diff --git a/.travis.yml b/.travis.yml
index ee934fec..2fe3721f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,12 @@
 language: go
 
+services:
+  - docker
+
+# Needed for e2e tests
 sudo: true
-go: 1.9.x
+
+go: 1.10.x
 go_import_path: github.com/kubernetes-csi/livenessprobe
 install:
   - go get -u github.com/golang/dep/cmd/dep
@@ -11,6 +16,7 @@ script:
 - go fmt $(go list ./... | grep -v vendor) | wc -l | grep 0
 - go vet $(go list ./... | grep -v vendor)
 - go test $(go list ./... | grep -v vendor)
+- ./hack/e2e-livenessprobe.sh
 after_success:
   - if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
       sudo make livenessprobe-container;
diff --git a/Gopkg.lock b/Gopkg.lock
index 6ab30844..de9a2c79 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -4,8 +4,8 @@
 [[projects]]
   name = "github.com/container-storage-interface/spec"
   packages = ["lib/go/csi/v0"]
-  revision = "35d9f9d77954980e449e52c3f3e43c21bd8171f5"
-  version = "v0.2.0-rc1"
+  revision = "2178fdeea87f1150a17a63252eee28d4d8141f72"
+  version = "v0.3.0"
 
 [[projects]]
   branch = "master"
@@ -16,30 +16,70 @@
 [[projects]]
   name = "github.com/golang/mock"
   packages = ["gomock"]
-  revision = "13f360950a79f5864a972c786a10a50e44b69541"
-  version = "v1.0.0"
+  revision = "c34cdb4725f4c3844d095133c6e40e448b86589b"
+  version = "v1.1.1"
 
 [[projects]]
   name = "github.com/golang/protobuf"
-  packages = ["proto","protoc-gen-go/descriptor","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"]
-  revision = "925541529c1fa6821df4e44ce2723319eb2be768"
-  version = "v1.0.0"
+  packages = [
+    "proto",
+    "protoc-gen-go/descriptor",
+    "ptypes",
+    "ptypes/any",
+    "ptypes/duration",
+    "ptypes/timestamp",
+    "ptypes/wrappers"
+  ]
+  revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
+  version = "v1.1.0"
 
 [[projects]]
   branch = "master"
   name = "github.com/kubernetes-csi/csi-test"
-  packages = ["driver","utils"]
-  revision = "3e4586c0abfbc869329d01510c663c6c540efb77"
+  packages = [
+    "driver",
+    "utils"
+  ]
+  revision = "e11d328ecca7fe91939284a8e878ebe77df8756d"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/net"
-  packages = ["context","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"]
-  revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"
+  packages = [
+    "context",
+    "http/httpguts",
+    "http2",
+    "http2/hpack",
+    "idna",
+    "internal/timeseries",
+    "trace"
+  ]
+  revision = "c39426892332e1bb5ec0a434a079bf82f5d30c54"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix"]
+  revision = "4e1fef5609515ec7a2cee7b5de30ba6d9b438cbf"
 
 [[projects]]
   name = "golang.org/x/text"
-  packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"]
+  packages = [
+    "collate",
+    "collate/build",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "language",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable"
+  ]
   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
   version = "v0.3.0"
 
@@ -47,17 +87,46 @@
   branch = "master"
   name = "google.golang.org/genproto"
   packages = ["googleapis/rpc/status"]
-  revision = "2d9486acae19cf9bd0c093d7dc236a323726a9e4"
+  revision = "383e8b2c3b9e36c4076b235b32537292176bae20"
 
 [[projects]]
   name = "google.golang.org/grpc"
-  packages = [".","balancer","balancer/base","balancer/roundrobin","codes","connectivity","credentials","encoding","encoding/proto","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","reflection","reflection/grpc_reflection_v1alpha","resolver","resolver/dns","resolver/passthrough","stats","status","tap","transport"]
-  revision = "8e4536a86ab602859c20df5ebfd0bd4228d08655"
-  version = "v1.10.0"
+  packages = [
+    ".",
+    "balancer",
+    "balancer/base",
+    "balancer/roundrobin",
+    "codes",
+    "connectivity",
+    "credentials",
+    "encoding",
+    "encoding/proto",
+    "grpclog",
+    "internal",
+    "internal/backoff",
+    "internal/channelz",
+    "internal/envconfig",
+    "internal/grpcrand",
+    "internal/transport",
+    "keepalive",
+    "metadata",
+    "naming",
+    "peer",
+    "reflection",
+    "reflection/grpc_reflection_v1alpha",
+    "resolver",
+    "resolver/dns",
+    "resolver/passthrough",
+    "stats",
+    "status",
+    "tap"
+  ]
+  revision = "32fb0ac620c32ba40a4626ddf94d90d12cce3455"
+  version = "v1.14.0"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "45f3b35a6ac9c977722fe0c14094733e288ce4648bb219612d65dc1bc3c1d7e3"
+  inputs-digest = "2f6e76998bb9d9f92c42332508edd9511082dc4b2a5bac1f3eba207120dd1b25"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 0619d492..182d704c 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -23,16 +23,12 @@
 
 [[constraint]]
   name = "github.com/container-storage-interface/spec"
-  version = "0.2.0-rc1"
+  version = "~0.3.0"
 
 [[constraint]]
   branch = "master"
   name = "github.com/golang/glog"
 
-[[constraint]]
-  name = "github.com/golang/mock"
-  version = "1.0.0"
-
 [[constraint]]
   branch = "master"
   name = "github.com/kubernetes-csi/csi-test"
@@ -40,3 +36,7 @@
 [[constraint]]
   name = "google.golang.org/grpc"
   version = "1.10.0"
+
+[[constraint]]
+  name = "github.com/golang/mock"
+  version = "1.1.1"
diff --git a/cmd/livenessprobe_test.go b/cmd/livenessprobe_test.go
new file mode 100644
index 00000000..0153137e
--- /dev/null
+++ b/cmd/livenessprobe_test.go
@@ -0,0 +1,95 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/golang/mock/gomock"
+	"github.com/kubernetes-csi/csi-test/driver"
+	"github.com/kubernetes-csi/livenessprobe/pkg/connection"
+)
+
+const (
+	driverName = "foo/bar"
+)
+
+func createMockServer(t *testing.T) (
+	*gomock.Controller,
+	*driver.MockCSIDriver,
+	*driver.MockIdentityServer,
+	*driver.MockControllerServer,
+	*driver.MockNodeServer,
+	connection.CSIConnection,
+	error) {
+	// Start the mock server
+	mockController := gomock.NewController(t)
+	identityServer := driver.NewMockIdentityServer(mockController)
+	controllerServer := driver.NewMockControllerServer(mockController)
+	nodeServer := driver.NewMockNodeServer(mockController)
+	drv := driver.NewMockCSIDriver(&driver.MockCSIDriverServers{
+		Identity:   identityServer,
+		Controller: controllerServer,
+		Node:       nodeServer,
+	})
+	drv.Start()
+
+	// Create a client connection to it
+	addr := drv.Address()
+	csiConn, err := connection.NewConnection(addr, 10)
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	return mockController, drv, identityServer, controllerServer, nodeServer, csiConn, nil
+}
+
+func TestProbe(t *testing.T) {
+	mockController, driver, idServer, _, nodeServer, csiConn, err := createMockServer(t)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mockController.Finish()
+	defer driver.Stop()
+	defer csiConn.Close()
+
+	// Setting up expected calls' responses
+	inPlugin := &csi.GetPluginInfoRequest{}
+	outPlugin := &csi.GetPluginInfoResponse{
+		Name: "foo/bar",
+	}
+	var injectedErr error
+	idServer.EXPECT().GetPluginInfo(gomock.Any(), inPlugin).Return(outPlugin, injectedErr).Times(1)
+
+	inNode := &csi.NodeGetIdRequest{}
+	outNode := &csi.NodeGetIdResponse{
+		NodeId: "test_node_id",
+	}
+	nodeServer.EXPECT().NodeGetId(gomock.Any(), inNode).Return(outNode, injectedErr).Times(1)
+	inProbe := &csi.ProbeRequest{}
+	outProbe := &csi.ProbeResponse{}
+	idServer.EXPECT().Probe(gomock.Any(), inProbe).Return(outProbe, injectedErr).Times(1)
+	// Calling Probing function
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	if err := runProbe(ctx, csiConn); err != nil {
+		t.Fatalf("failed to run probe with error: %+v", err)
+	}
+}
diff --git a/cmd/main.go b/cmd/main.go
index 4acf0d9f..cc5eb319 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -41,14 +41,7 @@ var (
 	healthzPort       = flag.String("health-port", "9808", "TCP ports for listening healthz requests")
 )
 
-func runProbe(ctx context.Context) error {
-
-	// Connect to CSI.
-	glog.Infof("Attempting to open a gRPC connection with: %s", *csiAddress)
-	csiConn, err := connection.NewConnection(*csiAddress, *connectionTimeout)
-	if err != nil {
-		return err
-	}
+func runProbe(ctx context.Context, csiConn connection.CSIConnection) error {
 
 	// Get CSI driver name.
 	glog.Infof("Calling CSI driver to discover driver name.")
@@ -74,13 +67,29 @@ func runProbe(ctx context.Context) error {
 	return nil
 }
 
+func getCSIConnection() (connection.CSIConnection, error) {
+	// Connect to CSI.
+	glog.Infof("Attempting to open a gRPC connection with: %s", *csiAddress)
+	csiConn, err := connection.NewConnection(*csiAddress, *connectionTimeout)
+	if err != nil {
+		return nil, err
+	}
+	return csiConn, nil
+}
+
 func chekcHealth(w http.ResponseWriter, req *http.Request) {
 
 	glog.Infof("Request: %s from: %s\n", req.URL.Path, req.RemoteAddr)
+	csiConn, err := getCSIConnection()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		w.Write([]byte(err.Error()))
+		glog.Infof("Failed to get connection to CSI  with error: %v.", err)
+		return
+	}
 	ctx, cancel := context.WithTimeout(context.Background(), *connectionTimeout)
 	defer cancel()
-	err := runProbe(ctx)
-	if err != nil {
+	if err := runProbe(ctx, csiConn); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte(err.Error()))
 		glog.Infof("Health check failed with: %v.", err)
diff --git a/hack/e2e-livenessprobe.sh b/hack/e2e-livenessprobe.sh
new file mode 100755
index 00000000..5768df26
--- /dev/null
+++ b/hack/e2e-livenessprobe.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+set -x
+
+## This file is for livenessprove which runs in a pair with csi
+## hostpath
+
+## Must be run from the root of the repo
+UDS="/tmp/e2e-csi-sanity.sock"
+CSI_ENDPOINT="unix://${UDS}"
+CSI_MOUNTPOINT="/mnt"
+APP=hostpathplugin
+
+SKIP="WithCapacity"
+if [ x${TRAVIS} = x"true" ] ; then
+	SKIP="WithCapacity|NodeUnpublishVolume|NodePublishVolume"
+fi
+
+git clone https://github.com/kubernetes-csi/drivers $GOPATH/src/github.com/kubernetes-csi/drivers
+pushd $GOPATH/src/github.com/kubernetes-csi/drivers
+# Build
+make hostpath; ret=$?
+if [ $ret -ne 0 ]; then
+ echo "Failed to build hostpath plugin, file a bug against drivers repo"
+ exit 1
+fi
+popd
+
+sudo rm -rf "$UDS" || true
+
+# Start hostpathplugin in the background
+sudo $GOPATH/src/github.com/kubernetes-csi/drivers/_output/$APP --endpoint=$CSI_ENDPOINT --nodeid=1 --v=5 &
+
+# Start liveness probe in the background
+sudo ./bin/livenessprobe --csi-address=$CSI_ENDPOINT &
+
+# Give time to CSI hostpathplugin and livenessprobe to initialize
+sleep 3
+
+# Requesting health
+health=$(curl -I http://localhost:9808/healthz | grep HTTP | awk '{print $2}')
+if [[ "x$health" != "x200" ]]; then
+  echo "Health check failed, but it was not supposed to, exiting..."
+  exit 1
+fi
+
+# Killing hostpathplugin
+sudo kill -9 $(pidof hostpathplugin)
+sleep 3
+
+# Requesting health, should fail since hostpathplugin is gone
+health=$(curl -I http://localhost:9808/healthz| grep HTTP | awk '{print $2}')
+if [[ "x$health" != "x500" ]]; then
+  echo "Health check did not detect driver failure, returned code: $health, exiting..."
+  exit 1
+fi
+
+sudo rm -f $UDS
+exit 0
diff --git a/vendor/github.com/container-storage-interface/spec/.travis.yml b/vendor/github.com/container-storage-interface/spec/.travis.yml
index ec3dde8a..15b11d3a 100644
--- a/vendor/github.com/container-storage-interface/spec/.travis.yml
+++ b/vendor/github.com/container-storage-interface/spec/.travis.yml
@@ -29,7 +29,7 @@ jobs:
     # Lang stage: Go
     - stage:               lang
       language:            go
-      go:                  1.8.3
+      go:                  1.9.5
       go_import_path:      github.com/container-storage-interface/spec
       install:
         - make -C lib/go protoc
diff --git a/vendor/github.com/container-storage-interface/spec/CONTRIBUTING.md b/vendor/github.com/container-storage-interface/spec/CONTRIBUTING.md
index cc5a61ce..8f33951f 100644
--- a/vendor/github.com/container-storage-interface/spec/CONTRIBUTING.md
+++ b/vendor/github.com/container-storage-interface/spec/CONTRIBUTING.md
@@ -24,7 +24,11 @@ This also applies to the code snippets in the markdown files.
 
 ## Git commit
 
-Prior to committing code please run `make` in order to update the protobuf file and any language bindings.
+The "system of record" for the specification is the `spec.md` file and all hand-edits of the specification should happen there.
+**DO NOT** manually edit the generated protobufs or generated language bindings.
+Once changes to `spec.md` are complete, please run `make` to update generated files.
+
+**IMPORTANT:** Prior to committing code please run `make` to ensure that your specification changes have landed in all generated files.
 
 ### Commit Style
 
diff --git a/vendor/github.com/container-storage-interface/spec/Makefile b/vendor/github.com/container-storage-interface/spec/Makefile
index 3cfaa450..0e04e322 100644
--- a/vendor/github.com/container-storage-interface/spec/Makefile
+++ b/vendor/github.com/container-storage-interface/spec/Makefile
@@ -7,8 +7,9 @@ CSI_PROTO := csi.proto
 #
 # The temporary file is not versioned, and thus will always be
 # built on Travis-CI.
-$(CSI_PROTO).tmp: $(CSI_SPEC)
-	cat $? | sed -n -e '/```protobuf$$/,/^```$$/ p' | sed '/^```/d' > "$@"
+$(CSI_PROTO).tmp: $(CSI_SPEC) Makefile
+	echo "// Code generated by make; DO NOT EDIT." > "$@"
+	cat $< | sed -n -e '/```protobuf$$/,/^```$$/ p' | sed '/^```/d' >> "$@"
 
 # This is the target for building the CSI protobuf file.
 #
@@ -37,8 +38,10 @@ build:
 endif
 
 clean:
+	$(MAKE) -C lib/go $@
 
 clobber: clean
+	$(MAKE) -C lib/go $@
 	rm -f $(CSI_PROTO) $(CSI_PROTO).tmp
 
 # check generated files for violation of standards
diff --git a/vendor/github.com/container-storage-interface/spec/README.md b/vendor/github.com/container-storage-interface/spec/README.md
index e16a3cc6..d270cedd 100644
--- a/vendor/github.com/container-storage-interface/spec/README.md
+++ b/vendor/github.com/container-storage-interface/spec/README.md
@@ -3,3 +3,11 @@
 ![CSI Logo](logo.png)
 
 This project contains the CSI [specification](spec.md) and [protobuf](csi.proto) files.
+
+## CSI Adoption
+
+### Container Orchestrators (CO)
+
+* [Cloud Foundry](https://github.com/cloudfoundry/csi-local-volume-release)
+* [Kubernetes](https://kubernetes-csi.github.io/docs/)
+* [Mesos](http://mesos.apache.org/documentation/latest/csi/)
diff --git a/vendor/github.com/container-storage-interface/spec/VERSION b/vendor/github.com/container-storage-interface/spec/VERSION
index 0ea3a944..0d91a54c 100644
--- a/vendor/github.com/container-storage-interface/spec/VERSION
+++ b/vendor/github.com/container-storage-interface/spec/VERSION
@@ -1 +1 @@
-0.2.0
+0.3.0
diff --git a/vendor/github.com/container-storage-interface/spec/csi.proto b/vendor/github.com/container-storage-interface/spec/csi.proto
index bd8a3e31..22cff40c 100644
--- a/vendor/github.com/container-storage-interface/spec/csi.proto
+++ b/vendor/github.com/container-storage-interface/spec/csi.proto
@@ -1,6 +1,9 @@
+// Code generated by make; DO NOT EDIT.
 syntax = "proto3";
 package csi.v0;
 
+import "google/protobuf/wrappers.proto";
+
 option go_package = "csi";
 service Identity {
   rpc GetPluginInfo(GetPluginInfoRequest)
@@ -36,7 +39,16 @@ service Controller {
     returns (GetCapacityResponse) {}
 
   rpc ControllerGetCapabilities (ControllerGetCapabilitiesRequest)
-    returns (ControllerGetCapabilitiesResponse) {}  
+    returns (ControllerGetCapabilitiesResponse) {}
+
+  rpc CreateSnapshot (CreateSnapshotRequest)
+    returns (CreateSnapshotResponse) {}
+
+  rpc DeleteSnapshot (DeleteSnapshotRequest)
+    returns (DeleteSnapshotResponse) {}
+
+  rpc ListSnapshots (ListSnapshotsRequest)
+    returns (ListSnapshotsResponse) {}
 }
 
 service Node {
@@ -52,13 +64,25 @@ service Node {
   rpc NodeUnpublishVolume (NodeUnpublishVolumeRequest)
     returns (NodeUnpublishVolumeResponse) {}
 
+  // NodeGetId is being deprecated in favor of NodeGetInfo and will be
+  // removed in CSI 1.0. Existing drivers, however, may depend on this
+  // RPC call and hence this RPC call MUST be implemented by the CSI
+  // plugin prior to v1.0.
   rpc NodeGetId (NodeGetIdRequest)
-    returns (NodeGetIdResponse) {}
+    returns (NodeGetIdResponse) {
+    option deprecated = true;
+  }
 
   rpc NodeGetCapabilities (NodeGetCapabilitiesRequest)
     returns (NodeGetCapabilitiesResponse) {}
+
+  // Prior to CSI 1.0 - CSI plugins MUST implement both NodeGetId and
+  // NodeGetInfo RPC calls.
+  rpc NodeGetInfo (NodeGetInfoRequest)
+    returns (NodeGetInfoResponse) {}
 }
 message GetPluginInfoRequest {
+  // Intentionally empty.
 }
 
 message GetPluginInfoResponse {
@@ -78,6 +102,7 @@ message GetPluginInfoResponse {
   map<string, string> manifest = 3;
 }
 message GetPluginCapabilitiesRequest {
+  // Intentionally empty.
 }
 
 message GetPluginCapabilitiesResponse {
@@ -101,6 +126,14 @@ message PluginCapability {
       // attempt to invoke the REQUIRED ControllerService RPCs, as well
       // as specific RPCs as indicated by ControllerGetCapabilities.
       CONTROLLER_SERVICE = 1;
+
+      // ACCESSIBILITY_CONSTRAINTS indicates that the volumes for this
+      // plugin may not be equally accessible by all nodes in the
+      // cluster. The CO MUST use the topology information returned by
+      // CreateVolumeRequest along with the topology information
+      // returned by NodeGetInfo to ensure that a given volume is
+      // accessible from a given node when scheduling workloads.
+      ACCESSIBILITY_CONSTRAINTS = 2;
     }
     Type type = 1;
   }
@@ -111,10 +144,31 @@ message PluginCapability {
   }
 }
 message ProbeRequest {
+  // Intentionally empty.
 }
 
 message ProbeResponse {
-  // Intentionally empty.
+  // Readiness allows a plugin to report its initialization status back
+  // to the CO. Initialization for some plugins MAY be time consuming
+  // and it is important for a CO to distinguish between the following
+  // cases:
+  //
+  // 1) The plugin is in an unhealthy state and MAY need restarting. In
+  //    this case a gRPC error code SHALL be returned.
+  // 2) The plugin is still initializing, but is otherwise perfectly
+  //    healthy. In this case a successful response SHALL be returned
+  //    with a readiness value of `false`. Calls to the plugin's
+  //    Controller and/or Node services MAY fail due to an incomplete
+  //    initialization state.
+  // 3) The plugin has finished initializing and is ready to service
+  //    calls to its Controller and/or Node services. A successful
+  //    response is returned with a readiness value of `true`.
+  //
+  // This field is OPTIONAL. If not present, the caller SHALL assume
+  // that the plugin is in a ready state and is accepting calls to its
+  // Controller and/or Node services (according to the plugin's reported
+  // capabilities).
+  .google.protobuf.BoolValue ready = 1;
 }
 message CreateVolumeRequest {
   // The suggested name for the storage space. This field is REQUIRED.
@@ -136,7 +190,11 @@ message CreateVolumeRequest {
 
   // This field is OPTIONAL. This allows the CO to specify the capacity
   // requirement of the volume to be provisioned. If not specified, the
-  // Plugin MAY choose an implementation-defined capacity range.
+  // Plugin MAY choose an implementation-defined capacity range. If
+  // specified it MUST always be honored, even when creating volumes
+  // from a source; which may force some backends to internally extend
+  // the volume after creating it.
+
   CapacityRange capacity_range = 2;
 
   // The capabilities that the provisioned volume MUST have: the Plugin
@@ -155,23 +213,42 @@ message CreateVolumeRequest {
   map<string, string> parameters = 4;
 
   // Secrets required by plugin to complete volume creation request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> controller_create_secrets = 5;
+
+  // If specified, the new volume will be pre-populated with data from
+  // this source. This field is OPTIONAL.
+  VolumeContentSource volume_content_source = 6;
+  
+  // Specifies where (regions, zones, racks, etc.) the provisioned
+  // volume MUST be accessible from.
+  // An SP SHALL advertise the requirements for topological
+  // accessibility information in documentation. COs SHALL only specify
+  // topological accessibility information supported by the SP.
+  // This field is OPTIONAL.
+  // This field SHALL NOT be specified unless the SP has the
+  // ACCESSIBILITY_CONSTRAINTS plugin capability.
+  // If this field is not specified and the SP has the
+  // ACCESSIBILITY_CONSTRAINTS plugin capability, the SP MAY choose
+  // where the provisioned volume is accessible from.
+  TopologyRequirement accessibility_requirements = 7;
+}
+
+// Specifies what source the volume will be created from. One of the
+// type fields MUST be specified.
+message VolumeContentSource {
+  message SnapshotSource {
+    // Contains identity information for the existing source snapshot.
+    // This field is REQUIRED. Plugin is REQUIRED to support creating
+    // volume from snapshot if it supports the capability
+    // CREATE_DELETE_SNAPSHOT.
+    string id = 1;
+  }
+
+  oneof type {
+    SnapshotSource snapshot = 1;
+  }
 }
 
 message CreateVolumeResponse {
@@ -199,7 +276,7 @@ message VolumeCapability {
     // Therefore, the CO and the Plugin MUST NOT leak this information
     // to untrusted entities. The total size of this repeated field
     // SHALL NOT exceed 4 KiB.
-    repeated string mount_flags = 2;    
+    repeated string mount_flags = 2;
   }
 
   // Specify how a volume can be accessed.
@@ -243,17 +320,17 @@ message VolumeCapability {
 }
 
 // The capacity of the storage space in bytes. To specify an exact size,
-// `required_bytes` and `limit_bytes` can be set to the same value. At
+// `required_bytes` and `limit_bytes` SHALL be set to the same value. At
 // least one of the these fields MUST be specified.
 message CapacityRange {
-  // Volume must be at least this big. This field is OPTIONAL.
+  // Volume MUST be at least this big. This field is OPTIONAL.
   // A value of 0 is equal to an unspecified field value.
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int64 required_bytes = 1;
 
-  // Volume must not be bigger than this. This field is OPTIONAL.
+  // Volume MUST not be bigger than this. This field is OPTIONAL.
   // A value of 0 is equal to an unspecified field value.
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int64 limit_bytes = 2;
 }
 
@@ -262,7 +339,7 @@ message Volume {
   // The capacity of the volume in bytes. This field is OPTIONAL. If not
   // set (value of 0), it indicates that the capacity of the volume is
   // unknown (e.g., NFS share).
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int64 capacity_bytes = 1;
 
   // Contains identity information for the created volume. This field is
@@ -278,7 +355,200 @@ message Volume {
   // a volume. A volume uniquely identified by `id` SHALL always report
   // the same attributes. This field is OPTIONAL and when present MUST
   // be passed to volume validation and publishing calls.
-  map<string,string> attributes = 3;
+  map<string, string> attributes = 3;
+
+  // If specified, indicates that the volume is not empty and is
+  // pre-populated with data from the specified source.
+  // This field is OPTIONAL.
+  VolumeContentSource content_source = 4;
+
+  // Specifies where (regions, zones, racks, etc.) the provisioned
+  // volume is accessible from.
+  // A plugin that returns this field MUST also set the
+  // ACCESSIBILITY_CONSTRAINTS plugin capability.
+  // An SP MAY specify multiple topologies to indicate the volume is
+  // accessible from multiple locations.
+  // COs MAY use this information along with the topology information
+  // returned by NodeGetInfo to ensure that a given volume is accessible
+  // from a given node when scheduling workloads.
+  // This field is OPTIONAL. If it is not specified, the CO MAY assume
+  // the volume is equally accessible from all nodes in the cluster and
+  // may schedule workloads referencing the volume on any available
+  // node.
+  //
+  // Example 1:
+  //   accessible_topology = {"region": "R1", "zone": "Z2"}
+  // Indicates a volume accessible only from the "region" "R1" and the
+  // "zone" "Z2".
+  //
+  // Example 2:
+  //   accessible_topology =
+  //     {"region": "R1", "zone": "Z2"},
+  //     {"region": "R1", "zone": "Z3"} 
+  // Indicates a volume accessible from both "zone" "Z2" and "zone" "Z3"
+  // in the "region" "R1".
+  repeated Topology accessible_topology = 5;
+}
+
+message TopologyRequirement {
+  // Specifies the list of topologies the provisioned volume MUST be
+  // accessible from.
+  // This field is OPTIONAL. If TopologyRequirement is specified either
+  // requisite or preferred or both MUST be specified.
+  // 
+  // If requisite is specified, the provisioned volume MUST be
+  // accessible from at least one of the requisite topologies.
+  // 
+  // Given
+  //   x = number of topologies provisioned volume is accessible from
+  //   n = number of requisite topologies
+  // The CO MUST ensure n >= 1. The SP MUST ensure x >= 1
+  // If x==n, than the SP MUST make the provisioned volume available to
+  // all topologies from the list of requisite topologies. If it is
+  // unable to do so, the SP MUST fail the CreateVolume call.
+  // For example, if a volume should be accessible from a single zone,
+  // and requisite =
+  //   {"region": "R1", "zone": "Z2"}
+  // then the provisioned volume MUST be accessible from the "region"
+  // "R1" and the "zone" "Z2".
+  // Similarly, if a volume should be accessible from two zones, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"}
+  // then the provisioned volume MUST be accessible from the "region"
+  // "R1" and both "zone" "Z2" and "zone" "Z3".
+  //
+  // If x<n, than the SP SHALL choose x unique topologies from the list
+  // of requisite topologies. If it is unable to do so, the SP MUST fail
+  // the CreateVolume call.
+  // For example, if a volume should be accessible from a single zone,
+  // and requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"}
+  // then the SP may choose to make the provisioned volume available in
+  // either the "zone" "Z2" or the "zone" "Z3" in the "region" "R1".
+  // Similarly, if a volume should be accessible from two zones, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"},
+  //   {"region": "R1", "zone": "Z4"}
+  // then the provisioned volume MUST be accessible from any combination
+  // of two unique topologies: e.g. "R1/Z2" and "R1/Z3", or "R1/Z2" and
+  //  "R1/Z4", or "R1/Z3" and "R1/Z4".
+  //
+  // If x>n, than the SP MUST make the provisioned volume available from
+  // all topologies from the list of requisite topologies and MAY choose
+  // the remaining x-n unique topologies from the list of all possible
+  // topologies. If it is unable to do so, the SP MUST fail the
+  // CreateVolume call.
+  // For example, if a volume should be accessible from two zones, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"}
+  // then the provisioned volume MUST be accessible from the "region"
+  // "R1" and the "zone" "Z2" and the SP may select the second zone
+  // independently, e.g. "R1/Z4".
+  repeated Topology requisite = 1;
+
+  // Specifies the list of topologies the CO would prefer the volume to
+  // be provisioned in.
+  //
+  // This field is OPTIONAL. If TopologyRequirement is specified either
+  // requisite or preferred or both MUST be specified.
+  // 
+  // An SP MUST attempt to make the provisioned volume available using
+  // the preferred topologies in order from first to last.
+  //
+  // If requisite is specified, all topologies in preferred list MUST
+  // also be present in the list of requisite topologies.
+  //
+  // If the SP is unable to to make the provisioned volume available
+  // from any of the preferred topologies, the SP MAY choose a topology
+  // from the list of requisite topologies.
+  // If the list of requisite topologies is not specified, then the SP
+  // MAY choose from the list of all possible topologies.
+  // If the list of requisite topologies is specified and the SP is
+  // unable to to make the provisioned volume available from any of the
+  // requisite topologies it MUST fail the CreateVolume call.
+  // 
+  // Example 1:
+  // Given a volume should be accessible from a single zone, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"}
+  // preferred =
+  //   {"region": "R1", "zone": "Z3"}
+  // then the the SP SHOULD first attempt to make the provisioned volume
+  // available from "zone" "Z3" in the "region" "R1" and fall back to
+  // "zone" "Z2" in the "region" "R1" if that is not possible.
+  //
+  // Example 2:
+  // Given a volume should be accessible from a single zone, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"},
+  //   {"region": "R1", "zone": "Z4"},
+  //   {"region": "R1", "zone": "Z5"}
+  // preferred =
+  //   {"region": "R1", "zone": "Z4"},
+  //   {"region": "R1", "zone": "Z2"}
+  // then the the SP SHOULD first attempt to make the provisioned volume
+  // accessible from "zone" "Z4" in the "region" "R1" and fall back to
+  // "zone" "Z2" in the "region" "R1" if that is not possible. If that
+  // is not possible, the SP may choose between either the "zone"
+  // "Z3" or "Z5" in the "region" "R1".
+  //
+  // Example 3:
+  // Given a volume should be accessible from TWO zones (because an
+  // opaque parameter in CreateVolumeRequest, for example, specifies
+  // the volume is accessible from two zones, aka synchronously
+  // replicated), and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"},
+  //   {"region": "R1", "zone": "Z4"},
+  //   {"region": "R1", "zone": "Z5"}
+  // preferred =
+  //   {"region": "R1", "zone": "Z5"},
+  //   {"region": "R1", "zone": "Z3"}
+  // then the the SP SHOULD first attempt to make the provisioned volume
+  // accessible from the combination of the two "zones" "Z5" and "Z3" in
+  // the "region" "R1". If that's not possible, it should fall back to
+  // a combination of "Z5" and other possibilities from the list of
+  // requisite. If that's not possible, it should fall back  to a
+  // combination of "Z3" and other possibilities from the list of
+  // requisite. If that's not possible, it should fall back  to a
+  // combination of other possibilities from the list of requisite.
+  repeated Topology preferred = 2;
+}
+
+// Topology is a map of topological domains to topological segments.
+// A topological domain is a sub-division of a cluster, like "region",
+// "zone", "rack", etc.
+// A topological segment is a specific instance of a topological domain,
+// like "zone3", "rack3", etc.
+// For example {"com.company/zone": "Z1", "com.company/rack": "R3"}
+// Valid keys have two segments: an optional prefix and name, separated
+// by a slash (/), for example: "com.company.example/zone".
+// The key name segment is required. The prefix is optional.
+// Both the key name and the prefix MUST each be 63 characters or less,
+// begin and end with an alphanumeric character ([a-z0-9A-Z]) and
+// contain only dashes (-), underscores (_), dots (.), or alphanumerics
+// in between, for example "zone".
+// The key prefix MUST follow reverse domain name notation format
+// (https://en.wikipedia.org/wiki/Reverse_domain_name_notation).
+// The key prefix SHOULD include the plugin's host company name and/or
+// the plugin name, to minimize the possibility of collisions with keys
+// from other plugins.
+// If a key prefix is specified, it MUST be identical across all
+// topology keys returned by the SP (across all RPCs).
+// Keys MUST be case-insensitive. Meaning the keys "Zone" and "zone"
+// MUST not both exist.
+// Each value (topological segment) MUST contain 1 or more strings.
+// Each string MUST be 63 characters or less and begin and end with an
+// alphanumeric character with '-', '_', '.', or alphanumerics in
+// between.
+message Topology {
+  map<string, string> segments = 1;
 }
 message DeleteVolumeRequest {
   // The ID of the volume to be deprovisioned.
@@ -286,26 +556,13 @@ message DeleteVolumeRequest {
   string volume_id = 1;
 
   // Secrets required by plugin to complete volume deletion request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> controller_delete_secrets = 2;
 }
 
 message DeleteVolumeResponse {
+  // Intentionally empty.
 }
 message ControllerPublishVolumeRequest {
   // The ID of the volume to be used on a node.
@@ -313,7 +570,7 @@ message ControllerPublishVolumeRequest {
   string volume_id = 1;
 
   // The ID of the node. This field is REQUIRED. The CO SHALL set this
-  // field to match the node ID returned by `NodeGetId`.
+  // field to match the node ID returned by `NodeGetInfo`.
   string node_id = 2;
 
   // The capability of the volume the CO expects the volume to have.
@@ -325,29 +582,14 @@ message ControllerPublishVolumeRequest {
   bool readonly = 4;
 
   // Secrets required by plugin to complete controller publish volume
-  // request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // request. This field is OPTIONAL. Refer to the
+  // `Secrets Requirements` section on how to use this field.
   map<string, string> controller_publish_secrets = 5;
 
   // Attributes of the volume to be used on a node. This field is
   // OPTIONAL and MUST match the attributes of the Volume identified
   // by `volume_id`.
-  map<string,string> volume_attributes = 6;
+  map<string, string> volume_attributes = 6;
 }
 
 message ControllerPublishVolumeResponse {
@@ -362,7 +604,7 @@ message ControllerUnpublishVolumeRequest {
   string volume_id = 1;
 
   // The ID of the node. This field is OPTIONAL. The CO SHOULD set this
-  // field to match the node ID returned by `NodeGetId` or leave it
+  // field to match the node ID returned by `NodeGetInfo` or leave it
   // unset. If the value is set, the SP MUST unpublish the volume from
   // the specified node. If the value is unset, the SP MUST unpublish
   // the volume from all nodes it is published to.
@@ -370,28 +612,14 @@ message ControllerUnpublishVolumeRequest {
 
   // Secrets required by plugin to complete controller unpublish volume
   // request. This SHOULD be the same secrets passed to the
-  // ControllerPublishVolume.
-  // call for the specified volume.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // ControllerPublishVolume call for the specified volume.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> controller_unpublish_secrets = 3;
 }
 
 message ControllerUnpublishVolumeResponse {
+  // Intentionally empty.
 }
 message ValidateVolumeCapabilitiesRequest {
   // The ID of the volume to check. This field is REQUIRED.
@@ -404,7 +632,15 @@ message ValidateVolumeCapabilitiesRequest {
 
   // Attributes of the volume to check. This field is OPTIONAL and MUST
   // match the attributes of the Volume identified by `volume_id`.
-  map<string,string> volume_attributes = 3;
+  map<string, string> volume_attributes = 3;
+
+  // Specifies where (regions, zones, racks, etc.) the caller believes
+  // the volume is accessible from.
+  // A caller MAY specify multiple topologies to indicate they believe
+  // the volume to be accessible from multiple locations.
+  // This field is OPTIONAL. This field SHALL NOT be set unless the
+  // plugin advertises the ACCESSIBILITY_CONSTRAINTS capability.
+  repeated Topology accessible_topology = 4;
 }
 
 message ValidateVolumeCapabilitiesResponse {
@@ -425,7 +661,7 @@ message ListVolumesRequest {
   // in the subsequent `ListVolumes` call. This field is OPTIONAL. If
   // not specified (zero value), it means there is no restriction on the
   // number of entries that can be returned.
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int32 max_entries = 1;
 
   // A token to specify where to start paginating. Set this field to
@@ -463,18 +699,27 @@ message GetCapacityRequest {
   // specific `parameters`. These are the same `parameters` the CO will
   // use in `CreateVolumeRequest`. This field is OPTIONAL.
   map<string, string> parameters = 2;
+
+  // If specified, the Plugin SHALL report the capacity of the storage
+  // that can be used to provision volumes that in the specified
+  // `accessible_topology`. This is the same as the
+  // `accessible_topology` the CO returns in a `CreateVolumeResponse`.
+  // This field is OPTIONAL. This field SHALL NOT be set unless the
+  // plugin advertises the ACCESSIBILITY_CONSTRAINTS capability.
+  Topology accessible_topology = 3;
 }
 
 message GetCapacityResponse {
-  // The available capacity of the storage that can be used to
-  // provision volumes. If `volume_capabilities` or `parameters` is
+  // The available capacity, in bytes, of the storage that can be used
+  // to provision volumes. If `volume_capabilities` or `parameters` is
   // specified in the request, the Plugin SHALL take those into
   // consideration when calculating the available capacity of the
   // storage. This field is REQUIRED.
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int64 available_capacity = 1;
 }
 message ControllerGetCapabilitiesRequest {
+  // Intentionally empty.
 }
 
 message ControllerGetCapabilitiesResponse {
@@ -492,6 +737,16 @@ message ControllerServiceCapability {
       PUBLISH_UNPUBLISH_VOLUME = 2;
       LIST_VOLUMES = 3;
       GET_CAPACITY = 4;
+      // Currently the only way to consume a snapshot is to create
+      // a volume from it. Therefore plugins supporting
+      // CREATE_DELETE_SNAPSHOT MUST support creating volume from
+      // snapshot.
+      CREATE_DELETE_SNAPSHOT = 5;
+      // LIST_SNAPSHOTS is NOT REQUIRED. For plugins that need to upload
+      // a snapshot after it is being cut, LIST_SNAPSHOTS COULD be used
+      // with the snapshot_id as the filter to query whether the
+      // uploading process is complete or not.
+      LIST_SNAPSHOTS = 6;
     }
 
     Type type = 1;
@@ -502,6 +757,158 @@ message ControllerServiceCapability {
     RPC rpc = 1;
   }
 }
+message CreateSnapshotRequest {
+  // The ID of the source volume to be snapshotted.
+  // This field is REQUIRED.
+  string source_volume_id = 1;
+
+  // The suggested name for the snapshot. This field is REQUIRED for
+  // idempotency.
+  string name = 2;
+
+  // Secrets required by plugin to complete snapshot creation request.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
+  map<string, string> create_snapshot_secrets = 3;
+
+  // Plugin specific parameters passed in as opaque key-value pairs.
+  // This field is OPTIONAL. The Plugin is responsible for parsing and
+  // validating these parameters. COs will treat these as opaque.
+  // Use cases for opaque parameters:
+  // - Specify a policy to automatically clean up the snapshot.
+  // - Specify an expiration date for the snapshot.
+  // - Specify whether the snapshot is readonly or read/write.
+  // - Specify if the snapshot should be replicated to some place.
+  // - Specify primary or secondary for replication systems that
+  //   support snapshotting only on primary.
+  map<string, string> parameters = 4;
+}
+
+message CreateSnapshotResponse {
+  // Contains all attributes of the newly created snapshot that are
+  // relevant to the CO along with information required by the Plugin
+  // to uniquely identify the snapshot. This field is REQUIRED.
+  Snapshot snapshot = 1;
+}
+
+// The information about a provisioned snapshot.
+message Snapshot {
+  // This is the complete size of the snapshot in bytes. The purpose of
+  // this field is to give CO guidance on how much space is needed to
+  // create a volume from this snapshot. The size of the volume MUST NOT
+  // be less than the size of the source snapshot. This field is
+  // OPTIONAL. If this field is not set, it indicates that this size is
+  // unknown. The value of this field MUST NOT be negative and a size of
+  // zero means it is unspecified.
+  int64 size_bytes = 1;
+
+  // Uniquely identifies a snapshot and is generated by the plugin. It
+  // will not change over time. This field is REQUIRED. The identity
+  // information will be used by the CO in subsequent calls to refer to
+  // the provisioned snapshot.
+  string id = 2;
+
+  // Identity information for the source volume. Note that creating a
+  // snapshot from a snapshot is not supported here so the source has to
+  // be a volume. This field is REQUIRED.
+  string source_volume_id = 3;
+
+  // Timestamp when the point-in-time snapshot is taken on the storage
+  // system. The format of this field should be a Unix nanoseconds time
+  // encoded as an int64. On Unix, the command `date +%s%N` returns the
+  // current time in nanoseconds since 1970-01-01 00:00:00 UTC. This
+  // field is REQUIRED.
+  int64 created_at = 4;
+
+  // The status of a snapshot.
+  SnapshotStatus status = 5;
+}
+
+// The status of a snapshot.
+message SnapshotStatus {
+  enum Type {
+     UNKNOWN = 0;
+     // A snapshot is ready for use.
+     READY = 1;
+     // A snapshot is cut and is now being uploaded.
+     // Some cloud providers and storage systems uploads the snapshot
+     // to the cloud after the snapshot is cut. During this phase,
+     // `thaw` can be done so the application can be running again if
+     // `freeze` was done before taking the snapshot.
+     UPLOADING = 2;
+     // An error occurred during the snapshot uploading process.
+     // This error status is specific for uploading because
+     // `CreateSnaphot` is a blocking call before the snapshot is
+     // cut and therefore it SHOULD NOT come back with an error
+     // status when an error occurs. Instead a gRPC error code SHALL
+     // be returned by `CreateSnapshot` when an error occurs before
+     // a snapshot is cut.
+     ERROR_UPLOADING = 3;
+  }
+  // This field is REQUIRED.
+  Type type = 1;
+
+  // Additional information to describe why a snapshot ended up in the
+  // `ERROR_UPLOADING` status. This field is OPTIONAL.
+  string details = 2;
+}
+message DeleteSnapshotRequest {
+  // The ID of the snapshot to be deleted.
+  // This field is REQUIRED.
+  string snapshot_id = 1;
+
+  // Secrets required by plugin to complete snapshot deletion request.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
+  map<string, string> delete_snapshot_secrets = 2;
+}
+
+message DeleteSnapshotResponse {}
+// List all snapshots on the storage system regardless of how they were
+// created.
+message ListSnapshotsRequest {
+  // If specified (non-zero value), the Plugin MUST NOT return more
+  // entries than this number in the response. If the actual number of
+  // entries is more than this number, the Plugin MUST set `next_token`
+  // in the response which can be used to get the next page of entries
+  // in the subsequent `ListSnapshots` call. This field is OPTIONAL. If
+  // not specified (zero value), it means there is no restriction on the
+  // number of entries that can be returned.
+  // The value of this field MUST NOT be negative.
+  int32 max_entries = 1;
+
+  // A token to specify where to start paginating. Set this field to
+  // `next_token` returned by a previous `ListSnapshots` call to get the
+  // next page of entries. This field is OPTIONAL.
+  // An empty string is equal to an unspecified field value.
+  string starting_token = 2;
+
+  // Identity information for the source volume. This field is OPTIONAL.
+  // It can be used to list snapshots by volume.
+  string source_volume_id = 3;
+
+  // Identity information for a specific snapshot. This field is
+  // OPTIONAL. It can be used to list only a specific snapshot.
+  // ListSnapshots will return with current snapshot information
+  // and will not block if the snapshot is being uploaded.
+  string snapshot_id = 4;
+}
+
+message ListSnapshotsResponse {
+  message Entry {
+    Snapshot snapshot = 1;
+  }
+
+  repeated Entry entries = 1;
+
+  // This token allows you to get the next page of entries for
+  // `ListSnapshots` request. If the number of entries is larger than
+  // `max_entries`, use the `next_token` as a value for the
+  // `starting_token` field in the next `ListSnapshots` request. This
+  // field is OPTIONAL.
+  // An empty string is equal to an unspecified field value.
+  string next_token = 2;
+}
 message NodeStageVolumeRequest {
   // The ID of the volume to publish. This field is REQUIRED.
   string volume_id = 1;
@@ -515,7 +922,7 @@ message NodeStageVolumeRequest {
 
   // The path to which the volume will be published. It MUST be an
   // absolute path in the root filesystem of the process serving this
-  // request. The CO SHALL ensure that there is only one 
+  // request. The CO SHALL ensure that there is only one
   // staging_target_path per volume.
   // This is a REQUIRED field.
   string staging_target_path = 3;
@@ -525,31 +932,18 @@ message NodeStageVolumeRequest {
   VolumeCapability volume_capability = 4;
 
   // Secrets required by plugin to complete node stage volume request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> node_stage_secrets = 5;
 
   // Attributes of the volume to publish. This field is OPTIONAL and
-  // MUST match the attributes of the VolumeInfo identified by
+  // MUST match the attributes of the `Volume` identified by
   // `volume_id`.
-  map<string,string> volume_attributes = 6;
+  map<string, string> volume_attributes = 6;
 }
 
 message NodeStageVolumeResponse {
+  // Intentionally empty.
 }
 message NodeUnstageVolumeRequest {
   // The ID of the volume. This field is REQUIRED.
@@ -562,6 +956,7 @@ message NodeUnstageVolumeRequest {
 }
 
 message NodeUnstageVolumeResponse {
+  // Intentionally empty.
 }
 message NodePublishVolumeRequest {
   // The ID of the volume to publish. This field is REQUIRED.
@@ -577,7 +972,7 @@ message NodePublishVolumeRequest {
   // The path to which the device was mounted by `NodeStageVolume`.
   // It MUST be an absolute path in the root filesystem of the process
   // serving this request.
-  // It MUST be set if the Node Plugin implements the 
+  // It MUST be set if the Node Plugin implements the
   // `STAGE_UNSTAGE_VOLUME` node capability.
   // This is an OPTIONAL field.
   string staging_target_path = 3;
@@ -599,31 +994,18 @@ message NodePublishVolumeRequest {
   bool readonly = 6;
 
   // Secrets required by plugin to complete node publish volume request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> node_publish_secrets = 7;
 
   // Attributes of the volume to publish. This field is OPTIONAL and
   // MUST match the attributes of the Volume identified by
   // `volume_id`.
-  map<string,string> volume_attributes = 8;
+  map<string, string> volume_attributes = 8;
 }
 
 message NodePublishVolumeResponse {
+  // Intentionally empty.
 }
 message NodeUnpublishVolumeRequest {
   // The ID of the volume. This field is REQUIRED.
@@ -636,8 +1018,10 @@ message NodeUnpublishVolumeRequest {
 }
 
 message NodeUnpublishVolumeResponse {
+  // Intentionally empty.
 }
 message NodeGetIdRequest {
+  // Intentionally empty.
 }
 
 message NodeGetIdResponse {
@@ -647,6 +1031,7 @@ message NodeGetIdResponse {
   string node_id = 1;
 }
 message NodeGetCapabilitiesRequest {
+  // Intentionally empty.
 }
 
 message NodeGetCapabilitiesResponse {
@@ -671,3 +1056,38 @@ message NodeServiceCapability {
     RPC rpc = 1;
   }
 }
+message NodeGetInfoRequest {
+}
+
+message NodeGetInfoResponse {
+  // The ID of the node as understood by the SP which SHALL be used by
+  // CO in subsequent calls to `ControllerPublishVolume`.
+  // This is a REQUIRED field.
+  string node_id = 1;
+
+  // Maximum number of volumes that controller can publish to the node.
+  // If value is not set or zero CO SHALL decide how many volumes of
+  // this type can be published by the controller to the node. The
+  // plugin MUST NOT set negative values here.
+  // This field is OPTIONAL.
+  int64 max_volumes_per_node = 2;
+
+  // Specifies where (regions, zones, racks, etc.) the node is
+  // accessible from.
+  // A plugin that returns this field MUST also set the
+  // ACCESSIBILITY_CONSTRAINTS plugin capability.
+  // COs MAY use this information along with the topology information
+  // returned in CreateVolumeResponse to ensure that a given volume is
+  // accessible from a given node when scheduling workloads.
+  // This field is OPTIONAL. If it is not specified, the CO MAY assume
+  // the node is not subject to any topological constraint, and MAY
+  // schedule workloads that reference any volume V, such that there are
+  // no topological constraints declared for V.
+  //
+  // Example 1:
+  //   accessible_topology =
+  //     {"region": "R1", "zone": "R2"}
+  // Indicates the node exists within the "region" "R1" and the "zone"
+  // "Z2".
+  Topology accessible_topology = 3;
+}
diff --git a/vendor/github.com/container-storage-interface/spec/lib/go/.gitignore b/vendor/github.com/container-storage-interface/spec/lib/go/.gitignore
index e1128ce8..44dae3ea 100644
--- a/vendor/github.com/container-storage-interface/spec/lib/go/.gitignore
+++ b/vendor/github.com/container-storage-interface/spec/lib/go/.gitignore
@@ -1,3 +1,4 @@
 /protoc
 /protoc-gen-go
 /csi.a
+/.protoc
diff --git a/vendor/github.com/container-storage-interface/spec/lib/go/Makefile b/vendor/github.com/container-storage-interface/spec/lib/go/Makefile
index 3af5de2b..a7443eae 100644
--- a/vendor/github.com/container-storage-interface/spec/lib/go/Makefile
+++ b/vendor/github.com/container-storage-interface/spec/lib/go/Makefile
@@ -46,7 +46,6 @@ $(PROTOC):
 	  unzip "$(PROTOC_TMP_DIR)/$(PROTOC_ZIP)" -d "$(PROTOC_TMP_DIR)" && \
 	  chmod 0755 "$(PROTOC_TMP_BIN)" && \
 	  cp -f "$(PROTOC_TMP_BIN)" "$@"
-	-rm -fr "$(PROTOC_TMP_DIR)"
 	stat "$@" > /dev/null 2>&1
 
 
@@ -58,8 +57,15 @@ $(PROTOC):
 # for protoc
 PROTOC_GEN_GO_PKG := github.com/golang/protobuf/protoc-gen-go
 PROTOC_GEN_GO := protoc-gen-go
+$(PROTOC_GEN_GO): PROTOBUF_PKG := $(dir $(PROTOC_GEN_GO_PKG))
+$(PROTOC_GEN_GO): PROTOBUF_VERSION := v1.1.0
 $(PROTOC_GEN_GO):
-	go get -d $(PROTOC_GEN_GO_PKG) && \
+	mkdir -p $(dir $(GOPATH)/src/$(PROTOBUF_PKG))
+	test -d $(GOPATH)/src/$(PROTOBUF_PKG)/.git || git clone https://$(PROTOBUF_PKG) $(GOPATH)/src/$(PROTOBUF_PKG)
+	(cd $(GOPATH)/src/$(PROTOBUF_PKG) && \
+		(test "$$(git describe --tags | head -1)" = "$(PROTOBUF_VERSION)" || \
+			(git fetch && git checkout tags/$(PROTOBUF_VERSION))))
+	(cd $(GOPATH)/src/$(PROTOBUF_PKG) && go get -v -d ./...) && \
 	go build -o "$@" $(PROTOC_GEN_GO_PKG)
 
 
@@ -83,9 +89,12 @@ CSI_A := csi.a
 CSI_GO_TMP := $(CSI_PKG)/.build/csi.pb.go
 
 # This recipe generates the go language bindings to a temp area.
+$(CSI_GO_TMP): GO_OUT := plugins=grpc
+$(CSI_GO_TMP): GO_OUT := $(GO_OUT),Mgoogle/protobuf/wrappers.proto=github.com/golang/protobuf/ptypes/wrappers
+$(CSI_GO_TMP): INCLUDE = -I$(PROTOC_TMP_DIR)/include
 $(CSI_GO_TMP): $(CSI_PROTO) | $(PROTOC) $(PROTOC_GEN_GO)
 	@mkdir -p "$(@D)"
-	$(PROTOC) -I "$(<D)" --go_out=plugins=grpc:"$(@D)" "$<"
+	$(PROTOC) -I "$(<D)" $(INCLUDE) --go_out=$(GO_OUT):"$(@D)" "$<"
 
 # The temp language bindings are compared to the ones that are
 # versioned. If they are different then it means the language
@@ -104,7 +113,7 @@ endif
 #   2. Cache the packages.
 #   3. Build the archive file.
 $(CSI_A): $(CSI_GO)
-	go get -d ./...
+	go get -v -d ./...
 	go install ./$(CSI_PKG)
 	go build -o "$@" ./$(CSI_PKG)
 
@@ -115,6 +124,6 @@ clean:
 	rm -f "$(CSI_A)"
 
 clobber: clean
-	rm -fr "$(PROTOC)" "$(PROTOC_GEN_GO)" "$(dir $(CSI_GO))"
+	rm -fr "$(PROTOC)" "$(PROTOC_GEN_GO)" "$(CSI_PKG)"
 
 .PHONY: clean clobber
diff --git a/vendor/github.com/container-storage-interface/spec/lib/go/csi/v0/csi.pb.go b/vendor/github.com/container-storage-interface/spec/lib/go/csi/v0/csi.pb.go
index 969362ff..612cfdd7 100644
--- a/vendor/github.com/container-storage-interface/spec/lib/go/csi/v0/csi.pb.go
+++ b/vendor/github.com/container-storage-interface/spec/lib/go/csi/v0/csi.pb.go
@@ -1,59 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: csi.proto
 
-/*
-Package csi is a generated protocol buffer package.
-
-It is generated from these files:
-	csi.proto
-
-It has these top-level messages:
-	GetPluginInfoRequest
-	GetPluginInfoResponse
-	GetPluginCapabilitiesRequest
-	GetPluginCapabilitiesResponse
-	PluginCapability
-	ProbeRequest
-	ProbeResponse
-	CreateVolumeRequest
-	CreateVolumeResponse
-	VolumeCapability
-	CapacityRange
-	Volume
-	DeleteVolumeRequest
-	DeleteVolumeResponse
-	ControllerPublishVolumeRequest
-	ControllerPublishVolumeResponse
-	ControllerUnpublishVolumeRequest
-	ControllerUnpublishVolumeResponse
-	ValidateVolumeCapabilitiesRequest
-	ValidateVolumeCapabilitiesResponse
-	ListVolumesRequest
-	ListVolumesResponse
-	GetCapacityRequest
-	GetCapacityResponse
-	ControllerGetCapabilitiesRequest
-	ControllerGetCapabilitiesResponse
-	ControllerServiceCapability
-	NodeStageVolumeRequest
-	NodeStageVolumeResponse
-	NodeUnstageVolumeRequest
-	NodeUnstageVolumeResponse
-	NodePublishVolumeRequest
-	NodePublishVolumeResponse
-	NodeUnpublishVolumeRequest
-	NodeUnpublishVolumeResponse
-	NodeGetIdRequest
-	NodeGetIdResponse
-	NodeGetCapabilitiesRequest
-	NodeGetCapabilitiesResponse
-	NodeServiceCapability
-*/
 package csi
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 
 import (
 	context "golang.org/x/net/context"
@@ -84,22 +37,31 @@ const (
 	// attempt to invoke the REQUIRED ControllerService RPCs, as well
 	// as specific RPCs as indicated by ControllerGetCapabilities.
 	PluginCapability_Service_CONTROLLER_SERVICE PluginCapability_Service_Type = 1
+	// ACCESSIBILITY_CONSTRAINTS indicates that the volumes for this
+	// plugin may not be equally accessible by all nodes in the
+	// cluster. The CO MUST use the topology information returned by
+	// CreateVolumeRequest along with the topology information
+	// returned by NodeGetInfo to ensure that a given volume is
+	// accessible from a given node when scheduling workloads.
+	PluginCapability_Service_ACCESSIBILITY_CONSTRAINTS PluginCapability_Service_Type = 2
 )
 
 var PluginCapability_Service_Type_name = map[int32]string{
 	0: "UNKNOWN",
 	1: "CONTROLLER_SERVICE",
+	2: "ACCESSIBILITY_CONSTRAINTS",
 }
 var PluginCapability_Service_Type_value = map[string]int32{
-	"UNKNOWN":            0,
-	"CONTROLLER_SERVICE": 1,
+	"UNKNOWN":                   0,
+	"CONTROLLER_SERVICE":        1,
+	"ACCESSIBILITY_CONSTRAINTS": 2,
 }
 
 func (x PluginCapability_Service_Type) String() string {
 	return proto.EnumName(PluginCapability_Service_Type_name, int32(x))
 }
 func (PluginCapability_Service_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{4, 0, 0}
+	return fileDescriptor_csi_31237507707d37ec, []int{4, 0, 0}
 }
 
 type VolumeCapability_AccessMode_Mode int32
@@ -143,7 +105,7 @@ func (x VolumeCapability_AccessMode_Mode) String() string {
 	return proto.EnumName(VolumeCapability_AccessMode_Mode_name, int32(x))
 }
 func (VolumeCapability_AccessMode_Mode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{9, 2, 0}
+	return fileDescriptor_csi_31237507707d37ec, []int{10, 2, 0}
 }
 
 type ControllerServiceCapability_RPC_Type int32
@@ -154,6 +116,16 @@ const (
 	ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME ControllerServiceCapability_RPC_Type = 2
 	ControllerServiceCapability_RPC_LIST_VOLUMES             ControllerServiceCapability_RPC_Type = 3
 	ControllerServiceCapability_RPC_GET_CAPACITY             ControllerServiceCapability_RPC_Type = 4
+	// Currently the only way to consume a snapshot is to create
+	// a volume from it. Therefore plugins supporting
+	// CREATE_DELETE_SNAPSHOT MUST support creating volume from
+	// snapshot.
+	ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT ControllerServiceCapability_RPC_Type = 5
+	// LIST_SNAPSHOTS is NOT REQUIRED. For plugins that need to upload
+	// a snapshot after it is being cut, LIST_SNAPSHOTS COULD be used
+	// with the snapshot_id as the filter to query whether the
+	// uploading process is complete or not.
+	ControllerServiceCapability_RPC_LIST_SNAPSHOTS ControllerServiceCapability_RPC_Type = 6
 )
 
 var ControllerServiceCapability_RPC_Type_name = map[int32]string{
@@ -162,6 +134,8 @@ var ControllerServiceCapability_RPC_Type_name = map[int32]string{
 	2: "PUBLISH_UNPUBLISH_VOLUME",
 	3: "LIST_VOLUMES",
 	4: "GET_CAPACITY",
+	5: "CREATE_DELETE_SNAPSHOT",
+	6: "LIST_SNAPSHOTS",
 }
 var ControllerServiceCapability_RPC_Type_value = map[string]int32{
 	"UNKNOWN":                  0,
@@ -169,13 +143,57 @@ var ControllerServiceCapability_RPC_Type_value = map[string]int32{
 	"PUBLISH_UNPUBLISH_VOLUME": 2,
 	"LIST_VOLUMES":             3,
 	"GET_CAPACITY":             4,
+	"CREATE_DELETE_SNAPSHOT":   5,
+	"LIST_SNAPSHOTS":           6,
 }
 
 func (x ControllerServiceCapability_RPC_Type) String() string {
 	return proto.EnumName(ControllerServiceCapability_RPC_Type_name, int32(x))
 }
 func (ControllerServiceCapability_RPC_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{26, 0, 0}
+	return fileDescriptor_csi_31237507707d37ec, []int{29, 0, 0}
+}
+
+type SnapshotStatus_Type int32
+
+const (
+	SnapshotStatus_UNKNOWN SnapshotStatus_Type = 0
+	// A snapshot is ready for use.
+	SnapshotStatus_READY SnapshotStatus_Type = 1
+	// A snapshot is cut and is now being uploaded.
+	// Some cloud providers and storage systems uploads the snapshot
+	// to the cloud after the snapshot is cut. During this phase,
+	// `thaw` can be done so the application can be running again if
+	// `freeze` was done before taking the snapshot.
+	SnapshotStatus_UPLOADING SnapshotStatus_Type = 2
+	// An error occurred during the snapshot uploading process.
+	// This error status is specific for uploading because
+	// `CreateSnaphot` is a blocking call before the snapshot is
+	// cut and therefore it SHOULD NOT come back with an error
+	// status when an error occurs. Instead a gRPC error code SHALL
+	// be returned by `CreateSnapshot` when an error occurs before
+	// a snapshot is cut.
+	SnapshotStatus_ERROR_UPLOADING SnapshotStatus_Type = 3
+)
+
+var SnapshotStatus_Type_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "READY",
+	2: "UPLOADING",
+	3: "ERROR_UPLOADING",
+}
+var SnapshotStatus_Type_value = map[string]int32{
+	"UNKNOWN":         0,
+	"READY":           1,
+	"UPLOADING":       2,
+	"ERROR_UPLOADING": 3,
+}
+
+func (x SnapshotStatus_Type) String() string {
+	return proto.EnumName(SnapshotStatus_Type_name, int32(x))
+}
+func (SnapshotStatus_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{33, 0}
 }
 
 type NodeServiceCapability_RPC_Type int32
@@ -198,16 +216,38 @@ func (x NodeServiceCapability_RPC_Type) String() string {
 	return proto.EnumName(NodeServiceCapability_RPC_Type_name, int32(x))
 }
 func (NodeServiceCapability_RPC_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{39, 0, 0}
+	return fileDescriptor_csi_31237507707d37ec, []int{50, 0, 0}
 }
 
 type GetPluginInfoRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetPluginInfoRequest) Reset()         { *m = GetPluginInfoRequest{} }
+func (m *GetPluginInfoRequest) String() string { return proto.CompactTextString(m) }
+func (*GetPluginInfoRequest) ProtoMessage()    {}
+func (*GetPluginInfoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{0}
+}
+func (m *GetPluginInfoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetPluginInfoRequest.Unmarshal(m, b)
+}
+func (m *GetPluginInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetPluginInfoRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetPluginInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPluginInfoRequest.Merge(dst, src)
+}
+func (m *GetPluginInfoRequest) XXX_Size() int {
+	return xxx_messageInfo_GetPluginInfoRequest.Size(m)
+}
+func (m *GetPluginInfoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetPluginInfoRequest.DiscardUnknown(m)
 }
 
-func (m *GetPluginInfoRequest) Reset()                    { *m = GetPluginInfoRequest{} }
-func (m *GetPluginInfoRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetPluginInfoRequest) ProtoMessage()               {}
-func (*GetPluginInfoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_GetPluginInfoRequest proto.InternalMessageInfo
 
 type GetPluginInfoResponse struct {
 	// The name MUST follow reverse domain name notation format
@@ -221,13 +261,35 @@ type GetPluginInfoResponse struct {
 	// This field is REQUIRED. Value of this field is opaque to the CO.
 	VendorVersion string `protobuf:"bytes,2,opt,name=vendor_version,json=vendorVersion" json:"vendor_version,omitempty"`
 	// This field is OPTIONAL. Values are opaque to the CO.
-	Manifest map[string]string `protobuf:"bytes,3,rep,name=manifest" json:"manifest,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Manifest             map[string]string `protobuf:"bytes,3,rep,name=manifest" json:"manifest,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 (m *GetPluginInfoResponse) Reset()         { *m = GetPluginInfoResponse{} }
+func (m *GetPluginInfoResponse) String() string { return proto.CompactTextString(m) }
+func (*GetPluginInfoResponse) ProtoMessage()    {}
+func (*GetPluginInfoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{1}
+}
+func (m *GetPluginInfoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetPluginInfoResponse.Unmarshal(m, b)
+}
+func (m *GetPluginInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetPluginInfoResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetPluginInfoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPluginInfoResponse.Merge(dst, src)
+}
+func (m *GetPluginInfoResponse) XXX_Size() int {
+	return xxx_messageInfo_GetPluginInfoResponse.Size(m)
+}
+func (m *GetPluginInfoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetPluginInfoResponse.DiscardUnknown(m)
 }
 
-func (m *GetPluginInfoResponse) Reset()                    { *m = GetPluginInfoResponse{} }
-func (m *GetPluginInfoResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetPluginInfoResponse) ProtoMessage()               {}
-func (*GetPluginInfoResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_GetPluginInfoResponse proto.InternalMessageInfo
 
 func (m *GetPluginInfoResponse) GetName() string {
 	if m != nil {
@@ -251,23 +313,67 @@ func (m *GetPluginInfoResponse) GetManifest() map[string]string {
 }
 
 type GetPluginCapabilitiesRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetPluginCapabilitiesRequest) Reset()         { *m = GetPluginCapabilitiesRequest{} }
+func (m *GetPluginCapabilitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*GetPluginCapabilitiesRequest) ProtoMessage()    {}
+func (*GetPluginCapabilitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{2}
+}
+func (m *GetPluginCapabilitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetPluginCapabilitiesRequest.Unmarshal(m, b)
+}
+func (m *GetPluginCapabilitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetPluginCapabilitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetPluginCapabilitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPluginCapabilitiesRequest.Merge(dst, src)
+}
+func (m *GetPluginCapabilitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_GetPluginCapabilitiesRequest.Size(m)
+}
+func (m *GetPluginCapabilitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetPluginCapabilitiesRequest.DiscardUnknown(m)
 }
 
-func (m *GetPluginCapabilitiesRequest) Reset()                    { *m = GetPluginCapabilitiesRequest{} }
-func (m *GetPluginCapabilitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetPluginCapabilitiesRequest) ProtoMessage()               {}
-func (*GetPluginCapabilitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_GetPluginCapabilitiesRequest proto.InternalMessageInfo
 
 type GetPluginCapabilitiesResponse struct {
 	// All the capabilities that the controller service supports. This
 	// field is OPTIONAL.
-	Capabilities []*PluginCapability `protobuf:"bytes,2,rep,name=capabilities" json:"capabilities,omitempty"`
+	Capabilities         []*PluginCapability `protobuf:"bytes,2,rep,name=capabilities" json:"capabilities,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *GetPluginCapabilitiesResponse) Reset()                    { *m = GetPluginCapabilitiesResponse{} }
-func (m *GetPluginCapabilitiesResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetPluginCapabilitiesResponse) ProtoMessage()               {}
-func (*GetPluginCapabilitiesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *GetPluginCapabilitiesResponse) Reset()         { *m = GetPluginCapabilitiesResponse{} }
+func (m *GetPluginCapabilitiesResponse) String() string { return proto.CompactTextString(m) }
+func (*GetPluginCapabilitiesResponse) ProtoMessage()    {}
+func (*GetPluginCapabilitiesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{3}
+}
+func (m *GetPluginCapabilitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetPluginCapabilitiesResponse.Unmarshal(m, b)
+}
+func (m *GetPluginCapabilitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetPluginCapabilitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetPluginCapabilitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPluginCapabilitiesResponse.Merge(dst, src)
+}
+func (m *GetPluginCapabilitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_GetPluginCapabilitiesResponse.Size(m)
+}
+func (m *GetPluginCapabilitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetPluginCapabilitiesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetPluginCapabilitiesResponse proto.InternalMessageInfo
 
 func (m *GetPluginCapabilitiesResponse) GetCapabilities() []*PluginCapability {
 	if m != nil {
@@ -280,13 +386,35 @@ func (m *GetPluginCapabilitiesResponse) GetCapabilities() []*PluginCapability {
 type PluginCapability struct {
 	// Types that are valid to be assigned to Type:
 	//	*PluginCapability_Service_
-	Type isPluginCapability_Type `protobuf_oneof:"type"`
+	Type                 isPluginCapability_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *PluginCapability) Reset()         { *m = PluginCapability{} }
+func (m *PluginCapability) String() string { return proto.CompactTextString(m) }
+func (*PluginCapability) ProtoMessage()    {}
+func (*PluginCapability) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{4}
+}
+func (m *PluginCapability) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PluginCapability.Unmarshal(m, b)
+}
+func (m *PluginCapability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PluginCapability.Marshal(b, m, deterministic)
+}
+func (dst *PluginCapability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PluginCapability.Merge(dst, src)
+}
+func (m *PluginCapability) XXX_Size() int {
+	return xxx_messageInfo_PluginCapability.Size(m)
+}
+func (m *PluginCapability) XXX_DiscardUnknown() {
+	xxx_messageInfo_PluginCapability.DiscardUnknown(m)
 }
 
-func (m *PluginCapability) Reset()                    { *m = PluginCapability{} }
-func (m *PluginCapability) String() string            { return proto.CompactTextString(m) }
-func (*PluginCapability) ProtoMessage()               {}
-func (*PluginCapability) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_PluginCapability proto.InternalMessageInfo
 
 type isPluginCapability_Type interface {
 	isPluginCapability_Type()
@@ -357,7 +485,7 @@ func _PluginCapability_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Type.(type) {
 	case *PluginCapability_Service_:
 		s := proto.Size(x.Service)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -368,13 +496,35 @@ func _PluginCapability_OneofSizer(msg proto.Message) (n int) {
 }
 
 type PluginCapability_Service struct {
-	Type PluginCapability_Service_Type `protobuf:"varint,1,opt,name=type,enum=csi.v0.PluginCapability_Service_Type" json:"type,omitempty"`
+	Type                 PluginCapability_Service_Type `protobuf:"varint,1,opt,name=type,enum=csi.v0.PluginCapability_Service_Type" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *PluginCapability_Service) Reset()         { *m = PluginCapability_Service{} }
+func (m *PluginCapability_Service) String() string { return proto.CompactTextString(m) }
+func (*PluginCapability_Service) ProtoMessage()    {}
+func (*PluginCapability_Service) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{4, 0}
+}
+func (m *PluginCapability_Service) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PluginCapability_Service.Unmarshal(m, b)
+}
+func (m *PluginCapability_Service) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PluginCapability_Service.Marshal(b, m, deterministic)
+}
+func (dst *PluginCapability_Service) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PluginCapability_Service.Merge(dst, src)
+}
+func (m *PluginCapability_Service) XXX_Size() int {
+	return xxx_messageInfo_PluginCapability_Service.Size(m)
+}
+func (m *PluginCapability_Service) XXX_DiscardUnknown() {
+	xxx_messageInfo_PluginCapability_Service.DiscardUnknown(m)
 }
 
-func (m *PluginCapability_Service) Reset()                    { *m = PluginCapability_Service{} }
-func (m *PluginCapability_Service) String() string            { return proto.CompactTextString(m) }
-func (*PluginCapability_Service) ProtoMessage()               {}
-func (*PluginCapability_Service) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
+var xxx_messageInfo_PluginCapability_Service proto.InternalMessageInfo
 
 func (m *PluginCapability_Service) GetType() PluginCapability_Service_Type {
 	if m != nil {
@@ -384,20 +534,92 @@ func (m *PluginCapability_Service) GetType() PluginCapability_Service_Type {
 }
 
 type ProbeRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ProbeRequest) Reset()         { *m = ProbeRequest{} }
+func (m *ProbeRequest) String() string { return proto.CompactTextString(m) }
+func (*ProbeRequest) ProtoMessage()    {}
+func (*ProbeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{5}
+}
+func (m *ProbeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProbeRequest.Unmarshal(m, b)
+}
+func (m *ProbeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProbeRequest.Marshal(b, m, deterministic)
+}
+func (dst *ProbeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProbeRequest.Merge(dst, src)
+}
+func (m *ProbeRequest) XXX_Size() int {
+	return xxx_messageInfo_ProbeRequest.Size(m)
+}
+func (m *ProbeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProbeRequest.DiscardUnknown(m)
 }
 
-func (m *ProbeRequest) Reset()                    { *m = ProbeRequest{} }
-func (m *ProbeRequest) String() string            { return proto.CompactTextString(m) }
-func (*ProbeRequest) ProtoMessage()               {}
-func (*ProbeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_ProbeRequest proto.InternalMessageInfo
 
 type ProbeResponse struct {
+	// Readiness allows a plugin to report its initialization status back
+	// to the CO. Initialization for some plugins MAY be time consuming
+	// and it is important for a CO to distinguish between the following
+	// cases:
+	//
+	// 1) The plugin is in an unhealthy state and MAY need restarting. In
+	//    this case a gRPC error code SHALL be returned.
+	// 2) The plugin is still initializing, but is otherwise perfectly
+	//    healthy. In this case a successful response SHALL be returned
+	//    with a readiness value of `false`. Calls to the plugin's
+	//    Controller and/or Node services MAY fail due to an incomplete
+	//    initialization state.
+	// 3) The plugin has finished initializing and is ready to service
+	//    calls to its Controller and/or Node services. A successful
+	//    response is returned with a readiness value of `true`.
+	//
+	// This field is OPTIONAL. If not present, the caller SHALL assume
+	// that the plugin is in a ready state and is accepting calls to its
+	// Controller and/or Node services (according to the plugin's reported
+	// capabilities).
+	Ready                *wrappers.BoolValue `protobuf:"bytes,1,opt,name=ready" json:"ready,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *ProbeResponse) Reset()         { *m = ProbeResponse{} }
+func (m *ProbeResponse) String() string { return proto.CompactTextString(m) }
+func (*ProbeResponse) ProtoMessage()    {}
+func (*ProbeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{6}
 }
+func (m *ProbeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProbeResponse.Unmarshal(m, b)
+}
+func (m *ProbeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProbeResponse.Marshal(b, m, deterministic)
+}
+func (dst *ProbeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProbeResponse.Merge(dst, src)
+}
+func (m *ProbeResponse) XXX_Size() int {
+	return xxx_messageInfo_ProbeResponse.Size(m)
+}
+func (m *ProbeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProbeResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ProbeResponse proto.InternalMessageInfo
 
-func (m *ProbeResponse) Reset()                    { *m = ProbeResponse{} }
-func (m *ProbeResponse) String() string            { return proto.CompactTextString(m) }
-func (*ProbeResponse) ProtoMessage()               {}
-func (*ProbeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *ProbeResponse) GetReady() *wrappers.BoolValue {
+	if m != nil {
+		return m.Ready
+	}
+	return nil
+}
 
 type CreateVolumeRequest struct {
 	// The suggested name for the storage space. This field is REQUIRED.
@@ -415,10 +637,7 @@ type CreateVolumeRequest struct {
 	//    an identifier by which to refer to the newly provisioned
 	//    storage. If a storage system supports this, it can optionally
 	//    use this name as the identifier for the new volume.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// This field is OPTIONAL. This allows the CO to specify the capacity
-	// requirement of the volume to be provisioned. If not specified, the
-	// Plugin MAY choose an implementation-defined capacity range.
+	Name          string         `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	CapacityRange *CapacityRange `protobuf:"bytes,2,opt,name=capacity_range,json=capacityRange" json:"capacity_range,omitempty"`
 	// The capabilities that the provisioned volume MUST have: the Plugin
 	// MUST provision a volume that could satisfy ALL of the
@@ -434,29 +653,52 @@ type CreateVolumeRequest struct {
 	// validating these parameters. COs will treat these as opaque.
 	Parameters map[string]string `protobuf:"bytes,4,rep,name=parameters" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Secrets required by plugin to complete volume creation request.
-	// A secret is a string to string map where the key identifies the
-	// name of the secret (e.g. "username" or "password"), and the value
-	// contains the secret data (e.g. "bob" or "abc123").
-	// Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-	// Each value MUST contain a valid string. An SP MAY choose to accept
-	// binary (non-string) data by using a binary-to-text encoding scheme,
-	// like base64.
-	// An SP SHALL advertise the requirements for required secret keys and
-	// values in documentation.
-	// CO SHALL permit passing through the required secrets.
-	// A CO MAY pass the same secrets to all RPCs, therefore the keys for
-	// all unique secrets that an SP expects must be unique across all CSI
-	// operations.
-	// This information is sensitive and MUST be treated as such (not
-	// logged, etc.) by the CO.
-	// This field is OPTIONAL.
+	// This field is OPTIONAL. Refer to the `Secrets Requirements`
+	// section on how to use this field.
 	ControllerCreateSecrets map[string]string `protobuf:"bytes,5,rep,name=controller_create_secrets,json=controllerCreateSecrets" json:"controller_create_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// If specified, the new volume will be pre-populated with data from
+	// this source. This field is OPTIONAL.
+	VolumeContentSource *VolumeContentSource `protobuf:"bytes,6,opt,name=volume_content_source,json=volumeContentSource" json:"volume_content_source,omitempty"`
+	// Specifies where (regions, zones, racks, etc.) the provisioned
+	// volume MUST be accessible from.
+	// An SP SHALL advertise the requirements for topological
+	// accessibility information in documentation. COs SHALL only specify
+	// topological accessibility information supported by the SP.
+	// This field is OPTIONAL.
+	// This field SHALL NOT be specified unless the SP has the
+	// ACCESSIBILITY_CONSTRAINTS plugin capability.
+	// If this field is not specified and the SP has the
+	// ACCESSIBILITY_CONSTRAINTS plugin capability, the SP MAY choose
+	// where the provisioned volume is accessible from.
+	AccessibilityRequirements *TopologyRequirement `protobuf:"bytes,7,opt,name=accessibility_requirements,json=accessibilityRequirements" json:"accessibility_requirements,omitempty"`
+	XXX_NoUnkeyedLiteral      struct{}             `json:"-"`
+	XXX_unrecognized          []byte               `json:"-"`
+	XXX_sizecache             int32                `json:"-"`
+}
+
+func (m *CreateVolumeRequest) Reset()         { *m = CreateVolumeRequest{} }
+func (m *CreateVolumeRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateVolumeRequest) ProtoMessage()    {}
+func (*CreateVolumeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{7}
+}
+func (m *CreateVolumeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateVolumeRequest.Unmarshal(m, b)
+}
+func (m *CreateVolumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateVolumeRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateVolumeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVolumeRequest.Merge(dst, src)
+}
+func (m *CreateVolumeRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateVolumeRequest.Size(m)
+}
+func (m *CreateVolumeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateVolumeRequest.DiscardUnknown(m)
 }
 
-func (m *CreateVolumeRequest) Reset()                    { *m = CreateVolumeRequest{} }
-func (m *CreateVolumeRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateVolumeRequest) ProtoMessage()               {}
-func (*CreateVolumeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_CreateVolumeRequest proto.InternalMessageInfo
 
 func (m *CreateVolumeRequest) GetName() string {
 	if m != nil {
@@ -493,17 +735,209 @@ func (m *CreateVolumeRequest) GetControllerCreateSecrets() map[string]string {
 	return nil
 }
 
+func (m *CreateVolumeRequest) GetVolumeContentSource() *VolumeContentSource {
+	if m != nil {
+		return m.VolumeContentSource
+	}
+	return nil
+}
+
+func (m *CreateVolumeRequest) GetAccessibilityRequirements() *TopologyRequirement {
+	if m != nil {
+		return m.AccessibilityRequirements
+	}
+	return nil
+}
+
+// Specifies what source the volume will be created from. One of the
+// type fields MUST be specified.
+type VolumeContentSource struct {
+	// Types that are valid to be assigned to Type:
+	//	*VolumeContentSource_Snapshot
+	Type                 isVolumeContentSource_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *VolumeContentSource) Reset()         { *m = VolumeContentSource{} }
+func (m *VolumeContentSource) String() string { return proto.CompactTextString(m) }
+func (*VolumeContentSource) ProtoMessage()    {}
+func (*VolumeContentSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{8}
+}
+func (m *VolumeContentSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VolumeContentSource.Unmarshal(m, b)
+}
+func (m *VolumeContentSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VolumeContentSource.Marshal(b, m, deterministic)
+}
+func (dst *VolumeContentSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VolumeContentSource.Merge(dst, src)
+}
+func (m *VolumeContentSource) XXX_Size() int {
+	return xxx_messageInfo_VolumeContentSource.Size(m)
+}
+func (m *VolumeContentSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_VolumeContentSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VolumeContentSource proto.InternalMessageInfo
+
+type isVolumeContentSource_Type interface {
+	isVolumeContentSource_Type()
+}
+
+type VolumeContentSource_Snapshot struct {
+	Snapshot *VolumeContentSource_SnapshotSource `protobuf:"bytes,1,opt,name=snapshot,oneof"`
+}
+
+func (*VolumeContentSource_Snapshot) isVolumeContentSource_Type() {}
+
+func (m *VolumeContentSource) GetType() isVolumeContentSource_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *VolumeContentSource) GetSnapshot() *VolumeContentSource_SnapshotSource {
+	if x, ok := m.GetType().(*VolumeContentSource_Snapshot); ok {
+		return x.Snapshot
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*VolumeContentSource) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _VolumeContentSource_OneofMarshaler, _VolumeContentSource_OneofUnmarshaler, _VolumeContentSource_OneofSizer, []interface{}{
+		(*VolumeContentSource_Snapshot)(nil),
+	}
+}
+
+func _VolumeContentSource_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*VolumeContentSource)
+	// type
+	switch x := m.Type.(type) {
+	case *VolumeContentSource_Snapshot:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Snapshot); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("VolumeContentSource.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _VolumeContentSource_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*VolumeContentSource)
+	switch tag {
+	case 1: // type.snapshot
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(VolumeContentSource_SnapshotSource)
+		err := b.DecodeMessage(msg)
+		m.Type = &VolumeContentSource_Snapshot{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _VolumeContentSource_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*VolumeContentSource)
+	// type
+	switch x := m.Type.(type) {
+	case *VolumeContentSource_Snapshot:
+		s := proto.Size(x.Snapshot)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type VolumeContentSource_SnapshotSource struct {
+	// Contains identity information for the existing source snapshot.
+	// This field is REQUIRED. Plugin is REQUIRED to support creating
+	// volume from snapshot if it supports the capability
+	// CREATE_DELETE_SNAPSHOT.
+	Id                   string   `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *VolumeContentSource_SnapshotSource) Reset()         { *m = VolumeContentSource_SnapshotSource{} }
+func (m *VolumeContentSource_SnapshotSource) String() string { return proto.CompactTextString(m) }
+func (*VolumeContentSource_SnapshotSource) ProtoMessage()    {}
+func (*VolumeContentSource_SnapshotSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{8, 0}
+}
+func (m *VolumeContentSource_SnapshotSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VolumeContentSource_SnapshotSource.Unmarshal(m, b)
+}
+func (m *VolumeContentSource_SnapshotSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VolumeContentSource_SnapshotSource.Marshal(b, m, deterministic)
+}
+func (dst *VolumeContentSource_SnapshotSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VolumeContentSource_SnapshotSource.Merge(dst, src)
+}
+func (m *VolumeContentSource_SnapshotSource) XXX_Size() int {
+	return xxx_messageInfo_VolumeContentSource_SnapshotSource.Size(m)
+}
+func (m *VolumeContentSource_SnapshotSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_VolumeContentSource_SnapshotSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VolumeContentSource_SnapshotSource proto.InternalMessageInfo
+
+func (m *VolumeContentSource_SnapshotSource) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
 type CreateVolumeResponse struct {
 	// Contains all attributes of the newly created volume that are
 	// relevant to the CO along with information required by the Plugin
 	// to uniquely identify the volume. This field is REQUIRED.
-	Volume *Volume `protobuf:"bytes,1,opt,name=volume" json:"volume,omitempty"`
+	Volume               *Volume  `protobuf:"bytes,1,opt,name=volume" json:"volume,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateVolumeResponse) Reset()         { *m = CreateVolumeResponse{} }
+func (m *CreateVolumeResponse) String() string { return proto.CompactTextString(m) }
+func (*CreateVolumeResponse) ProtoMessage()    {}
+func (*CreateVolumeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{9}
+}
+func (m *CreateVolumeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateVolumeResponse.Unmarshal(m, b)
+}
+func (m *CreateVolumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateVolumeResponse.Marshal(b, m, deterministic)
+}
+func (dst *CreateVolumeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVolumeResponse.Merge(dst, src)
+}
+func (m *CreateVolumeResponse) XXX_Size() int {
+	return xxx_messageInfo_CreateVolumeResponse.Size(m)
+}
+func (m *CreateVolumeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateVolumeResponse.DiscardUnknown(m)
 }
 
-func (m *CreateVolumeResponse) Reset()                    { *m = CreateVolumeResponse{} }
-func (m *CreateVolumeResponse) String() string            { return proto.CompactTextString(m) }
-func (*CreateVolumeResponse) ProtoMessage()               {}
-func (*CreateVolumeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_CreateVolumeResponse proto.InternalMessageInfo
 
 func (m *CreateVolumeResponse) GetVolume() *Volume {
 	if m != nil {
@@ -522,13 +956,35 @@ type VolumeCapability struct {
 	//	*VolumeCapability_Mount
 	AccessType isVolumeCapability_AccessType `protobuf_oneof:"access_type"`
 	// This is a REQUIRED field.
-	AccessMode *VolumeCapability_AccessMode `protobuf:"bytes,3,opt,name=access_mode,json=accessMode" json:"access_mode,omitempty"`
+	AccessMode           *VolumeCapability_AccessMode `protobuf:"bytes,3,opt,name=access_mode,json=accessMode" json:"access_mode,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *VolumeCapability) Reset()         { *m = VolumeCapability{} }
+func (m *VolumeCapability) String() string { return proto.CompactTextString(m) }
+func (*VolumeCapability) ProtoMessage()    {}
+func (*VolumeCapability) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{10}
+}
+func (m *VolumeCapability) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VolumeCapability.Unmarshal(m, b)
+}
+func (m *VolumeCapability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VolumeCapability.Marshal(b, m, deterministic)
+}
+func (dst *VolumeCapability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VolumeCapability.Merge(dst, src)
+}
+func (m *VolumeCapability) XXX_Size() int {
+	return xxx_messageInfo_VolumeCapability.Size(m)
+}
+func (m *VolumeCapability) XXX_DiscardUnknown() {
+	xxx_messageInfo_VolumeCapability.DiscardUnknown(m)
 }
 
-func (m *VolumeCapability) Reset()                    { *m = VolumeCapability{} }
-func (m *VolumeCapability) String() string            { return proto.CompactTextString(m) }
-func (*VolumeCapability) ProtoMessage()               {}
-func (*VolumeCapability) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_VolumeCapability proto.InternalMessageInfo
 
 type isVolumeCapability_AccessType interface {
 	isVolumeCapability_AccessType()
@@ -631,12 +1087,12 @@ func _VolumeCapability_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.AccessType.(type) {
 	case *VolumeCapability_Block:
 		s := proto.Size(x.Block)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *VolumeCapability_Mount:
 		s := proto.Size(x.Mount)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -648,12 +1104,34 @@ func _VolumeCapability_OneofSizer(msg proto.Message) (n int) {
 
 // Indicate that the volume will be accessed via the block device API.
 type VolumeCapability_BlockVolume struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *VolumeCapability_BlockVolume) Reset()         { *m = VolumeCapability_BlockVolume{} }
+func (m *VolumeCapability_BlockVolume) String() string { return proto.CompactTextString(m) }
+func (*VolumeCapability_BlockVolume) ProtoMessage()    {}
+func (*VolumeCapability_BlockVolume) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{10, 0}
+}
+func (m *VolumeCapability_BlockVolume) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VolumeCapability_BlockVolume.Unmarshal(m, b)
+}
+func (m *VolumeCapability_BlockVolume) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VolumeCapability_BlockVolume.Marshal(b, m, deterministic)
+}
+func (dst *VolumeCapability_BlockVolume) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VolumeCapability_BlockVolume.Merge(dst, src)
+}
+func (m *VolumeCapability_BlockVolume) XXX_Size() int {
+	return xxx_messageInfo_VolumeCapability_BlockVolume.Size(m)
+}
+func (m *VolumeCapability_BlockVolume) XXX_DiscardUnknown() {
+	xxx_messageInfo_VolumeCapability_BlockVolume.DiscardUnknown(m)
 }
 
-func (m *VolumeCapability_BlockVolume) Reset()                    { *m = VolumeCapability_BlockVolume{} }
-func (m *VolumeCapability_BlockVolume) String() string            { return proto.CompactTextString(m) }
-func (*VolumeCapability_BlockVolume) ProtoMessage()               {}
-func (*VolumeCapability_BlockVolume) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
+var xxx_messageInfo_VolumeCapability_BlockVolume proto.InternalMessageInfo
 
 // Indicate that the volume will be accessed via the filesystem API.
 type VolumeCapability_MountVolume struct {
@@ -665,13 +1143,35 @@ type VolumeCapability_MountVolume struct {
 	// Therefore, the CO and the Plugin MUST NOT leak this information
 	// to untrusted entities. The total size of this repeated field
 	// SHALL NOT exceed 4 KiB.
-	MountFlags []string `protobuf:"bytes,2,rep,name=mount_flags,json=mountFlags" json:"mount_flags,omitempty"`
+	MountFlags           []string `protobuf:"bytes,2,rep,name=mount_flags,json=mountFlags" json:"mount_flags,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *VolumeCapability_MountVolume) Reset()         { *m = VolumeCapability_MountVolume{} }
+func (m *VolumeCapability_MountVolume) String() string { return proto.CompactTextString(m) }
+func (*VolumeCapability_MountVolume) ProtoMessage()    {}
+func (*VolumeCapability_MountVolume) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{10, 1}
+}
+func (m *VolumeCapability_MountVolume) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VolumeCapability_MountVolume.Unmarshal(m, b)
+}
+func (m *VolumeCapability_MountVolume) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VolumeCapability_MountVolume.Marshal(b, m, deterministic)
+}
+func (dst *VolumeCapability_MountVolume) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VolumeCapability_MountVolume.Merge(dst, src)
+}
+func (m *VolumeCapability_MountVolume) XXX_Size() int {
+	return xxx_messageInfo_VolumeCapability_MountVolume.Size(m)
+}
+func (m *VolumeCapability_MountVolume) XXX_DiscardUnknown() {
+	xxx_messageInfo_VolumeCapability_MountVolume.DiscardUnknown(m)
 }
 
-func (m *VolumeCapability_MountVolume) Reset()                    { *m = VolumeCapability_MountVolume{} }
-func (m *VolumeCapability_MountVolume) String() string            { return proto.CompactTextString(m) }
-func (*VolumeCapability_MountVolume) ProtoMessage()               {}
-func (*VolumeCapability_MountVolume) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 1} }
+var xxx_messageInfo_VolumeCapability_MountVolume proto.InternalMessageInfo
 
 func (m *VolumeCapability_MountVolume) GetFsType() string {
 	if m != nil {
@@ -690,13 +1190,35 @@ func (m *VolumeCapability_MountVolume) GetMountFlags() []string {
 // Specify how a volume can be accessed.
 type VolumeCapability_AccessMode struct {
 	// This field is REQUIRED.
-	Mode VolumeCapability_AccessMode_Mode `protobuf:"varint,1,opt,name=mode,enum=csi.v0.VolumeCapability_AccessMode_Mode" json:"mode,omitempty"`
+	Mode                 VolumeCapability_AccessMode_Mode `protobuf:"varint,1,opt,name=mode,enum=csi.v0.VolumeCapability_AccessMode_Mode" json:"mode,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
+	XXX_unrecognized     []byte                           `json:"-"`
+	XXX_sizecache        int32                            `json:"-"`
+}
+
+func (m *VolumeCapability_AccessMode) Reset()         { *m = VolumeCapability_AccessMode{} }
+func (m *VolumeCapability_AccessMode) String() string { return proto.CompactTextString(m) }
+func (*VolumeCapability_AccessMode) ProtoMessage()    {}
+func (*VolumeCapability_AccessMode) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{10, 2}
+}
+func (m *VolumeCapability_AccessMode) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VolumeCapability_AccessMode.Unmarshal(m, b)
+}
+func (m *VolumeCapability_AccessMode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VolumeCapability_AccessMode.Marshal(b, m, deterministic)
+}
+func (dst *VolumeCapability_AccessMode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VolumeCapability_AccessMode.Merge(dst, src)
+}
+func (m *VolumeCapability_AccessMode) XXX_Size() int {
+	return xxx_messageInfo_VolumeCapability_AccessMode.Size(m)
+}
+func (m *VolumeCapability_AccessMode) XXX_DiscardUnknown() {
+	xxx_messageInfo_VolumeCapability_AccessMode.DiscardUnknown(m)
 }
 
-func (m *VolumeCapability_AccessMode) Reset()                    { *m = VolumeCapability_AccessMode{} }
-func (m *VolumeCapability_AccessMode) String() string            { return proto.CompactTextString(m) }
-func (*VolumeCapability_AccessMode) ProtoMessage()               {}
-func (*VolumeCapability_AccessMode) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 2} }
+var xxx_messageInfo_VolumeCapability_AccessMode proto.InternalMessageInfo
 
 func (m *VolumeCapability_AccessMode) GetMode() VolumeCapability_AccessMode_Mode {
 	if m != nil {
@@ -706,23 +1228,45 @@ func (m *VolumeCapability_AccessMode) GetMode() VolumeCapability_AccessMode_Mode
 }
 
 // The capacity of the storage space in bytes. To specify an exact size,
-// `required_bytes` and `limit_bytes` can be set to the same value. At
+// `required_bytes` and `limit_bytes` SHALL be set to the same value. At
 // least one of the these fields MUST be specified.
 type CapacityRange struct {
-	// Volume must be at least this big. This field is OPTIONAL.
+	// Volume MUST be at least this big. This field is OPTIONAL.
 	// A value of 0 is equal to an unspecified field value.
 	// The value of this field MUST NOT be negative.
 	RequiredBytes int64 `protobuf:"varint,1,opt,name=required_bytes,json=requiredBytes" json:"required_bytes,omitempty"`
-	// Volume must not be bigger than this. This field is OPTIONAL.
+	// Volume MUST not be bigger than this. This field is OPTIONAL.
 	// A value of 0 is equal to an unspecified field value.
 	// The value of this field MUST NOT be negative.
-	LimitBytes int64 `protobuf:"varint,2,opt,name=limit_bytes,json=limitBytes" json:"limit_bytes,omitempty"`
+	LimitBytes           int64    `protobuf:"varint,2,opt,name=limit_bytes,json=limitBytes" json:"limit_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CapacityRange) Reset()                    { *m = CapacityRange{} }
-func (m *CapacityRange) String() string            { return proto.CompactTextString(m) }
-func (*CapacityRange) ProtoMessage()               {}
-func (*CapacityRange) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *CapacityRange) Reset()         { *m = CapacityRange{} }
+func (m *CapacityRange) String() string { return proto.CompactTextString(m) }
+func (*CapacityRange) ProtoMessage()    {}
+func (*CapacityRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{11}
+}
+func (m *CapacityRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CapacityRange.Unmarshal(m, b)
+}
+func (m *CapacityRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CapacityRange.Marshal(b, m, deterministic)
+}
+func (dst *CapacityRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CapacityRange.Merge(dst, src)
+}
+func (m *CapacityRange) XXX_Size() int {
+	return xxx_messageInfo_CapacityRange.Size(m)
+}
+func (m *CapacityRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_CapacityRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CapacityRange proto.InternalMessageInfo
 
 func (m *CapacityRange) GetRequiredBytes() int64 {
 	if m != nil {
@@ -758,12 +1302,64 @@ type Volume struct {
 	// the same attributes. This field is OPTIONAL and when present MUST
 	// be passed to volume validation and publishing calls.
 	Attributes map[string]string `protobuf:"bytes,3,rep,name=attributes" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// If specified, indicates that the volume is not empty and is
+	// pre-populated with data from the specified source.
+	// This field is OPTIONAL.
+	ContentSource *VolumeContentSource `protobuf:"bytes,4,opt,name=content_source,json=contentSource" json:"content_source,omitempty"`
+	// Specifies where (regions, zones, racks, etc.) the provisioned
+	// volume is accessible from.
+	// A plugin that returns this field MUST also set the
+	// ACCESSIBILITY_CONSTRAINTS plugin capability.
+	// An SP MAY specify multiple topologies to indicate the volume is
+	// accessible from multiple locations.
+	// COs MAY use this information along with the topology information
+	// returned by NodeGetInfo to ensure that a given volume is accessible
+	// from a given node when scheduling workloads.
+	// This field is OPTIONAL. If it is not specified, the CO MAY assume
+	// the volume is equally accessible from all nodes in the cluster and
+	// may schedule workloads referencing the volume on any available
+	// node.
+	//
+	// Example 1:
+	//   accessible_topology = {"region": "R1", "zone": "Z2"}
+	// Indicates a volume accessible only from the "region" "R1" and the
+	// "zone" "Z2".
+	//
+	// Example 2:
+	//   accessible_topology =
+	//     {"region": "R1", "zone": "Z2"},
+	//     {"region": "R1", "zone": "Z3"}
+	// Indicates a volume accessible from both "zone" "Z2" and "zone" "Z3"
+	// in the "region" "R1".
+	AccessibleTopology   []*Topology `protobuf:"bytes,5,rep,name=accessible_topology,json=accessibleTopology" json:"accessible_topology,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *Volume) Reset()         { *m = Volume{} }
+func (m *Volume) String() string { return proto.CompactTextString(m) }
+func (*Volume) ProtoMessage()    {}
+func (*Volume) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{12}
+}
+func (m *Volume) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Volume.Unmarshal(m, b)
+}
+func (m *Volume) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Volume.Marshal(b, m, deterministic)
+}
+func (dst *Volume) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Volume.Merge(dst, src)
+}
+func (m *Volume) XXX_Size() int {
+	return xxx_messageInfo_Volume.Size(m)
+}
+func (m *Volume) XXX_DiscardUnknown() {
+	xxx_messageInfo_Volume.DiscardUnknown(m)
 }
 
-func (m *Volume) Reset()                    { *m = Volume{} }
-func (m *Volume) String() string            { return proto.CompactTextString(m) }
-func (*Volume) ProtoMessage()               {}
-func (*Volume) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_Volume proto.InternalMessageInfo
 
 func (m *Volume) GetCapacityBytes() int64 {
 	if m != nil {
@@ -786,63 +1382,342 @@ func (m *Volume) GetAttributes() map[string]string {
 	return nil
 }
 
-type DeleteVolumeRequest struct {
-	// The ID of the volume to be deprovisioned.
-	// This field is REQUIRED.
-	VolumeId string `protobuf:"bytes,1,opt,name=volume_id,json=volumeId" json:"volume_id,omitempty"`
-	// Secrets required by plugin to complete volume deletion request.
-	// A secret is a string to string map where the key identifies the
-	// name of the secret (e.g. "username" or "password"), and the value
-	// contains the secret data (e.g. "bob" or "abc123").
-	// Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-	// Each value MUST contain a valid string. An SP MAY choose to accept
-	// binary (non-string) data by using a binary-to-text encoding scheme,
-	// like base64.
-	// An SP SHALL advertise the requirements for required secret keys and
-	// values in documentation.
-	// CO SHALL permit passing through the required secrets.
-	// A CO MAY pass the same secrets to all RPCs, therefore the keys for
-	// all unique secrets that an SP expects must be unique across all CSI
-	// operations.
-	// This information is sensitive and MUST be treated as such (not
-	// logged, etc.) by the CO.
-	// This field is OPTIONAL.
-	ControllerDeleteSecrets map[string]string `protobuf:"bytes,2,rep,name=controller_delete_secrets,json=controllerDeleteSecrets" json:"controller_delete_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+func (m *Volume) GetContentSource() *VolumeContentSource {
+	if m != nil {
+		return m.ContentSource
+	}
+	return nil
 }
 
-func (m *DeleteVolumeRequest) Reset()                    { *m = DeleteVolumeRequest{} }
-func (m *DeleteVolumeRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteVolumeRequest) ProtoMessage()               {}
-func (*DeleteVolumeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *Volume) GetAccessibleTopology() []*Topology {
+	if m != nil {
+		return m.AccessibleTopology
+	}
+	return nil
+}
 
-func (m *DeleteVolumeRequest) GetVolumeId() string {
+type TopologyRequirement struct {
+	// Specifies the list of topologies the provisioned volume MUST be
+	// accessible from.
+	// This field is OPTIONAL. If TopologyRequirement is specified either
+	// requisite or preferred or both MUST be specified.
+	//
+	// If requisite is specified, the provisioned volume MUST be
+	// accessible from at least one of the requisite topologies.
+	//
+	// Given
+	//   x = number of topologies provisioned volume is accessible from
+	//   n = number of requisite topologies
+	// The CO MUST ensure n >= 1. The SP MUST ensure x >= 1
+	// If x==n, than the SP MUST make the provisioned volume available to
+	// all topologies from the list of requisite topologies. If it is
+	// unable to do so, the SP MUST fail the CreateVolume call.
+	// For example, if a volume should be accessible from a single zone,
+	// and requisite =
+	//   {"region": "R1", "zone": "Z2"}
+	// then the provisioned volume MUST be accessible from the "region"
+	// "R1" and the "zone" "Z2".
+	// Similarly, if a volume should be accessible from two zones, and
+	// requisite =
+	//   {"region": "R1", "zone": "Z2"},
+	//   {"region": "R1", "zone": "Z3"}
+	// then the provisioned volume MUST be accessible from the "region"
+	// "R1" and both "zone" "Z2" and "zone" "Z3".
+	//
+	// If x<n, than the SP SHALL choose x unique topologies from the list
+	// of requisite topologies. If it is unable to do so, the SP MUST fail
+	// the CreateVolume call.
+	// For example, if a volume should be accessible from a single zone,
+	// and requisite =
+	//   {"region": "R1", "zone": "Z2"},
+	//   {"region": "R1", "zone": "Z3"}
+	// then the SP may choose to make the provisioned volume available in
+	// either the "zone" "Z2" or the "zone" "Z3" in the "region" "R1".
+	// Similarly, if a volume should be accessible from two zones, and
+	// requisite =
+	//   {"region": "R1", "zone": "Z2"},
+	//   {"region": "R1", "zone": "Z3"},
+	//   {"region": "R1", "zone": "Z4"}
+	// then the provisioned volume MUST be accessible from any combination
+	// of two unique topologies: e.g. "R1/Z2" and "R1/Z3", or "R1/Z2" and
+	//  "R1/Z4", or "R1/Z3" and "R1/Z4".
+	//
+	// If x>n, than the SP MUST make the provisioned volume available from
+	// all topologies from the list of requisite topologies and MAY choose
+	// the remaining x-n unique topologies from the list of all possible
+	// topologies. If it is unable to do so, the SP MUST fail the
+	// CreateVolume call.
+	// For example, if a volume should be accessible from two zones, and
+	// requisite =
+	//   {"region": "R1", "zone": "Z2"}
+	// then the provisioned volume MUST be accessible from the "region"
+	// "R1" and the "zone" "Z2" and the SP may select the second zone
+	// independently, e.g. "R1/Z4".
+	Requisite []*Topology `protobuf:"bytes,1,rep,name=requisite" json:"requisite,omitempty"`
+	// Specifies the list of topologies the CO would prefer the volume to
+	// be provisioned in.
+	//
+	// This field is OPTIONAL. If TopologyRequirement is specified either
+	// requisite or preferred or both MUST be specified.
+	//
+	// An SP MUST attempt to make the provisioned volume available using
+	// the preferred topologies in order from first to last.
+	//
+	// If requisite is specified, all topologies in preferred list MUST
+	// also be present in the list of requisite topologies.
+	//
+	// If the SP is unable to to make the provisioned volume available
+	// from any of the preferred topologies, the SP MAY choose a topology
+	// from the list of requisite topologies.
+	// If the list of requisite topologies is not specified, then the SP
+	// MAY choose from the list of all possible topologies.
+	// If the list of requisite topologies is specified and the SP is
+	// unable to to make the provisioned volume available from any of the
+	// requisite topologies it MUST fail the CreateVolume call.
+	//
+	// Example 1:
+	// Given a volume should be accessible from a single zone, and
+	// requisite =
+	//   {"region": "R1", "zone": "Z2"},
+	//   {"region": "R1", "zone": "Z3"}
+	// preferred =
+	//   {"region": "R1", "zone": "Z3"}
+	// then the the SP SHOULD first attempt to make the provisioned volume
+	// available from "zone" "Z3" in the "region" "R1" and fall back to
+	// "zone" "Z2" in the "region" "R1" if that is not possible.
+	//
+	// Example 2:
+	// Given a volume should be accessible from a single zone, and
+	// requisite =
+	//   {"region": "R1", "zone": "Z2"},
+	//   {"region": "R1", "zone": "Z3"},
+	//   {"region": "R1", "zone": "Z4"},
+	//   {"region": "R1", "zone": "Z5"}
+	// preferred =
+	//   {"region": "R1", "zone": "Z4"},
+	//   {"region": "R1", "zone": "Z2"}
+	// then the the SP SHOULD first attempt to make the provisioned volume
+	// accessible from "zone" "Z4" in the "region" "R1" and fall back to
+	// "zone" "Z2" in the "region" "R1" if that is not possible. If that
+	// is not possible, the SP may choose between either the "zone"
+	// "Z3" or "Z5" in the "region" "R1".
+	//
+	// Example 3:
+	// Given a volume should be accessible from TWO zones (because an
+	// opaque parameter in CreateVolumeRequest, for example, specifies
+	// the volume is accessible from two zones, aka synchronously
+	// replicated), and
+	// requisite =
+	//   {"region": "R1", "zone": "Z2"},
+	//   {"region": "R1", "zone": "Z3"},
+	//   {"region": "R1", "zone": "Z4"},
+	//   {"region": "R1", "zone": "Z5"}
+	// preferred =
+	//   {"region": "R1", "zone": "Z5"},
+	//   {"region": "R1", "zone": "Z3"}
+	// then the the SP SHOULD first attempt to make the provisioned volume
+	// accessible from the combination of the two "zones" "Z5" and "Z3" in
+	// the "region" "R1". If that's not possible, it should fall back to
+	// a combination of "Z5" and other possibilities from the list of
+	// requisite. If that's not possible, it should fall back  to a
+	// combination of "Z3" and other possibilities from the list of
+	// requisite. If that's not possible, it should fall back  to a
+	// combination of other possibilities from the list of requisite.
+	Preferred            []*Topology `protobuf:"bytes,2,rep,name=preferred" json:"preferred,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *TopologyRequirement) Reset()         { *m = TopologyRequirement{} }
+func (m *TopologyRequirement) String() string { return proto.CompactTextString(m) }
+func (*TopologyRequirement) ProtoMessage()    {}
+func (*TopologyRequirement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{13}
+}
+func (m *TopologyRequirement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TopologyRequirement.Unmarshal(m, b)
+}
+func (m *TopologyRequirement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TopologyRequirement.Marshal(b, m, deterministic)
+}
+func (dst *TopologyRequirement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TopologyRequirement.Merge(dst, src)
+}
+func (m *TopologyRequirement) XXX_Size() int {
+	return xxx_messageInfo_TopologyRequirement.Size(m)
+}
+func (m *TopologyRequirement) XXX_DiscardUnknown() {
+	xxx_messageInfo_TopologyRequirement.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TopologyRequirement proto.InternalMessageInfo
+
+func (m *TopologyRequirement) GetRequisite() []*Topology {
 	if m != nil {
-		return m.VolumeId
+		return m.Requisite
 	}
-	return ""
+	return nil
 }
 
-func (m *DeleteVolumeRequest) GetControllerDeleteSecrets() map[string]string {
+func (m *TopologyRequirement) GetPreferred() []*Topology {
 	if m != nil {
-		return m.ControllerDeleteSecrets
+		return m.Preferred
+	}
+	return nil
+}
+
+// Topology is a map of topological domains to topological segments.
+// A topological domain is a sub-division of a cluster, like "region",
+// "zone", "rack", etc.
+// A topological segment is a specific instance of a topological domain,
+// like "zone3", "rack3", etc.
+// For example {"com.company/zone": "Z1", "com.company/rack": "R3"}
+// Valid keys have two segments: an optional prefix and name, separated
+// by a slash (/), for example: "com.company.example/zone".
+// The key name segment is required. The prefix is optional.
+// Both the key name and the prefix MUST each be 63 characters or less,
+// begin and end with an alphanumeric character ([a-z0-9A-Z]) and
+// contain only dashes (-), underscores (_), dots (.), or alphanumerics
+// in between, for example "zone".
+// The key prefix MUST follow reverse domain name notation format
+// (https://en.wikipedia.org/wiki/Reverse_domain_name_notation).
+// The key prefix SHOULD include the plugin's host company name and/or
+// the plugin name, to minimize the possibility of collisions with keys
+// from other plugins.
+// If a key prefix is specified, it MUST be identical across all
+// topology keys returned by the SP (across all RPCs).
+// Keys MUST be case-insensitive. Meaning the keys "Zone" and "zone"
+// MUST not both exist.
+// Each value (topological segment) MUST contain 1 or more strings.
+// Each string MUST be 63 characters or less and begin and end with an
+// alphanumeric character with '-', '_', '.', or alphanumerics in
+// between.
+type Topology struct {
+	Segments             map[string]string `protobuf:"bytes,1,rep,name=segments" json:"segments,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 (m *Topology) Reset()         { *m = Topology{} }
+func (m *Topology) String() string { return proto.CompactTextString(m) }
+func (*Topology) ProtoMessage()    {}
+func (*Topology) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{14}
+}
+func (m *Topology) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Topology.Unmarshal(m, b)
+}
+func (m *Topology) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Topology.Marshal(b, m, deterministic)
+}
+func (dst *Topology) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Topology.Merge(dst, src)
+}
+func (m *Topology) XXX_Size() int {
+	return xxx_messageInfo_Topology.Size(m)
+}
+func (m *Topology) XXX_DiscardUnknown() {
+	xxx_messageInfo_Topology.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Topology proto.InternalMessageInfo
+
+func (m *Topology) GetSegments() map[string]string {
+	if m != nil {
+		return m.Segments
+	}
+	return nil
+}
+
+type DeleteVolumeRequest struct {
+	// The ID of the volume to be deprovisioned.
+	// This field is REQUIRED.
+	VolumeId string `protobuf:"bytes,1,opt,name=volume_id,json=volumeId" json:"volume_id,omitempty"`
+	// Secrets required by plugin to complete volume deletion request.
+	// This field is OPTIONAL. Refer to the `Secrets Requirements`
+	// section on how to use this field.
+	ControllerDeleteSecrets map[string]string `protobuf:"bytes,2,rep,name=controller_delete_secrets,json=controllerDeleteSecrets" json:"controller_delete_secrets,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 (m *DeleteVolumeRequest) Reset()         { *m = DeleteVolumeRequest{} }
+func (m *DeleteVolumeRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteVolumeRequest) ProtoMessage()    {}
+func (*DeleteVolumeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{15}
+}
+func (m *DeleteVolumeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteVolumeRequest.Unmarshal(m, b)
+}
+func (m *DeleteVolumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteVolumeRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteVolumeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVolumeRequest.Merge(dst, src)
+}
+func (m *DeleteVolumeRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteVolumeRequest.Size(m)
+}
+func (m *DeleteVolumeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteVolumeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteVolumeRequest proto.InternalMessageInfo
+
+func (m *DeleteVolumeRequest) GetVolumeId() string {
+	if m != nil {
+		return m.VolumeId
+	}
+	return ""
+}
+
+func (m *DeleteVolumeRequest) GetControllerDeleteSecrets() map[string]string {
+	if m != nil {
+		return m.ControllerDeleteSecrets
 	}
 	return nil
 }
 
 type DeleteVolumeResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteVolumeResponse) Reset()         { *m = DeleteVolumeResponse{} }
+func (m *DeleteVolumeResponse) String() string { return proto.CompactTextString(m) }
+func (*DeleteVolumeResponse) ProtoMessage()    {}
+func (*DeleteVolumeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{16}
+}
+func (m *DeleteVolumeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteVolumeResponse.Unmarshal(m, b)
+}
+func (m *DeleteVolumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteVolumeResponse.Marshal(b, m, deterministic)
+}
+func (dst *DeleteVolumeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVolumeResponse.Merge(dst, src)
+}
+func (m *DeleteVolumeResponse) XXX_Size() int {
+	return xxx_messageInfo_DeleteVolumeResponse.Size(m)
+}
+func (m *DeleteVolumeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteVolumeResponse.DiscardUnknown(m)
 }
 
-func (m *DeleteVolumeResponse) Reset()                    { *m = DeleteVolumeResponse{} }
-func (m *DeleteVolumeResponse) String() string            { return proto.CompactTextString(m) }
-func (*DeleteVolumeResponse) ProtoMessage()               {}
-func (*DeleteVolumeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_DeleteVolumeResponse proto.InternalMessageInfo
 
 type ControllerPublishVolumeRequest struct {
 	// The ID of the volume to be used on a node.
 	// This field is REQUIRED.
 	VolumeId string `protobuf:"bytes,1,opt,name=volume_id,json=volumeId" json:"volume_id,omitempty"`
 	// The ID of the node. This field is REQUIRED. The CO SHALL set this
-	// field to match the node ID returned by `NodeGetId`.
+	// field to match the node ID returned by `NodeGetInfo`.
 	NodeId string `protobuf:"bytes,2,opt,name=node_id,json=nodeId" json:"node_id,omitempty"`
 	// The capability of the volume the CO expects the volume to have.
 	// This is a REQUIRED field.
@@ -851,34 +1726,41 @@ type ControllerPublishVolumeRequest struct {
 	// REQUIRED.
 	Readonly bool `protobuf:"varint,4,opt,name=readonly" json:"readonly,omitempty"`
 	// Secrets required by plugin to complete controller publish volume
-	// request.
-	// A secret is a string to string map where the key identifies the
-	// name of the secret (e.g. "username" or "password"), and the value
-	// contains the secret data (e.g. "bob" or "abc123").
-	// Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-	// Each value MUST contain a valid string. An SP MAY choose to accept
-	// binary (non-string) data by using a binary-to-text encoding scheme,
-	// like base64.
-	// An SP SHALL advertise the requirements for required secret keys and
-	// values in documentation.
-	// CO SHALL permit passing through the required secrets.
-	// A CO MAY pass the same secrets to all RPCs, therefore the keys for
-	// all unique secrets that an SP expects must be unique across all CSI
-	// operations.
-	// This information is sensitive and MUST be treated as such (not
-	// logged, etc.) by the CO.
-	// This field is OPTIONAL.
+	// request. This field is OPTIONAL. Refer to the
+	// `Secrets Requirements` section on how to use this field.
 	ControllerPublishSecrets map[string]string `protobuf:"bytes,5,rep,name=controller_publish_secrets,json=controllerPublishSecrets" json:"controller_publish_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Attributes of the volume to be used on a node. This field is
 	// OPTIONAL and MUST match the attributes of the Volume identified
 	// by `volume_id`.
-	VolumeAttributes map[string]string `protobuf:"bytes,6,rep,name=volume_attributes,json=volumeAttributes" json:"volume_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	VolumeAttributes     map[string]string `protobuf:"bytes,6,rep,name=volume_attributes,json=volumeAttributes" json:"volume_attributes,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 (m *ControllerPublishVolumeRequest) Reset()         { *m = ControllerPublishVolumeRequest{} }
+func (m *ControllerPublishVolumeRequest) String() string { return proto.CompactTextString(m) }
+func (*ControllerPublishVolumeRequest) ProtoMessage()    {}
+func (*ControllerPublishVolumeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{17}
+}
+func (m *ControllerPublishVolumeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerPublishVolumeRequest.Unmarshal(m, b)
+}
+func (m *ControllerPublishVolumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerPublishVolumeRequest.Marshal(b, m, deterministic)
+}
+func (dst *ControllerPublishVolumeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerPublishVolumeRequest.Merge(dst, src)
+}
+func (m *ControllerPublishVolumeRequest) XXX_Size() int {
+	return xxx_messageInfo_ControllerPublishVolumeRequest.Size(m)
+}
+func (m *ControllerPublishVolumeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerPublishVolumeRequest.DiscardUnknown(m)
 }
 
-func (m *ControllerPublishVolumeRequest) Reset()                    { *m = ControllerPublishVolumeRequest{} }
-func (m *ControllerPublishVolumeRequest) String() string            { return proto.CompactTextString(m) }
-func (*ControllerPublishVolumeRequest) ProtoMessage()               {}
-func (*ControllerPublishVolumeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_ControllerPublishVolumeRequest proto.InternalMessageInfo
 
 func (m *ControllerPublishVolumeRequest) GetVolumeId() string {
 	if m != nil {
@@ -927,15 +1809,35 @@ type ControllerPublishVolumeResponse struct {
 	// the subsequent `NodeStageVolume` or `NodePublishVolume` calls
 	// for the given volume.
 	// This information is opaque to the CO. This field is OPTIONAL.
-	PublishInfo map[string]string `protobuf:"bytes,1,rep,name=publish_info,json=publishInfo" json:"publish_info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	PublishInfo          map[string]string `protobuf:"bytes,1,rep,name=publish_info,json=publishInfo" json:"publish_info,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 (m *ControllerPublishVolumeResponse) Reset()         { *m = ControllerPublishVolumeResponse{} }
 func (m *ControllerPublishVolumeResponse) String() string { return proto.CompactTextString(m) }
 func (*ControllerPublishVolumeResponse) ProtoMessage()    {}
 func (*ControllerPublishVolumeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{15}
+	return fileDescriptor_csi_31237507707d37ec, []int{18}
+}
+func (m *ControllerPublishVolumeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerPublishVolumeResponse.Unmarshal(m, b)
+}
+func (m *ControllerPublishVolumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerPublishVolumeResponse.Marshal(b, m, deterministic)
+}
+func (dst *ControllerPublishVolumeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerPublishVolumeResponse.Merge(dst, src)
 }
+func (m *ControllerPublishVolumeResponse) XXX_Size() int {
+	return xxx_messageInfo_ControllerPublishVolumeResponse.Size(m)
+}
+func (m *ControllerPublishVolumeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerPublishVolumeResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ControllerPublishVolumeResponse proto.InternalMessageInfo
 
 func (m *ControllerPublishVolumeResponse) GetPublishInfo() map[string]string {
 	if m != nil {
@@ -948,41 +1850,46 @@ type ControllerUnpublishVolumeRequest struct {
 	// The ID of the volume. This field is REQUIRED.
 	VolumeId string `protobuf:"bytes,1,opt,name=volume_id,json=volumeId" json:"volume_id,omitempty"`
 	// The ID of the node. This field is OPTIONAL. The CO SHOULD set this
-	// field to match the node ID returned by `NodeGetId` or leave it
+	// field to match the node ID returned by `NodeGetInfo` or leave it
 	// unset. If the value is set, the SP MUST unpublish the volume from
 	// the specified node. If the value is unset, the SP MUST unpublish
 	// the volume from all nodes it is published to.
 	NodeId string `protobuf:"bytes,2,opt,name=node_id,json=nodeId" json:"node_id,omitempty"`
 	// Secrets required by plugin to complete controller unpublish volume
 	// request. This SHOULD be the same secrets passed to the
-	// ControllerPublishVolume.
-	// call for the specified volume.
-	// A secret is a string to string map where the key identifies the
-	// name of the secret (e.g. "username" or "password"), and the value
-	// contains the secret data (e.g. "bob" or "abc123").
-	// Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-	// Each value MUST contain a valid string. An SP MAY choose to accept
-	// binary (non-string) data by using a binary-to-text encoding scheme,
-	// like base64.
-	// An SP SHALL advertise the requirements for required secret keys and
-	// values in documentation.
-	// CO SHALL permit passing through the required secrets.
-	// A CO MAY pass the same secrets to all RPCs, therefore the keys for
-	// all unique secrets that an SP expects must be unique across all CSI
-	// operations.
-	// This information is sensitive and MUST be treated as such (not
-	// logged, etc.) by the CO.
-	// This field is OPTIONAL.
+	// ControllerPublishVolume call for the specified volume.
+	// This field is OPTIONAL. Refer to the `Secrets Requirements`
+	// section on how to use this field.
 	ControllerUnpublishSecrets map[string]string `protobuf:"bytes,3,rep,name=controller_unpublish_secrets,json=controllerUnpublishSecrets" json:"controller_unpublish_secrets,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 (m *ControllerUnpublishVolumeRequest) Reset()         { *m = ControllerUnpublishVolumeRequest{} }
 func (m *ControllerUnpublishVolumeRequest) String() string { return proto.CompactTextString(m) }
 func (*ControllerUnpublishVolumeRequest) ProtoMessage()    {}
 func (*ControllerUnpublishVolumeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{16}
+	return fileDescriptor_csi_31237507707d37ec, []int{19}
+}
+func (m *ControllerUnpublishVolumeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerUnpublishVolumeRequest.Unmarshal(m, b)
+}
+func (m *ControllerUnpublishVolumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerUnpublishVolumeRequest.Marshal(b, m, deterministic)
+}
+func (dst *ControllerUnpublishVolumeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerUnpublishVolumeRequest.Merge(dst, src)
+}
+func (m *ControllerUnpublishVolumeRequest) XXX_Size() int {
+	return xxx_messageInfo_ControllerUnpublishVolumeRequest.Size(m)
+}
+func (m *ControllerUnpublishVolumeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerUnpublishVolumeRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ControllerUnpublishVolumeRequest proto.InternalMessageInfo
+
 func (m *ControllerUnpublishVolumeRequest) GetVolumeId() string {
 	if m != nil {
 		return m.VolumeId
@@ -1005,15 +1912,35 @@ func (m *ControllerUnpublishVolumeRequest) GetControllerUnpublishSecrets() map[s
 }
 
 type ControllerUnpublishVolumeResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ControllerUnpublishVolumeResponse) Reset()         { *m = ControllerUnpublishVolumeResponse{} }
 func (m *ControllerUnpublishVolumeResponse) String() string { return proto.CompactTextString(m) }
 func (*ControllerUnpublishVolumeResponse) ProtoMessage()    {}
 func (*ControllerUnpublishVolumeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{17}
+	return fileDescriptor_csi_31237507707d37ec, []int{20}
+}
+func (m *ControllerUnpublishVolumeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerUnpublishVolumeResponse.Unmarshal(m, b)
+}
+func (m *ControllerUnpublishVolumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerUnpublishVolumeResponse.Marshal(b, m, deterministic)
+}
+func (dst *ControllerUnpublishVolumeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerUnpublishVolumeResponse.Merge(dst, src)
+}
+func (m *ControllerUnpublishVolumeResponse) XXX_Size() int {
+	return xxx_messageInfo_ControllerUnpublishVolumeResponse.Size(m)
+}
+func (m *ControllerUnpublishVolumeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerUnpublishVolumeResponse.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ControllerUnpublishVolumeResponse proto.InternalMessageInfo
+
 type ValidateVolumeCapabilitiesRequest struct {
 	// The ID of the volume to check. This field is REQUIRED.
 	VolumeId string `protobuf:"bytes,1,opt,name=volume_id,json=volumeId" json:"volume_id,omitempty"`
@@ -1024,15 +1951,42 @@ type ValidateVolumeCapabilitiesRequest struct {
 	// Attributes of the volume to check. This field is OPTIONAL and MUST
 	// match the attributes of the Volume identified by `volume_id`.
 	VolumeAttributes map[string]string `protobuf:"bytes,3,rep,name=volume_attributes,json=volumeAttributes" json:"volume_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// Specifies where (regions, zones, racks, etc.) the caller believes
+	// the volume is accessible from.
+	// A caller MAY specify multiple topologies to indicate they believe
+	// the volume to be accessible from multiple locations.
+	// This field is OPTIONAL. This field SHALL NOT be set unless the
+	// plugin advertises the ACCESSIBILITY_CONSTRAINTS capability.
+	AccessibleTopology   []*Topology `protobuf:"bytes,4,rep,name=accessible_topology,json=accessibleTopology" json:"accessible_topology,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
 func (m *ValidateVolumeCapabilitiesRequest) Reset()         { *m = ValidateVolumeCapabilitiesRequest{} }
 func (m *ValidateVolumeCapabilitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*ValidateVolumeCapabilitiesRequest) ProtoMessage()    {}
 func (*ValidateVolumeCapabilitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{18}
+	return fileDescriptor_csi_31237507707d37ec, []int{21}
+}
+func (m *ValidateVolumeCapabilitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ValidateVolumeCapabilitiesRequest.Unmarshal(m, b)
+}
+func (m *ValidateVolumeCapabilitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ValidateVolumeCapabilitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ValidateVolumeCapabilitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValidateVolumeCapabilitiesRequest.Merge(dst, src)
+}
+func (m *ValidateVolumeCapabilitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_ValidateVolumeCapabilitiesRequest.Size(m)
+}
+func (m *ValidateVolumeCapabilitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ValidateVolumeCapabilitiesRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ValidateVolumeCapabilitiesRequest proto.InternalMessageInfo
+
 func (m *ValidateVolumeCapabilitiesRequest) GetVolumeId() string {
 	if m != nil {
 		return m.VolumeId
@@ -1054,6 +2008,13 @@ func (m *ValidateVolumeCapabilitiesRequest) GetVolumeAttributes() map[string]str
 	return nil
 }
 
+func (m *ValidateVolumeCapabilitiesRequest) GetAccessibleTopology() []*Topology {
+	if m != nil {
+		return m.AccessibleTopology
+	}
+	return nil
+}
+
 type ValidateVolumeCapabilitiesResponse struct {
 	// True if the Plugin supports the specified capabilities for the
 	// given volume. This field is REQUIRED.
@@ -1061,15 +2022,35 @@ type ValidateVolumeCapabilitiesResponse struct {
 	// Message to the CO if `supported` above is false. This field is
 	// OPTIONAL.
 	// An empty string is equal to an unspecified field value.
-	Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Message              string   `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ValidateVolumeCapabilitiesResponse) Reset()         { *m = ValidateVolumeCapabilitiesResponse{} }
 func (m *ValidateVolumeCapabilitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*ValidateVolumeCapabilitiesResponse) ProtoMessage()    {}
 func (*ValidateVolumeCapabilitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{19}
+	return fileDescriptor_csi_31237507707d37ec, []int{22}
 }
+func (m *ValidateVolumeCapabilitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ValidateVolumeCapabilitiesResponse.Unmarshal(m, b)
+}
+func (m *ValidateVolumeCapabilitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ValidateVolumeCapabilitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ValidateVolumeCapabilitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValidateVolumeCapabilitiesResponse.Merge(dst, src)
+}
+func (m *ValidateVolumeCapabilitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_ValidateVolumeCapabilitiesResponse.Size(m)
+}
+func (m *ValidateVolumeCapabilitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ValidateVolumeCapabilitiesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ValidateVolumeCapabilitiesResponse proto.InternalMessageInfo
 
 func (m *ValidateVolumeCapabilitiesResponse) GetSupported() bool {
 	if m != nil {
@@ -1099,13 +2080,35 @@ type ListVolumesRequest struct {
 	// `next_token` returned by a previous `ListVolumes` call to get the
 	// next page of entries. This field is OPTIONAL.
 	// An empty string is equal to an unspecified field value.
-	StartingToken string `protobuf:"bytes,2,opt,name=starting_token,json=startingToken" json:"starting_token,omitempty"`
+	StartingToken        string   `protobuf:"bytes,2,opt,name=starting_token,json=startingToken" json:"starting_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVolumesRequest) Reset()         { *m = ListVolumesRequest{} }
+func (m *ListVolumesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListVolumesRequest) ProtoMessage()    {}
+func (*ListVolumesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{23}
+}
+func (m *ListVolumesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVolumesRequest.Unmarshal(m, b)
+}
+func (m *ListVolumesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVolumesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListVolumesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVolumesRequest.Merge(dst, src)
+}
+func (m *ListVolumesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListVolumesRequest.Size(m)
+}
+func (m *ListVolumesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVolumesRequest.DiscardUnknown(m)
 }
 
-func (m *ListVolumesRequest) Reset()                    { *m = ListVolumesRequest{} }
-func (m *ListVolumesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListVolumesRequest) ProtoMessage()               {}
-func (*ListVolumesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+var xxx_messageInfo_ListVolumesRequest proto.InternalMessageInfo
 
 func (m *ListVolumesRequest) GetMaxEntries() int32 {
 	if m != nil {
@@ -1129,13 +2132,35 @@ type ListVolumesResponse struct {
 	// `starting_token` field in the next `ListVolumes` request. This
 	// field is OPTIONAL.
 	// An empty string is equal to an unspecified field value.
-	NextToken string `protobuf:"bytes,2,opt,name=next_token,json=nextToken" json:"next_token,omitempty"`
+	NextToken            string   `protobuf:"bytes,2,opt,name=next_token,json=nextToken" json:"next_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListVolumesResponse) Reset()                    { *m = ListVolumesResponse{} }
-func (m *ListVolumesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListVolumesResponse) ProtoMessage()               {}
-func (*ListVolumesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+func (m *ListVolumesResponse) Reset()         { *m = ListVolumesResponse{} }
+func (m *ListVolumesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListVolumesResponse) ProtoMessage()    {}
+func (*ListVolumesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{24}
+}
+func (m *ListVolumesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVolumesResponse.Unmarshal(m, b)
+}
+func (m *ListVolumesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVolumesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListVolumesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVolumesResponse.Merge(dst, src)
+}
+func (m *ListVolumesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListVolumesResponse.Size(m)
+}
+func (m *ListVolumesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVolumesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListVolumesResponse proto.InternalMessageInfo
 
 func (m *ListVolumesResponse) GetEntries() []*ListVolumesResponse_Entry {
 	if m != nil {
@@ -1152,13 +2177,35 @@ func (m *ListVolumesResponse) GetNextToken() string {
 }
 
 type ListVolumesResponse_Entry struct {
-	Volume *Volume `protobuf:"bytes,1,opt,name=volume" json:"volume,omitempty"`
+	Volume               *Volume  `protobuf:"bytes,1,opt,name=volume" json:"volume,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListVolumesResponse_Entry) Reset()                    { *m = ListVolumesResponse_Entry{} }
-func (m *ListVolumesResponse_Entry) String() string            { return proto.CompactTextString(m) }
-func (*ListVolumesResponse_Entry) ProtoMessage()               {}
-func (*ListVolumesResponse_Entry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21, 0} }
+func (m *ListVolumesResponse_Entry) Reset()         { *m = ListVolumesResponse_Entry{} }
+func (m *ListVolumesResponse_Entry) String() string { return proto.CompactTextString(m) }
+func (*ListVolumesResponse_Entry) ProtoMessage()    {}
+func (*ListVolumesResponse_Entry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{24, 0}
+}
+func (m *ListVolumesResponse_Entry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVolumesResponse_Entry.Unmarshal(m, b)
+}
+func (m *ListVolumesResponse_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVolumesResponse_Entry.Marshal(b, m, deterministic)
+}
+func (dst *ListVolumesResponse_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVolumesResponse_Entry.Merge(dst, src)
+}
+func (m *ListVolumesResponse_Entry) XXX_Size() int {
+	return xxx_messageInfo_ListVolumesResponse_Entry.Size(m)
+}
+func (m *ListVolumesResponse_Entry) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVolumesResponse_Entry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListVolumesResponse_Entry proto.InternalMessageInfo
 
 func (m *ListVolumesResponse_Entry) GetVolume() *Volume {
 	if m != nil {
@@ -1179,12 +2226,41 @@ type GetCapacityRequest struct {
 	// specific `parameters`. These are the same `parameters` the CO will
 	// use in `CreateVolumeRequest`. This field is OPTIONAL.
 	Parameters map[string]string `protobuf:"bytes,2,rep,name=parameters" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// If specified, the Plugin SHALL report the capacity of the storage
+	// that can be used to provision volumes that in the specified
+	// `accessible_topology`. This is the same as the
+	// `accessible_topology` the CO returns in a `CreateVolumeResponse`.
+	// This field is OPTIONAL. This field SHALL NOT be set unless the
+	// plugin advertises the ACCESSIBILITY_CONSTRAINTS capability.
+	AccessibleTopology   *Topology `protobuf:"bytes,3,opt,name=accessible_topology,json=accessibleTopology" json:"accessible_topology,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *GetCapacityRequest) Reset()                    { *m = GetCapacityRequest{} }
-func (m *GetCapacityRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetCapacityRequest) ProtoMessage()               {}
-func (*GetCapacityRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+func (m *GetCapacityRequest) Reset()         { *m = GetCapacityRequest{} }
+func (m *GetCapacityRequest) String() string { return proto.CompactTextString(m) }
+func (*GetCapacityRequest) ProtoMessage()    {}
+func (*GetCapacityRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{25}
+}
+func (m *GetCapacityRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetCapacityRequest.Unmarshal(m, b)
+}
+func (m *GetCapacityRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetCapacityRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetCapacityRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCapacityRequest.Merge(dst, src)
+}
+func (m *GetCapacityRequest) XXX_Size() int {
+	return xxx_messageInfo_GetCapacityRequest.Size(m)
+}
+func (m *GetCapacityRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetCapacityRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetCapacityRequest proto.InternalMessageInfo
 
 func (m *GetCapacityRequest) GetVolumeCapabilities() []*VolumeCapability {
 	if m != nil {
@@ -1200,20 +2276,49 @@ func (m *GetCapacityRequest) GetParameters() map[string]string {
 	return nil
 }
 
+func (m *GetCapacityRequest) GetAccessibleTopology() *Topology {
+	if m != nil {
+		return m.AccessibleTopology
+	}
+	return nil
+}
+
 type GetCapacityResponse struct {
-	// The available capacity of the storage that can be used to
-	// provision volumes. If `volume_capabilities` or `parameters` is
+	// The available capacity, in bytes, of the storage that can be used
+	// to provision volumes. If `volume_capabilities` or `parameters` is
 	// specified in the request, the Plugin SHALL take those into
 	// consideration when calculating the available capacity of the
 	// storage. This field is REQUIRED.
 	// The value of this field MUST NOT be negative.
-	AvailableCapacity int64 `protobuf:"varint,1,opt,name=available_capacity,json=availableCapacity" json:"available_capacity,omitempty"`
+	AvailableCapacity    int64    `protobuf:"varint,1,opt,name=available_capacity,json=availableCapacity" json:"available_capacity,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetCapacityResponse) Reset()                    { *m = GetCapacityResponse{} }
-func (m *GetCapacityResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetCapacityResponse) ProtoMessage()               {}
-func (*GetCapacityResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+func (m *GetCapacityResponse) Reset()         { *m = GetCapacityResponse{} }
+func (m *GetCapacityResponse) String() string { return proto.CompactTextString(m) }
+func (*GetCapacityResponse) ProtoMessage()    {}
+func (*GetCapacityResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{26}
+}
+func (m *GetCapacityResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetCapacityResponse.Unmarshal(m, b)
+}
+func (m *GetCapacityResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetCapacityResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetCapacityResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCapacityResponse.Merge(dst, src)
+}
+func (m *GetCapacityResponse) XXX_Size() int {
+	return xxx_messageInfo_GetCapacityResponse.Size(m)
+}
+func (m *GetCapacityResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetCapacityResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetCapacityResponse proto.InternalMessageInfo
 
 func (m *GetCapacityResponse) GetAvailableCapacity() int64 {
 	if m != nil {
@@ -1223,27 +2328,67 @@ func (m *GetCapacityResponse) GetAvailableCapacity() int64 {
 }
 
 type ControllerGetCapabilitiesRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ControllerGetCapabilitiesRequest) Reset()         { *m = ControllerGetCapabilitiesRequest{} }
 func (m *ControllerGetCapabilitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*ControllerGetCapabilitiesRequest) ProtoMessage()    {}
 func (*ControllerGetCapabilitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{24}
+	return fileDescriptor_csi_31237507707d37ec, []int{27}
+}
+func (m *ControllerGetCapabilitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerGetCapabilitiesRequest.Unmarshal(m, b)
 }
+func (m *ControllerGetCapabilitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerGetCapabilitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ControllerGetCapabilitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerGetCapabilitiesRequest.Merge(dst, src)
+}
+func (m *ControllerGetCapabilitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_ControllerGetCapabilitiesRequest.Size(m)
+}
+func (m *ControllerGetCapabilitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerGetCapabilitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ControllerGetCapabilitiesRequest proto.InternalMessageInfo
 
 type ControllerGetCapabilitiesResponse struct {
 	// All the capabilities that the controller service supports. This
 	// field is OPTIONAL.
-	Capabilities []*ControllerServiceCapability `protobuf:"bytes,2,rep,name=capabilities" json:"capabilities,omitempty"`
+	Capabilities         []*ControllerServiceCapability `protobuf:"bytes,2,rep,name=capabilities" json:"capabilities,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
 }
 
 func (m *ControllerGetCapabilitiesResponse) Reset()         { *m = ControllerGetCapabilitiesResponse{} }
 func (m *ControllerGetCapabilitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*ControllerGetCapabilitiesResponse) ProtoMessage()    {}
 func (*ControllerGetCapabilitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{25}
+	return fileDescriptor_csi_31237507707d37ec, []int{28}
+}
+func (m *ControllerGetCapabilitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerGetCapabilitiesResponse.Unmarshal(m, b)
 }
+func (m *ControllerGetCapabilitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerGetCapabilitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ControllerGetCapabilitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerGetCapabilitiesResponse.Merge(dst, src)
+}
+func (m *ControllerGetCapabilitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_ControllerGetCapabilitiesResponse.Size(m)
+}
+func (m *ControllerGetCapabilitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerGetCapabilitiesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ControllerGetCapabilitiesResponse proto.InternalMessageInfo
 
 func (m *ControllerGetCapabilitiesResponse) GetCapabilities() []*ControllerServiceCapability {
 	if m != nil {
@@ -1256,13 +2401,35 @@ func (m *ControllerGetCapabilitiesResponse) GetCapabilities() []*ControllerServi
 type ControllerServiceCapability struct {
 	// Types that are valid to be assigned to Type:
 	//	*ControllerServiceCapability_Rpc
-	Type isControllerServiceCapability_Type `protobuf_oneof:"type"`
+	Type                 isControllerServiceCapability_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
+}
+
+func (m *ControllerServiceCapability) Reset()         { *m = ControllerServiceCapability{} }
+func (m *ControllerServiceCapability) String() string { return proto.CompactTextString(m) }
+func (*ControllerServiceCapability) ProtoMessage()    {}
+func (*ControllerServiceCapability) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{29}
+}
+func (m *ControllerServiceCapability) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerServiceCapability.Unmarshal(m, b)
+}
+func (m *ControllerServiceCapability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerServiceCapability.Marshal(b, m, deterministic)
+}
+func (dst *ControllerServiceCapability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerServiceCapability.Merge(dst, src)
+}
+func (m *ControllerServiceCapability) XXX_Size() int {
+	return xxx_messageInfo_ControllerServiceCapability.Size(m)
+}
+func (m *ControllerServiceCapability) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerServiceCapability.DiscardUnknown(m)
 }
 
-func (m *ControllerServiceCapability) Reset()                    { *m = ControllerServiceCapability{} }
-func (m *ControllerServiceCapability) String() string            { return proto.CompactTextString(m) }
-func (*ControllerServiceCapability) ProtoMessage()               {}
-func (*ControllerServiceCapability) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
+var xxx_messageInfo_ControllerServiceCapability proto.InternalMessageInfo
 
 type isControllerServiceCapability_Type interface {
 	isControllerServiceCapability_Type()
@@ -1327,38 +2494,572 @@ func _ControllerServiceCapability_OneofUnmarshaler(msg proto.Message, tag, wire
 	}
 }
 
-func _ControllerServiceCapability_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ControllerServiceCapability)
-	// type
-	switch x := m.Type.(type) {
-	case *ControllerServiceCapability_Rpc:
-		s := proto.Size(x.Rpc)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+func _ControllerServiceCapability_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ControllerServiceCapability)
+	// type
+	switch x := m.Type.(type) {
+	case *ControllerServiceCapability_Rpc:
+		s := proto.Size(x.Rpc)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type ControllerServiceCapability_RPC struct {
+	Type                 ControllerServiceCapability_RPC_Type `protobuf:"varint,1,opt,name=type,enum=csi.v0.ControllerServiceCapability_RPC_Type" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                             `json:"-"`
+	XXX_unrecognized     []byte                               `json:"-"`
+	XXX_sizecache        int32                                `json:"-"`
+}
+
+func (m *ControllerServiceCapability_RPC) Reset()         { *m = ControllerServiceCapability_RPC{} }
+func (m *ControllerServiceCapability_RPC) String() string { return proto.CompactTextString(m) }
+func (*ControllerServiceCapability_RPC) ProtoMessage()    {}
+func (*ControllerServiceCapability_RPC) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{29, 0}
+}
+func (m *ControllerServiceCapability_RPC) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerServiceCapability_RPC.Unmarshal(m, b)
+}
+func (m *ControllerServiceCapability_RPC) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerServiceCapability_RPC.Marshal(b, m, deterministic)
+}
+func (dst *ControllerServiceCapability_RPC) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerServiceCapability_RPC.Merge(dst, src)
+}
+func (m *ControllerServiceCapability_RPC) XXX_Size() int {
+	return xxx_messageInfo_ControllerServiceCapability_RPC.Size(m)
+}
+func (m *ControllerServiceCapability_RPC) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerServiceCapability_RPC.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ControllerServiceCapability_RPC proto.InternalMessageInfo
+
+func (m *ControllerServiceCapability_RPC) GetType() ControllerServiceCapability_RPC_Type {
+	if m != nil {
+		return m.Type
+	}
+	return ControllerServiceCapability_RPC_UNKNOWN
+}
+
+type CreateSnapshotRequest struct {
+	// The ID of the source volume to be snapshotted.
+	// This field is REQUIRED.
+	SourceVolumeId string `protobuf:"bytes,1,opt,name=source_volume_id,json=sourceVolumeId" json:"source_volume_id,omitempty"`
+	// The suggested name for the snapshot. This field is REQUIRED for
+	// idempotency.
+	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	// Secrets required by plugin to complete snapshot creation request.
+	// This field is OPTIONAL. Refer to the `Secrets Requirements`
+	// section on how to use this field.
+	CreateSnapshotSecrets map[string]string `protobuf:"bytes,3,rep,name=create_snapshot_secrets,json=createSnapshotSecrets" json:"create_snapshot_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// Plugin specific parameters passed in as opaque key-value pairs.
+	// This field is OPTIONAL. The Plugin is responsible for parsing and
+	// validating these parameters. COs will treat these as opaque.
+	// Use cases for opaque parameters:
+	// - Specify a policy to automatically clean up the snapshot.
+	// - Specify an expiration date for the snapshot.
+	// - Specify whether the snapshot is readonly or read/write.
+	// - Specify if the snapshot should be replicated to some place.
+	// - Specify primary or secondary for replication systems that
+	//   support snapshotting only on primary.
+	Parameters           map[string]string `protobuf:"bytes,4,rep,name=parameters" json:"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 (m *CreateSnapshotRequest) Reset()         { *m = CreateSnapshotRequest{} }
+func (m *CreateSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateSnapshotRequest) ProtoMessage()    {}
+func (*CreateSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{30}
+}
+func (m *CreateSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateSnapshotRequest.Unmarshal(m, b)
+}
+func (m *CreateSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSnapshotRequest.Merge(dst, src)
+}
+func (m *CreateSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateSnapshotRequest.Size(m)
+}
+func (m *CreateSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateSnapshotRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateSnapshotRequest proto.InternalMessageInfo
+
+func (m *CreateSnapshotRequest) GetSourceVolumeId() string {
+	if m != nil {
+		return m.SourceVolumeId
+	}
+	return ""
+}
+
+func (m *CreateSnapshotRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *CreateSnapshotRequest) GetCreateSnapshotSecrets() map[string]string {
+	if m != nil {
+		return m.CreateSnapshotSecrets
+	}
+	return nil
+}
+
+func (m *CreateSnapshotRequest) GetParameters() map[string]string {
+	if m != nil {
+		return m.Parameters
+	}
+	return nil
+}
+
+type CreateSnapshotResponse struct {
+	// Contains all attributes of the newly created snapshot that are
+	// relevant to the CO along with information required by the Plugin
+	// to uniquely identify the snapshot. This field is REQUIRED.
+	Snapshot             *Snapshot `protobuf:"bytes,1,opt,name=snapshot" json:"snapshot,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CreateSnapshotResponse) Reset()         { *m = CreateSnapshotResponse{} }
+func (m *CreateSnapshotResponse) String() string { return proto.CompactTextString(m) }
+func (*CreateSnapshotResponse) ProtoMessage()    {}
+func (*CreateSnapshotResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{31}
+}
+func (m *CreateSnapshotResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateSnapshotResponse.Unmarshal(m, b)
+}
+func (m *CreateSnapshotResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateSnapshotResponse.Marshal(b, m, deterministic)
+}
+func (dst *CreateSnapshotResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSnapshotResponse.Merge(dst, src)
+}
+func (m *CreateSnapshotResponse) XXX_Size() int {
+	return xxx_messageInfo_CreateSnapshotResponse.Size(m)
+}
+func (m *CreateSnapshotResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateSnapshotResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateSnapshotResponse proto.InternalMessageInfo
+
+func (m *CreateSnapshotResponse) GetSnapshot() *Snapshot {
+	if m != nil {
+		return m.Snapshot
+	}
+	return nil
+}
+
+// The information about a provisioned snapshot.
+type Snapshot struct {
+	// This is the complete size of the snapshot in bytes. The purpose of
+	// this field is to give CO guidance on how much space is needed to
+	// create a volume from this snapshot. The size of the volume MUST NOT
+	// be less than the size of the source snapshot. This field is
+	// OPTIONAL. If this field is not set, it indicates that this size is
+	// unknown. The value of this field MUST NOT be negative and a size of
+	// zero means it is unspecified.
+	SizeBytes int64 `protobuf:"varint,1,opt,name=size_bytes,json=sizeBytes" json:"size_bytes,omitempty"`
+	// Uniquely identifies a snapshot and is generated by the plugin. It
+	// will not change over time. This field is REQUIRED. The identity
+	// information will be used by the CO in subsequent calls to refer to
+	// the provisioned snapshot.
+	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	// Identity information for the source volume. Note that creating a
+	// snapshot from a snapshot is not supported here so the source has to
+	// be a volume. This field is REQUIRED.
+	SourceVolumeId string `protobuf:"bytes,3,opt,name=source_volume_id,json=sourceVolumeId" json:"source_volume_id,omitempty"`
+	// Timestamp when the point-in-time snapshot is taken on the storage
+	// system. The format of this field should be a Unix nanoseconds time
+	// encoded as an int64. On Unix, the command `date +%s%N` returns the
+	// current time in nanoseconds since 1970-01-01 00:00:00 UTC. This
+	// field is REQUIRED.
+	CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
+	// The status of a snapshot.
+	Status               *SnapshotStatus `protobuf:"bytes,5,opt,name=status" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Snapshot) Reset()         { *m = Snapshot{} }
+func (m *Snapshot) String() string { return proto.CompactTextString(m) }
+func (*Snapshot) ProtoMessage()    {}
+func (*Snapshot) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{32}
+}
+func (m *Snapshot) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Snapshot.Unmarshal(m, b)
+}
+func (m *Snapshot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Snapshot.Marshal(b, m, deterministic)
+}
+func (dst *Snapshot) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Snapshot.Merge(dst, src)
+}
+func (m *Snapshot) XXX_Size() int {
+	return xxx_messageInfo_Snapshot.Size(m)
+}
+func (m *Snapshot) XXX_DiscardUnknown() {
+	xxx_messageInfo_Snapshot.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Snapshot proto.InternalMessageInfo
+
+func (m *Snapshot) GetSizeBytes() int64 {
+	if m != nil {
+		return m.SizeBytes
+	}
+	return 0
+}
+
+func (m *Snapshot) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *Snapshot) GetSourceVolumeId() string {
+	if m != nil {
+		return m.SourceVolumeId
+	}
+	return ""
+}
+
+func (m *Snapshot) GetCreatedAt() int64 {
+	if m != nil {
+		return m.CreatedAt
+	}
+	return 0
+}
+
+func (m *Snapshot) GetStatus() *SnapshotStatus {
+	if m != nil {
+		return m.Status
+	}
+	return nil
+}
+
+// The status of a snapshot.
+type SnapshotStatus struct {
+	// This field is REQUIRED.
+	Type SnapshotStatus_Type `protobuf:"varint,1,opt,name=type,enum=csi.v0.SnapshotStatus_Type" json:"type,omitempty"`
+	// Additional information to describe why a snapshot ended up in the
+	// `ERROR_UPLOADING` status. This field is OPTIONAL.
+	Details              string   `protobuf:"bytes,2,opt,name=details" json:"details,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SnapshotStatus) Reset()         { *m = SnapshotStatus{} }
+func (m *SnapshotStatus) String() string { return proto.CompactTextString(m) }
+func (*SnapshotStatus) ProtoMessage()    {}
+func (*SnapshotStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{33}
+}
+func (m *SnapshotStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SnapshotStatus.Unmarshal(m, b)
+}
+func (m *SnapshotStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SnapshotStatus.Marshal(b, m, deterministic)
+}
+func (dst *SnapshotStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SnapshotStatus.Merge(dst, src)
+}
+func (m *SnapshotStatus) XXX_Size() int {
+	return xxx_messageInfo_SnapshotStatus.Size(m)
+}
+func (m *SnapshotStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_SnapshotStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SnapshotStatus proto.InternalMessageInfo
+
+func (m *SnapshotStatus) GetType() SnapshotStatus_Type {
+	if m != nil {
+		return m.Type
+	}
+	return SnapshotStatus_UNKNOWN
+}
+
+func (m *SnapshotStatus) GetDetails() string {
+	if m != nil {
+		return m.Details
+	}
+	return ""
+}
+
+type DeleteSnapshotRequest struct {
+	// The ID of the snapshot to be deleted.
+	// This field is REQUIRED.
+	SnapshotId string `protobuf:"bytes,1,opt,name=snapshot_id,json=snapshotId" json:"snapshot_id,omitempty"`
+	// Secrets required by plugin to complete snapshot deletion request.
+	// This field is OPTIONAL. Refer to the `Secrets Requirements`
+	// section on how to use this field.
+	DeleteSnapshotSecrets map[string]string `protobuf:"bytes,2,rep,name=delete_snapshot_secrets,json=deleteSnapshotSecrets" json:"delete_snapshot_secrets,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 (m *DeleteSnapshotRequest) Reset()         { *m = DeleteSnapshotRequest{} }
+func (m *DeleteSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSnapshotRequest) ProtoMessage()    {}
+func (*DeleteSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{34}
+}
+func (m *DeleteSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSnapshotRequest.Unmarshal(m, b)
+}
+func (m *DeleteSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSnapshotRequest.Merge(dst, src)
+}
+func (m *DeleteSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSnapshotRequest.Size(m)
+}
+func (m *DeleteSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSnapshotRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteSnapshotRequest proto.InternalMessageInfo
+
+func (m *DeleteSnapshotRequest) GetSnapshotId() string {
+	if m != nil {
+		return m.SnapshotId
+	}
+	return ""
+}
+
+func (m *DeleteSnapshotRequest) GetDeleteSnapshotSecrets() map[string]string {
+	if m != nil {
+		return m.DeleteSnapshotSecrets
+	}
+	return nil
+}
+
+type DeleteSnapshotResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSnapshotResponse) Reset()         { *m = DeleteSnapshotResponse{} }
+func (m *DeleteSnapshotResponse) String() string { return proto.CompactTextString(m) }
+func (*DeleteSnapshotResponse) ProtoMessage()    {}
+func (*DeleteSnapshotResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{35}
+}
+func (m *DeleteSnapshotResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSnapshotResponse.Unmarshal(m, b)
+}
+func (m *DeleteSnapshotResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSnapshotResponse.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSnapshotResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSnapshotResponse.Merge(dst, src)
+}
+func (m *DeleteSnapshotResponse) XXX_Size() int {
+	return xxx_messageInfo_DeleteSnapshotResponse.Size(m)
+}
+func (m *DeleteSnapshotResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSnapshotResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteSnapshotResponse proto.InternalMessageInfo
+
+// List all snapshots on the storage system regardless of how they were
+// created.
+type ListSnapshotsRequest struct {
+	// If specified (non-zero value), the Plugin MUST NOT return more
+	// entries than this number in the response. If the actual number of
+	// entries is more than this number, the Plugin MUST set `next_token`
+	// in the response which can be used to get the next page of entries
+	// in the subsequent `ListSnapshots` call. This field is OPTIONAL. If
+	// not specified (zero value), it means there is no restriction on the
+	// number of entries that can be returned.
+	// The value of this field MUST NOT be negative.
+	MaxEntries int32 `protobuf:"varint,1,opt,name=max_entries,json=maxEntries" json:"max_entries,omitempty"`
+	// A token to specify where to start paginating. Set this field to
+	// `next_token` returned by a previous `ListSnapshots` call to get the
+	// next page of entries. This field is OPTIONAL.
+	// An empty string is equal to an unspecified field value.
+	StartingToken string `protobuf:"bytes,2,opt,name=starting_token,json=startingToken" json:"starting_token,omitempty"`
+	// Identity information for the source volume. This field is OPTIONAL.
+	// It can be used to list snapshots by volume.
+	SourceVolumeId string `protobuf:"bytes,3,opt,name=source_volume_id,json=sourceVolumeId" json:"source_volume_id,omitempty"`
+	// Identity information for a specific snapshot. This field is
+	// OPTIONAL. It can be used to list only a specific snapshot.
+	// ListSnapshots will return with current snapshot information
+	// and will not block if the snapshot is being uploaded.
+	SnapshotId           string   `protobuf:"bytes,4,opt,name=snapshot_id,json=snapshotId" json:"snapshot_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSnapshotsRequest) Reset()         { *m = ListSnapshotsRequest{} }
+func (m *ListSnapshotsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSnapshotsRequest) ProtoMessage()    {}
+func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{36}
+}
+func (m *ListSnapshotsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSnapshotsRequest.Unmarshal(m, b)
+}
+func (m *ListSnapshotsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSnapshotsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSnapshotsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsRequest.Merge(dst, src)
+}
+func (m *ListSnapshotsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSnapshotsRequest.Size(m)
+}
+func (m *ListSnapshotsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSnapshotsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSnapshotsRequest proto.InternalMessageInfo
+
+func (m *ListSnapshotsRequest) GetMaxEntries() int32 {
+	if m != nil {
+		return m.MaxEntries
+	}
+	return 0
+}
+
+func (m *ListSnapshotsRequest) GetStartingToken() string {
+	if m != nil {
+		return m.StartingToken
+	}
+	return ""
+}
+
+func (m *ListSnapshotsRequest) GetSourceVolumeId() string {
+	if m != nil {
+		return m.SourceVolumeId
+	}
+	return ""
+}
+
+func (m *ListSnapshotsRequest) GetSnapshotId() string {
+	if m != nil {
+		return m.SnapshotId
+	}
+	return ""
+}
+
+type ListSnapshotsResponse struct {
+	Entries []*ListSnapshotsResponse_Entry `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty"`
+	// This token allows you to get the next page of entries for
+	// `ListSnapshots` request. If the number of entries is larger than
+	// `max_entries`, use the `next_token` as a value for the
+	// `starting_token` field in the next `ListSnapshots` request. This
+	// field is OPTIONAL.
+	// An empty string is equal to an unspecified field value.
+	NextToken            string   `protobuf:"bytes,2,opt,name=next_token,json=nextToken" json:"next_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSnapshotsResponse) Reset()         { *m = ListSnapshotsResponse{} }
+func (m *ListSnapshotsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSnapshotsResponse) ProtoMessage()    {}
+func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{37}
+}
+func (m *ListSnapshotsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSnapshotsResponse.Unmarshal(m, b)
+}
+func (m *ListSnapshotsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSnapshotsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSnapshotsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsResponse.Merge(dst, src)
+}
+func (m *ListSnapshotsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSnapshotsResponse.Size(m)
+}
+func (m *ListSnapshotsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSnapshotsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSnapshotsResponse proto.InternalMessageInfo
+
+func (m *ListSnapshotsResponse) GetEntries() []*ListSnapshotsResponse_Entry {
+	if m != nil {
+		return m.Entries
+	}
+	return nil
+}
+
+func (m *ListSnapshotsResponse) GetNextToken() string {
+	if m != nil {
+		return m.NextToken
 	}
-	return n
+	return ""
 }
 
-type ControllerServiceCapability_RPC struct {
-	Type ControllerServiceCapability_RPC_Type `protobuf:"varint,1,opt,name=type,enum=csi.v0.ControllerServiceCapability_RPC_Type" json:"type,omitempty"`
+type ListSnapshotsResponse_Entry struct {
+	Snapshot             *Snapshot `protobuf:"bytes,1,opt,name=snapshot" json:"snapshot,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *ControllerServiceCapability_RPC) Reset()         { *m = ControllerServiceCapability_RPC{} }
-func (m *ControllerServiceCapability_RPC) String() string { return proto.CompactTextString(m) }
-func (*ControllerServiceCapability_RPC) ProtoMessage()    {}
-func (*ControllerServiceCapability_RPC) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{26, 0}
+func (m *ListSnapshotsResponse_Entry) Reset()         { *m = ListSnapshotsResponse_Entry{} }
+func (m *ListSnapshotsResponse_Entry) String() string { return proto.CompactTextString(m) }
+func (*ListSnapshotsResponse_Entry) ProtoMessage()    {}
+func (*ListSnapshotsResponse_Entry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{37, 0}
+}
+func (m *ListSnapshotsResponse_Entry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSnapshotsResponse_Entry.Unmarshal(m, b)
+}
+func (m *ListSnapshotsResponse_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSnapshotsResponse_Entry.Marshal(b, m, deterministic)
+}
+func (dst *ListSnapshotsResponse_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsResponse_Entry.Merge(dst, src)
+}
+func (m *ListSnapshotsResponse_Entry) XXX_Size() int {
+	return xxx_messageInfo_ListSnapshotsResponse_Entry.Size(m)
+}
+func (m *ListSnapshotsResponse_Entry) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSnapshotsResponse_Entry.DiscardUnknown(m)
 }
 
-func (m *ControllerServiceCapability_RPC) GetType() ControllerServiceCapability_RPC_Type {
+var xxx_messageInfo_ListSnapshotsResponse_Entry proto.InternalMessageInfo
+
+func (m *ListSnapshotsResponse_Entry) GetSnapshot() *Snapshot {
 	if m != nil {
-		return m.Type
+		return m.Snapshot
 	}
-	return ControllerServiceCapability_RPC_UNKNOWN
+	return nil
 }
 
 type NodeStageVolumeRequest struct {
@@ -1380,33 +3081,41 @@ type NodeStageVolumeRequest struct {
 	// This is a REQUIRED field.
 	VolumeCapability *VolumeCapability `protobuf:"bytes,4,opt,name=volume_capability,json=volumeCapability" json:"volume_capability,omitempty"`
 	// Secrets required by plugin to complete node stage volume request.
-	// A secret is a string to string map where the key identifies the
-	// name of the secret (e.g. "username" or "password"), and the value
-	// contains the secret data (e.g. "bob" or "abc123").
-	// Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-	// Each value MUST contain a valid string. An SP MAY choose to accept
-	// binary (non-string) data by using a binary-to-text encoding scheme,
-	// like base64.
-	// An SP SHALL advertise the requirements for required secret keys and
-	// values in documentation.
-	// CO SHALL permit passing through the required secrets.
-	// A CO MAY pass the same secrets to all RPCs, therefore the keys for
-	// all unique secrets that an SP expects must be unique across all CSI
-	// operations.
-	// This information is sensitive and MUST be treated as such (not
-	// logged, etc.) by the CO.
-	// This field is OPTIONAL.
+	// This field is OPTIONAL. Refer to the `Secrets Requirements`
+	// section on how to use this field.
 	NodeStageSecrets map[string]string `protobuf:"bytes,5,rep,name=node_stage_secrets,json=nodeStageSecrets" json:"node_stage_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Attributes of the volume to publish. This field is OPTIONAL and
-	// MUST match the attributes of the VolumeInfo identified by
+	// MUST match the attributes of the `Volume` identified by
 	// `volume_id`.
-	VolumeAttributes map[string]string `protobuf:"bytes,6,rep,name=volume_attributes,json=volumeAttributes" json:"volume_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	VolumeAttributes     map[string]string `protobuf:"bytes,6,rep,name=volume_attributes,json=volumeAttributes" json:"volume_attributes,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 (m *NodeStageVolumeRequest) Reset()         { *m = NodeStageVolumeRequest{} }
+func (m *NodeStageVolumeRequest) String() string { return proto.CompactTextString(m) }
+func (*NodeStageVolumeRequest) ProtoMessage()    {}
+func (*NodeStageVolumeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{38}
+}
+func (m *NodeStageVolumeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeStageVolumeRequest.Unmarshal(m, b)
+}
+func (m *NodeStageVolumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeStageVolumeRequest.Marshal(b, m, deterministic)
+}
+func (dst *NodeStageVolumeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeStageVolumeRequest.Merge(dst, src)
+}
+func (m *NodeStageVolumeRequest) XXX_Size() int {
+	return xxx_messageInfo_NodeStageVolumeRequest.Size(m)
+}
+func (m *NodeStageVolumeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeStageVolumeRequest.DiscardUnknown(m)
 }
 
-func (m *NodeStageVolumeRequest) Reset()                    { *m = NodeStageVolumeRequest{} }
-func (m *NodeStageVolumeRequest) String() string            { return proto.CompactTextString(m) }
-func (*NodeStageVolumeRequest) ProtoMessage()               {}
-func (*NodeStageVolumeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
+var xxx_messageInfo_NodeStageVolumeRequest proto.InternalMessageInfo
 
 func (m *NodeStageVolumeRequest) GetVolumeId() string {
 	if m != nil {
@@ -1451,12 +3160,34 @@ func (m *NodeStageVolumeRequest) GetVolumeAttributes() map[string]string {
 }
 
 type NodeStageVolumeResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NodeStageVolumeResponse) Reset()         { *m = NodeStageVolumeResponse{} }
+func (m *NodeStageVolumeResponse) String() string { return proto.CompactTextString(m) }
+func (*NodeStageVolumeResponse) ProtoMessage()    {}
+func (*NodeStageVolumeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{39}
+}
+func (m *NodeStageVolumeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeStageVolumeResponse.Unmarshal(m, b)
+}
+func (m *NodeStageVolumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeStageVolumeResponse.Marshal(b, m, deterministic)
+}
+func (dst *NodeStageVolumeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeStageVolumeResponse.Merge(dst, src)
+}
+func (m *NodeStageVolumeResponse) XXX_Size() int {
+	return xxx_messageInfo_NodeStageVolumeResponse.Size(m)
+}
+func (m *NodeStageVolumeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeStageVolumeResponse.DiscardUnknown(m)
 }
 
-func (m *NodeStageVolumeResponse) Reset()                    { *m = NodeStageVolumeResponse{} }
-func (m *NodeStageVolumeResponse) String() string            { return proto.CompactTextString(m) }
-func (*NodeStageVolumeResponse) ProtoMessage()               {}
-func (*NodeStageVolumeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
+var xxx_messageInfo_NodeStageVolumeResponse proto.InternalMessageInfo
 
 type NodeUnstageVolumeRequest struct {
 	// The ID of the volume. This field is REQUIRED.
@@ -1464,13 +3195,35 @@ type NodeUnstageVolumeRequest struct {
 	// The path at which the volume was published. It MUST be an absolute
 	// path in the root filesystem of the process serving this request.
 	// This is a REQUIRED field.
-	StagingTargetPath string `protobuf:"bytes,2,opt,name=staging_target_path,json=stagingTargetPath" json:"staging_target_path,omitempty"`
+	StagingTargetPath    string   `protobuf:"bytes,2,opt,name=staging_target_path,json=stagingTargetPath" json:"staging_target_path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NodeUnstageVolumeRequest) Reset()         { *m = NodeUnstageVolumeRequest{} }
+func (m *NodeUnstageVolumeRequest) String() string { return proto.CompactTextString(m) }
+func (*NodeUnstageVolumeRequest) ProtoMessage()    {}
+func (*NodeUnstageVolumeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{40}
+}
+func (m *NodeUnstageVolumeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeUnstageVolumeRequest.Unmarshal(m, b)
+}
+func (m *NodeUnstageVolumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeUnstageVolumeRequest.Marshal(b, m, deterministic)
+}
+func (dst *NodeUnstageVolumeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeUnstageVolumeRequest.Merge(dst, src)
+}
+func (m *NodeUnstageVolumeRequest) XXX_Size() int {
+	return xxx_messageInfo_NodeUnstageVolumeRequest.Size(m)
+}
+func (m *NodeUnstageVolumeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeUnstageVolumeRequest.DiscardUnknown(m)
 }
 
-func (m *NodeUnstageVolumeRequest) Reset()                    { *m = NodeUnstageVolumeRequest{} }
-func (m *NodeUnstageVolumeRequest) String() string            { return proto.CompactTextString(m) }
-func (*NodeUnstageVolumeRequest) ProtoMessage()               {}
-func (*NodeUnstageVolumeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
+var xxx_messageInfo_NodeUnstageVolumeRequest proto.InternalMessageInfo
 
 func (m *NodeUnstageVolumeRequest) GetVolumeId() string {
 	if m != nil {
@@ -1487,12 +3240,34 @@ func (m *NodeUnstageVolumeRequest) GetStagingTargetPath() string {
 }
 
 type NodeUnstageVolumeResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NodeUnstageVolumeResponse) Reset()         { *m = NodeUnstageVolumeResponse{} }
+func (m *NodeUnstageVolumeResponse) String() string { return proto.CompactTextString(m) }
+func (*NodeUnstageVolumeResponse) ProtoMessage()    {}
+func (*NodeUnstageVolumeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{41}
+}
+func (m *NodeUnstageVolumeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeUnstageVolumeResponse.Unmarshal(m, b)
+}
+func (m *NodeUnstageVolumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeUnstageVolumeResponse.Marshal(b, m, deterministic)
+}
+func (dst *NodeUnstageVolumeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeUnstageVolumeResponse.Merge(dst, src)
+}
+func (m *NodeUnstageVolumeResponse) XXX_Size() int {
+	return xxx_messageInfo_NodeUnstageVolumeResponse.Size(m)
+}
+func (m *NodeUnstageVolumeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeUnstageVolumeResponse.DiscardUnknown(m)
 }
 
-func (m *NodeUnstageVolumeResponse) Reset()                    { *m = NodeUnstageVolumeResponse{} }
-func (m *NodeUnstageVolumeResponse) String() string            { return proto.CompactTextString(m) }
-func (*NodeUnstageVolumeResponse) ProtoMessage()               {}
-func (*NodeUnstageVolumeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
+var xxx_messageInfo_NodeUnstageVolumeResponse proto.InternalMessageInfo
 
 type NodePublishVolumeRequest struct {
 	// The ID of the volume to publish. This field is REQUIRED.
@@ -1524,33 +3299,41 @@ type NodePublishVolumeRequest struct {
 	// REQUIRED.
 	Readonly bool `protobuf:"varint,6,opt,name=readonly" json:"readonly,omitempty"`
 	// Secrets required by plugin to complete node publish volume request.
-	// A secret is a string to string map where the key identifies the
-	// name of the secret (e.g. "username" or "password"), and the value
-	// contains the secret data (e.g. "bob" or "abc123").
-	// Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-	// Each value MUST contain a valid string. An SP MAY choose to accept
-	// binary (non-string) data by using a binary-to-text encoding scheme,
-	// like base64.
-	// An SP SHALL advertise the requirements for required secret keys and
-	// values in documentation.
-	// CO SHALL permit passing through the required secrets.
-	// A CO MAY pass the same secrets to all RPCs, therefore the keys for
-	// all unique secrets that an SP expects must be unique across all CSI
-	// operations.
-	// This information is sensitive and MUST be treated as such (not
-	// logged, etc.) by the CO.
-	// This field is OPTIONAL.
+	// This field is OPTIONAL. Refer to the `Secrets Requirements`
+	// section on how to use this field.
 	NodePublishSecrets map[string]string `protobuf:"bytes,7,rep,name=node_publish_secrets,json=nodePublishSecrets" json:"node_publish_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Attributes of the volume to publish. This field is OPTIONAL and
 	// MUST match the attributes of the Volume identified by
 	// `volume_id`.
-	VolumeAttributes map[string]string `protobuf:"bytes,8,rep,name=volume_attributes,json=volumeAttributes" json:"volume_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	VolumeAttributes     map[string]string `protobuf:"bytes,8,rep,name=volume_attributes,json=volumeAttributes" json:"volume_attributes,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 (m *NodePublishVolumeRequest) Reset()         { *m = NodePublishVolumeRequest{} }
+func (m *NodePublishVolumeRequest) String() string { return proto.CompactTextString(m) }
+func (*NodePublishVolumeRequest) ProtoMessage()    {}
+func (*NodePublishVolumeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{42}
+}
+func (m *NodePublishVolumeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodePublishVolumeRequest.Unmarshal(m, b)
+}
+func (m *NodePublishVolumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodePublishVolumeRequest.Marshal(b, m, deterministic)
+}
+func (dst *NodePublishVolumeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePublishVolumeRequest.Merge(dst, src)
+}
+func (m *NodePublishVolumeRequest) XXX_Size() int {
+	return xxx_messageInfo_NodePublishVolumeRequest.Size(m)
+}
+func (m *NodePublishVolumeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodePublishVolumeRequest.DiscardUnknown(m)
 }
 
-func (m *NodePublishVolumeRequest) Reset()                    { *m = NodePublishVolumeRequest{} }
-func (m *NodePublishVolumeRequest) String() string            { return proto.CompactTextString(m) }
-func (*NodePublishVolumeRequest) ProtoMessage()               {}
-func (*NodePublishVolumeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
+var xxx_messageInfo_NodePublishVolumeRequest proto.InternalMessageInfo
 
 func (m *NodePublishVolumeRequest) GetVolumeId() string {
 	if m != nil {
@@ -1609,12 +3392,34 @@ func (m *NodePublishVolumeRequest) GetVolumeAttributes() map[string]string {
 }
 
 type NodePublishVolumeResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NodePublishVolumeResponse) Reset()         { *m = NodePublishVolumeResponse{} }
+func (m *NodePublishVolumeResponse) String() string { return proto.CompactTextString(m) }
+func (*NodePublishVolumeResponse) ProtoMessage()    {}
+func (*NodePublishVolumeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{43}
+}
+func (m *NodePublishVolumeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodePublishVolumeResponse.Unmarshal(m, b)
+}
+func (m *NodePublishVolumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodePublishVolumeResponse.Marshal(b, m, deterministic)
+}
+func (dst *NodePublishVolumeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePublishVolumeResponse.Merge(dst, src)
+}
+func (m *NodePublishVolumeResponse) XXX_Size() int {
+	return xxx_messageInfo_NodePublishVolumeResponse.Size(m)
+}
+func (m *NodePublishVolumeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodePublishVolumeResponse.DiscardUnknown(m)
 }
 
-func (m *NodePublishVolumeResponse) Reset()                    { *m = NodePublishVolumeResponse{} }
-func (m *NodePublishVolumeResponse) String() string            { return proto.CompactTextString(m) }
-func (*NodePublishVolumeResponse) ProtoMessage()               {}
-func (*NodePublishVolumeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
+var xxx_messageInfo_NodePublishVolumeResponse proto.InternalMessageInfo
 
 type NodeUnpublishVolumeRequest struct {
 	// The ID of the volume. This field is REQUIRED.
@@ -1622,13 +3427,35 @@ type NodeUnpublishVolumeRequest struct {
 	// The path at which the volume was published. It MUST be an absolute
 	// path in the root filesystem of the process serving this request.
 	// This is a REQUIRED field.
-	TargetPath string `protobuf:"bytes,2,opt,name=target_path,json=targetPath" json:"target_path,omitempty"`
+	TargetPath           string   `protobuf:"bytes,2,opt,name=target_path,json=targetPath" json:"target_path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NodeUnpublishVolumeRequest) Reset()         { *m = NodeUnpublishVolumeRequest{} }
+func (m *NodeUnpublishVolumeRequest) String() string { return proto.CompactTextString(m) }
+func (*NodeUnpublishVolumeRequest) ProtoMessage()    {}
+func (*NodeUnpublishVolumeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{44}
+}
+func (m *NodeUnpublishVolumeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeUnpublishVolumeRequest.Unmarshal(m, b)
+}
+func (m *NodeUnpublishVolumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeUnpublishVolumeRequest.Marshal(b, m, deterministic)
+}
+func (dst *NodeUnpublishVolumeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeUnpublishVolumeRequest.Merge(dst, src)
+}
+func (m *NodeUnpublishVolumeRequest) XXX_Size() int {
+	return xxx_messageInfo_NodeUnpublishVolumeRequest.Size(m)
+}
+func (m *NodeUnpublishVolumeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeUnpublishVolumeRequest.DiscardUnknown(m)
 }
 
-func (m *NodeUnpublishVolumeRequest) Reset()                    { *m = NodeUnpublishVolumeRequest{} }
-func (m *NodeUnpublishVolumeRequest) String() string            { return proto.CompactTextString(m) }
-func (*NodeUnpublishVolumeRequest) ProtoMessage()               {}
-func (*NodeUnpublishVolumeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} }
+var xxx_messageInfo_NodeUnpublishVolumeRequest proto.InternalMessageInfo
 
 func (m *NodeUnpublishVolumeRequest) GetVolumeId() string {
 	if m != nil {
@@ -1645,32 +3472,98 @@ func (m *NodeUnpublishVolumeRequest) GetTargetPath() string {
 }
 
 type NodeUnpublishVolumeResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NodeUnpublishVolumeResponse) Reset()         { *m = NodeUnpublishVolumeResponse{} }
+func (m *NodeUnpublishVolumeResponse) String() string { return proto.CompactTextString(m) }
+func (*NodeUnpublishVolumeResponse) ProtoMessage()    {}
+func (*NodeUnpublishVolumeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{45}
+}
+func (m *NodeUnpublishVolumeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeUnpublishVolumeResponse.Unmarshal(m, b)
+}
+func (m *NodeUnpublishVolumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeUnpublishVolumeResponse.Marshal(b, m, deterministic)
+}
+func (dst *NodeUnpublishVolumeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeUnpublishVolumeResponse.Merge(dst, src)
+}
+func (m *NodeUnpublishVolumeResponse) XXX_Size() int {
+	return xxx_messageInfo_NodeUnpublishVolumeResponse.Size(m)
+}
+func (m *NodeUnpublishVolumeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeUnpublishVolumeResponse.DiscardUnknown(m)
 }
 
-func (m *NodeUnpublishVolumeResponse) Reset()                    { *m = NodeUnpublishVolumeResponse{} }
-func (m *NodeUnpublishVolumeResponse) String() string            { return proto.CompactTextString(m) }
-func (*NodeUnpublishVolumeResponse) ProtoMessage()               {}
-func (*NodeUnpublishVolumeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} }
+var xxx_messageInfo_NodeUnpublishVolumeResponse proto.InternalMessageInfo
 
 type NodeGetIdRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NodeGetIdRequest) Reset()                    { *m = NodeGetIdRequest{} }
-func (m *NodeGetIdRequest) String() string            { return proto.CompactTextString(m) }
-func (*NodeGetIdRequest) ProtoMessage()               {}
-func (*NodeGetIdRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} }
+func (m *NodeGetIdRequest) Reset()         { *m = NodeGetIdRequest{} }
+func (m *NodeGetIdRequest) String() string { return proto.CompactTextString(m) }
+func (*NodeGetIdRequest) ProtoMessage()    {}
+func (*NodeGetIdRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{46}
+}
+func (m *NodeGetIdRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeGetIdRequest.Unmarshal(m, b)
+}
+func (m *NodeGetIdRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeGetIdRequest.Marshal(b, m, deterministic)
+}
+func (dst *NodeGetIdRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeGetIdRequest.Merge(dst, src)
+}
+func (m *NodeGetIdRequest) XXX_Size() int {
+	return xxx_messageInfo_NodeGetIdRequest.Size(m)
+}
+func (m *NodeGetIdRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeGetIdRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeGetIdRequest proto.InternalMessageInfo
 
 type NodeGetIdResponse struct {
 	// The ID of the node as understood by the SP which SHALL be used by
 	// CO in subsequent `ControllerPublishVolume`.
 	// This is a REQUIRED field.
-	NodeId string `protobuf:"bytes,1,opt,name=node_id,json=nodeId" json:"node_id,omitempty"`
+	NodeId               string   `protobuf:"bytes,1,opt,name=node_id,json=nodeId" json:"node_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NodeGetIdResponse) Reset()                    { *m = NodeGetIdResponse{} }
-func (m *NodeGetIdResponse) String() string            { return proto.CompactTextString(m) }
-func (*NodeGetIdResponse) ProtoMessage()               {}
-func (*NodeGetIdResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} }
+func (m *NodeGetIdResponse) Reset()         { *m = NodeGetIdResponse{} }
+func (m *NodeGetIdResponse) String() string { return proto.CompactTextString(m) }
+func (*NodeGetIdResponse) ProtoMessage()    {}
+func (*NodeGetIdResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{47}
+}
+func (m *NodeGetIdResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeGetIdResponse.Unmarshal(m, b)
+}
+func (m *NodeGetIdResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeGetIdResponse.Marshal(b, m, deterministic)
+}
+func (dst *NodeGetIdResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeGetIdResponse.Merge(dst, src)
+}
+func (m *NodeGetIdResponse) XXX_Size() int {
+	return xxx_messageInfo_NodeGetIdResponse.Size(m)
+}
+func (m *NodeGetIdResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeGetIdResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeGetIdResponse proto.InternalMessageInfo
 
 func (m *NodeGetIdResponse) GetNodeId() string {
 	if m != nil {
@@ -1680,23 +3573,67 @@ func (m *NodeGetIdResponse) GetNodeId() string {
 }
 
 type NodeGetCapabilitiesRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NodeGetCapabilitiesRequest) Reset()         { *m = NodeGetCapabilitiesRequest{} }
+func (m *NodeGetCapabilitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*NodeGetCapabilitiesRequest) ProtoMessage()    {}
+func (*NodeGetCapabilitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{48}
+}
+func (m *NodeGetCapabilitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeGetCapabilitiesRequest.Unmarshal(m, b)
+}
+func (m *NodeGetCapabilitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeGetCapabilitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *NodeGetCapabilitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeGetCapabilitiesRequest.Merge(dst, src)
+}
+func (m *NodeGetCapabilitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_NodeGetCapabilitiesRequest.Size(m)
+}
+func (m *NodeGetCapabilitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeGetCapabilitiesRequest.DiscardUnknown(m)
 }
 
-func (m *NodeGetCapabilitiesRequest) Reset()                    { *m = NodeGetCapabilitiesRequest{} }
-func (m *NodeGetCapabilitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*NodeGetCapabilitiesRequest) ProtoMessage()               {}
-func (*NodeGetCapabilitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} }
+var xxx_messageInfo_NodeGetCapabilitiesRequest proto.InternalMessageInfo
 
 type NodeGetCapabilitiesResponse struct {
 	// All the capabilities that the node service supports. This field
 	// is OPTIONAL.
-	Capabilities []*NodeServiceCapability `protobuf:"bytes,1,rep,name=capabilities" json:"capabilities,omitempty"`
+	Capabilities         []*NodeServiceCapability `protobuf:"bytes,1,rep,name=capabilities" json:"capabilities,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *NodeGetCapabilitiesResponse) Reset()         { *m = NodeGetCapabilitiesResponse{} }
+func (m *NodeGetCapabilitiesResponse) String() string { return proto.CompactTextString(m) }
+func (*NodeGetCapabilitiesResponse) ProtoMessage()    {}
+func (*NodeGetCapabilitiesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{49}
+}
+func (m *NodeGetCapabilitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeGetCapabilitiesResponse.Unmarshal(m, b)
+}
+func (m *NodeGetCapabilitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeGetCapabilitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *NodeGetCapabilitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeGetCapabilitiesResponse.Merge(dst, src)
+}
+func (m *NodeGetCapabilitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_NodeGetCapabilitiesResponse.Size(m)
+}
+func (m *NodeGetCapabilitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeGetCapabilitiesResponse.DiscardUnknown(m)
 }
 
-func (m *NodeGetCapabilitiesResponse) Reset()                    { *m = NodeGetCapabilitiesResponse{} }
-func (m *NodeGetCapabilitiesResponse) String() string            { return proto.CompactTextString(m) }
-func (*NodeGetCapabilitiesResponse) ProtoMessage()               {}
-func (*NodeGetCapabilitiesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} }
+var xxx_messageInfo_NodeGetCapabilitiesResponse proto.InternalMessageInfo
 
 func (m *NodeGetCapabilitiesResponse) GetCapabilities() []*NodeServiceCapability {
 	if m != nil {
@@ -1709,13 +3646,35 @@ func (m *NodeGetCapabilitiesResponse) GetCapabilities() []*NodeServiceCapability
 type NodeServiceCapability struct {
 	// Types that are valid to be assigned to Type:
 	//	*NodeServiceCapability_Rpc
-	Type isNodeServiceCapability_Type `protobuf_oneof:"type"`
+	Type                 isNodeServiceCapability_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *NodeServiceCapability) Reset()         { *m = NodeServiceCapability{} }
+func (m *NodeServiceCapability) String() string { return proto.CompactTextString(m) }
+func (*NodeServiceCapability) ProtoMessage()    {}
+func (*NodeServiceCapability) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{50}
+}
+func (m *NodeServiceCapability) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeServiceCapability.Unmarshal(m, b)
+}
+func (m *NodeServiceCapability) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeServiceCapability.Marshal(b, m, deterministic)
+}
+func (dst *NodeServiceCapability) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeServiceCapability.Merge(dst, src)
+}
+func (m *NodeServiceCapability) XXX_Size() int {
+	return xxx_messageInfo_NodeServiceCapability.Size(m)
+}
+func (m *NodeServiceCapability) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeServiceCapability.DiscardUnknown(m)
 }
 
-func (m *NodeServiceCapability) Reset()                    { *m = NodeServiceCapability{} }
-func (m *NodeServiceCapability) String() string            { return proto.CompactTextString(m) }
-func (*NodeServiceCapability) ProtoMessage()               {}
-func (*NodeServiceCapability) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} }
+var xxx_messageInfo_NodeServiceCapability proto.InternalMessageInfo
 
 type isNodeServiceCapability_Type interface {
 	isNodeServiceCapability_Type()
@@ -1786,7 +3745,7 @@ func _NodeServiceCapability_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Type.(type) {
 	case *NodeServiceCapability_Rpc:
 		s := proto.Size(x.Rpc)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1797,13 +3756,35 @@ func _NodeServiceCapability_OneofSizer(msg proto.Message) (n int) {
 }
 
 type NodeServiceCapability_RPC struct {
-	Type NodeServiceCapability_RPC_Type `protobuf:"varint,1,opt,name=type,enum=csi.v0.NodeServiceCapability_RPC_Type" json:"type,omitempty"`
+	Type                 NodeServiceCapability_RPC_Type `protobuf:"varint,1,opt,name=type,enum=csi.v0.NodeServiceCapability_RPC_Type" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *NodeServiceCapability_RPC) Reset()         { *m = NodeServiceCapability_RPC{} }
+func (m *NodeServiceCapability_RPC) String() string { return proto.CompactTextString(m) }
+func (*NodeServiceCapability_RPC) ProtoMessage()    {}
+func (*NodeServiceCapability_RPC) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{50, 0}
+}
+func (m *NodeServiceCapability_RPC) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeServiceCapability_RPC.Unmarshal(m, b)
+}
+func (m *NodeServiceCapability_RPC) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeServiceCapability_RPC.Marshal(b, m, deterministic)
+}
+func (dst *NodeServiceCapability_RPC) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeServiceCapability_RPC.Merge(dst, src)
+}
+func (m *NodeServiceCapability_RPC) XXX_Size() int {
+	return xxx_messageInfo_NodeServiceCapability_RPC.Size(m)
+}
+func (m *NodeServiceCapability_RPC) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeServiceCapability_RPC.DiscardUnknown(m)
 }
 
-func (m *NodeServiceCapability_RPC) Reset()                    { *m = NodeServiceCapability_RPC{} }
-func (m *NodeServiceCapability_RPC) String() string            { return proto.CompactTextString(m) }
-func (*NodeServiceCapability_RPC) ProtoMessage()               {}
-func (*NodeServiceCapability_RPC) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39, 0} }
+var xxx_messageInfo_NodeServiceCapability_RPC proto.InternalMessageInfo
 
 func (m *NodeServiceCapability_RPC) GetType() NodeServiceCapability_RPC_Type {
 	if m != nil {
@@ -1812,9 +3793,119 @@ func (m *NodeServiceCapability_RPC) GetType() NodeServiceCapability_RPC_Type {
 	return NodeServiceCapability_RPC_UNKNOWN
 }
 
+type NodeGetInfoRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NodeGetInfoRequest) Reset()         { *m = NodeGetInfoRequest{} }
+func (m *NodeGetInfoRequest) String() string { return proto.CompactTextString(m) }
+func (*NodeGetInfoRequest) ProtoMessage()    {}
+func (*NodeGetInfoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{51}
+}
+func (m *NodeGetInfoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeGetInfoRequest.Unmarshal(m, b)
+}
+func (m *NodeGetInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeGetInfoRequest.Marshal(b, m, deterministic)
+}
+func (dst *NodeGetInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeGetInfoRequest.Merge(dst, src)
+}
+func (m *NodeGetInfoRequest) XXX_Size() int {
+	return xxx_messageInfo_NodeGetInfoRequest.Size(m)
+}
+func (m *NodeGetInfoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeGetInfoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeGetInfoRequest proto.InternalMessageInfo
+
+type NodeGetInfoResponse struct {
+	// The ID of the node as understood by the SP which SHALL be used by
+	// CO in subsequent calls to `ControllerPublishVolume`.
+	// This is a REQUIRED field.
+	NodeId string `protobuf:"bytes,1,opt,name=node_id,json=nodeId" json:"node_id,omitempty"`
+	// Maximum number of volumes that controller can publish to the node.
+	// If value is not set or zero CO SHALL decide how many volumes of
+	// this type can be published by the controller to the node. The
+	// plugin MUST NOT set negative values here.
+	// This field is OPTIONAL.
+	MaxVolumesPerNode int64 `protobuf:"varint,2,opt,name=max_volumes_per_node,json=maxVolumesPerNode" json:"max_volumes_per_node,omitempty"`
+	// Specifies where (regions, zones, racks, etc.) the node is
+	// accessible from.
+	// A plugin that returns this field MUST also set the
+	// ACCESSIBILITY_CONSTRAINTS plugin capability.
+	// COs MAY use this information along with the topology information
+	// returned in CreateVolumeResponse to ensure that a given volume is
+	// accessible from a given node when scheduling workloads.
+	// This field is OPTIONAL. If it is not specified, the CO MAY assume
+	// the node is not subject to any topological constraint, and MAY
+	// schedule workloads that reference any volume V, such that there are
+	// no topological constraints declared for V.
+	//
+	// Example 1:
+	//   accessible_topology =
+	//     {"region": "R1", "zone": "R2"}
+	// Indicates the node exists within the "region" "R1" and the "zone"
+	// "Z2".
+	AccessibleTopology   *Topology `protobuf:"bytes,3,opt,name=accessible_topology,json=accessibleTopology" json:"accessible_topology,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *NodeGetInfoResponse) Reset()         { *m = NodeGetInfoResponse{} }
+func (m *NodeGetInfoResponse) String() string { return proto.CompactTextString(m) }
+func (*NodeGetInfoResponse) ProtoMessage()    {}
+func (*NodeGetInfoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_csi_31237507707d37ec, []int{52}
+}
+func (m *NodeGetInfoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeGetInfoResponse.Unmarshal(m, b)
+}
+func (m *NodeGetInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeGetInfoResponse.Marshal(b, m, deterministic)
+}
+func (dst *NodeGetInfoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeGetInfoResponse.Merge(dst, src)
+}
+func (m *NodeGetInfoResponse) XXX_Size() int {
+	return xxx_messageInfo_NodeGetInfoResponse.Size(m)
+}
+func (m *NodeGetInfoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeGetInfoResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeGetInfoResponse proto.InternalMessageInfo
+
+func (m *NodeGetInfoResponse) GetNodeId() string {
+	if m != nil {
+		return m.NodeId
+	}
+	return ""
+}
+
+func (m *NodeGetInfoResponse) GetMaxVolumesPerNode() int64 {
+	if m != nil {
+		return m.MaxVolumesPerNode
+	}
+	return 0
+}
+
+func (m *NodeGetInfoResponse) GetAccessibleTopology() *Topology {
+	if m != nil {
+		return m.AccessibleTopology
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*GetPluginInfoRequest)(nil), "csi.v0.GetPluginInfoRequest")
 	proto.RegisterType((*GetPluginInfoResponse)(nil), "csi.v0.GetPluginInfoResponse")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.GetPluginInfoResponse.ManifestEntry")
 	proto.RegisterType((*GetPluginCapabilitiesRequest)(nil), "csi.v0.GetPluginCapabilitiesRequest")
 	proto.RegisterType((*GetPluginCapabilitiesResponse)(nil), "csi.v0.GetPluginCapabilitiesResponse")
 	proto.RegisterType((*PluginCapability)(nil), "csi.v0.PluginCapability")
@@ -1822,6 +3913,10 @@ func init() {
 	proto.RegisterType((*ProbeRequest)(nil), "csi.v0.ProbeRequest")
 	proto.RegisterType((*ProbeResponse)(nil), "csi.v0.ProbeResponse")
 	proto.RegisterType((*CreateVolumeRequest)(nil), "csi.v0.CreateVolumeRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.CreateVolumeRequest.ControllerCreateSecretsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.CreateVolumeRequest.ParametersEntry")
+	proto.RegisterType((*VolumeContentSource)(nil), "csi.v0.VolumeContentSource")
+	proto.RegisterType((*VolumeContentSource_SnapshotSource)(nil), "csi.v0.VolumeContentSource.SnapshotSource")
 	proto.RegisterType((*CreateVolumeResponse)(nil), "csi.v0.CreateVolumeResponse")
 	proto.RegisterType((*VolumeCapability)(nil), "csi.v0.VolumeCapability")
 	proto.RegisterType((*VolumeCapability_BlockVolume)(nil), "csi.v0.VolumeCapability.BlockVolume")
@@ -1829,28 +3924,57 @@ func init() {
 	proto.RegisterType((*VolumeCapability_AccessMode)(nil), "csi.v0.VolumeCapability.AccessMode")
 	proto.RegisterType((*CapacityRange)(nil), "csi.v0.CapacityRange")
 	proto.RegisterType((*Volume)(nil), "csi.v0.Volume")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.Volume.AttributesEntry")
+	proto.RegisterType((*TopologyRequirement)(nil), "csi.v0.TopologyRequirement")
+	proto.RegisterType((*Topology)(nil), "csi.v0.Topology")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.Topology.SegmentsEntry")
 	proto.RegisterType((*DeleteVolumeRequest)(nil), "csi.v0.DeleteVolumeRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.DeleteVolumeRequest.ControllerDeleteSecretsEntry")
 	proto.RegisterType((*DeleteVolumeResponse)(nil), "csi.v0.DeleteVolumeResponse")
 	proto.RegisterType((*ControllerPublishVolumeRequest)(nil), "csi.v0.ControllerPublishVolumeRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.ControllerPublishVolumeRequest.ControllerPublishSecretsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.ControllerPublishVolumeRequest.VolumeAttributesEntry")
 	proto.RegisterType((*ControllerPublishVolumeResponse)(nil), "csi.v0.ControllerPublishVolumeResponse")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.ControllerPublishVolumeResponse.PublishInfoEntry")
 	proto.RegisterType((*ControllerUnpublishVolumeRequest)(nil), "csi.v0.ControllerUnpublishVolumeRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.ControllerUnpublishVolumeRequest.ControllerUnpublishSecretsEntry")
 	proto.RegisterType((*ControllerUnpublishVolumeResponse)(nil), "csi.v0.ControllerUnpublishVolumeResponse")
 	proto.RegisterType((*ValidateVolumeCapabilitiesRequest)(nil), "csi.v0.ValidateVolumeCapabilitiesRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.ValidateVolumeCapabilitiesRequest.VolumeAttributesEntry")
 	proto.RegisterType((*ValidateVolumeCapabilitiesResponse)(nil), "csi.v0.ValidateVolumeCapabilitiesResponse")
 	proto.RegisterType((*ListVolumesRequest)(nil), "csi.v0.ListVolumesRequest")
 	proto.RegisterType((*ListVolumesResponse)(nil), "csi.v0.ListVolumesResponse")
 	proto.RegisterType((*ListVolumesResponse_Entry)(nil), "csi.v0.ListVolumesResponse.Entry")
 	proto.RegisterType((*GetCapacityRequest)(nil), "csi.v0.GetCapacityRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.GetCapacityRequest.ParametersEntry")
 	proto.RegisterType((*GetCapacityResponse)(nil), "csi.v0.GetCapacityResponse")
 	proto.RegisterType((*ControllerGetCapabilitiesRequest)(nil), "csi.v0.ControllerGetCapabilitiesRequest")
 	proto.RegisterType((*ControllerGetCapabilitiesResponse)(nil), "csi.v0.ControllerGetCapabilitiesResponse")
 	proto.RegisterType((*ControllerServiceCapability)(nil), "csi.v0.ControllerServiceCapability")
 	proto.RegisterType((*ControllerServiceCapability_RPC)(nil), "csi.v0.ControllerServiceCapability.RPC")
+	proto.RegisterType((*CreateSnapshotRequest)(nil), "csi.v0.CreateSnapshotRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.CreateSnapshotRequest.CreateSnapshotSecretsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.CreateSnapshotRequest.ParametersEntry")
+	proto.RegisterType((*CreateSnapshotResponse)(nil), "csi.v0.CreateSnapshotResponse")
+	proto.RegisterType((*Snapshot)(nil), "csi.v0.Snapshot")
+	proto.RegisterType((*SnapshotStatus)(nil), "csi.v0.SnapshotStatus")
+	proto.RegisterType((*DeleteSnapshotRequest)(nil), "csi.v0.DeleteSnapshotRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.DeleteSnapshotRequest.DeleteSnapshotSecretsEntry")
+	proto.RegisterType((*DeleteSnapshotResponse)(nil), "csi.v0.DeleteSnapshotResponse")
+	proto.RegisterType((*ListSnapshotsRequest)(nil), "csi.v0.ListSnapshotsRequest")
+	proto.RegisterType((*ListSnapshotsResponse)(nil), "csi.v0.ListSnapshotsResponse")
+	proto.RegisterType((*ListSnapshotsResponse_Entry)(nil), "csi.v0.ListSnapshotsResponse.Entry")
 	proto.RegisterType((*NodeStageVolumeRequest)(nil), "csi.v0.NodeStageVolumeRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.NodeStageVolumeRequest.NodeStageSecretsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.NodeStageVolumeRequest.PublishInfoEntry")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.NodeStageVolumeRequest.VolumeAttributesEntry")
 	proto.RegisterType((*NodeStageVolumeResponse)(nil), "csi.v0.NodeStageVolumeResponse")
 	proto.RegisterType((*NodeUnstageVolumeRequest)(nil), "csi.v0.NodeUnstageVolumeRequest")
 	proto.RegisterType((*NodeUnstageVolumeResponse)(nil), "csi.v0.NodeUnstageVolumeResponse")
 	proto.RegisterType((*NodePublishVolumeRequest)(nil), "csi.v0.NodePublishVolumeRequest")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.NodePublishVolumeRequest.NodePublishSecretsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.NodePublishVolumeRequest.PublishInfoEntry")
+	proto.RegisterMapType((map[string]string)(nil), "csi.v0.NodePublishVolumeRequest.VolumeAttributesEntry")
 	proto.RegisterType((*NodePublishVolumeResponse)(nil), "csi.v0.NodePublishVolumeResponse")
 	proto.RegisterType((*NodeUnpublishVolumeRequest)(nil), "csi.v0.NodeUnpublishVolumeRequest")
 	proto.RegisterType((*NodeUnpublishVolumeResponse)(nil), "csi.v0.NodeUnpublishVolumeResponse")
@@ -1860,9 +3984,12 @@ func init() {
 	proto.RegisterType((*NodeGetCapabilitiesResponse)(nil), "csi.v0.NodeGetCapabilitiesResponse")
 	proto.RegisterType((*NodeServiceCapability)(nil), "csi.v0.NodeServiceCapability")
 	proto.RegisterType((*NodeServiceCapability_RPC)(nil), "csi.v0.NodeServiceCapability.RPC")
+	proto.RegisterType((*NodeGetInfoRequest)(nil), "csi.v0.NodeGetInfoRequest")
+	proto.RegisterType((*NodeGetInfoResponse)(nil), "csi.v0.NodeGetInfoResponse")
 	proto.RegisterEnum("csi.v0.PluginCapability_Service_Type", PluginCapability_Service_Type_name, PluginCapability_Service_Type_value)
 	proto.RegisterEnum("csi.v0.VolumeCapability_AccessMode_Mode", VolumeCapability_AccessMode_Mode_name, VolumeCapability_AccessMode_Mode_value)
 	proto.RegisterEnum("csi.v0.ControllerServiceCapability_RPC_Type", ControllerServiceCapability_RPC_Type_name, ControllerServiceCapability_RPC_Type_value)
+	proto.RegisterEnum("csi.v0.SnapshotStatus_Type", SnapshotStatus_Type_name, SnapshotStatus_Type_value)
 	proto.RegisterEnum("csi.v0.NodeServiceCapability_RPC_Type", NodeServiceCapability_RPC_Type_name, NodeServiceCapability_RPC_Type_value)
 }
 
@@ -2015,6 +4142,9 @@ type ControllerClient interface {
 	ListVolumes(ctx context.Context, in *ListVolumesRequest, opts ...grpc.CallOption) (*ListVolumesResponse, error)
 	GetCapacity(ctx context.Context, in *GetCapacityRequest, opts ...grpc.CallOption) (*GetCapacityResponse, error)
 	ControllerGetCapabilities(ctx context.Context, in *ControllerGetCapabilitiesRequest, opts ...grpc.CallOption) (*ControllerGetCapabilitiesResponse, error)
+	CreateSnapshot(ctx context.Context, in *CreateSnapshotRequest, opts ...grpc.CallOption) (*CreateSnapshotResponse, error)
+	DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*DeleteSnapshotResponse, error)
+	ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error)
 }
 
 type controllerClient struct {
@@ -2097,6 +4227,33 @@ func (c *controllerClient) ControllerGetCapabilities(ctx context.Context, in *Co
 	return out, nil
 }
 
+func (c *controllerClient) CreateSnapshot(ctx context.Context, in *CreateSnapshotRequest, opts ...grpc.CallOption) (*CreateSnapshotResponse, error) {
+	out := new(CreateSnapshotResponse)
+	err := grpc.Invoke(ctx, "/csi.v0.Controller/CreateSnapshot", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *controllerClient) DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*DeleteSnapshotResponse, error) {
+	out := new(DeleteSnapshotResponse)
+	err := grpc.Invoke(ctx, "/csi.v0.Controller/DeleteSnapshot", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *controllerClient) ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error) {
+	out := new(ListSnapshotsResponse)
+	err := grpc.Invoke(ctx, "/csi.v0.Controller/ListSnapshots", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for Controller service
 
 type ControllerServer interface {
@@ -2108,6 +4265,9 @@ type ControllerServer interface {
 	ListVolumes(context.Context, *ListVolumesRequest) (*ListVolumesResponse, error)
 	GetCapacity(context.Context, *GetCapacityRequest) (*GetCapacityResponse, error)
 	ControllerGetCapabilities(context.Context, *ControllerGetCapabilitiesRequest) (*ControllerGetCapabilitiesResponse, error)
+	CreateSnapshot(context.Context, *CreateSnapshotRequest) (*CreateSnapshotResponse, error)
+	DeleteSnapshot(context.Context, *DeleteSnapshotRequest) (*DeleteSnapshotResponse, error)
+	ListSnapshots(context.Context, *ListSnapshotsRequest) (*ListSnapshotsResponse, error)
 }
 
 func RegisterControllerServer(s *grpc.Server, srv ControllerServer) {
@@ -2258,6 +4418,60 @@ func _Controller_ControllerGetCapabilities_Handler(srv interface{}, ctx context.
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Controller_CreateSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateSnapshotRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ControllerServer).CreateSnapshot(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/csi.v0.Controller/CreateSnapshot",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ControllerServer).CreateSnapshot(ctx, req.(*CreateSnapshotRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Controller_DeleteSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteSnapshotRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ControllerServer).DeleteSnapshot(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/csi.v0.Controller/DeleteSnapshot",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ControllerServer).DeleteSnapshot(ctx, req.(*DeleteSnapshotRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Controller_ListSnapshots_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListSnapshotsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ControllerServer).ListSnapshots(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/csi.v0.Controller/ListSnapshots",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ControllerServer).ListSnapshots(ctx, req.(*ListSnapshotsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Controller_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "csi.v0.Controller",
 	HandlerType: (*ControllerServer)(nil),
@@ -2294,6 +4508,18 @@ var _Controller_serviceDesc = grpc.ServiceDesc{
 			MethodName: "ControllerGetCapabilities",
 			Handler:    _Controller_ControllerGetCapabilities_Handler,
 		},
+		{
+			MethodName: "CreateSnapshot",
+			Handler:    _Controller_CreateSnapshot_Handler,
+		},
+		{
+			MethodName: "DeleteSnapshot",
+			Handler:    _Controller_DeleteSnapshot_Handler,
+		},
+		{
+			MethodName: "ListSnapshots",
+			Handler:    _Controller_ListSnapshots_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "csi.proto",
@@ -2306,8 +4532,15 @@ type NodeClient interface {
 	NodeUnstageVolume(ctx context.Context, in *NodeUnstageVolumeRequest, opts ...grpc.CallOption) (*NodeUnstageVolumeResponse, error)
 	NodePublishVolume(ctx context.Context, in *NodePublishVolumeRequest, opts ...grpc.CallOption) (*NodePublishVolumeResponse, error)
 	NodeUnpublishVolume(ctx context.Context, in *NodeUnpublishVolumeRequest, opts ...grpc.CallOption) (*NodeUnpublishVolumeResponse, error)
+	// NodeGetId is being deprecated in favor of NodeGetInfo and will be
+	// removed in CSI 1.0. Existing drivers, however, may depend on this
+	// RPC call and hence this RPC call MUST be implemented by the CSI
+	// plugin prior to v1.0.
 	NodeGetId(ctx context.Context, in *NodeGetIdRequest, opts ...grpc.CallOption) (*NodeGetIdResponse, error)
 	NodeGetCapabilities(ctx context.Context, in *NodeGetCapabilitiesRequest, opts ...grpc.CallOption) (*NodeGetCapabilitiesResponse, error)
+	// Prior to CSI 1.0 - CSI plugins MUST implement both NodeGetId and
+	// NodeGetInfo RPC calls.
+	NodeGetInfo(ctx context.Context, in *NodeGetInfoRequest, opts ...grpc.CallOption) (*NodeGetInfoResponse, error)
 }
 
 type nodeClient struct {
@@ -2354,6 +4587,7 @@ func (c *nodeClient) NodeUnpublishVolume(ctx context.Context, in *NodeUnpublishV
 	return out, nil
 }
 
+// Deprecated: Do not use.
 func (c *nodeClient) NodeGetId(ctx context.Context, in *NodeGetIdRequest, opts ...grpc.CallOption) (*NodeGetIdResponse, error) {
 	out := new(NodeGetIdResponse)
 	err := grpc.Invoke(ctx, "/csi.v0.Node/NodeGetId", in, out, c.cc, opts...)
@@ -2372,6 +4606,15 @@ func (c *nodeClient) NodeGetCapabilities(ctx context.Context, in *NodeGetCapabil
 	return out, nil
 }
 
+func (c *nodeClient) NodeGetInfo(ctx context.Context, in *NodeGetInfoRequest, opts ...grpc.CallOption) (*NodeGetInfoResponse, error) {
+	out := new(NodeGetInfoResponse)
+	err := grpc.Invoke(ctx, "/csi.v0.Node/NodeGetInfo", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for Node service
 
 type NodeServer interface {
@@ -2379,8 +4622,15 @@ type NodeServer interface {
 	NodeUnstageVolume(context.Context, *NodeUnstageVolumeRequest) (*NodeUnstageVolumeResponse, error)
 	NodePublishVolume(context.Context, *NodePublishVolumeRequest) (*NodePublishVolumeResponse, error)
 	NodeUnpublishVolume(context.Context, *NodeUnpublishVolumeRequest) (*NodeUnpublishVolumeResponse, error)
+	// NodeGetId is being deprecated in favor of NodeGetInfo and will be
+	// removed in CSI 1.0. Existing drivers, however, may depend on this
+	// RPC call and hence this RPC call MUST be implemented by the CSI
+	// plugin prior to v1.0.
 	NodeGetId(context.Context, *NodeGetIdRequest) (*NodeGetIdResponse, error)
 	NodeGetCapabilities(context.Context, *NodeGetCapabilitiesRequest) (*NodeGetCapabilitiesResponse, error)
+	// Prior to CSI 1.0 - CSI plugins MUST implement both NodeGetId and
+	// NodeGetInfo RPC calls.
+	NodeGetInfo(context.Context, *NodeGetInfoRequest) (*NodeGetInfoResponse, error)
 }
 
 func RegisterNodeServer(s *grpc.Server, srv NodeServer) {
@@ -2495,6 +4745,24 @@ func _Node_NodeGetCapabilities_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Node_NodeGetInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(NodeGetInfoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NodeServer).NodeGetInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/csi.v0.Node/NodeGetInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NodeServer).NodeGetInfo(ctx, req.(*NodeGetInfoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Node_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "csi.v0.Node",
 	HandlerType: (*NodeServer)(nil),
@@ -2523,149 +4791,201 @@ var _Node_serviceDesc = grpc.ServiceDesc{
 			MethodName: "NodeGetCapabilities",
 			Handler:    _Node_NodeGetCapabilities_Handler,
 		},
+		{
+			MethodName: "NodeGetInfo",
+			Handler:    _Node_NodeGetInfo_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "csi.proto",
 }
 
-func init() { proto.RegisterFile("csi.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 2173 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x1a, 0x4d, 0x53, 0xe3, 0xc8,
-	0x15, 0xf9, 0x0b, 0x78, 0x06, 0xd6, 0xd3, 0x30, 0x83, 0x11, 0x30, 0x03, 0x62, 0x67, 0x96, 0xfd,
-	0xf2, 0x26, 0x24, 0xd9, 0xda, 0xec, 0x90, 0x49, 0xc0, 0x28, 0xe0, 0xc5, 0x18, 0x4a, 0x18, 0xa6,
-	0x76, 0xb2, 0x29, 0xad, 0xb0, 0x1b, 0x46, 0x19, 0x23, 0x79, 0x24, 0x99, 0x1a, 0x6e, 0xa9, 0x5c,
-	0x52, 0x95, 0x5b, 0xee, 0x49, 0xa5, 0x2a, 0xc7, 0x9c, 0x73, 0x48, 0x55, 0xaa, 0xe6, 0x9c, 0xaa,
-	0xfc, 0x81, 0x9c, 0xf2, 0x03, 0x52, 0x39, 0xe6, 0x94, 0x53, 0x4a, 0xdd, 0x2d, 0xb9, 0x25, 0xb7,
-	0x64, 0x7b, 0x67, 0x6a, 0x2b, 0x27, 0xac, 0xf7, 0xdd, 0xaf, 0xdf, 0x7b, 0xfd, 0x5e, 0x37, 0x30,
-	0xdd, 0x72, 0xcd, 0x4a, 0xd7, 0xb1, 0x3d, 0x1b, 0x15, 0xfc, 0x9f, 0x37, 0xdf, 0x51, 0xee, 0xc1,
-	0xc2, 0x3e, 0xf6, 0x4e, 0x3a, 0xbd, 0x2b, 0xd3, 0xaa, 0x59, 0x97, 0xb6, 0x86, 0x5f, 0xf6, 0xb0,
-	0xeb, 0x29, 0xff, 0x90, 0xe0, 0x6e, 0x0c, 0xe1, 0x76, 0x6d, 0xcb, 0xc5, 0x08, 0x41, 0xce, 0x32,
-	0xae, 0x71, 0x59, 0x5a, 0x93, 0x36, 0xa7, 0x35, 0xf2, 0x1b, 0x3d, 0x84, 0xb9, 0x1b, 0x6c, 0xb5,
-	0x6d, 0x47, 0xbf, 0xc1, 0x8e, 0x6b, 0xda, 0x56, 0x39, 0x43, 0xb0, 0xb3, 0x14, 0x7a, 0x4e, 0x81,
-	0x68, 0x1f, 0xa6, 0xae, 0x0d, 0xcb, 0xbc, 0xc4, 0xae, 0x57, 0xce, 0xae, 0x65, 0x37, 0x8b, 0x5b,
-	0x1f, 0x56, 0xa8, 0x1d, 0x15, 0xa1, 0xae, 0xca, 0x11, 0xa3, 0x56, 0x2d, 0xcf, 0xb9, 0xd5, 0x42,
-	0x66, 0xf9, 0x31, 0xcc, 0x46, 0x50, 0xa8, 0x04, 0xd9, 0x17, 0xf8, 0x96, 0xd9, 0xe4, 0xff, 0x44,
-	0x0b, 0x90, 0xbf, 0x31, 0x3a, 0x3d, 0xcc, 0x2c, 0xa1, 0x1f, 0x9f, 0x67, 0x3e, 0x93, 0x94, 0xfb,
-	0xb0, 0x12, 0x6a, 0xab, 0x1a, 0x5d, 0xe3, 0xc2, 0xec, 0x98, 0x9e, 0x89, 0xdd, 0x60, 0xe9, 0x3f,
-	0x87, 0xd5, 0x04, 0x3c, 0xf3, 0xc0, 0x36, 0xcc, 0xb4, 0x38, 0x78, 0x39, 0x43, 0x96, 0x52, 0x0e,
-	0x96, 0x12, 0xe3, 0xbc, 0xd5, 0x22, 0xd4, 0xca, 0xdf, 0x25, 0x28, 0xc5, 0x49, 0xd0, 0x36, 0x4c,
-	0xba, 0xd8, 0xb9, 0x31, 0x5b, 0xd4, 0xaf, 0xc5, 0xad, 0xb5, 0x24, 0x69, 0x95, 0x53, 0x4a, 0x77,
-	0x30, 0xa1, 0x05, 0x2c, 0xf2, 0x4b, 0x98, 0x64, 0x50, 0xf4, 0x43, 0xc8, 0x79, 0xb7, 0x5d, 0x2a,
-	0x65, 0x6e, 0xeb, 0xe1, 0x30, 0x29, 0x95, 0xe6, 0x6d, 0x17, 0x6b, 0x84, 0x45, 0xf9, 0x10, 0x72,
-	0xfe, 0x17, 0x2a, 0xc2, 0xe4, 0x59, 0xe3, 0xb0, 0x71, 0xfc, 0xb4, 0x51, 0x9a, 0x40, 0xf7, 0x00,
-	0x55, 0x8f, 0x1b, 0x4d, 0xed, 0xb8, 0x5e, 0x57, 0x35, 0xfd, 0x54, 0xd5, 0xce, 0x6b, 0x55, 0xb5,
-	0x24, 0xed, 0x16, 0xa8, 0x1e, 0x65, 0x0e, 0x66, 0x4e, 0x1c, 0xfb, 0x02, 0x07, 0xce, 0x7b, 0x07,
-	0x66, 0xd9, 0x37, 0x75, 0x96, 0xf2, 0xcb, 0x1c, 0xcc, 0x57, 0x1d, 0x6c, 0x78, 0xf8, 0xdc, 0xee,
-	0xf4, 0xae, 0x03, 0x42, 0x61, 0x18, 0x6d, 0xc3, 0x9c, 0xef, 0xaa, 0x96, 0xe9, 0xdd, 0xea, 0x8e,
-	0x61, 0x5d, 0xd1, 0xcd, 0x2b, 0x6e, 0xdd, 0x0d, 0x96, 0x51, 0x65, 0x58, 0xcd, 0x47, 0x6a, 0xb3,
-	0x2d, 0xfe, 0x13, 0xd5, 0x60, 0xfe, 0x86, 0xa8, 0xd0, 0x23, 0xbb, 0x93, 0x8d, 0xee, 0x0e, 0xb5,
-	0x82, 0xdb, 0x1d, 0x74, 0x13, 0x85, 0x98, 0xd8, 0x45, 0x87, 0x00, 0x5d, 0xc3, 0x31, 0xae, 0xb1,
-	0x87, 0x1d, 0xb7, 0x9c, 0x8b, 0x86, 0xaa, 0x60, 0x35, 0x95, 0x93, 0x90, 0x9a, 0x86, 0x2a, 0xc7,
-	0x8e, 0x3c, 0x58, 0x6a, 0xd9, 0x96, 0xe7, 0xd8, 0x9d, 0x0e, 0x76, 0xf4, 0x16, 0xe1, 0xd6, 0x5d,
-	0xdc, 0x72, 0xb0, 0xe7, 0x96, 0xf3, 0x44, 0xf6, 0x67, 0x69, 0xb2, 0xab, 0x21, 0x33, 0xc5, 0x9e,
-	0x52, 0x56, 0xaa, 0x68, 0xb1, 0x25, 0xc6, 0xca, 0x3f, 0x82, 0x77, 0x62, 0x46, 0x8d, 0x93, 0x24,
-	0xf2, 0x17, 0xb0, 0x92, 0xa6, 0x77, 0xac, 0x84, 0x7b, 0x02, 0x0b, 0xd1, 0x75, 0xb1, 0x3c, 0x7a,
-	0x04, 0x05, 0xea, 0x7b, 0x16, 0xf3, 0x73, 0xd1, 0x3d, 0xd2, 0x18, 0x56, 0xf9, 0x53, 0x0e, 0x4a,
-	0xf1, 0x6d, 0x43, 0xdb, 0x90, 0xbf, 0xe8, 0xd8, 0xad, 0x17, 0x8c, 0xf7, 0xdd, 0xa4, 0xfd, 0xad,
-	0xec, 0xfa, 0x54, 0x14, 0x7a, 0x30, 0xa1, 0x51, 0x26, 0x9f, 0xfb, 0xda, 0xee, 0x59, 0x1e, 0x0b,
-	0xb0, 0x64, 0xee, 0x23, 0x9f, 0xaa, 0xcf, 0x4d, 0x98, 0xd0, 0x1e, 0x14, 0x8d, 0x56, 0x0b, 0xbb,
-	0xae, 0x7e, 0x6d, 0xb7, 0x71, 0x39, 0x4b, 0x64, 0x6c, 0x24, 0xca, 0xd8, 0x21, 0xb4, 0x47, 0x76,
-	0x1b, 0x6b, 0x60, 0x84, 0xbf, 0xe5, 0x59, 0x28, 0x72, 0xb6, 0xc9, 0xfb, 0x50, 0xe4, 0x94, 0xa1,
-	0x45, 0x98, 0xbc, 0x74, 0xf5, 0x30, 0x97, 0xa7, 0xb5, 0xc2, 0xa5, 0x4b, 0xd2, 0xf3, 0x01, 0x14,
-	0x89, 0x15, 0xfa, 0x65, 0xc7, 0xb8, 0xa2, 0xc5, 0x67, 0x5a, 0x03, 0x02, 0xfa, 0xa9, 0x0f, 0x91,
-	0xff, 0x2d, 0x01, 0xf4, 0x55, 0xa2, 0x6d, 0xc8, 0x11, 0x2b, 0x69, 0x45, 0xd8, 0x1c, 0xc1, 0xca,
-	0x0a, 0x31, 0x95, 0x70, 0x29, 0x7f, 0x90, 0x20, 0x47, 0xc4, 0xc4, 0xab, 0xc2, 0x69, 0xad, 0xb1,
-	0x5f, 0x57, 0xf5, 0xc6, 0xf1, 0x9e, 0xaa, 0x3f, 0xd5, 0x6a, 0x4d, 0x55, 0x2b, 0x49, 0x68, 0x19,
-	0x16, 0x79, 0xb8, 0xa6, 0xee, 0xec, 0xa9, 0x9a, 0x7e, 0xdc, 0xa8, 0x7f, 0x59, 0xca, 0x20, 0x19,
-	0xee, 0x1d, 0x9d, 0xd5, 0x9b, 0xb5, 0x41, 0x5c, 0x16, 0xad, 0x40, 0x99, 0xc3, 0x31, 0x19, 0x4c,
-	0x6c, 0xce, 0x17, 0xcb, 0x61, 0xe9, 0x4f, 0x86, 0xcc, 0xef, 0xce, 0x86, 0x9b, 0x41, 0x0a, 0xd2,
-	0x53, 0x98, 0x8d, 0x54, 0x09, 0xff, 0x6c, 0x72, 0xf0, 0xcb, 0x9e, 0xe9, 0xe0, 0xb6, 0x7e, 0x71,
-	0xeb, 0x61, 0x97, 0x78, 0x22, 0xab, 0xcd, 0x06, 0xd0, 0x5d, 0x1f, 0xe8, 0xbb, 0xb5, 0x63, 0x5e,
-	0x9b, 0x1e, 0xa3, 0xc9, 0x10, 0x1a, 0x20, 0x20, 0x42, 0xa0, 0xbc, 0x96, 0xa0, 0xc0, 0xf6, 0xe6,
-	0x21, 0x57, 0xa7, 0x22, 0x22, 0x03, 0x28, 0x15, 0x39, 0x07, 0x19, 0xb3, 0xcd, 0xd2, 0x21, 0x63,
-	0xb6, 0xd1, 0x13, 0x00, 0xc3, 0xf3, 0x1c, 0xf3, 0xa2, 0xe7, 0x85, 0x75, 0xe9, 0x7e, 0x74, 0x3f,
-	0x2a, 0x3b, 0x21, 0x01, 0x2b, 0x24, 0x7d, 0x0e, 0x3f, 0xa5, 0x63, 0xe8, 0xb1, 0xd2, 0xf0, 0x3f,
-	0x12, 0xcc, 0xef, 0xe1, 0x0e, 0x8e, 0x57, 0xe2, 0x65, 0x98, 0x66, 0x75, 0xd3, 0x6c, 0x33, 0x49,
-	0x53, 0x14, 0x50, 0x6b, 0xc7, 0x8a, 0x57, 0x9b, 0xb0, 0x87, 0xc5, 0x2b, 0x13, 0x2d, 0x5e, 0x02,
-	0xe1, 0x5c, 0xf1, 0xa2, 0xd8, 0xa4, 0xe2, 0x15, 0xc1, 0x46, 0xab, 0xcf, 0x20, 0xe3, 0x58, 0xcb,
-	0xbe, 0x07, 0x0b, 0x51, 0xc3, 0xd8, 0xc1, 0xf4, 0xd7, 0x1c, 0xdc, 0xef, 0x2b, 0x39, 0xe9, 0x5d,
-	0x74, 0x4c, 0xf7, 0xf9, 0x18, 0x9e, 0x59, 0x84, 0x49, 0xcb, 0x6e, 0x13, 0x14, 0xd5, 0x59, 0xf0,
-	0x3f, 0x6b, 0x6d, 0xa4, 0xc2, 0x9d, 0xf8, 0x39, 0x74, 0xcb, 0x6a, 0x44, 0xf2, 0x29, 0x54, 0xba,
-	0x89, 0x17, 0x38, 0x19, 0xa6, 0x1c, 0x6c, 0xb4, 0x6d, 0xab, 0x73, 0x5b, 0xce, 0xad, 0x49, 0x9b,
-	0x53, 0x5a, 0xf8, 0x8d, 0x7e, 0x25, 0x81, 0xcc, 0x6d, 0x4b, 0x97, 0x1a, 0x1f, 0x3b, 0x54, 0xf6,
-	0xc2, 0x43, 0x25, 0x75, 0x95, 0x83, 0xe8, 0xc8, 0x1e, 0x95, 0x5b, 0x09, 0x68, 0x64, 0x86, 0xeb,
-	0xe4, 0xa2, 0xba, 0x40, 0x54, 0x6f, 0x8f, 0xa8, 0x9a, 0x7e, 0xc5, 0x63, 0x9e, 0xf9, 0xa2, 0x0f,
-	0x96, 0x0f, 0x61, 0x35, 0xd5, 0xca, 0xb1, 0x8e, 0xb6, 0x2a, 0xdc, 0x15, 0xea, 0x1d, 0x2b, 0xaa,
-	0x5e, 0x4b, 0xf0, 0x20, 0x71, 0x71, 0xec, 0x7c, 0xfb, 0x19, 0xcc, 0x04, 0x3b, 0x63, 0x5a, 0x97,
-	0x76, 0x59, 0x8a, 0x9d, 0xf5, 0xe9, 0xec, 0x15, 0x06, 0xf5, 0x1b, 0x62, 0xea, 0x97, 0x62, 0xb7,
-	0x0f, 0x91, 0x9f, 0x40, 0x29, 0x4e, 0x30, 0xd6, 0x02, 0xfe, 0x9c, 0x81, 0xb5, 0xbe, 0x05, 0x67,
-	0x56, 0xf7, 0xed, 0x25, 0xc0, 0x6f, 0x24, 0x58, 0xe1, 0xa2, 0xb3, 0x67, 0xc5, 0xe3, 0x93, 0x96,
-	0xbe, 0x83, 0x41, 0x47, 0x88, 0xcd, 0x10, 0x11, 0x44, 0x62, 0x94, 0xcb, 0x85, 0x38, 0x81, 0x7c,
-	0xc4, 0xef, 0x93, 0x90, 0x7d, 0x2c, 0xb7, 0x6d, 0xc0, 0x7a, 0x8a, 0xb9, 0xac, 0xb4, 0xbc, 0xce,
-	0xc0, 0xfa, 0xb9, 0xd1, 0x31, 0xdb, 0x61, 0xcf, 0x23, 0x98, 0x33, 0xd2, 0x9d, 0x9b, 0xd0, 0xcc,
-	0x66, 0xbe, 0x41, 0x33, 0xdb, 0x11, 0xe5, 0x29, 0xdd, 0x82, 0x1f, 0x87, 0x82, 0x86, 0x59, 0x3b,
-	0x72, 0xaa, 0xbe, 0x95, 0xec, 0xfa, 0x0a, 0x94, 0x34, 0x8b, 0x58, 0x7e, 0xad, 0xc0, 0xb4, 0xdb,
-	0xeb, 0x76, 0x6d, 0xc7, 0xc3, 0xd4, 0x81, 0x53, 0x5a, 0x1f, 0x80, 0xca, 0x30, 0x79, 0x8d, 0x5d,
-	0xd7, 0xb8, 0x0a, 0xe4, 0x07, 0x9f, 0xca, 0x57, 0x80, 0xea, 0xa6, 0xcb, 0x1a, 0xad, 0x70, 0x3b,
-	0xfc, 0xbe, 0xca, 0x78, 0xa5, 0x63, 0xcb, 0x73, 0x4c, 0x76, 0xa2, 0xe7, 0x35, 0xb8, 0x36, 0x5e,
-	0xa9, 0x14, 0xe2, 0x9f, 0xfa, 0xae, 0x67, 0x38, 0x9e, 0x69, 0x5d, 0xe9, 0x9e, 0xfd, 0x02, 0x87,
-	0x43, 0x6e, 0x00, 0x6d, 0xfa, 0x40, 0xe5, 0x8f, 0x12, 0xcc, 0x47, 0xc4, 0x33, 0x6b, 0x1f, 0xc3,
-	0x64, 0x5f, 0xb6, 0xef, 0xfc, 0xf5, 0xc0, 0xf9, 0x02, 0xea, 0x0a, 0x75, 0x6f, 0xc0, 0x81, 0x56,
-	0x01, 0x2c, 0xfc, 0xca, 0x8b, 0xe8, 0x9d, 0xf6, 0x21, 0x44, 0xa7, 0xfc, 0x09, 0xe4, 0xa9, 0x93,
-	0x47, 0x6d, 0xa9, 0xff, 0x25, 0x01, 0xda, 0xc7, 0x5e, 0xd8, 0x29, 0x31, 0x1f, 0x24, 0x44, 0x9d,
-	0xf4, 0x0d, 0xa2, 0xee, 0x8b, 0xc8, 0x08, 0x45, 0xe3, 0xf6, 0x03, 0x6e, 0xda, 0x8f, 0xa9, 0x4e,
-	0x9b, 0xa0, 0xde, 0x70, 0x96, 0x51, 0xf6, 0x60, 0x3e, 0xa2, 0x90, 0x6d, 0xc8, 0xc7, 0x80, 0x8c,
-	0x1b, 0xc3, 0xec, 0x18, 0x17, 0x1d, 0xba, 0x5e, 0x1f, 0xcb, 0x3a, 0xb9, 0x3b, 0x21, 0x26, 0x60,
-	0x53, 0x14, 0xbe, 0x5e, 0x32, 0x79, 0xf1, 0xab, 0x83, 0x0e, 0x5f, 0x1d, 0x06, 0x68, 0x98, 0xde,
-	0x7d, 0xe1, 0xf5, 0xc1, 0xc6, 0x60, 0x35, 0x64, 0x33, 0x7a, 0xe2, 0x4d, 0xc2, 0xef, 0x33, 0xb0,
-	0x9c, 0x42, 0x8d, 0x1e, 0x43, 0xd6, 0xe9, 0xb6, 0x58, 0x24, 0xbc, 0x37, 0x82, 0xfc, 0x8a, 0x76,
-	0x52, 0x3d, 0x98, 0xd0, 0x7c, 0x2e, 0xf9, 0x2f, 0x12, 0x64, 0xb5, 0x93, 0x2a, 0xfa, 0x49, 0xe4,
-	0x42, 0xe1, 0xa3, 0x11, 0xa5, 0xf0, 0xf7, 0x0a, 0xb6, 0xe8, 0x5e, 0xa1, 0x0c, 0x0b, 0x55, 0x4d,
-	0xdd, 0x69, 0xaa, 0xfa, 0x9e, 0x5a, 0x57, 0x9b, 0xaa, 0x7e, 0x7e, 0x5c, 0x3f, 0x3b, 0x52, 0x4b,
-	0x92, 0x3f, 0x0a, 0x9c, 0x9c, 0xed, 0xd6, 0x6b, 0xa7, 0x07, 0xfa, 0x59, 0x23, 0xf8, 0xc5, 0xb0,
-	0x19, 0x54, 0x82, 0x99, 0x7a, 0xed, 0xb4, 0xc9, 0x00, 0xa7, 0xa5, 0xac, 0x0f, 0xd9, 0x57, 0x9b,
-	0x7a, 0x75, 0xe7, 0x64, 0xa7, 0x5a, 0x6b, 0x7e, 0x59, 0xca, 0x85, 0x77, 0x13, 0xbf, 0xcd, 0xc3,
-	0xbd, 0x86, 0xdd, 0xc6, 0xa7, 0x9e, 0x71, 0x35, 0x4e, 0xcf, 0xab, 0xc5, 0xce, 0x6d, 0xba, 0x41,
-	0x9f, 0x04, 0x4b, 0x17, 0x8b, 0x4c, 0x3f, 0xae, 0x51, 0x05, 0xe6, 0x5d, 0xcf, 0xb8, 0x22, 0xb5,
-	0xc3, 0x70, 0xae, 0xb0, 0xa7, 0x77, 0x0d, 0xef, 0x39, 0x69, 0x0b, 0xa7, 0xb5, 0x3b, 0x0c, 0xd5,
-	0x24, 0x98, 0x13, 0xc3, 0x7b, 0x2e, 0x6e, 0x22, 0x73, 0x63, 0x37, 0x91, 0x17, 0x80, 0xc8, 0x19,
-	0xed, 0x2b, 0x88, 0x5f, 0x3a, 0x7c, 0x7f, 0xc8, 0x82, 0x42, 0x70, 0xe4, 0xac, 0x2d, 0x59, 0x31,
-	0x30, 0x32, 0x92, 0xfb, 0xc0, 0x61, 0x2a, 0x46, 0x3d, 0x54, 0xde, 0xb0, 0xd9, 0xf1, 0x0f, 0x25,
-	0xe1, 0x6a, 0xbe, 0xfd, 0xbe, 0x71, 0x09, 0x16, 0x07, 0x7c, 0xc1, 0xba, 0x86, 0x2b, 0x28, 0xfb,
-	0xa8, 0x33, 0xcb, 0x1d, 0x33, 0x5e, 0x13, 0x62, 0x2b, 0x93, 0x10, 0x5b, 0xca, 0x32, 0x2c, 0x09,
-	0x14, 0x31, 0x2b, 0xfe, 0x99, 0xa7, 0x66, 0x8c, 0x3f, 0x10, 0x35, 0x85, 0x69, 0xf3, 0x5d, 0x3e,
-	0x04, 0x84, 0x43, 0xc0, 0xdb, 0x4d, 0x9c, 0x07, 0x50, 0xe4, 0xe9, 0x72, 0x84, 0x0e, 0xbc, 0x21,
-	0x99, 0x95, 0x7f, 0xa3, 0xf1, 0xac, 0x10, 0x1b, 0xcf, 0x7e, 0x01, 0x0b, 0x24, 0xeb, 0xe2, 0x7d,
-	0xef, 0x64, 0x74, 0x00, 0x48, 0xf4, 0x08, 0x87, 0x88, 0xe4, 0x1e, 0xc9, 0xe5, 0xd8, 0x14, 0xd6,
-	0x12, 0x65, 0xdf, 0x14, 0x51, 0xf4, 0xe9, 0x50, 0x45, 0xdf, 0x56, 0xfe, 0xa9, 0x34, 0xea, 0xff,
-	0x2f, 0x26, 0x37, 0x16, 0xfd, 0xc2, 0x99, 0x4b, 0x79, 0x06, 0x32, 0x4d, 0x8d, 0xf1, 0xc7, 0xa1,
-	0x58, 0xe0, 0x65, 0xe2, 0x81, 0xa7, 0xac, 0xc2, 0xb2, 0x50, 0x36, 0x53, 0x8d, 0xa0, 0xe4, 0xa3,
-	0xf7, 0xb1, 0x57, 0x6b, 0x07, 0xfd, 0xc4, 0x47, 0x70, 0x87, 0x83, 0xb1, 0xfe, 0x81, 0x9b, 0xbb,
-	0x24, 0x7e, 0xee, 0x52, 0x56, 0xa8, 0xf1, 0x09, 0xbd, 0xc9, 0xd7, 0x54, 0x7d, 0x52, 0x57, 0xb2,
-	0x13, 0xeb, 0x4a, 0x68, 0xcf, 0xb7, 0x1a, 0x29, 0xe0, 0x43, 0xfa, 0x91, 0xbf, 0x49, 0xac, 0xcc,
-	0x0e, 0x74, 0x22, 0x3f, 0xe0, 0x3b, 0x91, 0xf5, 0x54, 0x99, 0x7c, 0x0f, 0xd2, 0xa5, 0x2d, 0xc8,
-	0xe7, 0x91, 0x16, 0xe4, 0xd1, 0x50, 0x76, 0xbe, 0xf9, 0xf8, 0x38, 0xa1, 0xf9, 0x38, 0x6d, 0xee,
-	0xec, 0xab, 0xfa, 0x59, 0x83, 0xfe, 0x0d, 0x9a, 0x8f, 0xa0, 0x75, 0xd8, 0xfa, 0xaf, 0x04, 0x53,
-	0xb5, 0x36, 0xb6, 0x3c, 0xdf, 0xfa, 0x06, 0xcc, 0x46, 0x9e, 0xa7, 0xd0, 0x4a, 0xc2, 0xab, 0x15,
-	0x71, 0xb4, 0xbc, 0x9a, 0xfa, 0xa6, 0xa5, 0x4c, 0xa0, 0x4b, 0xee, 0x69, 0x2d, 0xd2, 0x33, 0xbf,
-	0x3b, 0xc0, 0x29, 0xd8, 0x48, 0xf9, 0xe1, 0x10, 0xaa, 0x50, 0xcf, 0xa7, 0x90, 0x27, 0x6f, 0x31,
-	0x68, 0x21, 0x7c, 0x06, 0xe2, 0x9e, 0x6a, 0xe4, 0xbb, 0x31, 0x68, 0xc0, 0xb7, 0xf5, 0xeb, 0x02,
-	0x40, 0xbf, 0xbf, 0x43, 0x87, 0x30, 0xc3, 0x5f, 0xdf, 0xa3, 0xe5, 0x94, 0xc7, 0x0a, 0x79, 0x45,
-	0x8c, 0x0c, 0x6d, 0x3a, 0x84, 0x19, 0xfe, 0x36, 0xae, 0x2f, 0x4c, 0x70, 0x79, 0xd8, 0x17, 0x26,
-	0xbc, 0xc0, 0x9b, 0x40, 0x1d, 0x58, 0x4c, 0xb8, 0x44, 0x41, 0x8f, 0x46, 0xbb, 0x81, 0x92, 0xdf,
-	0x1b, 0xf1, 0x36, 0x46, 0x99, 0x40, 0x0e, 0x2c, 0x25, 0x8e, 0xfe, 0x68, 0x73, 0xd4, 0xcb, 0x0c,
-	0xf9, 0xfd, 0x11, 0x28, 0x43, 0x9d, 0x3d, 0x90, 0x93, 0x07, 0x61, 0xf4, 0xfe, 0xc8, 0xe3, 0xbb,
-	0xfc, 0xc1, 0x28, 0xa4, 0xa1, 0xda, 0x03, 0x28, 0x72, 0x43, 0x29, 0x92, 0x85, 0x93, 0x2a, 0x15,
-	0xbc, 0x9c, 0x32, 0xc5, 0x52, 0x49, 0xdc, 0xec, 0xd5, 0x97, 0x34, 0x38, 0x01, 0xf6, 0x25, 0x09,
-	0x86, 0xb5, 0xb8, 0xfb, 0x63, 0x55, 0x4c, 0xe4, 0x7e, 0x71, 0x19, 0x14, 0xb9, 0x3f, 0xa1, 0x24,
-	0x2a, 0x13, 0x5b, 0xbf, 0xcb, 0x41, 0xce, 0x2f, 0x33, 0xa8, 0x09, 0xef, 0xc4, 0xda, 0x36, 0x74,
-	0x3f, 0xbd, 0xb7, 0x95, 0x1f, 0x24, 0xe2, 0xc3, 0x25, 0x3d, 0xa3, 0xe5, 0x3d, 0xd2, 0x88, 0xa1,
-	0x35, 0x9e, 0x4f, 0xd4, 0x0c, 0xca, 0xeb, 0x29, 0x14, 0x71, 0xd9, 0xd1, 0xac, 0x58, 0x1b, 0xd6,
-	0x11, 0x44, 0x65, 0x27, 0x65, 0xc2, 0xd7, 0x30, 0x2f, 0x38, 0xc9, 0x90, 0x12, 0xb5, 0x4b, 0x18,
-	0xfd, 0x1b, 0xa9, 0x34, 0xa1, 0x86, 0x5d, 0x98, 0x0e, 0x0f, 0x3e, 0x54, 0xe6, 0x79, 0xf8, 0xf3,
-	0x51, 0x5e, 0x12, 0x60, 0xe2, 0x56, 0xc6, 0x43, 0x45, 0x89, 0xf1, 0x88, 0x82, 0x64, 0x23, 0x95,
-	0x26, 0xd0, 0xb0, 0x9b, 0x7f, 0x96, 0x6d, 0xb9, 0xe6, 0x45, 0x81, 0xfc, 0x4b, 0xc5, 0xf7, 0xfe,
-	0x17, 0x00, 0x00, 0xff, 0xff, 0x69, 0xaa, 0xdb, 0x41, 0x5f, 0x21, 0x00, 0x00,
+func init() { proto.RegisterFile("csi.proto", fileDescriptor_csi_31237507707d37ec) }
+
+var fileDescriptor_csi_31237507707d37ec = []byte{
+	// 2932 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x1a, 0x4d, 0x73, 0x23, 0x47,
+	0xd5, 0xa3, 0x0f, 0xdb, 0x7a, 0x5e, 0x3b, 0xda, 0xf6, 0x97, 0x3c, 0xb6, 0x77, 0xbd, 0xb3, 0xd9,
+	0x64, 0x13, 0x12, 0x6d, 0x30, 0x24, 0x15, 0x92, 0x4d, 0x40, 0x96, 0x15, 0x5b, 0x59, 0x5b, 0x36,
+	0x23, 0xd9, 0xa9, 0x5d, 0x42, 0x4d, 0xc6, 0x52, 0x5b, 0x3b, 0xac, 0x3c, 0xa3, 0xcc, 0x8c, 0xcc,
+	0x9a, 0x1b, 0x70, 0x01, 0x4e, 0xf0, 0x0b, 0x52, 0x95, 0x1b, 0x14, 0xb9, 0x50, 0xdc, 0xa8, 0xe2,
+	0x46, 0x15, 0x27, 0xce, 0x9c, 0xb8, 0xa7, 0xe0, 0xc8, 0x89, 0x2a, 0xaa, 0xa8, 0x9e, 0xee, 0x19,
+	0x4d, 0xb7, 0x7a, 0xf4, 0x91, 0xdd, 0x4a, 0x71, 0x92, 0xe6, 0x7d, 0xf5, 0xeb, 0xd7, 0xef, 0xbd,
+	0x7e, 0xef, 0xcd, 0x40, 0xae, 0xe9, 0x59, 0xc5, 0xae, 0xeb, 0xf8, 0x0e, 0x9a, 0x26, 0x7f, 0x2f,
+	0xdf, 0x50, 0x6f, 0xb4, 0x1d, 0xa7, 0xdd, 0xc1, 0xf7, 0x02, 0xe8, 0x59, 0xef, 0xfc, 0xde, 0x8f,
+	0x5d, 0xb3, 0xdb, 0xc5, 0xae, 0x47, 0xe9, 0xb4, 0x15, 0x58, 0xda, 0xc3, 0xfe, 0x71, 0xa7, 0xd7,
+	0xb6, 0xec, 0xaa, 0x7d, 0xee, 0xe8, 0xf8, 0xd3, 0x1e, 0xf6, 0x7c, 0xed, 0xef, 0x0a, 0x2c, 0x0b,
+	0x08, 0xaf, 0xeb, 0xd8, 0x1e, 0x46, 0x08, 0x32, 0xb6, 0x79, 0x81, 0x0b, 0xca, 0x96, 0x72, 0x37,
+	0xa7, 0x07, 0xff, 0xd1, 0x1d, 0x58, 0xb8, 0xc4, 0x76, 0xcb, 0x71, 0x8d, 0x4b, 0xec, 0x7a, 0x96,
+	0x63, 0x17, 0x52, 0x01, 0x76, 0x9e, 0x42, 0x4f, 0x29, 0x10, 0xed, 0xc1, 0xec, 0x85, 0x69, 0x5b,
+	0xe7, 0xd8, 0xf3, 0x0b, 0xe9, 0xad, 0xf4, 0xdd, 0xb9, 0xed, 0x6f, 0x14, 0xa9, 0x9e, 0x45, 0xe9,
+	0x5a, 0xc5, 0x43, 0x46, 0x5d, 0xb1, 0x7d, 0xf7, 0x4a, 0x8f, 0x98, 0xd5, 0x77, 0x61, 0x9e, 0x43,
+	0xa1, 0x3c, 0xa4, 0x9f, 0xe0, 0x2b, 0xa6, 0x13, 0xf9, 0x8b, 0x96, 0x20, 0x7b, 0x69, 0x76, 0x7a,
+	0x98, 0x69, 0x42, 0x1f, 0xde, 0x49, 0xbd, 0xad, 0x68, 0x37, 0x60, 0x23, 0x5a, 0xad, 0x6c, 0x76,
+	0xcd, 0x33, 0xab, 0x63, 0xf9, 0x16, 0xf6, 0xc2, 0xad, 0xff, 0x10, 0x36, 0x13, 0xf0, 0xcc, 0x02,
+	0xf7, 0xe1, 0x5a, 0x33, 0x06, 0x2f, 0xa4, 0x82, 0xad, 0x14, 0xc2, 0xad, 0x08, 0x9c, 0x57, 0x3a,
+	0x47, 0xad, 0xfd, 0x53, 0x81, 0xbc, 0x48, 0x82, 0xee, 0xc3, 0x8c, 0x87, 0xdd, 0x4b, 0xab, 0x49,
+	0xed, 0x3a, 0xb7, 0xbd, 0x95, 0x24, 0xad, 0x58, 0xa7, 0x74, 0xfb, 0x53, 0x7a, 0xc8, 0xa2, 0xfe,
+	0x5a, 0x81, 0x19, 0x06, 0x46, 0xdf, 0x81, 0x8c, 0x7f, 0xd5, 0xa5, 0x62, 0x16, 0xb6, 0xef, 0x8c,
+	0x12, 0x53, 0x6c, 0x5c, 0x75, 0xb1, 0x1e, 0xb0, 0x68, 0x1f, 0x42, 0x86, 0x3c, 0xa1, 0x39, 0x98,
+	0x39, 0xa9, 0x3d, 0xa8, 0x1d, 0x7d, 0x54, 0xcb, 0x4f, 0xa1, 0x15, 0x40, 0xe5, 0xa3, 0x5a, 0x43,
+	0x3f, 0x3a, 0x38, 0xa8, 0xe8, 0x46, 0xbd, 0xa2, 0x9f, 0x56, 0xcb, 0x95, 0xbc, 0x82, 0x36, 0x61,
+	0xad, 0x54, 0x2e, 0x57, 0xea, 0xf5, 0xea, 0x4e, 0xf5, 0xa0, 0xda, 0x78, 0x68, 0x94, 0x8f, 0x6a,
+	0xf5, 0x86, 0x5e, 0xaa, 0xd6, 0x1a, 0xf5, 0x7c, 0x6a, 0x67, 0x9a, 0xaa, 0xa1, 0x2d, 0xc0, 0xb5,
+	0x63, 0xd7, 0x39, 0xc3, 0xa1, 0x71, 0x4b, 0x30, 0xcf, 0x9e, 0x99, 0x31, 0xdf, 0x80, 0xac, 0x8b,
+	0xcd, 0xd6, 0x15, 0xdb, 0xb7, 0x5a, 0xa4, 0x0e, 0x5b, 0x0c, 0x1d, 0xb6, 0xb8, 0xe3, 0x38, 0x9d,
+	0x53, 0x72, 0x78, 0x3a, 0x25, 0xd4, 0xbe, 0xc8, 0xc2, 0x62, 0xd9, 0xc5, 0xa6, 0x8f, 0x4f, 0x9d,
+	0x4e, 0xef, 0x22, 0x14, 0x2d, 0x75, 0xcc, 0xfb, 0xb0, 0x40, 0x8c, 0xdf, 0xb4, 0xfc, 0x2b, 0xc3,
+	0x35, 0xed, 0x36, 0x75, 0x87, 0xb9, 0xed, 0xe5, 0xd0, 0x2e, 0x65, 0x86, 0xd5, 0x09, 0x52, 0x9f,
+	0x6f, 0xc6, 0x1f, 0x51, 0x15, 0x16, 0x2f, 0x83, 0x25, 0x0c, 0xee, 0xbc, 0xd3, 0xfc, 0x79, 0x53,
+	0x2d, 0x62, 0xe7, 0x8d, 0x2e, 0x79, 0x88, 0x85, 0x3d, 0xf4, 0x00, 0xa0, 0x6b, 0xba, 0xe6, 0x05,
+	0xf6, 0xb1, 0xeb, 0x15, 0x32, 0xbc, 0xf3, 0x4b, 0x76, 0x53, 0x3c, 0x8e, 0xa8, 0xa9, 0xf3, 0xc7,
+	0xd8, 0x91, 0x0f, 0x6b, 0x4d, 0xc7, 0xf6, 0x5d, 0xa7, 0xd3, 0xc1, 0xae, 0xd1, 0x0c, 0xb8, 0x0d,
+	0x0f, 0x37, 0x5d, 0xec, 0x7b, 0x85, 0x6c, 0x20, 0xfb, 0xed, 0x61, 0xb2, 0xcb, 0x11, 0x33, 0xc5,
+	0xd6, 0x29, 0x2b, 0x5d, 0x68, 0xb5, 0x29, 0xc7, 0xa2, 0x23, 0x58, 0x0e, 0xad, 0xe1, 0xd8, 0x3e,
+	0xb6, 0x7d, 0xc3, 0x73, 0x7a, 0x6e, 0x13, 0x17, 0xa6, 0x03, 0x93, 0xae, 0x0b, 0xf6, 0xa0, 0x34,
+	0xf5, 0x80, 0x44, 0x67, 0x76, 0xe4, 0x80, 0xe8, 0x11, 0xa8, 0x66, 0xb3, 0x89, 0x3d, 0xcf, 0xa2,
+	0x86, 0x33, 0x5c, 0xfc, 0x69, 0xcf, 0x72, 0xf1, 0x05, 0xb6, 0x7d, 0xaf, 0x30, 0xc3, 0x4b, 0x6d,
+	0x38, 0x5d, 0xa7, 0xe3, 0xb4, 0xaf, 0xf4, 0x3e, 0x8d, 0xbe, 0xc6, 0xb1, 0xc7, 0x30, 0x9e, 0xfa,
+	0x1e, 0xbc, 0x20, 0x58, 0x70, 0x92, 0x1c, 0xa1, 0x7e, 0x08, 0x1b, 0xc3, 0x8c, 0x34, 0x51, 0xbe,
+	0xf9, 0xa5, 0x02, 0x8b, 0x12, 0x9b, 0xa0, 0x7d, 0x98, 0xf5, 0x6c, 0xb3, 0xeb, 0x3d, 0x76, 0x7c,
+	0xe6, 0xfc, 0xaf, 0x0e, 0x31, 0x61, 0xb1, 0xce, 0x68, 0xe9, 0xe3, 0xfe, 0x94, 0x1e, 0x71, 0xab,
+	0x5b, 0xb0, 0xc0, 0x63, 0xd1, 0x02, 0xa4, 0xac, 0x16, 0x53, 0x2f, 0x65, 0xb5, 0xa2, 0x70, 0x7c,
+	0x1f, 0x96, 0x78, 0x87, 0x60, 0x51, 0xf8, 0x12, 0x4c, 0xd3, 0x13, 0x62, 0x9a, 0x2c, 0xf0, 0x9a,
+	0xe8, 0x0c, 0xab, 0xfd, 0x2e, 0x03, 0x79, 0xd1, 0xdf, 0xd1, 0x7d, 0xc8, 0x9e, 0x75, 0x9c, 0xe6,
+	0x13, 0xc6, 0xfb, 0x62, 0x52, 0x60, 0x14, 0x77, 0x08, 0x15, 0x85, 0xee, 0x4f, 0xe9, 0x94, 0x89,
+	0x70, 0x5f, 0x38, 0x3d, 0xdb, 0x67, 0x91, 0x99, 0xcc, 0x7d, 0x48, 0xa8, 0xfa, 0xdc, 0x01, 0x13,
+	0xda, 0x85, 0x39, 0xea, 0x04, 0xc6, 0x85, 0xd3, 0xc2, 0x85, 0x74, 0x20, 0xe3, 0x76, 0xa2, 0x8c,
+	0x52, 0x40, 0x7b, 0xe8, 0xb4, 0xb0, 0x0e, 0x66, 0xf4, 0x5f, 0x9d, 0x87, 0xb9, 0x98, 0x6e, 0xea,
+	0x1e, 0xcc, 0xc5, 0x16, 0x43, 0xab, 0x30, 0x73, 0xee, 0x19, 0x51, 0x56, 0xcd, 0xe9, 0xd3, 0xe7,
+	0x5e, 0x90, 0x28, 0x6f, 0xc2, 0x5c, 0xa0, 0x85, 0x71, 0xde, 0x31, 0xdb, 0xf4, 0x1e, 0xc8, 0xe9,
+	0x10, 0x80, 0x3e, 0x20, 0x10, 0xf5, 0x5f, 0x0a, 0x40, 0x7f, 0x49, 0x74, 0x1f, 0x32, 0x81, 0x96,
+	0x34, 0x37, 0xdf, 0x1d, 0x43, 0xcb, 0x62, 0xa0, 0x6a, 0xc0, 0xa5, 0x7d, 0xa6, 0x40, 0x26, 0x10,
+	0x23, 0xe6, 0xe7, 0x7a, 0xb5, 0xb6, 0x77, 0x50, 0x31, 0x6a, 0x47, 0xbb, 0x15, 0xe3, 0x23, 0xbd,
+	0xda, 0xa8, 0xe8, 0x79, 0x05, 0xad, 0xc3, 0x6a, 0x1c, 0xae, 0x57, 0x4a, 0xbb, 0x15, 0xdd, 0x38,
+	0xaa, 0x1d, 0x3c, 0xcc, 0xa7, 0x90, 0x0a, 0x2b, 0x87, 0x27, 0x07, 0x8d, 0xea, 0x20, 0x2e, 0x8d,
+	0x36, 0xa0, 0x10, 0xc3, 0x31, 0x19, 0x4c, 0x6c, 0x86, 0x88, 0x8d, 0x61, 0xe9, 0x5f, 0x86, 0xcc,
+	0xee, 0xcc, 0x47, 0x87, 0x11, 0x38, 0xdb, 0x47, 0x30, 0xcf, 0xa5, 0x57, 0x52, 0x26, 0xb0, 0x10,
+	0x6f, 0x19, 0x67, 0x57, 0x3e, 0xf6, 0x02, 0x4b, 0xa4, 0xf5, 0xf9, 0x10, 0xba, 0x43, 0x80, 0xc4,
+	0xac, 0x1d, 0xeb, 0xc2, 0xf2, 0x19, 0x4d, 0x2a, 0xa0, 0x81, 0x00, 0x14, 0x10, 0x68, 0x7f, 0x49,
+	0xc1, 0x34, 0x3b, 0x9b, 0x3b, 0xb1, 0x04, 0xcf, 0x89, 0x0c, 0xa1, 0x54, 0x24, 0x8d, 0x87, 0x54,
+	0x18, 0x0f, 0xe8, 0x7d, 0x00, 0xd3, 0xf7, 0x5d, 0xeb, 0xac, 0xe7, 0x47, 0x09, 0xfd, 0x06, 0x7f,
+	0x1e, 0xc5, 0x52, 0x44, 0xc0, 0x32, 0x70, 0x9f, 0x03, 0xed, 0xc0, 0x82, 0x90, 0x04, 0x33, 0xa3,
+	0x93, 0xe0, 0x7c, 0x93, 0x8b, 0xff, 0x12, 0x2c, 0x86, 0xf9, 0xab, 0x83, 0x0d, 0x9f, 0xe5, 0x37,
+	0x96, 0xbf, 0xf3, 0x03, 0x79, 0x0f, 0xf5, 0x89, 0x43, 0x18, 0xc9, 0x72, 0x82, 0x96, 0x13, 0x65,
+	0xa6, 0x1e, 0x2c, 0x4a, 0xd2, 0x2a, 0x2a, 0x42, 0x2e, 0x38, 0x10, 0xcf, 0xf2, 0x89, 0xaf, 0xca,
+	0xd5, 0xe9, 0x93, 0x10, 0xfa, 0xae, 0x8b, 0xcf, 0xb1, 0xeb, 0xe2, 0x16, 0x2b, 0x86, 0x24, 0xf4,
+	0x11, 0x89, 0xf6, 0x73, 0x05, 0x66, 0x43, 0x38, 0x7a, 0x07, 0x66, 0x3d, 0xdc, 0xa6, 0x29, 0x5f,
+	0xe1, 0xcf, 0x21, 0xa4, 0x29, 0xd6, 0x19, 0x01, 0x2b, 0x03, 0x43, 0x7a, 0x52, 0x06, 0x72, 0xa8,
+	0x89, 0x36, 0xff, 0x6f, 0x05, 0x16, 0x77, 0x71, 0x07, 0x8b, 0x65, 0xc4, 0x3a, 0xe4, 0xd8, 0x35,
+	0x17, 0x65, 0xd0, 0x59, 0x0a, 0xa8, 0xb6, 0x84, 0x9b, 0xb7, 0x15, 0xb0, 0x47, 0x37, 0x6f, 0x8a,
+	0xbf, 0x79, 0x25, 0xc2, 0x63, 0x37, 0x2f, 0xc5, 0x26, 0xdd, 0xbc, 0x1c, 0x96, 0xbf, 0x8d, 0x06,
+	0x19, 0x27, 0xda, 0xf6, 0x0a, 0x2c, 0xf1, 0x8a, 0xd1, 0x1b, 0x40, 0xfb, 0x53, 0x06, 0x6e, 0xf4,
+	0x17, 0x39, 0xee, 0x9d, 0x75, 0x2c, 0xef, 0xf1, 0x04, 0x96, 0x59, 0x85, 0x19, 0xdb, 0x69, 0x05,
+	0x28, 0xba, 0xe6, 0x34, 0x79, 0xac, 0xb6, 0x50, 0x05, 0xae, 0x8b, 0x45, 0xd4, 0x15, 0xcb, 0xd3,
+	0xc9, 0x25, 0x54, 0xfe, 0x52, 0xbc, 0x64, 0x54, 0x98, 0x25, 0xe5, 0x9f, 0x63, 0x77, 0xae, 0x82,
+	0x58, 0x9b, 0xd5, 0xa3, 0x67, 0xf4, 0x33, 0x05, 0xd4, 0xd8, 0xb1, 0x74, 0xa9, 0xf2, 0x42, 0x45,
+	0xb4, 0x1b, 0x55, 0x44, 0x43, 0x77, 0x39, 0x88, 0xe6, 0xce, 0xa8, 0xd0, 0x4c, 0x40, 0x23, 0x2b,
+	0xda, 0x67, 0x2c, 0xb3, 0x4c, 0x07, 0x4b, 0xdf, 0x1f, 0x73, 0x69, 0xfa, 0x24, 0xe6, 0x1d, 0x66,
+	0x8b, 0x3e, 0x58, 0x7d, 0x00, 0x9b, 0x43, 0xb5, 0x9c, 0xa8, 0xd4, 0x29, 0xc3, 0xb2, 0x74, 0xdd,
+	0x89, 0xbc, 0xea, 0xcf, 0x0a, 0xdc, 0x4c, 0xdc, 0x1c, 0xab, 0x31, 0x7e, 0x00, 0xd7, 0xc2, 0x93,
+	0xb1, 0xec, 0x73, 0x87, 0x45, 0xfb, 0xdb, 0x23, 0x6d, 0xc3, 0x7a, 0x41, 0x06, 0x25, 0xfd, 0x21,
+	0xb5, 0xcb, 0x5c, 0xb7, 0x0f, 0x51, 0xdf, 0x87, 0xbc, 0x48, 0x30, 0xd1, 0x06, 0xfe, 0x98, 0x82,
+	0xad, 0xbe, 0x06, 0x27, 0x76, 0xf7, 0xf9, 0x05, 0xc0, 0xaf, 0x14, 0xd8, 0x88, 0x79, 0x67, 0xcf,
+	0x16, 0xfd, 0x93, 0x5e, 0x3f, 0xfb, 0x83, 0x86, 0x90, 0xab, 0x21, 0x23, 0xe0, 0x7c, 0x34, 0x16,
+	0x0b, 0x22, 0x81, 0x7a, 0x18, 0x3f, 0x27, 0x29, 0xfb, 0x44, 0x66, 0xbb, 0x0d, 0xb7, 0x86, 0xa8,
+	0xcb, 0x52, 0xcb, 0x4f, 0xd3, 0x70, 0xeb, 0xd4, 0xec, 0x58, 0xad, 0xa8, 0xee, 0x94, 0xb4, 0xdd,
+	0xc3, 0x8d, 0x9b, 0xd0, 0x89, 0xa5, 0xbe, 0x42, 0x27, 0xd6, 0x91, 0xc5, 0x29, 0x3d, 0x82, 0xef,
+	0x46, 0x82, 0x46, 0x69, 0x3b, 0x6e, 0xa8, 0x26, 0x5d, 0xf2, 0x99, 0x09, 0x2e, 0xf9, 0xe7, 0x12,
+	0xa0, 0x1f, 0x83, 0x36, 0x6c, 0x53, 0x2c, 0x44, 0x37, 0x20, 0xe7, 0xf5, 0xba, 0x5d, 0xc7, 0xf5,
+	0x31, 0x3d, 0x83, 0x59, 0xbd, 0x0f, 0x40, 0x05, 0x98, 0xb9, 0xc0, 0x9e, 0x67, 0xb6, 0x43, 0xf9,
+	0xe1, 0xa3, 0xf6, 0x31, 0xa0, 0x03, 0xcb, 0x63, 0xf5, 0x72, 0x74, 0xa2, 0xa4, 0x3c, 0x36, 0x9f,
+	0x1a, 0xd8, 0xf6, 0x5d, 0x8b, 0x15, 0x66, 0x59, 0x1d, 0x2e, 0xcc, 0xa7, 0x15, 0x0a, 0x21, 0xc5,
+	0x9b, 0xe7, 0x9b, 0xae, 0x6f, 0xd9, 0x6d, 0xc3, 0x77, 0x9e, 0xe0, 0x68, 0x6c, 0x14, 0x42, 0x1b,
+	0x04, 0xa8, 0x7d, 0xae, 0xc0, 0x22, 0x27, 0x9e, 0x69, 0xfb, 0x2e, 0xcc, 0xf4, 0x65, 0x13, 0x7b,
+	0xde, 0x0a, 0xed, 0x29, 0xa1, 0x2e, 0xd2, 0x13, 0x0a, 0x39, 0xd0, 0x26, 0x80, 0x8d, 0x9f, 0xfa,
+	0xdc, 0xba, 0x39, 0x02, 0x09, 0xd6, 0x54, 0xef, 0x41, 0x96, 0x1a, 0x79, 0xdc, 0xce, 0xe8, 0x8b,
+	0x14, 0xa0, 0x3d, 0xec, 0x47, 0x05, 0x2f, 0xb3, 0x41, 0x82, 0xe3, 0x2a, 0x5f, 0xc1, 0x71, 0x3f,
+	0xe4, 0x46, 0x08, 0xd4, 0xf5, 0x5f, 0x8d, 0xcd, 0xcf, 0x84, 0xa5, 0x87, 0x4e, 0x10, 0x12, 0xdc,
+	0x92, 0x5e, 0xcb, 0x63, 0xd7, 0x9e, 0xcf, 0xd0, 0x61, 0x6b, 0xbb, 0xb0, 0xc8, 0xe9, 0xcc, 0xce,
+	0xf4, 0x75, 0x40, 0xe6, 0xa5, 0x69, 0x75, 0x4c, 0xa2, 0x57, 0x58, 0xc3, 0xb3, 0x9a, 0xfe, 0x7a,
+	0x84, 0x09, 0xd9, 0x34, 0x2d, 0x9e, 0xb5, 0x99, 0x3c, 0x71, 0x9e, 0xd7, 0x89, 0xe7, 0xa8, 0x01,
+	0x1a, 0xb6, 0xee, 0x9e, 0x74, 0xa6, 0x77, 0x7b, 0x30, 0x27, 0xb3, 0xb9, 0x59, 0xe2, 0x78, 0xef,
+	0x6f, 0x29, 0x58, 0x1f, 0x42, 0x8d, 0xde, 0x85, 0xb4, 0xdb, 0x6d, 0x32, 0x67, 0x7a, 0x79, 0x0c,
+	0xf9, 0x45, 0xfd, 0xb8, 0xbc, 0x3f, 0xa5, 0x13, 0x2e, 0xf5, 0x4b, 0x05, 0xd2, 0xfa, 0x71, 0x19,
+	0x7d, 0x8f, 0x1b, 0xf2, 0xbd, 0x36, 0xa6, 0x94, 0xf8, 0xac, 0x8f, 0x34, 0x93, 0x83, 0xc3, 0xbe,
+	0x02, 0x2c, 0x95, 0xf5, 0x4a, 0xa9, 0x51, 0x31, 0x76, 0x2b, 0x07, 0x95, 0x46, 0xc5, 0x38, 0x3d,
+	0x3a, 0x38, 0x39, 0xac, 0xe4, 0x15, 0xd2, 0x15, 0x1e, 0x9f, 0xec, 0x1c, 0x54, 0xeb, 0xfb, 0xc6,
+	0x49, 0x2d, 0xfc, 0xc7, 0xb0, 0x29, 0x94, 0x87, 0x6b, 0x07, 0xd5, 0x7a, 0x83, 0x01, 0xea, 0xf9,
+	0x34, 0x81, 0xec, 0x55, 0x1a, 0x46, 0xb9, 0x74, 0x5c, 0x2a, 0x57, 0x1b, 0x0f, 0xf3, 0x19, 0xd2,
+	0x73, 0xf2, 0xb2, 0xeb, 0xb5, 0xd2, 0x71, 0x7d, 0xff, 0xa8, 0x91, 0xcf, 0x22, 0x04, 0x0b, 0x01,
+	0x7f, 0x08, 0xaa, 0xe7, 0xa7, 0xa3, 0x91, 0xc5, 0x67, 0x69, 0x58, 0x66, 0x13, 0x18, 0x36, 0xe3,
+	0x08, 0x63, 0xeb, 0x2e, 0xe4, 0x69, 0xf3, 0x65, 0x88, 0x17, 0xc7, 0x02, 0x85, 0x9f, 0x86, 0xd7,
+	0x47, 0x38, 0x1a, 0x4c, 0xc5, 0x46, 0x83, 0x5d, 0x58, 0x0d, 0x27, 0x67, 0x4c, 0xae, 0x70, 0x21,
+	0x0b, 0x23, 0x34, 0x61, 0x75, 0x01, 0xca, 0x5d, 0xc0, 0xcb, 0x4d, 0x19, 0x0e, 0x1d, 0x4a, 0x66,
+	0x80, 0xaf, 0x0f, 0x5f, 0x64, 0x48, 0x0c, 0xab, 0xfb, 0xa0, 0x26, 0xeb, 0x30, 0x51, 0x09, 0xf8,
+	0x8c, 0xa1, 0xfc, 0x01, 0xac, 0x88, 0xda, 0xb3, 0xa8, 0x7a, 0x6d, 0x60, 0xc4, 0x15, 0xe5, 0x96,
+	0x88, 0x36, 0xa2, 0xd0, 0xfe, 0xa0, 0xc0, 0x6c, 0x08, 0x26, 0xf9, 0xd9, 0xb3, 0x7e, 0x82, 0xb9,
+	0xa6, 0x3e, 0x47, 0x20, 0xf2, 0x86, 0x5e, 0xe6, 0x0b, 0x69, 0xa9, 0x2f, 0x6c, 0x02, 0xd0, 0xe3,
+	0x69, 0x19, 0xa6, 0x1f, 0xb4, 0x12, 0x69, 0x3d, 0xc7, 0x20, 0x25, 0xd2, 0xfc, 0x4e, 0x7b, 0xbe,
+	0xe9, 0xf7, 0x48, 0xdb, 0x40, 0x14, 0x5e, 0x11, 0x15, 0xae, 0x07, 0x58, 0x9d, 0x51, 0x91, 0x40,
+	0x5a, 0xe0, 0x51, 0xe8, 0x1e, 0x17, 0x9d, 0xeb, 0x72, 0x01, 0xb1, 0x60, 0x24, 0x17, 0x6b, 0x0b,
+	0xfb, 0xa6, 0xd5, 0xf1, 0xc2, 0x8b, 0x95, 0x3d, 0x6a, 0x3b, 0xb2, 0x28, 0xcd, 0x41, 0x56, 0xaf,
+	0x94, 0x76, 0x1f, 0xe6, 0x15, 0x34, 0x0f, 0xb9, 0x93, 0xe3, 0x83, 0xa3, 0xd2, 0x6e, 0xb5, 0xb6,
+	0x97, 0x4f, 0xa1, 0x45, 0x78, 0xa1, 0xa2, 0xeb, 0x47, 0xba, 0xd1, 0x07, 0xa6, 0x49, 0xa3, 0xbb,
+	0xcc, 0x9a, 0x46, 0x21, 0x80, 0x6e, 0xc2, 0x5c, 0xe4, 0xfb, 0x51, 0xec, 0x40, 0x08, 0xaa, 0xb6,
+	0x48, 0x8c, 0x84, 0x3d, 0xae, 0x18, 0x23, 0xd2, 0x66, 0x57, 0x74, 0x5f, 0x1e, 0xca, 0xc7, 0x48,
+	0x4b, 0x86, 0x23, 0x4e, 0x9d, 0xcc, 0x34, 0x91, 0x57, 0x16, 0x60, 0x45, 0x54, 0x8a, 0xd5, 0xa3,
+	0xbf, 0x55, 0x60, 0x89, 0x54, 0x08, 0x21, 0xe2, 0x79, 0x17, 0x2c, 0x13, 0x38, 0xa3, 0x70, 0x02,
+	0x19, 0xf1, 0x04, 0xb4, 0xdf, 0x2b, 0xb0, 0x2c, 0xe8, 0xca, 0x62, 0xeb, 0x3d, 0xb1, 0xfa, 0xb9,
+	0x1d, 0xaf, 0x7e, 0x06, 0xe8, 0x27, 0xac, 0x7f, 0xde, 0x0c, 0xeb, 0x9f, 0xc9, 0x42, 0xf8, 0x37,
+	0x59, 0x58, 0xa9, 0x39, 0x2d, 0x5c, 0xf7, 0xcd, 0xf6, 0x24, 0x73, 0x15, 0x5d, 0xe8, 0x0d, 0xa9,
+	0x77, 0xdd, 0x0b, 0x57, 0x92, 0x8b, 0x1c, 0xde, 0x12, 0xa2, 0x22, 0x2c, 0x7a, 0xbe, 0xd9, 0x0e,
+	0xce, 0xca, 0x74, 0xdb, 0xd8, 0x37, 0xba, 0xa6, 0xff, 0x98, 0x1d, 0xc4, 0x75, 0x86, 0x6a, 0x04,
+	0x98, 0x63, 0xd3, 0x7f, 0x2c, 0x1f, 0x54, 0x64, 0x26, 0x1e, 0x54, 0x9c, 0x01, 0x0a, 0xfa, 0x40,
+	0xb2, 0x80, 0xf8, 0x56, 0xe6, 0xdb, 0x23, 0x36, 0x14, 0x81, 0xb9, 0x50, 0xc9, 0xdb, 0x02, 0x18,
+	0x99, 0xc9, 0xb3, 0x86, 0x51, 0x4b, 0x8c, 0x3b, 0x63, 0x78, 0xc6, 0x86, 0x9a, 0x74, 0x2d, 0xd2,
+	0xdd, 0x7c, 0xfd, 0xb3, 0x89, 0x35, 0x58, 0x1d, 0xb0, 0x05, 0xcb, 0x04, 0x6d, 0x28, 0x10, 0xd4,
+	0x89, 0xed, 0x4d, 0xe8, 0xaf, 0x09, 0xbe, 0x95, 0x4a, 0xf0, 0x2d, 0x6d, 0x1d, 0xd6, 0x24, 0x0b,
+	0x31, 0x2d, 0xfe, 0x91, 0xa5, 0x6a, 0x4c, 0x3e, 0x74, 0x6b, 0x48, 0xc3, 0xe6, 0x9b, 0x71, 0x17,
+	0x90, 0x0e, 0x9a, 0x9e, 0x6f, 0xe0, 0xdc, 0x84, 0xb9, 0x38, 0x1d, 0x4b, 0x62, 0xfe, 0x88, 0xc8,
+	0xca, 0x3e, 0xd3, 0x08, 0x70, 0x5a, 0x18, 0x01, 0xfe, 0x08, 0x96, 0x82, 0xa8, 0x13, 0x67, 0x2b,
+	0x33, 0xfc, 0x35, 0x95, 0x68, 0x91, 0x18, 0x82, 0x8b, 0xbd, 0x20, 0x96, 0x85, 0x49, 0x5f, 0x53,
+	0x16, 0x7d, 0xb3, 0xc1, 0x42, 0x6f, 0x8d, 0x5c, 0xe8, 0xeb, 0x8a, 0xbf, 0x0a, 0xf5, 0xfa, 0xff,
+	0x8b, 0xe9, 0x20, 0xf3, 0x7e, 0xe9, 0x5c, 0x4f, 0x7b, 0x04, 0x2a, 0x0d, 0x8d, 0xc9, 0x47, 0x6e,
+	0x82, 0xe3, 0xa5, 0x44, 0xc7, 0xd3, 0x36, 0x61, 0x5d, 0x2a, 0x9b, 0x2d, 0x8d, 0x20, 0x4f, 0xd0,
+	0x7b, 0xd8, 0xaf, 0xb6, 0xc2, 0x6e, 0xf1, 0x35, 0xb8, 0x1e, 0x83, 0xb1, 0xbb, 0x36, 0x36, 0xdb,
+	0x53, 0xe2, 0xb3, 0x3d, 0x6d, 0x83, 0x2a, 0x9f, 0xd0, 0x79, 0x7e, 0x42, 0x97, 0x4f, 0xea, 0x39,
+	0x4b, 0x42, 0xcf, 0x49, 0xaf, 0xf1, 0x4d, 0x2e, 0x81, 0x8f, 0xe8, 0x36, 0xff, 0xaa, 0xb0, 0x34,
+	0x3b, 0xd0, 0x67, 0xbe, 0x19, 0xef, 0x33, 0x6f, 0x0d, 0x95, 0x19, 0xef, 0x30, 0xbb, 0xb4, 0xc1,
+	0x7c, 0x87, 0x2b, 0x61, 0x5f, 0x1a, 0xc9, 0x1e, 0x6f, 0x2d, 0x5f, 0x4f, 0xe8, 0x2c, 0xeb, 0x8d,
+	0xd2, 0x5e, 0xc5, 0x38, 0xa9, 0xd1, 0xdf, 0xb0, 0xb3, 0x8c, 0xfa, 0xbc, 0x25, 0x40, 0xa1, 0xe1,
+	0x63, 0xdf, 0x21, 0x7d, 0xae, 0xc0, 0x22, 0x07, 0x1e, 0x71, 0x22, 0xe8, 0x1e, 0x2c, 0x91, 0x1a,
+	0x8e, 0xfa, 0x88, 0x67, 0x74, 0xb1, 0x6b, 0x10, 0x0c, 0x7b, 0x8b, 0x78, 0xfd, 0xc2, 0x7c, 0xca,
+	0x06, 0x43, 0xc7, 0xd8, 0x25, 0x82, 0x9f, 0xc3, 0x28, 0x64, 0xfb, 0x3f, 0x0a, 0xcc, 0x56, 0x5b,
+	0xd8, 0xf6, 0x89, 0xe1, 0x6b, 0x30, 0xcf, 0x7d, 0xcc, 0x84, 0x36, 0x12, 0xbe, 0x71, 0x0a, 0x36,
+	0xa8, 0x6e, 0x0e, 0xfd, 0x02, 0x4a, 0x9b, 0x42, 0xe7, 0xb1, 0x0f, 0xb1, 0xb8, 0x79, 0xd0, 0x8b,
+	0x03, 0x9c, 0x12, 0x1f, 0x54, 0xef, 0x8c, 0xa0, 0x8a, 0xd6, 0x79, 0x0b, 0xb2, 0xc1, 0x97, 0x39,
+	0x68, 0x29, 0xfa, 0x66, 0x28, 0xf6, 0xe1, 0x8e, 0xba, 0x2c, 0x40, 0x43, 0xbe, 0xed, 0xff, 0xce,
+	0x00, 0xf4, 0x07, 0x0f, 0xe8, 0x01, 0x5c, 0x8b, 0x7f, 0x61, 0x80, 0xd6, 0x87, 0x7c, 0x88, 0xa2,
+	0x6e, 0xc8, 0x91, 0x91, 0x4e, 0x0f, 0xe0, 0x5a, 0xfc, 0x65, 0x55, 0x5f, 0x98, 0xe4, 0xdd, 0x5a,
+	0x5f, 0x98, 0xf4, 0xfd, 0xd6, 0x14, 0xea, 0xc0, 0x6a, 0xc2, 0x3b, 0x06, 0xf4, 0xd2, 0x78, 0x2f,
+	0x68, 0xd4, 0x97, 0xc7, 0x7c, 0x59, 0xa1, 0x4d, 0x21, 0x17, 0xd6, 0x12, 0x27, 0xe3, 0xe8, 0xee,
+	0xb8, 0xb3, 0x7e, 0xf5, 0x95, 0x31, 0x28, 0xa3, 0x35, 0x7b, 0xa0, 0x26, 0x0f, 0x79, 0xd1, 0x2b,
+	0x63, 0x4f, 0xb7, 0xd5, 0x57, 0xc7, 0x21, 0x8d, 0x96, 0xdd, 0x87, 0xb9, 0xd8, 0xc0, 0x15, 0xa9,
+	0xd2, 0x29, 0x2c, 0x15, 0xbc, 0x3e, 0x64, 0x42, 0x4b, 0x25, 0xc5, 0x86, 0x82, 0x7d, 0x49, 0x83,
+	0xd3, 0xcd, 0xbe, 0x24, 0xc9, 0x14, 0x51, 0x34, 0xbf, 0x90, 0x80, 0x65, 0xe6, 0x97, 0x67, 0x70,
+	0x99, 0xf9, 0x13, 0xb2, 0xb9, 0x36, 0x85, 0xbe, 0x0f, 0x0b, 0xfc, 0x1c, 0x04, 0x6d, 0x0e, 0x9d,
+	0xee, 0xa8, 0x37, 0x92, 0xd0, 0x71, 0x91, 0x7c, 0x13, 0xdb, 0x17, 0x29, 0xed, 0xb8, 0xfb, 0x22,
+	0x13, 0x7a, 0xdf, 0x29, 0x92, 0x9f, 0xb8, 0x06, 0xb1, 0x9f, 0x9f, 0x64, 0x3d, 0x71, 0x3f, 0x3f,
+	0x49, 0xbb, 0x4a, 0x6d, 0x6a, 0xfb, 0xcb, 0x0c, 0x64, 0x82, 0x44, 0xda, 0x80, 0x17, 0x84, 0x3a,
+	0x1b, 0xdd, 0x18, 0xde, 0x8c, 0xa8, 0x37, 0x13, 0xf1, 0x91, 0xba, 0x8f, 0xe8, 0x7d, 0xcc, 0x55,
+	0xce, 0x68, 0x2b, 0xce, 0x27, 0xab, 0xde, 0xd5, 0x5b, 0x43, 0x28, 0x44, 0xd9, 0x7c, 0x2e, 0xd8,
+	0x1a, 0x55, 0xc2, 0xf1, 0xb2, 0x93, 0xe2, 0xff, 0x13, 0x7a, 0x6f, 0x89, 0x91, 0xaf, 0xf1, 0x7a,
+	0x49, 0x63, 0xfe, 0xf6, 0x50, 0x9a, 0x68, 0x85, 0x0a, 0xe4, 0xa2, 0x4a, 0x05, 0x15, 0xe2, 0x3c,
+	0xf1, 0x82, 0x46, 0x5d, 0x93, 0x60, 0x98, 0x8c, 0xf4, 0x2f, 0x52, 0x4a, 0xa8, 0xa8, 0x18, 0x23,
+	0x9a, 0xc0, 0x26, 0x8b, 0x8e, 0xdb, 0x43, 0x69, 0xe2, 0x51, 0x1d, 0xbb, 0xc2, 0xfb, 0x51, 0x3d,
+	0x78, 0xdd, 0xf7, 0xa3, 0x5a, 0x72, 0xe7, 0x6b, 0x53, 0x3b, 0xd9, 0x47, 0xe9, 0xa6, 0x67, 0x9d,
+	0x4d, 0x07, 0x1f, 0x87, 0x7e, 0xeb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x3b, 0x5a, 0x51,
+	0xf0, 0x2c, 0x00, 0x00,
 }
diff --git a/vendor/github.com/container-storage-interface/spec/spec.md b/vendor/github.com/container-storage-interface/spec/spec.md
index 7a5f6b12..f35e9878 100644
--- a/vendor/github.com/container-storage-interface/spec/spec.md
+++ b/vendor/github.com/container-storage-interface/spec/spec.md
@@ -46,6 +46,8 @@ The Container Storage Interface (CSI) will
   * Mounting/unmounting a volume from a node.
   * Consumption of both block and mountable volumes.
   * Local storage providers (e.g., device mapper, lvm).
+  * Creating and deleting a snapshot (source of the snapshot is a volume).
+  * Provisioning a new volume from a snapshot (reverting snapshot, where data in the original volume is erased and replaced with data in the snapshot, is out of scope).
 * Define plugin protocol RECOMMENDATIONS.
   * Describe a process by which a Supervisor configures a Plugin.
   * Container deployment considerations (`CAP_SYS_ADMIN`, mount namespace, etc.).
@@ -272,6 +274,8 @@ Each SP MUST provide:
 syntax = "proto3";
 package csi.v0;
 
+import "google/protobuf/wrappers.proto";
+
 option go_package = "csi";
 ```
 
@@ -316,7 +320,16 @@ service Controller {
     returns (GetCapacityResponse) {}
 
   rpc ControllerGetCapabilities (ControllerGetCapabilitiesRequest)
-    returns (ControllerGetCapabilitiesResponse) {}  
+    returns (ControllerGetCapabilitiesResponse) {}
+
+  rpc CreateSnapshot (CreateSnapshotRequest)
+    returns (CreateSnapshotResponse) {}
+
+  rpc DeleteSnapshot (DeleteSnapshotRequest)
+    returns (DeleteSnapshotResponse) {}
+
+  rpc ListSnapshots (ListSnapshotsRequest)
+    returns (ListSnapshotsResponse) {}
 }
 
 service Node {
@@ -332,20 +345,38 @@ service Node {
   rpc NodeUnpublishVolume (NodeUnpublishVolumeRequest)
     returns (NodeUnpublishVolumeResponse) {}
 
+  // NodeGetId is being deprecated in favor of NodeGetInfo and will be
+  // removed in CSI 1.0. Existing drivers, however, may depend on this
+  // RPC call and hence this RPC call MUST be implemented by the CSI
+  // plugin prior to v1.0.
   rpc NodeGetId (NodeGetIdRequest)
-    returns (NodeGetIdResponse) {}
+    returns (NodeGetIdResponse) {
+    option deprecated = true;
+  }
 
   rpc NodeGetCapabilities (NodeGetCapabilitiesRequest)
     returns (NodeGetCapabilitiesResponse) {}
+
+  // Prior to CSI 1.0 - CSI plugins MUST implement both NodeGetId and
+  // NodeGetInfo RPC calls.
+  rpc NodeGetInfo (NodeGetInfoRequest)
+    returns (NodeGetInfoResponse) {}
 }
 ```
 
+#### Concurrency
+
 In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call “in-flight” per volume at a given time.
 However, in some circumstances, the CO may lose state (for example when the CO crashes and restarts), and may issue multiple calls simultaneously for the same volume.
 The plugin should handle this as gracefully as possible.
 The error code `OPERATION_PENDING_FOR_VOLUME` may be returned by the plugin in this case (see general error code section for details).
 
-#### Field Size Limits
+#### Field Requirements
+
+The requirements documented herein apply equally and without exception, unless otherwise noted, for the fields of all protobuf message types defined by this specification.
+Violation of these requirements MAY result in RPC message data that is not compatible with all CO, Plugin, and/or CSI middleware implementations.
+
+##### Size Limits
 
 CSI defines general size limits for fields of various types (see table below).
 The general size limit for a particular field may be overridden by specifying a different size limit in said field's description.
@@ -357,10 +388,11 @@ These limits apply for messages generated by both COs and plugins.
 | 128 bytes  | string              |
 | 4 KiB      | map<string, string> |
 
-#### `REQUIRED` Fields
+##### `REQUIRED` vs. `OPTIONAL`
 
-* A field listed as `REQUIRED` MUST be specified, subject to any per-RPC caveats; caveats SHOULD be rare.
+* A field noted as `REQUIRED` MUST be specified, subject to any per-RPC caveats; caveats SHOULD be rare.
 * A `repeated` or `map` field listed as `REQUIRED` MUST contain at least 1 element.
+* A field noted as `OPTIONAL` MAY be specified and the specification SHALL clearly define expected behavior for the default, zero-value of such fields.
 
 ### Error Scheme
 
@@ -379,6 +411,18 @@ This string MAY be surfaced by CO to end users.
 
 The status `details` MUST be empty. In the future, this spec may require `details` to return a machine-parsable protobuf message if the status `code` is not `OK` to enable CO's to implement smarter error handling and fault resolution.
 
+### Secrets Requirements
+
+Secrets may be required by plugin to complete a RPC request.
+A secret is a string to string map where the key identifies the name of the secret (e.g. "username" or "password"), and the value contains the secret data (e.g. "bob" or "abc123").
+Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
+Each value MUST contain a valid string.
+An SP MAY choose to accept binary (non-string) data by using a binary-to-text encoding scheme, like base64.
+An SP SHALL advertise the requirements for required secret keys and values in documentation.
+CO SHALL permit passing through the required secrets.
+A CO MAY pass the same secrets to all RPCs, therefore the keys for all unique secrets that an SP expects must be unique across all CSI operations.
+This information is sensitive and MUST be treated as such (not logged, etc.) by the CO.
+
 ### Identity Service RPC
 
 Identity service RPCs allow a CO to query a plugin for capabilities, health, and other metadata.
@@ -419,6 +463,7 @@ The general flow of the success case MAY be as follows (protos illustrated in YA
 
 ```protobuf
 message GetPluginInfoRequest {
+  // Intentionally empty.
 }
 
 message GetPluginInfoResponse {
@@ -450,6 +495,7 @@ All instances of the same version (see `vendor_version` of `GetPluginInfoRespons
 
 ```protobuf
 message GetPluginCapabilitiesRequest {
+  // Intentionally empty.
 }
 
 message GetPluginCapabilitiesResponse {
@@ -473,6 +519,14 @@ message PluginCapability {
       // attempt to invoke the REQUIRED ControllerService RPCs, as well
       // as specific RPCs as indicated by ControllerGetCapabilities.
       CONTROLLER_SERVICE = 1;
+
+      // ACCESSIBILITY_CONSTRAINTS indicates that the volumes for this
+      // plugin may not be equally accessible by all nodes in the
+      // cluster. The CO MUST use the topology information returned by
+      // CreateVolumeRequest along with the topology information
+      // returned by NodeGetInfo to ensure that a given volume is
+      // accessible from a given node when scheduling workloads.
+      ACCESSIBILITY_CONSTRAINTS = 2;
     }
     Type type = 1;
   }
@@ -491,7 +545,7 @@ If the plugin is unable to complete the GetPluginCapabilities call successfully,
 #### `Probe`
 
 A Plugin MUST implement this RPC call.
-The primary utility of the Probe RPC is to verify that the plugin is in a healthy state.
+The primary utility of the Probe RPC is to verify that the plugin is in a healthy and ready state.
 If an unhealthy state is reported, via a non-success response, a CO MAY take action with the intent to bring the plugin to a healthy state.
 Such actions MAY include, but SHALL NOT be limited to, the following:
 
@@ -506,10 +560,31 @@ For example, the SP MAY document the maximum frequency at which its Probe implem
 
 ```protobuf
 message ProbeRequest {
+  // Intentionally empty.
 }
 
 message ProbeResponse {
-  // Intentionally empty.
+  // Readiness allows a plugin to report its initialization status back
+  // to the CO. Initialization for some plugins MAY be time consuming
+  // and it is important for a CO to distinguish between the following
+  // cases:
+  //
+  // 1) The plugin is in an unhealthy state and MAY need restarting. In
+  //    this case a gRPC error code SHALL be returned.
+  // 2) The plugin is still initializing, but is otherwise perfectly
+  //    healthy. In this case a successful response SHALL be returned
+  //    with a readiness value of `false`. Calls to the plugin's
+  //    Controller and/or Node services MAY fail due to an incomplete
+  //    initialization state.
+  // 3) The plugin has finished initializing and is ready to service
+  //    calls to its Controller and/or Node services. A successful
+  //    response is returned with a readiness value of `true`.
+  //
+  // This field is OPTIONAL. If not present, the caller SHALL assume
+  // that the plugin is in a ready state and is accepting calls to its
+  // Controller and/or Node services (according to the plugin's reported
+  // capabilities).
+  .google.protobuf.BoolValue ready = 1;
 }
 ```
 
@@ -533,7 +608,7 @@ A Controller Plugin MUST implement this RPC call if it has `CREATE_DELETE_VOLUME
 This RPC will be called by the CO to provision a new volume on behalf of a user (to be consumed as either a block device or a mounted filesystem).
 
 This operation MUST be idempotent.
-If a volume corresponding to the specified volume `name` already exists and is compatible with the specified `capacity_range`, `volume_capabilities` and `parameters` in the `CreateVolumeRequest`, the Plugin MUST reply `0 OK` with the corresponding `CreateVolumeResponse`.
+If a volume corresponding to the specified volume `name` already exists, is accessible from `accessibility_requirements`, and is compatible with the specified `capacity_range`, `volume_capabilities` and `parameters` in the `CreateVolumeRequest`, the Plugin MUST reply `0 OK` with the corresponding `CreateVolumeResponse`.
 
 ```protobuf
 message CreateVolumeRequest {
@@ -556,7 +631,11 @@ message CreateVolumeRequest {
 
   // This field is OPTIONAL. This allows the CO to specify the capacity
   // requirement of the volume to be provisioned. If not specified, the
-  // Plugin MAY choose an implementation-defined capacity range.
+  // Plugin MAY choose an implementation-defined capacity range. If
+  // specified it MUST always be honored, even when creating volumes
+  // from a source; which may force some backends to internally extend
+  // the volume after creating it.
+
   CapacityRange capacity_range = 2;
 
   // The capabilities that the provisioned volume MUST have: the Plugin
@@ -575,23 +654,42 @@ message CreateVolumeRequest {
   map<string, string> parameters = 4;
 
   // Secrets required by plugin to complete volume creation request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> controller_create_secrets = 5;
+
+  // If specified, the new volume will be pre-populated with data from
+  // this source. This field is OPTIONAL.
+  VolumeContentSource volume_content_source = 6;
+  
+  // Specifies where (regions, zones, racks, etc.) the provisioned
+  // volume MUST be accessible from.
+  // An SP SHALL advertise the requirements for topological
+  // accessibility information in documentation. COs SHALL only specify
+  // topological accessibility information supported by the SP.
+  // This field is OPTIONAL.
+  // This field SHALL NOT be specified unless the SP has the
+  // ACCESSIBILITY_CONSTRAINTS plugin capability.
+  // If this field is not specified and the SP has the
+  // ACCESSIBILITY_CONSTRAINTS plugin capability, the SP MAY choose
+  // where the provisioned volume is accessible from.
+  TopologyRequirement accessibility_requirements = 7;
+}
+
+// Specifies what source the volume will be created from. One of the
+// type fields MUST be specified.
+message VolumeContentSource {
+  message SnapshotSource {
+    // Contains identity information for the existing source snapshot.
+    // This field is REQUIRED. Plugin is REQUIRED to support creating
+    // volume from snapshot if it supports the capability
+    // CREATE_DELETE_SNAPSHOT.
+    string id = 1;
+  }
+
+  oneof type {
+    SnapshotSource snapshot = 1;
+  }
 }
 
 message CreateVolumeResponse {
@@ -619,7 +717,7 @@ message VolumeCapability {
     // Therefore, the CO and the Plugin MUST NOT leak this information
     // to untrusted entities. The total size of this repeated field
     // SHALL NOT exceed 4 KiB.
-    repeated string mount_flags = 2;    
+    repeated string mount_flags = 2;
   }
 
   // Specify how a volume can be accessed.
@@ -663,17 +761,17 @@ message VolumeCapability {
 }
 
 // The capacity of the storage space in bytes. To specify an exact size,
-// `required_bytes` and `limit_bytes` can be set to the same value. At
+// `required_bytes` and `limit_bytes` SHALL be set to the same value. At
 // least one of the these fields MUST be specified.
 message CapacityRange {
-  // Volume must be at least this big. This field is OPTIONAL.
+  // Volume MUST be at least this big. This field is OPTIONAL.
   // A value of 0 is equal to an unspecified field value.
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int64 required_bytes = 1;
 
-  // Volume must not be bigger than this. This field is OPTIONAL.
+  // Volume MUST not be bigger than this. This field is OPTIONAL.
   // A value of 0 is equal to an unspecified field value.
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int64 limit_bytes = 2;
 }
 
@@ -682,7 +780,7 @@ message Volume {
   // The capacity of the volume in bytes. This field is OPTIONAL. If not
   // set (value of 0), it indicates that the capacity of the volume is
   // unknown (e.g., NFS share).
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int64 capacity_bytes = 1;
 
   // Contains identity information for the created volume. This field is
@@ -698,7 +796,200 @@ message Volume {
   // a volume. A volume uniquely identified by `id` SHALL always report
   // the same attributes. This field is OPTIONAL and when present MUST
   // be passed to volume validation and publishing calls.
-  map<string,string> attributes = 3;
+  map<string, string> attributes = 3;
+
+  // If specified, indicates that the volume is not empty and is
+  // pre-populated with data from the specified source.
+  // This field is OPTIONAL.
+  VolumeContentSource content_source = 4;
+
+  // Specifies where (regions, zones, racks, etc.) the provisioned
+  // volume is accessible from.
+  // A plugin that returns this field MUST also set the
+  // ACCESSIBILITY_CONSTRAINTS plugin capability.
+  // An SP MAY specify multiple topologies to indicate the volume is
+  // accessible from multiple locations.
+  // COs MAY use this information along with the topology information
+  // returned by NodeGetInfo to ensure that a given volume is accessible
+  // from a given node when scheduling workloads.
+  // This field is OPTIONAL. If it is not specified, the CO MAY assume
+  // the volume is equally accessible from all nodes in the cluster and
+  // may schedule workloads referencing the volume on any available
+  // node.
+  //
+  // Example 1:
+  //   accessible_topology = {"region": "R1", "zone": "Z2"}
+  // Indicates a volume accessible only from the "region" "R1" and the
+  // "zone" "Z2".
+  //
+  // Example 2:
+  //   accessible_topology =
+  //     {"region": "R1", "zone": "Z2"},
+  //     {"region": "R1", "zone": "Z3"} 
+  // Indicates a volume accessible from both "zone" "Z2" and "zone" "Z3"
+  // in the "region" "R1".
+  repeated Topology accessible_topology = 5;
+}
+
+message TopologyRequirement {
+  // Specifies the list of topologies the provisioned volume MUST be
+  // accessible from.
+  // This field is OPTIONAL. If TopologyRequirement is specified either
+  // requisite or preferred or both MUST be specified.
+  // 
+  // If requisite is specified, the provisioned volume MUST be
+  // accessible from at least one of the requisite topologies.
+  // 
+  // Given
+  //   x = number of topologies provisioned volume is accessible from
+  //   n = number of requisite topologies
+  // The CO MUST ensure n >= 1. The SP MUST ensure x >= 1
+  // If x==n, than the SP MUST make the provisioned volume available to
+  // all topologies from the list of requisite topologies. If it is
+  // unable to do so, the SP MUST fail the CreateVolume call.
+  // For example, if a volume should be accessible from a single zone,
+  // and requisite =
+  //   {"region": "R1", "zone": "Z2"}
+  // then the provisioned volume MUST be accessible from the "region"
+  // "R1" and the "zone" "Z2".
+  // Similarly, if a volume should be accessible from two zones, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"}
+  // then the provisioned volume MUST be accessible from the "region"
+  // "R1" and both "zone" "Z2" and "zone" "Z3".
+  //
+  // If x<n, than the SP SHALL choose x unique topologies from the list
+  // of requisite topologies. If it is unable to do so, the SP MUST fail
+  // the CreateVolume call.
+  // For example, if a volume should be accessible from a single zone,
+  // and requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"}
+  // then the SP may choose to make the provisioned volume available in
+  // either the "zone" "Z2" or the "zone" "Z3" in the "region" "R1".
+  // Similarly, if a volume should be accessible from two zones, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"},
+  //   {"region": "R1", "zone": "Z4"}
+  // then the provisioned volume MUST be accessible from any combination
+  // of two unique topologies: e.g. "R1/Z2" and "R1/Z3", or "R1/Z2" and
+  //  "R1/Z4", or "R1/Z3" and "R1/Z4".
+  //
+  // If x>n, than the SP MUST make the provisioned volume available from
+  // all topologies from the list of requisite topologies and MAY choose
+  // the remaining x-n unique topologies from the list of all possible
+  // topologies. If it is unable to do so, the SP MUST fail the
+  // CreateVolume call.
+  // For example, if a volume should be accessible from two zones, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"}
+  // then the provisioned volume MUST be accessible from the "region"
+  // "R1" and the "zone" "Z2" and the SP may select the second zone
+  // independently, e.g. "R1/Z4".
+  repeated Topology requisite = 1;
+
+  // Specifies the list of topologies the CO would prefer the volume to
+  // be provisioned in.
+  //
+  // This field is OPTIONAL. If TopologyRequirement is specified either
+  // requisite or preferred or both MUST be specified.
+  // 
+  // An SP MUST attempt to make the provisioned volume available using
+  // the preferred topologies in order from first to last.
+  //
+  // If requisite is specified, all topologies in preferred list MUST
+  // also be present in the list of requisite topologies.
+  //
+  // If the SP is unable to to make the provisioned volume available
+  // from any of the preferred topologies, the SP MAY choose a topology
+  // from the list of requisite topologies.
+  // If the list of requisite topologies is not specified, then the SP
+  // MAY choose from the list of all possible topologies.
+  // If the list of requisite topologies is specified and the SP is
+  // unable to to make the provisioned volume available from any of the
+  // requisite topologies it MUST fail the CreateVolume call.
+  // 
+  // Example 1:
+  // Given a volume should be accessible from a single zone, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"}
+  // preferred =
+  //   {"region": "R1", "zone": "Z3"}
+  // then the the SP SHOULD first attempt to make the provisioned volume
+  // available from "zone" "Z3" in the "region" "R1" and fall back to
+  // "zone" "Z2" in the "region" "R1" if that is not possible.
+  //
+  // Example 2:
+  // Given a volume should be accessible from a single zone, and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"},
+  //   {"region": "R1", "zone": "Z4"},
+  //   {"region": "R1", "zone": "Z5"}
+  // preferred =
+  //   {"region": "R1", "zone": "Z4"},
+  //   {"region": "R1", "zone": "Z2"}
+  // then the the SP SHOULD first attempt to make the provisioned volume
+  // accessible from "zone" "Z4" in the "region" "R1" and fall back to
+  // "zone" "Z2" in the "region" "R1" if that is not possible. If that
+  // is not possible, the SP may choose between either the "zone"
+  // "Z3" or "Z5" in the "region" "R1".
+  //
+  // Example 3:
+  // Given a volume should be accessible from TWO zones (because an
+  // opaque parameter in CreateVolumeRequest, for example, specifies
+  // the volume is accessible from two zones, aka synchronously
+  // replicated), and
+  // requisite =
+  //   {"region": "R1", "zone": "Z2"},
+  //   {"region": "R1", "zone": "Z3"},
+  //   {"region": "R1", "zone": "Z4"},
+  //   {"region": "R1", "zone": "Z5"}
+  // preferred =
+  //   {"region": "R1", "zone": "Z5"},
+  //   {"region": "R1", "zone": "Z3"}
+  // then the the SP SHOULD first attempt to make the provisioned volume
+  // accessible from the combination of the two "zones" "Z5" and "Z3" in
+  // the "region" "R1". If that's not possible, it should fall back to
+  // a combination of "Z5" and other possibilities from the list of
+  // requisite. If that's not possible, it should fall back  to a
+  // combination of "Z3" and other possibilities from the list of
+  // requisite. If that's not possible, it should fall back  to a
+  // combination of other possibilities from the list of requisite.
+  repeated Topology preferred = 2;
+}
+
+// Topology is a map of topological domains to topological segments.
+// A topological domain is a sub-division of a cluster, like "region",
+// "zone", "rack", etc.
+// A topological segment is a specific instance of a topological domain,
+// like "zone3", "rack3", etc.
+// For example {"com.company/zone": "Z1", "com.company/rack": "R3"}
+// Valid keys have two segments: an optional prefix and name, separated
+// by a slash (/), for example: "com.company.example/zone".
+// The key name segment is required. The prefix is optional.
+// Both the key name and the prefix MUST each be 63 characters or less,
+// begin and end with an alphanumeric character ([a-z0-9A-Z]) and
+// contain only dashes (-), underscores (_), dots (.), or alphanumerics
+// in between, for example "zone".
+// The key prefix MUST follow reverse domain name notation format
+// (https://en.wikipedia.org/wiki/Reverse_domain_name_notation).
+// The key prefix SHOULD include the plugin's host company name and/or
+// the plugin name, to minimize the possibility of collisions with keys
+// from other plugins.
+// If a key prefix is specified, it MUST be identical across all
+// topology keys returned by the SP (across all RPCs).
+// Keys MUST be case-insensitive. Meaning the keys "Zone" and "zone"
+// MUST not both exist.
+// Each value (topological segment) MUST contain 1 or more strings.
+// Each string MUST be 63 characters or less and begin and end with an
+// alphanumeric character with '-', '_', '.', or alphanumerics in
+// between.
+message Topology {
+  map<string, string> segments = 1;
 }
 ```
 
@@ -711,8 +1002,9 @@ The CO MUST implement the specified error recovery behavior when it encounters t
 | Condition | gRPC Code | Description | Recovery Behavior |
 |-----------|-----------|-------------|-------------------|
 | Volume already exists but is incompatible | 6 ALREADY_EXISTS | Indicates that a volume corresponding to the specified volume `name` already exists but is incompatible with the specified `capacity_range`, `volume_capabilities` or `parameters`. | Caller MUST fix the arguments or use a different `name` before retrying. |
+| Unable to provision in `accessible_topology` | 8 RESOURCE_EXHAUSTED | Indicates that although the `accessible_topology` field is valid, a new volume can not be provisioned with the specified topology constraints. More human-readable information MAY be provided in the gRPC `status.message` field. | Caller MUST ensure that whatever is preventing volumes from being provisioned in the specified location (e.g. quota issues) is addressed before retrying with exponential backoff. |
 | Operation pending for volume | 10 ABORTED | Indicates that there is a already an operation pending for the specified volume. In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call "in-flight" per volume at a given time. However, in some circumstances, the CO MAY lose state (for example when the CO crashes and restarts), and MAY issue multiple calls simultaneously for the same volume. The Plugin, SHOULD handle this as gracefully as possible, and MAY return this error code to reject secondary calls. | Caller SHOULD ensure that there are no other calls pending for the specified volume, and then retry with exponential back off. |
-| Unsupported `capacity_range` | 11 OUT_OF_RANGE | Indicates that the capacity range is not allowed by the Plugin. More human-readable information MAY be provided in the gRPC `status.message` field. | Caller MUST fix the capacity range before retrying. |
+| Unsupported `capacity_range` | 11 OUT_OF_RANGE | Indicates that the capacity range is not allowed by the Plugin, for example when trying to create a volume smaller than the source snapshot. More human-readable information MAY be provided in the gRPC `status.message` field. | Caller MUST fix the capacity range before retrying. |
 | Call not implemented | 12 UNIMPLEMENTED | CreateVolume call is not implemented by the plugin or disabled in the Plugin's current mode of operation. | Caller MUST NOT retry. Caller MAY call `ControllerGetCapabilities` or `NodeGetCapabilities` to discover Plugin capabilities. |
 
 
@@ -732,26 +1024,13 @@ message DeleteVolumeRequest {
   string volume_id = 1;
 
   // Secrets required by plugin to complete volume deletion request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> controller_delete_secrets = 2;
 }
 
 message DeleteVolumeResponse {
+  // Intentionally empty.
 }
 ```
 
@@ -789,7 +1068,7 @@ message ControllerPublishVolumeRequest {
   string volume_id = 1;
 
   // The ID of the node. This field is REQUIRED. The CO SHALL set this
-  // field to match the node ID returned by `NodeGetId`.
+  // field to match the node ID returned by `NodeGetInfo`.
   string node_id = 2;
 
   // The capability of the volume the CO expects the volume to have.
@@ -801,29 +1080,14 @@ message ControllerPublishVolumeRequest {
   bool readonly = 4;
 
   // Secrets required by plugin to complete controller publish volume
-  // request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // request. This field is OPTIONAL. Refer to the
+  // `Secrets Requirements` section on how to use this field.
   map<string, string> controller_publish_secrets = 5;
 
   // Attributes of the volume to be used on a node. This field is
   // OPTIONAL and MUST match the attributes of the Volume identified
   // by `volume_id`.
-  map<string,string> volume_attributes = 6;
+  map<string, string> volume_attributes = 6;
 }
 
 message ControllerPublishVolumeResponse {
@@ -843,8 +1107,8 @@ The CO MUST implement the specified error recovery behavior when it encounters t
 
 | Condition | gRPC Code | Description | Recovery Behavior |
 |-----------|-----------|-------------|-------------------|
-| Volume does not exists | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
-| Node does not exists | 5 NOT_FOUND | Indicates that a node corresponding to the specified `node_id` does not exist. | Caller MUST verify that the `node_id` is correct and that the node is available and has not been terminated or deleted before retrying with exponential backoff. |
+| Volume does not exist | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
+| Node does not exist | 5 NOT_FOUND | Indicates that a node corresponding to the specified `node_id` does not exist. | Caller MUST verify that the `node_id` is correct and that the node is available and has not been terminated or deleted before retrying with exponential backoff. |
 | Volume published but is incompatible | 6 ALREADY_EXISTS | Indicates that a volume corresponding to the specified `volume_id` has already been published at the node corresponding to the specified `volume_id` but is incompatible with the specified `volume_capability` or `readonly` flag . | Caller MUST fix the arguments before retying. |
 | Volume published to another node | 9 FAILED_PRECONDITION | Indicates that a volume corresponding to the specified `volume_id` has already been published at another node and does not have MULTI_NODE volume capability. If this error code is returned, the Plugin SHOULD specify the `node_id` of the node at which the volume is published as part of the gRPC `status.message`. | Caller SHOULD ensure the specified volume is not published at any other node before retrying with exponential back off. |
 | Max volumes attached | 8 RESOURCE_EXHAUSTED | Indicates that the maximum supported number of volumes that can be attached to the specified node are already attached. Therefore, this operation will fail until at least one of the existing attached volumes is detached from the node. | Caller MUST ensure that the number of volumes already attached to the node is less then the maximum supported number of volumes before retrying with exponential backoff. |
@@ -871,7 +1135,7 @@ message ControllerUnpublishVolumeRequest {
   string volume_id = 1;
 
   // The ID of the node. This field is OPTIONAL. The CO SHOULD set this
-  // field to match the node ID returned by `NodeGetId` or leave it
+  // field to match the node ID returned by `NodeGetInfo` or leave it
   // unset. If the value is set, the SP MUST unpublish the volume from
   // the specified node. If the value is unset, the SP MUST unpublish
   // the volume from all nodes it is published to.
@@ -879,28 +1143,14 @@ message ControllerUnpublishVolumeRequest {
 
   // Secrets required by plugin to complete controller unpublish volume
   // request. This SHOULD be the same secrets passed to the
-  // ControllerPublishVolume.
-  // call for the specified volume.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // ControllerPublishVolume call for the specified volume.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> controller_unpublish_secrets = 3;
 }
 
 message ControllerUnpublishVolumeResponse {
+  // Intentionally empty.
 }
 ```
 
@@ -912,8 +1162,8 @@ The CO MUST implement the specified error recovery behavior when it encounters t
 
 | Condition | gRPC Code | Description | Recovery Behavior |
 |-----------|-----------|-------------|-------------------|
-| Volume does not exists | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
-| Node does not exists | 5 NOT_FOUND | Indicates that a node corresponding to the specified `node_id` does not exist. | Caller MUST verify that the `node_id` is correct and that the node is available and has not been terminated or deleted before retrying with exponential backoff. |
+| Volume does not exist | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
+| Node does not exist | 5 NOT_FOUND | Indicates that a node corresponding to the specified `node_id` does not exist. | Caller MUST verify that the `node_id` is correct and that the node is available and has not been terminated or deleted before retrying with exponential backoff. |
 | Operation pending for volume | 10 ABORTED | Indicates that there is a already an operation pending for the specified volume. In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call "in-flight" per volume at a given time. However, in some circumstances, the CO MAY lose state (for example when the CO crashes and restarts), and MAY issue multiple calls simultaneously for the same volume. The Plugin, SHOULD handle this as gracefully as possible, and MAY return this error code to reject secondary calls. | Caller SHOULD ensure that there are no other calls pending for the specified volume, and then retry with exponential back off. |
 | Call not implemented | 12 UNIMPLEMENTED | ControllerUnpublishVolume call is not implemented by the plugin or disabled in the Plugin's current mode of operation. | Caller MUST NOT retry. Caller MAY call `ControllerGetCapabilities` or `NodeGetCapabilities` to discover Plugin capabilities. |
 
@@ -937,7 +1187,15 @@ message ValidateVolumeCapabilitiesRequest {
 
   // Attributes of the volume to check. This field is OPTIONAL and MUST
   // match the attributes of the Volume identified by `volume_id`.
-  map<string,string> volume_attributes = 3;
+  map<string, string> volume_attributes = 3;
+
+  // Specifies where (regions, zones, racks, etc.) the caller believes
+  // the volume is accessible from.
+  // A caller MAY specify multiple topologies to indicate they believe
+  // the volume to be accessible from multiple locations.
+  // This field is OPTIONAL. This field SHALL NOT be set unless the
+  // plugin advertises the ACCESSIBILITY_CONSTRAINTS capability.
+  repeated Topology accessible_topology = 4;
 }
 
 message ValidateVolumeCapabilitiesResponse {
@@ -960,7 +1218,7 @@ The CO MUST implement the specified error recovery behavior when it encounters t
 
 | Condition | gRPC Code | Description | Recovery Behavior |
 |-----------|-----------|-------------|-------------------|
-| Volume does not exists | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
+| Volume does not exist | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
 
 
 #### `ListVolumes`
@@ -977,7 +1235,7 @@ message ListVolumesRequest {
   // in the subsequent `ListVolumes` call. This field is OPTIONAL. If
   // not specified (zero value), it means there is no restriction on the
   // number of entries that can be returned.
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int32 max_entries = 1;
 
   // A token to specify where to start paginating. Set this field to
@@ -1034,15 +1292,23 @@ message GetCapacityRequest {
   // specific `parameters`. These are the same `parameters` the CO will
   // use in `CreateVolumeRequest`. This field is OPTIONAL.
   map<string, string> parameters = 2;
+
+  // If specified, the Plugin SHALL report the capacity of the storage
+  // that can be used to provision volumes that in the specified
+  // `accessible_topology`. This is the same as the
+  // `accessible_topology` the CO returns in a `CreateVolumeResponse`.
+  // This field is OPTIONAL. This field SHALL NOT be set unless the
+  // plugin advertises the ACCESSIBILITY_CONSTRAINTS capability.
+  Topology accessible_topology = 3;
 }
 
 message GetCapacityResponse {
-  // The available capacity of the storage that can be used to
-  // provision volumes. If `volume_capabilities` or `parameters` is
+  // The available capacity, in bytes, of the storage that can be used
+  // to provision volumes. If `volume_capabilities` or `parameters` is
   // specified in the request, the Plugin SHALL take those into
   // consideration when calculating the available capacity of the
   // storage. This field is REQUIRED.
-  // The value of this field MUST NOT be negative. 
+  // The value of this field MUST NOT be negative.
   int64 available_capacity = 1;
 }
 ```
@@ -1057,6 +1323,7 @@ A Controller Plugin MUST implement this RPC call. This RPC allows the CO to chec
 
 ```protobuf
 message ControllerGetCapabilitiesRequest {
+  // Intentionally empty.
 }
 
 message ControllerGetCapabilitiesResponse {
@@ -1074,6 +1341,16 @@ message ControllerServiceCapability {
       PUBLISH_UNPUBLISH_VOLUME = 2;
       LIST_VOLUMES = 3;
       GET_CAPACITY = 4;
+      // Currently the only way to consume a snapshot is to create
+      // a volume from it. Therefore plugins supporting
+      // CREATE_DELETE_SNAPSHOT MUST support creating volume from
+      // snapshot.
+      CREATE_DELETE_SNAPSHOT = 5;
+      // LIST_SNAPSHOTS is NOT REQUIRED. For plugins that need to upload
+      // a snapshot after it is being cut, LIST_SNAPSHOTS COULD be used
+      // with the snapshot_id as the filter to query whether the
+      // uploading process is complete or not.
+      LIST_SNAPSHOTS = 6;
     }
 
     Type type = 1;
@@ -1090,6 +1367,237 @@ message ControllerServiceCapability {
 
 If the plugin is unable to complete the ControllerGetCapabilities call successfully, it MUST return a non-ok gRPC code in the gRPC status.
 
+#### `CreateSnapshot`
+
+A Controller Plugin MUST implement this RPC call if it has `CREATE_DELETE_SNAPSHOT` controller capability.
+This RPC will be called by the CO to create a new snapshot from a source volume on behalf of a user.
+
+This operation MUST be idempotent.
+If a snapshot corresponding to the specified snapshot `name` is already successfully cut and uploaded (if upload is part of the process) and is compatible with the specified `source_volume_id` and `parameters` in the `CreateSnapshotRequest`, the Plugin MUST reply `0 OK` with the corresponding `CreateSnapshotResponse`.
+
+If an error occurs before a snapshot is cut, `CreateSnapshot` SHOULD return a corresponding gRPC error code that reflects the error condition.
+
+For plugins that implement snapshot uploads, `CreateSnapshot` SHOULD return `10 ABORTED`, a gRPC code that indicates the operation is pending for snapshot, during the snapshot uploading processs.
+If an error occurs during the uploading process, `CreateSnapshot` SHOULD return a corresponding gRPC error code that reflects the error condition.
+
+A snapshot MAY be used as the source to provision a new volume.
+A CreateVolumeRequest message may specify an OPTIONAL source snapshot parameter.
+Reverting a snapshot, where data in the original volume is erased and replaced with data in the snapshot, is an advanced functionality not every storage system can support and therefore is currently out of scope.
+
+```protobuf
+message CreateSnapshotRequest {
+  // The ID of the source volume to be snapshotted.
+  // This field is REQUIRED.
+  string source_volume_id = 1;
+
+  // The suggested name for the snapshot. This field is REQUIRED for
+  // idempotency.
+  string name = 2;
+
+  // Secrets required by plugin to complete snapshot creation request.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
+  map<string, string> create_snapshot_secrets = 3;
+
+  // Plugin specific parameters passed in as opaque key-value pairs.
+  // This field is OPTIONAL. The Plugin is responsible for parsing and
+  // validating these parameters. COs will treat these as opaque.
+  // Use cases for opaque parameters:
+  // - Specify a policy to automatically clean up the snapshot.
+  // - Specify an expiration date for the snapshot.
+  // - Specify whether the snapshot is readonly or read/write.
+  // - Specify if the snapshot should be replicated to some place.
+  // - Specify primary or secondary for replication systems that
+  //   support snapshotting only on primary.
+  map<string, string> parameters = 4;
+}
+
+message CreateSnapshotResponse {
+  // Contains all attributes of the newly created snapshot that are
+  // relevant to the CO along with information required by the Plugin
+  // to uniquely identify the snapshot. This field is REQUIRED.
+  Snapshot snapshot = 1;
+}
+
+// The information about a provisioned snapshot.
+message Snapshot {
+  // This is the complete size of the snapshot in bytes. The purpose of
+  // this field is to give CO guidance on how much space is needed to
+  // create a volume from this snapshot. The size of the volume MUST NOT
+  // be less than the size of the source snapshot. This field is
+  // OPTIONAL. If this field is not set, it indicates that this size is
+  // unknown. The value of this field MUST NOT be negative and a size of
+  // zero means it is unspecified.
+  int64 size_bytes = 1;
+
+  // Uniquely identifies a snapshot and is generated by the plugin. It
+  // will not change over time. This field is REQUIRED. The identity
+  // information will be used by the CO in subsequent calls to refer to
+  // the provisioned snapshot.
+  string id = 2;
+
+  // Identity information for the source volume. Note that creating a
+  // snapshot from a snapshot is not supported here so the source has to
+  // be a volume. This field is REQUIRED.
+  string source_volume_id = 3;
+
+  // Timestamp when the point-in-time snapshot is taken on the storage
+  // system. The format of this field should be a Unix nanoseconds time
+  // encoded as an int64. On Unix, the command `date +%s%N` returns the
+  // current time in nanoseconds since 1970-01-01 00:00:00 UTC. This
+  // field is REQUIRED.
+  int64 created_at = 4;
+
+  // The status of a snapshot.
+  SnapshotStatus status = 5;
+}
+
+// The status of a snapshot.
+message SnapshotStatus {
+  enum Type {
+     UNKNOWN = 0;
+     // A snapshot is ready for use.
+     READY = 1;
+     // A snapshot is cut and is now being uploaded.
+     // Some cloud providers and storage systems uploads the snapshot
+     // to the cloud after the snapshot is cut. During this phase,
+     // `thaw` can be done so the application can be running again if
+     // `freeze` was done before taking the snapshot.
+     UPLOADING = 2;
+     // An error occurred during the snapshot uploading process.
+     // This error status is specific for uploading because
+     // `CreateSnaphot` is a blocking call before the snapshot is
+     // cut and therefore it SHOULD NOT come back with an error
+     // status when an error occurs. Instead a gRPC error code SHALL
+     // be returned by `CreateSnapshot` when an error occurs before
+     // a snapshot is cut.
+     ERROR_UPLOADING = 3;
+  }
+  // This field is REQUIRED.
+  Type type = 1;
+
+  // Additional information to describe why a snapshot ended up in the
+  // `ERROR_UPLOADING` status. This field is OPTIONAL.
+  string details = 2;
+}
+```
+
+##### CreateSnapshot Errors
+
+If the plugin is unable to complete the CreateSnapshot call successfully, it MUST return a non-ok gRPC code in the gRPC status.
+If the conditions defined below are encountered, the plugin MUST return the specified gRPC error code.
+The CO MUST implement the specified error recovery behavior when it encounters the gRPC error code.
+
+| Condition | gRPC Code | Description | Recovery Behavior |
+|-----------|-----------|-------------|-------------------|
+| Snapshot already exists but is incompatible | 6 ALREADY_EXISTS | Indicates that a snapshot corresponding to the specified snapshot `name` already exists but is incompatible with the specified `volume_id`. | Caller MUST fix the arguments or use a different `name` before retrying. |
+| Operation pending for snapshot | 10 ABORTED | Indicates that there is a already an operation pending for the specified snapshot. In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call "in-flight" per snapshot at a given time. However, in some circumstances, the CO MAY lose state (for example when the CO crashes and restarts), and MAY issue multiple calls simultaneously for the same snapshot. The Plugin, SHOULD handle this as gracefully as possible, and MAY return this error code to reject secondary calls. | Caller SHOULD ensure that there are no other calls pending for the specified snapshot, and then retry with exponential back off. |
+| Call not implemented | 12 UNIMPLEMENTED | CreateSnapshot call is not implemented by the plugin or disabled in the Plugin's current mode of operation. | Caller MUST NOT retry. Caller MAY call `ControllerGetCapabilities` to discover Plugin capabilities. |
+| Not enough space to create snapshot | 13 RESOURCE_EXHAUSTED | There is not enough space on the storage system to handle the create snapshot request. | Caller should fail this request. Future calls to CreateSnapshot may succeed if space is freed up. |
+
+
+#### `DeleteSnapshot`
+
+A Controller Plugin MUST implement this RPC call if it has `CREATE_DELETE_SNAPSHOT` capability.
+This RPC will be called by the CO to delete a snapshot.
+If successful, the storage space associated with the snapshot MUST be released and all the data in the snapshot SHALL NOT be accessible anymore.
+
+This operation MUST be idempotent.
+If a snapshot corresponding to the specified `snapshot_id` does not exist or the artifacts associated with the snapshot do not exist anymore, the Plugin MUST reply `0 OK`.
+
+```protobuf
+message DeleteSnapshotRequest {
+  // The ID of the snapshot to be deleted.
+  // This field is REQUIRED.
+  string snapshot_id = 1;
+
+  // Secrets required by plugin to complete snapshot deletion request.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
+  map<string, string> delete_snapshot_secrets = 2;
+}
+
+message DeleteSnapshotResponse {}
+```
+
+##### DeleteSnapshot Errors
+
+If the plugin is unable to complete the DeleteSnapshot call successfully, it MUST return a non-ok gRPC code in the gRPC status.
+If the conditions defined below are encountered, the plugin MUST return the specified gRPC error code.
+The CO MUST implement the specified error recovery behavior when it encounters the gRPC error code.
+
+| Condition | gRPC Code | Description | Recovery Behavior |
+|-----------|-----------|-------------|-------------------|
+| Snapshot in use | 9 FAILED_PRECONDITION | Indicates that the snapshot corresponding to the specified `snapshot_id` could not be deleted because it is in use by another resource. | Caller SHOULD ensure that there are no other resources using the snapshot, and then retry with exponential back off. |
+| Operation pending for snapshot | 10 ABORTED | Indicates that there is already an operation pending for the specified snapshot. In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call "in-flight" per snapshot at a given time. However, in some circumstances, the CO MAY lose state (for example when the CO crashes and restarts), and MAY issue multiple calls simultaneously for the same snapshot. The Plugin, SHOULD handle this as gracefully as possible, and MAY return this error code to reject secondary calls. | Caller SHOULD ensure that there are no other calls pending for the specified snapshot, and then retry with exponential back off. |
+| Call not implemented | 12 UNIMPLEMENTED | DeleteSnapshot call is not implemented by the plugin or disabled in the Plugin's current mode of operation. | Caller MUST NOT retry. Caller MAY call `ControllerGetCapabilities` to discover Plugin capabilities. |
+
+
+#### `ListSnapshots`
+
+A Controller Plugin MUST implement this RPC call if it has `LIST_SNAPSHOTS` capability.
+The Plugin SHALL return the information about all snapshots on the storage system within the given parameters regardless of how they were created.
+`ListSnapshots` SHALL NOT list a snapshot that is being created but has not been cut successfully yet.
+
+```protobuf
+// List all snapshots on the storage system regardless of how they were
+// created.
+message ListSnapshotsRequest {
+  // If specified (non-zero value), the Plugin MUST NOT return more
+  // entries than this number in the response. If the actual number of
+  // entries is more than this number, the Plugin MUST set `next_token`
+  // in the response which can be used to get the next page of entries
+  // in the subsequent `ListSnapshots` call. This field is OPTIONAL. If
+  // not specified (zero value), it means there is no restriction on the
+  // number of entries that can be returned.
+  // The value of this field MUST NOT be negative.
+  int32 max_entries = 1;
+
+  // A token to specify where to start paginating. Set this field to
+  // `next_token` returned by a previous `ListSnapshots` call to get the
+  // next page of entries. This field is OPTIONAL.
+  // An empty string is equal to an unspecified field value.
+  string starting_token = 2;
+
+  // Identity information for the source volume. This field is OPTIONAL.
+  // It can be used to list snapshots by volume.
+  string source_volume_id = 3;
+
+  // Identity information for a specific snapshot. This field is
+  // OPTIONAL. It can be used to list only a specific snapshot.
+  // ListSnapshots will return with current snapshot information
+  // and will not block if the snapshot is being uploaded.
+  string snapshot_id = 4;
+}
+
+message ListSnapshotsResponse {
+  message Entry {
+    Snapshot snapshot = 1;
+  }
+
+  repeated Entry entries = 1;
+
+  // This token allows you to get the next page of entries for
+  // `ListSnapshots` request. If the number of entries is larger than
+  // `max_entries`, use the `next_token` as a value for the
+  // `starting_token` field in the next `ListSnapshots` request. This
+  // field is OPTIONAL.
+  // An empty string is equal to an unspecified field value.
+  string next_token = 2;
+}
+```
+
+##### ListSnapshots Errors
+
+If the plugin is unable to complete the ListSnapshots call successfully, it MUST return a non-ok gRPC code in the gRPC status.
+If the conditions defined below are encountered, the plugin MUST return the specified gRPC error code.
+The CO MUST implement the specified error recovery behavior when it encounters the gRPC error code.
+
+| Condition | gRPC Code | Description | Recovery Behavior |
+|-----------|-----------|-------------|-------------------|
+| Invalid `starting_token` | 10 ABORTED | Indicates that `starting_token` is not valid. | Caller SHOULD start the `ListSnapshots` operation again with an empty `starting_token`. |
+
+
 #### RPC Interactions
 
 ##### `CreateVolume`, `DeleteVolume`, `ListVolumes`
@@ -1103,6 +1611,51 @@ If a `CreateVolume` operation times out, leaving the CO without an ID with which
 
 It is NOT REQUIRED for a controller plugin to implement the `LIST_VOLUMES` capability if it supports the `CREATE_DELETE_VOLUME` capability: the onus is upon the CO to take into consideration the full range of plugin capabilities before deciding how to proceed in the above scenario.
 
+##### `CreateSnapshot`, `DeleteSnapshot`, `ListSnapshots`
+
+The plugin-generated `snapshot_id` is a REQUIRED field for the `DeleteSnapshot` RPC, as opposed to the CO-generated snapshot `name` that is REQUIRED for the `CreateSnapshot` RPC.
+A `CreateSnapshot` operation SHOULD return with a `snapshot_id` when the snapshot is cut successfully.
+If a `CreateSnapshot` operation times out before the snapshot is cut, leaving the CO without an ID with which to reference a snapshot, and the CO also decides that it no longer needs/wants the snapshot in question then the CO MAY choose one of the following paths:
+
+1. Execute the `ListSnapshots` RPC to possibly obtain a snapshot ID that may be used to execute a `DeleteSnapshot` RPC; upon success execute `DeleteSnapshot`.
+2. The CO takes no further action regarding the timed out RPC, a snapshot is possibly leaked and the operator/user is expected to clean up.
+
+It is NOT REQUIRED for a controller plugin to implement the `LIST_SNAPSHOTS` capability if it supports the `CREATE_DELETE_SNAPSHOT` capability: the onus is upon the CO to take into consideration the full range of plugin capabilities before deciding how to proceed in the above scenario.
+A controller plugin COULD implement the `LIST_SNAPSHOTS` capability and call it repeatedly with the `snapshot_id` as a filter to query whether the uploading process is complete or not if it needs to upload a snapshot after it is being cut.
+
+##### Snapshot Statuses
+
+A snapshot could have the following statusus: UPLOADING, READY, and ERROR.
+
+Some cloud providers will upload the snapshot to a location in the cloud (i.e., an object store) after the snapshot is cut.
+Uploading may be a long process that could take hours.
+If a `freeze` operation was done on the application before taking the snapshot, it could be a long time before the application can be running again if we wait until the upload is complete to `thaw` the application.
+The purpose of `freeze` is to ensure the application data is in consistent state.
+When `freeze` is performed, the container is paused and the application is also paused.
+When `thaw` is performed, the container and the application start running again.
+During the snapshot uploading phase, since the snapshot is already cut, a `thaw` operation can be performed so application can start running without waiting for the upload to complete.
+The status of the snapshot will become `READY` after the upload is complete.
+
+For cloud providers and storage systems that don't have the uploading process, the status should be `READY` after the snapshot is cut.
+`thaw` can be done when the status is `READY` in this case.
+
+A `CREATING` status is not included here because CreateSnapshot is synchronous and will block until the snapshot is cut.
+
+`ERROR` is a terminal snapshot status.
+A CO SHOULD explicitly delete snapshots in this status.
+
+The SnapshotStatus parameter provides guidance to the CO on what action can be taken in the process of snapshotting.
+Based on this information, CO can issue repeated (idemponent) calls to CreateSnapshot, monitor the response, and make decisions.
+Note that CreateSnapshot is a synchronous call and it must block until the snapshot is cut.
+If the cloud provider or storage system does not need to upload the snapshot after it is cut, the status returned by CreateSnapshot SHALL be `READY`.
+If the cloud provider or storage system needs to upload the snapshot after the snapshot is cut, the status returned by CreateSnapshot SHALL be `UPLOADING`.
+CO MAY continue to call CreateSnapshot while waiting for the upload to complete until the status becomes `READY`.
+Note that CreateSnapshot no longer blocks after the snapshot is cut.
+
+Alternatively, ListSnapshots can be called repeatedly with snapshot_id as filtering to wait for the upload to complete.
+ListSnapshots SHALL return with current information regarding the snapshots on the storage system.
+When upload is complete, the status of the snapshot from ListSnapshots SHALL become `READY`.
+
 ### Node Service RPC
 
 #### `NodeStageVolume`
@@ -1135,7 +1688,7 @@ message NodeStageVolumeRequest {
 
   // The path to which the volume will be published. It MUST be an
   // absolute path in the root filesystem of the process serving this
-  // request. The CO SHALL ensure that there is only one 
+  // request. The CO SHALL ensure that there is only one
   // staging_target_path per volume.
   // This is a REQUIRED field.
   string staging_target_path = 3;
@@ -1145,31 +1698,18 @@ message NodeStageVolumeRequest {
   VolumeCapability volume_capability = 4;
 
   // Secrets required by plugin to complete node stage volume request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> node_stage_secrets = 5;
 
   // Attributes of the volume to publish. This field is OPTIONAL and
-  // MUST match the attributes of the VolumeInfo identified by
+  // MUST match the attributes of the `Volume` identified by
   // `volume_id`.
-  map<string,string> volume_attributes = 6;
+  map<string, string> volume_attributes = 6;
 }
 
 message NodeStageVolumeResponse {
+  // Intentionally empty.
 }
 ```
 
@@ -1184,7 +1724,7 @@ The CO MUST implement the specified error recovery behavior when it encounters t
 | Volume does not exist | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
 | Volume published but is incompatible | 6 ALREADY_EXISTS | Indicates that a volume corresponding to the specified `volume_id` has already been published at the specified `staging_target_path` but is incompatible with the specified `volume_capability` flag. | Caller MUST fix the arguments before retying. |
 | Operation pending for volume | 10 ABORTED | Indicates that there is a already an operation pending for the specified volume. In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call "in-flight" per volume at a given time. However, in some circumstances, the CO MAY lose state (for example when the CO crashes and restarts), and MAY issue multiple calls simultaneously for the same volume. The Plugin, SHOULD handle this as gracefully as possible, and MAY return this error code to reject secondary calls. | Caller SHOULD ensure that there are no other calls pending for the specified volume, and then retry with exponential back off. |
-| Exceeds capabilities | 10 FAILED_PRECONDITION | Indicates that the CO has exceeded the volume's capabilities because the volume does not have MULTI_NODE capability. | Caller MAY choose to call `ValidateVolumeCapabilities` to validate the volume capabilities, or wait for the volume to be unpublished on the node. |
+| Exceeds capabilities | 9 FAILED_PRECONDITION | Indicates that the CO has exceeded the volume's capabilities because the volume does not have MULTI_NODE capability. | Caller MAY choose to call `ValidateVolumeCapabilities` to validate the volume capabilities, or wait for the volume to be unpublished on the node. |
 
 #### `NodeUnstageVolume`
 
@@ -1218,6 +1758,7 @@ message NodeUnstageVolumeRequest {
 }
 
 message NodeUnstageVolumeResponse {
+  // Intentionally empty.
 }
 ```
 
@@ -1229,17 +1770,17 @@ The CO MUST implement the specified error recovery behavior when it encounters t
 
 | Condition | gRPC Code | Description | Recovery Behavior |
 |-----------|-----------|-------------|-------------------|
-| Volume does not exists | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
+| Volume does not exist | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
 | Operation pending for volume | 10 ABORTED | Indicates that there is a already an operation pending for the specified volume. In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call "in-flight" per volume at a given time. However, in some circumstances, the CO MAY lose state (for example when the CO crashes and restarts), and MAY issue multiple calls simultaneously for the same volume. The Plugin, SHOULD handle this as gracefully as possible, and MAY return this error code to reject secondary calls. | Caller SHOULD ensure that there are no other calls pending for the specified volume, and then retry with exponential back off. |
 
 #### RPC Interactions and Reference Counting
 `NodeStageVolume`, `NodeUnstageVolume`, `NodePublishVolume`, `NodeUnpublishVolume`
 
-The following interaction semantics ARE REQUIRED if the plugin advertises the `STAGE_UNSTAGE_VOLUME` capability. 
+The following interaction semantics ARE REQUIRED if the plugin advertises the `STAGE_UNSTAGE_VOLUME` capability.
 `NodeStageVolume` MUST be called and return success once per volume per node before any `NodePublishVolume` MAY be called for the volume.
 All `NodeUnpublishVolume` MUST be called and return success for a volume before `NodeUnstageVolume` MAY be called for the volume.
 
-Note that this requires that all COs MUST support reference counting of volumes so that if `STAGE_UNSTAGE_VOLUME` is advertised by the SP, the CO MUST fufill the above interaction semantics.
+Note that this requires that all COs MUST support reference counting of volumes so that if `STAGE_UNSTAGE_VOLUME` is advertised by the SP, the CO MUST fulfill the above interaction semantics.
 
 #### `NodePublishVolume`
 
@@ -1278,7 +1819,7 @@ message NodePublishVolumeRequest {
   // The path to which the device was mounted by `NodeStageVolume`.
   // It MUST be an absolute path in the root filesystem of the process
   // serving this request.
-  // It MUST be set if the Node Plugin implements the 
+  // It MUST be set if the Node Plugin implements the
   // `STAGE_UNSTAGE_VOLUME` node capability.
   // This is an OPTIONAL field.
   string staging_target_path = 3;
@@ -1300,31 +1841,18 @@ message NodePublishVolumeRequest {
   bool readonly = 6;
 
   // Secrets required by plugin to complete node publish volume request.
-  // A secret is a string to string map where the key identifies the
-  // name of the secret (e.g. "username" or "password"), and the value
-  // contains the secret data (e.g. "bob" or "abc123").
-  // Each key MUST consist of alphanumeric characters, '-', '_' or '.'.
-  // Each value MUST contain a valid string. An SP MAY choose to accept
-  // binary (non-string) data by using a binary-to-text encoding scheme,
-  // like base64.
-  // An SP SHALL advertise the requirements for required secret keys and
-  // values in documentation.
-  // CO SHALL permit passing through the required secrets.
-  // A CO MAY pass the same secrets to all RPCs, therefore the keys for
-  // all unique secrets that an SP expects must be unique across all CSI
-  // operations.
-  // This information is sensitive and MUST be treated as such (not
-  // logged, etc.) by the CO.
-  // This field is OPTIONAL.
+  // This field is OPTIONAL. Refer to the `Secrets Requirements`
+  // section on how to use this field.
   map<string, string> node_publish_secrets = 7;
 
   // Attributes of the volume to publish. This field is OPTIONAL and
   // MUST match the attributes of the Volume identified by
   // `volume_id`.
-  map<string,string> volume_attributes = 8;
+  map<string, string> volume_attributes = 8;
 }
 
 message NodePublishVolumeResponse {
+  // Intentionally empty.
 }
 ```
 
@@ -1336,11 +1864,11 @@ The CO MUST implement the specified error recovery behavior when it encounters t
 
 | Condition | gRPC Code | Description | Recovery Behavior |
 |-----------|-----------|-------------|-------------------|
-| Volume does not exists | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
+| Volume does not exist | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
 | Volume published but is incompatible | 6 ALREADY_EXISTS | Indicates that a volume corresponding to the specified `volume_id` has already been published at the specified `target_path` but is incompatible with the specified `volume_capability` or `readonly` flag. | Caller MUST fix the arguments before retying. |
 | Operation pending for volume | 10 ABORTED | Indicates that there is a already an operation pending for the specified volume. In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call "in-flight" per volume at a given time. However, in some circumstances, the CO MAY lose state (for example when the CO crashes and restarts), and MAY issue multiple calls simultaneously for the same volume. The Plugin, SHOULD handle this as gracefully as possible, and MAY return this error code to reject secondary calls. | Caller SHOULD ensure that there are no other calls pending for the specified volume, and then retry with exponential back off. |
-| Exceeds capabilities | 10 FAILED_PRECONDITION | Indicates that the CO has exceeded the volume's capabilities because the volume does not have MULTI_NODE capability. | Caller MAY choose to call `ValidateVolumeCapabilities` to validate the volume capabilities, or wait for the volume to be unpublished on the node. |
-| Stanging target path not set | 10 FAILED_PRECONDITION | Indicates that `STAGE_UNSTAGE_VOLUME` capability is set but no `staging_target_path` was set. | Caller MUST make sure call to `NodeStageVolume` is made and returns success before retrying with valid `staging_target_path`. |  
+| Exceeds capabilities | 9 FAILED_PRECONDITION | Indicates that the CO has exceeded the volume's capabilities because the volume does not have MULTI_NODE capability. | Caller MAY choose to call `ValidateVolumeCapabilities` to validate the volume capabilities, or wait for the volume to be unpublished on the node. |
+| Staging target path not set | 9 FAILED_PRECONDITION | Indicates that `STAGE_UNSTAGE_VOLUME` capability is set but no `staging_target_path` was set. | Caller MUST make sure call to `NodeStageVolume` is made and returns success before retrying with valid `staging_target_path`. |
 
 
 #### `NodeUnpublishVolume`
@@ -1369,6 +1897,7 @@ message NodeUnpublishVolumeRequest {
 }
 
 message NodeUnpublishVolumeResponse {
+  // Intentionally empty.
 }
 ```
 
@@ -1380,12 +1909,15 @@ The CO MUST implement the specified error recovery behavior when it encounters t
 
 | Condition | gRPC Code | Description | Recovery Behavior |
 |-----------|-----------|-------------|-------------------|
-| Volume does not exists | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
+| Volume does not exist | 5 NOT_FOUND | Indicates that a volume corresponding to the specified `volume_id` does not exist. | Caller MUST verify that the `volume_id` is correct and that the volume is accessible and has not been deleted before retrying with exponential back off. |
 | Operation pending for volume | 10 ABORTED | Indicates that there is a already an operation pending for the specified volume. In general the Cluster Orchestrator (CO) is responsible for ensuring that there is no more than one call "in-flight" per volume at a given time. However, in some circumstances, the CO MAY lose state (for example when the CO crashes and restarts), and MAY issue multiple calls simultaneously for the same volume. The Plugin, SHOULD handle this as gracefully as possible, and MAY return this error code to reject secondary calls. | Caller SHOULD ensure that there are no other calls pending for the specified volume, and then retry with exponential back off. |
 
 
 #### `NodeGetId`
 
+`NodeGetId` RPC call is deprecated.
+Users of this RPC call SHOULD use `NodeGetInfo`.
+
 A Node Plugin MUST implement this RPC call if the plugin has `PUBLISH_UNPUBLISH_VOLUME` controller capability.
 The Plugin SHALL assume that this RPC will be executed on the node where the volume will be used.
 The CO SHOULD call this RPC for the node at which it wants to place the workload.
@@ -1393,6 +1925,7 @@ The result of this call will be used by CO in `ControllerPublishVolume`.
 
 ```protobuf
 message NodeGetIdRequest {
+  // Intentionally empty.
 }
 
 message NodeGetIdResponse {
@@ -1420,6 +1953,7 @@ This RPC allows the CO to check the supported capabilities of node service provi
 
 ```protobuf
 message NodeGetCapabilitiesRequest {
+  // Intentionally empty.
 }
 
 message NodeGetCapabilitiesResponse {
@@ -1450,6 +1984,63 @@ message NodeServiceCapability {
 
 If the plugin is unable to complete the NodeGetCapabilities call successfully, it MUST return a non-ok gRPC code in the gRPC status.
 
+
+#### `NodeGetInfo`
+
+A Node Plugin MUST implement this RPC call if the plugin has `PUBLISH_UNPUBLISH_VOLUME` controller capability.
+The Plugin SHALL assume that this RPC will be executed on the node where the volume will be used.
+The CO SHOULD call this RPC for the node at which it wants to place the workload.
+The result of this call will be used by CO in `ControllerPublishVolume`.
+
+```protobuf
+message NodeGetInfoRequest {
+}
+
+message NodeGetInfoResponse {
+  // The ID of the node as understood by the SP which SHALL be used by
+  // CO in subsequent calls to `ControllerPublishVolume`.
+  // This is a REQUIRED field.
+  string node_id = 1;
+
+  // Maximum number of volumes that controller can publish to the node.
+  // If value is not set or zero CO SHALL decide how many volumes of
+  // this type can be published by the controller to the node. The
+  // plugin MUST NOT set negative values here.
+  // This field is OPTIONAL.
+  int64 max_volumes_per_node = 2;
+
+  // Specifies where (regions, zones, racks, etc.) the node is
+  // accessible from.
+  // A plugin that returns this field MUST also set the
+  // ACCESSIBILITY_CONSTRAINTS plugin capability.
+  // COs MAY use this information along with the topology information
+  // returned in CreateVolumeResponse to ensure that a given volume is
+  // accessible from a given node when scheduling workloads.
+  // This field is OPTIONAL. If it is not specified, the CO MAY assume
+  // the node is not subject to any topological constraint, and MAY
+  // schedule workloads that reference any volume V, such that there are
+  // no topological constraints declared for V.
+  //
+  // Example 1:
+  //   accessible_topology =
+  //     {"region": "R1", "zone": "R2"}
+  // Indicates the node exists within the "region" "R1" and the "zone"
+  // "Z2".
+  Topology accessible_topology = 3;
+}
+```
+
+##### NodeGetInfo Errors
+
+If the plugin is unable to complete the NodeGetInfo call successfully, it MUST return a non-ok gRPC code in the gRPC status.
+If the conditions defined below are encountered, the plugin MUST return the specified gRPC error code.
+The CO MUST implement the specified error recovery behavior when it encounters the gRPC error code.
+
+Condition | gRPC Code | Description | Recovery Behavior
+| --- | --- | --- | --- |
+| Call not implemented | 12 UNIMPLEMENTED | NodeGetInfo call is not implemented by the plugin or disabled in the Plugin's current mode of operation. | Caller MUST NOT retry. Caller MAY call `ControllerGetCapabilities` or `NodeGetCapabilities` to discover Plugin capabilities. |
+
+
 ## Protocol
 
 ### Connectivity
@@ -1527,7 +2118,7 @@ The following address types SHALL be supported by Plugins:
 
     unix:///path/to/unix/socket.sock
 
-Note: All UNIX endpoints SHALL end with `.sock`. See [gRPC Name Resolution](https://github.com/grpc/grpc/blob/master/doc/naming.md).  
+Note: All UNIX endpoints SHALL end with `.sock`. See [gRPC Name Resolution](https://github.com/grpc/grpc/blob/master/doc/naming.md).
 
 This variable is REQUIRED.
 
diff --git a/vendor/github.com/golang/mock/.travis.yml b/vendor/github.com/golang/mock/.travis.yml
index 543ce129..1b89c05f 100644
--- a/vendor/github.com/golang/mock/.travis.yml
+++ b/vendor/github.com/golang/mock/.travis.yml
@@ -1,9 +1,10 @@
 language: go
 
 go:
-  # we intend to support only the latest version and perhaps the previous one
-  - 1.7
-  - 1.8
+  - 1.7.x
+  - 1.8.x
+  - 1.9.x
+  - 1.10.x
 
 script:
   - go build ./...
diff --git a/vendor/github.com/golang/mock/README.md b/vendor/github.com/golang/mock/README.md
index daf4f975..e4387779 100644
--- a/vendor/github.com/golang/mock/README.md
+++ b/vendor/github.com/golang/mock/README.md
@@ -74,6 +74,14 @@ It supports the following flags:
 
 *  `-build_flags`: (reflect mode only) Flags passed verbatim to `go build`.
 
+* `-mock_names`: A list of custom names for generated mocks. This is specified 
+	as a comma-separated list of elements of the form
+	`Repository=MockSensorRepository,Endpoint=MockSensorEndpoint`, where 
+	`Repository` is the interface name and `MockSensorRepository` is the desired
+	mock name (mock factory method and mock recorder will be named after the mock).
+	If one of the interfaces has no custom name specified, then default naming
+	convention will be used.
+
 For an example of the use of `mockgen`, see the `sample/` directory. In simple
 cases, you will need only the `-source` flag.
 
diff --git a/vendor/github.com/golang/mock/gomock/call.go b/vendor/github.com/golang/mock/gomock/call.go
index cc8dfffe..a3fa1ae4 100644
--- a/vendor/github.com/golang/mock/gomock/call.go
+++ b/vendor/github.com/golang/mock/gomock/call.go
@@ -17,6 +17,7 @@ package gomock
 import (
 	"fmt"
 	"reflect"
+	"strconv"
 	"strings"
 )
 
@@ -24,11 +25,11 @@ import (
 type Call struct {
 	t TestReporter // for triggering test failures on invalid call setup
 
-	receiver   interface{}   // the receiver of the method call
-	method     string        // the name of the method
-	methodType reflect.Type  // the type of the method
-	args       []Matcher     // the args
-	rets       []interface{} // the return values (if any)
+	receiver   interface{}  // the receiver of the method call
+	method     string       // the name of the method
+	methodType reflect.Type // the type of the method
+	args       []Matcher    // the args
+	origin     string       // file and line number of call setup
 
 	preReqs []*Call // prerequisite calls
 
@@ -37,9 +38,44 @@ type Call struct {
 
 	numCalls int // actual number made
 
-	// Actions
-	doFunc  reflect.Value
-	setArgs map[int]reflect.Value
+	// actions are called when this Call is called. Each action gets the args and
+	// can set the return values by returning a non-nil slice. Actions run in the
+	// order they are created.
+	actions []func([]interface{}) []interface{}
+}
+
+// newCall creates a *Call. It requires the method type in order to support
+// unexported methods.
+func newCall(t TestReporter, receiver interface{}, method string, methodType reflect.Type, args ...interface{}) *Call {
+	if h, ok := t.(testHelper); ok {
+		h.Helper()
+	}
+
+	// TODO: check arity, types.
+	margs := make([]Matcher, len(args))
+	for i, arg := range args {
+		if m, ok := arg.(Matcher); ok {
+			margs[i] = m
+		} else if arg == nil {
+			// Handle nil specially so that passing a nil interface value
+			// will match the typed nils of concrete args.
+			margs[i] = Nil()
+		} else {
+			margs[i] = Eq(arg)
+		}
+	}
+
+	origin := callerInfo(3)
+	actions := []func([]interface{}) []interface{}{func([]interface{}) []interface{} {
+		// Synthesize the zero value for each of the return args' types.
+		rets := make([]interface{}, methodType.NumOut())
+		for i := 0; i < methodType.NumOut(); i++ {
+			rets[i] = reflect.Zero(methodType.Out(i)).Interface()
+		}
+		return rets
+	}}
+	return &Call{t: t, receiver: receiver, method: method, methodType: methodType,
+		args: margs, origin: origin, minCalls: 1, maxCalls: 1, actions: actions}
 }
 
 // AnyTimes allows the expectation to be called 0 or more times
@@ -68,19 +104,69 @@ func (c *Call) MaxTimes(n int) *Call {
 	return c
 }
 
-// Do declares the action to run when the call is matched.
+// DoAndReturn declares the action to run when the call is matched.
+// The return values from this function are returned by the mocked function.
+// It takes an interface{} argument to support n-arity functions.
+func (c *Call) DoAndReturn(f interface{}) *Call {
+	// TODO: Check arity and types here, rather than dying badly elsewhere.
+	v := reflect.ValueOf(f)
+
+	c.addAction(func(args []interface{}) []interface{} {
+		vargs := make([]reflect.Value, len(args))
+		ft := v.Type()
+		for i := 0; i < len(args); i++ {
+			if args[i] != nil {
+				vargs[i] = reflect.ValueOf(args[i])
+			} else {
+				// Use the zero value for the arg.
+				vargs[i] = reflect.Zero(ft.In(i))
+			}
+		}
+		vrets := v.Call(vargs)
+		rets := make([]interface{}, len(vrets))
+		for i, ret := range vrets {
+			rets[i] = ret.Interface()
+		}
+		return rets
+	})
+	return c
+}
+
+// Do declares the action to run when the call is matched. The function's
+// return values are ignored to retain backward compatibility. To use the
+// return values call DoAndReturn.
 // It takes an interface{} argument to support n-arity functions.
 func (c *Call) Do(f interface{}) *Call {
 	// TODO: Check arity and types here, rather than dying badly elsewhere.
-	c.doFunc = reflect.ValueOf(f)
+	v := reflect.ValueOf(f)
+
+	c.addAction(func(args []interface{}) []interface{} {
+		vargs := make([]reflect.Value, len(args))
+		ft := v.Type()
+		for i := 0; i < len(args); i++ {
+			if args[i] != nil {
+				vargs[i] = reflect.ValueOf(args[i])
+			} else {
+				// Use the zero value for the arg.
+				vargs[i] = reflect.Zero(ft.In(i))
+			}
+		}
+		v.Call(vargs)
+		return nil
+	})
 	return c
 }
 
+// Return declares the values to be returned by the mocked function call.
 func (c *Call) Return(rets ...interface{}) *Call {
+	if h, ok := c.t.(testHelper); ok {
+		h.Helper()
+	}
+
 	mt := c.methodType
 	if len(rets) != mt.NumOut() {
-		c.t.Fatalf("wrong number of arguments to Return for %T.%v: got %d, want %d",
-			c.receiver, c.method, len(rets), mt.NumOut())
+		c.t.Fatalf("wrong number of arguments to Return for %T.%v: got %d, want %d [%s]",
+			c.receiver, c.method, len(rets), mt.NumOut(), c.origin)
 	}
 	for i, ret := range rets {
 		if got, want := reflect.TypeOf(ret), mt.Out(i); got == want {
@@ -91,8 +177,8 @@ func (c *Call) Return(rets ...interface{}) *Call {
 			case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
 				// ok
 			default:
-				c.t.Fatalf("argument %d to Return for %T.%v is nil, but %v is not nillable",
-					i, c.receiver, c.method, want)
+				c.t.Fatalf("argument %d to Return for %T.%v is nil, but %v is not nillable [%s]",
+					i, c.receiver, c.method, want, c.origin)
 			}
 		} else if got.AssignableTo(want) {
 			// Assignable type relation. Make the assignment now so that the generated code
@@ -101,31 +187,38 @@ func (c *Call) Return(rets ...interface{}) *Call {
 			v.Set(reflect.ValueOf(ret))
 			rets[i] = v.Interface()
 		} else {
-			c.t.Fatalf("wrong type of argument %d to Return for %T.%v: %v is not assignable to %v",
-				i, c.receiver, c.method, got, want)
+			c.t.Fatalf("wrong type of argument %d to Return for %T.%v: %v is not assignable to %v [%s]",
+				i, c.receiver, c.method, got, want, c.origin)
 		}
 	}
 
-	c.rets = rets
+	c.addAction(func([]interface{}) []interface{} {
+		return rets
+	})
+
 	return c
 }
 
+// Times declares the exact number of times a function call is expected to be executed.
 func (c *Call) Times(n int) *Call {
 	c.minCalls, c.maxCalls = n, n
 	return c
 }
 
 // SetArg declares an action that will set the nth argument's value,
-// indirected through a pointer.
+// indirected through a pointer. Or, in the case of a slice, SetArg
+// will copy value's elements into the nth argument.
 func (c *Call) SetArg(n int, value interface{}) *Call {
-	if c.setArgs == nil {
-		c.setArgs = make(map[int]reflect.Value)
+	if h, ok := c.t.(testHelper); ok {
+		h.Helper()
 	}
+
 	mt := c.methodType
 	// TODO: This will break on variadic methods.
 	// We will need to check those at invocation time.
 	if n < 0 || n >= mt.NumIn() {
-		c.t.Fatalf("SetArg(%d, ...) called for a method with %d args", n, mt.NumIn())
+		c.t.Fatalf("SetArg(%d, ...) called for a method with %d args [%s]",
+			n, mt.NumIn(), c.origin)
 	}
 	// Permit setting argument through an interface.
 	// In the interface case, we don't (nay, can't) check the type here.
@@ -134,14 +227,28 @@ func (c *Call) SetArg(n int, value interface{}) *Call {
 	case reflect.Ptr:
 		dt := at.Elem()
 		if vt := reflect.TypeOf(value); !vt.AssignableTo(dt) {
-			c.t.Fatalf("SetArg(%d, ...) argument is a %v, not assignable to %v", n, vt, dt)
+			c.t.Fatalf("SetArg(%d, ...) argument is a %v, not assignable to %v [%s]",
+				n, vt, dt, c.origin)
 		}
 	case reflect.Interface:
 		// nothing to do
+	case reflect.Slice:
+		// nothing to do
 	default:
-		c.t.Fatalf("SetArg(%d, ...) referring to argument of non-pointer non-interface type %v", n, at)
+		c.t.Fatalf("SetArg(%d, ...) referring to argument of non-pointer non-interface non-slice type %v [%s]",
+			n, at, c.origin)
 	}
-	c.setArgs[n] = reflect.ValueOf(value)
+
+	c.addAction(func(args []interface{}) []interface{} {
+		v := reflect.ValueOf(value)
+		switch reflect.TypeOf(args[n]).Kind() {
+		case reflect.Slice:
+			setSlice(args[n], v)
+		default:
+			reflect.ValueOf(args[n]).Elem().Set(v)
+		}
+		return nil
+	})
 	return c
 }
 
@@ -157,8 +264,12 @@ func (c *Call) isPreReq(other *Call) bool {
 
 // After declares that the call may only match after preReq has been exhausted.
 func (c *Call) After(preReq *Call) *Call {
+	if h, ok := c.t.(testHelper); ok {
+		h.Helper()
+	}
+
 	if c == preReq {
-		c.t.Fatalf("A call isn't allowed to be it's own prerequisite")
+		c.t.Fatalf("A call isn't allowed to be its own prerequisite")
 	}
 	if preReq.isPreReq(c) {
 		c.t.Fatalf("Loop in call order: %v is a prerequisite to %v (possibly indirectly).", c, preReq)
@@ -168,7 +279,7 @@ func (c *Call) After(preReq *Call) *Call {
 	return c
 }
 
-// Returns true iff the minimum number of calls have been made.
+// Returns true if the minimum number of calls have been made.
 func (c *Call) satisfied() bool {
 	return c.numCalls >= c.minCalls
 }
@@ -184,31 +295,108 @@ func (c *Call) String() string {
 		args[i] = arg.String()
 	}
 	arguments := strings.Join(args, ", ")
-	return fmt.Sprintf("%T.%v(%s)", c.receiver, c.method, arguments)
+	return fmt.Sprintf("%T.%v(%s) %s", c.receiver, c.method, arguments, c.origin)
 }
 
 // Tests if the given call matches the expected call.
-func (c *Call) matches(args []interface{}) bool {
-	if len(args) != len(c.args) {
-		return false
-	}
-	for i, m := range c.args {
-		if !m.Matches(args[i]) {
-			return false
+// If yes, returns nil. If no, returns error with message explaining why it does not match.
+func (c *Call) matches(args []interface{}) error {
+	if !c.methodType.IsVariadic() {
+		if len(args) != len(c.args) {
+			return fmt.Errorf("Expected call at %s has the wrong number of arguments. Got: %d, want: %d",
+				c.origin, len(args), len(c.args))
+		}
+
+		for i, m := range c.args {
+			if !m.Matches(args[i]) {
+				return fmt.Errorf("Expected call at %s doesn't match the argument at index %s.\nGot: %v\nWant: %v",
+					c.origin, strconv.Itoa(i), args[i], m)
+			}
+		}
+	} else {
+		if len(c.args) < c.methodType.NumIn()-1 {
+			return fmt.Errorf("Expected call at %s has the wrong number of matchers. Got: %d, want: %d",
+				c.origin, len(c.args), c.methodType.NumIn()-1)
+		}
+		if len(c.args) != c.methodType.NumIn() && len(args) != len(c.args) {
+			return fmt.Errorf("Expected call at %s has the wrong number of arguments. Got: %d, want: %d",
+				c.origin, len(args), len(c.args))
+		}
+		if len(args) < len(c.args)-1 {
+			return fmt.Errorf("Expected call at %s has the wrong number of arguments. Got: %d, want: greater than or equal to %d",
+				c.origin, len(args), len(c.args)-1)
+		}
+
+		for i, m := range c.args {
+			if i < c.methodType.NumIn()-1 {
+				// Non-variadic args
+				if !m.Matches(args[i]) {
+					return fmt.Errorf("Expected call at %s doesn't match the argument at index %s.\nGot: %v\nWant: %v",
+						c.origin, strconv.Itoa(i), args[i], m)
+				}
+				continue
+			}
+			// The last arg has a possibility of a variadic argument, so let it branch
+
+			// sample: Foo(a int, b int, c ...int)
+			if i < len(c.args) && i < len(args) {
+				if m.Matches(args[i]) {
+					// Got Foo(a, b, c) want Foo(matcherA, matcherB, gomock.Any())
+					// Got Foo(a, b, c) want Foo(matcherA, matcherB, someSliceMatcher)
+					// Got Foo(a, b, c) want Foo(matcherA, matcherB, matcherC)
+					// Got Foo(a, b) want Foo(matcherA, matcherB)
+					// Got Foo(a, b, c, d) want Foo(matcherA, matcherB, matcherC, matcherD)
+					continue
+				}
+			}
+
+			// The number of actual args don't match the number of matchers,
+			// or the last matcher is a slice and the last arg is not.
+			// If this function still matches it is because the last matcher
+			// matches all the remaining arguments or the lack of any.
+			// Convert the remaining arguments, if any, into a slice of the
+			// expected type.
+			vargsType := c.methodType.In(c.methodType.NumIn() - 1)
+			vargs := reflect.MakeSlice(vargsType, 0, len(args)-i)
+			for _, arg := range args[i:] {
+				vargs = reflect.Append(vargs, reflect.ValueOf(arg))
+			}
+			if m.Matches(vargs.Interface()) {
+				// Got Foo(a, b, c, d, e) want Foo(matcherA, matcherB, gomock.Any())
+				// Got Foo(a, b, c, d, e) want Foo(matcherA, matcherB, someSliceMatcher)
+				// Got Foo(a, b) want Foo(matcherA, matcherB, gomock.Any())
+				// Got Foo(a, b) want Foo(matcherA, matcherB, someEmptySliceMatcher)
+				break
+			}
+			// Wrong number of matchers or not match. Fail.
+			// Got Foo(a, b) want Foo(matcherA, matcherB, matcherC, matcherD)
+			// Got Foo(a, b, c) want Foo(matcherA, matcherB, matcherC, matcherD)
+			// Got Foo(a, b, c, d) want Foo(matcherA, matcherB, matcherC, matcherD, matcherE)
+			// Got Foo(a, b, c, d, e) want Foo(matcherA, matcherB, matcherC, matcherD)
+			// Got Foo(a, b, c) want Foo(matcherA, matcherB)
+			return fmt.Errorf("Expected call at %s doesn't match the argument at index %s.\nGot: %v\nWant: %v",
+				c.origin, strconv.Itoa(i), args[i:], c.args[i])
+
 		}
 	}
 
 	// Check that all prerequisite calls have been satisfied.
 	for _, preReqCall := range c.preReqs {
 		if !preReqCall.satisfied() {
-			return false
+			return fmt.Errorf("Expected call at %s doesn't have a prerequisite call satisfied:\n%v\nshould be called before:\n%v",
+				c.origin, preReqCall, c)
 		}
 	}
 
-	return true
+	// Check that the call is not exhausted.
+	if c.exhausted() {
+		return fmt.Errorf("Expected call at %s has already been called the max number of times.", c.origin)
+	}
+
+	return nil
 }
 
-// dropPrereqs tells the expected Call to not re-check prerequite calls any
+// dropPrereqs tells the expected Call to not re-check prerequisite calls any
 // longer, and to return its current set.
 func (c *Call) dropPrereqs() (preReqs []*Call) {
 	preReqs = c.preReqs
@@ -216,38 +404,9 @@ func (c *Call) dropPrereqs() (preReqs []*Call) {
 	return
 }
 
-func (c *Call) call(args []interface{}) (rets []interface{}, action func()) {
+func (c *Call) call(args []interface{}) []func([]interface{}) []interface{} {
 	c.numCalls++
-
-	// Actions
-	if c.doFunc.IsValid() {
-		doArgs := make([]reflect.Value, len(args))
-		ft := c.doFunc.Type()
-		for i := 0; i < len(args); i++ {
-			if args[i] != nil {
-				doArgs[i] = reflect.ValueOf(args[i])
-			} else {
-				// Use the zero value for the arg.
-				doArgs[i] = reflect.Zero(ft.In(i))
-			}
-		}
-		action = func() { c.doFunc.Call(doArgs) }
-	}
-	for n, v := range c.setArgs {
-		reflect.ValueOf(args[n]).Elem().Set(v)
-	}
-
-	rets = c.rets
-	if rets == nil {
-		// Synthesize the zero value for each of the return args' types.
-		mt := c.methodType
-		rets = make([]interface{}, mt.NumOut())
-		for i := 0; i < mt.NumOut(); i++ {
-			rets[i] = reflect.Zero(mt.Out(i)).Interface()
-		}
-	}
-
-	return
+	return c.actions
 }
 
 // InOrder declares that the given calls should occur in order.
@@ -256,3 +415,14 @@ func InOrder(calls ...*Call) {
 		calls[i].After(calls[i-1])
 	}
 }
+
+func setSlice(arg interface{}, v reflect.Value) {
+	va := reflect.ValueOf(arg)
+	for i := 0; i < v.Len(); i++ {
+		va.Index(i).Set(v.Index(i))
+	}
+}
+
+func (c *Call) addAction(action func([]interface{}) []interface{}) {
+	c.actions = append(c.actions, action)
+}
diff --git a/vendor/github.com/golang/mock/gomock/call_test.go b/vendor/github.com/golang/mock/gomock/call_test.go
index 3ae7263c..3a8315b3 100644
--- a/vendor/github.com/golang/mock/gomock/call_test.go
+++ b/vendor/github.com/golang/mock/gomock/call_test.go
@@ -1,6 +1,8 @@
 package gomock
 
-import "testing"
+import (
+	"testing"
+)
 
 type mockTestReporter struct {
 	errorCalls int
@@ -15,6 +17,8 @@ func (o *mockTestReporter) Fatalf(format string, args ...interface{}) {
 	o.fatalCalls++
 }
 
+func (o *mockTestReporter) Helper() {}
+
 func TestCall_After(t *testing.T) {
 	t.Run("SelfPrereqCallsFatalf", func(t *testing.T) {
 		tr1 := &mockTestReporter{}
diff --git a/vendor/github.com/golang/mock/gomock/callset.go b/vendor/github.com/golang/mock/gomock/callset.go
index 1b7de4c0..c44a8a58 100644
--- a/vendor/github.com/golang/mock/gomock/callset.go
+++ b/vendor/github.com/golang/mock/gomock/callset.go
@@ -14,63 +14,95 @@
 
 package gomock
 
+import (
+	"bytes"
+	"fmt"
+)
+
 // callSet represents a set of expected calls, indexed by receiver and method
 // name.
-type callSet map[interface{}]map[string][]*Call
+type callSet struct {
+	// Calls that are still expected.
+	expected map[callSetKey][]*Call
+	// Calls that have been exhausted.
+	exhausted map[callSetKey][]*Call
+}
+
+// callSetKey is the key in the maps in callSet
+type callSetKey struct {
+	receiver interface{}
+	fname    string
+}
+
+func newCallSet() *callSet {
+	return &callSet{make(map[callSetKey][]*Call), make(map[callSetKey][]*Call)}
+}
 
 // Add adds a new expected call.
 func (cs callSet) Add(call *Call) {
-	methodMap, ok := cs[call.receiver]
-	if !ok {
-		methodMap = make(map[string][]*Call)
-		cs[call.receiver] = methodMap
+	key := callSetKey{call.receiver, call.method}
+	m := cs.expected
+	if call.exhausted() {
+		m = cs.exhausted
 	}
-	methodMap[call.method] = append(methodMap[call.method], call)
+	m[key] = append(m[key], call)
 }
 
 // Remove removes an expected call.
 func (cs callSet) Remove(call *Call) {
-	methodMap, ok := cs[call.receiver]
-	if !ok {
-		return
-	}
-	sl := methodMap[call.method]
-	for i, c := range sl {
+	key := callSetKey{call.receiver, call.method}
+	calls := cs.expected[key]
+	for i, c := range calls {
 		if c == call {
-			// quick removal; we don't need to maintain call order
-			if len(sl) > 1 {
-				sl[i] = sl[len(sl)-1]
-			}
-			methodMap[call.method] = sl[:len(sl)-1]
+			// maintain order for remaining calls
+			cs.expected[key] = append(calls[:i], calls[i+1:]...)
+			cs.exhausted[key] = append(cs.exhausted[key], call)
 			break
 		}
 	}
 }
 
-// FindMatch searches for a matching call. Returns nil if no call matched.
-func (cs callSet) FindMatch(receiver interface{}, method string, args []interface{}) *Call {
-	methodMap, ok := cs[receiver]
-	if !ok {
-		return nil
-	}
-	calls, ok := methodMap[method]
-	if !ok {
-		return nil
-	}
+// FindMatch searches for a matching call. Returns error with explanation message if no call matched.
+func (cs callSet) FindMatch(receiver interface{}, method string, args []interface{}) (*Call, error) {
+	key := callSetKey{receiver, method}
 
-	// Search through the unordered set of calls expected on a method on a
-	// receiver.
-	for _, call := range calls {
-		// A call should not normally still be here if exhausted,
-		// but it can happen if, for instance, .Times(0) was used.
-		// Pretend the call doesn't match.
-		if call.exhausted() {
-			continue
+	// Search through the expected calls.
+	expected := cs.expected[key]
+	var callsErrors bytes.Buffer
+	for _, call := range expected {
+		err := call.matches(args)
+		if err != nil {
+			fmt.Fprintf(&callsErrors, "\n%v", err)
+		} else {
+			return call, nil
 		}
-		if call.matches(args) {
-			return call
+	}
+
+	// If we haven't found a match then search through the exhausted calls so we
+	// get useful error messages.
+	exhausted := cs.exhausted[key]
+	for _, call := range exhausted {
+		if err := call.matches(args); err != nil {
+			fmt.Fprintf(&callsErrors, "\n%v", err)
 		}
 	}
 
-	return nil
+	if len(expected)+len(exhausted) == 0 {
+		fmt.Fprintf(&callsErrors, "there are no expected calls of the method %q for that receiver", method)
+	}
+
+	return nil, fmt.Errorf(callsErrors.String())
+}
+
+// Failures returns the calls that are not satisfied.
+func (cs callSet) Failures() []*Call {
+	failures := make([]*Call, 0, len(cs.expected))
+	for _, calls := range cs.expected {
+		for _, call := range calls {
+			if !call.satisfied() {
+				failures = append(failures, call)
+			}
+		}
+	}
+	return failures
 }
diff --git a/vendor/github.com/golang/mock/gomock/callset_test.go b/vendor/github.com/golang/mock/gomock/callset_test.go
new file mode 100644
index 00000000..7fc711a4
--- /dev/null
+++ b/vendor/github.com/golang/mock/gomock/callset_test.go
@@ -0,0 +1,76 @@
+// Copyright 2011 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package gomock
+
+import (
+	"reflect"
+	"testing"
+)
+
+type receiverType struct{}
+
+func (receiverType) Func() {}
+
+func TestCallSetAdd(t *testing.T) {
+	method := "TestMethod"
+	var receiver interface{} = "TestReceiver"
+	cs := newCallSet()
+
+	numCalls := 10
+	for i := 0; i < numCalls; i++ {
+		cs.Add(newCall(t, receiver, method, reflect.TypeOf(receiverType{}.Func)))
+	}
+
+	call, err := cs.FindMatch(receiver, method, []interface{}{})
+	if err != nil {
+		t.Fatalf("FindMatch: %v", err)
+	}
+	if call == nil {
+		t.Fatalf("FindMatch: Got nil, want non-nil *Call")
+	}
+}
+
+func TestCallSetRemove(t *testing.T) {
+	method := "TestMethod"
+	var receiver interface{} = "TestReceiver"
+
+	cs := newCallSet()
+	ourCalls := []*Call{}
+
+	numCalls := 10
+	for i := 0; i < numCalls; i++ {
+		// NOTE: abuse the `numCalls` value to convey initial ordering of mocked calls
+		generatedCall := &Call{receiver: receiver, method: method, numCalls: i}
+		cs.Add(generatedCall)
+		ourCalls = append(ourCalls, generatedCall)
+	}
+
+	// validateOrder validates that the calls in the array are ordered as they were added
+	validateOrder := func(calls []*Call) {
+		// lastNum tracks the last `numCalls` (call order) value seen
+		lastNum := -1
+		for _, c := range calls {
+			if lastNum >= c.numCalls {
+				t.Errorf("found call %d after call %d", c.numCalls, lastNum)
+			}
+			lastNum = c.numCalls
+		}
+	}
+
+	for _, c := range ourCalls {
+		validateOrder(cs.expected[callSetKey{receiver, method}])
+		cs.Remove(c)
+	}
+}
diff --git a/vendor/github.com/golang/mock/gomock/controller.go b/vendor/github.com/golang/mock/gomock/controller.go
index 6bff78d1..a7b79188 100644
--- a/vendor/github.com/golang/mock/gomock/controller.go
+++ b/vendor/github.com/golang/mock/gomock/controller.go
@@ -57,7 +57,9 @@ package gomock
 
 import (
 	"fmt"
+	"golang.org/x/net/context"
 	"reflect"
+	"runtime"
 	"sync"
 )
 
@@ -74,17 +76,40 @@ type TestReporter interface {
 type Controller struct {
 	mu            sync.Mutex
 	t             TestReporter
-	expectedCalls callSet
+	expectedCalls *callSet
+	finished      bool
 }
 
 func NewController(t TestReporter) *Controller {
 	return &Controller{
 		t:             t,
-		expectedCalls: make(callSet),
+		expectedCalls: newCallSet(),
 	}
 }
 
+type cancelReporter struct {
+	t      TestReporter
+	cancel func()
+}
+
+func (r *cancelReporter) Errorf(format string, args ...interface{}) { r.t.Errorf(format, args...) }
+func (r *cancelReporter) Fatalf(format string, args ...interface{}) {
+	defer r.cancel()
+	r.t.Fatalf(format, args...)
+}
+
+// WithContext returns a new Controller and a Context, which is cancelled on any
+// fatal failure.
+func WithContext(ctx context.Context, t TestReporter) (*Controller, context.Context) {
+	ctx, cancel := context.WithCancel(ctx)
+	return NewController(&cancelReporter{t, cancel}), ctx
+}
+
 func (ctrl *Controller) RecordCall(receiver interface{}, method string, args ...interface{}) *Call {
+	if h, ok := ctrl.t.(testHelper); ok {
+		h.Helper()
+	}
+
 	recv := reflect.ValueOf(receiver)
 	for i := 0; i < recv.Type().NumMethod(); i++ {
 		if recv.Type().Method(i).Name == method {
@@ -92,73 +117,77 @@ func (ctrl *Controller) RecordCall(receiver interface{}, method string, args ...
 		}
 	}
 	ctrl.t.Fatalf("gomock: failed finding method %s on %T", method, receiver)
-	// In case t.Fatalf does not panic.
-	panic(fmt.Sprintf("gomock: failed finding method %s on %T", method, receiver))
+	panic("unreachable")
 }
 
 func (ctrl *Controller) RecordCallWithMethodType(receiver interface{}, method string, methodType reflect.Type, args ...interface{}) *Call {
-	// TODO: check arity, types.
-	margs := make([]Matcher, len(args))
-	for i, arg := range args {
-		if m, ok := arg.(Matcher); ok {
-			margs[i] = m
-		} else if arg == nil {
-			// Handle nil specially so that passing a nil interface value
-			// will match the typed nils of concrete args.
-			margs[i] = Nil()
-		} else {
-			margs[i] = Eq(arg)
-		}
+	if h, ok := ctrl.t.(testHelper); ok {
+		h.Helper()
 	}
 
+	call := newCall(ctrl.t, receiver, method, methodType, args...)
+
 	ctrl.mu.Lock()
 	defer ctrl.mu.Unlock()
-
-	call := &Call{t: ctrl.t, receiver: receiver, method: method, methodType: methodType, args: margs, minCalls: 1, maxCalls: 1}
-
 	ctrl.expectedCalls.Add(call)
+
 	return call
 }
 
 func (ctrl *Controller) Call(receiver interface{}, method string, args ...interface{}) []interface{} {
-	ctrl.mu.Lock()
-	defer ctrl.mu.Unlock()
-
-	expected := ctrl.expectedCalls.FindMatch(receiver, method, args)
-	if expected == nil {
-		ctrl.t.Fatalf("no matching expected call: %T.%v(%v)", receiver, method, args)
+	if h, ok := ctrl.t.(testHelper); ok {
+		h.Helper()
 	}
 
-	// Two things happen here:
-	// * the matching call no longer needs to check prerequite calls,
-	// * and the prerequite calls are no longer expected, so remove them.
-	preReqCalls := expected.dropPrereqs()
-	for _, preReqCall := range preReqCalls {
-		ctrl.expectedCalls.Remove(preReqCall)
-	}
+	// Nest this code so we can use defer to make sure the lock is released.
+	actions := func() []func([]interface{}) []interface{} {
+		ctrl.mu.Lock()
+		defer ctrl.mu.Unlock()
 
-	rets, action := expected.call(args)
-	if expected.exhausted() {
-		ctrl.expectedCalls.Remove(expected)
-	}
+		expected, err := ctrl.expectedCalls.FindMatch(receiver, method, args)
+		if err != nil {
+			origin := callerInfo(2)
+			ctrl.t.Fatalf("Unexpected call to %T.%v(%v) at %s because: %s", receiver, method, args, origin, err)
+		}
 
-	// Don't hold the lock while doing the call's action (if any)
-	// so that actions may execute concurrently.
-	// We use the deferred Unlock to capture any panics that happen above;
-	// here we add a deferred Lock to balance it.
-	ctrl.mu.Unlock()
-	defer ctrl.mu.Lock()
-	if action != nil {
-		action()
+		// Two things happen here:
+		// * the matching call no longer needs to check prerequite calls,
+		// * and the prerequite calls are no longer expected, so remove them.
+		preReqCalls := expected.dropPrereqs()
+		for _, preReqCall := range preReqCalls {
+			ctrl.expectedCalls.Remove(preReqCall)
+		}
+
+		actions := expected.call(args)
+		if expected.exhausted() {
+			ctrl.expectedCalls.Remove(expected)
+		}
+		return actions
+	}()
+
+	var rets []interface{}
+	for _, action := range actions {
+		if r := action(args); r != nil {
+			rets = r
+		}
 	}
 
 	return rets
 }
 
 func (ctrl *Controller) Finish() {
+	if h, ok := ctrl.t.(testHelper); ok {
+		h.Helper()
+	}
+
 	ctrl.mu.Lock()
 	defer ctrl.mu.Unlock()
 
+	if ctrl.finished {
+		ctrl.t.Fatalf("Controller.Finish was called more than once. It has to be called exactly once.")
+	}
+	ctrl.finished = true
+
 	// If we're currently panicking, probably because this is a deferred call,
 	// pass through the panic.
 	if err := recover(); err != nil {
@@ -166,18 +195,23 @@ func (ctrl *Controller) Finish() {
 	}
 
 	// Check that all remaining expected calls are satisfied.
-	failures := false
-	for _, methodMap := range ctrl.expectedCalls {
-		for _, calls := range methodMap {
-			for _, call := range calls {
-				if !call.satisfied() {
-					ctrl.t.Errorf("missing call(s) to %v", call)
-					failures = true
-				}
-			}
-		}
+	failures := ctrl.expectedCalls.Failures()
+	for _, call := range failures {
+		ctrl.t.Errorf("missing call(s) to %v", call)
 	}
-	if failures {
+	if len(failures) != 0 {
 		ctrl.t.Fatalf("aborting test due to missing call(s)")
 	}
 }
+
+func callerInfo(skip int) string {
+	if _, file, line, ok := runtime.Caller(skip + 1); ok {
+		return fmt.Sprintf("%s:%d", file, line)
+	}
+	return "unknown file"
+}
+
+type testHelper interface {
+	TestReporter
+	Helper()
+}
diff --git a/vendor/github.com/golang/mock/gomock/controller_test.go b/vendor/github.com/golang/mock/gomock/controller_test.go
index 57f79572..b3bb4de2 100644
--- a/vendor/github.com/golang/mock/gomock/controller_test.go
+++ b/vendor/github.com/golang/mock/gomock/controller_test.go
@@ -19,6 +19,8 @@ import (
 	"reflect"
 	"testing"
 
+	"strings"
+
 	"github.com/golang/mock/gomock"
 )
 
@@ -53,7 +55,7 @@ func (e *ErrorReporter) assertFail(msg string) {
 }
 
 // Use to check that code triggers a fatal test failure.
-func (e *ErrorReporter) assertFatal(fn func()) {
+func (e *ErrorReporter) assertFatal(fn func(), expectedErrMsgs ...string) {
 	defer func() {
 		err := recover()
 		if err == nil {
@@ -66,6 +68,18 @@ func (e *ErrorReporter) assertFatal(fn func()) {
 			e.t.Error("Expected fatal failure, but got a", actual)
 		} else if token, ok := err.(*struct{}); ok && token == &e.fatalToken {
 			// This is okay - the panic is from Fatalf().
+			if expectedErrMsgs != nil {
+				// assert that the actual error message
+				// contains expectedErrMsgs
+
+				// check the last actualErrMsg, because the previous messages come from previous errors
+				actualErrMsg := e.log[len(e.log)-1]
+				for _, expectedErrMsg := range expectedErrMsgs {
+					if !strings.Contains(actualErrMsg, expectedErrMsg) {
+						e.t.Errorf("Error message:\ngot: %q\nwant to contain: %q\n", actualErrMsg, expectedErrMsg)
+					}
+				}
+			}
 			return
 		} else {
 			// Some other panic.
@@ -119,6 +133,20 @@ func (s *Subject) BarMethod(arg string) int {
 	return 0
 }
 
+func (s *Subject) VariadicMethod(arg int, vararg ...string) {}
+
+// A type purely for ActOnTestStructMethod
+type TestStruct struct {
+	Number  int
+	Message string
+}
+
+func (s *Subject) ActOnTestStructMethod(arg TestStruct, arg1 int) int {
+	return 0
+}
+
+func (s *Subject) SetArgMethod(sliceArg []byte, ptrArg *int) {}
+
 func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
 	if !reflect.DeepEqual(expected, actual) {
 		t.Errorf("Expected %+v, but got %+v", expected, actual)
@@ -140,6 +168,31 @@ func TestNoCalls(t *testing.T) {
 	reporter.assertPass("No calls expected or made.")
 }
 
+func TestNoRecordedCallsForAReceiver(t *testing.T) {
+	reporter, ctrl := createFixtures(t)
+	subject := new(Subject)
+
+	reporter.assertFatal(func() {
+		ctrl.Call(subject, "NotRecordedMethod", "argument")
+	}, "Unexpected call to", "there are no expected calls of the method \"NotRecordedMethod\" for that receiver")
+	ctrl.Finish()
+}
+
+func TestNoRecordedMatchingMethodNameForAReceiver(t *testing.T) {
+	reporter, ctrl := createFixtures(t)
+	subject := new(Subject)
+
+	ctrl.RecordCall(subject, "FooMethod", "argument")
+	reporter.assertFatal(func() {
+		ctrl.Call(subject, "NotRecordedMethod", "argument")
+	}, "Unexpected call to", "there are no expected calls of the method \"NotRecordedMethod\" for that receiver")
+	reporter.assertFatal(func() {
+		// The expected call wasn't made.
+		ctrl.Finish()
+	})
+}
+
+// This tests that a call with an arguments of some primitive type matches a recorded call.
 func TestExpectedMethodCall(t *testing.T) {
 	reporter, ctrl := createFixtures(t)
 	subject := new(Subject)
@@ -187,11 +240,68 @@ func TestUnexpectedArgCount(t *testing.T) {
 	reporter.assertFatal(func() {
 		// This call is made with the wrong number of arguments...
 		ctrl.Call(subject, "FooMethod", "argument", "extra_argument")
-	})
+	}, "Unexpected call to", "wrong number of arguments", "Got: 2, want: 1")
 	reporter.assertFatal(func() {
 		// ... so is this.
 		ctrl.Call(subject, "FooMethod")
+	}, "Unexpected call to", "wrong number of arguments", "Got: 0, want: 1")
+	reporter.assertFatal(func() {
+		// The expected call wasn't made.
+		ctrl.Finish()
+	})
+}
+
+// This tests that a call with complex arguments (a struct and some primitive type) matches a recorded call.
+func TestExpectedMethodCall_CustomStruct(t *testing.T) {
+	reporter, ctrl := createFixtures(t)
+	subject := new(Subject)
+
+	expectedArg0 := TestStruct{Number: 123, Message: "hello"}
+	ctrl.RecordCall(subject, "ActOnTestStructMethod", expectedArg0, 15)
+	ctrl.Call(subject, "ActOnTestStructMethod", expectedArg0, 15)
+
+	reporter.assertPass("Expected method call made.")
+}
+
+func TestUnexpectedArgValue_FirstArg(t *testing.T) {
+	reporter, ctrl := createFixtures(t)
+	defer reporter.recoverUnexpectedFatal()
+	subject := new(Subject)
+
+	expectedArg0 := TestStruct{Number: 123, Message: "hello"}
+	ctrl.RecordCall(subject, "ActOnTestStructMethod", expectedArg0, 15)
+
+	reporter.assertFatal(func() {
+		// the method argument (of TestStruct type) has 1 unexpected value (for the Message field)
+		ctrl.Call(subject, "ActOnTestStructMethod", TestStruct{Number: 123, Message: "no message"}, 15)
+	}, "Unexpected call to", "doesn't match the argument at index 0",
+		"Got: {123 no message}\nWant: is equal to {123 hello}")
+
+	reporter.assertFatal(func() {
+		// the method argument (of TestStruct type) has 2 unexpected values (for both fields)
+		ctrl.Call(subject, "ActOnTestStructMethod", TestStruct{Number: 11, Message: "no message"}, 15)
+	}, "Unexpected call to", "doesn't match the argument at index 0",
+		"Got: {11 no message}\nWant: is equal to {123 hello}")
+
+	reporter.assertFatal(func() {
+		// The expected call wasn't made.
+		ctrl.Finish()
 	})
+}
+
+func TestUnexpectedArgValue_SecondtArg(t *testing.T) {
+	reporter, ctrl := createFixtures(t)
+	defer reporter.recoverUnexpectedFatal()
+	subject := new(Subject)
+
+	expectedArg0 := TestStruct{Number: 123, Message: "hello"}
+	ctrl.RecordCall(subject, "ActOnTestStructMethod", expectedArg0, 15)
+
+	reporter.assertFatal(func() {
+		ctrl.Call(subject, "ActOnTestStructMethod", TestStruct{Number: 123, Message: "hello"}, 3)
+	}, "Unexpected call to", "doesn't match the argument at index 1",
+		"Got: 3\nWant: is equal to 15")
+
 	reporter.assertFatal(func() {
 		// The expected call wasn't made.
 		ctrl.Finish()
@@ -317,6 +427,74 @@ func TestDo(t *testing.T) {
 	ctrl.Finish()
 }
 
+func TestDoAndReturn(t *testing.T) {
+	_, ctrl := createFixtures(t)
+	subject := new(Subject)
+
+	doCalled := false
+	var argument string
+	ctrl.RecordCall(subject, "FooMethod", "argument").DoAndReturn(
+		func(arg string) int {
+			doCalled = true
+			argument = arg
+			return 5
+		})
+	if doCalled {
+		t.Error("Do() callback called too early.")
+	}
+
+	rets := ctrl.Call(subject, "FooMethod", "argument")
+
+	if !doCalled {
+		t.Error("Do() callback not called.")
+	}
+	if "argument" != argument {
+		t.Error("Do callback received wrong argument.")
+	}
+	if len(rets) != 1 {
+		t.Fatalf("Return values from Call: got %d, want 1", len(rets))
+	}
+	if ret, ok := rets[0].(int); !ok {
+		t.Fatalf("Return value is not an int")
+	} else if ret != 5 {
+		t.Errorf("DoAndReturn return value: got %d, want 5", ret)
+	}
+
+	ctrl.Finish()
+}
+
+func TestSetArgSlice(t *testing.T) {
+	_, ctrl := createFixtures(t)
+	subject := new(Subject)
+
+	var in = []byte{4, 5, 6}
+	var set = []byte{1, 2, 3}
+	ctrl.RecordCall(subject, "SetArgMethod", in, nil).SetArg(0, set)
+	ctrl.Call(subject, "SetArgMethod", in, nil)
+
+	if !reflect.DeepEqual(in, set) {
+		t.Error("Expected SetArg() to modify input slice argument")
+	}
+
+	ctrl.Finish()
+}
+
+func TestSetArgPtr(t *testing.T) {
+	_, ctrl := createFixtures(t)
+	subject := new(Subject)
+
+	var in int = 43
+	const set = 42
+	ctrl.RecordCall(subject, "SetArgMethod", nil, &in).SetArg(1, set)
+	ctrl.Call(subject, "SetArgMethod", nil, &in)
+
+	if in != set {
+		t.Error("Expected SetArg() to modify value pointed to by argument")
+	}
+
+	ctrl.Finish()
+}
+
 func TestReturn(t *testing.T) {
 	_, ctrl := createFixtures(t)
 	subject := new(Subject)
@@ -393,11 +571,12 @@ func TestOrderedCallsInCorrect(t *testing.T) {
 
 	ctrl.Call(subjectOne, "FooMethod", "1")
 	reporter.assertFatal(func() {
+		// FooMethod(2) should be called before BarMethod(3)
 		ctrl.Call(subjectTwo, "BarMethod", "3")
-	})
+	}, "Unexpected call to", "Subject.BarMethod([3])", "doesn't have a prerequisite call satisfied")
 }
 
-// Test that calls that are prerequites to other calls but have maxCalls >
+// Test that calls that are prerequisites to other calls but have maxCalls >
 // minCalls are removed from the expected call set.
 func TestOrderedCallsWithPreReqMaxUnbounded(t *testing.T) {
 	reporter, ctrl, subjectOne, subjectTwo := commonTestOrderedCalls(t)
@@ -473,3 +652,61 @@ func TestTimes0(t *testing.T) {
 		ctrl.Call(s, "FooMethod", "arg")
 	})
 }
+
+func TestVariadicMatching(t *testing.T) {
+	rep, ctrl := createFixtures(t)
+	defer rep.recoverUnexpectedFatal()
+
+	s := new(Subject)
+	ctrl.RecordCall(s, "VariadicMethod", 0, "1", "2")
+	ctrl.Call(s, "VariadicMethod", 0, "1", "2")
+	ctrl.Finish()
+	rep.assertPass("variadic matching works")
+}
+
+func TestVariadicNoMatch(t *testing.T) {
+	rep, ctrl := createFixtures(t)
+	defer rep.recoverUnexpectedFatal()
+
+	s := new(Subject)
+	ctrl.RecordCall(s, "VariadicMethod", 0)
+	rep.assertFatal(func() {
+		ctrl.Call(s, "VariadicMethod", 1)
+	}, "Expected call at", "doesn't match the argument at index 0",
+		"Got: 1\nWant: is equal to 0")
+	ctrl.Call(s, "VariadicMethod", 0)
+	ctrl.Finish()
+}
+
+func TestVariadicMatchingWithSlice(t *testing.T) {
+	testCases := [][]string{
+		{"1"},
+		{"1", "2"},
+	}
+	for _, tc := range testCases {
+		t.Run(fmt.Sprintf("%d arguments", len(tc)), func(t *testing.T) {
+			rep, ctrl := createFixtures(t)
+			defer rep.recoverUnexpectedFatal()
+
+			s := new(Subject)
+			ctrl.RecordCall(s, "VariadicMethod", 1, tc)
+			args := make([]interface{}, len(tc)+1)
+			args[0] = 1
+			for i, arg := range tc {
+				args[i+1] = arg
+			}
+			ctrl.Call(s, "VariadicMethod", args...)
+			ctrl.Finish()
+			rep.assertPass("slices can be used as matchers for variadic arguments")
+		})
+	}
+}
+
+func TestDuplicateFinishCallFails(t *testing.T) {
+	rep, ctrl := createFixtures(t)
+
+	ctrl.Finish()
+	rep.assertPass("the first Finish call should succeed")
+
+	rep.assertFatal(ctrl.Finish, "Controller.Finish was called more than once. It has to be called exactly once.")
+}
diff --git a/vendor/github.com/golang/mock/gomock/mock_matcher/mock_matcher.go b/vendor/github.com/golang/mock/gomock/mock_matcher/mock_matcher.go
index d0bf885f..7e4b4c8a 100644
--- a/vendor/github.com/golang/mock/gomock/mock_matcher/mock_matcher.go
+++ b/vendor/github.com/golang/mock/gomock/mock_matcher/mock_matcher.go
@@ -1,6 +1,7 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/golang/mock/gomock (interfaces: Matcher)
 
+// Package mock_gomock is a generated GoMock package.
 package mock_gomock
 
 import (
@@ -27,30 +28,30 @@ func NewMockMatcher(ctrl *gomock.Controller) *MockMatcher {
 }
 
 // EXPECT returns an object that allows the caller to indicate expected use
-func (_m *MockMatcher) EXPECT() *MockMatcherMockRecorder {
-	return _m.recorder
+func (m *MockMatcher) EXPECT() *MockMatcherMockRecorder {
+	return m.recorder
 }
 
 // Matches mocks base method
-func (_m *MockMatcher) Matches(_param0 interface{}) bool {
-	ret := _m.ctrl.Call(_m, "Matches", _param0)
+func (m *MockMatcher) Matches(arg0 interface{}) bool {
+	ret := m.ctrl.Call(m, "Matches", arg0)
 	ret0, _ := ret[0].(bool)
 	return ret0
 }
 
 // Matches indicates an expected call of Matches
-func (_mr *MockMatcherMockRecorder) Matches(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Matches", reflect.TypeOf((*MockMatcher)(nil).Matches), arg0)
+func (mr *MockMatcherMockRecorder) Matches(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Matches", reflect.TypeOf((*MockMatcher)(nil).Matches), arg0)
 }
 
 // String mocks base method
-func (_m *MockMatcher) String() string {
-	ret := _m.ctrl.Call(_m, "String")
+func (m *MockMatcher) String() string {
+	ret := m.ctrl.Call(m, "String")
 	ret0, _ := ret[0].(string)
 	return ret0
 }
 
 // String indicates an expected call of String
-func (_mr *MockMatcherMockRecorder) String() *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "String", reflect.TypeOf((*MockMatcher)(nil).String))
+func (mr *MockMatcherMockRecorder) String() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "String", reflect.TypeOf((*MockMatcher)(nil).String))
 }
diff --git a/vendor/github.com/golang/mock/mockgen/mockgen.go b/vendor/github.com/golang/mock/mockgen/mockgen.go
index 3b08c141..67481a64 100644
--- a/vendor/github.com/golang/mock/mockgen/mockgen.go
+++ b/vendor/github.com/golang/mock/mockgen/mockgen.go
@@ -22,12 +22,14 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
+	"go/build"
 	"go/format"
 	"go/token"
 	"io"
 	"log"
 	"os"
 	"path"
+	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
@@ -41,10 +43,12 @@ const (
 )
 
 var (
-	source      = flag.String("source", "", "(source mode) Input Go source file; enables source mode.")
-	destination = flag.String("destination", "", "Output file; defaults to stdout.")
-	packageOut  = flag.String("package", "", "Package of the generated code; defaults to the package of the input with a 'mock_' prefix.")
-	selfPackage = flag.String("self_package", "", "If set, the package this mock will be part of.")
+	source          = flag.String("source", "", "(source mode) Input Go source file; enables source mode.")
+	destination     = flag.String("destination", "", "Output file; defaults to stdout.")
+	mockNames       = flag.String("mock_names", "", "Comma-separated interfaceName=mockName pairs of explicit mock names to use. Mock names default to 'Mock'+ interfaceName suffix.")
+	packageOut      = flag.String("package", "", "Package of the generated code; defaults to the package of the input with a 'mock_' prefix.")
+	selfPackage     = flag.String("self_package", "", "The full package import path for the generated code. The purpose of this flag is to prevent import cycles in the generated code by trying to include its own package. This can happen if the mock's package is set to one of its inputs (usually the main one) and the output is stdio so mockgen cannot detect the final output package. Setting this flag will then tell mockgen which import to exclude.")
+	writePkgComment = flag.Bool("write_package_comment", true, "Writes package documentation comment (godoc) if true.")
 
 	debugParser = flag.Bool("debug_parser", false, "Print out parser results only.")
 )
@@ -90,6 +94,25 @@ func main() {
 		packageName = "mock_" + sanitize(pkg.Name)
 	}
 
+	// outputPackagePath represents the fully qualified name of the package of
+	// the generated code. Its purposes are to prevent the module from importing
+	// itself and to prevent qualifying type names that come from its own
+	// package (i.e. if there is a type called X then we want to print "X" not
+	// "package.X" since "package" is this package). This can happen if the mock
+	// is output into an already existing package.
+	outputPackagePath := *selfPackage
+	if len(outputPackagePath) == 0 && len(*destination) > 0 {
+		dst, _ := filepath.Abs(filepath.Dir(*destination))
+		for _, prefix := range build.Default.SrcDirs() {
+			if strings.HasPrefix(dst, prefix) {
+				if rel, err := filepath.Rel(prefix, dst); err == nil {
+					outputPackagePath = rel
+					break
+				}
+			}
+		}
+	}
+
 	g := new(generator)
 	if *source != "" {
 		g.filename = *source
@@ -97,13 +120,28 @@ func main() {
 		g.srcPackage = flag.Arg(0)
 		g.srcInterfaces = flag.Arg(1)
 	}
-	if err := g.Generate(pkg, packageName); err != nil {
+
+	if *mockNames != "" {
+		g.mockNames = parseMockNames(*mockNames)
+	}
+	if err := g.Generate(pkg, packageName, outputPackagePath); err != nil {
 		log.Fatalf("Failed generating mock: %v", err)
 	}
 	if _, err := dst.Write(g.Output()); err != nil {
 		log.Fatalf("Failed writing to destination: %v", err)
 	}
 }
+func parseMockNames(names string) map[string]string {
+	mocksMap := make(map[string]string)
+	for _, kv := range strings.Split(names, ",") {
+		parts := strings.SplitN(kv, "=", 2)
+		if len(parts) != 2 || parts[1] == "" {
+			log.Fatalf("bad mock names spec: %v", kv)
+		}
+		mocksMap[parts[0]] = parts[1]
+	}
+	return mocksMap
+}
 
 func usage() {
 	io.WriteString(os.Stderr, usageText)
@@ -128,11 +166,11 @@ Example:
 `
 
 type generator struct {
-	buf    bytes.Buffer
-	indent string
-
-	filename                  string // may be empty
-	srcPackage, srcInterfaces string // may be empty
+	buf                       bytes.Buffer
+	indent                    string
+	mockNames                 map[string]string //may be empty
+	filename                  string            // may be empty
+	srcPackage, srcInterfaces string            // may be empty
 
 	packageMap map[string]string // map from import path to package name
 }
@@ -181,7 +219,7 @@ func sanitize(s string) string {
 	return t
 }
 
-func (g *generator) Generate(pkg *model.Package, pkgName string) error {
+func (g *generator) Generate(pkg *model.Package, pkgName string, outputPackagePath string) error {
 	g.p("// Code generated by MockGen. DO NOT EDIT.")
 	if g.filename != "" {
 		g.p("// Source: %v", g.filename)
@@ -193,7 +231,15 @@ func (g *generator) Generate(pkg *model.Package, pkgName string) error {
 	// Get all required imports, and generate unique names for them all.
 	im := pkg.Imports()
 	im[gomockImportPath] = true
-	im["reflect"] = true
+
+	// Only import reflect if it's used. We only use reflect in mocked methods
+	// so only import if any of the mocked interfaces have methods.
+	for _, intf := range pkg.Interfaces {
+		if len(intf.Methods) > 0 {
+			im["reflect"] = true
+			break
+		}
+	}
 
 	// Sort keys to make import alias generation predictable
 	sorted_paths := make([]string, len(im), len(im))
@@ -225,12 +271,15 @@ func (g *generator) Generate(pkg *model.Package, pkgName string) error {
 		localNames[pkgName] = true
 	}
 
+	if *writePkgComment {
+		g.p("// Package %v is a generated GoMock package.", pkgName)
+	}
 	g.p("package %v", pkgName)
 	g.p("")
 	g.p("import (")
 	g.in()
 	for path, pkg := range g.packageMap {
-		if path == *selfPackage {
+		if path == outputPackagePath {
 			continue
 		}
 		g.p("%v %q", pkg, path)
@@ -242,7 +291,7 @@ func (g *generator) Generate(pkg *model.Package, pkgName string) error {
 	g.p(")")
 
 	for _, intf := range pkg.Interfaces {
-		if err := g.GenerateMockInterface(intf); err != nil {
+		if err := g.GenerateMockInterface(intf, outputPackagePath); err != nil {
 			return err
 		}
 	}
@@ -251,12 +300,16 @@ func (g *generator) Generate(pkg *model.Package, pkgName string) error {
 }
 
 // The name of the mock type to use for the given interface identifier.
-func mockName(typeName string) string {
+func (g *generator) mockName(typeName string) string {
+	if mockName, ok := g.mockNames[typeName]; ok {
+		return mockName
+	}
+
 	return "Mock" + typeName
 }
 
-func (g *generator) GenerateMockInterface(intf *model.Interface) error {
-	mockType := mockName(intf.Name)
+func (g *generator) GenerateMockInterface(intf *model.Interface, outputPackagePath string) error {
+	mockType := g.mockName(intf.Name)
 
 	g.p("")
 	g.p("// %v is a mock of %v interface", mockType, intf.Name)
@@ -293,13 +346,13 @@ func (g *generator) GenerateMockInterface(intf *model.Interface) error {
 
 	// XXX: possible name collision here if someone has EXPECT in their interface.
 	g.p("// EXPECT returns an object that allows the caller to indicate expected use")
-	g.p("func (_m *%v) EXPECT() *%vMockRecorder {", mockType, mockType)
+	g.p("func (m *%v) EXPECT() *%vMockRecorder {", mockType, mockType)
 	g.in()
-	g.p("return _m.recorder")
+	g.p("return m.recorder")
 	g.out()
 	g.p("}")
 
-	g.GenerateMockMethods(mockType, intf, *selfPackage)
+	g.GenerateMockMethods(mockType, intf, outputPackagePath)
 
 	return nil
 }
@@ -313,30 +366,25 @@ func (g *generator) GenerateMockMethods(mockType string, intf *model.Interface,
 	}
 }
 
+func makeArgString(argNames, argTypes []string) string {
+	args := make([]string, len(argNames))
+	for i, name := range argNames {
+		// specify the type only once for consecutive args of the same type
+		if i+1 < len(argTypes) && argTypes[i] == argTypes[i+1] {
+			args[i] = name
+		} else {
+			args[i] = name + " " + argTypes[i]
+		}
+	}
+	return strings.Join(args, ", ")
+}
+
 // GenerateMockMethod generates a mock method implementation.
 // If non-empty, pkgOverride is the package in which unqualified types reside.
 func (g *generator) GenerateMockMethod(mockType string, m *model.Method, pkgOverride string) error {
-	args := make([]string, len(m.In))
-	argNames := make([]string, len(m.In))
-	for i, p := range m.In {
-		name := p.Name
-		if name == "" {
-			name = fmt.Sprintf("_param%d", i)
-		}
-		ts := p.Type.String(g.packageMap, pkgOverride)
-		args[i] = name + " " + ts
-		argNames[i] = name
-	}
-	if m.Variadic != nil {
-		name := m.Variadic.Name
-		if name == "" {
-			name = fmt.Sprintf("_param%d", len(m.In))
-		}
-		ts := m.Variadic.Type.String(g.packageMap, pkgOverride)
-		args = append(args, name+" ..."+ts)
-		argNames = append(argNames, name)
-	}
-	argString := strings.Join(args, ", ")
+	argNames := g.getArgNames(m)
+	argTypes := g.getArgTypes(m, pkgOverride)
+	argString := makeArgString(argNames, argTypes)
 
 	rets := make([]string, len(m.Out))
 	for i, p := range m.Out {
@@ -350,37 +398,44 @@ func (g *generator) GenerateMockMethod(mockType string, m *model.Method, pkgOver
 		retString = " " + retString
 	}
 
+	ia := newIdentifierAllocator(argNames)
+	idRecv := ia.allocateIdentifier("m")
+
 	g.p("// %v mocks base method", m.Name)
-	g.p("func (_m *%v) %v(%v)%v {", mockType, m.Name, argString, retString)
+	g.p("func (%v *%v) %v(%v)%v {", idRecv, mockType, m.Name, argString, retString)
 	g.in()
 
-	callArgs := strings.Join(argNames, ", ")
-	if callArgs != "" {
-		callArgs = ", " + callArgs
-	}
-	if m.Variadic != nil {
+	var callArgs string
+	if m.Variadic == nil {
+		if len(argNames) > 0 {
+			callArgs = ", " + strings.Join(argNames, ", ")
+		}
+	} else {
 		// Non-trivial. The generated code must build a []interface{},
 		// but the variadic argument may be any type.
-		g.p("_s := []interface{}{%s}", strings.Join(argNames[:len(argNames)-1], ", "))
-		g.p("for _, _x := range %s {", argNames[len(argNames)-1])
+		idVarArgs := ia.allocateIdentifier("varargs")
+		idVArg := ia.allocateIdentifier("a")
+		g.p("%s := []interface{}{%s}", idVarArgs, strings.Join(argNames[:len(argNames)-1], ", "))
+		g.p("for _, %s := range %s {", idVArg, argNames[len(argNames)-1])
 		g.in()
-		g.p("_s = append(_s, _x)")
+		g.p("%s = append(%s, %s)", idVarArgs, idVarArgs, idVArg)
 		g.out()
 		g.p("}")
-		callArgs = ", _s..."
+		callArgs = ", " + idVarArgs + "..."
 	}
 	if len(m.Out) == 0 {
-		g.p(`_m.ctrl.Call(_m, "%v"%v)`, m.Name, callArgs)
+		g.p(`%v.ctrl.Call(%v, %q%v)`, idRecv, idRecv, m.Name, callArgs)
 	} else {
-		g.p(`ret := _m.ctrl.Call(_m, "%v"%v)`, m.Name, callArgs)
+		idRet := ia.allocateIdentifier("ret")
+		g.p(`%v := %v.ctrl.Call(%v, %q%v)`, idRet, idRecv, idRecv, m.Name, callArgs)
 
 		// Go does not allow "naked" type assertions on nil values, so we use the two-value form here.
 		// The value of that is either (x.(T), true) or (Z, false), where Z is the zero value for T.
 		// Happily, this coincides with the semantics we want here.
 		retNames := make([]string, len(rets))
 		for i, t := range rets {
-			retNames[i] = fmt.Sprintf("ret%d", i)
-			g.p("%s, _ := ret[%d].(%s)", retNames[i], i, t)
+			retNames[i] = ia.allocateIdentifier(fmt.Sprintf("ret%d", i))
+			g.p("%s, _ := %s[%d].(%s)", retNames[i], idRet, i, t)
 		}
 		g.p("return " + strings.Join(retNames, ", "))
 	}
@@ -391,47 +446,109 @@ func (g *generator) GenerateMockMethod(mockType string, m *model.Method, pkgOver
 }
 
 func (g *generator) GenerateMockRecorderMethod(mockType string, m *model.Method) error {
-	nargs := len(m.In)
-	args := make([]string, nargs)
-	for i := 0; i < nargs; i++ {
-		args[i] = "arg" + strconv.Itoa(i)
+	argNames := g.getArgNames(m)
+
+	var argString string
+	if m.Variadic == nil {
+		argString = strings.Join(argNames, ", ")
+	} else {
+		argString = strings.Join(argNames[:len(argNames)-1], ", ")
 	}
-	argString := strings.Join(args, ", ")
-	if nargs > 0 {
+	if argString != "" {
 		argString += " interface{}"
 	}
+
 	if m.Variadic != nil {
-		if nargs > 0 {
+		if argString != "" {
 			argString += ", "
 		}
-		argString += fmt.Sprintf("arg%d ...interface{}", nargs)
+		argString += fmt.Sprintf("%s ...interface{}", argNames[len(argNames)-1])
 	}
 
+	ia := newIdentifierAllocator(argNames)
+	idRecv := ia.allocateIdentifier("mr")
+
 	g.p("// %v indicates an expected call of %v", m.Name, m.Name)
-	g.p("func (_mr *%vMockRecorder) %v(%v) *gomock.Call {", mockType, m.Name, argString)
+	g.p("func (%s *%vMockRecorder) %v(%v) *gomock.Call {", idRecv, mockType, m.Name, argString)
 	g.in()
 
-	callArgs := strings.Join(args, ", ")
-	if nargs > 0 {
-		callArgs = ", " + callArgs
-	}
-	if m.Variadic != nil {
-		if nargs == 0 {
+	var callArgs string
+	if m.Variadic == nil {
+		if len(argNames) > 0 {
+			callArgs = ", " + strings.Join(argNames, ", ")
+		}
+	} else {
+		if len(argNames) == 1 {
 			// Easy: just use ... to push the arguments through.
-			callArgs = ", arg0..."
+			callArgs = ", " + argNames[0] + "..."
 		} else {
 			// Hard: create a temporary slice.
-			g.p("_s := append([]interface{}{%s}, arg%d...)", strings.Join(args, ", "), nargs)
-			callArgs = ", _s..."
+			idVarArgs := ia.allocateIdentifier("varargs")
+			g.p("%s := append([]interface{}{%s}, %s...)",
+				idVarArgs,
+				strings.Join(argNames[:len(argNames)-1], ", "),
+				argNames[len(argNames)-1])
+			callArgs = ", " + idVarArgs + "..."
 		}
 	}
-	g.p(`return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "%s", reflect.TypeOf((*%s)(nil).%s)%s)`, m.Name, mockType, m.Name, callArgs)
+	g.p(`return %s.mock.ctrl.RecordCallWithMethodType(%s.mock, "%s", reflect.TypeOf((*%s)(nil).%s)%s)`, idRecv, idRecv, m.Name, mockType, m.Name, callArgs)
 
 	g.out()
 	g.p("}")
 	return nil
 }
 
+func (g *generator) getArgNames(m *model.Method) []string {
+	argNames := make([]string, len(m.In))
+	for i, p := range m.In {
+		name := p.Name
+		if name == "" {
+			name = fmt.Sprintf("arg%d", i)
+		}
+		argNames[i] = name
+	}
+	if m.Variadic != nil {
+		name := m.Variadic.Name
+		if name == "" {
+			name = fmt.Sprintf("arg%d", len(m.In))
+		}
+		argNames = append(argNames, name)
+	}
+	return argNames
+}
+
+func (g *generator) getArgTypes(m *model.Method, pkgOverride string) []string {
+	argTypes := make([]string, len(m.In))
+	for i, p := range m.In {
+		argTypes[i] = p.Type.String(g.packageMap, pkgOverride)
+	}
+	if m.Variadic != nil {
+		argTypes = append(argTypes, "..."+m.Variadic.Type.String(g.packageMap, pkgOverride))
+	}
+	return argTypes
+}
+
+type identifierAllocator map[string]struct{}
+
+func newIdentifierAllocator(taken []string) identifierAllocator {
+	a := make(identifierAllocator, len(taken))
+	for _, s := range taken {
+		a[s] = struct{}{}
+	}
+	return a
+}
+
+func (o identifierAllocator) allocateIdentifier(want string) string {
+	id := want
+	for i := 2; ; i++ {
+		if _, ok := o[id]; !ok {
+			o[id] = struct{}{}
+			return id
+		}
+		id = want + "_" + strconv.Itoa(i)
+	}
+}
+
 // Output returns the generator's output, formatted in the standard Go style.
 func (g *generator) Output() []byte {
 	src, err := format.Source(g.buf.Bytes())
diff --git a/vendor/github.com/golang/mock/mockgen/mockgen_test.go b/vendor/github.com/golang/mock/mockgen/mockgen_test.go
new file mode 100644
index 00000000..bcb2a97f
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/mockgen_test.go
@@ -0,0 +1,181 @@
+package main
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestMakeArgString(t *testing.T) {
+	testCases := []struct {
+		argNames  []string
+		argTypes  []string
+		argString string
+	}{
+		{
+			argNames:  nil,
+			argTypes:  nil,
+			argString: "",
+		},
+		{
+			argNames:  []string{"arg0"},
+			argTypes:  []string{"int"},
+			argString: "arg0 int",
+		},
+		{
+			argNames:  []string{"arg0", "arg1"},
+			argTypes:  []string{"int", "bool"},
+			argString: "arg0 int, arg1 bool",
+		},
+		{
+			argNames:  []string{"arg0", "arg1"},
+			argTypes:  []string{"int", "int"},
+			argString: "arg0, arg1 int",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2"},
+			argTypes:  []string{"bool", "int", "int"},
+			argString: "arg0 bool, arg1, arg2 int",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2"},
+			argTypes:  []string{"int", "bool", "int"},
+			argString: "arg0 int, arg1 bool, arg2 int",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2"},
+			argTypes:  []string{"int", "int", "bool"},
+			argString: "arg0, arg1 int, arg2 bool",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2"},
+			argTypes:  []string{"int", "int", "int"},
+			argString: "arg0, arg1, arg2 int",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3"},
+			argTypes:  []string{"bool", "int", "int", "int"},
+			argString: "arg0 bool, arg1, arg2, arg3 int",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3"},
+			argTypes:  []string{"int", "bool", "int", "int"},
+			argString: "arg0 int, arg1 bool, arg2, arg3 int",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3"},
+			argTypes:  []string{"int", "int", "bool", "int"},
+			argString: "arg0, arg1 int, arg2 bool, arg3 int",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3"},
+			argTypes:  []string{"int", "int", "int", "bool"},
+			argString: "arg0, arg1, arg2 int, arg3 bool",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3", "arg4"},
+			argTypes:  []string{"bool", "int", "int", "int", "bool"},
+			argString: "arg0 bool, arg1, arg2, arg3 int, arg4 bool",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3", "arg4"},
+			argTypes:  []string{"int", "bool", "int", "int", "bool"},
+			argString: "arg0 int, arg1 bool, arg2, arg3 int, arg4 bool",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3", "arg4"},
+			argTypes:  []string{"int", "int", "bool", "int", "bool"},
+			argString: "arg0, arg1 int, arg2 bool, arg3 int, arg4 bool",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3", "arg4"},
+			argTypes:  []string{"int", "int", "int", "bool", "bool"},
+			argString: "arg0, arg1, arg2 int, arg3, arg4 bool",
+		},
+		{
+			argNames:  []string{"arg0", "arg1", "arg2", "arg3", "arg4"},
+			argTypes:  []string{"int", "int", "bool", "bool", "int"},
+			argString: "arg0, arg1 int, arg2, arg3 bool, arg4 int",
+		},
+	}
+
+	for i, tc := range testCases {
+		t.Run(fmt.Sprintf("#%d", i), func(t *testing.T) {
+			s := makeArgString(tc.argNames, tc.argTypes)
+			if s != tc.argString {
+				t.Errorf("result == %q, want %q", s, tc.argString)
+			}
+		})
+	}
+}
+
+func TestNewIdentifierAllocator(t *testing.T) {
+	a := newIdentifierAllocator([]string{"taken1", "taken2"})
+	if len(a) != 2 {
+		t.Fatalf("expected 2 items, got %v", len(a))
+	}
+
+	_, ok := a["taken1"]
+	if !ok {
+		t.Errorf("allocator doesn't contain 'taken1': %#v", a)
+	}
+
+	_, ok = a["taken2"]
+	if !ok {
+		t.Errorf("allocator doesn't contain 'taken2': %#v", a)
+	}
+}
+
+func allocatorContainsIdentifiers(a identifierAllocator, ids []string) bool {
+	if len(a) != len(ids) {
+		return false
+	}
+
+	for _, id := range ids {
+		_, ok := a[id]
+		if !ok {
+			return false
+		}
+	}
+
+	return true
+}
+
+func TestIdentifierAllocator_allocateIdentifier(t *testing.T) {
+	a := newIdentifierAllocator([]string{"taken"})
+
+	t2 := a.allocateIdentifier("taken_2")
+	if t2 != "taken_2" {
+		t.Fatalf("expected 'taken_2', got %q", t2)
+	}
+	expected := []string{"taken", "taken_2"}
+	if !allocatorContainsIdentifiers(a, expected) {
+		t.Fatalf("allocator doesn't contain the expected items - allocator: %#v, expected items: %#v", a, expected)
+	}
+
+	t3 := a.allocateIdentifier("taken")
+	if t3 != "taken_3" {
+		t.Fatalf("expected 'taken_3', got %q", t3)
+	}
+	expected = []string{"taken", "taken_2", "taken_3"}
+	if !allocatorContainsIdentifiers(a, expected) {
+		t.Fatalf("allocator doesn't contain the expected items - allocator: %#v, expected items: %#v", a, expected)
+	}
+
+	t4 := a.allocateIdentifier("taken")
+	if t4 != "taken_4" {
+		t.Fatalf("expected 'taken_4', got %q", t4)
+	}
+	expected = []string{"taken", "taken_2", "taken_3", "taken_4"}
+	if !allocatorContainsIdentifiers(a, expected) {
+		t.Fatalf("allocator doesn't contain the expected items - allocator: %#v, expected items: %#v", a, expected)
+	}
+
+	id := a.allocateIdentifier("id")
+	if id != "id" {
+		t.Fatalf("expected 'id', got %q", id)
+	}
+	expected = []string{"taken", "taken_2", "taken_3", "taken_4", "id"}
+	if !allocatorContainsIdentifiers(a, expected) {
+		t.Fatalf("allocator doesn't contain the expected items - allocator: %#v, expected items: %#v", a, expected)
+	}
+}
diff --git a/vendor/github.com/golang/mock/mockgen/model/model.go b/vendor/github.com/golang/mock/mockgen/model/model.go
index 0e69d66e..c8af9a34 100644
--- a/vendor/github.com/golang/mock/mockgen/model/model.go
+++ b/vendor/github.com/golang/mock/mockgen/model/model.go
@@ -23,6 +23,9 @@ import (
 	"strings"
 )
 
+// pkgPath is the importable path for package model
+const pkgPath = "github.com/golang/mock/mockgen/model"
+
 // Package is a Go package. It may be a subset.
 type Package struct {
 	Name       string
@@ -131,7 +134,15 @@ func init() {
 	gob.Register(&MapType{})
 	gob.Register(&NamedType{})
 	gob.Register(&PointerType{})
-	gob.Register(PredeclaredType(""))
+
+	// Call gob.RegisterName to make sure it has the consistent name registered
+	// for both gob decoder and encoder.
+	//
+	// For a non-pointer type, gob.Register will try to get package full path by
+	// calling rt.PkgPath() for a name to register. If your project has vendor
+	// directory, it is possible that PkgPath will get a path like this:
+	//     ../../../vendor/github.com/golang/mock/mockgen/model
+	gob.RegisterName(pkgPath+".PredeclaredType", PredeclaredType(""))
 }
 
 // ArrayType is an array or slice type.
@@ -343,6 +354,13 @@ func typeFromType(t reflect.Type) (Type, error) {
 	}
 
 	if imp := t.PkgPath(); imp != "" {
+		// PkgPath might return a path that includes "vendor"
+		// These paths do not compile, so we need to remove everything
+		// up to and including "/vendor/"
+		// see https://github.com/golang/go/issues/12019
+		if i := strings.LastIndex(imp, "/vendor/"); i != -1 {
+			imp = imp[i+len("/vendor/"):]
+		}
 		return &NamedType{
 			Package: imp,
 			Type:    t.Name(),
diff --git a/vendor/github.com/golang/mock/mockgen/parse.go b/vendor/github.com/golang/mock/mockgen/parse.go
index 5615d4b3..3060c481 100644
--- a/vendor/github.com/golang/mock/mockgen/parse.go
+++ b/vendor/github.com/golang/mock/mockgen/parse.go
@@ -20,10 +20,12 @@ import (
 	"flag"
 	"fmt"
 	"go/ast"
+	"go/build"
 	"go/parser"
 	"go/token"
 	"log"
 	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -38,6 +40,16 @@ var (
 // TODO: simplify error reporting
 
 func ParseFile(source string) (*model.Package, error) {
+	srcDir, err := filepath.Abs(filepath.Dir(source))
+	if err != nil {
+		return nil, fmt.Errorf("failed getting source directory: %v", err)
+	}
+
+	var packageImport string
+	if p, err := build.ImportDir(srcDir, 0); err == nil {
+		packageImport = p.ImportPath
+	} // TODO: should we fail if this returns an error?
+
 	fs := token.NewFileSet()
 	file, err := parser.ParseFile(fs, source, nil, 0)
 	if err != nil {
@@ -45,9 +57,11 @@ func ParseFile(source string) (*model.Package, error) {
 	}
 
 	p := &fileParser{
-		fileSet:       fs,
-		imports:       make(map[string]string),
-		auxInterfaces: make(map[string]map[string]*ast.InterfaceType),
+		fileSet:            fs,
+		imports:            make(map[string]string),
+		importedInterfaces: make(map[string]map[string]*ast.InterfaceType),
+		auxInterfaces:      make(map[string]map[string]*ast.InterfaceType),
+		srcDir:             srcDir,
 	}
 
 	// Handle -imports.
@@ -70,9 +84,9 @@ func ParseFile(source string) (*model.Package, error) {
 	if err := p.parseAuxFiles(*auxFiles); err != nil {
 		return nil, err
 	}
-	p.addAuxInterfacesFromFile("", file) // this file
+	p.addAuxInterfacesFromFile(packageImport, file) // this file
 
-	pkg, err := p.parseFile(file)
+	pkg, err := p.parseFile(packageImport, file)
 	if err != nil {
 		return nil, err
 	}
@@ -84,11 +98,14 @@ func ParseFile(source string) (*model.Package, error) {
 }
 
 type fileParser struct {
-	fileSet *token.FileSet
-	imports map[string]string // package name => import path
+	fileSet            *token.FileSet
+	imports            map[string]string                        // package name => import path
+	importedInterfaces map[string]map[string]*ast.InterfaceType // package (or "") => name => interface
 
 	auxFiles      []*ast.File
 	auxInterfaces map[string]map[string]*ast.InterfaceType // package (or "") => name => interface
+
+	srcDir string
 }
 
 func (p *fileParser) errorf(pos token.Pos, format string, args ...interface{}) error {
@@ -108,12 +125,14 @@ func (p *fileParser) parseAuxFiles(auxFiles string) error {
 		if len(parts) != 2 {
 			return fmt.Errorf("bad aux file spec: %v", kv)
 		}
-		file, err := parser.ParseFile(p.fileSet, parts[1], nil, 0)
+		pkg, fpath := parts[0], parts[1]
+
+		file, err := parser.ParseFile(p.fileSet, fpath, nil, 0)
 		if err != nil {
 			return err
 		}
 		p.auxFiles = append(p.auxFiles, file)
-		p.addAuxInterfacesFromFile(parts[0], file)
+		p.addAuxInterfacesFromFile(pkg, file)
 	}
 	return nil
 }
@@ -127,7 +146,9 @@ func (p *fileParser) addAuxInterfacesFromFile(pkg string, file *ast.File) {
 	}
 }
 
-func (p *fileParser) parseFile(file *ast.File) (*model.Package, error) {
+// parseFile loads all file imports and auxiliary files import into the
+// fileParser, parses all file interfaces and returns package model.
+func (p *fileParser) parseFile(importPath string, file *ast.File) (*model.Package, error) {
 	allImports := importsOfFile(file)
 	// Don't stomp imports provided by -imports. Those should take precedence.
 	for pkg, path := range allImports {
@@ -147,7 +168,7 @@ func (p *fileParser) parseFile(file *ast.File) (*model.Package, error) {
 
 	var is []*model.Interface
 	for ni := range iterInterfaces(file) {
-		i, err := p.parseInterface(ni.name.String(), "", ni.it)
+		i, err := p.parseInterface(ni.name.String(), importPath, ni.it)
 		if err != nil {
 			return nil, err
 		}
@@ -159,6 +180,32 @@ func (p *fileParser) parseFile(file *ast.File) (*model.Package, error) {
 	}, nil
 }
 
+// parsePackage loads package specified by path, parses it and populates
+// corresponding imports and importedInterfaces into the fileParser.
+func (p *fileParser) parsePackage(path string) error {
+	var pkgs map[string]*ast.Package
+	if imp, err := build.Import(path, p.srcDir, build.FindOnly); err != nil {
+		return err
+	} else if pkgs, err = parser.ParseDir(p.fileSet, imp.Dir, nil, 0); err != nil {
+		return err
+	}
+	for _, pkg := range pkgs {
+		file := ast.MergePackageFiles(pkg, ast.FilterFuncDuplicates|ast.FilterUnassociatedComments|ast.FilterImportDuplicates)
+		if _, ok := p.importedInterfaces[path]; !ok {
+			p.importedInterfaces[path] = make(map[string]*ast.InterfaceType)
+		}
+		for ni := range iterInterfaces(file) {
+			p.importedInterfaces[path][ni.name.Name] = ni.it
+		}
+		for pkgName, pkgPath := range importsOfFile(file) {
+			if _, ok := p.imports[pkgName]; !ok {
+				p.imports[pkgName] = pkgPath
+			}
+		}
+	}
+	return nil
+}
+
 func (p *fileParser) parseInterface(name, pkg string, it *ast.InterfaceType) (*model.Interface, error) {
 	intf := &model.Interface{Name: name}
 	for _, field := range it.Methods.List {
@@ -178,9 +225,11 @@ func (p *fileParser) parseInterface(name, pkg string, it *ast.InterfaceType) (*m
 			intf.Methods = append(intf.Methods, m)
 		case *ast.Ident:
 			// Embedded interface in this package.
-			ei := p.auxInterfaces[""][v.String()]
+			ei := p.auxInterfaces[pkg][v.String()]
 			if ei == nil {
-				return nil, p.errorf(v.Pos(), "unknown embedded interface %s", v.String())
+				if ei = p.importedInterfaces[pkg][v.String()]; ei == nil {
+					return nil, p.errorf(v.Pos(), "unknown embedded interface %s", v.String())
+				}
 			}
 			eintf, err := p.parseInterface(v.String(), pkg, ei)
 			if err != nil {
@@ -194,15 +243,23 @@ func (p *fileParser) parseInterface(name, pkg string, it *ast.InterfaceType) (*m
 		case *ast.SelectorExpr:
 			// Embedded interface in another package.
 			fpkg, sel := v.X.(*ast.Ident).String(), v.Sel.String()
-			ei := p.auxInterfaces[fpkg][sel]
-			if ei == nil {
-				return nil, p.errorf(v.Pos(), "unknown embedded interface %s.%s", fpkg, sel)
-			}
 			epkg, ok := p.imports[fpkg]
 			if !ok {
 				return nil, p.errorf(v.X.Pos(), "unknown package %s", fpkg)
 			}
-			eintf, err := p.parseInterface(sel, epkg, ei)
+			ei := p.auxInterfaces[fpkg][sel]
+			if ei == nil {
+				fpkg = epkg
+				if _, ok = p.importedInterfaces[epkg]; !ok {
+					if err := p.parsePackage(epkg); err != nil {
+						return nil, p.errorf(v.Pos(), "could not parse package %s: %v", fpkg, err)
+					}
+				}
+				if ei = p.importedInterfaces[epkg][sel]; ei == nil {
+					return nil, p.errorf(v.Pos(), "unknown embedded interface %s.%s", fpkg, sel)
+				}
+			}
+			eintf, err := p.parseInterface(sel, fpkg, ei)
 			if err != nil {
 				return nil, err
 			}
@@ -319,6 +376,12 @@ func (p *fileParser) parseType(pkg string, typ ast.Expr) (model.Type, error) {
 		return &model.FuncType{In: in, Out: out, Variadic: variadic}, nil
 	case *ast.Ident:
 		if v.IsExported() {
+			// `pkg` may be an aliased imported pkg
+			// if so, patch the import w/ the fully qualified import
+			maybeImportedPkg, ok := p.imports[pkg]
+			if ok {
+				pkg = maybeImportedPkg
+			}
 			// assume type in this package
 			return &model.NamedType{Package: pkg, Type: v.Name}, nil
 		} else {
@@ -366,40 +429,34 @@ func (p *fileParser) parseType(pkg string, typ ast.Expr) (model.Type, error) {
 // importsOfFile returns a map of package name to import path
 // of the imports in file.
 func importsOfFile(file *ast.File) map[string]string {
-	/* We have to make guesses about some imports, because imports are not required
-	 * to have names. Named imports are always certain. Unnamed imports are guessed
-	 * to have a name of the last path component; if the last path component has dots,
-	 * the first dot-delimited field is used as the name.
-	 */
-
 	m := make(map[string]string)
-	for _, decl := range file.Decls {
-		gd, ok := decl.(*ast.GenDecl)
-		if !ok || gd.Tok != token.IMPORT {
-			continue
-		}
-		for _, spec := range gd.Specs {
-			is, ok := spec.(*ast.ImportSpec)
-			if !ok {
+	for _, is := range file.Imports {
+		var pkgName string
+		importPath := is.Path.Value[1 : len(is.Path.Value)-1] // remove quotes
+
+		if is.Name != nil {
+			// Named imports are always certain.
+			if is.Name.Name == "_" {
 				continue
 			}
-			pkg, importPath := "", string(is.Path.Value)
-			importPath = importPath[1 : len(importPath)-1] // remove quotes
-
-			if is.Name != nil {
-				if is.Name.Name == "_" {
-					continue
-				}
-				pkg = removeDot(is.Name.Name)
-			} else {
+			pkgName = removeDot(is.Name.Name)
+		} else {
+			pkg, err := build.Import(importPath, "", 0)
+			if err != nil {
+				// Fallback to import path suffix. Note that this is uncertain.
 				_, last := path.Split(importPath)
-				pkg = strings.SplitN(last, ".", 2)[0]
-			}
-			if _, ok := m[pkg]; ok {
-				log.Fatalf("imported package collision: %q imported twice", pkg)
+				// If the last path component has dots, the first dot-delimited
+				// field is used as the name.
+				pkgName = strings.SplitN(last, ".", 2)[0]
+			} else {
+				pkgName = pkg.Name
 			}
-			m[pkg] = importPath
 		}
+
+		if _, ok := m[pkgName]; ok {
+			log.Fatalf("imported package collision: %q imported twice", pkgName)
+		}
+		m[pkgName] = importPath
 	}
 	return m
 }
diff --git a/vendor/github.com/golang/mock/mockgen/parse_test.go b/vendor/github.com/golang/mock/mockgen/parse_test.go
new file mode 100644
index 00000000..47e4d79c
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/parse_test.go
@@ -0,0 +1,108 @@
+package main
+
+import (
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"testing"
+)
+
+func TestFileParser_ParseFile(t *testing.T) {
+	fs := token.NewFileSet()
+	file, err := parser.ParseFile(fs, "tests/custom_package_name/greeter/greeter.go", nil, 0)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	p := fileParser{
+		fileSet:            fs,
+		imports:            make(map[string]string),
+		importedInterfaces: make(map[string]map[string]*ast.InterfaceType),
+	}
+
+	pkg, err := p.parseFile("", file)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	checkGreeterImports(t, p.imports)
+
+	expectedName := "greeter"
+	if pkg.Name != expectedName {
+		t.Fatalf("Expected name to be %v but got %v", expectedName, pkg.Name)
+	}
+
+	expectedInterfaceName := "InputMaker"
+	if pkg.Interfaces[0].Name != expectedInterfaceName {
+		t.Fatalf("Expected interface name to be %v but got %v", expectedInterfaceName, pkg.Interfaces[0].Name)
+	}
+}
+
+func TestFileParser_ParsePackage(t *testing.T) {
+	fs := token.NewFileSet()
+	_, err := parser.ParseFile(fs, "tests/custom_package_name/greeter/greeter.go", nil, 0)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	p := fileParser{
+		fileSet:            fs,
+		imports:            make(map[string]string),
+		importedInterfaces: make(map[string]map[string]*ast.InterfaceType),
+	}
+
+	err = p.parsePackage("github.com/golang/mock/mockgen/tests/custom_package_name/greeter")
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	checkGreeterImports(t, p.imports)
+}
+
+func TestImportsOfFile(t *testing.T) {
+	fs := token.NewFileSet()
+	file, err := parser.ParseFile(fs, "tests/custom_package_name/greeter/greeter.go", nil, 0)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	imports := importsOfFile(file)
+	checkGreeterImports(t, imports)
+}
+
+func checkGreeterImports(t *testing.T, imports map[string]string) {
+	// check that imports have stdlib package "fmt"
+	if fmtPackage, ok := imports["fmt"]; !ok {
+		t.Errorf("Expected imports to have key \"fmt\"")
+	} else {
+		expectedFmtPackage := "fmt"
+		if fmtPackage != expectedFmtPackage {
+			t.Errorf("Expected fmt key to have value %s but got %s", expectedFmtPackage, fmtPackage)
+		}
+	}
+
+	// check that imports have package named "validator"
+	if validatorPackage, ok := imports["validator"]; !ok {
+		t.Errorf("Expected imports to have key \"fmt\"")
+	} else {
+		expectedValidatorPackage := "github.com/golang/mock/mockgen/tests/custom_package_name/validator"
+		if validatorPackage != expectedValidatorPackage {
+			t.Errorf("Expected validator key to have value %s but got %s", expectedValidatorPackage, validatorPackage)
+		}
+	}
+
+	// check that imports have package named "client"
+	if clientPackage, ok := imports["client"]; !ok {
+		t.Errorf("Expected imports to have key \"client\"")
+	} else {
+		expectedClientPackage := "github.com/golang/mock/mockgen/tests/custom_package_name/client/v1"
+		if clientPackage != expectedClientPackage {
+			t.Errorf("Expected client key to have value %s but got %s", expectedClientPackage, clientPackage)
+		}
+	}
+
+	// check that imports don't have package named "v1"
+	if _, ok := imports["v1"]; ok {
+		t.Errorf("Expected import not to have key \"v1\"")
+	}
+}
diff --git a/vendor/github.com/golang/mock/mockgen/reflect.go b/vendor/github.com/golang/mock/mockgen/reflect.go
index 4df9689f..915f1331 100644
--- a/vendor/github.com/golang/mock/mockgen/reflect.go
+++ b/vendor/github.com/golang/mock/mockgen/reflect.go
@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"encoding/gob"
 	"flag"
-	"io"
+	"go/build"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -32,66 +32,27 @@ import (
 )
 
 var (
-	progOnly   = flag.Bool("prog_only", false, "(reflect mode) Only generate the reflection program; write it to stdout.")
+	progOnly   = flag.Bool("prog_only", false, "(reflect mode) Only generate the reflection program; write it to stdout and exit.")
 	execOnly   = flag.String("exec_only", "", "(reflect mode) If set, execute this reflection program.")
 	buildFlags = flag.String("build_flags", "", "(reflect mode) Additional flags for go build.")
 )
 
-func Reflect(importPath string, symbols []string) (*model.Package, error) {
-	// TODO: sanity check arguments
-
-	progPath := *execOnly
-	if *execOnly == "" {
-		// We use TempDir instead of TempFile so we can control the filename.
-		tmpDir, err := ioutil.TempDir("", "gomock_reflect_")
-		if err != nil {
-			return nil, err
-		}
-		defer func() { os.RemoveAll(tmpDir) }()
-		const progSource = "prog.go"
-		var progBinary = "prog.bin"
-		if runtime.GOOS == "windows" {
-			// Windows won't execute a program unless it has a ".exe" suffix.
-			progBinary += ".exe"
-		}
-
-		// Generate program.
-		var program bytes.Buffer
-		data := reflectData{
-			ImportPath: importPath,
-			Symbols:    symbols,
-		}
-		if err := reflectProgram.Execute(&program, &data); err != nil {
-			return nil, err
-		}
-		if *progOnly {
-			io.Copy(os.Stdout, &program)
-			os.Exit(0)
-		}
-		if err := ioutil.WriteFile(filepath.Join(tmpDir, progSource), program.Bytes(), 0600); err != nil {
-			return nil, err
-		}
-
-		cmdArgs := []string{}
-		cmdArgs = append(cmdArgs, "build")
-		if *buildFlags != "" {
-			cmdArgs = append(cmdArgs, *buildFlags)
-		}
-		cmdArgs = append(cmdArgs, "-o", progBinary, progSource)
-
-		// Build the program.
-		cmd := exec.Command("go", cmdArgs...)
-		cmd.Dir = tmpDir
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		if err := cmd.Run(); err != nil {
-			return nil, err
-		}
-		progPath = filepath.Join(tmpDir, progBinary)
+func writeProgram(importPath string, symbols []string) ([]byte, error) {
+	var program bytes.Buffer
+	data := reflectData{
+		ImportPath: importPath,
+		Symbols:    symbols,
+	}
+	if err := reflectProgram.Execute(&program, &data); err != nil {
+		return nil, err
 	}
+	return program.Bytes(), nil
+}
 
-	// Run it.
-	cmd := exec.Command(progPath)
+// run the given command and parse the output as a model.Package.
+func run(command string) (*model.Package, error) {
+	// Run the program.
+	cmd := exec.Command(command)
 	var stdout bytes.Buffer
 	cmd.Stdout = &stdout
 	cmd.Stderr = os.Stderr
@@ -107,6 +68,79 @@ func Reflect(importPath string, symbols []string) (*model.Package, error) {
 	return &pkg, nil
 }
 
+// runInDir writes the given program into the given dir, runs it there, and
+// parses the output as a model.Package.
+func runInDir(program []byte, dir string) (*model.Package, error) {
+	// We use TempDir instead of TempFile so we can control the filename.
+	tmpDir, err := ioutil.TempDir(dir, "gomock_reflect_")
+	if err != nil {
+		return nil, err
+	}
+	defer func() { os.RemoveAll(tmpDir) }()
+	const progSource = "prog.go"
+	var progBinary = "prog.bin"
+	if runtime.GOOS == "windows" {
+		// Windows won't execute a program unless it has a ".exe" suffix.
+		progBinary += ".exe"
+	}
+
+	if err := ioutil.WriteFile(filepath.Join(tmpDir, progSource), program, 0600); err != nil {
+		return nil, err
+	}
+
+	cmdArgs := []string{}
+	cmdArgs = append(cmdArgs, "build")
+	if *buildFlags != "" {
+		cmdArgs = append(cmdArgs, *buildFlags)
+	}
+	cmdArgs = append(cmdArgs, "-o", progBinary, progSource)
+
+	// Build the program.
+	cmd := exec.Command("go", cmdArgs...)
+	cmd.Dir = tmpDir
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return nil, err
+	}
+	return run(filepath.Join(tmpDir, progBinary))
+}
+
+func Reflect(importPath string, symbols []string) (*model.Package, error) {
+	// TODO: sanity check arguments
+
+	if *execOnly != "" {
+		return run(*execOnly)
+	}
+
+	program, err := writeProgram(importPath, symbols)
+	if err != nil {
+		return nil, err
+	}
+
+	if *progOnly {
+		os.Stdout.Write(program)
+		os.Exit(0)
+	}
+
+	wd, _ := os.Getwd()
+
+	// Try to run the program in the same directory as the input package.
+	if p, err := build.Import(importPath, wd, build.FindOnly); err == nil {
+		dir := p.Dir
+		if p, err := runInDir(program, dir); err == nil {
+			return p, nil
+		}
+	}
+
+	// Since that didn't work, try to run it in the current working directory.
+	if p, err := runInDir(program, wd); err == nil {
+		return p, nil
+	}
+	// Since that didn't work, try to run it in a standard temp directory.
+	return runInDir(program, "")
+}
+
 type reflectData struct {
 	ImportPath string
 	Symbols    []string
diff --git a/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/README.md b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/README.md
new file mode 100644
index 00000000..63955f6a
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/README.md
@@ -0,0 +1,36 @@
+Embedded interfaces in `aux_files` generate `unknown embedded interface XXX` errors.
+See below for example of the problem:
+```
+// source
+import (
+    alias "some.org/package/imported"
+)
+
+type Source interface {
+    alias.Foreign
+}
+```
+
+```
+// some.org/package/imported
+type Foreign interface {
+    Embedded
+}
+
+type Embedded interface {}
+```
+
+Attempting to generate a mock will result in an `unknown embedded interface Embedded`.
+The issue is that the `fileParser` stores `auxInterfaces` underneath the package name
+explicitly specified in the `aux_files` flag.
+
+In the `parseInterface` method, there is an incorrect assumption about an embedded interface
+always being in the source file.
+```
+case *ast.Ident:
+        // Embedded interface in this package.
+        ei := p.auxInterfaces[""][v.String()]
+        if ei == nil {
+                return nil, p.errorf(v.Pos(), "unknown embedded interface %s", v.String())
+        }
+```
diff --git a/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport.go b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport.go
new file mode 100644
index 00000000..618a7fd3
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport.go
@@ -0,0 +1,18 @@
+//go:generate mockgen -aux_files faux=faux/faux.go -destination bugreport_mock.go -package bugreport -source=bugreport.go Example
+
+package bugreport
+
+import (
+	"log"
+
+	"github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/faux"
+)
+
+// Source is an interface w/ an embedded foreign interface
+type Source interface {
+	faux.Foreign
+}
+
+func CallForeignMethod(s Source) {
+	log.Println(s.Method())
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport_mock.go b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport_mock.go
new file mode 100644
index 00000000..0feb02ab
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport_mock.go
@@ -0,0 +1,46 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: bugreport.go
+
+// Package bugreport is a generated GoMock package.
+package bugreport
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	faux "github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/faux"
+	reflect "reflect"
+)
+
+// MockSource is a mock of Source interface
+type MockSource struct {
+	ctrl     *gomock.Controller
+	recorder *MockSourceMockRecorder
+}
+
+// MockSourceMockRecorder is the mock recorder for MockSource
+type MockSourceMockRecorder struct {
+	mock *MockSource
+}
+
+// NewMockSource creates a new mock instance
+func NewMockSource(ctrl *gomock.Controller) *MockSource {
+	mock := &MockSource{ctrl: ctrl}
+	mock.recorder = &MockSourceMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockSource) EXPECT() *MockSourceMockRecorder {
+	return m.recorder
+}
+
+// Method mocks base method
+func (m *MockSource) Method() faux.Return {
+	ret := m.ctrl.Call(m, "Method")
+	ret0, _ := ret[0].(faux.Return)
+	return ret0
+}
+
+// Method indicates an expected call of Method
+func (mr *MockSourceMockRecorder) Method() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Method", reflect.TypeOf((*MockSource)(nil).Method))
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport_test.go b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport_test.go
new file mode 100644
index 00000000..acfca322
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/bugreport_test.go
@@ -0,0 +1,18 @@
+package bugreport
+
+import (
+	"testing"
+
+	"github.com/golang/mock/gomock"
+)
+
+// TestValidInterface assesses whether or not the generated mock is valid
+func TestValidInterface(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	s := NewMockSource(ctrl)
+	s.EXPECT().Method().Return("")
+
+	CallForeignMethod(s)
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/faux/faux.go b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/faux/faux.go
new file mode 100644
index 00000000..bafd034f
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/faux/faux.go
@@ -0,0 +1,10 @@
+package faux
+
+type Foreign interface {
+	Method() Return
+	Embedded
+}
+
+type Embedded interface{}
+
+type Return interface{}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/README.md b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/README.md
new file mode 100644
index 00000000..b16da215
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/README.md
@@ -0,0 +1,22 @@
+# Tests for custom package names
+
+This directory contains test for mockgen generating mocks when imported package
+name does not match import path suffix. For example, package with name "client"
+is located under import path "github.com/golang/mock/mockgen/tests/custom_package_name/client/v1".
+
+Prior to this patch:
+
+    $ go generate greeter/greeter.go
+    2018/03/05 22:44:52 Loading input failed: greeter.go:17:11: failed parsing returns: greeter.go:17:14: unknown package "client"
+    greeter/greeter.go:1: running "mockgen": exit status 1
+
+This can be fixed by manually providing `-imports` flag, like `-imports client=github.com/golang/mock/mockgen/tests/custom_package_name/client/v1`.
+But, mockgen should be able to automatically resolve package names in such situations.
+
+With this patch applied:
+
+    $ go generate greeter/greeter.go
+    $ echo $?
+    0
+
+Mockgen runs successfully, produced output is equal to [greeter_mock_test.go](greeter/greeter_mock_test.go) content.
diff --git a/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/client/v1/client.go b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/client/v1/client.go
new file mode 100644
index 00000000..fc799d9c
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/client/v1/client.go
@@ -0,0 +1,13 @@
+package client
+
+import "fmt"
+
+type Client struct{}
+
+func (c *Client) Greet(in GreetInput) string {
+	return fmt.Sprintf("Hello, %s!", in.Name)
+}
+
+type GreetInput struct {
+	Name string
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter.go b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter.go
new file mode 100644
index 00000000..8c2d2937
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter.go
@@ -0,0 +1,31 @@
+//go:generate mockgen -source greeter.go -destination greeter_mock_test.go -package greeter
+
+package greeter
+
+import (
+	// stdlib import
+	"fmt"
+
+	// non-matching import suffix and package name
+	"github.com/golang/mock/mockgen/tests/custom_package_name/client/v1"
+
+	//  matching import suffix and package name
+	"github.com/golang/mock/mockgen/tests/custom_package_name/validator"
+)
+
+type InputMaker interface {
+	MakeInput() client.GreetInput
+}
+
+type Greeter struct {
+	InputMaker InputMaker
+	Client     *client.Client
+}
+
+func (g *Greeter) Greet() (string, error) {
+	in := g.InputMaker.MakeInput()
+	if err := validator.Validate(in.Name); err != nil {
+		return "", fmt.Errorf("validation failed: %v", err)
+	}
+	return g.Client.Greet(in), nil
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter_mock_test.go b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter_mock_test.go
new file mode 100644
index 00000000..0bf0f46f
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter_mock_test.go
@@ -0,0 +1,46 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: greeter.go
+
+// Package greeter is a generated GoMock package.
+package greeter
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	v1 "github.com/golang/mock/mockgen/tests/custom_package_name/client/v1"
+	reflect "reflect"
+)
+
+// MockInputMaker is a mock of InputMaker interface
+type MockInputMaker struct {
+	ctrl     *gomock.Controller
+	recorder *MockInputMakerMockRecorder
+}
+
+// MockInputMakerMockRecorder is the mock recorder for MockInputMaker
+type MockInputMakerMockRecorder struct {
+	mock *MockInputMaker
+}
+
+// NewMockInputMaker creates a new mock instance
+func NewMockInputMaker(ctrl *gomock.Controller) *MockInputMaker {
+	mock := &MockInputMaker{ctrl: ctrl}
+	mock.recorder = &MockInputMakerMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockInputMaker) EXPECT() *MockInputMakerMockRecorder {
+	return m.recorder
+}
+
+// MakeInput mocks base method
+func (m *MockInputMaker) MakeInput() v1.GreetInput {
+	ret := m.ctrl.Call(m, "MakeInput")
+	ret0, _ := ret[0].(v1.GreetInput)
+	return ret0
+}
+
+// MakeInput indicates an expected call of MakeInput
+func (mr *MockInputMakerMockRecorder) MakeInput() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MakeInput", reflect.TypeOf((*MockInputMaker)(nil).MakeInput))
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter_test.go b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter_test.go
new file mode 100644
index 00000000..f056ec81
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/greeter/greeter_test.go
@@ -0,0 +1,37 @@
+package greeter
+
+import (
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	"github.com/golang/mock/mockgen/tests/custom_package_name/client/v1"
+)
+
+func TestGreeter_Greet(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	input := client.GreetInput{
+		Name: "Foo",
+	}
+
+	inputMaker := NewMockInputMaker(ctrl)
+	inputMaker.EXPECT().
+		MakeInput().
+		Return(input)
+
+	g := &Greeter{
+		InputMaker: inputMaker,
+		Client:     &client.Client{},
+	}
+
+	greeting, err := g.Greet()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	expected := "Hello, Foo!"
+	if greeting != expected {
+		t.Fatalf("Expected greeting to be %v but got %v", expected, greeting)
+	}
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/validator/validate.go b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/validator/validate.go
new file mode 100644
index 00000000..0617c4be
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/custom_package_name/validator/validate.go
@@ -0,0 +1,5 @@
+package validator
+
+func Validate(s string) error {
+	return nil
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/empty_interface/input.go b/vendor/github.com/golang/mock/mockgen/tests/empty_interface/input.go
new file mode 100644
index 00000000..bbcb3fc8
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/empty_interface/input.go
@@ -0,0 +1,4 @@
+//go:generate mockgen -package empty_interface -destination mock.go -source input.go
+package empty_interface
+
+type Empty interface{}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/empty_interface/mock.go b/vendor/github.com/golang/mock/mockgen/tests/empty_interface/mock.go
new file mode 100644
index 00000000..0fc5b0c7
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/empty_interface/mock.go
@@ -0,0 +1,32 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: input.go
+
+// Package empty_interface is a generated GoMock package.
+package empty_interface
+
+import (
+	gomock "github.com/golang/mock/gomock"
+)
+
+// MockEmpty is a mock of Empty interface
+type MockEmpty struct {
+	ctrl     *gomock.Controller
+	recorder *MockEmptyMockRecorder
+}
+
+// MockEmptyMockRecorder is the mock recorder for MockEmpty
+type MockEmptyMockRecorder struct {
+	mock *MockEmpty
+}
+
+// NewMockEmpty creates a new mock instance
+func NewMockEmpty(ctrl *gomock.Controller) *MockEmpty {
+	mock := &MockEmpty{ctrl: ctrl}
+	mock.recorder = &MockEmptyMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockEmpty) EXPECT() *MockEmptyMockRecorder {
+	return m.recorder
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/README.md b/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/README.md
new file mode 100644
index 00000000..ffb5f9f0
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/README.md
@@ -0,0 +1,26 @@
+The generated mock methods use some hardcoded variable/receiver names that can
+have conflicts with the argument names that are defined by the code for which
+the mock is generated when using the source generation method.
+
+Example:
+
+```go
+type Example interface {
+	Method(_m, _mr, m, mr int)
+}
+```
+
+```go
+// Method mocks base method
+func (_m *MockExample) Method(_m int, _mr int, m int, mr int) {
+	_m.ctrl.Call(_m, "Method", _m, _mr, m, mr)
+}
+```
+
+In the above example one of the interface method parameters is called `_m`
+but unfortunately the generated receiver name is also called `_m` so the
+mock code won't compile.
+
+The generator has to make sure that generated identifiers (e.g.: the receiver
+names) are always different from the arg names that might come from external
+sources.
diff --git a/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport.go b/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport.go
new file mode 100644
index 00000000..77af43de
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport.go
@@ -0,0 +1,16 @@
+//go:generate mockgen -destination bugreport_mock.go -package bugreport -source=bugreport.go
+
+package bugreport
+
+type Example interface {
+	// _m and _mr were used by the buggy code: the '_' prefix was there hoping
+	// that no one will use method argument names starting with '_' reducing
+	// the chance of collision with generated identifiers.
+	// m and mr are used by the bugfixed new code, the '_' prefix has been
+	// removed because the new code generator changes the names of the
+	// generated identifiers in case they would collide with identifiers
+	// coming from argument names.
+	Method(_m, _mr, m, mr int)
+
+	VarargMethod(_s, _x, a, ret int, varargs ...int)
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport_mock.go b/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport_mock.go
new file mode 100644
index 00000000..114f967c
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport_mock.go
@@ -0,0 +1,58 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: bugreport.go
+
+// Package bugreport is a generated GoMock package.
+package bugreport
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
+)
+
+// MockExample is a mock of Example interface
+type MockExample struct {
+	ctrl     *gomock.Controller
+	recorder *MockExampleMockRecorder
+}
+
+// MockExampleMockRecorder is the mock recorder for MockExample
+type MockExampleMockRecorder struct {
+	mock *MockExample
+}
+
+// NewMockExample creates a new mock instance
+func NewMockExample(ctrl *gomock.Controller) *MockExample {
+	mock := &MockExample{ctrl: ctrl}
+	mock.recorder = &MockExampleMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockExample) EXPECT() *MockExampleMockRecorder {
+	return m.recorder
+}
+
+// Method mocks base method
+func (m_2 *MockExample) Method(_m, _mr, m, mr int) {
+	m_2.ctrl.Call(m_2, "Method", _m, _mr, m, mr)
+}
+
+// Method indicates an expected call of Method
+func (mr_2 *MockExampleMockRecorder) Method(_m, _mr, m, mr interface{}) *gomock.Call {
+	return mr_2.mock.ctrl.RecordCallWithMethodType(mr_2.mock, "Method", reflect.TypeOf((*MockExample)(nil).Method), _m, _mr, m, mr)
+}
+
+// VarargMethod mocks base method
+func (m *MockExample) VarargMethod(_s, _x, a, ret int, varargs ...int) {
+	varargs_2 := []interface{}{_s, _x, a, ret}
+	for _, a_2 := range varargs {
+		varargs_2 = append(varargs_2, a_2)
+	}
+	m.ctrl.Call(m, "VarargMethod", varargs_2...)
+}
+
+// VarargMethod indicates an expected call of VarargMethod
+func (mr *MockExampleMockRecorder) VarargMethod(_s, _x, a, ret interface{}, varargs ...interface{}) *gomock.Call {
+	varargs_2 := append([]interface{}{_s, _x, a, ret}, varargs...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VarargMethod", reflect.TypeOf((*MockExample)(nil).VarargMethod), varargs_2...)
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport_test.go b/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport_test.go
new file mode 100644
index 00000000..3ca9807d
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/generated_identifier_conflict/bugreport_test.go
@@ -0,0 +1,26 @@
+package bugreport
+
+import (
+	"github.com/golang/mock/gomock"
+	"testing"
+)
+
+func TestExample_Method(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	m := NewMockExample(ctrl)
+	m.EXPECT().Method(1, 2, 3, 4)
+
+	m.Method(1, 2, 3, 4)
+
+	ctrl.Finish()
+}
+
+func TestExample_VarargMethod(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	m := NewMockExample(ctrl)
+	m.EXPECT().VarargMethod(1, 2, 3, 4, 6, 7)
+
+	m.VarargMethod(1, 2, 3, 4, 6, 7)
+
+	ctrl.Finish()
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/import_source/Readme.md b/vendor/github.com/golang/mock/mockgen/tests/import_source/Readme.md
new file mode 100644
index 00000000..b755968d
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/import_source/Readme.md
@@ -0,0 +1,3 @@
+Test the case where the generated code uses a type defined in the source package (in source mode). There are two test cases:
+- the output is in a new package
+- the output is in the same package as the input
\ No newline at end of file
diff --git a/vendor/github.com/golang/mock/mockgen/tests/import_source/definition/source.go b/vendor/github.com/golang/mock/mockgen/tests/import_source/definition/source.go
new file mode 100644
index 00000000..493134de
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/import_source/definition/source.go
@@ -0,0 +1,9 @@
+//go:generate mockgen -destination ../source_mock.go -source=source.go
+//go:generate mockgen -package source -destination source_mock.go -source=source.go
+package source
+
+type X struct{}
+
+type S interface {
+	F(X)
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/import_source/definition/source_mock.go b/vendor/github.com/golang/mock/mockgen/tests/import_source/definition/source_mock.go
new file mode 100644
index 00000000..e8c99966
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/import_source/definition/source_mock.go
@@ -0,0 +1,43 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: source.go
+
+// Package source is a generated GoMock package.
+package source
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
+)
+
+// MockS is a mock of S interface
+type MockS struct {
+	ctrl     *gomock.Controller
+	recorder *MockSMockRecorder
+}
+
+// MockSMockRecorder is the mock recorder for MockS
+type MockSMockRecorder struct {
+	mock *MockS
+}
+
+// NewMockS creates a new mock instance
+func NewMockS(ctrl *gomock.Controller) *MockS {
+	mock := &MockS{ctrl: ctrl}
+	mock.recorder = &MockSMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockS) EXPECT() *MockSMockRecorder {
+	return m.recorder
+}
+
+// F mocks base method
+func (m *MockS) F(arg0 X) {
+	m.ctrl.Call(m, "F", arg0)
+}
+
+// F indicates an expected call of F
+func (mr *MockSMockRecorder) F(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "F", reflect.TypeOf((*MockS)(nil).F), arg0)
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/import_source/source_mock.go b/vendor/github.com/golang/mock/mockgen/tests/import_source/source_mock.go
new file mode 100644
index 00000000..6789ba3a
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/import_source/source_mock.go
@@ -0,0 +1,44 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: source.go
+
+// Package mock_source is a generated GoMock package.
+package mock_source
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	definition "github.com/golang/mock/mockgen/tests/import_source/definition"
+	reflect "reflect"
+)
+
+// MockS is a mock of S interface
+type MockS struct {
+	ctrl     *gomock.Controller
+	recorder *MockSMockRecorder
+}
+
+// MockSMockRecorder is the mock recorder for MockS
+type MockSMockRecorder struct {
+	mock *MockS
+}
+
+// NewMockS creates a new mock instance
+func NewMockS(ctrl *gomock.Controller) *MockS {
+	mock := &MockS{ctrl: ctrl}
+	mock.recorder = &MockSMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockS) EXPECT() *MockSMockRecorder {
+	return m.recorder
+}
+
+// F mocks base method
+func (m *MockS) F(arg0 definition.X) {
+	m.ctrl.Call(m, "F", arg0)
+}
+
+// F indicates an expected call of F
+func (mr *MockSMockRecorder) F(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "F", reflect.TypeOf((*MockS)(nil).F), arg0)
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/generate.go b/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/generate.go
new file mode 100644
index 00000000..541ed647
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/generate.go
@@ -0,0 +1,3 @@
+//go:generate mockgen -destination subdir/internal/pkg/reflect_output/mock.go github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg Intf
+//go:generate mockgen -source subdir/internal/pkg/input.go -destination subdir/internal/pkg/source_output/mock.go
+package test
diff --git a/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/input.go b/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/input.go
new file mode 100644
index 00000000..d05f6a7f
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/input.go
@@ -0,0 +1,9 @@
+package pkg
+
+type Arg interface {
+	Foo() int
+}
+
+type Intf interface {
+	F() Arg
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go b/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go
new file mode 100644
index 00000000..47ccf0c5
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go
@@ -0,0 +1,46 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg (interfaces: Intf)
+
+// Package mock_pkg is a generated GoMock package.
+package mock_pkg
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	pkg "github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg"
+	reflect "reflect"
+)
+
+// MockIntf is a mock of Intf interface
+type MockIntf struct {
+	ctrl     *gomock.Controller
+	recorder *MockIntfMockRecorder
+}
+
+// MockIntfMockRecorder is the mock recorder for MockIntf
+type MockIntfMockRecorder struct {
+	mock *MockIntf
+}
+
+// NewMockIntf creates a new mock instance
+func NewMockIntf(ctrl *gomock.Controller) *MockIntf {
+	mock := &MockIntf{ctrl: ctrl}
+	mock.recorder = &MockIntfMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockIntf) EXPECT() *MockIntfMockRecorder {
+	return m.recorder
+}
+
+// F mocks base method
+func (m *MockIntf) F() pkg.Arg {
+	ret := m.ctrl.Call(m, "F")
+	ret0, _ := ret[0].(pkg.Arg)
+	return ret0
+}
+
+// F indicates an expected call of F
+func (mr *MockIntfMockRecorder) F() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "F", reflect.TypeOf((*MockIntf)(nil).F))
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go b/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go
new file mode 100644
index 00000000..32595ab1
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go
@@ -0,0 +1,81 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: subdir/internal/pkg/input.go
+
+// Package mock_pkg is a generated GoMock package.
+package mock_pkg
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	pkg "github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg"
+	reflect "reflect"
+)
+
+// MockArg is a mock of Arg interface
+type MockArg struct {
+	ctrl     *gomock.Controller
+	recorder *MockArgMockRecorder
+}
+
+// MockArgMockRecorder is the mock recorder for MockArg
+type MockArgMockRecorder struct {
+	mock *MockArg
+}
+
+// NewMockArg creates a new mock instance
+func NewMockArg(ctrl *gomock.Controller) *MockArg {
+	mock := &MockArg{ctrl: ctrl}
+	mock.recorder = &MockArgMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockArg) EXPECT() *MockArgMockRecorder {
+	return m.recorder
+}
+
+// Foo mocks base method
+func (m *MockArg) Foo() int {
+	ret := m.ctrl.Call(m, "Foo")
+	ret0, _ := ret[0].(int)
+	return ret0
+}
+
+// Foo indicates an expected call of Foo
+func (mr *MockArgMockRecorder) Foo() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Foo", reflect.TypeOf((*MockArg)(nil).Foo))
+}
+
+// MockIntf is a mock of Intf interface
+type MockIntf struct {
+	ctrl     *gomock.Controller
+	recorder *MockIntfMockRecorder
+}
+
+// MockIntfMockRecorder is the mock recorder for MockIntf
+type MockIntfMockRecorder struct {
+	mock *MockIntf
+}
+
+// NewMockIntf creates a new mock instance
+func NewMockIntf(ctrl *gomock.Controller) *MockIntf {
+	mock := &MockIntf{ctrl: ctrl}
+	mock.recorder = &MockIntfMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockIntf) EXPECT() *MockIntfMockRecorder {
+	return m.recorder
+}
+
+// F mocks base method
+func (m *MockIntf) F() pkg.Arg {
+	ret := m.ctrl.Call(m, "F")
+	ret0, _ := ret[0].(pkg.Arg)
+	return ret0
+}
+
+// F indicates an expected call of F
+func (mr *MockIntfMockRecorder) F() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "F", reflect.TypeOf((*MockIntf)(nil).F))
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/unexported_method/bugreport_mock.go b/vendor/github.com/golang/mock/mockgen/tests/unexported_method/bugreport_mock.go
index f1a16d81..8ba218fc 100644
--- a/vendor/github.com/golang/mock/mockgen/tests/unexported_method/bugreport_mock.go
+++ b/vendor/github.com/golang/mock/mockgen/tests/unexported_method/bugreport_mock.go
@@ -1,6 +1,7 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: bugreport.go
 
+// Package bugreport is a generated GoMock package.
 package bugreport
 
 import (
@@ -27,18 +28,18 @@ func NewMockExample(ctrl *gomock.Controller) *MockExample {
 }
 
 // EXPECT returns an object that allows the caller to indicate expected use
-func (_m *MockExample) EXPECT() *MockExampleMockRecorder {
-	return _m.recorder
+func (m *MockExample) EXPECT() *MockExampleMockRecorder {
+	return m.recorder
 }
 
 // someMethod mocks base method
-func (_m *MockExample) someMethod(_param0 string) string {
-	ret := _m.ctrl.Call(_m, "someMethod", _param0)
+func (m *MockExample) someMethod(arg0 string) string {
+	ret := m.ctrl.Call(m, "someMethod", arg0)
 	ret0, _ := ret[0].(string)
 	return ret0
 }
 
 // someMethod indicates an expected call of someMethod
-func (_mr *MockExampleMockRecorder) someMethod(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "someMethod", reflect.TypeOf((*MockExample)(nil).someMethod), arg0)
+func (mr *MockExampleMockRecorder) someMethod(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "someMethod", reflect.TypeOf((*MockExample)(nil).someMethod), arg0)
 }
diff --git a/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/README.md b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/README.md
new file mode 100644
index 00000000..9f9217d2
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/README.md
@@ -0,0 +1,2 @@
+Test for [Issue#4](https://github.com/golang/mock/issues/4).
+Also see discussion on [#28](https://github.com/golang/mock/pull/28).
diff --git a/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/doc.go b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/doc.go
new file mode 100644
index 00000000..e751826d
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/doc.go
@@ -0,0 +1,4 @@
+package vendor_dep
+
+//go:generate mockgen -package vendor_dep -destination mock.go github.com/golang/mock/mockgen/tests/vendor_dep VendorsDep
+//go:generate mockgen -destination source_mock_package/mock.go -source=vendor_dep.go
diff --git a/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/mock.go b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/mock.go
new file mode 100644
index 00000000..aace06e6
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/mock.go
@@ -0,0 +1,46 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/golang/mock/mockgen/tests/vendor_dep (interfaces: VendorsDep)
+
+// Package vendor_dep is a generated GoMock package.
+package vendor_dep
+
+import (
+	a "a"
+	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
+)
+
+// MockVendorsDep is a mock of VendorsDep interface
+type MockVendorsDep struct {
+	ctrl     *gomock.Controller
+	recorder *MockVendorsDepMockRecorder
+}
+
+// MockVendorsDepMockRecorder is the mock recorder for MockVendorsDep
+type MockVendorsDepMockRecorder struct {
+	mock *MockVendorsDep
+}
+
+// NewMockVendorsDep creates a new mock instance
+func NewMockVendorsDep(ctrl *gomock.Controller) *MockVendorsDep {
+	mock := &MockVendorsDep{ctrl: ctrl}
+	mock.recorder = &MockVendorsDepMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockVendorsDep) EXPECT() *MockVendorsDepMockRecorder {
+	return m.recorder
+}
+
+// Foo mocks base method
+func (m *MockVendorsDep) Foo() a.Ifc {
+	ret := m.ctrl.Call(m, "Foo")
+	ret0, _ := ret[0].(a.Ifc)
+	return ret0
+}
+
+// Foo indicates an expected call of Foo
+func (mr *MockVendorsDepMockRecorder) Foo() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Foo", reflect.TypeOf((*MockVendorsDep)(nil).Foo))
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/source_mock_package/mock.go b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/source_mock_package/mock.go
new file mode 100644
index 00000000..b4732592
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/source_mock_package/mock.go
@@ -0,0 +1,46 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: vendor_dep.go
+
+// Package mock_vendor_dep is a generated GoMock package.
+package mock_vendor_dep
+
+import (
+	a "a"
+	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
+)
+
+// MockVendorsDep is a mock of VendorsDep interface
+type MockVendorsDep struct {
+	ctrl     *gomock.Controller
+	recorder *MockVendorsDepMockRecorder
+}
+
+// MockVendorsDepMockRecorder is the mock recorder for MockVendorsDep
+type MockVendorsDepMockRecorder struct {
+	mock *MockVendorsDep
+}
+
+// NewMockVendorsDep creates a new mock instance
+func NewMockVendorsDep(ctrl *gomock.Controller) *MockVendorsDep {
+	mock := &MockVendorsDep{ctrl: ctrl}
+	mock.recorder = &MockVendorsDepMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockVendorsDep) EXPECT() *MockVendorsDepMockRecorder {
+	return m.recorder
+}
+
+// Foo mocks base method
+func (m *MockVendorsDep) Foo() a.Ifc {
+	ret := m.ctrl.Call(m, "Foo")
+	ret0, _ := ret[0].(a.Ifc)
+	return ret0
+}
+
+// Foo indicates an expected call of Foo
+func (mr *MockVendorsDepMockRecorder) Foo() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Foo", reflect.TypeOf((*MockVendorsDep)(nil).Foo))
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/vendor_dep.go b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/vendor_dep.go
new file mode 100644
index 00000000..412636a2
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/vendor_dep/vendor_dep.go
@@ -0,0 +1,7 @@
+package vendor_dep
+
+import "a"
+
+type VendorsDep interface {
+	Foo() a.Ifc
+}
diff --git a/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/README.md b/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/README.md
new file mode 100644
index 00000000..1233f98c
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/README.md
@@ -0,0 +1 @@
+Test for [Issue#4](https://github.com/golang/mock/issues/4).
diff --git a/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/doc.go b/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/doc.go
new file mode 100644
index 00000000..b5bde11c
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/doc.go
@@ -0,0 +1,3 @@
+package vendor_pkg
+
+//go:generate mockgen -destination mock.go -package vendor_pkg a Ifc
diff --git a/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/mock.go b/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/mock.go
new file mode 100644
index 00000000..e5e78e51
--- /dev/null
+++ b/vendor/github.com/golang/mock/mockgen/tests/vendor_pkg/mock.go
@@ -0,0 +1,99 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: a (interfaces: Ifc)
+
+// Package vendor_pkg is a generated GoMock package.
+package vendor_pkg
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
+)
+
+// MockIfc is a mock of Ifc interface
+type MockIfc struct {
+	ctrl     *gomock.Controller
+	recorder *MockIfcMockRecorder
+}
+
+// MockIfcMockRecorder is the mock recorder for MockIfc
+type MockIfcMockRecorder struct {
+	mock *MockIfc
+}
+
+// NewMockIfc creates a new mock instance
+func NewMockIfc(ctrl *gomock.Controller) *MockIfc {
+	mock := &MockIfc{ctrl: ctrl}
+	mock.recorder = &MockIfcMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockIfc) EXPECT() *MockIfcMockRecorder {
+	return m.recorder
+}
+
+// A mocks base method
+func (m *MockIfc) A(arg0 string) string {
+	ret := m.ctrl.Call(m, "A", arg0)
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// A indicates an expected call of A
+func (mr *MockIfcMockRecorder) A(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "A", reflect.TypeOf((*MockIfc)(nil).A), arg0)
+}
+
+// B mocks base method
+func (m *MockIfc) B(arg0 int) int {
+	ret := m.ctrl.Call(m, "B", arg0)
+	ret0, _ := ret[0].(int)
+	return ret0
+}
+
+// B indicates an expected call of B
+func (mr *MockIfcMockRecorder) B(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "B", reflect.TypeOf((*MockIfc)(nil).B), arg0)
+}
+
+// C mocks base method
+func (m *MockIfc) C(arg0 chan int) chan int {
+	ret := m.ctrl.Call(m, "C", arg0)
+	ret0, _ := ret[0].(chan int)
+	return ret0
+}
+
+// C indicates an expected call of C
+func (mr *MockIfcMockRecorder) C(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "C", reflect.TypeOf((*MockIfc)(nil).C), arg0)
+}
+
+// D mocks base method
+func (m *MockIfc) D(arg0 interface{}) {
+	m.ctrl.Call(m, "D", arg0)
+}
+
+// D indicates an expected call of D
+func (mr *MockIfcMockRecorder) D(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "D", reflect.TypeOf((*MockIfc)(nil).D), arg0)
+}
+
+// E mocks base method
+func (m *MockIfc) E(arg0 map[string]interface{}) {
+	m.ctrl.Call(m, "E", arg0)
+}
+
+// E indicates an expected call of E
+func (mr *MockIfcMockRecorder) E(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "E", reflect.TypeOf((*MockIfc)(nil).E), arg0)
+}
+
+// F mocks base method
+func (m *MockIfc) F(arg0 []float64) {
+	m.ctrl.Call(m, "F", arg0)
+}
+
+// F indicates an expected call of F
+func (mr *MockIfcMockRecorder) F(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "F", reflect.TypeOf((*MockIfc)(nil).F), arg0)
+}
diff --git a/vendor/github.com/golang/mock/sample/concurrent/concurrent.go b/vendor/github.com/golang/mock/sample/concurrent/concurrent.go
new file mode 100644
index 00000000..346cee42
--- /dev/null
+++ b/vendor/github.com/golang/mock/sample/concurrent/concurrent.go
@@ -0,0 +1,8 @@
+//go:generate mockgen -destination mock/concurrent_mock.go github.com/golang/mock/sample/concurrent Math
+
+// Package concurrent demonstrates how to use gomock with goroutines.
+package concurrent
+
+type Math interface {
+	Sum(a, b int) int
+}
diff --git a/vendor/github.com/golang/mock/sample/concurrent/concurrent_test.go b/vendor/github.com/golang/mock/sample/concurrent/concurrent_test.go
new file mode 100644
index 00000000..e4b271ea
--- /dev/null
+++ b/vendor/github.com/golang/mock/sample/concurrent/concurrent_test.go
@@ -0,0 +1,46 @@
+package concurrent
+
+import (
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	"golang.org/x/net/context"
+
+	mock "github.com/golang/mock/sample/concurrent/mock"
+)
+
+func call(ctx context.Context, m Math) (int, error) {
+	result := make(chan int)
+	go func() {
+		result <- m.Sum(1, 2)
+		close(result)
+	}()
+	select {
+	case r := <-result:
+		return r, nil
+	case <-ctx.Done():
+		return 0, ctx.Err()
+	}
+}
+
+// testConcurrentFails is expected to fail (and is disabled). It
+// demonstrates how to use gomock.WithContext to interrupt the test
+// from a different goroutine.
+func testConcurrentFails(t *testing.T) {
+	ctrl, ctx := gomock.WithContext(context.Background(), t)
+	defer ctrl.Finish()
+	m := mock.NewMockMath(ctrl)
+	if _, err := call(ctx, m); err != nil {
+		t.Error("call failed:", err)
+	}
+}
+
+func TestConcurrentWorks(t *testing.T) {
+	ctrl, ctx := gomock.WithContext(context.Background(), t)
+	defer ctrl.Finish()
+	m := mock.NewMockMath(ctrl)
+	m.EXPECT().Sum(1, 2).Return(3)
+	if _, err := call(ctx, m); err != nil {
+		t.Error("call failed:", err)
+	}
+}
diff --git a/vendor/github.com/golang/mock/sample/concurrent/mock/concurrent_mock.go b/vendor/github.com/golang/mock/sample/concurrent/mock/concurrent_mock.go
new file mode 100644
index 00000000..92005631
--- /dev/null
+++ b/vendor/github.com/golang/mock/sample/concurrent/mock/concurrent_mock.go
@@ -0,0 +1,45 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/golang/mock/sample/concurrent (interfaces: Math)
+
+// Package mock_concurrent is a generated GoMock package.
+package mock_concurrent
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
+)
+
+// MockMath is a mock of Math interface
+type MockMath struct {
+	ctrl     *gomock.Controller
+	recorder *MockMathMockRecorder
+}
+
+// MockMathMockRecorder is the mock recorder for MockMath
+type MockMathMockRecorder struct {
+	mock *MockMath
+}
+
+// NewMockMath creates a new mock instance
+func NewMockMath(ctrl *gomock.Controller) *MockMath {
+	mock := &MockMath{ctrl: ctrl}
+	mock.recorder = &MockMathMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockMath) EXPECT() *MockMathMockRecorder {
+	return m.recorder
+}
+
+// Sum mocks base method
+func (m *MockMath) Sum(arg0, arg1 int) int {
+	ret := m.ctrl.Call(m, "Sum", arg0, arg1)
+	ret0, _ := ret[0].(int)
+	return ret0
+}
+
+// Sum indicates an expected call of Sum
+func (mr *MockMathMockRecorder) Sum(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sum", reflect.TypeOf((*MockMath)(nil).Sum), arg0, arg1)
+}
diff --git a/vendor/github.com/golang/mock/sample/mock_user/mock_user.go b/vendor/github.com/golang/mock/sample/mock_user/mock_user.go
index 59602ef6..13b74b32 100644
--- a/vendor/github.com/golang/mock/sample/mock_user/mock_user.go
+++ b/vendor/github.com/golang/mock/sample/mock_user/mock_user.go
@@ -1,6 +1,7 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/golang/mock/sample (interfaces: Index,Embed,Embedded)
 
+// Package mock_sample is a generated GoMock package.
 package mock_sample
 
 import (
@@ -38,250 +39,250 @@ func NewMockIndex(ctrl *gomock.Controller) *MockIndex {
 }
 
 // EXPECT returns an object that allows the caller to indicate expected use
-func (_m *MockIndex) EXPECT() *MockIndexMockRecorder {
-	return _m.recorder
+func (m *MockIndex) EXPECT() *MockIndexMockRecorder {
+	return m.recorder
 }
 
 // Anon mocks base method
-func (_m *MockIndex) Anon(_param0 string) {
-	_m.ctrl.Call(_m, "Anon", _param0)
+func (m *MockIndex) Anon(arg0 string) {
+	m.ctrl.Call(m, "Anon", arg0)
 }
 
 // Anon indicates an expected call of Anon
-func (_mr *MockIndexMockRecorder) Anon(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Anon", reflect.TypeOf((*MockIndex)(nil).Anon), arg0)
+func (mr *MockIndexMockRecorder) Anon(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Anon", reflect.TypeOf((*MockIndex)(nil).Anon), arg0)
 }
 
 // Chan mocks base method
-func (_m *MockIndex) Chan(_param0 chan int, _param1 chan<- hash.Hash) {
-	_m.ctrl.Call(_m, "Chan", _param0, _param1)
+func (m *MockIndex) Chan(arg0 chan int, arg1 chan<- hash.Hash) {
+	m.ctrl.Call(m, "Chan", arg0, arg1)
 }
 
 // Chan indicates an expected call of Chan
-func (_mr *MockIndexMockRecorder) Chan(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Chan", reflect.TypeOf((*MockIndex)(nil).Chan), arg0, arg1)
+func (mr *MockIndexMockRecorder) Chan(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Chan", reflect.TypeOf((*MockIndex)(nil).Chan), arg0, arg1)
 }
 
 // ConcreteRet mocks base method
-func (_m *MockIndex) ConcreteRet() chan<- bool {
-	ret := _m.ctrl.Call(_m, "ConcreteRet")
+func (m *MockIndex) ConcreteRet() chan<- bool {
+	ret := m.ctrl.Call(m, "ConcreteRet")
 	ret0, _ := ret[0].(chan<- bool)
 	return ret0
 }
 
 // ConcreteRet indicates an expected call of ConcreteRet
-func (_mr *MockIndexMockRecorder) ConcreteRet() *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ConcreteRet", reflect.TypeOf((*MockIndex)(nil).ConcreteRet))
+func (mr *MockIndexMockRecorder) ConcreteRet() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConcreteRet", reflect.TypeOf((*MockIndex)(nil).ConcreteRet))
 }
 
 // Ellip mocks base method
-func (_m *MockIndex) Ellip(_param0 string, _param1 ...interface{}) {
-	_s := []interface{}{_param0}
-	for _, _x := range _param1 {
-		_s = append(_s, _x)
+func (m *MockIndex) Ellip(arg0 string, arg1 ...interface{}) {
+	varargs := []interface{}{arg0}
+	for _, a := range arg1 {
+		varargs = append(varargs, a)
 	}
-	_m.ctrl.Call(_m, "Ellip", _s...)
+	m.ctrl.Call(m, "Ellip", varargs...)
 }
 
 // Ellip indicates an expected call of Ellip
-func (_mr *MockIndexMockRecorder) Ellip(arg0 interface{}, arg1 ...interface{}) *gomock.Call {
-	_s := append([]interface{}{arg0}, arg1...)
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Ellip", reflect.TypeOf((*MockIndex)(nil).Ellip), _s...)
+func (mr *MockIndexMockRecorder) Ellip(arg0 interface{}, arg1 ...interface{}) *gomock.Call {
+	varargs := append([]interface{}{arg0}, arg1...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ellip", reflect.TypeOf((*MockIndex)(nil).Ellip), varargs...)
 }
 
 // EllipOnly mocks base method
-func (_m *MockIndex) EllipOnly(_param0 ...string) {
-	_s := []interface{}{}
-	for _, _x := range _param0 {
-		_s = append(_s, _x)
+func (m *MockIndex) EllipOnly(arg0 ...string) {
+	varargs := []interface{}{}
+	for _, a := range arg0 {
+		varargs = append(varargs, a)
 	}
-	_m.ctrl.Call(_m, "EllipOnly", _s...)
+	m.ctrl.Call(m, "EllipOnly", varargs...)
 }
 
 // EllipOnly indicates an expected call of EllipOnly
-func (_mr *MockIndexMockRecorder) EllipOnly(arg0 ...interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "EllipOnly", reflect.TypeOf((*MockIndex)(nil).EllipOnly), arg0...)
+func (mr *MockIndexMockRecorder) EllipOnly(arg0 ...interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EllipOnly", reflect.TypeOf((*MockIndex)(nil).EllipOnly), arg0...)
 }
 
 // ForeignFour mocks base method
-func (_m *MockIndex) ForeignFour(_param0 imp4.Imp4) {
-	_m.ctrl.Call(_m, "ForeignFour", _param0)
+func (m *MockIndex) ForeignFour(arg0 imp4.Imp4) {
+	m.ctrl.Call(m, "ForeignFour", arg0)
 }
 
 // ForeignFour indicates an expected call of ForeignFour
-func (_mr *MockIndexMockRecorder) ForeignFour(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ForeignFour", reflect.TypeOf((*MockIndex)(nil).ForeignFour), arg0)
+func (mr *MockIndexMockRecorder) ForeignFour(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ForeignFour", reflect.TypeOf((*MockIndex)(nil).ForeignFour), arg0)
 }
 
 // ForeignOne mocks base method
-func (_m *MockIndex) ForeignOne(_param0 imp1.Imp1) {
-	_m.ctrl.Call(_m, "ForeignOne", _param0)
+func (m *MockIndex) ForeignOne(arg0 imp1.Imp1) {
+	m.ctrl.Call(m, "ForeignOne", arg0)
 }
 
 // ForeignOne indicates an expected call of ForeignOne
-func (_mr *MockIndexMockRecorder) ForeignOne(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ForeignOne", reflect.TypeOf((*MockIndex)(nil).ForeignOne), arg0)
+func (mr *MockIndexMockRecorder) ForeignOne(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ForeignOne", reflect.TypeOf((*MockIndex)(nil).ForeignOne), arg0)
 }
 
 // ForeignThree mocks base method
-func (_m *MockIndex) ForeignThree(_param0 imp3.Imp3) {
-	_m.ctrl.Call(_m, "ForeignThree", _param0)
+func (m *MockIndex) ForeignThree(arg0 imp3.Imp3) {
+	m.ctrl.Call(m, "ForeignThree", arg0)
 }
 
 // ForeignThree indicates an expected call of ForeignThree
-func (_mr *MockIndexMockRecorder) ForeignThree(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ForeignThree", reflect.TypeOf((*MockIndex)(nil).ForeignThree), arg0)
+func (mr *MockIndexMockRecorder) ForeignThree(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ForeignThree", reflect.TypeOf((*MockIndex)(nil).ForeignThree), arg0)
 }
 
 // ForeignTwo mocks base method
-func (_m *MockIndex) ForeignTwo(_param0 imp2.Imp2) {
-	_m.ctrl.Call(_m, "ForeignTwo", _param0)
+func (m *MockIndex) ForeignTwo(arg0 imp2.Imp2) {
+	m.ctrl.Call(m, "ForeignTwo", arg0)
 }
 
 // ForeignTwo indicates an expected call of ForeignTwo
-func (_mr *MockIndexMockRecorder) ForeignTwo(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ForeignTwo", reflect.TypeOf((*MockIndex)(nil).ForeignTwo), arg0)
+func (mr *MockIndexMockRecorder) ForeignTwo(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ForeignTwo", reflect.TypeOf((*MockIndex)(nil).ForeignTwo), arg0)
 }
 
 // Func mocks base method
-func (_m *MockIndex) Func(_param0 func(http.Request) (int, bool)) {
-	_m.ctrl.Call(_m, "Func", _param0)
+func (m *MockIndex) Func(arg0 func(http.Request) (int, bool)) {
+	m.ctrl.Call(m, "Func", arg0)
 }
 
 // Func indicates an expected call of Func
-func (_mr *MockIndexMockRecorder) Func(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Func", reflect.TypeOf((*MockIndex)(nil).Func), arg0)
+func (mr *MockIndexMockRecorder) Func(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Func", reflect.TypeOf((*MockIndex)(nil).Func), arg0)
 }
 
 // Get mocks base method
-func (_m *MockIndex) Get(_param0 string) interface{} {
-	ret := _m.ctrl.Call(_m, "Get", _param0)
+func (m *MockIndex) Get(arg0 string) interface{} {
+	ret := m.ctrl.Call(m, "Get", arg0)
 	ret0, _ := ret[0].(interface{})
 	return ret0
 }
 
 // Get indicates an expected call of Get
-func (_mr *MockIndexMockRecorder) Get(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Get", reflect.TypeOf((*MockIndex)(nil).Get), arg0)
+func (mr *MockIndexMockRecorder) Get(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockIndex)(nil).Get), arg0)
 }
 
 // GetTwo mocks base method
-func (_m *MockIndex) GetTwo(_param0 string, _param1 string) (interface{}, interface{}) {
-	ret := _m.ctrl.Call(_m, "GetTwo", _param0, _param1)
+func (m *MockIndex) GetTwo(arg0, arg1 string) (interface{}, interface{}) {
+	ret := m.ctrl.Call(m, "GetTwo", arg0, arg1)
 	ret0, _ := ret[0].(interface{})
 	ret1, _ := ret[1].(interface{})
 	return ret0, ret1
 }
 
 // GetTwo indicates an expected call of GetTwo
-func (_mr *MockIndexMockRecorder) GetTwo(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetTwo", reflect.TypeOf((*MockIndex)(nil).GetTwo), arg0, arg1)
+func (mr *MockIndexMockRecorder) GetTwo(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTwo", reflect.TypeOf((*MockIndex)(nil).GetTwo), arg0, arg1)
 }
 
 // Map mocks base method
-func (_m *MockIndex) Map(_param0 map[int]hash.Hash) {
-	_m.ctrl.Call(_m, "Map", _param0)
+func (m *MockIndex) Map(arg0 map[int]hash.Hash) {
+	m.ctrl.Call(m, "Map", arg0)
 }
 
 // Map indicates an expected call of Map
-func (_mr *MockIndexMockRecorder) Map(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Map", reflect.TypeOf((*MockIndex)(nil).Map), arg0)
+func (mr *MockIndexMockRecorder) Map(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Map", reflect.TypeOf((*MockIndex)(nil).Map), arg0)
 }
 
 // NillableRet mocks base method
-func (_m *MockIndex) NillableRet() error {
-	ret := _m.ctrl.Call(_m, "NillableRet")
+func (m *MockIndex) NillableRet() error {
+	ret := m.ctrl.Call(m, "NillableRet")
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
 // NillableRet indicates an expected call of NillableRet
-func (_mr *MockIndexMockRecorder) NillableRet() *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "NillableRet", reflect.TypeOf((*MockIndex)(nil).NillableRet))
+func (mr *MockIndexMockRecorder) NillableRet() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NillableRet", reflect.TypeOf((*MockIndex)(nil).NillableRet))
 }
 
 // Other mocks base method
-func (_m *MockIndex) Other() hash.Hash {
-	ret := _m.ctrl.Call(_m, "Other")
+func (m *MockIndex) Other() hash.Hash {
+	ret := m.ctrl.Call(m, "Other")
 	ret0, _ := ret[0].(hash.Hash)
 	return ret0
 }
 
 // Other indicates an expected call of Other
-func (_mr *MockIndexMockRecorder) Other() *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Other", reflect.TypeOf((*MockIndex)(nil).Other))
+func (mr *MockIndexMockRecorder) Other() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Other", reflect.TypeOf((*MockIndex)(nil).Other))
 }
 
 // Ptr mocks base method
-func (_m *MockIndex) Ptr(_param0 *int) {
-	_m.ctrl.Call(_m, "Ptr", _param0)
+func (m *MockIndex) Ptr(arg0 *int) {
+	m.ctrl.Call(m, "Ptr", arg0)
 }
 
 // Ptr indicates an expected call of Ptr
-func (_mr *MockIndexMockRecorder) Ptr(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Ptr", reflect.TypeOf((*MockIndex)(nil).Ptr), arg0)
+func (mr *MockIndexMockRecorder) Ptr(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ptr", reflect.TypeOf((*MockIndex)(nil).Ptr), arg0)
 }
 
 // Put mocks base method
-func (_m *MockIndex) Put(_param0 string, _param1 interface{}) {
-	_m.ctrl.Call(_m, "Put", _param0, _param1)
+func (m *MockIndex) Put(arg0 string, arg1 interface{}) {
+	m.ctrl.Call(m, "Put", arg0, arg1)
 }
 
 // Put indicates an expected call of Put
-func (_mr *MockIndexMockRecorder) Put(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Put", reflect.TypeOf((*MockIndex)(nil).Put), arg0, arg1)
+func (mr *MockIndexMockRecorder) Put(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Put", reflect.TypeOf((*MockIndex)(nil).Put), arg0, arg1)
 }
 
 // Slice mocks base method
-func (_m *MockIndex) Slice(_param0 []int, _param1 []byte) [3]int {
-	ret := _m.ctrl.Call(_m, "Slice", _param0, _param1)
+func (m *MockIndex) Slice(arg0 []int, arg1 []byte) [3]int {
+	ret := m.ctrl.Call(m, "Slice", arg0, arg1)
 	ret0, _ := ret[0].([3]int)
 	return ret0
 }
 
 // Slice indicates an expected call of Slice
-func (_mr *MockIndexMockRecorder) Slice(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Slice", reflect.TypeOf((*MockIndex)(nil).Slice), arg0, arg1)
+func (mr *MockIndexMockRecorder) Slice(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Slice", reflect.TypeOf((*MockIndex)(nil).Slice), arg0, arg1)
 }
 
 // Struct mocks base method
-func (_m *MockIndex) Struct(_param0 struct{}) {
-	_m.ctrl.Call(_m, "Struct", _param0)
+func (m *MockIndex) Struct(arg0 struct{}) {
+	m.ctrl.Call(m, "Struct", arg0)
 }
 
 // Struct indicates an expected call of Struct
-func (_mr *MockIndexMockRecorder) Struct(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Struct", reflect.TypeOf((*MockIndex)(nil).Struct), arg0)
+func (mr *MockIndexMockRecorder) Struct(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Struct", reflect.TypeOf((*MockIndex)(nil).Struct), arg0)
 }
 
 // StructChan mocks base method
-func (_m *MockIndex) StructChan(_param0 chan struct{}) {
-	_m.ctrl.Call(_m, "StructChan", _param0)
+func (m *MockIndex) StructChan(arg0 chan struct{}) {
+	m.ctrl.Call(m, "StructChan", arg0)
 }
 
 // StructChan indicates an expected call of StructChan
-func (_mr *MockIndexMockRecorder) StructChan(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "StructChan", reflect.TypeOf((*MockIndex)(nil).StructChan), arg0)
+func (mr *MockIndexMockRecorder) StructChan(arg0 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StructChan", reflect.TypeOf((*MockIndex)(nil).StructChan), arg0)
 }
 
 // Summary mocks base method
-func (_m *MockIndex) Summary(_param0 *bytes.Buffer, _param1 io.Writer) {
-	_m.ctrl.Call(_m, "Summary", _param0, _param1)
+func (m *MockIndex) Summary(arg0 *bytes.Buffer, arg1 io.Writer) {
+	m.ctrl.Call(m, "Summary", arg0, arg1)
 }
 
 // Summary indicates an expected call of Summary
-func (_mr *MockIndexMockRecorder) Summary(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Summary", reflect.TypeOf((*MockIndex)(nil).Summary), arg0, arg1)
+func (mr *MockIndexMockRecorder) Summary(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Summary", reflect.TypeOf((*MockIndex)(nil).Summary), arg0, arg1)
 }
 
 // Templates mocks base method
-func (_m *MockIndex) Templates(_param0 template.CSS, _param1 template0.FuncMap) {
-	_m.ctrl.Call(_m, "Templates", _param0, _param1)
+func (m *MockIndex) Templates(arg0 template.CSS, arg1 template0.FuncMap) {
+	m.ctrl.Call(m, "Templates", arg0, arg1)
 }
 
 // Templates indicates an expected call of Templates
-func (_mr *MockIndexMockRecorder) Templates(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "Templates", reflect.TypeOf((*MockIndex)(nil).Templates), arg0, arg1)
+func (mr *MockIndexMockRecorder) Templates(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Templates", reflect.TypeOf((*MockIndex)(nil).Templates), arg0, arg1)
 }
 
 // MockEmbed is a mock of Embed interface
@@ -303,50 +304,50 @@ func NewMockEmbed(ctrl *gomock.Controller) *MockEmbed {
 }
 
 // EXPECT returns an object that allows the caller to indicate expected use
-func (_m *MockEmbed) EXPECT() *MockEmbedMockRecorder {
-	return _m.recorder
+func (m *MockEmbed) EXPECT() *MockEmbedMockRecorder {
+	return m.recorder
 }
 
 // EmbeddedMethod mocks base method
-func (_m *MockEmbed) EmbeddedMethod() {
-	_m.ctrl.Call(_m, "EmbeddedMethod")
+func (m *MockEmbed) EmbeddedMethod() {
+	m.ctrl.Call(m, "EmbeddedMethod")
 }
 
 // EmbeddedMethod indicates an expected call of EmbeddedMethod
-func (_mr *MockEmbedMockRecorder) EmbeddedMethod() *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "EmbeddedMethod", reflect.TypeOf((*MockEmbed)(nil).EmbeddedMethod))
+func (mr *MockEmbedMockRecorder) EmbeddedMethod() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EmbeddedMethod", reflect.TypeOf((*MockEmbed)(nil).EmbeddedMethod))
 }
 
 // ForeignEmbeddedMethod mocks base method
-func (_m *MockEmbed) ForeignEmbeddedMethod() *bufio.Reader {
-	ret := _m.ctrl.Call(_m, "ForeignEmbeddedMethod")
+func (m *MockEmbed) ForeignEmbeddedMethod() *bufio.Reader {
+	ret := m.ctrl.Call(m, "ForeignEmbeddedMethod")
 	ret0, _ := ret[0].(*bufio.Reader)
 	return ret0
 }
 
 // ForeignEmbeddedMethod indicates an expected call of ForeignEmbeddedMethod
-func (_mr *MockEmbedMockRecorder) ForeignEmbeddedMethod() *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ForeignEmbeddedMethod", reflect.TypeOf((*MockEmbed)(nil).ForeignEmbeddedMethod))
+func (mr *MockEmbedMockRecorder) ForeignEmbeddedMethod() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ForeignEmbeddedMethod", reflect.TypeOf((*MockEmbed)(nil).ForeignEmbeddedMethod))
 }
 
 // ImplicitPackage mocks base method
-func (_m *MockEmbed) ImplicitPackage(_param0 string, _param1 imp1.ImpT, _param2 []imp1.ImpT, _param3 *imp1.ImpT, _param4 chan imp1.ImpT) {
-	_m.ctrl.Call(_m, "ImplicitPackage", _param0, _param1, _param2, _param3, _param4)
+func (m *MockEmbed) ImplicitPackage(arg0 string, arg1 imp1.ImpT, arg2 []imp1.ImpT, arg3 *imp1.ImpT, arg4 chan imp1.ImpT) {
+	m.ctrl.Call(m, "ImplicitPackage", arg0, arg1, arg2, arg3, arg4)
 }
 
 // ImplicitPackage indicates an expected call of ImplicitPackage
-func (_mr *MockEmbedMockRecorder) ImplicitPackage(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ImplicitPackage", reflect.TypeOf((*MockEmbed)(nil).ImplicitPackage), arg0, arg1, arg2, arg3, arg4)
+func (mr *MockEmbedMockRecorder) ImplicitPackage(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ImplicitPackage", reflect.TypeOf((*MockEmbed)(nil).ImplicitPackage), arg0, arg1, arg2, arg3, arg4)
 }
 
 // RegularMethod mocks base method
-func (_m *MockEmbed) RegularMethod() {
-	_m.ctrl.Call(_m, "RegularMethod")
+func (m *MockEmbed) RegularMethod() {
+	m.ctrl.Call(m, "RegularMethod")
 }
 
 // RegularMethod indicates an expected call of RegularMethod
-func (_mr *MockEmbedMockRecorder) RegularMethod() *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "RegularMethod", reflect.TypeOf((*MockEmbed)(nil).RegularMethod))
+func (mr *MockEmbedMockRecorder) RegularMethod() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegularMethod", reflect.TypeOf((*MockEmbed)(nil).RegularMethod))
 }
 
 // MockEmbedded is a mock of Embedded interface
@@ -368,16 +369,16 @@ func NewMockEmbedded(ctrl *gomock.Controller) *MockEmbedded {
 }
 
 // EXPECT returns an object that allows the caller to indicate expected use
-func (_m *MockEmbedded) EXPECT() *MockEmbeddedMockRecorder {
-	return _m.recorder
+func (m *MockEmbedded) EXPECT() *MockEmbeddedMockRecorder {
+	return m.recorder
 }
 
 // EmbeddedMethod mocks base method
-func (_m *MockEmbedded) EmbeddedMethod() {
-	_m.ctrl.Call(_m, "EmbeddedMethod")
+func (m *MockEmbedded) EmbeddedMethod() {
+	m.ctrl.Call(m, "EmbeddedMethod")
 }
 
 // EmbeddedMethod indicates an expected call of EmbeddedMethod
-func (_mr *MockEmbeddedMockRecorder) EmbeddedMethod() *gomock.Call {
-	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "EmbeddedMethod", reflect.TypeOf((*MockEmbedded)(nil).EmbeddedMethod))
+func (mr *MockEmbeddedMockRecorder) EmbeddedMethod() *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EmbeddedMethod", reflect.TypeOf((*MockEmbedded)(nil).EmbeddedMethod))
 }
diff --git a/vendor/github.com/golang/mock/sample/user_test.go b/vendor/github.com/golang/mock/sample/user_test.go
index c8c3864a..d1de99cd 100644
--- a/vendor/github.com/golang/mock/sample/user_test.go
+++ b/vendor/github.com/golang/mock/sample/user_test.go
@@ -68,18 +68,57 @@ func TestVariadicFunction(t *testing.T) {
 	defer ctrl.Finish()
 
 	mockIndex := mock_user.NewMockIndex(ctrl)
-	m := mockIndex.EXPECT().Ellip("%d", 0, 1, 1, 2, 3)
-	m.Do(func(format string, nums ...int) {
+	mockIndex.EXPECT().Ellip("%d", 5, 6, 7, 8).Do(func(format string, nums ...int) {
 		sum := 0
 		for _, value := range nums {
 			sum += value
 		}
-		if sum != 7 {
+		if sum != 26 {
 			t.Errorf("Expected 7, got %d", sum)
 		}
 	})
+	mockIndex.EXPECT().Ellip("%d", gomock.Any()).Do(func(format string, nums ...int) {
+		sum := 0
+		for _, value := range nums {
+			sum += value
+		}
+		if sum != 10 {
+			t.Errorf("Expected 7, got %d", sum)
+		}
+	})
+	mockIndex.EXPECT().Ellip("%d", gomock.Any()).Do(func(format string, nums ...int) {
+		sum := 0
+		for _, value := range nums {
+			sum += value
+		}
+		if sum != 0 {
+			t.Errorf("Expected 0, got %d", sum)
+		}
+	})
+	mockIndex.EXPECT().Ellip("%d", gomock.Any()).Do(func(format string, nums ...int) {
+		sum := 0
+		for _, value := range nums {
+			sum += value
+		}
+		if sum != 0 {
+			t.Errorf("Expected 0, got %d", sum)
+		}
+	})
+	mockIndex.EXPECT().Ellip("%d").Do(func(format string, nums ...int) {
+		sum := 0
+		for _, value := range nums {
+			sum += value
+		}
+		if sum != 0 {
+			t.Errorf("Expected 0, got %d", sum)
+		}
+	})
 
-	mockIndex.Ellip("%d", 0, 1, 1, 2, 3)
+	mockIndex.Ellip("%d", 1, 2, 3, 4) // Match second matcher.
+	mockIndex.Ellip("%d", 5, 6, 7, 8) // Match first matcher.
+	mockIndex.Ellip("%d", 0)
+	mockIndex.Ellip("%d")
+	mockIndex.Ellip("%d")
 }
 
 func TestGrabPointer(t *testing.T) {
diff --git a/vendor/github.com/golang/protobuf/.gitignore b/vendor/github.com/golang/protobuf/.gitignore
index 8f5b596b..c7dd4058 100644
--- a/vendor/github.com/golang/protobuf/.gitignore
+++ b/vendor/github.com/golang/protobuf/.gitignore
@@ -12,5 +12,6 @@ core
 _obj
 _test
 _testmain.go
-protoc-gen-go/testdata/multi/*.pb.go
-_conformance/_conformance
+
+# Conformance test output and transient files.
+conformance/failing_tests.txt
diff --git a/vendor/github.com/golang/protobuf/.travis.yml b/vendor/github.com/golang/protobuf/.travis.yml
index 93c67805..455fa660 100644
--- a/vendor/github.com/golang/protobuf/.travis.yml
+++ b/vendor/github.com/golang/protobuf/.travis.yml
@@ -2,17 +2,29 @@ sudo: false
 language: go
 go:
 - 1.6.x
-- 1.7.x
-- 1.8.x
-- 1.9.x
+- 1.10.x
+- 1.x
 
 install:
   - go get -v -d -t github.com/golang/protobuf/...
-  - curl -L https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip -o /tmp/protoc.zip
-  - unzip /tmp/protoc.zip -d $HOME/protoc
+  - curl -L https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip -o /tmp/protoc.zip
+  - unzip /tmp/protoc.zip -d "$HOME"/protoc
+  - mkdir -p "$HOME"/src && ln -s "$HOME"/protoc "$HOME"/src/protobuf
 
 env:
   - PATH=$HOME/protoc/bin:$PATH
 
 script:
-  - make all test
+  - make all
+  - make regenerate
+  # TODO(tamird): When https://github.com/travis-ci/gimme/pull/130 is
+  # released, make this look for "1.x".
+  - if [[ "$TRAVIS_GO_VERSION" == 1.10* ]]; then
+      if [[ "$(git status --porcelain 2>&1)" != "" ]]; then
+        git status >&2;
+        git diff -a >&2;
+        exit 1;
+      fi;
+      echo "git status is clean.";
+    fi;
+  - make test
diff --git a/vendor/github.com/golang/protobuf/Make.protobuf b/vendor/github.com/golang/protobuf/Make.protobuf
deleted file mode 100644
index 15071de1..00000000
--- a/vendor/github.com/golang/protobuf/Make.protobuf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Includable Makefile to add a rule for generating .pb.go files from .proto files
-# (Google protocol buffer descriptions).
-# Typical use if myproto.proto is a file in package mypackage in this directory:
-#
-#	include $(GOROOT)/src/pkg/github.com/golang/protobuf/Make.protobuf
-
-%.pb.go:	%.proto
-	protoc --go_out=. $<
-
diff --git a/vendor/github.com/golang/protobuf/Makefile b/vendor/github.com/golang/protobuf/Makefile
index a1421d8b..2bc2621a 100644
--- a/vendor/github.com/golang/protobuf/Makefile
+++ b/vendor/github.com/golang/protobuf/Makefile
@@ -29,16 +29,14 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 all:	install
 
 install:
-	go install ./proto ./jsonpb ./ptypes
-	go install ./protoc-gen-go
+	go install ./proto ./jsonpb ./ptypes ./protoc-gen-go
 
 test:
-	go test ./proto ./jsonpb ./ptypes
-	make -C protoc-gen-go/testdata test
+	go test ./... ./protoc-gen-go/testdata
+	make -C conformance test
 
 clean:
 	go clean ./...
@@ -47,9 +45,4 @@ nuke:
 	go clean -i ./...
 
 regenerate:
-	make -C protoc-gen-go/descriptor regenerate
-	make -C protoc-gen-go/plugin regenerate
-	make -C protoc-gen-go/testdata regenerate
-	make -C proto/testdata regenerate
-	make -C jsonpb/jsonpb_test_proto regenerate
-	make -C _conformance regenerate
+	./regenerate.sh
diff --git a/vendor/github.com/golang/protobuf/README.md b/vendor/github.com/golang/protobuf/README.md
index 9c4c815c..01b29daf 100644
--- a/vendor/github.com/golang/protobuf/README.md
+++ b/vendor/github.com/golang/protobuf/README.md
@@ -7,7 +7,7 @@ Google's data interchange format.
 Copyright 2010 The Go Authors.
 https://github.com/golang/protobuf
 
-This package and the code it generates requires at least Go 1.4.
+This package and the code it generates requires at least Go 1.6.
 
 This software implements Go bindings for protocol buffers.  For
 information about protocol buffers themselves, see
@@ -56,13 +56,49 @@ parameter set to the directory you want to output the Go code to.
 The generated files will be suffixed .pb.go.  See the Test code below
 for an example using such a file.
 
+## Packages and input paths ##
+
+The protocol buffer language has a concept of "packages" which does not
+correspond well to the Go notion of packages. In generated Go code,
+each source `.proto` file is associated with a single Go package. The
+name and import path for this package is specified with the `go_package`
+proto option:
+
+	option go_package = "github.com/golang/protobuf/ptypes/any";
+
+The protocol buffer compiler will attempt to derive a package name and
+import path if a `go_package` option is not present, but it is
+best to always specify one explicitly.
+
+There is a one-to-one relationship between source `.proto` files and
+generated `.pb.go` files, but any number of `.pb.go` files may be
+contained in the same Go package.
+
+The output name of a generated file is produced by replacing the
+`.proto` suffix with `.pb.go` (e.g., `foo.proto` produces `foo.pb.go`).
+However, the output directory is selected in one of two ways.  Let
+us say we have `inputs/x.proto` with a `go_package` option of
+`github.com/golang/protobuf/p`. The corresponding output file may
+be:
+
+- Relative to the import path:
+
+	protoc --go_out=. inputs/x.proto
+	# writes ./github.com/golang/protobuf/p/x.pb.go
+
+  (This can work well with `--go_out=$GOPATH`.)
+
+- Relative to the input file:
+
+	protoc --go_out=paths=source_relative:. inputs/x.proto
+	# generate ./inputs/x.pb.go
+
+## Generated code ##
 
 The package comment for the proto library contains text describing
 the interface provided in Go for protocol buffers. Here is an edited
 version.
 
-==========
-
 The proto package converts data structures to and from the
 wire format of protocol buffers.  It works in concert with the
 Go source code generated for .proto files by the protocol compiler.
@@ -114,9 +150,9 @@ Consider file test.proto, containing
 ```proto
 	syntax = "proto2";
 	package example;
-	
+
 	enum FOO { X = 17; };
-	
+
 	message Test {
 	  required string label = 1;
 	  optional int32 type = 2 [default=77];
@@ -170,22 +206,25 @@ To create and play with a Test object from the example package,
 To pass extra parameters to the plugin, use a comma-separated
 parameter list separated from the output directory by a colon:
 
-
 	protoc --go_out=plugins=grpc,import_path=mypackage:. *.proto
 
-
-- `import_prefix=xxx` - a prefix that is added onto the beginning of
-  all imports. Useful for things like generating protos in a
-  subdirectory, or regenerating vendored protobufs in-place.
-- `import_path=foo/bar` - used as the package if no input files
-  declare `go_package`. If it contains slashes, everything up to the
-  rightmost slash is ignored.
+- `paths=(import | source_relative)` - specifies how the paths of
+  generated files are structured. See the "Packages and imports paths"
+  section above. The default is `import`.
 - `plugins=plugin1+plugin2` - specifies the list of sub-plugins to
   load. The only plugin in this repo is `grpc`.
 - `Mfoo/bar.proto=quux/shme` - declares that foo/bar.proto is
   associated with Go package quux/shme.  This is subject to the
   import_prefix parameter.
 
+The following parameters are deprecated and should not be used:
+
+- `import_prefix=xxx` - a prefix that is added onto the beginning of
+  all imports.
+- `import_path=foo/bar` - used as the package if no input files
+  declare `go_package`. If it contains slashes, everything up to the
+  rightmost slash is ignored.
+
 ## gRPC Support ##
 
 If a proto file specifies RPC services, protoc-gen-go can be instructed to
diff --git a/vendor/github.com/golang/protobuf/_conformance/Makefile b/vendor/github.com/golang/protobuf/conformance/Makefile
similarity index 76%
rename from vendor/github.com/golang/protobuf/_conformance/Makefile
rename to vendor/github.com/golang/protobuf/conformance/Makefile
index 89800e2d..b99e4ed6 100644
--- a/vendor/github.com/golang/protobuf/_conformance/Makefile
+++ b/vendor/github.com/golang/protobuf/conformance/Makefile
@@ -29,5 +29,21 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-regenerate:
-	protoc --go_out=Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any,Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,Mgoogle/protobuf/struct.proto=github.com/golang/protobuf/ptypes/struct,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/wrappers.proto=github.com/golang/protobuf/ptypes/wrappers,Mgoogle/protobuf/field_mask.proto=google.golang.org/genproto/protobuf:. conformance_proto/conformance.proto
+PROTOBUF_ROOT=$(HOME)/src/protobuf
+
+all:
+	@echo To run the tests in this directory, acquire the main protobuf
+	@echo distribution from:
+	@echo
+	@echo '   https://github.com/google/protobuf'
+	@echo
+	@echo Build the test runner with:
+	@echo
+	@echo '   cd conformance && make conformance-test-runner'
+	@echo
+	@echo And run the tests in this directory with:
+	@echo
+	@echo '   make test PROTOBUF_ROOT=<protobuf distribution>'
+
+test:
+	./test.sh $(PROTOBUF_ROOT)
diff --git a/vendor/github.com/golang/protobuf/_conformance/conformance.go b/vendor/github.com/golang/protobuf/conformance/conformance.go
similarity index 94%
rename from vendor/github.com/golang/protobuf/_conformance/conformance.go
rename to vendor/github.com/golang/protobuf/conformance/conformance.go
index c54212c8..3029312a 100644
--- a/vendor/github.com/golang/protobuf/_conformance/conformance.go
+++ b/vendor/github.com/golang/protobuf/conformance/conformance.go
@@ -39,7 +39,7 @@ import (
 	"io"
 	"os"
 
-	pb "github.com/golang/protobuf/_conformance/conformance_proto"
+	pb "github.com/golang/protobuf/conformance/internal/conformance_proto"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
 )
@@ -101,13 +101,6 @@ func handle(req *pb.ConformanceRequest) *pb.ConformanceResponse {
 		err = proto.Unmarshal(p.ProtobufPayload, &msg)
 	case *pb.ConformanceRequest_JsonPayload:
 		err = jsonpb.UnmarshalString(p.JsonPayload, &msg)
-		if err != nil && err.Error() == "unmarshaling Any not supported yet" {
-			return &pb.ConformanceResponse{
-				Result: &pb.ConformanceResponse_Skipped{
-					Skipped: err.Error(),
-				},
-			}
-		}
 	default:
 		return &pb.ConformanceResponse{
 			Result: &pb.ConformanceResponse_RuntimeError{
diff --git a/vendor/github.com/golang/protobuf/conformance/conformance.sh b/vendor/github.com/golang/protobuf/conformance/conformance.sh
new file mode 100755
index 00000000..8532f571
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/conformance/conformance.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd $(dirname $0)
+exec go run conformance.go $*
diff --git a/vendor/github.com/golang/protobuf/conformance/failure_list_go.txt b/vendor/github.com/golang/protobuf/conformance/failure_list_go.txt
new file mode 100644
index 00000000..d3728089
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/conformance/failure_list_go.txt
@@ -0,0 +1,61 @@
+# This is the list of conformance tests that are known ot fail right now.
+# TODO: These should be fixed.
+
+DurationProtoInputTooLarge.JsonOutput
+DurationProtoInputTooSmall.JsonOutput
+FieldMaskNumbersDontRoundTrip.JsonOutput
+FieldMaskPathsDontRoundTrip.JsonOutput
+FieldMaskTooManyUnderscore.JsonOutput
+JsonInput.AnyWithFieldMask.JsonOutput
+JsonInput.AnyWithFieldMask.ProtobufOutput
+JsonInput.DoubleFieldQuotedValue.JsonOutput
+JsonInput.DoubleFieldQuotedValue.ProtobufOutput
+JsonInput.DurationHas3FractionalDigits.Validator
+JsonInput.DurationHas6FractionalDigits.Validator
+JsonInput.DurationHas9FractionalDigits.Validator
+JsonInput.DurationHasZeroFractionalDigit.Validator
+JsonInput.DurationMaxValue.JsonOutput
+JsonInput.DurationMaxValue.ProtobufOutput
+JsonInput.DurationMinValue.JsonOutput
+JsonInput.DurationMinValue.ProtobufOutput
+JsonInput.EnumFieldUnknownValue.Validator
+JsonInput.FieldMask.JsonOutput
+JsonInput.FieldMask.ProtobufOutput
+JsonInput.FieldNameInLowerCamelCase.Validator
+JsonInput.FieldNameWithMixedCases.JsonOutput
+JsonInput.FieldNameWithMixedCases.ProtobufOutput
+JsonInput.FieldNameWithMixedCases.Validator
+JsonInput.FieldNameWithNumbers.Validator
+JsonInput.FloatFieldQuotedValue.JsonOutput
+JsonInput.FloatFieldQuotedValue.ProtobufOutput
+JsonInput.Int32FieldExponentialFormat.JsonOutput
+JsonInput.Int32FieldExponentialFormat.ProtobufOutput
+JsonInput.Int32FieldFloatTrailingZero.JsonOutput
+JsonInput.Int32FieldFloatTrailingZero.ProtobufOutput
+JsonInput.Int32FieldMaxFloatValue.JsonOutput
+JsonInput.Int32FieldMaxFloatValue.ProtobufOutput
+JsonInput.Int32FieldMinFloatValue.JsonOutput
+JsonInput.Int32FieldMinFloatValue.ProtobufOutput
+JsonInput.Int32FieldStringValue.JsonOutput
+JsonInput.Int32FieldStringValue.ProtobufOutput
+JsonInput.Int32FieldStringValueEscaped.JsonOutput
+JsonInput.Int32FieldStringValueEscaped.ProtobufOutput
+JsonInput.Int64FieldBeString.Validator
+JsonInput.MapFieldValueIsNull
+JsonInput.OneofFieldDuplicate
+JsonInput.RepeatedFieldMessageElementIsNull
+JsonInput.RepeatedFieldPrimitiveElementIsNull
+JsonInput.StringFieldSurrogateInWrongOrder
+JsonInput.StringFieldUnpairedHighSurrogate
+JsonInput.StringFieldUnpairedLowSurrogate
+JsonInput.TimestampHas3FractionalDigits.Validator
+JsonInput.TimestampHas6FractionalDigits.Validator
+JsonInput.TimestampHas9FractionalDigits.Validator
+JsonInput.TimestampHasZeroFractionalDigit.Validator
+JsonInput.TimestampJsonInputTooSmall
+JsonInput.TimestampZeroNormalized.Validator
+JsonInput.Uint32FieldMaxFloatValue.JsonOutput
+JsonInput.Uint32FieldMaxFloatValue.ProtobufOutput
+JsonInput.Uint64FieldBeString.Validator
+TimestampProtoInputTooLarge.JsonOutput
+TimestampProtoInputTooSmall.JsonOutput
diff --git a/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.pb.go b/vendor/github.com/golang/protobuf/conformance/internal/conformance_proto/conformance.pb.go
similarity index 55%
rename from vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.pb.go
rename to vendor/github.com/golang/protobuf/conformance/internal/conformance_proto/conformance.pb.go
index ec354ead..82d45412 100644
--- a/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.pb.go
+++ b/vendor/github.com/golang/protobuf/conformance/internal/conformance_proto/conformance.pb.go
@@ -1,29 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: conformance_proto/conformance.proto
+// source: conformance.proto
 
-/*
-Package conformance is a generated protocol buffer package.
-
-It is generated from these files:
-	conformance_proto/conformance.proto
-
-It has these top-level messages:
-	ConformanceRequest
-	ConformanceResponse
-	TestAllTypes
-	ForeignMessage
-*/
 package conformance
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "google.golang.org/genproto/protobuf"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/wrappers"
+import any "github.com/golang/protobuf/ptypes/any"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -58,7 +46,9 @@ var WireFormat_value = map[string]int32{
 func (x WireFormat) String() string {
 	return proto.EnumName(WireFormat_name, int32(x))
 }
-func (WireFormat) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (WireFormat) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_conformance_48ac832451f5d6c3, []int{0}
+}
 
 type ForeignEnum int32
 
@@ -82,7 +72,9 @@ var ForeignEnum_value = map[string]int32{
 func (x ForeignEnum) String() string {
 	return proto.EnumName(ForeignEnum_name, int32(x))
 }
-func (ForeignEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (ForeignEnum) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_conformance_48ac832451f5d6c3, []int{1}
+}
 
 type TestAllTypes_NestedEnum int32
 
@@ -109,7 +101,9 @@ var TestAllTypes_NestedEnum_value = map[string]int32{
 func (x TestAllTypes_NestedEnum) String() string {
 	return proto.EnumName(TestAllTypes_NestedEnum_name, int32(x))
 }
-func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_conformance_48ac832451f5d6c3, []int{2, 0}
+}
 
 // Represents a single test case's input.  The testee should:
 //
@@ -126,12 +120,34 @@ type ConformanceRequest struct {
 	Payload isConformanceRequest_Payload `protobuf_oneof:"payload"`
 	// Which format should the testee serialize its message to?
 	RequestedOutputFormat WireFormat `protobuf:"varint,3,opt,name=requested_output_format,json=requestedOutputFormat,enum=conformance.WireFormat" json:"requested_output_format,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}   `json:"-"`
+	XXX_unrecognized      []byte     `json:"-"`
+	XXX_sizecache         int32      `json:"-"`
 }
 
-func (m *ConformanceRequest) Reset()                    { *m = ConformanceRequest{} }
-func (m *ConformanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*ConformanceRequest) ProtoMessage()               {}
-func (*ConformanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *ConformanceRequest) Reset()         { *m = ConformanceRequest{} }
+func (m *ConformanceRequest) String() string { return proto.CompactTextString(m) }
+func (*ConformanceRequest) ProtoMessage()    {}
+func (*ConformanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_conformance_48ac832451f5d6c3, []int{0}
+}
+func (m *ConformanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConformanceRequest.Unmarshal(m, b)
+}
+func (m *ConformanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConformanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *ConformanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConformanceRequest.Merge(dst, src)
+}
+func (m *ConformanceRequest) XXX_Size() int {
+	return xxx_messageInfo_ConformanceRequest.Size(m)
+}
+func (m *ConformanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConformanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConformanceRequest proto.InternalMessageInfo
 
 type isConformanceRequest_Payload interface {
 	isConformanceRequest_Payload()
@@ -227,11 +243,11 @@ func _ConformanceRequest_OneofSizer(msg proto.Message) (n int) {
 	// payload
 	switch x := m.Payload.(type) {
 	case *ConformanceRequest_ProtobufPayload:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ProtobufPayload)))
 		n += len(x.ProtobufPayload)
 	case *ConformanceRequest_JsonPayload:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.JsonPayload)))
 		n += len(x.JsonPayload)
 	case nil:
@@ -250,13 +266,35 @@ type ConformanceResponse struct {
 	//	*ConformanceResponse_ProtobufPayload
 	//	*ConformanceResponse_JsonPayload
 	//	*ConformanceResponse_Skipped
-	Result isConformanceResponse_Result `protobuf_oneof:"result"`
+	Result               isConformanceResponse_Result `protobuf_oneof:"result"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *ConformanceResponse) Reset()         { *m = ConformanceResponse{} }
+func (m *ConformanceResponse) String() string { return proto.CompactTextString(m) }
+func (*ConformanceResponse) ProtoMessage()    {}
+func (*ConformanceResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_conformance_48ac832451f5d6c3, []int{1}
+}
+func (m *ConformanceResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConformanceResponse.Unmarshal(m, b)
+}
+func (m *ConformanceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConformanceResponse.Marshal(b, m, deterministic)
+}
+func (dst *ConformanceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConformanceResponse.Merge(dst, src)
+}
+func (m *ConformanceResponse) XXX_Size() int {
+	return xxx_messageInfo_ConformanceResponse.Size(m)
+}
+func (m *ConformanceResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConformanceResponse.DiscardUnknown(m)
 }
 
-func (m *ConformanceResponse) Reset()                    { *m = ConformanceResponse{} }
-func (m *ConformanceResponse) String() string            { return proto.CompactTextString(m) }
-func (*ConformanceResponse) ProtoMessage()               {}
-func (*ConformanceResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_ConformanceResponse proto.InternalMessageInfo
 
 type isConformanceResponse_Result interface {
 	isConformanceResponse_Result()
@@ -433,27 +471,27 @@ func _ConformanceResponse_OneofSizer(msg proto.Message) (n int) {
 	// result
 	switch x := m.Result.(type) {
 	case *ConformanceResponse_ParseError:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ParseError)))
 		n += len(x.ParseError)
 	case *ConformanceResponse_SerializeError:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.SerializeError)))
 		n += len(x.SerializeError)
 	case *ConformanceResponse_RuntimeError:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RuntimeError)))
 		n += len(x.RuntimeError)
 	case *ConformanceResponse_ProtobufPayload:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ProtobufPayload)))
 		n += len(x.ProtobufPayload)
 	case *ConformanceResponse_JsonPayload:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.JsonPayload)))
 		n += len(x.JsonPayload)
 	case *ConformanceResponse_Skipped:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Skipped)))
 		n += len(x.Skipped)
 	case nil:
@@ -536,69 +574,79 @@ type TestAllTypes struct {
 	//	*TestAllTypes_OneofNestedMessage
 	//	*TestAllTypes_OneofString
 	//	*TestAllTypes_OneofBytes
-	//	*TestAllTypes_OneofBool
-	//	*TestAllTypes_OneofUint64
-	//	*TestAllTypes_OneofFloat
-	//	*TestAllTypes_OneofDouble
-	//	*TestAllTypes_OneofEnum
 	OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
 	// Well-known types
-	OptionalBoolWrapper   *google_protobuf5.BoolValue     `protobuf:"bytes,201,opt,name=optional_bool_wrapper,json=optionalBoolWrapper" json:"optional_bool_wrapper,omitempty"`
-	OptionalInt32Wrapper  *google_protobuf5.Int32Value    `protobuf:"bytes,202,opt,name=optional_int32_wrapper,json=optionalInt32Wrapper" json:"optional_int32_wrapper,omitempty"`
-	OptionalInt64Wrapper  *google_protobuf5.Int64Value    `protobuf:"bytes,203,opt,name=optional_int64_wrapper,json=optionalInt64Wrapper" json:"optional_int64_wrapper,omitempty"`
-	OptionalUint32Wrapper *google_protobuf5.UInt32Value   `protobuf:"bytes,204,opt,name=optional_uint32_wrapper,json=optionalUint32Wrapper" json:"optional_uint32_wrapper,omitempty"`
-	OptionalUint64Wrapper *google_protobuf5.UInt64Value   `protobuf:"bytes,205,opt,name=optional_uint64_wrapper,json=optionalUint64Wrapper" json:"optional_uint64_wrapper,omitempty"`
-	OptionalFloatWrapper  *google_protobuf5.FloatValue    `protobuf:"bytes,206,opt,name=optional_float_wrapper,json=optionalFloatWrapper" json:"optional_float_wrapper,omitempty"`
-	OptionalDoubleWrapper *google_protobuf5.DoubleValue   `protobuf:"bytes,207,opt,name=optional_double_wrapper,json=optionalDoubleWrapper" json:"optional_double_wrapper,omitempty"`
-	OptionalStringWrapper *google_protobuf5.StringValue   `protobuf:"bytes,208,opt,name=optional_string_wrapper,json=optionalStringWrapper" json:"optional_string_wrapper,omitempty"`
-	OptionalBytesWrapper  *google_protobuf5.BytesValue    `protobuf:"bytes,209,opt,name=optional_bytes_wrapper,json=optionalBytesWrapper" json:"optional_bytes_wrapper,omitempty"`
-	RepeatedBoolWrapper   []*google_protobuf5.BoolValue   `protobuf:"bytes,211,rep,name=repeated_bool_wrapper,json=repeatedBoolWrapper" json:"repeated_bool_wrapper,omitempty"`
-	RepeatedInt32Wrapper  []*google_protobuf5.Int32Value  `protobuf:"bytes,212,rep,name=repeated_int32_wrapper,json=repeatedInt32Wrapper" json:"repeated_int32_wrapper,omitempty"`
-	RepeatedInt64Wrapper  []*google_protobuf5.Int64Value  `protobuf:"bytes,213,rep,name=repeated_int64_wrapper,json=repeatedInt64Wrapper" json:"repeated_int64_wrapper,omitempty"`
-	RepeatedUint32Wrapper []*google_protobuf5.UInt32Value `protobuf:"bytes,214,rep,name=repeated_uint32_wrapper,json=repeatedUint32Wrapper" json:"repeated_uint32_wrapper,omitempty"`
-	RepeatedUint64Wrapper []*google_protobuf5.UInt64Value `protobuf:"bytes,215,rep,name=repeated_uint64_wrapper,json=repeatedUint64Wrapper" json:"repeated_uint64_wrapper,omitempty"`
-	RepeatedFloatWrapper  []*google_protobuf5.FloatValue  `protobuf:"bytes,216,rep,name=repeated_float_wrapper,json=repeatedFloatWrapper" json:"repeated_float_wrapper,omitempty"`
-	RepeatedDoubleWrapper []*google_protobuf5.DoubleValue `protobuf:"bytes,217,rep,name=repeated_double_wrapper,json=repeatedDoubleWrapper" json:"repeated_double_wrapper,omitempty"`
-	RepeatedStringWrapper []*google_protobuf5.StringValue `protobuf:"bytes,218,rep,name=repeated_string_wrapper,json=repeatedStringWrapper" json:"repeated_string_wrapper,omitempty"`
-	RepeatedBytesWrapper  []*google_protobuf5.BytesValue  `protobuf:"bytes,219,rep,name=repeated_bytes_wrapper,json=repeatedBytesWrapper" json:"repeated_bytes_wrapper,omitempty"`
-	OptionalDuration      *google_protobuf1.Duration      `protobuf:"bytes,301,opt,name=optional_duration,json=optionalDuration" json:"optional_duration,omitempty"`
-	OptionalTimestamp     *google_protobuf4.Timestamp     `protobuf:"bytes,302,opt,name=optional_timestamp,json=optionalTimestamp" json:"optional_timestamp,omitempty"`
-	OptionalFieldMask     *google_protobuf2.FieldMask     `protobuf:"bytes,303,opt,name=optional_field_mask,json=optionalFieldMask" json:"optional_field_mask,omitempty"`
-	OptionalStruct        *google_protobuf3.Struct        `protobuf:"bytes,304,opt,name=optional_struct,json=optionalStruct" json:"optional_struct,omitempty"`
-	OptionalAny           *google_protobuf.Any            `protobuf:"bytes,305,opt,name=optional_any,json=optionalAny" json:"optional_any,omitempty"`
-	OptionalValue         *google_protobuf3.Value         `protobuf:"bytes,306,opt,name=optional_value,json=optionalValue" json:"optional_value,omitempty"`
-	RepeatedDuration      []*google_protobuf1.Duration    `protobuf:"bytes,311,rep,name=repeated_duration,json=repeatedDuration" json:"repeated_duration,omitempty"`
-	RepeatedTimestamp     []*google_protobuf4.Timestamp   `protobuf:"bytes,312,rep,name=repeated_timestamp,json=repeatedTimestamp" json:"repeated_timestamp,omitempty"`
-	RepeatedFieldmask     []*google_protobuf2.FieldMask   `protobuf:"bytes,313,rep,name=repeated_fieldmask,json=repeatedFieldmask" json:"repeated_fieldmask,omitempty"`
-	RepeatedStruct        []*google_protobuf3.Struct      `protobuf:"bytes,324,rep,name=repeated_struct,json=repeatedStruct" json:"repeated_struct,omitempty"`
-	RepeatedAny           []*google_protobuf.Any          `protobuf:"bytes,315,rep,name=repeated_any,json=repeatedAny" json:"repeated_any,omitempty"`
-	RepeatedValue         []*google_protobuf3.Value       `protobuf:"bytes,316,rep,name=repeated_value,json=repeatedValue" json:"repeated_value,omitempty"`
+	OptionalBoolWrapper   *wrappers.BoolValue     `protobuf:"bytes,201,opt,name=optional_bool_wrapper,json=optionalBoolWrapper" json:"optional_bool_wrapper,omitempty"`
+	OptionalInt32Wrapper  *wrappers.Int32Value    `protobuf:"bytes,202,opt,name=optional_int32_wrapper,json=optionalInt32Wrapper" json:"optional_int32_wrapper,omitempty"`
+	OptionalInt64Wrapper  *wrappers.Int64Value    `protobuf:"bytes,203,opt,name=optional_int64_wrapper,json=optionalInt64Wrapper" json:"optional_int64_wrapper,omitempty"`
+	OptionalUint32Wrapper *wrappers.UInt32Value   `protobuf:"bytes,204,opt,name=optional_uint32_wrapper,json=optionalUint32Wrapper" json:"optional_uint32_wrapper,omitempty"`
+	OptionalUint64Wrapper *wrappers.UInt64Value   `protobuf:"bytes,205,opt,name=optional_uint64_wrapper,json=optionalUint64Wrapper" json:"optional_uint64_wrapper,omitempty"`
+	OptionalFloatWrapper  *wrappers.FloatValue    `protobuf:"bytes,206,opt,name=optional_float_wrapper,json=optionalFloatWrapper" json:"optional_float_wrapper,omitempty"`
+	OptionalDoubleWrapper *wrappers.DoubleValue   `protobuf:"bytes,207,opt,name=optional_double_wrapper,json=optionalDoubleWrapper" json:"optional_double_wrapper,omitempty"`
+	OptionalStringWrapper *wrappers.StringValue   `protobuf:"bytes,208,opt,name=optional_string_wrapper,json=optionalStringWrapper" json:"optional_string_wrapper,omitempty"`
+	OptionalBytesWrapper  *wrappers.BytesValue    `protobuf:"bytes,209,opt,name=optional_bytes_wrapper,json=optionalBytesWrapper" json:"optional_bytes_wrapper,omitempty"`
+	RepeatedBoolWrapper   []*wrappers.BoolValue   `protobuf:"bytes,211,rep,name=repeated_bool_wrapper,json=repeatedBoolWrapper" json:"repeated_bool_wrapper,omitempty"`
+	RepeatedInt32Wrapper  []*wrappers.Int32Value  `protobuf:"bytes,212,rep,name=repeated_int32_wrapper,json=repeatedInt32Wrapper" json:"repeated_int32_wrapper,omitempty"`
+	RepeatedInt64Wrapper  []*wrappers.Int64Value  `protobuf:"bytes,213,rep,name=repeated_int64_wrapper,json=repeatedInt64Wrapper" json:"repeated_int64_wrapper,omitempty"`
+	RepeatedUint32Wrapper []*wrappers.UInt32Value `protobuf:"bytes,214,rep,name=repeated_uint32_wrapper,json=repeatedUint32Wrapper" json:"repeated_uint32_wrapper,omitempty"`
+	RepeatedUint64Wrapper []*wrappers.UInt64Value `protobuf:"bytes,215,rep,name=repeated_uint64_wrapper,json=repeatedUint64Wrapper" json:"repeated_uint64_wrapper,omitempty"`
+	RepeatedFloatWrapper  []*wrappers.FloatValue  `protobuf:"bytes,216,rep,name=repeated_float_wrapper,json=repeatedFloatWrapper" json:"repeated_float_wrapper,omitempty"`
+	RepeatedDoubleWrapper []*wrappers.DoubleValue `protobuf:"bytes,217,rep,name=repeated_double_wrapper,json=repeatedDoubleWrapper" json:"repeated_double_wrapper,omitempty"`
+	RepeatedStringWrapper []*wrappers.StringValue `protobuf:"bytes,218,rep,name=repeated_string_wrapper,json=repeatedStringWrapper" json:"repeated_string_wrapper,omitempty"`
+	RepeatedBytesWrapper  []*wrappers.BytesValue  `protobuf:"bytes,219,rep,name=repeated_bytes_wrapper,json=repeatedBytesWrapper" json:"repeated_bytes_wrapper,omitempty"`
+	OptionalDuration      *duration.Duration      `protobuf:"bytes,301,opt,name=optional_duration,json=optionalDuration" json:"optional_duration,omitempty"`
+	OptionalTimestamp     *timestamp.Timestamp    `protobuf:"bytes,302,opt,name=optional_timestamp,json=optionalTimestamp" json:"optional_timestamp,omitempty"`
+	OptionalFieldMask     *field_mask.FieldMask   `protobuf:"bytes,303,opt,name=optional_field_mask,json=optionalFieldMask" json:"optional_field_mask,omitempty"`
+	OptionalStruct        *_struct.Struct         `protobuf:"bytes,304,opt,name=optional_struct,json=optionalStruct" json:"optional_struct,omitempty"`
+	OptionalAny           *any.Any                `protobuf:"bytes,305,opt,name=optional_any,json=optionalAny" json:"optional_any,omitempty"`
+	OptionalValue         *_struct.Value          `protobuf:"bytes,306,opt,name=optional_value,json=optionalValue" json:"optional_value,omitempty"`
+	RepeatedDuration      []*duration.Duration    `protobuf:"bytes,311,rep,name=repeated_duration,json=repeatedDuration" json:"repeated_duration,omitempty"`
+	RepeatedTimestamp     []*timestamp.Timestamp  `protobuf:"bytes,312,rep,name=repeated_timestamp,json=repeatedTimestamp" json:"repeated_timestamp,omitempty"`
+	RepeatedFieldmask     []*field_mask.FieldMask `protobuf:"bytes,313,rep,name=repeated_fieldmask,json=repeatedFieldmask" json:"repeated_fieldmask,omitempty"`
+	RepeatedStruct        []*_struct.Struct       `protobuf:"bytes,324,rep,name=repeated_struct,json=repeatedStruct" json:"repeated_struct,omitempty"`
+	RepeatedAny           []*any.Any              `protobuf:"bytes,315,rep,name=repeated_any,json=repeatedAny" json:"repeated_any,omitempty"`
+	RepeatedValue         []*_struct.Value        `protobuf:"bytes,316,rep,name=repeated_value,json=repeatedValue" json:"repeated_value,omitempty"`
 	// Test field-name-to-JSON-name convention.
-	// (protobuf says names can be any valid C/C++ identifier.)
-	Fieldname1    int32 `protobuf:"varint,401,opt,name=fieldname1" json:"fieldname1,omitempty"`
-	FieldName2    int32 `protobuf:"varint,402,opt,name=field_name2,json=fieldName2" json:"field_name2,omitempty"`
-	XFieldName3   int32 `protobuf:"varint,403,opt,name=_field_name3,json=FieldName3" json:"_field_name3,omitempty"`
-	Field_Name4_  int32 `protobuf:"varint,404,opt,name=field__name4_,json=fieldName4" json:"field__name4_,omitempty"`
-	Field0Name5   int32 `protobuf:"varint,405,opt,name=field0name5" json:"field0name5,omitempty"`
-	Field_0Name6  int32 `protobuf:"varint,406,opt,name=field_0_name6,json=field0Name6" json:"field_0_name6,omitempty"`
-	FieldName7    int32 `protobuf:"varint,407,opt,name=fieldName7" json:"fieldName7,omitempty"`
-	FieldName8    int32 `protobuf:"varint,408,opt,name=FieldName8" json:"FieldName8,omitempty"`
-	Field_Name9   int32 `protobuf:"varint,409,opt,name=field_Name9,json=fieldName9" json:"field_Name9,omitempty"`
-	Field_Name10  int32 `protobuf:"varint,410,opt,name=Field_Name10,json=FieldName10" json:"Field_Name10,omitempty"`
-	FIELD_NAME11  int32 `protobuf:"varint,411,opt,name=FIELD_NAME11,json=FIELDNAME11" json:"FIELD_NAME11,omitempty"`
-	FIELDName12   int32 `protobuf:"varint,412,opt,name=FIELD_name12,json=FIELDName12" json:"FIELD_name12,omitempty"`
-	XFieldName13  int32 `protobuf:"varint,413,opt,name=__field_name13,json=FieldName13" json:"__field_name13,omitempty"`
-	X_FieldName14 int32 `protobuf:"varint,414,opt,name=__Field_name14,json=FieldName14" json:"__Field_name14,omitempty"`
-	Field_Name15  int32 `protobuf:"varint,415,opt,name=field__name15,json=fieldName15" json:"field__name15,omitempty"`
-	Field__Name16 int32 `protobuf:"varint,416,opt,name=field__Name16,json=fieldName16" json:"field__Name16,omitempty"`
-	FieldName17__ int32 `protobuf:"varint,417,opt,name=field_name17__,json=fieldName17" json:"field_name17__,omitempty"`
-	FieldName18__ int32 `protobuf:"varint,418,opt,name=Field_name18__,json=FieldName18" json:"Field_name18__,omitempty"`
-}
-
-func (m *TestAllTypes) Reset()                    { *m = TestAllTypes{} }
-func (m *TestAllTypes) String() string            { return proto.CompactTextString(m) }
-func (*TestAllTypes) ProtoMessage()               {}
-func (*TestAllTypes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+	Fieldname1           int32    `protobuf:"varint,401,opt,name=fieldname1" json:"fieldname1,omitempty"`
+	FieldName2           int32    `protobuf:"varint,402,opt,name=field_name2,json=fieldName2" json:"field_name2,omitempty"`
+	XFieldName3          int32    `protobuf:"varint,403,opt,name=_field_name3,json=FieldName3" json:"_field_name3,omitempty"`
+	Field_Name4_         int32    `protobuf:"varint,404,opt,name=field__name4_,json=fieldName4" json:"field__name4_,omitempty"`
+	Field0Name5          int32    `protobuf:"varint,405,opt,name=field0name5" json:"field0name5,omitempty"`
+	Field_0Name6         int32    `protobuf:"varint,406,opt,name=field_0_name6,json=field0Name6" json:"field_0_name6,omitempty"`
+	FieldName7           int32    `protobuf:"varint,407,opt,name=fieldName7" json:"fieldName7,omitempty"`
+	FieldName8           int32    `protobuf:"varint,408,opt,name=FieldName8" json:"FieldName8,omitempty"`
+	Field_Name9          int32    `protobuf:"varint,409,opt,name=field_Name9,json=fieldName9" json:"field_Name9,omitempty"`
+	Field_Name10         int32    `protobuf:"varint,410,opt,name=Field_Name10,json=FieldName10" json:"Field_Name10,omitempty"`
+	FIELD_NAME11         int32    `protobuf:"varint,411,opt,name=FIELD_NAME11,json=FIELDNAME11" json:"FIELD_NAME11,omitempty"`
+	FIELDName12          int32    `protobuf:"varint,412,opt,name=FIELD_name12,json=FIELDName12" json:"FIELD_name12,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestAllTypes) Reset()         { *m = TestAllTypes{} }
+func (m *TestAllTypes) String() string { return proto.CompactTextString(m) }
+func (*TestAllTypes) ProtoMessage()    {}
+func (*TestAllTypes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_conformance_48ac832451f5d6c3, []int{2}
+}
+func (m *TestAllTypes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestAllTypes.Unmarshal(m, b)
+}
+func (m *TestAllTypes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestAllTypes.Marshal(b, m, deterministic)
+}
+func (dst *TestAllTypes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestAllTypes.Merge(dst, src)
+}
+func (m *TestAllTypes) XXX_Size() int {
+	return xxx_messageInfo_TestAllTypes.Size(m)
+}
+func (m *TestAllTypes) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestAllTypes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestAllTypes proto.InternalMessageInfo
 
 type isTestAllTypes_OneofField interface {
 	isTestAllTypes_OneofField()
@@ -616,31 +664,11 @@ type TestAllTypes_OneofString struct {
 type TestAllTypes_OneofBytes struct {
 	OneofBytes []byte `protobuf:"bytes,114,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
 }
-type TestAllTypes_OneofBool struct {
-	OneofBool bool `protobuf:"varint,115,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type TestAllTypes_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,116,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type TestAllTypes_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,117,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type TestAllTypes_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,118,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type TestAllTypes_OneofEnum struct {
-	OneofEnum TestAllTypes_NestedEnum `protobuf:"varint,119,opt,name=oneof_enum,json=oneofEnum,enum=conformance.TestAllTypes_NestedEnum,oneof"`
-}
 
 func (*TestAllTypes_OneofUint32) isTestAllTypes_OneofField()        {}
 func (*TestAllTypes_OneofNestedMessage) isTestAllTypes_OneofField() {}
 func (*TestAllTypes_OneofString) isTestAllTypes_OneofField()        {}
 func (*TestAllTypes_OneofBytes) isTestAllTypes_OneofField()         {}
-func (*TestAllTypes_OneofBool) isTestAllTypes_OneofField()          {}
-func (*TestAllTypes_OneofUint64) isTestAllTypes_OneofField()        {}
-func (*TestAllTypes_OneofFloat) isTestAllTypes_OneofField()         {}
-func (*TestAllTypes_OneofDouble) isTestAllTypes_OneofField()        {}
-func (*TestAllTypes_OneofEnum) isTestAllTypes_OneofField()          {}
 
 func (m *TestAllTypes) GetOneofField() isTestAllTypes_OneofField {
 	if m != nil {
@@ -1111,245 +1139,210 @@ func (m *TestAllTypes) GetOneofBytes() []byte {
 	return nil
 }
 
-func (m *TestAllTypes) GetOneofBool() bool {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *TestAllTypes) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOneofEnum() TestAllTypes_NestedEnum {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofEnum); ok {
-		return x.OneofEnum
-	}
-	return TestAllTypes_FOO
-}
-
-func (m *TestAllTypes) GetOptionalBoolWrapper() *google_protobuf5.BoolValue {
+func (m *TestAllTypes) GetOptionalBoolWrapper() *wrappers.BoolValue {
 	if m != nil {
 		return m.OptionalBoolWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalInt32Wrapper() *google_protobuf5.Int32Value {
+func (m *TestAllTypes) GetOptionalInt32Wrapper() *wrappers.Int32Value {
 	if m != nil {
 		return m.OptionalInt32Wrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalInt64Wrapper() *google_protobuf5.Int64Value {
+func (m *TestAllTypes) GetOptionalInt64Wrapper() *wrappers.Int64Value {
 	if m != nil {
 		return m.OptionalInt64Wrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalUint32Wrapper() *google_protobuf5.UInt32Value {
+func (m *TestAllTypes) GetOptionalUint32Wrapper() *wrappers.UInt32Value {
 	if m != nil {
 		return m.OptionalUint32Wrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalUint64Wrapper() *google_protobuf5.UInt64Value {
+func (m *TestAllTypes) GetOptionalUint64Wrapper() *wrappers.UInt64Value {
 	if m != nil {
 		return m.OptionalUint64Wrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalFloatWrapper() *google_protobuf5.FloatValue {
+func (m *TestAllTypes) GetOptionalFloatWrapper() *wrappers.FloatValue {
 	if m != nil {
 		return m.OptionalFloatWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalDoubleWrapper() *google_protobuf5.DoubleValue {
+func (m *TestAllTypes) GetOptionalDoubleWrapper() *wrappers.DoubleValue {
 	if m != nil {
 		return m.OptionalDoubleWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalStringWrapper() *google_protobuf5.StringValue {
+func (m *TestAllTypes) GetOptionalStringWrapper() *wrappers.StringValue {
 	if m != nil {
 		return m.OptionalStringWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalBytesWrapper() *google_protobuf5.BytesValue {
+func (m *TestAllTypes) GetOptionalBytesWrapper() *wrappers.BytesValue {
 	if m != nil {
 		return m.OptionalBytesWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedBoolWrapper() []*google_protobuf5.BoolValue {
+func (m *TestAllTypes) GetRepeatedBoolWrapper() []*wrappers.BoolValue {
 	if m != nil {
 		return m.RepeatedBoolWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedInt32Wrapper() []*google_protobuf5.Int32Value {
+func (m *TestAllTypes) GetRepeatedInt32Wrapper() []*wrappers.Int32Value {
 	if m != nil {
 		return m.RepeatedInt32Wrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedInt64Wrapper() []*google_protobuf5.Int64Value {
+func (m *TestAllTypes) GetRepeatedInt64Wrapper() []*wrappers.Int64Value {
 	if m != nil {
 		return m.RepeatedInt64Wrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedUint32Wrapper() []*google_protobuf5.UInt32Value {
+func (m *TestAllTypes) GetRepeatedUint32Wrapper() []*wrappers.UInt32Value {
 	if m != nil {
 		return m.RepeatedUint32Wrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedUint64Wrapper() []*google_protobuf5.UInt64Value {
+func (m *TestAllTypes) GetRepeatedUint64Wrapper() []*wrappers.UInt64Value {
 	if m != nil {
 		return m.RepeatedUint64Wrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedFloatWrapper() []*google_protobuf5.FloatValue {
+func (m *TestAllTypes) GetRepeatedFloatWrapper() []*wrappers.FloatValue {
 	if m != nil {
 		return m.RepeatedFloatWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedDoubleWrapper() []*google_protobuf5.DoubleValue {
+func (m *TestAllTypes) GetRepeatedDoubleWrapper() []*wrappers.DoubleValue {
 	if m != nil {
 		return m.RepeatedDoubleWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedStringWrapper() []*google_protobuf5.StringValue {
+func (m *TestAllTypes) GetRepeatedStringWrapper() []*wrappers.StringValue {
 	if m != nil {
 		return m.RepeatedStringWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedBytesWrapper() []*google_protobuf5.BytesValue {
+func (m *TestAllTypes) GetRepeatedBytesWrapper() []*wrappers.BytesValue {
 	if m != nil {
 		return m.RepeatedBytesWrapper
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalDuration() *google_protobuf1.Duration {
+func (m *TestAllTypes) GetOptionalDuration() *duration.Duration {
 	if m != nil {
 		return m.OptionalDuration
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalTimestamp() *google_protobuf4.Timestamp {
+func (m *TestAllTypes) GetOptionalTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.OptionalTimestamp
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalFieldMask() *google_protobuf2.FieldMask {
+func (m *TestAllTypes) GetOptionalFieldMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.OptionalFieldMask
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalStruct() *google_protobuf3.Struct {
+func (m *TestAllTypes) GetOptionalStruct() *_struct.Struct {
 	if m != nil {
 		return m.OptionalStruct
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalAny() *google_protobuf.Any {
+func (m *TestAllTypes) GetOptionalAny() *any.Any {
 	if m != nil {
 		return m.OptionalAny
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetOptionalValue() *google_protobuf3.Value {
+func (m *TestAllTypes) GetOptionalValue() *_struct.Value {
 	if m != nil {
 		return m.OptionalValue
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedDuration() []*google_protobuf1.Duration {
+func (m *TestAllTypes) GetRepeatedDuration() []*duration.Duration {
 	if m != nil {
 		return m.RepeatedDuration
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedTimestamp() []*google_protobuf4.Timestamp {
+func (m *TestAllTypes) GetRepeatedTimestamp() []*timestamp.Timestamp {
 	if m != nil {
 		return m.RepeatedTimestamp
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedFieldmask() []*google_protobuf2.FieldMask {
+func (m *TestAllTypes) GetRepeatedFieldmask() []*field_mask.FieldMask {
 	if m != nil {
 		return m.RepeatedFieldmask
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedStruct() []*google_protobuf3.Struct {
+func (m *TestAllTypes) GetRepeatedStruct() []*_struct.Struct {
 	if m != nil {
 		return m.RepeatedStruct
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedAny() []*google_protobuf.Any {
+func (m *TestAllTypes) GetRepeatedAny() []*any.Any {
 	if m != nil {
 		return m.RepeatedAny
 	}
 	return nil
 }
 
-func (m *TestAllTypes) GetRepeatedValue() []*google_protobuf3.Value {
+func (m *TestAllTypes) GetRepeatedValue() []*_struct.Value {
 	if m != nil {
 		return m.RepeatedValue
 	}
@@ -1440,48 +1433,6 @@ func (m *TestAllTypes) GetFIELDName12() int32 {
 	return 0
 }
 
-func (m *TestAllTypes) GetXFieldName13() int32 {
-	if m != nil {
-		return m.XFieldName13
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetX_FieldName14() int32 {
-	if m != nil {
-		return m.X_FieldName14
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField_Name15() int32 {
-	if m != nil {
-		return m.Field_Name15
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField__Name16() int32 {
-	if m != nil {
-		return m.Field__Name16
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFieldName17__() int32 {
-	if m != nil {
-		return m.FieldName17__
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFieldName18__() int32 {
-	if m != nil {
-		return m.FieldName18__
-	}
-	return 0
-}
-
 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*TestAllTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _TestAllTypes_OneofMarshaler, _TestAllTypes_OneofUnmarshaler, _TestAllTypes_OneofSizer, []interface{}{
@@ -1489,11 +1440,6 @@ func (*TestAllTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer)
 		(*TestAllTypes_OneofNestedMessage)(nil),
 		(*TestAllTypes_OneofString)(nil),
 		(*TestAllTypes_OneofBytes)(nil),
-		(*TestAllTypes_OneofBool)(nil),
-		(*TestAllTypes_OneofUint64)(nil),
-		(*TestAllTypes_OneofFloat)(nil),
-		(*TestAllTypes_OneofDouble)(nil),
-		(*TestAllTypes_OneofEnum)(nil),
 	}
 }
 
@@ -1515,25 +1461,6 @@ func _TestAllTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 	case *TestAllTypes_OneofBytes:
 		b.EncodeVarint(114<<3 | proto.WireBytes)
 		b.EncodeRawBytes(x.OneofBytes)
-	case *TestAllTypes_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(115<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *TestAllTypes_OneofUint64:
-		b.EncodeVarint(116<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *TestAllTypes_OneofFloat:
-		b.EncodeVarint(117<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *TestAllTypes_OneofDouble:
-		b.EncodeVarint(118<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *TestAllTypes_OneofEnum:
-		b.EncodeVarint(119<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofEnum))
 	case nil:
 	default:
 		return fmt.Errorf("TestAllTypes.OneofField has unexpected type %T", x)
@@ -1573,41 +1500,6 @@ func _TestAllTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.B
 		x, err := b.DecodeRawBytes(true)
 		m.OneofField = &TestAllTypes_OneofBytes{x}
 		return true, err
-	case 115: // oneof_field.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofField = &TestAllTypes_OneofBool{x != 0}
-		return true, err
-	case 116: // oneof_field.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofField = &TestAllTypes_OneofUint64{x}
-		return true, err
-	case 117: // oneof_field.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofField = &TestAllTypes_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 118: // oneof_field.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofField = &TestAllTypes_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 119: // oneof_field.oneof_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofField = &TestAllTypes_OneofEnum{TestAllTypes_NestedEnum(x)}
-		return true, err
 	default:
 		return false, nil
 	}
@@ -1618,36 +1510,21 @@ func _TestAllTypes_OneofSizer(msg proto.Message) (n int) {
 	// oneof_field
 	switch x := m.OneofField.(type) {
 	case *TestAllTypes_OneofUint32:
-		n += proto.SizeVarint(111<<3 | proto.WireVarint)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(x.OneofUint32))
 	case *TestAllTypes_OneofNestedMessage:
 		s := proto.Size(x.OneofNestedMessage)
-		n += proto.SizeVarint(112<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TestAllTypes_OneofString:
-		n += proto.SizeVarint(113<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.OneofString)))
 		n += len(x.OneofString)
 	case *TestAllTypes_OneofBytes:
-		n += proto.SizeVarint(114<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
 		n += len(x.OneofBytes)
-	case *TestAllTypes_OneofBool:
-		n += proto.SizeVarint(115<<3 | proto.WireVarint)
-		n += 1
-	case *TestAllTypes_OneofUint64:
-		n += proto.SizeVarint(116<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *TestAllTypes_OneofFloat:
-		n += proto.SizeVarint(117<<3 | proto.WireFixed32)
-		n += 4
-	case *TestAllTypes_OneofDouble:
-		n += proto.SizeVarint(118<<3 | proto.WireFixed64)
-		n += 8
-	case *TestAllTypes_OneofEnum:
-		n += proto.SizeVarint(119<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofEnum))
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -1656,14 +1533,36 @@ func _TestAllTypes_OneofSizer(msg proto.Message) (n int) {
 }
 
 type TestAllTypes_NestedMessage struct {
-	A           int32         `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
+	A                    int32         `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	Corecursive          *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *TestAllTypes_NestedMessage) Reset()                    { *m = TestAllTypes_NestedMessage{} }
-func (m *TestAllTypes_NestedMessage) String() string            { return proto.CompactTextString(m) }
-func (*TestAllTypes_NestedMessage) ProtoMessage()               {}
-func (*TestAllTypes_NestedMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (m *TestAllTypes_NestedMessage) Reset()         { *m = TestAllTypes_NestedMessage{} }
+func (m *TestAllTypes_NestedMessage) String() string { return proto.CompactTextString(m) }
+func (*TestAllTypes_NestedMessage) ProtoMessage()    {}
+func (*TestAllTypes_NestedMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_conformance_48ac832451f5d6c3, []int{2, 0}
+}
+func (m *TestAllTypes_NestedMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestAllTypes_NestedMessage.Unmarshal(m, b)
+}
+func (m *TestAllTypes_NestedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestAllTypes_NestedMessage.Marshal(b, m, deterministic)
+}
+func (dst *TestAllTypes_NestedMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestAllTypes_NestedMessage.Merge(dst, src)
+}
+func (m *TestAllTypes_NestedMessage) XXX_Size() int {
+	return xxx_messageInfo_TestAllTypes_NestedMessage.Size(m)
+}
+func (m *TestAllTypes_NestedMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestAllTypes_NestedMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestAllTypes_NestedMessage proto.InternalMessageInfo
 
 func (m *TestAllTypes_NestedMessage) GetA() int32 {
 	if m != nil {
@@ -1680,13 +1579,35 @@ func (m *TestAllTypes_NestedMessage) GetCorecursive() *TestAllTypes {
 }
 
 type ForeignMessage struct {
-	C int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+	C                    int32    `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ForeignMessage) Reset()         { *m = ForeignMessage{} }
+func (m *ForeignMessage) String() string { return proto.CompactTextString(m) }
+func (*ForeignMessage) ProtoMessage()    {}
+func (*ForeignMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_conformance_48ac832451f5d6c3, []int{3}
+}
+func (m *ForeignMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ForeignMessage.Unmarshal(m, b)
+}
+func (m *ForeignMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ForeignMessage.Marshal(b, m, deterministic)
+}
+func (dst *ForeignMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ForeignMessage.Merge(dst, src)
+}
+func (m *ForeignMessage) XXX_Size() int {
+	return xxx_messageInfo_ForeignMessage.Size(m)
+}
+func (m *ForeignMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_ForeignMessage.DiscardUnknown(m)
 }
 
-func (m *ForeignMessage) Reset()                    { *m = ForeignMessage{} }
-func (m *ForeignMessage) String() string            { return proto.CompactTextString(m) }
-func (*ForeignMessage) ProtoMessage()               {}
-func (*ForeignMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_ForeignMessage proto.InternalMessageInfo
 
 func (m *ForeignMessage) GetC() int32 {
 	if m != nil {
@@ -1699,6 +1620,25 @@ func init() {
 	proto.RegisterType((*ConformanceRequest)(nil), "conformance.ConformanceRequest")
 	proto.RegisterType((*ConformanceResponse)(nil), "conformance.ConformanceResponse")
 	proto.RegisterType((*TestAllTypes)(nil), "conformance.TestAllTypes")
+	proto.RegisterMapType((map[bool]bool)(nil), "conformance.TestAllTypes.MapBoolBoolEntry")
+	proto.RegisterMapType((map[uint32]uint32)(nil), "conformance.TestAllTypes.MapFixed32Fixed32Entry")
+	proto.RegisterMapType((map[uint64]uint64)(nil), "conformance.TestAllTypes.MapFixed64Fixed64Entry")
+	proto.RegisterMapType((map[int32]float64)(nil), "conformance.TestAllTypes.MapInt32DoubleEntry")
+	proto.RegisterMapType((map[int32]float32)(nil), "conformance.TestAllTypes.MapInt32FloatEntry")
+	proto.RegisterMapType((map[int32]int32)(nil), "conformance.TestAllTypes.MapInt32Int32Entry")
+	proto.RegisterMapType((map[int64]int64)(nil), "conformance.TestAllTypes.MapInt64Int64Entry")
+	proto.RegisterMapType((map[int32]int32)(nil), "conformance.TestAllTypes.MapSfixed32Sfixed32Entry")
+	proto.RegisterMapType((map[int64]int64)(nil), "conformance.TestAllTypes.MapSfixed64Sfixed64Entry")
+	proto.RegisterMapType((map[int32]int32)(nil), "conformance.TestAllTypes.MapSint32Sint32Entry")
+	proto.RegisterMapType((map[int64]int64)(nil), "conformance.TestAllTypes.MapSint64Sint64Entry")
+	proto.RegisterMapType((map[string][]byte)(nil), "conformance.TestAllTypes.MapStringBytesEntry")
+	proto.RegisterMapType((map[string]ForeignEnum)(nil), "conformance.TestAllTypes.MapStringForeignEnumEntry")
+	proto.RegisterMapType((map[string]*ForeignMessage)(nil), "conformance.TestAllTypes.MapStringForeignMessageEntry")
+	proto.RegisterMapType((map[string]TestAllTypes_NestedEnum)(nil), "conformance.TestAllTypes.MapStringNestedEnumEntry")
+	proto.RegisterMapType((map[string]*TestAllTypes_NestedMessage)(nil), "conformance.TestAllTypes.MapStringNestedMessageEntry")
+	proto.RegisterMapType((map[string]string)(nil), "conformance.TestAllTypes.MapStringStringEntry")
+	proto.RegisterMapType((map[uint32]uint32)(nil), "conformance.TestAllTypes.MapUint32Uint32Entry")
+	proto.RegisterMapType((map[uint64]uint64)(nil), "conformance.TestAllTypes.MapUint64Uint64Entry")
 	proto.RegisterType((*TestAllTypes_NestedMessage)(nil), "conformance.TestAllTypes.NestedMessage")
 	proto.RegisterType((*ForeignMessage)(nil), "conformance.ForeignMessage")
 	proto.RegisterEnum("conformance.WireFormat", WireFormat_name, WireFormat_value)
@@ -1706,180 +1646,171 @@ func init() {
 	proto.RegisterEnum("conformance.TestAllTypes_NestedEnum", TestAllTypes_NestedEnum_name, TestAllTypes_NestedEnum_value)
 }
 
-func init() { proto.RegisterFile("conformance_proto/conformance.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 2737 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x5a, 0xd9, 0x72, 0xdb, 0xc8,
-	0xd5, 0x16, 0x08, 0x59, 0x4b, 0x93, 0x92, 0xa8, 0xd6, 0xd6, 0x96, 0x5d, 0x63, 0x58, 0xb2, 0x7f,
-	0xd3, 0xf6, 0x8c, 0xac, 0x05, 0x86, 0x65, 0xcf, 0x3f, 0x8e, 0x45, 0x9b, 0xb4, 0xe4, 0x8c, 0x25,
-	0x17, 0x64, 0x8d, 0xab, 0x9c, 0x0b, 0x06, 0xa6, 0x20, 0x15, 0xc7, 0x24, 0xc1, 0x01, 0x48, 0x4f,
-	0x94, 0xcb, 0xbc, 0x41, 0xf6, 0x7d, 0xbd, 0xcf, 0x7a, 0x93, 0xa4, 0x92, 0xab, 0x54, 0x6e, 0xb2,
-	0x27, 0x95, 0x3d, 0x79, 0x85, 0xbc, 0x43, 0x52, 0xbd, 0xa2, 0xbb, 0x01, 0x50, 0xf4, 0x54, 0x0d,
-	0x25, 0x1e, 0x7c, 0xfd, 0x9d, 0xd3, 0xe7, 0x1c, 0x7c, 0x2d, 0x1c, 0x18, 0x2c, 0xd7, 0x83, 0xf6,
-	0x51, 0x10, 0xb6, 0xbc, 0x76, 0xdd, 0xaf, 0x75, 0xc2, 0xa0, 0x1b, 0xdc, 0x90, 0x2c, 0x2b, 0xc4,
-	0x02, 0xf3, 0x92, 0x69, 0xf1, 0xec, 0x71, 0x10, 0x1c, 0x37, 0xfd, 0x1b, 0xe4, 0xd2, 0x8b, 0xde,
-	0xd1, 0x0d, 0xaf, 0x7d, 0x42, 0x71, 0x8b, 0x6f, 0xe8, 0x97, 0x0e, 0x7b, 0xa1, 0xd7, 0x6d, 0x04,
-	0x6d, 0x76, 0xdd, 0xd2, 0xaf, 0x1f, 0x35, 0xfc, 0xe6, 0x61, 0xad, 0xe5, 0x45, 0x2f, 0x19, 0xe2,
-	0xbc, 0x8e, 0x88, 0xba, 0x61, 0xaf, 0xde, 0x65, 0x57, 0x2f, 0xe8, 0x57, 0xbb, 0x8d, 0x96, 0x1f,
-	0x75, 0xbd, 0x56, 0x27, 0x2b, 0x80, 0x0f, 0x43, 0xaf, 0xd3, 0xf1, 0xc3, 0x88, 0x5e, 0x5f, 0xfa,
-	0x85, 0x01, 0xe0, 0xfd, 0x78, 0x2f, 0xae, 0xff, 0x41, 0xcf, 0x8f, 0xba, 0xf0, 0x3a, 0x28, 0xf2,
-	0x15, 0xb5, 0x8e, 0x77, 0xd2, 0x0c, 0xbc, 0x43, 0x64, 0x58, 0x46, 0xa9, 0xb0, 0x3d, 0xe4, 0x4e,
-	0xf1, 0x2b, 0x4f, 0xe8, 0x05, 0xb8, 0x0c, 0x0a, 0xef, 0x47, 0x41, 0x5b, 0x00, 0x73, 0x96, 0x51,
-	0x1a, 0xdf, 0x1e, 0x72, 0xf3, 0xd8, 0xca, 0x41, 0x7b, 0x60, 0x21, 0xa4, 0xe4, 0xfe, 0x61, 0x2d,
-	0xe8, 0x75, 0x3b, 0xbd, 0x6e, 0x8d, 0x78, 0xed, 0x22, 0xd3, 0x32, 0x4a, 0x93, 0xeb, 0x0b, 0x2b,
-	0x72, 0x9a, 0x9f, 0x35, 0x42, 0xbf, 0x4a, 0x2e, 0xbb, 0x73, 0x62, 0xdd, 0x1e, 0x59, 0x46, 0xcd,
-	0xe5, 0x71, 0x30, 0xca, 0x1c, 0x2e, 0x7d, 0x2a, 0x07, 0x66, 0x94, 0x4d, 0x44, 0x9d, 0xa0, 0x1d,
-	0xf9, 0xf0, 0x22, 0xc8, 0x77, 0xbc, 0x30, 0xf2, 0x6b, 0x7e, 0x18, 0x06, 0x21, 0xd9, 0x00, 0x8e,
-	0x0b, 0x10, 0x63, 0x05, 0xdb, 0xe0, 0x55, 0x30, 0x15, 0xf9, 0x61, 0xc3, 0x6b, 0x36, 0x3e, 0xc9,
-	0x61, 0x23, 0x0c, 0x36, 0x29, 0x2e, 0x50, 0xe8, 0x65, 0x30, 0x11, 0xf6, 0xda, 0x38, 0xc1, 0x0c,
-	0xc8, 0xf7, 0x59, 0x60, 0x66, 0x0a, 0x4b, 0x4b, 0x9d, 0x39, 0x68, 0xea, 0x86, 0xd3, 0x52, 0xb7,
-	0x08, 0x46, 0xa3, 0x97, 0x8d, 0x4e, 0xc7, 0x3f, 0x44, 0x67, 0xd8, 0x75, 0x6e, 0x28, 0x8f, 0x81,
-	0x91, 0xd0, 0x8f, 0x7a, 0xcd, 0xee, 0xd2, 0x7f, 0xaa, 0xa0, 0xf0, 0xd4, 0x8f, 0xba, 0x5b, 0xcd,
-	0xe6, 0xd3, 0x93, 0x8e, 0x1f, 0xc1, 0xcb, 0x60, 0x32, 0xe8, 0xe0, 0x5e, 0xf3, 0x9a, 0xb5, 0x46,
-	0xbb, 0xbb, 0xb1, 0x4e, 0x12, 0x70, 0xc6, 0x9d, 0xe0, 0xd6, 0x1d, 0x6c, 0xd4, 0x61, 0x8e, 0x4d,
-	0xf6, 0x65, 0x2a, 0x30, 0xc7, 0x86, 0x57, 0xc0, 0x94, 0x80, 0xf5, 0x28, 0x1d, 0xde, 0xd5, 0x84,
-	0x2b, 0x56, 0x1f, 0x10, 0x6b, 0x02, 0xe8, 0xd8, 0x64, 0x57, 0xc3, 0x2a, 0x50, 0x63, 0x8c, 0x28,
-	0x23, 0xde, 0xde, 0x74, 0x0c, 0xdc, 0x4f, 0x32, 0x46, 0x94, 0x11, 0xd7, 0x08, 0xaa, 0x40, 0xc7,
-	0x86, 0x57, 0x41, 0x51, 0x00, 0x8f, 0x1a, 0x9f, 0xf0, 0x0f, 0x37, 0xd6, 0xd1, 0xa8, 0x65, 0x94,
-	0x46, 0x5d, 0x41, 0x50, 0xa5, 0xe6, 0x24, 0xd4, 0xb1, 0xd1, 0x98, 0x65, 0x94, 0x46, 0x34, 0xa8,
-	0x63, 0xc3, 0xeb, 0x60, 0x3a, 0x76, 0xcf, 0x69, 0xc7, 0x2d, 0xa3, 0x34, 0xe5, 0x0a, 0x8e, 0x7d,
-	0x66, 0x4f, 0x01, 0x3b, 0x36, 0x02, 0x96, 0x51, 0x2a, 0xea, 0x60, 0xc7, 0x56, 0x52, 0x7f, 0xd4,
-	0x0c, 0xbc, 0x2e, 0xca, 0x5b, 0x46, 0x29, 0x17, 0xa7, 0xbe, 0x8a, 0x8d, 0xca, 0xfe, 0x0f, 0x83,
-	0xde, 0x8b, 0xa6, 0x8f, 0x0a, 0x96, 0x51, 0x32, 0xe2, 0xfd, 0x3f, 0x20, 0x56, 0xb8, 0x0c, 0xc4,
-	0xca, 0xda, 0x8b, 0x20, 0x68, 0xa2, 0x09, 0xcb, 0x28, 0x8d, 0xb9, 0x05, 0x6e, 0x2c, 0x07, 0x41,
-	0x53, 0xcd, 0x66, 0x37, 0x6c, 0xb4, 0x8f, 0xd1, 0x24, 0xee, 0x2a, 0x29, 0x9b, 0xc4, 0xaa, 0x44,
-	0xf7, 0xe2, 0xa4, 0xeb, 0x47, 0x68, 0x0a, 0xb7, 0x71, 0x1c, 0x5d, 0x19, 0x1b, 0x61, 0x0d, 0x2c,
-	0x08, 0x58, 0x9b, 0xde, 0xde, 0x2d, 0x3f, 0x8a, 0xbc, 0x63, 0x1f, 0x41, 0xcb, 0x28, 0xe5, 0xd7,
-	0xaf, 0x28, 0x37, 0xb6, 0xdc, 0xa2, 0x2b, 0xbb, 0x04, 0xff, 0x98, 0xc2, 0xdd, 0x39, 0xce, 0xa3,
-	0x98, 0xe1, 0x01, 0x40, 0x71, 0x96, 0x82, 0xd0, 0x6f, 0x1c, 0xb7, 0x85, 0x87, 0x19, 0xe2, 0xe1,
-	0x9c, 0xe2, 0xa1, 0x4a, 0x31, 0x9c, 0x75, 0x5e, 0x24, 0x53, 0xb1, 0xc3, 0xf7, 0xc0, 0xac, 0x1e,
-	0xb7, 0xdf, 0xee, 0xb5, 0xd0, 0x1c, 0x51, 0xa3, 0x4b, 0xa7, 0x05, 0x5d, 0x69, 0xf7, 0x5a, 0x2e,
-	0x54, 0x23, 0xc6, 0x36, 0xf8, 0x2e, 0x98, 0x4b, 0x84, 0x4b, 0x88, 0xe7, 0x09, 0x31, 0x4a, 0x8b,
-	0x95, 0x90, 0xcd, 0x68, 0x81, 0x12, 0x36, 0x47, 0x62, 0xa3, 0xd5, 0xaa, 0x75, 0x1a, 0x7e, 0xdd,
-	0x47, 0x08, 0xd7, 0xac, 0x9c, 0x1b, 0xcb, 0xc5, 0xeb, 0x68, 0xdd, 0x9e, 0xe0, 0xcb, 0xf0, 0x8a,
-	0xd4, 0x0a, 0xf5, 0x20, 0x3c, 0x44, 0x67, 0x19, 0xde, 0x88, 0xdb, 0xe1, 0x7e, 0x10, 0x1e, 0xc2,
-	0x2a, 0x98, 0x0e, 0xfd, 0x7a, 0x2f, 0x8c, 0x1a, 0xaf, 0x7c, 0x91, 0xd6, 0x73, 0x24, 0xad, 0x67,
-	0x33, 0x73, 0xe0, 0x16, 0xc5, 0x1a, 0x9e, 0xce, 0xcb, 0x60, 0x32, 0xf4, 0x3b, 0xbe, 0x87, 0xf3,
-	0x48, 0x6f, 0xe6, 0x0b, 0x96, 0x89, 0xd5, 0x86, 0x5b, 0x85, 0xda, 0xc8, 0x30, 0xc7, 0x46, 0x96,
-	0x65, 0x62, 0xb5, 0x91, 0x60, 0x54, 0x1b, 0x04, 0x8c, 0xa9, 0xcd, 0x45, 0xcb, 0xc4, 0x6a, 0xc3,
-	0xcd, 0xb1, 0xda, 0x28, 0x40, 0xc7, 0x46, 0x4b, 0x96, 0x89, 0xd5, 0x46, 0x06, 0x6a, 0x8c, 0x4c,
-	0x6d, 0x96, 0x2d, 0x13, 0xab, 0x0d, 0x37, 0xef, 0x27, 0x19, 0x99, 0xda, 0x5c, 0xb2, 0x4c, 0xac,
-	0x36, 0x32, 0x90, 0xaa, 0x8d, 0x00, 0x72, 0x59, 0xb8, 0x6c, 0x99, 0x58, 0x6d, 0xb8, 0x5d, 0x52,
-	0x1b, 0x15, 0xea, 0xd8, 0xe8, 0xff, 0x2c, 0x13, 0xab, 0x8d, 0x02, 0xa5, 0x6a, 0x13, 0xbb, 0xe7,
-	0xb4, 0x57, 0x2c, 0x13, 0xab, 0x8d, 0x08, 0x40, 0x52, 0x1b, 0x0d, 0xec, 0xd8, 0xa8, 0x64, 0x99,
-	0x58, 0x6d, 0x54, 0x30, 0x55, 0x9b, 0x38, 0x08, 0xa2, 0x36, 0x57, 0x2d, 0x13, 0xab, 0x8d, 0x08,
-	0x81, 0xab, 0x8d, 0x80, 0x31, 0xb5, 0xb9, 0x66, 0x99, 0x58, 0x6d, 0xb8, 0x39, 0x56, 0x1b, 0x01,
-	0x24, 0x6a, 0x73, 0xdd, 0x32, 0xb1, 0xda, 0x70, 0x23, 0x57, 0x9b, 0x38, 0x42, 0xaa, 0x36, 0x6f,
-	0x5a, 0x26, 0x56, 0x1b, 0x11, 0x9f, 0x50, 0x9b, 0x98, 0x8d, 0xa8, 0xcd, 0x5b, 0x96, 0x89, 0xd5,
-	0x46, 0xd0, 0x71, 0xb5, 0x11, 0x30, 0x4d, 0x6d, 0x56, 0x2d, 0xf3, 0xb5, 0xd4, 0x86, 0xf3, 0x24,
-	0xd4, 0x26, 0xce, 0x92, 0xa6, 0x36, 0x6b, 0xc4, 0x43, 0x7f, 0xb5, 0x11, 0xc9, 0x4c, 0xa8, 0x8d,
-	0x1e, 0x37, 0x11, 0x85, 0x0d, 0xcb, 0x1c, 0x5c, 0x6d, 0xd4, 0x88, 0xb9, 0xda, 0x24, 0xc2, 0x25,
-	0xc4, 0x36, 0x21, 0xee, 0xa3, 0x36, 0x5a, 0xa0, 0x5c, 0x6d, 0xb4, 0x6a, 0x31, 0xb5, 0x71, 0x70,
-	0xcd, 0xa8, 0xda, 0xa8, 0x75, 0x13, 0x6a, 0x23, 0xd6, 0x11, 0xb5, 0xb9, 0xc5, 0xf0, 0x46, 0xdc,
-	0x0e, 0x44, 0x6d, 0x9e, 0x82, 0xa9, 0x96, 0xd7, 0xa1, 0x02, 0xc1, 0x64, 0x62, 0x93, 0x24, 0xf5,
-	0xcd, 0xec, 0x0c, 0x3c, 0xf6, 0x3a, 0x44, 0x3b, 0xc8, 0x47, 0xa5, 0xdd, 0x0d, 0x4f, 0xdc, 0x89,
-	0x96, 0x6c, 0x93, 0x58, 0x1d, 0x9b, 0xa9, 0xca, 0xed, 0xc1, 0x58, 0x1d, 0x9b, 0x7c, 0x28, 0xac,
-	0xcc, 0x06, 0x9f, 0x83, 0x69, 0xcc, 0x4a, 0xe5, 0x87, 0xab, 0xd0, 0x1d, 0xc2, 0xbb, 0xd2, 0x97,
-	0x97, 0x4a, 0x13, 0xfd, 0xa4, 0xcc, 0x38, 0x3c, 0xd9, 0x2a, 0x73, 0x3b, 0x36, 0x17, 0xae, 0xb7,
-	0x07, 0xe4, 0x76, 0x6c, 0xfa, 0xa9, 0x72, 0x73, 0x2b, 0xe7, 0xa6, 0x22, 0xc7, 0xb5, 0xee, 0xff,
-	0x07, 0xe0, 0xa6, 0x02, 0xb8, 0xaf, 0xc5, 0x2d, 0x5b, 0x65, 0x6e, 0xc7, 0xe6, 0xf2, 0xf8, 0xce,
-	0x80, 0xdc, 0x8e, 0xbd, 0xaf, 0xc5, 0x2d, 0x5b, 0xe1, 0xc7, 0xc1, 0x0c, 0xe6, 0x66, 0xda, 0x26,
-	0x24, 0xf5, 0x2e, 0x61, 0x5f, 0xed, 0xcb, 0xce, 0x74, 0x96, 0xfd, 0xa0, 0xfc, 0x38, 0x50, 0xd5,
-	0xae, 0x78, 0x70, 0x6c, 0xa1, 0xc4, 0x1f, 0x19, 0xd4, 0x83, 0x63, 0xb3, 0x1f, 0x9a, 0x07, 0x61,
-	0x87, 0x47, 0x60, 0x8e, 0xe4, 0x87, 0x6f, 0x42, 0x28, 0xf8, 0x3d, 0xe2, 0x63, 0xbd, 0x7f, 0x8e,
-	0x18, 0x98, 0xff, 0xa4, 0x5e, 0x70, 0xc8, 0xfa, 0x15, 0xd5, 0x0f, 0xae, 0x04, 0xdf, 0xcb, 0xd6,
-	0xc0, 0x7e, 0x1c, 0x9b, 0xff, 0xd4, 0xfd, 0xc4, 0x57, 0xd4, 0xfb, 0x95, 0x1e, 0x1a, 0xe5, 0x41,
-	0xef, 0x57, 0x72, 0x9c, 0x68, 0xf7, 0x2b, 0x3d, 0x62, 0x9e, 0x81, 0x62, 0xcc, 0xca, 0xce, 0x98,
-	0xfb, 0x84, 0xf6, 0xad, 0xd3, 0x69, 0xe9, 0xe9, 0x43, 0x79, 0x27, 0x5b, 0x8a, 0x11, 0xee, 0x02,
-	0xec, 0x89, 0x9c, 0x46, 0xf4, 0x48, 0x7a, 0x40, 0x58, 0xaf, 0xf5, 0x65, 0xc5, 0xe7, 0x14, 0xfe,
-	0x9f, 0x52, 0xe6, 0x5b, 0xb1, 0x45, 0xb4, 0x3b, 0x95, 0x42, 0x76, 0x7e, 0x55, 0x06, 0x69, 0x77,
-	0x02, 0xa5, 0x9f, 0x52, 0xbb, 0x4b, 0x56, 0x9e, 0x04, 0xc6, 0x4d, 0x8f, 0xbc, 0xea, 0x00, 0x49,
-	0xa0, 0xcb, 0xc9, 0x69, 0x18, 0x27, 0x41, 0x32, 0xc2, 0x0e, 0x38, 0x2b, 0x11, 0x6b, 0x87, 0xe4,
-	0x43, 0xe2, 0xe1, 0xe6, 0x00, 0x1e, 0x94, 0x63, 0x91, 0x7a, 0x9a, 0x6f, 0xa5, 0x5e, 0x84, 0x11,
-	0x58, 0x94, 0x3c, 0xea, 0xa7, 0xe6, 0x36, 0x71, 0xe9, 0x0c, 0xe0, 0x52, 0x3d, 0x33, 0xa9, 0xcf,
-	0x85, 0x56, 0xfa, 0x55, 0x78, 0x0c, 0xe6, 0x93, 0xdb, 0x24, 0x47, 0xdf, 0xce, 0x20, 0xf7, 0x80,
-	0xb4, 0x0d, 0x7c, 0xf4, 0x49, 0xf7, 0x80, 0x76, 0x05, 0xbe, 0x0f, 0x16, 0x52, 0x76, 0x47, 0x3c,
-	0x3d, 0x22, 0x9e, 0x36, 0x06, 0xdf, 0x5a, 0xec, 0x6a, 0xb6, 0x95, 0x72, 0x09, 0x2e, 0x83, 0x42,
-	0xd0, 0xf6, 0x83, 0x23, 0x7e, 0xdc, 0x04, 0xf8, 0x11, 0x7b, 0x7b, 0xc8, 0xcd, 0x13, 0x2b, 0x3b,
-	0x3c, 0x3e, 0x06, 0x66, 0x29, 0x48, 0xab, 0x6d, 0xe7, 0xb5, 0x1e, 0xb7, 0xb6, 0x87, 0x5c, 0x48,
-	0x68, 0xd4, 0x5a, 0x8a, 0x08, 0x58, 0xb7, 0x7f, 0xc0, 0x27, 0x12, 0xc4, 0xca, 0x7a, 0xf7, 0x22,
-	0xa0, 0x5f, 0x59, 0xdb, 0x86, 0x6c, 0xbc, 0x01, 0x88, 0x91, 0x76, 0xe1, 0x05, 0x00, 0x18, 0x04,
-	0xdf, 0x87, 0x11, 0x7e, 0x10, 0xdd, 0x1e, 0x72, 0xc7, 0x29, 0x02, 0xdf, 0x5b, 0xca, 0x56, 0x1d,
-	0x1b, 0x75, 0x2d, 0xa3, 0x34, 0xac, 0x6c, 0xd5, 0xb1, 0x63, 0x47, 0x54, 0x7b, 0x7a, 0xf8, 0xf1,
-	0x58, 0x38, 0xa2, 0x62, 0x22, 0x78, 0x98, 0x90, 0xbc, 0xc2, 0x8f, 0xc6, 0x82, 0x87, 0x09, 0x43,
-	0x85, 0x47, 0x43, 0xca, 0xf6, 0xe1, 0xe0, 0x8f, 0x78, 0x22, 0x66, 0x52, 0x9e, 0x3d, 0xe9, 0x69,
-	0x8c, 0x88, 0x0c, 0x9b, 0xa6, 0xa1, 0x5f, 0x19, 0x24, 0xf7, 0x8b, 0x2b, 0x74, 0xdc, 0xb6, 0xc2,
-	0xe7, 0x3c, 0x2b, 0x78, 0xab, 0xef, 0x79, 0xcd, 0x9e, 0x1f, 0x3f, 0xa6, 0x61, 0xd3, 0x33, 0xba,
-	0x0e, 0xba, 0x60, 0x5e, 0x9d, 0xd1, 0x08, 0xc6, 0x5f, 0x1b, 0xec, 0xd1, 0x56, 0x67, 0x24, 0x7a,
-	0x47, 0x29, 0x67, 0x95, 0x49, 0x4e, 0x06, 0xa7, 0x63, 0x0b, 0xce, 0xdf, 0xf4, 0xe1, 0x74, 0xec,
-	0x24, 0xa7, 0x63, 0x73, 0xce, 0x03, 0xe9, 0x21, 0xbf, 0xa7, 0x06, 0xfa, 0x5b, 0x4a, 0x7a, 0x3e,
-	0x41, 0x7a, 0x20, 0x45, 0x3a, 0xa7, 0x0e, 0x89, 0xb2, 0x68, 0xa5, 0x58, 0x7f, 0xd7, 0x8f, 0x96,
-	0x07, 0x3b, 0xa7, 0x8e, 0x94, 0xd2, 0x32, 0x40, 0x1a, 0x47, 0xb0, 0xfe, 0x3e, 0x2b, 0x03, 0xa4,
-	0x97, 0xb4, 0x0c, 0x10, 0x5b, 0x5a, 0xa8, 0xb4, 0xd3, 0x04, 0xe9, 0x1f, 0xb2, 0x42, 0xa5, 0xcd,
-	0xa7, 0x85, 0x4a, 0x8d, 0x69, 0xb4, 0x4c, 0x61, 0x38, 0xed, 0x1f, 0xb3, 0x68, 0xe9, 0x4d, 0xa8,
-	0xd1, 0x52, 0x63, 0x5a, 0x06, 0xc8, 0x3d, 0x2a, 0x58, 0xff, 0x94, 0x95, 0x01, 0x72, 0xdb, 0x6a,
-	0x19, 0x20, 0x36, 0xce, 0xb9, 0x27, 0x3d, 0x1c, 0x28, 0xcd, 0xff, 0x67, 0x83, 0xc8, 0x60, 0xdf,
-	0xe6, 0x97, 0x1f, 0x0a, 0xa5, 0x20, 0xd5, 0x91, 0x81, 0x60, 0xfc, 0x8b, 0xc1, 0x9e, 0xb4, 0xfa,
-	0x35, 0xbf, 0x32, 0x58, 0xc8, 0xe0, 0x94, 0x1a, 0xea, 0xaf, 0x7d, 0x38, 0x45, 0xf3, 0x2b, 0x53,
-	0x08, 0xa9, 0x46, 0xda, 0x30, 0x42, 0x90, 0xfe, 0x8d, 0x92, 0x9e, 0xd2, 0xfc, 0xea, 0xcc, 0x22,
-	0x8b, 0x56, 0x8a, 0xf5, 0xef, 0xfd, 0x68, 0x45, 0xf3, 0xab, 0x13, 0x8e, 0xb4, 0x0c, 0xa8, 0xcd,
-	0xff, 0x8f, 0xac, 0x0c, 0xc8, 0xcd, 0xaf, 0x0c, 0x03, 0xd2, 0x42, 0xd5, 0x9a, 0xff, 0x9f, 0x59,
-	0xa1, 0x2a, 0xcd, 0xaf, 0x8e, 0x0e, 0xd2, 0x68, 0xb5, 0xe6, 0xff, 0x57, 0x16, 0xad, 0xd2, 0xfc,
-	0xea, 0xb3, 0x68, 0x5a, 0x06, 0xd4, 0xe6, 0xff, 0x77, 0x56, 0x06, 0xe4, 0xe6, 0x57, 0x06, 0x0e,
-	0x9c, 0xf3, 0xa1, 0x34, 0xd7, 0xe5, 0xef, 0x70, 0xd0, 0x77, 0x73, 0x6c, 0x4e, 0x96, 0xd8, 0x3b,
-	0x43, 0xc4, 0x33, 0x5f, 0x6e, 0x81, 0x8f, 0x80, 0x18, 0x1a, 0xd6, 0xc4, 0xcb, 0x1a, 0xf4, 0xbd,
-	0x5c, 0xc6, 0xf9, 0xf1, 0x94, 0x43, 0x5c, 0xe1, 0x5f, 0x98, 0xe0, 0x47, 0xc1, 0x8c, 0x34, 0xc4,
-	0xe6, 0x2f, 0x8e, 0xd0, 0xf7, 0xb3, 0xc8, 0xaa, 0x18, 0xf3, 0xd8, 0x8b, 0x5e, 0xc6, 0x64, 0xc2,
-	0x04, 0xb7, 0xd4, 0xb9, 0x70, 0xaf, 0xde, 0x45, 0x3f, 0xa0, 0x44, 0x0b, 0x69, 0x45, 0xe8, 0xd5,
-	0xbb, 0xca, 0xc4, 0xb8, 0x57, 0xef, 0xc2, 0x4d, 0x20, 0x66, 0x8b, 0x35, 0xaf, 0x7d, 0x82, 0x7e,
-	0x48, 0xd7, 0xcf, 0x26, 0xd6, 0x6f, 0xb5, 0x4f, 0xdc, 0x3c, 0x87, 0x6e, 0xb5, 0x4f, 0xe0, 0x5d,
-	0x69, 0xd6, 0xfc, 0x0a, 0x97, 0x01, 0xfd, 0x88, 0xae, 0x9d, 0x4f, 0xac, 0xa5, 0x55, 0x12, 0xd3,
-	0x4d, 0xf2, 0x15, 0x97, 0x27, 0x6e, 0x50, 0x5e, 0x9e, 0x1f, 0xe7, 0x48, 0xb5, 0xfb, 0x95, 0x47,
-	0xf4, 0xa5, 0x54, 0x1e, 0x41, 0x14, 0x97, 0xe7, 0x27, 0xb9, 0x0c, 0x85, 0x93, 0xca, 0xc3, 0x97,
-	0xc5, 0xe5, 0x91, 0xb9, 0x48, 0x79, 0x48, 0x75, 0x7e, 0x9a, 0xc5, 0x25, 0x55, 0x27, 0x1e, 0x0a,
-	0xb2, 0x55, 0xb8, 0x3a, 0xf2, 0xad, 0x82, 0xab, 0xf3, 0x4b, 0x4a, 0x94, 0x5d, 0x1d, 0xe9, 0xee,
-	0x60, 0xd5, 0x11, 0x14, 0xb8, 0x3a, 0x3f, 0xa3, 0xeb, 0x33, 0xaa, 0xc3, 0xa1, 0xac, 0x3a, 0x62,
-	0x25, 0xad, 0xce, 0xcf, 0xe9, 0xda, 0xcc, 0xea, 0x70, 0x38, 0xad, 0xce, 0x05, 0x00, 0xc8, 0xfe,
-	0xdb, 0x5e, 0xcb, 0x5f, 0x43, 0x9f, 0x36, 0xc9, 0x6b, 0x28, 0xc9, 0x04, 0x2d, 0x90, 0xa7, 0xfd,
-	0x8b, 0xbf, 0xae, 0xa3, 0xcf, 0xc8, 0x88, 0x5d, 0x6c, 0x82, 0x17, 0x41, 0xa1, 0x16, 0x43, 0x36,
-	0xd0, 0x67, 0x19, 0xa4, 0xca, 0x21, 0x1b, 0x70, 0x09, 0x4c, 0x50, 0x04, 0x81, 0xd8, 0x35, 0xf4,
-	0x39, 0x9d, 0x86, 0xfc, 0x3d, 0x49, 0xbe, 0xad, 0x62, 0xc8, 0x4d, 0xf4, 0x79, 0x8a, 0x90, 0x6d,
-	0x70, 0x99, 0xd3, 0xac, 0x12, 0x1e, 0x07, 0x7d, 0x41, 0x01, 0x61, 0x1e, 0x47, 0xec, 0x08, 0x7f,
-	0xbb, 0x85, 0xbe, 0xa8, 0x3b, 0xba, 0x85, 0x01, 0x22, 0xb4, 0x4d, 0xf4, 0x25, 0x3d, 0xda, 0xcd,
-	0x78, 0xcb, 0xf8, 0xeb, 0x6d, 0xf4, 0x65, 0x9d, 0xe2, 0x36, 0x5c, 0x02, 0x85, 0xaa, 0x40, 0xac,
-	0xad, 0xa2, 0xaf, 0xb0, 0x38, 0x04, 0xc9, 0xda, 0x2a, 0xc1, 0xec, 0x54, 0xde, 0x7d, 0x50, 0xdb,
-	0xdd, 0x7a, 0x5c, 0x59, 0x5b, 0x43, 0x5f, 0xe5, 0x18, 0x6c, 0xa4, 0xb6, 0x18, 0x43, 0x72, 0xbd,
-	0x8e, 0xbe, 0xa6, 0x60, 0x88, 0x0d, 0x5e, 0x02, 0x93, 0x35, 0x29, 0xbf, 0x6b, 0x1b, 0xe8, 0xeb,
-	0x09, 0x6f, 0x1b, 0x14, 0x55, 0x8d, 0x51, 0x36, 0xfa, 0x46, 0x02, 0x65, 0xc7, 0x09, 0xa4, 0xa0,
-	0x9b, 0xe8, 0x9b, 0x72, 0x02, 0x09, 0x48, 0xca, 0x32, 0xdd, 0x9d, 0x83, 0xbe, 0x95, 0x00, 0x39,
-	0xd8, 0x9f, 0x14, 0xd3, 0xad, 0x5a, 0x0d, 0x7d, 0x3b, 0x81, 0xba, 0x85, 0x51, 0x52, 0x4c, 0x9b,
-	0xb5, 0x1a, 0xfa, 0x4e, 0x22, 0xaa, 0xcd, 0xc5, 0xe7, 0x60, 0x42, 0x7d, 0xd0, 0x29, 0x00, 0xc3,
-	0x63, 0x6f, 0x44, 0x0d, 0x0f, 0xbe, 0x0d, 0xf2, 0xf5, 0x40, 0xbc, 0xd4, 0x40, 0xb9, 0xd3, 0x5e,
-	0x80, 0xc8, 0xe8, 0xc5, 0x7b, 0x00, 0x26, 0x87, 0x94, 0xb0, 0x08, 0xcc, 0x97, 0xfe, 0x09, 0x73,
-	0x81, 0x7f, 0x85, 0xb3, 0xe0, 0x0c, 0xbd, 0x7d, 0x72, 0xc4, 0x46, 0xbf, 0xdc, 0xc9, 0x6d, 0x1a,
-	0x31, 0x83, 0x3c, 0x90, 0x94, 0x19, 0xcc, 0x14, 0x06, 0x53, 0x66, 0x28, 0x83, 0xd9, 0xb4, 0xd1,
-	0xa3, 0xcc, 0x31, 0x91, 0xc2, 0x31, 0x91, 0xce, 0xa1, 0x8c, 0x18, 0x65, 0x8e, 0xe1, 0x14, 0x8e,
-	0xe1, 0x24, 0x47, 0x62, 0x94, 0x28, 0x73, 0x4c, 0xa7, 0x70, 0x4c, 0xa7, 0x73, 0x28, 0x23, 0x43,
-	0x99, 0x03, 0xa6, 0x70, 0x40, 0x99, 0xe3, 0x01, 0x98, 0x4f, 0x1f, 0x0c, 0xca, 0x2c, 0xa3, 0x29,
-	0x2c, 0xa3, 0x19, 0x2c, 0xea, 0xf0, 0x4f, 0x66, 0x19, 0x49, 0x61, 0x19, 0x91, 0x59, 0xaa, 0x00,
-	0x65, 0x8d, 0xf7, 0x64, 0x9e, 0xa9, 0x14, 0x9e, 0xa9, 0x2c, 0x1e, 0x6d, 0x7c, 0x27, 0xf3, 0x14,
-	0x53, 0x78, 0x8a, 0xa9, 0xdd, 0x26, 0x0f, 0xe9, 0x4e, 0xeb, 0xd7, 0x9c, 0xcc, 0xb0, 0x05, 0x66,
-	0x52, 0xe6, 0x71, 0xa7, 0x51, 0x18, 0x32, 0xc5, 0x5d, 0x50, 0xd4, 0x87, 0x6f, 0xf2, 0xfa, 0xb1,
-	0x94, 0xf5, 0x63, 0x29, 0x4d, 0xa2, 0x0f, 0xda, 0x64, 0x8e, 0xf1, 0x14, 0x8e, 0xf1, 0xe4, 0x36,
-	0xf4, 0x89, 0xda, 0x69, 0x14, 0x05, 0x99, 0x22, 0x04, 0xe7, 0xfa, 0x8c, 0xcc, 0x52, 0xa8, 0xde,
-	0x91, 0xa9, 0x5e, 0xe3, 0x7d, 0x95, 0xe4, 0xf3, 0x18, 0x9c, 0xef, 0x37, 0x33, 0x4b, 0x71, 0xba,
-	0xa6, 0x3a, 0xed, 0xfb, 0x0a, 0x4b, 0x72, 0xd4, 0xa4, 0x0d, 0x97, 0x36, 0x2b, 0x4b, 0x71, 0x72,
-	0x47, 0x76, 0x32, 0xe8, 0x4b, 0x2d, 0xc9, 0x9b, 0x07, 0xce, 0x66, 0xce, 0xcb, 0x52, 0xdc, 0xad,
-	0xa8, 0xee, 0xb2, 0x5f, 0x75, 0xc5, 0x2e, 0x96, 0x6e, 0x03, 0x20, 0x4d, 0xf6, 0x46, 0x81, 0x59,
-	0xdd, 0xdb, 0x2b, 0x0e, 0xe1, 0x5f, 0xca, 0x5b, 0x6e, 0xd1, 0xa0, 0xbf, 0x3c, 0x2f, 0xe6, 0xb0,
-	0xbb, 0xdd, 0xca, 0xc3, 0xe2, 0x7f, 0xf9, 0x7f, 0x46, 0x79, 0x42, 0x8c, 0xa2, 0xf0, 0xa9, 0xb2,
-	0xf4, 0x06, 0x98, 0xd4, 0x06, 0x92, 0x05, 0x60, 0xd4, 0xf9, 0x81, 0x52, 0xbf, 0x76, 0x13, 0x80,
-	0xf8, 0xdf, 0x30, 0xc1, 0x29, 0x90, 0x3f, 0xd8, 0xdd, 0x7f, 0x52, 0xb9, 0xbf, 0x53, 0xdd, 0xa9,
-	0x3c, 0x28, 0x0e, 0xc1, 0x02, 0x18, 0x7b, 0xe2, 0xee, 0x3d, 0xdd, 0x2b, 0x1f, 0x54, 0x8b, 0x06,
-	0x1c, 0x03, 0xc3, 0x8f, 0xf6, 0xf7, 0x76, 0x8b, 0xb9, 0x6b, 0xf7, 0x40, 0x5e, 0x9e, 0x07, 0x4e,
-	0x81, 0x7c, 0x75, 0xcf, 0xad, 0xec, 0x3c, 0xdc, 0xad, 0xd1, 0x48, 0x25, 0x03, 0x8d, 0x58, 0x31,
-	0x3c, 0x2f, 0xe6, 0xca, 0x17, 0xc1, 0x85, 0x7a, 0xd0, 0x4a, 0xfc, 0x61, 0x26, 0x25, 0xe7, 0xc5,
-	0x08, 0xb1, 0x6e, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x33, 0xc2, 0x0c, 0xb6, 0xeb, 0x26, 0x00,
-	0x00,
+func init() { proto.RegisterFile("conformance.proto", fileDescriptor_conformance_48ac832451f5d6c3) }
+
+var fileDescriptor_conformance_48ac832451f5d6c3 = []byte{
+	// 2600 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x5a, 0x5b, 0x73, 0x13, 0xc9,
+	0x15, 0xf6, 0x68, 0xc0, 0x36, 0x2d, 0xd9, 0x96, 0xdb, 0xb7, 0xc6, 0x50, 0xcb, 0x60, 0x96, 0x20,
+	0x60, 0xd7, 0xeb, 0xcb, 0x30, 0x5c, 0x36, 0x4b, 0xb0, 0xc0, 0x02, 0x93, 0xc5, 0xa2, 0xc6, 0x78,
+	0xa9, 0x22, 0x0f, 0xca, 0x20, 0x8f, 0x5d, 0x5a, 0x24, 0x8d, 0x76, 0x66, 0xb4, 0x89, 0xf3, 0x98,
+	0x7f, 0x90, 0xfb, 0xf5, 0x2f, 0xe4, 0x5a, 0x95, 0x4a, 0x52, 0xc9, 0x53, 0x2a, 0x2f, 0xb9, 0x27,
+	0x95, 0x7b, 0xf2, 0x63, 0x92, 0xea, 0xeb, 0x74, 0xb7, 0x7a, 0x64, 0xb1, 0x55, 0x2b, 0x5b, 0xa7,
+	0xbf, 0xfe, 0xce, 0xe9, 0xd3, 0x67, 0xbe, 0x76, 0x9f, 0x01, 0xcc, 0x36, 0xa3, 0xee, 0x61, 0x14,
+	0x77, 0x82, 0x6e, 0x33, 0x5c, 0xed, 0xc5, 0x51, 0x1a, 0xc1, 0xa2, 0x64, 0x5a, 0x3e, 0x7b, 0x14,
+	0x45, 0x47, 0xed, 0xf0, 0x1d, 0x32, 0xf4, 0xb2, 0x7f, 0xf8, 0x4e, 0xd0, 0x3d, 0xa6, 0xb8, 0xe5,
+	0x37, 0xf4, 0xa1, 0x83, 0x7e, 0x1c, 0xa4, 0xad, 0xa8, 0xcb, 0xc6, 0x1d, 0x7d, 0xfc, 0xb0, 0x15,
+	0xb6, 0x0f, 0x1a, 0x9d, 0x20, 0x79, 0xc5, 0x10, 0xe7, 0x75, 0x44, 0x92, 0xc6, 0xfd, 0x66, 0xca,
+	0x46, 0x2f, 0xe8, 0xa3, 0x69, 0xab, 0x13, 0x26, 0x69, 0xd0, 0xe9, 0xe5, 0x05, 0xf0, 0xb9, 0x38,
+	0xe8, 0xf5, 0xc2, 0x38, 0xa1, 0xe3, 0x2b, 0xbf, 0xb2, 0x00, 0xbc, 0x9f, 0xad, 0xc5, 0x0f, 0x3f,
+	0xea, 0x87, 0x49, 0x0a, 0xaf, 0x83, 0x32, 0x9f, 0xd1, 0xe8, 0x05, 0xc7, 0xed, 0x28, 0x38, 0x40,
+	0x96, 0x63, 0x55, 0x4a, 0x8f, 0xc6, 0xfc, 0x19, 0x3e, 0xf2, 0x94, 0x0e, 0xc0, 0x4b, 0xa0, 0xf4,
+	0x61, 0x12, 0x75, 0x05, 0xb0, 0xe0, 0x58, 0x95, 0x33, 0x8f, 0xc6, 0xfc, 0x22, 0xb6, 0x72, 0x50,
+	0x1d, 0x2c, 0xc5, 0x94, 0x3c, 0x3c, 0x68, 0x44, 0xfd, 0xb4, 0xd7, 0x4f, 0x1b, 0xc4, 0x6b, 0x8a,
+	0x6c, 0xc7, 0xaa, 0x4c, 0x6f, 0x2c, 0xad, 0xca, 0x69, 0x7e, 0xde, 0x8a, 0xc3, 0x1a, 0x19, 0xf6,
+	0x17, 0xc4, 0xbc, 0x3a, 0x99, 0x46, 0xcd, 0xd5, 0x33, 0x60, 0x82, 0x39, 0x5c, 0xf9, 0x62, 0x01,
+	0xcc, 0x29, 0x8b, 0x48, 0x7a, 0x51, 0x37, 0x09, 0xe1, 0x45, 0x50, 0xec, 0x05, 0x71, 0x12, 0x36,
+	0xc2, 0x38, 0x8e, 0x62, 0xb2, 0x00, 0x1c, 0x17, 0x20, 0xc6, 0x6d, 0x6c, 0x83, 0x57, 0xc1, 0x4c,
+	0x12, 0xc6, 0xad, 0xa0, 0xdd, 0xfa, 0x02, 0x87, 0x8d, 0x33, 0xd8, 0xb4, 0x18, 0xa0, 0xd0, 0xcb,
+	0x60, 0x2a, 0xee, 0x77, 0x71, 0x82, 0x19, 0x90, 0xaf, 0xb3, 0xc4, 0xcc, 0x14, 0x66, 0x4a, 0x9d,
+	0x3d, 0x6a, 0xea, 0x4e, 0x99, 0x52, 0xb7, 0x0c, 0x26, 0x92, 0x57, 0xad, 0x5e, 0x2f, 0x3c, 0x40,
+	0xa7, 0xd9, 0x38, 0x37, 0x54, 0x27, 0xc1, 0x78, 0x1c, 0x26, 0xfd, 0x76, 0xba, 0xf2, 0x93, 0xfb,
+	0xa0, 0xf4, 0x2c, 0x4c, 0xd2, 0xad, 0x76, 0xfb, 0xd9, 0x71, 0x2f, 0x4c, 0xe0, 0x65, 0x30, 0x1d,
+	0xf5, 0x70, 0xad, 0x05, 0xed, 0x46, 0xab, 0x9b, 0x6e, 0x6e, 0x90, 0x04, 0x9c, 0xf6, 0xa7, 0xb8,
+	0x75, 0x07, 0x1b, 0x75, 0x98, 0xe7, 0x92, 0x75, 0xd9, 0x0a, 0xcc, 0x73, 0xe1, 0x15, 0x30, 0x23,
+	0x60, 0x7d, 0x4a, 0x87, 0x57, 0x35, 0xe5, 0x8b, 0xd9, 0xfb, 0xc4, 0x3a, 0x00, 0xf4, 0x5c, 0xb2,
+	0xaa, 0x53, 0x2a, 0x50, 0x63, 0x4c, 0x28, 0x23, 0x5e, 0xde, 0x6c, 0x06, 0xdc, 0x1b, 0x64, 0x4c,
+	0x28, 0x23, 0xde, 0x23, 0xa8, 0x02, 0x3d, 0x17, 0x5e, 0x05, 0x65, 0x01, 0x3c, 0x6c, 0x7d, 0x3e,
+	0x3c, 0xd8, 0xdc, 0x40, 0x13, 0x8e, 0x55, 0x99, 0xf0, 0x05, 0x41, 0x8d, 0x9a, 0x07, 0xa1, 0x9e,
+	0x8b, 0x26, 0x1d, 0xab, 0x32, 0xae, 0x41, 0x3d, 0x17, 0x5e, 0x07, 0xb3, 0x99, 0x7b, 0x4e, 0x7b,
+	0xc6, 0xb1, 0x2a, 0x33, 0xbe, 0xe0, 0xd8, 0x63, 0x76, 0x03, 0xd8, 0x73, 0x11, 0x70, 0xac, 0x4a,
+	0x59, 0x07, 0x7b, 0xae, 0x92, 0xfa, 0xc3, 0x76, 0x14, 0xa4, 0xa8, 0xe8, 0x58, 0x95, 0x42, 0x96,
+	0xfa, 0x1a, 0x36, 0x2a, 0xeb, 0x3f, 0x88, 0xfa, 0x2f, 0xdb, 0x21, 0x2a, 0x39, 0x56, 0xc5, 0xca,
+	0xd6, 0xff, 0x80, 0x58, 0xe1, 0x25, 0x20, 0x66, 0x36, 0x5e, 0x46, 0x51, 0x1b, 0x4d, 0x39, 0x56,
+	0x65, 0xd2, 0x2f, 0x71, 0x63, 0x35, 0x8a, 0xda, 0x6a, 0x36, 0xd3, 0xb8, 0xd5, 0x3d, 0x42, 0xd3,
+	0xb8, 0xaa, 0xa4, 0x6c, 0x12, 0xab, 0x12, 0xdd, 0xcb, 0xe3, 0x34, 0x4c, 0xd0, 0x0c, 0x2e, 0xe3,
+	0x2c, 0xba, 0x2a, 0x36, 0xc2, 0x06, 0x58, 0x12, 0xb0, 0x2e, 0x7d, 0xbc, 0x3b, 0x61, 0x92, 0x04,
+	0x47, 0x21, 0x82, 0x8e, 0x55, 0x29, 0x6e, 0x5c, 0x51, 0x1e, 0x6c, 0xb9, 0x44, 0x57, 0x77, 0x09,
+	0xfe, 0x09, 0x85, 0xfb, 0x0b, 0x9c, 0x47, 0x31, 0xc3, 0x7d, 0x80, 0xb2, 0x2c, 0x45, 0x71, 0xd8,
+	0x3a, 0xea, 0x0a, 0x0f, 0x73, 0xc4, 0xc3, 0x39, 0xc5, 0x43, 0x8d, 0x62, 0x38, 0xeb, 0xa2, 0x48,
+	0xa6, 0x62, 0x87, 0x1f, 0x80, 0x79, 0x3d, 0xee, 0xb0, 0xdb, 0xef, 0xa0, 0x05, 0xa2, 0x46, 0x6f,
+	0x9e, 0x14, 0xf4, 0x76, 0xb7, 0xdf, 0xf1, 0xa1, 0x1a, 0x31, 0xb6, 0xc1, 0xf7, 0xc1, 0xc2, 0x40,
+	0xb8, 0x84, 0x78, 0x91, 0x10, 0x23, 0x53, 0xac, 0x84, 0x6c, 0x4e, 0x0b, 0x94, 0xb0, 0x79, 0x12,
+	0x1b, 0xdd, 0xad, 0x46, 0xaf, 0x15, 0x36, 0x43, 0x84, 0xf0, 0x9e, 0x55, 0x0b, 0x93, 0x85, 0x6c,
+	0x1e, 0xdd, 0xb7, 0xa7, 0x78, 0x18, 0x5e, 0x91, 0x4a, 0xa1, 0x19, 0xc5, 0x07, 0xe8, 0x2c, 0xc3,
+	0x5b, 0x59, 0x39, 0xdc, 0x8f, 0xe2, 0x03, 0x58, 0x03, 0xb3, 0x71, 0xd8, 0xec, 0xc7, 0x49, 0xeb,
+	0xe3, 0x50, 0xa4, 0xf5, 0x1c, 0x49, 0xeb, 0xd9, 0xdc, 0x1c, 0xf8, 0x65, 0x31, 0x87, 0xa7, 0xf3,
+	0x32, 0x98, 0x8e, 0xc3, 0x5e, 0x18, 0xe0, 0x3c, 0xd2, 0x87, 0xf9, 0x82, 0x63, 0x63, 0xb5, 0xe1,
+	0x56, 0xa1, 0x36, 0x32, 0xcc, 0x73, 0x91, 0xe3, 0xd8, 0x58, 0x6d, 0x24, 0x18, 0xd5, 0x06, 0x01,
+	0x63, 0x6a, 0x73, 0xd1, 0xb1, 0xb1, 0xda, 0x70, 0x73, 0xa6, 0x36, 0x0a, 0xd0, 0x73, 0xd1, 0x8a,
+	0x63, 0x63, 0xb5, 0x91, 0x81, 0x1a, 0x23, 0x53, 0x9b, 0x4b, 0x8e, 0x8d, 0xd5, 0x86, 0x9b, 0xf7,
+	0x06, 0x19, 0x99, 0xda, 0xbc, 0xe9, 0xd8, 0x58, 0x6d, 0x64, 0x20, 0x55, 0x1b, 0x01, 0xe4, 0xb2,
+	0x70, 0xd9, 0xb1, 0xb1, 0xda, 0x70, 0xbb, 0xa4, 0x36, 0x2a, 0xd4, 0x73, 0xd1, 0x27, 0x1c, 0x1b,
+	0xab, 0x8d, 0x02, 0xa5, 0x6a, 0x93, 0xb9, 0xe7, 0xb4, 0x57, 0x1c, 0x1b, 0xab, 0x8d, 0x08, 0x40,
+	0x52, 0x1b, 0x0d, 0xec, 0xb9, 0xa8, 0xe2, 0xd8, 0x58, 0x6d, 0x54, 0x30, 0x55, 0x9b, 0x2c, 0x08,
+	0xa2, 0x36, 0x57, 0x1d, 0x1b, 0xab, 0x8d, 0x08, 0x81, 0xab, 0x8d, 0x80, 0x31, 0xb5, 0xb9, 0xe6,
+	0xd8, 0x58, 0x6d, 0xb8, 0x39, 0x53, 0x1b, 0x01, 0x24, 0x6a, 0x73, 0xdd, 0xb1, 0xb1, 0xda, 0x70,
+	0x23, 0x57, 0x9b, 0x2c, 0x42, 0xaa, 0x36, 0x6f, 0x39, 0x36, 0x56, 0x1b, 0x11, 0x9f, 0x50, 0x9b,
+	0x8c, 0x8d, 0xa8, 0xcd, 0xdb, 0x8e, 0x8d, 0xd5, 0x46, 0xd0, 0x71, 0xb5, 0x11, 0x30, 0x4d, 0x6d,
+	0xd6, 0x1c, 0xfb, 0xb5, 0xd4, 0x86, 0xf3, 0x0c, 0xa8, 0x4d, 0x96, 0x25, 0x4d, 0x6d, 0xd6, 0x89,
+	0x87, 0xe1, 0x6a, 0x23, 0x92, 0x39, 0xa0, 0x36, 0x7a, 0xdc, 0x44, 0x14, 0x36, 0x1d, 0x7b, 0x74,
+	0xb5, 0x51, 0x23, 0xe6, 0x6a, 0x33, 0x10, 0x2e, 0x21, 0x76, 0x09, 0xf1, 0x10, 0xb5, 0xd1, 0x02,
+	0xe5, 0x6a, 0xa3, 0xed, 0x16, 0x53, 0x1b, 0x0f, 0xef, 0x19, 0x55, 0x1b, 0x75, 0xdf, 0x84, 0xda,
+	0x88, 0x79, 0x44, 0x6d, 0x6e, 0x32, 0xbc, 0x95, 0x95, 0x03, 0x51, 0x9b, 0x67, 0x60, 0xa6, 0x13,
+	0xf4, 0xa8, 0x40, 0x30, 0x99, 0xb8, 0x45, 0x92, 0xfa, 0x56, 0x7e, 0x06, 0x9e, 0x04, 0x3d, 0xa2,
+	0x1d, 0xe4, 0x63, 0xbb, 0x9b, 0xc6, 0xc7, 0xfe, 0x54, 0x47, 0xb6, 0x49, 0xac, 0x9e, 0xcb, 0x54,
+	0xe5, 0xf6, 0x68, 0xac, 0x9e, 0x4b, 0x3e, 0x14, 0x56, 0x66, 0x83, 0x2f, 0xc0, 0x2c, 0x66, 0xa5,
+	0xf2, 0xc3, 0x55, 0xe8, 0x0e, 0xe1, 0x5d, 0x1d, 0xca, 0x4b, 0xa5, 0x89, 0x7e, 0x52, 0x66, 0x1c,
+	0x9e, 0x6c, 0x95, 0xb9, 0x3d, 0x97, 0x0b, 0xd7, 0xbb, 0x23, 0x72, 0x7b, 0x2e, 0xfd, 0x54, 0xb9,
+	0xb9, 0x95, 0x73, 0x53, 0x91, 0xe3, 0x5a, 0xf7, 0xc9, 0x11, 0xb8, 0xa9, 0x00, 0xee, 0x69, 0x71,
+	0xcb, 0x56, 0x99, 0xdb, 0x73, 0xb9, 0x3c, 0xbe, 0x37, 0x22, 0xb7, 0xe7, 0xee, 0x69, 0x71, 0xcb,
+	0x56, 0xf8, 0x59, 0x30, 0x87, 0xb9, 0x99, 0xb6, 0x09, 0x49, 0xbd, 0x4b, 0xd8, 0xd7, 0x86, 0xb2,
+	0x33, 0x9d, 0x65, 0x3f, 0x28, 0x3f, 0x0e, 0x54, 0xb5, 0x2b, 0x1e, 0x3c, 0x57, 0x28, 0xf1, 0xa7,
+	0x46, 0xf5, 0xe0, 0xb9, 0xec, 0x87, 0xe6, 0x41, 0xd8, 0xe1, 0x21, 0x58, 0x20, 0xf9, 0xe1, 0x8b,
+	0x10, 0x0a, 0x7e, 0x8f, 0xf8, 0xd8, 0x18, 0x9e, 0x23, 0x06, 0xe6, 0x3f, 0xa9, 0x17, 0x1c, 0xb2,
+	0x3e, 0xa2, 0xfa, 0xc1, 0x3b, 0xc1, 0xd7, 0xb2, 0x35, 0xb2, 0x1f, 0xcf, 0xe5, 0x3f, 0x75, 0x3f,
+	0xd9, 0x88, 0xfa, 0xbc, 0xd2, 0x43, 0xa3, 0x3a, 0xea, 0xf3, 0x4a, 0x8e, 0x13, 0xed, 0x79, 0xa5,
+	0x47, 0xcc, 0x73, 0x50, 0xce, 0x58, 0xd9, 0x19, 0x73, 0x9f, 0xd0, 0xbe, 0x7d, 0x32, 0x2d, 0x3d,
+	0x7d, 0x28, 0xef, 0x74, 0x47, 0x31, 0xc2, 0x5d, 0x80, 0x3d, 0x91, 0xd3, 0x88, 0x1e, 0x49, 0x0f,
+	0x08, 0xeb, 0xb5, 0xa1, 0xac, 0xf8, 0x9c, 0xc2, 0xff, 0x53, 0xca, 0x62, 0x27, 0xb3, 0x88, 0x72,
+	0xa7, 0x52, 0xc8, 0xce, 0xaf, 0xed, 0x51, 0xca, 0x9d, 0x40, 0xe9, 0xa7, 0x54, 0xee, 0x92, 0x95,
+	0x27, 0x81, 0x71, 0xd3, 0x23, 0xaf, 0x36, 0x42, 0x12, 0xe8, 0x74, 0x72, 0x1a, 0x66, 0x49, 0x90,
+	0x8c, 0xb0, 0x07, 0xce, 0x4a, 0xc4, 0xda, 0x21, 0xf9, 0x90, 0x78, 0xb8, 0x31, 0x82, 0x07, 0xe5,
+	0x58, 0xa4, 0x9e, 0x16, 0x3b, 0xc6, 0x41, 0x98, 0x80, 0x65, 0xc9, 0xa3, 0x7e, 0x6a, 0x3e, 0x22,
+	0x2e, 0xbd, 0x11, 0x5c, 0xaa, 0x67, 0x26, 0xf5, 0xb9, 0xd4, 0x31, 0x8f, 0xc2, 0x23, 0xb0, 0x38,
+	0xb8, 0x4c, 0x72, 0xf4, 0xed, 0x8c, 0xf2, 0x0c, 0x48, 0xcb, 0xc0, 0x47, 0x9f, 0xf4, 0x0c, 0x68,
+	0x23, 0xf0, 0x43, 0xb0, 0x64, 0x58, 0x1d, 0xf1, 0xf4, 0x98, 0x78, 0xda, 0x1c, 0x7d, 0x69, 0x99,
+	0xab, 0xf9, 0x8e, 0x61, 0x08, 0x5e, 0x02, 0xa5, 0xa8, 0x1b, 0x46, 0x87, 0xfc, 0xb8, 0x89, 0xf0,
+	0x15, 0xfb, 0xd1, 0x98, 0x5f, 0x24, 0x56, 0x76, 0x78, 0x7c, 0x06, 0xcc, 0x53, 0x90, 0xb6, 0xb7,
+	0xbd, 0xd7, 0xba, 0x6e, 0x3d, 0x1a, 0xf3, 0x21, 0xa1, 0x51, 0xf7, 0x52, 0x44, 0xc0, 0xaa, 0xfd,
+	0x23, 0xde, 0x91, 0x20, 0x56, 0x56, 0xbb, 0x17, 0x01, 0xfd, 0xca, 0xca, 0x36, 0x66, 0xed, 0x0d,
+	0x40, 0x8c, 0xb4, 0x0a, 0xeb, 0xd2, 0xc5, 0x85, 0x3c, 0x8f, 0xac, 0xf1, 0x84, 0x7e, 0x63, 0x91,
+	0x30, 0x97, 0x57, 0x69, 0x67, 0x6a, 0x95, 0xb7, 0x44, 0x56, 0xf1, 0x13, 0xf7, 0x41, 0xd0, 0xee,
+	0x87, 0xd9, 0x8d, 0x06, 0x9b, 0x9e, 0xd3, 0x79, 0xd0, 0x07, 0x8b, 0x6a, 0x3b, 0x43, 0x30, 0xfe,
+	0xd6, 0x62, 0xb7, 0x40, 0x9d, 0x91, 0x48, 0x03, 0xa5, 0x9c, 0x57, 0x9a, 0x1e, 0x39, 0x9c, 0x9e,
+	0x2b, 0x38, 0x7f, 0x37, 0x84, 0xd3, 0x73, 0x07, 0x39, 0x3d, 0x97, 0x73, 0xee, 0x4b, 0xf7, 0xe1,
+	0xbe, 0x1a, 0xe8, 0xef, 0x29, 0xe9, 0xf9, 0x01, 0xd2, 0x7d, 0x29, 0xd2, 0x05, 0xb5, 0x9f, 0x92,
+	0x47, 0x2b, 0xc5, 0xfa, 0x87, 0x61, 0xb4, 0x3c, 0xd8, 0x05, 0xb5, 0xfb, 0x62, 0xca, 0x00, 0xd1,
+	0x77, 0xc1, 0xfa, 0xc7, 0xbc, 0x0c, 0x10, 0x0d, 0xd7, 0x32, 0x40, 0x6c, 0xa6, 0x50, 0xa9, 0xba,
+	0x0b, 0xd2, 0x3f, 0xe5, 0x85, 0x4a, 0x05, 0x5c, 0x0b, 0x95, 0x1a, 0x4d, 0xb4, 0xec, 0x61, 0xe4,
+	0xb4, 0x7f, 0xce, 0xa3, 0xa5, 0xf5, 0xaa, 0xd1, 0x52, 0xa3, 0x29, 0x03, 0xa4, 0x9c, 0x05, 0xeb,
+	0x5f, 0xf2, 0x32, 0x40, 0x2a, 0x5c, 0xcb, 0x00, 0xb1, 0x71, 0xce, 0xba, 0xf4, 0x77, 0xb4, 0x52,
+	0xfc, 0x7f, 0xb5, 0x88, 0x62, 0x0c, 0x2d, 0x7e, 0xf9, 0xfe, 0x24, 0x05, 0xa9, 0xde, 0xae, 0x05,
+	0xe3, 0xdf, 0x2c, 0x76, 0x29, 0x19, 0x56, 0xfc, 0xca, 0x1d, 0x3c, 0x87, 0x53, 0x2a, 0xa8, 0xbf,
+	0x0f, 0xe1, 0x14, 0xc5, 0xaf, 0x5c, 0xd8, 0xa5, 0x3d, 0xd2, 0xee, 0xed, 0x82, 0xf4, 0x1f, 0x94,
+	0xf4, 0x84, 0xe2, 0x57, 0xaf, 0xf7, 0x79, 0xb4, 0x52, 0xac, 0xff, 0x1c, 0x46, 0x2b, 0x8a, 0x5f,
+	0x6d, 0x06, 0x98, 0x32, 0xa0, 0x16, 0xff, 0xbf, 0xf2, 0x32, 0x20, 0x17, 0xbf, 0x72, 0x6f, 0x36,
+	0x85, 0xaa, 0x15, 0xff, 0xbf, 0xf3, 0x42, 0x55, 0x8a, 0x5f, 0xbd, 0x65, 0x9b, 0x68, 0xb5, 0xe2,
+	0xff, 0x4f, 0x1e, 0xad, 0x52, 0xfc, 0xea, 0xb5, 0xcd, 0x94, 0x01, 0xb5, 0xf8, 0xff, 0x9b, 0x97,
+	0x01, 0xb9, 0xf8, 0x95, 0xbb, 0x39, 0xe7, 0x7c, 0x28, 0xb5, 0x40, 0xf9, 0xeb, 0x0e, 0xf4, 0xbd,
+	0x02, 0x6b, 0x29, 0x0d, 0xac, 0x9d, 0x21, 0xb2, 0xf6, 0x28, 0xb7, 0xc0, 0xc7, 0x40, 0xf4, 0xd7,
+	0x1a, 0xe2, 0xbd, 0x06, 0xfa, 0x7e, 0x21, 0xe7, 0xfc, 0x78, 0xc6, 0x21, 0xbe, 0xf0, 0x2f, 0x4c,
+	0xf0, 0xd3, 0x60, 0x4e, 0xea, 0xf7, 0xf2, 0x77, 0x2c, 0xe8, 0x07, 0x79, 0x64, 0x35, 0x8c, 0x79,
+	0x12, 0x24, 0xaf, 0x32, 0x32, 0x61, 0x82, 0x5b, 0x6a, 0x0b, 0xb5, 0xdf, 0x4c, 0xd1, 0x0f, 0x29,
+	0xd1, 0x92, 0x69, 0x13, 0xfa, 0xcd, 0x54, 0x69, 0xae, 0xf6, 0x9b, 0x29, 0xbc, 0x05, 0x44, 0x1b,
+	0xae, 0x11, 0x74, 0x8f, 0xd1, 0x8f, 0xe8, 0xfc, 0xf9, 0x81, 0xf9, 0x5b, 0xdd, 0x63, 0xbf, 0xc8,
+	0xa1, 0x5b, 0xdd, 0x63, 0x78, 0x57, 0x6a, 0xcb, 0x7e, 0x8c, 0xb7, 0x01, 0xfd, 0x98, 0xce, 0x5d,
+	0x1c, 0x98, 0x4b, 0x77, 0x49, 0x34, 0x02, 0xc9, 0x57, 0xbc, 0x3d, 0x59, 0x81, 0xf2, 0xed, 0xf9,
+	0x69, 0x81, 0xec, 0xf6, 0xb0, 0xed, 0x11, 0x75, 0x29, 0x6d, 0x8f, 0x20, 0xca, 0xb6, 0xe7, 0x67,
+	0x85, 0x1c, 0x85, 0x93, 0xb6, 0x87, 0x4f, 0xcb, 0xb6, 0x47, 0xe6, 0x22, 0xdb, 0x43, 0x76, 0xe7,
+	0xe7, 0x79, 0x5c, 0xd2, 0xee, 0x64, 0xfd, 0x33, 0x36, 0x0b, 0xef, 0x8e, 0xfc, 0xa8, 0xe0, 0xdd,
+	0xf9, 0x35, 0x25, 0xca, 0xdf, 0x1d, 0xe9, 0xe9, 0x60, 0xbb, 0x23, 0x28, 0xf0, 0xee, 0xfc, 0x82,
+	0xce, 0xcf, 0xd9, 0x1d, 0x0e, 0x65, 0xbb, 0x23, 0x66, 0xd2, 0xdd, 0xf9, 0x25, 0x9d, 0x9b, 0xbb,
+	0x3b, 0x1c, 0x4e, 0x77, 0xe7, 0x02, 0x00, 0x64, 0xfd, 0xdd, 0xa0, 0x13, 0xae, 0xa3, 0x2f, 0xd9,
+	0xe4, 0x8d, 0x8d, 0x64, 0x82, 0x0e, 0x28, 0xd2, 0xfa, 0xc5, 0x5f, 0x37, 0xd0, 0x97, 0x65, 0xc4,
+	0x2e, 0x36, 0xc1, 0x8b, 0xa0, 0xd4, 0xc8, 0x20, 0x9b, 0xe8, 0x2b, 0x0c, 0x52, 0xe3, 0x90, 0x4d,
+	0xb8, 0x02, 0xa6, 0x28, 0x82, 0x40, 0xdc, 0x06, 0xfa, 0xaa, 0x4e, 0xe3, 0xe2, 0xbf, 0xf1, 0xc8,
+	0xb7, 0x35, 0x0c, 0xb9, 0x81, 0xbe, 0x46, 0x11, 0xb2, 0x0d, 0x5e, 0xe2, 0x34, 0x6b, 0x84, 0xc7,
+	0x43, 0x5f, 0x57, 0x40, 0x98, 0xc7, 0x13, 0x2b, 0xc2, 0xdf, 0x6e, 0xa2, 0x6f, 0xe8, 0x8e, 0x6e,
+	0x62, 0x80, 0x08, 0xed, 0x16, 0xfa, 0xa6, 0x1e, 0xed, 0xad, 0x6c, 0xc9, 0xf8, 0xeb, 0x6d, 0xf4,
+	0x2d, 0x9d, 0xe2, 0x36, 0x5c, 0x01, 0xa5, 0x9a, 0x40, 0xac, 0xaf, 0xa1, 0x6f, 0xb3, 0x38, 0x04,
+	0xc9, 0xfa, 0x1a, 0xc1, 0xec, 0x6c, 0xbf, 0xff, 0xa0, 0xb1, 0xbb, 0xf5, 0x64, 0x7b, 0x7d, 0x1d,
+	0x7d, 0x87, 0x63, 0xb0, 0x91, 0xda, 0x32, 0x0c, 0xc9, 0xf5, 0x06, 0xfa, 0xae, 0x82, 0x21, 0xb6,
+	0xe5, 0x17, 0x60, 0x4a, 0xfd, 0x8b, 0xb9, 0x04, 0xac, 0x80, 0xbd, 0x5a, 0xb3, 0x02, 0xf8, 0x2e,
+	0x28, 0x36, 0x23, 0xd1, 0x1d, 0x47, 0x85, 0x93, 0x3a, 0xe9, 0x32, 0x7a, 0xf9, 0x1e, 0x80, 0x83,
+	0xdd, 0x2e, 0x58, 0x06, 0xf6, 0xab, 0xf0, 0x98, 0xb9, 0xc0, 0xbf, 0xc2, 0x79, 0x70, 0x9a, 0x16,
+	0x57, 0x81, 0xd8, 0xe8, 0x97, 0x3b, 0x85, 0x5b, 0x56, 0xc6, 0x20, 0x77, 0xb6, 0x64, 0x06, 0xdb,
+	0xc0, 0x60, 0xcb, 0x0c, 0x55, 0x30, 0x6f, 0xea, 0x61, 0xc9, 0x1c, 0x53, 0x06, 0x8e, 0x29, 0x33,
+	0x87, 0xd2, 0xab, 0x92, 0x39, 0x4e, 0x19, 0x38, 0x4e, 0x0d, 0x72, 0x0c, 0xf4, 0xa4, 0x64, 0x8e,
+	0x59, 0x03, 0xc7, 0xac, 0x99, 0x43, 0xe9, 0x3d, 0xc9, 0x1c, 0xd0, 0xc0, 0x01, 0x65, 0x8e, 0x07,
+	0x60, 0xd1, 0xdc, 0x61, 0x92, 0x59, 0x26, 0x0c, 0x2c, 0x13, 0x39, 0x2c, 0x6a, 0x17, 0x49, 0x66,
+	0x19, 0x37, 0xb0, 0x8c, 0xcb, 0x2c, 0x35, 0x80, 0xf2, 0xfa, 0x44, 0x32, 0xcf, 0x8c, 0x81, 0x67,
+	0x26, 0x8f, 0x47, 0xeb, 0x03, 0xc9, 0x3c, 0x65, 0x03, 0x4f, 0xd9, 0x58, 0x6d, 0x72, 0xb7, 0xe7,
+	0xa4, 0x7a, 0x2d, 0xc8, 0x0c, 0x5b, 0x60, 0xce, 0xd0, 0xd8, 0x39, 0x89, 0xc2, 0x92, 0x29, 0xee,
+	0x82, 0xb2, 0xde, 0xc5, 0x91, 0xe7, 0x4f, 0x1a, 0xe6, 0x4f, 0x1a, 0x8a, 0x44, 0xef, 0xd8, 0xc8,
+	0x1c, 0x67, 0x0c, 0x1c, 0x67, 0x06, 0x97, 0xa1, 0xb7, 0x66, 0x4e, 0xa2, 0x28, 0xc9, 0x14, 0x31,
+	0x38, 0x37, 0xa4, 0xf7, 0x62, 0xa0, 0x7a, 0x4f, 0xa6, 0x7a, 0x8d, 0x17, 0x1f, 0x92, 0xcf, 0x23,
+	0x70, 0x7e, 0x58, 0xf3, 0xc5, 0xe0, 0x74, 0x5d, 0x75, 0x3a, 0xf4, 0x5d, 0x88, 0xe4, 0xa8, 0x4d,
+	0x0b, 0xce, 0xd4, 0x74, 0x31, 0x38, 0xb9, 0x23, 0x3b, 0x19, 0xf5, 0xed, 0x88, 0xe4, 0x2d, 0x00,
+	0x67, 0x73, 0x1b, 0x2f, 0x06, 0x77, 0xab, 0xaa, 0xbb, 0xfc, 0x77, 0x26, 0x99, 0x8b, 0x95, 0xdb,
+	0x00, 0x48, 0x2d, 0xa2, 0x09, 0x60, 0xd7, 0xea, 0xf5, 0xf2, 0x18, 0xfe, 0xa5, 0xba, 0xe5, 0x97,
+	0x2d, 0xfa, 0xcb, 0x8b, 0x72, 0x01, 0xbb, 0xdb, 0xdd, 0x7e, 0x58, 0xfe, 0x1f, 0xff, 0xcf, 0xaa,
+	0x4e, 0xf1, 0xe6, 0x09, 0x39, 0xc0, 0x56, 0xde, 0x00, 0xd3, 0x5a, 0x67, 0xab, 0x04, 0xac, 0x26,
+	0x3f, 0x50, 0x9a, 0xd7, 0x6e, 0x00, 0x90, 0xfd, 0x63, 0x18, 0x38, 0x03, 0x8a, 0xfb, 0xbb, 0x7b,
+	0x4f, 0xb7, 0xef, 0xef, 0xd4, 0x76, 0xb6, 0x1f, 0x94, 0xc7, 0x60, 0x09, 0x4c, 0x3e, 0xf5, 0xeb,
+	0xcf, 0xea, 0xd5, 0xfd, 0x5a, 0xd9, 0x82, 0x93, 0xe0, 0xd4, 0xe3, 0xbd, 0xfa, 0x6e, 0xb9, 0x70,
+	0xed, 0x1e, 0x28, 0xca, 0x8d, 0xa5, 0x19, 0x50, 0xac, 0xd5, 0xfd, 0xed, 0x9d, 0x87, 0xbb, 0x0d,
+	0x1a, 0xa9, 0x64, 0xa0, 0x11, 0x2b, 0x86, 0x17, 0xe5, 0x42, 0xf5, 0x22, 0xb8, 0xd0, 0x8c, 0x3a,
+	0x03, 0x7f, 0xb6, 0x48, 0xc9, 0x79, 0x39, 0x4e, 0xac, 0x9b, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff,
+	0x29, 0x30, 0x51, 0x54, 0x22, 0x25, 0x00, 0x00,
 }
diff --git a/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.proto b/vendor/github.com/golang/protobuf/conformance/internal/conformance_proto/conformance.proto
similarity index 96%
rename from vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.proto
rename to vendor/github.com/golang/protobuf/conformance/internal/conformance_proto/conformance.proto
index 95a8fd13..fc96074a 100644
--- a/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.proto
+++ b/vendor/github.com/golang/protobuf/conformance/internal/conformance_proto/conformance.proto
@@ -210,11 +210,6 @@ message TestAllTypes {
     NestedMessage oneof_nested_message = 112;
     string oneof_string = 113;
     bytes oneof_bytes = 114;
-    bool oneof_bool = 115;
-    uint64 oneof_uint64 = 116;
-    float oneof_float = 117;
-    double oneof_double = 118;
-    NestedEnum oneof_enum = 119;
   }
 
   // Well-known types
@@ -253,7 +248,6 @@ message TestAllTypes {
   repeated google.protobuf.Value repeated_value = 316;
 
   // Test field-name-to-JSON-name convention.
-  // (protobuf says names can be any valid C/C++ identifier.)
   int32 fieldname1 = 401;
   int32 field_name2 = 402;
   int32 _field_name3 = 403;
@@ -266,12 +260,6 @@ message TestAllTypes {
   int32 Field_Name10 = 410;
   int32 FIELD_NAME11 = 411;
   int32 FIELD_name12 = 412;
-  int32 __field_name13 = 413;
-  int32 __Field_name14 = 414;
-  int32 field__name15 = 415;
-  int32 field__Name16 = 416;
-  int32 field_name17__ = 417;
-  int32 Field_name18__ = 418;
 }
 
 message ForeignMessage {
diff --git a/vendor/github.com/golang/protobuf/conformance/test.sh b/vendor/github.com/golang/protobuf/conformance/test.sh
new file mode 100755
index 00000000..e6de29b9
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/conformance/test.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+PROTOBUF_ROOT=$1
+CONFORMANCE_ROOT=$1/conformance
+CONFORMANCE_TEST_RUNNER=$CONFORMANCE_ROOT/conformance-test-runner
+
+cd $(dirname $0)
+
+if [[ $PROTOBUF_ROOT == "" ]]; then
+  echo "usage: test.sh <protobuf-root>" >/dev/stderr
+  exit 1
+fi
+
+if [[ ! -x $CONFORMANCE_TEST_RUNNER ]]; then
+  echo "SKIP: conformance test runner not installed" >/dev/stderr
+  exit 0
+fi
+
+a=$CONFORMANCE_ROOT/conformance.proto
+b=internal/conformance_proto/conformance.proto
+if [[ $(diff $a $b) != "" ]]; then
+  cp $a $b
+  echo "WARNING: conformance.proto is out of date" >/dev/stderr
+fi
+
+$CONFORMANCE_TEST_RUNNER --failure_list failure_list_go.txt ./conformance.sh
diff --git a/vendor/github.com/golang/protobuf/descriptor/descriptor_test.go b/vendor/github.com/golang/protobuf/descriptor/descriptor_test.go
index 27b0729c..bf5174d3 100644
--- a/vendor/github.com/golang/protobuf/descriptor/descriptor_test.go
+++ b/vendor/github.com/golang/protobuf/descriptor/descriptor_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/descriptor"
-	tpb "github.com/golang/protobuf/proto/testdata"
+	tpb "github.com/golang/protobuf/proto/test_proto"
 	protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
 )
 
@@ -20,7 +20,7 @@ func TestMessage(t *testing.T) {
 	}
 }
 
-func Example_Options() {
+func Example_options() {
 	var msg *tpb.MyMessageSet
 	_, md := descriptor.ForMessage(msg)
 	if md.GetOptions().GetMessageSetWireFormat() {
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go
index 110ae138..ff368f33 100644
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go
+++ b/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go
@@ -56,6 +56,8 @@ import (
 	stpb "github.com/golang/protobuf/ptypes/struct"
 )
 
+const secondInNanos = int64(time.Second / time.Nanosecond)
+
 // Marshaler is a configurable object for converting between
 // protocol buffer objects and a JSON representation for them.
 type Marshaler struct {
@@ -118,6 +120,14 @@ type JSONPBUnmarshaler interface {
 
 // Marshal marshals a protocol buffer into JSON.
 func (m *Marshaler) Marshal(out io.Writer, pb proto.Message) error {
+	v := reflect.ValueOf(pb)
+	if pb == nil || (v.Kind() == reflect.Ptr && v.IsNil()) {
+		return errors.New("Marshal called with nil")
+	}
+	// Check for unset required fields first.
+	if err := checkRequiredFields(pb); err != nil {
+		return err
+	}
 	writer := &errWriter{writer: out}
 	return m.marshalObject(writer, pb, "", "")
 }
@@ -190,13 +200,22 @@ func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent, typeU
 			// Any is a bit more involved.
 			return m.marshalAny(out, v, indent)
 		case "Duration":
-			// "Generated output always contains 3, 6, or 9 fractional digits,
+			// "Generated output always contains 0, 3, 6, or 9 fractional digits,
 			//  depending on required precision."
 			s, ns := s.Field(0).Int(), s.Field(1).Int()
-			d := time.Duration(s)*time.Second + time.Duration(ns)*time.Nanosecond
-			x := fmt.Sprintf("%.9f", d.Seconds())
+			if ns <= -secondInNanos || ns >= secondInNanos {
+				return fmt.Errorf("ns out of range (%v, %v)", -secondInNanos, secondInNanos)
+			}
+			if (s > 0 && ns < 0) || (s < 0 && ns > 0) {
+				return errors.New("signs of seconds and nanos do not match")
+			}
+			if s < 0 {
+				ns = -ns
+			}
+			x := fmt.Sprintf("%d.%09d", s, ns)
 			x = strings.TrimSuffix(x, "000")
 			x = strings.TrimSuffix(x, "000")
+			x = strings.TrimSuffix(x, ".000")
 			out.write(`"`)
 			out.write(x)
 			out.write(`s"`)
@@ -207,13 +226,17 @@ func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent, typeU
 			return m.marshalValue(out, &proto.Properties{}, s.Field(0), indent)
 		case "Timestamp":
 			// "RFC 3339, where generated output will always be Z-normalized
-			//  and uses 3, 6 or 9 fractional digits."
+			//  and uses 0, 3, 6 or 9 fractional digits."
 			s, ns := s.Field(0).Int(), s.Field(1).Int()
+			if ns < 0 || ns >= secondInNanos {
+				return fmt.Errorf("ns out of range [0, %v)", secondInNanos)
+			}
 			t := time.Unix(s, ns).UTC()
 			// time.RFC3339Nano isn't exactly right (we need to get 3/6/9 fractional digits).
 			x := t.Format("2006-01-02T15:04:05.000000000")
 			x = strings.TrimSuffix(x, "000")
 			x = strings.TrimSuffix(x, "000")
+			x = strings.TrimSuffix(x, ".000")
 			out.write(`"`)
 			out.write(x)
 			out.write(`Z"`)
@@ -632,7 +655,10 @@ func (u *Unmarshaler) UnmarshalNext(dec *json.Decoder, pb proto.Message) error {
 	if err := dec.Decode(&inputValue); err != nil {
 		return err
 	}
-	return u.unmarshalValue(reflect.ValueOf(pb).Elem(), inputValue, nil)
+	if err := u.unmarshalValue(reflect.ValueOf(pb).Elem(), inputValue, nil); err != nil {
+		return err
+	}
+	return checkRequiredFields(pb)
 }
 
 // Unmarshal unmarshals a JSON object stream into a protocol
@@ -803,7 +829,7 @@ func (u *Unmarshaler) unmarshalValue(target reflect.Value, inputValue json.RawMe
 				return fmt.Errorf("bad ListValue: %v", err)
 			}
 
-			target.Field(0).Set(reflect.ValueOf(make([]*stpb.Value, len(s), len(s))))
+			target.Field(0).Set(reflect.ValueOf(make([]*stpb.Value, len(s))))
 			for i, sv := range s {
 				if err := u.unmarshalValue(target.Field(0).Index(i), sv, prop); err != nil {
 					return err
@@ -973,13 +999,6 @@ func (u *Unmarshaler) unmarshalValue(target reflect.Value, inputValue json.RawMe
 		}
 		if mp != nil {
 			target.Set(reflect.MakeMap(targetType))
-			var keyprop, valprop *proto.Properties
-			if prop != nil {
-				// These could still be nil if the protobuf metadata is broken somehow.
-				// TODO: This won't work because the fields are unexported.
-				// We should probably just reparse them.
-				//keyprop, valprop = prop.mkeyprop, prop.mvalprop
-			}
 			for ks, raw := range mp {
 				// Unmarshal map key. The core json library already decoded the key into a
 				// string, so we handle that specially. Other types were quoted post-serialization.
@@ -988,14 +1007,16 @@ func (u *Unmarshaler) unmarshalValue(target reflect.Value, inputValue json.RawMe
 					k = reflect.ValueOf(ks)
 				} else {
 					k = reflect.New(targetType.Key()).Elem()
-					if err := u.unmarshalValue(k, json.RawMessage(ks), keyprop); err != nil {
+					// TODO: pass the correct Properties if needed.
+					if err := u.unmarshalValue(k, json.RawMessage(ks), nil); err != nil {
 						return err
 					}
 				}
 
 				// Unmarshal map value.
 				v := reflect.New(targetType.Elem()).Elem()
-				if err := u.unmarshalValue(v, raw, valprop); err != nil {
+				// TODO: pass the correct Properties if needed.
+				if err := u.unmarshalValue(v, raw, nil); err != nil {
 					return err
 				}
 				target.SetMapIndex(k, v)
@@ -1081,3 +1102,140 @@ func (s mapKeys) Less(i, j int) bool {
 	}
 	return fmt.Sprint(s[i].Interface()) < fmt.Sprint(s[j].Interface())
 }
+
+// checkRequiredFields returns an error if any required field in the given proto message is not set.
+// This function is used by both Marshal and Unmarshal.  While required fields only exist in a
+// proto2 message, a proto3 message can contain proto2 message(s).
+func checkRequiredFields(pb proto.Message) error {
+	// Most well-known type messages do not contain required fields.  The "Any" type may contain
+	// a message that has required fields.
+	//
+	// When an Any message is being marshaled, the code will invoked proto.Unmarshal on Any.Value
+	// field in order to transform that into JSON, and that should have returned an error if a
+	// required field is not set in the embedded message.
+	//
+	// When an Any message is being unmarshaled, the code will have invoked proto.Marshal on the
+	// embedded message to store the serialized message in Any.Value field, and that should have
+	// returned an error if a required field is not set.
+	if _, ok := pb.(wkt); ok {
+		return nil
+	}
+
+	v := reflect.ValueOf(pb)
+	// Skip message if it is not a struct pointer.
+	if v.Kind() != reflect.Ptr {
+		return nil
+	}
+	v = v.Elem()
+	if v.Kind() != reflect.Struct {
+		return nil
+	}
+
+	for i := 0; i < v.NumField(); i++ {
+		field := v.Field(i)
+		sfield := v.Type().Field(i)
+
+		if sfield.PkgPath != "" {
+			// blank PkgPath means the field is exported; skip if not exported
+			continue
+		}
+
+		if strings.HasPrefix(sfield.Name, "XXX_") {
+			continue
+		}
+
+		// Oneof field is an interface implemented by wrapper structs containing the actual oneof
+		// field, i.e. an interface containing &T{real_value}.
+		if sfield.Tag.Get("protobuf_oneof") != "" {
+			if field.Kind() != reflect.Interface {
+				continue
+			}
+			v := field.Elem()
+			if v.Kind() != reflect.Ptr || v.IsNil() {
+				continue
+			}
+			v = v.Elem()
+			if v.Kind() != reflect.Struct || v.NumField() < 1 {
+				continue
+			}
+			field = v.Field(0)
+			sfield = v.Type().Field(0)
+		}
+
+		protoTag := sfield.Tag.Get("protobuf")
+		if protoTag == "" {
+			continue
+		}
+		var prop proto.Properties
+		prop.Init(sfield.Type, sfield.Name, protoTag, &sfield)
+
+		switch field.Kind() {
+		case reflect.Map:
+			if field.IsNil() {
+				continue
+			}
+			// Check each map value.
+			keys := field.MapKeys()
+			for _, k := range keys {
+				v := field.MapIndex(k)
+				if err := checkRequiredFieldsInValue(v); err != nil {
+					return err
+				}
+			}
+		case reflect.Slice:
+			// Handle non-repeated type, e.g. bytes.
+			if !prop.Repeated {
+				if prop.Required && field.IsNil() {
+					return fmt.Errorf("required field %q is not set", prop.Name)
+				}
+				continue
+			}
+
+			// Handle repeated type.
+			if field.IsNil() {
+				continue
+			}
+			// Check each slice item.
+			for i := 0; i < field.Len(); i++ {
+				v := field.Index(i)
+				if err := checkRequiredFieldsInValue(v); err != nil {
+					return err
+				}
+			}
+		case reflect.Ptr:
+			if field.IsNil() {
+				if prop.Required {
+					return fmt.Errorf("required field %q is not set", prop.Name)
+				}
+				continue
+			}
+			if err := checkRequiredFieldsInValue(field); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Handle proto2 extensions.
+	for _, ext := range proto.RegisteredExtensions(pb) {
+		if !proto.HasExtension(pb, ext) {
+			continue
+		}
+		ep, err := proto.GetExtension(pb, ext)
+		if err != nil {
+			return err
+		}
+		err = checkRequiredFieldsInValue(reflect.ValueOf(ep))
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func checkRequiredFieldsInValue(v reflect.Value) error {
+	if pm, ok := v.Interface().(proto.Message); ok {
+		return checkRequiredFields(pm)
+	}
+	return nil
+}
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go
index 2428d056..c9934d97 100644
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go
+++ b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go
@@ -406,7 +406,10 @@ var marshalingTests = []struct {
 	{"Any with message and indent", marshalerAllOptions, anySimple, anySimplePrettyJSON},
 	{"Any with WKT", marshaler, anyWellKnown, anyWellKnownJSON},
 	{"Any with WKT and indent", marshalerAllOptions, anyWellKnown, anyWellKnownPrettyJSON},
-	{"Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}, `{"dur":"3.000s"}`},
+	{"Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}, `{"dur":"3s"}`},
+	{"Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3, Nanos: 1e6}}, `{"dur":"3.001s"}`},
+	{"Duration beyond float64 precision", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 100000000, Nanos: 1}}, `{"dur":"100000000.000000001s"}`},
+	{"negative Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: -123, Nanos: -456}}, `{"dur":"-123.000000456s"}`},
 	{"Struct", marshaler, &pb.KnownTypes{St: &stpb.Struct{
 		Fields: map[string]*stpb.Value{
 			"one": {Kind: &stpb.Value_StringValue{"loneliest number"}},
@@ -421,6 +424,7 @@ var marshalingTests = []struct {
 		{Kind: &stpb.Value_BoolValue{true}},
 	}}}, `{"lv":["x",null,3,true]}`},
 	{"Timestamp", marshaler, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}, `{"ts":"2014-05-13T16:53:20.021Z"}`},
+	{"Timestamp", marshaler, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 0}}, `{"ts":"2014-05-13T16:53:20Z"}`},
 	{"number Value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NumberValue{1}}}, `{"val":1}`},
 	{"null Value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NullValue{stpb.NullValue_NULL_VALUE}}}, `{"val":null}`},
 	{"string number value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_StringValue{"9223372036854775807"}}}, `{"val":"9223372036854775807"}`},
@@ -449,6 +453,9 @@ var marshalingTests = []struct {
 	{"BoolValue", marshaler, &pb.KnownTypes{Bool: &wpb.BoolValue{Value: true}}, `{"bool":true}`},
 	{"StringValue", marshaler, &pb.KnownTypes{Str: &wpb.StringValue{Value: "plush"}}, `{"str":"plush"}`},
 	{"BytesValue", marshaler, &pb.KnownTypes{Bytes: &wpb.BytesValue{Value: []byte("wow")}}, `{"bytes":"d293"}`},
+
+	{"required", marshaler, &pb.MsgWithRequired{Str: proto.String("hello")}, `{"str":"hello"}`},
+	{"required bytes", marshaler, &pb.MsgWithRequiredBytes{Byts: []byte{}}, `{"byts":""}`},
 }
 
 func TestMarshaling(t *testing.T) {
@@ -462,6 +469,40 @@ func TestMarshaling(t *testing.T) {
 	}
 }
 
+func TestMarshalingNil(t *testing.T) {
+	var msg *pb.Simple
+	m := &Marshaler{}
+	if _, err := m.MarshalToString(msg); err == nil {
+		t.Errorf("mashaling nil returned no error")
+	}
+}
+
+func TestMarshalIllegalTime(t *testing.T) {
+	tests := []struct {
+		pb   proto.Message
+		fail bool
+	}{
+		{&pb.KnownTypes{Dur: &durpb.Duration{Seconds: 1, Nanos: 0}}, false},
+		{&pb.KnownTypes{Dur: &durpb.Duration{Seconds: -1, Nanos: 0}}, false},
+		{&pb.KnownTypes{Dur: &durpb.Duration{Seconds: 1, Nanos: -1}}, true},
+		{&pb.KnownTypes{Dur: &durpb.Duration{Seconds: -1, Nanos: 1}}, true},
+		{&pb.KnownTypes{Dur: &durpb.Duration{Seconds: 1, Nanos: 1000000000}}, true},
+		{&pb.KnownTypes{Dur: &durpb.Duration{Seconds: -1, Nanos: -1000000000}}, true},
+		{&pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 1, Nanos: 1}}, false},
+		{&pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 1, Nanos: -1}}, true},
+		{&pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 1, Nanos: 1000000000}}, true},
+	}
+	for _, tt := range tests {
+		_, err := marshaler.MarshalToString(tt.pb)
+		if err == nil && tt.fail {
+			t.Errorf("marshaler.MarshalToString(%v) = _, <nil>; want _, <non-nil>", tt.pb)
+		}
+		if err != nil && !tt.fail {
+			t.Errorf("marshaler.MarshalToString(%v) = _, %v; want _, <nil>", tt.pb, err)
+		}
+	}
+}
+
 func TestMarshalJSONPBMarshaler(t *testing.T) {
 	rawJson := `{ "foo": "bar", "baz": [0, 1, 2, 3] }`
 	msg := dynamicMessage{rawJson: rawJson}
@@ -492,6 +533,104 @@ func TestMarshalAnyJSONPBMarshaler(t *testing.T) {
 	}
 }
 
+func TestMarshalWithCustomValidation(t *testing.T) {
+	msg := dynamicMessage{rawJson: `{ "foo": "bar", "baz": [0, 1, 2, 3] }`, dummy: &dynamicMessage{}}
+
+	js, err := new(Marshaler).MarshalToString(&msg)
+	if err != nil {
+		t.Errorf("an unexpected error occurred when marshalling to json: %v", err)
+	}
+	err = Unmarshal(strings.NewReader(js), &msg)
+	if err != nil {
+		t.Errorf("an unexpected error occurred when unmarshalling from json: %v", err)
+	}
+}
+
+// Test marshaling message containing unset required fields should produce error.
+func TestMarshalUnsetRequiredFields(t *testing.T) {
+	msgExt := &pb.Real{}
+	proto.SetExtension(msgExt, pb.E_Extm, &pb.MsgWithRequired{})
+
+	tests := []struct {
+		desc      string
+		marshaler *Marshaler
+		pb        proto.Message
+	}{
+		{
+			desc:      "direct required field",
+			marshaler: &Marshaler{},
+			pb:        &pb.MsgWithRequired{},
+		},
+		{
+			desc:      "direct required field + emit defaults",
+			marshaler: &Marshaler{EmitDefaults: true},
+			pb:        &pb.MsgWithRequired{},
+		},
+		{
+			desc:      "indirect required field",
+			marshaler: &Marshaler{},
+			pb:        &pb.MsgWithIndirectRequired{Subm: &pb.MsgWithRequired{}},
+		},
+		{
+			desc:      "indirect required field + emit defaults",
+			marshaler: &Marshaler{EmitDefaults: true},
+			pb:        &pb.MsgWithIndirectRequired{Subm: &pb.MsgWithRequired{}},
+		},
+		{
+			desc:      "direct required wkt field",
+			marshaler: &Marshaler{},
+			pb:        &pb.MsgWithRequiredWKT{},
+		},
+		{
+			desc:      "direct required wkt field + emit defaults",
+			marshaler: &Marshaler{EmitDefaults: true},
+			pb:        &pb.MsgWithRequiredWKT{},
+		},
+		{
+			desc:      "direct required bytes field",
+			marshaler: &Marshaler{},
+			pb:        &pb.MsgWithRequiredBytes{},
+		},
+		{
+			desc:      "required in map value",
+			marshaler: &Marshaler{},
+			pb: &pb.MsgWithIndirectRequired{
+				MapField: map[string]*pb.MsgWithRequired{
+					"key": {},
+				},
+			},
+		},
+		{
+			desc:      "required in repeated item",
+			marshaler: &Marshaler{},
+			pb: &pb.MsgWithIndirectRequired{
+				SliceField: []*pb.MsgWithRequired{
+					{Str: proto.String("hello")},
+					{},
+				},
+			},
+		},
+		{
+			desc:      "required inside oneof",
+			marshaler: &Marshaler{},
+			pb: &pb.MsgWithOneof{
+				Union: &pb.MsgWithOneof_MsgWithRequired{&pb.MsgWithRequired{}},
+			},
+		},
+		{
+			desc:      "required inside extension",
+			marshaler: &Marshaler{},
+			pb:        msgExt,
+		},
+	}
+
+	for _, tc := range tests {
+		if _, err := tc.marshaler.MarshalToString(tc.pb); err == nil {
+			t.Errorf("%s: expecting error in marshaling with unset required fields %+v", tc.desc, tc.pb)
+		}
+	}
+}
+
 var unmarshalingTests = []struct {
 	desc        string
 	unmarshaler Unmarshaler
@@ -553,8 +692,10 @@ var unmarshalingTests = []struct {
 	{"camelName input", Unmarshaler{}, `{"oBool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
 
 	{"Duration", Unmarshaler{}, `{"dur":"3.000s"}`, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}},
+	{"Duration", Unmarshaler{}, `{"dur":"4s"}`, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 4}}},
 	{"null Duration", Unmarshaler{}, `{"dur":null}`, &pb.KnownTypes{Dur: nil}},
 	{"Timestamp", Unmarshaler{}, `{"ts":"2014-05-13T16:53:20.021Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}},
+	{"Timestamp", Unmarshaler{}, `{"ts":"2014-05-13T16:53:20Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 0}}},
 	{"PreEpochTimestamp", Unmarshaler{}, `{"ts":"1969-12-31T23:59:58.999999995Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: -2, Nanos: 999999995}}},
 	{"ZeroTimeTimestamp", Unmarshaler{}, `{"ts":"0001-01-01T00:00:00Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: -62135596800, Nanos: 0}}},
 	{"null Timestamp", Unmarshaler{}, `{"ts":null}`, &pb.KnownTypes{Ts: nil}},
@@ -623,6 +764,9 @@ var unmarshalingTests = []struct {
 	{"null BoolValue", Unmarshaler{}, `{"bool":null}`, &pb.KnownTypes{Bool: nil}},
 	{"null StringValue", Unmarshaler{}, `{"str":null}`, &pb.KnownTypes{Str: nil}},
 	{"null BytesValue", Unmarshaler{}, `{"bytes":null}`, &pb.KnownTypes{Bytes: nil}},
+
+	{"required", Unmarshaler{}, `{"str":"hello"}`, &pb.MsgWithRequired{Str: proto.String("hello")}},
+	{"required bytes", Unmarshaler{}, `{"byts": []}`, &pb.MsgWithRequiredBytes{Byts: []byte{}}},
 }
 
 func TestUnmarshaling(t *testing.T) {
@@ -821,7 +965,7 @@ func TestUnmarshalAnyJSONPBUnmarshaler(t *testing.T) {
 	}
 
 	if !proto.Equal(&got, &want) {
-		t.Errorf("message contents not set correctly after unmarshalling JSON: got %s, wanted %s", got, want)
+		t.Errorf("message contents not set correctly after unmarshalling JSON: got %v, wanted %v", got, want)
 	}
 }
 
@@ -873,6 +1017,10 @@ func (s *stringField) UnmarshalJSONPB(jum *Unmarshaler, js []byte) error {
 // It provides implementations of JSONPBMarshaler and JSONPBUnmarshaler for JSON support.
 type dynamicMessage struct {
 	rawJson string `protobuf:"bytes,1,opt,name=rawJson"`
+
+	// an unexported nested message is present just to ensure that it
+	// won't result in a panic (see issue #509)
+	dummy *dynamicMessage `protobuf:"bytes,2,opt,name=dummy"`
 }
 
 func (m *dynamicMessage) Reset() {
@@ -894,3 +1042,109 @@ func (m *dynamicMessage) UnmarshalJSONPB(jum *Unmarshaler, js []byte) error {
 	m.rawJson = string(js)
 	return nil
 }
+
+// Test unmarshaling message containing unset required fields should produce error.
+func TestUnmarshalUnsetRequiredFields(t *testing.T) {
+	tests := []struct {
+		desc string
+		pb   proto.Message
+		json string
+	}{
+		{
+			desc: "direct required field missing",
+			pb:   &pb.MsgWithRequired{},
+			json: `{}`,
+		},
+		{
+			desc: "direct required field set to null",
+			pb:   &pb.MsgWithRequired{},
+			json: `{"str": null}`,
+		},
+		{
+			desc: "indirect required field missing",
+			pb:   &pb.MsgWithIndirectRequired{},
+			json: `{"subm": {}}`,
+		},
+		{
+			desc: "indirect required field set to null",
+			pb:   &pb.MsgWithIndirectRequired{},
+			json: `{"subm": {"str": null}}`,
+		},
+		{
+			desc: "direct required bytes field missing",
+			pb:   &pb.MsgWithRequiredBytes{},
+			json: `{}`,
+		},
+		{
+			desc: "direct required bytes field set to null",
+			pb:   &pb.MsgWithRequiredBytes{},
+			json: `{"byts": null}`,
+		},
+		{
+			desc: "direct required wkt field missing",
+			pb:   &pb.MsgWithRequiredWKT{},
+			json: `{}`,
+		},
+		{
+			desc: "direct required wkt field set to null",
+			pb:   &pb.MsgWithRequiredWKT{},
+			json: `{"str": null}`,
+		},
+		{
+			desc: "any containing message with required field set to null",
+			pb:   &pb.KnownTypes{},
+			json: `{"an": {"@type": "example.com/jsonpb.MsgWithRequired", "str": null}}`,
+		},
+		{
+			desc: "any containing message with missing required field",
+			pb:   &pb.KnownTypes{},
+			json: `{"an": {"@type": "example.com/jsonpb.MsgWithRequired"}}`,
+		},
+		{
+			desc: "missing required in map value",
+			pb:   &pb.MsgWithIndirectRequired{},
+			json: `{"map_field": {"a": {}, "b": {"str": "hi"}}}`,
+		},
+		{
+			desc: "required in map value set to null",
+			pb:   &pb.MsgWithIndirectRequired{},
+			json: `{"map_field": {"a": {"str": "hello"}, "b": {"str": null}}}`,
+		},
+		{
+			desc: "missing required in slice item",
+			pb:   &pb.MsgWithIndirectRequired{},
+			json: `{"slice_field": [{}, {"str": "hi"}]}`,
+		},
+		{
+			desc: "required in slice item set to null",
+			pb:   &pb.MsgWithIndirectRequired{},
+			json: `{"slice_field": [{"str": "hello"}, {"str": null}]}`,
+		},
+		{
+			desc: "required inside oneof missing",
+			pb:   &pb.MsgWithOneof{},
+			json: `{"msgWithRequired": {}}`,
+		},
+		{
+			desc: "required inside oneof set to null",
+			pb:   &pb.MsgWithOneof{},
+			json: `{"msgWithRequired": {"str": null}}`,
+		},
+		{
+			desc: "required field in extension missing",
+			pb:   &pb.Real{},
+			json: `{"[jsonpb.extm]":{}}`,
+		},
+		{
+			desc: "required field in extension set to null",
+			pb:   &pb.Real{},
+			json: `{"[jsonpb.extm]":{"str": null}}`,
+		},
+	}
+
+	for _, tc := range tests {
+		if err := UnmarshalString(tc.json, tc.pb); err == nil {
+			t.Errorf("%s: expecting error in unmarshaling with unset required fields %s", tc.desc, tc.json)
+		}
+	}
+}
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile
deleted file mode 100644
index eeda8ae5..00000000
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2015 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-regenerate:
-	protoc --go_out=Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any,Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,Mgoogle/protobuf/struct.proto=github.com/golang/protobuf/ptypes/struct,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/wrappers.proto=github.com/golang/protobuf/ptypes/wrappers:. *.proto
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
index ebb180e8..1bcce029 100644
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
+++ b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
@@ -1,29 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: more_test_objects.proto
 
-/*
-Package jsonpb is a generated protocol buffer package.
-
-It is generated from these files:
-	more_test_objects.proto
-	test_objects.proto
-
-It has these top-level messages:
-	Simple3
-	SimpleSlice3
-	SimpleMap3
-	SimpleNull3
-	Mappy
-	Simple
-	NonFinites
-	Repeats
-	Widget
-	Maps
-	MsgWithOneof
-	Real
-	Complex
-	KnownTypes
-*/
 package jsonpb
 
 import proto "github.com/golang/protobuf/proto"
@@ -63,16 +40,40 @@ var Numeral_value = map[string]int32{
 func (x Numeral) String() string {
 	return proto.EnumName(Numeral_name, int32(x))
 }
-func (Numeral) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (Numeral) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{0}
+}
 
 type Simple3 struct {
-	Dub float64 `protobuf:"fixed64,1,opt,name=dub" json:"dub,omitempty"`
+	Dub                  float64  `protobuf:"fixed64,1,opt,name=dub" json:"dub,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Simple3) Reset()         { *m = Simple3{} }
+func (m *Simple3) String() string { return proto.CompactTextString(m) }
+func (*Simple3) ProtoMessage()    {}
+func (*Simple3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{0}
+}
+func (m *Simple3) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Simple3.Unmarshal(m, b)
+}
+func (m *Simple3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Simple3.Marshal(b, m, deterministic)
+}
+func (dst *Simple3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Simple3.Merge(dst, src)
+}
+func (m *Simple3) XXX_Size() int {
+	return xxx_messageInfo_Simple3.Size(m)
+}
+func (m *Simple3) XXX_DiscardUnknown() {
+	xxx_messageInfo_Simple3.DiscardUnknown(m)
 }
 
-func (m *Simple3) Reset()                    { *m = Simple3{} }
-func (m *Simple3) String() string            { return proto.CompactTextString(m) }
-func (*Simple3) ProtoMessage()               {}
-func (*Simple3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Simple3 proto.InternalMessageInfo
 
 func (m *Simple3) GetDub() float64 {
 	if m != nil {
@@ -82,13 +83,35 @@ func (m *Simple3) GetDub() float64 {
 }
 
 type SimpleSlice3 struct {
-	Slices []string `protobuf:"bytes,1,rep,name=slices" json:"slices,omitempty"`
+	Slices               []string `protobuf:"bytes,1,rep,name=slices" json:"slices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SimpleSlice3) Reset()         { *m = SimpleSlice3{} }
+func (m *SimpleSlice3) String() string { return proto.CompactTextString(m) }
+func (*SimpleSlice3) ProtoMessage()    {}
+func (*SimpleSlice3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{1}
+}
+func (m *SimpleSlice3) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleSlice3.Unmarshal(m, b)
+}
+func (m *SimpleSlice3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleSlice3.Marshal(b, m, deterministic)
+}
+func (dst *SimpleSlice3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleSlice3.Merge(dst, src)
+}
+func (m *SimpleSlice3) XXX_Size() int {
+	return xxx_messageInfo_SimpleSlice3.Size(m)
+}
+func (m *SimpleSlice3) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleSlice3.DiscardUnknown(m)
 }
 
-func (m *SimpleSlice3) Reset()                    { *m = SimpleSlice3{} }
-func (m *SimpleSlice3) String() string            { return proto.CompactTextString(m) }
-func (*SimpleSlice3) ProtoMessage()               {}
-func (*SimpleSlice3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_SimpleSlice3 proto.InternalMessageInfo
 
 func (m *SimpleSlice3) GetSlices() []string {
 	if m != nil {
@@ -98,13 +121,35 @@ func (m *SimpleSlice3) GetSlices() []string {
 }
 
 type SimpleMap3 struct {
-	Stringy map[string]string `protobuf:"bytes,1,rep,name=stringy" json:"stringy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Stringy              map[string]string `protobuf:"bytes,1,rep,name=stringy" json:"stringy,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 (m *SimpleMap3) Reset()         { *m = SimpleMap3{} }
+func (m *SimpleMap3) String() string { return proto.CompactTextString(m) }
+func (*SimpleMap3) ProtoMessage()    {}
+func (*SimpleMap3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{2}
+}
+func (m *SimpleMap3) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleMap3.Unmarshal(m, b)
+}
+func (m *SimpleMap3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleMap3.Marshal(b, m, deterministic)
+}
+func (dst *SimpleMap3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleMap3.Merge(dst, src)
+}
+func (m *SimpleMap3) XXX_Size() int {
+	return xxx_messageInfo_SimpleMap3.Size(m)
+}
+func (m *SimpleMap3) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleMap3.DiscardUnknown(m)
 }
 
-func (m *SimpleMap3) Reset()                    { *m = SimpleMap3{} }
-func (m *SimpleMap3) String() string            { return proto.CompactTextString(m) }
-func (*SimpleMap3) ProtoMessage()               {}
-func (*SimpleMap3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_SimpleMap3 proto.InternalMessageInfo
 
 func (m *SimpleMap3) GetStringy() map[string]string {
 	if m != nil {
@@ -114,13 +159,35 @@ func (m *SimpleMap3) GetStringy() map[string]string {
 }
 
 type SimpleNull3 struct {
-	Simple *Simple3 `protobuf:"bytes,1,opt,name=simple" json:"simple,omitempty"`
+	Simple               *Simple3 `protobuf:"bytes,1,opt,name=simple" json:"simple,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SimpleNull3) Reset()         { *m = SimpleNull3{} }
+func (m *SimpleNull3) String() string { return proto.CompactTextString(m) }
+func (*SimpleNull3) ProtoMessage()    {}
+func (*SimpleNull3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{3}
+}
+func (m *SimpleNull3) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleNull3.Unmarshal(m, b)
+}
+func (m *SimpleNull3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleNull3.Marshal(b, m, deterministic)
+}
+func (dst *SimpleNull3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleNull3.Merge(dst, src)
+}
+func (m *SimpleNull3) XXX_Size() int {
+	return xxx_messageInfo_SimpleNull3.Size(m)
+}
+func (m *SimpleNull3) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleNull3.DiscardUnknown(m)
 }
 
-func (m *SimpleNull3) Reset()                    { *m = SimpleNull3{} }
-func (m *SimpleNull3) String() string            { return proto.CompactTextString(m) }
-func (*SimpleNull3) ProtoMessage()               {}
-func (*SimpleNull3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_SimpleNull3 proto.InternalMessageInfo
 
 func (m *SimpleNull3) GetSimple() *Simple3 {
 	if m != nil {
@@ -130,22 +197,44 @@ func (m *SimpleNull3) GetSimple() *Simple3 {
 }
 
 type Mappy struct {
-	Nummy    map[int64]int32    `protobuf:"bytes,1,rep,name=nummy" json:"nummy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	Strry    map[string]string  `protobuf:"bytes,2,rep,name=strry" json:"strry,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Objjy    map[int32]*Simple3 `protobuf:"bytes,3,rep,name=objjy" json:"objjy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Buggy    map[int64]string   `protobuf:"bytes,4,rep,name=buggy" json:"buggy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Booly    map[bool]bool      `protobuf:"bytes,5,rep,name=booly" json:"booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	Enumy    map[string]Numeral `protobuf:"bytes,6,rep,name=enumy" json:"enumy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=jsonpb.Numeral"`
-	S32Booly map[int32]bool     `protobuf:"bytes,7,rep,name=s32booly" json:"s32booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	S64Booly map[int64]bool     `protobuf:"bytes,8,rep,name=s64booly" json:"s64booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	U32Booly map[uint32]bool    `protobuf:"bytes,9,rep,name=u32booly" json:"u32booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	U64Booly map[uint64]bool    `protobuf:"bytes,10,rep,name=u64booly" json:"u64booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-}
-
-func (m *Mappy) Reset()                    { *m = Mappy{} }
-func (m *Mappy) String() string            { return proto.CompactTextString(m) }
-func (*Mappy) ProtoMessage()               {}
-func (*Mappy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+	Nummy                map[int64]int32    `protobuf:"bytes,1,rep,name=nummy" json:"nummy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	Strry                map[string]string  `protobuf:"bytes,2,rep,name=strry" json:"strry,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Objjy                map[int32]*Simple3 `protobuf:"bytes,3,rep,name=objjy" json:"objjy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Buggy                map[int64]string   `protobuf:"bytes,4,rep,name=buggy" json:"buggy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Booly                map[bool]bool      `protobuf:"bytes,5,rep,name=booly" json:"booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	Enumy                map[string]Numeral `protobuf:"bytes,6,rep,name=enumy" json:"enumy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=jsonpb.Numeral"`
+	S32Booly             map[int32]bool     `protobuf:"bytes,7,rep,name=s32booly" json:"s32booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	S64Booly             map[int64]bool     `protobuf:"bytes,8,rep,name=s64booly" json:"s64booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	U32Booly             map[uint32]bool    `protobuf:"bytes,9,rep,name=u32booly" json:"u32booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	U64Booly             map[uint64]bool    `protobuf:"bytes,10,rep,name=u64booly" json:"u64booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Mappy) Reset()         { *m = Mappy{} }
+func (m *Mappy) String() string { return proto.CompactTextString(m) }
+func (*Mappy) ProtoMessage()    {}
+func (*Mappy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{4}
+}
+func (m *Mappy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mappy.Unmarshal(m, b)
+}
+func (m *Mappy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mappy.Marshal(b, m, deterministic)
+}
+func (dst *Mappy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mappy.Merge(dst, src)
+}
+func (m *Mappy) XXX_Size() int {
+	return xxx_messageInfo_Mappy.Size(m)
+}
+func (m *Mappy) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mappy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mappy proto.InternalMessageInfo
 
 func (m *Mappy) GetNummy() map[int64]int32 {
 	if m != nil {
@@ -221,14 +310,27 @@ func init() {
 	proto.RegisterType((*Simple3)(nil), "jsonpb.Simple3")
 	proto.RegisterType((*SimpleSlice3)(nil), "jsonpb.SimpleSlice3")
 	proto.RegisterType((*SimpleMap3)(nil), "jsonpb.SimpleMap3")
+	proto.RegisterMapType((map[string]string)(nil), "jsonpb.SimpleMap3.StringyEntry")
 	proto.RegisterType((*SimpleNull3)(nil), "jsonpb.SimpleNull3")
 	proto.RegisterType((*Mappy)(nil), "jsonpb.Mappy")
+	proto.RegisterMapType((map[bool]bool)(nil), "jsonpb.Mappy.BoolyEntry")
+	proto.RegisterMapType((map[int64]string)(nil), "jsonpb.Mappy.BuggyEntry")
+	proto.RegisterMapType((map[string]Numeral)(nil), "jsonpb.Mappy.EnumyEntry")
+	proto.RegisterMapType((map[int64]int32)(nil), "jsonpb.Mappy.NummyEntry")
+	proto.RegisterMapType((map[int32]*Simple3)(nil), "jsonpb.Mappy.ObjjyEntry")
+	proto.RegisterMapType((map[int32]bool)(nil), "jsonpb.Mappy.S32boolyEntry")
+	proto.RegisterMapType((map[int64]bool)(nil), "jsonpb.Mappy.S64boolyEntry")
+	proto.RegisterMapType((map[string]string)(nil), "jsonpb.Mappy.StrryEntry")
+	proto.RegisterMapType((map[uint32]bool)(nil), "jsonpb.Mappy.U32boolyEntry")
+	proto.RegisterMapType((map[uint64]bool)(nil), "jsonpb.Mappy.U64boolyEntry")
 	proto.RegisterEnum("jsonpb.Numeral", Numeral_name, Numeral_value)
 }
 
-func init() { proto.RegisterFile("more_test_objects.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("more_test_objects.proto", fileDescriptor_more_test_objects_bef0d79b901f4c4a)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_more_test_objects_bef0d79b901f4c4a = []byte{
 	// 526 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdd, 0x6b, 0xdb, 0x3c,
 	0x14, 0x87, 0x5f, 0x27, 0xf5, 0xd7, 0x49, 0xfb, 0x2e, 0x88, 0xb1, 0x99, 0xf4, 0x62, 0xc5, 0xb0,
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go
index d413d740..d9e24db2 100644
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go
+++ b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go
@@ -6,17 +6,23 @@ package jsonpb
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/wrappers"
+import any "github.com/golang/protobuf/ptypes/any"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type Widget_Color int32
 
 const (
@@ -52,28 +58,51 @@ func (x *Widget_Color) UnmarshalJSON(data []byte) error {
 	*x = Widget_Color(value)
 	return nil
 }
-func (Widget_Color) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{3, 0} }
+func (Widget_Color) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{3, 0}
+}
 
 // Test message for holding primitive types.
 type Simple struct {
-	OBool            *bool    `protobuf:"varint,1,opt,name=o_bool,json=oBool" json:"o_bool,omitempty"`
-	OInt32           *int32   `protobuf:"varint,2,opt,name=o_int32,json=oInt32" json:"o_int32,omitempty"`
-	OInt64           *int64   `protobuf:"varint,3,opt,name=o_int64,json=oInt64" json:"o_int64,omitempty"`
-	OUint32          *uint32  `protobuf:"varint,4,opt,name=o_uint32,json=oUint32" json:"o_uint32,omitempty"`
-	OUint64          *uint64  `protobuf:"varint,5,opt,name=o_uint64,json=oUint64" json:"o_uint64,omitempty"`
-	OSint32          *int32   `protobuf:"zigzag32,6,opt,name=o_sint32,json=oSint32" json:"o_sint32,omitempty"`
-	OSint64          *int64   `protobuf:"zigzag64,7,opt,name=o_sint64,json=oSint64" json:"o_sint64,omitempty"`
-	OFloat           *float32 `protobuf:"fixed32,8,opt,name=o_float,json=oFloat" json:"o_float,omitempty"`
-	ODouble          *float64 `protobuf:"fixed64,9,opt,name=o_double,json=oDouble" json:"o_double,omitempty"`
-	OString          *string  `protobuf:"bytes,10,opt,name=o_string,json=oString" json:"o_string,omitempty"`
-	OBytes           []byte   `protobuf:"bytes,11,opt,name=o_bytes,json=oBytes" json:"o_bytes,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Simple) Reset()                    { *m = Simple{} }
-func (m *Simple) String() string            { return proto.CompactTextString(m) }
-func (*Simple) ProtoMessage()               {}
-func (*Simple) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+	OBool                *bool    `protobuf:"varint,1,opt,name=o_bool,json=oBool" json:"o_bool,omitempty"`
+	OInt32               *int32   `protobuf:"varint,2,opt,name=o_int32,json=oInt32" json:"o_int32,omitempty"`
+	OInt64               *int64   `protobuf:"varint,3,opt,name=o_int64,json=oInt64" json:"o_int64,omitempty"`
+	OUint32              *uint32  `protobuf:"varint,4,opt,name=o_uint32,json=oUint32" json:"o_uint32,omitempty"`
+	OUint64              *uint64  `protobuf:"varint,5,opt,name=o_uint64,json=oUint64" json:"o_uint64,omitempty"`
+	OSint32              *int32   `protobuf:"zigzag32,6,opt,name=o_sint32,json=oSint32" json:"o_sint32,omitempty"`
+	OSint64              *int64   `protobuf:"zigzag64,7,opt,name=o_sint64,json=oSint64" json:"o_sint64,omitempty"`
+	OFloat               *float32 `protobuf:"fixed32,8,opt,name=o_float,json=oFloat" json:"o_float,omitempty"`
+	ODouble              *float64 `protobuf:"fixed64,9,opt,name=o_double,json=oDouble" json:"o_double,omitempty"`
+	OString              *string  `protobuf:"bytes,10,opt,name=o_string,json=oString" json:"o_string,omitempty"`
+	OBytes               []byte   `protobuf:"bytes,11,opt,name=o_bytes,json=oBytes" json:"o_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Simple) Reset()         { *m = Simple{} }
+func (m *Simple) String() string { return proto.CompactTextString(m) }
+func (*Simple) ProtoMessage()    {}
+func (*Simple) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{0}
+}
+func (m *Simple) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Simple.Unmarshal(m, b)
+}
+func (m *Simple) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Simple.Marshal(b, m, deterministic)
+}
+func (dst *Simple) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Simple.Merge(dst, src)
+}
+func (m *Simple) XXX_Size() int {
+	return xxx_messageInfo_Simple.Size(m)
+}
+func (m *Simple) XXX_DiscardUnknown() {
+	xxx_messageInfo_Simple.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Simple proto.InternalMessageInfo
 
 func (m *Simple) GetOBool() bool {
 	if m != nil && m.OBool != nil {
@@ -154,19 +183,40 @@ func (m *Simple) GetOBytes() []byte {
 
 // Test message for holding special non-finites primitives.
 type NonFinites struct {
-	FNan             *float32 `protobuf:"fixed32,1,opt,name=f_nan,json=fNan" json:"f_nan,omitempty"`
-	FPinf            *float32 `protobuf:"fixed32,2,opt,name=f_pinf,json=fPinf" json:"f_pinf,omitempty"`
-	FNinf            *float32 `protobuf:"fixed32,3,opt,name=f_ninf,json=fNinf" json:"f_ninf,omitempty"`
-	DNan             *float64 `protobuf:"fixed64,4,opt,name=d_nan,json=dNan" json:"d_nan,omitempty"`
-	DPinf            *float64 `protobuf:"fixed64,5,opt,name=d_pinf,json=dPinf" json:"d_pinf,omitempty"`
-	DNinf            *float64 `protobuf:"fixed64,6,opt,name=d_ninf,json=dNinf" json:"d_ninf,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
+	FNan                 *float32 `protobuf:"fixed32,1,opt,name=f_nan,json=fNan" json:"f_nan,omitempty"`
+	FPinf                *float32 `protobuf:"fixed32,2,opt,name=f_pinf,json=fPinf" json:"f_pinf,omitempty"`
+	FNinf                *float32 `protobuf:"fixed32,3,opt,name=f_ninf,json=fNinf" json:"f_ninf,omitempty"`
+	DNan                 *float64 `protobuf:"fixed64,4,opt,name=d_nan,json=dNan" json:"d_nan,omitempty"`
+	DPinf                *float64 `protobuf:"fixed64,5,opt,name=d_pinf,json=dPinf" json:"d_pinf,omitempty"`
+	DNinf                *float64 `protobuf:"fixed64,6,opt,name=d_ninf,json=dNinf" json:"d_ninf,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NonFinites) Reset()                    { *m = NonFinites{} }
-func (m *NonFinites) String() string            { return proto.CompactTextString(m) }
-func (*NonFinites) ProtoMessage()               {}
-func (*NonFinites) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *NonFinites) Reset()         { *m = NonFinites{} }
+func (m *NonFinites) String() string { return proto.CompactTextString(m) }
+func (*NonFinites) ProtoMessage()    {}
+func (*NonFinites) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{1}
+}
+func (m *NonFinites) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NonFinites.Unmarshal(m, b)
+}
+func (m *NonFinites) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NonFinites.Marshal(b, m, deterministic)
+}
+func (dst *NonFinites) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NonFinites.Merge(dst, src)
+}
+func (m *NonFinites) XXX_Size() int {
+	return xxx_messageInfo_NonFinites.Size(m)
+}
+func (m *NonFinites) XXX_DiscardUnknown() {
+	xxx_messageInfo_NonFinites.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NonFinites proto.InternalMessageInfo
 
 func (m *NonFinites) GetFNan() float32 {
 	if m != nil && m.FNan != nil {
@@ -212,24 +262,45 @@ func (m *NonFinites) GetDNinf() float64 {
 
 // Test message for holding repeated primitives.
 type Repeats struct {
-	RBool            []bool    `protobuf:"varint,1,rep,name=r_bool,json=rBool" json:"r_bool,omitempty"`
-	RInt32           []int32   `protobuf:"varint,2,rep,name=r_int32,json=rInt32" json:"r_int32,omitempty"`
-	RInt64           []int64   `protobuf:"varint,3,rep,name=r_int64,json=rInt64" json:"r_int64,omitempty"`
-	RUint32          []uint32  `protobuf:"varint,4,rep,name=r_uint32,json=rUint32" json:"r_uint32,omitempty"`
-	RUint64          []uint64  `protobuf:"varint,5,rep,name=r_uint64,json=rUint64" json:"r_uint64,omitempty"`
-	RSint32          []int32   `protobuf:"zigzag32,6,rep,name=r_sint32,json=rSint32" json:"r_sint32,omitempty"`
-	RSint64          []int64   `protobuf:"zigzag64,7,rep,name=r_sint64,json=rSint64" json:"r_sint64,omitempty"`
-	RFloat           []float32 `protobuf:"fixed32,8,rep,name=r_float,json=rFloat" json:"r_float,omitempty"`
-	RDouble          []float64 `protobuf:"fixed64,9,rep,name=r_double,json=rDouble" json:"r_double,omitempty"`
-	RString          []string  `protobuf:"bytes,10,rep,name=r_string,json=rString" json:"r_string,omitempty"`
-	RBytes           [][]byte  `protobuf:"bytes,11,rep,name=r_bytes,json=rBytes" json:"r_bytes,omitempty"`
-	XXX_unrecognized []byte    `json:"-"`
-}
-
-func (m *Repeats) Reset()                    { *m = Repeats{} }
-func (m *Repeats) String() string            { return proto.CompactTextString(m) }
-func (*Repeats) ProtoMessage()               {}
-func (*Repeats) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+	RBool                []bool    `protobuf:"varint,1,rep,name=r_bool,json=rBool" json:"r_bool,omitempty"`
+	RInt32               []int32   `protobuf:"varint,2,rep,name=r_int32,json=rInt32" json:"r_int32,omitempty"`
+	RInt64               []int64   `protobuf:"varint,3,rep,name=r_int64,json=rInt64" json:"r_int64,omitempty"`
+	RUint32              []uint32  `protobuf:"varint,4,rep,name=r_uint32,json=rUint32" json:"r_uint32,omitempty"`
+	RUint64              []uint64  `protobuf:"varint,5,rep,name=r_uint64,json=rUint64" json:"r_uint64,omitempty"`
+	RSint32              []int32   `protobuf:"zigzag32,6,rep,name=r_sint32,json=rSint32" json:"r_sint32,omitempty"`
+	RSint64              []int64   `protobuf:"zigzag64,7,rep,name=r_sint64,json=rSint64" json:"r_sint64,omitempty"`
+	RFloat               []float32 `protobuf:"fixed32,8,rep,name=r_float,json=rFloat" json:"r_float,omitempty"`
+	RDouble              []float64 `protobuf:"fixed64,9,rep,name=r_double,json=rDouble" json:"r_double,omitempty"`
+	RString              []string  `protobuf:"bytes,10,rep,name=r_string,json=rString" json:"r_string,omitempty"`
+	RBytes               [][]byte  `protobuf:"bytes,11,rep,name=r_bytes,json=rBytes" json:"r_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *Repeats) Reset()         { *m = Repeats{} }
+func (m *Repeats) String() string { return proto.CompactTextString(m) }
+func (*Repeats) ProtoMessage()    {}
+func (*Repeats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{2}
+}
+func (m *Repeats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Repeats.Unmarshal(m, b)
+}
+func (m *Repeats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Repeats.Marshal(b, m, deterministic)
+}
+func (dst *Repeats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Repeats.Merge(dst, src)
+}
+func (m *Repeats) XXX_Size() int {
+	return xxx_messageInfo_Repeats.Size(m)
+}
+func (m *Repeats) XXX_DiscardUnknown() {
+	xxx_messageInfo_Repeats.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Repeats proto.InternalMessageInfo
 
 func (m *Repeats) GetRBool() []bool {
 	if m != nil {
@@ -310,19 +381,40 @@ func (m *Repeats) GetRBytes() [][]byte {
 
 // Test message for holding enums and nested messages.
 type Widget struct {
-	Color            *Widget_Color  `protobuf:"varint,1,opt,name=color,enum=jsonpb.Widget_Color" json:"color,omitempty"`
-	RColor           []Widget_Color `protobuf:"varint,2,rep,name=r_color,json=rColor,enum=jsonpb.Widget_Color" json:"r_color,omitempty"`
-	Simple           *Simple        `protobuf:"bytes,10,opt,name=simple" json:"simple,omitempty"`
-	RSimple          []*Simple      `protobuf:"bytes,11,rep,name=r_simple,json=rSimple" json:"r_simple,omitempty"`
-	Repeats          *Repeats       `protobuf:"bytes,20,opt,name=repeats" json:"repeats,omitempty"`
-	RRepeats         []*Repeats     `protobuf:"bytes,21,rep,name=r_repeats,json=rRepeats" json:"r_repeats,omitempty"`
-	XXX_unrecognized []byte         `json:"-"`
+	Color                *Widget_Color  `protobuf:"varint,1,opt,name=color,enum=jsonpb.Widget_Color" json:"color,omitempty"`
+	RColor               []Widget_Color `protobuf:"varint,2,rep,name=r_color,json=rColor,enum=jsonpb.Widget_Color" json:"r_color,omitempty"`
+	Simple               *Simple        `protobuf:"bytes,10,opt,name=simple" json:"simple,omitempty"`
+	RSimple              []*Simple      `protobuf:"bytes,11,rep,name=r_simple,json=rSimple" json:"r_simple,omitempty"`
+	Repeats              *Repeats       `protobuf:"bytes,20,opt,name=repeats" json:"repeats,omitempty"`
+	RRepeats             []*Repeats     `protobuf:"bytes,21,rep,name=r_repeats,json=rRepeats" json:"r_repeats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *Widget) Reset()         { *m = Widget{} }
+func (m *Widget) String() string { return proto.CompactTextString(m) }
+func (*Widget) ProtoMessage()    {}
+func (*Widget) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{3}
+}
+func (m *Widget) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Widget.Unmarshal(m, b)
+}
+func (m *Widget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Widget.Marshal(b, m, deterministic)
+}
+func (dst *Widget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Widget.Merge(dst, src)
+}
+func (m *Widget) XXX_Size() int {
+	return xxx_messageInfo_Widget.Size(m)
+}
+func (m *Widget) XXX_DiscardUnknown() {
+	xxx_messageInfo_Widget.DiscardUnknown(m)
 }
 
-func (m *Widget) Reset()                    { *m = Widget{} }
-func (m *Widget) String() string            { return proto.CompactTextString(m) }
-func (*Widget) ProtoMessage()               {}
-func (*Widget) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_Widget proto.InternalMessageInfo
 
 func (m *Widget) GetColor() Widget_Color {
 	if m != nil && m.Color != nil {
@@ -367,15 +459,36 @@ func (m *Widget) GetRRepeats() []*Repeats {
 }
 
 type Maps struct {
-	MInt64Str        map[int64]string `protobuf:"bytes,1,rep,name=m_int64_str,json=mInt64Str" json:"m_int64_str,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MBoolSimple      map[bool]*Simple `protobuf:"bytes,2,rep,name=m_bool_simple,json=mBoolSimple" json:"m_bool_simple,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	XXX_unrecognized []byte           `json:"-"`
+	MInt64Str            map[int64]string `protobuf:"bytes,1,rep,name=m_int64_str,json=mInt64Str" json:"m_int64_str,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	MBoolSimple          map[bool]*Simple `protobuf:"bytes,2,rep,name=m_bool_simple,json=mBoolSimple" json:"m_bool_simple,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *Maps) Reset()         { *m = Maps{} }
+func (m *Maps) String() string { return proto.CompactTextString(m) }
+func (*Maps) ProtoMessage()    {}
+func (*Maps) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{4}
+}
+func (m *Maps) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Maps.Unmarshal(m, b)
+}
+func (m *Maps) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Maps.Marshal(b, m, deterministic)
+}
+func (dst *Maps) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Maps.Merge(dst, src)
+}
+func (m *Maps) XXX_Size() int {
+	return xxx_messageInfo_Maps.Size(m)
+}
+func (m *Maps) XXX_DiscardUnknown() {
+	xxx_messageInfo_Maps.DiscardUnknown(m)
 }
 
-func (m *Maps) Reset()                    { *m = Maps{} }
-func (m *Maps) String() string            { return proto.CompactTextString(m) }
-func (*Maps) ProtoMessage()               {}
-func (*Maps) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_Maps proto.InternalMessageInfo
 
 func (m *Maps) GetMInt64Str() map[int64]string {
 	if m != nil {
@@ -397,14 +510,36 @@ type MsgWithOneof struct {
 	//	*MsgWithOneof_Salary
 	//	*MsgWithOneof_Country
 	//	*MsgWithOneof_HomeAddress
-	Union            isMsgWithOneof_Union `protobuf_oneof:"union"`
-	XXX_unrecognized []byte               `json:"-"`
+	//	*MsgWithOneof_MsgWithRequired
+	Union                isMsgWithOneof_Union `protobuf_oneof:"union"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *MsgWithOneof) Reset()                    { *m = MsgWithOneof{} }
-func (m *MsgWithOneof) String() string            { return proto.CompactTextString(m) }
-func (*MsgWithOneof) ProtoMessage()               {}
-func (*MsgWithOneof) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *MsgWithOneof) Reset()         { *m = MsgWithOneof{} }
+func (m *MsgWithOneof) String() string { return proto.CompactTextString(m) }
+func (*MsgWithOneof) ProtoMessage()    {}
+func (*MsgWithOneof) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{5}
+}
+func (m *MsgWithOneof) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MsgWithOneof.Unmarshal(m, b)
+}
+func (m *MsgWithOneof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MsgWithOneof.Marshal(b, m, deterministic)
+}
+func (dst *MsgWithOneof) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgWithOneof.Merge(dst, src)
+}
+func (m *MsgWithOneof) XXX_Size() int {
+	return xxx_messageInfo_MsgWithOneof.Size(m)
+}
+func (m *MsgWithOneof) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgWithOneof.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgWithOneof proto.InternalMessageInfo
 
 type isMsgWithOneof_Union interface {
 	isMsgWithOneof_Union()
@@ -422,11 +557,15 @@ type MsgWithOneof_Country struct {
 type MsgWithOneof_HomeAddress struct {
 	HomeAddress string `protobuf:"bytes,4,opt,name=home_address,json=homeAddress,oneof"`
 }
+type MsgWithOneof_MsgWithRequired struct {
+	MsgWithRequired *MsgWithRequired `protobuf:"bytes,5,opt,name=msg_with_required,json=msgWithRequired,oneof"`
+}
 
-func (*MsgWithOneof_Title) isMsgWithOneof_Union()       {}
-func (*MsgWithOneof_Salary) isMsgWithOneof_Union()      {}
-func (*MsgWithOneof_Country) isMsgWithOneof_Union()     {}
-func (*MsgWithOneof_HomeAddress) isMsgWithOneof_Union() {}
+func (*MsgWithOneof_Title) isMsgWithOneof_Union()           {}
+func (*MsgWithOneof_Salary) isMsgWithOneof_Union()          {}
+func (*MsgWithOneof_Country) isMsgWithOneof_Union()         {}
+func (*MsgWithOneof_HomeAddress) isMsgWithOneof_Union()     {}
+func (*MsgWithOneof_MsgWithRequired) isMsgWithOneof_Union() {}
 
 func (m *MsgWithOneof) GetUnion() isMsgWithOneof_Union {
 	if m != nil {
@@ -463,6 +602,13 @@ func (m *MsgWithOneof) GetHomeAddress() string {
 	return ""
 }
 
+func (m *MsgWithOneof) GetMsgWithRequired() *MsgWithRequired {
+	if x, ok := m.GetUnion().(*MsgWithOneof_MsgWithRequired); ok {
+		return x.MsgWithRequired
+	}
+	return nil
+}
+
 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*MsgWithOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _MsgWithOneof_OneofMarshaler, _MsgWithOneof_OneofUnmarshaler, _MsgWithOneof_OneofSizer, []interface{}{
@@ -470,6 +616,7 @@ func (*MsgWithOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer)
 		(*MsgWithOneof_Salary)(nil),
 		(*MsgWithOneof_Country)(nil),
 		(*MsgWithOneof_HomeAddress)(nil),
+		(*MsgWithOneof_MsgWithRequired)(nil),
 	}
 }
 
@@ -489,6 +636,11 @@ func _MsgWithOneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 	case *MsgWithOneof_HomeAddress:
 		b.EncodeVarint(4<<3 | proto.WireBytes)
 		b.EncodeStringBytes(x.HomeAddress)
+	case *MsgWithOneof_MsgWithRequired:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.MsgWithRequired); err != nil {
+			return err
+		}
 	case nil:
 	default:
 		return fmt.Errorf("MsgWithOneof.Union has unexpected type %T", x)
@@ -527,6 +679,14 @@ func _MsgWithOneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.B
 		x, err := b.DecodeStringBytes()
 		m.Union = &MsgWithOneof_HomeAddress{x}
 		return true, err
+	case 5: // union.msg_with_required
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(MsgWithRequired)
+		err := b.DecodeMessage(msg)
+		m.Union = &MsgWithOneof_MsgWithRequired{msg}
+		return true, err
 	default:
 		return false, nil
 	}
@@ -537,20 +697,25 @@ func _MsgWithOneof_OneofSizer(msg proto.Message) (n int) {
 	// union
 	switch x := m.Union.(type) {
 	case *MsgWithOneof_Title:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Title)))
 		n += len(x.Title)
 	case *MsgWithOneof_Salary:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.Salary))
 	case *MsgWithOneof_Country:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Country)))
 		n += len(x.Country)
 	case *MsgWithOneof_HomeAddress:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.HomeAddress)))
 		n += len(x.HomeAddress)
+	case *MsgWithOneof_MsgWithRequired:
+		s := proto.Size(x.MsgWithRequired)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -560,22 +725,43 @@ func _MsgWithOneof_OneofSizer(msg proto.Message) (n int) {
 
 type Real struct {
 	Value                        *float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *Real) Reset()                    { *m = Real{} }
-func (m *Real) String() string            { return proto.CompactTextString(m) }
-func (*Real) ProtoMessage()               {}
-func (*Real) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *Real) Reset()         { *m = Real{} }
+func (m *Real) String() string { return proto.CompactTextString(m) }
+func (*Real) ProtoMessage()    {}
+func (*Real) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{6}
+}
 
 var extRange_Real = []proto.ExtensionRange{
-	{100, 536870911},
+	{Start: 100, End: 536870911},
 }
 
 func (*Real) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_Real
 }
+func (m *Real) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Real.Unmarshal(m, b)
+}
+func (m *Real) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Real.Marshal(b, m, deterministic)
+}
+func (dst *Real) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Real.Merge(dst, src)
+}
+func (m *Real) XXX_Size() int {
+	return xxx_messageInfo_Real.Size(m)
+}
+func (m *Real) XXX_DiscardUnknown() {
+	xxx_messageInfo_Real.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Real proto.InternalMessageInfo
 
 func (m *Real) GetValue() float64 {
 	if m != nil && m.Value != nil {
@@ -586,22 +772,43 @@ func (m *Real) GetValue() float64 {
 
 type Complex struct {
 	Imaginary                    *float64 `protobuf:"fixed64,1,opt,name=imaginary" json:"imaginary,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *Complex) Reset()                    { *m = Complex{} }
-func (m *Complex) String() string            { return proto.CompactTextString(m) }
-func (*Complex) ProtoMessage()               {}
-func (*Complex) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+func (m *Complex) Reset()         { *m = Complex{} }
+func (m *Complex) String() string { return proto.CompactTextString(m) }
+func (*Complex) ProtoMessage()    {}
+func (*Complex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{7}
+}
 
 var extRange_Complex = []proto.ExtensionRange{
-	{100, 536870911},
+	{Start: 100, End: 536870911},
 }
 
 func (*Complex) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_Complex
 }
+func (m *Complex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Complex.Unmarshal(m, b)
+}
+func (m *Complex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Complex.Marshal(b, m, deterministic)
+}
+func (dst *Complex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Complex.Merge(dst, src)
+}
+func (m *Complex) XXX_Size() int {
+	return xxx_messageInfo_Complex.Size(m)
+}
+func (m *Complex) XXX_DiscardUnknown() {
+	xxx_messageInfo_Complex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Complex proto.InternalMessageInfo
 
 func (m *Complex) GetImaginary() float64 {
 	if m != nil && m.Imaginary != nil {
@@ -620,134 +827,324 @@ var E_Complex_RealExtension = &proto.ExtensionDesc{
 }
 
 type KnownTypes struct {
-	An               *google_protobuf.Any          `protobuf:"bytes,14,opt,name=an" json:"an,omitempty"`
-	Dur              *google_protobuf1.Duration    `protobuf:"bytes,1,opt,name=dur" json:"dur,omitempty"`
-	St               *google_protobuf2.Struct      `protobuf:"bytes,12,opt,name=st" json:"st,omitempty"`
-	Ts               *google_protobuf3.Timestamp   `protobuf:"bytes,2,opt,name=ts" json:"ts,omitempty"`
-	Lv               *google_protobuf2.ListValue   `protobuf:"bytes,15,opt,name=lv" json:"lv,omitempty"`
-	Val              *google_protobuf2.Value       `protobuf:"bytes,16,opt,name=val" json:"val,omitempty"`
-	Dbl              *google_protobuf4.DoubleValue `protobuf:"bytes,3,opt,name=dbl" json:"dbl,omitempty"`
-	Flt              *google_protobuf4.FloatValue  `protobuf:"bytes,4,opt,name=flt" json:"flt,omitempty"`
-	I64              *google_protobuf4.Int64Value  `protobuf:"bytes,5,opt,name=i64" json:"i64,omitempty"`
-	U64              *google_protobuf4.UInt64Value `protobuf:"bytes,6,opt,name=u64" json:"u64,omitempty"`
-	I32              *google_protobuf4.Int32Value  `protobuf:"bytes,7,opt,name=i32" json:"i32,omitempty"`
-	U32              *google_protobuf4.UInt32Value `protobuf:"bytes,8,opt,name=u32" json:"u32,omitempty"`
-	Bool             *google_protobuf4.BoolValue   `protobuf:"bytes,9,opt,name=bool" json:"bool,omitempty"`
-	Str              *google_protobuf4.StringValue `protobuf:"bytes,10,opt,name=str" json:"str,omitempty"`
-	Bytes            *google_protobuf4.BytesValue  `protobuf:"bytes,11,opt,name=bytes" json:"bytes,omitempty"`
-	XXX_unrecognized []byte                        `json:"-"`
-}
-
-func (m *KnownTypes) Reset()                    { *m = KnownTypes{} }
-func (m *KnownTypes) String() string            { return proto.CompactTextString(m) }
-func (*KnownTypes) ProtoMessage()               {}
-func (*KnownTypes) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
-
-func (m *KnownTypes) GetAn() *google_protobuf.Any {
+	An                   *any.Any              `protobuf:"bytes,14,opt,name=an" json:"an,omitempty"`
+	Dur                  *duration.Duration    `protobuf:"bytes,1,opt,name=dur" json:"dur,omitempty"`
+	St                   *_struct.Struct       `protobuf:"bytes,12,opt,name=st" json:"st,omitempty"`
+	Ts                   *timestamp.Timestamp  `protobuf:"bytes,2,opt,name=ts" json:"ts,omitempty"`
+	Lv                   *_struct.ListValue    `protobuf:"bytes,15,opt,name=lv" json:"lv,omitempty"`
+	Val                  *_struct.Value        `protobuf:"bytes,16,opt,name=val" json:"val,omitempty"`
+	Dbl                  *wrappers.DoubleValue `protobuf:"bytes,3,opt,name=dbl" json:"dbl,omitempty"`
+	Flt                  *wrappers.FloatValue  `protobuf:"bytes,4,opt,name=flt" json:"flt,omitempty"`
+	I64                  *wrappers.Int64Value  `protobuf:"bytes,5,opt,name=i64" json:"i64,omitempty"`
+	U64                  *wrappers.UInt64Value `protobuf:"bytes,6,opt,name=u64" json:"u64,omitempty"`
+	I32                  *wrappers.Int32Value  `protobuf:"bytes,7,opt,name=i32" json:"i32,omitempty"`
+	U32                  *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=u32" json:"u32,omitempty"`
+	Bool                 *wrappers.BoolValue   `protobuf:"bytes,9,opt,name=bool" json:"bool,omitempty"`
+	Str                  *wrappers.StringValue `protobuf:"bytes,10,opt,name=str" json:"str,omitempty"`
+	Bytes                *wrappers.BytesValue  `protobuf:"bytes,11,opt,name=bytes" json:"bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *KnownTypes) Reset()         { *m = KnownTypes{} }
+func (m *KnownTypes) String() string { return proto.CompactTextString(m) }
+func (*KnownTypes) ProtoMessage()    {}
+func (*KnownTypes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{8}
+}
+func (m *KnownTypes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KnownTypes.Unmarshal(m, b)
+}
+func (m *KnownTypes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KnownTypes.Marshal(b, m, deterministic)
+}
+func (dst *KnownTypes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnownTypes.Merge(dst, src)
+}
+func (m *KnownTypes) XXX_Size() int {
+	return xxx_messageInfo_KnownTypes.Size(m)
+}
+func (m *KnownTypes) XXX_DiscardUnknown() {
+	xxx_messageInfo_KnownTypes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KnownTypes proto.InternalMessageInfo
+
+func (m *KnownTypes) GetAn() *any.Any {
 	if m != nil {
 		return m.An
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetDur() *google_protobuf1.Duration {
+func (m *KnownTypes) GetDur() *duration.Duration {
 	if m != nil {
 		return m.Dur
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetSt() *google_protobuf2.Struct {
+func (m *KnownTypes) GetSt() *_struct.Struct {
 	if m != nil {
 		return m.St
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetTs() *google_protobuf3.Timestamp {
+func (m *KnownTypes) GetTs() *timestamp.Timestamp {
 	if m != nil {
 		return m.Ts
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetLv() *google_protobuf2.ListValue {
+func (m *KnownTypes) GetLv() *_struct.ListValue {
 	if m != nil {
 		return m.Lv
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetVal() *google_protobuf2.Value {
+func (m *KnownTypes) GetVal() *_struct.Value {
 	if m != nil {
 		return m.Val
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetDbl() *google_protobuf4.DoubleValue {
+func (m *KnownTypes) GetDbl() *wrappers.DoubleValue {
 	if m != nil {
 		return m.Dbl
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetFlt() *google_protobuf4.FloatValue {
+func (m *KnownTypes) GetFlt() *wrappers.FloatValue {
 	if m != nil {
 		return m.Flt
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetI64() *google_protobuf4.Int64Value {
+func (m *KnownTypes) GetI64() *wrappers.Int64Value {
 	if m != nil {
 		return m.I64
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetU64() *google_protobuf4.UInt64Value {
+func (m *KnownTypes) GetU64() *wrappers.UInt64Value {
 	if m != nil {
 		return m.U64
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetI32() *google_protobuf4.Int32Value {
+func (m *KnownTypes) GetI32() *wrappers.Int32Value {
 	if m != nil {
 		return m.I32
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetU32() *google_protobuf4.UInt32Value {
+func (m *KnownTypes) GetU32() *wrappers.UInt32Value {
 	if m != nil {
 		return m.U32
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetBool() *google_protobuf4.BoolValue {
+func (m *KnownTypes) GetBool() *wrappers.BoolValue {
 	if m != nil {
 		return m.Bool
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetStr() *google_protobuf4.StringValue {
+func (m *KnownTypes) GetStr() *wrappers.StringValue {
 	if m != nil {
 		return m.Str
 	}
 	return nil
 }
 
-func (m *KnownTypes) GetBytes() *google_protobuf4.BytesValue {
+func (m *KnownTypes) GetBytes() *wrappers.BytesValue {
 	if m != nil {
 		return m.Bytes
 	}
 	return nil
 }
 
+// Test messages for marshaling/unmarshaling required fields.
+type MsgWithRequired struct {
+	Str                  *string  `protobuf:"bytes,1,req,name=str" json:"str,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MsgWithRequired) Reset()         { *m = MsgWithRequired{} }
+func (m *MsgWithRequired) String() string { return proto.CompactTextString(m) }
+func (*MsgWithRequired) ProtoMessage()    {}
+func (*MsgWithRequired) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{9}
+}
+func (m *MsgWithRequired) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MsgWithRequired.Unmarshal(m, b)
+}
+func (m *MsgWithRequired) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MsgWithRequired.Marshal(b, m, deterministic)
+}
+func (dst *MsgWithRequired) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgWithRequired.Merge(dst, src)
+}
+func (m *MsgWithRequired) XXX_Size() int {
+	return xxx_messageInfo_MsgWithRequired.Size(m)
+}
+func (m *MsgWithRequired) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgWithRequired.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgWithRequired proto.InternalMessageInfo
+
+func (m *MsgWithRequired) GetStr() string {
+	if m != nil && m.Str != nil {
+		return *m.Str
+	}
+	return ""
+}
+
+type MsgWithIndirectRequired struct {
+	Subm                 *MsgWithRequired            `protobuf:"bytes,1,opt,name=subm" json:"subm,omitempty"`
+	MapField             map[string]*MsgWithRequired `protobuf:"bytes,2,rep,name=map_field,json=mapField" json:"map_field,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	SliceField           []*MsgWithRequired          `protobuf:"bytes,3,rep,name=slice_field,json=sliceField" json:"slice_field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *MsgWithIndirectRequired) Reset()         { *m = MsgWithIndirectRequired{} }
+func (m *MsgWithIndirectRequired) String() string { return proto.CompactTextString(m) }
+func (*MsgWithIndirectRequired) ProtoMessage()    {}
+func (*MsgWithIndirectRequired) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{10}
+}
+func (m *MsgWithIndirectRequired) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MsgWithIndirectRequired.Unmarshal(m, b)
+}
+func (m *MsgWithIndirectRequired) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MsgWithIndirectRequired.Marshal(b, m, deterministic)
+}
+func (dst *MsgWithIndirectRequired) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgWithIndirectRequired.Merge(dst, src)
+}
+func (m *MsgWithIndirectRequired) XXX_Size() int {
+	return xxx_messageInfo_MsgWithIndirectRequired.Size(m)
+}
+func (m *MsgWithIndirectRequired) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgWithIndirectRequired.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgWithIndirectRequired proto.InternalMessageInfo
+
+func (m *MsgWithIndirectRequired) GetSubm() *MsgWithRequired {
+	if m != nil {
+		return m.Subm
+	}
+	return nil
+}
+
+func (m *MsgWithIndirectRequired) GetMapField() map[string]*MsgWithRequired {
+	if m != nil {
+		return m.MapField
+	}
+	return nil
+}
+
+func (m *MsgWithIndirectRequired) GetSliceField() []*MsgWithRequired {
+	if m != nil {
+		return m.SliceField
+	}
+	return nil
+}
+
+type MsgWithRequiredBytes struct {
+	Byts                 []byte   `protobuf:"bytes,1,req,name=byts" json:"byts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MsgWithRequiredBytes) Reset()         { *m = MsgWithRequiredBytes{} }
+func (m *MsgWithRequiredBytes) String() string { return proto.CompactTextString(m) }
+func (*MsgWithRequiredBytes) ProtoMessage()    {}
+func (*MsgWithRequiredBytes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{11}
+}
+func (m *MsgWithRequiredBytes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MsgWithRequiredBytes.Unmarshal(m, b)
+}
+func (m *MsgWithRequiredBytes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MsgWithRequiredBytes.Marshal(b, m, deterministic)
+}
+func (dst *MsgWithRequiredBytes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgWithRequiredBytes.Merge(dst, src)
+}
+func (m *MsgWithRequiredBytes) XXX_Size() int {
+	return xxx_messageInfo_MsgWithRequiredBytes.Size(m)
+}
+func (m *MsgWithRequiredBytes) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgWithRequiredBytes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgWithRequiredBytes proto.InternalMessageInfo
+
+func (m *MsgWithRequiredBytes) GetByts() []byte {
+	if m != nil {
+		return m.Byts
+	}
+	return nil
+}
+
+type MsgWithRequiredWKT struct {
+	Str                  *wrappers.StringValue `protobuf:"bytes,1,req,name=str" json:"str,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *MsgWithRequiredWKT) Reset()         { *m = MsgWithRequiredWKT{} }
+func (m *MsgWithRequiredWKT) String() string { return proto.CompactTextString(m) }
+func (*MsgWithRequiredWKT) ProtoMessage()    {}
+func (*MsgWithRequiredWKT) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_objects_c6f6c615ab823e65, []int{12}
+}
+func (m *MsgWithRequiredWKT) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MsgWithRequiredWKT.Unmarshal(m, b)
+}
+func (m *MsgWithRequiredWKT) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MsgWithRequiredWKT.Marshal(b, m, deterministic)
+}
+func (dst *MsgWithRequiredWKT) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgWithRequiredWKT.Merge(dst, src)
+}
+func (m *MsgWithRequiredWKT) XXX_Size() int {
+	return xxx_messageInfo_MsgWithRequiredWKT.Size(m)
+}
+func (m *MsgWithRequiredWKT) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgWithRequiredWKT.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgWithRequiredWKT proto.InternalMessageInfo
+
+func (m *MsgWithRequiredWKT) GetStr() *wrappers.StringValue {
+	if m != nil {
+		return m.Str
+	}
+	return nil
+}
+
 var E_Name = &proto.ExtensionDesc{
 	ExtendedType:  (*Real)(nil),
 	ExtensionType: (*string)(nil),
@@ -757,96 +1154,125 @@ var E_Name = &proto.ExtensionDesc{
 	Filename:      "test_objects.proto",
 }
 
+var E_Extm = &proto.ExtensionDesc{
+	ExtendedType:  (*Real)(nil),
+	ExtensionType: (*MsgWithRequired)(nil),
+	Field:         125,
+	Name:          "jsonpb.extm",
+	Tag:           "bytes,125,opt,name=extm",
+	Filename:      "test_objects.proto",
+}
+
 func init() {
 	proto.RegisterType((*Simple)(nil), "jsonpb.Simple")
 	proto.RegisterType((*NonFinites)(nil), "jsonpb.NonFinites")
 	proto.RegisterType((*Repeats)(nil), "jsonpb.Repeats")
 	proto.RegisterType((*Widget)(nil), "jsonpb.Widget")
 	proto.RegisterType((*Maps)(nil), "jsonpb.Maps")
+	proto.RegisterMapType((map[bool]*Simple)(nil), "jsonpb.Maps.MBoolSimpleEntry")
+	proto.RegisterMapType((map[int64]string)(nil), "jsonpb.Maps.MInt64StrEntry")
 	proto.RegisterType((*MsgWithOneof)(nil), "jsonpb.MsgWithOneof")
 	proto.RegisterType((*Real)(nil), "jsonpb.Real")
 	proto.RegisterType((*Complex)(nil), "jsonpb.Complex")
 	proto.RegisterType((*KnownTypes)(nil), "jsonpb.KnownTypes")
+	proto.RegisterType((*MsgWithRequired)(nil), "jsonpb.MsgWithRequired")
+	proto.RegisterType((*MsgWithIndirectRequired)(nil), "jsonpb.MsgWithIndirectRequired")
+	proto.RegisterMapType((map[string]*MsgWithRequired)(nil), "jsonpb.MsgWithIndirectRequired.MapFieldEntry")
+	proto.RegisterType((*MsgWithRequiredBytes)(nil), "jsonpb.MsgWithRequiredBytes")
+	proto.RegisterType((*MsgWithRequiredWKT)(nil), "jsonpb.MsgWithRequiredWKT")
 	proto.RegisterEnum("jsonpb.Widget_Color", Widget_Color_name, Widget_Color_value)
 	proto.RegisterExtension(E_Complex_RealExtension)
 	proto.RegisterExtension(E_Name)
-}
-
-func init() { proto.RegisterFile("test_objects.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 1160 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x95, 0x41, 0x73, 0xdb, 0x44,
-	0x14, 0xc7, 0x23, 0xc9, 0x92, 0xed, 0x75, 0x92, 0x9a, 0x6d, 0xda, 0x2a, 0x26, 0x80, 0xc6, 0x94,
-	0x22, 0x0a, 0x75, 0x07, 0xc7, 0xe3, 0x61, 0x0a, 0x97, 0xa4, 0x71, 0x29, 0x43, 0x13, 0x98, 0x4d,
-	0x43, 0x8f, 0x1e, 0x39, 0x5a, 0xbb, 0x2a, 0xf2, 0xae, 0x67, 0x77, 0x95, 0xd4, 0x03, 0x87, 0x9c,
-	0x39, 0x32, 0x7c, 0x05, 0xf8, 0x08, 0x1c, 0xf8, 0x74, 0xcc, 0xdb, 0x95, 0xac, 0xc4, 0x8e, 0x4f,
-	0xf1, 0x7b, 0xef, 0xff, 0xfe, 0x59, 0xed, 0x6f, 0x77, 0x1f, 0xc2, 0x8a, 0x4a, 0x35, 0xe4, 0xa3,
-	0x77, 0xf4, 0x5c, 0xc9, 0xce, 0x4c, 0x70, 0xc5, 0xb1, 0xf7, 0x4e, 0x72, 0x36, 0x1b, 0xb5, 0x76,
-	0x27, 0x9c, 0x4f, 0x52, 0xfa, 0x54, 0x67, 0x47, 0xd9, 0xf8, 0x69, 0xc4, 0xe6, 0x46, 0xd2, 0xfa,
-	0x78, 0xb9, 0x14, 0x67, 0x22, 0x52, 0x09, 0x67, 0x79, 0x7d, 0x6f, 0xb9, 0x2e, 0x95, 0xc8, 0xce,
-	0x55, 0x5e, 0xfd, 0x64, 0xb9, 0xaa, 0x92, 0x29, 0x95, 0x2a, 0x9a, 0xce, 0xd6, 0xd9, 0x5f, 0x8a,
-	0x68, 0x36, 0xa3, 0x22, 0x5f, 0x61, 0xfb, 0x6f, 0x1b, 0x79, 0xa7, 0xc9, 0x74, 0x96, 0x52, 0x7c,
-	0x0f, 0x79, 0x7c, 0x38, 0xe2, 0x3c, 0xf5, 0xad, 0xc0, 0x0a, 0x6b, 0xc4, 0xe5, 0x87, 0x9c, 0xa7,
-	0xf8, 0x01, 0xaa, 0xf2, 0x61, 0xc2, 0xd4, 0x7e, 0xd7, 0xb7, 0x03, 0x2b, 0x74, 0x89, 0xc7, 0x7f,
-	0x80, 0x68, 0x51, 0xe8, 0xf7, 0x7c, 0x27, 0xb0, 0x42, 0xc7, 0x14, 0xfa, 0x3d, 0xbc, 0x8b, 0x6a,
-	0x7c, 0x98, 0x99, 0x96, 0x4a, 0x60, 0x85, 0x5b, 0xa4, 0xca, 0xcf, 0x74, 0x58, 0x96, 0xfa, 0x3d,
-	0xdf, 0x0d, 0xac, 0xb0, 0x92, 0x97, 0x8a, 0x2e, 0x69, 0xba, 0xbc, 0xc0, 0x0a, 0x3f, 0x20, 0x55,
-	0x7e, 0x7a, 0xad, 0x4b, 0x9a, 0xae, 0x6a, 0x60, 0x85, 0x38, 0x2f, 0xf5, 0x7b, 0x66, 0x11, 0xe3,
-	0x94, 0x47, 0xca, 0xaf, 0x05, 0x56, 0x68, 0x13, 0x8f, 0xbf, 0x80, 0xc8, 0xf4, 0xc4, 0x3c, 0x1b,
-	0xa5, 0xd4, 0xaf, 0x07, 0x56, 0x68, 0x91, 0x2a, 0x3f, 0xd2, 0x61, 0x6e, 0xa7, 0x44, 0xc2, 0x26,
-	0x3e, 0x0a, 0xac, 0xb0, 0x0e, 0x76, 0x3a, 0x34, 0x76, 0xa3, 0xb9, 0xa2, 0xd2, 0x6f, 0x04, 0x56,
-	0xb8, 0x49, 0x3c, 0x7e, 0x08, 0x51, 0xfb, 0x4f, 0x0b, 0xa1, 0x13, 0xce, 0x5e, 0x24, 0x2c, 0x51,
-	0x54, 0xe2, 0xbb, 0xc8, 0x1d, 0x0f, 0x59, 0xc4, 0xf4, 0x56, 0xd9, 0xa4, 0x32, 0x3e, 0x89, 0x18,
-	0x6c, 0xe0, 0x78, 0x38, 0x4b, 0xd8, 0x58, 0x6f, 0x94, 0x4d, 0xdc, 0xf1, 0xcf, 0x09, 0x1b, 0x9b,
-	0x34, 0x83, 0xb4, 0x93, 0xa7, 0x4f, 0x20, 0x7d, 0x17, 0xb9, 0xb1, 0xb6, 0xa8, 0xe8, 0xd5, 0x55,
-	0xe2, 0xdc, 0x22, 0x36, 0x16, 0xae, 0xce, 0xba, 0x71, 0x61, 0x11, 0x1b, 0x0b, 0x2f, 0x4f, 0x83,
-	0x45, 0xfb, 0x1f, 0x1b, 0x55, 0x09, 0x9d, 0xd1, 0x48, 0x49, 0x90, 0x88, 0x82, 0x9e, 0x03, 0xf4,
-	0x44, 0x41, 0x4f, 0x2c, 0xe8, 0x39, 0x40, 0x4f, 0x2c, 0xe8, 0x89, 0x05, 0x3d, 0x07, 0xe8, 0x89,
-	0x05, 0x3d, 0x51, 0xd2, 0x73, 0x80, 0x9e, 0x28, 0xe9, 0x89, 0x92, 0x9e, 0x03, 0xf4, 0x44, 0x49,
-	0x4f, 0x94, 0xf4, 0x1c, 0xa0, 0x27, 0x4e, 0xaf, 0x75, 0x2d, 0xe8, 0x39, 0x40, 0x4f, 0x94, 0xf4,
-	0xc4, 0x82, 0x9e, 0x03, 0xf4, 0xc4, 0x82, 0x9e, 0x28, 0xe9, 0x39, 0x40, 0x4f, 0x94, 0xf4, 0x44,
-	0x49, 0xcf, 0x01, 0x7a, 0xa2, 0xa4, 0x27, 0x16, 0xf4, 0x1c, 0xa0, 0x27, 0x0c, 0xbd, 0x7f, 0x6d,
-	0xe4, 0xbd, 0x49, 0xe2, 0x09, 0x55, 0xf8, 0x31, 0x72, 0xcf, 0x79, 0xca, 0x85, 0x26, 0xb7, 0xdd,
-	0xdd, 0xe9, 0x98, 0x2b, 0xda, 0x31, 0xe5, 0xce, 0x73, 0xa8, 0x11, 0x23, 0xc1, 0x4f, 0xc0, 0xcf,
-	0xa8, 0x61, 0xf3, 0xd6, 0xa9, 0x3d, 0xa1, 0xff, 0xe2, 0x47, 0xc8, 0x93, 0xfa, 0x2a, 0xe9, 0x53,
-	0xd5, 0xe8, 0x6e, 0x17, 0x6a, 0x73, 0xc1, 0x48, 0x5e, 0xc5, 0x5f, 0x98, 0x0d, 0xd1, 0x4a, 0x58,
-	0xe7, 0xaa, 0x12, 0x36, 0x28, 0x97, 0x56, 0x85, 0x01, 0xec, 0xef, 0x68, 0xcf, 0x3b, 0x85, 0x32,
-	0xe7, 0x4e, 0x8a, 0x3a, 0xfe, 0x0a, 0xd5, 0xc5, 0xb0, 0x10, 0xdf, 0xd3, 0xb6, 0x2b, 0xe2, 0x9a,
-	0xc8, 0x7f, 0xb5, 0x3f, 0x43, 0xae, 0x59, 0x74, 0x15, 0x39, 0x64, 0x70, 0xd4, 0xdc, 0xc0, 0x75,
-	0xe4, 0x7e, 0x4f, 0x06, 0x83, 0x93, 0xa6, 0x85, 0x6b, 0xa8, 0x72, 0xf8, 0xea, 0x6c, 0xd0, 0xb4,
-	0xdb, 0x7f, 0xd9, 0xa8, 0x72, 0x1c, 0xcd, 0x24, 0xfe, 0x16, 0x35, 0xa6, 0xe6, 0xb8, 0xc0, 0xde,
-	0xeb, 0x33, 0xd6, 0xe8, 0x7e, 0x58, 0xf8, 0x83, 0xa4, 0x73, 0xac, 0xcf, 0xcf, 0xa9, 0x12, 0x03,
-	0xa6, 0xc4, 0x9c, 0xd4, 0xa7, 0x45, 0x8c, 0x0f, 0xd0, 0xd6, 0x54, 0x9f, 0xcd, 0xe2, 0xab, 0x6d,
-	0xdd, 0xfe, 0xd1, 0xcd, 0x76, 0x38, 0xaf, 0xe6, 0xb3, 0x8d, 0x41, 0x63, 0x5a, 0x66, 0x5a, 0xdf,
-	0xa1, 0xed, 0x9b, 0xfe, 0xb8, 0x89, 0x9c, 0x5f, 0xe9, 0x5c, 0x63, 0x74, 0x08, 0xfc, 0xc4, 0x3b,
-	0xc8, 0xbd, 0x88, 0xd2, 0x8c, 0xea, 0xeb, 0x57, 0x27, 0x26, 0x78, 0x66, 0x7f, 0x63, 0xb5, 0x4e,
-	0x50, 0x73, 0xd9, 0xfe, 0x7a, 0x7f, 0xcd, 0xf4, 0x3f, 0xbc, 0xde, 0xbf, 0x0a, 0xa5, 0xf4, 0x6b,
-	0xff, 0x61, 0xa1, 0xcd, 0x63, 0x39, 0x79, 0x93, 0xa8, 0xb7, 0x3f, 0x31, 0xca, 0xc7, 0xf8, 0x3e,
-	0x72, 0x55, 0xa2, 0x52, 0xaa, 0xed, 0xea, 0x2f, 0x37, 0x88, 0x09, 0xb1, 0x8f, 0x3c, 0x19, 0xa5,
-	0x91, 0x98, 0x6b, 0x4f, 0xe7, 0xe5, 0x06, 0xc9, 0x63, 0xdc, 0x42, 0xd5, 0xe7, 0x3c, 0x83, 0x95,
-	0xe8, 0x67, 0x01, 0x7a, 0x8a, 0x04, 0xfe, 0x14, 0x6d, 0xbe, 0xe5, 0x53, 0x3a, 0x8c, 0xe2, 0x58,
-	0x50, 0x29, 0xf5, 0x0b, 0x01, 0x82, 0x06, 0x64, 0x0f, 0x4c, 0xf2, 0xb0, 0x8a, 0xdc, 0x8c, 0x25,
-	0x9c, 0xb5, 0x1f, 0xa1, 0x0a, 0xa1, 0x51, 0x5a, 0x7e, 0xbe, 0x65, 0xde, 0x08, 0x1d, 0x3c, 0xae,
-	0xd5, 0xe2, 0xe6, 0xd5, 0xd5, 0xd5, 0x95, 0xdd, 0xbe, 0x84, 0xff, 0x08, 0x5f, 0xf2, 0x1e, 0xef,
-	0xa1, 0x7a, 0x32, 0x8d, 0x26, 0x09, 0x83, 0x95, 0x19, 0x79, 0x99, 0x28, 0x5b, 0xba, 0x47, 0x68,
-	0x5b, 0xd0, 0x28, 0x1d, 0xd2, 0xf7, 0x8a, 0x32, 0x99, 0x70, 0x86, 0x37, 0xcb, 0x23, 0x15, 0xa5,
-	0xfe, 0x6f, 0x37, 0xcf, 0x64, 0x6e, 0x4f, 0xb6, 0xa0, 0x69, 0x50, 0xf4, 0xb4, 0xff, 0x73, 0x11,
-	0xfa, 0x91, 0xf1, 0x4b, 0xf6, 0x7a, 0x3e, 0xa3, 0x12, 0x3f, 0x44, 0x76, 0xc4, 0xfc, 0x6d, 0xdd,
-	0xba, 0xd3, 0x31, 0xf3, 0xa9, 0x53, 0xcc, 0xa7, 0xce, 0x01, 0x9b, 0x13, 0x3b, 0x62, 0xf8, 0x4b,
-	0xe4, 0xc4, 0x99, 0xb9, 0xa5, 0x8d, 0xee, 0xee, 0x8a, 0xec, 0x28, 0x9f, 0x92, 0x04, 0x54, 0xf8,
-	0x73, 0x64, 0x4b, 0xe5, 0x6f, 0x6a, 0xed, 0x83, 0x15, 0xed, 0xa9, 0x9e, 0x98, 0xc4, 0x96, 0x70,
-	0xfb, 0x6d, 0x25, 0x73, 0xbe, 0xad, 0x15, 0xe1, 0xeb, 0x62, 0x78, 0x12, 0x5b, 0x49, 0xd0, 0xa6,
-	0x17, 0xfe, 0x9d, 0x35, 0xda, 0x57, 0x89, 0x54, 0xbf, 0xc0, 0x0e, 0x13, 0x3b, 0xbd, 0xc0, 0x21,
-	0x72, 0x2e, 0xa2, 0xd4, 0x6f, 0x6a, 0xf1, 0xfd, 0x15, 0xb1, 0x11, 0x82, 0x04, 0x77, 0x90, 0x13,
-	0x8f, 0x52, 0xcd, 0xbc, 0xd1, 0xdd, 0x5b, 0xfd, 0x2e, 0xfd, 0xc8, 0xe5, 0xfa, 0x78, 0x94, 0xe2,
-	0x27, 0xc8, 0x19, 0xa7, 0x4a, 0x1f, 0x01, 0xb8, 0x70, 0xcb, 0x7a, 0xfd, 0x5c, 0xe6, 0xf2, 0x71,
-	0xaa, 0x40, 0x9e, 0xe4, 0xb3, 0xf5, 0x36, 0xb9, 0xbe, 0x42, 0xb9, 0x3c, 0xe9, 0xf7, 0x60, 0x35,
-	0x59, 0xbf, 0xa7, 0xa7, 0xca, 0x6d, 0xab, 0x39, 0xbb, 0xae, 0xcf, 0xfa, 0x3d, 0x6d, 0xbf, 0xdf,
-	0xd5, 0x43, 0x78, 0x8d, 0xfd, 0x7e, 0xb7, 0xb0, 0xdf, 0xef, 0x6a, 0xfb, 0xfd, 0xae, 0x9e, 0xcc,
-	0xeb, 0xec, 0x17, 0xfa, 0x4c, 0xeb, 0x2b, 0x7a, 0x84, 0xd5, 0xd7, 0x6c, 0x3a, 0xdc, 0x61, 0x23,
-	0xd7, 0x3a, 0xf0, 0x87, 0xd7, 0x08, 0xad, 0xf1, 0x37, 0x63, 0x21, 0xf7, 0x97, 0x4a, 0xe0, 0xaf,
-	0x91, 0x5b, 0x0e, 0xf7, 0xdb, 0x3e, 0x40, 0x8f, 0x0b, 0xd3, 0x60, 0x94, 0xcf, 0x02, 0x54, 0x61,
-	0xd1, 0x94, 0x2e, 0x1d, 0xfc, 0xdf, 0xf5, 0x0b, 0xa3, 0x2b, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff,
-	0xd5, 0x39, 0x32, 0x09, 0xf9, 0x09, 0x00, 0x00,
+	proto.RegisterExtension(E_Extm)
+}
+
+func init() { proto.RegisterFile("test_objects.proto", fileDescriptor_test_objects_c6f6c615ab823e65) }
+
+var fileDescriptor_test_objects_c6f6c615ab823e65 = []byte{
+	// 1357 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xdd, 0x72, 0x13, 0xc7,
+	0x12, 0xf6, 0xee, 0x6a, 0xf5, 0xd3, 0xf2, 0x1f, 0x83, 0x81, 0xc5, 0x87, 0x73, 0x8e, 0x4a, 0x70,
+	0x38, 0x0a, 0xc4, 0xa2, 0x22, 0xbb, 0x5c, 0x84, 0xe4, 0x06, 0x63, 0x13, 0x08, 0xe0, 0xa4, 0xc6,
+	0x26, 0x5c, 0xaa, 0x56, 0xde, 0x91, 0x59, 0xb2, 0xbb, 0xa3, 0xcc, 0xcc, 0xda, 0xa8, 0x92, 0x54,
+	0xf9, 0x19, 0x52, 0x79, 0x82, 0x54, 0x25, 0x8f, 0x90, 0x8b, 0xbc, 0x45, 0xde, 0x28, 0x35, 0x3d,
+	0xb3, 0x5a, 0x59, 0x42, 0x95, 0x5c, 0x79, 0xbb, 0xfb, 0xeb, 0x4f, 0x33, 0xfd, 0xf5, 0x74, 0x1b,
+	0x88, 0x62, 0x52, 0xf5, 0xf9, 0xe0, 0x1d, 0x3b, 0x51, 0xb2, 0x3b, 0x12, 0x5c, 0x71, 0x52, 0x7d,
+	0x27, 0x79, 0x36, 0x1a, 0x6c, 0xde, 0x3c, 0xe5, 0xfc, 0x34, 0x61, 0x0f, 0xd0, 0x3b, 0xc8, 0x87,
+	0x0f, 0xc2, 0x6c, 0x6c, 0x20, 0x9b, 0xff, 0x99, 0x0d, 0x45, 0xb9, 0x08, 0x55, 0xcc, 0x33, 0x1b,
+	0xbf, 0x35, 0x1b, 0x97, 0x4a, 0xe4, 0x27, 0xca, 0x46, 0xff, 0x3b, 0x1b, 0x55, 0x71, 0xca, 0xa4,
+	0x0a, 0xd3, 0xd1, 0x22, 0xfa, 0x73, 0x11, 0x8e, 0x46, 0x4c, 0xd8, 0x13, 0xb6, 0x7f, 0x75, 0xa1,
+	0x7a, 0x14, 0xa7, 0xa3, 0x84, 0x91, 0x6b, 0x50, 0xe5, 0xfd, 0x01, 0xe7, 0x49, 0xe0, 0xb4, 0x9c,
+	0x4e, 0x9d, 0xfa, 0x7c, 0x8f, 0xf3, 0x84, 0xdc, 0x80, 0x1a, 0xef, 0xc7, 0x99, 0xda, 0xee, 0x05,
+	0x6e, 0xcb, 0xe9, 0xf8, 0xb4, 0xca, 0x9f, 0x6b, 0x6b, 0x12, 0xd8, 0xdd, 0x09, 0xbc, 0x96, 0xd3,
+	0xf1, 0x4c, 0x60, 0x77, 0x87, 0xdc, 0x84, 0x3a, 0xef, 0xe7, 0x26, 0xa5, 0xd2, 0x72, 0x3a, 0x2b,
+	0xb4, 0xc6, 0x5f, 0xa3, 0x59, 0x86, 0x76, 0x77, 0x02, 0xbf, 0xe5, 0x74, 0x2a, 0x36, 0x54, 0x64,
+	0x49, 0x93, 0x55, 0x6d, 0x39, 0x9d, 0x2b, 0xb4, 0xc6, 0x8f, 0xa6, 0xb2, 0xa4, 0xc9, 0xaa, 0xb5,
+	0x9c, 0x0e, 0xb1, 0xa1, 0xdd, 0x1d, 0x73, 0x88, 0x61, 0xc2, 0x43, 0x15, 0xd4, 0x5b, 0x4e, 0xc7,
+	0xa5, 0x55, 0xfe, 0x54, 0x5b, 0x26, 0x27, 0xe2, 0xf9, 0x20, 0x61, 0x41, 0xa3, 0xe5, 0x74, 0x1c,
+	0x5a, 0xe3, 0xfb, 0x68, 0x5a, 0x3a, 0x25, 0xe2, 0xec, 0x34, 0x80, 0x96, 0xd3, 0x69, 0x68, 0x3a,
+	0x34, 0x0d, 0xdd, 0x60, 0xac, 0x98, 0x0c, 0x9a, 0x2d, 0xa7, 0xb3, 0x4c, 0xab, 0x7c, 0x4f, 0x5b,
+	0xed, 0x9f, 0x1c, 0x80, 0x43, 0x9e, 0x3d, 0x8d, 0xb3, 0x58, 0x31, 0x49, 0xae, 0x82, 0x3f, 0xec,
+	0x67, 0x61, 0x86, 0xa5, 0x72, 0x69, 0x65, 0x78, 0x18, 0x66, 0xba, 0x80, 0xc3, 0xfe, 0x28, 0xce,
+	0x86, 0x58, 0x28, 0x97, 0xfa, 0xc3, 0xaf, 0xe3, 0x6c, 0x68, 0xdc, 0x99, 0x76, 0x7b, 0xd6, 0x7d,
+	0xa8, 0xdd, 0x57, 0xc1, 0x8f, 0x90, 0xa2, 0x82, 0xa7, 0xab, 0x44, 0x96, 0x22, 0x32, 0x14, 0x3e,
+	0x7a, 0xfd, 0xa8, 0xa0, 0x88, 0x0c, 0x45, 0xd5, 0xba, 0x35, 0x45, 0xfb, 0x37, 0x17, 0x6a, 0x94,
+	0x8d, 0x58, 0xa8, 0xa4, 0x86, 0x88, 0x42, 0x3d, 0x4f, 0xab, 0x27, 0x0a, 0xf5, 0xc4, 0x44, 0x3d,
+	0x4f, 0xab, 0x27, 0x26, 0xea, 0x89, 0x89, 0x7a, 0x9e, 0x56, 0x4f, 0x4c, 0xd4, 0x13, 0xa5, 0x7a,
+	0x9e, 0x56, 0x4f, 0x94, 0xea, 0x89, 0x52, 0x3d, 0x4f, 0xab, 0x27, 0x4a, 0xf5, 0x44, 0xa9, 0x9e,
+	0xa7, 0xd5, 0x13, 0x47, 0x53, 0x59, 0x13, 0xf5, 0x3c, 0xad, 0x9e, 0x28, 0xd5, 0x13, 0x13, 0xf5,
+	0x3c, 0xad, 0x9e, 0x98, 0xa8, 0x27, 0x4a, 0xf5, 0x3c, 0xad, 0x9e, 0x28, 0xd5, 0x13, 0xa5, 0x7a,
+	0x9e, 0x56, 0x4f, 0x94, 0xea, 0x89, 0x89, 0x7a, 0x9e, 0x56, 0x4f, 0x18, 0xf5, 0x7e, 0x77, 0xa1,
+	0xfa, 0x26, 0x8e, 0x4e, 0x99, 0x22, 0xf7, 0xc0, 0x3f, 0xe1, 0x09, 0x17, 0xa8, 0xdc, 0x6a, 0x6f,
+	0xa3, 0x6b, 0x9e, 0x68, 0xd7, 0x84, 0xbb, 0x4f, 0x74, 0x8c, 0x1a, 0x08, 0xd9, 0xd2, 0x7c, 0x06,
+	0xad, 0x8b, 0xb7, 0x08, 0x5d, 0x15, 0xf8, 0x97, 0xdc, 0x85, 0xaa, 0xc4, 0xa7, 0x84, 0x5d, 0xd5,
+	0xec, 0xad, 0x16, 0x68, 0xf3, 0xc0, 0xa8, 0x8d, 0x92, 0x8f, 0x4c, 0x41, 0x10, 0xa9, 0xcf, 0x39,
+	0x8f, 0xd4, 0x05, 0xb2, 0xd0, 0x9a, 0x30, 0x02, 0x07, 0x1b, 0xc8, 0xb9, 0x56, 0x20, 0xad, 0xee,
+	0xb4, 0x88, 0x93, 0x8f, 0xa1, 0x21, 0xfa, 0x05, 0xf8, 0x1a, 0xd2, 0xce, 0x81, 0xeb, 0xc2, 0x7e,
+	0xb5, 0xff, 0x07, 0xbe, 0x39, 0x74, 0x0d, 0x3c, 0x7a, 0xb0, 0xbf, 0xbe, 0x44, 0x1a, 0xe0, 0x7f,
+	0x41, 0x0f, 0x0e, 0x0e, 0xd7, 0x1d, 0x52, 0x87, 0xca, 0xde, 0xcb, 0xd7, 0x07, 0xeb, 0x6e, 0xfb,
+	0x67, 0x17, 0x2a, 0xaf, 0xc2, 0x91, 0x24, 0x9f, 0x41, 0x33, 0x35, 0xed, 0xa2, 0x6b, 0x8f, 0x3d,
+	0xd6, 0xec, 0xfd, 0xab, 0xe0, 0xd7, 0x90, 0xee, 0x2b, 0xec, 0x9f, 0x23, 0x25, 0x0e, 0x32, 0x25,
+	0xc6, 0xb4, 0x91, 0x16, 0x36, 0x79, 0x0c, 0x2b, 0x29, 0xf6, 0x66, 0x71, 0x6b, 0x17, 0xd3, 0xff,
+	0x7d, 0x39, 0x5d, 0xf7, 0xab, 0xb9, 0xb6, 0x21, 0x68, 0xa6, 0xa5, 0x67, 0xf3, 0x73, 0x58, 0xbd,
+	0xcc, 0x4f, 0xd6, 0xc1, 0xfb, 0x96, 0x8d, 0x51, 0x46, 0x8f, 0xea, 0x4f, 0xb2, 0x01, 0xfe, 0x59,
+	0x98, 0xe4, 0x0c, 0x9f, 0x5f, 0x83, 0x1a, 0xe3, 0x91, 0xfb, 0xd0, 0xd9, 0x3c, 0x84, 0xf5, 0x59,
+	0xfa, 0xe9, 0xfc, 0xba, 0xc9, 0xbf, 0x33, 0x9d, 0x3f, 0x2f, 0x4a, 0xc9, 0xd7, 0xfe, 0xd3, 0x81,
+	0xe5, 0x57, 0xf2, 0xf4, 0x4d, 0xac, 0xde, 0x7e, 0x95, 0x31, 0x3e, 0x24, 0xd7, 0xc1, 0x57, 0xb1,
+	0x4a, 0x18, 0xd2, 0x35, 0x9e, 0x2d, 0x51, 0x63, 0x92, 0x00, 0xaa, 0x32, 0x4c, 0x42, 0x31, 0x46,
+	0x4e, 0xef, 0xd9, 0x12, 0xb5, 0x36, 0xd9, 0x84, 0xda, 0x13, 0x9e, 0xeb, 0x93, 0xe0, 0x58, 0xd0,
+	0x39, 0x85, 0x83, 0xdc, 0x86, 0xe5, 0xb7, 0x3c, 0x65, 0xfd, 0x30, 0x8a, 0x04, 0x93, 0x12, 0x27,
+	0x84, 0x06, 0x34, 0xb5, 0xf7, 0xb1, 0x71, 0x92, 0x03, 0xb8, 0x92, 0xca, 0xd3, 0xfe, 0x79, 0xac,
+	0xde, 0xf6, 0x05, 0xfb, 0x2e, 0x8f, 0x05, 0x8b, 0x70, 0x6a, 0x34, 0x7b, 0x37, 0x26, 0x85, 0x35,
+	0x67, 0xa4, 0x36, 0xfc, 0x6c, 0x89, 0xae, 0xa5, 0x97, 0x5d, 0x7b, 0x35, 0xf0, 0xf3, 0x2c, 0xe6,
+	0x59, 0xfb, 0x2e, 0x54, 0x28, 0x0b, 0x93, 0xb2, 0x8a, 0x8e, 0x19, 0x35, 0x68, 0xdc, 0xab, 0xd7,
+	0xa3, 0xf5, 0x8b, 0x8b, 0x8b, 0x0b, 0xb7, 0x7d, 0xae, 0x0f, 0xae, 0x0b, 0xf2, 0x9e, 0xdc, 0x82,
+	0x46, 0x9c, 0x86, 0xa7, 0x71, 0xa6, 0x2f, 0x68, 0xe0, 0xa5, 0xa3, 0x4c, 0xe9, 0xed, 0xc3, 0xaa,
+	0x60, 0x61, 0xd2, 0x67, 0xef, 0x15, 0xcb, 0x64, 0xcc, 0x33, 0xb2, 0x5c, 0x76, 0x66, 0x98, 0x04,
+	0xdf, 0x5f, 0x6e, 0x6d, 0x4b, 0x4f, 0x57, 0x74, 0xd2, 0x41, 0x91, 0xd3, 0xfe, 0xc3, 0x07, 0x78,
+	0x91, 0xf1, 0xf3, 0xec, 0x78, 0x3c, 0x62, 0x92, 0xdc, 0x01, 0x37, 0xcc, 0x82, 0x55, 0x4c, 0xdd,
+	0xe8, 0x9a, 0x35, 0xd7, 0x2d, 0xd6, 0x5c, 0xf7, 0x71, 0x36, 0xa6, 0x6e, 0x98, 0x91, 0xfb, 0xe0,
+	0x45, 0xb9, 0x79, 0xec, 0xcd, 0xde, 0xcd, 0x39, 0xd8, 0xbe, 0x5d, 0xb6, 0x54, 0xa3, 0xc8, 0xff,
+	0xc1, 0x95, 0x2a, 0x58, 0xb6, 0x35, 0x9c, 0xc5, 0x1e, 0xe1, 0xe2, 0xa5, 0xae, 0xd4, 0x43, 0xc4,
+	0x55, 0xd2, 0xb6, 0xc9, 0xe6, 0x1c, 0xf0, 0xb8, 0xd8, 0xc1, 0xd4, 0x55, 0x52, 0x63, 0x93, 0xb3,
+	0x60, 0x6d, 0x01, 0xf6, 0x65, 0x2c, 0xd5, 0x37, 0xba, 0xc2, 0xd4, 0x4d, 0xce, 0x48, 0x07, 0xbc,
+	0xb3, 0x30, 0x09, 0xd6, 0x11, 0x7c, 0x7d, 0x0e, 0x6c, 0x80, 0x1a, 0x42, 0xba, 0xe0, 0x45, 0x83,
+	0x04, 0x5b, 0xa7, 0xd9, 0xbb, 0x35, 0x7f, 0x2f, 0x9c, 0x95, 0x16, 0x1f, 0x0d, 0x12, 0xb2, 0x05,
+	0xde, 0x30, 0x51, 0xd8, 0x49, 0xfa, 0xdd, 0xce, 0xe2, 0x71, 0xea, 0x5a, 0xf8, 0x30, 0x51, 0x1a,
+	0x1e, 0xdb, 0x15, 0xfd, 0x21, 0x38, 0xbe, 0x44, 0x0b, 0x8f, 0x77, 0x77, 0xf4, 0x69, 0xf2, 0xdd,
+	0x1d, 0x5c, 0x4e, 0x1f, 0x3a, 0xcd, 0xeb, 0x69, 0x7c, 0xbe, 0xbb, 0x83, 0xf4, 0xdb, 0x3d, 0xdc,
+	0xe5, 0x0b, 0xe8, 0xb7, 0x7b, 0x05, 0xfd, 0x76, 0x0f, 0xe9, 0xb7, 0x7b, 0xb8, 0xe0, 0x17, 0xd1,
+	0x4f, 0xf0, 0x39, 0xe2, 0x2b, 0xb8, 0x09, 0x1b, 0x0b, 0x8a, 0xae, 0x47, 0x81, 0x81, 0x23, 0x4e,
+	0xf3, 0xeb, 0xa1, 0x06, 0x0b, 0xf8, 0xcd, 0x76, 0xb1, 0xfc, 0x52, 0x09, 0xf2, 0x09, 0xf8, 0xe5,
+	0xff, 0x08, 0x1f, 0xba, 0x00, 0x6e, 0x1d, 0x93, 0x60, 0x90, 0xed, 0xdb, 0xb0, 0x36, 0xf3, 0x18,
+	0xf5, 0x00, 0x32, 0xa3, 0xd4, 0xed, 0x34, 0x90, 0xb7, 0xfd, 0x8b, 0x0b, 0x37, 0x2c, 0xea, 0x79,
+	0x16, 0xc5, 0x82, 0x9d, 0xa8, 0x09, 0xfa, 0x3e, 0x54, 0x64, 0x3e, 0x48, 0x6d, 0x27, 0x2f, 0x7a,
+	0xe1, 0x14, 0x41, 0xe4, 0x4b, 0x68, 0xa4, 0xe1, 0xa8, 0x3f, 0x8c, 0x59, 0x12, 0xd9, 0x61, 0xbb,
+	0x35, 0x93, 0x31, 0xfb, 0x03, 0x7a, 0x08, 0x3f, 0xd5, 0x78, 0x33, 0x7c, 0xeb, 0xa9, 0x35, 0xc9,
+	0x43, 0x68, 0xca, 0x24, 0x3e, 0x61, 0x96, 0xcd, 0x43, 0xb6, 0x85, 0xbf, 0x0f, 0x88, 0xc5, 0xcc,
+	0xcd, 0x63, 0x58, 0xb9, 0x44, 0x3a, 0x3d, 0x72, 0x1b, 0x66, 0xe4, 0x6e, 0x5d, 0x1e, 0xb9, 0x0b,
+	0x69, 0xa7, 0x66, 0xef, 0x3d, 0xd8, 0x98, 0x89, 0x62, 0xb5, 0x09, 0x81, 0xca, 0x60, 0xac, 0x24,
+	0xd6, 0x73, 0x99, 0xe2, 0x77, 0x7b, 0x1f, 0xc8, 0x0c, 0xf6, 0xcd, 0x8b, 0xe3, 0x42, 0x6e, 0x0d,
+	0xfc, 0x27, 0x72, 0x3f, 0x6a, 0x41, 0x25, 0x0b, 0x53, 0x36, 0x33, 0xb4, 0x7e, 0xc0, 0x5b, 0x60,
+	0xe4, 0xd1, 0xa7, 0x50, 0x61, 0xef, 0x55, 0x3a, 0x83, 0xf8, 0xf1, 0x6f, 0xa4, 0xd2, 0x29, 0x7f,
+	0x05, 0x00, 0x00, 0xff, 0xff, 0xea, 0x06, 0x1a, 0xa9, 0x37, 0x0c, 0x00, 0x00,
 }
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto
index 0d2fc1fa..36eb6e8c 100644
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto
+++ b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto
@@ -107,6 +107,7 @@ message MsgWithOneof {
     int64 salary = 2;
     string Country = 3;
     string home_address = 4;
+    MsgWithRequired msg_with_required = 5;
   }
 }
 
@@ -145,3 +146,26 @@ message KnownTypes {
   optional google.protobuf.StringValue str = 10;
   optional google.protobuf.BytesValue bytes = 11;
 }
+
+// Test messages for marshaling/unmarshaling required fields.
+message MsgWithRequired {
+  required string str = 1;
+}
+
+message MsgWithIndirectRequired {
+  optional MsgWithRequired subm = 1;
+  map<string, MsgWithRequired> map_field = 2;
+  repeated MsgWithRequired slice_field = 3;
+}
+
+message MsgWithRequiredBytes {
+  required bytes byts = 1;
+}
+
+message MsgWithRequiredWKT {
+  required google.protobuf.StringValue str = 1;
+}
+
+extend Real {
+  optional MsgWithRequired extm = 125;
+}
diff --git a/vendor/github.com/golang/protobuf/proto/Makefile b/vendor/github.com/golang/protobuf/proto/Makefile
deleted file mode 100644
index e2e0651a..00000000
--- a/vendor/github.com/golang/protobuf/proto/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-install:
-	go install
-
-test: install generate-test-pbs
-	go test
-
-
-generate-test-pbs:
-	make install
-	make -C testdata
-	protoc --go_out=Mtestdata/test.proto=github.com/golang/protobuf/proto/testdata,Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any:. proto3_proto/proto3.proto
-	make
diff --git a/vendor/github.com/golang/protobuf/proto/all_test.go b/vendor/github.com/golang/protobuf/proto/all_test.go
index 41451a40..361f72fb 100644
--- a/vendor/github.com/golang/protobuf/proto/all_test.go
+++ b/vendor/github.com/golang/protobuf/proto/all_test.go
@@ -41,11 +41,12 @@ import (
 	"reflect"
 	"runtime/debug"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
 	. "github.com/golang/protobuf/proto"
-	. "github.com/golang/protobuf/proto/testdata"
+	. "github.com/golang/protobuf/proto/test_proto"
 )
 
 var globalO *Buffer
@@ -114,6 +115,8 @@ func initGoTest(setdefaults bool) *GoTest {
 		pb.F_BytesDefaulted = Default_GoTest_F_BytesDefaulted
 		pb.F_Sint32Defaulted = Int32(Default_GoTest_F_Sint32Defaulted)
 		pb.F_Sint64Defaulted = Int64(Default_GoTest_F_Sint64Defaulted)
+		pb.F_Sfixed32Defaulted = Int32(Default_GoTest_F_Sfixed32Defaulted)
+		pb.F_Sfixed64Defaulted = Int64(Default_GoTest_F_Sfixed64Defaulted)
 	}
 
 	pb.Kind = GoTest_TIME.Enum()
@@ -131,135 +134,13 @@ func initGoTest(setdefaults bool) *GoTest {
 	pb.F_BytesRequired = []byte("bytes")
 	pb.F_Sint32Required = Int32(-32)
 	pb.F_Sint64Required = Int64(-64)
+	pb.F_Sfixed32Required = Int32(-32)
+	pb.F_Sfixed64Required = Int64(-64)
 	pb.Requiredgroup = initGoTest_RequiredGroup()
 
 	return pb
 }
 
-func fail(msg string, b *bytes.Buffer, s string, t *testing.T) {
-	data := b.Bytes()
-	ld := len(data)
-	ls := len(s) / 2
-
-	fmt.Printf("fail %s ld=%d ls=%d\n", msg, ld, ls)
-
-	// find the interesting spot - n
-	n := ls
-	if ld < ls {
-		n = ld
-	}
-	j := 0
-	for i := 0; i < n; i++ {
-		bs := hex(s[j])*16 + hex(s[j+1])
-		j += 2
-		if data[i] == bs {
-			continue
-		}
-		n = i
-		break
-	}
-	l := n - 10
-	if l < 0 {
-		l = 0
-	}
-	h := n + 10
-
-	// find the interesting spot - n
-	fmt.Printf("is[%d]:", l)
-	for i := l; i < h; i++ {
-		if i >= ld {
-			fmt.Printf(" --")
-			continue
-		}
-		fmt.Printf(" %.2x", data[i])
-	}
-	fmt.Printf("\n")
-
-	fmt.Printf("sb[%d]:", l)
-	for i := l; i < h; i++ {
-		if i >= ls {
-			fmt.Printf(" --")
-			continue
-		}
-		bs := hex(s[j])*16 + hex(s[j+1])
-		j += 2
-		fmt.Printf(" %.2x", bs)
-	}
-	fmt.Printf("\n")
-
-	t.Fail()
-
-	//	t.Errorf("%s: \ngood: %s\nbad: %x", msg, s, b.Bytes())
-	// Print the output in a partially-decoded format; can
-	// be helpful when updating the test.  It produces the output
-	// that is pasted, with minor edits, into the argument to verify().
-	//	data := b.Bytes()
-	//	nesting := 0
-	//	for b.Len() > 0 {
-	//		start := len(data) - b.Len()
-	//		var u uint64
-	//		u, err := DecodeVarint(b)
-	//		if err != nil {
-	//			fmt.Printf("decode error on varint:", err)
-	//			return
-	//		}
-	//		wire := u & 0x7
-	//		tag := u >> 3
-	//		switch wire {
-	//		case WireVarint:
-	//			v, err := DecodeVarint(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on varint:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireFixed32:
-	//			v, err := DecodeFixed32(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on fixed32:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireFixed64:
-	//			v, err := DecodeFixed64(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on fixed64:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireBytes:
-	//			nb, err := DecodeVarint(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on bytes:", err)
-	//				return
-	//			}
-	//			after_tag := len(data) - b.Len()
-	//			str := make([]byte, nb)
-	//			_, err = b.Read(str)
-	//			if err != nil {
-	//				fmt.Printf("decode error on bytes:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\" \"%x\"  // field %d, encoding %d (FIELD)\n",
-	//				data[start:after_tag], str, tag, wire)
-	//		case WireStartGroup:
-	//			nesting++
-	//			fmt.Printf("\t\t\"%x\"\t\t// start group field %d level %d\n",
-	//				data[start:len(data)-b.Len()], tag, nesting)
-	//		case WireEndGroup:
-	//			fmt.Printf("\t\t\"%x\"\t\t// end group field %d level %d\n",
-	//				data[start:len(data)-b.Len()], tag, nesting)
-	//			nesting--
-	//		default:
-	//			fmt.Printf("unrecognized wire type %d\n", wire)
-	//			return
-	//		}
-	//	}
-}
-
 func hex(c uint8) uint8 {
 	if '0' <= c && c <= '9' {
 		return c - '0'
@@ -482,6 +363,48 @@ func TestMarshalerEncoding(t *testing.T) {
 	}
 }
 
+// Ensure that Buffer.Marshal uses O(N) memory for N messages
+func TestBufferMarshalAllocs(t *testing.T) {
+	value := &OtherMessage{Key: Int64(1)}
+	msg := &MyMessage{Count: Int32(1), Others: []*OtherMessage{value}}
+
+	reallocSize := func(t *testing.T, items int, prealloc int) (int64, int64) {
+		var b Buffer
+		b.SetBuf(make([]byte, 0, prealloc))
+
+		var allocSpace int64
+		prevCap := cap(b.Bytes())
+		for i := 0; i < items; i++ {
+			err := b.Marshal(msg)
+			if err != nil {
+				t.Errorf("Marshal err = %q", err)
+				break
+			}
+			if c := cap(b.Bytes()); prevCap != c {
+				allocSpace += int64(c)
+				prevCap = c
+			}
+		}
+		needSpace := int64(len(b.Bytes()))
+		return allocSpace, needSpace
+	}
+
+	for _, prealloc := range []int{0, 100, 10000} {
+		for _, items := range []int{1, 2, 5, 10, 20, 50, 100, 200, 500, 1000} {
+			runtimeSpace, need := reallocSize(t, items, prealloc)
+			totalSpace := int64(prealloc) + runtimeSpace
+
+			runtimeRatio := float64(runtimeSpace) / float64(need)
+			totalRatio := float64(totalSpace) / float64(need)
+
+			if totalRatio < 1 || runtimeRatio > 4 {
+				t.Errorf("needed %dB, allocated %dB total (ratio %.1f), allocated %dB at runtime (ratio %.1f)",
+					need, totalSpace, totalRatio, runtimeSpace, runtimeRatio)
+			}
+		}
+	}
+}
+
 // Simple tests for bytes
 func TestBytesPrimitives(t *testing.T) {
 	o := old()
@@ -519,7 +442,7 @@ func TestRequiredBit(t *testing.T) {
 	err := o.Marshal(pb)
 	if err == nil {
 		t.Error("did not catch missing required fields")
-	} else if strings.Index(err.Error(), "Kind") < 0 {
+	} else if !strings.Contains(err.Error(), "Kind") {
 		t.Error("wrong error type:", err)
 	}
 }
@@ -612,7 +535,9 @@ func TestEncodeDecode1(t *testing.T) {
 			"b404"+ // field 70, encoding 4, end group
 			"aa0605"+"6279746573"+ // field 101, encoding 2, string "bytes"
 			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f") // field 103, encoding 0, 0x7f zigzag64
+			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
+			"c506e0ffffff"+ // field 104, encoding 5, -32 fixed32
+			"c906c0ffffffffffffff") // field 105, encoding 1, -64 fixed64
 }
 
 // All required fields set, defaults provided.
@@ -647,9 +572,13 @@ func TestEncodeDecode2(t *testing.T) {
 			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
 			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
 			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
+			"c506e0ffffff"+ // field 104, encoding 5, -32 fixed32
+			"c906c0ffffffffffffff"+ // field 105, encoding 1, -64 fixed64
 			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
 			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
+			"98197f"+ // field 403, encoding 0, value 127
+			"a519e0ffffff"+ // field 404, encoding 5, -32 fixed32
+			"a919c0ffffffffffffff") // field 405, encoding 1, -64 fixed64
 
 }
 
@@ -669,6 +598,8 @@ func TestEncodeDecode3(t *testing.T) {
 	pb.F_BytesDefaulted = []byte("Bignose")
 	pb.F_Sint32Defaulted = Int32(-32)
 	pb.F_Sint64Defaulted = Int64(-64)
+	pb.F_Sfixed32Defaulted = Int32(-32)
+	pb.F_Sfixed64Defaulted = Int64(-64)
 
 	overify(t, pb,
 		"0807"+ // field 1, encoding 0, value 7
@@ -699,9 +630,13 @@ func TestEncodeDecode3(t *testing.T) {
 			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
 			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
 			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
+			"c506e0ffffff"+ // field 104, encoding 5, -32 fixed32
+			"c906c0ffffffffffffff"+ // field 105, encoding 1, -64 fixed64
 			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
 			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
+			"98197f"+ // field 403, encoding 0, value 127
+			"a519e0ffffff"+ // field 404, encoding 5, -32 fixed32
+			"a919c0ffffffffffffff") // field 405, encoding 1, -64 fixed64
 
 }
 
@@ -724,6 +659,8 @@ func TestEncodeDecode4(t *testing.T) {
 	pb.F_BytesOptional = []byte("Bignose")
 	pb.F_Sint32Optional = Int32(-32)
 	pb.F_Sint64Optional = Int64(-64)
+	pb.F_Sfixed32Optional = Int32(-32)
+	pb.F_Sfixed64Optional = Int64(-64)
 	pb.Optionalgroup = initGoTest_OptionalGroup()
 
 	overify(t, pb,
@@ -771,12 +708,18 @@ func TestEncodeDecode4(t *testing.T) {
 			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
 			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
 			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
+			"c506e0ffffff"+ // field 104, encoding 5, -32 fixed32
+			"c906c0ffffffffffffff"+ // field 105, encoding 1, -64 fixed64
 			"ea1207"+"4269676e6f7365"+ // field 301, encoding 2, string "Bignose"
 			"f0123f"+ // field 302, encoding 0, value 63
 			"f8127f"+ // field 303, encoding 0, value 127
+			"8513e0ffffff"+ // field 304, encoding 5, -32 fixed32
+			"8913c0ffffffffffffff"+ // field 305, encoding 1, -64 fixed64
 			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
 			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
+			"98197f"+ // field 403, encoding 0, value 127
+			"a519e0ffffff"+ // field 404, encoding 5, -32 fixed32
+			"a919c0ffffffffffffff") // field 405, encoding 1, -64 fixed64
 
 }
 
@@ -797,6 +740,8 @@ func TestEncodeDecode5(t *testing.T) {
 	pb.F_BytesRepeated = [][]byte{[]byte("big"), []byte("nose")}
 	pb.F_Sint32Repeated = []int32{32, -32}
 	pb.F_Sint64Repeated = []int64{64, -64}
+	pb.F_Sfixed32Repeated = []int32{32, -32}
+	pb.F_Sfixed64Repeated = []int64{64, -64}
 	pb.Repeatedgroup = []*GoTest_RepeatedGroup{initGoTest_RepeatedGroup(), initGoTest_RepeatedGroup()}
 
 	overify(t, pb,
@@ -856,15 +801,23 @@ func TestEncodeDecode5(t *testing.T) {
 			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
 			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
 			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
+			"c506e0ffffff"+ // field 104, encoding 5, -32 fixed32
+			"c906c0ffffffffffffff"+ // field 105, encoding 1, -64 fixed64
 			"ca0c03"+"626967"+ // field 201, encoding 2, string "big"
 			"ca0c04"+"6e6f7365"+ // field 201, encoding 2, string "nose"
 			"d00c40"+ // field 202, encoding 0, value 32
 			"d00c3f"+ // field 202, encoding 0, value -32
 			"d80c8001"+ // field 203, encoding 0, value 64
 			"d80c7f"+ // field 203, encoding 0, value -64
+			"e50c20000000"+ // field 204, encoding 5, 32 fixed32
+			"e50ce0ffffff"+ // field 204, encoding 5, -32 fixed32
+			"e90c4000000000000000"+ // field 205, encoding 1, 64 fixed64
+			"e90cc0ffffffffffffff"+ // field 205, encoding 1, -64 fixed64
 			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
 			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
+			"98197f"+ // field 403, encoding 0, value 127
+			"a519e0ffffff"+ // field 404, encoding 5, -32 fixed32
+			"a919c0ffffffffffffff") // field 405, encoding 1, -64 fixed64
 
 }
 
@@ -882,6 +835,8 @@ func TestEncodeDecode6(t *testing.T) {
 	pb.F_DoubleRepeatedPacked = []float64{64., 65.}
 	pb.F_Sint32RepeatedPacked = []int32{32, -32}
 	pb.F_Sint64RepeatedPacked = []int64{64, -64}
+	pb.F_Sfixed32RepeatedPacked = []int32{32, -32}
+	pb.F_Sfixed64RepeatedPacked = []int64{64, -64}
 
 	overify(t, pb,
 		"0807"+ // field 1, encoding 0, value 7
@@ -917,10 +872,17 @@ func TestEncodeDecode6(t *testing.T) {
 			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
 			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
 			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
+			"c506e0ffffff"+ // field 104, encoding 5, -32 fixed32
+			"c906c0ffffffffffffff"+ // field 105, encoding 1, -64 fixed64
 			"b21f02"+ // field 502, encoding 2, 2 bytes
 			"403f"+ // value 32, value -32
 			"ba1f03"+ // field 503, encoding 2, 3 bytes
-			"80017f") // value 64, value -64
+			"80017f"+ // value 64, value -64
+			"c21f08"+ // field 504, encoding 2, 8 bytes
+			"20000000e0ffffff"+ // value 32, value -32
+			"ca1f10"+ // field 505, encoding 2, 16 bytes
+			"4000000000000000c0ffffffffffffff") // value 64, value -64
+
 }
 
 // Test that we can encode empty bytes fields.
@@ -1167,13 +1129,10 @@ func TestBigRepeated(t *testing.T) {
 		if pbd.Repeatedgroup[i] == nil { // TODO: more checking?
 			t.Error("pbd.Repeatedgroup bad")
 		}
-		var x uint64
-		x = uint64(pbd.F_Sint64Repeated[i])
-		if x != i {
+		if x := uint64(pbd.F_Sint64Repeated[i]); x != i {
 			t.Error("pbd.F_Sint64Repeated bad", x, i)
 		}
-		x = uint64(pbd.F_Sint32Repeated[i])
-		if x != i {
+		if x := uint64(pbd.F_Sint32Repeated[i]); x != i {
 			t.Error("pbd.F_Sint32Repeated bad", x, i)
 		}
 		s := fmt.Sprint(i)
@@ -1181,39 +1140,31 @@ func TestBigRepeated(t *testing.T) {
 		if pbd.F_StringRepeated[i] != s {
 			t.Error("pbd.F_Sint32Repeated bad", pbd.F_StringRepeated[i], i)
 		}
-		x = uint64(pbd.F_DoubleRepeated[i])
-		if x != i {
+		if x := uint64(pbd.F_DoubleRepeated[i]); x != i {
 			t.Error("pbd.F_DoubleRepeated bad", x, i)
 		}
-		x = uint64(pbd.F_FloatRepeated[i])
-		if x != i {
+		if x := uint64(pbd.F_FloatRepeated[i]); x != i {
 			t.Error("pbd.F_FloatRepeated bad", x, i)
 		}
-		x = pbd.F_Uint64Repeated[i]
-		if x != i {
+		if x := pbd.F_Uint64Repeated[i]; x != i {
 			t.Error("pbd.F_Uint64Repeated bad", x, i)
 		}
-		x = uint64(pbd.F_Uint32Repeated[i])
-		if x != i {
+		if x := uint64(pbd.F_Uint32Repeated[i]); x != i {
 			t.Error("pbd.F_Uint32Repeated bad", x, i)
 		}
-		x = pbd.F_Fixed64Repeated[i]
-		if x != i {
+		if x := pbd.F_Fixed64Repeated[i]; x != i {
 			t.Error("pbd.F_Fixed64Repeated bad", x, i)
 		}
-		x = uint64(pbd.F_Fixed32Repeated[i])
-		if x != i {
+		if x := uint64(pbd.F_Fixed32Repeated[i]); x != i {
 			t.Error("pbd.F_Fixed32Repeated bad", x, i)
 		}
-		x = uint64(pbd.F_Int64Repeated[i])
-		if x != i {
+		if x := uint64(pbd.F_Int64Repeated[i]); x != i {
 			t.Error("pbd.F_Int64Repeated bad", x, i)
 		}
-		x = uint64(pbd.F_Int32Repeated[i])
-		if x != i {
+		if x := uint64(pbd.F_Int32Repeated[i]); x != i {
 			t.Error("pbd.F_Int32Repeated bad", x, i)
 		}
-		if pbd.F_BoolRepeated[i] != (i%2 == 0) {
+		if x := pbd.F_BoolRepeated[i]; x != (i%2 == 0) {
 			t.Error("pbd.F_BoolRepeated bad", x, i)
 		}
 		if pbd.RepeatedField[i] == nil { // TODO: more checking?
@@ -1222,21 +1173,25 @@ func TestBigRepeated(t *testing.T) {
 	}
 }
 
-// Verify we give a useful message when decoding to the wrong structure type.
-func TestTypeMismatch(t *testing.T) {
-	pb1 := initGoTest(true)
+func TestBadWireTypeUnknown(t *testing.T) {
+	var b []byte
+	fmt.Sscanf("0a01780d00000000080b101612036161611521000000202c220362626225370000002203636363214200000000000000584d5a036464645900000000000056405d63000000", "%x", &b)
 
-	// Marshal
-	o := old()
-	o.Marshal(pb1)
+	m := new(MyMessage)
+	if err := Unmarshal(b, m); err != nil {
+		t.Errorf("unexpected Unmarshal error: %v", err)
+	}
 
-	// Now Unmarshal it to the wrong type.
-	pb2 := initGoTestField()
-	err := o.Unmarshal(pb2)
-	if err == nil {
-		t.Error("expected error, got no error")
-	} else if !strings.Contains(err.Error(), "bad wiretype") {
-		t.Error("expected bad wiretype error, got", err)
+	var unknown []byte
+	fmt.Sscanf("0a01780d0000000010161521000000202c2537000000214200000000000000584d5a036464645d63000000", "%x", &unknown)
+	if !bytes.Equal(m.XXX_unrecognized, unknown) {
+		t.Errorf("unknown bytes mismatch:\ngot  %x\nwant %x", m.XXX_unrecognized, unknown)
+	}
+	DiscardUnknown(m)
+
+	want := &MyMessage{Count: Int32(11), Name: String("aaa"), Pet: []string{"bbb", "ccc"}, Bigfloat: Float64(88)}
+	if !Equal(m, want) {
+		t.Errorf("message mismatch:\ngot  %v\nwant %v", m, want)
 	}
 }
 
@@ -1331,7 +1286,8 @@ func TestRequiredFieldEnforcement(t *testing.T) {
 	err = Unmarshal(buf, pb)
 	if err == nil {
 		t.Error("unmarshal: expected error, got nil")
-	} else if _, ok := err.(*RequiredNotSetError); !ok || !strings.Contains(err.Error(), "{Unknown}") {
+	} else if _, ok := err.(*RequiredNotSetError); !ok || !strings.Contains(err.Error(), "Type") && !strings.Contains(err.Error(), "{Unknown}") {
+		// TODO: remove unknown cases once we commit to the new unmarshaler.
 		t.Errorf("unmarshal: bad error type: %v", err)
 	}
 }
@@ -1348,7 +1304,7 @@ func TestRequiredFieldEnforcementGroups(t *testing.T) {
 	buf := []byte{11, 12}
 	if err := Unmarshal(buf, pb); err == nil {
 		t.Error("unmarshal: expected error, got nil")
-	} else if _, ok := err.(*RequiredNotSetError); !ok || !strings.Contains(err.Error(), "Group.{Unknown}") {
+	} else if _, ok := err.(*RequiredNotSetError); !ok || !strings.Contains(err.Error(), "Group.Field") && !strings.Contains(err.Error(), "Group.{Unknown}") {
 		t.Errorf("unmarshal: bad error type: %v", err)
 	}
 }
@@ -1385,18 +1341,7 @@ func (*NNIMessage) Reset()         {}
 func (*NNIMessage) String() string { return "" }
 func (*NNIMessage) ProtoMessage()  {}
 
-// A type that implements the Marshaler interface and is nillable.
-type nillableMessage struct {
-	x uint64
-}
-
-func (nm *nillableMessage) Marshal() ([]byte, error) {
-	return EncodeVarint(nm.x), nil
-}
-
-type NMMessage struct {
-	nm *nillableMessage
-}
+type NMMessage struct{}
 
 func (*NMMessage) Reset()         {}
 func (*NMMessage) String() string { return "" }
@@ -1595,6 +1540,14 @@ func TestVarintOverflow(t *testing.T) {
 	}
 }
 
+func TestBytesWithInvalidLengthInGroup(t *testing.T) {
+	// Overflowing a 64-bit length should not be allowed.
+	b := []byte{0xbb, 0x30, 0xb2, 0x30, 0xb0, 0xb2, 0x83, 0xf1, 0xb0, 0xb2, 0xef, 0xbf, 0xbd, 0x01}
+	if err := Unmarshal(b, new(MyMessage)); err == nil {
+		t.Fatalf("Overflowed uint64 length without error")
+	}
+}
+
 func TestUnmarshalFuzz(t *testing.T) {
 	const N = 1000
 	seed := time.Now().UnixNano()
@@ -1668,6 +1621,28 @@ func TestExtensionMarshalOrder(t *testing.T) {
 	}
 }
 
+func TestExtensionMapFieldMarshalDeterministic(t *testing.T) {
+	m := &MyMessage{Count: Int(123)}
+	if err := SetExtension(m, E_Ext_More, &Ext{MapField: map[int32]int32{1: 1, 2: 2, 3: 3, 4: 4}}); err != nil {
+		t.Fatalf("SetExtension: %v", err)
+	}
+	marshal := func(m Message) []byte {
+		var b Buffer
+		b.SetDeterministic(true)
+		if err := b.Marshal(m); err != nil {
+			t.Fatalf("Marshal failed: %v", err)
+		}
+		return b.Bytes()
+	}
+
+	want := marshal(m)
+	for i := 0; i < 100; i++ {
+		if got := marshal(m); !bytes.Equal(got, want) {
+			t.Errorf("Marshal produced inconsistent output with determinism enabled (pass %d).\n got %v\nwant %v", i, got, want)
+		}
+	}
+}
+
 // Many extensions, because small maps might not iterate differently on each iteration.
 var exts = []*ExtensionDesc{
 	E_X201,
@@ -1802,6 +1777,43 @@ func TestUnmarshalMergesMessages(t *testing.T) {
 	}
 }
 
+func TestUnmarshalMergesGroups(t *testing.T) {
+	// If a nested group occurs twice in the input,
+	// the fields should be merged when decoding.
+	a := &GroupNew{
+		G: &GroupNew_G{
+			X: Int32(7),
+			Y: Int32(8),
+		},
+	}
+	aData, err := Marshal(a)
+	if err != nil {
+		t.Fatalf("Marshal(a): %v", err)
+	}
+	b := &GroupNew{
+		G: &GroupNew_G{
+			X: Int32(9),
+		},
+	}
+	bData, err := Marshal(b)
+	if err != nil {
+		t.Fatalf("Marshal(b): %v", err)
+	}
+	want := &GroupNew{
+		G: &GroupNew_G{
+			X: Int32(9),
+			Y: Int32(8),
+		},
+	}
+	got := new(GroupNew)
+	if err := Unmarshal(append(aData, bData...), got); err != nil {
+		t.Fatalf("Unmarshal: %v", err)
+	}
+	if !Equal(got, want) {
+		t.Errorf("\n got %v\nwant %v", got, want)
+	}
+}
+
 func TestEncodingSizes(t *testing.T) {
 	tests := []struct {
 		m Message
@@ -1845,7 +1857,9 @@ func TestRequiredNotSetError(t *testing.T) {
 		"b404" + // field 70, encoding 4, end group
 		"aa0605" + "6279746573" + // field 101, encoding 2, string "bytes"
 		"b0063f" + // field 102, encoding 0, 0x3f zigzag32
-		"b8067f" // field 103, encoding 0, 0x7f zigzag64
+		"b8067f" + // field 103, encoding 0, 0x7f zigzag64
+		"c506e0ffffff" + // field 104, encoding 5, -32 fixed32
+		"c906c0ffffffffffffff" // field 105, encoding 1, -64 fixed64
 
 	o := old()
 	bytes, err := Marshal(pb)
@@ -1854,7 +1868,7 @@ func TestRequiredNotSetError(t *testing.T) {
 		o.DebugPrint("", bytes)
 		t.Fatalf("expected = %s", expected)
 	}
-	if strings.Index(err.Error(), "RequiredField.Label") < 0 {
+	if !strings.Contains(err.Error(), "RequiredField.Label") {
 		t.Errorf("marshal-1 wrong err msg: %v", err)
 	}
 	if !equal(bytes, expected, t) {
@@ -1870,7 +1884,7 @@ func TestRequiredNotSetError(t *testing.T) {
 		o.DebugPrint("", bytes)
 		t.Fatalf("string = %s", expected)
 	}
-	if strings.Index(err.Error(), "RequiredField.{Unknown}") < 0 {
+	if !strings.Contains(err.Error(), "RequiredField.Label") && !strings.Contains(err.Error(), "RequiredField.{Unknown}") {
 		t.Errorf("unmarshal wrong err msg: %v", err)
 	}
 	bytes, err = Marshal(pbd)
@@ -1879,7 +1893,7 @@ func TestRequiredNotSetError(t *testing.T) {
 		o.DebugPrint("", bytes)
 		t.Fatalf("string = %s", expected)
 	}
-	if strings.Index(err.Error(), "RequiredField.Label") < 0 {
+	if !strings.Contains(err.Error(), "RequiredField.Label") {
 		t.Errorf("marshal-2 wrong err msg: %v", err)
 	}
 	if !equal(bytes, expected, t) {
@@ -1888,6 +1902,25 @@ func TestRequiredNotSetError(t *testing.T) {
 	}
 }
 
+func TestRequiredNotSetErrorWithBadWireTypes(t *testing.T) {
+	// Required field expects a varint, and properly found a varint.
+	if err := Unmarshal([]byte{0x08, 0x00}, new(GoEnum)); err != nil {
+		t.Errorf("Unmarshal = %v, want nil", err)
+	}
+	// Required field expects a varint, but found a fixed32 instead.
+	if err := Unmarshal([]byte{0x0d, 0x00, 0x00, 0x00, 0x00}, new(GoEnum)); err == nil {
+		t.Errorf("Unmarshal = nil, want RequiredNotSetError")
+	}
+	// Required field expects a varint, and found both a varint and fixed32 (ignored).
+	m := new(GoEnum)
+	if err := Unmarshal([]byte{0x08, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00}, m); err != nil {
+		t.Errorf("Unmarshal = %v, want nil", err)
+	}
+	if !bytes.Equal(m.XXX_unrecognized, []byte{0x0d, 0x00, 0x00, 0x00, 0x00}) {
+		t.Errorf("expected fixed32 to appear as unknown bytes: %x", m.XXX_unrecognized)
+	}
+}
+
 func fuzzUnmarshal(t *testing.T, data []byte) {
 	defer func() {
 		if e := recover(); e != nil {
@@ -1946,6 +1979,32 @@ func TestMapFieldMarshal(t *testing.T) {
 	(new(Buffer)).DebugPrint("Dump of b", b)
 }
 
+func TestMapFieldDeterministicMarshal(t *testing.T) {
+	m := &MessageWithMap{
+		NameMapping: map[int32]string{
+			1: "Rob",
+			4: "Ian",
+			8: "Dave",
+		},
+	}
+
+	marshal := func(m Message) []byte {
+		var b Buffer
+		b.SetDeterministic(true)
+		if err := b.Marshal(m); err != nil {
+			t.Fatalf("Marshal failed: %v", err)
+		}
+		return b.Bytes()
+	}
+
+	want := marshal(m)
+	for i := 0; i < 10; i++ {
+		if got := marshal(m); !bytes.Equal(got, want) {
+			t.Errorf("Marshal produced inconsistent output with determinism enabled (pass %d).\n got %v\nwant %v", i, got, want)
+		}
+	}
+}
+
 func TestMapFieldRoundTrips(t *testing.T) {
 	m := &MessageWithMap{
 		NameMapping: map[int32]string{
@@ -1954,7 +2013,7 @@ func TestMapFieldRoundTrips(t *testing.T) {
 			8: "Dave",
 		},
 		MsgMapping: map[int64]*FloatingPoint{
-			0x7001: &FloatingPoint{F: Float64(2.0)},
+			0x7001: {F: Float64(2.0)},
 		},
 		ByteMapping: map[bool][]byte{
 			false: []byte("that's not right!"),
@@ -1970,14 +2029,8 @@ func TestMapFieldRoundTrips(t *testing.T) {
 	if err := Unmarshal(b, m2); err != nil {
 		t.Fatalf("Unmarshal: %v", err)
 	}
-	for _, pair := range [][2]interface{}{
-		{m.NameMapping, m2.NameMapping},
-		{m.MsgMapping, m2.MsgMapping},
-		{m.ByteMapping, m2.ByteMapping},
-	} {
-		if !reflect.DeepEqual(pair[0], pair[1]) {
-			t.Errorf("Map did not survive a round trip.\ninitial: %v\n  final: %v", pair[0], pair[1])
-		}
+	if !Equal(m, m2) {
+		t.Errorf("Map did not survive a round trip.\ninitial: %v\n  final: %v", m, m2)
 	}
 }
 
@@ -2005,7 +2058,7 @@ func TestMapFieldWithNil(t *testing.T) {
 func TestMapFieldWithNilBytes(t *testing.T) {
 	m1 := &MessageWithMap{
 		ByteMapping: map[bool][]byte{
-			false: []byte{},
+			false: {},
 			true:  nil,
 		},
 	}
@@ -2119,6 +2172,22 @@ func TestOneof(t *testing.T) {
 	}
 }
 
+func TestOneofNilBytes(t *testing.T) {
+	// A oneof with nil byte slice should marshal to tag + 0 (size), with no error.
+	m := &Communique{Union: &Communique_Data{Data: nil}}
+	b, err := Marshal(m)
+	if err != nil {
+		t.Fatalf("Marshal failed: %v", err)
+	}
+	want := []byte{
+		7<<3 | 2, // tag 7, wire type 2
+		0,        // size
+	}
+	if !bytes.Equal(b, want) {
+		t.Errorf("Wrong result of Marshal: got %x, want %x", b, want)
+	}
+}
+
 func TestInefficientPackedBool(t *testing.T) {
 	// https://github.com/golang/protobuf/issues/76
 	inp := []byte{
@@ -2132,6 +2201,69 @@ func TestInefficientPackedBool(t *testing.T) {
 	}
 }
 
+// Make sure pure-reflect-based implementation handles
+// []int32-[]enum conversion correctly.
+func TestRepeatedEnum2(t *testing.T) {
+	pb := &RepeatedEnum{
+		Color: []RepeatedEnum_Color{RepeatedEnum_RED},
+	}
+	b, err := Marshal(pb)
+	if err != nil {
+		t.Fatalf("Marshal failed: %v", err)
+	}
+	x := new(RepeatedEnum)
+	err = Unmarshal(b, x)
+	if err != nil {
+		t.Fatalf("Unmarshal failed: %v", err)
+	}
+	if !Equal(pb, x) {
+		t.Errorf("Incorrect result: want: %v got: %v", pb, x)
+	}
+}
+
+// TestConcurrentMarshal makes sure that it is safe to marshal
+// same message in multiple goroutines concurrently.
+func TestConcurrentMarshal(t *testing.T) {
+	pb := initGoTest(true)
+	const N = 100
+	b := make([][]byte, N)
+
+	var wg sync.WaitGroup
+	for i := 0; i < N; i++ {
+		wg.Add(1)
+		go func(i int) {
+			defer wg.Done()
+			var err error
+			b[i], err = Marshal(pb)
+			if err != nil {
+				t.Errorf("marshal error: %v", err)
+			}
+		}(i)
+	}
+
+	wg.Wait()
+	for i := 1; i < N; i++ {
+		if !bytes.Equal(b[0], b[i]) {
+			t.Errorf("concurrent marshal result not same: b[0] = %v, b[%d] = %v", b[0], i, b[i])
+		}
+	}
+}
+
+func TestInvalidUTF8(t *testing.T) {
+	const wire = "\x12\x04\xde\xea\xca\xfe"
+
+	var m GoTest
+	if err := Unmarshal([]byte(wire), &m); err == nil {
+		t.Errorf("Unmarshal error: got nil, want non-nil")
+	}
+
+	m.Reset()
+	m.Table = String(wire[2:])
+	if _, err := Marshal(&m); err == nil {
+		t.Errorf("Marshal error: got nil, want non-nil")
+	}
+}
+
 // Benchmarks
 
 func testMsg() *GoTest {
diff --git a/vendor/github.com/golang/protobuf/proto/any_test.go b/vendor/github.com/golang/protobuf/proto/any_test.go
index 1a3c22ed..56fc97c1 100644
--- a/vendor/github.com/golang/protobuf/proto/any_test.go
+++ b/vendor/github.com/golang/protobuf/proto/any_test.go
@@ -38,7 +38,7 @@ import (
 	"github.com/golang/protobuf/proto"
 
 	pb "github.com/golang/protobuf/proto/proto3_proto"
-	testpb "github.com/golang/protobuf/proto/testdata"
+	testpb "github.com/golang/protobuf/proto/test_proto"
 	anypb "github.com/golang/protobuf/ptypes/any"
 )
 
@@ -166,33 +166,33 @@ anything: <
 name: "David"
 result_count: 47
 anything: <
-  [type.googleapis.com/testdata.MyMessage]: <
+  [type.googleapis.com/test_proto.MyMessage]: <
     count: 47
     name: "David"
-    [testdata.Ext.more]: <
+    [test_proto.Ext.more]: <
       data: "foo"
     >
-    [testdata.Ext.text]: "bar"
+    [test_proto.Ext.text]: "bar"
   >
 >
 many_things: <
-  [type.googleapis.com/testdata.MyMessage]: <
+  [type.googleapis.com/test_proto.MyMessage]: <
     count: 42
     bikeshed: GREEN
     rep_bytes: "roboto"
-    [testdata.Ext.more]: <
+    [test_proto.Ext.more]: <
       data: "baz"
     >
   >
 >
 many_things: <
-  [type.googleapis.com/testdata.MyMessage]: <
+  [type.googleapis.com/test_proto.MyMessage]: <
     count: 47
     name: "David"
-    [testdata.Ext.more]: <
+    [test_proto.Ext.more]: <
       data: "foo"
     >
-    [testdata.Ext.text]: "bar"
+    [test_proto.Ext.text]: "bar"
   >
 >
 `
diff --git a/vendor/github.com/golang/protobuf/proto/clone.go b/vendor/github.com/golang/protobuf/proto/clone.go
index e392575b..3cd3249f 100644
--- a/vendor/github.com/golang/protobuf/proto/clone.go
+++ b/vendor/github.com/golang/protobuf/proto/clone.go
@@ -35,22 +35,39 @@
 package proto
 
 import (
+	"fmt"
 	"log"
 	"reflect"
 	"strings"
 )
 
 // Clone returns a deep copy of a protocol buffer.
-func Clone(pb Message) Message {
-	in := reflect.ValueOf(pb)
+func Clone(src Message) Message {
+	in := reflect.ValueOf(src)
 	if in.IsNil() {
-		return pb
+		return src
 	}
-
 	out := reflect.New(in.Type().Elem())
-	// out is empty so a merge is a deep copy.
-	mergeStruct(out.Elem(), in.Elem())
-	return out.Interface().(Message)
+	dst := out.Interface().(Message)
+	Merge(dst, src)
+	return dst
+}
+
+// Merger is the interface representing objects that can merge messages of the same type.
+type Merger interface {
+	// Merge merges src into this message.
+	// Required and optional fields that are set in src will be set to that value in dst.
+	// Elements of repeated fields will be appended.
+	//
+	// Merge may panic if called with a different argument type than the receiver.
+	Merge(src Message)
+}
+
+// generatedMerger is the custom merge method that generated protos will have.
+// We must add this method since a generate Merge method will conflict with
+// many existing protos that have a Merge data field already defined.
+type generatedMerger interface {
+	XXX_Merge(src Message)
 }
 
 // Merge merges src into dst.
@@ -58,17 +75,24 @@ func Clone(pb Message) Message {
 // Elements of repeated fields will be appended.
 // Merge panics if src and dst are not the same type, or if dst is nil.
 func Merge(dst, src Message) {
+	if m, ok := dst.(Merger); ok {
+		m.Merge(src)
+		return
+	}
+
 	in := reflect.ValueOf(src)
 	out := reflect.ValueOf(dst)
 	if out.IsNil() {
 		panic("proto: nil destination")
 	}
 	if in.Type() != out.Type() {
-		// Explicit test prior to mergeStruct so that mistyped nils will fail
-		panic("proto: type mismatch")
+		panic(fmt.Sprintf("proto.Merge(%T, %T) type mismatch", dst, src))
 	}
 	if in.IsNil() {
-		// Merging nil into non-nil is a quiet no-op
+		return // Merge from nil src is a noop
+	}
+	if m, ok := dst.(generatedMerger); ok {
+		m.XXX_Merge(src)
 		return
 	}
 	mergeStruct(out.Elem(), in.Elem())
@@ -84,7 +108,7 @@ func mergeStruct(out, in reflect.Value) {
 		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
 	}
 
-	if emIn, ok := extendable(in.Addr().Interface()); ok {
+	if emIn, err := extendable(in.Addr().Interface()); err == nil {
 		emOut, _ := extendable(out.Addr().Interface())
 		mIn, muIn := emIn.extensionsRead()
 		if mIn != nil {
diff --git a/vendor/github.com/golang/protobuf/proto/clone_test.go b/vendor/github.com/golang/protobuf/proto/clone_test.go
index f607ff49..0d3b1273 100644
--- a/vendor/github.com/golang/protobuf/proto/clone_test.go
+++ b/vendor/github.com/golang/protobuf/proto/clone_test.go
@@ -37,7 +37,7 @@ import (
 	"github.com/golang/protobuf/proto"
 
 	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
+	pb "github.com/golang/protobuf/proto/test_proto"
 )
 
 var cloneTestMessage = &pb.MyMessage{
@@ -72,7 +72,7 @@ func init() {
 func TestClone(t *testing.T) {
 	m := proto.Clone(cloneTestMessage).(*pb.MyMessage)
 	if !proto.Equal(m, cloneTestMessage) {
-		t.Errorf("Clone(%v) = %v", cloneTestMessage, m)
+		t.Fatalf("Clone(%v) = %v", cloneTestMessage, m)
 	}
 
 	// Verify it was a deep copy.
@@ -244,27 +244,45 @@ var mergeTests = []struct {
 			Data:       []byte("texas!"),
 		},
 	},
-	// Oneof fields should merge by assignment.
+	{ // Oneof fields should merge by assignment.
+		src:  &pb.Communique{Union: &pb.Communique_Number{41}},
+		dst:  &pb.Communique{Union: &pb.Communique_Name{"Bobby Tables"}},
+		want: &pb.Communique{Union: &pb.Communique_Number{41}},
+	},
+	{ // Oneof nil is the same as not set.
+		src:  &pb.Communique{},
+		dst:  &pb.Communique{Union: &pb.Communique_Name{"Bobby Tables"}},
+		want: &pb.Communique{Union: &pb.Communique_Name{"Bobby Tables"}},
+	},
 	{
-		src: &pb.Communique{
-			Union: &pb.Communique_Number{41},
-		},
-		dst: &pb.Communique{
-			Union: &pb.Communique_Name{"Bobby Tables"},
-		},
-		want: &pb.Communique{
-			Union: &pb.Communique_Number{41},
-		},
+		src:  &pb.Communique{Union: &pb.Communique_Number{1337}},
+		dst:  &pb.Communique{},
+		want: &pb.Communique{Union: &pb.Communique_Number{1337}},
 	},
-	// Oneof nil is the same as not set.
 	{
-		src: &pb.Communique{},
-		dst: &pb.Communique{
-			Union: &pb.Communique_Name{"Bobby Tables"},
-		},
-		want: &pb.Communique{
-			Union: &pb.Communique_Name{"Bobby Tables"},
-		},
+		src:  &pb.Communique{Union: &pb.Communique_Col{pb.MyMessage_RED}},
+		dst:  &pb.Communique{},
+		want: &pb.Communique{Union: &pb.Communique_Col{pb.MyMessage_RED}},
+	},
+	{
+		src:  &pb.Communique{Union: &pb.Communique_Data{[]byte("hello")}},
+		dst:  &pb.Communique{},
+		want: &pb.Communique{Union: &pb.Communique_Data{[]byte("hello")}},
+	},
+	{
+		src:  &pb.Communique{Union: &pb.Communique_Msg{&pb.Strings{BytesField: []byte{1, 2, 3}}}},
+		dst:  &pb.Communique{},
+		want: &pb.Communique{Union: &pb.Communique_Msg{&pb.Strings{BytesField: []byte{1, 2, 3}}}},
+	},
+	{
+		src:  &pb.Communique{Union: &pb.Communique_Msg{}},
+		dst:  &pb.Communique{},
+		want: &pb.Communique{Union: &pb.Communique_Msg{}},
+	},
+	{
+		src:  &pb.Communique{Union: &pb.Communique_Msg{&pb.Strings{StringField: proto.String("123")}}},
+		dst:  &pb.Communique{Union: &pb.Communique_Msg{&pb.Strings{BytesField: []byte{1, 2, 3}}}},
+		want: &pb.Communique{Union: &pb.Communique_Msg{&pb.Strings{StringField: proto.String("123"), BytesField: []byte{1, 2, 3}}}},
 	},
 	{
 		src: &proto3pb.Message{
@@ -287,14 +305,86 @@ var mergeTests = []struct {
 			},
 		},
 	},
+	{
+		src: &pb.GoTest{
+			F_BoolRepeated:   []bool{},
+			F_Int32Repeated:  []int32{},
+			F_Int64Repeated:  []int64{},
+			F_Uint32Repeated: []uint32{},
+			F_Uint64Repeated: []uint64{},
+			F_FloatRepeated:  []float32{},
+			F_DoubleRepeated: []float64{},
+			F_StringRepeated: []string{},
+			F_BytesRepeated:  [][]byte{},
+		},
+		dst: &pb.GoTest{},
+		want: &pb.GoTest{
+			F_BoolRepeated:   []bool{},
+			F_Int32Repeated:  []int32{},
+			F_Int64Repeated:  []int64{},
+			F_Uint32Repeated: []uint32{},
+			F_Uint64Repeated: []uint64{},
+			F_FloatRepeated:  []float32{},
+			F_DoubleRepeated: []float64{},
+			F_StringRepeated: []string{},
+			F_BytesRepeated:  [][]byte{},
+		},
+	},
+	{
+		src: &pb.GoTest{},
+		dst: &pb.GoTest{
+			F_BoolRepeated:   []bool{},
+			F_Int32Repeated:  []int32{},
+			F_Int64Repeated:  []int64{},
+			F_Uint32Repeated: []uint32{},
+			F_Uint64Repeated: []uint64{},
+			F_FloatRepeated:  []float32{},
+			F_DoubleRepeated: []float64{},
+			F_StringRepeated: []string{},
+			F_BytesRepeated:  [][]byte{},
+		},
+		want: &pb.GoTest{
+			F_BoolRepeated:   []bool{},
+			F_Int32Repeated:  []int32{},
+			F_Int64Repeated:  []int64{},
+			F_Uint32Repeated: []uint32{},
+			F_Uint64Repeated: []uint64{},
+			F_FloatRepeated:  []float32{},
+			F_DoubleRepeated: []float64{},
+			F_StringRepeated: []string{},
+			F_BytesRepeated:  [][]byte{},
+		},
+	},
+	{
+		src: &pb.GoTest{
+			F_BytesRepeated: [][]byte{nil, []byte{}, []byte{0}},
+		},
+		dst: &pb.GoTest{},
+		want: &pb.GoTest{
+			F_BytesRepeated: [][]byte{nil, []byte{}, []byte{0}},
+		},
+	},
+	{
+		src: &pb.MyMessage{
+			Others: []*pb.OtherMessage{},
+		},
+		dst: &pb.MyMessage{},
+		want: &pb.MyMessage{
+			Others: []*pb.OtherMessage{},
+		},
+	},
 }
 
 func TestMerge(t *testing.T) {
 	for _, m := range mergeTests {
 		got := proto.Clone(m.dst)
+		if !proto.Equal(got, m.dst) {
+			t.Errorf("Clone()\ngot  %v\nwant %v", got, m.dst)
+			continue
+		}
 		proto.Merge(got, m.src)
 		if !proto.Equal(got, m.want) {
-			t.Errorf("Merge(%v, %v)\n got %v\nwant %v\n", m.dst, m.src, got, m.want)
+			t.Errorf("Merge(%v, %v)\ngot  %v\nwant %v", m.dst, m.src, got, m.want)
 		}
 	}
 }
diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go
index aa207298..d9aa3c42 100644
--- a/vendor/github.com/golang/protobuf/proto/decode.go
+++ b/vendor/github.com/golang/protobuf/proto/decode.go
@@ -39,8 +39,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"os"
-	"reflect"
 )
 
 // errOverflow is returned when an integer is too large to be represented.
@@ -50,10 +48,6 @@ var errOverflow = errors.New("proto: integer overflow")
 // wire type is encountered. It does not get returned to user code.
 var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
 
-// The fundamental decoders that interpret bytes on the wire.
-// Those that take integer types all return uint64 and are
-// therefore of type valueDecoder.
-
 // DecodeVarint reads a varint-encoded integer from the slice.
 // It returns the integer and the number of bytes consumed, or
 // zero if there is not enough.
@@ -267,9 +261,6 @@ func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
 	return
 }
 
-// These are not ValueDecoders: they produce an array of bytes or a string.
-// bytes, embedded messages
-
 // DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
 // This is the format used for the bytes protocol buffer
 // type and for embedded messages.
@@ -311,81 +302,29 @@ func (p *Buffer) DecodeStringBytes() (s string, err error) {
 	return string(buf), nil
 }
 
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-// If the protocol buffer has extensions, and the field matches, add it as an extension.
-// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
-func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
-	oi := o.index
-
-	err := o.skip(t, tag, wire)
-	if err != nil {
-		return err
-	}
-
-	if !unrecField.IsValid() {
-		return nil
-	}
-
-	ptr := structPointer_Bytes(base, unrecField)
-
-	// Add the skipped field to struct field
-	obuf := o.buf
-
-	o.buf = *ptr
-	o.EncodeVarint(uint64(tag<<3 | wire))
-	*ptr = append(o.buf, obuf[oi:o.index]...)
-
-	o.buf = obuf
-
-	return nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
-
-	var u uint64
-	var err error
-
-	switch wire {
-	case WireVarint:
-		_, err = o.DecodeVarint()
-	case WireFixed64:
-		_, err = o.DecodeFixed64()
-	case WireBytes:
-		_, err = o.DecodeRawBytes(false)
-	case WireFixed32:
-		_, err = o.DecodeFixed32()
-	case WireStartGroup:
-		for {
-			u, err = o.DecodeVarint()
-			if err != nil {
-				break
-			}
-			fwire := int(u & 0x7)
-			if fwire == WireEndGroup {
-				break
-			}
-			ftag := int(u >> 3)
-			err = o.skip(t, ftag, fwire)
-			if err != nil {
-				break
-			}
-		}
-	default:
-		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
-	}
-	return err
-}
-
 // Unmarshaler is the interface representing objects that can
-// unmarshal themselves.  The method should reset the receiver before
-// decoding starts.  The argument points to data that may be
+// unmarshal themselves.  The argument points to data that may be
 // overwritten, so implementations should not keep references to the
 // buffer.
+// Unmarshal implementations should not clear the receiver.
+// Any unmarshaled data should be merged into the receiver.
+// Callers of Unmarshal that do not want to retain existing data
+// should Reset the receiver before calling Unmarshal.
 type Unmarshaler interface {
 	Unmarshal([]byte) error
 }
 
+// newUnmarshaler is the interface representing objects that can
+// unmarshal themselves. The semantics are identical to Unmarshaler.
+//
+// This exists to support protoc-gen-go generated messages.
+// The proto package will stop type-asserting to this interface in the future.
+//
+// DO NOT DEPEND ON THIS.
+type newUnmarshaler interface {
+	XXX_Unmarshal([]byte) error
+}
+
 // Unmarshal parses the protocol buffer representation in buf and places the
 // decoded result in pb.  If the struct underlying pb does not match
 // the data in buf, the results can be unpredictable.
@@ -395,7 +334,13 @@ type Unmarshaler interface {
 // to preserve and append to existing data.
 func Unmarshal(buf []byte, pb Message) error {
 	pb.Reset()
-	return UnmarshalMerge(buf, pb)
+	if u, ok := pb.(newUnmarshaler); ok {
+		return u.XXX_Unmarshal(buf)
+	}
+	if u, ok := pb.(Unmarshaler); ok {
+		return u.Unmarshal(buf)
+	}
+	return NewBuffer(buf).Unmarshal(pb)
 }
 
 // UnmarshalMerge parses the protocol buffer representation in buf and
@@ -405,8 +350,16 @@ func Unmarshal(buf []byte, pb Message) error {
 // UnmarshalMerge merges into existing data in pb.
 // Most code should use Unmarshal instead.
 func UnmarshalMerge(buf []byte, pb Message) error {
-	// If the object can unmarshal itself, let it.
+	if u, ok := pb.(newUnmarshaler); ok {
+		return u.XXX_Unmarshal(buf)
+	}
 	if u, ok := pb.(Unmarshaler); ok {
+		// NOTE: The history of proto have unfortunately been inconsistent
+		// whether Unmarshaler should or should not implicitly clear itself.
+		// Some implementations do, most do not.
+		// Thus, calling this here may or may not do what people want.
+		//
+		// See https://github.com/golang/protobuf/issues/424
 		return u.Unmarshal(buf)
 	}
 	return NewBuffer(buf).Unmarshal(pb)
@@ -422,12 +375,17 @@ func (p *Buffer) DecodeMessage(pb Message) error {
 }
 
 // DecodeGroup reads a tag-delimited group from the Buffer.
+// StartGroup tag is already consumed. This function consumes
+// EndGroup tag.
 func (p *Buffer) DecodeGroup(pb Message) error {
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
+	b := p.buf[p.index:]
+	x, y := findEndGroup(b)
+	if x < 0 {
+		return io.ErrUnexpectedEOF
 	}
-	return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base)
+	err := Unmarshal(b[:x], pb)
+	p.index += y
+	return err
 }
 
 // Unmarshal parses the protocol buffer representation in the
@@ -438,533 +396,33 @@ func (p *Buffer) DecodeGroup(pb Message) error {
 // Unlike proto.Unmarshal, this does not reset pb before starting to unmarshal.
 func (p *Buffer) Unmarshal(pb Message) error {
 	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		err := u.Unmarshal(p.buf[p.index:])
+	if u, ok := pb.(newUnmarshaler); ok {
+		err := u.XXX_Unmarshal(p.buf[p.index:])
 		p.index = len(p.buf)
 		return err
 	}
-
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-
-	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
-
-	if collectStats {
-		stats.Decode++
-	}
-
-	return err
-}
-
-// unmarshalType does the work of unmarshaling a structure.
-func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
-	var state errorState
-	required, reqFields := prop.reqCount, uint64(0)
-
-	var err error
-	for err == nil && o.index < len(o.buf) {
-		oi := o.index
-		var u uint64
-		u, err = o.DecodeVarint()
-		if err != nil {
-			break
-		}
-		wire := int(u & 0x7)
-		if wire == WireEndGroup {
-			if is_group {
-				if required > 0 {
-					// Not enough information to determine the exact field.
-					// (See below.)
-					return &RequiredNotSetError{"{Unknown}"}
-				}
-				return nil // input is satisfied
-			}
-			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
-		}
-		tag := int(u >> 3)
-		if tag <= 0 {
-			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
-		}
-		fieldnum, ok := prop.decoderTags.get(tag)
-		if !ok {
-			// Maybe it's an extension?
-			if prop.extendable {
-				if e, _ := extendable(structPointer_Interface(base, st)); isExtensionField(e, int32(tag)) {
-					if err = o.skip(st, tag, wire); err == nil {
-						extmap := e.extensionsWrite()
-						ext := extmap[int32(tag)] // may be missing
-						ext.enc = append(ext.enc, o.buf[oi:o.index]...)
-						extmap[int32(tag)] = ext
-					}
-					continue
-				}
-			}
-			// Maybe it's a oneof?
-			if prop.oneofUnmarshaler != nil {
-				m := structPointer_Interface(base, st).(Message)
-				// First return value indicates whether tag is a oneof field.
-				ok, err = prop.oneofUnmarshaler(m, tag, wire, o)
-				if err == ErrInternalBadWireType {
-					// Map the error to something more descriptive.
-					// Do the formatting here to save generated code space.
-					err = fmt.Errorf("bad wiretype for oneof field in %T", m)
-				}
-				if ok {
-					continue
-				}
-			}
-			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
-			continue
-		}
-		p := prop.Prop[fieldnum]
-
-		if p.dec == nil {
-			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
-			continue
-		}
-		dec := p.dec
-		if wire != WireStartGroup && wire != p.WireType {
-			if wire == WireBytes && p.packedDec != nil {
-				// a packable field
-				dec = p.packedDec
-			} else {
-				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
-				continue
-			}
-		}
-		decErr := dec(o, p, base)
-		if decErr != nil && !state.shouldContinue(decErr, p) {
-			err = decErr
-		}
-		if err == nil && p.Required {
-			// Successfully decoded a required field.
-			if tag <= 64 {
-				// use bitmap for fields 1-64 to catch field reuse.
-				var mask uint64 = 1 << uint64(tag-1)
-				if reqFields&mask == 0 {
-					// new required field
-					reqFields |= mask
-					required--
-				}
-			} else {
-				// This is imprecise. It can be fooled by a required field
-				// with a tag > 64 that is encoded twice; that's very rare.
-				// A fully correct implementation would require allocating
-				// a data structure, which we would like to avoid.
-				required--
-			}
-		}
-	}
-	if err == nil {
-		if is_group {
-			return io.ErrUnexpectedEOF
-		}
-		if state.err != nil {
-			return state.err
-		}
-		if required > 0 {
-			// Not enough information to determine the exact field. If we use extra
-			// CPU, we could determine the field only if the missing required field
-			// has a tag <= 64 and we check reqFields.
-			return &RequiredNotSetError{"{Unknown}"}
-		}
-	}
-	return err
-}
-
-// Individual type decoders
-// For each,
-//	u is the decoded value,
-//	v is a pointer to the field (pointer) in the struct
-
-// Sizes of the pools to allocate inside the Buffer.
-// The goal is modest amortization and allocation
-// on at least 16-byte boundaries.
-const (
-	boolPoolSize   = 16
-	uint32PoolSize = 8
-	uint64PoolSize = 4
-)
-
-// Decode a bool.
-func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	if len(o.bools) == 0 {
-		o.bools = make([]bool, boolPoolSize)
-	}
-	o.bools[0] = u != 0
-	*structPointer_Bool(base, p.field) = &o.bools[0]
-	o.bools = o.bools[1:]
-	return nil
-}
-
-func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	*structPointer_BoolVal(base, p.field) = u != 0
-	return nil
-}
-
-// Decode an int32.
-func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
-	return nil
-}
-
-// Decode an int64.
-func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64_Set(structPointer_Word64(base, p.field), o, u)
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
-	return nil
-}
-
-// Decode a string.
-func (o *Buffer) dec_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_String(base, p.field) = &s
-	return nil
-}
-
-func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_StringVal(base, p.field) = s
-	return nil
-}
-
-// Decode a slice of bytes ([]byte).
-func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	*structPointer_Bytes(base, p.field) = b
-	return nil
-}
-
-// Decode a slice of bools ([]bool).
-func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BoolSlice(base, p.field)
-	*v = append(*v, u != 0)
-	return nil
-}
-
-// Decode a slice of bools ([]bool) in packed format.
-func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
-	v := structPointer_BoolSlice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded bools
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-
-	y := *v
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		y = append(y, u != 0)
-	}
-
-	*v = y
-	return nil
-}
-
-// Decode a slice of int32s ([]int32).
-func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	structPointer_Word32Slice(base, p.field).Append(uint32(u))
-	return nil
-}
-
-// Decode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int32s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(uint32(u))
-	}
-	return nil
-}
-
-// Decode a slice of int64s ([]int64).
-func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-
-	structPointer_Word64Slice(base, p.field).Append(u)
-	return nil
-}
-
-// Decode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int64s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(u)
-	}
-	return nil
-}
-
-// Decode a slice of strings ([]string).
-func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	v := structPointer_StringSlice(base, p.field)
-	*v = append(*v, s)
-	return nil
-}
-
-// Decode a slice of slice of bytes ([][]byte).
-func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BytesSlice(base, p.field)
-	*v = append(*v, b)
-	return nil
-}
-
-// Decode a map field.
-func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	oi := o.index       // index at the end of this map entry
-	o.index -= len(raw) // move buffer back to start of map entry
-
-	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
-	if mptr.Elem().IsNil() {
-		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
-	}
-	v := mptr.Elem() // map[K]V
-
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// See enc_new_map for why.
-	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
-	keybase := toStructPointer(keyptr.Addr())                  // **K
-
-	var valbase structPointer
-	var valptr reflect.Value
-	switch p.mtype.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valptr = reflect.ValueOf(&dummy)  // *[]byte
-		valbase = toStructPointer(valptr) // *[]byte
-	case reflect.Ptr:
-		// message; valptr is **Msg; need to allocate the intermediate pointer
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valptr.Set(reflect.New(valptr.Type().Elem()))
-		valbase = toStructPointer(valptr)
-	default:
-		// everything else
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valbase = toStructPointer(valptr.Addr())                   // **V
-	}
-
-	// Decode.
-	// This parses a restricted wire format, namely the encoding of a message
-	// with two fields. See enc_new_map for the format.
-	for o.index < oi {
-		// tagcode for key and value properties are always a single byte
-		// because they have tags 1 and 2.
-		tagcode := o.buf[o.index]
-		o.index++
-		switch tagcode {
-		case p.mkeyprop.tagcode[0]:
-			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
-				return err
-			}
-		case p.mvalprop.tagcode[0]:
-			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
-				return err
-			}
-		default:
-			// TODO: Should we silently skip this instead?
-			return fmt.Errorf("proto: bad map data tag %d", raw[0])
-		}
-	}
-	keyelem, valelem := keyptr.Elem(), valptr.Elem()
-	if !keyelem.IsValid() {
-		keyelem = reflect.Zero(p.mtype.Key())
-	}
-	if !valelem.IsValid() {
-		valelem = reflect.Zero(p.mtype.Elem())
-	}
-
-	v.SetMapIndex(keyelem, valelem)
-	return nil
-}
-
-// Decode a group.
-func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-	return o.unmarshalType(p.stype, p.sprop, true, bas)
-}
-
-// Decode an embedded message.
-func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := structPointer_Interface(bas, p.stype)
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of embedded messages.
-func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, false, base)
-}
-
-// Decode a slice of embedded groups.
-func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, true, base)
-}
-
-// Decode a slice of structs ([]*struct).
-func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
-	v := reflect.New(p.stype)
-	bas := toStructPointer(v)
-	structPointer_StructPointerSlice(base, p.field).Append(bas)
-
-	if is_group {
-		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
-		return err
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
+	if u, ok := pb.(Unmarshaler); ok {
+		// NOTE: The history of proto have unfortunately been inconsistent
+		// whether Unmarshaler should or should not implicitly clear itself.
+		// Some implementations do, most do not.
+		// Thus, calling this here may or may not do what people want.
+		//
+		// See https://github.com/golang/protobuf/issues/424
+		err := u.Unmarshal(p.buf[p.index:])
+		p.index = len(p.buf)
 		return err
 	}
 
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := v.Interface()
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
-
-	o.buf = obuf
-	o.index = oi
-
+	// Slow workaround for messages that aren't Unmarshalers.
+	// This includes some hand-coded .pb.go files and
+	// bootstrap protos.
+	// TODO: fix all of those and then add Unmarshal to
+	// the Message interface. Then:
+	// The cast above and code below can be deleted.
+	// The old unmarshaler can be deleted.
+	// Clients can call Unmarshal directly (can already do that, actually).
+	var info InternalMessageInfo
+	err := info.Unmarshal(pb, p.buf[p.index:])
+	p.index = len(p.buf)
 	return err
 }
diff --git a/vendor/github.com/golang/protobuf/proto/decode_test.go b/vendor/github.com/golang/protobuf/proto/decode_test.go
index 2c4c31d1..949be3ab 100644
--- a/vendor/github.com/golang/protobuf/proto/decode_test.go
+++ b/vendor/github.com/golang/protobuf/proto/decode_test.go
@@ -41,10 +41,7 @@ import (
 	tpb "github.com/golang/protobuf/proto/proto3_proto"
 )
 
-var (
-	bytesBlackhole []byte
-	msgBlackhole   = new(tpb.Message)
-)
+var msgBlackhole = new(tpb.Message)
 
 // BenchmarkVarint32ArraySmall shows the performance on an array of small int32 fields (1 and
 // 2 bytes long).
diff --git a/vendor/github.com/golang/protobuf/proto/discard.go b/vendor/github.com/golang/protobuf/proto/discard.go
index bd0e3bb4..dea2617c 100644
--- a/vendor/github.com/golang/protobuf/proto/discard.go
+++ b/vendor/github.com/golang/protobuf/proto/discard.go
@@ -35,8 +35,14 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
+	"sync"
+	"sync/atomic"
 )
 
+type generatedDiscarder interface {
+	XXX_DiscardUnknown()
+}
+
 // DiscardUnknown recursively discards all unknown fields from this message
 // and all embedded messages.
 //
@@ -49,9 +55,202 @@ import (
 // For proto2 messages, the unknown fields of message extensions are only
 // discarded from messages that have been accessed via GetExtension.
 func DiscardUnknown(m Message) {
+	if m, ok := m.(generatedDiscarder); ok {
+		m.XXX_DiscardUnknown()
+		return
+	}
+	// TODO: Dynamically populate a InternalMessageInfo for legacy messages,
+	// but the master branch has no implementation for InternalMessageInfo,
+	// so it would be more work to replicate that approach.
 	discardLegacy(m)
 }
 
+// DiscardUnknown recursively discards all unknown fields.
+func (a *InternalMessageInfo) DiscardUnknown(m Message) {
+	di := atomicLoadDiscardInfo(&a.discard)
+	if di == nil {
+		di = getDiscardInfo(reflect.TypeOf(m).Elem())
+		atomicStoreDiscardInfo(&a.discard, di)
+	}
+	di.discard(toPointer(&m))
+}
+
+type discardInfo struct {
+	typ reflect.Type
+
+	initialized int32 // 0: only typ is valid, 1: everything is valid
+	lock        sync.Mutex
+
+	fields       []discardFieldInfo
+	unrecognized field
+}
+
+type discardFieldInfo struct {
+	field   field // Offset of field, guaranteed to be valid
+	discard func(src pointer)
+}
+
+var (
+	discardInfoMap  = map[reflect.Type]*discardInfo{}
+	discardInfoLock sync.Mutex
+)
+
+func getDiscardInfo(t reflect.Type) *discardInfo {
+	discardInfoLock.Lock()
+	defer discardInfoLock.Unlock()
+	di := discardInfoMap[t]
+	if di == nil {
+		di = &discardInfo{typ: t}
+		discardInfoMap[t] = di
+	}
+	return di
+}
+
+func (di *discardInfo) discard(src pointer) {
+	if src.isNil() {
+		return // Nothing to do.
+	}
+
+	if atomic.LoadInt32(&di.initialized) == 0 {
+		di.computeDiscardInfo()
+	}
+
+	for _, fi := range di.fields {
+		sfp := src.offset(fi.field)
+		fi.discard(sfp)
+	}
+
+	// For proto2 messages, only discard unknown fields in message extensions
+	// that have been accessed via GetExtension.
+	if em, err := extendable(src.asPointerTo(di.typ).Interface()); err == nil {
+		// Ignore lock since DiscardUnknown is not concurrency safe.
+		emm, _ := em.extensionsRead()
+		for _, mx := range emm {
+			if m, ok := mx.value.(Message); ok {
+				DiscardUnknown(m)
+			}
+		}
+	}
+
+	if di.unrecognized.IsValid() {
+		*src.offset(di.unrecognized).toBytes() = nil
+	}
+}
+
+func (di *discardInfo) computeDiscardInfo() {
+	di.lock.Lock()
+	defer di.lock.Unlock()
+	if di.initialized != 0 {
+		return
+	}
+	t := di.typ
+	n := t.NumField()
+
+	for i := 0; i < n; i++ {
+		f := t.Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+
+		dfi := discardFieldInfo{field: toField(&f)}
+		tf := f.Type
+
+		// Unwrap tf to get its most basic type.
+		var isPointer, isSlice bool
+		if tf.Kind() == reflect.Slice && tf.Elem().Kind() != reflect.Uint8 {
+			isSlice = true
+			tf = tf.Elem()
+		}
+		if tf.Kind() == reflect.Ptr {
+			isPointer = true
+			tf = tf.Elem()
+		}
+		if isPointer && isSlice && tf.Kind() != reflect.Struct {
+			panic(fmt.Sprintf("%v.%s cannot be a slice of pointers to primitive types", t, f.Name))
+		}
+
+		switch tf.Kind() {
+		case reflect.Struct:
+			switch {
+			case !isPointer:
+				panic(fmt.Sprintf("%v.%s cannot be a direct struct value", t, f.Name))
+			case isSlice: // E.g., []*pb.T
+				di := getDiscardInfo(tf)
+				dfi.discard = func(src pointer) {
+					sps := src.getPointerSlice()
+					for _, sp := range sps {
+						if !sp.isNil() {
+							di.discard(sp)
+						}
+					}
+				}
+			default: // E.g., *pb.T
+				di := getDiscardInfo(tf)
+				dfi.discard = func(src pointer) {
+					sp := src.getPointer()
+					if !sp.isNil() {
+						di.discard(sp)
+					}
+				}
+			}
+		case reflect.Map:
+			switch {
+			case isPointer || isSlice:
+				panic(fmt.Sprintf("%v.%s cannot be a pointer to a map or a slice of map values", t, f.Name))
+			default: // E.g., map[K]V
+				if tf.Elem().Kind() == reflect.Ptr { // Proto struct (e.g., *T)
+					dfi.discard = func(src pointer) {
+						sm := src.asPointerTo(tf).Elem()
+						if sm.Len() == 0 {
+							return
+						}
+						for _, key := range sm.MapKeys() {
+							val := sm.MapIndex(key)
+							DiscardUnknown(val.Interface().(Message))
+						}
+					}
+				} else {
+					dfi.discard = func(pointer) {} // Noop
+				}
+			}
+		case reflect.Interface:
+			// Must be oneof field.
+			switch {
+			case isPointer || isSlice:
+				panic(fmt.Sprintf("%v.%s cannot be a pointer to a interface or a slice of interface values", t, f.Name))
+			default: // E.g., interface{}
+				// TODO: Make this faster?
+				dfi.discard = func(src pointer) {
+					su := src.asPointerTo(tf).Elem()
+					if !su.IsNil() {
+						sv := su.Elem().Elem().Field(0)
+						if sv.Kind() == reflect.Ptr && sv.IsNil() {
+							return
+						}
+						switch sv.Type().Kind() {
+						case reflect.Ptr: // Proto struct (e.g., *T)
+							DiscardUnknown(sv.Interface().(Message))
+						}
+					}
+				}
+			}
+		default:
+			continue
+		}
+		di.fields = append(di.fields, dfi)
+	}
+
+	di.unrecognized = invalidField
+	if f, ok := t.FieldByName("XXX_unrecognized"); ok {
+		if f.Type != reflect.TypeOf([]byte{}) {
+			panic("expected XXX_unrecognized to be of type []byte")
+		}
+		di.unrecognized = toField(&f)
+	}
+
+	atomic.StoreInt32(&di.initialized, 1)
+}
+
 func discardLegacy(m Message) {
 	v := reflect.ValueOf(m)
 	if v.Kind() != reflect.Ptr || v.IsNil() {
@@ -139,7 +338,7 @@ func discardLegacy(m Message) {
 
 	// For proto2 messages, only discard unknown fields in message extensions
 	// that have been accessed via GetExtension.
-	if em, ok := extendable(m); ok {
+	if em, err := extendable(m); err == nil {
 		// Ignore lock since discardLegacy is not concurrency safe.
 		emm, _ := em.extensionsRead()
 		for _, mx := range emm {
diff --git a/vendor/github.com/golang/protobuf/proto/discard_test.go b/vendor/github.com/golang/protobuf/proto/discard_test.go
new file mode 100644
index 00000000..a2ff5509
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/discard_test.go
@@ -0,0 +1,170 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2017 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto_test
+
+import (
+	"testing"
+
+	"github.com/golang/protobuf/proto"
+
+	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
+	pb "github.com/golang/protobuf/proto/test_proto"
+)
+
+func TestDiscardUnknown(t *testing.T) {
+	tests := []struct {
+		desc     string
+		in, want proto.Message
+	}{{
+		desc: "Nil",
+		in:   nil, want: nil, // Should not panic
+	}, {
+		desc: "NilPtr",
+		in:   (*proto3pb.Message)(nil), want: (*proto3pb.Message)(nil), // Should not panic
+	}, {
+		desc: "Nested",
+		in: &proto3pb.Message{
+			Name:             "Aaron",
+			Nested:           &proto3pb.Nested{Cute: true, XXX_unrecognized: []byte("blah")},
+			XXX_unrecognized: []byte("blah"),
+		},
+		want: &proto3pb.Message{
+			Name:   "Aaron",
+			Nested: &proto3pb.Nested{Cute: true},
+		},
+	}, {
+		desc: "Slice",
+		in: &proto3pb.Message{
+			Name: "Aaron",
+			Children: []*proto3pb.Message{
+				{Name: "Sarah", XXX_unrecognized: []byte("blah")},
+				{Name: "Abraham", XXX_unrecognized: []byte("blah")},
+			},
+			XXX_unrecognized: []byte("blah"),
+		},
+		want: &proto3pb.Message{
+			Name: "Aaron",
+			Children: []*proto3pb.Message{
+				{Name: "Sarah"},
+				{Name: "Abraham"},
+			},
+		},
+	}, {
+		desc: "OneOf",
+		in: &pb.Communique{
+			Union: &pb.Communique_Msg{&pb.Strings{
+				StringField:      proto.String("123"),
+				XXX_unrecognized: []byte("blah"),
+			}},
+			XXX_unrecognized: []byte("blah"),
+		},
+		want: &pb.Communique{
+			Union: &pb.Communique_Msg{&pb.Strings{StringField: proto.String("123")}},
+		},
+	}, {
+		desc: "Map",
+		in: &pb.MessageWithMap{MsgMapping: map[int64]*pb.FloatingPoint{
+			0x4002: &pb.FloatingPoint{
+				Exact:            proto.Bool(true),
+				XXX_unrecognized: []byte("blah"),
+			},
+		}},
+		want: &pb.MessageWithMap{MsgMapping: map[int64]*pb.FloatingPoint{
+			0x4002: &pb.FloatingPoint{Exact: proto.Bool(true)},
+		}},
+	}, {
+		desc: "Extension",
+		in: func() proto.Message {
+			m := &pb.MyMessage{
+				Count: proto.Int32(42),
+				Somegroup: &pb.MyMessage_SomeGroup{
+					GroupField:       proto.Int32(6),
+					XXX_unrecognized: []byte("blah"),
+				},
+				XXX_unrecognized: []byte("blah"),
+			}
+			proto.SetExtension(m, pb.E_Ext_More, &pb.Ext{
+				Data:             proto.String("extension"),
+				XXX_unrecognized: []byte("blah"),
+			})
+			return m
+		}(),
+		want: func() proto.Message {
+			m := &pb.MyMessage{
+				Count:     proto.Int32(42),
+				Somegroup: &pb.MyMessage_SomeGroup{GroupField: proto.Int32(6)},
+			}
+			proto.SetExtension(m, pb.E_Ext_More, &pb.Ext{Data: proto.String("extension")})
+			return m
+		}(),
+	}}
+
+	// Test the legacy code path.
+	for _, tt := range tests {
+		// Clone the input so that we don't alter the original.
+		in := tt.in
+		if in != nil {
+			in = proto.Clone(tt.in)
+		}
+
+		var m LegacyMessage
+		m.Message, _ = in.(*proto3pb.Message)
+		m.Communique, _ = in.(*pb.Communique)
+		m.MessageWithMap, _ = in.(*pb.MessageWithMap)
+		m.MyMessage, _ = in.(*pb.MyMessage)
+		proto.DiscardUnknown(&m)
+		if !proto.Equal(in, tt.want) {
+			t.Errorf("test %s/Legacy, expected unknown fields to be discarded\ngot  %v\nwant %v", tt.desc, in, tt.want)
+		}
+	}
+
+	for _, tt := range tests {
+		proto.DiscardUnknown(tt.in)
+		if !proto.Equal(tt.in, tt.want) {
+			t.Errorf("test %s, expected unknown fields to be discarded\ngot  %v\nwant %v", tt.desc, tt.in, tt.want)
+		}
+	}
+}
+
+// LegacyMessage is a proto.Message that has several nested messages.
+// This does not have the XXX_DiscardUnknown method and so forces DiscardUnknown
+// to use the legacy fallback logic.
+type LegacyMessage struct {
+	Message        *proto3pb.Message
+	Communique     *pb.Communique
+	MessageWithMap *pb.MessageWithMap
+	MyMessage      *pb.MyMessage
+}
+
+func (m *LegacyMessage) Reset()         { *m = LegacyMessage{} }
+func (m *LegacyMessage) String() string { return proto.CompactTextString(m) }
+func (*LegacyMessage) ProtoMessage()    {}
diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go
index 8b84d1b2..c27d35f8 100644
--- a/vendor/github.com/golang/protobuf/proto/encode.go
+++ b/vendor/github.com/golang/protobuf/proto/encode.go
@@ -39,7 +39,6 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
-	"sort"
 )
 
 // RequiredNotSetError is the error returned if Marshal is called with
@@ -82,10 +81,6 @@ var (
 
 const maxVarintBytes = 10 // maximum length of a varint
 
-// maxMarshalSize is the largest allowed size of an encoded protobuf,
-// since C++ and Java use signed int32s for the size.
-const maxMarshalSize = 1<<31 - 1
-
 // EncodeVarint returns the varint encoding of x.
 // This is the format for the
 // int32, int64, uint32, uint64, bool, and enum
@@ -119,18 +114,27 @@ func (p *Buffer) EncodeVarint(x uint64) error {
 
 // SizeVarint returns the varint encoding size of an integer.
 func SizeVarint(x uint64) int {
-	return sizeVarint(x)
-}
-
-func sizeVarint(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
+	switch {
+	case x < 1<<7:
+		return 1
+	case x < 1<<14:
+		return 2
+	case x < 1<<21:
+		return 3
+	case x < 1<<28:
+		return 4
+	case x < 1<<35:
+		return 5
+	case x < 1<<42:
+		return 6
+	case x < 1<<49:
+		return 7
+	case x < 1<<56:
+		return 8
+	case x < 1<<63:
+		return 9
+	}
+	return 10
 }
 
 // EncodeFixed64 writes a 64-bit integer to the Buffer.
@@ -149,10 +153,6 @@ func (p *Buffer) EncodeFixed64(x uint64) error {
 	return nil
 }
 
-func sizeFixed64(x uint64) int {
-	return 8
-}
-
 // EncodeFixed32 writes a 32-bit integer to the Buffer.
 // This is the format for the
 // fixed32, sfixed32, and float protocol buffer types.
@@ -165,20 +165,12 @@ func (p *Buffer) EncodeFixed32(x uint64) error {
 	return nil
 }
 
-func sizeFixed32(x uint64) int {
-	return 4
-}
-
 // EncodeZigzag64 writes a zigzag-encoded 64-bit integer
 // to the Buffer.
 // This is the format used for the sint64 protocol buffer type.
 func (p *Buffer) EncodeZigzag64(x uint64) error {
 	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint((x << 1) ^ uint64((int64(x) >> 63)))
-}
-
-func sizeZigzag64(x uint64) int {
-	return sizeVarint((x << 1) ^ uint64((int64(x) >> 63)))
+	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
 
 // EncodeZigzag32 writes a zigzag-encoded 32-bit integer
@@ -189,10 +181,6 @@ func (p *Buffer) EncodeZigzag32(x uint64) error {
 	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
 }
 
-func sizeZigzag32(x uint64) int {
-	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
 // EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
 // This is the format used for the bytes protocol buffer
 // type and for embedded messages.
@@ -202,11 +190,6 @@ func (p *Buffer) EncodeRawBytes(b []byte) error {
 	return nil
 }
 
-func sizeRawBytes(b []byte) int {
-	return sizeVarint(uint64(len(b))) +
-		len(b)
-}
-
 // EncodeStringBytes writes an encoded string to the Buffer.
 // This is the format used for the proto2 string type.
 func (p *Buffer) EncodeStringBytes(s string) error {
@@ -215,319 +198,17 @@ func (p *Buffer) EncodeStringBytes(s string) error {
 	return nil
 }
 
-func sizeStringBytes(s string) int {
-	return sizeVarint(uint64(len(s))) +
-		len(s)
-}
-
 // Marshaler is the interface representing objects that can marshal themselves.
 type Marshaler interface {
 	Marshal() ([]byte, error)
 }
 
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, returning the data.
-func Marshal(pb Message) ([]byte, error) {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		return m.Marshal()
-	}
-	p := NewBuffer(nil)
-	err := p.Marshal(pb)
-	if p.buf == nil && err == nil {
-		// Return a non-nil slice on success.
-		return []byte{}, nil
-	}
-	return p.buf, err
-}
-
 // EncodeMessage writes the protocol buffer to the Buffer,
 // prefixed by a varint-encoded length.
 func (p *Buffer) EncodeMessage(pb Message) error {
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		var state errorState
-		err = p.enc_len_struct(GetProperties(t.Elem()), base, &state)
-	}
-	return err
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, writing the result to the
-// Buffer.
-func (p *Buffer) Marshal(pb Message) error {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		data, err := m.Marshal()
-		p.buf = append(p.buf, data...)
-		return err
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		err = p.enc_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		(stats).Encode++ // Parens are to work around a goimports bug.
-	}
-
-	if len(p.buf) > maxMarshalSize {
-		return ErrTooLarge
-	}
-	return err
-}
-
-// Size returns the encoded size of a protocol buffer.
-func Size(pb Message) (n int) {
-	// Can the object marshal itself?  If so, Size is slow.
-	// TODO: add Size to Marshaler, or add a Sizer interface.
-	if m, ok := pb.(Marshaler); ok {
-		b, _ := m.Marshal()
-		return len(b)
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return 0
-	}
-	if err == nil {
-		n = size_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		(stats).Size++ // Parens are to work around a goimports bug.
-	}
-
-	return
-}
-
-// Individual type encoders.
-
-// Encode a bool.
-func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := 0
-	if *v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, 1)
-	return nil
-}
-
-func size_bool(p *Properties, base structPointer) int {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-func size_proto3_bool(p *Properties, base structPointer) int {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v && !p.oneof {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode an int32.
-func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a uint32.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := word32_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := word32_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode an int64.
-func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return ErrNil
-	}
-	x := word64_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return 0
-	}
-	x := word64_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-func size_proto3_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a string.
-func (o *Buffer) enc_string(p *Properties, base structPointer) error {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := *v
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return 0
-	}
-	x := *v
-	n += len(p.tagcode)
-	n += sizeStringBytes(x)
-	return
-}
-
-func size_proto3_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
+	siz := Size(pb)
+	p.EncodeVarint(uint64(siz))
+	return p.Marshal(pb)
 }
 
 // All protocol buffer fields are nillable, but be careful.
@@ -538,825 +219,3 @@ func isNil(v reflect.Value) bool {
 	}
 	return false
 }
-
-// Encode a message struct.
-func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return state.err
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-func size_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a group struct.
-func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return ErrNil
-	}
-
-	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	err := o.enc_struct(p.sprop, b)
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return state.err
-}
-
-func size_struct_group(p *Properties, base structPointer) (n int) {
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return 0
-	}
-
-	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	n += size_struct(p.sprop, b)
-	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return
-}
-
-// Encode a slice of bools ([]bool).
-func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	for _, x := range s {
-		o.buf = append(o.buf, p.tagcode...)
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_bool(p *Properties, base structPointer) int {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
-}
-
-// Encode a slice of bools ([]bool) in packed format.
-func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
-	for _, x := range s {
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(l))
-	n += l // each bool takes exactly one byte
-	return
-}
-
-// Encode a slice of bytes ([]byte).
-func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func size_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-// Encode a slice of int32s ([]int32).
-func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(buf, uint64(x))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		bufSize += p.valSize(uint64(x))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of uint32s ([]uint32).
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := s.Index(i)
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := s.Index(i)
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of uint32s ([]uint32) in packed format.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, uint64(s.Index(i)))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(uint64(s.Index(i)))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of int64s ([]int64).
-func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		p.valEnc(o, s.Index(i))
-	}
-	return nil
-}
-
-func size_slice_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		n += p.valSize(s.Index(i))
-	}
-	return
-}
-
-// Encode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, s.Index(i))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(s.Index(i))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of slice of bytes ([][]byte).
-func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return 0
-	}
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeRawBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of strings ([]string).
-func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeStringBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_string(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeStringBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of message structs ([]*struct).
-func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-	}
-	return state.err
-}
-
-func size_slice_struct_message(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-// Encode a slice of group structs ([]*struct).
-func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return errRepeatedHasNil
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-
-		err := o.enc_struct(p.sprop, b)
-
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	}
-	return state.err
-}
-
-func size_slice_struct_group(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return // return size up to this point
-		}
-
-		n += size_struct(p.sprop, b)
-	}
-	return
-}
-
-// Encode an extension map.
-func (o *Buffer) enc_map(p *Properties, base structPointer) error {
-	exts := structPointer_ExtMap(base, p.field)
-	if err := encodeExtensionsMap(*exts); err != nil {
-		return err
-	}
-
-	return o.enc_map_body(*exts)
-}
-
-func (o *Buffer) enc_exts(p *Properties, base structPointer) error {
-	exts := structPointer_Extensions(base, p.field)
-
-	v, mu := exts.extensionsRead()
-	if v == nil {
-		return nil
-	}
-
-	mu.Lock()
-	defer mu.Unlock()
-	if err := encodeExtensionsMap(v); err != nil {
-		return err
-	}
-
-	return o.enc_map_body(v)
-}
-
-func (o *Buffer) enc_map_body(v map[int32]Extension) error {
-	// Fast-path for common cases: zero or one extensions.
-	if len(v) <= 1 {
-		for _, e := range v {
-			o.buf = append(o.buf, e.enc...)
-		}
-		return nil
-	}
-
-	// Sort keys to provide a deterministic encoding.
-	keys := make([]int, 0, len(v))
-	for k := range v {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-
-	for _, k := range keys {
-		o.buf = append(o.buf, v[int32(k)].enc...)
-	}
-	return nil
-}
-
-func size_map(p *Properties, base structPointer) int {
-	v := structPointer_ExtMap(base, p.field)
-	return extensionsMapSize(*v)
-}
-
-func size_exts(p *Properties, base structPointer) int {
-	v := structPointer_Extensions(base, p.field)
-	return extensionsSize(v)
-}
-
-// Encode a map field.
-func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
-	var state errorState // XXX: or do we need to plumb this through?
-
-	/*
-		A map defined as
-			map<key_type, value_type> map_field = N;
-		is encoded in the same way as
-			message MapFieldEntry {
-				key_type key = 1;
-				value_type value = 2;
-			}
-			repeated MapFieldEntry map_field = N;
-	*/
-
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-	if v.Len() == 0 {
-		return nil
-	}
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	enc := func() error {
-		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
-			return err
-		}
-		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil && err != ErrNil {
-			return err
-		}
-		return nil
-	}
-
-	// Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		o.buf = append(o.buf, p.tagcode...)
-		if err := o.enc_len_thing(enc, &state); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func size_new_map(p *Properties, base structPointer) int {
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	n := 0
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		// Tag codes for key and val are the responsibility of the sub-sizer.
-		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
-		valsize := p.mvalprop.size(p.mvalprop, valbase)
-		entry := keysize + valsize
-		// Add on tag code and length of map entry itself.
-		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
-	}
-	return n
-}
-
-// mapEncodeScratch returns a new reflect.Value matching the map's value type,
-// and a structPointer suitable for passing to an encoder or sizer.
-func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
-
-	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
-	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
-	keyptr.Set(keycopy.Addr())                                  //
-	keybase = toStructPointer(keyptr.Addr())                    // **K
-
-	// Value types are more varied and require special handling.
-	switch mapType.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
-		valbase = toStructPointer(valcopy.Addr())
-	case reflect.Ptr:
-		// message; the generated field type is map[K]*Msg (so V is *Msg),
-		// so we only need one level of indirection.
-		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
-		valbase = toStructPointer(valcopy.Addr())
-	default:
-		// everything else
-		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
-		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
-		valptr.Set(valcopy.Addr())                                  //
-		valbase = toStructPointer(valptr.Addr())                    // **V
-	}
-	return
-}
-
-// Encode a struct.
-func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
-	var state errorState
-	// Encode fields in tag order so that decoders may use optimizations
-	// that depend on the ordering.
-	// https://developers.google.com/protocol-buffers/docs/encoding#order
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.enc != nil {
-			err := p.enc(o, p, base)
-			if err != nil {
-				if err == ErrNil {
-					if p.Required && state.err == nil {
-						state.err = &RequiredNotSetError{p.Name}
-					}
-				} else if err == errRepeatedHasNil {
-					// Give more context to nil values in repeated fields.
-					return errors.New("repeated field " + p.OrigName + " has nil element")
-				} else if !state.shouldContinue(err, p) {
-					return err
-				}
-			}
-			if len(o.buf) > maxMarshalSize {
-				return ErrTooLarge
-			}
-		}
-	}
-
-	// Do oneof fields.
-	if prop.oneofMarshaler != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		if err := prop.oneofMarshaler(m, o); err == ErrNil {
-			return errOneofHasNil
-		} else if err != nil {
-			return err
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		if len(o.buf)+len(v) > maxMarshalSize {
-			return ErrTooLarge
-		}
-		if len(v) > 0 {
-			o.buf = append(o.buf, v...)
-		}
-	}
-
-	return state.err
-}
-
-func size_struct(prop *StructProperties, base structPointer) (n int) {
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.size != nil {
-			n += p.size(p, base)
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		n += len(v)
-	}
-
-	// Factor in any oneof fields.
-	if prop.oneofSizer != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		n += prop.oneofSizer(m)
-	}
-
-	return
-}
-
-var zeroes [20]byte // longer than any conceivable sizeVarint
-
-// Encode a struct, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
-	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
-}
-
-// Encode something, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
-	iLen := len(o.buf)
-	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
-	iMsg := len(o.buf)
-	err := enc()
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	lMsg := len(o.buf) - iMsg
-	lLen := sizeVarint(uint64(lMsg))
-	switch x := lLen - (iMsg - iLen); {
-	case x > 0: // actual length is x bytes larger than the space we reserved
-		// Move msg x bytes right.
-		o.buf = append(o.buf, zeroes[:x]...)
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-	case x < 0: // actual length is x bytes smaller than the space we reserved
-		// Move msg x bytes left.
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-		o.buf = o.buf[:len(o.buf)+x] // x is negative
-	}
-	// Encode the length in the reserved space.
-	o.buf = o.buf[:iLen]
-	o.EncodeVarint(uint64(lMsg))
-	o.buf = o.buf[:len(o.buf)+lMsg]
-	return state.err
-}
-
-// errorState maintains the first error that occurs and updates that error
-// with additional context.
-type errorState struct {
-	err error
-}
-
-// shouldContinue reports whether encoding should continue upon encountering the
-// given error. If the error is RequiredNotSetError, shouldContinue returns true
-// and, if this is the first appearance of that error, remembers it for future
-// reporting.
-//
-// If prop is not nil, it may update any error with additional context about the
-// field with the error.
-func (s *errorState) shouldContinue(err error, prop *Properties) bool {
-	// Ignore unset required fields.
-	reqNotSet, ok := err.(*RequiredNotSetError)
-	if !ok {
-		return false
-	}
-	if s.err == nil {
-		if prop != nil {
-			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
-		}
-		s.err = err
-	}
-	return true
-}
diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go
index 2ed1cf59..d4db5a1c 100644
--- a/vendor/github.com/golang/protobuf/proto/equal.go
+++ b/vendor/github.com/golang/protobuf/proto/equal.go
@@ -109,15 +109,6 @@ func equalStruct(v1, v2 reflect.Value) bool {
 				// set/unset mismatch
 				return false
 			}
-			b1, ok := f1.Interface().(raw)
-			if ok {
-				b2 := f2.Interface().(raw)
-				// RawMessage
-				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
-					return false
-				}
-				continue
-			}
 			f1, f2 = f1.Elem(), f2.Elem()
 		}
 		if !equalAny(f1, f2, sprop.Prop[i]) {
@@ -146,11 +137,7 @@ func equalStruct(v1, v2 reflect.Value) bool {
 
 	u1 := uf.Bytes()
 	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
-	if !bytes.Equal(u1, u2) {
-		return false
-	}
-
-	return true
+	return bytes.Equal(u1, u2)
 }
 
 // v1 and v2 are known to have the same type.
@@ -261,6 +248,15 @@ func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
 
 		m1, m2 := e1.value, e2.value
 
+		if m1 == nil && m2 == nil {
+			// Both have only encoded form.
+			if bytes.Equal(e1.enc, e2.enc) {
+				continue
+			}
+			// The bytes are different, but the extensions might still be
+			// equal. We need to decode them to compare.
+		}
+
 		if m1 != nil && m2 != nil {
 			// Both are unencoded.
 			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
@@ -276,8 +272,12 @@ func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
 			desc = m[extNum]
 		}
 		if desc == nil {
+			// If both have only encoded form and the bytes are the same,
+			// it is handled above. We get here when the bytes are different.
+			// We don't know how to decode it, so just compare them as byte
+			// slices.
 			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
-			continue
+			return false
 		}
 		var err error
 		if m1 == nil {
diff --git a/vendor/github.com/golang/protobuf/proto/equal_test.go b/vendor/github.com/golang/protobuf/proto/equal_test.go
index a2febb39..93ff88f3 100644
--- a/vendor/github.com/golang/protobuf/proto/equal_test.go
+++ b/vendor/github.com/golang/protobuf/proto/equal_test.go
@@ -36,7 +36,7 @@ import (
 
 	. "github.com/golang/protobuf/proto"
 	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
+	pb "github.com/golang/protobuf/proto/test_proto"
 )
 
 // Four identical base messages.
@@ -45,6 +45,9 @@ var messageWithoutExtension = &pb.MyMessage{Count: Int32(7)}
 var messageWithExtension1a = &pb.MyMessage{Count: Int32(7)}
 var messageWithExtension1b = &pb.MyMessage{Count: Int32(7)}
 var messageWithExtension2 = &pb.MyMessage{Count: Int32(7)}
+var messageWithExtension3a = &pb.MyMessage{Count: Int32(7)}
+var messageWithExtension3b = &pb.MyMessage{Count: Int32(7)}
+var messageWithExtension3c = &pb.MyMessage{Count: Int32(7)}
 
 // Two messages with non-message extensions.
 var messageWithInt32Extension1 = &pb.MyMessage{Count: Int32(8)}
@@ -83,6 +86,20 @@ func init() {
 	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(24)); err != nil {
 		panic("SetExtension on Int32-2 failed: " + err.Error())
 	}
+
+	// messageWithExtension3{a,b,c} has unregistered extension.
+	if RegisteredExtensions(messageWithExtension3a)[200] != nil {
+		panic("expect extension 200 unregistered")
+	}
+	bytes := []byte{
+		0xc0, 0x0c, 0x01, // id=200, wiretype=0 (varint), data=1
+	}
+	bytes2 := []byte{
+		0xc0, 0x0c, 0x02, // id=200, wiretype=0 (varint), data=2
+	}
+	SetRawExtension(messageWithExtension3a, 200, bytes)
+	SetRawExtension(messageWithExtension3b, 200, bytes)
+	SetRawExtension(messageWithExtension3c, 200, bytes2)
 }
 
 var EqualTests = []struct {
@@ -142,6 +159,9 @@ var EqualTests = []struct {
 	{"int32 extension vs. itself", messageWithInt32Extension1, messageWithInt32Extension1, true},
 	{"int32 extension vs. a different int32", messageWithInt32Extension1, messageWithInt32Extension2, false},
 
+	{"unregistered extension same", messageWithExtension3a, messageWithExtension3b, true},
+	{"unregistered extension different", messageWithExtension3a, messageWithExtension3c, false},
+
 	{
 		"message with group",
 		&pb.MyMessage{
diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go
index eaad2183..816a3b9d 100644
--- a/vendor/github.com/golang/protobuf/proto/extensions.go
+++ b/vendor/github.com/golang/protobuf/proto/extensions.go
@@ -38,6 +38,7 @@ package proto
 import (
 	"errors"
 	"fmt"
+	"io"
 	"reflect"
 	"strconv"
 	"sync"
@@ -91,14 +92,29 @@ func (n notLocker) Unlock() {}
 // extendable returns the extendableProto interface for the given generated proto message.
 // If the proto message has the old extension format, it returns a wrapper that implements
 // the extendableProto interface.
-func extendable(p interface{}) (extendableProto, bool) {
-	if ep, ok := p.(extendableProto); ok {
-		return ep, ok
-	}
-	if ep, ok := p.(extendableProtoV1); ok {
-		return extensionAdapter{ep}, ok
+func extendable(p interface{}) (extendableProto, error) {
+	switch p := p.(type) {
+	case extendableProto:
+		if isNilPtr(p) {
+			return nil, fmt.Errorf("proto: nil %T is not extendable", p)
+		}
+		return p, nil
+	case extendableProtoV1:
+		if isNilPtr(p) {
+			return nil, fmt.Errorf("proto: nil %T is not extendable", p)
+		}
+		return extensionAdapter{p}, nil
 	}
-	return nil, false
+	// Don't allocate a specific error containing %T:
+	// this is the hot path for Clone and MarshalText.
+	return nil, errNotExtendable
+}
+
+var errNotExtendable = errors.New("proto: not an extendable proto.Message")
+
+func isNilPtr(x interface{}) bool {
+	v := reflect.ValueOf(x)
+	return v.Kind() == reflect.Ptr && v.IsNil()
 }
 
 // XXX_InternalExtensions is an internal representation of proto extensions.
@@ -143,9 +159,6 @@ func (e *XXX_InternalExtensions) extensionsRead() (map[int32]Extension, sync.Loc
 	return e.p.extensionMap, &e.p.mu
 }
 
-var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
-var extendableProtoV1Type = reflect.TypeOf((*extendableProtoV1)(nil)).Elem()
-
 // ExtensionDesc represents an extension specification.
 // Used in generated code from the protocol compiler.
 type ExtensionDesc struct {
@@ -179,8 +192,8 @@ type Extension struct {
 
 // SetRawExtension is for testing only.
 func SetRawExtension(base Message, id int32, b []byte) {
-	epb, ok := extendable(base)
-	if !ok {
+	epb, err := extendable(base)
+	if err != nil {
 		return
 	}
 	extmap := epb.extensionsWrite()
@@ -205,7 +218,7 @@ func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
 		pbi = ea.extendableProtoV1
 	}
 	if a, b := reflect.TypeOf(pbi), reflect.TypeOf(extension.ExtendedType); a != b {
-		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
+		return fmt.Errorf("proto: bad extended type; %v does not extend %v", b, a)
 	}
 	// Check the range.
 	if !isExtensionField(pb, extension.Field) {
@@ -250,85 +263,11 @@ func extensionProperties(ed *ExtensionDesc) *Properties {
 	return prop
 }
 
-// encode encodes any unmarshaled (unencoded) extensions in e.
-func encodeExtensions(e *XXX_InternalExtensions) error {
-	m, mu := e.extensionsRead()
-	if m == nil {
-		return nil // fast path
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	return encodeExtensionsMap(m)
-}
-
-// encode encodes any unmarshaled (unencoded) extensions in e.
-func encodeExtensionsMap(m map[int32]Extension) error {
-	for k, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		p := NewBuffer(nil)
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		if err := props.enc(p, props, toStructPointer(x)); err != nil {
-			return err
-		}
-		e.enc = p.buf
-		m[k] = e
-	}
-	return nil
-}
-
-func extensionsSize(e *XXX_InternalExtensions) (n int) {
-	m, mu := e.extensionsRead()
-	if m == nil {
-		return 0
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	return extensionsMapSize(m)
-}
-
-func extensionsMapSize(m map[int32]Extension) (n int) {
-	for _, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			n += len(e.enc)
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		n += props.size(props, toStructPointer(x))
-	}
-	return
-}
-
 // HasExtension returns whether the given extension is present in pb.
 func HasExtension(pb Message, extension *ExtensionDesc) bool {
 	// TODO: Check types, field numbers, etc.?
-	epb, ok := extendable(pb)
-	if !ok {
+	epb, err := extendable(pb)
+	if err != nil {
 		return false
 	}
 	extmap, mu := epb.extensionsRead()
@@ -336,15 +275,15 @@ func HasExtension(pb Message, extension *ExtensionDesc) bool {
 		return false
 	}
 	mu.Lock()
-	_, ok = extmap[extension.Field]
+	_, ok := extmap[extension.Field]
 	mu.Unlock()
 	return ok
 }
 
 // ClearExtension removes the given extension from pb.
 func ClearExtension(pb Message, extension *ExtensionDesc) {
-	epb, ok := extendable(pb)
-	if !ok {
+	epb, err := extendable(pb)
+	if err != nil {
 		return
 	}
 	// TODO: Check types, field numbers, etc.?
@@ -352,16 +291,26 @@ func ClearExtension(pb Message, extension *ExtensionDesc) {
 	delete(extmap, extension.Field)
 }
 
-// GetExtension parses and returns the given extension of pb.
-// If the extension is not present and has no default value it returns ErrMissingExtension.
+// GetExtension retrieves a proto2 extended field from pb.
+//
+// If the descriptor is type complete (i.e., ExtensionDesc.ExtensionType is non-nil),
+// then GetExtension parses the encoded field and returns a Go value of the specified type.
+// If the field is not present, then the default value is returned (if one is specified),
+// otherwise ErrMissingExtension is reported.
+//
+// If the descriptor is not type complete (i.e., ExtensionDesc.ExtensionType is nil),
+// then GetExtension returns the raw encoded bytes of the field extension.
 func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, errors.New("proto: not an extendable proto")
+	epb, err := extendable(pb)
+	if err != nil {
+		return nil, err
 	}
 
-	if err := checkExtensionTypes(epb, extension); err != nil {
-		return nil, err
+	if extension.ExtendedType != nil {
+		// can only check type if this is a complete descriptor
+		if err := checkExtensionTypes(epb, extension); err != nil {
+			return nil, err
+		}
 	}
 
 	emap, mu := epb.extensionsRead()
@@ -388,6 +337,11 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
 		return e.value, nil
 	}
 
+	if extension.ExtensionType == nil {
+		// incomplete descriptor
+		return e.enc, nil
+	}
+
 	v, err := decodeExtension(e.enc, extension)
 	if err != nil {
 		return nil, err
@@ -405,6 +359,11 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
 // defaultExtensionValue returns the default value for extension.
 // If no default for an extension is defined ErrMissingExtension is returned.
 func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
+	if extension.ExtensionType == nil {
+		// incomplete descriptor, so no default
+		return nil, ErrMissingExtension
+	}
+
 	t := reflect.TypeOf(extension.ExtensionType)
 	props := extensionProperties(extension)
 
@@ -439,31 +398,28 @@ func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
 
 // decodeExtension decodes an extension encoded in b.
 func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
-	o := NewBuffer(b)
-
 	t := reflect.TypeOf(extension.ExtensionType)
-
-	props := extensionProperties(extension)
+	unmarshal := typeUnmarshaler(t, extension.Tag)
 
 	// t is a pointer to a struct, pointer to basic type or a slice.
-	// Allocate a "field" to store the pointer/slice itself; the
-	// pointer/slice will be stored here. We pass
-	// the address of this field to props.dec.
-	// This passes a zero field and a *t and lets props.dec
-	// interpret it as a *struct{ x t }.
+	// Allocate space to store the pointer/slice.
 	value := reflect.New(t).Elem()
 
+	var err error
 	for {
-		// Discard wire type and field number varint. It isn't needed.
-		if _, err := o.DecodeVarint(); err != nil {
-			return nil, err
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
 		}
+		b = b[n:]
+		wire := int(x) & 7
 
-		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
+		b, err = unmarshal(b, valToPointer(value.Addr()), wire)
+		if err != nil {
 			return nil, err
 		}
 
-		if o.index >= len(o.buf) {
+		if len(b) == 0 {
 			break
 		}
 	}
@@ -473,9 +429,9 @@ func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
 // GetExtensions returns a slice of the extensions present in pb that are also listed in es.
 // The returned slice has the same length as es; missing extensions will appear as nil elements.
 func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, errors.New("proto: not an extendable proto")
+	epb, err := extendable(pb)
+	if err != nil {
+		return nil, err
 	}
 	extensions = make([]interface{}, len(es))
 	for i, e := range es {
@@ -494,9 +450,9 @@ func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, e
 // For non-registered extensions, ExtensionDescs returns an incomplete descriptor containing
 // just the Field field, which defines the extension's field number.
 func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, fmt.Errorf("proto: %T is not an extendable proto.Message", pb)
+	epb, err := extendable(pb)
+	if err != nil {
+		return nil, err
 	}
 	registeredExtensions := RegisteredExtensions(pb)
 
@@ -523,9 +479,9 @@ func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
 
 // SetExtension sets the specified extension of pb to the specified value.
 func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error {
-	epb, ok := extendable(pb)
-	if !ok {
-		return errors.New("proto: not an extendable proto")
+	epb, err := extendable(pb)
+	if err != nil {
+		return err
 	}
 	if err := checkExtensionTypes(epb, extension); err != nil {
 		return err
@@ -550,8 +506,8 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error
 
 // ClearAllExtensions clears all extensions from pb.
 func ClearAllExtensions(pb Message) {
-	epb, ok := extendable(pb)
-	if !ok {
+	epb, err := extendable(pb)
+	if err != nil {
 		return
 	}
 	m := epb.extensionsWrite()
diff --git a/vendor/github.com/golang/protobuf/proto/extensions_test.go b/vendor/github.com/golang/protobuf/proto/extensions_test.go
index b6d9114c..dc69fe97 100644
--- a/vendor/github.com/golang/protobuf/proto/extensions_test.go
+++ b/vendor/github.com/golang/protobuf/proto/extensions_test.go
@@ -34,12 +34,14 @@ package proto_test
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"reflect"
 	"sort"
+	"strings"
 	"testing"
 
 	"github.com/golang/protobuf/proto"
-	pb "github.com/golang/protobuf/proto/testdata"
+	pb "github.com/golang/protobuf/proto/test_proto"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -64,7 +66,107 @@ func TestGetExtensionsWithMissingExtensions(t *testing.T) {
 	}
 }
 
-func TestExtensionDescsWithMissingExtensions(t *testing.T) {
+func TestGetExtensionWithEmptyBuffer(t *testing.T) {
+	// Make sure that GetExtension returns an error if its
+	// undecoded buffer is empty.
+	msg := &pb.MyMessage{}
+	proto.SetRawExtension(msg, pb.E_Ext_More.Field, []byte{})
+	_, err := proto.GetExtension(msg, pb.E_Ext_More)
+	if want := io.ErrUnexpectedEOF; err != want {
+		t.Errorf("unexpected error in GetExtension from empty buffer: got %v, want %v", err, want)
+	}
+}
+
+func TestGetExtensionForIncompleteDesc(t *testing.T) {
+	msg := &pb.MyMessage{Count: proto.Int32(0)}
+	extdesc1 := &proto.ExtensionDesc{
+		ExtendedType:  (*pb.MyMessage)(nil),
+		ExtensionType: (*bool)(nil),
+		Field:         123456789,
+		Name:          "a.b",
+		Tag:           "varint,123456789,opt",
+	}
+	ext1 := proto.Bool(true)
+	if err := proto.SetExtension(msg, extdesc1, ext1); err != nil {
+		t.Fatalf("Could not set ext1: %s", err)
+	}
+	extdesc2 := &proto.ExtensionDesc{
+		ExtendedType:  (*pb.MyMessage)(nil),
+		ExtensionType: ([]byte)(nil),
+		Field:         123456790,
+		Name:          "a.c",
+		Tag:           "bytes,123456790,opt",
+	}
+	ext2 := []byte{0, 1, 2, 3, 4, 5, 6, 7}
+	if err := proto.SetExtension(msg, extdesc2, ext2); err != nil {
+		t.Fatalf("Could not set ext2: %s", err)
+	}
+	extdesc3 := &proto.ExtensionDesc{
+		ExtendedType:  (*pb.MyMessage)(nil),
+		ExtensionType: (*pb.Ext)(nil),
+		Field:         123456791,
+		Name:          "a.d",
+		Tag:           "bytes,123456791,opt",
+	}
+	ext3 := &pb.Ext{Data: proto.String("foo")}
+	if err := proto.SetExtension(msg, extdesc3, ext3); err != nil {
+		t.Fatalf("Could not set ext3: %s", err)
+	}
+
+	b, err := proto.Marshal(msg)
+	if err != nil {
+		t.Fatalf("Could not marshal msg: %v", err)
+	}
+	if err := proto.Unmarshal(b, msg); err != nil {
+		t.Fatalf("Could not unmarshal into msg: %v", err)
+	}
+
+	var expected proto.Buffer
+	if err := expected.EncodeVarint(uint64((extdesc1.Field << 3) | proto.WireVarint)); err != nil {
+		t.Fatalf("failed to compute expected prefix for ext1: %s", err)
+	}
+	if err := expected.EncodeVarint(1 /* bool true */); err != nil {
+		t.Fatalf("failed to compute expected value for ext1: %s", err)
+	}
+
+	if b, err := proto.GetExtension(msg, &proto.ExtensionDesc{Field: extdesc1.Field}); err != nil {
+		t.Fatalf("Failed to get raw value for ext1: %s", err)
+	} else if !reflect.DeepEqual(b, expected.Bytes()) {
+		t.Fatalf("Raw value for ext1: got %v, want %v", b, expected.Bytes())
+	}
+
+	expected = proto.Buffer{} // reset
+	if err := expected.EncodeVarint(uint64((extdesc2.Field << 3) | proto.WireBytes)); err != nil {
+		t.Fatalf("failed to compute expected prefix for ext2: %s", err)
+	}
+	if err := expected.EncodeRawBytes(ext2); err != nil {
+		t.Fatalf("failed to compute expected value for ext2: %s", err)
+	}
+
+	if b, err := proto.GetExtension(msg, &proto.ExtensionDesc{Field: extdesc2.Field}); err != nil {
+		t.Fatalf("Failed to get raw value for ext2: %s", err)
+	} else if !reflect.DeepEqual(b, expected.Bytes()) {
+		t.Fatalf("Raw value for ext2: got %v, want %v", b, expected.Bytes())
+	}
+
+	expected = proto.Buffer{} // reset
+	if err := expected.EncodeVarint(uint64((extdesc3.Field << 3) | proto.WireBytes)); err != nil {
+		t.Fatalf("failed to compute expected prefix for ext3: %s", err)
+	}
+	if b, err := proto.Marshal(ext3); err != nil {
+		t.Fatalf("failed to compute expected value for ext3: %s", err)
+	} else if err := expected.EncodeRawBytes(b); err != nil {
+		t.Fatalf("failed to compute expected value for ext3: %s", err)
+	}
+
+	if b, err := proto.GetExtension(msg, &proto.ExtensionDesc{Field: extdesc3.Field}); err != nil {
+		t.Fatalf("Failed to get raw value for ext3: %s", err)
+	} else if !reflect.DeepEqual(b, expected.Bytes()) {
+		t.Fatalf("Raw value for ext3: got %v, want %v", b, expected.Bytes())
+	}
+}
+
+func TestExtensionDescsWithUnregisteredExtensions(t *testing.T) {
 	msg := &pb.MyMessage{Count: proto.Int32(0)}
 	extdesc1 := pb.E_Ext_More
 	if descs, err := proto.ExtensionDescs(msg); len(descs) != 0 || err != nil {
@@ -100,7 +202,7 @@ func TestExtensionDescsWithMissingExtensions(t *testing.T) {
 		t.Fatalf("proto.ExtensionDescs: got error %v", err)
 	}
 	sortExtDescs(descs)
-	wantDescs := []*proto.ExtensionDesc{extdesc1, &proto.ExtensionDesc{Field: extdesc2.Field}}
+	wantDescs := []*proto.ExtensionDesc{extdesc1, {Field: extdesc2.Field}}
 	if !reflect.DeepEqual(descs, wantDescs) {
 		t.Errorf("proto.ExtensionDescs(msg) sorted extension ids: got %+v, want %+v", descs, wantDescs)
 	}
@@ -200,7 +302,7 @@ func TestGetExtensionDefaults(t *testing.T) {
 		{pb.E_DefaultSfixed64, setInt64, int64(51)},
 		{pb.E_DefaultBool, setBool, true},
 		{pb.E_DefaultBool, setBool2, true},
-		{pb.E_DefaultString, setString, "Hello, string"},
+		{pb.E_DefaultString, setString, "Hello, string,def=foo"},
 		{pb.E_DefaultBytes, setBytes, []byte("Hello, bytes")},
 		{pb.E_DefaultEnum, setEnum, pb.DefaultsMessage_ONE},
 	}
@@ -287,6 +389,44 @@ func TestGetExtensionDefaults(t *testing.T) {
 	}
 }
 
+func TestNilMessage(t *testing.T) {
+	name := "nil interface"
+	if got, err := proto.GetExtension(nil, pb.E_Ext_More); err == nil {
+		t.Errorf("%s: got %T %v, expected to fail", name, got, got)
+	} else if !strings.Contains(err.Error(), "extendable") {
+		t.Errorf("%s: got error %v, expected not-extendable error", name, err)
+	}
+
+	// Regression tests: all functions of the Extension API
+	// used to panic when passed (*M)(nil), where M is a concrete message
+	// type.  Now they handle this gracefully as a no-op or reported error.
+	var nilMsg *pb.MyMessage
+	desc := pb.E_Ext_More
+
+	isNotExtendable := func(err error) bool {
+		return strings.Contains(fmt.Sprint(err), "not extendable")
+	}
+
+	if proto.HasExtension(nilMsg, desc) {
+		t.Error("HasExtension(nil) = true")
+	}
+
+	if _, err := proto.GetExtensions(nilMsg, []*proto.ExtensionDesc{desc}); !isNotExtendable(err) {
+		t.Errorf("GetExtensions(nil) = %q (wrong error)", err)
+	}
+
+	if _, err := proto.ExtensionDescs(nilMsg); !isNotExtendable(err) {
+		t.Errorf("ExtensionDescs(nil) = %q (wrong error)", err)
+	}
+
+	if err := proto.SetExtension(nilMsg, desc, nil); !isNotExtendable(err) {
+		t.Errorf("SetExtension(nil) = %q (wrong error)", err)
+	}
+
+	proto.ClearExtension(nilMsg, desc) // no-op
+	proto.ClearAllExtensions(nilMsg)   // no-op
+}
+
 func TestExtensionsRoundTrip(t *testing.T) {
 	msg := &pb.MyMessage{}
 	ext1 := &pb.Ext{
@@ -311,7 +451,7 @@ func TestExtensionsRoundTrip(t *testing.T) {
 	}
 	x, ok := e.(*pb.Ext)
 	if !ok {
-		t.Errorf("e has type %T, expected testdata.Ext", e)
+		t.Errorf("e has type %T, expected test_proto.Ext", e)
 	} else if *x.Data != "there" {
 		t.Errorf("SetExtension failed to overwrite, got %+v, not 'there'", x)
 	}
@@ -339,7 +479,7 @@ func TestNilExtension(t *testing.T) {
 	}
 	if err := proto.SetExtension(msg, pb.E_Ext_More, (*pb.Ext)(nil)); err == nil {
 		t.Error("expected SetExtension to fail due to a nil extension")
-	} else if want := "proto: SetExtension called with nil value of type *testdata.Ext"; err.Error() != want {
+	} else if want := fmt.Sprintf("proto: SetExtension called with nil value of type %T", new(pb.Ext)); err.Error() != want {
 		t.Errorf("expected error %v, got %v", want, err)
 	}
 	// Note: if the behavior of Marshal is ever changed to ignore nil extensions, update
@@ -402,8 +542,13 @@ func TestMarshalUnmarshalRepeatedExtension(t *testing.T) {
 		if ext == nil {
 			t.Fatalf("[%s] Invalid extension", test.name)
 		}
-		if !reflect.DeepEqual(ext, test.ext) {
-			t.Errorf("[%s] Wrong value for ComplexExtension: got: %v want: %v\n", test.name, ext, test.ext)
+		if len(ext) != len(test.ext) {
+			t.Errorf("[%s] Wrong length of ComplexExtension: got: %v want: %v\n", test.name, len(ext), len(test.ext))
+		}
+		for i := range test.ext {
+			if !proto.Equal(ext[i], test.ext[i]) {
+				t.Errorf("[%s] Wrong value for ComplexExtension[%d]: got: %v want: %v\n", test.name, i, ext[i], test.ext[i])
+			}
 		}
 	}
 }
@@ -477,8 +622,8 @@ func TestUnmarshalRepeatingNonRepeatedExtension(t *testing.T) {
 		if ext == nil {
 			t.Fatalf("[%s] Invalid extension", test.name)
 		}
-		if !reflect.DeepEqual(*ext, want) {
-			t.Errorf("[%s] Wrong value for ComplexExtension: got: %s want: %s\n", test.name, ext, want)
+		if !proto.Equal(ext, &want) {
+			t.Errorf("[%s] Wrong value for ComplexExtension: got: %s want: %s\n", test.name, ext, &want)
 		}
 	}
 }
@@ -509,19 +654,22 @@ func TestClearAllExtensions(t *testing.T) {
 }
 
 func TestMarshalRace(t *testing.T) {
-	// unregistered extension
-	desc := &proto.ExtensionDesc{
-		ExtendedType:  (*pb.MyMessage)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         101010100,
-		Name:          "emptyextension",
-		Tag:           "varint,0,opt",
+	ext := &pb.Ext{}
+	m := &pb.MyMessage{Count: proto.Int32(4)}
+	if err := proto.SetExtension(m, pb.E_Ext_More, ext); err != nil {
+		t.Fatalf("proto.SetExtension(m, desc, true): got error %q, want nil", err)
 	}
 
-	m := &pb.MyMessage{Count: proto.Int32(4)}
-	if err := proto.SetExtension(m, desc, proto.Bool(true)); err != nil {
-		t.Errorf("proto.SetExtension(m, desc, true): got error %q, want nil", err)
+	b, err := proto.Marshal(m)
+	if err != nil {
+		t.Fatalf("Could not marshal message: %v", err)
+	}
+	if err := proto.Unmarshal(b, m); err != nil {
+		t.Fatalf("Could not unmarshal message: %v", err)
 	}
+	// after Unmarshal, the extension is in undecoded form.
+	// GetExtension will decode it lazily. Make sure this does
+	// not race against Marshal.
 
 	var g errgroup.Group
 	for n := 3; n > 0; n-- {
@@ -529,6 +677,10 @@ func TestMarshalRace(t *testing.T) {
 			_, err := proto.Marshal(m)
 			return err
 		})
+		g.Go(func() error {
+			_, err := proto.GetExtension(m, pb.E_Ext_More)
+			return err
+		})
 	}
 	if err := g.Wait(); err != nil {
 		t.Fatal(err)
diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go
index 1c225504..0e2191b8 100644
--- a/vendor/github.com/golang/protobuf/proto/lib.go
+++ b/vendor/github.com/golang/protobuf/proto/lib.go
@@ -265,6 +265,7 @@ package proto
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"reflect"
@@ -273,6 +274,8 @@ import (
 	"sync"
 )
 
+var errInvalidUTF8 = errors.New("proto: invalid UTF-8 string")
+
 // Message is implemented by generated protocol buffer messages.
 type Message interface {
 	Reset()
@@ -309,16 +312,7 @@ type Buffer struct {
 	buf   []byte // encode/decode byte stream
 	index int    // read point
 
-	// pools of basic types to amortize allocation.
-	bools   []bool
-	uint32s []uint32
-	uint64s []uint64
-
-	// extra pools, only used with pointer_reflect.go
-	int32s   []int32
-	int64s   []int64
-	float32s []float32
-	float64s []float64
+	deterministic bool
 }
 
 // NewBuffer allocates a new Buffer and initializes its internal data to
@@ -343,6 +337,30 @@ func (p *Buffer) SetBuf(s []byte) {
 // Bytes returns the contents of the Buffer.
 func (p *Buffer) Bytes() []byte { return p.buf }
 
+// SetDeterministic sets whether to use deterministic serialization.
+//
+// Deterministic serialization guarantees that for a given binary, equal
+// messages will always be serialized to the same bytes. This implies:
+//
+//   - Repeated serialization of a message will return the same bytes.
+//   - Different processes of the same binary (which may be executing on
+//     different machines) will serialize equal messages to the same bytes.
+//
+// Note that the deterministic serialization is NOT canonical across
+// languages. It is not guaranteed to remain stable over time. It is unstable
+// across different builds with schema changes due to unknown fields.
+// Users who need canonical serialization (e.g., persistent storage in a
+// canonical form, fingerprinting, etc.) should define their own
+// canonicalization specification and implement their own serializer rather
+// than relying on this API.
+//
+// If deterministic serialization is requested, map entries will be sorted
+// by keys in lexographical order. This is an implementation detail and
+// subject to change.
+func (p *Buffer) SetDeterministic(deterministic bool) {
+	p.deterministic = deterministic
+}
+
 /*
  * Helper routines for simplifying the creation of optional fields of basic type.
  */
@@ -831,22 +849,12 @@ func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMes
 	return sf, false, nil
 }
 
+// mapKeys returns a sort.Interface to be used for sorting the map keys.
 // Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-
 func mapKeys(vs []reflect.Value) sort.Interface {
-	s := mapKeySorter{
-		vs: vs,
-		// default Less function: textual comparison
-		less: func(a, b reflect.Value) bool {
-			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
-		},
-	}
+	s := mapKeySorter{vs: vs}
 
-	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
-	// numeric keys are sorted numerically.
+	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps.
 	if len(vs) == 0 {
 		return s
 	}
@@ -855,6 +863,12 @@ func mapKeys(vs []reflect.Value) sort.Interface {
 		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
 	case reflect.Uint32, reflect.Uint64:
 		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
+	case reflect.Bool:
+		s.less = func(a, b reflect.Value) bool { return !a.Bool() && b.Bool() } // false < true
+	case reflect.String:
+		s.less = func(a, b reflect.Value) bool { return a.String() < b.String() }
+	default:
+		panic(fmt.Sprintf("unsupported map key type: %v", vs[0].Kind()))
 	}
 
 	return s
@@ -895,3 +909,13 @@ const ProtoPackageIsVersion2 = true
 // ProtoPackageIsVersion1 is referenced from generated protocol buffer files
 // to assert that that code is compatible with this version of the proto package.
 const ProtoPackageIsVersion1 = true
+
+// InternalMessageInfo is a type used internally by generated .pb.go files.
+// This type is not intended to be used by non-generated code.
+// This type is not subject to any compatibility guarantee.
+type InternalMessageInfo struct {
+	marshal   *marshalInfo
+	unmarshal *unmarshalInfo
+	merge     *mergeInfo
+	discard   *discardInfo
+}
diff --git a/vendor/github.com/golang/protobuf/proto/map_test.go b/vendor/github.com/golang/protobuf/proto/map_test.go
index 313e8792..b1e1529e 100644
--- a/vendor/github.com/golang/protobuf/proto/map_test.go
+++ b/vendor/github.com/golang/protobuf/proto/map_test.go
@@ -2,12 +2,36 @@ package proto_test
 
 import (
 	"fmt"
+	"reflect"
 	"testing"
 
 	"github.com/golang/protobuf/proto"
 	ppb "github.com/golang/protobuf/proto/proto3_proto"
 )
 
+func TestMap(t *testing.T) {
+	var b []byte
+	fmt.Sscanf("a2010c0a044b657931120456616c31a201130a044b657932120556616c3261120456616c32a201240a044b6579330d05000000120556616c33621a0556616c3361120456616c331505000000a20100a201260a044b657934130a07536f6d6555524c1209536f6d655469746c651a08536e69707065743114", "%x", &b)
+
+	var m ppb.Message
+	if err := proto.Unmarshal(b, &m); err != nil {
+		t.Fatalf("proto.Unmarshal error: %v", err)
+	}
+
+	got := m.StringMap
+	want := map[string]string{
+		"":     "",
+		"Key1": "Val1",
+		"Key2": "Val2",
+		"Key3": "Val3",
+		"Key4": "",
+	}
+
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("maps differ:\ngot  %#v\nwant %#v", got, want)
+	}
+}
+
 func marshalled() []byte {
 	m := &ppb.IntMaps{}
 	for i := 0; i < 1000; i++ {
diff --git a/vendor/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go
index fd982dec..3b6ca41d 100644
--- a/vendor/github.com/golang/protobuf/proto/message_set.go
+++ b/vendor/github.com/golang/protobuf/proto/message_set.go
@@ -42,6 +42,7 @@ import (
 	"fmt"
 	"reflect"
 	"sort"
+	"sync"
 )
 
 // errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
@@ -94,10 +95,7 @@ func (ms *messageSet) find(pb Message) *_MessageSet_Item {
 }
 
 func (ms *messageSet) Has(pb Message) bool {
-	if ms.find(pb) != nil {
-		return true
-	}
-	return false
+	return ms.find(pb) != nil
 }
 
 func (ms *messageSet) Unmarshal(pb Message) error {
@@ -150,46 +148,42 @@ func skipVarint(buf []byte) []byte {
 // MarshalMessageSet encodes the extension map represented by m in the message set wire format.
 // It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
 func MarshalMessageSet(exts interface{}) ([]byte, error) {
-	var m map[int32]Extension
+	return marshalMessageSet(exts, false)
+}
+
+// marshaMessageSet implements above function, with the opt to turn on / off deterministic during Marshal.
+func marshalMessageSet(exts interface{}, deterministic bool) ([]byte, error) {
 	switch exts := exts.(type) {
 	case *XXX_InternalExtensions:
-		if err := encodeExtensions(exts); err != nil {
-			return nil, err
-		}
-		m, _ = exts.extensionsRead()
+		var u marshalInfo
+		siz := u.sizeMessageSet(exts)
+		b := make([]byte, 0, siz)
+		return u.appendMessageSet(b, exts, deterministic)
+
 	case map[int32]Extension:
-		if err := encodeExtensionsMap(exts); err != nil {
-			return nil, err
+		// This is an old-style extension map.
+		// Wrap it in a new-style XXX_InternalExtensions.
+		ie := XXX_InternalExtensions{
+			p: &struct {
+				mu           sync.Mutex
+				extensionMap map[int32]Extension
+			}{
+				extensionMap: exts,
+			},
 		}
-		m = exts
+
+		var u marshalInfo
+		siz := u.sizeMessageSet(&ie)
+		b := make([]byte, 0, siz)
+		return u.appendMessageSet(b, &ie, deterministic)
+
 	default:
 		return nil, errors.New("proto: not an extension map")
 	}
-
-	// Sort extension IDs to provide a deterministic encoding.
-	// See also enc_map in encode.go.
-	ids := make([]int, 0, len(m))
-	for id := range m {
-		ids = append(ids, int(id))
-	}
-	sort.Ints(ids)
-
-	ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
-	for _, id := range ids {
-		e := m[int32(id)]
-		// Remove the wire type and field number varint, as well as the length varint.
-		msg := skipVarint(skipVarint(e.enc))
-
-		ms.Item = append(ms.Item, &_MessageSet_Item{
-			TypeId:  Int32(int32(id)),
-			Message: msg,
-		})
-	}
-	return Marshal(ms)
 }
 
 // UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
-// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
+// It is called by Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
 func UnmarshalMessageSet(buf []byte, exts interface{}) error {
 	var m map[int32]Extension
 	switch exts := exts.(type) {
@@ -235,7 +229,15 @@ func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {
 	var m map[int32]Extension
 	switch exts := exts.(type) {
 	case *XXX_InternalExtensions:
-		m, _ = exts.extensionsRead()
+		var mu sync.Locker
+		m, mu = exts.extensionsRead()
+		if m != nil {
+			// Keep the extensions map locked until we're done marshaling to prevent
+			// races between marshaling and unmarshaling the lazily-{en,de}coded
+			// values.
+			mu.Lock()
+			defer mu.Unlock()
+		}
 	case map[int32]Extension:
 		m = exts
 	default:
@@ -253,15 +255,16 @@ func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {
 
 	for i, id := range ids {
 		ext := m[id]
-		if i > 0 {
-			b.WriteByte(',')
-		}
-
 		msd, ok := messageSetMap[id]
 		if !ok {
 			// Unknown type; we can't render it, so skip it.
 			continue
 		}
+
+		if i > 0 && b.Len() > 1 {
+			b.WriteByte(',')
+		}
+
 		fmt.Fprintf(&b, `"[%s]":`, msd.name)
 
 		x := ext.value
diff --git a/vendor/github.com/golang/protobuf/proto/message_set_test.go b/vendor/github.com/golang/protobuf/proto/message_set_test.go
index 353a3ea7..2c170c5f 100644
--- a/vendor/github.com/golang/protobuf/proto/message_set_test.go
+++ b/vendor/github.com/golang/protobuf/proto/message_set_test.go
@@ -64,3 +64,14 @@ func TestUnmarshalMessageSetWithDuplicate(t *testing.T) {
 		t.Errorf("Combined extension is %q, want %q", got, want)
 	}
 }
+
+func TestMarshalMessageSetJSON_UnknownType(t *testing.T) {
+	extMap := map[int32]Extension{12345: Extension{}}
+	got, err := MarshalMessageSetJSON(extMap)
+	if err != nil {
+		t.Fatalf("MarshalMessageSetJSON: %v", err)
+	}
+	if want := []byte("{}"); !bytes.Equal(got, want) {
+		t.Errorf("MarshalMessageSetJSON(%v) = %q, want %q", extMap, got, want)
+	}
+}
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
index fb512e2e..b6cad908 100644
--- a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
+++ b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
@@ -29,7 +29,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// +build appengine js
+// +build purego appengine js
 
 // This file contains an implementation of proto field accesses using package reflect.
 // It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
@@ -38,32 +38,13 @@
 package proto
 
 import (
-	"math"
 	"reflect"
+	"sync"
 )
 
-// A structPointer is a pointer to a struct.
-type structPointer struct {
-	v reflect.Value
-}
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-// The reflect value must itself be a pointer to a struct.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer{v}
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p.v.IsNil()
-}
+const unsafeAllowed = false
 
-// Interface returns the struct pointer as an interface value.
-func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
-	return p.v.Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
+// A field identifies a field in a struct, accessible from a pointer.
 // In this implementation, a field is identified by the sequence of field indices
 // passed to reflect's FieldByIndex.
 type field []int
@@ -76,409 +57,301 @@ func toField(f *reflect.StructField) field {
 // invalidField is an invalid field identifier.
 var invalidField = field(nil)
 
+// zeroField is a noop when calling pointer.offset.
+var zeroField = field([]int{})
+
 // IsValid reports whether the field identifier is valid.
 func (f field) IsValid() bool { return f != nil }
 
-// field returns the given field in the struct as a reflect value.
-func structPointer_field(p structPointer, f field) reflect.Value {
-	// Special case: an extension map entry with a value of type T
-	// passes a *T to the struct-handling code with a zero field,
-	// expecting that it will be treated as equivalent to *struct{ X T },
-	// which has the same memory layout. We have to handle that case
-	// specially, because reflect will panic if we call FieldByIndex on a
-	// non-struct.
-	if f == nil {
-		return p.v.Elem()
-	}
-
-	return p.v.Elem().FieldByIndex(f)
+// The pointer type is for the table-driven decoder.
+// The implementation here uses a reflect.Value of pointer type to
+// create a generic pointer. In pointer_unsafe.go we use unsafe
+// instead of reflect to implement the same (but faster) interface.
+type pointer struct {
+	v reflect.Value
 }
 
-// ifield returns the given field in the struct as an interface value.
-func structPointer_ifield(p structPointer, f field) interface{} {
-	return structPointer_field(p, f).Addr().Interface()
+// toPointer converts an interface of pointer type to a pointer
+// that points to the same target.
+func toPointer(i *Message) pointer {
+	return pointer{v: reflect.ValueOf(*i)}
 }
 
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return structPointer_ifield(p, f).(*[]byte)
+// toAddrPointer converts an interface to a pointer that points to
+// the interface data.
+func toAddrPointer(i *interface{}, isptr bool) pointer {
+	v := reflect.ValueOf(*i)
+	u := reflect.New(v.Type())
+	u.Elem().Set(v)
+	return pointer{v: u}
 }
 
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return structPointer_ifield(p, f).(*[][]byte)
+// valToPointer converts v to a pointer.  v must be of pointer type.
+func valToPointer(v reflect.Value) pointer {
+	return pointer{v: v}
 }
 
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return structPointer_ifield(p, f).(**bool)
+// offset converts from a pointer to a structure to a pointer to
+// one of its fields.
+func (p pointer) offset(f field) pointer {
+	return pointer{v: p.v.Elem().FieldByIndex(f).Addr()}
 }
 
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return structPointer_ifield(p, f).(*bool)
+func (p pointer) isNil() bool {
+	return p.v.IsNil()
 }
 
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return structPointer_ifield(p, f).(*[]bool)
+// grow updates the slice s in place to make it one element longer.
+// s must be addressable.
+// Returns the (addressable) new element.
+func grow(s reflect.Value) reflect.Value {
+	n, m := s.Len(), s.Cap()
+	if n < m {
+		s.SetLen(n + 1)
+	} else {
+		s.Set(reflect.Append(s, reflect.Zero(s.Type().Elem())))
+	}
+	return s.Index(n)
 }
 
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return structPointer_ifield(p, f).(**string)
+func (p pointer) toInt64() *int64 {
+	return p.v.Interface().(*int64)
 }
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return structPointer_ifield(p, f).(*string)
+func (p pointer) toInt64Ptr() **int64 {
+	return p.v.Interface().(**int64)
 }
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return structPointer_ifield(p, f).(*[]string)
+func (p pointer) toInt64Slice() *[]int64 {
+	return p.v.Interface().(*[]int64)
 }
 
-// Extensions returns the address of an extension map field in the struct.
-func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
-	return structPointer_ifield(p, f).(*XXX_InternalExtensions)
-}
+var int32ptr = reflect.TypeOf((*int32)(nil))
 
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return structPointer_ifield(p, f).(*map[int32]Extension)
+func (p pointer) toInt32() *int32 {
+	return p.v.Convert(int32ptr).Interface().(*int32)
 }
 
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return structPointer_field(p, f).Addr()
+// The toInt32Ptr/Slice methods don't work because of enums.
+// Instead, we must use set/get methods for the int32ptr/slice case.
+/*
+	func (p pointer) toInt32Ptr() **int32 {
+		return p.v.Interface().(**int32)
 }
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	structPointer_field(p, f).Set(q.v)
+	func (p pointer) toInt32Slice() *[]int32 {
+		return p.v.Interface().(*[]int32)
 }
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return structPointer{structPointer_field(p, f)}
+*/
+func (p pointer) getInt32Ptr() *int32 {
+	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
+		// raw int32 type
+		return p.v.Elem().Interface().(*int32)
+	}
+	// an enum
+	return p.v.Elem().Convert(int32PtrType).Interface().(*int32)
+}
+func (p pointer) setInt32Ptr(v int32) {
+	// Allocate value in a *int32. Possibly convert that to a *enum.
+	// Then assign it to a **int32 or **enum.
+	// Note: we can convert *int32 to *enum, but we can't convert
+	// **int32 to **enum!
+	p.v.Elem().Set(reflect.ValueOf(&v).Convert(p.v.Type().Elem()))
+}
+
+// getInt32Slice copies []int32 from p as a new slice.
+// This behavior differs from the implementation in pointer_unsafe.go.
+func (p pointer) getInt32Slice() []int32 {
+	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
+		// raw int32 type
+		return p.v.Elem().Interface().([]int32)
+	}
+	// an enum
+	// Allocate a []int32, then assign []enum's values into it.
+	// Note: we can't convert []enum to []int32.
+	slice := p.v.Elem()
+	s := make([]int32, slice.Len())
+	for i := 0; i < slice.Len(); i++ {
+		s[i] = int32(slice.Index(i).Int())
+	}
+	return s
 }
 
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
-	return structPointerSlice{structPointer_field(p, f)}
+// setInt32Slice copies []int32 into p as a new slice.
+// This behavior differs from the implementation in pointer_unsafe.go.
+func (p pointer) setInt32Slice(v []int32) {
+	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
+		// raw int32 type
+		p.v.Elem().Set(reflect.ValueOf(v))
+		return
+	}
+	// an enum
+	// Allocate a []enum, then assign []int32's values into it.
+	// Note: we can't convert []enum to []int32.
+	slice := reflect.MakeSlice(p.v.Type().Elem(), len(v), cap(v))
+	for i, x := range v {
+		slice.Index(i).SetInt(int64(x))
+	}
+	p.v.Elem().Set(slice)
 }
-
-// A structPointerSlice represents the address of a slice of pointers to structs
-// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
-type structPointerSlice struct {
-	v reflect.Value
+func (p pointer) appendInt32Slice(v int32) {
+	grow(p.v.Elem()).SetInt(int64(v))
 }
 
-func (p structPointerSlice) Len() int                  { return p.v.Len() }
-func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
-func (p structPointerSlice) Append(q structPointer) {
-	p.v.Set(reflect.Append(p.v, q.v))
+func (p pointer) toUint64() *uint64 {
+	return p.v.Interface().(*uint64)
 }
-
-var (
-	int32Type   = reflect.TypeOf(int32(0))
-	uint32Type  = reflect.TypeOf(uint32(0))
-	float32Type = reflect.TypeOf(float32(0))
-	int64Type   = reflect.TypeOf(int64(0))
-	uint64Type  = reflect.TypeOf(uint64(0))
-	float64Type = reflect.TypeOf(float64(0))
-)
-
-// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
-// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
-type word32 struct {
-	v reflect.Value
+func (p pointer) toUint64Ptr() **uint64 {
+	return p.v.Interface().(**uint64)
 }
-
-// IsNil reports whether p is nil.
-func word32_IsNil(p word32) bool {
-	return p.v.IsNil()
+func (p pointer) toUint64Slice() *[]uint64 {
+	return p.v.Interface().(*[]uint64)
 }
-
-// Set sets p to point at a newly allocated word with bits set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int32Type:
-		if len(o.int32s) == 0 {
-			o.int32s = make([]int32, uint32PoolSize)
-		}
-		o.int32s[0] = int32(x)
-		p.v.Set(reflect.ValueOf(&o.int32s[0]))
-		o.int32s = o.int32s[1:]
-		return
-	case uint32Type:
-		if len(o.uint32s) == 0 {
-			o.uint32s = make([]uint32, uint32PoolSize)
-		}
-		o.uint32s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
-		o.uint32s = o.uint32s[1:]
-		return
-	case float32Type:
-		if len(o.float32s) == 0 {
-			o.float32s = make([]float32, uint32PoolSize)
-		}
-		o.float32s[0] = math.Float32frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float32s[0]))
-		o.float32s = o.float32s[1:]
-		return
-	}
-
-	// must be enum
-	p.v.Set(reflect.New(t))
-	p.v.Elem().SetInt(int64(int32(x)))
+func (p pointer) toUint32() *uint32 {
+	return p.v.Interface().(*uint32)
 }
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32_Get(p word32) uint32 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
+func (p pointer) toUint32Ptr() **uint32 {
+	return p.v.Interface().(**uint32)
 }
-
-// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32{structPointer_field(p, f)}
+func (p pointer) toUint32Slice() *[]uint32 {
+	return p.v.Interface().(*[]uint32)
 }
-
-// A word32Val represents a field of type int32, uint32, float32, or enum.
-// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
-type word32Val struct {
-	v reflect.Value
+func (p pointer) toBool() *bool {
+	return p.v.Interface().(*bool)
 }
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	switch p.v.Type() {
-	case int32Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint32Type:
-		p.v.SetUint(uint64(x))
-		return
-	case float32Type:
-		p.v.SetFloat(float64(math.Float32frombits(x)))
-		return
-	}
-
-	// must be enum
-	p.v.SetInt(int64(int32(x)))
+func (p pointer) toBoolPtr() **bool {
+	return p.v.Interface().(**bool)
 }
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32Val_Get(p word32Val) uint32 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
+func (p pointer) toBoolSlice() *[]bool {
+	return p.v.Interface().(*[]bool)
 }
-
-// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val{structPointer_field(p, f)}
+func (p pointer) toFloat64() *float64 {
+	return p.v.Interface().(*float64)
 }
-
-// A word32Slice is a slice of 32-bit values.
-// That is, v.Type() is []int32, []uint32, []float32, or []enum.
-type word32Slice struct {
-	v reflect.Value
+func (p pointer) toFloat64Ptr() **float64 {
+	return p.v.Interface().(**float64)
 }
-
-func (p word32Slice) Append(x uint32) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int32:
-		elem.SetInt(int64(int32(x)))
-	case reflect.Uint32:
-		elem.SetUint(uint64(x))
-	case reflect.Float32:
-		elem.SetFloat(float64(math.Float32frombits(x)))
-	}
+func (p pointer) toFloat64Slice() *[]float64 {
+	return p.v.Interface().(*[]float64)
 }
-
-func (p word32Slice) Len() int {
-	return p.v.Len()
+func (p pointer) toFloat32() *float32 {
+	return p.v.Interface().(*float32)
 }
-
-func (p word32Slice) Index(i int) uint32 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
+func (p pointer) toFloat32Ptr() **float32 {
+	return p.v.Interface().(**float32)
 }
-
-// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) word32Slice {
-	return word32Slice{structPointer_field(p, f)}
+func (p pointer) toFloat32Slice() *[]float32 {
+	return p.v.Interface().(*[]float32)
 }
-
-// word64 is like word32 but for 64-bit values.
-type word64 struct {
-	v reflect.Value
+func (p pointer) toString() *string {
+	return p.v.Interface().(*string)
 }
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int64Type:
-		if len(o.int64s) == 0 {
-			o.int64s = make([]int64, uint64PoolSize)
-		}
-		o.int64s[0] = int64(x)
-		p.v.Set(reflect.ValueOf(&o.int64s[0]))
-		o.int64s = o.int64s[1:]
-		return
-	case uint64Type:
-		if len(o.uint64s) == 0 {
-			o.uint64s = make([]uint64, uint64PoolSize)
-		}
-		o.uint64s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
-		o.uint64s = o.uint64s[1:]
-		return
-	case float64Type:
-		if len(o.float64s) == 0 {
-			o.float64s = make([]float64, uint64PoolSize)
-		}
-		o.float64s[0] = math.Float64frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float64s[0]))
-		o.float64s = o.float64s[1:]
-		return
-	}
-	panic("unreachable")
+func (p pointer) toStringPtr() **string {
+	return p.v.Interface().(**string)
 }
-
-func word64_IsNil(p word64) bool {
-	return p.v.IsNil()
+func (p pointer) toStringSlice() *[]string {
+	return p.v.Interface().(*[]string)
 }
-
-func word64_Get(p word64) uint64 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
+func (p pointer) toBytes() *[]byte {
+	return p.v.Interface().(*[]byte)
 }
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64{structPointer_field(p, f)}
+func (p pointer) toBytesSlice() *[][]byte {
+	return p.v.Interface().(*[][]byte)
+}
+func (p pointer) toExtensions() *XXX_InternalExtensions {
+	return p.v.Interface().(*XXX_InternalExtensions)
+}
+func (p pointer) toOldExtensions() *map[int32]Extension {
+	return p.v.Interface().(*map[int32]Extension)
+}
+func (p pointer) getPointer() pointer {
+	return pointer{v: p.v.Elem()}
+}
+func (p pointer) setPointer(q pointer) {
+	p.v.Elem().Set(q.v)
+}
+func (p pointer) appendPointer(q pointer) {
+	grow(p.v.Elem()).Set(q.v)
 }
 
-// word64Val is like word32Val but for 64-bit values.
-type word64Val struct {
-	v reflect.Value
+// getPointerSlice copies []*T from p as a new []pointer.
+// This behavior differs from the implementation in pointer_unsafe.go.
+func (p pointer) getPointerSlice() []pointer {
+	if p.v.IsNil() {
+		return nil
+	}
+	n := p.v.Elem().Len()
+	s := make([]pointer, n)
+	for i := 0; i < n; i++ {
+		s[i] = pointer{v: p.v.Elem().Index(i)}
+	}
+	return s
 }
 
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	switch p.v.Type() {
-	case int64Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint64Type:
-		p.v.SetUint(x)
-		return
-	case float64Type:
-		p.v.SetFloat(math.Float64frombits(x))
+// setPointerSlice copies []pointer into p as a new []*T.
+// This behavior differs from the implementation in pointer_unsafe.go.
+func (p pointer) setPointerSlice(v []pointer) {
+	if v == nil {
+		p.v.Elem().Set(reflect.New(p.v.Elem().Type()).Elem())
 		return
 	}
-	panic("unreachable")
+	s := reflect.MakeSlice(p.v.Elem().Type(), 0, len(v))
+	for _, p := range v {
+		s = reflect.Append(s, p.v)
+	}
+	p.v.Elem().Set(s)
 }
 
-func word64Val_Get(p word64Val) uint64 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
+// getInterfacePointer returns a pointer that points to the
+// interface data of the interface pointed by p.
+func (p pointer) getInterfacePointer() pointer {
+	if p.v.Elem().IsNil() {
+		return pointer{v: p.v.Elem()}
 	}
-	panic("unreachable")
+	return pointer{v: p.v.Elem().Elem().Elem().Field(0).Addr()} // *interface -> interface -> *struct -> struct
 }
 
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val{structPointer_field(p, f)}
+func (p pointer) asPointerTo(t reflect.Type) reflect.Value {
+	// TODO: check that p.v.Type().Elem() == t?
+	return p.v
 }
 
-type word64Slice struct {
-	v reflect.Value
+func atomicLoadUnmarshalInfo(p **unmarshalInfo) *unmarshalInfo {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	return *p
 }
-
-func (p word64Slice) Append(x uint64) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int64:
-		elem.SetInt(int64(int64(x)))
-	case reflect.Uint64:
-		elem.SetUint(uint64(x))
-	case reflect.Float64:
-		elem.SetFloat(float64(math.Float64frombits(x)))
-	}
+func atomicStoreUnmarshalInfo(p **unmarshalInfo, v *unmarshalInfo) {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	*p = v
 }
-
-func (p word64Slice) Len() int {
-	return p.v.Len()
+func atomicLoadMarshalInfo(p **marshalInfo) *marshalInfo {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	return *p
 }
-
-func (p word64Slice) Index(i int) uint64 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return uint64(elem.Uint())
-	case reflect.Float64:
-		return math.Float64bits(float64(elem.Float()))
-	}
-	panic("unreachable")
+func atomicStoreMarshalInfo(p **marshalInfo, v *marshalInfo) {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	*p = v
 }
-
-func structPointer_Word64Slice(p structPointer, f field) word64Slice {
-	return word64Slice{structPointer_field(p, f)}
+func atomicLoadMergeInfo(p **mergeInfo) *mergeInfo {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	return *p
+}
+func atomicStoreMergeInfo(p **mergeInfo, v *mergeInfo) {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	*p = v
 }
+func atomicLoadDiscardInfo(p **discardInfo) *discardInfo {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	return *p
+}
+func atomicStoreDiscardInfo(p **discardInfo, v *discardInfo) {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	*p = v
+}
+
+var atomicLock sync.Mutex
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
index 6b5567d4..d55a335d 100644
--- a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
+++ b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
@@ -29,7 +29,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// +build !appengine,!js
+// +build !purego,!appengine,!js
 
 // This file contains the implementation of the proto field accesses using package unsafe.
 
@@ -37,38 +37,13 @@ package proto
 
 import (
 	"reflect"
+	"sync/atomic"
 	"unsafe"
 )
 
-// NOTE: These type_Foo functions would more idiomatically be methods,
-// but Go does not allow methods on pointer types, and we must preserve
-// some pointer type for the garbage collector. We use these
-// funcs with clunky names as our poor approximation to methods.
-//
-// An alternative would be
-//	type structPointer struct { p unsafe.Pointer }
-// but that does not registerize as well.
-
-// A structPointer is a pointer to a struct.
-type structPointer unsafe.Pointer
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer(unsafe.Pointer(v.Pointer()))
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p == nil
-}
-
-// Interface returns the struct pointer, assumed to have element type t,
-// as an interface value.
-func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
-	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
-}
+const unsafeAllowed = true
 
-// A field identifies a field in a struct, accessible from a structPointer.
+// A field identifies a field in a struct, accessible from a pointer.
 // In this implementation, a field is identified by its byte offset from the start of the struct.
 type field uintptr
 
@@ -80,191 +55,254 @@ func toField(f *reflect.StructField) field {
 // invalidField is an invalid field identifier.
 const invalidField = ^field(0)
 
+// zeroField is a noop when calling pointer.offset.
+const zeroField = field(0)
+
 // IsValid reports whether the field identifier is valid.
 func (f field) IsValid() bool {
-	return f != ^field(0)
+	return f != invalidField
 }
 
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// The pointer type below is for the new table-driven encoder/decoder.
+// The implementation here uses unsafe.Pointer to create a generic pointer.
+// In pointer_reflect.go we use reflect instead of unsafe to implement
+// the same (but slower) interface.
+type pointer struct {
+	p unsafe.Pointer
 }
 
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
+// size of pointer
+var ptrSize = unsafe.Sizeof(uintptr(0))
 
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// toPointer converts an interface of pointer type to a pointer
+// that points to the same target.
+func toPointer(i *Message) pointer {
+	// Super-tricky - read pointer out of data word of interface value.
+	// Saves ~25ns over the equivalent:
+	// return valToPointer(reflect.ValueOf(*i))
+	return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
 }
 
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// toAddrPointer converts an interface to a pointer that points to
+// the interface data.
+func toAddrPointer(i *interface{}, isptr bool) pointer {
+	// Super-tricky - read or get the address of data word of interface value.
+	if isptr {
+		// The interface is of pointer type, thus it is a direct interface.
+		// The data word is the pointer data itself. We take its address.
+		return pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)}
+	}
+	// The interface is not of pointer type. The data word is the pointer
+	// to the data.
+	return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
 }
 
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// valToPointer converts v to a pointer. v must be of pointer type.
+func valToPointer(v reflect.Value) pointer {
+	return pointer{p: unsafe.Pointer(v.Pointer())}
 }
 
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// offset converts from a pointer to a structure to a pointer to
+// one of its fields.
+func (p pointer) offset(f field) pointer {
+	// For safety, we should panic if !f.IsValid, however calling panic causes
+	// this to no longer be inlineable, which is a serious performance cost.
+	/*
+		if !f.IsValid() {
+			panic("invalid field")
+		}
+	*/
+	return pointer{p: unsafe.Pointer(uintptr(p.p) + uintptr(f))}
 }
 
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) isNil() bool {
+	return p.p == nil
 }
 
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) toInt64() *int64 {
+	return (*int64)(p.p)
 }
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
-	return (*XXX_InternalExtensions)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) toInt64Ptr() **int64 {
+	return (**int64)(p.p)
 }
-
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) toInt64Slice() *[]int64 {
+	return (*[]int64)(p.p)
 }
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
+func (p pointer) toInt32() *int32 {
+	return (*int32)(p.p)
 }
 
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
+// See pointer_reflect.go for why toInt32Ptr/Slice doesn't exist.
+/*
+	func (p pointer) toInt32Ptr() **int32 {
+		return (**int32)(p.p)
+	}
+	func (p pointer) toInt32Slice() *[]int32 {
+		return (*[]int32)(p.p)
+	}
+*/
+func (p pointer) getInt32Ptr() *int32 {
+	return *(**int32)(p.p)
 }
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) setInt32Ptr(v int32) {
+	*(**int32)(p.p) = &v
 }
 
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
-	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// getInt32Slice loads a []int32 from p.
+// The value returned is aliased with the original slice.
+// This behavior differs from the implementation in pointer_reflect.go.
+func (p pointer) getInt32Slice() []int32 {
+	return *(*[]int32)(p.p)
 }
 
-// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
-type structPointerSlice []structPointer
-
-func (v *structPointerSlice) Len() int                  { return len(*v) }
-func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
-func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
-
-// A word32 is the address of a "pointer to 32-bit value" field.
-type word32 **uint32
-
-// IsNil reports whether *v is nil.
-func word32_IsNil(p word32) bool {
-	return *p == nil
+// setInt32Slice stores a []int32 to p.
+// The value set is aliased with the input slice.
+// This behavior differs from the implementation in pointer_reflect.go.
+func (p pointer) setInt32Slice(v []int32) {
+	*(*[]int32)(p.p) = v
 }
 
-// Set sets *v to point at a newly allocated word set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	if len(o.uint32s) == 0 {
-		o.uint32s = make([]uint32, uint32PoolSize)
-	}
-	o.uint32s[0] = x
-	*p = &o.uint32s[0]
-	o.uint32s = o.uint32s[1:]
+// TODO: Can we get rid of appendInt32Slice and use setInt32Slice instead?
+func (p pointer) appendInt32Slice(v int32) {
+	s := (*[]int32)(p.p)
+	*s = append(*s, v)
 }
 
-// Get gets the value pointed at by *v.
-func word32_Get(p word32) uint32 {
-	return **p
+func (p pointer) toUint64() *uint64 {
+	return (*uint64)(p.p)
 }
-
-// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+func (p pointer) toUint64Ptr() **uint64 {
+	return (**uint64)(p.p)
 }
-
-// A word32Val is the address of a 32-bit value field.
-type word32Val *uint32
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	*p = x
+func (p pointer) toUint64Slice() *[]uint64 {
+	return (*[]uint64)(p.p)
 }
-
-// Get gets the value pointed at by p.
-func word32Val_Get(p word32Val) uint32 {
-	return *p
+func (p pointer) toUint32() *uint32 {
+	return (*uint32)(p.p)
 }
-
-// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+func (p pointer) toUint32Ptr() **uint32 {
+	return (**uint32)(p.p)
 }
-
-// A word32Slice is a slice of 32-bit values.
-type word32Slice []uint32
-
-func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
-func (v *word32Slice) Len() int           { return len(*v) }
-func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
-
-// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
-	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) toUint32Slice() *[]uint32 {
+	return (*[]uint32)(p.p)
 }
-
-// word64 is like word32 but for 64-bit values.
-type word64 **uint64
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	if len(o.uint64s) == 0 {
-		o.uint64s = make([]uint64, uint64PoolSize)
-	}
-	o.uint64s[0] = x
-	*p = &o.uint64s[0]
-	o.uint64s = o.uint64s[1:]
+func (p pointer) toBool() *bool {
+	return (*bool)(p.p)
 }
-
-func word64_IsNil(p word64) bool {
-	return *p == nil
+func (p pointer) toBoolPtr() **bool {
+	return (**bool)(p.p)
 }
-
-func word64_Get(p word64) uint64 {
-	return **p
+func (p pointer) toBoolSlice() *[]bool {
+	return (*[]bool)(p.p)
+}
+func (p pointer) toFloat64() *float64 {
+	return (*float64)(p.p)
+}
+func (p pointer) toFloat64Ptr() **float64 {
+	return (**float64)(p.p)
+}
+func (p pointer) toFloat64Slice() *[]float64 {
+	return (*[]float64)(p.p)
+}
+func (p pointer) toFloat32() *float32 {
+	return (*float32)(p.p)
+}
+func (p pointer) toFloat32Ptr() **float32 {
+	return (**float32)(p.p)
+}
+func (p pointer) toFloat32Slice() *[]float32 {
+	return (*[]float32)(p.p)
+}
+func (p pointer) toString() *string {
+	return (*string)(p.p)
+}
+func (p pointer) toStringPtr() **string {
+	return (**string)(p.p)
+}
+func (p pointer) toStringSlice() *[]string {
+	return (*[]string)(p.p)
+}
+func (p pointer) toBytes() *[]byte {
+	return (*[]byte)(p.p)
+}
+func (p pointer) toBytesSlice() *[][]byte {
+	return (*[][]byte)(p.p)
+}
+func (p pointer) toExtensions() *XXX_InternalExtensions {
+	return (*XXX_InternalExtensions)(p.p)
+}
+func (p pointer) toOldExtensions() *map[int32]Extension {
+	return (*map[int32]Extension)(p.p)
 }
 
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+// getPointerSlice loads []*T from p as a []pointer.
+// The value returned is aliased with the original slice.
+// This behavior differs from the implementation in pointer_reflect.go.
+func (p pointer) getPointerSlice() []pointer {
+	// Super-tricky - p should point to a []*T where T is a
+	// message type. We load it as []pointer.
+	return *(*[]pointer)(p.p)
 }
 
-// word64Val is like word32Val but for 64-bit values.
-type word64Val *uint64
+// setPointerSlice stores []pointer into p as a []*T.
+// The value set is aliased with the input slice.
+// This behavior differs from the implementation in pointer_reflect.go.
+func (p pointer) setPointerSlice(v []pointer) {
+	// Super-tricky - p should point to a []*T where T is a
+	// message type. We store it as []pointer.
+	*(*[]pointer)(p.p) = v
+}
 
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	*p = x
+// getPointer loads the pointer at p and returns it.
+func (p pointer) getPointer() pointer {
+	return pointer{p: *(*unsafe.Pointer)(p.p)}
 }
 
-func word64Val_Get(p word64Val) uint64 {
-	return *p
+// setPointer stores the pointer q at p.
+func (p pointer) setPointer(q pointer) {
+	*(*unsafe.Pointer)(p.p) = q.p
 }
 
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+// append q to the slice pointed to by p.
+func (p pointer) appendPointer(q pointer) {
+	s := (*[]unsafe.Pointer)(p.p)
+	*s = append(*s, q.p)
 }
 
-// word64Slice is like word32Slice but for 64-bit values.
-type word64Slice []uint64
+// getInterfacePointer returns a pointer that points to the
+// interface data of the interface pointed by p.
+func (p pointer) getInterfacePointer() pointer {
+	// Super-tricky - read pointer out of data word of interface value.
+	return pointer{p: (*(*[2]unsafe.Pointer)(p.p))[1]}
+}
 
-func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
-func (v *word64Slice) Len() int           { return len(*v) }
-func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
+// asPointerTo returns a reflect.Value that is a pointer to an
+// object of type t stored at p.
+func (p pointer) asPointerTo(t reflect.Type) reflect.Value {
+	return reflect.NewAt(t, p.p)
+}
 
-func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
-	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func atomicLoadUnmarshalInfo(p **unmarshalInfo) *unmarshalInfo {
+	return (*unmarshalInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
+}
+func atomicStoreUnmarshalInfo(p **unmarshalInfo, v *unmarshalInfo) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
+}
+func atomicLoadMarshalInfo(p **marshalInfo) *marshalInfo {
+	return (*marshalInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
+}
+func atomicStoreMarshalInfo(p **marshalInfo, v *marshalInfo) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
+}
+func atomicLoadMergeInfo(p **mergeInfo) *mergeInfo {
+	return (*mergeInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
+}
+func atomicStoreMergeInfo(p **mergeInfo, v *mergeInfo) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
+}
+func atomicLoadDiscardInfo(p **discardInfo) *discardInfo {
+	return (*discardInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
+}
+func atomicStoreDiscardInfo(p **discardInfo, v *discardInfo) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
 }
diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go
index ec2289c0..f710adab 100644
--- a/vendor/github.com/golang/protobuf/proto/properties.go
+++ b/vendor/github.com/golang/protobuf/proto/properties.go
@@ -58,42 +58,6 @@ const (
 	WireFixed32    = 5
 )
 
-const startSize = 10 // initial slice/string sizes
-
-// Encoders are defined in encode.go
-// An encoder outputs the full representation of a field, including its
-// tag and encoder type.
-type encoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueEncoder encodes a single integer in a particular encoding.
-type valueEncoder func(o *Buffer, x uint64) error
-
-// Sizers are defined in encode.go
-// A sizer returns the encoded size of a field, including its tag and encoder
-// type.
-type sizer func(prop *Properties, base structPointer) int
-
-// A valueSizer returns the encoded size of a single integer in a particular
-// encoding.
-type valueSizer func(x uint64) int
-
-// Decoders are defined in decode.go
-// A decoder creates a value from its wire representation.
-// Unrecognized subelements are saved in unrec.
-type decoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueDecoder decodes a single integer in a particular encoding.
-type valueDecoder func(o *Buffer) (x uint64, err error)
-
-// A oneofMarshaler does the marshaling for all oneof fields in a message.
-type oneofMarshaler func(Message, *Buffer) error
-
-// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
-type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
-
-// A oneofSizer does the sizing for all oneof fields in a message.
-type oneofSizer func(Message) int
-
 // tagMap is an optimization over map[int]int for typical protocol buffer
 // use-cases. Encoded protocol buffers are often in tag order with small tag
 // numbers.
@@ -140,13 +104,6 @@ type StructProperties struct {
 	decoderTags      tagMap         // map from proto tag to struct field number
 	decoderOrigNames map[string]int // map from original name to struct field number
 	order            []int          // list of struct field numbers in tag order
-	unrecField       field          // field id of the XXX_unrecognized []byte field
-	extendable       bool           // is this an extendable proto
-
-	oneofMarshaler   oneofMarshaler
-	oneofUnmarshaler oneofUnmarshaler
-	oneofSizer       oneofSizer
-	stype            reflect.Type
 
 	// OneofTypes contains information about the oneof fields in this message.
 	// It is keyed by the original name of a field.
@@ -187,36 +144,19 @@ type Properties struct {
 
 	Default    string // default value
 	HasDefault bool   // whether an explicit default was provided
-	def_uint64 uint64
-
-	enc           encoder
-	valEnc        valueEncoder // set for bool and numeric types only
-	field         field
-	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
-	tagbuf        [8]byte
-	stype         reflect.Type      // set for struct types only
-	sprop         *StructProperties // set for struct types only
-	isMarshaler   bool
-	isUnmarshaler bool
+
+	stype reflect.Type      // set for struct types only
+	sprop *StructProperties // set for struct types only
 
 	mtype    reflect.Type // set for map types only
 	mkeyprop *Properties  // set for map types only
 	mvalprop *Properties  // set for map types only
-
-	size    sizer
-	valSize valueSizer // set for bool and numeric types only
-
-	dec    decoder
-	valDec valueDecoder // set for bool and numeric types only
-
-	// If this is a packable field, this will be the decoder for the packed version of the field.
-	packedDec decoder
 }
 
 // String formats the properties in the protobuf struct field tag style.
 func (p *Properties) String() string {
 	s := p.Wire
-	s = ","
+	s += ","
 	s += strconv.Itoa(p.Tag)
 	if p.Required {
 		s += ",req"
@@ -262,29 +202,14 @@ func (p *Properties) Parse(s string) {
 	switch p.Wire {
 	case "varint":
 		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeVarint
-		p.valDec = (*Buffer).DecodeVarint
-		p.valSize = sizeVarint
 	case "fixed32":
 		p.WireType = WireFixed32
-		p.valEnc = (*Buffer).EncodeFixed32
-		p.valDec = (*Buffer).DecodeFixed32
-		p.valSize = sizeFixed32
 	case "fixed64":
 		p.WireType = WireFixed64
-		p.valEnc = (*Buffer).EncodeFixed64
-		p.valDec = (*Buffer).DecodeFixed64
-		p.valSize = sizeFixed64
 	case "zigzag32":
 		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag32
-		p.valDec = (*Buffer).DecodeZigzag32
-		p.valSize = sizeZigzag32
 	case "zigzag64":
 		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag64
-		p.valDec = (*Buffer).DecodeZigzag64
-		p.valSize = sizeZigzag64
 	case "bytes", "group":
 		p.WireType = WireBytes
 		// no numeric converter for non-numeric types
@@ -299,6 +224,7 @@ func (p *Properties) Parse(s string) {
 		return
 	}
 
+outer:
 	for i := 2; i < len(fields); i++ {
 		f := fields[i]
 		switch {
@@ -326,229 +252,28 @@ func (p *Properties) Parse(s string) {
 			if i+1 < len(fields) {
 				// Commas aren't escaped, and def is always last.
 				p.Default += "," + strings.Join(fields[i+1:], ",")
-				break
+				break outer
 			}
 		}
 	}
 }
 
-func logNoSliceEnc(t1, t2 reflect.Type) {
-	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
-}
-
 var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
 
-// Initialize the fields for encoding and decoding.
-func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
-	p.enc = nil
-	p.dec = nil
-	p.size = nil
-
+// setFieldProps initializes the field properties for submessages and maps.
+func (p *Properties) setFieldProps(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
 	switch t1 := typ; t1.Kind() {
-	default:
-		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
-
-	// proto3 scalar types
-
-	case reflect.Bool:
-		p.enc = (*Buffer).enc_proto3_bool
-		p.dec = (*Buffer).dec_proto3_bool
-		p.size = size_proto3_bool
-	case reflect.Int32:
-		p.enc = (*Buffer).enc_proto3_int32
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_int32
-	case reflect.Uint32:
-		p.enc = (*Buffer).enc_proto3_uint32
-		p.dec = (*Buffer).dec_proto3_int32 // can reuse
-		p.size = size_proto3_uint32
-	case reflect.Int64, reflect.Uint64:
-		p.enc = (*Buffer).enc_proto3_int64
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.Float32:
-		p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_uint32
-	case reflect.Float64:
-		p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.String:
-		p.enc = (*Buffer).enc_proto3_string
-		p.dec = (*Buffer).dec_proto3_string
-		p.size = size_proto3_string
-
 	case reflect.Ptr:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
-			break
-		case reflect.Bool:
-			p.enc = (*Buffer).enc_bool
-			p.dec = (*Buffer).dec_bool
-			p.size = size_bool
-		case reflect.Int32:
-			p.enc = (*Buffer).enc_int32
-			p.dec = (*Buffer).dec_int32
-			p.size = size_int32
-		case reflect.Uint32:
-			p.enc = (*Buffer).enc_uint32
-			p.dec = (*Buffer).dec_int32 // can reuse
-			p.size = size_uint32
-		case reflect.Int64, reflect.Uint64:
-			p.enc = (*Buffer).enc_int64
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.Float32:
-			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_int32
-			p.size = size_uint32
-		case reflect.Float64:
-			p.enc = (*Buffer).enc_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.String:
-			p.enc = (*Buffer).enc_string
-			p.dec = (*Buffer).dec_string
-			p.size = size_string
-		case reflect.Struct:
+		if t1.Elem().Kind() == reflect.Struct {
 			p.stype = t1.Elem()
-			p.isMarshaler = isMarshaler(t1)
-			p.isUnmarshaler = isUnmarshaler(t1)
-			if p.Wire == "bytes" {
-				p.enc = (*Buffer).enc_struct_message
-				p.dec = (*Buffer).dec_struct_message
-				p.size = size_struct_message
-			} else {
-				p.enc = (*Buffer).enc_struct_group
-				p.dec = (*Buffer).dec_struct_group
-				p.size = size_struct_group
-			}
 		}
 
 	case reflect.Slice:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			logNoSliceEnc(t1, t2)
-			break
-		case reflect.Bool:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_bool
-				p.size = size_slice_packed_bool
-			} else {
-				p.enc = (*Buffer).enc_slice_bool
-				p.size = size_slice_bool
-			}
-			p.dec = (*Buffer).dec_slice_bool
-			p.packedDec = (*Buffer).dec_slice_packed_bool
-		case reflect.Int32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int32
-				p.size = size_slice_packed_int32
-			} else {
-				p.enc = (*Buffer).enc_slice_int32
-				p.size = size_slice_int32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Uint32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_uint32
-				p.size = size_slice_packed_uint32
-			} else {
-				p.enc = (*Buffer).enc_slice_uint32
-				p.size = size_slice_uint32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Int64, reflect.Uint64:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int64
-				p.size = size_slice_packed_int64
-			} else {
-				p.enc = (*Buffer).enc_slice_int64
-				p.size = size_slice_int64
-			}
-			p.dec = (*Buffer).dec_slice_int64
-			p.packedDec = (*Buffer).dec_slice_packed_int64
-		case reflect.Uint8:
-			p.dec = (*Buffer).dec_slice_byte
-			if p.proto3 {
-				p.enc = (*Buffer).enc_proto3_slice_byte
-				p.size = size_proto3_slice_byte
-			} else {
-				p.enc = (*Buffer).enc_slice_byte
-				p.size = size_slice_byte
-			}
-		case reflect.Float32, reflect.Float64:
-			switch t2.Bits() {
-			case 32:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_uint32
-					p.size = size_slice_packed_uint32
-				} else {
-					p.enc = (*Buffer).enc_slice_uint32
-					p.size = size_slice_uint32
-				}
-				p.dec = (*Buffer).dec_slice_int32
-				p.packedDec = (*Buffer).dec_slice_packed_int32
-			case 64:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_int64
-					p.size = size_slice_packed_int64
-				} else {
-					p.enc = (*Buffer).enc_slice_int64
-					p.size = size_slice_int64
-				}
-				p.dec = (*Buffer).dec_slice_int64
-				p.packedDec = (*Buffer).dec_slice_packed_int64
-			default:
-				logNoSliceEnc(t1, t2)
-				break
-			}
-		case reflect.String:
-			p.enc = (*Buffer).enc_slice_string
-			p.dec = (*Buffer).dec_slice_string
-			p.size = size_slice_string
-		case reflect.Ptr:
-			switch t3 := t2.Elem(); t3.Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
-				break
-			case reflect.Struct:
-				p.stype = t2.Elem()
-				p.isMarshaler = isMarshaler(t2)
-				p.isUnmarshaler = isUnmarshaler(t2)
-				if p.Wire == "bytes" {
-					p.enc = (*Buffer).enc_slice_struct_message
-					p.dec = (*Buffer).dec_slice_struct_message
-					p.size = size_slice_struct_message
-				} else {
-					p.enc = (*Buffer).enc_slice_struct_group
-					p.dec = (*Buffer).dec_slice_struct_group
-					p.size = size_slice_struct_group
-				}
-			}
-		case reflect.Slice:
-			switch t2.Elem().Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
-				break
-			case reflect.Uint8:
-				p.enc = (*Buffer).enc_slice_slice_byte
-				p.dec = (*Buffer).dec_slice_slice_byte
-				p.size = size_slice_slice_byte
-			}
+		if t2 := t1.Elem(); t2.Kind() == reflect.Ptr && t2.Elem().Kind() == reflect.Struct {
+			p.stype = t2.Elem()
 		}
 
 	case reflect.Map:
-		p.enc = (*Buffer).enc_new_map
-		p.dec = (*Buffer).dec_new_map
-		p.size = size_new_map
-
 		p.mtype = t1
 		p.mkeyprop = &Properties{}
 		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
@@ -562,20 +287,6 @@ func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lock
 		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
 	}
 
-	// precalculate tag code
-	wire := p.WireType
-	if p.Packed {
-		wire = WireBytes
-	}
-	x := uint32(p.Tag)<<3 | uint32(wire)
-	i := 0
-	for i = 0; x > 127; i++ {
-		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	p.tagbuf[i] = uint8(x)
-	p.tagcode = p.tagbuf[0 : i+1]
-
 	if p.stype != nil {
 		if lockGetProp {
 			p.sprop = GetProperties(p.stype)
@@ -586,32 +297,9 @@ func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lock
 }
 
 var (
-	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
+	marshalerType = reflect.TypeOf((*Marshaler)(nil)).Elem()
 )
 
-// isMarshaler reports whether type t implements Marshaler.
-func isMarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isMarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isMarshaler")
-	}
-	return t.Implements(marshalerType)
-}
-
-// isUnmarshaler reports whether type t implements Unmarshaler.
-func isUnmarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isUnmarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isUnmarshaler")
-	}
-	return t.Implements(unmarshalerType)
-}
-
 // Init populates the properties from a protocol buffer struct tag.
 func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
 	p.init(typ, name, tag, f, true)
@@ -621,14 +309,11 @@ func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructF
 	// "bytes,49,opt,def=hello!"
 	p.Name = name
 	p.OrigName = name
-	if f != nil {
-		p.field = toField(f)
-	}
 	if tag == "" {
 		return
 	}
 	p.Parse(tag)
-	p.setEncAndDec(typ, f, lockGetProp)
+	p.setFieldProps(typ, f, lockGetProp)
 }
 
 var (
@@ -678,9 +363,6 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	propertiesMap[t] = prop
 
 	// build properties
-	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType) ||
-		reflect.PtrTo(t).Implements(extendableProtoV1Type)
-	prop.unrecField = invalidField
 	prop.Prop = make([]*Properties, t.NumField())
 	prop.order = make([]int, t.NumField())
 
@@ -690,17 +372,6 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 		name := f.Name
 		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
 
-		if f.Name == "XXX_InternalExtensions" { // special case
-			p.enc = (*Buffer).enc_exts
-			p.dec = nil // not needed
-			p.size = size_exts
-		} else if f.Name == "XXX_extensions" { // special case
-			p.enc = (*Buffer).enc_map
-			p.dec = nil // not needed
-			p.size = size_map
-		} else if f.Name == "XXX_unrecognized" { // special case
-			prop.unrecField = toField(&f)
-		}
 		oneof := f.Tag.Get("protobuf_oneof") // special case
 		if oneof != "" {
 			// Oneof fields don't use the traditional protobuf tag.
@@ -715,9 +386,6 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 			}
 			print("\n")
 		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && oneof == "" {
-			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
-		}
 	}
 
 	// Re-order prop.order.
@@ -728,8 +396,7 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	}
 	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
 		var oots []interface{}
-		prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
-		prop.stype = t
+		_, _, _, oots = om.XXX_OneofFuncs()
 
 		// Interpret oneof metadata.
 		prop.OneofTypes = make(map[string]*OneofProperties)
@@ -779,30 +446,6 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	return prop
 }
 
-// Return the Properties object for the x[0]'th field of the structure.
-func propByIndex(t reflect.Type, x []int) *Properties {
-	if len(x) != 1 {
-		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
-		return nil
-	}
-	prop := GetProperties(t)
-	return prop.Prop[x[0]]
-}
-
-// Get the address and type of a pointer to a struct from an interface.
-func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
-	if pb == nil {
-		err = ErrNil
-		return
-	}
-	// get the reflect type of the pointer to the struct.
-	t = reflect.TypeOf(pb)
-	// get the address of the struct.
-	value := reflect.ValueOf(pb)
-	b = toStructPointer(value)
-	return
-}
-
 // A global registry of enum types.
 // The generated code will register the generated maps by calling RegisterEnum.
 
@@ -826,20 +469,42 @@ func EnumValueMap(enumType string) map[string]int32 {
 // A registry of all linked message types.
 // The string is a fully-qualified proto name ("pkg.Message").
 var (
-	protoTypes    = make(map[string]reflect.Type)
-	revProtoTypes = make(map[reflect.Type]string)
+	protoTypedNils = make(map[string]Message)      // a map from proto names to typed nil pointers
+	protoMapTypes  = make(map[string]reflect.Type) // a map from proto names to map types
+	revProtoTypes  = make(map[reflect.Type]string)
 )
 
 // RegisterType is called from generated code and maps from the fully qualified
 // proto name to the type (pointer to struct) of the protocol buffer.
 func RegisterType(x Message, name string) {
-	if _, ok := protoTypes[name]; ok {
+	if _, ok := protoTypedNils[name]; ok {
 		// TODO: Some day, make this a panic.
 		log.Printf("proto: duplicate proto type registered: %s", name)
 		return
 	}
 	t := reflect.TypeOf(x)
-	protoTypes[name] = t
+	if v := reflect.ValueOf(x); v.Kind() == reflect.Ptr && v.Pointer() == 0 {
+		// Generated code always calls RegisterType with nil x.
+		// This check is just for extra safety.
+		protoTypedNils[name] = x
+	} else {
+		protoTypedNils[name] = reflect.Zero(t).Interface().(Message)
+	}
+	revProtoTypes[t] = name
+}
+
+// RegisterMapType is called from generated code and maps from the fully qualified
+// proto name to the native map type of the proto map definition.
+func RegisterMapType(x interface{}, name string) {
+	if reflect.TypeOf(x).Kind() != reflect.Map {
+		panic(fmt.Sprintf("RegisterMapType(%T, %q); want map", x, name))
+	}
+	if _, ok := protoMapTypes[name]; ok {
+		log.Printf("proto: duplicate proto type registered: %s", name)
+		return
+	}
+	t := reflect.TypeOf(x)
+	protoMapTypes[name] = t
 	revProtoTypes[t] = name
 }
 
@@ -855,7 +520,14 @@ func MessageName(x Message) string {
 }
 
 // MessageType returns the message type (pointer to struct) for a named message.
-func MessageType(name string) reflect.Type { return protoTypes[name] }
+// The type is not guaranteed to implement proto.Message if the name refers to a
+// map entry.
+func MessageType(name string) reflect.Type {
+	if t, ok := protoTypedNils[name]; ok {
+		return reflect.TypeOf(t)
+	}
+	return protoMapTypes[name]
+}
 
 // A registry of all linked proto files.
 var (
diff --git a/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go b/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
index cc4d0489..a80f0893 100644
--- a/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
+++ b/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
@@ -1,27 +1,13 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: proto3_proto/proto3.proto
-// DO NOT EDIT!
 
-/*
-Package proto3_proto is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3_proto/proto3.proto
-
-It has these top-level messages:
-	Message
-	Nested
-	MessageWithMap
-	IntMap
-	IntMaps
-*/
 package proto3_proto
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import testdata "github.com/golang/protobuf/proto/testdata"
+import test_proto "github.com/golang/protobuf/proto/test_proto"
+import any "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -59,33 +45,58 @@ var Message_Humour_value = map[string]int32{
 func (x Message_Humour) String() string {
 	return proto.EnumName(Message_Humour_name, int32(x))
 }
-func (Message_Humour) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (Message_Humour) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_e706e4ff19a5dbea, []int{0, 0}
+}
 
 type Message struct {
-	Name         string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Hilarity     Message_Humour                   `protobuf:"varint,2,opt,name=hilarity,enum=proto3_proto.Message_Humour" json:"hilarity,omitempty"`
-	HeightInCm   uint32                           `protobuf:"varint,3,opt,name=height_in_cm,json=heightInCm" json:"height_in_cm,omitempty"`
-	Data         []byte                           `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
-	ResultCount  int64                            `protobuf:"varint,7,opt,name=result_count,json=resultCount" json:"result_count,omitempty"`
-	TrueScotsman bool                             `protobuf:"varint,8,opt,name=true_scotsman,json=trueScotsman" json:"true_scotsman,omitempty"`
-	Score        float32                          `protobuf:"fixed32,9,opt,name=score" json:"score,omitempty"`
-	Key          []uint64                         `protobuf:"varint,5,rep,packed,name=key" json:"key,omitempty"`
-	ShortKey     []int32                          `protobuf:"varint,19,rep,packed,name=short_key,json=shortKey" json:"short_key,omitempty"`
-	Nested       *Nested                          `protobuf:"bytes,6,opt,name=nested" json:"nested,omitempty"`
-	RFunny       []Message_Humour                 `protobuf:"varint,16,rep,packed,name=r_funny,json=rFunny,enum=proto3_proto.Message_Humour" json:"r_funny,omitempty"`
-	Terrain      map[string]*Nested               `protobuf:"bytes,10,rep,name=terrain" json:"terrain,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Proto2Field  *testdata.SubDefaults            `protobuf:"bytes,11,opt,name=proto2_field,json=proto2Field" json:"proto2_field,omitempty"`
-	Proto2Value  map[string]*testdata.SubDefaults `protobuf:"bytes,13,rep,name=proto2_value,json=proto2Value" json:"proto2_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Anything     *google_protobuf.Any             `protobuf:"bytes,14,opt,name=anything" json:"anything,omitempty"`
-	ManyThings   []*google_protobuf.Any           `protobuf:"bytes,15,rep,name=many_things,json=manyThings" json:"many_things,omitempty"`
-	Submessage   *Message                         `protobuf:"bytes,17,opt,name=submessage" json:"submessage,omitempty"`
-	Children     []*Message                       `protobuf:"bytes,18,rep,name=children" json:"children,omitempty"`
-}
-
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+	Name                 string                             `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Hilarity             Message_Humour                     `protobuf:"varint,2,opt,name=hilarity,enum=proto3_proto.Message_Humour" json:"hilarity,omitempty"`
+	HeightInCm           uint32                             `protobuf:"varint,3,opt,name=height_in_cm,json=heightInCm" json:"height_in_cm,omitempty"`
+	Data                 []byte                             `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
+	ResultCount          int64                              `protobuf:"varint,7,opt,name=result_count,json=resultCount" json:"result_count,omitempty"`
+	TrueScotsman         bool                               `protobuf:"varint,8,opt,name=true_scotsman,json=trueScotsman" json:"true_scotsman,omitempty"`
+	Score                float32                            `protobuf:"fixed32,9,opt,name=score" json:"score,omitempty"`
+	Key                  []uint64                           `protobuf:"varint,5,rep,packed,name=key" json:"key,omitempty"`
+	ShortKey             []int32                            `protobuf:"varint,19,rep,packed,name=short_key,json=shortKey" json:"short_key,omitempty"`
+	Nested               *Nested                            `protobuf:"bytes,6,opt,name=nested" json:"nested,omitempty"`
+	RFunny               []Message_Humour                   `protobuf:"varint,16,rep,packed,name=r_funny,json=rFunny,enum=proto3_proto.Message_Humour" json:"r_funny,omitempty"`
+	Terrain              map[string]*Nested                 `protobuf:"bytes,10,rep,name=terrain" json:"terrain,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Proto2Field          *test_proto.SubDefaults            `protobuf:"bytes,11,opt,name=proto2_field,json=proto2Field" json:"proto2_field,omitempty"`
+	Proto2Value          map[string]*test_proto.SubDefaults `protobuf:"bytes,13,rep,name=proto2_value,json=proto2Value" json:"proto2_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Anything             *any.Any                           `protobuf:"bytes,14,opt,name=anything" json:"anything,omitempty"`
+	ManyThings           []*any.Any                         `protobuf:"bytes,15,rep,name=many_things,json=manyThings" json:"many_things,omitempty"`
+	Submessage           *Message                           `protobuf:"bytes,17,opt,name=submessage" json:"submessage,omitempty"`
+	Children             []*Message                         `protobuf:"bytes,18,rep,name=children" json:"children,omitempty"`
+	StringMap            map[string]string                  `protobuf:"bytes,20,rep,name=string_map,json=stringMap" json:"string_map,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 (m *Message) Reset()         { *m = Message{} }
+func (m *Message) String() string { return proto.CompactTextString(m) }
+func (*Message) ProtoMessage()    {}
+func (*Message) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_e706e4ff19a5dbea, []int{0}
+}
+func (m *Message) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Message.Unmarshal(m, b)
+}
+func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
+}
+func (dst *Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Message.Merge(dst, src)
+}
+func (m *Message) XXX_Size() int {
+	return xxx_messageInfo_Message.Size(m)
+}
+func (m *Message) XXX_DiscardUnknown() {
+	xxx_messageInfo_Message.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Message proto.InternalMessageInfo
 
 func (m *Message) GetName() string {
 	if m != nil {
@@ -171,28 +182,28 @@ func (m *Message) GetTerrain() map[string]*Nested {
 	return nil
 }
 
-func (m *Message) GetProto2Field() *testdata.SubDefaults {
+func (m *Message) GetProto2Field() *test_proto.SubDefaults {
 	if m != nil {
 		return m.Proto2Field
 	}
 	return nil
 }
 
-func (m *Message) GetProto2Value() map[string]*testdata.SubDefaults {
+func (m *Message) GetProto2Value() map[string]*test_proto.SubDefaults {
 	if m != nil {
 		return m.Proto2Value
 	}
 	return nil
 }
 
-func (m *Message) GetAnything() *google_protobuf.Any {
+func (m *Message) GetAnything() *any.Any {
 	if m != nil {
 		return m.Anything
 	}
 	return nil
 }
 
-func (m *Message) GetManyThings() []*google_protobuf.Any {
+func (m *Message) GetManyThings() []*any.Any {
 	if m != nil {
 		return m.ManyThings
 	}
@@ -213,15 +224,44 @@ func (m *Message) GetChildren() []*Message {
 	return nil
 }
 
+func (m *Message) GetStringMap() map[string]string {
+	if m != nil {
+		return m.StringMap
+	}
+	return nil
+}
+
 type Nested struct {
-	Bunny string `protobuf:"bytes,1,opt,name=bunny" json:"bunny,omitempty"`
-	Cute  bool   `protobuf:"varint,2,opt,name=cute" json:"cute,omitempty"`
+	Bunny                string   `protobuf:"bytes,1,opt,name=bunny" json:"bunny,omitempty"`
+	Cute                 bool     `protobuf:"varint,2,opt,name=cute" json:"cute,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Nested) Reset()         { *m = Nested{} }
+func (m *Nested) String() string { return proto.CompactTextString(m) }
+func (*Nested) ProtoMessage()    {}
+func (*Nested) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_e706e4ff19a5dbea, []int{1}
+}
+func (m *Nested) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Nested.Unmarshal(m, b)
+}
+func (m *Nested) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Nested.Marshal(b, m, deterministic)
+}
+func (dst *Nested) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Nested.Merge(dst, src)
+}
+func (m *Nested) XXX_Size() int {
+	return xxx_messageInfo_Nested.Size(m)
+}
+func (m *Nested) XXX_DiscardUnknown() {
+	xxx_messageInfo_Nested.DiscardUnknown(m)
 }
 
-func (m *Nested) Reset()                    { *m = Nested{} }
-func (m *Nested) String() string            { return proto.CompactTextString(m) }
-func (*Nested) ProtoMessage()               {}
-func (*Nested) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Nested proto.InternalMessageInfo
 
 func (m *Nested) GetBunny() string {
 	if m != nil {
@@ -238,13 +278,35 @@ func (m *Nested) GetCute() bool {
 }
 
 type MessageWithMap struct {
-	ByteMapping map[bool][]byte `protobuf:"bytes,1,rep,name=byte_mapping,json=byteMapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ByteMapping          map[bool][]byte `protobuf:"bytes,1,rep,name=byte_mapping,json=byteMapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *MessageWithMap) Reset()         { *m = MessageWithMap{} }
+func (m *MessageWithMap) String() string { return proto.CompactTextString(m) }
+func (*MessageWithMap) ProtoMessage()    {}
+func (*MessageWithMap) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_e706e4ff19a5dbea, []int{2}
+}
+func (m *MessageWithMap) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageWithMap.Unmarshal(m, b)
+}
+func (m *MessageWithMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageWithMap.Marshal(b, m, deterministic)
+}
+func (dst *MessageWithMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageWithMap.Merge(dst, src)
+}
+func (m *MessageWithMap) XXX_Size() int {
+	return xxx_messageInfo_MessageWithMap.Size(m)
+}
+func (m *MessageWithMap) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageWithMap.DiscardUnknown(m)
 }
 
-func (m *MessageWithMap) Reset()                    { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string            { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()               {}
-func (*MessageWithMap) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_MessageWithMap proto.InternalMessageInfo
 
 func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
 	if m != nil {
@@ -254,13 +316,35 @@ func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
 }
 
 type IntMap struct {
-	Rtt map[int32]int32 `protobuf:"bytes,1,rep,name=rtt" json:"rtt,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	Rtt                  map[int32]int32 `protobuf:"bytes,1,rep,name=rtt" json:"rtt,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *IntMap) Reset()         { *m = IntMap{} }
+func (m *IntMap) String() string { return proto.CompactTextString(m) }
+func (*IntMap) ProtoMessage()    {}
+func (*IntMap) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_e706e4ff19a5dbea, []int{3}
+}
+func (m *IntMap) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IntMap.Unmarshal(m, b)
+}
+func (m *IntMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IntMap.Marshal(b, m, deterministic)
+}
+func (dst *IntMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntMap.Merge(dst, src)
+}
+func (m *IntMap) XXX_Size() int {
+	return xxx_messageInfo_IntMap.Size(m)
+}
+func (m *IntMap) XXX_DiscardUnknown() {
+	xxx_messageInfo_IntMap.DiscardUnknown(m)
 }
 
-func (m *IntMap) Reset()                    { *m = IntMap{} }
-func (m *IntMap) String() string            { return proto.CompactTextString(m) }
-func (*IntMap) ProtoMessage()               {}
-func (*IntMap) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_IntMap proto.InternalMessageInfo
 
 func (m *IntMap) GetRtt() map[int32]int32 {
 	if m != nil {
@@ -270,13 +354,35 @@ func (m *IntMap) GetRtt() map[int32]int32 {
 }
 
 type IntMaps struct {
-	Maps []*IntMap `protobuf:"bytes,1,rep,name=maps" json:"maps,omitempty"`
+	Maps                 []*IntMap `protobuf:"bytes,1,rep,name=maps" json:"maps,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *IntMaps) Reset()         { *m = IntMaps{} }
+func (m *IntMaps) String() string { return proto.CompactTextString(m) }
+func (*IntMaps) ProtoMessage()    {}
+func (*IntMaps) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_e706e4ff19a5dbea, []int{4}
+}
+func (m *IntMaps) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IntMaps.Unmarshal(m, b)
+}
+func (m *IntMaps) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IntMaps.Marshal(b, m, deterministic)
+}
+func (dst *IntMaps) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntMaps.Merge(dst, src)
+}
+func (m *IntMaps) XXX_Size() int {
+	return xxx_messageInfo_IntMaps.Size(m)
+}
+func (m *IntMaps) XXX_DiscardUnknown() {
+	xxx_messageInfo_IntMaps.DiscardUnknown(m)
 }
 
-func (m *IntMaps) Reset()                    { *m = IntMaps{} }
-func (m *IntMaps) String() string            { return proto.CompactTextString(m) }
-func (*IntMaps) ProtoMessage()               {}
-func (*IntMaps) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_IntMaps proto.InternalMessageInfo
 
 func (m *IntMaps) GetMaps() []*IntMap {
 	if m != nil {
@@ -287,61 +393,69 @@ func (m *IntMaps) GetMaps() []*IntMap {
 
 func init() {
 	proto.RegisterType((*Message)(nil), "proto3_proto.Message")
+	proto.RegisterMapType((map[string]*test_proto.SubDefaults)(nil), "proto3_proto.Message.Proto2ValueEntry")
+	proto.RegisterMapType((map[string]string)(nil), "proto3_proto.Message.StringMapEntry")
+	proto.RegisterMapType((map[string]*Nested)(nil), "proto3_proto.Message.TerrainEntry")
 	proto.RegisterType((*Nested)(nil), "proto3_proto.Nested")
 	proto.RegisterType((*MessageWithMap)(nil), "proto3_proto.MessageWithMap")
+	proto.RegisterMapType((map[bool][]byte)(nil), "proto3_proto.MessageWithMap.ByteMappingEntry")
 	proto.RegisterType((*IntMap)(nil), "proto3_proto.IntMap")
+	proto.RegisterMapType((map[int32]int32)(nil), "proto3_proto.IntMap.RttEntry")
 	proto.RegisterType((*IntMaps)(nil), "proto3_proto.IntMaps")
 	proto.RegisterEnum("proto3_proto.Message_Humour", Message_Humour_name, Message_Humour_value)
 }
 
-func init() { proto.RegisterFile("proto3_proto/proto3.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 733 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x53, 0x6d, 0x6f, 0xf3, 0x34,
-	0x14, 0x25, 0x4d, 0x5f, 0xd2, 0x9b, 0x74, 0x0b, 0x5e, 0x91, 0xbc, 0x02, 0x52, 0x28, 0x12, 0x8a,
-	0x78, 0x49, 0xa1, 0xd3, 0xd0, 0x84, 0x10, 0x68, 0x1b, 0x9b, 0xa8, 0xd6, 0x95, 0xca, 0xdd, 0x98,
-	0xf8, 0x14, 0xa5, 0xad, 0xdb, 0x46, 0x34, 0x4e, 0x49, 0x1c, 0xa4, 0xfc, 0x1d, 0xfe, 0x28, 0x8f,
-	0x6c, 0xa7, 0x5d, 0x36, 0x65, 0xcf, 0xf3, 0x29, 0xf6, 0xf1, 0xb9, 0xf7, 0x9c, 0x1c, 0x5f, 0xc3,
-	0xe9, 0x2e, 0x89, 0x79, 0x7c, 0xe6, 0xcb, 0xcf, 0x40, 0x6d, 0x3c, 0xf9, 0x41, 0x56, 0xf9, 0xa8,
-	0x77, 0xba, 0x8e, 0xe3, 0xf5, 0x96, 0x2a, 0xca, 0x3c, 0x5b, 0x0d, 0x02, 0x96, 0x2b, 0x62, 0xef,
-	0x84, 0xd3, 0x94, 0x2f, 0x03, 0x1e, 0x0c, 0xc4, 0x42, 0x81, 0xfd, 0xff, 0x5b, 0xd0, 0xba, 0xa7,
-	0x69, 0x1a, 0xac, 0x29, 0x42, 0x50, 0x67, 0x41, 0x44, 0xb1, 0xe6, 0x68, 0x6e, 0x9b, 0xc8, 0x35,
-	0xba, 0x00, 0x63, 0x13, 0x6e, 0x83, 0x24, 0xe4, 0x39, 0xae, 0x39, 0x9a, 0x7b, 0x34, 0xfc, 0xcc,
-	0x2b, 0x0b, 0x7a, 0x45, 0xb1, 0xf7, 0x7b, 0x16, 0xc5, 0x59, 0x42, 0x0e, 0x6c, 0xe4, 0x80, 0xb5,
-	0xa1, 0xe1, 0x7a, 0xc3, 0xfd, 0x90, 0xf9, 0x8b, 0x08, 0xeb, 0x8e, 0xe6, 0x76, 0x08, 0x28, 0x6c,
-	0xc4, 0xae, 0x23, 0xa1, 0x27, 0xec, 0xe0, 0xba, 0xa3, 0xb9, 0x16, 0x91, 0x6b, 0xf4, 0x05, 0x58,
-	0x09, 0x4d, 0xb3, 0x2d, 0xf7, 0x17, 0x71, 0xc6, 0x38, 0x6e, 0x39, 0x9a, 0xab, 0x13, 0x53, 0x61,
-	0xd7, 0x02, 0x42, 0x5f, 0x42, 0x87, 0x27, 0x19, 0xf5, 0xd3, 0x45, 0xcc, 0xd3, 0x28, 0x60, 0xd8,
-	0x70, 0x34, 0xd7, 0x20, 0x96, 0x00, 0x67, 0x05, 0x86, 0xba, 0xd0, 0x48, 0x17, 0x71, 0x42, 0x71,
-	0xdb, 0xd1, 0xdc, 0x1a, 0x51, 0x1b, 0x64, 0x83, 0xfe, 0x37, 0xcd, 0x71, 0xc3, 0xd1, 0xdd, 0x3a,
-	0x11, 0x4b, 0xf4, 0x29, 0xb4, 0xd3, 0x4d, 0x9c, 0x70, 0x5f, 0xe0, 0x27, 0x8e, 0xee, 0x36, 0x88,
-	0x21, 0x81, 0x3b, 0x9a, 0xa3, 0x6f, 0xa1, 0xc9, 0x68, 0xca, 0xe9, 0x12, 0x37, 0x1d, 0xcd, 0x35,
-	0x87, 0xdd, 0x97, 0xbf, 0x3e, 0x91, 0x67, 0xa4, 0xe0, 0xa0, 0x73, 0x68, 0x25, 0xfe, 0x2a, 0x63,
-	0x2c, 0xc7, 0xb6, 0xa3, 0x7f, 0x30, 0xa9, 0x66, 0x72, 0x2b, 0xb8, 0xe8, 0x67, 0x68, 0x71, 0x9a,
-	0x24, 0x41, 0xc8, 0x30, 0x38, 0xba, 0x6b, 0x0e, 0xfb, 0xd5, 0x65, 0x0f, 0x8a, 0x74, 0xc3, 0x78,
-	0x92, 0x93, 0x7d, 0x09, 0xba, 0x00, 0x75, 0xff, 0x43, 0x7f, 0x15, 0xd2, 0xed, 0x12, 0x9b, 0xd2,
-	0xe8, 0x27, 0xde, 0xfe, 0xae, 0xbd, 0x59, 0x36, 0xff, 0x8d, 0xae, 0x82, 0x6c, 0xcb, 0x53, 0x62,
-	0x2a, 0xea, 0xad, 0x60, 0xa2, 0xd1, 0xa1, 0xf2, 0xdf, 0x60, 0x9b, 0x51, 0xdc, 0x91, 0xe2, 0x5f,
-	0x55, 0x8b, 0x4f, 0x25, 0xf3, 0x4f, 0x41, 0x54, 0x06, 0x8a, 0x56, 0x12, 0x41, 0xdf, 0x83, 0x11,
-	0xb0, 0x9c, 0x6f, 0x42, 0xb6, 0xc6, 0x47, 0x45, 0x52, 0x6a, 0x0e, 0xbd, 0xfd, 0x1c, 0x7a, 0x97,
-	0x2c, 0x27, 0x07, 0x16, 0x3a, 0x07, 0x33, 0x0a, 0x58, 0xee, 0xcb, 0x5d, 0x8a, 0x8f, 0xa5, 0x76,
-	0x75, 0x11, 0x08, 0xe2, 0x83, 0xe4, 0xa1, 0x73, 0x80, 0x34, 0x9b, 0x47, 0xca, 0x14, 0xfe, 0xb8,
-	0xf8, 0xd7, 0x2a, 0xc7, 0xa4, 0x44, 0x44, 0x3f, 0x80, 0xb1, 0xd8, 0x84, 0xdb, 0x65, 0x42, 0x19,
-	0x46, 0x52, 0xea, 0x8d, 0xa2, 0x03, 0xad, 0x37, 0x05, 0xab, 0x1c, 0xf8, 0x7e, 0x72, 0xd4, 0xd3,
-	0x90, 0x93, 0xf3, 0x35, 0x34, 0x54, 0x70, 0xb5, 0xf7, 0xcc, 0x86, 0xa2, 0xfc, 0x54, 0xbb, 0xd0,
-	0x7a, 0x8f, 0x60, 0xbf, 0x4e, 0xb1, 0xa2, 0xeb, 0x37, 0x2f, 0xbb, 0xbe, 0x71, 0x91, 0xcf, 0x6d,
-	0xfb, 0xbf, 0x42, 0x53, 0x0d, 0x14, 0x32, 0xa1, 0xf5, 0x38, 0xb9, 0x9b, 0xfc, 0xf1, 0x34, 0xb1,
-	0x3f, 0x42, 0x06, 0xd4, 0xa7, 0x8f, 0x93, 0x99, 0xad, 0xa1, 0x0e, 0xb4, 0x67, 0xe3, 0xcb, 0xe9,
-	0xec, 0x61, 0x74, 0x7d, 0x67, 0xd7, 0xd0, 0x31, 0x98, 0x57, 0xa3, 0xf1, 0xd8, 0xbf, 0xba, 0x1c,
-	0x8d, 0x6f, 0xfe, 0xb2, 0xf5, 0xfe, 0x10, 0x9a, 0xca, 0xac, 0x78, 0x33, 0x73, 0x39, 0xbe, 0xca,
-	0x8f, 0xda, 0x88, 0x57, 0xba, 0xc8, 0xb8, 0x32, 0x64, 0x10, 0xb9, 0xee, 0xff, 0xa7, 0xc1, 0x51,
-	0x91, 0xd9, 0x53, 0xc8, 0x37, 0xf7, 0xc1, 0x0e, 0x4d, 0xc1, 0x9a, 0xe7, 0x9c, 0xfa, 0x51, 0xb0,
-	0xdb, 0x89, 0x39, 0xd0, 0x64, 0xce, 0xdf, 0x55, 0xe6, 0x5c, 0xd4, 0x78, 0x57, 0x39, 0xa7, 0xf7,
-	0x8a, 0x5f, 0x4c, 0xd5, 0xfc, 0x19, 0xe9, 0xfd, 0x02, 0xf6, 0x6b, 0x42, 0x39, 0x30, 0x43, 0x05,
-	0xd6, 0x2d, 0x07, 0x66, 0x95, 0x93, 0xf9, 0x07, 0x9a, 0x23, 0xc6, 0x85, 0xb7, 0x01, 0xe8, 0x09,
-	0xe7, 0x85, 0xa5, 0xcf, 0x5f, 0x5a, 0x52, 0x14, 0x8f, 0x70, 0xae, 0x2c, 0x08, 0x66, 0xef, 0x47,
-	0x30, 0xf6, 0x40, 0x59, 0xb2, 0x51, 0x21, 0xd9, 0x28, 0x4b, 0x9e, 0x41, 0x4b, 0xf5, 0x4b, 0x91,
-	0x0b, 0xf5, 0x28, 0xd8, 0xa5, 0x85, 0x68, 0xb7, 0x4a, 0x94, 0x48, 0xc6, 0xbc, 0xa9, 0x8e, 0xde,
-	0x05, 0x00, 0x00, 0xff, 0xff, 0x75, 0x38, 0xad, 0x84, 0xe4, 0x05, 0x00, 0x00,
+func init() { proto.RegisterFile("proto3_proto/proto3.proto", fileDescriptor_proto3_e706e4ff19a5dbea) }
+
+var fileDescriptor_proto3_e706e4ff19a5dbea = []byte{
+	// 774 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x6f, 0x8f, 0xdb, 0x44,
+	0x10, 0xc6, 0x71, 0x9c, 0x3f, 0xce, 0xd8, 0x77, 0x35, 0x4b, 0x2a, 0xb6, 0x01, 0x24, 0x13, 0x10,
+	0xb2, 0x10, 0xf5, 0x41, 0xaa, 0x43, 0x55, 0x55, 0x81, 0xee, 0x8e, 0x56, 0x44, 0x77, 0x17, 0xa2,
+	0xcd, 0x95, 0x13, 0xaf, 0xac, 0x4d, 0x6e, 0x93, 0x58, 0xc4, 0xeb, 0xe0, 0x5d, 0x23, 0xf9, 0x0b,
+	0xf0, 0x41, 0xf8, 0xa4, 0x68, 0x77, 0x9d, 0xd4, 0xa9, 0x5c, 0xfa, 0x2a, 0xbb, 0x8f, 0x7f, 0x33,
+	0xcf, 0x78, 0x66, 0x1c, 0x78, 0xb2, 0xcb, 0x33, 0x99, 0x3d, 0x8b, 0xf5, 0xcf, 0x99, 0xb9, 0x44,
+	0xfa, 0x07, 0x79, 0xf5, 0x47, 0xc3, 0x27, 0xeb, 0x2c, 0x5b, 0x6f, 0x99, 0x41, 0x16, 0xc5, 0xea,
+	0x8c, 0xf2, 0xd2, 0x80, 0xc3, 0xc7, 0x92, 0x09, 0x59, 0x65, 0x50, 0x47, 0x23, 0x8f, 0xfe, 0xe9,
+	0x43, 0xef, 0x96, 0x09, 0x41, 0xd7, 0x0c, 0x21, 0x68, 0x73, 0x9a, 0x32, 0x6c, 0x05, 0x56, 0xd8,
+	0x27, 0xfa, 0x8c, 0x9e, 0x83, 0xb3, 0x49, 0xb6, 0x34, 0x4f, 0x64, 0x89, 0x5b, 0x81, 0x15, 0x9e,
+	0x8e, 0x3f, 0x8f, 0xea, 0x96, 0x51, 0x15, 0x1c, 0xfd, 0x5a, 0xa4, 0x59, 0x91, 0x93, 0x03, 0x8d,
+	0x02, 0xf0, 0x36, 0x2c, 0x59, 0x6f, 0x64, 0x9c, 0xf0, 0x78, 0x99, 0x62, 0x3b, 0xb0, 0xc2, 0x13,
+	0x02, 0x46, 0x9b, 0xf0, 0xab, 0x54, 0xf9, 0x3d, 0x50, 0x49, 0x71, 0x3b, 0xb0, 0x42, 0x8f, 0xe8,
+	0x33, 0xfa, 0x12, 0xbc, 0x9c, 0x89, 0x62, 0x2b, 0xe3, 0x65, 0x56, 0x70, 0x89, 0x7b, 0x81, 0x15,
+	0xda, 0xc4, 0x35, 0xda, 0x95, 0x92, 0xd0, 0x57, 0x70, 0x22, 0xf3, 0x82, 0xc5, 0x62, 0x99, 0x49,
+	0x91, 0x52, 0x8e, 0x9d, 0xc0, 0x0a, 0x1d, 0xe2, 0x29, 0x71, 0x5e, 0x69, 0x68, 0x00, 0x1d, 0xb1,
+	0xcc, 0x72, 0x86, 0xfb, 0x81, 0x15, 0xb6, 0x88, 0xb9, 0x20, 0x1f, 0xec, 0x3f, 0x59, 0x89, 0x3b,
+	0x81, 0x1d, 0xb6, 0x89, 0x3a, 0xa2, 0xcf, 0xa0, 0x2f, 0x36, 0x59, 0x2e, 0x63, 0xa5, 0x7f, 0x12,
+	0xd8, 0x61, 0x87, 0x38, 0x5a, 0xb8, 0x66, 0x25, 0xfa, 0x0e, 0xba, 0x9c, 0x09, 0xc9, 0x1e, 0x70,
+	0x37, 0xb0, 0x42, 0x77, 0x3c, 0x38, 0x7e, 0xf5, 0xa9, 0x7e, 0x46, 0x2a, 0x06, 0x9d, 0x43, 0x2f,
+	0x8f, 0x57, 0x05, 0xe7, 0x25, 0xf6, 0x03, 0xfb, 0x83, 0x9d, 0xea, 0xe6, 0xaf, 0x15, 0x8b, 0x5e,
+	0x42, 0x4f, 0xb2, 0x3c, 0xa7, 0x09, 0xc7, 0x10, 0xd8, 0xa1, 0x3b, 0x1e, 0x35, 0x87, 0xdd, 0x19,
+	0xe8, 0x15, 0x97, 0x79, 0x49, 0xf6, 0x21, 0xe8, 0x05, 0x98, 0x0d, 0x18, 0xc7, 0xab, 0x84, 0x6d,
+	0x1f, 0xb0, 0xab, 0x0b, 0xfd, 0x34, 0x7a, 0x3b, 0xed, 0x68, 0x5e, 0x2c, 0x7e, 0x61, 0x2b, 0x5a,
+	0x6c, 0xa5, 0x20, 0xae, 0x81, 0x5f, 0x2b, 0x16, 0x4d, 0x0e, 0xb1, 0x7f, 0xd3, 0x6d, 0xc1, 0xf0,
+	0x89, 0xb6, 0xff, 0xa6, 0xd9, 0x7e, 0xa6, 0xc9, 0xdf, 0x15, 0x68, 0x4a, 0xa8, 0x52, 0x69, 0x05,
+	0x7d, 0x0f, 0x0e, 0xe5, 0xa5, 0xdc, 0x24, 0x7c, 0x8d, 0x4f, 0xab, 0x5e, 0x99, 0x5d, 0x8c, 0xf6,
+	0xbb, 0x18, 0x5d, 0xf0, 0x92, 0x1c, 0x28, 0x74, 0x0e, 0x6e, 0x4a, 0x79, 0x19, 0xeb, 0x9b, 0xc0,
+	0x8f, 0xb4, 0x77, 0x73, 0x10, 0x28, 0xf0, 0x4e, 0x73, 0xe8, 0x1c, 0x40, 0x14, 0x8b, 0xd4, 0x14,
+	0x85, 0x3f, 0xd6, 0x56, 0x8f, 0x1b, 0x2b, 0x26, 0x35, 0x10, 0xfd, 0x00, 0xce, 0x72, 0x93, 0x6c,
+	0x1f, 0x72, 0xc6, 0x31, 0xd2, 0x56, 0xef, 0x09, 0x3a, 0x60, 0xe8, 0x0a, 0x40, 0xc8, 0x3c, 0xe1,
+	0xeb, 0x38, 0xa5, 0x3b, 0x3c, 0xd0, 0x41, 0x5f, 0x37, 0xf7, 0x66, 0xae, 0xb9, 0x5b, 0xba, 0x33,
+	0x9d, 0xe9, 0x8b, 0xfd, 0x7d, 0x38, 0x03, 0xaf, 0x3e, 0xb7, 0xfd, 0x02, 0x9a, 0x2f, 0x4c, 0x2f,
+	0xe0, 0xb7, 0xd0, 0x31, 0xdd, 0x6f, 0xfd, 0xcf, 0x8a, 0x19, 0xe4, 0x45, 0xeb, 0xb9, 0x35, 0xbc,
+	0x07, 0xff, 0xdd, 0x51, 0x34, 0x64, 0x7d, 0x7a, 0x9c, 0xf5, 0xbd, 0xfb, 0x50, 0x4b, 0xfc, 0x12,
+	0x4e, 0x8f, 0xdf, 0xa3, 0x21, 0xed, 0xa0, 0x9e, 0xb6, 0x5f, 0x8b, 0x1e, 0xfd, 0x0c, 0x5d, 0xb3,
+	0xd7, 0xc8, 0x85, 0xde, 0x9b, 0xe9, 0xf5, 0xf4, 0xb7, 0xfb, 0xa9, 0xff, 0x11, 0x72, 0xa0, 0x3d,
+	0x7b, 0x33, 0x9d, 0xfb, 0x16, 0x3a, 0x81, 0xfe, 0xfc, 0xe6, 0x62, 0x36, 0xbf, 0x9b, 0x5c, 0x5d,
+	0xfb, 0x2d, 0xf4, 0x08, 0xdc, 0xcb, 0xc9, 0xcd, 0x4d, 0x7c, 0x79, 0x31, 0xb9, 0x79, 0xf5, 0x87,
+	0x6f, 0x8f, 0xc6, 0xd0, 0x35, 0x2f, 0xab, 0x4c, 0x16, 0xfa, 0x2b, 0x32, 0xc6, 0xe6, 0xa2, 0xfe,
+	0x2c, 0x96, 0x85, 0x34, 0xce, 0x0e, 0xd1, 0xe7, 0xd1, 0xbf, 0x16, 0x9c, 0x56, 0x33, 0xb8, 0x4f,
+	0xe4, 0xe6, 0x96, 0xee, 0xd0, 0x0c, 0xbc, 0x45, 0x29, 0x99, 0x9a, 0xd9, 0x4e, 0x2d, 0xa3, 0xa5,
+	0xe7, 0xf6, 0xb4, 0x71, 0x6e, 0x55, 0x4c, 0x74, 0x59, 0x4a, 0x76, 0x6b, 0xf8, 0x6a, 0xb5, 0x17,
+	0x6f, 0x95, 0xe1, 0x4f, 0xe0, 0xbf, 0x0b, 0xd4, 0x3b, 0xe3, 0x34, 0x74, 0xc6, 0xab, 0x77, 0xe6,
+	0x2f, 0xe8, 0x4e, 0xb8, 0x54, 0xb5, 0x9d, 0x81, 0x9d, 0x4b, 0x59, 0x95, 0xf4, 0xc5, 0x71, 0x49,
+	0x06, 0x89, 0x88, 0x94, 0xa6, 0x04, 0x45, 0x0e, 0x7f, 0x04, 0x67, 0x2f, 0xd4, 0x2d, 0x3b, 0x0d,
+	0x96, 0x9d, 0xba, 0xe5, 0x33, 0xe8, 0x99, 0x7c, 0x02, 0x85, 0xd0, 0x4e, 0xe9, 0x4e, 0x54, 0xa6,
+	0x83, 0x26, 0x53, 0xa2, 0x89, 0x45, 0xd7, 0x3c, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x99, 0x24,
+	0x6b, 0x12, 0x6d, 0x06, 0x00, 0x00,
 }
diff --git a/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto b/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
index 20486557..c81fe1e5 100644
--- a/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
+++ b/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
@@ -32,7 +32,7 @@
 syntax = "proto3";
 
 import "google/protobuf/any.proto";
-import "testdata/test.proto";
+import "test_proto/test.proto";
 
 package proto3_proto;
 
@@ -58,14 +58,16 @@ message Message {
   repeated Humour r_funny = 16;
 
   map<string, Nested> terrain = 10;
-  testdata.SubDefaults proto2_field = 11;
-  map<string, testdata.SubDefaults> proto2_value = 13;
+  test_proto.SubDefaults proto2_field = 11;
+  map<string, test_proto.SubDefaults> proto2_value = 13;
 
   google.protobuf.Any anything = 14;
   repeated google.protobuf.Any many_things = 15;
 
   Message submessage = 17;
   repeated Message children = 18;
+
+  map<string, string> string_map = 20;
 }
 
 message Nested {
diff --git a/vendor/github.com/golang/protobuf/proto/proto3_test.go b/vendor/github.com/golang/protobuf/proto/proto3_test.go
index 735837f2..73eed6c0 100644
--- a/vendor/github.com/golang/protobuf/proto/proto3_test.go
+++ b/vendor/github.com/golang/protobuf/proto/proto3_test.go
@@ -32,11 +32,12 @@
 package proto_test
 
 import (
+	"bytes"
 	"testing"
 
 	"github.com/golang/protobuf/proto"
 	pb "github.com/golang/protobuf/proto/proto3_proto"
-	tpb "github.com/golang/protobuf/proto/testdata"
+	tpb "github.com/golang/protobuf/proto/test_proto"
 )
 
 func TestProto3ZeroValues(t *testing.T) {
@@ -133,3 +134,18 @@ func TestProto3SetDefaults(t *testing.T) {
 		t.Errorf("with in = %v\nproto.SetDefaults(in) =>\ngot %v\nwant %v", in, got, want)
 	}
 }
+
+func TestUnknownFieldPreservation(t *testing.T) {
+	b1 := "\x0a\x05David"      // Known tag 1
+	b2 := "\xc2\x0c\x06Google" // Unknown tag 200
+	b := []byte(b1 + b2)
+
+	m := new(pb.Message)
+	if err := proto.Unmarshal(b, m); err != nil {
+		t.Fatalf("proto.Unmarshal: %v", err)
+	}
+
+	if !bytes.Equal(m.XXX_unrecognized, []byte(b2)) {
+		t.Fatalf("mismatching unknown fields:\ngot  %q\nwant %q", m.XXX_unrecognized, b2)
+	}
+}
diff --git a/vendor/github.com/golang/protobuf/proto/size2_test.go b/vendor/github.com/golang/protobuf/proto/size2_test.go
index a2729c39..7846b061 100644
--- a/vendor/github.com/golang/protobuf/proto/size2_test.go
+++ b/vendor/github.com/golang/protobuf/proto/size2_test.go
@@ -55,7 +55,7 @@ func TestVarintSize(t *testing.T) {
 		{1 << 63, 10},
 	}
 	for _, tc := range testCases {
-		size := sizeVarint(tc.n)
+		size := SizeVarint(tc.n)
 		if size != tc.size {
 			t.Errorf("sizeVarint(%d) = %d, want %d", tc.n, size, tc.size)
 		}
diff --git a/vendor/github.com/golang/protobuf/proto/size_test.go b/vendor/github.com/golang/protobuf/proto/size_test.go
index af1034dc..3abac418 100644
--- a/vendor/github.com/golang/protobuf/proto/size_test.go
+++ b/vendor/github.com/golang/protobuf/proto/size_test.go
@@ -38,7 +38,7 @@ import (
 
 	. "github.com/golang/protobuf/proto"
 	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
+	pb "github.com/golang/protobuf/proto/test_proto"
 )
 
 var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}
@@ -59,6 +59,30 @@ func init() {
 
 }
 
+// non-pointer custom message
+type nonptrMessage struct{}
+
+func (m nonptrMessage) ProtoMessage()  {}
+func (m nonptrMessage) Reset()         {}
+func (m nonptrMessage) String() string { return "" }
+
+func (m nonptrMessage) Marshal() ([]byte, error) {
+	return []byte{42}, nil
+}
+
+// custom message embedding a proto.Message
+type messageWithEmbedding struct {
+	*pb.OtherMessage
+}
+
+func (m *messageWithEmbedding) ProtoMessage()  {}
+func (m *messageWithEmbedding) Reset()         {}
+func (m *messageWithEmbedding) String() string { return "" }
+
+func (m *messageWithEmbedding) Marshal() ([]byte, error) {
+	return []byte{42}, nil
+}
+
 var SizeTests = []struct {
 	desc string
 	pb   Message
@@ -146,6 +170,9 @@ var SizeTests = []struct {
 	{"oneof group", &pb.Oneof{Union: &pb.Oneof_FGroup{&pb.Oneof_F_Group{X: Int32(52)}}}},
 	{"oneof largest tag", &pb.Oneof{Union: &pb.Oneof_F_Largest_Tag{1}}},
 	{"multiple oneofs", &pb.Oneof{Union: &pb.Oneof_F_Int32{1}, Tormato: &pb.Oneof_Value{2}}},
+
+	{"non-pointer message", nonptrMessage{}},
+	{"custom message with embedding", &messageWithEmbedding{&pb.OtherMessage{}}},
 }
 
 func TestSize(t *testing.T) {
diff --git a/vendor/github.com/golang/protobuf/proto/table_marshal.go b/vendor/github.com/golang/protobuf/proto/table_marshal.go
new file mode 100644
index 00000000..0f212b30
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/table_marshal.go
@@ -0,0 +1,2681 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2016 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"errors"
+	"fmt"
+	"math"
+	"reflect"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"unicode/utf8"
+)
+
+// a sizer takes a pointer to a field and the size of its tag, computes the size of
+// the encoded data.
+type sizer func(pointer, int) int
+
+// a marshaler takes a byte slice, a pointer to a field, and its tag (in wire format),
+// marshals the field to the end of the slice, returns the slice and error (if any).
+type marshaler func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error)
+
+// marshalInfo is the information used for marshaling a message.
+type marshalInfo struct {
+	typ          reflect.Type
+	fields       []*marshalFieldInfo
+	unrecognized field                      // offset of XXX_unrecognized
+	extensions   field                      // offset of XXX_InternalExtensions
+	v1extensions field                      // offset of XXX_extensions
+	sizecache    field                      // offset of XXX_sizecache
+	initialized  int32                      // 0 -- only typ is set, 1 -- fully initialized
+	messageset   bool                       // uses message set wire format
+	hasmarshaler bool                       // has custom marshaler
+	sync.RWMutex                            // protect extElems map, also for initialization
+	extElems     map[int32]*marshalElemInfo // info of extension elements
+}
+
+// marshalFieldInfo is the information used for marshaling a field of a message.
+type marshalFieldInfo struct {
+	field      field
+	wiretag    uint64 // tag in wire format
+	tagsize    int    // size of tag in wire format
+	sizer      sizer
+	marshaler  marshaler
+	isPointer  bool
+	required   bool                              // field is required
+	name       string                            // name of the field, for error reporting
+	oneofElems map[reflect.Type]*marshalElemInfo // info of oneof elements
+}
+
+// marshalElemInfo is the information used for marshaling an extension or oneof element.
+type marshalElemInfo struct {
+	wiretag   uint64 // tag in wire format
+	tagsize   int    // size of tag in wire format
+	sizer     sizer
+	marshaler marshaler
+	isptr     bool // elem is pointer typed, thus interface of this type is a direct interface (extension only)
+}
+
+var (
+	marshalInfoMap  = map[reflect.Type]*marshalInfo{}
+	marshalInfoLock sync.Mutex
+)
+
+// getMarshalInfo returns the information to marshal a given type of message.
+// The info it returns may not necessarily initialized.
+// t is the type of the message (NOT the pointer to it).
+func getMarshalInfo(t reflect.Type) *marshalInfo {
+	marshalInfoLock.Lock()
+	u, ok := marshalInfoMap[t]
+	if !ok {
+		u = &marshalInfo{typ: t}
+		marshalInfoMap[t] = u
+	}
+	marshalInfoLock.Unlock()
+	return u
+}
+
+// Size is the entry point from generated code,
+// and should be ONLY called by generated code.
+// It computes the size of encoded data of msg.
+// a is a pointer to a place to store cached marshal info.
+func (a *InternalMessageInfo) Size(msg Message) int {
+	u := getMessageMarshalInfo(msg, a)
+	ptr := toPointer(&msg)
+	if ptr.isNil() {
+		// We get here if msg is a typed nil ((*SomeMessage)(nil)),
+		// so it satisfies the interface, and msg == nil wouldn't
+		// catch it. We don't want crash in this case.
+		return 0
+	}
+	return u.size(ptr)
+}
+
+// Marshal is the entry point from generated code,
+// and should be ONLY called by generated code.
+// It marshals msg to the end of b.
+// a is a pointer to a place to store cached marshal info.
+func (a *InternalMessageInfo) Marshal(b []byte, msg Message, deterministic bool) ([]byte, error) {
+	u := getMessageMarshalInfo(msg, a)
+	ptr := toPointer(&msg)
+	if ptr.isNil() {
+		// We get here if msg is a typed nil ((*SomeMessage)(nil)),
+		// so it satisfies the interface, and msg == nil wouldn't
+		// catch it. We don't want crash in this case.
+		return b, ErrNil
+	}
+	return u.marshal(b, ptr, deterministic)
+}
+
+func getMessageMarshalInfo(msg interface{}, a *InternalMessageInfo) *marshalInfo {
+	// u := a.marshal, but atomically.
+	// We use an atomic here to ensure memory consistency.
+	u := atomicLoadMarshalInfo(&a.marshal)
+	if u == nil {
+		// Get marshal information from type of message.
+		t := reflect.ValueOf(msg).Type()
+		if t.Kind() != reflect.Ptr {
+			panic(fmt.Sprintf("cannot handle non-pointer message type %v", t))
+		}
+		u = getMarshalInfo(t.Elem())
+		// Store it in the cache for later users.
+		// a.marshal = u, but atomically.
+		atomicStoreMarshalInfo(&a.marshal, u)
+	}
+	return u
+}
+
+// size is the main function to compute the size of the encoded data of a message.
+// ptr is the pointer to the message.
+func (u *marshalInfo) size(ptr pointer) int {
+	if atomic.LoadInt32(&u.initialized) == 0 {
+		u.computeMarshalInfo()
+	}
+
+	// If the message can marshal itself, let it do it, for compatibility.
+	// NOTE: This is not efficient.
+	if u.hasmarshaler {
+		m := ptr.asPointerTo(u.typ).Interface().(Marshaler)
+		b, _ := m.Marshal()
+		return len(b)
+	}
+
+	n := 0
+	for _, f := range u.fields {
+		if f.isPointer && ptr.offset(f.field).getPointer().isNil() {
+			// nil pointer always marshals to nothing
+			continue
+		}
+		n += f.sizer(ptr.offset(f.field), f.tagsize)
+	}
+	if u.extensions.IsValid() {
+		e := ptr.offset(u.extensions).toExtensions()
+		if u.messageset {
+			n += u.sizeMessageSet(e)
+		} else {
+			n += u.sizeExtensions(e)
+		}
+	}
+	if u.v1extensions.IsValid() {
+		m := *ptr.offset(u.v1extensions).toOldExtensions()
+		n += u.sizeV1Extensions(m)
+	}
+	if u.unrecognized.IsValid() {
+		s := *ptr.offset(u.unrecognized).toBytes()
+		n += len(s)
+	}
+	// cache the result for use in marshal
+	if u.sizecache.IsValid() {
+		atomic.StoreInt32(ptr.offset(u.sizecache).toInt32(), int32(n))
+	}
+	return n
+}
+
+// cachedsize gets the size from cache. If there is no cache (i.e. message is not generated),
+// fall back to compute the size.
+func (u *marshalInfo) cachedsize(ptr pointer) int {
+	if u.sizecache.IsValid() {
+		return int(atomic.LoadInt32(ptr.offset(u.sizecache).toInt32()))
+	}
+	return u.size(ptr)
+}
+
+// marshal is the main function to marshal a message. It takes a byte slice and appends
+// the encoded data to the end of the slice, returns the slice and error (if any).
+// ptr is the pointer to the message.
+// If deterministic is true, map is marshaled in deterministic order.
+func (u *marshalInfo) marshal(b []byte, ptr pointer, deterministic bool) ([]byte, error) {
+	if atomic.LoadInt32(&u.initialized) == 0 {
+		u.computeMarshalInfo()
+	}
+
+	// If the message can marshal itself, let it do it, for compatibility.
+	// NOTE: This is not efficient.
+	if u.hasmarshaler {
+		m := ptr.asPointerTo(u.typ).Interface().(Marshaler)
+		b1, err := m.Marshal()
+		b = append(b, b1...)
+		return b, err
+	}
+
+	var err, errreq error
+	// The old marshaler encodes extensions at beginning.
+	if u.extensions.IsValid() {
+		e := ptr.offset(u.extensions).toExtensions()
+		if u.messageset {
+			b, err = u.appendMessageSet(b, e, deterministic)
+		} else {
+			b, err = u.appendExtensions(b, e, deterministic)
+		}
+		if err != nil {
+			return b, err
+		}
+	}
+	if u.v1extensions.IsValid() {
+		m := *ptr.offset(u.v1extensions).toOldExtensions()
+		b, err = u.appendV1Extensions(b, m, deterministic)
+		if err != nil {
+			return b, err
+		}
+	}
+	for _, f := range u.fields {
+		if f.required && errreq == nil {
+			if ptr.offset(f.field).getPointer().isNil() {
+				// Required field is not set.
+				// We record the error but keep going, to give a complete marshaling.
+				errreq = &RequiredNotSetError{f.name}
+				continue
+			}
+		}
+		if f.isPointer && ptr.offset(f.field).getPointer().isNil() {
+			// nil pointer always marshals to nothing
+			continue
+		}
+		b, err = f.marshaler(b, ptr.offset(f.field), f.wiretag, deterministic)
+		if err != nil {
+			if err1, ok := err.(*RequiredNotSetError); ok {
+				// Required field in submessage is not set.
+				// We record the error but keep going, to give a complete marshaling.
+				if errreq == nil {
+					errreq = &RequiredNotSetError{f.name + "." + err1.field}
+				}
+				continue
+			}
+			if err == errRepeatedHasNil {
+				err = errors.New("proto: repeated field " + f.name + " has nil element")
+			}
+			return b, err
+		}
+	}
+	if u.unrecognized.IsValid() {
+		s := *ptr.offset(u.unrecognized).toBytes()
+		b = append(b, s...)
+	}
+	return b, errreq
+}
+
+// computeMarshalInfo initializes the marshal info.
+func (u *marshalInfo) computeMarshalInfo() {
+	u.Lock()
+	defer u.Unlock()
+	if u.initialized != 0 { // non-atomic read is ok as it is protected by the lock
+		return
+	}
+
+	t := u.typ
+	u.unrecognized = invalidField
+	u.extensions = invalidField
+	u.v1extensions = invalidField
+	u.sizecache = invalidField
+
+	// If the message can marshal itself, let it do it, for compatibility.
+	// NOTE: This is not efficient.
+	if reflect.PtrTo(t).Implements(marshalerType) {
+		u.hasmarshaler = true
+		atomic.StoreInt32(&u.initialized, 1)
+		return
+	}
+
+	// get oneof implementers
+	var oneofImplementers []interface{}
+	if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
+		_, _, _, oneofImplementers = m.XXX_OneofFuncs()
+	}
+
+	n := t.NumField()
+
+	// deal with XXX fields first
+	for i := 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+		if !strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		switch f.Name {
+		case "XXX_sizecache":
+			u.sizecache = toField(&f)
+		case "XXX_unrecognized":
+			u.unrecognized = toField(&f)
+		case "XXX_InternalExtensions":
+			u.extensions = toField(&f)
+			u.messageset = f.Tag.Get("protobuf_messageset") == "1"
+		case "XXX_extensions":
+			u.v1extensions = toField(&f)
+		case "XXX_NoUnkeyedLiteral":
+			// nothing to do
+		default:
+			panic("unknown XXX field: " + f.Name)
+		}
+		n--
+	}
+
+	// normal fields
+	fields := make([]marshalFieldInfo, n) // batch allocation
+	u.fields = make([]*marshalFieldInfo, 0, n)
+	for i, j := 0, 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		field := &fields[j]
+		j++
+		field.name = f.Name
+		u.fields = append(u.fields, field)
+		if f.Tag.Get("protobuf_oneof") != "" {
+			field.computeOneofFieldInfo(&f, oneofImplementers)
+			continue
+		}
+		if f.Tag.Get("protobuf") == "" {
+			// field has no tag (not in generated message), ignore it
+			u.fields = u.fields[:len(u.fields)-1]
+			j--
+			continue
+		}
+		field.computeMarshalFieldInfo(&f)
+	}
+
+	// fields are marshaled in tag order on the wire.
+	sort.Sort(byTag(u.fields))
+
+	atomic.StoreInt32(&u.initialized, 1)
+}
+
+// helper for sorting fields by tag
+type byTag []*marshalFieldInfo
+
+func (a byTag) Len() int           { return len(a) }
+func (a byTag) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a byTag) Less(i, j int) bool { return a[i].wiretag < a[j].wiretag }
+
+// getExtElemInfo returns the information to marshal an extension element.
+// The info it returns is initialized.
+func (u *marshalInfo) getExtElemInfo(desc *ExtensionDesc) *marshalElemInfo {
+	// get from cache first
+	u.RLock()
+	e, ok := u.extElems[desc.Field]
+	u.RUnlock()
+	if ok {
+		return e
+	}
+
+	t := reflect.TypeOf(desc.ExtensionType) // pointer or slice to basic type or struct
+	tags := strings.Split(desc.Tag, ",")
+	tag, err := strconv.Atoi(tags[1])
+	if err != nil {
+		panic("tag is not an integer")
+	}
+	wt := wiretype(tags[0])
+	sizer, marshaler := typeMarshaler(t, tags, false, false)
+	e = &marshalElemInfo{
+		wiretag:   uint64(tag)<<3 | wt,
+		tagsize:   SizeVarint(uint64(tag) << 3),
+		sizer:     sizer,
+		marshaler: marshaler,
+		isptr:     t.Kind() == reflect.Ptr,
+	}
+
+	// update cache
+	u.Lock()
+	if u.extElems == nil {
+		u.extElems = make(map[int32]*marshalElemInfo)
+	}
+	u.extElems[desc.Field] = e
+	u.Unlock()
+	return e
+}
+
+// computeMarshalFieldInfo fills up the information to marshal a field.
+func (fi *marshalFieldInfo) computeMarshalFieldInfo(f *reflect.StructField) {
+	// parse protobuf tag of the field.
+	// tag has format of "bytes,49,opt,name=foo,def=hello!"
+	tags := strings.Split(f.Tag.Get("protobuf"), ",")
+	if tags[0] == "" {
+		return
+	}
+	tag, err := strconv.Atoi(tags[1])
+	if err != nil {
+		panic("tag is not an integer")
+	}
+	wt := wiretype(tags[0])
+	if tags[2] == "req" {
+		fi.required = true
+	}
+	fi.setTag(f, tag, wt)
+	fi.setMarshaler(f, tags)
+}
+
+func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofImplementers []interface{}) {
+	fi.field = toField(f)
+	fi.wiretag = 1<<31 - 1 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire.
+	fi.isPointer = true
+	fi.sizer, fi.marshaler = makeOneOfMarshaler(fi, f)
+	fi.oneofElems = make(map[reflect.Type]*marshalElemInfo)
+
+	ityp := f.Type // interface type
+	for _, o := range oneofImplementers {
+		t := reflect.TypeOf(o)
+		if !t.Implements(ityp) {
+			continue
+		}
+		sf := t.Elem().Field(0) // oneof implementer is a struct with a single field
+		tags := strings.Split(sf.Tag.Get("protobuf"), ",")
+		tag, err := strconv.Atoi(tags[1])
+		if err != nil {
+			panic("tag is not an integer")
+		}
+		wt := wiretype(tags[0])
+		sizer, marshaler := typeMarshaler(sf.Type, tags, false, true) // oneof should not omit any zero value
+		fi.oneofElems[t.Elem()] = &marshalElemInfo{
+			wiretag:   uint64(tag)<<3 | wt,
+			tagsize:   SizeVarint(uint64(tag) << 3),
+			sizer:     sizer,
+			marshaler: marshaler,
+		}
+	}
+}
+
+type oneofMessage interface {
+	XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
+}
+
+// wiretype returns the wire encoding of the type.
+func wiretype(encoding string) uint64 {
+	switch encoding {
+	case "fixed32":
+		return WireFixed32
+	case "fixed64":
+		return WireFixed64
+	case "varint", "zigzag32", "zigzag64":
+		return WireVarint
+	case "bytes":
+		return WireBytes
+	case "group":
+		return WireStartGroup
+	}
+	panic("unknown wire type " + encoding)
+}
+
+// setTag fills up the tag (in wire format) and its size in the info of a field.
+func (fi *marshalFieldInfo) setTag(f *reflect.StructField, tag int, wt uint64) {
+	fi.field = toField(f)
+	fi.wiretag = uint64(tag)<<3 | wt
+	fi.tagsize = SizeVarint(uint64(tag) << 3)
+}
+
+// setMarshaler fills up the sizer and marshaler in the info of a field.
+func (fi *marshalFieldInfo) setMarshaler(f *reflect.StructField, tags []string) {
+	switch f.Type.Kind() {
+	case reflect.Map:
+		// map field
+		fi.isPointer = true
+		fi.sizer, fi.marshaler = makeMapMarshaler(f)
+		return
+	case reflect.Ptr, reflect.Slice:
+		fi.isPointer = true
+	}
+	fi.sizer, fi.marshaler = typeMarshaler(f.Type, tags, true, false)
+}
+
+// typeMarshaler returns the sizer and marshaler of a given field.
+// t is the type of the field.
+// tags is the generated "protobuf" tag of the field.
+// If nozero is true, zero value is not marshaled to the wire.
+// If oneof is true, it is a oneof field.
+func typeMarshaler(t reflect.Type, tags []string, nozero, oneof bool) (sizer, marshaler) {
+	encoding := tags[0]
+
+	pointer := false
+	slice := false
+	if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {
+		slice = true
+		t = t.Elem()
+	}
+	if t.Kind() == reflect.Ptr {
+		pointer = true
+		t = t.Elem()
+	}
+
+	packed := false
+	proto3 := false
+	for i := 2; i < len(tags); i++ {
+		if tags[i] == "packed" {
+			packed = true
+		}
+		if tags[i] == "proto3" {
+			proto3 = true
+		}
+	}
+
+	switch t.Kind() {
+	case reflect.Bool:
+		if pointer {
+			return sizeBoolPtr, appendBoolPtr
+		}
+		if slice {
+			if packed {
+				return sizeBoolPackedSlice, appendBoolPackedSlice
+			}
+			return sizeBoolSlice, appendBoolSlice
+		}
+		if nozero {
+			return sizeBoolValueNoZero, appendBoolValueNoZero
+		}
+		return sizeBoolValue, appendBoolValue
+	case reflect.Uint32:
+		switch encoding {
+		case "fixed32":
+			if pointer {
+				return sizeFixed32Ptr, appendFixed32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeFixed32PackedSlice, appendFixed32PackedSlice
+				}
+				return sizeFixed32Slice, appendFixed32Slice
+			}
+			if nozero {
+				return sizeFixed32ValueNoZero, appendFixed32ValueNoZero
+			}
+			return sizeFixed32Value, appendFixed32Value
+		case "varint":
+			if pointer {
+				return sizeVarint32Ptr, appendVarint32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeVarint32PackedSlice, appendVarint32PackedSlice
+				}
+				return sizeVarint32Slice, appendVarint32Slice
+			}
+			if nozero {
+				return sizeVarint32ValueNoZero, appendVarint32ValueNoZero
+			}
+			return sizeVarint32Value, appendVarint32Value
+		}
+	case reflect.Int32:
+		switch encoding {
+		case "fixed32":
+			if pointer {
+				return sizeFixedS32Ptr, appendFixedS32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeFixedS32PackedSlice, appendFixedS32PackedSlice
+				}
+				return sizeFixedS32Slice, appendFixedS32Slice
+			}
+			if nozero {
+				return sizeFixedS32ValueNoZero, appendFixedS32ValueNoZero
+			}
+			return sizeFixedS32Value, appendFixedS32Value
+		case "varint":
+			if pointer {
+				return sizeVarintS32Ptr, appendVarintS32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeVarintS32PackedSlice, appendVarintS32PackedSlice
+				}
+				return sizeVarintS32Slice, appendVarintS32Slice
+			}
+			if nozero {
+				return sizeVarintS32ValueNoZero, appendVarintS32ValueNoZero
+			}
+			return sizeVarintS32Value, appendVarintS32Value
+		case "zigzag32":
+			if pointer {
+				return sizeZigzag32Ptr, appendZigzag32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeZigzag32PackedSlice, appendZigzag32PackedSlice
+				}
+				return sizeZigzag32Slice, appendZigzag32Slice
+			}
+			if nozero {
+				return sizeZigzag32ValueNoZero, appendZigzag32ValueNoZero
+			}
+			return sizeZigzag32Value, appendZigzag32Value
+		}
+	case reflect.Uint64:
+		switch encoding {
+		case "fixed64":
+			if pointer {
+				return sizeFixed64Ptr, appendFixed64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeFixed64PackedSlice, appendFixed64PackedSlice
+				}
+				return sizeFixed64Slice, appendFixed64Slice
+			}
+			if nozero {
+				return sizeFixed64ValueNoZero, appendFixed64ValueNoZero
+			}
+			return sizeFixed64Value, appendFixed64Value
+		case "varint":
+			if pointer {
+				return sizeVarint64Ptr, appendVarint64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeVarint64PackedSlice, appendVarint64PackedSlice
+				}
+				return sizeVarint64Slice, appendVarint64Slice
+			}
+			if nozero {
+				return sizeVarint64ValueNoZero, appendVarint64ValueNoZero
+			}
+			return sizeVarint64Value, appendVarint64Value
+		}
+	case reflect.Int64:
+		switch encoding {
+		case "fixed64":
+			if pointer {
+				return sizeFixedS64Ptr, appendFixedS64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeFixedS64PackedSlice, appendFixedS64PackedSlice
+				}
+				return sizeFixedS64Slice, appendFixedS64Slice
+			}
+			if nozero {
+				return sizeFixedS64ValueNoZero, appendFixedS64ValueNoZero
+			}
+			return sizeFixedS64Value, appendFixedS64Value
+		case "varint":
+			if pointer {
+				return sizeVarintS64Ptr, appendVarintS64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeVarintS64PackedSlice, appendVarintS64PackedSlice
+				}
+				return sizeVarintS64Slice, appendVarintS64Slice
+			}
+			if nozero {
+				return sizeVarintS64ValueNoZero, appendVarintS64ValueNoZero
+			}
+			return sizeVarintS64Value, appendVarintS64Value
+		case "zigzag64":
+			if pointer {
+				return sizeZigzag64Ptr, appendZigzag64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeZigzag64PackedSlice, appendZigzag64PackedSlice
+				}
+				return sizeZigzag64Slice, appendZigzag64Slice
+			}
+			if nozero {
+				return sizeZigzag64ValueNoZero, appendZigzag64ValueNoZero
+			}
+			return sizeZigzag64Value, appendZigzag64Value
+		}
+	case reflect.Float32:
+		if pointer {
+			return sizeFloat32Ptr, appendFloat32Ptr
+		}
+		if slice {
+			if packed {
+				return sizeFloat32PackedSlice, appendFloat32PackedSlice
+			}
+			return sizeFloat32Slice, appendFloat32Slice
+		}
+		if nozero {
+			return sizeFloat32ValueNoZero, appendFloat32ValueNoZero
+		}
+		return sizeFloat32Value, appendFloat32Value
+	case reflect.Float64:
+		if pointer {
+			return sizeFloat64Ptr, appendFloat64Ptr
+		}
+		if slice {
+			if packed {
+				return sizeFloat64PackedSlice, appendFloat64PackedSlice
+			}
+			return sizeFloat64Slice, appendFloat64Slice
+		}
+		if nozero {
+			return sizeFloat64ValueNoZero, appendFloat64ValueNoZero
+		}
+		return sizeFloat64Value, appendFloat64Value
+	case reflect.String:
+		if pointer {
+			return sizeStringPtr, appendStringPtr
+		}
+		if slice {
+			return sizeStringSlice, appendStringSlice
+		}
+		if nozero {
+			return sizeStringValueNoZero, appendStringValueNoZero
+		}
+		return sizeStringValue, appendStringValue
+	case reflect.Slice:
+		if slice {
+			return sizeBytesSlice, appendBytesSlice
+		}
+		if oneof {
+			// Oneof bytes field may also have "proto3" tag.
+			// We want to marshal it as a oneof field. Do this
+			// check before the proto3 check.
+			return sizeBytesOneof, appendBytesOneof
+		}
+		if proto3 {
+			return sizeBytes3, appendBytes3
+		}
+		return sizeBytes, appendBytes
+	case reflect.Struct:
+		switch encoding {
+		case "group":
+			if slice {
+				return makeGroupSliceMarshaler(getMarshalInfo(t))
+			}
+			return makeGroupMarshaler(getMarshalInfo(t))
+		case "bytes":
+			if slice {
+				return makeMessageSliceMarshaler(getMarshalInfo(t))
+			}
+			return makeMessageMarshaler(getMarshalInfo(t))
+		}
+	}
+	panic(fmt.Sprintf("unknown or mismatched type: type: %v, wire type: %v", t, encoding))
+}
+
+// Below are functions to size/marshal a specific type of a field.
+// They are stored in the field's info, and called by function pointers.
+// They have type sizer or marshaler.
+
+func sizeFixed32Value(_ pointer, tagsize int) int {
+	return 4 + tagsize
+}
+func sizeFixed32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toUint32()
+	if v == 0 {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFixed32Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toUint32Ptr()
+	if p == nil {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFixed32Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint32Slice()
+	return (4 + tagsize) * len(s)
+}
+func sizeFixed32PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
+}
+func sizeFixedS32Value(_ pointer, tagsize int) int {
+	return 4 + tagsize
+}
+func sizeFixedS32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFixedS32Ptr(ptr pointer, tagsize int) int {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFixedS32Slice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	return (4 + tagsize) * len(s)
+}
+func sizeFixedS32PackedSlice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
+}
+func sizeFloat32Value(_ pointer, tagsize int) int {
+	return 4 + tagsize
+}
+func sizeFloat32ValueNoZero(ptr pointer, tagsize int) int {
+	v := math.Float32bits(*ptr.toFloat32())
+	if v == 0 {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFloat32Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toFloat32Ptr()
+	if p == nil {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFloat32Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toFloat32Slice()
+	return (4 + tagsize) * len(s)
+}
+func sizeFloat32PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toFloat32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
+}
+func sizeFixed64Value(_ pointer, tagsize int) int {
+	return 8 + tagsize
+}
+func sizeFixed64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toUint64()
+	if v == 0 {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFixed64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toUint64Ptr()
+	if p == nil {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFixed64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint64Slice()
+	return (8 + tagsize) * len(s)
+}
+func sizeFixed64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
+}
+func sizeFixedS64Value(_ pointer, tagsize int) int {
+	return 8 + tagsize
+}
+func sizeFixedS64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFixedS64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFixedS64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	return (8 + tagsize) * len(s)
+}
+func sizeFixedS64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
+}
+func sizeFloat64Value(_ pointer, tagsize int) int {
+	return 8 + tagsize
+}
+func sizeFloat64ValueNoZero(ptr pointer, tagsize int) int {
+	v := math.Float64bits(*ptr.toFloat64())
+	if v == 0 {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFloat64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toFloat64Ptr()
+	if p == nil {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFloat64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toFloat64Slice()
+	return (8 + tagsize) * len(s)
+}
+func sizeFloat64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toFloat64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
+}
+func sizeVarint32Value(ptr pointer, tagsize int) int {
+	v := *ptr.toUint32()
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarint32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toUint32()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarint32Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toUint32Ptr()
+	if p == nil {
+		return 0
+	}
+	return SizeVarint(uint64(*p)) + tagsize
+}
+func sizeVarint32Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint32Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v)) + tagsize
+	}
+	return n
+}
+func sizeVarint32PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeVarintS32Value(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarintS32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarintS32Ptr(ptr pointer, tagsize int) int {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return 0
+	}
+	return SizeVarint(uint64(*p)) + tagsize
+}
+func sizeVarintS32Slice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v)) + tagsize
+	}
+	return n
+}
+func sizeVarintS32PackedSlice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeVarint64Value(ptr pointer, tagsize int) int {
+	v := *ptr.toUint64()
+	return SizeVarint(v) + tagsize
+}
+func sizeVarint64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toUint64()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(v) + tagsize
+}
+func sizeVarint64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toUint64Ptr()
+	if p == nil {
+		return 0
+	}
+	return SizeVarint(*p) + tagsize
+}
+func sizeVarint64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint64Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(v) + tagsize
+	}
+	return n
+}
+func sizeVarint64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(v)
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeVarintS64Value(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarintS64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarintS64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return 0
+	}
+	return SizeVarint(uint64(*p)) + tagsize
+}
+func sizeVarintS64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v)) + tagsize
+	}
+	return n
+}
+func sizeVarintS64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeZigzag32Value(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
+}
+func sizeZigzag32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
+}
+func sizeZigzag32Ptr(ptr pointer, tagsize int) int {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return 0
+	}
+	v := *p
+	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
+}
+func sizeZigzag32Slice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
+	}
+	return n
+}
+func sizeZigzag32PackedSlice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64((uint32(v) << 1) ^ uint32((int32(v) >> 31))))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeZigzag64Value(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
+}
+func sizeZigzag64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
+}
+func sizeZigzag64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return 0
+	}
+	v := *p
+	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
+}
+func sizeZigzag64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
+	}
+	return n
+}
+func sizeZigzag64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v<<1) ^ uint64((int64(v) >> 63)))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeBoolValue(_ pointer, tagsize int) int {
+	return 1 + tagsize
+}
+func sizeBoolValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toBool()
+	if !v {
+		return 0
+	}
+	return 1 + tagsize
+}
+func sizeBoolPtr(ptr pointer, tagsize int) int {
+	p := *ptr.toBoolPtr()
+	if p == nil {
+		return 0
+	}
+	return 1 + tagsize
+}
+func sizeBoolSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toBoolSlice()
+	return (1 + tagsize) * len(s)
+}
+func sizeBoolPackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toBoolSlice()
+	if len(s) == 0 {
+		return 0
+	}
+	return len(s) + SizeVarint(uint64(len(s))) + tagsize
+}
+func sizeStringValue(ptr pointer, tagsize int) int {
+	v := *ptr.toString()
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeStringValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toString()
+	if v == "" {
+		return 0
+	}
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeStringPtr(ptr pointer, tagsize int) int {
+	p := *ptr.toStringPtr()
+	if p == nil {
+		return 0
+	}
+	v := *p
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeStringSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toStringSlice()
+	n := 0
+	for _, v := range s {
+		n += len(v) + SizeVarint(uint64(len(v))) + tagsize
+	}
+	return n
+}
+func sizeBytes(ptr pointer, tagsize int) int {
+	v := *ptr.toBytes()
+	if v == nil {
+		return 0
+	}
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeBytes3(ptr pointer, tagsize int) int {
+	v := *ptr.toBytes()
+	if len(v) == 0 {
+		return 0
+	}
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeBytesOneof(ptr pointer, tagsize int) int {
+	v := *ptr.toBytes()
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeBytesSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toBytesSlice()
+	n := 0
+	for _, v := range s {
+		n += len(v) + SizeVarint(uint64(len(v))) + tagsize
+	}
+	return n
+}
+
+// appendFixed32 appends an encoded fixed32 to b.
+func appendFixed32(b []byte, v uint32) []byte {
+	b = append(b,
+		byte(v),
+		byte(v>>8),
+		byte(v>>16),
+		byte(v>>24))
+	return b
+}
+
+// appendFixed64 appends an encoded fixed64 to b.
+func appendFixed64(b []byte, v uint64) []byte {
+	b = append(b,
+		byte(v),
+		byte(v>>8),
+		byte(v>>16),
+		byte(v>>24),
+		byte(v>>32),
+		byte(v>>40),
+		byte(v>>48),
+		byte(v>>56))
+	return b
+}
+
+// appendVarint appends an encoded varint to b.
+func appendVarint(b []byte, v uint64) []byte {
+	// TODO: make 1-byte (maybe 2-byte) case inline-able, once we
+	// have non-leaf inliner.
+	switch {
+	case v < 1<<7:
+		b = append(b, byte(v))
+	case v < 1<<14:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte(v>>7))
+	case v < 1<<21:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte(v>>14))
+	case v < 1<<28:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte(v>>21))
+	case v < 1<<35:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte(v>>28))
+	case v < 1<<42:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte(v>>35))
+	case v < 1<<49:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte((v>>35)&0x7f|0x80),
+			byte(v>>42))
+	case v < 1<<56:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte((v>>35)&0x7f|0x80),
+			byte((v>>42)&0x7f|0x80),
+			byte(v>>49))
+	case v < 1<<63:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte((v>>35)&0x7f|0x80),
+			byte((v>>42)&0x7f|0x80),
+			byte((v>>49)&0x7f|0x80),
+			byte(v>>56))
+	default:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte((v>>35)&0x7f|0x80),
+			byte((v>>42)&0x7f|0x80),
+			byte((v>>49)&0x7f|0x80),
+			byte((v>>56)&0x7f|0x80),
+			1)
+	}
+	return b
+}
+
+func appendFixed32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint32()
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, v)
+	return b, nil
+}
+func appendFixed32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, v)
+	return b, nil
+}
+func appendFixed32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toUint32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, *p)
+	return b, nil
+}
+func appendFixed32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed32(b, v)
+	}
+	return b, nil
+}
+func appendFixed32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(4*len(s)))
+	for _, v := range s {
+		b = appendFixed32(b, v)
+	}
+	return b, nil
+}
+func appendFixedS32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, uint32(v))
+	return b, nil
+}
+func appendFixedS32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, uint32(v))
+	return b, nil
+}
+func appendFixedS32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, uint32(*p))
+	return b, nil
+}
+func appendFixedS32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed32(b, uint32(v))
+	}
+	return b, nil
+}
+func appendFixedS32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(4*len(s)))
+	for _, v := range s {
+		b = appendFixed32(b, uint32(v))
+	}
+	return b, nil
+}
+func appendFloat32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := math.Float32bits(*ptr.toFloat32())
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, v)
+	return b, nil
+}
+func appendFloat32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := math.Float32bits(*ptr.toFloat32())
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, v)
+	return b, nil
+}
+func appendFloat32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toFloat32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, math.Float32bits(*p))
+	return b, nil
+}
+func appendFloat32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toFloat32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed32(b, math.Float32bits(v))
+	}
+	return b, nil
+}
+func appendFloat32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toFloat32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(4*len(s)))
+	for _, v := range s {
+		b = appendFixed32(b, math.Float32bits(v))
+	}
+	return b, nil
+}
+func appendFixed64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint64()
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, v)
+	return b, nil
+}
+func appendFixed64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, v)
+	return b, nil
+}
+func appendFixed64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toUint64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, *p)
+	return b, nil
+}
+func appendFixed64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed64(b, v)
+	}
+	return b, nil
+}
+func appendFixed64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(8*len(s)))
+	for _, v := range s {
+		b = appendFixed64(b, v)
+	}
+	return b, nil
+}
+func appendFixedS64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, uint64(v))
+	return b, nil
+}
+func appendFixedS64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, uint64(v))
+	return b, nil
+}
+func appendFixedS64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, uint64(*p))
+	return b, nil
+}
+func appendFixedS64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed64(b, uint64(v))
+	}
+	return b, nil
+}
+func appendFixedS64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(8*len(s)))
+	for _, v := range s {
+		b = appendFixed64(b, uint64(v))
+	}
+	return b, nil
+}
+func appendFloat64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := math.Float64bits(*ptr.toFloat64())
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, v)
+	return b, nil
+}
+func appendFloat64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := math.Float64bits(*ptr.toFloat64())
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, v)
+	return b, nil
+}
+func appendFloat64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toFloat64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, math.Float64bits(*p))
+	return b, nil
+}
+func appendFloat64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toFloat64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed64(b, math.Float64bits(v))
+	}
+	return b, nil
+}
+func appendFloat64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toFloat64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(8*len(s)))
+	for _, v := range s {
+		b = appendFixed64(b, math.Float64bits(v))
+	}
+	return b, nil
+}
+func appendVarint32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint32()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarint32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarint32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toUint32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(*p))
+	return b, nil
+}
+func appendVarint32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarint32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarintS32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarintS32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarintS32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(*p))
+	return b, nil
+}
+func appendVarintS32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarintS32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarint64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint64()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, v)
+	return b, nil
+}
+func appendVarint64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, v)
+	return b, nil
+}
+func appendVarint64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toUint64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, *p)
+	return b, nil
+}
+func appendVarint64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, v)
+	}
+	return b, nil
+}
+func appendVarint64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(v)
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, v)
+	}
+	return b, nil
+}
+func appendVarintS64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarintS64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarintS64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(*p))
+	return b, nil
+}
+func appendVarintS64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarintS64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendZigzag32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	return b, nil
+}
+func appendZigzag32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	return b, nil
+}
+func appendZigzag32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	v := *p
+	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	return b, nil
+}
+func appendZigzag32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	}
+	return b, nil
+}
+func appendZigzag32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64((uint32(v) << 1) ^ uint32((int32(v) >> 31))))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	}
+	return b, nil
+}
+func appendZigzag64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	return b, nil
+}
+func appendZigzag64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	return b, nil
+}
+func appendZigzag64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	v := *p
+	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	return b, nil
+}
+func appendZigzag64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	}
+	return b, nil
+}
+func appendZigzag64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v<<1) ^ uint64((int64(v) >> 63)))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	}
+	return b, nil
+}
+func appendBoolValue(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBool()
+	b = appendVarint(b, wiretag)
+	if v {
+		b = append(b, 1)
+	} else {
+		b = append(b, 0)
+	}
+	return b, nil
+}
+func appendBoolValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBool()
+	if !v {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = append(b, 1)
+	return b, nil
+}
+
+func appendBoolPtr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toBoolPtr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	if *p {
+		b = append(b, 1)
+	} else {
+		b = append(b, 0)
+	}
+	return b, nil
+}
+func appendBoolSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toBoolSlice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		if v {
+			b = append(b, 1)
+		} else {
+			b = append(b, 0)
+		}
+	}
+	return b, nil
+}
+func appendBoolPackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toBoolSlice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(len(s)))
+	for _, v := range s {
+		if v {
+			b = append(b, 1)
+		} else {
+			b = append(b, 0)
+		}
+	}
+	return b, nil
+}
+func appendStringValue(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toString()
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendStringValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toString()
+	if v == "" {
+		return b, nil
+	}
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendStringPtr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toStringPtr()
+	if p == nil {
+		return b, nil
+	}
+	v := *p
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendStringSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toStringSlice()
+	for _, v := range s {
+		if !utf8.ValidString(v) {
+			return nil, errInvalidUTF8
+		}
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(len(v)))
+		b = append(b, v...)
+	}
+	return b, nil
+}
+func appendBytes(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBytes()
+	if v == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendBytes3(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBytes()
+	if len(v) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendBytesOneof(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBytes()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendBytesSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toBytesSlice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(len(v)))
+		b = append(b, v...)
+	}
+	return b, nil
+}
+
+// makeGroupMarshaler returns the sizer and marshaler for a group.
+// u is the marshal info of the underlying message.
+func makeGroupMarshaler(u *marshalInfo) (sizer, marshaler) {
+	return func(ptr pointer, tagsize int) int {
+			p := ptr.getPointer()
+			if p.isNil() {
+				return 0
+			}
+			return u.size(p) + 2*tagsize
+		},
+		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
+			p := ptr.getPointer()
+			if p.isNil() {
+				return b, nil
+			}
+			var err error
+			b = appendVarint(b, wiretag) // start group
+			b, err = u.marshal(b, p, deterministic)
+			b = appendVarint(b, wiretag+(WireEndGroup-WireStartGroup)) // end group
+			return b, err
+		}
+}
+
+// makeGroupSliceMarshaler returns the sizer and marshaler for a group slice.
+// u is the marshal info of the underlying message.
+func makeGroupSliceMarshaler(u *marshalInfo) (sizer, marshaler) {
+	return func(ptr pointer, tagsize int) int {
+			s := ptr.getPointerSlice()
+			n := 0
+			for _, v := range s {
+				if v.isNil() {
+					continue
+				}
+				n += u.size(v) + 2*tagsize
+			}
+			return n
+		},
+		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
+			s := ptr.getPointerSlice()
+			var err, errreq error
+			for _, v := range s {
+				if v.isNil() {
+					return b, errRepeatedHasNil
+				}
+				b = appendVarint(b, wiretag) // start group
+				b, err = u.marshal(b, v, deterministic)
+				b = appendVarint(b, wiretag+(WireEndGroup-WireStartGroup)) // end group
+				if err != nil {
+					if _, ok := err.(*RequiredNotSetError); ok {
+						// Required field in submessage is not set.
+						// We record the error but keep going, to give a complete marshaling.
+						if errreq == nil {
+							errreq = err
+						}
+						continue
+					}
+					if err == ErrNil {
+						err = errRepeatedHasNil
+					}
+					return b, err
+				}
+			}
+			return b, errreq
+		}
+}
+
+// makeMessageMarshaler returns the sizer and marshaler for a message field.
+// u is the marshal info of the message.
+func makeMessageMarshaler(u *marshalInfo) (sizer, marshaler) {
+	return func(ptr pointer, tagsize int) int {
+			p := ptr.getPointer()
+			if p.isNil() {
+				return 0
+			}
+			siz := u.size(p)
+			return siz + SizeVarint(uint64(siz)) + tagsize
+		},
+		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
+			p := ptr.getPointer()
+			if p.isNil() {
+				return b, nil
+			}
+			b = appendVarint(b, wiretag)
+			siz := u.cachedsize(p)
+			b = appendVarint(b, uint64(siz))
+			return u.marshal(b, p, deterministic)
+		}
+}
+
+// makeMessageSliceMarshaler returns the sizer and marshaler for a message slice.
+// u is the marshal info of the message.
+func makeMessageSliceMarshaler(u *marshalInfo) (sizer, marshaler) {
+	return func(ptr pointer, tagsize int) int {
+			s := ptr.getPointerSlice()
+			n := 0
+			for _, v := range s {
+				if v.isNil() {
+					continue
+				}
+				siz := u.size(v)
+				n += siz + SizeVarint(uint64(siz)) + tagsize
+			}
+			return n
+		},
+		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
+			s := ptr.getPointerSlice()
+			var err, errreq error
+			for _, v := range s {
+				if v.isNil() {
+					return b, errRepeatedHasNil
+				}
+				b = appendVarint(b, wiretag)
+				siz := u.cachedsize(v)
+				b = appendVarint(b, uint64(siz))
+				b, err = u.marshal(b, v, deterministic)
+
+				if err != nil {
+					if _, ok := err.(*RequiredNotSetError); ok {
+						// Required field in submessage is not set.
+						// We record the error but keep going, to give a complete marshaling.
+						if errreq == nil {
+							errreq = err
+						}
+						continue
+					}
+					if err == ErrNil {
+						err = errRepeatedHasNil
+					}
+					return b, err
+				}
+			}
+			return b, errreq
+		}
+}
+
+// makeMapMarshaler returns the sizer and marshaler for a map field.
+// f is the pointer to the reflect data structure of the field.
+func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) {
+	// figure out key and value type
+	t := f.Type
+	keyType := t.Key()
+	valType := t.Elem()
+	keyTags := strings.Split(f.Tag.Get("protobuf_key"), ",")
+	valTags := strings.Split(f.Tag.Get("protobuf_val"), ",")
+	keySizer, keyMarshaler := typeMarshaler(keyType, keyTags, false, false) // don't omit zero value in map
+	valSizer, valMarshaler := typeMarshaler(valType, valTags, false, false) // don't omit zero value in map
+	keyWireTag := 1<<3 | wiretype(keyTags[0])
+	valWireTag := 2<<3 | wiretype(valTags[0])
+
+	// We create an interface to get the addresses of the map key and value.
+	// If value is pointer-typed, the interface is a direct interface, the
+	// idata itself is the value. Otherwise, the idata is the pointer to the
+	// value.
+	// Key cannot be pointer-typed.
+	valIsPtr := valType.Kind() == reflect.Ptr
+	return func(ptr pointer, tagsize int) int {
+			m := ptr.asPointerTo(t).Elem() // the map
+			n := 0
+			for _, k := range m.MapKeys() {
+				ki := k.Interface()
+				vi := m.MapIndex(k).Interface()
+				kaddr := toAddrPointer(&ki, false)             // pointer to key
+				vaddr := toAddrPointer(&vi, valIsPtr)          // pointer to value
+				siz := keySizer(kaddr, 1) + valSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1)
+				n += siz + SizeVarint(uint64(siz)) + tagsize
+			}
+			return n
+		},
+		func(b []byte, ptr pointer, tag uint64, deterministic bool) ([]byte, error) {
+			m := ptr.asPointerTo(t).Elem() // the map
+			var err error
+			keys := m.MapKeys()
+			if len(keys) > 1 && deterministic {
+				sort.Sort(mapKeys(keys))
+			}
+			for _, k := range keys {
+				ki := k.Interface()
+				vi := m.MapIndex(k).Interface()
+				kaddr := toAddrPointer(&ki, false)    // pointer to key
+				vaddr := toAddrPointer(&vi, valIsPtr) // pointer to value
+				b = appendVarint(b, tag)
+				siz := keySizer(kaddr, 1) + valSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1)
+				b = appendVarint(b, uint64(siz))
+				b, err = keyMarshaler(b, kaddr, keyWireTag, deterministic)
+				if err != nil {
+					return b, err
+				}
+				b, err = valMarshaler(b, vaddr, valWireTag, deterministic)
+				if err != nil && err != ErrNil { // allow nil value in map
+					return b, err
+				}
+			}
+			return b, nil
+		}
+}
+
+// makeOneOfMarshaler returns the sizer and marshaler for a oneof field.
+// fi is the marshal info of the field.
+// f is the pointer to the reflect data structure of the field.
+func makeOneOfMarshaler(fi *marshalFieldInfo, f *reflect.StructField) (sizer, marshaler) {
+	// Oneof field is an interface. We need to get the actual data type on the fly.
+	t := f.Type
+	return func(ptr pointer, _ int) int {
+			p := ptr.getInterfacePointer()
+			if p.isNil() {
+				return 0
+			}
+			v := ptr.asPointerTo(t).Elem().Elem().Elem() // *interface -> interface -> *struct -> struct
+			telem := v.Type()
+			e := fi.oneofElems[telem]
+			return e.sizer(p, e.tagsize)
+		},
+		func(b []byte, ptr pointer, _ uint64, deterministic bool) ([]byte, error) {
+			p := ptr.getInterfacePointer()
+			if p.isNil() {
+				return b, nil
+			}
+			v := ptr.asPointerTo(t).Elem().Elem().Elem() // *interface -> interface -> *struct -> struct
+			telem := v.Type()
+			if telem.Field(0).Type.Kind() == reflect.Ptr && p.getPointer().isNil() {
+				return b, errOneofHasNil
+			}
+			e := fi.oneofElems[telem]
+			return e.marshaler(b, p, e.wiretag, deterministic)
+		}
+}
+
+// sizeExtensions computes the size of encoded data for a XXX_InternalExtensions field.
+func (u *marshalInfo) sizeExtensions(ext *XXX_InternalExtensions) int {
+	m, mu := ext.extensionsRead()
+	if m == nil {
+		return 0
+	}
+	mu.Lock()
+
+	n := 0
+	for _, e := range m {
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			n += len(e.enc)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		n += ei.sizer(p, ei.tagsize)
+	}
+	mu.Unlock()
+	return n
+}
+
+// appendExtensions marshals a XXX_InternalExtensions field to the end of byte slice b.
+func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, deterministic bool) ([]byte, error) {
+	m, mu := ext.extensionsRead()
+	if m == nil {
+		return b, nil
+	}
+	mu.Lock()
+	defer mu.Unlock()
+
+	var err error
+
+	// Fast-path for common cases: zero or one extensions.
+	// Don't bother sorting the keys.
+	if len(m) <= 1 {
+		for _, e := range m {
+			if e.value == nil || e.desc == nil {
+				// Extension is only in its encoded form.
+				b = append(b, e.enc...)
+				continue
+			}
+
+			// We don't skip extensions that have an encoded form set,
+			// because the extension value may have been mutated after
+			// the last time this function was called.
+
+			ei := u.getExtElemInfo(e.desc)
+			v := e.value
+			p := toAddrPointer(&v, ei.isptr)
+			b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
+			if err != nil {
+				return b, err
+			}
+		}
+		return b, nil
+	}
+
+	// Sort the keys to provide a deterministic encoding.
+	// Not sure this is required, but the old code does it.
+	keys := make([]int, 0, len(m))
+	for k := range m {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	for _, k := range keys {
+		e := m[int32(k)]
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			b = append(b, e.enc...)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
+		if err != nil {
+			return b, err
+		}
+	}
+	return b, nil
+}
+
+// message set format is:
+//   message MessageSet {
+//     repeated group Item = 1 {
+//       required int32 type_id = 2;
+//       required string message = 3;
+//     };
+//   }
+
+// sizeMessageSet computes the size of encoded data for a XXX_InternalExtensions field
+// in message set format (above).
+func (u *marshalInfo) sizeMessageSet(ext *XXX_InternalExtensions) int {
+	m, mu := ext.extensionsRead()
+	if m == nil {
+		return 0
+	}
+	mu.Lock()
+
+	n := 0
+	for id, e := range m {
+		n += 2                          // start group, end group. tag = 1 (size=1)
+		n += SizeVarint(uint64(id)) + 1 // type_id, tag = 2 (size=1)
+
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
+			siz := len(msgWithLen)
+			n += siz + 1 // message, tag = 3 (size=1)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		n += ei.sizer(p, 1) // message, tag = 3 (size=1)
+	}
+	mu.Unlock()
+	return n
+}
+
+// appendMessageSet marshals a XXX_InternalExtensions field in message set format (above)
+// to the end of byte slice b.
+func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, deterministic bool) ([]byte, error) {
+	m, mu := ext.extensionsRead()
+	if m == nil {
+		return b, nil
+	}
+	mu.Lock()
+	defer mu.Unlock()
+
+	var err error
+
+	// Fast-path for common cases: zero or one extensions.
+	// Don't bother sorting the keys.
+	if len(m) <= 1 {
+		for id, e := range m {
+			b = append(b, 1<<3|WireStartGroup)
+			b = append(b, 2<<3|WireVarint)
+			b = appendVarint(b, uint64(id))
+
+			if e.value == nil || e.desc == nil {
+				// Extension is only in its encoded form.
+				msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
+				b = append(b, 3<<3|WireBytes)
+				b = append(b, msgWithLen...)
+				b = append(b, 1<<3|WireEndGroup)
+				continue
+			}
+
+			// We don't skip extensions that have an encoded form set,
+			// because the extension value may have been mutated after
+			// the last time this function was called.
+
+			ei := u.getExtElemInfo(e.desc)
+			v := e.value
+			p := toAddrPointer(&v, ei.isptr)
+			b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic)
+			if err != nil {
+				return b, err
+			}
+			b = append(b, 1<<3|WireEndGroup)
+		}
+		return b, nil
+	}
+
+	// Sort the keys to provide a deterministic encoding.
+	keys := make([]int, 0, len(m))
+	for k := range m {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	for _, id := range keys {
+		e := m[int32(id)]
+		b = append(b, 1<<3|WireStartGroup)
+		b = append(b, 2<<3|WireVarint)
+		b = appendVarint(b, uint64(id))
+
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
+			b = append(b, 3<<3|WireBytes)
+			b = append(b, msgWithLen...)
+			b = append(b, 1<<3|WireEndGroup)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic)
+		b = append(b, 1<<3|WireEndGroup)
+		if err != nil {
+			return b, err
+		}
+	}
+	return b, nil
+}
+
+// sizeV1Extensions computes the size of encoded data for a V1-API extension field.
+func (u *marshalInfo) sizeV1Extensions(m map[int32]Extension) int {
+	if m == nil {
+		return 0
+	}
+
+	n := 0
+	for _, e := range m {
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			n += len(e.enc)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		n += ei.sizer(p, ei.tagsize)
+	}
+	return n
+}
+
+// appendV1Extensions marshals a V1-API extension field to the end of byte slice b.
+func (u *marshalInfo) appendV1Extensions(b []byte, m map[int32]Extension, deterministic bool) ([]byte, error) {
+	if m == nil {
+		return b, nil
+	}
+
+	// Sort the keys to provide a deterministic encoding.
+	keys := make([]int, 0, len(m))
+	for k := range m {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	var err error
+	for _, k := range keys {
+		e := m[int32(k)]
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			b = append(b, e.enc...)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
+		if err != nil {
+			return b, err
+		}
+	}
+	return b, nil
+}
+
+// newMarshaler is the interface representing objects that can marshal themselves.
+//
+// This exists to support protoc-gen-go generated messages.
+// The proto package will stop type-asserting to this interface in the future.
+//
+// DO NOT DEPEND ON THIS.
+type newMarshaler interface {
+	XXX_Size() int
+	XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
+}
+
+// Size returns the encoded size of a protocol buffer message.
+// This is the main entry point.
+func Size(pb Message) int {
+	if m, ok := pb.(newMarshaler); ok {
+		return m.XXX_Size()
+	}
+	if m, ok := pb.(Marshaler); ok {
+		// If the message can marshal itself, let it do it, for compatibility.
+		// NOTE: This is not efficient.
+		b, _ := m.Marshal()
+		return len(b)
+	}
+	// in case somehow we didn't generate the wrapper
+	if pb == nil {
+		return 0
+	}
+	var info InternalMessageInfo
+	return info.Size(pb)
+}
+
+// Marshal takes a protocol buffer message
+// and encodes it into the wire format, returning the data.
+// This is the main entry point.
+func Marshal(pb Message) ([]byte, error) {
+	if m, ok := pb.(newMarshaler); ok {
+		siz := m.XXX_Size()
+		b := make([]byte, 0, siz)
+		return m.XXX_Marshal(b, false)
+	}
+	if m, ok := pb.(Marshaler); ok {
+		// If the message can marshal itself, let it do it, for compatibility.
+		// NOTE: This is not efficient.
+		return m.Marshal()
+	}
+	// in case somehow we didn't generate the wrapper
+	if pb == nil {
+		return nil, ErrNil
+	}
+	var info InternalMessageInfo
+	siz := info.Size(pb)
+	b := make([]byte, 0, siz)
+	return info.Marshal(b, pb, false)
+}
+
+// Marshal takes a protocol buffer message
+// and encodes it into the wire format, writing the result to the
+// Buffer.
+// This is an alternative entry point. It is not necessary to use
+// a Buffer for most applications.
+func (p *Buffer) Marshal(pb Message) error {
+	var err error
+	if m, ok := pb.(newMarshaler); ok {
+		siz := m.XXX_Size()
+		p.grow(siz) // make sure buf has enough capacity
+		p.buf, err = m.XXX_Marshal(p.buf, p.deterministic)
+		return err
+	}
+	if m, ok := pb.(Marshaler); ok {
+		// If the message can marshal itself, let it do it, for compatibility.
+		// NOTE: This is not efficient.
+		b, err := m.Marshal()
+		p.buf = append(p.buf, b...)
+		return err
+	}
+	// in case somehow we didn't generate the wrapper
+	if pb == nil {
+		return ErrNil
+	}
+	var info InternalMessageInfo
+	siz := info.Size(pb)
+	p.grow(siz) // make sure buf has enough capacity
+	p.buf, err = info.Marshal(p.buf, pb, p.deterministic)
+	return err
+}
+
+// grow grows the buffer's capacity, if necessary, to guarantee space for
+// another n bytes. After grow(n), at least n bytes can be written to the
+// buffer without another allocation.
+func (p *Buffer) grow(n int) {
+	need := len(p.buf) + n
+	if need <= cap(p.buf) {
+		return
+	}
+	newCap := len(p.buf) * 2
+	if newCap < need {
+		newCap = need
+	}
+	p.buf = append(make([]byte, 0, newCap), p.buf...)
+}
diff --git a/vendor/github.com/golang/protobuf/proto/table_merge.go b/vendor/github.com/golang/protobuf/proto/table_merge.go
new file mode 100644
index 00000000..5525def6
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/table_merge.go
@@ -0,0 +1,654 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2016 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+	"sync"
+	"sync/atomic"
+)
+
+// Merge merges the src message into dst.
+// This assumes that dst and src of the same type and are non-nil.
+func (a *InternalMessageInfo) Merge(dst, src Message) {
+	mi := atomicLoadMergeInfo(&a.merge)
+	if mi == nil {
+		mi = getMergeInfo(reflect.TypeOf(dst).Elem())
+		atomicStoreMergeInfo(&a.merge, mi)
+	}
+	mi.merge(toPointer(&dst), toPointer(&src))
+}
+
+type mergeInfo struct {
+	typ reflect.Type
+
+	initialized int32 // 0: only typ is valid, 1: everything is valid
+	lock        sync.Mutex
+
+	fields       []mergeFieldInfo
+	unrecognized field // Offset of XXX_unrecognized
+}
+
+type mergeFieldInfo struct {
+	field field // Offset of field, guaranteed to be valid
+
+	// isPointer reports whether the value in the field is a pointer.
+	// This is true for the following situations:
+	//	* Pointer to struct
+	//	* Pointer to basic type (proto2 only)
+	//	* Slice (first value in slice header is a pointer)
+	//	* String (first value in string header is a pointer)
+	isPointer bool
+
+	// basicWidth reports the width of the field assuming that it is directly
+	// embedded in the struct (as is the case for basic types in proto3).
+	// The possible values are:
+	// 	0: invalid
+	//	1: bool
+	//	4: int32, uint32, float32
+	//	8: int64, uint64, float64
+	basicWidth int
+
+	// Where dst and src are pointers to the types being merged.
+	merge func(dst, src pointer)
+}
+
+var (
+	mergeInfoMap  = map[reflect.Type]*mergeInfo{}
+	mergeInfoLock sync.Mutex
+)
+
+func getMergeInfo(t reflect.Type) *mergeInfo {
+	mergeInfoLock.Lock()
+	defer mergeInfoLock.Unlock()
+	mi := mergeInfoMap[t]
+	if mi == nil {
+		mi = &mergeInfo{typ: t}
+		mergeInfoMap[t] = mi
+	}
+	return mi
+}
+
+// merge merges src into dst assuming they are both of type *mi.typ.
+func (mi *mergeInfo) merge(dst, src pointer) {
+	if dst.isNil() {
+		panic("proto: nil destination")
+	}
+	if src.isNil() {
+		return // Nothing to do.
+	}
+
+	if atomic.LoadInt32(&mi.initialized) == 0 {
+		mi.computeMergeInfo()
+	}
+
+	for _, fi := range mi.fields {
+		sfp := src.offset(fi.field)
+
+		// As an optimization, we can avoid the merge function call cost
+		// if we know for sure that the source will have no effect
+		// by checking if it is the zero value.
+		if unsafeAllowed {
+			if fi.isPointer && sfp.getPointer().isNil() { // Could be slice or string
+				continue
+			}
+			if fi.basicWidth > 0 {
+				switch {
+				case fi.basicWidth == 1 && !*sfp.toBool():
+					continue
+				case fi.basicWidth == 4 && *sfp.toUint32() == 0:
+					continue
+				case fi.basicWidth == 8 && *sfp.toUint64() == 0:
+					continue
+				}
+			}
+		}
+
+		dfp := dst.offset(fi.field)
+		fi.merge(dfp, sfp)
+	}
+
+	// TODO: Make this faster?
+	out := dst.asPointerTo(mi.typ).Elem()
+	in := src.asPointerTo(mi.typ).Elem()
+	if emIn, err := extendable(in.Addr().Interface()); err == nil {
+		emOut, _ := extendable(out.Addr().Interface())
+		mIn, muIn := emIn.extensionsRead()
+		if mIn != nil {
+			mOut := emOut.extensionsWrite()
+			muIn.Lock()
+			mergeExtension(mOut, mIn)
+			muIn.Unlock()
+		}
+	}
+
+	if mi.unrecognized.IsValid() {
+		if b := *src.offset(mi.unrecognized).toBytes(); len(b) > 0 {
+			*dst.offset(mi.unrecognized).toBytes() = append([]byte(nil), b...)
+		}
+	}
+}
+
+func (mi *mergeInfo) computeMergeInfo() {
+	mi.lock.Lock()
+	defer mi.lock.Unlock()
+	if mi.initialized != 0 {
+		return
+	}
+	t := mi.typ
+	n := t.NumField()
+
+	props := GetProperties(t)
+	for i := 0; i < n; i++ {
+		f := t.Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+
+		mfi := mergeFieldInfo{field: toField(&f)}
+		tf := f.Type
+
+		// As an optimization, we can avoid the merge function call cost
+		// if we know for sure that the source will have no effect
+		// by checking if it is the zero value.
+		if unsafeAllowed {
+			switch tf.Kind() {
+			case reflect.Ptr, reflect.Slice, reflect.String:
+				// As a special case, we assume slices and strings are pointers
+				// since we know that the first field in the SliceSlice or
+				// StringHeader is a data pointer.
+				mfi.isPointer = true
+			case reflect.Bool:
+				mfi.basicWidth = 1
+			case reflect.Int32, reflect.Uint32, reflect.Float32:
+				mfi.basicWidth = 4
+			case reflect.Int64, reflect.Uint64, reflect.Float64:
+				mfi.basicWidth = 8
+			}
+		}
+
+		// Unwrap tf to get at its most basic type.
+		var isPointer, isSlice bool
+		if tf.Kind() == reflect.Slice && tf.Elem().Kind() != reflect.Uint8 {
+			isSlice = true
+			tf = tf.Elem()
+		}
+		if tf.Kind() == reflect.Ptr {
+			isPointer = true
+			tf = tf.Elem()
+		}
+		if isPointer && isSlice && tf.Kind() != reflect.Struct {
+			panic("both pointer and slice for basic type in " + tf.Name())
+		}
+
+		switch tf.Kind() {
+		case reflect.Int32:
+			switch {
+			case isSlice: // E.g., []int32
+				mfi.merge = func(dst, src pointer) {
+					// NOTE: toInt32Slice is not defined (see pointer_reflect.go).
+					/*
+						sfsp := src.toInt32Slice()
+						if *sfsp != nil {
+							dfsp := dst.toInt32Slice()
+							*dfsp = append(*dfsp, *sfsp...)
+							if *dfsp == nil {
+								*dfsp = []int64{}
+							}
+						}
+					*/
+					sfs := src.getInt32Slice()
+					if sfs != nil {
+						dfs := dst.getInt32Slice()
+						dfs = append(dfs, sfs...)
+						if dfs == nil {
+							dfs = []int32{}
+						}
+						dst.setInt32Slice(dfs)
+					}
+				}
+			case isPointer: // E.g., *int32
+				mfi.merge = func(dst, src pointer) {
+					// NOTE: toInt32Ptr is not defined (see pointer_reflect.go).
+					/*
+						sfpp := src.toInt32Ptr()
+						if *sfpp != nil {
+							dfpp := dst.toInt32Ptr()
+							if *dfpp == nil {
+								*dfpp = Int32(**sfpp)
+							} else {
+								**dfpp = **sfpp
+							}
+						}
+					*/
+					sfp := src.getInt32Ptr()
+					if sfp != nil {
+						dfp := dst.getInt32Ptr()
+						if dfp == nil {
+							dst.setInt32Ptr(*sfp)
+						} else {
+							*dfp = *sfp
+						}
+					}
+				}
+			default: // E.g., int32
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toInt32(); v != 0 {
+						*dst.toInt32() = v
+					}
+				}
+			}
+		case reflect.Int64:
+			switch {
+			case isSlice: // E.g., []int64
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toInt64Slice()
+					if *sfsp != nil {
+						dfsp := dst.toInt64Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []int64{}
+						}
+					}
+				}
+			case isPointer: // E.g., *int64
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toInt64Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toInt64Ptr()
+						if *dfpp == nil {
+							*dfpp = Int64(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., int64
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toInt64(); v != 0 {
+						*dst.toInt64() = v
+					}
+				}
+			}
+		case reflect.Uint32:
+			switch {
+			case isSlice: // E.g., []uint32
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toUint32Slice()
+					if *sfsp != nil {
+						dfsp := dst.toUint32Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []uint32{}
+						}
+					}
+				}
+			case isPointer: // E.g., *uint32
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toUint32Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toUint32Ptr()
+						if *dfpp == nil {
+							*dfpp = Uint32(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., uint32
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toUint32(); v != 0 {
+						*dst.toUint32() = v
+					}
+				}
+			}
+		case reflect.Uint64:
+			switch {
+			case isSlice: // E.g., []uint64
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toUint64Slice()
+					if *sfsp != nil {
+						dfsp := dst.toUint64Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []uint64{}
+						}
+					}
+				}
+			case isPointer: // E.g., *uint64
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toUint64Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toUint64Ptr()
+						if *dfpp == nil {
+							*dfpp = Uint64(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., uint64
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toUint64(); v != 0 {
+						*dst.toUint64() = v
+					}
+				}
+			}
+		case reflect.Float32:
+			switch {
+			case isSlice: // E.g., []float32
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toFloat32Slice()
+					if *sfsp != nil {
+						dfsp := dst.toFloat32Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []float32{}
+						}
+					}
+				}
+			case isPointer: // E.g., *float32
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toFloat32Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toFloat32Ptr()
+						if *dfpp == nil {
+							*dfpp = Float32(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., float32
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toFloat32(); v != 0 {
+						*dst.toFloat32() = v
+					}
+				}
+			}
+		case reflect.Float64:
+			switch {
+			case isSlice: // E.g., []float64
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toFloat64Slice()
+					if *sfsp != nil {
+						dfsp := dst.toFloat64Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []float64{}
+						}
+					}
+				}
+			case isPointer: // E.g., *float64
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toFloat64Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toFloat64Ptr()
+						if *dfpp == nil {
+							*dfpp = Float64(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., float64
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toFloat64(); v != 0 {
+						*dst.toFloat64() = v
+					}
+				}
+			}
+		case reflect.Bool:
+			switch {
+			case isSlice: // E.g., []bool
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toBoolSlice()
+					if *sfsp != nil {
+						dfsp := dst.toBoolSlice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []bool{}
+						}
+					}
+				}
+			case isPointer: // E.g., *bool
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toBoolPtr()
+					if *sfpp != nil {
+						dfpp := dst.toBoolPtr()
+						if *dfpp == nil {
+							*dfpp = Bool(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., bool
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toBool(); v {
+						*dst.toBool() = v
+					}
+				}
+			}
+		case reflect.String:
+			switch {
+			case isSlice: // E.g., []string
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toStringSlice()
+					if *sfsp != nil {
+						dfsp := dst.toStringSlice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []string{}
+						}
+					}
+				}
+			case isPointer: // E.g., *string
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toStringPtr()
+					if *sfpp != nil {
+						dfpp := dst.toStringPtr()
+						if *dfpp == nil {
+							*dfpp = String(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., string
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toString(); v != "" {
+						*dst.toString() = v
+					}
+				}
+			}
+		case reflect.Slice:
+			isProto3 := props.Prop[i].proto3
+			switch {
+			case isPointer:
+				panic("bad pointer in byte slice case in " + tf.Name())
+			case tf.Elem().Kind() != reflect.Uint8:
+				panic("bad element kind in byte slice case in " + tf.Name())
+			case isSlice: // E.g., [][]byte
+				mfi.merge = func(dst, src pointer) {
+					sbsp := src.toBytesSlice()
+					if *sbsp != nil {
+						dbsp := dst.toBytesSlice()
+						for _, sb := range *sbsp {
+							if sb == nil {
+								*dbsp = append(*dbsp, nil)
+							} else {
+								*dbsp = append(*dbsp, append([]byte{}, sb...))
+							}
+						}
+						if *dbsp == nil {
+							*dbsp = [][]byte{}
+						}
+					}
+				}
+			default: // E.g., []byte
+				mfi.merge = func(dst, src pointer) {
+					sbp := src.toBytes()
+					if *sbp != nil {
+						dbp := dst.toBytes()
+						if !isProto3 || len(*sbp) > 0 {
+							*dbp = append([]byte{}, *sbp...)
+						}
+					}
+				}
+			}
+		case reflect.Struct:
+			switch {
+			case !isPointer:
+				panic(fmt.Sprintf("message field %s without pointer", tf))
+			case isSlice: // E.g., []*pb.T
+				mi := getMergeInfo(tf)
+				mfi.merge = func(dst, src pointer) {
+					sps := src.getPointerSlice()
+					if sps != nil {
+						dps := dst.getPointerSlice()
+						for _, sp := range sps {
+							var dp pointer
+							if !sp.isNil() {
+								dp = valToPointer(reflect.New(tf))
+								mi.merge(dp, sp)
+							}
+							dps = append(dps, dp)
+						}
+						if dps == nil {
+							dps = []pointer{}
+						}
+						dst.setPointerSlice(dps)
+					}
+				}
+			default: // E.g., *pb.T
+				mi := getMergeInfo(tf)
+				mfi.merge = func(dst, src pointer) {
+					sp := src.getPointer()
+					if !sp.isNil() {
+						dp := dst.getPointer()
+						if dp.isNil() {
+							dp = valToPointer(reflect.New(tf))
+							dst.setPointer(dp)
+						}
+						mi.merge(dp, sp)
+					}
+				}
+			}
+		case reflect.Map:
+			switch {
+			case isPointer || isSlice:
+				panic("bad pointer or slice in map case in " + tf.Name())
+			default: // E.g., map[K]V
+				mfi.merge = func(dst, src pointer) {
+					sm := src.asPointerTo(tf).Elem()
+					if sm.Len() == 0 {
+						return
+					}
+					dm := dst.asPointerTo(tf).Elem()
+					if dm.IsNil() {
+						dm.Set(reflect.MakeMap(tf))
+					}
+
+					switch tf.Elem().Kind() {
+					case reflect.Ptr: // Proto struct (e.g., *T)
+						for _, key := range sm.MapKeys() {
+							val := sm.MapIndex(key)
+							val = reflect.ValueOf(Clone(val.Interface().(Message)))
+							dm.SetMapIndex(key, val)
+						}
+					case reflect.Slice: // E.g. Bytes type (e.g., []byte)
+						for _, key := range sm.MapKeys() {
+							val := sm.MapIndex(key)
+							val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
+							dm.SetMapIndex(key, val)
+						}
+					default: // Basic type (e.g., string)
+						for _, key := range sm.MapKeys() {
+							val := sm.MapIndex(key)
+							dm.SetMapIndex(key, val)
+						}
+					}
+				}
+			}
+		case reflect.Interface:
+			// Must be oneof field.
+			switch {
+			case isPointer || isSlice:
+				panic("bad pointer or slice in interface case in " + tf.Name())
+			default: // E.g., interface{}
+				// TODO: Make this faster?
+				mfi.merge = func(dst, src pointer) {
+					su := src.asPointerTo(tf).Elem()
+					if !su.IsNil() {
+						du := dst.asPointerTo(tf).Elem()
+						typ := su.Elem().Type()
+						if du.IsNil() || du.Elem().Type() != typ {
+							du.Set(reflect.New(typ.Elem())) // Initialize interface if empty
+						}
+						sv := su.Elem().Elem().Field(0)
+						if sv.Kind() == reflect.Ptr && sv.IsNil() {
+							return
+						}
+						dv := du.Elem().Elem().Field(0)
+						if dv.Kind() == reflect.Ptr && dv.IsNil() {
+							dv.Set(reflect.New(sv.Type().Elem())) // Initialize proto message if empty
+						}
+						switch sv.Type().Kind() {
+						case reflect.Ptr: // Proto struct (e.g., *T)
+							Merge(dv.Interface().(Message), sv.Interface().(Message))
+						case reflect.Slice: // E.g. Bytes type (e.g., []byte)
+							dv.Set(reflect.ValueOf(append([]byte{}, sv.Bytes()...)))
+						default: // Basic type (e.g., string)
+							dv.Set(sv)
+						}
+					}
+				}
+			}
+		default:
+			panic(fmt.Sprintf("merger not found for type:%s", tf))
+		}
+		mi.fields = append(mi.fields, mfi)
+	}
+
+	mi.unrecognized = invalidField
+	if f, ok := t.FieldByName("XXX_unrecognized"); ok {
+		if f.Type != reflect.TypeOf([]byte{}) {
+			panic("expected XXX_unrecognized to be of type []byte")
+		}
+		mi.unrecognized = toField(&f)
+	}
+
+	atomic.StoreInt32(&mi.initialized, 1)
+}
diff --git a/vendor/github.com/golang/protobuf/proto/table_unmarshal.go b/vendor/github.com/golang/protobuf/proto/table_unmarshal.go
new file mode 100644
index 00000000..55f0340a
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/table_unmarshal.go
@@ -0,0 +1,1967 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2016 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"math"
+	"reflect"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"unicode/utf8"
+)
+
+// Unmarshal is the entry point from the generated .pb.go files.
+// This function is not intended to be used by non-generated code.
+// This function is not subject to any compatibility guarantee.
+// msg contains a pointer to a protocol buffer struct.
+// b is the data to be unmarshaled into the protocol buffer.
+// a is a pointer to a place to store cached unmarshal information.
+func (a *InternalMessageInfo) Unmarshal(msg Message, b []byte) error {
+	// Load the unmarshal information for this message type.
+	// The atomic load ensures memory consistency.
+	u := atomicLoadUnmarshalInfo(&a.unmarshal)
+	if u == nil {
+		// Slow path: find unmarshal info for msg, update a with it.
+		u = getUnmarshalInfo(reflect.TypeOf(msg).Elem())
+		atomicStoreUnmarshalInfo(&a.unmarshal, u)
+	}
+	// Then do the unmarshaling.
+	err := u.unmarshal(toPointer(&msg), b)
+	return err
+}
+
+type unmarshalInfo struct {
+	typ reflect.Type // type of the protobuf struct
+
+	// 0 = only typ field is initialized
+	// 1 = completely initialized
+	initialized     int32
+	lock            sync.Mutex                    // prevents double initialization
+	dense           []unmarshalFieldInfo          // fields indexed by tag #
+	sparse          map[uint64]unmarshalFieldInfo // fields indexed by tag #
+	reqFields       []string                      // names of required fields
+	reqMask         uint64                        // 1<<len(reqFields)-1
+	unrecognized    field                         // offset of []byte to put unrecognized data (or invalidField if we should throw it away)
+	extensions      field                         // offset of extensions field (of type proto.XXX_InternalExtensions), or invalidField if it does not exist
+	oldExtensions   field                         // offset of old-form extensions field (of type map[int]Extension)
+	extensionRanges []ExtensionRange              // if non-nil, implies extensions field is valid
+	isMessageSet    bool                          // if true, implies extensions field is valid
+}
+
+// An unmarshaler takes a stream of bytes and a pointer to a field of a message.
+// It decodes the field, stores it at f, and returns the unused bytes.
+// w is the wire encoding.
+// b is the data after the tag and wire encoding have been read.
+type unmarshaler func(b []byte, f pointer, w int) ([]byte, error)
+
+type unmarshalFieldInfo struct {
+	// location of the field in the proto message structure.
+	field field
+
+	// function to unmarshal the data for the field.
+	unmarshal unmarshaler
+
+	// if a required field, contains a single set bit at this field's index in the required field list.
+	reqMask uint64
+}
+
+var (
+	unmarshalInfoMap  = map[reflect.Type]*unmarshalInfo{}
+	unmarshalInfoLock sync.Mutex
+)
+
+// getUnmarshalInfo returns the data structure which can be
+// subsequently used to unmarshal a message of the given type.
+// t is the type of the message (note: not pointer to message).
+func getUnmarshalInfo(t reflect.Type) *unmarshalInfo {
+	// It would be correct to return a new unmarshalInfo
+	// unconditionally. We would end up allocating one
+	// per occurrence of that type as a message or submessage.
+	// We use a cache here just to reduce memory usage.
+	unmarshalInfoLock.Lock()
+	defer unmarshalInfoLock.Unlock()
+	u := unmarshalInfoMap[t]
+	if u == nil {
+		u = &unmarshalInfo{typ: t}
+		// Note: we just set the type here. The rest of the fields
+		// will be initialized on first use.
+		unmarshalInfoMap[t] = u
+	}
+	return u
+}
+
+// unmarshal does the main work of unmarshaling a message.
+// u provides type information used to unmarshal the message.
+// m is a pointer to a protocol buffer message.
+// b is a byte stream to unmarshal into m.
+// This is top routine used when recursively unmarshaling submessages.
+func (u *unmarshalInfo) unmarshal(m pointer, b []byte) error {
+	if atomic.LoadInt32(&u.initialized) == 0 {
+		u.computeUnmarshalInfo()
+	}
+	if u.isMessageSet {
+		return UnmarshalMessageSet(b, m.offset(u.extensions).toExtensions())
+	}
+	var reqMask uint64            // bitmask of required fields we've seen.
+	var rnse *RequiredNotSetError // an instance of a RequiredNotSetError returned by a submessage.
+	for len(b) > 0 {
+		// Read tag and wire type.
+		// Special case 1 and 2 byte varints.
+		var x uint64
+		if b[0] < 128 {
+			x = uint64(b[0])
+			b = b[1:]
+		} else if len(b) >= 2 && b[1] < 128 {
+			x = uint64(b[0]&0x7f) + uint64(b[1])<<7
+			b = b[2:]
+		} else {
+			var n int
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+		}
+		tag := x >> 3
+		wire := int(x) & 7
+
+		// Dispatch on the tag to one of the unmarshal* functions below.
+		var f unmarshalFieldInfo
+		if tag < uint64(len(u.dense)) {
+			f = u.dense[tag]
+		} else {
+			f = u.sparse[tag]
+		}
+		if fn := f.unmarshal; fn != nil {
+			var err error
+			b, err = fn(b, m.offset(f.field), wire)
+			if err == nil {
+				reqMask |= f.reqMask
+				continue
+			}
+			if r, ok := err.(*RequiredNotSetError); ok {
+				// Remember this error, but keep parsing. We need to produce
+				// a full parse even if a required field is missing.
+				rnse = r
+				reqMask |= f.reqMask
+				continue
+			}
+			if err != errInternalBadWireType {
+				return err
+			}
+			// Fragments with bad wire type are treated as unknown fields.
+		}
+
+		// Unknown tag.
+		if !u.unrecognized.IsValid() {
+			// Don't keep unrecognized data; just skip it.
+			var err error
+			b, err = skipField(b, wire)
+			if err != nil {
+				return err
+			}
+			continue
+		}
+		// Keep unrecognized data around.
+		// maybe in extensions, maybe in the unrecognized field.
+		z := m.offset(u.unrecognized).toBytes()
+		var emap map[int32]Extension
+		var e Extension
+		for _, r := range u.extensionRanges {
+			if uint64(r.Start) <= tag && tag <= uint64(r.End) {
+				if u.extensions.IsValid() {
+					mp := m.offset(u.extensions).toExtensions()
+					emap = mp.extensionsWrite()
+					e = emap[int32(tag)]
+					z = &e.enc
+					break
+				}
+				if u.oldExtensions.IsValid() {
+					p := m.offset(u.oldExtensions).toOldExtensions()
+					emap = *p
+					if emap == nil {
+						emap = map[int32]Extension{}
+						*p = emap
+					}
+					e = emap[int32(tag)]
+					z = &e.enc
+					break
+				}
+				panic("no extensions field available")
+			}
+		}
+
+		// Use wire type to skip data.
+		var err error
+		b0 := b
+		b, err = skipField(b, wire)
+		if err != nil {
+			return err
+		}
+		*z = encodeVarint(*z, tag<<3|uint64(wire))
+		*z = append(*z, b0[:len(b0)-len(b)]...)
+
+		if emap != nil {
+			emap[int32(tag)] = e
+		}
+	}
+	if rnse != nil {
+		// A required field of a submessage/group is missing. Return that error.
+		return rnse
+	}
+	if reqMask != u.reqMask {
+		// A required field of this message is missing.
+		for _, n := range u.reqFields {
+			if reqMask&1 == 0 {
+				return &RequiredNotSetError{n}
+			}
+			reqMask >>= 1
+		}
+	}
+	return nil
+}
+
+// computeUnmarshalInfo fills in u with information for use
+// in unmarshaling protocol buffers of type u.typ.
+func (u *unmarshalInfo) computeUnmarshalInfo() {
+	u.lock.Lock()
+	defer u.lock.Unlock()
+	if u.initialized != 0 {
+		return
+	}
+	t := u.typ
+	n := t.NumField()
+
+	// Set up the "not found" value for the unrecognized byte buffer.
+	// This is the default for proto3.
+	u.unrecognized = invalidField
+	u.extensions = invalidField
+	u.oldExtensions = invalidField
+
+	// List of the generated type and offset for each oneof field.
+	type oneofField struct {
+		ityp  reflect.Type // interface type of oneof field
+		field field        // offset in containing message
+	}
+	var oneofFields []oneofField
+
+	for i := 0; i < n; i++ {
+		f := t.Field(i)
+		if f.Name == "XXX_unrecognized" {
+			// The byte slice used to hold unrecognized input is special.
+			if f.Type != reflect.TypeOf(([]byte)(nil)) {
+				panic("bad type for XXX_unrecognized field: " + f.Type.Name())
+			}
+			u.unrecognized = toField(&f)
+			continue
+		}
+		if f.Name == "XXX_InternalExtensions" {
+			// Ditto here.
+			if f.Type != reflect.TypeOf(XXX_InternalExtensions{}) {
+				panic("bad type for XXX_InternalExtensions field: " + f.Type.Name())
+			}
+			u.extensions = toField(&f)
+			if f.Tag.Get("protobuf_messageset") == "1" {
+				u.isMessageSet = true
+			}
+			continue
+		}
+		if f.Name == "XXX_extensions" {
+			// An older form of the extensions field.
+			if f.Type != reflect.TypeOf((map[int32]Extension)(nil)) {
+				panic("bad type for XXX_extensions field: " + f.Type.Name())
+			}
+			u.oldExtensions = toField(&f)
+			continue
+		}
+		if f.Name == "XXX_NoUnkeyedLiteral" || f.Name == "XXX_sizecache" {
+			continue
+		}
+
+		oneof := f.Tag.Get("protobuf_oneof")
+		if oneof != "" {
+			oneofFields = append(oneofFields, oneofField{f.Type, toField(&f)})
+			// The rest of oneof processing happens below.
+			continue
+		}
+
+		tags := f.Tag.Get("protobuf")
+		tagArray := strings.Split(tags, ",")
+		if len(tagArray) < 2 {
+			panic("protobuf tag not enough fields in " + t.Name() + "." + f.Name + ": " + tags)
+		}
+		tag, err := strconv.Atoi(tagArray[1])
+		if err != nil {
+			panic("protobuf tag field not an integer: " + tagArray[1])
+		}
+
+		name := ""
+		for _, tag := range tagArray[3:] {
+			if strings.HasPrefix(tag, "name=") {
+				name = tag[5:]
+			}
+		}
+
+		// Extract unmarshaling function from the field (its type and tags).
+		unmarshal := fieldUnmarshaler(&f)
+
+		// Required field?
+		var reqMask uint64
+		if tagArray[2] == "req" {
+			bit := len(u.reqFields)
+			u.reqFields = append(u.reqFields, name)
+			reqMask = uint64(1) << uint(bit)
+			// TODO: if we have more than 64 required fields, we end up
+			// not verifying that all required fields are present.
+			// Fix this, perhaps using a count of required fields?
+		}
+
+		// Store the info in the correct slot in the message.
+		u.setTag(tag, toField(&f), unmarshal, reqMask)
+	}
+
+	// Find any types associated with oneof fields.
+	// TODO: XXX_OneofFuncs returns more info than we need.  Get rid of some of it?
+	fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("XXX_OneofFuncs")
+	if fn.IsValid() {
+		res := fn.Call(nil)[3] // last return value from XXX_OneofFuncs: []interface{}
+		for i := res.Len() - 1; i >= 0; i-- {
+			v := res.Index(i)                             // interface{}
+			tptr := reflect.ValueOf(v.Interface()).Type() // *Msg_X
+			typ := tptr.Elem()                            // Msg_X
+
+			f := typ.Field(0) // oneof implementers have one field
+			baseUnmarshal := fieldUnmarshaler(&f)
+			tagstr := strings.Split(f.Tag.Get("protobuf"), ",")[1]
+			tag, err := strconv.Atoi(tagstr)
+			if err != nil {
+				panic("protobuf tag field not an integer: " + tagstr)
+			}
+
+			// Find the oneof field that this struct implements.
+			// Might take O(n^2) to process all of the oneofs, but who cares.
+			for _, of := range oneofFields {
+				if tptr.Implements(of.ityp) {
+					// We have found the corresponding interface for this struct.
+					// That lets us know where this struct should be stored
+					// when we encounter it during unmarshaling.
+					unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal)
+					u.setTag(tag, of.field, unmarshal, 0)
+				}
+			}
+		}
+	}
+
+	// Get extension ranges, if any.
+	fn = reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
+	if fn.IsValid() {
+		if !u.extensions.IsValid() && !u.oldExtensions.IsValid() {
+			panic("a message with extensions, but no extensions field in " + t.Name())
+		}
+		u.extensionRanges = fn.Call(nil)[0].Interface().([]ExtensionRange)
+	}
+
+	// Explicitly disallow tag 0. This will ensure we flag an error
+	// when decoding a buffer of all zeros. Without this code, we
+	// would decode and skip an all-zero buffer of even length.
+	// [0 0] is [tag=0/wiretype=varint varint-encoded-0].
+	u.setTag(0, zeroField, func(b []byte, f pointer, w int) ([]byte, error) {
+		return nil, fmt.Errorf("proto: %s: illegal tag 0 (wire type %d)", t, w)
+	}, 0)
+
+	// Set mask for required field check.
+	u.reqMask = uint64(1)<<uint(len(u.reqFields)) - 1
+
+	atomic.StoreInt32(&u.initialized, 1)
+}
+
+// setTag stores the unmarshal information for the given tag.
+// tag = tag # for field
+// field/unmarshal = unmarshal info for that field.
+// reqMask = if required, bitmask for field position in required field list. 0 otherwise.
+func (u *unmarshalInfo) setTag(tag int, field field, unmarshal unmarshaler, reqMask uint64) {
+	i := unmarshalFieldInfo{field: field, unmarshal: unmarshal, reqMask: reqMask}
+	n := u.typ.NumField()
+	if tag >= 0 && (tag < 16 || tag < 2*n) { // TODO: what are the right numbers here?
+		for len(u.dense) <= tag {
+			u.dense = append(u.dense, unmarshalFieldInfo{})
+		}
+		u.dense[tag] = i
+		return
+	}
+	if u.sparse == nil {
+		u.sparse = map[uint64]unmarshalFieldInfo{}
+	}
+	u.sparse[uint64(tag)] = i
+}
+
+// fieldUnmarshaler returns an unmarshaler for the given field.
+func fieldUnmarshaler(f *reflect.StructField) unmarshaler {
+	if f.Type.Kind() == reflect.Map {
+		return makeUnmarshalMap(f)
+	}
+	return typeUnmarshaler(f.Type, f.Tag.Get("protobuf"))
+}
+
+// typeUnmarshaler returns an unmarshaler for the given field type / field tag pair.
+func typeUnmarshaler(t reflect.Type, tags string) unmarshaler {
+	tagArray := strings.Split(tags, ",")
+	encoding := tagArray[0]
+	name := "unknown"
+	for _, tag := range tagArray[3:] {
+		if strings.HasPrefix(tag, "name=") {
+			name = tag[5:]
+		}
+	}
+
+	// Figure out packaging (pointer, slice, or both)
+	slice := false
+	pointer := false
+	if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {
+		slice = true
+		t = t.Elem()
+	}
+	if t.Kind() == reflect.Ptr {
+		pointer = true
+		t = t.Elem()
+	}
+
+	// We'll never have both pointer and slice for basic types.
+	if pointer && slice && t.Kind() != reflect.Struct {
+		panic("both pointer and slice for basic type in " + t.Name())
+	}
+
+	switch t.Kind() {
+	case reflect.Bool:
+		if pointer {
+			return unmarshalBoolPtr
+		}
+		if slice {
+			return unmarshalBoolSlice
+		}
+		return unmarshalBoolValue
+	case reflect.Int32:
+		switch encoding {
+		case "fixed32":
+			if pointer {
+				return unmarshalFixedS32Ptr
+			}
+			if slice {
+				return unmarshalFixedS32Slice
+			}
+			return unmarshalFixedS32Value
+		case "varint":
+			// this could be int32 or enum
+			if pointer {
+				return unmarshalInt32Ptr
+			}
+			if slice {
+				return unmarshalInt32Slice
+			}
+			return unmarshalInt32Value
+		case "zigzag32":
+			if pointer {
+				return unmarshalSint32Ptr
+			}
+			if slice {
+				return unmarshalSint32Slice
+			}
+			return unmarshalSint32Value
+		}
+	case reflect.Int64:
+		switch encoding {
+		case "fixed64":
+			if pointer {
+				return unmarshalFixedS64Ptr
+			}
+			if slice {
+				return unmarshalFixedS64Slice
+			}
+			return unmarshalFixedS64Value
+		case "varint":
+			if pointer {
+				return unmarshalInt64Ptr
+			}
+			if slice {
+				return unmarshalInt64Slice
+			}
+			return unmarshalInt64Value
+		case "zigzag64":
+			if pointer {
+				return unmarshalSint64Ptr
+			}
+			if slice {
+				return unmarshalSint64Slice
+			}
+			return unmarshalSint64Value
+		}
+	case reflect.Uint32:
+		switch encoding {
+		case "fixed32":
+			if pointer {
+				return unmarshalFixed32Ptr
+			}
+			if slice {
+				return unmarshalFixed32Slice
+			}
+			return unmarshalFixed32Value
+		case "varint":
+			if pointer {
+				return unmarshalUint32Ptr
+			}
+			if slice {
+				return unmarshalUint32Slice
+			}
+			return unmarshalUint32Value
+		}
+	case reflect.Uint64:
+		switch encoding {
+		case "fixed64":
+			if pointer {
+				return unmarshalFixed64Ptr
+			}
+			if slice {
+				return unmarshalFixed64Slice
+			}
+			return unmarshalFixed64Value
+		case "varint":
+			if pointer {
+				return unmarshalUint64Ptr
+			}
+			if slice {
+				return unmarshalUint64Slice
+			}
+			return unmarshalUint64Value
+		}
+	case reflect.Float32:
+		if pointer {
+			return unmarshalFloat32Ptr
+		}
+		if slice {
+			return unmarshalFloat32Slice
+		}
+		return unmarshalFloat32Value
+	case reflect.Float64:
+		if pointer {
+			return unmarshalFloat64Ptr
+		}
+		if slice {
+			return unmarshalFloat64Slice
+		}
+		return unmarshalFloat64Value
+	case reflect.Map:
+		panic("map type in typeUnmarshaler in " + t.Name())
+	case reflect.Slice:
+		if pointer {
+			panic("bad pointer in slice case in " + t.Name())
+		}
+		if slice {
+			return unmarshalBytesSlice
+		}
+		return unmarshalBytesValue
+	case reflect.String:
+		if pointer {
+			return unmarshalStringPtr
+		}
+		if slice {
+			return unmarshalStringSlice
+		}
+		return unmarshalStringValue
+	case reflect.Struct:
+		// message or group field
+		if !pointer {
+			panic(fmt.Sprintf("message/group field %s:%s without pointer", t, encoding))
+		}
+		switch encoding {
+		case "bytes":
+			if slice {
+				return makeUnmarshalMessageSlicePtr(getUnmarshalInfo(t), name)
+			}
+			return makeUnmarshalMessagePtr(getUnmarshalInfo(t), name)
+		case "group":
+			if slice {
+				return makeUnmarshalGroupSlicePtr(getUnmarshalInfo(t), name)
+			}
+			return makeUnmarshalGroupPtr(getUnmarshalInfo(t), name)
+		}
+	}
+	panic(fmt.Sprintf("unmarshaler not found type:%s encoding:%s", t, encoding))
+}
+
+// Below are all the unmarshalers for individual fields of various types.
+
+func unmarshalInt64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x)
+	*f.toInt64() = v
+	return b, nil
+}
+
+func unmarshalInt64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x)
+	*f.toInt64Ptr() = &v
+	return b, nil
+}
+
+func unmarshalInt64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := int64(x)
+			s := f.toInt64Slice()
+			*s = append(*s, v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x)
+	s := f.toInt64Slice()
+	*s = append(*s, v)
+	return b, nil
+}
+
+func unmarshalSint64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x>>1) ^ int64(x)<<63>>63
+	*f.toInt64() = v
+	return b, nil
+}
+
+func unmarshalSint64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x>>1) ^ int64(x)<<63>>63
+	*f.toInt64Ptr() = &v
+	return b, nil
+}
+
+func unmarshalSint64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := int64(x>>1) ^ int64(x)<<63>>63
+			s := f.toInt64Slice()
+			*s = append(*s, v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x>>1) ^ int64(x)<<63>>63
+	s := f.toInt64Slice()
+	*s = append(*s, v)
+	return b, nil
+}
+
+func unmarshalUint64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint64(x)
+	*f.toUint64() = v
+	return b, nil
+}
+
+func unmarshalUint64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint64(x)
+	*f.toUint64Ptr() = &v
+	return b, nil
+}
+
+func unmarshalUint64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := uint64(x)
+			s := f.toUint64Slice()
+			*s = append(*s, v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint64(x)
+	s := f.toUint64Slice()
+	*s = append(*s, v)
+	return b, nil
+}
+
+func unmarshalInt32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x)
+	*f.toInt32() = v
+	return b, nil
+}
+
+func unmarshalInt32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x)
+	f.setInt32Ptr(v)
+	return b, nil
+}
+
+func unmarshalInt32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := int32(x)
+			f.appendInt32Slice(v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x)
+	f.appendInt32Slice(v)
+	return b, nil
+}
+
+func unmarshalSint32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x>>1) ^ int32(x)<<31>>31
+	*f.toInt32() = v
+	return b, nil
+}
+
+func unmarshalSint32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x>>1) ^ int32(x)<<31>>31
+	f.setInt32Ptr(v)
+	return b, nil
+}
+
+func unmarshalSint32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := int32(x>>1) ^ int32(x)<<31>>31
+			f.appendInt32Slice(v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x>>1) ^ int32(x)<<31>>31
+	f.appendInt32Slice(v)
+	return b, nil
+}
+
+func unmarshalUint32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint32(x)
+	*f.toUint32() = v
+	return b, nil
+}
+
+func unmarshalUint32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint32(x)
+	*f.toUint32Ptr() = &v
+	return b, nil
+}
+
+func unmarshalUint32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := uint32(x)
+			s := f.toUint32Slice()
+			*s = append(*s, v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint32(x)
+	s := f.toUint32Slice()
+	*s = append(*s, v)
+	return b, nil
+}
+
+func unmarshalFixed64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+	*f.toUint64() = v
+	return b[8:], nil
+}
+
+func unmarshalFixed64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+	*f.toUint64Ptr() = &v
+	return b[8:], nil
+}
+
+func unmarshalFixed64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 8 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+			s := f.toUint64Slice()
+			*s = append(*s, v)
+			b = b[8:]
+		}
+		return res, nil
+	}
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+	s := f.toUint64Slice()
+	*s = append(*s, v)
+	return b[8:], nil
+}
+
+func unmarshalFixedS64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
+	*f.toInt64() = v
+	return b[8:], nil
+}
+
+func unmarshalFixedS64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
+	*f.toInt64Ptr() = &v
+	return b[8:], nil
+}
+
+func unmarshalFixedS64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 8 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
+			s := f.toInt64Slice()
+			*s = append(*s, v)
+			b = b[8:]
+		}
+		return res, nil
+	}
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
+	s := f.toInt64Slice()
+	*s = append(*s, v)
+	return b[8:], nil
+}
+
+func unmarshalFixed32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+	*f.toUint32() = v
+	return b[4:], nil
+}
+
+func unmarshalFixed32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+	*f.toUint32Ptr() = &v
+	return b[4:], nil
+}
+
+func unmarshalFixed32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 4 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+			s := f.toUint32Slice()
+			*s = append(*s, v)
+			b = b[4:]
+		}
+		return res, nil
+	}
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+	s := f.toUint32Slice()
+	*s = append(*s, v)
+	return b[4:], nil
+}
+
+func unmarshalFixedS32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
+	*f.toInt32() = v
+	return b[4:], nil
+}
+
+func unmarshalFixedS32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
+	f.setInt32Ptr(v)
+	return b[4:], nil
+}
+
+func unmarshalFixedS32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 4 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
+			f.appendInt32Slice(v)
+			b = b[4:]
+		}
+		return res, nil
+	}
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
+	f.appendInt32Slice(v)
+	return b[4:], nil
+}
+
+func unmarshalBoolValue(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	// Note: any length varint is allowed, even though any sane
+	// encoder will use one byte.
+	// See https://github.com/golang/protobuf/issues/76
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	// TODO: check if x>1? Tests seem to indicate no.
+	v := x != 0
+	*f.toBool() = v
+	return b[n:], nil
+}
+
+func unmarshalBoolPtr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := x != 0
+	*f.toBoolPtr() = &v
+	return b[n:], nil
+}
+
+func unmarshalBoolSlice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := x != 0
+			s := f.toBoolSlice()
+			*s = append(*s, v)
+			b = b[n:]
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := x != 0
+	s := f.toBoolSlice()
+	*s = append(*s, v)
+	return b[n:], nil
+}
+
+func unmarshalFloat64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
+	*f.toFloat64() = v
+	return b[8:], nil
+}
+
+func unmarshalFloat64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
+	*f.toFloat64Ptr() = &v
+	return b[8:], nil
+}
+
+func unmarshalFloat64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 8 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
+			s := f.toFloat64Slice()
+			*s = append(*s, v)
+			b = b[8:]
+		}
+		return res, nil
+	}
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
+	s := f.toFloat64Slice()
+	*s = append(*s, v)
+	return b[8:], nil
+}
+
+func unmarshalFloat32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
+	*f.toFloat32() = v
+	return b[4:], nil
+}
+
+func unmarshalFloat32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
+	*f.toFloat32Ptr() = &v
+	return b[4:], nil
+}
+
+func unmarshalFloat32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 4 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
+			s := f.toFloat32Slice()
+			*s = append(*s, v)
+			b = b[4:]
+		}
+		return res, nil
+	}
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
+	s := f.toFloat32Slice()
+	*s = append(*s, v)
+	return b[4:], nil
+}
+
+func unmarshalStringValue(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := string(b[:x])
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	*f.toString() = v
+	return b[x:], nil
+}
+
+func unmarshalStringPtr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := string(b[:x])
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	*f.toStringPtr() = &v
+	return b[x:], nil
+}
+
+func unmarshalStringSlice(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := string(b[:x])
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	s := f.toStringSlice()
+	*s = append(*s, v)
+	return b[x:], nil
+}
+
+var emptyBuf [0]byte
+
+func unmarshalBytesValue(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	// The use of append here is a trick which avoids the zeroing
+	// that would be required if we used a make/copy pair.
+	// We append to emptyBuf instead of nil because we want
+	// a non-nil result even when the length is 0.
+	v := append(emptyBuf[:], b[:x]...)
+	*f.toBytes() = v
+	return b[x:], nil
+}
+
+func unmarshalBytesSlice(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := append(emptyBuf[:], b[:x]...)
+	s := f.toBytesSlice()
+	*s = append(*s, v)
+	return b[x:], nil
+}
+
+func makeUnmarshalMessagePtr(sub *unmarshalInfo, name string) unmarshaler {
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		if w != WireBytes {
+			return b, errInternalBadWireType
+		}
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		// First read the message field to see if something is there.
+		// The semantics of multiple submessages are weird.  Instead of
+		// the last one winning (as it is for all other fields), multiple
+		// submessages are merged.
+		v := f.getPointer()
+		if v.isNil() {
+			v = valToPointer(reflect.New(sub.typ))
+			f.setPointer(v)
+		}
+		err := sub.unmarshal(v, b[:x])
+		if err != nil {
+			if r, ok := err.(*RequiredNotSetError); ok {
+				r.field = name + "." + r.field
+			} else {
+				return nil, err
+			}
+		}
+		return b[x:], err
+	}
+}
+
+func makeUnmarshalMessageSlicePtr(sub *unmarshalInfo, name string) unmarshaler {
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		if w != WireBytes {
+			return b, errInternalBadWireType
+		}
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		v := valToPointer(reflect.New(sub.typ))
+		err := sub.unmarshal(v, b[:x])
+		if err != nil {
+			if r, ok := err.(*RequiredNotSetError); ok {
+				r.field = name + "." + r.field
+			} else {
+				return nil, err
+			}
+		}
+		f.appendPointer(v)
+		return b[x:], err
+	}
+}
+
+func makeUnmarshalGroupPtr(sub *unmarshalInfo, name string) unmarshaler {
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		if w != WireStartGroup {
+			return b, errInternalBadWireType
+		}
+		x, y := findEndGroup(b)
+		if x < 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		v := f.getPointer()
+		if v.isNil() {
+			v = valToPointer(reflect.New(sub.typ))
+			f.setPointer(v)
+		}
+		err := sub.unmarshal(v, b[:x])
+		if err != nil {
+			if r, ok := err.(*RequiredNotSetError); ok {
+				r.field = name + "." + r.field
+			} else {
+				return nil, err
+			}
+		}
+		return b[y:], err
+	}
+}
+
+func makeUnmarshalGroupSlicePtr(sub *unmarshalInfo, name string) unmarshaler {
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		if w != WireStartGroup {
+			return b, errInternalBadWireType
+		}
+		x, y := findEndGroup(b)
+		if x < 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		v := valToPointer(reflect.New(sub.typ))
+		err := sub.unmarshal(v, b[:x])
+		if err != nil {
+			if r, ok := err.(*RequiredNotSetError); ok {
+				r.field = name + "." + r.field
+			} else {
+				return nil, err
+			}
+		}
+		f.appendPointer(v)
+		return b[y:], err
+	}
+}
+
+func makeUnmarshalMap(f *reflect.StructField) unmarshaler {
+	t := f.Type
+	kt := t.Key()
+	vt := t.Elem()
+	unmarshalKey := typeUnmarshaler(kt, f.Tag.Get("protobuf_key"))
+	unmarshalVal := typeUnmarshaler(vt, f.Tag.Get("protobuf_val"))
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		// The map entry is a submessage. Figure out how big it is.
+		if w != WireBytes {
+			return nil, fmt.Errorf("proto: bad wiretype for map field: got %d want %d", w, WireBytes)
+		}
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		r := b[x:] // unused data to return
+		b = b[:x]  // data for map entry
+
+		// Note: we could use #keys * #values ~= 200 functions
+		// to do map decoding without reflection. Probably not worth it.
+		// Maps will be somewhat slow. Oh well.
+
+		// Read key and value from data.
+		k := reflect.New(kt)
+		v := reflect.New(vt)
+		for len(b) > 0 {
+			x, n := decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			wire := int(x) & 7
+			b = b[n:]
+
+			var err error
+			switch x >> 3 {
+			case 1:
+				b, err = unmarshalKey(b, valToPointer(k), wire)
+			case 2:
+				b, err = unmarshalVal(b, valToPointer(v), wire)
+			default:
+				err = errInternalBadWireType // skip unknown tag
+			}
+
+			if err == nil {
+				continue
+			}
+			if err != errInternalBadWireType {
+				return nil, err
+			}
+
+			// Skip past unknown fields.
+			b, err = skipField(b, wire)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		// Get map, allocate if needed.
+		m := f.asPointerTo(t).Elem() // an addressable map[K]T
+		if m.IsNil() {
+			m.Set(reflect.MakeMap(t))
+		}
+
+		// Insert into map.
+		m.SetMapIndex(k.Elem(), v.Elem())
+
+		return r, nil
+	}
+}
+
+// makeUnmarshalOneof makes an unmarshaler for oneof fields.
+// for:
+// message Msg {
+//   oneof F {
+//     int64 X = 1;
+//     float64 Y = 2;
+//   }
+// }
+// typ is the type of the concrete entry for a oneof case (e.g. Msg_X).
+// ityp is the interface type of the oneof field (e.g. isMsg_F).
+// unmarshal is the unmarshaler for the base type of the oneof case (e.g. int64).
+// Note that this function will be called once for each case in the oneof.
+func makeUnmarshalOneof(typ, ityp reflect.Type, unmarshal unmarshaler) unmarshaler {
+	sf := typ.Field(0)
+	field0 := toField(&sf)
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		// Allocate holder for value.
+		v := reflect.New(typ)
+
+		// Unmarshal data into holder.
+		// We unmarshal into the first field of the holder object.
+		var err error
+		b, err = unmarshal(b, valToPointer(v).offset(field0), w)
+		if err != nil {
+			return nil, err
+		}
+
+		// Write pointer to holder into target field.
+		f.asPointerTo(ityp).Elem().Set(v)
+
+		return b, nil
+	}
+}
+
+// Error used by decode internally.
+var errInternalBadWireType = errors.New("proto: internal error: bad wiretype")
+
+// skipField skips past a field of type wire and returns the remaining bytes.
+func skipField(b []byte, wire int) ([]byte, error) {
+	switch wire {
+	case WireVarint:
+		_, k := decodeVarint(b)
+		if k == 0 {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[k:]
+	case WireFixed32:
+		if len(b) < 4 {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[4:]
+	case WireFixed64:
+		if len(b) < 8 {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[8:]
+	case WireBytes:
+		m, k := decodeVarint(b)
+		if k == 0 || uint64(len(b)-k) < m {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[uint64(k)+m:]
+	case WireStartGroup:
+		_, i := findEndGroup(b)
+		if i == -1 {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[i:]
+	default:
+		return b, fmt.Errorf("proto: can't skip unknown wire type %d", wire)
+	}
+	return b, nil
+}
+
+// findEndGroup finds the index of the next EndGroup tag.
+// Groups may be nested, so the "next" EndGroup tag is the first
+// unpaired EndGroup.
+// findEndGroup returns the indexes of the start and end of the EndGroup tag.
+// Returns (-1,-1) if it can't find one.
+func findEndGroup(b []byte) (int, int) {
+	depth := 1
+	i := 0
+	for {
+		x, n := decodeVarint(b[i:])
+		if n == 0 {
+			return -1, -1
+		}
+		j := i
+		i += n
+		switch x & 7 {
+		case WireVarint:
+			_, k := decodeVarint(b[i:])
+			if k == 0 {
+				return -1, -1
+			}
+			i += k
+		case WireFixed32:
+			if len(b)-4 < i {
+				return -1, -1
+			}
+			i += 4
+		case WireFixed64:
+			if len(b)-8 < i {
+				return -1, -1
+			}
+			i += 8
+		case WireBytes:
+			m, k := decodeVarint(b[i:])
+			if k == 0 {
+				return -1, -1
+			}
+			i += k
+			if uint64(len(b)-i) < m {
+				return -1, -1
+			}
+			i += int(m)
+		case WireStartGroup:
+			depth++
+		case WireEndGroup:
+			depth--
+			if depth == 0 {
+				return j, i
+			}
+		default:
+			return -1, -1
+		}
+	}
+}
+
+// encodeVarint appends a varint-encoded integer to b and returns the result.
+func encodeVarint(b []byte, x uint64) []byte {
+	for x >= 1<<7 {
+		b = append(b, byte(x&0x7f|0x80))
+		x >>= 7
+	}
+	return append(b, byte(x))
+}
+
+// decodeVarint reads a varint-encoded integer from b.
+// Returns the decoded integer and the number of bytes read.
+// If there is an error, it returns 0,0.
+func decodeVarint(b []byte) (uint64, int) {
+	var x, y uint64
+	if len(b) <= 0 {
+		goto bad
+	}
+	x = uint64(b[0])
+	if x < 0x80 {
+		return x, 1
+	}
+	x -= 0x80
+
+	if len(b) <= 1 {
+		goto bad
+	}
+	y = uint64(b[1])
+	x += y << 7
+	if y < 0x80 {
+		return x, 2
+	}
+	x -= 0x80 << 7
+
+	if len(b) <= 2 {
+		goto bad
+	}
+	y = uint64(b[2])
+	x += y << 14
+	if y < 0x80 {
+		return x, 3
+	}
+	x -= 0x80 << 14
+
+	if len(b) <= 3 {
+		goto bad
+	}
+	y = uint64(b[3])
+	x += y << 21
+	if y < 0x80 {
+		return x, 4
+	}
+	x -= 0x80 << 21
+
+	if len(b) <= 4 {
+		goto bad
+	}
+	y = uint64(b[4])
+	x += y << 28
+	if y < 0x80 {
+		return x, 5
+	}
+	x -= 0x80 << 28
+
+	if len(b) <= 5 {
+		goto bad
+	}
+	y = uint64(b[5])
+	x += y << 35
+	if y < 0x80 {
+		return x, 6
+	}
+	x -= 0x80 << 35
+
+	if len(b) <= 6 {
+		goto bad
+	}
+	y = uint64(b[6])
+	x += y << 42
+	if y < 0x80 {
+		return x, 7
+	}
+	x -= 0x80 << 42
+
+	if len(b) <= 7 {
+		goto bad
+	}
+	y = uint64(b[7])
+	x += y << 49
+	if y < 0x80 {
+		return x, 8
+	}
+	x -= 0x80 << 49
+
+	if len(b) <= 8 {
+		goto bad
+	}
+	y = uint64(b[8])
+	x += y << 56
+	if y < 0x80 {
+		return x, 9
+	}
+	x -= 0x80 << 56
+
+	if len(b) <= 9 {
+		goto bad
+	}
+	y = uint64(b[9])
+	x += y << 63
+	if y < 2 {
+		return x, 10
+	}
+
+bad:
+	return 0, 0
+}
diff --git a/vendor/github.com/golang/protobuf/proto/test_proto/test.pb.go b/vendor/github.com/golang/protobuf/proto/test_proto/test.pb.go
new file mode 100644
index 00000000..049b5dd2
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/test_proto/test.pb.go
@@ -0,0 +1,5118 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: test_proto/test.proto
+
+package test_proto // import "github.com/golang/protobuf/proto/test_proto"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type FOO int32
+
+const (
+	FOO_FOO1 FOO = 1
+)
+
+var FOO_name = map[int32]string{
+	1: "FOO1",
+}
+var FOO_value = map[string]int32{
+	"FOO1": 1,
+}
+
+func (x FOO) Enum() *FOO {
+	p := new(FOO)
+	*p = x
+	return p
+}
+func (x FOO) String() string {
+	return proto.EnumName(FOO_name, int32(x))
+}
+func (x *FOO) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FOO_value, data, "FOO")
+	if err != nil {
+		return err
+	}
+	*x = FOO(value)
+	return nil
+}
+func (FOO) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{0}
+}
+
+// An enum, for completeness.
+type GoTest_KIND int32
+
+const (
+	GoTest_VOID GoTest_KIND = 0
+	// Basic types
+	GoTest_BOOL        GoTest_KIND = 1
+	GoTest_BYTES       GoTest_KIND = 2
+	GoTest_FINGERPRINT GoTest_KIND = 3
+	GoTest_FLOAT       GoTest_KIND = 4
+	GoTest_INT         GoTest_KIND = 5
+	GoTest_STRING      GoTest_KIND = 6
+	GoTest_TIME        GoTest_KIND = 7
+	// Groupings
+	GoTest_TUPLE GoTest_KIND = 8
+	GoTest_ARRAY GoTest_KIND = 9
+	GoTest_MAP   GoTest_KIND = 10
+	// Table types
+	GoTest_TABLE GoTest_KIND = 11
+	// Functions
+	GoTest_FUNCTION GoTest_KIND = 12
+)
+
+var GoTest_KIND_name = map[int32]string{
+	0:  "VOID",
+	1:  "BOOL",
+	2:  "BYTES",
+	3:  "FINGERPRINT",
+	4:  "FLOAT",
+	5:  "INT",
+	6:  "STRING",
+	7:  "TIME",
+	8:  "TUPLE",
+	9:  "ARRAY",
+	10: "MAP",
+	11: "TABLE",
+	12: "FUNCTION",
+}
+var GoTest_KIND_value = map[string]int32{
+	"VOID":        0,
+	"BOOL":        1,
+	"BYTES":       2,
+	"FINGERPRINT": 3,
+	"FLOAT":       4,
+	"INT":         5,
+	"STRING":      6,
+	"TIME":        7,
+	"TUPLE":       8,
+	"ARRAY":       9,
+	"MAP":         10,
+	"TABLE":       11,
+	"FUNCTION":    12,
+}
+
+func (x GoTest_KIND) Enum() *GoTest_KIND {
+	p := new(GoTest_KIND)
+	*p = x
+	return p
+}
+func (x GoTest_KIND) String() string {
+	return proto.EnumName(GoTest_KIND_name, int32(x))
+}
+func (x *GoTest_KIND) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(GoTest_KIND_value, data, "GoTest_KIND")
+	if err != nil {
+		return err
+	}
+	*x = GoTest_KIND(value)
+	return nil
+}
+func (GoTest_KIND) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{2, 0}
+}
+
+type MyMessage_Color int32
+
+const (
+	MyMessage_RED   MyMessage_Color = 0
+	MyMessage_GREEN MyMessage_Color = 1
+	MyMessage_BLUE  MyMessage_Color = 2
+)
+
+var MyMessage_Color_name = map[int32]string{
+	0: "RED",
+	1: "GREEN",
+	2: "BLUE",
+}
+var MyMessage_Color_value = map[string]int32{
+	"RED":   0,
+	"GREEN": 1,
+	"BLUE":  2,
+}
+
+func (x MyMessage_Color) Enum() *MyMessage_Color {
+	p := new(MyMessage_Color)
+	*p = x
+	return p
+}
+func (x MyMessage_Color) String() string {
+	return proto.EnumName(MyMessage_Color_name, int32(x))
+}
+func (x *MyMessage_Color) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(MyMessage_Color_value, data, "MyMessage_Color")
+	if err != nil {
+		return err
+	}
+	*x = MyMessage_Color(value)
+	return nil
+}
+func (MyMessage_Color) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{13, 0}
+}
+
+type DefaultsMessage_DefaultsEnum int32
+
+const (
+	DefaultsMessage_ZERO DefaultsMessage_DefaultsEnum = 0
+	DefaultsMessage_ONE  DefaultsMessage_DefaultsEnum = 1
+	DefaultsMessage_TWO  DefaultsMessage_DefaultsEnum = 2
+)
+
+var DefaultsMessage_DefaultsEnum_name = map[int32]string{
+	0: "ZERO",
+	1: "ONE",
+	2: "TWO",
+}
+var DefaultsMessage_DefaultsEnum_value = map[string]int32{
+	"ZERO": 0,
+	"ONE":  1,
+	"TWO":  2,
+}
+
+func (x DefaultsMessage_DefaultsEnum) Enum() *DefaultsMessage_DefaultsEnum {
+	p := new(DefaultsMessage_DefaultsEnum)
+	*p = x
+	return p
+}
+func (x DefaultsMessage_DefaultsEnum) String() string {
+	return proto.EnumName(DefaultsMessage_DefaultsEnum_name, int32(x))
+}
+func (x *DefaultsMessage_DefaultsEnum) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(DefaultsMessage_DefaultsEnum_value, data, "DefaultsMessage_DefaultsEnum")
+	if err != nil {
+		return err
+	}
+	*x = DefaultsMessage_DefaultsEnum(value)
+	return nil
+}
+func (DefaultsMessage_DefaultsEnum) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{16, 0}
+}
+
+type Defaults_Color int32
+
+const (
+	Defaults_RED   Defaults_Color = 0
+	Defaults_GREEN Defaults_Color = 1
+	Defaults_BLUE  Defaults_Color = 2
+)
+
+var Defaults_Color_name = map[int32]string{
+	0: "RED",
+	1: "GREEN",
+	2: "BLUE",
+}
+var Defaults_Color_value = map[string]int32{
+	"RED":   0,
+	"GREEN": 1,
+	"BLUE":  2,
+}
+
+func (x Defaults_Color) Enum() *Defaults_Color {
+	p := new(Defaults_Color)
+	*p = x
+	return p
+}
+func (x Defaults_Color) String() string {
+	return proto.EnumName(Defaults_Color_name, int32(x))
+}
+func (x *Defaults_Color) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Defaults_Color_value, data, "Defaults_Color")
+	if err != nil {
+		return err
+	}
+	*x = Defaults_Color(value)
+	return nil
+}
+func (Defaults_Color) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{21, 0}
+}
+
+type RepeatedEnum_Color int32
+
+const (
+	RepeatedEnum_RED RepeatedEnum_Color = 1
+)
+
+var RepeatedEnum_Color_name = map[int32]string{
+	1: "RED",
+}
+var RepeatedEnum_Color_value = map[string]int32{
+	"RED": 1,
+}
+
+func (x RepeatedEnum_Color) Enum() *RepeatedEnum_Color {
+	p := new(RepeatedEnum_Color)
+	*p = x
+	return p
+}
+func (x RepeatedEnum_Color) String() string {
+	return proto.EnumName(RepeatedEnum_Color_name, int32(x))
+}
+func (x *RepeatedEnum_Color) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(RepeatedEnum_Color_value, data, "RepeatedEnum_Color")
+	if err != nil {
+		return err
+	}
+	*x = RepeatedEnum_Color(value)
+	return nil
+}
+func (RepeatedEnum_Color) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{23, 0}
+}
+
+type GoEnum struct {
+	Foo                  *FOO     `protobuf:"varint,1,req,name=foo,enum=test_proto.FOO" json:"foo,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GoEnum) Reset()         { *m = GoEnum{} }
+func (m *GoEnum) String() string { return proto.CompactTextString(m) }
+func (*GoEnum) ProtoMessage()    {}
+func (*GoEnum) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{0}
+}
+func (m *GoEnum) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoEnum.Unmarshal(m, b)
+}
+func (m *GoEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoEnum.Marshal(b, m, deterministic)
+}
+func (dst *GoEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoEnum.Merge(dst, src)
+}
+func (m *GoEnum) XXX_Size() int {
+	return xxx_messageInfo_GoEnum.Size(m)
+}
+func (m *GoEnum) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoEnum.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoEnum proto.InternalMessageInfo
+
+func (m *GoEnum) GetFoo() FOO {
+	if m != nil && m.Foo != nil {
+		return *m.Foo
+	}
+	return FOO_FOO1
+}
+
+type GoTestField struct {
+	Label                *string  `protobuf:"bytes,1,req,name=Label" json:"Label,omitempty"`
+	Type                 *string  `protobuf:"bytes,2,req,name=Type" json:"Type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GoTestField) Reset()         { *m = GoTestField{} }
+func (m *GoTestField) String() string { return proto.CompactTextString(m) }
+func (*GoTestField) ProtoMessage()    {}
+func (*GoTestField) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{1}
+}
+func (m *GoTestField) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoTestField.Unmarshal(m, b)
+}
+func (m *GoTestField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoTestField.Marshal(b, m, deterministic)
+}
+func (dst *GoTestField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoTestField.Merge(dst, src)
+}
+func (m *GoTestField) XXX_Size() int {
+	return xxx_messageInfo_GoTestField.Size(m)
+}
+func (m *GoTestField) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoTestField.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoTestField proto.InternalMessageInfo
+
+func (m *GoTestField) GetLabel() string {
+	if m != nil && m.Label != nil {
+		return *m.Label
+	}
+	return ""
+}
+
+func (m *GoTestField) GetType() string {
+	if m != nil && m.Type != nil {
+		return *m.Type
+	}
+	return ""
+}
+
+type GoTest struct {
+	// Some typical parameters
+	Kind  *GoTest_KIND `protobuf:"varint,1,req,name=Kind,enum=test_proto.GoTest_KIND" json:"Kind,omitempty"`
+	Table *string      `protobuf:"bytes,2,opt,name=Table" json:"Table,omitempty"`
+	Param *int32       `protobuf:"varint,3,opt,name=Param" json:"Param,omitempty"`
+	// Required, repeated and optional foreign fields.
+	RequiredField *GoTestField   `protobuf:"bytes,4,req,name=RequiredField" json:"RequiredField,omitempty"`
+	RepeatedField []*GoTestField `protobuf:"bytes,5,rep,name=RepeatedField" json:"RepeatedField,omitempty"`
+	OptionalField *GoTestField   `protobuf:"bytes,6,opt,name=OptionalField" json:"OptionalField,omitempty"`
+	// Required fields of all basic types
+	F_BoolRequired     *bool    `protobuf:"varint,10,req,name=F_Bool_required,json=FBoolRequired" json:"F_Bool_required,omitempty"`
+	F_Int32Required    *int32   `protobuf:"varint,11,req,name=F_Int32_required,json=FInt32Required" json:"F_Int32_required,omitempty"`
+	F_Int64Required    *int64   `protobuf:"varint,12,req,name=F_Int64_required,json=FInt64Required" json:"F_Int64_required,omitempty"`
+	F_Fixed32Required  *uint32  `protobuf:"fixed32,13,req,name=F_Fixed32_required,json=FFixed32Required" json:"F_Fixed32_required,omitempty"`
+	F_Fixed64Required  *uint64  `protobuf:"fixed64,14,req,name=F_Fixed64_required,json=FFixed64Required" json:"F_Fixed64_required,omitempty"`
+	F_Uint32Required   *uint32  `protobuf:"varint,15,req,name=F_Uint32_required,json=FUint32Required" json:"F_Uint32_required,omitempty"`
+	F_Uint64Required   *uint64  `protobuf:"varint,16,req,name=F_Uint64_required,json=FUint64Required" json:"F_Uint64_required,omitempty"`
+	F_FloatRequired    *float32 `protobuf:"fixed32,17,req,name=F_Float_required,json=FFloatRequired" json:"F_Float_required,omitempty"`
+	F_DoubleRequired   *float64 `protobuf:"fixed64,18,req,name=F_Double_required,json=FDoubleRequired" json:"F_Double_required,omitempty"`
+	F_StringRequired   *string  `protobuf:"bytes,19,req,name=F_String_required,json=FStringRequired" json:"F_String_required,omitempty"`
+	F_BytesRequired    []byte   `protobuf:"bytes,101,req,name=F_Bytes_required,json=FBytesRequired" json:"F_Bytes_required,omitempty"`
+	F_Sint32Required   *int32   `protobuf:"zigzag32,102,req,name=F_Sint32_required,json=FSint32Required" json:"F_Sint32_required,omitempty"`
+	F_Sint64Required   *int64   `protobuf:"zigzag64,103,req,name=F_Sint64_required,json=FSint64Required" json:"F_Sint64_required,omitempty"`
+	F_Sfixed32Required *int32   `protobuf:"fixed32,104,req,name=F_Sfixed32_required,json=FSfixed32Required" json:"F_Sfixed32_required,omitempty"`
+	F_Sfixed64Required *int64   `protobuf:"fixed64,105,req,name=F_Sfixed64_required,json=FSfixed64Required" json:"F_Sfixed64_required,omitempty"`
+	// Repeated fields of all basic types
+	F_BoolRepeated     []bool    `protobuf:"varint,20,rep,name=F_Bool_repeated,json=FBoolRepeated" json:"F_Bool_repeated,omitempty"`
+	F_Int32Repeated    []int32   `protobuf:"varint,21,rep,name=F_Int32_repeated,json=FInt32Repeated" json:"F_Int32_repeated,omitempty"`
+	F_Int64Repeated    []int64   `protobuf:"varint,22,rep,name=F_Int64_repeated,json=FInt64Repeated" json:"F_Int64_repeated,omitempty"`
+	F_Fixed32Repeated  []uint32  `protobuf:"fixed32,23,rep,name=F_Fixed32_repeated,json=FFixed32Repeated" json:"F_Fixed32_repeated,omitempty"`
+	F_Fixed64Repeated  []uint64  `protobuf:"fixed64,24,rep,name=F_Fixed64_repeated,json=FFixed64Repeated" json:"F_Fixed64_repeated,omitempty"`
+	F_Uint32Repeated   []uint32  `protobuf:"varint,25,rep,name=F_Uint32_repeated,json=FUint32Repeated" json:"F_Uint32_repeated,omitempty"`
+	F_Uint64Repeated   []uint64  `protobuf:"varint,26,rep,name=F_Uint64_repeated,json=FUint64Repeated" json:"F_Uint64_repeated,omitempty"`
+	F_FloatRepeated    []float32 `protobuf:"fixed32,27,rep,name=F_Float_repeated,json=FFloatRepeated" json:"F_Float_repeated,omitempty"`
+	F_DoubleRepeated   []float64 `protobuf:"fixed64,28,rep,name=F_Double_repeated,json=FDoubleRepeated" json:"F_Double_repeated,omitempty"`
+	F_StringRepeated   []string  `protobuf:"bytes,29,rep,name=F_String_repeated,json=FStringRepeated" json:"F_String_repeated,omitempty"`
+	F_BytesRepeated    [][]byte  `protobuf:"bytes,201,rep,name=F_Bytes_repeated,json=FBytesRepeated" json:"F_Bytes_repeated,omitempty"`
+	F_Sint32Repeated   []int32   `protobuf:"zigzag32,202,rep,name=F_Sint32_repeated,json=FSint32Repeated" json:"F_Sint32_repeated,omitempty"`
+	F_Sint64Repeated   []int64   `protobuf:"zigzag64,203,rep,name=F_Sint64_repeated,json=FSint64Repeated" json:"F_Sint64_repeated,omitempty"`
+	F_Sfixed32Repeated []int32   `protobuf:"fixed32,204,rep,name=F_Sfixed32_repeated,json=FSfixed32Repeated" json:"F_Sfixed32_repeated,omitempty"`
+	F_Sfixed64Repeated []int64   `protobuf:"fixed64,205,rep,name=F_Sfixed64_repeated,json=FSfixed64Repeated" json:"F_Sfixed64_repeated,omitempty"`
+	// Optional fields of all basic types
+	F_BoolOptional     *bool    `protobuf:"varint,30,opt,name=F_Bool_optional,json=FBoolOptional" json:"F_Bool_optional,omitempty"`
+	F_Int32Optional    *int32   `protobuf:"varint,31,opt,name=F_Int32_optional,json=FInt32Optional" json:"F_Int32_optional,omitempty"`
+	F_Int64Optional    *int64   `protobuf:"varint,32,opt,name=F_Int64_optional,json=FInt64Optional" json:"F_Int64_optional,omitempty"`
+	F_Fixed32Optional  *uint32  `protobuf:"fixed32,33,opt,name=F_Fixed32_optional,json=FFixed32Optional" json:"F_Fixed32_optional,omitempty"`
+	F_Fixed64Optional  *uint64  `protobuf:"fixed64,34,opt,name=F_Fixed64_optional,json=FFixed64Optional" json:"F_Fixed64_optional,omitempty"`
+	F_Uint32Optional   *uint32  `protobuf:"varint,35,opt,name=F_Uint32_optional,json=FUint32Optional" json:"F_Uint32_optional,omitempty"`
+	F_Uint64Optional   *uint64  `protobuf:"varint,36,opt,name=F_Uint64_optional,json=FUint64Optional" json:"F_Uint64_optional,omitempty"`
+	F_FloatOptional    *float32 `protobuf:"fixed32,37,opt,name=F_Float_optional,json=FFloatOptional" json:"F_Float_optional,omitempty"`
+	F_DoubleOptional   *float64 `protobuf:"fixed64,38,opt,name=F_Double_optional,json=FDoubleOptional" json:"F_Double_optional,omitempty"`
+	F_StringOptional   *string  `protobuf:"bytes,39,opt,name=F_String_optional,json=FStringOptional" json:"F_String_optional,omitempty"`
+	F_BytesOptional    []byte   `protobuf:"bytes,301,opt,name=F_Bytes_optional,json=FBytesOptional" json:"F_Bytes_optional,omitempty"`
+	F_Sint32Optional   *int32   `protobuf:"zigzag32,302,opt,name=F_Sint32_optional,json=FSint32Optional" json:"F_Sint32_optional,omitempty"`
+	F_Sint64Optional   *int64   `protobuf:"zigzag64,303,opt,name=F_Sint64_optional,json=FSint64Optional" json:"F_Sint64_optional,omitempty"`
+	F_Sfixed32Optional *int32   `protobuf:"fixed32,304,opt,name=F_Sfixed32_optional,json=FSfixed32Optional" json:"F_Sfixed32_optional,omitempty"`
+	F_Sfixed64Optional *int64   `protobuf:"fixed64,305,opt,name=F_Sfixed64_optional,json=FSfixed64Optional" json:"F_Sfixed64_optional,omitempty"`
+	// Default-valued fields of all basic types
+	F_BoolDefaulted     *bool    `protobuf:"varint,40,opt,name=F_Bool_defaulted,json=FBoolDefaulted,def=1" json:"F_Bool_defaulted,omitempty"`
+	F_Int32Defaulted    *int32   `protobuf:"varint,41,opt,name=F_Int32_defaulted,json=FInt32Defaulted,def=32" json:"F_Int32_defaulted,omitempty"`
+	F_Int64Defaulted    *int64   `protobuf:"varint,42,opt,name=F_Int64_defaulted,json=FInt64Defaulted,def=64" json:"F_Int64_defaulted,omitempty"`
+	F_Fixed32Defaulted  *uint32  `protobuf:"fixed32,43,opt,name=F_Fixed32_defaulted,json=FFixed32Defaulted,def=320" json:"F_Fixed32_defaulted,omitempty"`
+	F_Fixed64Defaulted  *uint64  `protobuf:"fixed64,44,opt,name=F_Fixed64_defaulted,json=FFixed64Defaulted,def=640" json:"F_Fixed64_defaulted,omitempty"`
+	F_Uint32Defaulted   *uint32  `protobuf:"varint,45,opt,name=F_Uint32_defaulted,json=FUint32Defaulted,def=3200" json:"F_Uint32_defaulted,omitempty"`
+	F_Uint64Defaulted   *uint64  `protobuf:"varint,46,opt,name=F_Uint64_defaulted,json=FUint64Defaulted,def=6400" json:"F_Uint64_defaulted,omitempty"`
+	F_FloatDefaulted    *float32 `protobuf:"fixed32,47,opt,name=F_Float_defaulted,json=FFloatDefaulted,def=314159" json:"F_Float_defaulted,omitempty"`
+	F_DoubleDefaulted   *float64 `protobuf:"fixed64,48,opt,name=F_Double_defaulted,json=FDoubleDefaulted,def=271828" json:"F_Double_defaulted,omitempty"`
+	F_StringDefaulted   *string  `protobuf:"bytes,49,opt,name=F_String_defaulted,json=FStringDefaulted,def=hello, \"world!\"\n" json:"F_String_defaulted,omitempty"`
+	F_BytesDefaulted    []byte   `protobuf:"bytes,401,opt,name=F_Bytes_defaulted,json=FBytesDefaulted,def=Bignose" json:"F_Bytes_defaulted,omitempty"`
+	F_Sint32Defaulted   *int32   `protobuf:"zigzag32,402,opt,name=F_Sint32_defaulted,json=FSint32Defaulted,def=-32" json:"F_Sint32_defaulted,omitempty"`
+	F_Sint64Defaulted   *int64   `protobuf:"zigzag64,403,opt,name=F_Sint64_defaulted,json=FSint64Defaulted,def=-64" json:"F_Sint64_defaulted,omitempty"`
+	F_Sfixed32Defaulted *int32   `protobuf:"fixed32,404,opt,name=F_Sfixed32_defaulted,json=FSfixed32Defaulted,def=-32" json:"F_Sfixed32_defaulted,omitempty"`
+	F_Sfixed64Defaulted *int64   `protobuf:"fixed64,405,opt,name=F_Sfixed64_defaulted,json=FSfixed64Defaulted,def=-64" json:"F_Sfixed64_defaulted,omitempty"`
+	// Packed repeated fields (no string or bytes).
+	F_BoolRepeatedPacked     []bool                  `protobuf:"varint,50,rep,packed,name=F_Bool_repeated_packed,json=FBoolRepeatedPacked" json:"F_Bool_repeated_packed,omitempty"`
+	F_Int32RepeatedPacked    []int32                 `protobuf:"varint,51,rep,packed,name=F_Int32_repeated_packed,json=FInt32RepeatedPacked" json:"F_Int32_repeated_packed,omitempty"`
+	F_Int64RepeatedPacked    []int64                 `protobuf:"varint,52,rep,packed,name=F_Int64_repeated_packed,json=FInt64RepeatedPacked" json:"F_Int64_repeated_packed,omitempty"`
+	F_Fixed32RepeatedPacked  []uint32                `protobuf:"fixed32,53,rep,packed,name=F_Fixed32_repeated_packed,json=FFixed32RepeatedPacked" json:"F_Fixed32_repeated_packed,omitempty"`
+	F_Fixed64RepeatedPacked  []uint64                `protobuf:"fixed64,54,rep,packed,name=F_Fixed64_repeated_packed,json=FFixed64RepeatedPacked" json:"F_Fixed64_repeated_packed,omitempty"`
+	F_Uint32RepeatedPacked   []uint32                `protobuf:"varint,55,rep,packed,name=F_Uint32_repeated_packed,json=FUint32RepeatedPacked" json:"F_Uint32_repeated_packed,omitempty"`
+	F_Uint64RepeatedPacked   []uint64                `protobuf:"varint,56,rep,packed,name=F_Uint64_repeated_packed,json=FUint64RepeatedPacked" json:"F_Uint64_repeated_packed,omitempty"`
+	F_FloatRepeatedPacked    []float32               `protobuf:"fixed32,57,rep,packed,name=F_Float_repeated_packed,json=FFloatRepeatedPacked" json:"F_Float_repeated_packed,omitempty"`
+	F_DoubleRepeatedPacked   []float64               `protobuf:"fixed64,58,rep,packed,name=F_Double_repeated_packed,json=FDoubleRepeatedPacked" json:"F_Double_repeated_packed,omitempty"`
+	F_Sint32RepeatedPacked   []int32                 `protobuf:"zigzag32,502,rep,packed,name=F_Sint32_repeated_packed,json=FSint32RepeatedPacked" json:"F_Sint32_repeated_packed,omitempty"`
+	F_Sint64RepeatedPacked   []int64                 `protobuf:"zigzag64,503,rep,packed,name=F_Sint64_repeated_packed,json=FSint64RepeatedPacked" json:"F_Sint64_repeated_packed,omitempty"`
+	F_Sfixed32RepeatedPacked []int32                 `protobuf:"fixed32,504,rep,packed,name=F_Sfixed32_repeated_packed,json=FSfixed32RepeatedPacked" json:"F_Sfixed32_repeated_packed,omitempty"`
+	F_Sfixed64RepeatedPacked []int64                 `protobuf:"fixed64,505,rep,packed,name=F_Sfixed64_repeated_packed,json=FSfixed64RepeatedPacked" json:"F_Sfixed64_repeated_packed,omitempty"`
+	Requiredgroup            *GoTest_RequiredGroup   `protobuf:"group,70,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
+	Repeatedgroup            []*GoTest_RepeatedGroup `protobuf:"group,80,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
+	Optionalgroup            *GoTest_OptionalGroup   `protobuf:"group,90,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{}                `json:"-"`
+	XXX_unrecognized         []byte                  `json:"-"`
+	XXX_sizecache            int32                   `json:"-"`
+}
+
+func (m *GoTest) Reset()         { *m = GoTest{} }
+func (m *GoTest) String() string { return proto.CompactTextString(m) }
+func (*GoTest) ProtoMessage()    {}
+func (*GoTest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{2}
+}
+func (m *GoTest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoTest.Unmarshal(m, b)
+}
+func (m *GoTest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoTest.Marshal(b, m, deterministic)
+}
+func (dst *GoTest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoTest.Merge(dst, src)
+}
+func (m *GoTest) XXX_Size() int {
+	return xxx_messageInfo_GoTest.Size(m)
+}
+func (m *GoTest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoTest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoTest proto.InternalMessageInfo
+
+const Default_GoTest_F_BoolDefaulted bool = true
+const Default_GoTest_F_Int32Defaulted int32 = 32
+const Default_GoTest_F_Int64Defaulted int64 = 64
+const Default_GoTest_F_Fixed32Defaulted uint32 = 320
+const Default_GoTest_F_Fixed64Defaulted uint64 = 640
+const Default_GoTest_F_Uint32Defaulted uint32 = 3200
+const Default_GoTest_F_Uint64Defaulted uint64 = 6400
+const Default_GoTest_F_FloatDefaulted float32 = 314159
+const Default_GoTest_F_DoubleDefaulted float64 = 271828
+const Default_GoTest_F_StringDefaulted string = "hello, \"world!\"\n"
+
+var Default_GoTest_F_BytesDefaulted []byte = []byte("Bignose")
+
+const Default_GoTest_F_Sint32Defaulted int32 = -32
+const Default_GoTest_F_Sint64Defaulted int64 = -64
+const Default_GoTest_F_Sfixed32Defaulted int32 = -32
+const Default_GoTest_F_Sfixed64Defaulted int64 = -64
+
+func (m *GoTest) GetKind() GoTest_KIND {
+	if m != nil && m.Kind != nil {
+		return *m.Kind
+	}
+	return GoTest_VOID
+}
+
+func (m *GoTest) GetTable() string {
+	if m != nil && m.Table != nil {
+		return *m.Table
+	}
+	return ""
+}
+
+func (m *GoTest) GetParam() int32 {
+	if m != nil && m.Param != nil {
+		return *m.Param
+	}
+	return 0
+}
+
+func (m *GoTest) GetRequiredField() *GoTestField {
+	if m != nil {
+		return m.RequiredField
+	}
+	return nil
+}
+
+func (m *GoTest) GetRepeatedField() []*GoTestField {
+	if m != nil {
+		return m.RepeatedField
+	}
+	return nil
+}
+
+func (m *GoTest) GetOptionalField() *GoTestField {
+	if m != nil {
+		return m.OptionalField
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_BoolRequired() bool {
+	if m != nil && m.F_BoolRequired != nil {
+		return *m.F_BoolRequired
+	}
+	return false
+}
+
+func (m *GoTest) GetF_Int32Required() int32 {
+	if m != nil && m.F_Int32Required != nil {
+		return *m.F_Int32Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Int64Required() int64 {
+	if m != nil && m.F_Int64Required != nil {
+		return *m.F_Int64Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Fixed32Required() uint32 {
+	if m != nil && m.F_Fixed32Required != nil {
+		return *m.F_Fixed32Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Fixed64Required() uint64 {
+	if m != nil && m.F_Fixed64Required != nil {
+		return *m.F_Fixed64Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Uint32Required() uint32 {
+	if m != nil && m.F_Uint32Required != nil {
+		return *m.F_Uint32Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Uint64Required() uint64 {
+	if m != nil && m.F_Uint64Required != nil {
+		return *m.F_Uint64Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_FloatRequired() float32 {
+	if m != nil && m.F_FloatRequired != nil {
+		return *m.F_FloatRequired
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_DoubleRequired() float64 {
+	if m != nil && m.F_DoubleRequired != nil {
+		return *m.F_DoubleRequired
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_StringRequired() string {
+	if m != nil && m.F_StringRequired != nil {
+		return *m.F_StringRequired
+	}
+	return ""
+}
+
+func (m *GoTest) GetF_BytesRequired() []byte {
+	if m != nil {
+		return m.F_BytesRequired
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sint32Required() int32 {
+	if m != nil && m.F_Sint32Required != nil {
+		return *m.F_Sint32Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Sint64Required() int64 {
+	if m != nil && m.F_Sint64Required != nil {
+		return *m.F_Sint64Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Sfixed32Required() int32 {
+	if m != nil && m.F_Sfixed32Required != nil {
+		return *m.F_Sfixed32Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Sfixed64Required() int64 {
+	if m != nil && m.F_Sfixed64Required != nil {
+		return *m.F_Sfixed64Required
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_BoolRepeated() []bool {
+	if m != nil {
+		return m.F_BoolRepeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Int32Repeated() []int32 {
+	if m != nil {
+		return m.F_Int32Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Int64Repeated() []int64 {
+	if m != nil {
+		return m.F_Int64Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Fixed32Repeated() []uint32 {
+	if m != nil {
+		return m.F_Fixed32Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Fixed64Repeated() []uint64 {
+	if m != nil {
+		return m.F_Fixed64Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Uint32Repeated() []uint32 {
+	if m != nil {
+		return m.F_Uint32Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Uint64Repeated() []uint64 {
+	if m != nil {
+		return m.F_Uint64Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_FloatRepeated() []float32 {
+	if m != nil {
+		return m.F_FloatRepeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_DoubleRepeated() []float64 {
+	if m != nil {
+		return m.F_DoubleRepeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_StringRepeated() []string {
+	if m != nil {
+		return m.F_StringRepeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_BytesRepeated() [][]byte {
+	if m != nil {
+		return m.F_BytesRepeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sint32Repeated() []int32 {
+	if m != nil {
+		return m.F_Sint32Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sint64Repeated() []int64 {
+	if m != nil {
+		return m.F_Sint64Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sfixed32Repeated() []int32 {
+	if m != nil {
+		return m.F_Sfixed32Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sfixed64Repeated() []int64 {
+	if m != nil {
+		return m.F_Sfixed64Repeated
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_BoolOptional() bool {
+	if m != nil && m.F_BoolOptional != nil {
+		return *m.F_BoolOptional
+	}
+	return false
+}
+
+func (m *GoTest) GetF_Int32Optional() int32 {
+	if m != nil && m.F_Int32Optional != nil {
+		return *m.F_Int32Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Int64Optional() int64 {
+	if m != nil && m.F_Int64Optional != nil {
+		return *m.F_Int64Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Fixed32Optional() uint32 {
+	if m != nil && m.F_Fixed32Optional != nil {
+		return *m.F_Fixed32Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Fixed64Optional() uint64 {
+	if m != nil && m.F_Fixed64Optional != nil {
+		return *m.F_Fixed64Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Uint32Optional() uint32 {
+	if m != nil && m.F_Uint32Optional != nil {
+		return *m.F_Uint32Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Uint64Optional() uint64 {
+	if m != nil && m.F_Uint64Optional != nil {
+		return *m.F_Uint64Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_FloatOptional() float32 {
+	if m != nil && m.F_FloatOptional != nil {
+		return *m.F_FloatOptional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_DoubleOptional() float64 {
+	if m != nil && m.F_DoubleOptional != nil {
+		return *m.F_DoubleOptional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_StringOptional() string {
+	if m != nil && m.F_StringOptional != nil {
+		return *m.F_StringOptional
+	}
+	return ""
+}
+
+func (m *GoTest) GetF_BytesOptional() []byte {
+	if m != nil {
+		return m.F_BytesOptional
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sint32Optional() int32 {
+	if m != nil && m.F_Sint32Optional != nil {
+		return *m.F_Sint32Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Sint64Optional() int64 {
+	if m != nil && m.F_Sint64Optional != nil {
+		return *m.F_Sint64Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Sfixed32Optional() int32 {
+	if m != nil && m.F_Sfixed32Optional != nil {
+		return *m.F_Sfixed32Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_Sfixed64Optional() int64 {
+	if m != nil && m.F_Sfixed64Optional != nil {
+		return *m.F_Sfixed64Optional
+	}
+	return 0
+}
+
+func (m *GoTest) GetF_BoolDefaulted() bool {
+	if m != nil && m.F_BoolDefaulted != nil {
+		return *m.F_BoolDefaulted
+	}
+	return Default_GoTest_F_BoolDefaulted
+}
+
+func (m *GoTest) GetF_Int32Defaulted() int32 {
+	if m != nil && m.F_Int32Defaulted != nil {
+		return *m.F_Int32Defaulted
+	}
+	return Default_GoTest_F_Int32Defaulted
+}
+
+func (m *GoTest) GetF_Int64Defaulted() int64 {
+	if m != nil && m.F_Int64Defaulted != nil {
+		return *m.F_Int64Defaulted
+	}
+	return Default_GoTest_F_Int64Defaulted
+}
+
+func (m *GoTest) GetF_Fixed32Defaulted() uint32 {
+	if m != nil && m.F_Fixed32Defaulted != nil {
+		return *m.F_Fixed32Defaulted
+	}
+	return Default_GoTest_F_Fixed32Defaulted
+}
+
+func (m *GoTest) GetF_Fixed64Defaulted() uint64 {
+	if m != nil && m.F_Fixed64Defaulted != nil {
+		return *m.F_Fixed64Defaulted
+	}
+	return Default_GoTest_F_Fixed64Defaulted
+}
+
+func (m *GoTest) GetF_Uint32Defaulted() uint32 {
+	if m != nil && m.F_Uint32Defaulted != nil {
+		return *m.F_Uint32Defaulted
+	}
+	return Default_GoTest_F_Uint32Defaulted
+}
+
+func (m *GoTest) GetF_Uint64Defaulted() uint64 {
+	if m != nil && m.F_Uint64Defaulted != nil {
+		return *m.F_Uint64Defaulted
+	}
+	return Default_GoTest_F_Uint64Defaulted
+}
+
+func (m *GoTest) GetF_FloatDefaulted() float32 {
+	if m != nil && m.F_FloatDefaulted != nil {
+		return *m.F_FloatDefaulted
+	}
+	return Default_GoTest_F_FloatDefaulted
+}
+
+func (m *GoTest) GetF_DoubleDefaulted() float64 {
+	if m != nil && m.F_DoubleDefaulted != nil {
+		return *m.F_DoubleDefaulted
+	}
+	return Default_GoTest_F_DoubleDefaulted
+}
+
+func (m *GoTest) GetF_StringDefaulted() string {
+	if m != nil && m.F_StringDefaulted != nil {
+		return *m.F_StringDefaulted
+	}
+	return Default_GoTest_F_StringDefaulted
+}
+
+func (m *GoTest) GetF_BytesDefaulted() []byte {
+	if m != nil && m.F_BytesDefaulted != nil {
+		return m.F_BytesDefaulted
+	}
+	return append([]byte(nil), Default_GoTest_F_BytesDefaulted...)
+}
+
+func (m *GoTest) GetF_Sint32Defaulted() int32 {
+	if m != nil && m.F_Sint32Defaulted != nil {
+		return *m.F_Sint32Defaulted
+	}
+	return Default_GoTest_F_Sint32Defaulted
+}
+
+func (m *GoTest) GetF_Sint64Defaulted() int64 {
+	if m != nil && m.F_Sint64Defaulted != nil {
+		return *m.F_Sint64Defaulted
+	}
+	return Default_GoTest_F_Sint64Defaulted
+}
+
+func (m *GoTest) GetF_Sfixed32Defaulted() int32 {
+	if m != nil && m.F_Sfixed32Defaulted != nil {
+		return *m.F_Sfixed32Defaulted
+	}
+	return Default_GoTest_F_Sfixed32Defaulted
+}
+
+func (m *GoTest) GetF_Sfixed64Defaulted() int64 {
+	if m != nil && m.F_Sfixed64Defaulted != nil {
+		return *m.F_Sfixed64Defaulted
+	}
+	return Default_GoTest_F_Sfixed64Defaulted
+}
+
+func (m *GoTest) GetF_BoolRepeatedPacked() []bool {
+	if m != nil {
+		return m.F_BoolRepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Int32RepeatedPacked() []int32 {
+	if m != nil {
+		return m.F_Int32RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Int64RepeatedPacked() []int64 {
+	if m != nil {
+		return m.F_Int64RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Fixed32RepeatedPacked() []uint32 {
+	if m != nil {
+		return m.F_Fixed32RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Fixed64RepeatedPacked() []uint64 {
+	if m != nil {
+		return m.F_Fixed64RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Uint32RepeatedPacked() []uint32 {
+	if m != nil {
+		return m.F_Uint32RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Uint64RepeatedPacked() []uint64 {
+	if m != nil {
+		return m.F_Uint64RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_FloatRepeatedPacked() []float32 {
+	if m != nil {
+		return m.F_FloatRepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_DoubleRepeatedPacked() []float64 {
+	if m != nil {
+		return m.F_DoubleRepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sint32RepeatedPacked() []int32 {
+	if m != nil {
+		return m.F_Sint32RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sint64RepeatedPacked() []int64 {
+	if m != nil {
+		return m.F_Sint64RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sfixed32RepeatedPacked() []int32 {
+	if m != nil {
+		return m.F_Sfixed32RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetF_Sfixed64RepeatedPacked() []int64 {
+	if m != nil {
+		return m.F_Sfixed64RepeatedPacked
+	}
+	return nil
+}
+
+func (m *GoTest) GetRequiredgroup() *GoTest_RequiredGroup {
+	if m != nil {
+		return m.Requiredgroup
+	}
+	return nil
+}
+
+func (m *GoTest) GetRepeatedgroup() []*GoTest_RepeatedGroup {
+	if m != nil {
+		return m.Repeatedgroup
+	}
+	return nil
+}
+
+func (m *GoTest) GetOptionalgroup() *GoTest_OptionalGroup {
+	if m != nil {
+		return m.Optionalgroup
+	}
+	return nil
+}
+
+// Required, repeated, and optional groups.
+type GoTest_RequiredGroup struct {
+	RequiredField        *string  `protobuf:"bytes,71,req,name=RequiredField" json:"RequiredField,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GoTest_RequiredGroup) Reset()         { *m = GoTest_RequiredGroup{} }
+func (m *GoTest_RequiredGroup) String() string { return proto.CompactTextString(m) }
+func (*GoTest_RequiredGroup) ProtoMessage()    {}
+func (*GoTest_RequiredGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{2, 0}
+}
+func (m *GoTest_RequiredGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoTest_RequiredGroup.Unmarshal(m, b)
+}
+func (m *GoTest_RequiredGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoTest_RequiredGroup.Marshal(b, m, deterministic)
+}
+func (dst *GoTest_RequiredGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoTest_RequiredGroup.Merge(dst, src)
+}
+func (m *GoTest_RequiredGroup) XXX_Size() int {
+	return xxx_messageInfo_GoTest_RequiredGroup.Size(m)
+}
+func (m *GoTest_RequiredGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoTest_RequiredGroup.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoTest_RequiredGroup proto.InternalMessageInfo
+
+func (m *GoTest_RequiredGroup) GetRequiredField() string {
+	if m != nil && m.RequiredField != nil {
+		return *m.RequiredField
+	}
+	return ""
+}
+
+type GoTest_RepeatedGroup struct {
+	RequiredField        *string  `protobuf:"bytes,81,req,name=RequiredField" json:"RequiredField,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GoTest_RepeatedGroup) Reset()         { *m = GoTest_RepeatedGroup{} }
+func (m *GoTest_RepeatedGroup) String() string { return proto.CompactTextString(m) }
+func (*GoTest_RepeatedGroup) ProtoMessage()    {}
+func (*GoTest_RepeatedGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{2, 1}
+}
+func (m *GoTest_RepeatedGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoTest_RepeatedGroup.Unmarshal(m, b)
+}
+func (m *GoTest_RepeatedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoTest_RepeatedGroup.Marshal(b, m, deterministic)
+}
+func (dst *GoTest_RepeatedGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoTest_RepeatedGroup.Merge(dst, src)
+}
+func (m *GoTest_RepeatedGroup) XXX_Size() int {
+	return xxx_messageInfo_GoTest_RepeatedGroup.Size(m)
+}
+func (m *GoTest_RepeatedGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoTest_RepeatedGroup.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoTest_RepeatedGroup proto.InternalMessageInfo
+
+func (m *GoTest_RepeatedGroup) GetRequiredField() string {
+	if m != nil && m.RequiredField != nil {
+		return *m.RequiredField
+	}
+	return ""
+}
+
+type GoTest_OptionalGroup struct {
+	RequiredField        *string  `protobuf:"bytes,91,req,name=RequiredField" json:"RequiredField,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GoTest_OptionalGroup) Reset()         { *m = GoTest_OptionalGroup{} }
+func (m *GoTest_OptionalGroup) String() string { return proto.CompactTextString(m) }
+func (*GoTest_OptionalGroup) ProtoMessage()    {}
+func (*GoTest_OptionalGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{2, 2}
+}
+func (m *GoTest_OptionalGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoTest_OptionalGroup.Unmarshal(m, b)
+}
+func (m *GoTest_OptionalGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoTest_OptionalGroup.Marshal(b, m, deterministic)
+}
+func (dst *GoTest_OptionalGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoTest_OptionalGroup.Merge(dst, src)
+}
+func (m *GoTest_OptionalGroup) XXX_Size() int {
+	return xxx_messageInfo_GoTest_OptionalGroup.Size(m)
+}
+func (m *GoTest_OptionalGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoTest_OptionalGroup.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoTest_OptionalGroup proto.InternalMessageInfo
+
+func (m *GoTest_OptionalGroup) GetRequiredField() string {
+	if m != nil && m.RequiredField != nil {
+		return *m.RequiredField
+	}
+	return ""
+}
+
+// For testing a group containing a required field.
+type GoTestRequiredGroupField struct {
+	Group                *GoTestRequiredGroupField_Group `protobuf:"group,1,req,name=Group,json=group" json:"group,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
+}
+
+func (m *GoTestRequiredGroupField) Reset()         { *m = GoTestRequiredGroupField{} }
+func (m *GoTestRequiredGroupField) String() string { return proto.CompactTextString(m) }
+func (*GoTestRequiredGroupField) ProtoMessage()    {}
+func (*GoTestRequiredGroupField) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{3}
+}
+func (m *GoTestRequiredGroupField) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoTestRequiredGroupField.Unmarshal(m, b)
+}
+func (m *GoTestRequiredGroupField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoTestRequiredGroupField.Marshal(b, m, deterministic)
+}
+func (dst *GoTestRequiredGroupField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoTestRequiredGroupField.Merge(dst, src)
+}
+func (m *GoTestRequiredGroupField) XXX_Size() int {
+	return xxx_messageInfo_GoTestRequiredGroupField.Size(m)
+}
+func (m *GoTestRequiredGroupField) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoTestRequiredGroupField.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoTestRequiredGroupField proto.InternalMessageInfo
+
+func (m *GoTestRequiredGroupField) GetGroup() *GoTestRequiredGroupField_Group {
+	if m != nil {
+		return m.Group
+	}
+	return nil
+}
+
+type GoTestRequiredGroupField_Group struct {
+	Field                *int32   `protobuf:"varint,2,req,name=Field" json:"Field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GoTestRequiredGroupField_Group) Reset()         { *m = GoTestRequiredGroupField_Group{} }
+func (m *GoTestRequiredGroupField_Group) String() string { return proto.CompactTextString(m) }
+func (*GoTestRequiredGroupField_Group) ProtoMessage()    {}
+func (*GoTestRequiredGroupField_Group) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{3, 0}
+}
+func (m *GoTestRequiredGroupField_Group) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoTestRequiredGroupField_Group.Unmarshal(m, b)
+}
+func (m *GoTestRequiredGroupField_Group) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoTestRequiredGroupField_Group.Marshal(b, m, deterministic)
+}
+func (dst *GoTestRequiredGroupField_Group) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoTestRequiredGroupField_Group.Merge(dst, src)
+}
+func (m *GoTestRequiredGroupField_Group) XXX_Size() int {
+	return xxx_messageInfo_GoTestRequiredGroupField_Group.Size(m)
+}
+func (m *GoTestRequiredGroupField_Group) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoTestRequiredGroupField_Group.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoTestRequiredGroupField_Group proto.InternalMessageInfo
+
+func (m *GoTestRequiredGroupField_Group) GetField() int32 {
+	if m != nil && m.Field != nil {
+		return *m.Field
+	}
+	return 0
+}
+
+// For testing skipping of unrecognized fields.
+// Numbers are all big, larger than tag numbers in GoTestField,
+// the message used in the corresponding test.
+type GoSkipTest struct {
+	SkipInt32            *int32                `protobuf:"varint,11,req,name=skip_int32,json=skipInt32" json:"skip_int32,omitempty"`
+	SkipFixed32          *uint32               `protobuf:"fixed32,12,req,name=skip_fixed32,json=skipFixed32" json:"skip_fixed32,omitempty"`
+	SkipFixed64          *uint64               `protobuf:"fixed64,13,req,name=skip_fixed64,json=skipFixed64" json:"skip_fixed64,omitempty"`
+	SkipString           *string               `protobuf:"bytes,14,req,name=skip_string,json=skipString" json:"skip_string,omitempty"`
+	Skipgroup            *GoSkipTest_SkipGroup `protobuf:"group,15,req,name=SkipGroup,json=skipgroup" json:"skipgroup,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *GoSkipTest) Reset()         { *m = GoSkipTest{} }
+func (m *GoSkipTest) String() string { return proto.CompactTextString(m) }
+func (*GoSkipTest) ProtoMessage()    {}
+func (*GoSkipTest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{4}
+}
+func (m *GoSkipTest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoSkipTest.Unmarshal(m, b)
+}
+func (m *GoSkipTest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoSkipTest.Marshal(b, m, deterministic)
+}
+func (dst *GoSkipTest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoSkipTest.Merge(dst, src)
+}
+func (m *GoSkipTest) XXX_Size() int {
+	return xxx_messageInfo_GoSkipTest.Size(m)
+}
+func (m *GoSkipTest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoSkipTest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoSkipTest proto.InternalMessageInfo
+
+func (m *GoSkipTest) GetSkipInt32() int32 {
+	if m != nil && m.SkipInt32 != nil {
+		return *m.SkipInt32
+	}
+	return 0
+}
+
+func (m *GoSkipTest) GetSkipFixed32() uint32 {
+	if m != nil && m.SkipFixed32 != nil {
+		return *m.SkipFixed32
+	}
+	return 0
+}
+
+func (m *GoSkipTest) GetSkipFixed64() uint64 {
+	if m != nil && m.SkipFixed64 != nil {
+		return *m.SkipFixed64
+	}
+	return 0
+}
+
+func (m *GoSkipTest) GetSkipString() string {
+	if m != nil && m.SkipString != nil {
+		return *m.SkipString
+	}
+	return ""
+}
+
+func (m *GoSkipTest) GetSkipgroup() *GoSkipTest_SkipGroup {
+	if m != nil {
+		return m.Skipgroup
+	}
+	return nil
+}
+
+type GoSkipTest_SkipGroup struct {
+	GroupInt32           *int32   `protobuf:"varint,16,req,name=group_int32,json=groupInt32" json:"group_int32,omitempty"`
+	GroupString          *string  `protobuf:"bytes,17,req,name=group_string,json=groupString" json:"group_string,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GoSkipTest_SkipGroup) Reset()         { *m = GoSkipTest_SkipGroup{} }
+func (m *GoSkipTest_SkipGroup) String() string { return proto.CompactTextString(m) }
+func (*GoSkipTest_SkipGroup) ProtoMessage()    {}
+func (*GoSkipTest_SkipGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{4, 0}
+}
+func (m *GoSkipTest_SkipGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoSkipTest_SkipGroup.Unmarshal(m, b)
+}
+func (m *GoSkipTest_SkipGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoSkipTest_SkipGroup.Marshal(b, m, deterministic)
+}
+func (dst *GoSkipTest_SkipGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoSkipTest_SkipGroup.Merge(dst, src)
+}
+func (m *GoSkipTest_SkipGroup) XXX_Size() int {
+	return xxx_messageInfo_GoSkipTest_SkipGroup.Size(m)
+}
+func (m *GoSkipTest_SkipGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoSkipTest_SkipGroup.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoSkipTest_SkipGroup proto.InternalMessageInfo
+
+func (m *GoSkipTest_SkipGroup) GetGroupInt32() int32 {
+	if m != nil && m.GroupInt32 != nil {
+		return *m.GroupInt32
+	}
+	return 0
+}
+
+func (m *GoSkipTest_SkipGroup) GetGroupString() string {
+	if m != nil && m.GroupString != nil {
+		return *m.GroupString
+	}
+	return ""
+}
+
+// For testing packed/non-packed decoder switching.
+// A serialized instance of one should be deserializable as the other.
+type NonPackedTest struct {
+	A                    []int32  `protobuf:"varint,1,rep,name=a" json:"a,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NonPackedTest) Reset()         { *m = NonPackedTest{} }
+func (m *NonPackedTest) String() string { return proto.CompactTextString(m) }
+func (*NonPackedTest) ProtoMessage()    {}
+func (*NonPackedTest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{5}
+}
+func (m *NonPackedTest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NonPackedTest.Unmarshal(m, b)
+}
+func (m *NonPackedTest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NonPackedTest.Marshal(b, m, deterministic)
+}
+func (dst *NonPackedTest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NonPackedTest.Merge(dst, src)
+}
+func (m *NonPackedTest) XXX_Size() int {
+	return xxx_messageInfo_NonPackedTest.Size(m)
+}
+func (m *NonPackedTest) XXX_DiscardUnknown() {
+	xxx_messageInfo_NonPackedTest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NonPackedTest proto.InternalMessageInfo
+
+func (m *NonPackedTest) GetA() []int32 {
+	if m != nil {
+		return m.A
+	}
+	return nil
+}
+
+type PackedTest struct {
+	B                    []int32  `protobuf:"varint,1,rep,packed,name=b" json:"b,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PackedTest) Reset()         { *m = PackedTest{} }
+func (m *PackedTest) String() string { return proto.CompactTextString(m) }
+func (*PackedTest) ProtoMessage()    {}
+func (*PackedTest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{6}
+}
+func (m *PackedTest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PackedTest.Unmarshal(m, b)
+}
+func (m *PackedTest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PackedTest.Marshal(b, m, deterministic)
+}
+func (dst *PackedTest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackedTest.Merge(dst, src)
+}
+func (m *PackedTest) XXX_Size() int {
+	return xxx_messageInfo_PackedTest.Size(m)
+}
+func (m *PackedTest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PackedTest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PackedTest proto.InternalMessageInfo
+
+func (m *PackedTest) GetB() []int32 {
+	if m != nil {
+		return m.B
+	}
+	return nil
+}
+
+type MaxTag struct {
+	// Maximum possible tag number.
+	LastField            *string  `protobuf:"bytes,536870911,opt,name=last_field,json=lastField" json:"last_field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MaxTag) Reset()         { *m = MaxTag{} }
+func (m *MaxTag) String() string { return proto.CompactTextString(m) }
+func (*MaxTag) ProtoMessage()    {}
+func (*MaxTag) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{7}
+}
+func (m *MaxTag) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MaxTag.Unmarshal(m, b)
+}
+func (m *MaxTag) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MaxTag.Marshal(b, m, deterministic)
+}
+func (dst *MaxTag) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaxTag.Merge(dst, src)
+}
+func (m *MaxTag) XXX_Size() int {
+	return xxx_messageInfo_MaxTag.Size(m)
+}
+func (m *MaxTag) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaxTag.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MaxTag proto.InternalMessageInfo
+
+func (m *MaxTag) GetLastField() string {
+	if m != nil && m.LastField != nil {
+		return *m.LastField
+	}
+	return ""
+}
+
+type OldMessage struct {
+	Nested               *OldMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
+	Num                  *int32             `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *OldMessage) Reset()         { *m = OldMessage{} }
+func (m *OldMessage) String() string { return proto.CompactTextString(m) }
+func (*OldMessage) ProtoMessage()    {}
+func (*OldMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{8}
+}
+func (m *OldMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OldMessage.Unmarshal(m, b)
+}
+func (m *OldMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OldMessage.Marshal(b, m, deterministic)
+}
+func (dst *OldMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OldMessage.Merge(dst, src)
+}
+func (m *OldMessage) XXX_Size() int {
+	return xxx_messageInfo_OldMessage.Size(m)
+}
+func (m *OldMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_OldMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OldMessage proto.InternalMessageInfo
+
+func (m *OldMessage) GetNested() *OldMessage_Nested {
+	if m != nil {
+		return m.Nested
+	}
+	return nil
+}
+
+func (m *OldMessage) GetNum() int32 {
+	if m != nil && m.Num != nil {
+		return *m.Num
+	}
+	return 0
+}
+
+type OldMessage_Nested struct {
+	Name                 *string  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OldMessage_Nested) Reset()         { *m = OldMessage_Nested{} }
+func (m *OldMessage_Nested) String() string { return proto.CompactTextString(m) }
+func (*OldMessage_Nested) ProtoMessage()    {}
+func (*OldMessage_Nested) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{8, 0}
+}
+func (m *OldMessage_Nested) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OldMessage_Nested.Unmarshal(m, b)
+}
+func (m *OldMessage_Nested) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OldMessage_Nested.Marshal(b, m, deterministic)
+}
+func (dst *OldMessage_Nested) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OldMessage_Nested.Merge(dst, src)
+}
+func (m *OldMessage_Nested) XXX_Size() int {
+	return xxx_messageInfo_OldMessage_Nested.Size(m)
+}
+func (m *OldMessage_Nested) XXX_DiscardUnknown() {
+	xxx_messageInfo_OldMessage_Nested.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OldMessage_Nested proto.InternalMessageInfo
+
+func (m *OldMessage_Nested) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+// NewMessage is wire compatible with OldMessage;
+// imagine it as a future version.
+type NewMessage struct {
+	Nested *NewMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
+	// This is an int32 in OldMessage.
+	Num                  *int64   `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NewMessage) Reset()         { *m = NewMessage{} }
+func (m *NewMessage) String() string { return proto.CompactTextString(m) }
+func (*NewMessage) ProtoMessage()    {}
+func (*NewMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{9}
+}
+func (m *NewMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NewMessage.Unmarshal(m, b)
+}
+func (m *NewMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NewMessage.Marshal(b, m, deterministic)
+}
+func (dst *NewMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NewMessage.Merge(dst, src)
+}
+func (m *NewMessage) XXX_Size() int {
+	return xxx_messageInfo_NewMessage.Size(m)
+}
+func (m *NewMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_NewMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NewMessage proto.InternalMessageInfo
+
+func (m *NewMessage) GetNested() *NewMessage_Nested {
+	if m != nil {
+		return m.Nested
+	}
+	return nil
+}
+
+func (m *NewMessage) GetNum() int64 {
+	if m != nil && m.Num != nil {
+		return *m.Num
+	}
+	return 0
+}
+
+type NewMessage_Nested struct {
+	Name                 *string  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	FoodGroup            *string  `protobuf:"bytes,2,opt,name=food_group,json=foodGroup" json:"food_group,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NewMessage_Nested) Reset()         { *m = NewMessage_Nested{} }
+func (m *NewMessage_Nested) String() string { return proto.CompactTextString(m) }
+func (*NewMessage_Nested) ProtoMessage()    {}
+func (*NewMessage_Nested) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{9, 0}
+}
+func (m *NewMessage_Nested) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NewMessage_Nested.Unmarshal(m, b)
+}
+func (m *NewMessage_Nested) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NewMessage_Nested.Marshal(b, m, deterministic)
+}
+func (dst *NewMessage_Nested) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NewMessage_Nested.Merge(dst, src)
+}
+func (m *NewMessage_Nested) XXX_Size() int {
+	return xxx_messageInfo_NewMessage_Nested.Size(m)
+}
+func (m *NewMessage_Nested) XXX_DiscardUnknown() {
+	xxx_messageInfo_NewMessage_Nested.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NewMessage_Nested proto.InternalMessageInfo
+
+func (m *NewMessage_Nested) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *NewMessage_Nested) GetFoodGroup() string {
+	if m != nil && m.FoodGroup != nil {
+		return *m.FoodGroup
+	}
+	return ""
+}
+
+type InnerMessage struct {
+	Host                 *string  `protobuf:"bytes,1,req,name=host" json:"host,omitempty"`
+	Port                 *int32   `protobuf:"varint,2,opt,name=port,def=4000" json:"port,omitempty"`
+	Connected            *bool    `protobuf:"varint,3,opt,name=connected" json:"connected,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InnerMessage) Reset()         { *m = InnerMessage{} }
+func (m *InnerMessage) String() string { return proto.CompactTextString(m) }
+func (*InnerMessage) ProtoMessage()    {}
+func (*InnerMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{10}
+}
+func (m *InnerMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InnerMessage.Unmarshal(m, b)
+}
+func (m *InnerMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InnerMessage.Marshal(b, m, deterministic)
+}
+func (dst *InnerMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InnerMessage.Merge(dst, src)
+}
+func (m *InnerMessage) XXX_Size() int {
+	return xxx_messageInfo_InnerMessage.Size(m)
+}
+func (m *InnerMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_InnerMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InnerMessage proto.InternalMessageInfo
+
+const Default_InnerMessage_Port int32 = 4000
+
+func (m *InnerMessage) GetHost() string {
+	if m != nil && m.Host != nil {
+		return *m.Host
+	}
+	return ""
+}
+
+func (m *InnerMessage) GetPort() int32 {
+	if m != nil && m.Port != nil {
+		return *m.Port
+	}
+	return Default_InnerMessage_Port
+}
+
+func (m *InnerMessage) GetConnected() bool {
+	if m != nil && m.Connected != nil {
+		return *m.Connected
+	}
+	return false
+}
+
+type OtherMessage struct {
+	Key                          *int64        `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
+	Value                        []byte        `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Weight                       *float32      `protobuf:"fixed32,3,opt,name=weight" json:"weight,omitempty"`
+	Inner                        *InnerMessage `protobuf:"bytes,4,opt,name=inner" json:"inner,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}      `json:"-"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
+}
+
+func (m *OtherMessage) Reset()         { *m = OtherMessage{} }
+func (m *OtherMessage) String() string { return proto.CompactTextString(m) }
+func (*OtherMessage) ProtoMessage()    {}
+func (*OtherMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{11}
+}
+
+var extRange_OtherMessage = []proto.ExtensionRange{
+	{Start: 100, End: 536870911},
+}
+
+func (*OtherMessage) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_OtherMessage
+}
+func (m *OtherMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OtherMessage.Unmarshal(m, b)
+}
+func (m *OtherMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OtherMessage.Marshal(b, m, deterministic)
+}
+func (dst *OtherMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OtherMessage.Merge(dst, src)
+}
+func (m *OtherMessage) XXX_Size() int {
+	return xxx_messageInfo_OtherMessage.Size(m)
+}
+func (m *OtherMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_OtherMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OtherMessage proto.InternalMessageInfo
+
+func (m *OtherMessage) GetKey() int64 {
+	if m != nil && m.Key != nil {
+		return *m.Key
+	}
+	return 0
+}
+
+func (m *OtherMessage) GetValue() []byte {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+func (m *OtherMessage) GetWeight() float32 {
+	if m != nil && m.Weight != nil {
+		return *m.Weight
+	}
+	return 0
+}
+
+func (m *OtherMessage) GetInner() *InnerMessage {
+	if m != nil {
+		return m.Inner
+	}
+	return nil
+}
+
+type RequiredInnerMessage struct {
+	LeoFinallyWonAnOscar *InnerMessage `protobuf:"bytes,1,req,name=leo_finally_won_an_oscar,json=leoFinallyWonAnOscar" json:"leo_finally_won_an_oscar,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *RequiredInnerMessage) Reset()         { *m = RequiredInnerMessage{} }
+func (m *RequiredInnerMessage) String() string { return proto.CompactTextString(m) }
+func (*RequiredInnerMessage) ProtoMessage()    {}
+func (*RequiredInnerMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{12}
+}
+func (m *RequiredInnerMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RequiredInnerMessage.Unmarshal(m, b)
+}
+func (m *RequiredInnerMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RequiredInnerMessage.Marshal(b, m, deterministic)
+}
+func (dst *RequiredInnerMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequiredInnerMessage.Merge(dst, src)
+}
+func (m *RequiredInnerMessage) XXX_Size() int {
+	return xxx_messageInfo_RequiredInnerMessage.Size(m)
+}
+func (m *RequiredInnerMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_RequiredInnerMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RequiredInnerMessage proto.InternalMessageInfo
+
+func (m *RequiredInnerMessage) GetLeoFinallyWonAnOscar() *InnerMessage {
+	if m != nil {
+		return m.LeoFinallyWonAnOscar
+	}
+	return nil
+}
+
+type MyMessage struct {
+	Count          *int32                `protobuf:"varint,1,req,name=count" json:"count,omitempty"`
+	Name           *string               `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Quote          *string               `protobuf:"bytes,3,opt,name=quote" json:"quote,omitempty"`
+	Pet            []string              `protobuf:"bytes,4,rep,name=pet" json:"pet,omitempty"`
+	Inner          *InnerMessage         `protobuf:"bytes,5,opt,name=inner" json:"inner,omitempty"`
+	Others         []*OtherMessage       `protobuf:"bytes,6,rep,name=others" json:"others,omitempty"`
+	WeMustGoDeeper *RequiredInnerMessage `protobuf:"bytes,13,opt,name=we_must_go_deeper,json=weMustGoDeeper" json:"we_must_go_deeper,omitempty"`
+	RepInner       []*InnerMessage       `protobuf:"bytes,12,rep,name=rep_inner,json=repInner" json:"rep_inner,omitempty"`
+	Bikeshed       *MyMessage_Color      `protobuf:"varint,7,opt,name=bikeshed,enum=test_proto.MyMessage_Color" json:"bikeshed,omitempty"`
+	Somegroup      *MyMessage_SomeGroup  `protobuf:"group,8,opt,name=SomeGroup,json=somegroup" json:"somegroup,omitempty"`
+	// This field becomes [][]byte in the generated code.
+	RepBytes                     [][]byte `protobuf:"bytes,10,rep,name=rep_bytes,json=repBytes" json:"rep_bytes,omitempty"`
+	Bigfloat                     *float64 `protobuf:"fixed64,11,opt,name=bigfloat" json:"bigfloat,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
+}
+
+func (m *MyMessage) Reset()         { *m = MyMessage{} }
+func (m *MyMessage) String() string { return proto.CompactTextString(m) }
+func (*MyMessage) ProtoMessage()    {}
+func (*MyMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{13}
+}
+
+var extRange_MyMessage = []proto.ExtensionRange{
+	{Start: 100, End: 536870911},
+}
+
+func (*MyMessage) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_MyMessage
+}
+func (m *MyMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MyMessage.Unmarshal(m, b)
+}
+func (m *MyMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MyMessage.Marshal(b, m, deterministic)
+}
+func (dst *MyMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MyMessage.Merge(dst, src)
+}
+func (m *MyMessage) XXX_Size() int {
+	return xxx_messageInfo_MyMessage.Size(m)
+}
+func (m *MyMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_MyMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MyMessage proto.InternalMessageInfo
+
+func (m *MyMessage) GetCount() int32 {
+	if m != nil && m.Count != nil {
+		return *m.Count
+	}
+	return 0
+}
+
+func (m *MyMessage) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *MyMessage) GetQuote() string {
+	if m != nil && m.Quote != nil {
+		return *m.Quote
+	}
+	return ""
+}
+
+func (m *MyMessage) GetPet() []string {
+	if m != nil {
+		return m.Pet
+	}
+	return nil
+}
+
+func (m *MyMessage) GetInner() *InnerMessage {
+	if m != nil {
+		return m.Inner
+	}
+	return nil
+}
+
+func (m *MyMessage) GetOthers() []*OtherMessage {
+	if m != nil {
+		return m.Others
+	}
+	return nil
+}
+
+func (m *MyMessage) GetWeMustGoDeeper() *RequiredInnerMessage {
+	if m != nil {
+		return m.WeMustGoDeeper
+	}
+	return nil
+}
+
+func (m *MyMessage) GetRepInner() []*InnerMessage {
+	if m != nil {
+		return m.RepInner
+	}
+	return nil
+}
+
+func (m *MyMessage) GetBikeshed() MyMessage_Color {
+	if m != nil && m.Bikeshed != nil {
+		return *m.Bikeshed
+	}
+	return MyMessage_RED
+}
+
+func (m *MyMessage) GetSomegroup() *MyMessage_SomeGroup {
+	if m != nil {
+		return m.Somegroup
+	}
+	return nil
+}
+
+func (m *MyMessage) GetRepBytes() [][]byte {
+	if m != nil {
+		return m.RepBytes
+	}
+	return nil
+}
+
+func (m *MyMessage) GetBigfloat() float64 {
+	if m != nil && m.Bigfloat != nil {
+		return *m.Bigfloat
+	}
+	return 0
+}
+
+type MyMessage_SomeGroup struct {
+	GroupField           *int32   `protobuf:"varint,9,opt,name=group_field,json=groupField" json:"group_field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MyMessage_SomeGroup) Reset()         { *m = MyMessage_SomeGroup{} }
+func (m *MyMessage_SomeGroup) String() string { return proto.CompactTextString(m) }
+func (*MyMessage_SomeGroup) ProtoMessage()    {}
+func (*MyMessage_SomeGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{13, 0}
+}
+func (m *MyMessage_SomeGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MyMessage_SomeGroup.Unmarshal(m, b)
+}
+func (m *MyMessage_SomeGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MyMessage_SomeGroup.Marshal(b, m, deterministic)
+}
+func (dst *MyMessage_SomeGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MyMessage_SomeGroup.Merge(dst, src)
+}
+func (m *MyMessage_SomeGroup) XXX_Size() int {
+	return xxx_messageInfo_MyMessage_SomeGroup.Size(m)
+}
+func (m *MyMessage_SomeGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_MyMessage_SomeGroup.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MyMessage_SomeGroup proto.InternalMessageInfo
+
+func (m *MyMessage_SomeGroup) GetGroupField() int32 {
+	if m != nil && m.GroupField != nil {
+		return *m.GroupField
+	}
+	return 0
+}
+
+type Ext struct {
+	Data                 *string         `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	MapField             map[int32]int32 `protobuf:"bytes,2,rep,name=map_field,json=mapField" json:"map_field,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Ext) Reset()         { *m = Ext{} }
+func (m *Ext) String() string { return proto.CompactTextString(m) }
+func (*Ext) ProtoMessage()    {}
+func (*Ext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{14}
+}
+func (m *Ext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Ext.Unmarshal(m, b)
+}
+func (m *Ext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Ext.Marshal(b, m, deterministic)
+}
+func (dst *Ext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Ext.Merge(dst, src)
+}
+func (m *Ext) XXX_Size() int {
+	return xxx_messageInfo_Ext.Size(m)
+}
+func (m *Ext) XXX_DiscardUnknown() {
+	xxx_messageInfo_Ext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Ext proto.InternalMessageInfo
+
+func (m *Ext) GetData() string {
+	if m != nil && m.Data != nil {
+		return *m.Data
+	}
+	return ""
+}
+
+func (m *Ext) GetMapField() map[int32]int32 {
+	if m != nil {
+		return m.MapField
+	}
+	return nil
+}
+
+var E_Ext_More = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessage)(nil),
+	ExtensionType: (*Ext)(nil),
+	Field:         103,
+	Name:          "test_proto.Ext.more",
+	Tag:           "bytes,103,opt,name=more",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_Ext_Text = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessage)(nil),
+	ExtensionType: (*string)(nil),
+	Field:         104,
+	Name:          "test_proto.Ext.text",
+	Tag:           "bytes,104,opt,name=text",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_Ext_Number = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessage)(nil),
+	ExtensionType: (*int32)(nil),
+	Field:         105,
+	Name:          "test_proto.Ext.number",
+	Tag:           "varint,105,opt,name=number",
+	Filename:      "test_proto/test.proto",
+}
+
+type ComplexExtension struct {
+	First                *int32   `protobuf:"varint,1,opt,name=first" json:"first,omitempty"`
+	Second               *int32   `protobuf:"varint,2,opt,name=second" json:"second,omitempty"`
+	Third                []int32  `protobuf:"varint,3,rep,name=third" json:"third,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ComplexExtension) Reset()         { *m = ComplexExtension{} }
+func (m *ComplexExtension) String() string { return proto.CompactTextString(m) }
+func (*ComplexExtension) ProtoMessage()    {}
+func (*ComplexExtension) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{15}
+}
+func (m *ComplexExtension) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ComplexExtension.Unmarshal(m, b)
+}
+func (m *ComplexExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ComplexExtension.Marshal(b, m, deterministic)
+}
+func (dst *ComplexExtension) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ComplexExtension.Merge(dst, src)
+}
+func (m *ComplexExtension) XXX_Size() int {
+	return xxx_messageInfo_ComplexExtension.Size(m)
+}
+func (m *ComplexExtension) XXX_DiscardUnknown() {
+	xxx_messageInfo_ComplexExtension.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ComplexExtension proto.InternalMessageInfo
+
+func (m *ComplexExtension) GetFirst() int32 {
+	if m != nil && m.First != nil {
+		return *m.First
+	}
+	return 0
+}
+
+func (m *ComplexExtension) GetSecond() int32 {
+	if m != nil && m.Second != nil {
+		return *m.Second
+	}
+	return 0
+}
+
+func (m *ComplexExtension) GetThird() []int32 {
+	if m != nil {
+		return m.Third
+	}
+	return nil
+}
+
+type DefaultsMessage struct {
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
+}
+
+func (m *DefaultsMessage) Reset()         { *m = DefaultsMessage{} }
+func (m *DefaultsMessage) String() string { return proto.CompactTextString(m) }
+func (*DefaultsMessage) ProtoMessage()    {}
+func (*DefaultsMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{16}
+}
+
+var extRange_DefaultsMessage = []proto.ExtensionRange{
+	{Start: 100, End: 536870911},
+}
+
+func (*DefaultsMessage) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_DefaultsMessage
+}
+func (m *DefaultsMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DefaultsMessage.Unmarshal(m, b)
+}
+func (m *DefaultsMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DefaultsMessage.Marshal(b, m, deterministic)
+}
+func (dst *DefaultsMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DefaultsMessage.Merge(dst, src)
+}
+func (m *DefaultsMessage) XXX_Size() int {
+	return xxx_messageInfo_DefaultsMessage.Size(m)
+}
+func (m *DefaultsMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_DefaultsMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DefaultsMessage proto.InternalMessageInfo
+
+type MyMessageSet struct {
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	proto.XXX_InternalExtensions `protobuf_messageset:"1" json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
+}
+
+func (m *MyMessageSet) Reset()         { *m = MyMessageSet{} }
+func (m *MyMessageSet) String() string { return proto.CompactTextString(m) }
+func (*MyMessageSet) ProtoMessage()    {}
+func (*MyMessageSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{17}
+}
+
+func (m *MyMessageSet) MarshalJSON() ([]byte, error) {
+	return proto.MarshalMessageSetJSON(&m.XXX_InternalExtensions)
+}
+func (m *MyMessageSet) UnmarshalJSON(buf []byte) error {
+	return proto.UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)
+}
+
+var extRange_MyMessageSet = []proto.ExtensionRange{
+	{Start: 100, End: 2147483646},
+}
+
+func (*MyMessageSet) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_MyMessageSet
+}
+func (m *MyMessageSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MyMessageSet.Unmarshal(m, b)
+}
+func (m *MyMessageSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MyMessageSet.Marshal(b, m, deterministic)
+}
+func (dst *MyMessageSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MyMessageSet.Merge(dst, src)
+}
+func (m *MyMessageSet) XXX_Size() int {
+	return xxx_messageInfo_MyMessageSet.Size(m)
+}
+func (m *MyMessageSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_MyMessageSet.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MyMessageSet proto.InternalMessageInfo
+
+type Empty struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Empty) Reset()         { *m = Empty{} }
+func (m *Empty) String() string { return proto.CompactTextString(m) }
+func (*Empty) ProtoMessage()    {}
+func (*Empty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{18}
+}
+func (m *Empty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Empty.Unmarshal(m, b)
+}
+func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Empty.Marshal(b, m, deterministic)
+}
+func (dst *Empty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Empty.Merge(dst, src)
+}
+func (m *Empty) XXX_Size() int {
+	return xxx_messageInfo_Empty.Size(m)
+}
+func (m *Empty) XXX_DiscardUnknown() {
+	xxx_messageInfo_Empty.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Empty proto.InternalMessageInfo
+
+type MessageList struct {
+	Message              []*MessageList_Message `protobuf:"group,1,rep,name=Message,json=message" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *MessageList) Reset()         { *m = MessageList{} }
+func (m *MessageList) String() string { return proto.CompactTextString(m) }
+func (*MessageList) ProtoMessage()    {}
+func (*MessageList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{19}
+}
+func (m *MessageList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageList.Unmarshal(m, b)
+}
+func (m *MessageList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageList.Marshal(b, m, deterministic)
+}
+func (dst *MessageList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageList.Merge(dst, src)
+}
+func (m *MessageList) XXX_Size() int {
+	return xxx_messageInfo_MessageList.Size(m)
+}
+func (m *MessageList) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MessageList proto.InternalMessageInfo
+
+func (m *MessageList) GetMessage() []*MessageList_Message {
+	if m != nil {
+		return m.Message
+	}
+	return nil
+}
+
+type MessageList_Message struct {
+	Name                 *string  `protobuf:"bytes,2,req,name=name" json:"name,omitempty"`
+	Count                *int32   `protobuf:"varint,3,req,name=count" json:"count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MessageList_Message) Reset()         { *m = MessageList_Message{} }
+func (m *MessageList_Message) String() string { return proto.CompactTextString(m) }
+func (*MessageList_Message) ProtoMessage()    {}
+func (*MessageList_Message) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{19, 0}
+}
+func (m *MessageList_Message) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageList_Message.Unmarshal(m, b)
+}
+func (m *MessageList_Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageList_Message.Marshal(b, m, deterministic)
+}
+func (dst *MessageList_Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageList_Message.Merge(dst, src)
+}
+func (m *MessageList_Message) XXX_Size() int {
+	return xxx_messageInfo_MessageList_Message.Size(m)
+}
+func (m *MessageList_Message) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageList_Message.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MessageList_Message proto.InternalMessageInfo
+
+func (m *MessageList_Message) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *MessageList_Message) GetCount() int32 {
+	if m != nil && m.Count != nil {
+		return *m.Count
+	}
+	return 0
+}
+
+type Strings struct {
+	StringField          *string  `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"`
+	BytesField           []byte   `protobuf:"bytes,2,opt,name=bytes_field,json=bytesField" json:"bytes_field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Strings) Reset()         { *m = Strings{} }
+func (m *Strings) String() string { return proto.CompactTextString(m) }
+func (*Strings) ProtoMessage()    {}
+func (*Strings) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{20}
+}
+func (m *Strings) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Strings.Unmarshal(m, b)
+}
+func (m *Strings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Strings.Marshal(b, m, deterministic)
+}
+func (dst *Strings) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Strings.Merge(dst, src)
+}
+func (m *Strings) XXX_Size() int {
+	return xxx_messageInfo_Strings.Size(m)
+}
+func (m *Strings) XXX_DiscardUnknown() {
+	xxx_messageInfo_Strings.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Strings proto.InternalMessageInfo
+
+func (m *Strings) GetStringField() string {
+	if m != nil && m.StringField != nil {
+		return *m.StringField
+	}
+	return ""
+}
+
+func (m *Strings) GetBytesField() []byte {
+	if m != nil {
+		return m.BytesField
+	}
+	return nil
+}
+
+type Defaults struct {
+	// Default-valued fields of all basic types.
+	// Same as GoTest, but copied here to make testing easier.
+	F_Bool    *bool           `protobuf:"varint,1,opt,name=F_Bool,json=FBool,def=1" json:"F_Bool,omitempty"`
+	F_Int32   *int32          `protobuf:"varint,2,opt,name=F_Int32,json=FInt32,def=32" json:"F_Int32,omitempty"`
+	F_Int64   *int64          `protobuf:"varint,3,opt,name=F_Int64,json=FInt64,def=64" json:"F_Int64,omitempty"`
+	F_Fixed32 *uint32         `protobuf:"fixed32,4,opt,name=F_Fixed32,json=FFixed32,def=320" json:"F_Fixed32,omitempty"`
+	F_Fixed64 *uint64         `protobuf:"fixed64,5,opt,name=F_Fixed64,json=FFixed64,def=640" json:"F_Fixed64,omitempty"`
+	F_Uint32  *uint32         `protobuf:"varint,6,opt,name=F_Uint32,json=FUint32,def=3200" json:"F_Uint32,omitempty"`
+	F_Uint64  *uint64         `protobuf:"varint,7,opt,name=F_Uint64,json=FUint64,def=6400" json:"F_Uint64,omitempty"`
+	F_Float   *float32        `protobuf:"fixed32,8,opt,name=F_Float,json=FFloat,def=314159" json:"F_Float,omitempty"`
+	F_Double  *float64        `protobuf:"fixed64,9,opt,name=F_Double,json=FDouble,def=271828" json:"F_Double,omitempty"`
+	F_String  *string         `protobuf:"bytes,10,opt,name=F_String,json=FString,def=hello, \"world!\"\n" json:"F_String,omitempty"`
+	F_Bytes   []byte          `protobuf:"bytes,11,opt,name=F_Bytes,json=FBytes,def=Bignose" json:"F_Bytes,omitempty"`
+	F_Sint32  *int32          `protobuf:"zigzag32,12,opt,name=F_Sint32,json=FSint32,def=-32" json:"F_Sint32,omitempty"`
+	F_Sint64  *int64          `protobuf:"zigzag64,13,opt,name=F_Sint64,json=FSint64,def=-64" json:"F_Sint64,omitempty"`
+	F_Enum    *Defaults_Color `protobuf:"varint,14,opt,name=F_Enum,json=FEnum,enum=test_proto.Defaults_Color,def=1" json:"F_Enum,omitempty"`
+	// More fields with crazy defaults.
+	F_Pinf *float32 `protobuf:"fixed32,15,opt,name=F_Pinf,json=FPinf,def=inf" json:"F_Pinf,omitempty"`
+	F_Ninf *float32 `protobuf:"fixed32,16,opt,name=F_Ninf,json=FNinf,def=-inf" json:"F_Ninf,omitempty"`
+	F_Nan  *float32 `protobuf:"fixed32,17,opt,name=F_Nan,json=FNan,def=nan" json:"F_Nan,omitempty"`
+	// Sub-message.
+	Sub *SubDefaults `protobuf:"bytes,18,opt,name=sub" json:"sub,omitempty"`
+	// Redundant but explicit defaults.
+	StrZero              *string  `protobuf:"bytes,19,opt,name=str_zero,json=strZero,def=" json:"str_zero,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Defaults) Reset()         { *m = Defaults{} }
+func (m *Defaults) String() string { return proto.CompactTextString(m) }
+func (*Defaults) ProtoMessage()    {}
+func (*Defaults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{21}
+}
+func (m *Defaults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Defaults.Unmarshal(m, b)
+}
+func (m *Defaults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Defaults.Marshal(b, m, deterministic)
+}
+func (dst *Defaults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Defaults.Merge(dst, src)
+}
+func (m *Defaults) XXX_Size() int {
+	return xxx_messageInfo_Defaults.Size(m)
+}
+func (m *Defaults) XXX_DiscardUnknown() {
+	xxx_messageInfo_Defaults.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Defaults proto.InternalMessageInfo
+
+const Default_Defaults_F_Bool bool = true
+const Default_Defaults_F_Int32 int32 = 32
+const Default_Defaults_F_Int64 int64 = 64
+const Default_Defaults_F_Fixed32 uint32 = 320
+const Default_Defaults_F_Fixed64 uint64 = 640
+const Default_Defaults_F_Uint32 uint32 = 3200
+const Default_Defaults_F_Uint64 uint64 = 6400
+const Default_Defaults_F_Float float32 = 314159
+const Default_Defaults_F_Double float64 = 271828
+const Default_Defaults_F_String string = "hello, \"world!\"\n"
+
+var Default_Defaults_F_Bytes []byte = []byte("Bignose")
+
+const Default_Defaults_F_Sint32 int32 = -32
+const Default_Defaults_F_Sint64 int64 = -64
+const Default_Defaults_F_Enum Defaults_Color = Defaults_GREEN
+
+var Default_Defaults_F_Pinf float32 = float32(math.Inf(1))
+var Default_Defaults_F_Ninf float32 = float32(math.Inf(-1))
+var Default_Defaults_F_Nan float32 = float32(math.NaN())
+
+func (m *Defaults) GetF_Bool() bool {
+	if m != nil && m.F_Bool != nil {
+		return *m.F_Bool
+	}
+	return Default_Defaults_F_Bool
+}
+
+func (m *Defaults) GetF_Int32() int32 {
+	if m != nil && m.F_Int32 != nil {
+		return *m.F_Int32
+	}
+	return Default_Defaults_F_Int32
+}
+
+func (m *Defaults) GetF_Int64() int64 {
+	if m != nil && m.F_Int64 != nil {
+		return *m.F_Int64
+	}
+	return Default_Defaults_F_Int64
+}
+
+func (m *Defaults) GetF_Fixed32() uint32 {
+	if m != nil && m.F_Fixed32 != nil {
+		return *m.F_Fixed32
+	}
+	return Default_Defaults_F_Fixed32
+}
+
+func (m *Defaults) GetF_Fixed64() uint64 {
+	if m != nil && m.F_Fixed64 != nil {
+		return *m.F_Fixed64
+	}
+	return Default_Defaults_F_Fixed64
+}
+
+func (m *Defaults) GetF_Uint32() uint32 {
+	if m != nil && m.F_Uint32 != nil {
+		return *m.F_Uint32
+	}
+	return Default_Defaults_F_Uint32
+}
+
+func (m *Defaults) GetF_Uint64() uint64 {
+	if m != nil && m.F_Uint64 != nil {
+		return *m.F_Uint64
+	}
+	return Default_Defaults_F_Uint64
+}
+
+func (m *Defaults) GetF_Float() float32 {
+	if m != nil && m.F_Float != nil {
+		return *m.F_Float
+	}
+	return Default_Defaults_F_Float
+}
+
+func (m *Defaults) GetF_Double() float64 {
+	if m != nil && m.F_Double != nil {
+		return *m.F_Double
+	}
+	return Default_Defaults_F_Double
+}
+
+func (m *Defaults) GetF_String() string {
+	if m != nil && m.F_String != nil {
+		return *m.F_String
+	}
+	return Default_Defaults_F_String
+}
+
+func (m *Defaults) GetF_Bytes() []byte {
+	if m != nil && m.F_Bytes != nil {
+		return m.F_Bytes
+	}
+	return append([]byte(nil), Default_Defaults_F_Bytes...)
+}
+
+func (m *Defaults) GetF_Sint32() int32 {
+	if m != nil && m.F_Sint32 != nil {
+		return *m.F_Sint32
+	}
+	return Default_Defaults_F_Sint32
+}
+
+func (m *Defaults) GetF_Sint64() int64 {
+	if m != nil && m.F_Sint64 != nil {
+		return *m.F_Sint64
+	}
+	return Default_Defaults_F_Sint64
+}
+
+func (m *Defaults) GetF_Enum() Defaults_Color {
+	if m != nil && m.F_Enum != nil {
+		return *m.F_Enum
+	}
+	return Default_Defaults_F_Enum
+}
+
+func (m *Defaults) GetF_Pinf() float32 {
+	if m != nil && m.F_Pinf != nil {
+		return *m.F_Pinf
+	}
+	return Default_Defaults_F_Pinf
+}
+
+func (m *Defaults) GetF_Ninf() float32 {
+	if m != nil && m.F_Ninf != nil {
+		return *m.F_Ninf
+	}
+	return Default_Defaults_F_Ninf
+}
+
+func (m *Defaults) GetF_Nan() float32 {
+	if m != nil && m.F_Nan != nil {
+		return *m.F_Nan
+	}
+	return Default_Defaults_F_Nan
+}
+
+func (m *Defaults) GetSub() *SubDefaults {
+	if m != nil {
+		return m.Sub
+	}
+	return nil
+}
+
+func (m *Defaults) GetStrZero() string {
+	if m != nil && m.StrZero != nil {
+		return *m.StrZero
+	}
+	return ""
+}
+
+type SubDefaults struct {
+	N                    *int64   `protobuf:"varint,1,opt,name=n,def=7" json:"n,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SubDefaults) Reset()         { *m = SubDefaults{} }
+func (m *SubDefaults) String() string { return proto.CompactTextString(m) }
+func (*SubDefaults) ProtoMessage()    {}
+func (*SubDefaults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{22}
+}
+func (m *SubDefaults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SubDefaults.Unmarshal(m, b)
+}
+func (m *SubDefaults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SubDefaults.Marshal(b, m, deterministic)
+}
+func (dst *SubDefaults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubDefaults.Merge(dst, src)
+}
+func (m *SubDefaults) XXX_Size() int {
+	return xxx_messageInfo_SubDefaults.Size(m)
+}
+func (m *SubDefaults) XXX_DiscardUnknown() {
+	xxx_messageInfo_SubDefaults.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SubDefaults proto.InternalMessageInfo
+
+const Default_SubDefaults_N int64 = 7
+
+func (m *SubDefaults) GetN() int64 {
+	if m != nil && m.N != nil {
+		return *m.N
+	}
+	return Default_SubDefaults_N
+}
+
+type RepeatedEnum struct {
+	Color                []RepeatedEnum_Color `protobuf:"varint,1,rep,name=color,enum=test_proto.RepeatedEnum_Color" json:"color,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *RepeatedEnum) Reset()         { *m = RepeatedEnum{} }
+func (m *RepeatedEnum) String() string { return proto.CompactTextString(m) }
+func (*RepeatedEnum) ProtoMessage()    {}
+func (*RepeatedEnum) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{23}
+}
+func (m *RepeatedEnum) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RepeatedEnum.Unmarshal(m, b)
+}
+func (m *RepeatedEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RepeatedEnum.Marshal(b, m, deterministic)
+}
+func (dst *RepeatedEnum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepeatedEnum.Merge(dst, src)
+}
+func (m *RepeatedEnum) XXX_Size() int {
+	return xxx_messageInfo_RepeatedEnum.Size(m)
+}
+func (m *RepeatedEnum) XXX_DiscardUnknown() {
+	xxx_messageInfo_RepeatedEnum.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RepeatedEnum proto.InternalMessageInfo
+
+func (m *RepeatedEnum) GetColor() []RepeatedEnum_Color {
+	if m != nil {
+		return m.Color
+	}
+	return nil
+}
+
+type MoreRepeated struct {
+	Bools                []bool   `protobuf:"varint,1,rep,name=bools" json:"bools,omitempty"`
+	BoolsPacked          []bool   `protobuf:"varint,2,rep,packed,name=bools_packed,json=boolsPacked" json:"bools_packed,omitempty"`
+	Ints                 []int32  `protobuf:"varint,3,rep,name=ints" json:"ints,omitempty"`
+	IntsPacked           []int32  `protobuf:"varint,4,rep,packed,name=ints_packed,json=intsPacked" json:"ints_packed,omitempty"`
+	Int64SPacked         []int64  `protobuf:"varint,7,rep,packed,name=int64s_packed,json=int64sPacked" json:"int64s_packed,omitempty"`
+	Strings              []string `protobuf:"bytes,5,rep,name=strings" json:"strings,omitempty"`
+	Fixeds               []uint32 `protobuf:"fixed32,6,rep,name=fixeds" json:"fixeds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MoreRepeated) Reset()         { *m = MoreRepeated{} }
+func (m *MoreRepeated) String() string { return proto.CompactTextString(m) }
+func (*MoreRepeated) ProtoMessage()    {}
+func (*MoreRepeated) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{24}
+}
+func (m *MoreRepeated) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MoreRepeated.Unmarshal(m, b)
+}
+func (m *MoreRepeated) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MoreRepeated.Marshal(b, m, deterministic)
+}
+func (dst *MoreRepeated) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MoreRepeated.Merge(dst, src)
+}
+func (m *MoreRepeated) XXX_Size() int {
+	return xxx_messageInfo_MoreRepeated.Size(m)
+}
+func (m *MoreRepeated) XXX_DiscardUnknown() {
+	xxx_messageInfo_MoreRepeated.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MoreRepeated proto.InternalMessageInfo
+
+func (m *MoreRepeated) GetBools() []bool {
+	if m != nil {
+		return m.Bools
+	}
+	return nil
+}
+
+func (m *MoreRepeated) GetBoolsPacked() []bool {
+	if m != nil {
+		return m.BoolsPacked
+	}
+	return nil
+}
+
+func (m *MoreRepeated) GetInts() []int32 {
+	if m != nil {
+		return m.Ints
+	}
+	return nil
+}
+
+func (m *MoreRepeated) GetIntsPacked() []int32 {
+	if m != nil {
+		return m.IntsPacked
+	}
+	return nil
+}
+
+func (m *MoreRepeated) GetInt64SPacked() []int64 {
+	if m != nil {
+		return m.Int64SPacked
+	}
+	return nil
+}
+
+func (m *MoreRepeated) GetStrings() []string {
+	if m != nil {
+		return m.Strings
+	}
+	return nil
+}
+
+func (m *MoreRepeated) GetFixeds() []uint32 {
+	if m != nil {
+		return m.Fixeds
+	}
+	return nil
+}
+
+type GroupOld struct {
+	G                    *GroupOld_G `protobuf:"group,101,opt,name=G,json=g" json:"g,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *GroupOld) Reset()         { *m = GroupOld{} }
+func (m *GroupOld) String() string { return proto.CompactTextString(m) }
+func (*GroupOld) ProtoMessage()    {}
+func (*GroupOld) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{25}
+}
+func (m *GroupOld) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GroupOld.Unmarshal(m, b)
+}
+func (m *GroupOld) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GroupOld.Marshal(b, m, deterministic)
+}
+func (dst *GroupOld) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupOld.Merge(dst, src)
+}
+func (m *GroupOld) XXX_Size() int {
+	return xxx_messageInfo_GroupOld.Size(m)
+}
+func (m *GroupOld) XXX_DiscardUnknown() {
+	xxx_messageInfo_GroupOld.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GroupOld proto.InternalMessageInfo
+
+func (m *GroupOld) GetG() *GroupOld_G {
+	if m != nil {
+		return m.G
+	}
+	return nil
+}
+
+type GroupOld_G struct {
+	X                    *int32   `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GroupOld_G) Reset()         { *m = GroupOld_G{} }
+func (m *GroupOld_G) String() string { return proto.CompactTextString(m) }
+func (*GroupOld_G) ProtoMessage()    {}
+func (*GroupOld_G) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{25, 0}
+}
+func (m *GroupOld_G) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GroupOld_G.Unmarshal(m, b)
+}
+func (m *GroupOld_G) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GroupOld_G.Marshal(b, m, deterministic)
+}
+func (dst *GroupOld_G) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupOld_G.Merge(dst, src)
+}
+func (m *GroupOld_G) XXX_Size() int {
+	return xxx_messageInfo_GroupOld_G.Size(m)
+}
+func (m *GroupOld_G) XXX_DiscardUnknown() {
+	xxx_messageInfo_GroupOld_G.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GroupOld_G proto.InternalMessageInfo
+
+func (m *GroupOld_G) GetX() int32 {
+	if m != nil && m.X != nil {
+		return *m.X
+	}
+	return 0
+}
+
+type GroupNew struct {
+	G                    *GroupNew_G `protobuf:"group,101,opt,name=G,json=g" json:"g,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *GroupNew) Reset()         { *m = GroupNew{} }
+func (m *GroupNew) String() string { return proto.CompactTextString(m) }
+func (*GroupNew) ProtoMessage()    {}
+func (*GroupNew) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{26}
+}
+func (m *GroupNew) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GroupNew.Unmarshal(m, b)
+}
+func (m *GroupNew) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GroupNew.Marshal(b, m, deterministic)
+}
+func (dst *GroupNew) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupNew.Merge(dst, src)
+}
+func (m *GroupNew) XXX_Size() int {
+	return xxx_messageInfo_GroupNew.Size(m)
+}
+func (m *GroupNew) XXX_DiscardUnknown() {
+	xxx_messageInfo_GroupNew.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GroupNew proto.InternalMessageInfo
+
+func (m *GroupNew) GetG() *GroupNew_G {
+	if m != nil {
+		return m.G
+	}
+	return nil
+}
+
+type GroupNew_G struct {
+	X                    *int32   `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
+	Y                    *int32   `protobuf:"varint,3,opt,name=y" json:"y,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GroupNew_G) Reset()         { *m = GroupNew_G{} }
+func (m *GroupNew_G) String() string { return proto.CompactTextString(m) }
+func (*GroupNew_G) ProtoMessage()    {}
+func (*GroupNew_G) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{26, 0}
+}
+func (m *GroupNew_G) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GroupNew_G.Unmarshal(m, b)
+}
+func (m *GroupNew_G) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GroupNew_G.Marshal(b, m, deterministic)
+}
+func (dst *GroupNew_G) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupNew_G.Merge(dst, src)
+}
+func (m *GroupNew_G) XXX_Size() int {
+	return xxx_messageInfo_GroupNew_G.Size(m)
+}
+func (m *GroupNew_G) XXX_DiscardUnknown() {
+	xxx_messageInfo_GroupNew_G.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GroupNew_G proto.InternalMessageInfo
+
+func (m *GroupNew_G) GetX() int32 {
+	if m != nil && m.X != nil {
+		return *m.X
+	}
+	return 0
+}
+
+func (m *GroupNew_G) GetY() int32 {
+	if m != nil && m.Y != nil {
+		return *m.Y
+	}
+	return 0
+}
+
+type FloatingPoint struct {
+	F                    *float64 `protobuf:"fixed64,1,req,name=f" json:"f,omitempty"`
+	Exact                *bool    `protobuf:"varint,2,opt,name=exact" json:"exact,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FloatingPoint) Reset()         { *m = FloatingPoint{} }
+func (m *FloatingPoint) String() string { return proto.CompactTextString(m) }
+func (*FloatingPoint) ProtoMessage()    {}
+func (*FloatingPoint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{27}
+}
+func (m *FloatingPoint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FloatingPoint.Unmarshal(m, b)
+}
+func (m *FloatingPoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FloatingPoint.Marshal(b, m, deterministic)
+}
+func (dst *FloatingPoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FloatingPoint.Merge(dst, src)
+}
+func (m *FloatingPoint) XXX_Size() int {
+	return xxx_messageInfo_FloatingPoint.Size(m)
+}
+func (m *FloatingPoint) XXX_DiscardUnknown() {
+	xxx_messageInfo_FloatingPoint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FloatingPoint proto.InternalMessageInfo
+
+func (m *FloatingPoint) GetF() float64 {
+	if m != nil && m.F != nil {
+		return *m.F
+	}
+	return 0
+}
+
+func (m *FloatingPoint) GetExact() bool {
+	if m != nil && m.Exact != nil {
+		return *m.Exact
+	}
+	return false
+}
+
+type MessageWithMap struct {
+	NameMapping          map[int32]string         `protobuf:"bytes,1,rep,name=name_mapping,json=nameMapping" json:"name_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	MsgMapping           map[int64]*FloatingPoint `protobuf:"bytes,2,rep,name=msg_mapping,json=msgMapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ByteMapping          map[bool][]byte          `protobuf:"bytes,3,rep,name=byte_mapping,json=byteMapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	StrToStr             map[string]string        `protobuf:"bytes,4,rep,name=str_to_str,json=strToStr" json:"str_to_str,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 (m *MessageWithMap) Reset()         { *m = MessageWithMap{} }
+func (m *MessageWithMap) String() string { return proto.CompactTextString(m) }
+func (*MessageWithMap) ProtoMessage()    {}
+func (*MessageWithMap) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{28}
+}
+func (m *MessageWithMap) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageWithMap.Unmarshal(m, b)
+}
+func (m *MessageWithMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageWithMap.Marshal(b, m, deterministic)
+}
+func (dst *MessageWithMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageWithMap.Merge(dst, src)
+}
+func (m *MessageWithMap) XXX_Size() int {
+	return xxx_messageInfo_MessageWithMap.Size(m)
+}
+func (m *MessageWithMap) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageWithMap.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MessageWithMap proto.InternalMessageInfo
+
+func (m *MessageWithMap) GetNameMapping() map[int32]string {
+	if m != nil {
+		return m.NameMapping
+	}
+	return nil
+}
+
+func (m *MessageWithMap) GetMsgMapping() map[int64]*FloatingPoint {
+	if m != nil {
+		return m.MsgMapping
+	}
+	return nil
+}
+
+func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
+	if m != nil {
+		return m.ByteMapping
+	}
+	return nil
+}
+
+func (m *MessageWithMap) GetStrToStr() map[string]string {
+	if m != nil {
+		return m.StrToStr
+	}
+	return nil
+}
+
+type Oneof struct {
+	// Types that are valid to be assigned to Union:
+	//	*Oneof_F_Bool
+	//	*Oneof_F_Int32
+	//	*Oneof_F_Int64
+	//	*Oneof_F_Fixed32
+	//	*Oneof_F_Fixed64
+	//	*Oneof_F_Uint32
+	//	*Oneof_F_Uint64
+	//	*Oneof_F_Float
+	//	*Oneof_F_Double
+	//	*Oneof_F_String
+	//	*Oneof_F_Bytes
+	//	*Oneof_F_Sint32
+	//	*Oneof_F_Sint64
+	//	*Oneof_F_Enum
+	//	*Oneof_F_Message
+	//	*Oneof_FGroup
+	//	*Oneof_F_Largest_Tag
+	Union isOneof_Union `protobuf_oneof:"union"`
+	// Types that are valid to be assigned to Tormato:
+	//	*Oneof_Value
+	Tormato              isOneof_Tormato `protobuf_oneof:"tormato"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Oneof) Reset()         { *m = Oneof{} }
+func (m *Oneof) String() string { return proto.CompactTextString(m) }
+func (*Oneof) ProtoMessage()    {}
+func (*Oneof) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{29}
+}
+func (m *Oneof) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Oneof.Unmarshal(m, b)
+}
+func (m *Oneof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Oneof.Marshal(b, m, deterministic)
+}
+func (dst *Oneof) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Oneof.Merge(dst, src)
+}
+func (m *Oneof) XXX_Size() int {
+	return xxx_messageInfo_Oneof.Size(m)
+}
+func (m *Oneof) XXX_DiscardUnknown() {
+	xxx_messageInfo_Oneof.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Oneof proto.InternalMessageInfo
+
+type isOneof_Union interface {
+	isOneof_Union()
+}
+type isOneof_Tormato interface {
+	isOneof_Tormato()
+}
+
+type Oneof_F_Bool struct {
+	F_Bool bool `protobuf:"varint,1,opt,name=F_Bool,json=FBool,oneof"`
+}
+type Oneof_F_Int32 struct {
+	F_Int32 int32 `protobuf:"varint,2,opt,name=F_Int32,json=FInt32,oneof"`
+}
+type Oneof_F_Int64 struct {
+	F_Int64 int64 `protobuf:"varint,3,opt,name=F_Int64,json=FInt64,oneof"`
+}
+type Oneof_F_Fixed32 struct {
+	F_Fixed32 uint32 `protobuf:"fixed32,4,opt,name=F_Fixed32,json=FFixed32,oneof"`
+}
+type Oneof_F_Fixed64 struct {
+	F_Fixed64 uint64 `protobuf:"fixed64,5,opt,name=F_Fixed64,json=FFixed64,oneof"`
+}
+type Oneof_F_Uint32 struct {
+	F_Uint32 uint32 `protobuf:"varint,6,opt,name=F_Uint32,json=FUint32,oneof"`
+}
+type Oneof_F_Uint64 struct {
+	F_Uint64 uint64 `protobuf:"varint,7,opt,name=F_Uint64,json=FUint64,oneof"`
+}
+type Oneof_F_Float struct {
+	F_Float float32 `protobuf:"fixed32,8,opt,name=F_Float,json=FFloat,oneof"`
+}
+type Oneof_F_Double struct {
+	F_Double float64 `protobuf:"fixed64,9,opt,name=F_Double,json=FDouble,oneof"`
+}
+type Oneof_F_String struct {
+	F_String string `protobuf:"bytes,10,opt,name=F_String,json=FString,oneof"`
+}
+type Oneof_F_Bytes struct {
+	F_Bytes []byte `protobuf:"bytes,11,opt,name=F_Bytes,json=FBytes,oneof"`
+}
+type Oneof_F_Sint32 struct {
+	F_Sint32 int32 `protobuf:"zigzag32,12,opt,name=F_Sint32,json=FSint32,oneof"`
+}
+type Oneof_F_Sint64 struct {
+	F_Sint64 int64 `protobuf:"zigzag64,13,opt,name=F_Sint64,json=FSint64,oneof"`
+}
+type Oneof_F_Enum struct {
+	F_Enum MyMessage_Color `protobuf:"varint,14,opt,name=F_Enum,json=FEnum,enum=test_proto.MyMessage_Color,oneof"`
+}
+type Oneof_F_Message struct {
+	F_Message *GoTestField `protobuf:"bytes,15,opt,name=F_Message,json=FMessage,oneof"`
+}
+type Oneof_FGroup struct {
+	FGroup *Oneof_F_Group `protobuf:"group,16,opt,name=F_Group,json=fGroup,oneof"`
+}
+type Oneof_F_Largest_Tag struct {
+	F_Largest_Tag int32 `protobuf:"varint,536870911,opt,name=F_Largest_Tag,json=FLargestTag,oneof"`
+}
+type Oneof_Value struct {
+	Value int32 `protobuf:"varint,100,opt,name=value,oneof"`
+}
+
+func (*Oneof_F_Bool) isOneof_Union()        {}
+func (*Oneof_F_Int32) isOneof_Union()       {}
+func (*Oneof_F_Int64) isOneof_Union()       {}
+func (*Oneof_F_Fixed32) isOneof_Union()     {}
+func (*Oneof_F_Fixed64) isOneof_Union()     {}
+func (*Oneof_F_Uint32) isOneof_Union()      {}
+func (*Oneof_F_Uint64) isOneof_Union()      {}
+func (*Oneof_F_Float) isOneof_Union()       {}
+func (*Oneof_F_Double) isOneof_Union()      {}
+func (*Oneof_F_String) isOneof_Union()      {}
+func (*Oneof_F_Bytes) isOneof_Union()       {}
+func (*Oneof_F_Sint32) isOneof_Union()      {}
+func (*Oneof_F_Sint64) isOneof_Union()      {}
+func (*Oneof_F_Enum) isOneof_Union()        {}
+func (*Oneof_F_Message) isOneof_Union()     {}
+func (*Oneof_FGroup) isOneof_Union()        {}
+func (*Oneof_F_Largest_Tag) isOneof_Union() {}
+func (*Oneof_Value) isOneof_Tormato()       {}
+
+func (m *Oneof) GetUnion() isOneof_Union {
+	if m != nil {
+		return m.Union
+	}
+	return nil
+}
+func (m *Oneof) GetTormato() isOneof_Tormato {
+	if m != nil {
+		return m.Tormato
+	}
+	return nil
+}
+
+func (m *Oneof) GetF_Bool() bool {
+	if x, ok := m.GetUnion().(*Oneof_F_Bool); ok {
+		return x.F_Bool
+	}
+	return false
+}
+
+func (m *Oneof) GetF_Int32() int32 {
+	if x, ok := m.GetUnion().(*Oneof_F_Int32); ok {
+		return x.F_Int32
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Int64() int64 {
+	if x, ok := m.GetUnion().(*Oneof_F_Int64); ok {
+		return x.F_Int64
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Fixed32() uint32 {
+	if x, ok := m.GetUnion().(*Oneof_F_Fixed32); ok {
+		return x.F_Fixed32
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Fixed64() uint64 {
+	if x, ok := m.GetUnion().(*Oneof_F_Fixed64); ok {
+		return x.F_Fixed64
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Uint32() uint32 {
+	if x, ok := m.GetUnion().(*Oneof_F_Uint32); ok {
+		return x.F_Uint32
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Uint64() uint64 {
+	if x, ok := m.GetUnion().(*Oneof_F_Uint64); ok {
+		return x.F_Uint64
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Float() float32 {
+	if x, ok := m.GetUnion().(*Oneof_F_Float); ok {
+		return x.F_Float
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Double() float64 {
+	if x, ok := m.GetUnion().(*Oneof_F_Double); ok {
+		return x.F_Double
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_String() string {
+	if x, ok := m.GetUnion().(*Oneof_F_String); ok {
+		return x.F_String
+	}
+	return ""
+}
+
+func (m *Oneof) GetF_Bytes() []byte {
+	if x, ok := m.GetUnion().(*Oneof_F_Bytes); ok {
+		return x.F_Bytes
+	}
+	return nil
+}
+
+func (m *Oneof) GetF_Sint32() int32 {
+	if x, ok := m.GetUnion().(*Oneof_F_Sint32); ok {
+		return x.F_Sint32
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Sint64() int64 {
+	if x, ok := m.GetUnion().(*Oneof_F_Sint64); ok {
+		return x.F_Sint64
+	}
+	return 0
+}
+
+func (m *Oneof) GetF_Enum() MyMessage_Color {
+	if x, ok := m.GetUnion().(*Oneof_F_Enum); ok {
+		return x.F_Enum
+	}
+	return MyMessage_RED
+}
+
+func (m *Oneof) GetF_Message() *GoTestField {
+	if x, ok := m.GetUnion().(*Oneof_F_Message); ok {
+		return x.F_Message
+	}
+	return nil
+}
+
+func (m *Oneof) GetFGroup() *Oneof_F_Group {
+	if x, ok := m.GetUnion().(*Oneof_FGroup); ok {
+		return x.FGroup
+	}
+	return nil
+}
+
+func (m *Oneof) GetF_Largest_Tag() int32 {
+	if x, ok := m.GetUnion().(*Oneof_F_Largest_Tag); ok {
+		return x.F_Largest_Tag
+	}
+	return 0
+}
+
+func (m *Oneof) GetValue() int32 {
+	if x, ok := m.GetTormato().(*Oneof_Value); ok {
+		return x.Value
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Oneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Oneof_OneofMarshaler, _Oneof_OneofUnmarshaler, _Oneof_OneofSizer, []interface{}{
+		(*Oneof_F_Bool)(nil),
+		(*Oneof_F_Int32)(nil),
+		(*Oneof_F_Int64)(nil),
+		(*Oneof_F_Fixed32)(nil),
+		(*Oneof_F_Fixed64)(nil),
+		(*Oneof_F_Uint32)(nil),
+		(*Oneof_F_Uint64)(nil),
+		(*Oneof_F_Float)(nil),
+		(*Oneof_F_Double)(nil),
+		(*Oneof_F_String)(nil),
+		(*Oneof_F_Bytes)(nil),
+		(*Oneof_F_Sint32)(nil),
+		(*Oneof_F_Sint64)(nil),
+		(*Oneof_F_Enum)(nil),
+		(*Oneof_F_Message)(nil),
+		(*Oneof_FGroup)(nil),
+		(*Oneof_F_Largest_Tag)(nil),
+		(*Oneof_Value)(nil),
+	}
+}
+
+func _Oneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Oneof)
+	// union
+	switch x := m.Union.(type) {
+	case *Oneof_F_Bool:
+		t := uint64(0)
+		if x.F_Bool {
+			t = 1
+		}
+		b.EncodeVarint(1<<3 | proto.WireVarint)
+		b.EncodeVarint(t)
+	case *Oneof_F_Int32:
+		b.EncodeVarint(2<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.F_Int32))
+	case *Oneof_F_Int64:
+		b.EncodeVarint(3<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.F_Int64))
+	case *Oneof_F_Fixed32:
+		b.EncodeVarint(4<<3 | proto.WireFixed32)
+		b.EncodeFixed32(uint64(x.F_Fixed32))
+	case *Oneof_F_Fixed64:
+		b.EncodeVarint(5<<3 | proto.WireFixed64)
+		b.EncodeFixed64(uint64(x.F_Fixed64))
+	case *Oneof_F_Uint32:
+		b.EncodeVarint(6<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.F_Uint32))
+	case *Oneof_F_Uint64:
+		b.EncodeVarint(7<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.F_Uint64))
+	case *Oneof_F_Float:
+		b.EncodeVarint(8<<3 | proto.WireFixed32)
+		b.EncodeFixed32(uint64(math.Float32bits(x.F_Float)))
+	case *Oneof_F_Double:
+		b.EncodeVarint(9<<3 | proto.WireFixed64)
+		b.EncodeFixed64(math.Float64bits(x.F_Double))
+	case *Oneof_F_String:
+		b.EncodeVarint(10<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.F_String)
+	case *Oneof_F_Bytes:
+		b.EncodeVarint(11<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.F_Bytes)
+	case *Oneof_F_Sint32:
+		b.EncodeVarint(12<<3 | proto.WireVarint)
+		b.EncodeZigzag32(uint64(x.F_Sint32))
+	case *Oneof_F_Sint64:
+		b.EncodeVarint(13<<3 | proto.WireVarint)
+		b.EncodeZigzag64(uint64(x.F_Sint64))
+	case *Oneof_F_Enum:
+		b.EncodeVarint(14<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.F_Enum))
+	case *Oneof_F_Message:
+		b.EncodeVarint(15<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.F_Message); err != nil {
+			return err
+		}
+	case *Oneof_FGroup:
+		b.EncodeVarint(16<<3 | proto.WireStartGroup)
+		if err := b.Marshal(x.FGroup); err != nil {
+			return err
+		}
+		b.EncodeVarint(16<<3 | proto.WireEndGroup)
+	case *Oneof_F_Largest_Tag:
+		b.EncodeVarint(536870911<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.F_Largest_Tag))
+	case nil:
+	default:
+		return fmt.Errorf("Oneof.Union has unexpected type %T", x)
+	}
+	// tormato
+	switch x := m.Tormato.(type) {
+	case *Oneof_Value:
+		b.EncodeVarint(100<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Value))
+	case nil:
+	default:
+		return fmt.Errorf("Oneof.Tormato has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Oneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Oneof)
+	switch tag {
+	case 1: // union.F_Bool
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Oneof_F_Bool{x != 0}
+		return true, err
+	case 2: // union.F_Int32
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Oneof_F_Int32{int32(x)}
+		return true, err
+	case 3: // union.F_Int64
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Oneof_F_Int64{int64(x)}
+		return true, err
+	case 4: // union.F_Fixed32
+		if wire != proto.WireFixed32 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed32()
+		m.Union = &Oneof_F_Fixed32{uint32(x)}
+		return true, err
+	case 5: // union.F_Fixed64
+		if wire != proto.WireFixed64 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed64()
+		m.Union = &Oneof_F_Fixed64{x}
+		return true, err
+	case 6: // union.F_Uint32
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Oneof_F_Uint32{uint32(x)}
+		return true, err
+	case 7: // union.F_Uint64
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Oneof_F_Uint64{x}
+		return true, err
+	case 8: // union.F_Float
+		if wire != proto.WireFixed32 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed32()
+		m.Union = &Oneof_F_Float{math.Float32frombits(uint32(x))}
+		return true, err
+	case 9: // union.F_Double
+		if wire != proto.WireFixed64 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed64()
+		m.Union = &Oneof_F_Double{math.Float64frombits(x)}
+		return true, err
+	case 10: // union.F_String
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Union = &Oneof_F_String{x}
+		return true, err
+	case 11: // union.F_Bytes
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.Union = &Oneof_F_Bytes{x}
+		return true, err
+	case 12: // union.F_Sint32
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeZigzag32()
+		m.Union = &Oneof_F_Sint32{int32(x)}
+		return true, err
+	case 13: // union.F_Sint64
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeZigzag64()
+		m.Union = &Oneof_F_Sint64{int64(x)}
+		return true, err
+	case 14: // union.F_Enum
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Oneof_F_Enum{MyMessage_Color(x)}
+		return true, err
+	case 15: // union.F_Message
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(GoTestField)
+		err := b.DecodeMessage(msg)
+		m.Union = &Oneof_F_Message{msg}
+		return true, err
+	case 16: // union.f_group
+		if wire != proto.WireStartGroup {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Oneof_F_Group)
+		err := b.DecodeGroup(msg)
+		m.Union = &Oneof_FGroup{msg}
+		return true, err
+	case 536870911: // union.F_Largest_Tag
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Oneof_F_Largest_Tag{int32(x)}
+		return true, err
+	case 100: // tormato.value
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Tormato = &Oneof_Value{int32(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Oneof_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Oneof)
+	// union
+	switch x := m.Union.(type) {
+	case *Oneof_F_Bool:
+		n += 1 // tag and wire
+		n += 1
+	case *Oneof_F_Int32:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.F_Int32))
+	case *Oneof_F_Int64:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.F_Int64))
+	case *Oneof_F_Fixed32:
+		n += 1 // tag and wire
+		n += 4
+	case *Oneof_F_Fixed64:
+		n += 1 // tag and wire
+		n += 8
+	case *Oneof_F_Uint32:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.F_Uint32))
+	case *Oneof_F_Uint64:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.F_Uint64))
+	case *Oneof_F_Float:
+		n += 1 // tag and wire
+		n += 4
+	case *Oneof_F_Double:
+		n += 1 // tag and wire
+		n += 8
+	case *Oneof_F_String:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.F_String)))
+		n += len(x.F_String)
+	case *Oneof_F_Bytes:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.F_Bytes)))
+		n += len(x.F_Bytes)
+	case *Oneof_F_Sint32:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64((uint32(x.F_Sint32) << 1) ^ uint32((int32(x.F_Sint32) >> 31))))
+	case *Oneof_F_Sint64:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(uint64(x.F_Sint64<<1) ^ uint64((int64(x.F_Sint64) >> 63))))
+	case *Oneof_F_Enum:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.F_Enum))
+	case *Oneof_F_Message:
+		s := proto.Size(x.F_Message)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Oneof_FGroup:
+		n += 2 // tag and wire
+		n += proto.Size(x.FGroup)
+		n += 2 // tag and wire
+	case *Oneof_F_Largest_Tag:
+		n += 10 // tag and wire
+		n += proto.SizeVarint(uint64(x.F_Largest_Tag))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	// tormato
+	switch x := m.Tormato.(type) {
+	case *Oneof_Value:
+		n += 2 // tag and wire
+		n += proto.SizeVarint(uint64(x.Value))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type Oneof_F_Group struct {
+	X                    *int32   `protobuf:"varint,17,opt,name=x" json:"x,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Oneof_F_Group) Reset()         { *m = Oneof_F_Group{} }
+func (m *Oneof_F_Group) String() string { return proto.CompactTextString(m) }
+func (*Oneof_F_Group) ProtoMessage()    {}
+func (*Oneof_F_Group) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{29, 0}
+}
+func (m *Oneof_F_Group) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Oneof_F_Group.Unmarshal(m, b)
+}
+func (m *Oneof_F_Group) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Oneof_F_Group.Marshal(b, m, deterministic)
+}
+func (dst *Oneof_F_Group) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Oneof_F_Group.Merge(dst, src)
+}
+func (m *Oneof_F_Group) XXX_Size() int {
+	return xxx_messageInfo_Oneof_F_Group.Size(m)
+}
+func (m *Oneof_F_Group) XXX_DiscardUnknown() {
+	xxx_messageInfo_Oneof_F_Group.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Oneof_F_Group proto.InternalMessageInfo
+
+func (m *Oneof_F_Group) GetX() int32 {
+	if m != nil && m.X != nil {
+		return *m.X
+	}
+	return 0
+}
+
+type Communique struct {
+	MakeMeCry *bool `protobuf:"varint,1,opt,name=make_me_cry,json=makeMeCry" json:"make_me_cry,omitempty"`
+	// This is a oneof, called "union".
+	//
+	// Types that are valid to be assigned to Union:
+	//	*Communique_Number
+	//	*Communique_Name
+	//	*Communique_Data
+	//	*Communique_TempC
+	//	*Communique_Col
+	//	*Communique_Msg
+	Union                isCommunique_Union `protobuf_oneof:"union"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Communique) Reset()         { *m = Communique{} }
+func (m *Communique) String() string { return proto.CompactTextString(m) }
+func (*Communique) ProtoMessage()    {}
+func (*Communique) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_74787bfc6550f8a7, []int{30}
+}
+func (m *Communique) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Communique.Unmarshal(m, b)
+}
+func (m *Communique) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Communique.Marshal(b, m, deterministic)
+}
+func (dst *Communique) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Communique.Merge(dst, src)
+}
+func (m *Communique) XXX_Size() int {
+	return xxx_messageInfo_Communique.Size(m)
+}
+func (m *Communique) XXX_DiscardUnknown() {
+	xxx_messageInfo_Communique.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Communique proto.InternalMessageInfo
+
+type isCommunique_Union interface {
+	isCommunique_Union()
+}
+
+type Communique_Number struct {
+	Number int32 `protobuf:"varint,5,opt,name=number,oneof"`
+}
+type Communique_Name struct {
+	Name string `protobuf:"bytes,6,opt,name=name,oneof"`
+}
+type Communique_Data struct {
+	Data []byte `protobuf:"bytes,7,opt,name=data,oneof"`
+}
+type Communique_TempC struct {
+	TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof"`
+}
+type Communique_Col struct {
+	Col MyMessage_Color `protobuf:"varint,9,opt,name=col,enum=test_proto.MyMessage_Color,oneof"`
+}
+type Communique_Msg struct {
+	Msg *Strings `protobuf:"bytes,10,opt,name=msg,oneof"`
+}
+
+func (*Communique_Number) isCommunique_Union() {}
+func (*Communique_Name) isCommunique_Union()   {}
+func (*Communique_Data) isCommunique_Union()   {}
+func (*Communique_TempC) isCommunique_Union()  {}
+func (*Communique_Col) isCommunique_Union()    {}
+func (*Communique_Msg) isCommunique_Union()    {}
+
+func (m *Communique) GetUnion() isCommunique_Union {
+	if m != nil {
+		return m.Union
+	}
+	return nil
+}
+
+func (m *Communique) GetMakeMeCry() bool {
+	if m != nil && m.MakeMeCry != nil {
+		return *m.MakeMeCry
+	}
+	return false
+}
+
+func (m *Communique) GetNumber() int32 {
+	if x, ok := m.GetUnion().(*Communique_Number); ok {
+		return x.Number
+	}
+	return 0
+}
+
+func (m *Communique) GetName() string {
+	if x, ok := m.GetUnion().(*Communique_Name); ok {
+		return x.Name
+	}
+	return ""
+}
+
+func (m *Communique) GetData() []byte {
+	if x, ok := m.GetUnion().(*Communique_Data); ok {
+		return x.Data
+	}
+	return nil
+}
+
+func (m *Communique) GetTempC() float64 {
+	if x, ok := m.GetUnion().(*Communique_TempC); ok {
+		return x.TempC
+	}
+	return 0
+}
+
+func (m *Communique) GetCol() MyMessage_Color {
+	if x, ok := m.GetUnion().(*Communique_Col); ok {
+		return x.Col
+	}
+	return MyMessage_RED
+}
+
+func (m *Communique) GetMsg() *Strings {
+	if x, ok := m.GetUnion().(*Communique_Msg); ok {
+		return x.Msg
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Communique) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Communique_OneofMarshaler, _Communique_OneofUnmarshaler, _Communique_OneofSizer, []interface{}{
+		(*Communique_Number)(nil),
+		(*Communique_Name)(nil),
+		(*Communique_Data)(nil),
+		(*Communique_TempC)(nil),
+		(*Communique_Col)(nil),
+		(*Communique_Msg)(nil),
+	}
+}
+
+func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Communique)
+	// union
+	switch x := m.Union.(type) {
+	case *Communique_Number:
+		b.EncodeVarint(5<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Number))
+	case *Communique_Name:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Name)
+	case *Communique_Data:
+		b.EncodeVarint(7<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.Data)
+	case *Communique_TempC:
+		b.EncodeVarint(8<<3 | proto.WireFixed64)
+		b.EncodeFixed64(math.Float64bits(x.TempC))
+	case *Communique_Col:
+		b.EncodeVarint(9<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Col))
+	case *Communique_Msg:
+		b.EncodeVarint(10<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Msg); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Communique.Union has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Communique)
+	switch tag {
+	case 5: // union.number
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Communique_Number{int32(x)}
+		return true, err
+	case 6: // union.name
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Union = &Communique_Name{x}
+		return true, err
+	case 7: // union.data
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.Union = &Communique_Data{x}
+		return true, err
+	case 8: // union.temp_c
+		if wire != proto.WireFixed64 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed64()
+		m.Union = &Communique_TempC{math.Float64frombits(x)}
+		return true, err
+	case 9: // union.col
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Union = &Communique_Col{MyMessage_Color(x)}
+		return true, err
+	case 10: // union.msg
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Strings)
+		err := b.DecodeMessage(msg)
+		m.Union = &Communique_Msg{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Communique_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Communique)
+	// union
+	switch x := m.Union.(type) {
+	case *Communique_Number:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Number))
+	case *Communique_Name:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Name)))
+		n += len(x.Name)
+	case *Communique_Data:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Data)))
+		n += len(x.Data)
+	case *Communique_TempC:
+		n += 1 // tag and wire
+		n += 8
+	case *Communique_Col:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Col))
+	case *Communique_Msg:
+		s := proto.Size(x.Msg)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+var E_Greeting = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessage)(nil),
+	ExtensionType: ([]string)(nil),
+	Field:         106,
+	Name:          "test_proto.greeting",
+	Tag:           "bytes,106,rep,name=greeting",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_Complex = &proto.ExtensionDesc{
+	ExtendedType:  (*OtherMessage)(nil),
+	ExtensionType: (*ComplexExtension)(nil),
+	Field:         200,
+	Name:          "test_proto.complex",
+	Tag:           "bytes,200,opt,name=complex",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_RComplex = &proto.ExtensionDesc{
+	ExtendedType:  (*OtherMessage)(nil),
+	ExtensionType: ([]*ComplexExtension)(nil),
+	Field:         201,
+	Name:          "test_proto.r_complex",
+	Tag:           "bytes,201,rep,name=r_complex,json=rComplex",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultDouble = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*float64)(nil),
+	Field:         101,
+	Name:          "test_proto.no_default_double",
+	Tag:           "fixed64,101,opt,name=no_default_double,json=noDefaultDouble",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultFloat = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*float32)(nil),
+	Field:         102,
+	Name:          "test_proto.no_default_float",
+	Tag:           "fixed32,102,opt,name=no_default_float,json=noDefaultFloat",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultInt32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int32)(nil),
+	Field:         103,
+	Name:          "test_proto.no_default_int32",
+	Tag:           "varint,103,opt,name=no_default_int32,json=noDefaultInt32",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultInt64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int64)(nil),
+	Field:         104,
+	Name:          "test_proto.no_default_int64",
+	Tag:           "varint,104,opt,name=no_default_int64,json=noDefaultInt64",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultUint32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*uint32)(nil),
+	Field:         105,
+	Name:          "test_proto.no_default_uint32",
+	Tag:           "varint,105,opt,name=no_default_uint32,json=noDefaultUint32",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultUint64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*uint64)(nil),
+	Field:         106,
+	Name:          "test_proto.no_default_uint64",
+	Tag:           "varint,106,opt,name=no_default_uint64,json=noDefaultUint64",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultSint32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int32)(nil),
+	Field:         107,
+	Name:          "test_proto.no_default_sint32",
+	Tag:           "zigzag32,107,opt,name=no_default_sint32,json=noDefaultSint32",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultSint64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int64)(nil),
+	Field:         108,
+	Name:          "test_proto.no_default_sint64",
+	Tag:           "zigzag64,108,opt,name=no_default_sint64,json=noDefaultSint64",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultFixed32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*uint32)(nil),
+	Field:         109,
+	Name:          "test_proto.no_default_fixed32",
+	Tag:           "fixed32,109,opt,name=no_default_fixed32,json=noDefaultFixed32",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultFixed64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*uint64)(nil),
+	Field:         110,
+	Name:          "test_proto.no_default_fixed64",
+	Tag:           "fixed64,110,opt,name=no_default_fixed64,json=noDefaultFixed64",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultSfixed32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int32)(nil),
+	Field:         111,
+	Name:          "test_proto.no_default_sfixed32",
+	Tag:           "fixed32,111,opt,name=no_default_sfixed32,json=noDefaultSfixed32",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultSfixed64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int64)(nil),
+	Field:         112,
+	Name:          "test_proto.no_default_sfixed64",
+	Tag:           "fixed64,112,opt,name=no_default_sfixed64,json=noDefaultSfixed64",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultBool = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*bool)(nil),
+	Field:         113,
+	Name:          "test_proto.no_default_bool",
+	Tag:           "varint,113,opt,name=no_default_bool,json=noDefaultBool",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultString = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*string)(nil),
+	Field:         114,
+	Name:          "test_proto.no_default_string",
+	Tag:           "bytes,114,opt,name=no_default_string,json=noDefaultString",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultBytes = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: ([]byte)(nil),
+	Field:         115,
+	Name:          "test_proto.no_default_bytes",
+	Tag:           "bytes,115,opt,name=no_default_bytes,json=noDefaultBytes",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_NoDefaultEnum = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
+	Field:         116,
+	Name:          "test_proto.no_default_enum",
+	Tag:           "varint,116,opt,name=no_default_enum,json=noDefaultEnum,enum=test_proto.DefaultsMessage_DefaultsEnum",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultDouble = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*float64)(nil),
+	Field:         201,
+	Name:          "test_proto.default_double",
+	Tag:           "fixed64,201,opt,name=default_double,json=defaultDouble,def=3.1415",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultFloat = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*float32)(nil),
+	Field:         202,
+	Name:          "test_proto.default_float",
+	Tag:           "fixed32,202,opt,name=default_float,json=defaultFloat,def=3.14",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultInt32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int32)(nil),
+	Field:         203,
+	Name:          "test_proto.default_int32",
+	Tag:           "varint,203,opt,name=default_int32,json=defaultInt32,def=42",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultInt64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int64)(nil),
+	Field:         204,
+	Name:          "test_proto.default_int64",
+	Tag:           "varint,204,opt,name=default_int64,json=defaultInt64,def=43",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultUint32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*uint32)(nil),
+	Field:         205,
+	Name:          "test_proto.default_uint32",
+	Tag:           "varint,205,opt,name=default_uint32,json=defaultUint32,def=44",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultUint64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*uint64)(nil),
+	Field:         206,
+	Name:          "test_proto.default_uint64",
+	Tag:           "varint,206,opt,name=default_uint64,json=defaultUint64,def=45",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultSint32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int32)(nil),
+	Field:         207,
+	Name:          "test_proto.default_sint32",
+	Tag:           "zigzag32,207,opt,name=default_sint32,json=defaultSint32,def=46",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultSint64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int64)(nil),
+	Field:         208,
+	Name:          "test_proto.default_sint64",
+	Tag:           "zigzag64,208,opt,name=default_sint64,json=defaultSint64,def=47",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultFixed32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*uint32)(nil),
+	Field:         209,
+	Name:          "test_proto.default_fixed32",
+	Tag:           "fixed32,209,opt,name=default_fixed32,json=defaultFixed32,def=48",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultFixed64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*uint64)(nil),
+	Field:         210,
+	Name:          "test_proto.default_fixed64",
+	Tag:           "fixed64,210,opt,name=default_fixed64,json=defaultFixed64,def=49",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultSfixed32 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int32)(nil),
+	Field:         211,
+	Name:          "test_proto.default_sfixed32",
+	Tag:           "fixed32,211,opt,name=default_sfixed32,json=defaultSfixed32,def=50",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultSfixed64 = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*int64)(nil),
+	Field:         212,
+	Name:          "test_proto.default_sfixed64",
+	Tag:           "fixed64,212,opt,name=default_sfixed64,json=defaultSfixed64,def=51",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultBool = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*bool)(nil),
+	Field:         213,
+	Name:          "test_proto.default_bool",
+	Tag:           "varint,213,opt,name=default_bool,json=defaultBool,def=1",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultString = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*string)(nil),
+	Field:         214,
+	Name:          "test_proto.default_string",
+	Tag:           "bytes,214,opt,name=default_string,json=defaultString,def=Hello, string,def=foo",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultBytes = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: ([]byte)(nil),
+	Field:         215,
+	Name:          "test_proto.default_bytes",
+	Tag:           "bytes,215,opt,name=default_bytes,json=defaultBytes,def=Hello, bytes",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_DefaultEnum = &proto.ExtensionDesc{
+	ExtendedType:  (*DefaultsMessage)(nil),
+	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
+	Field:         216,
+	Name:          "test_proto.default_enum",
+	Tag:           "varint,216,opt,name=default_enum,json=defaultEnum,enum=test_proto.DefaultsMessage_DefaultsEnum,def=1",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X201 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         201,
+	Name:          "test_proto.x201",
+	Tag:           "bytes,201,opt,name=x201",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X202 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         202,
+	Name:          "test_proto.x202",
+	Tag:           "bytes,202,opt,name=x202",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X203 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         203,
+	Name:          "test_proto.x203",
+	Tag:           "bytes,203,opt,name=x203",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X204 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         204,
+	Name:          "test_proto.x204",
+	Tag:           "bytes,204,opt,name=x204",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X205 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         205,
+	Name:          "test_proto.x205",
+	Tag:           "bytes,205,opt,name=x205",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X206 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         206,
+	Name:          "test_proto.x206",
+	Tag:           "bytes,206,opt,name=x206",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X207 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         207,
+	Name:          "test_proto.x207",
+	Tag:           "bytes,207,opt,name=x207",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X208 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         208,
+	Name:          "test_proto.x208",
+	Tag:           "bytes,208,opt,name=x208",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X209 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         209,
+	Name:          "test_proto.x209",
+	Tag:           "bytes,209,opt,name=x209",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X210 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         210,
+	Name:          "test_proto.x210",
+	Tag:           "bytes,210,opt,name=x210",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X211 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         211,
+	Name:          "test_proto.x211",
+	Tag:           "bytes,211,opt,name=x211",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X212 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         212,
+	Name:          "test_proto.x212",
+	Tag:           "bytes,212,opt,name=x212",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X213 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         213,
+	Name:          "test_proto.x213",
+	Tag:           "bytes,213,opt,name=x213",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X214 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         214,
+	Name:          "test_proto.x214",
+	Tag:           "bytes,214,opt,name=x214",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X215 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         215,
+	Name:          "test_proto.x215",
+	Tag:           "bytes,215,opt,name=x215",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X216 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         216,
+	Name:          "test_proto.x216",
+	Tag:           "bytes,216,opt,name=x216",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X217 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         217,
+	Name:          "test_proto.x217",
+	Tag:           "bytes,217,opt,name=x217",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X218 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         218,
+	Name:          "test_proto.x218",
+	Tag:           "bytes,218,opt,name=x218",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X219 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         219,
+	Name:          "test_proto.x219",
+	Tag:           "bytes,219,opt,name=x219",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X220 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         220,
+	Name:          "test_proto.x220",
+	Tag:           "bytes,220,opt,name=x220",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X221 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         221,
+	Name:          "test_proto.x221",
+	Tag:           "bytes,221,opt,name=x221",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X222 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         222,
+	Name:          "test_proto.x222",
+	Tag:           "bytes,222,opt,name=x222",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X223 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         223,
+	Name:          "test_proto.x223",
+	Tag:           "bytes,223,opt,name=x223",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X224 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         224,
+	Name:          "test_proto.x224",
+	Tag:           "bytes,224,opt,name=x224",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X225 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         225,
+	Name:          "test_proto.x225",
+	Tag:           "bytes,225,opt,name=x225",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X226 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         226,
+	Name:          "test_proto.x226",
+	Tag:           "bytes,226,opt,name=x226",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X227 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         227,
+	Name:          "test_proto.x227",
+	Tag:           "bytes,227,opt,name=x227",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X228 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         228,
+	Name:          "test_proto.x228",
+	Tag:           "bytes,228,opt,name=x228",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X229 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         229,
+	Name:          "test_proto.x229",
+	Tag:           "bytes,229,opt,name=x229",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X230 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         230,
+	Name:          "test_proto.x230",
+	Tag:           "bytes,230,opt,name=x230",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X231 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         231,
+	Name:          "test_proto.x231",
+	Tag:           "bytes,231,opt,name=x231",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X232 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         232,
+	Name:          "test_proto.x232",
+	Tag:           "bytes,232,opt,name=x232",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X233 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         233,
+	Name:          "test_proto.x233",
+	Tag:           "bytes,233,opt,name=x233",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X234 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         234,
+	Name:          "test_proto.x234",
+	Tag:           "bytes,234,opt,name=x234",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X235 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         235,
+	Name:          "test_proto.x235",
+	Tag:           "bytes,235,opt,name=x235",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X236 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         236,
+	Name:          "test_proto.x236",
+	Tag:           "bytes,236,opt,name=x236",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X237 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         237,
+	Name:          "test_proto.x237",
+	Tag:           "bytes,237,opt,name=x237",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X238 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         238,
+	Name:          "test_proto.x238",
+	Tag:           "bytes,238,opt,name=x238",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X239 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         239,
+	Name:          "test_proto.x239",
+	Tag:           "bytes,239,opt,name=x239",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X240 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         240,
+	Name:          "test_proto.x240",
+	Tag:           "bytes,240,opt,name=x240",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X241 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         241,
+	Name:          "test_proto.x241",
+	Tag:           "bytes,241,opt,name=x241",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X242 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         242,
+	Name:          "test_proto.x242",
+	Tag:           "bytes,242,opt,name=x242",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X243 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         243,
+	Name:          "test_proto.x243",
+	Tag:           "bytes,243,opt,name=x243",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X244 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         244,
+	Name:          "test_proto.x244",
+	Tag:           "bytes,244,opt,name=x244",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X245 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         245,
+	Name:          "test_proto.x245",
+	Tag:           "bytes,245,opt,name=x245",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X246 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         246,
+	Name:          "test_proto.x246",
+	Tag:           "bytes,246,opt,name=x246",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X247 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         247,
+	Name:          "test_proto.x247",
+	Tag:           "bytes,247,opt,name=x247",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X248 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         248,
+	Name:          "test_proto.x248",
+	Tag:           "bytes,248,opt,name=x248",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X249 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         249,
+	Name:          "test_proto.x249",
+	Tag:           "bytes,249,opt,name=x249",
+	Filename:      "test_proto/test.proto",
+}
+
+var E_X250 = &proto.ExtensionDesc{
+	ExtendedType:  (*MyMessageSet)(nil),
+	ExtensionType: (*Empty)(nil),
+	Field:         250,
+	Name:          "test_proto.x250",
+	Tag:           "bytes,250,opt,name=x250",
+	Filename:      "test_proto/test.proto",
+}
+
+func init() {
+	proto.RegisterType((*GoEnum)(nil), "test_proto.GoEnum")
+	proto.RegisterType((*GoTestField)(nil), "test_proto.GoTestField")
+	proto.RegisterType((*GoTest)(nil), "test_proto.GoTest")
+	proto.RegisterType((*GoTest_RequiredGroup)(nil), "test_proto.GoTest.RequiredGroup")
+	proto.RegisterType((*GoTest_RepeatedGroup)(nil), "test_proto.GoTest.RepeatedGroup")
+	proto.RegisterType((*GoTest_OptionalGroup)(nil), "test_proto.GoTest.OptionalGroup")
+	proto.RegisterType((*GoTestRequiredGroupField)(nil), "test_proto.GoTestRequiredGroupField")
+	proto.RegisterType((*GoTestRequiredGroupField_Group)(nil), "test_proto.GoTestRequiredGroupField.Group")
+	proto.RegisterType((*GoSkipTest)(nil), "test_proto.GoSkipTest")
+	proto.RegisterType((*GoSkipTest_SkipGroup)(nil), "test_proto.GoSkipTest.SkipGroup")
+	proto.RegisterType((*NonPackedTest)(nil), "test_proto.NonPackedTest")
+	proto.RegisterType((*PackedTest)(nil), "test_proto.PackedTest")
+	proto.RegisterType((*MaxTag)(nil), "test_proto.MaxTag")
+	proto.RegisterType((*OldMessage)(nil), "test_proto.OldMessage")
+	proto.RegisterType((*OldMessage_Nested)(nil), "test_proto.OldMessage.Nested")
+	proto.RegisterType((*NewMessage)(nil), "test_proto.NewMessage")
+	proto.RegisterType((*NewMessage_Nested)(nil), "test_proto.NewMessage.Nested")
+	proto.RegisterType((*InnerMessage)(nil), "test_proto.InnerMessage")
+	proto.RegisterType((*OtherMessage)(nil), "test_proto.OtherMessage")
+	proto.RegisterType((*RequiredInnerMessage)(nil), "test_proto.RequiredInnerMessage")
+	proto.RegisterType((*MyMessage)(nil), "test_proto.MyMessage")
+	proto.RegisterType((*MyMessage_SomeGroup)(nil), "test_proto.MyMessage.SomeGroup")
+	proto.RegisterType((*Ext)(nil), "test_proto.Ext")
+	proto.RegisterMapType((map[int32]int32)(nil), "test_proto.Ext.MapFieldEntry")
+	proto.RegisterType((*ComplexExtension)(nil), "test_proto.ComplexExtension")
+	proto.RegisterType((*DefaultsMessage)(nil), "test_proto.DefaultsMessage")
+	proto.RegisterType((*MyMessageSet)(nil), "test_proto.MyMessageSet")
+	proto.RegisterType((*Empty)(nil), "test_proto.Empty")
+	proto.RegisterType((*MessageList)(nil), "test_proto.MessageList")
+	proto.RegisterType((*MessageList_Message)(nil), "test_proto.MessageList.Message")
+	proto.RegisterType((*Strings)(nil), "test_proto.Strings")
+	proto.RegisterType((*Defaults)(nil), "test_proto.Defaults")
+	proto.RegisterType((*SubDefaults)(nil), "test_proto.SubDefaults")
+	proto.RegisterType((*RepeatedEnum)(nil), "test_proto.RepeatedEnum")
+	proto.RegisterType((*MoreRepeated)(nil), "test_proto.MoreRepeated")
+	proto.RegisterType((*GroupOld)(nil), "test_proto.GroupOld")
+	proto.RegisterType((*GroupOld_G)(nil), "test_proto.GroupOld.G")
+	proto.RegisterType((*GroupNew)(nil), "test_proto.GroupNew")
+	proto.RegisterType((*GroupNew_G)(nil), "test_proto.GroupNew.G")
+	proto.RegisterType((*FloatingPoint)(nil), "test_proto.FloatingPoint")
+	proto.RegisterType((*MessageWithMap)(nil), "test_proto.MessageWithMap")
+	proto.RegisterMapType((map[bool][]byte)(nil), "test_proto.MessageWithMap.ByteMappingEntry")
+	proto.RegisterMapType((map[int64]*FloatingPoint)(nil), "test_proto.MessageWithMap.MsgMappingEntry")
+	proto.RegisterMapType((map[int32]string)(nil), "test_proto.MessageWithMap.NameMappingEntry")
+	proto.RegisterMapType((map[string]string)(nil), "test_proto.MessageWithMap.StrToStrEntry")
+	proto.RegisterType((*Oneof)(nil), "test_proto.Oneof")
+	proto.RegisterType((*Oneof_F_Group)(nil), "test_proto.Oneof.F_Group")
+	proto.RegisterType((*Communique)(nil), "test_proto.Communique")
+	proto.RegisterEnum("test_proto.FOO", FOO_name, FOO_value)
+	proto.RegisterEnum("test_proto.GoTest_KIND", GoTest_KIND_name, GoTest_KIND_value)
+	proto.RegisterEnum("test_proto.MyMessage_Color", MyMessage_Color_name, MyMessage_Color_value)
+	proto.RegisterEnum("test_proto.DefaultsMessage_DefaultsEnum", DefaultsMessage_DefaultsEnum_name, DefaultsMessage_DefaultsEnum_value)
+	proto.RegisterEnum("test_proto.Defaults_Color", Defaults_Color_name, Defaults_Color_value)
+	proto.RegisterEnum("test_proto.RepeatedEnum_Color", RepeatedEnum_Color_name, RepeatedEnum_Color_value)
+	proto.RegisterExtension(E_Ext_More)
+	proto.RegisterExtension(E_Ext_Text)
+	proto.RegisterExtension(E_Ext_Number)
+	proto.RegisterExtension(E_Greeting)
+	proto.RegisterExtension(E_Complex)
+	proto.RegisterExtension(E_RComplex)
+	proto.RegisterExtension(E_NoDefaultDouble)
+	proto.RegisterExtension(E_NoDefaultFloat)
+	proto.RegisterExtension(E_NoDefaultInt32)
+	proto.RegisterExtension(E_NoDefaultInt64)
+	proto.RegisterExtension(E_NoDefaultUint32)
+	proto.RegisterExtension(E_NoDefaultUint64)
+	proto.RegisterExtension(E_NoDefaultSint32)
+	proto.RegisterExtension(E_NoDefaultSint64)
+	proto.RegisterExtension(E_NoDefaultFixed32)
+	proto.RegisterExtension(E_NoDefaultFixed64)
+	proto.RegisterExtension(E_NoDefaultSfixed32)
+	proto.RegisterExtension(E_NoDefaultSfixed64)
+	proto.RegisterExtension(E_NoDefaultBool)
+	proto.RegisterExtension(E_NoDefaultString)
+	proto.RegisterExtension(E_NoDefaultBytes)
+	proto.RegisterExtension(E_NoDefaultEnum)
+	proto.RegisterExtension(E_DefaultDouble)
+	proto.RegisterExtension(E_DefaultFloat)
+	proto.RegisterExtension(E_DefaultInt32)
+	proto.RegisterExtension(E_DefaultInt64)
+	proto.RegisterExtension(E_DefaultUint32)
+	proto.RegisterExtension(E_DefaultUint64)
+	proto.RegisterExtension(E_DefaultSint32)
+	proto.RegisterExtension(E_DefaultSint64)
+	proto.RegisterExtension(E_DefaultFixed32)
+	proto.RegisterExtension(E_DefaultFixed64)
+	proto.RegisterExtension(E_DefaultSfixed32)
+	proto.RegisterExtension(E_DefaultSfixed64)
+	proto.RegisterExtension(E_DefaultBool)
+	proto.RegisterExtension(E_DefaultString)
+	proto.RegisterExtension(E_DefaultBytes)
+	proto.RegisterExtension(E_DefaultEnum)
+	proto.RegisterExtension(E_X201)
+	proto.RegisterExtension(E_X202)
+	proto.RegisterExtension(E_X203)
+	proto.RegisterExtension(E_X204)
+	proto.RegisterExtension(E_X205)
+	proto.RegisterExtension(E_X206)
+	proto.RegisterExtension(E_X207)
+	proto.RegisterExtension(E_X208)
+	proto.RegisterExtension(E_X209)
+	proto.RegisterExtension(E_X210)
+	proto.RegisterExtension(E_X211)
+	proto.RegisterExtension(E_X212)
+	proto.RegisterExtension(E_X213)
+	proto.RegisterExtension(E_X214)
+	proto.RegisterExtension(E_X215)
+	proto.RegisterExtension(E_X216)
+	proto.RegisterExtension(E_X217)
+	proto.RegisterExtension(E_X218)
+	proto.RegisterExtension(E_X219)
+	proto.RegisterExtension(E_X220)
+	proto.RegisterExtension(E_X221)
+	proto.RegisterExtension(E_X222)
+	proto.RegisterExtension(E_X223)
+	proto.RegisterExtension(E_X224)
+	proto.RegisterExtension(E_X225)
+	proto.RegisterExtension(E_X226)
+	proto.RegisterExtension(E_X227)
+	proto.RegisterExtension(E_X228)
+	proto.RegisterExtension(E_X229)
+	proto.RegisterExtension(E_X230)
+	proto.RegisterExtension(E_X231)
+	proto.RegisterExtension(E_X232)
+	proto.RegisterExtension(E_X233)
+	proto.RegisterExtension(E_X234)
+	proto.RegisterExtension(E_X235)
+	proto.RegisterExtension(E_X236)
+	proto.RegisterExtension(E_X237)
+	proto.RegisterExtension(E_X238)
+	proto.RegisterExtension(E_X239)
+	proto.RegisterExtension(E_X240)
+	proto.RegisterExtension(E_X241)
+	proto.RegisterExtension(E_X242)
+	proto.RegisterExtension(E_X243)
+	proto.RegisterExtension(E_X244)
+	proto.RegisterExtension(E_X245)
+	proto.RegisterExtension(E_X246)
+	proto.RegisterExtension(E_X247)
+	proto.RegisterExtension(E_X248)
+	proto.RegisterExtension(E_X249)
+	proto.RegisterExtension(E_X250)
+}
+
+func init() { proto.RegisterFile("test_proto/test.proto", fileDescriptor_test_74787bfc6550f8a7) }
+
+var fileDescriptor_test_74787bfc6550f8a7 = []byte{
+	// 4680 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x5b, 0xd9, 0x73, 0x1b, 0x47,
+	0x7a, 0xd7, 0x0c, 0xee, 0x0f, 0x20, 0x31, 0x6c, 0xd1, 0x12, 0x44, 0x59, 0xd2, 0x08, 0x6b, 0xaf,
+	0x61, 0xc9, 0xa2, 0x48, 0x60, 0x08, 0x49, 0x70, 0xec, 0xb2, 0x0e, 0x82, 0x62, 0x49, 0x24, 0xe4,
+	0x21, 0x6d, 0x67, 0x95, 0x07, 0x14, 0x48, 0x0c, 0x40, 0xac, 0x80, 0x19, 0x18, 0x18, 0x44, 0x64,
+	0x52, 0xa9, 0xf2, 0x63, 0xaa, 0xf2, 0x94, 0x4d, 0x52, 0x95, 0xf7, 0xbc, 0xe4, 0x25, 0xd7, 0x43,
+	0xf2, 0x37, 0xc4, 0xd7, 0x5e, 0xde, 0x2b, 0xc9, 0x26, 0x9b, 0xfb, 0xce, 0xe6, 0xde, 0x23, 0x2f,
+	0x4e, 0xf5, 0xd7, 0x3d, 0x33, 0x3d, 0x03, 0xa8, 0x45, 0x3e, 0x71, 0xa6, 0xfb, 0xf7, 0xfd, 0xfa,
+	0xfa, 0xf5, 0xf7, 0xf5, 0xd7, 0x18, 0xc2, 0x0b, 0xae, 0x35, 0x76, 0x9b, 0xc3, 0x91, 0xe3, 0x3a,
+	0xd7, 0xe9, 0xe3, 0x32, 0x3e, 0x12, 0x08, 0x8a, 0x8b, 0x57, 0x21, 0xb9, 0xe1, 0xac, 0xdb, 0x93,
+	0x01, 0xb9, 0x0c, 0xb1, 0x8e, 0xe3, 0x14, 0x14, 0x5d, 0x2d, 0xcd, 0x97, 0xf3, 0xcb, 0x01, 0x66,
+	0xb9, 0xde, 0x68, 0x98, 0xb4, 0xae, 0x78, 0x03, 0xb2, 0x1b, 0xce, 0xae, 0x35, 0x76, 0xeb, 0x3d,
+	0xab, 0xdf, 0x26, 0x8b, 0x90, 0x78, 0xd8, 0xda, 0xb3, 0xfa, 0x68, 0x93, 0x31, 0xd9, 0x0b, 0x21,
+	0x10, 0xdf, 0x3d, 0x1a, 0x5a, 0x05, 0x15, 0x0b, 0xf1, 0xb9, 0xf8, 0x87, 0x45, 0xda, 0x0c, 0xb5,
+	0x24, 0x57, 0x21, 0xfe, 0xa0, 0x67, 0xb7, 0x79, 0x3b, 0x67, 0xc5, 0x76, 0x18, 0x62, 0xf9, 0xc1,
+	0xe6, 0xf6, 0x3d, 0x13, 0x41, 0xb4, 0x85, 0xdd, 0xd6, 0x5e, 0x9f, 0x92, 0x29, 0xb4, 0x05, 0x7c,
+	0xa1, 0xa5, 0x8f, 0x5a, 0xa3, 0xd6, 0xa0, 0x10, 0xd3, 0x95, 0x52, 0xc2, 0x64, 0x2f, 0xe4, 0x0d,
+	0x98, 0x33, 0xad, 0xf7, 0x27, 0xbd, 0x91, 0xd5, 0xc6, 0xee, 0x15, 0xe2, 0xba, 0x5a, 0xca, 0xce,
+	0x6a, 0x01, 0xab, 0xcd, 0x30, 0x9a, 0x99, 0x0f, 0xad, 0x96, 0xeb, 0x99, 0x27, 0xf4, 0xd8, 0x73,
+	0xcc, 0x05, 0x34, 0x35, 0x6f, 0x0c, 0xdd, 0x9e, 0x63, 0xb7, 0xfa, 0xcc, 0x3c, 0xa9, 0x2b, 0x52,
+	0xf3, 0x10, 0x9a, 0x7c, 0x11, 0xf2, 0xf5, 0xe6, 0x1d, 0xc7, 0xe9, 0x37, 0x47, 0xbc, 0x57, 0x05,
+	0xd0, 0xd5, 0x52, 0xda, 0x9c, 0xab, 0xd3, 0x52, 0xaf, 0xab, 0xa4, 0x04, 0x5a, 0xbd, 0xb9, 0x69,
+	0xbb, 0x95, 0x72, 0x00, 0xcc, 0xea, 0x6a, 0x29, 0x61, 0xce, 0xd7, 0xb1, 0x78, 0x0a, 0x59, 0x35,
+	0x02, 0x64, 0x4e, 0x57, 0x4b, 0x31, 0x86, 0xac, 0x1a, 0x3e, 0xf2, 0x35, 0x20, 0xf5, 0x66, 0xbd,
+	0x77, 0x68, 0xb5, 0x45, 0xd6, 0x39, 0x5d, 0x2d, 0xa5, 0x4c, 0xad, 0xce, 0x2b, 0x66, 0xa0, 0x45,
+	0xe6, 0x79, 0x5d, 0x2d, 0x25, 0x3d, 0xb4, 0xc0, 0x7d, 0x05, 0x16, 0xea, 0xcd, 0x77, 0x7a, 0xe1,
+	0x0e, 0xe7, 0x75, 0xb5, 0x34, 0x67, 0xe6, 0xeb, 0xac, 0x7c, 0x1a, 0x2b, 0x12, 0x6b, 0xba, 0x5a,
+	0x8a, 0x73, 0xac, 0xc0, 0x8b, 0xa3, 0xab, 0xf7, 0x9d, 0x96, 0x1b, 0x40, 0x17, 0x74, 0xb5, 0xa4,
+	0x9a, 0xf3, 0x75, 0x2c, 0x0e, 0xb3, 0xde, 0x73, 0x26, 0x7b, 0x7d, 0x2b, 0x80, 0x12, 0x5d, 0x2d,
+	0x29, 0x66, 0xbe, 0xce, 0xca, 0xc3, 0xd8, 0x1d, 0x77, 0xd4, 0xb3, 0xbb, 0x01, 0xf6, 0x34, 0xea,
+	0x38, 0x5f, 0x67, 0xe5, 0xe1, 0x1e, 0xdc, 0x39, 0x72, 0xad, 0x71, 0x00, 0xb5, 0x74, 0xb5, 0x94,
+	0x33, 0xe7, 0xeb, 0x58, 0x1c, 0x61, 0x8d, 0xcc, 0x41, 0x47, 0x57, 0x4b, 0x0b, 0x94, 0x75, 0xc6,
+	0x1c, 0xec, 0x44, 0xe6, 0xa0, 0xab, 0xab, 0x25, 0xc2, 0xb1, 0xc2, 0x1c, 0x2c, 0xc3, 0xe9, 0x7a,
+	0x73, 0xa7, 0x13, 0x5d, 0xb8, 0x03, 0x5d, 0x2d, 0xe5, 0xcd, 0x85, 0xba, 0x57, 0x33, 0x0b, 0x2f,
+	0xb2, 0xf7, 0x74, 0xb5, 0xa4, 0xf9, 0x78, 0x81, 0x5f, 0xd4, 0x24, 0x93, 0x7a, 0x61, 0x51, 0x8f,
+	0x09, 0x9a, 0x64, 0x85, 0x61, 0x4d, 0x72, 0xe0, 0x0b, 0x7a, 0x4c, 0xd4, 0x64, 0x04, 0x89, 0xcd,
+	0x73, 0xe4, 0x19, 0x3d, 0x26, 0x6a, 0x92, 0x23, 0x23, 0x9a, 0xe4, 0xd8, 0xb3, 0x7a, 0x2c, 0xac,
+	0xc9, 0x29, 0xb4, 0xc8, 0x5c, 0xd0, 0x63, 0x61, 0x4d, 0x72, 0x74, 0x58, 0x93, 0x1c, 0x7c, 0x4e,
+	0x8f, 0x85, 0x34, 0x19, 0xc5, 0x8a, 0xc4, 0x4b, 0x7a, 0x2c, 0xa4, 0x49, 0x71, 0x74, 0x9e, 0x26,
+	0x39, 0xf4, 0xbc, 0x1e, 0x13, 0x35, 0x29, 0xb2, 0xfa, 0x9a, 0xe4, 0xd0, 0x17, 0xf5, 0x58, 0x48,
+	0x93, 0x22, 0xd6, 0xd7, 0x24, 0xc7, 0x5e, 0xd0, 0x63, 0x21, 0x4d, 0x72, 0xec, 0xab, 0xa2, 0x26,
+	0x39, 0xf4, 0x43, 0x45, 0x8f, 0x89, 0xa2, 0xe4, 0xd0, 0xab, 0x21, 0x51, 0x72, 0xec, 0x47, 0x14,
+	0x2b, 0xaa, 0x32, 0x0a, 0x16, 0x67, 0xe1, 0x63, 0x0a, 0x16, 0x65, 0xc9, 0xc1, 0xd7, 0x23, 0xb2,
+	0xe4, 0xf0, 0x4f, 0x28, 0x3c, 0xac, 0xcb, 0x69, 0x03, 0x91, 0xff, 0x53, 0x6a, 0x10, 0x16, 0x26,
+	0x37, 0x08, 0x84, 0xe9, 0x70, 0x27, 0x5a, 0xb8, 0xa8, 0x2b, 0xbe, 0x30, 0x3d, 0xcf, 0x2a, 0x0a,
+	0xd3, 0x07, 0x5e, 0xc2, 0x90, 0xc1, 0x85, 0x39, 0x85, 0xac, 0x1a, 0x01, 0x52, 0xd7, 0x95, 0x40,
+	0x98, 0x3e, 0x32, 0x24, 0x4c, 0x1f, 0x7b, 0x59, 0x57, 0x44, 0x61, 0xce, 0x40, 0x8b, 0xcc, 0x45,
+	0x5d, 0x11, 0x85, 0xe9, 0xa3, 0x45, 0x61, 0xfa, 0xe0, 0x2f, 0xe8, 0x8a, 0x20, 0xcc, 0x69, 0xac,
+	0x48, 0xfc, 0x92, 0xae, 0x08, 0xc2, 0x0c, 0x8f, 0x8e, 0x09, 0xd3, 0x87, 0xbe, 0xac, 0x2b, 0x81,
+	0x30, 0xc3, 0xac, 0x5c, 0x98, 0x3e, 0xf4, 0x8b, 0xba, 0x22, 0x08, 0x33, 0x8c, 0xe5, 0xc2, 0xf4,
+	0xb1, 0xaf, 0x60, 0x9c, 0xf6, 0x84, 0xe9, 0x63, 0x05, 0x61, 0xfa, 0xd0, 0xdf, 0xa1, 0x31, 0xdd,
+	0x17, 0xa6, 0x0f, 0x15, 0x85, 0xe9, 0x63, 0x7f, 0x97, 0x62, 0x03, 0x61, 0x4e, 0x83, 0xc5, 0x59,
+	0xf8, 0x3d, 0x0a, 0x0e, 0x84, 0xe9, 0x83, 0xc3, 0xc2, 0xf4, 0xe1, 0xbf, 0x4f, 0xe1, 0xa2, 0x30,
+	0x67, 0x19, 0x88, 0xfc, 0x7f, 0x40, 0x0d, 0x44, 0x61, 0xfa, 0x06, 0xcb, 0x38, 0x4c, 0x2a, 0xcc,
+	0xb6, 0xd5, 0x69, 0x4d, 0xfa, 0x54, 0xc6, 0x25, 0xaa, 0xcc, 0x5a, 0xdc, 0x1d, 0x4d, 0x2c, 0x3a,
+	0x56, 0xc7, 0xe9, 0xdf, 0xf3, 0xea, 0xc8, 0x32, 0xed, 0x3e, 0x13, 0x68, 0x60, 0xf0, 0x2a, 0x55,
+	0x68, 0x4d, 0xad, 0x94, 0xcd, 0x3c, 0x53, 0xe9, 0x34, 0xbe, 0x6a, 0x08, 0xf8, 0x2b, 0x54, 0xa7,
+	0x35, 0xb5, 0x6a, 0x30, 0x7c, 0xd5, 0x08, 0xf0, 0x15, 0x3a, 0x00, 0x4f, 0xac, 0x81, 0xc5, 0x55,
+	0xaa, 0xd6, 0x5a, 0xac, 0x52, 0x5e, 0x31, 0x17, 0x3c, 0xc9, 0xce, 0x32, 0x0a, 0x35, 0xf3, 0x1a,
+	0x15, 0x6d, 0x2d, 0x56, 0x35, 0x7c, 0x23, 0xb1, 0xa5, 0x32, 0x15, 0x3a, 0x97, 0x6e, 0x60, 0x73,
+	0x8d, 0x6a, 0xb7, 0x16, 0xaf, 0x94, 0x57, 0x56, 0x4c, 0x8d, 0x2b, 0x78, 0x86, 0x4d, 0xa8, 0x9d,
+	0x65, 0xaa, 0xe1, 0x5a, 0xbc, 0x6a, 0xf8, 0x36, 0xe1, 0x76, 0x16, 0x3c, 0x29, 0x07, 0x26, 0xd7,
+	0xa9, 0x96, 0x6b, 0xc9, 0xca, 0xaa, 0xb1, 0xba, 0x76, 0xcb, 0xcc, 0x33, 0x4d, 0x07, 0x36, 0x06,
+	0x6d, 0x87, 0x8b, 0x3a, 0x30, 0x5a, 0xa1, 0xaa, 0xae, 0x25, 0xcb, 0x37, 0x56, 0x6f, 0x96, 0x6f,
+	0x9a, 0x1a, 0x57, 0x77, 0x60, 0xf5, 0x26, 0xb5, 0xe2, 0xf2, 0x0e, 0xac, 0x56, 0xa9, 0xbe, 0x6b,
+	0xda, 0x81, 0xd5, 0xef, 0x3b, 0xaf, 0xe9, 0xc5, 0xa7, 0xce, 0xa8, 0xdf, 0xbe, 0x5c, 0x04, 0x53,
+	0xe3, 0x8a, 0x17, 0x5b, 0x5d, 0xf0, 0x24, 0x1f, 0x98, 0xff, 0x2a, 0x3d, 0xb1, 0xe6, 0x6a, 0xa9,
+	0x3b, 0xbd, 0xae, 0xed, 0x8c, 0x2d, 0x33, 0xcf, 0xc4, 0x1f, 0x99, 0x93, 0x9d, 0xe8, 0x3c, 0x7e,
+	0x85, 0x9a, 0x2d, 0xd4, 0x62, 0xd7, 0x2a, 0x65, 0xda, 0xd2, 0xac, 0x79, 0xdc, 0x89, 0xce, 0xe3,
+	0xaf, 0x51, 0x1b, 0x52, 0x8b, 0x5d, 0xab, 0x1a, 0xdc, 0x46, 0x9c, 0xc7, 0x2a, 0x2c, 0x0a, 0x7b,
+	0x21, 0xb0, 0xfa, 0x75, 0x6a, 0x95, 0x67, 0x2d, 0x11, 0x7f, 0x47, 0xcc, 0xb4, 0x0b, 0xb5, 0xf6,
+	0x1b, 0xd4, 0x4e, 0x63, 0xad, 0x11, 0x7f, 0x63, 0x04, 0x76, 0x37, 0xe0, 0x4c, 0xe4, 0x2c, 0xd1,
+	0x1c, 0xb6, 0xf6, 0x9f, 0x58, 0xed, 0x42, 0x99, 0x1e, 0x29, 0xee, 0xa8, 0x9a, 0x62, 0x9e, 0x0e,
+	0x1d, 0x2b, 0x1e, 0x61, 0x35, 0xb9, 0x05, 0x67, 0xa3, 0x87, 0x0b, 0xcf, 0xb2, 0x42, 0xcf, 0x18,
+	0x68, 0xb9, 0x18, 0x3e, 0x67, 0x44, 0x4c, 0x85, 0xa0, 0xe2, 0x99, 0x1a, 0xf4, 0xd0, 0x11, 0x98,
+	0x06, 0xb1, 0x85, 0x9b, 0xbe, 0x01, 0xe7, 0xa6, 0x8f, 0x1f, 0x9e, 0xf1, 0x1a, 0x3d, 0x85, 0xa0,
+	0xf1, 0x99, 0xe8, 0x49, 0x64, 0xca, 0x7c, 0x46, 0xdb, 0x55, 0x7a, 0x2c, 0x11, 0xcd, 0xa7, 0x5a,
+	0x7f, 0x1d, 0x0a, 0x53, 0x07, 0x14, 0xcf, 0xfa, 0x06, 0x3d, 0xa7, 0xa0, 0xf5, 0x0b, 0x91, 0xb3,
+	0x4a, 0xd4, 0x78, 0x46, 0xd3, 0x37, 0xe9, 0xc1, 0x45, 0x30, 0x9e, 0x6a, 0x19, 0xa7, 0x2c, 0x7c,
+	0x84, 0xf1, 0x6c, 0x6f, 0xd1, 0x93, 0x0c, 0x9f, 0xb2, 0xd0, 0x69, 0x46, 0x6c, 0x37, 0x72, 0xa6,
+	0xf1, 0x6c, 0x6b, 0xf4, 0x68, 0xc3, 0xdb, 0x0d, 0x1f, 0x6f, 0xb8, 0xf1, 0xcf, 0x50, 0xe3, 0x9d,
+	0xd9, 0x23, 0xfe, 0x51, 0x8c, 0x1e, 0x4a, 0xb8, 0xf5, 0xce, 0xac, 0x21, 0xfb, 0xd6, 0x33, 0x86,
+	0xfc, 0x63, 0x6a, 0x4d, 0x04, 0xeb, 0xa9, 0x31, 0xbf, 0x05, 0x4b, 0x33, 0xce, 0x2b, 0x9e, 0xfd,
+	0x4f, 0xa8, 0x7d, 0x1e, 0xed, 0xcf, 0x4e, 0x1d, 0x5d, 0xa6, 0x19, 0x66, 0xf4, 0xe0, 0xa7, 0x94,
+	0x41, 0x0b, 0x31, 0x4c, 0xf5, 0xa1, 0x0e, 0x73, 0xde, 0x79, 0xbc, 0x3b, 0x72, 0x26, 0xc3, 0x42,
+	0x5d, 0x57, 0x4b, 0x50, 0xd6, 0x67, 0x64, 0xc7, 0xde, 0xf1, 0x7c, 0x83, 0xe2, 0xcc, 0xb0, 0x19,
+	0xe3, 0x61, 0xcc, 0x8c, 0xe7, 0x91, 0x1e, 0x7b, 0x26, 0x0f, 0xc3, 0xf9, 0x3c, 0x82, 0x19, 0xe5,
+	0xf1, 0xc2, 0x1d, 0xe3, 0x79, 0xac, 0x2b, 0xcf, 0xe0, 0xf1, 0x82, 0x1f, 0xe7, 0x09, 0x99, 0x2d,
+	0xad, 0x05, 0x39, 0x39, 0xd6, 0x93, 0x97, 0xa2, 0x49, 0xfa, 0x06, 0x66, 0x57, 0xe1, 0x42, 0x66,
+	0x26, 0x74, 0x6f, 0xda, 0xec, 0xed, 0x67, 0x98, 0x85, 0x7a, 0x33, 0x6d, 0xf6, 0x73, 0x33, 0xcc,
+	0x8a, 0xbf, 0xa9, 0x40, 0xfc, 0xc1, 0xe6, 0xf6, 0x3d, 0x92, 0x86, 0xf8, 0xbb, 0x8d, 0xcd, 0x7b,
+	0xda, 0x29, 0xfa, 0x74, 0xa7, 0xd1, 0x78, 0xa8, 0x29, 0x24, 0x03, 0x89, 0x3b, 0x5f, 0xda, 0x5d,
+	0xdf, 0xd1, 0x54, 0x92, 0x87, 0x6c, 0x7d, 0x73, 0x7b, 0x63, 0xdd, 0x7c, 0x64, 0x6e, 0x6e, 0xef,
+	0x6a, 0x31, 0x5a, 0x57, 0x7f, 0xd8, 0xb8, 0xbd, 0xab, 0xc5, 0x49, 0x0a, 0x62, 0xb4, 0x2c, 0x41,
+	0x00, 0x92, 0x3b, 0xbb, 0xe6, 0xe6, 0xf6, 0x86, 0x96, 0xa4, 0x2c, 0xbb, 0x9b, 0x5b, 0xeb, 0x5a,
+	0x8a, 0x22, 0x77, 0xdf, 0x79, 0xf4, 0x70, 0x5d, 0x4b, 0xd3, 0xc7, 0xdb, 0xa6, 0x79, 0xfb, 0x4b,
+	0x5a, 0x86, 0x1a, 0x6d, 0xdd, 0x7e, 0xa4, 0x01, 0x56, 0xdf, 0xbe, 0xf3, 0x70, 0x5d, 0xcb, 0x92,
+	0x1c, 0xa4, 0xeb, 0xef, 0x6c, 0xdf, 0xdd, 0xdd, 0x6c, 0x6c, 0x6b, 0xb9, 0xe2, 0x2f, 0x42, 0x81,
+	0x4d, 0x73, 0x68, 0x16, 0xd9, 0x95, 0xc1, 0x5b, 0x90, 0x60, 0x6b, 0xa3, 0xa0, 0x56, 0xae, 0x4c,
+	0xaf, 0xcd, 0xb4, 0xd1, 0x32, 0x5b, 0x25, 0x66, 0xb8, 0x74, 0x01, 0x12, 0x6c, 0x9e, 0x16, 0x21,
+	0xc1, 0xe6, 0x47, 0xc5, 0xab, 0x04, 0xf6, 0x52, 0xfc, 0x2d, 0x15, 0x60, 0xc3, 0xd9, 0x79, 0xd2,
+	0x1b, 0xe2, 0xc5, 0xcd, 0x05, 0x80, 0xf1, 0x93, 0xde, 0xb0, 0x89, 0x3b, 0x90, 0x5f, 0x3a, 0x64,
+	0x68, 0x09, 0xfa, 0x5e, 0x72, 0x19, 0x72, 0x58, 0xcd, 0xb7, 0x08, 0xde, 0x35, 0xa4, 0xcc, 0x2c,
+	0x2d, 0xe3, 0x4e, 0x32, 0x0c, 0xa9, 0x1a, 0x78, 0xc5, 0x90, 0x14, 0x20, 0x55, 0x83, 0x5c, 0x02,
+	0x7c, 0x6d, 0x8e, 0x31, 0x9a, 0xe2, 0xb5, 0x42, 0xc6, 0xc4, 0x76, 0x59, 0x7c, 0x25, 0x6f, 0x02,
+	0xb6, 0xc9, 0x46, 0x9e, 0x9f, 0xb5, 0x4b, 0xbc, 0x0e, 0x2f, 0xd3, 0x07, 0x36, 0xde, 0xc0, 0x64,
+	0xa9, 0x01, 0x19, 0xbf, 0x9c, 0xb6, 0x86, 0xa5, 0x7c, 0x4c, 0x1a, 0x8e, 0x09, 0xb0, 0xc8, 0x1f,
+	0x14, 0x03, 0xf0, 0xfe, 0x2c, 0x60, 0x7f, 0x98, 0x11, 0xeb, 0x50, 0xf1, 0x02, 0xcc, 0x6d, 0x3b,
+	0x36, 0xdb, 0xc7, 0x38, 0x4f, 0x39, 0x50, 0x5a, 0x05, 0x05, 0xf3, 0x5f, 0xa5, 0x55, 0xbc, 0x08,
+	0x20, 0xd4, 0x69, 0xa0, 0xec, 0xb1, 0x3a, 0xf4, 0x07, 0xca, 0x5e, 0xf1, 0x2a, 0x24, 0xb7, 0x5a,
+	0x87, 0xbb, 0xad, 0x2e, 0xb9, 0x0c, 0xd0, 0x6f, 0x8d, 0xdd, 0x66, 0x07, 0x57, 0xe2, 0xf3, 0xcf,
+	0x3f, 0xff, 0x5c, 0xc1, 0xc3, 0x74, 0x86, 0x96, 0xb2, 0x15, 0x19, 0x03, 0x34, 0xfa, 0xed, 0x2d,
+	0x6b, 0x3c, 0x6e, 0x75, 0x2d, 0xb2, 0x06, 0x49, 0xdb, 0x1a, 0xd3, 0xe8, 0xab, 0xe0, 0x5d, 0xd3,
+	0x05, 0x71, 0x1e, 0x02, 0xdc, 0xf2, 0x36, 0x82, 0x4c, 0x0e, 0x26, 0x1a, 0xc4, 0xec, 0xc9, 0x00,
+	0x6f, 0xd4, 0x12, 0x26, 0x7d, 0x5c, 0x7a, 0x11, 0x92, 0x0c, 0x43, 0x08, 0xc4, 0xed, 0xd6, 0xc0,
+	0x2a, 0xb0, 0x96, 0xf1, 0xb9, 0xf8, 0x15, 0x05, 0x60, 0xdb, 0x7a, 0x7a, 0xac, 0x56, 0x03, 0x9c,
+	0xa4, 0xd5, 0x18, 0x6b, 0xf5, 0x75, 0x59, 0xab, 0x54, 0x6d, 0x1d, 0xc7, 0x69, 0x37, 0xd9, 0x42,
+	0xb3, 0xeb, 0xbf, 0x0c, 0x2d, 0xc1, 0x95, 0x2b, 0x3e, 0x86, 0xdc, 0xa6, 0x6d, 0x5b, 0x23, 0xaf,
+	0x57, 0x04, 0xe2, 0x07, 0xce, 0xd8, 0xe5, 0x37, 0x91, 0xf8, 0x4c, 0x0a, 0x10, 0x1f, 0x3a, 0x23,
+	0x97, 0x8d, 0xb4, 0x16, 0x37, 0x56, 0x56, 0x56, 0x4c, 0x2c, 0x21, 0x2f, 0x42, 0x66, 0xdf, 0xb1,
+	0x6d, 0x6b, 0x9f, 0x0e, 0x23, 0x86, 0xa9, 0x63, 0x50, 0x50, 0xfc, 0x65, 0x05, 0x72, 0x0d, 0xf7,
+	0x20, 0x20, 0xd7, 0x20, 0xf6, 0xc4, 0x3a, 0xc2, 0xee, 0xc5, 0x4c, 0xfa, 0x48, 0x37, 0xcc, 0xcf,
+	0xb7, 0xfa, 0x13, 0x76, 0x2f, 0x99, 0x33, 0xd9, 0x0b, 0x39, 0x03, 0xc9, 0xa7, 0x56, 0xaf, 0x7b,
+	0xe0, 0x22, 0xa7, 0x6a, 0xf2, 0x37, 0xb2, 0x0c, 0x89, 0x1e, 0xed, 0x6c, 0x21, 0x8e, 0x33, 0x56,
+	0x10, 0x67, 0x4c, 0x1c, 0x85, 0xc9, 0x60, 0x57, 0xd2, 0xe9, 0xb6, 0xf6, 0xc1, 0x07, 0x1f, 0x7c,
+	0xa0, 0x16, 0x0f, 0x60, 0xd1, 0xdb, 0xc4, 0xa1, 0xe1, 0x3e, 0x82, 0x42, 0xdf, 0x72, 0x9a, 0x9d,
+	0x9e, 0xdd, 0xea, 0xf7, 0x8f, 0x9a, 0x4f, 0x1d, 0xbb, 0xd9, 0xb2, 0x9b, 0xce, 0x78, 0xbf, 0x35,
+	0xc2, 0x29, 0x90, 0x35, 0xb2, 0xd8, 0xb7, 0x9c, 0x3a, 0x33, 0x7c, 0xcf, 0xb1, 0x6f, 0xdb, 0x0d,
+	0x6a, 0x55, 0xfc, 0x2c, 0x0e, 0x99, 0xad, 0x23, 0x8f, 0x7f, 0x11, 0x12, 0xfb, 0xce, 0xc4, 0x66,
+	0xf3, 0x99, 0x30, 0xd9, 0x8b, 0xbf, 0x4e, 0xaa, 0xb0, 0x4e, 0x8b, 0x90, 0x78, 0x7f, 0xe2, 0xb8,
+	0x16, 0x0e, 0x39, 0x63, 0xb2, 0x17, 0x3a, 0x63, 0x43, 0xcb, 0x2d, 0xc4, 0xf1, 0x9a, 0x82, 0x3e,
+	0x06, 0x73, 0x90, 0x38, 0xd6, 0x1c, 0x90, 0x15, 0x48, 0x3a, 0x74, 0x0d, 0xc6, 0x85, 0x24, 0xde,
+	0xc3, 0x86, 0x0c, 0xc4, 0xd5, 0x31, 0x39, 0x8e, 0x3c, 0x80, 0x85, 0xa7, 0x56, 0x73, 0x30, 0x19,
+	0xbb, 0xcd, 0xae, 0xd3, 0x6c, 0x5b, 0xd6, 0xd0, 0x1a, 0x15, 0xe6, 0xb0, 0xb5, 0x90, 0x87, 0x98,
+	0x35, 0xa1, 0xe6, 0xfc, 0x53, 0x6b, 0x6b, 0x32, 0x76, 0x37, 0x9c, 0x7b, 0x68, 0x47, 0xd6, 0x20,
+	0x33, 0xb2, 0xa8, 0x5f, 0xa0, 0x5d, 0xce, 0x4d, 0xf7, 0x20, 0x64, 0x9c, 0x1e, 0x59, 0x43, 0x2c,
+	0x20, 0x37, 0x20, 0xbd, 0xd7, 0x7b, 0x62, 0x8d, 0x0f, 0xac, 0x76, 0x21, 0xa5, 0x2b, 0xa5, 0xf9,
+	0xf2, 0x79, 0xd1, 0xca, 0x9f, 0xe0, 0xe5, 0xbb, 0x4e, 0xdf, 0x19, 0x99, 0x3e, 0x98, 0xbc, 0x01,
+	0x99, 0xb1, 0x33, 0xb0, 0x98, 0xda, 0xd3, 0x18, 0x6c, 0x2f, 0xcd, 0xb6, 0xdc, 0x71, 0x06, 0x96,
+	0xe7, 0xd5, 0x3c, 0x0b, 0x72, 0x9e, 0x75, 0x77, 0x8f, 0x26, 0x13, 0x05, 0xc0, 0x0b, 0x1f, 0xda,
+	0x29, 0x4c, 0x2e, 0xc8, 0x12, 0xed, 0x54, 0xb7, 0x43, 0xcf, 0x6c, 0x85, 0x2c, 0xe6, 0xf2, 0xfe,
+	0xfb, 0xd2, 0x6b, 0x90, 0xf1, 0x09, 0x03, 0x77, 0xc8, 0x5c, 0x50, 0x06, 0x3d, 0x04, 0x73, 0x87,
+	0xcc, 0xff, 0xbc, 0x0c, 0x09, 0xec, 0x38, 0x8d, 0x5c, 0xe6, 0x3a, 0x0d, 0x94, 0x19, 0x48, 0x6c,
+	0x98, 0xeb, 0xeb, 0xdb, 0x9a, 0x82, 0x31, 0xf3, 0xe1, 0x3b, 0xeb, 0x9a, 0x2a, 0xe8, 0xf7, 0xb7,
+	0x55, 0x88, 0xad, 0x1f, 0xa2, 0x72, 0xda, 0x2d, 0xb7, 0xe5, 0xed, 0x70, 0xfa, 0x4c, 0x6a, 0x90,
+	0x19, 0xb4, 0xbc, 0xb6, 0x54, 0x9c, 0xe2, 0x90, 0x2f, 0x59, 0x3f, 0x74, 0x97, 0xb7, 0x5a, 0xac,
+	0xe5, 0x75, 0xdb, 0x1d, 0x1d, 0x99, 0xe9, 0x01, 0x7f, 0x5d, 0x7a, 0x1d, 0xe6, 0x42, 0x55, 0xe2,
+	0x16, 0x4d, 0xcc, 0xd8, 0xa2, 0x09, 0xbe, 0x45, 0x6b, 0xea, 0x4d, 0xa5, 0x5c, 0x83, 0xf8, 0xc0,
+	0x19, 0x59, 0xe4, 0x85, 0x99, 0x13, 0x5c, 0xe8, 0xa2, 0x64, 0xf2, 0x91, 0xae, 0x98, 0x68, 0x53,
+	0x7e, 0x15, 0xe2, 0xae, 0x75, 0xe8, 0x3e, 0xcb, 0xf6, 0x80, 0x8d, 0x8f, 0x42, 0xca, 0xd7, 0x20,
+	0x69, 0x4f, 0x06, 0x7b, 0xd6, 0xe8, 0x59, 0xe0, 0x1e, 0x76, 0x8c, 0x83, 0x8a, 0xef, 0x82, 0x76,
+	0xd7, 0x19, 0x0c, 0xfb, 0xd6, 0xe1, 0xfa, 0xa1, 0x6b, 0xd9, 0xe3, 0x9e, 0x63, 0xd3, 0x31, 0x74,
+	0x7a, 0x23, 0x74, 0x6b, 0x38, 0x06, 0x7c, 0xa1, 0x6e, 0x66, 0x6c, 0xed, 0x3b, 0x76, 0x9b, 0x0f,
+	0x8d, 0xbf, 0x51, 0xb4, 0x7b, 0xd0, 0x1b, 0x51, 0x8f, 0x46, 0x83, 0x0f, 0x7b, 0x29, 0x6e, 0x40,
+	0x9e, 0xa7, 0x61, 0x63, 0xde, 0x70, 0xf1, 0x0a, 0xe4, 0xbc, 0x22, 0xfc, 0xe5, 0x27, 0x0d, 0xf1,
+	0xc7, 0xeb, 0x66, 0x43, 0x3b, 0x45, 0xd7, 0xb5, 0xb1, 0xbd, 0xae, 0x29, 0xf4, 0x61, 0xf7, 0xbd,
+	0x46, 0x68, 0x2d, 0x5f, 0x84, 0x9c, 0xdf, 0xf7, 0x1d, 0xcb, 0xc5, 0x1a, 0x1a, 0xa5, 0x52, 0x35,
+	0x35, 0xad, 0x14, 0x53, 0x90, 0x58, 0x1f, 0x0c, 0xdd, 0xa3, 0xe2, 0x2f, 0x41, 0x96, 0x83, 0x1e,
+	0xf6, 0xc6, 0x2e, 0xb9, 0x05, 0xa9, 0x01, 0x1f, 0xaf, 0x82, 0x67, 0xd1, 0xb0, 0xac, 0x03, 0xa4,
+	0xf7, 0x6c, 0x7a, 0xf8, 0xa5, 0x0a, 0xa4, 0x04, 0xf7, 0xce, 0x3d, 0x8f, 0x2a, 0x7a, 0x1e, 0xe6,
+	0xa3, 0x62, 0x82, 0x8f, 0x2a, 0x6e, 0x41, 0x8a, 0x05, 0xe6, 0x31, 0x1e, 0x37, 0x58, 0xfe, 0xce,
+	0x34, 0xc6, 0xc4, 0x97, 0x65, 0x65, 0xec, 0x0c, 0x75, 0x09, 0xb2, 0xb8, 0x67, 0x7c, 0x15, 0x52,
+	0x6f, 0x0e, 0x58, 0xc4, 0x14, 0xff, 0x47, 0x09, 0x48, 0x7b, 0x73, 0x45, 0xce, 0x43, 0x92, 0x25,
+	0xb1, 0x48, 0xe5, 0x5d, 0xea, 0x24, 0x30, 0x6d, 0x25, 0xe7, 0x21, 0xc5, 0x13, 0x55, 0x1e, 0x70,
+	0xd4, 0x4a, 0xd9, 0x4c, 0xb2, 0xc4, 0xd4, 0xaf, 0xac, 0x1a, 0xe8, 0x27, 0xd9, 0x75, 0x4d, 0x92,
+	0xa5, 0x9e, 0x44, 0x87, 0x8c, 0x9f, 0x6c, 0x62, 0x88, 0xe0, 0x77, 0x33, 0x69, 0x2f, 0xbb, 0x14,
+	0x10, 0x55, 0x03, 0x1d, 0x28, 0xbf, 0x88, 0x49, 0xd7, 0x83, 0x73, 0x53, 0xda, 0x4b, 0x19, 0xf1,
+	0x97, 0x27, 0xef, 0xd6, 0x25, 0xc5, 0x93, 0xc4, 0x00, 0x50, 0x35, 0xd0, 0x33, 0x79, 0x57, 0x2c,
+	0x29, 0x9e, 0x08, 0x92, 0x4b, 0xb4, 0x8b, 0x98, 0xd8, 0xa1, 0xff, 0x09, 0xee, 0x53, 0x92, 0x2c,
+	0xdd, 0x23, 0x97, 0x29, 0x03, 0xcb, 0xde, 0xd0, 0x35, 0x04, 0x97, 0x27, 0x29, 0x9e, 0xd4, 0x91,
+	0xab, 0x14, 0xc2, 0xa6, 0xbf, 0x00, 0xcf, 0xb8, 0x29, 0x49, 0xf1, 0x9b, 0x12, 0xa2, 0xd3, 0x06,
+	0xd1, 0x43, 0xa1, 0x57, 0x12, 0x6e, 0x45, 0x92, 0xec, 0x56, 0x84, 0x5c, 0x44, 0x3a, 0x36, 0xa8,
+	0x5c, 0x70, 0x03, 0x92, 0xe2, 0x59, 0x60, 0x50, 0x8f, 0x67, 0x49, 0xff, 0xb6, 0x23, 0xc5, 0xf3,
+	0x3c, 0x72, 0x93, 0xae, 0x17, 0x55, 0x78, 0x61, 0x1e, 0x7d, 0xf1, 0x92, 0x28, 0x3d, 0x6f, 0x55,
+	0x99, 0x2b, 0xae, 0x31, 0x37, 0x66, 0x26, 0xea, 0xb8, 0x23, 0x96, 0xa8, 0xe5, 0xa3, 0x9e, 0xdd,
+	0x29, 0xe4, 0x71, 0x2e, 0x62, 0x3d, 0xbb, 0x63, 0x26, 0xea, 0xb4, 0x84, 0xa9, 0x60, 0x9b, 0xd6,
+	0x69, 0x58, 0x17, 0xbf, 0xc6, 0x2a, 0x69, 0x11, 0x29, 0x40, 0xa2, 0xde, 0xdc, 0x6e, 0xd9, 0x85,
+	0x05, 0x66, 0x67, 0xb7, 0x6c, 0x33, 0x5e, 0xdf, 0x6e, 0xd9, 0xe4, 0x55, 0x88, 0x8d, 0x27, 0x7b,
+	0x05, 0x32, 0xfd, 0xb3, 0xe0, 0xce, 0x64, 0xcf, 0xeb, 0x8c, 0x49, 0x31, 0xe4, 0x3c, 0xa4, 0xc7,
+	0xee, 0xa8, 0xf9, 0x0b, 0xd6, 0xc8, 0x29, 0x9c, 0xc6, 0x69, 0x3c, 0x65, 0xa6, 0xc6, 0xee, 0xe8,
+	0xb1, 0x35, 0x72, 0x8e, 0xe9, 0x83, 0x8b, 0x17, 0x21, 0x2b, 0xf0, 0x92, 0x3c, 0x28, 0x36, 0x3b,
+	0xc0, 0xd4, 0x94, 0x1b, 0xa6, 0x62, 0x17, 0xdf, 0x85, 0x9c, 0x97, 0x62, 0xe1, 0x88, 0x0d, 0xba,
+	0x9b, 0xfa, 0xce, 0x08, 0x77, 0xe9, 0x7c, 0xf9, 0x62, 0x38, 0x62, 0x06, 0x40, 0x1e, 0xb9, 0x18,
+	0xb8, 0xa8, 0x45, 0x3a, 0xa3, 0x14, 0x7f, 0xa0, 0x40, 0x6e, 0xcb, 0x19, 0x05, 0xbf, 0x5f, 0x2c,
+	0x42, 0x62, 0xcf, 0x71, 0xfa, 0x63, 0x24, 0x4e, 0x9b, 0xec, 0x85, 0xbc, 0x0c, 0x39, 0x7c, 0xf0,
+	0x92, 0x64, 0xd5, 0xbf, 0x05, 0xca, 0x62, 0x39, 0xcf, 0x8b, 0x09, 0xc4, 0x7b, 0xb6, 0x3b, 0xe6,
+	0x1e, 0x0d, 0x9f, 0xc9, 0x17, 0x20, 0x4b, 0xff, 0x7a, 0x96, 0x71, 0xff, 0x34, 0x0d, 0xb4, 0x98,
+	0x1b, 0xbe, 0x02, 0x73, 0xa8, 0x01, 0x1f, 0x96, 0xf2, 0x6f, 0x7c, 0x72, 0xac, 0x82, 0x03, 0x0b,
+	0x90, 0x62, 0x0e, 0x61, 0x8c, 0x3f, 0xf8, 0x66, 0x4c, 0xef, 0x95, 0xba, 0x59, 0x4c, 0x54, 0xd8,
+	0x09, 0x24, 0x65, 0xf2, 0xb7, 0xe2, 0x5d, 0x48, 0x63, 0xb8, 0x6c, 0xf4, 0xdb, 0xe4, 0x25, 0x50,
+	0xba, 0x05, 0x0b, 0xc3, 0xf5, 0x99, 0x50, 0x16, 0xc2, 0x01, 0xcb, 0x1b, 0xa6, 0xd2, 0x5d, 0x5a,
+	0x00, 0x65, 0x83, 0xa6, 0x05, 0x87, 0xdc, 0x61, 0x2b, 0x87, 0xc5, 0xb7, 0x39, 0xc9, 0xb6, 0xf5,
+	0x54, 0x4e, 0xb2, 0x6d, 0x3d, 0x65, 0x24, 0x97, 0xa6, 0x48, 0xe8, 0xdb, 0x11, 0xff, 0x0d, 0x5c,
+	0x39, 0x2a, 0x56, 0x60, 0x0e, 0x37, 0x6a, 0xcf, 0xee, 0x3e, 0x72, 0x7a, 0x36, 0x26, 0x22, 0x1d,
+	0x3c, 0xc0, 0x29, 0xa6, 0xd2, 0xa1, 0xeb, 0x60, 0x1d, 0xb6, 0xf6, 0xd9, 0x71, 0x38, 0x6d, 0xb2,
+	0x97, 0xe2, 0xf7, 0xe3, 0x30, 0xcf, 0x9d, 0xec, 0x7b, 0x3d, 0xf7, 0x60, 0xab, 0x35, 0x24, 0xdb,
+	0x90, 0xa3, 0xfe, 0xb5, 0x39, 0x68, 0x0d, 0x87, 0x74, 0x23, 0x2b, 0x18, 0x9a, 0xaf, 0xce, 0x70,
+	0xdb, 0xdc, 0x62, 0x79, 0xbb, 0x35, 0xb0, 0xb6, 0x18, 0x9a, 0x05, 0xea, 0xac, 0x1d, 0x94, 0x90,
+	0x07, 0x90, 0x1d, 0x8c, 0xbb, 0x3e, 0x1d, 0x8b, 0xf4, 0x57, 0x24, 0x74, 0x5b, 0xe3, 0x6e, 0x88,
+	0x0d, 0x06, 0x7e, 0x01, 0xed, 0x1c, 0xf5, 0xce, 0x3e, 0x5b, 0xec, 0xb9, 0x9d, 0xa3, 0xae, 0x24,
+	0xdc, 0xb9, 0xbd, 0xa0, 0x84, 0xd4, 0x01, 0xe8, 0x56, 0x73, 0x1d, 0x9a, 0xe1, 0xa1, 0x96, 0xb2,
+	0xe5, 0x92, 0x84, 0x6d, 0xc7, 0x1d, 0xed, 0x3a, 0x3b, 0xee, 0x88, 0x1f, 0x48, 0xc6, 0xfc, 0x75,
+	0xe9, 0x4d, 0xd0, 0xa2, 0xb3, 0xf0, 0xbc, 0x33, 0x49, 0x46, 0x38, 0x93, 0x2c, 0xfd, 0x2c, 0xe4,
+	0x23, 0xc3, 0x16, 0xcd, 0x09, 0x33, 0xbf, 0x2e, 0x9a, 0x67, 0xcb, 0xe7, 0x42, 0xdf, 0x68, 0x88,
+	0x4b, 0x2f, 0x32, 0xbf, 0x09, 0x5a, 0x74, 0x0a, 0x44, 0xea, 0xb4, 0x24, 0xa1, 0x41, 0xfb, 0xd7,
+	0x61, 0x2e, 0x34, 0x68, 0xd1, 0x38, 0xf3, 0x9c, 0x61, 0x15, 0x7f, 0x25, 0x01, 0x89, 0x86, 0x6d,
+	0x39, 0x1d, 0x72, 0x36, 0x1c, 0x3b, 0xef, 0x9f, 0xf2, 0xe2, 0xe6, 0xb9, 0x48, 0xdc, 0xbc, 0x7f,
+	0xca, 0x8f, 0x9a, 0xe7, 0x22, 0x51, 0xd3, 0xab, 0xaa, 0x1a, 0xe4, 0xc2, 0x54, 0xcc, 0xbc, 0x7f,
+	0x4a, 0x08, 0x98, 0x17, 0xa6, 0x02, 0x66, 0x50, 0x5d, 0x35, 0xa8, 0x83, 0x0d, 0x47, 0xcb, 0xfb,
+	0xa7, 0x82, 0x48, 0x79, 0x3e, 0x1a, 0x29, 0xfd, 0xca, 0xaa, 0xc1, 0xba, 0x24, 0x44, 0x49, 0xec,
+	0x12, 0x8b, 0x8f, 0xe7, 0xa3, 0xf1, 0x11, 0xed, 0x78, 0x64, 0x3c, 0x1f, 0x8d, 0x8c, 0x58, 0xc9,
+	0x23, 0xe1, 0xb9, 0x48, 0x24, 0x44, 0x52, 0x16, 0x02, 0xcf, 0x47, 0x43, 0x20, 0xb3, 0x13, 0x7a,
+	0x2a, 0xc6, 0x3f, 0xbf, 0xb2, 0x6a, 0x10, 0x23, 0x12, 0xfc, 0x64, 0x89, 0x08, 0xae, 0x06, 0x86,
+	0x81, 0x2a, 0x9d, 0x38, 0xef, 0x80, 0x9a, 0x97, 0x7e, 0xc2, 0x82, 0x33, 0xea, 0x1d, 0xd0, 0x0c,
+	0x48, 0x75, 0x78, 0xae, 0xae, 0xa1, 0x27, 0x0b, 0x89, 0x13, 0x25, 0xb0, 0x5c, 0x6f, 0xa2, 0x47,
+	0xa3, 0xa3, 0xeb, 0xb0, 0x84, 0xa3, 0x04, 0x73, 0xf5, 0xe6, 0xc3, 0xd6, 0xa8, 0x4b, 0xa1, 0xbb,
+	0xad, 0xae, 0x7f, 0xeb, 0x41, 0x55, 0x90, 0xad, 0xf3, 0x9a, 0xdd, 0x56, 0x97, 0x9c, 0xf1, 0x24,
+	0xd6, 0xc6, 0x5a, 0x85, 0x8b, 0x6c, 0xe9, 0x2c, 0x9d, 0x3a, 0x46, 0x86, 0xbe, 0x71, 0x81, 0xfb,
+	0xc6, 0x3b, 0x29, 0x48, 0x4c, 0xec, 0x9e, 0x63, 0xdf, 0xc9, 0x40, 0xca, 0x75, 0x46, 0x83, 0x96,
+	0xeb, 0x14, 0x7f, 0xa8, 0x00, 0xdc, 0x75, 0x06, 0x83, 0x89, 0xdd, 0x7b, 0x7f, 0x62, 0x91, 0x8b,
+	0x90, 0x1d, 0xb4, 0x9e, 0x58, 0xcd, 0x81, 0xd5, 0xdc, 0x1f, 0x79, 0xbb, 0x21, 0x43, 0x8b, 0xb6,
+	0xac, 0xbb, 0xa3, 0x23, 0x52, 0xf0, 0x0e, 0xf0, 0xa8, 0x20, 0x14, 0x26, 0x3f, 0xd0, 0x2f, 0xf2,
+	0xe3, 0x68, 0x92, 0xaf, 0xa4, 0x77, 0x20, 0x65, 0x49, 0x4e, 0x8a, 0xaf, 0x21, 0x4b, 0x73, 0xce,
+	0x42, 0xd2, 0xb5, 0x06, 0xc3, 0xe6, 0x3e, 0x0a, 0x86, 0x8a, 0x22, 0x41, 0xdf, 0xef, 0x92, 0xeb,
+	0x10, 0xdb, 0x77, 0xfa, 0x28, 0x95, 0xe7, 0xae, 0x0e, 0x45, 0x92, 0x57, 0x20, 0x36, 0x18, 0x33,
+	0xf9, 0x64, 0xcb, 0xa7, 0x43, 0x27, 0x08, 0x16, 0xb2, 0x28, 0x70, 0x30, 0xee, 0xfa, 0x63, 0xbf,
+	0x92, 0x87, 0x58, 0xbd, 0xd1, 0xa0, 0xa7, 0x82, 0x7a, 0xa3, 0xb1, 0xaa, 0x29, 0xb5, 0x55, 0x48,
+	0x77, 0x47, 0x96, 0x45, 0x1d, 0xc5, 0xb3, 0xb2, 0x92, 0x2f, 0x63, 0x14, 0xf4, 0x61, 0xb5, 0xb7,
+	0x21, 0xb5, 0xcf, 0xf2, 0x12, 0xf2, 0xcc, 0x1c, 0xbc, 0xf0, 0xc7, 0xec, 0x2e, 0xe8, 0x45, 0x11,
+	0x10, 0xcd, 0x66, 0x4c, 0x8f, 0xa7, 0xb6, 0x0b, 0x99, 0x51, 0xf3, 0xf9, 0xa4, 0x1f, 0xb2, 0xc8,
+	0x23, 0x27, 0x4d, 0x8f, 0x78, 0x51, 0x6d, 0x03, 0x16, 0x6c, 0xc7, 0xfb, 0x49, 0xaa, 0xd9, 0xe6,
+	0xfb, 0x6e, 0xd6, 0x91, 0xcf, 0x6b, 0xc0, 0x62, 0x3f, 0x6c, 0xdb, 0x0e, 0xaf, 0x60, 0x7b, 0xb5,
+	0xb6, 0x0e, 0x9a, 0x40, 0xd4, 0x61, 0x9b, 0x5b, 0xc6, 0xd3, 0x61, 0xbf, 0xa5, 0xfb, 0x3c, 0xe8,
+	0x0f, 0x22, 0x34, 0x7c, 0xc7, 0xca, 0x68, 0xba, 0xec, 0xd3, 0x04, 0x9f, 0x06, 0x9d, 0xe0, 0x34,
+	0x0d, 0xf5, 0x5f, 0x32, 0x9a, 0x03, 0xf6, 0xdd, 0x82, 0x48, 0x53, 0x35, 0x22, 0xb3, 0x33, 0x39,
+	0x46, 0x77, 0x7a, 0xec, 0xc3, 0x03, 0x9f, 0x87, 0xb9, 0xc7, 0x19, 0x44, 0xcf, 0xeb, 0xd0, 0x97,
+	0xd9, 0x57, 0x09, 0x21, 0xa2, 0xa9, 0x1e, 0x8d, 0x8f, 0xd1, 0xa3, 0x27, 0xec, 0x23, 0x00, 0x9f,
+	0x68, 0x67, 0x56, 0x8f, 0xc6, 0xc7, 0xe8, 0x51, 0x9f, 0x7d, 0x20, 0x10, 0x22, 0xaa, 0x1a, 0xb5,
+	0x4d, 0x20, 0xe2, 0xc2, 0xf3, 0x58, 0x22, 0x65, 0x1a, 0xb0, 0x0f, 0x3f, 0x82, 0xa5, 0x67, 0x46,
+	0xb3, 0xa8, 0x9e, 0xd7, 0x29, 0x9b, 0x7d, 0x15, 0x12, 0xa6, 0xaa, 0x1a, 0xb5, 0x07, 0x70, 0x5a,
+	0x1c, 0xde, 0xb1, 0xba, 0xe5, 0xb0, 0x4f, 0x1a, 0x82, 0x01, 0x72, 0xab, 0x99, 0x64, 0xcf, 0xeb,
+	0xd8, 0x90, 0x7d, 0xee, 0x10, 0x21, 0xab, 0x1a, 0xb5, 0xbb, 0x90, 0x17, 0xc8, 0xf6, 0x30, 0x0b,
+	0x96, 0x11, 0xbd, 0xcf, 0x3e, 0xd2, 0xf1, 0x89, 0x68, 0xfc, 0x8f, 0xae, 0x1e, 0x8b, 0x88, 0x52,
+	0x9a, 0x11, 0xfb, 0xc6, 0x24, 0xe8, 0x0f, 0xda, 0x44, 0x36, 0xca, 0x1e, 0x0b, 0x9f, 0x32, 0x9e,
+	0x31, 0xfb, 0xfe, 0x24, 0xe8, 0x0e, 0x35, 0xa9, 0x0d, 0x42, 0x83, 0xb2, 0x68, 0x50, 0x94, 0xb2,
+	0xb8, 0xe8, 0xbf, 0x4b, 0x12, 0xc8, 0xb2, 0x78, 0xd9, 0x22, 0x0c, 0x9f, 0xbe, 0xd6, 0x1e, 0xc0,
+	0xfc, 0x49, 0x5c, 0xd6, 0x87, 0x0a, 0xcb, 0xbc, 0x2b, 0xcb, 0x34, 0x39, 0x37, 0xe7, 0xda, 0x21,
+	0xcf, 0xb5, 0x01, 0x73, 0x27, 0x70, 0x5b, 0x1f, 0x29, 0x2c, 0x7f, 0xa5, 0x5c, 0x66, 0xae, 0x1d,
+	0xf6, 0x5d, 0x73, 0x27, 0x70, 0x5c, 0x1f, 0x2b, 0xec, 0xc2, 0xc3, 0x28, 0xfb, 0x34, 0x9e, 0xef,
+	0x9a, 0x3b, 0x81, 0xe3, 0xfa, 0x84, 0xe5, 0xa7, 0xaa, 0x51, 0x11, 0x69, 0xd0, 0x53, 0xcc, 0x9f,
+	0xc4, 0x71, 0x7d, 0xaa, 0xe0, 0x05, 0x88, 0x6a, 0x18, 0xfe, 0xfc, 0xf8, 0xbe, 0x6b, 0xfe, 0x24,
+	0x8e, 0xeb, 0xab, 0x0a, 0x5e, 0x94, 0xa8, 0xc6, 0x5a, 0x88, 0x28, 0xdc, 0xa3, 0xe3, 0x38, 0xae,
+	0xaf, 0x29, 0x78, 0x7b, 0xa1, 0x1a, 0x55, 0x9f, 0x68, 0x67, 0xaa, 0x47, 0xc7, 0x71, 0x5c, 0x5f,
+	0xc7, 0x6c, 0xa0, 0xa6, 0x1a, 0x37, 0x42, 0x44, 0xe8, 0xbb, 0xf2, 0x27, 0x72, 0x5c, 0xdf, 0x50,
+	0xf0, 0xa2, 0x49, 0x35, 0x6e, 0x9a, 0x5e, 0x0f, 0x02, 0xdf, 0x95, 0x3f, 0x91, 0xe3, 0xfa, 0xa6,
+	0x82, 0x37, 0x52, 0xaa, 0x71, 0x2b, 0x4c, 0x85, 0xbe, 0x4b, 0x3b, 0x99, 0xe3, 0xfa, 0x4c, 0xc1,
+	0xef, 0x4f, 0xd4, 0xb5, 0x15, 0xd3, 0xeb, 0x84, 0xe0, 0xbb, 0xb4, 0x93, 0x39, 0xae, 0x6f, 0x29,
+	0xf8, 0x51, 0x8a, 0xba, 0xb6, 0x1a, 0x21, 0xab, 0x1a, 0xb5, 0x75, 0xc8, 0x1d, 0xdf, 0x71, 0x7d,
+	0x5b, 0xbc, 0xef, 0xcb, 0xb6, 0x05, 0xef, 0xf5, 0x58, 0x58, 0xbf, 0x63, 0xb8, 0xae, 0xef, 0x60,
+	0xd6, 0x54, 0x7b, 0xe1, 0x3e, 0xbb, 0x15, 0x63, 0x26, 0xaf, 0xb5, 0xad, 0xce, 0x1b, 0x1d, 0xc7,
+	0x09, 0x96, 0x94, 0x39, 0xb4, 0x46, 0xb0, 0x7b, 0x8e, 0xe1, 0xcd, 0xbe, 0xab, 0xe0, 0x25, 0x5a,
+	0x8e, 0x53, 0xa3, 0x85, 0xbf, 0x8f, 0x98, 0x6b, 0xb3, 0x83, 0x31, 0x3f, 0xdf, 0xaf, 0x7d, 0x4f,
+	0x39, 0x99, 0x63, 0xab, 0xc5, 0x1a, 0xdb, 0xeb, 0xfe, 0xe4, 0x60, 0xc9, 0x5b, 0x10, 0x3f, 0x2c,
+	0xaf, 0xac, 0x86, 0x8f, 0x78, 0xe2, 0x1d, 0x32, 0x73, 0x67, 0xd9, 0xf2, 0x42, 0xe8, 0xb2, 0x7d,
+	0x30, 0x74, 0x8f, 0x4c, 0xb4, 0xe4, 0x0c, 0x65, 0x09, 0xc3, 0x47, 0x52, 0x86, 0x32, 0x67, 0xa8,
+	0x48, 0x18, 0x3e, 0x96, 0x32, 0x54, 0x38, 0x83, 0x21, 0x61, 0xf8, 0x44, 0xca, 0x60, 0x70, 0x86,
+	0x35, 0x09, 0xc3, 0xa7, 0x52, 0x86, 0x35, 0xce, 0x50, 0x95, 0x30, 0x7c, 0x55, 0xca, 0x50, 0xe5,
+	0x0c, 0x37, 0x24, 0x0c, 0x5f, 0x93, 0x32, 0xdc, 0xe0, 0x0c, 0x37, 0x25, 0x0c, 0x5f, 0x97, 0x32,
+	0xdc, 0xe4, 0x0c, 0xb7, 0x24, 0x0c, 0xdf, 0x90, 0x32, 0xdc, 0x62, 0x0c, 0xab, 0x2b, 0x12, 0x86,
+	0x6f, 0xca, 0x18, 0x56, 0x57, 0x38, 0x83, 0x4c, 0x93, 0x9f, 0x49, 0x19, 0xb8, 0x26, 0x57, 0x65,
+	0x9a, 0xfc, 0x96, 0x94, 0x81, 0x6b, 0x72, 0x55, 0xa6, 0xc9, 0x6f, 0x4b, 0x19, 0xb8, 0x26, 0x57,
+	0x65, 0x9a, 0xfc, 0x8e, 0x94, 0x81, 0x6b, 0x72, 0x55, 0xa6, 0xc9, 0xef, 0x4a, 0x19, 0xb8, 0x26,
+	0x57, 0x65, 0x9a, 0xfc, 0x9e, 0x94, 0x81, 0x6b, 0x72, 0x55, 0xa6, 0xc9, 0x3f, 0x91, 0x32, 0x70,
+	0x4d, 0xae, 0xca, 0x34, 0xf9, 0xa7, 0x52, 0x06, 0xae, 0xc9, 0x55, 0x99, 0x26, 0xff, 0x4c, 0xca,
+	0xc0, 0x35, 0x59, 0x96, 0x69, 0xf2, 0xfb, 0x32, 0x86, 0x32, 0xd7, 0x64, 0x59, 0xa6, 0xc9, 0x3f,
+	0x97, 0x32, 0x70, 0x4d, 0x96, 0x65, 0x9a, 0xfc, 0x0b, 0x29, 0x03, 0xd7, 0x64, 0x59, 0xa6, 0xc9,
+	0x1f, 0x48, 0x19, 0xb8, 0x26, 0xcb, 0x32, 0x4d, 0xfe, 0xa5, 0x94, 0x81, 0x6b, 0xb2, 0x2c, 0xd3,
+	0xe4, 0x5f, 0x49, 0x19, 0xb8, 0x26, 0xcb, 0x32, 0x4d, 0xfe, 0xb5, 0x94, 0x81, 0x6b, 0xb2, 0x2c,
+	0xd3, 0xe4, 0xdf, 0x48, 0x19, 0xb8, 0x26, 0xcb, 0x32, 0x4d, 0xfe, 0xad, 0x94, 0x81, 0x6b, 0xb2,
+	0x2c, 0xd3, 0xe4, 0xdf, 0x49, 0x19, 0xb8, 0x26, 0x2b, 0x32, 0x4d, 0xfe, 0xbd, 0x8c, 0xa1, 0xc2,
+	0x35, 0x59, 0x91, 0x69, 0xf2, 0x1f, 0xa4, 0x0c, 0x5c, 0x93, 0x15, 0x99, 0x26, 0xff, 0x51, 0xca,
+	0xc0, 0x35, 0x59, 0x91, 0x69, 0xf2, 0x9f, 0xa4, 0x0c, 0x5c, 0x93, 0x15, 0x99, 0x26, 0xff, 0x59,
+	0xca, 0xc0, 0x35, 0x59, 0x91, 0x69, 0xf2, 0x5f, 0xa4, 0x0c, 0x5c, 0x93, 0x15, 0x99, 0x26, 0xff,
+	0x55, 0xca, 0xc0, 0x35, 0x59, 0x91, 0x69, 0xf2, 0xdf, 0xa4, 0x0c, 0x5c, 0x93, 0x15, 0x99, 0x26,
+	0x7f, 0x28, 0x65, 0xe0, 0x9a, 0xac, 0xc8, 0x34, 0xf9, 0xef, 0x52, 0x06, 0xae, 0x49, 0x43, 0xa6,
+	0xc9, 0xff, 0x90, 0x31, 0x18, 0x5c, 0x93, 0x86, 0x4c, 0x93, 0xff, 0x29, 0x65, 0xe0, 0x9a, 0x34,
+	0x64, 0x9a, 0xfc, 0x2f, 0x29, 0x03, 0xd7, 0xa4, 0x21, 0xd3, 0xe4, 0x7f, 0x4b, 0x19, 0xb8, 0x26,
+	0x0d, 0x99, 0x26, 0xff, 0x47, 0xca, 0xc0, 0x35, 0x69, 0xc8, 0x34, 0xf9, 0xbf, 0x52, 0x06, 0xae,
+	0x49, 0x43, 0xa6, 0xc9, 0x1f, 0x49, 0x19, 0xb8, 0x26, 0x0d, 0x99, 0x26, 0x7f, 0x2c, 0x65, 0xe0,
+	0x9a, 0x34, 0x64, 0x9a, 0xfc, 0x89, 0x94, 0x81, 0x6b, 0xd2, 0x90, 0x69, 0xf2, 0xa7, 0x52, 0x06,
+	0xae, 0xc9, 0x35, 0x99, 0x26, 0xff, 0x4f, 0xc6, 0xb0, 0xb6, 0x72, 0xe7, 0xda, 0xe3, 0xab, 0xdd,
+	0x9e, 0x7b, 0x30, 0xd9, 0x5b, 0xde, 0x77, 0x06, 0xd7, 0xbb, 0x4e, 0xbf, 0x65, 0x77, 0xaf, 0x23,
+	0x6c, 0x6f, 0xd2, 0xb9, 0x1e, 0xfc, 0xeb, 0x35, 0x33, 0xfd, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x46, 0xc7, 0xb3, 0x38, 0x92, 0x3d, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/proto/testdata/test.proto b/vendor/github.com/golang/protobuf/proto/test_proto/test.proto
similarity index 95%
rename from vendor/github.com/golang/protobuf/proto/testdata/test.proto
rename to vendor/github.com/golang/protobuf/proto/test_proto/test.proto
index 70e3cfcd..22068a95 100644
--- a/vendor/github.com/golang/protobuf/proto/testdata/test.proto
+++ b/vendor/github.com/golang/protobuf/proto/test_proto/test.proto
@@ -33,7 +33,9 @@
 
 syntax = "proto2";
 
-package testdata;
+option go_package = "github.com/golang/protobuf/proto/test_proto";
+
+package test_proto;
 
 enum FOO { FOO1 = 1; };
 
@@ -96,6 +98,8 @@ message GoTest {
   required bytes F_Bytes_required = 101;
   required sint32 F_Sint32_required = 102;
   required sint64 F_Sint64_required = 103;
+  required sfixed32 F_Sfixed32_required = 104;
+  required sfixed64 F_Sfixed64_required = 105;
 
   // Repeated fields of all basic types
   repeated bool F_Bool_repeated = 20;
@@ -111,6 +115,8 @@ message GoTest {
   repeated bytes F_Bytes_repeated = 201;
   repeated sint32 F_Sint32_repeated = 202;
   repeated sint64 F_Sint64_repeated = 203;
+  repeated sfixed32 F_Sfixed32_repeated = 204;
+  repeated sfixed64 F_Sfixed64_repeated = 205;
 
   // Optional fields of all basic types
   optional bool F_Bool_optional = 30;
@@ -126,6 +132,8 @@ message GoTest {
   optional bytes F_Bytes_optional = 301;
   optional sint32 F_Sint32_optional = 302;
   optional sint64 F_Sint64_optional = 303;
+  optional sfixed32 F_Sfixed32_optional = 304;
+  optional sfixed64 F_Sfixed64_optional = 305;
 
   // Default-valued fields of all basic types
   optional bool F_Bool_defaulted = 40 [default=true];
@@ -141,6 +149,8 @@ message GoTest {
   optional bytes F_Bytes_defaulted = 401 [default="Bignose"];
   optional sint32 F_Sint32_defaulted = 402 [default = -32];
   optional sint64 F_Sint64_defaulted = 403 [default = -64];
+  optional sfixed32 F_Sfixed32_defaulted = 404 [default = -32];
+  optional sfixed64 F_Sfixed64_defaulted = 405 [default = -64];
 
   // Packed repeated fields (no string or bytes).
   repeated bool F_Bool_repeated_packed = 50 [packed=true];
@@ -154,6 +164,8 @@ message GoTest {
   repeated double F_Double_repeated_packed = 58 [packed=true];
   repeated sint32 F_Sint32_repeated_packed = 502 [packed=true];
   repeated sint64 F_Sint64_repeated_packed = 503 [packed=true];
+  repeated sfixed32 F_Sfixed32_repeated_packed = 504 [packed=true];
+  repeated sfixed64 F_Sfixed64_repeated_packed = 505 [packed=true];
 
   // Required, repeated, and optional groups.
   required group RequiredGroup = 70 {
@@ -285,10 +297,12 @@ message Ext {
   }
 
   optional string data = 1;
+  map<int32, int32> map_field = 2;
 }
 
 extend MyMessage {
   repeated string greeting = 106;
+  // leave field 200 unregistered for testing
 }
 
 message ComplexExtension {
@@ -342,7 +356,7 @@ extend DefaultsMessage {
   optional sfixed32 default_sfixed32 = 211 [default = 50];
   optional sfixed64 default_sfixed64 = 212 [default = 51];
   optional bool default_bool = 213 [default = true];
-  optional string default_string = 214 [default = "Hello, string"];
+  optional string default_string = 214 [default = "Hello, string,def=foo"];
   optional bytes default_bytes = 215 [default = "Hello, bytes"];
   optional DefaultsMessage.DefaultsEnum default_enum = 216 [default = ONE];
 }
diff --git a/vendor/github.com/golang/protobuf/proto/testdata/Makefile b/vendor/github.com/golang/protobuf/proto/testdata/Makefile
deleted file mode 100644
index fc288628..00000000
--- a/vendor/github.com/golang/protobuf/proto/testdata/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-include ../../Make.protobuf
-
-all:	regenerate
-
-regenerate:
-	rm -f test.pb.go
-	make test.pb.go
-
-# The following rules are just aids to development. Not needed for typical testing.
-
-diff:	regenerate
-	git diff test.pb.go
-
-restore:
-	cp test.pb.go.golden test.pb.go
-
-preserve:
-	cp test.pb.go test.pb.go.golden
diff --git a/vendor/github.com/golang/protobuf/proto/testdata/test.pb.go b/vendor/github.com/golang/protobuf/proto/testdata/test.pb.go
deleted file mode 100644
index e980d1a0..00000000
--- a/vendor/github.com/golang/protobuf/proto/testdata/test.pb.go
+++ /dev/null
@@ -1,4147 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: test.proto
-
-/*
-Package testdata is a generated protocol buffer package.
-
-It is generated from these files:
-	test.proto
-
-It has these top-level messages:
-	GoEnum
-	GoTestField
-	GoTest
-	GoTestRequiredGroupField
-	GoSkipTest
-	NonPackedTest
-	PackedTest
-	MaxTag
-	OldMessage
-	NewMessage
-	InnerMessage
-	OtherMessage
-	RequiredInnerMessage
-	MyMessage
-	Ext
-	ComplexExtension
-	DefaultsMessage
-	MyMessageSet
-	Empty
-	MessageList
-	Strings
-	Defaults
-	SubDefaults
-	RepeatedEnum
-	MoreRepeated
-	GroupOld
-	GroupNew
-	FloatingPoint
-	MessageWithMap
-	Oneof
-	Communique
-*/
-package testdata
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-type FOO int32
-
-const (
-	FOO_FOO1 FOO = 1
-)
-
-var FOO_name = map[int32]string{
-	1: "FOO1",
-}
-var FOO_value = map[string]int32{
-	"FOO1": 1,
-}
-
-func (x FOO) Enum() *FOO {
-	p := new(FOO)
-	*p = x
-	return p
-}
-func (x FOO) String() string {
-	return proto.EnumName(FOO_name, int32(x))
-}
-func (x *FOO) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FOO_value, data, "FOO")
-	if err != nil {
-		return err
-	}
-	*x = FOO(value)
-	return nil
-}
-func (FOO) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-// An enum, for completeness.
-type GoTest_KIND int32
-
-const (
-	GoTest_VOID GoTest_KIND = 0
-	// Basic types
-	GoTest_BOOL        GoTest_KIND = 1
-	GoTest_BYTES       GoTest_KIND = 2
-	GoTest_FINGERPRINT GoTest_KIND = 3
-	GoTest_FLOAT       GoTest_KIND = 4
-	GoTest_INT         GoTest_KIND = 5
-	GoTest_STRING      GoTest_KIND = 6
-	GoTest_TIME        GoTest_KIND = 7
-	// Groupings
-	GoTest_TUPLE GoTest_KIND = 8
-	GoTest_ARRAY GoTest_KIND = 9
-	GoTest_MAP   GoTest_KIND = 10
-	// Table types
-	GoTest_TABLE GoTest_KIND = 11
-	// Functions
-	GoTest_FUNCTION GoTest_KIND = 12
-)
-
-var GoTest_KIND_name = map[int32]string{
-	0:  "VOID",
-	1:  "BOOL",
-	2:  "BYTES",
-	3:  "FINGERPRINT",
-	4:  "FLOAT",
-	5:  "INT",
-	6:  "STRING",
-	7:  "TIME",
-	8:  "TUPLE",
-	9:  "ARRAY",
-	10: "MAP",
-	11: "TABLE",
-	12: "FUNCTION",
-}
-var GoTest_KIND_value = map[string]int32{
-	"VOID":        0,
-	"BOOL":        1,
-	"BYTES":       2,
-	"FINGERPRINT": 3,
-	"FLOAT":       4,
-	"INT":         5,
-	"STRING":      6,
-	"TIME":        7,
-	"TUPLE":       8,
-	"ARRAY":       9,
-	"MAP":         10,
-	"TABLE":       11,
-	"FUNCTION":    12,
-}
-
-func (x GoTest_KIND) Enum() *GoTest_KIND {
-	p := new(GoTest_KIND)
-	*p = x
-	return p
-}
-func (x GoTest_KIND) String() string {
-	return proto.EnumName(GoTest_KIND_name, int32(x))
-}
-func (x *GoTest_KIND) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(GoTest_KIND_value, data, "GoTest_KIND")
-	if err != nil {
-		return err
-	}
-	*x = GoTest_KIND(value)
-	return nil
-}
-func (GoTest_KIND) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-type MyMessage_Color int32
-
-const (
-	MyMessage_RED   MyMessage_Color = 0
-	MyMessage_GREEN MyMessage_Color = 1
-	MyMessage_BLUE  MyMessage_Color = 2
-)
-
-var MyMessage_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var MyMessage_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x MyMessage_Color) Enum() *MyMessage_Color {
-	p := new(MyMessage_Color)
-	*p = x
-	return p
-}
-func (x MyMessage_Color) String() string {
-	return proto.EnumName(MyMessage_Color_name, int32(x))
-}
-func (x *MyMessage_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(MyMessage_Color_value, data, "MyMessage_Color")
-	if err != nil {
-		return err
-	}
-	*x = MyMessage_Color(value)
-	return nil
-}
-func (MyMessage_Color) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{13, 0} }
-
-type DefaultsMessage_DefaultsEnum int32
-
-const (
-	DefaultsMessage_ZERO DefaultsMessage_DefaultsEnum = 0
-	DefaultsMessage_ONE  DefaultsMessage_DefaultsEnum = 1
-	DefaultsMessage_TWO  DefaultsMessage_DefaultsEnum = 2
-)
-
-var DefaultsMessage_DefaultsEnum_name = map[int32]string{
-	0: "ZERO",
-	1: "ONE",
-	2: "TWO",
-}
-var DefaultsMessage_DefaultsEnum_value = map[string]int32{
-	"ZERO": 0,
-	"ONE":  1,
-	"TWO":  2,
-}
-
-func (x DefaultsMessage_DefaultsEnum) Enum() *DefaultsMessage_DefaultsEnum {
-	p := new(DefaultsMessage_DefaultsEnum)
-	*p = x
-	return p
-}
-func (x DefaultsMessage_DefaultsEnum) String() string {
-	return proto.EnumName(DefaultsMessage_DefaultsEnum_name, int32(x))
-}
-func (x *DefaultsMessage_DefaultsEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(DefaultsMessage_DefaultsEnum_value, data, "DefaultsMessage_DefaultsEnum")
-	if err != nil {
-		return err
-	}
-	*x = DefaultsMessage_DefaultsEnum(value)
-	return nil
-}
-func (DefaultsMessage_DefaultsEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{16, 0}
-}
-
-type Defaults_Color int32
-
-const (
-	Defaults_RED   Defaults_Color = 0
-	Defaults_GREEN Defaults_Color = 1
-	Defaults_BLUE  Defaults_Color = 2
-)
-
-var Defaults_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Defaults_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Defaults_Color) Enum() *Defaults_Color {
-	p := new(Defaults_Color)
-	*p = x
-	return p
-}
-func (x Defaults_Color) String() string {
-	return proto.EnumName(Defaults_Color_name, int32(x))
-}
-func (x *Defaults_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Defaults_Color_value, data, "Defaults_Color")
-	if err != nil {
-		return err
-	}
-	*x = Defaults_Color(value)
-	return nil
-}
-func (Defaults_Color) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{21, 0} }
-
-type RepeatedEnum_Color int32
-
-const (
-	RepeatedEnum_RED RepeatedEnum_Color = 1
-)
-
-var RepeatedEnum_Color_name = map[int32]string{
-	1: "RED",
-}
-var RepeatedEnum_Color_value = map[string]int32{
-	"RED": 1,
-}
-
-func (x RepeatedEnum_Color) Enum() *RepeatedEnum_Color {
-	p := new(RepeatedEnum_Color)
-	*p = x
-	return p
-}
-func (x RepeatedEnum_Color) String() string {
-	return proto.EnumName(RepeatedEnum_Color_name, int32(x))
-}
-func (x *RepeatedEnum_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(RepeatedEnum_Color_value, data, "RepeatedEnum_Color")
-	if err != nil {
-		return err
-	}
-	*x = RepeatedEnum_Color(value)
-	return nil
-}
-func (RepeatedEnum_Color) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{23, 0} }
-
-type GoEnum struct {
-	Foo              *FOO   `protobuf:"varint,1,req,name=foo,enum=testdata.FOO" json:"foo,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GoEnum) Reset()                    { *m = GoEnum{} }
-func (m *GoEnum) String() string            { return proto.CompactTextString(m) }
-func (*GoEnum) ProtoMessage()               {}
-func (*GoEnum) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *GoEnum) GetFoo() FOO {
-	if m != nil && m.Foo != nil {
-		return *m.Foo
-	}
-	return FOO_FOO1
-}
-
-type GoTestField struct {
-	Label            *string `protobuf:"bytes,1,req,name=Label" json:"Label,omitempty"`
-	Type             *string `protobuf:"bytes,2,req,name=Type" json:"Type,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTestField) Reset()                    { *m = GoTestField{} }
-func (m *GoTestField) String() string            { return proto.CompactTextString(m) }
-func (*GoTestField) ProtoMessage()               {}
-func (*GoTestField) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *GoTestField) GetLabel() string {
-	if m != nil && m.Label != nil {
-		return *m.Label
-	}
-	return ""
-}
-
-func (m *GoTestField) GetType() string {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return ""
-}
-
-type GoTest struct {
-	// Some typical parameters
-	Kind  *GoTest_KIND `protobuf:"varint,1,req,name=Kind,enum=testdata.GoTest_KIND" json:"Kind,omitempty"`
-	Table *string      `protobuf:"bytes,2,opt,name=Table" json:"Table,omitempty"`
-	Param *int32       `protobuf:"varint,3,opt,name=Param" json:"Param,omitempty"`
-	// Required, repeated and optional foreign fields.
-	RequiredField *GoTestField   `protobuf:"bytes,4,req,name=RequiredField" json:"RequiredField,omitempty"`
-	RepeatedField []*GoTestField `protobuf:"bytes,5,rep,name=RepeatedField" json:"RepeatedField,omitempty"`
-	OptionalField *GoTestField   `protobuf:"bytes,6,opt,name=OptionalField" json:"OptionalField,omitempty"`
-	// Required fields of all basic types
-	F_BoolRequired    *bool    `protobuf:"varint,10,req,name=F_Bool_required,json=FBoolRequired" json:"F_Bool_required,omitempty"`
-	F_Int32Required   *int32   `protobuf:"varint,11,req,name=F_Int32_required,json=FInt32Required" json:"F_Int32_required,omitempty"`
-	F_Int64Required   *int64   `protobuf:"varint,12,req,name=F_Int64_required,json=FInt64Required" json:"F_Int64_required,omitempty"`
-	F_Fixed32Required *uint32  `protobuf:"fixed32,13,req,name=F_Fixed32_required,json=FFixed32Required" json:"F_Fixed32_required,omitempty"`
-	F_Fixed64Required *uint64  `protobuf:"fixed64,14,req,name=F_Fixed64_required,json=FFixed64Required" json:"F_Fixed64_required,omitempty"`
-	F_Uint32Required  *uint32  `protobuf:"varint,15,req,name=F_Uint32_required,json=FUint32Required" json:"F_Uint32_required,omitempty"`
-	F_Uint64Required  *uint64  `protobuf:"varint,16,req,name=F_Uint64_required,json=FUint64Required" json:"F_Uint64_required,omitempty"`
-	F_FloatRequired   *float32 `protobuf:"fixed32,17,req,name=F_Float_required,json=FFloatRequired" json:"F_Float_required,omitempty"`
-	F_DoubleRequired  *float64 `protobuf:"fixed64,18,req,name=F_Double_required,json=FDoubleRequired" json:"F_Double_required,omitempty"`
-	F_StringRequired  *string  `protobuf:"bytes,19,req,name=F_String_required,json=FStringRequired" json:"F_String_required,omitempty"`
-	F_BytesRequired   []byte   `protobuf:"bytes,101,req,name=F_Bytes_required,json=FBytesRequired" json:"F_Bytes_required,omitempty"`
-	F_Sint32Required  *int32   `protobuf:"zigzag32,102,req,name=F_Sint32_required,json=FSint32Required" json:"F_Sint32_required,omitempty"`
-	F_Sint64Required  *int64   `protobuf:"zigzag64,103,req,name=F_Sint64_required,json=FSint64Required" json:"F_Sint64_required,omitempty"`
-	// Repeated fields of all basic types
-	F_BoolRepeated    []bool    `protobuf:"varint,20,rep,name=F_Bool_repeated,json=FBoolRepeated" json:"F_Bool_repeated,omitempty"`
-	F_Int32Repeated   []int32   `protobuf:"varint,21,rep,name=F_Int32_repeated,json=FInt32Repeated" json:"F_Int32_repeated,omitempty"`
-	F_Int64Repeated   []int64   `protobuf:"varint,22,rep,name=F_Int64_repeated,json=FInt64Repeated" json:"F_Int64_repeated,omitempty"`
-	F_Fixed32Repeated []uint32  `protobuf:"fixed32,23,rep,name=F_Fixed32_repeated,json=FFixed32Repeated" json:"F_Fixed32_repeated,omitempty"`
-	F_Fixed64Repeated []uint64  `protobuf:"fixed64,24,rep,name=F_Fixed64_repeated,json=FFixed64Repeated" json:"F_Fixed64_repeated,omitempty"`
-	F_Uint32Repeated  []uint32  `protobuf:"varint,25,rep,name=F_Uint32_repeated,json=FUint32Repeated" json:"F_Uint32_repeated,omitempty"`
-	F_Uint64Repeated  []uint64  `protobuf:"varint,26,rep,name=F_Uint64_repeated,json=FUint64Repeated" json:"F_Uint64_repeated,omitempty"`
-	F_FloatRepeated   []float32 `protobuf:"fixed32,27,rep,name=F_Float_repeated,json=FFloatRepeated" json:"F_Float_repeated,omitempty"`
-	F_DoubleRepeated  []float64 `protobuf:"fixed64,28,rep,name=F_Double_repeated,json=FDoubleRepeated" json:"F_Double_repeated,omitempty"`
-	F_StringRepeated  []string  `protobuf:"bytes,29,rep,name=F_String_repeated,json=FStringRepeated" json:"F_String_repeated,omitempty"`
-	F_BytesRepeated   [][]byte  `protobuf:"bytes,201,rep,name=F_Bytes_repeated,json=FBytesRepeated" json:"F_Bytes_repeated,omitempty"`
-	F_Sint32Repeated  []int32   `protobuf:"zigzag32,202,rep,name=F_Sint32_repeated,json=FSint32Repeated" json:"F_Sint32_repeated,omitempty"`
-	F_Sint64Repeated  []int64   `protobuf:"zigzag64,203,rep,name=F_Sint64_repeated,json=FSint64Repeated" json:"F_Sint64_repeated,omitempty"`
-	// Optional fields of all basic types
-	F_BoolOptional    *bool    `protobuf:"varint,30,opt,name=F_Bool_optional,json=FBoolOptional" json:"F_Bool_optional,omitempty"`
-	F_Int32Optional   *int32   `protobuf:"varint,31,opt,name=F_Int32_optional,json=FInt32Optional" json:"F_Int32_optional,omitempty"`
-	F_Int64Optional   *int64   `protobuf:"varint,32,opt,name=F_Int64_optional,json=FInt64Optional" json:"F_Int64_optional,omitempty"`
-	F_Fixed32Optional *uint32  `protobuf:"fixed32,33,opt,name=F_Fixed32_optional,json=FFixed32Optional" json:"F_Fixed32_optional,omitempty"`
-	F_Fixed64Optional *uint64  `protobuf:"fixed64,34,opt,name=F_Fixed64_optional,json=FFixed64Optional" json:"F_Fixed64_optional,omitempty"`
-	F_Uint32Optional  *uint32  `protobuf:"varint,35,opt,name=F_Uint32_optional,json=FUint32Optional" json:"F_Uint32_optional,omitempty"`
-	F_Uint64Optional  *uint64  `protobuf:"varint,36,opt,name=F_Uint64_optional,json=FUint64Optional" json:"F_Uint64_optional,omitempty"`
-	F_FloatOptional   *float32 `protobuf:"fixed32,37,opt,name=F_Float_optional,json=FFloatOptional" json:"F_Float_optional,omitempty"`
-	F_DoubleOptional  *float64 `protobuf:"fixed64,38,opt,name=F_Double_optional,json=FDoubleOptional" json:"F_Double_optional,omitempty"`
-	F_StringOptional  *string  `protobuf:"bytes,39,opt,name=F_String_optional,json=FStringOptional" json:"F_String_optional,omitempty"`
-	F_BytesOptional   []byte   `protobuf:"bytes,301,opt,name=F_Bytes_optional,json=FBytesOptional" json:"F_Bytes_optional,omitempty"`
-	F_Sint32Optional  *int32   `protobuf:"zigzag32,302,opt,name=F_Sint32_optional,json=FSint32Optional" json:"F_Sint32_optional,omitempty"`
-	F_Sint64Optional  *int64   `protobuf:"zigzag64,303,opt,name=F_Sint64_optional,json=FSint64Optional" json:"F_Sint64_optional,omitempty"`
-	// Default-valued fields of all basic types
-	F_BoolDefaulted    *bool    `protobuf:"varint,40,opt,name=F_Bool_defaulted,json=FBoolDefaulted,def=1" json:"F_Bool_defaulted,omitempty"`
-	F_Int32Defaulted   *int32   `protobuf:"varint,41,opt,name=F_Int32_defaulted,json=FInt32Defaulted,def=32" json:"F_Int32_defaulted,omitempty"`
-	F_Int64Defaulted   *int64   `protobuf:"varint,42,opt,name=F_Int64_defaulted,json=FInt64Defaulted,def=64" json:"F_Int64_defaulted,omitempty"`
-	F_Fixed32Defaulted *uint32  `protobuf:"fixed32,43,opt,name=F_Fixed32_defaulted,json=FFixed32Defaulted,def=320" json:"F_Fixed32_defaulted,omitempty"`
-	F_Fixed64Defaulted *uint64  `protobuf:"fixed64,44,opt,name=F_Fixed64_defaulted,json=FFixed64Defaulted,def=640" json:"F_Fixed64_defaulted,omitempty"`
-	F_Uint32Defaulted  *uint32  `protobuf:"varint,45,opt,name=F_Uint32_defaulted,json=FUint32Defaulted,def=3200" json:"F_Uint32_defaulted,omitempty"`
-	F_Uint64Defaulted  *uint64  `protobuf:"varint,46,opt,name=F_Uint64_defaulted,json=FUint64Defaulted,def=6400" json:"F_Uint64_defaulted,omitempty"`
-	F_FloatDefaulted   *float32 `protobuf:"fixed32,47,opt,name=F_Float_defaulted,json=FFloatDefaulted,def=314159" json:"F_Float_defaulted,omitempty"`
-	F_DoubleDefaulted  *float64 `protobuf:"fixed64,48,opt,name=F_Double_defaulted,json=FDoubleDefaulted,def=271828" json:"F_Double_defaulted,omitempty"`
-	F_StringDefaulted  *string  `protobuf:"bytes,49,opt,name=F_String_defaulted,json=FStringDefaulted,def=hello, \"world!\"\n" json:"F_String_defaulted,omitempty"`
-	F_BytesDefaulted   []byte   `protobuf:"bytes,401,opt,name=F_Bytes_defaulted,json=FBytesDefaulted,def=Bignose" json:"F_Bytes_defaulted,omitempty"`
-	F_Sint32Defaulted  *int32   `protobuf:"zigzag32,402,opt,name=F_Sint32_defaulted,json=FSint32Defaulted,def=-32" json:"F_Sint32_defaulted,omitempty"`
-	F_Sint64Defaulted  *int64   `protobuf:"zigzag64,403,opt,name=F_Sint64_defaulted,json=FSint64Defaulted,def=-64" json:"F_Sint64_defaulted,omitempty"`
-	// Packed repeated fields (no string or bytes).
-	F_BoolRepeatedPacked    []bool                  `protobuf:"varint,50,rep,packed,name=F_Bool_repeated_packed,json=FBoolRepeatedPacked" json:"F_Bool_repeated_packed,omitempty"`
-	F_Int32RepeatedPacked   []int32                 `protobuf:"varint,51,rep,packed,name=F_Int32_repeated_packed,json=FInt32RepeatedPacked" json:"F_Int32_repeated_packed,omitempty"`
-	F_Int64RepeatedPacked   []int64                 `protobuf:"varint,52,rep,packed,name=F_Int64_repeated_packed,json=FInt64RepeatedPacked" json:"F_Int64_repeated_packed,omitempty"`
-	F_Fixed32RepeatedPacked []uint32                `protobuf:"fixed32,53,rep,packed,name=F_Fixed32_repeated_packed,json=FFixed32RepeatedPacked" json:"F_Fixed32_repeated_packed,omitempty"`
-	F_Fixed64RepeatedPacked []uint64                `protobuf:"fixed64,54,rep,packed,name=F_Fixed64_repeated_packed,json=FFixed64RepeatedPacked" json:"F_Fixed64_repeated_packed,omitempty"`
-	F_Uint32RepeatedPacked  []uint32                `protobuf:"varint,55,rep,packed,name=F_Uint32_repeated_packed,json=FUint32RepeatedPacked" json:"F_Uint32_repeated_packed,omitempty"`
-	F_Uint64RepeatedPacked  []uint64                `protobuf:"varint,56,rep,packed,name=F_Uint64_repeated_packed,json=FUint64RepeatedPacked" json:"F_Uint64_repeated_packed,omitempty"`
-	F_FloatRepeatedPacked   []float32               `protobuf:"fixed32,57,rep,packed,name=F_Float_repeated_packed,json=FFloatRepeatedPacked" json:"F_Float_repeated_packed,omitempty"`
-	F_DoubleRepeatedPacked  []float64               `protobuf:"fixed64,58,rep,packed,name=F_Double_repeated_packed,json=FDoubleRepeatedPacked" json:"F_Double_repeated_packed,omitempty"`
-	F_Sint32RepeatedPacked  []int32                 `protobuf:"zigzag32,502,rep,packed,name=F_Sint32_repeated_packed,json=FSint32RepeatedPacked" json:"F_Sint32_repeated_packed,omitempty"`
-	F_Sint64RepeatedPacked  []int64                 `protobuf:"zigzag64,503,rep,packed,name=F_Sint64_repeated_packed,json=FSint64RepeatedPacked" json:"F_Sint64_repeated_packed,omitempty"`
-	Requiredgroup           *GoTest_RequiredGroup   `protobuf:"group,70,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
-	Repeatedgroup           []*GoTest_RepeatedGroup `protobuf:"group,80,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	Optionalgroup           *GoTest_OptionalGroup   `protobuf:"group,90,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	XXX_unrecognized        []byte                  `json:"-"`
-}
-
-func (m *GoTest) Reset()                    { *m = GoTest{} }
-func (m *GoTest) String() string            { return proto.CompactTextString(m) }
-func (*GoTest) ProtoMessage()               {}
-func (*GoTest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-const Default_GoTest_F_BoolDefaulted bool = true
-const Default_GoTest_F_Int32Defaulted int32 = 32
-const Default_GoTest_F_Int64Defaulted int64 = 64
-const Default_GoTest_F_Fixed32Defaulted uint32 = 320
-const Default_GoTest_F_Fixed64Defaulted uint64 = 640
-const Default_GoTest_F_Uint32Defaulted uint32 = 3200
-const Default_GoTest_F_Uint64Defaulted uint64 = 6400
-const Default_GoTest_F_FloatDefaulted float32 = 314159
-const Default_GoTest_F_DoubleDefaulted float64 = 271828
-const Default_GoTest_F_StringDefaulted string = "hello, \"world!\"\n"
-
-var Default_GoTest_F_BytesDefaulted []byte = []byte("Bignose")
-
-const Default_GoTest_F_Sint32Defaulted int32 = -32
-const Default_GoTest_F_Sint64Defaulted int64 = -64
-
-func (m *GoTest) GetKind() GoTest_KIND {
-	if m != nil && m.Kind != nil {
-		return *m.Kind
-	}
-	return GoTest_VOID
-}
-
-func (m *GoTest) GetTable() string {
-	if m != nil && m.Table != nil {
-		return *m.Table
-	}
-	return ""
-}
-
-func (m *GoTest) GetParam() int32 {
-	if m != nil && m.Param != nil {
-		return *m.Param
-	}
-	return 0
-}
-
-func (m *GoTest) GetRequiredField() *GoTestField {
-	if m != nil {
-		return m.RequiredField
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedField() []*GoTestField {
-	if m != nil {
-		return m.RepeatedField
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalField() *GoTestField {
-	if m != nil {
-		return m.OptionalField
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolRequired() bool {
-	if m != nil && m.F_BoolRequired != nil {
-		return *m.F_BoolRequired
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Required() int32 {
-	if m != nil && m.F_Int32Required != nil {
-		return *m.F_Int32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Required() int64 {
-	if m != nil && m.F_Int64Required != nil {
-		return *m.F_Int64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Required() uint32 {
-	if m != nil && m.F_Fixed32Required != nil {
-		return *m.F_Fixed32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Required() uint64 {
-	if m != nil && m.F_Fixed64Required != nil {
-		return *m.F_Fixed64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Required() uint32 {
-	if m != nil && m.F_Uint32Required != nil {
-		return *m.F_Uint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Required() uint64 {
-	if m != nil && m.F_Uint64Required != nil {
-		return *m.F_Uint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatRequired() float32 {
-	if m != nil && m.F_FloatRequired != nil {
-		return *m.F_FloatRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleRequired() float64 {
-	if m != nil && m.F_DoubleRequired != nil {
-		return *m.F_DoubleRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringRequired() string {
-	if m != nil && m.F_StringRequired != nil {
-		return *m.F_StringRequired
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesRequired() []byte {
-	if m != nil {
-		return m.F_BytesRequired
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Required() int32 {
-	if m != nil && m.F_Sint32Required != nil {
-		return *m.F_Sint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Required() int64 {
-	if m != nil && m.F_Sint64Required != nil {
-		return *m.F_Sint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolRepeated() []bool {
-	if m != nil {
-		return m.F_BoolRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32Repeated() []int32 {
-	if m != nil {
-		return m.F_Int32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64Repeated() []int64 {
-	if m != nil {
-		return m.F_Int64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Fixed32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Fixed64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Uint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Uint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeated() []float32 {
-	if m != nil {
-		return m.F_FloatRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeated() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_StringRepeated() []string {
-	if m != nil {
-		return m.F_StringRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BytesRepeated() [][]byte {
-	if m != nil {
-		return m.F_BytesRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Repeated() []int32 {
-	if m != nil {
-		return m.F_Sint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64Repeated() []int64 {
-	if m != nil {
-		return m.F_Sint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolOptional() bool {
-	if m != nil && m.F_BoolOptional != nil {
-		return *m.F_BoolOptional
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Optional() int32 {
-	if m != nil && m.F_Int32Optional != nil {
-		return *m.F_Int32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Optional() int64 {
-	if m != nil && m.F_Int64Optional != nil {
-		return *m.F_Int64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Optional() uint32 {
-	if m != nil && m.F_Fixed32Optional != nil {
-		return *m.F_Fixed32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Optional() uint64 {
-	if m != nil && m.F_Fixed64Optional != nil {
-		return *m.F_Fixed64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Optional() uint32 {
-	if m != nil && m.F_Uint32Optional != nil {
-		return *m.F_Uint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Optional() uint64 {
-	if m != nil && m.F_Uint64Optional != nil {
-		return *m.F_Uint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatOptional() float32 {
-	if m != nil && m.F_FloatOptional != nil {
-		return *m.F_FloatOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleOptional() float64 {
-	if m != nil && m.F_DoubleOptional != nil {
-		return *m.F_DoubleOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringOptional() string {
-	if m != nil && m.F_StringOptional != nil {
-		return *m.F_StringOptional
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesOptional() []byte {
-	if m != nil {
-		return m.F_BytesOptional
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Optional() int32 {
-	if m != nil && m.F_Sint32Optional != nil {
-		return *m.F_Sint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Optional() int64 {
-	if m != nil && m.F_Sint64Optional != nil {
-		return *m.F_Sint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolDefaulted() bool {
-	if m != nil && m.F_BoolDefaulted != nil {
-		return *m.F_BoolDefaulted
-	}
-	return Default_GoTest_F_BoolDefaulted
-}
-
-func (m *GoTest) GetF_Int32Defaulted() int32 {
-	if m != nil && m.F_Int32Defaulted != nil {
-		return *m.F_Int32Defaulted
-	}
-	return Default_GoTest_F_Int32Defaulted
-}
-
-func (m *GoTest) GetF_Int64Defaulted() int64 {
-	if m != nil && m.F_Int64Defaulted != nil {
-		return *m.F_Int64Defaulted
-	}
-	return Default_GoTest_F_Int64Defaulted
-}
-
-func (m *GoTest) GetF_Fixed32Defaulted() uint32 {
-	if m != nil && m.F_Fixed32Defaulted != nil {
-		return *m.F_Fixed32Defaulted
-	}
-	return Default_GoTest_F_Fixed32Defaulted
-}
-
-func (m *GoTest) GetF_Fixed64Defaulted() uint64 {
-	if m != nil && m.F_Fixed64Defaulted != nil {
-		return *m.F_Fixed64Defaulted
-	}
-	return Default_GoTest_F_Fixed64Defaulted
-}
-
-func (m *GoTest) GetF_Uint32Defaulted() uint32 {
-	if m != nil && m.F_Uint32Defaulted != nil {
-		return *m.F_Uint32Defaulted
-	}
-	return Default_GoTest_F_Uint32Defaulted
-}
-
-func (m *GoTest) GetF_Uint64Defaulted() uint64 {
-	if m != nil && m.F_Uint64Defaulted != nil {
-		return *m.F_Uint64Defaulted
-	}
-	return Default_GoTest_F_Uint64Defaulted
-}
-
-func (m *GoTest) GetF_FloatDefaulted() float32 {
-	if m != nil && m.F_FloatDefaulted != nil {
-		return *m.F_FloatDefaulted
-	}
-	return Default_GoTest_F_FloatDefaulted
-}
-
-func (m *GoTest) GetF_DoubleDefaulted() float64 {
-	if m != nil && m.F_DoubleDefaulted != nil {
-		return *m.F_DoubleDefaulted
-	}
-	return Default_GoTest_F_DoubleDefaulted
-}
-
-func (m *GoTest) GetF_StringDefaulted() string {
-	if m != nil && m.F_StringDefaulted != nil {
-		return *m.F_StringDefaulted
-	}
-	return Default_GoTest_F_StringDefaulted
-}
-
-func (m *GoTest) GetF_BytesDefaulted() []byte {
-	if m != nil && m.F_BytesDefaulted != nil {
-		return m.F_BytesDefaulted
-	}
-	return append([]byte(nil), Default_GoTest_F_BytesDefaulted...)
-}
-
-func (m *GoTest) GetF_Sint32Defaulted() int32 {
-	if m != nil && m.F_Sint32Defaulted != nil {
-		return *m.F_Sint32Defaulted
-	}
-	return Default_GoTest_F_Sint32Defaulted
-}
-
-func (m *GoTest) GetF_Sint64Defaulted() int64 {
-	if m != nil && m.F_Sint64Defaulted != nil {
-		return *m.F_Sint64Defaulted
-	}
-	return Default_GoTest_F_Sint64Defaulted
-}
-
-func (m *GoTest) GetF_BoolRepeatedPacked() []bool {
-	if m != nil {
-		return m.F_BoolRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Int32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Int64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Fixed32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Fixed64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Uint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Uint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeatedPacked() []float32 {
-	if m != nil {
-		return m.F_FloatRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeatedPacked() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Sint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Sint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetRequiredgroup() *GoTest_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedgroup() []*GoTest_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalgroup() *GoTest_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-// Required, repeated, and optional groups.
-type GoTest_RequiredGroup struct {
-	RequiredField    *string `protobuf:"bytes,71,req,name=RequiredField" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RequiredGroup) Reset()                    { *m = GoTest_RequiredGroup{} }
-func (m *GoTest_RequiredGroup) String() string            { return proto.CompactTextString(m) }
-func (*GoTest_RequiredGroup) ProtoMessage()               {}
-func (*GoTest_RequiredGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-func (m *GoTest_RequiredGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_RepeatedGroup struct {
-	RequiredField    *string `protobuf:"bytes,81,req,name=RequiredField" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RepeatedGroup) Reset()                    { *m = GoTest_RepeatedGroup{} }
-func (m *GoTest_RepeatedGroup) String() string            { return proto.CompactTextString(m) }
-func (*GoTest_RepeatedGroup) ProtoMessage()               {}
-func (*GoTest_RepeatedGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
-
-func (m *GoTest_RepeatedGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_OptionalGroup struct {
-	RequiredField    *string `protobuf:"bytes,91,req,name=RequiredField" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_OptionalGroup) Reset()                    { *m = GoTest_OptionalGroup{} }
-func (m *GoTest_OptionalGroup) String() string            { return proto.CompactTextString(m) }
-func (*GoTest_OptionalGroup) ProtoMessage()               {}
-func (*GoTest_OptionalGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 2} }
-
-func (m *GoTest_OptionalGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-// For testing a group containing a required field.
-type GoTestRequiredGroupField struct {
-	Group            *GoTestRequiredGroupField_Group `protobuf:"group,1,req,name=Group,json=group" json:"group,omitempty"`
-	XXX_unrecognized []byte                          `json:"-"`
-}
-
-func (m *GoTestRequiredGroupField) Reset()                    { *m = GoTestRequiredGroupField{} }
-func (m *GoTestRequiredGroupField) String() string            { return proto.CompactTextString(m) }
-func (*GoTestRequiredGroupField) ProtoMessage()               {}
-func (*GoTestRequiredGroupField) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *GoTestRequiredGroupField) GetGroup() *GoTestRequiredGroupField_Group {
-	if m != nil {
-		return m.Group
-	}
-	return nil
-}
-
-type GoTestRequiredGroupField_Group struct {
-	Field            *int32 `protobuf:"varint,2,req,name=Field" json:"Field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GoTestRequiredGroupField_Group) Reset()         { *m = GoTestRequiredGroupField_Group{} }
-func (m *GoTestRequiredGroupField_Group) String() string { return proto.CompactTextString(m) }
-func (*GoTestRequiredGroupField_Group) ProtoMessage()    {}
-func (*GoTestRequiredGroupField_Group) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{3, 0}
-}
-
-func (m *GoTestRequiredGroupField_Group) GetField() int32 {
-	if m != nil && m.Field != nil {
-		return *m.Field
-	}
-	return 0
-}
-
-// For testing skipping of unrecognized fields.
-// Numbers are all big, larger than tag numbers in GoTestField,
-// the message used in the corresponding test.
-type GoSkipTest struct {
-	SkipInt32        *int32                `protobuf:"varint,11,req,name=skip_int32,json=skipInt32" json:"skip_int32,omitempty"`
-	SkipFixed32      *uint32               `protobuf:"fixed32,12,req,name=skip_fixed32,json=skipFixed32" json:"skip_fixed32,omitempty"`
-	SkipFixed64      *uint64               `protobuf:"fixed64,13,req,name=skip_fixed64,json=skipFixed64" json:"skip_fixed64,omitempty"`
-	SkipString       *string               `protobuf:"bytes,14,req,name=skip_string,json=skipString" json:"skip_string,omitempty"`
-	Skipgroup        *GoSkipTest_SkipGroup `protobuf:"group,15,req,name=SkipGroup,json=skipgroup" json:"skipgroup,omitempty"`
-	XXX_unrecognized []byte                `json:"-"`
-}
-
-func (m *GoSkipTest) Reset()                    { *m = GoSkipTest{} }
-func (m *GoSkipTest) String() string            { return proto.CompactTextString(m) }
-func (*GoSkipTest) ProtoMessage()               {}
-func (*GoSkipTest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *GoSkipTest) GetSkipInt32() int32 {
-	if m != nil && m.SkipInt32 != nil {
-		return *m.SkipInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed32() uint32 {
-	if m != nil && m.SkipFixed32 != nil {
-		return *m.SkipFixed32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed64() uint64 {
-	if m != nil && m.SkipFixed64 != nil {
-		return *m.SkipFixed64
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipString() string {
-	if m != nil && m.SkipString != nil {
-		return *m.SkipString
-	}
-	return ""
-}
-
-func (m *GoSkipTest) GetSkipgroup() *GoSkipTest_SkipGroup {
-	if m != nil {
-		return m.Skipgroup
-	}
-	return nil
-}
-
-type GoSkipTest_SkipGroup struct {
-	GroupInt32       *int32  `protobuf:"varint,16,req,name=group_int32,json=groupInt32" json:"group_int32,omitempty"`
-	GroupString      *string `protobuf:"bytes,17,req,name=group_string,json=groupString" json:"group_string,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoSkipTest_SkipGroup) Reset()                    { *m = GoSkipTest_SkipGroup{} }
-func (m *GoSkipTest_SkipGroup) String() string            { return proto.CompactTextString(m) }
-func (*GoSkipTest_SkipGroup) ProtoMessage()               {}
-func (*GoSkipTest_SkipGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
-
-func (m *GoSkipTest_SkipGroup) GetGroupInt32() int32 {
-	if m != nil && m.GroupInt32 != nil {
-		return *m.GroupInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest_SkipGroup) GetGroupString() string {
-	if m != nil && m.GroupString != nil {
-		return *m.GroupString
-	}
-	return ""
-}
-
-// For testing packed/non-packed decoder switching.
-// A serialized instance of one should be deserializable as the other.
-type NonPackedTest struct {
-	A                []int32 `protobuf:"varint,1,rep,name=a" json:"a,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NonPackedTest) Reset()                    { *m = NonPackedTest{} }
-func (m *NonPackedTest) String() string            { return proto.CompactTextString(m) }
-func (*NonPackedTest) ProtoMessage()               {}
-func (*NonPackedTest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *NonPackedTest) GetA() []int32 {
-	if m != nil {
-		return m.A
-	}
-	return nil
-}
-
-type PackedTest struct {
-	B                []int32 `protobuf:"varint,1,rep,packed,name=b" json:"b,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *PackedTest) Reset()                    { *m = PackedTest{} }
-func (m *PackedTest) String() string            { return proto.CompactTextString(m) }
-func (*PackedTest) ProtoMessage()               {}
-func (*PackedTest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *PackedTest) GetB() []int32 {
-	if m != nil {
-		return m.B
-	}
-	return nil
-}
-
-type MaxTag struct {
-	// Maximum possible tag number.
-	LastField        *string `protobuf:"bytes,536870911,opt,name=last_field,json=lastField" json:"last_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MaxTag) Reset()                    { *m = MaxTag{} }
-func (m *MaxTag) String() string            { return proto.CompactTextString(m) }
-func (*MaxTag) ProtoMessage()               {}
-func (*MaxTag) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *MaxTag) GetLastField() string {
-	if m != nil && m.LastField != nil {
-		return *m.LastField
-	}
-	return ""
-}
-
-type OldMessage struct {
-	Nested           *OldMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	Num              *int32             `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *OldMessage) Reset()                    { *m = OldMessage{} }
-func (m *OldMessage) String() string            { return proto.CompactTextString(m) }
-func (*OldMessage) ProtoMessage()               {}
-func (*OldMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *OldMessage) GetNested() *OldMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *OldMessage) GetNum() int32 {
-	if m != nil && m.Num != nil {
-		return *m.Num
-	}
-	return 0
-}
-
-type OldMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *OldMessage_Nested) Reset()                    { *m = OldMessage_Nested{} }
-func (m *OldMessage_Nested) String() string            { return proto.CompactTextString(m) }
-func (*OldMessage_Nested) ProtoMessage()               {}
-func (*OldMessage_Nested) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8, 0} }
-
-func (m *OldMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-// NewMessage is wire compatible with OldMessage;
-// imagine it as a future version.
-type NewMessage struct {
-	Nested *NewMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	// This is an int32 in OldMessage.
-	Num              *int64 `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *NewMessage) Reset()                    { *m = NewMessage{} }
-func (m *NewMessage) String() string            { return proto.CompactTextString(m) }
-func (*NewMessage) ProtoMessage()               {}
-func (*NewMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-func (m *NewMessage) GetNested() *NewMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *NewMessage) GetNum() int64 {
-	if m != nil && m.Num != nil {
-		return *m.Num
-	}
-	return 0
-}
-
-type NewMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	FoodGroup        *string `protobuf:"bytes,2,opt,name=food_group,json=foodGroup" json:"food_group,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NewMessage_Nested) Reset()                    { *m = NewMessage_Nested{} }
-func (m *NewMessage_Nested) String() string            { return proto.CompactTextString(m) }
-func (*NewMessage_Nested) ProtoMessage()               {}
-func (*NewMessage_Nested) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
-
-func (m *NewMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *NewMessage_Nested) GetFoodGroup() string {
-	if m != nil && m.FoodGroup != nil {
-		return *m.FoodGroup
-	}
-	return ""
-}
-
-type InnerMessage struct {
-	Host             *string `protobuf:"bytes,1,req,name=host" json:"host,omitempty"`
-	Port             *int32  `protobuf:"varint,2,opt,name=port,def=4000" json:"port,omitempty"`
-	Connected        *bool   `protobuf:"varint,3,opt,name=connected" json:"connected,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *InnerMessage) Reset()                    { *m = InnerMessage{} }
-func (m *InnerMessage) String() string            { return proto.CompactTextString(m) }
-func (*InnerMessage) ProtoMessage()               {}
-func (*InnerMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-const Default_InnerMessage_Port int32 = 4000
-
-func (m *InnerMessage) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-func (m *InnerMessage) GetPort() int32 {
-	if m != nil && m.Port != nil {
-		return *m.Port
-	}
-	return Default_InnerMessage_Port
-}
-
-func (m *InnerMessage) GetConnected() bool {
-	if m != nil && m.Connected != nil {
-		return *m.Connected
-	}
-	return false
-}
-
-type OtherMessage struct {
-	Key                          *int64        `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	Value                        []byte        `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-	Weight                       *float32      `protobuf:"fixed32,3,opt,name=weight" json:"weight,omitempty"`
-	Inner                        *InnerMessage `protobuf:"bytes,4,opt,name=inner" json:"inner,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OtherMessage) Reset()                    { *m = OtherMessage{} }
-func (m *OtherMessage) String() string            { return proto.CompactTextString(m) }
-func (*OtherMessage) ProtoMessage()               {}
-func (*OtherMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-var extRange_OtherMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*OtherMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OtherMessage
-}
-
-func (m *OtherMessage) GetKey() int64 {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetValue() []byte {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *OtherMessage) GetWeight() float32 {
-	if m != nil && m.Weight != nil {
-		return *m.Weight
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-type RequiredInnerMessage struct {
-	LeoFinallyWonAnOscar *InnerMessage `protobuf:"bytes,1,req,name=leo_finally_won_an_oscar,json=leoFinallyWonAnOscar" json:"leo_finally_won_an_oscar,omitempty"`
-	XXX_unrecognized     []byte        `json:"-"`
-}
-
-func (m *RequiredInnerMessage) Reset()                    { *m = RequiredInnerMessage{} }
-func (m *RequiredInnerMessage) String() string            { return proto.CompactTextString(m) }
-func (*RequiredInnerMessage) ProtoMessage()               {}
-func (*RequiredInnerMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-func (m *RequiredInnerMessage) GetLeoFinallyWonAnOscar() *InnerMessage {
-	if m != nil {
-		return m.LeoFinallyWonAnOscar
-	}
-	return nil
-}
-
-type MyMessage struct {
-	Count          *int32                `protobuf:"varint,1,req,name=count" json:"count,omitempty"`
-	Name           *string               `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	Quote          *string               `protobuf:"bytes,3,opt,name=quote" json:"quote,omitempty"`
-	Pet            []string              `protobuf:"bytes,4,rep,name=pet" json:"pet,omitempty"`
-	Inner          *InnerMessage         `protobuf:"bytes,5,opt,name=inner" json:"inner,omitempty"`
-	Others         []*OtherMessage       `protobuf:"bytes,6,rep,name=others" json:"others,omitempty"`
-	WeMustGoDeeper *RequiredInnerMessage `protobuf:"bytes,13,opt,name=we_must_go_deeper,json=weMustGoDeeper" json:"we_must_go_deeper,omitempty"`
-	RepInner       []*InnerMessage       `protobuf:"bytes,12,rep,name=rep_inner,json=repInner" json:"rep_inner,omitempty"`
-	Bikeshed       *MyMessage_Color      `protobuf:"varint,7,opt,name=bikeshed,enum=testdata.MyMessage_Color" json:"bikeshed,omitempty"`
-	Somegroup      *MyMessage_SomeGroup  `protobuf:"group,8,opt,name=SomeGroup,json=somegroup" json:"somegroup,omitempty"`
-	// This field becomes [][]byte in the generated code.
-	RepBytes                     [][]byte `protobuf:"bytes,10,rep,name=rep_bytes,json=repBytes" json:"rep_bytes,omitempty"`
-	Bigfloat                     *float64 `protobuf:"fixed64,11,opt,name=bigfloat" json:"bigfloat,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *MyMessage) Reset()                    { *m = MyMessage{} }
-func (m *MyMessage) String() string            { return proto.CompactTextString(m) }
-func (*MyMessage) ProtoMessage()               {}
-func (*MyMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
-
-var extRange_MyMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*MyMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessage
-}
-
-func (m *MyMessage) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *MyMessage) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MyMessage) GetQuote() string {
-	if m != nil && m.Quote != nil {
-		return *m.Quote
-	}
-	return ""
-}
-
-func (m *MyMessage) GetPet() []string {
-	if m != nil {
-		return m.Pet
-	}
-	return nil
-}
-
-func (m *MyMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetOthers() []*OtherMessage {
-	if m != nil {
-		return m.Others
-	}
-	return nil
-}
-
-func (m *MyMessage) GetWeMustGoDeeper() *RequiredInnerMessage {
-	if m != nil {
-		return m.WeMustGoDeeper
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepInner() []*InnerMessage {
-	if m != nil {
-		return m.RepInner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBikeshed() MyMessage_Color {
-	if m != nil && m.Bikeshed != nil {
-		return *m.Bikeshed
-	}
-	return MyMessage_RED
-}
-
-func (m *MyMessage) GetSomegroup() *MyMessage_SomeGroup {
-	if m != nil {
-		return m.Somegroup
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepBytes() [][]byte {
-	if m != nil {
-		return m.RepBytes
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBigfloat() float64 {
-	if m != nil && m.Bigfloat != nil {
-		return *m.Bigfloat
-	}
-	return 0
-}
-
-type MyMessage_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field,json=groupField" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *MyMessage_SomeGroup) Reset()                    { *m = MyMessage_SomeGroup{} }
-func (m *MyMessage_SomeGroup) String() string            { return proto.CompactTextString(m) }
-func (*MyMessage_SomeGroup) ProtoMessage()               {}
-func (*MyMessage_SomeGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13, 0} }
-
-func (m *MyMessage_SomeGroup) GetGroupField() int32 {
-	if m != nil && m.GroupField != nil {
-		return *m.GroupField
-	}
-	return 0
-}
-
-type Ext struct {
-	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Ext) Reset()                    { *m = Ext{} }
-func (m *Ext) String() string            { return proto.CompactTextString(m) }
-func (*Ext) ProtoMessage()               {}
-func (*Ext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
-
-func (m *Ext) GetData() string {
-	if m != nil && m.Data != nil {
-		return *m.Data
-	}
-	return ""
-}
-
-var E_Ext_More = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*Ext)(nil),
-	Field:         103,
-	Name:          "testdata.Ext.more",
-	Tag:           "bytes,103,opt,name=more",
-	Filename:      "test.proto",
-}
-
-var E_Ext_Text = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         104,
-	Name:          "testdata.Ext.text",
-	Tag:           "bytes,104,opt,name=text",
-	Filename:      "test.proto",
-}
-
-var E_Ext_Number = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         105,
-	Name:          "testdata.Ext.number",
-	Tag:           "varint,105,opt,name=number",
-	Filename:      "test.proto",
-}
-
-type ComplexExtension struct {
-	First            *int32  `protobuf:"varint,1,opt,name=first" json:"first,omitempty"`
-	Second           *int32  `protobuf:"varint,2,opt,name=second" json:"second,omitempty"`
-	Third            []int32 `protobuf:"varint,3,rep,name=third" json:"third,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *ComplexExtension) Reset()                    { *m = ComplexExtension{} }
-func (m *ComplexExtension) String() string            { return proto.CompactTextString(m) }
-func (*ComplexExtension) ProtoMessage()               {}
-func (*ComplexExtension) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
-
-func (m *ComplexExtension) GetFirst() int32 {
-	if m != nil && m.First != nil {
-		return *m.First
-	}
-	return 0
-}
-
-func (m *ComplexExtension) GetSecond() int32 {
-	if m != nil && m.Second != nil {
-		return *m.Second
-	}
-	return 0
-}
-
-func (m *ComplexExtension) GetThird() []int32 {
-	if m != nil {
-		return m.Third
-	}
-	return nil
-}
-
-type DefaultsMessage struct {
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *DefaultsMessage) Reset()                    { *m = DefaultsMessage{} }
-func (m *DefaultsMessage) String() string            { return proto.CompactTextString(m) }
-func (*DefaultsMessage) ProtoMessage()               {}
-func (*DefaultsMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
-
-var extRange_DefaultsMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*DefaultsMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_DefaultsMessage
-}
-
-type MyMessageSet struct {
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *MyMessageSet) Reset()                    { *m = MyMessageSet{} }
-func (m *MyMessageSet) String() string            { return proto.CompactTextString(m) }
-func (*MyMessageSet) ProtoMessage()               {}
-func (*MyMessageSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
-
-func (m *MyMessageSet) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(&m.XXX_InternalExtensions)
-}
-func (m *MyMessageSet) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)
-}
-func (m *MyMessageSet) MarshalJSON() ([]byte, error) {
-	return proto.MarshalMessageSetJSON(&m.XXX_InternalExtensions)
-}
-func (m *MyMessageSet) UnmarshalJSON(buf []byte) error {
-	return proto.UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)
-}
-
-// ensure MyMessageSet satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*MyMessageSet)(nil)
-var _ proto.Unmarshaler = (*MyMessageSet)(nil)
-
-var extRange_MyMessageSet = []proto.ExtensionRange{
-	{100, 2147483646},
-}
-
-func (*MyMessageSet) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessageSet
-}
-
-type Empty struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Empty) Reset()                    { *m = Empty{} }
-func (m *Empty) String() string            { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()               {}
-func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
-
-type MessageList struct {
-	Message          []*MessageList_Message `protobuf:"group,1,rep,name=Message,json=message" json:"message,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *MessageList) Reset()                    { *m = MessageList{} }
-func (m *MessageList) String() string            { return proto.CompactTextString(m) }
-func (*MessageList) ProtoMessage()               {}
-func (*MessageList) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
-
-func (m *MessageList) GetMessage() []*MessageList_Message {
-	if m != nil {
-		return m.Message
-	}
-	return nil
-}
-
-type MessageList_Message struct {
-	Name             *string `protobuf:"bytes,2,req,name=name" json:"name,omitempty"`
-	Count            *int32  `protobuf:"varint,3,req,name=count" json:"count,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MessageList_Message) Reset()                    { *m = MessageList_Message{} }
-func (m *MessageList_Message) String() string            { return proto.CompactTextString(m) }
-func (*MessageList_Message) ProtoMessage()               {}
-func (*MessageList_Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19, 0} }
-
-func (m *MessageList_Message) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MessageList_Message) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-type Strings struct {
-	StringField      *string `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"`
-	BytesField       []byte  `protobuf:"bytes,2,opt,name=bytes_field,json=bytesField" json:"bytes_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Strings) Reset()                    { *m = Strings{} }
-func (m *Strings) String() string            { return proto.CompactTextString(m) }
-func (*Strings) ProtoMessage()               {}
-func (*Strings) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
-
-func (m *Strings) GetStringField() string {
-	if m != nil && m.StringField != nil {
-		return *m.StringField
-	}
-	return ""
-}
-
-func (m *Strings) GetBytesField() []byte {
-	if m != nil {
-		return m.BytesField
-	}
-	return nil
-}
-
-type Defaults struct {
-	// Default-valued fields of all basic types.
-	// Same as GoTest, but copied here to make testing easier.
-	F_Bool    *bool           `protobuf:"varint,1,opt,name=F_Bool,json=FBool,def=1" json:"F_Bool,omitempty"`
-	F_Int32   *int32          `protobuf:"varint,2,opt,name=F_Int32,json=FInt32,def=32" json:"F_Int32,omitempty"`
-	F_Int64   *int64          `protobuf:"varint,3,opt,name=F_Int64,json=FInt64,def=64" json:"F_Int64,omitempty"`
-	F_Fixed32 *uint32         `protobuf:"fixed32,4,opt,name=F_Fixed32,json=FFixed32,def=320" json:"F_Fixed32,omitempty"`
-	F_Fixed64 *uint64         `protobuf:"fixed64,5,opt,name=F_Fixed64,json=FFixed64,def=640" json:"F_Fixed64,omitempty"`
-	F_Uint32  *uint32         `protobuf:"varint,6,opt,name=F_Uint32,json=FUint32,def=3200" json:"F_Uint32,omitempty"`
-	F_Uint64  *uint64         `protobuf:"varint,7,opt,name=F_Uint64,json=FUint64,def=6400" json:"F_Uint64,omitempty"`
-	F_Float   *float32        `protobuf:"fixed32,8,opt,name=F_Float,json=FFloat,def=314159" json:"F_Float,omitempty"`
-	F_Double  *float64        `protobuf:"fixed64,9,opt,name=F_Double,json=FDouble,def=271828" json:"F_Double,omitempty"`
-	F_String  *string         `protobuf:"bytes,10,opt,name=F_String,json=FString,def=hello, \"world!\"\n" json:"F_String,omitempty"`
-	F_Bytes   []byte          `protobuf:"bytes,11,opt,name=F_Bytes,json=FBytes,def=Bignose" json:"F_Bytes,omitempty"`
-	F_Sint32  *int32          `protobuf:"zigzag32,12,opt,name=F_Sint32,json=FSint32,def=-32" json:"F_Sint32,omitempty"`
-	F_Sint64  *int64          `protobuf:"zigzag64,13,opt,name=F_Sint64,json=FSint64,def=-64" json:"F_Sint64,omitempty"`
-	F_Enum    *Defaults_Color `protobuf:"varint,14,opt,name=F_Enum,json=FEnum,enum=testdata.Defaults_Color,def=1" json:"F_Enum,omitempty"`
-	// More fields with crazy defaults.
-	F_Pinf *float32 `protobuf:"fixed32,15,opt,name=F_Pinf,json=FPinf,def=inf" json:"F_Pinf,omitempty"`
-	F_Ninf *float32 `protobuf:"fixed32,16,opt,name=F_Ninf,json=FNinf,def=-inf" json:"F_Ninf,omitempty"`
-	F_Nan  *float32 `protobuf:"fixed32,17,opt,name=F_Nan,json=FNan,def=nan" json:"F_Nan,omitempty"`
-	// Sub-message.
-	Sub *SubDefaults `protobuf:"bytes,18,opt,name=sub" json:"sub,omitempty"`
-	// Redundant but explicit defaults.
-	StrZero          *string `protobuf:"bytes,19,opt,name=str_zero,json=strZero,def=" json:"str_zero,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Defaults) Reset()                    { *m = Defaults{} }
-func (m *Defaults) String() string            { return proto.CompactTextString(m) }
-func (*Defaults) ProtoMessage()               {}
-func (*Defaults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
-
-const Default_Defaults_F_Bool bool = true
-const Default_Defaults_F_Int32 int32 = 32
-const Default_Defaults_F_Int64 int64 = 64
-const Default_Defaults_F_Fixed32 uint32 = 320
-const Default_Defaults_F_Fixed64 uint64 = 640
-const Default_Defaults_F_Uint32 uint32 = 3200
-const Default_Defaults_F_Uint64 uint64 = 6400
-const Default_Defaults_F_Float float32 = 314159
-const Default_Defaults_F_Double float64 = 271828
-const Default_Defaults_F_String string = "hello, \"world!\"\n"
-
-var Default_Defaults_F_Bytes []byte = []byte("Bignose")
-
-const Default_Defaults_F_Sint32 int32 = -32
-const Default_Defaults_F_Sint64 int64 = -64
-const Default_Defaults_F_Enum Defaults_Color = Defaults_GREEN
-
-var Default_Defaults_F_Pinf float32 = float32(math.Inf(1))
-var Default_Defaults_F_Ninf float32 = float32(math.Inf(-1))
-var Default_Defaults_F_Nan float32 = float32(math.NaN())
-
-func (m *Defaults) GetF_Bool() bool {
-	if m != nil && m.F_Bool != nil {
-		return *m.F_Bool
-	}
-	return Default_Defaults_F_Bool
-}
-
-func (m *Defaults) GetF_Int32() int32 {
-	if m != nil && m.F_Int32 != nil {
-		return *m.F_Int32
-	}
-	return Default_Defaults_F_Int32
-}
-
-func (m *Defaults) GetF_Int64() int64 {
-	if m != nil && m.F_Int64 != nil {
-		return *m.F_Int64
-	}
-	return Default_Defaults_F_Int64
-}
-
-func (m *Defaults) GetF_Fixed32() uint32 {
-	if m != nil && m.F_Fixed32 != nil {
-		return *m.F_Fixed32
-	}
-	return Default_Defaults_F_Fixed32
-}
-
-func (m *Defaults) GetF_Fixed64() uint64 {
-	if m != nil && m.F_Fixed64 != nil {
-		return *m.F_Fixed64
-	}
-	return Default_Defaults_F_Fixed64
-}
-
-func (m *Defaults) GetF_Uint32() uint32 {
-	if m != nil && m.F_Uint32 != nil {
-		return *m.F_Uint32
-	}
-	return Default_Defaults_F_Uint32
-}
-
-func (m *Defaults) GetF_Uint64() uint64 {
-	if m != nil && m.F_Uint64 != nil {
-		return *m.F_Uint64
-	}
-	return Default_Defaults_F_Uint64
-}
-
-func (m *Defaults) GetF_Float() float32 {
-	if m != nil && m.F_Float != nil {
-		return *m.F_Float
-	}
-	return Default_Defaults_F_Float
-}
-
-func (m *Defaults) GetF_Double() float64 {
-	if m != nil && m.F_Double != nil {
-		return *m.F_Double
-	}
-	return Default_Defaults_F_Double
-}
-
-func (m *Defaults) GetF_String() string {
-	if m != nil && m.F_String != nil {
-		return *m.F_String
-	}
-	return Default_Defaults_F_String
-}
-
-func (m *Defaults) GetF_Bytes() []byte {
-	if m != nil && m.F_Bytes != nil {
-		return m.F_Bytes
-	}
-	return append([]byte(nil), Default_Defaults_F_Bytes...)
-}
-
-func (m *Defaults) GetF_Sint32() int32 {
-	if m != nil && m.F_Sint32 != nil {
-		return *m.F_Sint32
-	}
-	return Default_Defaults_F_Sint32
-}
-
-func (m *Defaults) GetF_Sint64() int64 {
-	if m != nil && m.F_Sint64 != nil {
-		return *m.F_Sint64
-	}
-	return Default_Defaults_F_Sint64
-}
-
-func (m *Defaults) GetF_Enum() Defaults_Color {
-	if m != nil && m.F_Enum != nil {
-		return *m.F_Enum
-	}
-	return Default_Defaults_F_Enum
-}
-
-func (m *Defaults) GetF_Pinf() float32 {
-	if m != nil && m.F_Pinf != nil {
-		return *m.F_Pinf
-	}
-	return Default_Defaults_F_Pinf
-}
-
-func (m *Defaults) GetF_Ninf() float32 {
-	if m != nil && m.F_Ninf != nil {
-		return *m.F_Ninf
-	}
-	return Default_Defaults_F_Ninf
-}
-
-func (m *Defaults) GetF_Nan() float32 {
-	if m != nil && m.F_Nan != nil {
-		return *m.F_Nan
-	}
-	return Default_Defaults_F_Nan
-}
-
-func (m *Defaults) GetSub() *SubDefaults {
-	if m != nil {
-		return m.Sub
-	}
-	return nil
-}
-
-func (m *Defaults) GetStrZero() string {
-	if m != nil && m.StrZero != nil {
-		return *m.StrZero
-	}
-	return ""
-}
-
-type SubDefaults struct {
-	N                *int64 `protobuf:"varint,1,opt,name=n,def=7" json:"n,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SubDefaults) Reset()                    { *m = SubDefaults{} }
-func (m *SubDefaults) String() string            { return proto.CompactTextString(m) }
-func (*SubDefaults) ProtoMessage()               {}
-func (*SubDefaults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
-
-const Default_SubDefaults_N int64 = 7
-
-func (m *SubDefaults) GetN() int64 {
-	if m != nil && m.N != nil {
-		return *m.N
-	}
-	return Default_SubDefaults_N
-}
-
-type RepeatedEnum struct {
-	Color            []RepeatedEnum_Color `protobuf:"varint,1,rep,name=color,enum=testdata.RepeatedEnum_Color" json:"color,omitempty"`
-	XXX_unrecognized []byte               `json:"-"`
-}
-
-func (m *RepeatedEnum) Reset()                    { *m = RepeatedEnum{} }
-func (m *RepeatedEnum) String() string            { return proto.CompactTextString(m) }
-func (*RepeatedEnum) ProtoMessage()               {}
-func (*RepeatedEnum) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
-
-func (m *RepeatedEnum) GetColor() []RepeatedEnum_Color {
-	if m != nil {
-		return m.Color
-	}
-	return nil
-}
-
-type MoreRepeated struct {
-	Bools            []bool   `protobuf:"varint,1,rep,name=bools" json:"bools,omitempty"`
-	BoolsPacked      []bool   `protobuf:"varint,2,rep,packed,name=bools_packed,json=boolsPacked" json:"bools_packed,omitempty"`
-	Ints             []int32  `protobuf:"varint,3,rep,name=ints" json:"ints,omitempty"`
-	IntsPacked       []int32  `protobuf:"varint,4,rep,packed,name=ints_packed,json=intsPacked" json:"ints_packed,omitempty"`
-	Int64SPacked     []int64  `protobuf:"varint,7,rep,packed,name=int64s_packed,json=int64sPacked" json:"int64s_packed,omitempty"`
-	Strings          []string `protobuf:"bytes,5,rep,name=strings" json:"strings,omitempty"`
-	Fixeds           []uint32 `protobuf:"fixed32,6,rep,name=fixeds" json:"fixeds,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *MoreRepeated) Reset()                    { *m = MoreRepeated{} }
-func (m *MoreRepeated) String() string            { return proto.CompactTextString(m) }
-func (*MoreRepeated) ProtoMessage()               {}
-func (*MoreRepeated) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
-
-func (m *MoreRepeated) GetBools() []bool {
-	if m != nil {
-		return m.Bools
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetBoolsPacked() []bool {
-	if m != nil {
-		return m.BoolsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInts() []int32 {
-	if m != nil {
-		return m.Ints
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetIntsPacked() []int32 {
-	if m != nil {
-		return m.IntsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInt64SPacked() []int64 {
-	if m != nil {
-		return m.Int64SPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetStrings() []string {
-	if m != nil {
-		return m.Strings
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetFixeds() []uint32 {
-	if m != nil {
-		return m.Fixeds
-	}
-	return nil
-}
-
-type GroupOld struct {
-	G                *GroupOld_G `protobuf:"group,101,opt,name=G,json=g" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupOld) Reset()                    { *m = GroupOld{} }
-func (m *GroupOld) String() string            { return proto.CompactTextString(m) }
-func (*GroupOld) ProtoMessage()               {}
-func (*GroupOld) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
-
-func (m *GroupOld) GetG() *GroupOld_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupOld_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupOld_G) Reset()                    { *m = GroupOld_G{} }
-func (m *GroupOld_G) String() string            { return proto.CompactTextString(m) }
-func (*GroupOld_G) ProtoMessage()               {}
-func (*GroupOld_G) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25, 0} }
-
-func (m *GroupOld_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-type GroupNew struct {
-	G                *GroupNew_G `protobuf:"group,101,opt,name=G,json=g" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupNew) Reset()                    { *m = GroupNew{} }
-func (m *GroupNew) String() string            { return proto.CompactTextString(m) }
-func (*GroupNew) ProtoMessage()               {}
-func (*GroupNew) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
-
-func (m *GroupNew) GetG() *GroupNew_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupNew_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	Y                *int32 `protobuf:"varint,3,opt,name=y" json:"y,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupNew_G) Reset()                    { *m = GroupNew_G{} }
-func (m *GroupNew_G) String() string            { return proto.CompactTextString(m) }
-func (*GroupNew_G) ProtoMessage()               {}
-func (*GroupNew_G) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26, 0} }
-
-func (m *GroupNew_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-func (m *GroupNew_G) GetY() int32 {
-	if m != nil && m.Y != nil {
-		return *m.Y
-	}
-	return 0
-}
-
-type FloatingPoint struct {
-	F                *float64 `protobuf:"fixed64,1,req,name=f" json:"f,omitempty"`
-	Exact            *bool    `protobuf:"varint,2,opt,name=exact" json:"exact,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *FloatingPoint) Reset()                    { *m = FloatingPoint{} }
-func (m *FloatingPoint) String() string            { return proto.CompactTextString(m) }
-func (*FloatingPoint) ProtoMessage()               {}
-func (*FloatingPoint) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
-
-func (m *FloatingPoint) GetF() float64 {
-	if m != nil && m.F != nil {
-		return *m.F
-	}
-	return 0
-}
-
-func (m *FloatingPoint) GetExact() bool {
-	if m != nil && m.Exact != nil {
-		return *m.Exact
-	}
-	return false
-}
-
-type MessageWithMap struct {
-	NameMapping      map[int32]string         `protobuf:"bytes,1,rep,name=name_mapping,json=nameMapping" json:"name_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MsgMapping       map[int64]*FloatingPoint `protobuf:"bytes,2,rep,name=msg_mapping,json=msgMapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	ByteMapping      map[bool][]byte          `protobuf:"bytes,3,rep,name=byte_mapping,json=byteMapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	StrToStr         map[string]string        `protobuf:"bytes,4,rep,name=str_to_str,json=strToStr" json:"str_to_str,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	XXX_unrecognized []byte                   `json:"-"`
-}
-
-func (m *MessageWithMap) Reset()                    { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string            { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()               {}
-func (*MessageWithMap) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
-
-func (m *MessageWithMap) GetNameMapping() map[int32]string {
-	if m != nil {
-		return m.NameMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetMsgMapping() map[int64]*FloatingPoint {
-	if m != nil {
-		return m.MsgMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
-	if m != nil {
-		return m.ByteMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetStrToStr() map[string]string {
-	if m != nil {
-		return m.StrToStr
-	}
-	return nil
-}
-
-type Oneof struct {
-	// Types that are valid to be assigned to Union:
-	//	*Oneof_F_Bool
-	//	*Oneof_F_Int32
-	//	*Oneof_F_Int64
-	//	*Oneof_F_Fixed32
-	//	*Oneof_F_Fixed64
-	//	*Oneof_F_Uint32
-	//	*Oneof_F_Uint64
-	//	*Oneof_F_Float
-	//	*Oneof_F_Double
-	//	*Oneof_F_String
-	//	*Oneof_F_Bytes
-	//	*Oneof_F_Sint32
-	//	*Oneof_F_Sint64
-	//	*Oneof_F_Enum
-	//	*Oneof_F_Message
-	//	*Oneof_FGroup
-	//	*Oneof_F_Largest_Tag
-	Union isOneof_Union `protobuf_oneof:"union"`
-	// Types that are valid to be assigned to Tormato:
-	//	*Oneof_Value
-	Tormato          isOneof_Tormato `protobuf_oneof:"tormato"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *Oneof) Reset()                    { *m = Oneof{} }
-func (m *Oneof) String() string            { return proto.CompactTextString(m) }
-func (*Oneof) ProtoMessage()               {}
-func (*Oneof) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
-
-type isOneof_Union interface {
-	isOneof_Union()
-}
-type isOneof_Tormato interface {
-	isOneof_Tormato()
-}
-
-type Oneof_F_Bool struct {
-	F_Bool bool `protobuf:"varint,1,opt,name=F_Bool,json=FBool,oneof"`
-}
-type Oneof_F_Int32 struct {
-	F_Int32 int32 `protobuf:"varint,2,opt,name=F_Int32,json=FInt32,oneof"`
-}
-type Oneof_F_Int64 struct {
-	F_Int64 int64 `protobuf:"varint,3,opt,name=F_Int64,json=FInt64,oneof"`
-}
-type Oneof_F_Fixed32 struct {
-	F_Fixed32 uint32 `protobuf:"fixed32,4,opt,name=F_Fixed32,json=FFixed32,oneof"`
-}
-type Oneof_F_Fixed64 struct {
-	F_Fixed64 uint64 `protobuf:"fixed64,5,opt,name=F_Fixed64,json=FFixed64,oneof"`
-}
-type Oneof_F_Uint32 struct {
-	F_Uint32 uint32 `protobuf:"varint,6,opt,name=F_Uint32,json=FUint32,oneof"`
-}
-type Oneof_F_Uint64 struct {
-	F_Uint64 uint64 `protobuf:"varint,7,opt,name=F_Uint64,json=FUint64,oneof"`
-}
-type Oneof_F_Float struct {
-	F_Float float32 `protobuf:"fixed32,8,opt,name=F_Float,json=FFloat,oneof"`
-}
-type Oneof_F_Double struct {
-	F_Double float64 `protobuf:"fixed64,9,opt,name=F_Double,json=FDouble,oneof"`
-}
-type Oneof_F_String struct {
-	F_String string `protobuf:"bytes,10,opt,name=F_String,json=FString,oneof"`
-}
-type Oneof_F_Bytes struct {
-	F_Bytes []byte `protobuf:"bytes,11,opt,name=F_Bytes,json=FBytes,oneof"`
-}
-type Oneof_F_Sint32 struct {
-	F_Sint32 int32 `protobuf:"zigzag32,12,opt,name=F_Sint32,json=FSint32,oneof"`
-}
-type Oneof_F_Sint64 struct {
-	F_Sint64 int64 `protobuf:"zigzag64,13,opt,name=F_Sint64,json=FSint64,oneof"`
-}
-type Oneof_F_Enum struct {
-	F_Enum MyMessage_Color `protobuf:"varint,14,opt,name=F_Enum,json=FEnum,enum=testdata.MyMessage_Color,oneof"`
-}
-type Oneof_F_Message struct {
-	F_Message *GoTestField `protobuf:"bytes,15,opt,name=F_Message,json=FMessage,oneof"`
-}
-type Oneof_FGroup struct {
-	FGroup *Oneof_F_Group `protobuf:"group,16,opt,name=F_Group,json=fGroup,oneof"`
-}
-type Oneof_F_Largest_Tag struct {
-	F_Largest_Tag int32 `protobuf:"varint,536870911,opt,name=F_Largest_Tag,json=FLargestTag,oneof"`
-}
-type Oneof_Value struct {
-	Value int32 `protobuf:"varint,100,opt,name=value,oneof"`
-}
-
-func (*Oneof_F_Bool) isOneof_Union()        {}
-func (*Oneof_F_Int32) isOneof_Union()       {}
-func (*Oneof_F_Int64) isOneof_Union()       {}
-func (*Oneof_F_Fixed32) isOneof_Union()     {}
-func (*Oneof_F_Fixed64) isOneof_Union()     {}
-func (*Oneof_F_Uint32) isOneof_Union()      {}
-func (*Oneof_F_Uint64) isOneof_Union()      {}
-func (*Oneof_F_Float) isOneof_Union()       {}
-func (*Oneof_F_Double) isOneof_Union()      {}
-func (*Oneof_F_String) isOneof_Union()      {}
-func (*Oneof_F_Bytes) isOneof_Union()       {}
-func (*Oneof_F_Sint32) isOneof_Union()      {}
-func (*Oneof_F_Sint64) isOneof_Union()      {}
-func (*Oneof_F_Enum) isOneof_Union()        {}
-func (*Oneof_F_Message) isOneof_Union()     {}
-func (*Oneof_FGroup) isOneof_Union()        {}
-func (*Oneof_F_Largest_Tag) isOneof_Union() {}
-func (*Oneof_Value) isOneof_Tormato()       {}
-
-func (m *Oneof) GetUnion() isOneof_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-func (m *Oneof) GetTormato() isOneof_Tormato {
-	if m != nil {
-		return m.Tormato
-	}
-	return nil
-}
-
-func (m *Oneof) GetF_Bool() bool {
-	if x, ok := m.GetUnion().(*Oneof_F_Bool); ok {
-		return x.F_Bool
-	}
-	return false
-}
-
-func (m *Oneof) GetF_Int32() int32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Int32); ok {
-		return x.F_Int32
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Int64() int64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Int64); ok {
-		return x.F_Int64
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Fixed32() uint32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Fixed32); ok {
-		return x.F_Fixed32
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Fixed64() uint64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Fixed64); ok {
-		return x.F_Fixed64
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Uint32() uint32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Uint32); ok {
-		return x.F_Uint32
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Uint64() uint64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Uint64); ok {
-		return x.F_Uint64
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Float() float32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Float); ok {
-		return x.F_Float
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Double() float64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Double); ok {
-		return x.F_Double
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_String() string {
-	if x, ok := m.GetUnion().(*Oneof_F_String); ok {
-		return x.F_String
-	}
-	return ""
-}
-
-func (m *Oneof) GetF_Bytes() []byte {
-	if x, ok := m.GetUnion().(*Oneof_F_Bytes); ok {
-		return x.F_Bytes
-	}
-	return nil
-}
-
-func (m *Oneof) GetF_Sint32() int32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Sint32); ok {
-		return x.F_Sint32
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Sint64() int64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Sint64); ok {
-		return x.F_Sint64
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Enum() MyMessage_Color {
-	if x, ok := m.GetUnion().(*Oneof_F_Enum); ok {
-		return x.F_Enum
-	}
-	return MyMessage_RED
-}
-
-func (m *Oneof) GetF_Message() *GoTestField {
-	if x, ok := m.GetUnion().(*Oneof_F_Message); ok {
-		return x.F_Message
-	}
-	return nil
-}
-
-func (m *Oneof) GetFGroup() *Oneof_F_Group {
-	if x, ok := m.GetUnion().(*Oneof_FGroup); ok {
-		return x.FGroup
-	}
-	return nil
-}
-
-func (m *Oneof) GetF_Largest_Tag() int32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Largest_Tag); ok {
-		return x.F_Largest_Tag
-	}
-	return 0
-}
-
-func (m *Oneof) GetValue() int32 {
-	if x, ok := m.GetTormato().(*Oneof_Value); ok {
-		return x.Value
-	}
-	return 0
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Oneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Oneof_OneofMarshaler, _Oneof_OneofUnmarshaler, _Oneof_OneofSizer, []interface{}{
-		(*Oneof_F_Bool)(nil),
-		(*Oneof_F_Int32)(nil),
-		(*Oneof_F_Int64)(nil),
-		(*Oneof_F_Fixed32)(nil),
-		(*Oneof_F_Fixed64)(nil),
-		(*Oneof_F_Uint32)(nil),
-		(*Oneof_F_Uint64)(nil),
-		(*Oneof_F_Float)(nil),
-		(*Oneof_F_Double)(nil),
-		(*Oneof_F_String)(nil),
-		(*Oneof_F_Bytes)(nil),
-		(*Oneof_F_Sint32)(nil),
-		(*Oneof_F_Sint64)(nil),
-		(*Oneof_F_Enum)(nil),
-		(*Oneof_F_Message)(nil),
-		(*Oneof_FGroup)(nil),
-		(*Oneof_F_Largest_Tag)(nil),
-		(*Oneof_Value)(nil),
-	}
-}
-
-func _Oneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Oneof)
-	// union
-	switch x := m.Union.(type) {
-	case *Oneof_F_Bool:
-		t := uint64(0)
-		if x.F_Bool {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Oneof_F_Int32:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Int32))
-	case *Oneof_F_Int64:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Int64))
-	case *Oneof_F_Fixed32:
-		b.EncodeVarint(4<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.F_Fixed32))
-	case *Oneof_F_Fixed64:
-		b.EncodeVarint(5<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.F_Fixed64))
-	case *Oneof_F_Uint32:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Uint32))
-	case *Oneof_F_Uint64:
-		b.EncodeVarint(7<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Uint64))
-	case *Oneof_F_Float:
-		b.EncodeVarint(8<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.F_Float)))
-	case *Oneof_F_Double:
-		b.EncodeVarint(9<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.F_Double))
-	case *Oneof_F_String:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.F_String)
-	case *Oneof_F_Bytes:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.F_Bytes)
-	case *Oneof_F_Sint32:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.F_Sint32))
-	case *Oneof_F_Sint64:
-		b.EncodeVarint(13<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.F_Sint64))
-	case *Oneof_F_Enum:
-		b.EncodeVarint(14<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Enum))
-	case *Oneof_F_Message:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.F_Message); err != nil {
-			return err
-		}
-	case *Oneof_FGroup:
-		b.EncodeVarint(16<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.FGroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(16<<3 | proto.WireEndGroup)
-	case *Oneof_F_Largest_Tag:
-		b.EncodeVarint(536870911<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Largest_Tag))
-	case nil:
-	default:
-		return fmt.Errorf("Oneof.Union has unexpected type %T", x)
-	}
-	// tormato
-	switch x := m.Tormato.(type) {
-	case *Oneof_Value:
-		b.EncodeVarint(100<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Value))
-	case nil:
-	default:
-		return fmt.Errorf("Oneof.Tormato has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Oneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Oneof)
-	switch tag {
-	case 1: // union.F_Bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Bool{x != 0}
-		return true, err
-	case 2: // union.F_Int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Int32{int32(x)}
-		return true, err
-	case 3: // union.F_Int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Int64{int64(x)}
-		return true, err
-	case 4: // union.F_Fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.Union = &Oneof_F_Fixed32{uint32(x)}
-		return true, err
-	case 5: // union.F_Fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Oneof_F_Fixed64{x}
-		return true, err
-	case 6: // union.F_Uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Uint32{uint32(x)}
-		return true, err
-	case 7: // union.F_Uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Uint64{x}
-		return true, err
-	case 8: // union.F_Float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.Union = &Oneof_F_Float{math.Float32frombits(uint32(x))}
-		return true, err
-	case 9: // union.F_Double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Oneof_F_Double{math.Float64frombits(x)}
-		return true, err
-	case 10: // union.F_String
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &Oneof_F_String{x}
-		return true, err
-	case 11: // union.F_Bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Union = &Oneof_F_Bytes{x}
-		return true, err
-	case 12: // union.F_Sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.Union = &Oneof_F_Sint32{int32(x)}
-		return true, err
-	case 13: // union.F_Sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.Union = &Oneof_F_Sint64{int64(x)}
-		return true, err
-	case 14: // union.F_Enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Enum{MyMessage_Color(x)}
-		return true, err
-	case 15: // union.F_Message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GoTestField)
-		err := b.DecodeMessage(msg)
-		m.Union = &Oneof_F_Message{msg}
-		return true, err
-	case 16: // union.f_group
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Oneof_F_Group)
-		err := b.DecodeGroup(msg)
-		m.Union = &Oneof_FGroup{msg}
-		return true, err
-	case 536870911: // union.F_Largest_Tag
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Largest_Tag{int32(x)}
-		return true, err
-	case 100: // tormato.value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Tormato = &Oneof_Value{int32(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Oneof_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Oneof)
-	// union
-	switch x := m.Union.(type) {
-	case *Oneof_F_Bool:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
-		n += 1
-	case *Oneof_F_Int32:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Int32))
-	case *Oneof_F_Int64:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Int64))
-	case *Oneof_F_Fixed32:
-		n += proto.SizeVarint(4<<3 | proto.WireFixed32)
-		n += 4
-	case *Oneof_F_Fixed64:
-		n += proto.SizeVarint(5<<3 | proto.WireFixed64)
-		n += 8
-	case *Oneof_F_Uint32:
-		n += proto.SizeVarint(6<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Uint32))
-	case *Oneof_F_Uint64:
-		n += proto.SizeVarint(7<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Uint64))
-	case *Oneof_F_Float:
-		n += proto.SizeVarint(8<<3 | proto.WireFixed32)
-		n += 4
-	case *Oneof_F_Double:
-		n += proto.SizeVarint(9<<3 | proto.WireFixed64)
-		n += 8
-	case *Oneof_F_String:
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.F_String)))
-		n += len(x.F_String)
-	case *Oneof_F_Bytes:
-		n += proto.SizeVarint(11<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.F_Bytes)))
-		n += len(x.F_Bytes)
-	case *Oneof_F_Sint32:
-		n += proto.SizeVarint(12<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.F_Sint32) << 1) ^ uint32((int32(x.F_Sint32) >> 31))))
-	case *Oneof_F_Sint64:
-		n += proto.SizeVarint(13<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.F_Sint64<<1) ^ uint64((int64(x.F_Sint64) >> 63))))
-	case *Oneof_F_Enum:
-		n += proto.SizeVarint(14<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Enum))
-	case *Oneof_F_Message:
-		s := proto.Size(x.F_Message)
-		n += proto.SizeVarint(15<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Oneof_FGroup:
-		n += proto.SizeVarint(16<<3 | proto.WireStartGroup)
-		n += proto.Size(x.FGroup)
-		n += proto.SizeVarint(16<<3 | proto.WireEndGroup)
-	case *Oneof_F_Largest_Tag:
-		n += proto.SizeVarint(536870911<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Largest_Tag))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// tormato
-	switch x := m.Tormato.(type) {
-	case *Oneof_Value:
-		n += proto.SizeVarint(100<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Value))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Oneof_F_Group struct {
-	X                *int32 `protobuf:"varint,17,opt,name=x" json:"x,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Oneof_F_Group) Reset()                    { *m = Oneof_F_Group{} }
-func (m *Oneof_F_Group) String() string            { return proto.CompactTextString(m) }
-func (*Oneof_F_Group) ProtoMessage()               {}
-func (*Oneof_F_Group) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29, 0} }
-
-func (m *Oneof_F_Group) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-type Communique struct {
-	MakeMeCry *bool `protobuf:"varint,1,opt,name=make_me_cry,json=makeMeCry" json:"make_me_cry,omitempty"`
-	// This is a oneof, called "union".
-	//
-	// Types that are valid to be assigned to Union:
-	//	*Communique_Number
-	//	*Communique_Name
-	//	*Communique_Data
-	//	*Communique_TempC
-	//	*Communique_Col
-	//	*Communique_Msg
-	Union            isCommunique_Union `protobuf_oneof:"union"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *Communique) Reset()                    { *m = Communique{} }
-func (m *Communique) String() string            { return proto.CompactTextString(m) }
-func (*Communique) ProtoMessage()               {}
-func (*Communique) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
-
-type isCommunique_Union interface {
-	isCommunique_Union()
-}
-
-type Communique_Number struct {
-	Number int32 `protobuf:"varint,5,opt,name=number,oneof"`
-}
-type Communique_Name struct {
-	Name string `protobuf:"bytes,6,opt,name=name,oneof"`
-}
-type Communique_Data struct {
-	Data []byte `protobuf:"bytes,7,opt,name=data,oneof"`
-}
-type Communique_TempC struct {
-	TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof"`
-}
-type Communique_Col struct {
-	Col MyMessage_Color `protobuf:"varint,9,opt,name=col,enum=testdata.MyMessage_Color,oneof"`
-}
-type Communique_Msg struct {
-	Msg *Strings `protobuf:"bytes,10,opt,name=msg,oneof"`
-}
-
-func (*Communique_Number) isCommunique_Union() {}
-func (*Communique_Name) isCommunique_Union()   {}
-func (*Communique_Data) isCommunique_Union()   {}
-func (*Communique_TempC) isCommunique_Union()  {}
-func (*Communique_Col) isCommunique_Union()    {}
-func (*Communique_Msg) isCommunique_Union()    {}
-
-func (m *Communique) GetUnion() isCommunique_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-
-func (m *Communique) GetMakeMeCry() bool {
-	if m != nil && m.MakeMeCry != nil {
-		return *m.MakeMeCry
-	}
-	return false
-}
-
-func (m *Communique) GetNumber() int32 {
-	if x, ok := m.GetUnion().(*Communique_Number); ok {
-		return x.Number
-	}
-	return 0
-}
-
-func (m *Communique) GetName() string {
-	if x, ok := m.GetUnion().(*Communique_Name); ok {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *Communique) GetData() []byte {
-	if x, ok := m.GetUnion().(*Communique_Data); ok {
-		return x.Data
-	}
-	return nil
-}
-
-func (m *Communique) GetTempC() float64 {
-	if x, ok := m.GetUnion().(*Communique_TempC); ok {
-		return x.TempC
-	}
-	return 0
-}
-
-func (m *Communique) GetCol() MyMessage_Color {
-	if x, ok := m.GetUnion().(*Communique_Col); ok {
-		return x.Col
-	}
-	return MyMessage_RED
-}
-
-func (m *Communique) GetMsg() *Strings {
-	if x, ok := m.GetUnion().(*Communique_Msg); ok {
-		return x.Msg
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Communique) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Communique_OneofMarshaler, _Communique_OneofUnmarshaler, _Communique_OneofSizer, []interface{}{
-		(*Communique_Number)(nil),
-		(*Communique_Name)(nil),
-		(*Communique_Data)(nil),
-		(*Communique_TempC)(nil),
-		(*Communique_Col)(nil),
-		(*Communique_Msg)(nil),
-	}
-}
-
-func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Number))
-	case *Communique_Name:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case *Communique_Data:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Data)
-	case *Communique_TempC:
-		b.EncodeVarint(8<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.TempC))
-	case *Communique_Col:
-		b.EncodeVarint(9<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Col))
-	case *Communique_Msg:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Msg); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Communique.Union has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Communique)
-	switch tag {
-	case 5: // union.number
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Number{int32(x)}
-		return true, err
-	case 6: // union.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &Communique_Name{x}
-		return true, err
-	case 7: // union.data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Union = &Communique_Data{x}
-		return true, err
-	case 8: // union.temp_c
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Communique_TempC{math.Float64frombits(x)}
-		return true, err
-	case 9: // union.col
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Col{MyMessage_Color(x)}
-		return true, err
-	case 10: // union.msg
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Strings)
-		err := b.DecodeMessage(msg)
-		m.Union = &Communique_Msg{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Communique_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		n += proto.SizeVarint(5<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Number))
-	case *Communique_Name:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case *Communique_Data:
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Data)))
-		n += len(x.Data)
-	case *Communique_TempC:
-		n += proto.SizeVarint(8<<3 | proto.WireFixed64)
-		n += 8
-	case *Communique_Col:
-		n += proto.SizeVarint(9<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Col))
-	case *Communique_Msg:
-		s := proto.Size(x.Msg)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-var E_Greeting = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         106,
-	Name:          "testdata.greeting",
-	Tag:           "bytes,106,rep,name=greeting",
-	Filename:      "test.proto",
-}
-
-var E_Complex = &proto.ExtensionDesc{
-	ExtendedType:  (*OtherMessage)(nil),
-	ExtensionType: (*ComplexExtension)(nil),
-	Field:         200,
-	Name:          "testdata.complex",
-	Tag:           "bytes,200,opt,name=complex",
-	Filename:      "test.proto",
-}
-
-var E_RComplex = &proto.ExtensionDesc{
-	ExtendedType:  (*OtherMessage)(nil),
-	ExtensionType: ([]*ComplexExtension)(nil),
-	Field:         201,
-	Name:          "testdata.r_complex",
-	Tag:           "bytes,201,rep,name=r_complex,json=rComplex",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         101,
-	Name:          "testdata.no_default_double",
-	Tag:           "fixed64,101,opt,name=no_default_double,json=noDefaultDouble",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         102,
-	Name:          "testdata.no_default_float",
-	Tag:           "fixed32,102,opt,name=no_default_float,json=noDefaultFloat",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         103,
-	Name:          "testdata.no_default_int32",
-	Tag:           "varint,103,opt,name=no_default_int32,json=noDefaultInt32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         104,
-	Name:          "testdata.no_default_int64",
-	Tag:           "varint,104,opt,name=no_default_int64,json=noDefaultInt64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         105,
-	Name:          "testdata.no_default_uint32",
-	Tag:           "varint,105,opt,name=no_default_uint32,json=noDefaultUint32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         106,
-	Name:          "testdata.no_default_uint64",
-	Tag:           "varint,106,opt,name=no_default_uint64,json=noDefaultUint64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         107,
-	Name:          "testdata.no_default_sint32",
-	Tag:           "zigzag32,107,opt,name=no_default_sint32,json=noDefaultSint32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         108,
-	Name:          "testdata.no_default_sint64",
-	Tag:           "zigzag64,108,opt,name=no_default_sint64,json=noDefaultSint64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         109,
-	Name:          "testdata.no_default_fixed32",
-	Tag:           "fixed32,109,opt,name=no_default_fixed32,json=noDefaultFixed32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         110,
-	Name:          "testdata.no_default_fixed64",
-	Tag:           "fixed64,110,opt,name=no_default_fixed64,json=noDefaultFixed64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         111,
-	Name:          "testdata.no_default_sfixed32",
-	Tag:           "fixed32,111,opt,name=no_default_sfixed32,json=noDefaultSfixed32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         112,
-	Name:          "testdata.no_default_sfixed64",
-	Tag:           "fixed64,112,opt,name=no_default_sfixed64,json=noDefaultSfixed64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultBool = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         113,
-	Name:          "testdata.no_default_bool",
-	Tag:           "varint,113,opt,name=no_default_bool,json=noDefaultBool",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultString = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         114,
-	Name:          "testdata.no_default_string",
-	Tag:           "bytes,114,opt,name=no_default_string,json=noDefaultString",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         115,
-	Name:          "testdata.no_default_bytes",
-	Tag:           "bytes,115,opt,name=no_default_bytes,json=noDefaultBytes",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
-	Field:         116,
-	Name:          "testdata.no_default_enum",
-	Tag:           "varint,116,opt,name=no_default_enum,json=noDefaultEnum,enum=testdata.DefaultsMessage_DefaultsEnum",
-	Filename:      "test.proto",
-}
-
-var E_DefaultDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         201,
-	Name:          "testdata.default_double",
-	Tag:           "fixed64,201,opt,name=default_double,json=defaultDouble,def=3.1415",
-	Filename:      "test.proto",
-}
-
-var E_DefaultFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         202,
-	Name:          "testdata.default_float",
-	Tag:           "fixed32,202,opt,name=default_float,json=defaultFloat,def=3.14",
-	Filename:      "test.proto",
-}
-
-var E_DefaultInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         203,
-	Name:          "testdata.default_int32",
-	Tag:           "varint,203,opt,name=default_int32,json=defaultInt32,def=42",
-	Filename:      "test.proto",
-}
-
-var E_DefaultInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         204,
-	Name:          "testdata.default_int64",
-	Tag:           "varint,204,opt,name=default_int64,json=defaultInt64,def=43",
-	Filename:      "test.proto",
-}
-
-var E_DefaultUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         205,
-	Name:          "testdata.default_uint32",
-	Tag:           "varint,205,opt,name=default_uint32,json=defaultUint32,def=44",
-	Filename:      "test.proto",
-}
-
-var E_DefaultUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         206,
-	Name:          "testdata.default_uint64",
-	Tag:           "varint,206,opt,name=default_uint64,json=defaultUint64,def=45",
-	Filename:      "test.proto",
-}
-
-var E_DefaultSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         207,
-	Name:          "testdata.default_sint32",
-	Tag:           "zigzag32,207,opt,name=default_sint32,json=defaultSint32,def=46",
-	Filename:      "test.proto",
-}
-
-var E_DefaultSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         208,
-	Name:          "testdata.default_sint64",
-	Tag:           "zigzag64,208,opt,name=default_sint64,json=defaultSint64,def=47",
-	Filename:      "test.proto",
-}
-
-var E_DefaultFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         209,
-	Name:          "testdata.default_fixed32",
-	Tag:           "fixed32,209,opt,name=default_fixed32,json=defaultFixed32,def=48",
-	Filename:      "test.proto",
-}
-
-var E_DefaultFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         210,
-	Name:          "testdata.default_fixed64",
-	Tag:           "fixed64,210,opt,name=default_fixed64,json=defaultFixed64,def=49",
-	Filename:      "test.proto",
-}
-
-var E_DefaultSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         211,
-	Name:          "testdata.default_sfixed32",
-	Tag:           "fixed32,211,opt,name=default_sfixed32,json=defaultSfixed32,def=50",
-	Filename:      "test.proto",
-}
-
-var E_DefaultSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         212,
-	Name:          "testdata.default_sfixed64",
-	Tag:           "fixed64,212,opt,name=default_sfixed64,json=defaultSfixed64,def=51",
-	Filename:      "test.proto",
-}
-
-var E_DefaultBool = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         213,
-	Name:          "testdata.default_bool",
-	Tag:           "varint,213,opt,name=default_bool,json=defaultBool,def=1",
-	Filename:      "test.proto",
-}
-
-var E_DefaultString = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         214,
-	Name:          "testdata.default_string",
-	Tag:           "bytes,214,opt,name=default_string,json=defaultString,def=Hello, string",
-	Filename:      "test.proto",
-}
-
-var E_DefaultBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         215,
-	Name:          "testdata.default_bytes",
-	Tag:           "bytes,215,opt,name=default_bytes,json=defaultBytes,def=Hello, bytes",
-	Filename:      "test.proto",
-}
-
-var E_DefaultEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
-	Field:         216,
-	Name:          "testdata.default_enum",
-	Tag:           "varint,216,opt,name=default_enum,json=defaultEnum,enum=testdata.DefaultsMessage_DefaultsEnum,def=1",
-	Filename:      "test.proto",
-}
-
-var E_X201 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         201,
-	Name:          "testdata.x201",
-	Tag:           "bytes,201,opt,name=x201",
-	Filename:      "test.proto",
-}
-
-var E_X202 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         202,
-	Name:          "testdata.x202",
-	Tag:           "bytes,202,opt,name=x202",
-	Filename:      "test.proto",
-}
-
-var E_X203 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         203,
-	Name:          "testdata.x203",
-	Tag:           "bytes,203,opt,name=x203",
-	Filename:      "test.proto",
-}
-
-var E_X204 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         204,
-	Name:          "testdata.x204",
-	Tag:           "bytes,204,opt,name=x204",
-	Filename:      "test.proto",
-}
-
-var E_X205 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         205,
-	Name:          "testdata.x205",
-	Tag:           "bytes,205,opt,name=x205",
-	Filename:      "test.proto",
-}
-
-var E_X206 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         206,
-	Name:          "testdata.x206",
-	Tag:           "bytes,206,opt,name=x206",
-	Filename:      "test.proto",
-}
-
-var E_X207 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         207,
-	Name:          "testdata.x207",
-	Tag:           "bytes,207,opt,name=x207",
-	Filename:      "test.proto",
-}
-
-var E_X208 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         208,
-	Name:          "testdata.x208",
-	Tag:           "bytes,208,opt,name=x208",
-	Filename:      "test.proto",
-}
-
-var E_X209 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         209,
-	Name:          "testdata.x209",
-	Tag:           "bytes,209,opt,name=x209",
-	Filename:      "test.proto",
-}
-
-var E_X210 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         210,
-	Name:          "testdata.x210",
-	Tag:           "bytes,210,opt,name=x210",
-	Filename:      "test.proto",
-}
-
-var E_X211 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         211,
-	Name:          "testdata.x211",
-	Tag:           "bytes,211,opt,name=x211",
-	Filename:      "test.proto",
-}
-
-var E_X212 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         212,
-	Name:          "testdata.x212",
-	Tag:           "bytes,212,opt,name=x212",
-	Filename:      "test.proto",
-}
-
-var E_X213 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         213,
-	Name:          "testdata.x213",
-	Tag:           "bytes,213,opt,name=x213",
-	Filename:      "test.proto",
-}
-
-var E_X214 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         214,
-	Name:          "testdata.x214",
-	Tag:           "bytes,214,opt,name=x214",
-	Filename:      "test.proto",
-}
-
-var E_X215 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         215,
-	Name:          "testdata.x215",
-	Tag:           "bytes,215,opt,name=x215",
-	Filename:      "test.proto",
-}
-
-var E_X216 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         216,
-	Name:          "testdata.x216",
-	Tag:           "bytes,216,opt,name=x216",
-	Filename:      "test.proto",
-}
-
-var E_X217 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         217,
-	Name:          "testdata.x217",
-	Tag:           "bytes,217,opt,name=x217",
-	Filename:      "test.proto",
-}
-
-var E_X218 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         218,
-	Name:          "testdata.x218",
-	Tag:           "bytes,218,opt,name=x218",
-	Filename:      "test.proto",
-}
-
-var E_X219 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         219,
-	Name:          "testdata.x219",
-	Tag:           "bytes,219,opt,name=x219",
-	Filename:      "test.proto",
-}
-
-var E_X220 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         220,
-	Name:          "testdata.x220",
-	Tag:           "bytes,220,opt,name=x220",
-	Filename:      "test.proto",
-}
-
-var E_X221 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         221,
-	Name:          "testdata.x221",
-	Tag:           "bytes,221,opt,name=x221",
-	Filename:      "test.proto",
-}
-
-var E_X222 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         222,
-	Name:          "testdata.x222",
-	Tag:           "bytes,222,opt,name=x222",
-	Filename:      "test.proto",
-}
-
-var E_X223 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         223,
-	Name:          "testdata.x223",
-	Tag:           "bytes,223,opt,name=x223",
-	Filename:      "test.proto",
-}
-
-var E_X224 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         224,
-	Name:          "testdata.x224",
-	Tag:           "bytes,224,opt,name=x224",
-	Filename:      "test.proto",
-}
-
-var E_X225 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         225,
-	Name:          "testdata.x225",
-	Tag:           "bytes,225,opt,name=x225",
-	Filename:      "test.proto",
-}
-
-var E_X226 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         226,
-	Name:          "testdata.x226",
-	Tag:           "bytes,226,opt,name=x226",
-	Filename:      "test.proto",
-}
-
-var E_X227 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         227,
-	Name:          "testdata.x227",
-	Tag:           "bytes,227,opt,name=x227",
-	Filename:      "test.proto",
-}
-
-var E_X228 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         228,
-	Name:          "testdata.x228",
-	Tag:           "bytes,228,opt,name=x228",
-	Filename:      "test.proto",
-}
-
-var E_X229 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         229,
-	Name:          "testdata.x229",
-	Tag:           "bytes,229,opt,name=x229",
-	Filename:      "test.proto",
-}
-
-var E_X230 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         230,
-	Name:          "testdata.x230",
-	Tag:           "bytes,230,opt,name=x230",
-	Filename:      "test.proto",
-}
-
-var E_X231 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         231,
-	Name:          "testdata.x231",
-	Tag:           "bytes,231,opt,name=x231",
-	Filename:      "test.proto",
-}
-
-var E_X232 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         232,
-	Name:          "testdata.x232",
-	Tag:           "bytes,232,opt,name=x232",
-	Filename:      "test.proto",
-}
-
-var E_X233 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         233,
-	Name:          "testdata.x233",
-	Tag:           "bytes,233,opt,name=x233",
-	Filename:      "test.proto",
-}
-
-var E_X234 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         234,
-	Name:          "testdata.x234",
-	Tag:           "bytes,234,opt,name=x234",
-	Filename:      "test.proto",
-}
-
-var E_X235 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         235,
-	Name:          "testdata.x235",
-	Tag:           "bytes,235,opt,name=x235",
-	Filename:      "test.proto",
-}
-
-var E_X236 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         236,
-	Name:          "testdata.x236",
-	Tag:           "bytes,236,opt,name=x236",
-	Filename:      "test.proto",
-}
-
-var E_X237 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         237,
-	Name:          "testdata.x237",
-	Tag:           "bytes,237,opt,name=x237",
-	Filename:      "test.proto",
-}
-
-var E_X238 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         238,
-	Name:          "testdata.x238",
-	Tag:           "bytes,238,opt,name=x238",
-	Filename:      "test.proto",
-}
-
-var E_X239 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         239,
-	Name:          "testdata.x239",
-	Tag:           "bytes,239,opt,name=x239",
-	Filename:      "test.proto",
-}
-
-var E_X240 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         240,
-	Name:          "testdata.x240",
-	Tag:           "bytes,240,opt,name=x240",
-	Filename:      "test.proto",
-}
-
-var E_X241 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         241,
-	Name:          "testdata.x241",
-	Tag:           "bytes,241,opt,name=x241",
-	Filename:      "test.proto",
-}
-
-var E_X242 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         242,
-	Name:          "testdata.x242",
-	Tag:           "bytes,242,opt,name=x242",
-	Filename:      "test.proto",
-}
-
-var E_X243 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         243,
-	Name:          "testdata.x243",
-	Tag:           "bytes,243,opt,name=x243",
-	Filename:      "test.proto",
-}
-
-var E_X244 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         244,
-	Name:          "testdata.x244",
-	Tag:           "bytes,244,opt,name=x244",
-	Filename:      "test.proto",
-}
-
-var E_X245 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         245,
-	Name:          "testdata.x245",
-	Tag:           "bytes,245,opt,name=x245",
-	Filename:      "test.proto",
-}
-
-var E_X246 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         246,
-	Name:          "testdata.x246",
-	Tag:           "bytes,246,opt,name=x246",
-	Filename:      "test.proto",
-}
-
-var E_X247 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         247,
-	Name:          "testdata.x247",
-	Tag:           "bytes,247,opt,name=x247",
-	Filename:      "test.proto",
-}
-
-var E_X248 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         248,
-	Name:          "testdata.x248",
-	Tag:           "bytes,248,opt,name=x248",
-	Filename:      "test.proto",
-}
-
-var E_X249 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         249,
-	Name:          "testdata.x249",
-	Tag:           "bytes,249,opt,name=x249",
-	Filename:      "test.proto",
-}
-
-var E_X250 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         250,
-	Name:          "testdata.x250",
-	Tag:           "bytes,250,opt,name=x250",
-	Filename:      "test.proto",
-}
-
-func init() {
-	proto.RegisterType((*GoEnum)(nil), "testdata.GoEnum")
-	proto.RegisterType((*GoTestField)(nil), "testdata.GoTestField")
-	proto.RegisterType((*GoTest)(nil), "testdata.GoTest")
-	proto.RegisterType((*GoTest_RequiredGroup)(nil), "testdata.GoTest.RequiredGroup")
-	proto.RegisterType((*GoTest_RepeatedGroup)(nil), "testdata.GoTest.RepeatedGroup")
-	proto.RegisterType((*GoTest_OptionalGroup)(nil), "testdata.GoTest.OptionalGroup")
-	proto.RegisterType((*GoTestRequiredGroupField)(nil), "testdata.GoTestRequiredGroupField")
-	proto.RegisterType((*GoTestRequiredGroupField_Group)(nil), "testdata.GoTestRequiredGroupField.Group")
-	proto.RegisterType((*GoSkipTest)(nil), "testdata.GoSkipTest")
-	proto.RegisterType((*GoSkipTest_SkipGroup)(nil), "testdata.GoSkipTest.SkipGroup")
-	proto.RegisterType((*NonPackedTest)(nil), "testdata.NonPackedTest")
-	proto.RegisterType((*PackedTest)(nil), "testdata.PackedTest")
-	proto.RegisterType((*MaxTag)(nil), "testdata.MaxTag")
-	proto.RegisterType((*OldMessage)(nil), "testdata.OldMessage")
-	proto.RegisterType((*OldMessage_Nested)(nil), "testdata.OldMessage.Nested")
-	proto.RegisterType((*NewMessage)(nil), "testdata.NewMessage")
-	proto.RegisterType((*NewMessage_Nested)(nil), "testdata.NewMessage.Nested")
-	proto.RegisterType((*InnerMessage)(nil), "testdata.InnerMessage")
-	proto.RegisterType((*OtherMessage)(nil), "testdata.OtherMessage")
-	proto.RegisterType((*RequiredInnerMessage)(nil), "testdata.RequiredInnerMessage")
-	proto.RegisterType((*MyMessage)(nil), "testdata.MyMessage")
-	proto.RegisterType((*MyMessage_SomeGroup)(nil), "testdata.MyMessage.SomeGroup")
-	proto.RegisterType((*Ext)(nil), "testdata.Ext")
-	proto.RegisterType((*ComplexExtension)(nil), "testdata.ComplexExtension")
-	proto.RegisterType((*DefaultsMessage)(nil), "testdata.DefaultsMessage")
-	proto.RegisterType((*MyMessageSet)(nil), "testdata.MyMessageSet")
-	proto.RegisterType((*Empty)(nil), "testdata.Empty")
-	proto.RegisterType((*MessageList)(nil), "testdata.MessageList")
-	proto.RegisterType((*MessageList_Message)(nil), "testdata.MessageList.Message")
-	proto.RegisterType((*Strings)(nil), "testdata.Strings")
-	proto.RegisterType((*Defaults)(nil), "testdata.Defaults")
-	proto.RegisterType((*SubDefaults)(nil), "testdata.SubDefaults")
-	proto.RegisterType((*RepeatedEnum)(nil), "testdata.RepeatedEnum")
-	proto.RegisterType((*MoreRepeated)(nil), "testdata.MoreRepeated")
-	proto.RegisterType((*GroupOld)(nil), "testdata.GroupOld")
-	proto.RegisterType((*GroupOld_G)(nil), "testdata.GroupOld.G")
-	proto.RegisterType((*GroupNew)(nil), "testdata.GroupNew")
-	proto.RegisterType((*GroupNew_G)(nil), "testdata.GroupNew.G")
-	proto.RegisterType((*FloatingPoint)(nil), "testdata.FloatingPoint")
-	proto.RegisterType((*MessageWithMap)(nil), "testdata.MessageWithMap")
-	proto.RegisterType((*Oneof)(nil), "testdata.Oneof")
-	proto.RegisterType((*Oneof_F_Group)(nil), "testdata.Oneof.F_Group")
-	proto.RegisterType((*Communique)(nil), "testdata.Communique")
-	proto.RegisterEnum("testdata.FOO", FOO_name, FOO_value)
-	proto.RegisterEnum("testdata.GoTest_KIND", GoTest_KIND_name, GoTest_KIND_value)
-	proto.RegisterEnum("testdata.MyMessage_Color", MyMessage_Color_name, MyMessage_Color_value)
-	proto.RegisterEnum("testdata.DefaultsMessage_DefaultsEnum", DefaultsMessage_DefaultsEnum_name, DefaultsMessage_DefaultsEnum_value)
-	proto.RegisterEnum("testdata.Defaults_Color", Defaults_Color_name, Defaults_Color_value)
-	proto.RegisterEnum("testdata.RepeatedEnum_Color", RepeatedEnum_Color_name, RepeatedEnum_Color_value)
-	proto.RegisterExtension(E_Ext_More)
-	proto.RegisterExtension(E_Ext_Text)
-	proto.RegisterExtension(E_Ext_Number)
-	proto.RegisterExtension(E_Greeting)
-	proto.RegisterExtension(E_Complex)
-	proto.RegisterExtension(E_RComplex)
-	proto.RegisterExtension(E_NoDefaultDouble)
-	proto.RegisterExtension(E_NoDefaultFloat)
-	proto.RegisterExtension(E_NoDefaultInt32)
-	proto.RegisterExtension(E_NoDefaultInt64)
-	proto.RegisterExtension(E_NoDefaultUint32)
-	proto.RegisterExtension(E_NoDefaultUint64)
-	proto.RegisterExtension(E_NoDefaultSint32)
-	proto.RegisterExtension(E_NoDefaultSint64)
-	proto.RegisterExtension(E_NoDefaultFixed32)
-	proto.RegisterExtension(E_NoDefaultFixed64)
-	proto.RegisterExtension(E_NoDefaultSfixed32)
-	proto.RegisterExtension(E_NoDefaultSfixed64)
-	proto.RegisterExtension(E_NoDefaultBool)
-	proto.RegisterExtension(E_NoDefaultString)
-	proto.RegisterExtension(E_NoDefaultBytes)
-	proto.RegisterExtension(E_NoDefaultEnum)
-	proto.RegisterExtension(E_DefaultDouble)
-	proto.RegisterExtension(E_DefaultFloat)
-	proto.RegisterExtension(E_DefaultInt32)
-	proto.RegisterExtension(E_DefaultInt64)
-	proto.RegisterExtension(E_DefaultUint32)
-	proto.RegisterExtension(E_DefaultUint64)
-	proto.RegisterExtension(E_DefaultSint32)
-	proto.RegisterExtension(E_DefaultSint64)
-	proto.RegisterExtension(E_DefaultFixed32)
-	proto.RegisterExtension(E_DefaultFixed64)
-	proto.RegisterExtension(E_DefaultSfixed32)
-	proto.RegisterExtension(E_DefaultSfixed64)
-	proto.RegisterExtension(E_DefaultBool)
-	proto.RegisterExtension(E_DefaultString)
-	proto.RegisterExtension(E_DefaultBytes)
-	proto.RegisterExtension(E_DefaultEnum)
-	proto.RegisterExtension(E_X201)
-	proto.RegisterExtension(E_X202)
-	proto.RegisterExtension(E_X203)
-	proto.RegisterExtension(E_X204)
-	proto.RegisterExtension(E_X205)
-	proto.RegisterExtension(E_X206)
-	proto.RegisterExtension(E_X207)
-	proto.RegisterExtension(E_X208)
-	proto.RegisterExtension(E_X209)
-	proto.RegisterExtension(E_X210)
-	proto.RegisterExtension(E_X211)
-	proto.RegisterExtension(E_X212)
-	proto.RegisterExtension(E_X213)
-	proto.RegisterExtension(E_X214)
-	proto.RegisterExtension(E_X215)
-	proto.RegisterExtension(E_X216)
-	proto.RegisterExtension(E_X217)
-	proto.RegisterExtension(E_X218)
-	proto.RegisterExtension(E_X219)
-	proto.RegisterExtension(E_X220)
-	proto.RegisterExtension(E_X221)
-	proto.RegisterExtension(E_X222)
-	proto.RegisterExtension(E_X223)
-	proto.RegisterExtension(E_X224)
-	proto.RegisterExtension(E_X225)
-	proto.RegisterExtension(E_X226)
-	proto.RegisterExtension(E_X227)
-	proto.RegisterExtension(E_X228)
-	proto.RegisterExtension(E_X229)
-	proto.RegisterExtension(E_X230)
-	proto.RegisterExtension(E_X231)
-	proto.RegisterExtension(E_X232)
-	proto.RegisterExtension(E_X233)
-	proto.RegisterExtension(E_X234)
-	proto.RegisterExtension(E_X235)
-	proto.RegisterExtension(E_X236)
-	proto.RegisterExtension(E_X237)
-	proto.RegisterExtension(E_X238)
-	proto.RegisterExtension(E_X239)
-	proto.RegisterExtension(E_X240)
-	proto.RegisterExtension(E_X241)
-	proto.RegisterExtension(E_X242)
-	proto.RegisterExtension(E_X243)
-	proto.RegisterExtension(E_X244)
-	proto.RegisterExtension(E_X245)
-	proto.RegisterExtension(E_X246)
-	proto.RegisterExtension(E_X247)
-	proto.RegisterExtension(E_X248)
-	proto.RegisterExtension(E_X249)
-	proto.RegisterExtension(E_X250)
-}
-
-func init() { proto.RegisterFile("test.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 4453 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x5a, 0xc9, 0x77, 0xdb, 0x48,
-	0x7a, 0x37, 0xc0, 0xfd, 0x23, 0x25, 0x42, 0x65, 0xb5, 0x9b, 0x96, 0xbc, 0xc0, 0x9c, 0xe9, 0x6e,
-	0x7a, 0xd3, 0x48, 0x20, 0x44, 0xdb, 0x74, 0xa7, 0xdf, 0xf3, 0x42, 0xca, 0x7a, 0x63, 0x89, 0x0a,
-	0xa4, 0xee, 0x7e, 0xd3, 0x39, 0xf0, 0x51, 0x22, 0x44, 0xb3, 0x4d, 0x02, 0x34, 0x09, 0xc5, 0x52,
-	0x72, 0xe9, 0x4b, 0x72, 0xcd, 0x76, 0xc9, 0x35, 0xa7, 0x9c, 0x92, 0xbc, 0x97, 0x7f, 0x22, 0xe9,
-	0xee, 0x59, 0x7b, 0xd6, 0xac, 0x93, 0x7d, 0x99, 0xec, 0xdb, 0x4c, 0x92, 0x4b, 0xcf, 0xab, 0xaf,
-	0x0a, 0x40, 0x01, 0x24, 0x20, 0xf9, 0x24, 0x56, 0xd5, 0xef, 0xf7, 0xd5, 0xf6, 0xab, 0xef, 0xab,
-	0xaf, 0x20, 0x00, 0xc7, 0x9c, 0x38, 0x2b, 0xa3, 0xb1, 0xed, 0xd8, 0x24, 0x4b, 0x7f, 0x77, 0x3b,
-	0x4e, 0xa7, 0x7c, 0x1d, 0xd2, 0x1b, 0x76, 0xc3, 0x3a, 0x1a, 0x92, 0xab, 0x90, 0x38, 0xb4, 0xed,
-	0x92, 0xa4, 0xca, 0x95, 0x79, 0x6d, 0x6e, 0xc5, 0x45, 0xac, 0x34, 0x5b, 0x2d, 0x83, 0xb6, 0x94,
-	0xef, 0x40, 0x7e, 0xc3, 0xde, 0x33, 0x27, 0x4e, 0xb3, 0x6f, 0x0e, 0xba, 0x64, 0x11, 0x52, 0x4f,
-	0x3b, 0xfb, 0xe6, 0x00, 0x19, 0x39, 0x83, 0x15, 0x08, 0x81, 0xe4, 0xde, 0xc9, 0xc8, 0x2c, 0xc9,
-	0x58, 0x89, 0xbf, 0xcb, 0xbf, 0x72, 0x85, 0x76, 0x42, 0x99, 0xe4, 0x3a, 0x24, 0xbf, 0xdc, 0xb7,
-	0xba, 0xbc, 0x97, 0xd7, 0xfc, 0x5e, 0x58, 0xfb, 0xca, 0x97, 0x37, 0xb7, 0x1f, 0x1b, 0x08, 0xa1,
-	0xf6, 0xf7, 0x3a, 0xfb, 0x03, 0x6a, 0x4a, 0xa2, 0xf6, 0xb1, 0x40, 0x6b, 0x77, 0x3a, 0xe3, 0xce,
-	0xb0, 0x94, 0x50, 0xa5, 0x4a, 0xca, 0x60, 0x05, 0x72, 0x1f, 0xe6, 0x0c, 0xf3, 0xc5, 0x51, 0x7f,
-	0x6c, 0x76, 0x71, 0x70, 0xa5, 0xa4, 0x2a, 0x57, 0xf2, 0xd3, 0xf6, 0xb1, 0xd1, 0x08, 0x62, 0x19,
-	0x79, 0x64, 0x76, 0x1c, 0x97, 0x9c, 0x52, 0x13, 0xb1, 0x64, 0x01, 0x4b, 0xc9, 0xad, 0x91, 0xd3,
-	0xb7, 0xad, 0xce, 0x80, 0x91, 0xd3, 0xaa, 0x14, 0x43, 0x0e, 0x60, 0xc9, 0x9b, 0x50, 0x6c, 0xb6,
-	0x1f, 0xda, 0xf6, 0xa0, 0x3d, 0xe6, 0x23, 0x2a, 0x81, 0x2a, 0x57, 0xb2, 0xc6, 0x5c, 0x93, 0xd6,
-	0xba, 0xc3, 0x24, 0x15, 0x50, 0x9a, 0xed, 0x4d, 0xcb, 0xa9, 0x6a, 0x3e, 0x30, 0xaf, 0xca, 0x95,
-	0x94, 0x31, 0xdf, 0xc4, 0xea, 0x29, 0x64, 0x4d, 0xf7, 0x91, 0x05, 0x55, 0xae, 0x24, 0x18, 0xb2,
-	0xa6, 0x7b, 0xc8, 0x5b, 0x40, 0x9a, 0xed, 0x66, 0xff, 0xd8, 0xec, 0x8a, 0x56, 0xe7, 0x54, 0xb9,
-	0x92, 0x31, 0x94, 0x26, 0x6f, 0x98, 0x81, 0x16, 0x2d, 0xcf, 0xab, 0x72, 0x25, 0xed, 0xa2, 0x05,
-	0xdb, 0x37, 0x60, 0xa1, 0xd9, 0x7e, 0xb7, 0x1f, 0x1c, 0x70, 0x51, 0x95, 0x2b, 0x73, 0x46, 0xb1,
-	0xc9, 0xea, 0xa7, 0xb1, 0xa2, 0x61, 0x45, 0x95, 0x2b, 0x49, 0x8e, 0x15, 0xec, 0xe2, 0xec, 0x9a,
-	0x03, 0xbb, 0xe3, 0xf8, 0xd0, 0x05, 0x55, 0xae, 0xc8, 0xc6, 0x7c, 0x13, 0xab, 0x83, 0x56, 0x1f,
-	0xdb, 0x47, 0xfb, 0x03, 0xd3, 0x87, 0x12, 0x55, 0xae, 0x48, 0x46, 0xb1, 0xc9, 0xea, 0x83, 0xd8,
-	0x5d, 0x67, 0xdc, 0xb7, 0x7a, 0x3e, 0xf6, 0x3c, 0xea, 0xb7, 0xd8, 0x64, 0xf5, 0xc1, 0x11, 0x3c,
-	0x3c, 0x71, 0xcc, 0x89, 0x0f, 0x35, 0x55, 0xb9, 0x52, 0x30, 0xe6, 0x9b, 0x58, 0x1d, 0xb2, 0x1a,
-	0x5a, 0x83, 0x43, 0x55, 0xae, 0x2c, 0x50, 0xab, 0x33, 0xd6, 0x60, 0x37, 0xb4, 0x06, 0x3d, 0x55,
-	0xae, 0x10, 0x8e, 0x15, 0xd6, 0x40, 0xd4, 0x0c, 0x13, 0x62, 0x69, 0x51, 0x4d, 0x08, 0x9a, 0x61,
-	0x95, 0x41, 0xcd, 0x70, 0xe0, 0x6b, 0x6a, 0x42, 0xd4, 0x4c, 0x08, 0x89, 0x9d, 0x73, 0xe4, 0x05,
-	0x35, 0x21, 0x6a, 0x86, 0x23, 0x43, 0x9a, 0xe1, 0xd8, 0xd7, 0xd5, 0x44, 0x50, 0x33, 0x53, 0x68,
-	0xd1, 0x72, 0x49, 0x4d, 0x04, 0x35, 0xc3, 0xd1, 0x41, 0xcd, 0x70, 0xf0, 0x45, 0x35, 0x11, 0xd0,
-	0x4c, 0x18, 0x2b, 0x1a, 0x5e, 0x52, 0x13, 0x01, 0xcd, 0x88, 0xb3, 0x73, 0x35, 0xc3, 0xa1, 0xcb,
-	0x6a, 0x42, 0xd4, 0x8c, 0x68, 0xd5, 0xd3, 0x0c, 0x87, 0x5e, 0x52, 0x13, 0x01, 0xcd, 0x88, 0x58,
-	0x4f, 0x33, 0x1c, 0x7b, 0x59, 0x4d, 0x04, 0x34, 0xc3, 0xb1, 0xd7, 0x45, 0xcd, 0x70, 0xe8, 0xc7,
-	0x92, 0x9a, 0x10, 0x45, 0xc3, 0xa1, 0x37, 0x03, 0xa2, 0xe1, 0xd8, 0x4f, 0x28, 0x56, 0x54, 0x4d,
-	0x18, 0x2c, 0xae, 0xc2, 0xa7, 0x14, 0x2c, 0xca, 0x86, 0x83, 0x7d, 0xd9, 0xd8, 0xdc, 0x05, 0x95,
-	0xae, 0xa8, 0x92, 0x27, 0x1b, 0xd7, 0x2f, 0x89, 0xb2, 0xf1, 0x80, 0x57, 0xd1, 0xd5, 0x72, 0xd9,
-	0x4c, 0x21, 0x6b, 0xba, 0x8f, 0x54, 0x55, 0xc9, 0x97, 0x8d, 0x87, 0x0c, 0xc8, 0xc6, 0xc3, 0x5e,
-	0x53, 0x25, 0x51, 0x36, 0x33, 0xd0, 0xa2, 0xe5, 0xb2, 0x2a, 0x89, 0xb2, 0xf1, 0xd0, 0xa2, 0x6c,
-	0x3c, 0xf0, 0x17, 0x54, 0x49, 0x90, 0xcd, 0x34, 0x56, 0x34, 0xfc, 0x45, 0x55, 0x12, 0x64, 0x13,
-	0x9c, 0x1d, 0x93, 0x8d, 0x07, 0x7d, 0x43, 0x95, 0x7c, 0xd9, 0x04, 0xad, 0x72, 0xd9, 0x78, 0xd0,
-	0x37, 0x55, 0x49, 0x90, 0x4d, 0x10, 0xcb, 0x65, 0xe3, 0x61, 0xdf, 0xc2, 0xf8, 0xe6, 0xca, 0xc6,
-	0xc3, 0x0a, 0xb2, 0xf1, 0xa0, 0xbf, 0x43, 0x63, 0xa1, 0x27, 0x1b, 0x0f, 0x2a, 0xca, 0xc6, 0xc3,
-	0xfe, 0x2e, 0xc5, 0xfa, 0xb2, 0x99, 0x06, 0x8b, 0xab, 0xf0, 0x7b, 0x14, 0xec, 0xcb, 0xc6, 0x03,
-	0xaf, 0xe0, 0x20, 0xa8, 0x6c, 0xba, 0xe6, 0x61, 0xe7, 0x68, 0x40, 0x25, 0x56, 0xa1, 0xba, 0xa9,
-	0x27, 0x9d, 0xf1, 0x91, 0x49, 0x47, 0x62, 0xdb, 0x83, 0xc7, 0x6e, 0x1b, 0x59, 0xa1, 0xc6, 0x99,
-	0x7c, 0x7c, 0xc2, 0x75, 0xaa, 0x9f, 0xba, 0x5c, 0xd5, 0x8c, 0x22, 0xd3, 0xd0, 0x34, 0xbe, 0xa6,
-	0x0b, 0xf8, 0x1b, 0x54, 0x45, 0x75, 0xb9, 0xa6, 0x33, 0x7c, 0x4d, 0xf7, 0xf1, 0x55, 0x38, 0xef,
-	0x4b, 0xc9, 0x67, 0xdc, 0xa4, 0x5a, 0xaa, 0x27, 0xaa, 0xda, 0xaa, 0xb1, 0xe0, 0x0a, 0x6a, 0x16,
-	0x29, 0xd0, 0xcd, 0x2d, 0x2a, 0xa9, 0x7a, 0xa2, 0xa6, 0x7b, 0x24, 0xb1, 0x27, 0x8d, 0xca, 0x90,
-	0x0b, 0xcb, 0xe7, 0xdc, 0xa6, 0xca, 0xaa, 0x27, 0xab, 0xda, 0xea, 0xaa, 0xa1, 0x70, 0x7d, 0xcd,
-	0xe0, 0x04, 0xfa, 0x59, 0xa1, 0x0a, 0xab, 0x27, 0x6b, 0xba, 0xc7, 0x09, 0xf6, 0xb3, 0xe0, 0x0a,
-	0xcd, 0xa7, 0x7c, 0x89, 0x2a, 0xad, 0x9e, 0xae, 0xae, 0xe9, 0x6b, 0xeb, 0xf7, 0x8c, 0x22, 0x53,
-	0x9c, 0xcf, 0xd1, 0x69, 0x3f, 0x5c, 0x72, 0x3e, 0x69, 0x95, 0x6a, 0xae, 0x9e, 0xd6, 0xee, 0xac,
-	0xdd, 0xd5, 0xee, 0x1a, 0x0a, 0xd7, 0x9e, 0xcf, 0x7a, 0x87, 0xb2, 0xb8, 0xf8, 0x7c, 0xd6, 0x1a,
-	0x55, 0x5f, 0x5d, 0x79, 0x66, 0x0e, 0x06, 0xf6, 0x2d, 0xb5, 0xfc, 0xd2, 0x1e, 0x0f, 0xba, 0xd7,
-	0xca, 0x60, 0x28, 0x5c, 0x8f, 0x62, 0xaf, 0x0b, 0xae, 0x20, 0x7d, 0xfa, 0xaf, 0xd1, 0x7b, 0x58,
-	0xa1, 0x9e, 0x79, 0xd8, 0xef, 0x59, 0xf6, 0xc4, 0x34, 0x8a, 0x4c, 0x9a, 0xa1, 0x35, 0xd9, 0x0d,
-	0xaf, 0xe3, 0xaf, 0x53, 0xda, 0x42, 0x3d, 0x71, 0xbb, 0xaa, 0xd1, 0x9e, 0x66, 0xad, 0xe3, 0x6e,
-	0x78, 0x1d, 0x7f, 0x83, 0x72, 0x48, 0x3d, 0x71, 0xbb, 0xa6, 0x73, 0x8e, 0xb8, 0x8e, 0x77, 0xe0,
-	0x42, 0x28, 0x2e, 0xb6, 0x47, 0x9d, 0x83, 0xe7, 0x66, 0xb7, 0xa4, 0xd1, 0xf0, 0xf8, 0x50, 0x56,
-	0x24, 0xe3, 0x7c, 0x20, 0x44, 0xee, 0x60, 0x33, 0xb9, 0x07, 0xaf, 0x87, 0x03, 0xa5, 0xcb, 0xac,
-	0xd2, 0x78, 0x89, 0xcc, 0xc5, 0x60, 0xcc, 0x0c, 0x51, 0x05, 0x07, 0xec, 0x52, 0x75, 0x1a, 0x40,
-	0x7d, 0xaa, 0xef, 0x89, 0x39, 0xf5, 0x67, 0xe0, 0xe2, 0x74, 0x28, 0x75, 0xc9, 0xeb, 0x34, 0xa2,
-	0x22, 0xf9, 0x42, 0x38, 0xaa, 0x4e, 0xd1, 0x67, 0xf4, 0x5d, 0xa3, 0x21, 0x56, 0xa4, 0x4f, 0xf5,
-	0x7e, 0x1f, 0x4a, 0x53, 0xc1, 0xd6, 0x65, 0xdf, 0xa1, 0x31, 0x17, 0xd9, 0xaf, 0x85, 0xe2, 0x6e,
-	0x98, 0x3c, 0xa3, 0xeb, 0xbb, 0x34, 0x08, 0x0b, 0xe4, 0xa9, 0x9e, 0x71, 0xc9, 0x82, 0xe1, 0xd8,
-	0xe5, 0xde, 0xa3, 0x51, 0x99, 0x2f, 0x59, 0x20, 0x32, 0x8b, 0xfd, 0x86, 0xe2, 0xb3, 0xcb, 0xad,
-	0xd3, 0x30, 0xcd, 0xfb, 0x0d, 0x86, 0x6a, 0x4e, 0x7e, 0x9b, 0x92, 0x77, 0x67, 0xcf, 0xf8, 0xc7,
-	0x09, 0x1a, 0x60, 0x39, 0x7b, 0x77, 0xd6, 0x94, 0x3d, 0xf6, 0x8c, 0x29, 0xff, 0x84, 0xb2, 0x89,
-	0xc0, 0x9e, 0x9a, 0xf3, 0x63, 0x98, 0x73, 0x6f, 0x75, 0xbd, 0xb1, 0x7d, 0x34, 0x2a, 0x35, 0x55,
-	0xb9, 0x02, 0xda, 0x95, 0xa9, 0xec, 0xc7, 0xbd, 0xe4, 0x6d, 0x50, 0x94, 0x11, 0x24, 0x31, 0x2b,
-	0xcc, 0x2e, 0xb3, 0xb2, 0xa3, 0x26, 0x22, 0xac, 0x30, 0x94, 0x67, 0x45, 0x20, 0x51, 0x2b, 0xae,
-	0xd3, 0x67, 0x56, 0x3e, 0x50, 0xa5, 0x99, 0x56, 0xdc, 0x10, 0xc0, 0xad, 0x04, 0x48, 0x4b, 0xeb,
-	0x7e, 0xbe, 0x85, 0xed, 0xe4, 0x8b, 0xe1, 0x04, 0x6c, 0x03, 0xef, 0xcf, 0xc1, 0x4a, 0x46, 0x13,
-	0x06, 0x37, 0x4d, 0xfb, 0xd9, 0x08, 0x5a, 0x60, 0x34, 0xd3, 0xb4, 0x9f, 0x9b, 0x41, 0x2b, 0xff,
-	0xa6, 0x04, 0x49, 0x9a, 0x4f, 0x92, 0x2c, 0x24, 0xdf, 0x6b, 0x6d, 0x3e, 0x56, 0xce, 0xd1, 0x5f,
-	0x0f, 0x5b, 0xad, 0xa7, 0x8a, 0x44, 0x72, 0x90, 0x7a, 0xf8, 0x95, 0xbd, 0xc6, 0xae, 0x22, 0x93,
-	0x22, 0xe4, 0x9b, 0x9b, 0xdb, 0x1b, 0x0d, 0x63, 0xc7, 0xd8, 0xdc, 0xde, 0x53, 0x12, 0xb4, 0xad,
-	0xf9, 0xb4, 0xf5, 0x60, 0x4f, 0x49, 0x92, 0x0c, 0x24, 0x68, 0x5d, 0x8a, 0x00, 0xa4, 0x77, 0xf7,
-	0x8c, 0xcd, 0xed, 0x0d, 0x25, 0x4d, 0xad, 0xec, 0x6d, 0x6e, 0x35, 0x94, 0x0c, 0x45, 0xee, 0xbd,
-	0xbb, 0xf3, 0xb4, 0xa1, 0x64, 0xe9, 0xcf, 0x07, 0x86, 0xf1, 0xe0, 0x2b, 0x4a, 0x8e, 0x92, 0xb6,
-	0x1e, 0xec, 0x28, 0x80, 0xcd, 0x0f, 0x1e, 0x3e, 0x6d, 0x28, 0x79, 0x52, 0x80, 0x6c, 0xf3, 0xdd,
-	0xed, 0x47, 0x7b, 0x9b, 0xad, 0x6d, 0xa5, 0x50, 0x3e, 0x81, 0x12, 0x5b, 0xe6, 0xc0, 0x2a, 0xb2,
-	0xa4, 0xf0, 0x1d, 0x48, 0xb1, 0x9d, 0x91, 0x50, 0x25, 0x95, 0xf0, 0xce, 0x4c, 0x53, 0x56, 0xd8,
-	0x1e, 0x31, 0xda, 0xd2, 0x65, 0x48, 0xb1, 0x55, 0x5a, 0x84, 0x14, 0x5b, 0x1d, 0x19, 0x53, 0x45,
-	0x56, 0x28, 0xff, 0x96, 0x0c, 0xb0, 0x61, 0xef, 0x3e, 0xef, 0x8f, 0x30, 0x21, 0xbf, 0x0c, 0x30,
-	0x79, 0xde, 0x1f, 0xb5, 0x51, 0xf5, 0x3c, 0xa9, 0xcc, 0xd1, 0x1a, 0xf4, 0x77, 0xe4, 0x1a, 0x14,
-	0xb0, 0xf9, 0x90, 0x79, 0x21, 0xcc, 0x25, 0x33, 0x46, 0x9e, 0xd6, 0x71, 0xc7, 0x14, 0x84, 0xd4,
-	0x74, 0x4c, 0x21, 0xd3, 0x02, 0xa4, 0xa6, 0x93, 0xab, 0x80, 0xc5, 0xf6, 0x04, 0x23, 0x0a, 0xa6,
-	0x8d, 0x39, 0x03, 0xfb, 0x65, 0x31, 0x86, 0xbc, 0x0d, 0xd8, 0x27, 0x9b, 0x77, 0x71, 0xfa, 0x74,
-	0xb8, 0xc3, 0x5d, 0xa1, 0x3f, 0xd8, 0x6c, 0x7d, 0xc2, 0x52, 0x0b, 0x72, 0x5e, 0x3d, 0xed, 0x0b,
-	0x6b, 0xf9, 0x8c, 0x14, 0x9c, 0x11, 0x60, 0x95, 0x37, 0x25, 0x06, 0xe0, 0xa3, 0x59, 0xc0, 0xd1,
-	0x30, 0x12, 0x1b, 0x4e, 0xf9, 0x32, 0xcc, 0x6d, 0xdb, 0x16, 0x3b, 0xbd, 0xb8, 0x4a, 0x05, 0x90,
-	0x3a, 0x25, 0x09, 0xb3, 0x27, 0xa9, 0x53, 0xbe, 0x02, 0x20, 0xb4, 0x29, 0x20, 0xed, 0xb3, 0x36,
-	0xf4, 0x01, 0xd2, 0x7e, 0xf9, 0x26, 0xa4, 0xb7, 0x3a, 0xc7, 0x7b, 0x9d, 0x1e, 0xb9, 0x06, 0x30,
-	0xe8, 0x4c, 0x9c, 0xf6, 0x21, 0xee, 0xc3, 0xe7, 0x9f, 0x7f, 0xfe, 0xb9, 0x84, 0x97, 0xbd, 0x1c,
-	0xad, 0x65, 0xfb, 0xf1, 0x02, 0xa0, 0x35, 0xe8, 0x6e, 0x99, 0x93, 0x49, 0xa7, 0x67, 0x92, 0x2a,
-	0xa4, 0x2d, 0x73, 0x42, 0xa3, 0x9d, 0x84, 0xef, 0x08, 0xcb, 0xfe, 0x2a, 0xf8, 0xa8, 0x95, 0x6d,
-	0x84, 0x18, 0x1c, 0x4a, 0x14, 0x48, 0x58, 0x47, 0x43, 0x7c, 0x27, 0x49, 0x19, 0xf4, 0xe7, 0xd2,
-	0x25, 0x48, 0x33, 0x0c, 0x21, 0x90, 0xb4, 0x3a, 0x43, 0xb3, 0xc4, 0xfa, 0xc5, 0xdf, 0xe5, 0x5f,
-	0x95, 0x00, 0xb6, 0xcd, 0x97, 0x67, 0xe8, 0xd3, 0x47, 0xc5, 0xf4, 0x99, 0x60, 0x7d, 0xde, 0x8f,
-	0xeb, 0x93, 0xea, 0xec, 0xd0, 0xb6, 0xbb, 0x6d, 0xb6, 0xc5, 0xec, 0x49, 0x27, 0x47, 0x6b, 0x70,
-	0xd7, 0xca, 0x1f, 0x40, 0x61, 0xd3, 0xb2, 0xcc, 0xb1, 0x3b, 0x26, 0x02, 0xc9, 0x67, 0xf6, 0xc4,
-	0xe1, 0x6f, 0x4b, 0xf8, 0x9b, 0x94, 0x20, 0x39, 0xb2, 0xc7, 0x0e, 0x9b, 0x67, 0x3d, 0xa9, 0xaf,
-	0xae, 0xae, 0x1a, 0x58, 0x43, 0x2e, 0x41, 0xee, 0xc0, 0xb6, 0x2c, 0xf3, 0x80, 0x4e, 0x22, 0x81,
-	0x69, 0x8d, 0x5f, 0x51, 0xfe, 0x65, 0x09, 0x0a, 0x2d, 0xe7, 0x99, 0x6f, 0x5c, 0x81, 0xc4, 0x73,
-	0xf3, 0x04, 0x87, 0x97, 0x30, 0xe8, 0x4f, 0x7a, 0x54, 0x7e, 0xbe, 0x33, 0x38, 0x62, 0x6f, 0x4d,
-	0x05, 0x83, 0x15, 0xc8, 0x05, 0x48, 0xbf, 0x34, 0xfb, 0xbd, 0x67, 0x0e, 0xda, 0x94, 0x0d, 0x5e,
-	0x22, 0xb7, 0x20, 0xd5, 0xa7, 0x83, 0x2d, 0x25, 0x71, 0xbd, 0x2e, 0xf8, 0xeb, 0x25, 0xce, 0xc1,
-	0x60, 0xa0, 0x1b, 0xd9, 0x6c, 0x57, 0xf9, 0xe8, 0xa3, 0x8f, 0x3e, 0x92, 0xcb, 0x87, 0xb0, 0xe8,
-	0x1e, 0xde, 0xc0, 0x64, 0xb7, 0xa1, 0x34, 0x30, 0xed, 0xf6, 0x61, 0xdf, 0xea, 0x0c, 0x06, 0x27,
-	0xed, 0x97, 0xb6, 0xd5, 0xee, 0x58, 0x6d, 0x7b, 0x72, 0xd0, 0x19, 0xe3, 0x02, 0x44, 0x77, 0xb1,
-	0x38, 0x30, 0xed, 0x26, 0xa3, 0xbd, 0x6f, 0x5b, 0x0f, 0xac, 0x16, 0xe5, 0x94, 0xff, 0x20, 0x09,
-	0xb9, 0xad, 0x13, 0xd7, 0xfa, 0x22, 0xa4, 0x0e, 0xec, 0x23, 0x8b, 0xad, 0x65, 0xca, 0x60, 0x05,
-	0x6f, 0x8f, 0x64, 0x61, 0x8f, 0x16, 0x21, 0xf5, 0xe2, 0xc8, 0x76, 0x4c, 0x9c, 0x6e, 0xce, 0x60,
-	0x05, 0xba, 0x5a, 0x23, 0xd3, 0x29, 0x25, 0x31, 0xb9, 0xa5, 0x3f, 0xfd, 0xf9, 0xa7, 0xce, 0x30,
-	0x7f, 0xb2, 0x02, 0x69, 0x9b, 0xae, 0xfe, 0xa4, 0x94, 0xc6, 0x77, 0x35, 0x01, 0x2e, 0xee, 0x8a,
-	0xc1, 0x51, 0x64, 0x13, 0x16, 0x5e, 0x9a, 0xed, 0xe1, 0xd1, 0xc4, 0x69, 0xf7, 0xec, 0x76, 0xd7,
-	0x34, 0x47, 0xe6, 0xb8, 0x34, 0x87, 0x3d, 0x09, 0x3e, 0x61, 0xd6, 0x42, 0x1a, 0xf3, 0x2f, 0xcd,
-	0xad, 0xa3, 0x89, 0xb3, 0x61, 0x3f, 0x46, 0x16, 0xa9, 0x42, 0x6e, 0x6c, 0x52, 0x4f, 0x40, 0x07,
-	0x5b, 0x08, 0xf7, 0x1e, 0xa0, 0x66, 0xc7, 0xe6, 0x08, 0x2b, 0xc8, 0x3a, 0x64, 0xf7, 0xfb, 0xcf,
-	0xcd, 0xc9, 0x33, 0xb3, 0x5b, 0xca, 0xa8, 0x52, 0x65, 0x5e, 0xbb, 0xe8, 0x73, 0xbc, 0x65, 0x5d,
-	0x79, 0x64, 0x0f, 0xec, 0xb1, 0xe1, 0x41, 0xc9, 0x7d, 0xc8, 0x4d, 0xec, 0xa1, 0xc9, 0xf4, 0x9d,
-	0xc5, 0xa0, 0x7a, 0x79, 0x16, 0x6f, 0xd7, 0x1e, 0x9a, 0xae, 0x07, 0x73, 0xf1, 0x64, 0x99, 0x0d,
-	0x74, 0x9f, 0x5e, 0x9d, 0x4b, 0x80, 0x4f, 0x03, 0x74, 0x40, 0x78, 0x95, 0x26, 0x4b, 0x74, 0x40,
-	0xbd, 0x43, 0x7a, 0x23, 0x2a, 0xe5, 0x31, 0xaf, 0xf4, 0xca, 0x4b, 0xb7, 0x20, 0xe7, 0x19, 0xf4,
-	0x5d, 0x1f, 0x73, 0x37, 0x39, 0xf4, 0x07, 0xcc, 0xf5, 0x31, 0x5f, 0xf3, 0x06, 0xa4, 0x70, 0xd8,
-	0x34, 0x42, 0x19, 0x0d, 0x1a, 0x10, 0x73, 0x90, 0xda, 0x30, 0x1a, 0x8d, 0x6d, 0x45, 0xc2, 0xd8,
-	0xf8, 0xf4, 0xdd, 0x86, 0x22, 0x0b, 0x8a, 0xfd, 0x6d, 0x09, 0x12, 0x8d, 0x63, 0x54, 0x0b, 0x9d,
-	0x86, 0x7b, 0xa2, 0xe9, 0x6f, 0xad, 0x06, 0xc9, 0xa1, 0x3d, 0x36, 0xc9, 0xf9, 0x19, 0xb3, 0x2c,
-	0xf5, 0x70, 0xbf, 0x84, 0x57, 0xe4, 0xc6, 0xb1, 0x63, 0x20, 0x5e, 0x7b, 0x0b, 0x92, 0x8e, 0x79,
-	0xec, 0xcc, 0xe6, 0x3d, 0x63, 0x1d, 0x50, 0x80, 0x76, 0x13, 0xd2, 0xd6, 0xd1, 0x70, 0xdf, 0x1c,
-	0xcf, 0x86, 0xf6, 0x71, 0x7a, 0x1c, 0x52, 0x7e, 0x0f, 0x94, 0x47, 0xf6, 0x70, 0x34, 0x30, 0x8f,
-	0x1b, 0xc7, 0x8e, 0x69, 0x4d, 0xfa, 0xb6, 0x45, 0xf5, 0x7c, 0xd8, 0x1f, 0xa3, 0x17, 0xc1, 0xb7,
-	0x62, 0x2c, 0xd0, 0x53, 0x3d, 0x31, 0x0f, 0x6c, 0xab, 0xcb, 0x1d, 0x26, 0x2f, 0x51, 0xb4, 0xf3,
-	0xac, 0x3f, 0xa6, 0x0e, 0x84, 0xfa, 0x79, 0x56, 0x28, 0x6f, 0x40, 0x91, 0xe7, 0x18, 0x13, 0xde,
-	0x71, 0xf9, 0x06, 0x14, 0xdc, 0x2a, 0x7c, 0x38, 0xcf, 0x42, 0xf2, 0x83, 0x86, 0xd1, 0x52, 0xce,
-	0xd1, 0x65, 0x6d, 0x6d, 0x37, 0x14, 0x89, 0xfe, 0xd8, 0x7b, 0xbf, 0x15, 0x58, 0xca, 0x4b, 0x50,
-	0xf0, 0xc6, 0xbe, 0x6b, 0x3a, 0xd8, 0x42, 0x03, 0x42, 0xa6, 0x2e, 0x67, 0xa5, 0x72, 0x06, 0x52,
-	0x8d, 0xe1, 0xc8, 0x39, 0x29, 0xff, 0x22, 0xe4, 0x39, 0xe8, 0x69, 0x7f, 0xe2, 0x90, 0x3b, 0x90,
-	0x19, 0xf2, 0xf9, 0x4a, 0x78, 0xdd, 0x13, 0x35, 0xe5, 0xe3, 0xdc, 0xdf, 0x86, 0x8b, 0x5e, 0xaa,
-	0x42, 0x46, 0xf0, 0xa5, 0xfc, 0xa8, 0xcb, 0xe2, 0x51, 0x67, 0x4e, 0x21, 0x21, 0x38, 0x85, 0xf2,
-	0x16, 0x64, 0x58, 0x04, 0x9c, 0x60, 0x54, 0x67, 0xa9, 0x22, 0x13, 0x13, 0xdb, 0xf9, 0x3c, 0xab,
-	0x63, 0x17, 0x95, 0xab, 0x90, 0x47, 0xc1, 0x72, 0x04, 0x73, 0x9d, 0x80, 0x55, 0x4c, 0x6e, 0xbf,
-	0x9f, 0x82, 0xac, 0xbb, 0x52, 0x64, 0x19, 0xd2, 0x2c, 0x3f, 0x43, 0x53, 0xee, 0xfb, 0x41, 0x0a,
-	0x33, 0x32, 0xb2, 0x0c, 0x19, 0x9e, 0x83, 0x71, 0xef, 0x2e, 0x57, 0x35, 0x23, 0xcd, 0x72, 0x2e,
-	0xaf, 0xb1, 0xa6, 0xa3, 0x63, 0x62, 0x2f, 0x03, 0x69, 0x96, 0x55, 0x11, 0x15, 0x72, 0x5e, 0x1e,
-	0x85, 0xfe, 0x98, 0x3f, 0x03, 0x64, 0xdd, 0xc4, 0x49, 0x40, 0xd4, 0x74, 0xf4, 0x58, 0x3c, 0xe7,
-	0xcf, 0x36, 0xfd, 0xeb, 0x49, 0xd6, 0xcd, 0x86, 0xf0, 0xf9, 0xde, 0x4d, 0xf0, 0x33, 0x3c, 0xff,
-	0xf1, 0x01, 0x35, 0x1d, 0x5d, 0x82, 0x9b, 0xcd, 0x67, 0x78, 0x8e, 0x43, 0xae, 0xd2, 0x21, 0x62,
-	0xce, 0x82, 0x47, 0xdf, 0x4f, 0xdd, 0xd3, 0x2c, 0x93, 0x21, 0xd7, 0xa8, 0x05, 0x96, 0x98, 0xe0,
-	0xb9, 0xf4, 0xf3, 0xf4, 0x0c, 0xcf, 0x57, 0xc8, 0x4d, 0x0a, 0x61, 0xcb, 0x5f, 0x82, 0x88, 0xa4,
-	0x3c, 0xc3, 0x93, 0x72, 0xa2, 0xd2, 0x0e, 0xd1, 0x3d, 0xa0, 0x4b, 0x10, 0x12, 0xf0, 0x34, 0x4b,
-	0xc0, 0xc9, 0x15, 0x34, 0xc7, 0x26, 0x55, 0xf0, 0x93, 0xed, 0x0c, 0x4f, 0x70, 0xfc, 0x76, 0xbc,
-	0xb2, 0x79, 0x89, 0x75, 0x86, 0xa7, 0x30, 0xa4, 0x46, 0xf7, 0x8b, 0xea, 0xbb, 0x34, 0x8f, 0x4e,
-	0xb0, 0xe4, 0x0b, 0xcf, 0xdd, 0x53, 0xe6, 0x03, 0xeb, 0xcc, 0x83, 0x18, 0xa9, 0x26, 0x9e, 0x86,
-	0x25, 0xca, 0xdb, 0xe9, 0x5b, 0x87, 0xa5, 0x22, 0xae, 0x44, 0xa2, 0x6f, 0x1d, 0x1a, 0xa9, 0x26,
-	0xad, 0x61, 0x1a, 0xd8, 0xa6, 0x6d, 0x0a, 0xb6, 0x25, 0x6f, 0xb3, 0x46, 0x5a, 0x45, 0x4a, 0x90,
-	0x6a, 0xb6, 0xb7, 0x3b, 0x56, 0x69, 0x81, 0xf1, 0xac, 0x8e, 0x65, 0x24, 0x9b, 0xdb, 0x1d, 0x8b,
-	0xbc, 0x05, 0x89, 0xc9, 0xd1, 0x7e, 0x89, 0x84, 0xbf, 0xac, 0xec, 0x1e, 0xed, 0xbb, 0x43, 0x31,
-	0x28, 0x82, 0x2c, 0x43, 0x76, 0xe2, 0x8c, 0xdb, 0xbf, 0x60, 0x8e, 0xed, 0xd2, 0x79, 0x5c, 0xc2,
-	0x73, 0x46, 0x66, 0xe2, 0x8c, 0x3f, 0x30, 0xc7, 0xf6, 0x19, 0x9d, 0x5f, 0xf9, 0x0a, 0xe4, 0x05,
-	0xbb, 0xa4, 0x08, 0x92, 0xc5, 0x6e, 0x0a, 0x75, 0xe9, 0x8e, 0x21, 0x59, 0xe5, 0x3d, 0x28, 0xb8,
-	0x39, 0x0c, 0xce, 0x57, 0xa3, 0x27, 0x69, 0x60, 0x8f, 0xf1, 0x7c, 0xce, 0x6b, 0x97, 0xc4, 0x10,
-	0xe5, 0xc3, 0x78, 0xb8, 0x60, 0xd0, 0xb2, 0x12, 0x1a, 0x8a, 0x54, 0xfe, 0xa1, 0x04, 0x85, 0x2d,
-	0x7b, 0xec, 0x3f, 0x30, 0x2f, 0x42, 0x6a, 0xdf, 0xb6, 0x07, 0x13, 0x34, 0x9b, 0x35, 0x58, 0x81,
-	0xbc, 0x01, 0x05, 0xfc, 0xe1, 0xe6, 0x9e, 0xb2, 0xf7, 0xb4, 0x91, 0xc7, 0x7a, 0x9e, 0x70, 0x12,
-	0x48, 0xf6, 0x2d, 0x67, 0xc2, 0x3d, 0x19, 0xfe, 0x26, 0x5f, 0x80, 0x3c, 0xfd, 0xeb, 0x32, 0x93,
-	0xde, 0x85, 0x15, 0x68, 0x35, 0x27, 0xbe, 0x05, 0x73, 0xb8, 0xfb, 0x1e, 0x2c, 0xe3, 0x3d, 0x63,
-	0x14, 0x58, 0x03, 0x07, 0x96, 0x20, 0xc3, 0x5c, 0xc1, 0x04, 0xbf, 0x96, 0xe5, 0x0c, 0xb7, 0x48,
-	0xdd, 0x2b, 0x66, 0x02, 0x2c, 0xdc, 0x67, 0x0c, 0x5e, 0x2a, 0x3f, 0x80, 0x2c, 0x46, 0xa9, 0xd6,
-	0xa0, 0x4b, 0xca, 0x20, 0xf5, 0x4a, 0x26, 0xc6, 0xc8, 0x45, 0xe1, 0x9a, 0xcf, 0x9b, 0x57, 0x36,
-	0x0c, 0xa9, 0xb7, 0xb4, 0x00, 0xd2, 0x06, 0xbd, 0x77, 0x1f, 0x73, 0x37, 0x2d, 0x1d, 0x97, 0x5b,
-	0xdc, 0xc4, 0xb6, 0xf9, 0x32, 0xce, 0xc4, 0xb6, 0xf9, 0x92, 0x99, 0xb8, 0x3a, 0x65, 0x82, 0x96,
-	0x4e, 0xf8, 0xa7, 0x43, 0xe9, 0xa4, 0x5c, 0x85, 0x39, 0x3c, 0x9e, 0x7d, 0xab, 0xb7, 0x63, 0xf7,
-	0x2d, 0xbc, 0xe7, 0x1f, 0xe2, 0x3d, 0x49, 0x32, 0xa4, 0x43, 0xba, 0x07, 0xe6, 0x71, 0xe7, 0x80,
-	0xdd, 0x38, 0xb3, 0x06, 0x2b, 0x94, 0x3f, 0x4b, 0xc2, 0x3c, 0x77, 0xad, 0xef, 0xf7, 0x9d, 0x67,
-	0x5b, 0x9d, 0x11, 0x79, 0x0a, 0x05, 0xea, 0x55, 0xdb, 0xc3, 0xce, 0x68, 0x44, 0x8f, 0xaf, 0x84,
-	0x57, 0x8d, 0xeb, 0x53, 0xae, 0x9a, 0xe3, 0x57, 0xb6, 0x3b, 0x43, 0x73, 0x8b, 0x61, 0x1b, 0x96,
-	0x33, 0x3e, 0x31, 0xf2, 0x96, 0x5f, 0x43, 0x36, 0x21, 0x3f, 0x9c, 0xf4, 0x3c, 0x63, 0x32, 0x1a,
-	0xab, 0x44, 0x1a, 0xdb, 0x9a, 0xf4, 0x02, 0xb6, 0x60, 0xe8, 0x55, 0xd0, 0x81, 0x51, 0x7f, 0xec,
-	0xd9, 0x4a, 0x9c, 0x32, 0x30, 0xea, 0x3a, 0x82, 0x03, 0xdb, 0xf7, 0x6b, 0xc8, 0x63, 0x00, 0x7a,
-	0xbc, 0x1c, 0x9b, 0xa6, 0x4e, 0xa8, 0xa0, 0xbc, 0xf6, 0x66, 0xa4, 0xad, 0x5d, 0x67, 0xbc, 0x67,
-	0xef, 0x3a, 0x63, 0x66, 0x88, 0x1e, 0x4c, 0x2c, 0x2e, 0xbd, 0x03, 0x4a, 0x78, 0xfe, 0xe2, 0x8d,
-	0x3c, 0x35, 0xe3, 0x46, 0x9e, 0xe3, 0x37, 0xf2, 0xba, 0x7c, 0x57, 0x5a, 0x7a, 0x0f, 0x8a, 0xa1,
-	0x29, 0x8b, 0x74, 0xc2, 0xe8, 0xb7, 0x45, 0x7a, 0x5e, 0x7b, 0x5d, 0xf8, 0x9c, 0x2d, 0x6e, 0xb8,
-	0x68, 0xf7, 0x1d, 0x50, 0xc2, 0xd3, 0x17, 0x0d, 0x67, 0x63, 0x32, 0x05, 0xe4, 0xdf, 0x87, 0xb9,
-	0xc0, 0x94, 0x45, 0x72, 0xee, 0x94, 0x49, 0x95, 0x7f, 0x29, 0x05, 0xa9, 0x96, 0x65, 0xda, 0x87,
-	0xe4, 0xf5, 0x60, 0x9c, 0x7c, 0x72, 0xce, 0x8d, 0x91, 0x17, 0x43, 0x31, 0xf2, 0xc9, 0x39, 0x2f,
-	0x42, 0x5e, 0x0c, 0x45, 0x48, 0xb7, 0xa9, 0xa6, 0x93, 0xcb, 0x53, 0xf1, 0xf1, 0xc9, 0x39, 0x21,
-	0x38, 0x5e, 0x9e, 0x0a, 0x8e, 0x7e, 0x73, 0x4d, 0xa7, 0x0e, 0x35, 0x18, 0x19, 0x9f, 0x9c, 0xf3,
-	0xa3, 0xe2, 0x72, 0x38, 0x2a, 0x7a, 0x8d, 0x35, 0x9d, 0x0d, 0x49, 0x88, 0x88, 0x38, 0x24, 0x16,
-	0x0b, 0x97, 0xc3, 0xb1, 0x10, 0x79, 0x3c, 0x0a, 0x2e, 0x87, 0xa3, 0x20, 0x36, 0xf2, 0xa8, 0x77,
-	0x31, 0x14, 0xf5, 0xd0, 0x28, 0x0b, 0x77, 0xcb, 0xe1, 0x70, 0xc7, 0x78, 0xc2, 0x48, 0xc5, 0x58,
-	0xe7, 0x35, 0xd6, 0x74, 0xa2, 0x85, 0x02, 0x5d, 0xf4, 0x6d, 0x1f, 0xf7, 0x02, 0x9d, 0xbe, 0x4e,
-	0x97, 0xcd, 0xbd, 0x88, 0x16, 0x63, 0xbe, 0xf8, 0xe3, 0x6a, 0xba, 0x17, 0x31, 0x0d, 0x32, 0x87,
-	0x3c, 0x01, 0x56, 0xd0, 0x73, 0x09, 0xb2, 0xc4, 0xcd, 0x5f, 0x69, 0xb6, 0xd1, 0x83, 0xd1, 0x79,
-	0x1d, 0xb2, 0x3b, 0x7d, 0x05, 0xe6, 0x9a, 0xed, 0xa7, 0x9d, 0x71, 0xcf, 0x9c, 0x38, 0xed, 0xbd,
-	0x4e, 0xcf, 0x7b, 0x44, 0xa0, 0xfb, 0x9f, 0x6f, 0xf2, 0x96, 0xbd, 0x4e, 0x8f, 0x5c, 0x70, 0xc5,
-	0xd5, 0xc5, 0x56, 0x89, 0xcb, 0x6b, 0xe9, 0x75, 0xba, 0x68, 0xcc, 0x18, 0xfa, 0xc2, 0x05, 0xee,
-	0x0b, 0x1f, 0x66, 0x20, 0x75, 0x64, 0xf5, 0x6d, 0xeb, 0x61, 0x0e, 0x32, 0x8e, 0x3d, 0x1e, 0x76,
-	0x1c, 0xbb, 0xfc, 0x23, 0x09, 0xe0, 0x91, 0x3d, 0x1c, 0x1e, 0x59, 0xfd, 0x17, 0x47, 0x26, 0xb9,
-	0x02, 0xf9, 0x61, 0xe7, 0xb9, 0xd9, 0x1e, 0x9a, 0xed, 0x83, 0xb1, 0x7b, 0x0e, 0x72, 0xb4, 0x6a,
-	0xcb, 0x7c, 0x34, 0x3e, 0x21, 0x25, 0xf7, 0x8a, 0x8e, 0xda, 0x41, 0x49, 0xf2, 0x2b, 0xfb, 0x22,
-	0xbf, 0x74, 0xa6, 0xf9, 0x1e, 0xba, 0xd7, 0x4e, 0x96, 0x47, 0x64, 0xf8, 0xee, 0x61, 0x89, 0x4a,
-	0xde, 0x31, 0x87, 0xa3, 0xf6, 0x01, 0x4a, 0x85, 0xca, 0x21, 0x45, 0xcb, 0x8f, 0xc8, 0x6d, 0x48,
-	0x1c, 0xd8, 0x03, 0x14, 0xc9, 0x29, 0xfb, 0x42, 0x71, 0xe4, 0x0d, 0x48, 0x0c, 0x27, 0x4c, 0x36,
-	0x79, 0x6d, 0x41, 0xb8, 0x27, 0xb0, 0xd0, 0x44, 0x61, 0xc3, 0x49, 0xcf, 0x9b, 0xf7, 0x8d, 0x22,
-	0x24, 0x9a, 0xad, 0x16, 0x8d, 0xfd, 0xcd, 0x56, 0x6b, 0x4d, 0x91, 0xea, 0x5f, 0x82, 0x6c, 0x6f,
-	0x6c, 0x9a, 0xd4, 0x3d, 0xcc, 0xce, 0x39, 0x3e, 0xc4, 0x58, 0xe7, 0x81, 0xea, 0x5b, 0x90, 0x39,
-	0x60, 0x59, 0x07, 0x89, 0x48, 0x6b, 0x4b, 0x7f, 0xc8, 0x1e, 0x55, 0x96, 0xfc, 0xe6, 0x70, 0x9e,
-	0x62, 0xb8, 0x36, 0xea, 0x3b, 0x90, 0x1b, 0xb7, 0x4f, 0x33, 0xf8, 0x31, 0x8b, 0x2e, 0x71, 0x06,
-	0xb3, 0x63, 0x5e, 0x55, 0x6f, 0xc0, 0x82, 0x65, 0xbb, 0xdf, 0x50, 0xda, 0x5d, 0x76, 0xc6, 0x2e,
-	0x4e, 0x5f, 0xe5, 0x5c, 0xe3, 0x26, 0xfb, 0x6e, 0x69, 0xd9, 0xbc, 0x81, 0x9d, 0xca, 0xfa, 0x23,
-	0x50, 0x04, 0x33, 0x98, 0x7a, 0xc6, 0x59, 0x39, 0x64, 0x1f, 0x4a, 0x3d, 0x2b, 0x78, 0xee, 0x43,
-	0x46, 0xd8, 0xc9, 0x8c, 0x31, 0xd2, 0x63, 0x5f, 0x9d, 0x3d, 0x23, 0xe8, 0xea, 0xa6, 0x8d, 0x50,
-	0x5f, 0x13, 0x6d, 0xe4, 0x19, 0xfb, 0x20, 0x2d, 0x1a, 0xa9, 0xe9, 0xa1, 0x55, 0x39, 0x3a, 0x75,
-	0x28, 0x7d, 0xf6, 0x3d, 0xd9, 0xb3, 0xc2, 0x1c, 0xe0, 0x0c, 0x33, 0xf1, 0x83, 0xf9, 0x90, 0x7d,
-	0x6a, 0x0e, 0x98, 0x99, 0x1a, 0xcd, 0xe4, 0xd4, 0xd1, 0x3c, 0x67, 0xdf, 0x75, 0x3d, 0x33, 0xbb,
-	0xb3, 0x46, 0x33, 0x39, 0x75, 0x34, 0x03, 0xf6, 0xc5, 0x37, 0x60, 0xa6, 0xa6, 0xd7, 0x37, 0x80,
-	0x88, 0x5b, 0xcd, 0xe3, 0x44, 0x8c, 0x9d, 0x21, 0xfb, 0x8e, 0xef, 0x6f, 0x36, 0xa3, 0xcc, 0x32,
-	0x14, 0x3f, 0x20, 0x8b, 0x7d, 0xe2, 0x0f, 0x1a, 0xaa, 0xe9, 0xf5, 0x4d, 0x38, 0x2f, 0x4e, 0xec,
-	0x0c, 0x43, 0xb2, 0x55, 0xa9, 0x52, 0x34, 0x16, 0xfc, 0xa9, 0x71, 0xce, 0x4c, 0x53, 0xf1, 0x83,
-	0x1a, 0xa9, 0x52, 0x45, 0x99, 0x32, 0x55, 0xd3, 0xeb, 0x0f, 0xa0, 0x28, 0x98, 0xda, 0xc7, 0x08,
-	0x1d, 0x6d, 0xe6, 0x05, 0xfb, 0x5f, 0x0b, 0xcf, 0x0c, 0x8d, 0xe8, 0xe1, 0x1d, 0xe3, 0x31, 0x2e,
-	0xda, 0xc8, 0x98, 0xfd, 0xa3, 0x80, 0x3f, 0x16, 0x64, 0x84, 0x8e, 0x04, 0xe6, 0xdf, 0x71, 0x56,
-	0x26, 0xec, 0x5f, 0x08, 0xfc, 0xa1, 0x50, 0x42, 0xbd, 0x1f, 0x98, 0x8e, 0x49, 0x83, 0x5c, 0x8c,
-	0x0d, 0x07, 0x3d, 0xf2, 0x9b, 0x91, 0x80, 0x15, 0xf1, 0x81, 0x44, 0x98, 0x36, 0x2d, 0xd6, 0x37,
-	0x61, 0xfe, 0xec, 0x0e, 0xe9, 0x63, 0x89, 0x65, 0xcb, 0xd5, 0x15, 0x9a, 0x50, 0x1b, 0x73, 0xdd,
-	0x80, 0x5f, 0x6a, 0xc0, 0xdc, 0x99, 0x9d, 0xd2, 0x27, 0x12, 0xcb, 0x39, 0xa9, 0x25, 0xa3, 0xd0,
-	0x0d, 0x7a, 0xa6, 0xb9, 0x33, 0xbb, 0xa5, 0x4f, 0x25, 0xf6, 0x40, 0xa1, 0x6b, 0x9e, 0x11, 0xd7,
-	0x33, 0xcd, 0x9d, 0xd9, 0x2d, 0x7d, 0x95, 0x65, 0x94, 0xb2, 0x5e, 0x15, 0x8d, 0xa0, 0x2f, 0x98,
-	0x3f, 0xbb, 0x5b, 0xfa, 0x9a, 0x84, 0x8f, 0x15, 0xb2, 0xae, 0x7b, 0xeb, 0xe2, 0x79, 0xa6, 0xf9,
-	0xb3, 0xbb, 0xa5, 0xaf, 0x4b, 0xf8, 0xa4, 0x21, 0xeb, 0xeb, 0x01, 0x33, 0xc1, 0xd1, 0x9c, 0xee,
-	0x96, 0xbe, 0x21, 0xe1, 0x2b, 0x83, 0xac, 0xd7, 0x3c, 0x33, 0xbb, 0x53, 0xa3, 0x39, 0xdd, 0x2d,
-	0x7d, 0x13, 0x6f, 0xf1, 0x75, 0x59, 0xbf, 0x13, 0x30, 0x83, 0x9e, 0xa9, 0xf8, 0x0a, 0x6e, 0xe9,
-	0x5b, 0x12, 0x3e, 0x06, 0xc9, 0xfa, 0x5d, 0xc3, 0xed, 0xdd, 0xf7, 0x4c, 0xc5, 0x57, 0x70, 0x4b,
-	0x9f, 0x49, 0xf8, 0x66, 0x24, 0xeb, 0xf7, 0x82, 0x86, 0xd0, 0x33, 0x29, 0xaf, 0xe2, 0x96, 0xbe,
-	0x4d, 0x2d, 0x15, 0xeb, 0xf2, 0xfa, 0xaa, 0xe1, 0x0e, 0x40, 0xf0, 0x4c, 0xca, 0xab, 0xb8, 0xa5,
-	0xef, 0x50, 0x53, 0x4a, 0x5d, 0x5e, 0x5f, 0x0b, 0x99, 0xaa, 0xe9, 0xf5, 0x47, 0x50, 0x38, 0xab,
-	0x5b, 0xfa, 0xae, 0xf8, 0x16, 0x97, 0xef, 0x0a, 0xbe, 0x69, 0x47, 0xd8, 0xb3, 0x53, 0x1d, 0xd3,
-	0xf7, 0x30, 0xc7, 0xa9, 0xcf, 0x3d, 0x61, 0xef, 0x55, 0x8c, 0xe0, 0x6f, 0x1f, 0x73, 0x53, 0x5b,
-	0xfe, 0xf9, 0x38, 0xd5, 0x47, 0x7d, 0x5f, 0xc2, 0x47, 0xad, 0x02, 0x37, 0x88, 0x78, 0xef, 0xa4,
-	0x30, 0x87, 0xf5, 0xa1, 0x3f, 0xcb, 0xd3, 0xbc, 0xd5, 0x0f, 0xa4, 0x57, 0x71, 0x57, 0xf5, 0x44,
-	0x6b, 0xbb, 0xe1, 0x2d, 0x06, 0xd6, 0xbc, 0x0d, 0xc9, 0x63, 0x6d, 0x75, 0x4d, 0xbc, 0x92, 0x89,
-	0x6f, 0xb9, 0xcc, 0x49, 0xe5, 0xb5, 0xa2, 0xf0, 0xdc, 0x3d, 0x1c, 0x39, 0x27, 0x06, 0xb2, 0x38,
-	0x5b, 0x8b, 0x64, 0x7f, 0x12, 0xc3, 0xd6, 0x38, 0xbb, 0x1a, 0xc9, 0xfe, 0x34, 0x86, 0x5d, 0xe5,
-	0x6c, 0x3d, 0x92, 0xfd, 0xd5, 0x18, 0xb6, 0xce, 0xd9, 0xeb, 0x91, 0xec, 0xaf, 0xc5, 0xb0, 0xd7,
-	0x39, 0xbb, 0x16, 0xc9, 0xfe, 0x7a, 0x0c, 0xbb, 0xc6, 0xd9, 0x77, 0x22, 0xd9, 0xdf, 0x88, 0x61,
-	0xdf, 0xe1, 0xec, 0xbb, 0x91, 0xec, 0x6f, 0xc6, 0xb0, 0xef, 0x72, 0xf6, 0xbd, 0x48, 0xf6, 0xb7,
-	0x62, 0xd8, 0xf7, 0x18, 0x7b, 0x6d, 0x35, 0x92, 0xfd, 0x59, 0x34, 0x7b, 0x6d, 0x95, 0xb3, 0xa3,
-	0xb5, 0xf6, 0xed, 0x18, 0x36, 0xd7, 0xda, 0x5a, 0xb4, 0xd6, 0xbe, 0x13, 0xc3, 0xe6, 0x5a, 0x5b,
-	0x8b, 0xd6, 0xda, 0x77, 0x63, 0xd8, 0x5c, 0x6b, 0x6b, 0xd1, 0x5a, 0xfb, 0x5e, 0x0c, 0x9b, 0x6b,
-	0x6d, 0x2d, 0x5a, 0x6b, 0xdf, 0x8f, 0x61, 0x73, 0xad, 0xad, 0x45, 0x6b, 0xed, 0x07, 0x31, 0x6c,
-	0xae, 0xb5, 0xb5, 0x68, 0xad, 0xfd, 0x51, 0x0c, 0x9b, 0x6b, 0x6d, 0x2d, 0x5a, 0x6b, 0x7f, 0x1c,
-	0xc3, 0xe6, 0x5a, 0x5b, 0x8b, 0xd6, 0xda, 0x9f, 0xc4, 0xb0, 0xb9, 0xd6, 0xb4, 0x68, 0xad, 0xfd,
-	0x69, 0x34, 0x5b, 0xe3, 0x5a, 0xd3, 0xa2, 0xb5, 0xf6, 0x67, 0x31, 0x6c, 0xae, 0x35, 0x2d, 0x5a,
-	0x6b, 0x7f, 0x1e, 0xc3, 0xe6, 0x5a, 0xd3, 0xa2, 0xb5, 0xf6, 0xc3, 0x18, 0x36, 0xd7, 0x9a, 0x16,
-	0xad, 0xb5, 0xbf, 0x88, 0x61, 0x73, 0xad, 0x69, 0xd1, 0x5a, 0xfb, 0xcb, 0x18, 0x36, 0xd7, 0x9a,
-	0x16, 0xad, 0xb5, 0xbf, 0x8a, 0x61, 0x73, 0xad, 0x69, 0xd1, 0x5a, 0xfb, 0xeb, 0x18, 0x36, 0xd7,
-	0x9a, 0x16, 0xad, 0xb5, 0xbf, 0x89, 0x61, 0x73, 0xad, 0x69, 0xd1, 0x5a, 0xfb, 0xdb, 0x18, 0x36,
-	0xd7, 0x5a, 0x35, 0x5a, 0x6b, 0x7f, 0x17, 0xcd, 0xae, 0x72, 0xad, 0x55, 0xa3, 0xb5, 0xf6, 0xf7,
-	0x31, 0x6c, 0xae, 0xb5, 0x6a, 0xb4, 0xd6, 0xfe, 0x21, 0x86, 0xcd, 0xb5, 0x56, 0x8d, 0xd6, 0xda,
-	0x3f, 0xc6, 0xb0, 0xb9, 0xd6, 0xaa, 0xd1, 0x5a, 0xfb, 0x51, 0x0c, 0x9b, 0x6b, 0xad, 0x1a, 0xad,
-	0xb5, 0x7f, 0x8a, 0x61, 0x73, 0xad, 0x55, 0xa3, 0xb5, 0xf6, 0xcf, 0x31, 0x6c, 0xae, 0xb5, 0x6a,
-	0xb4, 0xd6, 0xfe, 0x25, 0x86, 0xcd, 0xb5, 0x56, 0x8d, 0xd6, 0xda, 0xbf, 0xc6, 0xb0, 0xb9, 0xd6,
-	0xaa, 0xd1, 0x5a, 0xfb, 0xb7, 0x18, 0x36, 0xd7, 0x9a, 0x1e, 0xad, 0xb5, 0x7f, 0x8f, 0x66, 0xeb,
-	0x5c, 0x6b, 0x7a, 0xb4, 0xd6, 0xfe, 0x23, 0x86, 0xcd, 0xb5, 0xa6, 0x47, 0x6b, 0xed, 0x3f, 0x63,
-	0xd8, 0x5c, 0x6b, 0x7a, 0xb4, 0xd6, 0xfe, 0x2b, 0x86, 0xcd, 0xb5, 0xa6, 0x47, 0x6b, 0xed, 0xbf,
-	0x63, 0xd8, 0x5c, 0x6b, 0x7a, 0xb4, 0xd6, 0xfe, 0x27, 0x86, 0xcd, 0xb5, 0xa6, 0x47, 0x6b, 0xed,
-	0xc7, 0x31, 0x6c, 0xae, 0x35, 0x3d, 0x5a, 0x6b, 0x3f, 0x89, 0x61, 0x73, 0xad, 0xe9, 0xd1, 0x5a,
-	0xfb, 0xdf, 0x18, 0x36, 0xd7, 0x9a, 0x1e, 0xad, 0xb5, 0xff, 0x8b, 0x61, 0x73, 0xad, 0xad, 0x47,
-	0x6b, 0xed, 0xff, 0xa3, 0xd9, 0xeb, 0xab, 0x3f, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x00, 0xcd,
-	0x32, 0x57, 0x39, 0x00, 0x00,
-}
diff --git a/vendor/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go
index 965876bf..2205fdaa 100644
--- a/vendor/github.com/golang/protobuf/proto/text.go
+++ b/vendor/github.com/golang/protobuf/proto/text.go
@@ -50,7 +50,6 @@ import (
 var (
 	newline         = []byte("\n")
 	spaces          = []byte("                                        ")
-	gtNewline       = []byte(">\n")
 	endBraceNewline = []byte("}\n")
 	backslashN      = []byte{'\\', 'n'}
 	backslashR      = []byte{'\\', 'r'}
@@ -170,11 +169,6 @@ func writeName(w *textWriter, props *Properties) error {
 	return nil
 }
 
-// raw is the interface satisfied by RawMessage.
-type raw interface {
-	Bytes() []byte
-}
-
 func requiresQuotes(u string) bool {
 	// When type URL contains any characters except [0-9A-Za-z./\-]*, it must be quoted.
 	for _, ch := range u {
@@ -269,6 +263,10 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 		props := sprops.Prop[i]
 		name := st.Field(i).Name
 
+		if name == "XXX_NoUnkeyedLiteral" {
+			continue
+		}
+
 		if strings.HasPrefix(name, "XXX_") {
 			// There are two XXX_ fields:
 			//   XXX_unrecognized []byte
@@ -436,12 +434,6 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 				return err
 			}
 		}
-		if b, ok := fv.Interface().(raw); ok {
-			if err := writeRaw(w, b.Bytes()); err != nil {
-				return err
-			}
-			continue
-		}
 
 		// Enums have a String method, so writeAny will work fine.
 		if err := tm.writeAny(w, fv, props); err != nil {
@@ -455,7 +447,7 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 
 	// Extensions (the XXX_extensions field).
 	pv := sv.Addr()
-	if _, ok := extendable(pv.Interface()); ok {
+	if _, err := extendable(pv.Interface()); err == nil {
 		if err := tm.writeExtensions(w, pv); err != nil {
 			return err
 		}
@@ -464,27 +456,6 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 	return nil
 }
 
-// writeRaw writes an uninterpreted raw message.
-func writeRaw(w *textWriter, b []byte) error {
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	w.indent()
-	if err := writeUnknownStruct(w, b); err != nil {
-		return err
-	}
-	w.unindent()
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-	return nil
-}
-
 // writeAny writes an arbitrary field.
 func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
 	v = reflect.Indirect(v)
@@ -535,6 +506,19 @@ func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Propert
 			}
 		}
 		w.indent()
+		if v.CanAddr() {
+			// Calling v.Interface on a struct causes the reflect package to
+			// copy the entire struct. This is racy with the new Marshaler
+			// since we atomically update the XXX_sizecache.
+			//
+			// Thus, we retrieve a pointer to the struct if possible to avoid
+			// a race since v.Interface on the pointer doesn't copy the struct.
+			//
+			// If v is not addressable, then we are not worried about a race
+			// since it implies that the binary Marshaler cannot possibly be
+			// mutating this value.
+			v = v.Addr()
+		}
 		if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
 			text, err := etm.MarshalText()
 			if err != nil {
@@ -543,8 +527,13 @@ func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Propert
 			if _, err = w.Write(text); err != nil {
 				return err
 			}
-		} else if err := tm.writeStruct(w, v); err != nil {
-			return err
+		} else {
+			if v.Kind() == reflect.Ptr {
+				v = v.Elem()
+			}
+			if err := tm.writeStruct(w, v); err != nil {
+				return err
+			}
 		}
 		w.unindent()
 		if err := w.WriteByte(ket); err != nil {
diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go
index 5e14513f..0685bae3 100644
--- a/vendor/github.com/golang/protobuf/proto/text_parser.go
+++ b/vendor/github.com/golang/protobuf/proto/text_parser.go
@@ -206,7 +206,6 @@ func (p *textParser) advance() {
 
 var (
 	errBadUTF8 = errors.New("proto: bad UTF-8")
-	errBadHex  = errors.New("proto: bad hexadecimal")
 )
 
 func unquoteC(s string, quote rune) (string, error) {
@@ -277,60 +276,47 @@ func unescape(s string) (ch string, tail string, err error) {
 		return "?", s, nil // trigraph workaround
 	case '\'', '"', '\\':
 		return string(r), s, nil
-	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
+	case '0', '1', '2', '3', '4', '5', '6', '7':
 		if len(s) < 2 {
 			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
 		}
-		base := 8
-		ss := s[:2]
+		ss := string(r) + s[:2]
 		s = s[2:]
-		if r == 'x' || r == 'X' {
-			base = 16
-		} else {
-			ss = string(r) + ss
-		}
-		i, err := strconv.ParseUint(ss, base, 8)
+		i, err := strconv.ParseUint(ss, 8, 8)
 		if err != nil {
-			return "", "", err
+			return "", "", fmt.Errorf(`\%s contains non-octal digits`, ss)
 		}
 		return string([]byte{byte(i)}), s, nil
-	case 'u', 'U':
-		n := 4
-		if r == 'U' {
+	case 'x', 'X', 'u', 'U':
+		var n int
+		switch r {
+		case 'x', 'X':
+			n = 2
+		case 'u':
+			n = 4
+		case 'U':
 			n = 8
 		}
 		if len(s) < n {
-			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
-		}
-
-		bs := make([]byte, n/2)
-		for i := 0; i < n; i += 2 {
-			a, ok1 := unhex(s[i])
-			b, ok2 := unhex(s[i+1])
-			if !ok1 || !ok2 {
-				return "", "", errBadHex
-			}
-			bs[i/2] = a<<4 | b
+			return "", "", fmt.Errorf(`\%c requires %d following digits`, r, n)
 		}
+		ss := s[:n]
 		s = s[n:]
-		return string(bs), s, nil
+		i, err := strconv.ParseUint(ss, 16, 64)
+		if err != nil {
+			return "", "", fmt.Errorf(`\%c%s contains non-hexadecimal digits`, r, ss)
+		}
+		if r == 'x' || r == 'X' {
+			return string([]byte{byte(i)}), s, nil
+		}
+		if i > utf8.MaxRune {
+			return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss)
+		}
+		return string(i), s, nil
 	}
 	return "", "", fmt.Errorf(`unknown escape \%c`, r)
 }
 
-// Adapted from src/pkg/strconv/quote.go.
-func unhex(b byte) (v byte, ok bool) {
-	switch {
-	case '0' <= b && b <= '9':
-		return b - '0', true
-	case 'a' <= b && b <= 'f':
-		return b - 'a' + 10, true
-	case 'A' <= b && b <= 'F':
-		return b - 'A' + 10, true
-	}
-	return 0, false
-}
-
 // Back off the parser by one token. Can only be done between calls to next().
 // It makes the next advance() a no-op.
 func (p *textParser) back() { p.backed = true }
@@ -728,6 +714,9 @@ func (p *textParser) consumeExtName() (string, error) {
 		if tok.err != nil {
 			return "", p.errorf("unrecognized type_url or extension name: %s", tok.err)
 		}
+		if p.done && tok.value != "]" {
+			return "", p.errorf("unclosed type_url or extension name")
+		}
 	}
 	return strings.Join(parts, ""), nil
 }
@@ -865,7 +854,7 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error {
 		return p.readStruct(fv, terminator)
 	case reflect.Uint32:
 		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(x)
+			fv.SetUint(uint64(x))
 			return nil
 		}
 	case reflect.Uint64:
@@ -883,13 +872,9 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error {
 // UnmarshalText returns *RequiredNotSetError.
 func UnmarshalText(s string, pb Message) error {
 	if um, ok := pb.(encoding.TextUnmarshaler); ok {
-		err := um.UnmarshalText([]byte(s))
-		return err
+		return um.UnmarshalText([]byte(s))
 	}
 	pb.Reset()
 	v := reflect.ValueOf(pb)
-	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
-		return pe
-	}
-	return nil
+	return newTextParser(s).readStruct(v.Elem(), "")
 }
diff --git a/vendor/github.com/golang/protobuf/proto/text_parser_test.go b/vendor/github.com/golang/protobuf/proto/text_parser_test.go
index 8f7cb4d2..a8198087 100644
--- a/vendor/github.com/golang/protobuf/proto/text_parser_test.go
+++ b/vendor/github.com/golang/protobuf/proto/text_parser_test.go
@@ -32,13 +32,13 @@
 package proto_test
 
 import (
+	"fmt"
 	"math"
-	"reflect"
 	"testing"
 
 	. "github.com/golang/protobuf/proto"
 	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	. "github.com/golang/protobuf/proto/testdata"
+	. "github.com/golang/protobuf/proto/test_proto"
 )
 
 type UnmarshalTextTest struct {
@@ -167,10 +167,19 @@ var unMarshalTextTests = []UnmarshalTextTest{
 
 	// Quoted string with UTF-8 bytes.
 	{
-		in: "count:42 name: '\303\277\302\201\xAB'",
+		in: "count:42 name: '\303\277\302\201\x00\xAB\xCD\xEF'",
 		out: &MyMessage{
 			Count: Int32(42),
-			Name:  String("\303\277\302\201\xAB"),
+			Name:  String("\303\277\302\201\x00\xAB\xCD\xEF"),
+		},
+	},
+
+	// Quoted string with unicode escapes.
+	{
+		in: `count: 42 name: "\u0047\U00000047\uffff\U0010ffff"`,
+		out: &MyMessage{
+			Count: Int32(42),
+			Name:  String("GG\uffff\U0010ffff"),
 		},
 	},
 
@@ -180,6 +189,24 @@ var unMarshalTextTests = []UnmarshalTextTest{
 		err: `line 1.15: invalid quoted string "\0": \0 requires 2 following digits`,
 	},
 
+	// Bad \u escape
+	{
+		in:  `count: 42 name: "\u000"`,
+		err: `line 1.16: invalid quoted string "\u000": \u requires 4 following digits`,
+	},
+
+	// Bad \U escape
+	{
+		in:  `count: 42 name: "\U0000000"`,
+		err: `line 1.16: invalid quoted string "\U0000000": \U requires 8 following digits`,
+	},
+
+	// Bad \U escape
+	{
+		in:  `count: 42 name: "\xxx"`,
+		err: `line 1.16: invalid quoted string "\xxx": \xxx contains non-hexadecimal digits`,
+	},
+
 	// Number too large for int64
 	{
 		in:  "count: 1 others { key: 123456789012345678901 }",
@@ -263,6 +290,12 @@ var unMarshalTextTests = []UnmarshalTextTest{
 		err: `line 1.17: invalid float32: "17.4"`,
 	},
 
+	// unclosed bracket doesn't cause infinite loop
+	{
+		in:  `[`,
+		err: `line 1.0: unclosed type_url or extension name`,
+	},
+
 	// Enum
 	{
 		in: `count:42 bikeshed: BLUE`,
@@ -330,7 +363,7 @@ var unMarshalTextTests = []UnmarshalTextTest{
 	// Missing required field
 	{
 		in:  `name: "Pawel"`,
-		err: `proto: required field "testdata.MyMessage.count" not set`,
+		err: fmt.Sprintf(`proto: required field "%T.count" not set`, MyMessage{}),
 		out: &MyMessage{
 			Name: String("Pawel"),
 		},
@@ -339,7 +372,7 @@ var unMarshalTextTests = []UnmarshalTextTest{
 	// Missing required field in a required submessage
 	{
 		in:  `count: 42 we_must_go_deeper < leo_finally_won_an_oscar <> >`,
-		err: `proto: required field "testdata.InnerMessage.host" not set`,
+		err: fmt.Sprintf(`proto: required field "%T.host" not set`, InnerMessage{}),
 		out: &MyMessage{
 			Count:          Int32(42),
 			WeMustGoDeeper: &RequiredInnerMessage{LeoFinallyWonAnOscar: &InnerMessage{}},
@@ -470,10 +503,10 @@ var unMarshalTextTests = []UnmarshalTextTest{
 	},
 
 	// Extension
-	buildExtStructTest(`count: 42 [testdata.Ext.more]:<data:"Hello, world!" >`),
-	buildExtStructTest(`count: 42 [testdata.Ext.more] {data:"Hello, world!"}`),
-	buildExtDataTest(`count: 42 [testdata.Ext.text]:"Hello, world!" [testdata.Ext.number]:1729`),
-	buildExtRepStringTest(`count: 42 [testdata.greeting]:"bula" [testdata.greeting]:"hola"`),
+	buildExtStructTest(`count: 42 [test_proto.Ext.more]:<data:"Hello, world!" >`),
+	buildExtStructTest(`count: 42 [test_proto.Ext.more] {data:"Hello, world!"}`),
+	buildExtDataTest(`count: 42 [test_proto.Ext.text]:"Hello, world!" [test_proto.Ext.number]:1729`),
+	buildExtRepStringTest(`count: 42 [test_proto.greeting]:"bula" [test_proto.greeting]:"hola"`),
 
 	// Big all-in-one
 	{
@@ -534,7 +567,7 @@ func TestUnmarshalText(t *testing.T) {
 			// We don't expect failure.
 			if err != nil {
 				t.Errorf("Test %d: Unexpected error: %v", i, err)
-			} else if !reflect.DeepEqual(pb, test.out) {
+			} else if !Equal(pb, test.out) {
 				t.Errorf("Test %d: Incorrect populated \nHave: %v\nWant: %v",
 					i, pb, test.out)
 			}
@@ -545,7 +578,7 @@ func TestUnmarshalText(t *testing.T) {
 			} else if err.Error() != test.err {
 				t.Errorf("Test %d: Incorrect error.\nHave: %v\nWant: %v",
 					i, err.Error(), test.err)
-			} else if _, ok := err.(*RequiredNotSetError); ok && test.out != nil && !reflect.DeepEqual(pb, test.out) {
+			} else if _, ok := err.(*RequiredNotSetError); ok && test.out != nil && !Equal(pb, test.out) {
 				t.Errorf("Test %d: Incorrect populated \nHave: %v\nWant: %v",
 					i, pb, test.out)
 			}
diff --git a/vendor/github.com/golang/protobuf/proto/text_test.go b/vendor/github.com/golang/protobuf/proto/text_test.go
index 3eabacac..3c8b033c 100644
--- a/vendor/github.com/golang/protobuf/proto/text_test.go
+++ b/vendor/github.com/golang/protobuf/proto/text_test.go
@@ -37,12 +37,14 @@ import (
 	"io/ioutil"
 	"math"
 	"strings"
+	"sync"
 	"testing"
 
 	"github.com/golang/protobuf/proto"
 
 	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
+	pb "github.com/golang/protobuf/proto/test_proto"
+	anypb "github.com/golang/protobuf/ptypes/any"
 )
 
 // textMessage implements the methods that allow it to marshal and unmarshal
@@ -151,12 +153,12 @@ SomeGroup {
 }
 /* 2 unknown bytes */
 13: 4
-[testdata.Ext.more]: <
+[test_proto.Ext.more]: <
   data: "Big gobs for big rats"
 >
-[testdata.greeting]: "adg"
-[testdata.greeting]: "easy"
-[testdata.greeting]: "cow"
+[test_proto.greeting]: "adg"
+[test_proto.greeting]: "easy"
+[test_proto.greeting]: "cow"
 /* 13 unknown bytes */
 201: "\t3G skiing"
 /* 3 unknown bytes */
@@ -472,3 +474,45 @@ func TestProto3Text(t *testing.T) {
 		}
 	}
 }
+
+func TestRacyMarshal(t *testing.T) {
+	// This test should be run with the race detector.
+
+	any := &pb.MyMessage{Count: proto.Int32(47), Name: proto.String("David")}
+	proto.SetExtension(any, pb.E_Ext_Text, proto.String("bar"))
+	b, err := proto.Marshal(any)
+	if err != nil {
+		panic(err)
+	}
+	m := &proto3pb.Message{
+		Name:        "David",
+		ResultCount: 47,
+		Anything:    &anypb.Any{TypeUrl: "type.googleapis.com/" + proto.MessageName(any), Value: b},
+	}
+
+	wantText := proto.MarshalTextString(m)
+	wantBytes, err := proto.Marshal(m)
+	if err != nil {
+		t.Fatalf("proto.Marshal error: %v", err)
+	}
+
+	var wg sync.WaitGroup
+	defer wg.Wait()
+	wg.Add(20)
+	for i := 0; i < 10; i++ {
+		go func() {
+			defer wg.Done()
+			got := proto.MarshalTextString(m)
+			if got != wantText {
+				t.Errorf("proto.MarshalTextString = %q, want %q", got, wantText)
+			}
+		}()
+		go func() {
+			defer wg.Done()
+			got, err := proto.Marshal(m)
+			if !bytes.Equal(got, wantBytes) || err != nil {
+				t.Errorf("proto.Marshal = (%x, %v), want (%x, nil)", got, err, wantBytes)
+			}
+		}()
+	}
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/Makefile
deleted file mode 100644
index a42cc371..00000000
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-test:
-	cd testdata && make test
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
deleted file mode 100644
index f706871a..00000000
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Not stored here, but descriptor.proto is in https://github.com/google/protobuf/
-# at src/google/protobuf/descriptor.proto
-regenerate:
-	@echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
-	cp $(HOME)/src/protobuf/include/google/protobuf/descriptor.proto .
-	protoc --go_out=../../../../.. -I$(HOME)/src/protobuf/include $(HOME)/src/protobuf/include/google/protobuf/descriptor.proto
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
index c6a91bca..e855b1f5 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
@@ -1,36 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/descriptor.proto
 
-/*
-Package descriptor is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/descriptor.proto
-
-It has these top-level messages:
-	FileDescriptorSet
-	FileDescriptorProto
-	DescriptorProto
-	ExtensionRangeOptions
-	FieldDescriptorProto
-	OneofDescriptorProto
-	EnumDescriptorProto
-	EnumValueDescriptorProto
-	ServiceDescriptorProto
-	MethodDescriptorProto
-	FileOptions
-	MessageOptions
-	FieldOptions
-	OneofOptions
-	EnumOptions
-	EnumValueOptions
-	ServiceOptions
-	MethodOptions
-	UninterpretedOption
-	SourceCodeInfo
-	GeneratedCodeInfo
-*/
-package descriptor
+package descriptor // import "github.com/golang/protobuf/protoc-gen-go/descriptor"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -138,7 +109,9 @@ func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error {
 	*x = FieldDescriptorProto_Type(value)
 	return nil
 }
-func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
+func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4, 0}
+}
 
 type FieldDescriptorProto_Label int32
 
@@ -177,7 +150,7 @@ func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error {
 	return nil
 }
 func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{4, 1}
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4, 1}
 }
 
 // Generated classes can be optimized for speed or code size.
@@ -217,7 +190,9 @@ func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error {
 	*x = FileOptions_OptimizeMode(value)
 	return nil
 }
-func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 0} }
+func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{10, 0}
+}
 
 type FieldOptions_CType int32
 
@@ -255,7 +230,9 @@ func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error {
 	*x = FieldOptions_CType(value)
 	return nil
 }
-func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{12, 0} }
+func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12, 0}
+}
 
 type FieldOptions_JSType int32
 
@@ -295,7 +272,9 @@ func (x *FieldOptions_JSType) UnmarshalJSON(data []byte) error {
 	*x = FieldOptions_JSType(value)
 	return nil
 }
-func (FieldOptions_JSType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{12, 1} }
+func (FieldOptions_JSType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12, 1}
+}
 
 // Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
 // or neither? HTTP based RPC implementation may choose GET verb for safe
@@ -336,20 +315,41 @@ func (x *MethodOptions_IdempotencyLevel) UnmarshalJSON(data []byte) error {
 	return nil
 }
 func (MethodOptions_IdempotencyLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{17, 0}
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{17, 0}
 }
 
 // The protocol compiler can output a FileDescriptorSet containing the .proto
 // files it parses.
 type FileDescriptorSet struct {
-	File             []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
+	File                 []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *FileDescriptorSet) Reset()         { *m = FileDescriptorSet{} }
+func (m *FileDescriptorSet) String() string { return proto.CompactTextString(m) }
+func (*FileDescriptorSet) ProtoMessage()    {}
+func (*FileDescriptorSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{0}
+}
+func (m *FileDescriptorSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileDescriptorSet.Unmarshal(m, b)
+}
+func (m *FileDescriptorSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileDescriptorSet.Marshal(b, m, deterministic)
+}
+func (dst *FileDescriptorSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileDescriptorSet.Merge(dst, src)
+}
+func (m *FileDescriptorSet) XXX_Size() int {
+	return xxx_messageInfo_FileDescriptorSet.Size(m)
+}
+func (m *FileDescriptorSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileDescriptorSet.DiscardUnknown(m)
 }
 
-func (m *FileDescriptorSet) Reset()                    { *m = FileDescriptorSet{} }
-func (m *FileDescriptorSet) String() string            { return proto.CompactTextString(m) }
-func (*FileDescriptorSet) ProtoMessage()               {}
-func (*FileDescriptorSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_FileDescriptorSet proto.InternalMessageInfo
 
 func (m *FileDescriptorSet) GetFile() []*FileDescriptorProto {
 	if m != nil {
@@ -382,14 +382,35 @@ type FileDescriptorProto struct {
 	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info,json=sourceCodeInfo" json:"source_code_info,omitempty"`
 	// The syntax of the proto file.
 	// The supported values are "proto2" and "proto3".
-	Syntax           *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	Syntax               *string  `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FileDescriptorProto) Reset()         { *m = FileDescriptorProto{} }
+func (m *FileDescriptorProto) String() string { return proto.CompactTextString(m) }
+func (*FileDescriptorProto) ProtoMessage()    {}
+func (*FileDescriptorProto) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{1}
+}
+func (m *FileDescriptorProto) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileDescriptorProto.Unmarshal(m, b)
+}
+func (m *FileDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileDescriptorProto.Marshal(b, m, deterministic)
+}
+func (dst *FileDescriptorProto) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileDescriptorProto.Merge(dst, src)
+}
+func (m *FileDescriptorProto) XXX_Size() int {
+	return xxx_messageInfo_FileDescriptorProto.Size(m)
+}
+func (m *FileDescriptorProto) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileDescriptorProto.DiscardUnknown(m)
 }
 
-func (m *FileDescriptorProto) Reset()                    { *m = FileDescriptorProto{} }
-func (m *FileDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*FileDescriptorProto) ProtoMessage()               {}
-func (*FileDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_FileDescriptorProto proto.InternalMessageInfo
 
 func (m *FileDescriptorProto) GetName() string {
 	if m != nil && m.Name != nil {
@@ -488,14 +509,35 @@ type DescriptorProto struct {
 	ReservedRange  []*DescriptorProto_ReservedRange  `protobuf:"bytes,9,rep,name=reserved_range,json=reservedRange" json:"reserved_range,omitempty"`
 	// Reserved field names, which may not be used by fields in the same message.
 	// A given name may only be reserved once.
-	ReservedName     []string `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
+	ReservedName         []string `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DescriptorProto) Reset()         { *m = DescriptorProto{} }
+func (m *DescriptorProto) String() string { return proto.CompactTextString(m) }
+func (*DescriptorProto) ProtoMessage()    {}
+func (*DescriptorProto) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2}
+}
+func (m *DescriptorProto) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DescriptorProto.Unmarshal(m, b)
+}
+func (m *DescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DescriptorProto.Marshal(b, m, deterministic)
+}
+func (dst *DescriptorProto) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DescriptorProto.Merge(dst, src)
+}
+func (m *DescriptorProto) XXX_Size() int {
+	return xxx_messageInfo_DescriptorProto.Size(m)
+}
+func (m *DescriptorProto) XXX_DiscardUnknown() {
+	xxx_messageInfo_DescriptorProto.DiscardUnknown(m)
 }
 
-func (m *DescriptorProto) Reset()                    { *m = DescriptorProto{} }
-func (m *DescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*DescriptorProto) ProtoMessage()               {}
-func (*DescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_DescriptorProto proto.InternalMessageInfo
 
 func (m *DescriptorProto) GetName() string {
 	if m != nil && m.Name != nil {
@@ -568,19 +610,38 @@ func (m *DescriptorProto) GetReservedName() []string {
 }
 
 type DescriptorProto_ExtensionRange struct {
-	Start            *int32                 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End              *int32                 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	Options          *ExtensionRangeOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
+	Start                *int32                 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End                  *int32                 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	Options              *ExtensionRangeOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
 func (m *DescriptorProto_ExtensionRange) Reset()         { *m = DescriptorProto_ExtensionRange{} }
 func (m *DescriptorProto_ExtensionRange) String() string { return proto.CompactTextString(m) }
 func (*DescriptorProto_ExtensionRange) ProtoMessage()    {}
 func (*DescriptorProto_ExtensionRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 0}
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2, 0}
+}
+func (m *DescriptorProto_ExtensionRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DescriptorProto_ExtensionRange.Unmarshal(m, b)
+}
+func (m *DescriptorProto_ExtensionRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DescriptorProto_ExtensionRange.Marshal(b, m, deterministic)
+}
+func (dst *DescriptorProto_ExtensionRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DescriptorProto_ExtensionRange.Merge(dst, src)
+}
+func (m *DescriptorProto_ExtensionRange) XXX_Size() int {
+	return xxx_messageInfo_DescriptorProto_ExtensionRange.Size(m)
+}
+func (m *DescriptorProto_ExtensionRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_DescriptorProto_ExtensionRange.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_DescriptorProto_ExtensionRange proto.InternalMessageInfo
+
 func (m *DescriptorProto_ExtensionRange) GetStart() int32 {
 	if m != nil && m.Start != nil {
 		return *m.Start
@@ -606,17 +667,36 @@ func (m *DescriptorProto_ExtensionRange) GetOptions() *ExtensionRangeOptions {
 // fields or extension ranges in the same message. Reserved ranges may
 // not overlap.
 type DescriptorProto_ReservedRange struct {
-	Start            *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End              *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	Start                *int32   `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End                  *int32   `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *DescriptorProto_ReservedRange) Reset()         { *m = DescriptorProto_ReservedRange{} }
 func (m *DescriptorProto_ReservedRange) String() string { return proto.CompactTextString(m) }
 func (*DescriptorProto_ReservedRange) ProtoMessage()    {}
 func (*DescriptorProto_ReservedRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 1}
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2, 1}
+}
+func (m *DescriptorProto_ReservedRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DescriptorProto_ReservedRange.Unmarshal(m, b)
+}
+func (m *DescriptorProto_ReservedRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DescriptorProto_ReservedRange.Marshal(b, m, deterministic)
+}
+func (dst *DescriptorProto_ReservedRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DescriptorProto_ReservedRange.Merge(dst, src)
+}
+func (m *DescriptorProto_ReservedRange) XXX_Size() int {
+	return xxx_messageInfo_DescriptorProto_ReservedRange.Size(m)
 }
+func (m *DescriptorProto_ReservedRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_DescriptorProto_ReservedRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DescriptorProto_ReservedRange proto.InternalMessageInfo
 
 func (m *DescriptorProto_ReservedRange) GetStart() int32 {
 	if m != nil && m.Start != nil {
@@ -635,22 +715,43 @@ func (m *DescriptorProto_ReservedRange) GetEnd() int32 {
 type ExtensionRangeOptions struct {
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *ExtensionRangeOptions) Reset()                    { *m = ExtensionRangeOptions{} }
-func (m *ExtensionRangeOptions) String() string            { return proto.CompactTextString(m) }
-func (*ExtensionRangeOptions) ProtoMessage()               {}
-func (*ExtensionRangeOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ExtensionRangeOptions) Reset()         { *m = ExtensionRangeOptions{} }
+func (m *ExtensionRangeOptions) String() string { return proto.CompactTextString(m) }
+func (*ExtensionRangeOptions) ProtoMessage()    {}
+func (*ExtensionRangeOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{3}
+}
 
 var extRange_ExtensionRangeOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*ExtensionRangeOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_ExtensionRangeOptions
 }
+func (m *ExtensionRangeOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExtensionRangeOptions.Unmarshal(m, b)
+}
+func (m *ExtensionRangeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExtensionRangeOptions.Marshal(b, m, deterministic)
+}
+func (dst *ExtensionRangeOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionRangeOptions.Merge(dst, src)
+}
+func (m *ExtensionRangeOptions) XXX_Size() int {
+	return xxx_messageInfo_ExtensionRangeOptions.Size(m)
+}
+func (m *ExtensionRangeOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExtensionRangeOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExtensionRangeOptions proto.InternalMessageInfo
 
 func (m *ExtensionRangeOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if m != nil {
@@ -689,15 +790,36 @@ type FieldDescriptorProto struct {
 	// user has set a "json_name" option on this field, that option's value
 	// will be used. Otherwise, it's deduced from the field's name by converting
 	// it to camelCase.
-	JsonName         *string       `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"`
-	Options          *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
+	JsonName             *string       `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"`
+	Options              *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *FieldDescriptorProto) Reset()                    { *m = FieldDescriptorProto{} }
-func (m *FieldDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*FieldDescriptorProto) ProtoMessage()               {}
-func (*FieldDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *FieldDescriptorProto) Reset()         { *m = FieldDescriptorProto{} }
+func (m *FieldDescriptorProto) String() string { return proto.CompactTextString(m) }
+func (*FieldDescriptorProto) ProtoMessage()    {}
+func (*FieldDescriptorProto) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4}
+}
+func (m *FieldDescriptorProto) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FieldDescriptorProto.Unmarshal(m, b)
+}
+func (m *FieldDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FieldDescriptorProto.Marshal(b, m, deterministic)
+}
+func (dst *FieldDescriptorProto) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldDescriptorProto.Merge(dst, src)
+}
+func (m *FieldDescriptorProto) XXX_Size() int {
+	return xxx_messageInfo_FieldDescriptorProto.Size(m)
+}
+func (m *FieldDescriptorProto) XXX_DiscardUnknown() {
+	xxx_messageInfo_FieldDescriptorProto.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FieldDescriptorProto proto.InternalMessageInfo
 
 func (m *FieldDescriptorProto) GetName() string {
 	if m != nil && m.Name != nil {
@@ -771,15 +893,36 @@ func (m *FieldDescriptorProto) GetOptions() *FieldOptions {
 
 // Describes a oneof.
 type OneofDescriptorProto struct {
-	Name             *string       `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Options          *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
+	Name                 *string       `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Options              *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *OneofDescriptorProto) Reset()         { *m = OneofDescriptorProto{} }
+func (m *OneofDescriptorProto) String() string { return proto.CompactTextString(m) }
+func (*OneofDescriptorProto) ProtoMessage()    {}
+func (*OneofDescriptorProto) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{5}
+}
+func (m *OneofDescriptorProto) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OneofDescriptorProto.Unmarshal(m, b)
+}
+func (m *OneofDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OneofDescriptorProto.Marshal(b, m, deterministic)
+}
+func (dst *OneofDescriptorProto) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OneofDescriptorProto.Merge(dst, src)
+}
+func (m *OneofDescriptorProto) XXX_Size() int {
+	return xxx_messageInfo_OneofDescriptorProto.Size(m)
+}
+func (m *OneofDescriptorProto) XXX_DiscardUnknown() {
+	xxx_messageInfo_OneofDescriptorProto.DiscardUnknown(m)
 }
 
-func (m *OneofDescriptorProto) Reset()                    { *m = OneofDescriptorProto{} }
-func (m *OneofDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*OneofDescriptorProto) ProtoMessage()               {}
-func (*OneofDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_OneofDescriptorProto proto.InternalMessageInfo
 
 func (m *OneofDescriptorProto) GetName() string {
 	if m != nil && m.Name != nil {
@@ -797,16 +940,44 @@ func (m *OneofDescriptorProto) GetOptions() *OneofOptions {
 
 // Describes an enum type.
 type EnumDescriptorProto struct {
-	Name             *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Value            []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
-	Options          *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                      `json:"-"`
+	Name    *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Value   []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
+	Options *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	// Range of reserved numeric values. Reserved numeric values may not be used
+	// by enum values in the same enum declaration. Reserved ranges may not
+	// overlap.
+	ReservedRange []*EnumDescriptorProto_EnumReservedRange `protobuf:"bytes,4,rep,name=reserved_range,json=reservedRange" json:"reserved_range,omitempty"`
+	// Reserved enum value names, which may not be reused. A given name may only
+	// be reserved once.
+	ReservedName         []string `protobuf:"bytes,5,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EnumDescriptorProto) Reset()         { *m = EnumDescriptorProto{} }
+func (m *EnumDescriptorProto) String() string { return proto.CompactTextString(m) }
+func (*EnumDescriptorProto) ProtoMessage()    {}
+func (*EnumDescriptorProto) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{6}
+}
+func (m *EnumDescriptorProto) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EnumDescriptorProto.Unmarshal(m, b)
+}
+func (m *EnumDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EnumDescriptorProto.Marshal(b, m, deterministic)
+}
+func (dst *EnumDescriptorProto) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumDescriptorProto.Merge(dst, src)
+}
+func (m *EnumDescriptorProto) XXX_Size() int {
+	return xxx_messageInfo_EnumDescriptorProto.Size(m)
+}
+func (m *EnumDescriptorProto) XXX_DiscardUnknown() {
+	xxx_messageInfo_EnumDescriptorProto.DiscardUnknown(m)
 }
 
-func (m *EnumDescriptorProto) Reset()                    { *m = EnumDescriptorProto{} }
-func (m *EnumDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*EnumDescriptorProto) ProtoMessage()               {}
-func (*EnumDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_EnumDescriptorProto proto.InternalMessageInfo
 
 func (m *EnumDescriptorProto) GetName() string {
 	if m != nil && m.Name != nil {
@@ -829,18 +1000,105 @@ func (m *EnumDescriptorProto) GetOptions() *EnumOptions {
 	return nil
 }
 
+func (m *EnumDescriptorProto) GetReservedRange() []*EnumDescriptorProto_EnumReservedRange {
+	if m != nil {
+		return m.ReservedRange
+	}
+	return nil
+}
+
+func (m *EnumDescriptorProto) GetReservedName() []string {
+	if m != nil {
+		return m.ReservedName
+	}
+	return nil
+}
+
+// Range of reserved numeric values. Reserved values may not be used by
+// entries in the same enum. Reserved ranges may not overlap.
+//
+// Note that this is distinct from DescriptorProto.ReservedRange in that it
+// is inclusive such that it can appropriately represent the entire int32
+// domain.
+type EnumDescriptorProto_EnumReservedRange struct {
+	Start                *int32   `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End                  *int32   `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EnumDescriptorProto_EnumReservedRange) Reset()         { *m = EnumDescriptorProto_EnumReservedRange{} }
+func (m *EnumDescriptorProto_EnumReservedRange) String() string { return proto.CompactTextString(m) }
+func (*EnumDescriptorProto_EnumReservedRange) ProtoMessage()    {}
+func (*EnumDescriptorProto_EnumReservedRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{6, 0}
+}
+func (m *EnumDescriptorProto_EnumReservedRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Unmarshal(m, b)
+}
+func (m *EnumDescriptorProto_EnumReservedRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Marshal(b, m, deterministic)
+}
+func (dst *EnumDescriptorProto_EnumReservedRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Merge(dst, src)
+}
+func (m *EnumDescriptorProto_EnumReservedRange) XXX_Size() int {
+	return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Size(m)
+}
+func (m *EnumDescriptorProto_EnumReservedRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EnumDescriptorProto_EnumReservedRange proto.InternalMessageInfo
+
+func (m *EnumDescriptorProto_EnumReservedRange) GetStart() int32 {
+	if m != nil && m.Start != nil {
+		return *m.Start
+	}
+	return 0
+}
+
+func (m *EnumDescriptorProto_EnumReservedRange) GetEnd() int32 {
+	if m != nil && m.End != nil {
+		return *m.End
+	}
+	return 0
+}
+
 // Describes a value within an enum.
 type EnumValueDescriptorProto struct {
-	Name             *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number           *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
-	Options          *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
+	Name                 *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number               *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
+	Options              *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *EnumValueDescriptorProto) Reset()                    { *m = EnumValueDescriptorProto{} }
-func (m *EnumValueDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*EnumValueDescriptorProto) ProtoMessage()               {}
-func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *EnumValueDescriptorProto) Reset()         { *m = EnumValueDescriptorProto{} }
+func (m *EnumValueDescriptorProto) String() string { return proto.CompactTextString(m) }
+func (*EnumValueDescriptorProto) ProtoMessage()    {}
+func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{7}
+}
+func (m *EnumValueDescriptorProto) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EnumValueDescriptorProto.Unmarshal(m, b)
+}
+func (m *EnumValueDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EnumValueDescriptorProto.Marshal(b, m, deterministic)
+}
+func (dst *EnumValueDescriptorProto) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumValueDescriptorProto.Merge(dst, src)
+}
+func (m *EnumValueDescriptorProto) XXX_Size() int {
+	return xxx_messageInfo_EnumValueDescriptorProto.Size(m)
+}
+func (m *EnumValueDescriptorProto) XXX_DiscardUnknown() {
+	xxx_messageInfo_EnumValueDescriptorProto.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EnumValueDescriptorProto proto.InternalMessageInfo
 
 func (m *EnumValueDescriptorProto) GetName() string {
 	if m != nil && m.Name != nil {
@@ -865,16 +1123,37 @@ func (m *EnumValueDescriptorProto) GetOptions() *EnumValueOptions {
 
 // Describes a service.
 type ServiceDescriptorProto struct {
-	Name             *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Method           []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
-	Options          *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                   `json:"-"`
+	Name                 *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Method               []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
+	Options              *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *ServiceDescriptorProto) Reset()                    { *m = ServiceDescriptorProto{} }
-func (m *ServiceDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*ServiceDescriptorProto) ProtoMessage()               {}
-func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *ServiceDescriptorProto) Reset()         { *m = ServiceDescriptorProto{} }
+func (m *ServiceDescriptorProto) String() string { return proto.CompactTextString(m) }
+func (*ServiceDescriptorProto) ProtoMessage()    {}
+func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{8}
+}
+func (m *ServiceDescriptorProto) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceDescriptorProto.Unmarshal(m, b)
+}
+func (m *ServiceDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceDescriptorProto.Marshal(b, m, deterministic)
+}
+func (dst *ServiceDescriptorProto) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceDescriptorProto.Merge(dst, src)
+}
+func (m *ServiceDescriptorProto) XXX_Size() int {
+	return xxx_messageInfo_ServiceDescriptorProto.Size(m)
+}
+func (m *ServiceDescriptorProto) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceDescriptorProto.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServiceDescriptorProto proto.InternalMessageInfo
 
 func (m *ServiceDescriptorProto) GetName() string {
 	if m != nil && m.Name != nil {
@@ -908,14 +1187,35 @@ type MethodDescriptorProto struct {
 	// Identifies if client streams multiple client messages
 	ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,json=clientStreaming,def=0" json:"client_streaming,omitempty"`
 	// Identifies if server streams multiple server messages
-	ServerStreaming  *bool  `protobuf:"varint,6,opt,name=server_streaming,json=serverStreaming,def=0" json:"server_streaming,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	ServerStreaming      *bool    `protobuf:"varint,6,opt,name=server_streaming,json=serverStreaming,def=0" json:"server_streaming,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MethodDescriptorProto) Reset()         { *m = MethodDescriptorProto{} }
+func (m *MethodDescriptorProto) String() string { return proto.CompactTextString(m) }
+func (*MethodDescriptorProto) ProtoMessage()    {}
+func (*MethodDescriptorProto) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{9}
+}
+func (m *MethodDescriptorProto) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MethodDescriptorProto.Unmarshal(m, b)
+}
+func (m *MethodDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MethodDescriptorProto.Marshal(b, m, deterministic)
+}
+func (dst *MethodDescriptorProto) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MethodDescriptorProto.Merge(dst, src)
+}
+func (m *MethodDescriptorProto) XXX_Size() int {
+	return xxx_messageInfo_MethodDescriptorProto.Size(m)
+}
+func (m *MethodDescriptorProto) XXX_DiscardUnknown() {
+	xxx_messageInfo_MethodDescriptorProto.DiscardUnknown(m)
 }
 
-func (m *MethodDescriptorProto) Reset()                    { *m = MethodDescriptorProto{} }
-func (m *MethodDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*MethodDescriptorProto) ProtoMessage()               {}
-func (*MethodDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_MethodDescriptorProto proto.InternalMessageInfo
 
 const Default_MethodDescriptorProto_ClientStreaming bool = false
 const Default_MethodDescriptorProto_ServerStreaming bool = false
@@ -982,7 +1282,7 @@ type FileOptions struct {
 	// top-level extensions defined in the file.
 	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,json=javaMultipleFiles,def=0" json:"java_multiple_files,omitempty"`
 	// This option does nothing.
-	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash" json:"java_generate_equals_and_hash,omitempty"`
+	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash" json:"java_generate_equals_and_hash,omitempty"` // Deprecated: Do not use.
 	// If set true, then the Java2 code generator will generate code that
 	// throws an exception whenever an attempt is made to assign a non-UTF-8
 	// byte sequence to a string field.
@@ -1036,24 +1336,46 @@ type FileOptions struct {
 	// is empty. When this option is empty, the package name will be used for
 	// determining the namespace.
 	PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
+	// The parser stores options it doesn't recognize here.
+	// See the documentation for the "Options" section above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *FileOptions) Reset()                    { *m = FileOptions{} }
-func (m *FileOptions) String() string            { return proto.CompactTextString(m) }
-func (*FileOptions) ProtoMessage()               {}
-func (*FileOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *FileOptions) Reset()         { *m = FileOptions{} }
+func (m *FileOptions) String() string { return proto.CompactTextString(m) }
+func (*FileOptions) ProtoMessage()    {}
+func (*FileOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{10}
+}
 
 var extRange_FileOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_FileOptions
 }
+func (m *FileOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileOptions.Unmarshal(m, b)
+}
+func (m *FileOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileOptions.Marshal(b, m, deterministic)
+}
+func (dst *FileOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileOptions.Merge(dst, src)
+}
+func (m *FileOptions) XXX_Size() int {
+	return xxx_messageInfo_FileOptions.Size(m)
+}
+func (m *FileOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileOptions proto.InternalMessageInfo
 
 const Default_FileOptions_JavaMultipleFiles bool = false
 const Default_FileOptions_JavaStringCheckUtf8 bool = false
@@ -1086,6 +1408,7 @@ func (m *FileOptions) GetJavaMultipleFiles() bool {
 	return Default_FileOptions_JavaMultipleFiles
 }
 
+// Deprecated: Do not use.
 func (m *FileOptions) GetJavaGenerateEqualsAndHash() bool {
 	if m != nil && m.JavaGenerateEqualsAndHash != nil {
 		return *m.JavaGenerateEqualsAndHash
@@ -1251,22 +1574,43 @@ type MessageOptions struct {
 	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry,json=mapEntry" json:"map_entry,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *MessageOptions) Reset()                    { *m = MessageOptions{} }
-func (m *MessageOptions) String() string            { return proto.CompactTextString(m) }
-func (*MessageOptions) ProtoMessage()               {}
-func (*MessageOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *MessageOptions) Reset()         { *m = MessageOptions{} }
+func (m *MessageOptions) String() string { return proto.CompactTextString(m) }
+func (*MessageOptions) ProtoMessage()    {}
+func (*MessageOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{11}
+}
 
 var extRange_MessageOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*MessageOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_MessageOptions
 }
+func (m *MessageOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageOptions.Unmarshal(m, b)
+}
+func (m *MessageOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageOptions.Marshal(b, m, deterministic)
+}
+func (dst *MessageOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageOptions.Merge(dst, src)
+}
+func (m *MessageOptions) XXX_Size() int {
+	return xxx_messageInfo_MessageOptions.Size(m)
+}
+func (m *MessageOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MessageOptions proto.InternalMessageInfo
 
 const Default_MessageOptions_MessageSetWireFormat bool = false
 const Default_MessageOptions_NoStandardDescriptorAccessor bool = false
@@ -1369,22 +1713,43 @@ type FieldOptions struct {
 	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *FieldOptions) Reset()                    { *m = FieldOptions{} }
-func (m *FieldOptions) String() string            { return proto.CompactTextString(m) }
-func (*FieldOptions) ProtoMessage()               {}
-func (*FieldOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *FieldOptions) Reset()         { *m = FieldOptions{} }
+func (m *FieldOptions) String() string { return proto.CompactTextString(m) }
+func (*FieldOptions) ProtoMessage()    {}
+func (*FieldOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12}
+}
 
 var extRange_FieldOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*FieldOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_FieldOptions
 }
+func (m *FieldOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FieldOptions.Unmarshal(m, b)
+}
+func (m *FieldOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FieldOptions.Marshal(b, m, deterministic)
+}
+func (dst *FieldOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldOptions.Merge(dst, src)
+}
+func (m *FieldOptions) XXX_Size() int {
+	return xxx_messageInfo_FieldOptions.Size(m)
+}
+func (m *FieldOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_FieldOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FieldOptions proto.InternalMessageInfo
 
 const Default_FieldOptions_Ctype FieldOptions_CType = FieldOptions_STRING
 const Default_FieldOptions_Jstype FieldOptions_JSType = FieldOptions_JS_NORMAL
@@ -1444,22 +1809,43 @@ func (m *FieldOptions) GetUninterpretedOption() []*UninterpretedOption {
 type OneofOptions struct {
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *OneofOptions) Reset()                    { *m = OneofOptions{} }
-func (m *OneofOptions) String() string            { return proto.CompactTextString(m) }
-func (*OneofOptions) ProtoMessage()               {}
-func (*OneofOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *OneofOptions) Reset()         { *m = OneofOptions{} }
+func (m *OneofOptions) String() string { return proto.CompactTextString(m) }
+func (*OneofOptions) ProtoMessage()    {}
+func (*OneofOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{13}
+}
 
 var extRange_OneofOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*OneofOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_OneofOptions
 }
+func (m *OneofOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OneofOptions.Unmarshal(m, b)
+}
+func (m *OneofOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OneofOptions.Marshal(b, m, deterministic)
+}
+func (dst *OneofOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OneofOptions.Merge(dst, src)
+}
+func (m *OneofOptions) XXX_Size() int {
+	return xxx_messageInfo_OneofOptions.Size(m)
+}
+func (m *OneofOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_OneofOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OneofOptions proto.InternalMessageInfo
 
 func (m *OneofOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if m != nil {
@@ -1479,22 +1865,43 @@ type EnumOptions struct {
 	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *EnumOptions) Reset()                    { *m = EnumOptions{} }
-func (m *EnumOptions) String() string            { return proto.CompactTextString(m) }
-func (*EnumOptions) ProtoMessage()               {}
-func (*EnumOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *EnumOptions) Reset()         { *m = EnumOptions{} }
+func (m *EnumOptions) String() string { return proto.CompactTextString(m) }
+func (*EnumOptions) ProtoMessage()    {}
+func (*EnumOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{14}
+}
 
 var extRange_EnumOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*EnumOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_EnumOptions
 }
+func (m *EnumOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EnumOptions.Unmarshal(m, b)
+}
+func (m *EnumOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EnumOptions.Marshal(b, m, deterministic)
+}
+func (dst *EnumOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumOptions.Merge(dst, src)
+}
+func (m *EnumOptions) XXX_Size() int {
+	return xxx_messageInfo_EnumOptions.Size(m)
+}
+func (m *EnumOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_EnumOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EnumOptions proto.InternalMessageInfo
 
 const Default_EnumOptions_Deprecated bool = false
 
@@ -1527,22 +1934,43 @@ type EnumValueOptions struct {
 	Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *EnumValueOptions) Reset()                    { *m = EnumValueOptions{} }
-func (m *EnumValueOptions) String() string            { return proto.CompactTextString(m) }
-func (*EnumValueOptions) ProtoMessage()               {}
-func (*EnumValueOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *EnumValueOptions) Reset()         { *m = EnumValueOptions{} }
+func (m *EnumValueOptions) String() string { return proto.CompactTextString(m) }
+func (*EnumValueOptions) ProtoMessage()    {}
+func (*EnumValueOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{15}
+}
 
 var extRange_EnumValueOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*EnumValueOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_EnumValueOptions
 }
+func (m *EnumValueOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EnumValueOptions.Unmarshal(m, b)
+}
+func (m *EnumValueOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EnumValueOptions.Marshal(b, m, deterministic)
+}
+func (dst *EnumValueOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumValueOptions.Merge(dst, src)
+}
+func (m *EnumValueOptions) XXX_Size() int {
+	return xxx_messageInfo_EnumValueOptions.Size(m)
+}
+func (m *EnumValueOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_EnumValueOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EnumValueOptions proto.InternalMessageInfo
 
 const Default_EnumValueOptions_Deprecated bool = false
 
@@ -1568,22 +1996,43 @@ type ServiceOptions struct {
 	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *ServiceOptions) Reset()                    { *m = ServiceOptions{} }
-func (m *ServiceOptions) String() string            { return proto.CompactTextString(m) }
-func (*ServiceOptions) ProtoMessage()               {}
-func (*ServiceOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *ServiceOptions) Reset()         { *m = ServiceOptions{} }
+func (m *ServiceOptions) String() string { return proto.CompactTextString(m) }
+func (*ServiceOptions) ProtoMessage()    {}
+func (*ServiceOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{16}
+}
 
 var extRange_ServiceOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*ServiceOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_ServiceOptions
 }
+func (m *ServiceOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceOptions.Unmarshal(m, b)
+}
+func (m *ServiceOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceOptions.Marshal(b, m, deterministic)
+}
+func (dst *ServiceOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceOptions.Merge(dst, src)
+}
+func (m *ServiceOptions) XXX_Size() int {
+	return xxx_messageInfo_ServiceOptions.Size(m)
+}
+func (m *ServiceOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServiceOptions proto.InternalMessageInfo
 
 const Default_ServiceOptions_Deprecated bool = false
 
@@ -1610,22 +2059,43 @@ type MethodOptions struct {
 	IdempotencyLevel *MethodOptions_IdempotencyLevel `protobuf:"varint,34,opt,name=idempotency_level,json=idempotencyLevel,enum=google.protobuf.MethodOptions_IdempotencyLevel,def=0" json:"idempotency_level,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}               `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *MethodOptions) Reset()                    { *m = MethodOptions{} }
-func (m *MethodOptions) String() string            { return proto.CompactTextString(m) }
-func (*MethodOptions) ProtoMessage()               {}
-func (*MethodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *MethodOptions) Reset()         { *m = MethodOptions{} }
+func (m *MethodOptions) String() string { return proto.CompactTextString(m) }
+func (*MethodOptions) ProtoMessage()    {}
+func (*MethodOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{17}
+}
 
 var extRange_MethodOptions = []proto.ExtensionRange{
-	{1000, 536870911},
+	{Start: 1000, End: 536870911},
 }
 
 func (*MethodOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_MethodOptions
 }
+func (m *MethodOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MethodOptions.Unmarshal(m, b)
+}
+func (m *MethodOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MethodOptions.Marshal(b, m, deterministic)
+}
+func (dst *MethodOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MethodOptions.Merge(dst, src)
+}
+func (m *MethodOptions) XXX_Size() int {
+	return xxx_messageInfo_MethodOptions.Size(m)
+}
+func (m *MethodOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_MethodOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MethodOptions proto.InternalMessageInfo
 
 const Default_MethodOptions_Deprecated bool = false
 const Default_MethodOptions_IdempotencyLevel MethodOptions_IdempotencyLevel = MethodOptions_IDEMPOTENCY_UNKNOWN
@@ -1661,19 +2131,40 @@ type UninterpretedOption struct {
 	Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
 	// The value of the uninterpreted option, in whatever type the tokenizer
 	// identified it as during parsing. Exactly one of these should be set.
-	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"`
-	PositiveIntValue *uint64  `protobuf:"varint,4,opt,name=positive_int_value,json=positiveIntValue" json:"positive_int_value,omitempty"`
-	NegativeIntValue *int64   `protobuf:"varint,5,opt,name=negative_int_value,json=negativeIntValue" json:"negative_int_value,omitempty"`
-	DoubleValue      *float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"`
-	StringValue      []byte   `protobuf:"bytes,7,opt,name=string_value,json=stringValue" json:"string_value,omitempty"`
-	AggregateValue   *string  `protobuf:"bytes,8,opt,name=aggregate_value,json=aggregateValue" json:"aggregate_value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
+	IdentifierValue      *string  `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"`
+	PositiveIntValue     *uint64  `protobuf:"varint,4,opt,name=positive_int_value,json=positiveIntValue" json:"positive_int_value,omitempty"`
+	NegativeIntValue     *int64   `protobuf:"varint,5,opt,name=negative_int_value,json=negativeIntValue" json:"negative_int_value,omitempty"`
+	DoubleValue          *float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"`
+	StringValue          []byte   `protobuf:"bytes,7,opt,name=string_value,json=stringValue" json:"string_value,omitempty"`
+	AggregateValue       *string  `protobuf:"bytes,8,opt,name=aggregate_value,json=aggregateValue" json:"aggregate_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UninterpretedOption) Reset()                    { *m = UninterpretedOption{} }
-func (m *UninterpretedOption) String() string            { return proto.CompactTextString(m) }
-func (*UninterpretedOption) ProtoMessage()               {}
-func (*UninterpretedOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *UninterpretedOption) Reset()         { *m = UninterpretedOption{} }
+func (m *UninterpretedOption) String() string { return proto.CompactTextString(m) }
+func (*UninterpretedOption) ProtoMessage()    {}
+func (*UninterpretedOption) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{18}
+}
+func (m *UninterpretedOption) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UninterpretedOption.Unmarshal(m, b)
+}
+func (m *UninterpretedOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UninterpretedOption.Marshal(b, m, deterministic)
+}
+func (dst *UninterpretedOption) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UninterpretedOption.Merge(dst, src)
+}
+func (m *UninterpretedOption) XXX_Size() int {
+	return xxx_messageInfo_UninterpretedOption.Size(m)
+}
+func (m *UninterpretedOption) XXX_DiscardUnknown() {
+	xxx_messageInfo_UninterpretedOption.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UninterpretedOption proto.InternalMessageInfo
 
 func (m *UninterpretedOption) GetName() []*UninterpretedOption_NamePart {
 	if m != nil {
@@ -1730,18 +2221,37 @@ func (m *UninterpretedOption) GetAggregateValue() string {
 // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
 // "foo.(bar.baz).qux".
 type UninterpretedOption_NamePart struct {
-	NamePart         *string `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"`
-	IsExtension      *bool   `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	NamePart             *string  `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"`
+	IsExtension          *bool    `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *UninterpretedOption_NamePart) Reset()         { *m = UninterpretedOption_NamePart{} }
 func (m *UninterpretedOption_NamePart) String() string { return proto.CompactTextString(m) }
 func (*UninterpretedOption_NamePart) ProtoMessage()    {}
 func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{18, 0}
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{18, 0}
+}
+func (m *UninterpretedOption_NamePart) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UninterpretedOption_NamePart.Unmarshal(m, b)
+}
+func (m *UninterpretedOption_NamePart) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UninterpretedOption_NamePart.Marshal(b, m, deterministic)
+}
+func (dst *UninterpretedOption_NamePart) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UninterpretedOption_NamePart.Merge(dst, src)
+}
+func (m *UninterpretedOption_NamePart) XXX_Size() int {
+	return xxx_messageInfo_UninterpretedOption_NamePart.Size(m)
+}
+func (m *UninterpretedOption_NamePart) XXX_DiscardUnknown() {
+	xxx_messageInfo_UninterpretedOption_NamePart.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_UninterpretedOption_NamePart proto.InternalMessageInfo
+
 func (m *UninterpretedOption_NamePart) GetNamePart() string {
 	if m != nil && m.NamePart != nil {
 		return *m.NamePart
@@ -1802,14 +2312,35 @@ type SourceCodeInfo struct {
 	// - Code which tries to interpret locations should probably be designed to
 	//   ignore those that it doesn't understand, as more types of locations could
 	//   be recorded in the future.
-	Location         []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
-	XXX_unrecognized []byte                     `json:"-"`
+	Location             []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *SourceCodeInfo) Reset()         { *m = SourceCodeInfo{} }
+func (m *SourceCodeInfo) String() string { return proto.CompactTextString(m) }
+func (*SourceCodeInfo) ProtoMessage()    {}
+func (*SourceCodeInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{19}
+}
+func (m *SourceCodeInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceCodeInfo.Unmarshal(m, b)
+}
+func (m *SourceCodeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceCodeInfo.Marshal(b, m, deterministic)
+}
+func (dst *SourceCodeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceCodeInfo.Merge(dst, src)
+}
+func (m *SourceCodeInfo) XXX_Size() int {
+	return xxx_messageInfo_SourceCodeInfo.Size(m)
+}
+func (m *SourceCodeInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceCodeInfo.DiscardUnknown(m)
 }
 
-func (m *SourceCodeInfo) Reset()                    { *m = SourceCodeInfo{} }
-func (m *SourceCodeInfo) String() string            { return proto.CompactTextString(m) }
-func (*SourceCodeInfo) ProtoMessage()               {}
-func (*SourceCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_SourceCodeInfo proto.InternalMessageInfo
 
 func (m *SourceCodeInfo) GetLocation() []*SourceCodeInfo_Location {
 	if m != nil {
@@ -1899,13 +2430,34 @@ type SourceCodeInfo_Location struct {
 	LeadingComments         *string  `protobuf:"bytes,3,opt,name=leading_comments,json=leadingComments" json:"leading_comments,omitempty"`
 	TrailingComments        *string  `protobuf:"bytes,4,opt,name=trailing_comments,json=trailingComments" json:"trailing_comments,omitempty"`
 	LeadingDetachedComments []string `protobuf:"bytes,6,rep,name=leading_detached_comments,json=leadingDetachedComments" json:"leading_detached_comments,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
 	XXX_unrecognized        []byte   `json:"-"`
+	XXX_sizecache           int32    `json:"-"`
+}
+
+func (m *SourceCodeInfo_Location) Reset()         { *m = SourceCodeInfo_Location{} }
+func (m *SourceCodeInfo_Location) String() string { return proto.CompactTextString(m) }
+func (*SourceCodeInfo_Location) ProtoMessage()    {}
+func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{19, 0}
+}
+func (m *SourceCodeInfo_Location) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceCodeInfo_Location.Unmarshal(m, b)
+}
+func (m *SourceCodeInfo_Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceCodeInfo_Location.Marshal(b, m, deterministic)
+}
+func (dst *SourceCodeInfo_Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceCodeInfo_Location.Merge(dst, src)
+}
+func (m *SourceCodeInfo_Location) XXX_Size() int {
+	return xxx_messageInfo_SourceCodeInfo_Location.Size(m)
+}
+func (m *SourceCodeInfo_Location) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceCodeInfo_Location.DiscardUnknown(m)
 }
 
-func (m *SourceCodeInfo_Location) Reset()                    { *m = SourceCodeInfo_Location{} }
-func (m *SourceCodeInfo_Location) String() string            { return proto.CompactTextString(m) }
-func (*SourceCodeInfo_Location) ProtoMessage()               {}
-func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19, 0} }
+var xxx_messageInfo_SourceCodeInfo_Location proto.InternalMessageInfo
 
 func (m *SourceCodeInfo_Location) GetPath() []int32 {
 	if m != nil {
@@ -1948,14 +2500,35 @@ func (m *SourceCodeInfo_Location) GetLeadingDetachedComments() []string {
 type GeneratedCodeInfo struct {
 	// An Annotation connects some span of text in generated code to an element
 	// of its generating .proto file.
-	Annotation       []*GeneratedCodeInfo_Annotation `protobuf:"bytes,1,rep,name=annotation" json:"annotation,omitempty"`
-	XXX_unrecognized []byte                          `json:"-"`
+	Annotation           []*GeneratedCodeInfo_Annotation `protobuf:"bytes,1,rep,name=annotation" json:"annotation,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
 }
 
-func (m *GeneratedCodeInfo) Reset()                    { *m = GeneratedCodeInfo{} }
-func (m *GeneratedCodeInfo) String() string            { return proto.CompactTextString(m) }
-func (*GeneratedCodeInfo) ProtoMessage()               {}
-func (*GeneratedCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *GeneratedCodeInfo) Reset()         { *m = GeneratedCodeInfo{} }
+func (m *GeneratedCodeInfo) String() string { return proto.CompactTextString(m) }
+func (*GeneratedCodeInfo) ProtoMessage()    {}
+func (*GeneratedCodeInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{20}
+}
+func (m *GeneratedCodeInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GeneratedCodeInfo.Unmarshal(m, b)
+}
+func (m *GeneratedCodeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GeneratedCodeInfo.Marshal(b, m, deterministic)
+}
+func (dst *GeneratedCodeInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeneratedCodeInfo.Merge(dst, src)
+}
+func (m *GeneratedCodeInfo) XXX_Size() int {
+	return xxx_messageInfo_GeneratedCodeInfo.Size(m)
+}
+func (m *GeneratedCodeInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_GeneratedCodeInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GeneratedCodeInfo proto.InternalMessageInfo
 
 func (m *GeneratedCodeInfo) GetAnnotation() []*GeneratedCodeInfo_Annotation {
 	if m != nil {
@@ -1976,17 +2549,36 @@ type GeneratedCodeInfo_Annotation struct {
 	// Identifies the ending offset in bytes in the generated code that
 	// relates to the identified offset. The end offset should be one past
 	// the last relevant byte (so the length of the text = end - begin).
-	End              *int32 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	End                  *int32   `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *GeneratedCodeInfo_Annotation) Reset()         { *m = GeneratedCodeInfo_Annotation{} }
 func (m *GeneratedCodeInfo_Annotation) String() string { return proto.CompactTextString(m) }
 func (*GeneratedCodeInfo_Annotation) ProtoMessage()    {}
 func (*GeneratedCodeInfo_Annotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{20, 0}
+	return fileDescriptor_descriptor_4df4cb5f42392df6, []int{20, 0}
+}
+func (m *GeneratedCodeInfo_Annotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GeneratedCodeInfo_Annotation.Unmarshal(m, b)
+}
+func (m *GeneratedCodeInfo_Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GeneratedCodeInfo_Annotation.Marshal(b, m, deterministic)
+}
+func (dst *GeneratedCodeInfo_Annotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GeneratedCodeInfo_Annotation.Merge(dst, src)
+}
+func (m *GeneratedCodeInfo_Annotation) XXX_Size() int {
+	return xxx_messageInfo_GeneratedCodeInfo_Annotation.Size(m)
+}
+func (m *GeneratedCodeInfo_Annotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_GeneratedCodeInfo_Annotation.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_GeneratedCodeInfo_Annotation proto.InternalMessageInfo
+
 func (m *GeneratedCodeInfo_Annotation) GetPath() []int32 {
 	if m != nil {
 		return m.Path
@@ -2025,6 +2617,7 @@ func init() {
 	proto.RegisterType((*FieldDescriptorProto)(nil), "google.protobuf.FieldDescriptorProto")
 	proto.RegisterType((*OneofDescriptorProto)(nil), "google.protobuf.OneofDescriptorProto")
 	proto.RegisterType((*EnumDescriptorProto)(nil), "google.protobuf.EnumDescriptorProto")
+	proto.RegisterType((*EnumDescriptorProto_EnumReservedRange)(nil), "google.protobuf.EnumDescriptorProto.EnumReservedRange")
 	proto.RegisterType((*EnumValueDescriptorProto)(nil), "google.protobuf.EnumValueDescriptorProto")
 	proto.RegisterType((*ServiceDescriptorProto)(nil), "google.protobuf.ServiceDescriptorProto")
 	proto.RegisterType((*MethodDescriptorProto)(nil), "google.protobuf.MethodDescriptorProto")
@@ -2050,166 +2643,170 @@ func init() {
 	proto.RegisterEnum("google.protobuf.MethodOptions_IdempotencyLevel", MethodOptions_IdempotencyLevel_name, MethodOptions_IdempotencyLevel_value)
 }
 
-func init() { proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_descriptor_4df4cb5f42392df6)
+}
 
-var fileDescriptor0 = []byte{
-	// 2519 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_descriptor_4df4cb5f42392df6 = []byte{
+	// 2555 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6e, 0x1b, 0xc7,
-	0x15, 0x0e, 0x7f, 0x45, 0x1e, 0x52, 0xd4, 0x68, 0xa4, 0xd8, 0x6b, 0xe5, 0xc7, 0x32, 0xf3, 0x63,
-	0xd9, 0x69, 0xa8, 0x40, 0xb1, 0x1d, 0x47, 0x29, 0xd2, 0x52, 0xe4, 0x5a, 0xa1, 0x4a, 0x91, 0xec,
-	0x92, 0x6a, 0x7e, 0x6e, 0x16, 0xa3, 0xdd, 0x21, 0xb9, 0xf6, 0x72, 0x77, 0xb3, 0xbb, 0xb4, 0xad,
-	0xa0, 0x17, 0x06, 0x7a, 0x55, 0xa0, 0x0f, 0x50, 0x14, 0x45, 0x2f, 0x72, 0x13, 0xa0, 0x0f, 0x50,
-	0x20, 0x77, 0x7d, 0x82, 0x02, 0x79, 0x83, 0xa2, 0x28, 0xd0, 0x3e, 0x46, 0x31, 0x33, 0xbb, 0xcb,
-	0x5d, 0xfe, 0xc4, 0x6a, 0x80, 0x38, 0x57, 0xe4, 0x7c, 0xe7, 0x3b, 0x67, 0xce, 0x9c, 0x39, 0x33,
-	0x73, 0x66, 0x16, 0x76, 0x47, 0xb6, 0x3d, 0x32, 0xe9, 0xbe, 0xe3, 0xda, 0xbe, 0x7d, 0x3e, 0x1d,
-	0xee, 0xeb, 0xd4, 0xd3, 0x5c, 0xc3, 0xf1, 0x6d, 0xb7, 0xc6, 0x31, 0xbc, 0x21, 0x18, 0xb5, 0x90,
-	0x51, 0x3d, 0x85, 0xcd, 0x07, 0x86, 0x49, 0x9b, 0x11, 0xb1, 0x4f, 0x7d, 0x7c, 0x1f, 0xb2, 0x43,
-	0xc3, 0xa4, 0x52, 0x6a, 0x37, 0xb3, 0x57, 0x3a, 0x78, 0xb3, 0x36, 0xa7, 0x54, 0x4b, 0x6a, 0xf4,
-	0x18, 0xac, 0x70, 0x8d, 0xea, 0xbf, 0xb3, 0xb0, 0xb5, 0x44, 0x8a, 0x31, 0x64, 0x2d, 0x32, 0x61,
-	0x16, 0x53, 0x7b, 0x45, 0x85, 0xff, 0xc7, 0x12, 0xac, 0x39, 0x44, 0x7b, 0x44, 0x46, 0x54, 0x4a,
-	0x73, 0x38, 0x6c, 0xe2, 0xd7, 0x01, 0x74, 0xea, 0x50, 0x4b, 0xa7, 0x96, 0x76, 0x21, 0x65, 0x76,
-	0x33, 0x7b, 0x45, 0x25, 0x86, 0xe0, 0x77, 0x60, 0xd3, 0x99, 0x9e, 0x9b, 0x86, 0xa6, 0xc6, 0x68,
-	0xb0, 0x9b, 0xd9, 0xcb, 0x29, 0x48, 0x08, 0x9a, 0x33, 0xf2, 0x4d, 0xd8, 0x78, 0x42, 0xc9, 0xa3,
-	0x38, 0xb5, 0xc4, 0xa9, 0x15, 0x06, 0xc7, 0x88, 0x0d, 0x28, 0x4f, 0xa8, 0xe7, 0x91, 0x11, 0x55,
-	0xfd, 0x0b, 0x87, 0x4a, 0x59, 0x3e, 0xfa, 0xdd, 0x85, 0xd1, 0xcf, 0x8f, 0xbc, 0x14, 0x68, 0x0d,
-	0x2e, 0x1c, 0x8a, 0xeb, 0x50, 0xa4, 0xd6, 0x74, 0x22, 0x2c, 0xe4, 0x56, 0xc4, 0x4f, 0xb6, 0xa6,
-	0x93, 0x79, 0x2b, 0x05, 0xa6, 0x16, 0x98, 0x58, 0xf3, 0xa8, 0xfb, 0xd8, 0xd0, 0xa8, 0x94, 0xe7,
-	0x06, 0x6e, 0x2e, 0x18, 0xe8, 0x0b, 0xf9, 0xbc, 0x8d, 0x50, 0x0f, 0x37, 0xa0, 0x48, 0x9f, 0xfa,
-	0xd4, 0xf2, 0x0c, 0xdb, 0x92, 0xd6, 0xb8, 0x91, 0xb7, 0x96, 0xcc, 0x22, 0x35, 0xf5, 0x79, 0x13,
-	0x33, 0x3d, 0x7c, 0x0f, 0xd6, 0x6c, 0xc7, 0x37, 0x6c, 0xcb, 0x93, 0x0a, 0xbb, 0xa9, 0xbd, 0xd2,
-	0xc1, 0xab, 0x4b, 0x13, 0xa1, 0x2b, 0x38, 0x4a, 0x48, 0xc6, 0x2d, 0x40, 0x9e, 0x3d, 0x75, 0x35,
-	0xaa, 0x6a, 0xb6, 0x4e, 0x55, 0xc3, 0x1a, 0xda, 0x52, 0x91, 0x1b, 0xb8, 0xbe, 0x38, 0x10, 0x4e,
-	0x6c, 0xd8, 0x3a, 0x6d, 0x59, 0x43, 0x5b, 0xa9, 0x78, 0x89, 0x36, 0xbe, 0x02, 0x79, 0xef, 0xc2,
-	0xf2, 0xc9, 0x53, 0xa9, 0xcc, 0x33, 0x24, 0x68, 0x55, 0xbf, 0xcd, 0xc3, 0xc6, 0x65, 0x52, 0xec,
-	0x23, 0xc8, 0x0d, 0xd9, 0x28, 0xa5, 0xf4, 0xff, 0x13, 0x03, 0xa1, 0x93, 0x0c, 0x62, 0xfe, 0x07,
-	0x06, 0xb1, 0x0e, 0x25, 0x8b, 0x7a, 0x3e, 0xd5, 0x45, 0x46, 0x64, 0x2e, 0x99, 0x53, 0x20, 0x94,
-	0x16, 0x53, 0x2a, 0xfb, 0x83, 0x52, 0xea, 0x33, 0xd8, 0x88, 0x5c, 0x52, 0x5d, 0x62, 0x8d, 0xc2,
-	0xdc, 0xdc, 0x7f, 0x9e, 0x27, 0x35, 0x39, 0xd4, 0x53, 0x98, 0x9a, 0x52, 0xa1, 0x89, 0x36, 0x6e,
-	0x02, 0xd8, 0x16, 0xb5, 0x87, 0xaa, 0x4e, 0x35, 0x53, 0x2a, 0xac, 0x88, 0x52, 0x97, 0x51, 0x16,
-	0xa2, 0x64, 0x0b, 0x54, 0x33, 0xf1, 0x87, 0xb3, 0x54, 0x5b, 0x5b, 0x91, 0x29, 0xa7, 0x62, 0x91,
-	0x2d, 0x64, 0xdb, 0x19, 0x54, 0x5c, 0xca, 0xf2, 0x9e, 0xea, 0xc1, 0xc8, 0x8a, 0xdc, 0x89, 0xda,
-	0x73, 0x47, 0xa6, 0x04, 0x6a, 0x62, 0x60, 0xeb, 0x6e, 0xbc, 0x89, 0xdf, 0x80, 0x08, 0x50, 0x79,
-	0x5a, 0x01, 0xdf, 0x85, 0xca, 0x21, 0xd8, 0x21, 0x13, 0xba, 0xf3, 0x15, 0x54, 0x92, 0xe1, 0xc1,
-	0xdb, 0x90, 0xf3, 0x7c, 0xe2, 0xfa, 0x3c, 0x0b, 0x73, 0x8a, 0x68, 0x60, 0x04, 0x19, 0x6a, 0xe9,
-	0x7c, 0x97, 0xcb, 0x29, 0xec, 0x2f, 0xfe, 0xe5, 0x6c, 0xc0, 0x19, 0x3e, 0xe0, 0xb7, 0x17, 0x67,
-	0x34, 0x61, 0x79, 0x7e, 0xdc, 0x3b, 0x1f, 0xc0, 0x7a, 0x62, 0x00, 0x97, 0xed, 0xba, 0xfa, 0x5b,
-	0x78, 0x79, 0xa9, 0x69, 0xfc, 0x19, 0x6c, 0x4f, 0x2d, 0xc3, 0xf2, 0xa9, 0xeb, 0xb8, 0x94, 0x65,
-	0xac, 0xe8, 0x4a, 0xfa, 0xcf, 0xda, 0x8a, 0x9c, 0x3b, 0x8b, 0xb3, 0x85, 0x15, 0x65, 0x6b, 0xba,
-	0x08, 0xde, 0x2e, 0x16, 0xfe, 0xbb, 0x86, 0x9e, 0x3d, 0x7b, 0xf6, 0x2c, 0x5d, 0xfd, 0x63, 0x1e,
-	0xb6, 0x97, 0xad, 0x99, 0xa5, 0xcb, 0xf7, 0x0a, 0xe4, 0xad, 0xe9, 0xe4, 0x9c, 0xba, 0x3c, 0x48,
-	0x39, 0x25, 0x68, 0xe1, 0x3a, 0xe4, 0x4c, 0x72, 0x4e, 0x4d, 0x29, 0xbb, 0x9b, 0xda, 0xab, 0x1c,
-	0xbc, 0x73, 0xa9, 0x55, 0x59, 0x6b, 0x33, 0x15, 0x45, 0x68, 0xe2, 0x8f, 0x21, 0x1b, 0x6c, 0xd1,
-	0xcc, 0xc2, 0xed, 0xcb, 0x59, 0x60, 0x6b, 0x49, 0xe1, 0x7a, 0xf8, 0x15, 0x28, 0xb2, 0x5f, 0x91,
-	0x1b, 0x79, 0xee, 0x73, 0x81, 0x01, 0x2c, 0x2f, 0xf0, 0x0e, 0x14, 0xf8, 0x32, 0xd1, 0x69, 0x78,
-	0xb4, 0x45, 0x6d, 0x96, 0x58, 0x3a, 0x1d, 0x92, 0xa9, 0xe9, 0xab, 0x8f, 0x89, 0x39, 0xa5, 0x3c,
-	0xe1, 0x8b, 0x4a, 0x39, 0x00, 0x7f, 0xc3, 0x30, 0x7c, 0x1d, 0x4a, 0x62, 0x55, 0x19, 0x96, 0x4e,
-	0x9f, 0xf2, 0xdd, 0x33, 0xa7, 0x88, 0x85, 0xd6, 0x62, 0x08, 0xeb, 0xfe, 0xa1, 0x67, 0x5b, 0x61,
-	0x6a, 0xf2, 0x2e, 0x18, 0xc0, 0xbb, 0xff, 0x60, 0x7e, 0xe3, 0x7e, 0x6d, 0xf9, 0xf0, 0xe6, 0x73,
-	0xaa, 0xfa, 0xb7, 0x34, 0x64, 0xf9, 0x7e, 0xb1, 0x01, 0xa5, 0xc1, 0xe7, 0x3d, 0x59, 0x6d, 0x76,
-	0xcf, 0x8e, 0xda, 0x32, 0x4a, 0xe1, 0x0a, 0x00, 0x07, 0x1e, 0xb4, 0xbb, 0xf5, 0x01, 0x4a, 0x47,
-	0xed, 0x56, 0x67, 0x70, 0xef, 0x0e, 0xca, 0x44, 0x0a, 0x67, 0x02, 0xc8, 0xc6, 0x09, 0xef, 0x1f,
-	0xa0, 0x1c, 0x46, 0x50, 0x16, 0x06, 0x5a, 0x9f, 0xc9, 0xcd, 0x7b, 0x77, 0x50, 0x3e, 0x89, 0xbc,
-	0x7f, 0x80, 0xd6, 0xf0, 0x3a, 0x14, 0x39, 0x72, 0xd4, 0xed, 0xb6, 0x51, 0x21, 0xb2, 0xd9, 0x1f,
-	0x28, 0xad, 0xce, 0x31, 0x2a, 0x46, 0x36, 0x8f, 0x95, 0xee, 0x59, 0x0f, 0x41, 0x64, 0xe1, 0x54,
-	0xee, 0xf7, 0xeb, 0xc7, 0x32, 0x2a, 0x45, 0x8c, 0xa3, 0xcf, 0x07, 0x72, 0x1f, 0x95, 0x13, 0x6e,
-	0xbd, 0x7f, 0x80, 0xd6, 0xa3, 0x2e, 0xe4, 0xce, 0xd9, 0x29, 0xaa, 0xe0, 0x4d, 0x58, 0x17, 0x5d,
-	0x84, 0x4e, 0x6c, 0xcc, 0x41, 0xf7, 0xee, 0x20, 0x34, 0x73, 0x44, 0x58, 0xd9, 0x4c, 0x00, 0xf7,
-	0xee, 0x20, 0x5c, 0x6d, 0x40, 0x8e, 0x67, 0x17, 0xc6, 0x50, 0x69, 0xd7, 0x8f, 0xe4, 0xb6, 0xda,
-	0xed, 0x0d, 0x5a, 0xdd, 0x4e, 0xbd, 0x8d, 0x52, 0x33, 0x4c, 0x91, 0x7f, 0x7d, 0xd6, 0x52, 0xe4,
-	0x26, 0x4a, 0xc7, 0xb1, 0x9e, 0x5c, 0x1f, 0xc8, 0x4d, 0x94, 0xa9, 0x6a, 0xb0, 0xbd, 0x6c, 0x9f,
-	0x5c, 0xba, 0x32, 0x62, 0x53, 0x9c, 0x5e, 0x31, 0xc5, 0xdc, 0xd6, 0xc2, 0x14, 0x7f, 0x9d, 0x82,
-	0xad, 0x25, 0x67, 0xc5, 0xd2, 0x4e, 0x7e, 0x01, 0x39, 0x91, 0xa2, 0xe2, 0xf4, 0xbc, 0xb5, 0xf4,
-	0xd0, 0xe1, 0x09, 0xbb, 0x70, 0x82, 0x72, 0xbd, 0x78, 0x05, 0x91, 0x59, 0x51, 0x41, 0x30, 0x13,
-	0x0b, 0x4e, 0xfe, 0x2e, 0x05, 0xd2, 0x2a, 0xdb, 0xcf, 0xd9, 0x28, 0xd2, 0x89, 0x8d, 0xe2, 0xa3,
-	0x79, 0x07, 0x6e, 0xac, 0x1e, 0xc3, 0x82, 0x17, 0xdf, 0xa4, 0xe0, 0xca, 0xf2, 0x42, 0x6b, 0xa9,
-	0x0f, 0x1f, 0x43, 0x7e, 0x42, 0xfd, 0xb1, 0x1d, 0x16, 0x1b, 0x6f, 0x2f, 0x39, 0xc2, 0x98, 0x78,
-	0x3e, 0x56, 0x81, 0x56, 0xfc, 0x0c, 0xcc, 0xac, 0xaa, 0x96, 0x84, 0x37, 0x0b, 0x9e, 0xfe, 0x3e,
-	0x0d, 0x2f, 0x2f, 0x35, 0xbe, 0xd4, 0xd1, 0xd7, 0x00, 0x0c, 0xcb, 0x99, 0xfa, 0xa2, 0xa0, 0x10,
-	0xfb, 0x53, 0x91, 0x23, 0x7c, 0xed, 0xb3, 0xbd, 0x67, 0xea, 0x47, 0xf2, 0x0c, 0x97, 0x83, 0x80,
-	0x38, 0xe1, 0xfe, 0xcc, 0xd1, 0x2c, 0x77, 0xf4, 0xf5, 0x15, 0x23, 0x5d, 0x38, 0xab, 0xdf, 0x03,
-	0xa4, 0x99, 0x06, 0xb5, 0x7c, 0xd5, 0xf3, 0x5d, 0x4a, 0x26, 0x86, 0x35, 0xe2, 0x1b, 0x70, 0xe1,
-	0x30, 0x37, 0x24, 0xa6, 0x47, 0x95, 0x0d, 0x21, 0xee, 0x87, 0x52, 0xa6, 0xc1, 0xcf, 0x38, 0x37,
-	0xa6, 0x91, 0x4f, 0x68, 0x08, 0x71, 0xa4, 0x51, 0xfd, 0xb6, 0x00, 0xa5, 0x58, 0x59, 0x8a, 0x6f,
-	0x40, 0xf9, 0x21, 0x79, 0x4c, 0xd4, 0xf0, 0xaa, 0x21, 0x22, 0x51, 0x62, 0x58, 0x2f, 0xb8, 0x6e,
-	0xbc, 0x07, 0xdb, 0x9c, 0x62, 0x4f, 0x7d, 0xea, 0xaa, 0x9a, 0x49, 0x3c, 0x8f, 0x07, 0xad, 0xc0,
-	0xa9, 0x98, 0xc9, 0xba, 0x4c, 0xd4, 0x08, 0x25, 0xf8, 0x2e, 0x6c, 0x71, 0x8d, 0xc9, 0xd4, 0xf4,
-	0x0d, 0xc7, 0xa4, 0x2a, 0xbb, 0xfc, 0x78, 0x7c, 0x23, 0x8e, 0x3c, 0xdb, 0x64, 0x8c, 0xd3, 0x80,
-	0xc0, 0x3c, 0xf2, 0x70, 0x13, 0x5e, 0xe3, 0x6a, 0x23, 0x6a, 0x51, 0x97, 0xf8, 0x54, 0xa5, 0x5f,
-	0x4e, 0x89, 0xe9, 0xa9, 0xc4, 0xd2, 0xd5, 0x31, 0xf1, 0xc6, 0xd2, 0x36, 0x33, 0x70, 0x94, 0x96,
-	0x52, 0xca, 0x35, 0x46, 0x3c, 0x0e, 0x78, 0x32, 0xa7, 0xd5, 0x2d, 0xfd, 0x13, 0xe2, 0x8d, 0xf1,
-	0x21, 0x5c, 0xe1, 0x56, 0x3c, 0xdf, 0x35, 0xac, 0x91, 0xaa, 0x8d, 0xa9, 0xf6, 0x48, 0x9d, 0xfa,
-	0xc3, 0xfb, 0xd2, 0x2b, 0xf1, 0xfe, 0xb9, 0x87, 0x7d, 0xce, 0x69, 0x30, 0xca, 0x99, 0x3f, 0xbc,
-	0x8f, 0xfb, 0x50, 0x66, 0x93, 0x31, 0x31, 0xbe, 0xa2, 0xea, 0xd0, 0x76, 0xf9, 0xc9, 0x52, 0x59,
-	0xb2, 0xb2, 0x63, 0x11, 0xac, 0x75, 0x03, 0x85, 0x53, 0x5b, 0xa7, 0x87, 0xb9, 0x7e, 0x4f, 0x96,
-	0x9b, 0x4a, 0x29, 0xb4, 0xf2, 0xc0, 0x76, 0x59, 0x42, 0x8d, 0xec, 0x28, 0xc0, 0x25, 0x91, 0x50,
-	0x23, 0x3b, 0x0c, 0xef, 0x5d, 0xd8, 0xd2, 0x34, 0x31, 0x66, 0x43, 0x53, 0x83, 0x2b, 0x8a, 0x27,
-	0xa1, 0x44, 0xb0, 0x34, 0xed, 0x58, 0x10, 0x82, 0x1c, 0xf7, 0xf0, 0x87, 0xf0, 0xf2, 0x2c, 0x58,
-	0x71, 0xc5, 0xcd, 0x85, 0x51, 0xce, 0xab, 0xde, 0x85, 0x2d, 0xe7, 0x62, 0x51, 0x11, 0x27, 0x7a,
-	0x74, 0x2e, 0xe6, 0xd5, 0x3e, 0x80, 0x6d, 0x67, 0xec, 0x2c, 0xea, 0xdd, 0x8e, 0xeb, 0x61, 0x67,
-	0xec, 0xcc, 0x2b, 0xbe, 0xc5, 0xef, 0xab, 0x2e, 0xd5, 0x88, 0x4f, 0x75, 0xe9, 0x6a, 0x9c, 0x1e,
-	0x13, 0xe0, 0x7d, 0x40, 0x9a, 0xa6, 0x52, 0x8b, 0x9c, 0x9b, 0x54, 0x25, 0x2e, 0xb5, 0x88, 0x27,
-	0x5d, 0x8f, 0x93, 0x2b, 0x9a, 0x26, 0x73, 0x69, 0x9d, 0x0b, 0xf1, 0x6d, 0xd8, 0xb4, 0xcf, 0x1f,
-	0x6a, 0x22, 0x25, 0x55, 0xc7, 0xa5, 0x43, 0xe3, 0xa9, 0xf4, 0x26, 0x8f, 0xef, 0x06, 0x13, 0xf0,
-	0x84, 0xec, 0x71, 0x18, 0xdf, 0x02, 0xa4, 0x79, 0x63, 0xe2, 0x3a, 0xbc, 0x26, 0xf0, 0x1c, 0xa2,
-	0x51, 0xe9, 0x2d, 0x41, 0x15, 0x78, 0x27, 0x84, 0xd9, 0x92, 0xf0, 0x9e, 0x18, 0x43, 0x3f, 0xb4,
-	0x78, 0x53, 0x2c, 0x09, 0x8e, 0x05, 0xd6, 0xf6, 0x00, 0xb1, 0x50, 0x24, 0x3a, 0xde, 0xe3, 0xb4,
-	0x8a, 0x33, 0x76, 0xe2, 0xfd, 0xbe, 0x01, 0xeb, 0x8c, 0x39, 0xeb, 0xf4, 0x96, 0xa8, 0x67, 0x9c,
-	0x71, 0xac, 0xc7, 0x1f, 0xad, 0xb4, 0xac, 0x1e, 0x42, 0x39, 0x9e, 0x9f, 0xb8, 0x08, 0x22, 0x43,
-	0x51, 0x8a, 0x9d, 0xf5, 0x8d, 0x6e, 0x93, 0x9d, 0xd2, 0x5f, 0xc8, 0x28, 0xcd, 0xaa, 0x85, 0x76,
-	0x6b, 0x20, 0xab, 0xca, 0x59, 0x67, 0xd0, 0x3a, 0x95, 0x51, 0x26, 0x56, 0x96, 0x9e, 0x64, 0x0b,
-	0x6f, 0xa3, 0x9b, 0xd5, 0xef, 0xd2, 0x50, 0x49, 0xde, 0x33, 0xf0, 0xcf, 0xe1, 0x6a, 0xf8, 0x28,
-	0xe0, 0x51, 0x5f, 0x7d, 0x62, 0xb8, 0x7c, 0xe1, 0x4c, 0x88, 0xa8, 0xb3, 0xa3, 0xa9, 0xdb, 0x0e,
-	0x58, 0x7d, 0xea, 0x7f, 0x6a, 0xb8, 0x6c, 0x59, 0x4c, 0x88, 0x8f, 0xdb, 0x70, 0xdd, 0xb2, 0x55,
-	0xcf, 0x27, 0x96, 0x4e, 0x5c, 0x5d, 0x9d, 0x3d, 0xc7, 0xa8, 0x44, 0xd3, 0xa8, 0xe7, 0xd9, 0xe2,
-	0xc0, 0x8a, 0xac, 0xbc, 0x6a, 0xd9, 0xfd, 0x80, 0x3c, 0xdb, 0xc9, 0xeb, 0x01, 0x75, 0x2e, 0xcd,
-	0x32, 0xab, 0xd2, 0xec, 0x15, 0x28, 0x4e, 0x88, 0xa3, 0x52, 0xcb, 0x77, 0x2f, 0x78, 0x75, 0x59,
-	0x50, 0x0a, 0x13, 0xe2, 0xc8, 0xac, 0xfd, 0x42, 0x8a, 0xfc, 0x93, 0x6c, 0xa1, 0x80, 0x8a, 0x27,
-	0xd9, 0x42, 0x11, 0x41, 0xf5, 0x5f, 0x19, 0x28, 0xc7, 0xab, 0x4d, 0x56, 0xbc, 0x6b, 0xfc, 0x64,
-	0x49, 0xf1, 0xbd, 0xe7, 0x8d, 0xef, 0xad, 0x4d, 0x6b, 0x0d, 0x76, 0xe4, 0x1c, 0xe6, 0x45, 0x0d,
-	0xa8, 0x08, 0x4d, 0x76, 0xdc, 0xb3, 0xdd, 0x86, 0x8a, 0x7b, 0x4d, 0x41, 0x09, 0x5a, 0xf8, 0x18,
-	0xf2, 0x0f, 0x3d, 0x6e, 0x3b, 0xcf, 0x6d, 0xbf, 0xf9, 0xfd, 0xb6, 0x4f, 0xfa, 0xdc, 0x78, 0xf1,
-	0xa4, 0xaf, 0x76, 0xba, 0xca, 0x69, 0xbd, 0xad, 0x04, 0xea, 0xf8, 0x1a, 0x64, 0x4d, 0xf2, 0xd5,
-	0x45, 0xf2, 0x70, 0xe2, 0xd0, 0x65, 0x27, 0xe1, 0x1a, 0x64, 0x9f, 0x50, 0xf2, 0x28, 0x79, 0x24,
-	0x70, 0xe8, 0x47, 0x5c, 0x0c, 0xfb, 0x90, 0xe3, 0xf1, 0xc2, 0x00, 0x41, 0xc4, 0xd0, 0x4b, 0xb8,
-	0x00, 0xd9, 0x46, 0x57, 0x61, 0x0b, 0x02, 0x41, 0x59, 0xa0, 0x6a, 0xaf, 0x25, 0x37, 0x64, 0x94,
-	0xae, 0xde, 0x85, 0xbc, 0x08, 0x02, 0x5b, 0x2c, 0x51, 0x18, 0xd0, 0x4b, 0x41, 0x33, 0xb0, 0x91,
-	0x0a, 0xa5, 0x67, 0xa7, 0x47, 0xb2, 0x82, 0xd2, 0xc9, 0xa9, 0xce, 0xa2, 0x5c, 0xd5, 0x83, 0x72,
-	0xbc, 0xdc, 0x7c, 0x31, 0x57, 0xc9, 0xbf, 0xa7, 0xa0, 0x14, 0x2b, 0x1f, 0x59, 0xe1, 0x42, 0x4c,
-	0xd3, 0x7e, 0xa2, 0x12, 0xd3, 0x20, 0x5e, 0x90, 0x1a, 0xc0, 0xa1, 0x3a, 0x43, 0x2e, 0x3b, 0x75,
-	0x2f, 0x68, 0x89, 0xe4, 0x50, 0xbe, 0xfa, 0x97, 0x14, 0xa0, 0xf9, 0x02, 0x74, 0xce, 0xcd, 0xd4,
-	0x4f, 0xe9, 0x66, 0xf5, 0xcf, 0x29, 0xa8, 0x24, 0xab, 0xce, 0x39, 0xf7, 0x6e, 0xfc, 0xa4, 0xee,
-	0xfd, 0x33, 0x0d, 0xeb, 0x89, 0x5a, 0xf3, 0xb2, 0xde, 0x7d, 0x09, 0x9b, 0x86, 0x4e, 0x27, 0x8e,
-	0xed, 0x53, 0x4b, 0xbb, 0x50, 0x4d, 0xfa, 0x98, 0x9a, 0x52, 0x95, 0x6f, 0x1a, 0xfb, 0xdf, 0x5f,
-	0xcd, 0xd6, 0x5a, 0x33, 0xbd, 0x36, 0x53, 0x3b, 0xdc, 0x6a, 0x35, 0xe5, 0xd3, 0x5e, 0x77, 0x20,
-	0x77, 0x1a, 0x9f, 0xab, 0x67, 0x9d, 0x5f, 0x75, 0xba, 0x9f, 0x76, 0x14, 0x64, 0xcc, 0xd1, 0x7e,
-	0xc4, 0x65, 0xdf, 0x03, 0x34, 0xef, 0x14, 0xbe, 0x0a, 0xcb, 0xdc, 0x42, 0x2f, 0xe1, 0x2d, 0xd8,
-	0xe8, 0x74, 0xd5, 0x7e, 0xab, 0x29, 0xab, 0xf2, 0x83, 0x07, 0x72, 0x63, 0xd0, 0x17, 0xd7, 0xfb,
-	0x88, 0x3d, 0x48, 0x2c, 0xf0, 0xea, 0x9f, 0x32, 0xb0, 0xb5, 0xc4, 0x13, 0x5c, 0x0f, 0x6e, 0x16,
-	0xe2, 0xb2, 0xf3, 0xee, 0x65, 0xbc, 0xaf, 0xb1, 0x82, 0xa0, 0x47, 0x5c, 0x3f, 0xb8, 0x88, 0xdc,
-	0x02, 0x16, 0x25, 0xcb, 0x37, 0x86, 0x06, 0x75, 0x83, 0xd7, 0x10, 0x71, 0xdd, 0xd8, 0x98, 0xe1,
-	0xe2, 0x41, 0xe4, 0x67, 0x80, 0x1d, 0xdb, 0x33, 0x7c, 0xe3, 0x31, 0x55, 0x0d, 0x2b, 0x7c, 0x3a,
-	0x61, 0xd7, 0x8f, 0xac, 0x82, 0x42, 0x49, 0xcb, 0xf2, 0x23, 0xb6, 0x45, 0x47, 0x64, 0x8e, 0xcd,
-	0x36, 0xf3, 0x8c, 0x82, 0x42, 0x49, 0xc4, 0xbe, 0x01, 0x65, 0xdd, 0x9e, 0xb2, 0x9a, 0x4c, 0xf0,
-	0xd8, 0xd9, 0x91, 0x52, 0x4a, 0x02, 0x8b, 0x28, 0x41, 0xb5, 0x3d, 0x7b, 0xb3, 0x29, 0x2b, 0x25,
-	0x81, 0x09, 0xca, 0x4d, 0xd8, 0x20, 0xa3, 0x91, 0xcb, 0x8c, 0x87, 0x86, 0xc4, 0xfd, 0xa1, 0x12,
-	0xc1, 0x9c, 0xb8, 0x73, 0x02, 0x85, 0x30, 0x0e, 0xec, 0xa8, 0x66, 0x91, 0x50, 0x1d, 0xf1, 0x6e,
-	0x97, 0xde, 0x2b, 0x2a, 0x05, 0x2b, 0x14, 0xde, 0x80, 0xb2, 0xe1, 0xa9, 0xb3, 0x27, 0xe8, 0xf4,
-	0x6e, 0x7a, 0xaf, 0xa0, 0x94, 0x0c, 0x2f, 0x7a, 0xbe, 0xab, 0x7e, 0x93, 0x86, 0x4a, 0xf2, 0x09,
-	0x1d, 0x37, 0xa1, 0x60, 0xda, 0x1a, 0xe1, 0xa9, 0x25, 0xbe, 0xdf, 0xec, 0x3d, 0xe7, 0xd5, 0xbd,
-	0xd6, 0x0e, 0xf8, 0x4a, 0xa4, 0xb9, 0xf3, 0x8f, 0x14, 0x14, 0x42, 0x18, 0x5f, 0x81, 0xac, 0x43,
-	0xfc, 0x31, 0x37, 0x97, 0x3b, 0x4a, 0xa3, 0x94, 0xc2, 0xdb, 0x0c, 0xf7, 0x1c, 0x62, 0xf1, 0x14,
-	0x08, 0x70, 0xd6, 0x66, 0xf3, 0x6a, 0x52, 0xa2, 0xf3, 0xcb, 0x89, 0x3d, 0x99, 0x50, 0xcb, 0xf7,
-	0xc2, 0x79, 0x0d, 0xf0, 0x46, 0x00, 0xe3, 0x77, 0x60, 0xd3, 0x77, 0x89, 0x61, 0x26, 0xb8, 0x59,
-	0xce, 0x45, 0xa1, 0x20, 0x22, 0x1f, 0xc2, 0xb5, 0xd0, 0xae, 0x4e, 0x7d, 0xa2, 0x8d, 0xa9, 0x3e,
-	0x53, 0xca, 0xf3, 0xf7, 0xd9, 0xab, 0x01, 0xa1, 0x19, 0xc8, 0x43, 0xdd, 0xea, 0x77, 0x29, 0xd8,
-	0x0c, 0xaf, 0x53, 0x7a, 0x14, 0xac, 0x53, 0x00, 0x62, 0x59, 0xb6, 0x1f, 0x0f, 0xd7, 0x62, 0x2a,
-	0x2f, 0xe8, 0xd5, 0xea, 0x91, 0x92, 0x12, 0x33, 0xb0, 0x33, 0x01, 0x98, 0x49, 0x56, 0x86, 0xed,
-	0x3a, 0x94, 0x82, 0xef, 0x23, 0xfc, 0x23, 0x9b, 0xb8, 0x80, 0x83, 0x80, 0xd8, 0xbd, 0x0b, 0x6f,
-	0x43, 0xee, 0x9c, 0x8e, 0x0c, 0x2b, 0x78, 0xf5, 0x14, 0x8d, 0xf0, 0x25, 0x37, 0x1b, 0xbd, 0xe4,
-	0x1e, 0xfd, 0x21, 0x05, 0x5b, 0x9a, 0x3d, 0x99, 0xf7, 0xf7, 0x08, 0xcd, 0xbd, 0x02, 0x78, 0x9f,
-	0xa4, 0xbe, 0xf8, 0x78, 0x64, 0xf8, 0xe3, 0xe9, 0x79, 0x4d, 0xb3, 0x27, 0xfb, 0x23, 0xdb, 0x24,
-	0xd6, 0x68, 0xf6, 0x95, 0x90, 0xff, 0xd1, 0xde, 0x1d, 0x51, 0xeb, 0xdd, 0x91, 0x1d, 0xfb, 0x66,
-	0xf8, 0xd1, 0xec, 0xef, 0xd7, 0xe9, 0xcc, 0x71, 0xef, 0xe8, 0xaf, 0xe9, 0x9d, 0x63, 0xd1, 0x57,
-	0x2f, 0x8c, 0x8d, 0x42, 0x87, 0x26, 0xd5, 0xd8, 0x78, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x0c,
-	0xab, 0xb6, 0x37, 0x7e, 0x1c, 0x00, 0x00,
+	0xf5, 0xcf, 0xf2, 0x4b, 0xe4, 0x21, 0x45, 0x8d, 0x46, 0x8a, 0xbd, 0x56, 0x3e, 0x2c, 0x33, 0x1f,
+	0x96, 0x9d, 0x7f, 0xa8, 0xc0, 0xb1, 0x1d, 0x47, 0xfe, 0x23, 0x2d, 0x45, 0xae, 0x15, 0xaa, 0x12,
+	0xc9, 0x2e, 0xa9, 0xe6, 0x03, 0x28, 0x16, 0xa3, 0xdd, 0x21, 0xb9, 0xf6, 0x72, 0x77, 0xb3, 0xbb,
+	0xb4, 0xad, 0xa0, 0x17, 0x06, 0x7a, 0xd5, 0xab, 0xde, 0x16, 0x45, 0xd1, 0x8b, 0xde, 0x04, 0xe8,
+	0x03, 0x14, 0xc8, 0x5d, 0x9f, 0xa0, 0x40, 0xde, 0xa0, 0x68, 0x0b, 0xb4, 0x8f, 0xd0, 0xcb, 0x62,
+	0x66, 0x76, 0x97, 0xbb, 0x24, 0x15, 0x2b, 0x01, 0xe2, 0x5c, 0x91, 0xf3, 0x9b, 0xdf, 0x39, 0x73,
+	0xe6, 0xcc, 0x99, 0x33, 0x67, 0x66, 0x61, 0x7b, 0xe4, 0x38, 0x23, 0x8b, 0xee, 0xba, 0x9e, 0x13,
+	0x38, 0xa7, 0xd3, 0xe1, 0xae, 0x41, 0x7d, 0xdd, 0x33, 0xdd, 0xc0, 0xf1, 0xea, 0x1c, 0xc3, 0x6b,
+	0x82, 0x51, 0x8f, 0x18, 0xb5, 0x63, 0x58, 0x7f, 0x60, 0x5a, 0xb4, 0x15, 0x13, 0xfb, 0x34, 0xc0,
+	0xf7, 0x20, 0x37, 0x34, 0x2d, 0x2a, 0x4b, 0xdb, 0xd9, 0x9d, 0xf2, 0xad, 0x37, 0xeb, 0x73, 0x42,
+	0xf5, 0xb4, 0x44, 0x8f, 0xc1, 0x2a, 0x97, 0xa8, 0xfd, 0x2b, 0x07, 0x1b, 0x4b, 0x7a, 0x31, 0x86,
+	0x9c, 0x4d, 0x26, 0x4c, 0xa3, 0xb4, 0x53, 0x52, 0xf9, 0x7f, 0x2c, 0xc3, 0x8a, 0x4b, 0xf4, 0x47,
+	0x64, 0x44, 0xe5, 0x0c, 0x87, 0xa3, 0x26, 0x7e, 0x1d, 0xc0, 0xa0, 0x2e, 0xb5, 0x0d, 0x6a, 0xeb,
+	0x67, 0x72, 0x76, 0x3b, 0xbb, 0x53, 0x52, 0x13, 0x08, 0x7e, 0x07, 0xd6, 0xdd, 0xe9, 0xa9, 0x65,
+	0xea, 0x5a, 0x82, 0x06, 0xdb, 0xd9, 0x9d, 0xbc, 0x8a, 0x44, 0x47, 0x6b, 0x46, 0xbe, 0x0e, 0x6b,
+	0x4f, 0x28, 0x79, 0x94, 0xa4, 0x96, 0x39, 0xb5, 0xca, 0xe0, 0x04, 0xb1, 0x09, 0x95, 0x09, 0xf5,
+	0x7d, 0x32, 0xa2, 0x5a, 0x70, 0xe6, 0x52, 0x39, 0xc7, 0x67, 0xbf, 0xbd, 0x30, 0xfb, 0xf9, 0x99,
+	0x97, 0x43, 0xa9, 0xc1, 0x99, 0x4b, 0x71, 0x03, 0x4a, 0xd4, 0x9e, 0x4e, 0x84, 0x86, 0xfc, 0x39,
+	0xfe, 0x53, 0xec, 0xe9, 0x64, 0x5e, 0x4b, 0x91, 0x89, 0x85, 0x2a, 0x56, 0x7c, 0xea, 0x3d, 0x36,
+	0x75, 0x2a, 0x17, 0xb8, 0x82, 0xeb, 0x0b, 0x0a, 0xfa, 0xa2, 0x7f, 0x5e, 0x47, 0x24, 0x87, 0x9b,
+	0x50, 0xa2, 0x4f, 0x03, 0x6a, 0xfb, 0xa6, 0x63, 0xcb, 0x2b, 0x5c, 0xc9, 0x5b, 0x4b, 0x56, 0x91,
+	0x5a, 0xc6, 0xbc, 0x8a, 0x99, 0x1c, 0xbe, 0x0b, 0x2b, 0x8e, 0x1b, 0x98, 0x8e, 0xed, 0xcb, 0xc5,
+	0x6d, 0x69, 0xa7, 0x7c, 0xeb, 0xd5, 0xa5, 0x81, 0xd0, 0x15, 0x1c, 0x35, 0x22, 0xe3, 0x36, 0x20,
+	0xdf, 0x99, 0x7a, 0x3a, 0xd5, 0x74, 0xc7, 0xa0, 0x9a, 0x69, 0x0f, 0x1d, 0xb9, 0xc4, 0x15, 0x5c,
+	0x5d, 0x9c, 0x08, 0x27, 0x36, 0x1d, 0x83, 0xb6, 0xed, 0xa1, 0xa3, 0x56, 0xfd, 0x54, 0x1b, 0x5f,
+	0x82, 0x82, 0x7f, 0x66, 0x07, 0xe4, 0xa9, 0x5c, 0xe1, 0x11, 0x12, 0xb6, 0x6a, 0x5f, 0x17, 0x60,
+	0xed, 0x22, 0x21, 0x76, 0x1f, 0xf2, 0x43, 0x36, 0x4b, 0x39, 0xf3, 0x5d, 0x7c, 0x20, 0x64, 0xd2,
+	0x4e, 0x2c, 0x7c, 0x4f, 0x27, 0x36, 0xa0, 0x6c, 0x53, 0x3f, 0xa0, 0x86, 0x88, 0x88, 0xec, 0x05,
+	0x63, 0x0a, 0x84, 0xd0, 0x62, 0x48, 0xe5, 0xbe, 0x57, 0x48, 0x7d, 0x0a, 0x6b, 0xb1, 0x49, 0x9a,
+	0x47, 0xec, 0x51, 0x14, 0x9b, 0xbb, 0xcf, 0xb3, 0xa4, 0xae, 0x44, 0x72, 0x2a, 0x13, 0x53, 0xab,
+	0x34, 0xd5, 0xc6, 0x2d, 0x00, 0xc7, 0xa6, 0xce, 0x50, 0x33, 0xa8, 0x6e, 0xc9, 0xc5, 0x73, 0xbc,
+	0xd4, 0x65, 0x94, 0x05, 0x2f, 0x39, 0x02, 0xd5, 0x2d, 0xfc, 0xe1, 0x2c, 0xd4, 0x56, 0xce, 0x89,
+	0x94, 0x63, 0xb1, 0xc9, 0x16, 0xa2, 0xed, 0x04, 0xaa, 0x1e, 0x65, 0x71, 0x4f, 0x8d, 0x70, 0x66,
+	0x25, 0x6e, 0x44, 0xfd, 0xb9, 0x33, 0x53, 0x43, 0x31, 0x31, 0xb1, 0x55, 0x2f, 0xd9, 0xc4, 0x6f,
+	0x40, 0x0c, 0x68, 0x3c, 0xac, 0x80, 0x67, 0xa1, 0x4a, 0x04, 0x76, 0xc8, 0x84, 0x6e, 0x7d, 0x09,
+	0xd5, 0xb4, 0x7b, 0xf0, 0x26, 0xe4, 0xfd, 0x80, 0x78, 0x01, 0x8f, 0xc2, 0xbc, 0x2a, 0x1a, 0x18,
+	0x41, 0x96, 0xda, 0x06, 0xcf, 0x72, 0x79, 0x95, 0xfd, 0xc5, 0x3f, 0x9d, 0x4d, 0x38, 0xcb, 0x27,
+	0xfc, 0xf6, 0xe2, 0x8a, 0xa6, 0x34, 0xcf, 0xcf, 0x7b, 0xeb, 0x03, 0x58, 0x4d, 0x4d, 0xe0, 0xa2,
+	0x43, 0xd7, 0x7e, 0x05, 0x2f, 0x2f, 0x55, 0x8d, 0x3f, 0x85, 0xcd, 0xa9, 0x6d, 0xda, 0x01, 0xf5,
+	0x5c, 0x8f, 0xb2, 0x88, 0x15, 0x43, 0xc9, 0xff, 0x5e, 0x39, 0x27, 0xe6, 0x4e, 0x92, 0x6c, 0xa1,
+	0x45, 0xdd, 0x98, 0x2e, 0x82, 0x37, 0x4b, 0xc5, 0xff, 0xac, 0xa0, 0x67, 0xcf, 0x9e, 0x3d, 0xcb,
+	0xd4, 0x7e, 0x57, 0x80, 0xcd, 0x65, 0x7b, 0x66, 0xe9, 0xf6, 0xbd, 0x04, 0x05, 0x7b, 0x3a, 0x39,
+	0xa5, 0x1e, 0x77, 0x52, 0x5e, 0x0d, 0x5b, 0xb8, 0x01, 0x79, 0x8b, 0x9c, 0x52, 0x4b, 0xce, 0x6d,
+	0x4b, 0x3b, 0xd5, 0x5b, 0xef, 0x5c, 0x68, 0x57, 0xd6, 0x8f, 0x98, 0x88, 0x2a, 0x24, 0xf1, 0x47,
+	0x90, 0x0b, 0x53, 0x34, 0xd3, 0x70, 0xf3, 0x62, 0x1a, 0xd8, 0x5e, 0x52, 0xb9, 0x1c, 0x7e, 0x05,
+	0x4a, 0xec, 0x57, 0xc4, 0x46, 0x81, 0xdb, 0x5c, 0x64, 0x00, 0x8b, 0x0b, 0xbc, 0x05, 0x45, 0xbe,
+	0x4d, 0x0c, 0x1a, 0x1d, 0x6d, 0x71, 0x9b, 0x05, 0x96, 0x41, 0x87, 0x64, 0x6a, 0x05, 0xda, 0x63,
+	0x62, 0x4d, 0x29, 0x0f, 0xf8, 0x92, 0x5a, 0x09, 0xc1, 0x5f, 0x30, 0x0c, 0x5f, 0x85, 0xb2, 0xd8,
+	0x55, 0xa6, 0x6d, 0xd0, 0xa7, 0x3c, 0x7b, 0xe6, 0x55, 0xb1, 0xd1, 0xda, 0x0c, 0x61, 0xc3, 0x3f,
+	0xf4, 0x1d, 0x3b, 0x0a, 0x4d, 0x3e, 0x04, 0x03, 0xf8, 0xf0, 0x1f, 0xcc, 0x27, 0xee, 0xd7, 0x96,
+	0x4f, 0x6f, 0x3e, 0xa6, 0x6a, 0x7f, 0xc9, 0x40, 0x8e, 0xe7, 0x8b, 0x35, 0x28, 0x0f, 0x3e, 0xeb,
+	0x29, 0x5a, 0xab, 0x7b, 0xb2, 0x7f, 0xa4, 0x20, 0x09, 0x57, 0x01, 0x38, 0xf0, 0xe0, 0xa8, 0xdb,
+	0x18, 0xa0, 0x4c, 0xdc, 0x6e, 0x77, 0x06, 0x77, 0x6f, 0xa3, 0x6c, 0x2c, 0x70, 0x22, 0x80, 0x5c,
+	0x92, 0xf0, 0xfe, 0x2d, 0x94, 0xc7, 0x08, 0x2a, 0x42, 0x41, 0xfb, 0x53, 0xa5, 0x75, 0xf7, 0x36,
+	0x2a, 0xa4, 0x91, 0xf7, 0x6f, 0xa1, 0x15, 0xbc, 0x0a, 0x25, 0x8e, 0xec, 0x77, 0xbb, 0x47, 0xa8,
+	0x18, 0xeb, 0xec, 0x0f, 0xd4, 0x76, 0xe7, 0x00, 0x95, 0x62, 0x9d, 0x07, 0x6a, 0xf7, 0xa4, 0x87,
+	0x20, 0xd6, 0x70, 0xac, 0xf4, 0xfb, 0x8d, 0x03, 0x05, 0x95, 0x63, 0xc6, 0xfe, 0x67, 0x03, 0xa5,
+	0x8f, 0x2a, 0x29, 0xb3, 0xde, 0xbf, 0x85, 0x56, 0xe3, 0x21, 0x94, 0xce, 0xc9, 0x31, 0xaa, 0xe2,
+	0x75, 0x58, 0x15, 0x43, 0x44, 0x46, 0xac, 0xcd, 0x41, 0x77, 0x6f, 0x23, 0x34, 0x33, 0x44, 0x68,
+	0x59, 0x4f, 0x01, 0x77, 0x6f, 0x23, 0x5c, 0x6b, 0x42, 0x9e, 0x47, 0x17, 0xc6, 0x50, 0x3d, 0x6a,
+	0xec, 0x2b, 0x47, 0x5a, 0xb7, 0x37, 0x68, 0x77, 0x3b, 0x8d, 0x23, 0x24, 0xcd, 0x30, 0x55, 0xf9,
+	0xf9, 0x49, 0x5b, 0x55, 0x5a, 0x28, 0x93, 0xc4, 0x7a, 0x4a, 0x63, 0xa0, 0xb4, 0x50, 0xb6, 0xa6,
+	0xc3, 0xe6, 0xb2, 0x3c, 0xb9, 0x74, 0x67, 0x24, 0x96, 0x38, 0x73, 0xce, 0x12, 0x73, 0x5d, 0x0b,
+	0x4b, 0xfc, 0xcf, 0x0c, 0x6c, 0x2c, 0x39, 0x2b, 0x96, 0x0e, 0xf2, 0x13, 0xc8, 0x8b, 0x10, 0x15,
+	0xa7, 0xe7, 0x8d, 0xa5, 0x87, 0x0e, 0x0f, 0xd8, 0x85, 0x13, 0x94, 0xcb, 0x25, 0x2b, 0x88, 0xec,
+	0x39, 0x15, 0x04, 0x53, 0xb1, 0x90, 0xd3, 0x7f, 0xb9, 0x90, 0xd3, 0xc5, 0xb1, 0x77, 0xf7, 0x22,
+	0xc7, 0x1e, 0xc7, 0xbe, 0x5b, 0x6e, 0xcf, 0x2f, 0xc9, 0xed, 0xf7, 0x61, 0x7d, 0x41, 0xd1, 0x85,
+	0x73, 0xec, 0xaf, 0x25, 0x90, 0xcf, 0x73, 0xce, 0x73, 0x32, 0x5d, 0x26, 0x95, 0xe9, 0xee, 0xcf,
+	0x7b, 0xf0, 0xda, 0xf9, 0x8b, 0xb0, 0xb0, 0xd6, 0x5f, 0x49, 0x70, 0x69, 0x79, 0xa5, 0xb8, 0xd4,
+	0x86, 0x8f, 0xa0, 0x30, 0xa1, 0xc1, 0xd8, 0x89, 0xaa, 0xa5, 0xb7, 0x97, 0x9c, 0xc1, 0xac, 0x7b,
+	0x7e, 0xb1, 0x43, 0xa9, 0xe4, 0x21, 0x9e, 0x3d, 0xaf, 0xdc, 0x13, 0xd6, 0x2c, 0x58, 0xfa, 0x9b,
+	0x0c, 0xbc, 0xbc, 0x54, 0xf9, 0x52, 0x43, 0x5f, 0x03, 0x30, 0x6d, 0x77, 0x1a, 0x88, 0x8a, 0x48,
+	0x24, 0xd8, 0x12, 0x47, 0x78, 0xf2, 0x62, 0xc9, 0x73, 0x1a, 0xc4, 0xfd, 0x59, 0xde, 0x0f, 0x02,
+	0xe2, 0x84, 0x7b, 0x33, 0x43, 0x73, 0xdc, 0xd0, 0xd7, 0xcf, 0x99, 0xe9, 0x42, 0x60, 0xbe, 0x07,
+	0x48, 0xb7, 0x4c, 0x6a, 0x07, 0x9a, 0x1f, 0x78, 0x94, 0x4c, 0x4c, 0x7b, 0xc4, 0x4f, 0x90, 0xe2,
+	0x5e, 0x7e, 0x48, 0x2c, 0x9f, 0xaa, 0x6b, 0xa2, 0xbb, 0x1f, 0xf5, 0x32, 0x09, 0x1e, 0x40, 0x5e,
+	0x42, 0xa2, 0x90, 0x92, 0x10, 0xdd, 0xb1, 0x44, 0xed, 0xeb, 0x22, 0x94, 0x13, 0x75, 0x35, 0xbe,
+	0x06, 0x95, 0x87, 0xe4, 0x31, 0xd1, 0xa2, 0xbb, 0x92, 0xf0, 0x44, 0x99, 0x61, 0xbd, 0xf0, 0xbe,
+	0xf4, 0x1e, 0x6c, 0x72, 0x8a, 0x33, 0x0d, 0xa8, 0xa7, 0xe9, 0x16, 0xf1, 0x7d, 0xee, 0xb4, 0x22,
+	0xa7, 0x62, 0xd6, 0xd7, 0x65, 0x5d, 0xcd, 0xa8, 0x07, 0xdf, 0x81, 0x0d, 0x2e, 0x31, 0x99, 0x5a,
+	0x81, 0xe9, 0x5a, 0x54, 0x63, 0xb7, 0x37, 0x9f, 0x9f, 0x24, 0xb1, 0x65, 0xeb, 0x8c, 0x71, 0x1c,
+	0x12, 0x98, 0x45, 0x3e, 0x6e, 0xc1, 0x6b, 0x5c, 0x6c, 0x44, 0x6d, 0xea, 0x91, 0x80, 0x6a, 0xf4,
+	0x8b, 0x29, 0xb1, 0x7c, 0x8d, 0xd8, 0x86, 0x36, 0x26, 0xfe, 0x58, 0xde, 0x64, 0x0a, 0xf6, 0x33,
+	0xb2, 0xa4, 0x5e, 0x61, 0xc4, 0x83, 0x90, 0xa7, 0x70, 0x5a, 0xc3, 0x36, 0x3e, 0x26, 0xfe, 0x18,
+	0xef, 0xc1, 0x25, 0xae, 0xc5, 0x0f, 0x3c, 0xd3, 0x1e, 0x69, 0xfa, 0x98, 0xea, 0x8f, 0xb4, 0x69,
+	0x30, 0xbc, 0x27, 0xbf, 0x92, 0x1c, 0x9f, 0x5b, 0xd8, 0xe7, 0x9c, 0x26, 0xa3, 0x9c, 0x04, 0xc3,
+	0x7b, 0xb8, 0x0f, 0x15, 0xb6, 0x18, 0x13, 0xf3, 0x4b, 0xaa, 0x0d, 0x1d, 0x8f, 0x1f, 0x8d, 0xd5,
+	0x25, 0xa9, 0x29, 0xe1, 0xc1, 0x7a, 0x37, 0x14, 0x38, 0x76, 0x0c, 0xba, 0x97, 0xef, 0xf7, 0x14,
+	0xa5, 0xa5, 0x96, 0x23, 0x2d, 0x0f, 0x1c, 0x8f, 0x05, 0xd4, 0xc8, 0x89, 0x1d, 0x5c, 0x16, 0x01,
+	0x35, 0x72, 0x22, 0xf7, 0xde, 0x81, 0x0d, 0x5d, 0x17, 0x73, 0x36, 0x75, 0x2d, 0xbc, 0x63, 0xf9,
+	0x32, 0x4a, 0x39, 0x4b, 0xd7, 0x0f, 0x04, 0x21, 0x8c, 0x71, 0x1f, 0x7f, 0x08, 0x2f, 0xcf, 0x9c,
+	0x95, 0x14, 0x5c, 0x5f, 0x98, 0xe5, 0xbc, 0xe8, 0x1d, 0xd8, 0x70, 0xcf, 0x16, 0x05, 0x71, 0x6a,
+	0x44, 0xf7, 0x6c, 0x5e, 0xec, 0x03, 0xd8, 0x74, 0xc7, 0xee, 0xa2, 0xdc, 0xcd, 0xa4, 0x1c, 0x76,
+	0xc7, 0xee, 0xbc, 0xe0, 0x5b, 0xfc, 0xc2, 0xed, 0x51, 0x9d, 0x04, 0xd4, 0x90, 0x2f, 0x27, 0xe9,
+	0x89, 0x0e, 0xbc, 0x0b, 0x48, 0xd7, 0x35, 0x6a, 0x93, 0x53, 0x8b, 0x6a, 0xc4, 0xa3, 0x36, 0xf1,
+	0xe5, 0xab, 0x49, 0x72, 0x55, 0xd7, 0x15, 0xde, 0xdb, 0xe0, 0x9d, 0xf8, 0x26, 0xac, 0x3b, 0xa7,
+	0x0f, 0x75, 0x11, 0x92, 0x9a, 0xeb, 0xd1, 0xa1, 0xf9, 0x54, 0x7e, 0x93, 0xfb, 0x77, 0x8d, 0x75,
+	0xf0, 0x80, 0xec, 0x71, 0x18, 0xdf, 0x00, 0xa4, 0xfb, 0x63, 0xe2, 0xb9, 0x3c, 0x27, 0xfb, 0x2e,
+	0xd1, 0xa9, 0xfc, 0x96, 0xa0, 0x0a, 0xbc, 0x13, 0xc1, 0x6c, 0x4b, 0xf8, 0x4f, 0xcc, 0x61, 0x10,
+	0x69, 0xbc, 0x2e, 0xb6, 0x04, 0xc7, 0x42, 0x6d, 0x3b, 0x80, 0x98, 0x2b, 0x52, 0x03, 0xef, 0x70,
+	0x5a, 0xd5, 0x1d, 0xbb, 0xc9, 0x71, 0xdf, 0x80, 0x55, 0xc6, 0x9c, 0x0d, 0x7a, 0x43, 0x14, 0x64,
+	0xee, 0x38, 0x31, 0xe2, 0x0f, 0x56, 0x1b, 0xd7, 0xf6, 0xa0, 0x92, 0x8c, 0x4f, 0x5c, 0x02, 0x11,
+	0xa1, 0x48, 0x62, 0xc5, 0x4a, 0xb3, 0xdb, 0x62, 0x65, 0xc6, 0xe7, 0x0a, 0xca, 0xb0, 0x72, 0xe7,
+	0xa8, 0x3d, 0x50, 0x34, 0xf5, 0xa4, 0x33, 0x68, 0x1f, 0x2b, 0x28, 0x9b, 0xa8, 0xab, 0x0f, 0x73,
+	0xc5, 0xb7, 0xd1, 0xf5, 0xda, 0x37, 0x19, 0xa8, 0xa6, 0x2f, 0x4a, 0xf8, 0xff, 0xe1, 0x72, 0xf4,
+	0xaa, 0xe1, 0xd3, 0x40, 0x7b, 0x62, 0x7a, 0x7c, 0xe3, 0x4c, 0x88, 0x38, 0xc4, 0xe2, 0xa5, 0xdb,
+	0x0c, 0x59, 0x7d, 0x1a, 0x7c, 0x62, 0x7a, 0x6c, 0x5b, 0x4c, 0x48, 0x80, 0x8f, 0xe0, 0xaa, 0xed,
+	0x68, 0x7e, 0x40, 0x6c, 0x83, 0x78, 0x86, 0x36, 0x7b, 0x4f, 0xd2, 0x88, 0xae, 0x53, 0xdf, 0x77,
+	0xc4, 0x81, 0x15, 0x6b, 0x79, 0xd5, 0x76, 0xfa, 0x21, 0x79, 0x96, 0xc9, 0x1b, 0x21, 0x75, 0x2e,
+	0xcc, 0xb2, 0xe7, 0x85, 0xd9, 0x2b, 0x50, 0x9a, 0x10, 0x57, 0xa3, 0x76, 0xe0, 0x9d, 0xf1, 0xf2,
+	0xb8, 0xa8, 0x16, 0x27, 0xc4, 0x55, 0x58, 0xfb, 0x85, 0xdc, 0x52, 0x0e, 0x73, 0xc5, 0x22, 0x2a,
+	0x1d, 0xe6, 0x8a, 0x25, 0x04, 0xb5, 0x7f, 0x64, 0xa1, 0x92, 0x2c, 0x97, 0xd9, 0xed, 0x43, 0xe7,
+	0x27, 0x8b, 0xc4, 0x73, 0xcf, 0x1b, 0xdf, 0x5a, 0x5c, 0xd7, 0x9b, 0xec, 0xc8, 0xd9, 0x2b, 0x88,
+	0x22, 0x56, 0x15, 0x92, 0xec, 0xb8, 0x67, 0xd9, 0x86, 0x8a, 0xa2, 0xa1, 0xa8, 0x86, 0x2d, 0x7c,
+	0x00, 0x85, 0x87, 0x3e, 0xd7, 0x5d, 0xe0, 0xba, 0xdf, 0xfc, 0x76, 0xdd, 0x87, 0x7d, 0xae, 0xbc,
+	0x74, 0xd8, 0xd7, 0x3a, 0x5d, 0xf5, 0xb8, 0x71, 0xa4, 0x86, 0xe2, 0xf8, 0x0a, 0xe4, 0x2c, 0xf2,
+	0xe5, 0x59, 0xfa, 0x70, 0xe2, 0xd0, 0x45, 0x17, 0xe1, 0x0a, 0xe4, 0x9e, 0x50, 0xf2, 0x28, 0x7d,
+	0x24, 0x70, 0xe8, 0x07, 0xdc, 0x0c, 0xbb, 0x90, 0xe7, 0xfe, 0xc2, 0x00, 0xa1, 0xc7, 0xd0, 0x4b,
+	0xb8, 0x08, 0xb9, 0x66, 0x57, 0x65, 0x1b, 0x02, 0x41, 0x45, 0xa0, 0x5a, 0xaf, 0xad, 0x34, 0x15,
+	0x94, 0xa9, 0xdd, 0x81, 0x82, 0x70, 0x02, 0xdb, 0x2c, 0xb1, 0x1b, 0xd0, 0x4b, 0x61, 0x33, 0xd4,
+	0x21, 0x45, 0xbd, 0x27, 0xc7, 0xfb, 0x8a, 0x8a, 0x32, 0xe9, 0xa5, 0xce, 0xa1, 0x7c, 0xcd, 0x87,
+	0x4a, 0xb2, 0x5e, 0x7e, 0x31, 0x77, 0xe1, 0xbf, 0x4a, 0x50, 0x4e, 0xd4, 0xbf, 0xac, 0x70, 0x21,
+	0x96, 0xe5, 0x3c, 0xd1, 0x88, 0x65, 0x12, 0x3f, 0x0c, 0x0d, 0xe0, 0x50, 0x83, 0x21, 0x17, 0x5d,
+	0xba, 0x17, 0xb4, 0x45, 0xf2, 0xa8, 0x50, 0xfb, 0xa3, 0x04, 0x68, 0xbe, 0x00, 0x9d, 0x33, 0x53,
+	0xfa, 0x31, 0xcd, 0xac, 0xfd, 0x41, 0x82, 0x6a, 0xba, 0xea, 0x9c, 0x33, 0xef, 0xda, 0x8f, 0x6a,
+	0xde, 0xdf, 0x33, 0xb0, 0x9a, 0xaa, 0x35, 0x2f, 0x6a, 0xdd, 0x17, 0xb0, 0x6e, 0x1a, 0x74, 0xe2,
+	0x3a, 0x01, 0xb5, 0xf5, 0x33, 0xcd, 0xa2, 0x8f, 0xa9, 0x25, 0xd7, 0x78, 0xd2, 0xd8, 0xfd, 0xf6,
+	0x6a, 0xb6, 0xde, 0x9e, 0xc9, 0x1d, 0x31, 0xb1, 0xbd, 0x8d, 0x76, 0x4b, 0x39, 0xee, 0x75, 0x07,
+	0x4a, 0xa7, 0xf9, 0x99, 0x76, 0xd2, 0xf9, 0x59, 0xa7, 0xfb, 0x49, 0x47, 0x45, 0xe6, 0x1c, 0xed,
+	0x07, 0xdc, 0xf6, 0x3d, 0x40, 0xf3, 0x46, 0xe1, 0xcb, 0xb0, 0xcc, 0x2c, 0xf4, 0x12, 0xde, 0x80,
+	0xb5, 0x4e, 0x57, 0xeb, 0xb7, 0x5b, 0x8a, 0xa6, 0x3c, 0x78, 0xa0, 0x34, 0x07, 0x7d, 0xf1, 0x3e,
+	0x11, 0xb3, 0x07, 0xa9, 0x0d, 0x5e, 0xfb, 0x7d, 0x16, 0x36, 0x96, 0x58, 0x82, 0x1b, 0xe1, 0xcd,
+	0x42, 0x5c, 0x76, 0xde, 0xbd, 0x88, 0xf5, 0x75, 0x56, 0x10, 0xf4, 0x88, 0x17, 0x84, 0x17, 0x91,
+	0x1b, 0xc0, 0xbc, 0x64, 0x07, 0xe6, 0xd0, 0xa4, 0x5e, 0xf8, 0x9c, 0x23, 0xae, 0x1b, 0x6b, 0x33,
+	0x5c, 0xbc, 0xe8, 0xfc, 0x1f, 0x60, 0xd7, 0xf1, 0xcd, 0xc0, 0x7c, 0x4c, 0x35, 0xd3, 0x8e, 0xde,
+	0x7e, 0xd8, 0xf5, 0x23, 0xa7, 0xa2, 0xa8, 0xa7, 0x6d, 0x07, 0x31, 0xdb, 0xa6, 0x23, 0x32, 0xc7,
+	0x66, 0xc9, 0x3c, 0xab, 0xa2, 0xa8, 0x27, 0x66, 0x5f, 0x83, 0x8a, 0xe1, 0x4c, 0x59, 0x4d, 0x26,
+	0x78, 0xec, 0xec, 0x90, 0xd4, 0xb2, 0xc0, 0x62, 0x4a, 0x58, 0x6d, 0xcf, 0x1e, 0x9d, 0x2a, 0x6a,
+	0x59, 0x60, 0x82, 0x72, 0x1d, 0xd6, 0xc8, 0x68, 0xe4, 0x31, 0xe5, 0x91, 0x22, 0x71, 0x7f, 0xa8,
+	0xc6, 0x30, 0x27, 0x6e, 0x1d, 0x42, 0x31, 0xf2, 0x03, 0x3b, 0xaa, 0x99, 0x27, 0x34, 0x57, 0x5c,
+	0x8a, 0x33, 0x3b, 0x25, 0xb5, 0x68, 0x47, 0x9d, 0xd7, 0xa0, 0x62, 0xfa, 0xda, 0xec, 0x0d, 0x3d,
+	0xb3, 0x9d, 0xd9, 0x29, 0xaa, 0x65, 0xd3, 0x8f, 0xdf, 0x1f, 0x6b, 0x5f, 0x65, 0xa0, 0x9a, 0xfe,
+	0x06, 0x80, 0x5b, 0x50, 0xb4, 0x1c, 0x9d, 0xf0, 0xd0, 0x12, 0x1f, 0xa0, 0x76, 0x9e, 0xf3, 0xd9,
+	0xa0, 0x7e, 0x14, 0xf2, 0xd5, 0x58, 0x72, 0xeb, 0x6f, 0x12, 0x14, 0x23, 0x18, 0x5f, 0x82, 0x9c,
+	0x4b, 0x82, 0x31, 0x57, 0x97, 0xdf, 0xcf, 0x20, 0x49, 0xe5, 0x6d, 0x86, 0xfb, 0x2e, 0xb1, 0x79,
+	0x08, 0x84, 0x38, 0x6b, 0xb3, 0x75, 0xb5, 0x28, 0x31, 0xf8, 0xe5, 0xc4, 0x99, 0x4c, 0xa8, 0x1d,
+	0xf8, 0xd1, 0xba, 0x86, 0x78, 0x33, 0x84, 0xf1, 0x3b, 0xb0, 0x1e, 0x78, 0xc4, 0xb4, 0x52, 0xdc,
+	0x1c, 0xe7, 0xa2, 0xa8, 0x23, 0x26, 0xef, 0xc1, 0x95, 0x48, 0xaf, 0x41, 0x03, 0xa2, 0x8f, 0xa9,
+	0x31, 0x13, 0x2a, 0xf0, 0x47, 0x88, 0xcb, 0x21, 0xa1, 0x15, 0xf6, 0x47, 0xb2, 0xb5, 0x6f, 0x24,
+	0x58, 0x8f, 0xae, 0x53, 0x46, 0xec, 0xac, 0x63, 0x00, 0x62, 0xdb, 0x4e, 0x90, 0x74, 0xd7, 0x62,
+	0x28, 0x2f, 0xc8, 0xd5, 0x1b, 0xb1, 0x90, 0x9a, 0x50, 0xb0, 0x35, 0x01, 0x98, 0xf5, 0x9c, 0xeb,
+	0xb6, 0xab, 0x50, 0x0e, 0x3f, 0xf0, 0xf0, 0xaf, 0x84, 0xe2, 0x02, 0x0e, 0x02, 0x62, 0xf7, 0x2e,
+	0xbc, 0x09, 0xf9, 0x53, 0x3a, 0x32, 0xed, 0xf0, 0xd9, 0x56, 0x34, 0xa2, 0x67, 0x92, 0x5c, 0xfc,
+	0x4c, 0xb2, 0xff, 0x5b, 0x09, 0x36, 0x74, 0x67, 0x32, 0x6f, 0xef, 0x3e, 0x9a, 0x7b, 0x05, 0xf0,
+	0x3f, 0x96, 0x3e, 0xff, 0x68, 0x64, 0x06, 0xe3, 0xe9, 0x69, 0x5d, 0x77, 0x26, 0xbb, 0x23, 0xc7,
+	0x22, 0xf6, 0x68, 0xf6, 0x99, 0x93, 0xff, 0xd1, 0xdf, 0x1d, 0x51, 0xfb, 0xdd, 0x91, 0x93, 0xf8,
+	0xe8, 0x79, 0x7f, 0xf6, 0xf7, 0xbf, 0x92, 0xf4, 0xa7, 0x4c, 0xf6, 0xa0, 0xb7, 0xff, 0xe7, 0xcc,
+	0xd6, 0x81, 0x18, 0xae, 0x17, 0xb9, 0x47, 0xa5, 0x43, 0x8b, 0xea, 0x6c, 0xca, 0xff, 0x0b, 0x00,
+	0x00, 0xff, 0xff, 0x1a, 0x28, 0x25, 0x79, 0x42, 0x1d, 0x00, 0x00,
 }
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto
index 4d4fb378..8697a50d 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto
@@ -45,6 +45,7 @@ option java_package = "com.google.protobuf";
 option java_outer_classname = "DescriptorProtos";
 option csharp_namespace = "Google.Protobuf.Reflection";
 option objc_class_prefix = "GPB";
+option cc_enable_arenas = true;
 
 // descriptor.proto must be optimized for speed because reflection-based
 // algorithms don't work during bootstrapping.
@@ -225,6 +226,26 @@ message EnumDescriptorProto {
   repeated EnumValueDescriptorProto value = 2;
 
   optional EnumOptions options = 3;
+
+  // Range of reserved numeric values. Reserved values may not be used by
+  // entries in the same enum. Reserved ranges may not overlap.
+  //
+  // Note that this is distinct from DescriptorProto.ReservedRange in that it
+  // is inclusive such that it can appropriately represent the entire int32
+  // domain.
+  message EnumReservedRange {
+    optional int32 start = 1; // Inclusive.
+    optional int32 end = 2;   // Inclusive.
+  }
+
+  // Range of reserved numeric values. Reserved numeric values may not be used
+  // by enum values in the same enum declaration. Reserved ranges may not
+  // overlap.
+  repeated EnumReservedRange reserved_range = 4;
+
+  // Reserved enum value names, which may not be reused. A given name may only
+  // be reserved once.
+  repeated string reserved_name = 5;
 }
 
 // Describes a value within an enum.
@@ -396,10 +417,12 @@ message FileOptions {
   // determining the namespace.
   optional string php_namespace = 41;
 
-  // The parser stores options it doesn't recognize here. See above.
+  // The parser stores options it doesn't recognize here.
+  // See the documentation for the "Options" section above.
   repeated UninterpretedOption uninterpreted_option = 999;
 
-  // Clients can define custom options in extensions of this message. See above.
+  // Clients can define custom options in extensions of this message.
+  // See the documentation for the "Options" section above.
   extensions 1000 to max;
 
   reserved 38;
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
deleted file mode 100644
index b5715c35..00000000
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-include $(GOROOT)/src/Make.inc
-
-TARG=github.com/golang/protobuf/compiler/generator
-GOFILES=\
-	generator.go\
-
-DEPS=../descriptor ../plugin ../../proto
-
-include $(GOROOT)/src/Make.pkg
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
index 60d52464..e0aba85f 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
@@ -40,19 +40,24 @@ import (
 	"bufio"
 	"bytes"
 	"compress/gzip"
+	"crypto/sha256"
+	"encoding/hex"
 	"fmt"
+	"go/build"
 	"go/parser"
 	"go/printer"
 	"go/token"
 	"log"
 	"os"
 	"path"
+	"sort"
 	"strconv"
 	"strings"
 	"unicode"
 	"unicode/utf8"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/protoc-gen-go/generator/internal/remap"
 
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
 	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
@@ -88,6 +93,14 @@ func RegisterPlugin(p Plugin) {
 	plugins = append(plugins, p)
 }
 
+// A GoImportPath is the import path of a Go package. e.g., "google.golang.org/genproto/protobuf".
+type GoImportPath string
+
+func (p GoImportPath) String() string { return strconv.Quote(string(p)) }
+
+// A GoPackageName is the name of a Go package. e.g., "protobuf".
+type GoPackageName string
+
 // Each type we import as a protocol buffer (other than FileDescriptorProto) needs
 // a pointer to the FileDescriptorProto that represents it.  These types achieve that
 // wrapping by placing each Proto inside a struct with the pointer to its File. The
@@ -96,19 +109,21 @@ func RegisterPlugin(p Plugin) {
 
 // The file and package name method are common to messages and enums.
 type common struct {
-	file *descriptor.FileDescriptorProto // File this object comes from.
+	file *FileDescriptor // File this object comes from.
 }
 
-// PackageName is name in the package clause in the generated file.
-func (c *common) PackageName() string { return uniquePackageOf(c.file) }
+// GoImportPath is the import path of the Go package containing the type.
+func (c *common) GoImportPath() GoImportPath {
+	return c.file.importPath
+}
 
-func (c *common) File() *descriptor.FileDescriptorProto { return c.file }
+func (c *common) File() *FileDescriptor { return c.file }
 
 func fileIsProto3(file *descriptor.FileDescriptorProto) bool {
 	return file.GetSyntax() == "proto3"
 }
 
-func (c *common) proto3() bool { return fileIsProto3(c.file) }
+func (c *common) proto3() bool { return fileIsProto3(c.file.FileDescriptorProto) }
 
 // Descriptor represents a protocol buffer message.
 type Descriptor struct {
@@ -134,7 +149,7 @@ func (d *Descriptor) TypeName() []string {
 	for parent := d; parent != nil; parent = parent.parent {
 		n++
 	}
-	s := make([]string, n, n)
+	s := make([]string, n)
 	for parent := d; parent != nil; parent = parent.parent {
 		n--
 		s[n] = parent.GetName()
@@ -256,77 +271,61 @@ type FileDescriptor struct {
 	// This is used for supporting public imports.
 	exported map[Object][]symbol
 
-	index int // The index of this file in the list of files to generate code for
+	fingerprint string        // Fingerprint of this file's contents.
+	importPath  GoImportPath  // Import path of this file's package.
+	packageName GoPackageName // Name of this file's Go package.
 
 	proto3 bool // whether to generate proto3 code for this file
 }
 
-// PackageName is the package name we'll use in the generated code to refer to this file.
-func (d *FileDescriptor) PackageName() string { return uniquePackageOf(d.FileDescriptorProto) }
-
 // VarName is the variable name we'll use in the generated code to refer
 // to the compressed bytes of this descriptor. It is not exported, so
 // it is only valid inside the generated package.
-func (d *FileDescriptor) VarName() string { return fmt.Sprintf("fileDescriptor%d", d.index) }
+func (d *FileDescriptor) VarName() string {
+	name := strings.Map(badToUnderscore, baseName(d.GetName()))
+	return fmt.Sprintf("fileDescriptor_%s_%s", name, d.fingerprint)
+}
 
 // goPackageOption interprets the file's go_package option.
 // If there is no go_package, it returns ("", "", false).
 // If there's a simple name, it returns ("", pkg, true).
 // If the option implies an import path, it returns (impPath, pkg, true).
-func (d *FileDescriptor) goPackageOption() (impPath, pkg string, ok bool) {
-	pkg = d.GetOptions().GetGoPackage()
-	if pkg == "" {
-		return
-	}
-	ok = true
-	// The presence of a slash implies there's an import path.
-	slash := strings.LastIndex(pkg, "/")
-	if slash < 0 {
-		return
-	}
-	impPath, pkg = pkg, pkg[slash+1:]
-	// A semicolon-delimited suffix overrides the package name.
-	sc := strings.IndexByte(impPath, ';')
-	if sc < 0 {
-		return
+func (d *FileDescriptor) goPackageOption() (impPath GoImportPath, pkg GoPackageName, ok bool) {
+	opt := d.GetOptions().GetGoPackage()
+	if opt == "" {
+		return "", "", false
 	}
-	impPath, pkg = impPath[:sc], impPath[sc+1:]
-	return
-}
-
-// goPackageName returns the Go package name to use in the
-// generated Go file.  The result explicit reports whether the name
-// came from an option go_package statement.  If explicit is false,
-// the name was derived from the protocol buffer's package statement
-// or the input file name.
-func (d *FileDescriptor) goPackageName() (name string, explicit bool) {
-	// Does the file have a "go_package" option?
-	if _, pkg, ok := d.goPackageOption(); ok {
-		return pkg, true
+	// A semicolon-delimited suffix delimits the import path and package name.
+	sc := strings.Index(opt, ";")
+	if sc >= 0 {
+		return GoImportPath(opt[:sc]), cleanPackageName(opt[sc+1:]), true
 	}
-
-	// Does the file have a package clause?
-	if pkg := d.GetPackage(); pkg != "" {
-		return pkg, false
+	// The presence of a slash implies there's an import path.
+	slash := strings.LastIndex(opt, "/")
+	if slash >= 0 {
+		return GoImportPath(opt), cleanPackageName(opt[slash+1:]), true
 	}
-	// Use the file base name.
-	return baseName(d.GetName()), false
+	return "", cleanPackageName(opt), true
 }
 
 // goFileName returns the output name for the generated Go file.
-func (d *FileDescriptor) goFileName() string {
+func (d *FileDescriptor) goFileName(pathType pathType) string {
 	name := *d.Name
 	if ext := path.Ext(name); ext == ".proto" || ext == ".protodevel" {
 		name = name[:len(name)-len(ext)]
 	}
 	name += ".pb.go"
 
+	if pathType == pathTypeSourceRelative {
+		return name
+	}
+
 	// Does the file have a "go_package" option?
 	// If it does, it may override the filename.
 	if impPath, _, ok := d.goPackageOption(); ok && impPath != "" {
 		// Replace the existing dirname with the declared import path.
 		_, name = path.Split(name)
-		name = path.Join(impPath, name)
+		name = path.Join(string(impPath), name)
 		return name
 	}
 
@@ -341,14 +340,13 @@ func (d *FileDescriptor) addExport(obj Object, sym symbol) {
 type symbol interface {
 	// GenerateAlias should generate an appropriate alias
 	// for the symbol from the named package.
-	GenerateAlias(g *Generator, pkg string)
+	GenerateAlias(g *Generator, pkg GoPackageName)
 }
 
 type messageSymbol struct {
 	sym                         string
 	hasExtensions, isMessageSet bool
-	hasOneof                    bool
-	getters                     []getterSymbol
+	oneofTypes                  []string
 }
 
 type getterSymbol struct {
@@ -358,144 +356,11 @@ type getterSymbol struct {
 	genType  bool   // whether typ contains a generated type (message/group/enum)
 }
 
-func (ms *messageSymbol) GenerateAlias(g *Generator, pkg string) {
-	remoteSym := pkg + "." + ms.sym
-
-	g.P("type ", ms.sym, " ", remoteSym)
-	g.P("func (m *", ms.sym, ") Reset() { (*", remoteSym, ")(m).Reset() }")
-	g.P("func (m *", ms.sym, ") String() string { return (*", remoteSym, ")(m).String() }")
-	g.P("func (*", ms.sym, ") ProtoMessage() {}")
-	if ms.hasExtensions {
-		g.P("func (*", ms.sym, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange ",
-			"{ return (*", remoteSym, ")(nil).ExtensionRangeArray() }")
-		if ms.isMessageSet {
-			g.P("func (m *", ms.sym, ") Marshal() ([]byte, error) ",
-				"{ return (*", remoteSym, ")(m).Marshal() }")
-			g.P("func (m *", ms.sym, ") Unmarshal(buf []byte) error ",
-				"{ return (*", remoteSym, ")(m).Unmarshal(buf) }")
-		}
-	}
-	if ms.hasOneof {
-		// Oneofs and public imports do not mix well.
-		// We can make them work okay for the binary format,
-		// but they're going to break weirdly for text/JSON.
-		enc := "_" + ms.sym + "_OneofMarshaler"
-		dec := "_" + ms.sym + "_OneofUnmarshaler"
-		size := "_" + ms.sym + "_OneofSizer"
-		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
-		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
-		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) int"
-		g.P("func (m *", ms.sym, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
-		g.P("return ", enc, ", ", dec, ", ", size, ", nil")
-		g.P("}")
-
-		g.P("func ", enc, encSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("enc, _, _, _ := m0.XXX_OneofFuncs()")
-		g.P("return enc(m0, b)")
-		g.P("}")
-
-		g.P("func ", dec, decSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("_, dec, _, _ := m0.XXX_OneofFuncs()")
-		g.P("return dec(m0, tag, wire, b)")
-		g.P("}")
-
-		g.P("func ", size, sizeSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("_, _, size, _ := m0.XXX_OneofFuncs()")
-		g.P("return size(m0)")
-		g.P("}")
+func (ms *messageSymbol) GenerateAlias(g *Generator, pkg GoPackageName) {
+	g.P("type ", ms.sym, " = ", pkg, ".", ms.sym)
+	for _, name := range ms.oneofTypes {
+		g.P("type ", name, " = ", pkg, ".", name)
 	}
-	for _, get := range ms.getters {
-
-		if get.typeName != "" {
-			g.RecordTypeUse(get.typeName)
-		}
-		typ := get.typ
-		val := "(*" + remoteSym + ")(m)." + get.name + "()"
-		if get.genType {
-			// typ will be "*pkg.T" (message/group) or "pkg.T" (enum)
-			// or "map[t]*pkg.T" (map to message/enum).
-			// The first two of those might have a "[]" prefix if it is repeated.
-			// Drop any package qualifier since we have hoisted the type into this package.
-			rep := strings.HasPrefix(typ, "[]")
-			if rep {
-				typ = typ[2:]
-			}
-			isMap := strings.HasPrefix(typ, "map[")
-			star := typ[0] == '*'
-			if !isMap { // map types handled lower down
-				typ = typ[strings.Index(typ, ".")+1:]
-			}
-			if star {
-				typ = "*" + typ
-			}
-			if rep {
-				// Go does not permit conversion between slice types where both
-				// element types are named. That means we need to generate a bit
-				// of code in this situation.
-				// typ is the element type.
-				// val is the expression to get the slice from the imported type.
-
-				ctyp := typ // conversion type expression; "Foo" or "(*Foo)"
-				if star {
-					ctyp = "(" + typ + ")"
-				}
-
-				g.P("func (m *", ms.sym, ") ", get.name, "() []", typ, " {")
-				g.In()
-				g.P("o := ", val)
-				g.P("if o == nil {")
-				g.In()
-				g.P("return nil")
-				g.Out()
-				g.P("}")
-				g.P("s := make([]", typ, ", len(o))")
-				g.P("for i, x := range o {")
-				g.In()
-				g.P("s[i] = ", ctyp, "(x)")
-				g.Out()
-				g.P("}")
-				g.P("return s")
-				g.Out()
-				g.P("}")
-				continue
-			}
-			if isMap {
-				// Split map[keyTyp]valTyp.
-				bra, ket := strings.Index(typ, "["), strings.Index(typ, "]")
-				keyTyp, valTyp := typ[bra+1:ket], typ[ket+1:]
-				// Drop any package qualifier.
-				// Only the value type may be foreign.
-				star := valTyp[0] == '*'
-				valTyp = valTyp[strings.Index(valTyp, ".")+1:]
-				if star {
-					valTyp = "*" + valTyp
-				}
-
-				typ := "map[" + keyTyp + "]" + valTyp
-				g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " {")
-				g.P("o := ", val)
-				g.P("if o == nil { return nil }")
-				g.P("s := make(", typ, ", len(o))")
-				g.P("for k, v := range o {")
-				g.P("s[k] = (", valTyp, ")(v)")
-				g.P("}")
-				g.P("return s")
-				g.P("}")
-				continue
-			}
-			// Convert imported type into the forwarding type.
-			val = "(" + typ + ")(" + val + ")"
-		}
-
-		g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " { return ", val, " }")
-	}
-
 }
 
 type enumSymbol struct {
@@ -503,16 +368,11 @@ type enumSymbol struct {
 	proto3 bool // Whether this came from a proto3 file.
 }
 
-func (es enumSymbol) GenerateAlias(g *Generator, pkg string) {
+func (es enumSymbol) GenerateAlias(g *Generator, pkg GoPackageName) {
 	s := es.name
-	g.P("type ", s, " ", pkg, ".", s)
+	g.P("type ", s, " = ", pkg, ".", s)
 	g.P("var ", s, "_name = ", pkg, ".", s, "_name")
 	g.P("var ", s, "_value = ", pkg, ".", s, "_value")
-	g.P("func (x ", s, ") String() string { return (", pkg, ".", s, ")(x).String() }")
-	if !es.proto3 {
-		g.P("func (x ", s, ") Enum() *", s, "{ return (*", s, ")((", pkg, ".", s, ")(x).Enum()) }")
-		g.P("func (x *", s, ") UnmarshalJSON(data []byte) error { return (*", pkg, ".", s, ")(x).UnmarshalJSON(data) }")
-	}
 }
 
 type constOrVarSymbol struct {
@@ -521,8 +381,8 @@ type constOrVarSymbol struct {
 	cast string // if non-empty, a type cast is required (used for enums)
 }
 
-func (cs constOrVarSymbol) GenerateAlias(g *Generator, pkg string) {
-	v := pkg + "." + cs.sym
+func (cs constOrVarSymbol) GenerateAlias(g *Generator, pkg GoPackageName) {
+	v := string(pkg) + "." + cs.sym
 	if cs.cast != "" {
 		v = cs.cast + "(" + v + ")"
 	}
@@ -531,21 +391,9 @@ func (cs constOrVarSymbol) GenerateAlias(g *Generator, pkg string) {
 
 // Object is an interface abstracting the abilities shared by enums, messages, extensions and imported objects.
 type Object interface {
-	PackageName() string // The name we use in our output (a_b_c), possibly renamed for uniqueness.
+	GoImportPath() GoImportPath
 	TypeName() []string
-	File() *descriptor.FileDescriptorProto
-}
-
-// Each package name we generate must be unique. The package we're generating
-// gets its own name but every other package must have a unique name that does
-// not conflict in the code we generate.  These names are chosen globally (although
-// they don't have to be, it simplifies things to do them globally).
-func uniquePackageOf(fd *descriptor.FileDescriptorProto) string {
-	s, ok := uniquePackageName[fd]
-	if !ok {
-		log.Fatal("internal error: no package name defined for " + fd.GetName())
-	}
-	return s
+	File() *FileDescriptor
 }
 
 // Generator is the type whose methods generate the output, stored in the associated response structure.
@@ -562,18 +410,30 @@ type Generator struct {
 
 	Pkg map[string]string // The names under which we import support packages
 
-	packageName      string                     // What we're calling ourselves.
-	allFiles         []*FileDescriptor          // All files in the tree
-	allFilesByName   map[string]*FileDescriptor // All files by filename.
-	genFiles         []*FileDescriptor          // Those files we will generate output for.
-	file             *FileDescriptor            // The file we are compiling now.
-	usedPackages     map[string]bool            // Names of packages used in current file.
-	typeNameToObject map[string]Object          // Key is a fully-qualified name in input syntax.
-	init             []string                   // Lines to emit in the init function.
+	outputImportPath GoImportPath                   // Package we're generating code for.
+	allFiles         []*FileDescriptor              // All files in the tree
+	allFilesByName   map[string]*FileDescriptor     // All files by filename.
+	genFiles         []*FileDescriptor              // Those files we will generate output for.
+	file             *FileDescriptor                // The file we are compiling now.
+	packageNames     map[GoImportPath]GoPackageName // Imported package names in the current file.
+	usedPackages     map[GoImportPath]bool          // Packages used in current file.
+	usedPackageNames map[GoPackageName]bool         // Package names used in the current file.
+	typeNameToObject map[string]Object              // Key is a fully-qualified name in input syntax.
+	init             []string                       // Lines to emit in the init function.
 	indent           string
+	pathType         pathType // How to generate output filenames.
 	writeOutput      bool
+	annotateCode     bool                                       // whether to store annotations
+	annotations      []*descriptor.GeneratedCodeInfo_Annotation // annotations to store
 }
 
+type pathType int
+
+const (
+	pathTypeImport pathType = iota
+	pathTypeSourceRelative
+)
+
 // New creates a new generator and allocates the request and response protobufs.
 func New() *Generator {
 	g := new(Generator)
@@ -618,8 +478,21 @@ func (g *Generator) CommandLineParameters(parameter string) {
 			g.ImportPrefix = v
 		case "import_path":
 			g.PackageImportPath = v
+		case "paths":
+			switch v {
+			case "import":
+				g.pathType = pathTypeImport
+			case "source_relative":
+				g.pathType = pathTypeSourceRelative
+			default:
+				g.Fail(fmt.Sprintf(`Unknown path type %q: want "import" or "source_relative".`, v))
+			}
 		case "plugins":
 			pluginList = v
+		case "annotate_code":
+			if v == "true" {
+				g.annotateCode = true
+			}
 		default:
 			if len(k) > 0 && k[0] == 'M' {
 				g.ImportMap[k[1:]] = v
@@ -646,37 +519,42 @@ func (g *Generator) CommandLineParameters(parameter string) {
 // If its file is in a different package, it returns the package name we're using for this file, plus ".".
 // Otherwise it returns the empty string.
 func (g *Generator) DefaultPackageName(obj Object) string {
-	pkg := obj.PackageName()
-	if pkg == g.packageName {
+	importPath := obj.GoImportPath()
+	if importPath == g.outputImportPath {
 		return ""
 	}
-	return pkg + "."
+	return string(g.GoPackageName(importPath)) + "."
 }
 
-// For each input file, the unique package name to use, underscored.
-var uniquePackageName = make(map[*descriptor.FileDescriptorProto]string)
+// GoPackageName returns the name used for a package.
+func (g *Generator) GoPackageName(importPath GoImportPath) GoPackageName {
+	if name, ok := g.packageNames[importPath]; ok {
+		return name
+	}
+	name := cleanPackageName(baseName(string(importPath)))
+	for i, orig := 1, name; g.usedPackageNames[name]; i++ {
+		name = orig + GoPackageName(strconv.Itoa(i))
+	}
+	g.packageNames[importPath] = name
+	g.usedPackageNames[name] = true
+	return name
+}
 
-// Package names already registered.  Key is the name from the .proto file;
-// value is the name that appears in the generated code.
-var pkgNamesInUse = make(map[string]bool)
+var globalPackageNames = map[GoPackageName]bool{
+	"fmt":   true,
+	"math":  true,
+	"proto": true,
+}
 
-// Create and remember a guaranteed unique package name for this file descriptor.
-// Pkg is the candidate name.  If f is nil, it's a builtin package like "proto" and
-// has no file descriptor.
+// Create and remember a guaranteed unique package name. Pkg is the candidate name.
+// The FileDescriptor parameter is unused.
 func RegisterUniquePackageName(pkg string, f *FileDescriptor) string {
-	// Convert dots to underscores before finding a unique alias.
-	pkg = strings.Map(badToUnderscore, pkg)
-
-	for i, orig := 1, pkg; pkgNamesInUse[pkg]; i++ {
-		// It's a duplicate; must rename.
-		pkg = orig + strconv.Itoa(i)
-	}
-	// Install it.
-	pkgNamesInUse[pkg] = true
-	if f != nil {
-		uniquePackageName[f.FileDescriptorProto] = pkg
+	name := cleanPackageName(pkg)
+	for i, orig := 1, name; globalPackageNames[name]; i++ {
+		name = orig + GoPackageName(strconv.Itoa(i))
 	}
-	return pkg
+	globalPackageNames[name] = true
+	return string(name)
 }
 
 var isGoKeyword = map[string]bool{
@@ -707,97 +585,83 @@ var isGoKeyword = map[string]bool{
 	"var":         true,
 }
 
+func cleanPackageName(name string) GoPackageName {
+	name = strings.Map(badToUnderscore, name)
+	// Identifier must not be keyword: insert _.
+	if isGoKeyword[name] {
+		name = "_" + name
+	}
+	// Identifier must not begin with digit: insert _.
+	if r, _ := utf8.DecodeRuneInString(name); unicode.IsDigit(r) {
+		name = "_" + name
+	}
+	return GoPackageName(name)
+}
+
 // defaultGoPackage returns the package name to use,
 // derived from the import path of the package we're building code for.
-func (g *Generator) defaultGoPackage() string {
+func (g *Generator) defaultGoPackage() GoPackageName {
 	p := g.PackageImportPath
 	if i := strings.LastIndex(p, "/"); i >= 0 {
 		p = p[i+1:]
 	}
-	if p == "" {
-		return ""
-	}
-
-	p = strings.Map(badToUnderscore, p)
-	// Identifier must not be keyword: insert _.
-	if isGoKeyword[p] {
-		p = "_" + p
-	}
-	// Identifier must not begin with digit: insert _.
-	if r, _ := utf8.DecodeRuneInString(p); unicode.IsDigit(r) {
-		p = "_" + p
-	}
-	return p
+	return cleanPackageName(p)
 }
 
 // SetPackageNames sets the package name for this run.
 // The package name must agree across all files being generated.
 // It also defines unique package names for all imported files.
 func (g *Generator) SetPackageNames() {
-	// Register the name for this package.  It will be the first name
-	// registered so is guaranteed to be unmodified.
-	pkg, explicit := g.genFiles[0].goPackageName()
+	g.outputImportPath = g.genFiles[0].importPath
 
-	// Check all files for an explicit go_package option.
+	defaultPackageNames := make(map[GoImportPath]GoPackageName)
 	for _, f := range g.genFiles {
-		thisPkg, thisExplicit := f.goPackageName()
-		if thisExplicit {
-			if !explicit {
-				// Let this file's go_package option serve for all input files.
-				pkg, explicit = thisPkg, true
-			} else if thisPkg != pkg {
-				g.Fail("inconsistent package names:", thisPkg, pkg)
-			}
+		if _, p, ok := f.goPackageOption(); ok {
+			defaultPackageNames[f.importPath] = p
 		}
 	}
-
-	// If we don't have an explicit go_package option but we have an
-	// import path, use that.
-	if !explicit {
-		p := g.defaultGoPackage()
-		if p != "" {
-			pkg, explicit = p, true
+	for _, f := range g.genFiles {
+		if _, p, ok := f.goPackageOption(); ok {
+			// Source file: option go_package = "quux/bar";
+			f.packageName = p
+		} else if p, ok := defaultPackageNames[f.importPath]; ok {
+			// A go_package option in another file in the same package.
+			//
+			// This is a poor choice in general, since every source file should
+			// contain a go_package option. Supported mainly for historical
+			// compatibility.
+			f.packageName = p
+		} else if p := g.defaultGoPackage(); p != "" {
+			// Command-line: import_path=quux/bar.
+			//
+			// The import_path flag sets a package name for files which don't
+			// contain a go_package option.
+			f.packageName = p
+		} else if p := f.GetPackage(); p != "" {
+			// Source file: package quux.bar;
+			f.packageName = cleanPackageName(p)
+		} else {
+			// Source filename.
+			f.packageName = cleanPackageName(baseName(f.GetName()))
 		}
 	}
 
-	// If there was no go_package and no import path to use,
-	// double-check that all the inputs have the same implicit
-	// Go package name.
-	if !explicit {
-		for _, f := range g.genFiles {
-			thisPkg, _ := f.goPackageName()
-			if thisPkg != pkg {
-				g.Fail("inconsistent package names:", thisPkg, pkg)
-			}
+	// Check that all files have a consistent package name and import path.
+	for _, f := range g.genFiles[1:] {
+		if a, b := g.genFiles[0].importPath, f.importPath; a != b {
+			g.Fail(fmt.Sprintf("inconsistent package import paths: %v, %v", a, b))
+		}
+		if a, b := g.genFiles[0].packageName, f.packageName; a != b {
+			g.Fail(fmt.Sprintf("inconsistent package names: %v, %v", a, b))
 		}
 	}
 
-	g.packageName = RegisterUniquePackageName(pkg, g.genFiles[0])
-
-	// Register the support package names. They might collide with the
-	// name of a package we import.
+	// Names of support packages. These never vary (if there are conflicts,
+	// we rename the conflicting package), so this could be removed someday.
 	g.Pkg = map[string]string{
-		"fmt":   RegisterUniquePackageName("fmt", nil),
-		"math":  RegisterUniquePackageName("math", nil),
-		"proto": RegisterUniquePackageName("proto", nil),
-	}
-
-AllFiles:
-	for _, f := range g.allFiles {
-		for _, genf := range g.genFiles {
-			if f == genf {
-				// In this package already.
-				uniquePackageName[f.FileDescriptorProto] = g.packageName
-				continue AllFiles
-			}
-		}
-		// The file is a dependency, so we want to ignore its go_package option
-		// because that is only relevant for its specific generated output.
-		pkg := f.GetPackage()
-		if pkg == "" {
-			pkg = baseName(*f.Name)
-		}
-		RegisterUniquePackageName(pkg, f)
+		"fmt":   "fmt",
+		"math":  "math",
+		"proto": "proto",
 	}
 }
 
@@ -807,27 +671,51 @@ AllFiles:
 func (g *Generator) WrapTypes() {
 	g.allFiles = make([]*FileDescriptor, 0, len(g.Request.ProtoFile))
 	g.allFilesByName = make(map[string]*FileDescriptor, len(g.allFiles))
+	genFileNames := make(map[string]bool)
+	for _, n := range g.Request.FileToGenerate {
+		genFileNames[n] = true
+	}
 	for _, f := range g.Request.ProtoFile {
-		// We must wrap the descriptors before we wrap the enums
-		descs := wrapDescriptors(f)
-		g.buildNestedDescriptors(descs)
-		enums := wrapEnumDescriptors(f, descs)
-		g.buildNestedEnums(descs, enums)
-		exts := wrapExtensions(f)
 		fd := &FileDescriptor{
 			FileDescriptorProto: f,
-			desc:                descs,
-			enum:                enums,
-			ext:                 exts,
 			exported:            make(map[Object][]symbol),
 			proto3:              fileIsProto3(f),
 		}
+		// The import path may be set in a number of ways.
+		if substitution, ok := g.ImportMap[f.GetName()]; ok {
+			// Command-line: M=foo.proto=quux/bar.
+			//
+			// Explicit mapping of source file to import path.
+			fd.importPath = GoImportPath(substitution)
+		} else if genFileNames[f.GetName()] && g.PackageImportPath != "" {
+			// Command-line: import_path=quux/bar.
+			//
+			// The import_path flag sets the import path for every file that
+			// we generate code for.
+			fd.importPath = GoImportPath(g.PackageImportPath)
+		} else if p, _, _ := fd.goPackageOption(); p != "" {
+			// Source file: option go_package = "quux/bar";
+			//
+			// The go_package option sets the import path. Most users should use this.
+			fd.importPath = p
+		} else {
+			// Source filename.
+			//
+			// Last resort when nothing else is available.
+			fd.importPath = GoImportPath(path.Dir(f.GetName()))
+		}
+		// We must wrap the descriptors before we wrap the enums
+		fd.desc = wrapDescriptors(fd)
+		g.buildNestedDescriptors(fd.desc)
+		fd.enum = wrapEnumDescriptors(fd, fd.desc)
+		g.buildNestedEnums(fd.desc, fd.enum)
+		fd.ext = wrapExtensions(fd)
 		extractComments(fd)
 		g.allFiles = append(g.allFiles, fd)
 		g.allFilesByName[f.GetName()] = fd
 	}
 	for _, fd := range g.allFiles {
-		fd.imp = wrapImported(fd.FileDescriptorProto, g)
+		fd.imp = wrapImported(fd, g)
 	}
 
 	g.genFiles = make([]*FileDescriptor, 0, len(g.Request.FileToGenerate))
@@ -836,11 +724,27 @@ func (g *Generator) WrapTypes() {
 		if fd == nil {
 			g.Fail("could not find file named", fileName)
 		}
-		fd.index = len(g.genFiles)
+		fingerprint, err := fingerprintProto(fd.FileDescriptorProto)
+		if err != nil {
+			g.Error(err)
+		}
+		fd.fingerprint = fingerprint
 		g.genFiles = append(g.genFiles, fd)
 	}
 }
 
+// fingerprintProto returns a fingerprint for a message.
+// The fingerprint is intended to prevent conflicts between generated fileds,
+// not to provide cryptographic security.
+func fingerprintProto(m proto.Message) (string, error) {
+	b, err := proto.Marshal(m)
+	if err != nil {
+		return "", err
+	}
+	h := sha256.Sum256(b)
+	return hex.EncodeToString(h[:8]), nil
+}
+
 // Scan the descriptors in this file.  For each one, build the slice of nested descriptors
 func (g *Generator) buildNestedDescriptors(descs []*Descriptor) {
 	for _, desc := range descs {
@@ -873,7 +777,7 @@ func (g *Generator) buildNestedEnums(descs []*Descriptor, enums []*EnumDescripto
 }
 
 // Construct the Descriptor
-func newDescriptor(desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *Descriptor {
+func newDescriptor(desc *descriptor.DescriptorProto, parent *Descriptor, file *FileDescriptor, index int) *Descriptor {
 	d := &Descriptor{
 		common:          common{file},
 		DescriptorProto: desc,
@@ -910,7 +814,7 @@ func newDescriptor(desc *descriptor.DescriptorProto, parent *Descriptor, file *d
 }
 
 // Return a slice of all the Descriptors defined within this file
-func wrapDescriptors(file *descriptor.FileDescriptorProto) []*Descriptor {
+func wrapDescriptors(file *FileDescriptor) []*Descriptor {
 	sl := make([]*Descriptor, 0, len(file.MessageType)+10)
 	for i, desc := range file.MessageType {
 		sl = wrapThisDescriptor(sl, desc, nil, file, i)
@@ -919,7 +823,7 @@ func wrapDescriptors(file *descriptor.FileDescriptorProto) []*Descriptor {
 }
 
 // Wrap this Descriptor, recursively
-func wrapThisDescriptor(sl []*Descriptor, desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) []*Descriptor {
+func wrapThisDescriptor(sl []*Descriptor, desc *descriptor.DescriptorProto, parent *Descriptor, file *FileDescriptor, index int) []*Descriptor {
 	sl = append(sl, newDescriptor(desc, parent, file, index))
 	me := sl[len(sl)-1]
 	for i, nested := range desc.NestedType {
@@ -929,7 +833,7 @@ func wrapThisDescriptor(sl []*Descriptor, desc *descriptor.DescriptorProto, pare
 }
 
 // Construct the EnumDescriptor
-func newEnumDescriptor(desc *descriptor.EnumDescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *EnumDescriptor {
+func newEnumDescriptor(desc *descriptor.EnumDescriptorProto, parent *Descriptor, file *FileDescriptor, index int) *EnumDescriptor {
 	ed := &EnumDescriptor{
 		common:              common{file},
 		EnumDescriptorProto: desc,
@@ -945,7 +849,7 @@ func newEnumDescriptor(desc *descriptor.EnumDescriptorProto, parent *Descriptor,
 }
 
 // Return a slice of all the EnumDescriptors defined within this file
-func wrapEnumDescriptors(file *descriptor.FileDescriptorProto, descs []*Descriptor) []*EnumDescriptor {
+func wrapEnumDescriptors(file *FileDescriptor, descs []*Descriptor) []*EnumDescriptor {
 	sl := make([]*EnumDescriptor, 0, len(file.EnumType)+10)
 	// Top-level enums.
 	for i, enum := range file.EnumType {
@@ -961,7 +865,7 @@ func wrapEnumDescriptors(file *descriptor.FileDescriptorProto, descs []*Descript
 }
 
 // Return a slice of all the top-level ExtensionDescriptors defined within this file.
-func wrapExtensions(file *descriptor.FileDescriptorProto) []*ExtensionDescriptor {
+func wrapExtensions(file *FileDescriptor) []*ExtensionDescriptor {
 	var sl []*ExtensionDescriptor
 	for _, field := range file.Extension {
 		sl = append(sl, &ExtensionDescriptor{common{file}, field, nil})
@@ -970,7 +874,7 @@ func wrapExtensions(file *descriptor.FileDescriptorProto) []*ExtensionDescriptor
 }
 
 // Return a slice of all the types that are publicly imported into this file.
-func wrapImported(file *descriptor.FileDescriptorProto, g *Generator) (sl []*ImportedDescriptor) {
+func wrapImported(file *FileDescriptor, g *Generator) (sl []*ImportedDescriptor) {
 	for _, index := range file.PublicDependency {
 		df := g.fileByName(file.Dependency[index])
 		for _, d := range df.desc {
@@ -1070,35 +974,84 @@ func (g *Generator) ObjectNamed(typeName string) Object {
 	return o
 }
 
+// AnnotatedAtoms is a list of atoms (as consumed by P) that records the file name and proto AST path from which they originated.
+type AnnotatedAtoms struct {
+	source string
+	path   string
+	atoms  []interface{}
+}
+
+// Annotate records the file name and proto AST path of a list of atoms
+// so that a later call to P can emit a link from each atom to its origin.
+func Annotate(file *FileDescriptor, path string, atoms ...interface{}) *AnnotatedAtoms {
+	return &AnnotatedAtoms{source: *file.Name, path: path, atoms: atoms}
+}
+
+// printAtom prints the (atomic, non-annotation) argument to the generated output.
+func (g *Generator) printAtom(v interface{}) {
+	switch v := v.(type) {
+	case string:
+		g.WriteString(v)
+	case *string:
+		g.WriteString(*v)
+	case bool:
+		fmt.Fprint(g, v)
+	case *bool:
+		fmt.Fprint(g, *v)
+	case int:
+		fmt.Fprint(g, v)
+	case *int32:
+		fmt.Fprint(g, *v)
+	case *int64:
+		fmt.Fprint(g, *v)
+	case float64:
+		fmt.Fprint(g, v)
+	case *float64:
+		fmt.Fprint(g, *v)
+	case GoPackageName:
+		g.WriteString(string(v))
+	case GoImportPath:
+		g.WriteString(strconv.Quote(string(v)))
+	default:
+		g.Fail(fmt.Sprintf("unknown type in printer: %T", v))
+	}
+}
+
 // P prints the arguments to the generated output.  It handles strings and int32s, plus
-// handling indirections because they may be *string, etc.
+// handling indirections because they may be *string, etc.  Any inputs of type AnnotatedAtoms may emit
+// annotations in a .meta file in addition to outputting the atoms themselves (if g.annotateCode
+// is true).
 func (g *Generator) P(str ...interface{}) {
 	if !g.writeOutput {
 		return
 	}
 	g.WriteString(g.indent)
 	for _, v := range str {
-		switch s := v.(type) {
-		case string:
-			g.WriteString(s)
-		case *string:
-			g.WriteString(*s)
-		case bool:
-			fmt.Fprintf(g, "%t", s)
-		case *bool:
-			fmt.Fprintf(g, "%t", *s)
-		case int:
-			fmt.Fprintf(g, "%d", s)
-		case *int32:
-			fmt.Fprintf(g, "%d", *s)
-		case *int64:
-			fmt.Fprintf(g, "%d", *s)
-		case float64:
-			fmt.Fprintf(g, "%g", s)
-		case *float64:
-			fmt.Fprintf(g, "%g", *s)
+		switch v := v.(type) {
+		case *AnnotatedAtoms:
+			begin := int32(g.Len())
+			for _, v := range v.atoms {
+				g.printAtom(v)
+			}
+			if g.annotateCode {
+				end := int32(g.Len())
+				var path []int32
+				for _, token := range strings.Split(v.path, ",") {
+					val, err := strconv.ParseInt(token, 10, 32)
+					if err != nil {
+						g.Fail("could not parse proto AST path: ", err.Error())
+					}
+					path = append(path, int32(val))
+				}
+				g.annotations = append(g.annotations, &descriptor.GeneratedCodeInfo_Annotation{
+					Path:       path,
+					SourceFile: &v.source,
+					Begin:      &begin,
+					End:        &end,
+				})
+			}
 		default:
-			g.Fail(fmt.Sprintf("unknown type in printer: %T", v))
+			g.printAtom(v)
 		}
 	}
 	g.WriteByte('\n')
@@ -1135,15 +1088,25 @@ func (g *Generator) GenerateAllFiles() {
 	}
 	for _, file := range g.allFiles {
 		g.Reset()
+		g.annotations = nil
 		g.writeOutput = genFileMap[file]
 		g.generate(file)
 		if !g.writeOutput {
 			continue
 		}
+		fname := file.goFileName(g.pathType)
 		g.Response.File = append(g.Response.File, &plugin.CodeGeneratorResponse_File{
-			Name:    proto.String(file.goFileName()),
+			Name:    proto.String(fname),
 			Content: proto.String(g.String()),
 		})
+		if g.annotateCode {
+			// Store the generated code annotations in text, as the protoc plugin protocol requires that
+			// strings contain valid UTF-8.
+			g.Response.File = append(g.Response.File, &plugin.CodeGeneratorResponse_File{
+				Name:    proto.String(file.goFileName(g.pathType) + ".meta"),
+				Content: proto.String(proto.CompactTextString(&descriptor.GeneratedCodeInfo{Annotation: g.annotations})),
+			})
+		}
 	}
 }
 
@@ -1154,32 +1117,24 @@ func (g *Generator) runPlugins(file *FileDescriptor) {
 	}
 }
 
-// FileOf return the FileDescriptor for this FileDescriptorProto.
-func (g *Generator) FileOf(fd *descriptor.FileDescriptorProto) *FileDescriptor {
-	for _, file := range g.allFiles {
-		if file.FileDescriptorProto == fd {
-			return file
-		}
-	}
-	g.Fail("could not find file in table:", fd.GetName())
-	return nil
-}
-
 // Fill the response protocol buffer with the generated output for all the files we're
 // supposed to generate.
 func (g *Generator) generate(file *FileDescriptor) {
-	g.file = g.FileOf(file.FileDescriptorProto)
-	g.usedPackages = make(map[string]bool)
-
-	if g.file.index == 0 {
-		// For one file in the package, assert version compatibility.
-		g.P("// This is a compile-time assertion to ensure that this generated file")
-		g.P("// is compatible with the proto package it is being compiled against.")
-		g.P("// A compilation error at this line likely means your copy of the")
-		g.P("// proto package needs to be updated.")
-		g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion, " // please upgrade the proto package")
-		g.P()
-	}
+	g.file = file
+	g.usedPackages = make(map[GoImportPath]bool)
+	g.packageNames = make(map[GoImportPath]GoPackageName)
+	g.usedPackageNames = make(map[GoPackageName]bool)
+	for name := range globalPackageNames {
+		g.usedPackageNames[name] = true
+	}
+
+	g.P("// This is a compile-time assertion to ensure that this generated file")
+	g.P("// is compatible with the proto package it is being compiled against.")
+	g.P("// A compilation error at this line likely means your copy of the")
+	g.P("// proto package needs to be updated.")
+	g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion, " // please upgrade the proto package")
+	g.P()
+
 	for _, td := range g.file.imp {
 		g.generateImported(td)
 	}
@@ -1205,24 +1160,36 @@ func (g *Generator) generate(file *FileDescriptor) {
 
 	// Generate header and imports last, though they appear first in the output.
 	rem := g.Buffer
+	remAnno := g.annotations
 	g.Buffer = new(bytes.Buffer)
+	g.annotations = nil
 	g.generateHeader()
 	g.generateImports()
 	if !g.writeOutput {
 		return
 	}
+	// Adjust the offsets for annotations displaced by the header and imports.
+	for _, anno := range remAnno {
+		*anno.Begin += int32(g.Len())
+		*anno.End += int32(g.Len())
+		g.annotations = append(g.annotations, anno)
+	}
 	g.Write(rem.Bytes())
 
-	// Reformat generated code.
+	// Reformat generated code and patch annotation locations.
 	fset := token.NewFileSet()
-	raw := g.Bytes()
-	ast, err := parser.ParseFile(fset, "", g, parser.ParseComments)
+	original := g.Bytes()
+	if g.annotateCode {
+		// make a copy independent of g; we'll need it after Reset.
+		original = append([]byte(nil), original...)
+	}
+	ast, err := parser.ParseFile(fset, "", original, parser.ParseComments)
 	if err != nil {
 		// Print out the bad code with line numbers.
 		// This should never happen in practice, but it can while changing generated code,
 		// so consider this a debugging aid.
 		var src bytes.Buffer
-		s := bufio.NewScanner(bytes.NewReader(raw))
+		s := bufio.NewScanner(bytes.NewReader(original))
 		for line := 1; s.Scan(); line++ {
 			fmt.Fprintf(&src, "%5d\t%s\n", line, s.Bytes())
 		}
@@ -1233,55 +1200,59 @@ func (g *Generator) generate(file *FileDescriptor) {
 	if err != nil {
 		g.Fail("generated Go source code could not be reformatted:", err.Error())
 	}
+	if g.annotateCode {
+		m, err := remap.Compute(original, g.Bytes())
+		if err != nil {
+			g.Fail("formatted generated Go source code could not be mapped back to the original code:", err.Error())
+		}
+		for _, anno := range g.annotations {
+			new, ok := m.Find(int(*anno.Begin), int(*anno.End))
+			if !ok {
+				g.Fail("span in formatted generated Go source code could not be mapped back to the original code")
+			}
+			*anno.Begin = int32(new.Pos)
+			*anno.End = int32(new.End)
+		}
+	}
 }
 
 // Generate the header, including package definition
 func (g *Generator) generateHeader() {
 	g.P("// Code generated by protoc-gen-go. DO NOT EDIT.")
-	g.P("// source: ", g.file.Name)
+	if g.file.GetOptions().GetDeprecated() {
+		g.P("// ", g.file.Name, " is a deprecated file.")
+	} else {
+		g.P("// source: ", g.file.Name)
+	}
 	g.P()
 
-	name := g.file.PackageName()
+	importPath, _, _ := g.file.goPackageOption()
+	if importPath == "" {
+		g.P("package ", g.file.packageName)
+	} else {
+		g.P("package ", g.file.packageName, " // import ", GoImportPath(g.ImportPrefix)+importPath)
+	}
+	g.P()
 
-	if g.file.index == 0 {
-		// Generate package docs for the first file in the package.
+	if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok {
 		g.P("/*")
-		g.P("Package ", name, " is a generated protocol buffer package.")
-		g.P()
-		if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok {
-			// not using g.PrintComments because this is a /* */ comment block.
-			text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
-			for _, line := range strings.Split(text, "\n") {
-				line = strings.TrimPrefix(line, " ")
-				// ensure we don't escape from the block comment
-				line = strings.Replace(line, "*/", "* /", -1)
-				g.P(line)
-			}
-			g.P()
-		}
-		var topMsgs []string
-		g.P("It is generated from these files:")
-		for _, f := range g.genFiles {
-			g.P("\t", f.Name)
-			for _, msg := range f.desc {
-				if msg.parent != nil {
-					continue
-				}
-				topMsgs = append(topMsgs, CamelCaseSlice(msg.TypeName()))
-			}
-		}
-		g.P()
-		g.P("It has these top-level messages:")
-		for _, msg := range topMsgs {
-			g.P("\t", msg)
+		// not using g.PrintComments because this is a /* */ comment block.
+		text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
+		for _, line := range strings.Split(text, "\n") {
+			line = strings.TrimPrefix(line, " ")
+			// ensure we don't escape from the block comment
+			line = strings.Replace(line, "*/", "* /", -1)
+			g.P(line)
 		}
 		g.P("*/")
+		g.P()
 	}
-
-	g.P("package ", name)
-	g.P()
 }
 
+// deprecationComment is the standard comment added to deprecated
+// messages, fields, enums, and enum values.
+var deprecationComment = "// Deprecated: Do not use."
+
 // PrintComments prints any comments from the source .proto file.
 // The path is a comma-separated list of integers.
 // It returns an indication of whether any comments were printed.
@@ -1319,35 +1290,46 @@ func (g *Generator) generateImports() {
 	// We almost always need a proto import.  Rather than computing when we
 	// do, which is tricky when there's a plugin, just import it and
 	// reference it later. The same argument applies to the fmt and math packages.
-	g.P("import " + g.Pkg["proto"] + " " + strconv.Quote(g.ImportPrefix+"github.com/golang/protobuf/proto"))
+	g.P("import "+g.Pkg["proto"]+" ", GoImportPath(g.ImportPrefix)+"github.com/golang/protobuf/proto")
 	g.P("import " + g.Pkg["fmt"] + ` "fmt"`)
 	g.P("import " + g.Pkg["math"] + ` "math"`)
+	var (
+		imports       = make(map[GoImportPath]bool)
+		strongImports = make(map[GoImportPath]bool)
+		importPaths   []string
+	)
 	for i, s := range g.file.Dependency {
 		fd := g.fileByName(s)
+		importPath := fd.importPath
 		// Do not import our own package.
-		if fd.PackageName() == g.packageName {
+		if importPath == g.file.importPath {
 			continue
 		}
-		filename := fd.goFileName()
-		// By default, import path is the dirname of the Go filename.
-		importPath := path.Dir(filename)
-		if substitution, ok := g.ImportMap[s]; ok {
-			importPath = substitution
+		if !imports[importPath] {
+			importPaths = append(importPaths, string(importPath))
+		}
+		imports[importPath] = true
+		if !g.weak(int32(i)) {
+			strongImports[importPath] = true
 		}
-		importPath = g.ImportPrefix + importPath
+	}
+	sort.Strings(importPaths)
+	for i := range importPaths {
+		importPath := GoImportPath(importPaths[i])
+		packageName := g.GoPackageName(importPath)
+		fullPath := GoImportPath(g.ImportPrefix) + importPath
 		// Skip weak imports.
-		if g.weak(int32(i)) {
-			g.P("// skipping weak import ", fd.PackageName(), " ", strconv.Quote(importPath))
+		if !strongImports[importPath] {
+			g.P("// skipping weak import ", packageName, " ", fullPath)
 			continue
 		}
 		// We need to import all the dependencies, even if we don't reference them,
 		// because other code and tools depend on having the full transitive closure
 		// of protocol buffer types in the binary.
-		pname := fd.PackageName()
-		if _, ok := g.usedPackages[pname]; !ok {
-			pname = "_"
+		if _, ok := g.usedPackages[importPath]; !ok {
+			packageName = "_"
 		}
-		g.P("import ", pname, " ", strconv.Quote(importPath))
+		g.P("import ", packageName, " ", fullPath)
 	}
 	g.P()
 	// TODO: may need to worry about uniqueness across plugins
@@ -1363,26 +1345,24 @@ func (g *Generator) generateImports() {
 }
 
 func (g *Generator) generateImported(id *ImportedDescriptor) {
-	// Don't generate public import symbols for files that we are generating
-	// code for, since those symbols will already be in this package.
-	// We can't simply avoid creating the ImportedDescriptor objects,
-	// because g.genFiles isn't populated at that stage.
 	tn := id.TypeName()
 	sn := tn[len(tn)-1]
-	df := g.FileOf(id.o.File())
+	df := id.o.File()
 	filename := *df.Name
-	for _, fd := range g.genFiles {
-		if *fd.Name == filename {
-			g.P("// Ignoring public import of ", sn, " from ", filename)
-			g.P()
-			return
-		}
+	if df.importPath == g.file.importPath {
+		// Don't generate type aliases for files in the same Go package as this one.
+		g.P("// Ignoring public import of ", sn, " from ", filename)
+		g.P()
+		return
+	}
+	if !supportTypeAliases {
+		g.Fail(fmt.Sprintf("%s: public imports require at least go1.9", filename))
 	}
 	g.P("// ", sn, " from public import ", filename)
-	g.usedPackages[df.PackageName()] = true
+	g.usedPackages[df.importPath] = true
 
 	for _, sym := range df.exported[id.o] {
-		sym.GenerateAlias(g, df.PackageName())
+		sym.GenerateAlias(g, g.GoPackageName(df.importPath))
 	}
 
 	g.P()
@@ -1396,16 +1376,26 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) {
 	ccTypeName := CamelCaseSlice(typeName)
 	ccPrefix := enum.prefix()
 
+	deprecatedEnum := ""
+	if enum.GetOptions().GetDeprecated() {
+		deprecatedEnum = deprecationComment
+	}
 	g.PrintComments(enum.path)
-	g.P("type ", ccTypeName, " int32")
+	g.P("type ", Annotate(enum.file, enum.path, ccTypeName), " int32", deprecatedEnum)
 	g.file.addExport(enum, enumSymbol{ccTypeName, enum.proto3()})
 	g.P("const (")
 	g.In()
 	for i, e := range enum.Value {
-		g.PrintComments(fmt.Sprintf("%s,%d,%d", enum.path, enumValuePath, i))
+		etorPath := fmt.Sprintf("%s,%d,%d", enum.path, enumValuePath, i)
+		g.PrintComments(etorPath)
+
+		deprecatedValue := ""
+		if e.GetOptions().GetDeprecated() {
+			deprecatedValue = deprecationComment
+		}
 
 		name := ccPrefix + *e.Name
-		g.P(name, " ", ccTypeName, " = ", e.Number)
+		g.P(Annotate(enum.file, etorPath, name), " ", ccTypeName, " = ", e.Number, " ", deprecatedValue)
 		g.file.addExport(enum, constOrVarSymbol{name, "const", ccTypeName})
 	}
 	g.Out()
@@ -1468,7 +1458,11 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) {
 		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
 	}
 	indexes = append(indexes, strconv.Itoa(enum.index))
-	g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) { return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "} }")
+	g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) {")
+	g.In()
+	g.P("return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "}")
+	g.Out()
+	g.P("}")
 	if enum.file.GetPackage() == "google.protobuf" && enum.GetName() == "NullValue" {
 		g.P("func (", ccTypeName, `) XXX_WellKnownType() string { return "`, enum.GetName(), `" }`)
 	}
@@ -1535,7 +1529,7 @@ func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptor
 	}
 	enum := ""
 	if *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM {
-		// We avoid using obj.PackageName(), because we want to use the
+		// We avoid using obj.GoPackageName(), because we want to use the
 		// original (proto-world) package name.
 		obj := g.ObjectNamed(field.GetTypeName())
 		if id, ok := obj.(*ImportedDescriptor); ok {
@@ -1617,12 +1611,6 @@ func (g *Generator) TypeName(obj Object) string {
 	return g.DefaultPackageName(obj) + CamelCaseSlice(obj.TypeName())
 }
 
-// TypeNameWithPackage is like TypeName, but always includes the package
-// name even if the object is in our own package.
-func (g *Generator) TypeNameWithPackage(obj Object) string {
-	return obj.PackageName() + CamelCaseSlice(obj.TypeName())
-}
-
 // GoType returns a string representing the type name, and the wire type
 func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescriptorProto) (typ string, wire string) {
 	// TODO: Options.
@@ -1682,10 +1670,10 @@ func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescripto
 }
 
 func (g *Generator) RecordTypeUse(t string) {
-	if obj, ok := g.typeNameToObject[t]; ok {
+	if _, ok := g.typeNameToObject[t]; ok {
 		// Call ObjectNamed to get the true object to record the use.
-		obj = g.ObjectNamed(t)
-		g.usedPackages[obj.PackageName()] = true
+		obj := g.ObjectNamed(t)
+		g.usedPackages[obj.GoImportPath()] = true
 	}
 }
 
@@ -1746,8 +1734,19 @@ func (g *Generator) generateMessage(message *Descriptor) {
 	oneofTypeName := make(map[*descriptor.FieldDescriptorProto]string) // without star
 	oneofInsertPoints := make(map[int32]int)                           // oneof_index => offset of g.Buffer
 
-	g.PrintComments(message.path)
-	g.P("type ", ccTypeName, " struct {")
+	comments := g.PrintComments(message.path)
+
+	// Guarantee deprecation comments appear after user-provided comments.
+	if message.GetOptions().GetDeprecated() {
+		if comments {
+			// Convention: Separate deprecation comments from original
+			// comments with an empty line.
+			g.P("//")
+		}
+		g.P(deprecationComment)
+	}
+
+	g.P("type ", Annotate(message.file, message.path, ccTypeName), " struct {")
 	g.In()
 
 	// allocNames finds a conflict-free variation of the given strings,
@@ -1794,7 +1793,8 @@ func (g *Generator) generateMessage(message *Descriptor) {
 
 			// This is the first field of a oneof we haven't seen before.
 			// Generate the union field.
-			com := g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageOneofPath, *field.OneofIndex))
+			oneofFullPath := fmt.Sprintf("%s,%d,%d", message.path, messageOneofPath, *field.OneofIndex)
+			com := g.PrintComments(oneofFullPath)
 			if com {
 				g.P("//")
 			}
@@ -1807,7 +1807,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			oneofFieldName[*field.OneofIndex] = fname
 			oneofDisc[*field.OneofIndex] = dname
 			tag := `protobuf_oneof:"` + odp.GetName() + `"`
-			g.P(fname, " ", dname, " `", tag, "`")
+			g.P(Annotate(message.file, oneofFullPath, fname), " ", dname, " `", tag, "`")
 		}
 
 		if *field.Type == descriptor.FieldDescriptorProto_TYPE_MESSAGE {
@@ -1871,16 +1871,26 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			continue
 		}
 
-		g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i))
-		g.P(fieldName, "\t", typename, "\t`", tag, "`")
+		fieldDeprecated := ""
+		if field.GetOptions().GetDeprecated() {
+			fieldDeprecated = deprecationComment
+		}
+
+		fieldFullPath := fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i)
+		g.PrintComments(fieldFullPath)
+		g.P(Annotate(message.file, fieldFullPath, fieldName), "\t", typename, "\t`", tag, "`", fieldDeprecated)
 		g.RecordTypeUse(field.GetTypeName())
 	}
+	g.P("XXX_NoUnkeyedLiteral\tstruct{} `json:\"-\"`") // prevent unkeyed struct literals
 	if len(message.ExtensionRange) > 0 {
-		g.P(g.Pkg["proto"], ".XXX_InternalExtensions `json:\"-\"`")
-	}
-	if !message.proto3() {
-		g.P("XXX_unrecognized\t[]byte `json:\"-\"`")
+		messageset := ""
+		if opts := message.Options; opts != nil && opts.GetMessageSetWireFormat() {
+			messageset = "protobuf_messageset:\"1\" "
+		}
+		g.P(g.Pkg["proto"], ".XXX_InternalExtensions `", messageset, "json:\"-\"`")
 	}
+	g.P("XXX_unrecognized\t[]byte `json:\"-\"`")
+	g.P("XXX_sizecache\tint32 `json:\"-\"`")
 	g.Out()
 	g.P("}")
 
@@ -1892,12 +1902,25 @@ func (g *Generator) generateMessage(message *Descriptor) {
 		all := g.Buffer.Bytes()
 		rem := all[ip:]
 		g.Buffer = bytes.NewBuffer(all[:ip:ip]) // set cap so we don't scribble on rem
+		oldLen := g.Buffer.Len()
 		for _, field := range message.Field {
 			if field.OneofIndex == nil || *field.OneofIndex != oi {
 				continue
 			}
 			g.P("//\t*", oneofTypeName[field])
 		}
+		// If we've inserted text, we also need to fix up affected annotations (as
+		// they contain offsets that may need to be changed).
+		offset := int32(g.Buffer.Len() - oldLen)
+		ip32 := int32(ip)
+		for _, anno := range g.annotations {
+			if *anno.Begin >= ip32 {
+				*anno.Begin += offset
+			}
+			if *anno.End >= ip32 {
+				*anno.End += offset
+			}
+		}
 		g.Buffer.Write(rem)
 	}
 
@@ -1909,7 +1932,11 @@ func (g *Generator) generateMessage(message *Descriptor) {
 	for m := message; m != nil; m = m.parent {
 		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
 	}
-	g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) { return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "} }")
+	g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) {")
+	g.In()
+	g.P("return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "}")
+	g.Out()
+	g.P("}")
 	// TODO: Revisit the decision to use a XXX_WellKnownType method
 	// if we change proto.MessageName to work with multiple equivalents.
 	if message.file.GetPackage() == "google.protobuf" && wellKnownTypes[message.GetName()] {
@@ -1924,16 +1951,6 @@ func (g *Generator) generateMessage(message *Descriptor) {
 		if opts := message.Options; opts != nil && opts.GetMessageSetWireFormat() {
 			isMessageSet = true
 			g.P()
-			g.P("func (m *", ccTypeName, ") Marshal() ([]byte, error) {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".MarshalMessageSet(&m.XXX_InternalExtensions)")
-			g.Out()
-			g.P("}")
-			g.P("func (m *", ccTypeName, ") Unmarshal(buf []byte) error {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)")
-			g.Out()
-			g.P("}")
 			g.P("func (m *", ccTypeName, ") MarshalJSON() ([]byte, error) {")
 			g.In()
 			g.P("return ", g.Pkg["proto"], ".MarshalMessageSetJSON(&m.XXX_InternalExtensions)")
@@ -1944,9 +1961,6 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)")
 			g.Out()
 			g.P("}")
-			g.P("// ensure ", ccTypeName, " satisfies proto.Marshaler and proto.Unmarshaler")
-			g.P("var _ ", g.Pkg["proto"], ".Marshaler = (*", ccTypeName, ")(nil)")
-			g.P("var _ ", g.Pkg["proto"], ".Unmarshaler = (*", ccTypeName, ")(nil)")
 		}
 
 		g.P()
@@ -1954,7 +1968,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
 		g.In()
 		for _, r := range message.ExtensionRange {
 			end := fmt.Sprint(*r.End - 1) // make range inclusive on both ends
-			g.P("{", r.Start, ", ", end, "},")
+			g.P("{Start: ", r.Start, ", End: ", end, "},")
 		}
 		g.Out()
 		g.P("}")
@@ -1965,6 +1979,45 @@ func (g *Generator) generateMessage(message *Descriptor) {
 		g.P("}")
 	}
 
+	// TODO: It does not scale to keep adding another method for every
+	// operation on protos that we want to switch over to using the
+	// table-driven approach. Instead, we should only add a single method
+	// that allows getting access to the *InternalMessageInfo struct and then
+	// calling Unmarshal, Marshal, Merge, Size, and Discard directly on that.
+
+	// Wrapper for table-driven marshaling and unmarshaling.
+	g.P("func (m *", ccTypeName, ") XXX_Unmarshal(b []byte) error {")
+	g.In()
+	g.P("return xxx_messageInfo_", ccTypeName, ".Unmarshal(m, b)")
+	g.Out()
+	g.P("}")
+
+	g.P("func (m *", ccTypeName, ") XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {")
+	g.In()
+	g.P("return xxx_messageInfo_", ccTypeName, ".Marshal(b, m, deterministic)")
+	g.Out()
+	g.P("}")
+
+	g.P("func (dst *", ccTypeName, ") XXX_Merge(src ", g.Pkg["proto"], ".Message) {")
+	g.In()
+	g.P("xxx_messageInfo_", ccTypeName, ".Merge(dst, src)")
+	g.Out()
+	g.P("}")
+
+	g.P("func (m *", ccTypeName, ") XXX_Size() int {") // avoid name clash with "Size" field in some message
+	g.In()
+	g.P("return xxx_messageInfo_", ccTypeName, ".Size(m)")
+	g.Out()
+	g.P("}")
+
+	g.P("func (m *", ccTypeName, ") XXX_DiscardUnknown() {")
+	g.In()
+	g.P("xxx_messageInfo_", ccTypeName, ".DiscardUnknown(m)")
+	g.Out()
+	g.P("}")
+
+	g.P("var xxx_messageInfo_", ccTypeName, " ", g.Pkg["proto"], ".InternalMessageInfo")
+
 	// Default constants
 	defNames := make(map[*descriptor.FieldDescriptorProto]string)
 	for _, field := range message.Field {
@@ -2029,17 +2082,24 @@ func (g *Generator) generateMessage(message *Descriptor) {
 	// TODO: Revisit this and consider reverting back to anonymous interfaces.
 	for oi := range message.OneofDecl {
 		dname := oneofDisc[int32(oi)]
-		g.P("type ", dname, " interface { ", dname, "() }")
+		g.P("type ", dname, " interface {")
+		g.In()
+		g.P(dname, "()")
+		g.Out()
+		g.P("}")
 	}
 	g.P()
-	for _, field := range message.Field {
+	var oneofTypes []string
+	for i, field := range message.Field {
 		if field.OneofIndex == nil {
 			continue
 		}
 		_, wiretype := g.GoType(message, field)
 		tag := "protobuf:" + g.goTag(message, field, wiretype)
-		g.P("type ", oneofTypeName[field], " struct{ ", fieldNames[field], " ", fieldTypes[field], " `", tag, "` }")
+		fieldFullPath := fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i)
+		g.P("type ", Annotate(message.file, fieldFullPath, oneofTypeName[field]), " struct{ ", Annotate(message.file, fieldFullPath, fieldNames[field]), " ", fieldTypes[field], " `", tag, "` }")
 		g.RecordTypeUse(field.GetTypeName())
+		oneofTypes = append(oneofTypes, oneofTypeName[field])
 	}
 	g.P()
 	for _, field := range message.Field {
@@ -2051,7 +2111,8 @@ func (g *Generator) generateMessage(message *Descriptor) {
 	g.P()
 	for oi := range message.OneofDecl {
 		fname := oneofFieldName[int32(oi)]
-		g.P("func (m *", ccTypeName, ") Get", fname, "() ", oneofDisc[int32(oi)], " {")
+		oneofFullPath := fmt.Sprintf("%s,%d,%d", message.path, messageOneofPath, oi)
+		g.P("func (m *", ccTypeName, ") ", Annotate(message.file, oneofFullPath, "Get"+fname), "() ", oneofDisc[int32(oi)], " {")
 		g.P("if m != nil { return m.", fname, " }")
 		g.P("return nil")
 		g.P("}")
@@ -2059,8 +2120,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
 	g.P()
 
 	// Field getters
-	var getters []getterSymbol
-	for _, field := range message.Field {
+	for i, field := range message.Field {
 		oneof := field.OneofIndex != nil
 
 		fname := fieldNames[field]
@@ -2074,38 +2134,13 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			typename = typename[1:]
 			star = "*"
 		}
+		fieldFullPath := fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i)
 
-		// Only export getter symbols for basic types,
-		// and for messages and enums in the same package.
-		// Groups are not exported.
-		// Foreign types can't be hoisted through a public import because
-		// the importer may not already be importing the defining .proto.
-		// As an example, imagine we have an import tree like this:
-		//   A.proto -> B.proto -> C.proto
-		// If A publicly imports B, we need to generate the getters from B in A's output,
-		// but if one such getter returns something from C then we cannot do that
-		// because A is not importing C already.
-		var getter, genType bool
-		switch *field.Type {
-		case descriptor.FieldDescriptorProto_TYPE_GROUP:
-			getter = false
-		case descriptor.FieldDescriptorProto_TYPE_MESSAGE, descriptor.FieldDescriptorProto_TYPE_ENUM:
-			// Only export getter if its return type is in this package.
-			getter = g.ObjectNamed(field.GetTypeName()).PackageName() == message.PackageName()
-			genType = true
-		default:
-			getter = true
-		}
-		if getter {
-			getters = append(getters, getterSymbol{
-				name:     mname,
-				typ:      typename,
-				typeName: field.GetTypeName(),
-				genType:  genType,
-			})
+		if field.GetOptions().GetDeprecated() {
+			g.P(deprecationComment)
 		}
 
-		g.P("func (m *", ccTypeName, ") "+mname+"() "+typename+" {")
+		g.P("func (m *", ccTypeName, ") ", Annotate(message.file, fieldFullPath, mname), "() "+typename+" {")
 		g.In()
 		def, hasDef := defNames[field]
 		typeDefaultIsNil := false // whether this field type's default value is a literal nil unless specified
@@ -2203,8 +2238,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			sym:           ccTypeName,
 			hasExtensions: hasExtensions,
 			isMessageSet:  isMessageSet,
-			hasOneof:      len(message.OneofDecl) > 0,
-			getters:       getters,
+			oneofTypes:    oneofTypes,
 		}
 		g.file.addExport(message, ms)
 	}
@@ -2424,58 +2458,49 @@ func (g *Generator) generateMessage(message *Descriptor) {
 				}
 				g.P("case *", oneofTypeName[field], ":")
 				val := "x." + fieldNames[field]
-				var wire, varint, fixed string
+				var varint, fixed string
 				switch *field.Type {
 				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-					wire = "WireFixed64"
 					fixed = "8"
 				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-					wire = "WireFixed32"
 					fixed = "4"
 				case descriptor.FieldDescriptorProto_TYPE_INT64,
 					descriptor.FieldDescriptorProto_TYPE_UINT64,
 					descriptor.FieldDescriptorProto_TYPE_INT32,
 					descriptor.FieldDescriptorProto_TYPE_UINT32,
 					descriptor.FieldDescriptorProto_TYPE_ENUM:
-					wire = "WireVarint"
 					varint = val
 				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
 					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-					wire = "WireFixed64"
 					fixed = "8"
 				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
 					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-					wire = "WireFixed32"
 					fixed = "4"
 				case descriptor.FieldDescriptorProto_TYPE_BOOL:
-					wire = "WireVarint"
 					fixed = "1"
 				case descriptor.FieldDescriptorProto_TYPE_STRING:
-					wire = "WireBytes"
 					fixed = "len(" + val + ")"
 					varint = fixed
 				case descriptor.FieldDescriptorProto_TYPE_GROUP:
-					wire = "WireStartGroup"
 					fixed = g.Pkg["proto"] + ".Size(" + val + ")"
 				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-					wire = "WireBytes"
 					g.P("s := ", g.Pkg["proto"], ".Size(", val, ")")
 					fixed = "s"
 					varint = fixed
 				case descriptor.FieldDescriptorProto_TYPE_BYTES:
-					wire = "WireBytes"
 					fixed = "len(" + val + ")"
 					varint = fixed
 				case descriptor.FieldDescriptorProto_TYPE_SINT32:
-					wire = "WireVarint"
 					varint = "(uint32(" + val + ") << 1) ^ uint32((int32(" + val + ") >> 31))"
 				case descriptor.FieldDescriptorProto_TYPE_SINT64:
-					wire = "WireVarint"
 					varint = "uint64(" + val + " << 1) ^ uint64((int64(" + val + ") >> 63))"
 				default:
 					g.Fail("unhandled oneof field type ", field.Type.String())
 				}
-				g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
+				// Tag and wire varint is known statically,
+				// so don't generate code for that part of the size computation.
+				tagAndWireSize := proto.SizeVarint(uint64(*field.Number << 3)) // wire doesn't affect varint size
+				g.P("n += ", tagAndWireSize, " // tag and wire")
 				if varint != "" {
 					g.P("n += ", g.Pkg["proto"], ".SizeVarint(uint64(", varint, "))")
 				}
@@ -2483,7 +2508,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
 					g.P("n += ", fixed)
 				}
 				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
-					g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
+					g.P("n += ", tagAndWireSize, " // tag and wire")
 				}
 			}
 			g.P("case nil:")
@@ -2506,6 +2531,27 @@ func (g *Generator) generateMessage(message *Descriptor) {
 	}
 
 	g.addInitf("%s.RegisterType((*%s)(nil), %q)", g.Pkg["proto"], ccTypeName, fullName)
+	// Register types for native map types.
+	for _, k := range mapFieldKeys(mapFieldTypes) {
+		fullName := strings.TrimPrefix(*k.TypeName, ".")
+		g.addInitf("%s.RegisterMapType((%s)(nil), %q)", g.Pkg["proto"], mapFieldTypes[k], fullName)
+	}
+}
+
+type byTypeName []*descriptor.FieldDescriptorProto
+
+func (a byTypeName) Len() int           { return len(a) }
+func (a byTypeName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a byTypeName) Less(i, j int) bool { return *a[i].TypeName < *a[j].TypeName }
+
+// mapFieldKeys returns the keys of m in a consistent order.
+func mapFieldKeys(m map[*descriptor.FieldDescriptorProto]string) []*descriptor.FieldDescriptorProto {
+	keys := make([]*descriptor.FieldDescriptorProto, 0, len(m))
+	for k := range m {
+		keys = append(keys, k)
+	}
+	sort.Sort(byTypeName(keys))
+	return keys
 }
 
 var escapeChars = [256]byte{
@@ -2594,10 +2640,15 @@ func (g *Generator) generateExtension(ext *ExtensionDescriptor) {
 	typeName := ext.TypeName()
 
 	// Special case for proto2 message sets: If this extension is extending
-	// proto2_bridge.MessageSet, and its final name component is "message_set_extension",
+	// proto2.bridge.MessageSet, and its final name component is "message_set_extension",
 	// then drop that last component.
+	//
+	// TODO: This should be implemented in the text formatter rather than the generator.
+	// In addition, the situation for when to apply this special case is implemented
+	// differently in other languages:
+	// https://github.com/google/protobuf/blob/aff10976/src/google/protobuf/text_format.cc#L1560
 	mset := false
-	if extendedType == "*proto2_bridge.MessageSet" && typeName[len(typeName)-1] == "message_set_extension" {
+	if extDesc.GetOptions().GetMessageSetWireFormat() && typeName[len(typeName)-1] == "message_set_extension" {
 		typeName = typeName[:len(typeName)-1]
 		mset = true
 	}
@@ -2864,3 +2915,14 @@ const (
 	// tag numbers in EnumDescriptorProto
 	enumValuePath = 2 // value
 )
+
+var supportTypeAliases bool
+
+func init() {
+	for _, tag := range build.Default.ReleaseTags {
+		if tag == "go1.9" {
+			supportTypeAliases = true
+			return
+		}
+	}
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/internal/remap/remap.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/internal/remap/remap.go
new file mode 100644
index 00000000..a9b61036
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/internal/remap/remap.go
@@ -0,0 +1,117 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2017 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+Package remap handles tracking the locations of Go tokens in a source text
+across a rewrite by the Go formatter.
+*/
+package remap
+
+import (
+	"fmt"
+	"go/scanner"
+	"go/token"
+)
+
+// A Location represents a span of byte offsets in the source text.
+type Location struct {
+	Pos, End int // End is exclusive
+}
+
+// A Map represents a mapping between token locations in an input source text
+// and locations in the correspnding output text.
+type Map map[Location]Location
+
+// Find reports whether the specified span is recorded by m, and if so returns
+// the new location it was mapped to. If the input span was not found, the
+// returned location is the same as the input.
+func (m Map) Find(pos, end int) (Location, bool) {
+	key := Location{
+		Pos: pos,
+		End: end,
+	}
+	if loc, ok := m[key]; ok {
+		return loc, true
+	}
+	return key, false
+}
+
+func (m Map) add(opos, oend, npos, nend int) {
+	m[Location{Pos: opos, End: oend}] = Location{Pos: npos, End: nend}
+}
+
+// Compute constructs a location mapping from input to output.  An error is
+// reported if any of the tokens of output cannot be mapped.
+func Compute(input, output []byte) (Map, error) {
+	itok := tokenize(input)
+	otok := tokenize(output)
+	if len(itok) != len(otok) {
+		return nil, fmt.Errorf("wrong number of tokens, %d ≠ %d", len(itok), len(otok))
+	}
+	m := make(Map)
+	for i, ti := range itok {
+		to := otok[i]
+		if ti.Token != to.Token {
+			return nil, fmt.Errorf("token %d type mismatch: %s ≠ %s", i+1, ti, to)
+		}
+		m.add(ti.pos, ti.end, to.pos, to.end)
+	}
+	return m, nil
+}
+
+// tokinfo records the span and type of a source token.
+type tokinfo struct {
+	pos, end int
+	token.Token
+}
+
+func tokenize(src []byte) []tokinfo {
+	fs := token.NewFileSet()
+	var s scanner.Scanner
+	s.Init(fs.AddFile("src", fs.Base(), len(src)), src, nil, scanner.ScanComments)
+	var info []tokinfo
+	for {
+		pos, next, lit := s.Scan()
+		switch next {
+		case token.SEMICOLON:
+			continue
+		}
+		info = append(info, tokinfo{
+			pos:   int(pos - 1),
+			end:   int(pos + token.Pos(len(lit)) - 1),
+			Token: next,
+		})
+		if next == token.EOF {
+			break
+		}
+	}
+	return info
+}
diff --git a/vendor/github.com/golang/protobuf/proto/testdata/golden_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/internal/remap/remap_test.go
similarity index 57%
rename from vendor/github.com/golang/protobuf/proto/testdata/golden_test.go
rename to vendor/github.com/golang/protobuf/protoc-gen-go/generator/internal/remap/remap_test.go
index 7172d0e9..ccc7fca0 100644
--- a/vendor/github.com/golang/protobuf/proto/testdata/golden_test.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/internal/remap/remap_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2012 The Go Authors.  All rights reserved.
+// Copyright 2017 The Go Authors.  All rights reserved.
 // https://github.com/golang/protobuf
 //
 // Redistribution and use in source and binary forms, with or without
@@ -29,58 +29,54 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Verify that the compiler output for test.proto is unchanged.
-
-package testdata
+package remap
 
 import (
-	"crypto/sha1"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
+	"go/format"
 	"testing"
 )
 
-// sum returns in string form (for easy comparison) the SHA-1 hash of the named file.
-func sum(t *testing.T, name string) string {
-	data, err := ioutil.ReadFile(name)
-	if err != nil {
-		t.Fatal(err)
+func TestErrors(t *testing.T) {
+	tests := []struct {
+		in, out string
+	}{
+		{"", "x"},
+		{"x", ""},
+		{"var x int = 5\n", "var x = 5\n"},
+		{"these are \"one\" thing", "those are 'another' thing"},
 	}
-	t.Logf("sum(%q): length is %d", name, len(data))
-	hash := sha1.New()
-	_, err = hash.Write(data)
-	if err != nil {
-		t.Fatal(err)
+	for _, test := range tests {
+		m, err := Compute([]byte(test.in), []byte(test.out))
+		if err != nil {
+			t.Logf("Got expected error: %v", err)
+			continue
+		}
+		t.Errorf("Compute(%q, %q): got %+v, wanted error", test.in, test.out, m)
 	}
-	return fmt.Sprintf("% x", hash.Sum(nil))
 }
 
-func run(t *testing.T, name string, args ...string) {
-	cmd := exec.Command(name, args...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
+func TestMatching(t *testing.T) {
+	// The input is a source text that will be rearranged by the formatter.
+	const input = `package foo
+var s int
+func main(){}
+`
+
+	output, err := format.Source([]byte(input))
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("Formatting failed: %v", err)
+	}
+	m, err := Compute([]byte(input), output)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
 	}
-}
 
-func TestGolden(t *testing.T) {
-	// Compute the original checksum.
-	goldenSum := sum(t, "test.pb.go")
-	// Run the proto compiler.
-	run(t, "protoc", "--go_out="+os.TempDir(), "test.proto")
-	newFile := filepath.Join(os.TempDir(), "test.pb.go")
-	defer os.Remove(newFile)
-	// Compute the new checksum.
-	newSum := sum(t, newFile)
-	// Verify
-	if newSum != goldenSum {
-		run(t, "diff", "-u", "test.pb.go", newFile)
-		t.Fatal("Code generated by protoc-gen-go has changed; update test.pb.go")
+	// Verify that the mapped locations have the same text.
+	for key, val := range m {
+		want := input[key.Pos:key.End]
+		got := string(output[val.Pos:val.End])
+		if got != want {
+			t.Errorf("Token at %d:%d: got %q, want %q", key.Pos, key.End, got, want)
+		}
 	}
 }
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go
index 76808f3b..571147cf 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go
@@ -59,9 +59,10 @@ func TestCamelCase(t *testing.T) {
 
 func TestGoPackageOption(t *testing.T) {
 	tests := []struct {
-		in           string
-		impPath, pkg string
-		ok           bool
+		in      string
+		impPath GoImportPath
+		pkg     GoPackageName
+		ok      bool
 	}{
 		{"", "", "", false},
 		{"foo", "", "foo", true},
@@ -86,8 +87,8 @@ func TestGoPackageOption(t *testing.T) {
 
 func TestUnescape(t *testing.T) {
 	tests := []struct {
-		in   string
-		out  string
+		in  string
+		out string
 	}{
 		// successful cases, including all kinds of escapes
 		{"", ""},
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/golden_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/golden_test.go
new file mode 100644
index 00000000..2630de68
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/golden_test.go
@@ -0,0 +1,422 @@
+package main
+
+import (
+	"bytes"
+	"flag"
+	"fmt"
+	"go/build"
+	"go/parser"
+	"go/token"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"strings"
+	"testing"
+)
+
+// Set --regenerate to regenerate the golden files.
+var regenerate = flag.Bool("regenerate", false, "regenerate golden files")
+
+// When the environment variable RUN_AS_PROTOC_GEN_GO is set, we skip running
+// tests and instead act as protoc-gen-go. This allows the test binary to
+// pass itself to protoc.
+func init() {
+	if os.Getenv("RUN_AS_PROTOC_GEN_GO") != "" {
+		main()
+		os.Exit(0)
+	}
+}
+
+func TestGolden(t *testing.T) {
+	workdir, err := ioutil.TempDir("", "proto-test")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(workdir)
+
+	// Find all the proto files we need to compile. We assume that each directory
+	// contains the files for a single package.
+	supportTypeAliases := hasReleaseTag("go1.9")
+	packages := map[string][]string{}
+	err = filepath.Walk("testdata", func(path string, info os.FileInfo, err error) error {
+		if filepath.Base(path) == "import_public" && !supportTypeAliases {
+			// Public imports require type alias support.
+			return filepath.SkipDir
+		}
+		if !strings.HasSuffix(path, ".proto") {
+			return nil
+		}
+		dir := filepath.Dir(path)
+		packages[dir] = append(packages[dir], path)
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Compile each package, using this binary as protoc-gen-go.
+	for _, sources := range packages {
+		args := []string{"-Itestdata", "--go_out=plugins=grpc,paths=source_relative:" + workdir}
+		args = append(args, sources...)
+		protoc(t, args)
+	}
+
+	// Compare each generated file to the golden version.
+	filepath.Walk(workdir, func(genPath string, info os.FileInfo, _ error) error {
+		if info.IsDir() {
+			return nil
+		}
+
+		// For each generated file, figure out the path to the corresponding
+		// golden file in the testdata directory.
+		relPath, err := filepath.Rel(workdir, genPath)
+		if err != nil {
+			t.Errorf("filepath.Rel(%q, %q): %v", workdir, genPath, err)
+			return nil
+		}
+		if filepath.SplitList(relPath)[0] == ".." {
+			t.Errorf("generated file %q is not relative to %q", genPath, workdir)
+		}
+		goldenPath := filepath.Join("testdata", relPath)
+
+		got, err := ioutil.ReadFile(genPath)
+		if err != nil {
+			t.Error(err)
+			return nil
+		}
+		if *regenerate {
+			// If --regenerate set, just rewrite the golden files.
+			err := ioutil.WriteFile(goldenPath, got, 0666)
+			if err != nil {
+				t.Error(err)
+			}
+			return nil
+		}
+
+		want, err := ioutil.ReadFile(goldenPath)
+		if err != nil {
+			t.Error(err)
+			return nil
+		}
+
+		want = fdescRE.ReplaceAll(want, nil)
+		got = fdescRE.ReplaceAll(got, nil)
+		if bytes.Equal(got, want) {
+			return nil
+		}
+
+		cmd := exec.Command("diff", "-u", goldenPath, genPath)
+		out, _ := cmd.CombinedOutput()
+		t.Errorf("golden file differs: %v\n%v", relPath, string(out))
+		return nil
+	})
+}
+
+var fdescRE = regexp.MustCompile(`(?ms)^var fileDescriptor.*}`)
+
+// Source files used by TestParameters.
+const (
+	aProto = `
+syntax = "proto3";
+package test.alpha;
+option go_package = "package/alpha";
+import "beta/b.proto";
+message M { test.beta.M field = 1; }`
+
+	bProto = `
+syntax = "proto3";
+package test.beta;
+// no go_package option
+message M {}`
+)
+
+func TestParameters(t *testing.T) {
+	for _, test := range []struct {
+		parameters   string
+		wantFiles    map[string]bool
+		wantImportsA map[string]bool
+		wantPackageA string
+		wantPackageB string
+	}{{
+		parameters: "",
+		wantFiles: map[string]bool{
+			"package/alpha/a.pb.go": true,
+			"beta/b.pb.go":          true,
+		},
+		wantPackageA: "alpha",
+		wantPackageB: "test_beta",
+		wantImportsA: map[string]bool{
+			"github.com/golang/protobuf/proto": true,
+			"beta": true,
+		},
+	}, {
+		parameters: "import_prefix=prefix",
+		wantFiles: map[string]bool{
+			"package/alpha/a.pb.go": true,
+			"beta/b.pb.go":          true,
+		},
+		wantPackageA: "alpha",
+		wantPackageB: "test_beta",
+		wantImportsA: map[string]bool{
+			// This really doesn't seem like useful behavior.
+			"prefixgithub.com/golang/protobuf/proto": true,
+			"prefixbeta":                             true,
+		},
+	}, {
+		// import_path only affects the 'package' line.
+		parameters:   "import_path=import/path/of/pkg",
+		wantPackageA: "alpha",
+		wantPackageB: "pkg",
+		wantFiles: map[string]bool{
+			"package/alpha/a.pb.go": true,
+			"beta/b.pb.go":          true,
+		},
+	}, {
+		parameters: "Mbeta/b.proto=package/gamma",
+		wantFiles: map[string]bool{
+			"package/alpha/a.pb.go": true,
+			"beta/b.pb.go":          true,
+		},
+		wantPackageA: "alpha",
+		wantPackageB: "test_beta",
+		wantImportsA: map[string]bool{
+			"github.com/golang/protobuf/proto": true,
+			// Rewritten by the M parameter.
+			"package/gamma": true,
+		},
+	}, {
+		parameters: "import_prefix=prefix,Mbeta/b.proto=package/gamma",
+		wantFiles: map[string]bool{
+			"package/alpha/a.pb.go": true,
+			"beta/b.pb.go":          true,
+		},
+		wantPackageA: "alpha",
+		wantPackageB: "test_beta",
+		wantImportsA: map[string]bool{
+			// import_prefix applies after M.
+			"prefixpackage/gamma": true,
+		},
+	}, {
+		parameters: "paths=source_relative",
+		wantFiles: map[string]bool{
+			"alpha/a.pb.go": true,
+			"beta/b.pb.go":  true,
+		},
+		wantPackageA: "alpha",
+		wantPackageB: "test_beta",
+	}, {
+		parameters: "paths=source_relative,import_prefix=prefix",
+		wantFiles: map[string]bool{
+			// import_prefix doesn't affect filenames.
+			"alpha/a.pb.go": true,
+			"beta/b.pb.go":  true,
+		},
+		wantPackageA: "alpha",
+		wantPackageB: "test_beta",
+	}} {
+		name := test.parameters
+		if name == "" {
+			name = "defaults"
+		}
+		// TODO: Switch to t.Run when we no longer support Go 1.6.
+		t.Logf("TEST: %v", name)
+		workdir, err := ioutil.TempDir("", "proto-test")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.RemoveAll(workdir)
+
+		for _, dir := range []string{"alpha", "beta", "out"} {
+			if err := os.MkdirAll(filepath.Join(workdir, dir), 0777); err != nil {
+				t.Fatal(err)
+			}
+		}
+
+		if err := ioutil.WriteFile(filepath.Join(workdir, "alpha", "a.proto"), []byte(aProto), 0666); err != nil {
+			t.Fatal(err)
+		}
+
+		if err := ioutil.WriteFile(filepath.Join(workdir, "beta", "b.proto"), []byte(bProto), 0666); err != nil {
+			t.Fatal(err)
+		}
+
+		protoc(t, []string{
+			"-I" + workdir,
+			"--go_out=" + test.parameters + ":" + filepath.Join(workdir, "out"),
+			filepath.Join(workdir, "alpha", "a.proto"),
+		})
+		protoc(t, []string{
+			"-I" + workdir,
+			"--go_out=" + test.parameters + ":" + filepath.Join(workdir, "out"),
+			filepath.Join(workdir, "beta", "b.proto"),
+		})
+
+		contents := make(map[string]string)
+		gotFiles := make(map[string]bool)
+		outdir := filepath.Join(workdir, "out")
+		filepath.Walk(outdir, func(p string, info os.FileInfo, _ error) error {
+			if info.IsDir() {
+				return nil
+			}
+			base := filepath.Base(p)
+			if base == "a.pb.go" || base == "b.pb.go" {
+				b, err := ioutil.ReadFile(p)
+				if err != nil {
+					t.Fatal(err)
+				}
+				contents[base] = string(b)
+			}
+			relPath, _ := filepath.Rel(outdir, p)
+			gotFiles[relPath] = true
+			return nil
+		})
+		for got := range gotFiles {
+			if runtime.GOOS == "windows" {
+				got = filepath.ToSlash(got)
+			}
+			if !test.wantFiles[got] {
+				t.Errorf("unexpected output file: %v", got)
+			}
+		}
+		for want := range test.wantFiles {
+			if runtime.GOOS == "windows" {
+				want = filepath.FromSlash(want)
+			}
+			if !gotFiles[want] {
+				t.Errorf("missing output file:    %v", want)
+			}
+		}
+		gotPackageA, gotImports, err := parseFile(contents["a.pb.go"])
+		if err != nil {
+			t.Fatal(err)
+		}
+		gotPackageB, _, err := parseFile(contents["b.pb.go"])
+		if err != nil {
+			t.Fatal(err)
+		}
+		if got, want := gotPackageA, test.wantPackageA; want != got {
+			t.Errorf("output file a.pb.go is package %q, want %q", got, want)
+		}
+		if got, want := gotPackageB, test.wantPackageB; want != got {
+			t.Errorf("output file b.pb.go is package %q, want %q", got, want)
+		}
+		missingImport := false
+	WantImport:
+		for want := range test.wantImportsA {
+			for _, imp := range gotImports {
+				if `"`+want+`"` == imp {
+					continue WantImport
+				}
+			}
+			t.Errorf("output file a.pb.go does not contain expected import %q", want)
+			missingImport = true
+		}
+		if missingImport {
+			t.Error("got imports:")
+			for _, imp := range gotImports {
+				t.Errorf("  %v", imp)
+			}
+		}
+	}
+}
+
+func TestPackageComment(t *testing.T) {
+	workdir, err := ioutil.TempDir("", "proto-test")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(workdir)
+
+	var packageRE = regexp.MustCompile(`(?m)^package .*`)
+
+	for i, test := range []struct {
+		goPackageOption string
+		wantPackage     string
+	}{{
+		goPackageOption: ``,
+		wantPackage:     `package proto_package`,
+	}, {
+		goPackageOption: `option go_package = "go_package";`,
+		wantPackage:     `package go_package`,
+	}, {
+		goPackageOption: `option go_package = "import/path/of/go_package";`,
+		wantPackage:     `package go_package // import "import/path/of/go_package"`,
+	}, {
+		goPackageOption: `option go_package = "import/path/of/something;go_package";`,
+		wantPackage:     `package go_package // import "import/path/of/something"`,
+	}, {
+		goPackageOption: `option go_package = "import_path;go_package";`,
+		wantPackage:     `package go_package // import "import_path"`,
+	}} {
+		srcName := filepath.Join(workdir, fmt.Sprintf("%d.proto", i))
+		tgtName := filepath.Join(workdir, fmt.Sprintf("%d.pb.go", i))
+
+		buf := &bytes.Buffer{}
+		fmt.Fprintln(buf, `syntax = "proto3";`)
+		fmt.Fprintln(buf, `package proto_package;`)
+		fmt.Fprintln(buf, test.goPackageOption)
+		if err := ioutil.WriteFile(srcName, buf.Bytes(), 0666); err != nil {
+			t.Fatal(err)
+		}
+
+		protoc(t, []string{"-I" + workdir, "--go_out=paths=source_relative:" + workdir, srcName})
+
+		out, err := ioutil.ReadFile(tgtName)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		pkg := packageRE.Find(out)
+		if pkg == nil {
+			t.Errorf("generated .pb.go contains no package line\n\nsource:\n%v\n\noutput:\n%v", buf.String(), string(out))
+			continue
+		}
+
+		if got, want := string(pkg), test.wantPackage; got != want {
+			t.Errorf("unexpected package statement with go_package = %q\n got: %v\nwant: %v", test.goPackageOption, got, want)
+		}
+	}
+}
+
+// parseFile returns a file's package name and a list of all packages it imports.
+func parseFile(source string) (packageName string, imports []string, err error) {
+	fset := token.NewFileSet()
+	f, err := parser.ParseFile(fset, "<source>", source, parser.ImportsOnly)
+	if err != nil {
+		return "", nil, err
+	}
+	for _, imp := range f.Imports {
+		imports = append(imports, imp.Path.Value)
+	}
+	return f.Name.Name, imports, nil
+}
+
+func protoc(t *testing.T, args []string) {
+	cmd := exec.Command("protoc", "--plugin=protoc-gen-go="+os.Args[0])
+	cmd.Args = append(cmd.Args, args...)
+	// We set the RUN_AS_PROTOC_GEN_GO environment variable to indicate that
+	// the subprocess should act as a proto compiler rather than a test.
+	cmd.Env = append(os.Environ(), "RUN_AS_PROTOC_GEN_GO=1")
+	out, err := cmd.CombinedOutput()
+	if len(out) > 0 || err != nil {
+		t.Log("RUNNING: ", strings.Join(cmd.Args, " "))
+	}
+	if len(out) > 0 {
+		t.Log(string(out))
+	}
+	if err != nil {
+		t.Fatalf("protoc: %v", err)
+	}
+}
+
+func hasReleaseTag(want string) bool {
+	for _, tag := range build.Default.ReleaseTags {
+		if tag == want {
+			return true
+		}
+	}
+	return false
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
index 2660e47a..1723680a 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
@@ -130,19 +130,23 @@ func (g *grpc) GenerateImports(file *generator.FileDescriptor) {
 		return
 	}
 	g.P("import (")
-	g.P(contextPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, contextPkgPath)))
-	g.P(grpcPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, grpcPkgPath)))
+	g.P(contextPkg, " ", generator.GoImportPath(path.Join(string(g.gen.ImportPrefix), contextPkgPath)))
+	g.P(grpcPkg, " ", generator.GoImportPath(path.Join(string(g.gen.ImportPrefix), grpcPkgPath)))
 	g.P(")")
 	g.P()
 }
 
 // reservedClientName records whether a client name is reserved on the client side.
 var reservedClientName = map[string]bool{
-// TODO: do we need any in gRPC?
+	// TODO: do we need any in gRPC?
 }
 
 func unexport(s string) string { return strings.ToLower(s[:1]) + s[1:] }
 
+// deprecationComment is the standard comment added to deprecated
+// messages, fields, enums, and enum values.
+var deprecationComment = "// Deprecated: Do not use."
+
 // generateService generates all the code for the named service.
 func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.ServiceDescriptorProto, index int) {
 	path := fmt.Sprintf("6,%d", index) // 6 means service.
@@ -153,12 +157,16 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi
 		fullServName = pkg + "." + fullServName
 	}
 	servName := generator.CamelCase(origServName)
+	deprecated := service.GetOptions().GetDeprecated()
 
 	g.P()
 	g.P("// Client API for ", servName, " service")
 	g.P()
 
 	// Client interface.
+	if deprecated {
+		g.P(deprecationComment)
+	}
 	g.P("type ", servName, "Client interface {")
 	for i, method := range service.Method {
 		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
@@ -174,6 +182,9 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi
 	g.P()
 
 	// NewClient factory.
+	if deprecated {
+		g.P(deprecationComment)
+	}
 	g.P("func New", servName, "Client (cc *", grpcPkg, ".ClientConn) ", servName, "Client {")
 	g.P("return &", unexport(servName), "Client{cc}")
 	g.P("}")
@@ -200,6 +211,9 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi
 	g.P()
 
 	// Server interface.
+	if deprecated {
+		g.P(deprecationComment)
+	}
 	serverType := servName + "Server"
 	g.P("type ", serverType, " interface {")
 	for i, method := range service.Method {
@@ -210,6 +224,9 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi
 	g.P()
 
 	// Server registration.
+	if deprecated {
+		g.P(deprecationComment)
+	}
 	g.P("func Register", servName, "Server(s *", grpcPkg, ".Server, srv ", serverType, ") {")
 	g.P("s.RegisterService(&", serviceDescVar, `, srv)`)
 	g.P("}")
@@ -283,6 +300,9 @@ func (g *grpc) generateClientMethod(servName, fullServName, serviceDescVar strin
 	inType := g.typeName(method.GetInputType())
 	outType := g.typeName(method.GetOutputType())
 
+	if method.GetOptions().GetDeprecated() {
+		g.P(deprecationComment)
+	}
 	g.P("func (c *", unexport(servName), "Client) ", g.generateClientSignature(servName, method), "{")
 	if !method.GetServerStreaming() && !method.GetClientStreaming() {
 		g.P("out := new(", outType, ")")
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
deleted file mode 100644
index bc0463d5..00000000
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Not stored here, but plugin.proto is in https://github.com/google/protobuf/
-# at src/google/protobuf/compiler/plugin.proto
-# Also we need to fix an import.
-regenerate:
-	@echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
-	cp $(HOME)/src/protobuf/include/google/protobuf/compiler/plugin.proto .
-	protoc --go_out=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor:../../../../.. \
-		-I$(HOME)/src/protobuf/include $(HOME)/src/protobuf/include/google/protobuf/compiler/plugin.proto
-
-restore:
-	cp plugin.pb.golden plugin.pb.go
-
-preserve:
-	cp plugin.pb.go plugin.pb.golden
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
index c608a248..61bfc10e 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
@@ -37,14 +37,33 @@ type Version struct {
 	Patch *int32 `protobuf:"varint,3,opt,name=patch" json:"patch,omitempty"`
 	// A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
 	// be empty for mainline stable releases.
-	Suffix           *string `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	Suffix               *string  `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Version) Reset()                    { *m = Version{} }
 func (m *Version) String() string            { return proto.CompactTextString(m) }
 func (*Version) ProtoMessage()               {}
 func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Version) Unmarshal(b []byte) error {
+	return xxx_messageInfo_Version.Unmarshal(m, b)
+}
+func (m *Version) Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Version.Marshal(b, m, deterministic)
+}
+func (dst *Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Version.Merge(dst, src)
+}
+func (m *Version) XXX_Size() int {
+	return xxx_messageInfo_Version.Size(m)
+}
+func (m *Version) XXX_DiscardUnknown() {
+	xxx_messageInfo_Version.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Version proto.InternalMessageInfo
 
 func (m *Version) GetMajor() int32 {
 	if m != nil && m.Major != nil {
@@ -98,14 +117,33 @@ type CodeGeneratorRequest struct {
 	// fully qualified.
 	ProtoFile []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file,json=protoFile" json:"proto_file,omitempty"`
 	// The version number of protocol compiler.
-	CompilerVersion  *Version `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
+	CompilerVersion      *Version `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *CodeGeneratorRequest) Reset()                    { *m = CodeGeneratorRequest{} }
 func (m *CodeGeneratorRequest) String() string            { return proto.CompactTextString(m) }
 func (*CodeGeneratorRequest) ProtoMessage()               {}
 func (*CodeGeneratorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *CodeGeneratorRequest) Unmarshal(b []byte) error {
+	return xxx_messageInfo_CodeGeneratorRequest.Unmarshal(m, b)
+}
+func (m *CodeGeneratorRequest) Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CodeGeneratorRequest.Marshal(b, m, deterministic)
+}
+func (dst *CodeGeneratorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CodeGeneratorRequest.Merge(dst, src)
+}
+func (m *CodeGeneratorRequest) XXX_Size() int {
+	return xxx_messageInfo_CodeGeneratorRequest.Size(m)
+}
+func (m *CodeGeneratorRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CodeGeneratorRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CodeGeneratorRequest proto.InternalMessageInfo
 
 func (m *CodeGeneratorRequest) GetFileToGenerate() []string {
 	if m != nil {
@@ -145,15 +183,34 @@ type CodeGeneratorResponse struct {
 	// problem in protoc itself -- such as the input CodeGeneratorRequest being
 	// unparseable -- should be reported by writing a message to stderr and
 	// exiting with a non-zero status code.
-	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
-	XXX_unrecognized []byte                        `json:"-"`
+	Error                *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	File                 []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
 }
 
 func (m *CodeGeneratorResponse) Reset()                    { *m = CodeGeneratorResponse{} }
 func (m *CodeGeneratorResponse) String() string            { return proto.CompactTextString(m) }
 func (*CodeGeneratorResponse) ProtoMessage()               {}
 func (*CodeGeneratorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *CodeGeneratorResponse) Unmarshal(b []byte) error {
+	return xxx_messageInfo_CodeGeneratorResponse.Unmarshal(m, b)
+}
+func (m *CodeGeneratorResponse) Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CodeGeneratorResponse.Marshal(b, m, deterministic)
+}
+func (dst *CodeGeneratorResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CodeGeneratorResponse.Merge(dst, src)
+}
+func (m *CodeGeneratorResponse) XXX_Size() int {
+	return xxx_messageInfo_CodeGeneratorResponse.Size(m)
+}
+func (m *CodeGeneratorResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CodeGeneratorResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CodeGeneratorResponse proto.InternalMessageInfo
 
 func (m *CodeGeneratorResponse) GetError() string {
 	if m != nil && m.Error != nil {
@@ -222,14 +279,33 @@ type CodeGeneratorResponse_File struct {
 	// If |insertion_point| is present, |name| must also be present.
 	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point,json=insertionPoint" json:"insertion_point,omitempty"`
 	// The file contents.
-	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	Content              *string  `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *CodeGeneratorResponse_File) Reset()                    { *m = CodeGeneratorResponse_File{} }
 func (m *CodeGeneratorResponse_File) String() string            { return proto.CompactTextString(m) }
 func (*CodeGeneratorResponse_File) ProtoMessage()               {}
 func (*CodeGeneratorResponse_File) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (m *CodeGeneratorResponse_File) Unmarshal(b []byte) error {
+	return xxx_messageInfo_CodeGeneratorResponse_File.Unmarshal(m, b)
+}
+func (m *CodeGeneratorResponse_File) Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CodeGeneratorResponse_File.Marshal(b, m, deterministic)
+}
+func (dst *CodeGeneratorResponse_File) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CodeGeneratorResponse_File.Merge(dst, src)
+}
+func (m *CodeGeneratorResponse_File) XXX_Size() int {
+	return xxx_messageInfo_CodeGeneratorResponse_File.Size(m)
+}
+func (m *CodeGeneratorResponse_File) XXX_DiscardUnknown() {
+	xxx_messageInfo_CodeGeneratorResponse_File.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CodeGeneratorResponse_File proto.InternalMessageInfo
 
 func (m *CodeGeneratorResponse_File) GetName() string {
 	if m != nil && m.Name != nil {
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile
deleted file mode 100644
index a0bf9fef..00000000
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-all:
-	@echo run make test
-
-include ../../Make.protobuf
-
-test:	golden testbuild
-
-#test:	golden testbuild extension_test
-#	./extension_test
-#	@echo PASS
-
-my_test/test.pb.go: my_test/test.proto
-	protoc --go_out=Mmulti/multi1.proto=github.com/golang/protobuf/protoc-gen-go/testdata/multi:. $<
-
-golden:
-	make -B my_test/test.pb.go
-	sed -i -e '/return.*fileDescriptor/d' my_test/test.pb.go
-	sed -i -e '/^var fileDescriptor/,/^}/d' my_test/test.pb.go
-	sed -i -e '/proto.RegisterFile.*fileDescriptor/d' my_test/test.pb.go
-	gofmt -w my_test/test.pb.go
-	diff -w my_test/test.pb.go my_test/test.pb.go.golden
-
-nuke:	clean
-
-testbuild:	regenerate
-	go test
-
-regenerate:
-	# Invoke protoc once to generate three independent .pb.go files in the same package.
-	protoc --go_out=. multi/multi1.proto multi/multi2.proto multi/multi3.proto
-
-#extension_test:	extension_test.$O
-#	$(LD) -L. -o $@ $<
-
-#multi.a: multi3.pb.$O multi2.pb.$O multi1.pb.$O
-#	rm -f multi.a
-#	$(QUOTED_GOBIN)/gopack grc $@ $<
-
-#test.pb.go:	imp.pb.go
-#multi1.pb.go:	multi2.pb.go multi3.pb.go
-#main.$O: imp.pb.$O test.pb.$O multi.a
-#extension_test.$O: extension_base.pb.$O extension_extra.pb.$O extension_user.pb.$O
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/deprecated/deprecated.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/deprecated/deprecated.pb.go
new file mode 100644
index 00000000..6ebae9da
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/deprecated/deprecated.pb.go
@@ -0,0 +1,232 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// deprecated/deprecated.proto is a deprecated file.
+
+package deprecated // import "github.com/golang/protobuf/protoc-gen-go/testdata/deprecated"
+
+/*
+package deprecated contains only deprecated messages and services.
+*/
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// DeprecatedEnum contains deprecated values.
+type DeprecatedEnum int32 // Deprecated: Do not use.
+const (
+	// DEPRECATED is the iota value of this enum.
+	DeprecatedEnum_DEPRECATED DeprecatedEnum = 0 // Deprecated: Do not use.
+)
+
+var DeprecatedEnum_name = map[int32]string{
+	0: "DEPRECATED",
+}
+var DeprecatedEnum_value = map[string]int32{
+	"DEPRECATED": 0,
+}
+
+func (x DeprecatedEnum) String() string {
+	return proto.EnumName(DeprecatedEnum_name, int32(x))
+}
+func (DeprecatedEnum) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_deprecated_9e1889ba21817fad, []int{0}
+}
+
+// DeprecatedRequest is a request to DeprecatedCall.
+//
+// Deprecated: Do not use.
+type DeprecatedRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeprecatedRequest) Reset()         { *m = DeprecatedRequest{} }
+func (m *DeprecatedRequest) String() string { return proto.CompactTextString(m) }
+func (*DeprecatedRequest) ProtoMessage()    {}
+func (*DeprecatedRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deprecated_9e1889ba21817fad, []int{0}
+}
+func (m *DeprecatedRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeprecatedRequest.Unmarshal(m, b)
+}
+func (m *DeprecatedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeprecatedRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeprecatedRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeprecatedRequest.Merge(dst, src)
+}
+func (m *DeprecatedRequest) XXX_Size() int {
+	return xxx_messageInfo_DeprecatedRequest.Size(m)
+}
+func (m *DeprecatedRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeprecatedRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeprecatedRequest proto.InternalMessageInfo
+
+// Deprecated: Do not use.
+type DeprecatedResponse struct {
+	// DeprecatedField contains a DeprecatedEnum.
+	DeprecatedField      DeprecatedEnum `protobuf:"varint,1,opt,name=deprecated_field,json=deprecatedField,enum=deprecated.DeprecatedEnum" json:"deprecated_field,omitempty"` // Deprecated: Do not use.
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *DeprecatedResponse) Reset()         { *m = DeprecatedResponse{} }
+func (m *DeprecatedResponse) String() string { return proto.CompactTextString(m) }
+func (*DeprecatedResponse) ProtoMessage()    {}
+func (*DeprecatedResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deprecated_9e1889ba21817fad, []int{1}
+}
+func (m *DeprecatedResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeprecatedResponse.Unmarshal(m, b)
+}
+func (m *DeprecatedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeprecatedResponse.Marshal(b, m, deterministic)
+}
+func (dst *DeprecatedResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeprecatedResponse.Merge(dst, src)
+}
+func (m *DeprecatedResponse) XXX_Size() int {
+	return xxx_messageInfo_DeprecatedResponse.Size(m)
+}
+func (m *DeprecatedResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeprecatedResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeprecatedResponse proto.InternalMessageInfo
+
+// Deprecated: Do not use.
+func (m *DeprecatedResponse) GetDeprecatedField() DeprecatedEnum {
+	if m != nil {
+		return m.DeprecatedField
+	}
+	return DeprecatedEnum_DEPRECATED
+}
+
+func init() {
+	proto.RegisterType((*DeprecatedRequest)(nil), "deprecated.DeprecatedRequest")
+	proto.RegisterType((*DeprecatedResponse)(nil), "deprecated.DeprecatedResponse")
+	proto.RegisterEnum("deprecated.DeprecatedEnum", DeprecatedEnum_name, DeprecatedEnum_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for DeprecatedService service
+
+// Deprecated: Do not use.
+type DeprecatedServiceClient interface {
+	// DeprecatedCall takes a DeprecatedRequest and returns a DeprecatedResponse.
+	DeprecatedCall(ctx context.Context, in *DeprecatedRequest, opts ...grpc.CallOption) (*DeprecatedResponse, error)
+}
+
+type deprecatedServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+// Deprecated: Do not use.
+func NewDeprecatedServiceClient(cc *grpc.ClientConn) DeprecatedServiceClient {
+	return &deprecatedServiceClient{cc}
+}
+
+// Deprecated: Do not use.
+func (c *deprecatedServiceClient) DeprecatedCall(ctx context.Context, in *DeprecatedRequest, opts ...grpc.CallOption) (*DeprecatedResponse, error) {
+	out := new(DeprecatedResponse)
+	err := grpc.Invoke(ctx, "/deprecated.DeprecatedService/DeprecatedCall", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Server API for DeprecatedService service
+
+// Deprecated: Do not use.
+type DeprecatedServiceServer interface {
+	// DeprecatedCall takes a DeprecatedRequest and returns a DeprecatedResponse.
+	DeprecatedCall(context.Context, *DeprecatedRequest) (*DeprecatedResponse, error)
+}
+
+// Deprecated: Do not use.
+func RegisterDeprecatedServiceServer(s *grpc.Server, srv DeprecatedServiceServer) {
+	s.RegisterService(&_DeprecatedService_serviceDesc, srv)
+}
+
+func _DeprecatedService_DeprecatedCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeprecatedRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DeprecatedServiceServer).DeprecatedCall(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/deprecated.DeprecatedService/DeprecatedCall",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DeprecatedServiceServer).DeprecatedCall(ctx, req.(*DeprecatedRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _DeprecatedService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "deprecated.DeprecatedService",
+	HandlerType: (*DeprecatedServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "DeprecatedCall",
+			Handler:    _DeprecatedService_DeprecatedCall_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "deprecated/deprecated.proto",
+}
+
+func init() {
+	proto.RegisterFile("deprecated/deprecated.proto", fileDescriptor_deprecated_9e1889ba21817fad)
+}
+
+var fileDescriptor_deprecated_9e1889ba21817fad = []byte{
+	// 248 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0x49, 0x2d, 0x28,
+	0x4a, 0x4d, 0x4e, 0x2c, 0x49, 0x4d, 0xd1, 0x47, 0x30, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85,
+	0xb8, 0x10, 0x22, 0x4a, 0xe2, 0x5c, 0x82, 0x2e, 0x70, 0x5e, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71,
+	0x89, 0x15, 0x93, 0x04, 0xa3, 0x52, 0x32, 0x97, 0x10, 0xb2, 0x44, 0x71, 0x41, 0x7e, 0x5e, 0x71,
+	0xaa, 0x90, 0x27, 0x97, 0x00, 0x42, 0x73, 0x7c, 0x5a, 0x66, 0x6a, 0x4e, 0x8a, 0x04, 0xa3, 0x02,
+	0xa3, 0x06, 0x9f, 0x91, 0x94, 0x1e, 0x92, 0x3d, 0x08, 0x9d, 0xae, 0x79, 0xa5, 0xb9, 0x4e, 0x4c,
+	0x12, 0x8c, 0x41, 0xfc, 0x08, 0x69, 0x37, 0x90, 0x36, 0x90, 0x25, 0x5a, 0x1a, 0x5c, 0x7c, 0xa8,
+	0x4a, 0x85, 0x84, 0xb8, 0xb8, 0x5c, 0x5c, 0x03, 0x82, 0x5c, 0x9d, 0x1d, 0x43, 0x5c, 0x5d, 0x04,
+	0x18, 0xa4, 0x98, 0x38, 0x18, 0xa5, 0x98, 0x24, 0x18, 0x8d, 0xf2, 0x90, 0xdd, 0x19, 0x9c, 0x5a,
+	0x54, 0x96, 0x99, 0x9c, 0x2a, 0x14, 0x82, 0xac, 0xdd, 0x39, 0x31, 0x27, 0x47, 0x48, 0x16, 0xbb,
+	0x2b, 0xa0, 0x1e, 0x93, 0x92, 0xc3, 0x25, 0x0d, 0xf1, 0x9e, 0x12, 0x73, 0x07, 0x13, 0xa3, 0x14,
+	0x88, 0x70, 0x72, 0x8c, 0xb2, 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5,
+	0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x07, 0x07, 0x5f, 0x52, 0x69, 0x1a, 0x84, 0x91, 0xac,
+	0x9b, 0x9e, 0x9a, 0xa7, 0x9b, 0x9e, 0xaf, 0x5f, 0x92, 0x5a, 0x5c, 0x92, 0x92, 0x58, 0x92, 0x88,
+	0x14, 0xd2, 0x3b, 0x18, 0x19, 0x93, 0xd8, 0xc0, 0xaa, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x0e, 0xf5, 0x6c, 0x87, 0x8c, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/deprecated/deprecated.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/deprecated/deprecated.proto
new file mode 100644
index 00000000..b314166d
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/deprecated/deprecated.proto
@@ -0,0 +1,69 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+// package deprecated contains only deprecated messages and services.
+package deprecated;
+
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/deprecated";
+
+option deprecated = true; // file-level deprecation
+
+// DeprecatedRequest is a request to DeprecatedCall.
+message DeprecatedRequest {
+  option deprecated = true;
+}
+
+message DeprecatedResponse {
+  // comment for DeprecatedResponse is omitted to guarantee deprecation
+  // message doesn't append unnecessary comments.
+  option deprecated = true;
+  // DeprecatedField contains a DeprecatedEnum.
+  DeprecatedEnum deprecated_field = 1 [deprecated=true];
+}
+
+// DeprecatedEnum contains deprecated values.
+enum DeprecatedEnum {
+  option deprecated = true;
+  // DEPRECATED is the iota value of this enum.
+  DEPRECATED = 0 [deprecated=true];
+}
+
+// DeprecatedService is for making DeprecatedCalls
+service DeprecatedService {
+  option deprecated = true;
+
+  // DeprecatedCall takes a DeprecatedRequest and returns a DeprecatedResponse.
+  rpc DeprecatedCall(DeprecatedRequest) returns (DeprecatedResponse) {
+    option deprecated = true;
+  }
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base/extension_base.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base/extension_base.pb.go
new file mode 100644
index 00000000..a08e8eda
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base/extension_base.pb.go
@@ -0,0 +1,139 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: extension_base/extension_base.proto
+
+package extension_base // import "github.com/golang/protobuf/protoc-gen-go/testdata/extension_base"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type BaseMessage struct {
+	Height                       *int32   `protobuf:"varint,1,opt,name=height" json:"height,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
+}
+
+func (m *BaseMessage) Reset()         { *m = BaseMessage{} }
+func (m *BaseMessage) String() string { return proto.CompactTextString(m) }
+func (*BaseMessage) ProtoMessage()    {}
+func (*BaseMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_base_41d3c712c9fc37fc, []int{0}
+}
+
+var extRange_BaseMessage = []proto.ExtensionRange{
+	{Start: 4, End: 9},
+	{Start: 16, End: 536870911},
+}
+
+func (*BaseMessage) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_BaseMessage
+}
+func (m *BaseMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BaseMessage.Unmarshal(m, b)
+}
+func (m *BaseMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BaseMessage.Marshal(b, m, deterministic)
+}
+func (dst *BaseMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BaseMessage.Merge(dst, src)
+}
+func (m *BaseMessage) XXX_Size() int {
+	return xxx_messageInfo_BaseMessage.Size(m)
+}
+func (m *BaseMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_BaseMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BaseMessage proto.InternalMessageInfo
+
+func (m *BaseMessage) GetHeight() int32 {
+	if m != nil && m.Height != nil {
+		return *m.Height
+	}
+	return 0
+}
+
+// Another message that may be extended, using message_set_wire_format.
+type OldStyleMessage struct {
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	proto.XXX_InternalExtensions `protobuf_messageset:"1" json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
+}
+
+func (m *OldStyleMessage) Reset()         { *m = OldStyleMessage{} }
+func (m *OldStyleMessage) String() string { return proto.CompactTextString(m) }
+func (*OldStyleMessage) ProtoMessage()    {}
+func (*OldStyleMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_base_41d3c712c9fc37fc, []int{1}
+}
+
+func (m *OldStyleMessage) MarshalJSON() ([]byte, error) {
+	return proto.MarshalMessageSetJSON(&m.XXX_InternalExtensions)
+}
+func (m *OldStyleMessage) UnmarshalJSON(buf []byte) error {
+	return proto.UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)
+}
+
+var extRange_OldStyleMessage = []proto.ExtensionRange{
+	{Start: 100, End: 2147483646},
+}
+
+func (*OldStyleMessage) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_OldStyleMessage
+}
+func (m *OldStyleMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OldStyleMessage.Unmarshal(m, b)
+}
+func (m *OldStyleMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OldStyleMessage.Marshal(b, m, deterministic)
+}
+func (dst *OldStyleMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OldStyleMessage.Merge(dst, src)
+}
+func (m *OldStyleMessage) XXX_Size() int {
+	return xxx_messageInfo_OldStyleMessage.Size(m)
+}
+func (m *OldStyleMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_OldStyleMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OldStyleMessage proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*BaseMessage)(nil), "extension_base.BaseMessage")
+	proto.RegisterType((*OldStyleMessage)(nil), "extension_base.OldStyleMessage")
+}
+
+func init() {
+	proto.RegisterFile("extension_base/extension_base.proto", fileDescriptor_extension_base_41d3c712c9fc37fc)
+}
+
+var fileDescriptor_extension_base_41d3c712c9fc37fc = []byte{
+	// 179 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4e, 0xad, 0x28, 0x49,
+	0xcd, 0x2b, 0xce, 0xcc, 0xcf, 0x8b, 0x4f, 0x4a, 0x2c, 0x4e, 0xd5, 0x47, 0xe5, 0xea, 0x15, 0x14,
+	0xe5, 0x97, 0xe4, 0x0b, 0xf1, 0xa1, 0x8a, 0x2a, 0x99, 0x72, 0x71, 0x3b, 0x25, 0x16, 0xa7, 0xfa,
+	0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a, 0x89, 0x71, 0xb1, 0x65, 0xa4, 0x66, 0xa6, 0x67, 0x94,
+	0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x06, 0x41, 0x79, 0x5a, 0x2c, 0x1c, 0x2c, 0x02, 0x5c, 0x5a,
+	0x1c, 0x1c, 0x02, 0x02, 0x0d, 0x0d, 0x0d, 0x0d, 0x4c, 0x4a, 0xf2, 0x5c, 0xfc, 0xfe, 0x39, 0x29,
+	0xc1, 0x25, 0x95, 0x39, 0x30, 0xad, 0x5a, 0x1c, 0x1c, 0x29, 0x02, 0xff, 0xff, 0xff, 0xff, 0xcf,
+	0x6e, 0xc5, 0xc4, 0xc1, 0xe8, 0xe4, 0x14, 0xe5, 0x90, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97,
+	0x9c, 0x9f, 0xab, 0x9f, 0x9e, 0x9f, 0x93, 0x98, 0x97, 0xae, 0x0f, 0x76, 0x42, 0x52, 0x69, 0x1a,
+	0x84, 0x91, 0xac, 0x9b, 0x9e, 0x9a, 0xa7, 0x9b, 0x9e, 0xaf, 0x5f, 0x92, 0x5a, 0x5c, 0x92, 0x92,
+	0x58, 0x92, 0x88, 0xe6, 0x62, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x7f, 0xb7, 0x2a, 0xd1,
+	0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base/extension_base.proto
similarity index 95%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto
rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base/extension_base.proto
index 94acfc1b..0ba74def 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base/extension_base.proto
@@ -33,6 +33,8 @@ syntax = "proto2";
 
 package extension_base;
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/extension_base";
+
 message BaseMessage {
   optional int32 height = 1;
   extensions 4 to 9;
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra/extension_extra.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra/extension_extra.pb.go
new file mode 100644
index 00000000..b3732169
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra/extension_extra.pb.go
@@ -0,0 +1,78 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: extension_extra/extension_extra.proto
+
+package extension_extra // import "github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type ExtraMessage struct {
+	Width                *int32   `protobuf:"varint,1,opt,name=width" json:"width,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExtraMessage) Reset()         { *m = ExtraMessage{} }
+func (m *ExtraMessage) String() string { return proto.CompactTextString(m) }
+func (*ExtraMessage) ProtoMessage()    {}
+func (*ExtraMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_extra_83adf2410f49f816, []int{0}
+}
+func (m *ExtraMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExtraMessage.Unmarshal(m, b)
+}
+func (m *ExtraMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExtraMessage.Marshal(b, m, deterministic)
+}
+func (dst *ExtraMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtraMessage.Merge(dst, src)
+}
+func (m *ExtraMessage) XXX_Size() int {
+	return xxx_messageInfo_ExtraMessage.Size(m)
+}
+func (m *ExtraMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExtraMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExtraMessage proto.InternalMessageInfo
+
+func (m *ExtraMessage) GetWidth() int32 {
+	if m != nil && m.Width != nil {
+		return *m.Width
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*ExtraMessage)(nil), "extension_extra.ExtraMessage")
+}
+
+func init() {
+	proto.RegisterFile("extension_extra/extension_extra.proto", fileDescriptor_extension_extra_83adf2410f49f816)
+}
+
+var fileDescriptor_extension_extra_83adf2410f49f816 = []byte{
+	// 133 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4d, 0xad, 0x28, 0x49,
+	0xcd, 0x2b, 0xce, 0xcc, 0xcf, 0x8b, 0x4f, 0xad, 0x28, 0x29, 0x4a, 0xd4, 0x47, 0xe3, 0xeb, 0x15,
+	0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xf1, 0xa3, 0x09, 0x2b, 0xa9, 0x70, 0xf1, 0xb8, 0x82, 0x18, 0xbe,
+	0xa9, 0xc5, 0xc5, 0x89, 0xe9, 0xa9, 0x42, 0x22, 0x5c, 0xac, 0xe5, 0x99, 0x29, 0x25, 0x19, 0x12,
+	0x8c, 0x0a, 0x8c, 0x1a, 0xac, 0x41, 0x10, 0x8e, 0x93, 0x73, 0x94, 0x63, 0x7a, 0x66, 0x49, 0x46,
+	0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x4e, 0x62, 0x5e, 0xba, 0x3e, 0xd8, 0xc4,
+	0xa4, 0xd2, 0x34, 0x08, 0x23, 0x59, 0x37, 0x3d, 0x35, 0x4f, 0x37, 0x3d, 0x5f, 0xbf, 0x24, 0xb5,
+	0xb8, 0x24, 0x25, 0xb1, 0x04, 0xc3, 0x05, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0xec, 0xe3,
+	0xb7, 0xa3, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra/extension_extra.proto
similarity index 95%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto
rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra/extension_extra.proto
index fca7f600..1dd03e70 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra/extension_extra.proto
@@ -33,6 +33,8 @@ syntax = "proto2";
 
 package extension_extra;
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra";
+
 message ExtraMessage {
   optional int32 width = 1;
 }
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go
index 86e9c118..05247299 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go
@@ -33,16 +33,14 @@
 
 package testdata
 
-/*
-
 import (
 	"bytes"
 	"regexp"
 	"testing"
 
 	"github.com/golang/protobuf/proto"
-	base "extension_base.pb"
-	user "extension_user.pb"
+	base "github.com/golang/protobuf/protoc-gen-go/testdata/extension_base"
+	user "github.com/golang/protobuf/protoc-gen-go/testdata/extension_user"
 )
 
 func TestSingleFieldExtension(t *testing.T) {
@@ -206,5 +204,3 @@ func main() {
 		[]testing.InternalBenchmark{},
 		[]testing.InternalExample{})
 }
-
-*/
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user/extension_user.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user/extension_user.pb.go
new file mode 100644
index 00000000..c7187921
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user/extension_user.pb.go
@@ -0,0 +1,401 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: extension_user/extension_user.proto
+
+package extension_user // import "github.com/golang/protobuf/protoc-gen-go/testdata/extension_user"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import extension_base "github.com/golang/protobuf/protoc-gen-go/testdata/extension_base"
+import extension_extra "github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type UserMessage struct {
+	Name                 *string  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Rank                 *string  `protobuf:"bytes,2,opt,name=rank" json:"rank,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UserMessage) Reset()         { *m = UserMessage{} }
+func (m *UserMessage) String() string { return proto.CompactTextString(m) }
+func (*UserMessage) ProtoMessage()    {}
+func (*UserMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_user_af41b5e0bdfb7846, []int{0}
+}
+func (m *UserMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UserMessage.Unmarshal(m, b)
+}
+func (m *UserMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UserMessage.Marshal(b, m, deterministic)
+}
+func (dst *UserMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserMessage.Merge(dst, src)
+}
+func (m *UserMessage) XXX_Size() int {
+	return xxx_messageInfo_UserMessage.Size(m)
+}
+func (m *UserMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_UserMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UserMessage proto.InternalMessageInfo
+
+func (m *UserMessage) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *UserMessage) GetRank() string {
+	if m != nil && m.Rank != nil {
+		return *m.Rank
+	}
+	return ""
+}
+
+// Extend inside the scope of another type
+type LoudMessage struct {
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
+}
+
+func (m *LoudMessage) Reset()         { *m = LoudMessage{} }
+func (m *LoudMessage) String() string { return proto.CompactTextString(m) }
+func (*LoudMessage) ProtoMessage()    {}
+func (*LoudMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_user_af41b5e0bdfb7846, []int{1}
+}
+
+var extRange_LoudMessage = []proto.ExtensionRange{
+	{Start: 100, End: 536870911},
+}
+
+func (*LoudMessage) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_LoudMessage
+}
+func (m *LoudMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoudMessage.Unmarshal(m, b)
+}
+func (m *LoudMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoudMessage.Marshal(b, m, deterministic)
+}
+func (dst *LoudMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoudMessage.Merge(dst, src)
+}
+func (m *LoudMessage) XXX_Size() int {
+	return xxx_messageInfo_LoudMessage.Size(m)
+}
+func (m *LoudMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoudMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LoudMessage proto.InternalMessageInfo
+
+var E_LoudMessage_Volume = &proto.ExtensionDesc{
+	ExtendedType:  (*extension_base.BaseMessage)(nil),
+	ExtensionType: (*uint32)(nil),
+	Field:         8,
+	Name:          "extension_user.LoudMessage.volume",
+	Tag:           "varint,8,opt,name=volume",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+// Extend inside the scope of another type, using a message.
+type LoginMessage struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LoginMessage) Reset()         { *m = LoginMessage{} }
+func (m *LoginMessage) String() string { return proto.CompactTextString(m) }
+func (*LoginMessage) ProtoMessage()    {}
+func (*LoginMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_user_af41b5e0bdfb7846, []int{2}
+}
+func (m *LoginMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoginMessage.Unmarshal(m, b)
+}
+func (m *LoginMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoginMessage.Marshal(b, m, deterministic)
+}
+func (dst *LoginMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoginMessage.Merge(dst, src)
+}
+func (m *LoginMessage) XXX_Size() int {
+	return xxx_messageInfo_LoginMessage.Size(m)
+}
+func (m *LoginMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoginMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LoginMessage proto.InternalMessageInfo
+
+var E_LoginMessage_UserMessage = &proto.ExtensionDesc{
+	ExtendedType:  (*extension_base.BaseMessage)(nil),
+	ExtensionType: (*UserMessage)(nil),
+	Field:         16,
+	Name:          "extension_user.LoginMessage.user_message",
+	Tag:           "bytes,16,opt,name=user_message,json=userMessage",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+type Detail struct {
+	Color                *string  `protobuf:"bytes,1,opt,name=color" json:"color,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Detail) Reset()         { *m = Detail{} }
+func (m *Detail) String() string { return proto.CompactTextString(m) }
+func (*Detail) ProtoMessage()    {}
+func (*Detail) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_user_af41b5e0bdfb7846, []int{3}
+}
+func (m *Detail) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Detail.Unmarshal(m, b)
+}
+func (m *Detail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Detail.Marshal(b, m, deterministic)
+}
+func (dst *Detail) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Detail.Merge(dst, src)
+}
+func (m *Detail) XXX_Size() int {
+	return xxx_messageInfo_Detail.Size(m)
+}
+func (m *Detail) XXX_DiscardUnknown() {
+	xxx_messageInfo_Detail.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Detail proto.InternalMessageInfo
+
+func (m *Detail) GetColor() string {
+	if m != nil && m.Color != nil {
+		return *m.Color
+	}
+	return ""
+}
+
+// An extension of an extension
+type Announcement struct {
+	Words                *string  `protobuf:"bytes,1,opt,name=words" json:"words,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Announcement) Reset()         { *m = Announcement{} }
+func (m *Announcement) String() string { return proto.CompactTextString(m) }
+func (*Announcement) ProtoMessage()    {}
+func (*Announcement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_user_af41b5e0bdfb7846, []int{4}
+}
+func (m *Announcement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Announcement.Unmarshal(m, b)
+}
+func (m *Announcement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Announcement.Marshal(b, m, deterministic)
+}
+func (dst *Announcement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Announcement.Merge(dst, src)
+}
+func (m *Announcement) XXX_Size() int {
+	return xxx_messageInfo_Announcement.Size(m)
+}
+func (m *Announcement) XXX_DiscardUnknown() {
+	xxx_messageInfo_Announcement.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Announcement proto.InternalMessageInfo
+
+func (m *Announcement) GetWords() string {
+	if m != nil && m.Words != nil {
+		return *m.Words
+	}
+	return ""
+}
+
+var E_Announcement_LoudExt = &proto.ExtensionDesc{
+	ExtendedType:  (*LoudMessage)(nil),
+	ExtensionType: (*Announcement)(nil),
+	Field:         100,
+	Name:          "extension_user.Announcement.loud_ext",
+	Tag:           "bytes,100,opt,name=loud_ext,json=loudExt",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+// Something that can be put in a message set.
+type OldStyleParcel struct {
+	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
+	Height               *int32   `protobuf:"varint,2,opt,name=height" json:"height,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OldStyleParcel) Reset()         { *m = OldStyleParcel{} }
+func (m *OldStyleParcel) String() string { return proto.CompactTextString(m) }
+func (*OldStyleParcel) ProtoMessage()    {}
+func (*OldStyleParcel) Descriptor() ([]byte, []int) {
+	return fileDescriptor_extension_user_af41b5e0bdfb7846, []int{5}
+}
+func (m *OldStyleParcel) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OldStyleParcel.Unmarshal(m, b)
+}
+func (m *OldStyleParcel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OldStyleParcel.Marshal(b, m, deterministic)
+}
+func (dst *OldStyleParcel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OldStyleParcel.Merge(dst, src)
+}
+func (m *OldStyleParcel) XXX_Size() int {
+	return xxx_messageInfo_OldStyleParcel.Size(m)
+}
+func (m *OldStyleParcel) XXX_DiscardUnknown() {
+	xxx_messageInfo_OldStyleParcel.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OldStyleParcel proto.InternalMessageInfo
+
+func (m *OldStyleParcel) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *OldStyleParcel) GetHeight() int32 {
+	if m != nil && m.Height != nil {
+		return *m.Height
+	}
+	return 0
+}
+
+var E_OldStyleParcel_MessageSetExtension = &proto.ExtensionDesc{
+	ExtendedType:  (*extension_base.OldStyleMessage)(nil),
+	ExtensionType: (*OldStyleParcel)(nil),
+	Field:         2001,
+	Name:          "extension_user.OldStyleParcel",
+	Tag:           "bytes,2001,opt,name=message_set_extension,json=messageSetExtension",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+var E_UserMessage = &proto.ExtensionDesc{
+	ExtendedType:  (*extension_base.BaseMessage)(nil),
+	ExtensionType: (*UserMessage)(nil),
+	Field:         5,
+	Name:          "extension_user.user_message",
+	Tag:           "bytes,5,opt,name=user_message,json=userMessage",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+var E_ExtraMessage = &proto.ExtensionDesc{
+	ExtendedType:  (*extension_base.BaseMessage)(nil),
+	ExtensionType: (*extension_extra.ExtraMessage)(nil),
+	Field:         9,
+	Name:          "extension_user.extra_message",
+	Tag:           "bytes,9,opt,name=extra_message,json=extraMessage",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+var E_Width = &proto.ExtensionDesc{
+	ExtendedType:  (*extension_base.BaseMessage)(nil),
+	ExtensionType: (*int32)(nil),
+	Field:         6,
+	Name:          "extension_user.width",
+	Tag:           "varint,6,opt,name=width",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+var E_Area = &proto.ExtensionDesc{
+	ExtendedType:  (*extension_base.BaseMessage)(nil),
+	ExtensionType: (*int64)(nil),
+	Field:         7,
+	Name:          "extension_user.area",
+	Tag:           "varint,7,opt,name=area",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+var E_Detail = &proto.ExtensionDesc{
+	ExtendedType:  (*extension_base.BaseMessage)(nil),
+	ExtensionType: ([]*Detail)(nil),
+	Field:         17,
+	Name:          "extension_user.detail",
+	Tag:           "bytes,17,rep,name=detail",
+	Filename:      "extension_user/extension_user.proto",
+}
+
+func init() {
+	proto.RegisterType((*UserMessage)(nil), "extension_user.UserMessage")
+	proto.RegisterType((*LoudMessage)(nil), "extension_user.LoudMessage")
+	proto.RegisterType((*LoginMessage)(nil), "extension_user.LoginMessage")
+	proto.RegisterType((*Detail)(nil), "extension_user.Detail")
+	proto.RegisterType((*Announcement)(nil), "extension_user.Announcement")
+	proto.RegisterMessageSetType((*OldStyleParcel)(nil), 2001, "extension_user.OldStyleParcel")
+	proto.RegisterType((*OldStyleParcel)(nil), "extension_user.OldStyleParcel")
+	proto.RegisterExtension(E_LoudMessage_Volume)
+	proto.RegisterExtension(E_LoginMessage_UserMessage)
+	proto.RegisterExtension(E_Announcement_LoudExt)
+	proto.RegisterExtension(E_OldStyleParcel_MessageSetExtension)
+	proto.RegisterExtension(E_UserMessage)
+	proto.RegisterExtension(E_ExtraMessage)
+	proto.RegisterExtension(E_Width)
+	proto.RegisterExtension(E_Area)
+	proto.RegisterExtension(E_Detail)
+}
+
+func init() {
+	proto.RegisterFile("extension_user/extension_user.proto", fileDescriptor_extension_user_af41b5e0bdfb7846)
+}
+
+var fileDescriptor_extension_user_af41b5e0bdfb7846 = []byte{
+	// 492 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x51, 0x6f, 0x94, 0x40,
+	0x10, 0x0e, 0x6d, 0x8f, 0x5e, 0x87, 0x6b, 0xad, 0xa8, 0xcd, 0xa5, 0x6a, 0x25, 0x18, 0x13, 0x62,
+	0xd2, 0x23, 0x62, 0x7c, 0xe1, 0x49, 0x2f, 0xde, 0x93, 0x67, 0x34, 0x54, 0x5f, 0xf4, 0x81, 0xec,
+	0xc1, 0xc8, 0x91, 0xc2, 0xae, 0xd9, 0x5d, 0xec, 0xe9, 0xd3, 0xfd, 0x26, 0xff, 0x89, 0xff, 0xc8,
+	0xb0, 0x2c, 0x2d, 0x87, 0xc9, 0xc5, 0xbe, 0x90, 0xfd, 0x86, 0x6f, 0xbe, 0x99, 0xfd, 0x66, 0x00,
+	0x9e, 0xe2, 0x4a, 0x22, 0x15, 0x39, 0xa3, 0x71, 0x25, 0x90, 0xfb, 0x9b, 0x70, 0xf2, 0x9d, 0x33,
+	0xc9, 0xec, 0xa3, 0xcd, 0xe8, 0x69, 0x27, 0x69, 0x41, 0x04, 0xfa, 0x9b, 0xb0, 0x49, 0x3a, 0x7d,
+	0x76, 0x13, 0xc5, 0x95, 0xe4, 0xc4, 0xef, 0xe1, 0x86, 0xe6, 0xbe, 0x02, 0xeb, 0xb3, 0x40, 0xfe,
+	0x1e, 0x85, 0x20, 0x19, 0xda, 0x36, 0xec, 0x51, 0x52, 0xe2, 0xd8, 0x70, 0x0c, 0xef, 0x20, 0x52,
+	0xe7, 0x3a, 0xc6, 0x09, 0xbd, 0x1c, 0xef, 0x34, 0xb1, 0xfa, 0xec, 0xce, 0xc1, 0x9a, 0xb3, 0x2a,
+	0xd5, 0x69, 0xcf, 0x87, 0xc3, 0xf4, 0x78, 0xbd, 0x5e, 0xaf, 0x77, 0x82, 0x97, 0x60, 0xfe, 0x60,
+	0x45, 0x55, 0xa2, 0xfd, 0x70, 0xd2, 0xeb, 0x6b, 0x4a, 0x04, 0xea, 0x84, 0xf1, 0xd0, 0x31, 0xbc,
+	0xc3, 0x48, 0x53, 0xdd, 0x4b, 0x18, 0xcd, 0x59, 0x96, 0x53, 0xfd, 0x36, 0xf8, 0x0a, 0xa3, 0xfa,
+	0xa2, 0x71, 0xa9, 0xbb, 0xda, 0x2a, 0x75, 0xec, 0x18, 0x9e, 0x15, 0x74, 0x29, 0xca, 0xba, 0xce,
+	0xad, 0x22, 0xab, 0xba, 0x01, 0xee, 0x19, 0x98, 0x6f, 0x51, 0x92, 0xbc, 0xb0, 0xef, 0xc3, 0x20,
+	0x61, 0x05, 0xe3, 0xfa, 0xb6, 0x0d, 0x70, 0x7f, 0xc1, 0xe8, 0x0d, 0xa5, 0xac, 0xa2, 0x09, 0x96,
+	0x48, 0x65, 0xcd, 0xba, 0x62, 0x3c, 0x15, 0x2d, 0x4b, 0x81, 0xe0, 0x13, 0x0c, 0x0b, 0x56, 0xa5,
+	0xb5, 0x97, 0xf6, 0x3f, 0xb5, 0x3b, 0xd6, 0x8c, 0x53, 0xd5, 0xde, 0xa3, 0x3e, 0xa5, 0x5b, 0x22,
+	0xda, 0xaf, 0xa5, 0x66, 0x2b, 0xe9, 0xfe, 0x36, 0xe0, 0xe8, 0x43, 0x91, 0x5e, 0xc8, 0x9f, 0x05,
+	0x7e, 0x24, 0x3c, 0xc1, 0xa2, 0x33, 0x91, 0x9d, 0xeb, 0x89, 0x9c, 0x80, 0xb9, 0xc4, 0x3c, 0x5b,
+	0x4a, 0x35, 0x93, 0x41, 0xa4, 0x51, 0x20, 0xe1, 0x81, 0xb6, 0x2c, 0x16, 0x28, 0xe3, 0xeb, 0x92,
+	0xf6, 0x93, 0xbe, 0x81, 0x6d, 0x91, 0xb6, 0xcb, 0x3f, 0x77, 0x54, 0x9b, 0x67, 0xfd, 0x36, 0x37,
+	0x9b, 0x89, 0xee, 0x69, 0xf9, 0x0b, 0x94, 0xb3, 0x96, 0x18, 0xde, 0x6a, 0x5a, 0x83, 0xdb, 0x4d,
+	0x2b, 0x8c, 0xe1, 0x50, 0xad, 0xeb, 0xff, 0xa9, 0x1f, 0x28, 0xf5, 0xc7, 0x93, 0xfe, 0xae, 0xcf,
+	0xea, 0x67, 0xab, 0x3f, 0xc2, 0x0e, 0x0a, 0x5f, 0xc0, 0xe0, 0x2a, 0x4f, 0xe5, 0x72, 0xbb, 0xb0,
+	0xa9, 0x7c, 0x6e, 0x98, 0xa1, 0x0f, 0x7b, 0x84, 0x23, 0xd9, 0x9e, 0xb1, 0xef, 0x18, 0xde, 0x6e,
+	0xa4, 0x88, 0xe1, 0x3b, 0x30, 0xd3, 0x66, 0xe5, 0xb6, 0xa6, 0xdc, 0x75, 0x76, 0x3d, 0x2b, 0x38,
+	0xe9, 0x7b, 0xd3, 0x6c, 0x6b, 0xa4, 0x25, 0xa6, 0xd3, 0x2f, 0xaf, 0xb3, 0x5c, 0x2e, 0xab, 0xc5,
+	0x24, 0x61, 0xa5, 0x9f, 0xb1, 0x82, 0xd0, 0xcc, 0x57, 0x1f, 0xf3, 0xa2, 0xfa, 0xd6, 0x1c, 0x92,
+	0xf3, 0x0c, 0xe9, 0x79, 0xc6, 0x7c, 0x89, 0x42, 0xa6, 0x44, 0x92, 0xde, 0x7f, 0xe5, 0x6f, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xdf, 0x18, 0x64, 0x15, 0x77, 0x04, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user/extension_user.proto
similarity index 94%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto
rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user/extension_user.proto
index ff65873d..033c186c 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user/extension_user.proto
@@ -31,11 +31,13 @@
 
 syntax = "proto2";
 
-import "extension_base.proto";
-import "extension_extra.proto";
+import "extension_base/extension_base.proto";
+import "extension_extra/extension_extra.proto";
 
 package extension_user;
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/extension_user";
+
 message UserMessage {
   optional string name = 1;
   optional string rank = 2;
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc/grpc.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc/grpc.pb.go
new file mode 100644
index 00000000..0bb4cbfd
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc/grpc.pb.go
@@ -0,0 +1,444 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: grpc/grpc.proto
+
+package testing // import "github.com/golang/protobuf/protoc-gen-go/testdata/grpc"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type SimpleRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
+func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
+func (*SimpleRequest) ProtoMessage()    {}
+func (*SimpleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_grpc_65bf3902e49ee873, []int{0}
+}
+func (m *SimpleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleRequest.Unmarshal(m, b)
+}
+func (m *SimpleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleRequest.Marshal(b, m, deterministic)
+}
+func (dst *SimpleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleRequest.Merge(dst, src)
+}
+func (m *SimpleRequest) XXX_Size() int {
+	return xxx_messageInfo_SimpleRequest.Size(m)
+}
+func (m *SimpleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SimpleRequest proto.InternalMessageInfo
+
+type SimpleResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
+func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
+func (*SimpleResponse) ProtoMessage()    {}
+func (*SimpleResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_grpc_65bf3902e49ee873, []int{1}
+}
+func (m *SimpleResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleResponse.Unmarshal(m, b)
+}
+func (m *SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleResponse.Marshal(b, m, deterministic)
+}
+func (dst *SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleResponse.Merge(dst, src)
+}
+func (m *SimpleResponse) XXX_Size() int {
+	return xxx_messageInfo_SimpleResponse.Size(m)
+}
+func (m *SimpleResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SimpleResponse proto.InternalMessageInfo
+
+type StreamMsg struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamMsg) Reset()         { *m = StreamMsg{} }
+func (m *StreamMsg) String() string { return proto.CompactTextString(m) }
+func (*StreamMsg) ProtoMessage()    {}
+func (*StreamMsg) Descriptor() ([]byte, []int) {
+	return fileDescriptor_grpc_65bf3902e49ee873, []int{2}
+}
+func (m *StreamMsg) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamMsg.Unmarshal(m, b)
+}
+func (m *StreamMsg) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamMsg.Marshal(b, m, deterministic)
+}
+func (dst *StreamMsg) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamMsg.Merge(dst, src)
+}
+func (m *StreamMsg) XXX_Size() int {
+	return xxx_messageInfo_StreamMsg.Size(m)
+}
+func (m *StreamMsg) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamMsg.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamMsg proto.InternalMessageInfo
+
+type StreamMsg2 struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamMsg2) Reset()         { *m = StreamMsg2{} }
+func (m *StreamMsg2) String() string { return proto.CompactTextString(m) }
+func (*StreamMsg2) ProtoMessage()    {}
+func (*StreamMsg2) Descriptor() ([]byte, []int) {
+	return fileDescriptor_grpc_65bf3902e49ee873, []int{3}
+}
+func (m *StreamMsg2) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamMsg2.Unmarshal(m, b)
+}
+func (m *StreamMsg2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamMsg2.Marshal(b, m, deterministic)
+}
+func (dst *StreamMsg2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamMsg2.Merge(dst, src)
+}
+func (m *StreamMsg2) XXX_Size() int {
+	return xxx_messageInfo_StreamMsg2.Size(m)
+}
+func (m *StreamMsg2) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamMsg2.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamMsg2 proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*SimpleRequest)(nil), "grpc.testing.SimpleRequest")
+	proto.RegisterType((*SimpleResponse)(nil), "grpc.testing.SimpleResponse")
+	proto.RegisterType((*StreamMsg)(nil), "grpc.testing.StreamMsg")
+	proto.RegisterType((*StreamMsg2)(nil), "grpc.testing.StreamMsg2")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for Test service
+
+type TestClient interface {
+	UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error)
+	// This RPC streams from the server only.
+	Downstream(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (Test_DownstreamClient, error)
+	// This RPC streams from the client.
+	Upstream(ctx context.Context, opts ...grpc.CallOption) (Test_UpstreamClient, error)
+	// This one streams in both directions.
+	Bidi(ctx context.Context, opts ...grpc.CallOption) (Test_BidiClient, error)
+}
+
+type testClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewTestClient(cc *grpc.ClientConn) TestClient {
+	return &testClient{cc}
+}
+
+func (c *testClient) UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
+	out := new(SimpleResponse)
+	err := grpc.Invoke(ctx, "/grpc.testing.Test/UnaryCall", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *testClient) Downstream(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (Test_DownstreamClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_Test_serviceDesc.Streams[0], c.cc, "/grpc.testing.Test/Downstream", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &testDownstreamClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type Test_DownstreamClient interface {
+	Recv() (*StreamMsg, error)
+	grpc.ClientStream
+}
+
+type testDownstreamClient struct {
+	grpc.ClientStream
+}
+
+func (x *testDownstreamClient) Recv() (*StreamMsg, error) {
+	m := new(StreamMsg)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *testClient) Upstream(ctx context.Context, opts ...grpc.CallOption) (Test_UpstreamClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_Test_serviceDesc.Streams[1], c.cc, "/grpc.testing.Test/Upstream", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &testUpstreamClient{stream}
+	return x, nil
+}
+
+type Test_UpstreamClient interface {
+	Send(*StreamMsg) error
+	CloseAndRecv() (*SimpleResponse, error)
+	grpc.ClientStream
+}
+
+type testUpstreamClient struct {
+	grpc.ClientStream
+}
+
+func (x *testUpstreamClient) Send(m *StreamMsg) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *testUpstreamClient) CloseAndRecv() (*SimpleResponse, error) {
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	m := new(SimpleResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *testClient) Bidi(ctx context.Context, opts ...grpc.CallOption) (Test_BidiClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_Test_serviceDesc.Streams[2], c.cc, "/grpc.testing.Test/Bidi", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &testBidiClient{stream}
+	return x, nil
+}
+
+type Test_BidiClient interface {
+	Send(*StreamMsg) error
+	Recv() (*StreamMsg2, error)
+	grpc.ClientStream
+}
+
+type testBidiClient struct {
+	grpc.ClientStream
+}
+
+func (x *testBidiClient) Send(m *StreamMsg) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *testBidiClient) Recv() (*StreamMsg2, error) {
+	m := new(StreamMsg2)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// Server API for Test service
+
+type TestServer interface {
+	UnaryCall(context.Context, *SimpleRequest) (*SimpleResponse, error)
+	// This RPC streams from the server only.
+	Downstream(*SimpleRequest, Test_DownstreamServer) error
+	// This RPC streams from the client.
+	Upstream(Test_UpstreamServer) error
+	// This one streams in both directions.
+	Bidi(Test_BidiServer) error
+}
+
+func RegisterTestServer(s *grpc.Server, srv TestServer) {
+	s.RegisterService(&_Test_serviceDesc, srv)
+}
+
+func _Test_UnaryCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SimpleRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TestServer).UnaryCall(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpc.testing.Test/UnaryCall",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TestServer).UnaryCall(ctx, req.(*SimpleRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Test_Downstream_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(SimpleRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(TestServer).Downstream(m, &testDownstreamServer{stream})
+}
+
+type Test_DownstreamServer interface {
+	Send(*StreamMsg) error
+	grpc.ServerStream
+}
+
+type testDownstreamServer struct {
+	grpc.ServerStream
+}
+
+func (x *testDownstreamServer) Send(m *StreamMsg) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func _Test_Upstream_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(TestServer).Upstream(&testUpstreamServer{stream})
+}
+
+type Test_UpstreamServer interface {
+	SendAndClose(*SimpleResponse) error
+	Recv() (*StreamMsg, error)
+	grpc.ServerStream
+}
+
+type testUpstreamServer struct {
+	grpc.ServerStream
+}
+
+func (x *testUpstreamServer) SendAndClose(m *SimpleResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func (x *testUpstreamServer) Recv() (*StreamMsg, error) {
+	m := new(StreamMsg)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func _Test_Bidi_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(TestServer).Bidi(&testBidiServer{stream})
+}
+
+type Test_BidiServer interface {
+	Send(*StreamMsg2) error
+	Recv() (*StreamMsg, error)
+	grpc.ServerStream
+}
+
+type testBidiServer struct {
+	grpc.ServerStream
+}
+
+func (x *testBidiServer) Send(m *StreamMsg2) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func (x *testBidiServer) Recv() (*StreamMsg, error) {
+	m := new(StreamMsg)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+var _Test_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "grpc.testing.Test",
+	HandlerType: (*TestServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "UnaryCall",
+			Handler:    _Test_UnaryCall_Handler,
+		},
+	},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "Downstream",
+			Handler:       _Test_Downstream_Handler,
+			ServerStreams: true,
+		},
+		{
+			StreamName:    "Upstream",
+			Handler:       _Test_Upstream_Handler,
+			ClientStreams: true,
+		},
+		{
+			StreamName:    "Bidi",
+			Handler:       _Test_Bidi_Handler,
+			ServerStreams: true,
+			ClientStreams: true,
+		},
+	},
+	Metadata: "grpc/grpc.proto",
+}
+
+func init() { proto.RegisterFile("grpc/grpc.proto", fileDescriptor_grpc_65bf3902e49ee873) }
+
+var fileDescriptor_grpc_65bf3902e49ee873 = []byte{
+	// 244 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4f, 0x2f, 0x2a, 0x48,
+	0xd6, 0x07, 0x11, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x3c, 0x60, 0x76, 0x49, 0x6a, 0x71,
+	0x49, 0x66, 0x5e, 0xba, 0x12, 0x3f, 0x17, 0x6f, 0x70, 0x66, 0x6e, 0x41, 0x4e, 0x6a, 0x50, 0x6a,
+	0x61, 0x69, 0x6a, 0x71, 0x89, 0x92, 0x00, 0x17, 0x1f, 0x4c, 0xa0, 0xb8, 0x20, 0x3f, 0xaf, 0x38,
+	0x55, 0x89, 0x9b, 0x8b, 0x33, 0xb8, 0xa4, 0x28, 0x35, 0x31, 0xd7, 0xb7, 0x38, 0x5d, 0x89, 0x87,
+	0x8b, 0x0b, 0xce, 0x31, 0x32, 0x9a, 0xc1, 0xc4, 0xc5, 0x12, 0x92, 0x5a, 0x5c, 0x22, 0xe4, 0xc6,
+	0xc5, 0x19, 0x9a, 0x97, 0x58, 0x54, 0xe9, 0x9c, 0x98, 0x93, 0x23, 0x24, 0xad, 0x87, 0x6c, 0x85,
+	0x1e, 0x8a, 0xf9, 0x52, 0x32, 0xd8, 0x25, 0x21, 0x76, 0x09, 0xb9, 0x70, 0x71, 0xb9, 0xe4, 0x97,
+	0xe7, 0x15, 0x83, 0xad, 0xc0, 0x6f, 0x90, 0x38, 0x9a, 0x24, 0xcc, 0x55, 0x06, 0x8c, 0x42, 0xce,
+	0x5c, 0x1c, 0xa1, 0x05, 0x50, 0x33, 0x70, 0x29, 0xc3, 0xef, 0x10, 0x0d, 0x46, 0x21, 0x5b, 0x2e,
+	0x16, 0xa7, 0xcc, 0x94, 0x4c, 0xdc, 0x06, 0x48, 0xe0, 0x90, 0x30, 0xd2, 0x60, 0x34, 0x60, 0x74,
+	0x72, 0x88, 0xb2, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf,
+	0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x07, 0xc7, 0x40, 0x52, 0x69, 0x1a, 0x84, 0x91, 0xac, 0x9b, 0x9e,
+	0x9a, 0xa7, 0x9b, 0x9e, 0xaf, 0x0f, 0x32, 0x22, 0x25, 0xb1, 0x24, 0x11, 0x1c, 0x4d, 0xd6, 0x50,
+	0x03, 0x93, 0xd8, 0xc0, 0x8a, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x90, 0xb9, 0x95, 0x42,
+	0xc2, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc/grpc.proto
similarity index 96%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto
rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc/grpc.proto
index b8bc41ac..0e5c64a9 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc/grpc.proto
@@ -33,6 +33,8 @@ syntax = "proto3";
 
 package grpc.testing;
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/grpc;testing";
+
 message SimpleRequest {
 }
 
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden
deleted file mode 100644
index 784a4f86..00000000
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden
+++ /dev/null
@@ -1,113 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: imp.proto
-// DO NOT EDIT!
-
-package imp
-
-import proto "github.com/golang/protobuf/proto"
-import "math"
-import "os"
-import imp1 "imp2.pb"
-
-// Reference proto & math imports to suppress error if they are not otherwise used.
-var _ = proto.GetString
-var _ = math.Inf
-
-// Types from public import imp2.proto
-type PubliclyImportedMessage imp1.PubliclyImportedMessage
-
-func (this *PubliclyImportedMessage) Reset() { (*imp1.PubliclyImportedMessage)(this).Reset() }
-func (this *PubliclyImportedMessage) String() string {
-	return (*imp1.PubliclyImportedMessage)(this).String()
-}
-
-// PubliclyImportedMessage from public import imp.proto
-
-type ImportedMessage_Owner int32
-
-const (
-	ImportedMessage_DAVE ImportedMessage_Owner = 1
-	ImportedMessage_MIKE ImportedMessage_Owner = 2
-)
-
-var ImportedMessage_Owner_name = map[int32]string{
-	1: "DAVE",
-	2: "MIKE",
-}
-var ImportedMessage_Owner_value = map[string]int32{
-	"DAVE": 1,
-	"MIKE": 2,
-}
-
-// NewImportedMessage_Owner is deprecated. Use x.Enum() instead.
-func NewImportedMessage_Owner(x ImportedMessage_Owner) *ImportedMessage_Owner {
-	e := ImportedMessage_Owner(x)
-	return &e
-}
-func (x ImportedMessage_Owner) Enum() *ImportedMessage_Owner {
-	p := new(ImportedMessage_Owner)
-	*p = x
-	return p
-}
-func (x ImportedMessage_Owner) String() string {
-	return proto.EnumName(ImportedMessage_Owner_name, int32(x))
-}
-
-type ImportedMessage struct {
-	Field            *int64           `protobuf:"varint,1,req,name=field" json:"field,omitempty"`
-	XXX_extensions   map[int32][]byte `json:",omitempty"`
-	XXX_unrecognized []byte           `json:",omitempty"`
-}
-
-func (this *ImportedMessage) Reset()         { *this = ImportedMessage{} }
-func (this *ImportedMessage) String() string { return proto.CompactTextString(this) }
-
-var extRange_ImportedMessage = []proto.ExtensionRange{
-	proto.ExtensionRange{90, 100},
-}
-
-func (*ImportedMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_ImportedMessage
-}
-func (this *ImportedMessage) ExtensionMap() map[int32][]byte {
-	if this.XXX_extensions == nil {
-		this.XXX_extensions = make(map[int32][]byte)
-	}
-	return this.XXX_extensions
-}
-
-type ImportedExtendable struct {
-	XXX_extensions   map[int32][]byte `json:",omitempty"`
-	XXX_unrecognized []byte           `json:",omitempty"`
-}
-
-func (this *ImportedExtendable) Reset()         { *this = ImportedExtendable{} }
-func (this *ImportedExtendable) String() string { return proto.CompactTextString(this) }
-
-func (this *ImportedExtendable) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(this.ExtensionMap())
-}
-func (this *ImportedExtendable) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, this.ExtensionMap())
-}
-// ensure ImportedExtendable satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*ImportedExtendable)(nil)
-var _ proto.Unmarshaler = (*ImportedExtendable)(nil)
-
-var extRange_ImportedExtendable = []proto.ExtensionRange{
-	proto.ExtensionRange{100, 536870911},
-}
-
-func (*ImportedExtendable) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_ImportedExtendable
-}
-func (this *ImportedExtendable) ExtensionMap() map[int32][]byte {
-	if this.XXX_extensions == nil {
-		this.XXX_extensions = make(map[int32][]byte)
-	}
-	return this.XXX_extensions
-}
-
-func init() {
-	proto.RegisterEnum("imp.ImportedMessage_Owner", ImportedMessage_Owner_name, ImportedMessage_Owner_value)
-}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/a.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/a.pb.go
new file mode 100644
index 00000000..5b780fd5
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/a.pb.go
@@ -0,0 +1,110 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: import_public/a.proto
+
+package import_public // import "github.com/golang/protobuf/protoc-gen-go/testdata/import_public"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import sub "github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// M from public import import_public/sub/a.proto
+type M = sub.M
+
+// E from public import import_public/sub/a.proto
+type E = sub.E
+
+var E_name = sub.E_name
+var E_value = sub.E_value
+
+const E_ZERO = E(sub.E_ZERO)
+
+// Ignoring public import of Local from import_public/b.proto
+
+type Public struct {
+	M                    *sub.M   `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
+	E                    sub.E    `protobuf:"varint,2,opt,name=e,enum=goproto.test.import_public.sub.E" json:"e,omitempty"`
+	Local                *Local   `protobuf:"bytes,3,opt,name=local" json:"local,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Public) Reset()         { *m = Public{} }
+func (m *Public) String() string { return proto.CompactTextString(m) }
+func (*Public) ProtoMessage()    {}
+func (*Public) Descriptor() ([]byte, []int) {
+	return fileDescriptor_a_c0314c022b7c17d8, []int{0}
+}
+func (m *Public) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Public.Unmarshal(m, b)
+}
+func (m *Public) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Public.Marshal(b, m, deterministic)
+}
+func (dst *Public) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Public.Merge(dst, src)
+}
+func (m *Public) XXX_Size() int {
+	return xxx_messageInfo_Public.Size(m)
+}
+func (m *Public) XXX_DiscardUnknown() {
+	xxx_messageInfo_Public.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Public proto.InternalMessageInfo
+
+func (m *Public) GetM() *sub.M {
+	if m != nil {
+		return m.M
+	}
+	return nil
+}
+
+func (m *Public) GetE() sub.E {
+	if m != nil {
+		return m.E
+	}
+	return sub.E_ZERO
+}
+
+func (m *Public) GetLocal() *Local {
+	if m != nil {
+		return m.Local
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Public)(nil), "goproto.test.import_public.Public")
+}
+
+func init() { proto.RegisterFile("import_public/a.proto", fileDescriptor_a_c0314c022b7c17d8) }
+
+var fileDescriptor_a_c0314c022b7c17d8 = []byte{
+	// 200 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x4f, 0xd4, 0x2b, 0x28, 0xca, 0x2f,
+	0xc9, 0x17, 0x92, 0x4a, 0xcf, 0x07, 0x33, 0xf4, 0x4a, 0x52, 0x8b, 0x4b, 0xf4, 0x50, 0xd4, 0x48,
+	0x49, 0xa2, 0x6a, 0x29, 0x2e, 0x4d, 0x82, 0x69, 0x93, 0x42, 0x33, 0x2d, 0x09, 0x22, 0xac, 0xb4,
+	0x98, 0x91, 0x8b, 0x2d, 0x00, 0x2c, 0x24, 0xa4, 0xcf, 0xc5, 0x98, 0x2b, 0xc1, 0xa8, 0xc0, 0xa8,
+	0xc1, 0x6d, 0xa4, 0xa8, 0x87, 0xdb, 0x12, 0xbd, 0xe2, 0xd2, 0x24, 0x3d, 0xdf, 0x20, 0xc6, 0x5c,
+	0x90, 0x86, 0x54, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x3e, 0xc2, 0x1a, 0x5c, 0x83, 0x18, 0x53, 0x85,
+	0xcc, 0xb9, 0x58, 0x73, 0xf2, 0x93, 0x13, 0x73, 0x24, 0x98, 0x09, 0xdb, 0xe2, 0x03, 0x52, 0x18,
+	0x04, 0x51, 0xef, 0xe4, 0x18, 0x65, 0x9f, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f,
+	0xab, 0x9f, 0x9e, 0x9f, 0x93, 0x98, 0x97, 0xae, 0x0f, 0xd6, 0x9a, 0x54, 0x9a, 0x06, 0x61, 0x24,
+	0xeb, 0xa6, 0xa7, 0xe6, 0xe9, 0xa6, 0xe7, 0xeb, 0x83, 0xcc, 0x4a, 0x49, 0x2c, 0x49, 0xd4, 0x47,
+	0x31, 0x2f, 0x80, 0x21, 0x80, 0x31, 0x89, 0x0d, 0xac, 0xd2, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff,
+	0x70, 0xc5, 0xc3, 0x79, 0x5a, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/a.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/a.proto
new file mode 100644
index 00000000..957ad897
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/a.proto
@@ -0,0 +1,45 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package goproto.test.import_public;
+
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/import_public";
+
+import public "import_public/sub/a.proto"; // Different Go package.
+import public "import_public/b.proto";     // Same Go package.
+
+message Public {
+  goproto.test.import_public.sub.M m = 1;
+  goproto.test.import_public.sub.E e = 2;
+  Local local = 3;
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/b.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/b.pb.go
new file mode 100644
index 00000000..427aa4f3
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/b.pb.go
@@ -0,0 +1,87 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: import_public/b.proto
+
+package import_public // import "github.com/golang/protobuf/protoc-gen-go/testdata/import_public"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import sub "github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type Local struct {
+	M                    *sub.M   `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
+	E                    sub.E    `protobuf:"varint,2,opt,name=e,enum=goproto.test.import_public.sub.E" json:"e,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Local) Reset()         { *m = Local{} }
+func (m *Local) String() string { return proto.CompactTextString(m) }
+func (*Local) ProtoMessage()    {}
+func (*Local) Descriptor() ([]byte, []int) {
+	return fileDescriptor_b_7f20a805fad67bd0, []int{0}
+}
+func (m *Local) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Local.Unmarshal(m, b)
+}
+func (m *Local) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Local.Marshal(b, m, deterministic)
+}
+func (dst *Local) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Local.Merge(dst, src)
+}
+func (m *Local) XXX_Size() int {
+	return xxx_messageInfo_Local.Size(m)
+}
+func (m *Local) XXX_DiscardUnknown() {
+	xxx_messageInfo_Local.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Local proto.InternalMessageInfo
+
+func (m *Local) GetM() *sub.M {
+	if m != nil {
+		return m.M
+	}
+	return nil
+}
+
+func (m *Local) GetE() sub.E {
+	if m != nil {
+		return m.E
+	}
+	return sub.E_ZERO
+}
+
+func init() {
+	proto.RegisterType((*Local)(nil), "goproto.test.import_public.Local")
+}
+
+func init() { proto.RegisterFile("import_public/b.proto", fileDescriptor_b_7f20a805fad67bd0) }
+
+var fileDescriptor_b_7f20a805fad67bd0 = []byte{
+	// 174 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x4f, 0xd2, 0x2b, 0x28, 0xca, 0x2f,
+	0xc9, 0x17, 0x92, 0x4a, 0xcf, 0x07, 0x33, 0xf4, 0x4a, 0x52, 0x8b, 0x4b, 0xf4, 0x50, 0xd4, 0x48,
+	0x49, 0xa2, 0x6a, 0x29, 0x2e, 0x4d, 0xd2, 0x4f, 0x84, 0x68, 0x53, 0xca, 0xe4, 0x62, 0xf5, 0xc9,
+	0x4f, 0x4e, 0xcc, 0x11, 0xd2, 0xe7, 0x62, 0xcc, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x52,
+	0xd4, 0xc3, 0x6d, 0x96, 0x5e, 0x71, 0x69, 0x92, 0x9e, 0x6f, 0x10, 0x63, 0x2e, 0x48, 0x43, 0xaa,
+	0x04, 0x93, 0x02, 0xa3, 0x06, 0x1f, 0x61, 0x0d, 0xae, 0x41, 0x8c, 0xa9, 0x4e, 0x8e, 0x51, 0xf6,
+	0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xe9, 0xf9, 0x39, 0x89, 0x79,
+	0xe9, 0xfa, 0x60, 0x6d, 0x49, 0xa5, 0x69, 0x10, 0x46, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a,
+	0xbe, 0x3e, 0xc8, 0x9c, 0x94, 0xc4, 0x92, 0x44, 0x7d, 0x14, 0xb3, 0x92, 0xd8, 0xc0, 0xaa, 0x8c,
+	0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x2b, 0x5f, 0x8e, 0x04, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/b.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/b.proto
new file mode 100644
index 00000000..1dbca3e4
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/b.proto
@@ -0,0 +1,43 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package goproto.test.import_public;
+
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/import_public";
+
+import "import_public/sub/a.proto";
+
+message Local {
+  goproto.test.import_public.sub.M m = 1;
+  goproto.test.import_public.sub.E e = 2;
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/a.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/a.pb.go
new file mode 100644
index 00000000..4f8f6d24
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/a.pb.go
@@ -0,0 +1,100 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: import_public/sub/a.proto
+
+package sub // import "github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type E int32
+
+const (
+	E_ZERO E = 0
+)
+
+var E_name = map[int32]string{
+	0: "ZERO",
+}
+var E_value = map[string]int32{
+	"ZERO": 0,
+}
+
+func (x E) String() string {
+	return proto.EnumName(E_name, int32(x))
+}
+func (E) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_a_91ca0264a534463a, []int{0}
+}
+
+type M struct {
+	// Field using a type in the same Go package, but a different source file.
+	M2                   *M2      `protobuf:"bytes,1,opt,name=m2" json:"m2,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M) Reset()         { *m = M{} }
+func (m *M) String() string { return proto.CompactTextString(m) }
+func (*M) ProtoMessage()    {}
+func (*M) Descriptor() ([]byte, []int) {
+	return fileDescriptor_a_91ca0264a534463a, []int{0}
+}
+func (m *M) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M.Unmarshal(m, b)
+}
+func (m *M) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M.Marshal(b, m, deterministic)
+}
+func (dst *M) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M.Merge(dst, src)
+}
+func (m *M) XXX_Size() int {
+	return xxx_messageInfo_M.Size(m)
+}
+func (m *M) XXX_DiscardUnknown() {
+	xxx_messageInfo_M.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M proto.InternalMessageInfo
+
+func (m *M) GetM2() *M2 {
+	if m != nil {
+		return m.M2
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*M)(nil), "goproto.test.import_public.sub.M")
+	proto.RegisterEnum("goproto.test.import_public.sub.E", E_name, E_value)
+}
+
+func init() { proto.RegisterFile("import_public/sub/a.proto", fileDescriptor_a_91ca0264a534463a) }
+
+var fileDescriptor_a_91ca0264a534463a = []byte{
+	// 172 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x2f, 0x2e, 0x4d, 0xd2, 0x4f, 0xd4,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4b, 0xcf, 0x07, 0x33, 0xf4, 0x4a, 0x52, 0x8b, 0x4b,
+	0xf4, 0x50, 0xd4, 0xe9, 0x15, 0x97, 0x26, 0x49, 0x61, 0xd1, 0x9a, 0x04, 0xd1, 0xaa, 0x64, 0xce,
+	0xc5, 0xe8, 0x2b, 0x64, 0xc4, 0xc5, 0x94, 0x6b, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0xa4,
+	0xa4, 0x87, 0xdf, 0x30, 0x3d, 0x5f, 0xa3, 0x20, 0xa6, 0x5c, 0x23, 0x2d, 0x5e, 0x2e, 0x46, 0x57,
+	0x21, 0x0e, 0x2e, 0x96, 0x28, 0xd7, 0x20, 0x7f, 0x01, 0x06, 0x27, 0xd7, 0x28, 0xe7, 0xf4, 0xcc,
+	0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xf4, 0xfc, 0x9c, 0xc4, 0xbc, 0x74, 0x7d,
+	0xb0, 0x39, 0x49, 0xa5, 0x69, 0x10, 0x46, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a, 0xbe, 0x3e,
+	0xc8, 0xe0, 0x94, 0xc4, 0x92, 0x44, 0x7d, 0x0c, 0x67, 0x25, 0xb1, 0x81, 0x55, 0x1a, 0x03, 0x02,
+	0x00, 0x00, 0xff, 0xff, 0x81, 0xcc, 0x07, 0x7d, 0xed, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/a.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/a.proto
new file mode 100644
index 00000000..4494c818
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/a.proto
@@ -0,0 +1,47 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package goproto.test.import_public.sub;
+
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub";
+
+import "import_public/sub/b.proto";
+
+message M {
+  // Field using a type in the same Go package, but a different source file.
+  M2 m2 = 1;
+}
+
+enum E {
+  ZERO = 0;
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/b.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/b.pb.go
new file mode 100644
index 00000000..d57a3bb9
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/b.pb.go
@@ -0,0 +1,67 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: import_public/sub/b.proto
+
+package sub // import "github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type M2 struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M2) Reset()         { *m = M2{} }
+func (m *M2) String() string { return proto.CompactTextString(m) }
+func (*M2) ProtoMessage()    {}
+func (*M2) Descriptor() ([]byte, []int) {
+	return fileDescriptor_b_eba25180453d86b4, []int{0}
+}
+func (m *M2) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M2.Unmarshal(m, b)
+}
+func (m *M2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M2.Marshal(b, m, deterministic)
+}
+func (dst *M2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M2.Merge(dst, src)
+}
+func (m *M2) XXX_Size() int {
+	return xxx_messageInfo_M2.Size(m)
+}
+func (m *M2) XXX_DiscardUnknown() {
+	xxx_messageInfo_M2.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M2 proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*M2)(nil), "goproto.test.import_public.sub.M2")
+}
+
+func init() { proto.RegisterFile("import_public/sub/b.proto", fileDescriptor_b_eba25180453d86b4) }
+
+var fileDescriptor_b_eba25180453d86b4 = []byte{
+	// 127 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x2f, 0x2e, 0x4d, 0xd2, 0x4f, 0xd2,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4b, 0xcf, 0x07, 0x33, 0xf4, 0x4a, 0x52, 0x8b, 0x4b,
+	0xf4, 0x50, 0xd4, 0xe9, 0x15, 0x97, 0x26, 0x29, 0xb1, 0x70, 0x31, 0xf9, 0x1a, 0x39, 0xb9, 0x46,
+	0x39, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xe7, 0x24,
+	0xe6, 0xa5, 0xeb, 0x83, 0xf5, 0x25, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba,
+	0xe9, 0xf9, 0xfa, 0x20, 0x83, 0x52, 0x12, 0x4b, 0x12, 0xf5, 0x31, 0x2c, 0x4d, 0x62, 0x03, 0xab,
+	0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x64, 0x42, 0xe4, 0xa8, 0x90, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/b.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/b.proto
new file mode 100644
index 00000000..c7299e0f
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub/b.proto
@@ -0,0 +1,39 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package goproto.test.import_public.sub;
+
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub";
+
+message M2 {
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public_test.go
similarity index 69%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto
rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public_test.go
index 156e078d..7ef776bf 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/import_public_test.go
@@ -29,42 +29,38 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-syntax = "proto2";
+// +build go1.9
 
-package imp;
+package testdata
 
-import "imp2.proto";
-import "imp3.proto";
+import (
+	"testing"
 
-message ImportedMessage {
-  required int64 field = 1;
+	mainpb "github.com/golang/protobuf/protoc-gen-go/testdata/import_public"
+	subpb "github.com/golang/protobuf/protoc-gen-go/testdata/import_public/sub"
+)
 
-  // The forwarded getters for these fields are fiddly to get right.
-  optional ImportedMessage2 local_msg = 2;
-  optional ForeignImportedMessage foreign_msg = 3;  // in imp3.proto
-  optional Owner enum_field = 4;
-  oneof union {
-    int32 state = 9;
-  }
-
-  repeated string name = 5;
-  repeated Owner boss = 6;
-  repeated ImportedMessage2 memo = 7;
-
-  map<string, ImportedMessage2> msg_map = 8;
-
-  enum Owner {
-    DAVE = 1;
-    MIKE = 2;
-  }
-
-  extensions 90 to 100;
-}
-
-message ImportedMessage2 {
-}
-
-message ImportedExtendable {
-  option message_set_wire_format = true;
-  extensions 100 to max;
+func TestImportPublicLink(t *testing.T) {
+	// mainpb.[ME] should be interchangable with subpb.[ME].
+	var _ mainpb.M = subpb.M{}
+	var _ mainpb.E = subpb.E(0)
+	_ = &mainpb.Public{
+		M: &mainpb.M{},
+		E: mainpb.E_ZERO,
+		Local: &mainpb.Local{
+			M: &mainpb.M{},
+			E: mainpb.E_ZERO,
+		},
+	}
+	_ = &mainpb.Public{
+		M: &subpb.M{},
+		E: subpb.E_ZERO,
+		Local: &mainpb.Local{
+			M: &subpb.M{},
+			E: subpb.E_ZERO,
+		},
+	}
+	_ = &mainpb.M{
+		M2: &subpb.M2{},
+	}
 }
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt/m.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt/m.pb.go
new file mode 100644
index 00000000..ca312d6c
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt/m.pb.go
@@ -0,0 +1,66 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/fmt/m.proto
+
+package fmt // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type M struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M) Reset()         { *m = M{} }
+func (m *M) String() string { return proto.CompactTextString(m) }
+func (*M) ProtoMessage()    {}
+func (*M) Descriptor() ([]byte, []int) {
+	return fileDescriptor_m_867dd34c461422b8, []int{0}
+}
+func (m *M) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M.Unmarshal(m, b)
+}
+func (m *M) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M.Marshal(b, m, deterministic)
+}
+func (dst *M) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M.Merge(dst, src)
+}
+func (m *M) XXX_Size() int {
+	return xxx_messageInfo_M.Size(m)
+}
+func (m *M) XXX_DiscardUnknown() {
+	xxx_messageInfo_M.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*M)(nil), "fmt.M")
+}
+
+func init() { proto.RegisterFile("imports/fmt/m.proto", fileDescriptor_m_867dd34c461422b8) }
+
+var fileDescriptor_m_867dd34c461422b8 = []byte{
+	// 109 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xce, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x4f, 0xcb, 0x2d, 0xd1, 0xcf, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
+	0x62, 0x4e, 0xcb, 0x2d, 0x51, 0x62, 0xe6, 0x62, 0xf4, 0x75, 0xb2, 0x8f, 0xb2, 0x4d, 0xcf, 0x2c,
+	0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x07,
+	0x2b, 0x4a, 0x2a, 0x4d, 0x83, 0x30, 0x92, 0x75, 0xd3, 0x53, 0xf3, 0x74, 0xd3, 0xf3, 0xf5, 0x4b,
+	0x52, 0x8b, 0x4b, 0x52, 0x12, 0x4b, 0x12, 0xf5, 0x91, 0x8c, 0x4c, 0x62, 0x03, 0xab, 0x31, 0x06,
+	0x04, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xc9, 0xee, 0xbe, 0x68, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt/m.proto
similarity index 89%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto
rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt/m.proto
index 58fc7598..142d8cfa 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt/m.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2012 The Go Authors.  All rights reserved.
+// Copyright 2018 The Go Authors.  All rights reserved.
 // https://github.com/golang/protobuf
 //
 // Redistribution and use in source and binary forms, with or without
@@ -29,10 +29,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-syntax = "proto2";
-
-package imp;
-
-message ForeignImportedMessage {
-  optional string tuber = 1;
-}
+syntax = "proto3";
+package fmt;
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt";
+message M {}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
new file mode 100644
index 00000000..82ec35e1
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
@@ -0,0 +1,130 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_a_1/m1.proto
+
+package test_a_1 // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type E1 int32
+
+const (
+	E1_E1_ZERO E1 = 0
+)
+
+var E1_name = map[int32]string{
+	0: "E1_ZERO",
+}
+var E1_value = map[string]int32{
+	"E1_ZERO": 0,
+}
+
+func (x E1) String() string {
+	return proto.EnumName(E1_name, int32(x))
+}
+func (E1) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_m1_56a2598431d21e61, []int{0}
+}
+
+type M1 struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M1) Reset()         { *m = M1{} }
+func (m *M1) String() string { return proto.CompactTextString(m) }
+func (*M1) ProtoMessage()    {}
+func (*M1) Descriptor() ([]byte, []int) {
+	return fileDescriptor_m1_56a2598431d21e61, []int{0}
+}
+func (m *M1) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M1.Unmarshal(m, b)
+}
+func (m *M1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M1.Marshal(b, m, deterministic)
+}
+func (dst *M1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M1.Merge(dst, src)
+}
+func (m *M1) XXX_Size() int {
+	return xxx_messageInfo_M1.Size(m)
+}
+func (m *M1) XXX_DiscardUnknown() {
+	xxx_messageInfo_M1.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M1 proto.InternalMessageInfo
+
+type M1_1 struct {
+	M1                   *M1      `protobuf:"bytes,1,opt,name=m1" json:"m1,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M1_1) Reset()         { *m = M1_1{} }
+func (m *M1_1) String() string { return proto.CompactTextString(m) }
+func (*M1_1) ProtoMessage()    {}
+func (*M1_1) Descriptor() ([]byte, []int) {
+	return fileDescriptor_m1_56a2598431d21e61, []int{1}
+}
+func (m *M1_1) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M1_1.Unmarshal(m, b)
+}
+func (m *M1_1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M1_1.Marshal(b, m, deterministic)
+}
+func (dst *M1_1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M1_1.Merge(dst, src)
+}
+func (m *M1_1) XXX_Size() int {
+	return xxx_messageInfo_M1_1.Size(m)
+}
+func (m *M1_1) XXX_DiscardUnknown() {
+	xxx_messageInfo_M1_1.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M1_1 proto.InternalMessageInfo
+
+func (m *M1_1) GetM1() *M1 {
+	if m != nil {
+		return m.M1
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*M1)(nil), "test.a.M1")
+	proto.RegisterType((*M1_1)(nil), "test.a.M1_1")
+	proto.RegisterEnum("test.a.E1", E1_name, E1_value)
+}
+
+func init() { proto.RegisterFile("imports/test_a_1/m1.proto", fileDescriptor_m1_56a2598431d21e61) }
+
+var fileDescriptor_m1_56a2598431d21e61 = []byte{
+	// 165 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8c, 0x37, 0xd4, 0xcf, 0x35, 0xd4,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x09, 0xe9, 0x25, 0x2a, 0xb1, 0x70, 0x31, 0xf9,
+	0x1a, 0x2a, 0x29, 0x71, 0xb1, 0xf8, 0x1a, 0xc6, 0x1b, 0x0a, 0x49, 0x71, 0x31, 0xe5, 0x1a, 0x4a,
+	0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x71, 0xe9, 0x41, 0x94, 0xe8, 0xf9, 0x1a, 0x06, 0x31, 0xe5,
+	0x1a, 0x6a, 0x09, 0x72, 0x31, 0xb9, 0x1a, 0x0a, 0x71, 0x73, 0xb1, 0xbb, 0x1a, 0xc6, 0x47, 0xb9,
+	0x06, 0xf9, 0x0b, 0x30, 0x38, 0xb9, 0x44, 0x39, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25,
+	0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0x83, 0xcd, 0x4f, 0x2a, 0x4d, 0x83,
+	0x30, 0x92, 0x75, 0xd3, 0x53, 0xf3, 0x74, 0xd3, 0xf3, 0xc1, 0x4e, 0x48, 0x49, 0x2c, 0x49, 0xd4,
+	0x47, 0x77, 0x53, 0x12, 0x1b, 0x58, 0xa1, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xae, 0xc9,
+	0xcd, 0xae, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m1.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m1.proto
new file mode 100644
index 00000000..da54c1ee
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m1.proto
@@ -0,0 +1,44 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+package test.a;
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1";
+
+message M1 {}
+
+message M1_1 {
+  M1 m1 = 1;
+}
+
+enum E1 {
+  E1_ZERO = 0;
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
new file mode 100644
index 00000000..1b629bf3
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
@@ -0,0 +1,67 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_a_1/m2.proto
+
+package test_a_1 // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type M2 struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M2) Reset()         { *m = M2{} }
+func (m *M2) String() string { return proto.CompactTextString(m) }
+func (*M2) ProtoMessage()    {}
+func (*M2) Descriptor() ([]byte, []int) {
+	return fileDescriptor_m2_ccd6356c045a9ac3, []int{0}
+}
+func (m *M2) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M2.Unmarshal(m, b)
+}
+func (m *M2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M2.Marshal(b, m, deterministic)
+}
+func (dst *M2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M2.Merge(dst, src)
+}
+func (m *M2) XXX_Size() int {
+	return xxx_messageInfo_M2.Size(m)
+}
+func (m *M2) XXX_DiscardUnknown() {
+	xxx_messageInfo_M2.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M2 proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*M2)(nil), "test.a.M2")
+}
+
+func init() { proto.RegisterFile("imports/test_a_1/m2.proto", fileDescriptor_m2_ccd6356c045a9ac3) }
+
+var fileDescriptor_m2_ccd6356c045a9ac3 = []byte{
+	// 114 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8c, 0x37, 0xd4, 0xcf, 0x35, 0xd2,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x09, 0xe9, 0x25, 0x2a, 0xb1, 0x70, 0x31, 0xf9,
+	0x1a, 0x39, 0xb9, 0x44, 0x39, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
+	0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0x83, 0x15, 0x26, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba,
+	0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0x60, 0xb3, 0x52, 0x12, 0x4b, 0x12, 0xf5, 0xd1, 0x0d, 0x4f,
+	0x62, 0x03, 0x2b, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe3, 0xe0, 0x7e, 0xc0, 0x77, 0x00,
+	0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m2.proto
similarity index 88%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto
rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m2.proto
index 3bb0632b..49499dc9 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1/m2.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2011 The Go Authors.  All rights reserved.
+// Copyright 2018 The Go Authors.  All rights reserved.
 // https://github.com/golang/protobuf
 //
 // Redistribution and use in source and binary forms, with or without
@@ -29,15 +29,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-syntax = "proto2";
-
-package imp;
-
-message PubliclyImportedMessage {
-  optional int64 field = 1;
-}
-
-enum PubliclyImportedEnum {
-  GLASSES = 1;
-  HAIR = 2;
-}
+syntax = "proto3";
+package test.a;
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1";
+message M2 {}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
new file mode 100644
index 00000000..e3895d2b
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
@@ -0,0 +1,67 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_a_2/m3.proto
+
+package test_a_2 // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type M3 struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M3) Reset()         { *m = M3{} }
+func (m *M3) String() string { return proto.CompactTextString(m) }
+func (*M3) ProtoMessage()    {}
+func (*M3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_m3_de310e87d08d4216, []int{0}
+}
+func (m *M3) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M3.Unmarshal(m, b)
+}
+func (m *M3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M3.Marshal(b, m, deterministic)
+}
+func (dst *M3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M3.Merge(dst, src)
+}
+func (m *M3) XXX_Size() int {
+	return xxx_messageInfo_M3.Size(m)
+}
+func (m *M3) XXX_DiscardUnknown() {
+	xxx_messageInfo_M3.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M3 proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*M3)(nil), "test.a.M3")
+}
+
+func init() { proto.RegisterFile("imports/test_a_2/m3.proto", fileDescriptor_m3_de310e87d08d4216) }
+
+var fileDescriptor_m3_de310e87d08d4216 = []byte{
+	// 114 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8c, 0x37, 0xd2, 0xcf, 0x35, 0xd6,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x09, 0xe9, 0x25, 0x2a, 0xb1, 0x70, 0x31, 0xf9,
+	0x1a, 0x3b, 0xb9, 0x44, 0x39, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
+	0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0x83, 0x15, 0x26, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba,
+	0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0x60, 0xb3, 0x52, 0x12, 0x4b, 0x12, 0xf5, 0xd1, 0x0d, 0x4f,
+	0x62, 0x03, 0x2b, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x23, 0x86, 0x27, 0x47, 0x77, 0x00,
+	0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m3.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m3.proto
new file mode 100644
index 00000000..5e811ef8
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m3.proto
@@ -0,0 +1,35 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+package test.a;
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2";
+message M3 {}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
new file mode 100644
index 00000000..65a3bad2
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
@@ -0,0 +1,67 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_a_2/m4.proto
+
+package test_a_2 // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type M4 struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M4) Reset()         { *m = M4{} }
+func (m *M4) String() string { return proto.CompactTextString(m) }
+func (*M4) ProtoMessage()    {}
+func (*M4) Descriptor() ([]byte, []int) {
+	return fileDescriptor_m4_da12b386229f3791, []int{0}
+}
+func (m *M4) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M4.Unmarshal(m, b)
+}
+func (m *M4) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M4.Marshal(b, m, deterministic)
+}
+func (dst *M4) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M4.Merge(dst, src)
+}
+func (m *M4) XXX_Size() int {
+	return xxx_messageInfo_M4.Size(m)
+}
+func (m *M4) XXX_DiscardUnknown() {
+	xxx_messageInfo_M4.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M4 proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*M4)(nil), "test.a.M4")
+}
+
+func init() { proto.RegisterFile("imports/test_a_2/m4.proto", fileDescriptor_m4_da12b386229f3791) }
+
+var fileDescriptor_m4_da12b386229f3791 = []byte{
+	// 114 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8c, 0x37, 0xd2, 0xcf, 0x35, 0xd1,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x09, 0xe9, 0x25, 0x2a, 0xb1, 0x70, 0x31, 0xf9,
+	0x9a, 0x38, 0xb9, 0x44, 0x39, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea,
+	0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0x83, 0x15, 0x26, 0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba,
+	0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0x60, 0xb3, 0x52, 0x12, 0x4b, 0x12, 0xf5, 0xd1, 0x0d, 0x4f,
+	0x62, 0x03, 0x2b, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x58, 0xcb, 0x10, 0xc8, 0x77, 0x00,
+	0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m4.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m4.proto
new file mode 100644
index 00000000..8f8fe3e1
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2/m4.proto
@@ -0,0 +1,35 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+package test.a;
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2";
+message M4 {}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
new file mode 100644
index 00000000..831f4149
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
@@ -0,0 +1,67 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_b_1/m1.proto
+
+package beta // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type M1 struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M1) Reset()         { *m = M1{} }
+func (m *M1) String() string { return proto.CompactTextString(m) }
+func (*M1) ProtoMessage()    {}
+func (*M1) Descriptor() ([]byte, []int) {
+	return fileDescriptor_m1_aff127b054aec649, []int{0}
+}
+func (m *M1) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M1.Unmarshal(m, b)
+}
+func (m *M1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M1.Marshal(b, m, deterministic)
+}
+func (dst *M1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M1.Merge(dst, src)
+}
+func (m *M1) XXX_Size() int {
+	return xxx_messageInfo_M1.Size(m)
+}
+func (m *M1) XXX_DiscardUnknown() {
+	xxx_messageInfo_M1.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M1 proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*M1)(nil), "test.b.part1.M1")
+}
+
+func init() { proto.RegisterFile("imports/test_b_1/m1.proto", fileDescriptor_m1_aff127b054aec649) }
+
+var fileDescriptor_m1_aff127b054aec649 = []byte{
+	// 125 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8a, 0x37, 0xd4, 0xcf, 0x35, 0xd4,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0x09, 0xe9, 0x25, 0xe9, 0x15, 0x24, 0x16, 0x95,
+	0x18, 0x2a, 0xb1, 0x70, 0x31, 0xf9, 0x1a, 0x3a, 0x79, 0x46, 0xb9, 0xa7, 0x67, 0x96, 0x64, 0x94,
+	0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0x83, 0x95, 0x27,
+	0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0x60, 0x13, 0x53, 0x12,
+	0x4b, 0x12, 0xf5, 0xd1, 0xad, 0xb0, 0x4e, 0x4a, 0x2d, 0x49, 0x4c, 0x62, 0x03, 0xab, 0x36, 0x06,
+	0x04, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xf1, 0x3b, 0x7f, 0x82, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m1.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m1.proto
new file mode 100644
index 00000000..2c35ec4a
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m1.proto
@@ -0,0 +1,35 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+package test.b.part1;
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1;beta";
+message M1 {}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
new file mode 100644
index 00000000..bc741056
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
@@ -0,0 +1,67 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_b_1/m2.proto
+
+package beta // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type M2 struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *M2) Reset()         { *m = M2{} }
+func (m *M2) String() string { return proto.CompactTextString(m) }
+func (*M2) ProtoMessage()    {}
+func (*M2) Descriptor() ([]byte, []int) {
+	return fileDescriptor_m2_0c59cab35ba1b0d8, []int{0}
+}
+func (m *M2) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_M2.Unmarshal(m, b)
+}
+func (m *M2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_M2.Marshal(b, m, deterministic)
+}
+func (dst *M2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_M2.Merge(dst, src)
+}
+func (m *M2) XXX_Size() int {
+	return xxx_messageInfo_M2.Size(m)
+}
+func (m *M2) XXX_DiscardUnknown() {
+	xxx_messageInfo_M2.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_M2 proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*M2)(nil), "test.b.part2.M2")
+}
+
+func init() { proto.RegisterFile("imports/test_b_1/m2.proto", fileDescriptor_m2_0c59cab35ba1b0d8) }
+
+var fileDescriptor_m2_0c59cab35ba1b0d8 = []byte{
+	// 125 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x4f, 0x8a, 0x37, 0xd4, 0xcf, 0x35, 0xd2,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0x09, 0xe9, 0x25, 0xe9, 0x15, 0x24, 0x16, 0x95,
+	0x18, 0x29, 0xb1, 0x70, 0x31, 0xf9, 0x1a, 0x39, 0x79, 0x46, 0xb9, 0xa7, 0x67, 0x96, 0x64, 0x94,
+	0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0x83, 0x95, 0x27,
+	0x95, 0xa6, 0x41, 0x18, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0x60, 0x13, 0x53, 0x12,
+	0x4b, 0x12, 0xf5, 0xd1, 0xad, 0xb0, 0x4e, 0x4a, 0x2d, 0x49, 0x4c, 0x62, 0x03, 0xab, 0x36, 0x06,
+	0x04, 0x00, 0x00, 0xff, 0xff, 0x44, 0x29, 0xbe, 0x6d, 0x82, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m2.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m2.proto
new file mode 100644
index 00000000..13723be4
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1/m2.proto
@@ -0,0 +1,35 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+package test.b.part2;
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1;beta";
+message M2 {}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
new file mode 100644
index 00000000..72daffdb
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
@@ -0,0 +1,80 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_import_a1m1.proto
+
+package imports // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import test_a_1 "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type A1M1 struct {
+	F                    *test_a_1.M1 `protobuf:"bytes,1,opt,name=f" json:"f,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *A1M1) Reset()         { *m = A1M1{} }
+func (m *A1M1) String() string { return proto.CompactTextString(m) }
+func (*A1M1) ProtoMessage()    {}
+func (*A1M1) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_import_a1m1_d7f2b5c638a69f6e, []int{0}
+}
+func (m *A1M1) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_A1M1.Unmarshal(m, b)
+}
+func (m *A1M1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_A1M1.Marshal(b, m, deterministic)
+}
+func (dst *A1M1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_A1M1.Merge(dst, src)
+}
+func (m *A1M1) XXX_Size() int {
+	return xxx_messageInfo_A1M1.Size(m)
+}
+func (m *A1M1) XXX_DiscardUnknown() {
+	xxx_messageInfo_A1M1.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_A1M1 proto.InternalMessageInfo
+
+func (m *A1M1) GetF() *test_a_1.M1 {
+	if m != nil {
+		return m.F
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*A1M1)(nil), "test.A1M1")
+}
+
+func init() {
+	proto.RegisterFile("imports/test_import_a1m1.proto", fileDescriptor_test_import_a1m1_d7f2b5c638a69f6e)
+}
+
+var fileDescriptor_test_import_a1m1_d7f2b5c638a69f6e = []byte{
+	// 149 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcb, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x87, 0x70, 0xe2, 0x13, 0x0d, 0x73, 0x0d,
+	0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x58, 0x40, 0xe2, 0x52, 0x92, 0x28, 0xaa, 0x12, 0xe3,
+	0x0d, 0xf5, 0x61, 0x0a, 0x94, 0x14, 0xb8, 0x58, 0x1c, 0x0d, 0x7d, 0x0d, 0x85, 0x24, 0xb8, 0x18,
+	0xd3, 0x24, 0x18, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0xb8, 0xf4, 0x40, 0xca, 0xf4, 0x12, 0xf5, 0x7c,
+	0x0d, 0x83, 0x18, 0xd3, 0x9c, 0xac, 0xa3, 0x2c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92,
+	0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0x73, 0x12, 0xf3, 0xd2, 0xf5, 0xc1, 0x9a, 0x93, 0x4a, 0xd3, 0x20,
+	0x8c, 0x64, 0xdd, 0xf4, 0xd4, 0x3c, 0xdd, 0xf4, 0x7c, 0xb0, 0xf9, 0x29, 0x89, 0x25, 0x89, 0xfa,
+	0x50, 0x0b, 0x93, 0xd8, 0xc0, 0xf2, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x84, 0x2f, 0x18,
+	0x23, 0xa8, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m1.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m1.proto
new file mode 100644
index 00000000..abf07f2a
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m1.proto
@@ -0,0 +1,42 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package test;
+
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports";
+
+import "imports/test_a_1/m1.proto";
+
+message A1M1 {
+  test.a.M1 f = 1;
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
new file mode 100644
index 00000000..9e36ebde
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
@@ -0,0 +1,80 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_import_a1m2.proto
+
+package imports // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import test_a_1 "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type A1M2 struct {
+	F                    *test_a_1.M2 `protobuf:"bytes,1,opt,name=f" json:"f,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *A1M2) Reset()         { *m = A1M2{} }
+func (m *A1M2) String() string { return proto.CompactTextString(m) }
+func (*A1M2) ProtoMessage()    {}
+func (*A1M2) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_import_a1m2_9a3281ce9464e116, []int{0}
+}
+func (m *A1M2) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_A1M2.Unmarshal(m, b)
+}
+func (m *A1M2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_A1M2.Marshal(b, m, deterministic)
+}
+func (dst *A1M2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_A1M2.Merge(dst, src)
+}
+func (m *A1M2) XXX_Size() int {
+	return xxx_messageInfo_A1M2.Size(m)
+}
+func (m *A1M2) XXX_DiscardUnknown() {
+	xxx_messageInfo_A1M2.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_A1M2 proto.InternalMessageInfo
+
+func (m *A1M2) GetF() *test_a_1.M2 {
+	if m != nil {
+		return m.F
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*A1M2)(nil), "test.A1M2")
+}
+
+func init() {
+	proto.RegisterFile("imports/test_import_a1m2.proto", fileDescriptor_test_import_a1m2_9a3281ce9464e116)
+}
+
+var fileDescriptor_test_import_a1m2_9a3281ce9464e116 = []byte{
+	// 149 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcb, 0xcc, 0x2d, 0xc8,
+	0x2f, 0x2a, 0x29, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x87, 0x70, 0xe2, 0x13, 0x0d, 0x73, 0x8d,
+	0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x58, 0x40, 0xe2, 0x52, 0x92, 0x28, 0xaa, 0x12, 0xe3,
+	0x0d, 0xf5, 0x61, 0x0a, 0x94, 0x14, 0xb8, 0x58, 0x1c, 0x0d, 0x7d, 0x8d, 0x84, 0x24, 0xb8, 0x18,
+	0xd3, 0x24, 0x18, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0xb8, 0xf4, 0x40, 0xca, 0xf4, 0x12, 0xf5, 0x7c,
+	0x8d, 0x82, 0x18, 0xd3, 0x9c, 0xac, 0xa3, 0x2c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92,
+	0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0x73, 0x12, 0xf3, 0xd2, 0xf5, 0xc1, 0x9a, 0x93, 0x4a, 0xd3, 0x20,
+	0x8c, 0x64, 0xdd, 0xf4, 0xd4, 0x3c, 0xdd, 0xf4, 0x7c, 0xb0, 0xf9, 0x29, 0x89, 0x25, 0x89, 0xfa,
+	0x50, 0x0b, 0x93, 0xd8, 0xc0, 0xf2, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x88, 0xfb,
+	0xea, 0xa8, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m2.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m2.proto
new file mode 100644
index 00000000..5c53950d
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_a1m2.proto
@@ -0,0 +1,42 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package test;
+
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports";
+
+import "imports/test_a_1/m2.proto";
+
+message A1M2 {
+  test.a.M2 f = 1;
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_all.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_all.pb.go
new file mode 100644
index 00000000..f40e0b73
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_all.pb.go
@@ -0,0 +1,138 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: imports/test_import_all.proto
+
+package imports // import "github.com/golang/protobuf/protoc-gen-go/testdata/imports"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import fmt1 "github.com/golang/protobuf/protoc-gen-go/testdata/imports/fmt"
+import test_a_1 "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_1"
+import test_a_2 "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_a_2"
+import test_b_1 "github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_b_1"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type All struct {
+	Am1                  *test_a_1.M1 `protobuf:"bytes,1,opt,name=am1" json:"am1,omitempty"`
+	Am2                  *test_a_1.M2 `protobuf:"bytes,2,opt,name=am2" json:"am2,omitempty"`
+	Am3                  *test_a_2.M3 `protobuf:"bytes,3,opt,name=am3" json:"am3,omitempty"`
+	Am4                  *test_a_2.M4 `protobuf:"bytes,4,opt,name=am4" json:"am4,omitempty"`
+	Bm1                  *test_b_1.M1 `protobuf:"bytes,5,opt,name=bm1" json:"bm1,omitempty"`
+	Bm2                  *test_b_1.M2 `protobuf:"bytes,6,opt,name=bm2" json:"bm2,omitempty"`
+	Fmt                  *fmt1.M      `protobuf:"bytes,7,opt,name=fmt" json:"fmt,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *All) Reset()         { *m = All{} }
+func (m *All) String() string { return proto.CompactTextString(m) }
+func (*All) ProtoMessage()    {}
+func (*All) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_import_all_b41dc4592e4a4f3b, []int{0}
+}
+func (m *All) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_All.Unmarshal(m, b)
+}
+func (m *All) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_All.Marshal(b, m, deterministic)
+}
+func (dst *All) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_All.Merge(dst, src)
+}
+func (m *All) XXX_Size() int {
+	return xxx_messageInfo_All.Size(m)
+}
+func (m *All) XXX_DiscardUnknown() {
+	xxx_messageInfo_All.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_All proto.InternalMessageInfo
+
+func (m *All) GetAm1() *test_a_1.M1 {
+	if m != nil {
+		return m.Am1
+	}
+	return nil
+}
+
+func (m *All) GetAm2() *test_a_1.M2 {
+	if m != nil {
+		return m.Am2
+	}
+	return nil
+}
+
+func (m *All) GetAm3() *test_a_2.M3 {
+	if m != nil {
+		return m.Am3
+	}
+	return nil
+}
+
+func (m *All) GetAm4() *test_a_2.M4 {
+	if m != nil {
+		return m.Am4
+	}
+	return nil
+}
+
+func (m *All) GetBm1() *test_b_1.M1 {
+	if m != nil {
+		return m.Bm1
+	}
+	return nil
+}
+
+func (m *All) GetBm2() *test_b_1.M2 {
+	if m != nil {
+		return m.Bm2
+	}
+	return nil
+}
+
+func (m *All) GetFmt() *fmt1.M {
+	if m != nil {
+		return m.Fmt
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*All)(nil), "test.All")
+}
+
+func init() {
+	proto.RegisterFile("imports/test_import_all.proto", fileDescriptor_test_import_all_b41dc4592e4a4f3b)
+}
+
+var fileDescriptor_test_import_all_b41dc4592e4a4f3b = []byte{
+	// 258 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xd0, 0xb1, 0x4e, 0xc3, 0x30,
+	0x10, 0x06, 0x60, 0x15, 0x97, 0x20, 0x99, 0x05, 0x85, 0xc5, 0x20, 0x90, 0x50, 0x27, 0x96, 0xda,
+	0xb2, 0x9d, 0x05, 0x31, 0xc1, 0xde, 0xa5, 0x23, 0x4b, 0x64, 0x97, 0xc6, 0x54, 0xf2, 0xd5, 0x51,
+	0x7a, 0x7d, 0x5e, 0x5e, 0x05, 0xd9, 0x07, 0x12, 0x84, 0x66, 0x4b, 0xfe, 0xef, 0xb7, 0xce, 0x3e,
+	0x7e, 0xbf, 0x83, 0x3e, 0x0d, 0x78, 0x50, 0xb8, 0x3d, 0x60, 0x4b, 0x3f, 0xad, 0x8b, 0x51, 0xf6,
+	0x43, 0xc2, 0x54, 0xcf, 0x73, 0x7c, 0x7b, 0xf3, 0xa7, 0xe4, 0x5a, 0xad, 0x40, 0x53, 0xe1, 0x14,
+	0x99, 0x09, 0x32, 0x0a, 0xec, 0x34, 0x35, 0x27, 0xc9, 0x4f, 0xcf, 0xf2, 0xbf, 0x67, 0x5d, 0xff,
+	0x50, 0x07, 0xa8, 0x80, 0xc2, 0xc5, 0xe7, 0x8c, 0xb3, 0x97, 0x18, 0xeb, 0x3b, 0xce, 0x1c, 0x68,
+	0x31, 0x7b, 0x98, 0x3d, 0x5e, 0x1a, 0x2e, 0xf3, 0x69, 0xe9, 0xe4, 0x4a, 0xaf, 0x73, 0x4c, 0x6a,
+	0xc4, 0xd9, 0x48, 0x4d, 0x56, 0x43, 0x6a, 0x05, 0x1b, 0xa9, 0xcd, 0x6a, 0x49, 0x1b, 0x31, 0x1f,
+	0x69, 0x93, 0xb5, 0xa9, 0x17, 0x9c, 0x79, 0xd0, 0xe2, 0xbc, 0xe8, 0x15, 0xa9, 0x97, 0xbd, 0x1b,
+	0x50, 0x97, 0xe9, 0x1e, 0x34, 0x75, 0x8c, 0xa8, 0xfe, 0x77, 0x4c, 0xb9, 0x83, 0x07, 0x53, 0x0b,
+	0xce, 0x3a, 0x40, 0x71, 0x51, 0x3a, 0x95, 0xec, 0x00, 0xe5, 0x6a, 0x9d, 0xa3, 0xd7, 0xe7, 0xb7,
+	0xa7, 0xb0, 0xc3, 0x8f, 0xa3, 0x97, 0x9b, 0x04, 0x2a, 0xa4, 0xe8, 0xf6, 0x41, 0x95, 0xc7, 0xfb,
+	0x63, 0x47, 0x1f, 0x9b, 0x65, 0xd8, 0xee, 0x97, 0x21, 0x95, 0xa5, 0xbd, 0x3b, 0x74, 0xea, 0x7b,
+	0x55, 0xbe, 0x2a, 0x6e, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x95, 0x39, 0xa3, 0x82, 0x03, 0x02,
+	0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_all.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_all.proto
new file mode 100644
index 00000000..582d722e
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imports/test_import_all.proto
@@ -0,0 +1,58 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2018 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package test;
+
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/imports";
+
+// test_a_1/m*.proto are in the same Go package and proto package.
+// test_a_*/*.proto are in different Go packages, but the same proto package.
+// test_b_1/*.proto are in the same Go package, but different proto packages.
+// fmt/m.proto has a package name which conflicts with "fmt".
+import "imports/test_a_1/m1.proto";
+import "imports/test_a_1/m2.proto";
+import "imports/test_a_2/m3.proto";
+import "imports/test_a_2/m4.proto";
+import "imports/test_b_1/m1.proto";
+import "imports/test_b_1/m2.proto";
+import "imports/fmt/m.proto";
+
+message All {
+  test.a.M1 am1 = 1;
+  test.a.M2 am2 = 2;
+  test.a.M3 am3 = 3;
+  test.a.M4 am4 = 4;
+  test.b.part1.M1 bm1 = 5;
+  test.b.part2.M2 bm2 = 6;
+  fmt.M fmt = 7;
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go
index f9b5ccf2..7ec1f2db 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go
@@ -36,11 +36,13 @@ package testdata
 import (
 	"testing"
 
-	mytestpb "./my_test"
+	importspb "github.com/golang/protobuf/protoc-gen-go/testdata/imports"
 	multipb "github.com/golang/protobuf/protoc-gen-go/testdata/multi"
+	mytestpb "github.com/golang/protobuf/protoc-gen-go/testdata/my_test"
 )
 
 func TestLink(t *testing.T) {
 	_ = &multipb.Multi1{}
 	_ = &mytestpb.Request{}
+	_ = &importspb.All{}
 }
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.pb.go
new file mode 100644
index 00000000..da0fdf8f
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.pb.go
@@ -0,0 +1,96 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: multi/multi1.proto
+
+package multitest // import "github.com/golang/protobuf/protoc-gen-go/testdata/multi"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type Multi1 struct {
+	Multi2               *Multi2         `protobuf:"bytes,1,req,name=multi2" json:"multi2,omitempty"`
+	Color                *Multi2_Color   `protobuf:"varint,2,opt,name=color,enum=multitest.Multi2_Color" json:"color,omitempty"`
+	HatType              *Multi3_HatType `protobuf:"varint,3,opt,name=hat_type,json=hatType,enum=multitest.Multi3_HatType" json:"hat_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Multi1) Reset()         { *m = Multi1{} }
+func (m *Multi1) String() string { return proto.CompactTextString(m) }
+func (*Multi1) ProtoMessage()    {}
+func (*Multi1) Descriptor() ([]byte, []int) {
+	return fileDescriptor_multi1_08e50c6822e808b8, []int{0}
+}
+func (m *Multi1) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Multi1.Unmarshal(m, b)
+}
+func (m *Multi1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Multi1.Marshal(b, m, deterministic)
+}
+func (dst *Multi1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Multi1.Merge(dst, src)
+}
+func (m *Multi1) XXX_Size() int {
+	return xxx_messageInfo_Multi1.Size(m)
+}
+func (m *Multi1) XXX_DiscardUnknown() {
+	xxx_messageInfo_Multi1.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Multi1 proto.InternalMessageInfo
+
+func (m *Multi1) GetMulti2() *Multi2 {
+	if m != nil {
+		return m.Multi2
+	}
+	return nil
+}
+
+func (m *Multi1) GetColor() Multi2_Color {
+	if m != nil && m.Color != nil {
+		return *m.Color
+	}
+	return Multi2_BLUE
+}
+
+func (m *Multi1) GetHatType() Multi3_HatType {
+	if m != nil && m.HatType != nil {
+		return *m.HatType
+	}
+	return Multi3_FEDORA
+}
+
+func init() {
+	proto.RegisterType((*Multi1)(nil), "multitest.Multi1")
+}
+
+func init() { proto.RegisterFile("multi/multi1.proto", fileDescriptor_multi1_08e50c6822e808b8) }
+
+var fileDescriptor_multi1_08e50c6822e808b8 = []byte{
+	// 200 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xca, 0x2d, 0xcd, 0x29,
+	0xc9, 0xd4, 0x07, 0x93, 0x86, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x9c, 0x60, 0x5e, 0x49,
+	0x6a, 0x71, 0x89, 0x14, 0xb2, 0xb4, 0x11, 0x44, 0x1a, 0x45, 0xcc, 0x18, 0x22, 0xa6, 0x34, 0x83,
+	0x91, 0x8b, 0xcd, 0x17, 0x6c, 0x86, 0x90, 0x26, 0x17, 0x1b, 0x44, 0xb9, 0x04, 0xa3, 0x02, 0x93,
+	0x06, 0xb7, 0x91, 0xa0, 0x1e, 0xdc, 0x38, 0x3d, 0xb0, 0x12, 0xa3, 0x20, 0xa8, 0x02, 0x21, 0x5d,
+	0x2e, 0xd6, 0xe4, 0xfc, 0x9c, 0xfc, 0x22, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x3e, 0x23, 0x71, 0x0c,
+	0x95, 0x7a, 0xce, 0x20, 0xe9, 0x20, 0x88, 0x2a, 0x21, 0x13, 0x2e, 0x8e, 0x8c, 0xc4, 0x92, 0xf8,
+	0x92, 0xca, 0x82, 0x54, 0x09, 0x66, 0xb0, 0x0e, 0x49, 0x74, 0x1d, 0xc6, 0x7a, 0x1e, 0x89, 0x25,
+	0x21, 0x95, 0x05, 0xa9, 0x41, 0xec, 0x19, 0x10, 0x86, 0x93, 0x73, 0x94, 0x63, 0x7a, 0x66, 0x49,
+	0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x4e, 0x62, 0x5e, 0xba, 0x3e, 0xd8,
+	0xd5, 0x49, 0xa5, 0x69, 0x10, 0x46, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a, 0xbe, 0x3e, 0xc8,
+	0xa0, 0x94, 0xc4, 0x92, 0x44, 0x88, 0xe7, 0xac, 0xe1, 0x86, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff,
+	0x60, 0x7d, 0xfc, 0x9f, 0x27, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto
index 0da6e0af..d3a32041 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto
@@ -36,6 +36,8 @@ import "multi/multi3.proto";
 
 package multitest;
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/multi;multitest";
+
 message Multi1 {
   required Multi2 multi2 = 1;
   optional Multi2.Color color = 2;
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.pb.go
new file mode 100644
index 00000000..b66ce793
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.pb.go
@@ -0,0 +1,128 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: multi/multi2.proto
+
+package multitest // import "github.com/golang/protobuf/protoc-gen-go/testdata/multi"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type Multi2_Color int32
+
+const (
+	Multi2_BLUE  Multi2_Color = 1
+	Multi2_GREEN Multi2_Color = 2
+	Multi2_RED   Multi2_Color = 3
+)
+
+var Multi2_Color_name = map[int32]string{
+	1: "BLUE",
+	2: "GREEN",
+	3: "RED",
+}
+var Multi2_Color_value = map[string]int32{
+	"BLUE":  1,
+	"GREEN": 2,
+	"RED":   3,
+}
+
+func (x Multi2_Color) Enum() *Multi2_Color {
+	p := new(Multi2_Color)
+	*p = x
+	return p
+}
+func (x Multi2_Color) String() string {
+	return proto.EnumName(Multi2_Color_name, int32(x))
+}
+func (x *Multi2_Color) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Multi2_Color_value, data, "Multi2_Color")
+	if err != nil {
+		return err
+	}
+	*x = Multi2_Color(value)
+	return nil
+}
+func (Multi2_Color) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_multi2_c47490ad66d93e67, []int{0, 0}
+}
+
+type Multi2 struct {
+	RequiredValue        *int32        `protobuf:"varint,1,req,name=required_value,json=requiredValue" json:"required_value,omitempty"`
+	Color                *Multi2_Color `protobuf:"varint,2,opt,name=color,enum=multitest.Multi2_Color" json:"color,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *Multi2) Reset()         { *m = Multi2{} }
+func (m *Multi2) String() string { return proto.CompactTextString(m) }
+func (*Multi2) ProtoMessage()    {}
+func (*Multi2) Descriptor() ([]byte, []int) {
+	return fileDescriptor_multi2_c47490ad66d93e67, []int{0}
+}
+func (m *Multi2) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Multi2.Unmarshal(m, b)
+}
+func (m *Multi2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Multi2.Marshal(b, m, deterministic)
+}
+func (dst *Multi2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Multi2.Merge(dst, src)
+}
+func (m *Multi2) XXX_Size() int {
+	return xxx_messageInfo_Multi2.Size(m)
+}
+func (m *Multi2) XXX_DiscardUnknown() {
+	xxx_messageInfo_Multi2.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Multi2 proto.InternalMessageInfo
+
+func (m *Multi2) GetRequiredValue() int32 {
+	if m != nil && m.RequiredValue != nil {
+		return *m.RequiredValue
+	}
+	return 0
+}
+
+func (m *Multi2) GetColor() Multi2_Color {
+	if m != nil && m.Color != nil {
+		return *m.Color
+	}
+	return Multi2_BLUE
+}
+
+func init() {
+	proto.RegisterType((*Multi2)(nil), "multitest.Multi2")
+	proto.RegisterEnum("multitest.Multi2_Color", Multi2_Color_name, Multi2_Color_value)
+}
+
+func init() { proto.RegisterFile("multi/multi2.proto", fileDescriptor_multi2_c47490ad66d93e67) }
+
+var fileDescriptor_multi2_c47490ad66d93e67 = []byte{
+	// 202 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xca, 0x2d, 0xcd, 0x29,
+	0xc9, 0xd4, 0x07, 0x93, 0x46, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x9c, 0x60, 0x5e, 0x49,
+	0x6a, 0x71, 0x89, 0x52, 0x2b, 0x23, 0x17, 0x9b, 0x2f, 0x58, 0x4e, 0x48, 0x95, 0x8b, 0xaf, 0x28,
+	0xb5, 0xb0, 0x34, 0xb3, 0x28, 0x35, 0x25, 0xbe, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x51, 0x81,
+	0x49, 0x83, 0x35, 0x88, 0x17, 0x26, 0x1a, 0x06, 0x12, 0x14, 0xd2, 0xe5, 0x62, 0x4d, 0xce, 0xcf,
+	0xc9, 0x2f, 0x92, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x33, 0x12, 0xd7, 0x83, 0x1b, 0xa6, 0x07, 0x31,
+	0x48, 0xcf, 0x19, 0x24, 0x1d, 0x04, 0x51, 0xa5, 0xa4, 0xca, 0xc5, 0x0a, 0xe6, 0x0b, 0x71, 0x70,
+	0xb1, 0x38, 0xf9, 0x84, 0xba, 0x0a, 0x30, 0x0a, 0x71, 0x72, 0xb1, 0xba, 0x07, 0xb9, 0xba, 0xfa,
+	0x09, 0x30, 0x09, 0xb1, 0x73, 0x31, 0x07, 0xb9, 0xba, 0x08, 0x30, 0x3b, 0x39, 0x47, 0x39, 0xa6,
+	0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5,
+	0xeb, 0x83, 0x5d, 0x9b, 0x54, 0x9a, 0x06, 0x61, 0x24, 0xeb, 0xa6, 0xa7, 0xe6, 0xe9, 0xa6, 0xe7,
+	0xeb, 0x83, 0xec, 0x4a, 0x49, 0x2c, 0x49, 0x84, 0x78, 0xca, 0x1a, 0x6e, 0x3f, 0x20, 0x00, 0x00,
+	0xff, 0xff, 0x49, 0x3b, 0x52, 0x44, 0xec, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto
index e6bfc71b..ec5b431e 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto
@@ -33,6 +33,8 @@ syntax = "proto2";
 
 package multitest;
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/multi;multitest";
+
 message Multi2 {
   required int32 required_value = 1;
 
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.pb.go
new file mode 100644
index 00000000..f03c350a
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.pb.go
@@ -0,0 +1,115 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: multi/multi3.proto
+
+package multitest // import "github.com/golang/protobuf/protoc-gen-go/testdata/multi"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type Multi3_HatType int32
+
+const (
+	Multi3_FEDORA Multi3_HatType = 1
+	Multi3_FEZ    Multi3_HatType = 2
+)
+
+var Multi3_HatType_name = map[int32]string{
+	1: "FEDORA",
+	2: "FEZ",
+}
+var Multi3_HatType_value = map[string]int32{
+	"FEDORA": 1,
+	"FEZ":    2,
+}
+
+func (x Multi3_HatType) Enum() *Multi3_HatType {
+	p := new(Multi3_HatType)
+	*p = x
+	return p
+}
+func (x Multi3_HatType) String() string {
+	return proto.EnumName(Multi3_HatType_name, int32(x))
+}
+func (x *Multi3_HatType) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Multi3_HatType_value, data, "Multi3_HatType")
+	if err != nil {
+		return err
+	}
+	*x = Multi3_HatType(value)
+	return nil
+}
+func (Multi3_HatType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_multi3_d55a72b4628b7875, []int{0, 0}
+}
+
+type Multi3 struct {
+	HatType              *Multi3_HatType `protobuf:"varint,1,opt,name=hat_type,json=hatType,enum=multitest.Multi3_HatType" json:"hat_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Multi3) Reset()         { *m = Multi3{} }
+func (m *Multi3) String() string { return proto.CompactTextString(m) }
+func (*Multi3) ProtoMessage()    {}
+func (*Multi3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_multi3_d55a72b4628b7875, []int{0}
+}
+func (m *Multi3) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Multi3.Unmarshal(m, b)
+}
+func (m *Multi3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Multi3.Marshal(b, m, deterministic)
+}
+func (dst *Multi3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Multi3.Merge(dst, src)
+}
+func (m *Multi3) XXX_Size() int {
+	return xxx_messageInfo_Multi3.Size(m)
+}
+func (m *Multi3) XXX_DiscardUnknown() {
+	xxx_messageInfo_Multi3.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Multi3 proto.InternalMessageInfo
+
+func (m *Multi3) GetHatType() Multi3_HatType {
+	if m != nil && m.HatType != nil {
+		return *m.HatType
+	}
+	return Multi3_FEDORA
+}
+
+func init() {
+	proto.RegisterType((*Multi3)(nil), "multitest.Multi3")
+	proto.RegisterEnum("multitest.Multi3_HatType", Multi3_HatType_name, Multi3_HatType_value)
+}
+
+func init() { proto.RegisterFile("multi/multi3.proto", fileDescriptor_multi3_d55a72b4628b7875) }
+
+var fileDescriptor_multi3_d55a72b4628b7875 = []byte{
+	// 170 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xca, 0x2d, 0xcd, 0x29,
+	0xc9, 0xd4, 0x07, 0x93, 0xc6, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x9c, 0x60, 0x5e, 0x49,
+	0x6a, 0x71, 0x89, 0x52, 0x1c, 0x17, 0x9b, 0x2f, 0x58, 0x4a, 0xc8, 0x84, 0x8b, 0x23, 0x23, 0xb1,
+	0x24, 0xbe, 0xa4, 0xb2, 0x20, 0x55, 0x82, 0x51, 0x81, 0x51, 0x83, 0xcf, 0x48, 0x52, 0x0f, 0xae,
+	0x4e, 0x0f, 0xa2, 0x48, 0xcf, 0x23, 0xb1, 0x24, 0xa4, 0xb2, 0x20, 0x35, 0x88, 0x3d, 0x03, 0xc2,
+	0x50, 0x92, 0xe3, 0x62, 0x87, 0x8a, 0x09, 0x71, 0x71, 0xb1, 0xb9, 0xb9, 0xba, 0xf8, 0x07, 0x39,
+	0x0a, 0x30, 0x0a, 0xb1, 0x73, 0x31, 0xbb, 0xb9, 0x46, 0x09, 0x30, 0x39, 0x39, 0x47, 0x39, 0xa6,
+	0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5,
+	0xeb, 0x83, 0x5d, 0x91, 0x54, 0x9a, 0x06, 0x61, 0x24, 0xeb, 0xa6, 0xa7, 0xe6, 0xe9, 0xa6, 0xe7,
+	0xeb, 0x83, 0x2c, 0x4a, 0x49, 0x2c, 0x49, 0x84, 0x38, 0xd6, 0x1a, 0x6e, 0x39, 0x20, 0x00, 0x00,
+	0xff, 0xff, 0xd5, 0xa4, 0x1a, 0x0e, 0xc4, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto
index 146c255b..8690b881 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto
@@ -33,6 +33,8 @@ syntax = "proto2";
 
 package multitest;
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/multi;multitest";
+
 message Multi3 {
   enum HatType {
     FEDORA = 1;
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go
index 1954e3fb..8cf6a698 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go
@@ -1,24 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: my_test/test.proto
 
-/*
-Package my_test is a generated protocol buffer package.
+package test // import "github.com/golang/protobuf/protoc-gen-go/testdata/my_test"
 
+/*
 This package holds interesting messages.
-
-It is generated from these files:
-	my_test/test.proto
-
-It has these top-level messages:
-	Request
-	Reply
-	OtherBase
-	ReplyExtensions
-	OtherReplyExtensions
-	OldReply
-	Communique
 */
-package my_test
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -69,6 +56,9 @@ func (x *HatType) UnmarshalJSON(data []byte) error {
 	*x = HatType(value)
 	return nil
 }
+func (HatType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{0}
+}
 
 // This enum represents days of the week.
 type Days int32
@@ -106,6 +96,9 @@ func (x *Days) UnmarshalJSON(data []byte) error {
 	*x = Days(value)
 	return nil
 }
+func (Days) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{1}
+}
 
 type Request_Color int32
 
@@ -142,6 +135,9 @@ func (x *Request_Color) UnmarshalJSON(data []byte) error {
 	*x = Request_Color(value)
 	return nil
 }
+func (Request_Color) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{0, 0}
+}
 
 type Reply_Entry_Game int32
 
@@ -175,6 +171,9 @@ func (x *Reply_Entry_Game) UnmarshalJSON(data []byte) error {
 	*x = Reply_Entry_Game(value)
 	return nil
 }
+func (Reply_Entry_Game) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{1, 0, 0}
+}
 
 // This is a message that might be sent somewhere.
 type Request struct {
@@ -191,13 +190,35 @@ type Request struct {
 	MsgMapping map[int64]*Reply `protobuf:"bytes,15,rep,name=msg_mapping,json=msgMapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	Reset_     *int32           `protobuf:"varint,12,opt,name=reset" json:"reset,omitempty"`
 	// This field should not conflict with any getters.
-	GetKey_          *string `protobuf:"bytes,16,opt,name=get_key,json=getKey" json:"get_key,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	GetKey_              *string  `protobuf:"bytes,16,opt,name=get_key,json=getKey" json:"get_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Request) Reset()         { *m = Request{} }
 func (m *Request) String() string { return proto.CompactTextString(m) }
 func (*Request) ProtoMessage()    {}
+func (*Request) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{0}
+}
+func (m *Request) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Request.Unmarshal(m, b)
+}
+func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Request.Marshal(b, m, deterministic)
+}
+func (dst *Request) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Request.Merge(dst, src)
+}
+func (m *Request) XXX_Size() int {
+	return xxx_messageInfo_Request.Size(m)
+}
+func (m *Request) XXX_DiscardUnknown() {
+	xxx_messageInfo_Request.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Request proto.InternalMessageInfo
 
 const Default_Request_Hat HatType = HatType_FEDORA
 
@@ -267,13 +288,35 @@ func (m *Request) GetGetKey_() string {
 }
 
 type Request_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field,json=groupField" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	GroupField           *int32   `protobuf:"varint,9,opt,name=group_field,json=groupField" json:"group_field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Request_SomeGroup) Reset()         { *m = Request_SomeGroup{} }
 func (m *Request_SomeGroup) String() string { return proto.CompactTextString(m) }
 func (*Request_SomeGroup) ProtoMessage()    {}
+func (*Request_SomeGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{0, 0}
+}
+func (m *Request_SomeGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Request_SomeGroup.Unmarshal(m, b)
+}
+func (m *Request_SomeGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Request_SomeGroup.Marshal(b, m, deterministic)
+}
+func (dst *Request_SomeGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Request_SomeGroup.Merge(dst, src)
+}
+func (m *Request_SomeGroup) XXX_Size() int {
+	return xxx_messageInfo_Request_SomeGroup.Size(m)
+}
+func (m *Request_SomeGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_Request_SomeGroup.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Request_SomeGroup proto.InternalMessageInfo
 
 func (m *Request_SomeGroup) GetGroupField() int32 {
 	if m != nil && m.GroupField != nil {
@@ -285,21 +328,43 @@ func (m *Request_SomeGroup) GetGroupField() int32 {
 type Reply struct {
 	Found                        []*Reply_Entry `protobuf:"bytes,1,rep,name=found" json:"found,omitempty"`
 	CompactKeys                  []int32        `protobuf:"varint,2,rep,packed,name=compact_keys,json=compactKeys" json:"compact_keys,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{}       `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
 func (m *Reply) Reset()         { *m = Reply{} }
 func (m *Reply) String() string { return proto.CompactTextString(m) }
 func (*Reply) ProtoMessage()    {}
+func (*Reply) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{1}
+}
 
 var extRange_Reply = []proto.ExtensionRange{
-	{100, 536870911},
+	{Start: 100, End: 536870911},
 }
 
 func (*Reply) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_Reply
 }
+func (m *Reply) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Reply.Unmarshal(m, b)
+}
+func (m *Reply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Reply.Marshal(b, m, deterministic)
+}
+func (dst *Reply) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Reply.Merge(dst, src)
+}
+func (m *Reply) XXX_Size() int {
+	return xxx_messageInfo_Reply.Size(m)
+}
+func (m *Reply) XXX_DiscardUnknown() {
+	xxx_messageInfo_Reply.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Reply proto.InternalMessageInfo
 
 func (m *Reply) GetFound() []*Reply_Entry {
 	if m != nil {
@@ -316,15 +381,37 @@ func (m *Reply) GetCompactKeys() []int32 {
 }
 
 type Reply_Entry struct {
-	KeyThatNeeds_1234Camel_CasIng *int64 `protobuf:"varint,1,req,name=key_that_needs_1234camel_CasIng,json=keyThatNeeds1234camelCasIng" json:"key_that_needs_1234camel_CasIng,omitempty"`
-	Value                         *int64 `protobuf:"varint,2,opt,name=value,def=7" json:"value,omitempty"`
-	XMyFieldName_2                *int64 `protobuf:"varint,3,opt,name=_my_field_name_2,json=MyFieldName2" json:"_my_field_name_2,omitempty"`
-	XXX_unrecognized              []byte `json:"-"`
+	KeyThatNeeds_1234Camel_CasIng *int64   `protobuf:"varint,1,req,name=key_that_needs_1234camel_CasIng,json=keyThatNeeds1234camelCasIng" json:"key_that_needs_1234camel_CasIng,omitempty"`
+	Value                         *int64   `protobuf:"varint,2,opt,name=value,def=7" json:"value,omitempty"`
+	XMyFieldName_2                *int64   `protobuf:"varint,3,opt,name=_my_field_name_2,json=MyFieldName2" json:"_my_field_name_2,omitempty"`
+	XXX_NoUnkeyedLiteral          struct{} `json:"-"`
+	XXX_unrecognized              []byte   `json:"-"`
+	XXX_sizecache                 int32    `json:"-"`
 }
 
 func (m *Reply_Entry) Reset()         { *m = Reply_Entry{} }
 func (m *Reply_Entry) String() string { return proto.CompactTextString(m) }
 func (*Reply_Entry) ProtoMessage()    {}
+func (*Reply_Entry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{1, 0}
+}
+func (m *Reply_Entry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Reply_Entry.Unmarshal(m, b)
+}
+func (m *Reply_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Reply_Entry.Marshal(b, m, deterministic)
+}
+func (dst *Reply_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Reply_Entry.Merge(dst, src)
+}
+func (m *Reply_Entry) XXX_Size() int {
+	return xxx_messageInfo_Reply_Entry.Size(m)
+}
+func (m *Reply_Entry) XXX_DiscardUnknown() {
+	xxx_messageInfo_Reply_Entry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Reply_Entry proto.InternalMessageInfo
 
 const Default_Reply_Entry_Value int64 = 7
 
@@ -350,22 +437,44 @@ func (m *Reply_Entry) GetXMyFieldName_2() int64 {
 }
 
 type OtherBase struct {
-	Name                         *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                         *string  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
 func (m *OtherBase) Reset()         { *m = OtherBase{} }
 func (m *OtherBase) String() string { return proto.CompactTextString(m) }
 func (*OtherBase) ProtoMessage()    {}
+func (*OtherBase) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{2}
+}
 
 var extRange_OtherBase = []proto.ExtensionRange{
-	{100, 536870911},
+	{Start: 100, End: 536870911},
 }
 
 func (*OtherBase) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_OtherBase
 }
+func (m *OtherBase) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OtherBase.Unmarshal(m, b)
+}
+func (m *OtherBase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OtherBase.Marshal(b, m, deterministic)
+}
+func (dst *OtherBase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OtherBase.Merge(dst, src)
+}
+func (m *OtherBase) XXX_Size() int {
+	return xxx_messageInfo_OtherBase.Size(m)
+}
+func (m *OtherBase) XXX_DiscardUnknown() {
+	xxx_messageInfo_OtherBase.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OtherBase proto.InternalMessageInfo
 
 func (m *OtherBase) GetName() string {
 	if m != nil && m.Name != nil {
@@ -375,12 +484,34 @@ func (m *OtherBase) GetName() string {
 }
 
 type ReplyExtensions struct {
-	XXX_unrecognized []byte `json:"-"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ReplyExtensions) Reset()         { *m = ReplyExtensions{} }
 func (m *ReplyExtensions) String() string { return proto.CompactTextString(m) }
 func (*ReplyExtensions) ProtoMessage()    {}
+func (*ReplyExtensions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{3}
+}
+func (m *ReplyExtensions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReplyExtensions.Unmarshal(m, b)
+}
+func (m *ReplyExtensions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReplyExtensions.Marshal(b, m, deterministic)
+}
+func (dst *ReplyExtensions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplyExtensions.Merge(dst, src)
+}
+func (m *ReplyExtensions) XXX_Size() int {
+	return xxx_messageInfo_ReplyExtensions.Size(m)
+}
+func (m *ReplyExtensions) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReplyExtensions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReplyExtensions proto.InternalMessageInfo
 
 var E_ReplyExtensions_Time = &proto.ExtensionDesc{
 	ExtendedType:  (*Reply)(nil),
@@ -410,13 +541,35 @@ var E_ReplyExtensions_Donut = &proto.ExtensionDesc{
 }
 
 type OtherReplyExtensions struct {
-	Key              *int32 `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	Key                  *int32   `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *OtherReplyExtensions) Reset()         { *m = OtherReplyExtensions{} }
 func (m *OtherReplyExtensions) String() string { return proto.CompactTextString(m) }
 func (*OtherReplyExtensions) ProtoMessage()    {}
+func (*OtherReplyExtensions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{4}
+}
+func (m *OtherReplyExtensions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OtherReplyExtensions.Unmarshal(m, b)
+}
+func (m *OtherReplyExtensions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OtherReplyExtensions.Marshal(b, m, deterministic)
+}
+func (dst *OtherReplyExtensions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OtherReplyExtensions.Merge(dst, src)
+}
+func (m *OtherReplyExtensions) XXX_Size() int {
+	return xxx_messageInfo_OtherReplyExtensions.Size(m)
+}
+func (m *OtherReplyExtensions) XXX_DiscardUnknown() {
+	xxx_messageInfo_OtherReplyExtensions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OtherReplyExtensions proto.InternalMessageInfo
 
 func (m *OtherReplyExtensions) GetKey() int32 {
 	if m != nil && m.Key != nil {
@@ -426,20 +579,19 @@ func (m *OtherReplyExtensions) GetKey() int32 {
 }
 
 type OldReply struct {
-	proto.XXX_InternalExtensions `json:"-"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	proto.XXX_InternalExtensions `protobuf_messageset:"1" json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
 func (m *OldReply) Reset()         { *m = OldReply{} }
 func (m *OldReply) String() string { return proto.CompactTextString(m) }
 func (*OldReply) ProtoMessage()    {}
-
-func (m *OldReply) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(&m.XXX_InternalExtensions)
-}
-func (m *OldReply) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)
+func (*OldReply) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{5}
 }
+
 func (m *OldReply) MarshalJSON() ([]byte, error) {
 	return proto.MarshalMessageSetJSON(&m.XXX_InternalExtensions)
 }
@@ -447,17 +599,30 @@ func (m *OldReply) UnmarshalJSON(buf []byte) error {
 	return proto.UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)
 }
 
-// ensure OldReply satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*OldReply)(nil)
-var _ proto.Unmarshaler = (*OldReply)(nil)
-
 var extRange_OldReply = []proto.ExtensionRange{
-	{100, 2147483646},
+	{Start: 100, End: 2147483646},
 }
 
 func (*OldReply) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_OldReply
 }
+func (m *OldReply) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OldReply.Unmarshal(m, b)
+}
+func (m *OldReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OldReply.Marshal(b, m, deterministic)
+}
+func (dst *OldReply) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OldReply.Merge(dst, src)
+}
+func (m *OldReply) XXX_Size() int {
+	return xxx_messageInfo_OldReply.Size(m)
+}
+func (m *OldReply) XXX_DiscardUnknown() {
+	xxx_messageInfo_OldReply.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OldReply proto.InternalMessageInfo
 
 type Communique struct {
 	MakeMeCry *bool `protobuf:"varint,1,opt,name=make_me_cry,json=makeMeCry" json:"make_me_cry,omitempty"`
@@ -474,13 +639,35 @@ type Communique struct {
 	//	*Communique_Delta_
 	//	*Communique_Msg
 	//	*Communique_Somegroup
-	Union            isCommunique_Union `protobuf_oneof:"union"`
-	XXX_unrecognized []byte             `json:"-"`
+	Union                isCommunique_Union `protobuf_oneof:"union"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
 func (m *Communique) Reset()         { *m = Communique{} }
 func (m *Communique) String() string { return proto.CompactTextString(m) }
 func (*Communique) ProtoMessage()    {}
+func (*Communique) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{6}
+}
+func (m *Communique) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Communique.Unmarshal(m, b)
+}
+func (m *Communique) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Communique.Marshal(b, m, deterministic)
+}
+func (dst *Communique) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Communique.Merge(dst, src)
+}
+func (m *Communique) XXX_Size() int {
+	return xxx_messageInfo_Communique.Size(m)
+}
+func (m *Communique) XXX_DiscardUnknown() {
+	xxx_messageInfo_Communique.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Communique proto.InternalMessageInfo
 
 type isCommunique_Union interface {
 	isCommunique_Union()
@@ -511,7 +698,7 @@ type Communique_Delta_ struct {
 	Delta int32 `protobuf:"zigzag32,12,opt,name=delta,oneof"`
 }
 type Communique_Msg struct {
-	Msg *Reply `protobuf:"bytes,13,opt,name=msg,oneof"`
+	Msg *Reply `protobuf:"bytes,16,opt,name=msg,oneof"`
 }
 type Communique_Somegroup struct {
 	Somegroup *Communique_SomeGroup `protobuf:"group,14,opt,name=SomeGroup,json=somegroup,oneof"`
@@ -661,7 +848,7 @@ func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 		b.EncodeVarint(12<<3 | proto.WireVarint)
 		b.EncodeZigzag32(uint64(x.Delta))
 	case *Communique_Msg:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
+		b.EncodeVarint(16<<3 | proto.WireBytes)
 		if err := b.EncodeMessage(x.Msg); err != nil {
 			return err
 		}
@@ -737,7 +924,7 @@ func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buf
 		x, err := b.DecodeZigzag32()
 		m.Union = &Communique_Delta_{int32(x)}
 		return true, err
-	case 13: // union.msg
+	case 16: // union.msg
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
@@ -763,40 +950,40 @@ func _Communique_OneofSizer(msg proto.Message) (n int) {
 	// union
 	switch x := m.Union.(type) {
 	case *Communique_Number:
-		n += proto.SizeVarint(5<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.Number))
 	case *Communique_Name:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Name)))
 		n += len(x.Name)
 	case *Communique_Data:
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Data)))
 		n += len(x.Data)
 	case *Communique_TempC:
-		n += proto.SizeVarint(8<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *Communique_Height:
-		n += proto.SizeVarint(9<<3 | proto.WireFixed32)
+		n += 1 // tag and wire
 		n += 4
 	case *Communique_Today:
-		n += proto.SizeVarint(10<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.Today))
 	case *Communique_Maybe:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *Communique_Delta_:
-		n += proto.SizeVarint(12<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64((uint32(x.Delta) << 1) ^ uint32((int32(x.Delta) >> 31))))
 	case *Communique_Msg:
 		s := proto.Size(x.Msg)
-		n += proto.SizeVarint(13<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Communique_Somegroup:
-		n += proto.SizeVarint(14<<3 | proto.WireStartGroup)
+		n += 1 // tag and wire
 		n += proto.Size(x.Somegroup)
-		n += proto.SizeVarint(14<<3 | proto.WireEndGroup)
+		n += 1 // tag and wire
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -805,13 +992,35 @@ func _Communique_OneofSizer(msg proto.Message) (n int) {
 }
 
 type Communique_SomeGroup struct {
-	Member           *string `protobuf:"bytes,15,opt,name=member" json:"member,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	Member               *string  `protobuf:"bytes,15,opt,name=member" json:"member,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Communique_SomeGroup) Reset()         { *m = Communique_SomeGroup{} }
 func (m *Communique_SomeGroup) String() string { return proto.CompactTextString(m) }
 func (*Communique_SomeGroup) ProtoMessage()    {}
+func (*Communique_SomeGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{6, 0}
+}
+func (m *Communique_SomeGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Communique_SomeGroup.Unmarshal(m, b)
+}
+func (m *Communique_SomeGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Communique_SomeGroup.Marshal(b, m, deterministic)
+}
+func (dst *Communique_SomeGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Communique_SomeGroup.Merge(dst, src)
+}
+func (m *Communique_SomeGroup) XXX_Size() int {
+	return xxx_messageInfo_Communique_SomeGroup.Size(m)
+}
+func (m *Communique_SomeGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_Communique_SomeGroup.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Communique_SomeGroup proto.InternalMessageInfo
 
 func (m *Communique_SomeGroup) GetMember() string {
 	if m != nil && m.Member != nil {
@@ -821,12 +1030,34 @@ func (m *Communique_SomeGroup) GetMember() string {
 }
 
 type Communique_Delta struct {
-	XXX_unrecognized []byte `json:"-"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Communique_Delta) Reset()         { *m = Communique_Delta{} }
 func (m *Communique_Delta) String() string { return proto.CompactTextString(m) }
 func (*Communique_Delta) ProtoMessage()    {}
+func (*Communique_Delta) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_2309d445eee26af7, []int{6, 1}
+}
+func (m *Communique_Delta) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Communique_Delta.Unmarshal(m, b)
+}
+func (m *Communique_Delta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Communique_Delta.Marshal(b, m, deterministic)
+}
+func (dst *Communique_Delta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Communique_Delta.Merge(dst, src)
+}
+func (m *Communique_Delta) XXX_Size() int {
+	return xxx_messageInfo_Communique_Delta.Size(m)
+}
+func (m *Communique_Delta) XXX_DiscardUnknown() {
+	xxx_messageInfo_Communique_Delta.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Communique_Delta proto.InternalMessageInfo
 
 var E_Tag = &proto.ExtensionDesc{
 	ExtendedType:  (*Reply)(nil),
@@ -848,6 +1079,8 @@ var E_Donut = &proto.ExtensionDesc{
 
 func init() {
 	proto.RegisterType((*Request)(nil), "my.test.Request")
+	proto.RegisterMapType((map[int64]*Reply)(nil), "my.test.Request.MsgMappingEntry")
+	proto.RegisterMapType((map[int32]string)(nil), "my.test.Request.NameMappingEntry")
 	proto.RegisterType((*Request_SomeGroup)(nil), "my.test.Request.SomeGroup")
 	proto.RegisterType((*Reply)(nil), "my.test.Reply")
 	proto.RegisterType((*Reply_Entry)(nil), "my.test.Reply.Entry")
@@ -868,3 +1101,74 @@ func init() {
 	proto.RegisterExtension(E_Tag)
 	proto.RegisterExtension(E_Donut)
 }
+
+func init() { proto.RegisterFile("my_test/test.proto", fileDescriptor_test_2309d445eee26af7) }
+
+var fileDescriptor_test_2309d445eee26af7 = []byte{
+	// 1033 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0xdd, 0x6e, 0xe3, 0x44,
+	0x14, 0xce, 0xd8, 0x71, 0x7e, 0x4e, 0x42, 0x6b, 0x46, 0x55, 0x6b, 0x05, 0xed, 0xd6, 0x04, 0x8a,
+	0x4c, 0xc5, 0xa6, 0xda, 0x80, 0xc4, 0x2a, 0x88, 0xd5, 0x36, 0x3f, 0x6d, 0xaa, 0x6d, 0x12, 0x69,
+	0xda, 0x5e, 0xb0, 0x37, 0xd6, 0x34, 0x9e, 0x3a, 0xa6, 0x19, 0x3b, 0x6b, 0x8f, 0x11, 0xbe, 0xeb,
+	0x53, 0xc0, 0x6b, 0x70, 0xcf, 0x0b, 0xf1, 0x16, 0x45, 0x33, 0x0e, 0x49, 0xda, 0xa0, 0xbd, 0xb1,
+	0x7c, 0xce, 0xf9, 0xce, 0xe7, 0x39, 0x3f, 0xfe, 0x06, 0x30, 0xcf, 0x5c, 0xc1, 0x12, 0x71, 0x22,
+	0x1f, 0xad, 0x45, 0x1c, 0x89, 0x08, 0x97, 0x79, 0xd6, 0x92, 0x66, 0x03, 0xf3, 0x74, 0x2e, 0x82,
+	0x13, 0xf5, 0x7c, 0x9d, 0x07, 0x9b, 0xff, 0x14, 0xa1, 0x4c, 0xd8, 0xc7, 0x94, 0x25, 0x02, 0x9b,
+	0xa0, 0xdf, 0xb3, 0xcc, 0x42, 0xb6, 0xee, 0xe8, 0x44, 0xbe, 0x62, 0x07, 0xf4, 0x59, 0xca, 0x2c,
+	0xdd, 0x46, 0xce, 0x4e, 0x7b, 0xbf, 0xb5, 0x24, 0x6a, 0x2d, 0x13, 0x5a, 0xbd, 0x68, 0x1e, 0xc5,
+	0x44, 0x42, 0xf0, 0x31, 0xe8, 0x33, 0x2a, 0xac, 0xa2, 0x42, 0x9a, 0x2b, 0xe4, 0x90, 0x8a, 0xeb,
+	0x6c, 0xc1, 0x3a, 0xa5, 0xb3, 0x41, 0x7f, 0x42, 0x4e, 0x89, 0x04, 0xe1, 0x43, 0xa8, 0x78, 0x8c,
+	0x7a, 0xf3, 0x20, 0x64, 0x56, 0xd9, 0x46, 0x8e, 0xd6, 0xd1, 0x83, 0xf0, 0x8e, 0xac, 0x9c, 0xf8,
+	0x0d, 0x54, 0x93, 0x88, 0x33, 0x3f, 0x8e, 0xd2, 0x85, 0x55, 0xb1, 0x91, 0x03, 0xed, 0xc6, 0xd6,
+	0xc7, 0xaf, 0x22, 0xce, 0xce, 0x25, 0x82, 0xac, 0xc1, 0xb8, 0x0f, 0xf5, 0x90, 0x72, 0xe6, 0x72,
+	0xba, 0x58, 0x04, 0xa1, 0x6f, 0xed, 0xd8, 0xba, 0x53, 0x6b, 0x7f, 0xb9, 0x95, 0x3c, 0xa6, 0x9c,
+	0x8d, 0x72, 0xcc, 0x20, 0x14, 0x71, 0x46, 0x6a, 0xe1, 0xda, 0x83, 0x4f, 0xa1, 0xc6, 0x13, 0x7f,
+	0x45, 0xb2, 0xab, 0x48, 0xec, 0x2d, 0x92, 0x51, 0xe2, 0x3f, 0xe1, 0x00, 0xbe, 0x72, 0xe0, 0x3d,
+	0x30, 0x62, 0x96, 0x30, 0x61, 0xd5, 0x6d, 0xe4, 0x18, 0x24, 0x37, 0xf0, 0x01, 0x94, 0x7d, 0x26,
+	0x5c, 0xd9, 0x65, 0xd3, 0x46, 0x4e, 0x95, 0x94, 0x7c, 0x26, 0xde, 0xb3, 0xac, 0xf1, 0x1d, 0x54,
+	0x57, 0xf5, 0xe0, 0x43, 0xa8, 0xa9, 0x6a, 0xdc, 0xbb, 0x80, 0xcd, 0x3d, 0xab, 0xaa, 0x18, 0x40,
+	0xb9, 0xce, 0xa4, 0xa7, 0xf1, 0x16, 0xcc, 0xe7, 0x05, 0xac, 0x87, 0x27, 0xc1, 0x6a, 0x78, 0x7b,
+	0x60, 0xfc, 0x46, 0xe7, 0x29, 0xb3, 0x34, 0xf5, 0xa9, 0xdc, 0xe8, 0x68, 0x6f, 0x50, 0x63, 0x04,
+	0xbb, 0xcf, 0xce, 0xbe, 0x99, 0x8e, 0xf3, 0xf4, 0xaf, 0x37, 0xd3, 0x6b, 0xed, 0x9d, 0x8d, 0xf2,
+	0x17, 0xf3, 0x6c, 0x83, 0xae, 0x79, 0x04, 0x86, 0xda, 0x04, 0x5c, 0x06, 0x9d, 0x0c, 0xfa, 0x66,
+	0x01, 0x57, 0xc1, 0x38, 0x27, 0x83, 0xc1, 0xd8, 0x44, 0xb8, 0x02, 0xc5, 0xee, 0xe5, 0xcd, 0xc0,
+	0xd4, 0x9a, 0x7f, 0x6a, 0x60, 0xa8, 0x5c, 0x7c, 0x0c, 0xc6, 0x5d, 0x94, 0x86, 0x9e, 0x5a, 0xb5,
+	0x5a, 0x7b, 0xef, 0x29, 0x75, 0x2b, 0xef, 0x66, 0x0e, 0xc1, 0x47, 0x50, 0x9f, 0x46, 0x7c, 0x41,
+	0xa7, 0xaa, 0x6d, 0x89, 0xa5, 0xd9, 0xba, 0x63, 0x74, 0x35, 0x13, 0x91, 0xda, 0xd2, 0xff, 0x9e,
+	0x65, 0x49, 0xe3, 0x2f, 0x04, 0x46, 0x5e, 0x49, 0x1f, 0x0e, 0xef, 0x59, 0xe6, 0x8a, 0x19, 0x15,
+	0x6e, 0xc8, 0x98, 0x97, 0xb8, 0xaf, 0xdb, 0xdf, 0xff, 0x30, 0xa5, 0x9c, 0xcd, 0xdd, 0x1e, 0x4d,
+	0x2e, 0x42, 0xdf, 0x42, 0xb6, 0xe6, 0xe8, 0xe4, 0x8b, 0x7b, 0x96, 0x5d, 0xcf, 0xa8, 0x18, 0x4b,
+	0xd0, 0x0a, 0x93, 0x43, 0xf0, 0xc1, 0x66, 0xf5, 0x7a, 0x07, 0xfd, 0xb8, 0x2c, 0x18, 0x7f, 0x03,
+	0xa6, 0xcb, 0xb3, 0x7c, 0x34, 0xae, 0xda, 0xb5, 0xb6, 0xfa, 0x3f, 0x74, 0x52, 0x1f, 0x65, 0x6a,
+	0x3c, 0x72, 0x34, 0xed, 0xa6, 0x0d, 0xc5, 0x73, 0xca, 0x19, 0xae, 0x43, 0xe5, 0x6c, 0x32, 0xb9,
+	0xee, 0x9e, 0x5e, 0x5e, 0x9a, 0x08, 0x03, 0x94, 0xae, 0x07, 0xe3, 0xf1, 0xc5, 0x95, 0xa9, 0x1d,
+	0x57, 0x2a, 0x9e, 0xf9, 0xf0, 0xf0, 0xf0, 0xa0, 0x35, 0xbf, 0x85, 0xea, 0x44, 0xcc, 0x58, 0xdc,
+	0xa5, 0x09, 0xc3, 0x18, 0x8a, 0x92, 0x56, 0x8d, 0xa2, 0x4a, 0xd4, 0xfb, 0x06, 0xf4, 0x6f, 0x04,
+	0xbb, 0xaa, 0x4b, 0x83, 0xdf, 0x05, 0x0b, 0x93, 0x20, 0x0a, 0x93, 0x76, 0x13, 0x8a, 0x22, 0xe0,
+	0x0c, 0x3f, 0x1b, 0x91, 0xc5, 0x6c, 0xe4, 0x20, 0xa2, 0x62, 0xed, 0x77, 0x50, 0x9a, 0xd2, 0x38,
+	0x8e, 0xc4, 0x16, 0x2a, 0x50, 0xe3, 0xb5, 0x9e, 0x7a, 0xd7, 0xec, 0x64, 0x99, 0xd7, 0xee, 0x82,
+	0xe1, 0x45, 0x61, 0x2a, 0x30, 0x5e, 0x41, 0x57, 0x87, 0x56, 0x9f, 0xfa, 0x14, 0x49, 0x9e, 0xda,
+	0x74, 0x60, 0x4f, 0xe5, 0x3c, 0x0b, 0x6f, 0x2f, 0x6f, 0xd3, 0x82, 0xca, 0x64, 0xee, 0x29, 0x9c,
+	0xaa, 0xfe, 0xf1, 0xf1, 0xf1, 0xb1, 0xdc, 0xd1, 0x2a, 0xa8, 0xf9, 0x87, 0x0e, 0xd0, 0x8b, 0x38,
+	0x4f, 0xc3, 0xe0, 0x63, 0xca, 0xf0, 0x4b, 0xa8, 0x71, 0x7a, 0xcf, 0x5c, 0xce, 0xdc, 0x69, 0x9c,
+	0x53, 0x54, 0x48, 0x55, 0xba, 0x46, 0xac, 0x17, 0x67, 0xd8, 0x82, 0x52, 0x98, 0xf2, 0x5b, 0x16,
+	0x5b, 0x86, 0x64, 0x1f, 0x16, 0xc8, 0xd2, 0xc6, 0x7b, 0xcb, 0x46, 0x97, 0x64, 0xa3, 0x87, 0x85,
+	0xbc, 0xd5, 0xd2, 0xeb, 0x51, 0x41, 0x95, 0x30, 0xd5, 0xa5, 0x57, 0x5a, 0xf8, 0x00, 0x4a, 0x82,
+	0xf1, 0x85, 0x3b, 0x55, 0x72, 0x84, 0x86, 0x05, 0x62, 0x48, 0xbb, 0x27, 0xe9, 0x67, 0x2c, 0xf0,
+	0x67, 0x42, 0xfd, 0xa6, 0x9a, 0xa4, 0xcf, 0x6d, 0x7c, 0x04, 0x86, 0x88, 0x3c, 0x9a, 0x59, 0xa0,
+	0x34, 0xf1, 0xb3, 0x55, 0x6f, 0xfa, 0x34, 0x4b, 0x14, 0x81, 0x8c, 0xe2, 0x7d, 0x30, 0x38, 0xcd,
+	0x6e, 0x99, 0x55, 0x93, 0x27, 0x97, 0x7e, 0x65, 0x4a, 0xbf, 0xc7, 0xe6, 0x82, 0x2a, 0x01, 0xf9,
+	0x5c, 0xfa, 0x95, 0x89, 0x9b, 0xa0, 0xf3, 0xc4, 0x57, 0xf2, 0xb1, 0xf5, 0x53, 0x0e, 0x0b, 0x44,
+	0x06, 0xf1, 0xcf, 0x9b, 0xfa, 0xb9, 0xa3, 0xf4, 0xf3, 0xc5, 0x0a, 0xb9, 0xee, 0xdd, 0x5a, 0x42,
+	0x87, 0x85, 0x0d, 0x11, 0x6d, 0x7c, 0xb5, 0x29, 0x46, 0xfb, 0x50, 0xe2, 0x4c, 0xf5, 0x6f, 0x37,
+	0x57, 0xac, 0xdc, 0x6a, 0x94, 0xc1, 0xe8, 0xcb, 0x03, 0x75, 0xcb, 0x60, 0xa4, 0x61, 0x10, 0x85,
+	0xc7, 0x2f, 0xa1, 0xbc, 0x94, 0x7b, 0xb9, 0xe6, 0xb9, 0xe0, 0x9b, 0x48, 0x8a, 0xc2, 0xd9, 0xe0,
+	0x83, 0xa9, 0x1d, 0xb7, 0xa0, 0x28, 0x4b, 0x97, 0xc1, 0xd1, 0x64, 0xdc, 0x3f, 0xfd, 0xc5, 0x44,
+	0xb8, 0x06, 0xe5, 0xeb, 0x9b, 0xc1, 0x95, 0x34, 0x34, 0xa9, 0x1a, 0x97, 0x37, 0xe3, 0xfe, 0x85,
+	0x89, 0x1a, 0x9a, 0x89, 0x3a, 0x36, 0xe8, 0x82, 0xfa, 0x5b, 0xfb, 0xea, 0xab, 0x63, 0xc8, 0x50,
+	0xa7, 0xf7, 0xdf, 0x4a, 0x3e, 0xc7, 0xfc, 0xaa, 0xba, 0xf3, 0xe2, 0xe9, 0xa2, 0xfe, 0xff, 0x4e,
+	0x76, 0xdf, 0x7d, 0x78, 0xeb, 0x07, 0x62, 0x96, 0xde, 0xb6, 0xa6, 0x11, 0x3f, 0xf1, 0xa3, 0x39,
+	0x0d, 0xfd, 0x13, 0x75, 0x39, 0xde, 0xa6, 0x77, 0xf9, 0xcb, 0xf4, 0x95, 0xcf, 0xc2, 0x57, 0x7e,
+	0xa4, 0x6e, 0x55, 0xb9, 0x0f, 0x27, 0xcb, 0x6b, 0xf6, 0x27, 0xf9, 0xf8, 0x37, 0x00, 0x00, 0xff,
+	0xff, 0x12, 0xd5, 0x46, 0x00, 0x75, 0x07, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden
deleted file mode 100644
index 1954e3fb..00000000
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden
+++ /dev/null
@@ -1,870 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: my_test/test.proto
-
-/*
-Package my_test is a generated protocol buffer package.
-
-This package holds interesting messages.
-
-It is generated from these files:
-	my_test/test.proto
-
-It has these top-level messages:
-	Request
-	Reply
-	OtherBase
-	ReplyExtensions
-	OtherReplyExtensions
-	OldReply
-	Communique
-*/
-package my_test
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/protoc-gen-go/testdata/multi"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-type HatType int32
-
-const (
-	// deliberately skipping 0
-	HatType_FEDORA HatType = 1
-	HatType_FEZ    HatType = 2
-)
-
-var HatType_name = map[int32]string{
-	1: "FEDORA",
-	2: "FEZ",
-}
-var HatType_value = map[string]int32{
-	"FEDORA": 1,
-	"FEZ":    2,
-}
-
-func (x HatType) Enum() *HatType {
-	p := new(HatType)
-	*p = x
-	return p
-}
-func (x HatType) String() string {
-	return proto.EnumName(HatType_name, int32(x))
-}
-func (x *HatType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(HatType_value, data, "HatType")
-	if err != nil {
-		return err
-	}
-	*x = HatType(value)
-	return nil
-}
-
-// This enum represents days of the week.
-type Days int32
-
-const (
-	Days_MONDAY  Days = 1
-	Days_TUESDAY Days = 2
-	Days_LUNDI   Days = 1
-)
-
-var Days_name = map[int32]string{
-	1: "MONDAY",
-	2: "TUESDAY",
-	// Duplicate value: 1: "LUNDI",
-}
-var Days_value = map[string]int32{
-	"MONDAY":  1,
-	"TUESDAY": 2,
-	"LUNDI":   1,
-}
-
-func (x Days) Enum() *Days {
-	p := new(Days)
-	*p = x
-	return p
-}
-func (x Days) String() string {
-	return proto.EnumName(Days_name, int32(x))
-}
-func (x *Days) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Days_value, data, "Days")
-	if err != nil {
-		return err
-	}
-	*x = Days(value)
-	return nil
-}
-
-type Request_Color int32
-
-const (
-	Request_RED   Request_Color = 0
-	Request_GREEN Request_Color = 1
-	Request_BLUE  Request_Color = 2
-)
-
-var Request_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Request_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Request_Color) Enum() *Request_Color {
-	p := new(Request_Color)
-	*p = x
-	return p
-}
-func (x Request_Color) String() string {
-	return proto.EnumName(Request_Color_name, int32(x))
-}
-func (x *Request_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Request_Color_value, data, "Request_Color")
-	if err != nil {
-		return err
-	}
-	*x = Request_Color(value)
-	return nil
-}
-
-type Reply_Entry_Game int32
-
-const (
-	Reply_Entry_FOOTBALL Reply_Entry_Game = 1
-	Reply_Entry_TENNIS   Reply_Entry_Game = 2
-)
-
-var Reply_Entry_Game_name = map[int32]string{
-	1: "FOOTBALL",
-	2: "TENNIS",
-}
-var Reply_Entry_Game_value = map[string]int32{
-	"FOOTBALL": 1,
-	"TENNIS":   2,
-}
-
-func (x Reply_Entry_Game) Enum() *Reply_Entry_Game {
-	p := new(Reply_Entry_Game)
-	*p = x
-	return p
-}
-func (x Reply_Entry_Game) String() string {
-	return proto.EnumName(Reply_Entry_Game_name, int32(x))
-}
-func (x *Reply_Entry_Game) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Reply_Entry_Game_value, data, "Reply_Entry_Game")
-	if err != nil {
-		return err
-	}
-	*x = Reply_Entry_Game(value)
-	return nil
-}
-
-// This is a message that might be sent somewhere.
-type Request struct {
-	Key []int64 `protobuf:"varint,1,rep,name=key" json:"key,omitempty"`
-	//  optional imp.ImportedMessage imported_message = 2;
-	Hue *Request_Color `protobuf:"varint,3,opt,name=hue,enum=my.test.Request_Color" json:"hue,omitempty"`
-	Hat *HatType       `protobuf:"varint,4,opt,name=hat,enum=my.test.HatType,def=1" json:"hat,omitempty"`
-	//  optional imp.ImportedMessage.Owner owner = 6;
-	Deadline  *float32           `protobuf:"fixed32,7,opt,name=deadline,def=inf" json:"deadline,omitempty"`
-	Somegroup *Request_SomeGroup `protobuf:"group,8,opt,name=SomeGroup,json=somegroup" json:"somegroup,omitempty"`
-	// This is a map field. It will generate map[int32]string.
-	NameMapping map[int32]string `protobuf:"bytes,14,rep,name=name_mapping,json=nameMapping" json:"name_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// This is a map field whose value type is a message.
-	MsgMapping map[int64]*Reply `protobuf:"bytes,15,rep,name=msg_mapping,json=msgMapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Reset_     *int32           `protobuf:"varint,12,opt,name=reset" json:"reset,omitempty"`
-	// This field should not conflict with any getters.
-	GetKey_          *string `protobuf:"bytes,16,opt,name=get_key,json=getKey" json:"get_key,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Request) Reset()         { *m = Request{} }
-func (m *Request) String() string { return proto.CompactTextString(m) }
-func (*Request) ProtoMessage()    {}
-
-const Default_Request_Hat HatType = HatType_FEDORA
-
-var Default_Request_Deadline float32 = float32(math.Inf(1))
-
-func (m *Request) GetKey() []int64 {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *Request) GetHue() Request_Color {
-	if m != nil && m.Hue != nil {
-		return *m.Hue
-	}
-	return Request_RED
-}
-
-func (m *Request) GetHat() HatType {
-	if m != nil && m.Hat != nil {
-		return *m.Hat
-	}
-	return Default_Request_Hat
-}
-
-func (m *Request) GetDeadline() float32 {
-	if m != nil && m.Deadline != nil {
-		return *m.Deadline
-	}
-	return Default_Request_Deadline
-}
-
-func (m *Request) GetSomegroup() *Request_SomeGroup {
-	if m != nil {
-		return m.Somegroup
-	}
-	return nil
-}
-
-func (m *Request) GetNameMapping() map[int32]string {
-	if m != nil {
-		return m.NameMapping
-	}
-	return nil
-}
-
-func (m *Request) GetMsgMapping() map[int64]*Reply {
-	if m != nil {
-		return m.MsgMapping
-	}
-	return nil
-}
-
-func (m *Request) GetReset_() int32 {
-	if m != nil && m.Reset_ != nil {
-		return *m.Reset_
-	}
-	return 0
-}
-
-func (m *Request) GetGetKey_() string {
-	if m != nil && m.GetKey_ != nil {
-		return *m.GetKey_
-	}
-	return ""
-}
-
-type Request_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field,json=groupField" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Request_SomeGroup) Reset()         { *m = Request_SomeGroup{} }
-func (m *Request_SomeGroup) String() string { return proto.CompactTextString(m) }
-func (*Request_SomeGroup) ProtoMessage()    {}
-
-func (m *Request_SomeGroup) GetGroupField() int32 {
-	if m != nil && m.GroupField != nil {
-		return *m.GroupField
-	}
-	return 0
-}
-
-type Reply struct {
-	Found                        []*Reply_Entry `protobuf:"bytes,1,rep,name=found" json:"found,omitempty"`
-	CompactKeys                  []int32        `protobuf:"varint,2,rep,packed,name=compact_keys,json=compactKeys" json:"compact_keys,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *Reply) Reset()         { *m = Reply{} }
-func (m *Reply) String() string { return proto.CompactTextString(m) }
-func (*Reply) ProtoMessage()    {}
-
-var extRange_Reply = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*Reply) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Reply
-}
-
-func (m *Reply) GetFound() []*Reply_Entry {
-	if m != nil {
-		return m.Found
-	}
-	return nil
-}
-
-func (m *Reply) GetCompactKeys() []int32 {
-	if m != nil {
-		return m.CompactKeys
-	}
-	return nil
-}
-
-type Reply_Entry struct {
-	KeyThatNeeds_1234Camel_CasIng *int64 `protobuf:"varint,1,req,name=key_that_needs_1234camel_CasIng,json=keyThatNeeds1234camelCasIng" json:"key_that_needs_1234camel_CasIng,omitempty"`
-	Value                         *int64 `protobuf:"varint,2,opt,name=value,def=7" json:"value,omitempty"`
-	XMyFieldName_2                *int64 `protobuf:"varint,3,opt,name=_my_field_name_2,json=MyFieldName2" json:"_my_field_name_2,omitempty"`
-	XXX_unrecognized              []byte `json:"-"`
-}
-
-func (m *Reply_Entry) Reset()         { *m = Reply_Entry{} }
-func (m *Reply_Entry) String() string { return proto.CompactTextString(m) }
-func (*Reply_Entry) ProtoMessage()    {}
-
-const Default_Reply_Entry_Value int64 = 7
-
-func (m *Reply_Entry) GetKeyThatNeeds_1234Camel_CasIng() int64 {
-	if m != nil && m.KeyThatNeeds_1234Camel_CasIng != nil {
-		return *m.KeyThatNeeds_1234Camel_CasIng
-	}
-	return 0
-}
-
-func (m *Reply_Entry) GetValue() int64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return Default_Reply_Entry_Value
-}
-
-func (m *Reply_Entry) GetXMyFieldName_2() int64 {
-	if m != nil && m.XMyFieldName_2 != nil {
-		return *m.XMyFieldName_2
-	}
-	return 0
-}
-
-type OtherBase struct {
-	Name                         *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OtherBase) Reset()         { *m = OtherBase{} }
-func (m *OtherBase) String() string { return proto.CompactTextString(m) }
-func (*OtherBase) ProtoMessage()    {}
-
-var extRange_OtherBase = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*OtherBase) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OtherBase
-}
-
-func (m *OtherBase) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-type ReplyExtensions struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *ReplyExtensions) Reset()         { *m = ReplyExtensions{} }
-func (m *ReplyExtensions) String() string { return proto.CompactTextString(m) }
-func (*ReplyExtensions) ProtoMessage()    {}
-
-var E_ReplyExtensions_Time = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         101,
-	Name:          "my.test.ReplyExtensions.time",
-	Tag:           "fixed64,101,opt,name=time",
-	Filename:      "my_test/test.proto",
-}
-
-var E_ReplyExtensions_Carrot = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*ReplyExtensions)(nil),
-	Field:         105,
-	Name:          "my.test.ReplyExtensions.carrot",
-	Tag:           "bytes,105,opt,name=carrot",
-	Filename:      "my_test/test.proto",
-}
-
-var E_ReplyExtensions_Donut = &proto.ExtensionDesc{
-	ExtendedType:  (*OtherBase)(nil),
-	ExtensionType: (*ReplyExtensions)(nil),
-	Field:         101,
-	Name:          "my.test.ReplyExtensions.donut",
-	Tag:           "bytes,101,opt,name=donut",
-	Filename:      "my_test/test.proto",
-}
-
-type OtherReplyExtensions struct {
-	Key              *int32 `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *OtherReplyExtensions) Reset()         { *m = OtherReplyExtensions{} }
-func (m *OtherReplyExtensions) String() string { return proto.CompactTextString(m) }
-func (*OtherReplyExtensions) ProtoMessage()    {}
-
-func (m *OtherReplyExtensions) GetKey() int32 {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return 0
-}
-
-type OldReply struct {
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OldReply) Reset()         { *m = OldReply{} }
-func (m *OldReply) String() string { return proto.CompactTextString(m) }
-func (*OldReply) ProtoMessage()    {}
-
-func (m *OldReply) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(&m.XXX_InternalExtensions)
-}
-func (m *OldReply) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)
-}
-func (m *OldReply) MarshalJSON() ([]byte, error) {
-	return proto.MarshalMessageSetJSON(&m.XXX_InternalExtensions)
-}
-func (m *OldReply) UnmarshalJSON(buf []byte) error {
-	return proto.UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)
-}
-
-// ensure OldReply satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*OldReply)(nil)
-var _ proto.Unmarshaler = (*OldReply)(nil)
-
-var extRange_OldReply = []proto.ExtensionRange{
-	{100, 2147483646},
-}
-
-func (*OldReply) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OldReply
-}
-
-type Communique struct {
-	MakeMeCry *bool `protobuf:"varint,1,opt,name=make_me_cry,json=makeMeCry" json:"make_me_cry,omitempty"`
-	// This is a oneof, called "union".
-	//
-	// Types that are valid to be assigned to Union:
-	//	*Communique_Number
-	//	*Communique_Name
-	//	*Communique_Data
-	//	*Communique_TempC
-	//	*Communique_Height
-	//	*Communique_Today
-	//	*Communique_Maybe
-	//	*Communique_Delta_
-	//	*Communique_Msg
-	//	*Communique_Somegroup
-	Union            isCommunique_Union `protobuf_oneof:"union"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *Communique) Reset()         { *m = Communique{} }
-func (m *Communique) String() string { return proto.CompactTextString(m) }
-func (*Communique) ProtoMessage()    {}
-
-type isCommunique_Union interface {
-	isCommunique_Union()
-}
-
-type Communique_Number struct {
-	Number int32 `protobuf:"varint,5,opt,name=number,oneof"`
-}
-type Communique_Name struct {
-	Name string `protobuf:"bytes,6,opt,name=name,oneof"`
-}
-type Communique_Data struct {
-	Data []byte `protobuf:"bytes,7,opt,name=data,oneof"`
-}
-type Communique_TempC struct {
-	TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof"`
-}
-type Communique_Height struct {
-	Height float32 `protobuf:"fixed32,9,opt,name=height,oneof"`
-}
-type Communique_Today struct {
-	Today Days `protobuf:"varint,10,opt,name=today,enum=my.test.Days,oneof"`
-}
-type Communique_Maybe struct {
-	Maybe bool `protobuf:"varint,11,opt,name=maybe,oneof"`
-}
-type Communique_Delta_ struct {
-	Delta int32 `protobuf:"zigzag32,12,opt,name=delta,oneof"`
-}
-type Communique_Msg struct {
-	Msg *Reply `protobuf:"bytes,13,opt,name=msg,oneof"`
-}
-type Communique_Somegroup struct {
-	Somegroup *Communique_SomeGroup `protobuf:"group,14,opt,name=SomeGroup,json=somegroup,oneof"`
-}
-
-func (*Communique_Number) isCommunique_Union()    {}
-func (*Communique_Name) isCommunique_Union()      {}
-func (*Communique_Data) isCommunique_Union()      {}
-func (*Communique_TempC) isCommunique_Union()     {}
-func (*Communique_Height) isCommunique_Union()    {}
-func (*Communique_Today) isCommunique_Union()     {}
-func (*Communique_Maybe) isCommunique_Union()     {}
-func (*Communique_Delta_) isCommunique_Union()    {}
-func (*Communique_Msg) isCommunique_Union()       {}
-func (*Communique_Somegroup) isCommunique_Union() {}
-
-func (m *Communique) GetUnion() isCommunique_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-
-func (m *Communique) GetMakeMeCry() bool {
-	if m != nil && m.MakeMeCry != nil {
-		return *m.MakeMeCry
-	}
-	return false
-}
-
-func (m *Communique) GetNumber() int32 {
-	if x, ok := m.GetUnion().(*Communique_Number); ok {
-		return x.Number
-	}
-	return 0
-}
-
-func (m *Communique) GetName() string {
-	if x, ok := m.GetUnion().(*Communique_Name); ok {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *Communique) GetData() []byte {
-	if x, ok := m.GetUnion().(*Communique_Data); ok {
-		return x.Data
-	}
-	return nil
-}
-
-func (m *Communique) GetTempC() float64 {
-	if x, ok := m.GetUnion().(*Communique_TempC); ok {
-		return x.TempC
-	}
-	return 0
-}
-
-func (m *Communique) GetHeight() float32 {
-	if x, ok := m.GetUnion().(*Communique_Height); ok {
-		return x.Height
-	}
-	return 0
-}
-
-func (m *Communique) GetToday() Days {
-	if x, ok := m.GetUnion().(*Communique_Today); ok {
-		return x.Today
-	}
-	return Days_MONDAY
-}
-
-func (m *Communique) GetMaybe() bool {
-	if x, ok := m.GetUnion().(*Communique_Maybe); ok {
-		return x.Maybe
-	}
-	return false
-}
-
-func (m *Communique) GetDelta() int32 {
-	if x, ok := m.GetUnion().(*Communique_Delta_); ok {
-		return x.Delta
-	}
-	return 0
-}
-
-func (m *Communique) GetMsg() *Reply {
-	if x, ok := m.GetUnion().(*Communique_Msg); ok {
-		return x.Msg
-	}
-	return nil
-}
-
-func (m *Communique) GetSomegroup() *Communique_SomeGroup {
-	if x, ok := m.GetUnion().(*Communique_Somegroup); ok {
-		return x.Somegroup
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Communique) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Communique_OneofMarshaler, _Communique_OneofUnmarshaler, _Communique_OneofSizer, []interface{}{
-		(*Communique_Number)(nil),
-		(*Communique_Name)(nil),
-		(*Communique_Data)(nil),
-		(*Communique_TempC)(nil),
-		(*Communique_Height)(nil),
-		(*Communique_Today)(nil),
-		(*Communique_Maybe)(nil),
-		(*Communique_Delta_)(nil),
-		(*Communique_Msg)(nil),
-		(*Communique_Somegroup)(nil),
-	}
-}
-
-func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Number))
-	case *Communique_Name:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case *Communique_Data:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Data)
-	case *Communique_TempC:
-		b.EncodeVarint(8<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.TempC))
-	case *Communique_Height:
-		b.EncodeVarint(9<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.Height)))
-	case *Communique_Today:
-		b.EncodeVarint(10<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Today))
-	case *Communique_Maybe:
-		t := uint64(0)
-		if x.Maybe {
-			t = 1
-		}
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Communique_Delta_:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.Delta))
-	case *Communique_Msg:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Msg); err != nil {
-			return err
-		}
-	case *Communique_Somegroup:
-		b.EncodeVarint(14<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.Somegroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(14<<3 | proto.WireEndGroup)
-	case nil:
-	default:
-		return fmt.Errorf("Communique.Union has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Communique)
-	switch tag {
-	case 5: // union.number
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Number{int32(x)}
-		return true, err
-	case 6: // union.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &Communique_Name{x}
-		return true, err
-	case 7: // union.data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Union = &Communique_Data{x}
-		return true, err
-	case 8: // union.temp_c
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Communique_TempC{math.Float64frombits(x)}
-		return true, err
-	case 9: // union.height
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.Union = &Communique_Height{math.Float32frombits(uint32(x))}
-		return true, err
-	case 10: // union.today
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Today{Days(x)}
-		return true, err
-	case 11: // union.maybe
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Maybe{x != 0}
-		return true, err
-	case 12: // union.delta
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.Union = &Communique_Delta_{int32(x)}
-		return true, err
-	case 13: // union.msg
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Reply)
-		err := b.DecodeMessage(msg)
-		m.Union = &Communique_Msg{msg}
-		return true, err
-	case 14: // union.somegroup
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Communique_SomeGroup)
-		err := b.DecodeGroup(msg)
-		m.Union = &Communique_Somegroup{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Communique_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		n += proto.SizeVarint(5<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Number))
-	case *Communique_Name:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case *Communique_Data:
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Data)))
-		n += len(x.Data)
-	case *Communique_TempC:
-		n += proto.SizeVarint(8<<3 | proto.WireFixed64)
-		n += 8
-	case *Communique_Height:
-		n += proto.SizeVarint(9<<3 | proto.WireFixed32)
-		n += 4
-	case *Communique_Today:
-		n += proto.SizeVarint(10<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Today))
-	case *Communique_Maybe:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
-		n += 1
-	case *Communique_Delta_:
-		n += proto.SizeVarint(12<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.Delta) << 1) ^ uint32((int32(x.Delta) >> 31))))
-	case *Communique_Msg:
-		s := proto.Size(x.Msg)
-		n += proto.SizeVarint(13<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Communique_Somegroup:
-		n += proto.SizeVarint(14<<3 | proto.WireStartGroup)
-		n += proto.Size(x.Somegroup)
-		n += proto.SizeVarint(14<<3 | proto.WireEndGroup)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Communique_SomeGroup struct {
-	Member           *string `protobuf:"bytes,15,opt,name=member" json:"member,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Communique_SomeGroup) Reset()         { *m = Communique_SomeGroup{} }
-func (m *Communique_SomeGroup) String() string { return proto.CompactTextString(m) }
-func (*Communique_SomeGroup) ProtoMessage()    {}
-
-func (m *Communique_SomeGroup) GetMember() string {
-	if m != nil && m.Member != nil {
-		return *m.Member
-	}
-	return ""
-}
-
-type Communique_Delta struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Communique_Delta) Reset()         { *m = Communique_Delta{} }
-func (m *Communique_Delta) String() string { return proto.CompactTextString(m) }
-func (*Communique_Delta) ProtoMessage()    {}
-
-var E_Tag = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         103,
-	Name:          "my.test.tag",
-	Tag:           "bytes,103,opt,name=tag",
-	Filename:      "my_test/test.proto",
-}
-
-var E_Donut = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*OtherReplyExtensions)(nil),
-	Field:         106,
-	Name:          "my.test.donut",
-	Tag:           "bytes,106,opt,name=donut",
-	Filename:      "my_test/test.proto",
-}
-
-func init() {
-	proto.RegisterType((*Request)(nil), "my.test.Request")
-	proto.RegisterType((*Request_SomeGroup)(nil), "my.test.Request.SomeGroup")
-	proto.RegisterType((*Reply)(nil), "my.test.Reply")
-	proto.RegisterType((*Reply_Entry)(nil), "my.test.Reply.Entry")
-	proto.RegisterType((*OtherBase)(nil), "my.test.OtherBase")
-	proto.RegisterType((*ReplyExtensions)(nil), "my.test.ReplyExtensions")
-	proto.RegisterType((*OtherReplyExtensions)(nil), "my.test.OtherReplyExtensions")
-	proto.RegisterType((*OldReply)(nil), "my.test.OldReply")
-	proto.RegisterType((*Communique)(nil), "my.test.Communique")
-	proto.RegisterType((*Communique_SomeGroup)(nil), "my.test.Communique.SomeGroup")
-	proto.RegisterType((*Communique_Delta)(nil), "my.test.Communique.Delta")
-	proto.RegisterEnum("my.test.HatType", HatType_name, HatType_value)
-	proto.RegisterEnum("my.test.Days", Days_name, Days_value)
-	proto.RegisterEnum("my.test.Request_Color", Request_Color_name, Request_Color_value)
-	proto.RegisterEnum("my.test.Reply_Entry_Game", Reply_Entry_Game_name, Reply_Entry_Game_value)
-	proto.RegisterExtension(E_ReplyExtensions_Time)
-	proto.RegisterExtension(E_ReplyExtensions_Carrot)
-	proto.RegisterExtension(E_ReplyExtensions_Donut)
-	proto.RegisterExtension(E_Tag)
-	proto.RegisterExtension(E_Donut)
-}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto
index 8e709463..1ef3fd02 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto
@@ -34,6 +34,8 @@ syntax = "proto2";
 // This package holds interesting messages.
 package my.test;  // dotted package name
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/my_test;test";
+
 //import "imp.proto";
 import "multi/multi1.proto";  // unused import
 
@@ -145,7 +147,7 @@ message Communique {
     Days today = 10;
     bool maybe = 11;
     sint32 delta = 12;  // name will conflict with Delta below
-    Reply msg = 13;
+    Reply msg = 16;  // requires two bytes to encode field tag
     group SomeGroup = 14 {
       optional string member = 15;
     }
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3/proto3.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3/proto3.pb.go
new file mode 100644
index 00000000..3b0ad849
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3/proto3.pb.go
@@ -0,0 +1,196 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: proto3/proto3.proto
+
+package proto3 // import "github.com/golang/protobuf/protoc-gen-go/testdata/proto3"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type Request_Flavour int32
+
+const (
+	Request_SWEET         Request_Flavour = 0
+	Request_SOUR          Request_Flavour = 1
+	Request_UMAMI         Request_Flavour = 2
+	Request_GOPHERLICIOUS Request_Flavour = 3
+)
+
+var Request_Flavour_name = map[int32]string{
+	0: "SWEET",
+	1: "SOUR",
+	2: "UMAMI",
+	3: "GOPHERLICIOUS",
+}
+var Request_Flavour_value = map[string]int32{
+	"SWEET":         0,
+	"SOUR":          1,
+	"UMAMI":         2,
+	"GOPHERLICIOUS": 3,
+}
+
+func (x Request_Flavour) String() string {
+	return proto.EnumName(Request_Flavour_name, int32(x))
+}
+func (Request_Flavour) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_a752e09251f17e01, []int{0, 0}
+}
+
+type Request struct {
+	Name                 string          `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Key                  []int64         `protobuf:"varint,2,rep,packed,name=key" json:"key,omitempty"`
+	Taste                Request_Flavour `protobuf:"varint,3,opt,name=taste,enum=proto3.Request_Flavour" json:"taste,omitempty"`
+	Book                 *Book           `protobuf:"bytes,4,opt,name=book" json:"book,omitempty"`
+	Unpacked             []int64         `protobuf:"varint,5,rep,name=unpacked" json:"unpacked,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Request) Reset()         { *m = Request{} }
+func (m *Request) String() string { return proto.CompactTextString(m) }
+func (*Request) ProtoMessage()    {}
+func (*Request) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_a752e09251f17e01, []int{0}
+}
+func (m *Request) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Request.Unmarshal(m, b)
+}
+func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Request.Marshal(b, m, deterministic)
+}
+func (dst *Request) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Request.Merge(dst, src)
+}
+func (m *Request) XXX_Size() int {
+	return xxx_messageInfo_Request.Size(m)
+}
+func (m *Request) XXX_DiscardUnknown() {
+	xxx_messageInfo_Request.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Request proto.InternalMessageInfo
+
+func (m *Request) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Request) GetKey() []int64 {
+	if m != nil {
+		return m.Key
+	}
+	return nil
+}
+
+func (m *Request) GetTaste() Request_Flavour {
+	if m != nil {
+		return m.Taste
+	}
+	return Request_SWEET
+}
+
+func (m *Request) GetBook() *Book {
+	if m != nil {
+		return m.Book
+	}
+	return nil
+}
+
+func (m *Request) GetUnpacked() []int64 {
+	if m != nil {
+		return m.Unpacked
+	}
+	return nil
+}
+
+type Book struct {
+	Title                string   `protobuf:"bytes,1,opt,name=title" json:"title,omitempty"`
+	RawData              []byte   `protobuf:"bytes,2,opt,name=raw_data,json=rawData,proto3" json:"raw_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Book) Reset()         { *m = Book{} }
+func (m *Book) String() string { return proto.CompactTextString(m) }
+func (*Book) ProtoMessage()    {}
+func (*Book) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_a752e09251f17e01, []int{1}
+}
+func (m *Book) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Book.Unmarshal(m, b)
+}
+func (m *Book) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Book.Marshal(b, m, deterministic)
+}
+func (dst *Book) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Book.Merge(dst, src)
+}
+func (m *Book) XXX_Size() int {
+	return xxx_messageInfo_Book.Size(m)
+}
+func (m *Book) XXX_DiscardUnknown() {
+	xxx_messageInfo_Book.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Book proto.InternalMessageInfo
+
+func (m *Book) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *Book) GetRawData() []byte {
+	if m != nil {
+		return m.RawData
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Request)(nil), "proto3.Request")
+	proto.RegisterType((*Book)(nil), "proto3.Book")
+	proto.RegisterEnum("proto3.Request_Flavour", Request_Flavour_name, Request_Flavour_value)
+}
+
+func init() { proto.RegisterFile("proto3/proto3.proto", fileDescriptor_proto3_a752e09251f17e01) }
+
+var fileDescriptor_proto3_a752e09251f17e01 = []byte{
+	// 306 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x90, 0xcf, 0x4e, 0xf2, 0x40,
+	0x14, 0xc5, 0x99, 0xfe, 0xf9, 0x80, 0xfb, 0xa1, 0x19, 0xaf, 0x26, 0x8e, 0x1b, 0x33, 0x61, 0xd5,
+	0x0d, 0x25, 0xc1, 0x85, 0xc6, 0xb8, 0x11, 0x45, 0x25, 0x91, 0x60, 0x06, 0x89, 0x89, 0x1b, 0x33,
+	0x85, 0xb1, 0x92, 0x42, 0x07, 0xcb, 0x54, 0xe2, 0xcb, 0xfa, 0x2c, 0xa6, 0x9d, 0xe2, 0xea, 0x9e,
+	0x7b, 0xe7, 0xe4, 0x77, 0x32, 0x07, 0x0e, 0xd7, 0x99, 0x36, 0xfa, 0xac, 0x6b, 0x47, 0x58, 0x0e,
+	0xfc, 0x67, 0xb7, 0xf6, 0x0f, 0x81, 0xba, 0x50, 0x9f, 0xb9, 0xda, 0x18, 0x44, 0xf0, 0x52, 0xb9,
+	0x52, 0x8c, 0x70, 0x12, 0x34, 0x45, 0xa9, 0x91, 0x82, 0x9b, 0xa8, 0x6f, 0xe6, 0x70, 0x37, 0x70,
+	0x45, 0x21, 0xb1, 0x03, 0xbe, 0x91, 0x1b, 0xa3, 0x98, 0xcb, 0x49, 0xb0, 0xdf, 0x3b, 0x0e, 0x2b,
+	0x6e, 0x45, 0x09, 0xef, 0x96, 0xf2, 0x4b, 0xe7, 0x99, 0xb0, 0x2e, 0xe4, 0xe0, 0x45, 0x5a, 0x27,
+	0xcc, 0xe3, 0x24, 0xf8, 0xdf, 0x6b, 0xed, 0xdc, 0x7d, 0xad, 0x13, 0x51, 0xbe, 0xe0, 0x29, 0x34,
+	0xf2, 0x74, 0x2d, 0x67, 0x89, 0x9a, 0x33, 0xbf, 0xc8, 0xe9, 0x3b, 0xb4, 0x26, 0xfe, 0x6e, 0xed,
+	0x2b, 0xa8, 0x57, 0x4c, 0x6c, 0x82, 0x3f, 0x79, 0x19, 0x0c, 0x9e, 0x69, 0x0d, 0x1b, 0xe0, 0x4d,
+	0xc6, 0x53, 0x41, 0x49, 0x71, 0x9c, 0x8e, 0xae, 0x47, 0x43, 0xea, 0xe0, 0x01, 0xec, 0xdd, 0x8f,
+	0x9f, 0x1e, 0x06, 0xe2, 0x71, 0x78, 0x33, 0x1c, 0x4f, 0x27, 0xd4, 0x6d, 0x9f, 0x83, 0x57, 0x64,
+	0xe1, 0x11, 0xf8, 0x66, 0x61, 0x96, 0xbb, 0xdf, 0xd9, 0x05, 0x4f, 0xa0, 0x91, 0xc9, 0xed, 0xdb,
+	0x5c, 0x1a, 0xc9, 0x1c, 0x4e, 0x82, 0x96, 0xa8, 0x67, 0x72, 0x7b, 0x2b, 0x8d, 0xec, 0x5f, 0xbe,
+	0x5e, 0xc4, 0x0b, 0xf3, 0x91, 0x47, 0xe1, 0x4c, 0xaf, 0xba, 0xb1, 0x5e, 0xca, 0x34, 0xb6, 0x1d,
+	0x46, 0xf9, 0xbb, 0x15, 0xb3, 0x4e, 0xac, 0xd2, 0x4e, 0xac, 0xbb, 0x46, 0x6d, 0x4c, 0xc1, 0xa8,
+	0x3a, 0x8e, 0xaa, 0x76, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xec, 0x71, 0xee, 0xdb, 0x7b, 0x01,
+	0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3/proto3.proto
similarity index 96%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto
rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3/proto3.proto
index 869b9af5..79954e4e 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3/proto3.proto
@@ -33,6 +33,8 @@ syntax = "proto3";
 
 package proto3;
 
+option go_package = "github.com/golang/protobuf/protoc-gen-go/testdata/proto3";
+
 message Request {
   enum Flavour {
     SWEET = 0;
diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go
index f3460172..f67edc7d 100644
--- a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go
+++ b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/any.proto
 
-/*
-Package any is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/any.proto
-
-It has these top-level messages:
-	Any
-*/
-package any
+package any // import "github.com/golang/protobuf/ptypes/any"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -132,14 +123,36 @@ type Any struct {
 	//
 	TypeUrl string `protobuf:"bytes,1,opt,name=type_url,json=typeUrl" json:"type_url,omitempty"`
 	// Must be a valid serialized protocol buffer of the above specified type.
-	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	Value                []byte   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Any) Reset()         { *m = Any{} }
+func (m *Any) String() string { return proto.CompactTextString(m) }
+func (*Any) ProtoMessage()    {}
+func (*Any) Descriptor() ([]byte, []int) {
+	return fileDescriptor_any_744b9ca530f228db, []int{0}
+}
+func (*Any) XXX_WellKnownType() string { return "Any" }
+func (m *Any) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Any.Unmarshal(m, b)
+}
+func (m *Any) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Any.Marshal(b, m, deterministic)
+}
+func (dst *Any) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Any.Merge(dst, src)
+}
+func (m *Any) XXX_Size() int {
+	return xxx_messageInfo_Any.Size(m)
+}
+func (m *Any) XXX_DiscardUnknown() {
+	xxx_messageInfo_Any.DiscardUnknown(m)
 }
 
-func (m *Any) Reset()                    { *m = Any{} }
-func (m *Any) String() string            { return proto.CompactTextString(m) }
-func (*Any) ProtoMessage()               {}
-func (*Any) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Any) XXX_WellKnownType() string   { return "Any" }
+var xxx_messageInfo_Any proto.InternalMessageInfo
 
 func (m *Any) GetTypeUrl() string {
 	if m != nil {
@@ -159,9 +172,9 @@ func init() {
 	proto.RegisterType((*Any)(nil), "google.protobuf.Any")
 }
 
-func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_any_744b9ca530f228db) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_any_744b9ca530f228db = []byte{
 	// 185 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4,
diff --git a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go
index b2410a09..4d75473b 100644
--- a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go
+++ b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/duration.proto
 
-/*
-Package duration is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/duration.proto
-
-It has these top-level messages:
-	Duration
-*/
-package duration
+package duration // import "github.com/golang/protobuf/ptypes/duration"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -98,14 +89,36 @@ type Duration struct {
 	// of one second or more, a non-zero value for the `nanos` field must be
 	// of the same sign as the `seconds` field. Must be from -999,999,999
 	// to +999,999,999 inclusive.
-	Nanos int32 `protobuf:"varint,2,opt,name=nanos" json:"nanos,omitempty"`
+	Nanos                int32    `protobuf:"varint,2,opt,name=nanos" json:"nanos,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Duration) Reset()                    { *m = Duration{} }
-func (m *Duration) String() string            { return proto.CompactTextString(m) }
-func (*Duration) ProtoMessage()               {}
-func (*Duration) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Duration) XXX_WellKnownType() string   { return "Duration" }
+func (m *Duration) Reset()         { *m = Duration{} }
+func (m *Duration) String() string { return proto.CompactTextString(m) }
+func (*Duration) ProtoMessage()    {}
+func (*Duration) Descriptor() ([]byte, []int) {
+	return fileDescriptor_duration_e7d612259e3f0613, []int{0}
+}
+func (*Duration) XXX_WellKnownType() string { return "Duration" }
+func (m *Duration) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Duration.Unmarshal(m, b)
+}
+func (m *Duration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Duration.Marshal(b, m, deterministic)
+}
+func (dst *Duration) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Duration.Merge(dst, src)
+}
+func (m *Duration) XXX_Size() int {
+	return xxx_messageInfo_Duration.Size(m)
+}
+func (m *Duration) XXX_DiscardUnknown() {
+	xxx_messageInfo_Duration.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Duration proto.InternalMessageInfo
 
 func (m *Duration) GetSeconds() int64 {
 	if m != nil {
@@ -125,9 +138,11 @@ func init() {
 	proto.RegisterType((*Duration)(nil), "google.protobuf.Duration")
 }
 
-func init() { proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_duration_e7d612259e3f0613)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_duration_e7d612259e3f0613 = []byte{
 	// 190 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0x29, 0x2d, 0x4a,
diff --git a/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go b/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go
index e877b72c..a69b403c 100644
--- a/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go
+++ b/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/empty.proto
 
-/*
-Package empty is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/empty.proto
-
-It has these top-level messages:
-	Empty
-*/
-package empty
+package empty // import "github.com/golang/protobuf/ptypes/empty"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -37,21 +28,43 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 //
 // The JSON representation for `Empty` is empty JSON object `{}`.
 type Empty struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Empty) Reset()         { *m = Empty{} }
+func (m *Empty) String() string { return proto.CompactTextString(m) }
+func (*Empty) ProtoMessage()    {}
+func (*Empty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_empty_39e6d6db0632e5b2, []int{0}
+}
+func (*Empty) XXX_WellKnownType() string { return "Empty" }
+func (m *Empty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Empty.Unmarshal(m, b)
+}
+func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Empty.Marshal(b, m, deterministic)
+}
+func (dst *Empty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Empty.Merge(dst, src)
+}
+func (m *Empty) XXX_Size() int {
+	return xxx_messageInfo_Empty.Size(m)
+}
+func (m *Empty) XXX_DiscardUnknown() {
+	xxx_messageInfo_Empty.DiscardUnknown(m)
 }
 
-func (m *Empty) Reset()                    { *m = Empty{} }
-func (m *Empty) String() string            { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()               {}
-func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Empty) XXX_WellKnownType() string   { return "Empty" }
+var xxx_messageInfo_Empty proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*Empty)(nil), "google.protobuf.Empty")
 }
 
-func init() { proto.RegisterFile("google/protobuf/empty.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/protobuf/empty.proto", fileDescriptor_empty_39e6d6db0632e5b2) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_empty_39e6d6db0632e5b2 = []byte{
 	// 148 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcd, 0x2d, 0x28,
diff --git a/vendor/github.com/golang/protobuf/ptypes/regen.sh b/vendor/github.com/golang/protobuf/ptypes/regen.sh
deleted file mode 100755
index b50a9414..00000000
--- a/vendor/github.com/golang/protobuf/ptypes/regen.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash -e
-#
-# This script fetches and rebuilds the "well-known types" protocol buffers.
-# To run this you will need protoc and goprotobuf installed;
-# see https://github.com/golang/protobuf for instructions.
-# You also need Go and Git installed.
-
-PKG=github.com/golang/protobuf/ptypes
-UPSTREAM=https://github.com/google/protobuf
-UPSTREAM_SUBDIR=src/google/protobuf
-PROTO_FILES=(any duration empty struct timestamp wrappers)
-
-function die() {
-  echo 1>&2 $*
-  exit 1
-}
-
-# Sanity check that the right tools are accessible.
-for tool in go git protoc protoc-gen-go; do
-  q=$(which $tool) || die "didn't find $tool"
-  echo 1>&2 "$tool: $q"
-done
-
-tmpdir=$(mktemp -d -t regen-wkt.XXXXXX)
-trap 'rm -rf $tmpdir' EXIT
-
-echo -n 1>&2 "finding package dir... "
-pkgdir=$(go list -f '{{.Dir}}' $PKG)
-echo 1>&2 $pkgdir
-base=$(echo $pkgdir | sed "s,/$PKG\$,,")
-echo 1>&2 "base: $base"
-cd "$base"
-
-echo 1>&2 "fetching latest protos... "
-git clone -q $UPSTREAM $tmpdir
-
-for file in ${PROTO_FILES[@]}; do
-  echo 1>&2 "* $file"
-  protoc --go_out=. -I$tmpdir/src $tmpdir/src/google/protobuf/$file.proto || die
-  cp $tmpdir/src/google/protobuf/$file.proto $PKG/$file
-done
-
-echo 1>&2 "All OK"
diff --git a/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go b/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go
index 4cfe6081..442c0e09 100644
--- a/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go
+++ b/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go
@@ -1,18 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/struct.proto
 
-/*
-Package structpb is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/struct.proto
-
-It has these top-level messages:
-	Struct
-	Value
-	ListValue
-*/
-package structpb
+package structpb // import "github.com/golang/protobuf/ptypes/struct"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -50,8 +39,10 @@ var NullValue_value = map[string]int32{
 func (x NullValue) String() string {
 	return proto.EnumName(NullValue_name, int32(x))
 }
-func (NullValue) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (NullValue) XXX_WellKnownType() string       { return "NullValue" }
+func (NullValue) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_struct_3a5a94e0c7801b27, []int{0}
+}
+func (NullValue) XXX_WellKnownType() string { return "NullValue" }
 
 // `Struct` represents a structured data value, consisting of fields
 // which map to dynamically typed values. In some languages, `Struct`
@@ -63,14 +54,36 @@ func (NullValue) XXX_WellKnownType() string       { return "NullValue" }
 // The JSON representation for `Struct` is JSON object.
 type Struct struct {
 	// Unordered map of dynamically typed values.
-	Fields map[string]*Value `protobuf:"bytes,1,rep,name=fields" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Fields               map[string]*Value `protobuf:"bytes,1,rep,name=fields" json:"fields,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 (m *Struct) Reset()                    { *m = Struct{} }
-func (m *Struct) String() string            { return proto.CompactTextString(m) }
-func (*Struct) ProtoMessage()               {}
-func (*Struct) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Struct) XXX_WellKnownType() string   { return "Struct" }
+func (m *Struct) Reset()         { *m = Struct{} }
+func (m *Struct) String() string { return proto.CompactTextString(m) }
+func (*Struct) ProtoMessage()    {}
+func (*Struct) Descriptor() ([]byte, []int) {
+	return fileDescriptor_struct_3a5a94e0c7801b27, []int{0}
+}
+func (*Struct) XXX_WellKnownType() string { return "Struct" }
+func (m *Struct) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Struct.Unmarshal(m, b)
+}
+func (m *Struct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Struct.Marshal(b, m, deterministic)
+}
+func (dst *Struct) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Struct.Merge(dst, src)
+}
+func (m *Struct) XXX_Size() int {
+	return xxx_messageInfo_Struct.Size(m)
+}
+func (m *Struct) XXX_DiscardUnknown() {
+	xxx_messageInfo_Struct.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Struct proto.InternalMessageInfo
 
 func (m *Struct) GetFields() map[string]*Value {
 	if m != nil {
@@ -95,14 +108,36 @@ type Value struct {
 	//	*Value_BoolValue
 	//	*Value_StructValue
 	//	*Value_ListValue
-	Kind isValue_Kind `protobuf_oneof:"kind"`
+	Kind                 isValue_Kind `protobuf_oneof:"kind"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Value) Reset()         { *m = Value{} }
+func (m *Value) String() string { return proto.CompactTextString(m) }
+func (*Value) ProtoMessage()    {}
+func (*Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_struct_3a5a94e0c7801b27, []int{1}
+}
+func (*Value) XXX_WellKnownType() string { return "Value" }
+func (m *Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Value.Unmarshal(m, b)
+}
+func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
+}
+func (dst *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(dst, src)
+}
+func (m *Value) XXX_Size() int {
+	return xxx_messageInfo_Value.Size(m)
+}
+func (m *Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_Value.DiscardUnknown(m)
 }
 
-func (m *Value) Reset()                    { *m = Value{} }
-func (m *Value) String() string            { return proto.CompactTextString(m) }
-func (*Value) ProtoMessage()               {}
-func (*Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-func (*Value) XXX_WellKnownType() string   { return "Value" }
+var xxx_messageInfo_Value proto.InternalMessageInfo
 
 type isValue_Kind interface {
 	isValue_Kind()
@@ -289,26 +324,26 @@ func _Value_OneofSizer(msg proto.Message) (n int) {
 	// kind
 	switch x := m.Kind.(type) {
 	case *Value_NullValue:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.NullValue))
 	case *Value_NumberValue:
-		n += proto.SizeVarint(2<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *Value_StringValue:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StringValue)))
 		n += len(x.StringValue)
 	case *Value_BoolValue:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *Value_StructValue:
 		s := proto.Size(x.StructValue)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_ListValue:
 		s := proto.Size(x.ListValue)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -323,14 +358,36 @@ func _Value_OneofSizer(msg proto.Message) (n int) {
 // The JSON representation for `ListValue` is JSON array.
 type ListValue struct {
 	// Repeated field of dynamically typed values.
-	Values []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
+	Values               []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListValue) Reset()                    { *m = ListValue{} }
-func (m *ListValue) String() string            { return proto.CompactTextString(m) }
-func (*ListValue) ProtoMessage()               {}
-func (*ListValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-func (*ListValue) XXX_WellKnownType() string   { return "ListValue" }
+func (m *ListValue) Reset()         { *m = ListValue{} }
+func (m *ListValue) String() string { return proto.CompactTextString(m) }
+func (*ListValue) ProtoMessage()    {}
+func (*ListValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_struct_3a5a94e0c7801b27, []int{2}
+}
+func (*ListValue) XXX_WellKnownType() string { return "ListValue" }
+func (m *ListValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListValue.Unmarshal(m, b)
+}
+func (m *ListValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListValue.Marshal(b, m, deterministic)
+}
+func (dst *ListValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListValue.Merge(dst, src)
+}
+func (m *ListValue) XXX_Size() int {
+	return xxx_messageInfo_ListValue.Size(m)
+}
+func (m *ListValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListValue proto.InternalMessageInfo
 
 func (m *ListValue) GetValues() []*Value {
 	if m != nil {
@@ -341,14 +398,17 @@ func (m *ListValue) GetValues() []*Value {
 
 func init() {
 	proto.RegisterType((*Struct)(nil), "google.protobuf.Struct")
+	proto.RegisterMapType((map[string]*Value)(nil), "google.protobuf.Struct.FieldsEntry")
 	proto.RegisterType((*Value)(nil), "google.protobuf.Value")
 	proto.RegisterType((*ListValue)(nil), "google.protobuf.ListValue")
 	proto.RegisterEnum("google.protobuf.NullValue", NullValue_name, NullValue_value)
 }
 
-func init() { proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor_struct_3a5a94e0c7801b27)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_struct_3a5a94e0c7801b27 = []byte{
 	// 417 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x41, 0x8b, 0xd3, 0x40,
 	0x14, 0xc7, 0x3b, 0xc9, 0x36, 0x98, 0x17, 0x59, 0x97, 0x11, 0xb4, 0xac, 0xa2, 0xa1, 0x7b, 0x09,
diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go
index e23e4a25..e9c22228 100644
--- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go
+++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/timestamp.proto
 
-/*
-Package timestamp is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/timestamp.proto
-
-It has these top-level messages:
-	Timestamp
-*/
-package timestamp
+package timestamp // import "github.com/golang/protobuf/ptypes/timestamp"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -101,7 +92,7 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
 // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
 // can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime())
+// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--)
 // to obtain a formatter capable of generating timestamps in this format.
 //
 //
@@ -114,14 +105,36 @@ type Timestamp struct {
 	// second values with fractions must still have non-negative nanos values
 	// that count forward in time. Must be from 0 to 999,999,999
 	// inclusive.
-	Nanos int32 `protobuf:"varint,2,opt,name=nanos" json:"nanos,omitempty"`
+	Nanos                int32    `protobuf:"varint,2,opt,name=nanos" json:"nanos,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Timestamp) Reset()                    { *m = Timestamp{} }
-func (m *Timestamp) String() string            { return proto.CompactTextString(m) }
-func (*Timestamp) ProtoMessage()               {}
-func (*Timestamp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Timestamp) XXX_WellKnownType() string   { return "Timestamp" }
+func (m *Timestamp) Reset()         { *m = Timestamp{} }
+func (m *Timestamp) String() string { return proto.CompactTextString(m) }
+func (*Timestamp) ProtoMessage()    {}
+func (*Timestamp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_timestamp_b826e8e5fba671a8, []int{0}
+}
+func (*Timestamp) XXX_WellKnownType() string { return "Timestamp" }
+func (m *Timestamp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Timestamp.Unmarshal(m, b)
+}
+func (m *Timestamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Timestamp.Marshal(b, m, deterministic)
+}
+func (dst *Timestamp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Timestamp.Merge(dst, src)
+}
+func (m *Timestamp) XXX_Size() int {
+	return xxx_messageInfo_Timestamp.Size(m)
+}
+func (m *Timestamp) XXX_DiscardUnknown() {
+	xxx_messageInfo_Timestamp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Timestamp proto.InternalMessageInfo
 
 func (m *Timestamp) GetSeconds() int64 {
 	if m != nil {
@@ -141,9 +154,11 @@ func init() {
 	proto.RegisterType((*Timestamp)(nil), "google.protobuf.Timestamp")
 }
 
-func init() { proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_timestamp_b826e8e5fba671a8)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_timestamp_b826e8e5fba671a8 = []byte{
 	// 191 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xc9, 0xcc, 0x4d,
diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
index b7cbd175..06750ab1 100644
--- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
+++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
@@ -114,7 +114,7 @@ option objc_class_prefix = "GPB";
 // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
 // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
 // can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime())
+// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--)
 // to obtain a formatter capable of generating timestamps in this format.
 //
 //
diff --git a/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go b/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go
index 0ed59bf1..d1fc4d0b 100644
--- a/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go
+++ b/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go
@@ -1,24 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/wrappers.proto
 
-/*
-Package wrappers is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/wrappers.proto
-
-It has these top-level messages:
-	DoubleValue
-	FloatValue
-	Int64Value
-	UInt64Value
-	Int32Value
-	UInt32Value
-	BoolValue
-	StringValue
-	BytesValue
-*/
-package wrappers
+package wrappers // import "github.com/golang/protobuf/ptypes/wrappers"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -40,14 +23,36 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // The JSON representation for `DoubleValue` is JSON number.
 type DoubleValue struct {
 	// The double value.
-	Value float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
+	Value                float64  `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DoubleValue) Reset()                    { *m = DoubleValue{} }
-func (m *DoubleValue) String() string            { return proto.CompactTextString(m) }
-func (*DoubleValue) ProtoMessage()               {}
-func (*DoubleValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*DoubleValue) XXX_WellKnownType() string   { return "DoubleValue" }
+func (m *DoubleValue) Reset()         { *m = DoubleValue{} }
+func (m *DoubleValue) String() string { return proto.CompactTextString(m) }
+func (*DoubleValue) ProtoMessage()    {}
+func (*DoubleValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{0}
+}
+func (*DoubleValue) XXX_WellKnownType() string { return "DoubleValue" }
+func (m *DoubleValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DoubleValue.Unmarshal(m, b)
+}
+func (m *DoubleValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DoubleValue.Marshal(b, m, deterministic)
+}
+func (dst *DoubleValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DoubleValue.Merge(dst, src)
+}
+func (m *DoubleValue) XXX_Size() int {
+	return xxx_messageInfo_DoubleValue.Size(m)
+}
+func (m *DoubleValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_DoubleValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DoubleValue proto.InternalMessageInfo
 
 func (m *DoubleValue) GetValue() float64 {
 	if m != nil {
@@ -61,14 +66,36 @@ func (m *DoubleValue) GetValue() float64 {
 // The JSON representation for `FloatValue` is JSON number.
 type FloatValue struct {
 	// The float value.
-	Value float32 `protobuf:"fixed32,1,opt,name=value" json:"value,omitempty"`
+	Value                float32  `protobuf:"fixed32,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FloatValue) Reset()                    { *m = FloatValue{} }
-func (m *FloatValue) String() string            { return proto.CompactTextString(m) }
-func (*FloatValue) ProtoMessage()               {}
-func (*FloatValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-func (*FloatValue) XXX_WellKnownType() string   { return "FloatValue" }
+func (m *FloatValue) Reset()         { *m = FloatValue{} }
+func (m *FloatValue) String() string { return proto.CompactTextString(m) }
+func (*FloatValue) ProtoMessage()    {}
+func (*FloatValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{1}
+}
+func (*FloatValue) XXX_WellKnownType() string { return "FloatValue" }
+func (m *FloatValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FloatValue.Unmarshal(m, b)
+}
+func (m *FloatValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FloatValue.Marshal(b, m, deterministic)
+}
+func (dst *FloatValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FloatValue.Merge(dst, src)
+}
+func (m *FloatValue) XXX_Size() int {
+	return xxx_messageInfo_FloatValue.Size(m)
+}
+func (m *FloatValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_FloatValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FloatValue proto.InternalMessageInfo
 
 func (m *FloatValue) GetValue() float32 {
 	if m != nil {
@@ -82,14 +109,36 @@ func (m *FloatValue) GetValue() float32 {
 // The JSON representation for `Int64Value` is JSON string.
 type Int64Value struct {
 	// The int64 value.
-	Value int64 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	Value                int64    `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Int64Value) Reset()                    { *m = Int64Value{} }
-func (m *Int64Value) String() string            { return proto.CompactTextString(m) }
-func (*Int64Value) ProtoMessage()               {}
-func (*Int64Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-func (*Int64Value) XXX_WellKnownType() string   { return "Int64Value" }
+func (m *Int64Value) Reset()         { *m = Int64Value{} }
+func (m *Int64Value) String() string { return proto.CompactTextString(m) }
+func (*Int64Value) ProtoMessage()    {}
+func (*Int64Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{2}
+}
+func (*Int64Value) XXX_WellKnownType() string { return "Int64Value" }
+func (m *Int64Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Int64Value.Unmarshal(m, b)
+}
+func (m *Int64Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Int64Value.Marshal(b, m, deterministic)
+}
+func (dst *Int64Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Int64Value.Merge(dst, src)
+}
+func (m *Int64Value) XXX_Size() int {
+	return xxx_messageInfo_Int64Value.Size(m)
+}
+func (m *Int64Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_Int64Value.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Int64Value proto.InternalMessageInfo
 
 func (m *Int64Value) GetValue() int64 {
 	if m != nil {
@@ -103,14 +152,36 @@ func (m *Int64Value) GetValue() int64 {
 // The JSON representation for `UInt64Value` is JSON string.
 type UInt64Value struct {
 	// The uint64 value.
-	Value uint64 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	Value                uint64   `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UInt64Value) Reset()         { *m = UInt64Value{} }
+func (m *UInt64Value) String() string { return proto.CompactTextString(m) }
+func (*UInt64Value) ProtoMessage()    {}
+func (*UInt64Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{3}
+}
+func (*UInt64Value) XXX_WellKnownType() string { return "UInt64Value" }
+func (m *UInt64Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UInt64Value.Unmarshal(m, b)
+}
+func (m *UInt64Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UInt64Value.Marshal(b, m, deterministic)
+}
+func (dst *UInt64Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UInt64Value.Merge(dst, src)
+}
+func (m *UInt64Value) XXX_Size() int {
+	return xxx_messageInfo_UInt64Value.Size(m)
+}
+func (m *UInt64Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_UInt64Value.DiscardUnknown(m)
 }
 
-func (m *UInt64Value) Reset()                    { *m = UInt64Value{} }
-func (m *UInt64Value) String() string            { return proto.CompactTextString(m) }
-func (*UInt64Value) ProtoMessage()               {}
-func (*UInt64Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-func (*UInt64Value) XXX_WellKnownType() string   { return "UInt64Value" }
+var xxx_messageInfo_UInt64Value proto.InternalMessageInfo
 
 func (m *UInt64Value) GetValue() uint64 {
 	if m != nil {
@@ -124,14 +195,36 @@ func (m *UInt64Value) GetValue() uint64 {
 // The JSON representation for `Int32Value` is JSON number.
 type Int32Value struct {
 	// The int32 value.
-	Value int32 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	Value                int32    `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Int32Value) Reset()                    { *m = Int32Value{} }
-func (m *Int32Value) String() string            { return proto.CompactTextString(m) }
-func (*Int32Value) ProtoMessage()               {}
-func (*Int32Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-func (*Int32Value) XXX_WellKnownType() string   { return "Int32Value" }
+func (m *Int32Value) Reset()         { *m = Int32Value{} }
+func (m *Int32Value) String() string { return proto.CompactTextString(m) }
+func (*Int32Value) ProtoMessage()    {}
+func (*Int32Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{4}
+}
+func (*Int32Value) XXX_WellKnownType() string { return "Int32Value" }
+func (m *Int32Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Int32Value.Unmarshal(m, b)
+}
+func (m *Int32Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Int32Value.Marshal(b, m, deterministic)
+}
+func (dst *Int32Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Int32Value.Merge(dst, src)
+}
+func (m *Int32Value) XXX_Size() int {
+	return xxx_messageInfo_Int32Value.Size(m)
+}
+func (m *Int32Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_Int32Value.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Int32Value proto.InternalMessageInfo
 
 func (m *Int32Value) GetValue() int32 {
 	if m != nil {
@@ -145,14 +238,36 @@ func (m *Int32Value) GetValue() int32 {
 // The JSON representation for `UInt32Value` is JSON number.
 type UInt32Value struct {
 	// The uint32 value.
-	Value uint32 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	Value                uint32   `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UInt32Value) Reset()         { *m = UInt32Value{} }
+func (m *UInt32Value) String() string { return proto.CompactTextString(m) }
+func (*UInt32Value) ProtoMessage()    {}
+func (*UInt32Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{5}
+}
+func (*UInt32Value) XXX_WellKnownType() string { return "UInt32Value" }
+func (m *UInt32Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UInt32Value.Unmarshal(m, b)
+}
+func (m *UInt32Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UInt32Value.Marshal(b, m, deterministic)
+}
+func (dst *UInt32Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UInt32Value.Merge(dst, src)
+}
+func (m *UInt32Value) XXX_Size() int {
+	return xxx_messageInfo_UInt32Value.Size(m)
+}
+func (m *UInt32Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_UInt32Value.DiscardUnknown(m)
 }
 
-func (m *UInt32Value) Reset()                    { *m = UInt32Value{} }
-func (m *UInt32Value) String() string            { return proto.CompactTextString(m) }
-func (*UInt32Value) ProtoMessage()               {}
-func (*UInt32Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-func (*UInt32Value) XXX_WellKnownType() string   { return "UInt32Value" }
+var xxx_messageInfo_UInt32Value proto.InternalMessageInfo
 
 func (m *UInt32Value) GetValue() uint32 {
 	if m != nil {
@@ -166,14 +281,36 @@ func (m *UInt32Value) GetValue() uint32 {
 // The JSON representation for `BoolValue` is JSON `true` and `false`.
 type BoolValue struct {
 	// The bool value.
-	Value bool `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	Value                bool     `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BoolValue) Reset()         { *m = BoolValue{} }
+func (m *BoolValue) String() string { return proto.CompactTextString(m) }
+func (*BoolValue) ProtoMessage()    {}
+func (*BoolValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{6}
+}
+func (*BoolValue) XXX_WellKnownType() string { return "BoolValue" }
+func (m *BoolValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BoolValue.Unmarshal(m, b)
+}
+func (m *BoolValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BoolValue.Marshal(b, m, deterministic)
+}
+func (dst *BoolValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoolValue.Merge(dst, src)
+}
+func (m *BoolValue) XXX_Size() int {
+	return xxx_messageInfo_BoolValue.Size(m)
+}
+func (m *BoolValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_BoolValue.DiscardUnknown(m)
 }
 
-func (m *BoolValue) Reset()                    { *m = BoolValue{} }
-func (m *BoolValue) String() string            { return proto.CompactTextString(m) }
-func (*BoolValue) ProtoMessage()               {}
-func (*BoolValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-func (*BoolValue) XXX_WellKnownType() string   { return "BoolValue" }
+var xxx_messageInfo_BoolValue proto.InternalMessageInfo
 
 func (m *BoolValue) GetValue() bool {
 	if m != nil {
@@ -187,14 +324,36 @@ func (m *BoolValue) GetValue() bool {
 // The JSON representation for `StringValue` is JSON string.
 type StringValue struct {
 	// The string value.
-	Value string `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"`
+	Value                string   `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StringValue) Reset()                    { *m = StringValue{} }
-func (m *StringValue) String() string            { return proto.CompactTextString(m) }
-func (*StringValue) ProtoMessage()               {}
-func (*StringValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-func (*StringValue) XXX_WellKnownType() string   { return "StringValue" }
+func (m *StringValue) Reset()         { *m = StringValue{} }
+func (m *StringValue) String() string { return proto.CompactTextString(m) }
+func (*StringValue) ProtoMessage()    {}
+func (*StringValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{7}
+}
+func (*StringValue) XXX_WellKnownType() string { return "StringValue" }
+func (m *StringValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StringValue.Unmarshal(m, b)
+}
+func (m *StringValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StringValue.Marshal(b, m, deterministic)
+}
+func (dst *StringValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StringValue.Merge(dst, src)
+}
+func (m *StringValue) XXX_Size() int {
+	return xxx_messageInfo_StringValue.Size(m)
+}
+func (m *StringValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_StringValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StringValue proto.InternalMessageInfo
 
 func (m *StringValue) GetValue() string {
 	if m != nil {
@@ -208,14 +367,36 @@ func (m *StringValue) GetValue() string {
 // The JSON representation for `BytesValue` is JSON string.
 type BytesValue struct {
 	// The bytes value.
-	Value []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	Value                []byte   `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BytesValue) Reset()         { *m = BytesValue{} }
+func (m *BytesValue) String() string { return proto.CompactTextString(m) }
+func (*BytesValue) ProtoMessage()    {}
+func (*BytesValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_wrappers_16c7c35c009f3253, []int{8}
+}
+func (*BytesValue) XXX_WellKnownType() string { return "BytesValue" }
+func (m *BytesValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BytesValue.Unmarshal(m, b)
+}
+func (m *BytesValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BytesValue.Marshal(b, m, deterministic)
+}
+func (dst *BytesValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BytesValue.Merge(dst, src)
+}
+func (m *BytesValue) XXX_Size() int {
+	return xxx_messageInfo_BytesValue.Size(m)
+}
+func (m *BytesValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_BytesValue.DiscardUnknown(m)
 }
 
-func (m *BytesValue) Reset()                    { *m = BytesValue{} }
-func (m *BytesValue) String() string            { return proto.CompactTextString(m) }
-func (*BytesValue) ProtoMessage()               {}
-func (*BytesValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-func (*BytesValue) XXX_WellKnownType() string   { return "BytesValue" }
+var xxx_messageInfo_BytesValue proto.InternalMessageInfo
 
 func (m *BytesValue) GetValue() []byte {
 	if m != nil {
@@ -236,9 +417,11 @@ func init() {
 	proto.RegisterType((*BytesValue)(nil), "google.protobuf.BytesValue")
 }
 
-func init() { proto.RegisterFile("google/protobuf/wrappers.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/protobuf/wrappers.proto", fileDescriptor_wrappers_16c7c35c009f3253)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_wrappers_16c7c35c009f3253 = []byte{
 	// 259 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x2f, 0x4a, 0x2c,
diff --git a/vendor/github.com/golang/protobuf/regenerate.sh b/vendor/github.com/golang/protobuf/regenerate.sh
new file mode 100755
index 00000000..dc7e2d1f
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/regenerate.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -e
+
+# Install the working tree's protoc-gen-gen in a tempdir.
+tmpdir=$(mktemp -d -t regen-wkt.XXXXXX)
+trap 'rm -rf $tmpdir' EXIT
+mkdir -p $tmpdir/bin
+PATH=$tmpdir/bin:$PATH
+GOBIN=$tmpdir/bin go install ./protoc-gen-go
+
+# Public imports require at least Go 1.9.
+supportTypeAliases=""
+if go list -f '{{context.ReleaseTags}}' runtime | grep -q go1.9; then
+  supportTypeAliases=1
+fi
+
+# Generate various test protos.
+PROTO_DIRS=(
+  conformance/internal/conformance_proto
+  jsonpb/jsonpb_test_proto
+  proto
+  protoc-gen-go/testdata
+)
+for dir in ${PROTO_DIRS[@]}; do
+  for p in `find $dir -name "*.proto"`; do
+    if [[ $p == */import_public/* && ! $supportTypeAliases ]]; then
+      echo "# $p (skipped)"
+      continue;
+    fi
+    echo "# $p"
+    protoc -I$dir --go_out=plugins=grpc,paths=source_relative:$dir $p
+  done
+done
+
+# Deriving the location of the source protos from the path to the
+# protoc binary may be a bit odd, but this is what protoc itself does.
+PROTO_INCLUDE=$(dirname $(dirname $(which protoc)))/include
+
+# Well-known types.
+WKT_PROTOS=(any duration empty struct timestamp wrappers)
+for p in ${WKT_PROTOS[@]}; do
+  echo "# google/protobuf/$p.proto"
+  protoc --go_out=paths=source_relative:$tmpdir google/protobuf/$p.proto
+  cp $tmpdir/google/protobuf/$p.pb.go ptypes/$p
+  cp $PROTO_INCLUDE/google/protobuf/$p.proto ptypes/$p
+done
+
+# descriptor.proto.
+echo "# google/protobuf/descriptor.proto"
+protoc --go_out=paths=source_relative:$tmpdir google/protobuf/descriptor.proto
+cp $tmpdir/google/protobuf/descriptor.pb.go protoc-gen-go/descriptor
+cp $PROTO_INCLUDE/google/protobuf/descriptor.proto protoc-gen-go/descriptor
diff --git a/vendor/github.com/kubernetes-csi/csi-test/.gitignore b/vendor/github.com/kubernetes-csi/csi-test/.gitignore
index 5e8f082f..984ec0fb 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/.gitignore
+++ b/vendor/github.com/kubernetes-csi/csi-test/.gitignore
@@ -9,4 +9,5 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+bin/mock
 cmd/csi-sanity/csi-sanity
diff --git a/vendor/github.com/kubernetes-csi/csi-test/.travis.yml b/vendor/github.com/kubernetes-csi/csi-test/.travis.yml
index 414fa97b..261662d3 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/.travis.yml
+++ b/vendor/github.com/kubernetes-csi/csi-test/.travis.yml
@@ -1,9 +1,11 @@
 language: go
 matrix:
   include:
-  - go: 1.x
+  - go: 1.10.3
 script:
-- go fmt $(go list ./... | grep -v vendor) | wc -l | grep 0
-- go vet $(go list ./... | grep -v vendor)
-- go test $(go list ./... | grep -v vendor | grep -v "cmd/csi-sanity")
-- ./hack/e2e.sh
+- make test
+after_success:
+  - if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+      docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" quay.io;
+      make push;
+    fi
diff --git a/vendor/github.com/kubernetes-csi/csi-test/Dockerfile.mock b/vendor/github.com/kubernetes-csi/csi-test/Dockerfile.mock
new file mode 100644
index 00000000..72697712
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/Dockerfile.mock
@@ -0,0 +1,6 @@
+FROM alpine
+LABEL maintainers="Kubernetes Authors"
+LABEL description="CSI Mock Driver"
+
+COPY ./bin/mock mock
+ENTRYPOINT ["/mock"]
diff --git a/vendor/github.com/kubernetes-csi/csi-test/Gopkg.lock b/vendor/github.com/kubernetes-csi/csi-test/Gopkg.lock
index 39d4c232..2737ba71 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/Gopkg.lock
+++ b/vendor/github.com/kubernetes-csi/csi-test/Gopkg.lock
@@ -2,62 +2,143 @@
 
 
 [[projects]]
-  branch = "master"
   name = "github.com/container-storage-interface/spec"
   packages = ["lib/go/csi/v0"]
-  revision = "35d9f9d77954980e449e52c3f3e43c21bd8171f5"
+  revision = "2178fdeea87f1150a17a63252eee28d4d8141f72"
+  version = "v0.3.0"
 
 [[projects]]
   name = "github.com/golang/mock"
   packages = ["gomock"]
-  revision = "13f360950a79f5864a972c786a10a50e44b69541"
-  version = "v1.0.0"
+  revision = "c34cdb4725f4c3844d095133c6e40e448b86589b"
+  version = "v1.1.1"
 
 [[projects]]
   name = "github.com/golang/protobuf"
-  packages = ["proto","protoc-gen-go/descriptor","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"]
-  revision = "925541529c1fa6821df4e44ce2723319eb2be768"
-  version = "v1.0.0"
+  packages = [
+    "proto",
+    "protoc-gen-go/descriptor",
+    "ptypes",
+    "ptypes/any",
+    "ptypes/duration",
+    "ptypes/timestamp",
+    "ptypes/wrappers"
+  ]
+  revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
+  version = "v1.1.0"
 
 [[projects]]
   name = "github.com/onsi/ginkgo"
-  packages = [".","config","internal/codelocation","internal/containernode","internal/failer","internal/leafnodes","internal/remote","internal/spec","internal/spec_iterator","internal/specrunner","internal/suite","internal/testingtproxy","internal/writer","reporters","reporters/stenographer","reporters/stenographer/support/go-colorable","reporters/stenographer/support/go-isatty","types"]
-  revision = "9eda700730cba42af70d53180f9dcce9266bc2bc"
-  version = "v1.4.0"
+  packages = [
+    ".",
+    "config",
+    "internal/codelocation",
+    "internal/containernode",
+    "internal/failer",
+    "internal/leafnodes",
+    "internal/remote",
+    "internal/spec",
+    "internal/spec_iterator",
+    "internal/specrunner",
+    "internal/suite",
+    "internal/testingtproxy",
+    "internal/writer",
+    "reporters",
+    "reporters/stenographer",
+    "reporters/stenographer/support/go-colorable",
+    "reporters/stenographer/support/go-isatty",
+    "types"
+  ]
+  revision = "fa5fabab2a1bfbd924faf4c067d07ae414e2aedf"
+  version = "v1.5.0"
 
 [[projects]]
   name = "github.com/onsi/gomega"
-  packages = [".","format","internal/assertion","internal/asyncassertion","internal/oraclematcher","internal/testingtsupport","matchers","matchers/support/goraph/bipartitegraph","matchers/support/goraph/edge","matchers/support/goraph/node","matchers/support/goraph/util","types"]
-  revision = "003f63b7f4cff3fc95357005358af2de0f5fe152"
-  version = "v1.3.0"
+  packages = [
+    ".",
+    "format",
+    "internal/assertion",
+    "internal/asyncassertion",
+    "internal/oraclematcher",
+    "internal/testingtsupport",
+    "matchers",
+    "matchers/support/goraph/bipartitegraph",
+    "matchers/support/goraph/edge",
+    "matchers/support/goraph/node",
+    "matchers/support/goraph/util",
+    "types"
+  ]
+  revision = "62bff4df71bdbc266561a0caee19f0594b17c240"
+  version = "v1.4.0"
 
 [[projects]]
   name = "github.com/sirupsen/logrus"
   packages = ["."]
-  revision = "d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-  version = "v1.0.4"
+  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+  version = "v1.0.5"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
   packages = ["ssh/terminal"]
-  revision = "91a49db82a88618983a78a06c1cbd4e00ab749ab"
+  revision = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/net"
-  packages = ["context","html","html/atom","html/charset","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"]
-  revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"
+  packages = [
+    "context",
+    "html",
+    "html/atom",
+    "html/charset",
+    "http/httpguts",
+    "http2",
+    "http2/hpack",
+    "idna",
+    "internal/timeseries",
+    "trace"
+  ]
+  revision = "1e491301e022f8f977054da4c2d852decd59571f"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
-  packages = ["unix","windows"]
-  revision = "f6cff0780e542efa0c8e864dc8fa522808f6a598"
+  packages = [
+    "unix",
+    "windows"
+  ]
+  revision = "9527bec2660bd847c050fda93a0f0c6dee0800bb"
 
 [[projects]]
   name = "golang.org/x/text"
-  packages = ["collate","collate/build","encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"]
+  packages = [
+    "collate",
+    "collate/build",
+    "encoding",
+    "encoding/charmap",
+    "encoding/htmlindex",
+    "encoding/internal",
+    "encoding/internal/identifier",
+    "encoding/japanese",
+    "encoding/korean",
+    "encoding/simplifiedchinese",
+    "encoding/traditionalchinese",
+    "encoding/unicode",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "internal/utf8internal",
+    "language",
+    "runes",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable"
+  ]
   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
   version = "v0.3.0"
 
@@ -65,23 +146,50 @@
   branch = "master"
   name = "google.golang.org/genproto"
   packages = ["googleapis/rpc/status"]
-  revision = "2d9486acae19cf9bd0c093d7dc236a323726a9e4"
+  revision = "32ee49c4dd805befd833990acba36cb75042378c"
 
 [[projects]]
   name = "google.golang.org/grpc"
-  packages = [".","balancer","balancer/base","balancer/roundrobin","codes","connectivity","credentials","encoding","encoding/proto","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","reflection","reflection/grpc_reflection_v1alpha","resolver","resolver/dns","resolver/passthrough","stats","status","tap","transport"]
-  revision = "8e4536a86ab602859c20df5ebfd0bd4228d08655"
-  version = "v1.10.0"
+  packages = [
+    ".",
+    "balancer",
+    "balancer/base",
+    "balancer/roundrobin",
+    "channelz",
+    "codes",
+    "connectivity",
+    "credentials",
+    "encoding",
+    "encoding/proto",
+    "grpclb/grpc_lb_v1/messages",
+    "grpclog",
+    "internal",
+    "keepalive",
+    "metadata",
+    "naming",
+    "peer",
+    "reflection",
+    "reflection/grpc_reflection_v1alpha",
+    "resolver",
+    "resolver/dns",
+    "resolver/passthrough",
+    "stats",
+    "status",
+    "tap",
+    "transport"
+  ]
+  revision = "7a6a684ca69eb4cae85ad0a484f2e531598c047b"
+  version = "v1.12.2"
 
 [[projects]]
   name = "gopkg.in/yaml.v2"
   packages = ["."]
-  revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5"
-  version = "v2.1.1"
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "f1ca6410db1fd26a2f3f92e02da2f371644f51f2e143d232771778466d089fb9"
+  inputs-digest = "5dd480018adbb94025564b74bad8dd269cc516183b7b428317f6dd04b07726f4"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/vendor/github.com/kubernetes-csi/csi-test/Gopkg.toml b/vendor/github.com/kubernetes-csi/csi-test/Gopkg.toml
index 91e1cabe..e7312785 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/Gopkg.toml
+++ b/vendor/github.com/kubernetes-csi/csi-test/Gopkg.toml
@@ -27,12 +27,16 @@
 
 [[constraint]]
   name = "github.com/container-storage-interface/spec"
-  branch = "master"
+  version = "~0.3.0"
 
 [[constraint]]
   name = "github.com/golang/mock"
   version = "1.0.0"
 
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  version = "v1.1.0"
+
 [[constraint]]
   name = "github.com/onsi/ginkgo"
   version = "1.4.0"
@@ -49,6 +53,10 @@
   name = "google.golang.org/grpc"
   version = "1.9.2"
 
+[[constraint]]
+  name = "gopkg.in/yaml.v2"
+  version = "v2.1.1"
+
 [prune]
   go-tests = true
   unused-packages = true
diff --git a/vendor/github.com/kubernetes-csi/csi-test/Makefile b/vendor/github.com/kubernetes-csi/csi-test/Makefile
new file mode 100644
index 00000000..621cec71
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/Makefile
@@ -0,0 +1,52 @@
+# Copyright 2018 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+IMAGE_NAME = quay.io/k8scsi/mock-driver
+IMAGE_VERSION = canary
+APP := ./bin/mock
+
+
+ifdef V
+TESTARGS = -v -args -alsologtostderr -v 5
+else
+TESTARGS =
+endif
+
+all: $(APP)
+
+$(APP):
+	mkdir -p bin
+	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o $(APP) ./mock/main.go
+
+clean:
+	rm -rf bin
+
+container: $(APP)
+	docker build -f Dockerfile.mock -t $(IMAGE_NAME):$(IMAGE_VERSION) .
+
+push: container
+	docker push $(IMAGE_NAME):$(IMAGE_VERSION)
+
+test:
+	files=$$(find ./ -name '*.go' | grep -v '^./vendor' ); \
+        if [ $$(gofmt -d $$files | wc -l) -ne 0 ]; then \
+                echo "formatting errors:"; \
+                gofmt -d $$files; \
+                false; \
+        fi
+	go vet $$(go list ./... | grep -v vendor)
+	go test $$(go list ./... | grep -v vendor | grep -v "cmd/csi-sanity")
+	./hack/e2e.sh
+
+.PHONY: all clean container push test
diff --git a/vendor/github.com/kubernetes-csi/csi-test/OWNERS b/vendor/github.com/kubernetes-csi/csi-test/OWNERS
new file mode 100644
index 00000000..a780cce6
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/OWNERS
@@ -0,0 +1,4 @@
+approvers:
+- saad-ali
+- lpabon
+- pohly
diff --git a/vendor/github.com/kubernetes-csi/csi-test/README.md b/vendor/github.com/kubernetes-csi/csi-test/README.md
index 07178eeb..61daecc0 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/README.md
+++ b/vendor/github.com/kubernetes-csi/csi-test/README.md
@@ -1,4 +1,7 @@
 [![Build Status](https://travis-ci.org/kubernetes-csi/csi-test.svg?branch=master)](https://travis-ci.org/kubernetes-csi/csi-test)
+[![Docker Repository on Quay](https://quay.io/repository/k8scsi/mock-driver/status "Docker Repository on
+Quay")](https://quay.io/repository/k8scsi/mock-driver)
+
 # csi-test
 csi-test houses packages and libraries to help test CSI client and plugins.
 
@@ -7,10 +10,20 @@ CO developers can use this framework to create drivers based on the
 [Golang mock](https://github.com/golang/mock) framework. Please see
 [co_test.go](test/co_test.go) for an example.
 
+### Mock driver for testing
+We also provide a container called `quay.io/k8scsi/mock-driver:canary` which can be used as an in-memory mock driver.
+It follows the same release cycle as other containers, so the latest release is `quay.io/k8scsi/mock-driver:v0.3.0`.
+
+You will need to setup the environment variable `CSI_ENDPOINT` for the mock driver to know where to create the unix
+domain socket.
+
 ## For CSI Driver Tests
-To test drivers please take a look at [pkg/sanity](https://github.com/kubernetes-csi/csi-test/tree/master/pkg/sanity)
+To test drivers please take a look at [pkg/sanity](https://github.com/kubernetes-csi/csi-test/tree/master/pkg/sanity).
+This package and [csi-sanity](https://github.com/kubernetes-csi/csi-test/tree/master/cmd/csi-sanity) are meant to test
+the CSI API capability of a driver. They are meant to be an additional test to the unit, functional, and e2e tests of a
+CSI driver.
 
 ### Note
 
-* Master is for CSI v0.2.0. Please use the branch v0.1.0 for CSI v0.1.0
+* Master is for CSI v0.4.0. Please see the branches for other CSI releases.
 * Only Golang 1.9+ supported. See [gRPC issue](https://github.com/grpc/grpc-go/issues/711#issuecomment-326626790)
diff --git a/vendor/github.com/kubernetes-csi/csi-test/SECURITY_CONTACTS b/vendor/github.com/kubernetes-csi/csi-test/SECURITY_CONTACTS
new file mode 100644
index 00000000..00e28e4e
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/SECURITY_CONTACTS
@@ -0,0 +1,14 @@
+# Defined below are the security contacts for this repo.
+#
+# They are the contact point for the Product Security Team to reach out
+# to for triaging and handling of incoming issues.
+#
+# The below names agree to abide by the
+# [Embargo Policy](https://github.com/kubernetes/sig-release/blob/master/security-release-process-documentation/security-release-process.md#embargo-policy)
+# and will be removed and replaced if they violate that agreement.
+#
+# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
+# INSTRUCTIONS AT https://kubernetes.io/security/
+
+saad-ali
+lpabon
diff --git a/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/Makefile b/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/Makefile
index db9e6e7d..520c2153 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/Makefile
+++ b/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/Makefile
@@ -49,16 +49,13 @@ $(PACKAGE): $(APP_NAME)
 linux_amd64_dist:
 	GOOS=linux GOARCH=amd64 $(MAKE) dist
 
-linux_arm_dist:
-	GOOS=linux GOARCH=arm $(MAKE) dist
-
 linux_arm64_dist:
 	GOOS=linux GOARCH=arm64 $(MAKE) dist
 
 darwin_amd64_dist:
 	GOOS=darwin GOARCH=amd64 $(MAKE) dist
 
-release: dist-clean darwin_amd64_dist linux_arm_dist linux_amd64_dist linux_arm64_dist
+release: dist-clean darwin_amd64_dist linux_amd64_dist linux_arm64_dist
 
 .PHONY: release darwin_amd64_dist linux_arm64_dist linux_amd64_dist \
 	    linux_arm_dist linux_amd64_dist clean dist-clean
diff --git a/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/README.md b/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/README.md
index 48127b0f..dade1018 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/README.md
+++ b/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/README.md
@@ -19,6 +19,30 @@ For verbose type:
 $ csi-sanity --ginkgo.v --csi.endpoint=<your csi driver endpoint>
 ```
 
+For csi-credentials, create a secrets file with all the secrets in it:
+```yaml
+CreateVolumeSecret:
+  secretKey: secretval1
+DeleteVolumeSecret:
+  secretKey: secretval2
+ControllerPublishVolumeSecret:
+  secretKey: secretval3
+ControllerUnpublishVolumeSecret:
+  secretKey: secretval4
+NodeStageVolumeSecret:
+  secretKey: secretval5
+NodePublishVolumeSecret:
+  secretKey: secretval6
+```
+
+Pass the file path to csi-sanity as:
+```
+$ csi-sanity --csi.endpoint=<your csi driver endpoint> --csi.secrets=<path to secrets file>
+```
+
+Replace the keys and values of the credentials appropriately. Since the whole
+secret is passed in the request, multiple key-val pairs can be used.
+
 ### Help
 The full Ginkgo and golang unit test parameters are available. Type
 
diff --git a/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/sanity_test.go b/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/sanity_test.go
index 5d288154..a4f4707a 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/sanity_test.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/cmd/csi-sanity/sanity_test.go
@@ -29,16 +29,18 @@ const (
 )
 
 var (
-	VERSION    = "(dev)"
-	endpoint   string
-	mountPoint string
-	version    bool
+	VERSION = "(dev)"
+	version bool
+	config  sanity.Config
 )
 
 func init() {
-	flag.StringVar(&endpoint, prefix+"endpoint", "", "CSI endpoint")
+	flag.StringVar(&config.Address, prefix+"endpoint", "", "CSI endpoint")
 	flag.BoolVar(&version, prefix+"version", false, "Version of this program")
-	flag.StringVar(&mountPoint, prefix+"mountpoint", os.TempDir()+"/csi", "Mount point for NodePublish")
+	flag.StringVar(&config.TargetPath, prefix+"mountdir", os.TempDir()+"/csi", "Mount point for NodePublish")
+	flag.StringVar(&config.StagingPath, prefix+"stagingdir", os.TempDir()+"/csi", "Mount point for NodeStage if staging is supported")
+	flag.StringVar(&config.SecretsFile, prefix+"secrets", "", "CSI secrets file")
+	flag.Int64Var(&config.TestVolumeSize, prefix+"testvolumesize", sanity.DefTestVolumeSize, "Base volume size used for provisioned volumes")
 	flag.Parse()
 }
 
@@ -47,8 +49,8 @@ func TestSanity(t *testing.T) {
 		fmt.Printf("Version = %s\n", VERSION)
 		return
 	}
-	if len(endpoint) == 0 {
+	if len(config.Address) == 0 {
 		t.Fatalf("--%sendpoint must be provided with an CSI endpoint", prefix)
 	}
-	sanity.Test(t, endpoint, mountPoint)
+	sanity.Test(t, &config)
 }
diff --git a/vendor/github.com/kubernetes-csi/csi-test/driver/driver.go b/vendor/github.com/kubernetes-csi/csi-test/driver/driver.go
index 3ed7a832..a8cd796f 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/driver/driver.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/driver/driver.go
@@ -14,127 +14,234 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//go:generate mockgen -package=driver -destination=driver.mock.go github.com/container-storage-interface/spec/lib/go/csi IdentityServer,ControllerServer,NodeServer
+//go:generate mockgen -package=driver -destination=driver.mock.go github.com/container-storage-interface/spec/lib/go/csi/v0 IdentityServer,ControllerServer,NodeServer
 
 package driver
 
 import (
+	"context"
+	"errors"
 	"net"
 	"sync"
 
-	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
-	"github.com/kubernetes-csi/csi-test/utils"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	"github.com/container-storage-interface/spec/lib/go/csi/v0"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )
 
-type MockCSIDriverServers struct {
-	Controller *MockControllerServer
-	Identity   *MockIdentityServer
-	Node       *MockNodeServer
+var (
+	// ErrNoCredentials is the error when a secret is enabled but not passed in the request.
+	ErrNoCredentials = errors.New("secret must be provided")
+	// ErrAuthFailed is the error when the secret is incorrect.
+	ErrAuthFailed = errors.New("authentication failed")
+)
+
+type CSIDriverServers struct {
+	Controller csi.ControllerServer
+	Identity   csi.IdentityServer
+	Node       csi.NodeServer
+}
+
+// This is the key name in all the CSI secret objects.
+const secretField = "secretKey"
+
+// CSICreds is a driver specific secret type. Drivers can have a key-val pair of
+// secrets. This mock driver has a single string secret with secretField as the
+// key.
+type CSICreds struct {
+	CreateVolumeSecret              string
+	DeleteVolumeSecret              string
+	ControllerPublishVolumeSecret   string
+	ControllerUnpublishVolumeSecret string
+	NodeStageVolumeSecret           string
+	NodePublishVolumeSecret         string
+	CreateSnapshotSecret            string
+	DeleteSnapshotSecret            string
 }
 
-type MockCSIDriver struct {
+type CSIDriver struct {
 	listener net.Listener
 	server   *grpc.Server
-	conn     *grpc.ClientConn
-	servers  *MockCSIDriverServers
+	servers  *CSIDriverServers
 	wg       sync.WaitGroup
 	running  bool
 	lock     sync.Mutex
+	creds    *CSICreds
 }
 
-func NewMockCSIDriver(servers *MockCSIDriverServers) *MockCSIDriver {
-	return &MockCSIDriver{
+func NewCSIDriver(servers *CSIDriverServers) *CSIDriver {
+	return &CSIDriver{
 		servers: servers,
 	}
 }
 
-func (m *MockCSIDriver) goServe(started chan<- bool) {
-	m.wg.Add(1)
+func (c *CSIDriver) goServe(started chan<- bool) {
+	c.wg.Add(1)
 	go func() {
-		defer m.wg.Done()
+		defer c.wg.Done()
 		started <- true
-		err := m.server.Serve(m.listener)
+		err := c.server.Serve(c.listener)
 		if err != nil {
 			panic(err.Error())
 		}
 	}()
 }
 
-func (m *MockCSIDriver) Address() string {
-	return m.listener.Addr().String()
+func (c *CSIDriver) Address() string {
+	return c.listener.Addr().String()
 }
-func (m *MockCSIDriver) Start() error {
-	m.lock.Lock()
-	defer m.lock.Unlock()
+func (c *CSIDriver) Start(l net.Listener) error {
+	c.lock.Lock()
+	defer c.lock.Unlock()
 
-	// Listen on a port assigned by the net package
-	l, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		return err
-	}
-	m.listener = l
+	// Set listener
+	c.listener = l
 
 	// Create a new grpc server
-	m.server = grpc.NewServer()
+	c.server = grpc.NewServer(
+		grpc.UnaryInterceptor(c.authInterceptor),
+	)
 
 	// Register Mock servers
-	if m.servers.Controller != nil {
-		csi.RegisterControllerServer(m.server, m.servers.Controller)
+	if c.servers.Controller != nil {
+		csi.RegisterControllerServer(c.server, c.servers.Controller)
 	}
-	if m.servers.Identity != nil {
-		csi.RegisterIdentityServer(m.server, m.servers.Identity)
+	if c.servers.Identity != nil {
+		csi.RegisterIdentityServer(c.server, c.servers.Identity)
 	}
-	if m.servers.Node != nil {
-		csi.RegisterNodeServer(m.server, m.servers.Node)
+	if c.servers.Node != nil {
+		csi.RegisterNodeServer(c.server, c.servers.Node)
 	}
-	reflection.Register(m.server)
+	reflection.Register(c.server)
 
 	// Start listening for requests
 	waitForServer := make(chan bool)
-	m.goServe(waitForServer)
+	c.goServe(waitForServer)
 	<-waitForServer
-	m.running = true
+	c.running = true
 	return nil
 }
 
-func (m *MockCSIDriver) Nexus() (*grpc.ClientConn, error) {
-	// Start server
-	err := m.Start()
-	if err != nil {
-		return nil, err
-	}
+func (c *CSIDriver) Stop() {
+	c.lock.Lock()
+	defer c.lock.Unlock()
 
-	// Create a client connection
-	m.conn, err = utils.Connect(m.Address())
-	if err != nil {
-		return nil, err
+	if !c.running {
+		return
 	}
 
-	return m.conn, nil
+	c.server.Stop()
+	c.wg.Wait()
 }
 
-func (m *MockCSIDriver) Stop() {
-	m.lock.Lock()
-	defer m.lock.Unlock()
+func (c *CSIDriver) Close() {
+	c.server.Stop()
+}
 
-	if !m.running {
-		return
+func (c *CSIDriver) IsRunning() bool {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	return c.running
+}
+
+// SetDefaultCreds sets the default secrets for CSI creds.
+func (c *CSIDriver) SetDefaultCreds() {
+	c.creds = &CSICreds{
+		CreateVolumeSecret:              "secretval1",
+		DeleteVolumeSecret:              "secretval2",
+		ControllerPublishVolumeSecret:   "secretval3",
+		ControllerUnpublishVolumeSecret: "secretval4",
+		NodeStageVolumeSecret:           "secretval5",
+		NodePublishVolumeSecret:         "secretval6",
+		CreateSnapshotSecret:            "secretval7",
+		DeleteSnapshotSecret:            "secretval8",
 	}
+}
 
-	m.server.Stop()
-	m.wg.Wait()
+func (c *CSIDriver) authInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+	if c.creds != nil {
+		authenticated, authErr := isAuthenticated(req, c.creds)
+		if !authenticated {
+			if authErr == ErrNoCredentials {
+				return nil, status.Error(codes.InvalidArgument, authErr.Error())
+			}
+			if authErr == ErrAuthFailed {
+				return nil, status.Error(codes.Unauthenticated, authErr.Error())
+			}
+		}
+	}
+
+	h, err := handler(ctx, req)
+
+	return h, err
 }
 
-func (m *MockCSIDriver) Close() {
-	m.conn.Close()
-	m.server.Stop()
+func isAuthenticated(req interface{}, creds *CSICreds) (bool, error) {
+	switch r := req.(type) {
+	case *csi.CreateVolumeRequest:
+		return authenticateCreateVolume(r, creds)
+	case *csi.DeleteVolumeRequest:
+		return authenticateDeleteVolume(r, creds)
+	case *csi.ControllerPublishVolumeRequest:
+		return authenticateControllerPublishVolume(r, creds)
+	case *csi.ControllerUnpublishVolumeRequest:
+		return authenticateControllerUnpublishVolume(r, creds)
+	case *csi.NodeStageVolumeRequest:
+		return authenticateNodeStageVolume(r, creds)
+	case *csi.NodePublishVolumeRequest:
+		return authenticateNodePublishVolume(r, creds)
+	case *csi.CreateSnapshotRequest:
+		return authenticateCreateSnapshot(r, creds)
+	case *csi.DeleteSnapshotRequest:
+		return authenticateDeleteSnapshot(r, creds)
+	default:
+		return true, nil
+	}
 }
 
-func (m *MockCSIDriver) IsRunning() bool {
-	m.lock.Lock()
-	defer m.lock.Unlock()
+func authenticateCreateVolume(req *csi.CreateVolumeRequest, creds *CSICreds) (bool, error) {
+	return credsCheck(req.GetControllerCreateSecrets(), creds.CreateVolumeSecret)
+}
+
+func authenticateDeleteVolume(req *csi.DeleteVolumeRequest, creds *CSICreds) (bool, error) {
+	return credsCheck(req.GetControllerDeleteSecrets(), creds.DeleteVolumeSecret)
+}
+
+func authenticateControllerPublishVolume(req *csi.ControllerPublishVolumeRequest, creds *CSICreds) (bool, error) {
+	return credsCheck(req.GetControllerPublishSecrets(), creds.ControllerPublishVolumeSecret)
+}
+
+func authenticateControllerUnpublishVolume(req *csi.ControllerUnpublishVolumeRequest, creds *CSICreds) (bool, error) {
+	return credsCheck(req.GetControllerUnpublishSecrets(), creds.ControllerUnpublishVolumeSecret)
+}
+
+func authenticateNodeStageVolume(req *csi.NodeStageVolumeRequest, creds *CSICreds) (bool, error) {
+	return credsCheck(req.GetNodeStageSecrets(), creds.NodeStageVolumeSecret)
+}
 
-	return m.running
+func authenticateNodePublishVolume(req *csi.NodePublishVolumeRequest, creds *CSICreds) (bool, error) {
+	return credsCheck(req.GetNodePublishSecrets(), creds.NodePublishVolumeSecret)
+}
+
+func authenticateCreateSnapshot(req *csi.CreateSnapshotRequest, creds *CSICreds) (bool, error) {
+	return credsCheck(req.GetCreateSnapshotSecrets(), creds.CreateSnapshotSecret)
+}
+
+func authenticateDeleteSnapshot(req *csi.DeleteSnapshotRequest, creds *CSICreds) (bool, error) {
+	return credsCheck(req.GetDeleteSnapshotSecrets(), creds.DeleteSnapshotSecret)
+}
+
+func credsCheck(secrets map[string]string, secretVal string) (bool, error) {
+	if len(secrets) == 0 {
+		return false, ErrNoCredentials
+	}
+
+	if secrets[secretField] != secretVal {
+		return false, ErrAuthFailed
+	}
+	return true, nil
 }
diff --git a/vendor/github.com/kubernetes-csi/csi-test/driver/driver.mock.go b/vendor/github.com/kubernetes-csi/csi-test/driver/driver.mock.go
index e9e14061..f6d2b135 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/driver/driver.mock.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/driver/driver.mock.go
@@ -1,261 +1,354 @@
-// Automatically generated by MockGen. DO NOT EDIT!
+// Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/container-storage-interface/spec/lib/go/csi/v0 (interfaces: IdentityServer,ControllerServer,NodeServer)
 
+// Package driver is a generated GoMock package.
 package driver
 
 import (
 	context "context"
-
 	v0 "github.com/container-storage-interface/spec/lib/go/csi/v0"
 	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
 )
 
-// Mock of IdentityServer interface
+// MockIdentityServer is a mock of IdentityServer interface
 type MockIdentityServer struct {
 	ctrl     *gomock.Controller
-	recorder *_MockIdentityServerRecorder
+	recorder *MockIdentityServerMockRecorder
 }
 
-// Recorder for MockIdentityServer (not exported)
-type _MockIdentityServerRecorder struct {
+// MockIdentityServerMockRecorder is the mock recorder for MockIdentityServer
+type MockIdentityServerMockRecorder struct {
 	mock *MockIdentityServer
 }
 
+// NewMockIdentityServer creates a new mock instance
 func NewMockIdentityServer(ctrl *gomock.Controller) *MockIdentityServer {
 	mock := &MockIdentityServer{ctrl: ctrl}
-	mock.recorder = &_MockIdentityServerRecorder{mock}
+	mock.recorder = &MockIdentityServerMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockIdentityServer) EXPECT() *_MockIdentityServerRecorder {
-	return _m.recorder
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockIdentityServer) EXPECT() *MockIdentityServerMockRecorder {
+	return m.recorder
 }
 
-func (_m *MockIdentityServer) GetPluginCapabilities(_param0 context.Context, _param1 *v0.GetPluginCapabilitiesRequest) (*v0.GetPluginCapabilitiesResponse, error) {
-	ret := _m.ctrl.Call(_m, "GetPluginCapabilities", _param0, _param1)
+// GetPluginCapabilities mocks base method
+func (m *MockIdentityServer) GetPluginCapabilities(arg0 context.Context, arg1 *v0.GetPluginCapabilitiesRequest) (*v0.GetPluginCapabilitiesResponse, error) {
+	ret := m.ctrl.Call(m, "GetPluginCapabilities", arg0, arg1)
 	ret0, _ := ret[0].(*v0.GetPluginCapabilitiesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockIdentityServerRecorder) GetPluginCapabilities(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetPluginCapabilities", arg0, arg1)
+// GetPluginCapabilities indicates an expected call of GetPluginCapabilities
+func (mr *MockIdentityServerMockRecorder) GetPluginCapabilities(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPluginCapabilities", reflect.TypeOf((*MockIdentityServer)(nil).GetPluginCapabilities), arg0, arg1)
 }
 
-func (_m *MockIdentityServer) GetPluginInfo(_param0 context.Context, _param1 *v0.GetPluginInfoRequest) (*v0.GetPluginInfoResponse, error) {
-	ret := _m.ctrl.Call(_m, "GetPluginInfo", _param0, _param1)
+// GetPluginInfo mocks base method
+func (m *MockIdentityServer) GetPluginInfo(arg0 context.Context, arg1 *v0.GetPluginInfoRequest) (*v0.GetPluginInfoResponse, error) {
+	ret := m.ctrl.Call(m, "GetPluginInfo", arg0, arg1)
 	ret0, _ := ret[0].(*v0.GetPluginInfoResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockIdentityServerRecorder) GetPluginInfo(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetPluginInfo", arg0, arg1)
+// GetPluginInfo indicates an expected call of GetPluginInfo
+func (mr *MockIdentityServerMockRecorder) GetPluginInfo(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPluginInfo", reflect.TypeOf((*MockIdentityServer)(nil).GetPluginInfo), arg0, arg1)
 }
 
-func (_m *MockIdentityServer) Probe(_param0 context.Context, _param1 *v0.ProbeRequest) (*v0.ProbeResponse, error) {
-	ret := _m.ctrl.Call(_m, "Probe", _param0, _param1)
+// Probe mocks base method
+func (m *MockIdentityServer) Probe(arg0 context.Context, arg1 *v0.ProbeRequest) (*v0.ProbeResponse, error) {
+	ret := m.ctrl.Call(m, "Probe", arg0, arg1)
 	ret0, _ := ret[0].(*v0.ProbeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockIdentityServerRecorder) Probe(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Probe", arg0, arg1)
+// Probe indicates an expected call of Probe
+func (mr *MockIdentityServerMockRecorder) Probe(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Probe", reflect.TypeOf((*MockIdentityServer)(nil).Probe), arg0, arg1)
 }
 
-// Mock of ControllerServer interface
+// MockControllerServer is a mock of ControllerServer interface
 type MockControllerServer struct {
 	ctrl     *gomock.Controller
-	recorder *_MockControllerServerRecorder
+	recorder *MockControllerServerMockRecorder
 }
 
-// Recorder for MockControllerServer (not exported)
-type _MockControllerServerRecorder struct {
+// MockControllerServerMockRecorder is the mock recorder for MockControllerServer
+type MockControllerServerMockRecorder struct {
 	mock *MockControllerServer
 }
 
+// NewMockControllerServer creates a new mock instance
 func NewMockControllerServer(ctrl *gomock.Controller) *MockControllerServer {
 	mock := &MockControllerServer{ctrl: ctrl}
-	mock.recorder = &_MockControllerServerRecorder{mock}
+	mock.recorder = &MockControllerServerMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockControllerServer) EXPECT() *_MockControllerServerRecorder {
-	return _m.recorder
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockControllerServer) EXPECT() *MockControllerServerMockRecorder {
+	return m.recorder
 }
 
-func (_m *MockControllerServer) ControllerGetCapabilities(_param0 context.Context, _param1 *v0.ControllerGetCapabilitiesRequest) (*v0.ControllerGetCapabilitiesResponse, error) {
-	ret := _m.ctrl.Call(_m, "ControllerGetCapabilities", _param0, _param1)
+// ControllerGetCapabilities mocks base method
+func (m *MockControllerServer) ControllerGetCapabilities(arg0 context.Context, arg1 *v0.ControllerGetCapabilitiesRequest) (*v0.ControllerGetCapabilitiesResponse, error) {
+	ret := m.ctrl.Call(m, "ControllerGetCapabilities", arg0, arg1)
 	ret0, _ := ret[0].(*v0.ControllerGetCapabilitiesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockControllerServerRecorder) ControllerGetCapabilities(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ControllerGetCapabilities", arg0, arg1)
+// ControllerGetCapabilities indicates an expected call of ControllerGetCapabilities
+func (mr *MockControllerServerMockRecorder) ControllerGetCapabilities(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ControllerGetCapabilities", reflect.TypeOf((*MockControllerServer)(nil).ControllerGetCapabilities), arg0, arg1)
 }
 
-func (_m *MockControllerServer) ControllerPublishVolume(_param0 context.Context, _param1 *v0.ControllerPublishVolumeRequest) (*v0.ControllerPublishVolumeResponse, error) {
-	ret := _m.ctrl.Call(_m, "ControllerPublishVolume", _param0, _param1)
+// ControllerPublishVolume mocks base method
+func (m *MockControllerServer) ControllerPublishVolume(arg0 context.Context, arg1 *v0.ControllerPublishVolumeRequest) (*v0.ControllerPublishVolumeResponse, error) {
+	ret := m.ctrl.Call(m, "ControllerPublishVolume", arg0, arg1)
 	ret0, _ := ret[0].(*v0.ControllerPublishVolumeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockControllerServerRecorder) ControllerPublishVolume(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ControllerPublishVolume", arg0, arg1)
+// ControllerPublishVolume indicates an expected call of ControllerPublishVolume
+func (mr *MockControllerServerMockRecorder) ControllerPublishVolume(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ControllerPublishVolume", reflect.TypeOf((*MockControllerServer)(nil).ControllerPublishVolume), arg0, arg1)
 }
 
-func (_m *MockControllerServer) ControllerUnpublishVolume(_param0 context.Context, _param1 *v0.ControllerUnpublishVolumeRequest) (*v0.ControllerUnpublishVolumeResponse, error) {
-	ret := _m.ctrl.Call(_m, "ControllerUnpublishVolume", _param0, _param1)
+// ControllerUnpublishVolume mocks base method
+func (m *MockControllerServer) ControllerUnpublishVolume(arg0 context.Context, arg1 *v0.ControllerUnpublishVolumeRequest) (*v0.ControllerUnpublishVolumeResponse, error) {
+	ret := m.ctrl.Call(m, "ControllerUnpublishVolume", arg0, arg1)
 	ret0, _ := ret[0].(*v0.ControllerUnpublishVolumeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockControllerServerRecorder) ControllerUnpublishVolume(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ControllerUnpublishVolume", arg0, arg1)
+// ControllerUnpublishVolume indicates an expected call of ControllerUnpublishVolume
+func (mr *MockControllerServerMockRecorder) ControllerUnpublishVolume(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ControllerUnpublishVolume", reflect.TypeOf((*MockControllerServer)(nil).ControllerUnpublishVolume), arg0, arg1)
+}
+
+// CreateSnapshot mocks base method
+func (m *MockControllerServer) CreateSnapshot(arg0 context.Context, arg1 *v0.CreateSnapshotRequest) (*v0.CreateSnapshotResponse, error) {
+	ret := m.ctrl.Call(m, "CreateSnapshot", arg0, arg1)
+	ret0, _ := ret[0].(*v0.CreateSnapshotResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// CreateSnapshot indicates an expected call of CreateSnapshot
+func (mr *MockControllerServerMockRecorder) CreateSnapshot(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSnapshot", reflect.TypeOf((*MockControllerServer)(nil).CreateSnapshot), arg0, arg1)
 }
 
-func (_m *MockControllerServer) CreateVolume(_param0 context.Context, _param1 *v0.CreateVolumeRequest) (*v0.CreateVolumeResponse, error) {
-	ret := _m.ctrl.Call(_m, "CreateVolume", _param0, _param1)
+// CreateVolume mocks base method
+func (m *MockControllerServer) CreateVolume(arg0 context.Context, arg1 *v0.CreateVolumeRequest) (*v0.CreateVolumeResponse, error) {
+	ret := m.ctrl.Call(m, "CreateVolume", arg0, arg1)
 	ret0, _ := ret[0].(*v0.CreateVolumeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockControllerServerRecorder) CreateVolume(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "CreateVolume", arg0, arg1)
+// CreateVolume indicates an expected call of CreateVolume
+func (mr *MockControllerServerMockRecorder) CreateVolume(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateVolume", reflect.TypeOf((*MockControllerServer)(nil).CreateVolume), arg0, arg1)
+}
+
+// DeleteSnapshot mocks base method
+func (m *MockControllerServer) DeleteSnapshot(arg0 context.Context, arg1 *v0.DeleteSnapshotRequest) (*v0.DeleteSnapshotResponse, error) {
+	ret := m.ctrl.Call(m, "DeleteSnapshot", arg0, arg1)
+	ret0, _ := ret[0].(*v0.DeleteSnapshotResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DeleteSnapshot indicates an expected call of DeleteSnapshot
+func (mr *MockControllerServerMockRecorder) DeleteSnapshot(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSnapshot", reflect.TypeOf((*MockControllerServer)(nil).DeleteSnapshot), arg0, arg1)
 }
 
-func (_m *MockControllerServer) DeleteVolume(_param0 context.Context, _param1 *v0.DeleteVolumeRequest) (*v0.DeleteVolumeResponse, error) {
-	ret := _m.ctrl.Call(_m, "DeleteVolume", _param0, _param1)
+// DeleteVolume mocks base method
+func (m *MockControllerServer) DeleteVolume(arg0 context.Context, arg1 *v0.DeleteVolumeRequest) (*v0.DeleteVolumeResponse, error) {
+	ret := m.ctrl.Call(m, "DeleteVolume", arg0, arg1)
 	ret0, _ := ret[0].(*v0.DeleteVolumeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockControllerServerRecorder) DeleteVolume(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "DeleteVolume", arg0, arg1)
+// DeleteVolume indicates an expected call of DeleteVolume
+func (mr *MockControllerServerMockRecorder) DeleteVolume(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteVolume", reflect.TypeOf((*MockControllerServer)(nil).DeleteVolume), arg0, arg1)
 }
 
-func (_m *MockControllerServer) GetCapacity(_param0 context.Context, _param1 *v0.GetCapacityRequest) (*v0.GetCapacityResponse, error) {
-	ret := _m.ctrl.Call(_m, "GetCapacity", _param0, _param1)
+// GetCapacity mocks base method
+func (m *MockControllerServer) GetCapacity(arg0 context.Context, arg1 *v0.GetCapacityRequest) (*v0.GetCapacityResponse, error) {
+	ret := m.ctrl.Call(m, "GetCapacity", arg0, arg1)
 	ret0, _ := ret[0].(*v0.GetCapacityResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockControllerServerRecorder) GetCapacity(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetCapacity", arg0, arg1)
+// GetCapacity indicates an expected call of GetCapacity
+func (mr *MockControllerServerMockRecorder) GetCapacity(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCapacity", reflect.TypeOf((*MockControllerServer)(nil).GetCapacity), arg0, arg1)
 }
 
-func (_m *MockControllerServer) ListVolumes(_param0 context.Context, _param1 *v0.ListVolumesRequest) (*v0.ListVolumesResponse, error) {
-	ret := _m.ctrl.Call(_m, "ListVolumes", _param0, _param1)
+// ListSnapshots mocks base method
+func (m *MockControllerServer) ListSnapshots(arg0 context.Context, arg1 *v0.ListSnapshotsRequest) (*v0.ListSnapshotsResponse, error) {
+	ret := m.ctrl.Call(m, "ListSnapshots", arg0, arg1)
+	ret0, _ := ret[0].(*v0.ListSnapshotsResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// ListSnapshots indicates an expected call of ListSnapshots
+func (mr *MockControllerServerMockRecorder) ListSnapshots(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListSnapshots", reflect.TypeOf((*MockControllerServer)(nil).ListSnapshots), arg0, arg1)
+}
+
+// ListVolumes mocks base method
+func (m *MockControllerServer) ListVolumes(arg0 context.Context, arg1 *v0.ListVolumesRequest) (*v0.ListVolumesResponse, error) {
+	ret := m.ctrl.Call(m, "ListVolumes", arg0, arg1)
 	ret0, _ := ret[0].(*v0.ListVolumesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockControllerServerRecorder) ListVolumes(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ListVolumes", arg0, arg1)
+// ListVolumes indicates an expected call of ListVolumes
+func (mr *MockControllerServerMockRecorder) ListVolumes(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListVolumes", reflect.TypeOf((*MockControllerServer)(nil).ListVolumes), arg0, arg1)
 }
 
-func (_m *MockControllerServer) ValidateVolumeCapabilities(_param0 context.Context, _param1 *v0.ValidateVolumeCapabilitiesRequest) (*v0.ValidateVolumeCapabilitiesResponse, error) {
-	ret := _m.ctrl.Call(_m, "ValidateVolumeCapabilities", _param0, _param1)
+// ValidateVolumeCapabilities mocks base method
+func (m *MockControllerServer) ValidateVolumeCapabilities(arg0 context.Context, arg1 *v0.ValidateVolumeCapabilitiesRequest) (*v0.ValidateVolumeCapabilitiesResponse, error) {
+	ret := m.ctrl.Call(m, "ValidateVolumeCapabilities", arg0, arg1)
 	ret0, _ := ret[0].(*v0.ValidateVolumeCapabilitiesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockControllerServerRecorder) ValidateVolumeCapabilities(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ValidateVolumeCapabilities", arg0, arg1)
+// ValidateVolumeCapabilities indicates an expected call of ValidateVolumeCapabilities
+func (mr *MockControllerServerMockRecorder) ValidateVolumeCapabilities(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateVolumeCapabilities", reflect.TypeOf((*MockControllerServer)(nil).ValidateVolumeCapabilities), arg0, arg1)
 }
 
-// Mock of NodeServer interface
+// MockNodeServer is a mock of NodeServer interface
 type MockNodeServer struct {
 	ctrl     *gomock.Controller
-	recorder *_MockNodeServerRecorder
+	recorder *MockNodeServerMockRecorder
 }
 
-// Recorder for MockNodeServer (not exported)
-type _MockNodeServerRecorder struct {
+// MockNodeServerMockRecorder is the mock recorder for MockNodeServer
+type MockNodeServerMockRecorder struct {
 	mock *MockNodeServer
 }
 
+// NewMockNodeServer creates a new mock instance
 func NewMockNodeServer(ctrl *gomock.Controller) *MockNodeServer {
 	mock := &MockNodeServer{ctrl: ctrl}
-	mock.recorder = &_MockNodeServerRecorder{mock}
+	mock.recorder = &MockNodeServerMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockNodeServer) EXPECT() *_MockNodeServerRecorder {
-	return _m.recorder
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockNodeServer) EXPECT() *MockNodeServerMockRecorder {
+	return m.recorder
 }
 
-func (_m *MockNodeServer) NodeGetCapabilities(_param0 context.Context, _param1 *v0.NodeGetCapabilitiesRequest) (*v0.NodeGetCapabilitiesResponse, error) {
-	ret := _m.ctrl.Call(_m, "NodeGetCapabilities", _param0, _param1)
+// NodeGetCapabilities mocks base method
+func (m *MockNodeServer) NodeGetCapabilities(arg0 context.Context, arg1 *v0.NodeGetCapabilitiesRequest) (*v0.NodeGetCapabilitiesResponse, error) {
+	ret := m.ctrl.Call(m, "NodeGetCapabilities", arg0, arg1)
 	ret0, _ := ret[0].(*v0.NodeGetCapabilitiesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockNodeServerRecorder) NodeGetCapabilities(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "NodeGetCapabilities", arg0, arg1)
+// NodeGetCapabilities indicates an expected call of NodeGetCapabilities
+func (mr *MockNodeServerMockRecorder) NodeGetCapabilities(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeGetCapabilities", reflect.TypeOf((*MockNodeServer)(nil).NodeGetCapabilities), arg0, arg1)
 }
 
-func (_m *MockNodeServer) NodeGetId(_param0 context.Context, _param1 *v0.NodeGetIdRequest) (*v0.NodeGetIdResponse, error) {
-	ret := _m.ctrl.Call(_m, "NodeGetId", _param0, _param1)
+// NodeGetId mocks base method
+func (m *MockNodeServer) NodeGetId(arg0 context.Context, arg1 *v0.NodeGetIdRequest) (*v0.NodeGetIdResponse, error) {
+	ret := m.ctrl.Call(m, "NodeGetId", arg0, arg1)
 	ret0, _ := ret[0].(*v0.NodeGetIdResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockNodeServerRecorder) NodeGetId(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "NodeGetId", arg0, arg1)
+// NodeGetId indicates an expected call of NodeGetId
+func (mr *MockNodeServerMockRecorder) NodeGetId(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeGetId", reflect.TypeOf((*MockNodeServer)(nil).NodeGetId), arg0, arg1)
+}
+
+// NodeGetInfo mocks base method
+func (m *MockNodeServer) NodeGetInfo(arg0 context.Context, arg1 *v0.NodeGetInfoRequest) (*v0.NodeGetInfoResponse, error) {
+	ret := m.ctrl.Call(m, "NodeGetInfo", arg0, arg1)
+	ret0, _ := ret[0].(*v0.NodeGetInfoResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// NodeGetInfo indicates an expected call of NodeGetInfo
+func (mr *MockNodeServerMockRecorder) NodeGetInfo(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeGetInfo", reflect.TypeOf((*MockNodeServer)(nil).NodeGetInfo), arg0, arg1)
 }
 
-func (_m *MockNodeServer) NodePublishVolume(_param0 context.Context, _param1 *v0.NodePublishVolumeRequest) (*v0.NodePublishVolumeResponse, error) {
-	ret := _m.ctrl.Call(_m, "NodePublishVolume", _param0, _param1)
+// NodePublishVolume mocks base method
+func (m *MockNodeServer) NodePublishVolume(arg0 context.Context, arg1 *v0.NodePublishVolumeRequest) (*v0.NodePublishVolumeResponse, error) {
+	ret := m.ctrl.Call(m, "NodePublishVolume", arg0, arg1)
 	ret0, _ := ret[0].(*v0.NodePublishVolumeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockNodeServerRecorder) NodePublishVolume(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "NodePublishVolume", arg0, arg1)
+// NodePublishVolume indicates an expected call of NodePublishVolume
+func (mr *MockNodeServerMockRecorder) NodePublishVolume(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodePublishVolume", reflect.TypeOf((*MockNodeServer)(nil).NodePublishVolume), arg0, arg1)
 }
 
-func (_m *MockNodeServer) NodeStageVolume(_param0 context.Context, _param1 *v0.NodeStageVolumeRequest) (*v0.NodeStageVolumeResponse, error) {
-	ret := _m.ctrl.Call(_m, "NodeStageVolume", _param0, _param1)
+// NodeStageVolume mocks base method
+func (m *MockNodeServer) NodeStageVolume(arg0 context.Context, arg1 *v0.NodeStageVolumeRequest) (*v0.NodeStageVolumeResponse, error) {
+	ret := m.ctrl.Call(m, "NodeStageVolume", arg0, arg1)
 	ret0, _ := ret[0].(*v0.NodeStageVolumeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockNodeServerRecorder) NodeStageVolume(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "NodeStageVolume", arg0, arg1)
+// NodeStageVolume indicates an expected call of NodeStageVolume
+func (mr *MockNodeServerMockRecorder) NodeStageVolume(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeStageVolume", reflect.TypeOf((*MockNodeServer)(nil).NodeStageVolume), arg0, arg1)
 }
 
-func (_m *MockNodeServer) NodeUnpublishVolume(_param0 context.Context, _param1 *v0.NodeUnpublishVolumeRequest) (*v0.NodeUnpublishVolumeResponse, error) {
-	ret := _m.ctrl.Call(_m, "NodeUnpublishVolume", _param0, _param1)
+// NodeUnpublishVolume mocks base method
+func (m *MockNodeServer) NodeUnpublishVolume(arg0 context.Context, arg1 *v0.NodeUnpublishVolumeRequest) (*v0.NodeUnpublishVolumeResponse, error) {
+	ret := m.ctrl.Call(m, "NodeUnpublishVolume", arg0, arg1)
 	ret0, _ := ret[0].(*v0.NodeUnpublishVolumeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockNodeServerRecorder) NodeUnpublishVolume(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "NodeUnpublishVolume", arg0, arg1)
+// NodeUnpublishVolume indicates an expected call of NodeUnpublishVolume
+func (mr *MockNodeServerMockRecorder) NodeUnpublishVolume(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeUnpublishVolume", reflect.TypeOf((*MockNodeServer)(nil).NodeUnpublishVolume), arg0, arg1)
 }
 
-func (_m *MockNodeServer) NodeUnstageVolume(_param0 context.Context, _param1 *v0.NodeUnstageVolumeRequest) (*v0.NodeUnstageVolumeResponse, error) {
-	ret := _m.ctrl.Call(_m, "NodeUnstageVolume", _param0, _param1)
+// NodeUnstageVolume mocks base method
+func (m *MockNodeServer) NodeUnstageVolume(arg0 context.Context, arg1 *v0.NodeUnstageVolumeRequest) (*v0.NodeUnstageVolumeResponse, error) {
+	ret := m.ctrl.Call(m, "NodeUnstageVolume", arg0, arg1)
 	ret0, _ := ret[0].(*v0.NodeUnstageVolumeResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockNodeServerRecorder) NodeUnstageVolume(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "NodeUnstageVolume", arg0, arg1)
+// NodeUnstageVolume indicates an expected call of NodeUnstageVolume
+func (mr *MockNodeServerMockRecorder) NodeUnstageVolume(arg0, arg1 interface{}) *gomock.Call {
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeUnstageVolume", reflect.TypeOf((*MockNodeServer)(nil).NodeUnstageVolume), arg0, arg1)
 }
diff --git a/vendor/github.com/kubernetes-csi/csi-test/driver/mock.go b/vendor/github.com/kubernetes-csi/csi-test/driver/mock.go
new file mode 100644
index 00000000..9b051eee
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/driver/mock.go
@@ -0,0 +1,83 @@
+/*
+Copyright 2017 Luis Pabón luis@portworx.com
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package driver
+
+import (
+	"net"
+
+	"github.com/kubernetes-csi/csi-test/utils"
+	"google.golang.org/grpc"
+)
+
+type MockCSIDriverServers struct {
+	Controller *MockControllerServer
+	Identity   *MockIdentityServer
+	Node       *MockNodeServer
+}
+
+type MockCSIDriver struct {
+	CSIDriver
+	conn *grpc.ClientConn
+}
+
+func NewMockCSIDriver(servers *MockCSIDriverServers) *MockCSIDriver {
+	return &MockCSIDriver{
+		CSIDriver: CSIDriver{
+			servers: &CSIDriverServers{
+				Controller: servers.Controller,
+				Node:       servers.Node,
+				Identity:   servers.Identity,
+			},
+		},
+	}
+}
+
+func (m *MockCSIDriver) Start() error {
+	// Listen on a port assigned by the net package
+	l, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		return err
+	}
+
+	if err := m.CSIDriver.Start(l); err != nil {
+		l.Close()
+		return err
+	}
+
+	return nil
+}
+
+func (m *MockCSIDriver) Nexus() (*grpc.ClientConn, error) {
+	// Start server
+	err := m.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	// Create a client connection
+	m.conn, err = utils.Connect(m.Address())
+	if err != nil {
+		return nil, err
+	}
+
+	return m.conn, nil
+}
+
+func (m *MockCSIDriver) Close() {
+	m.conn.Close()
+	m.server.Stop()
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/hack/e2e.sh b/vendor/github.com/kubernetes-csi/csi-test/hack/e2e.sh
index 43fcba84..777250eb 100755
--- a/vendor/github.com/kubernetes-csi/csi-test/hack/e2e.sh
+++ b/vendor/github.com/kubernetes-csi/csi-test/hack/e2e.sh
@@ -2,8 +2,6 @@
 
 TESTARGS=$@
 UDS="/tmp/e2e-csi-sanity.sock"
-CSI_ENDPOINTS="127.0.0.1:9998"
-CSI_ENDPOINTS="$CSI_ENDPOINTS unix://${UDS}"
 CSI_ENDPOINTS="$CSI_ENDPOINTS ${UDS}"
 CSI_MOCK_VERSION="master"
 
@@ -13,10 +11,10 @@ CSI_MOCK_VERSION="master"
 #      See https://github.com/grpc/grpc/blob/master/doc/naming.md
 runTest()
 {
-	CSI_ENDPOINT=$1 mock &
+	CSI_ENDPOINT=$1 ./bin/mock &
 	local pid=$!
 
-	csi-sanity $TESTARGS --csi.endpoint=$2; ret=$?
+	./cmd/csi-sanity/csi-sanity $TESTARGS --csi.endpoint=$2; ret=$?
 	kill -9 $pid
 
 	if [ $ret -ne 0 ] ; then
@@ -24,19 +22,29 @@ runTest()
 	fi
 }
 
-cd mock
-  make clean mock || exit 1
-cd ..
+runTestWithCreds()
+{
+	CSI_ENDPOINT=$1 CSI_ENABLE_CREDS=true ./bin/mock &
+	local pid=$!
+
+	./cmd/csi-sanity/csi-sanity $TESTARGS --csi.endpoint=$2 --csi.secrets=mock/mocksecret.yaml; ret=$?
+	kill -9 $pid
+
+	if [ $ret -ne 0 ] ; then
+		exit $ret
+	fi
+}
+
+go build -o bin/mock ./mock || exit 1
 
 cd cmd/csi-sanity
   make clean install || exit 1
 cd ../..
 
-runTest "tcp://127.0.0.1:9998" "127.0.0.1:9998"
-rm -f $UDS
-runTest "unix://${UDS}" "unix://${UDS}"
-rm -f $UDS
 runTest "${UDS}" "${UDS}"
 rm -f $UDS
 
+runTestWithCreds "${UDS}" "${UDS}"
+rm -f $UDS
+
 exit 0
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/.gitignore b/vendor/github.com/kubernetes-csi/csi-test/mock/.gitignore
deleted file mode 100644
index ce020eb6..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/mock
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/AUTHORS b/vendor/github.com/kubernetes-csi/csi-test/mock/AUTHORS
index 3a611857..23eabcd2 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/AUTHORS
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/AUTHORS
@@ -1 +1,2 @@
 TheCodeTeam
+Kubernetes Authors
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/Makefile b/vendor/github.com/kubernetes-csi/csi-test/mock/Makefile
deleted file mode 100644
index 1555ead7..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-all: build
-
-PROG := mock
-
-$(PROG): *.go ./provider/*.go ./service/*.go
-	@go install .
-	go build -o "$@" .
-
-build: $(PROG)
-
-clean:
-	go clean -i -v .
-	rm -f $(PROG)
-
-clobber: clean
-
-.PHONY: clean clobber
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/README.md b/vendor/github.com/kubernetes-csi/csi-test/mock/README.md
index 4236b8b5..d35e2d26 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/README.md
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/README.md
@@ -1,46 +1,2 @@
-# Mock Plug-in
-The mock plug-in is a stand-alone binary that implements the CSI
-Controller, Identity, and Node RPCs in addition to the specification's
-requirements regarding idempotency.
-
-The mock plug-in always starts with a deterministic state and maintains
-state for the duration of  the process. The state can also be modified.
-For example, while the plug-in launches with three volumes, a
-`CreateVolume` RPC will update the plug-in's internal data map so that a
-subsequent `ListVolumes` RPC will indicate four volumes are present.
-
-Per the specification the Mock plug-in starts a gRPC server using the
-value of the environment variable `CSI_ENDPOINT`. The plug-in process
-runs in the foreground, logging activity to `STDOUT` and errors to
-`STDERR`, only returning control to the user when `CTRL-C` is entered
-or the process is sent a `kill` signal.
-
-```bash
-$ CSI_ENDPOINT=/tmp/csi.sock mock/mock
-INFO  2017/08/22 16:22:15 main.go:154: mock.Serve: /tmp/csi.sock
-INFO  2017/08/22 16:22:18 main.go:133: /csi.Controller/CreateVolume: REQ 0001: Version=minor:1 , Name=Test Volume, CapacityRange=required_bytes:10740000000 limit_bytes:107400000000 , VolumeCapabilities=[mount:<fs_type:"ext4" mount_flags:"-o noexec" > ], Parameters=map[tag:gold]
-INFO  2017/08/22 16:22:18 main.go:133: /csi.Controller/CreateVolume: REP 0001: Reply=&{volume_info:<capacity_bytes:107400000000 id:<values:<key:"id" value:"4" > values:<key:"name" value:"Test Volume" > > metadata:<> > }
-INFO  2017/08/22 16:23:53 main.go:94: received signal: interrupt: shutting down
-INFO  2017/08/22 16:23:53 main.go:188: mock.GracefulStop
-INFO  2017/08/22 16:23:53 main.go:53: removed sock file: /tmp/csi.sock
-INFO  2017/08/22 16:23:53 main.go:64: server stopped gracefully
-```
-
-## Configuration
-The Mock CSI plug-in is created using the GoCSI CSP package. Please
-see its [configuration section](../csp/README.md#configuration) for
-a complete list of the environment variables that may be used to
-configure the Mock SP.
-
-The following table is a list of the Mock SP's default configuration
-values:
-
-| Name | Value |
-|------|---------|
-| `X_CSI_IDEMP` | `true` |
-| `X_CSI_IDEMP_REQUIRE_VOL` | `true` |
-| `X_CSI_REQUIRE_NODE_ID` | `true` |
-| `X_CSI_REQUIRE_PUB_VOL_INFO` | `true` |
-| `X_CSI_CREATE_VOL_ALREADY_EXISTS` | `true` |
-| `X_CSI_DELETE_VOL_NOT_FOUND` | `true` |
-| `X_CSI_SUPPORTED_VERSIONS` | `0.2.0 1.0.0 1.1.0` |
+# Mock CSI Driver
+Extremely simple mock driver used to test `csi-sanity` based on `rexray/gocsi/mock`
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/cache/SnapshotCache.go b/vendor/github.com/kubernetes-csi/csi-test/mock/cache/SnapshotCache.go
new file mode 100644
index 00000000..14343d04
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/cache/SnapshotCache.go
@@ -0,0 +1,89 @@
+package cache
+
+import (
+	"strings"
+	"sync"
+
+	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+)
+
+type SnapshotCache interface {
+	Add(snapshot Snapshot)
+
+	Delete(i int)
+
+	List(status csi.SnapshotStatus_Type) []csi.Snapshot
+
+	FindSnapshot(k, v string) (int, Snapshot)
+}
+
+type Snapshot struct {
+	Name        string
+	Parameters  map[string]string
+	SnapshotCSI csi.Snapshot
+}
+
+type snapshotCache struct {
+	snapshotsRWL sync.RWMutex
+	snapshots    []Snapshot
+}
+
+func NewSnapshotCache() SnapshotCache {
+	return &snapshotCache{
+		snapshots: make([]Snapshot, 0),
+	}
+}
+
+func (snap *snapshotCache) Add(snapshot Snapshot) {
+	snap.snapshotsRWL.Lock()
+	defer snap.snapshotsRWL.Unlock()
+
+	snap.snapshots = append(snap.snapshots, snapshot)
+}
+
+func (snap *snapshotCache) Delete(i int) {
+	snap.snapshotsRWL.Lock()
+	defer snap.snapshotsRWL.Unlock()
+
+	copy(snap.snapshots[i:], snap.snapshots[i+1:])
+	snap.snapshots = snap.snapshots[:len(snap.snapshots)-1]
+}
+
+func (snap *snapshotCache) List(status csi.SnapshotStatus_Type) []csi.Snapshot {
+	snap.snapshotsRWL.RLock()
+	defer snap.snapshotsRWL.RUnlock()
+
+	snapshots := make([]csi.Snapshot, 0)
+	for _, v := range snap.snapshots {
+		if v.SnapshotCSI.GetStatus() != nil && v.SnapshotCSI.GetStatus().Type == status {
+			snapshots = append(snapshots, v.SnapshotCSI)
+		}
+	}
+
+	return snapshots
+}
+
+func (snap *snapshotCache) FindSnapshot(k, v string) (int, Snapshot) {
+	snap.snapshotsRWL.RLock()
+	defer snap.snapshotsRWL.RUnlock()
+
+	snapshotIdx := -1
+	for i, vi := range snap.snapshots {
+		switch k {
+		case "id":
+			if strings.EqualFold(v, vi.SnapshotCSI.Id) {
+				return i, vi
+			}
+		case "sourceVolumeId":
+			if strings.EqualFold(v, vi.SnapshotCSI.SourceVolumeId) {
+				return i, vi
+			}
+		case "name":
+			if vi.Name == v {
+				return i, vi
+			}
+		}
+	}
+
+	return snapshotIdx, Snapshot{}
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/context/context.go b/vendor/github.com/kubernetes-csi/csi-test/mock/context/context.go
deleted file mode 100644
index 694ed65e..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/context/context.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package context
-
-import (
-	"context"
-	"os"
-	"strconv"
-	"strings"
-
-	"google.golang.org/grpc/metadata"
-)
-
-// RequestIDKey is the key used to put/get a CSI request ID
-// in/fromt a Go context.
-const RequestIDKey = "csi.requestid"
-
-var (
-	// ctxRequestIDKey is an interface-wrapped key used to access the
-	// gRPC request ID injected into an outgoing or incoming context
-	// via the GoCSI request ID injection interceptor
-	ctxRequestIDKey = interface{}("x-csi-request-id")
-
-	// ctxOSEnviron is an interface-wrapped key used to access a string
-	// slice that contains one or more environment variables stored as
-	// KEY=VALUE.
-	ctxOSEnviron = interface{}("os.Environ")
-
-	// ctxOSLookupEnvKey is an interface-wrapped key used to access a function
-	// with the signature func(string) (string, bool) that returns the value of
-	// an environment variable.
-	ctxOSLookupEnvKey = interface{}("os.LookupEnv")
-
-	// ctxOSSetenvKey is an interface-wrapped key used to access a function
-	// with the signature func(string, string) that can be used to set the
-	// value of an environment variable
-	ctxOSSetenvKey = interface{}("os.Setenev")
-)
-
-type lookupEnvFunc func(string) (string, bool)
-type setenvFunc func(string, string) error
-
-// GetRequestID inspects the context for gRPC metadata and returns
-// its request ID if available.
-func GetRequestID(ctx context.Context) (uint64, bool) {
-	var (
-		szID   []string
-		szIDOK bool
-	)
-
-	// Prefer the incoming context, but look in both types.
-	if md, ok := metadata.FromIncomingContext(ctx); ok {
-		szID, szIDOK = md[RequestIDKey]
-	} else if md, ok := metadata.FromOutgoingContext(ctx); ok {
-		szID, szIDOK = md[RequestIDKey]
-	}
-
-	if szIDOK && len(szID) == 1 {
-		if id, err := strconv.ParseUint(szID[0], 10, 64); err == nil {
-			return id, true
-		}
-	}
-
-	return 0, false
-}
-
-// WithEnviron returns a new Context with the provided environment variable
-// string slice.
-func WithEnviron(ctx context.Context, v []string) context.Context {
-	return context.WithValue(ctx, ctxOSEnviron, v)
-}
-
-// WithLookupEnv returns a new Context with the provided function.
-func WithLookupEnv(ctx context.Context, f lookupEnvFunc) context.Context {
-	return context.WithValue(ctx, ctxOSLookupEnvKey, f)
-}
-
-// WithSetenv returns a new Context with the provided function.
-func WithSetenv(ctx context.Context, f setenvFunc) context.Context {
-	return context.WithValue(ctx, ctxOSSetenvKey, f)
-}
-
-// LookupEnv returns the value of the provided environment variable by:
-//
-//   1. Inspecting the context for a key "os.Environ" with a string
-//      slice value. If such a key and value exist then the string slice
-//      is searched for the specified key and if found its value is returned.
-//
-//   2. Inspecting the context for a key "os.LookupEnv" with a value of
-//      func(string) (string, bool). If such a key and value exist then the
-//      function is used to attempt to discover the key's value. If the
-//      key and value are found they are returned.
-//
-//   3. Returning the result of os.LookupEnv.
-func LookupEnv(ctx context.Context, key string) (string, bool) {
-	if s, ok := ctx.Value(ctxOSEnviron).([]string); ok {
-		for _, v := range s {
-			p := strings.SplitN(v, "=", 2)
-			if len(p) > 0 && strings.EqualFold(p[0], key) {
-				if len(p) > 1 {
-					return p[1], true
-				}
-				return "", true
-			}
-		}
-	}
-	if f, ok := ctx.Value(ctxOSLookupEnvKey).(lookupEnvFunc); ok {
-		if v, ok := f(key); ok {
-			return v, true
-		}
-	}
-	return os.LookupEnv(key)
-}
-
-// Getenv is an alias for LookupEnv and drops the boolean return value.
-func Getenv(ctx context.Context, key string) string {
-	val, _ := LookupEnv(ctx, key)
-	return val
-}
-
-// Setenv sets the value of the provided environment variable to the
-// specified value by first inspecting the context for a key "os.Setenv"
-// with a value of func(string, string) error. If the context does not
-// contain such a function then os.Setenv is used instead.
-func Setenv(ctx context.Context, key, val string) error {
-	if f, ok := ctx.Value(ctxOSSetenvKey).(setenvFunc); ok {
-		return f(key, val)
-	}
-	return os.Setenv(key, val)
-}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/envvars.go b/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/envvars.go
deleted file mode 100644
index 28f3c376..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/envvars.go
+++ /dev/null
@@ -1,325 +0,0 @@
-package gocsi
-
-import (
-	"context"
-	"strconv"
-	"strings"
-
-	log "github.com/sirupsen/logrus"
-
-	csictx "github.com/kubernetes-csi/csi-test/mock/context"
-	"github.com/kubernetes-csi/csi-test/mock/utils"
-)
-
-const (
-	// EnvVarEndpoint is the name of the environment variable used to
-	// specify the CSI endpoint.
-	EnvVarEndpoint = "CSI_ENDPOINT"
-
-	// EnvVarEndpointPerms is the name of the environment variable used
-	// to specify the file permissions for the CSI endpoint when it is
-	// a UNIX socket file. This setting has no effect if CSI_ENDPOINT
-	// specifies a TCP socket. The default value is 0755.
-	EnvVarEndpointPerms = "X_CSI_ENDPOINT_PERMS"
-
-	// EnvVarEndpointUser is the name of the environment variable used
-	// to specify the UID or name of the user that owns the endpoint's
-	// UNIX socket file. This setting has no effect if CSI_ENDPOINT
-	// specifies a TCP socket. The default value is the user that starts
-	// the process.
-	EnvVarEndpointUser = "X_CSI_ENDPOINT_USER"
-
-	// EnvVarEndpointGroup is the name of the environment variable used
-	// to specify the GID or name of the group that owns the endpoint's
-	// UNIX socket file. This setting has no effect if CSI_ENDPOINT
-	// specifies a TCP socket. The default value is the group that starts
-	// the process.
-	EnvVarEndpointGroup = "X_CSI_ENDPOINT_GROUP"
-
-	// EnvVarDebug is the name of the environment variable used to
-	// determine whether or not debug mode is enabled.
-	//
-	// Setting this environment variable to a truthy value is the
-	// equivalent of X_CSI_LOG_LEVEL=DEBUG, X_CSI_REQ_LOGGING=true,
-	// and X_CSI_REP_LOGGING=true.
-	EnvVarDebug = "X_CSI_DEBUG"
-
-	// EnvVarLogLevel is the name of the environment variable used to
-	// specify the log level. Valid values include PANIC, FATAL, ERROR,
-	// WARN, INFO, and DEBUG.
-	EnvVarLogLevel = "X_CSI_LOG_LEVEL"
-
-	// EnvVarSupportedVersions is the name of the environment variable used
-	// to specify a list of comma-separated versions supported by the SP. If
-	// no value is specified then the SP does not perform a version check on
-	// the RPC.
-	EnvVarSupportedVersions = "X_CSI_SUPPORTED_VERSIONS"
-
-	// EnvVarPluginInfo is the name of the environment variable used to
-	// specify the plug-in info in the format:
-	//
-	//         NAME, VENDOR_VERSION[, MANIFEST...]
-	//
-	// The MANIFEST value may be a series of additional comma-separated
-	// key/value pairs.
-	//
-	// Please see the encoding/csv package (https://goo.gl/1j1xb9) for
-	// information on how to quote keys and/or values to include leading
-	// and trailing whitespace.
-	//
-	// Setting this environment variable will cause the program to
-	// bypass the SP's GetPluginInfo RPC and returns the specified
-	// information instead.
-	EnvVarPluginInfo = "X_CSI_PLUGIN_INFO"
-
-	// EnvVarMode is the name of the environment variable used to specify
-	// the service mode of the storage plug-in. Valie values are:
-	//
-	// * <empty>
-	// * controller
-	// * node
-	//
-	// If unset or set to an empty value the storage plug-in activates
-	// both controller and node services. The identity service is always
-	// activated.
-	EnvVarMode = "X_CSI_MODE"
-
-	// EnvVarReqLogging is the name of the environment variable
-	// used to determine whether or not to enable request logging.
-	//
-	// Setting this environment variable to a truthy value enables
-	// request logging to STDOUT.
-	EnvVarReqLogging = "X_CSI_REQ_LOGGING"
-
-	// EnvVarRepLogging is the name of the environment variable
-	// used to determine whether or not to enable response logging.
-	//
-	// Setting this environment variable to a truthy value enables
-	// response logging to STDOUT.
-	EnvVarRepLogging = "X_CSI_REP_LOGGING"
-
-	// EnvVarReqIDInjection is the name of the environment variable
-	// used to determine whether or not to enable request ID injection.
-	EnvVarReqIDInjection = "X_CSI_REQ_ID_INJECTION"
-
-	// EnvVarSpecValidation is the name of the environment variable
-	// used to determine whether or not to enable validation of CSI
-	// request and response messages. Setting X_CSI_SPEC_VALIDATION=true
-	// is the equivalent to setting X_CSI_SPEC_REQ_VALIDATION=true and
-	// X_CSI_SPEC_REP_VALIDATION=true.
-	EnvVarSpecValidation = "X_CSI_SPEC_VALIDATION"
-
-	// EnvVarSpecReqValidation is the name of the environment variable
-	// used to determine whether or not to enable validation of CSI request
-	// messages.
-	EnvVarSpecReqValidation = "X_CSI_SPEC_REQ_VALIDATION"
-
-	// EnvVarSpecRepValidation is the name of the environment variable
-	// used to determine whether or not to enable validation of CSI response
-	// messages. Invalid responses are marshalled into a gRPC error with
-	// a code of "Internal."
-	EnvVarSpecRepValidation = "X_CSI_SPEC_REP_VALIDATION"
-
-	// EnvVarRequireNodeID is the name of the environment variable used
-	// to determine whether or not the node ID value is required for
-	// requests that accept it and responses that return it such as
-	// ControllerPublishVolume and GetNodeId.
-	EnvVarRequireNodeID = "X_CSI_REQUIRE_NODE_ID"
-
-	// EnvVarRequirePubVolInfo is the name of the environment variable used
-	// to determine whether or not publish volume info is required for
-	// requests that accept it and responses that return it such as
-	// NodePublishVolume and ControllerPublishVolume.
-	EnvVarRequirePubVolInfo = "X_CSI_REQUIRE_PUB_VOL_INFO"
-
-	// EnvVarRequireVolAttribs is the name of the environment variable used
-	// to determine whether or not volume attributes are required for
-	// requests that accept them and responses that return them such as
-	// ControllerPublishVolume and CreateVolume.
-	EnvVarRequireVolAttribs = "X_CSI_REQUIRE_VOL_ATTRIBS"
-
-	// EnvVarCreds is the name of the environment variable
-	// used to determine whether or not user credentials are required for
-	// all RPCs. This value may be overridden for specific RPCs.
-	EnvVarCreds = "X_CSI_REQUIRE_CREDS"
-
-	// EnvVarCredsCreateVol is the name of the environment variable
-	// used to determine whether or not user credentials are required for
-	// the eponymous RPC.
-	EnvVarCredsCreateVol = "X_CSI_REQUIRE_CREDS_CREATE_VOL"
-
-	// EnvVarCredsDeleteVol is the name of the environment variable
-	// used to determine whether or not user credentials are required for
-	// the eponymous RPC.
-	EnvVarCredsDeleteVol = "X_CSI_REQUIRE_CREDS_DELETE_VOL"
-
-	// EnvVarCredsCtrlrPubVol is the name of the environment
-	// variable used to determine whether or not user credentials are required
-	// for the eponymous RPC.
-	EnvVarCredsCtrlrPubVol = "X_CSI_REQUIRE_CREDS_CTRLR_PUB_VOL"
-
-	// EnvVarCredsCtrlrUnpubVol is the name of the
-	// environment variable used to determine whether or not user credentials
-	// are required for the eponymous RPC.
-	EnvVarCredsCtrlrUnpubVol = "X_CSI_REQUIRE_CREDS_CTRLR_UNPUB_VOL"
-
-	// EnvVarCredsNodePubVol is the name of the environment
-	// variable used to determine whether or not user credentials are required
-	// for the eponymous RPC.
-	EnvVarCredsNodePubVol = "X_CSI_REQUIRE_CREDS_NODE_PUB_VOL"
-
-	// EnvVarCredsNodeUnpubVol is the name of the environment
-	// variable used to determine whether or not user credentials are required
-	// for the eponymous RPC.
-	EnvVarCredsNodeUnpubVol = "X_CSI_REQUIRE_CREDS_NODE_UNPUB_VOL"
-
-	// EnvVarSerialVolAccess is the name of the environment variable
-	// used to determine whether or not to enable serial volume access.
-	EnvVarSerialVolAccess = "X_CSI_SERIAL_VOL_ACCESS"
-
-	// EnvVarSerialVolAccessTimeout is the name of the environment variable
-	// used to specify the timeout for obtaining a volume lock.
-	EnvVarSerialVolAccessTimeout = "X_CSI_SERIAL_VOL_ACCESS_TIMEOUT"
-
-	// EnvVarSerialVolAccessEtcdDomain is the name of the environment
-	// variable that defines the lock provider's concurrency domain.
-	EnvVarSerialVolAccessEtcdDomain = "X_CSI_SERIAL_VOL_ACCESS_ETCD_DOMAIN"
-
-	// EnvVarSerialVolAccessEtcdTTL is the name of the environment
-	// variable that defines the length of time etcd will wait before
-	// releasing ownership of a distributed lock if the lock's session
-	// has not been renewed.
-	EnvVarSerialVolAccessEtcdTTL = "X_CSI_SERIAL_VOL_ACCESS_ETCD_TTL"
-
-	// EnvVarSerialVolAccessEtcdEndpoints is the name of the environment
-	// variable that defines the lock provider's etcd endoints.
-	EnvVarSerialVolAccessEtcdEndpoints = "X_CSI_SERIAL_VOL_ACCESS_ETCD_ENDPOINTS"
-
-	// EnvVarSerialVolAccessEtcdAutoSyncInterval is the name of the environment
-	// variable that defines the interval to update endpoints with its latest
-	//  members. 0 disables auto-sync. By default auto-sync is disabled.
-	EnvVarSerialVolAccessEtcdAutoSyncInterval = "X_CSI_SERIAL_VOL_ACCESS_ETCD_AUTO_SYNC_INTERVAL"
-
-	// EnvVarSerialVolAccessEtcdDialTimeout is the name of the environment
-	// variable that defines the timeout for failing to establish a connection.
-	EnvVarSerialVolAccessEtcdDialTimeout = "X_CSI_SERIAL_VOL_ACCESS_ETCD_DIAL_TIMEOUT"
-
-	// EnvVarSerialVolAccessEtcdDialKeepAliveTime is the name of the environment
-	// variable that defines the time after which client pings the server to see
-	// if transport is alive.
-	EnvVarSerialVolAccessEtcdDialKeepAliveTime = "X_CSI_SERIAL_VOL_ACCESS_ETCD_DIAL_KEEP_ALIVE_TIME"
-
-	// EnvVarSerialVolAccessEtcdDialKeepAliveTimeout is the name of the
-	// environment variable that defines the time that the client waits for a
-	// response for the keep-alive probe. If the response is not received in
-	// this time, the connection is closed.
-	EnvVarSerialVolAccessEtcdDialKeepAliveTimeout = "X_CSI_SERIAL_VOL_ACCESS_ETCD_DIAL_KEEP_ALIVE_TIMEOUT"
-
-	// EnvVarSerialVolAccessEtcdMaxCallSendMsgSz is the name of the environment
-	// variable that defines the client-side request send limit in bytes.
-	// If 0, it defaults to 2.0 MiB (2 * 1024 * 1024).
-	// Make sure that "MaxCallSendMsgSize" < server-side default send/recv
-	// limit. ("--max-request-bytes" flag to etcd or
-	// "embed.Config.MaxRequestBytes").
-	EnvVarSerialVolAccessEtcdMaxCallSendMsgSz = "X_CSI_SERIAL_VOL_ACCESS_ETCD_MAX_CALL_SEND_MSG_SZ"
-
-	// EnvVarSerialVolAccessEtcdMaxCallRecvMsgSz is the name of the environment
-	// variable that defines the client-side response receive limit.
-	// If 0, it defaults to "math.MaxInt32", because range response can
-	// easily exceed request send limits.
-	// Make sure that "MaxCallRecvMsgSize" >= server-side default send/recv
-	// limit. ("--max-request-bytes" flag to etcd or
-	// "embed.Config.MaxRequestBytes").
-	EnvVarSerialVolAccessEtcdMaxCallRecvMsgSz = "X_CSI_SERIAL_VOL_ACCESS_ETCD_MAX_CALL_RECV_MSG_SZ"
-
-	// EnvVarSerialVolAccessEtcdUsername is the name of the environment
-	// variable that defines the user name used for authentication.
-	EnvVarSerialVolAccessEtcdUsername = "X_CSI_SERIAL_VOL_ACCESS_ETCD_USERNAME"
-
-	// EnvVarSerialVolAccessEtcdPassword is the name of the environment
-	// variable that defines the password used for authentication.
-	EnvVarSerialVolAccessEtcdPassword = "X_CSI_SERIAL_VOL_ACCESS_ETCD_PASSWORD"
-
-	// EnvVarSerialVolAccessEtcdRejectOldCluster is the name of the environment
-	// variable that defines when set will refuse to create a client against
-	// an outdated cluster.
-	EnvVarSerialVolAccessEtcdRejectOldCluster = "X_CSI_SERIAL_VOL_ACCESS_ETCD_REJECT_OLD_CLUSTER"
-
-	// EnvVarSerialVolAccessEtcdTLS is the name of the environment
-	// variable that defines whether or not the client should attempt
-	// to use TLS when connecting to the server.
-	EnvVarSerialVolAccessEtcdTLS = "X_CSI_SERIAL_VOL_ACCESS_ETCD_TLS"
-
-	// EnvVarSerialVolAccessEtcdTLSInsecure is the name of the environment
-	// variable that defines whether or not the TLS connection should
-	// verify certificates.
-	EnvVarSerialVolAccessEtcdTLSInsecure = "X_CSI_SERIAL_VOL_ACCESS_ETCD_TLS_INSECURE"
-)
-
-func (sp *StoragePlugin) initEnvVars(ctx context.Context) {
-
-	// Copy the environment variables from the public EnvVar
-	// string slice to the private envVars map for quick lookup.
-	sp.envVars = map[string]string{}
-	for _, v := range sp.EnvVars {
-		// Environment variables must adhere to one of the following
-		// formats:
-		//
-		//     - ENV_VAR_KEY=
-		//     - ENV_VAR_KEY=ENV_VAR_VAL
-		pair := strings.SplitN(v, "=", 2)
-		if len(pair) < 1 || len(pair) > 2 {
-			continue
-		}
-
-		// Ensure the environment variable is stored in all upper-case
-		// to make subsequent map-lookups deterministic.
-		key := strings.ToUpper(pair[0])
-
-		// Check to see if the value for the key is available from the
-		// context's os.Environ or os.LookupEnv functions. If neither
-		// return a value then use the provided default value.
-		var val string
-		if v, ok := csictx.LookupEnv(ctx, key); ok {
-			val = v
-		} else if len(pair) > 1 {
-			val = pair[1]
-		}
-		sp.envVars[key] = val
-	}
-
-	// Check for the debug value.
-	if v, ok := csictx.LookupEnv(ctx, EnvVarDebug); ok {
-		if ok, _ := strconv.ParseBool(v); ok {
-			csictx.Setenv(ctx, EnvVarReqLogging, "true")
-			csictx.Setenv(ctx, EnvVarRepLogging, "true")
-		}
-	}
-
-	return
-}
-
-func (sp *StoragePlugin) initPluginInfo(ctx context.Context) {
-	szInfo, ok := csictx.LookupEnv(ctx, EnvVarPluginInfo)
-	if !ok {
-		return
-	}
-	info := strings.SplitN(szInfo, ",", 3)
-	fields := map[string]interface{}{}
-	if len(info) > 0 {
-		sp.pluginInfo.Name = strings.TrimSpace(info[0])
-		fields["name"] = sp.pluginInfo.Name
-	}
-	if len(info) > 1 {
-		sp.pluginInfo.VendorVersion = strings.TrimSpace(info[1])
-		fields["vendorVersion"] = sp.pluginInfo.VendorVersion
-	}
-	if len(info) > 2 {
-		sp.pluginInfo.Manifest = utils.ParseMap(strings.TrimSpace(info[2]))
-		fields["manifest"] = sp.pluginInfo.Manifest
-	}
-
-	if len(fields) > 0 {
-		log.WithFields(fields).Debug("init plug-in info")
-	}
-}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/gocsi.go b/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/gocsi.go
deleted file mode 100644
index 4b70ecc4..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/gocsi.go
+++ /dev/null
@@ -1,545 +0,0 @@
-//go:generate make
-
-// Package gocsi provides a Container Storage Interface (CSI) library,
-// client, and other helpful utilities.
-package gocsi
-
-import (
-	"bufio"
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"os/signal"
-	"os/user"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"text/template"
-
-	log "github.com/sirupsen/logrus"
-	"google.golang.org/grpc"
-
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
-
-	csictx "github.com/kubernetes-csi/csi-test/mock/context"
-	"github.com/kubernetes-csi/csi-test/mock/utils"
-)
-
-// Run launches a CSI storage plug-in.
-func Run(
-	ctx context.Context,
-	appName, appDescription, appUsage string,
-	sp StoragePluginProvider) {
-
-	// Check for the debug value.
-	if v, ok := csictx.LookupEnv(ctx, EnvVarDebug); ok {
-		if ok, _ := strconv.ParseBool(v); ok {
-			csictx.Setenv(ctx, EnvVarLogLevel, "debug")
-			csictx.Setenv(ctx, EnvVarReqLogging, "true")
-			csictx.Setenv(ctx, EnvVarRepLogging, "true")
-		}
-	}
-
-	// Adjust the log level.
-	lvl := log.InfoLevel
-	if v, ok := csictx.LookupEnv(ctx, EnvVarLogLevel); ok {
-		var err error
-		if lvl, err = log.ParseLevel(v); err != nil {
-			lvl = log.InfoLevel
-		}
-	}
-	log.SetLevel(lvl)
-
-	printUsage := func() {
-		// app is the information passed to the printUsage function
-		app := struct {
-			Name        string
-			Description string
-			Usage       string
-			BinPath     string
-		}{
-			appName,
-			appDescription,
-			appUsage,
-			os.Args[0],
-		}
-
-		t, err := template.New("t").Parse(usage)
-		if err != nil {
-			log.WithError(err).Fatalln("failed to parse usage template")
-		}
-		if err := t.Execute(os.Stderr, app); err != nil {
-			log.WithError(err).Fatalln("failed emitting usage")
-		}
-		return
-	}
-
-	// Check for a help flag.
-	fs := flag.NewFlagSet("csp", flag.ExitOnError)
-	fs.Usage = printUsage
-	var help bool
-	fs.BoolVar(&help, "?", false, "")
-	err := fs.Parse(os.Args)
-	if err == flag.ErrHelp || help {
-		printUsage()
-		os.Exit(1)
-	}
-
-	// If no endpoint is set then print the usage.
-	if os.Getenv(EnvVarEndpoint) == "" {
-		printUsage()
-		os.Exit(1)
-	}
-
-	l, err := utils.GetCSIEndpointListener()
-	if err != nil {
-		log.WithError(err).Fatalln("failed to listen")
-	}
-
-	// Define a lambda that can be used in the exit handler
-	// to remove a potential UNIX sock file.
-	var rmSockFileOnce sync.Once
-	rmSockFile := func() {
-		rmSockFileOnce.Do(func() {
-			if l == nil || l.Addr() == nil {
-				return
-			}
-			if l.Addr().Network() == netUnix {
-				sockFile := l.Addr().String()
-				os.RemoveAll(sockFile)
-				log.WithField("path", sockFile).Info("removed sock file")
-			}
-		})
-	}
-
-	trapSignals(func() {
-		sp.GracefulStop(ctx)
-		rmSockFile()
-		log.Info("server stopped gracefully")
-	}, func() {
-		sp.Stop(ctx)
-		rmSockFile()
-		log.Info("server aborted")
-	})
-
-	if err := sp.Serve(ctx, l); err != nil {
-		rmSockFile()
-		log.WithError(err).Fatal("grpc failed")
-	}
-}
-
-// StoragePluginProvider is able to serve a gRPC endpoint that provides
-// the CSI services: Controller, Identity, Node.
-type StoragePluginProvider interface {
-
-	// Serve accepts incoming connections on the listener lis, creating
-	// a new ServerTransport and service goroutine for each. The service
-	// goroutine read gRPC requests and then call the registered handlers
-	// to reply to them. Serve returns when lis.Accept fails with fatal
-	// errors.  lis will be closed when this method returns.
-	// Serve always returns non-nil error.
-	Serve(ctx context.Context, lis net.Listener) error
-
-	// Stop stops the gRPC server. It immediately closes all open
-	// connections and listeners.
-	// It cancels all active RPCs on the server side and the corresponding
-	// pending RPCs on the client side will get notified by connection
-	// errors.
-	Stop(ctx context.Context)
-
-	// GracefulStop stops the gRPC server gracefully. It stops the server
-	// from accepting new connections and RPCs and blocks until all the
-	// pending RPCs are finished.
-	GracefulStop(ctx context.Context)
-}
-
-// StoragePlugin is the collection of services and data used to server
-// a new gRPC endpoint that acts as a CSI storage plug-in (SP).
-type StoragePlugin struct {
-	// Controller is the eponymous CSI service.
-	Controller csi.ControllerServer
-
-	// Identity is the eponymous CSI service.
-	Identity csi.IdentityServer
-
-	// Node is the eponymous CSI service.
-	Node csi.NodeServer
-
-	// ServerOpts is a list of gRPC server options used when serving
-	// the SP. This list should not include a gRPC interceptor option
-	// as one is created automatically based on the interceptor configuration
-	// or provided list of interceptors.
-	ServerOpts []grpc.ServerOption
-
-	// Interceptors is a list of gRPC server interceptors to use when
-	// serving the SP. This list should not include the interceptors
-	// defined in the GoCSI package as those are configured by default
-	// based on runtime configuration settings.
-	Interceptors []grpc.UnaryServerInterceptor
-
-	// BeforeServe is an optional callback that is invoked after the
-	// StoragePlugin has been initialized, just prior to the creation
-	// of the gRPC server. This callback may be used to perform custom
-	// initialization logic, modify the interceptors and server options,
-	// or prevent the server from starting by returning a non-nil error.
-	BeforeServe func(context.Context, *StoragePlugin, net.Listener) error
-
-	// EnvVars is a list of default environment variables and values.
-	EnvVars []string
-
-	serveOnce sync.Once
-	stopOnce  sync.Once
-	server    *grpc.Server
-
-	envVars    map[string]string
-	pluginInfo csi.GetPluginInfoResponse
-}
-
-// Serve accepts incoming connections on the listener lis, creating
-// a new ServerTransport and service goroutine for each. The service
-// goroutine read gRPC requests and then call the registered handlers
-// to reply to them. Serve returns when lis.Accept fails with fatal
-// errors.  lis will be closed when this method returns.
-// Serve always returns non-nil error.
-func (sp *StoragePlugin) Serve(ctx context.Context, lis net.Listener) error {
-	var err error
-	sp.serveOnce.Do(func() {
-		// Please note that the order of the below init functions is
-		// important and should not be altered unless by someone aware
-		// of how they work.
-
-		// Adding this function to the context allows `csictx.LookupEnv`
-		// to search this SP's default env vars for a value.
-		ctx = csictx.WithLookupEnv(ctx, sp.lookupEnv)
-
-		// Adding this function to the context allows `csictx.Setenv`
-		// to set environment variables in this SP's env var store.
-		ctx = csictx.WithSetenv(ctx, sp.setenv)
-
-		// Initialize the storage plug-in's environment variables map.
-		sp.initEnvVars(ctx)
-
-		// Adjust the endpoint's file permissions.
-		if err = sp.initEndpointPerms(ctx, lis); err != nil {
-			return
-		}
-
-		// Adjust the endpoint's file ownership.
-		if err = sp.initEndpointOwner(ctx, lis); err != nil {
-			return
-		}
-
-		// Initialize the storage plug-in's info.
-		sp.initPluginInfo(ctx)
-
-		// Initialize the interceptors.
-		// sp.initInterceptors(ctx)
-
-		// Invoke the SP's BeforeServe function to give the SP a chance
-		// to perform any local initialization routines.
-		if f := sp.BeforeServe; f != nil {
-			if err = f(ctx, sp, lis); err != nil {
-				return
-			}
-		}
-
-		// Add the interceptors to the server if any are configured.
-		if i := sp.Interceptors; len(i) > 0 {
-			sp.ServerOpts = append(sp.ServerOpts,
-				grpc.UnaryInterceptor(utils.ChainUnaryServer(i...)))
-		}
-
-		// Initialize the gRPC server.
-		sp.server = grpc.NewServer(sp.ServerOpts...)
-
-		// Register the CSI services.
-		// Always require the identity service.
-		if sp.Identity == nil {
-			err = errors.New("identity service is required")
-			return
-		}
-		// Either a Controller or Node service should be supplied.
-		if sp.Controller == nil && sp.Node == nil {
-			err = errors.New(
-				"either a controller or node service is required")
-			return
-		}
-
-		// Always register the identity service.
-		csi.RegisterIdentityServer(sp.server, sp.Identity)
-		log.Info("identity service registered")
-
-		// Determine which of the controller/node services to register
-		mode := csictx.Getenv(ctx, EnvVarMode)
-		if strings.EqualFold(mode, "controller") {
-			mode = "controller"
-		} else if strings.EqualFold(mode, "node") {
-			mode = "node"
-		} else {
-			mode = ""
-		}
-
-		if mode == "" || mode == "controller" {
-			if sp.Controller == nil {
-				err = errors.New("controller service is required")
-				return
-			}
-			csi.RegisterControllerServer(sp.server, sp.Controller)
-			log.Info("controller service registered")
-		}
-		if mode == "" || mode == "node" {
-			if sp.Node == nil {
-				err = errors.New("node service is required")
-				return
-			}
-			csi.RegisterNodeServer(sp.server, sp.Node)
-			log.Info("node service registered")
-		}
-
-		endpoint := fmt.Sprintf(
-			"%s://%s",
-			lis.Addr().Network(), lis.Addr().String())
-		log.WithField("endpoint", endpoint).Info("serving")
-
-		// Start the gRPC server.
-		err = sp.server.Serve(lis)
-		return
-	})
-	return err
-}
-
-// Stop stops the gRPC server. It immediately closes all open
-// connections and listeners.
-// It cancels all active RPCs on the server side and the corresponding
-// pending RPCs on the client side will get notified by connection
-// errors.
-func (sp *StoragePlugin) Stop(ctx context.Context) {
-	sp.stopOnce.Do(func() {
-		sp.server.Stop()
-		log.Info("stopped")
-	})
-}
-
-// GracefulStop stops the gRPC server gracefully. It stops the server
-// from accepting new connections and RPCs and blocks until all the
-// pending RPCs are finished.
-func (sp *StoragePlugin) GracefulStop(ctx context.Context) {
-	sp.stopOnce.Do(func() {
-		sp.server.GracefulStop()
-		log.Info("gracefully stopped")
-	})
-}
-
-const netUnix = "unix"
-
-func (sp *StoragePlugin) initEndpointPerms(
-	ctx context.Context, lis net.Listener) error {
-
-	if lis.Addr().Network() != netUnix {
-		return nil
-	}
-
-	v, ok := csictx.LookupEnv(ctx, EnvVarEndpointPerms)
-	if !ok || v == "0755" {
-		return nil
-	}
-	u, err := strconv.ParseUint(v, 8, 32)
-	if err != nil {
-		return err
-	}
-
-	p := lis.Addr().String()
-	m := os.FileMode(u)
-
-	log.WithFields(map[string]interface{}{
-		"path": p,
-		"mode": m,
-	}).Info("chmod csi endpoint")
-
-	if err := os.Chmod(p, m); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (sp *StoragePlugin) initEndpointOwner(
-	ctx context.Context, lis net.Listener) error {
-
-	if lis.Addr().Network() != netUnix {
-		return nil
-	}
-
-	var (
-		usrName string
-		grpName string
-
-		uid  = os.Getuid()
-		gid  = os.Getgid()
-		puid = uid
-		pgid = gid
-	)
-
-	if v, ok := csictx.LookupEnv(ctx, EnvVarEndpointUser); ok {
-		m, err := regexp.MatchString(`^\d+$`, v)
-		if err != nil {
-			return err
-		}
-		usrName = v
-		szUID := v
-		if m {
-			u, err := user.LookupId(v)
-			if err != nil {
-				return err
-			}
-			usrName = u.Username
-		} else {
-			u, err := user.Lookup(v)
-			if err != nil {
-				return err
-			}
-			szUID = u.Uid
-		}
-		iuid, err := strconv.Atoi(szUID)
-		if err != nil {
-			return err
-		}
-		uid = iuid
-	}
-
-	if v, ok := csictx.LookupEnv(ctx, EnvVarEndpointGroup); ok {
-		m, err := regexp.MatchString(`^\d+$`, v)
-		if err != nil {
-			return err
-		}
-		grpName = v
-		szGID := v
-		if m {
-			u, err := user.LookupGroupId(v)
-			if err != nil {
-				return err
-			}
-			grpName = u.Name
-		} else {
-			u, err := user.LookupGroup(v)
-			if err != nil {
-				return err
-			}
-			szGID = u.Gid
-		}
-		igid, err := strconv.Atoi(szGID)
-		if err != nil {
-			return err
-		}
-		gid = igid
-	}
-
-	if uid != puid || gid != pgid {
-		f := lis.Addr().String()
-		log.WithFields(map[string]interface{}{
-			"uid":  usrName,
-			"gid":  grpName,
-			"path": f,
-		}).Info("chown csi endpoint")
-		if err := os.Chown(f, uid, gid); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (sp *StoragePlugin) lookupEnv(key string) (string, bool) {
-	val, ok := sp.envVars[key]
-	return val, ok
-}
-
-func (sp *StoragePlugin) setenv(key, val string) error {
-	sp.envVars[key] = val
-	return nil
-}
-
-func (sp *StoragePlugin) getEnvBool(ctx context.Context, key string) bool {
-	v, ok := csictx.LookupEnv(ctx, key)
-	if !ok {
-		return false
-	}
-	if b, err := strconv.ParseBool(v); err == nil {
-		return b
-	}
-	return false
-}
-
-func trapSignals(onExit, onAbort func()) {
-	sigc := make(chan os.Signal, 1)
-	sigs := []os.Signal{
-		syscall.SIGTERM,
-		syscall.SIGHUP,
-		syscall.SIGINT,
-		syscall.SIGQUIT,
-	}
-	signal.Notify(sigc, sigs...)
-	go func() {
-		for s := range sigc {
-			ok, graceful := isExitSignal(s)
-			if !ok {
-				continue
-			}
-			if !graceful {
-				log.WithField("signal", s).Error("received signal; aborting")
-				if onAbort != nil {
-					onAbort()
-				}
-				os.Exit(1)
-			}
-			log.WithField("signal", s).Info("received signal; shutting down")
-			if onExit != nil {
-				onExit()
-			}
-			os.Exit(0)
-		}
-	}()
-}
-
-// isExitSignal returns a flag indicating whether a signal SIGHUP,
-// SIGINT, SIGTERM, or SIGQUIT. The second return value is whether it is a
-// graceful exit. This flag is true for SIGTERM, SIGHUP, SIGINT, and SIGQUIT.
-func isExitSignal(s os.Signal) (bool, bool) {
-	switch s {
-	case syscall.SIGTERM,
-		syscall.SIGHUP,
-		syscall.SIGINT,
-		syscall.SIGQUIT:
-		return true, true
-	default:
-		return false, false
-	}
-}
-
-type logger struct {
-	f func(msg string, args ...interface{})
-	w io.Writer
-}
-
-func newLogger(f func(msg string, args ...interface{})) *logger {
-	l := &logger{f: f}
-	r, w := io.Pipe()
-	l.w = w
-	go func() {
-		scan := bufio.NewScanner(r)
-		for scan.Scan() {
-			f(scan.Text())
-		}
-	}()
-	return l
-}
-
-func (l *logger) Write(data []byte) (int, error) {
-	return l.w.Write(data)
-}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/usage.go b/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/usage.go
deleted file mode 100644
index 29b05fca..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/gocsi/usage.go
+++ /dev/null
@@ -1,269 +0,0 @@
-package gocsi
-
-const usage = `NAME
-    {{.Name}} -- {{.Description}}
-
-SYNOPSIS
-    {{.BinPath}}
-{{if .Usage}}
-STORAGE OPTIONS
-{{.Usage}}{{end}}
-GLOBAL OPTIONS
-    CSI_ENDPOINT
-        The CSI endpoint may also be specified by the environment variable
-        CSI_ENDPOINT. The endpoint should adhere to Go's network address
-        pattern:
-
-            * tcp://host:port
-            * unix:///path/to/file.sock.
-
-        If the network type is omitted then the value is assumed to be an
-        absolute or relative filesystem path to a UNIX socket file
-
-    X_CSI_MODE
-        Specifies the service mode of the storage plug-in. Valid values are:
-
-            * <empty>
-            * controller
-            * node
-
-        If unset or set to an empty value the storage plug-in activates
-        both controller and node services. The identity service is always
-        activated.
-
-    X_CSI_ENDPOINT_PERMS
-        When CSI_ENDPOINT is set to a UNIX socket file this environment
-        variable may be used to specify the socket's file permissions
-        as an octal number, ex. 0644. Please note this value has no
-        effect if CSI_ENDPOINT specifies a TCP socket.
-
-        The default value is 0755.
-
-    X_CSI_ENDPOINT_USER
-        When CSI_ENDPOINT is set to a UNIX socket file this environment
-        variable may be used to specify the UID or user name of the
-        user that owns the file. Please note this value has no
-        effect if CSI_ENDPOINT specifies a TCP socket.
-
-        If no value is specified then the user owner of the file is the
-        same as the user that starts the process.
-
-    X_CSI_ENDPOINT_GROUP
-        When CSI_ENDPOINT is set to a UNIX socket file this environment
-        variable may be used to specify the GID or group name of the
-        group that owns the file. Please note this value has no
-        effect if CSI_ENDPOINT specifies a TCP socket.
-
-        If no value is specified then the group owner of the file is the
-        same as the group that starts the process.
-
-    X_CSI_DEBUG
-        Enabling this option is the same as:
-            X_CSI_LOG_LEVEL=debug
-            X_CSI_REQ_LOGGING=true
-            X_CSI_REP_LOGGING=true
-
-    X_CSI_LOG_LEVEL
-        The log level. Valid values include:
-           * PANIC
-           * FATAL
-           * ERROR
-           * WARN
-           * INFO
-           * DEBUG
-
-        The default value is WARN.
-
-    X_CSI_SUPPORTED_VERSIONS
-        A list of comma-separated versions strings: MAJOR.MINOR.PATCH.
-        Setting this environment variable will cause the program to
-        bypass the SP's GetSupportedVersions RPC and return the list of
-        specified versions instead.
-
-    X_CSI_PLUGIN_INFO
-        The plug-in information is specified via the following
-        comma-separated format:
-
-            NAME, VENDOR_VERSION[, MANIFEST...]
-
-        The MANIFEST value may be a series of additional
-        comma-separated key/value pairs.
-
-        Please see the encoding/csv package (https://goo.gl/1j1xb9) for
-        information on how to quote keys and/or values to include
-        leading and trailing whitespace.
-
-        Setting this environment variable will cause the program to
-        bypass the SP's GetPluginInfo RPC and returns the specified
-        information instead.
-
-    X_CSI_REQ_LOGGING
-        A flag that enables logging of incoming requests to STDOUT.
-
-        Enabling this option sets X_CSI_REQ_ID_INJECTION=true.
-
-    X_CSI_REP_LOGGING
-        A flag that enables logging of outgoing responses to STDOUT.
-
-        Enabling this option sets X_CSI_REQ_ID_INJECTION=true.
-
-    X_CSI_REQ_ID_INJECTION
-        A flag that enables request ID injection. The ID is parsed from
-        the incoming request's metadata with a key of "csi.requestid".
-        If no value for that key is found then a new request ID is
-        generated using an atomic sequence counter.
-
-    X_CSI_SPEC_VALIDATION
-        Setting X_CSI_SPEC_VALIDATION=true is the same as:
-            X_CSI_SPEC_REQ_VALIDATION=true
-            X_CSI_SPEC_REP_VALIDATION=true
-
-    X_CSI_SPEC_REQ_VALIDATION
-        A flag that enables the validation of CSI request messages.
-
-    X_CSI_SPEC_REP_VALIDATION
-        A flag that enables the validation of CSI response messages.
-        Invalid responses are marshalled into a gRPC error with a code
-        of "Internal."
-
-    X_CSI_REQUIRE_NODE_ID
-        A flag that enables treating the following fields as required:
-            * ControllerPublishVolumeRequest.NodeId
-            * NodeGetIdResponse.NodeId
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_PUB_VOL_INFO
-        A flag that enables treating the following fields as required:
-            * ControllerPublishVolumeResponse.PublishVolumeInfo
-            * NodePublishVolumeRequest.PublishVolumeInfo
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_VOL_ATTRIBS
-        A flag that enables treating the following fields as required:
-            * ControllerPublishVolumeRequest.VolumeAttributes
-            * ValidateVolumeCapabilitiesRequest.VolumeAttributes
-            * NodePublishVolumeRequest.VolumeAttributes
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_CREDS
-        Setting X_CSI_REQUIRE_CREDS=true is the same as:
-            X_CSI_REQUIRE_CREDS_CREATE_VOL=true
-            X_CSI_REQUIRE_CREDS_DELETE_VOL=true
-            X_CSI_REQUIRE_CREDS_CTRLR_PUB_VOL=true
-            X_CSI_REQUIRE_CREDS_CTRLR_UNPUB_VOL=true
-            X_CSI_REQUIRE_CREDS_NODE_PUB_VOL=true
-            X_CSI_REQUIRE_CREDS_NODE_UNPUB_VOL=true
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_CREDS_CREATE_VOL
-        A flag that enables treating the following fields as required:
-            * CreateVolumeRequest.UserCredentials
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_CREDS_DELETE_VOL
-        A flag that enables treating the following fields as required:
-            * DeleteVolumeRequest.UserCredentials
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_CREDS_CTRLR_PUB_VOL
-        A flag that enables treating the following fields as required:
-            * ControllerPublishVolumeRequest.UserCredentials
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_CREDS_CTRLR_UNPUB_VOL
-        A flag that enables treating the following fields as required:
-            * ControllerUnpublishVolumeRequest.UserCredentials
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_CREDS_NODE_PUB_VOL
-        A flag that enables treating the following fields as required:
-            * NodePublishVolumeRequest.UserCredentials
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_REQUIRE_CREDS_NODE_UNPUB_VOL
-        A flag that enables treating the following fields as required:
-            * NodeUnpublishVolumeRequest.UserCredentials
-
-        Enabling this option sets X_CSI_SPEC_REQ_VALIDATION=true.
-
-    X_CSI_SERIAL_VOL_ACCESS
-        A flag that enables the serial volume access middleware.
-
-    X_CSI_SERIAL_VOL_ACCESS_TIMEOUT
-        A time.Duration string that determines how long the serial volume
-        access middleware waits to obtain a lock for the request's volume before
-        returning a the gRPC error code FailedPrecondition (5) to indicate
-        an operation is already pending for the specified volume.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_DOMAIN
-        The name of the environment variable that defines the etcd lock
-        provider's concurrency domain.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_TTL
-        The length of time etcd will wait before  releasing ownership of a
-        distributed lock if the lock's session has not been renewed.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_ENDPOINTS
-        A comma-separated list of etcd endpoints. If specified then the
-        SP's serial volume access middleware will leverage etcd to enable
-        distributed locking.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_AUTO_SYNC_INTERVAL
-        A time.Duration string that specifies the interval to update
-        endpoints with its latest members. A value of 0 disables
-        auto-sync. By default auto-sync is disabled.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_DIAL_TIMEOUT
-        A time.Duration string that specifies the timeout for failing to
-        establish a connection.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_DIAL_KEEP_ALIVE_TIME
-        A time.Duration string that defines the time after which the client
-        pings the server to see if the transport is alive.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_DIAL_KEEP_ALIVE_TIMEOUT
-        A time.Duration string that defines the time that the client waits for
-        a response for the keep-alive probe. If the response is not received
-        in this time, the connection is closed.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_MAX_CALL_SEND_MSG_SZ
-        Defines the client-side request send limit in bytes. If 0, it defaults
-        to 2.0 MiB (2 * 1024 * 1024). Make sure that "MaxCallSendMsgSize" <
-        server-side default send/recv limit. ("--max-request-bytes" flag to
-        etcd or "embed.Config.MaxRequestBytes").
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_MAX_CALL_RECV_MSG_SZ
-        Defines the client-side response receive limit. If 0, it defaults to
-        "math.MaxInt32", because range response can easily exceed request send
-        limits. Make sure that "MaxCallRecvMsgSize" >= server-side default
-        send/recv limit. ("--max-request-bytes" flag to etcd or
-        "embed.Config.MaxRequestBytes").
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_USERNAME
-        The user name used for authentication.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_PASSWORD
-        The password used for authentication.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_REJECT_OLD_CLUSTER
-        A flag that indicates refusal to create a client against an outdated
-        cluster.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_TLS
-        A flag that indicates the client should attempt a TLS connection.
-
-    X_CSI_SERIAL_VOL_ACCESS_ETCD_TLS_INSECURE
-        A flag that indicates the TLS connection should not verify peer
-        certificates.
-
-The flags -?,-h,-help may be used to print this screen.
-`
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/main.go b/vendor/github.com/kubernetes-csi/csi-test/mock/main.go
index 17dce66d..d66d1881 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/main.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/main.go
@@ -1,19 +1,88 @@
+/*
+Copyright 2018 Kubernetes Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package main
 
 import (
-	"context"
+	"fmt"
+	"net"
+	"os"
+	"os/signal"
+	"strings"
+	"syscall"
 
-	"github.com/kubernetes-csi/csi-test/mock/gocsi"
-	"github.com/kubernetes-csi/csi-test/mock/provider"
+	"github.com/kubernetes-csi/csi-test/driver"
 	"github.com/kubernetes-csi/csi-test/mock/service"
 )
 
-// main is ignored when this package is built as a go plug-in
 func main() {
-	gocsi.Run(
-		context.Background(),
-		service.Name,
-		"A Mock Container Storage Interface (CSI) Storage Plug-in (SP)",
-		"",
-		provider.New())
+	endpoint := os.Getenv("CSI_ENDPOINT")
+	if len(endpoint) == 0 {
+		fmt.Println("CSI_ENDPOINT must be defined and must be a path")
+		os.Exit(1)
+	}
+	if strings.Contains(endpoint, ":") {
+		fmt.Println("CSI_ENDPOINT must be a unix path")
+		os.Exit(1)
+	}
+
+	// Create mock driver
+	s := service.New()
+	servers := &driver.CSIDriverServers{
+		Controller: s,
+		Identity:   s,
+		Node:       s,
+	}
+	d := driver.NewCSIDriver(servers)
+
+	// If creds is enabled, set the default creds.
+	setCreds := os.Getenv("CSI_ENABLE_CREDS")
+	if len(setCreds) > 0 && setCreds == "true" {
+		d.SetDefaultCreds()
+	}
+
+	// Listen
+	os.Remove(endpoint)
+	l, err := net.Listen("unix", endpoint)
+	if err != nil {
+		fmt.Printf("Error: Unable to listen on %s socket: %v\n",
+			endpoint,
+			err)
+		os.Exit(1)
+	}
+	defer os.Remove(endpoint)
+
+	// Start server
+	if err := d.Start(l); err != nil {
+		fmt.Printf("Error: Unable to start mock CSI server: %v\n",
+			err)
+		os.Exit(1)
+	}
+	fmt.Println("mock driver started")
+
+	// Wait for signal
+	sigc := make(chan os.Signal, 1)
+	sigs := []os.Signal{
+		syscall.SIGTERM,
+		syscall.SIGHUP,
+		syscall.SIGINT,
+		syscall.SIGQUIT,
+	}
+	signal.Notify(sigc, sigs...)
+
+	<-sigc
+	d.Stop()
+	fmt.Println("mock driver stopped")
 }
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/mocksecret.yaml b/vendor/github.com/kubernetes-csi/csi-test/mock/mocksecret.yaml
new file mode 100644
index 00000000..e7c9f20d
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/mocksecret.yaml
@@ -0,0 +1,16 @@
+CreateVolumeSecret:
+  secretKey: secretval1
+DeleteVolumeSecret:
+  secretKey: secretval2
+ControllerPublishVolumeSecret:
+  secretKey: secretval3
+ControllerUnpublishVolumeSecret:
+  secretKey: secretval4
+NodeStageVolumeSecret:
+  secretKey: secretval5
+NodePublishVolumeSecret:
+  secretKey: secretval6
+CreateSnapshotSecret:
+  secretKey: secretval7
+DeleteSnapshotSecret:
+  secretKey: secretval8
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/plugin.go b/vendor/github.com/kubernetes-csi/csi-test/mock/plugin.go
deleted file mode 100644
index c3d0aac3..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/plugin.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// +build linux,plugin
-
-package main
-
-import "C"
-
-import (
-	"github.com/kubernetes-csi/csi-test/mock/provider"
-	"github.com/kubernetes-csi/csi-test/mock/service"
-)
-
-////////////////////////////////////////////////////////////////////////////////
-//                              Go Plug-in                                    //
-////////////////////////////////////////////////////////////////////////////////
-
-// SupportedVersions is a space-delimited list of supported CSI versions.
-var SupportedVersions = service.SupportedVersions
-
-// ServiceProviders is an exported symbol that provides a host program
-// with a map of the service provider names and constructors.
-var ServiceProviders = map[string]func() interface{}{
-	service.Name: func() interface{} { return provider.New() },
-}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/provider/provider.go b/vendor/github.com/kubernetes-csi/csi-test/mock/provider/provider.go
deleted file mode 100644
index 6b36cb4f..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/provider/provider.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package provider
-
-import (
-	"context"
-	"net"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/kubernetes-csi/csi-test/mock/gocsi"
-	"github.com/kubernetes-csi/csi-test/mock/service"
-)
-
-// New returns a new Mock Storage Plug-in Provider.
-func New() gocsi.StoragePluginProvider {
-	svc := service.New()
-	return &gocsi.StoragePlugin{
-		Controller: svc,
-		Identity:   svc,
-		Node:       svc,
-
-		// BeforeServe allows the SP to participate in the startup
-		// sequence. This function is invoked directly before the
-		// gRPC server is created, giving the callback the ability to
-		// modify the SP's interceptors, server options, or prevent the
-		// server from starting by returning a non-nil error.
-		BeforeServe: func(
-			ctx context.Context,
-			sp *gocsi.StoragePlugin,
-			lis net.Listener) error {
-
-			log.WithField("service", service.Name).Debug("BeforeServe")
-			return nil
-		},
-
-		EnvVars: []string{
-			// Enable serial volume access.
-			gocsi.EnvVarSerialVolAccess + "=true",
-
-			// Enable request and response validation.
-			gocsi.EnvVarSpecValidation + "=true",
-
-			// Treat the following fields as required:
-			//    * ControllerPublishVolumeRequest.NodeId
-			//    * NodeGetNodeIdResponse.NodeId
-			gocsi.EnvVarRequireNodeID + "=true",
-
-			// Treat the following fields as required:
-			//    * ControllerPublishVolumeResponse.PublishInfo
-			//    * NodePublishVolumeRequest.PublishInfo
-			gocsi.EnvVarRequirePubVolInfo + "=true",
-		},
-	}
-}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/service/controller.go b/vendor/github.com/kubernetes-csi/csi-test/mock/service/controller.go
index 2c30881d..39176bdd 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/service/controller.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/service/controller.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math"
 	"path"
+	"reflect"
 	"strconv"
 
 	log "github.com/sirupsen/logrus"
@@ -14,13 +15,18 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi/v0"
 )
 
+const (
+	MaxStorageCapacity = tib
+	ReadOnlyKey        = "readonly"
+)
+
 func (s *service) CreateVolume(
 	ctx context.Context,
 	req *csi.CreateVolumeRequest) (
 	*csi.CreateVolumeResponse, error) {
 
 	if len(req.Name) == 0 {
-		return nil, status.Error(codes.InvalidArgument, "Volume Name canot be empty")
+		return nil, status.Error(codes.InvalidArgument, "Volume Name cannot be empty")
 	}
 	if req.VolumeCapabilities == nil {
 		return nil, status.Error(codes.InvalidArgument, "Volume Capabilities cannot be empty")
@@ -28,6 +34,12 @@ func (s *service) CreateVolume(
 
 	// Check to see if the volume already exists.
 	if i, v := s.findVolByName(ctx, req.Name); i >= 0 {
+		// Requested volume name already exists, need to check if the existing volume's
+		// capacity is more or equal to new request's capacity.
+		if v.GetCapacityBytes() < req.GetCapacityRange().GetRequiredBytes() {
+			return nil, status.Error(codes.AlreadyExists,
+				fmt.Sprintf("Volume with name %s already exists", req.GetName()))
+		}
 		return &csi.CreateVolumeResponse{Volume: &v}, nil
 	}
 
@@ -41,12 +53,23 @@ func (s *service) CreateVolume(
 			capacity = lb
 		}
 	}
-
+	// Check for maximum available capacity
+	if capacity >= MaxStorageCapacity {
+		return nil, status.Errorf(codes.OutOfRange, "Requested capacity %d exceeds maximum allowed %d", capacity, MaxStorageCapacity)
+	}
 	// Create the volume and add it to the service's in-mem volume slice.
 	v := s.newVolume(req.Name, capacity)
 	s.volsRWL.Lock()
 	defer s.volsRWL.Unlock()
 	s.vols = append(s.vols, v)
+	MockVolumes[v.Id] = Volume{
+		VolumeCSI:       v,
+		NodeID:          "",
+		ISStaged:        false,
+		ISPublished:     false,
+		StageTargetPath: "",
+		TargetPath:      "",
+	}
 
 	return &csi.CreateVolumeResponse{Volume: &v}, nil
 }
@@ -59,6 +82,11 @@ func (s *service) DeleteVolume(
 	s.volsRWL.Lock()
 	defer s.volsRWL.Unlock()
 
+	//  If the volume is not specified, return error
+	if len(req.VolumeId) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
+	}
+
 	// If the volume does not exist then return an idempotent response.
 	i, _ := s.findVolNoLock("id", req.VolumeId)
 	if i < 0 {
@@ -80,6 +108,20 @@ func (s *service) ControllerPublishVolume(
 	req *csi.ControllerPublishVolumeRequest) (
 	*csi.ControllerPublishVolumeResponse, error) {
 
+	if len(req.VolumeId) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
+	}
+	if len(req.NodeId) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Node ID cannot be empty")
+	}
+	if req.VolumeCapability == nil {
+		return nil, status.Error(codes.InvalidArgument, "Volume Capabilities cannot be empty")
+	}
+
+	if req.NodeId != s.nodeID {
+		return nil, status.Errorf(codes.NotFound, "Not matching Node ID %s to Mock Node ID %s", req.NodeId, s.nodeID)
+	}
+
 	s.volsRWL.Lock()
 	defer s.volsRWL.Unlock()
 
@@ -95,21 +137,48 @@ func (s *service) ControllerPublishVolume(
 
 	// Check to see if the volume is already published.
 	if device := v.Attributes[devPathKey]; device != "" {
+		var volRo bool
+		var roVal string
+		if ro, ok := v.Attributes[ReadOnlyKey]; ok {
+			roVal = ro
+		}
+
+		if roVal == "true" {
+			volRo = true
+		} else {
+			volRo = false
+		}
+
+		// Check if readonly flag is compatible with the publish request.
+		if req.GetReadonly() != volRo {
+			return nil, status.Error(codes.AlreadyExists, "Volume published but has incompatible readonly flag")
+		}
+
 		return &csi.ControllerPublishVolumeResponse{
 			PublishInfo: map[string]string{
-				"device": device,
+				"device":   device,
+				"readonly": roVal,
 			},
 		}, nil
 	}
 
+	var roVal string
+	if req.GetReadonly() {
+		roVal = "true"
+	} else {
+		roVal = "false"
+	}
+
 	// Publish the volume.
 	device := "/dev/mock"
 	v.Attributes[devPathKey] = device
+	v.Attributes[ReadOnlyKey] = roVal
 	s.vols[i] = v
 
 	return &csi.ControllerPublishVolumeResponse{
 		PublishInfo: map[string]string{
-			"device": device,
+			"device":   device,
+			"readonly": roVal,
 		},
 	}, nil
 }
@@ -119,6 +188,19 @@ func (s *service) ControllerUnpublishVolume(
 	req *csi.ControllerUnpublishVolumeRequest) (
 	*csi.ControllerUnpublishVolumeResponse, error) {
 
+	if len(req.VolumeId) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
+	}
+	nodeID := req.NodeId
+	if len(nodeID) == 0 {
+		// If node id is empty, no failure as per Spec
+		nodeID = s.nodeID
+	}
+
+	if req.NodeId != s.nodeID {
+		return nil, status.Errorf(codes.NotFound, "Node ID %s does not match to expected Node ID %s", req.NodeId, s.nodeID)
+	}
+
 	s.volsRWL.Lock()
 	defer s.volsRWL.Unlock()
 
@@ -130,7 +212,7 @@ func (s *service) ControllerUnpublishVolume(
 	// devPathKey is the key in the volume's attributes that is set to a
 	// mock device path if the volume has been published by the controller
 	// to the specified node.
-	devPathKey := path.Join(req.NodeId, "dev")
+	devPathKey := path.Join(nodeID, "dev")
 
 	// Check to see if the volume is already unpublished.
 	if v.Attributes[devPathKey] == "" {
@@ -139,6 +221,7 @@ func (s *service) ControllerUnpublishVolume(
 
 	// Unpublish the volume.
 	delete(v.Attributes, devPathKey)
+	delete(v.Attributes, ReadOnlyKey)
 	s.vols[i] = v
 
 	return &csi.ControllerUnpublishVolumeResponse{}, nil
@@ -149,11 +232,14 @@ func (s *service) ValidateVolumeCapabilities(
 	req *csi.ValidateVolumeCapabilitiesRequest) (
 	*csi.ValidateVolumeCapabilitiesResponse, error) {
 
-	i, _ := s.findVolNoLock("id", req.VolumeId)
-	if i < 0 {
-		return nil, status.Error(codes.NotFound, req.VolumeId)
+	if len(req.GetVolumeId()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
 	}
 	if len(req.VolumeCapabilities) == 0 {
+		return nil, status.Error(codes.InvalidArgument, req.VolumeId)
+	}
+	i, _ := s.findVolNoLock("id", req.VolumeId)
+	if i < 0 {
 		return nil, status.Error(codes.NotFound, req.VolumeId)
 	}
 
@@ -243,7 +329,7 @@ func (s *service) GetCapacity(
 	*csi.GetCapacityResponse, error) {
 
 	return &csi.GetCapacityResponse{
-		AvailableCapacity: tib100,
+		AvailableCapacity: MaxStorageCapacity,
 	}, nil
 }
 
@@ -282,6 +368,192 @@ func (s *service) ControllerGetCapabilities(
 					},
 				},
 			},
+			{
+				Type: &csi.ControllerServiceCapability_Rpc{
+					Rpc: &csi.ControllerServiceCapability_RPC{
+						Type: csi.ControllerServiceCapability_RPC_LIST_SNAPSHOTS,
+					},
+				},
+			},
+			{
+				Type: &csi.ControllerServiceCapability_Rpc{
+					Rpc: &csi.ControllerServiceCapability_RPC{
+						Type: csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT,
+					},
+				},
+			},
 		},
 	}, nil
 }
+
+func (s *service) CreateSnapshot(ctx context.Context,
+	req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
+	// Check arguments
+	if len(req.GetName()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Snapshot Name cannot be empty")
+	}
+	if len(req.GetSourceVolumeId()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Snapshot SourceVolumeId cannot be empty")
+	}
+
+	// Check to see if the snapshot already exists.
+	if i, v := s.snapshots.FindSnapshot("name", req.GetName()); i >= 0 {
+		// Requested snapshot name already exists
+		if v.SnapshotCSI.GetSourceVolumeId() != req.GetSourceVolumeId() || !reflect.DeepEqual(v.Parameters, req.GetParameters()) {
+			return nil, status.Error(codes.AlreadyExists,
+				fmt.Sprintf("Snapshot with name %s already exists", req.GetName()))
+		}
+		return &csi.CreateSnapshotResponse{Snapshot: &v.SnapshotCSI}, nil
+	}
+
+	// Create the snapshot and add it to the service's in-mem snapshot slice.
+	snapshot := s.newSnapshot(req.GetName(), req.GetSourceVolumeId(), req.GetParameters())
+	s.snapshots.Add(snapshot)
+
+	return &csi.CreateSnapshotResponse{Snapshot: &snapshot.SnapshotCSI}, nil
+}
+
+func (s *service) DeleteSnapshot(ctx context.Context,
+	req *csi.DeleteSnapshotRequest) (*csi.DeleteSnapshotResponse, error) {
+
+	//  If the snapshot is not specified, return error
+	if len(req.SnapshotId) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Snapshot ID cannot be empty")
+	}
+
+	// If the snapshot does not exist then return an idempotent response.
+	i, _ := s.snapshots.FindSnapshot("id", req.SnapshotId)
+	if i < 0 {
+		return &csi.DeleteSnapshotResponse{}, nil
+	}
+
+	// This delete logic preserves order and prevents potential memory
+	// leaks. The slice's elements may not be pointers, but the structs
+	// themselves have fields that are.
+	s.snapshots.Delete(i)
+	log.WithField("SnapshotId", req.SnapshotId).Debug("mock delete snapshot")
+	return &csi.DeleteSnapshotResponse{}, nil
+}
+
+func (s *service) ListSnapshots(ctx context.Context,
+	req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
+
+	// case 1: SnapshotId is not empty, return snapshots that match the snapshot id.
+	if len(req.GetSnapshotId()) != 0 {
+		return getSnapshotById(s, req)
+	}
+
+	// case 2: SourceVolumeId is not empty, return snapshots that match the source volume id.
+	if len(req.GetSourceVolumeId()) != 0 {
+		return getSnapshotByVolumeId(s, req)
+	}
+
+	// case 3: no parameter is set, so we return all the snapshots.
+	return getAllSnapshots(s, req)
+}
+
+func getSnapshotById(s *service, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
+	if len(req.GetSnapshotId()) != 0 {
+		i, snapshot := s.snapshots.FindSnapshot("id", req.GetSnapshotId())
+		if i < 0 {
+			return &csi.ListSnapshotsResponse{}, nil
+		}
+
+		if len(req.GetSourceVolumeId()) != 0 {
+			if snapshot.SnapshotCSI.GetSourceVolumeId() != req.GetSourceVolumeId() {
+				return &csi.ListSnapshotsResponse{}, nil
+			}
+		}
+
+		return &csi.ListSnapshotsResponse{
+			Entries: []*csi.ListSnapshotsResponse_Entry{
+				{
+					Snapshot: &snapshot.SnapshotCSI,
+				},
+			},
+		}, nil
+	}
+	return nil, nil
+}
+
+func getSnapshotByVolumeId(s *service, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
+	if len(req.GetSourceVolumeId()) != 0 {
+		i, snapshot := s.snapshots.FindSnapshot("sourceVolumeId", req.SourceVolumeId)
+		if i < 0 {
+			return &csi.ListSnapshotsResponse{}, nil
+		}
+		return &csi.ListSnapshotsResponse{
+			Entries: []*csi.ListSnapshotsResponse_Entry{
+				{
+					Snapshot: &snapshot.SnapshotCSI,
+				},
+			},
+		}, nil
+	}
+	return nil, nil
+}
+
+func getAllSnapshots(s *service, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
+	// Copy the mock snapshots into a new slice in order to avoid
+	// locking the service's snapshot slice for the duration of the
+	// ListSnapshots RPC.
+	snapshots := s.snapshots.List(csi.SnapshotStatus_READY)
+
+	var (
+		ulenSnapshots = int32(len(snapshots))
+		maxEntries    = req.MaxEntries
+		startingToken int32
+	)
+
+	if v := req.StartingToken; v != "" {
+		i, err := strconv.ParseUint(v, 10, 32)
+		if err != nil {
+			return nil, status.Errorf(
+				codes.Aborted,
+				"startingToken=%d !< int32=%d",
+				startingToken, math.MaxUint32)
+		}
+		startingToken = int32(i)
+	}
+
+	if startingToken > ulenSnapshots {
+		return nil, status.Errorf(
+			codes.Aborted,
+			"startingToken=%d > len(snapshots)=%d",
+			startingToken, ulenSnapshots)
+	}
+
+	// Discern the number of remaining entries.
+	rem := ulenSnapshots - startingToken
+
+	// If maxEntries is 0 or greater than the number of remaining entries then
+	// set maxEntries to the number of remaining entries.
+	if maxEntries == 0 || maxEntries > rem {
+		maxEntries = rem
+	}
+
+	var (
+		i       int
+		j       = startingToken
+		entries = make(
+			[]*csi.ListSnapshotsResponse_Entry,
+			maxEntries)
+	)
+
+	for i = 0; i < len(entries); i++ {
+		entries[i] = &csi.ListSnapshotsResponse_Entry{
+			Snapshot: &snapshots[j],
+		}
+		j++
+	}
+
+	var nextToken string
+	if n := startingToken + int32(i); n < ulenSnapshots {
+		nextToken = fmt.Sprintf("%d", n)
+	}
+
+	return &csi.ListSnapshotsResponse{
+		Entries:   entries,
+		NextToken: nextToken,
+	}, nil
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/service/identity.go b/vendor/github.com/kubernetes-csi/csi-test/mock/service/identity.go
index c83daea5..c66d3b62 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/service/identity.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/service/identity.go
@@ -4,6 +4,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/golang/protobuf/ptypes/wrappers"
 )
 
 func (s *service) GetPluginInfo(
@@ -23,7 +24,9 @@ func (s *service) Probe(
 	req *csi.ProbeRequest) (
 	*csi.ProbeResponse, error) {
 
-	return &csi.ProbeResponse{}, nil
+	return &csi.ProbeResponse{
+		Ready: &wrappers.BoolValue{Value: true},
+	}, nil
 }
 
 func (s *service) GetPluginCapabilities(
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/service/node.go b/vendor/github.com/kubernetes-csi/csi-test/mock/service/node.go
index e6432f26..0321c740 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/service/node.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/service/node.go
@@ -16,7 +16,49 @@ func (s *service) NodeStageVolume(
 	req *csi.NodeStageVolumeRequest) (
 	*csi.NodeStageVolumeResponse, error) {
 
-	return nil, status.Error(codes.Unimplemented, "")
+	device, ok := req.PublishInfo["device"]
+	if !ok {
+		return nil, status.Error(
+			codes.InvalidArgument,
+			"stage volume info 'device' key required")
+	}
+
+	if len(req.GetVolumeId()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
+	}
+
+	if len(req.GetStagingTargetPath()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Staging Target Path cannot be empty")
+	}
+
+	if req.GetVolumeCapability() == nil {
+		return nil, status.Error(codes.InvalidArgument, "Volume Capability cannot be empty")
+	}
+
+	s.volsRWL.Lock()
+	defer s.volsRWL.Unlock()
+
+	i, v := s.findVolNoLock("id", req.VolumeId)
+	if i < 0 {
+		return nil, status.Error(codes.NotFound, req.VolumeId)
+	}
+
+	// nodeStgPathKey is the key in the volume's attributes that is set to a
+	// mock stage path if the volume has been published by the node
+	nodeStgPathKey := path.Join(s.nodeID, req.StagingTargetPath)
+
+	// Check to see if the volume has already been staged.
+	if v.Attributes[nodeStgPathKey] != "" {
+		// TODO: Check for the capabilities to be equal. Return "ALREADY_EXISTS"
+		// if the capabilities don't match.
+		return &csi.NodeStageVolumeResponse{}, nil
+	}
+
+	// Stage the volume.
+	v.Attributes[nodeStgPathKey] = device
+	s.vols[i] = v
+
+	return &csi.NodeStageVolumeResponse{}, nil
 }
 
 func (s *service) NodeUnstageVolume(
@@ -24,7 +66,36 @@ func (s *service) NodeUnstageVolume(
 	req *csi.NodeUnstageVolumeRequest) (
 	*csi.NodeUnstageVolumeResponse, error) {
 
-	return nil, status.Error(codes.Unimplemented, "")
+	if len(req.GetVolumeId()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
+	}
+
+	if len(req.GetStagingTargetPath()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Staging Target Path cannot be empty")
+	}
+
+	s.volsRWL.Lock()
+	defer s.volsRWL.Unlock()
+
+	i, v := s.findVolNoLock("id", req.VolumeId)
+	if i < 0 {
+		return nil, status.Error(codes.NotFound, req.VolumeId)
+	}
+
+	// nodeStgPathKey is the key in the volume's attributes that is set to a
+	// mock stage path if the volume has been published by the node
+	nodeStgPathKey := path.Join(s.nodeID, req.StagingTargetPath)
+
+	// Check to see if the volume has already been unstaged.
+	if v.Attributes[nodeStgPathKey] == "" {
+		return &csi.NodeUnstageVolumeResponse{}, nil
+	}
+
+	// Unpublish the volume.
+	delete(v.Attributes, nodeStgPathKey)
+	s.vols[i] = v
+
+	return &csi.NodeUnstageVolumeResponse{}, nil
 }
 
 func (s *service) NodePublishVolume(
@@ -39,6 +110,18 @@ func (s *service) NodePublishVolume(
 			"publish volume info 'device' key required")
 	}
 
+	if len(req.GetVolumeId()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
+	}
+
+	if len(req.GetTargetPath()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Target Path cannot be empty")
+	}
+
+	if req.GetVolumeCapability() == nil {
+		return nil, status.Error(codes.InvalidArgument, "Volume Capability cannot be empty")
+	}
+
 	s.volsRWL.Lock()
 	defer s.volsRWL.Unlock()
 
@@ -64,7 +147,11 @@ func (s *service) NodePublishVolume(
 	}
 
 	// Publish the volume.
-	v.Attributes[nodeMntPathKey] = device
+	if req.GetStagingTargetPath() != "" {
+		v.Attributes[nodeMntPathKey] = req.GetStagingTargetPath()
+	} else {
+		v.Attributes[nodeMntPathKey] = device
+	}
 	s.vols[i] = v
 
 	return &csi.NodePublishVolumeResponse{}, nil
@@ -75,6 +162,13 @@ func (s *service) NodeUnpublishVolume(
 	req *csi.NodeUnpublishVolumeRequest) (
 	*csi.NodeUnpublishVolumeResponse, error) {
 
+	if len(req.GetVolumeId()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Volume ID cannot be empty")
+	}
+	if len(req.GetTargetPath()) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Target Path cannot be empty")
+	}
+
 	s.volsRWL.Lock()
 	defer s.volsRWL.Unlock()
 
@@ -123,6 +217,20 @@ func (s *service) NodeGetCapabilities(
 					},
 				},
 			},
+			{
+				Type: &csi.NodeServiceCapability_Rpc{
+					Rpc: &csi.NodeServiceCapability_RPC{
+						Type: csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME,
+					},
+				},
+			},
 		},
 	}, nil
 }
+
+func (s *service) NodeGetInfo(ctx context.Context,
+	req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
+	return &csi.NodeGetInfoResponse{
+		NodeId: s.nodeID,
+	}, nil
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/service/service.go b/vendor/github.com/kubernetes-csi/csi-test/mock/service/service.go
index 94681449..c9f4f7b2 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/service/service.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/mock/service/service.go
@@ -5,8 +5,10 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
+	"time"
 
 	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/kubernetes-csi/csi-test/mock/cache"
 	"golang.org/x/net/context"
 )
 
@@ -15,7 +17,7 @@ const (
 	Name = "io.kubernetes.storage.mock"
 
 	// VendorVersion is the version returned by GetPluginInfo.
-	VendorVersion = "0.2.0"
+	VendorVersion = "0.3.0"
 )
 
 // Manifest is the SP's manifest.
@@ -32,20 +34,41 @@ type Service interface {
 
 type service struct {
 	sync.Mutex
-	nodeID  string
-	vols    []csi.Volume
-	volsRWL sync.RWMutex
-	volsNID uint64
+	nodeID       string
+	vols         []csi.Volume
+	volsRWL      sync.RWMutex
+	volsNID      uint64
+	snapshots    cache.SnapshotCache
+	snapshotsNID uint64
 }
 
+type Volume struct {
+	sync.Mutex
+	VolumeCSI       csi.Volume
+	NodeID          string
+	ISStaged        bool
+	ISPublished     bool
+	StageTargetPath string
+	TargetPath      string
+}
+
+var MockVolumes map[string]Volume
+
 // New returns a new Service.
 func New() Service {
 	s := &service{nodeID: Name}
+	s.snapshots = cache.NewSnapshotCache()
 	s.vols = []csi.Volume{
 		s.newVolume("Mock Volume 1", gib100),
 		s.newVolume("Mock Volume 2", gib100),
 		s.newVolume("Mock Volume 3", gib100),
 	}
+	MockVolumes = map[string]Volume{}
+
+	s.snapshots.Add(s.newSnapshot("Mock Snapshot 1", "1", map[string]string{"Description": "snapshot 1"}))
+	s.snapshots.Add(s.newSnapshot("Mock Snapshot 2", "2", map[string]string{"Description": "snapshot 2"}))
+	s.snapshots.Add(s.newSnapshot("Mock Snapshot 3", "3", map[string]string{"Description": "snapshot 3"}))
+
 	return s
 }
 
@@ -96,3 +119,19 @@ func (s *service) findVolByName(
 
 	return s.findVol("name", name)
 }
+
+func (s *service) newSnapshot(name, sourceVolumeId string, parameters map[string]string) cache.Snapshot {
+	return cache.Snapshot{
+		Name:       name,
+		Parameters: parameters,
+		SnapshotCSI: csi.Snapshot{
+			Id:             fmt.Sprintf("%d", atomic.AddUint64(&s.snapshotsNID, 1)),
+			CreatedAt:      time.Now().UnixNano(),
+			SourceVolumeId: sourceVolumeId,
+			Status: &csi.SnapshotStatus{
+				Type:    csi.SnapshotStatus_READY,
+				Details: "snapshot ready",
+			},
+		},
+	}
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils.go b/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils.go
deleted file mode 100644
index 5e64cdce..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils.go
+++ /dev/null
@@ -1,586 +0,0 @@
-package utils
-
-import (
-	"bytes"
-	"context"
-	"encoding/csv"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"regexp"
-	"sort"
-	"strings"
-	"sync"
-
-	log "github.com/sirupsen/logrus"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
-)
-
-const maxuint32 = 4294967295
-
-// GetCSIEndpoint returns the network address specified by the
-// environment variable CSI_ENDPOINT.
-func GetCSIEndpoint() (network, addr string, err error) {
-	protoAddr := os.Getenv(CSIEndpoint)
-	if emptyRX.MatchString(protoAddr) {
-		return "", "", errors.New("missing CSI_ENDPOINT")
-	}
-	return ParseProtoAddr(protoAddr)
-}
-
-// GetCSIEndpointListener returns the net.Listener for the endpoint
-// specified by the environment variable CSI_ENDPOINT.
-func GetCSIEndpointListener() (net.Listener, error) {
-	proto, addr, err := GetCSIEndpoint()
-	if err != nil {
-		return nil, err
-	}
-	return net.Listen(proto, addr)
-}
-
-const (
-	protoAddrGuessPatt = `(?i)^(?:tcp|udp|ip|unix)[^:]*://`
-
-	protoAddrExactPatt = `(?i)^((?:(?:tcp|udp|ip)[46]?)|` +
-		`(?:unix(?:gram|packet)?))://(.+)$`
-)
-
-var (
-	emptyRX          = regexp.MustCompile(`^\s*$`)
-	protoAddrGuessRX = regexp.MustCompile(protoAddrGuessPatt)
-	protoAddrExactRX = regexp.MustCompile(protoAddrExactPatt)
-)
-
-// ErrParseProtoAddrRequired occurs when an empty string is provided
-// to ParseProtoAddr.
-var ErrParseProtoAddrRequired = errors.New(
-	"non-empty network address is required")
-
-// ParseProtoAddr parses a Golang network address.
-func ParseProtoAddr(protoAddr string) (proto string, addr string, err error) {
-
-	if emptyRX.MatchString(protoAddr) {
-		return "", "", ErrParseProtoAddrRequired
-	}
-
-	// If the provided network address does not begin with one
-	// of the valid network protocols then treat the string as a
-	// file path.
-	//
-	// First check to see if the file exists at the specified path.
-	// If it does then assume it's a valid file path and return it.
-	//
-	// Otherwise attempt to create the file. If the file can be created
-	// without error then remove the file and return the result a UNIX
-	// socket file path.
-	if !protoAddrGuessRX.MatchString(protoAddr) {
-
-		// If the file already exists then assume it's a valid sock
-		// file and return it.
-		if _, err := os.Stat(protoAddr); !os.IsNotExist(err) {
-			return "unix", protoAddr, nil
-		}
-
-		f, err := os.Create(protoAddr)
-		if err != nil {
-			return "", "", fmt.Errorf(
-				"invalid implied sock file: %s: %v", protoAddr, err)
-		}
-		if err := f.Close(); err != nil {
-			return "", "", fmt.Errorf(
-				"failed to verify network address as sock file: %s", protoAddr)
-		}
-		if err := os.RemoveAll(protoAddr); err != nil {
-			return "", "", fmt.Errorf(
-				"failed to remove verified sock file: %s", protoAddr)
-		}
-		return "unix", protoAddr, nil
-	}
-
-	// Parse the provided network address into the protocol and address parts.
-	m := protoAddrExactRX.FindStringSubmatch(protoAddr)
-	if m == nil {
-		return "", "", fmt.Errorf("invalid network address: %s", protoAddr)
-	}
-	return m[1], m[2], nil
-}
-
-// ParseMap parses a string into a map. The string's expected pattern is:
-//
-//         KEY1=VAL1, "KEY2=VAL2 ", "KEY 3= VAL3"
-//
-// The key/value pairs are separated by a comma and optional whitespace.
-// Please see the encoding/csv package (https://goo.gl/1j1xb9) for information
-// on how to quote keys and/or values to include leading and trailing
-// whitespace.
-func ParseMap(line string) map[string]string {
-	line = strings.TrimSpace(line)
-	if line == "" {
-		return nil
-	}
-
-	r := csv.NewReader(strings.NewReader(line))
-	r.TrimLeadingSpace = true
-
-	record, err := r.Read()
-	if err == io.EOF {
-		return nil
-	}
-	if err != nil {
-		panic(err)
-	}
-
-	data := map[string]string{}
-	for i := range record {
-		p := strings.SplitN(record[i], "=", 2)
-		if len(p) == 0 {
-			continue
-		}
-		k := p[0]
-		var v string
-		if len(p) > 1 {
-			v = p[1]
-		}
-		data[k] = v
-	}
-
-	return data
-}
-
-// ParseSlice parses a string into a slice. The string's expected pattern is:
-//
-//         VAL1, "VAL2 ", " VAL3 "
-//
-// The values are separated by a comma and optional whitespace. Please see
-// the encoding/csv package (https://goo.gl/1j1xb9) for information on how to
-// quote values to include leading and trailing whitespace.
-func ParseSlice(line string) []string {
-	line = strings.TrimSpace(line)
-	if line == "" {
-		return nil
-	}
-
-	r := csv.NewReader(strings.NewReader(line))
-	r.TrimLeadingSpace = true
-
-	record, err := r.Read()
-	if err == io.EOF {
-		return nil
-	}
-	if err != nil {
-		panic(err)
-	}
-
-	return record
-}
-
-// ParseMapWS parses a string into a map. The string's expected pattern is:
-//
-//         KEY1=VAL1 KEY2="VAL2 " "KEY 3"=' VAL3'
-//
-// The key/value pairs are separated by one or more whitespace characters.
-// Keys and/or values with whitespace should be quoted with either single
-// or double quotes.
-func ParseMapWS(line string) map[string]string {
-	if line == "" {
-		return nil
-	}
-
-	var (
-		escp bool
-		quot rune
-		ckey string
-		keyb = &bytes.Buffer{}
-		valb = &bytes.Buffer{}
-		word = keyb
-		data = map[string]string{}
-	)
-
-	for i, c := range line {
-		// Check to see if the character is a quote character.
-		switch c {
-		case '\\':
-			// If not already escaped then activate escape.
-			if !escp {
-				escp = true
-				continue
-			}
-		case '\'', '"':
-			// If the quote or double quote is the first char or
-			// an unescaped char then determine if this is the
-			// beginning of a quote or end of one.
-			if i == 0 || !escp {
-				if quot == c {
-					quot = 0
-				} else {
-					quot = c
-				}
-				continue
-			}
-		case '=':
-			// If the word buffer is currently the key buffer,
-			// quoting is not enabled, and the preceeding character
-			// is not the escape character then the equal sign indicates
-			// a transition from key to value.
-			if word == keyb && quot == 0 && !escp {
-				ckey = keyb.String()
-				keyb.Reset()
-				word = valb
-				continue
-			}
-		case ' ', '\t':
-			// If quoting is not enabled and the preceeding character is
-			// not the escape character then record the value into the
-			// map and fast-forward the cursor to the next, non-whitespace
-			// character.
-			if quot == 0 && !escp {
-				// Record the value into the map for the current key.
-				if ckey != "" {
-					data[ckey] = valb.String()
-					valb.Reset()
-					word = keyb
-					ckey = ""
-				}
-				continue
-			}
-		}
-		if escp {
-			escp = false
-		}
-		word.WriteRune(c)
-	}
-
-	// If the current key string is not empty then record it with the value
-	// buffer's string value as a new pair.
-	if ckey != "" {
-		data[ckey] = valb.String()
-	}
-
-	return data
-}
-
-// NewMountCapability returns a new *csi.VolumeCapability for a
-// volume that is to be mounted.
-func NewMountCapability(
-	mode csi.VolumeCapability_AccessMode_Mode,
-	fsType string,
-	mountFlags ...string) *csi.VolumeCapability {
-
-	return &csi.VolumeCapability{
-		AccessMode: &csi.VolumeCapability_AccessMode{
-			Mode: mode,
-		},
-		AccessType: &csi.VolumeCapability_Mount{
-			Mount: &csi.VolumeCapability_MountVolume{
-				FsType:     fsType,
-				MountFlags: mountFlags,
-			},
-		},
-	}
-}
-
-// NewBlockCapability returns a new *csi.VolumeCapability for a
-// volume that is to be accessed as a raw device.
-func NewBlockCapability(
-	mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability {
-
-	return &csi.VolumeCapability{
-		AccessMode: &csi.VolumeCapability_AccessMode{
-			Mode: mode,
-		},
-		AccessType: &csi.VolumeCapability_Block{
-			Block: &csi.VolumeCapability_BlockVolume{},
-		},
-	}
-}
-
-// PageVolumes issues one or more ListVolumes requests to retrieve
-// all available volumes, returning them over a Go channel.
-func PageVolumes(
-	ctx context.Context,
-	client csi.ControllerClient,
-	req csi.ListVolumesRequest,
-	opts ...grpc.CallOption) (<-chan csi.Volume, <-chan error) {
-
-	var (
-		cvol = make(chan csi.Volume)
-		cerr = make(chan error)
-	)
-
-	// Execute the RPC in a goroutine, looping until there are no
-	// more volumes available.
-	go func() {
-		var (
-			wg     sync.WaitGroup
-			pages  int
-			cancel context.CancelFunc
-		)
-
-		// Get a cancellation context used to control the interaction
-		// between returning volumes and the possibility of an error.
-		ctx, cancel = context.WithCancel(ctx)
-
-		// waitAndClose closes the volume and error channels after all
-		// channel-dependent goroutines have completed their work
-		defer func() {
-			wg.Wait()
-			close(cerr)
-			close(cvol)
-			log.WithField("pages", pages).Debug("PageAllVolumes: exit")
-		}()
-
-		sendVolumes := func(res csi.ListVolumesResponse) {
-			// Loop over the volume entries until they're all gone
-			// or the context is cancelled.
-			var i int
-			for i = 0; i < len(res.Entries) && ctx.Err() == nil; i++ {
-
-				// Send the volume over the channel.
-				cvol <- *res.Entries[i].Volume
-
-				// Let the wait group know that this worker has completed
-				// its task.
-				wg.Done()
-			}
-			// If not all volumes have been sent over the channel then
-			// deduct the remaining number from the wait group.
-			if i != len(res.Entries) {
-				rem := len(res.Entries) - i
-				log.WithFields(map[string]interface{}{
-					"cancel":    ctx.Err(),
-					"remaining": rem,
-				}).Warn("PageAllVolumes: cancelled w unprocessed results")
-				wg.Add(-rem)
-			}
-		}
-
-		// listVolumes returns true if there are more volumes to list.
-		listVolumes := func() bool {
-
-			// The wait group "wg" is blocked during the execution of
-			// this function.
-			wg.Add(1)
-			defer wg.Done()
-
-			res, err := client.ListVolumes(ctx, &req, opts...)
-			if err != nil {
-				cerr <- err
-
-				// Invoke the cancellation context function to
-				// ensure that work wraps up as quickly as possible.
-				cancel()
-
-				return false
-			}
-
-			// Add to the number of workers
-			wg.Add(len(res.Entries))
-
-			// Process the retrieved volumes.
-			go sendVolumes(*res)
-
-			// Set the request's starting token to the response's
-			// next token.
-			req.StartingToken = res.NextToken
-			return req.StartingToken != ""
-		}
-
-		// List volumes until there are no more volumes or the context
-		// is cancelled.
-		for {
-			if ctx.Err() != nil {
-				break
-			}
-			if !listVolumes() {
-				break
-			}
-			pages++
-		}
-	}()
-
-	return cvol, cerr
-}
-
-// IsSuccess returns nil if the provided error is an RPC error with an error
-// code that is OK (0) or matches one of the additional, provided successful
-// error codes. Otherwise the original error is returned.
-func IsSuccess(err error, successCodes ...codes.Code) error {
-
-	// Shortcut the process by first checking to see if the error is nil.
-	if err == nil {
-		return nil
-	}
-
-	// Check to see if the provided error is an RPC error.
-	stat, ok := status.FromError(err)
-	if !ok {
-		return err
-	}
-
-	if stat.Code() == codes.OK {
-		return nil
-	}
-	for _, c := range successCodes {
-		if stat.Code() == c {
-			return nil
-		}
-	}
-
-	return err
-}
-
-// IsSuccessfulResponse uses IsSuccess to determine if the response for
-// a specific CSI method is successful. If successful a nil value is
-// returned; otherwise the original error is returned.
-func IsSuccessfulResponse(method string, err error) error {
-	switch method {
-	case CreateVolume:
-		return IsSuccess(err, codes.AlreadyExists)
-	case DeleteVolume:
-		return IsSuccess(err, codes.NotFound)
-	}
-	return err
-}
-
-// AreVolumeCapabilitiesCompatible returns a flag indicating whether
-// the volume capability array "a" is compatible with "b". A true value
-// indicates that "a" and "b" are equivalent or "b" is a superset of "a".
-func AreVolumeCapabilitiesCompatible(
-	a, b []*csi.VolumeCapability) (bool, error) {
-
-	if len(a) > len(b) {
-		return false, status.Error(
-			codes.AlreadyExists,
-			"requested capabilities exceed existing")
-	}
-
-	var i int
-
-	for _, va := range a {
-		for _, vb := range b {
-			if EqualVolumeCapability(va, vb) {
-				i++
-			}
-		}
-	}
-
-	return i >= len(a), nil
-}
-
-// IsVolumeCapabilityCompatible returns a flag indicating whether
-// the volume capability "a" is compatible with the set "b". A true value
-// indicates that "a" and "b" are equivalent or "b" is a superset of "a".
-func IsVolumeCapabilityCompatible(
-	a *csi.VolumeCapability, b []*csi.VolumeCapability) (bool, error) {
-
-	return AreVolumeCapabilitiesCompatible([]*csi.VolumeCapability{a}, b)
-}
-
-// EqualVolumeCapability returns a flag indicating if two csi.VolumeCapability
-// objects are equal. If a and b are both nil then false is returned.
-func EqualVolumeCapability(a, b *csi.VolumeCapability) bool {
-	if a == nil || b == nil {
-		return false
-	}
-
-	// Compare access modes.
-	if a.AccessMode != nil && b.AccessMode == nil {
-		return false
-	}
-	if a.AccessMode == nil && b.AccessMode != nil {
-		return false
-	}
-	if a.AccessMode != nil && b.AccessMode != nil &&
-		a.AccessMode.Mode != b.AccessMode.Mode {
-		return false
-	}
-
-	// If both capabilities are block then return true.
-	if a.GetBlock() != nil && b.GetBlock() != nil {
-		return true
-	}
-
-	aMount := a.GetMount()
-	bMount := b.GetMount()
-	if aMount != nil && bMount != nil {
-
-		// If the filesystem types are incompatible then return false.
-		if aMount.FsType != bMount.FsType {
-			return false
-		}
-
-		// Compare the mount flags lengths.
-		if len(aMount.MountFlags) != len(bMount.MountFlags) {
-			return false
-		}
-
-		// Copy the mount flags to prevent the original order
-		// from changing due to the sort operation below.
-		af := append([]string{}, aMount.MountFlags...)
-		bf := append([]string{}, bMount.MountFlags...)
-
-		// Sort the mount flags prior to comparison.
-		sort.Strings(af)
-		sort.Strings(bf)
-
-		// Compare the mount flags.
-		for j := range af {
-			if af[j] != bf[j] {
-				return false
-			}
-		}
-
-		// The mount capabilities are compatible; return true.
-		return true
-	}
-
-	return false
-}
-
-// EqualVolume returns a flag indicating if two csi.Volume
-// objects are equal. If a and b are both nil then false is returned.
-func EqualVolume(a, b *csi.Volume) bool {
-	if a == nil || b == nil {
-		return false
-	}
-	return CompareVolume(*a, *b) == 0
-}
-
-// CompareVolume compares two csi.Volume objects and returns a
-// negative number if a < b, a positive number if a > b, and zero if
-// a == b.
-func CompareVolume(a, b csi.Volume) int {
-	if a.Id < b.Id {
-		return -1
-	}
-	if a.Id > b.Id {
-		return 1
-	}
-	if a.CapacityBytes < b.CapacityBytes {
-		return -1
-	}
-	if a.CapacityBytes > b.CapacityBytes {
-		return 1
-	}
-	if len(a.Attributes) < len(b.Attributes) {
-		return -1
-	}
-	if len(a.Attributes) > len(b.Attributes) {
-		return 1
-	}
-	for k, v := range a.Attributes {
-		if v < b.Attributes[k] {
-			return -1
-		}
-		if v > b.Attributes[k] {
-			return 1
-		}
-	}
-	return 0
-}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_middleware.go b/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_middleware.go
deleted file mode 100644
index f9966f05..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_middleware.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package utils
-
-import (
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
-)
-
-// ChainUnaryClient chains one or more unary, client interceptors
-// together into a left-to-right series that can be provided to a
-// new gRPC client.
-func ChainUnaryClient(
-	i ...grpc.UnaryClientInterceptor) grpc.UnaryClientInterceptor {
-
-	switch len(i) {
-	case 0:
-		return func(
-			ctx context.Context,
-			method string,
-			req, rep interface{},
-			cc *grpc.ClientConn,
-			invoker grpc.UnaryInvoker,
-			opts ...grpc.CallOption) error {
-			return invoker(ctx, method, req, rep, cc, opts...)
-		}
-	case 1:
-		return i[0]
-	}
-
-	return func(
-		ctx context.Context,
-		method string,
-		req, rep interface{},
-		cc *grpc.ClientConn,
-		invoker grpc.UnaryInvoker,
-		opts ...grpc.CallOption) error {
-
-		bc := func(
-			cur grpc.UnaryClientInterceptor,
-			nxt grpc.UnaryInvoker) grpc.UnaryInvoker {
-
-			return func(
-				curCtx context.Context,
-				curMethod string,
-				curReq, curRep interface{},
-				curCC *grpc.ClientConn,
-				curOpts ...grpc.CallOption) error {
-
-				return cur(
-					curCtx,
-					curMethod,
-					curReq, curRep,
-					curCC, nxt,
-					curOpts...)
-			}
-		}
-
-		c := invoker
-		for j := len(i) - 1; j >= 0; j-- {
-			c = bc(i[j], c)
-		}
-
-		return c(ctx, method, req, rep, cc, opts...)
-	}
-}
-
-// ChainUnaryServer chains one or more unary, server interceptors
-// together into a left-to-right series that can be provided to a
-// new gRPC server.
-func ChainUnaryServer(
-	i ...grpc.UnaryServerInterceptor) grpc.UnaryServerInterceptor {
-
-	switch len(i) {
-	case 0:
-		return func(
-			ctx context.Context,
-			req interface{},
-			_ *grpc.UnaryServerInfo,
-			handler grpc.UnaryHandler) (interface{}, error) {
-			return handler(ctx, req)
-		}
-	case 1:
-		return i[0]
-	}
-
-	return func(
-		ctx context.Context,
-		req interface{},
-		info *grpc.UnaryServerInfo,
-		handler grpc.UnaryHandler) (interface{}, error) {
-
-		bc := func(
-			cur grpc.UnaryServerInterceptor,
-			nxt grpc.UnaryHandler) grpc.UnaryHandler {
-			return func(
-				curCtx context.Context,
-				curReq interface{}) (interface{}, error) {
-				return cur(curCtx, curReq, info, nxt)
-			}
-		}
-		c := handler
-		for j := len(i) - 1; j >= 0; j-- {
-			c = bc(i[j], c)
-		}
-		return c(ctx, req)
-	}
-}
-
-// nilResponses exceeds the 80char code limit, but to modify it would render
-// it less readable than leaving it as is
-var nilResponses = map[string]interface{}{
-	CreateVolume:               (*csi.CreateVolumeResponse)(nil),
-	DeleteVolume:               (*csi.DeleteVolumeResponse)(nil),
-	ControllerPublishVolume:    (*csi.ControllerPublishVolumeResponse)(nil),
-	ControllerUnpublishVolume:  (*csi.ControllerUnpublishVolumeResponse)(nil),
-	ValidateVolumeCapabilities: (*csi.ValidateVolumeCapabilitiesResponse)(nil),
-	ListVolumes:                (*csi.ListVolumesResponse)(nil),
-	GetCapacity:                (*csi.GetCapacityResponse)(nil),
-	ControllerGetCapabilities:  (*csi.ControllerGetCapabilitiesResponse)(nil),
-	GetPluginInfo:              (*csi.GetPluginInfoResponse)(nil),
-	NodeGetId:                  (*csi.NodeGetIdResponse)(nil),
-	NodePublishVolume:          (*csi.NodePublishVolumeResponse)(nil),
-	NodeUnpublishVolume:        (*csi.NodeUnpublishVolumeResponse)(nil),
-	NodeGetCapabilities:        (*csi.NodeGetCapabilitiesResponse)(nil),
-}
-
-// IsNilResponse returns a flag indicating whether or not the provided
-// response object is a nil object wrapped inside a non-nil interface.
-func IsNilResponse(method string, rep interface{}) bool {
-	// Determine whether or not the resposne is nil. Otherwise it
-	// will no longer be possible to perform a nil equality check on the
-	// response to the interface{} rules for nil comparison. For more info
-	// please see https://golang.org/doc/faq#nil_error and
-	// https://github.com/grpc/grpc-go/issues/532.
-	if rep == nil {
-		return true
-	}
-	if nilRep := nilResponses[method]; rep == nilRep {
-		return true
-	}
-	return false
-}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_rpcs.go b/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_rpcs.go
deleted file mode 100644
index 55c20f88..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_rpcs.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package utils
-
-const (
-	// Namespace is the namesapce used by the protobuf.
-	Namespace = "csi"
-
-	// CSIEndpoint is the name of the environment variable that
-	// contains the CSI endpoint.
-	CSIEndpoint = "CSI_ENDPOINT"
-
-	//
-	// Controller Service
-	//
-	ctrlSvc = "/" + Namespace + ".Controller/"
-
-	// CreateVolume is the full method name for the
-	// eponymous RPC message.
-	CreateVolume = ctrlSvc + "CreateVolume"
-
-	// DeleteVolume is the full method name for the
-	// eponymous RPC message.
-	DeleteVolume = ctrlSvc + "DeleteVolume"
-
-	// ControllerPublishVolume is the full method name for the
-	// eponymous RPC message.
-	ControllerPublishVolume = ctrlSvc + "ControllerPublishVolume"
-
-	// ControllerUnpublishVolume is the full method name for the
-	// eponymous RPC message.
-	ControllerUnpublishVolume = ctrlSvc + "ControllerUnpublishVolume"
-
-	// ValidateVolumeCapabilities is the full method name for the
-	// eponymous RPC message.
-	ValidateVolumeCapabilities = ctrlSvc + "ValidateVolumeCapabilities"
-
-	// ListVolumes is the full method name for the
-	// eponymous RPC message.
-	ListVolumes = ctrlSvc + "ListVolumes"
-
-	// GetCapacity is the full method name for the
-	// eponymous RPC message.
-	GetCapacity = ctrlSvc + "GetCapacity"
-
-	// ControllerGetCapabilities is the full method name for the
-	// eponymous RPC message.
-	ControllerGetCapabilities = ctrlSvc + "ControllerGetCapabilities"
-
-	// ControllerProbe is the full method name for the
-	// eponymous RPC message.
-	ControllerProbe = ctrlSvc + "ControllerProbe"
-
-	//
-	// Identity Service
-	//
-	identSvc = "/" + Namespace + ".Identity/"
-
-	// GetSupportedVersions is the full method name for the
-	// eponymous RPC message.
-	GetSupportedVersions = identSvc + "GetSupportedVersions"
-
-	// GetPluginInfo is the full method name for the
-	// eponymous RPC message.
-	GetPluginInfo = identSvc + "GetPluginInfo"
-
-	//
-	// Node Service
-	//
-	nodeSvc = "/" + Namespace + ".Node/"
-
-	// NodeGetId is the full method name for the
-	// eponymous RPC message.
-	NodeGetId = nodeSvc + "NodeGetId"
-
-	// NodePublishVolume is the full method name for the
-	// eponymous RPC message.
-	NodePublishVolume = nodeSvc + "NodePublishVolume"
-
-	// NodeUnpublishVolume is the full method name for the
-	// eponymous RPC message.
-	NodeUnpublishVolume = nodeSvc + "NodeUnpublishVolume"
-
-	// NodeProbe is the full method name for the
-	// eponymous RPC message.
-	NodeProbe = nodeSvc + "NodeProbe"
-
-	// NodeGetCapabilities is the full method name for the
-	// eponymous RPC message.
-	NodeGetCapabilities = nodeSvc + "NodeGetCapabilities"
-)
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_suite_test.go b/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_suite_test.go
deleted file mode 100644
index bdc90681..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_suite_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package utils_test
-
-import (
-	"github.com/onsi/ginkgo"
-	"github.com/onsi/gomega"
-	log "github.com/sirupsen/logrus"
-
-	"testing"
-)
-
-func TestUtils(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-	log.SetOutput(GinkgoWriter)
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Utils Suite")
-}
-
-// Declarations for Ginkgo DSL
-type Done ginkgo.Done
-type Benchmarker ginkgo.Benchmarker
-
-var GinkgoWriter = ginkgo.GinkgoWriter
-var GinkgoRandomSeed = ginkgo.GinkgoRandomSeed
-var GinkgoParallelNode = ginkgo.GinkgoParallelNode
-var GinkgoT = ginkgo.GinkgoT
-var CurrentGinkgoTestDescription = ginkgo.CurrentGinkgoTestDescription
-var RunSpecs = ginkgo.RunSpecs
-var RunSpecsWithDefaultAndCustomReporters = ginkgo.RunSpecsWithDefaultAndCustomReporters
-var RunSpecsWithCustomReporters = ginkgo.RunSpecsWithCustomReporters
-var Skip = ginkgo.Skip
-var Fail = ginkgo.Fail
-var GinkgoRecover = ginkgo.GinkgoRecover
-var Describe = ginkgo.Describe
-var FDescribe = ginkgo.FDescribe
-var PDescribe = ginkgo.PDescribe
-var XDescribe = ginkgo.XDescribe
-var Context = ginkgo.Context
-var FContext = ginkgo.FContext
-var PContext = ginkgo.PContext
-var XContext = ginkgo.XContext
-var It = ginkgo.It
-var FIt = ginkgo.FIt
-var PIt = ginkgo.PIt
-var XIt = ginkgo.XIt
-var Specify = ginkgo.Specify
-var FSpecify = ginkgo.FSpecify
-var PSpecify = ginkgo.PSpecify
-var XSpecify = ginkgo.XSpecify
-var By = ginkgo.By
-var Measure = ginkgo.Measure
-var FMeasure = ginkgo.FMeasure
-var PMeasure = ginkgo.PMeasure
-var XMeasure = ginkgo.XMeasure
-var BeforeSuite = ginkgo.BeforeSuite
-var AfterSuite = ginkgo.AfterSuite
-var SynchronizedBeforeSuite = ginkgo.SynchronizedBeforeSuite
-var SynchronizedAfterSuite = ginkgo.SynchronizedAfterSuite
-var BeforeEach = ginkgo.BeforeEach
-var JustBeforeEach = ginkgo.JustBeforeEach
-var AfterEach = ginkgo.AfterEach
-
-// Declarations for Gomega DSL
-var RegisterFailHandler = gomega.RegisterFailHandler
-var RegisterTestingT = gomega.RegisterTestingT
-var InterceptGomegaFailures = gomega.InterceptGomegaFailures
-var Ω = gomega.Ω
-var Expect = gomega.Expect
-var ExpectWithOffset = gomega.ExpectWithOffset
-var Eventually = gomega.Eventually
-var EventuallyWithOffset = gomega.EventuallyWithOffset
-var Consistently = gomega.Consistently
-var ConsistentlyWithOffset = gomega.ConsistentlyWithOffset
-var SetDefaultEventuallyTimeout = gomega.SetDefaultEventuallyTimeout
-var SetDefaultEventuallyPollingInterval = gomega.SetDefaultEventuallyPollingInterval
-var SetDefaultConsistentlyDuration = gomega.SetDefaultConsistentlyDuration
-var SetDefaultConsistentlyPollingInterval = gomega.SetDefaultConsistentlyPollingInterval
-
-// Declarations for Gomega Matchers
-var Equal = gomega.Equal
-var BeEquivalentTo = gomega.BeEquivalentTo
-var BeIdenticalTo = gomega.BeIdenticalTo
-var BeNil = gomega.BeNil
-var BeTrue = gomega.BeTrue
-var BeFalse = gomega.BeFalse
-var HaveOccurred = gomega.HaveOccurred
-var Succeed = gomega.Succeed
-var MatchError = gomega.MatchError
-var BeClosed = gomega.BeClosed
-var Receive = gomega.Receive
-var BeSent = gomega.BeSent
-var MatchRegexp = gomega.MatchRegexp
-var ContainSubstring = gomega.ContainSubstring
-var HavePrefix = gomega.HavePrefix
-var HaveSuffix = gomega.HaveSuffix
-var MatchJSON = gomega.MatchJSON
-var MatchXML = gomega.MatchXML
-var MatchYAML = gomega.MatchYAML
-var BeEmpty = gomega.BeEmpty
-var HaveLen = gomega.HaveLen
-var HaveCap = gomega.HaveCap
-var BeZero = gomega.BeZero
-var ContainElement = gomega.ContainElement
-var ConsistOf = gomega.ConsistOf
-var HaveKey = gomega.HaveKey
-var HaveKeyWithValue = gomega.HaveKeyWithValue
-var BeNumerically = gomega.BeNumerically
-var BeTemporally = gomega.BeTemporally
-var BeAssignableToTypeOf = gomega.BeAssignableToTypeOf
-var Panic = gomega.Panic
-var BeAnExistingFile = gomega.BeAnExistingFile
-var BeARegularFile = gomega.BeARegularFile
-var BeADirectory = gomega.BeADirectory
-var And = gomega.And
-var SatisfyAll = gomega.SatisfyAll
-var Or = gomega.Or
-var SatisfyAny = gomega.SatisfyAny
-var Not = gomega.Not
-var WithTransform = gomega.WithTransform
diff --git a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_test.go b/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_test.go
deleted file mode 100644
index d6748a73..00000000
--- a/vendor/github.com/kubernetes-csi/csi-test/mock/utils/utils_test.go
+++ /dev/null
@@ -1,415 +0,0 @@
-package utils_test
-
-import (
-	"errors"
-	"fmt"
-	"os"
-
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
-	"github.com/kubernetes-csi/csi-test/mock/utils"
-)
-
-var errMissingCSIEndpoint = errors.New("missing CSI_ENDPOINT")
-
-var _ = Describe("GetCSIEndpoint", func() {
-	var (
-		err         error
-		proto       string
-		addr        string
-		expEndpoint string
-		expProto    string
-		expAddr     string
-	)
-	BeforeEach(func() {
-		expEndpoint = CurrentGinkgoTestDescription().ComponentTexts[2]
-		os.Setenv(utils.CSIEndpoint, expEndpoint)
-	})
-	AfterEach(func() {
-		proto = ""
-		addr = ""
-		expEndpoint = ""
-		expProto = ""
-		expAddr = ""
-		os.Unsetenv(utils.CSIEndpoint)
-	})
-	JustBeforeEach(func() {
-		proto, addr, err = utils.GetCSIEndpoint()
-	})
-
-	Context("Valid Endpoint", func() {
-		shouldBeValid := func() {
-			Ω(os.Getenv(utils.CSIEndpoint)).Should(Equal(expEndpoint))
-			Ω(proto).Should(Equal(expProto))
-			Ω(addr).Should(Equal(expAddr))
-		}
-		Context("tcp://127.0.0.1", func() {
-			BeforeEach(func() {
-				expProto = "tcp"
-				expAddr = "127.0.0.1"
-			})
-			It("Should Be Valid", shouldBeValid)
-		})
-		Context("tcp://127.0.0.1:8080", func() {
-			BeforeEach(func() {
-				expProto = "tcp"
-				expAddr = "127.0.0.1:8080"
-			})
-			It("Should Be Valid", shouldBeValid)
-		})
-		Context("tcp://*:8080", func() {
-			BeforeEach(func() {
-				expProto = "tcp"
-				expAddr = "*:8080"
-			})
-			It("Should Be Valid", shouldBeValid)
-		})
-		Context("unix://path/to/sock.sock", func() {
-			BeforeEach(func() {
-				expProto = "unix"
-				expAddr = "path/to/sock.sock"
-			})
-			It("Should Be Valid", shouldBeValid)
-		})
-		Context("unix:///path/to/sock.sock", func() {
-			BeforeEach(func() {
-				expProto = "unix"
-				expAddr = "/path/to/sock.sock"
-			})
-			It("Should Be Valid", shouldBeValid)
-		})
-		Context("sock.sock", func() {
-			BeforeEach(func() {
-				expProto = "unix"
-				expAddr = "sock.sock"
-			})
-			It("Should Be Valid", shouldBeValid)
-		})
-		Context("/tmp/sock.sock", func() {
-			BeforeEach(func() {
-				expProto = "unix"
-				expAddr = "/tmp/sock.sock"
-			})
-			It("Should Be Valid", shouldBeValid)
-		})
-	})
-
-	Context("Missing Endpoint", func() {
-		Context("", func() {
-			It("Should Be Missing", func() {
-				Ω(err).Should(HaveOccurred())
-				Ω(err).Should(Equal(errMissingCSIEndpoint))
-			})
-		})
-		Context("    ", func() {
-			It("Should Be Missing", func() {
-				Ω(err).Should(HaveOccurred())
-				Ω(err).Should(Equal(errMissingCSIEndpoint))
-			})
-		})
-	})
-
-	Context("Invalid Network Address", func() {
-		shouldBeInvalid := func() {
-			Ω(err).Should(HaveOccurred())
-			Ω(err.Error()).Should(Equal(fmt.Sprintf(
-				"invalid network address: %s", expEndpoint)))
-		}
-		Context("tcp5://localhost:5000", func() {
-			It("Should Be An Invalid Endpoint", shouldBeInvalid)
-		})
-		Context("unixpcket://path/to/sock.sock", func() {
-			It("Should Be An Invalid Endpoint", shouldBeInvalid)
-		})
-	})
-
-	Context("Invalid Implied Sock File", func() {
-		shouldBeInvalid := func() {
-			Ω(err).Should(HaveOccurred())
-			Ω(err.Error()).Should(Equal(fmt.Sprintf(
-				"invalid implied sock file: %[1]s: "+
-					"open %[1]s: no such file or directory",
-				expEndpoint)))
-		}
-		Context("Xtcp5://localhost:5000", func() {
-			It("Should Be An Invalid Implied Sock File", shouldBeInvalid)
-		})
-		Context("Xunixpcket://path/to/sock.sock", func() {
-			It("Should Be An Invalid Implied Sock File", shouldBeInvalid)
-		})
-	})
-})
-
-var _ = Describe("ParseProtoAddr", func() {
-	Context("Empty Address", func() {
-		It("Should Be An Empty Address", func() {
-			_, _, err := utils.ParseProtoAddr("")
-			Ω(err).Should(HaveOccurred())
-			Ω(err).Should(Equal(utils.ErrParseProtoAddrRequired))
-		})
-		It("Should Be An Empty Address", func() {
-			_, _, err := utils.ParseProtoAddr("   ")
-			Ω(err).Should(HaveOccurred())
-			Ω(err).Should(Equal(utils.ErrParseProtoAddrRequired))
-		})
-	})
-})
-
-var _ = Describe("ParseMap", func() {
-	Context("One Pair", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap("k1=v1")
-			Ω(data).Should(HaveLen(1))
-			Ω(data["k1"]).Should(Equal("v1"))
-		})
-	})
-	Context("Empty Line", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap("")
-			Ω(data).Should(HaveLen(0))
-		})
-	})
-	Context("Key Sans Value", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap("k1")
-			Ω(data).Should(HaveLen(1))
-		})
-	})
-	Context("Two Pair", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap("k1=v1, k2=v2")
-			Ω(data).Should(HaveLen(2))
-			Ω(data["k1"]).Should(Equal("v1"))
-			Ω(data["k2"]).Should(Equal("v2"))
-		})
-	})
-	Context("Two Pair with Quoting & Escaping", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap(`k1=v1, "k2=v2""s"`)
-			Ω(data).Should(HaveLen(2))
-			Ω(data["k1"]).Should(Equal("v1"))
-			Ω(data["k2"]).Should(Equal(`v2"s`))
-		})
-		It("Should Be Valid", func() {
-			data := utils.ParseMap(`k1=v1, "k2=v2\'s"`)
-			Ω(data).Should(HaveLen(2))
-			Ω(data["k1"]).Should(Equal("v1"))
-			Ω(data["k2"]).Should(Equal(`v2\'s`))
-		})
-		It("Should Be Valid", func() {
-			data := utils.ParseMap(`k1=v1, k2=v2's`)
-			Ω(data).Should(HaveLen(2))
-			Ω(data["k1"]).Should(Equal("v1"))
-			Ω(data["k2"]).Should(Equal(`v2's`))
-		})
-	})
-	Context("Two Pair with Three Spaces Between Them", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap("k1=v1,   k2=v2")
-			Ω(data).Should(HaveLen(2))
-			Ω(data["k1"]).Should(Equal("v1"))
-			Ω(data["k2"]).Should(Equal("v2"))
-		})
-	})
-	Context("Two Pair with One Sans Value", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap("k1=, k2=v2")
-			Ω(data).Should(HaveLen(2))
-			Ω(data["k1"]).Should(Equal(""))
-			Ω(data["k2"]).Should(Equal("v2"))
-		})
-	})
-	Context("Two Pair with One Sans Value & Three Spaces Between Them", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap("k1=,    k2=v2")
-			Ω(data).Should(HaveLen(2))
-			Ω(data["k1"]).Should(Equal(""))
-			Ω(data["k2"]).Should(Equal("v2"))
-		})
-	})
-	Context("One Pair with Quoted Value", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap("k1=v 1")
-			Ω(data).Should(HaveLen(1))
-			Ω(data["k1"]).Should(Equal("v 1"))
-		})
-	})
-	Context("Three Pair with Mixed Values", func() {
-		It("Should Be Valid", func() {
-			data := utils.ParseMap(`"k1=v 1", "k2=v 2 ", "k3 =v3"  `)
-			Ω(data).Should(HaveLen(3))
-			Ω(data["k1"]).Should(Equal("v 1"))
-			Ω(data["k2"]).Should(Equal("v 2 "))
-			Ω(data["k3 "]).Should(Equal("v3"))
-		})
-	})
-})
-
-var _ = Describe("CompareVolume", func() {
-	It("a == b", func() {
-		a := csi.Volume{Id: "0"}
-		b := csi.Volume{Id: "0"}
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-		a.CapacityBytes = 1
-		b.CapacityBytes = 1
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-		a.Attributes = map[string]string{"key": "val"}
-		b.Attributes = map[string]string{"key": "val"}
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-	})
-	It("a > b", func() {
-		a := csi.Volume{Id: "0"}
-		b := csi.Volume{}
-		Ω(utils.CompareVolume(a, b)).Should(Equal(1))
-		b.Id = "0"
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-		a.CapacityBytes = 1
-		Ω(utils.CompareVolume(a, b)).Should(Equal(1))
-		b.CapacityBytes = 1
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-		a.Attributes = map[string]string{"key": "val"}
-		Ω(utils.CompareVolume(a, b)).Should(Equal(1))
-		b.Attributes = map[string]string{"key": "val"}
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-	})
-	It("a < b", func() {
-		b := csi.Volume{Id: "0"}
-		a := csi.Volume{}
-		Ω(utils.CompareVolume(a, b)).Should(Equal(-1))
-		a.Id = "0"
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-		b.CapacityBytes = 1
-		Ω(utils.CompareVolume(a, b)).Should(Equal(-1))
-		a.CapacityBytes = 1
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-		b.Attributes = map[string]string{"key": "val"}
-		Ω(utils.CompareVolume(a, b)).Should(Equal(-1))
-		a.Attributes = map[string]string{"key": "val"}
-		Ω(utils.CompareVolume(a, b)).Should(Equal(0))
-	})
-})
-
-var _ = Describe("EqualVolumeCapability", func() {
-	It("a == b", func() {
-		a := &csi.VolumeCapability{
-			AccessMode: &csi.VolumeCapability_AccessMode{
-				Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-			},
-			AccessType: &csi.VolumeCapability_Block{
-				Block: &csi.VolumeCapability_BlockVolume{},
-			},
-		}
-		b := &csi.VolumeCapability{
-			AccessMode: &csi.VolumeCapability_AccessMode{
-				Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-			},
-			AccessType: &csi.VolumeCapability_Block{
-				Block: &csi.VolumeCapability_BlockVolume{},
-			},
-		}
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeTrue())
-		a.AccessMode.Mode = csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeFalse())
-		b.AccessMode.Mode = csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeTrue())
-		a.AccessMode = nil
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeFalse())
-		b.AccessMode = nil
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeTrue())
-		a = nil
-		Ω(utils.EqualVolumeCapability(nil, b)).Should(BeFalse())
-		b = nil
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeFalse())
-
-		aAT := &csi.VolumeCapability_Mount{
-			Mount: &csi.VolumeCapability_MountVolume{
-				FsType:     "ext4",
-				MountFlags: []string{"rw"},
-			},
-		}
-		bAT := &csi.VolumeCapability_Mount{
-			Mount: &csi.VolumeCapability_MountVolume{
-				FsType:     "ext4",
-				MountFlags: []string{"rw"},
-			},
-		}
-
-		a = &csi.VolumeCapability{
-			AccessMode: &csi.VolumeCapability_AccessMode{
-				Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-			},
-			AccessType: aAT,
-		}
-		b = &csi.VolumeCapability{
-			AccessMode: &csi.VolumeCapability_AccessMode{
-				Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-			},
-			AccessType: bAT,
-		}
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeTrue())
-		aAT.Mount.FsType = "xfs"
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeFalse())
-		bAT.Mount.FsType = "xfs"
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeTrue())
-		aAT.Mount.MountFlags = append(aAT.Mount.MountFlags, "nosuid")
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeFalse())
-		bAT.Mount.MountFlags = append(bAT.Mount.MountFlags, "nosuid")
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeTrue())
-		aAT.Mount.MountFlags[0] = "ro"
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeFalse())
-		bAT.Mount.MountFlags[0] = "ro"
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeTrue())
-		aAT.Mount.MountFlags = nil
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeFalse())
-		bAT.Mount.MountFlags = nil
-		Ω(utils.EqualVolumeCapability(a, b)).Should(BeTrue())
-	})
-})
-
-var _ = Describe("AreVolumeCapabilitiesCompatible", func() {
-	It("compatible", func() {
-		aMountAT := &csi.VolumeCapability_Mount{
-			Mount: &csi.VolumeCapability_MountVolume{
-				FsType:     "ext4",
-				MountFlags: []string{"rw"},
-			},
-		}
-		a := []*csi.VolumeCapability{
-			{
-				AccessMode: &csi.VolumeCapability_AccessMode{
-					Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-				},
-				AccessType: aMountAT,
-			},
-		}
-
-		b := []*csi.VolumeCapability{
-			{
-				AccessMode: &csi.VolumeCapability_AccessMode{
-					Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-				},
-				AccessType: &csi.VolumeCapability_Block{
-					Block: &csi.VolumeCapability_BlockVolume{},
-				},
-			},
-			{
-				AccessMode: &csi.VolumeCapability_AccessMode{
-					Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-				},
-				AccessType: &csi.VolumeCapability_Mount{
-					Mount: &csi.VolumeCapability_MountVolume{
-						FsType:     "ext4",
-						MountFlags: []string{"rw"},
-					},
-				},
-			},
-		}
-
-		Ω(utils.AreVolumeCapabilitiesCompatible(a, b)).Should(BeTrue())
-		aMountAT.Mount.MountFlags[0] = "ro"
-		Ω(utils.AreVolumeCapabilitiesCompatible(a, b)).Should(BeFalse())
-		a[0].AccessType = &csi.VolumeCapability_Block{
-			Block: &csi.VolumeCapability_BlockVolume{},
-		}
-		Ω(utils.AreVolumeCapabilitiesCompatible(a, b)).Should(BeTrue())
-	})
-})
diff --git a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/README.md b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/README.md
index 747744ea..de4ae501 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/README.md
+++ b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/README.md
@@ -13,13 +13,50 @@ Golang `TestXXX` functions. For example:
 
 ```go
 func TestMyDriver(t *testing.T) {
-    // Setup the full driver and its environment
-    ... setup driver ...
+	// Setup the full driver and its environment
+	... setup driver ...
+	config := &sanity.Config{
+		TargetPath:     ...
+		StagingPath:    ...
+		Address:        endpoint,
+	}
 
-    // Now call the test suite
-    sanity.Test(t, driverEndpointAddress, "/mnt")
+
+	// Now call the test suite
+	sanity.Test(t, config)
 }
 ```
 
+Only one such test function is supported because under the hood a
+Ginkgo test suite gets constructed and executed by the call.
+
+Alternatively, the tests can also be embedded inside a Ginkgo test
+suite. In that case it is possible to define multiple tests with
+different configurations:
+
+```go
+var _ = Describe("MyCSIDriver", func () {
+	Context("Config A", func () {
+		var config &sanity.Config
+
+		BeforeEach() {
+			... setup driver and config...
+		}
+
+		AfterEach() {
+			...tear down driver...
+		}
+
+		Describe("CSI sanity", func() {
+			sanity.GinkgoTest(config)
+		})
+	})
+
+	Context("Config B", func () {
+		...
+	})
+})
+```
+
 ## Command line program
 Please see [csi-sanity](https://github.com/kubernetes-csi/csi-test/tree/master/cmd/csi-sanity)
diff --git a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/cleanup.go b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/cleanup.go
new file mode 100644
index 00000000..699efe7b
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/cleanup.go
@@ -0,0 +1,134 @@
+/*
+Copyright 2018 Intel Corporation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package sanity
+
+import (
+	"context"
+	"log"
+
+	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+
+	. "github.com/onsi/ginkgo"
+)
+
+// VolumeInfo keeps track of the information needed to delete a volume.
+type VolumeInfo struct {
+	// Node on which the volume was published, empty if none
+	// or publishing is not supported.
+	NodeID string
+
+	// Volume ID assigned by CreateVolume.
+	VolumeID string
+}
+
+// Cleanup keeps track of resources, in particular volumes, which need
+// to be freed when testing is done.
+type Cleanup struct {
+	Context                    *SanityContext
+	ControllerClient           csi.ControllerClient
+	NodeClient                 csi.NodeClient
+	ControllerPublishSupported bool
+	NodeStageSupported         bool
+
+	// Maps from volume name to the node ID for which the volume
+	// is published and the volume ID.
+	volumes map[string]VolumeInfo
+}
+
+// RegisterVolume adds or updates an entry for the volume with the
+// given name.
+func (cl *Cleanup) RegisterVolume(name string, info VolumeInfo) {
+	if cl.volumes == nil {
+		cl.volumes = make(map[string]VolumeInfo)
+	}
+	cl.volumes[name] = info
+}
+
+// MaybeRegisterVolume adds or updates an entry for the volume with
+// the given name if CreateVolume was successful.
+func (cl *Cleanup) MaybeRegisterVolume(name string, vol *csi.CreateVolumeResponse, err error) {
+	if err == nil && vol.GetVolume().GetId() != "" {
+		cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+	}
+}
+
+// UnregisterVolume removes the entry for the volume with the
+// given name, thus preventing all cleanup operations for it.
+func (cl *Cleanup) UnregisterVolume(name string) {
+	if cl.volumes != nil {
+		delete(cl.volumes, name)
+	}
+}
+
+// DeleteVolumes stops using the registered volumes and tries to delete all of them.
+func (cl *Cleanup) DeleteVolumes() {
+	if cl.volumes == nil {
+		return
+	}
+	logger := log.New(GinkgoWriter, "cleanup: ", 0)
+	ctx := context.Background()
+
+	for name, info := range cl.volumes {
+		logger.Printf("deleting %s = %s", name, info.VolumeID)
+		if _, err := cl.NodeClient.NodeUnpublishVolume(
+			ctx,
+			&csi.NodeUnpublishVolumeRequest{
+				VolumeId:   info.VolumeID,
+				TargetPath: cl.Context.Config.TargetPath,
+			},
+		); err != nil {
+			logger.Printf("warning: NodeUnpublishVolume: %s", err)
+		}
+
+		if cl.NodeStageSupported {
+			if _, err := cl.NodeClient.NodeUnstageVolume(
+				ctx,
+				&csi.NodeUnstageVolumeRequest{
+					VolumeId:          info.VolumeID,
+					StagingTargetPath: cl.Context.Config.StagingPath,
+				},
+			); err != nil {
+				logger.Printf("warning: NodeUnstageVolume: %s", err)
+			}
+		}
+
+		if cl.ControllerPublishSupported && info.NodeID != "" {
+			if _, err := cl.ControllerClient.ControllerUnpublishVolume(
+				ctx,
+				&csi.ControllerUnpublishVolumeRequest{
+					VolumeId: info.VolumeID,
+					NodeId:   info.NodeID,
+					ControllerUnpublishSecrets: cl.Context.Secrets.ControllerUnpublishVolumeSecret,
+				},
+			); err != nil {
+				logger.Printf("warning: ControllerUnpublishVolume: %s", err)
+			}
+		}
+
+		if _, err := cl.ControllerClient.DeleteVolume(
+			ctx,
+			&csi.DeleteVolumeRequest{
+				VolumeId:                info.VolumeID,
+				ControllerDeleteSecrets: cl.Context.Secrets.DeleteVolumeSecret,
+			},
+		); err != nil {
+			logger.Printf("error: DeleteVolume: %s", err)
+		}
+
+		cl.UnregisterVolume(name)
+	}
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/controller.go b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/controller.go
index 7fcd41a5..294a1e0d 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/controller.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/controller.go
@@ -17,24 +17,46 @@ limitations under the License.
 package sanity
 
 import (
+	"context"
 	"fmt"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
-	context "golang.org/x/net/context"
+	"github.com/container-storage-interface/spec/lib/go/csi/v0"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"strconv"
 )
 
+const (
+	// DefTestVolumeSize defines the base size of dynamically
+	// provisioned volumes. 10GB by default, can be overridden by
+	// setting Config.TestVolumeSize.
+	DefTestVolumeSize int64 = 10 * 1024 * 1024 * 1024
+)
+
+func TestVolumeSize(sc *SanityContext) int64 {
+	if sc.Config.TestVolumeSize > 0 {
+		return sc.Config.TestVolumeSize
+	}
+	return DefTestVolumeSize
+}
+
 func verifyVolumeInfo(v *csi.Volume) {
 	Expect(v).NotTo(BeNil())
 	Expect(v.GetId()).NotTo(BeEmpty())
 }
 
-func isCapabilitySupported(
+func verifySnapshotInfo(snapshot *csi.Snapshot) {
+	Expect(snapshot).NotTo(BeNil())
+	Expect(snapshot.GetId()).NotTo(BeEmpty())
+	Expect(snapshot.GetSourceVolumeId()).NotTo(BeEmpty())
+	Expect(snapshot.GetCreatedAt()).NotTo(BeZero())
+}
+
+func isControllerCapabilitySupported(
 	c csi.ControllerClient,
 	capType csi.ControllerServiceCapability_RPC_Type,
 ) bool {
@@ -55,144 +77,669 @@ func isCapabilitySupported(
 	return false
 }
 
-var _ = Describe("ControllerGetCapabilities [Controller Server]", func() {
+var _ = DescribeSanity("Controller Service", func(sc *SanityContext) {
 	var (
 		c csi.ControllerClient
+		n csi.NodeClient
+
+		cl *Cleanup
 	)
 
 	BeforeEach(func() {
-		c = csi.NewControllerClient(conn)
-	})
+		c = csi.NewControllerClient(sc.Conn)
+		n = csi.NewNodeClient(sc.Conn)
 
-	It("should return appropriate capabilities", func() {
-		caps, err := c.ControllerGetCapabilities(
-			context.Background(),
-			&csi.ControllerGetCapabilitiesRequest{})
-
-		By("checking successful response")
-		Expect(err).NotTo(HaveOccurred())
-		Expect(caps).NotTo(BeNil())
-		Expect(caps.GetCapabilities()).NotTo(BeNil())
+		cl = &Cleanup{
+			NodeClient:       n,
+			ControllerClient: c,
+			Context:          sc,
+		}
+	})
 
-		for _, cap := range caps.GetCapabilities() {
-			Expect(cap.GetRpc()).NotTo(BeNil())
+	AfterEach(func() {
+		cl.DeleteVolumes()
+	})
 
-			switch cap.GetRpc().GetType() {
-			case csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME:
-			case csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME:
-			case csi.ControllerServiceCapability_RPC_LIST_VOLUMES:
-			case csi.ControllerServiceCapability_RPC_GET_CAPACITY:
-			default:
-				Fail(fmt.Sprintf("Unknown capability: %v\n", cap.GetRpc().GetType()))
+	Describe("ControllerGetCapabilities", func() {
+		It("should return appropriate capabilities", func() {
+			caps, err := c.ControllerGetCapabilities(
+				context.Background(),
+				&csi.ControllerGetCapabilitiesRequest{})
+
+			By("checking successful response")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(caps).NotTo(BeNil())
+			Expect(caps.GetCapabilities()).NotTo(BeNil())
+
+			for _, cap := range caps.GetCapabilities() {
+				Expect(cap.GetRpc()).NotTo(BeNil())
+
+				switch cap.GetRpc().GetType() {
+				case csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME:
+				case csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME:
+				case csi.ControllerServiceCapability_RPC_LIST_VOLUMES:
+				case csi.ControllerServiceCapability_RPC_GET_CAPACITY:
+				case csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT:
+				case csi.ControllerServiceCapability_RPC_LIST_SNAPSHOTS:
+				default:
+					Fail(fmt.Sprintf("Unknown capability: %v\n", cap.GetRpc().GetType()))
+				}
 			}
-		}
+		})
 	})
-})
 
-var _ = Describe("GetCapacity [Controller Server]", func() {
-	var (
-		c csi.ControllerClient
-	)
+	Describe("GetCapacity", func() {
+		BeforeEach(func() {
+			if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_GET_CAPACITY) {
+				Skip("GetCapacity not supported")
+			}
+		})
 
-	BeforeEach(func() {
-		c = csi.NewControllerClient(conn)
+		It("should return capacity (no optional values added)", func() {
+			_, err := c.GetCapacity(
+				context.Background(),
+				&csi.GetCapacityRequest{})
+			Expect(err).NotTo(HaveOccurred())
 
-		if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_GET_CAPACITY) {
-			Skip("GetCapacity not supported")
-		}
+			// Since capacity is int64 we will not be checking it
+			// The value of zero is a possible value.
+		})
 	})
 
-	It("should return capacity (no optional values added)", func() {
-		_, err := c.GetCapacity(
-			context.Background(),
-			&csi.GetCapacityRequest{})
-		Expect(err).NotTo(HaveOccurred())
+	Describe("ListVolumes", func() {
+		BeforeEach(func() {
+			if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_LIST_VOLUMES) {
+				Skip("ListVolumes not supported")
+			}
+		})
 
-		// Since capacity is int64 we will not be checking it
-		// The value of zero is a possible value.
-	})
-})
+		It("should return appropriate values (no optional values added)", func() {
+			vols, err := c.ListVolumes(
+				context.Background(),
+				&csi.ListVolumesRequest{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vols).NotTo(BeNil())
 
-var _ = Describe("ListVolumes [Controller Server]", func() {
-	var (
-		c csi.ControllerClient
-	)
+			for _, vol := range vols.GetEntries() {
+				verifyVolumeInfo(vol.GetVolume())
+			}
+		})
 
-	BeforeEach(func() {
-		c = csi.NewControllerClient(conn)
+		// TODO: Add test to test for tokens
 
-		if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_LIST_VOLUMES) {
-			Skip("ListVolumes not supported")
-		}
+		// TODO: Add test which checks list of volume is there when created,
+		//       and not there when deleted.
 	})
 
-	It("should return appropriate values (no optional values added)", func() {
-		vols, err := c.ListVolumes(
-			context.Background(),
-			&csi.ListVolumesRequest{})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(vols).NotTo(BeNil())
+	Describe("CreateVolume", func() {
+		BeforeEach(func() {
+			if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME) {
+				Skip("CreateVolume not supported")
+			}
+		})
 
-		for _, vol := range vols.GetEntries() {
-			verifyVolumeInfo(vol.GetVolume())
-		}
+		It("should fail when no name is provided", func() {
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			cl.MaybeRegisterVolume("", vol, err)
+			Expect(err).To(HaveOccurred())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
+
+		It("should fail when no volume capabilities are provided", func() {
+			name := uniqueString("sanity-controller-create-no-volume-capabilities")
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			cl.MaybeRegisterVolume(name, vol, err)
+			Expect(err).To(HaveOccurred())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
+
+		It("should return appropriate values SingleNodeWriter NoCapacity Type:Mount", func() {
+
+			By("creating a volume")
+			name := uniqueString("sanity-controller-create-single-no-capacity")
+
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol).NotTo(BeNil())
+			Expect(vol.GetVolume()).NotTo(BeNil())
+			Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
+
+		It("should return appropriate values SingleNodeWriter WithCapacity 1Gi Type:Mount", func() {
+
+			By("creating a volume")
+			name := uniqueString("sanity-controller-create-single-with-capacity")
+
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					CapacityRange: &csi.CapacityRange{
+						RequiredBytes: TestVolumeSize(sc),
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			if serverError, ok := status.FromError(err); ok &&
+				(serverError.Code() == codes.OutOfRange || serverError.Code() == codes.Unimplemented) {
+				Skip("Required bytes not supported")
+			}
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol).NotTo(BeNil())
+			Expect(vol.GetVolume()).NotTo(BeNil())
+			Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+			Expect(vol.GetVolume().GetCapacityBytes()).To(BeNumerically(">=", TestVolumeSize(sc)))
+
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
+		It("should not fail when requesting to create a volume with already exisiting name and same capacity.", func() {
+
+			By("creating a volume")
+			name := uniqueString("sanity-controller-create-twice")
+			size := TestVolumeSize(sc)
+
+			vol1, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					CapacityRange: &csi.CapacityRange{
+						RequiredBytes: size,
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol1).NotTo(BeNil())
+			Expect(vol1.GetVolume()).NotTo(BeNil())
+			Expect(vol1.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol1.GetVolume().GetId()})
+			Expect(vol1.GetVolume().GetCapacityBytes()).To(BeNumerically(">=", size))
+
+			vol2, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					CapacityRange: &csi.CapacityRange{
+						RequiredBytes: size,
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol2).NotTo(BeNil())
+			Expect(vol2.GetVolume()).NotTo(BeNil())
+			Expect(vol2.GetVolume().GetId()).NotTo(BeEmpty())
+			Expect(vol2.GetVolume().GetCapacityBytes()).To(BeNumerically(">=", size))
+			Expect(vol1.GetVolume().GetId()).To(Equal(vol2.GetVolume().GetId()))
+
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol1.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
+		It("should fail when requesting to create a volume with already exisiting name and different capacity.", func() {
+
+			By("creating a volume")
+			name := uniqueString("sanity-controller-create-twice-different")
+			size1 := TestVolumeSize(sc)
+
+			vol1, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					CapacityRange: &csi.CapacityRange{
+						RequiredBytes: size1,
+						LimitBytes:    size1,
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(vol1).NotTo(BeNil())
+			Expect(vol1.GetVolume()).NotTo(BeNil())
+			Expect(vol1.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol1.GetVolume().GetId()})
+			size2 := 2 * TestVolumeSize(sc)
+
+			_, err = c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					CapacityRange: &csi.CapacityRange{
+						RequiredBytes: size2,
+						LimitBytes:    size2,
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.AlreadyExists))
+
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol1.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
 	})
 
-	// TODO: Add test to test for tokens
+	Describe("DeleteVolume", func() {
+		BeforeEach(func() {
+			if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME) {
+				Skip("DeleteVolume not supported")
+			}
+		})
 
-	// TODO: Add test which checks list of volume is there when created,
-	//       and not there when deleted.
-})
+		It("should fail when no volume id is provided", func() {
 
-var _ = Describe("CreateVolume [Controller Server]", func() {
-	var (
-		c csi.ControllerClient
-	)
+			_, err := c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
 
-	BeforeEach(func() {
-		c = csi.NewControllerClient(conn)
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 
-		if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME) {
-			Skip("CreateVolume not supported")
-		}
-	})
+		It("should succeed when an invalid volume id is used", func() {
 
-	It("should fail when no name is provided", func() {
+			_, err := c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                "reallyfakevolumeid",
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+		})
+
+		It("should return appropriate values (no optional values added)", func() {
+
+			// Create Volume First
+			By("creating a volume")
+			name := uniqueString("sanity-controller-create-appropriate")
+
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol).NotTo(BeNil())
+			Expect(vol.GetVolume()).NotTo(BeNil())
+			Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+
+			// Delete Volume
+			By("deleting a volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
+	})
 
-		_, err := c.CreateVolume(
-			context.Background(),
-			&csi.CreateVolumeRequest{})
-		Expect(err).To(HaveOccurred())
+	Describe("ValidateVolumeCapabilities", func() {
+		It("should fail when no volume id is provided", func() {
+
+			_, err := c.ValidateVolumeCapabilities(
+				context.Background(),
+				&csi.ValidateVolumeCapabilitiesRequest{})
+			Expect(err).To(HaveOccurred())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
+
+		It("should fail when no volume capabilities are provided", func() {
+
+			_, err := c.ValidateVolumeCapabilities(
+				context.Background(),
+				&csi.ValidateVolumeCapabilitiesRequest{
+					VolumeId: "id",
+				})
+			Expect(err).To(HaveOccurred())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
+
+		It("should return appropriate values (no optional values added)", func() {
+
+			// Create Volume First
+			By("creating a single node writer volume")
+			name := uniqueString("sanity-controller-validate")
+
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol).NotTo(BeNil())
+			Expect(vol.GetVolume()).NotTo(BeNil())
+			Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+
+			// ValidateVolumeCapabilities
+			By("validating volume capabilities")
+			valivolcap, err := c.ValidateVolumeCapabilities(
+				context.Background(),
+				&csi.ValidateVolumeCapabilitiesRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+				})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(valivolcap).NotTo(BeNil())
+			Expect(valivolcap.GetSupported()).To(BeTrue())
+
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
+
+		It("should fail when the requested volume does not exist", func() {
+
+			_, err := c.ValidateVolumeCapabilities(
+				context.Background(),
+				&csi.ValidateVolumeCapabilitiesRequest{
+					VolumeId: "some-vol-id",
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+				},
+			)
+			Expect(err).To(HaveOccurred())
 
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.NotFound))
+		})
 	})
 
-	It("should fail when no volume capabilities are provided", func() {
+	Describe("ControllerPublishVolume", func() {
+		BeforeEach(func() {
+			if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME) {
+				Skip("ControllerPublishVolume not supported")
+			}
+		})
 
-		_, err := c.CreateVolume(
-			context.Background(),
-			&csi.CreateVolumeRequest{
-				Name: "name",
-			})
-		Expect(err).To(HaveOccurred())
+		It("should fail when no volume id is provided", func() {
 
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
-	})
+			_, err := c.ControllerPublishVolume(
+				context.Background(),
+				&csi.ControllerPublishVolumeRequest{
+					ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
 
-	It("should return appropriate values SingleNodeWriter NoCapacity Type:Mount", func() {
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 
-		By("creating a volume")
-		name := "sanity"
-		vol, err := c.CreateVolume(
-			context.Background(),
-			&csi.CreateVolumeRequest{
-				Name: name,
-				VolumeCapabilities: []*csi.VolumeCapability{
-					{
+		It("should fail when no node id is provided", func() {
+
+			_, err := c.ControllerPublishVolume(
+				context.Background(),
+				&csi.ControllerPublishVolumeRequest{
+					VolumeId:                 "id",
+					ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
+
+		It("should fail when no volume capability is provided", func() {
+
+			_, err := c.ControllerPublishVolume(
+				context.Background(),
+				&csi.ControllerPublishVolumeRequest{
+					VolumeId: "id",
+					NodeId:   "fakenode",
+					ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
+
+		It("should return appropriate values (no optional values added)", func() {
+
+			// Create Volume First
+			By("creating a single node writer volume")
+			name := uniqueString("sanity-controller-publish")
+
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol).NotTo(BeNil())
+			Expect(vol.GetVolume()).NotTo(BeNil())
+			Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+
+			By("getting a node id")
+			nid, err := n.NodeGetId(
+				context.Background(),
+				&csi.NodeGetIdRequest{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(nid).NotTo(BeNil())
+			Expect(nid.GetNodeId()).NotTo(BeEmpty())
+
+			// ControllerPublishVolume
+			By("calling controllerpublish on that volume")
+
+			conpubvol, err := c.ControllerPublishVolume(
+				context.Background(),
+				&csi.ControllerPublishVolumeRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					NodeId:   nid.GetNodeId(),
+					VolumeCapability: &csi.VolumeCapability{
 						AccessType: &csi.VolumeCapability_Mount{
 							Mount: &csi.VolumeCapability_MountVolume{},
 						},
@@ -200,34 +747,306 @@ var _ = Describe("CreateVolume [Controller Server]", func() {
 							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 						},
 					},
+					Readonly:                 false,
+					ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
 				},
-			})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(vol).NotTo(BeNil())
-		Expect(vol.GetVolume()).NotTo(BeNil())
-		Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId(), NodeID: nid.GetNodeId()})
+			Expect(conpubvol).NotTo(BeNil())
+
+			By("cleaning up unpublishing the volume")
+
+			conunpubvol, err := c.ControllerUnpublishVolume(
+				context.Background(),
+				&csi.ControllerUnpublishVolumeRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					// NodeID is optional in ControllerUnpublishVolume
+					NodeId: nid.GetNodeId(),
+					ControllerUnpublishSecrets: sc.Secrets.ControllerUnpublishVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(conunpubvol).NotTo(BeNil())
 
-		By("cleaning up deleting the volume")
-		_, err = c.DeleteVolume(
-			context.Background(),
-			&csi.DeleteVolumeRequest{
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
+
+		It("should fail when the volume does not exist", func() {
+
+			By("calling controller publish on a non-existent volume")
+
+			conpubvol, err := c.ControllerPublishVolume(
+				context.Background(),
+				&csi.ControllerPublishVolumeRequest{
+					VolumeId: "some-vol-id",
+					NodeId:   "some-node-id",
+					VolumeCapability: &csi.VolumeCapability{
+						AccessType: &csi.VolumeCapability_Mount{
+							Mount: &csi.VolumeCapability_MountVolume{},
+						},
+						AccessMode: &csi.VolumeCapability_AccessMode{
+							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+						},
+					},
+					Readonly:                 false,
+					ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
+			Expect(conpubvol).To(BeNil())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.NotFound))
+		})
+
+		It("should fail when the node does not exist", func() {
+
+			// Create Volume First
+			By("creating a single node writer volume")
+			name := uniqueString("sanity-controller-wrong-node")
+
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol).NotTo(BeNil())
+			Expect(vol.GetVolume()).NotTo(BeNil())
+			Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+
+			// ControllerPublishVolume
+			By("calling controllerpublish on that volume")
+
+			conpubvol, err := c.ControllerPublishVolume(
+				context.Background(),
+				&csi.ControllerPublishVolumeRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					NodeId:   "some-fake-node-id",
+					VolumeCapability: &csi.VolumeCapability{
+						AccessType: &csi.VolumeCapability_Mount{
+							Mount: &csi.VolumeCapability_MountVolume{},
+						},
+						AccessMode: &csi.VolumeCapability_AccessMode{
+							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+						},
+					},
+					Readonly:                 false,
+					ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
+			Expect(conpubvol).To(BeNil())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.NotFound))
+
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
+
+		It("should fail when the volume is already published but is incompatible", func() {
+
+			// Create Volume First
+			By("creating a single node writer volume")
+			name := uniqueString("sanity-controller-published-incompatible")
+
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol).NotTo(BeNil())
+			Expect(vol.GetVolume()).NotTo(BeNil())
+			Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+
+			By("getting a node id")
+			nid, err := n.NodeGetId(
+				context.Background(),
+				&csi.NodeGetIdRequest{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(nid).NotTo(BeNil())
+			Expect(nid.GetNodeId()).NotTo(BeEmpty())
+
+			// ControllerPublishVolume
+			By("calling controllerpublish on that volume")
+
+			pubReq := &csi.ControllerPublishVolumeRequest{
 				VolumeId: vol.GetVolume().GetId(),
-			})
-		Expect(err).NotTo(HaveOccurred())
+				NodeId:   nid.GetNodeId(),
+				VolumeCapability: &csi.VolumeCapability{
+					AccessType: &csi.VolumeCapability_Mount{
+						Mount: &csi.VolumeCapability_MountVolume{},
+					},
+					AccessMode: &csi.VolumeCapability_AccessMode{
+						Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+					},
+				},
+				Readonly:                 false,
+				ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
+			}
+
+			conpubvol, err := c.ControllerPublishVolume(context.Background(), pubReq)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(conpubvol).NotTo(BeNil())
+
+			// Publish again with different attributes.
+			pubReq.Readonly = true
+
+			conpubvol, err = c.ControllerPublishVolume(context.Background(), pubReq)
+			Expect(err).To(HaveOccurred())
+			Expect(conpubvol).To(BeNil())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.AlreadyExists))
+
+			By("cleaning up unpublishing the volume")
+
+			conunpubvol, err := c.ControllerUnpublishVolume(
+				context.Background(),
+				&csi.ControllerUnpublishVolumeRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					// NodeID is optional in ControllerUnpublishVolume
+					NodeId: nid.GetNodeId(),
+					ControllerUnpublishSecrets: sc.Secrets.ControllerUnpublishVolumeSecret,
+				},
+			)
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(conunpubvol).NotTo(BeNil())
+
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
 	})
 
-	// Pending fix in mock file
-	It("should return appropriate values SingleNodeWriter WithCapacity 1Gi Type:Mount", func() {
+	Describe("ControllerUnpublishVolume", func() {
+		BeforeEach(func() {
+			if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME) {
+				Skip("ControllerUnpublishVolume not supported")
+			}
+		})
 
-		By("creating a volume")
-		name := "sanity"
-		size := int64(1 * 1024 * 1024 * 1024)
-		vol, err := c.CreateVolume(
-			context.Background(),
-			&csi.CreateVolumeRequest{
-				Name: name,
-				VolumeCapabilities: []*csi.VolumeCapability{
-					{
+		It("should fail when no volume id is provided", func() {
+
+			_, err := c.ControllerUnpublishVolume(
+				context.Background(),
+				&csi.ControllerUnpublishVolumeRequest{
+					ControllerUnpublishSecrets: sc.Secrets.ControllerUnpublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
+
+		It("should return appropriate values (no optional values added)", func() {
+
+			// Create Volume First
+			By("creating a single node writer volume")
+			name := uniqueString("sanity-controller-unpublish")
+
+			vol, err := c.CreateVolume(
+				context.Background(),
+				&csi.CreateVolumeRequest{
+					Name: name,
+					VolumeCapabilities: []*csi.VolumeCapability{
+						{
+							AccessType: &csi.VolumeCapability_Mount{
+								Mount: &csi.VolumeCapability_MountVolume{},
+							},
+							AccessMode: &csi.VolumeCapability_AccessMode{
+								Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+							},
+						},
+					},
+					ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(vol).NotTo(BeNil())
+			Expect(vol.GetVolume()).NotTo(BeNil())
+			Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+
+			By("getting a node id")
+			nid, err := n.NodeGetId(
+				context.Background(),
+				&csi.NodeGetIdRequest{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(nid).NotTo(BeNil())
+			Expect(nid.GetNodeId()).NotTo(BeEmpty())
+
+			// ControllerPublishVolume
+			By("calling controllerpublish on that volume")
+
+			conpubvol, err := c.ControllerPublishVolume(
+				context.Background(),
+				&csi.ControllerPublishVolumeRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					NodeId:   nid.GetNodeId(),
+					VolumeCapability: &csi.VolumeCapability{
 						AccessType: &csi.VolumeCapability_Mount{
 							Mount: &csi.VolumeCapability_MountVolume{},
 						},
@@ -235,415 +1054,573 @@ var _ = Describe("CreateVolume [Controller Server]", func() {
 							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 						},
 					},
+					Readonly:                 false,
+					ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
 				},
-				CapacityRange: &csi.CapacityRange{
-					RequiredBytes: size,
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId(), NodeID: nid.GetNodeId()})
+			Expect(conpubvol).NotTo(BeNil())
+
+			// ControllerUnpublishVolume
+			By("calling controllerunpublish on that volume")
+
+			conunpubvol, err := c.ControllerUnpublishVolume(
+				context.Background(),
+				&csi.ControllerUnpublishVolumeRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					// NodeID is optional in ControllerUnpublishVolume
+					NodeId: nid.GetNodeId(),
+					ControllerUnpublishSecrets: sc.Secrets.ControllerUnpublishVolumeSecret,
 				},
-			})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(vol).NotTo(BeNil())
-		Expect(vol.GetVolume()).NotTo(BeNil())
-		Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
-		Expect(vol.GetVolume().GetCapacityBytes()).To(Equal(size))
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(conunpubvol).NotTo(BeNil())
 
-		By("cleaning up deleting the volume")
-		_, err = c.DeleteVolume(
-			context.Background(),
-			&csi.DeleteVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-			})
-		Expect(err).NotTo(HaveOccurred())
+			By("cleaning up deleting the volume")
+
+			_, err = c.DeleteVolume(
+				context.Background(),
+				&csi.DeleteVolumeRequest{
+					VolumeId:                vol.GetVolume().GetId(),
+					ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			cl.UnregisterVolume(name)
+		})
 	})
 })
 
-var _ = Describe("DeleteVolume [Controller Server]", func() {
+var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *SanityContext) {
 	var (
 		c csi.ControllerClient
 	)
 
 	BeforeEach(func() {
-		c = csi.NewControllerClient(conn)
+		c = csi.NewControllerClient(sc.Conn)
 
-		if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME) {
-			Skip("DeleteVolume not supported")
+		if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_LIST_SNAPSHOTS) {
+			Skip("ListSnapshots not supported")
 		}
 	})
 
-	It("should not fail when no volume id is provided", func() {
+	It("should return appropriate values (no optional values added)", func() {
+		snapshots, err := c.ListSnapshots(
+			context.Background(),
+			&csi.ListSnapshotsRequest{})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
 
-		_, err := c.DeleteVolume(
+		for _, snapshot := range snapshots.GetEntries() {
+			verifySnapshotInfo(snapshot.GetSnapshot())
+		}
+	})
+
+	It("should return snapshots that match the specify snapshot id", func() {
+
+		By("creating a volume")
+		volReq := MakeCreateVolumeReq(sc, "listSnapshots-volume-1")
+		volume, err := c.CreateVolume(context.Background(), volReq)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("creating a snapshot")
+		snapshotReq := MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-1", volume.GetVolume().GetId(), nil)
+		snapshot, err := c.CreateSnapshot(context.Background(), snapshotReq)
+		Expect(err).NotTo(HaveOccurred())
+
+		snapshots, err := c.ListSnapshots(
 			context.Background(),
-			&csi.DeleteVolumeRequest{})
+			&csi.ListSnapshotsRequest{SnapshotId: snapshot.GetSnapshot().GetId()})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
+		Expect(len(snapshots.GetEntries())).To(BeNumerically("==", 1))
+		verifySnapshotInfo(snapshots.GetEntries()[0].GetSnapshot())
+		Expect(snapshots.GetEntries()[0].GetSnapshot().GetId()).To(Equal(snapshot.GetSnapshot().GetId()))
+
+		By("cleaning up deleting the volume")
+		delVolReq := MakeDeleteVolumeReq(sc, volume.GetVolume().GetId())
+		_, err = c.DeleteVolume(context.Background(), delVolReq)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("cleaning up deleting the snapshot")
+		delSnapReq := MakeDeleteSnapshotReq(sc, snapshot.GetSnapshot().GetId())
+		_, err = c.DeleteSnapshot(context.Background(), delSnapReq)
 		Expect(err).NotTo(HaveOccurred())
 	})
 
-	It("should succeed when an invalid volume id is used", func() {
+	It("should return empty when the specify snapshot id is not exist", func() {
 
-		_, err := c.DeleteVolume(
+		snapshots, err := c.ListSnapshots(
 			context.Background(),
-			&csi.DeleteVolumeRequest{
-				VolumeId: "reallyfakevolumeid",
-			})
+			&csi.ListSnapshotsRequest{SnapshotId: "none-exist-id"})
 		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
+		Expect(snapshots.GetEntries()).To(BeEmpty())
 	})
 
-	It("should return appropriate values (no optional values added)", func() {
+	It("should return snapshots that match the specify source volume id)", func() {
 
-		// Create Volume First
 		By("creating a volume")
-		name := "sanity"
-		vol, err := c.CreateVolume(
-			context.Background(),
-			&csi.CreateVolumeRequest{
-				Name: name,
-				VolumeCapabilities: []*csi.VolumeCapability{
-					{
-						AccessType: &csi.VolumeCapability_Mount{
-							Mount: &csi.VolumeCapability_MountVolume{},
-						},
-						AccessMode: &csi.VolumeCapability_AccessMode{
-							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-						},
-					},
-				},
-			})
+		volReq := MakeCreateVolumeReq(sc, "listSnapshots-volume-2")
+		volume, err := c.CreateVolume(context.Background(), volReq)
+		Expect(err).NotTo(HaveOccurred())
 
+		By("creating a snapshot")
+		snapshotReq := MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-2", volume.GetVolume().GetId(), nil)
+		snapshot, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(vol).NotTo(BeNil())
-		Expect(vol.GetVolume()).NotTo(BeNil())
-		Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
 
-		// Delete Volume
-		By("deleting a volume")
-		_, err = c.DeleteVolume(
+		snapshots, err := c.ListSnapshots(
 			context.Background(),
-			&csi.DeleteVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-			})
+			&csi.ListSnapshotsRequest{SourceVolumeId: snapshot.GetSnapshot().GetSourceVolumeId()})
 		Expect(err).NotTo(HaveOccurred())
-	})
-})
+		Expect(snapshots).NotTo(BeNil())
+		for _, snap := range snapshots.GetEntries() {
+			verifySnapshotInfo(snap.GetSnapshot())
+			Expect(snap.GetSnapshot().GetSourceVolumeId()).To(Equal(snapshot.GetSnapshot().GetSourceVolumeId()))
+		}
 
-var _ = Describe("ValidateVolumeCapabilities [Controller Server]", func() {
-	var (
-		c csi.ControllerClient
-	)
+		By("cleaning up deleting the snapshot")
+		delSnapReq := MakeDeleteSnapshotReq(sc, snapshot.GetSnapshot().GetId())
+		_, err = c.DeleteSnapshot(context.Background(), delSnapReq)
+		Expect(err).NotTo(HaveOccurred())
 
-	BeforeEach(func() {
-		c = csi.NewControllerClient(conn)
+		By("cleaning up deleting the volume")
+		delVolReq := MakeDeleteVolumeReq(sc, volume.GetVolume().GetId())
+		_, err = c.DeleteVolume(context.Background(), delVolReq)
+		Expect(err).NotTo(HaveOccurred())
 	})
 
-	It("should fail when no volume id is provided", func() {
+	It("should return empty when the specify source volume id is not exist", func() {
+
+		snapshots, err := c.ListSnapshots(
+			context.Background(),
+			&csi.ListSnapshotsRequest{SourceVolumeId: "none-exist-volume-id"})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
+		Expect(snapshots.GetEntries()).To(BeEmpty())
+	})
 
-		_, err := c.ValidateVolumeCapabilities(
+	It("should fail when an invalid starting_token is passed", func() {
+		vols, err := c.ListSnapshots(
 			context.Background(),
-			&csi.ValidateVolumeCapabilitiesRequest{})
+			&csi.ListSnapshotsRequest{
+				StartingToken: "invalid-token",
+			},
+		)
 		Expect(err).To(HaveOccurred())
+		Expect(vols).To(BeNil())
 
 		serverError, ok := status.FromError(err)
 		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.NotFound))
+		Expect(serverError.Code()).To(Equal(codes.Aborted))
 	})
 
-	It("should fail when no volume capabilities are provided", func() {
+	It("should fail when the starting_token is greater than total number of snapshots", func() {
+		// Get total number of snapshots.
+		snapshots, err := c.ListSnapshots(
+			context.Background(),
+			&csi.ListSnapshotsRequest{})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
 
-		_, err := c.ValidateVolumeCapabilities(
+		totalSnapshots := len(snapshots.GetEntries())
+
+		// Send starting_token that is greater than the total number of snapshots.
+		snapshots, err = c.ListSnapshots(
 			context.Background(),
-			&csi.ValidateVolumeCapabilitiesRequest{
-				VolumeId: "id",
-			})
+			&csi.ListSnapshotsRequest{
+				StartingToken: strconv.Itoa(totalSnapshots + 5),
+			},
+		)
 		Expect(err).To(HaveOccurred())
+		Expect(snapshots).To(BeNil())
 
 		serverError, ok := status.FromError(err)
 		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.NotFound))
+		Expect(serverError.Code()).To(Equal(codes.Aborted))
 	})
 
-	It("should return appropriate values (no optional values added)", func() {
+	It("check the presence of new snapshots in the snapshot list", func() {
+		// List Snapshots before creating new snapshots.
+		snapshots, err := c.ListSnapshots(
+			context.Background(),
+			&csi.ListSnapshotsRequest{})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
+
+		totalSnapshots := len(snapshots.GetEntries())
+
+		By("creating a volume")
+		volReq := MakeCreateVolumeReq(sc, "listSnapshots-volume-3")
+		volume, err := c.CreateVolume(context.Background(), volReq)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("creating a snapshot")
+		snapReq := MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-3", volume.GetVolume().GetId(), nil)
+		snapshot, err := c.CreateSnapshot(context.Background(), snapReq)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshot).NotTo(BeNil())
+		verifySnapshotInfo(snapshot.GetSnapshot())
 
-		// Create Volume First
-		By("creating a single node writer volume")
-		name := "sanity"
-		vol, err := c.CreateVolume(
+		snapshots, err = c.ListSnapshots(
 			context.Background(),
-			&csi.CreateVolumeRequest{
-				Name: name,
-				VolumeCapabilities: []*csi.VolumeCapability{
-					{
-						AccessType: &csi.VolumeCapability_Mount{
-							Mount: &csi.VolumeCapability_MountVolume{},
-						},
-						AccessMode: &csi.VolumeCapability_AccessMode{
-							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-						},
-					},
-				},
-			})
+			&csi.ListSnapshotsRequest{})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
+		Expect(len(snapshots.GetEntries())).To(Equal(totalSnapshots + 1))
+
+		By("cleaning up deleting the snapshot")
+		delSnapReq := MakeDeleteSnapshotReq(sc, snapshot.GetSnapshot().GetId())
+		_, err = c.DeleteSnapshot(context.Background(), delSnapReq)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("cleaning up deleting the volume")
+		delVolReq := MakeDeleteVolumeReq(sc, volume.GetVolume().GetId())
+		_, err = c.DeleteVolume(context.Background(), delVolReq)
+		Expect(err).NotTo(HaveOccurred())
 
+		// List snapshots and check if the deleted snapshot exists in the snapshot list.
+		snapshots, err = c.ListSnapshots(
+			context.Background(),
+			&csi.ListSnapshotsRequest{})
 		Expect(err).NotTo(HaveOccurred())
-		Expect(vol).NotTo(BeNil())
-		Expect(vol.GetVolume()).NotTo(BeNil())
-		Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+		Expect(snapshots).NotTo(BeNil())
+		Expect(len(snapshots.GetEntries())).To(Equal(totalSnapshots))
+	})
 
-		// ValidateVolumeCapabilities
-		By("validating volume capabilities")
-		valivolcap, err := c.ValidateVolumeCapabilities(
+	It("should return next token when a limited number of entries are requested", func() {
+		// minSnapshotCount is the minimum number of snapshots expected to exist,
+		// based on which paginated snapshot listing is performed.
+		minSnapshotCount := 5
+		// maxEntried is the maximum entries in list snapshot request.
+		maxEntries := 2
+		// currentTotalVols is the total number of volumes at a given time. It
+		// is used to verify that all the snapshots have been listed.
+		currentTotalSnapshots := 0
+
+		// Get the number of existing volumes.
+		snapshots, err := c.ListSnapshots(
 			context.Background(),
-			&csi.ValidateVolumeCapabilitiesRequest{
-				VolumeId: vol.GetVolume().GetId(),
-				VolumeCapabilities: []*csi.VolumeCapability{
-					{
-						AccessType: &csi.VolumeCapability_Mount{
-							Mount: &csi.VolumeCapability_MountVolume{},
-						},
-						AccessMode: &csi.VolumeCapability_AccessMode{
-							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-						},
-					},
-				},
+			&csi.ListSnapshotsRequest{})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
+
+		initialTotalSnapshots := len(snapshots.GetEntries())
+		currentTotalSnapshots = initialTotalSnapshots
+
+		createVols := make([]*csi.Volume, 0)
+		createSnapshots := make([]*csi.Snapshot, 0)
+
+		// Ensure minimum minVolCount volumes exist.
+		if initialTotalSnapshots < minSnapshotCount {
+
+			By("creating required new volumes")
+			requiredSnapshots := minSnapshotCount - initialTotalSnapshots
+
+			for i := 1; i <= requiredSnapshots; i++ {
+				volReq := MakeCreateVolumeReq(sc, "volume"+strconv.Itoa(i))
+				volume, err := c.CreateVolume(context.Background(), volReq)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(volume).NotTo(BeNil())
+				createVols = append(createVols, volume.GetVolume())
+
+				snapReq := MakeCreateSnapshotReq(sc, "snapshot"+strconv.Itoa(i), volume.GetVolume().GetId(), nil)
+				snapshot, err := c.CreateSnapshot(context.Background(), snapReq)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(snapshot).NotTo(BeNil())
+				verifySnapshotInfo(snapshot.GetSnapshot())
+				createSnapshots = append(createSnapshots, snapshot.GetSnapshot())
+			}
+
+			// Update the current total snapshots count.
+			currentTotalSnapshots += requiredSnapshots
+		}
+
+		// Request list snapshots with max entries maxEntries.
+		snapshots, err = c.ListSnapshots(
+			context.Background(),
+			&csi.ListSnapshotsRequest{
+				MaxEntries: int32(maxEntries),
 			})
 		Expect(err).NotTo(HaveOccurred())
-		Expect(valivolcap).NotTo(BeNil())
-		Expect(valivolcap.GetSupported()).To(BeTrue())
+		Expect(snapshots).NotTo(BeNil())
 
-		By("cleaning up deleting the volume")
-		_, err = c.DeleteVolume(
+		nextToken := snapshots.GetNextToken()
+
+		Expect(nextToken).To(Equal(strconv.Itoa(maxEntries)))
+		Expect(len(snapshots.GetEntries())).To(Equal(maxEntries))
+
+		// Request list snapshots with starting_token and no max entries.
+		snapshots, err = c.ListSnapshots(
 			context.Background(),
-			&csi.DeleteVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
+			&csi.ListSnapshotsRequest{
+				StartingToken: nextToken,
 			})
 		Expect(err).NotTo(HaveOccurred())
+		Expect(snapshots).NotTo(BeNil())
+
+		// Ensure that all the remaining entries are returned at once.
+		Expect(len(snapshots.GetEntries())).To(Equal(currentTotalSnapshots - maxEntries))
+
+		if initialTotalSnapshots < minSnapshotCount {
+
+			By("cleaning up deleting the snapshots")
+
+			for _, snap := range createSnapshots {
+				delSnapReq := MakeDeleteSnapshotReq(sc, snap.GetId())
+				_, err = c.DeleteSnapshot(context.Background(), delSnapReq)
+				Expect(err).NotTo(HaveOccurred())
+			}
+
+			By("cleaning up deleting the volumes")
+
+			for _, vol := range createVols {
+				delVolReq := MakeDeleteVolumeReq(sc, vol.GetId())
+				_, err = c.DeleteVolume(context.Background(), delVolReq)
+				Expect(err).NotTo(HaveOccurred())
+			}
+		}
 	})
+
 })
 
-var _ = Describe("ControllerPublishVolume [Controller Server]", func() {
+var _ = DescribeSanity("DeleteSnapshot [Controller Server]", func(sc *SanityContext) {
 	var (
 		c csi.ControllerClient
-		n csi.NodeClient
 	)
 
 	BeforeEach(func() {
-		c = csi.NewControllerClient(conn)
-		n = csi.NewNodeClient(conn)
+		c = csi.NewControllerClient(sc.Conn)
 
-		if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME) {
-			Skip("ControllerPublishVolume not supported")
+		if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT) {
+			Skip("DeleteSnapshot not supported")
 		}
 	})
 
-	It("should fail when no volume id is provided", func() {
+	It("should fail when no snapshot id is provided", func() {
 
-		_, err := c.ControllerPublishVolume(
-			context.Background(),
-			&csi.ControllerPublishVolumeRequest{})
-		Expect(err).To(HaveOccurred())
+		req := &csi.DeleteSnapshotRequest{}
 
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.NotFound))
-	})
-
-	It("should fail when no node id is provided", func() {
+		if sc.Secrets != nil {
+			req.DeleteSnapshotSecrets = sc.Secrets.DeleteSnapshotSecret
+		}
 
-		_, err := c.ControllerPublishVolume(
-			context.Background(),
-			&csi.ControllerPublishVolumeRequest{
-				VolumeId: "id",
-			})
+		_, err := c.DeleteSnapshot(context.Background(), req)
 		Expect(err).To(HaveOccurred())
 
 		serverError, ok := status.FromError(err)
 		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.NotFound))
+		Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
 	})
 
-	It("should fail when no volume capability is provided", func() {
+	It("should succeed when an invalid snapshot id is used", func() {
 
-		_, err := c.ControllerPublishVolume(
-			context.Background(),
-			&csi.ControllerPublishVolumeRequest{
-				VolumeId: "id",
-				NodeId:   "fakenode",
-			})
-		Expect(err).To(HaveOccurred())
-
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.NotFound))
+		req := MakeDeleteSnapshotReq(sc, "reallyfakesnapshotid")
+		_, err := c.DeleteSnapshot(context.Background(), req)
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("should return appropriate values (no optional values added)", func() {
 
-		// Create Volume First
-		By("creating a single node writer volume")
-		name := "sanity"
-		vol, err := c.CreateVolume(
-			context.Background(),
-			&csi.CreateVolumeRequest{
-				Name: name,
-				VolumeCapabilities: []*csi.VolumeCapability{
-					{
-						AccessType: &csi.VolumeCapability_Mount{
-							Mount: &csi.VolumeCapability_MountVolume{},
-						},
-						AccessMode: &csi.VolumeCapability_AccessMode{
-							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-						},
-					},
-				},
-			})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(vol).NotTo(BeNil())
-		Expect(vol.GetVolume()).NotTo(BeNil())
-		Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
-
-		By("getting a node id")
-		nid, err := n.NodeGetId(
-			context.Background(),
-			&csi.NodeGetIdRequest{})
+		By("creating a volume")
+		volReq := MakeCreateVolumeReq(sc, "DeleteSnapshot-volume-1")
+		volume, err := c.CreateVolume(context.Background(), volReq)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(nid).NotTo(BeNil())
-		Expect(nid.GetNodeId()).NotTo(BeEmpty())
 
-		// ControllerPublishVolume
-		By("calling controllerpublish on that volume")
-		conpubvol, err := c.ControllerPublishVolume(
-			context.Background(),
-			&csi.ControllerPublishVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-				NodeId:   nid.GetNodeId(),
-				VolumeCapability: &csi.VolumeCapability{
-					AccessType: &csi.VolumeCapability_Mount{
-						Mount: &csi.VolumeCapability_MountVolume{},
-					},
-					AccessMode: &csi.VolumeCapability_AccessMode{
-						Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-					},
-				},
-				Readonly: false,
-			})
+		// Create Snapshot First
+		By("creating a snapshot")
+		snapshotReq := MakeCreateSnapshotReq(sc, "DeleteSnapshot-snapshot-1", volume.GetVolume().GetId(), nil)
+		snapshot, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(conpubvol).NotTo(BeNil())
+		Expect(snapshot).NotTo(BeNil())
+		verifySnapshotInfo(snapshot.GetSnapshot())
 
-		By("cleaning up unpublishing the volume")
-		conunpubvol, err := c.ControllerUnpublishVolume(
-			context.Background(),
-			&csi.ControllerUnpublishVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-				// NodeID is optional in ControllerUnpublishVolume
-				NodeId: nid.GetNodeId(),
-			})
+		By("cleaning up deleting the snapshot")
+		delSnapReq := MakeDeleteSnapshotReq(sc, snapshot.GetSnapshot().GetId())
+		_, err = c.DeleteSnapshot(context.Background(), delSnapReq)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(conunpubvol).NotTo(BeNil())
 
 		By("cleaning up deleting the volume")
-		_, err = c.DeleteVolume(
-			context.Background(),
-			&csi.DeleteVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-			})
+		delVolReq := MakeDeleteVolumeReq(sc, volume.GetVolume().GetId())
+		_, err = c.DeleteVolume(context.Background(), delVolReq)
 		Expect(err).NotTo(HaveOccurred())
 	})
 })
 
-var _ = Describe("ControllerUnpublishVolume [Controller Server]", func() {
+var _ = DescribeSanity("CreateSnapshot [Controller Server]", func(sc *SanityContext) {
 	var (
 		c csi.ControllerClient
-		n csi.NodeClient
 	)
 
 	BeforeEach(func() {
-		c = csi.NewControllerClient(conn)
-		n = csi.NewNodeClient(conn)
+		c = csi.NewControllerClient(sc.Conn)
 
-		if !isCapabilitySupported(c, csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME) {
-			Skip("ControllerUnpublishVolume not supported")
+		if !isControllerCapabilitySupported(c, csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT) {
+			Skip("CreateSnapshot not supported")
 		}
 	})
 
-	It("should fail when no volume id is provided", func() {
+	It("should fail when no name is provided", func() {
 
-		_, err := c.ControllerUnpublishVolume(
-			context.Background(),
-			&csi.ControllerUnpublishVolumeRequest{})
+		req := &csi.CreateSnapshotRequest{
+			SourceVolumeId: "testId",
+		}
+
+		if sc.Secrets != nil {
+			req.CreateSnapshotSecrets = sc.Secrets.CreateSnapshotSecret
+		}
+
+		_, err := c.CreateSnapshot(context.Background(), req)
 		Expect(err).To(HaveOccurred())
+		serverError, ok := status.FromError(err)
+		Expect(ok).To(BeTrue())
+		Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+	})
+
+	It("should fail when no source volume id is provided", func() {
+
+		req := &csi.CreateSnapshotRequest{
+			Name: "name",
+		}
+
+		if sc.Secrets != nil {
+			req.CreateSnapshotSecrets = sc.Secrets.CreateSnapshotSecret
+		}
 
+		_, err := c.CreateSnapshot(context.Background(), req)
+		Expect(err).To(HaveOccurred())
 		serverError, ok := status.FromError(err)
 		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.NotFound))
+		Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
 	})
 
-	It("should return appropriate values (no optional values added)", func() {
+	It("should not fail when requesting to create a snapshot with already existing name and same SourceVolumeId.", func() {
 
-		// Create Volume First
-		By("creating a single node writer volume")
-		name := "sanity"
-		vol, err := c.CreateVolume(
-			context.Background(),
-			&csi.CreateVolumeRequest{
-				Name: name,
-				VolumeCapabilities: []*csi.VolumeCapability{
-					{
-						AccessType: &csi.VolumeCapability_Mount{
-							Mount: &csi.VolumeCapability_MountVolume{},
-						},
-						AccessMode: &csi.VolumeCapability_AccessMode{
-							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-						},
-					},
-				},
-			})
+		By("creating a volume")
+		volReq := MakeCreateVolumeReq(sc, "CreateSnapshot-volume-1")
+		volume, err := c.CreateVolume(context.Background(), volReq)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(vol).NotTo(BeNil())
-		Expect(vol.GetVolume()).NotTo(BeNil())
-		Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
 
-		By("getting a node id")
-		nid, err := n.NodeGetId(
-			context.Background(),
-			&csi.NodeGetIdRequest{})
+		By("creating a snapshot")
+		snapReq1 := MakeCreateSnapshotReq(sc, "CreateSnapshot-snapshot-1", volume.GetVolume().GetId(), nil)
+		snap1, err := c.CreateSnapshot(context.Background(), snapReq1)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(nid).NotTo(BeNil())
-		Expect(nid.GetNodeId()).NotTo(BeEmpty())
+		Expect(snap1).NotTo(BeNil())
+		verifySnapshotInfo(snap1.GetSnapshot())
 
-		// ControllerPublishVolume
-		By("calling controllerpublish on that volume")
-		conpubvol, err := c.ControllerPublishVolume(
-			context.Background(),
-			&csi.ControllerPublishVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-				NodeId:   nid.GetNodeId(),
-				VolumeCapability: &csi.VolumeCapability{
-					AccessType: &csi.VolumeCapability_Mount{
-						Mount: &csi.VolumeCapability_MountVolume{},
-					},
-					AccessMode: &csi.VolumeCapability_AccessMode{
-						Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
-					},
-				},
-				Readonly: false,
-			})
+		snap2, err := c.CreateSnapshot(context.Background(), snapReq1)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(conpubvol).NotTo(BeNil())
+		Expect(snap2).NotTo(BeNil())
+		verifySnapshotInfo(snap2.GetSnapshot())
 
-		// ControllerUnpublishVolume
-		By("calling controllerunpublish on that volume")
-		conunpubvol, err := c.ControllerUnpublishVolume(
-			context.Background(),
-			&csi.ControllerUnpublishVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-				// NodeID is optional in ControllerUnpublishVolume
-				NodeId: nid.GetNodeId(),
-			})
+		By("cleaning up deleting the snapshot")
+		delSnapReq := MakeDeleteSnapshotReq(sc, snap1.GetSnapshot().GetId())
+		_, err = c.DeleteSnapshot(context.Background(), delSnapReq)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(conunpubvol).NotTo(BeNil())
 
 		By("cleaning up deleting the volume")
-		_, err = c.DeleteVolume(
-			context.Background(),
-			&csi.DeleteVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-			})
+		delVolReq := MakeDeleteVolumeReq(sc, volume.GetVolume().GetId())
+		_, err = c.DeleteVolume(context.Background(), delVolReq)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should fail when requesting to create a snapshot with already existing name and different SourceVolumeId.", func() {
+
+		By("creating a volume")
+		volume, err := c.CreateVolume(context.Background(), MakeCreateVolumeReq(sc, "CreateSnapshot-volume-2"))
+		Expect(err).ToNot(HaveOccurred())
+
+		By("creating a snapshot with the created volume source id")
+		req1 := MakeCreateSnapshotReq(sc, "CreateSnapshot-snapshot-2", volume.GetVolume().GetId(), nil)
+		snap1, err := c.CreateSnapshot(context.Background(), req1)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(snap1).NotTo(BeNil())
+		verifySnapshotInfo(snap1.GetSnapshot())
+
+		By("creating a snapshot with the same name but different volume source id")
+		req2 := MakeCreateSnapshotReq(sc, "CreateSnapshot-snapshot-2", "test001", nil)
+		_, err = c.CreateSnapshot(context.Background(), req2)
+		Expect(err).To(HaveOccurred())
+		serverError, ok := status.FromError(err)
+		Expect(ok).To(BeTrue())
+		Expect(serverError.Code()).To(Equal(codes.AlreadyExists))
+
+		By("cleaning up deleting the snapshot")
+		delSnapReq := MakeDeleteSnapshotReq(sc, snap1.GetSnapshot().GetId())
+		_, err = c.DeleteSnapshot(context.Background(), delSnapReq)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("cleaning up deleting the volume")
+		delVolReq := MakeDeleteVolumeReq(sc, volume.GetVolume().GetId())
+		_, err = c.DeleteVolume(context.Background(), delVolReq)
 		Expect(err).NotTo(HaveOccurred())
 	})
 })
+
+func MakeCreateVolumeReq(sc *SanityContext, name string) *csi.CreateVolumeRequest {
+	size1 := TestVolumeSize(sc)
+
+	req := &csi.CreateVolumeRequest{
+		Name: name,
+		VolumeCapabilities: []*csi.VolumeCapability{
+			{
+				AccessType: &csi.VolumeCapability_Mount{
+					Mount: &csi.VolumeCapability_MountVolume{},
+				},
+				AccessMode: &csi.VolumeCapability_AccessMode{
+					Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+				},
+			},
+		},
+		CapacityRange: &csi.CapacityRange{
+			RequiredBytes: size1,
+			LimitBytes:    size1,
+		},
+	}
+
+	if sc.Secrets != nil {
+		req.ControllerCreateSecrets = sc.Secrets.CreateVolumeSecret
+	}
+
+	return req
+}
+
+func MakeCreateSnapshotReq(sc *SanityContext, name, sourceVolumeId string, parameters map[string]string) *csi.CreateSnapshotRequest {
+	req := &csi.CreateSnapshotRequest{
+		Name:           name,
+		SourceVolumeId: sourceVolumeId,
+		Parameters:     parameters,
+	}
+
+	if sc.Secrets != nil {
+		req.CreateSnapshotSecrets = sc.Secrets.CreateSnapshotSecret
+	}
+
+	return req
+}
+
+func MakeDeleteSnapshotReq(sc *SanityContext, id string) *csi.DeleteSnapshotRequest {
+	delSnapReq := &csi.DeleteSnapshotRequest{
+		SnapshotId: id,
+	}
+
+	if sc.Secrets != nil {
+		delSnapReq.DeleteSnapshotSecrets = sc.Secrets.DeleteSnapshotSecret
+	}
+
+	return delSnapReq
+}
+
+func MakeDeleteVolumeReq(sc *SanityContext, id string) *csi.DeleteVolumeRequest {
+	delVolReq := &csi.DeleteVolumeRequest{
+		VolumeId: id,
+	}
+
+	if sc.Secrets != nil {
+		delVolReq.ControllerDeleteSecrets = sc.Secrets.DeleteVolumeSecret
+	}
+
+	return delVolReq
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/identity.go b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/identity.go
index 4df4d4b4..e60439b3 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/identity.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/identity.go
@@ -17,39 +17,83 @@ limitations under the License.
 package sanity
 
 import (
+	"context"
+	"fmt"
 	"regexp"
 
-	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
-	context "golang.org/x/net/context"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	"github.com/container-storage-interface/spec/lib/go/csi/v0"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
-// TODO: Tests for GetPluginCapabilities
-
-// TODO: Tests for Probe
-
-var _ = Describe("GetPluginInfo [Identity Server]", func() {
+var _ = DescribeSanity("Identity Service", func(sc *SanityContext) {
 	var (
 		c csi.IdentityClient
 	)
 
 	BeforeEach(func() {
-		c = csi.NewIdentityClient(conn)
+		c = csi.NewIdentityClient(sc.Conn)
 	})
 
-	It("should return appropriate information", func() {
-		req := &csi.GetPluginInfoRequest{}
-		res, err := c.GetPluginInfo(context.Background(), req)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).NotTo(BeNil())
-
-		By("verifying name size and characters")
-		Expect(res.GetName()).ToNot(HaveLen(0))
-		Expect(len(res.GetName())).To(BeNumerically("<=", 63))
-		Expect(regexp.
-			MustCompile("^[a-zA-Z][A-Za-z0-9-\\.\\_]{0,61}[a-zA-Z]$").
-			MatchString(res.GetName())).To(BeTrue())
+	Describe("GetPluginCapabilities", func() {
+		It("should return appropriate capabilities", func() {
+			req := &csi.GetPluginCapabilitiesRequest{}
+			res, err := c.GetPluginCapabilities(context.Background(), req)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(res).NotTo(BeNil())
+
+			By("checking successful response")
+			Expect(res.GetCapabilities()).NotTo(BeNil())
+			for _, cap := range res.GetCapabilities() {
+				switch cap.GetService().GetType() {
+				case csi.PluginCapability_Service_CONTROLLER_SERVICE:
+				case csi.PluginCapability_Service_ACCESSIBILITY_CONSTRAINTS:
+				default:
+					Fail(fmt.Sprintf("Unknown capability: %v\n", cap.GetService().GetType()))
+				}
+			}
+
+		})
+
+	})
+
+	Describe("Probe", func() {
+		It("should return appropriate information", func() {
+			req := &csi.ProbeRequest{}
+			res, err := c.Probe(context.Background(), req)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(res).NotTo(BeNil())
+
+			By("verifying return status")
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code() == codes.FailedPrecondition ||
+				serverError.Code() == codes.OK).To(BeTrue())
+
+			if res.GetReady() != nil {
+				Expect(res.GetReady().GetValue() == true ||
+					res.GetReady().GetValue() == false).To(BeTrue())
+			}
+		})
+	})
+
+	Describe("GetPluginInfo", func() {
+		It("should return appropriate information", func() {
+			req := &csi.GetPluginInfoRequest{}
+			res, err := c.GetPluginInfo(context.Background(), req)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(res).NotTo(BeNil())
+
+			By("verifying name size and characters")
+			Expect(res.GetName()).ToNot(HaveLen(0))
+			Expect(len(res.GetName())).To(BeNumerically("<=", 63))
+			Expect(regexp.
+				MustCompile("^[a-zA-Z][A-Za-z0-9-\\.\\_]{0,61}[a-zA-Z]$").
+				MatchString(res.GetName())).To(BeTrue())
+		})
 	})
 })
diff --git a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/node.go b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/node.go
index 9ed48cf6..a98f5151 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/node.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/node.go
@@ -17,136 +17,248 @@ limitations under the License.
 package sanity
 
 import (
+	"context"
 	"fmt"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
-	context "golang.org/x/net/context"
+	"github.com/container-storage-interface/spec/lib/go/csi/v0"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("NodeGetCapabilities [Node Server]", func() {
+func isNodeCapabilitySupported(c csi.NodeClient,
+	capType csi.NodeServiceCapability_RPC_Type,
+) bool {
+
+	caps, err := c.NodeGetCapabilities(
+		context.Background(),
+		&csi.NodeGetCapabilitiesRequest{})
+	Expect(err).NotTo(HaveOccurred())
+	Expect(caps).NotTo(BeNil())
+
+	for _, cap := range caps.GetCapabilities() {
+		Expect(cap.GetRpc()).NotTo(BeNil())
+		if cap.GetRpc().GetType() == capType {
+			return true
+		}
+	}
+	return false
+}
+
+func isPluginCapabilitySupported(c csi.IdentityClient,
+	capType csi.PluginCapability_Service_Type,
+) bool {
+
+	caps, err := c.GetPluginCapabilities(
+		context.Background(),
+		&csi.GetPluginCapabilitiesRequest{})
+	Expect(err).NotTo(HaveOccurred())
+	Expect(caps).NotTo(BeNil())
+	Expect(caps.GetCapabilities()).NotTo(BeNil())
+
+	for _, cap := range caps.GetCapabilities() {
+		Expect(cap.GetService()).NotTo(BeNil())
+		if cap.GetService().GetType() == capType {
+			return true
+		}
+	}
+	return false
+}
+
+var _ = DescribeSanity("Node Service", func(sc *SanityContext) {
 	var (
-		c csi.NodeClient
+		cl *Cleanup
+		c  csi.NodeClient
+		s  csi.ControllerClient
+
+		controllerPublishSupported bool
+		nodeStageSupported         bool
 	)
 
 	BeforeEach(func() {
-		c = csi.NewNodeClient(conn)
+		c = csi.NewNodeClient(sc.Conn)
+		s = csi.NewControllerClient(sc.Conn)
+
+		controllerPublishSupported = isControllerCapabilitySupported(
+			s,
+			csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME)
+		nodeStageSupported = isNodeCapabilitySupported(c, csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME)
+		if nodeStageSupported {
+			err := createMountTargetLocation(sc.Config.StagingPath)
+			Expect(err).NotTo(HaveOccurred())
+		}
+		cl = &Cleanup{
+			Context:                    sc,
+			NodeClient:                 c,
+			ControllerClient:           s,
+			ControllerPublishSupported: controllerPublishSupported,
+			NodeStageSupported:         nodeStageSupported,
+		}
 	})
 
-	It("should return appropriate capabilities", func() {
-		caps, err := c.NodeGetCapabilities(
-			context.Background(),
-			&csi.NodeGetCapabilitiesRequest{})
+	AfterEach(func() {
+		cl.DeleteVolumes()
+	})
 
-		By("checking successful response")
-		Expect(err).NotTo(HaveOccurred())
-		Expect(caps).NotTo(BeNil())
-		Expect(caps.GetCapabilities()).NotTo(BeNil())
+	Describe("NodeGetCapabilities", func() {
+		It("should return appropriate capabilities", func() {
+			caps, err := c.NodeGetCapabilities(
+				context.Background(),
+				&csi.NodeGetCapabilitiesRequest{})
 
-		for _, cap := range caps.GetCapabilities() {
-			Expect(cap.GetRpc()).NotTo(BeNil())
+			By("checking successful response")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(caps).NotTo(BeNil())
+
+			for _, cap := range caps.GetCapabilities() {
+				Expect(cap.GetRpc()).NotTo(BeNil())
 
-			switch cap.GetRpc().GetType() {
-			case csi.NodeServiceCapability_RPC_UNKNOWN:
-			default:
-				Fail(fmt.Sprintf("Unknown capability: %v\n", cap.GetRpc().GetType()))
+				switch cap.GetRpc().GetType() {
+				case csi.NodeServiceCapability_RPC_UNKNOWN:
+				case csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME:
+				default:
+					Fail(fmt.Sprintf("Unknown capability: %v\n", cap.GetRpc().GetType()))
+				}
 			}
-		}
+		})
 	})
-})
 
-var _ = Describe("NodeGetId [Node Server]", func() {
-	var (
-		c csi.NodeClient
-	)
+	Describe("NodeGetId", func() {
+		It("should return appropriate values", func() {
+			nid, err := c.NodeGetId(
+				context.Background(),
+				&csi.NodeGetIdRequest{})
 
-	BeforeEach(func() {
-		c = csi.NewNodeClient(conn)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(nid).NotTo(BeNil())
+			Expect(nid.GetNodeId()).NotTo(BeEmpty())
+		})
 	})
 
-	It("should return appropriate values", func() {
-		nid, err := c.NodeGetId(
-			context.Background(),
-			&csi.NodeGetIdRequest{})
+	Describe("NodeGetInfo", func() {
+		var (
+			i                                csi.IdentityClient
+			accessibilityConstraintSupported bool
+		)
 
-		Expect(err).NotTo(HaveOccurred())
-		Expect(nid).NotTo(BeNil())
-		Expect(nid.GetNodeId()).NotTo(BeEmpty())
-	})
-})
+		BeforeEach(func() {
+			i = csi.NewIdentityClient(sc.Conn)
+			accessibilityConstraintSupported = isPluginCapabilitySupported(i, csi.PluginCapability_Service_ACCESSIBILITY_CONSTRAINTS)
+		})
 
-var _ = Describe("NodePublishVolume [Node Server]", func() {
-	var (
-		s                          csi.ControllerClient
-		c                          csi.NodeClient
-		controllerPublishSupported bool
-	)
+		It("should return approproate values", func() {
+			ninfo, err := c.NodeGetInfo(
+				context.Background(),
+				&csi.NodeGetInfoRequest{})
 
-	BeforeEach(func() {
-		s = csi.NewControllerClient(conn)
-		c = csi.NewNodeClient(conn)
-		controllerPublishSupported = isCapabilitySupported(
-			s,
-			csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(ninfo).NotTo(BeNil())
+			Expect(ninfo.GetNodeId()).NotTo(BeEmpty())
+			Expect(ninfo.GetMaxVolumesPerNode()).NotTo(BeNumerically("<", 0))
+
+			if accessibilityConstraintSupported {
+				Expect(ninfo.GetAccessibleTopology()).NotTo(BeNil())
+			}
+		})
 	})
 
-	It("should fail when no volume id is provided", func() {
+	Describe("NodePublishVolume", func() {
+		It("should fail when no volume id is provided", func() {
+			_, err := c.NodePublishVolume(
+				context.Background(),
+				&csi.NodePublishVolumeRequest{
+					NodePublishSecrets: sc.Secrets.NodePublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
 
-		_, err := c.NodePublishVolume(
-			context.Background(),
-			&csi.NodePublishVolumeRequest{})
-		Expect(err).To(HaveOccurred())
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
-	})
+		It("should fail when no target path is provided", func() {
+			_, err := c.NodePublishVolume(
+				context.Background(),
+				&csi.NodePublishVolumeRequest{
+					VolumeId:           "id",
+					NodePublishSecrets: sc.Secrets.NodePublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
 
-	It("should fail when no target path is provided", func() {
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 
-		_, err := c.NodePublishVolume(
-			context.Background(),
-			&csi.NodePublishVolumeRequest{
-				VolumeId: "id",
-			})
-		Expect(err).To(HaveOccurred())
+		It("should fail when no volume capability is provided", func() {
+			_, err := c.NodePublishVolume(
+				context.Background(),
+				&csi.NodePublishVolumeRequest{
+					VolumeId:           "id",
+					TargetPath:         sc.Config.TargetPath,
+					NodePublishSecrets: sc.Secrets.NodePublishVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
 
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 	})
 
-	It("should fail when no volume capability is provided", func() {
+	Describe("NodeUnpublishVolume", func() {
+		It("should fail when no volume id is provided", func() {
 
-		_, err := c.NodePublishVolume(
-			context.Background(),
-			&csi.NodePublishVolumeRequest{
-				VolumeId:   "id",
-				TargetPath: csiTargetPath,
-			})
-		Expect(err).To(HaveOccurred())
+			_, err := c.NodeUnpublishVolume(
+				context.Background(),
+				&csi.NodeUnpublishVolumeRequest{})
+			Expect(err).To(HaveOccurred())
+
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
+
+		It("should fail when no target path is provided", func() {
+
+			_, err := c.NodeUnpublishVolume(
+				context.Background(),
+				&csi.NodeUnpublishVolumeRequest{
+					VolumeId: "id",
+				})
+			Expect(err).To(HaveOccurred())
 
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 	})
 
-	It("should return appropriate values (no optional values added)", func() {
+	Describe("NodeStageVolume", func() {
+		var (
+			device string
+		)
 
-		// Create Volume First
-		By("creating a single node writer volume")
-		name := "sanity"
-		vol, err := s.CreateVolume(
-			context.Background(),
-			&csi.CreateVolumeRequest{
-				Name: name,
-				VolumeCapabilities: []*csi.VolumeCapability{
-					{
+		BeforeEach(func() {
+			if !nodeStageSupported {
+				Skip("NodeStageVolume not supported")
+			}
+
+			device = "/dev/mock"
+		})
+
+		It("should fail when no volume id is provided", func() {
+			_, err := c.NodeStageVolume(
+				context.Background(),
+				&csi.NodeStageVolumeRequest{
+					StagingTargetPath: sc.Config.StagingPath,
+					VolumeCapability: &csi.VolumeCapability{
 						AccessType: &csi.VolumeCapability_Mount{
 							Mount: &csi.VolumeCapability_MountVolume{},
 						},
@@ -154,29 +266,24 @@ var _ = Describe("NodePublishVolume [Node Server]", func() {
 							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 						},
 					},
+					PublishInfo: map[string]string{
+						"device": device,
+					},
+					NodeStageSecrets: sc.Secrets.NodeStageVolumeSecret,
 				},
-			})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(vol).NotTo(BeNil())
-		Expect(vol.GetVolume()).NotTo(BeNil())
-		Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+			)
+			Expect(err).To(HaveOccurred())
 
-		By("getting a node id")
-		nid, err := c.NodeGetId(
-			context.Background(),
-			&csi.NodeGetIdRequest{})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(nid).NotTo(BeNil())
-		Expect(nid.GetNodeId()).NotTo(BeEmpty())
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 
-		var conpubvol *csi.ControllerPublishVolumeResponse
-		if controllerPublishSupported {
-			By("controller publishing volume")
-			conpubvol, err = s.ControllerPublishVolume(
+		It("should fail when no staging target path is provided", func() {
+			_, err := c.NodeStageVolume(
 				context.Background(),
-				&csi.ControllerPublishVolumeRequest{
-					VolumeId: vol.GetVolume().GetId(),
-					NodeId:   nid.GetNodeId(),
+				&csi.NodeStageVolumeRequest{
+					VolumeId: "id",
 					VolumeCapability: &csi.VolumeCapability{
 						AccessType: &csi.VolumeCapability_Mount{
 							Mount: &csi.VolumeCapability_MountVolume{},
@@ -185,112 +292,80 @@ var _ = Describe("NodePublishVolume [Node Server]", func() {
 							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 						},
 					},
-					Readonly: false,
-				})
-			Expect(err).NotTo(HaveOccurred())
-			Expect(conpubvol).NotTo(BeNil())
-		}
-
-		// NodePublishVolume
-		By("publishing the volume on a node")
-		nodepubvolRequest := &csi.NodePublishVolumeRequest{
-			VolumeId:   vol.GetVolume().GetId(),
-			TargetPath: csiTargetPath,
-			VolumeCapability: &csi.VolumeCapability{
-				AccessType: &csi.VolumeCapability_Mount{
-					Mount: &csi.VolumeCapability_MountVolume{},
-				},
-				AccessMode: &csi.VolumeCapability_AccessMode{
-					Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+					PublishInfo: map[string]string{
+						"device": device,
+					},
+					NodeStageSecrets: sc.Secrets.NodeStageVolumeSecret,
 				},
-			},
-		}
-		if controllerPublishSupported {
-			nodepubvolRequest.PublishInfo = conpubvol.GetPublishInfo()
-		}
-		nodepubvol, err := c.NodePublishVolume(context.Background(), nodepubvolRequest)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(nodepubvol).NotTo(BeNil())
+			)
+			Expect(err).To(HaveOccurred())
 
-		// NodeUnpublishVolume
-		By("cleaning up calling nodeunpublish")
-		nodeunpubvol, err := c.NodeUnpublishVolume(
-			context.Background(),
-			&csi.NodeUnpublishVolumeRequest{
-				VolumeId:   vol.GetVolume().GetId(),
-				TargetPath: csiTargetPath,
-			})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(nodeunpubvol).NotTo(BeNil())
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 
-		if controllerPublishSupported {
-			By("cleaning up calling controllerunpublishing the volume")
-			nodeunpubvol, err := c.NodeUnpublishVolume(
+		It("should fail when no volume capability is provided", func() {
+			_, err := c.NodeStageVolume(
 				context.Background(),
-				&csi.NodeUnpublishVolumeRequest{
-					VolumeId:   vol.GetVolume().GetId(),
-					TargetPath: csiTargetPath,
-				})
-			Expect(err).NotTo(HaveOccurred())
-			Expect(nodeunpubvol).NotTo(BeNil())
-		}
+				&csi.NodeStageVolumeRequest{
+					VolumeId:          "id",
+					StagingTargetPath: sc.Config.StagingPath,
+					PublishInfo: map[string]string{
+						"device": device,
+					},
+					NodeStageSecrets: sc.Secrets.NodeStageVolumeSecret,
+				},
+			)
+			Expect(err).To(HaveOccurred())
 
-		By("cleaning up deleting the volume")
-		_, err = s.DeleteVolume(
-			context.Background(),
-			&csi.DeleteVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-			})
-		Expect(err).NotTo(HaveOccurred())
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 	})
-})
 
-var _ = Describe("NodeUnpublishVolume [Node Server]", func() {
-	var (
-		s                          csi.ControllerClient
-		c                          csi.NodeClient
-		controllerPublishSupported bool
-	)
-
-	BeforeEach(func() {
-		s = csi.NewControllerClient(conn)
-		c = csi.NewNodeClient(conn)
-		controllerPublishSupported = isCapabilitySupported(
-			s,
-			csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME)
-	})
+	Describe("NodeUnstageVolume", func() {
+		BeforeEach(func() {
+			if !nodeStageSupported {
+				Skip("NodeUnstageVolume not supported")
+			}
+		})
 
-	It("should fail when no volume id is provided", func() {
+		It("should fail when no volume id is provided", func() {
 
-		_, err := c.NodeUnpublishVolume(
-			context.Background(),
-			&csi.NodeUnpublishVolumeRequest{})
-		Expect(err).To(HaveOccurred())
+			_, err := c.NodeUnstageVolume(
+				context.Background(),
+				&csi.NodeUnstageVolumeRequest{
+					StagingTargetPath: sc.Config.StagingPath,
+				})
+			Expect(err).To(HaveOccurred())
 
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.NotFound))
-	})
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 
-	It("should fail when no target path is provided", func() {
+		It("should fail when no staging target path is provided", func() {
 
-		_, err := c.NodeUnpublishVolume(
-			context.Background(),
-			&csi.NodeUnpublishVolumeRequest{
-				VolumeId: "id",
-			})
-		Expect(err).To(HaveOccurred())
+			_, err := c.NodeUnstageVolume(
+				context.Background(),
+				&csi.NodeUnstageVolumeRequest{
+					VolumeId: "id",
+				})
+			Expect(err).To(HaveOccurred())
 
-		serverError, ok := status.FromError(err)
-		Expect(ok).To(BeTrue())
-		Expect(serverError.Code()).To(Equal(codes.NotFound))
+			serverError, ok := status.FromError(err)
+			Expect(ok).To(BeTrue())
+			Expect(serverError.Code()).To(Equal(codes.InvalidArgument))
+		})
 	})
 
-	It("should return appropriate values (no optional values added)", func() {
+	It("should work", func() {
+		name := uniqueString("sanity-node-full")
 
 		// Create Volume First
 		By("creating a single node writer volume")
-		name := "sanity"
 		vol, err := s.CreateVolume(
 			context.Background(),
 			&csi.CreateVolumeRequest{
@@ -305,21 +380,32 @@ var _ = Describe("NodeUnpublishVolume [Node Server]", func() {
 						},
 					},
 				},
-			})
+				ControllerCreateSecrets: sc.Secrets.CreateVolumeSecret,
+			},
+		)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(vol).NotTo(BeNil())
 		Expect(vol.GetVolume()).NotTo(BeNil())
 		Expect(vol.GetVolume().GetId()).NotTo(BeEmpty())
+		cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId()})
+
+		By("getting a node id")
+		nid, err := c.NodeGetId(
+			context.Background(),
+			&csi.NodeGetIdRequest{})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(nid).NotTo(BeNil())
+		Expect(nid.GetNodeId()).NotTo(BeEmpty())
 
-		// ControllerPublishVolume
 		var conpubvol *csi.ControllerPublishVolumeResponse
 		if controllerPublishSupported {
-			By("calling controllerpublish on the volume")
+			By("controller publishing volume")
+
 			conpubvol, err = s.ControllerPublishVolume(
 				context.Background(),
 				&csi.ControllerPublishVolumeRequest{
 					VolumeId: vol.GetVolume().GetId(),
-					NodeId:   "foobar",
+					NodeId:   nid.GetNodeId(),
 					VolumeCapability: &csi.VolumeCapability{
 						AccessType: &csi.VolumeCapability_Mount{
 							Mount: &csi.VolumeCapability_MountVolume{},
@@ -328,63 +414,115 @@ var _ = Describe("NodeUnpublishVolume [Node Server]", func() {
 							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 						},
 					},
-					Readonly: false,
-				})
+					VolumeAttributes:         vol.GetVolume().GetAttributes(),
+					Readonly:                 false,
+					ControllerPublishSecrets: sc.Secrets.ControllerPublishVolumeSecret,
+				},
+			)
 			Expect(err).NotTo(HaveOccurred())
+			cl.RegisterVolume(name, VolumeInfo{VolumeID: vol.GetVolume().GetId(), NodeID: nid.GetNodeId()})
 			Expect(conpubvol).NotTo(BeNil())
 		}
-
+		// NodeStageVolume
+		if nodeStageSupported {
+			By("node staging volume")
+			nodestagevol, err := c.NodeStageVolume(
+				context.Background(),
+				&csi.NodeStageVolumeRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					VolumeCapability: &csi.VolumeCapability{
+						AccessType: &csi.VolumeCapability_Mount{
+							Mount: &csi.VolumeCapability_MountVolume{},
+						},
+						AccessMode: &csi.VolumeCapability_AccessMode{
+							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+						},
+					},
+					StagingTargetPath: sc.Config.StagingPath,
+					VolumeAttributes:  vol.GetVolume().GetAttributes(),
+					PublishInfo:       conpubvol.GetPublishInfo(),
+					NodeStageSecrets:  sc.Secrets.NodeStageVolumeSecret,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(nodestagevol).NotTo(BeNil())
+		}
 		// NodePublishVolume
 		By("publishing the volume on a node")
-		nodepubvolRequest := &csi.NodePublishVolumeRequest{
-			VolumeId:   vol.GetVolume().GetId(),
-			TargetPath: csiTargetPath,
-			VolumeCapability: &csi.VolumeCapability{
-				AccessType: &csi.VolumeCapability_Mount{
-					Mount: &csi.VolumeCapability_MountVolume{},
-				},
-				AccessMode: &csi.VolumeCapability_AccessMode{
-					Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+		var stagingPath string
+		if nodeStageSupported {
+			stagingPath = sc.Config.StagingPath
+		}
+		nodepubvol, err := c.NodePublishVolume(
+			context.Background(),
+			&csi.NodePublishVolumeRequest{
+				VolumeId:          vol.GetVolume().GetId(),
+				TargetPath:        sc.Config.TargetPath,
+				StagingTargetPath: stagingPath,
+				VolumeCapability: &csi.VolumeCapability{
+					AccessType: &csi.VolumeCapability_Mount{
+						Mount: &csi.VolumeCapability_MountVolume{},
+					},
+					AccessMode: &csi.VolumeCapability_AccessMode{
+						Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+					},
 				},
+				VolumeAttributes:   vol.GetVolume().GetAttributes(),
+				PublishInfo:        conpubvol.GetPublishInfo(),
+				NodePublishSecrets: sc.Secrets.NodePublishVolumeSecret,
 			},
-		}
-		if controllerPublishSupported {
-			nodepubvolRequest.PublishInfo = conpubvol.GetPublishInfo()
-		}
-		nodepubvol, err := c.NodePublishVolume(context.Background(), nodepubvolRequest)
+		)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(nodepubvol).NotTo(BeNil())
 
 		// NodeUnpublishVolume
+		By("cleaning up calling nodeunpublish")
 		nodeunpubvol, err := c.NodeUnpublishVolume(
 			context.Background(),
 			&csi.NodeUnpublishVolumeRequest{
 				VolumeId:   vol.GetVolume().GetId(),
-				TargetPath: csiTargetPath,
+				TargetPath: sc.Config.TargetPath,
 			})
 		Expect(err).NotTo(HaveOccurred())
 		Expect(nodeunpubvol).NotTo(BeNil())
 
+		if nodeStageSupported {
+			By("cleaning up calling nodeunstage")
+			nodeunstagevol, err := c.NodeUnstageVolume(
+				context.Background(),
+				&csi.NodeUnstageVolumeRequest{
+					VolumeId:          vol.GetVolume().GetId(),
+					StagingTargetPath: sc.Config.StagingPath,
+				},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(nodeunstagevol).NotTo(BeNil())
+		}
+
 		if controllerPublishSupported {
-			By("cleaning up unpublishing the volume")
-			nodeunpubvol, err := c.NodeUnpublishVolume(
+			By("cleaning up calling controllerunpublishing")
+
+			controllerunpubvol, err := s.ControllerUnpublishVolume(
 				context.Background(),
-				&csi.NodeUnpublishVolumeRequest{
-					VolumeId:   vol.GetVolume().GetId(),
-					TargetPath: csiTargetPath,
-				})
+				&csi.ControllerUnpublishVolumeRequest{
+					VolumeId: vol.GetVolume().GetId(),
+					NodeId:   nid.GetNodeId(),
+					ControllerUnpublishSecrets: sc.Secrets.ControllerUnpublishVolumeSecret,
+				},
+			)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(nodeunpubvol).NotTo(BeNil())
+			Expect(controllerunpubvol).NotTo(BeNil())
 		}
 
 		By("cleaning up deleting the volume")
+
 		_, err = s.DeleteVolume(
 			context.Background(),
 			&csi.DeleteVolumeRequest{
-				VolumeId: vol.GetVolume().GetId(),
-			})
+				VolumeId:                vol.GetVolume().GetId(),
+				ControllerDeleteSecrets: sc.Secrets.DeleteVolumeSecret,
+			},
+		)
 		Expect(err).NotTo(HaveOccurred())
 	})
 })
-
-// TODO: Tests for NodeStageVolume/NodeUnstageVolume
diff --git a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/sanity.go b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/sanity.go
index 0acb159c..9a4de8be 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/sanity.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/sanity.go
@@ -17,12 +17,14 @@ limitations under the License.
 package sanity
 
 import (
+	"crypto/rand"
 	"fmt"
+	"io/ioutil"
 	"os"
-	"sync"
 	"testing"
 
 	"github.com/kubernetes-csi/csi-test/utils"
+	yaml "gopkg.in/yaml.v2"
 
 	"google.golang.org/grpc"
 
@@ -30,45 +32,90 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var (
-	driverAddress string
-	csiTargetPath string
-	conn          *grpc.ClientConn
-	lock          sync.Mutex
-)
+// CSISecrets consists of secrets used in CSI credentials.
+type CSISecrets struct {
+	CreateVolumeSecret              map[string]string `yaml:"CreateVolumeSecret"`
+	DeleteVolumeSecret              map[string]string `yaml:"DeleteVolumeSecret"`
+	ControllerPublishVolumeSecret   map[string]string `yaml:"ControllerPublishVolumeSecret"`
+	ControllerUnpublishVolumeSecret map[string]string `yaml:"ControllerUnpublishVolumeSecret"`
+	NodeStageVolumeSecret           map[string]string `yaml:"NodeStageVolumeSecret"`
+	NodePublishVolumeSecret         map[string]string `yaml:"NodePublishVolumeSecret"`
+	CreateSnapshotSecret            map[string]string `yaml:"CreateSnapshotSecret"`
+	DeleteSnapshotSecret            map[string]string `yaml:"DeleteSnapshotSecret"`
+}
+
+// Config provides the configuration for the sanity tests. It
+// needs to be initialized by the user of the sanity package.
+type Config struct {
+	TargetPath     string
+	StagingPath    string
+	Address        string
+	SecretsFile    string
+	TestVolumeSize int64
+}
 
-// Test will test the CSI driver at the specified address
-func Test(t *testing.T, address, mountPoint string) {
-	lock.Lock()
-	defer lock.Unlock()
+// SanityContext holds the variables that each test can depend on. It
+// gets initialized before each test block runs.
+type SanityContext struct {
+	Config  *Config
+	Conn    *grpc.ClientConn
+	Secrets *CSISecrets
+}
+
+// Test will test the CSI driver at the specified address by
+// setting up a Ginkgo suite and running it.
+func Test(t *testing.T, reqConfig *Config) {
+	sc := &SanityContext{
+		Config: reqConfig,
+	}
 
-	driverAddress = address
-	csiTargetPath = mountPoint
+	registerTestsInGinkgo(sc)
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "CSI Driver Test Suite")
 }
 
-var _ = BeforeSuite(func() {
+func GinkgoTest(reqConfig *Config) {
+	sc := &SanityContext{
+		Config: reqConfig,
+	}
+
+	registerTestsInGinkgo(sc)
+}
+
+func (sc *SanityContext) setup() {
 	var err error
 
+	if len(sc.Config.SecretsFile) > 0 {
+		sc.Secrets, err = loadSecrets(sc.Config.SecretsFile)
+		Expect(err).NotTo(HaveOccurred())
+	} else {
+		sc.Secrets = &CSISecrets{}
+	}
+
 	By("connecting to CSI driver")
-	conn, err = utils.Connect(driverAddress)
+	sc.Conn, err = utils.Connect(sc.Config.Address)
 	Expect(err).NotTo(HaveOccurred())
 
-	By("creating mount directory")
-	err = createMountTargetLocation(csiTargetPath)
+	By("creating mount and staging directories")
+	err = createMountTargetLocation(sc.Config.TargetPath)
 	Expect(err).NotTo(HaveOccurred())
-})
+	if len(sc.Config.StagingPath) > 0 {
+		err = createMountTargetLocation(sc.Config.StagingPath)
+		Expect(err).NotTo(HaveOccurred())
+	}
+}
 
-var _ = AfterSuite(func() {
-	conn.Close()
-	os.Remove(csiTargetPath)
-})
+func (sc *SanityContext) teardown() {
+	if sc.Conn != nil {
+		sc.Conn.Close()
+		sc.Conn = nil
+	}
+}
 
 func createMountTargetLocation(targetPath string) error {
 	fileInfo, err := os.Stat(targetPath)
 	if err != nil && os.IsNotExist(err) {
-		return os.Mkdir(targetPath, 0755)
+		return os.MkdirAll(targetPath, 0755)
 	} else if err != nil {
 		return err
 	}
@@ -78,3 +125,39 @@ func createMountTargetLocation(targetPath string) error {
 
 	return nil
 }
+
+func loadSecrets(path string) (*CSISecrets, error) {
+	var creds CSISecrets
+
+	yamlFile, err := ioutil.ReadFile(path)
+	if err != nil {
+		return &creds, fmt.Errorf("failed to read file %q: #%v", path, err)
+	}
+
+	err = yaml.Unmarshal(yamlFile, &creds)
+	if err != nil {
+		return &creds, fmt.Errorf("error unmarshaling yaml: #%v", err)
+	}
+
+	return &creds, nil
+}
+
+var uniqueSuffix = "-" + pseudoUUID()
+
+// pseudoUUID returns a unique string generated from random
+// bytes, empty string in case of error.
+func pseudoUUID() string {
+	b := make([]byte, 8)
+	if _, err := rand.Read(b); err != nil {
+		// Shouldn't happen?!
+		return ""
+	}
+	return fmt.Sprintf("%08X-%08X", b[0:4], b[4:8])
+}
+
+// uniqueString returns a unique string by appending a random
+// number. In case of an error, just the prefix is returned, so it
+// alone should already be fairly unique.
+func uniqueString(prefix string) string {
+	return prefix + uniqueSuffix
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/tests.go b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/tests.go
new file mode 100644
index 00000000..47763b75
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-test/pkg/sanity/tests.go
@@ -0,0 +1,56 @@
+/*
+Copyright 2018 Intel Corporation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package sanity
+
+import (
+	. "github.com/onsi/ginkgo"
+)
+
+type test struct {
+	text string
+	body func(*SanityContext)
+}
+
+var tests []test
+
+// DescribeSanity must be used instead of the usual Ginkgo Describe to
+// register a test block. The difference is that the body function
+// will be called multiple times with the right context (when
+// setting up a Ginkgo suite or a testing.T test, with the right
+// configuration).
+func DescribeSanity(text string, body func(*SanityContext)) bool {
+	tests = append(tests, test{text, body})
+	return true
+}
+
+// registerTestsInGinkgo invokes the actual Gingko Describe
+// for the tests registered earlier with DescribeSanity.
+func registerTestsInGinkgo(sc *SanityContext) {
+	for _, test := range tests {
+		Describe(test.text, func() {
+			BeforeEach(func() {
+				sc.setup()
+			})
+
+			test.body(sc)
+
+			AfterEach(func() {
+				sc.teardown()
+			})
+		})
+	}
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/test/co_test.go b/vendor/github.com/kubernetes-csi/csi-test/test/co_test.go
index d4e5dfc3..5a2bbe27 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/test/co_test.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/test/co_test.go
@@ -16,13 +16,16 @@ limitations under the License.
 package test
 
 import (
+	"context"
+	"fmt"
+	"reflect"
 	"testing"
 
-	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
-	gomock "github.com/golang/mock/gomock"
+	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/golang/mock/gomock"
+	"github.com/golang/protobuf/proto"
 	mock_driver "github.com/kubernetes-csi/csi-test/driver"
 	mock_utils "github.com/kubernetes-csi/csi-test/utils"
-	"golang.org/x/net/context"
 )
 
 func TestPluginInfoResponse(t *testing.T) {
@@ -58,6 +61,24 @@ func TestPluginInfoResponse(t *testing.T) {
 	}
 }
 
+type pbMatcher struct {
+	x proto.Message
+}
+
+func (p pbMatcher) Matches(x interface{}) bool {
+	y := x.(proto.Message)
+	return proto.Equal(p.x, y)
+}
+
+func (p pbMatcher) String() string {
+	return fmt.Sprintf("pb equal to %v", p.x)
+}
+
+func pbMatch(x interface{}) gomock.Matcher {
+	v := x.(proto.Message)
+	return &pbMatcher{v}
+}
+
 func TestGRPCGetPluginInfoReponse(t *testing.T) {
 
 	// Setup mock
@@ -79,7 +100,7 @@ func TestGRPCGetPluginInfoReponse(t *testing.T) {
 
 	// Setup expectation
 	// !IMPORTANT!: Must set context expected value to gomock.Any() to match any value
-	driver.EXPECT().GetPluginInfo(gomock.Any(), in).Return(out, nil).Times(1)
+	driver.EXPECT().GetPluginInfo(gomock.Any(), pbMatch(in)).Return(out, nil).Times(1)
 
 	// Create a new RPC
 	server := mock_driver.NewMockCSIDriver(&mock_driver.MockCSIDriverServers{
@@ -103,3 +124,65 @@ func TestGRPCGetPluginInfoReponse(t *testing.T) {
 		t.Errorf("Unknown name: %s\n", name)
 	}
 }
+
+func TestGRPCAttach(t *testing.T) {
+
+	// Setup mock
+	m := gomock.NewController(&mock_utils.SafeGoroutineTester{})
+	defer m.Finish()
+	driver := mock_driver.NewMockControllerServer(m)
+
+	// Setup input
+	defaultVolumeID := "myname"
+	defaultNodeID := "MyNodeID"
+	defaultCaps := &csi.VolumeCapability{
+		AccessType: &csi.VolumeCapability_Mount{
+			Mount: &csi.VolumeCapability_MountVolume{},
+		},
+		AccessMode: &csi.VolumeCapability_AccessMode{
+			Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,
+		},
+	}
+	publishVolumeInfo := map[string]string{
+		"first":  "foo",
+		"second": "bar",
+		"third":  "baz",
+	}
+	defaultRequest := &csi.ControllerPublishVolumeRequest{
+		VolumeId:         defaultVolumeID,
+		NodeId:           defaultNodeID,
+		VolumeCapability: defaultCaps,
+		Readonly:         false,
+	}
+
+	// Setup mock outout
+	out := &csi.ControllerPublishVolumeResponse{
+		PublishInfo: publishVolumeInfo,
+	}
+
+	// Setup expectation
+	// !IMPORTANT!: Must set context expected value to gomock.Any() to match any value
+	driver.EXPECT().ControllerPublishVolume(gomock.Any(), pbMatch(defaultRequest)).Return(out, nil).Times(1)
+
+	// Create a new RPC
+	server := mock_driver.NewMockCSIDriver(&mock_driver.MockCSIDriverServers{
+		Controller: driver,
+	})
+	conn, err := server.Nexus()
+	if err != nil {
+		t.Errorf("Error: %s", err.Error())
+	}
+	defer server.Close()
+
+	// Make call
+	c := csi.NewControllerClient(conn)
+	r, err := c.ControllerPublishVolume(context.Background(), defaultRequest)
+	if err != nil {
+		t.Errorf("Error: %s", err.Error())
+	}
+
+	info := r.GetPublishInfo()
+	if !reflect.DeepEqual(info, publishVolumeInfo) {
+		t.Errorf("Invalid publish info: %v", info)
+	}
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-test/test/driver_test.go b/vendor/github.com/kubernetes-csi/csi-test/test/driver_test.go
index 4b0122b6..82080eb3 100644
--- a/vendor/github.com/kubernetes-csi/csi-test/test/driver_test.go
+++ b/vendor/github.com/kubernetes-csi/csi-test/test/driver_test.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 	"testing"
 
-	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi/v0"
 	"github.com/kubernetes-csi/csi-test/utils"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
diff --git a/vendor/golang.org/x/net/CONTRIBUTING.md b/vendor/golang.org/x/net/CONTRIBUTING.md
index 88dff59b..d0485e88 100644
--- a/vendor/golang.org/x/net/CONTRIBUTING.md
+++ b/vendor/golang.org/x/net/CONTRIBUTING.md
@@ -4,16 +4,15 @@ Go is an open source project.
 
 It is the work of hundreds of contributors. We appreciate your help!
 
-
 ## Filing issues
 
 When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
 
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
+1.  What version of Go are you using (`go version`)?
+2.  What operating system and processor architecture are you using?
+3.  What did you do?
+4.  What did you expect to see?
+5.  What did you see instead?
 
 General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
 The gophers there will answer or ask you to file an issue if you've tripped over a bug.
@@ -23,9 +22,5 @@ The gophers there will answer or ask you to file an issue if you've tripped over
 Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
 before sending patches.
 
-**We do not accept GitHub pull requests**
-(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
-
 Unless otherwise noted, the Go source files are distributed under
 the BSD-style license found in the LICENSE file.
-
diff --git a/vendor/golang.org/x/net/dns/dnsmessage/example_test.go b/vendor/golang.org/x/net/dns/dnsmessage/example_test.go
index 5415c2d3..8600a6bc 100644
--- a/vendor/golang.org/x/net/dns/dnsmessage/example_test.go
+++ b/vendor/golang.org/x/net/dns/dnsmessage/example_test.go
@@ -37,20 +37,20 @@ func ExampleParser() {
 		},
 		Answers: []dnsmessage.Resource{
 			{
-				dnsmessage.ResourceHeader{
+				Header: dnsmessage.ResourceHeader{
 					Name:  mustNewName("foo.bar.example.com."),
 					Type:  dnsmessage.TypeA,
 					Class: dnsmessage.ClassINET,
 				},
-				&dnsmessage.AResource{[4]byte{127, 0, 0, 1}},
+				Body: &dnsmessage.AResource{A: [4]byte{127, 0, 0, 1}},
 			},
 			{
-				dnsmessage.ResourceHeader{
+				Header: dnsmessage.ResourceHeader{
 					Name:  mustNewName("bar.example.com."),
 					Type:  dnsmessage.TypeA,
 					Class: dnsmessage.ClassINET,
 				},
-				&dnsmessage.AResource{[4]byte{127, 0, 0, 2}},
+				Body: &dnsmessage.AResource{A: [4]byte{127, 0, 0, 2}},
 			},
 		},
 	}
diff --git a/vendor/golang.org/x/net/dns/dnsmessage/message.go b/vendor/golang.org/x/net/dns/dnsmessage/message.go
index e98fda66..13fbc081 100644
--- a/vendor/golang.org/x/net/dns/dnsmessage/message.go
+++ b/vendor/golang.org/x/net/dns/dnsmessage/message.go
@@ -5,6 +5,9 @@
 // Package dnsmessage provides a mostly RFC 1035 compliant implementation of
 // DNS message packing and unpacking.
 //
+// The package also supports messages with Extension Mechanisms for DNS
+// (EDNS(0)) as defined in RFC 6891.
+//
 // This implementation is designed to minimize heap allocations and avoid
 // unnecessary packing and unpacking as much as possible.
 package dnsmessage
@@ -18,16 +21,6 @@ import (
 // A Type is a type of DNS request and response.
 type Type uint16
 
-// A Class is a type of network.
-type Class uint16
-
-// An OpCode is a DNS operation code.
-type OpCode uint16
-
-// An RCode is a DNS response status code.
-type RCode uint16
-
-// Wire constants.
 const (
 	// ResourceHeader.Type and Question.Type
 	TypeA     Type = 1
@@ -39,6 +32,7 @@ const (
 	TypeTXT   Type = 16
 	TypeAAAA  Type = 28
 	TypeSRV   Type = 33
+	TypeOPT   Type = 41
 
 	// Question.Type
 	TypeWKS   Type = 11
@@ -46,7 +40,46 @@ const (
 	TypeMINFO Type = 14
 	TypeAXFR  Type = 252
 	TypeALL   Type = 255
+)
+
+var typeNames = map[Type]string{
+	TypeA:     "TypeA",
+	TypeNS:    "TypeNS",
+	TypeCNAME: "TypeCNAME",
+	TypeSOA:   "TypeSOA",
+	TypePTR:   "TypePTR",
+	TypeMX:    "TypeMX",
+	TypeTXT:   "TypeTXT",
+	TypeAAAA:  "TypeAAAA",
+	TypeSRV:   "TypeSRV",
+	TypeOPT:   "TypeOPT",
+	TypeWKS:   "TypeWKS",
+	TypeHINFO: "TypeHINFO",
+	TypeMINFO: "TypeMINFO",
+	TypeAXFR:  "TypeAXFR",
+	TypeALL:   "TypeALL",
+}
+
+// String implements fmt.Stringer.String.
+func (t Type) String() string {
+	if n, ok := typeNames[t]; ok {
+		return n
+	}
+	return printUint16(uint16(t))
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (t Type) GoString() string {
+	if n, ok := typeNames[t]; ok {
+		return "dnsmessage." + n
+	}
+	return printUint16(uint16(t))
+}
+
+// A Class is a type of network.
+type Class uint16
 
+const (
 	// ResourceHeader.Class and Question.Class
 	ClassINET   Class = 1
 	ClassCSNET  Class = 2
@@ -55,7 +88,44 @@ const (
 
 	// Question.Class
 	ClassANY Class = 255
+)
+
+var classNames = map[Class]string{
+	ClassINET:   "ClassINET",
+	ClassCSNET:  "ClassCSNET",
+	ClassCHAOS:  "ClassCHAOS",
+	ClassHESIOD: "ClassHESIOD",
+	ClassANY:    "ClassANY",
+}
+
+// String implements fmt.Stringer.String.
+func (c Class) String() string {
+	if n, ok := classNames[c]; ok {
+		return n
+	}
+	return printUint16(uint16(c))
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (c Class) GoString() string {
+	if n, ok := classNames[c]; ok {
+		return "dnsmessage." + n
+	}
+	return printUint16(uint16(c))
+}
+
+// An OpCode is a DNS operation code.
+type OpCode uint16
 
+// GoString implements fmt.GoStringer.GoString.
+func (o OpCode) GoString() string {
+	return printUint16(uint16(o))
+}
+
+// An RCode is a DNS response status code.
+type RCode uint16
+
+const (
 	// Message.Rcode
 	RCodeSuccess        RCode = 0
 	RCodeFormatError    RCode = 1
@@ -65,6 +135,116 @@ const (
 	RCodeRefused        RCode = 5
 )
 
+var rCodeNames = map[RCode]string{
+	RCodeSuccess:        "RCodeSuccess",
+	RCodeFormatError:    "RCodeFormatError",
+	RCodeServerFailure:  "RCodeServerFailure",
+	RCodeNameError:      "RCodeNameError",
+	RCodeNotImplemented: "RCodeNotImplemented",
+	RCodeRefused:        "RCodeRefused",
+}
+
+// String implements fmt.Stringer.String.
+func (r RCode) String() string {
+	if n, ok := rCodeNames[r]; ok {
+		return n
+	}
+	return printUint16(uint16(r))
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (r RCode) GoString() string {
+	if n, ok := rCodeNames[r]; ok {
+		return "dnsmessage." + n
+	}
+	return printUint16(uint16(r))
+}
+
+func printPaddedUint8(i uint8) string {
+	b := byte(i)
+	return string([]byte{
+		b/100 + '0',
+		b/10%10 + '0',
+		b%10 + '0',
+	})
+}
+
+func printUint8Bytes(buf []byte, i uint8) []byte {
+	b := byte(i)
+	if i >= 100 {
+		buf = append(buf, b/100+'0')
+	}
+	if i >= 10 {
+		buf = append(buf, b/10%10+'0')
+	}
+	return append(buf, b%10+'0')
+}
+
+func printByteSlice(b []byte) string {
+	if len(b) == 0 {
+		return ""
+	}
+	buf := make([]byte, 0, 5*len(b))
+	buf = printUint8Bytes(buf, uint8(b[0]))
+	for _, n := range b[1:] {
+		buf = append(buf, ',', ' ')
+		buf = printUint8Bytes(buf, uint8(n))
+	}
+	return string(buf)
+}
+
+const hexDigits = "0123456789abcdef"
+
+func printString(str []byte) string {
+	buf := make([]byte, 0, len(str))
+	for i := 0; i < len(str); i++ {
+		c := str[i]
+		if c == '.' || c == '-' || c == ' ' ||
+			'A' <= c && c <= 'Z' ||
+			'a' <= c && c <= 'z' ||
+			'0' <= c && c <= '9' {
+			buf = append(buf, c)
+			continue
+		}
+
+		upper := c >> 4
+		lower := (c << 4) >> 4
+		buf = append(
+			buf,
+			'\\',
+			'x',
+			hexDigits[upper],
+			hexDigits[lower],
+		)
+	}
+	return string(buf)
+}
+
+func printUint16(i uint16) string {
+	return printUint32(uint32(i))
+}
+
+func printUint32(i uint32) string {
+	// Max value is 4294967295.
+	buf := make([]byte, 10)
+	for b, d := buf, uint32(1000000000); d > 0; d /= 10 {
+		b[0] = byte(i/d%10 + '0')
+		if b[0] == '0' && len(b) == len(buf) && len(buf) > 1 {
+			buf = buf[1:]
+		}
+		b = b[1:]
+		i %= d
+	}
+	return string(buf)
+}
+
+func printBool(b bool) string {
+	if b {
+		return "true"
+	}
+	return "false"
+}
+
 var (
 	// ErrNotStarted indicates that the prerequisite information isn't
 	// available yet because the previous records haven't been appropriately
@@ -90,6 +270,8 @@ var (
 	errTooManyAuthorities = errors.New("too many Authorities to pack (>65535)")
 	errTooManyAdditionals = errors.New("too many Additionals to pack (>65535)")
 	errNonCanonicalName   = errors.New("name is not in canonical format (it must end with a .)")
+	errStringTooLong      = errors.New("character string exceeds maximum length (255)")
+	errCompressedSRV      = errors.New("compressed name in SRV resource data")
 )
 
 // Internal constants.
@@ -159,6 +341,19 @@ func (m *Header) pack() (id uint16, bits uint16) {
 	return
 }
 
+// GoString implements fmt.GoStringer.GoString.
+func (m *Header) GoString() string {
+	return "dnsmessage.Header{" +
+		"ID: " + printUint16(m.ID) + ", " +
+		"Response: " + printBool(m.Response) + ", " +
+		"OpCode: " + m.OpCode.GoString() + ", " +
+		"Authoritative: " + printBool(m.Authoritative) + ", " +
+		"Truncated: " + printBool(m.Truncated) + ", " +
+		"RecursionDesired: " + printBool(m.RecursionDesired) + ", " +
+		"RecursionAvailable: " + printBool(m.RecursionAvailable) + ", " +
+		"RCode: " + m.RCode.GoString() + "}"
+}
+
 // Message is a representation of a DNS message.
 type Message struct {
 	Header
@@ -218,6 +413,7 @@ func (h *header) count(sec section) uint16 {
 	return 0
 }
 
+// pack appends the wire format of the header to msg.
 func (h *header) pack(msg []byte) []byte {
 	msg = packUint16(msg, h.id)
 	msg = packUint16(msg, h.bits)
@@ -270,32 +466,43 @@ type Resource struct {
 	Body   ResourceBody
 }
 
+func (r *Resource) GoString() string {
+	return "dnsmessage.Resource{" +
+		"Header: " + r.Header.GoString() +
+		", Body: &" + r.Body.GoString() +
+		"}"
+}
+
 // A ResourceBody is a DNS resource record minus the header.
 type ResourceBody interface {
 	// pack packs a Resource except for its header.
-	pack(msg []byte, compression map[string]int) ([]byte, error)
+	pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error)
 
 	// realType returns the actual type of the Resource. This is used to
 	// fill in the header Type field.
 	realType() Type
+
+	// GoString implements fmt.GoStringer.GoString.
+	GoString() string
 }
 
-func (r *Resource) pack(msg []byte, compression map[string]int) ([]byte, error) {
+// pack appends the wire format of the Resource to msg.
+func (r *Resource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
 	if r.Body == nil {
 		return msg, errNilResouceBody
 	}
 	oldMsg := msg
 	r.Header.Type = r.Body.realType()
-	msg, length, err := r.Header.pack(msg, compression)
+	msg, lenOff, err := r.Header.pack(msg, compression, compressionOff)
 	if err != nil {
 		return msg, &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	msg, err = r.Body.pack(msg, compression)
+	msg, err = r.Body.pack(msg, compression, compressionOff)
 	if err != nil {
 		return msg, &nestedError{"content", err}
 	}
-	if err := r.Header.fixLen(msg, length, preLen); err != nil {
+	if err := r.Header.fixLen(msg, lenOff, preLen); err != nil {
 		return oldMsg, err
 	}
 	return msg, nil
@@ -798,6 +1005,24 @@ func (p *Parser) AAAAResource() (AAAAResource, error) {
 	return r, nil
 }
 
+// OPTResource parses a single OPTResource.
+//
+// One of the XXXHeader methods must have been called before calling this
+// method.
+func (p *Parser) OPTResource() (OPTResource, error) {
+	if !p.resHeaderValid || p.resHeader.Type != TypeOPT {
+		return OPTResource{}, ErrNotStarted
+	}
+	r, err := unpackOPTResource(p.msg, p.off, p.resHeader.Length)
+	if err != nil {
+		return OPTResource{}, err
+	}
+	p.off += int(p.resHeader.Length)
+	p.resHeaderValid = false
+	p.index++
+	return r, nil
+}
+
 // Unpack parses a full Message.
 func (m *Message) Unpack(msg []byte) error {
 	var p Parser
@@ -852,6 +1077,7 @@ func (m *Message) AppendPack(b []byte) ([]byte, error) {
 	h.authorities = uint16(len(m.Authorities))
 	h.additionals = uint16(len(m.Additionals))
 
+	compressionOff := len(b)
 	msg := h.pack(b)
 
 	// RFC 1035 allows (but does not require) compression for packing. RFC
@@ -866,25 +1092,25 @@ func (m *Message) AppendPack(b []byte) ([]byte, error) {
 
 	for i := range m.Questions {
 		var err error
-		if msg, err = m.Questions[i].pack(msg, compression); err != nil {
+		if msg, err = m.Questions[i].pack(msg, compression, compressionOff); err != nil {
 			return nil, &nestedError{"packing Question", err}
 		}
 	}
 	for i := range m.Answers {
 		var err error
-		if msg, err = m.Answers[i].pack(msg, compression); err != nil {
+		if msg, err = m.Answers[i].pack(msg, compression, compressionOff); err != nil {
 			return nil, &nestedError{"packing Answer", err}
 		}
 	}
 	for i := range m.Authorities {
 		var err error
-		if msg, err = m.Authorities[i].pack(msg, compression); err != nil {
+		if msg, err = m.Authorities[i].pack(msg, compression, compressionOff); err != nil {
 			return nil, &nestedError{"packing Authority", err}
 		}
 	}
 	for i := range m.Additionals {
 		var err error
-		if msg, err = m.Additionals[i].pack(msg, compression); err != nil {
+		if msg, err = m.Additionals[i].pack(msg, compression, compressionOff); err != nil {
 			return nil, &nestedError{"packing Additional", err}
 		}
 	}
@@ -892,37 +1118,104 @@ func (m *Message) AppendPack(b []byte) ([]byte, error) {
 	return msg, nil
 }
 
+// GoString implements fmt.GoStringer.GoString.
+func (m *Message) GoString() string {
+	s := "dnsmessage.Message{Header: " + m.Header.GoString() + ", " +
+		"Questions: []dnsmessage.Question{"
+	if len(m.Questions) > 0 {
+		s += m.Questions[0].GoString()
+		for _, q := range m.Questions[1:] {
+			s += ", " + q.GoString()
+		}
+	}
+	s += "}, Answers: []dnsmessage.Resource{"
+	if len(m.Answers) > 0 {
+		s += m.Answers[0].GoString()
+		for _, a := range m.Answers[1:] {
+			s += ", " + a.GoString()
+		}
+	}
+	s += "}, Authorities: []dnsmessage.Resource{"
+	if len(m.Authorities) > 0 {
+		s += m.Authorities[0].GoString()
+		for _, a := range m.Authorities[1:] {
+			s += ", " + a.GoString()
+		}
+	}
+	s += "}, Additionals: []dnsmessage.Resource{"
+	if len(m.Additionals) > 0 {
+		s += m.Additionals[0].GoString()
+		for _, a := range m.Additionals[1:] {
+			s += ", " + a.GoString()
+		}
+	}
+	return s + "}}"
+}
+
 // A Builder allows incrementally packing a DNS message.
+//
+// Example usage:
+//	buf := make([]byte, 2, 514)
+//	b := NewBuilder(buf, Header{...})
+//	b.EnableCompression()
+//	// Optionally start a section and add things to that section.
+//	// Repeat adding sections as necessary.
+//	buf, err := b.Finish()
+//	// If err is nil, buf[2:] will contain the built bytes.
 type Builder struct {
-	msg         []byte
-	header      header
-	section     section
+	// msg is the storage for the message being built.
+	msg []byte
+
+	// section keeps track of the current section being built.
+	section section
+
+	// header keeps track of what should go in the header when Finish is
+	// called.
+	header header
+
+	// start is the starting index of the bytes allocated in msg for header.
+	start int
+
+	// compression is a mapping from name suffixes to their starting index
+	// in msg.
 	compression map[string]int
 }
 
-// Start initializes the builder.
+// NewBuilder creates a new builder with compression disabled.
 //
-// buf is optional (nil is fine), but if provided, Start takes ownership of buf.
-func (b *Builder) Start(buf []byte, h Header) {
-	b.StartWithoutCompression(buf, h)
-	b.compression = map[string]int{}
+// Note: Most users will want to immediately enable compression with the
+// EnableCompression method. See that method's comment for why you may or may
+// not want to enable compression.
+//
+// The DNS message is appended to the provided initial buffer buf (which may be
+// nil) as it is built. The final message is returned by the (*Builder).Finish
+// method, which may return the same underlying array if there was sufficient
+// capacity in the slice.
+func NewBuilder(buf []byte, h Header) Builder {
+	if buf == nil {
+		buf = make([]byte, 0, packStartingCap)
+	}
+	b := Builder{msg: buf, start: len(buf)}
+	b.header.id, b.header.bits = h.pack()
+	var hb [headerLen]byte
+	b.msg = append(b.msg, hb[:]...)
+	b.section = sectionHeader
+	return b
 }
 
-// StartWithoutCompression initializes the builder with compression disabled.
+// EnableCompression enables compression in the Builder.
 //
-// This avoids compression related allocations, but can result in larger message
-// sizes. Be careful with this mode as it can cause messages to exceed the UDP
-// size limit.
+// Leaving compression disabled avoids compression related allocations, but can
+// result in larger message sizes. Be careful with this mode as it can cause
+// messages to exceed the UDP size limit.
 //
-// buf is optional (nil is fine), but if provided, Start takes ownership of buf.
-func (b *Builder) StartWithoutCompression(buf []byte, h Header) {
-	*b = Builder{msg: buf}
-	b.header.id, b.header.bits = h.pack()
-	if cap(b.msg) < headerLen {
-		b.msg = make([]byte, 0, packStartingCap)
-	}
-	b.msg = b.msg[:headerLen]
-	b.section = sectionHeader
+// According to RFC 1035, section 4.1.4, the use of compression is optional, but
+// all implementations must accept both compressed and uncompressed DNS
+// messages.
+//
+// Compression should be enabled before any sections are added for best results.
+func (b *Builder) EnableCompression() {
+	b.compression = map[string]int{}
 }
 
 func (b *Builder) startCheck(s section) error {
@@ -1003,7 +1296,7 @@ func (b *Builder) Question(q Question) error {
 	if b.section > sectionQuestions {
 		return ErrSectionDone
 	}
-	msg, err := q.pack(b.msg, b.compression)
+	msg, err := q.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return err
 	}
@@ -1030,15 +1323,15 @@ func (b *Builder) CNAMEResource(h ResourceHeader, r CNAMEResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"CNAMEResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1054,15 +1347,15 @@ func (b *Builder) MXResource(h ResourceHeader, r MXResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"MXResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1078,15 +1371,15 @@ func (b *Builder) NSResource(h ResourceHeader, r NSResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"NSResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1102,15 +1395,15 @@ func (b *Builder) PTRResource(h ResourceHeader, r PTRResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"PTRResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1126,15 +1419,15 @@ func (b *Builder) SOAResource(h ResourceHeader, r SOAResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"SOAResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1150,15 +1443,15 @@ func (b *Builder) TXTResource(h ResourceHeader, r TXTResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"TXTResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1174,15 +1467,15 @@ func (b *Builder) SRVResource(h ResourceHeader, r SRVResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"SRVResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1198,15 +1491,15 @@ func (b *Builder) AResource(h ResourceHeader, r AResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"AResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1222,15 +1515,39 @@ func (b *Builder) AAAAResource(h ResourceHeader, r AAAAResource) error {
 		return err
 	}
 	h.Type = r.realType()
-	msg, length, err := h.pack(b.msg, b.compression)
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
 	if err != nil {
 		return &nestedError{"ResourceHeader", err}
 	}
 	preLen := len(msg)
-	if msg, err = r.pack(msg, b.compression); err != nil {
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
 		return &nestedError{"AAAAResource body", err}
 	}
-	if err := h.fixLen(msg, length, preLen); err != nil {
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
+		return err
+	}
+	if err := b.incrementSectionCount(); err != nil {
+		return err
+	}
+	b.msg = msg
+	return nil
+}
+
+// OPTResource adds a single OPTResource.
+func (b *Builder) OPTResource(h ResourceHeader, r OPTResource) error {
+	if err := b.checkResourceSection(); err != nil {
+		return err
+	}
+	h.Type = r.realType()
+	msg, lenOff, err := h.pack(b.msg, b.compression, b.start)
+	if err != nil {
+		return &nestedError{"ResourceHeader", err}
+	}
+	preLen := len(msg)
+	if msg, err = r.pack(msg, b.compression, b.start); err != nil {
+		return &nestedError{"OPTResource body", err}
+	}
+	if err := h.fixLen(msg, lenOff, preLen); err != nil {
 		return err
 	}
 	if err := b.incrementSectionCount(); err != nil {
@@ -1246,7 +1563,8 @@ func (b *Builder) Finish() ([]byte, error) {
 		return nil, ErrNotStarted
 	}
 	b.section = sectionDone
-	b.header.pack(b.msg[:0])
+	// Space for the header was allocated in NewBuilder.
+	b.header.pack(b.msg[b.start:b.start])
 	return b.msg, nil
 }
 
@@ -1276,20 +1594,30 @@ type ResourceHeader struct {
 	Length uint16
 }
 
-// pack packs all of the fields in a ResourceHeader except for the length. The
-// length bytes are returned as a slice so they can be filled in after the rest
-// of the Resource has been packed.
-func (h *ResourceHeader) pack(oldMsg []byte, compression map[string]int) (msg []byte, length []byte, err error) {
+// GoString implements fmt.GoStringer.GoString.
+func (h *ResourceHeader) GoString() string {
+	return "dnsmessage.ResourceHeader{" +
+		"Name: " + h.Name.GoString() + ", " +
+		"Type: " + h.Type.GoString() + ", " +
+		"Class: " + h.Class.GoString() + ", " +
+		"TTL: " + printUint32(h.TTL) + ", " +
+		"Length: " + printUint16(h.Length) + "}"
+}
+
+// pack appends the wire format of the ResourceHeader to oldMsg.
+//
+// lenOff is the offset in msg where the Length field was packed.
+func (h *ResourceHeader) pack(oldMsg []byte, compression map[string]int, compressionOff int) (msg []byte, lenOff int, err error) {
 	msg = oldMsg
-	if msg, err = h.Name.pack(msg, compression); err != nil {
-		return oldMsg, nil, &nestedError{"Name", err}
+	if msg, err = h.Name.pack(msg, compression, compressionOff); err != nil {
+		return oldMsg, 0, &nestedError{"Name", err}
 	}
 	msg = packType(msg, h.Type)
 	msg = packClass(msg, h.Class)
 	msg = packUint32(msg, h.TTL)
-	lenBegin := len(msg)
+	lenOff = len(msg)
 	msg = packUint16(msg, h.Length)
-	return msg, msg[lenBegin : lenBegin+uint16Len], nil
+	return msg, lenOff, nil
 }
 
 func (h *ResourceHeader) unpack(msg []byte, off int) (int, error) {
@@ -1313,19 +1641,63 @@ func (h *ResourceHeader) unpack(msg []byte, off int) (int, error) {
 	return newOff, nil
 }
 
-func (h *ResourceHeader) fixLen(msg []byte, length []byte, preLen int) error {
+// fixLen updates a packed ResourceHeader to include the length of the
+// ResourceBody.
+//
+// lenOff is the offset of the ResourceHeader.Length field in msg.
+//
+// preLen is the length that msg was before the ResourceBody was packed.
+func (h *ResourceHeader) fixLen(msg []byte, lenOff int, preLen int) error {
 	conLen := len(msg) - preLen
 	if conLen > int(^uint16(0)) {
 		return errResTooLong
 	}
 
 	// Fill in the length now that we know how long the content is.
-	packUint16(length[:0], uint16(conLen))
+	packUint16(msg[lenOff:lenOff], uint16(conLen))
 	h.Length = uint16(conLen)
 
 	return nil
 }
 
+// EDNS(0) wire costants.
+const (
+	edns0Version = 0
+
+	edns0DNSSECOK     = 0x00008000
+	ednsVersionMask   = 0x00ff0000
+	edns0DNSSECOKMask = 0x00ff8000
+)
+
+// SetEDNS0 configures h for EDNS(0).
+//
+// The provided extRCode must be an extedned RCode.
+func (h *ResourceHeader) SetEDNS0(udpPayloadLen int, extRCode RCode, dnssecOK bool) error {
+	h.Name = Name{Data: [nameLen]byte{'.'}, Length: 1} // RFC 6891 section 6.1.2
+	h.Type = TypeOPT
+	h.Class = Class(udpPayloadLen)
+	h.TTL = uint32(extRCode) >> 4 << 24
+	if dnssecOK {
+		h.TTL |= edns0DNSSECOK
+	}
+	return nil
+}
+
+// DNSSECAllowed reports whether the DNSSEC OK bit is set.
+func (h *ResourceHeader) DNSSECAllowed() bool {
+	return h.TTL&edns0DNSSECOKMask == edns0DNSSECOK // RFC 6891 section 6.1.3
+}
+
+// ExtendedRCode returns an extended RCode.
+//
+// The provided rcode must be the RCode in DNS message header.
+func (h *ResourceHeader) ExtendedRCode(rcode RCode) RCode {
+	if h.TTL&ednsVersionMask == edns0Version { // RFC 6891 section 6.1.3
+		return RCode(h.TTL>>24<<4) | rcode
+	}
+	return rcode
+}
+
 func skipResource(msg []byte, off int) (int, error) {
 	newOff, err := skipName(msg, off)
 	if err != nil {
@@ -1350,6 +1722,7 @@ func skipResource(msg []byte, off int) (int, error) {
 	return newOff, nil
 }
 
+// packUint16 appends the wire format of field to msg.
 func packUint16(msg []byte, field uint16) []byte {
 	return append(msg, byte(field>>8), byte(field))
 }
@@ -1368,6 +1741,7 @@ func skipUint16(msg []byte, off int) (int, error) {
 	return off + uint16Len, nil
 }
 
+// packType appends the wire format of field to msg.
 func packType(msg []byte, field Type) []byte {
 	return packUint16(msg, uint16(field))
 }
@@ -1381,6 +1755,7 @@ func skipType(msg []byte, off int) (int, error) {
 	return skipUint16(msg, off)
 }
 
+// packClass appends the wire format of field to msg.
 func packClass(msg []byte, field Class) []byte {
 	return packUint16(msg, uint16(field))
 }
@@ -1394,6 +1769,7 @@ func skipClass(msg []byte, off int) (int, error) {
 	return skipUint16(msg, off)
 }
 
+// packUint32 appends the wire format of field to msg.
 func packUint32(msg []byte, field uint32) []byte {
 	return append(
 		msg,
@@ -1419,17 +1795,16 @@ func skipUint32(msg []byte, off int) (int, error) {
 	return off + uint32Len, nil
 }
 
-func packText(msg []byte, field string) []byte {
-	for len(field) > 0 {
-		l := len(field)
-		if l > 255 {
-			l = 255
-		}
-		msg = append(msg, byte(l))
-		msg = append(msg, field[:l]...)
-		field = field[l:]
+// packText appends the wire format of field to msg.
+func packText(msg []byte, field string) ([]byte, error) {
+	l := len(field)
+	if l > 255 {
+		return nil, errStringTooLong
 	}
-	return msg
+	msg = append(msg, byte(l))
+	msg = append(msg, field...)
+
+	return msg, nil
 }
 
 func unpackText(msg []byte, off int) (string, int, error) {
@@ -1455,6 +1830,7 @@ func skipText(msg []byte, off int) (int, error) {
 	return endOff, nil
 }
 
+// packBytes appends the wire format of field to msg.
 func packBytes(msg []byte, field []byte) []byte {
 	return append(msg, field...)
 }
@@ -1495,18 +1871,33 @@ func NewName(name string) (Name, error) {
 	return n, nil
 }
 
+// MustNewName creates a new Name from a string and panics on error.
+func MustNewName(name string) Name {
+	n, err := NewName(name)
+	if err != nil {
+		panic("creating name: " + err.Error())
+	}
+	return n
+}
+
+// String implements fmt.Stringer.String.
 func (n Name) String() string {
 	return string(n.Data[:n.Length])
 }
 
-// pack packs a domain name.
+// GoString implements fmt.GoStringer.GoString.
+func (n *Name) GoString() string {
+	return `dnsmessage.MustNewName("` + printString(n.Data[:n.Length]) + `")`
+}
+
+// pack appends the wire format of the Name to msg.
 //
 // Domain names are a sequence of counted strings split at the dots. They end
 // with a zero-length string. Compression can be used to reuse domain suffixes.
 //
 // The compression map will be updated with new domain suffixes. If compression
 // is nil, compression will not be used.
-func (n *Name) pack(msg []byte, compression map[string]int) ([]byte, error) {
+func (n *Name) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
 	oldMsg := msg
 
 	// Add a trailing dot to canonicalize name.
@@ -1558,7 +1949,7 @@ func (n *Name) pack(msg []byte, compression map[string]int) ([]byte, error) {
 			// Miss. Add the suffix to the compression table if the
 			// offset can be stored in the available 14 bytes.
 			if len(msg) <= int(^uint16(0)>>2) {
-				compression[string(n.Data[i:])] = len(msg)
+				compression[string(n.Data[i:])] = len(msg) - compressionOff
 			}
 		}
 	}
@@ -1567,6 +1958,10 @@ func (n *Name) pack(msg []byte, compression map[string]int) ([]byte, error) {
 
 // unpack unpacks a domain name.
 func (n *Name) unpack(msg []byte, off int) (int, error) {
+	return n.unpackCompressed(msg, off, true /* allowCompression */)
+}
+
+func (n *Name) unpackCompressed(msg []byte, off int, allowCompression bool) (int, error) {
 	// currOff is the current working offset.
 	currOff := off
 
@@ -1602,6 +1997,9 @@ Loop:
 			name = append(name, '.')
 			currOff = endOff
 		case 0xC0: // Pointer
+			if !allowCompression {
+				return off, errCompressedSRV
+			}
 			if currOff >= len(msg) {
 				return off, errInvalidPtr
 			}
@@ -1681,8 +2079,9 @@ type Question struct {
 	Class Class
 }
 
-func (q *Question) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	msg, err := q.Name.pack(msg, compression)
+// pack appends the wire format of the Question to msg.
+func (q *Question) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
+	msg, err := q.Name.pack(msg, compression, compressionOff)
 	if err != nil {
 		return msg, &nestedError{"Name", err}
 	}
@@ -1690,6 +2089,14 @@ func (q *Question) pack(msg []byte, compression map[string]int) ([]byte, error)
 	return packClass(msg, q.Class), nil
 }
 
+// GoString implements fmt.GoStringer.GoString.
+func (q *Question) GoString() string {
+	return "dnsmessage.Question{" +
+		"Name: " + q.Name.GoString() + ", " +
+		"Type: " + q.Type.GoString() + ", " +
+		"Class: " + q.Class.GoString() + "}"
+}
+
 func unpackResourceBody(msg []byte, off int, hdr ResourceHeader) (ResourceBody, int, error) {
 	var (
 		r    ResourceBody
@@ -1742,6 +2149,11 @@ func unpackResourceBody(msg []byte, off int, hdr ResourceHeader) (ResourceBody,
 		rb, err = unpackSRVResource(msg, off)
 		r = &rb
 		name = "SRV"
+	case TypeOPT:
+		var rb OPTResource
+		rb, err = unpackOPTResource(msg, off, hdr.Length)
+		r = &rb
+		name = "OPT"
 	}
 	if err != nil {
 		return nil, off, &nestedError{name + " record", err}
@@ -1761,8 +2173,14 @@ func (r *CNAMEResource) realType() Type {
 	return TypeCNAME
 }
 
-func (r *CNAMEResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return r.CNAME.pack(msg, compression)
+// pack appends the wire format of the CNAMEResource to msg.
+func (r *CNAMEResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
+	return r.CNAME.pack(msg, compression, compressionOff)
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (r *CNAMEResource) GoString() string {
+	return "dnsmessage.CNAMEResource{CNAME: " + r.CNAME.GoString() + "}"
 }
 
 func unpackCNAMEResource(msg []byte, off int) (CNAMEResource, error) {
@@ -1783,16 +2201,24 @@ func (r *MXResource) realType() Type {
 	return TypeMX
 }
 
-func (r *MXResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
+// pack appends the wire format of the MXResource to msg.
+func (r *MXResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
 	oldMsg := msg
 	msg = packUint16(msg, r.Pref)
-	msg, err := r.MX.pack(msg, compression)
+	msg, err := r.MX.pack(msg, compression, compressionOff)
 	if err != nil {
 		return oldMsg, &nestedError{"MXResource.MX", err}
 	}
 	return msg, nil
 }
 
+// GoString implements fmt.GoStringer.GoString.
+func (r *MXResource) GoString() string {
+	return "dnsmessage.MXResource{" +
+		"Pref: " + printUint16(r.Pref) + ", " +
+		"MX: " + r.MX.GoString() + "}"
+}
+
 func unpackMXResource(msg []byte, off int) (MXResource, error) {
 	pref, off, err := unpackUint16(msg, off)
 	if err != nil {
@@ -1814,8 +2240,14 @@ func (r *NSResource) realType() Type {
 	return TypeNS
 }
 
-func (r *NSResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return r.NS.pack(msg, compression)
+// pack appends the wire format of the NSResource to msg.
+func (r *NSResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
+	return r.NS.pack(msg, compression, compressionOff)
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (r *NSResource) GoString() string {
+	return "dnsmessage.NSResource{NS: " + r.NS.GoString() + "}"
 }
 
 func unpackNSResource(msg []byte, off int) (NSResource, error) {
@@ -1835,8 +2267,14 @@ func (r *PTRResource) realType() Type {
 	return TypePTR
 }
 
-func (r *PTRResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return r.PTR.pack(msg, compression)
+// pack appends the wire format of the PTRResource to msg.
+func (r *PTRResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
+	return r.PTR.pack(msg, compression, compressionOff)
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (r *PTRResource) GoString() string {
+	return "dnsmessage.PTRResource{PTR: " + r.PTR.GoString() + "}"
 }
 
 func unpackPTRResource(msg []byte, off int) (PTRResource, error) {
@@ -1866,13 +2304,14 @@ func (r *SOAResource) realType() Type {
 	return TypeSOA
 }
 
-func (r *SOAResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
+// pack appends the wire format of the SOAResource to msg.
+func (r *SOAResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
 	oldMsg := msg
-	msg, err := r.NS.pack(msg, compression)
+	msg, err := r.NS.pack(msg, compression, compressionOff)
 	if err != nil {
 		return oldMsg, &nestedError{"SOAResource.NS", err}
 	}
-	msg, err = r.MBox.pack(msg, compression)
+	msg, err = r.MBox.pack(msg, compression, compressionOff)
 	if err != nil {
 		return oldMsg, &nestedError{"SOAResource.MBox", err}
 	}
@@ -1883,6 +2322,18 @@ func (r *SOAResource) pack(msg []byte, compression map[string]int) ([]byte, erro
 	return packUint32(msg, r.MinTTL), nil
 }
 
+// GoString implements fmt.GoStringer.GoString.
+func (r *SOAResource) GoString() string {
+	return "dnsmessage.SOAResource{" +
+		"NS: " + r.NS.GoString() + ", " +
+		"MBox: " + r.MBox.GoString() + ", " +
+		"Serial: " + printUint32(r.Serial) + ", " +
+		"Refresh: " + printUint32(r.Refresh) + ", " +
+		"Retry: " + printUint32(r.Retry) + ", " +
+		"Expire: " + printUint32(r.Expire) + ", " +
+		"MinTTL: " + printUint32(r.MinTTL) + "}"
+}
+
 func unpackSOAResource(msg []byte, off int) (SOAResource, error) {
 	var ns Name
 	off, err := ns.unpack(msg, off)
@@ -1918,19 +2369,41 @@ func unpackSOAResource(msg []byte, off int) (SOAResource, error) {
 
 // A TXTResource is a TXT Resource record.
 type TXTResource struct {
-	Txt string // Not a domain name.
+	TXT []string
 }
 
 func (r *TXTResource) realType() Type {
 	return TypeTXT
 }
 
-func (r *TXTResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return packText(msg, r.Txt), nil
+// pack appends the wire format of the TXTResource to msg.
+func (r *TXTResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
+	oldMsg := msg
+	for _, s := range r.TXT {
+		var err error
+		msg, err = packText(msg, s)
+		if err != nil {
+			return oldMsg, err
+		}
+	}
+	return msg, nil
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (r *TXTResource) GoString() string {
+	s := "dnsmessage.TXTResource{TXT: []string{"
+	if len(r.TXT) == 0 {
+		return s + "}}"
+	}
+	s += `"` + printString([]byte(r.TXT[0]))
+	for _, t := range r.TXT[1:] {
+		s += `", "` + printString([]byte(t))
+	}
+	return s + `"}}`
 }
 
 func unpackTXTResource(msg []byte, off int, length uint16) (TXTResource, error) {
-	var txt string
+	txts := make([]string, 0, 1)
 	for n := uint16(0); n < length; {
 		var t string
 		var err error
@@ -1942,9 +2415,9 @@ func unpackTXTResource(msg []byte, off int, length uint16) (TXTResource, error)
 			return TXTResource{}, errCalcLen
 		}
 		n += uint16(len(t)) + 1
-		txt += t
+		txts = append(txts, t)
 	}
-	return TXTResource{txt}, nil
+	return TXTResource{txts}, nil
 }
 
 // An SRVResource is an SRV Resource record.
@@ -1959,18 +2432,28 @@ func (r *SRVResource) realType() Type {
 	return TypeSRV
 }
 
-func (r *SRVResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
+// pack appends the wire format of the SRVResource to msg.
+func (r *SRVResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
 	oldMsg := msg
 	msg = packUint16(msg, r.Priority)
 	msg = packUint16(msg, r.Weight)
 	msg = packUint16(msg, r.Port)
-	msg, err := r.Target.pack(msg, nil)
+	msg, err := r.Target.pack(msg, nil, compressionOff)
 	if err != nil {
 		return oldMsg, &nestedError{"SRVResource.Target", err}
 	}
 	return msg, nil
 }
 
+// GoString implements fmt.GoStringer.GoString.
+func (r *SRVResource) GoString() string {
+	return "dnsmessage.SRVResource{" +
+		"Priority: " + printUint16(r.Priority) + ", " +
+		"Weight: " + printUint16(r.Weight) + ", " +
+		"Port: " + printUint16(r.Port) + ", " +
+		"Target: " + r.Target.GoString() + "}"
+}
+
 func unpackSRVResource(msg []byte, off int) (SRVResource, error) {
 	priority, off, err := unpackUint16(msg, off)
 	if err != nil {
@@ -1985,7 +2468,7 @@ func unpackSRVResource(msg []byte, off int) (SRVResource, error) {
 		return SRVResource{}, &nestedError{"Port", err}
 	}
 	var target Name
-	if _, err := target.unpack(msg, off); err != nil {
+	if _, err := target.unpackCompressed(msg, off, false /* allowCompression */); err != nil {
 		return SRVResource{}, &nestedError{"Target", err}
 	}
 	return SRVResource{priority, weight, port, target}, nil
@@ -2000,10 +2483,17 @@ func (r *AResource) realType() Type {
 	return TypeA
 }
 
-func (r *AResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
+// pack appends the wire format of the AResource to msg.
+func (r *AResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
 	return packBytes(msg, r.A[:]), nil
 }
 
+// GoString implements fmt.GoStringer.GoString.
+func (r *AResource) GoString() string {
+	return "dnsmessage.AResource{" +
+		"A: [4]byte{" + printByteSlice(r.A[:]) + "}}"
+}
+
 func unpackAResource(msg []byte, off int) (AResource, error) {
 	var a [4]byte
 	if _, err := unpackBytes(msg, off, a[:]); err != nil {
@@ -2021,7 +2511,14 @@ func (r *AAAAResource) realType() Type {
 	return TypeAAAA
 }
 
-func (r *AAAAResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
+// GoString implements fmt.GoStringer.GoString.
+func (r *AAAAResource) GoString() string {
+	return "dnsmessage.AAAAResource{" +
+		"AAAA: [16]byte{" + printByteSlice(r.AAAA[:]) + "}}"
+}
+
+// pack appends the wire format of the AAAAResource to msg.
+func (r *AAAAResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
 	return packBytes(msg, r.AAAA[:]), nil
 }
 
@@ -2032,3 +2529,78 @@ func unpackAAAAResource(msg []byte, off int) (AAAAResource, error) {
 	}
 	return AAAAResource{aaaa}, nil
 }
+
+// An OPTResource is an OPT pseudo Resource record.
+//
+// The pseudo resource record is part of the extension mechanisms for DNS
+// as defined in RFC 6891.
+type OPTResource struct {
+	Options []Option
+}
+
+// An Option represents a DNS message option within OPTResource.
+//
+// The message option is part of the extension mechanisms for DNS as
+// defined in RFC 6891.
+type Option struct {
+	Code uint16 // option code
+	Data []byte
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (o *Option) GoString() string {
+	return "dnsmessage.Option{" +
+		"Code: " + printUint16(o.Code) + ", " +
+		"Data: []byte{" + printByteSlice(o.Data) + "}}"
+}
+
+func (r *OPTResource) realType() Type {
+	return TypeOPT
+}
+
+func (r *OPTResource) pack(msg []byte, compression map[string]int, compressionOff int) ([]byte, error) {
+	for _, opt := range r.Options {
+		msg = packUint16(msg, opt.Code)
+		l := uint16(len(opt.Data))
+		msg = packUint16(msg, l)
+		msg = packBytes(msg, opt.Data)
+	}
+	return msg, nil
+}
+
+// GoString implements fmt.GoStringer.GoString.
+func (r *OPTResource) GoString() string {
+	s := "dnsmessage.OPTResource{Options: []dnsmessage.Option{"
+	if len(r.Options) == 0 {
+		return s + "}}"
+	}
+	s += r.Options[0].GoString()
+	for _, o := range r.Options[1:] {
+		s += ", " + o.GoString()
+	}
+	return s + "}}"
+}
+
+func unpackOPTResource(msg []byte, off int, length uint16) (OPTResource, error) {
+	var opts []Option
+	for oldOff := off; off < oldOff+int(length); {
+		var err error
+		var o Option
+		o.Code, off, err = unpackUint16(msg, off)
+		if err != nil {
+			return OPTResource{}, &nestedError{"Code", err}
+		}
+		var l uint16
+		l, off, err = unpackUint16(msg, off)
+		if err != nil {
+			return OPTResource{}, &nestedError{"Data", err}
+		}
+		o.Data = make([]byte, l)
+		if copy(o.Data, msg[off:]) != int(l) {
+			return OPTResource{}, &nestedError{"Data", errCalcLen}
+		}
+		off += int(l)
+		opts = append(opts, o)
+	}
+	return OPTResource{opts}, nil
+}
diff --git a/vendor/golang.org/x/net/dns/dnsmessage/message_test.go b/vendor/golang.org/x/net/dns/dnsmessage/message_test.go
index 2bb76342..25ba8f06 100644
--- a/vendor/golang.org/x/net/dns/dnsmessage/message_test.go
+++ b/vendor/golang.org/x/net/dns/dnsmessage/message_test.go
@@ -8,15 +8,109 @@ import (
 	"bytes"
 	"fmt"
 	"reflect"
+	"strings"
 	"testing"
 )
 
-func mustNewName(name string) Name {
-	n, err := NewName(name)
-	if err != nil {
+func TestPrintPaddedUint8(t *testing.T) {
+	tests := []struct {
+		num  uint8
+		want string
+	}{
+		{0, "000"},
+		{1, "001"},
+		{9, "009"},
+		{10, "010"},
+		{99, "099"},
+		{100, "100"},
+		{124, "124"},
+		{104, "104"},
+		{120, "120"},
+		{255, "255"},
+	}
+
+	for _, test := range tests {
+		if got := printPaddedUint8(test.num); got != test.want {
+			t.Errorf("got printPaddedUint8(%d) = %s, want = %s", test.num, got, test.want)
+		}
+	}
+}
+
+func TestPrintUint8Bytes(t *testing.T) {
+	tests := []uint8{
+		0,
+		1,
+		9,
+		10,
+		99,
+		100,
+		124,
+		104,
+		120,
+		255,
+	}
+
+	for _, test := range tests {
+		if got, want := string(printUint8Bytes(nil, test)), fmt.Sprint(test); got != want {
+			t.Errorf("got printUint8Bytes(%d) = %s, want = %s", test, got, want)
+		}
+	}
+}
+
+func TestPrintUint16(t *testing.T) {
+	tests := []uint16{
+		65535,
+		0,
+		1,
+		10,
+		100,
+		1000,
+		10000,
+		324,
+		304,
+		320,
+	}
+
+	for _, test := range tests {
+		if got, want := printUint16(test), fmt.Sprint(test); got != want {
+			t.Errorf("got printUint16(%d) = %s, want = %s", test, got, want)
+		}
+	}
+}
+
+func TestPrintUint32(t *testing.T) {
+	tests := []uint32{
+		4294967295,
+		65535,
+		0,
+		1,
+		10,
+		100,
+		1000,
+		10000,
+		100000,
+		1000000,
+		10000000,
+		100000000,
+		1000000000,
+		324,
+		304,
+		320,
+	}
+
+	for _, test := range tests {
+		if got, want := printUint32(test), fmt.Sprint(test); got != want {
+			t.Errorf("got printUint32(%d) = %s, want = %s", test, got, want)
+		}
+	}
+}
+
+func mustEDNS0ResourceHeader(l int, extrc RCode, do bool) ResourceHeader {
+	h := ResourceHeader{Class: ClassINET}
+	if err := h.SetEDNS0(l, extrc, do); err != nil {
 		panic(err)
 	}
-	return n
+	return h
 }
 
 func (m *Message) String() string {
@@ -50,7 +144,7 @@ func (m *Message) String() string {
 
 func TestNameString(t *testing.T) {
 	want := "foo"
-	name := mustNewName(want)
+	name := MustNewName(want)
 	if got := fmt.Sprint(name); got != want {
 		t.Errorf("got fmt.Sprint(%#v) = %s, want = %s", name, got, want)
 	}
@@ -58,13 +152,13 @@ func TestNameString(t *testing.T) {
 
 func TestQuestionPackUnpack(t *testing.T) {
 	want := Question{
-		Name:  mustNewName("."),
+		Name:  MustNewName("."),
 		Type:  TypeA,
 		Class: ClassINET,
 	}
-	buf, err := want.pack(make([]byte, 1, 50), map[string]int{})
+	buf, err := want.pack(make([]byte, 1, 50), map[string]int{}, 1)
 	if err != nil {
-		t.Fatal("Packing failed:", err)
+		t.Fatal("Question.pack() =", err)
 	}
 	var p Parser
 	p.msg = buf
@@ -73,13 +167,13 @@ func TestQuestionPackUnpack(t *testing.T) {
 	p.off = 1
 	got, err := p.Question()
 	if err != nil {
-		t.Fatalf("Unpacking failed: %v\n%s", err, string(buf[1:]))
+		t.Fatalf("Parser{%q}.Question() = %v", string(buf[1:]), err)
 	}
 	if p.off != len(buf) {
-		t.Errorf("Unpacked different amount than packed: got n = %d, want = %d", p.off, len(buf))
+		t.Errorf("unpacked different amount than packed: got = %d, want = %d", p.off, len(buf))
 	}
 	if !reflect.DeepEqual(got, want) {
-		t.Errorf("Got = %+v, want = %+v", got, want)
+		t.Errorf("got from Parser.Question() = %+v, want = %+v", got, want)
 	}
 }
 
@@ -99,11 +193,11 @@ func TestName(t *testing.T) {
 	for _, test := range tests {
 		n, err := NewName(test)
 		if err != nil {
-			t.Errorf("Creating name for %q: %v", test, err)
+			t.Errorf("NewName(%q) = %v", test, err)
 			continue
 		}
 		if ns := n.String(); ns != test {
-			t.Errorf("Got %#v.String() = %q, want = %q", n, ns, test)
+			t.Errorf("got %#v.String() = %q, want = %q", n, ns, test)
 			continue
 		}
 	}
@@ -127,11 +221,11 @@ func TestNamePackUnpack(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		in := mustNewName(test.in)
-		want := mustNewName(test.want)
-		buf, err := in.pack(make([]byte, 0, 30), map[string]int{})
+		in := MustNewName(test.in)
+		want := MustNewName(test.want)
+		buf, err := in.pack(make([]byte, 0, 30), map[string]int{}, 0)
 		if err != test.err {
-			t.Errorf("Packing of %q: got err = %v, want err = %v", test.in, err, test.err)
+			t.Errorf("got %q.pack() = %v, want = %v", test.in, err, test.err)
 			continue
 		}
 		if test.err != nil {
@@ -140,23 +234,45 @@ func TestNamePackUnpack(t *testing.T) {
 		var got Name
 		n, err := got.unpack(buf, 0)
 		if err != nil {
-			t.Errorf("Unpacking for %q failed: %v", test.in, err)
+			t.Errorf("%q.unpack() = %v", test.in, err)
 			continue
 		}
 		if n != len(buf) {
 			t.Errorf(
-				"Unpacked different amount than packed for %q: got n = %d, want = %d",
+				"unpacked different amount than packed for %q: got = %d, want = %d",
 				test.in,
 				n,
 				len(buf),
 			)
 		}
 		if got != want {
-			t.Errorf("Unpacking packing of %q: got = %#v, want = %#v", test.in, got, want)
+			t.Errorf("unpacking packing of %q: got = %#v, want = %#v", test.in, got, want)
 		}
 	}
 }
 
+func TestIncompressibleName(t *testing.T) {
+	name := MustNewName("example.com.")
+	compression := map[string]int{}
+	buf, err := name.pack(make([]byte, 0, 100), compression, 0)
+	if err != nil {
+		t.Fatal("first Name.pack() =", err)
+	}
+	buf, err = name.pack(buf, compression, 0)
+	if err != nil {
+		t.Fatal("second Name.pack() =", err)
+	}
+	var n1 Name
+	off, err := n1.unpackCompressed(buf, 0, false /* allowCompression */)
+	if err != nil {
+		t.Fatal("unpacking incompressible name without pointers failed:", err)
+	}
+	var n2 Name
+	if _, err := n2.unpackCompressed(buf, off, false /* allowCompression */); err != errCompressedSRV {
+		t.Errorf("unpacking compressed incompressible name with pointers: got %v, want = %v", err, errCompressedSRV)
+	}
+}
+
 func checkErrorPrefix(err error, prefix string) bool {
 	e, ok := err.(*nestedError)
 	return ok && e.s == prefix
@@ -176,7 +292,7 @@ func TestHeaderUnpackError(t *testing.T) {
 	for _, want := range wants {
 		n, err := h.unpack(buf, 0)
 		if n != 0 || !checkErrorPrefix(err, want) {
-			t.Errorf("got h.unpack([%d]byte, 0) = %d, %v, want = 0, %s", len(buf), n, err, want)
+			t.Errorf("got header.unpack([%d]byte, 0) = %d, %v, want = 0, %s", len(buf), n, err, want)
 		}
 		buf = append(buf, 0, 0)
 	}
@@ -188,7 +304,7 @@ func TestParserStart(t *testing.T) {
 	for i := 0; i <= 1; i++ {
 		_, err := p.Start([]byte{})
 		if !checkErrorPrefix(err, want) {
-			t.Errorf("got p.Start(nil) = _, %v, want = _, %s", err, want)
+			t.Errorf("got Parser.Start(nil) = _, %v, want = _, %s", err, want)
 		}
 	}
 }
@@ -211,7 +327,7 @@ func TestResourceNotStarted(t *testing.T) {
 
 	for _, test := range tests {
 		if err := test.fn(&Parser{}); err != ErrNotStarted {
-			t.Errorf("got _, %v = p.%s(), want = _, %v", err, test.name, ErrNotStarted)
+			t.Errorf("got Parser.%s() = _ , %v, want = _, %v", test.name, err, ErrNotStarted)
 		}
 	}
 }
@@ -221,7 +337,7 @@ func TestDNSPackUnpack(t *testing.T) {
 		{
 			Questions: []Question{
 				{
-					Name:  mustNewName("."),
+					Name:  MustNewName("."),
 					Type:  TypeAAAA,
 					Class: ClassINET,
 				},
@@ -235,15 +351,49 @@ func TestDNSPackUnpack(t *testing.T) {
 	for i, want := range wants {
 		b, err := want.Pack()
 		if err != nil {
-			t.Fatalf("%d: packing failed: %v", i, err)
+			t.Fatalf("%d: Message.Pack() = %v", i, err)
 		}
 		var got Message
 		err = got.Unpack(b)
 		if err != nil {
-			t.Fatalf("%d: unpacking failed: %v", i, err)
+			t.Fatalf("%d: Message.Unapck() = %v", i, err)
 		}
 		if !reflect.DeepEqual(got, want) {
-			t.Errorf("%d: got = %+v, want = %+v", i, &got, &want)
+			t.Errorf("%d: Message.Pack/Unpack() roundtrip: got = %+v, want = %+v", i, &got, &want)
+		}
+	}
+}
+
+func TestDNSAppendPackUnpack(t *testing.T) {
+	wants := []Message{
+		{
+			Questions: []Question{
+				{
+					Name:  MustNewName("."),
+					Type:  TypeAAAA,
+					Class: ClassINET,
+				},
+			},
+			Answers:     []Resource{},
+			Authorities: []Resource{},
+			Additionals: []Resource{},
+		},
+		largeTestMsg(),
+	}
+	for i, want := range wants {
+		b := make([]byte, 2, 514)
+		b, err := want.AppendPack(b)
+		if err != nil {
+			t.Fatalf("%d: Message.AppendPack() = %v", i, err)
+		}
+		b = b[2:]
+		var got Message
+		err = got.Unpack(b)
+		if err != nil {
+			t.Fatalf("%d: Message.Unapck() = %v", i, err)
+		}
+		if !reflect.DeepEqual(got, want) {
+			t.Errorf("%d: Message.AppendPack/Unpack() roundtrip: got = %+v, want = %+v", i, &got, &want)
 		}
 	}
 }
@@ -252,11 +402,11 @@ func TestSkipAll(t *testing.T) {
 	msg := largeTestMsg()
 	buf, err := msg.Pack()
 	if err != nil {
-		t.Fatal("Packing large test message:", err)
+		t.Fatal("Message.Pack() =", err)
 	}
 	var p Parser
 	if _, err := p.Start(buf); err != nil {
-		t.Fatal(err)
+		t.Fatal("Parser.Start(non-nil) =", err)
 	}
 
 	tests := []struct {
@@ -271,7 +421,7 @@ func TestSkipAll(t *testing.T) {
 	for _, test := range tests {
 		for i := 1; i <= 3; i++ {
 			if err := test.f(); err != nil {
-				t.Errorf("Call #%d to %s(): %v", i, test.name, err)
+				t.Errorf("%d: Parser.%s() = %v", i, test.name, err)
 			}
 		}
 	}
@@ -282,11 +432,11 @@ func TestSkipEach(t *testing.T) {
 
 	buf, err := msg.Pack()
 	if err != nil {
-		t.Fatal("Packing test message:", err)
+		t.Fatal("Message.Pack() =", err)
 	}
 	var p Parser
 	if _, err := p.Start(buf); err != nil {
-		t.Fatal(err)
+		t.Fatal("Parser.Start(non-nil) =", err)
 	}
 
 	tests := []struct {
@@ -300,10 +450,10 @@ func TestSkipEach(t *testing.T) {
 	}
 	for _, test := range tests {
 		if err := test.f(); err != nil {
-			t.Errorf("First call: got %s() = %v, want = %v", test.name, err, nil)
+			t.Errorf("first Parser.%s() = %v, want = nil", test.name, err)
 		}
 		if err := test.f(); err != ErrSectionDone {
-			t.Errorf("Second call: got %s() = %v, want = %v", test.name, err, ErrSectionDone)
+			t.Errorf("second Parser.%s() = %v, want = %v", test.name, err, ErrSectionDone)
 		}
 	}
 }
@@ -313,11 +463,11 @@ func TestSkipAfterRead(t *testing.T) {
 
 	buf, err := msg.Pack()
 	if err != nil {
-		t.Fatal("Packing test message:", err)
+		t.Fatal("Message.Pack() =", err)
 	}
 	var p Parser
 	if _, err := p.Start(buf); err != nil {
-		t.Fatal(err)
+		t.Fatal("Parser.Srart(non-nil) =", err)
 	}
 
 	tests := []struct {
@@ -332,10 +482,10 @@ func TestSkipAfterRead(t *testing.T) {
 	}
 	for _, test := range tests {
 		if err := test.read(); err != nil {
-			t.Errorf("Got %s() = _, %v, want = _, %v", test.name, err, nil)
+			t.Errorf("got Parser.%s() = _, %v, want = _, nil", test.name, err)
 		}
 		if err := test.skip(); err != ErrSectionDone {
-			t.Errorf("Got Skip%s() = %v, want = %v", test.name, err, ErrSectionDone)
+			t.Errorf("got Parser.Skip%s() = %v, want = %v", test.name, err, ErrSectionDone)
 		}
 	}
 }
@@ -354,7 +504,7 @@ func TestSkipNotStarted(t *testing.T) {
 	}
 	for _, test := range tests {
 		if err := test.f(); err != ErrNotStarted {
-			t.Errorf("Got %s() = %v, want = %v", test.name, err, ErrNotStarted)
+			t.Errorf("got Parser.%s() = %v, want = %v", test.name, err, ErrNotStarted)
 		}
 	}
 }
@@ -398,7 +548,7 @@ func TestTooManyRecords(t *testing.T) {
 
 	for _, test := range tests {
 		if _, got := test.msg.Pack(); got != test.want {
-			t.Errorf("Packing %d %s: got = %v, want = %v", recs, test.name, got, test.want)
+			t.Errorf("got Message.Pack() for %d %s = %v, want = %v", recs, test.name, got, test.want)
 		}
 	}
 }
@@ -406,31 +556,66 @@ func TestTooManyRecords(t *testing.T) {
 func TestVeryLongTxt(t *testing.T) {
 	want := Resource{
 		ResourceHeader{
-			Name:  mustNewName("foo.bar.example.com."),
+			Name:  MustNewName("foo.bar.example.com."),
 			Type:  TypeTXT,
 			Class: ClassINET,
 		},
-		&TXTResource{loremIpsum},
-	}
-	buf, err := want.pack(make([]byte, 0, 8000), map[string]int{})
+		&TXTResource{[]string{
+			"",
+			"",
+			"foo bar",
+			"",
+			"www.example.com",
+			"www.example.com.",
+			strings.Repeat(".", 255),
+		}},
+	}
+	buf, err := want.pack(make([]byte, 0, 8000), map[string]int{}, 0)
 	if err != nil {
-		t.Fatal("Packing failed:", err)
+		t.Fatal("Resource.pack() =", err)
 	}
 	var got Resource
 	off, err := got.Header.unpack(buf, 0)
 	if err != nil {
-		t.Fatal("Unpacking ResourceHeader failed:", err)
+		t.Fatal("ResourceHeader.unpack() =", err)
 	}
 	body, n, err := unpackResourceBody(buf, off, got.Header)
 	if err != nil {
-		t.Fatal("Unpacking failed:", err)
+		t.Fatal("unpackResourceBody() =", err)
 	}
 	got.Body = body
 	if n != len(buf) {
-		t.Errorf("Unpacked different amount than packed: got n = %d, want = %d", n, len(buf))
+		t.Errorf("unpacked different amount than packed: got = %d, want = %d", n, len(buf))
 	}
 	if !reflect.DeepEqual(got, want) {
-		t.Errorf("Got = %#v, want = %#v", got, want)
+		t.Errorf("Resource.pack/unpack() roundtrip: got = %#v, want = %#v", got, want)
+	}
+}
+
+func TestTooLongTxt(t *testing.T) {
+	rb := TXTResource{[]string{strings.Repeat(".", 256)}}
+	if _, err := rb.pack(make([]byte, 0, 8000), map[string]int{}, 0); err != errStringTooLong {
+		t.Errorf("packing TXTResource with 256 character string: got err = %v, want = %v", err, errStringTooLong)
+	}
+}
+
+func TestStartAppends(t *testing.T) {
+	buf := make([]byte, 2, 514)
+	wantBuf := []byte{4, 44}
+	copy(buf, wantBuf)
+
+	b := NewBuilder(buf, Header{})
+	b.EnableCompression()
+
+	buf, err := b.Finish()
+	if err != nil {
+		t.Fatal("Builder.Finish() =", err)
+	}
+	if got, want := len(buf), headerLen+2; got != want {
+		t.Errorf("got len(buf) = %d, want = %d", got, want)
+	}
+	if string(buf[:2]) != string(wantBuf) {
+		t.Errorf("original data not preserved, got = %#v, want = %#v", buf[:2], wantBuf)
 	}
 }
 
@@ -457,7 +642,7 @@ func TestStartError(t *testing.T) {
 	for _, env := range envs {
 		for _, test := range tests {
 			if got := test.fn(env.fn()); got != env.want {
-				t.Errorf("got Builder{%s}.Start%s = %v, want = %v", env.name, test.name, got, env.want)
+				t.Errorf("got Builder{%s}.Start%s() = %v, want = %v", env.name, test.name, got, env.want)
 			}
 		}
 	}
@@ -477,6 +662,7 @@ func TestBuilderResourceError(t *testing.T) {
 		{"SRVResource", func(b *Builder) error { return b.SRVResource(ResourceHeader{}, SRVResource{}) }},
 		{"AResource", func(b *Builder) error { return b.AResource(ResourceHeader{}, AResource{}) }},
 		{"AAAAResource", func(b *Builder) error { return b.AAAAResource(ResourceHeader{}, AAAAResource{}) }},
+		{"OPTResource", func(b *Builder) error { return b.OPTResource(ResourceHeader{}, OPTResource{}) }},
 	}
 
 	envs := []struct {
@@ -493,7 +679,7 @@ func TestBuilderResourceError(t *testing.T) {
 	for _, env := range envs {
 		for _, test := range tests {
 			if got := test.fn(env.fn()); got != env.want {
-				t.Errorf("got Builder{%s}.%s = %v, want = %v", env.name, test.name, got, env.want)
+				t.Errorf("got Builder{%s}.%s() = %v, want = %v", env.name, test.name, got, env.want)
 			}
 		}
 	}
@@ -503,7 +689,7 @@ func TestFinishError(t *testing.T) {
 	var b Builder
 	want := ErrNotStarted
 	if _, got := b.Finish(); got != want {
-		t.Errorf("got Builder{}.Finish() = %v, want = %v", got, want)
+		t.Errorf("got Builder.Finish() = %v, want = %v", got, want)
 	}
 }
 
@@ -511,89 +697,96 @@ func TestBuilder(t *testing.T) {
 	msg := largeTestMsg()
 	want, err := msg.Pack()
 	if err != nil {
-		t.Fatal("Packing without builder:", err)
+		t.Fatal("Message.Pack() =", err)
 	}
 
-	var b Builder
-	b.Start(nil, msg.Header)
+	b := NewBuilder(nil, msg.Header)
+	b.EnableCompression()
 
 	if err := b.StartQuestions(); err != nil {
-		t.Fatal("b.StartQuestions():", err)
+		t.Fatal("Builder.StartQuestions() =", err)
 	}
 	for _, q := range msg.Questions {
 		if err := b.Question(q); err != nil {
-			t.Fatalf("b.Question(%#v): %v", q, err)
+			t.Fatalf("Builder.Question(%#v) = %v", q, err)
 		}
 	}
 
 	if err := b.StartAnswers(); err != nil {
-		t.Fatal("b.StartAnswers():", err)
+		t.Fatal("Builder.StartAnswers() =", err)
 	}
 	for _, a := range msg.Answers {
 		switch a.Header.Type {
 		case TypeA:
 			if err := b.AResource(a.Header, *a.Body.(*AResource)); err != nil {
-				t.Fatalf("b.AResource(%#v): %v", a, err)
+				t.Fatalf("Builder.AResource(%#v) = %v", a, err)
 			}
 		case TypeNS:
 			if err := b.NSResource(a.Header, *a.Body.(*NSResource)); err != nil {
-				t.Fatalf("b.NSResource(%#v): %v", a, err)
+				t.Fatalf("Builder.NSResource(%#v) = %v", a, err)
 			}
 		case TypeCNAME:
 			if err := b.CNAMEResource(a.Header, *a.Body.(*CNAMEResource)); err != nil {
-				t.Fatalf("b.CNAMEResource(%#v): %v", a, err)
+				t.Fatalf("Builder.CNAMEResource(%#v) = %v", a, err)
 			}
 		case TypeSOA:
 			if err := b.SOAResource(a.Header, *a.Body.(*SOAResource)); err != nil {
-				t.Fatalf("b.SOAResource(%#v): %v", a, err)
+				t.Fatalf("Builder.SOAResource(%#v) = %v", a, err)
 			}
 		case TypePTR:
 			if err := b.PTRResource(a.Header, *a.Body.(*PTRResource)); err != nil {
-				t.Fatalf("b.PTRResource(%#v): %v", a, err)
+				t.Fatalf("Builder.PTRResource(%#v) = %v", a, err)
 			}
 		case TypeMX:
 			if err := b.MXResource(a.Header, *a.Body.(*MXResource)); err != nil {
-				t.Fatalf("b.MXResource(%#v): %v", a, err)
+				t.Fatalf("Builder.MXResource(%#v) = %v", a, err)
 			}
 		case TypeTXT:
 			if err := b.TXTResource(a.Header, *a.Body.(*TXTResource)); err != nil {
-				t.Fatalf("b.TXTResource(%#v): %v", a, err)
+				t.Fatalf("Builder.TXTResource(%#v) = %v", a, err)
 			}
 		case TypeAAAA:
 			if err := b.AAAAResource(a.Header, *a.Body.(*AAAAResource)); err != nil {
-				t.Fatalf("b.AAAAResource(%#v): %v", a, err)
+				t.Fatalf("Builder.AAAAResource(%#v) = %v", a, err)
 			}
 		case TypeSRV:
 			if err := b.SRVResource(a.Header, *a.Body.(*SRVResource)); err != nil {
-				t.Fatalf("b.SRVResource(%#v): %v", a, err)
+				t.Fatalf("Builder.SRVResource(%#v) = %v", a, err)
 			}
 		}
 	}
 
 	if err := b.StartAuthorities(); err != nil {
-		t.Fatal("b.StartAuthorities():", err)
+		t.Fatal("Builder.StartAuthorities() =", err)
 	}
 	for _, a := range msg.Authorities {
 		if err := b.NSResource(a.Header, *a.Body.(*NSResource)); err != nil {
-			t.Fatalf("b.NSResource(%#v): %v", a, err)
+			t.Fatalf("Builder.NSResource(%#v) = %v", a, err)
 		}
 	}
 
 	if err := b.StartAdditionals(); err != nil {
-		t.Fatal("b.StartAdditionals():", err)
+		t.Fatal("Builder.StartAdditionals() =", err)
 	}
 	for _, a := range msg.Additionals {
-		if err := b.TXTResource(a.Header, *a.Body.(*TXTResource)); err != nil {
-			t.Fatalf("b.TXTResource(%#v): %v", a, err)
+		switch a.Body.(type) {
+		case *TXTResource:
+			if err := b.TXTResource(a.Header, *a.Body.(*TXTResource)); err != nil {
+				t.Fatalf("Builder.TXTResource(%#v) = %v", a, err)
+			}
+		case *OPTResource:
+			if err := b.OPTResource(a.Header, *a.Body.(*OPTResource)); err != nil {
+				t.Fatalf("Builder.OPTResource(%#v) = %v", a, err)
+			}
 		}
 	}
 
 	got, err := b.Finish()
 	if err != nil {
-		t.Fatal("b.Finish():", err)
+		t.Fatal("Builder.Finish() =", err)
 	}
 	if !bytes.Equal(got, want) {
-		t.Fatalf("Got from Builder: %#v\nwant = %#v", got, want)
+		t.Fatalf("got from Builder.Finish() = %#v\nwant = %#v", got, want)
 	}
 }
 
@@ -606,7 +799,7 @@ func TestResourcePack(t *testing.T) {
 			Message{
 				Questions: []Question{
 					{
-						Name:  mustNewName("."),
+						Name:  MustNewName("."),
 						Type:  TypeAAAA,
 						Class: ClassINET,
 					},
@@ -619,7 +812,7 @@ func TestResourcePack(t *testing.T) {
 			Message{
 				Questions: []Question{
 					{
-						Name:  mustNewName("."),
+						Name:  MustNewName("."),
 						Type:  TypeAAAA,
 						Class: ClassINET,
 					},
@@ -636,7 +829,7 @@ func TestResourcePack(t *testing.T) {
 			Message{
 				Questions: []Question{
 					{
-						Name:  mustNewName("."),
+						Name:  MustNewName("."),
 						Type:  TypeA,
 						Class: ClassINET,
 					},
@@ -648,15 +841,202 @@ func TestResourcePack(t *testing.T) {
 	} {
 		_, err := tt.m.Pack()
 		if !reflect.DeepEqual(err, tt.err) {
-			t.Errorf("got %v for %v; want %v", err, tt.m, tt.err)
+			t.Errorf("got Message{%v}.Pack() = %v, want %v", tt.m, err, tt.err)
 		}
 	}
 }
 
-func BenchmarkParsing(b *testing.B) {
-	b.ReportAllocs()
+func TestResourcePackLength(t *testing.T) {
+	r := Resource{
+		ResourceHeader{
+			Name:  MustNewName("."),
+			Type:  TypeA,
+			Class: ClassINET,
+		},
+		&AResource{[4]byte{127, 0, 0, 2}},
+	}
+
+	hb, _, err := r.Header.pack(nil, nil, 0)
+	if err != nil {
+		t.Fatal("ResourceHeader.pack() =", err)
+	}
+	buf := make([]byte, 0, len(hb))
+	buf, err = r.pack(buf, nil, 0)
+	if err != nil {
+		t.Fatal("Resource.pack() =", err)
+	}
 
-	name := mustNewName("foo.bar.example.com.")
+	var hdr ResourceHeader
+	if _, err := hdr.unpack(buf, 0); err != nil {
+		t.Fatal("ResourceHeader.unpack() =", err)
+	}
+
+	if got, want := int(hdr.Length), len(buf)-len(hb); got != want {
+		t.Errorf("got hdr.Length = %d, want = %d", got, want)
+	}
+}
+
+func TestOptionPackUnpack(t *testing.T) {
+	for _, tt := range []struct {
+		name     string
+		w        []byte // wire format of m.Additionals
+		m        Message
+		dnssecOK bool
+		extRCode RCode
+	}{
+		{
+			name: "without EDNS(0) options",
+			w: []byte{
+				0x00, 0x00, 0x29, 0x10, 0x00, 0xfe, 0x00, 0x80,
+				0x00, 0x00, 0x00,
+			},
+			m: Message{
+				Header: Header{RCode: RCodeFormatError},
+				Questions: []Question{
+					{
+						Name:  MustNewName("."),
+						Type:  TypeA,
+						Class: ClassINET,
+					},
+				},
+				Additionals: []Resource{
+					{
+						mustEDNS0ResourceHeader(4096, 0xfe0|RCodeFormatError, true),
+						&OPTResource{},
+					},
+				},
+			},
+			dnssecOK: true,
+			extRCode: 0xfe0 | RCodeFormatError,
+		},
+		{
+			name: "with EDNS(0) options",
+			w: []byte{
+				0x00, 0x00, 0x29, 0x10, 0x00, 0xff, 0x00, 0x00,
+				0x00, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x02, 0x00,
+				0x00, 0x00, 0x0b, 0x00, 0x02, 0x12, 0x34,
+			},
+			m: Message{
+				Header: Header{RCode: RCodeServerFailure},
+				Questions: []Question{
+					{
+						Name:  MustNewName("."),
+						Type:  TypeAAAA,
+						Class: ClassINET,
+					},
+				},
+				Additionals: []Resource{
+					{
+						mustEDNS0ResourceHeader(4096, 0xff0|RCodeServerFailure, false),
+						&OPTResource{
+							Options: []Option{
+								{
+									Code: 12, // see RFC 7828
+									Data: []byte{0x00, 0x00},
+								},
+								{
+									Code: 11, // see RFC 7830
+									Data: []byte{0x12, 0x34},
+								},
+							},
+						},
+					},
+				},
+			},
+			dnssecOK: false,
+			extRCode: 0xff0 | RCodeServerFailure,
+		},
+		{
+			// Containing multiple OPT resources in a
+			// message is invalid, but it's necessary for
+			// protocol conformance testing.
+			name: "with multiple OPT resources",
+			w: []byte{
+				0x00, 0x00, 0x29, 0x10, 0x00, 0xff, 0x00, 0x00,
+				0x00, 0x00, 0x06, 0x00, 0x0b, 0x00, 0x02, 0x12,
+				0x34, 0x00, 0x00, 0x29, 0x10, 0x00, 0xff, 0x00,
+				0x00, 0x00, 0x00, 0x06, 0x00, 0x0c, 0x00, 0x02,
+				0x00, 0x00,
+			},
+			m: Message{
+				Header: Header{RCode: RCodeNameError},
+				Questions: []Question{
+					{
+						Name:  MustNewName("."),
+						Type:  TypeAAAA,
+						Class: ClassINET,
+					},
+				},
+				Additionals: []Resource{
+					{
+						mustEDNS0ResourceHeader(4096, 0xff0|RCodeNameError, false),
+						&OPTResource{
+							Options: []Option{
+								{
+									Code: 11, // see RFC 7830
+									Data: []byte{0x12, 0x34},
+								},
+							},
+						},
+					},
+					{
+						mustEDNS0ResourceHeader(4096, 0xff0|RCodeNameError, false),
+						&OPTResource{
+							Options: []Option{
+								{
+									Code: 12, // see RFC 7828
+									Data: []byte{0x00, 0x00},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	} {
+		w, err := tt.m.Pack()
+		if err != nil {
+			t.Errorf("Message.Pack() for %s = %v", tt.name, err)
+			continue
+		}
+		if !bytes.Equal(w[len(w)-len(tt.w):], tt.w) {
+			t.Errorf("got Message.Pack() for %s = %#v, want %#v", tt.name, w[len(w)-len(tt.w):], tt.w)
+			continue
+		}
+		var m Message
+		if err := m.Unpack(w); err != nil {
+			t.Errorf("Message.Unpack() for %s = %v", tt.name, err)
+			continue
+		}
+		if !reflect.DeepEqual(m.Additionals, tt.m.Additionals) {
+			t.Errorf("got Message.Pack/Unpack() roundtrip for %s = %+v, want %+v", tt.name, m, tt.m)
+			continue
+		}
+	}
+}
+
+// TestGoString tests that Message.GoString produces Go code that compiles to
+// reproduce the Message.
+//
+// This test was produced as follows:
+// 1. Run (*Message).GoString on largeTestMsg().
+// 2. Remove "dnsmessage." from the output.
+// 3. Paste the result in the test to store it in msg.
+// 4. Also put the original output in the test to store in want.
+func TestGoString(t *testing.T) {
+	msg := Message{Header: Header{ID: 0, Response: true, OpCode: 0, Authoritative: true, Truncated: false, RecursionDesired: false, RecursionAvailable: false, RCode: RCodeSuccess}, Questions: []Question{{Name: MustNewName("foo.bar.example.com."), Type: TypeA, Class: ClassINET}}, Answers: []Resource{{Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeA, Class: ClassINET, TTL: 0, Length: 0}, Body: &AResource{A: [4]byte{127, 0, 0, 1}}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeA, Class: ClassINET, TTL: 0, Length: 0}, Body: &AResource{A: [4]byte{127, 0, 0, 2}}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeAAAA, Class: ClassINET, TTL: 0, Length: 0}, Body: &AAAAResource{AAAA: [16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeCNAME, Class: ClassINET, TTL: 0, Length: 0}, Body: &CNAMEResource{CNAME: MustNewName("alias.example.com.")}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeSOA, Class: ClassINET, TTL: 0, Length: 0}, Body: &SOAResource{NS: MustNewName("ns1.example.com."), MBox: MustNewName("mb.example.com."), Serial: 1, Refresh: 2, Retry: 3, Expire: 4, MinTTL: 5}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypePTR, Class: ClassINET, TTL: 0, Length: 0}, Body: &PTRResource{PTR: MustNewName("ptr.example.com.")}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeMX, Class: ClassINET, TTL: 0, Length: 0}, Body: &MXResource{Pref: 7, MX: MustNewName("mx.example.com.")}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeSRV, Class: ClassINET, TTL: 0, Length: 0}, Body: &SRVResource{Priority: 8, Weight: 9, Port: 11, Target: MustNewName("srv.example.com.")}}}, Authorities: []Resource{{Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeNS, Class: ClassINET, TTL: 0, Length: 0}, Body: &NSResource{NS: MustNewName("ns1.example.com.")}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeNS, Class: ClassINET, TTL: 0, Length: 0}, Body: &NSResource{NS: MustNewName("ns2.example.com.")}}}, Additionals: []Resource{{Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeTXT, Class: ClassINET, TTL: 0, Length: 0}, Body: &TXTResource{TXT: []string{"So Long\x2c and Thanks for All the Fish"}}}, {Header: ResourceHeader{Name: MustNewName("foo.bar.example.com."), Type: TypeTXT, Class: ClassINET, TTL: 0, Length: 0}, Body: &TXTResource{TXT: []string{"Hamster Huey and the Gooey Kablooie"}}}, {Header: ResourceHeader{Name: MustNewName("."), Type: TypeOPT, Class: 4096, TTL: 4261412864, Length: 0}, Body: &OPTResource{Options: []Option{{Code: 10, Data: []byte{1, 35, 69, 103, 137, 171, 205, 239}}}}}}}
+	if !reflect.DeepEqual(msg, largeTestMsg()) {
+		t.Error("Message.GoString lost information or largeTestMsg changed: msg != largeTestMsg()")
+	}
+	got := msg.GoString()
+	want := `dnsmessage.Message{Header: dnsmessage.Header{ID: 0, Response: true, OpCode: 0, Authoritative: true, Truncated: false, RecursionDesired: false, RecursionAvailable: false, RCode: dnsmessage.RCodeSuccess}, Questions: []dnsmessage.Question{dnsmessage.Question{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeA, Class: dnsmessage.ClassINET}}, Answers: []dnsmessage.Resource{dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeA, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.AResource{A: [4]byte{127, 0, 0, 1}}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeA, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.AResource{A: [4]byte{127, 0, 0, 2}}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeAAAA, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.AAAAResource{AAAA: [16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeCNAME, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.CNAMEResource{CNAME: dnsmessage.MustNewName("alias.example.com.")}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeSOA, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.SOAResource{NS: dnsmessage.MustNewName("ns1.example.com."), MBox: dnsmessage.MustNewName("mb.example.com."), Serial: 1, Refresh: 2, Retry: 3, Expire: 4, MinTTL: 5}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypePTR, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.PTRResource{PTR: dnsmessage.MustNewName("ptr.example.com.")}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeMX, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.MXResource{Pref: 7, MX: dnsmessage.MustNewName("mx.example.com.")}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeSRV, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.SRVResource{Priority: 8, Weight: 9, Port: 11, Target: dnsmessage.MustNewName("srv.example.com.")}}}, Authorities: []dnsmessage.Resource{dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeNS, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.NSResource{NS: dnsmessage.MustNewName("ns1.example.com.")}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeNS, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.NSResource{NS: dnsmessage.MustNewName("ns2.example.com.")}}}, Additionals: []dnsmessage.Resource{dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeTXT, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.TXTResource{TXT: []string{"So Long\x2c and Thanks for All the Fish"}}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("foo.bar.example.com."), Type: dnsmessage.TypeTXT, Class: dnsmessage.ClassINET, TTL: 0, Length: 0}, Body: &dnsmessage.TXTResource{TXT: []string{"Hamster Huey and the Gooey Kablooie"}}}, dnsmessage.Resource{Header: dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName("."), Type: dnsmessage.TypeOPT, Class: 4096, TTL: 4261412864, Length: 0}, Body: &dnsmessage.OPTResource{Options: []dnsmessage.Option{dnsmessage.Option{Code: 10, Data: []byte{1, 35, 69, 103, 137, 171, 205, 239}}}}}}}`
+	if got != want {
+		t.Errorf("got msg1.GoString() = %s\nwant = %s", got, want)
+	}
+}
+
+func benchmarkParsingSetup() ([]byte, error) {
+	name := MustNewName("foo.bar.example.com.")
 	msg := Message{
 		Header: Header{Response: true, Authoritative: true},
 		Questions: []Question{
@@ -700,116 +1080,166 @@ func BenchmarkParsing(b *testing.B) {
 
 	buf, err := msg.Pack()
 	if err != nil {
-		b.Fatal("msg.Pack():", err)
+		return nil, fmt.Errorf("Message.Pack() = %v", err)
 	}
+	return buf, nil
+}
 
-	for i := 0; i < b.N; i++ {
-		var p Parser
-		if _, err := p.Start(buf); err != nil {
-			b.Fatal("p.Start(buf):", err)
+func benchmarkParsing(tb testing.TB, buf []byte) {
+	var p Parser
+	if _, err := p.Start(buf); err != nil {
+		tb.Fatal("Parser.Start(non-nil) =", err)
+	}
+
+	for {
+		_, err := p.Question()
+		if err == ErrSectionDone {
+			break
+		}
+		if err != nil {
+			tb.Fatal("Parser.Question() =", err)
 		}
+	}
 
-		for {
-			_, err := p.Question()
-			if err == ErrSectionDone {
-				break
-			}
-			if err != nil {
-				b.Fatal("p.Question():", err)
-			}
+	for {
+		h, err := p.AnswerHeader()
+		if err == ErrSectionDone {
+			break
+		}
+		if err != nil {
+			tb.Fatal("Parser.AnswerHeader() =", err)
 		}
 
-		for {
-			h, err := p.AnswerHeader()
-			if err == ErrSectionDone {
-				break
+		switch h.Type {
+		case TypeA:
+			if _, err := p.AResource(); err != nil {
+				tb.Fatal("Parser.AResource() =", err)
 			}
-			if err != nil {
-				panic(err)
+		case TypeAAAA:
+			if _, err := p.AAAAResource(); err != nil {
+				tb.Fatal("Parser.AAAAResource() =", err)
 			}
-
-			switch h.Type {
-			case TypeA:
-				if _, err := p.AResource(); err != nil {
-					b.Fatal("p.AResource():", err)
-				}
-			case TypeAAAA:
-				if _, err := p.AAAAResource(); err != nil {
-					b.Fatal("p.AAAAResource():", err)
-				}
-			case TypeCNAME:
-				if _, err := p.CNAMEResource(); err != nil {
-					b.Fatal("p.CNAMEResource():", err)
-				}
-			case TypeNS:
-				if _, err := p.NSResource(); err != nil {
-					b.Fatal("p.NSResource():", err)
-				}
-			default:
-				b.Fatalf("unknown type: %T", h)
+		case TypeCNAME:
+			if _, err := p.CNAMEResource(); err != nil {
+				tb.Fatal("Parser.CNAMEResource() =", err)
+			}
+		case TypeNS:
+			if _, err := p.NSResource(); err != nil {
+				tb.Fatal("Parser.NSResource() =", err)
 			}
+		case TypeOPT:
+			if _, err := p.OPTResource(); err != nil {
+				tb.Fatal("Parser.OPTResource() =", err)
+			}
+		default:
+			tb.Fatalf("got unknown type: %T", h)
 		}
 	}
 }
 
-func BenchmarkBuilding(b *testing.B) {
+func BenchmarkParsing(b *testing.B) {
+	buf, err := benchmarkParsingSetup()
+	if err != nil {
+		b.Fatal(err)
+	}
+
 	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		benchmarkParsing(b, buf)
+	}
+}
+
+func TestParsingAllocs(t *testing.T) {
+	buf, err := benchmarkParsingSetup()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if allocs := testing.AllocsPerRun(100, func() { benchmarkParsing(t, buf) }); allocs > 0.5 {
+		t.Errorf("allocations during parsing: got = %f, want ~0", allocs)
+	}
+}
 
-	name := mustNewName("foo.bar.example.com.")
+func benchmarkBuildingSetup() (Name, []byte) {
+	name := MustNewName("foo.bar.example.com.")
 	buf := make([]byte, 0, packStartingCap)
+	return name, buf
+}
 
-	for i := 0; i < b.N; i++ {
-		var bld Builder
-		bld.StartWithoutCompression(buf, Header{Response: true, Authoritative: true})
+func benchmarkBuilding(tb testing.TB, name Name, buf []byte) {
+	bld := NewBuilder(buf, Header{Response: true, Authoritative: true})
 
-		if err := bld.StartQuestions(); err != nil {
-			b.Fatal("bld.StartQuestions():", err)
-		}
-		q := Question{
-			Name:  name,
-			Type:  TypeA,
-			Class: ClassINET,
-		}
-		if err := bld.Question(q); err != nil {
-			b.Fatalf("bld.Question(%+v): %v", q, err)
-		}
+	if err := bld.StartQuestions(); err != nil {
+		tb.Fatal("Builder.StartQuestions() =", err)
+	}
+	q := Question{
+		Name:  name,
+		Type:  TypeA,
+		Class: ClassINET,
+	}
+	if err := bld.Question(q); err != nil {
+		tb.Fatalf("Builder.Question(%+v) = %v", q, err)
+	}
 
-		hdr := ResourceHeader{
-			Name:  name,
-			Class: ClassINET,
-		}
-		if err := bld.StartAnswers(); err != nil {
-			b.Fatal("bld.StartQuestions():", err)
-		}
+	hdr := ResourceHeader{
+		Name:  name,
+		Class: ClassINET,
+	}
+	if err := bld.StartAnswers(); err != nil {
+		tb.Fatal("Builder.StartQuestions() =", err)
+	}
 
-		ar := AResource{[4]byte{}}
-		if err := bld.AResource(hdr, ar); err != nil {
-			b.Fatalf("bld.AResource(%+v, %+v): %v", hdr, ar, err)
-		}
+	ar := AResource{[4]byte{}}
+	if err := bld.AResource(hdr, ar); err != nil {
+		tb.Fatalf("Builder.AResource(%+v, %+v) = %v", hdr, ar, err)
+	}
 
-		aaar := AAAAResource{[16]byte{}}
-		if err := bld.AAAAResource(hdr, aaar); err != nil {
-			b.Fatalf("bld.AAAAResource(%+v, %+v): %v", hdr, aaar, err)
-		}
+	aaar := AAAAResource{[16]byte{}}
+	if err := bld.AAAAResource(hdr, aaar); err != nil {
+		tb.Fatalf("Builder.AAAAResource(%+v, %+v) = %v", hdr, aaar, err)
+	}
 
-		cnr := CNAMEResource{name}
-		if err := bld.CNAMEResource(hdr, cnr); err != nil {
-			b.Fatalf("bld.CNAMEResource(%+v, %+v): %v", hdr, cnr, err)
-		}
+	cnr := CNAMEResource{name}
+	if err := bld.CNAMEResource(hdr, cnr); err != nil {
+		tb.Fatalf("Builder.CNAMEResource(%+v, %+v) = %v", hdr, cnr, err)
+	}
 
-		nsr := NSResource{name}
-		if err := bld.NSResource(hdr, nsr); err != nil {
-			b.Fatalf("bld.NSResource(%+v, %+v): %v", hdr, nsr, err)
-		}
+	nsr := NSResource{name}
+	if err := bld.NSResource(hdr, nsr); err != nil {
+		tb.Fatalf("Builder.NSResource(%+v, %+v) = %v", hdr, nsr, err)
+	}
 
-		if _, err := bld.Finish(); err != nil {
-			b.Fatal("bld.Finish():", err)
-		}
+	extrc := 0xfe0 | RCodeNotImplemented
+	if err := (&hdr).SetEDNS0(4096, extrc, true); err != nil {
+		tb.Fatalf("ResourceHeader.SetEDNS0(4096, %#x, true) = %v", extrc, err)
+	}
+	optr := OPTResource{}
+	if err := bld.OPTResource(hdr, optr); err != nil {
+		tb.Fatalf("Builder.OPTResource(%+v, %+v) = %v", hdr, optr, err)
+	}
+
+	if _, err := bld.Finish(); err != nil {
+		tb.Fatal("Builder.Finish() =", err)
+	}
+}
+
+func BenchmarkBuilding(b *testing.B) {
+	name, buf := benchmarkBuildingSetup()
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		benchmarkBuilding(b, name, buf)
+	}
+}
+
+func TestBuildingAllocs(t *testing.T) {
+	name, buf := benchmarkBuildingSetup()
+	if allocs := testing.AllocsPerRun(100, func() { benchmarkBuilding(t, name, buf) }); allocs > 0.5 {
+		t.Errorf("allocations during building: got = %f, want ~0", allocs)
 	}
 }
 
 func smallTestMsg() Message {
-	name := mustNewName("example.com.")
+	name := MustNewName("example.com.")
 	return Message{
 		Header: Header{Response: true, Authoritative: true},
 		Questions: []Question{
@@ -859,7 +1289,7 @@ func BenchmarkPack(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		if _, err := msg.Pack(); err != nil {
-			b.Fatal(err)
+			b.Fatal("Message.Pack() =", err)
 		}
 	}
 }
@@ -872,13 +1302,13 @@ func BenchmarkAppendPack(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		if _, err := msg.AppendPack(buf[:0]); err != nil {
-			b.Fatal(err)
+			b.Fatal("Message.AppendPack() = ", err)
 		}
 	}
 }
 
 func largeTestMsg() Message {
-	name := mustNewName("foo.bar.example.com.")
+	name := MustNewName("foo.bar.example.com.")
 	return Message{
 		Header: Header{Response: true, Authoritative: true},
 		Questions: []Question{
@@ -919,7 +1349,7 @@ func largeTestMsg() Message {
 					Type:  TypeCNAME,
 					Class: ClassINET,
 				},
-				&CNAMEResource{mustNewName("alias.example.com.")},
+				&CNAMEResource{MustNewName("alias.example.com.")},
 			},
 			{
 				ResourceHeader{
@@ -928,8 +1358,8 @@ func largeTestMsg() Message {
 					Class: ClassINET,
 				},
 				&SOAResource{
-					NS:      mustNewName("ns1.example.com."),
-					MBox:    mustNewName("mb.example.com."),
+					NS:      MustNewName("ns1.example.com."),
+					MBox:    MustNewName("mb.example.com."),
 					Serial:  1,
 					Refresh: 2,
 					Retry:   3,
@@ -943,7 +1373,7 @@ func largeTestMsg() Message {
 					Type:  TypePTR,
 					Class: ClassINET,
 				},
-				&PTRResource{mustNewName("ptr.example.com.")},
+				&PTRResource{MustNewName("ptr.example.com.")},
 			},
 			{
 				ResourceHeader{
@@ -953,7 +1383,7 @@ func largeTestMsg() Message {
 				},
 				&MXResource{
 					7,
-					mustNewName("mx.example.com."),
+					MustNewName("mx.example.com."),
 				},
 			},
 			{
@@ -966,7 +1396,7 @@ func largeTestMsg() Message {
 					8,
 					9,
 					11,
-					mustNewName("srv.example.com."),
+					MustNewName("srv.example.com."),
 				},
 			},
 		},
@@ -977,7 +1407,7 @@ func largeTestMsg() Message {
 					Type:  TypeNS,
 					Class: ClassINET,
 				},
-				&NSResource{mustNewName("ns1.example.com.")},
+				&NSResource{MustNewName("ns1.example.com.")},
 			},
 			{
 				ResourceHeader{
@@ -985,7 +1415,7 @@ func largeTestMsg() Message {
 					Type:  TypeNS,
 					Class: ClassINET,
 				},
-				&NSResource{mustNewName("ns2.example.com.")},
+				&NSResource{MustNewName("ns2.example.com.")},
 			},
 		},
 		Additionals: []Resource{
@@ -995,7 +1425,7 @@ func largeTestMsg() Message {
 					Type:  TypeTXT,
 					Class: ClassINET,
 				},
-				&TXTResource{"So Long, and Thanks for All the Fish"},
+				&TXTResource{[]string{"So Long, and Thanks for All the Fish"}},
 			},
 			{
 				ResourceHeader{
@@ -1003,139 +1433,19 @@ func largeTestMsg() Message {
 					Type:  TypeTXT,
 					Class: ClassINET,
 				},
-				&TXTResource{"Hamster Huey and the Gooey Kablooie"},
+				&TXTResource{[]string{"Hamster Huey and the Gooey Kablooie"}},
+			},
+			{
+				mustEDNS0ResourceHeader(4096, 0xfe0|RCodeSuccess, false),
+				&OPTResource{
+					Options: []Option{
+						{
+							Code: 10, // see RFC 7873
+							Data: []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
+						},
+					},
+				},
 			},
 		},
 	}
 }
-
-const loremIpsum = `
-Lorem ipsum dolor sit amet, nec enim antiopam id, an ullum choro
-nonumes qui, pro eu debet honestatis mediocritatem. No alia enim eos,
-magna signiferumque ex vis. Mei no aperiri dissentias, cu vel quas
-regione. Malorum quaeque vim ut, eum cu semper aliquid invidunt, ei
-nam ipsum assentior.
-
-Nostrum appellantur usu no, vis ex probatus adipiscing. Cu usu illum
-facilis eleifend. Iusto conceptam complectitur vim id. Tale omnesque
-no usu, ei oblique sadipscing vim. At nullam voluptua usu, mei laudem
-reformidans et. Qui ei eros porro reformidans, ius suas veritus
-torquatos ex. Mea te facer alterum consequat.
-
-Soleat torquatos democritum sed et, no mea congue appareat, facer
-aliquam nec in. Has te ipsum tritani. At justo dicta option nec, movet
-phaedrum ad nam. Ea detracto verterem liberavisse has, delectus
-suscipiantur in mei. Ex nam meliore complectitur. Ut nam omnis
-honestatis quaerendum, ea mea nihil affert detracto, ad vix rebum
-mollis.
-
-Ut epicurei praesent neglegentur pri, prima fuisset intellegebat ad
-vim. An habemus comprehensam usu, at enim dignissim pro. Eam reque
-vivendum adipisci ea. Vel ne odio choro minimum. Sea admodum
-dissentiet ex. Mundi tamquam evertitur ius cu. Homero postea iisque ut
-pro, vel ne saepe senserit consetetur.
-
-Nulla utamur facilisis ius ea, in viderer diceret pertinax eum. Mei no
-enim quodsi facilisi, ex sed aeterno appareat mediocritatem, eum
-sententiae deterruisset ut. At suas timeam euismod cum, offendit
-appareat interpretaris ne vix. Vel ea civibus albucius, ex vim quidam
-accusata intellegebat, noluisse instructior sea id. Nec te nonumes
-habemus appellantur, quis dignissim vituperata eu nam.
-
-At vix apeirian patrioque vituperatoribus, an usu agam assum. Debet
-iisque an mea. Per eu dicant ponderum accommodare. Pri alienum
-placerat senserit an, ne eum ferri abhorreant vituperatoribus. Ut mea
-eligendi disputationi. Ius no tation everti impedit, ei magna quidam
-mediocritatem pri.
-
-Legendos perpetua iracundia ne usu, no ius ullum epicurei intellegam,
-ad modus epicuri lucilius eam. In unum quaerendum usu. Ne diam paulo
-has, ea veri virtute sed. Alia honestatis conclusionemque mea eu, ut
-iudico albucius his.
-
-Usu essent probatus eu, sed omnis dolor delicatissimi ex. No qui augue
-dissentias dissentiet. Laudem recteque no usu, vel an velit noluisse,
-an sed utinam eirmod appetere. Ne mea fuisset inimicus ocurreret. At
-vis dicant abhorreant, utinam forensibus nec ne, mei te docendi
-consequat. Brute inermis persecuti cum id. Ut ipsum munere propriae
-usu, dicit graeco disputando id has.
-
-Eros dolore quaerendum nam ei. Timeam ornatus inciderint pro id. Nec
-torquatos sadipscing ei, ancillae molestie per in. Malis principes duo
-ea, usu liber postulant ei.
-
-Graece timeam voluptatibus eu eam. Alia probatus quo no, ea scripta
-feugiat duo. Congue option meliore ex qui, noster invenire appellantur
-ea vel. Eu exerci legendos vel. Consetetur repudiandae vim ut. Vix an
-probo minimum, et nam illud falli tempor.
-
-Cum dico signiferumque eu. Sed ut regione maiorum, id veritus insolens
-tacimates vix. Eu mel sint tamquam lucilius, duo no oporteat
-tacimates. Atqui augue concludaturque vix ei, id mel utroque menandri.
-
-Ad oratio blandit aliquando pro. Vis et dolorum rationibus
-philosophia, ad cum nulla molestie. Hinc fuisset adversarium eum et,
-ne qui nisl verear saperet, vel te quaestio forensibus. Per odio
-option delenit an. Alii placerat has no, in pri nihil platonem
-cotidieque. Est ut elit copiosae scaevola, debet tollit maluisset sea
-an.
-
-Te sea hinc debet pericula, liber ridens fabulas cu sed, quem mutat
-accusam mea et. Elitr labitur albucius et pri, an labore feugait mel.
-Velit zril melius usu ea. Ad stet putent interpretaris qui. Mel no
-error volumus scripserit. In pro paulo iudico, quo ei dolorem
-verterem, affert fabellas dissentiet ea vix.
-
-Vis quot deserunt te. Error aliquid detraxit eu usu, vis alia eruditi
-salutatus cu. Est nostrud bonorum an, ei usu alii salutatus. Vel at
-nisl primis, eum ex aperiri noluisse reformidans. Ad veri velit
-utroque vis, ex equidem detraxit temporibus has.
-
-Inermis appareat usu ne. Eros placerat periculis mea ad, in dictas
-pericula pro. Errem postulant at usu, ea nec amet ornatus mentitum. Ad
-mazim graeco eum, vel ex percipit volutpat iudicabit, sit ne delicata
-interesset. Mel sapientem prodesset abhorreant et, oblique suscipit
-eam id.
-
-An maluisset disputando mea, vidit mnesarchum pri et. Malis insolens
-inciderint no sea. Ea persius maluisset vix, ne vim appellantur
-instructior, consul quidam definiebas pri id. Cum integre feugiat
-pericula in, ex sed persius similique, mel ne natum dicit percipitur.
-
-Primis discere ne pri, errem putent definitionem at vis. Ei mel dolore
-neglegentur, mei tincidunt percipitur ei. Pro ad simul integre
-rationibus. Eu vel alii honestatis definitiones, mea no nonumy
-reprehendunt.
-
-Dicta appareat legendos est cu. Eu vel congue dicunt omittam, no vix
-adhuc minimum constituam, quot noluisse id mel. Eu quot sale mutat
-duo, ex nisl munere invenire duo. Ne nec ullum utamur. Pro alterum
-debitis nostrum no, ut vel aliquid vivendo.
-
-Aliquip fierent praesent quo ne, id sit audiam recusabo delicatissimi.
-Usu postulant incorrupte cu. At pro dicit tibique intellegam, cibo
-dolore impedit id eam, et aeque feugait assentior has. Quando sensibus
-nec ex. Possit sensibus pri ad, unum mutat periculis cu vix.
-
-Mundi tibique vix te, duo simul partiendo qualisque id, est at vidit
-sonet tempor. No per solet aeterno deseruisse. Petentium salutandi
-definiebas pri cu. Munere vivendum est in. Ei justo congue eligendi
-vis, modus offendit omittantur te mel.
-
-Integre voluptaria in qui, sit habemus tractatos constituam no. Utinam
-melius conceptam est ne, quo in minimum apeirian delicata, ut ius
-porro recusabo. Dicant expetenda vix no, ludus scripserit sed ex, eu
-his modo nostro. Ut etiam sonet his, quodsi inciderint philosophia te
-per. Nullam lobortis eu cum, vix an sonet efficiendi repudiandae. Vis
-ad idque fabellas intellegebat.
-
-Eum commodo senserit conclusionemque ex. Sed forensibus sadipscing ut,
-mei in facer delicata periculis, sea ne hinc putent cetero. Nec ne
-alia corpora invenire, alia prima soleat te cum. Eleifend posidonium
-nam at.
-
-Dolorum indoctum cu quo, ex dolor legendos recteque eam, cu pri zril
-discere. Nec civibus officiis dissentiunt ex, est te liber ludus
-elaboraret. Cum ea fabellas invenire. Ex vim nostrud eripuit
-comprehensam, nam te inermis delectus, saepe inermis senserit.
-`
diff --git a/vendor/golang.org/x/net/html/atom/gen.go b/vendor/golang.org/x/net/html/atom/gen.go
index 56cd8425..5d052781 100644
--- a/vendor/golang.org/x/net/html/atom/gen.go
+++ b/vendor/golang.org/x/net/html/atom/gen.go
@@ -306,7 +306,7 @@ func (t *table) push(i uint32, depth int) bool {
 
 // The lists of element names and attribute keys were taken from
 // https://html.spec.whatwg.org/multipage/indices.html#index
-// as of the "HTML Living Standard - Last Updated 18 September 2017" version.
+// as of the "HTML Living Standard - Last Updated 16 April 2018" version.
 
 // "command", "keygen" and "menuitem" have been removed from the spec,
 // but are kept here for backwards compatibility.
@@ -701,6 +701,8 @@ var extra = []string{
 	"plaintext",
 	"prompt",
 	"public",
+	"rb",
+	"rtc",
 	"spacer",
 	"strike",
 	"svg",
diff --git a/vendor/golang.org/x/net/html/atom/table.go b/vendor/golang.org/x/net/html/atom/table.go
index a91bd647..2a938864 100644
--- a/vendor/golang.org/x/net/html/atom/table.go
+++ b/vendor/golang.org/x/net/html/atom/table.go
@@ -10,30 +10,30 @@ const (
 	Accept                    Atom = 0x1a06
 	AcceptCharset             Atom = 0x1a0e
 	Accesskey                 Atom = 0x2c09
-	Acronym                   Atom = 0x6907
-	Action                    Atom = 0x26a06
+	Acronym                   Atom = 0xaa07
+	Action                    Atom = 0x27206
 	Address                   Atom = 0x6f307
-	Align                     Atom = 0x7005
-	Allowfullscreen           Atom = 0x2000f
-	Allowpaymentrequest       Atom = 0x8013
-	Allowusermedia            Atom = 0x9c0e
-	Alt                       Atom = 0xc703
+	Align                     Atom = 0xb105
+	Allowfullscreen           Atom = 0x2080f
+	Allowpaymentrequest       Atom = 0xc113
+	Allowusermedia            Atom = 0xdd0e
+	Alt                       Atom = 0xf303
 	Annotation                Atom = 0x1c90a
 	AnnotationXml             Atom = 0x1c90e
-	Applet                    Atom = 0x31106
-	Area                      Atom = 0x34e04
-	Article                   Atom = 0x3f407
-	As                        Atom = 0xd002
-	Aside                     Atom = 0xd805
-	Async                     Atom = 0xd005
-	Audio                     Atom = 0xe605
-	Autocomplete              Atom = 0x2700c
-	Autofocus                 Atom = 0x10209
-	Autoplay                  Atom = 0x11d08
+	Applet                    Atom = 0x31906
+	Area                      Atom = 0x35604
+	Article                   Atom = 0x3fc07
+	As                        Atom = 0x3c02
+	Aside                     Atom = 0x10705
+	Async                     Atom = 0xff05
+	Audio                     Atom = 0x11505
+	Autocomplete              Atom = 0x2780c
+	Autofocus                 Atom = 0x12109
+	Autoplay                  Atom = 0x13c08
 	B                         Atom = 0x101
-	Base                      Atom = 0x12c04
-	Basefont                  Atom = 0x12c08
-	Bdi                       Atom = 0x7903
+	Base                      Atom = 0x3b04
+	Basefont                  Atom = 0x3b08
+	Bdi                       Atom = 0xba03
 	Bdo                       Atom = 0x14b03
 	Bgsound                   Atom = 0x15e07
 	Big                       Atom = 0x17003
@@ -42,217 +42,217 @@ const (
 	Body                      Atom = 0x2804
 	Br                        Atom = 0x202
 	Button                    Atom = 0x19106
-	Canvas                    Atom = 0xd406
-	Caption                   Atom = 0x22907
-	Center                    Atom = 0x21806
-	Challenge                 Atom = 0x29309
+	Canvas                    Atom = 0x10306
+	Caption                   Atom = 0x23107
+	Center                    Atom = 0x22006
+	Challenge                 Atom = 0x29b09
 	Charset                   Atom = 0x2107
-	Checked                   Atom = 0x47107
-	Cite                      Atom = 0x55c04
-	Class                     Atom = 0x5bd05
-	Code                      Atom = 0x1a004
-	Col                       Atom = 0x1a703
-	Colgroup                  Atom = 0x1a708
+	Checked                   Atom = 0x47907
+	Cite                      Atom = 0x19c04
+	Class                     Atom = 0x56405
+	Code                      Atom = 0x5c504
+	Col                       Atom = 0x1ab03
+	Colgroup                  Atom = 0x1ab08
 	Color                     Atom = 0x1bf05
 	Cols                      Atom = 0x1c404
 	Colspan                   Atom = 0x1c407
 	Command                   Atom = 0x1d707
-	Content                   Atom = 0x58307
-	Contenteditable           Atom = 0x5830f
-	Contextmenu               Atom = 0x3780b
+	Content                   Atom = 0x58b07
+	Contenteditable           Atom = 0x58b0f
+	Contextmenu               Atom = 0x3800b
 	Controls                  Atom = 0x1de08
 	Coords                    Atom = 0x1ea06
-	Crossorigin               Atom = 0x1f30b
-	Data                      Atom = 0x49d04
-	Datalist                  Atom = 0x49d08
-	Datetime                  Atom = 0x2b008
-	Dd                        Atom = 0x2cf02
-	Default                   Atom = 0xdb07
-	Defer                     Atom = 0x1a205
-	Del                       Atom = 0x44a03
-	Desc                      Atom = 0x55904
-	Details                   Atom = 0x4607
-	Dfn                       Atom = 0x5f03
-	Dialog                    Atom = 0x7a06
-	Dir                       Atom = 0xba03
-	Dirname                   Atom = 0xba07
+	Crossorigin               Atom = 0x1fb0b
+	Data                      Atom = 0x4a504
+	Datalist                  Atom = 0x4a508
+	Datetime                  Atom = 0x2b808
+	Dd                        Atom = 0x2d702
+	Default                   Atom = 0x10a07
+	Defer                     Atom = 0x5c705
+	Del                       Atom = 0x45203
+	Desc                      Atom = 0x56104
+	Details                   Atom = 0x7207
+	Dfn                       Atom = 0x8703
+	Dialog                    Atom = 0xbb06
+	Dir                       Atom = 0x9303
+	Dirname                   Atom = 0x9307
 	Disabled                  Atom = 0x16408
 	Div                       Atom = 0x16b03
 	Dl                        Atom = 0x5e602
-	Download                  Atom = 0x45b08
+	Download                  Atom = 0x46308
 	Draggable                 Atom = 0x17a09
-	Dropzone                  Atom = 0x3fd08
+	Dropzone                  Atom = 0x40508
 	Dt                        Atom = 0x64b02
-	Em                        Atom = 0x4202
-	Embed                     Atom = 0x4205
-	Enctype                   Atom = 0x28507
-	Face                      Atom = 0x21604
-	Fieldset                  Atom = 0x21e08
-	Figcaption                Atom = 0x2260a
-	Figure                    Atom = 0x24006
-	Font                      Atom = 0x13004
-	Footer                    Atom = 0xca06
-	For                       Atom = 0x24c03
-	ForeignObject             Atom = 0x24c0d
-	Foreignobject             Atom = 0x2590d
-	Form                      Atom = 0x26604
-	Formaction                Atom = 0x2660a
-	Formenctype               Atom = 0x2810b
-	Formmethod                Atom = 0x29c0a
-	Formnovalidate            Atom = 0x2a60e
-	Formtarget                Atom = 0x2b80a
-	Frame                     Atom = 0x5705
-	Frameset                  Atom = 0x5708
+	Em                        Atom = 0x6e02
+	Embed                     Atom = 0x6e05
+	Enctype                   Atom = 0x28d07
+	Face                      Atom = 0x21e04
+	Fieldset                  Atom = 0x22608
+	Figcaption                Atom = 0x22e0a
+	Figure                    Atom = 0x24806
+	Font                      Atom = 0x3f04
+	Footer                    Atom = 0xf606
+	For                       Atom = 0x25403
+	ForeignObject             Atom = 0x2540d
+	Foreignobject             Atom = 0x2610d
+	Form                      Atom = 0x26e04
+	Formaction                Atom = 0x26e0a
+	Formenctype               Atom = 0x2890b
+	Formmethod                Atom = 0x2a40a
+	Formnovalidate            Atom = 0x2ae0e
+	Formtarget                Atom = 0x2c00a
+	Frame                     Atom = 0x8b05
+	Frameset                  Atom = 0x8b08
 	H1                        Atom = 0x15c02
-	H2                        Atom = 0x2d602
-	H3                        Atom = 0x30502
-	H4                        Atom = 0x33d02
-	H5                        Atom = 0x34702
+	H2                        Atom = 0x2de02
+	H3                        Atom = 0x30d02
+	H4                        Atom = 0x34502
+	H5                        Atom = 0x34f02
 	H6                        Atom = 0x64d02
-	Head                      Atom = 0x32904
-	Header                    Atom = 0x32906
-	Headers                   Atom = 0x32907
-	Height                    Atom = 0x14306
-	Hgroup                    Atom = 0x2c206
-	Hidden                    Atom = 0x2cd06
-	High                      Atom = 0x2d304
+	Head                      Atom = 0x33104
+	Header                    Atom = 0x33106
+	Headers                   Atom = 0x33107
+	Height                    Atom = 0x5206
+	Hgroup                    Atom = 0x2ca06
+	Hidden                    Atom = 0x2d506
+	High                      Atom = 0x2db04
 	Hr                        Atom = 0x15702
-	Href                      Atom = 0x2d804
-	Hreflang                  Atom = 0x2d808
-	Html                      Atom = 0x14704
-	HttpEquiv                 Atom = 0x2e00a
+	Href                      Atom = 0x2e004
+	Hreflang                  Atom = 0x2e008
+	Html                      Atom = 0x5604
+	HttpEquiv                 Atom = 0x2e80a
 	I                         Atom = 0x601
-	Icon                      Atom = 0x58204
-	Id                        Atom = 0xda02
-	Iframe                    Atom = 0x2f406
-	Image                     Atom = 0x2fa05
-	Img                       Atom = 0x2ff03
-	Input                     Atom = 0x44305
-	Inputmode                 Atom = 0x44309
-	Ins                       Atom = 0x1fc03
-	Integrity                 Atom = 0x23709
+	Icon                      Atom = 0x58a04
+	Id                        Atom = 0x10902
+	Iframe                    Atom = 0x2fc06
+	Image                     Atom = 0x30205
+	Img                       Atom = 0x30703
+	Input                     Atom = 0x44b05
+	Inputmode                 Atom = 0x44b09
+	Ins                       Atom = 0x20403
+	Integrity                 Atom = 0x23f09
 	Is                        Atom = 0x16502
-	Isindex                   Atom = 0x30707
-	Ismap                     Atom = 0x30e05
-	Itemid                    Atom = 0x38306
-	Itemprop                  Atom = 0x55d08
-	Itemref                   Atom = 0x3c507
+	Isindex                   Atom = 0x30f07
+	Ismap                     Atom = 0x31605
+	Itemid                    Atom = 0x38b06
+	Itemprop                  Atom = 0x19d08
+	Itemref                   Atom = 0x3cd07
 	Itemscope                 Atom = 0x67109
-	Itemtype                  Atom = 0x31708
-	Kbd                       Atom = 0x7803
+	Itemtype                  Atom = 0x31f08
+	Kbd                       Atom = 0xb903
 	Keygen                    Atom = 0x3206
-	Keytype                   Atom = 0x9507
+	Keytype                   Atom = 0xd607
 	Kind                      Atom = 0x17704
-	Label                     Atom = 0xf105
-	Lang                      Atom = 0x2dc04
+	Label                     Atom = 0x5905
+	Lang                      Atom = 0x2e404
 	Legend                    Atom = 0x18106
-	Li                        Atom = 0x7102
+	Li                        Atom = 0xb202
 	Link                      Atom = 0x17404
-	List                      Atom = 0x4a104
-	Listing                   Atom = 0x4a107
-	Loop                      Atom = 0xf504
-	Low                       Atom = 0x8203
+	List                      Atom = 0x4a904
+	Listing                   Atom = 0x4a907
+	Loop                      Atom = 0x5d04
+	Low                       Atom = 0xc303
 	Main                      Atom = 0x1004
-	Malignmark                Atom = 0x6f0a
+	Malignmark                Atom = 0xb00a
 	Manifest                  Atom = 0x6d708
-	Map                       Atom = 0x31003
-	Mark                      Atom = 0x7504
-	Marquee                   Atom = 0x31f07
-	Math                      Atom = 0x32604
-	Max                       Atom = 0x33503
-	Maxlength                 Atom = 0x33509
-	Media                     Atom = 0xa505
-	Mediagroup                Atom = 0xa50a
-	Menu                      Atom = 0x37f04
-	Menuitem                  Atom = 0x37f08
-	Meta                      Atom = 0x4b004
-	Meter                     Atom = 0xbf05
-	Method                    Atom = 0x2a006
-	Mglyph                    Atom = 0x30006
-	Mi                        Atom = 0x33f02
-	Min                       Atom = 0x33f03
-	Minlength                 Atom = 0x33f09
-	Mn                        Atom = 0x2a902
-	Mo                        Atom = 0x6302
+	Map                       Atom = 0x31803
+	Mark                      Atom = 0xb604
+	Marquee                   Atom = 0x32707
+	Math                      Atom = 0x32e04
+	Max                       Atom = 0x33d03
+	Maxlength                 Atom = 0x33d09
+	Media                     Atom = 0xe605
+	Mediagroup                Atom = 0xe60a
+	Menu                      Atom = 0x38704
+	Menuitem                  Atom = 0x38708
+	Meta                      Atom = 0x4b804
+	Meter                     Atom = 0x9805
+	Method                    Atom = 0x2a806
+	Mglyph                    Atom = 0x30806
+	Mi                        Atom = 0x34702
+	Min                       Atom = 0x34703
+	Minlength                 Atom = 0x34709
+	Mn                        Atom = 0x2b102
+	Mo                        Atom = 0xa402
 	Ms                        Atom = 0x67402
-	Mtext                     Atom = 0x34905
-	Multiple                  Atom = 0x35708
-	Muted                     Atom = 0x35f05
-	Name                      Atom = 0xbd04
+	Mtext                     Atom = 0x35105
+	Multiple                  Atom = 0x35f08
+	Muted                     Atom = 0x36705
+	Name                      Atom = 0x9604
 	Nav                       Atom = 0x1303
 	Nobr                      Atom = 0x3704
-	Noembed                   Atom = 0x4007
-	Noframes                  Atom = 0x5508
-	Nomodule                  Atom = 0x6108
-	Nonce                     Atom = 0x56605
-	Noscript                  Atom = 0x20e08
-	Novalidate                Atom = 0x2aa0a
-	Object                    Atom = 0x26006
-	Ol                        Atom = 0x11802
+	Noembed                   Atom = 0x6c07
+	Noframes                  Atom = 0x8908
+	Nomodule                  Atom = 0xa208
+	Nonce                     Atom = 0x1a605
+	Noscript                  Atom = 0x21608
+	Novalidate                Atom = 0x2b20a
+	Object                    Atom = 0x26806
+	Ol                        Atom = 0x13702
 	Onabort                   Atom = 0x19507
-	Onafterprint              Atom = 0x22e0c
-	Onautocomplete            Atom = 0x26e0e
-	Onautocompleteerror       Atom = 0x26e13
+	Onafterprint              Atom = 0x2360c
+	Onautocomplete            Atom = 0x2760e
+	Onautocompleteerror       Atom = 0x27613
 	Onauxclick                Atom = 0x61f0a
 	Onbeforeprint             Atom = 0x69e0d
 	Onbeforeunload            Atom = 0x6e70e
-	Onblur                    Atom = 0x5c606
-	Oncancel                  Atom = 0xea08
+	Onblur                    Atom = 0x56d06
+	Oncancel                  Atom = 0x11908
 	Oncanplay                 Atom = 0x14d09
 	Oncanplaythrough          Atom = 0x14d10
-	Onchange                  Atom = 0x41308
-	Onclick                   Atom = 0x2ed07
-	Onclose                   Atom = 0x36407
-	Oncontextmenu             Atom = 0x3760d
-	Oncopy                    Atom = 0x38906
-	Oncuechange               Atom = 0x38f0b
-	Oncut                     Atom = 0x39a05
-	Ondblclick                Atom = 0x39f0a
-	Ondrag                    Atom = 0x3a906
-	Ondragend                 Atom = 0x3a909
-	Ondragenter               Atom = 0x3b20b
-	Ondragexit                Atom = 0x3bd0a
-	Ondragleave               Atom = 0x3d70b
-	Ondragover                Atom = 0x3e20a
-	Ondragstart               Atom = 0x3ec0b
-	Ondrop                    Atom = 0x3fb06
-	Ondurationchange          Atom = 0x40b10
-	Onemptied                 Atom = 0x40209
-	Onended                   Atom = 0x41b07
-	Onerror                   Atom = 0x42207
-	Onfocus                   Atom = 0x42907
-	Onhashchange              Atom = 0x4350c
-	Oninput                   Atom = 0x44107
-	Oninvalid                 Atom = 0x44d09
-	Onkeydown                 Atom = 0x45609
-	Onkeypress                Atom = 0x4630a
-	Onkeyup                   Atom = 0x47807
-	Onlanguagechange          Atom = 0x48510
-	Onload                    Atom = 0x49506
-	Onloadeddata              Atom = 0x4950c
-	Onloadedmetadata          Atom = 0x4a810
-	Onloadend                 Atom = 0x4be09
-	Onloadstart               Atom = 0x4c70b
-	Onmessage                 Atom = 0x4d209
-	Onmessageerror            Atom = 0x4d20e
-	Onmousedown               Atom = 0x4e00b
-	Onmouseenter              Atom = 0x4eb0c
-	Onmouseleave              Atom = 0x4f70c
-	Onmousemove               Atom = 0x5030b
-	Onmouseout                Atom = 0x50e0a
-	Onmouseover               Atom = 0x51b0b
-	Onmouseup                 Atom = 0x52609
-	Onmousewheel              Atom = 0x5340c
-	Onoffline                 Atom = 0x54009
-	Ononline                  Atom = 0x54908
-	Onpagehide                Atom = 0x5510a
-	Onpageshow                Atom = 0x56b0a
-	Onpaste                   Atom = 0x57707
-	Onpause                   Atom = 0x59207
-	Onplay                    Atom = 0x59c06
-	Onplaying                 Atom = 0x59c09
-	Onpopstate                Atom = 0x5a50a
-	Onprogress                Atom = 0x5af0a
+	Onchange                  Atom = 0x41b08
+	Onclick                   Atom = 0x2f507
+	Onclose                   Atom = 0x36c07
+	Oncontextmenu             Atom = 0x37e0d
+	Oncopy                    Atom = 0x39106
+	Oncuechange               Atom = 0x3970b
+	Oncut                     Atom = 0x3a205
+	Ondblclick                Atom = 0x3a70a
+	Ondrag                    Atom = 0x3b106
+	Ondragend                 Atom = 0x3b109
+	Ondragenter               Atom = 0x3ba0b
+	Ondragexit                Atom = 0x3c50a
+	Ondragleave               Atom = 0x3df0b
+	Ondragover                Atom = 0x3ea0a
+	Ondragstart               Atom = 0x3f40b
+	Ondrop                    Atom = 0x40306
+	Ondurationchange          Atom = 0x41310
+	Onemptied                 Atom = 0x40a09
+	Onended                   Atom = 0x42307
+	Onerror                   Atom = 0x42a07
+	Onfocus                   Atom = 0x43107
+	Onhashchange              Atom = 0x43d0c
+	Oninput                   Atom = 0x44907
+	Oninvalid                 Atom = 0x45509
+	Onkeydown                 Atom = 0x45e09
+	Onkeypress                Atom = 0x46b0a
+	Onkeyup                   Atom = 0x48007
+	Onlanguagechange          Atom = 0x48d10
+	Onload                    Atom = 0x49d06
+	Onloadeddata              Atom = 0x49d0c
+	Onloadedmetadata          Atom = 0x4b010
+	Onloadend                 Atom = 0x4c609
+	Onloadstart               Atom = 0x4cf0b
+	Onmessage                 Atom = 0x4da09
+	Onmessageerror            Atom = 0x4da0e
+	Onmousedown               Atom = 0x4e80b
+	Onmouseenter              Atom = 0x4f30c
+	Onmouseleave              Atom = 0x4ff0c
+	Onmousemove               Atom = 0x50b0b
+	Onmouseout                Atom = 0x5160a
+	Onmouseover               Atom = 0x5230b
+	Onmouseup                 Atom = 0x52e09
+	Onmousewheel              Atom = 0x53c0c
+	Onoffline                 Atom = 0x54809
+	Ononline                  Atom = 0x55108
+	Onpagehide                Atom = 0x5590a
+	Onpageshow                Atom = 0x5730a
+	Onpaste                   Atom = 0x57f07
+	Onpause                   Atom = 0x59a07
+	Onplay                    Atom = 0x5a406
+	Onplaying                 Atom = 0x5a409
+	Onpopstate                Atom = 0x5ad0a
+	Onprogress                Atom = 0x5b70a
 	Onratechange              Atom = 0x5cc0c
 	Onrejectionhandled        Atom = 0x5d812
 	Onreset                   Atom = 0x5ea07
@@ -268,72 +268,74 @@ const (
 	Onstorage                 Atom = 0x66209
 	Onsubmit                  Atom = 0x66b08
 	Onsuspend                 Atom = 0x67b09
-	Ontimeupdate              Atom = 0x1310c
+	Ontimeupdate              Atom = 0x400c
 	Ontoggle                  Atom = 0x68408
 	Onunhandledrejection      Atom = 0x68c14
 	Onunload                  Atom = 0x6ab08
 	Onvolumechange            Atom = 0x6b30e
 	Onwaiting                 Atom = 0x6c109
 	Onwheel                   Atom = 0x6ca07
-	Open                      Atom = 0x56304
-	Optgroup                  Atom = 0xf708
+	Open                      Atom = 0x1a304
+	Optgroup                  Atom = 0x5f08
 	Optimum                   Atom = 0x6d107
 	Option                    Atom = 0x6e306
-	Output                    Atom = 0x51506
+	Output                    Atom = 0x51d06
 	P                         Atom = 0xc01
 	Param                     Atom = 0xc05
-	Pattern                   Atom = 0x4f07
-	Picture                   Atom = 0xae07
-	Ping                      Atom = 0xfe04
-	Placeholder               Atom = 0x1120b
-	Plaintext                 Atom = 0x1ae09
-	Playsinline               Atom = 0x1210b
-	Poster                    Atom = 0x2c706
-	Pre                       Atom = 0x46803
-	Preload                   Atom = 0x47e07
-	Progress                  Atom = 0x5b108
-	Prompt                    Atom = 0x52e06
-	Public                    Atom = 0x57e06
-	Q                         Atom = 0x8e01
+	Pattern                   Atom = 0x6607
+	Picture                   Atom = 0x7b07
+	Ping                      Atom = 0xef04
+	Placeholder               Atom = 0x1310b
+	Plaintext                 Atom = 0x1b209
+	Playsinline               Atom = 0x1400b
+	Poster                    Atom = 0x2cf06
+	Pre                       Atom = 0x47003
+	Preload                   Atom = 0x48607
+	Progress                  Atom = 0x5b908
+	Prompt                    Atom = 0x53606
+	Public                    Atom = 0x58606
+	Q                         Atom = 0xcf01
 	Radiogroup                Atom = 0x30a
-	Readonly                  Atom = 0x34f08
-	Referrerpolicy            Atom = 0x3c90e
-	Rel                       Atom = 0x47f03
-	Required                  Atom = 0x24408
-	Reversed                  Atom = 0xb308
-	Rows                      Atom = 0x3a04
-	Rowspan                   Atom = 0x3a07
-	Rp                        Atom = 0x23402
+	Rb                        Atom = 0x3a02
+	Readonly                  Atom = 0x35708
+	Referrerpolicy            Atom = 0x3d10e
+	Rel                       Atom = 0x48703
+	Required                  Atom = 0x24c08
+	Reversed                  Atom = 0x8008
+	Rows                      Atom = 0x9c04
+	Rowspan                   Atom = 0x9c07
+	Rp                        Atom = 0x23c02
 	Rt                        Atom = 0x19a02
-	Ruby                      Atom = 0xc304
+	Rtc                       Atom = 0x19a03
+	Ruby                      Atom = 0xfb04
 	S                         Atom = 0x2501
-	Samp                      Atom = 0x4c04
-	Sandbox                   Atom = 0x10a07
+	Samp                      Atom = 0x7804
+	Sandbox                   Atom = 0x12907
 	Scope                     Atom = 0x67505
 	Scoped                    Atom = 0x67506
-	Script                    Atom = 0x21006
-	Seamless                  Atom = 0x36908
-	Section                   Atom = 0x5c107
+	Script                    Atom = 0x21806
+	Seamless                  Atom = 0x37108
+	Section                   Atom = 0x56807
 	Select                    Atom = 0x63c06
 	Selected                  Atom = 0x63c08
 	Shape                     Atom = 0x1e505
 	Size                      Atom = 0x5f504
 	Sizes                     Atom = 0x5f505
 	Slot                      Atom = 0x1ef04
-	Small                     Atom = 0x1fe05
+	Small                     Atom = 0x20605
 	Sortable                  Atom = 0x65108
-	Sorted                    Atom = 0x32f06
-	Source                    Atom = 0x37006
-	Spacer                    Atom = 0x42f06
-	Span                      Atom = 0x3d04
-	Spellcheck                Atom = 0x46c0a
-	Src                       Atom = 0x5b803
-	Srcdoc                    Atom = 0x5b806
+	Sorted                    Atom = 0x33706
+	Source                    Atom = 0x37806
+	Spacer                    Atom = 0x43706
+	Span                      Atom = 0x9f04
+	Spellcheck                Atom = 0x4740a
+	Src                       Atom = 0x5c003
+	Srcdoc                    Atom = 0x5c006
 	Srclang                   Atom = 0x5f907
 	Srcset                    Atom = 0x6f906
-	Start                     Atom = 0x3f205
-	Step                      Atom = 0x57b04
-	Strike                    Atom = 0x9106
+	Start                     Atom = 0x3fa05
+	Step                      Atom = 0x58304
+	Strike                    Atom = 0xd206
 	Strong                    Atom = 0x6dd06
 	Style                     Atom = 0x6ff05
 	Sub                       Atom = 0x66d03
@@ -341,36 +343,36 @@ const (
 	Sup                       Atom = 0x70b03
 	Svg                       Atom = 0x70e03
 	System                    Atom = 0x71106
-	Tabindex                  Atom = 0x4b608
-	Table                     Atom = 0x58d05
-	Target                    Atom = 0x2bc06
+	Tabindex                  Atom = 0x4be08
+	Table                     Atom = 0x59505
+	Target                    Atom = 0x2c406
 	Tbody                     Atom = 0x2705
-	Td                        Atom = 0x5e02
+	Td                        Atom = 0x9202
 	Template                  Atom = 0x71408
-	Textarea                  Atom = 0x34a08
-	Tfoot                     Atom = 0xc905
+	Textarea                  Atom = 0x35208
+	Tfoot                     Atom = 0xf505
 	Th                        Atom = 0x15602
-	Thead                     Atom = 0x32805
-	Time                      Atom = 0x13304
-	Title                     Atom = 0xe105
-	Tr                        Atom = 0x8b02
-	Track                     Atom = 0x19b05
-	Translate                 Atom = 0x1b609
-	Tt                        Atom = 0x5102
-	Type                      Atom = 0x9804
-	Typemustmatch             Atom = 0x2880d
+	Thead                     Atom = 0x33005
+	Time                      Atom = 0x4204
+	Title                     Atom = 0x11005
+	Tr                        Atom = 0xcc02
+	Track                     Atom = 0x1ba05
+	Translate                 Atom = 0x1f209
+	Tt                        Atom = 0x6802
+	Type                      Atom = 0xd904
+	Typemustmatch             Atom = 0x2900d
 	U                         Atom = 0xb01
-	Ul                        Atom = 0x6602
-	Updateviacache            Atom = 0x1370e
-	Usemap                    Atom = 0x59606
+	Ul                        Atom = 0xa702
+	Updateviacache            Atom = 0x460e
+	Usemap                    Atom = 0x59e06
 	Value                     Atom = 0x1505
 	Var                       Atom = 0x16d03
-	Video                     Atom = 0x2e905
-	Wbr                       Atom = 0x57403
+	Video                     Atom = 0x2f105
+	Wbr                       Atom = 0x57c03
 	Width                     Atom = 0x64905
 	Workertype                Atom = 0x71c0a
 	Wrap                      Atom = 0x72604
-	Xmp                       Atom = 0x11003
+	Xmp                       Atom = 0x12f03
 )
 
 const hash0 = 0x81cdf10e
@@ -378,399 +380,401 @@ const hash0 = 0x81cdf10e
 const maxAtomLen = 25
 
 var table = [1 << 9]Atom{
-	0x1:   0xa50a,  // mediagroup
-	0x2:   0x2dc04, // lang
+	0x1:   0xe60a,  // mediagroup
+	0x2:   0x2e404, // lang
 	0x4:   0x2c09,  // accesskey
-	0x5:   0x5708,  // frameset
+	0x5:   0x8b08,  // frameset
 	0x7:   0x63a08, // onselect
 	0x8:   0x71106, // system
 	0xa:   0x64905, // width
-	0xc:   0x2810b, // formenctype
-	0xd:   0x11802, // ol
-	0xe:   0x38f0b, // oncuechange
+	0xc:   0x2890b, // formenctype
+	0xd:   0x13702, // ol
+	0xe:   0x3970b, // oncuechange
 	0x10:  0x14b03, // bdo
-	0x11:  0xe605,  // audio
+	0x11:  0x11505, // audio
 	0x12:  0x17a09, // draggable
-	0x14:  0x2e905, // video
-	0x15:  0x2a902, // mn
-	0x16:  0x37f04, // menu
-	0x17:  0x2c706, // poster
-	0x19:  0xca06,  // footer
-	0x1a:  0x2a006, // method
-	0x1b:  0x2b008, // datetime
+	0x14:  0x2f105, // video
+	0x15:  0x2b102, // mn
+	0x16:  0x38704, // menu
+	0x17:  0x2cf06, // poster
+	0x19:  0xf606,  // footer
+	0x1a:  0x2a806, // method
+	0x1b:  0x2b808, // datetime
 	0x1c:  0x19507, // onabort
-	0x1d:  0x1370e, // updateviacache
-	0x1e:  0xd005,  // async
-	0x1f:  0x49506, // onload
-	0x21:  0xea08,  // oncancel
+	0x1d:  0x460e,  // updateviacache
+	0x1e:  0xff05,  // async
+	0x1f:  0x49d06, // onload
+	0x21:  0x11908, // oncancel
 	0x22:  0x62908, // onseeked
-	0x23:  0x2fa05, // image
+	0x23:  0x30205, // image
 	0x24:  0x5d812, // onrejectionhandled
 	0x26:  0x17404, // link
-	0x27:  0x51506, // output
-	0x28:  0x32904, // head
-	0x29:  0x4f70c, // onmouseleave
-	0x2a:  0x57707, // onpaste
-	0x2b:  0x59c09, // onplaying
+	0x27:  0x51d06, // output
+	0x28:  0x33104, // head
+	0x29:  0x4ff0c, // onmouseleave
+	0x2a:  0x57f07, // onpaste
+	0x2b:  0x5a409, // onplaying
 	0x2c:  0x1c407, // colspan
 	0x2f:  0x1bf05, // color
 	0x30:  0x5f504, // size
-	0x31:  0x2e00a, // http-equiv
+	0x31:  0x2e80a, // http-equiv
 	0x33:  0x601,   // i
-	0x34:  0x5510a, // onpagehide
+	0x34:  0x5590a, // onpagehide
 	0x35:  0x68c14, // onunhandledrejection
-	0x37:  0x42207, // onerror
-	0x3a:  0x12c08, // basefont
+	0x37:  0x42a07, // onerror
+	0x3a:  0x3b08,  // basefont
 	0x3f:  0x1303,  // nav
 	0x40:  0x17704, // kind
-	0x41:  0x34f08, // readonly
-	0x42:  0x30006, // mglyph
-	0x44:  0x7102,  // li
-	0x46:  0x2cd06, // hidden
+	0x41:  0x35708, // readonly
+	0x42:  0x30806, // mglyph
+	0x44:  0xb202,  // li
+	0x46:  0x2d506, // hidden
 	0x47:  0x70e03, // svg
-	0x48:  0x57b04, // step
-	0x49:  0x23709, // integrity
-	0x4a:  0x57e06, // public
-	0x4c:  0x1a703, // col
+	0x48:  0x58304, // step
+	0x49:  0x23f09, // integrity
+	0x4a:  0x58606, // public
+	0x4c:  0x1ab03, // col
 	0x4d:  0x1870a, // blockquote
-	0x4e:  0x34702, // h5
-	0x50:  0x5b108, // progress
+	0x4e:  0x34f02, // h5
+	0x50:  0x5b908, // progress
 	0x51:  0x5f505, // sizes
-	0x52:  0x33d02, // h4
-	0x56:  0x32805, // thead
-	0x57:  0x9507,  // keytype
-	0x58:  0x5af0a, // onprogress
-	0x59:  0x44309, // inputmode
-	0x5a:  0x3a909, // ondragend
-	0x5d:  0x39a05, // oncut
-	0x5e:  0x42f06, // spacer
-	0x5f:  0x1a708, // colgroup
+	0x52:  0x34502, // h4
+	0x56:  0x33005, // thead
+	0x57:  0xd607,  // keytype
+	0x58:  0x5b70a, // onprogress
+	0x59:  0x44b09, // inputmode
+	0x5a:  0x3b109, // ondragend
+	0x5d:  0x3a205, // oncut
+	0x5e:  0x43706, // spacer
+	0x5f:  0x1ab08, // colgroup
 	0x62:  0x16502, // is
-	0x65:  0xd002,  // as
-	0x66:  0x54009, // onoffline
-	0x67:  0x32f06, // sorted
-	0x69:  0x48510, // onlanguagechange
-	0x6c:  0x4350c, // onhashchange
-	0x6d:  0xbd04,  // name
-	0x6e:  0xc905,  // tfoot
-	0x6f:  0x55904, // desc
-	0x70:  0x33503, // max
+	0x65:  0x3c02,  // as
+	0x66:  0x54809, // onoffline
+	0x67:  0x33706, // sorted
+	0x69:  0x48d10, // onlanguagechange
+	0x6c:  0x43d0c, // onhashchange
+	0x6d:  0x9604,  // name
+	0x6e:  0xf505,  // tfoot
+	0x6f:  0x56104, // desc
+	0x70:  0x33d03, // max
 	0x72:  0x1ea06, // coords
-	0x73:  0x30502, // h3
+	0x73:  0x30d02, // h3
 	0x74:  0x6e70e, // onbeforeunload
-	0x75:  0x3a04,  // rows
+	0x75:  0x9c04,  // rows
 	0x76:  0x63c06, // select
-	0x77:  0xbf05,  // meter
-	0x78:  0x38306, // itemid
-	0x79:  0x5340c, // onmousewheel
-	0x7a:  0x5b806, // srcdoc
-	0x7d:  0x19b05, // track
-	0x7f:  0x31708, // itemtype
-	0x82:  0x6302,  // mo
-	0x83:  0x41308, // onchange
-	0x84:  0x32907, // headers
+	0x77:  0x9805,  // meter
+	0x78:  0x38b06, // itemid
+	0x79:  0x53c0c, // onmousewheel
+	0x7a:  0x5c006, // srcdoc
+	0x7d:  0x1ba05, // track
+	0x7f:  0x31f08, // itemtype
+	0x82:  0xa402,  // mo
+	0x83:  0x41b08, // onchange
+	0x84:  0x33107, // headers
 	0x85:  0x5cc0c, // onratechange
 	0x86:  0x60819, // onsecuritypolicyviolation
-	0x88:  0x49d08, // datalist
-	0x89:  0x4e00b, // onmousedown
+	0x88:  0x4a508, // datalist
+	0x89:  0x4e80b, // onmousedown
 	0x8a:  0x1ef04, // slot
-	0x8b:  0x4a810, // onloadedmetadata
+	0x8b:  0x4b010, // onloadedmetadata
 	0x8c:  0x1a06,  // accept
-	0x8d:  0x26006, // object
+	0x8d:  0x26806, // object
 	0x91:  0x6b30e, // onvolumechange
 	0x92:  0x2107,  // charset
-	0x93:  0x26e13, // onautocompleteerror
-	0x94:  0x8013,  // allowpaymentrequest
+	0x93:  0x27613, // onautocompleteerror
+	0x94:  0xc113,  // allowpaymentrequest
 	0x95:  0x2804,  // body
-	0x96:  0xdb07,  // default
+	0x96:  0x10a07, // default
 	0x97:  0x63c08, // selected
-	0x98:  0x21604, // face
+	0x98:  0x21e04, // face
 	0x99:  0x1e505, // shape
 	0x9b:  0x68408, // ontoggle
 	0x9e:  0x64b02, // dt
-	0x9f:  0x7504,  // mark
+	0x9f:  0xb604,  // mark
 	0xa1:  0xb01,   // u
 	0xa4:  0x6ab08, // onunload
-	0xa5:  0xf504,  // loop
+	0xa5:  0x5d04,  // loop
 	0xa6:  0x16408, // disabled
-	0xaa:  0x41b07, // onended
-	0xab:  0x6f0a,  // malignmark
+	0xaa:  0x42307, // onended
+	0xab:  0xb00a,  // malignmark
 	0xad:  0x67b09, // onsuspend
-	0xae:  0x34905, // mtext
+	0xae:  0x35105, // mtext
 	0xaf:  0x64f06, // onsort
-	0xb0:  0x55d08, // itemprop
+	0xb0:  0x19d08, // itemprop
 	0xb3:  0x67109, // itemscope
 	0xb4:  0x17305, // blink
-	0xb6:  0x3a906, // ondrag
-	0xb7:  0x6602,  // ul
-	0xb8:  0x26604, // form
-	0xb9:  0x10a07, // sandbox
-	0xba:  0x5705,  // frame
+	0xb6:  0x3b106, // ondrag
+	0xb7:  0xa702,  // ul
+	0xb8:  0x26e04, // form
+	0xb9:  0x12907, // sandbox
+	0xba:  0x8b05,  // frame
 	0xbb:  0x1505,  // value
 	0xbc:  0x66209, // onstorage
-	0xbf:  0x6907,  // acronym
+	0xbf:  0xaa07,  // acronym
 	0xc0:  0x19a02, // rt
 	0xc2:  0x202,   // br
-	0xc3:  0x21e08, // fieldset
-	0xc4:  0x2880d, // typemustmatch
-	0xc5:  0x6108,  // nomodule
-	0xc6:  0x4007,  // noembed
+	0xc3:  0x22608, // fieldset
+	0xc4:  0x2900d, // typemustmatch
+	0xc5:  0xa208,  // nomodule
+	0xc6:  0x6c07,  // noembed
 	0xc7:  0x69e0d, // onbeforeprint
 	0xc8:  0x19106, // button
-	0xc9:  0x2ed07, // onclick
+	0xc9:  0x2f507, // onclick
 	0xca:  0x70407, // summary
-	0xcd:  0xc304,  // ruby
-	0xce:  0x5bd05, // class
-	0xcf:  0x3ec0b, // ondragstart
-	0xd0:  0x22907, // caption
-	0xd4:  0x9c0e,  // allowusermedia
-	0xd5:  0x4c70b, // onloadstart
+	0xcd:  0xfb04,  // ruby
+	0xce:  0x56405, // class
+	0xcf:  0x3f40b, // ondragstart
+	0xd0:  0x23107, // caption
+	0xd4:  0xdd0e,  // allowusermedia
+	0xd5:  0x4cf0b, // onloadstart
 	0xd9:  0x16b03, // div
-	0xda:  0x4a104, // list
-	0xdb:  0x32604, // math
-	0xdc:  0x44305, // input
-	0xdf:  0x3e20a, // ondragover
-	0xe0:  0x2d602, // h2
-	0xe2:  0x1ae09, // plaintext
-	0xe4:  0x4eb0c, // onmouseenter
-	0xe7:  0x47107, // checked
-	0xe8:  0x46803, // pre
-	0xea:  0x35708, // multiple
-	0xeb:  0x7903,  // bdi
-	0xec:  0x33509, // maxlength
-	0xed:  0x8e01,  // q
+	0xda:  0x4a904, // list
+	0xdb:  0x32e04, // math
+	0xdc:  0x44b05, // input
+	0xdf:  0x3ea0a, // ondragover
+	0xe0:  0x2de02, // h2
+	0xe2:  0x1b209, // plaintext
+	0xe4:  0x4f30c, // onmouseenter
+	0xe7:  0x47907, // checked
+	0xe8:  0x47003, // pre
+	0xea:  0x35f08, // multiple
+	0xeb:  0xba03,  // bdi
+	0xec:  0x33d09, // maxlength
+	0xed:  0xcf01,  // q
 	0xee:  0x61f0a, // onauxclick
-	0xf0:  0x57403, // wbr
-	0xf2:  0x12c04, // base
+	0xf0:  0x57c03, // wbr
+	0xf2:  0x3b04,  // base
 	0xf3:  0x6e306, // option
-	0xf5:  0x40b10, // ondurationchange
-	0xf7:  0x5508,  // noframes
-	0xf9:  0x3fd08, // dropzone
+	0xf5:  0x41310, // ondurationchange
+	0xf7:  0x8908,  // noframes
+	0xf9:  0x40508, // dropzone
 	0xfb:  0x67505, // scope
-	0xfc:  0xb308,  // reversed
-	0xfd:  0x3b20b, // ondragenter
-	0xfe:  0x3f205, // start
-	0xff:  0x11003, // xmp
+	0xfc:  0x8008,  // reversed
+	0xfd:  0x3ba0b, // ondragenter
+	0xfe:  0x3fa05, // start
+	0xff:  0x12f03, // xmp
 	0x100: 0x5f907, // srclang
-	0x101: 0x2ff03, // img
+	0x101: 0x30703, // img
 	0x104: 0x101,   // b
-	0x105: 0x24c03, // for
-	0x106: 0xd805,  // aside
-	0x107: 0x44107, // oninput
-	0x108: 0x34e04, // area
-	0x109: 0x29c0a, // formmethod
+	0x105: 0x25403, // for
+	0x106: 0x10705, // aside
+	0x107: 0x44907, // oninput
+	0x108: 0x35604, // area
+	0x109: 0x2a40a, // formmethod
 	0x10a: 0x72604, // wrap
-	0x10c: 0x23402, // rp
-	0x10d: 0x4630a, // onkeypress
-	0x10e: 0x5102,  // tt
-	0x110: 0x33f02, // mi
-	0x111: 0x35f05, // muted
-	0x112: 0xc703,  // alt
-	0x113: 0x1a004, // code
-	0x114: 0x4202,  // em
-	0x115: 0x3bd0a, // ondragexit
-	0x117: 0x3d04,  // span
+	0x10c: 0x23c02, // rp
+	0x10d: 0x46b0a, // onkeypress
+	0x10e: 0x6802,  // tt
+	0x110: 0x34702, // mi
+	0x111: 0x36705, // muted
+	0x112: 0xf303,  // alt
+	0x113: 0x5c504, // code
+	0x114: 0x6e02,  // em
+	0x115: 0x3c50a, // ondragexit
+	0x117: 0x9f04,  // span
 	0x119: 0x6d708, // manifest
-	0x11a: 0x37f08, // menuitem
-	0x11b: 0x58307, // content
+	0x11a: 0x38708, // menuitem
+	0x11b: 0x58b07, // content
 	0x11d: 0x6c109, // onwaiting
-	0x11f: 0x4be09, // onloadend
-	0x121: 0x3760d, // oncontextmenu
-	0x123: 0x5c606, // onblur
-	0x124: 0x3f407, // article
-	0x125: 0xba03,  // dir
-	0x126: 0xfe04,  // ping
-	0x127: 0x24408, // required
-	0x128: 0x44d09, // oninvalid
-	0x129: 0x7005,  // align
-	0x12b: 0x58204, // icon
+	0x11f: 0x4c609, // onloadend
+	0x121: 0x37e0d, // oncontextmenu
+	0x123: 0x56d06, // onblur
+	0x124: 0x3fc07, // article
+	0x125: 0x9303,  // dir
+	0x126: 0xef04,  // ping
+	0x127: 0x24c08, // required
+	0x128: 0x45509, // oninvalid
+	0x129: 0xb105,  // align
+	0x12b: 0x58a04, // icon
 	0x12c: 0x64d02, // h6
 	0x12d: 0x1c404, // cols
-	0x12e: 0x2260a, // figcaption
-	0x12f: 0x45609, // onkeydown
+	0x12e: 0x22e0a, // figcaption
+	0x12f: 0x45e09, // onkeydown
 	0x130: 0x66b08, // onsubmit
 	0x131: 0x14d09, // oncanplay
 	0x132: 0x70b03, // sup
 	0x133: 0xc01,   // p
-	0x135: 0x40209, // onemptied
-	0x136: 0x38906, // oncopy
-	0x137: 0x55c04, // cite
-	0x138: 0x39f0a, // ondblclick
-	0x13a: 0x5030b, // onmousemove
+	0x135: 0x40a09, // onemptied
+	0x136: 0x39106, // oncopy
+	0x137: 0x19c04, // cite
+	0x138: 0x3a70a, // ondblclick
+	0x13a: 0x50b0b, // onmousemove
 	0x13c: 0x66d03, // sub
-	0x13d: 0x47f03, // rel
-	0x13e: 0xf708,  // optgroup
-	0x142: 0x3a07,  // rowspan
-	0x143: 0x37006, // source
-	0x144: 0x20e08, // noscript
-	0x145: 0x56304, // open
-	0x146: 0x1fc03, // ins
-	0x147: 0x24c0d, // foreignObject
-	0x148: 0x5a50a, // onpopstate
-	0x14a: 0x28507, // enctype
-	0x14b: 0x26e0e, // onautocomplete
-	0x14c: 0x34a08, // textarea
-	0x14e: 0x2700c, // autocomplete
+	0x13d: 0x48703, // rel
+	0x13e: 0x5f08,  // optgroup
+	0x142: 0x9c07,  // rowspan
+	0x143: 0x37806, // source
+	0x144: 0x21608, // noscript
+	0x145: 0x1a304, // open
+	0x146: 0x20403, // ins
+	0x147: 0x2540d, // foreignObject
+	0x148: 0x5ad0a, // onpopstate
+	0x14a: 0x28d07, // enctype
+	0x14b: 0x2760e, // onautocomplete
+	0x14c: 0x35208, // textarea
+	0x14e: 0x2780c, // autocomplete
 	0x14f: 0x15702, // hr
 	0x150: 0x1de08, // controls
-	0x151: 0xda02,  // id
-	0x153: 0x22e0c, // onafterprint
-	0x155: 0x2590d, // foreignobject
-	0x156: 0x31f07, // marquee
-	0x157: 0x59207, // onpause
+	0x151: 0x10902, // id
+	0x153: 0x2360c, // onafterprint
+	0x155: 0x2610d, // foreignobject
+	0x156: 0x32707, // marquee
+	0x157: 0x59a07, // onpause
 	0x158: 0x5e602, // dl
-	0x159: 0x14306, // height
-	0x15a: 0x33f03, // min
-	0x15b: 0xba07,  // dirname
-	0x15c: 0x1b609, // translate
-	0x15d: 0x14704, // html
-	0x15e: 0x33f09, // minlength
-	0x15f: 0x47e07, // preload
+	0x159: 0x5206,  // height
+	0x15a: 0x34703, // min
+	0x15b: 0x9307,  // dirname
+	0x15c: 0x1f209, // translate
+	0x15d: 0x5604,  // html
+	0x15e: 0x34709, // minlength
+	0x15f: 0x48607, // preload
 	0x160: 0x71408, // template
-	0x161: 0x3d70b, // ondragleave
-	0x164: 0x5b803, // src
+	0x161: 0x3df0b, // ondragleave
+	0x162: 0x3a02,  // rb
+	0x164: 0x5c003, // src
 	0x165: 0x6dd06, // strong
-	0x167: 0x4c04,  // samp
+	0x167: 0x7804,  // samp
 	0x168: 0x6f307, // address
-	0x169: 0x54908, // ononline
-	0x16b: 0x1120b, // placeholder
-	0x16c: 0x2bc06, // target
-	0x16d: 0x1fe05, // small
+	0x169: 0x55108, // ononline
+	0x16b: 0x1310b, // placeholder
+	0x16c: 0x2c406, // target
+	0x16d: 0x20605, // small
 	0x16e: 0x6ca07, // onwheel
 	0x16f: 0x1c90a, // annotation
-	0x170: 0x46c0a, // spellcheck
-	0x171: 0x4607,  // details
-	0x172: 0xd406,  // canvas
-	0x173: 0x10209, // autofocus
+	0x170: 0x4740a, // spellcheck
+	0x171: 0x7207,  // details
+	0x172: 0x10306, // canvas
+	0x173: 0x12109, // autofocus
 	0x174: 0xc05,   // param
-	0x176: 0x45b08, // download
-	0x177: 0x44a03, // del
-	0x178: 0x36407, // onclose
-	0x179: 0x7803,  // kbd
-	0x17a: 0x31106, // applet
-	0x17b: 0x2d804, // href
+	0x176: 0x46308, // download
+	0x177: 0x45203, // del
+	0x178: 0x36c07, // onclose
+	0x179: 0xb903,  // kbd
+	0x17a: 0x31906, // applet
+	0x17b: 0x2e004, // href
 	0x17c: 0x5f108, // onresize
-	0x17e: 0x4950c, // onloadeddata
-	0x180: 0x8b02,  // tr
-	0x181: 0x2b80a, // formtarget
-	0x182: 0xe105,  // title
+	0x17e: 0x49d0c, // onloadeddata
+	0x180: 0xcc02,  // tr
+	0x181: 0x2c00a, // formtarget
+	0x182: 0x11005, // title
 	0x183: 0x6ff05, // style
-	0x184: 0x9106,  // strike
-	0x185: 0x59606, // usemap
-	0x186: 0x2f406, // iframe
+	0x184: 0xd206,  // strike
+	0x185: 0x59e06, // usemap
+	0x186: 0x2fc06, // iframe
 	0x187: 0x1004,  // main
-	0x189: 0xae07,  // picture
-	0x18c: 0x30e05, // ismap
-	0x18e: 0x49d04, // data
-	0x18f: 0xf105,  // label
-	0x191: 0x3c90e, // referrerpolicy
+	0x189: 0x7b07,  // picture
+	0x18c: 0x31605, // ismap
+	0x18e: 0x4a504, // data
+	0x18f: 0x5905,  // label
+	0x191: 0x3d10e, // referrerpolicy
 	0x192: 0x15602, // th
-	0x194: 0x52e06, // prompt
-	0x195: 0x5c107, // section
+	0x194: 0x53606, // prompt
+	0x195: 0x56807, // section
 	0x197: 0x6d107, // optimum
-	0x198: 0x2d304, // high
+	0x198: 0x2db04, // high
 	0x199: 0x15c02, // h1
 	0x19a: 0x65909, // onstalled
 	0x19b: 0x16d03, // var
-	0x19c: 0x13304, // time
+	0x19c: 0x4204,  // time
 	0x19e: 0x67402, // ms
-	0x19f: 0x32906, // header
-	0x1a0: 0x4d209, // onmessage
-	0x1a1: 0x56605, // nonce
-	0x1a2: 0x2660a, // formaction
-	0x1a3: 0x21806, // center
+	0x19f: 0x33106, // header
+	0x1a0: 0x4da09, // onmessage
+	0x1a1: 0x1a605, // nonce
+	0x1a2: 0x26e0a, // formaction
+	0x1a3: 0x22006, // center
 	0x1a4: 0x3704,  // nobr
-	0x1a5: 0x58d05, // table
-	0x1a6: 0x4a107, // listing
+	0x1a5: 0x59505, // table
+	0x1a6: 0x4a907, // listing
 	0x1a7: 0x18106, // legend
-	0x1a9: 0x29309, // challenge
-	0x1aa: 0x24006, // figure
-	0x1ab: 0xa505,  // media
-	0x1ae: 0x9804,  // type
-	0x1af: 0x13004, // font
-	0x1b0: 0x4d20e, // onmessageerror
-	0x1b1: 0x36908, // seamless
-	0x1b2: 0x5f03,  // dfn
-	0x1b3: 0x1a205, // defer
-	0x1b4: 0x8203,  // low
-	0x1b5: 0x63109, // onseeking
-	0x1b6: 0x51b0b, // onmouseover
-	0x1b7: 0x2aa0a, // novalidate
+	0x1a9: 0x29b09, // challenge
+	0x1aa: 0x24806, // figure
+	0x1ab: 0xe605,  // media
+	0x1ae: 0xd904,  // type
+	0x1af: 0x3f04,  // font
+	0x1b0: 0x4da0e, // onmessageerror
+	0x1b1: 0x37108, // seamless
+	0x1b2: 0x8703,  // dfn
+	0x1b3: 0x5c705, // defer
+	0x1b4: 0xc303,  // low
+	0x1b5: 0x19a03, // rtc
+	0x1b6: 0x5230b, // onmouseover
+	0x1b7: 0x2b20a, // novalidate
 	0x1b8: 0x71c0a, // workertype
-	0x1ba: 0x3c507, // itemref
+	0x1ba: 0x3cd07, // itemref
 	0x1bd: 0x1,     // a
-	0x1be: 0x31003, // map
-	0x1bf: 0x1310c, // ontimeupdate
+	0x1be: 0x31803, // map
+	0x1bf: 0x400c,  // ontimeupdate
 	0x1c0: 0x15e07, // bgsound
 	0x1c1: 0x3206,  // keygen
 	0x1c2: 0x2705,  // tbody
 	0x1c5: 0x64406, // onshow
 	0x1c7: 0x2501,  // s
-	0x1c8: 0x4f07,  // pattern
+	0x1c8: 0x6607,  // pattern
 	0x1cc: 0x14d10, // oncanplaythrough
-	0x1ce: 0x2cf02, // dd
+	0x1ce: 0x2d702, // dd
 	0x1cf: 0x6f906, // srcset
 	0x1d0: 0x17003, // big
 	0x1d2: 0x65108, // sortable
-	0x1d3: 0x47807, // onkeyup
-	0x1d5: 0x59c06, // onplay
-	0x1d7: 0x4b004, // meta
-	0x1d8: 0x3fb06, // ondrop
+	0x1d3: 0x48007, // onkeyup
+	0x1d5: 0x5a406, // onplay
+	0x1d7: 0x4b804, // meta
+	0x1d8: 0x40306, // ondrop
 	0x1da: 0x60008, // onscroll
-	0x1db: 0x1f30b, // crossorigin
-	0x1dc: 0x56b0a, // onpageshow
+	0x1db: 0x1fb0b, // crossorigin
+	0x1dc: 0x5730a, // onpageshow
 	0x1dd: 0x4,     // abbr
-	0x1de: 0x5e02,  // td
-	0x1df: 0x5830f, // contenteditable
-	0x1e0: 0x26a06, // action
-	0x1e1: 0x1210b, // playsinline
-	0x1e2: 0x42907, // onfocus
-	0x1e3: 0x2d808, // hreflang
-	0x1e5: 0x50e0a, // onmouseout
+	0x1de: 0x9202,  // td
+	0x1df: 0x58b0f, // contenteditable
+	0x1e0: 0x27206, // action
+	0x1e1: 0x1400b, // playsinline
+	0x1e2: 0x43107, // onfocus
+	0x1e3: 0x2e008, // hreflang
+	0x1e5: 0x5160a, // onmouseout
 	0x1e6: 0x5ea07, // onreset
-	0x1e7: 0x11d08, // autoplay
+	0x1e7: 0x13c08, // autoplay
+	0x1e8: 0x63109, // onseeking
 	0x1ea: 0x67506, // scoped
 	0x1ec: 0x30a,   // radiogroup
-	0x1ee: 0x3780b, // contextmenu
-	0x1ef: 0x52609, // onmouseup
-	0x1f1: 0x2c206, // hgroup
-	0x1f2: 0x2000f, // allowfullscreen
-	0x1f3: 0x4b608, // tabindex
-	0x1f6: 0x30707, // isindex
+	0x1ee: 0x3800b, // contextmenu
+	0x1ef: 0x52e09, // onmouseup
+	0x1f1: 0x2ca06, // hgroup
+	0x1f2: 0x2080f, // allowfullscreen
+	0x1f3: 0x4be08, // tabindex
+	0x1f6: 0x30f07, // isindex
 	0x1f7: 0x1a0e,  // accept-charset
-	0x1f8: 0x2a60e, // formnovalidate
+	0x1f8: 0x2ae0e, // formnovalidate
 	0x1fb: 0x1c90e, // annotation-xml
-	0x1fc: 0x4205,  // embed
-	0x1fd: 0x21006, // script
-	0x1fe: 0x7a06,  // dialog
+	0x1fc: 0x6e05,  // embed
+	0x1fd: 0x21806, // script
+	0x1fe: 0xbb06,  // dialog
 	0x1ff: 0x1d707, // command
 }
 
-const atomText = "abbradiogrouparamainavalueaccept-charsetbodyaccesskeygenobro" +
-	"wspanoembedetailsampatternoframesetdfnomoduleacronymalignmar" +
-	"kbdialogallowpaymentrequestrikeytypeallowusermediagroupictur" +
-	"eversedirnameterubyaltfooterasyncanvasidefaultitleaudioncanc" +
-	"elabelooptgroupingautofocusandboxmplaceholderautoplaysinline" +
-	"basefontimeupdateviacacheightmlbdoncanplaythrough1bgsoundisa" +
-	"bledivarbigblinkindraggablegendblockquotebuttonabortrackcode" +
-	"fercolgrouplaintextranslatecolorcolspannotation-xmlcommandco" +
-	"ntrolshapecoordslotcrossoriginsmallowfullscreenoscriptfacent" +
-	"erfieldsetfigcaptionafterprintegrityfigurequiredforeignObjec" +
-	"tforeignobjectformactionautocompleteerrorformenctypemustmatc" +
-	"hallengeformmethodformnovalidatetimeformtargethgrouposterhid" +
-	"denhigh2hreflanghttp-equivideonclickiframeimageimglyph3isind" +
-	"exismappletitemtypemarqueematheadersortedmaxlength4minlength" +
-	"5mtextareadonlymultiplemutedoncloseamlessourceoncontextmenui" +
-	"temidoncopyoncuechangeoncutondblclickondragendondragenterond" +
-	"ragexitemreferrerpolicyondragleaveondragoverondragstarticleo" +
-	"ndropzonemptiedondurationchangeonendedonerroronfocuspaceronh" +
-	"ashchangeoninputmodeloninvalidonkeydownloadonkeypresspellche" +
-	"ckedonkeyupreloadonlanguagechangeonloadeddatalistingonloaded" +
-	"metadatabindexonloadendonloadstartonmessageerroronmousedowno" +
-	"nmouseenteronmouseleaveonmousemoveonmouseoutputonmouseoveron" +
-	"mouseupromptonmousewheelonofflineononlineonpagehidescitempro" +
-	"penonceonpageshowbronpastepublicontenteditableonpausemaponpl" +
-	"ayingonpopstateonprogressrcdoclassectionbluronratechangeonre" +
+const atomText = "abbradiogrouparamainavalueaccept-charsetbodyaccesskeygenobrb" +
+	"asefontimeupdateviacacheightmlabelooptgroupatternoembedetail" +
+	"sampictureversedfnoframesetdirnameterowspanomoduleacronymali" +
+	"gnmarkbdialogallowpaymentrequestrikeytypeallowusermediagroup" +
+	"ingaltfooterubyasyncanvasidefaultitleaudioncancelautofocusan" +
+	"dboxmplaceholderautoplaysinlinebdoncanplaythrough1bgsoundisa" +
+	"bledivarbigblinkindraggablegendblockquotebuttonabortcitempro" +
+	"penoncecolgrouplaintextrackcolorcolspannotation-xmlcommandco" +
+	"ntrolshapecoordslotranslatecrossoriginsmallowfullscreenoscri" +
+	"ptfacenterfieldsetfigcaptionafterprintegrityfigurequiredfore" +
+	"ignObjectforeignobjectformactionautocompleteerrorformenctype" +
+	"mustmatchallengeformmethodformnovalidatetimeformtargethgroup" +
+	"osterhiddenhigh2hreflanghttp-equivideonclickiframeimageimgly" +
+	"ph3isindexismappletitemtypemarqueematheadersortedmaxlength4m" +
+	"inlength5mtextareadonlymultiplemutedoncloseamlessourceoncont" +
+	"extmenuitemidoncopyoncuechangeoncutondblclickondragendondrag" +
+	"enterondragexitemreferrerpolicyondragleaveondragoverondragst" +
+	"articleondropzonemptiedondurationchangeonendedonerroronfocus" +
+	"paceronhashchangeoninputmodeloninvalidonkeydownloadonkeypres" +
+	"spellcheckedonkeyupreloadonlanguagechangeonloadeddatalisting" +
+	"onloadedmetadatabindexonloadendonloadstartonmessageerroronmo" +
+	"usedownonmouseenteronmouseleaveonmousemoveonmouseoutputonmou" +
+	"seoveronmouseupromptonmousewheelonofflineononlineonpagehides" +
+	"classectionbluronpageshowbronpastepublicontenteditableonpaus" +
+	"emaponplayingonpopstateonprogressrcdocodeferonratechangeonre" +
 	"jectionhandledonresetonresizesrclangonscrollonsecuritypolicy" +
 	"violationauxclickonseekedonseekingonselectedonshowidth6onsor" +
 	"tableonstalledonstorageonsubmitemscopedonsuspendontoggleonun" +
diff --git a/vendor/golang.org/x/net/html/atom/table_test.go b/vendor/golang.org/x/net/html/atom/table_test.go
index 46d9d701..8a30762e 100644
--- a/vendor/golang.org/x/net/html/atom/table_test.go
+++ b/vendor/golang.org/x/net/html/atom/table_test.go
@@ -296,6 +296,7 @@ var testAtomList = []string{
 	"public",
 	"q",
 	"radiogroup",
+	"rb",
 	"readonly",
 	"referrerpolicy",
 	"rel",
@@ -305,6 +306,7 @@ var testAtomList = []string{
 	"rowspan",
 	"rp",
 	"rt",
+	"rtc",
 	"ruby",
 	"s",
 	"samp",
diff --git a/vendor/golang.org/x/net/html/entity.go b/vendor/golang.org/x/net/html/entity.go
index a50c04c6..b628880a 100644
--- a/vendor/golang.org/x/net/html/entity.go
+++ b/vendor/golang.org/x/net/html/entity.go
@@ -75,2083 +75,2083 @@ var entity = map[string]rune{
 	"Copf;":                            '\U00002102',
 	"Coproduct;":                       '\U00002210',
 	"CounterClockwiseContourIntegral;": '\U00002233',
-	"Cross;":                    '\U00002A2F',
-	"Cscr;":                     '\U0001D49E',
-	"Cup;":                      '\U000022D3',
-	"CupCap;":                   '\U0000224D',
-	"DD;":                       '\U00002145',
-	"DDotrahd;":                 '\U00002911',
-	"DJcy;":                     '\U00000402',
-	"DScy;":                     '\U00000405',
-	"DZcy;":                     '\U0000040F',
-	"Dagger;":                   '\U00002021',
-	"Darr;":                     '\U000021A1',
-	"Dashv;":                    '\U00002AE4',
-	"Dcaron;":                   '\U0000010E',
-	"Dcy;":                      '\U00000414',
-	"Del;":                      '\U00002207',
-	"Delta;":                    '\U00000394',
-	"Dfr;":                      '\U0001D507',
-	"DiacriticalAcute;":         '\U000000B4',
-	"DiacriticalDot;":           '\U000002D9',
-	"DiacriticalDoubleAcute;":   '\U000002DD',
-	"DiacriticalGrave;":         '\U00000060',
-	"DiacriticalTilde;":         '\U000002DC',
-	"Diamond;":                  '\U000022C4',
-	"DifferentialD;":            '\U00002146',
-	"Dopf;":                     '\U0001D53B',
-	"Dot;":                      '\U000000A8',
-	"DotDot;":                   '\U000020DC',
-	"DotEqual;":                 '\U00002250',
-	"DoubleContourIntegral;":    '\U0000222F',
-	"DoubleDot;":                '\U000000A8',
-	"DoubleDownArrow;":          '\U000021D3',
-	"DoubleLeftArrow;":          '\U000021D0',
-	"DoubleLeftRightArrow;":     '\U000021D4',
-	"DoubleLeftTee;":            '\U00002AE4',
-	"DoubleLongLeftArrow;":      '\U000027F8',
-	"DoubleLongLeftRightArrow;": '\U000027FA',
-	"DoubleLongRightArrow;":     '\U000027F9',
-	"DoubleRightArrow;":         '\U000021D2',
-	"DoubleRightTee;":           '\U000022A8',
-	"DoubleUpArrow;":            '\U000021D1',
-	"DoubleUpDownArrow;":        '\U000021D5',
-	"DoubleVerticalBar;":        '\U00002225',
-	"DownArrow;":                '\U00002193',
-	"DownArrowBar;":             '\U00002913',
-	"DownArrowUpArrow;":         '\U000021F5',
-	"DownBreve;":                '\U00000311',
-	"DownLeftRightVector;":      '\U00002950',
-	"DownLeftTeeVector;":        '\U0000295E',
-	"DownLeftVector;":           '\U000021BD',
-	"DownLeftVectorBar;":        '\U00002956',
-	"DownRightTeeVector;":       '\U0000295F',
-	"DownRightVector;":          '\U000021C1',
-	"DownRightVectorBar;":       '\U00002957',
-	"DownTee;":                  '\U000022A4',
-	"DownTeeArrow;":             '\U000021A7',
-	"Downarrow;":                '\U000021D3',
-	"Dscr;":                     '\U0001D49F',
-	"Dstrok;":                   '\U00000110',
-	"ENG;":                      '\U0000014A',
-	"ETH;":                      '\U000000D0',
-	"Eacute;":                   '\U000000C9',
-	"Ecaron;":                   '\U0000011A',
-	"Ecirc;":                    '\U000000CA',
-	"Ecy;":                      '\U0000042D',
-	"Edot;":                     '\U00000116',
-	"Efr;":                      '\U0001D508',
-	"Egrave;":                   '\U000000C8',
-	"Element;":                  '\U00002208',
-	"Emacr;":                    '\U00000112',
-	"EmptySmallSquare;":         '\U000025FB',
-	"EmptyVerySmallSquare;":     '\U000025AB',
-	"Eogon;":                    '\U00000118',
-	"Eopf;":                     '\U0001D53C',
-	"Epsilon;":                  '\U00000395',
-	"Equal;":                    '\U00002A75',
-	"EqualTilde;":               '\U00002242',
-	"Equilibrium;":              '\U000021CC',
-	"Escr;":                     '\U00002130',
-	"Esim;":                     '\U00002A73',
-	"Eta;":                      '\U00000397',
-	"Euml;":                     '\U000000CB',
-	"Exists;":                   '\U00002203',
-	"ExponentialE;":             '\U00002147',
-	"Fcy;":                      '\U00000424',
-	"Ffr;":                      '\U0001D509',
-	"FilledSmallSquare;":        '\U000025FC',
-	"FilledVerySmallSquare;":    '\U000025AA',
-	"Fopf;":                     '\U0001D53D',
-	"ForAll;":                   '\U00002200',
-	"Fouriertrf;":               '\U00002131',
-	"Fscr;":                     '\U00002131',
-	"GJcy;":                     '\U00000403',
-	"GT;":                       '\U0000003E',
-	"Gamma;":                    '\U00000393',
-	"Gammad;":                   '\U000003DC',
-	"Gbreve;":                   '\U0000011E',
-	"Gcedil;":                   '\U00000122',
-	"Gcirc;":                    '\U0000011C',
-	"Gcy;":                      '\U00000413',
-	"Gdot;":                     '\U00000120',
-	"Gfr;":                      '\U0001D50A',
-	"Gg;":                       '\U000022D9',
-	"Gopf;":                     '\U0001D53E',
-	"GreaterEqual;":             '\U00002265',
-	"GreaterEqualLess;":         '\U000022DB',
-	"GreaterFullEqual;":         '\U00002267',
-	"GreaterGreater;":           '\U00002AA2',
-	"GreaterLess;":              '\U00002277',
-	"GreaterSlantEqual;":        '\U00002A7E',
-	"GreaterTilde;":             '\U00002273',
-	"Gscr;":                     '\U0001D4A2',
-	"Gt;":                       '\U0000226B',
-	"HARDcy;":                   '\U0000042A',
-	"Hacek;":                    '\U000002C7',
-	"Hat;":                      '\U0000005E',
-	"Hcirc;":                    '\U00000124',
-	"Hfr;":                      '\U0000210C',
-	"HilbertSpace;":             '\U0000210B',
-	"Hopf;":                     '\U0000210D',
-	"HorizontalLine;":           '\U00002500',
-	"Hscr;":                     '\U0000210B',
-	"Hstrok;":                   '\U00000126',
-	"HumpDownHump;":             '\U0000224E',
-	"HumpEqual;":                '\U0000224F',
-	"IEcy;":                     '\U00000415',
-	"IJlig;":                    '\U00000132',
-	"IOcy;":                     '\U00000401',
-	"Iacute;":                   '\U000000CD',
-	"Icirc;":                    '\U000000CE',
-	"Icy;":                      '\U00000418',
-	"Idot;":                     '\U00000130',
-	"Ifr;":                      '\U00002111',
-	"Igrave;":                   '\U000000CC',
-	"Im;":                       '\U00002111',
-	"Imacr;":                    '\U0000012A',
-	"ImaginaryI;":               '\U00002148',
-	"Implies;":                  '\U000021D2',
-	"Int;":                      '\U0000222C',
-	"Integral;":                 '\U0000222B',
-	"Intersection;":             '\U000022C2',
-	"InvisibleComma;":           '\U00002063',
-	"InvisibleTimes;":           '\U00002062',
-	"Iogon;":                    '\U0000012E',
-	"Iopf;":                     '\U0001D540',
-	"Iota;":                     '\U00000399',
-	"Iscr;":                     '\U00002110',
-	"Itilde;":                   '\U00000128',
-	"Iukcy;":                    '\U00000406',
-	"Iuml;":                     '\U000000CF',
-	"Jcirc;":                    '\U00000134',
-	"Jcy;":                      '\U00000419',
-	"Jfr;":                      '\U0001D50D',
-	"Jopf;":                     '\U0001D541',
-	"Jscr;":                     '\U0001D4A5',
-	"Jsercy;":                   '\U00000408',
-	"Jukcy;":                    '\U00000404',
-	"KHcy;":                     '\U00000425',
-	"KJcy;":                     '\U0000040C',
-	"Kappa;":                    '\U0000039A',
-	"Kcedil;":                   '\U00000136',
-	"Kcy;":                      '\U0000041A',
-	"Kfr;":                      '\U0001D50E',
-	"Kopf;":                     '\U0001D542',
-	"Kscr;":                     '\U0001D4A6',
-	"LJcy;":                     '\U00000409',
-	"LT;":                       '\U0000003C',
-	"Lacute;":                   '\U00000139',
-	"Lambda;":                   '\U0000039B',
-	"Lang;":                     '\U000027EA',
-	"Laplacetrf;":               '\U00002112',
-	"Larr;":                     '\U0000219E',
-	"Lcaron;":                   '\U0000013D',
-	"Lcedil;":                   '\U0000013B',
-	"Lcy;":                      '\U0000041B',
-	"LeftAngleBracket;":         '\U000027E8',
-	"LeftArrow;":                '\U00002190',
-	"LeftArrowBar;":             '\U000021E4',
-	"LeftArrowRightArrow;":      '\U000021C6',
-	"LeftCeiling;":              '\U00002308',
-	"LeftDoubleBracket;":        '\U000027E6',
-	"LeftDownTeeVector;":        '\U00002961',
-	"LeftDownVector;":           '\U000021C3',
-	"LeftDownVectorBar;":        '\U00002959',
-	"LeftFloor;":                '\U0000230A',
-	"LeftRightArrow;":           '\U00002194',
-	"LeftRightVector;":          '\U0000294E',
-	"LeftTee;":                  '\U000022A3',
-	"LeftTeeArrow;":             '\U000021A4',
-	"LeftTeeVector;":            '\U0000295A',
-	"LeftTriangle;":             '\U000022B2',
-	"LeftTriangleBar;":          '\U000029CF',
-	"LeftTriangleEqual;":        '\U000022B4',
-	"LeftUpDownVector;":         '\U00002951',
-	"LeftUpTeeVector;":          '\U00002960',
-	"LeftUpVector;":             '\U000021BF',
-	"LeftUpVectorBar;":          '\U00002958',
-	"LeftVector;":               '\U000021BC',
-	"LeftVectorBar;":            '\U00002952',
-	"Leftarrow;":                '\U000021D0',
-	"Leftrightarrow;":           '\U000021D4',
-	"LessEqualGreater;":         '\U000022DA',
-	"LessFullEqual;":            '\U00002266',
-	"LessGreater;":              '\U00002276',
-	"LessLess;":                 '\U00002AA1',
-	"LessSlantEqual;":           '\U00002A7D',
-	"LessTilde;":                '\U00002272',
-	"Lfr;":                      '\U0001D50F',
-	"Ll;":                       '\U000022D8',
-	"Lleftarrow;":               '\U000021DA',
-	"Lmidot;":                   '\U0000013F',
-	"LongLeftArrow;":            '\U000027F5',
-	"LongLeftRightArrow;":       '\U000027F7',
-	"LongRightArrow;":           '\U000027F6',
-	"Longleftarrow;":            '\U000027F8',
-	"Longleftrightarrow;":       '\U000027FA',
-	"Longrightarrow;":           '\U000027F9',
-	"Lopf;":                     '\U0001D543',
-	"LowerLeftArrow;":           '\U00002199',
-	"LowerRightArrow;":          '\U00002198',
-	"Lscr;":                     '\U00002112',
-	"Lsh;":                      '\U000021B0',
-	"Lstrok;":                   '\U00000141',
-	"Lt;":                       '\U0000226A',
-	"Map;":                      '\U00002905',
-	"Mcy;":                      '\U0000041C',
-	"MediumSpace;":              '\U0000205F',
-	"Mellintrf;":                '\U00002133',
-	"Mfr;":                      '\U0001D510',
-	"MinusPlus;":                '\U00002213',
-	"Mopf;":                     '\U0001D544',
-	"Mscr;":                     '\U00002133',
-	"Mu;":                       '\U0000039C',
-	"NJcy;":                     '\U0000040A',
-	"Nacute;":                   '\U00000143',
-	"Ncaron;":                   '\U00000147',
-	"Ncedil;":                   '\U00000145',
-	"Ncy;":                      '\U0000041D',
-	"NegativeMediumSpace;":      '\U0000200B',
-	"NegativeThickSpace;":       '\U0000200B',
-	"NegativeThinSpace;":        '\U0000200B',
-	"NegativeVeryThinSpace;":    '\U0000200B',
-	"NestedGreaterGreater;":     '\U0000226B',
-	"NestedLessLess;":           '\U0000226A',
-	"NewLine;":                  '\U0000000A',
-	"Nfr;":                      '\U0001D511',
-	"NoBreak;":                  '\U00002060',
-	"NonBreakingSpace;":         '\U000000A0',
-	"Nopf;":                     '\U00002115',
-	"Not;":                      '\U00002AEC',
-	"NotCongruent;":             '\U00002262',
-	"NotCupCap;":                '\U0000226D',
-	"NotDoubleVerticalBar;":     '\U00002226',
-	"NotElement;":               '\U00002209',
-	"NotEqual;":                 '\U00002260',
-	"NotExists;":                '\U00002204',
-	"NotGreater;":               '\U0000226F',
-	"NotGreaterEqual;":          '\U00002271',
-	"NotGreaterLess;":           '\U00002279',
-	"NotGreaterTilde;":          '\U00002275',
-	"NotLeftTriangle;":          '\U000022EA',
-	"NotLeftTriangleEqual;":     '\U000022EC',
-	"NotLess;":                  '\U0000226E',
-	"NotLessEqual;":             '\U00002270',
-	"NotLessGreater;":           '\U00002278',
-	"NotLessTilde;":             '\U00002274',
-	"NotPrecedes;":              '\U00002280',
-	"NotPrecedesSlantEqual;":    '\U000022E0',
-	"NotReverseElement;":        '\U0000220C',
-	"NotRightTriangle;":         '\U000022EB',
-	"NotRightTriangleEqual;":    '\U000022ED',
-	"NotSquareSubsetEqual;":     '\U000022E2',
-	"NotSquareSupersetEqual;":   '\U000022E3',
-	"NotSubsetEqual;":           '\U00002288',
-	"NotSucceeds;":              '\U00002281',
-	"NotSucceedsSlantEqual;":    '\U000022E1',
-	"NotSupersetEqual;":         '\U00002289',
-	"NotTilde;":                 '\U00002241',
-	"NotTildeEqual;":            '\U00002244',
-	"NotTildeFullEqual;":        '\U00002247',
-	"NotTildeTilde;":            '\U00002249',
-	"NotVerticalBar;":           '\U00002224',
-	"Nscr;":                     '\U0001D4A9',
-	"Ntilde;":                   '\U000000D1',
-	"Nu;":                       '\U0000039D',
-	"OElig;":                    '\U00000152',
-	"Oacute;":                   '\U000000D3',
-	"Ocirc;":                    '\U000000D4',
-	"Ocy;":                      '\U0000041E',
-	"Odblac;":                   '\U00000150',
-	"Ofr;":                      '\U0001D512',
-	"Ograve;":                   '\U000000D2',
-	"Omacr;":                    '\U0000014C',
-	"Omega;":                    '\U000003A9',
-	"Omicron;":                  '\U0000039F',
-	"Oopf;":                     '\U0001D546',
-	"OpenCurlyDoubleQuote;":     '\U0000201C',
-	"OpenCurlyQuote;":           '\U00002018',
-	"Or;":                       '\U00002A54',
-	"Oscr;":                     '\U0001D4AA',
-	"Oslash;":                   '\U000000D8',
-	"Otilde;":                   '\U000000D5',
-	"Otimes;":                   '\U00002A37',
-	"Ouml;":                     '\U000000D6',
-	"OverBar;":                  '\U0000203E',
-	"OverBrace;":                '\U000023DE',
-	"OverBracket;":              '\U000023B4',
-	"OverParenthesis;":          '\U000023DC',
-	"PartialD;":                 '\U00002202',
-	"Pcy;":                      '\U0000041F',
-	"Pfr;":                      '\U0001D513',
-	"Phi;":                      '\U000003A6',
-	"Pi;":                       '\U000003A0',
-	"PlusMinus;":                '\U000000B1',
-	"Poincareplane;":            '\U0000210C',
-	"Popf;":                     '\U00002119',
-	"Pr;":                       '\U00002ABB',
-	"Precedes;":                 '\U0000227A',
-	"PrecedesEqual;":            '\U00002AAF',
-	"PrecedesSlantEqual;":       '\U0000227C',
-	"PrecedesTilde;":            '\U0000227E',
-	"Prime;":                    '\U00002033',
-	"Product;":                  '\U0000220F',
-	"Proportion;":               '\U00002237',
-	"Proportional;":             '\U0000221D',
-	"Pscr;":                     '\U0001D4AB',
-	"Psi;":                      '\U000003A8',
-	"QUOT;":                     '\U00000022',
-	"Qfr;":                      '\U0001D514',
-	"Qopf;":                     '\U0000211A',
-	"Qscr;":                     '\U0001D4AC',
-	"RBarr;":                    '\U00002910',
-	"REG;":                      '\U000000AE',
-	"Racute;":                   '\U00000154',
-	"Rang;":                     '\U000027EB',
-	"Rarr;":                     '\U000021A0',
-	"Rarrtl;":                   '\U00002916',
-	"Rcaron;":                   '\U00000158',
-	"Rcedil;":                   '\U00000156',
-	"Rcy;":                      '\U00000420',
-	"Re;":                       '\U0000211C',
-	"ReverseElement;":           '\U0000220B',
-	"ReverseEquilibrium;":       '\U000021CB',
-	"ReverseUpEquilibrium;":     '\U0000296F',
-	"Rfr;":                      '\U0000211C',
-	"Rho;":                      '\U000003A1',
-	"RightAngleBracket;":        '\U000027E9',
-	"RightArrow;":               '\U00002192',
-	"RightArrowBar;":            '\U000021E5',
-	"RightArrowLeftArrow;":      '\U000021C4',
-	"RightCeiling;":             '\U00002309',
-	"RightDoubleBracket;":       '\U000027E7',
-	"RightDownTeeVector;":       '\U0000295D',
-	"RightDownVector;":          '\U000021C2',
-	"RightDownVectorBar;":       '\U00002955',
-	"RightFloor;":               '\U0000230B',
-	"RightTee;":                 '\U000022A2',
-	"RightTeeArrow;":            '\U000021A6',
-	"RightTeeVector;":           '\U0000295B',
-	"RightTriangle;":            '\U000022B3',
-	"RightTriangleBar;":         '\U000029D0',
-	"RightTriangleEqual;":       '\U000022B5',
-	"RightUpDownVector;":        '\U0000294F',
-	"RightUpTeeVector;":         '\U0000295C',
-	"RightUpVector;":            '\U000021BE',
-	"RightUpVectorBar;":         '\U00002954',
-	"RightVector;":              '\U000021C0',
-	"RightVectorBar;":           '\U00002953',
-	"Rightarrow;":               '\U000021D2',
-	"Ropf;":                     '\U0000211D',
-	"RoundImplies;":             '\U00002970',
-	"Rrightarrow;":              '\U000021DB',
-	"Rscr;":                     '\U0000211B',
-	"Rsh;":                      '\U000021B1',
-	"RuleDelayed;":              '\U000029F4',
-	"SHCHcy;":                   '\U00000429',
-	"SHcy;":                     '\U00000428',
-	"SOFTcy;":                   '\U0000042C',
-	"Sacute;":                   '\U0000015A',
-	"Sc;":                       '\U00002ABC',
-	"Scaron;":                   '\U00000160',
-	"Scedil;":                   '\U0000015E',
-	"Scirc;":                    '\U0000015C',
-	"Scy;":                      '\U00000421',
-	"Sfr;":                      '\U0001D516',
-	"ShortDownArrow;":           '\U00002193',
-	"ShortLeftArrow;":           '\U00002190',
-	"ShortRightArrow;":          '\U00002192',
-	"ShortUpArrow;":             '\U00002191',
-	"Sigma;":                    '\U000003A3',
-	"SmallCircle;":              '\U00002218',
-	"Sopf;":                     '\U0001D54A',
-	"Sqrt;":                     '\U0000221A',
-	"Square;":                   '\U000025A1',
-	"SquareIntersection;":       '\U00002293',
-	"SquareSubset;":             '\U0000228F',
-	"SquareSubsetEqual;":        '\U00002291',
-	"SquareSuperset;":           '\U00002290',
-	"SquareSupersetEqual;":      '\U00002292',
-	"SquareUnion;":              '\U00002294',
-	"Sscr;":                     '\U0001D4AE',
-	"Star;":                     '\U000022C6',
-	"Sub;":                      '\U000022D0',
-	"Subset;":                   '\U000022D0',
-	"SubsetEqual;":              '\U00002286',
-	"Succeeds;":                 '\U0000227B',
-	"SucceedsEqual;":            '\U00002AB0',
-	"SucceedsSlantEqual;":       '\U0000227D',
-	"SucceedsTilde;":            '\U0000227F',
-	"SuchThat;":                 '\U0000220B',
-	"Sum;":                      '\U00002211',
-	"Sup;":                      '\U000022D1',
-	"Superset;":                 '\U00002283',
-	"SupersetEqual;":            '\U00002287',
-	"Supset;":                   '\U000022D1',
-	"THORN;":                    '\U000000DE',
-	"TRADE;":                    '\U00002122',
-	"TSHcy;":                    '\U0000040B',
-	"TScy;":                     '\U00000426',
-	"Tab;":                      '\U00000009',
-	"Tau;":                      '\U000003A4',
-	"Tcaron;":                   '\U00000164',
-	"Tcedil;":                   '\U00000162',
-	"Tcy;":                      '\U00000422',
-	"Tfr;":                      '\U0001D517',
-	"Therefore;":                '\U00002234',
-	"Theta;":                    '\U00000398',
-	"ThinSpace;":                '\U00002009',
-	"Tilde;":                    '\U0000223C',
-	"TildeEqual;":               '\U00002243',
-	"TildeFullEqual;":           '\U00002245',
-	"TildeTilde;":               '\U00002248',
-	"Topf;":                     '\U0001D54B',
-	"TripleDot;":                '\U000020DB',
-	"Tscr;":                     '\U0001D4AF',
-	"Tstrok;":                   '\U00000166',
-	"Uacute;":                   '\U000000DA',
-	"Uarr;":                     '\U0000219F',
-	"Uarrocir;":                 '\U00002949',
-	"Ubrcy;":                    '\U0000040E',
-	"Ubreve;":                   '\U0000016C',
-	"Ucirc;":                    '\U000000DB',
-	"Ucy;":                      '\U00000423',
-	"Udblac;":                   '\U00000170',
-	"Ufr;":                      '\U0001D518',
-	"Ugrave;":                   '\U000000D9',
-	"Umacr;":                    '\U0000016A',
-	"UnderBar;":                 '\U0000005F',
-	"UnderBrace;":               '\U000023DF',
-	"UnderBracket;":             '\U000023B5',
-	"UnderParenthesis;":         '\U000023DD',
-	"Union;":                    '\U000022C3',
-	"UnionPlus;":                '\U0000228E',
-	"Uogon;":                    '\U00000172',
-	"Uopf;":                     '\U0001D54C',
-	"UpArrow;":                  '\U00002191',
-	"UpArrowBar;":               '\U00002912',
-	"UpArrowDownArrow;":         '\U000021C5',
-	"UpDownArrow;":              '\U00002195',
-	"UpEquilibrium;":            '\U0000296E',
-	"UpTee;":                    '\U000022A5',
-	"UpTeeArrow;":               '\U000021A5',
-	"Uparrow;":                  '\U000021D1',
-	"Updownarrow;":              '\U000021D5',
-	"UpperLeftArrow;":           '\U00002196',
-	"UpperRightArrow;":          '\U00002197',
-	"Upsi;":                     '\U000003D2',
-	"Upsilon;":                  '\U000003A5',
-	"Uring;":                    '\U0000016E',
-	"Uscr;":                     '\U0001D4B0',
-	"Utilde;":                   '\U00000168',
-	"Uuml;":                     '\U000000DC',
-	"VDash;":                    '\U000022AB',
-	"Vbar;":                     '\U00002AEB',
-	"Vcy;":                      '\U00000412',
-	"Vdash;":                    '\U000022A9',
-	"Vdashl;":                   '\U00002AE6',
-	"Vee;":                      '\U000022C1',
-	"Verbar;":                   '\U00002016',
-	"Vert;":                     '\U00002016',
-	"VerticalBar;":              '\U00002223',
-	"VerticalLine;":             '\U0000007C',
-	"VerticalSeparator;":        '\U00002758',
-	"VerticalTilde;":            '\U00002240',
-	"VeryThinSpace;":            '\U0000200A',
-	"Vfr;":                      '\U0001D519',
-	"Vopf;":                     '\U0001D54D',
-	"Vscr;":                     '\U0001D4B1',
-	"Vvdash;":                   '\U000022AA',
-	"Wcirc;":                    '\U00000174',
-	"Wedge;":                    '\U000022C0',
-	"Wfr;":                      '\U0001D51A',
-	"Wopf;":                     '\U0001D54E',
-	"Wscr;":                     '\U0001D4B2',
-	"Xfr;":                      '\U0001D51B',
-	"Xi;":                       '\U0000039E',
-	"Xopf;":                     '\U0001D54F',
-	"Xscr;":                     '\U0001D4B3',
-	"YAcy;":                     '\U0000042F',
-	"YIcy;":                     '\U00000407',
-	"YUcy;":                     '\U0000042E',
-	"Yacute;":                   '\U000000DD',
-	"Ycirc;":                    '\U00000176',
-	"Ycy;":                      '\U0000042B',
-	"Yfr;":                      '\U0001D51C',
-	"Yopf;":                     '\U0001D550',
-	"Yscr;":                     '\U0001D4B4',
-	"Yuml;":                     '\U00000178',
-	"ZHcy;":                     '\U00000416',
-	"Zacute;":                   '\U00000179',
-	"Zcaron;":                   '\U0000017D',
-	"Zcy;":                      '\U00000417',
-	"Zdot;":                     '\U0000017B',
-	"ZeroWidthSpace;":           '\U0000200B',
-	"Zeta;":                     '\U00000396',
-	"Zfr;":                      '\U00002128',
-	"Zopf;":                     '\U00002124',
-	"Zscr;":                     '\U0001D4B5',
-	"aacute;":                   '\U000000E1',
-	"abreve;":                   '\U00000103',
-	"ac;":                       '\U0000223E',
-	"acd;":                      '\U0000223F',
-	"acirc;":                    '\U000000E2',
-	"acute;":                    '\U000000B4',
-	"acy;":                      '\U00000430',
-	"aelig;":                    '\U000000E6',
-	"af;":                       '\U00002061',
-	"afr;":                      '\U0001D51E',
-	"agrave;":                   '\U000000E0',
-	"alefsym;":                  '\U00002135',
-	"aleph;":                    '\U00002135',
-	"alpha;":                    '\U000003B1',
-	"amacr;":                    '\U00000101',
-	"amalg;":                    '\U00002A3F',
-	"amp;":                      '\U00000026',
-	"and;":                      '\U00002227',
-	"andand;":                   '\U00002A55',
-	"andd;":                     '\U00002A5C',
-	"andslope;":                 '\U00002A58',
-	"andv;":                     '\U00002A5A',
-	"ang;":                      '\U00002220',
-	"ange;":                     '\U000029A4',
-	"angle;":                    '\U00002220',
-	"angmsd;":                   '\U00002221',
-	"angmsdaa;":                 '\U000029A8',
-	"angmsdab;":                 '\U000029A9',
-	"angmsdac;":                 '\U000029AA',
-	"angmsdad;":                 '\U000029AB',
-	"angmsdae;":                 '\U000029AC',
-	"angmsdaf;":                 '\U000029AD',
-	"angmsdag;":                 '\U000029AE',
-	"angmsdah;":                 '\U000029AF',
-	"angrt;":                    '\U0000221F',
-	"angrtvb;":                  '\U000022BE',
-	"angrtvbd;":                 '\U0000299D',
-	"angsph;":                   '\U00002222',
-	"angst;":                    '\U000000C5',
-	"angzarr;":                  '\U0000237C',
-	"aogon;":                    '\U00000105',
-	"aopf;":                     '\U0001D552',
-	"ap;":                       '\U00002248',
-	"apE;":                      '\U00002A70',
-	"apacir;":                   '\U00002A6F',
-	"ape;":                      '\U0000224A',
-	"apid;":                     '\U0000224B',
-	"apos;":                     '\U00000027',
-	"approx;":                   '\U00002248',
-	"approxeq;":                 '\U0000224A',
-	"aring;":                    '\U000000E5',
-	"ascr;":                     '\U0001D4B6',
-	"ast;":                      '\U0000002A',
-	"asymp;":                    '\U00002248',
-	"asympeq;":                  '\U0000224D',
-	"atilde;":                   '\U000000E3',
-	"auml;":                     '\U000000E4',
-	"awconint;":                 '\U00002233',
-	"awint;":                    '\U00002A11',
-	"bNot;":                     '\U00002AED',
-	"backcong;":                 '\U0000224C',
-	"backepsilon;":              '\U000003F6',
-	"backprime;":                '\U00002035',
-	"backsim;":                  '\U0000223D',
-	"backsimeq;":                '\U000022CD',
-	"barvee;":                   '\U000022BD',
-	"barwed;":                   '\U00002305',
-	"barwedge;":                 '\U00002305',
-	"bbrk;":                     '\U000023B5',
-	"bbrktbrk;":                 '\U000023B6',
-	"bcong;":                    '\U0000224C',
-	"bcy;":                      '\U00000431',
-	"bdquo;":                    '\U0000201E',
-	"becaus;":                   '\U00002235',
-	"because;":                  '\U00002235',
-	"bemptyv;":                  '\U000029B0',
-	"bepsi;":                    '\U000003F6',
-	"bernou;":                   '\U0000212C',
-	"beta;":                     '\U000003B2',
-	"beth;":                     '\U00002136',
-	"between;":                  '\U0000226C',
-	"bfr;":                      '\U0001D51F',
-	"bigcap;":                   '\U000022C2',
-	"bigcirc;":                  '\U000025EF',
-	"bigcup;":                   '\U000022C3',
-	"bigodot;":                  '\U00002A00',
-	"bigoplus;":                 '\U00002A01',
-	"bigotimes;":                '\U00002A02',
-	"bigsqcup;":                 '\U00002A06',
-	"bigstar;":                  '\U00002605',
-	"bigtriangledown;":          '\U000025BD',
-	"bigtriangleup;":            '\U000025B3',
-	"biguplus;":                 '\U00002A04',
-	"bigvee;":                   '\U000022C1',
-	"bigwedge;":                 '\U000022C0',
-	"bkarow;":                   '\U0000290D',
-	"blacklozenge;":             '\U000029EB',
-	"blacksquare;":              '\U000025AA',
-	"blacktriangle;":            '\U000025B4',
-	"blacktriangledown;":        '\U000025BE',
-	"blacktriangleleft;":        '\U000025C2',
-	"blacktriangleright;":       '\U000025B8',
-	"blank;":                    '\U00002423',
-	"blk12;":                    '\U00002592',
-	"blk14;":                    '\U00002591',
-	"blk34;":                    '\U00002593',
-	"block;":                    '\U00002588',
-	"bnot;":                     '\U00002310',
-	"bopf;":                     '\U0001D553',
-	"bot;":                      '\U000022A5',
-	"bottom;":                   '\U000022A5',
-	"bowtie;":                   '\U000022C8',
-	"boxDL;":                    '\U00002557',
-	"boxDR;":                    '\U00002554',
-	"boxDl;":                    '\U00002556',
-	"boxDr;":                    '\U00002553',
-	"boxH;":                     '\U00002550',
-	"boxHD;":                    '\U00002566',
-	"boxHU;":                    '\U00002569',
-	"boxHd;":                    '\U00002564',
-	"boxHu;":                    '\U00002567',
-	"boxUL;":                    '\U0000255D',
-	"boxUR;":                    '\U0000255A',
-	"boxUl;":                    '\U0000255C',
-	"boxUr;":                    '\U00002559',
-	"boxV;":                     '\U00002551',
-	"boxVH;":                    '\U0000256C',
-	"boxVL;":                    '\U00002563',
-	"boxVR;":                    '\U00002560',
-	"boxVh;":                    '\U0000256B',
-	"boxVl;":                    '\U00002562',
-	"boxVr;":                    '\U0000255F',
-	"boxbox;":                   '\U000029C9',
-	"boxdL;":                    '\U00002555',
-	"boxdR;":                    '\U00002552',
-	"boxdl;":                    '\U00002510',
-	"boxdr;":                    '\U0000250C',
-	"boxh;":                     '\U00002500',
-	"boxhD;":                    '\U00002565',
-	"boxhU;":                    '\U00002568',
-	"boxhd;":                    '\U0000252C',
-	"boxhu;":                    '\U00002534',
-	"boxminus;":                 '\U0000229F',
-	"boxplus;":                  '\U0000229E',
-	"boxtimes;":                 '\U000022A0',
-	"boxuL;":                    '\U0000255B',
-	"boxuR;":                    '\U00002558',
-	"boxul;":                    '\U00002518',
-	"boxur;":                    '\U00002514',
-	"boxv;":                     '\U00002502',
-	"boxvH;":                    '\U0000256A',
-	"boxvL;":                    '\U00002561',
-	"boxvR;":                    '\U0000255E',
-	"boxvh;":                    '\U0000253C',
-	"boxvl;":                    '\U00002524',
-	"boxvr;":                    '\U0000251C',
-	"bprime;":                   '\U00002035',
-	"breve;":                    '\U000002D8',
-	"brvbar;":                   '\U000000A6',
-	"bscr;":                     '\U0001D4B7',
-	"bsemi;":                    '\U0000204F',
-	"bsim;":                     '\U0000223D',
-	"bsime;":                    '\U000022CD',
-	"bsol;":                     '\U0000005C',
-	"bsolb;":                    '\U000029C5',
-	"bsolhsub;":                 '\U000027C8',
-	"bull;":                     '\U00002022',
-	"bullet;":                   '\U00002022',
-	"bump;":                     '\U0000224E',
-	"bumpE;":                    '\U00002AAE',
-	"bumpe;":                    '\U0000224F',
-	"bumpeq;":                   '\U0000224F',
-	"cacute;":                   '\U00000107',
-	"cap;":                      '\U00002229',
-	"capand;":                   '\U00002A44',
-	"capbrcup;":                 '\U00002A49',
-	"capcap;":                   '\U00002A4B',
-	"capcup;":                   '\U00002A47',
-	"capdot;":                   '\U00002A40',
-	"caret;":                    '\U00002041',
-	"caron;":                    '\U000002C7',
-	"ccaps;":                    '\U00002A4D',
-	"ccaron;":                   '\U0000010D',
-	"ccedil;":                   '\U000000E7',
-	"ccirc;":                    '\U00000109',
-	"ccups;":                    '\U00002A4C',
-	"ccupssm;":                  '\U00002A50',
-	"cdot;":                     '\U0000010B',
-	"cedil;":                    '\U000000B8',
-	"cemptyv;":                  '\U000029B2',
-	"cent;":                     '\U000000A2',
-	"centerdot;":                '\U000000B7',
-	"cfr;":                      '\U0001D520',
-	"chcy;":                     '\U00000447',
-	"check;":                    '\U00002713',
-	"checkmark;":                '\U00002713',
-	"chi;":                      '\U000003C7',
-	"cir;":                      '\U000025CB',
-	"cirE;":                     '\U000029C3',
-	"circ;":                     '\U000002C6',
-	"circeq;":                   '\U00002257',
-	"circlearrowleft;":          '\U000021BA',
-	"circlearrowright;":         '\U000021BB',
-	"circledR;":                 '\U000000AE',
-	"circledS;":                 '\U000024C8',
-	"circledast;":               '\U0000229B',
-	"circledcirc;":              '\U0000229A',
-	"circleddash;":              '\U0000229D',
-	"cire;":                     '\U00002257',
-	"cirfnint;":                 '\U00002A10',
-	"cirmid;":                   '\U00002AEF',
-	"cirscir;":                  '\U000029C2',
-	"clubs;":                    '\U00002663',
-	"clubsuit;":                 '\U00002663',
-	"colon;":                    '\U0000003A',
-	"colone;":                   '\U00002254',
-	"coloneq;":                  '\U00002254',
-	"comma;":                    '\U0000002C',
-	"commat;":                   '\U00000040',
-	"comp;":                     '\U00002201',
-	"compfn;":                   '\U00002218',
-	"complement;":               '\U00002201',
-	"complexes;":                '\U00002102',
-	"cong;":                     '\U00002245',
-	"congdot;":                  '\U00002A6D',
-	"conint;":                   '\U0000222E',
-	"copf;":                     '\U0001D554',
-	"coprod;":                   '\U00002210',
-	"copy;":                     '\U000000A9',
-	"copysr;":                   '\U00002117',
-	"crarr;":                    '\U000021B5',
-	"cross;":                    '\U00002717',
-	"cscr;":                     '\U0001D4B8',
-	"csub;":                     '\U00002ACF',
-	"csube;":                    '\U00002AD1',
-	"csup;":                     '\U00002AD0',
-	"csupe;":                    '\U00002AD2',
-	"ctdot;":                    '\U000022EF',
-	"cudarrl;":                  '\U00002938',
-	"cudarrr;":                  '\U00002935',
-	"cuepr;":                    '\U000022DE',
-	"cuesc;":                    '\U000022DF',
-	"cularr;":                   '\U000021B6',
-	"cularrp;":                  '\U0000293D',
-	"cup;":                      '\U0000222A',
-	"cupbrcap;":                 '\U00002A48',
-	"cupcap;":                   '\U00002A46',
-	"cupcup;":                   '\U00002A4A',
-	"cupdot;":                   '\U0000228D',
-	"cupor;":                    '\U00002A45',
-	"curarr;":                   '\U000021B7',
-	"curarrm;":                  '\U0000293C',
-	"curlyeqprec;":              '\U000022DE',
-	"curlyeqsucc;":              '\U000022DF',
-	"curlyvee;":                 '\U000022CE',
-	"curlywedge;":               '\U000022CF',
-	"curren;":                   '\U000000A4',
-	"curvearrowleft;":           '\U000021B6',
-	"curvearrowright;":          '\U000021B7',
-	"cuvee;":                    '\U000022CE',
-	"cuwed;":                    '\U000022CF',
-	"cwconint;":                 '\U00002232',
-	"cwint;":                    '\U00002231',
-	"cylcty;":                   '\U0000232D',
-	"dArr;":                     '\U000021D3',
-	"dHar;":                     '\U00002965',
-	"dagger;":                   '\U00002020',
-	"daleth;":                   '\U00002138',
-	"darr;":                     '\U00002193',
-	"dash;":                     '\U00002010',
-	"dashv;":                    '\U000022A3',
-	"dbkarow;":                  '\U0000290F',
-	"dblac;":                    '\U000002DD',
-	"dcaron;":                   '\U0000010F',
-	"dcy;":                      '\U00000434',
-	"dd;":                       '\U00002146',
-	"ddagger;":                  '\U00002021',
-	"ddarr;":                    '\U000021CA',
-	"ddotseq;":                  '\U00002A77',
-	"deg;":                      '\U000000B0',
-	"delta;":                    '\U000003B4',
-	"demptyv;":                  '\U000029B1',
-	"dfisht;":                   '\U0000297F',
-	"dfr;":                      '\U0001D521',
-	"dharl;":                    '\U000021C3',
-	"dharr;":                    '\U000021C2',
-	"diam;":                     '\U000022C4',
-	"diamond;":                  '\U000022C4',
-	"diamondsuit;":              '\U00002666',
-	"diams;":                    '\U00002666',
-	"die;":                      '\U000000A8',
-	"digamma;":                  '\U000003DD',
-	"disin;":                    '\U000022F2',
-	"div;":                      '\U000000F7',
-	"divide;":                   '\U000000F7',
-	"divideontimes;":            '\U000022C7',
-	"divonx;":                   '\U000022C7',
-	"djcy;":                     '\U00000452',
-	"dlcorn;":                   '\U0000231E',
-	"dlcrop;":                   '\U0000230D',
-	"dollar;":                   '\U00000024',
-	"dopf;":                     '\U0001D555',
-	"dot;":                      '\U000002D9',
-	"doteq;":                    '\U00002250',
-	"doteqdot;":                 '\U00002251',
-	"dotminus;":                 '\U00002238',
-	"dotplus;":                  '\U00002214',
-	"dotsquare;":                '\U000022A1',
-	"doublebarwedge;":           '\U00002306',
-	"downarrow;":                '\U00002193',
-	"downdownarrows;":           '\U000021CA',
-	"downharpoonleft;":          '\U000021C3',
-	"downharpoonright;":         '\U000021C2',
-	"drbkarow;":                 '\U00002910',
-	"drcorn;":                   '\U0000231F',
-	"drcrop;":                   '\U0000230C',
-	"dscr;":                     '\U0001D4B9',
-	"dscy;":                     '\U00000455',
-	"dsol;":                     '\U000029F6',
-	"dstrok;":                   '\U00000111',
-	"dtdot;":                    '\U000022F1',
-	"dtri;":                     '\U000025BF',
-	"dtrif;":                    '\U000025BE',
-	"duarr;":                    '\U000021F5',
-	"duhar;":                    '\U0000296F',
-	"dwangle;":                  '\U000029A6',
-	"dzcy;":                     '\U0000045F',
-	"dzigrarr;":                 '\U000027FF',
-	"eDDot;":                    '\U00002A77',
-	"eDot;":                     '\U00002251',
-	"eacute;":                   '\U000000E9',
-	"easter;":                   '\U00002A6E',
-	"ecaron;":                   '\U0000011B',
-	"ecir;":                     '\U00002256',
-	"ecirc;":                    '\U000000EA',
-	"ecolon;":                   '\U00002255',
-	"ecy;":                      '\U0000044D',
-	"edot;":                     '\U00000117',
-	"ee;":                       '\U00002147',
-	"efDot;":                    '\U00002252',
-	"efr;":                      '\U0001D522',
-	"eg;":                       '\U00002A9A',
-	"egrave;":                   '\U000000E8',
-	"egs;":                      '\U00002A96',
-	"egsdot;":                   '\U00002A98',
-	"el;":                       '\U00002A99',
-	"elinters;":                 '\U000023E7',
-	"ell;":                      '\U00002113',
-	"els;":                      '\U00002A95',
-	"elsdot;":                   '\U00002A97',
-	"emacr;":                    '\U00000113',
-	"empty;":                    '\U00002205',
-	"emptyset;":                 '\U00002205',
-	"emptyv;":                   '\U00002205',
-	"emsp;":                     '\U00002003',
-	"emsp13;":                   '\U00002004',
-	"emsp14;":                   '\U00002005',
-	"eng;":                      '\U0000014B',
-	"ensp;":                     '\U00002002',
-	"eogon;":                    '\U00000119',
-	"eopf;":                     '\U0001D556',
-	"epar;":                     '\U000022D5',
-	"eparsl;":                   '\U000029E3',
-	"eplus;":                    '\U00002A71',
-	"epsi;":                     '\U000003B5',
-	"epsilon;":                  '\U000003B5',
-	"epsiv;":                    '\U000003F5',
-	"eqcirc;":                   '\U00002256',
-	"eqcolon;":                  '\U00002255',
-	"eqsim;":                    '\U00002242',
-	"eqslantgtr;":               '\U00002A96',
-	"eqslantless;":              '\U00002A95',
-	"equals;":                   '\U0000003D',
-	"equest;":                   '\U0000225F',
-	"equiv;":                    '\U00002261',
-	"equivDD;":                  '\U00002A78',
-	"eqvparsl;":                 '\U000029E5',
-	"erDot;":                    '\U00002253',
-	"erarr;":                    '\U00002971',
-	"escr;":                     '\U0000212F',
-	"esdot;":                    '\U00002250',
-	"esim;":                     '\U00002242',
-	"eta;":                      '\U000003B7',
-	"eth;":                      '\U000000F0',
-	"euml;":                     '\U000000EB',
-	"euro;":                     '\U000020AC',
-	"excl;":                     '\U00000021',
-	"exist;":                    '\U00002203',
-	"expectation;":              '\U00002130',
-	"exponentiale;":             '\U00002147',
-	"fallingdotseq;":            '\U00002252',
-	"fcy;":                      '\U00000444',
-	"female;":                   '\U00002640',
-	"ffilig;":                   '\U0000FB03',
-	"fflig;":                    '\U0000FB00',
-	"ffllig;":                   '\U0000FB04',
-	"ffr;":                      '\U0001D523',
-	"filig;":                    '\U0000FB01',
-	"flat;":                     '\U0000266D',
-	"fllig;":                    '\U0000FB02',
-	"fltns;":                    '\U000025B1',
-	"fnof;":                     '\U00000192',
-	"fopf;":                     '\U0001D557',
-	"forall;":                   '\U00002200',
-	"fork;":                     '\U000022D4',
-	"forkv;":                    '\U00002AD9',
-	"fpartint;":                 '\U00002A0D',
-	"frac12;":                   '\U000000BD',
-	"frac13;":                   '\U00002153',
-	"frac14;":                   '\U000000BC',
-	"frac15;":                   '\U00002155',
-	"frac16;":                   '\U00002159',
-	"frac18;":                   '\U0000215B',
-	"frac23;":                   '\U00002154',
-	"frac25;":                   '\U00002156',
-	"frac34;":                   '\U000000BE',
-	"frac35;":                   '\U00002157',
-	"frac38;":                   '\U0000215C',
-	"frac45;":                   '\U00002158',
-	"frac56;":                   '\U0000215A',
-	"frac58;":                   '\U0000215D',
-	"frac78;":                   '\U0000215E',
-	"frasl;":                    '\U00002044',
-	"frown;":                    '\U00002322',
-	"fscr;":                     '\U0001D4BB',
-	"gE;":                       '\U00002267',
-	"gEl;":                      '\U00002A8C',
-	"gacute;":                   '\U000001F5',
-	"gamma;":                    '\U000003B3',
-	"gammad;":                   '\U000003DD',
-	"gap;":                      '\U00002A86',
-	"gbreve;":                   '\U0000011F',
-	"gcirc;":                    '\U0000011D',
-	"gcy;":                      '\U00000433',
-	"gdot;":                     '\U00000121',
-	"ge;":                       '\U00002265',
-	"gel;":                      '\U000022DB',
-	"geq;":                      '\U00002265',
-	"geqq;":                     '\U00002267',
-	"geqslant;":                 '\U00002A7E',
-	"ges;":                      '\U00002A7E',
-	"gescc;":                    '\U00002AA9',
-	"gesdot;":                   '\U00002A80',
-	"gesdoto;":                  '\U00002A82',
-	"gesdotol;":                 '\U00002A84',
-	"gesles;":                   '\U00002A94',
-	"gfr;":                      '\U0001D524',
-	"gg;":                       '\U0000226B',
-	"ggg;":                      '\U000022D9',
-	"gimel;":                    '\U00002137',
-	"gjcy;":                     '\U00000453',
-	"gl;":                       '\U00002277',
-	"glE;":                      '\U00002A92',
-	"gla;":                      '\U00002AA5',
-	"glj;":                      '\U00002AA4',
-	"gnE;":                      '\U00002269',
-	"gnap;":                     '\U00002A8A',
-	"gnapprox;":                 '\U00002A8A',
-	"gne;":                      '\U00002A88',
-	"gneq;":                     '\U00002A88',
-	"gneqq;":                    '\U00002269',
-	"gnsim;":                    '\U000022E7',
-	"gopf;":                     '\U0001D558',
-	"grave;":                    '\U00000060',
-	"gscr;":                     '\U0000210A',
-	"gsim;":                     '\U00002273',
-	"gsime;":                    '\U00002A8E',
-	"gsiml;":                    '\U00002A90',
-	"gt;":                       '\U0000003E',
-	"gtcc;":                     '\U00002AA7',
-	"gtcir;":                    '\U00002A7A',
-	"gtdot;":                    '\U000022D7',
-	"gtlPar;":                   '\U00002995',
-	"gtquest;":                  '\U00002A7C',
-	"gtrapprox;":                '\U00002A86',
-	"gtrarr;":                   '\U00002978',
-	"gtrdot;":                   '\U000022D7',
-	"gtreqless;":                '\U000022DB',
-	"gtreqqless;":               '\U00002A8C',
-	"gtrless;":                  '\U00002277',
-	"gtrsim;":                   '\U00002273',
-	"hArr;":                     '\U000021D4',
-	"hairsp;":                   '\U0000200A',
-	"half;":                     '\U000000BD',
-	"hamilt;":                   '\U0000210B',
-	"hardcy;":                   '\U0000044A',
-	"harr;":                     '\U00002194',
-	"harrcir;":                  '\U00002948',
-	"harrw;":                    '\U000021AD',
-	"hbar;":                     '\U0000210F',
-	"hcirc;":                    '\U00000125',
-	"hearts;":                   '\U00002665',
-	"heartsuit;":                '\U00002665',
-	"hellip;":                   '\U00002026',
-	"hercon;":                   '\U000022B9',
-	"hfr;":                      '\U0001D525',
-	"hksearow;":                 '\U00002925',
-	"hkswarow;":                 '\U00002926',
-	"hoarr;":                    '\U000021FF',
-	"homtht;":                   '\U0000223B',
-	"hookleftarrow;":            '\U000021A9',
-	"hookrightarrow;":           '\U000021AA',
-	"hopf;":                     '\U0001D559',
-	"horbar;":                   '\U00002015',
-	"hscr;":                     '\U0001D4BD',
-	"hslash;":                   '\U0000210F',
-	"hstrok;":                   '\U00000127',
-	"hybull;":                   '\U00002043',
-	"hyphen;":                   '\U00002010',
-	"iacute;":                   '\U000000ED',
-	"ic;":                       '\U00002063',
-	"icirc;":                    '\U000000EE',
-	"icy;":                      '\U00000438',
-	"iecy;":                     '\U00000435',
-	"iexcl;":                    '\U000000A1',
-	"iff;":                      '\U000021D4',
-	"ifr;":                      '\U0001D526',
-	"igrave;":                   '\U000000EC',
-	"ii;":                       '\U00002148',
-	"iiiint;":                   '\U00002A0C',
-	"iiint;":                    '\U0000222D',
-	"iinfin;":                   '\U000029DC',
-	"iiota;":                    '\U00002129',
-	"ijlig;":                    '\U00000133',
-	"imacr;":                    '\U0000012B',
-	"image;":                    '\U00002111',
-	"imagline;":                 '\U00002110',
-	"imagpart;":                 '\U00002111',
-	"imath;":                    '\U00000131',
-	"imof;":                     '\U000022B7',
-	"imped;":                    '\U000001B5',
-	"in;":                       '\U00002208',
-	"incare;":                   '\U00002105',
-	"infin;":                    '\U0000221E',
-	"infintie;":                 '\U000029DD',
-	"inodot;":                   '\U00000131',
-	"int;":                      '\U0000222B',
-	"intcal;":                   '\U000022BA',
-	"integers;":                 '\U00002124',
-	"intercal;":                 '\U000022BA',
-	"intlarhk;":                 '\U00002A17',
-	"intprod;":                  '\U00002A3C',
-	"iocy;":                     '\U00000451',
-	"iogon;":                    '\U0000012F',
-	"iopf;":                     '\U0001D55A',
-	"iota;":                     '\U000003B9',
-	"iprod;":                    '\U00002A3C',
-	"iquest;":                   '\U000000BF',
-	"iscr;":                     '\U0001D4BE',
-	"isin;":                     '\U00002208',
-	"isinE;":                    '\U000022F9',
-	"isindot;":                  '\U000022F5',
-	"isins;":                    '\U000022F4',
-	"isinsv;":                   '\U000022F3',
-	"isinv;":                    '\U00002208',
-	"it;":                       '\U00002062',
-	"itilde;":                   '\U00000129',
-	"iukcy;":                    '\U00000456',
-	"iuml;":                     '\U000000EF',
-	"jcirc;":                    '\U00000135',
-	"jcy;":                      '\U00000439',
-	"jfr;":                      '\U0001D527',
-	"jmath;":                    '\U00000237',
-	"jopf;":                     '\U0001D55B',
-	"jscr;":                     '\U0001D4BF',
-	"jsercy;":                   '\U00000458',
-	"jukcy;":                    '\U00000454',
-	"kappa;":                    '\U000003BA',
-	"kappav;":                   '\U000003F0',
-	"kcedil;":                   '\U00000137',
-	"kcy;":                      '\U0000043A',
-	"kfr;":                      '\U0001D528',
-	"kgreen;":                   '\U00000138',
-	"khcy;":                     '\U00000445',
-	"kjcy;":                     '\U0000045C',
-	"kopf;":                     '\U0001D55C',
-	"kscr;":                     '\U0001D4C0',
-	"lAarr;":                    '\U000021DA',
-	"lArr;":                     '\U000021D0',
-	"lAtail;":                   '\U0000291B',
-	"lBarr;":                    '\U0000290E',
-	"lE;":                       '\U00002266',
-	"lEg;":                      '\U00002A8B',
-	"lHar;":                     '\U00002962',
-	"lacute;":                   '\U0000013A',
-	"laemptyv;":                 '\U000029B4',
-	"lagran;":                   '\U00002112',
-	"lambda;":                   '\U000003BB',
-	"lang;":                     '\U000027E8',
-	"langd;":                    '\U00002991',
-	"langle;":                   '\U000027E8',
-	"lap;":                      '\U00002A85',
-	"laquo;":                    '\U000000AB',
-	"larr;":                     '\U00002190',
-	"larrb;":                    '\U000021E4',
-	"larrbfs;":                  '\U0000291F',
-	"larrfs;":                   '\U0000291D',
-	"larrhk;":                   '\U000021A9',
-	"larrlp;":                   '\U000021AB',
-	"larrpl;":                   '\U00002939',
-	"larrsim;":                  '\U00002973',
-	"larrtl;":                   '\U000021A2',
-	"lat;":                      '\U00002AAB',
-	"latail;":                   '\U00002919',
-	"late;":                     '\U00002AAD',
-	"lbarr;":                    '\U0000290C',
-	"lbbrk;":                    '\U00002772',
-	"lbrace;":                   '\U0000007B',
-	"lbrack;":                   '\U0000005B',
-	"lbrke;":                    '\U0000298B',
-	"lbrksld;":                  '\U0000298F',
-	"lbrkslu;":                  '\U0000298D',
-	"lcaron;":                   '\U0000013E',
-	"lcedil;":                   '\U0000013C',
-	"lceil;":                    '\U00002308',
-	"lcub;":                     '\U0000007B',
-	"lcy;":                      '\U0000043B',
-	"ldca;":                     '\U00002936',
-	"ldquo;":                    '\U0000201C',
-	"ldquor;":                   '\U0000201E',
-	"ldrdhar;":                  '\U00002967',
-	"ldrushar;":                 '\U0000294B',
-	"ldsh;":                     '\U000021B2',
-	"le;":                       '\U00002264',
-	"leftarrow;":                '\U00002190',
-	"leftarrowtail;":            '\U000021A2',
-	"leftharpoondown;":          '\U000021BD',
-	"leftharpoonup;":            '\U000021BC',
-	"leftleftarrows;":           '\U000021C7',
-	"leftrightarrow;":           '\U00002194',
-	"leftrightarrows;":          '\U000021C6',
-	"leftrightharpoons;":        '\U000021CB',
-	"leftrightsquigarrow;":      '\U000021AD',
-	"leftthreetimes;":           '\U000022CB',
-	"leg;":                      '\U000022DA',
-	"leq;":                      '\U00002264',
-	"leqq;":                     '\U00002266',
-	"leqslant;":                 '\U00002A7D',
-	"les;":                      '\U00002A7D',
-	"lescc;":                    '\U00002AA8',
-	"lesdot;":                   '\U00002A7F',
-	"lesdoto;":                  '\U00002A81',
-	"lesdotor;":                 '\U00002A83',
-	"lesges;":                   '\U00002A93',
-	"lessapprox;":               '\U00002A85',
-	"lessdot;":                  '\U000022D6',
-	"lesseqgtr;":                '\U000022DA',
-	"lesseqqgtr;":               '\U00002A8B',
-	"lessgtr;":                  '\U00002276',
-	"lesssim;":                  '\U00002272',
-	"lfisht;":                   '\U0000297C',
-	"lfloor;":                   '\U0000230A',
-	"lfr;":                      '\U0001D529',
-	"lg;":                       '\U00002276',
-	"lgE;":                      '\U00002A91',
-	"lhard;":                    '\U000021BD',
-	"lharu;":                    '\U000021BC',
-	"lharul;":                   '\U0000296A',
-	"lhblk;":                    '\U00002584',
-	"ljcy;":                     '\U00000459',
-	"ll;":                       '\U0000226A',
-	"llarr;":                    '\U000021C7',
-	"llcorner;":                 '\U0000231E',
-	"llhard;":                   '\U0000296B',
-	"lltri;":                    '\U000025FA',
-	"lmidot;":                   '\U00000140',
-	"lmoust;":                   '\U000023B0',
-	"lmoustache;":               '\U000023B0',
-	"lnE;":                      '\U00002268',
-	"lnap;":                     '\U00002A89',
-	"lnapprox;":                 '\U00002A89',
-	"lne;":                      '\U00002A87',
-	"lneq;":                     '\U00002A87',
-	"lneqq;":                    '\U00002268',
-	"lnsim;":                    '\U000022E6',
-	"loang;":                    '\U000027EC',
-	"loarr;":                    '\U000021FD',
-	"lobrk;":                    '\U000027E6',
-	"longleftarrow;":            '\U000027F5',
-	"longleftrightarrow;":       '\U000027F7',
-	"longmapsto;":               '\U000027FC',
-	"longrightarrow;":           '\U000027F6',
-	"looparrowleft;":            '\U000021AB',
-	"looparrowright;":           '\U000021AC',
-	"lopar;":                    '\U00002985',
-	"lopf;":                     '\U0001D55D',
-	"loplus;":                   '\U00002A2D',
-	"lotimes;":                  '\U00002A34',
-	"lowast;":                   '\U00002217',
-	"lowbar;":                   '\U0000005F',
-	"loz;":                      '\U000025CA',
-	"lozenge;":                  '\U000025CA',
-	"lozf;":                     '\U000029EB',
-	"lpar;":                     '\U00000028',
-	"lparlt;":                   '\U00002993',
-	"lrarr;":                    '\U000021C6',
-	"lrcorner;":                 '\U0000231F',
-	"lrhar;":                    '\U000021CB',
-	"lrhard;":                   '\U0000296D',
-	"lrm;":                      '\U0000200E',
-	"lrtri;":                    '\U000022BF',
-	"lsaquo;":                   '\U00002039',
-	"lscr;":                     '\U0001D4C1',
-	"lsh;":                      '\U000021B0',
-	"lsim;":                     '\U00002272',
-	"lsime;":                    '\U00002A8D',
-	"lsimg;":                    '\U00002A8F',
-	"lsqb;":                     '\U0000005B',
-	"lsquo;":                    '\U00002018',
-	"lsquor;":                   '\U0000201A',
-	"lstrok;":                   '\U00000142',
-	"lt;":                       '\U0000003C',
-	"ltcc;":                     '\U00002AA6',
-	"ltcir;":                    '\U00002A79',
-	"ltdot;":                    '\U000022D6',
-	"lthree;":                   '\U000022CB',
-	"ltimes;":                   '\U000022C9',
-	"ltlarr;":                   '\U00002976',
-	"ltquest;":                  '\U00002A7B',
-	"ltrPar;":                   '\U00002996',
-	"ltri;":                     '\U000025C3',
-	"ltrie;":                    '\U000022B4',
-	"ltrif;":                    '\U000025C2',
-	"lurdshar;":                 '\U0000294A',
-	"luruhar;":                  '\U00002966',
-	"mDDot;":                    '\U0000223A',
-	"macr;":                     '\U000000AF',
-	"male;":                     '\U00002642',
-	"malt;":                     '\U00002720',
-	"maltese;":                  '\U00002720',
-	"map;":                      '\U000021A6',
-	"mapsto;":                   '\U000021A6',
-	"mapstodown;":               '\U000021A7',
-	"mapstoleft;":               '\U000021A4',
-	"mapstoup;":                 '\U000021A5',
-	"marker;":                   '\U000025AE',
-	"mcomma;":                   '\U00002A29',
-	"mcy;":                      '\U0000043C',
-	"mdash;":                    '\U00002014',
-	"measuredangle;":            '\U00002221',
-	"mfr;":                      '\U0001D52A',
-	"mho;":                      '\U00002127',
-	"micro;":                    '\U000000B5',
-	"mid;":                      '\U00002223',
-	"midast;":                   '\U0000002A',
-	"midcir;":                   '\U00002AF0',
-	"middot;":                   '\U000000B7',
-	"minus;":                    '\U00002212',
-	"minusb;":                   '\U0000229F',
-	"minusd;":                   '\U00002238',
-	"minusdu;":                  '\U00002A2A',
-	"mlcp;":                     '\U00002ADB',
-	"mldr;":                     '\U00002026',
-	"mnplus;":                   '\U00002213',
-	"models;":                   '\U000022A7',
-	"mopf;":                     '\U0001D55E',
-	"mp;":                       '\U00002213',
-	"mscr;":                     '\U0001D4C2',
-	"mstpos;":                   '\U0000223E',
-	"mu;":                       '\U000003BC',
-	"multimap;":                 '\U000022B8',
-	"mumap;":                    '\U000022B8',
-	"nLeftarrow;":               '\U000021CD',
-	"nLeftrightarrow;":          '\U000021CE',
-	"nRightarrow;":              '\U000021CF',
-	"nVDash;":                   '\U000022AF',
-	"nVdash;":                   '\U000022AE',
-	"nabla;":                    '\U00002207',
-	"nacute;":                   '\U00000144',
-	"nap;":                      '\U00002249',
-	"napos;":                    '\U00000149',
-	"napprox;":                  '\U00002249',
-	"natur;":                    '\U0000266E',
-	"natural;":                  '\U0000266E',
-	"naturals;":                 '\U00002115',
-	"nbsp;":                     '\U000000A0',
-	"ncap;":                     '\U00002A43',
-	"ncaron;":                   '\U00000148',
-	"ncedil;":                   '\U00000146',
-	"ncong;":                    '\U00002247',
-	"ncup;":                     '\U00002A42',
-	"ncy;":                      '\U0000043D',
-	"ndash;":                    '\U00002013',
-	"ne;":                       '\U00002260',
-	"neArr;":                    '\U000021D7',
-	"nearhk;":                   '\U00002924',
-	"nearr;":                    '\U00002197',
-	"nearrow;":                  '\U00002197',
-	"nequiv;":                   '\U00002262',
-	"nesear;":                   '\U00002928',
-	"nexist;":                   '\U00002204',
-	"nexists;":                  '\U00002204',
-	"nfr;":                      '\U0001D52B',
-	"nge;":                      '\U00002271',
-	"ngeq;":                     '\U00002271',
-	"ngsim;":                    '\U00002275',
-	"ngt;":                      '\U0000226F',
-	"ngtr;":                     '\U0000226F',
-	"nhArr;":                    '\U000021CE',
-	"nharr;":                    '\U000021AE',
-	"nhpar;":                    '\U00002AF2',
-	"ni;":                       '\U0000220B',
-	"nis;":                      '\U000022FC',
-	"nisd;":                     '\U000022FA',
-	"niv;":                      '\U0000220B',
-	"njcy;":                     '\U0000045A',
-	"nlArr;":                    '\U000021CD',
-	"nlarr;":                    '\U0000219A',
-	"nldr;":                     '\U00002025',
-	"nle;":                      '\U00002270',
-	"nleftarrow;":               '\U0000219A',
-	"nleftrightarrow;":          '\U000021AE',
-	"nleq;":                     '\U00002270',
-	"nless;":                    '\U0000226E',
-	"nlsim;":                    '\U00002274',
-	"nlt;":                      '\U0000226E',
-	"nltri;":                    '\U000022EA',
-	"nltrie;":                   '\U000022EC',
-	"nmid;":                     '\U00002224',
-	"nopf;":                     '\U0001D55F',
-	"not;":                      '\U000000AC',
-	"notin;":                    '\U00002209',
-	"notinva;":                  '\U00002209',
-	"notinvb;":                  '\U000022F7',
-	"notinvc;":                  '\U000022F6',
-	"notni;":                    '\U0000220C',
-	"notniva;":                  '\U0000220C',
-	"notnivb;":                  '\U000022FE',
-	"notnivc;":                  '\U000022FD',
-	"npar;":                     '\U00002226',
-	"nparallel;":                '\U00002226',
-	"npolint;":                  '\U00002A14',
-	"npr;":                      '\U00002280',
-	"nprcue;":                   '\U000022E0',
-	"nprec;":                    '\U00002280',
-	"nrArr;":                    '\U000021CF',
-	"nrarr;":                    '\U0000219B',
-	"nrightarrow;":              '\U0000219B',
-	"nrtri;":                    '\U000022EB',
-	"nrtrie;":                   '\U000022ED',
-	"nsc;":                      '\U00002281',
-	"nsccue;":                   '\U000022E1',
-	"nscr;":                     '\U0001D4C3',
-	"nshortmid;":                '\U00002224',
-	"nshortparallel;":           '\U00002226',
-	"nsim;":                     '\U00002241',
-	"nsime;":                    '\U00002244',
-	"nsimeq;":                   '\U00002244',
-	"nsmid;":                    '\U00002224',
-	"nspar;":                    '\U00002226',
-	"nsqsube;":                  '\U000022E2',
-	"nsqsupe;":                  '\U000022E3',
-	"nsub;":                     '\U00002284',
-	"nsube;":                    '\U00002288',
-	"nsubseteq;":                '\U00002288',
-	"nsucc;":                    '\U00002281',
-	"nsup;":                     '\U00002285',
-	"nsupe;":                    '\U00002289',
-	"nsupseteq;":                '\U00002289',
-	"ntgl;":                     '\U00002279',
-	"ntilde;":                   '\U000000F1',
-	"ntlg;":                     '\U00002278',
-	"ntriangleleft;":            '\U000022EA',
-	"ntrianglelefteq;":          '\U000022EC',
-	"ntriangleright;":           '\U000022EB',
-	"ntrianglerighteq;":         '\U000022ED',
-	"nu;":                       '\U000003BD',
-	"num;":                      '\U00000023',
-	"numero;":                   '\U00002116',
-	"numsp;":                    '\U00002007',
-	"nvDash;":                   '\U000022AD',
-	"nvHarr;":                   '\U00002904',
-	"nvdash;":                   '\U000022AC',
-	"nvinfin;":                  '\U000029DE',
-	"nvlArr;":                   '\U00002902',
-	"nvrArr;":                   '\U00002903',
-	"nwArr;":                    '\U000021D6',
-	"nwarhk;":                   '\U00002923',
-	"nwarr;":                    '\U00002196',
-	"nwarrow;":                  '\U00002196',
-	"nwnear;":                   '\U00002927',
-	"oS;":                       '\U000024C8',
-	"oacute;":                   '\U000000F3',
-	"oast;":                     '\U0000229B',
-	"ocir;":                     '\U0000229A',
-	"ocirc;":                    '\U000000F4',
-	"ocy;":                      '\U0000043E',
-	"odash;":                    '\U0000229D',
-	"odblac;":                   '\U00000151',
-	"odiv;":                     '\U00002A38',
-	"odot;":                     '\U00002299',
-	"odsold;":                   '\U000029BC',
-	"oelig;":                    '\U00000153',
-	"ofcir;":                    '\U000029BF',
-	"ofr;":                      '\U0001D52C',
-	"ogon;":                     '\U000002DB',
-	"ograve;":                   '\U000000F2',
-	"ogt;":                      '\U000029C1',
-	"ohbar;":                    '\U000029B5',
-	"ohm;":                      '\U000003A9',
-	"oint;":                     '\U0000222E',
-	"olarr;":                    '\U000021BA',
-	"olcir;":                    '\U000029BE',
-	"olcross;":                  '\U000029BB',
-	"oline;":                    '\U0000203E',
-	"olt;":                      '\U000029C0',
-	"omacr;":                    '\U0000014D',
-	"omega;":                    '\U000003C9',
-	"omicron;":                  '\U000003BF',
-	"omid;":                     '\U000029B6',
-	"ominus;":                   '\U00002296',
-	"oopf;":                     '\U0001D560',
-	"opar;":                     '\U000029B7',
-	"operp;":                    '\U000029B9',
-	"oplus;":                    '\U00002295',
-	"or;":                       '\U00002228',
-	"orarr;":                    '\U000021BB',
-	"ord;":                      '\U00002A5D',
-	"order;":                    '\U00002134',
-	"orderof;":                  '\U00002134',
-	"ordf;":                     '\U000000AA',
-	"ordm;":                     '\U000000BA',
-	"origof;":                   '\U000022B6',
-	"oror;":                     '\U00002A56',
-	"orslope;":                  '\U00002A57',
-	"orv;":                      '\U00002A5B',
-	"oscr;":                     '\U00002134',
-	"oslash;":                   '\U000000F8',
-	"osol;":                     '\U00002298',
-	"otilde;":                   '\U000000F5',
-	"otimes;":                   '\U00002297',
-	"otimesas;":                 '\U00002A36',
-	"ouml;":                     '\U000000F6',
-	"ovbar;":                    '\U0000233D',
-	"par;":                      '\U00002225',
-	"para;":                     '\U000000B6',
-	"parallel;":                 '\U00002225',
-	"parsim;":                   '\U00002AF3',
-	"parsl;":                    '\U00002AFD',
-	"part;":                     '\U00002202',
-	"pcy;":                      '\U0000043F',
-	"percnt;":                   '\U00000025',
-	"period;":                   '\U0000002E',
-	"permil;":                   '\U00002030',
-	"perp;":                     '\U000022A5',
-	"pertenk;":                  '\U00002031',
-	"pfr;":                      '\U0001D52D',
-	"phi;":                      '\U000003C6',
-	"phiv;":                     '\U000003D5',
-	"phmmat;":                   '\U00002133',
-	"phone;":                    '\U0000260E',
-	"pi;":                       '\U000003C0',
-	"pitchfork;":                '\U000022D4',
-	"piv;":                      '\U000003D6',
-	"planck;":                   '\U0000210F',
-	"planckh;":                  '\U0000210E',
-	"plankv;":                   '\U0000210F',
-	"plus;":                     '\U0000002B',
-	"plusacir;":                 '\U00002A23',
-	"plusb;":                    '\U0000229E',
-	"pluscir;":                  '\U00002A22',
-	"plusdo;":                   '\U00002214',
-	"plusdu;":                   '\U00002A25',
-	"pluse;":                    '\U00002A72',
-	"plusmn;":                   '\U000000B1',
-	"plussim;":                  '\U00002A26',
-	"plustwo;":                  '\U00002A27',
-	"pm;":                       '\U000000B1',
-	"pointint;":                 '\U00002A15',
-	"popf;":                     '\U0001D561',
-	"pound;":                    '\U000000A3',
-	"pr;":                       '\U0000227A',
-	"prE;":                      '\U00002AB3',
-	"prap;":                     '\U00002AB7',
-	"prcue;":                    '\U0000227C',
-	"pre;":                      '\U00002AAF',
-	"prec;":                     '\U0000227A',
-	"precapprox;":               '\U00002AB7',
-	"preccurlyeq;":              '\U0000227C',
-	"preceq;":                   '\U00002AAF',
-	"precnapprox;":              '\U00002AB9',
-	"precneqq;":                 '\U00002AB5',
-	"precnsim;":                 '\U000022E8',
-	"precsim;":                  '\U0000227E',
-	"prime;":                    '\U00002032',
-	"primes;":                   '\U00002119',
-	"prnE;":                     '\U00002AB5',
-	"prnap;":                    '\U00002AB9',
-	"prnsim;":                   '\U000022E8',
-	"prod;":                     '\U0000220F',
-	"profalar;":                 '\U0000232E',
-	"profline;":                 '\U00002312',
-	"profsurf;":                 '\U00002313',
-	"prop;":                     '\U0000221D',
-	"propto;":                   '\U0000221D',
-	"prsim;":                    '\U0000227E',
-	"prurel;":                   '\U000022B0',
-	"pscr;":                     '\U0001D4C5',
-	"psi;":                      '\U000003C8',
-	"puncsp;":                   '\U00002008',
-	"qfr;":                      '\U0001D52E',
-	"qint;":                     '\U00002A0C',
-	"qopf;":                     '\U0001D562',
-	"qprime;":                   '\U00002057',
-	"qscr;":                     '\U0001D4C6',
-	"quaternions;":              '\U0000210D',
-	"quatint;":                  '\U00002A16',
-	"quest;":                    '\U0000003F',
-	"questeq;":                  '\U0000225F',
-	"quot;":                     '\U00000022',
-	"rAarr;":                    '\U000021DB',
-	"rArr;":                     '\U000021D2',
-	"rAtail;":                   '\U0000291C',
-	"rBarr;":                    '\U0000290F',
-	"rHar;":                     '\U00002964',
-	"racute;":                   '\U00000155',
-	"radic;":                    '\U0000221A',
-	"raemptyv;":                 '\U000029B3',
-	"rang;":                     '\U000027E9',
-	"rangd;":                    '\U00002992',
-	"range;":                    '\U000029A5',
-	"rangle;":                   '\U000027E9',
-	"raquo;":                    '\U000000BB',
-	"rarr;":                     '\U00002192',
-	"rarrap;":                   '\U00002975',
-	"rarrb;":                    '\U000021E5',
-	"rarrbfs;":                  '\U00002920',
-	"rarrc;":                    '\U00002933',
-	"rarrfs;":                   '\U0000291E',
-	"rarrhk;":                   '\U000021AA',
-	"rarrlp;":                   '\U000021AC',
-	"rarrpl;":                   '\U00002945',
-	"rarrsim;":                  '\U00002974',
-	"rarrtl;":                   '\U000021A3',
-	"rarrw;":                    '\U0000219D',
-	"ratail;":                   '\U0000291A',
-	"ratio;":                    '\U00002236',
-	"rationals;":                '\U0000211A',
-	"rbarr;":                    '\U0000290D',
-	"rbbrk;":                    '\U00002773',
-	"rbrace;":                   '\U0000007D',
-	"rbrack;":                   '\U0000005D',
-	"rbrke;":                    '\U0000298C',
-	"rbrksld;":                  '\U0000298E',
-	"rbrkslu;":                  '\U00002990',
-	"rcaron;":                   '\U00000159',
-	"rcedil;":                   '\U00000157',
-	"rceil;":                    '\U00002309',
-	"rcub;":                     '\U0000007D',
-	"rcy;":                      '\U00000440',
-	"rdca;":                     '\U00002937',
-	"rdldhar;":                  '\U00002969',
-	"rdquo;":                    '\U0000201D',
-	"rdquor;":                   '\U0000201D',
-	"rdsh;":                     '\U000021B3',
-	"real;":                     '\U0000211C',
-	"realine;":                  '\U0000211B',
-	"realpart;":                 '\U0000211C',
-	"reals;":                    '\U0000211D',
-	"rect;":                     '\U000025AD',
-	"reg;":                      '\U000000AE',
-	"rfisht;":                   '\U0000297D',
-	"rfloor;":                   '\U0000230B',
-	"rfr;":                      '\U0001D52F',
-	"rhard;":                    '\U000021C1',
-	"rharu;":                    '\U000021C0',
-	"rharul;":                   '\U0000296C',
-	"rho;":                      '\U000003C1',
-	"rhov;":                     '\U000003F1',
-	"rightarrow;":               '\U00002192',
-	"rightarrowtail;":           '\U000021A3',
-	"rightharpoondown;":         '\U000021C1',
-	"rightharpoonup;":           '\U000021C0',
-	"rightleftarrows;":          '\U000021C4',
-	"rightleftharpoons;":        '\U000021CC',
-	"rightrightarrows;":         '\U000021C9',
-	"rightsquigarrow;":          '\U0000219D',
-	"rightthreetimes;":          '\U000022CC',
-	"ring;":                     '\U000002DA',
-	"risingdotseq;":             '\U00002253',
-	"rlarr;":                    '\U000021C4',
-	"rlhar;":                    '\U000021CC',
-	"rlm;":                      '\U0000200F',
-	"rmoust;":                   '\U000023B1',
-	"rmoustache;":               '\U000023B1',
-	"rnmid;":                    '\U00002AEE',
-	"roang;":                    '\U000027ED',
-	"roarr;":                    '\U000021FE',
-	"robrk;":                    '\U000027E7',
-	"ropar;":                    '\U00002986',
-	"ropf;":                     '\U0001D563',
-	"roplus;":                   '\U00002A2E',
-	"rotimes;":                  '\U00002A35',
-	"rpar;":                     '\U00000029',
-	"rpargt;":                   '\U00002994',
-	"rppolint;":                 '\U00002A12',
-	"rrarr;":                    '\U000021C9',
-	"rsaquo;":                   '\U0000203A',
-	"rscr;":                     '\U0001D4C7',
-	"rsh;":                      '\U000021B1',
-	"rsqb;":                     '\U0000005D',
-	"rsquo;":                    '\U00002019',
-	"rsquor;":                   '\U00002019',
-	"rthree;":                   '\U000022CC',
-	"rtimes;":                   '\U000022CA',
-	"rtri;":                     '\U000025B9',
-	"rtrie;":                    '\U000022B5',
-	"rtrif;":                    '\U000025B8',
-	"rtriltri;":                 '\U000029CE',
-	"ruluhar;":                  '\U00002968',
-	"rx;":                       '\U0000211E',
-	"sacute;":                   '\U0000015B',
-	"sbquo;":                    '\U0000201A',
-	"sc;":                       '\U0000227B',
-	"scE;":                      '\U00002AB4',
-	"scap;":                     '\U00002AB8',
-	"scaron;":                   '\U00000161',
-	"sccue;":                    '\U0000227D',
-	"sce;":                      '\U00002AB0',
-	"scedil;":                   '\U0000015F',
-	"scirc;":                    '\U0000015D',
-	"scnE;":                     '\U00002AB6',
-	"scnap;":                    '\U00002ABA',
-	"scnsim;":                   '\U000022E9',
-	"scpolint;":                 '\U00002A13',
-	"scsim;":                    '\U0000227F',
-	"scy;":                      '\U00000441',
-	"sdot;":                     '\U000022C5',
-	"sdotb;":                    '\U000022A1',
-	"sdote;":                    '\U00002A66',
-	"seArr;":                    '\U000021D8',
-	"searhk;":                   '\U00002925',
-	"searr;":                    '\U00002198',
-	"searrow;":                  '\U00002198',
-	"sect;":                     '\U000000A7',
-	"semi;":                     '\U0000003B',
-	"seswar;":                   '\U00002929',
-	"setminus;":                 '\U00002216',
-	"setmn;":                    '\U00002216',
-	"sext;":                     '\U00002736',
-	"sfr;":                      '\U0001D530',
-	"sfrown;":                   '\U00002322',
-	"sharp;":                    '\U0000266F',
-	"shchcy;":                   '\U00000449',
-	"shcy;":                     '\U00000448',
-	"shortmid;":                 '\U00002223',
-	"shortparallel;":            '\U00002225',
-	"shy;":                      '\U000000AD',
-	"sigma;":                    '\U000003C3',
-	"sigmaf;":                   '\U000003C2',
-	"sigmav;":                   '\U000003C2',
-	"sim;":                      '\U0000223C',
-	"simdot;":                   '\U00002A6A',
-	"sime;":                     '\U00002243',
-	"simeq;":                    '\U00002243',
-	"simg;":                     '\U00002A9E',
-	"simgE;":                    '\U00002AA0',
-	"siml;":                     '\U00002A9D',
-	"simlE;":                    '\U00002A9F',
-	"simne;":                    '\U00002246',
-	"simplus;":                  '\U00002A24',
-	"simrarr;":                  '\U00002972',
-	"slarr;":                    '\U00002190',
-	"smallsetminus;":            '\U00002216',
-	"smashp;":                   '\U00002A33',
-	"smeparsl;":                 '\U000029E4',
-	"smid;":                     '\U00002223',
-	"smile;":                    '\U00002323',
-	"smt;":                      '\U00002AAA',
-	"smte;":                     '\U00002AAC',
-	"softcy;":                   '\U0000044C',
-	"sol;":                      '\U0000002F',
-	"solb;":                     '\U000029C4',
-	"solbar;":                   '\U0000233F',
-	"sopf;":                     '\U0001D564',
-	"spades;":                   '\U00002660',
-	"spadesuit;":                '\U00002660',
-	"spar;":                     '\U00002225',
-	"sqcap;":                    '\U00002293',
-	"sqcup;":                    '\U00002294',
-	"sqsub;":                    '\U0000228F',
-	"sqsube;":                   '\U00002291',
-	"sqsubset;":                 '\U0000228F',
-	"sqsubseteq;":               '\U00002291',
-	"sqsup;":                    '\U00002290',
-	"sqsupe;":                   '\U00002292',
-	"sqsupset;":                 '\U00002290',
-	"sqsupseteq;":               '\U00002292',
-	"squ;":                      '\U000025A1',
-	"square;":                   '\U000025A1',
-	"squarf;":                   '\U000025AA',
-	"squf;":                     '\U000025AA',
-	"srarr;":                    '\U00002192',
-	"sscr;":                     '\U0001D4C8',
-	"ssetmn;":                   '\U00002216',
-	"ssmile;":                   '\U00002323',
-	"sstarf;":                   '\U000022C6',
-	"star;":                     '\U00002606',
-	"starf;":                    '\U00002605',
-	"straightepsilon;":          '\U000003F5',
-	"straightphi;":              '\U000003D5',
-	"strns;":                    '\U000000AF',
-	"sub;":                      '\U00002282',
-	"subE;":                     '\U00002AC5',
-	"subdot;":                   '\U00002ABD',
-	"sube;":                     '\U00002286',
-	"subedot;":                  '\U00002AC3',
-	"submult;":                  '\U00002AC1',
-	"subnE;":                    '\U00002ACB',
-	"subne;":                    '\U0000228A',
-	"subplus;":                  '\U00002ABF',
-	"subrarr;":                  '\U00002979',
-	"subset;":                   '\U00002282',
-	"subseteq;":                 '\U00002286',
-	"subseteqq;":                '\U00002AC5',
-	"subsetneq;":                '\U0000228A',
-	"subsetneqq;":               '\U00002ACB',
-	"subsim;":                   '\U00002AC7',
-	"subsub;":                   '\U00002AD5',
-	"subsup;":                   '\U00002AD3',
-	"succ;":                     '\U0000227B',
-	"succapprox;":               '\U00002AB8',
-	"succcurlyeq;":              '\U0000227D',
-	"succeq;":                   '\U00002AB0',
-	"succnapprox;":              '\U00002ABA',
-	"succneqq;":                 '\U00002AB6',
-	"succnsim;":                 '\U000022E9',
-	"succsim;":                  '\U0000227F',
-	"sum;":                      '\U00002211',
-	"sung;":                     '\U0000266A',
-	"sup;":                      '\U00002283',
-	"sup1;":                     '\U000000B9',
-	"sup2;":                     '\U000000B2',
-	"sup3;":                     '\U000000B3',
-	"supE;":                     '\U00002AC6',
-	"supdot;":                   '\U00002ABE',
-	"supdsub;":                  '\U00002AD8',
-	"supe;":                     '\U00002287',
-	"supedot;":                  '\U00002AC4',
-	"suphsol;":                  '\U000027C9',
-	"suphsub;":                  '\U00002AD7',
-	"suplarr;":                  '\U0000297B',
-	"supmult;":                  '\U00002AC2',
-	"supnE;":                    '\U00002ACC',
-	"supne;":                    '\U0000228B',
-	"supplus;":                  '\U00002AC0',
-	"supset;":                   '\U00002283',
-	"supseteq;":                 '\U00002287',
-	"supseteqq;":                '\U00002AC6',
-	"supsetneq;":                '\U0000228B',
-	"supsetneqq;":               '\U00002ACC',
-	"supsim;":                   '\U00002AC8',
-	"supsub;":                   '\U00002AD4',
-	"supsup;":                   '\U00002AD6',
-	"swArr;":                    '\U000021D9',
-	"swarhk;":                   '\U00002926',
-	"swarr;":                    '\U00002199',
-	"swarrow;":                  '\U00002199',
-	"swnwar;":                   '\U0000292A',
-	"szlig;":                    '\U000000DF',
-	"target;":                   '\U00002316',
-	"tau;":                      '\U000003C4',
-	"tbrk;":                     '\U000023B4',
-	"tcaron;":                   '\U00000165',
-	"tcedil;":                   '\U00000163',
-	"tcy;":                      '\U00000442',
-	"tdot;":                     '\U000020DB',
-	"telrec;":                   '\U00002315',
-	"tfr;":                      '\U0001D531',
-	"there4;":                   '\U00002234',
-	"therefore;":                '\U00002234',
-	"theta;":                    '\U000003B8',
-	"thetasym;":                 '\U000003D1',
-	"thetav;":                   '\U000003D1',
-	"thickapprox;":              '\U00002248',
-	"thicksim;":                 '\U0000223C',
-	"thinsp;":                   '\U00002009',
-	"thkap;":                    '\U00002248',
-	"thksim;":                   '\U0000223C',
-	"thorn;":                    '\U000000FE',
-	"tilde;":                    '\U000002DC',
-	"times;":                    '\U000000D7',
-	"timesb;":                   '\U000022A0',
-	"timesbar;":                 '\U00002A31',
-	"timesd;":                   '\U00002A30',
-	"tint;":                     '\U0000222D',
-	"toea;":                     '\U00002928',
-	"top;":                      '\U000022A4',
-	"topbot;":                   '\U00002336',
-	"topcir;":                   '\U00002AF1',
-	"topf;":                     '\U0001D565',
-	"topfork;":                  '\U00002ADA',
-	"tosa;":                     '\U00002929',
-	"tprime;":                   '\U00002034',
-	"trade;":                    '\U00002122',
-	"triangle;":                 '\U000025B5',
-	"triangledown;":             '\U000025BF',
-	"triangleleft;":             '\U000025C3',
-	"trianglelefteq;":           '\U000022B4',
-	"triangleq;":                '\U0000225C',
-	"triangleright;":            '\U000025B9',
-	"trianglerighteq;":          '\U000022B5',
-	"tridot;":                   '\U000025EC',
-	"trie;":                     '\U0000225C',
-	"triminus;":                 '\U00002A3A',
-	"triplus;":                  '\U00002A39',
-	"trisb;":                    '\U000029CD',
-	"tritime;":                  '\U00002A3B',
-	"trpezium;":                 '\U000023E2',
-	"tscr;":                     '\U0001D4C9',
-	"tscy;":                     '\U00000446',
-	"tshcy;":                    '\U0000045B',
-	"tstrok;":                   '\U00000167',
-	"twixt;":                    '\U0000226C',
-	"twoheadleftarrow;":         '\U0000219E',
-	"twoheadrightarrow;":        '\U000021A0',
-	"uArr;":                     '\U000021D1',
-	"uHar;":                     '\U00002963',
-	"uacute;":                   '\U000000FA',
-	"uarr;":                     '\U00002191',
-	"ubrcy;":                    '\U0000045E',
-	"ubreve;":                   '\U0000016D',
-	"ucirc;":                    '\U000000FB',
-	"ucy;":                      '\U00000443',
-	"udarr;":                    '\U000021C5',
-	"udblac;":                   '\U00000171',
-	"udhar;":                    '\U0000296E',
-	"ufisht;":                   '\U0000297E',
-	"ufr;":                      '\U0001D532',
-	"ugrave;":                   '\U000000F9',
-	"uharl;":                    '\U000021BF',
-	"uharr;":                    '\U000021BE',
-	"uhblk;":                    '\U00002580',
-	"ulcorn;":                   '\U0000231C',
-	"ulcorner;":                 '\U0000231C',
-	"ulcrop;":                   '\U0000230F',
-	"ultri;":                    '\U000025F8',
-	"umacr;":                    '\U0000016B',
-	"uml;":                      '\U000000A8',
-	"uogon;":                    '\U00000173',
-	"uopf;":                     '\U0001D566',
-	"uparrow;":                  '\U00002191',
-	"updownarrow;":              '\U00002195',
-	"upharpoonleft;":            '\U000021BF',
-	"upharpoonright;":           '\U000021BE',
-	"uplus;":                    '\U0000228E',
-	"upsi;":                     '\U000003C5',
-	"upsih;":                    '\U000003D2',
-	"upsilon;":                  '\U000003C5',
-	"upuparrows;":               '\U000021C8',
-	"urcorn;":                   '\U0000231D',
-	"urcorner;":                 '\U0000231D',
-	"urcrop;":                   '\U0000230E',
-	"uring;":                    '\U0000016F',
-	"urtri;":                    '\U000025F9',
-	"uscr;":                     '\U0001D4CA',
-	"utdot;":                    '\U000022F0',
-	"utilde;":                   '\U00000169',
-	"utri;":                     '\U000025B5',
-	"utrif;":                    '\U000025B4',
-	"uuarr;":                    '\U000021C8',
-	"uuml;":                     '\U000000FC',
-	"uwangle;":                  '\U000029A7',
-	"vArr;":                     '\U000021D5',
-	"vBar;":                     '\U00002AE8',
-	"vBarv;":                    '\U00002AE9',
-	"vDash;":                    '\U000022A8',
-	"vangrt;":                   '\U0000299C',
-	"varepsilon;":               '\U000003F5',
-	"varkappa;":                 '\U000003F0',
-	"varnothing;":               '\U00002205',
-	"varphi;":                   '\U000003D5',
-	"varpi;":                    '\U000003D6',
-	"varpropto;":                '\U0000221D',
-	"varr;":                     '\U00002195',
-	"varrho;":                   '\U000003F1',
-	"varsigma;":                 '\U000003C2',
-	"vartheta;":                 '\U000003D1',
-	"vartriangleleft;":          '\U000022B2',
-	"vartriangleright;":         '\U000022B3',
-	"vcy;":                      '\U00000432',
-	"vdash;":                    '\U000022A2',
-	"vee;":                      '\U00002228',
-	"veebar;":                   '\U000022BB',
-	"veeeq;":                    '\U0000225A',
-	"vellip;":                   '\U000022EE',
-	"verbar;":                   '\U0000007C',
-	"vert;":                     '\U0000007C',
-	"vfr;":                      '\U0001D533',
-	"vltri;":                    '\U000022B2',
-	"vopf;":                     '\U0001D567',
-	"vprop;":                    '\U0000221D',
-	"vrtri;":                    '\U000022B3',
-	"vscr;":                     '\U0001D4CB',
-	"vzigzag;":                  '\U0000299A',
-	"wcirc;":                    '\U00000175',
-	"wedbar;":                   '\U00002A5F',
-	"wedge;":                    '\U00002227',
-	"wedgeq;":                   '\U00002259',
-	"weierp;":                   '\U00002118',
-	"wfr;":                      '\U0001D534',
-	"wopf;":                     '\U0001D568',
-	"wp;":                       '\U00002118',
-	"wr;":                       '\U00002240',
-	"wreath;":                   '\U00002240',
-	"wscr;":                     '\U0001D4CC',
-	"xcap;":                     '\U000022C2',
-	"xcirc;":                    '\U000025EF',
-	"xcup;":                     '\U000022C3',
-	"xdtri;":                    '\U000025BD',
-	"xfr;":                      '\U0001D535',
-	"xhArr;":                    '\U000027FA',
-	"xharr;":                    '\U000027F7',
-	"xi;":                       '\U000003BE',
-	"xlArr;":                    '\U000027F8',
-	"xlarr;":                    '\U000027F5',
-	"xmap;":                     '\U000027FC',
-	"xnis;":                     '\U000022FB',
-	"xodot;":                    '\U00002A00',
-	"xopf;":                     '\U0001D569',
-	"xoplus;":                   '\U00002A01',
-	"xotime;":                   '\U00002A02',
-	"xrArr;":                    '\U000027F9',
-	"xrarr;":                    '\U000027F6',
-	"xscr;":                     '\U0001D4CD',
-	"xsqcup;":                   '\U00002A06',
-	"xuplus;":                   '\U00002A04',
-	"xutri;":                    '\U000025B3',
-	"xvee;":                     '\U000022C1',
-	"xwedge;":                   '\U000022C0',
-	"yacute;":                   '\U000000FD',
-	"yacy;":                     '\U0000044F',
-	"ycirc;":                    '\U00000177',
-	"ycy;":                      '\U0000044B',
-	"yen;":                      '\U000000A5',
-	"yfr;":                      '\U0001D536',
-	"yicy;":                     '\U00000457',
-	"yopf;":                     '\U0001D56A',
-	"yscr;":                     '\U0001D4CE',
-	"yucy;":                     '\U0000044E',
-	"yuml;":                     '\U000000FF',
-	"zacute;":                   '\U0000017A',
-	"zcaron;":                   '\U0000017E',
-	"zcy;":                      '\U00000437',
-	"zdot;":                     '\U0000017C',
-	"zeetrf;":                   '\U00002128',
-	"zeta;":                     '\U000003B6',
-	"zfr;":                      '\U0001D537',
-	"zhcy;":                     '\U00000436',
-	"zigrarr;":                  '\U000021DD',
-	"zopf;":                     '\U0001D56B',
-	"zscr;":                     '\U0001D4CF',
-	"zwj;":                      '\U0000200D',
-	"zwnj;":                     '\U0000200C',
-	"AElig":                     '\U000000C6',
-	"AMP":                       '\U00000026',
-	"Aacute":                    '\U000000C1',
-	"Acirc":                     '\U000000C2',
-	"Agrave":                    '\U000000C0',
-	"Aring":                     '\U000000C5',
-	"Atilde":                    '\U000000C3',
-	"Auml":                      '\U000000C4',
-	"COPY":                      '\U000000A9',
-	"Ccedil":                    '\U000000C7',
-	"ETH":                       '\U000000D0',
-	"Eacute":                    '\U000000C9',
-	"Ecirc":                     '\U000000CA',
-	"Egrave":                    '\U000000C8',
-	"Euml":                      '\U000000CB',
-	"GT":                        '\U0000003E',
-	"Iacute":                    '\U000000CD',
-	"Icirc":                     '\U000000CE',
-	"Igrave":                    '\U000000CC',
-	"Iuml":                      '\U000000CF',
-	"LT":                        '\U0000003C',
-	"Ntilde":                    '\U000000D1',
-	"Oacute":                    '\U000000D3',
-	"Ocirc":                     '\U000000D4',
-	"Ograve":                    '\U000000D2',
-	"Oslash":                    '\U000000D8',
-	"Otilde":                    '\U000000D5',
-	"Ouml":                      '\U000000D6',
-	"QUOT":                      '\U00000022',
-	"REG":                       '\U000000AE',
-	"THORN":                     '\U000000DE',
-	"Uacute":                    '\U000000DA',
-	"Ucirc":                     '\U000000DB',
-	"Ugrave":                    '\U000000D9',
-	"Uuml":                      '\U000000DC',
-	"Yacute":                    '\U000000DD',
-	"aacute":                    '\U000000E1',
-	"acirc":                     '\U000000E2',
-	"acute":                     '\U000000B4',
-	"aelig":                     '\U000000E6',
-	"agrave":                    '\U000000E0',
-	"amp":                       '\U00000026',
-	"aring":                     '\U000000E5',
-	"atilde":                    '\U000000E3',
-	"auml":                      '\U000000E4',
-	"brvbar":                    '\U000000A6',
-	"ccedil":                    '\U000000E7',
-	"cedil":                     '\U000000B8',
-	"cent":                      '\U000000A2',
-	"copy":                      '\U000000A9',
-	"curren":                    '\U000000A4',
-	"deg":                       '\U000000B0',
-	"divide":                    '\U000000F7',
-	"eacute":                    '\U000000E9',
-	"ecirc":                     '\U000000EA',
-	"egrave":                    '\U000000E8',
-	"eth":                       '\U000000F0',
-	"euml":                      '\U000000EB',
-	"frac12":                    '\U000000BD',
-	"frac14":                    '\U000000BC',
-	"frac34":                    '\U000000BE',
-	"gt":                        '\U0000003E',
-	"iacute":                    '\U000000ED',
-	"icirc":                     '\U000000EE',
-	"iexcl":                     '\U000000A1',
-	"igrave":                    '\U000000EC',
-	"iquest":                    '\U000000BF',
-	"iuml":                      '\U000000EF',
-	"laquo":                     '\U000000AB',
-	"lt":                        '\U0000003C',
-	"macr":                      '\U000000AF',
-	"micro":                     '\U000000B5',
-	"middot":                    '\U000000B7',
-	"nbsp":                      '\U000000A0',
-	"not":                       '\U000000AC',
-	"ntilde":                    '\U000000F1',
-	"oacute":                    '\U000000F3',
-	"ocirc":                     '\U000000F4',
-	"ograve":                    '\U000000F2',
-	"ordf":                      '\U000000AA',
-	"ordm":                      '\U000000BA',
-	"oslash":                    '\U000000F8',
-	"otilde":                    '\U000000F5',
-	"ouml":                      '\U000000F6',
-	"para":                      '\U000000B6',
-	"plusmn":                    '\U000000B1',
-	"pound":                     '\U000000A3',
-	"quot":                      '\U00000022',
-	"raquo":                     '\U000000BB',
-	"reg":                       '\U000000AE',
-	"sect":                      '\U000000A7',
-	"shy":                       '\U000000AD',
-	"sup1":                      '\U000000B9',
-	"sup2":                      '\U000000B2',
-	"sup3":                      '\U000000B3',
-	"szlig":                     '\U000000DF',
-	"thorn":                     '\U000000FE',
-	"times":                     '\U000000D7',
-	"uacute":                    '\U000000FA',
-	"ucirc":                     '\U000000FB',
-	"ugrave":                    '\U000000F9',
-	"uml":                       '\U000000A8',
-	"uuml":                      '\U000000FC',
-	"yacute":                    '\U000000FD',
-	"yen":                       '\U000000A5',
-	"yuml":                      '\U000000FF',
+	"Cross;":                           '\U00002A2F',
+	"Cscr;":                            '\U0001D49E',
+	"Cup;":                             '\U000022D3',
+	"CupCap;":                          '\U0000224D',
+	"DD;":                              '\U00002145',
+	"DDotrahd;":                        '\U00002911',
+	"DJcy;":                            '\U00000402',
+	"DScy;":                            '\U00000405',
+	"DZcy;":                            '\U0000040F',
+	"Dagger;":                          '\U00002021',
+	"Darr;":                            '\U000021A1',
+	"Dashv;":                           '\U00002AE4',
+	"Dcaron;":                          '\U0000010E',
+	"Dcy;":                             '\U00000414',
+	"Del;":                             '\U00002207',
+	"Delta;":                           '\U00000394',
+	"Dfr;":                             '\U0001D507',
+	"DiacriticalAcute;":                '\U000000B4',
+	"DiacriticalDot;":                  '\U000002D9',
+	"DiacriticalDoubleAcute;":          '\U000002DD',
+	"DiacriticalGrave;":                '\U00000060',
+	"DiacriticalTilde;":                '\U000002DC',
+	"Diamond;":                         '\U000022C4',
+	"DifferentialD;":                   '\U00002146',
+	"Dopf;":                            '\U0001D53B',
+	"Dot;":                             '\U000000A8',
+	"DotDot;":                          '\U000020DC',
+	"DotEqual;":                        '\U00002250',
+	"DoubleContourIntegral;":           '\U0000222F',
+	"DoubleDot;":                       '\U000000A8',
+	"DoubleDownArrow;":                 '\U000021D3',
+	"DoubleLeftArrow;":                 '\U000021D0',
+	"DoubleLeftRightArrow;":            '\U000021D4',
+	"DoubleLeftTee;":                   '\U00002AE4',
+	"DoubleLongLeftArrow;":             '\U000027F8',
+	"DoubleLongLeftRightArrow;":        '\U000027FA',
+	"DoubleLongRightArrow;":            '\U000027F9',
+	"DoubleRightArrow;":                '\U000021D2',
+	"DoubleRightTee;":                  '\U000022A8',
+	"DoubleUpArrow;":                   '\U000021D1',
+	"DoubleUpDownArrow;":               '\U000021D5',
+	"DoubleVerticalBar;":               '\U00002225',
+	"DownArrow;":                       '\U00002193',
+	"DownArrowBar;":                    '\U00002913',
+	"DownArrowUpArrow;":                '\U000021F5',
+	"DownBreve;":                       '\U00000311',
+	"DownLeftRightVector;":             '\U00002950',
+	"DownLeftTeeVector;":               '\U0000295E',
+	"DownLeftVector;":                  '\U000021BD',
+	"DownLeftVectorBar;":               '\U00002956',
+	"DownRightTeeVector;":              '\U0000295F',
+	"DownRightVector;":                 '\U000021C1',
+	"DownRightVectorBar;":              '\U00002957',
+	"DownTee;":                         '\U000022A4',
+	"DownTeeArrow;":                    '\U000021A7',
+	"Downarrow;":                       '\U000021D3',
+	"Dscr;":                            '\U0001D49F',
+	"Dstrok;":                          '\U00000110',
+	"ENG;":                             '\U0000014A',
+	"ETH;":                             '\U000000D0',
+	"Eacute;":                          '\U000000C9',
+	"Ecaron;":                          '\U0000011A',
+	"Ecirc;":                           '\U000000CA',
+	"Ecy;":                             '\U0000042D',
+	"Edot;":                            '\U00000116',
+	"Efr;":                             '\U0001D508',
+	"Egrave;":                          '\U000000C8',
+	"Element;":                         '\U00002208',
+	"Emacr;":                           '\U00000112',
+	"EmptySmallSquare;":                '\U000025FB',
+	"EmptyVerySmallSquare;":            '\U000025AB',
+	"Eogon;":                           '\U00000118',
+	"Eopf;":                            '\U0001D53C',
+	"Epsilon;":                         '\U00000395',
+	"Equal;":                           '\U00002A75',
+	"EqualTilde;":                      '\U00002242',
+	"Equilibrium;":                     '\U000021CC',
+	"Escr;":                            '\U00002130',
+	"Esim;":                            '\U00002A73',
+	"Eta;":                             '\U00000397',
+	"Euml;":                            '\U000000CB',
+	"Exists;":                          '\U00002203',
+	"ExponentialE;":                    '\U00002147',
+	"Fcy;":                             '\U00000424',
+	"Ffr;":                             '\U0001D509',
+	"FilledSmallSquare;":               '\U000025FC',
+	"FilledVerySmallSquare;":           '\U000025AA',
+	"Fopf;":                            '\U0001D53D',
+	"ForAll;":                          '\U00002200',
+	"Fouriertrf;":                      '\U00002131',
+	"Fscr;":                            '\U00002131',
+	"GJcy;":                            '\U00000403',
+	"GT;":                              '\U0000003E',
+	"Gamma;":                           '\U00000393',
+	"Gammad;":                          '\U000003DC',
+	"Gbreve;":                          '\U0000011E',
+	"Gcedil;":                          '\U00000122',
+	"Gcirc;":                           '\U0000011C',
+	"Gcy;":                             '\U00000413',
+	"Gdot;":                            '\U00000120',
+	"Gfr;":                             '\U0001D50A',
+	"Gg;":                              '\U000022D9',
+	"Gopf;":                            '\U0001D53E',
+	"GreaterEqual;":                    '\U00002265',
+	"GreaterEqualLess;":                '\U000022DB',
+	"GreaterFullEqual;":                '\U00002267',
+	"GreaterGreater;":                  '\U00002AA2',
+	"GreaterLess;":                     '\U00002277',
+	"GreaterSlantEqual;":               '\U00002A7E',
+	"GreaterTilde;":                    '\U00002273',
+	"Gscr;":                            '\U0001D4A2',
+	"Gt;":                              '\U0000226B',
+	"HARDcy;":                          '\U0000042A',
+	"Hacek;":                           '\U000002C7',
+	"Hat;":                             '\U0000005E',
+	"Hcirc;":                           '\U00000124',
+	"Hfr;":                             '\U0000210C',
+	"HilbertSpace;":                    '\U0000210B',
+	"Hopf;":                            '\U0000210D',
+	"HorizontalLine;":                  '\U00002500',
+	"Hscr;":                            '\U0000210B',
+	"Hstrok;":                          '\U00000126',
+	"HumpDownHump;":                    '\U0000224E',
+	"HumpEqual;":                       '\U0000224F',
+	"IEcy;":                            '\U00000415',
+	"IJlig;":                           '\U00000132',
+	"IOcy;":                            '\U00000401',
+	"Iacute;":                          '\U000000CD',
+	"Icirc;":                           '\U000000CE',
+	"Icy;":                             '\U00000418',
+	"Idot;":                            '\U00000130',
+	"Ifr;":                             '\U00002111',
+	"Igrave;":                          '\U000000CC',
+	"Im;":                              '\U00002111',
+	"Imacr;":                           '\U0000012A',
+	"ImaginaryI;":                      '\U00002148',
+	"Implies;":                         '\U000021D2',
+	"Int;":                             '\U0000222C',
+	"Integral;":                        '\U0000222B',
+	"Intersection;":                    '\U000022C2',
+	"InvisibleComma;":                  '\U00002063',
+	"InvisibleTimes;":                  '\U00002062',
+	"Iogon;":                           '\U0000012E',
+	"Iopf;":                            '\U0001D540',
+	"Iota;":                            '\U00000399',
+	"Iscr;":                            '\U00002110',
+	"Itilde;":                          '\U00000128',
+	"Iukcy;":                           '\U00000406',
+	"Iuml;":                            '\U000000CF',
+	"Jcirc;":                           '\U00000134',
+	"Jcy;":                             '\U00000419',
+	"Jfr;":                             '\U0001D50D',
+	"Jopf;":                            '\U0001D541',
+	"Jscr;":                            '\U0001D4A5',
+	"Jsercy;":                          '\U00000408',
+	"Jukcy;":                           '\U00000404',
+	"KHcy;":                            '\U00000425',
+	"KJcy;":                            '\U0000040C',
+	"Kappa;":                           '\U0000039A',
+	"Kcedil;":                          '\U00000136',
+	"Kcy;":                             '\U0000041A',
+	"Kfr;":                             '\U0001D50E',
+	"Kopf;":                            '\U0001D542',
+	"Kscr;":                            '\U0001D4A6',
+	"LJcy;":                            '\U00000409',
+	"LT;":                              '\U0000003C',
+	"Lacute;":                          '\U00000139',
+	"Lambda;":                          '\U0000039B',
+	"Lang;":                            '\U000027EA',
+	"Laplacetrf;":                      '\U00002112',
+	"Larr;":                            '\U0000219E',
+	"Lcaron;":                          '\U0000013D',
+	"Lcedil;":                          '\U0000013B',
+	"Lcy;":                             '\U0000041B',
+	"LeftAngleBracket;":                '\U000027E8',
+	"LeftArrow;":                       '\U00002190',
+	"LeftArrowBar;":                    '\U000021E4',
+	"LeftArrowRightArrow;":             '\U000021C6',
+	"LeftCeiling;":                     '\U00002308',
+	"LeftDoubleBracket;":               '\U000027E6',
+	"LeftDownTeeVector;":               '\U00002961',
+	"LeftDownVector;":                  '\U000021C3',
+	"LeftDownVectorBar;":               '\U00002959',
+	"LeftFloor;":                       '\U0000230A',
+	"LeftRightArrow;":                  '\U00002194',
+	"LeftRightVector;":                 '\U0000294E',
+	"LeftTee;":                         '\U000022A3',
+	"LeftTeeArrow;":                    '\U000021A4',
+	"LeftTeeVector;":                   '\U0000295A',
+	"LeftTriangle;":                    '\U000022B2',
+	"LeftTriangleBar;":                 '\U000029CF',
+	"LeftTriangleEqual;":               '\U000022B4',
+	"LeftUpDownVector;":                '\U00002951',
+	"LeftUpTeeVector;":                 '\U00002960',
+	"LeftUpVector;":                    '\U000021BF',
+	"LeftUpVectorBar;":                 '\U00002958',
+	"LeftVector;":                      '\U000021BC',
+	"LeftVectorBar;":                   '\U00002952',
+	"Leftarrow;":                       '\U000021D0',
+	"Leftrightarrow;":                  '\U000021D4',
+	"LessEqualGreater;":                '\U000022DA',
+	"LessFullEqual;":                   '\U00002266',
+	"LessGreater;":                     '\U00002276',
+	"LessLess;":                        '\U00002AA1',
+	"LessSlantEqual;":                  '\U00002A7D',
+	"LessTilde;":                       '\U00002272',
+	"Lfr;":                             '\U0001D50F',
+	"Ll;":                              '\U000022D8',
+	"Lleftarrow;":                      '\U000021DA',
+	"Lmidot;":                          '\U0000013F',
+	"LongLeftArrow;":                   '\U000027F5',
+	"LongLeftRightArrow;":              '\U000027F7',
+	"LongRightArrow;":                  '\U000027F6',
+	"Longleftarrow;":                   '\U000027F8',
+	"Longleftrightarrow;":              '\U000027FA',
+	"Longrightarrow;":                  '\U000027F9',
+	"Lopf;":                            '\U0001D543',
+	"LowerLeftArrow;":                  '\U00002199',
+	"LowerRightArrow;":                 '\U00002198',
+	"Lscr;":                            '\U00002112',
+	"Lsh;":                             '\U000021B0',
+	"Lstrok;":                          '\U00000141',
+	"Lt;":                              '\U0000226A',
+	"Map;":                             '\U00002905',
+	"Mcy;":                             '\U0000041C',
+	"MediumSpace;":                     '\U0000205F',
+	"Mellintrf;":                       '\U00002133',
+	"Mfr;":                             '\U0001D510',
+	"MinusPlus;":                       '\U00002213',
+	"Mopf;":                            '\U0001D544',
+	"Mscr;":                            '\U00002133',
+	"Mu;":                              '\U0000039C',
+	"NJcy;":                            '\U0000040A',
+	"Nacute;":                          '\U00000143',
+	"Ncaron;":                          '\U00000147',
+	"Ncedil;":                          '\U00000145',
+	"Ncy;":                             '\U0000041D',
+	"NegativeMediumSpace;":             '\U0000200B',
+	"NegativeThickSpace;":              '\U0000200B',
+	"NegativeThinSpace;":               '\U0000200B',
+	"NegativeVeryThinSpace;":           '\U0000200B',
+	"NestedGreaterGreater;":            '\U0000226B',
+	"NestedLessLess;":                  '\U0000226A',
+	"NewLine;":                         '\U0000000A',
+	"Nfr;":                             '\U0001D511',
+	"NoBreak;":                         '\U00002060',
+	"NonBreakingSpace;":                '\U000000A0',
+	"Nopf;":                            '\U00002115',
+	"Not;":                             '\U00002AEC',
+	"NotCongruent;":                    '\U00002262',
+	"NotCupCap;":                       '\U0000226D',
+	"NotDoubleVerticalBar;":            '\U00002226',
+	"NotElement;":                      '\U00002209',
+	"NotEqual;":                        '\U00002260',
+	"NotExists;":                       '\U00002204',
+	"NotGreater;":                      '\U0000226F',
+	"NotGreaterEqual;":                 '\U00002271',
+	"NotGreaterLess;":                  '\U00002279',
+	"NotGreaterTilde;":                 '\U00002275',
+	"NotLeftTriangle;":                 '\U000022EA',
+	"NotLeftTriangleEqual;":            '\U000022EC',
+	"NotLess;":                         '\U0000226E',
+	"NotLessEqual;":                    '\U00002270',
+	"NotLessGreater;":                  '\U00002278',
+	"NotLessTilde;":                    '\U00002274',
+	"NotPrecedes;":                     '\U00002280',
+	"NotPrecedesSlantEqual;":           '\U000022E0',
+	"NotReverseElement;":               '\U0000220C',
+	"NotRightTriangle;":                '\U000022EB',
+	"NotRightTriangleEqual;":           '\U000022ED',
+	"NotSquareSubsetEqual;":            '\U000022E2',
+	"NotSquareSupersetEqual;":          '\U000022E3',
+	"NotSubsetEqual;":                  '\U00002288',
+	"NotSucceeds;":                     '\U00002281',
+	"NotSucceedsSlantEqual;":           '\U000022E1',
+	"NotSupersetEqual;":                '\U00002289',
+	"NotTilde;":                        '\U00002241',
+	"NotTildeEqual;":                   '\U00002244',
+	"NotTildeFullEqual;":               '\U00002247',
+	"NotTildeTilde;":                   '\U00002249',
+	"NotVerticalBar;":                  '\U00002224',
+	"Nscr;":                            '\U0001D4A9',
+	"Ntilde;":                          '\U000000D1',
+	"Nu;":                              '\U0000039D',
+	"OElig;":                           '\U00000152',
+	"Oacute;":                          '\U000000D3',
+	"Ocirc;":                           '\U000000D4',
+	"Ocy;":                             '\U0000041E',
+	"Odblac;":                          '\U00000150',
+	"Ofr;":                             '\U0001D512',
+	"Ograve;":                          '\U000000D2',
+	"Omacr;":                           '\U0000014C',
+	"Omega;":                           '\U000003A9',
+	"Omicron;":                         '\U0000039F',
+	"Oopf;":                            '\U0001D546',
+	"OpenCurlyDoubleQuote;":            '\U0000201C',
+	"OpenCurlyQuote;":                  '\U00002018',
+	"Or;":                              '\U00002A54',
+	"Oscr;":                            '\U0001D4AA',
+	"Oslash;":                          '\U000000D8',
+	"Otilde;":                          '\U000000D5',
+	"Otimes;":                          '\U00002A37',
+	"Ouml;":                            '\U000000D6',
+	"OverBar;":                         '\U0000203E',
+	"OverBrace;":                       '\U000023DE',
+	"OverBracket;":                     '\U000023B4',
+	"OverParenthesis;":                 '\U000023DC',
+	"PartialD;":                        '\U00002202',
+	"Pcy;":                             '\U0000041F',
+	"Pfr;":                             '\U0001D513',
+	"Phi;":                             '\U000003A6',
+	"Pi;":                              '\U000003A0',
+	"PlusMinus;":                       '\U000000B1',
+	"Poincareplane;":                   '\U0000210C',
+	"Popf;":                            '\U00002119',
+	"Pr;":                              '\U00002ABB',
+	"Precedes;":                        '\U0000227A',
+	"PrecedesEqual;":                   '\U00002AAF',
+	"PrecedesSlantEqual;":              '\U0000227C',
+	"PrecedesTilde;":                   '\U0000227E',
+	"Prime;":                           '\U00002033',
+	"Product;":                         '\U0000220F',
+	"Proportion;":                      '\U00002237',
+	"Proportional;":                    '\U0000221D',
+	"Pscr;":                            '\U0001D4AB',
+	"Psi;":                             '\U000003A8',
+	"QUOT;":                            '\U00000022',
+	"Qfr;":                             '\U0001D514',
+	"Qopf;":                            '\U0000211A',
+	"Qscr;":                            '\U0001D4AC',
+	"RBarr;":                           '\U00002910',
+	"REG;":                             '\U000000AE',
+	"Racute;":                          '\U00000154',
+	"Rang;":                            '\U000027EB',
+	"Rarr;":                            '\U000021A0',
+	"Rarrtl;":                          '\U00002916',
+	"Rcaron;":                          '\U00000158',
+	"Rcedil;":                          '\U00000156',
+	"Rcy;":                             '\U00000420',
+	"Re;":                              '\U0000211C',
+	"ReverseElement;":                  '\U0000220B',
+	"ReverseEquilibrium;":              '\U000021CB',
+	"ReverseUpEquilibrium;":            '\U0000296F',
+	"Rfr;":                             '\U0000211C',
+	"Rho;":                             '\U000003A1',
+	"RightAngleBracket;":               '\U000027E9',
+	"RightArrow;":                      '\U00002192',
+	"RightArrowBar;":                   '\U000021E5',
+	"RightArrowLeftArrow;":             '\U000021C4',
+	"RightCeiling;":                    '\U00002309',
+	"RightDoubleBracket;":              '\U000027E7',
+	"RightDownTeeVector;":              '\U0000295D',
+	"RightDownVector;":                 '\U000021C2',
+	"RightDownVectorBar;":              '\U00002955',
+	"RightFloor;":                      '\U0000230B',
+	"RightTee;":                        '\U000022A2',
+	"RightTeeArrow;":                   '\U000021A6',
+	"RightTeeVector;":                  '\U0000295B',
+	"RightTriangle;":                   '\U000022B3',
+	"RightTriangleBar;":                '\U000029D0',
+	"RightTriangleEqual;":              '\U000022B5',
+	"RightUpDownVector;":               '\U0000294F',
+	"RightUpTeeVector;":                '\U0000295C',
+	"RightUpVector;":                   '\U000021BE',
+	"RightUpVectorBar;":                '\U00002954',
+	"RightVector;":                     '\U000021C0',
+	"RightVectorBar;":                  '\U00002953',
+	"Rightarrow;":                      '\U000021D2',
+	"Ropf;":                            '\U0000211D',
+	"RoundImplies;":                    '\U00002970',
+	"Rrightarrow;":                     '\U000021DB',
+	"Rscr;":                            '\U0000211B',
+	"Rsh;":                             '\U000021B1',
+	"RuleDelayed;":                     '\U000029F4',
+	"SHCHcy;":                          '\U00000429',
+	"SHcy;":                            '\U00000428',
+	"SOFTcy;":                          '\U0000042C',
+	"Sacute;":                          '\U0000015A',
+	"Sc;":                              '\U00002ABC',
+	"Scaron;":                          '\U00000160',
+	"Scedil;":                          '\U0000015E',
+	"Scirc;":                           '\U0000015C',
+	"Scy;":                             '\U00000421',
+	"Sfr;":                             '\U0001D516',
+	"ShortDownArrow;":                  '\U00002193',
+	"ShortLeftArrow;":                  '\U00002190',
+	"ShortRightArrow;":                 '\U00002192',
+	"ShortUpArrow;":                    '\U00002191',
+	"Sigma;":                           '\U000003A3',
+	"SmallCircle;":                     '\U00002218',
+	"Sopf;":                            '\U0001D54A',
+	"Sqrt;":                            '\U0000221A',
+	"Square;":                          '\U000025A1',
+	"SquareIntersection;":              '\U00002293',
+	"SquareSubset;":                    '\U0000228F',
+	"SquareSubsetEqual;":               '\U00002291',
+	"SquareSuperset;":                  '\U00002290',
+	"SquareSupersetEqual;":             '\U00002292',
+	"SquareUnion;":                     '\U00002294',
+	"Sscr;":                            '\U0001D4AE',
+	"Star;":                            '\U000022C6',
+	"Sub;":                             '\U000022D0',
+	"Subset;":                          '\U000022D0',
+	"SubsetEqual;":                     '\U00002286',
+	"Succeeds;":                        '\U0000227B',
+	"SucceedsEqual;":                   '\U00002AB0',
+	"SucceedsSlantEqual;":              '\U0000227D',
+	"SucceedsTilde;":                   '\U0000227F',
+	"SuchThat;":                        '\U0000220B',
+	"Sum;":                             '\U00002211',
+	"Sup;":                             '\U000022D1',
+	"Superset;":                        '\U00002283',
+	"SupersetEqual;":                   '\U00002287',
+	"Supset;":                          '\U000022D1',
+	"THORN;":                           '\U000000DE',
+	"TRADE;":                           '\U00002122',
+	"TSHcy;":                           '\U0000040B',
+	"TScy;":                            '\U00000426',
+	"Tab;":                             '\U00000009',
+	"Tau;":                             '\U000003A4',
+	"Tcaron;":                          '\U00000164',
+	"Tcedil;":                          '\U00000162',
+	"Tcy;":                             '\U00000422',
+	"Tfr;":                             '\U0001D517',
+	"Therefore;":                       '\U00002234',
+	"Theta;":                           '\U00000398',
+	"ThinSpace;":                       '\U00002009',
+	"Tilde;":                           '\U0000223C',
+	"TildeEqual;":                      '\U00002243',
+	"TildeFullEqual;":                  '\U00002245',
+	"TildeTilde;":                      '\U00002248',
+	"Topf;":                            '\U0001D54B',
+	"TripleDot;":                       '\U000020DB',
+	"Tscr;":                            '\U0001D4AF',
+	"Tstrok;":                          '\U00000166',
+	"Uacute;":                          '\U000000DA',
+	"Uarr;":                            '\U0000219F',
+	"Uarrocir;":                        '\U00002949',
+	"Ubrcy;":                           '\U0000040E',
+	"Ubreve;":                          '\U0000016C',
+	"Ucirc;":                           '\U000000DB',
+	"Ucy;":                             '\U00000423',
+	"Udblac;":                          '\U00000170',
+	"Ufr;":                             '\U0001D518',
+	"Ugrave;":                          '\U000000D9',
+	"Umacr;":                           '\U0000016A',
+	"UnderBar;":                        '\U0000005F',
+	"UnderBrace;":                      '\U000023DF',
+	"UnderBracket;":                    '\U000023B5',
+	"UnderParenthesis;":                '\U000023DD',
+	"Union;":                           '\U000022C3',
+	"UnionPlus;":                       '\U0000228E',
+	"Uogon;":                           '\U00000172',
+	"Uopf;":                            '\U0001D54C',
+	"UpArrow;":                         '\U00002191',
+	"UpArrowBar;":                      '\U00002912',
+	"UpArrowDownArrow;":                '\U000021C5',
+	"UpDownArrow;":                     '\U00002195',
+	"UpEquilibrium;":                   '\U0000296E',
+	"UpTee;":                           '\U000022A5',
+	"UpTeeArrow;":                      '\U000021A5',
+	"Uparrow;":                         '\U000021D1',
+	"Updownarrow;":                     '\U000021D5',
+	"UpperLeftArrow;":                  '\U00002196',
+	"UpperRightArrow;":                 '\U00002197',
+	"Upsi;":                            '\U000003D2',
+	"Upsilon;":                         '\U000003A5',
+	"Uring;":                           '\U0000016E',
+	"Uscr;":                            '\U0001D4B0',
+	"Utilde;":                          '\U00000168',
+	"Uuml;":                            '\U000000DC',
+	"VDash;":                           '\U000022AB',
+	"Vbar;":                            '\U00002AEB',
+	"Vcy;":                             '\U00000412',
+	"Vdash;":                           '\U000022A9',
+	"Vdashl;":                          '\U00002AE6',
+	"Vee;":                             '\U000022C1',
+	"Verbar;":                          '\U00002016',
+	"Vert;":                            '\U00002016',
+	"VerticalBar;":                     '\U00002223',
+	"VerticalLine;":                    '\U0000007C',
+	"VerticalSeparator;":               '\U00002758',
+	"VerticalTilde;":                   '\U00002240',
+	"VeryThinSpace;":                   '\U0000200A',
+	"Vfr;":                             '\U0001D519',
+	"Vopf;":                            '\U0001D54D',
+	"Vscr;":                            '\U0001D4B1',
+	"Vvdash;":                          '\U000022AA',
+	"Wcirc;":                           '\U00000174',
+	"Wedge;":                           '\U000022C0',
+	"Wfr;":                             '\U0001D51A',
+	"Wopf;":                            '\U0001D54E',
+	"Wscr;":                            '\U0001D4B2',
+	"Xfr;":                             '\U0001D51B',
+	"Xi;":                              '\U0000039E',
+	"Xopf;":                            '\U0001D54F',
+	"Xscr;":                            '\U0001D4B3',
+	"YAcy;":                            '\U0000042F',
+	"YIcy;":                            '\U00000407',
+	"YUcy;":                            '\U0000042E',
+	"Yacute;":                          '\U000000DD',
+	"Ycirc;":                           '\U00000176',
+	"Ycy;":                             '\U0000042B',
+	"Yfr;":                             '\U0001D51C',
+	"Yopf;":                            '\U0001D550',
+	"Yscr;":                            '\U0001D4B4',
+	"Yuml;":                            '\U00000178',
+	"ZHcy;":                            '\U00000416',
+	"Zacute;":                          '\U00000179',
+	"Zcaron;":                          '\U0000017D',
+	"Zcy;":                             '\U00000417',
+	"Zdot;":                            '\U0000017B',
+	"ZeroWidthSpace;":                  '\U0000200B',
+	"Zeta;":                            '\U00000396',
+	"Zfr;":                             '\U00002128',
+	"Zopf;":                            '\U00002124',
+	"Zscr;":                            '\U0001D4B5',
+	"aacute;":                          '\U000000E1',
+	"abreve;":                          '\U00000103',
+	"ac;":                              '\U0000223E',
+	"acd;":                             '\U0000223F',
+	"acirc;":                           '\U000000E2',
+	"acute;":                           '\U000000B4',
+	"acy;":                             '\U00000430',
+	"aelig;":                           '\U000000E6',
+	"af;":                              '\U00002061',
+	"afr;":                             '\U0001D51E',
+	"agrave;":                          '\U000000E0',
+	"alefsym;":                         '\U00002135',
+	"aleph;":                           '\U00002135',
+	"alpha;":                           '\U000003B1',
+	"amacr;":                           '\U00000101',
+	"amalg;":                           '\U00002A3F',
+	"amp;":                             '\U00000026',
+	"and;":                             '\U00002227',
+	"andand;":                          '\U00002A55',
+	"andd;":                            '\U00002A5C',
+	"andslope;":                        '\U00002A58',
+	"andv;":                            '\U00002A5A',
+	"ang;":                             '\U00002220',
+	"ange;":                            '\U000029A4',
+	"angle;":                           '\U00002220',
+	"angmsd;":                          '\U00002221',
+	"angmsdaa;":                        '\U000029A8',
+	"angmsdab;":                        '\U000029A9',
+	"angmsdac;":                        '\U000029AA',
+	"angmsdad;":                        '\U000029AB',
+	"angmsdae;":                        '\U000029AC',
+	"angmsdaf;":                        '\U000029AD',
+	"angmsdag;":                        '\U000029AE',
+	"angmsdah;":                        '\U000029AF',
+	"angrt;":                           '\U0000221F',
+	"angrtvb;":                         '\U000022BE',
+	"angrtvbd;":                        '\U0000299D',
+	"angsph;":                          '\U00002222',
+	"angst;":                           '\U000000C5',
+	"angzarr;":                         '\U0000237C',
+	"aogon;":                           '\U00000105',
+	"aopf;":                            '\U0001D552',
+	"ap;":                              '\U00002248',
+	"apE;":                             '\U00002A70',
+	"apacir;":                          '\U00002A6F',
+	"ape;":                             '\U0000224A',
+	"apid;":                            '\U0000224B',
+	"apos;":                            '\U00000027',
+	"approx;":                          '\U00002248',
+	"approxeq;":                        '\U0000224A',
+	"aring;":                           '\U000000E5',
+	"ascr;":                            '\U0001D4B6',
+	"ast;":                             '\U0000002A',
+	"asymp;":                           '\U00002248',
+	"asympeq;":                         '\U0000224D',
+	"atilde;":                          '\U000000E3',
+	"auml;":                            '\U000000E4',
+	"awconint;":                        '\U00002233',
+	"awint;":                           '\U00002A11',
+	"bNot;":                            '\U00002AED',
+	"backcong;":                        '\U0000224C',
+	"backepsilon;":                     '\U000003F6',
+	"backprime;":                       '\U00002035',
+	"backsim;":                         '\U0000223D',
+	"backsimeq;":                       '\U000022CD',
+	"barvee;":                          '\U000022BD',
+	"barwed;":                          '\U00002305',
+	"barwedge;":                        '\U00002305',
+	"bbrk;":                            '\U000023B5',
+	"bbrktbrk;":                        '\U000023B6',
+	"bcong;":                           '\U0000224C',
+	"bcy;":                             '\U00000431',
+	"bdquo;":                           '\U0000201E',
+	"becaus;":                          '\U00002235',
+	"because;":                         '\U00002235',
+	"bemptyv;":                         '\U000029B0',
+	"bepsi;":                           '\U000003F6',
+	"bernou;":                          '\U0000212C',
+	"beta;":                            '\U000003B2',
+	"beth;":                            '\U00002136',
+	"between;":                         '\U0000226C',
+	"bfr;":                             '\U0001D51F',
+	"bigcap;":                          '\U000022C2',
+	"bigcirc;":                         '\U000025EF',
+	"bigcup;":                          '\U000022C3',
+	"bigodot;":                         '\U00002A00',
+	"bigoplus;":                        '\U00002A01',
+	"bigotimes;":                       '\U00002A02',
+	"bigsqcup;":                        '\U00002A06',
+	"bigstar;":                         '\U00002605',
+	"bigtriangledown;":                 '\U000025BD',
+	"bigtriangleup;":                   '\U000025B3',
+	"biguplus;":                        '\U00002A04',
+	"bigvee;":                          '\U000022C1',
+	"bigwedge;":                        '\U000022C0',
+	"bkarow;":                          '\U0000290D',
+	"blacklozenge;":                    '\U000029EB',
+	"blacksquare;":                     '\U000025AA',
+	"blacktriangle;":                   '\U000025B4',
+	"blacktriangledown;":               '\U000025BE',
+	"blacktriangleleft;":               '\U000025C2',
+	"blacktriangleright;":              '\U000025B8',
+	"blank;":                           '\U00002423',
+	"blk12;":                           '\U00002592',
+	"blk14;":                           '\U00002591',
+	"blk34;":                           '\U00002593',
+	"block;":                           '\U00002588',
+	"bnot;":                            '\U00002310',
+	"bopf;":                            '\U0001D553',
+	"bot;":                             '\U000022A5',
+	"bottom;":                          '\U000022A5',
+	"bowtie;":                          '\U000022C8',
+	"boxDL;":                           '\U00002557',
+	"boxDR;":                           '\U00002554',
+	"boxDl;":                           '\U00002556',
+	"boxDr;":                           '\U00002553',
+	"boxH;":                            '\U00002550',
+	"boxHD;":                           '\U00002566',
+	"boxHU;":                           '\U00002569',
+	"boxHd;":                           '\U00002564',
+	"boxHu;":                           '\U00002567',
+	"boxUL;":                           '\U0000255D',
+	"boxUR;":                           '\U0000255A',
+	"boxUl;":                           '\U0000255C',
+	"boxUr;":                           '\U00002559',
+	"boxV;":                            '\U00002551',
+	"boxVH;":                           '\U0000256C',
+	"boxVL;":                           '\U00002563',
+	"boxVR;":                           '\U00002560',
+	"boxVh;":                           '\U0000256B',
+	"boxVl;":                           '\U00002562',
+	"boxVr;":                           '\U0000255F',
+	"boxbox;":                          '\U000029C9',
+	"boxdL;":                           '\U00002555',
+	"boxdR;":                           '\U00002552',
+	"boxdl;":                           '\U00002510',
+	"boxdr;":                           '\U0000250C',
+	"boxh;":                            '\U00002500',
+	"boxhD;":                           '\U00002565',
+	"boxhU;":                           '\U00002568',
+	"boxhd;":                           '\U0000252C',
+	"boxhu;":                           '\U00002534',
+	"boxminus;":                        '\U0000229F',
+	"boxplus;":                         '\U0000229E',
+	"boxtimes;":                        '\U000022A0',
+	"boxuL;":                           '\U0000255B',
+	"boxuR;":                           '\U00002558',
+	"boxul;":                           '\U00002518',
+	"boxur;":                           '\U00002514',
+	"boxv;":                            '\U00002502',
+	"boxvH;":                           '\U0000256A',
+	"boxvL;":                           '\U00002561',
+	"boxvR;":                           '\U0000255E',
+	"boxvh;":                           '\U0000253C',
+	"boxvl;":                           '\U00002524',
+	"boxvr;":                           '\U0000251C',
+	"bprime;":                          '\U00002035',
+	"breve;":                           '\U000002D8',
+	"brvbar;":                          '\U000000A6',
+	"bscr;":                            '\U0001D4B7',
+	"bsemi;":                           '\U0000204F',
+	"bsim;":                            '\U0000223D',
+	"bsime;":                           '\U000022CD',
+	"bsol;":                            '\U0000005C',
+	"bsolb;":                           '\U000029C5',
+	"bsolhsub;":                        '\U000027C8',
+	"bull;":                            '\U00002022',
+	"bullet;":                          '\U00002022',
+	"bump;":                            '\U0000224E',
+	"bumpE;":                           '\U00002AAE',
+	"bumpe;":                           '\U0000224F',
+	"bumpeq;":                          '\U0000224F',
+	"cacute;":                          '\U00000107',
+	"cap;":                             '\U00002229',
+	"capand;":                          '\U00002A44',
+	"capbrcup;":                        '\U00002A49',
+	"capcap;":                          '\U00002A4B',
+	"capcup;":                          '\U00002A47',
+	"capdot;":                          '\U00002A40',
+	"caret;":                           '\U00002041',
+	"caron;":                           '\U000002C7',
+	"ccaps;":                           '\U00002A4D',
+	"ccaron;":                          '\U0000010D',
+	"ccedil;":                          '\U000000E7',
+	"ccirc;":                           '\U00000109',
+	"ccups;":                           '\U00002A4C',
+	"ccupssm;":                         '\U00002A50',
+	"cdot;":                            '\U0000010B',
+	"cedil;":                           '\U000000B8',
+	"cemptyv;":                         '\U000029B2',
+	"cent;":                            '\U000000A2',
+	"centerdot;":                       '\U000000B7',
+	"cfr;":                             '\U0001D520',
+	"chcy;":                            '\U00000447',
+	"check;":                           '\U00002713',
+	"checkmark;":                       '\U00002713',
+	"chi;":                             '\U000003C7',
+	"cir;":                             '\U000025CB',
+	"cirE;":                            '\U000029C3',
+	"circ;":                            '\U000002C6',
+	"circeq;":                          '\U00002257',
+	"circlearrowleft;":                 '\U000021BA',
+	"circlearrowright;":                '\U000021BB',
+	"circledR;":                        '\U000000AE',
+	"circledS;":                        '\U000024C8',
+	"circledast;":                      '\U0000229B',
+	"circledcirc;":                     '\U0000229A',
+	"circleddash;":                     '\U0000229D',
+	"cire;":                            '\U00002257',
+	"cirfnint;":                        '\U00002A10',
+	"cirmid;":                          '\U00002AEF',
+	"cirscir;":                         '\U000029C2',
+	"clubs;":                           '\U00002663',
+	"clubsuit;":                        '\U00002663',
+	"colon;":                           '\U0000003A',
+	"colone;":                          '\U00002254',
+	"coloneq;":                         '\U00002254',
+	"comma;":                           '\U0000002C',
+	"commat;":                          '\U00000040',
+	"comp;":                            '\U00002201',
+	"compfn;":                          '\U00002218',
+	"complement;":                      '\U00002201',
+	"complexes;":                       '\U00002102',
+	"cong;":                            '\U00002245',
+	"congdot;":                         '\U00002A6D',
+	"conint;":                          '\U0000222E',
+	"copf;":                            '\U0001D554',
+	"coprod;":                          '\U00002210',
+	"copy;":                            '\U000000A9',
+	"copysr;":                          '\U00002117',
+	"crarr;":                           '\U000021B5',
+	"cross;":                           '\U00002717',
+	"cscr;":                            '\U0001D4B8',
+	"csub;":                            '\U00002ACF',
+	"csube;":                           '\U00002AD1',
+	"csup;":                            '\U00002AD0',
+	"csupe;":                           '\U00002AD2',
+	"ctdot;":                           '\U000022EF',
+	"cudarrl;":                         '\U00002938',
+	"cudarrr;":                         '\U00002935',
+	"cuepr;":                           '\U000022DE',
+	"cuesc;":                           '\U000022DF',
+	"cularr;":                          '\U000021B6',
+	"cularrp;":                         '\U0000293D',
+	"cup;":                             '\U0000222A',
+	"cupbrcap;":                        '\U00002A48',
+	"cupcap;":                          '\U00002A46',
+	"cupcup;":                          '\U00002A4A',
+	"cupdot;":                          '\U0000228D',
+	"cupor;":                           '\U00002A45',
+	"curarr;":                          '\U000021B7',
+	"curarrm;":                         '\U0000293C',
+	"curlyeqprec;":                     '\U000022DE',
+	"curlyeqsucc;":                     '\U000022DF',
+	"curlyvee;":                        '\U000022CE',
+	"curlywedge;":                      '\U000022CF',
+	"curren;":                          '\U000000A4',
+	"curvearrowleft;":                  '\U000021B6',
+	"curvearrowright;":                 '\U000021B7',
+	"cuvee;":                           '\U000022CE',
+	"cuwed;":                           '\U000022CF',
+	"cwconint;":                        '\U00002232',
+	"cwint;":                           '\U00002231',
+	"cylcty;":                          '\U0000232D',
+	"dArr;":                            '\U000021D3',
+	"dHar;":                            '\U00002965',
+	"dagger;":                          '\U00002020',
+	"daleth;":                          '\U00002138',
+	"darr;":                            '\U00002193',
+	"dash;":                            '\U00002010',
+	"dashv;":                           '\U000022A3',
+	"dbkarow;":                         '\U0000290F',
+	"dblac;":                           '\U000002DD',
+	"dcaron;":                          '\U0000010F',
+	"dcy;":                             '\U00000434',
+	"dd;":                              '\U00002146',
+	"ddagger;":                         '\U00002021',
+	"ddarr;":                           '\U000021CA',
+	"ddotseq;":                         '\U00002A77',
+	"deg;":                             '\U000000B0',
+	"delta;":                           '\U000003B4',
+	"demptyv;":                         '\U000029B1',
+	"dfisht;":                          '\U0000297F',
+	"dfr;":                             '\U0001D521',
+	"dharl;":                           '\U000021C3',
+	"dharr;":                           '\U000021C2',
+	"diam;":                            '\U000022C4',
+	"diamond;":                         '\U000022C4',
+	"diamondsuit;":                     '\U00002666',
+	"diams;":                           '\U00002666',
+	"die;":                             '\U000000A8',
+	"digamma;":                         '\U000003DD',
+	"disin;":                           '\U000022F2',
+	"div;":                             '\U000000F7',
+	"divide;":                          '\U000000F7',
+	"divideontimes;":                   '\U000022C7',
+	"divonx;":                          '\U000022C7',
+	"djcy;":                            '\U00000452',
+	"dlcorn;":                          '\U0000231E',
+	"dlcrop;":                          '\U0000230D',
+	"dollar;":                          '\U00000024',
+	"dopf;":                            '\U0001D555',
+	"dot;":                             '\U000002D9',
+	"doteq;":                           '\U00002250',
+	"doteqdot;":                        '\U00002251',
+	"dotminus;":                        '\U00002238',
+	"dotplus;":                         '\U00002214',
+	"dotsquare;":                       '\U000022A1',
+	"doublebarwedge;":                  '\U00002306',
+	"downarrow;":                       '\U00002193',
+	"downdownarrows;":                  '\U000021CA',
+	"downharpoonleft;":                 '\U000021C3',
+	"downharpoonright;":                '\U000021C2',
+	"drbkarow;":                        '\U00002910',
+	"drcorn;":                          '\U0000231F',
+	"drcrop;":                          '\U0000230C',
+	"dscr;":                            '\U0001D4B9',
+	"dscy;":                            '\U00000455',
+	"dsol;":                            '\U000029F6',
+	"dstrok;":                          '\U00000111',
+	"dtdot;":                           '\U000022F1',
+	"dtri;":                            '\U000025BF',
+	"dtrif;":                           '\U000025BE',
+	"duarr;":                           '\U000021F5',
+	"duhar;":                           '\U0000296F',
+	"dwangle;":                         '\U000029A6',
+	"dzcy;":                            '\U0000045F',
+	"dzigrarr;":                        '\U000027FF',
+	"eDDot;":                           '\U00002A77',
+	"eDot;":                            '\U00002251',
+	"eacute;":                          '\U000000E9',
+	"easter;":                          '\U00002A6E',
+	"ecaron;":                          '\U0000011B',
+	"ecir;":                            '\U00002256',
+	"ecirc;":                           '\U000000EA',
+	"ecolon;":                          '\U00002255',
+	"ecy;":                             '\U0000044D',
+	"edot;":                            '\U00000117',
+	"ee;":                              '\U00002147',
+	"efDot;":                           '\U00002252',
+	"efr;":                             '\U0001D522',
+	"eg;":                              '\U00002A9A',
+	"egrave;":                          '\U000000E8',
+	"egs;":                             '\U00002A96',
+	"egsdot;":                          '\U00002A98',
+	"el;":                              '\U00002A99',
+	"elinters;":                        '\U000023E7',
+	"ell;":                             '\U00002113',
+	"els;":                             '\U00002A95',
+	"elsdot;":                          '\U00002A97',
+	"emacr;":                           '\U00000113',
+	"empty;":                           '\U00002205',
+	"emptyset;":                        '\U00002205',
+	"emptyv;":                          '\U00002205',
+	"emsp;":                            '\U00002003',
+	"emsp13;":                          '\U00002004',
+	"emsp14;":                          '\U00002005',
+	"eng;":                             '\U0000014B',
+	"ensp;":                            '\U00002002',
+	"eogon;":                           '\U00000119',
+	"eopf;":                            '\U0001D556',
+	"epar;":                            '\U000022D5',
+	"eparsl;":                          '\U000029E3',
+	"eplus;":                           '\U00002A71',
+	"epsi;":                            '\U000003B5',
+	"epsilon;":                         '\U000003B5',
+	"epsiv;":                           '\U000003F5',
+	"eqcirc;":                          '\U00002256',
+	"eqcolon;":                         '\U00002255',
+	"eqsim;":                           '\U00002242',
+	"eqslantgtr;":                      '\U00002A96',
+	"eqslantless;":                     '\U00002A95',
+	"equals;":                          '\U0000003D',
+	"equest;":                          '\U0000225F',
+	"equiv;":                           '\U00002261',
+	"equivDD;":                         '\U00002A78',
+	"eqvparsl;":                        '\U000029E5',
+	"erDot;":                           '\U00002253',
+	"erarr;":                           '\U00002971',
+	"escr;":                            '\U0000212F',
+	"esdot;":                           '\U00002250',
+	"esim;":                            '\U00002242',
+	"eta;":                             '\U000003B7',
+	"eth;":                             '\U000000F0',
+	"euml;":                            '\U000000EB',
+	"euro;":                            '\U000020AC',
+	"excl;":                            '\U00000021',
+	"exist;":                           '\U00002203',
+	"expectation;":                     '\U00002130',
+	"exponentiale;":                    '\U00002147',
+	"fallingdotseq;":                   '\U00002252',
+	"fcy;":                             '\U00000444',
+	"female;":                          '\U00002640',
+	"ffilig;":                          '\U0000FB03',
+	"fflig;":                           '\U0000FB00',
+	"ffllig;":                          '\U0000FB04',
+	"ffr;":                             '\U0001D523',
+	"filig;":                           '\U0000FB01',
+	"flat;":                            '\U0000266D',
+	"fllig;":                           '\U0000FB02',
+	"fltns;":                           '\U000025B1',
+	"fnof;":                            '\U00000192',
+	"fopf;":                            '\U0001D557',
+	"forall;":                          '\U00002200',
+	"fork;":                            '\U000022D4',
+	"forkv;":                           '\U00002AD9',
+	"fpartint;":                        '\U00002A0D',
+	"frac12;":                          '\U000000BD',
+	"frac13;":                          '\U00002153',
+	"frac14;":                          '\U000000BC',
+	"frac15;":                          '\U00002155',
+	"frac16;":                          '\U00002159',
+	"frac18;":                          '\U0000215B',
+	"frac23;":                          '\U00002154',
+	"frac25;":                          '\U00002156',
+	"frac34;":                          '\U000000BE',
+	"frac35;":                          '\U00002157',
+	"frac38;":                          '\U0000215C',
+	"frac45;":                          '\U00002158',
+	"frac56;":                          '\U0000215A',
+	"frac58;":                          '\U0000215D',
+	"frac78;":                          '\U0000215E',
+	"frasl;":                           '\U00002044',
+	"frown;":                           '\U00002322',
+	"fscr;":                            '\U0001D4BB',
+	"gE;":                              '\U00002267',
+	"gEl;":                             '\U00002A8C',
+	"gacute;":                          '\U000001F5',
+	"gamma;":                           '\U000003B3',
+	"gammad;":                          '\U000003DD',
+	"gap;":                             '\U00002A86',
+	"gbreve;":                          '\U0000011F',
+	"gcirc;":                           '\U0000011D',
+	"gcy;":                             '\U00000433',
+	"gdot;":                            '\U00000121',
+	"ge;":                              '\U00002265',
+	"gel;":                             '\U000022DB',
+	"geq;":                             '\U00002265',
+	"geqq;":                            '\U00002267',
+	"geqslant;":                        '\U00002A7E',
+	"ges;":                             '\U00002A7E',
+	"gescc;":                           '\U00002AA9',
+	"gesdot;":                          '\U00002A80',
+	"gesdoto;":                         '\U00002A82',
+	"gesdotol;":                        '\U00002A84',
+	"gesles;":                          '\U00002A94',
+	"gfr;":                             '\U0001D524',
+	"gg;":                              '\U0000226B',
+	"ggg;":                             '\U000022D9',
+	"gimel;":                           '\U00002137',
+	"gjcy;":                            '\U00000453',
+	"gl;":                              '\U00002277',
+	"glE;":                             '\U00002A92',
+	"gla;":                             '\U00002AA5',
+	"glj;":                             '\U00002AA4',
+	"gnE;":                             '\U00002269',
+	"gnap;":                            '\U00002A8A',
+	"gnapprox;":                        '\U00002A8A',
+	"gne;":                             '\U00002A88',
+	"gneq;":                            '\U00002A88',
+	"gneqq;":                           '\U00002269',
+	"gnsim;":                           '\U000022E7',
+	"gopf;":                            '\U0001D558',
+	"grave;":                           '\U00000060',
+	"gscr;":                            '\U0000210A',
+	"gsim;":                            '\U00002273',
+	"gsime;":                           '\U00002A8E',
+	"gsiml;":                           '\U00002A90',
+	"gt;":                              '\U0000003E',
+	"gtcc;":                            '\U00002AA7',
+	"gtcir;":                           '\U00002A7A',
+	"gtdot;":                           '\U000022D7',
+	"gtlPar;":                          '\U00002995',
+	"gtquest;":                         '\U00002A7C',
+	"gtrapprox;":                       '\U00002A86',
+	"gtrarr;":                          '\U00002978',
+	"gtrdot;":                          '\U000022D7',
+	"gtreqless;":                       '\U000022DB',
+	"gtreqqless;":                      '\U00002A8C',
+	"gtrless;":                         '\U00002277',
+	"gtrsim;":                          '\U00002273',
+	"hArr;":                            '\U000021D4',
+	"hairsp;":                          '\U0000200A',
+	"half;":                            '\U000000BD',
+	"hamilt;":                          '\U0000210B',
+	"hardcy;":                          '\U0000044A',
+	"harr;":                            '\U00002194',
+	"harrcir;":                         '\U00002948',
+	"harrw;":                           '\U000021AD',
+	"hbar;":                            '\U0000210F',
+	"hcirc;":                           '\U00000125',
+	"hearts;":                          '\U00002665',
+	"heartsuit;":                       '\U00002665',
+	"hellip;":                          '\U00002026',
+	"hercon;":                          '\U000022B9',
+	"hfr;":                             '\U0001D525',
+	"hksearow;":                        '\U00002925',
+	"hkswarow;":                        '\U00002926',
+	"hoarr;":                           '\U000021FF',
+	"homtht;":                          '\U0000223B',
+	"hookleftarrow;":                   '\U000021A9',
+	"hookrightarrow;":                  '\U000021AA',
+	"hopf;":                            '\U0001D559',
+	"horbar;":                          '\U00002015',
+	"hscr;":                            '\U0001D4BD',
+	"hslash;":                          '\U0000210F',
+	"hstrok;":                          '\U00000127',
+	"hybull;":                          '\U00002043',
+	"hyphen;":                          '\U00002010',
+	"iacute;":                          '\U000000ED',
+	"ic;":                              '\U00002063',
+	"icirc;":                           '\U000000EE',
+	"icy;":                             '\U00000438',
+	"iecy;":                            '\U00000435',
+	"iexcl;":                           '\U000000A1',
+	"iff;":                             '\U000021D4',
+	"ifr;":                             '\U0001D526',
+	"igrave;":                          '\U000000EC',
+	"ii;":                              '\U00002148',
+	"iiiint;":                          '\U00002A0C',
+	"iiint;":                           '\U0000222D',
+	"iinfin;":                          '\U000029DC',
+	"iiota;":                           '\U00002129',
+	"ijlig;":                           '\U00000133',
+	"imacr;":                           '\U0000012B',
+	"image;":                           '\U00002111',
+	"imagline;":                        '\U00002110',
+	"imagpart;":                        '\U00002111',
+	"imath;":                           '\U00000131',
+	"imof;":                            '\U000022B7',
+	"imped;":                           '\U000001B5',
+	"in;":                              '\U00002208',
+	"incare;":                          '\U00002105',
+	"infin;":                           '\U0000221E',
+	"infintie;":                        '\U000029DD',
+	"inodot;":                          '\U00000131',
+	"int;":                             '\U0000222B',
+	"intcal;":                          '\U000022BA',
+	"integers;":                        '\U00002124',
+	"intercal;":                        '\U000022BA',
+	"intlarhk;":                        '\U00002A17',
+	"intprod;":                         '\U00002A3C',
+	"iocy;":                            '\U00000451',
+	"iogon;":                           '\U0000012F',
+	"iopf;":                            '\U0001D55A',
+	"iota;":                            '\U000003B9',
+	"iprod;":                           '\U00002A3C',
+	"iquest;":                          '\U000000BF',
+	"iscr;":                            '\U0001D4BE',
+	"isin;":                            '\U00002208',
+	"isinE;":                           '\U000022F9',
+	"isindot;":                         '\U000022F5',
+	"isins;":                           '\U000022F4',
+	"isinsv;":                          '\U000022F3',
+	"isinv;":                           '\U00002208',
+	"it;":                              '\U00002062',
+	"itilde;":                          '\U00000129',
+	"iukcy;":                           '\U00000456',
+	"iuml;":                            '\U000000EF',
+	"jcirc;":                           '\U00000135',
+	"jcy;":                             '\U00000439',
+	"jfr;":                             '\U0001D527',
+	"jmath;":                           '\U00000237',
+	"jopf;":                            '\U0001D55B',
+	"jscr;":                            '\U0001D4BF',
+	"jsercy;":                          '\U00000458',
+	"jukcy;":                           '\U00000454',
+	"kappa;":                           '\U000003BA',
+	"kappav;":                          '\U000003F0',
+	"kcedil;":                          '\U00000137',
+	"kcy;":                             '\U0000043A',
+	"kfr;":                             '\U0001D528',
+	"kgreen;":                          '\U00000138',
+	"khcy;":                            '\U00000445',
+	"kjcy;":                            '\U0000045C',
+	"kopf;":                            '\U0001D55C',
+	"kscr;":                            '\U0001D4C0',
+	"lAarr;":                           '\U000021DA',
+	"lArr;":                            '\U000021D0',
+	"lAtail;":                          '\U0000291B',
+	"lBarr;":                           '\U0000290E',
+	"lE;":                              '\U00002266',
+	"lEg;":                             '\U00002A8B',
+	"lHar;":                            '\U00002962',
+	"lacute;":                          '\U0000013A',
+	"laemptyv;":                        '\U000029B4',
+	"lagran;":                          '\U00002112',
+	"lambda;":                          '\U000003BB',
+	"lang;":                            '\U000027E8',
+	"langd;":                           '\U00002991',
+	"langle;":                          '\U000027E8',
+	"lap;":                             '\U00002A85',
+	"laquo;":                           '\U000000AB',
+	"larr;":                            '\U00002190',
+	"larrb;":                           '\U000021E4',
+	"larrbfs;":                         '\U0000291F',
+	"larrfs;":                          '\U0000291D',
+	"larrhk;":                          '\U000021A9',
+	"larrlp;":                          '\U000021AB',
+	"larrpl;":                          '\U00002939',
+	"larrsim;":                         '\U00002973',
+	"larrtl;":                          '\U000021A2',
+	"lat;":                             '\U00002AAB',
+	"latail;":                          '\U00002919',
+	"late;":                            '\U00002AAD',
+	"lbarr;":                           '\U0000290C',
+	"lbbrk;":                           '\U00002772',
+	"lbrace;":                          '\U0000007B',
+	"lbrack;":                          '\U0000005B',
+	"lbrke;":                           '\U0000298B',
+	"lbrksld;":                         '\U0000298F',
+	"lbrkslu;":                         '\U0000298D',
+	"lcaron;":                          '\U0000013E',
+	"lcedil;":                          '\U0000013C',
+	"lceil;":                           '\U00002308',
+	"lcub;":                            '\U0000007B',
+	"lcy;":                             '\U0000043B',
+	"ldca;":                            '\U00002936',
+	"ldquo;":                           '\U0000201C',
+	"ldquor;":                          '\U0000201E',
+	"ldrdhar;":                         '\U00002967',
+	"ldrushar;":                        '\U0000294B',
+	"ldsh;":                            '\U000021B2',
+	"le;":                              '\U00002264',
+	"leftarrow;":                       '\U00002190',
+	"leftarrowtail;":                   '\U000021A2',
+	"leftharpoondown;":                 '\U000021BD',
+	"leftharpoonup;":                   '\U000021BC',
+	"leftleftarrows;":                  '\U000021C7',
+	"leftrightarrow;":                  '\U00002194',
+	"leftrightarrows;":                 '\U000021C6',
+	"leftrightharpoons;":               '\U000021CB',
+	"leftrightsquigarrow;":             '\U000021AD',
+	"leftthreetimes;":                  '\U000022CB',
+	"leg;":                             '\U000022DA',
+	"leq;":                             '\U00002264',
+	"leqq;":                            '\U00002266',
+	"leqslant;":                        '\U00002A7D',
+	"les;":                             '\U00002A7D',
+	"lescc;":                           '\U00002AA8',
+	"lesdot;":                          '\U00002A7F',
+	"lesdoto;":                         '\U00002A81',
+	"lesdotor;":                        '\U00002A83',
+	"lesges;":                          '\U00002A93',
+	"lessapprox;":                      '\U00002A85',
+	"lessdot;":                         '\U000022D6',
+	"lesseqgtr;":                       '\U000022DA',
+	"lesseqqgtr;":                      '\U00002A8B',
+	"lessgtr;":                         '\U00002276',
+	"lesssim;":                         '\U00002272',
+	"lfisht;":                          '\U0000297C',
+	"lfloor;":                          '\U0000230A',
+	"lfr;":                             '\U0001D529',
+	"lg;":                              '\U00002276',
+	"lgE;":                             '\U00002A91',
+	"lhard;":                           '\U000021BD',
+	"lharu;":                           '\U000021BC',
+	"lharul;":                          '\U0000296A',
+	"lhblk;":                           '\U00002584',
+	"ljcy;":                            '\U00000459',
+	"ll;":                              '\U0000226A',
+	"llarr;":                           '\U000021C7',
+	"llcorner;":                        '\U0000231E',
+	"llhard;":                          '\U0000296B',
+	"lltri;":                           '\U000025FA',
+	"lmidot;":                          '\U00000140',
+	"lmoust;":                          '\U000023B0',
+	"lmoustache;":                      '\U000023B0',
+	"lnE;":                             '\U00002268',
+	"lnap;":                            '\U00002A89',
+	"lnapprox;":                        '\U00002A89',
+	"lne;":                             '\U00002A87',
+	"lneq;":                            '\U00002A87',
+	"lneqq;":                           '\U00002268',
+	"lnsim;":                           '\U000022E6',
+	"loang;":                           '\U000027EC',
+	"loarr;":                           '\U000021FD',
+	"lobrk;":                           '\U000027E6',
+	"longleftarrow;":                   '\U000027F5',
+	"longleftrightarrow;":              '\U000027F7',
+	"longmapsto;":                      '\U000027FC',
+	"longrightarrow;":                  '\U000027F6',
+	"looparrowleft;":                   '\U000021AB',
+	"looparrowright;":                  '\U000021AC',
+	"lopar;":                           '\U00002985',
+	"lopf;":                            '\U0001D55D',
+	"loplus;":                          '\U00002A2D',
+	"lotimes;":                         '\U00002A34',
+	"lowast;":                          '\U00002217',
+	"lowbar;":                          '\U0000005F',
+	"loz;":                             '\U000025CA',
+	"lozenge;":                         '\U000025CA',
+	"lozf;":                            '\U000029EB',
+	"lpar;":                            '\U00000028',
+	"lparlt;":                          '\U00002993',
+	"lrarr;":                           '\U000021C6',
+	"lrcorner;":                        '\U0000231F',
+	"lrhar;":                           '\U000021CB',
+	"lrhard;":                          '\U0000296D',
+	"lrm;":                             '\U0000200E',
+	"lrtri;":                           '\U000022BF',
+	"lsaquo;":                          '\U00002039',
+	"lscr;":                            '\U0001D4C1',
+	"lsh;":                             '\U000021B0',
+	"lsim;":                            '\U00002272',
+	"lsime;":                           '\U00002A8D',
+	"lsimg;":                           '\U00002A8F',
+	"lsqb;":                            '\U0000005B',
+	"lsquo;":                           '\U00002018',
+	"lsquor;":                          '\U0000201A',
+	"lstrok;":                          '\U00000142',
+	"lt;":                              '\U0000003C',
+	"ltcc;":                            '\U00002AA6',
+	"ltcir;":                           '\U00002A79',
+	"ltdot;":                           '\U000022D6',
+	"lthree;":                          '\U000022CB',
+	"ltimes;":                          '\U000022C9',
+	"ltlarr;":                          '\U00002976',
+	"ltquest;":                         '\U00002A7B',
+	"ltrPar;":                          '\U00002996',
+	"ltri;":                            '\U000025C3',
+	"ltrie;":                           '\U000022B4',
+	"ltrif;":                           '\U000025C2',
+	"lurdshar;":                        '\U0000294A',
+	"luruhar;":                         '\U00002966',
+	"mDDot;":                           '\U0000223A',
+	"macr;":                            '\U000000AF',
+	"male;":                            '\U00002642',
+	"malt;":                            '\U00002720',
+	"maltese;":                         '\U00002720',
+	"map;":                             '\U000021A6',
+	"mapsto;":                          '\U000021A6',
+	"mapstodown;":                      '\U000021A7',
+	"mapstoleft;":                      '\U000021A4',
+	"mapstoup;":                        '\U000021A5',
+	"marker;":                          '\U000025AE',
+	"mcomma;":                          '\U00002A29',
+	"mcy;":                             '\U0000043C',
+	"mdash;":                           '\U00002014',
+	"measuredangle;":                   '\U00002221',
+	"mfr;":                             '\U0001D52A',
+	"mho;":                             '\U00002127',
+	"micro;":                           '\U000000B5',
+	"mid;":                             '\U00002223',
+	"midast;":                          '\U0000002A',
+	"midcir;":                          '\U00002AF0',
+	"middot;":                          '\U000000B7',
+	"minus;":                           '\U00002212',
+	"minusb;":                          '\U0000229F',
+	"minusd;":                          '\U00002238',
+	"minusdu;":                         '\U00002A2A',
+	"mlcp;":                            '\U00002ADB',
+	"mldr;":                            '\U00002026',
+	"mnplus;":                          '\U00002213',
+	"models;":                          '\U000022A7',
+	"mopf;":                            '\U0001D55E',
+	"mp;":                              '\U00002213',
+	"mscr;":                            '\U0001D4C2',
+	"mstpos;":                          '\U0000223E',
+	"mu;":                              '\U000003BC',
+	"multimap;":                        '\U000022B8',
+	"mumap;":                           '\U000022B8',
+	"nLeftarrow;":                      '\U000021CD',
+	"nLeftrightarrow;":                 '\U000021CE',
+	"nRightarrow;":                     '\U000021CF',
+	"nVDash;":                          '\U000022AF',
+	"nVdash;":                          '\U000022AE',
+	"nabla;":                           '\U00002207',
+	"nacute;":                          '\U00000144',
+	"nap;":                             '\U00002249',
+	"napos;":                           '\U00000149',
+	"napprox;":                         '\U00002249',
+	"natur;":                           '\U0000266E',
+	"natural;":                         '\U0000266E',
+	"naturals;":                        '\U00002115',
+	"nbsp;":                            '\U000000A0',
+	"ncap;":                            '\U00002A43',
+	"ncaron;":                          '\U00000148',
+	"ncedil;":                          '\U00000146',
+	"ncong;":                           '\U00002247',
+	"ncup;":                            '\U00002A42',
+	"ncy;":                             '\U0000043D',
+	"ndash;":                           '\U00002013',
+	"ne;":                              '\U00002260',
+	"neArr;":                           '\U000021D7',
+	"nearhk;":                          '\U00002924',
+	"nearr;":                           '\U00002197',
+	"nearrow;":                         '\U00002197',
+	"nequiv;":                          '\U00002262',
+	"nesear;":                          '\U00002928',
+	"nexist;":                          '\U00002204',
+	"nexists;":                         '\U00002204',
+	"nfr;":                             '\U0001D52B',
+	"nge;":                             '\U00002271',
+	"ngeq;":                            '\U00002271',
+	"ngsim;":                           '\U00002275',
+	"ngt;":                             '\U0000226F',
+	"ngtr;":                            '\U0000226F',
+	"nhArr;":                           '\U000021CE',
+	"nharr;":                           '\U000021AE',
+	"nhpar;":                           '\U00002AF2',
+	"ni;":                              '\U0000220B',
+	"nis;":                             '\U000022FC',
+	"nisd;":                            '\U000022FA',
+	"niv;":                             '\U0000220B',
+	"njcy;":                            '\U0000045A',
+	"nlArr;":                           '\U000021CD',
+	"nlarr;":                           '\U0000219A',
+	"nldr;":                            '\U00002025',
+	"nle;":                             '\U00002270',
+	"nleftarrow;":                      '\U0000219A',
+	"nleftrightarrow;":                 '\U000021AE',
+	"nleq;":                            '\U00002270',
+	"nless;":                           '\U0000226E',
+	"nlsim;":                           '\U00002274',
+	"nlt;":                             '\U0000226E',
+	"nltri;":                           '\U000022EA',
+	"nltrie;":                          '\U000022EC',
+	"nmid;":                            '\U00002224',
+	"nopf;":                            '\U0001D55F',
+	"not;":                             '\U000000AC',
+	"notin;":                           '\U00002209',
+	"notinva;":                         '\U00002209',
+	"notinvb;":                         '\U000022F7',
+	"notinvc;":                         '\U000022F6',
+	"notni;":                           '\U0000220C',
+	"notniva;":                         '\U0000220C',
+	"notnivb;":                         '\U000022FE',
+	"notnivc;":                         '\U000022FD',
+	"npar;":                            '\U00002226',
+	"nparallel;":                       '\U00002226',
+	"npolint;":                         '\U00002A14',
+	"npr;":                             '\U00002280',
+	"nprcue;":                          '\U000022E0',
+	"nprec;":                           '\U00002280',
+	"nrArr;":                           '\U000021CF',
+	"nrarr;":                           '\U0000219B',
+	"nrightarrow;":                     '\U0000219B',
+	"nrtri;":                           '\U000022EB',
+	"nrtrie;":                          '\U000022ED',
+	"nsc;":                             '\U00002281',
+	"nsccue;":                          '\U000022E1',
+	"nscr;":                            '\U0001D4C3',
+	"nshortmid;":                       '\U00002224',
+	"nshortparallel;":                  '\U00002226',
+	"nsim;":                            '\U00002241',
+	"nsime;":                           '\U00002244',
+	"nsimeq;":                          '\U00002244',
+	"nsmid;":                           '\U00002224',
+	"nspar;":                           '\U00002226',
+	"nsqsube;":                         '\U000022E2',
+	"nsqsupe;":                         '\U000022E3',
+	"nsub;":                            '\U00002284',
+	"nsube;":                           '\U00002288',
+	"nsubseteq;":                       '\U00002288',
+	"nsucc;":                           '\U00002281',
+	"nsup;":                            '\U00002285',
+	"nsupe;":                           '\U00002289',
+	"nsupseteq;":                       '\U00002289',
+	"ntgl;":                            '\U00002279',
+	"ntilde;":                          '\U000000F1',
+	"ntlg;":                            '\U00002278',
+	"ntriangleleft;":                   '\U000022EA',
+	"ntrianglelefteq;":                 '\U000022EC',
+	"ntriangleright;":                  '\U000022EB',
+	"ntrianglerighteq;":                '\U000022ED',
+	"nu;":                              '\U000003BD',
+	"num;":                             '\U00000023',
+	"numero;":                          '\U00002116',
+	"numsp;":                           '\U00002007',
+	"nvDash;":                          '\U000022AD',
+	"nvHarr;":                          '\U00002904',
+	"nvdash;":                          '\U000022AC',
+	"nvinfin;":                         '\U000029DE',
+	"nvlArr;":                          '\U00002902',
+	"nvrArr;":                          '\U00002903',
+	"nwArr;":                           '\U000021D6',
+	"nwarhk;":                          '\U00002923',
+	"nwarr;":                           '\U00002196',
+	"nwarrow;":                         '\U00002196',
+	"nwnear;":                          '\U00002927',
+	"oS;":                              '\U000024C8',
+	"oacute;":                          '\U000000F3',
+	"oast;":                            '\U0000229B',
+	"ocir;":                            '\U0000229A',
+	"ocirc;":                           '\U000000F4',
+	"ocy;":                             '\U0000043E',
+	"odash;":                           '\U0000229D',
+	"odblac;":                          '\U00000151',
+	"odiv;":                            '\U00002A38',
+	"odot;":                            '\U00002299',
+	"odsold;":                          '\U000029BC',
+	"oelig;":                           '\U00000153',
+	"ofcir;":                           '\U000029BF',
+	"ofr;":                             '\U0001D52C',
+	"ogon;":                            '\U000002DB',
+	"ograve;":                          '\U000000F2',
+	"ogt;":                             '\U000029C1',
+	"ohbar;":                           '\U000029B5',
+	"ohm;":                             '\U000003A9',
+	"oint;":                            '\U0000222E',
+	"olarr;":                           '\U000021BA',
+	"olcir;":                           '\U000029BE',
+	"olcross;":                         '\U000029BB',
+	"oline;":                           '\U0000203E',
+	"olt;":                             '\U000029C0',
+	"omacr;":                           '\U0000014D',
+	"omega;":                           '\U000003C9',
+	"omicron;":                         '\U000003BF',
+	"omid;":                            '\U000029B6',
+	"ominus;":                          '\U00002296',
+	"oopf;":                            '\U0001D560',
+	"opar;":                            '\U000029B7',
+	"operp;":                           '\U000029B9',
+	"oplus;":                           '\U00002295',
+	"or;":                              '\U00002228',
+	"orarr;":                           '\U000021BB',
+	"ord;":                             '\U00002A5D',
+	"order;":                           '\U00002134',
+	"orderof;":                         '\U00002134',
+	"ordf;":                            '\U000000AA',
+	"ordm;":                            '\U000000BA',
+	"origof;":                          '\U000022B6',
+	"oror;":                            '\U00002A56',
+	"orslope;":                         '\U00002A57',
+	"orv;":                             '\U00002A5B',
+	"oscr;":                            '\U00002134',
+	"oslash;":                          '\U000000F8',
+	"osol;":                            '\U00002298',
+	"otilde;":                          '\U000000F5',
+	"otimes;":                          '\U00002297',
+	"otimesas;":                        '\U00002A36',
+	"ouml;":                            '\U000000F6',
+	"ovbar;":                           '\U0000233D',
+	"par;":                             '\U00002225',
+	"para;":                            '\U000000B6',
+	"parallel;":                        '\U00002225',
+	"parsim;":                          '\U00002AF3',
+	"parsl;":                           '\U00002AFD',
+	"part;":                            '\U00002202',
+	"pcy;":                             '\U0000043F',
+	"percnt;":                          '\U00000025',
+	"period;":                          '\U0000002E',
+	"permil;":                          '\U00002030',
+	"perp;":                            '\U000022A5',
+	"pertenk;":                         '\U00002031',
+	"pfr;":                             '\U0001D52D',
+	"phi;":                             '\U000003C6',
+	"phiv;":                            '\U000003D5',
+	"phmmat;":                          '\U00002133',
+	"phone;":                           '\U0000260E',
+	"pi;":                              '\U000003C0',
+	"pitchfork;":                       '\U000022D4',
+	"piv;":                             '\U000003D6',
+	"planck;":                          '\U0000210F',
+	"planckh;":                         '\U0000210E',
+	"plankv;":                          '\U0000210F',
+	"plus;":                            '\U0000002B',
+	"plusacir;":                        '\U00002A23',
+	"plusb;":                           '\U0000229E',
+	"pluscir;":                         '\U00002A22',
+	"plusdo;":                          '\U00002214',
+	"plusdu;":                          '\U00002A25',
+	"pluse;":                           '\U00002A72',
+	"plusmn;":                          '\U000000B1',
+	"plussim;":                         '\U00002A26',
+	"plustwo;":                         '\U00002A27',
+	"pm;":                              '\U000000B1',
+	"pointint;":                        '\U00002A15',
+	"popf;":                            '\U0001D561',
+	"pound;":                           '\U000000A3',
+	"pr;":                              '\U0000227A',
+	"prE;":                             '\U00002AB3',
+	"prap;":                            '\U00002AB7',
+	"prcue;":                           '\U0000227C',
+	"pre;":                             '\U00002AAF',
+	"prec;":                            '\U0000227A',
+	"precapprox;":                      '\U00002AB7',
+	"preccurlyeq;":                     '\U0000227C',
+	"preceq;":                          '\U00002AAF',
+	"precnapprox;":                     '\U00002AB9',
+	"precneqq;":                        '\U00002AB5',
+	"precnsim;":                        '\U000022E8',
+	"precsim;":                         '\U0000227E',
+	"prime;":                           '\U00002032',
+	"primes;":                          '\U00002119',
+	"prnE;":                            '\U00002AB5',
+	"prnap;":                           '\U00002AB9',
+	"prnsim;":                          '\U000022E8',
+	"prod;":                            '\U0000220F',
+	"profalar;":                        '\U0000232E',
+	"profline;":                        '\U00002312',
+	"profsurf;":                        '\U00002313',
+	"prop;":                            '\U0000221D',
+	"propto;":                          '\U0000221D',
+	"prsim;":                           '\U0000227E',
+	"prurel;":                          '\U000022B0',
+	"pscr;":                            '\U0001D4C5',
+	"psi;":                             '\U000003C8',
+	"puncsp;":                          '\U00002008',
+	"qfr;":                             '\U0001D52E',
+	"qint;":                            '\U00002A0C',
+	"qopf;":                            '\U0001D562',
+	"qprime;":                          '\U00002057',
+	"qscr;":                            '\U0001D4C6',
+	"quaternions;":                     '\U0000210D',
+	"quatint;":                         '\U00002A16',
+	"quest;":                           '\U0000003F',
+	"questeq;":                         '\U0000225F',
+	"quot;":                            '\U00000022',
+	"rAarr;":                           '\U000021DB',
+	"rArr;":                            '\U000021D2',
+	"rAtail;":                          '\U0000291C',
+	"rBarr;":                           '\U0000290F',
+	"rHar;":                            '\U00002964',
+	"racute;":                          '\U00000155',
+	"radic;":                           '\U0000221A',
+	"raemptyv;":                        '\U000029B3',
+	"rang;":                            '\U000027E9',
+	"rangd;":                           '\U00002992',
+	"range;":                           '\U000029A5',
+	"rangle;":                          '\U000027E9',
+	"raquo;":                           '\U000000BB',
+	"rarr;":                            '\U00002192',
+	"rarrap;":                          '\U00002975',
+	"rarrb;":                           '\U000021E5',
+	"rarrbfs;":                         '\U00002920',
+	"rarrc;":                           '\U00002933',
+	"rarrfs;":                          '\U0000291E',
+	"rarrhk;":                          '\U000021AA',
+	"rarrlp;":                          '\U000021AC',
+	"rarrpl;":                          '\U00002945',
+	"rarrsim;":                         '\U00002974',
+	"rarrtl;":                          '\U000021A3',
+	"rarrw;":                           '\U0000219D',
+	"ratail;":                          '\U0000291A',
+	"ratio;":                           '\U00002236',
+	"rationals;":                       '\U0000211A',
+	"rbarr;":                           '\U0000290D',
+	"rbbrk;":                           '\U00002773',
+	"rbrace;":                          '\U0000007D',
+	"rbrack;":                          '\U0000005D',
+	"rbrke;":                           '\U0000298C',
+	"rbrksld;":                         '\U0000298E',
+	"rbrkslu;":                         '\U00002990',
+	"rcaron;":                          '\U00000159',
+	"rcedil;":                          '\U00000157',
+	"rceil;":                           '\U00002309',
+	"rcub;":                            '\U0000007D',
+	"rcy;":                             '\U00000440',
+	"rdca;":                            '\U00002937',
+	"rdldhar;":                         '\U00002969',
+	"rdquo;":                           '\U0000201D',
+	"rdquor;":                          '\U0000201D',
+	"rdsh;":                            '\U000021B3',
+	"real;":                            '\U0000211C',
+	"realine;":                         '\U0000211B',
+	"realpart;":                        '\U0000211C',
+	"reals;":                           '\U0000211D',
+	"rect;":                            '\U000025AD',
+	"reg;":                             '\U000000AE',
+	"rfisht;":                          '\U0000297D',
+	"rfloor;":                          '\U0000230B',
+	"rfr;":                             '\U0001D52F',
+	"rhard;":                           '\U000021C1',
+	"rharu;":                           '\U000021C0',
+	"rharul;":                          '\U0000296C',
+	"rho;":                             '\U000003C1',
+	"rhov;":                            '\U000003F1',
+	"rightarrow;":                      '\U00002192',
+	"rightarrowtail;":                  '\U000021A3',
+	"rightharpoondown;":                '\U000021C1',
+	"rightharpoonup;":                  '\U000021C0',
+	"rightleftarrows;":                 '\U000021C4',
+	"rightleftharpoons;":               '\U000021CC',
+	"rightrightarrows;":                '\U000021C9',
+	"rightsquigarrow;":                 '\U0000219D',
+	"rightthreetimes;":                 '\U000022CC',
+	"ring;":                            '\U000002DA',
+	"risingdotseq;":                    '\U00002253',
+	"rlarr;":                           '\U000021C4',
+	"rlhar;":                           '\U000021CC',
+	"rlm;":                             '\U0000200F',
+	"rmoust;":                          '\U000023B1',
+	"rmoustache;":                      '\U000023B1',
+	"rnmid;":                           '\U00002AEE',
+	"roang;":                           '\U000027ED',
+	"roarr;":                           '\U000021FE',
+	"robrk;":                           '\U000027E7',
+	"ropar;":                           '\U00002986',
+	"ropf;":                            '\U0001D563',
+	"roplus;":                          '\U00002A2E',
+	"rotimes;":                         '\U00002A35',
+	"rpar;":                            '\U00000029',
+	"rpargt;":                          '\U00002994',
+	"rppolint;":                        '\U00002A12',
+	"rrarr;":                           '\U000021C9',
+	"rsaquo;":                          '\U0000203A',
+	"rscr;":                            '\U0001D4C7',
+	"rsh;":                             '\U000021B1',
+	"rsqb;":                            '\U0000005D',
+	"rsquo;":                           '\U00002019',
+	"rsquor;":                          '\U00002019',
+	"rthree;":                          '\U000022CC',
+	"rtimes;":                          '\U000022CA',
+	"rtri;":                            '\U000025B9',
+	"rtrie;":                           '\U000022B5',
+	"rtrif;":                           '\U000025B8',
+	"rtriltri;":                        '\U000029CE',
+	"ruluhar;":                         '\U00002968',
+	"rx;":                              '\U0000211E',
+	"sacute;":                          '\U0000015B',
+	"sbquo;":                           '\U0000201A',
+	"sc;":                              '\U0000227B',
+	"scE;":                             '\U00002AB4',
+	"scap;":                            '\U00002AB8',
+	"scaron;":                          '\U00000161',
+	"sccue;":                           '\U0000227D',
+	"sce;":                             '\U00002AB0',
+	"scedil;":                          '\U0000015F',
+	"scirc;":                           '\U0000015D',
+	"scnE;":                            '\U00002AB6',
+	"scnap;":                           '\U00002ABA',
+	"scnsim;":                          '\U000022E9',
+	"scpolint;":                        '\U00002A13',
+	"scsim;":                           '\U0000227F',
+	"scy;":                             '\U00000441',
+	"sdot;":                            '\U000022C5',
+	"sdotb;":                           '\U000022A1',
+	"sdote;":                           '\U00002A66',
+	"seArr;":                           '\U000021D8',
+	"searhk;":                          '\U00002925',
+	"searr;":                           '\U00002198',
+	"searrow;":                         '\U00002198',
+	"sect;":                            '\U000000A7',
+	"semi;":                            '\U0000003B',
+	"seswar;":                          '\U00002929',
+	"setminus;":                        '\U00002216',
+	"setmn;":                           '\U00002216',
+	"sext;":                            '\U00002736',
+	"sfr;":                             '\U0001D530',
+	"sfrown;":                          '\U00002322',
+	"sharp;":                           '\U0000266F',
+	"shchcy;":                          '\U00000449',
+	"shcy;":                            '\U00000448',
+	"shortmid;":                        '\U00002223',
+	"shortparallel;":                   '\U00002225',
+	"shy;":                             '\U000000AD',
+	"sigma;":                           '\U000003C3',
+	"sigmaf;":                          '\U000003C2',
+	"sigmav;":                          '\U000003C2',
+	"sim;":                             '\U0000223C',
+	"simdot;":                          '\U00002A6A',
+	"sime;":                            '\U00002243',
+	"simeq;":                           '\U00002243',
+	"simg;":                            '\U00002A9E',
+	"simgE;":                           '\U00002AA0',
+	"siml;":                            '\U00002A9D',
+	"simlE;":                           '\U00002A9F',
+	"simne;":                           '\U00002246',
+	"simplus;":                         '\U00002A24',
+	"simrarr;":                         '\U00002972',
+	"slarr;":                           '\U00002190',
+	"smallsetminus;":                   '\U00002216',
+	"smashp;":                          '\U00002A33',
+	"smeparsl;":                        '\U000029E4',
+	"smid;":                            '\U00002223',
+	"smile;":                           '\U00002323',
+	"smt;":                             '\U00002AAA',
+	"smte;":                            '\U00002AAC',
+	"softcy;":                          '\U0000044C',
+	"sol;":                             '\U0000002F',
+	"solb;":                            '\U000029C4',
+	"solbar;":                          '\U0000233F',
+	"sopf;":                            '\U0001D564',
+	"spades;":                          '\U00002660',
+	"spadesuit;":                       '\U00002660',
+	"spar;":                            '\U00002225',
+	"sqcap;":                           '\U00002293',
+	"sqcup;":                           '\U00002294',
+	"sqsub;":                           '\U0000228F',
+	"sqsube;":                          '\U00002291',
+	"sqsubset;":                        '\U0000228F',
+	"sqsubseteq;":                      '\U00002291',
+	"sqsup;":                           '\U00002290',
+	"sqsupe;":                          '\U00002292',
+	"sqsupset;":                        '\U00002290',
+	"sqsupseteq;":                      '\U00002292',
+	"squ;":                             '\U000025A1',
+	"square;":                          '\U000025A1',
+	"squarf;":                          '\U000025AA',
+	"squf;":                            '\U000025AA',
+	"srarr;":                           '\U00002192',
+	"sscr;":                            '\U0001D4C8',
+	"ssetmn;":                          '\U00002216',
+	"ssmile;":                          '\U00002323',
+	"sstarf;":                          '\U000022C6',
+	"star;":                            '\U00002606',
+	"starf;":                           '\U00002605',
+	"straightepsilon;":                 '\U000003F5',
+	"straightphi;":                     '\U000003D5',
+	"strns;":                           '\U000000AF',
+	"sub;":                             '\U00002282',
+	"subE;":                            '\U00002AC5',
+	"subdot;":                          '\U00002ABD',
+	"sube;":                            '\U00002286',
+	"subedot;":                         '\U00002AC3',
+	"submult;":                         '\U00002AC1',
+	"subnE;":                           '\U00002ACB',
+	"subne;":                           '\U0000228A',
+	"subplus;":                         '\U00002ABF',
+	"subrarr;":                         '\U00002979',
+	"subset;":                          '\U00002282',
+	"subseteq;":                        '\U00002286',
+	"subseteqq;":                       '\U00002AC5',
+	"subsetneq;":                       '\U0000228A',
+	"subsetneqq;":                      '\U00002ACB',
+	"subsim;":                          '\U00002AC7',
+	"subsub;":                          '\U00002AD5',
+	"subsup;":                          '\U00002AD3',
+	"succ;":                            '\U0000227B',
+	"succapprox;":                      '\U00002AB8',
+	"succcurlyeq;":                     '\U0000227D',
+	"succeq;":                          '\U00002AB0',
+	"succnapprox;":                     '\U00002ABA',
+	"succneqq;":                        '\U00002AB6',
+	"succnsim;":                        '\U000022E9',
+	"succsim;":                         '\U0000227F',
+	"sum;":                             '\U00002211',
+	"sung;":                            '\U0000266A',
+	"sup;":                             '\U00002283',
+	"sup1;":                            '\U000000B9',
+	"sup2;":                            '\U000000B2',
+	"sup3;":                            '\U000000B3',
+	"supE;":                            '\U00002AC6',
+	"supdot;":                          '\U00002ABE',
+	"supdsub;":                         '\U00002AD8',
+	"supe;":                            '\U00002287',
+	"supedot;":                         '\U00002AC4',
+	"suphsol;":                         '\U000027C9',
+	"suphsub;":                         '\U00002AD7',
+	"suplarr;":                         '\U0000297B',
+	"supmult;":                         '\U00002AC2',
+	"supnE;":                           '\U00002ACC',
+	"supne;":                           '\U0000228B',
+	"supplus;":                         '\U00002AC0',
+	"supset;":                          '\U00002283',
+	"supseteq;":                        '\U00002287',
+	"supseteqq;":                       '\U00002AC6',
+	"supsetneq;":                       '\U0000228B',
+	"supsetneqq;":                      '\U00002ACC',
+	"supsim;":                          '\U00002AC8',
+	"supsub;":                          '\U00002AD4',
+	"supsup;":                          '\U00002AD6',
+	"swArr;":                           '\U000021D9',
+	"swarhk;":                          '\U00002926',
+	"swarr;":                           '\U00002199',
+	"swarrow;":                         '\U00002199',
+	"swnwar;":                          '\U0000292A',
+	"szlig;":                           '\U000000DF',
+	"target;":                          '\U00002316',
+	"tau;":                             '\U000003C4',
+	"tbrk;":                            '\U000023B4',
+	"tcaron;":                          '\U00000165',
+	"tcedil;":                          '\U00000163',
+	"tcy;":                             '\U00000442',
+	"tdot;":                            '\U000020DB',
+	"telrec;":                          '\U00002315',
+	"tfr;":                             '\U0001D531',
+	"there4;":                          '\U00002234',
+	"therefore;":                       '\U00002234',
+	"theta;":                           '\U000003B8',
+	"thetasym;":                        '\U000003D1',
+	"thetav;":                          '\U000003D1',
+	"thickapprox;":                     '\U00002248',
+	"thicksim;":                        '\U0000223C',
+	"thinsp;":                          '\U00002009',
+	"thkap;":                           '\U00002248',
+	"thksim;":                          '\U0000223C',
+	"thorn;":                           '\U000000FE',
+	"tilde;":                           '\U000002DC',
+	"times;":                           '\U000000D7',
+	"timesb;":                          '\U000022A0',
+	"timesbar;":                        '\U00002A31',
+	"timesd;":                          '\U00002A30',
+	"tint;":                            '\U0000222D',
+	"toea;":                            '\U00002928',
+	"top;":                             '\U000022A4',
+	"topbot;":                          '\U00002336',
+	"topcir;":                          '\U00002AF1',
+	"topf;":                            '\U0001D565',
+	"topfork;":                         '\U00002ADA',
+	"tosa;":                            '\U00002929',
+	"tprime;":                          '\U00002034',
+	"trade;":                           '\U00002122',
+	"triangle;":                        '\U000025B5',
+	"triangledown;":                    '\U000025BF',
+	"triangleleft;":                    '\U000025C3',
+	"trianglelefteq;":                  '\U000022B4',
+	"triangleq;":                       '\U0000225C',
+	"triangleright;":                   '\U000025B9',
+	"trianglerighteq;":                 '\U000022B5',
+	"tridot;":                          '\U000025EC',
+	"trie;":                            '\U0000225C',
+	"triminus;":                        '\U00002A3A',
+	"triplus;":                         '\U00002A39',
+	"trisb;":                           '\U000029CD',
+	"tritime;":                         '\U00002A3B',
+	"trpezium;":                        '\U000023E2',
+	"tscr;":                            '\U0001D4C9',
+	"tscy;":                            '\U00000446',
+	"tshcy;":                           '\U0000045B',
+	"tstrok;":                          '\U00000167',
+	"twixt;":                           '\U0000226C',
+	"twoheadleftarrow;":                '\U0000219E',
+	"twoheadrightarrow;":               '\U000021A0',
+	"uArr;":                            '\U000021D1',
+	"uHar;":                            '\U00002963',
+	"uacute;":                          '\U000000FA',
+	"uarr;":                            '\U00002191',
+	"ubrcy;":                           '\U0000045E',
+	"ubreve;":                          '\U0000016D',
+	"ucirc;":                           '\U000000FB',
+	"ucy;":                             '\U00000443',
+	"udarr;":                           '\U000021C5',
+	"udblac;":                          '\U00000171',
+	"udhar;":                           '\U0000296E',
+	"ufisht;":                          '\U0000297E',
+	"ufr;":                             '\U0001D532',
+	"ugrave;":                          '\U000000F9',
+	"uharl;":                           '\U000021BF',
+	"uharr;":                           '\U000021BE',
+	"uhblk;":                           '\U00002580',
+	"ulcorn;":                          '\U0000231C',
+	"ulcorner;":                        '\U0000231C',
+	"ulcrop;":                          '\U0000230F',
+	"ultri;":                           '\U000025F8',
+	"umacr;":                           '\U0000016B',
+	"uml;":                             '\U000000A8',
+	"uogon;":                           '\U00000173',
+	"uopf;":                            '\U0001D566',
+	"uparrow;":                         '\U00002191',
+	"updownarrow;":                     '\U00002195',
+	"upharpoonleft;":                   '\U000021BF',
+	"upharpoonright;":                  '\U000021BE',
+	"uplus;":                           '\U0000228E',
+	"upsi;":                            '\U000003C5',
+	"upsih;":                           '\U000003D2',
+	"upsilon;":                         '\U000003C5',
+	"upuparrows;":                      '\U000021C8',
+	"urcorn;":                          '\U0000231D',
+	"urcorner;":                        '\U0000231D',
+	"urcrop;":                          '\U0000230E',
+	"uring;":                           '\U0000016F',
+	"urtri;":                           '\U000025F9',
+	"uscr;":                            '\U0001D4CA',
+	"utdot;":                           '\U000022F0',
+	"utilde;":                          '\U00000169',
+	"utri;":                            '\U000025B5',
+	"utrif;":                           '\U000025B4',
+	"uuarr;":                           '\U000021C8',
+	"uuml;":                            '\U000000FC',
+	"uwangle;":                         '\U000029A7',
+	"vArr;":                            '\U000021D5',
+	"vBar;":                            '\U00002AE8',
+	"vBarv;":                           '\U00002AE9',
+	"vDash;":                           '\U000022A8',
+	"vangrt;":                          '\U0000299C',
+	"varepsilon;":                      '\U000003F5',
+	"varkappa;":                        '\U000003F0',
+	"varnothing;":                      '\U00002205',
+	"varphi;":                          '\U000003D5',
+	"varpi;":                           '\U000003D6',
+	"varpropto;":                       '\U0000221D',
+	"varr;":                            '\U00002195',
+	"varrho;":                          '\U000003F1',
+	"varsigma;":                        '\U000003C2',
+	"vartheta;":                        '\U000003D1',
+	"vartriangleleft;":                 '\U000022B2',
+	"vartriangleright;":                '\U000022B3',
+	"vcy;":                             '\U00000432',
+	"vdash;":                           '\U000022A2',
+	"vee;":                             '\U00002228',
+	"veebar;":                          '\U000022BB',
+	"veeeq;":                           '\U0000225A',
+	"vellip;":                          '\U000022EE',
+	"verbar;":                          '\U0000007C',
+	"vert;":                            '\U0000007C',
+	"vfr;":                             '\U0001D533',
+	"vltri;":                           '\U000022B2',
+	"vopf;":                            '\U0001D567',
+	"vprop;":                           '\U0000221D',
+	"vrtri;":                           '\U000022B3',
+	"vscr;":                            '\U0001D4CB',
+	"vzigzag;":                         '\U0000299A',
+	"wcirc;":                           '\U00000175',
+	"wedbar;":                          '\U00002A5F',
+	"wedge;":                           '\U00002227',
+	"wedgeq;":                          '\U00002259',
+	"weierp;":                          '\U00002118',
+	"wfr;":                             '\U0001D534',
+	"wopf;":                            '\U0001D568',
+	"wp;":                              '\U00002118',
+	"wr;":                              '\U00002240',
+	"wreath;":                          '\U00002240',
+	"wscr;":                            '\U0001D4CC',
+	"xcap;":                            '\U000022C2',
+	"xcirc;":                           '\U000025EF',
+	"xcup;":                            '\U000022C3',
+	"xdtri;":                           '\U000025BD',
+	"xfr;":                             '\U0001D535',
+	"xhArr;":                           '\U000027FA',
+	"xharr;":                           '\U000027F7',
+	"xi;":                              '\U000003BE',
+	"xlArr;":                           '\U000027F8',
+	"xlarr;":                           '\U000027F5',
+	"xmap;":                            '\U000027FC',
+	"xnis;":                            '\U000022FB',
+	"xodot;":                           '\U00002A00',
+	"xopf;":                            '\U0001D569',
+	"xoplus;":                          '\U00002A01',
+	"xotime;":                          '\U00002A02',
+	"xrArr;":                           '\U000027F9',
+	"xrarr;":                           '\U000027F6',
+	"xscr;":                            '\U0001D4CD',
+	"xsqcup;":                          '\U00002A06',
+	"xuplus;":                          '\U00002A04',
+	"xutri;":                           '\U000025B3',
+	"xvee;":                            '\U000022C1',
+	"xwedge;":                          '\U000022C0',
+	"yacute;":                          '\U000000FD',
+	"yacy;":                            '\U0000044F',
+	"ycirc;":                           '\U00000177',
+	"ycy;":                             '\U0000044B',
+	"yen;":                             '\U000000A5',
+	"yfr;":                             '\U0001D536',
+	"yicy;":                            '\U00000457',
+	"yopf;":                            '\U0001D56A',
+	"yscr;":                            '\U0001D4CE',
+	"yucy;":                            '\U0000044E',
+	"yuml;":                            '\U000000FF',
+	"zacute;":                          '\U0000017A',
+	"zcaron;":                          '\U0000017E',
+	"zcy;":                             '\U00000437',
+	"zdot;":                            '\U0000017C',
+	"zeetrf;":                          '\U00002128',
+	"zeta;":                            '\U000003B6',
+	"zfr;":                             '\U0001D537',
+	"zhcy;":                            '\U00000436',
+	"zigrarr;":                         '\U000021DD',
+	"zopf;":                            '\U0001D56B',
+	"zscr;":                            '\U0001D4CF',
+	"zwj;":                             '\U0000200D',
+	"zwnj;":                            '\U0000200C',
+	"AElig":                            '\U000000C6',
+	"AMP":                              '\U00000026',
+	"Aacute":                           '\U000000C1',
+	"Acirc":                            '\U000000C2',
+	"Agrave":                           '\U000000C0',
+	"Aring":                            '\U000000C5',
+	"Atilde":                           '\U000000C3',
+	"Auml":                             '\U000000C4',
+	"COPY":                             '\U000000A9',
+	"Ccedil":                           '\U000000C7',
+	"ETH":                              '\U000000D0',
+	"Eacute":                           '\U000000C9',
+	"Ecirc":                            '\U000000CA',
+	"Egrave":                           '\U000000C8',
+	"Euml":                             '\U000000CB',
+	"GT":                               '\U0000003E',
+	"Iacute":                           '\U000000CD',
+	"Icirc":                            '\U000000CE',
+	"Igrave":                           '\U000000CC',
+	"Iuml":                             '\U000000CF',
+	"LT":                               '\U0000003C',
+	"Ntilde":                           '\U000000D1',
+	"Oacute":                           '\U000000D3',
+	"Ocirc":                            '\U000000D4',
+	"Ograve":                           '\U000000D2',
+	"Oslash":                           '\U000000D8',
+	"Otilde":                           '\U000000D5',
+	"Ouml":                             '\U000000D6',
+	"QUOT":                             '\U00000022',
+	"REG":                              '\U000000AE',
+	"THORN":                            '\U000000DE',
+	"Uacute":                           '\U000000DA',
+	"Ucirc":                            '\U000000DB',
+	"Ugrave":                           '\U000000D9',
+	"Uuml":                             '\U000000DC',
+	"Yacute":                           '\U000000DD',
+	"aacute":                           '\U000000E1',
+	"acirc":                            '\U000000E2',
+	"acute":                            '\U000000B4',
+	"aelig":                            '\U000000E6',
+	"agrave":                           '\U000000E0',
+	"amp":                              '\U00000026',
+	"aring":                            '\U000000E5',
+	"atilde":                           '\U000000E3',
+	"auml":                             '\U000000E4',
+	"brvbar":                           '\U000000A6',
+	"ccedil":                           '\U000000E7',
+	"cedil":                            '\U000000B8',
+	"cent":                             '\U000000A2',
+	"copy":                             '\U000000A9',
+	"curren":                           '\U000000A4',
+	"deg":                              '\U000000B0',
+	"divide":                           '\U000000F7',
+	"eacute":                           '\U000000E9',
+	"ecirc":                            '\U000000EA',
+	"egrave":                           '\U000000E8',
+	"eth":                              '\U000000F0',
+	"euml":                             '\U000000EB',
+	"frac12":                           '\U000000BD',
+	"frac14":                           '\U000000BC',
+	"frac34":                           '\U000000BE',
+	"gt":                               '\U0000003E',
+	"iacute":                           '\U000000ED',
+	"icirc":                            '\U000000EE',
+	"iexcl":                            '\U000000A1',
+	"igrave":                           '\U000000EC',
+	"iquest":                           '\U000000BF',
+	"iuml":                             '\U000000EF',
+	"laquo":                            '\U000000AB',
+	"lt":                               '\U0000003C',
+	"macr":                             '\U000000AF',
+	"micro":                            '\U000000B5',
+	"middot":                           '\U000000B7',
+	"nbsp":                             '\U000000A0',
+	"not":                              '\U000000AC',
+	"ntilde":                           '\U000000F1',
+	"oacute":                           '\U000000F3',
+	"ocirc":                            '\U000000F4',
+	"ograve":                           '\U000000F2',
+	"ordf":                             '\U000000AA',
+	"ordm":                             '\U000000BA',
+	"oslash":                           '\U000000F8',
+	"otilde":                           '\U000000F5',
+	"ouml":                             '\U000000F6',
+	"para":                             '\U000000B6',
+	"plusmn":                           '\U000000B1',
+	"pound":                            '\U000000A3',
+	"quot":                             '\U00000022',
+	"raquo":                            '\U000000BB',
+	"reg":                              '\U000000AE',
+	"sect":                             '\U000000A7',
+	"shy":                              '\U000000AD',
+	"sup1":                             '\U000000B9',
+	"sup2":                             '\U000000B2',
+	"sup3":                             '\U000000B3',
+	"szlig":                            '\U000000DF',
+	"thorn":                            '\U000000FE',
+	"times":                            '\U000000D7',
+	"uacute":                           '\U000000FA',
+	"ucirc":                            '\U000000FB',
+	"ugrave":                           '\U000000F9',
+	"uml":                              '\U000000A8',
+	"uuml":                             '\U000000FC',
+	"yacute":                           '\U000000FD',
+	"yen":                              '\U000000A5',
+	"yuml":                             '\U000000FF',
 }
 
 // HTML entities that are two unicode codepoints.
diff --git a/vendor/golang.org/x/net/html/node.go b/vendor/golang.org/x/net/html/node.go
index 6f136c4e..2c1cade6 100644
--- a/vendor/golang.org/x/net/html/node.go
+++ b/vendor/golang.org/x/net/html/node.go
@@ -174,6 +174,16 @@ func (s *nodeStack) index(n *Node) int {
 	return -1
 }
 
+// contains returns whether a is within s.
+func (s *nodeStack) contains(a atom.Atom) bool {
+	for _, n := range *s {
+		if n.DataAtom == a {
+			return true
+		}
+	}
+	return false
+}
+
 // insert inserts a node at the given index.
 func (s *nodeStack) insert(i int, n *Node) {
 	(*s) = append(*s, nil)
@@ -192,3 +202,19 @@ func (s *nodeStack) remove(n *Node) {
 	(*s)[j] = nil
 	*s = (*s)[:j]
 }
+
+type insertionModeStack []insertionMode
+
+func (s *insertionModeStack) pop() (im insertionMode) {
+	i := len(*s)
+	im = (*s)[i-1]
+	*s = (*s)[:i-1]
+	return im
+}
+
+func (s *insertionModeStack) top() insertionMode {
+	if i := len(*s); i > 0 {
+		return (*s)[i-1]
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go
index 2a5abddc..d5b0aee1 100644
--- a/vendor/golang.org/x/net/html/parse.go
+++ b/vendor/golang.org/x/net/html/parse.go
@@ -32,6 +32,8 @@ type parser struct {
 	head, form *Node
 	// Other parsing state flags (section 12.2.4.5).
 	scripting, framesetOK bool
+	// The stack of template insertion modes
+	templateStack insertionModeStack
 	// im is the current insertion mode.
 	im insertionMode
 	// originalIM is the insertion mode to go back to after completing a text
@@ -126,7 +128,7 @@ func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int {
 					return -1
 				}
 			case tableScope:
-				if tagAtom == a.Html || tagAtom == a.Table {
+				if tagAtom == a.Html || tagAtom == a.Table || tagAtom == a.Template {
 					return -1
 				}
 			case selectScope:
@@ -162,17 +164,17 @@ func (p *parser) clearStackToContext(s scope) {
 		tagAtom := p.oe[i].DataAtom
 		switch s {
 		case tableScope:
-			if tagAtom == a.Html || tagAtom == a.Table {
+			if tagAtom == a.Html || tagAtom == a.Table || tagAtom == a.Template {
 				p.oe = p.oe[:i+1]
 				return
 			}
 		case tableRowScope:
-			if tagAtom == a.Html || tagAtom == a.Tr {
+			if tagAtom == a.Html || tagAtom == a.Tr || tagAtom == a.Template {
 				p.oe = p.oe[:i+1]
 				return
 			}
 		case tableBodyScope:
-			if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead {
+			if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead || tagAtom == a.Template {
 				p.oe = p.oe[:i+1]
 				return
 			}
@@ -183,7 +185,7 @@ func (p *parser) clearStackToContext(s scope) {
 }
 
 // generateImpliedEndTags pops nodes off the stack of open elements as long as
-// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt.
+// the top node has a tag name of dd, dt, li, optgroup, option, p, rb, rp, rt or rtc.
 // If exceptions are specified, nodes with that name will not be popped off.
 func (p *parser) generateImpliedEndTags(exceptions ...string) {
 	var i int
@@ -192,7 +194,7 @@ loop:
 		n := p.oe[i]
 		if n.Type == ElementNode {
 			switch n.DataAtom {
-			case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt:
+			case a.Dd, a.Dt, a.Li, a.Optgroup, a.Option, a.P, a.Rb, a.Rp, a.Rt, a.Rtc:
 				for _, except := range exceptions {
 					if n.Data == except {
 						break loop
@@ -207,6 +209,27 @@ loop:
 	p.oe = p.oe[:i+1]
 }
 
+// generateAllImpliedEndTags pops nodes off the stack of open elements as long as
+// the top node has a tag name of caption, colgroup, dd, div, dt, li, optgroup, option, p, rb,
+// rp, rt, rtc, span, tbody, td, tfoot, th, thead or tr.
+func (p *parser) generateAllImpliedEndTags() {
+	var i int
+	for i = len(p.oe) - 1; i >= 0; i-- {
+		n := p.oe[i]
+		if n.Type == ElementNode {
+			switch n.DataAtom {
+			// TODO: remove this divergence from the HTML5 spec
+			case a.Caption, a.Colgroup, a.Dd, a.Div, a.Dt, a.Li, a.Optgroup, a.Option, a.P, a.Rb,
+				a.Rp, a.Rt, a.Rtc, a.Span, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+				continue
+			}
+		}
+		break
+	}
+
+	p.oe = p.oe[:i+1]
+}
+
 // addChild adds a child node n to the top element, and pushes n onto the stack
 // of open elements if it is an element node.
 func (p *parser) addChild(n *Node) {
@@ -236,7 +259,7 @@ func (p *parser) shouldFosterParent() bool {
 // fosterParent adds a child node according to the foster parenting rules.
 // Section 12.2.6.1, "foster parenting".
 func (p *parser) fosterParent(n *Node) {
-	var table, parent, prev *Node
+	var table, parent, prev, template *Node
 	var i int
 	for i = len(p.oe) - 1; i >= 0; i-- {
 		if p.oe[i].DataAtom == a.Table {
@@ -245,6 +268,19 @@ func (p *parser) fosterParent(n *Node) {
 		}
 	}
 
+	var j int
+	for j = len(p.oe) - 1; j >= 0; j-- {
+		if p.oe[j].DataAtom == a.Template {
+			template = p.oe[j]
+			break
+		}
+	}
+
+	if template != nil && (table == nil || j < i) {
+		template.AppendChild(n)
+		return
+	}
+
 	if table == nil {
 		// The foster parent is the html element.
 		parent = p.oe[0]
@@ -415,14 +451,34 @@ func (p *parser) setOriginalIM() {
 func (p *parser) resetInsertionMode() {
 	for i := len(p.oe) - 1; i >= 0; i-- {
 		n := p.oe[i]
-		if i == 0 && p.context != nil {
+		last := i == 0
+		if last && p.context != nil {
 			n = p.context
 		}
 
 		switch n.DataAtom {
 		case a.Select:
+			if !last {
+				for ancestor, first := n, p.oe[0]; ancestor != first; {
+					if ancestor == first {
+						break
+					}
+					ancestor = p.oe[p.oe.index(ancestor)-1]
+					switch ancestor.DataAtom {
+					case a.Template:
+						p.im = inSelectIM
+						return
+					case a.Table:
+						p.im = inSelectInTableIM
+						return
+					}
+				}
+			}
 			p.im = inSelectIM
 		case a.Td, a.Th:
+			// TODO: remove this divergence from the HTML5 spec.
+			//
+			// See https://bugs.chromium.org/p/chromium/issues/detail?id=829668
 			p.im = inCellIM
 		case a.Tr:
 			p.im = inRowIM
@@ -434,20 +490,32 @@ func (p *parser) resetInsertionMode() {
 			p.im = inColumnGroupIM
 		case a.Table:
 			p.im = inTableIM
+		case a.Template:
+			p.im = p.templateStack.top()
 		case a.Head:
-			p.im = inBodyIM
+			// TODO: remove this divergence from the HTML5 spec.
+			//
+			// See https://bugs.chromium.org/p/chromium/issues/detail?id=829668
+			p.im = inHeadIM
 		case a.Body:
 			p.im = inBodyIM
 		case a.Frameset:
 			p.im = inFramesetIM
 		case a.Html:
-			p.im = beforeHeadIM
+			if p.head == nil {
+				p.im = beforeHeadIM
+			} else {
+				p.im = afterHeadIM
+			}
 		default:
+			if last {
+				p.im = inBodyIM
+				return
+			}
 			continue
 		}
 		return
 	}
-	p.im = inBodyIM
 }
 
 const whitespace = " \t\r\n\f"
@@ -590,19 +658,33 @@ func inHeadIM(p *parser) bool {
 		case a.Head:
 			// Ignore the token.
 			return true
+		case a.Template:
+			p.addElement()
+			p.afe = append(p.afe, &scopeMarker)
+			p.framesetOK = false
+			p.im = inTemplateIM
+			p.templateStack = append(p.templateStack, inTemplateIM)
+			return true
 		}
 	case EndTagToken:
 		switch p.tok.DataAtom {
 		case a.Head:
-			n := p.oe.pop()
-			if n.DataAtom != a.Head {
-				panic("html: bad parser state: <head> element not found, in the in-head insertion mode")
-			}
+			p.oe.pop()
 			p.im = afterHeadIM
 			return true
 		case a.Body, a.Html, a.Br:
 			p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
 			return false
+		case a.Template:
+			if !p.oe.contains(a.Template) {
+				return true
+			}
+			p.generateAllImpliedEndTags()
+			p.popUntil(defaultScope, a.Template)
+			p.clearActiveFormattingElements()
+			p.templateStack.pop()
+			p.resetInsertionMode()
+			return true
 		default:
 			// Ignore the token.
 			return true
@@ -648,7 +730,7 @@ func afterHeadIM(p *parser) bool {
 			p.addElement()
 			p.im = inFramesetIM
 			return true
-		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Template, a.Title:
 			p.oe = append(p.oe, p.head)
 			defer p.oe.remove(p.head)
 			return inHeadIM(p)
@@ -660,6 +742,8 @@ func afterHeadIM(p *parser) bool {
 		switch p.tok.DataAtom {
 		case a.Body, a.Html, a.Br:
 			// Drop down to creating an implied <body> tag.
+		case a.Template:
+			return inHeadIM(p)
 		default:
 			// Ignore the token.
 			return true
@@ -727,10 +811,16 @@ func inBodyIM(p *parser) bool {
 	case StartTagToken:
 		switch p.tok.DataAtom {
 		case a.Html:
+			if p.oe.contains(a.Template) {
+				return true
+			}
 			copyAttributes(p.oe[0], p.tok)
-		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Template, a.Title:
 			return inHeadIM(p)
 		case a.Body:
+			if p.oe.contains(a.Template) {
+				return true
+			}
 			if len(p.oe) >= 2 {
 				body := p.oe[1]
 				if body.Type == ElementNode && body.DataAtom == a.Body {
@@ -767,9 +857,13 @@ func inBodyIM(p *parser) bool {
 			// The newline, if any, will be dealt with by the TextToken case.
 			p.framesetOK = false
 		case a.Form:
-			if p.form == nil {
-				p.popUntil(buttonScope, a.P)
-				p.addElement()
+			if p.form != nil && !p.oe.contains(a.Template) {
+				// Ignore the token
+				return true
+			}
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+			if !p.oe.contains(a.Template) {
 				p.form = p.top()
 			}
 		case a.Li:
@@ -952,11 +1046,16 @@ func inBodyIM(p *parser) bool {
 			}
 			p.reconstructActiveFormattingElements()
 			p.addElement()
-		case a.Rp, a.Rt:
+		case a.Rb, a.Rtc:
 			if p.elementInScope(defaultScope, a.Ruby) {
 				p.generateImpliedEndTags()
 			}
 			p.addElement()
+		case a.Rp, a.Rt:
+			if p.elementInScope(defaultScope, a.Ruby) {
+				p.generateImpliedEndTags("rtc")
+			}
+			p.addElement()
 		case a.Math, a.Svg:
 			p.reconstructActiveFormattingElements()
 			if p.tok.DataAtom == a.Math {
@@ -972,7 +1071,13 @@ func inBodyIM(p *parser) bool {
 				p.acknowledgeSelfClosingTag()
 			}
 			return true
-		case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+		case a.Frame:
+			// TODO: remove this divergence from the HTML5 spec.
+			if p.oe.contains(a.Template) {
+				p.addElement()
+				return true
+			}
+		case a.Caption, a.Col, a.Colgroup, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
 			// Ignore the token.
 		default:
 			p.reconstructActiveFormattingElements()
@@ -993,15 +1098,29 @@ func inBodyIM(p *parser) bool {
 		case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
 			p.popUntil(defaultScope, p.tok.DataAtom)
 		case a.Form:
-			node := p.form
-			p.form = nil
-			i := p.indexOfElementInScope(defaultScope, a.Form)
-			if node == nil || i == -1 || p.oe[i] != node {
-				// Ignore the token.
-				return true
+			if p.oe.contains(a.Template) {
+				i := p.indexOfElementInScope(defaultScope, a.Form)
+				if i == -1 {
+					// Ignore the token.
+					return true
+				}
+				p.generateImpliedEndTags()
+				if p.oe[i].DataAtom != a.Form {
+					// Ignore the token.
+					return true
+				}
+				p.popUntil(defaultScope, a.Form)
+			} else {
+				node := p.form
+				p.form = nil
+				i := p.indexOfElementInScope(defaultScope, a.Form)
+				if node == nil || i == -1 || p.oe[i] != node {
+					// Ignore the token.
+					return true
+				}
+				p.generateImpliedEndTags()
+				p.oe.remove(node)
 			}
-			p.generateImpliedEndTags()
-			p.oe.remove(node)
 		case a.P:
 			if !p.elementInScope(buttonScope, a.P) {
 				p.parseImpliedToken(StartTagToken, a.P, a.P.String())
@@ -1022,6 +1141,8 @@ func inBodyIM(p *parser) bool {
 		case a.Br:
 			p.tok.Type = StartTagToken
 			return false
+		case a.Template:
+			return inHeadIM(p)
 		default:
 			p.inBodyEndTagOther(p.tok.DataAtom)
 		}
@@ -1030,6 +1151,21 @@ func inBodyIM(p *parser) bool {
 			Type: CommentNode,
 			Data: p.tok.Data,
 		})
+	case ErrorToken:
+		// TODO: remove this divergence from the HTML5 spec.
+		if len(p.templateStack) > 0 {
+			p.im = inTemplateIM
+			return false
+		} else {
+			for _, e := range p.oe {
+				switch e.DataAtom {
+				case a.Dd, a.Dt, a.Li, a.Optgroup, a.Option, a.P, a.Rb, a.Rp, a.Rt, a.Rtc, a.Tbody, a.Td, a.Tfoot, a.Th,
+					a.Thead, a.Tr, a.Body, a.Html:
+				default:
+					return true
+				}
+			}
+		}
 	}
 
 	return true
@@ -1135,6 +1271,12 @@ func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
 		switch commonAncestor.DataAtom {
 		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
 			p.fosterParent(lastNode)
+		case a.Template:
+			// TODO: remove namespace checking
+			if commonAncestor.Namespace == "html" {
+				commonAncestor = commonAncestor.LastChild
+			}
+			fallthrough
 		default:
 			commonAncestor.AppendChild(lastNode)
 		}
@@ -1249,7 +1391,7 @@ func inTableIM(p *parser) bool {
 			}
 			// Ignore the token.
 			return true
-		case a.Style, a.Script:
+		case a.Style, a.Script, a.Template:
 			return inHeadIM(p)
 		case a.Input:
 			for _, t := range p.tok.Attr {
@@ -1261,7 +1403,7 @@ func inTableIM(p *parser) bool {
 			}
 			// Otherwise drop down to the default action.
 		case a.Form:
-			if p.form != nil {
+			if p.oe.contains(a.Template) || p.form != nil {
 				// Ignore the token.
 				return true
 			}
@@ -1291,6 +1433,8 @@ func inTableIM(p *parser) bool {
 		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
 			// Ignore the token.
 			return true
+		case a.Template:
+			return inHeadIM(p)
 		}
 	case CommentToken:
 		p.addChild(&Node{
@@ -1386,11 +1530,13 @@ func inColumnGroupIM(p *parser) bool {
 			p.oe.pop()
 			p.acknowledgeSelfClosingTag()
 			return true
+		case a.Template:
+			return inHeadIM(p)
 		}
 	case EndTagToken:
 		switch p.tok.DataAtom {
 		case a.Colgroup:
-			if p.oe.top().DataAtom != a.Html {
+			if p.oe.top().DataAtom == a.Colgroup {
 				p.oe.pop()
 				p.im = inTableIM
 			}
@@ -1398,14 +1544,16 @@ func inColumnGroupIM(p *parser) bool {
 		case a.Col:
 			// Ignore the token.
 			return true
+		case a.Template:
+			return inHeadIM(p)
 		}
 	}
-	if p.oe.top().DataAtom != a.Html {
-		p.oe.pop()
-		p.im = inTableIM
-		return false
+	if p.oe.top().DataAtom != a.Colgroup {
+		return true
 	}
-	return true
+	p.oe.pop()
+	p.im = inTableIM
+	return false
 }
 
 // Section 12.2.6.4.13.
@@ -1597,7 +1745,7 @@ func inSelectIM(p *parser) bool {
 			p.tokenizer.NextIsNotRawText()
 			// Ignore the token.
 			return true
-		case a.Script:
+		case a.Script, a.Template:
 			return inHeadIM(p)
 		}
 	case EndTagToken:
@@ -1618,6 +1766,8 @@ func inSelectIM(p *parser) bool {
 			if p.popUntil(selectScope, a.Select) {
 				p.resetInsertionMode()
 			}
+		case a.Template:
+			return inHeadIM(p)
 		}
 	case CommentToken:
 		p.addChild(&Node{
@@ -1650,6 +1800,61 @@ func inSelectInTableIM(p *parser) bool {
 	return inSelectIM(p)
 }
 
+// Section 12.2.6.4.18.
+func inTemplateIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken, CommentToken, DoctypeToken:
+		return inBodyIM(p)
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Template, a.Title:
+			return inHeadIM(p)
+		case a.Caption, a.Colgroup, a.Tbody, a.Tfoot, a.Thead:
+			p.templateStack.pop()
+			p.templateStack = append(p.templateStack, inTableIM)
+			p.im = inTableIM
+			return false
+		case a.Col:
+			p.templateStack.pop()
+			p.templateStack = append(p.templateStack, inColumnGroupIM)
+			p.im = inColumnGroupIM
+			return false
+		case a.Tr:
+			p.templateStack.pop()
+			p.templateStack = append(p.templateStack, inTableBodyIM)
+			p.im = inTableBodyIM
+			return false
+		case a.Td, a.Th:
+			p.templateStack.pop()
+			p.templateStack = append(p.templateStack, inRowIM)
+			p.im = inRowIM
+			return false
+		default:
+			p.templateStack.pop()
+			p.templateStack = append(p.templateStack, inBodyIM)
+			p.im = inBodyIM
+			return false
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Template:
+			return inHeadIM(p)
+		default:
+			// Ignore the token.
+			return true
+		}
+	}
+	if !p.oe.contains(a.Template) {
+		// Ignore the token.
+		return true
+	}
+	p.popUntil(defaultScope, a.Template)
+	p.clearActiveFormattingElements()
+	p.templateStack.pop()
+	p.resetInsertionMode()
+	return false
+}
+
 // Section 12.2.6.4.19.
 func afterBodyIM(p *parser) bool {
 	switch p.tok.Type {
@@ -1720,6 +1925,11 @@ func inFramesetIM(p *parser) bool {
 			p.acknowledgeSelfClosingTag()
 		case a.Noframes:
 			return inHeadIM(p)
+		case a.Template:
+			// TODO: remove this divergence from the HTML5 spec.
+			//
+			// See https://bugs.chromium.org/p/chromium/issues/detail?id=829668
+			return inTemplateIM(p)
 		}
 	case EndTagToken:
 		switch p.tok.DataAtom {
@@ -2064,6 +2274,9 @@ func ParseFragment(r io.Reader, context *Node) ([]*Node, error) {
 	}
 	p.doc.AppendChild(root)
 	p.oe = nodeStack{root}
+	if context != nil && context.DataAtom == a.Template {
+		p.templateStack = append(p.templateStack, inTemplateIM)
+	}
 	p.resetInsertionMode()
 
 	for n := context; n != nil; n = n.Parent {
diff --git a/vendor/golang.org/x/net/html/parse_test.go b/vendor/golang.org/x/net/html/parse_test.go
index 7e47d11b..0b72a12b 100644
--- a/vendor/golang.org/x/net/html/parse_test.go
+++ b/vendor/golang.org/x/net/html/parse_test.go
@@ -125,6 +125,7 @@ func (a sortedAttributes) Swap(i, j int) {
 
 func dumpLevel(w io.Writer, n *Node, level int) error {
 	dumpIndent(w, level)
+	level++
 	switch n.Type {
 	case ErrorNode:
 		return errors.New("unexpected ErrorNode")
@@ -140,13 +141,19 @@ func dumpLevel(w io.Writer, n *Node, level int) error {
 		sort.Sort(attr)
 		for _, a := range attr {
 			io.WriteString(w, "\n")
-			dumpIndent(w, level+1)
+			dumpIndent(w, level)
 			if a.Namespace != "" {
 				fmt.Fprintf(w, `%s %s="%s"`, a.Namespace, a.Key, a.Val)
 			} else {
 				fmt.Fprintf(w, `%s="%s"`, a.Key, a.Val)
 			}
 		}
+		if n.Namespace == "" && n.DataAtom == atom.Template {
+			io.WriteString(w, "\n")
+			dumpIndent(w, level)
+			level++
+			io.WriteString(w, "content")
+		}
 	case TextNode:
 		fmt.Fprintf(w, `"%s"`, n.Data)
 	case CommentNode:
@@ -176,7 +183,7 @@ func dumpLevel(w io.Writer, n *Node, level int) error {
 	}
 	io.WriteString(w, "\n")
 	for c := n.FirstChild; c != nil; c = c.NextSibling {
-		if err := dumpLevel(w, c, level+1); err != nil {
+		if err := dumpLevel(w, c, level); err != nil {
 			return err
 		}
 	}
@@ -196,34 +203,36 @@ func dump(n *Node) (string, error) {
 	return b.String(), nil
 }
 
-const testDataDir = "testdata/webkit/"
+var testDataDirs = []string{"testdata/webkit/", "testdata/go/"}
 
 func TestParser(t *testing.T) {
-	testFiles, err := filepath.Glob(testDataDir + "*.dat")
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, tf := range testFiles {
-		f, err := os.Open(tf)
+	for _, testDataDir := range testDataDirs {
+		testFiles, err := filepath.Glob(testDataDir + "*.dat")
 		if err != nil {
 			t.Fatal(err)
 		}
-		defer f.Close()
-		r := bufio.NewReader(f)
-
-		for i := 0; ; i++ {
-			text, want, context, err := readParseTest(r)
-			if err == io.EOF {
-				break
-			}
+		for _, tf := range testFiles {
+			f, err := os.Open(tf)
 			if err != nil {
 				t.Fatal(err)
 			}
+			defer f.Close()
+			r := bufio.NewReader(f)
 
-			err = testParseCase(text, want, context)
+			for i := 0; ; i++ {
+				text, want, context, err := readParseTest(r)
+				if err == io.EOF {
+					break
+				}
+				if err != nil {
+					t.Fatal(err)
+				}
 
-			if err != nil {
-				t.Errorf("%s test #%d %q, %s", tf, i, text, err)
+				err = testParseCase(text, want, context)
+
+				if err != nil {
+					t.Errorf("%s test #%d %q, %s", tf, i, text, err)
+				}
 			}
 		}
 	}
@@ -373,6 +382,11 @@ func TestNodeConsistency(t *testing.T) {
 	}
 }
 
+func TestParseFragmentWithNilContext(t *testing.T) {
+	// This shouldn't panic.
+	ParseFragment(strings.NewReader("<p>hello</p>"), nil)
+}
+
 func BenchmarkParser(b *testing.B) {
 	buf, err := ioutil.ReadFile("testdata/go1.html")
 	if err != nil {
diff --git a/vendor/golang.org/x/net/html/testdata/go/template.dat b/vendor/golang.org/x/net/html/testdata/go/template.dat
new file mode 100644
index 00000000..a0a525bc
--- /dev/null
+++ b/vendor/golang.org/x/net/html/testdata/go/template.dat
@@ -0,0 +1,13 @@
+#data
+<body><template><yt-icon-button></yt-icon-button><form><paper-input></paper-input></form><style></style></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <yt-icon-button>
+|         <form>
+|           <paper-input>
+|         <style>
diff --git a/vendor/golang.org/x/net/html/testdata/webkit/ruby.dat b/vendor/golang.org/x/net/html/testdata/webkit/ruby.dat
new file mode 100644
index 00000000..1ca8016c
--- /dev/null
+++ b/vendor/golang.org/x/net/html/testdata/webkit/ruby.dat
@@ -0,0 +1,298 @@
+#data
+<html><ruby>a<rb>b<rb></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rb>
+|         "b"
+|       <rb>
+
+#data
+<html><ruby>a<rb>b<rt></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rb>
+|         "b"
+|       <rt>
+
+#data
+<html><ruby>a<rb>b<rtc></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rb>
+|         "b"
+|       <rtc>
+
+#data
+<html><ruby>a<rb>b<rp></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rb>
+|         "b"
+|       <rp>
+
+#data
+<html><ruby>a<rb>b<span></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rb>
+|         "b"
+|         <span>
+
+#data
+<html><ruby>a<rt>b<rb></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rt>
+|         "b"
+|       <rb>
+
+#data
+<html><ruby>a<rt>b<rt></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rt>
+|         "b"
+|       <rt>
+
+#data
+<html><ruby>a<rt>b<rtc></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rt>
+|         "b"
+|       <rtc>
+
+#data
+<html><ruby>a<rt>b<rp></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rt>
+|         "b"
+|       <rp>
+
+#data
+<html><ruby>a<rt>b<span></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rt>
+|         "b"
+|         <span>
+
+#data
+<html><ruby>a<rtc>b<rb></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rtc>
+|         "b"
+|       <rb>
+
+#data
+<html><ruby>a<rtc>b<rt>c<rt>d</ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rtc>
+|         "b"
+|         <rt>
+|           "c"
+|         <rt>
+|           "d"
+
+#data
+<html><ruby>a<rtc>b<rtc></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rtc>
+|         "b"
+|       <rtc>
+
+#data
+<html><ruby>a<rtc>b<rp></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rtc>
+|         "b"
+|         <rp>
+
+#data
+<html><ruby>a<rtc>b<span></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rtc>
+|         "b"
+|         <span>
+
+#data
+<html><ruby>a<rp>b<rb></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rp>
+|         "b"
+|       <rb>
+
+#data
+<html><ruby>a<rp>b<rt></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rp>
+|         "b"
+|       <rt>
+
+#data
+<html><ruby>a<rp>b<rtc></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rp>
+|         "b"
+|       <rtc>
+
+#data
+<html><ruby>a<rp>b<rp></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rp>
+|         "b"
+|       <rp>
+
+#data
+<html><ruby>a<rp>b<span></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       "a"
+|       <rp>
+|         "b"
+|         <span>
+
+#data
+<html><ruby><rtc><ruby>a<rb>b<rt></ruby></ruby></html>
+#errors
+(1,6): expected-doctype-but-got-start-tag
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <rtc>
+|         <ruby>
+|           "a"
+|           <rb>
+|             "b"
+|           <rt>
diff --git a/vendor/golang.org/x/net/html/testdata/webkit/template.dat b/vendor/golang.org/x/net/html/testdata/webkit/template.dat
new file mode 100644
index 00000000..2d6c0a73
--- /dev/null
+++ b/vendor/golang.org/x/net/html/testdata/webkit/template.dat
@@ -0,0 +1,1133 @@
+#data
+<body><template>Hello</template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         "Hello"
+
+#data
+<template>Hello</template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         "Hello"
+|   <body>
+
+#data
+<template></template><div></div>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|   <body>
+|     <div>
+
+#data
+<html><template>Hello</template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         "Hello"
+|   <body>
+
+#data
+<head><template><div></div></template></head>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <div>
+|   <body>
+
+#data
+<div><template><div><span></template><b>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <template>
+|         content
+|           <div>
+|             <span>
+|       <b>
+
+#data
+<div><template></div>Hello
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <template>
+|         content
+|           "Hello"
+
+#data
+<div></template></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+
+#data
+<table><template></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+
+#data
+<table><template></template></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+
+#data
+<table><div><template></template></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <template>
+|         content
+|     <table>
+
+#data
+<table><template></template><div></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|     <table>
+|       <template>
+|         content
+
+#data
+<table>   <template></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       "   "
+|       <template>
+|         content
+
+#data
+<table><tbody><template></template></tbody>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <template>
+|           content
+
+#data
+<table><tbody><template></tbody></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <template>
+|           content
+
+#data
+<table><tbody><template></template></tbody></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <template>
+|           content
+
+#data
+<table><thead><template></template></thead>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <thead>
+|         <template>
+|           content
+
+#data
+<table><tfoot><template></template></tfoot>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tfoot>
+|         <template>
+|           content
+
+#data
+<select><template></template></select>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <template>
+|         content
+
+#data
+<select><template><option></option></template></select>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <template>
+|         content
+|           <option>
+
+#data
+<template><option></option></select><option></option></template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <option>
+|         <option>
+|   <body>
+
+#data
+<select><template></template><option></select>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <template>
+|         content
+|       <option>
+
+#data
+<select><option><template></template></select>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|         <template>
+|           content
+
+#data
+<select><template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <template>
+|         content
+
+#data
+<select><option></option><template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|       <template>
+|         content
+
+#data
+<select><option></option><template><option>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|       <template>
+|         content
+|           <option>
+
+#data
+<table><thead><template><td></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <thead>
+|         <template>
+|           content
+|             <td>
+
+#data
+<table><template><thead></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+|           <thead>
+
+#data
+<body><table><template><td></tr><div></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+|           <td>
+|             <div>
+
+#data
+<table><template><thead></template></thead></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+|           <thead>
+
+#data
+<table><thead><template><tr></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <thead>
+|         <template>
+|           content
+|             <tr>
+
+#data
+<table><template><tr></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+|           <tr>
+
+#data
+<table><tr><template><td>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <template>
+|             content
+|               <td>
+
+#data
+<table><template><tr><template><td></template></tr></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+|           <tr>
+|             <template>
+|               content
+|                 <td>
+
+#data
+<table><template><tr><template><td></td></template></tr></template></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+|           <tr>
+|             <template>
+|               content
+|                 <td>
+
+#data
+<table><template><td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <template>
+|         content
+|           <td>
+
+#data
+<body><template><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <td>
+
+#data
+<body><template><template><tr></tr></template><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <template>
+|           content
+|             <tr>
+|         <td>
+
+#data
+<table><colgroup><template><col>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <colgroup>
+|         <template>
+|           content
+|             <col>
+
+#data
+<frameset><template><frame></frame></template></frameset>
+#errors
+#document
+| <html>
+|   <head>
+|   <frameset>
+|     <template>
+|       content
+|         <frame>
+
+#data
+<template><frame></frame></frameset><frame></frame></template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <frame>
+|         <frame>
+|   <body>
+
+#data
+<template><div><frameset><span></span></div><span></span></template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <div>
+|           <span>
+|         <span>
+|   <body>
+
+#data
+<body><template><div><frameset><span></span></div><span></span></template></body>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <div>
+|           <span>
+|         <span>
+
+#data
+<body><template><script>var i = 1;</script><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <script>
+|           "var i = 1;"
+|         <td>
+
+#data
+<body><template><tr><div></div></tr></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <tr>
+|         <div>
+
+#data
+<body><template><tr></tr><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <tr>
+|         <tr>
+|           <td>
+
+#data
+<body><template><td></td></tr><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <td>
+|         <td>
+
+#data
+<body><template><td></td><tbody><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <td>
+|         <td>
+
+#data
+<body><template><td></td><caption></caption><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <td>
+|         <td>
+
+#data
+<body><template><td></td><colgroup></caption><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <td>
+|         <td>
+
+#data
+<body><template><td></td></table><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <td>
+|         <td>
+
+#data
+<body><template><tr></tr><tbody><tr></tr></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <tr>
+|         <tr>
+
+#data
+<body><template><tr></tr><caption><tr></tr></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <tr>
+|         <tr>
+
+#data
+<body><template><tr></tr></table><tr></tr></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <tr>
+|         <tr>
+
+#data
+<body><template><thead></thead><caption></caption><tbody></tbody></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <thead>
+|         <caption>
+|         <tbody>
+
+#data
+<body><template><thead></thead></table><tbody></tbody></template></body>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <thead>
+|         <tbody>
+
+#data
+<body><template><div><tr></tr></div></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <div>
+
+#data
+<body><template><em>Hello</em></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <em>
+|           "Hello"
+
+#data
+<body><template><!--comment--></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <!-- comment -->
+
+#data
+<body><template><style></style><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <style>
+|         <td>
+
+#data
+<body><template><meta><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <meta>
+|         <td>
+
+#data
+<body><template><link><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <link>
+|         <td>
+
+#data
+<body><template><template><tr></tr></template><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <template>
+|           content
+|             <tr>
+|         <td>
+
+#data
+<body><table><colgroup><template><col></col></template></colgroup></table></body>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <colgroup>
+|         <template>
+|           content
+|             <col>
+
+#data
+<body a=b><template><div></div><body c=d><div></div></body></template></body>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     a="b"
+|     <template>
+|       content
+|         <div>
+|         <div>
+
+#data
+<html a=b><template><div><html b=c><span></template>
+#errors
+#document
+| <html>
+|   a="b"
+|   <head>
+|     <template>
+|       content
+|         <div>
+|           <span>
+|   <body>
+
+#data
+<html a=b><template><col></col><html b=c><col></col></template>
+#errors
+#document
+| <html>
+|   a="b"
+|   <head>
+|     <template>
+|       content
+|         <col>
+|         <col>
+|   <body>
+
+#data
+<html a=b><template><frame></frame><html b=c><frame></frame></template>
+#errors
+#document
+| <html>
+|   a="b"
+|   <head>
+|     <template>
+|       content
+|         <frame>
+|         <frame>
+|   <body>
+
+#data
+<body><template><tr></tr><template></template><td></td></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <tr>
+|         <template>
+|           content
+|         <tr>
+|           <td>
+
+#data
+<body><template><thead></thead><template><tr></tr></template><tr></tr><tfoot></tfoot></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <thead>
+|         <template>
+|           content
+|             <tr>
+|         <tbody>
+|           <tr>
+|         <tfoot>
+
+#data
+<body><template><template><b><template></template></template>text</template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <template>
+|           content
+|             <b>
+|               <template>
+|                 content
+|         "text"
+
+#data
+<body><template><col><colgroup>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <col>
+
+#data
+<body><template><col></colgroup>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <col>
+
+#data
+<body><template><col><colgroup></template></body>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <col>
+
+#data
+<body><template><col><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <col>
+
+#data
+<body><template><col></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <col>
+
+#data
+<body><template><col>Hello
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <col>
+
+#data
+<body><template><i><menu>Foo</i>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <i>
+|         <menu>
+|           <i>
+|             "Foo"
+
+#data
+<body><template></div><div>Foo</div><template></template><tr></tr>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+|         <div>
+|           "Foo"
+|         <template>
+|           content
+
+#data
+<body><div><template></div><tr><td>Foo</td></tr></template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <template>
+|         content
+|           <tr>
+|             <td>
+|               "Foo"
+
+#data
+<template></figcaption><sub><table></table>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <sub>
+|           <table>
+|   <body>
+
+#data
+<template><template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <template>
+|           content
+|   <body>
+
+#data
+<template><div>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <div>
+|   <body>
+
+#data
+<template><template><div>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <template>
+|           content
+|             <div>
+|   <body>
+
+#data
+<template><template><script>var i
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <template>
+|           content
+|             <script>
+|               "var i"
+|   <body>
+
+#data
+<template><template><style>var i
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <template>
+|           content
+|             <style>
+|               "var i"
+|   <body>
+
+#data
+<template><svg><template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         <svg svg>
+|           <svg template>
+|   <body>
+
+#data
+<dummy><template><span></dummy>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <dummy>
+|       <template>
+|         content
+|           <span>
+
+#data
+<body><table><tr><td><select><template>Foo</template><caption>A</table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <select>
+|               <template>
+|                 content
+|                   "Foo"
+|       <caption>
+|         "A"
+
+#data
+<body></body><template>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <template>
+|       content
+
+#data
+<head></head><template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|   <body>
+
+#data
+<head></head><template>Foo</template>
+#errors
+#document
+| <html>
+|   <head>
+|     <template>
+|       content
+|         "Foo"
+|   <body>
diff --git a/vendor/golang.org/x/net/html/token_test.go b/vendor/golang.org/x/net/html/token_test.go
index 20221c32..f2473ba6 100644
--- a/vendor/golang.org/x/net/html/token_test.go
+++ b/vendor/golang.org/x/net/html/token_test.go
@@ -589,20 +589,20 @@ func TestConvertNewlines(t *testing.T) {
 		"Mac\rDOS\r\nUnix\n":    "Mac\nDOS\nUnix\n",
 		"Unix\nMac\rDOS\r\n":    "Unix\nMac\nDOS\n",
 		"DOS\r\nDOS\r\nDOS\r\n": "DOS\nDOS\nDOS\n",
-		"":         "",
-		"\n":       "\n",
-		"\n\r":     "\n\n",
-		"\r":       "\n",
-		"\r\n":     "\n",
-		"\r\n\n":   "\n\n",
-		"\r\n\r":   "\n\n",
-		"\r\n\r\n": "\n\n",
-		"\r\r":     "\n\n",
-		"\r\r\n":   "\n\n",
-		"\r\r\n\n": "\n\n\n",
-		"\r\r\r\n": "\n\n\n",
-		"\r \n":    "\n \n",
-		"xyz":      "xyz",
+		"":                      "",
+		"\n":                    "\n",
+		"\n\r":                  "\n\n",
+		"\r":                    "\n",
+		"\r\n":                  "\n",
+		"\r\n\n":                "\n\n",
+		"\r\n\r":                "\n\n",
+		"\r\n\r\n":              "\n\n",
+		"\r\r":                  "\n\n",
+		"\r\r\n":                "\n\n",
+		"\r\r\n\n":              "\n\n\n",
+		"\r\r\r\n":              "\n\n\n",
+		"\r \n":                 "\n \n",
+		"xyz":                   "xyz",
 	}
 	for in, want := range testCases {
 		if got := string(convertNewlines([]byte(in))); got != want {
diff --git a/vendor/golang.org/x/net/http/httpguts/guts.go b/vendor/golang.org/x/net/http/httpguts/guts.go
new file mode 100644
index 00000000..e6cd0ced
--- /dev/null
+++ b/vendor/golang.org/x/net/http/httpguts/guts.go
@@ -0,0 +1,50 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package httpguts provides functions implementing various details
+// of the HTTP specification.
+//
+// This package is shared by the standard library (which vendors it)
+// and x/net/http2. It comes with no API stability promise.
+package httpguts
+
+import (
+	"net/textproto"
+	"strings"
+)
+
+// ValidTrailerHeader reports whether name is a valid header field name to appear
+// in trailers.
+// See RFC 7230, Section 4.1.2
+func ValidTrailerHeader(name string) bool {
+	name = textproto.CanonicalMIMEHeaderKey(name)
+	if strings.HasPrefix(name, "If-") || badTrailer[name] {
+		return false
+	}
+	return true
+}
+
+var badTrailer = map[string]bool{
+	"Authorization":       true,
+	"Cache-Control":       true,
+	"Connection":          true,
+	"Content-Encoding":    true,
+	"Content-Length":      true,
+	"Content-Range":       true,
+	"Content-Type":        true,
+	"Expect":              true,
+	"Host":                true,
+	"Keep-Alive":          true,
+	"Max-Forwards":        true,
+	"Pragma":              true,
+	"Proxy-Authenticate":  true,
+	"Proxy-Authorization": true,
+	"Proxy-Connection":    true,
+	"Range":               true,
+	"Realm":               true,
+	"Te":                  true,
+	"Trailer":             true,
+	"Transfer-Encoding":   true,
+	"Www-Authenticate":    true,
+}
diff --git a/vendor/golang.org/x/net/lex/httplex/httplex.go b/vendor/golang.org/x/net/http/httpguts/httplex.go
similarity index 97%
rename from vendor/golang.org/x/net/lex/httplex/httplex.go
rename to vendor/golang.org/x/net/http/httpguts/httplex.go
index 20f2b894..e7de24ee 100644
--- a/vendor/golang.org/x/net/lex/httplex/httplex.go
+++ b/vendor/golang.org/x/net/http/httpguts/httplex.go
@@ -2,12 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package httplex contains rules around lexical matters of various
-// HTTP-related specifications.
-//
-// This package is shared by the standard library (which vendors it)
-// and x/net/http2. It comes with no API stability promise.
-package httplex
+package httpguts
 
 import (
 	"net"
diff --git a/vendor/golang.org/x/net/lex/httplex/httplex_test.go b/vendor/golang.org/x/net/http/httpguts/httplex_test.go
similarity index 99%
rename from vendor/golang.org/x/net/lex/httplex/httplex_test.go
rename to vendor/golang.org/x/net/http/httpguts/httplex_test.go
index f47adc93..a2c57f39 100644
--- a/vendor/golang.org/x/net/lex/httplex/httplex_test.go
+++ b/vendor/golang.org/x/net/http/httpguts/httplex_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package httplex
+package httpguts
 
 import (
 	"testing"
diff --git a/vendor/golang.org/x/net/http/httpproxy/export_test.go b/vendor/golang.org/x/net/http/httpproxy/export_test.go
index 36b29d2d..5d30018f 100644
--- a/vendor/golang.org/x/net/http/httpproxy/export_test.go
+++ b/vendor/golang.org/x/net/http/httpproxy/export_test.go
@@ -4,4 +4,10 @@
 
 package httpproxy
 
-var ExportUseProxy = (*Config).useProxy
+func ExportUseProxy(cfg *Config, host string) bool {
+	cfg1 := &config{
+		Config: *cfg,
+	}
+	cfg1.init()
+	return cfg1.useProxy(host)
+}
diff --git a/vendor/golang.org/x/net/http/httpproxy/proxy.go b/vendor/golang.org/x/net/http/httpproxy/proxy.go
index cbe1d2a0..163645b8 100644
--- a/vendor/golang.org/x/net/http/httpproxy/proxy.go
+++ b/vendor/golang.org/x/net/http/httpproxy/proxy.go
@@ -37,13 +37,18 @@ type Config struct {
 	HTTPSProxy string
 
 	// NoProxy represents the NO_PROXY or no_proxy environment
-	// variable. It specifies URLs that should be excluded from
-	// proxying as a comma-separated list of domain names or a
-	// single asterisk (*) to indicate that no proxying should be
-	// done. A domain name matches that name and all subdomains. A
-	// domain name with a leading "." matches subdomains only. For
-	// example "foo.com" matches "foo.com" and "bar.foo.com";
-	// ".y.com" matches "x.y.com" but not "y.com".
+	// variable. It specifies a string that contains comma-separated values
+	// specifying hosts that should be excluded from proxying. Each value is
+	// represented by an IP address prefix (1.2.3.4), an IP address prefix in
+	// CIDR notation (1.2.3.4/8), a domain name, or a special DNS label (*).
+	// An IP address prefix and domain name can also include a literal port
+	// number (1.2.3.4:80).
+	// A domain name matches that name and all subdomains. A domain name with
+	// a leading "." matches subdomains only. For example "foo.com" matches
+	// "foo.com" and "bar.foo.com"; ".y.com" matches "x.y.com" but not "y.com".
+	// A single asterisk (*) indicates that no proxying should be done.
+	// A best effort is made to parse the string and errors are
+	// ignored.
 	NoProxy string
 
 	// CGI holds whether the current process is running
@@ -55,6 +60,26 @@ type Config struct {
 	CGI bool
 }
 
+// config holds the parsed configuration for HTTP proxy settings.
+type config struct {
+	// Config represents the original configuration as defined above.
+	Config
+
+	// httpsProxy is the parsed URL of the HTTPSProxy if defined.
+	httpsProxy *url.URL
+
+	// httpProxy is the parsed URL of the HTTPProxy if defined.
+	httpProxy *url.URL
+
+	// ipMatchers represent all values in the NoProxy that are IP address
+	// prefixes or an IP address in CIDR notation.
+	ipMatchers []matcher
+
+	// domainMatchers represent all values in the NoProxy that are a domain
+	// name or hostname & domain name
+	domainMatchers []matcher
+}
+
 // FromEnvironment returns a Config instance populated from the
 // environment variables HTTP_PROXY, HTTPS_PROXY and NO_PROXY (or the
 // lowercase versions thereof). HTTPS_PROXY takes precedence over
@@ -92,29 +117,40 @@ func getEnvAny(names ...string) string {
 // As a special case, if req.URL.Host is "localhost" (with or without a
 // port number), then a nil URL and nil error will be returned.
 func (cfg *Config) ProxyFunc() func(reqURL *url.URL) (*url.URL, error) {
-	// Prevent Config changes from affecting the function calculation.
-	// TODO Preprocess proxy settings for more efficient evaluation.
-	cfg1 := *cfg
+	// Preprocess the Config settings for more efficient evaluation.
+	cfg1 := &config{
+		Config: *cfg,
+	}
+	cfg1.init()
 	return cfg1.proxyForURL
 }
 
-func (cfg *Config) proxyForURL(reqURL *url.URL) (*url.URL, error) {
-	var proxy string
+func (cfg *config) proxyForURL(reqURL *url.URL) (*url.URL, error) {
+	var proxy *url.URL
 	if reqURL.Scheme == "https" {
-		proxy = cfg.HTTPSProxy
+		proxy = cfg.httpsProxy
 	}
-	if proxy == "" {
-		proxy = cfg.HTTPProxy
-		if proxy != "" && cfg.CGI {
+	if proxy == nil {
+		proxy = cfg.httpProxy
+		if proxy != nil && cfg.CGI {
 			return nil, errors.New("refusing to use HTTP_PROXY value in CGI environment; see golang.org/s/cgihttpproxy")
 		}
 	}
-	if proxy == "" {
+	if proxy == nil {
 		return nil, nil
 	}
 	if !cfg.useProxy(canonicalAddr(reqURL)) {
 		return nil, nil
 	}
+
+	return proxy, nil
+}
+
+func parseProxy(proxy string) (*url.URL, error) {
+	if proxy == "" {
+		return nil, nil
+	}
+
 	proxyURL, err := url.Parse(proxy)
 	if err != nil ||
 		(proxyURL.Scheme != "http" &&
@@ -136,58 +172,105 @@ func (cfg *Config) proxyForURL(reqURL *url.URL) (*url.URL, error) {
 // useProxy reports whether requests to addr should use a proxy,
 // according to the NO_PROXY or no_proxy environment variable.
 // addr is always a canonicalAddr with a host and port.
-func (cfg *Config) useProxy(addr string) bool {
+func (cfg *config) useProxy(addr string) bool {
 	if len(addr) == 0 {
 		return true
 	}
-	host, _, err := net.SplitHostPort(addr)
+	host, port, err := net.SplitHostPort(addr)
 	if err != nil {
 		return false
 	}
 	if host == "localhost" {
 		return false
 	}
-	if ip := net.ParseIP(host); ip != nil {
+	ip := net.ParseIP(host)
+	if ip != nil {
 		if ip.IsLoopback() {
 			return false
 		}
 	}
 
-	noProxy := cfg.NoProxy
-	if noProxy == "*" {
-		return false
+	addr = strings.ToLower(strings.TrimSpace(host))
+
+	if ip != nil {
+		for _, m := range cfg.ipMatchers {
+			if m.match(addr, port, ip) {
+				return false
+			}
+		}
 	}
+	for _, m := range cfg.domainMatchers {
+		if m.match(addr, port, ip) {
+			return false
+		}
+	}
+	return true
+}
 
-	addr = strings.ToLower(strings.TrimSpace(addr))
-	if hasPort(addr) {
-		addr = addr[:strings.LastIndex(addr, ":")]
+func (c *config) init() {
+	if parsed, err := parseProxy(c.HTTPProxy); err == nil {
+		c.httpProxy = parsed
+	}
+	if parsed, err := parseProxy(c.HTTPSProxy); err == nil {
+		c.httpsProxy = parsed
 	}
 
-	for _, p := range strings.Split(noProxy, ",") {
+	for _, p := range strings.Split(c.NoProxy, ",") {
 		p = strings.ToLower(strings.TrimSpace(p))
 		if len(p) == 0 {
 			continue
 		}
-		if hasPort(p) {
-			p = p[:strings.LastIndex(p, ":")]
+
+		if p == "*" {
+			c.ipMatchers = []matcher{allMatch{}}
+			c.domainMatchers = []matcher{allMatch{}}
+			return
 		}
-		if addr == p {
-			return false
+
+		// IPv4/CIDR, IPv6/CIDR
+		if _, pnet, err := net.ParseCIDR(p); err == nil {
+			c.ipMatchers = append(c.ipMatchers, cidrMatch{cidr: pnet})
+			continue
 		}
-		if len(p) == 0 {
+
+		// IPv4:port, [IPv6]:port
+		phost, pport, err := net.SplitHostPort(p)
+		if err == nil {
+			if len(phost) == 0 {
+				// There is no host part, likely the entry is malformed; ignore.
+				continue
+			}
+			if phost[0] == '[' && phost[len(phost)-1] == ']' {
+				phost = phost[1 : len(phost)-1]
+			}
+		} else {
+			phost = p
+		}
+		// IPv4, IPv6
+		if pip := net.ParseIP(phost); pip != nil {
+			c.ipMatchers = append(c.ipMatchers, ipMatch{ip: pip, port: pport})
+			continue
+		}
+
+		if len(phost) == 0 {
 			// There is no host part, likely the entry is malformed; ignore.
 			continue
 		}
-		if p[0] == '.' && (strings.HasSuffix(addr, p) || addr == p[1:]) {
-			// no_proxy ".foo.com" matches "bar.foo.com" or "foo.com"
-			return false
+
+		// domain.com or domain.com:80
+		// foo.com matches bar.foo.com
+		// .domain.com or .domain.com:port
+		// *.domain.com or *.domain.com:port
+		if strings.HasPrefix(phost, "*.") {
+			phost = phost[1:]
 		}
-		if p[0] != '.' && strings.HasSuffix(addr, p) && addr[len(addr)-len(p)-1] == '.' {
-			// no_proxy "foo.com" matches "bar.foo.com"
-			return false
+		matchHost := false
+		if phost[0] != '.' {
+			matchHost = true
+			phost = "." + phost
 		}
+		c.domainMatchers = append(c.domainMatchers, domainMatch{host: phost, port: pport, matchHost: matchHost})
 	}
-	return true
 }
 
 var portMap = map[string]string{
@@ -237,3 +320,51 @@ func isASCII(s string) bool {
 	}
 	return true
 }
+
+// matcher represents the matching rule for a given value in the NO_PROXY list
+type matcher interface {
+	// match returns true if the host and optional port or ip and optional port
+	// are allowed
+	match(host, port string, ip net.IP) bool
+}
+
+// allMatch matches on all possible inputs
+type allMatch struct{}
+
+func (a allMatch) match(host, port string, ip net.IP) bool {
+	return true
+}
+
+type cidrMatch struct {
+	cidr *net.IPNet
+}
+
+func (m cidrMatch) match(host, port string, ip net.IP) bool {
+	return m.cidr.Contains(ip)
+}
+
+type ipMatch struct {
+	ip   net.IP
+	port string
+}
+
+func (m ipMatch) match(host, port string, ip net.IP) bool {
+	if m.ip.Equal(ip) {
+		return m.port == "" || m.port == port
+	}
+	return false
+}
+
+type domainMatch struct {
+	host string
+	port string
+
+	matchHost bool
+}
+
+func (m domainMatch) match(host, port string, ip net.IP) bool {
+	if strings.HasSuffix(host, m.host) || (m.matchHost && host == m.host[1:]) {
+		return m.port == "" || m.port == port
+	}
+	return false
+}
diff --git a/vendor/golang.org/x/net/http/httpproxy/proxy_test.go b/vendor/golang.org/x/net/http/httpproxy/proxy_test.go
index e4af199c..9951246a 100644
--- a/vendor/golang.org/x/net/http/httpproxy/proxy_test.go
+++ b/vendor/golang.org/x/net/http/httpproxy/proxy_test.go
@@ -144,7 +144,7 @@ var proxyForURLTests = []proxyForURLTest{{
 		HTTPProxy: "proxy",
 	},
 	req:  "http://example.com/",
-	want: "<nil>",
+	want: "http://proxy",
 }, {
 	cfg: httpproxy.Config{
 		NoProxy:   "ample.com",
@@ -269,19 +269,36 @@ var UseProxyTests = []struct {
 	{"[::1]", false},
 	{"[::2]", true}, // not a loopback address
 
-	{"barbaz.net", false},     // match as .barbaz.net
-	{"foobar.com", false},     // have a port but match
-	{"foofoobar.com", true},   // not match as a part of foobar.com
-	{"baz.com", true},         // not match as a part of barbaz.com
-	{"localhost.net", true},   // not match as suffix of address
-	{"local.localhost", true}, // not match as prefix as address
-	{"barbarbaz.net", true},   // not match because NO_PROXY have a '.'
-	{"www.foobar.com", false}, // match because NO_PROXY includes "foobar.com"
+	{"192.168.1.1", false},                // matches exact IPv4
+	{"192.168.1.2", true},                 // ports do not match
+	{"192.168.1.3", false},                // matches exact IPv4:port
+	{"192.168.1.4", true},                 // no match
+	{"10.0.0.2", false},                   // matches IPv4/CIDR
+	{"[2001:db8::52:0:1]", false},         // matches exact IPv6
+	{"[2001:db8::52:0:2]", true},          // no match
+	{"[2001:db8::52:0:3]", false},         // matches exact [IPv6]:port
+	{"[2002:db8:a::123]", false},          // matches IPv6/CIDR
+	{"[fe80::424b:c8be:1643:a1b6]", true}, // no match
+
+	{"barbaz.net", true},          // does not match as .barbaz.net
+	{"www.barbaz.net", false},     // does match as .barbaz.net
+	{"foobar.com", false},         // does match as foobar.com
+	{"www.foobar.com", false},     // match because NO_PROXY includes "foobar.com"
+	{"foofoobar.com", true},       // not match as a part of foobar.com
+	{"baz.com", true},             // not match as a part of barbaz.com
+	{"localhost.net", true},       // not match as suffix of address
+	{"local.localhost", true},     // not match as prefix as address
+	{"barbarbaz.net", true},       // not match, wrong domain
+	{"wildcard.io", true},         // does not match as *.wildcard.io
+	{"nested.wildcard.io", false}, // match as *.wildcard.io
+	{"awildcard.io", true},        // not a match because of '*'
 }
 
+var noProxy = "foobar.com, .barbaz.net, *.wildcard.io, 192.168.1.1, 192.168.1.2:81, 192.168.1.3:80, 10.0.0.0/30, 2001:db8::52:0:1, [2001:db8::52:0:2]:443, [2001:db8::52:0:3]:80, 2002:db8:a::45/64"
+
 func TestUseProxy(t *testing.T) {
 	cfg := &httpproxy.Config{
-		NoProxy: "foobar.com, .barbaz.net",
+		NoProxy: noProxy,
 	}
 	for _, test := range UseProxyTests {
 		if httpproxy.ExportUseProxy(cfg, test.host+":80") != test.match {
@@ -299,3 +316,36 @@ func TestInvalidNoProxy(t *testing.T) {
 		t.Errorf("useProxy unexpected return; got false; want true")
 	}
 }
+
+func TestAllNoProxy(t *testing.T) {
+	cfg := &httpproxy.Config{
+		NoProxy: "*",
+	}
+	for _, test := range UseProxyTests {
+		if httpproxy.ExportUseProxy(cfg, test.host+":80") != false {
+			t.Errorf("useProxy(%v) = true, want false", test.host)
+		}
+	}
+}
+
+func BenchmarkProxyForURL(b *testing.B) {
+	cfg := &httpproxy.Config{
+		HTTPProxy:  "http://proxy.example.org",
+		HTTPSProxy: "https://proxy.example.org",
+		NoProxy:    noProxy,
+	}
+	for _, test := range UseProxyTests {
+		u, err := url.Parse("https://" + test.host + ":80")
+		if err != nil {
+			b.Fatalf("parsed failed: %s", test.host)
+		}
+		proxyFunc := cfg.ProxyFunc()
+		b.Run(test.host, func(b *testing.B) {
+			for n := 0; n < b.N; n++ {
+				if au, e := proxyFunc(u); e != nil && test.match == (au != nil) {
+					b.Errorf("useProxy(%v) = %v, want %v", test.host, !test.match, test.match)
+				}
+			}
+		})
+	}
+}
diff --git a/vendor/golang.org/x/net/http2/client_conn_pool.go b/vendor/golang.org/x/net/http2/client_conn_pool.go
index bdf5652b..f4d9b5ec 100644
--- a/vendor/golang.org/x/net/http2/client_conn_pool.go
+++ b/vendor/golang.org/x/net/http2/client_conn_pool.go
@@ -52,9 +52,31 @@ const (
 	noDialOnMiss = false
 )
 
+// shouldTraceGetConn reports whether getClientConn should call any
+// ClientTrace.GetConn hook associated with the http.Request.
+//
+// This complexity is needed to avoid double calls of the GetConn hook
+// during the back-and-forth between net/http and x/net/http2 (when the
+// net/http.Transport is upgraded to also speak http2), as well as support
+// the case where x/net/http2 is being used directly.
+func (p *clientConnPool) shouldTraceGetConn(st clientConnIdleState) bool {
+	// If our Transport wasn't made via ConfigureTransport, always
+	// trace the GetConn hook if provided, because that means the
+	// http2 package is being used directly and it's the one
+	// dialing, as opposed to net/http.
+	if _, ok := p.t.ConnPool.(noDialClientConnPool); !ok {
+		return true
+	}
+	// Otherwise, only use the GetConn hook if this connection has
+	// been used previously for other requests. For fresh
+	// connections, the net/http package does the dialing.
+	return !st.freshConn
+}
+
 func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMiss bool) (*ClientConn, error) {
 	if isConnectionCloseRequest(req) && dialOnMiss {
 		// It gets its own connection.
+		traceGetConn(req, addr)
 		const singleUse = true
 		cc, err := p.t.dialClientConn(addr, singleUse)
 		if err != nil {
@@ -64,7 +86,10 @@ func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMis
 	}
 	p.mu.Lock()
 	for _, cc := range p.conns[addr] {
-		if cc.CanTakeNewRequest() {
+		if st := cc.idleState(); st.canTakeNewRequest {
+			if p.shouldTraceGetConn(st) {
+				traceGetConn(req, addr)
+			}
 			p.mu.Unlock()
 			return cc, nil
 		}
@@ -73,6 +98,7 @@ func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMis
 		p.mu.Unlock()
 		return nil, ErrNoCachedConn
 	}
+	traceGetConn(req, addr)
 	call := p.getStartDialLocked(addr)
 	p.mu.Unlock()
 	<-call.done
diff --git a/vendor/golang.org/x/net/http2/configure_transport.go b/vendor/golang.org/x/net/http2/configure_transport.go
index 088d6e2b..6356b328 100644
--- a/vendor/golang.org/x/net/http2/configure_transport.go
+++ b/vendor/golang.org/x/net/http2/configure_transport.go
@@ -57,7 +57,7 @@ func configureTransport(t1 *http.Transport) (*Transport, error) {
 
 // registerHTTPSProtocol calls Transport.RegisterProtocol but
 // converting panics into errors.
-func registerHTTPSProtocol(t *http.Transport, rt http.RoundTripper) (err error) {
+func registerHTTPSProtocol(t *http.Transport, rt noDialH2RoundTripper) (err error) {
 	defer func() {
 		if e := recover(); e != nil {
 			err = fmt.Errorf("%v", e)
@@ -69,10 +69,12 @@ func registerHTTPSProtocol(t *http.Transport, rt http.RoundTripper) (err error)
 
 // noDialH2RoundTripper is a RoundTripper which only tries to complete the request
 // if there's already has a cached connection to the host.
-type noDialH2RoundTripper struct{ t *Transport }
+// (The field is exported so it can be accessed via reflect from net/http; tested
+// by TestNoDialH2RoundTripperType)
+type noDialH2RoundTripper struct{ *Transport }
 
 func (rt noDialH2RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	res, err := rt.t.RoundTrip(req)
+	res, err := rt.Transport.RoundTrip(req)
 	if isNoCachedConnError(err) {
 		return nil, http.ErrSkipAltProtocol
 	}
diff --git a/vendor/golang.org/x/net/http2/flow.go b/vendor/golang.org/x/net/http2/flow.go
index 957de254..cea601fc 100644
--- a/vendor/golang.org/x/net/http2/flow.go
+++ b/vendor/golang.org/x/net/http2/flow.go
@@ -41,10 +41,10 @@ func (f *flow) take(n int32) {
 // add adds n bytes (positive or negative) to the flow control window.
 // It returns false if the sum would exceed 2^31-1.
 func (f *flow) add(n int32) bool {
-	remain := (1<<31 - 1) - f.n
-	if n > remain {
-		return false
+	sum := f.n + n
+	if (sum > n) == (f.n > 0) {
+		f.n = sum
+		return true
 	}
-	f.n += n
-	return true
+	return false
 }
diff --git a/vendor/golang.org/x/net/http2/flow_test.go b/vendor/golang.org/x/net/http2/flow_test.go
index 859adf5d..7ae82c78 100644
--- a/vendor/golang.org/x/net/http2/flow_test.go
+++ b/vendor/golang.org/x/net/http2/flow_test.go
@@ -49,5 +49,39 @@ func TestFlowAdd(t *testing.T) {
 	if f.add(1) {
 		t.Fatal("adding 1 to max shouldn't be allowed")
 	}
+}
+
+func TestFlowAddOverflow(t *testing.T) {
+	var f flow
+	if !f.add(0) {
+		t.Fatal("failed to add 0")
+	}
+	if !f.add(-1) {
+		t.Fatal("failed to add -1")
+	}
+	if !f.add(0) {
+		t.Fatal("failed to add 0")
+	}
+	if !f.add(1) {
+		t.Fatal("failed to add 1")
+	}
+	if !f.add(1) {
+		t.Fatal("failed to add 1")
+	}
+	if !f.add(0) {
+		t.Fatal("failed to add 0")
+	}
+	if !f.add(-3) {
+		t.Fatal("failed to add -3")
+	}
+	if got, want := f.available(), int32(-2); got != want {
+		t.Fatalf("size = %d; want %d", got, want)
+	}
+	if !f.add(1<<31 - 1) {
+		t.Fatal("failed to add 2^31-1")
+	}
+	if got, want := f.available(), int32(1+-3+(1<<31-1)); got != want {
+		t.Fatalf("size = %d; want %d", got, want)
+	}
 
 }
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
index 3b148907..c85e31f2 100644
--- a/vendor/golang.org/x/net/http2/frame.go
+++ b/vendor/golang.org/x/net/http2/frame.go
@@ -14,8 +14,8 @@ import (
 	"strings"
 	"sync"
 
+	"golang.org/x/net/http/httpguts"
 	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/lex/httplex"
 )
 
 const frameHeaderLen = 9
@@ -733,32 +733,67 @@ func (f *SettingsFrame) IsAck() bool {
 	return f.FrameHeader.Flags.Has(FlagSettingsAck)
 }
 
-func (f *SettingsFrame) Value(s SettingID) (v uint32, ok bool) {
+func (f *SettingsFrame) Value(id SettingID) (v uint32, ok bool) {
 	f.checkValid()
-	buf := f.p
-	for len(buf) > 0 {
-		settingID := SettingID(binary.BigEndian.Uint16(buf[:2]))
-		if settingID == s {
-			return binary.BigEndian.Uint32(buf[2:6]), true
+	for i := 0; i < f.NumSettings(); i++ {
+		if s := f.Setting(i); s.ID == id {
+			return s.Val, true
 		}
-		buf = buf[6:]
 	}
 	return 0, false
 }
 
+// Setting returns the setting from the frame at the given 0-based index.
+// The index must be >= 0 and less than f.NumSettings().
+func (f *SettingsFrame) Setting(i int) Setting {
+	buf := f.p
+	return Setting{
+		ID:  SettingID(binary.BigEndian.Uint16(buf[i*6 : i*6+2])),
+		Val: binary.BigEndian.Uint32(buf[i*6+2 : i*6+6]),
+	}
+}
+
+func (f *SettingsFrame) NumSettings() int { return len(f.p) / 6 }
+
+// HasDuplicates reports whether f contains any duplicate setting IDs.
+func (f *SettingsFrame) HasDuplicates() bool {
+	num := f.NumSettings()
+	if num == 0 {
+		return false
+	}
+	// If it's small enough (the common case), just do the n^2
+	// thing and avoid a map allocation.
+	if num < 10 {
+		for i := 0; i < num; i++ {
+			idi := f.Setting(i).ID
+			for j := i + 1; j < num; j++ {
+				idj := f.Setting(j).ID
+				if idi == idj {
+					return true
+				}
+			}
+		}
+		return false
+	}
+	seen := map[SettingID]bool{}
+	for i := 0; i < num; i++ {
+		id := f.Setting(i).ID
+		if seen[id] {
+			return true
+		}
+		seen[id] = true
+	}
+	return false
+}
+
 // ForeachSetting runs fn for each setting.
 // It stops and returns the first error.
 func (f *SettingsFrame) ForeachSetting(fn func(Setting) error) error {
 	f.checkValid()
-	buf := f.p
-	for len(buf) > 0 {
-		if err := fn(Setting{
-			SettingID(binary.BigEndian.Uint16(buf[:2])),
-			binary.BigEndian.Uint32(buf[2:6]),
-		}); err != nil {
+	for i := 0; i < f.NumSettings(); i++ {
+		if err := fn(f.Setting(i)); err != nil {
 			return err
 		}
-		buf = buf[6:]
 	}
 	return nil
 }
@@ -1462,7 +1497,7 @@ func (fr *Framer) readMetaFrame(hf *HeadersFrame) (*MetaHeadersFrame, error) {
 		if VerboseLogs && fr.logReads {
 			fr.debugReadLoggerf("http2: decoded hpack field %+v", hf)
 		}
-		if !httplex.ValidHeaderFieldValue(hf.Value) {
+		if !httpguts.ValidHeaderFieldValue(hf.Value) {
 			invalid = headerFieldValueError(hf.Value)
 		}
 		isPseudo := strings.HasPrefix(hf.Name, ":")
diff --git a/vendor/golang.org/x/net/http2/frame_test.go b/vendor/golang.org/x/net/http2/frame_test.go
index 37266bc5..3c107b95 100644
--- a/vendor/golang.org/x/net/http2/frame_test.go
+++ b/vendor/golang.org/x/net/http2/frame_test.go
@@ -1189,3 +1189,47 @@ func encodeHeaderRaw(t *testing.T, pairs ...string) []byte {
 	var he hpackEncoder
 	return he.encodeHeaderRaw(t, pairs...)
 }
+
+func TestSettingsDuplicates(t *testing.T) {
+	tests := []struct {
+		settings []Setting
+		want     bool
+	}{
+		{nil, false},
+		{[]Setting{{ID: 1}}, false},
+		{[]Setting{{ID: 1}, {ID: 2}}, false},
+		{[]Setting{{ID: 1}, {ID: 2}}, false},
+		{[]Setting{{ID: 1}, {ID: 2}, {ID: 3}}, false},
+		{[]Setting{{ID: 1}, {ID: 2}, {ID: 3}}, false},
+		{[]Setting{{ID: 1}, {ID: 2}, {ID: 3}, {ID: 4}}, false},
+
+		{[]Setting{{ID: 1}, {ID: 2}, {ID: 3}, {ID: 2}}, true},
+		{[]Setting{{ID: 4}, {ID: 2}, {ID: 3}, {ID: 4}}, true},
+
+		{[]Setting{
+			{ID: 1}, {ID: 2}, {ID: 3}, {ID: 4},
+			{ID: 5}, {ID: 6}, {ID: 7}, {ID: 8},
+			{ID: 9}, {ID: 10}, {ID: 11}, {ID: 12},
+		}, false},
+
+		{[]Setting{
+			{ID: 1}, {ID: 2}, {ID: 3}, {ID: 4},
+			{ID: 5}, {ID: 6}, {ID: 7}, {ID: 8},
+			{ID: 9}, {ID: 10}, {ID: 11}, {ID: 11},
+		}, true},
+	}
+	for i, tt := range tests {
+		fr, _ := testFramer()
+		fr.WriteSettings(tt.settings...)
+		f, err := fr.ReadFrame()
+		if err != nil {
+			t.Fatalf("%d. ReadFrame: %v", i, err)
+		}
+		sf := f.(*SettingsFrame)
+		got := sf.HasDuplicates()
+		if got != tt.want {
+			t.Errorf("%d. HasDuplicates = %v; want %v", i, got, tt.want)
+		}
+	}
+
+}
diff --git a/vendor/golang.org/x/net/http2/go111.go b/vendor/golang.org/x/net/http2/go111.go
new file mode 100644
index 00000000..9749dc0b
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/go111.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.11
+
+package http2
+
+import "net/textproto"
+
+func traceHasWroteHeaderField(trace *clientTrace) bool {
+	return trace != nil && trace.WroteHeaderField != nil
+}
+
+func traceWroteHeaderField(trace *clientTrace, k, v string) {
+	if trace != nil && trace.WroteHeaderField != nil {
+		trace.WroteHeaderField(k, []string{v})
+	}
+}
+
+func traceGot1xxResponseFunc(trace *clientTrace) func(int, textproto.MIMEHeader) error {
+	if trace != nil {
+		return trace.Got1xxResponse
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/net/http2/go17.go b/vendor/golang.org/x/net/http2/go17.go
index 47b7fae0..d957b7bc 100644
--- a/vendor/golang.org/x/net/http2/go17.go
+++ b/vendor/golang.org/x/net/http2/go17.go
@@ -18,6 +18,8 @@ type contextContext interface {
 	context.Context
 }
 
+var errCanceled = context.Canceled
+
 func serverConnBaseContext(c net.Conn, opts *ServeConnOpts) (ctx contextContext, cancel func()) {
 	ctx, cancel = context.WithCancel(context.Background())
 	ctx = context.WithValue(ctx, http.LocalAddrContextKey, c.LocalAddr())
@@ -48,6 +50,14 @@ func (t *Transport) idleConnTimeout() time.Duration {
 
 func setResponseUncompressed(res *http.Response) { res.Uncompressed = true }
 
+func traceGetConn(req *http.Request, hostPort string) {
+	trace := httptrace.ContextClientTrace(req.Context())
+	if trace == nil || trace.GetConn == nil {
+		return
+	}
+	trace.GetConn(hostPort)
+}
+
 func traceGotConn(req *http.Request, cc *ClientConn) {
 	trace := httptrace.ContextClientTrace(req.Context())
 	if trace == nil || trace.GotConn == nil {
@@ -104,3 +114,8 @@ func requestTrace(req *http.Request) *clientTrace {
 func (cc *ClientConn) Ping(ctx context.Context) error {
 	return cc.ping(ctx)
 }
+
+// Shutdown gracefully closes the client connection, waiting for running streams to complete.
+func (cc *ClientConn) Shutdown(ctx context.Context) error {
+	return cc.shutdown(ctx)
+}
diff --git a/vendor/golang.org/x/net/http2/h2c/h2c.go b/vendor/golang.org/x/net/http2/h2c/h2c.go
new file mode 100644
index 00000000..f2d60f84
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/h2c/h2c.go
@@ -0,0 +1,492 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package h2c implements the unencrypted "h2c" form of HTTP/2.
+//
+// The h2c protocol is the non-TLS version of HTTP/2 which is not available from
+// net/http or golang.org/x/net/http2.
+package h2c
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/base64"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"net/textproto"
+	"os"
+	"strings"
+
+	"golang.org/x/net/http/httpguts"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
+)
+
+var (
+	http2VerboseLogs bool
+)
+
+func init() {
+	e := os.Getenv("GODEBUG")
+	if strings.Contains(e, "http2debug=1") || strings.Contains(e, "http2debug=2") {
+		http2VerboseLogs = true
+	}
+}
+
+// h2cHandler is a Handler which implements h2c by hijacking the HTTP/1 traffic
+// that should be h2c traffic. There are two ways to begin a h2c connection
+// (RFC 7540 Section 3.2 and 3.4): (1) Starting with Prior Knowledge - this
+// works by starting an h2c connection with a string of bytes that is valid
+// HTTP/1, but unlikely to occur in practice and (2) Upgrading from HTTP/1 to
+// h2c - this works by using the HTTP/1 Upgrade header to request an upgrade to
+// h2c. When either of those situations occur we hijack the HTTP/1 connection,
+// convert it to a HTTP/2 connection and pass the net.Conn to http2.ServeConn.
+type h2cHandler struct {
+	Handler http.Handler
+	s       *http2.Server
+}
+
+// NewHandler returns an http.Handler that wraps h, intercepting any h2c
+// traffic. If a request is an h2c connection, it's hijacked and redirected to
+// s.ServeConn. Otherwise the returned Handler just forwards requests to h. This
+// works because h2c is designed to be parseable as valid HTTP/1, but ignored by
+// any HTTP server that does not handle h2c. Therefore we leverage the HTTP/1
+// compatible parts of the Go http library to parse and recognize h2c requests.
+// Once a request is recognized as h2c, we hijack the connection and convert it
+// to an HTTP/2 connection which is understandable to s.ServeConn. (s.ServeConn
+// understands HTTP/2 except for the h2c part of it.)
+func NewHandler(h http.Handler, s *http2.Server) http.Handler {
+	return &h2cHandler{
+		Handler: h,
+		s:       s,
+	}
+}
+
+// ServeHTTP implement the h2c support that is enabled by h2c.GetH2CHandler.
+func (s h2cHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	// Handle h2c with prior knowledge (RFC 7540 Section 3.4)
+	if r.Method == "PRI" && len(r.Header) == 0 && r.URL.Path == "*" && r.Proto == "HTTP/2.0" {
+		if http2VerboseLogs {
+			log.Print("h2c: attempting h2c with prior knowledge.")
+		}
+		conn, err := initH2CWithPriorKnowledge(w)
+		if err != nil {
+			if http2VerboseLogs {
+				log.Printf("h2c: error h2c with prior knowledge: %v", err)
+			}
+			return
+		}
+		defer conn.Close()
+
+		s.s.ServeConn(conn, &http2.ServeConnOpts{Handler: s.Handler})
+		return
+	}
+	// Handle Upgrade to h2c (RFC 7540 Section 3.2)
+	if conn, err := h2cUpgrade(w, r); err == nil {
+		defer conn.Close()
+
+		s.s.ServeConn(conn, &http2.ServeConnOpts{Handler: s.Handler})
+		return
+	}
+
+	s.Handler.ServeHTTP(w, r)
+	return
+}
+
+// initH2CWithPriorKnowledge implements creating a h2c connection with prior
+// knowledge (Section 3.4) and creates a net.Conn suitable for http2.ServeConn.
+// All we have to do is look for the client preface that is suppose to be part
+// of the body, and reforward the client preface on the net.Conn this function
+// creates.
+func initH2CWithPriorKnowledge(w http.ResponseWriter) (net.Conn, error) {
+	hijacker, ok := w.(http.Hijacker)
+	if !ok {
+		panic("Hijack not supported.")
+	}
+	conn, rw, err := hijacker.Hijack()
+	if err != nil {
+		panic(fmt.Sprintf("Hijack failed: %v", err))
+	}
+
+	const expectedBody = "SM\r\n\r\n"
+
+	buf := make([]byte, len(expectedBody))
+	n, err := io.ReadFull(rw, buf)
+
+	if string(buf[:n]) == expectedBody {
+		c := &rwConn{
+			Conn:      conn,
+			Reader:    io.MultiReader(strings.NewReader(http2.ClientPreface), rw),
+			BufWriter: rw.Writer,
+		}
+		return c, nil
+	}
+
+	conn.Close()
+	if http2VerboseLogs {
+		log.Printf(
+			"h2c: missing the request body portion of the client preface. Wanted: %v Got: %v",
+			[]byte(expectedBody),
+			buf[0:n],
+		)
+	}
+	return nil, errors.New("invalid client preface")
+}
+
+// drainClientPreface reads a single instance of the HTTP/2 client preface from
+// the supplied reader.
+func drainClientPreface(r io.Reader) error {
+	var buf bytes.Buffer
+	prefaceLen := int64(len(http2.ClientPreface))
+	n, err := io.CopyN(&buf, r, prefaceLen)
+	if err != nil {
+		return err
+	}
+	if n != prefaceLen || buf.String() != http2.ClientPreface {
+		return fmt.Errorf("Client never sent: %s", http2.ClientPreface)
+	}
+	return nil
+}
+
+// h2cUpgrade establishes a h2c connection using the HTTP/1 upgrade (Section 3.2).
+func h2cUpgrade(w http.ResponseWriter, r *http.Request) (net.Conn, error) {
+	if !isH2CUpgrade(r.Header) {
+		return nil, errors.New("non-conforming h2c headers")
+	}
+
+	// Initial bytes we put into conn to fool http2 server
+	initBytes, _, err := convertH1ReqToH2(r)
+	if err != nil {
+		return nil, err
+	}
+
+	hijacker, ok := w.(http.Hijacker)
+	if !ok {
+		return nil, errors.New("hijack not supported.")
+	}
+	conn, rw, err := hijacker.Hijack()
+	if err != nil {
+		return nil, fmt.Errorf("hijack failed: %v", err)
+	}
+
+	rw.Write([]byte("HTTP/1.1 101 Switching Protocols\r\n" +
+		"Connection: Upgrade\r\n" +
+		"Upgrade: h2c\r\n\r\n"))
+	rw.Flush()
+
+	// A conforming client will now send an H2 client preface which need to drain
+	// since we already sent this.
+	if err := drainClientPreface(rw); err != nil {
+		return nil, err
+	}
+
+	c := &rwConn{
+		Conn:      conn,
+		Reader:    io.MultiReader(initBytes, rw),
+		BufWriter: newSettingsAckSwallowWriter(rw.Writer),
+	}
+	return c, nil
+}
+
+// convert the data contained in the HTTP/1 upgrade request into the HTTP/2
+// version in byte form.
+func convertH1ReqToH2(r *http.Request) (*bytes.Buffer, []http2.Setting, error) {
+	h2Bytes := bytes.NewBuffer([]byte((http2.ClientPreface)))
+	framer := http2.NewFramer(h2Bytes, nil)
+	settings, err := getH2Settings(r.Header)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if err := framer.WriteSettings(settings...); err != nil {
+		return nil, nil, err
+	}
+
+	headerBytes, err := getH2HeaderBytes(r, getMaxHeaderTableSize(settings))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	maxFrameSize := int(getMaxFrameSize(settings))
+	needOneHeader := len(headerBytes) < maxFrameSize
+	err = framer.WriteHeaders(http2.HeadersFrameParam{
+		StreamID:      1,
+		BlockFragment: headerBytes,
+		EndHeaders:    needOneHeader,
+	})
+	if err != nil {
+		return nil, nil, err
+	}
+
+	for i := maxFrameSize; i < len(headerBytes); i += maxFrameSize {
+		if len(headerBytes)-i > maxFrameSize {
+			if err := framer.WriteContinuation(1,
+				false, // endHeaders
+				headerBytes[i:maxFrameSize]); err != nil {
+				return nil, nil, err
+			}
+		} else {
+			if err := framer.WriteContinuation(1,
+				true, // endHeaders
+				headerBytes[i:]); err != nil {
+				return nil, nil, err
+			}
+		}
+	}
+
+	return h2Bytes, settings, nil
+}
+
+// getMaxFrameSize returns the SETTINGS_MAX_FRAME_SIZE. If not present default
+// value is 16384 as specified by RFC 7540 Section 6.5.2.
+func getMaxFrameSize(settings []http2.Setting) uint32 {
+	for _, setting := range settings {
+		if setting.ID == http2.SettingMaxFrameSize {
+			return setting.Val
+		}
+	}
+	return 16384
+}
+
+// getMaxHeaderTableSize returns the SETTINGS_HEADER_TABLE_SIZE. If not present
+// default value is 4096 as specified by RFC 7540 Section 6.5.2.
+func getMaxHeaderTableSize(settings []http2.Setting) uint32 {
+	for _, setting := range settings {
+		if setting.ID == http2.SettingHeaderTableSize {
+			return setting.Val
+		}
+	}
+	return 4096
+}
+
+// bufWriter is a Writer interface that also has a Flush method.
+type bufWriter interface {
+	io.Writer
+	Flush() error
+}
+
+// rwConn implements net.Conn but overrides Read and Write so that reads and
+// writes are forwarded to the provided io.Reader and bufWriter.
+type rwConn struct {
+	net.Conn
+	io.Reader
+	BufWriter bufWriter
+}
+
+// Read forwards reads to the underlying Reader.
+func (c *rwConn) Read(p []byte) (int, error) {
+	return c.Reader.Read(p)
+}
+
+// Write forwards writes to the underlying bufWriter and immediately flushes.
+func (c *rwConn) Write(p []byte) (int, error) {
+	n, err := c.BufWriter.Write(p)
+	if err := c.BufWriter.Flush(); err != nil {
+		return 0, err
+	}
+	return n, err
+}
+
+// settingsAckSwallowWriter is a writer that normally forwards bytes to it's
+// underlying Writer, but swallows the first SettingsAck frame that it sees.
+type settingsAckSwallowWriter struct {
+	Writer     *bufio.Writer
+	buf        []byte
+	didSwallow bool
+}
+
+// newSettingsAckSwallowWriter returns a new settingsAckSwallowWriter.
+func newSettingsAckSwallowWriter(w *bufio.Writer) *settingsAckSwallowWriter {
+	return &settingsAckSwallowWriter{
+		Writer:     w,
+		buf:        make([]byte, 0),
+		didSwallow: false,
+	}
+}
+
+// Write implements io.Writer interface. Normally forwards bytes to w.Writer,
+// except for the first Settings ACK frame that it sees.
+func (w *settingsAckSwallowWriter) Write(p []byte) (int, error) {
+	if !w.didSwallow {
+		w.buf = append(w.buf, p...)
+		// Process all the frames we have collected into w.buf
+		for {
+			// Append until we get full frame header which is 9 bytes
+			if len(w.buf) < 9 {
+				break
+			}
+			// Check if we have collected a whole frame.
+			fh, err := http2.ReadFrameHeader(bytes.NewBuffer(w.buf))
+			if err != nil {
+				// Corrupted frame, fail current Write
+				return 0, err
+			}
+			fSize := fh.Length + 9
+			if uint32(len(w.buf)) < fSize {
+				// Have not collected whole frame. Stop processing buf, and withold on
+				// forward bytes to w.Writer until we get the full frame.
+				break
+			}
+
+			// We have now collected a whole frame.
+			if fh.Type == http2.FrameSettings && fh.Flags.Has(http2.FlagSettingsAck) {
+				// If Settings ACK frame, do not forward to underlying writer, remove
+				// bytes from w.buf, and record that we have swallowed Settings Ack
+				// frame.
+				w.didSwallow = true
+				w.buf = w.buf[fSize:]
+				continue
+			}
+
+			// Not settings ack frame. Forward bytes to w.Writer.
+			if _, err := w.Writer.Write(w.buf[:fSize]); err != nil {
+				// Couldn't forward bytes. Fail current Write.
+				return 0, err
+			}
+			w.buf = w.buf[fSize:]
+		}
+		return len(p), nil
+	}
+	return w.Writer.Write(p)
+}
+
+// Flush calls w.Writer.Flush.
+func (w *settingsAckSwallowWriter) Flush() error {
+	return w.Writer.Flush()
+}
+
+// isH2CUpgrade returns true if the header properly request an upgrade to h2c
+// as specified by Section 3.2.
+func isH2CUpgrade(h http.Header) bool {
+	return httpguts.HeaderValuesContainsToken(h[textproto.CanonicalMIMEHeaderKey("Upgrade")], "h2c") &&
+		httpguts.HeaderValuesContainsToken(h[textproto.CanonicalMIMEHeaderKey("Connection")], "HTTP2-Settings")
+}
+
+// getH2Settings returns the []http2.Setting that are encoded in the
+// HTTP2-Settings header.
+func getH2Settings(h http.Header) ([]http2.Setting, error) {
+	vals, ok := h[textproto.CanonicalMIMEHeaderKey("HTTP2-Settings")]
+	if !ok {
+		return nil, errors.New("missing HTTP2-Settings header")
+	}
+	if len(vals) != 1 {
+		return nil, fmt.Errorf("expected 1 HTTP2-Settings. Got: %v", vals)
+	}
+	settings, err := decodeSettings(vals[0])
+	if err != nil {
+		return nil, fmt.Errorf("Invalid HTTP2-Settings: %q", vals[0])
+	}
+	return settings, nil
+}
+
+// decodeSettings decodes the base64url header value of the HTTP2-Settings
+// header. RFC 7540 Section 3.2.1.
+func decodeSettings(headerVal string) ([]http2.Setting, error) {
+	b, err := base64.RawURLEncoding.DecodeString(headerVal)
+	if err != nil {
+		return nil, err
+	}
+	if len(b)%6 != 0 {
+		return nil, err
+	}
+	settings := make([]http2.Setting, 0)
+	for i := 0; i < len(b)/6; i++ {
+		settings = append(settings, http2.Setting{
+			ID:  http2.SettingID(binary.BigEndian.Uint16(b[i*6 : i*6+2])),
+			Val: binary.BigEndian.Uint32(b[i*6+2 : i*6+6]),
+		})
+	}
+
+	return settings, nil
+}
+
+// getH2HeaderBytes return the headers in r a []bytes encoded by HPACK.
+func getH2HeaderBytes(r *http.Request, maxHeaderTableSize uint32) ([]byte, error) {
+	headerBytes := bytes.NewBuffer(nil)
+	hpackEnc := hpack.NewEncoder(headerBytes)
+	hpackEnc.SetMaxDynamicTableSize(maxHeaderTableSize)
+
+	// Section 8.1.2.3
+	err := hpackEnc.WriteField(hpack.HeaderField{
+		Name:  ":method",
+		Value: r.Method,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	err = hpackEnc.WriteField(hpack.HeaderField{
+		Name:  ":scheme",
+		Value: "http",
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	err = hpackEnc.WriteField(hpack.HeaderField{
+		Name:  ":authority",
+		Value: r.Host,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	path := r.URL.Path
+	if r.URL.RawQuery != "" {
+		path = strings.Join([]string{path, r.URL.RawQuery}, "?")
+	}
+	err = hpackEnc.WriteField(hpack.HeaderField{
+		Name:  ":path",
+		Value: path,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// TODO Implement Section 8.3
+
+	for header, values := range r.Header {
+		// Skip non h2 headers
+		if isNonH2Header(header) {
+			continue
+		}
+		for _, v := range values {
+			err := hpackEnc.WriteField(hpack.HeaderField{
+				Name:  strings.ToLower(header),
+				Value: v,
+			})
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+	return headerBytes.Bytes(), nil
+}
+
+// Connection specific headers listed in RFC 7540 Section 8.1.2.2 that are not
+// suppose to be transferred to HTTP/2. The Http2-Settings header is skipped
+// since already use to create the HTTP/2 SETTINGS frame.
+var nonH2Headers = []string{
+	"Connection",
+	"Keep-Alive",
+	"Proxy-Connection",
+	"Transfer-Encoding",
+	"Upgrade",
+	"Http2-Settings",
+}
+
+// isNonH2Header returns true if header should not be transferred to HTTP/2.
+func isNonH2Header(header string) bool {
+	for _, nonH2h := range nonH2Headers {
+		if header == nonH2h {
+			return true
+		}
+	}
+	return false
+}
diff --git a/vendor/golang.org/x/net/http2/h2c/h2c_test.go b/vendor/golang.org/x/net/http2/h2c/h2c_test.go
new file mode 100644
index 00000000..57aadc0b
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/h2c/h2c_test.go
@@ -0,0 +1,58 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package h2c
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"log"
+	"net/http"
+	"testing"
+
+	"golang.org/x/net/http2"
+)
+
+func TestSettingsAckSwallowWriter(t *testing.T) {
+	var buf bytes.Buffer
+	swallower := newSettingsAckSwallowWriter(bufio.NewWriter(&buf))
+	fw := http2.NewFramer(swallower, nil)
+	fw.WriteSettings(http2.Setting{http2.SettingMaxFrameSize, 2})
+	fw.WriteSettingsAck()
+	fw.WriteData(1, true, []byte{})
+	swallower.Flush()
+
+	fr := http2.NewFramer(nil, bufio.NewReader(&buf))
+
+	f, err := fr.ReadFrame()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if f.Header().Type != http2.FrameSettings {
+		t.Fatalf("Expected first frame to be SETTINGS. Got: %v", f.Header().Type)
+	}
+
+	f, err = fr.ReadFrame()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if f.Header().Type != http2.FrameData {
+		t.Fatalf("Expected first frame to be DATA. Got: %v", f.Header().Type)
+	}
+}
+
+func ExampleNewHandler() {
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprint(w, "Hello world")
+	})
+	h2s := &http2.Server{
+		// ...
+	}
+	h1s := &http.Server{
+		Addr:    ":8080",
+		Handler: NewHandler(handler, h2s),
+	}
+	log.Fatal(h1s.ListenAndServe())
+}
diff --git a/vendor/golang.org/x/net/http2/h2demo/h2demo.go b/vendor/golang.org/x/net/http2/h2demo/h2demo.go
index ce842fd6..59d9f5f6 100644
--- a/vendor/golang.org/x/net/http2/h2demo/h2demo.go
+++ b/vendor/golang.org/x/net/http2/h2demo/h2demo.go
@@ -160,6 +160,9 @@ func echoCapitalHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "PUT required.", 400)
 		return
 	}
+	if f, ok := w.(http.Flusher); ok {
+		f.Flush()
+	}
 	io.Copy(flushWriter{w}, capitalizeReader{r.Body})
 }
 
diff --git a/vendor/golang.org/x/net/http2/h2demo/service.yaml b/vendor/golang.org/x/net/http2/h2demo/service.yaml
index 8e7671e4..2b7d5411 100644
--- a/vendor/golang.org/x/net/http2/h2demo/service.yaml
+++ b/vendor/golang.org/x/net/http2/h2demo/service.yaml
@@ -3,6 +3,7 @@ kind: Service
 metadata:
   name: h2demo
 spec:
+  externalTrafficPolicy: Local
   ports:
     - port: 80
       targetPort: 80
diff --git a/vendor/golang.org/x/net/http2/h2i/h2i.go b/vendor/golang.org/x/net/http2/h2i/h2i.go
index 62e57527..12d325eb 100644
--- a/vendor/golang.org/x/net/http2/h2i/h2i.go
+++ b/vendor/golang.org/x/net/http2/h2i/h2i.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !plan9,!solaris
+// +build !js,!nacl,!plan9,!solaris
 
 /*
 The h2i command is an interactive HTTP/2 console.
diff --git a/vendor/golang.org/x/net/http2/hpack/hpack.go b/vendor/golang.org/x/net/http2/hpack/hpack.go
index 176644ac..166788ce 100644
--- a/vendor/golang.org/x/net/http2/hpack/hpack.go
+++ b/vendor/golang.org/x/net/http2/hpack/hpack.go
@@ -389,6 +389,12 @@ func (d *Decoder) callEmit(hf HeaderField) error {
 
 // (same invariants and behavior as parseHeaderFieldRepr)
 func (d *Decoder) parseDynamicTableSizeUpdate() error {
+	// RFC 7541, sec 4.2: This dynamic table size update MUST occur at the
+	// beginning of the first header block following the change to the dynamic table size.
+	if d.dynTab.size > 0 {
+		return DecodingError{errors.New("dynamic table size update MUST occur at the beginning of a header block")}
+	}
+
 	buf := d.buf
 	size, buf, err := readVarInt(5, buf)
 	if err != nil {
diff --git a/vendor/golang.org/x/net/http2/hpack/hpack_test.go b/vendor/golang.org/x/net/http2/hpack/hpack_test.go
index bc7f4767..3f222744 100644
--- a/vendor/golang.org/x/net/http2/hpack/hpack_test.go
+++ b/vendor/golang.org/x/net/http2/hpack/hpack_test.go
@@ -462,6 +462,27 @@ func TestHuffmanDecode(t *testing.T) {
 	}
 }
 
+func BenchmarkHuffmanDecode(b *testing.B) {
+	b.StopTimer()
+	enc, err := hex.DecodeString(strings.Replace("94e7 821d d7f2 e6c7 b335 dfdf cd5b 3960 d5af 2708 7f36 72c1 ab27 0fb5 291f 9587 3160 65c0 03ed 4ee5 b106 3d50 07",
+		" ", "", -1))
+	if err != nil {
+		b.Fatal(err)
+	}
+	b.ReportAllocs()
+	b.StartTimer()
+	var buf bytes.Buffer
+	for i := 0; i < b.N; i++ {
+		buf.Reset()
+		if _, err := HuffmanDecode(&buf, enc); err != nil {
+			b.Fatalf("decode error: %v", err)
+		}
+		if string(buf.Bytes()) != "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1" {
+			b.Fatalf("bogus output %q", buf.Bytes())
+		}
+	}
+}
+
 func TestAppendHuffmanString(t *testing.T) {
 	tests := []struct {
 		in, want string
@@ -720,3 +741,22 @@ func TestSaveBufLimit(t *testing.T) {
 		t.Fatalf("Write error = %v; want ErrStringLength", err)
 	}
 }
+
+func TestDynamicSizeUpdate(t *testing.T) {
+	var buf bytes.Buffer
+	enc := NewEncoder(&buf)
+	enc.SetMaxDynamicTableSize(255)
+	enc.WriteField(HeaderField{Name: "foo", Value: "bar"})
+
+	d := NewDecoder(4096, nil)
+	_, err := d.DecodeFull(buf.Bytes())
+	if err != nil {
+		t.Fatalf("unexpected error: got = %v", err)
+	}
+
+	// must fail since the dynamic table update must be at the beginning
+	_, err = d.DecodeFull(buf.Bytes())
+	if err == nil {
+		t.Fatalf("dynamic table size update not at the beginning of a header block")
+	}
+}
diff --git a/vendor/golang.org/x/net/http2/hpack/huffman.go b/vendor/golang.org/x/net/http2/hpack/huffman.go
index 8850e394..b412a96c 100644
--- a/vendor/golang.org/x/net/http2/hpack/huffman.go
+++ b/vendor/golang.org/x/net/http2/hpack/huffman.go
@@ -47,6 +47,7 @@ var ErrInvalidHuffman = errors.New("hpack: invalid Huffman-encoded data")
 // If maxLen is greater than 0, attempts to write more to buf than
 // maxLen bytes will return ErrStringLength.
 func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error {
+	rootHuffmanNode := getRootHuffmanNode()
 	n := rootHuffmanNode
 	// cur is the bit buffer that has not been fed into n.
 	// cbits is the number of low order bits in cur that are valid.
@@ -106,7 +107,7 @@ func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error {
 
 type node struct {
 	// children is non-nil for internal nodes
-	children []*node
+	children *[256]*node
 
 	// The following are only valid if children is nil:
 	codeLen uint8 // number of bits that led to the output of sym
@@ -114,22 +115,31 @@ type node struct {
 }
 
 func newInternalNode() *node {
-	return &node{children: make([]*node, 256)}
+	return &node{children: new([256]*node)}
 }
 
-var rootHuffmanNode = newInternalNode()
+var (
+	buildRootOnce       sync.Once
+	lazyRootHuffmanNode *node
+)
+
+func getRootHuffmanNode() *node {
+	buildRootOnce.Do(buildRootHuffmanNode)
+	return lazyRootHuffmanNode
+}
 
-func init() {
+func buildRootHuffmanNode() {
 	if len(huffmanCodes) != 256 {
 		panic("unexpected size")
 	}
+	lazyRootHuffmanNode = newInternalNode()
 	for i, code := range huffmanCodes {
 		addDecoderNode(byte(i), code, huffmanCodeLen[i])
 	}
 }
 
 func addDecoderNode(sym byte, code uint32, codeLen uint8) {
-	cur := rootHuffmanNode
+	cur := lazyRootHuffmanNode
 	for codeLen > 8 {
 		codeLen -= 8
 		i := uint8(code >> codeLen)
diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go
index 71db28a8..c8242825 100644
--- a/vendor/golang.org/x/net/http2/http2.go
+++ b/vendor/golang.org/x/net/http2/http2.go
@@ -29,7 +29,7 @@ import (
 	"strings"
 	"sync"
 
-	"golang.org/x/net/lex/httplex"
+	"golang.org/x/net/http/httpguts"
 )
 
 var (
@@ -179,7 +179,7 @@ var (
 )
 
 // validWireHeaderFieldName reports whether v is a valid header field
-// name (key). See httplex.ValidHeaderName for the base rules.
+// name (key). See httpguts.ValidHeaderName for the base rules.
 //
 // Further, http2 says:
 //   "Just as in HTTP/1.x, header field names are strings of ASCII
@@ -191,7 +191,7 @@ func validWireHeaderFieldName(v string) bool {
 		return false
 	}
 	for _, r := range v {
-		if !httplex.IsTokenRune(r) {
+		if !httpguts.IsTokenRune(r) {
 			return false
 		}
 		if 'A' <= r && r <= 'Z' {
diff --git a/vendor/golang.org/x/net/http2/http2_test.go b/vendor/golang.org/x/net/http2/http2_test.go
index 52487764..667db488 100644
--- a/vendor/golang.org/x/net/http2/http2_test.go
+++ b/vendor/golang.org/x/net/http2/http2_test.go
@@ -14,6 +14,7 @@ import (
 	"strconv"
 	"strings"
 	"testing"
+	"time"
 
 	"golang.org/x/net/http2/hpack"
 )
@@ -197,3 +198,30 @@ func TestSorterPoolAllocs(t *testing.T) {
 		t.Logf("Keys allocs = %v; want <1", allocs)
 	}
 }
+
+// waitCondition reports whether fn eventually returned true,
+// checking immediately and then every checkEvery amount,
+// until waitFor has elapsed, at which point it returns false.
+func waitCondition(waitFor, checkEvery time.Duration, fn func() bool) bool {
+	deadline := time.Now().Add(waitFor)
+	for time.Now().Before(deadline) {
+		if fn() {
+			return true
+		}
+		time.Sleep(checkEvery)
+	}
+	return false
+}
+
+// waitErrCondition is like waitCondition but with errors instead of bools.
+func waitErrCondition(waitFor, checkEvery time.Duration, fn func() error) error {
+	deadline := time.Now().Add(waitFor)
+	var err error
+	for time.Now().Before(deadline) {
+		if err = fn(); err == nil {
+			return nil
+		}
+		time.Sleep(checkEvery)
+	}
+	return err
+}
diff --git a/vendor/golang.org/x/net/http2/not_go111.go b/vendor/golang.org/x/net/http2/not_go111.go
new file mode 100644
index 00000000..0df34e6d
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/not_go111.go
@@ -0,0 +1,17 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !go1.11
+
+package http2
+
+import "net/textproto"
+
+func traceHasWroteHeaderField(trace *clientTrace) bool { return false }
+
+func traceWroteHeaderField(trace *clientTrace, k, v string) {}
+
+func traceGot1xxResponseFunc(trace *clientTrace) func(int, textproto.MIMEHeader) error {
+	return nil
+}
diff --git a/vendor/golang.org/x/net/http2/not_go17.go b/vendor/golang.org/x/net/http2/not_go17.go
index 140434a7..7ffb2504 100644
--- a/vendor/golang.org/x/net/http2/not_go17.go
+++ b/vendor/golang.org/x/net/http2/not_go17.go
@@ -8,6 +8,7 @@ package http2
 
 import (
 	"crypto/tls"
+	"errors"
 	"net"
 	"net/http"
 	"time"
@@ -18,6 +19,8 @@ type contextContext interface {
 	Err() error
 }
 
+var errCanceled = errors.New("canceled")
+
 type fakeContext struct{}
 
 func (fakeContext) Done() <-chan struct{} { return nil }
@@ -34,6 +37,7 @@ func setResponseUncompressed(res *http.Response) {
 type clientTrace struct{}
 
 func requestTrace(*http.Request) *clientTrace { return nil }
+func traceGetConn(*http.Request, string)      {}
 func traceGotConn(*http.Request, *ClientConn) {}
 func traceFirstResponseByte(*clientTrace)     {}
 func traceWroteHeaders(*clientTrace)          {}
@@ -84,4 +88,8 @@ func (cc *ClientConn) Ping(ctx contextContext) error {
 	return cc.ping(ctx)
 }
 
+func (cc *ClientConn) Shutdown(ctx contextContext) error {
+	return cc.shutdown(ctx)
+}
+
 func (t *Transport) idleConnTimeout() time.Duration { return 0 }
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
index 39ed755a..9862dad0 100644
--- a/vendor/golang.org/x/net/http2/server.go
+++ b/vendor/golang.org/x/net/http2/server.go
@@ -46,6 +46,7 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/net/http/httpguts"
 	"golang.org/x/net/http2/hpack"
 )
 
@@ -1486,6 +1487,12 @@ func (sc *serverConn) processSettings(f *SettingsFrame) error {
 		}
 		return nil
 	}
+	if f.NumSettings() > 100 || f.HasDuplicates() {
+		// This isn't actually in the spec, but hang up on
+		// suspiciously large settings frames or those with
+		// duplicate entries.
+		return ConnectionError(ErrCodeProtocol)
+	}
 	if err := f.ForeachSetting(sc.processSetting); err != nil {
 		return err
 	}
@@ -1574,6 +1581,12 @@ func (sc *serverConn) processData(f *DataFrame) error {
 		// type PROTOCOL_ERROR."
 		return ConnectionError(ErrCodeProtocol)
 	}
+	// RFC 7540, sec 6.1: If a DATA frame is received whose stream is not in
+	// "open" or "half-closed (local)" state, the recipient MUST respond with a
+	// stream error (Section 5.4.2) of type STREAM_CLOSED.
+	if state == stateClosed {
+		return streamError(id, ErrCodeStreamClosed)
+	}
 	if st == nil || state != stateOpen || st.gotTrailerHeader || st.resetQueued {
 		// This includes sending a RST_STREAM if the stream is
 		// in stateHalfClosedLocal (which currently means that
@@ -1607,7 +1620,10 @@ func (sc *serverConn) processData(f *DataFrame) error {
 	// Sender sending more than they'd declared?
 	if st.declBodyBytes != -1 && st.bodyBytes+int64(len(data)) > st.declBodyBytes {
 		st.body.CloseWithError(fmt.Errorf("sender tried to send more than declared Content-Length of %d bytes", st.declBodyBytes))
-		return streamError(id, ErrCodeStreamClosed)
+		// RFC 7540, sec 8.1.2.6: A request or response is also malformed if the
+		// value of a content-length header field does not equal the sum of the
+		// DATA frame payload lengths that form the body.
+		return streamError(id, ErrCodeProtocol)
 	}
 	if f.Length > 0 {
 		// Check whether the client has flow control quota.
@@ -1717,6 +1733,13 @@ func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 			// processing this frame.
 			return nil
 		}
+		// RFC 7540, sec 5.1: If an endpoint receives additional frames, other than
+		// WINDOW_UPDATE, PRIORITY, or RST_STREAM, for a stream that is in
+		// this state, it MUST respond with a stream error (Section 5.4.2) of
+		// type STREAM_CLOSED.
+		if st.state == stateHalfClosedRemote {
+			return streamError(id, ErrCodeStreamClosed)
+		}
 		return st.processTrailerHeaders(f)
 	}
 
@@ -1817,7 +1840,7 @@ func (st *stream) processTrailerHeaders(f *MetaHeadersFrame) error {
 	if st.trailer != nil {
 		for _, hf := range f.RegularFields() {
 			key := sc.canonicalHeader(hf.Name)
-			if !ValidTrailerHeader(key) {
+			if !httpguts.ValidTrailerHeader(key) {
 				// TODO: send more details to the peer somehow. But http2 has
 				// no way to send debug data at a stream level. Discuss with
 				// HTTP folk.
@@ -2284,7 +2307,7 @@ func (rws *responseWriterState) hasTrailers() bool { return len(rws.trailers) !=
 // written in the trailers at the end of the response.
 func (rws *responseWriterState) declareTrailer(k string) {
 	k = http.CanonicalHeaderKey(k)
-	if !ValidTrailerHeader(k) {
+	if !httpguts.ValidTrailerHeader(k) {
 		// Forbidden by RFC 7230, section 4.1.2.
 		rws.conn.logf("ignoring invalid trailer %q", k)
 		return
@@ -2335,6 +2358,19 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 			foreachHeaderElement(v, rws.declareTrailer)
 		}
 
+		// "Connection" headers aren't allowed in HTTP/2 (RFC 7540, 8.1.2.2),
+		// but respect "Connection" == "close" to mean sending a GOAWAY and tearing
+		// down the TCP connection when idle, like we do for HTTP/1.
+		// TODO: remove more Connection-specific header fields here, in addition
+		// to "Connection".
+		if _, ok := rws.snapHeader["Connection"]; ok {
+			v := rws.snapHeader.Get("Connection")
+			delete(rws.snapHeader, "Connection")
+			if v == "close" {
+				rws.conn.startGracefulShutdown()
+			}
+		}
+
 		endStream := (rws.handlerDone && !rws.hasTrailers() && len(p) == 0) || isHeadResp
 		err = rws.conn.writeHeaders(rws.stream, &writeResHeaders{
 			streamID:      rws.stream.id,
@@ -2838,41 +2874,6 @@ func new400Handler(err error) http.HandlerFunc {
 	}
 }
 
-// ValidTrailerHeader reports whether name is a valid header field name to appear
-// in trailers.
-// See: http://tools.ietf.org/html/rfc7230#section-4.1.2
-func ValidTrailerHeader(name string) bool {
-	name = http.CanonicalHeaderKey(name)
-	if strings.HasPrefix(name, "If-") || badTrailer[name] {
-		return false
-	}
-	return true
-}
-
-var badTrailer = map[string]bool{
-	"Authorization":       true,
-	"Cache-Control":       true,
-	"Connection":          true,
-	"Content-Encoding":    true,
-	"Content-Length":      true,
-	"Content-Range":       true,
-	"Content-Type":        true,
-	"Expect":              true,
-	"Host":                true,
-	"Keep-Alive":          true,
-	"Max-Forwards":        true,
-	"Pragma":              true,
-	"Proxy-Authenticate":  true,
-	"Proxy-Authorization": true,
-	"Proxy-Connection":    true,
-	"Range":               true,
-	"Realm":               true,
-	"Te":                  true,
-	"Trailer":             true,
-	"Transfer-Encoding":   true,
-	"Www-Authenticate":    true,
-}
-
 // h1ServerKeepAlivesDisabled reports whether hs has its keep-alives
 // disabled. See comments on h1ServerShutdownChan above for why
 // the code is written this way.
diff --git a/vendor/golang.org/x/net/http2/server_test.go b/vendor/golang.org/x/net/http2/server_test.go
index c5d8459c..bb19c966 100644
--- a/vendor/golang.org/x/net/http2/server_test.go
+++ b/vendor/golang.org/x/net/http2/server_test.go
@@ -2360,9 +2360,6 @@ func TestServer_NoCrash_HandlerClose_Then_ClientClose(t *testing.T) {
 		// it did before.
 		st.writeData(1, true, []byte("foo"))
 
-		// Get our flow control bytes back, since the handler didn't get them.
-		st.wantWindowUpdate(0, uint32(len("foo")))
-
 		// Sent after a peer sends data anyway (admittedly the
 		// previous RST_STREAM might've still been in-flight),
 		// but they'll get the more friendly 'cancel' code
@@ -3723,3 +3720,133 @@ func TestIssue20704Race(t *testing.T) {
 		resp.Body.Close()
 	}
 }
+
+func TestServer_Rejects_TooSmall(t *testing.T) {
+	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
+		ioutil.ReadAll(r.Body)
+		return nil
+	}, func(st *serverTester) {
+		st.writeHeaders(HeadersFrameParam{
+			StreamID: 1, // clients send odd numbers
+			BlockFragment: st.encodeHeader(
+				":method", "POST",
+				"content-length", "4",
+			),
+			EndStream:  false, // to say DATA frames are coming
+			EndHeaders: true,
+		})
+		st.writeData(1, true, []byte("12345"))
+
+		st.wantRSTStream(1, ErrCodeProtocol)
+	})
+}
+
+// Tests that a handler setting "Connection: close" results in a GOAWAY being sent,
+// and the connection still completing.
+func TestServerHandlerConnectionClose(t *testing.T) {
+	unblockHandler := make(chan bool, 1)
+	defer close(unblockHandler) // backup; in case of errors
+	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
+		w.Header().Set("Connection", "close")
+		w.Header().Set("Foo", "bar")
+		w.(http.Flusher).Flush()
+		<-unblockHandler
+		return nil
+	}, func(st *serverTester) {
+		st.writeHeaders(HeadersFrameParam{
+			StreamID:      1,
+			BlockFragment: st.encodeHeader(),
+			EndStream:     true,
+			EndHeaders:    true,
+		})
+		var sawGoAway bool
+		var sawRes bool
+		for {
+			f, err := st.readFrame()
+			if err == io.EOF {
+				break
+			}
+			if err != nil {
+				t.Fatal(err)
+			}
+			switch f := f.(type) {
+			case *GoAwayFrame:
+				sawGoAway = true
+				unblockHandler <- true
+				if f.LastStreamID != 1 || f.ErrCode != ErrCodeNo {
+					t.Errorf("unexpected GOAWAY frame: %v", summarizeFrame(f))
+				}
+			case *HeadersFrame:
+				goth := st.decodeHeader(f.HeaderBlockFragment())
+				wanth := [][2]string{
+					{":status", "200"},
+					{"foo", "bar"},
+				}
+				if !reflect.DeepEqual(goth, wanth) {
+					t.Errorf("got headers %v; want %v", goth, wanth)
+				}
+				sawRes = true
+			case *DataFrame:
+				if f.StreamID != 1 || !f.StreamEnded() || len(f.Data()) != 0 {
+					t.Errorf("unexpected DATA frame: %v", summarizeFrame(f))
+				}
+			default:
+				t.Logf("unexpected frame: %v", summarizeFrame(f))
+			}
+		}
+		if !sawGoAway {
+			t.Errorf("didn't see GOAWAY")
+		}
+		if !sawRes {
+			t.Errorf("didn't see response")
+		}
+	})
+}
+
+func TestServer_Headers_HalfCloseRemote(t *testing.T) {
+	var st *serverTester
+	writeData := make(chan bool)
+	writeHeaders := make(chan bool)
+	leaveHandler := make(chan bool)
+	st = newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
+		if st.stream(1) == nil {
+			t.Errorf("nil stream 1 in handler")
+		}
+		if got, want := st.streamState(1), stateOpen; got != want {
+			t.Errorf("in handler, state is %v; want %v", got, want)
+		}
+		writeData <- true
+		if n, err := r.Body.Read(make([]byte, 1)); n != 0 || err != io.EOF {
+			t.Errorf("body read = %d, %v; want 0, EOF", n, err)
+		}
+		if got, want := st.streamState(1), stateHalfClosedRemote; got != want {
+			t.Errorf("in handler, state is %v; want %v", got, want)
+		}
+		writeHeaders <- true
+
+		<-leaveHandler
+	})
+	st.greet()
+
+	st.writeHeaders(HeadersFrameParam{
+		StreamID:      1,
+		BlockFragment: st.encodeHeader(),
+		EndStream:     false, // keep it open
+		EndHeaders:    true,
+	})
+	<-writeData
+	st.writeData(1, true, nil)
+
+	<-writeHeaders
+
+	st.writeHeaders(HeadersFrameParam{
+		StreamID:      1,
+		BlockFragment: st.encodeHeader(),
+		EndStream:     false, // keep it open
+		EndHeaders:    true,
+	})
+
+	defer close(leaveHandler)
+
+	st.wantRSTStream(1, ErrCodeStreamClosed)
+}
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index e6b321f4..9d1f2fad 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -21,15 +21,16 @@ import (
 	mathrand "math/rand"
 	"net"
 	"net/http"
+	"net/textproto"
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"golang.org/x/net/http/httpguts"
 	"golang.org/x/net/http2/hpack"
 	"golang.org/x/net/idna"
-	"golang.org/x/net/lex/httplex"
 )
 
 const (
@@ -159,6 +160,7 @@ type ClientConn struct {
 	cond            *sync.Cond // hold mu; broadcast on flow/closed changes
 	flow            flow       // our conn-level flow control quota (cs.flow is per stream)
 	inflow          flow       // peer's conn-level flow control
+	closing         bool
 	closed          bool
 	wantSettingsAck bool                     // we sent a SETTINGS frame and haven't heard back
 	goAway          *GoAwayFrame             // if non-nil, the GoAwayFrame we received
@@ -211,9 +213,10 @@ type clientStream struct {
 	done chan struct{} // closed when stream remove from cc.streams map; close calls guarded by cc.mu
 
 	// owned by clientConnReadLoop:
-	firstByte    bool // got the first response byte
-	pastHeaders  bool // got first MetaHeadersFrame (actual headers)
-	pastTrailers bool // got optional second MetaHeadersFrame (trailers)
+	firstByte    bool  // got the first response byte
+	pastHeaders  bool  // got first MetaHeadersFrame (actual headers)
+	pastTrailers bool  // got optional second MetaHeadersFrame (trailers)
+	num1xx       uint8 // number of 1xx responses seen
 
 	trailer    http.Header  // accumulated trailers
 	resTrailer *http.Header // client's Response.Trailer
@@ -237,6 +240,17 @@ func awaitRequestCancel(req *http.Request, done <-chan struct{}) error {
 	}
 }
 
+var got1xxFuncForTests func(int, textproto.MIMEHeader) error
+
+// get1xxTraceFunc returns the value of request's httptrace.ClientTrace.Got1xxResponse func,
+// if any. It returns nil if not set or if the Go version is too old.
+func (cs *clientStream) get1xxTraceFunc() func(int, textproto.MIMEHeader) error {
+	if fn := got1xxFuncForTests; fn != nil {
+		return fn
+	}
+	return traceGot1xxResponseFunc(cs.trace)
+}
+
 // awaitRequestCancel waits for the user to cancel a request, its context to
 // expire, or for the request to be done (any way it might be removed from the
 // cc.streams map: peer reset, successful completion, TCP connection breakage,
@@ -423,27 +437,36 @@ func shouldRetryRequest(req *http.Request, err error, afterBodyWrite bool) (*htt
 	if !canRetryError(err) {
 		return nil, err
 	}
-	if !afterBodyWrite {
-		return req, nil
-	}
 	// If the Body is nil (or http.NoBody), it's safe to reuse
 	// this request and its Body.
 	if req.Body == nil || reqBodyIsNoBody(req.Body) {
 		return req, nil
 	}
-	// Otherwise we depend on the Request having its GetBody
-	// func defined.
+
+	// If the request body can be reset back to its original
+	// state via the optional req.GetBody, do that.
 	getBody := reqGetBody(req) // Go 1.8: getBody = req.GetBody
-	if getBody == nil {
-		return nil, fmt.Errorf("http2: Transport: cannot retry err [%v] after Request.Body was written; define Request.GetBody to avoid this error", err)
+	if getBody != nil {
+		// TODO: consider a req.Body.Close here? or audit that all caller paths do?
+		body, err := getBody()
+		if err != nil {
+			return nil, err
+		}
+		newReq := *req
+		newReq.Body = body
+		return &newReq, nil
 	}
-	body, err := getBody()
-	if err != nil {
-		return nil, err
+
+	// The Request.Body can't reset back to the beginning, but we
+	// don't seem to have started to read from it yet, so reuse
+	// the request directly. The "afterBodyWrite" means the
+	// bodyWrite process has started, which becomes true before
+	// the first Read.
+	if !afterBodyWrite {
+		return req, nil
 	}
-	newReq := *req
-	newReq.Body = body
-	return &newReq, nil
+
+	return nil, fmt.Errorf("http2: Transport: cannot retry err [%v] after Request.Body was written; define Request.GetBody to avoid this error", err)
 }
 
 func canRetryError(err error) bool {
@@ -567,6 +590,10 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, erro
 	// henc in response to SETTINGS frames?
 	cc.henc = hpack.NewEncoder(&cc.hbuf)
 
+	if t.AllowHTTP {
+		cc.nextStreamID = 3
+	}
+
 	if cs, ok := c.(connectionStater); ok {
 		state := cs.ConnectionState()
 		cc.tlsState = &state
@@ -626,12 +653,32 @@ func (cc *ClientConn) CanTakeNewRequest() bool {
 	return cc.canTakeNewRequestLocked()
 }
 
-func (cc *ClientConn) canTakeNewRequestLocked() bool {
+// clientConnIdleState describes the suitability of a client
+// connection to initiate a new RoundTrip request.
+type clientConnIdleState struct {
+	canTakeNewRequest bool
+	freshConn         bool // whether it's unused by any previous request
+}
+
+func (cc *ClientConn) idleState() clientConnIdleState {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	return cc.idleStateLocked()
+}
+
+func (cc *ClientConn) idleStateLocked() (st clientConnIdleState) {
 	if cc.singleUse && cc.nextStreamID > 1 {
-		return false
+		return
 	}
-	return cc.goAway == nil && !cc.closed &&
+	st.canTakeNewRequest = cc.goAway == nil && !cc.closed && !cc.closing &&
 		int64(cc.nextStreamID)+int64(cc.pendingRequests) < math.MaxInt32
+	st.freshConn = cc.nextStreamID == 1 && st.canTakeNewRequest
+	return
+}
+
+func (cc *ClientConn) canTakeNewRequestLocked() bool {
+	st := cc.idleStateLocked()
+	return st.canTakeNewRequest
 }
 
 // onIdleTimeout is called from a time.AfterFunc goroutine. It will
@@ -661,6 +708,88 @@ func (cc *ClientConn) closeIfIdle() {
 	cc.tconn.Close()
 }
 
+var shutdownEnterWaitStateHook = func() {}
+
+// Shutdown gracefully close the client connection, waiting for running streams to complete.
+// Public implementation is in go17.go and not_go17.go
+func (cc *ClientConn) shutdown(ctx contextContext) error {
+	if err := cc.sendGoAway(); err != nil {
+		return err
+	}
+	// Wait for all in-flight streams to complete or connection to close
+	done := make(chan error, 1)
+	cancelled := false // guarded by cc.mu
+	go func() {
+		cc.mu.Lock()
+		defer cc.mu.Unlock()
+		for {
+			if len(cc.streams) == 0 || cc.closed {
+				cc.closed = true
+				done <- cc.tconn.Close()
+				break
+			}
+			if cancelled {
+				break
+			}
+			cc.cond.Wait()
+		}
+	}()
+	shutdownEnterWaitStateHook()
+	select {
+	case err := <-done:
+		return err
+	case <-ctx.Done():
+		cc.mu.Lock()
+		// Free the goroutine above
+		cancelled = true
+		cc.cond.Broadcast()
+		cc.mu.Unlock()
+		return ctx.Err()
+	}
+}
+
+func (cc *ClientConn) sendGoAway() error {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	cc.wmu.Lock()
+	defer cc.wmu.Unlock()
+	if cc.closing {
+		// GOAWAY sent already
+		return nil
+	}
+	// Send a graceful shutdown frame to server
+	maxStreamID := cc.nextStreamID
+	if err := cc.fr.WriteGoAway(maxStreamID, ErrCodeNo, nil); err != nil {
+		return err
+	}
+	if err := cc.bw.Flush(); err != nil {
+		return err
+	}
+	// Prevent new requests
+	cc.closing = true
+	return nil
+}
+
+// Close closes the client connection immediately.
+//
+// In-flight requests are interrupted. For a graceful shutdown, use Shutdown instead.
+func (cc *ClientConn) Close() error {
+	cc.mu.Lock()
+	defer cc.cond.Broadcast()
+	defer cc.mu.Unlock()
+	err := errors.New("http2: client connection force closed via ClientConn.Close")
+	for id, cs := range cc.streams {
+		select {
+		case cs.resc <- resAndError{err: err}:
+		default:
+		}
+		cs.bufPipe.CloseWithError(err)
+		delete(cc.streams, id)
+	}
+	cc.closed = true
+	return cc.tconn.Close()
+}
+
 const maxAllocFrameSize = 512 << 10
 
 // frameBuffer returns a scratch buffer suitable for writing DATA frames.
@@ -743,7 +872,7 @@ func checkConnHeaders(req *http.Request) error {
 	if vv := req.Header["Transfer-Encoding"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && vv[0] != "chunked") {
 		return fmt.Errorf("http2: invalid Transfer-Encoding request header: %q", vv)
 	}
-	if vv := req.Header["Connection"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && vv[0] != "close" && vv[0] != "keep-alive") {
+	if vv := req.Header["Connection"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && !strings.EqualFold(vv[0], "close") && !strings.EqualFold(vv[0], "keep-alive")) {
 		return fmt.Errorf("http2: invalid Connection request header: %q", vv)
 	}
 	return nil
@@ -951,6 +1080,9 @@ func (cc *ClientConn) awaitOpenSlotForRequest(req *http.Request) error {
 	for {
 		cc.lastActive = time.Now()
 		if cc.closed || !cc.canTakeNewRequestLocked() {
+			if waitingForConn != nil {
+				close(waitingForConn)
+			}
 			return errClientConnUnusable
 		}
 		if int64(len(cc.streams))+1 <= int64(cc.maxConcurrentStreams) {
@@ -1174,7 +1306,7 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 	if host == "" {
 		host = req.URL.Host
 	}
-	host, err := httplex.PunycodeHostPort(host)
+	host, err := httpguts.PunycodeHostPort(host)
 	if err != nil {
 		return nil, err
 	}
@@ -1199,11 +1331,11 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 	// potentially pollute our hpack state. (We want to be able to
 	// continue to reuse the hpack encoder for future requests)
 	for k, vv := range req.Header {
-		if !httplex.ValidHeaderFieldName(k) {
+		if !httpguts.ValidHeaderFieldName(k) {
 			return nil, fmt.Errorf("invalid HTTP header name %q", k)
 		}
 		for _, v := range vv {
-			if !httplex.ValidHeaderFieldValue(v) {
+			if !httpguts.ValidHeaderFieldValue(v) {
 				return nil, fmt.Errorf("invalid HTTP header value %q for header %q", v, k)
 			}
 		}
@@ -1284,9 +1416,16 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 		return nil, errRequestHeaderListSize
 	}
 
+	trace := requestTrace(req)
+	traceHeaders := traceHasWroteHeaderField(trace)
+
 	// Header list size is ok. Write the headers.
 	enumerateHeaders(func(name, value string) {
-		cc.writeHeader(strings.ToLower(name), value)
+		name = strings.ToLower(name)
+		cc.writeHeader(name, value)
+		if traceHeaders {
+			traceWroteHeaderField(trace, name, value)
+		}
 	})
 
 	return cc.hbuf.Bytes(), nil
@@ -1608,8 +1747,7 @@ func (rl *clientConnReadLoop) processHeaders(f *MetaHeadersFrame) error {
 // is the detail.
 //
 // As a special case, handleResponse may return (nil, nil) to skip the
-// frame (currently only used for 100 expect continue). This special
-// case is going away after Issue 13851 is fixed.
+// frame (currently only used for 1xx responses).
 func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFrame) (*http.Response, error) {
 	if f.Truncated {
 		return nil, errResponseHeaderListSize
@@ -1624,15 +1762,6 @@ func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFra
 		return nil, errors.New("malformed response from server: malformed non-numeric status pseudo header")
 	}
 
-	if statusCode == 100 {
-		traceGot100Continue(cs.trace)
-		if cs.on100 != nil {
-			cs.on100() // forces any write delay timer to fire
-		}
-		cs.pastHeaders = false // do it all again
-		return nil, nil
-	}
-
 	header := make(http.Header)
 	res := &http.Response{
 		Proto:      "HTTP/2.0",
@@ -1657,6 +1786,27 @@ func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFra
 		}
 	}
 
+	if statusCode >= 100 && statusCode <= 199 {
+		cs.num1xx++
+		const max1xxResponses = 5 // arbitrary bound on number of informational responses, same as net/http
+		if cs.num1xx > max1xxResponses {
+			return nil, errors.New("http2: too many 1xx informational responses")
+		}
+		if fn := cs.get1xxTraceFunc(); fn != nil {
+			if err := fn(statusCode, textproto.MIMEHeader(header)); err != nil {
+				return nil, err
+			}
+		}
+		if statusCode == 100 {
+			traceGot100Continue(cs.trace)
+			if cs.on100 != nil {
+				cs.on100() // forces any write delay timer to fire
+			}
+		}
+		cs.pastHeaders = false // do it all again
+		return nil, nil
+	}
+
 	streamEnded := f.StreamEnded()
 	isHead := cs.req.Method == "HEAD"
 	if !streamEnded || isHead {
@@ -2244,7 +2394,7 @@ func (t *Transport) getBodyWriterState(cs *clientStream, body io.Reader) (s body
 	}
 	s.delay = t.expectContinueTimeout()
 	if s.delay == 0 ||
-		!httplex.HeaderValuesContainsToken(
+		!httpguts.HeaderValuesContainsToken(
 			cs.req.Header["Expect"],
 			"100-continue") {
 		return
@@ -2299,5 +2449,5 @@ func (s bodyWriterState) scheduleBodyWrite() {
 // isConnectionCloseRequest reports whether req should use its own
 // connection for a single request and then close the connection.
 func isConnectionCloseRequest(req *http.Request) bool {
-	return req.Close || httplex.HeaderValuesContainsToken(req.Header["Connection"], "close")
+	return req.Close || httpguts.HeaderValuesContainsToken(req.Header["Connection"], "close")
 }
diff --git a/vendor/golang.org/x/net/http2/transport_test.go b/vendor/golang.org/x/net/http2/transport_test.go
index fe04bd28..5b5c0768 100644
--- a/vendor/golang.org/x/net/http2/transport_test.go
+++ b/vendor/golang.org/x/net/http2/transport_test.go
@@ -18,6 +18,7 @@ import (
 	"net"
 	"net/http"
 	"net/http/httptest"
+	"net/textproto"
 	"net/url"
 	"os"
 	"reflect"
@@ -30,6 +31,7 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
 	"golang.org/x/net/http2/hpack"
 )
 
@@ -41,12 +43,13 @@ var (
 
 var tlsConfigInsecure = &tls.Config{InsecureSkipVerify: true}
 
-type testContext struct{}
+var canceledCtx context.Context
 
-func (testContext) Done() <-chan struct{}                   { return make(chan struct{}) }
-func (testContext) Err() error                              { panic("should not be called") }
-func (testContext) Deadline() (deadline time.Time, ok bool) { return time.Time{}, false }
-func (testContext) Value(key interface{}) interface{}       { return nil }
+func init() {
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	canceledCtx = ctx
+}
 
 func TestTransportExternal(t *testing.T) {
 	if !*extNet {
@@ -1190,6 +1193,77 @@ func testTransportResPattern(t *testing.T, expect100Continue, resHeader headerTy
 	ct.run()
 }
 
+// Issue 26189, Issue 17739: ignore unknown 1xx responses
+func TestTransportUnknown1xx(t *testing.T) {
+	var buf bytes.Buffer
+	defer func() { got1xxFuncForTests = nil }()
+	got1xxFuncForTests = func(code int, header textproto.MIMEHeader) error {
+		fmt.Fprintf(&buf, "code=%d header=%v\n", code, header)
+		return nil
+	}
+
+	ct := newClientTester(t)
+	ct.client = func() error {
+		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
+		res, err := ct.tr.RoundTrip(req)
+		if err != nil {
+			return fmt.Errorf("RoundTrip: %v", err)
+		}
+		defer res.Body.Close()
+		if res.StatusCode != 204 {
+			return fmt.Errorf("status code = %v; want 204", res.StatusCode)
+		}
+		want := `code=110 header=map[Foo-Bar:[110]]
+code=111 header=map[Foo-Bar:[111]]
+code=112 header=map[Foo-Bar:[112]]
+code=113 header=map[Foo-Bar:[113]]
+code=114 header=map[Foo-Bar:[114]]
+`
+		if got := buf.String(); got != want {
+			t.Errorf("Got trace:\n%s\nWant:\n%s", got, want)
+		}
+		return nil
+	}
+	ct.server = func() error {
+		ct.greet()
+		var buf bytes.Buffer
+		enc := hpack.NewEncoder(&buf)
+
+		for {
+			f, err := ct.fr.ReadFrame()
+			if err != nil {
+				return err
+			}
+			switch f := f.(type) {
+			case *WindowUpdateFrame, *SettingsFrame:
+			case *HeadersFrame:
+				for i := 110; i <= 114; i++ {
+					buf.Reset()
+					enc.WriteField(hpack.HeaderField{Name: ":status", Value: fmt.Sprint(i)})
+					enc.WriteField(hpack.HeaderField{Name: "foo-bar", Value: fmt.Sprint(i)})
+					ct.fr.WriteHeaders(HeadersFrameParam{
+						StreamID:      f.StreamID,
+						EndHeaders:    true,
+						EndStream:     false,
+						BlockFragment: buf.Bytes(),
+					})
+				}
+				buf.Reset()
+				enc.WriteField(hpack.HeaderField{Name: ":status", Value: "204"})
+				ct.fr.WriteHeaders(HeadersFrameParam{
+					StreamID:      f.StreamID,
+					EndHeaders:    true,
+					EndStream:     false,
+					BlockFragment: buf.Bytes(),
+				})
+				return nil
+			}
+		}
+	}
+	ct.run()
+
+}
+
 func TestTransportReceiveUndeclaredTrailer(t *testing.T) {
 	ct := newClientTester(t)
 	ct.client = func() error {
@@ -2022,6 +2096,11 @@ func TestTransportRejectsConnHeaders(t *testing.T) {
 			value: []string{"close"},
 			want:  "Accept-Encoding,User-Agent",
 		},
+		{
+			key:   "Connection",
+			value: []string{"CLoSe"},
+			want:  "Accept-Encoding,User-Agent",
+		},
 		{
 			key:   "Connection",
 			value: []string{"close", "something-else"},
@@ -2032,6 +2111,11 @@ func TestTransportRejectsConnHeaders(t *testing.T) {
 			value: []string{"keep-alive"},
 			want:  "Accept-Encoding,User-Agent",
 		},
+		{
+			key:   "Connection",
+			value: []string{"Keep-ALIVE"},
+			want:  "Accept-Encoding,User-Agent",
+		},
 		{
 			key:   "Proxy-Connection", // just deleted and ignored
 			value: []string{"keep-alive"},
@@ -2394,11 +2478,12 @@ func TestTransportHandlerBodyClose(t *testing.T) {
 	}
 	tr.CloseIdleConnections()
 
-	gd := runtime.NumGoroutine() - g0
-	if gd > numReq/2 {
+	if !waitCondition(5*time.Second, 100*time.Millisecond, func() bool {
+		gd := runtime.NumGoroutine() - g0
+		return gd < numReq/2
+	}) {
 		t.Errorf("appeared to leak goroutines")
 	}
-
 }
 
 // https://golang.org/issue/15930
@@ -3043,7 +3128,7 @@ func TestClientConnPing(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err = cc.Ping(testContext{}); err != nil {
+	if err = cc.Ping(context.Background()); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -3845,3 +3930,256 @@ func BenchmarkClientRequestHeaders(b *testing.B) {
 	b.Run(" 100 Headers", func(b *testing.B) { benchSimpleRoundTrip(b, 100) })
 	b.Run("1000 Headers", func(b *testing.B) { benchSimpleRoundTrip(b, 1000) })
 }
+
+func activeStreams(cc *ClientConn) int {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	return len(cc.streams)
+}
+
+type closeMode int
+
+const (
+	closeAtHeaders closeMode = iota
+	closeAtBody
+	shutdown
+	shutdownCancel
+)
+
+// See golang.org/issue/17292
+func testClientConnClose(t *testing.T, closeMode closeMode) {
+	clientDone := make(chan struct{})
+	defer close(clientDone)
+	handlerDone := make(chan struct{})
+	closeDone := make(chan struct{})
+	beforeHeader := func() {}
+	bodyWrite := func(w http.ResponseWriter) {}
+	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
+		defer close(handlerDone)
+		beforeHeader()
+		w.WriteHeader(http.StatusOK)
+		w.(http.Flusher).Flush()
+		bodyWrite(w)
+		select {
+		case <-w.(http.CloseNotifier).CloseNotify():
+			// client closed connection before completion
+			if closeMode == shutdown || closeMode == shutdownCancel {
+				t.Error("expected request to complete")
+			}
+		case <-clientDone:
+			if closeMode == closeAtHeaders || closeMode == closeAtBody {
+				t.Error("expected connection closed by client")
+			}
+		}
+	}, optOnlyServer)
+	defer st.Close()
+	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
+	defer tr.CloseIdleConnections()
+	cc, err := tr.dialClientConn(st.ts.Listener.Addr().String(), false)
+	req, err := http.NewRequest("GET", st.ts.URL, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if closeMode == closeAtHeaders {
+		beforeHeader = func() {
+			if err := cc.Close(); err != nil {
+				t.Error(err)
+			}
+			close(closeDone)
+		}
+	}
+	var sendBody chan struct{}
+	if closeMode == closeAtBody {
+		sendBody = make(chan struct{})
+		bodyWrite = func(w http.ResponseWriter) {
+			<-sendBody
+			b := make([]byte, 32)
+			w.Write(b)
+			w.(http.Flusher).Flush()
+			if err := cc.Close(); err != nil {
+				t.Errorf("unexpected ClientConn close error: %v", err)
+			}
+			close(closeDone)
+			w.Write(b)
+			w.(http.Flusher).Flush()
+		}
+	}
+	res, err := cc.RoundTrip(req)
+	if res != nil {
+		defer res.Body.Close()
+	}
+	if closeMode == closeAtHeaders {
+		got := fmt.Sprint(err)
+		want := "http2: client connection force closed via ClientConn.Close"
+		if got != want {
+			t.Fatalf("RoundTrip error = %v, want %v", got, want)
+		}
+	} else {
+		if err != nil {
+			t.Fatalf("RoundTrip: %v", err)
+		}
+		if got, want := activeStreams(cc), 1; got != want {
+			t.Errorf("got %d active streams, want %d", got, want)
+		}
+	}
+	switch closeMode {
+	case shutdownCancel:
+		if err = cc.Shutdown(canceledCtx); err != errCanceled {
+			t.Errorf("got %v, want %v", err, errCanceled)
+		}
+		if cc.closing == false {
+			t.Error("expected closing to be true")
+		}
+		if cc.CanTakeNewRequest() == true {
+			t.Error("CanTakeNewRequest to return false")
+		}
+		if v, want := len(cc.streams), 1; v != want {
+			t.Errorf("expected %d active streams, got %d", want, v)
+		}
+		clientDone <- struct{}{}
+		<-handlerDone
+	case shutdown:
+		wait := make(chan struct{})
+		shutdownEnterWaitStateHook = func() {
+			close(wait)
+			shutdownEnterWaitStateHook = func() {}
+		}
+		defer func() { shutdownEnterWaitStateHook = func() {} }()
+		shutdown := make(chan struct{}, 1)
+		go func() {
+			if err = cc.Shutdown(context.Background()); err != nil {
+				t.Error(err)
+			}
+			close(shutdown)
+		}()
+		// Let the shutdown to enter wait state
+		<-wait
+		cc.mu.Lock()
+		if cc.closing == false {
+			t.Error("expected closing to be true")
+		}
+		cc.mu.Unlock()
+		if cc.CanTakeNewRequest() == true {
+			t.Error("CanTakeNewRequest to return false")
+		}
+		if got, want := activeStreams(cc), 1; got != want {
+			t.Errorf("got %d active streams, want %d", got, want)
+		}
+		// Let the active request finish
+		clientDone <- struct{}{}
+		// Wait for the shutdown to end
+		select {
+		case <-shutdown:
+		case <-time.After(2 * time.Second):
+			t.Fatal("expected server connection to close")
+		}
+	case closeAtHeaders, closeAtBody:
+		if closeMode == closeAtBody {
+			go close(sendBody)
+			if _, err := io.Copy(ioutil.Discard, res.Body); err == nil {
+				t.Error("expected a Copy error, got nil")
+			}
+		}
+		<-closeDone
+		if got, want := activeStreams(cc), 0; got != want {
+			t.Errorf("got %d active streams, want %d", got, want)
+		}
+		// wait for server to get the connection close notice
+		select {
+		case <-handlerDone:
+		case <-time.After(2 * time.Second):
+			t.Fatal("expected server connection to close")
+		}
+	}
+}
+
+// The client closes the connection just after the server got the client's HEADERS
+// frame, but before the server sends its HEADERS response back. The expected
+// result is an error on RoundTrip explaining the client closed the connection.
+func TestClientConnCloseAtHeaders(t *testing.T) {
+	testClientConnClose(t, closeAtHeaders)
+}
+
+// The client closes the connection between two server's response DATA frames.
+// The expected behavior is a response body io read error on the client.
+func TestClientConnCloseAtBody(t *testing.T) {
+	testClientConnClose(t, closeAtBody)
+}
+
+// The client sends a GOAWAY frame before the server finished processing a request.
+// We expect the connection not to close until the request is completed.
+func TestClientConnShutdown(t *testing.T) {
+	testClientConnClose(t, shutdown)
+}
+
+// The client sends a GOAWAY frame before the server finishes processing a request,
+// but cancels the passed context before the request is completed. The expected
+// behavior is the client closing the connection after the context is canceled.
+func TestClientConnShutdownCancel(t *testing.T) {
+	testClientConnClose(t, shutdownCancel)
+}
+
+// Issue 25009: use Request.GetBody if present, even if it seems like
+// we might not need it. Apparently something else can still read from
+// the original request body. Data race? In any case, rewinding
+// unconditionally on retry is a nicer model anyway and should
+// simplify code in the future (after the Go 1.11 freeze)
+func TestTransportUsesGetBodyWhenPresent(t *testing.T) {
+	calls := 0
+	someBody := func() io.ReadCloser {
+		return struct{ io.ReadCloser }{ioutil.NopCloser(bytes.NewReader(nil))}
+	}
+	req := &http.Request{
+		Body: someBody(),
+		GetBody: func() (io.ReadCloser, error) {
+			calls++
+			return someBody(), nil
+		},
+	}
+
+	afterBodyWrite := false // pretend we haven't read+written the body yet
+	req2, err := shouldRetryRequest(req, errClientConnUnusable, afterBodyWrite)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if calls != 1 {
+		t.Errorf("Calls = %d; want 1", calls)
+	}
+	if req2 == req {
+		t.Error("req2 changed")
+	}
+	if req2 == nil {
+		t.Fatal("req2 is nil")
+	}
+	if req2.Body == nil {
+		t.Fatal("req2.Body is nil")
+	}
+	if req2.GetBody == nil {
+		t.Fatal("req2.GetBody is nil")
+	}
+	if req2.Body == req.Body {
+		t.Error("req2.Body unchanged")
+	}
+}
+
+// Issue 22891: verify that the "https" altproto we register with net/http
+// is a certain type: a struct with one field with our *http2.Transport in it.
+func TestNoDialH2RoundTripperType(t *testing.T) {
+	t1 := new(http.Transport)
+	t2 := new(Transport)
+	rt := noDialH2RoundTripper{t2}
+	if err := registerHTTPSProtocol(t1, rt); err != nil {
+		t.Fatal(err)
+	}
+	rv := reflect.ValueOf(rt)
+	if rv.Type().Kind() != reflect.Struct {
+		t.Fatalf("kind = %v; net/http expects struct", rv.Type().Kind())
+	}
+	if n := rv.Type().NumField(); n != 1 {
+		t.Fatalf("fields = %d; net/http expects 1", n)
+	}
+	v := rv.Field(0)
+	if _, ok := v.Interface().(*Transport); !ok {
+		t.Fatalf("wrong kind %T; want *Transport", v.Interface())
+	}
+}
diff --git a/vendor/golang.org/x/net/http2/write.go b/vendor/golang.org/x/net/http2/write.go
index 54ab4a88..8a9711f6 100644
--- a/vendor/golang.org/x/net/http2/write.go
+++ b/vendor/golang.org/x/net/http2/write.go
@@ -11,8 +11,8 @@ import (
 	"net/http"
 	"net/url"
 
+	"golang.org/x/net/http/httpguts"
 	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/lex/httplex"
 )
 
 // writeFramer is implemented by any type that is used to write frames.
@@ -350,7 +350,7 @@ func encodeHeaders(enc *hpack.Encoder, h http.Header, keys []string) {
 		}
 		isTE := k == "transfer-encoding"
 		for _, v := range vv {
-			if !httplex.ValidHeaderFieldValue(v) {
+			if !httpguts.ValidHeaderFieldValue(v) {
 				// TODO: return an error? golang.org/issue/14048
 				// For now just omit it.
 				continue
diff --git a/vendor/golang.org/x/net/icmp/diag_test.go b/vendor/golang.org/x/net/icmp/diag_test.go
new file mode 100644
index 00000000..2ecd465a
--- /dev/null
+++ b/vendor/golang.org/x/net/icmp/diag_test.go
@@ -0,0 +1,274 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package icmp_test
+
+import (
+	"errors"
+	"fmt"
+	"net"
+	"os"
+	"runtime"
+	"sync"
+	"testing"
+	"time"
+
+	"golang.org/x/net/icmp"
+	"golang.org/x/net/internal/iana"
+	"golang.org/x/net/internal/nettest"
+	"golang.org/x/net/ipv4"
+	"golang.org/x/net/ipv6"
+)
+
+type diagTest struct {
+	network, address string
+	protocol         int
+	m                icmp.Message
+}
+
+func TestDiag(t *testing.T) {
+	if testing.Short() {
+		t.Skip("avoid external network")
+	}
+
+	t.Run("Ping/NonPrivileged", func(t *testing.T) {
+		switch runtime.GOOS {
+		case "darwin":
+		case "linux":
+			t.Log("you may need to adjust the net.ipv4.ping_group_range kernel state")
+		default:
+			t.Logf("not supported on %s", runtime.GOOS)
+			return
+		}
+		for i, dt := range []diagTest{
+			{
+				"udp4", "0.0.0.0", iana.ProtocolICMP,
+				icmp.Message{
+					Type: ipv4.ICMPTypeEcho, Code: 0,
+					Body: &icmp.Echo{
+						ID:   os.Getpid() & 0xffff,
+						Data: []byte("HELLO-R-U-THERE"),
+					},
+				},
+			},
+
+			{
+				"udp6", "::", iana.ProtocolIPv6ICMP,
+				icmp.Message{
+					Type: ipv6.ICMPTypeEchoRequest, Code: 0,
+					Body: &icmp.Echo{
+						ID:   os.Getpid() & 0xffff,
+						Data: []byte("HELLO-R-U-THERE"),
+					},
+				},
+			},
+		} {
+			if err := doDiag(dt, i); err != nil {
+				t.Error(err)
+			}
+		}
+	})
+	t.Run("Ping/Privileged", func(t *testing.T) {
+		if m, ok := nettest.SupportsRawIPSocket(); !ok {
+			t.Skip(m)
+		}
+		for i, dt := range []diagTest{
+			{
+				"ip4:icmp", "0.0.0.0", iana.ProtocolICMP,
+				icmp.Message{
+					Type: ipv4.ICMPTypeEcho, Code: 0,
+					Body: &icmp.Echo{
+						ID:   os.Getpid() & 0xffff,
+						Data: []byte("HELLO-R-U-THERE"),
+					},
+				},
+			},
+
+			{
+				"ip6:ipv6-icmp", "::", iana.ProtocolIPv6ICMP,
+				icmp.Message{
+					Type: ipv6.ICMPTypeEchoRequest, Code: 0,
+					Body: &icmp.Echo{
+						ID:   os.Getpid() & 0xffff,
+						Data: []byte("HELLO-R-U-THERE"),
+					},
+				},
+			},
+		} {
+			if err := doDiag(dt, i); err != nil {
+				t.Error(err)
+			}
+		}
+	})
+	t.Run("Probe/Privileged", func(t *testing.T) {
+		if m, ok := nettest.SupportsRawIPSocket(); !ok {
+			t.Skip(m)
+		}
+		for i, dt := range []diagTest{
+			{
+				"ip4:icmp", "0.0.0.0", iana.ProtocolICMP,
+				icmp.Message{
+					Type: ipv4.ICMPTypeExtendedEchoRequest, Code: 0,
+					Body: &icmp.ExtendedEchoRequest{
+						ID:    os.Getpid() & 0xffff,
+						Local: true,
+						Extensions: []icmp.Extension{
+							&icmp.InterfaceIdent{
+								Class: 3, Type: 1,
+								Name: "doesnotexist",
+							},
+						},
+					},
+				},
+			},
+
+			{
+				"ip6:ipv6-icmp", "::", iana.ProtocolIPv6ICMP,
+				icmp.Message{
+					Type: ipv6.ICMPTypeExtendedEchoRequest, Code: 0,
+					Body: &icmp.ExtendedEchoRequest{
+						ID:    os.Getpid() & 0xffff,
+						Local: true,
+						Extensions: []icmp.Extension{
+							&icmp.InterfaceIdent{
+								Class: 3, Type: 1,
+								Name: "doesnotexist",
+							},
+						},
+					},
+				},
+			},
+		} {
+			if err := doDiag(dt, i); err != nil {
+				t.Error(err)
+			}
+		}
+	})
+}
+
+func doDiag(dt diagTest, seq int) error {
+	c, err := icmp.ListenPacket(dt.network, dt.address)
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	dst, err := googleAddr(c, dt.protocol)
+	if err != nil {
+		return err
+	}
+
+	if dt.network != "udp6" && dt.protocol == iana.ProtocolIPv6ICMP {
+		var f ipv6.ICMPFilter
+		f.SetAll(true)
+		f.Accept(ipv6.ICMPTypeDestinationUnreachable)
+		f.Accept(ipv6.ICMPTypePacketTooBig)
+		f.Accept(ipv6.ICMPTypeTimeExceeded)
+		f.Accept(ipv6.ICMPTypeParameterProblem)
+		f.Accept(ipv6.ICMPTypeEchoReply)
+		f.Accept(ipv6.ICMPTypeExtendedEchoReply)
+		if err := c.IPv6PacketConn().SetICMPFilter(&f); err != nil {
+			return err
+		}
+	}
+
+	switch m := dt.m.Body.(type) {
+	case *icmp.Echo:
+		m.Seq = 1 << uint(seq)
+	case *icmp.ExtendedEchoRequest:
+		m.Seq = 1 << uint(seq)
+	}
+	wb, err := dt.m.Marshal(nil)
+	if err != nil {
+		return err
+	}
+	if n, err := c.WriteTo(wb, dst); err != nil {
+		return err
+	} else if n != len(wb) {
+		return fmt.Errorf("got %v; want %v", n, len(wb))
+	}
+
+	rb := make([]byte, 1500)
+	if err := c.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
+		return err
+	}
+	n, peer, err := c.ReadFrom(rb)
+	if err != nil {
+		return err
+	}
+	rm, err := icmp.ParseMessage(dt.protocol, rb[:n])
+	if err != nil {
+		return err
+	}
+	switch {
+	case dt.m.Type == ipv4.ICMPTypeEcho && rm.Type == ipv4.ICMPTypeEchoReply:
+		fallthrough
+	case dt.m.Type == ipv6.ICMPTypeEchoRequest && rm.Type == ipv6.ICMPTypeEchoReply:
+		fallthrough
+	case dt.m.Type == ipv4.ICMPTypeExtendedEchoRequest && rm.Type == ipv4.ICMPTypeExtendedEchoReply:
+		fallthrough
+	case dt.m.Type == ipv6.ICMPTypeExtendedEchoRequest && rm.Type == ipv6.ICMPTypeExtendedEchoReply:
+		return nil
+	default:
+		return fmt.Errorf("got %+v from %v; want echo reply or extended echo reply", rm, peer)
+	}
+}
+
+func googleAddr(c *icmp.PacketConn, protocol int) (net.Addr, error) {
+	host := "ipv4.google.com"
+	if protocol == iana.ProtocolIPv6ICMP {
+		host = "ipv6.google.com"
+	}
+	ips, err := net.LookupIP(host)
+	if err != nil {
+		return nil, err
+	}
+	netaddr := func(ip net.IP) (net.Addr, error) {
+		switch c.LocalAddr().(type) {
+		case *net.UDPAddr:
+			return &net.UDPAddr{IP: ip}, nil
+		case *net.IPAddr:
+			return &net.IPAddr{IP: ip}, nil
+		default:
+			return nil, errors.New("neither UDPAddr nor IPAddr")
+		}
+	}
+	if len(ips) > 0 {
+		return netaddr(ips[0])
+	}
+	return nil, errors.New("no A or AAAA record")
+}
+
+func TestConcurrentNonPrivilegedListenPacket(t *testing.T) {
+	if testing.Short() {
+		t.Skip("avoid external network")
+	}
+	switch runtime.GOOS {
+	case "darwin":
+	case "linux":
+		t.Log("you may need to adjust the net.ipv4.ping_group_range kernel state")
+	default:
+		t.Skipf("not supported on %s", runtime.GOOS)
+	}
+
+	network, address := "udp4", "127.0.0.1"
+	if !nettest.SupportsIPv4() {
+		network, address = "udp6", "::1"
+	}
+	const N = 1000
+	var wg sync.WaitGroup
+	wg.Add(N)
+	for i := 0; i < N; i++ {
+		go func() {
+			defer wg.Done()
+			c, err := icmp.ListenPacket(network, address)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			c.Close()
+		}()
+	}
+	wg.Wait()
+}
diff --git a/vendor/golang.org/x/net/icmp/dstunreach.go b/vendor/golang.org/x/net/icmp/dstunreach.go
index 75db991d..7464bf7e 100644
--- a/vendor/golang.org/x/net/icmp/dstunreach.go
+++ b/vendor/golang.org/x/net/icmp/dstunreach.go
@@ -16,24 +16,24 @@ func (p *DstUnreach) Len(proto int) int {
 	if p == nil {
 		return 0
 	}
-	l, _ := multipartMessageBodyDataLen(proto, p.Data, p.Extensions)
+	l, _ := multipartMessageBodyDataLen(proto, true, p.Data, p.Extensions)
 	return 4 + l
 }
 
 // Marshal implements the Marshal method of MessageBody interface.
 func (p *DstUnreach) Marshal(proto int) ([]byte, error) {
-	return marshalMultipartMessageBody(proto, p.Data, p.Extensions)
+	return marshalMultipartMessageBody(proto, true, p.Data, p.Extensions)
 }
 
 // parseDstUnreach parses b as an ICMP destination unreachable message
 // body.
-func parseDstUnreach(proto int, b []byte) (MessageBody, error) {
+func parseDstUnreach(proto int, typ Type, b []byte) (MessageBody, error) {
 	if len(b) < 4 {
 		return nil, errMessageTooShort
 	}
 	p := &DstUnreach{}
 	var err error
-	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, b)
+	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, typ, b)
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/golang.org/x/net/icmp/echo.go b/vendor/golang.org/x/net/icmp/echo.go
index e6f15efd..c611f651 100644
--- a/vendor/golang.org/x/net/icmp/echo.go
+++ b/vendor/golang.org/x/net/icmp/echo.go
@@ -31,7 +31,7 @@ func (p *Echo) Marshal(proto int) ([]byte, error) {
 }
 
 // parseEcho parses b as an ICMP echo request or reply message body.
-func parseEcho(proto int, b []byte) (MessageBody, error) {
+func parseEcho(proto int, _ Type, b []byte) (MessageBody, error) {
 	bodyLen := len(b)
 	if bodyLen < 4 {
 		return nil, errMessageTooShort
@@ -43,3 +43,115 @@ func parseEcho(proto int, b []byte) (MessageBody, error) {
 	}
 	return p, nil
 }
+
+// An ExtendedEchoRequest represents an ICMP extended echo request
+// message body.
+type ExtendedEchoRequest struct {
+	ID         int         // identifier
+	Seq        int         // sequence number
+	Local      bool        // must be true when identifying by name or index
+	Extensions []Extension // extensions
+}
+
+// Len implements the Len method of MessageBody interface.
+func (p *ExtendedEchoRequest) Len(proto int) int {
+	if p == nil {
+		return 0
+	}
+	l, _ := multipartMessageBodyDataLen(proto, false, nil, p.Extensions)
+	return 4 + l
+}
+
+// Marshal implements the Marshal method of MessageBody interface.
+func (p *ExtendedEchoRequest) Marshal(proto int) ([]byte, error) {
+	b, err := marshalMultipartMessageBody(proto, false, nil, p.Extensions)
+	if err != nil {
+		return nil, err
+	}
+	bb := make([]byte, 4)
+	binary.BigEndian.PutUint16(bb[:2], uint16(p.ID))
+	bb[2] = byte(p.Seq)
+	if p.Local {
+		bb[3] |= 0x01
+	}
+	bb = append(bb, b...)
+	return bb, nil
+}
+
+// parseExtendedEchoRequest parses b as an ICMP extended echo request
+// message body.
+func parseExtendedEchoRequest(proto int, typ Type, b []byte) (MessageBody, error) {
+	if len(b) < 4+4 {
+		return nil, errMessageTooShort
+	}
+	p := &ExtendedEchoRequest{ID: int(binary.BigEndian.Uint16(b[:2])), Seq: int(b[2])}
+	if b[3]&0x01 != 0 {
+		p.Local = true
+	}
+	var err error
+	_, p.Extensions, err = parseMultipartMessageBody(proto, typ, b[4:])
+	if err != nil {
+		return nil, err
+	}
+	return p, nil
+}
+
+// An ExtendedEchoReply represents an ICMP extended echo reply message
+// body.
+type ExtendedEchoReply struct {
+	ID     int  // identifier
+	Seq    int  // sequence number
+	State  int  // 3-bit state working together with Message.Code
+	Active bool // probed interface is active
+	IPv4   bool // probed interface runs IPv4
+	IPv6   bool // probed interface runs IPv6
+}
+
+// Len implements the Len method of MessageBody interface.
+func (p *ExtendedEchoReply) Len(proto int) int {
+	if p == nil {
+		return 0
+	}
+	return 4
+}
+
+// Marshal implements the Marshal method of MessageBody interface.
+func (p *ExtendedEchoReply) Marshal(proto int) ([]byte, error) {
+	b := make([]byte, 4)
+	binary.BigEndian.PutUint16(b[:2], uint16(p.ID))
+	b[2] = byte(p.Seq)
+	b[3] = byte(p.State<<5) & 0xe0
+	if p.Active {
+		b[3] |= 0x04
+	}
+	if p.IPv4 {
+		b[3] |= 0x02
+	}
+	if p.IPv6 {
+		b[3] |= 0x01
+	}
+	return b, nil
+}
+
+// parseExtendedEchoReply parses b as an ICMP extended echo reply
+// message body.
+func parseExtendedEchoReply(proto int, _ Type, b []byte) (MessageBody, error) {
+	if len(b) < 4 {
+		return nil, errMessageTooShort
+	}
+	p := &ExtendedEchoReply{
+		ID:    int(binary.BigEndian.Uint16(b[:2])),
+		Seq:   int(b[2]),
+		State: int(b[3]) >> 5,
+	}
+	if b[3]&0x04 != 0 {
+		p.Active = true
+	}
+	if b[3]&0x02 != 0 {
+		p.IPv4 = true
+	}
+	if b[3]&0x01 != 0 {
+		p.IPv6 = true
+	}
+	return p, nil
+}
diff --git a/vendor/golang.org/x/net/icmp/endpoint.go b/vendor/golang.org/x/net/icmp/endpoint.go
index a68bfb01..4841bdd2 100644
--- a/vendor/golang.org/x/net/icmp/endpoint.go
+++ b/vendor/golang.org/x/net/icmp/endpoint.go
@@ -7,7 +7,6 @@ package icmp
 import (
 	"net"
 	"runtime"
-	"syscall"
 	"time"
 
 	"golang.org/x/net/ipv4"
@@ -47,7 +46,7 @@ func (c *PacketConn) IPv6PacketConn() *ipv6.PacketConn {
 // ReadFrom reads an ICMP message from the connection.
 func (c *PacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
 	if !c.ok() {
-		return 0, nil, syscall.EINVAL
+		return 0, nil, errInvalidConn
 	}
 	// Please be informed that ipv4.NewPacketConn enables
 	// IP_STRIPHDR option by default on Darwin.
@@ -60,11 +59,12 @@ func (c *PacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
 }
 
 // WriteTo writes the ICMP message b to dst.
-// Dst must be net.UDPAddr when c is a non-privileged
-// datagram-oriented ICMP endpoint. Otherwise it must be net.IPAddr.
+// The provided dst must be net.UDPAddr when c is a non-privileged
+// datagram-oriented ICMP endpoint.
+// Otherwise it must be net.IPAddr.
 func (c *PacketConn) WriteTo(b []byte, dst net.Addr) (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	return c.c.WriteTo(b, dst)
 }
@@ -72,7 +72,7 @@ func (c *PacketConn) WriteTo(b []byte, dst net.Addr) (int, error) {
 // Close closes the endpoint.
 func (c *PacketConn) Close() error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.c.Close()
 }
@@ -89,7 +89,7 @@ func (c *PacketConn) LocalAddr() net.Addr {
 // endpoint.
 func (c *PacketConn) SetDeadline(t time.Time) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.c.SetDeadline(t)
 }
@@ -98,7 +98,7 @@ func (c *PacketConn) SetDeadline(t time.Time) error {
 // endpoint.
 func (c *PacketConn) SetReadDeadline(t time.Time) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.c.SetReadDeadline(t)
 }
@@ -107,7 +107,7 @@ func (c *PacketConn) SetReadDeadline(t time.Time) error {
 // endpoint.
 func (c *PacketConn) SetWriteDeadline(t time.Time) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.c.SetWriteDeadline(t)
 }
diff --git a/vendor/golang.org/x/net/icmp/extension.go b/vendor/golang.org/x/net/icmp/extension.go
index 402a7514..d27c462d 100644
--- a/vendor/golang.org/x/net/icmp/extension.go
+++ b/vendor/golang.org/x/net/icmp/extension.go
@@ -4,16 +4,23 @@
 
 package icmp
 
-import "encoding/binary"
+import (
+	"encoding/binary"
+
+	"golang.org/x/net/ipv4"
+	"golang.org/x/net/ipv6"
+)
 
 // An Extension represents an ICMP extension.
 type Extension interface {
 	// Len returns the length of ICMP extension.
-	// Proto must be either the ICMPv4 or ICMPv6 protocol number.
+	// The provided proto must be either the ICMPv4 or ICMPv6
+	// protocol number.
 	Len(proto int) int
 
 	// Marshal returns the binary encoding of ICMP extension.
-	// Proto must be either the ICMPv4 or ICMPv6 protocol number.
+	// The provided proto must be either the ICMPv4 or ICMPv6
+	// protocol number.
 	Marshal(proto int) ([]byte, error)
 }
 
@@ -38,7 +45,7 @@ func validExtensionHeader(b []byte) bool {
 // It will return a list of ICMP extensions and an adjusted length
 // attribute that represents the length of the padded original
 // datagram field. Otherwise, it returns an error.
-func parseExtensions(b []byte, l int) ([]Extension, int, error) {
+func parseExtensions(typ Type, b []byte, l int) ([]Extension, int, error) {
 	// Still a lot of non-RFC 4884 compliant implementations are
 	// out there. Set the length attribute l to 128 when it looks
 	// inappropriate for backwards compatibility.
@@ -48,20 +55,28 @@ func parseExtensions(b []byte, l int) ([]Extension, int, error) {
 	// header.
 	//
 	// See RFC 4884 for further information.
-	if 128 > l || l+8 > len(b) {
-		l = 128
-	}
-	if l+8 > len(b) {
-		return nil, -1, errNoExtension
-	}
-	if !validExtensionHeader(b[l:]) {
-		if l == 128 {
+	switch typ {
+	case ipv4.ICMPTypeExtendedEchoRequest, ipv6.ICMPTypeExtendedEchoRequest:
+		if len(b) < 8 || !validExtensionHeader(b) {
 			return nil, -1, errNoExtension
 		}
-		l = 128
-		if !validExtensionHeader(b[l:]) {
+		l = 0
+	default:
+		if 128 > l || l+8 > len(b) {
+			l = 128
+		}
+		if l+8 > len(b) {
 			return nil, -1, errNoExtension
 		}
+		if !validExtensionHeader(b[l:]) {
+			if l == 128 {
+				return nil, -1, errNoExtension
+			}
+			l = 128
+			if !validExtensionHeader(b[l:]) {
+				return nil, -1, errNoExtension
+			}
+		}
 	}
 	var exts []Extension
 	for b = b[l+4:]; len(b) >= 4; {
@@ -82,6 +97,12 @@ func parseExtensions(b []byte, l int) ([]Extension, int, error) {
 				return nil, -1, err
 			}
 			exts = append(exts, ext)
+		case classInterfaceIdent:
+			ext, err := parseInterfaceIdent(b[:ol])
+			if err != nil {
+				return nil, -1, err
+			}
+			exts = append(exts, ext)
 		}
 		b = b[ol:]
 	}
diff --git a/vendor/golang.org/x/net/icmp/extension_test.go b/vendor/golang.org/x/net/icmp/extension_test.go
index 0b3f7b9e..a7669dae 100644
--- a/vendor/golang.org/x/net/icmp/extension_test.go
+++ b/vendor/golang.org/x/net/icmp/extension_test.go
@@ -5,253 +5,327 @@
 package icmp
 
 import (
+	"fmt"
 	"net"
 	"reflect"
 	"testing"
 
 	"golang.org/x/net/internal/iana"
+	"golang.org/x/net/ipv4"
+	"golang.org/x/net/ipv6"
 )
 
-var marshalAndParseExtensionTests = []struct {
-	proto int
-	hdr   []byte
-	obj   []byte
-	exts  []Extension
-}{
-	// MPLS label stack with no label
-	{
-		proto: iana.ProtocolICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x04, 0x01, 0x01,
-		},
-		exts: []Extension{
-			&MPLSLabelStack{
-				Class: classMPLSLabelStack,
-				Type:  typeIncomingMPLSLabelStack,
+func TestMarshalAndParseExtension(t *testing.T) {
+	fn := func(t *testing.T, proto int, typ Type, hdr, obj []byte, te Extension) error {
+		b, err := te.Marshal(proto)
+		if err != nil {
+			return err
+		}
+		if !reflect.DeepEqual(b, obj) {
+			return fmt.Errorf("got %#v; want %#v", b, obj)
+		}
+		switch typ {
+		case ipv4.ICMPTypeExtendedEchoRequest, ipv6.ICMPTypeExtendedEchoRequest:
+			exts, l, err := parseExtensions(typ, append(hdr, obj...), 0)
+			if err != nil {
+				return err
+			}
+			if l != 0 {
+				return fmt.Errorf("got %d; want 0", l)
+			}
+			if !reflect.DeepEqual(exts, []Extension{te}) {
+				return fmt.Errorf("got %#v; want %#v", exts[0], te)
+			}
+		default:
+			for i, wire := range []struct {
+				data     []byte // original datagram
+				inlattr  int    // length of padded original datagram, a hint
+				outlattr int    // length of padded original datagram, a want
+				err      error
+			}{
+				{nil, 0, -1, errNoExtension},
+				{make([]byte, 127), 128, -1, errNoExtension},
+
+				{make([]byte, 128), 127, -1, errNoExtension},
+				{make([]byte, 128), 128, -1, errNoExtension},
+				{make([]byte, 128), 129, -1, errNoExtension},
+
+				{append(make([]byte, 128), append(hdr, obj...)...), 127, 128, nil},
+				{append(make([]byte, 128), append(hdr, obj...)...), 128, 128, nil},
+				{append(make([]byte, 128), append(hdr, obj...)...), 129, 128, nil},
+
+				{append(make([]byte, 512), append(hdr, obj...)...), 511, -1, errNoExtension},
+				{append(make([]byte, 512), append(hdr, obj...)...), 512, 512, nil},
+				{append(make([]byte, 512), append(hdr, obj...)...), 513, -1, errNoExtension},
+			} {
+				exts, l, err := parseExtensions(typ, wire.data, wire.inlattr)
+				if err != wire.err {
+					return fmt.Errorf("#%d: got %v; want %v", i, err, wire.err)
+				}
+				if wire.err != nil {
+					continue
+				}
+				if l != wire.outlattr {
+					return fmt.Errorf("#%d: got %d; want %d", i, l, wire.outlattr)
+				}
+				if !reflect.DeepEqual(exts, []Extension{te}) {
+					return fmt.Errorf("#%d: got %#v; want %#v", i, exts[0], te)
+				}
+			}
+		}
+		return nil
+	}
+
+	t.Run("MPLSLabelStack", func(t *testing.T) {
+		for _, et := range []struct {
+			proto int
+			typ   Type
+			hdr   []byte
+			obj   []byte
+			ext   Extension
+		}{
+			// MPLS label stack with no label
+			{
+				proto: iana.ProtocolICMP,
+				typ:   ipv4.ICMPTypeDestinationUnreachable,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
+				},
+				obj: []byte{
+					0x00, 0x04, 0x01, 0x01,
+				},
+				ext: &MPLSLabelStack{
+					Class: classMPLSLabelStack,
+					Type:  typeIncomingMPLSLabelStack,
+				},
 			},
-		},
-	},
-	// MPLS label stack with a single label
-	{
-		proto: iana.ProtocolIPv6ICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x08, 0x01, 0x01,
-			0x03, 0xe8, 0xe9, 0xff,
-		},
-		exts: []Extension{
-			&MPLSLabelStack{
-				Class: classMPLSLabelStack,
-				Type:  typeIncomingMPLSLabelStack,
-				Labels: []MPLSLabel{
-					{
-						Label: 16014,
-						TC:    0x4,
-						S:     true,
-						TTL:   255,
+			// MPLS label stack with a single label
+			{
+				proto: iana.ProtocolIPv6ICMP,
+				typ:   ipv6.ICMPTypeDestinationUnreachable,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
+				},
+				obj: []byte{
+					0x00, 0x08, 0x01, 0x01,
+					0x03, 0xe8, 0xe9, 0xff,
+				},
+				ext: &MPLSLabelStack{
+					Class: classMPLSLabelStack,
+					Type:  typeIncomingMPLSLabelStack,
+					Labels: []MPLSLabel{
+						{
+							Label: 16014,
+							TC:    0x4,
+							S:     true,
+							TTL:   255,
+						},
 					},
 				},
 			},
-		},
-	},
-	// MPLS label stack with multiple labels
-	{
-		proto: iana.ProtocolICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x0c, 0x01, 0x01,
-			0x03, 0xe8, 0xde, 0xfe,
-			0x03, 0xe8, 0xe1, 0xff,
-		},
-		exts: []Extension{
-			&MPLSLabelStack{
-				Class: classMPLSLabelStack,
-				Type:  typeIncomingMPLSLabelStack,
-				Labels: []MPLSLabel{
-					{
-						Label: 16013,
-						TC:    0x7,
-						S:     false,
-						TTL:   254,
-					},
-					{
-						Label: 16014,
-						TC:    0,
-						S:     true,
-						TTL:   255,
+			// MPLS label stack with multiple labels
+			{
+				proto: iana.ProtocolICMP,
+				typ:   ipv4.ICMPTypeDestinationUnreachable,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
+				},
+				obj: []byte{
+					0x00, 0x0c, 0x01, 0x01,
+					0x03, 0xe8, 0xde, 0xfe,
+					0x03, 0xe8, 0xe1, 0xff,
+				},
+				ext: &MPLSLabelStack{
+					Class: classMPLSLabelStack,
+					Type:  typeIncomingMPLSLabelStack,
+					Labels: []MPLSLabel{
+						{
+							Label: 16013,
+							TC:    0x7,
+							S:     false,
+							TTL:   254,
+						},
+						{
+							Label: 16014,
+							TC:    0,
+							S:     true,
+							TTL:   255,
+						},
 					},
 				},
 			},
-		},
-	},
-	// Interface information with no attribute
-	{
-		proto: iana.ProtocolICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x04, 0x02, 0x00,
-		},
-		exts: []Extension{
-			&InterfaceInfo{
-				Class: classInterfaceInfo,
+		} {
+			if err := fn(t, et.proto, et.typ, et.hdr, et.obj, et.ext); err != nil {
+				t.Error(err)
+			}
+		}
+	})
+	t.Run("InterfaceInfo", func(t *testing.T) {
+		for _, et := range []struct {
+			proto int
+			typ   Type
+			hdr   []byte
+			obj   []byte
+			ext   Extension
+		}{
+			// Interface information with no attribute
+			{
+				proto: iana.ProtocolICMP,
+				typ:   ipv4.ICMPTypeDestinationUnreachable,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
+				},
+				obj: []byte{
+					0x00, 0x04, 0x02, 0x00,
+				},
+				ext: &InterfaceInfo{
+					Class: classInterfaceInfo,
+				},
 			},
-		},
-	},
-	// Interface information with ifIndex and name
-	{
-		proto: iana.ProtocolICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x10, 0x02, 0x0a,
-			0x00, 0x00, 0x00, 0x10,
-			0x08, byte('e'), byte('n'), byte('1'),
-			byte('0'), byte('1'), 0x00, 0x00,
-		},
-		exts: []Extension{
-			&InterfaceInfo{
-				Class: classInterfaceInfo,
-				Type:  0x0a,
-				Interface: &net.Interface{
-					Index: 16,
-					Name:  "en101",
+			// Interface information with ifIndex and name
+			{
+				proto: iana.ProtocolICMP,
+				typ:   ipv4.ICMPTypeDestinationUnreachable,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
+				},
+				obj: []byte{
+					0x00, 0x10, 0x02, 0x0a,
+					0x00, 0x00, 0x00, 0x10,
+					0x08, byte('e'), byte('n'), byte('1'),
+					byte('0'), byte('1'), 0x00, 0x00,
+				},
+				ext: &InterfaceInfo{
+					Class: classInterfaceInfo,
+					Type:  0x0a,
+					Interface: &net.Interface{
+						Index: 16,
+						Name:  "en101",
+					},
 				},
 			},
-		},
-	},
-	// Interface information with ifIndex, IPAddr, name and MTU
-	{
-		proto: iana.ProtocolIPv6ICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x28, 0x02, 0x0f,
-			0x00, 0x00, 0x00, 0x0f,
-			0x00, 0x02, 0x00, 0x00,
-			0xfe, 0x80, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x01,
-			0x08, byte('e'), byte('n'), byte('1'),
-			byte('0'), byte('1'), 0x00, 0x00,
-			0x00, 0x00, 0x20, 0x00,
-		},
-		exts: []Extension{
-			&InterfaceInfo{
-				Class: classInterfaceInfo,
-				Type:  0x0f,
-				Interface: &net.Interface{
-					Index: 15,
-					Name:  "en101",
-					MTU:   8192,
+			// Interface information with ifIndex, IPAddr, name and MTU
+			{
+				proto: iana.ProtocolIPv6ICMP,
+				typ:   ipv6.ICMPTypeDestinationUnreachable,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
 				},
-				Addr: &net.IPAddr{
-					IP:   net.ParseIP("fe80::1"),
-					Zone: "en101",
+				obj: []byte{
+					0x00, 0x28, 0x02, 0x0f,
+					0x00, 0x00, 0x00, 0x0f,
+					0x00, 0x02, 0x00, 0x00,
+					0xfe, 0x80, 0x00, 0x00,
+					0x00, 0x00, 0x00, 0x00,
+					0x00, 0x00, 0x00, 0x00,
+					0x00, 0x00, 0x00, 0x01,
+					0x08, byte('e'), byte('n'), byte('1'),
+					byte('0'), byte('1'), 0x00, 0x00,
+					0x00, 0x00, 0x20, 0x00,
+				},
+				ext: &InterfaceInfo{
+					Class: classInterfaceInfo,
+					Type:  0x0f,
+					Interface: &net.Interface{
+						Index: 15,
+						Name:  "en101",
+						MTU:   8192,
+					},
+					Addr: &net.IPAddr{
+						IP:   net.ParseIP("fe80::1"),
+						Zone: "en101",
+					},
 				},
 			},
-		},
-	},
-}
-
-func TestMarshalAndParseExtension(t *testing.T) {
-	for i, tt := range marshalAndParseExtensionTests {
-		for j, ext := range tt.exts {
-			var err error
-			var b []byte
-			switch ext := ext.(type) {
-			case *MPLSLabelStack:
-				b, err = ext.Marshal(tt.proto)
-				if err != nil {
-					t.Errorf("#%v/%v: %v", i, j, err)
-					continue
-				}
-			case *InterfaceInfo:
-				b, err = ext.Marshal(tt.proto)
-				if err != nil {
-					t.Errorf("#%v/%v: %v", i, j, err)
-					continue
-				}
-			}
-			if !reflect.DeepEqual(b, tt.obj) {
-				t.Errorf("#%v/%v: got %#v; want %#v", i, j, b, tt.obj)
-				continue
+		} {
+			if err := fn(t, et.proto, et.typ, et.hdr, et.obj, et.ext); err != nil {
+				t.Error(err)
 			}
 		}
-
-		for j, wire := range []struct {
-			data     []byte // original datagram
-			inlattr  int    // length of padded original datagram, a hint
-			outlattr int    // length of padded original datagram, a want
-			err      error
+	})
+	t.Run("InterfaceIdent", func(t *testing.T) {
+		for _, et := range []struct {
+			proto int
+			typ   Type
+			hdr   []byte
+			obj   []byte
+			ext   Extension
 		}{
-			{nil, 0, -1, errNoExtension},
-			{make([]byte, 127), 128, -1, errNoExtension},
-
-			{make([]byte, 128), 127, -1, errNoExtension},
-			{make([]byte, 128), 128, -1, errNoExtension},
-			{make([]byte, 128), 129, -1, errNoExtension},
-
-			{append(make([]byte, 128), append(tt.hdr, tt.obj...)...), 127, 128, nil},
-			{append(make([]byte, 128), append(tt.hdr, tt.obj...)...), 128, 128, nil},
-			{append(make([]byte, 128), append(tt.hdr, tt.obj...)...), 129, 128, nil},
-
-			{append(make([]byte, 512), append(tt.hdr, tt.obj...)...), 511, -1, errNoExtension},
-			{append(make([]byte, 512), append(tt.hdr, tt.obj...)...), 512, 512, nil},
-			{append(make([]byte, 512), append(tt.hdr, tt.obj...)...), 513, -1, errNoExtension},
+			// Interface identification by name
+			{
+				proto: iana.ProtocolICMP,
+				typ:   ipv4.ICMPTypeExtendedEchoRequest,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
+				},
+				obj: []byte{
+					0x00, 0x0c, 0x03, 0x01,
+					byte('e'), byte('n'), byte('1'), byte('0'),
+					byte('1'), 0x00, 0x00, 0x00,
+				},
+				ext: &InterfaceIdent{
+					Class: classInterfaceIdent,
+					Type:  typeInterfaceByName,
+					Name:  "en101",
+				},
+			},
+			// Interface identification by index
+			{
+				proto: iana.ProtocolIPv6ICMP,
+				typ:   ipv6.ICMPTypeExtendedEchoRequest,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
+				},
+				obj: []byte{
+					0x00, 0x0c, 0x03, 0x02,
+					0x00, 0x00, 0x00, 0x00,
+					0x00, 0x00, 0x03, 0x8f,
+				},
+				ext: &InterfaceIdent{
+					Class: classInterfaceIdent,
+					Type:  typeInterfaceByIndex,
+					Index: 911,
+				},
+			},
+			// Interface identification by address
+			{
+				proto: iana.ProtocolICMP,
+				typ:   ipv4.ICMPTypeExtendedEchoRequest,
+				hdr: []byte{
+					0x20, 0x00, 0x00, 0x00,
+				},
+				obj: []byte{
+					0x00, 0x10, 0x03, 0x03,
+					byte(iana.AddrFamily48bitMAC >> 8), byte(iana.AddrFamily48bitMAC & 0x0f), 0x06, 0x00,
+					0x01, 0x23, 0x45, 0x67,
+					0x89, 0xab, 0x00, 0x00,
+				},
+				ext: &InterfaceIdent{
+					Class: classInterfaceIdent,
+					Type:  typeInterfaceByAddress,
+					AFI:   iana.AddrFamily48bitMAC,
+					Addr:  []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab},
+				},
+			},
 		} {
-			exts, l, err := parseExtensions(wire.data, wire.inlattr)
-			if err != wire.err {
-				t.Errorf("#%v/%v: got %v; want %v", i, j, err, wire.err)
-				continue
-			}
-			if wire.err != nil {
-				continue
-			}
-			if l != wire.outlattr {
-				t.Errorf("#%v/%v: got %v; want %v", i, j, l, wire.outlattr)
-			}
-			if !reflect.DeepEqual(exts, tt.exts) {
-				for j, ext := range exts {
-					switch ext := ext.(type) {
-					case *MPLSLabelStack:
-						want := tt.exts[j].(*MPLSLabelStack)
-						t.Errorf("#%v/%v: got %#v; want %#v", i, j, ext, want)
-					case *InterfaceInfo:
-						want := tt.exts[j].(*InterfaceInfo)
-						t.Errorf("#%v/%v: got %#v; want %#v", i, j, ext, want)
-					}
-				}
-				continue
+			if err := fn(t, et.proto, et.typ, et.hdr, et.obj, et.ext); err != nil {
+				t.Error(err)
 			}
 		}
-	}
-}
-
-var parseInterfaceNameTests = []struct {
-	b []byte
-	error
-}{
-	{[]byte{0, 'e', 'n', '0'}, errInvalidExtension},
-	{[]byte{4, 'e', 'n', '0'}, nil},
-	{[]byte{7, 'e', 'n', '0', 0xff, 0xff, 0xff, 0xff}, errInvalidExtension},
-	{[]byte{8, 'e', 'n', '0', 0xff, 0xff, 0xff}, errMessageTooShort},
+	})
 }
 
 func TestParseInterfaceName(t *testing.T) {
 	ifi := InterfaceInfo{Interface: &net.Interface{}}
-	for i, tt := range parseInterfaceNameTests {
+	for i, tt := range []struct {
+		b []byte
+		error
+	}{
+		{[]byte{0, 'e', 'n', '0'}, errInvalidExtension},
+		{[]byte{4, 'e', 'n', '0'}, nil},
+		{[]byte{7, 'e', 'n', '0', 0xff, 0xff, 0xff, 0xff}, errInvalidExtension},
+		{[]byte{8, 'e', 'n', '0', 0xff, 0xff, 0xff}, errMessageTooShort},
+	} {
 		if _, err := ifi.parseName(tt.b); err != tt.error {
 			t.Errorf("#%d: got %v; want %v", i, err, tt.error)
 		}
diff --git a/vendor/golang.org/x/net/icmp/interface.go b/vendor/golang.org/x/net/icmp/interface.go
index 78b5b98b..617f757b 100644
--- a/vendor/golang.org/x/net/icmp/interface.go
+++ b/vendor/golang.org/x/net/icmp/interface.go
@@ -14,9 +14,6 @@ import (
 
 const (
 	classInterfaceInfo = 2
-
-	afiIPv4 = 1
-	afiIPv6 = 2
 )
 
 const (
@@ -127,11 +124,11 @@ func (ifi *InterfaceInfo) parseIfIndex(b []byte) ([]byte, error) {
 func (ifi *InterfaceInfo) marshalIPAddr(proto int, b []byte) []byte {
 	switch proto {
 	case iana.ProtocolICMP:
-		binary.BigEndian.PutUint16(b[:2], uint16(afiIPv4))
+		binary.BigEndian.PutUint16(b[:2], uint16(iana.AddrFamilyIPv4))
 		copy(b[4:4+net.IPv4len], ifi.Addr.IP.To4())
 		b = b[4+net.IPv4len:]
 	case iana.ProtocolIPv6ICMP:
-		binary.BigEndian.PutUint16(b[:2], uint16(afiIPv6))
+		binary.BigEndian.PutUint16(b[:2], uint16(iana.AddrFamilyIPv6))
 		copy(b[4:4+net.IPv6len], ifi.Addr.IP.To16())
 		b = b[4+net.IPv6len:]
 	}
@@ -145,14 +142,14 @@ func (ifi *InterfaceInfo) parseIPAddr(b []byte) ([]byte, error) {
 	afi := int(binary.BigEndian.Uint16(b[:2]))
 	b = b[4:]
 	switch afi {
-	case afiIPv4:
+	case iana.AddrFamilyIPv4:
 		if len(b) < net.IPv4len {
 			return nil, errMessageTooShort
 		}
 		ifi.Addr.IP = make(net.IP, net.IPv4len)
 		copy(ifi.Addr.IP, b[:net.IPv4len])
 		b = b[net.IPv4len:]
-	case afiIPv6:
+	case iana.AddrFamilyIPv6:
 		if len(b) < net.IPv6len {
 			return nil, errMessageTooShort
 		}
@@ -234,3 +231,92 @@ func parseInterfaceInfo(b []byte) (Extension, error) {
 	}
 	return ifi, nil
 }
+
+const (
+	classInterfaceIdent    = 3
+	typeInterfaceByName    = 1
+	typeInterfaceByIndex   = 2
+	typeInterfaceByAddress = 3
+)
+
+// An InterfaceIdent represents interface identification.
+type InterfaceIdent struct {
+	Class int    // extension object class number
+	Type  int    // extension object sub-type
+	Name  string // interface name
+	Index int    // interface index
+	AFI   int    // address family identifier; see address family numbers in IANA registry
+	Addr  []byte // address
+}
+
+// Len implements the Len method of Extension interface.
+func (ifi *InterfaceIdent) Len(_ int) int {
+	switch ifi.Type {
+	case typeInterfaceByName:
+		l := len(ifi.Name)
+		if l > 255 {
+			l = 255
+		}
+		return 4 + (l+3)&^3
+	case typeInterfaceByIndex:
+		return 4 + 8
+	case typeInterfaceByAddress:
+		return 4 + 4 + (len(ifi.Addr)+3)&^3
+	default:
+		return 4
+	}
+}
+
+// Marshal implements the Marshal method of Extension interface.
+func (ifi *InterfaceIdent) Marshal(proto int) ([]byte, error) {
+	b := make([]byte, ifi.Len(proto))
+	if err := ifi.marshal(proto, b); err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+func (ifi *InterfaceIdent) marshal(proto int, b []byte) error {
+	l := ifi.Len(proto)
+	binary.BigEndian.PutUint16(b[:2], uint16(l))
+	b[2], b[3] = classInterfaceIdent, byte(ifi.Type)
+	switch ifi.Type {
+	case typeInterfaceByName:
+		copy(b[4:], ifi.Name)
+	case typeInterfaceByIndex:
+		binary.BigEndian.PutUint64(b[4:4+8], uint64(ifi.Index))
+	case typeInterfaceByAddress:
+		binary.BigEndian.PutUint16(b[4:4+2], uint16(ifi.AFI))
+		b[4+2] = byte(len(ifi.Addr))
+		copy(b[4+4:], ifi.Addr)
+	}
+	return nil
+}
+
+func parseInterfaceIdent(b []byte) (Extension, error) {
+	ifi := &InterfaceIdent{
+		Class: int(b[2]),
+		Type:  int(b[3]),
+	}
+	switch ifi.Type {
+	case typeInterfaceByName:
+		ifi.Name = strings.Trim(string(b[4:]), string(0))
+	case typeInterfaceByIndex:
+		if len(b[4:]) < 8 {
+			return nil, errInvalidExtension
+		}
+		ifi.Index = int(binary.BigEndian.Uint64(b[4 : 4+8]))
+	case typeInterfaceByAddress:
+		if len(b[4:]) < 4 {
+			return nil, errInvalidExtension
+		}
+		ifi.AFI = int(binary.BigEndian.Uint16(b[4 : 4+2]))
+		l := int(b[4+2])
+		if len(b[4+4:]) < l {
+			return nil, errInvalidExtension
+		}
+		ifi.Addr = make([]byte, l)
+		copy(ifi.Addr, b[4+4:])
+	}
+	return ifi, nil
+}
diff --git a/vendor/golang.org/x/net/icmp/ipv4.go b/vendor/golang.org/x/net/icmp/ipv4.go
index ffc66ed4..c4629240 100644
--- a/vendor/golang.org/x/net/icmp/ipv4.go
+++ b/vendor/golang.org/x/net/icmp/ipv4.go
@@ -17,8 +17,16 @@ import (
 // See http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
 var freebsdVersion uint32
 
-// ParseIPv4Header parses b as an IPv4 header of ICMP error message
-// invoking packet, which is contained in ICMP error message.
+// ParseIPv4Header returns the IPv4 header of the IPv4 packet that
+// triggered an ICMP error message.
+// This is found in the Data field of the ICMP error message body.
+//
+// The provided b must be in the format used by a raw ICMP socket on
+// the local system.
+// This may differ from the wire format, and the format used by a raw
+// IP socket, depending on the system.
+//
+// To parse an IPv6 header, use ipv6.ParseHeader.
 func ParseIPv4Header(b []byte) (*ipv4.Header, error) {
 	if len(b) < ipv4.HeaderLen {
 		return nil, errHeaderTooShort
diff --git a/vendor/golang.org/x/net/icmp/ipv4_test.go b/vendor/golang.org/x/net/icmp/ipv4_test.go
index 058953f4..3fdee83f 100644
--- a/vendor/golang.org/x/net/icmp/ipv4_test.go
+++ b/vendor/golang.org/x/net/icmp/ipv4_test.go
@@ -15,69 +15,61 @@ import (
 	"golang.org/x/net/ipv4"
 )
 
-type ipv4HeaderTest struct {
-	wireHeaderFromKernel        [ipv4.HeaderLen]byte
-	wireHeaderFromTradBSDKernel [ipv4.HeaderLen]byte
-	Header                      *ipv4.Header
-}
-
-var ipv4HeaderLittleEndianTest = ipv4HeaderTest{
-	// TODO(mikio): Add platform dependent wire header formats when
-	// we support new platforms.
-	wireHeaderFromKernel: [ipv4.HeaderLen]byte{
-		0x45, 0x01, 0xbe, 0xef,
-		0xca, 0xfe, 0x45, 0xdc,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	wireHeaderFromTradBSDKernel: [ipv4.HeaderLen]byte{
-		0x45, 0x01, 0xef, 0xbe,
-		0xca, 0xfe, 0x45, 0xdc,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	Header: &ipv4.Header{
-		Version:  ipv4.Version,
-		Len:      ipv4.HeaderLen,
-		TOS:      1,
-		TotalLen: 0xbeef,
-		ID:       0xcafe,
-		Flags:    ipv4.DontFragment,
-		FragOff:  1500,
-		TTL:      255,
-		Protocol: 1,
-		Checksum: 0xdead,
-		Src:      net.IPv4(172, 16, 254, 254),
-		Dst:      net.IPv4(192, 168, 0, 1),
-	},
-}
-
 func TestParseIPv4Header(t *testing.T) {
-	tt := &ipv4HeaderLittleEndianTest
-	if socket.NativeEndian != binary.LittleEndian {
-		t.Skip("no test for non-little endian machine yet")
-	}
-
-	var wh []byte
-	switch runtime.GOOS {
-	case "darwin":
-		wh = tt.wireHeaderFromTradBSDKernel[:]
-	case "freebsd":
-		if freebsdVersion >= 1000000 {
-			wh = tt.wireHeaderFromKernel[:]
-		} else {
-			wh = tt.wireHeaderFromTradBSDKernel[:]
-		}
-	default:
-		wh = tt.wireHeaderFromKernel[:]
-	}
-	h, err := ParseIPv4Header(wh)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(h, tt.Header) {
-		t.Fatalf("got %#v; want %#v", h, tt.Header)
+	switch socket.NativeEndian {
+	case binary.LittleEndian:
+		t.Run("LittleEndian", func(t *testing.T) {
+			// TODO(mikio): Add platform dependent wire
+			// header formats when we support new
+			// platforms.
+			wireHeaderFromKernel := [ipv4.HeaderLen]byte{
+				0x45, 0x01, 0xbe, 0xef,
+				0xca, 0xfe, 0x45, 0xdc,
+				0xff, 0x01, 0xde, 0xad,
+				172, 16, 254, 254,
+				192, 168, 0, 1,
+			}
+			wireHeaderFromTradBSDKernel := [ipv4.HeaderLen]byte{
+				0x45, 0x01, 0xef, 0xbe,
+				0xca, 0xfe, 0x45, 0xdc,
+				0xff, 0x01, 0xde, 0xad,
+				172, 16, 254, 254,
+				192, 168, 0, 1,
+			}
+			th := &ipv4.Header{
+				Version:  ipv4.Version,
+				Len:      ipv4.HeaderLen,
+				TOS:      1,
+				TotalLen: 0xbeef,
+				ID:       0xcafe,
+				Flags:    ipv4.DontFragment,
+				FragOff:  1500,
+				TTL:      255,
+				Protocol: 1,
+				Checksum: 0xdead,
+				Src:      net.IPv4(172, 16, 254, 254),
+				Dst:      net.IPv4(192, 168, 0, 1),
+			}
+			var wh []byte
+			switch runtime.GOOS {
+			case "darwin":
+				wh = wireHeaderFromTradBSDKernel[:]
+			case "freebsd":
+				if freebsdVersion >= 1000000 {
+					wh = wireHeaderFromKernel[:]
+				} else {
+					wh = wireHeaderFromTradBSDKernel[:]
+				}
+			default:
+				wh = wireHeaderFromKernel[:]
+			}
+			h, err := ParseIPv4Header(wh)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if !reflect.DeepEqual(h, th) {
+				t.Fatalf("got %#v; want %#v", h, th)
+			}
+		})
 	}
 }
diff --git a/vendor/golang.org/x/net/icmp/listen_stub.go b/vendor/golang.org/x/net/icmp/listen_stub.go
index 668728d1..14beb0ef 100644
--- a/vendor/golang.org/x/net/icmp/listen_stub.go
+++ b/vendor/golang.org/x/net/icmp/listen_stub.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build nacl plan9
+// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows
 
 package icmp
 
diff --git a/vendor/golang.org/x/net/icmp/message.go b/vendor/golang.org/x/net/icmp/message.go
index 81140b0d..75aac6c5 100644
--- a/vendor/golang.org/x/net/icmp/message.go
+++ b/vendor/golang.org/x/net/icmp/message.go
@@ -11,22 +11,24 @@
 // ICMP extensions for MPLS are defined in RFC 4950.
 // ICMP extensions for interface and next-hop identification are
 // defined in RFC 5837.
+// PROBE: A utility for probing interfaces is defined in RFC 8335.
 package icmp // import "golang.org/x/net/icmp"
 
 import (
 	"encoding/binary"
 	"errors"
 	"net"
-	"syscall"
 
 	"golang.org/x/net/internal/iana"
 	"golang.org/x/net/ipv4"
 	"golang.org/x/net/ipv6"
 )
 
-// BUG(mikio): This package is not implemented on NaCl and Plan 9.
+// BUG(mikio): This package is not implemented on JS, NaCl and Plan 9.
 
 var (
+	errInvalidConn      = errors.New("invalid connection")
+	errInvalidProtocol  = errors.New("invalid protocol")
 	errMessageTooShort  = errors.New("message too short")
 	errHeaderTooShort   = errors.New("header too short")
 	errBufferTooShort   = errors.New("buffer too short")
@@ -79,7 +81,7 @@ func (m *Message) Marshal(psh []byte) ([]byte, error) {
 	case ipv6.ICMPType:
 		mtype = int(typ)
 	default:
-		return nil, syscall.EINVAL
+		return nil, errInvalidProtocol
 	}
 	b := []byte{byte(mtype), byte(m.Code), 0, 0}
 	if m.Type.Protocol() == iana.ProtocolIPv6ICMP && psh != nil {
@@ -107,25 +109,30 @@ func (m *Message) Marshal(psh []byte) ([]byte, error) {
 	return b[len(psh):], nil
 }
 
-var parseFns = map[Type]func(int, []byte) (MessageBody, error){
+var parseFns = map[Type]func(int, Type, []byte) (MessageBody, error){
 	ipv4.ICMPTypeDestinationUnreachable: parseDstUnreach,
 	ipv4.ICMPTypeTimeExceeded:           parseTimeExceeded,
 	ipv4.ICMPTypeParameterProblem:       parseParamProb,
 
-	ipv4.ICMPTypeEcho:      parseEcho,
-	ipv4.ICMPTypeEchoReply: parseEcho,
+	ipv4.ICMPTypeEcho:                parseEcho,
+	ipv4.ICMPTypeEchoReply:           parseEcho,
+	ipv4.ICMPTypeExtendedEchoRequest: parseExtendedEchoRequest,
+	ipv4.ICMPTypeExtendedEchoReply:   parseExtendedEchoReply,
 
 	ipv6.ICMPTypeDestinationUnreachable: parseDstUnreach,
 	ipv6.ICMPTypePacketTooBig:           parsePacketTooBig,
 	ipv6.ICMPTypeTimeExceeded:           parseTimeExceeded,
 	ipv6.ICMPTypeParameterProblem:       parseParamProb,
 
-	ipv6.ICMPTypeEchoRequest: parseEcho,
-	ipv6.ICMPTypeEchoReply:   parseEcho,
+	ipv6.ICMPTypeEchoRequest:         parseEcho,
+	ipv6.ICMPTypeEchoReply:           parseEcho,
+	ipv6.ICMPTypeExtendedEchoRequest: parseExtendedEchoRequest,
+	ipv6.ICMPTypeExtendedEchoReply:   parseExtendedEchoReply,
 }
 
 // ParseMessage parses b as an ICMP message.
-// Proto must be either the ICMPv4 or ICMPv6 protocol number.
+// The provided proto must be either the ICMPv4 or ICMPv6 protocol
+// number.
 func ParseMessage(proto int, b []byte) (*Message, error) {
 	if len(b) < 4 {
 		return nil, errMessageTooShort
@@ -138,12 +145,12 @@ func ParseMessage(proto int, b []byte) (*Message, error) {
 	case iana.ProtocolIPv6ICMP:
 		m.Type = ipv6.ICMPType(b[0])
 	default:
-		return nil, syscall.EINVAL
+		return nil, errInvalidProtocol
 	}
 	if fn, ok := parseFns[m.Type]; !ok {
 		m.Body, err = parseDefaultMessageBody(proto, b[4:])
 	} else {
-		m.Body, err = fn(proto, b[4:])
+		m.Body, err = fn(proto, m.Type, b[4:])
 	}
 	if err != nil {
 		return nil, err
diff --git a/vendor/golang.org/x/net/icmp/message_test.go b/vendor/golang.org/x/net/icmp/message_test.go
index 5d2605f8..c278b8b8 100644
--- a/vendor/golang.org/x/net/icmp/message_test.go
+++ b/vendor/golang.org/x/net/icmp/message_test.go
@@ -15,120 +15,141 @@ import (
 	"golang.org/x/net/ipv6"
 )
 
-var marshalAndParseMessageForIPv4Tests = []icmp.Message{
-	{
-		Type: ipv4.ICMPTypeDestinationUnreachable, Code: 15,
-		Body: &icmp.DstUnreach{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeTimeExceeded, Code: 1,
-		Body: &icmp.TimeExceeded{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeParameterProblem, Code: 2,
-		Body: &icmp.ParamProb{
-			Pointer: 8,
-			Data:    []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeEcho, Code: 0,
-		Body: &icmp.Echo{
-			ID: 1, Seq: 2,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	},
-	{
-		Type: ipv4.ICMPTypePhoturis,
-		Body: &icmp.DefaultMessageBody{
-			Data: []byte{0x80, 0x40, 0x20, 0x10},
-		},
-	},
-}
-
-func TestMarshalAndParseMessageForIPv4(t *testing.T) {
-	for i, tt := range marshalAndParseMessageForIPv4Tests {
-		b, err := tt.Marshal(nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		m, err := icmp.ParseMessage(iana.ProtocolICMP, b)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if m.Type != tt.Type || m.Code != tt.Code {
-			t.Errorf("#%v: got %v; want %v", i, m, &tt)
-		}
-		if !reflect.DeepEqual(m.Body, tt.Body) {
-			t.Errorf("#%v: got %v; want %v", i, m.Body, tt.Body)
-		}
-	}
-}
-
-var marshalAndParseMessageForIPv6Tests = []icmp.Message{
-	{
-		Type: ipv6.ICMPTypeDestinationUnreachable, Code: 6,
-		Body: &icmp.DstUnreach{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypePacketTooBig, Code: 0,
-		Body: &icmp.PacketTooBig{
-			MTU:  1<<16 - 1,
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeTimeExceeded, Code: 1,
-		Body: &icmp.TimeExceeded{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeParameterProblem, Code: 2,
-		Body: &icmp.ParamProb{
-			Pointer: 8,
-			Data:    []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-		Body: &icmp.Echo{
-			ID: 1, Seq: 2,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeDuplicateAddressConfirmation,
-		Body: &icmp.DefaultMessageBody{
-			Data: []byte{0x80, 0x40, 0x20, 0x10},
-		},
-	},
-}
-
-func TestMarshalAndParseMessageForIPv6(t *testing.T) {
-	pshicmp := icmp.IPv6PseudoHeader(net.ParseIP("fe80::1"), net.ParseIP("ff02::1"))
-	for i, tt := range marshalAndParseMessageForIPv6Tests {
-		for _, psh := range [][]byte{pshicmp, nil} {
-			b, err := tt.Marshal(psh)
-			if err != nil {
-				t.Fatal(err)
-			}
-			m, err := icmp.ParseMessage(iana.ProtocolIPv6ICMP, b)
-			if err != nil {
-				t.Fatal(err)
+func TestMarshalAndParseMessage(t *testing.T) {
+	fn := func(t *testing.T, proto int, tms []icmp.Message) {
+		var pshs [][]byte
+		switch proto {
+		case iana.ProtocolICMP:
+			pshs = [][]byte{nil}
+		case iana.ProtocolIPv6ICMP:
+			pshs = [][]byte{
+				icmp.IPv6PseudoHeader(net.ParseIP("fe80::1"), net.ParseIP("ff02::1")),
+				nil,
 			}
-			if m.Type != tt.Type || m.Code != tt.Code {
-				t.Errorf("#%v: got %v; want %v", i, m, &tt)
-			}
-			if !reflect.DeepEqual(m.Body, tt.Body) {
-				t.Errorf("#%v: got %v; want %v", i, m.Body, tt.Body)
+		}
+		for i, tm := range tms {
+			for _, psh := range pshs {
+				b, err := tm.Marshal(psh)
+				if err != nil {
+					t.Fatal(err)
+				}
+				m, err := icmp.ParseMessage(proto, b)
+				if err != nil {
+					t.Fatal(err)
+				}
+				if m.Type != tm.Type || m.Code != tm.Code {
+					t.Errorf("#%d: got %#v; want %#v", i, m, &tm)
+				}
+				if !reflect.DeepEqual(m.Body, tm.Body) {
+					t.Errorf("#%d: got %#v; want %#v", i, m.Body, tm.Body)
+				}
 			}
 		}
 	}
+
+	t.Run("IPv4", func(t *testing.T) {
+		fn(t, iana.ProtocolICMP,
+			[]icmp.Message{
+				{
+					Type: ipv4.ICMPTypeDestinationUnreachable, Code: 15,
+					Body: &icmp.DstUnreach{
+						Data: []byte("ERROR-INVOKING-PACKET"),
+					},
+				},
+				{
+					Type: ipv4.ICMPTypeTimeExceeded, Code: 1,
+					Body: &icmp.TimeExceeded{
+						Data: []byte("ERROR-INVOKING-PACKET"),
+					},
+				},
+				{
+					Type: ipv4.ICMPTypeParameterProblem, Code: 2,
+					Body: &icmp.ParamProb{
+						Pointer: 8,
+						Data:    []byte("ERROR-INVOKING-PACKET"),
+					},
+				},
+				{
+					Type: ipv4.ICMPTypeEcho, Code: 0,
+					Body: &icmp.Echo{
+						ID: 1, Seq: 2,
+						Data: []byte("HELLO-R-U-THERE"),
+					},
+				},
+				{
+					Type: ipv4.ICMPTypeExtendedEchoRequest, Code: 0,
+					Body: &icmp.ExtendedEchoRequest{
+						ID: 1, Seq: 2,
+					},
+				},
+				{
+					Type: ipv4.ICMPTypeExtendedEchoReply, Code: 0,
+					Body: &icmp.ExtendedEchoReply{
+						State: 4 /* Delay */, Active: true, IPv4: true,
+					},
+				},
+				{
+					Type: ipv4.ICMPTypePhoturis,
+					Body: &icmp.DefaultMessageBody{
+						Data: []byte{0x80, 0x40, 0x20, 0x10},
+					},
+				},
+			})
+	})
+	t.Run("IPv6", func(t *testing.T) {
+		fn(t, iana.ProtocolIPv6ICMP,
+			[]icmp.Message{
+				{
+					Type: ipv6.ICMPTypeDestinationUnreachable, Code: 6,
+					Body: &icmp.DstUnreach{
+						Data: []byte("ERROR-INVOKING-PACKET"),
+					},
+				},
+				{
+					Type: ipv6.ICMPTypePacketTooBig, Code: 0,
+					Body: &icmp.PacketTooBig{
+						MTU:  1<<16 - 1,
+						Data: []byte("ERROR-INVOKING-PACKET"),
+					},
+				},
+				{
+					Type: ipv6.ICMPTypeTimeExceeded, Code: 1,
+					Body: &icmp.TimeExceeded{
+						Data: []byte("ERROR-INVOKING-PACKET"),
+					},
+				},
+				{
+					Type: ipv6.ICMPTypeParameterProblem, Code: 2,
+					Body: &icmp.ParamProb{
+						Pointer: 8,
+						Data:    []byte("ERROR-INVOKING-PACKET"),
+					},
+				},
+				{
+					Type: ipv6.ICMPTypeEchoRequest, Code: 0,
+					Body: &icmp.Echo{
+						ID: 1, Seq: 2,
+						Data: []byte("HELLO-R-U-THERE"),
+					},
+				},
+				{
+					Type: ipv6.ICMPTypeExtendedEchoRequest, Code: 0,
+					Body: &icmp.ExtendedEchoRequest{
+						ID: 1, Seq: 2,
+					},
+				},
+				{
+					Type: ipv6.ICMPTypeExtendedEchoReply, Code: 0,
+					Body: &icmp.ExtendedEchoReply{
+						State: 5 /* Probe */, Active: true, IPv6: true,
+					},
+				},
+				{
+					Type: ipv6.ICMPTypeDuplicateAddressConfirmation,
+					Body: &icmp.DefaultMessageBody{
+						Data: []byte{0x80, 0x40, 0x20, 0x10},
+					},
+				},
+			})
+	})
 }
diff --git a/vendor/golang.org/x/net/icmp/messagebody.go b/vendor/golang.org/x/net/icmp/messagebody.go
index 2463730a..f12250c0 100644
--- a/vendor/golang.org/x/net/icmp/messagebody.go
+++ b/vendor/golang.org/x/net/icmp/messagebody.go
@@ -7,11 +7,13 @@ package icmp
 // A MessageBody represents an ICMP message body.
 type MessageBody interface {
 	// Len returns the length of ICMP message body.
-	// Proto must be either the ICMPv4 or ICMPv6 protocol number.
+	// The provided proto must be either the ICMPv4 or ICMPv6
+	// protocol number.
 	Len(proto int) int
 
 	// Marshal returns the binary encoding of ICMP message body.
-	// Proto must be either the ICMPv4 or ICMPv6 protocol number.
+	// The provided proto must be either the ICMPv4 or ICMPv6
+	// protocol number.
 	Marshal(proto int) ([]byte, error)
 }
 
diff --git a/vendor/golang.org/x/net/icmp/mpls.go b/vendor/golang.org/x/net/icmp/mpls.go
index c3149174..f9f4841b 100644
--- a/vendor/golang.org/x/net/icmp/mpls.go
+++ b/vendor/golang.org/x/net/icmp/mpls.go
@@ -6,7 +6,7 @@ package icmp
 
 import "encoding/binary"
 
-// A MPLSLabel represents a MPLS label stack entry.
+// MPLSLabel represents an MPLS label stack entry.
 type MPLSLabel struct {
 	Label int  // label value
 	TC    int  // traffic class; formerly experimental use
@@ -19,7 +19,7 @@ const (
 	typeIncomingMPLSLabelStack = 1
 )
 
-// A MPLSLabelStack represents a MPLS label stack.
+// MPLSLabelStack represents an MPLS label stack.
 type MPLSLabelStack struct {
 	Class  int // extension object class number
 	Type   int // extension object sub-type
diff --git a/vendor/golang.org/x/net/icmp/multipart.go b/vendor/golang.org/x/net/icmp/multipart.go
index f2713566..9ebbbafe 100644
--- a/vendor/golang.org/x/net/icmp/multipart.go
+++ b/vendor/golang.org/x/net/icmp/multipart.go
@@ -10,12 +10,14 @@ import "golang.org/x/net/internal/iana"
 // exts as extensions, and returns a required length for message body
 // and a required length for a padded original datagram in wire
 // format.
-func multipartMessageBodyDataLen(proto int, b []byte, exts []Extension) (bodyLen, dataLen int) {
+func multipartMessageBodyDataLen(proto int, withOrigDgram bool, b []byte, exts []Extension) (bodyLen, dataLen int) {
 	for _, ext := range exts {
 		bodyLen += ext.Len(proto)
 	}
 	if bodyLen > 0 {
-		dataLen = multipartMessageOrigDatagramLen(proto, b)
+		if withOrigDgram {
+			dataLen = multipartMessageOrigDatagramLen(proto, b)
+		}
 		bodyLen += 4 // length of extension header
 	} else {
 		dataLen = len(b)
@@ -50,8 +52,8 @@ func multipartMessageOrigDatagramLen(proto int, b []byte) int {
 // marshalMultipartMessageBody takes data as an original datagram and
 // exts as extesnsions, and returns a binary encoding of message body.
 // It can be used for non-multipart message bodies when exts is nil.
-func marshalMultipartMessageBody(proto int, data []byte, exts []Extension) ([]byte, error) {
-	bodyLen, dataLen := multipartMessageBodyDataLen(proto, data, exts)
+func marshalMultipartMessageBody(proto int, withOrigDgram bool, data []byte, exts []Extension) ([]byte, error) {
+	bodyLen, dataLen := multipartMessageBodyDataLen(proto, withOrigDgram, data, exts)
 	b := make([]byte, 4+bodyLen)
 	copy(b[4:], data)
 	off := dataLen + 4
@@ -71,16 +73,23 @@ func marshalMultipartMessageBody(proto int, data []byte, exts []Extension) ([]by
 					return nil, err
 				}
 				off += ext.Len(proto)
+			case *InterfaceIdent:
+				if err := ext.marshal(proto, b[off:]); err != nil {
+					return nil, err
+				}
+				off += ext.Len(proto)
 			}
 		}
 		s := checksum(b[dataLen+4:])
 		b[dataLen+4+2] ^= byte(s)
 		b[dataLen+4+3] ^= byte(s >> 8)
-		switch proto {
-		case iana.ProtocolICMP:
-			b[1] = byte(dataLen / 4)
-		case iana.ProtocolIPv6ICMP:
-			b[0] = byte(dataLen / 8)
+		if withOrigDgram {
+			switch proto {
+			case iana.ProtocolICMP:
+				b[1] = byte(dataLen / 4)
+			case iana.ProtocolIPv6ICMP:
+				b[0] = byte(dataLen / 8)
+			}
 		}
 	}
 	return b, nil
@@ -88,7 +97,7 @@ func marshalMultipartMessageBody(proto int, data []byte, exts []Extension) ([]by
 
 // parseMultipartMessageBody parses b as either a non-multipart
 // message body or a multipart message body.
-func parseMultipartMessageBody(proto int, b []byte) ([]byte, []Extension, error) {
+func parseMultipartMessageBody(proto int, typ Type, b []byte) ([]byte, []Extension, error) {
 	var l int
 	switch proto {
 	case iana.ProtocolICMP:
@@ -99,11 +108,14 @@ func parseMultipartMessageBody(proto int, b []byte) ([]byte, []Extension, error)
 	if len(b) == 4 {
 		return nil, nil, nil
 	}
-	exts, l, err := parseExtensions(b[4:], l)
+	exts, l, err := parseExtensions(typ, b[4:], l)
 	if err != nil {
 		l = len(b) - 4
 	}
-	data := make([]byte, l)
-	copy(data, b[4:])
+	var data []byte
+	if l > 0 {
+		data = make([]byte, l)
+		copy(data, b[4:])
+	}
 	return data, exts, nil
 }
diff --git a/vendor/golang.org/x/net/icmp/multipart_test.go b/vendor/golang.org/x/net/icmp/multipart_test.go
index 966ccb8d..74408827 100644
--- a/vendor/golang.org/x/net/icmp/multipart_test.go
+++ b/vendor/golang.org/x/net/icmp/multipart_test.go
@@ -5,6 +5,7 @@
 package icmp_test
 
 import (
+	"errors"
 	"fmt"
 	"net"
 	"reflect"
@@ -16,425 +17,557 @@ import (
 	"golang.org/x/net/ipv6"
 )
 
-var marshalAndParseMultipartMessageForIPv4Tests = []icmp.Message{
-	{
-		Type: ipv4.ICMPTypeDestinationUnreachable, Code: 15,
-		Body: &icmp.DstUnreach{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
-						},
-					},
-				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP: net.IPv4(192, 168, 0, 1).To4(),
-					},
-				},
-			},
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeTimeExceeded, Code: 1,
-		Body: &icmp.TimeExceeded{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP: net.IPv4(192, 168, 0, 1).To4(),
-					},
-				},
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
-						},
-					},
-				},
-			},
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeParameterProblem, Code: 2,
-		Body: &icmp.ParamProb{
-			Pointer: 8,
-			Data:    []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
-						},
-					},
-				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP: net.IPv4(192, 168, 0, 1).To4(),
-					},
-				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x2f,
-					Interface: &net.Interface{
-						Index: 16,
-						Name:  "en102",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP: net.IPv4(192, 168, 0, 2).To4(),
-					},
-				},
-			},
-		},
-	},
-}
-
-func TestMarshalAndParseMultipartMessageForIPv4(t *testing.T) {
-	for i, tt := range marshalAndParseMultipartMessageForIPv4Tests {
-		b, err := tt.Marshal(nil)
+func TestMarshalAndParseMultipartMessage(t *testing.T) {
+	fn := func(t *testing.T, proto int, tm icmp.Message) error {
+		b, err := tm.Marshal(nil)
 		if err != nil {
-			t.Fatal(err)
+			return err
 		}
-		if b[5] != 32 {
-			t.Errorf("#%v: got %v; want 32", i, b[5])
+		switch tm.Type {
+		case ipv4.ICMPTypeExtendedEchoRequest, ipv6.ICMPTypeExtendedEchoRequest:
+		default:
+			switch proto {
+			case iana.ProtocolICMP:
+				if b[5] != 32 {
+					return fmt.Errorf("got %d; want 32", b[5])
+				}
+			case iana.ProtocolIPv6ICMP:
+				if b[4] != 16 {
+					return fmt.Errorf("got %d; want 16", b[4])
+				}
+			default:
+				return fmt.Errorf("unknown protocol: %d", proto)
+			}
 		}
-		m, err := icmp.ParseMessage(iana.ProtocolICMP, b)
+		m, err := icmp.ParseMessage(proto, b)
 		if err != nil {
-			t.Fatal(err)
+			return err
 		}
-		if m.Type != tt.Type || m.Code != tt.Code {
-			t.Errorf("#%v: got %v; want %v", i, m, &tt)
+		if m.Type != tm.Type || m.Code != tm.Code {
+			return fmt.Errorf("got %v; want %v", m, &tm)
 		}
 		switch m.Type {
+		case ipv4.ICMPTypeExtendedEchoRequest, ipv6.ICMPTypeExtendedEchoRequest:
+			got, want := m.Body.(*icmp.ExtendedEchoRequest), tm.Body.(*icmp.ExtendedEchoRequest)
+			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
+				return errors.New(dumpExtensions(got.Extensions, want.Extensions))
+			}
 		case ipv4.ICMPTypeDestinationUnreachable:
-			got, want := m.Body.(*icmp.DstUnreach), tt.Body.(*icmp.DstUnreach)
+			got, want := m.Body.(*icmp.DstUnreach), tm.Body.(*icmp.DstUnreach)
 			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-				t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
+				return errors.New(dumpExtensions(got.Extensions, want.Extensions))
 			}
 			if len(got.Data) != 128 {
-				t.Errorf("#%v: got %v; want 128", i, len(got.Data))
+				return fmt.Errorf("got %d; want 128", len(got.Data))
 			}
 		case ipv4.ICMPTypeTimeExceeded:
-			got, want := m.Body.(*icmp.TimeExceeded), tt.Body.(*icmp.TimeExceeded)
+			got, want := m.Body.(*icmp.TimeExceeded), tm.Body.(*icmp.TimeExceeded)
 			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-				t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
+				return errors.New(dumpExtensions(got.Extensions, want.Extensions))
 			}
 			if len(got.Data) != 128 {
-				t.Errorf("#%v: got %v; want 128", i, len(got.Data))
+				return fmt.Errorf("got %d; want 128", len(got.Data))
 			}
 		case ipv4.ICMPTypeParameterProblem:
-			got, want := m.Body.(*icmp.ParamProb), tt.Body.(*icmp.ParamProb)
+			got, want := m.Body.(*icmp.ParamProb), tm.Body.(*icmp.ParamProb)
+			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
+				return errors.New(dumpExtensions(got.Extensions, want.Extensions))
+			}
+			if len(got.Data) != 128 {
+				return fmt.Errorf("got %d; want 128", len(got.Data))
+			}
+		case ipv6.ICMPTypeDestinationUnreachable:
+			got, want := m.Body.(*icmp.DstUnreach), tm.Body.(*icmp.DstUnreach)
 			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-				t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
+				return errors.New(dumpExtensions(got.Extensions, want.Extensions))
 			}
 			if len(got.Data) != 128 {
-				t.Errorf("#%v: got %v; want 128", i, len(got.Data))
+				return fmt.Errorf("got %d; want 128", len(got.Data))
 			}
+		case ipv6.ICMPTypeTimeExceeded:
+			got, want := m.Body.(*icmp.TimeExceeded), tm.Body.(*icmp.TimeExceeded)
+			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
+				return errors.New(dumpExtensions(got.Extensions, want.Extensions))
+			}
+			if len(got.Data) != 128 {
+				return fmt.Errorf("got %d; want 128", len(got.Data))
+			}
+		default:
+			return fmt.Errorf("unknown message type: %v", m.Type)
 		}
+		return nil
 	}
-}
 
-var marshalAndParseMultipartMessageForIPv6Tests = []icmp.Message{
-	{
-		Type: ipv6.ICMPTypeDestinationUnreachable, Code: 6,
-		Body: &icmp.DstUnreach{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
+	t.Run("IPv4", func(t *testing.T) {
+		for i, tm := range []icmp.Message{
+			{
+				Type: ipv4.ICMPTypeDestinationUnreachable, Code: 15,
+				Body: &icmp.DstUnreach{
+					Data: []byte("ERROR-INVOKING-PACKET"),
+					Extensions: []icmp.Extension{
+						&icmp.MPLSLabelStack{
+							Class: 1,
+							Type:  1,
+							Labels: []icmp.MPLSLabel{
+								{
+									Label: 16014,
+									TC:    0x4,
+									S:     true,
+									TTL:   255,
+								},
+							},
+						},
+						&icmp.InterfaceInfo{
+							Class: 2,
+							Type:  0x0f,
+							Interface: &net.Interface{
+								Index: 15,
+								Name:  "en101",
+								MTU:   8192,
+							},
+							Addr: &net.IPAddr{
+								IP: net.IPv4(192, 168, 0, 1).To4(),
+							},
 						},
 					},
 				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
+			},
+			{
+				Type: ipv4.ICMPTypeTimeExceeded, Code: 1,
+				Body: &icmp.TimeExceeded{
+					Data: []byte("ERROR-INVOKING-PACKET"),
+					Extensions: []icmp.Extension{
+						&icmp.InterfaceInfo{
+							Class: 2,
+							Type:  0x0f,
+							Interface: &net.Interface{
+								Index: 15,
+								Name:  "en101",
+								MTU:   8192,
+							},
+							Addr: &net.IPAddr{
+								IP: net.IPv4(192, 168, 0, 1).To4(),
+							},
+						},
+						&icmp.MPLSLabelStack{
+							Class: 1,
+							Type:  1,
+							Labels: []icmp.MPLSLabel{
+								{
+									Label: 16014,
+									TC:    0x4,
+									S:     true,
+									TTL:   255,
+								},
+							},
+						},
 					},
-					Addr: &net.IPAddr{
-						IP:   net.ParseIP("fe80::1"),
-						Zone: "en101",
+				},
+			},
+			{
+				Type: ipv4.ICMPTypeParameterProblem, Code: 2,
+				Body: &icmp.ParamProb{
+					Pointer: 8,
+					Data:    []byte("ERROR-INVOKING-PACKET"),
+					Extensions: []icmp.Extension{
+						&icmp.MPLSLabelStack{
+							Class: 1,
+							Type:  1,
+							Labels: []icmp.MPLSLabel{
+								{
+									Label: 16014,
+									TC:    0x4,
+									S:     true,
+									TTL:   255,
+								},
+							},
+						},
+						&icmp.InterfaceInfo{
+							Class: 2,
+							Type:  0x0f,
+							Interface: &net.Interface{
+								Index: 15,
+								Name:  "en101",
+								MTU:   8192,
+							},
+							Addr: &net.IPAddr{
+								IP: net.IPv4(192, 168, 0, 1).To4(),
+							},
+						},
+						&icmp.InterfaceInfo{
+							Class: 2,
+							Type:  0x2f,
+							Interface: &net.Interface{
+								Index: 16,
+								Name:  "en102",
+								MTU:   8192,
+							},
+							Addr: &net.IPAddr{
+								IP: net.IPv4(192, 168, 0, 2).To4(),
+							},
+						},
 					},
 				},
 			},
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeTimeExceeded, Code: 1,
-		Body: &icmp.TimeExceeded{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
+			{
+				Type: ipv4.ICMPTypeExtendedEchoRequest, Code: 0,
+				Body: &icmp.ExtendedEchoRequest{
+					ID: 1, Seq: 2, Local: true,
+					Extensions: []icmp.Extension{
+						&icmp.InterfaceIdent{
+							Class: 3,
+							Type:  1,
+							Name:  "en101",
+						},
 					},
-					Addr: &net.IPAddr{
-						IP:   net.ParseIP("fe80::1"),
-						Zone: "en101",
+				},
+			},
+			{
+				Type: ipv4.ICMPTypeExtendedEchoRequest, Code: 0,
+				Body: &icmp.ExtendedEchoRequest{
+					ID: 1, Seq: 2, Local: true,
+					Extensions: []icmp.Extension{
+						&icmp.InterfaceIdent{
+							Class: 3,
+							Type:  2,
+							Index: 911,
+						},
+						&icmp.InterfaceIdent{
+							Class: 3,
+							Type:  1,
+							Name:  "en101",
+						},
 					},
 				},
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
+			},
+			{
+				Type: ipv4.ICMPTypeExtendedEchoRequest, Code: 0,
+				Body: &icmp.ExtendedEchoRequest{
+					ID: 1, Seq: 2,
+					Extensions: []icmp.Extension{
+						&icmp.InterfaceIdent{
+							Class: 3,
+							Type:  3,
+							AFI:   iana.AddrFamily48bitMAC,
+							Addr:  []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab},
 						},
 					},
 				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x2f,
-					Interface: &net.Interface{
-						Index: 16,
-						Name:  "en102",
-						MTU:   8192,
+			},
+		} {
+			if err := fn(t, iana.ProtocolICMP, tm); err != nil {
+				t.Errorf("#%d: %v", i, err)
+			}
+		}
+	})
+	t.Run("IPv6", func(t *testing.T) {
+		for i, tm := range []icmp.Message{
+			{
+				Type: ipv6.ICMPTypeDestinationUnreachable, Code: 6,
+				Body: &icmp.DstUnreach{
+					Data: []byte("ERROR-INVOKING-PACKET"),
+					Extensions: []icmp.Extension{
+						&icmp.MPLSLabelStack{
+							Class: 1,
+							Type:  1,
+							Labels: []icmp.MPLSLabel{
+								{
+									Label: 16014,
+									TC:    0x4,
+									S:     true,
+									TTL:   255,
+								},
+							},
+						},
+						&icmp.InterfaceInfo{
+							Class: 2,
+							Type:  0x0f,
+							Interface: &net.Interface{
+								Index: 15,
+								Name:  "en101",
+								MTU:   8192,
+							},
+							Addr: &net.IPAddr{
+								IP:   net.ParseIP("fe80::1"),
+								Zone: "en101",
+							},
+						},
 					},
-					Addr: &net.IPAddr{
-						IP:   net.ParseIP("fe80::1"),
-						Zone: "en102",
+				},
+			},
+			{
+				Type: ipv6.ICMPTypeTimeExceeded, Code: 1,
+				Body: &icmp.TimeExceeded{
+					Data: []byte("ERROR-INVOKING-PACKET"),
+					Extensions: []icmp.Extension{
+						&icmp.InterfaceInfo{
+							Class: 2,
+							Type:  0x0f,
+							Interface: &net.Interface{
+								Index: 15,
+								Name:  "en101",
+								MTU:   8192,
+							},
+							Addr: &net.IPAddr{
+								IP:   net.ParseIP("fe80::1"),
+								Zone: "en101",
+							},
+						},
+						&icmp.MPLSLabelStack{
+							Class: 1,
+							Type:  1,
+							Labels: []icmp.MPLSLabel{
+								{
+									Label: 16014,
+									TC:    0x4,
+									S:     true,
+									TTL:   255,
+								},
+							},
+						},
+						&icmp.InterfaceInfo{
+							Class: 2,
+							Type:  0x2f,
+							Interface: &net.Interface{
+								Index: 16,
+								Name:  "en102",
+								MTU:   8192,
+							},
+							Addr: &net.IPAddr{
+								IP:   net.ParseIP("fe80::1"),
+								Zone: "en102",
+							},
+						},
 					},
 				},
 			},
-		},
-	},
-}
-
-func TestMarshalAndParseMultipartMessageForIPv6(t *testing.T) {
-	pshicmp := icmp.IPv6PseudoHeader(net.ParseIP("fe80::1"), net.ParseIP("ff02::1"))
-	for i, tt := range marshalAndParseMultipartMessageForIPv6Tests {
-		for _, psh := range [][]byte{pshicmp, nil} {
-			b, err := tt.Marshal(psh)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if b[4] != 16 {
-				t.Errorf("#%v: got %v; want 16", i, b[4])
-			}
-			m, err := icmp.ParseMessage(iana.ProtocolIPv6ICMP, b)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if m.Type != tt.Type || m.Code != tt.Code {
-				t.Errorf("#%v: got %v; want %v", i, m, &tt)
-			}
-			switch m.Type {
-			case ipv6.ICMPTypeDestinationUnreachable:
-				got, want := m.Body.(*icmp.DstUnreach), tt.Body.(*icmp.DstUnreach)
-				if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-					t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
-				}
-				if len(got.Data) != 128 {
-					t.Errorf("#%v: got %v; want 128", i, len(got.Data))
-				}
-			case ipv6.ICMPTypeTimeExceeded:
-				got, want := m.Body.(*icmp.TimeExceeded), tt.Body.(*icmp.TimeExceeded)
-				if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-					t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
-				}
-				if len(got.Data) != 128 {
-					t.Errorf("#%v: got %v; want 128", i, len(got.Data))
-				}
+			{
+				Type: ipv6.ICMPTypeExtendedEchoRequest, Code: 0,
+				Body: &icmp.ExtendedEchoRequest{
+					ID: 1, Seq: 2, Local: true,
+					Extensions: []icmp.Extension{
+						&icmp.InterfaceIdent{
+							Class: 3,
+							Type:  1,
+							Name:  "en101",
+						},
+					},
+				},
+			},
+			{
+				Type: ipv6.ICMPTypeExtendedEchoRequest, Code: 0,
+				Body: &icmp.ExtendedEchoRequest{
+					ID: 1, Seq: 2, Local: true,
+					Extensions: []icmp.Extension{
+						&icmp.InterfaceIdent{
+							Class: 3,
+							Type:  1,
+							Name:  "en101",
+						},
+						&icmp.InterfaceIdent{
+							Class: 3,
+							Type:  2,
+							Index: 911,
+						},
+					},
+				},
+			},
+			{
+				Type: ipv6.ICMPTypeExtendedEchoRequest, Code: 0,
+				Body: &icmp.ExtendedEchoRequest{
+					ID: 1, Seq: 2,
+					Extensions: []icmp.Extension{
+						&icmp.InterfaceIdent{
+							Class: 3,
+							Type:  3,
+							AFI:   iana.AddrFamilyIPv4,
+							Addr:  []byte{192, 0, 2, 1},
+						},
+					},
+				},
+			},
+		} {
+			if err := fn(t, iana.ProtocolIPv6ICMP, tm); err != nil {
+				t.Errorf("#%d: %v", i, err)
 			}
 		}
-	}
+	})
 }
 
-func dumpExtensions(i int, gotExts, wantExts []icmp.Extension) string {
+func dumpExtensions(gotExts, wantExts []icmp.Extension) string {
 	var s string
-	for j, got := range gotExts {
+	for i, got := range gotExts {
 		switch got := got.(type) {
 		case *icmp.MPLSLabelStack:
-			want := wantExts[j].(*icmp.MPLSLabelStack)
+			want := wantExts[i].(*icmp.MPLSLabelStack)
 			if !reflect.DeepEqual(got, want) {
-				s += fmt.Sprintf("#%v/%v: got %#v; want %#v\n", i, j, got, want)
+				s += fmt.Sprintf("#%d: got %#v; want %#v\n", i, got, want)
 			}
 		case *icmp.InterfaceInfo:
-			want := wantExts[j].(*icmp.InterfaceInfo)
+			want := wantExts[i].(*icmp.InterfaceInfo)
+			if !reflect.DeepEqual(got, want) {
+				s += fmt.Sprintf("#%d: got %#v, %#v, %#v; want %#v, %#v, %#v\n", i, got, got.Interface, got.Addr, want, want.Interface, want.Addr)
+			}
+		case *icmp.InterfaceIdent:
+			want := wantExts[i].(*icmp.InterfaceIdent)
 			if !reflect.DeepEqual(got, want) {
-				s += fmt.Sprintf("#%v/%v: got %#v, %#v, %#v; want %#v, %#v, %#v\n", i, j, got, got.Interface, got.Addr, want, want.Interface, want.Addr)
+				s += fmt.Sprintf("#%d: got %#v; want %#v\n", i, got, want)
 			}
 		}
 	}
+	if len(s) == 0 {
+		return "<nil>"
+	}
 	return s[:len(s)-1]
 }
 
-var multipartMessageBodyLenTests = []struct {
-	proto int
-	in    icmp.MessageBody
-	out   int
-}{
-	{
-		iana.ProtocolICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, ipv4.HeaderLen),
+func TestMultipartMessageBodyLen(t *testing.T) {
+	for i, tt := range []struct {
+		proto int
+		in    icmp.MessageBody
+		out   int
+	}{
+		{
+			iana.ProtocolICMP,
+			&icmp.DstUnreach{
+				Data: make([]byte, ipv4.HeaderLen),
+			},
+			4 + ipv4.HeaderLen, // unused and original datagram
 		},
-		4 + ipv4.HeaderLen, // unused and original datagram
-	},
-	{
-		iana.ProtocolICMP,
-		&icmp.TimeExceeded{
-			Data: make([]byte, ipv4.HeaderLen),
+		{
+			iana.ProtocolICMP,
+			&icmp.TimeExceeded{
+				Data: make([]byte, ipv4.HeaderLen),
+			},
+			4 + ipv4.HeaderLen, // unused and original datagram
 		},
-		4 + ipv4.HeaderLen, // unused and original datagram
-	},
-	{
-		iana.ProtocolICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, ipv4.HeaderLen),
+		{
+			iana.ProtocolICMP,
+			&icmp.ParamProb{
+				Data: make([]byte, ipv4.HeaderLen),
+			},
+			4 + ipv4.HeaderLen, // [pointer, unused] and original datagram
 		},
-		4 + ipv4.HeaderLen, // [pointer, unused] and original datagram
-	},
 
-	{
-		iana.ProtocolICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, ipv4.HeaderLen),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
+		{
+			iana.ProtocolICMP,
+			&icmp.ParamProb{
+				Data: make([]byte, ipv4.HeaderLen),
+				Extensions: []icmp.Extension{
+					&icmp.MPLSLabelStack{},
+				},
 			},
+			4 + 4 + 4 + 0 + 128, // [pointer, length, unused], extension header, object header, object payload, original datagram
 		},
-		4 + 4 + 4 + 0 + 128, // [pointer, length, unused], extension header, object header, object payload, original datagram
-	},
-	{
-		iana.ProtocolICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, 128),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
+		{
+			iana.ProtocolICMP,
+			&icmp.ParamProb{
+				Data: make([]byte, 128),
+				Extensions: []icmp.Extension{
+					&icmp.MPLSLabelStack{},
+				},
 			},
+			4 + 4 + 4 + 0 + 128, // [pointer, length, unused], extension header, object header, object payload and original datagram
 		},
-		4 + 4 + 4 + 0 + 128, // [pointer, length, unused], extension header, object header, object payload and original datagram
-	},
-	{
-		iana.ProtocolICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, 129),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
+		{
+			iana.ProtocolICMP,
+			&icmp.ParamProb{
+				Data: make([]byte, 129),
+				Extensions: []icmp.Extension{
+					&icmp.MPLSLabelStack{},
+				},
 			},
+			4 + 4 + 4 + 0 + 132, // [pointer, length, unused], extension header, object header, object payload and original datagram
 		},
-		4 + 4 + 4 + 0 + 132, // [pointer, length, unused], extension header, object header, object payload and original datagram
-	},
 
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, ipv6.HeaderLen),
+		{
+			iana.ProtocolIPv6ICMP,
+			&icmp.DstUnreach{
+				Data: make([]byte, ipv6.HeaderLen),
+			},
+			4 + ipv6.HeaderLen, // unused and original datagram
 		},
-		4 + ipv6.HeaderLen, // unused and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.PacketTooBig{
-			Data: make([]byte, ipv6.HeaderLen),
+		{
+			iana.ProtocolIPv6ICMP,
+			&icmp.PacketTooBig{
+				Data: make([]byte, ipv6.HeaderLen),
+			},
+			4 + ipv6.HeaderLen, // mtu and original datagram
 		},
-		4 + ipv6.HeaderLen, // mtu and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.TimeExceeded{
-			Data: make([]byte, ipv6.HeaderLen),
+		{
+			iana.ProtocolIPv6ICMP,
+			&icmp.TimeExceeded{
+				Data: make([]byte, ipv6.HeaderLen),
+			},
+			4 + ipv6.HeaderLen, // unused and original datagram
 		},
-		4 + ipv6.HeaderLen, // unused and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, ipv6.HeaderLen),
+		{
+			iana.ProtocolIPv6ICMP,
+			&icmp.ParamProb{
+				Data: make([]byte, ipv6.HeaderLen),
+			},
+			4 + ipv6.HeaderLen, // pointer and original datagram
 		},
-		4 + ipv6.HeaderLen, // pointer and original datagram
-	},
 
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, 127),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
+		{
+			iana.ProtocolIPv6ICMP,
+			&icmp.DstUnreach{
+				Data: make([]byte, 127),
+				Extensions: []icmp.Extension{
+					&icmp.MPLSLabelStack{},
+				},
 			},
+			4 + 4 + 4 + 0 + 128, // [length, unused], extension header, object header, object payload and original datagram
 		},
-		4 + 4 + 4 + 0 + 128, // [length, unused], extension header, object header, object payload and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, 128),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
+		{
+			iana.ProtocolIPv6ICMP,
+			&icmp.DstUnreach{
+				Data: make([]byte, 128),
+				Extensions: []icmp.Extension{
+					&icmp.MPLSLabelStack{},
+				},
 			},
+			4 + 4 + 4 + 0 + 128, // [length, unused], extension header, object header, object payload and original datagram
 		},
-		4 + 4 + 4 + 0 + 128, // [length, unused], extension header, object header, object payload and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, 129),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
+		{
+			iana.ProtocolIPv6ICMP,
+			&icmp.DstUnreach{
+				Data: make([]byte, 129),
+				Extensions: []icmp.Extension{
+					&icmp.MPLSLabelStack{},
+				},
 			},
+			4 + 4 + 4 + 0 + 136, // [length, unused], extension header, object header, object payload and original datagram
 		},
-		4 + 4 + 4 + 0 + 136, // [length, unused], extension header, object header, object payload and original datagram
-	},
-}
 
-func TestMultipartMessageBodyLen(t *testing.T) {
-	for i, tt := range multipartMessageBodyLenTests {
+		{
+			iana.ProtocolICMP,
+			&icmp.ExtendedEchoRequest{},
+			4, // [id, seq, l-bit]
+		},
+		{
+			iana.ProtocolICMP,
+			&icmp.ExtendedEchoRequest{
+				Extensions: []icmp.Extension{
+					&icmp.InterfaceIdent{},
+				},
+			},
+			4 + 4 + 4, // [id, seq, l-bit], extension header, object header
+		},
+		{
+			iana.ProtocolIPv6ICMP,
+			&icmp.ExtendedEchoRequest{
+				Extensions: []icmp.Extension{
+					&icmp.InterfaceIdent{
+						Type: 3,
+						AFI:  iana.AddrFamilyNSAP,
+						Addr: []byte{0x49, 0x00, 0x01, 0xaa, 0xaa, 0xbb, 0xbb, 0xcc, 0xcc, 0x00},
+					},
+				},
+			},
+			4 + 4 + 4 + 16, // [id, seq, l-bit], extension header, object header, object payload
+		},
+	} {
 		if out := tt.in.Len(tt.proto); out != tt.out {
 			t.Errorf("#%d: got %d; want %d", i, out, tt.out)
 		}
diff --git a/vendor/golang.org/x/net/icmp/packettoobig.go b/vendor/golang.org/x/net/icmp/packettoobig.go
index a1c9df7b..afbf24f1 100644
--- a/vendor/golang.org/x/net/icmp/packettoobig.go
+++ b/vendor/golang.org/x/net/icmp/packettoobig.go
@@ -29,7 +29,7 @@ func (p *PacketTooBig) Marshal(proto int) ([]byte, error) {
 }
 
 // parsePacketTooBig parses b as an ICMP packet too big message body.
-func parsePacketTooBig(proto int, b []byte) (MessageBody, error) {
+func parsePacketTooBig(proto int, _ Type, b []byte) (MessageBody, error) {
 	bodyLen := len(b)
 	if bodyLen < 4 {
 		return nil, errMessageTooShort
diff --git a/vendor/golang.org/x/net/icmp/paramprob.go b/vendor/golang.org/x/net/icmp/paramprob.go
index 0a2548da..85872554 100644
--- a/vendor/golang.org/x/net/icmp/paramprob.go
+++ b/vendor/golang.org/x/net/icmp/paramprob.go
@@ -21,7 +21,7 @@ func (p *ParamProb) Len(proto int) int {
 	if p == nil {
 		return 0
 	}
-	l, _ := multipartMessageBodyDataLen(proto, p.Data, p.Extensions)
+	l, _ := multipartMessageBodyDataLen(proto, true, p.Data, p.Extensions)
 	return 4 + l
 }
 
@@ -33,7 +33,7 @@ func (p *ParamProb) Marshal(proto int) ([]byte, error) {
 		copy(b[4:], p.Data)
 		return b, nil
 	}
-	b, err := marshalMultipartMessageBody(proto, p.Data, p.Extensions)
+	b, err := marshalMultipartMessageBody(proto, true, p.Data, p.Extensions)
 	if err != nil {
 		return nil, err
 	}
@@ -42,7 +42,7 @@ func (p *ParamProb) Marshal(proto int) ([]byte, error) {
 }
 
 // parseParamProb parses b as an ICMP parameter problem message body.
-func parseParamProb(proto int, b []byte) (MessageBody, error) {
+func parseParamProb(proto int, typ Type, b []byte) (MessageBody, error) {
 	if len(b) < 4 {
 		return nil, errMessageTooShort
 	}
@@ -55,7 +55,7 @@ func parseParamProb(proto int, b []byte) (MessageBody, error) {
 	}
 	p.Pointer = uintptr(b[0])
 	var err error
-	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, b)
+	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, typ, b)
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/golang.org/x/net/icmp/ping_test.go b/vendor/golang.org/x/net/icmp/ping_test.go
deleted file mode 100644
index 3171dad1..00000000
--- a/vendor/golang.org/x/net/icmp/ping_test.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp_test
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"runtime"
-	"sync"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-	"golang.org/x/net/ipv6"
-)
-
-func googleAddr(c *icmp.PacketConn, protocol int) (net.Addr, error) {
-	const host = "www.google.com"
-	ips, err := net.LookupIP(host)
-	if err != nil {
-		return nil, err
-	}
-	netaddr := func(ip net.IP) (net.Addr, error) {
-		switch c.LocalAddr().(type) {
-		case *net.UDPAddr:
-			return &net.UDPAddr{IP: ip}, nil
-		case *net.IPAddr:
-			return &net.IPAddr{IP: ip}, nil
-		default:
-			return nil, errors.New("neither UDPAddr nor IPAddr")
-		}
-	}
-	for _, ip := range ips {
-		switch protocol {
-		case iana.ProtocolICMP:
-			if ip.To4() != nil {
-				return netaddr(ip)
-			}
-		case iana.ProtocolIPv6ICMP:
-			if ip.To16() != nil && ip.To4() == nil {
-				return netaddr(ip)
-			}
-		}
-	}
-	return nil, errors.New("no A or AAAA record")
-}
-
-type pingTest struct {
-	network, address string
-	protocol         int
-	mtype            icmp.Type
-}
-
-var nonPrivilegedPingTests = []pingTest{
-	{"udp4", "0.0.0.0", iana.ProtocolICMP, ipv4.ICMPTypeEcho},
-
-	{"udp6", "::", iana.ProtocolIPv6ICMP, ipv6.ICMPTypeEchoRequest},
-}
-
-func TestNonPrivilegedPing(t *testing.T) {
-	if testing.Short() {
-		t.Skip("avoid external network")
-	}
-	switch runtime.GOOS {
-	case "darwin":
-	case "linux":
-		t.Log("you may need to adjust the net.ipv4.ping_group_range kernel state")
-	default:
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	for i, tt := range nonPrivilegedPingTests {
-		if err := doPing(tt, i); err != nil {
-			t.Error(err)
-		}
-	}
-}
-
-var privilegedPingTests = []pingTest{
-	{"ip4:icmp", "0.0.0.0", iana.ProtocolICMP, ipv4.ICMPTypeEcho},
-
-	{"ip6:ipv6-icmp", "::", iana.ProtocolIPv6ICMP, ipv6.ICMPTypeEchoRequest},
-}
-
-func TestPrivilegedPing(t *testing.T) {
-	if testing.Short() {
-		t.Skip("avoid external network")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	for i, tt := range privilegedPingTests {
-		if err := doPing(tt, i); err != nil {
-			t.Error(err)
-		}
-	}
-}
-
-func doPing(tt pingTest, seq int) error {
-	c, err := icmp.ListenPacket(tt.network, tt.address)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	dst, err := googleAddr(c, tt.protocol)
-	if err != nil {
-		return err
-	}
-
-	if tt.network != "udp6" && tt.protocol == iana.ProtocolIPv6ICMP {
-		var f ipv6.ICMPFilter
-		f.SetAll(true)
-		f.Accept(ipv6.ICMPTypeDestinationUnreachable)
-		f.Accept(ipv6.ICMPTypePacketTooBig)
-		f.Accept(ipv6.ICMPTypeTimeExceeded)
-		f.Accept(ipv6.ICMPTypeParameterProblem)
-		f.Accept(ipv6.ICMPTypeEchoReply)
-		if err := c.IPv6PacketConn().SetICMPFilter(&f); err != nil {
-			return err
-		}
-	}
-
-	wm := icmp.Message{
-		Type: tt.mtype, Code: 0,
-		Body: &icmp.Echo{
-			ID: os.Getpid() & 0xffff, Seq: 1 << uint(seq),
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	}
-	wb, err := wm.Marshal(nil)
-	if err != nil {
-		return err
-	}
-	if n, err := c.WriteTo(wb, dst); err != nil {
-		return err
-	} else if n != len(wb) {
-		return fmt.Errorf("got %v; want %v", n, len(wb))
-	}
-
-	rb := make([]byte, 1500)
-	if err := c.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
-		return err
-	}
-	n, peer, err := c.ReadFrom(rb)
-	if err != nil {
-		return err
-	}
-	rm, err := icmp.ParseMessage(tt.protocol, rb[:n])
-	if err != nil {
-		return err
-	}
-	switch rm.Type {
-	case ipv4.ICMPTypeEchoReply, ipv6.ICMPTypeEchoReply:
-		return nil
-	default:
-		return fmt.Errorf("got %+v from %v; want echo reply", rm, peer)
-	}
-}
-
-func TestConcurrentNonPrivilegedListenPacket(t *testing.T) {
-	if testing.Short() {
-		t.Skip("avoid external network")
-	}
-	switch runtime.GOOS {
-	case "darwin":
-	case "linux":
-		t.Log("you may need to adjust the net.ipv4.ping_group_range kernel state")
-	default:
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	network, address := "udp4", "127.0.0.1"
-	if !nettest.SupportsIPv4() {
-		network, address = "udp6", "::1"
-	}
-	const N = 1000
-	var wg sync.WaitGroup
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go func() {
-			defer wg.Done()
-			c, err := icmp.ListenPacket(network, address)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			c.Close()
-		}()
-	}
-	wg.Wait()
-}
diff --git a/vendor/golang.org/x/net/icmp/timeexceeded.go b/vendor/golang.org/x/net/icmp/timeexceeded.go
index 344e1584..14e9e23c 100644
--- a/vendor/golang.org/x/net/icmp/timeexceeded.go
+++ b/vendor/golang.org/x/net/icmp/timeexceeded.go
@@ -15,23 +15,23 @@ func (p *TimeExceeded) Len(proto int) int {
 	if p == nil {
 		return 0
 	}
-	l, _ := multipartMessageBodyDataLen(proto, p.Data, p.Extensions)
+	l, _ := multipartMessageBodyDataLen(proto, true, p.Data, p.Extensions)
 	return 4 + l
 }
 
 // Marshal implements the Marshal method of MessageBody interface.
 func (p *TimeExceeded) Marshal(proto int) ([]byte, error) {
-	return marshalMultipartMessageBody(proto, p.Data, p.Extensions)
+	return marshalMultipartMessageBody(proto, true, p.Data, p.Extensions)
 }
 
 // parseTimeExceeded parses b as an ICMP time exceeded message body.
-func parseTimeExceeded(proto int, b []byte) (MessageBody, error) {
+func parseTimeExceeded(proto int, typ Type, b []byte) (MessageBody, error) {
 	if len(b) < 4 {
 		return nil, errMessageTooShort
 	}
 	p := &TimeExceeded{}
 	var err error
-	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, b)
+	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, typ, b)
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/golang.org/x/net/internal/iana/const.go b/vendor/golang.org/x/net/internal/iana/const.go
index c9df24d9..cea712fa 100644
--- a/vendor/golang.org/x/net/internal/iana/const.go
+++ b/vendor/golang.org/x/net/internal/iana/const.go
@@ -1,44 +1,40 @@
 // go generate gen.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; DO NOT EDIT.
 
 // Package iana provides protocol number resources managed by the Internet Assigned Numbers Authority (IANA).
 package iana // import "golang.org/x/net/internal/iana"
 
-// Differentiated Services Field Codepoints (DSCP), Updated: 2017-05-12
+// Differentiated Services Field Codepoints (DSCP), Updated: 2018-05-04
 const (
-	DiffServCS0        = 0x0  // CS0
-	DiffServCS1        = 0x20 // CS1
-	DiffServCS2        = 0x40 // CS2
-	DiffServCS3        = 0x60 // CS3
-	DiffServCS4        = 0x80 // CS4
-	DiffServCS5        = 0xa0 // CS5
-	DiffServCS6        = 0xc0 // CS6
-	DiffServCS7        = 0xe0 // CS7
-	DiffServAF11       = 0x28 // AF11
-	DiffServAF12       = 0x30 // AF12
-	DiffServAF13       = 0x38 // AF13
-	DiffServAF21       = 0x48 // AF21
-	DiffServAF22       = 0x50 // AF22
-	DiffServAF23       = 0x58 // AF23
-	DiffServAF31       = 0x68 // AF31
-	DiffServAF32       = 0x70 // AF32
-	DiffServAF33       = 0x78 // AF33
-	DiffServAF41       = 0x88 // AF41
-	DiffServAF42       = 0x90 // AF42
-	DiffServAF43       = 0x98 // AF43
-	DiffServEF         = 0xb8 // EF
-	DiffServVOICEADMIT = 0xb0 // VOICE-ADMIT
+	DiffServCS0           = 0x00 // CS0
+	DiffServCS1           = 0x20 // CS1
+	DiffServCS2           = 0x40 // CS2
+	DiffServCS3           = 0x60 // CS3
+	DiffServCS4           = 0x80 // CS4
+	DiffServCS5           = 0xa0 // CS5
+	DiffServCS6           = 0xc0 // CS6
+	DiffServCS7           = 0xe0 // CS7
+	DiffServAF11          = 0x28 // AF11
+	DiffServAF12          = 0x30 // AF12
+	DiffServAF13          = 0x38 // AF13
+	DiffServAF21          = 0x48 // AF21
+	DiffServAF22          = 0x50 // AF22
+	DiffServAF23          = 0x58 // AF23
+	DiffServAF31          = 0x68 // AF31
+	DiffServAF32          = 0x70 // AF32
+	DiffServAF33          = 0x78 // AF33
+	DiffServAF41          = 0x88 // AF41
+	DiffServAF42          = 0x90 // AF42
+	DiffServAF43          = 0x98 // AF43
+	DiffServEF            = 0xb8 // EF
+	DiffServVOICEADMIT    = 0xb0 // VOICE-ADMIT
+	NotECNTransport       = 0x00 // Not-ECT (Not ECN-Capable Transport)
+	ECNTransport1         = 0x01 // ECT(1) (ECN-Capable Transport(1))
+	ECNTransport0         = 0x02 // ECT(0) (ECN-Capable Transport(0))
+	CongestionExperienced = 0x03 // CE (Congestion Experienced)
 )
 
-// IPv4 TOS Byte and IPv6 Traffic Class Octet, Updated: 2001-09-06
-const (
-	NotECNTransport       = 0x0 // Not-ECT (Not ECN-Capable Transport)
-	ECNTransport1         = 0x1 // ECT(1) (ECN-Capable Transport(1))
-	ECNTransport0         = 0x2 // ECT(0) (ECN-Capable Transport(0))
-	CongestionExperienced = 0x3 // CE (Congestion Experienced)
-)
-
-// Protocol Numbers, Updated: 2016-06-22
+// Protocol Numbers, Updated: 2017-10-13
 const (
 	ProtocolIP             = 0   // IPv4 encapsulation, pseudo protocol number
 	ProtocolHOPOPT         = 0   // IPv6 Hop-by-Hop Option
@@ -178,3 +174,50 @@ const (
 	ProtocolROHC           = 142 // Robust Header Compression
 	ProtocolReserved       = 255 // Reserved
 )
+
+// Address Family Numbers, Updated: 2018-04-02
+const (
+	AddrFamilyIPv4                          = 1     // IP (IP version 4)
+	AddrFamilyIPv6                          = 2     // IP6 (IP version 6)
+	AddrFamilyNSAP                          = 3     // NSAP
+	AddrFamilyHDLC                          = 4     // HDLC (8-bit multidrop)
+	AddrFamilyBBN1822                       = 5     // BBN 1822
+	AddrFamily802                           = 6     // 802 (includes all 802 media plus Ethernet "canonical format")
+	AddrFamilyE163                          = 7     // E.163
+	AddrFamilyE164                          = 8     // E.164 (SMDS, Frame Relay, ATM)
+	AddrFamilyF69                           = 9     // F.69 (Telex)
+	AddrFamilyX121                          = 10    // X.121 (X.25, Frame Relay)
+	AddrFamilyIPX                           = 11    // IPX
+	AddrFamilyAppletalk                     = 12    // Appletalk
+	AddrFamilyDecnetIV                      = 13    // Decnet IV
+	AddrFamilyBanyanVines                   = 14    // Banyan Vines
+	AddrFamilyE164withSubaddress            = 15    // E.164 with NSAP format subaddress
+	AddrFamilyDNS                           = 16    // DNS (Domain Name System)
+	AddrFamilyDistinguishedName             = 17    // Distinguished Name
+	AddrFamilyASNumber                      = 18    // AS Number
+	AddrFamilyXTPoverIPv4                   = 19    // XTP over IP version 4
+	AddrFamilyXTPoverIPv6                   = 20    // XTP over IP version 6
+	AddrFamilyXTPnativemodeXTP              = 21    // XTP native mode XTP
+	AddrFamilyFibreChannelWorldWidePortName = 22    // Fibre Channel World-Wide Port Name
+	AddrFamilyFibreChannelWorldWideNodeName = 23    // Fibre Channel World-Wide Node Name
+	AddrFamilyGWID                          = 24    // GWID
+	AddrFamilyL2VPN                         = 25    // AFI for L2VPN information
+	AddrFamilyMPLSTPSectionEndpointID       = 26    // MPLS-TP Section Endpoint Identifier
+	AddrFamilyMPLSTPLSPEndpointID           = 27    // MPLS-TP LSP Endpoint Identifier
+	AddrFamilyMPLSTPPseudowireEndpointID    = 28    // MPLS-TP Pseudowire Endpoint Identifier
+	AddrFamilyMTIPv4                        = 29    // MT IP: Multi-Topology IP version 4
+	AddrFamilyMTIPv6                        = 30    // MT IPv6: Multi-Topology IP version 6
+	AddrFamilyEIGRPCommonServiceFamily      = 16384 // EIGRP Common Service Family
+	AddrFamilyEIGRPIPv4ServiceFamily        = 16385 // EIGRP IPv4 Service Family
+	AddrFamilyEIGRPIPv6ServiceFamily        = 16386 // EIGRP IPv6 Service Family
+	AddrFamilyLISPCanonicalAddressFormat    = 16387 // LISP Canonical Address Format (LCAF)
+	AddrFamilyBGPLS                         = 16388 // BGP-LS
+	AddrFamily48bitMAC                      = 16389 // 48-bit MAC
+	AddrFamily64bitMAC                      = 16390 // 64-bit MAC
+	AddrFamilyOUI                           = 16391 // OUI
+	AddrFamilyMACFinal24bits                = 16392 // MAC/24
+	AddrFamilyMACFinal40bits                = 16393 // MAC/40
+	AddrFamilyIPv6Initial64bits             = 16394 // IPv6/64
+	AddrFamilyRBridgePortID                 = 16395 // RBridge Port ID
+	AddrFamilyTRILLNickname                 = 16396 // TRILL Nickname
+)
diff --git a/vendor/golang.org/x/net/internal/iana/gen.go b/vendor/golang.org/x/net/internal/iana/gen.go
index 2a5c310c..2a7661c2 100644
--- a/vendor/golang.org/x/net/internal/iana/gen.go
+++ b/vendor/golang.org/x/net/internal/iana/gen.go
@@ -31,20 +31,20 @@ var registries = []struct {
 		"https://www.iana.org/assignments/dscp-registry/dscp-registry.xml",
 		parseDSCPRegistry,
 	},
-	{
-		"https://www.iana.org/assignments/ipv4-tos-byte/ipv4-tos-byte.xml",
-		parseTOSTCByte,
-	},
 	{
 		"https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml",
 		parseProtocolNumbers,
 	},
+	{
+		"https://www.iana.org/assignments/address-family-numbers/address-family-numbers.xml",
+		parseAddrFamilyNumbers,
+	},
 }
 
 func main() {
 	var bb bytes.Buffer
 	fmt.Fprintf(&bb, "// go generate gen.go\n")
-	fmt.Fprintf(&bb, "// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT\n\n")
+	fmt.Fprintf(&bb, "// Code generated by the command above; DO NOT EDIT.\n\n")
 	fmt.Fprintf(&bb, "// Package iana provides protocol number resources managed by the Internet Assigned Numbers Authority (IANA).\n")
 	fmt.Fprintf(&bb, `package iana // import "golang.org/x/net/internal/iana"`+"\n\n")
 	for _, r := range registries {
@@ -81,31 +81,39 @@ func parseDSCPRegistry(w io.Writer, r io.Reader) error {
 	if err := dec.Decode(&dr); err != nil {
 		return err
 	}
-	drs := dr.escape()
 	fmt.Fprintf(w, "// %s, Updated: %s\n", dr.Title, dr.Updated)
 	fmt.Fprintf(w, "const (\n")
-	for _, dr := range drs {
-		fmt.Fprintf(w, "DiffServ%s = %#x", dr.Name, dr.Value)
+	for _, dr := range dr.escapeDSCP() {
+		fmt.Fprintf(w, "DiffServ%s = %#02x", dr.Name, dr.Value)
 		fmt.Fprintf(w, "// %s\n", dr.OrigName)
 	}
+	for _, er := range dr.escapeECN() {
+		fmt.Fprintf(w, "%s = %#02x", er.Descr, er.Value)
+		fmt.Fprintf(w, "// %s\n", er.OrigDescr)
+	}
 	fmt.Fprintf(w, ")\n")
 	return nil
 }
 
 type dscpRegistry struct {
-	XMLName     xml.Name `xml:"registry"`
-	Title       string   `xml:"title"`
-	Updated     string   `xml:"updated"`
-	Note        string   `xml:"note"`
-	RegTitle    string   `xml:"registry>title"`
-	PoolRecords []struct {
-		Name  string `xml:"name"`
-		Space string `xml:"space"`
-	} `xml:"registry>record"`
-	Records []struct {
-		Name  string `xml:"name"`
-		Space string `xml:"space"`
-	} `xml:"registry>registry>record"`
+	XMLName    xml.Name `xml:"registry"`
+	Title      string   `xml:"title"`
+	Updated    string   `xml:"updated"`
+	Note       string   `xml:"note"`
+	Registries []struct {
+		Title      string `xml:"title"`
+		Registries []struct {
+			Title   string `xml:"title"`
+			Records []struct {
+				Name  string `xml:"name"`
+				Space string `xml:"space"`
+			} `xml:"record"`
+		} `xml:"registry"`
+		Records []struct {
+			Value string `xml:"value"`
+			Descr string `xml:"description"`
+		} `xml:"record"`
+	} `xml:"registry"`
 }
 
 type canonDSCPRecord struct {
@@ -114,92 +122,84 @@ type canonDSCPRecord struct {
 	Value    int
 }
 
-func (drr *dscpRegistry) escape() []canonDSCPRecord {
-	drs := make([]canonDSCPRecord, len(drr.Records))
-	sr := strings.NewReplacer(
-		"+", "",
-		"-", "",
-		"/", "",
-		".", "",
-		" ", "",
-	)
-	for i, dr := range drr.Records {
-		s := strings.TrimSpace(dr.Name)
-		drs[i].OrigName = s
-		drs[i].Name = sr.Replace(s)
-		n, err := strconv.ParseUint(dr.Space, 2, 8)
-		if err != nil {
+func (drr *dscpRegistry) escapeDSCP() []canonDSCPRecord {
+	var drs []canonDSCPRecord
+	for _, preg := range drr.Registries {
+		if !strings.Contains(preg.Title, "Differentiated Services Field Codepoints") {
 			continue
 		}
-		drs[i].Value = int(n) << 2
+		for _, reg := range preg.Registries {
+			if !strings.Contains(reg.Title, "Pool 1 Codepoints") {
+				continue
+			}
+			drs = make([]canonDSCPRecord, len(reg.Records))
+			sr := strings.NewReplacer(
+				"+", "",
+				"-", "",
+				"/", "",
+				".", "",
+				" ", "",
+			)
+			for i, dr := range reg.Records {
+				s := strings.TrimSpace(dr.Name)
+				drs[i].OrigName = s
+				drs[i].Name = sr.Replace(s)
+				n, err := strconv.ParseUint(dr.Space, 2, 8)
+				if err != nil {
+					continue
+				}
+				drs[i].Value = int(n) << 2
+			}
+		}
 	}
 	return drs
 }
 
-func parseTOSTCByte(w io.Writer, r io.Reader) error {
-	dec := xml.NewDecoder(r)
-	var ttb tosTCByte
-	if err := dec.Decode(&ttb); err != nil {
-		return err
-	}
-	trs := ttb.escape()
-	fmt.Fprintf(w, "// %s, Updated: %s\n", ttb.Title, ttb.Updated)
-	fmt.Fprintf(w, "const (\n")
-	for _, tr := range trs {
-		fmt.Fprintf(w, "%s = %#x", tr.Keyword, tr.Value)
-		fmt.Fprintf(w, "// %s\n", tr.OrigKeyword)
-	}
-	fmt.Fprintf(w, ")\n")
-	return nil
-}
-
-type tosTCByte struct {
-	XMLName  xml.Name `xml:"registry"`
-	Title    string   `xml:"title"`
-	Updated  string   `xml:"updated"`
-	Note     string   `xml:"note"`
-	RegTitle string   `xml:"registry>title"`
-	Records  []struct {
-		Binary  string `xml:"binary"`
-		Keyword string `xml:"keyword"`
-	} `xml:"registry>record"`
+type canonECNRecord struct {
+	OrigDescr string
+	Descr     string
+	Value     int
 }
 
-type canonTOSTCByteRecord struct {
-	OrigKeyword string
-	Keyword     string
-	Value       int
-}
-
-func (ttb *tosTCByte) escape() []canonTOSTCByteRecord {
-	trs := make([]canonTOSTCByteRecord, len(ttb.Records))
-	sr := strings.NewReplacer(
-		"Capable", "",
-		"(", "",
-		")", "",
-		"+", "",
-		"-", "",
-		"/", "",
-		".", "",
-		" ", "",
-	)
-	for i, tr := range ttb.Records {
-		s := strings.TrimSpace(tr.Keyword)
-		trs[i].OrigKeyword = s
-		ss := strings.Split(s, " ")
-		if len(ss) > 1 {
-			trs[i].Keyword = strings.Join(ss[1:], " ")
-		} else {
-			trs[i].Keyword = ss[0]
-		}
-		trs[i].Keyword = sr.Replace(trs[i].Keyword)
-		n, err := strconv.ParseUint(tr.Binary, 2, 8)
-		if err != nil {
+func (drr *dscpRegistry) escapeECN() []canonECNRecord {
+	var ers []canonECNRecord
+	for _, reg := range drr.Registries {
+		if !strings.Contains(reg.Title, "ECN Field") {
 			continue
 		}
-		trs[i].Value = int(n)
+		ers = make([]canonECNRecord, len(reg.Records))
+		sr := strings.NewReplacer(
+			"Capable", "",
+			"Not-ECT", "",
+			"ECT(1)", "",
+			"ECT(0)", "",
+			"CE", "",
+			"(", "",
+			")", "",
+			"+", "",
+			"-", "",
+			"/", "",
+			".", "",
+			" ", "",
+		)
+		for i, er := range reg.Records {
+			s := strings.TrimSpace(er.Descr)
+			ers[i].OrigDescr = s
+			ss := strings.Split(s, " ")
+			if len(ss) > 1 {
+				ers[i].Descr = strings.Join(ss[1:], " ")
+			} else {
+				ers[i].Descr = ss[0]
+			}
+			ers[i].Descr = sr.Replace(er.Descr)
+			n, err := strconv.ParseUint(er.Value, 2, 8)
+			if err != nil {
+				continue
+			}
+			ers[i].Value = int(n)
+		}
 	}
-	return trs
+	return ers
 }
 
 func parseProtocolNumbers(w io.Writer, r io.Reader) error {
@@ -291,3 +291,93 @@ func (pn *protocolNumbers) escape() []canonProtocolRecord {
 	}
 	return prs
 }
+
+func parseAddrFamilyNumbers(w io.Writer, r io.Reader) error {
+	dec := xml.NewDecoder(r)
+	var afn addrFamilylNumbers
+	if err := dec.Decode(&afn); err != nil {
+		return err
+	}
+	afrs := afn.escape()
+	fmt.Fprintf(w, "// %s, Updated: %s\n", afn.Title, afn.Updated)
+	fmt.Fprintf(w, "const (\n")
+	for _, afr := range afrs {
+		if afr.Name == "" {
+			continue
+		}
+		fmt.Fprintf(w, "AddrFamily%s = %d", afr.Name, afr.Value)
+		fmt.Fprintf(w, "// %s\n", afr.Descr)
+	}
+	fmt.Fprintf(w, ")\n")
+	return nil
+}
+
+type addrFamilylNumbers struct {
+	XMLName  xml.Name `xml:"registry"`
+	Title    string   `xml:"title"`
+	Updated  string   `xml:"updated"`
+	RegTitle string   `xml:"registry>title"`
+	Note     string   `xml:"registry>note"`
+	Records  []struct {
+		Value string `xml:"value"`
+		Descr string `xml:"description"`
+	} `xml:"registry>record"`
+}
+
+type canonAddrFamilyRecord struct {
+	Name  string
+	Descr string
+	Value int
+}
+
+func (afn *addrFamilylNumbers) escape() []canonAddrFamilyRecord {
+	afrs := make([]canonAddrFamilyRecord, len(afn.Records))
+	sr := strings.NewReplacer(
+		"IP version 4", "IPv4",
+		"IP version 6", "IPv6",
+		"Identifier", "ID",
+		"-", "",
+		"-", "",
+		"/", "",
+		".", "",
+		" ", "",
+	)
+	for i, afr := range afn.Records {
+		if strings.Contains(afr.Descr, "Unassigned") ||
+			strings.Contains(afr.Descr, "Reserved") {
+			continue
+		}
+		afrs[i].Descr = afr.Descr
+		s := strings.TrimSpace(afr.Descr)
+		switch s {
+		case "IP (IP version 4)":
+			afrs[i].Name = "IPv4"
+		case "IP6 (IP version 6)":
+			afrs[i].Name = "IPv6"
+		case "AFI for L2VPN information":
+			afrs[i].Name = "L2VPN"
+		case "E.164 with NSAP format subaddress":
+			afrs[i].Name = "E164withSubaddress"
+		case "MT IP: Multi-Topology IP version 4":
+			afrs[i].Name = "MTIPv4"
+		case "MAC/24":
+			afrs[i].Name = "MACFinal24bits"
+		case "MAC/40":
+			afrs[i].Name = "MACFinal40bits"
+		case "IPv6/64":
+			afrs[i].Name = "IPv6Initial64bits"
+		default:
+			n := strings.Index(s, "(")
+			if n > 0 {
+				s = s[:n]
+			}
+			n = strings.Index(s, ":")
+			if n > 0 {
+				s = s[:n]
+			}
+			afrs[i].Name = sr.Replace(s)
+		}
+		afrs[i].Value, _ = strconv.Atoi(afr.Value)
+	}
+	return afrs
+}
diff --git a/vendor/golang.org/x/net/internal/nettest/helper_stub.go b/vendor/golang.org/x/net/internal/nettest/helper_stub.go
index ea61b6f3..d89cf299 100644
--- a/vendor/golang.org/x/net/internal/nettest/helper_stub.go
+++ b/vendor/golang.org/x/net/internal/nettest/helper_stub.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build nacl plan9
+// +build js nacl plan9
 
 package nettest
 
diff --git a/vendor/golang.org/x/net/internal/nettest/stack.go b/vendor/golang.org/x/net/internal/nettest/stack.go
index 06f4e09e..46d2fcca 100644
--- a/vendor/golang.org/x/net/internal/nettest/stack.go
+++ b/vendor/golang.org/x/net/internal/nettest/stack.go
@@ -64,7 +64,7 @@ func TestableNetwork(network string) bool {
 	switch network {
 	case "unix", "unixgram":
 		switch runtime.GOOS {
-		case "android", "nacl", "plan9", "windows":
+		case "android", "js", "nacl", "plan9", "windows":
 			return false
 		}
 		if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
@@ -72,7 +72,7 @@ func TestableNetwork(network string) bool {
 		}
 	case "unixpacket":
 		switch runtime.GOOS {
-		case "android", "darwin", "freebsd", "nacl", "plan9", "windows":
+		case "android", "darwin", "freebsd", "js", "nacl", "plan9", "windows":
 			return false
 		case "netbsd":
 			// It passes on amd64 at least. 386 fails (Issue 22927). arm is unknown.
diff --git a/vendor/golang.org/x/net/internal/socket/zsys_netbsd_arm.go b/vendor/golang.org/x/net/internal/socket/zsys_netbsd_arm.go
index 206ea2d1..db60491f 100644
--- a/vendor/golang.org/x/net/internal/socket/zsys_netbsd_arm.go
+++ b/vendor/golang.org/x/net/internal/socket/zsys_netbsd_arm.go
@@ -26,6 +26,11 @@ type msghdr struct {
 	Flags      int32
 }
 
+type mmsghdr struct {
+	Hdr msghdr
+	Len uint32
+}
+
 type cmsghdr struct {
 	Len   uint32
 	Level int32
@@ -52,6 +57,7 @@ type sockaddrInet6 struct {
 const (
 	sizeofIovec   = 0x8
 	sizeofMsghdr  = 0x1c
+	sizeofMmsghdr = 0x20
 	sizeofCmsghdr = 0xc
 
 	sizeofSockaddrInet  = 0x10
diff --git a/vendor/golang.org/x/net/internal/socks/client.go b/vendor/golang.org/x/net/internal/socks/client.go
new file mode 100644
index 00000000..3d6f516a
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/socks/client.go
@@ -0,0 +1,168 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package socks
+
+import (
+	"context"
+	"errors"
+	"io"
+	"net"
+	"strconv"
+	"time"
+)
+
+var (
+	noDeadline   = time.Time{}
+	aLongTimeAgo = time.Unix(1, 0)
+)
+
+func (d *Dialer) connect(ctx context.Context, c net.Conn, address string) (_ net.Addr, ctxErr error) {
+	host, port, err := splitHostPort(address)
+	if err != nil {
+		return nil, err
+	}
+	if deadline, ok := ctx.Deadline(); ok && !deadline.IsZero() {
+		c.SetDeadline(deadline)
+		defer c.SetDeadline(noDeadline)
+	}
+	if ctx != context.Background() {
+		errCh := make(chan error, 1)
+		done := make(chan struct{})
+		defer func() {
+			close(done)
+			if ctxErr == nil {
+				ctxErr = <-errCh
+			}
+		}()
+		go func() {
+			select {
+			case <-ctx.Done():
+				c.SetDeadline(aLongTimeAgo)
+				errCh <- ctx.Err()
+			case <-done:
+				errCh <- nil
+			}
+		}()
+	}
+
+	b := make([]byte, 0, 6+len(host)) // the size here is just an estimate
+	b = append(b, Version5)
+	if len(d.AuthMethods) == 0 || d.Authenticate == nil {
+		b = append(b, 1, byte(AuthMethodNotRequired))
+	} else {
+		ams := d.AuthMethods
+		if len(ams) > 255 {
+			return nil, errors.New("too many authentication methods")
+		}
+		b = append(b, byte(len(ams)))
+		for _, am := range ams {
+			b = append(b, byte(am))
+		}
+	}
+	if _, ctxErr = c.Write(b); ctxErr != nil {
+		return
+	}
+
+	if _, ctxErr = io.ReadFull(c, b[:2]); ctxErr != nil {
+		return
+	}
+	if b[0] != Version5 {
+		return nil, errors.New("unexpected protocol version " + strconv.Itoa(int(b[0])))
+	}
+	am := AuthMethod(b[1])
+	if am == AuthMethodNoAcceptableMethods {
+		return nil, errors.New("no acceptable authentication methods")
+	}
+	if d.Authenticate != nil {
+		if ctxErr = d.Authenticate(ctx, c, am); ctxErr != nil {
+			return
+		}
+	}
+
+	b = b[:0]
+	b = append(b, Version5, byte(d.cmd), 0)
+	if ip := net.ParseIP(host); ip != nil {
+		if ip4 := ip.To4(); ip4 != nil {
+			b = append(b, AddrTypeIPv4)
+			b = append(b, ip4...)
+		} else if ip6 := ip.To16(); ip6 != nil {
+			b = append(b, AddrTypeIPv6)
+			b = append(b, ip6...)
+		} else {
+			return nil, errors.New("unknown address type")
+		}
+	} else {
+		if len(host) > 255 {
+			return nil, errors.New("FQDN too long")
+		}
+		b = append(b, AddrTypeFQDN)
+		b = append(b, byte(len(host)))
+		b = append(b, host...)
+	}
+	b = append(b, byte(port>>8), byte(port))
+	if _, ctxErr = c.Write(b); ctxErr != nil {
+		return
+	}
+
+	if _, ctxErr = io.ReadFull(c, b[:4]); ctxErr != nil {
+		return
+	}
+	if b[0] != Version5 {
+		return nil, errors.New("unexpected protocol version " + strconv.Itoa(int(b[0])))
+	}
+	if cmdErr := Reply(b[1]); cmdErr != StatusSucceeded {
+		return nil, errors.New("unknown error " + cmdErr.String())
+	}
+	if b[2] != 0 {
+		return nil, errors.New("non-zero reserved field")
+	}
+	l := 2
+	var a Addr
+	switch b[3] {
+	case AddrTypeIPv4:
+		l += net.IPv4len
+		a.IP = make(net.IP, net.IPv4len)
+	case AddrTypeIPv6:
+		l += net.IPv6len
+		a.IP = make(net.IP, net.IPv6len)
+	case AddrTypeFQDN:
+		if _, err := io.ReadFull(c, b[:1]); err != nil {
+			return nil, err
+		}
+		l += int(b[0])
+	default:
+		return nil, errors.New("unknown address type " + strconv.Itoa(int(b[3])))
+	}
+	if cap(b) < l {
+		b = make([]byte, l)
+	} else {
+		b = b[:l]
+	}
+	if _, ctxErr = io.ReadFull(c, b); ctxErr != nil {
+		return
+	}
+	if a.IP != nil {
+		copy(a.IP, b)
+	} else {
+		a.Name = string(b[:len(b)-2])
+	}
+	a.Port = int(b[len(b)-2])<<8 | int(b[len(b)-1])
+	return &a, nil
+}
+
+func splitHostPort(address string) (string, int, error) {
+	host, port, err := net.SplitHostPort(address)
+	if err != nil {
+		return "", 0, err
+	}
+	portnum, err := strconv.Atoi(port)
+	if err != nil {
+		return "", 0, err
+	}
+	if 1 > portnum || portnum > 0xffff {
+		return "", 0, errors.New("port number out of range " + port)
+	}
+	return host, portnum, nil
+}
diff --git a/vendor/golang.org/x/net/internal/socks/dial_test.go b/vendor/golang.org/x/net/internal/socks/dial_test.go
new file mode 100644
index 00000000..3a7a31bd
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/socks/dial_test.go
@@ -0,0 +1,170 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package socks_test
+
+import (
+	"context"
+	"io"
+	"math/rand"
+	"net"
+	"os"
+	"testing"
+	"time"
+
+	"golang.org/x/net/internal/socks"
+	"golang.org/x/net/internal/sockstest"
+)
+
+func TestDial(t *testing.T) {
+	t.Run("Connect", func(t *testing.T) {
+		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, sockstest.NoProxyRequired)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer ss.Close()
+		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
+		d.AuthMethods = []socks.AuthMethod{
+			socks.AuthMethodNotRequired,
+			socks.AuthMethodUsernamePassword,
+		}
+		d.Authenticate = (&socks.UsernamePassword{
+			Username: "username",
+			Password: "password",
+		}).Authenticate
+		c, err := d.DialContext(context.Background(), ss.TargetAddr().Network(), ss.TargetAddr().String())
+		if err != nil {
+			t.Fatal(err)
+		}
+		c.(*socks.Conn).BoundAddr()
+		c.Close()
+	})
+	t.Run("ConnectWithConn", func(t *testing.T) {
+		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, sockstest.NoProxyRequired)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer ss.Close()
+		c, err := net.Dial(ss.Addr().Network(), ss.Addr().String())
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer c.Close()
+		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
+		d.AuthMethods = []socks.AuthMethod{
+			socks.AuthMethodNotRequired,
+			socks.AuthMethodUsernamePassword,
+		}
+		d.Authenticate = (&socks.UsernamePassword{
+			Username: "username",
+			Password: "password",
+		}).Authenticate
+		a, err := d.DialWithConn(context.Background(), c, ss.TargetAddr().Network(), ss.TargetAddr().String())
+		if err != nil {
+			t.Fatal(err)
+		}
+		if _, ok := a.(*socks.Addr); !ok {
+			t.Fatalf("got %+v; want socks.Addr", a)
+		}
+	})
+	t.Run("Cancel", func(t *testing.T) {
+		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, blackholeCmdFunc)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer ss.Close()
+		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
+		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
+		dialErr := make(chan error)
+		go func() {
+			c, err := d.DialContext(ctx, ss.TargetAddr().Network(), ss.TargetAddr().String())
+			if err == nil {
+				c.Close()
+			}
+			dialErr <- err
+		}()
+		time.Sleep(100 * time.Millisecond)
+		cancel()
+		err = <-dialErr
+		if perr, nerr := parseDialError(err); perr != context.Canceled && nerr == nil {
+			t.Fatalf("got %v; want context.Canceled or equivalent", err)
+		}
+	})
+	t.Run("Deadline", func(t *testing.T) {
+		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, blackholeCmdFunc)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer ss.Close()
+		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
+		ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(100*time.Millisecond))
+		defer cancel()
+		c, err := d.DialContext(ctx, ss.TargetAddr().Network(), ss.TargetAddr().String())
+		if err == nil {
+			c.Close()
+		}
+		if perr, nerr := parseDialError(err); perr != context.DeadlineExceeded && nerr == nil {
+			t.Fatalf("got %v; want context.DeadlineExceeded or equivalent", err)
+		}
+	})
+	t.Run("WithRogueServer", func(t *testing.T) {
+		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, rogueCmdFunc)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer ss.Close()
+		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
+		for i := 0; i < 2*len(rogueCmdList); i++ {
+			ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(100*time.Millisecond))
+			defer cancel()
+			c, err := d.DialContext(ctx, ss.TargetAddr().Network(), ss.TargetAddr().String())
+			if err == nil {
+				t.Log(c.(*socks.Conn).BoundAddr())
+				c.Close()
+				t.Error("should fail")
+			}
+		}
+	})
+}
+
+func blackholeCmdFunc(rw io.ReadWriter, b []byte) error {
+	if _, err := sockstest.ParseCmdRequest(b); err != nil {
+		return err
+	}
+	var bb [1]byte
+	for {
+		if _, err := rw.Read(bb[:]); err != nil {
+			return err
+		}
+	}
+}
+
+func rogueCmdFunc(rw io.ReadWriter, b []byte) error {
+	if _, err := sockstest.ParseCmdRequest(b); err != nil {
+		return err
+	}
+	rw.Write(rogueCmdList[rand.Intn(len(rogueCmdList))])
+	return nil
+}
+
+var rogueCmdList = [][]byte{
+	{0x05},
+	{0x06, 0x00, 0x00, 0x01, 192, 0, 2, 1, 0x17, 0x4b},
+	{0x05, 0x00, 0xff, 0x01, 192, 0, 2, 2, 0x17, 0x4b},
+	{0x05, 0x00, 0x00, 0x01, 192, 0, 2, 3},
+	{0x05, 0x00, 0x00, 0x03, 0x04, 'F', 'Q', 'D', 'N'},
+}
+
+func parseDialError(err error) (perr, nerr error) {
+	if e, ok := err.(*net.OpError); ok {
+		err = e.Err
+		nerr = e
+	}
+	if e, ok := err.(*os.SyscallError); ok {
+		err = e.Err
+	}
+	perr = err
+	return
+}
diff --git a/vendor/golang.org/x/net/internal/socks/socks.go b/vendor/golang.org/x/net/internal/socks/socks.go
new file mode 100644
index 00000000..d93e699b
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/socks/socks.go
@@ -0,0 +1,316 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package socks provides a SOCKS version 5 client implementation.
+//
+// SOCKS protocol version 5 is defined in RFC 1928.
+// Username/Password authentication for SOCKS version 5 is defined in
+// RFC 1929.
+package socks
+
+import (
+	"context"
+	"errors"
+	"io"
+	"net"
+	"strconv"
+)
+
+// A Command represents a SOCKS command.
+type Command int
+
+func (cmd Command) String() string {
+	switch cmd {
+	case CmdConnect:
+		return "socks connect"
+	case cmdBind:
+		return "socks bind"
+	default:
+		return "socks " + strconv.Itoa(int(cmd))
+	}
+}
+
+// An AuthMethod represents a SOCKS authentication method.
+type AuthMethod int
+
+// A Reply represents a SOCKS command reply code.
+type Reply int
+
+func (code Reply) String() string {
+	switch code {
+	case StatusSucceeded:
+		return "succeeded"
+	case 0x01:
+		return "general SOCKS server failure"
+	case 0x02:
+		return "connection not allowed by ruleset"
+	case 0x03:
+		return "network unreachable"
+	case 0x04:
+		return "host unreachable"
+	case 0x05:
+		return "connection refused"
+	case 0x06:
+		return "TTL expired"
+	case 0x07:
+		return "command not supported"
+	case 0x08:
+		return "address type not supported"
+	default:
+		return "unknown code: " + strconv.Itoa(int(code))
+	}
+}
+
+// Wire protocol constants.
+const (
+	Version5 = 0x05
+
+	AddrTypeIPv4 = 0x01
+	AddrTypeFQDN = 0x03
+	AddrTypeIPv6 = 0x04
+
+	CmdConnect Command = 0x01 // establishes an active-open forward proxy connection
+	cmdBind    Command = 0x02 // establishes a passive-open forward proxy connection
+
+	AuthMethodNotRequired         AuthMethod = 0x00 // no authentication required
+	AuthMethodUsernamePassword    AuthMethod = 0x02 // use username/password
+	AuthMethodNoAcceptableMethods AuthMethod = 0xff // no acceptable authentication methods
+
+	StatusSucceeded Reply = 0x00
+)
+
+// An Addr represents a SOCKS-specific address.
+// Either Name or IP is used exclusively.
+type Addr struct {
+	Name string // fully-qualified domain name
+	IP   net.IP
+	Port int
+}
+
+func (a *Addr) Network() string { return "socks" }
+
+func (a *Addr) String() string {
+	if a == nil {
+		return "<nil>"
+	}
+	port := strconv.Itoa(a.Port)
+	if a.IP == nil {
+		return net.JoinHostPort(a.Name, port)
+	}
+	return net.JoinHostPort(a.IP.String(), port)
+}
+
+// A Conn represents a forward proxy connection.
+type Conn struct {
+	net.Conn
+
+	boundAddr net.Addr
+}
+
+// BoundAddr returns the address assigned by the proxy server for
+// connecting to the command target address from the proxy server.
+func (c *Conn) BoundAddr() net.Addr {
+	if c == nil {
+		return nil
+	}
+	return c.boundAddr
+}
+
+// A Dialer holds SOCKS-specific options.
+type Dialer struct {
+	cmd          Command // either CmdConnect or cmdBind
+	proxyNetwork string  // network between a proxy server and a client
+	proxyAddress string  // proxy server address
+
+	// ProxyDial specifies the optional dial function for
+	// establishing the transport connection.
+	ProxyDial func(context.Context, string, string) (net.Conn, error)
+
+	// AuthMethods specifies the list of request authention
+	// methods.
+	// If empty, SOCKS client requests only AuthMethodNotRequired.
+	AuthMethods []AuthMethod
+
+	// Authenticate specifies the optional authentication
+	// function. It must be non-nil when AuthMethods is not empty.
+	// It must return an error when the authentication is failed.
+	Authenticate func(context.Context, io.ReadWriter, AuthMethod) error
+}
+
+// DialContext connects to the provided address on the provided
+// network.
+//
+// The returned error value may be a net.OpError. When the Op field of
+// net.OpError contains "socks", the Source field contains a proxy
+// server address and the Addr field contains a command target
+// address.
+//
+// See func Dial of the net package of standard library for a
+// description of the network and address parameters.
+func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	if err := d.validateTarget(network, address); err != nil {
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
+	}
+	if ctx == nil {
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: errors.New("nil context")}
+	}
+	var err error
+	var c net.Conn
+	if d.ProxyDial != nil {
+		c, err = d.ProxyDial(ctx, d.proxyNetwork, d.proxyAddress)
+	} else {
+		var dd net.Dialer
+		c, err = dd.DialContext(ctx, d.proxyNetwork, d.proxyAddress)
+	}
+	if err != nil {
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
+	}
+	a, err := d.connect(ctx, c, address)
+	if err != nil {
+		c.Close()
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
+	}
+	return &Conn{Conn: c, boundAddr: a}, nil
+}
+
+// DialWithConn initiates a connection from SOCKS server to the target
+// network and address using the connection c that is already
+// connected to the SOCKS server.
+//
+// It returns the connection's local address assigned by the SOCKS
+// server.
+func (d *Dialer) DialWithConn(ctx context.Context, c net.Conn, network, address string) (net.Addr, error) {
+	if err := d.validateTarget(network, address); err != nil {
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
+	}
+	if ctx == nil {
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: errors.New("nil context")}
+	}
+	a, err := d.connect(ctx, c, address)
+	if err != nil {
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
+	}
+	return a, nil
+}
+
+// Dial connects to the provided address on the provided network.
+//
+// Unlike DialContext, it returns a raw transport connection instead
+// of a forward proxy connection.
+//
+// Deprecated: Use DialContext or DialWithConn instead.
+func (d *Dialer) Dial(network, address string) (net.Conn, error) {
+	if err := d.validateTarget(network, address); err != nil {
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
+	}
+	var err error
+	var c net.Conn
+	if d.ProxyDial != nil {
+		c, err = d.ProxyDial(context.Background(), d.proxyNetwork, d.proxyAddress)
+	} else {
+		c, err = net.Dial(d.proxyNetwork, d.proxyAddress)
+	}
+	if err != nil {
+		proxy, dst, _ := d.pathAddrs(address)
+		return nil, &net.OpError{Op: d.cmd.String(), Net: network, Source: proxy, Addr: dst, Err: err}
+	}
+	if _, err := d.DialWithConn(context.Background(), c, network, address); err != nil {
+		return nil, err
+	}
+	return c, nil
+}
+
+func (d *Dialer) validateTarget(network, address string) error {
+	switch network {
+	case "tcp", "tcp6", "tcp4":
+	default:
+		return errors.New("network not implemented")
+	}
+	switch d.cmd {
+	case CmdConnect, cmdBind:
+	default:
+		return errors.New("command not implemented")
+	}
+	return nil
+}
+
+func (d *Dialer) pathAddrs(address string) (proxy, dst net.Addr, err error) {
+	for i, s := range []string{d.proxyAddress, address} {
+		host, port, err := splitHostPort(s)
+		if err != nil {
+			return nil, nil, err
+		}
+		a := &Addr{Port: port}
+		a.IP = net.ParseIP(host)
+		if a.IP == nil {
+			a.Name = host
+		}
+		if i == 0 {
+			proxy = a
+		} else {
+			dst = a
+		}
+	}
+	return
+}
+
+// NewDialer returns a new Dialer that dials through the provided
+// proxy server's network and address.
+func NewDialer(network, address string) *Dialer {
+	return &Dialer{proxyNetwork: network, proxyAddress: address, cmd: CmdConnect}
+}
+
+const (
+	authUsernamePasswordVersion = 0x01
+	authStatusSucceeded         = 0x00
+)
+
+// UsernamePassword are the credentials for the username/password
+// authentication method.
+type UsernamePassword struct {
+	Username string
+	Password string
+}
+
+// Authenticate authenticates a pair of username and password with the
+// proxy server.
+func (up *UsernamePassword) Authenticate(ctx context.Context, rw io.ReadWriter, auth AuthMethod) error {
+	switch auth {
+	case AuthMethodNotRequired:
+		return nil
+	case AuthMethodUsernamePassword:
+		if len(up.Username) == 0 || len(up.Username) > 255 || len(up.Password) == 0 || len(up.Password) > 255 {
+			return errors.New("invalid username/password")
+		}
+		b := []byte{authUsernamePasswordVersion}
+		b = append(b, byte(len(up.Username)))
+		b = append(b, up.Username...)
+		b = append(b, byte(len(up.Password)))
+		b = append(b, up.Password...)
+		// TODO(mikio): handle IO deadlines and cancelation if
+		// necessary
+		if _, err := rw.Write(b); err != nil {
+			return err
+		}
+		if _, err := io.ReadFull(rw, b[:2]); err != nil {
+			return err
+		}
+		if b[0] != authUsernamePasswordVersion {
+			return errors.New("invalid username/password version")
+		}
+		if b[1] != authStatusSucceeded {
+			return errors.New("username/password authentication failed")
+		}
+		return nil
+	}
+	return errors.New("unsupported authentication method " + strconv.Itoa(int(auth)))
+}
diff --git a/vendor/golang.org/x/net/internal/sockstest/server.go b/vendor/golang.org/x/net/internal/sockstest/server.go
new file mode 100644
index 00000000..3c6e9e95
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/sockstest/server.go
@@ -0,0 +1,241 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package sockstest provides utilities for SOCKS testing.
+package sockstest
+
+import (
+	"errors"
+	"io"
+	"net"
+
+	"golang.org/x/net/internal/nettest"
+	"golang.org/x/net/internal/socks"
+)
+
+// An AuthRequest represents an authentication request.
+type AuthRequest struct {
+	Version int
+	Methods []socks.AuthMethod
+}
+
+// ParseAuthRequest parses an authentication request.
+func ParseAuthRequest(b []byte) (*AuthRequest, error) {
+	if len(b) < 2 {
+		return nil, errors.New("short auth request")
+	}
+	if b[0] != socks.Version5 {
+		return nil, errors.New("unexpected protocol version")
+	}
+	if len(b)-2 < int(b[1]) {
+		return nil, errors.New("short auth request")
+	}
+	req := &AuthRequest{Version: int(b[0])}
+	if b[1] > 0 {
+		req.Methods = make([]socks.AuthMethod, b[1])
+		for i, m := range b[2 : 2+b[1]] {
+			req.Methods[i] = socks.AuthMethod(m)
+		}
+	}
+	return req, nil
+}
+
+// MarshalAuthReply returns an authentication reply in wire format.
+func MarshalAuthReply(ver int, m socks.AuthMethod) ([]byte, error) {
+	return []byte{byte(ver), byte(m)}, nil
+}
+
+// A CmdRequest repesents a command request.
+type CmdRequest struct {
+	Version int
+	Cmd     socks.Command
+	Addr    socks.Addr
+}
+
+// ParseCmdRequest parses a command request.
+func ParseCmdRequest(b []byte) (*CmdRequest, error) {
+	if len(b) < 7 {
+		return nil, errors.New("short cmd request")
+	}
+	if b[0] != socks.Version5 {
+		return nil, errors.New("unexpected protocol version")
+	}
+	if socks.Command(b[1]) != socks.CmdConnect {
+		return nil, errors.New("unexpected command")
+	}
+	if b[2] != 0 {
+		return nil, errors.New("non-zero reserved field")
+	}
+	req := &CmdRequest{Version: int(b[0]), Cmd: socks.Command(b[1])}
+	l := 2
+	off := 4
+	switch b[3] {
+	case socks.AddrTypeIPv4:
+		l += net.IPv4len
+		req.Addr.IP = make(net.IP, net.IPv4len)
+	case socks.AddrTypeIPv6:
+		l += net.IPv6len
+		req.Addr.IP = make(net.IP, net.IPv6len)
+	case socks.AddrTypeFQDN:
+		l += int(b[4])
+		off = 5
+	default:
+		return nil, errors.New("unknown address type")
+	}
+	if len(b[off:]) < l {
+		return nil, errors.New("short cmd request")
+	}
+	if req.Addr.IP != nil {
+		copy(req.Addr.IP, b[off:])
+	} else {
+		req.Addr.Name = string(b[off : off+l-2])
+	}
+	req.Addr.Port = int(b[off+l-2])<<8 | int(b[off+l-1])
+	return req, nil
+}
+
+// MarshalCmdReply returns a command reply in wire format.
+func MarshalCmdReply(ver int, reply socks.Reply, a *socks.Addr) ([]byte, error) {
+	b := make([]byte, 4)
+	b[0] = byte(ver)
+	b[1] = byte(reply)
+	if a.Name != "" {
+		if len(a.Name) > 255 {
+			return nil, errors.New("fqdn too long")
+		}
+		b[3] = socks.AddrTypeFQDN
+		b = append(b, byte(len(a.Name)))
+		b = append(b, a.Name...)
+	} else if ip4 := a.IP.To4(); ip4 != nil {
+		b[3] = socks.AddrTypeIPv4
+		b = append(b, ip4...)
+	} else if ip6 := a.IP.To16(); ip6 != nil {
+		b[3] = socks.AddrTypeIPv6
+		b = append(b, ip6...)
+	} else {
+		return nil, errors.New("unknown address type")
+	}
+	b = append(b, byte(a.Port>>8), byte(a.Port))
+	return b, nil
+}
+
+// A Server repesents a server for handshake testing.
+type Server struct {
+	ln net.Listener
+}
+
+// Addr rerurns a server address.
+func (s *Server) Addr() net.Addr {
+	return s.ln.Addr()
+}
+
+// TargetAddr returns a fake final destination address.
+//
+// The returned address is only valid for testing with Server.
+func (s *Server) TargetAddr() net.Addr {
+	a := s.ln.Addr()
+	switch a := a.(type) {
+	case *net.TCPAddr:
+		if a.IP.To4() != nil {
+			return &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 5963}
+		}
+		if a.IP.To16() != nil && a.IP.To4() == nil {
+			return &net.TCPAddr{IP: net.IPv6loopback, Port: 5963}
+		}
+	}
+	return nil
+}
+
+// Close closes the server.
+func (s *Server) Close() error {
+	return s.ln.Close()
+}
+
+func (s *Server) serve(authFunc, cmdFunc func(io.ReadWriter, []byte) error) {
+	c, err := s.ln.Accept()
+	if err != nil {
+		return
+	}
+	defer c.Close()
+	go s.serve(authFunc, cmdFunc)
+	b := make([]byte, 512)
+	n, err := c.Read(b)
+	if err != nil {
+		return
+	}
+	if err := authFunc(c, b[:n]); err != nil {
+		return
+	}
+	n, err = c.Read(b)
+	if err != nil {
+		return
+	}
+	if err := cmdFunc(c, b[:n]); err != nil {
+		return
+	}
+}
+
+// NewServer returns a new server.
+//
+// The provided authFunc and cmdFunc must parse requests and return
+// appropriate replies to clients.
+func NewServer(authFunc, cmdFunc func(io.ReadWriter, []byte) error) (*Server, error) {
+	var err error
+	s := new(Server)
+	s.ln, err = nettest.NewLocalListener("tcp")
+	if err != nil {
+		return nil, err
+	}
+	go s.serve(authFunc, cmdFunc)
+	return s, nil
+}
+
+// NoAuthRequired handles a no-authentication-required signaling.
+func NoAuthRequired(rw io.ReadWriter, b []byte) error {
+	req, err := ParseAuthRequest(b)
+	if err != nil {
+		return err
+	}
+	b, err = MarshalAuthReply(req.Version, socks.AuthMethodNotRequired)
+	if err != nil {
+		return err
+	}
+	n, err := rw.Write(b)
+	if err != nil {
+		return err
+	}
+	if n != len(b) {
+		return errors.New("short write")
+	}
+	return nil
+}
+
+// NoProxyRequired handles a command signaling without constructing a
+// proxy connection to the final destination.
+func NoProxyRequired(rw io.ReadWriter, b []byte) error {
+	req, err := ParseCmdRequest(b)
+	if err != nil {
+		return err
+	}
+	req.Addr.Port += 1
+	if req.Addr.Name != "" {
+		req.Addr.Name = "boundaddr.doesnotexist"
+	} else if req.Addr.IP.To4() != nil {
+		req.Addr.IP = net.IPv4(127, 0, 0, 1)
+	} else {
+		req.Addr.IP = net.IPv6loopback
+	}
+	b, err = MarshalCmdReply(socks.Version5, socks.StatusSucceeded, &req.Addr)
+	if err != nil {
+		return err
+	}
+	n, err := rw.Write(b)
+	if err != nil {
+		return err
+	}
+	if n != len(b) {
+		return errors.New("short write")
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/net/internal/sockstest/server_test.go b/vendor/golang.org/x/net/internal/sockstest/server_test.go
new file mode 100644
index 00000000..2b02d816
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/sockstest/server_test.go
@@ -0,0 +1,103 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package sockstest
+
+import (
+	"net"
+	"reflect"
+	"testing"
+
+	"golang.org/x/net/internal/socks"
+)
+
+func TestParseAuthRequest(t *testing.T) {
+	for i, tt := range []struct {
+		wire []byte
+		req  *AuthRequest
+	}{
+		{
+			[]byte{0x05, 0x00},
+			&AuthRequest{
+				socks.Version5,
+				nil,
+			},
+		},
+		{
+			[]byte{0x05, 0x01, 0xff},
+			&AuthRequest{
+				socks.Version5,
+				[]socks.AuthMethod{
+					socks.AuthMethodNoAcceptableMethods,
+				},
+			},
+		},
+		{
+			[]byte{0x05, 0x02, 0x00, 0xff},
+			&AuthRequest{
+				socks.Version5,
+				[]socks.AuthMethod{
+					socks.AuthMethodNotRequired,
+					socks.AuthMethodNoAcceptableMethods,
+				},
+			},
+		},
+
+		// corrupted requests
+		{nil, nil},
+		{[]byte{0x00, 0x01}, nil},
+		{[]byte{0x06, 0x00}, nil},
+		{[]byte{0x05, 0x02, 0x00}, nil},
+	} {
+		req, err := ParseAuthRequest(tt.wire)
+		if !reflect.DeepEqual(req, tt.req) {
+			t.Errorf("#%d: got %v, %v; want %v", i, req, err, tt.req)
+			continue
+		}
+	}
+}
+
+func TestParseCmdRequest(t *testing.T) {
+	for i, tt := range []struct {
+		wire []byte
+		req  *CmdRequest
+	}{
+		{
+			[]byte{0x05, 0x01, 0x00, 0x01, 192, 0, 2, 1, 0x17, 0x4b},
+			&CmdRequest{
+				socks.Version5,
+				socks.CmdConnect,
+				socks.Addr{
+					IP:   net.IP{192, 0, 2, 1},
+					Port: 5963,
+				},
+			},
+		},
+		{
+			[]byte{0x05, 0x01, 0x00, 0x03, 0x04, 'F', 'Q', 'D', 'N', 0x17, 0x4b},
+			&CmdRequest{
+				socks.Version5,
+				socks.CmdConnect,
+				socks.Addr{
+					Name: "FQDN",
+					Port: 5963,
+				},
+			},
+		},
+
+		// corrupted requests
+		{nil, nil},
+		{[]byte{0x05}, nil},
+		{[]byte{0x06, 0x01, 0x00, 0x01, 192, 0, 2, 2, 0x17, 0x4b}, nil},
+		{[]byte{0x05, 0x01, 0xff, 0x01, 192, 0, 2, 3}, nil},
+		{[]byte{0x05, 0x01, 0x00, 0x01, 192, 0, 2, 4}, nil},
+		{[]byte{0x05, 0x01, 0x00, 0x03, 0x04, 'F', 'Q', 'D', 'N'}, nil},
+	} {
+		req, err := ParseCmdRequest(tt.wire)
+		if !reflect.DeepEqual(req, tt.req) {
+			t.Errorf("#%d: got %v, %v; want %v", i, req, err, tt.req)
+			continue
+		}
+	}
+}
diff --git a/vendor/golang.org/x/net/ipv4/batch.go b/vendor/golang.org/x/net/ipv4/batch.go
index b4454992..5ce9b358 100644
--- a/vendor/golang.org/x/net/ipv4/batch.go
+++ b/vendor/golang.org/x/net/ipv4/batch.go
@@ -9,7 +9,6 @@ package ipv4
 import (
 	"net"
 	"runtime"
-	"syscall"
 
 	"golang.org/x/net/internal/socket"
 )
@@ -76,7 +75,7 @@ type Message = socket.Message
 // headers.
 func (c *payloadHandler) ReadBatch(ms []Message, flags int) (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	switch runtime.GOOS {
 	case "linux":
@@ -107,7 +106,7 @@ func (c *payloadHandler) ReadBatch(ms []Message, flags int) (int, error) {
 // On other platforms, this method will write only a single message.
 func (c *payloadHandler) WriteBatch(ms []Message, flags int) (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	switch runtime.GOOS {
 	case "linux":
@@ -139,7 +138,7 @@ func (c *payloadHandler) WriteBatch(ms []Message, flags int) (int, error) {
 // On other platforms, this method will read only a single message.
 func (c *packetHandler) ReadBatch(ms []Message, flags int) (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	switch runtime.GOOS {
 	case "linux":
@@ -170,7 +169,7 @@ func (c *packetHandler) ReadBatch(ms []Message, flags int) (int, error) {
 // On other platforms, this method will write only a single message.
 func (c *packetHandler) WriteBatch(ms []Message, flags int) (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	switch runtime.GOOS {
 	case "linux":
diff --git a/vendor/golang.org/x/net/ipv4/dgramopt.go b/vendor/golang.org/x/net/ipv4/dgramopt.go
index 54d77d5f..36764492 100644
--- a/vendor/golang.org/x/net/ipv4/dgramopt.go
+++ b/vendor/golang.org/x/net/ipv4/dgramopt.go
@@ -6,7 +6,6 @@ package ipv4
 
 import (
 	"net"
-	"syscall"
 
 	"golang.org/x/net/bpf"
 )
@@ -15,7 +14,7 @@ import (
 // multicast packets.
 func (c *dgramOpt) MulticastTTL() (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastTTL]
 	if !ok {
@@ -28,7 +27,7 @@ func (c *dgramOpt) MulticastTTL() (int, error) {
 // outgoing multicast packets.
 func (c *dgramOpt) SetMulticastTTL(ttl int) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastTTL]
 	if !ok {
@@ -41,7 +40,7 @@ func (c *dgramOpt) SetMulticastTTL(ttl int) error {
 // packet transmissions.
 func (c *dgramOpt) MulticastInterface() (*net.Interface, error) {
 	if !c.ok() {
-		return nil, syscall.EINVAL
+		return nil, errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastInterface]
 	if !ok {
@@ -54,7 +53,7 @@ func (c *dgramOpt) MulticastInterface() (*net.Interface, error) {
 // multicast packet transmissions.
 func (c *dgramOpt) SetMulticastInterface(ifi *net.Interface) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastInterface]
 	if !ok {
@@ -67,7 +66,7 @@ func (c *dgramOpt) SetMulticastInterface(ifi *net.Interface) error {
 // should be copied and send back to the originator.
 func (c *dgramOpt) MulticastLoopback() (bool, error) {
 	if !c.ok() {
-		return false, syscall.EINVAL
+		return false, errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastLoopback]
 	if !ok {
@@ -84,7 +83,7 @@ func (c *dgramOpt) MulticastLoopback() (bool, error) {
 // should be copied and send back to the originator.
 func (c *dgramOpt) SetMulticastLoopback(on bool) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastLoopback]
 	if !ok {
@@ -104,7 +103,7 @@ func (c *dgramOpt) SetMulticastLoopback(on bool) error {
 // configuration.
 func (c *dgramOpt) JoinGroup(ifi *net.Interface, group net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoJoinGroup]
 	if !ok {
@@ -122,7 +121,7 @@ func (c *dgramOpt) JoinGroup(ifi *net.Interface, group net.Addr) error {
 // source-specific group.
 func (c *dgramOpt) LeaveGroup(ifi *net.Interface, group net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoLeaveGroup]
 	if !ok {
@@ -143,7 +142,7 @@ func (c *dgramOpt) LeaveGroup(ifi *net.Interface, group net.Addr) error {
 // routing configuration.
 func (c *dgramOpt) JoinSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoJoinSourceGroup]
 	if !ok {
@@ -164,7 +163,7 @@ func (c *dgramOpt) JoinSourceSpecificGroup(ifi *net.Interface, group, source net
 // interface ifi.
 func (c *dgramOpt) LeaveSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoLeaveSourceGroup]
 	if !ok {
@@ -186,7 +185,7 @@ func (c *dgramOpt) LeaveSourceSpecificGroup(ifi *net.Interface, group, source ne
 // ifi.
 func (c *dgramOpt) ExcludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoBlockSourceGroup]
 	if !ok {
@@ -207,7 +206,7 @@ func (c *dgramOpt) ExcludeSourceSpecificGroup(ifi *net.Interface, group, source
 // group by ExcludeSourceSpecificGroup again on the interface ifi.
 func (c *dgramOpt) IncludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoUnblockSourceGroup]
 	if !ok {
@@ -228,7 +227,7 @@ func (c *dgramOpt) IncludeSourceSpecificGroup(ifi *net.Interface, group, source
 // Currently only Linux supports this.
 func (c *dgramOpt) ICMPFilter() (*ICMPFilter, error) {
 	if !c.ok() {
-		return nil, syscall.EINVAL
+		return nil, errInvalidConn
 	}
 	so, ok := sockOpts[ssoICMPFilter]
 	if !ok {
@@ -241,7 +240,7 @@ func (c *dgramOpt) ICMPFilter() (*ICMPFilter, error) {
 // Currently only Linux supports this.
 func (c *dgramOpt) SetICMPFilter(f *ICMPFilter) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoICMPFilter]
 	if !ok {
@@ -255,7 +254,7 @@ func (c *dgramOpt) SetICMPFilter(f *ICMPFilter) error {
 // Only supported on Linux.
 func (c *dgramOpt) SetBPF(filter []bpf.RawInstruction) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoAttachFilter]
 	if !ok {
diff --git a/vendor/golang.org/x/net/ipv4/doc.go b/vendor/golang.org/x/net/ipv4/doc.go
index b43935a5..3efa2903 100644
--- a/vendor/golang.org/x/net/ipv4/doc.go
+++ b/vendor/golang.org/x/net/ipv4/doc.go
@@ -55,7 +55,7 @@
 // Multicasting
 //
 // The options for multicasting are available for net.UDPConn and
-// net.IPconn which are created as network connections that use the
+// net.IPConn which are created as network connections that use the
 // IPv4 transport. A few network facilities must be prepared before
 // you begin multicasting, at a minimum joining network interfaces and
 // multicast groups.
@@ -241,4 +241,4 @@
 // IncludeSourceSpecificGroup may return an error.
 package ipv4 // import "golang.org/x/net/ipv4"
 
-// BUG(mikio): This package is not implemented on NaCl and Plan 9.
+// BUG(mikio): This package is not implemented on JS, NaCl and Plan 9.
diff --git a/vendor/golang.org/x/net/ipv4/endpoint.go b/vendor/golang.org/x/net/ipv4/endpoint.go
index 2ab87736..50094637 100644
--- a/vendor/golang.org/x/net/ipv4/endpoint.go
+++ b/vendor/golang.org/x/net/ipv4/endpoint.go
@@ -6,7 +6,6 @@ package ipv4
 
 import (
 	"net"
-	"syscall"
 	"time"
 
 	"golang.org/x/net/internal/socket"
@@ -58,7 +57,7 @@ func (c *dgramOpt) ok() bool { return c != nil && c.Conn != nil }
 // SetControlMessage sets the per packet IP-level socket options.
 func (c *PacketConn) SetControlMessage(cf ControlFlags, on bool) error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return setControlMessage(c.dgramOpt.Conn, &c.payloadHandler.rawOpt, cf, on)
 }
@@ -67,7 +66,7 @@ func (c *PacketConn) SetControlMessage(cf ControlFlags, on bool) error {
 // endpoint.
 func (c *PacketConn) SetDeadline(t time.Time) error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.payloadHandler.PacketConn.SetDeadline(t)
 }
@@ -76,7 +75,7 @@ func (c *PacketConn) SetDeadline(t time.Time) error {
 // endpoint.
 func (c *PacketConn) SetReadDeadline(t time.Time) error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.payloadHandler.PacketConn.SetReadDeadline(t)
 }
@@ -85,7 +84,7 @@ func (c *PacketConn) SetReadDeadline(t time.Time) error {
 // endpoint.
 func (c *PacketConn) SetWriteDeadline(t time.Time) error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.payloadHandler.PacketConn.SetWriteDeadline(t)
 }
@@ -93,7 +92,7 @@ func (c *PacketConn) SetWriteDeadline(t time.Time) error {
 // Close closes the endpoint.
 func (c *PacketConn) Close() error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.payloadHandler.PacketConn.Close()
 }
@@ -124,7 +123,7 @@ type RawConn struct {
 // SetControlMessage sets the per packet IP-level socket options.
 func (c *RawConn) SetControlMessage(cf ControlFlags, on bool) error {
 	if !c.packetHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return setControlMessage(c.dgramOpt.Conn, &c.packetHandler.rawOpt, cf, on)
 }
@@ -133,7 +132,7 @@ func (c *RawConn) SetControlMessage(cf ControlFlags, on bool) error {
 // endpoint.
 func (c *RawConn) SetDeadline(t time.Time) error {
 	if !c.packetHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.packetHandler.IPConn.SetDeadline(t)
 }
@@ -142,7 +141,7 @@ func (c *RawConn) SetDeadline(t time.Time) error {
 // endpoint.
 func (c *RawConn) SetReadDeadline(t time.Time) error {
 	if !c.packetHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.packetHandler.IPConn.SetReadDeadline(t)
 }
@@ -151,7 +150,7 @@ func (c *RawConn) SetReadDeadline(t time.Time) error {
 // endpoint.
 func (c *RawConn) SetWriteDeadline(t time.Time) error {
 	if !c.packetHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.packetHandler.IPConn.SetWriteDeadline(t)
 }
@@ -159,7 +158,7 @@ func (c *RawConn) SetWriteDeadline(t time.Time) error {
 // Close closes the endpoint.
 func (c *RawConn) Close() error {
 	if !c.packetHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.packetHandler.IPConn.Close()
 }
diff --git a/vendor/golang.org/x/net/ipv4/gen.go b/vendor/golang.org/x/net/ipv4/gen.go
index 9d490fac..1bb1737f 100644
--- a/vendor/golang.org/x/net/ipv4/gen.go
+++ b/vendor/golang.org/x/net/ipv4/gen.go
@@ -80,7 +80,7 @@ var registries = []struct {
 func geniana() error {
 	var bb bytes.Buffer
 	fmt.Fprintf(&bb, "// go generate gen.go\n")
-	fmt.Fprintf(&bb, "// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT\n\n")
+	fmt.Fprintf(&bb, "// Code generated by the command above; DO NOT EDIT.\n\n")
 	fmt.Fprintf(&bb, "package ipv4\n\n")
 	for _, r := range registries {
 		resp, err := http.Get(r.url)
diff --git a/vendor/golang.org/x/net/ipv4/genericopt.go b/vendor/golang.org/x/net/ipv4/genericopt.go
index 119bf841..587ae4a1 100644
--- a/vendor/golang.org/x/net/ipv4/genericopt.go
+++ b/vendor/golang.org/x/net/ipv4/genericopt.go
@@ -4,12 +4,10 @@
 
 package ipv4
 
-import "syscall"
-
 // TOS returns the type-of-service field value for outgoing packets.
 func (c *genericOpt) TOS() (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	so, ok := sockOpts[ssoTOS]
 	if !ok {
@@ -22,7 +20,7 @@ func (c *genericOpt) TOS() (int, error) {
 // packets.
 func (c *genericOpt) SetTOS(tos int) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoTOS]
 	if !ok {
@@ -34,7 +32,7 @@ func (c *genericOpt) SetTOS(tos int) error {
 // TTL returns the time-to-live field value for outgoing packets.
 func (c *genericOpt) TTL() (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	so, ok := sockOpts[ssoTTL]
 	if !ok {
@@ -47,7 +45,7 @@ func (c *genericOpt) TTL() (int, error) {
 // packets.
 func (c *genericOpt) SetTTL(ttl int) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoTTL]
 	if !ok {
diff --git a/vendor/golang.org/x/net/ipv4/header.go b/vendor/golang.org/x/net/ipv4/header.go
index 8bb0f0f4..a8c8f7a6 100644
--- a/vendor/golang.org/x/net/ipv4/header.go
+++ b/vendor/golang.org/x/net/ipv4/header.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"net"
 	"runtime"
-	"syscall"
 
 	"golang.org/x/net/internal/socket"
 )
@@ -52,9 +51,13 @@ func (h *Header) String() string {
 }
 
 // Marshal returns the binary encoding of h.
+//
+// The returned slice is in the format used by a raw IP socket on the
+// local system.
+// This may differ from the wire format, depending on the system.
 func (h *Header) Marshal() ([]byte, error) {
 	if h == nil {
-		return nil, syscall.EINVAL
+		return nil, errInvalidConn
 	}
 	if h.Len < HeaderLen {
 		return nil, errHeaderTooShort
@@ -98,7 +101,11 @@ func (h *Header) Marshal() ([]byte, error) {
 	return b, nil
 }
 
-// Parse parses b as an IPv4 header and sotres the result in h.
+// Parse parses b as an IPv4 header and stores the result in h.
+//
+// The provided b must be in the format used by a raw IP socket on the
+// local system.
+// This may differ from the wire format, depending on the system.
 func (h *Header) Parse(b []byte) error {
 	if h == nil || len(b) < HeaderLen {
 		return errHeaderTooShort
@@ -150,6 +157,10 @@ func (h *Header) Parse(b []byte) error {
 }
 
 // ParseHeader parses b as an IPv4 header.
+//
+// The provided b must be in the format used by a raw IP socket on the
+// local system.
+// This may differ from the wire format, depending on the system.
 func ParseHeader(b []byte) (*Header, error) {
 	h := new(Header)
 	if err := h.Parse(b); err != nil {
diff --git a/vendor/golang.org/x/net/ipv4/helper.go b/vendor/golang.org/x/net/ipv4/helper.go
index a5052e32..8d8ff98e 100644
--- a/vendor/golang.org/x/net/ipv4/helper.go
+++ b/vendor/golang.org/x/net/ipv4/helper.go
@@ -10,6 +10,7 @@ import (
 )
 
 var (
+	errInvalidConn              = errors.New("invalid connection")
 	errMissingAddress           = errors.New("missing address")
 	errMissingHeader            = errors.New("missing header")
 	errHeaderTooShort           = errors.New("header too short")
diff --git a/vendor/golang.org/x/net/ipv4/iana.go b/vendor/golang.org/x/net/ipv4/iana.go
index be10c948..4375b409 100644
--- a/vendor/golang.org/x/net/ipv4/iana.go
+++ b/vendor/golang.org/x/net/ipv4/iana.go
@@ -1,9 +1,9 @@
 // go generate gen.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; DO NOT EDIT.
 
 package ipv4
 
-// Internet Control Message Protocol (ICMP) Parameters, Updated: 2013-04-19
+// Internet Control Message Protocol (ICMP) Parameters, Updated: 2018-02-26
 const (
 	ICMPTypeEchoReply              ICMPType = 0  // Echo Reply
 	ICMPTypeDestinationUnreachable ICMPType = 3  // Destination Unreachable
@@ -16,9 +16,11 @@ const (
 	ICMPTypeTimestamp              ICMPType = 13 // Timestamp
 	ICMPTypeTimestampReply         ICMPType = 14 // Timestamp Reply
 	ICMPTypePhoturis               ICMPType = 40 // Photuris
+	ICMPTypeExtendedEchoRequest    ICMPType = 42 // Extended Echo Request
+	ICMPTypeExtendedEchoReply      ICMPType = 43 // Extended Echo Reply
 )
 
-// Internet Control Message Protocol (ICMP) Parameters, Updated: 2013-04-19
+// Internet Control Message Protocol (ICMP) Parameters, Updated: 2018-02-26
 var icmpTypes = map[ICMPType]string{
 	0:  "echo reply",
 	3:  "destination unreachable",
@@ -31,4 +33,6 @@ var icmpTypes = map[ICMPType]string{
 	13: "timestamp",
 	14: "timestamp reply",
 	40: "photuris",
+	42: "extended echo request",
+	43: "extended echo reply",
 }
diff --git a/vendor/golang.org/x/net/ipv4/multicast_test.go b/vendor/golang.org/x/net/ipv4/multicast_test.go
index bcf49736..2136a3c6 100644
--- a/vendor/golang.org/x/net/ipv4/multicast_test.go
+++ b/vendor/golang.org/x/net/ipv4/multicast_test.go
@@ -29,7 +29,7 @@ var packetConnReadWriteMulticastUDPTests = []struct {
 
 func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "solaris", "windows":
+	case "js", "nacl", "plan9", "solaris", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
@@ -117,7 +117,7 @@ var packetConnReadWriteMulticastICMPTests = []struct {
 
 func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "solaris", "windows":
+	case "js", "nacl", "plan9", "solaris", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if m, ok := nettest.SupportsRawIPSocket(); !ok {
diff --git a/vendor/golang.org/x/net/ipv4/multicastlistener_test.go b/vendor/golang.org/x/net/ipv4/multicastlistener_test.go
index e43fbbe0..ba2480e4 100644
--- a/vendor/golang.org/x/net/ipv4/multicastlistener_test.go
+++ b/vendor/golang.org/x/net/ipv4/multicastlistener_test.go
@@ -21,7 +21,7 @@ var udpMultipleGroupListenerTests = []net.Addr{
 
 func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if testing.Short() {
@@ -61,7 +61,7 @@ func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
 
 func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if testing.Short() {
@@ -116,7 +116,7 @@ func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
 
 func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if testing.Short() {
@@ -172,7 +172,7 @@ func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
 
 func TestIPSingleRawConnWithSingleGroupListener(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if testing.Short() {
@@ -217,7 +217,7 @@ func TestIPSingleRawConnWithSingleGroupListener(t *testing.T) {
 
 func TestIPPerInterfaceSingleRawConnWithSingleGroupListener(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if testing.Short() {
diff --git a/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go b/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go
index f7efac24..c0a26800 100644
--- a/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go
+++ b/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go
@@ -26,7 +26,7 @@ var packetConnMulticastSocketOptionTests = []struct {
 
 func TestPacketConnMulticastSocketOptions(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9":
+	case "js", "nacl", "plan9":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
@@ -66,7 +66,7 @@ var rawConnMulticastSocketOptionTests = []struct {
 
 func TestRawConnMulticastSocketOptions(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9":
+	case "js", "nacl", "plan9":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if m, ok := nettest.SupportsRawIPSocket(); !ok {
diff --git a/vendor/golang.org/x/net/ipv4/packet.go b/vendor/golang.org/x/net/ipv4/packet.go
index f00f5b05..966bb776 100644
--- a/vendor/golang.org/x/net/ipv4/packet.go
+++ b/vendor/golang.org/x/net/ipv4/packet.go
@@ -6,7 +6,6 @@ package ipv4
 
 import (
 	"net"
-	"syscall"
 
 	"golang.org/x/net/internal/socket"
 )
@@ -28,7 +27,7 @@ func (c *packetHandler) ok() bool { return c != nil && c.IPConn != nil && c.Conn
 // header h, the payload p and the control message cm.
 func (c *packetHandler) ReadFrom(b []byte) (h *Header, p []byte, cm *ControlMessage, err error) {
 	if !c.ok() {
-		return nil, nil, nil, syscall.EINVAL
+		return nil, nil, nil, errInvalidConn
 	}
 	return c.readFrom(b)
 }
@@ -63,7 +62,7 @@ func slicePacket(b []byte) (h, p []byte, err error) {
 //	Options       = optional
 func (c *packetHandler) WriteTo(h *Header, p []byte, cm *ControlMessage) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.writeTo(h, p, cm)
 }
diff --git a/vendor/golang.org/x/net/ipv4/payload_cmsg.go b/vendor/golang.org/x/net/ipv4/payload_cmsg.go
index 3f06d760..204a49fe 100644
--- a/vendor/golang.org/x/net/ipv4/payload_cmsg.go
+++ b/vendor/golang.org/x/net/ipv4/payload_cmsg.go
@@ -2,14 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv4
 
-import (
-	"net"
-	"syscall"
-)
+import "net"
 
 // ReadFrom reads a payload of the received IPv4 datagram, from the
 // endpoint c, copying the payload into b. It returns the number of
@@ -17,7 +14,7 @@ import (
 // src of the received datagram.
 func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.Addr, err error) {
 	if !c.ok() {
-		return 0, nil, nil, syscall.EINVAL
+		return 0, nil, nil, errInvalidConn
 	}
 	return c.readFrom(b)
 }
@@ -30,7 +27,7 @@ func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.
 // control of the outgoing datagram is not required.
 func (c *payloadHandler) WriteTo(b []byte, cm *ControlMessage, dst net.Addr) (n int, err error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	return c.writeTo(b, cm, dst)
 }
diff --git a/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go b/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go
index d26ccd90..8d45599f 100644
--- a/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go
+++ b/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build !go1.9
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go b/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go
index 2f193118..4081aad8 100644
--- a/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go
+++ b/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build go1.9
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/payload_nocmsg.go b/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
index 3926de70..1d434c61 100644
--- a/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
+++ b/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
@@ -2,14 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build nacl plan9 windows
+// +build js nacl plan9 windows
 
 package ipv4
 
-import (
-	"net"
-	"syscall"
-)
+import "net"
 
 // ReadFrom reads a payload of the received IPv4 datagram, from the
 // endpoint c, copying the payload into b. It returns the number of
@@ -17,7 +14,7 @@ import (
 // src of the received datagram.
 func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.Addr, err error) {
 	if !c.ok() {
-		return 0, nil, nil, syscall.EINVAL
+		return 0, nil, nil, errInvalidConn
 	}
 	if n, src, err = c.PacketConn.ReadFrom(b); err != nil {
 		return 0, nil, nil, err
@@ -33,7 +30,7 @@ func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.
 // control of the outgoing datagram is not required.
 func (c *payloadHandler) WriteTo(b []byte, cm *ControlMessage, dst net.Addr) (n int, err error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	if dst == nil {
 		return 0, errMissingAddress
diff --git a/vendor/golang.org/x/net/ipv4/readwrite_go1_8_test.go b/vendor/golang.org/x/net/ipv4/readwrite_go1_8_test.go
index 1cd926e7..83bf927e 100644
--- a/vendor/golang.org/x/net/ipv4/readwrite_go1_8_test.go
+++ b/vendor/golang.org/x/net/ipv4/readwrite_go1_8_test.go
@@ -22,7 +22,7 @@ import (
 
 func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		b.Skipf("not supported on %s", runtime.GOOS)
 	}
 
@@ -126,7 +126,7 @@ func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
 
 func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 
diff --git a/vendor/golang.org/x/net/ipv4/readwrite_go1_9_test.go b/vendor/golang.org/x/net/ipv4/readwrite_go1_9_test.go
index 365de022..ef76c8a7 100644
--- a/vendor/golang.org/x/net/ipv4/readwrite_go1_9_test.go
+++ b/vendor/golang.org/x/net/ipv4/readwrite_go1_9_test.go
@@ -22,7 +22,7 @@ import (
 
 func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		b.Skipf("not supported on %s", runtime.GOOS)
 	}
 
@@ -172,7 +172,7 @@ func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
 
 func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 
diff --git a/vendor/golang.org/x/net/ipv4/readwrite_test.go b/vendor/golang.org/x/net/ipv4/readwrite_test.go
index 3896a8ae..1b7f7488 100644
--- a/vendor/golang.org/x/net/ipv4/readwrite_test.go
+++ b/vendor/golang.org/x/net/ipv4/readwrite_test.go
@@ -61,7 +61,7 @@ func BenchmarkReadWriteUnicast(b *testing.B) {
 
 func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 
diff --git a/vendor/golang.org/x/net/ipv4/unicast_test.go b/vendor/golang.org/x/net/ipv4/unicast_test.go
index 02c089f0..274a558c 100644
--- a/vendor/golang.org/x/net/ipv4/unicast_test.go
+++ b/vendor/golang.org/x/net/ipv4/unicast_test.go
@@ -20,7 +20,7 @@ import (
 
 func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
@@ -71,7 +71,7 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
 
 func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if m, ok := nettest.SupportsRawIPSocket(); !ok {
@@ -157,7 +157,7 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
 
 func TestRawConnReadWriteUnicastICMP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if m, ok := nettest.SupportsRawIPSocket(); !ok {
diff --git a/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go b/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go
index db5213b9..2bfda7ff 100644
--- a/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go
+++ b/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go
@@ -16,7 +16,7 @@ import (
 
 func TestConnUnicastSocketOptions(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
@@ -62,7 +62,7 @@ var packetConnUnicastSocketOptionTests = []struct {
 
 func TestPacketConnUnicastSocketOptions(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
@@ -88,7 +88,7 @@ func TestPacketConnUnicastSocketOptions(t *testing.T) {
 
 func TestRawConnUnicastSocketOptions(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if m, ok := nettest.SupportsRawIPSocket(); !ok {
diff --git a/vendor/golang.org/x/net/ipv6/batch.go b/vendor/golang.org/x/net/ipv6/batch.go
index 4f5fe683..10d64924 100644
--- a/vendor/golang.org/x/net/ipv6/batch.go
+++ b/vendor/golang.org/x/net/ipv6/batch.go
@@ -9,7 +9,6 @@ package ipv6
 import (
 	"net"
 	"runtime"
-	"syscall"
 
 	"golang.org/x/net/internal/socket"
 )
@@ -67,7 +66,7 @@ type Message = socket.Message
 // On other platforms, this method will read only a single message.
 func (c *payloadHandler) ReadBatch(ms []Message, flags int) (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	switch runtime.GOOS {
 	case "linux":
@@ -98,7 +97,7 @@ func (c *payloadHandler) ReadBatch(ms []Message, flags int) (int, error) {
 // On other platforms, this method will write only a single message.
 func (c *payloadHandler) WriteBatch(ms []Message, flags int) (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	switch runtime.GOOS {
 	case "linux":
diff --git a/vendor/golang.org/x/net/ipv6/dgramopt.go b/vendor/golang.org/x/net/ipv6/dgramopt.go
index 703dafe8..eea4fde2 100644
--- a/vendor/golang.org/x/net/ipv6/dgramopt.go
+++ b/vendor/golang.org/x/net/ipv6/dgramopt.go
@@ -6,7 +6,6 @@ package ipv6
 
 import (
 	"net"
-	"syscall"
 
 	"golang.org/x/net/bpf"
 )
@@ -15,7 +14,7 @@ import (
 // multicast packets.
 func (c *dgramOpt) MulticastHopLimit() (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastHopLimit]
 	if !ok {
@@ -28,7 +27,7 @@ func (c *dgramOpt) MulticastHopLimit() (int, error) {
 // outgoing multicast packets.
 func (c *dgramOpt) SetMulticastHopLimit(hoplim int) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastHopLimit]
 	if !ok {
@@ -41,7 +40,7 @@ func (c *dgramOpt) SetMulticastHopLimit(hoplim int) error {
 // packet transmissions.
 func (c *dgramOpt) MulticastInterface() (*net.Interface, error) {
 	if !c.ok() {
-		return nil, syscall.EINVAL
+		return nil, errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastInterface]
 	if !ok {
@@ -54,7 +53,7 @@ func (c *dgramOpt) MulticastInterface() (*net.Interface, error) {
 // multicast packet transmissions.
 func (c *dgramOpt) SetMulticastInterface(ifi *net.Interface) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastInterface]
 	if !ok {
@@ -67,7 +66,7 @@ func (c *dgramOpt) SetMulticastInterface(ifi *net.Interface) error {
 // should be copied and send back to the originator.
 func (c *dgramOpt) MulticastLoopback() (bool, error) {
 	if !c.ok() {
-		return false, syscall.EINVAL
+		return false, errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastLoopback]
 	if !ok {
@@ -84,7 +83,7 @@ func (c *dgramOpt) MulticastLoopback() (bool, error) {
 // should be copied and send back to the originator.
 func (c *dgramOpt) SetMulticastLoopback(on bool) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoMulticastLoopback]
 	if !ok {
@@ -104,7 +103,7 @@ func (c *dgramOpt) SetMulticastLoopback(on bool) error {
 // configuration.
 func (c *dgramOpt) JoinGroup(ifi *net.Interface, group net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoJoinGroup]
 	if !ok {
@@ -122,7 +121,7 @@ func (c *dgramOpt) JoinGroup(ifi *net.Interface, group net.Addr) error {
 // source-specific group.
 func (c *dgramOpt) LeaveGroup(ifi *net.Interface, group net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoLeaveGroup]
 	if !ok {
@@ -143,7 +142,7 @@ func (c *dgramOpt) LeaveGroup(ifi *net.Interface, group net.Addr) error {
 // routing configuration.
 func (c *dgramOpt) JoinSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoJoinSourceGroup]
 	if !ok {
@@ -164,7 +163,7 @@ func (c *dgramOpt) JoinSourceSpecificGroup(ifi *net.Interface, group, source net
 // interface ifi.
 func (c *dgramOpt) LeaveSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoLeaveSourceGroup]
 	if !ok {
@@ -186,7 +185,7 @@ func (c *dgramOpt) LeaveSourceSpecificGroup(ifi *net.Interface, group, source ne
 // ifi.
 func (c *dgramOpt) ExcludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoBlockSourceGroup]
 	if !ok {
@@ -207,7 +206,7 @@ func (c *dgramOpt) ExcludeSourceSpecificGroup(ifi *net.Interface, group, source
 // group by ExcludeSourceSpecificGroup again on the interface ifi.
 func (c *dgramOpt) IncludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoUnblockSourceGroup]
 	if !ok {
@@ -230,7 +229,7 @@ func (c *dgramOpt) IncludeSourceSpecificGroup(ifi *net.Interface, group, source
 // field is located.
 func (c *dgramOpt) Checksum() (on bool, offset int, err error) {
 	if !c.ok() {
-		return false, 0, syscall.EINVAL
+		return false, 0, errInvalidConn
 	}
 	so, ok := sockOpts[ssoChecksum]
 	if !ok {
@@ -251,7 +250,7 @@ func (c *dgramOpt) Checksum() (on bool, offset int, err error) {
 // checksum field is located.
 func (c *dgramOpt) SetChecksum(on bool, offset int) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoChecksum]
 	if !ok {
@@ -266,7 +265,7 @@ func (c *dgramOpt) SetChecksum(on bool, offset int) error {
 // ICMPFilter returns an ICMP filter.
 func (c *dgramOpt) ICMPFilter() (*ICMPFilter, error) {
 	if !c.ok() {
-		return nil, syscall.EINVAL
+		return nil, errInvalidConn
 	}
 	so, ok := sockOpts[ssoICMPFilter]
 	if !ok {
@@ -278,7 +277,7 @@ func (c *dgramOpt) ICMPFilter() (*ICMPFilter, error) {
 // SetICMPFilter deploys the ICMP filter.
 func (c *dgramOpt) SetICMPFilter(f *ICMPFilter) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoICMPFilter]
 	if !ok {
@@ -292,7 +291,7 @@ func (c *dgramOpt) SetICMPFilter(f *ICMPFilter) error {
 // Only supported on Linux.
 func (c *dgramOpt) SetBPF(filter []bpf.RawInstruction) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoAttachFilter]
 	if !ok {
diff --git a/vendor/golang.org/x/net/ipv6/doc.go b/vendor/golang.org/x/net/ipv6/doc.go
index 664a97de..e0be9d50 100644
--- a/vendor/golang.org/x/net/ipv6/doc.go
+++ b/vendor/golang.org/x/net/ipv6/doc.go
@@ -56,7 +56,7 @@
 // Multicasting
 //
 // The options for multicasting are available for net.UDPConn and
-// net.IPconn which are created as network connections that use the
+// net.IPConn which are created as network connections that use the
 // IPv6 transport. A few network facilities must be prepared before
 // you begin multicasting, at a minimum joining network interfaces and
 // multicast groups.
@@ -240,4 +240,4 @@
 // IncludeSourceSpecificGroup may return an error.
 package ipv6 // import "golang.org/x/net/ipv6"
 
-// BUG(mikio): This package is not implemented on NaCl and Plan 9.
+// BUG(mikio): This package is not implemented on JS, NaCl and Plan 9.
diff --git a/vendor/golang.org/x/net/ipv6/endpoint.go b/vendor/golang.org/x/net/ipv6/endpoint.go
index 0624c174..93257563 100644
--- a/vendor/golang.org/x/net/ipv6/endpoint.go
+++ b/vendor/golang.org/x/net/ipv6/endpoint.go
@@ -6,7 +6,6 @@ package ipv6
 
 import (
 	"net"
-	"syscall"
 	"time"
 
 	"golang.org/x/net/internal/socket"
@@ -34,7 +33,7 @@ func (c *genericOpt) ok() bool { return c != nil && c.Conn != nil }
 // with the endpoint.
 func (c *Conn) PathMTU() (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	so, ok := sockOpts[ssoPathMTU]
 	if !ok {
@@ -76,7 +75,7 @@ func (c *dgramOpt) ok() bool { return c != nil && c.Conn != nil }
 // socket options.
 func (c *PacketConn) SetControlMessage(cf ControlFlags, on bool) error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return setControlMessage(c.dgramOpt.Conn, &c.payloadHandler.rawOpt, cf, on)
 }
@@ -85,7 +84,7 @@ func (c *PacketConn) SetControlMessage(cf ControlFlags, on bool) error {
 // endpoint.
 func (c *PacketConn) SetDeadline(t time.Time) error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.payloadHandler.SetDeadline(t)
 }
@@ -94,7 +93,7 @@ func (c *PacketConn) SetDeadline(t time.Time) error {
 // endpoint.
 func (c *PacketConn) SetReadDeadline(t time.Time) error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.payloadHandler.SetReadDeadline(t)
 }
@@ -103,7 +102,7 @@ func (c *PacketConn) SetReadDeadline(t time.Time) error {
 // endpoint.
 func (c *PacketConn) SetWriteDeadline(t time.Time) error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.payloadHandler.SetWriteDeadline(t)
 }
@@ -111,7 +110,7 @@ func (c *PacketConn) SetWriteDeadline(t time.Time) error {
 // Close closes the endpoint.
 func (c *PacketConn) Close() error {
 	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	return c.payloadHandler.Close()
 }
diff --git a/vendor/golang.org/x/net/ipv6/gen.go b/vendor/golang.org/x/net/ipv6/gen.go
index 47b7e9f0..5885664f 100644
--- a/vendor/golang.org/x/net/ipv6/gen.go
+++ b/vendor/golang.org/x/net/ipv6/gen.go
@@ -80,7 +80,7 @@ var registries = []struct {
 func geniana() error {
 	var bb bytes.Buffer
 	fmt.Fprintf(&bb, "// go generate gen.go\n")
-	fmt.Fprintf(&bb, "// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT\n\n")
+	fmt.Fprintf(&bb, "// Code generated by the command above; DO NOT EDIT.\n\n")
 	fmt.Fprintf(&bb, "package ipv6\n\n")
 	for _, r := range registries {
 		resp, err := http.Get(r.url)
diff --git a/vendor/golang.org/x/net/ipv6/genericopt.go b/vendor/golang.org/x/net/ipv6/genericopt.go
index e9dbc2e1..1a18f754 100644
--- a/vendor/golang.org/x/net/ipv6/genericopt.go
+++ b/vendor/golang.org/x/net/ipv6/genericopt.go
@@ -4,13 +4,11 @@
 
 package ipv6
 
-import "syscall"
-
 // TrafficClass returns the traffic class field value for outgoing
 // packets.
 func (c *genericOpt) TrafficClass() (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	so, ok := sockOpts[ssoTrafficClass]
 	if !ok {
@@ -23,7 +21,7 @@ func (c *genericOpt) TrafficClass() (int, error) {
 // outgoing packets.
 func (c *genericOpt) SetTrafficClass(tclass int) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoTrafficClass]
 	if !ok {
@@ -35,7 +33,7 @@ func (c *genericOpt) SetTrafficClass(tclass int) error {
 // HopLimit returns the hop limit field value for outgoing packets.
 func (c *genericOpt) HopLimit() (int, error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	so, ok := sockOpts[ssoHopLimit]
 	if !ok {
@@ -48,7 +46,7 @@ func (c *genericOpt) HopLimit() (int, error) {
 // packets.
 func (c *genericOpt) SetHopLimit(hoplim int) error {
 	if !c.ok() {
-		return syscall.EINVAL
+		return errInvalidConn
 	}
 	so, ok := sockOpts[ssoHopLimit]
 	if !ok {
diff --git a/vendor/golang.org/x/net/ipv6/helper.go b/vendor/golang.org/x/net/ipv6/helper.go
index 25974013..7ac53522 100644
--- a/vendor/golang.org/x/net/ipv6/helper.go
+++ b/vendor/golang.org/x/net/ipv6/helper.go
@@ -10,6 +10,7 @@ import (
 )
 
 var (
+	errInvalidConn     = errors.New("invalid connection")
 	errMissingAddress  = errors.New("missing address")
 	errHeaderTooShort  = errors.New("header too short")
 	errInvalidConnType = errors.New("invalid conn type")
diff --git a/vendor/golang.org/x/net/ipv6/iana.go b/vendor/golang.org/x/net/ipv6/iana.go
index 3c6214fb..32db1aa9 100644
--- a/vendor/golang.org/x/net/ipv6/iana.go
+++ b/vendor/golang.org/x/net/ipv6/iana.go
@@ -1,9 +1,9 @@
 // go generate gen.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; DO NOT EDIT.
 
 package ipv6
 
-// Internet Control Message Protocol version 6 (ICMPv6) Parameters, Updated: 2015-07-07
+// Internet Control Message Protocol version 6 (ICMPv6) Parameters, Updated: 2018-03-09
 const (
 	ICMPTypeDestinationUnreachable                ICMPType = 1   // Destination Unreachable
 	ICMPTypePacketTooBig                          ICMPType = 2   // Packet Too Big
@@ -40,9 +40,11 @@ const (
 	ICMPTypeDuplicateAddressRequest               ICMPType = 157 // Duplicate Address Request
 	ICMPTypeDuplicateAddressConfirmation          ICMPType = 158 // Duplicate Address Confirmation
 	ICMPTypeMPLControl                            ICMPType = 159 // MPL Control Message
+	ICMPTypeExtendedEchoRequest                   ICMPType = 160 // Extended Echo Request
+	ICMPTypeExtendedEchoReply                     ICMPType = 161 // Extended Echo Reply
 )
 
-// Internet Control Message Protocol version 6 (ICMPv6) Parameters, Updated: 2015-07-07
+// Internet Control Message Protocol version 6 (ICMPv6) Parameters, Updated: 2018-03-09
 var icmpTypes = map[ICMPType]string{
 	1:   "destination unreachable",
 	2:   "packet too big",
@@ -79,4 +81,6 @@ var icmpTypes = map[ICMPType]string{
 	157: "duplicate address request",
 	158: "duplicate address confirmation",
 	159: "mpl control message",
+	160: "extended echo request",
+	161: "extended echo reply",
 }
diff --git a/vendor/golang.org/x/net/ipv6/icmp_test.go b/vendor/golang.org/x/net/ipv6/icmp_test.go
index d8e9675d..bdde2fdb 100644
--- a/vendor/golang.org/x/net/ipv6/icmp_test.go
+++ b/vendor/golang.org/x/net/ipv6/icmp_test.go
@@ -34,7 +34,7 @@ func TestICMPString(t *testing.T) {
 
 func TestICMPFilter(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 
@@ -61,7 +61,7 @@ func TestICMPFilter(t *testing.T) {
 
 func TestSetICMPFilter(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
diff --git a/vendor/golang.org/x/net/ipv6/multicast_test.go b/vendor/golang.org/x/net/ipv6/multicast_test.go
index 69a21cd3..50442c36 100644
--- a/vendor/golang.org/x/net/ipv6/multicast_test.go
+++ b/vendor/golang.org/x/net/ipv6/multicast_test.go
@@ -29,7 +29,7 @@ var packetConnReadWriteMulticastUDPTests = []struct {
 
 func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -129,7 +129,7 @@ var packetConnReadWriteMulticastICMPTests = []struct {
 
 func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
diff --git a/vendor/golang.org/x/net/ipv6/multicastlistener_test.go b/vendor/golang.org/x/net/ipv6/multicastlistener_test.go
index b27713e2..1ee0549d 100644
--- a/vendor/golang.org/x/net/ipv6/multicastlistener_test.go
+++ b/vendor/golang.org/x/net/ipv6/multicastlistener_test.go
@@ -21,7 +21,7 @@ var udpMultipleGroupListenerTests = []net.Addr{
 
 func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -61,7 +61,7 @@ func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
 
 func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -116,7 +116,7 @@ func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
 
 func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -172,7 +172,7 @@ func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
 
 func TestIPSinglePacketConnWithSingleGroupListener(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -216,7 +216,7 @@ func TestIPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
 	switch runtime.GOOS {
 	case "darwin", "dragonfly", "openbsd": // platforms that return fe80::1%lo0: bind: can't assign requested address
 		t.Skipf("not supported on %s", runtime.GOOS)
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
diff --git a/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go b/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go
index 9e6b902d..9906e876 100644
--- a/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go
+++ b/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go
@@ -26,7 +26,7 @@ var packetConnMulticastSocketOptionTests = []struct {
 
 func TestPacketConnMulticastSocketOptions(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
diff --git a/vendor/golang.org/x/net/ipv6/payload_cmsg.go b/vendor/golang.org/x/net/ipv6/payload_cmsg.go
index 4ee4b062..3f23b5d2 100644
--- a/vendor/golang.org/x/net/ipv6/payload_cmsg.go
+++ b/vendor/golang.org/x/net/ipv6/payload_cmsg.go
@@ -2,14 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv6
 
-import (
-	"net"
-	"syscall"
-)
+import "net"
 
 // ReadFrom reads a payload of the received IPv6 datagram, from the
 // endpoint c, copying the payload into b. It returns the number of
@@ -17,7 +14,7 @@ import (
 // src of the received datagram.
 func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.Addr, err error) {
 	if !c.ok() {
-		return 0, nil, nil, syscall.EINVAL
+		return 0, nil, nil, errInvalidConn
 	}
 	return c.readFrom(b)
 }
@@ -29,7 +26,7 @@ func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.
 // cm may be nil if control of the outgoing datagram is not required.
 func (c *payloadHandler) WriteTo(b []byte, cm *ControlMessage, dst net.Addr) (n int, err error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	return c.writeTo(b, cm, dst)
 }
diff --git a/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go b/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go
index fdc6c399..bc4209db 100644
--- a/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go
+++ b/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build !go1.9
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go b/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go
index 8f6d02e2..7dd65048 100644
--- a/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go
+++ b/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build go1.9
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/payload_nocmsg.go b/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
index 99a43542..459142d2 100644
--- a/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
+++ b/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
@@ -2,14 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build nacl plan9 windows
+// +build js nacl plan9 windows
 
 package ipv6
 
-import (
-	"net"
-	"syscall"
-)
+import "net"
 
 // ReadFrom reads a payload of the received IPv6 datagram, from the
 // endpoint c, copying the payload into b. It returns the number of
@@ -17,7 +14,7 @@ import (
 // src of the received datagram.
 func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.Addr, err error) {
 	if !c.ok() {
-		return 0, nil, nil, syscall.EINVAL
+		return 0, nil, nil, errInvalidConn
 	}
 	if n, src, err = c.PacketConn.ReadFrom(b); err != nil {
 		return 0, nil, nil, err
@@ -32,7 +29,7 @@ func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.
 // cm may be nil if control of the outgoing datagram is not required.
 func (c *payloadHandler) WriteTo(b []byte, cm *ControlMessage, dst net.Addr) (n int, err error) {
 	if !c.ok() {
-		return 0, syscall.EINVAL
+		return 0, errInvalidConn
 	}
 	if dst == nil {
 		return 0, errMissingAddress
diff --git a/vendor/golang.org/x/net/ipv6/readwrite_go1_8_test.go b/vendor/golang.org/x/net/ipv6/readwrite_go1_8_test.go
index c11d92ae..b3fbda13 100644
--- a/vendor/golang.org/x/net/ipv6/readwrite_go1_8_test.go
+++ b/vendor/golang.org/x/net/ipv6/readwrite_go1_8_test.go
@@ -22,7 +22,7 @@ import (
 
 func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		b.Skipf("not supported on %s", runtime.GOOS)
 	}
 
@@ -123,7 +123,7 @@ func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
 
 func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 
diff --git a/vendor/golang.org/x/net/ipv6/readwrite_go1_9_test.go b/vendor/golang.org/x/net/ipv6/readwrite_go1_9_test.go
index e2fd7337..7110619b 100644
--- a/vendor/golang.org/x/net/ipv6/readwrite_go1_9_test.go
+++ b/vendor/golang.org/x/net/ipv6/readwrite_go1_9_test.go
@@ -22,7 +22,7 @@ import (
 
 func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		b.Skipf("not supported on %s", runtime.GOOS)
 	}
 
@@ -169,7 +169,7 @@ func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
 
 func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 
diff --git a/vendor/golang.org/x/net/ipv6/readwrite_test.go b/vendor/golang.org/x/net/ipv6/readwrite_test.go
index 206b915c..668208f2 100644
--- a/vendor/golang.org/x/net/ipv6/readwrite_test.go
+++ b/vendor/golang.org/x/net/ipv6/readwrite_test.go
@@ -65,7 +65,7 @@ func BenchmarkReadWriteUnicast(b *testing.B) {
 
 func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
diff --git a/vendor/golang.org/x/net/ipv6/sockopt_test.go b/vendor/golang.org/x/net/ipv6/sockopt_test.go
index 774338db..add045e3 100644
--- a/vendor/golang.org/x/net/ipv6/sockopt_test.go
+++ b/vendor/golang.org/x/net/ipv6/sockopt_test.go
@@ -19,7 +19,7 @@ var supportsIPv6 bool = nettest.SupportsIPv6()
 
 func TestConnInitiatorPathMTU(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -57,7 +57,7 @@ func TestConnInitiatorPathMTU(t *testing.T) {
 
 func TestConnResponderPathMTU(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -95,7 +95,7 @@ func TestConnResponderPathMTU(t *testing.T) {
 
 func TestPacketConnChecksum(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
diff --git a/vendor/golang.org/x/net/ipv6/unicast_test.go b/vendor/golang.org/x/net/ipv6/unicast_test.go
index a0b7d955..159bb39b 100644
--- a/vendor/golang.org/x/net/ipv6/unicast_test.go
+++ b/vendor/golang.org/x/net/ipv6/unicast_test.go
@@ -20,7 +20,7 @@ import (
 
 func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -78,7 +78,7 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
 
 func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
diff --git a/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go b/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go
index e175dccf..69adefe8 100644
--- a/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go
+++ b/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go
@@ -16,7 +16,7 @@ import (
 
 func TestConnUnicastSocketOptions(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
@@ -61,7 +61,7 @@ var packetConnUnicastSocketOptionTests = []struct {
 
 func TestPacketConnUnicastSocketOptions(t *testing.T) {
 	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
+	case "js", "nacl", "plan9", "windows":
 		t.Skipf("not supported on %s", runtime.GOOS)
 	}
 	if !supportsIPv6 {
diff --git a/vendor/golang.org/x/net/netutil/listen.go b/vendor/golang.org/x/net/netutil/listen.go
index 56f43bf6..cee46e33 100644
--- a/vendor/golang.org/x/net/netutil/listen.go
+++ b/vendor/golang.org/x/net/netutil/listen.go
@@ -14,27 +14,53 @@ import (
 // LimitListener returns a Listener that accepts at most n simultaneous
 // connections from the provided Listener.
 func LimitListener(l net.Listener, n int) net.Listener {
-	return &limitListener{l, make(chan struct{}, n)}
+	return &limitListener{
+		Listener: l,
+		sem:      make(chan struct{}, n),
+		done:     make(chan struct{}),
+	}
 }
 
 type limitListener struct {
 	net.Listener
-	sem chan struct{}
+	sem       chan struct{}
+	closeOnce sync.Once     // ensures the done chan is only closed once
+	done      chan struct{} // no values sent; closed when Close is called
 }
 
-func (l *limitListener) acquire() { l.sem <- struct{}{} }
+// acquire acquires the limiting semaphore. Returns true if successfully
+// accquired, false if the listener is closed and the semaphore is not
+// acquired.
+func (l *limitListener) acquire() bool {
+	select {
+	case <-l.done:
+		return false
+	case l.sem <- struct{}{}:
+		return true
+	}
+}
 func (l *limitListener) release() { <-l.sem }
 
 func (l *limitListener) Accept() (net.Conn, error) {
-	l.acquire()
+	acquired := l.acquire()
+	// If the semaphore isn't acquired because the listener was closed, expect
+	// that this call to accept won't block, but immediately return an error.
 	c, err := l.Listener.Accept()
 	if err != nil {
-		l.release()
+		if acquired {
+			l.release()
+		}
 		return nil, err
 	}
 	return &limitListenerConn{Conn: c, release: l.release}, nil
 }
 
+func (l *limitListener) Close() error {
+	err := l.Listener.Close()
+	l.closeOnce.Do(func() { close(l.done) })
+	return err
+}
+
 type limitListenerConn struct {
 	net.Conn
 	releaseOnce sync.Once
diff --git a/vendor/golang.org/x/net/netutil/listen_test.go b/vendor/golang.org/x/net/netutil/listen_test.go
index 5e07d7be..f40c9aa9 100644
--- a/vendor/golang.org/x/net/netutil/listen_test.go
+++ b/vendor/golang.org/x/net/netutil/listen_test.go
@@ -99,3 +99,49 @@ func TestLimitListenerError(t *testing.T) {
 		t.Fatal("timeout. deadlock?")
 	}
 }
+
+func TestLimitListenerClose(t *testing.T) {
+	ln, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer ln.Close()
+	ln = LimitListener(ln, 1)
+
+	doneCh := make(chan struct{})
+	defer close(doneCh)
+	go func() {
+		c, err := net.Dial("tcp", ln.Addr().String())
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer c.Close()
+		<-doneCh
+	}()
+
+	c, err := ln.Accept()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer c.Close()
+
+	acceptDone := make(chan struct{})
+	go func() {
+		c, err := ln.Accept()
+		if err == nil {
+			c.Close()
+			t.Errorf("Unexpected successful Accept()")
+		}
+		close(acceptDone)
+	}()
+
+	// Wait a tiny bit to ensure the Accept() is blocking.
+	time.Sleep(10 * time.Millisecond)
+	ln.Close()
+
+	select {
+	case <-acceptDone:
+	case <-time.After(5 * time.Second):
+		t.Fatalf("Accept() still blocking")
+	}
+}
diff --git a/vendor/golang.org/x/net/proxy/proxy_test.go b/vendor/golang.org/x/net/proxy/proxy_test.go
index 0f31e211..0be1b422 100644
--- a/vendor/golang.org/x/net/proxy/proxy_test.go
+++ b/vendor/golang.org/x/net/proxy/proxy_test.go
@@ -7,14 +7,12 @@ package proxy
 import (
 	"bytes"
 	"fmt"
-	"io"
-	"net"
 	"net/url"
 	"os"
-	"strconv"
 	"strings"
-	"sync"
 	"testing"
+
+	"golang.org/x/net/internal/sockstest"
 )
 
 type proxyFromEnvTest struct {
@@ -73,131 +71,41 @@ func TestFromEnvironment(t *testing.T) {
 }
 
 func TestFromURL(t *testing.T) {
-	endSystem, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("net.Listen failed: %v", err)
-	}
-	defer endSystem.Close()
-	gateway, err := net.Listen("tcp", "127.0.0.1:0")
+	ss, err := sockstest.NewServer(sockstest.NoAuthRequired, sockstest.NoProxyRequired)
 	if err != nil {
-		t.Fatalf("net.Listen failed: %v", err)
+		t.Fatal(err)
 	}
-	defer gateway.Close()
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go socks5Gateway(t, gateway, endSystem, socks5Domain, &wg)
-
-	url, err := url.Parse("socks5://user:password@" + gateway.Addr().String())
+	defer ss.Close()
+	url, err := url.Parse("socks5://user:password@" + ss.Addr().String())
 	if err != nil {
-		t.Fatalf("url.Parse failed: %v", err)
+		t.Fatal(err)
 	}
-	proxy, err := FromURL(url, Direct)
+	proxy, err := FromURL(url, nil)
 	if err != nil {
-		t.Fatalf("FromURL failed: %v", err)
+		t.Fatal(err)
 	}
-	_, port, err := net.SplitHostPort(endSystem.Addr().String())
+	c, err := proxy.Dial("tcp", "fqdn.doesnotexist:5963")
 	if err != nil {
-		t.Fatalf("net.SplitHostPort failed: %v", err)
-	}
-	if c, err := proxy.Dial("tcp", "localhost:"+port); err != nil {
-		t.Fatalf("FromURL.Dial failed: %v", err)
-	} else {
-		c.Close()
+		t.Fatal(err)
 	}
-
-	wg.Wait()
+	c.Close()
 }
 
 func TestSOCKS5(t *testing.T) {
-	endSystem, err := net.Listen("tcp", "127.0.0.1:0")
+	ss, err := sockstest.NewServer(sockstest.NoAuthRequired, sockstest.NoProxyRequired)
 	if err != nil {
-		t.Fatalf("net.Listen failed: %v", err)
+		t.Fatal(err)
 	}
-	defer endSystem.Close()
-	gateway, err := net.Listen("tcp", "127.0.0.1:0")
+	defer ss.Close()
+	proxy, err := SOCKS5("tcp", ss.Addr().String(), nil, nil)
 	if err != nil {
-		t.Fatalf("net.Listen failed: %v", err)
+		t.Fatal(err)
 	}
-	defer gateway.Close()
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go socks5Gateway(t, gateway, endSystem, socks5IP4, &wg)
-
-	proxy, err := SOCKS5("tcp", gateway.Addr().String(), nil, Direct)
+	c, err := proxy.Dial("tcp", ss.TargetAddr().String())
 	if err != nil {
-		t.Fatalf("SOCKS5 failed: %v", err)
-	}
-	if c, err := proxy.Dial("tcp", endSystem.Addr().String()); err != nil {
-		t.Fatalf("SOCKS5.Dial failed: %v", err)
-	} else {
-		c.Close()
-	}
-
-	wg.Wait()
-}
-
-func socks5Gateway(t *testing.T, gateway, endSystem net.Listener, typ byte, wg *sync.WaitGroup) {
-	defer wg.Done()
-
-	c, err := gateway.Accept()
-	if err != nil {
-		t.Errorf("net.Listener.Accept failed: %v", err)
-		return
-	}
-	defer c.Close()
-
-	b := make([]byte, 32)
-	var n int
-	if typ == socks5Domain {
-		n = 4
-	} else {
-		n = 3
-	}
-	if _, err := io.ReadFull(c, b[:n]); err != nil {
-		t.Errorf("io.ReadFull failed: %v", err)
-		return
-	}
-	if _, err := c.Write([]byte{socks5Version, socks5AuthNone}); err != nil {
-		t.Errorf("net.Conn.Write failed: %v", err)
-		return
-	}
-	if typ == socks5Domain {
-		n = 16
-	} else {
-		n = 10
-	}
-	if _, err := io.ReadFull(c, b[:n]); err != nil {
-		t.Errorf("io.ReadFull failed: %v", err)
-		return
-	}
-	if b[0] != socks5Version || b[1] != socks5Connect || b[2] != 0x00 || b[3] != typ {
-		t.Errorf("got an unexpected packet: %#02x %#02x %#02x %#02x", b[0], b[1], b[2], b[3])
-		return
-	}
-	if typ == socks5Domain {
-		copy(b[:5], []byte{socks5Version, 0x00, 0x00, socks5Domain, 9})
-		b = append(b, []byte("localhost")...)
-	} else {
-		copy(b[:4], []byte{socks5Version, 0x00, 0x00, socks5IP4})
-	}
-	host, port, err := net.SplitHostPort(endSystem.Addr().String())
-	if err != nil {
-		t.Errorf("net.SplitHostPort failed: %v", err)
-		return
-	}
-	b = append(b, []byte(net.ParseIP(host).To4())...)
-	p, err := strconv.Atoi(port)
-	if err != nil {
-		t.Errorf("strconv.Atoi failed: %v", err)
-		return
-	}
-	b = append(b, []byte{byte(p >> 8), byte(p)}...)
-	if _, err := c.Write(b); err != nil {
-		t.Errorf("net.Conn.Write failed: %v", err)
-		return
+		t.Fatal(err)
 	}
+	c.Close()
 }
 
 func ResetProxyEnv() {
diff --git a/vendor/golang.org/x/net/proxy/socks5.go b/vendor/golang.org/x/net/proxy/socks5.go
index 3fed38ef..56345ec8 100644
--- a/vendor/golang.org/x/net/proxy/socks5.go
+++ b/vendor/golang.org/x/net/proxy/socks5.go
@@ -5,210 +5,32 @@
 package proxy
 
 import (
-	"errors"
-	"io"
+	"context"
 	"net"
-	"strconv"
-)
-
-// SOCKS5 returns a Dialer that makes SOCKSv5 connections to the given address
-// with an optional username and password. See RFC 1928 and RFC 1929.
-func SOCKS5(network, addr string, auth *Auth, forward Dialer) (Dialer, error) {
-	s := &socks5{
-		network: network,
-		addr:    addr,
-		forward: forward,
-	}
-	if auth != nil {
-		s.user = auth.User
-		s.password = auth.Password
-	}
-
-	return s, nil
-}
 
-type socks5 struct {
-	user, password string
-	network, addr  string
-	forward        Dialer
-}
-
-const socks5Version = 5
-
-const (
-	socks5AuthNone     = 0
-	socks5AuthPassword = 2
+	"golang.org/x/net/internal/socks"
 )
 
-const socks5Connect = 1
-
-const (
-	socks5IP4    = 1
-	socks5Domain = 3
-	socks5IP6    = 4
-)
-
-var socks5Errors = []string{
-	"",
-	"general failure",
-	"connection forbidden",
-	"network unreachable",
-	"host unreachable",
-	"connection refused",
-	"TTL expired",
-	"command not supported",
-	"address type not supported",
-}
-
-// Dial connects to the address addr on the given network via the SOCKS5 proxy.
-func (s *socks5) Dial(network, addr string) (net.Conn, error) {
-	switch network {
-	case "tcp", "tcp6", "tcp4":
-	default:
-		return nil, errors.New("proxy: no support for SOCKS5 proxy connections of type " + network)
-	}
-
-	conn, err := s.forward.Dial(s.network, s.addr)
-	if err != nil {
-		return nil, err
-	}
-	if err := s.connect(conn, addr); err != nil {
-		conn.Close()
-		return nil, err
-	}
-	return conn, nil
-}
-
-// connect takes an existing connection to a socks5 proxy server,
-// and commands the server to extend that connection to target,
-// which must be a canonical address with a host and port.
-func (s *socks5) connect(conn net.Conn, target string) error {
-	host, portStr, err := net.SplitHostPort(target)
-	if err != nil {
-		return err
-	}
-
-	port, err := strconv.Atoi(portStr)
-	if err != nil {
-		return errors.New("proxy: failed to parse port number: " + portStr)
-	}
-	if port < 1 || port > 0xffff {
-		return errors.New("proxy: port number out of range: " + portStr)
-	}
-
-	// the size here is just an estimate
-	buf := make([]byte, 0, 6+len(host))
-
-	buf = append(buf, socks5Version)
-	if len(s.user) > 0 && len(s.user) < 256 && len(s.password) < 256 {
-		buf = append(buf, 2 /* num auth methods */, socks5AuthNone, socks5AuthPassword)
-	} else {
-		buf = append(buf, 1 /* num auth methods */, socks5AuthNone)
-	}
-
-	if _, err := conn.Write(buf); err != nil {
-		return errors.New("proxy: failed to write greeting to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-		return errors.New("proxy: failed to read greeting from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-	if buf[0] != 5 {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " has unexpected version " + strconv.Itoa(int(buf[0])))
-	}
-	if buf[1] == 0xff {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " requires authentication")
-	}
-
-	// See RFC 1929
-	if buf[1] == socks5AuthPassword {
-		buf = buf[:0]
-		buf = append(buf, 1 /* password protocol version */)
-		buf = append(buf, uint8(len(s.user)))
-		buf = append(buf, s.user...)
-		buf = append(buf, uint8(len(s.password)))
-		buf = append(buf, s.password...)
-
-		if _, err := conn.Write(buf); err != nil {
-			return errors.New("proxy: failed to write authentication request to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-		}
-
-		if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-			return errors.New("proxy: failed to read authentication reply from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-		}
-
-		if buf[1] != 0 {
-			return errors.New("proxy: SOCKS5 proxy at " + s.addr + " rejected username/password")
+// SOCKS5 returns a Dialer that makes SOCKSv5 connections to the given
+// address with an optional username and password.
+// See RFC 1928 and RFC 1929.
+func SOCKS5(network, address string, auth *Auth, forward Dialer) (Dialer, error) {
+	d := socks.NewDialer(network, address)
+	if forward != nil {
+		d.ProxyDial = func(_ context.Context, network string, address string) (net.Conn, error) {
+			return forward.Dial(network, address)
 		}
 	}
-
-	buf = buf[:0]
-	buf = append(buf, socks5Version, socks5Connect, 0 /* reserved */)
-
-	if ip := net.ParseIP(host); ip != nil {
-		if ip4 := ip.To4(); ip4 != nil {
-			buf = append(buf, socks5IP4)
-			ip = ip4
-		} else {
-			buf = append(buf, socks5IP6)
-		}
-		buf = append(buf, ip...)
-	} else {
-		if len(host) > 255 {
-			return errors.New("proxy: destination host name too long: " + host)
+	if auth != nil {
+		up := socks.UsernamePassword{
+			Username: auth.User,
+			Password: auth.Password,
 		}
-		buf = append(buf, socks5Domain)
-		buf = append(buf, byte(len(host)))
-		buf = append(buf, host...)
-	}
-	buf = append(buf, byte(port>>8), byte(port))
-
-	if _, err := conn.Write(buf); err != nil {
-		return errors.New("proxy: failed to write connect request to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	if _, err := io.ReadFull(conn, buf[:4]); err != nil {
-		return errors.New("proxy: failed to read connect reply from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	failure := "unknown error"
-	if int(buf[1]) < len(socks5Errors) {
-		failure = socks5Errors[buf[1]]
-	}
-
-	if len(failure) > 0 {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " failed to connect: " + failure)
-	}
-
-	bytesToDiscard := 0
-	switch buf[3] {
-	case socks5IP4:
-		bytesToDiscard = net.IPv4len
-	case socks5IP6:
-		bytesToDiscard = net.IPv6len
-	case socks5Domain:
-		_, err := io.ReadFull(conn, buf[:1])
-		if err != nil {
-			return errors.New("proxy: failed to read domain length from SOCKS5 proxy at " + s.addr + ": " + err.Error())
+		d.AuthMethods = []socks.AuthMethod{
+			socks.AuthMethodNotRequired,
+			socks.AuthMethodUsernamePassword,
 		}
-		bytesToDiscard = int(buf[0])
-	default:
-		return errors.New("proxy: got unknown address type " + strconv.Itoa(int(buf[3])) + " from SOCKS5 proxy at " + s.addr)
-	}
-
-	if cap(buf) < bytesToDiscard {
-		buf = make([]byte, bytesToDiscard)
-	} else {
-		buf = buf[:bytesToDiscard]
-	}
-	if _, err := io.ReadFull(conn, buf); err != nil {
-		return errors.New("proxy: failed to read address from SOCKS5 proxy at " + s.addr + ": " + err.Error())
+		d.Authenticate = up.Authenticate
 	}
-
-	// Also need to discard the port number
-	if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-		return errors.New("proxy: failed to read port from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	return nil
+	return d, nil
 }
diff --git a/vendor/golang.org/x/net/publicsuffix/list.go b/vendor/golang.org/x/net/publicsuffix/list.go
index 8bbf3bcd..fea98a8f 100644
--- a/vendor/golang.org/x/net/publicsuffix/list.go
+++ b/vendor/golang.org/x/net/publicsuffix/list.go
@@ -5,8 +5,43 @@
 //go:generate go run gen.go
 
 // Package publicsuffix provides a public suffix list based on data from
-// http://publicsuffix.org/. A public suffix is one under which Internet users
-// can directly register names.
+// https://publicsuffix.org/
+//
+// A public suffix is one under which Internet users can directly register
+// names. It is related to, but different from, a TLD (top level domain).
+//
+// "com" is a TLD (top level domain). Top level means it has no dots.
+//
+// "com" is also a public suffix. Amazon and Google have registered different
+// siblings under that domain: "amazon.com" and "google.com".
+//
+// "au" is another TLD, again because it has no dots. But it's not "amazon.au".
+// Instead, it's "amazon.com.au".
+//
+// "com.au" isn't an actual TLD, because it's not at the top level (it has
+// dots). But it is an eTLD (effective TLD), because that's the branching point
+// for domain name registrars.
+//
+// Another name for "an eTLD" is "a public suffix". Often, what's more of
+// interest is the eTLD+1, or one more label than the public suffix. For
+// example, browsers partition read/write access to HTTP cookies according to
+// the eTLD+1. Web pages served from "amazon.com.au" can't read cookies from
+// "google.com.au", but web pages served from "maps.google.com" can share
+// cookies from "www.google.com", so you don't have to sign into Google Maps
+// separately from signing into Google Web Search. Note that all four of those
+// domains have 3 labels and 2 dots. The first two domains are each an eTLD+1,
+// the last two are not (but share the same eTLD+1: "google.com").
+//
+// All of these domains have the same eTLD+1:
+//  - "www.books.amazon.co.uk"
+//  - "books.amazon.co.uk"
+//  - "amazon.co.uk"
+// Specifically, the eTLD+1 is "amazon.co.uk", because the eTLD is "co.uk".
+//
+// There is no closed form algorithm to calculate the eTLD of a domain.
+// Instead, the calculation is data driven. This package provides a
+// pre-compiled snapshot of Mozilla's PSL (Public Suffix List) data at
+// https://publicsuffix.org/
 package publicsuffix // import "golang.org/x/net/publicsuffix"
 
 // TODO: specify case sensitivity and leading/trailing dot behavior for
diff --git a/vendor/golang.org/x/net/publicsuffix/table.go b/vendor/golang.org/x/net/publicsuffix/table.go
index a870b36c..1bdecb66 100644
--- a/vendor/golang.org/x/net/publicsuffix/table.go
+++ b/vendor/golang.org/x/net/publicsuffix/table.go
@@ -2,7 +2,7 @@
 
 package publicsuffix
 
-const version = "publicsuffix.org's public_suffix_list.dat, git revision 0f3b07d9aab6d6c9fe74990af98316468d40f488 (2018-01-25T09:22:16Z)"
+const version = "publicsuffix.org's public_suffix_list.dat, git revision 545c3f0754686c54b449a63dc00f5110a28bd94e (2018-07-25T21:31:09Z)"
 
 const (
 	nodesBitsChildren   = 10
@@ -26,461 +26,473 @@ const (
 const numTLD = 1551
 
 // Text is the combined text of all labels.
-const text = "0emmafann-arboretumbriamallamaceiobihirosakikamijimatsuzaki234li" +
-	"ma-cityeatselinogradult3l3p0rtargets-itargivestbytomaritimekeepi" +
-	"ng120009guacuiababia-goracleaningroks-theatreeastcoastaldefencea" +
-	"tonsbergjemnes3-ap-northeast-1337bilbaogashimadachicagoboats3-we" +
-	"bsite-us-east-1billustrationikonanporovnopocznoppdalindesnes3-we" +
-	"bsite-us-west-1biobirdartcenterprisesakimobetsuitainairforcechir" +
-	"ealminamiechizeninohekinannestadiybirkenesoddtangenovaranzanpach" +
-	"igasakievennodesaarlandnpanasonicateringebuilderschmidtre-gaulda" +
-	"livornobirthplacebitballooningladefinimakanegasakinkobayashikaoi" +
-	"rminamifuranobjarkoybjerkreimbananarepublicasadelamonedatingjesd" +
-	"alimitediscountysvardolls3-eu-west-3utilitiesquare7bjugninomiyak" +
-	"onojorpelandrangedalombardiamonds3-website-us-west-2blancomedica" +
-	"ltanissettaipeiheijinuyamashinatsukigatakasagotpantheonsitebloom" +
-	"bergbauernuorochesterbloxcms5ybluedancebmoattachmentsakyotanabel" +
-	"lunord-aurdalvdalcesalangenirasakinvestmentsalondonetskarmoybmsa" +
-	"ltdalombardynamisches-dnsaludray-dnsupdaternopilawawebspacebmwed" +
-	"dinglassassinationalheritagebnpparibaselburgleezebnrwedeployboml" +
-	"oansalvadordalibabalsanagochihayaakasakawaharaholtalenvironmenta" +
-	"lconservationishiazainzais-a-candidatebondrayddnsfreebox-osascol" +
-	"i-picenordre-landraydnsalzburgliwicebonnishigobookinglobalashovh" +
-	"achinohedmarkarpaczeladzparaglidingloboavistaprintelligencebooml" +
-	"adbrokesamegawabootsamnangerboschaefflerdalwaysdatabaseballangen" +
-	"oamishirasatochigiessensiositelekommunikationishiharabostikaruiz" +
-	"awabostonakijinsekikogentinglogowegroweibolognagasukebotanicalga" +
-	"rdenishiizunazukis-a-catererbotanicgardenishikatakayamatsushigeb" +
-	"otanybouncemerckmsdnipropetrovskjervoyagebounty-fullensakerrypro" +
-	"pertiesampagespeedmobilizeroboutiquebecatholicaxiascolipicenodum" +
-	"inamiiselectjomemorialomzaporizhzheguris-a-celticsfanishikatsura" +
-	"git-repostfoldnavybozentsujiiebplacedekagaminord-odalondrinaples" +
-	"amsclubindalorenskogloppenzaolbia-tempio-olbiatempioolbialystokk" +
-	"embuchikumagayagawakuyabukihokumakogenglandrivelandrobaknoluokta" +
-	"chikawakkanaibetsubamericanfamilydscloudcontrolappspotagerbrandy" +
-	"winevalleybrasiliabrindisibenikebristoloseyouripirangapartmentsa" +
-	"msungmbhartiffanybritishcolumbialowiezachpomorskienishikawazukam" +
-	"itsuebroadcastlefrakkestadrudunsandvikcoromantovalle-d-aostathel" +
-	"lebroadwaybroke-itjxjavald-aostaplesanfranciscofreakunemurorange" +
-	"iseiyoichippubetsubetsugarugbyengerdalaskanittedallasalleasingle" +
-	"surancertmgretagajobojis-a-chefarmsteadupontariodejaneirodoybrok" +
-	"erbronnoysundurbanamexnetlifyis-a-conservativefsnillfjordurhambu" +
-	"rgminakamichiharabrothermesaverdeatnurembergmodellingmxn--0trq7p" +
-	"7nnishimerabrowsersafetymarketsangobrumunddalotenkawabrunelastic" +
-	"beanstalkarumaifarsundyndns-at-workinggrouparisor-fronishinomiya" +
-	"shironobrusselsanjotkmaxxn--11b4c3dyndns-blogdnsannanishinoomote" +
-	"gobruxellesannohelplfinancialottebryanskleppgafanquannefrankfurt" +
-	"ksatxn--12c1fe0bradescorporationishinoshimatsuurabrynewjerseybus" +
-	"kerudinewportlligatmparliamentoyosatoyonakagyokutoyokawabuzenish" +
-	"iokoppegardyndns-freeboxoslodingenishitosashimizunaminamibosognd" +
-	"alottokorozawabuzzweirbwfashionishiwakis-a-cpadualstackspace-to-" +
-	"rentalstomakomaibarabzhitomirumalatvuopmicrolightingrimstadyndns" +
-	"-homednsanokasaokaminokawanishiaizubangecommunitysnesardegnaroyc" +
-	"omobaracomparemarkerryhotelsardiniacompute-1computerhistoryofsci" +
-	"ence-fictioncomsecuritytacticsarlutskashiwazakiyosemitecondoshic" +
-	"hinohealth-carereformitakeharaconferenceconstructionconsuladohar" +
-	"uovatrani-andria-barletta-trani-andriaconsultanthropologyconsult" +
-	"ingvolluxembourgruecontactraniandriabarlettatraniandriacontagema" +
-	"tsubaracontemporaryarteducationalchikugojomedio-campidano-medioc" +
-	"ampidanomediocontractorskenconventureshinodearthdfcbankasukabedz" +
-	"in-the-bandaioiraseeklogest-mon-blogueurovisionionjukudoyamainte" +
-	"nancebetsuikidsmynasushiobarackmazerbaijan-mayenebakkeshibechamb" +
-	"agriculturennebudapest-a-la-masionthewifiat-band-campaniacooking" +
-	"channelsdvrdnsdojoetsuwanouchikujogaszczytnordlandyndns-weberlin" +
-	"colncoolkuszkolahppiacenzagancooperativano-frankivskodjeffersonc" +
-	"openhagencyclopedichernivtsiciliacorsicagliaribeiraokinawashiros" +
-	"atochiokinoshimaizuruhrcorvettemasekasumigaurawa-mazowszextraspa" +
-	"cekitagatajirissagamiharacosenzakopanerairguardiannakadomarinebr" +
-	"askaunjargalsaceocosidnsfor-better-thanawatchesarpsborguitarsaru" +
-	"futsunomiyawakasaikaitakoelncostumedizinhistorischesasayamacouch" +
-	"potatofriesasebofagecounciluxurycouponsaskatchewancoursesassaris" +
-	"-a-doctoraycq-acranbrookuwanalyticsaudacreditcardyndns-wikiracre" +
-	"ditunioncremonashgabadaddjaguarqhachiojiyahoooshikamaishimodatec" +
-	"rewhoswhokksundyndns-workisboringujoinvillewismillercricketrzync" +
-	"rimeast-kazakhstanangercrotonexus-3crownprovidercrsvparsauherady" +
-	"ndns1cruisesavannahgacryptonomichigangwoncuisinellair-traffic-co" +
-	"ntrolleyculturalcentertainmentranoycuneocupcakecuritibaghdadynns" +
-	"aves-the-whalessandria-trani-barletta-andriatranibarlettaandriac" +
-	"xn--12cfi8ixb8luzerncyberlevagangaviikanonjis-a-financialadvisor" +
-	"-aurdalvivanovodkamisatokashikiwakunigamiharufcfancymrussiacyona" +
-	"barulsandoycyoutheworkpccwiiheyakagefgushikamifuranorth-kazakhst" +
-	"anfhvalerfidonnakanotoddenfieldynvpnchernovtsykkylvenetogakushim" +
-	"otoganewyorkshirecipesaro-urbino-pesarourbinopesaromasvuotnakaiw" +
-	"amizawassamukawataricohdatsunanjoburgriwataraidyndns-iparmattele" +
-	"fonicapitalonewspaperfigueresinstagingxn--1ctwolominamatakkokami" +
-	"noyamaxunusualpersonfilateliafilegearfilminamimakis-a-geekaszuby" +
-	"finalfinancefineartscholarshipschoolfinlandyroyrvikingulenfinnoy" +
-	"firebaseappartis-a-greenfirenzefirestonefirmdaleirvikatowicefish" +
-	"ingolffanschulefitjarfitnessettlementransurlfjalerflesbergflickr" +
-	"agerotikakamigaharaflightschwarzgwangjuniperflirflogintohmalvika" +
-	"tsushikabeeldengeluidfloraflorencefloridavvesiidazaifudaigokasel" +
-	"jordfloripaderbornfloristanohatakahamamurogawaflorogerschweizflo" +
-	"wersciencecentersciencehistoryflynnhosting-clusterflynnhubarclay" +
-	"s3-sa-east-1fndfor-ourfor-someeresistancefor-theaterforexrothach" +
-	"irogatakamoriokalmykiaforgotdnscientistockholmestrandforli-cesen" +
-	"a-forlicesenaforlikescandynamic-dnscjohnsonforsaleitungsenforsan" +
-	"dasuoloftrapaniizafortalfortmissoulancashireggio-calabriafortwor" +
-	"thadanorthwesternmutualforuminamiminowafosnescotlandfotaruis-a-g" +
-	"urufoxfordebianfozorafredrikstadtvscrapper-sitefreeddnsgeekgalax" +
-	"yfreemasonryfreesitevadsochildrensgardenfreetlscrappingfreiburgf" +
-	"reightravelchannelfreseniuscountryestateofdelawarezzoologyfribou" +
-	"rgfriuli-v-giuliafriuli-ve-giuliafriuli-vegiuliafriuli-venezia-g" +
-	"iuliafriuli-veneziagiuliafriuli-vgiuliafriuliv-giuliafriulive-gi" +
-	"uliafriulivegiuliafriulivenezia-giuliafriuliveneziagiuliafriuliv" +
-	"giuliafrlfroganscrysechirurgiens-dentistes-en-francefrognfroland" +
-	"from-akrehamnfrom-alfrom-arfrom-azfrom-canonoichinomiyakefrom-co" +
-	"dynaliasdaburfrom-ctravelersinsurancefrom-dchiryukyuragifuchungb" +
-	"ukharafrom-dedyn-ip24from-flanderservegame-serversicherungfrom-g" +
-	"ausdalfrom-higashiagatsumagoianiafrom-iafrom-idfrom-ilfrom-inche" +
-	"onfrom-kservehalflifestylefrom-kyowariasahikawafrom-lancasterfro" +
-	"m-mangonohejis-a-hard-workerfrom-mdfrom-meethnologyfrom-mifunefr" +
-	"om-mnfrom-modalenfrom-mservehttpartnerservehumourfrom-mtnfrom-nc" +
-	"hitachinakagawatchandclockashibatakashimarumorimachidafrom-ndfro" +
-	"m-nefrom-nh-servebbserveirchitosetogitsuliguriafrom-njaworznotog" +
-	"awafrom-nminamiogunicomcastresindeviceserveminecraftrdfrom-nv-in" +
-	"foodnetworkshoppingfrom-nyfrom-ohtawaramotoineppuboliviajessheim" +
-	"periafrom-oketohnoshooguyfrom-orfrom-padovaksdalfrom-pratohobby-" +
-	"sitexashorokanaiefrom-rivnefrom-schoenbrunnfrom-sdfrom-tnfrom-tx" +
-	"n--1lqs03nfrom-utazuerichardlillehammerfeste-ipartservemp3from-v" +
-	"al-daostavalleyfrom-vtrentino-a-adigefrom-wafrom-wielunnerfrom-w" +
-	"valled-aostatoilfrom-wyfrosinonefrostalowa-wolawafroyahikobeardu" +
-	"baiduckdnservep2partyfstavernfujiiderafujikawaguchikonefujiminok" +
-	"amoenairtelecitychyattorneyagawakeisenbahnfujinomiyadafujiokayam" +
-	"angyshlakasamatsudontexistmein-vigorgefujisatoshonairtrafficplex" +
-	"us-1fujisawafujishiroishidakabiratoridefensells-for-lesservepics" +
-	"ervequakefujitsurugashimaringatlantakaharufujixeroxn--1lqs71dfuj" +
-	"iyoshidafukayabeatservesarcasmatartanddesignfukuchiyamadafukudom" +
-	"inichocolatelevisionissedalouvreisenisshingugefukuis-a-hunterfuk" +
-	"umitsubishigakirovogradoyfukuokazakiryuohadselfipasadenaritakura" +
-	"shikis-a-knightpointtokamachintaifun-dnsaliasiafukuroishikarikat" +
-	"urindalfukusakisarazurewebsiteshikagamiishibukawafukuyamagatakah" +
-	"ashimamakishiwadafunabashiriuchinadafunagatakahatakaishimogosenf" +
-	"unahashikamiamakusatsumasendaisennangoodyearfundaciofuoiskujukur" +
-	"iyamaniwakuratextileksvikatsuyamarylandfuosskoczowildlifedorainf" +
-	"racloudcontrolledogawarabikomaezakirunore-og-uvdalfurnitureggio-" +
-	"emilia-romagnakatombetsumitakagiizefurubirafurudonostiaarpassage" +
-	"nservicesettsurgeonshalloffameloyalistjordalshalsenfurukawais-a-" +
-	"landscaperfusodegaurafussaikisofukushimannorfolkebiblelveruminam" +
-	"isanrikubetsupportrentino-aadigefutabayamaguchinomigawafutboldly" +
-	"goingnowhere-for-morenakatsugawafuttsurugiminamitanefuturecmseva" +
-	"stopolefuturehostingfuturemailingfvgfylkesbiblackfridayfyresdalh" +
-	"angoutsystemscloudfunctionsevenassisicilyhannanmokuizumodenakaya" +
-	"mapassenger-associationhannosegawahanyuzenhapmirhareidsbergenhar" +
-	"stadharvestcelebrationhasamarburghasaminami-alpssells-itrentino-" +
-	"altoadigehashbanghasudahasura-appatriahasvikazohatogayaitakanabe" +
-	"autysfjordhatoyamazakitakamiizumisanofidelityhatsukaichikaiseis-" +
-	"a-linux-useranishiaritabashijonawatehattfjelldalhayashimamotobun" +
-	"gotakadapliernewmexicoalhazuminobusellsyourhomegoodsewilliamhill" +
-	"hbodoes-itvedestrandhelsinkitakatakanezawahembygdsforbundhemnesh" +
-	"aris-a-llamarriottrentino-s-tirollagrigentomologyeonggiehtavuoat" +
-	"nagaivuotnagaokakyotambabydgoszczecinemaceratabusebastopologyeon" +
-	"gnamegawakayamadridhemsedalhepforgeherokussldheroyhgtvalledaosta" +
-	"vangerhigashichichibunkyonanaoshimageandsoundandvisionhigashihir" +
-	"oshimanehigashiizumozakitakyushuaiahigashikagawahigashikagurasoe" +
-	"dahigashikawakitaaikitamihamadahigashikurumeguromskoghigashimats" +
-	"ushimarcheapaviancargodaddyn-vpnplus-2higashimatsuyamakitaakitad" +
-	"aitoigawahigashimurayamamotorcyclesharpfizerhigashinarusembokuki" +
-	"tamotosumy-routerhigashinehigashiomihachimanaustdalhigashiosakas" +
-	"ayamanakakogawahigashishirakawamatakaokaluganskydivinghigashisum" +
-	"iyoshikawaminamiaikitanakagusukumodernhigashitsunoshiroomurahiga" +
-	"shiurausukitashiobarahigashiyamatokoriyamanashifteditchyouripgfo" +
-	"ggiahigashiyodogawahigashiyoshinogaris-a-musicianhiraizumisatoka" +
-	"izukamakurazakitaurayasudahirakatashinagawahiranais-a-nascarfanh" +
-	"irarahiratsukagawahirayaizuwakamatsubushikusakadogawahistorichou" +
-	"seshawaiijimaritimoduminamiyamashirokawanabelembetsukubankazunow" +
-	"tvallee-aosteroyhitachiomiyagildeskaliszhitachiotagoperauniteroi" +
-	"zumizakisosakitagawahitraeumtgeradellogliastradinghjartdalhjelme" +
-	"landholeckobierzyceholidayhomeipharmacienshellaspeziahomelinkddi" +
-	"elddanuorrikuzentakataiwanairlinedre-eikerhomelinuxn--1qqw23ahom" +
-	"eofficehomesecuritymacaparecidahomesecuritypchofunatoriginsurecr" +
-	"eationiyodogawahomesenseminehomeunixn--2m4a15ehondahoneywellbein" +
-	"gzonehongotembaixadahonjyoitakarazukameokameyamatotakadahorninda" +
-	"lhorseoullensvanguardhortendofinternet-dnshimojis-a-nurservebeer" +
-	"hospitalhoteleshimokawahotmailhoyangerhoylandetroitskypehumaniti" +
-	"eshimokitayamahurdalhurumajis-a-painteractivegarsheis-a-patsfanh" +
-	"yllestadhyogoris-a-personaltrainerhyugawarahyundaiwafunejewelryj" +
-	"ewishartgalleryjfkharkovanylvenicejgorajlcube-serverrankoshigaya" +
-	"kumoldelmenhorstalbanshinichinanjlljmphilatelyjnjcphiladelphiaar" +
-	"eadmyblogsitejoyentrentino-sued-tiroljoyokaichibalatinoipifonymi" +
-	"nanojpmorganjpnjprshinjournalismailillesandefjordjurkoshunantank" +
-	"hmelnitskiyamarylhurstjohnkosugekotohiradomainshinjukumanokotour" +
-	"akouhokutamakis-a-techietis-a-photographerokuappharmacyshimonita" +
-	"yanagithubusercontentrentino-stirolkounosupplieshinkamigotoyohas" +
-	"himotottoris-a-therapistoiakouyamashikekouzushimashikis-an-accou" +
-	"ntantshimonosekikawakozagawakozakis-an-actorkozowinbarrel-of-kno" +
-	"wledgeologyonagoyaustrheimatunduhrennesoyolasitebizenakasatsunai" +
-	"rportland-4-salernoboribetsucks3-eu-central-1kpnkppspdnshinshino" +
-	"tsurgerykrasnodarkredstonekristiansandcatshinshirokristiansundkr" +
-	"odsheradkrokstadelvaldaostarnbergkrymincommbankhmelnytskyivaokum" +
-	"atorinokumejimasoykumenantokonamegatakatoris-an-actresshimosuwal" +
-	"kis-a-playerkunisakis-an-anarchistoricalsocietykunitachiarailway" +
-	"kunitomigusukumamotoyamashikokuchuokunneppugliakunstsammlungkuns" +
-	"tunddesignkuokgrouphoenixn--30rr7ykurehabmerkurgankurobelaudible" +
-	"borkangerkurogiminamiashigarakuroisoftwarendalenugkuromatsunais-" +
-	"an-artisteinkjerusalembroiderykurotakikawasakis-an-engineeringku" +
-	"shirogawakustanais-an-entertainerkusupplykutchanelkutnokuzumakis" +
-	"-bykvafjordkvalsundkvamfamberkeleykvanangenkvinesdalkvinnheradkv" +
-	"iteseidskogkvitsoykwpspiegelkzmitoyoakemiuramiyazumiyotamanomjon" +
-	"dalenmlbfanmonstermontrealestatefarmequipmentrentinoa-adigemonza" +
-	"-brianzaporizhzhiamonza-e-della-brianzapposhintomikasaharamonzab" +
-	"rianzaptokyotangotsukitahatakamatsukawamonzaebrianzaramonzaedell" +
-	"abrianzamoonscalemoparachutingmordoviamoriyamatsumotofukemoriyos" +
-	"himinamiawajikis-into-animeiwamarshallstatebankfhappoumormonmout" +
-	"hagakhanamigawamoroyamatsunomortgagemoscowindmillmoseushistorymo" +
-	"sjoenmoskeneshinyoshitomiokamogawamosshiojirishirifujiedamosvikn" +
-	"x-serveronamsskoganeis-a-rockstarachowicemoteginowaniihamatamaka" +
-	"wajimansionshioyanaizumoviemovimientolgamovistargardmtpchoyodoba" +
-	"shichikashukujitawaramtranbymuenstermuginozawaonsenmuikamisunaga" +
-	"wamukodairamulhouserveblogspotrentinoaadigemunakatanemuncienciam" +
-	"uosattemuphonefosshirahamatonbetsurnadalmurmanskolobrzegersundmu" +
-	"rotorcraftrentinoalto-adigemusashimurayamatsusakahoginankokubunj" +
-	"is-into-carshimotsukemusashinoharamuseetrentinoaltoadigemuseumve" +
-	"renigingmusicarbonia-iglesias-carboniaiglesiascarboniamutsuzawam" +
-	"y-vigorlicemy-wanggouvicenzamyactivedirectorymyasustor-elvdalmyc" +
-	"dn77-securecifedexhibitionmyddnskingmydissentrentinos-tirolmydro" +
-	"boehringerikemydshirakofuefukihaborokunohealthcareershiranukanag" +
-	"awamyeffectrentinostirolmyfirewallonieruchomoscienceandindustryn" +
-	"myfritzmyftpaccesshiraois-into-cartoonshimotsumamyhome-serversai" +
-	"lleshiraokananiimihoboleslawiechristiansburgrondarmykolaivaporcl" +
-	"oudmymailermymediapchristmasakinderoymyokohamamatsudamypephotogr" +
-	"aphysiomypetshiratakahagitlabormyphotoshibalestrandabergamoareke" +
-	"ymachinewhampshirebungoonombresciamypsxn--32vp30hagebostadmysecu" +
-	"ritycamerakermyshopblockshishikuis-into-gamessinazawamytis-a-boo" +
-	"kkeeperugiamytuleapiagetmyipictetrentinosud-tirolmyvnchromedicin" +
-	"akamagayachtsantabarbaramywireitrentinosudtirolpinkomaganepionee" +
-	"rpippulawypiszpittsburghofauskedsmokorsetagayasells-for-unzenpiw" +
-	"atepixolinopizzapkomakiyosunndalplanetariuminnesotaketakatsukis-" +
-	"certifieducatorahimeshimamateramobilyplantationplantshitaramapla" +
-	"tformshangrilanshizukuishimofusaitamatsukuris-lostre-toteneis-a-" +
-	"republicancerresearchaeologicaliforniaplaystationplazaplchungnam" +
-	"dalseidfjordyndns-mailucaniaplumbingoplurinacionalpmnpodzonepohl" +
-	"poivronpokerpokrovskomatsushimasfjordenpoliticarrierpolitiendapo" +
-	"lkowicepoltavalle-aostarostwodzislawindowshizuokanazawapomorzesz" +
-	"owinnershoujis-not-certifiedunetbankhakassiapordenonepornporsang" +
-	"erporsanguidell-ogliastraderporsgrunnanyokoshibahikariwanumatake" +
-	"tomisatoshimapoznanpraxis-a-bruinsfanprdpreservationpresidioprgm" +
-	"rprimeldalprincipeprivatizehealthinsuranceprochowiceproductionsh" +
-	"owaprofesionalprogressivegaskvolloabathsbchurchaseljeepsongdalen" +
-	"viknaharimalopolskanlandyndns-office-on-the-webcampinashikiminoh" +
-	"kurapromombetsurfbsbxn--12co0c3b4evalleaostaticsavonarusawaprope" +
-	"rtyprotectionprotonetrentinosued-tirolprudentialpruszkowioshowti" +
-	"memergencyahabahcavuotnagarahkkeravjuegoshikikonaikawachinaganoh" +
-	"aramcoachampionshiphoptobishimagentositecnologiaprzeworskogptplu" +
-	"sgardenpupictureshisognepvhaibarakitahiroshimaoris-a-lawyerpvtre" +
-	"ntinosuedtirolpwciprianiigataishinomakindlegnicafederationpzqldq" +
-	"ponqslgbtrentoyonezawaquicksyteshriramlidlugolekafjordquipelemen" +
-	"tsienarutomobellevuelosangelesjabbottrevisohughesigdalqvcirclego" +
-	"doesntexisteingeekashiharasrtroandinosaurepaircraftrogstadsrvare" +
-	"servecounterstrikestoragestordalstoregontrailroadstorfjordstorjd" +
-	"evcloudfrontdoorstpetersburgstreamsterdamnserverbaniastudiostudy" +
-	"ndns-at-homedepotenzamamidsundstuff-4-salestufftoread-booksnesir" +
-	"dalstuttgartromsakakinokiasusakis-savedsusonosuzakaniepcesuzukan" +
-	"makiwiensuzukis-slickharkivalleeaosteigensvalbardunloppacificirc" +
-	"ustomersveiosvelvikomvuxn--2scrj9choshibuyachiyodavvenjargaulard" +
-	"alowiczest-le-patronsvizzerasvn-reposjcbnlswedenswidnicartoonart" +
-	"decologiaswiebodzindianapolis-a-bloggerswiftcoverswinoujsciencea" +
-	"ndhistoryswisshikis-uberleetrentino-sud-tirolsynology-dslingtush" +
-	"uissier-justicetuvalle-daostatic-accessnoasaitotaltuxfamilytwmai" +
-	"lvenneslaskerrylogisticsokaneyamazoevestfoldvestnesokndalvestre-" +
-	"slidrepbodynathomebuiltrusteevestre-totennishiawakuravestvagoyve" +
-	"velstadvibo-valentiavibovalentiavideovillasnesoddenmarkhangelskj" +
-	"akdnepropetrovskiervaapsteiermarkongsvingervinnicasacamdvrcampin" +
-	"agrandebugattipschlesischesolarssonvinnytsiavipsinaappiemontevir" +
-	"giniavirtualvirtueeldomeindianmarketingvirtuelvisakegawaviterbok" +
-	"nowsitallvivoldavixn--3bst00misakis-foundationvlaanderenvladikav" +
-	"kazimierz-dolnyvladimirvlogoipilotshisuifuelblagdenesnaaseraling" +
-	"enkainanaejrietisalatinabenonichryslervolkswagentsolognevologdan" +
-	"skoninjambylvolvolkenkundenvolyngdalvossevangenvotevotingvotoyon" +
-	"owiwatsukiyonoticiaskimitsubatamibudejjuedischesapeakebayernrtrv" +
-	"arggatromsojamisonwloclawekonsulatrobeepilepsydneywmflabsolundbe" +
-	"ckommuneworldworse-thandawowitdkonskowolayangrouphilipsynology-d" +
-	"iskstationwpdevcloudwritesthisblogsytewroclawithgoogleapisa-hock" +
-	"eynutsiracusakatakinouewtcmisasaguris-gonewtfbx-ostrowwlkpmgunma" +
-	"nxn--1ck2e1barclaycards3-fips-us-gov-west-1wuozuwwwithyoutubenev" +
-	"entoeidsvollwzmiuwajimaxn--42c2d9axn--45br5cylxn--45brj9citadeli" +
-	"veryxn--45q11citichernigovernmentoyotaris-a-cubicle-slavellinota" +
-	"irestaurantoyotomiyazakis-a-democratoyotsukaidoxn--4gbriminingxn" +
-	"--4it168dxn--4it797kooris-a-soxfanxn--4pvxs4allxn--54b7fta0ccivi" +
-	"laviationxn--55qw42gxn--55qx5dxn--5js045dxn--5rtp49civilisationx" +
-	"n--5rtq34kopervikhersonxn--5su34j936bgsgxn--5tzm5gxn--6btw5axn--" +
-	"6frz82gxn--6orx2rxn--6qq986b3xlxn--7t0a264civilizationxn--80adxh" +
-	"ksolutionsilkomforbargainstitutelemarkarateu-1xn--80ao21axn--80a" +
-	"qecdr1axn--80asehdbarsyonlinewhollandiscoveryonaguniversityoriik" +
-	"aratsuginamikatagamilitaryoshiokaracoldwarmiastageu-2xn--80aswgx" +
-	"n--80audnedalnxn--8ltr62koryokamikawanehonbetsurutaharaxn--8pvr4" +
-	"uxn--8y0a063axn--90a3academiamicaaarborteaches-yogasawaracingxn-" +
-	"-90aeroportalaheadjudaicable-modemocraciaxn--90aishobarakawagoex" +
-	"n--90azhytomyrxn--9dbhblg6dietcimdbashkiriauthordalandeportenrig" +
-	"htathomeftpalmaseratibigawastronomy-gatewayokosukanzakiyosatokig" +
-	"awagrocerybnikahokutobamagazineat-url-o-g-i-natuurwetenschappena" +
-	"umburgjerdrumeteorappalermomahachijolstereportarumizusawaetnagah" +
-	"amaroygardendoftheinternetflixilovecollegefantasyleaguernseybolt" +
-	"arnobrzegyptianaturhistorisches3-ap-northeast-2ixboxenapponazure" +
-	"-mobile12hpaleobirabogadocscbgdyniabruzzoologicalvinklein-addram" +
-	"menuernberggfarmerseine164xn--9dbq2axn--9et52uxn--9krt00axn--and" +
-	"y-iraxn--aroport-byandexn--3ds443gxn--asky-iraxn--aurskog-hland-" +
-	"jnbasilicataniautomotiveconomiasakuchinotsuchiurakawalmartataran" +
-	"toyakokonoehimejibmdgcahcesuolocalhostrodawaraumalborkdalaziocea" +
-	"nographics3-eu-west-1xn--avery-yuasakuhokkaidoomdnsiskinkyotobet" +
-	"sumidatlanticivilwarmanagementoyouraxn--b-5gaxn--b4w605ferdxn--b" +
-	"ck1b9a5dre4claimsantacruzsantafedjejuifminamiizukamishihoronobea" +
-	"uxartsandcraftsantamariakexn--bdddj-mrabdxn--bearalvhki-y4axn--b" +
-	"erlevg-jxaxn--bhcavuotna-s4axn--bhccavuotna-k7axn--bidr-5nachika" +
-	"tsuuraxn--bievt-0qa2xn--bjarky-fyaotsurreyxn--bjddar-ptamayufuet" +
-	"tertdasnetzxn--blt-elabourxn--bmlo-graingerxn--bod-2natalxn--brn" +
-	"ny-wuacademy-firewall-gatewayxn--brnnysund-m8accident-investigat" +
-	"ion-aptibleaseating-organicbcn-north-1xn--brum-voagatrysiljanxn-" +
-	"-btsfjord-9zaxn--c1avgxn--c2br7gxn--c3s14misawaxn--cck2b3basketb" +
-	"allyngenhktatsunoddautoscanadaejeonbukarasjohkamikoaniikappueblo" +
-	"ckbustermezgoraugustowadaegubambleclerc66xn--cg4bkis-very-badajo" +
-	"zxn--ciqpnxn--clchc0ea0b2g2a9gcdn77-sslattumisconfusedxn--comuni" +
-	"caes-v6a2oxn--correios-e-telecomunicaes-ghc29axn--czr694batodayu" +
-	"kindustriaveroykeniwaizumiotsukumiyamazonawsadodgemologicallilly" +
-	"ombolzanord-frontiereviewskrakowebhostingjerstadotsuruokakegawau" +
-	"kraanghkepnogifts3-ap-southeast-2xn--czrs0tulanxesslupskommunalf" +
-	"orbundxn--czru2dxn--czrw28batsfjordishakotanhlfanhs3-us-gov-west" +
-	"-1xn--d1acj3bauhausposts-and-telecommunicationsncfdisrechtranaka" +
-	"muratajimidoriopretogoldpoint2thisamitsukeu-3xn--d1alfaromeoxn--" +
-	"d1atuneslzxn--d5qv7z876clanbibaidarmeniaxn--davvenjrga-y4axn--dj" +
-	"rs72d6uyxn--djty4kosaigawaxn--dnna-grajewolterskluwerxn--drbak-w" +
-	"uaxn--dyry-iraxn--e1a4cldmailuccapetownnews-stagingrongaxn--eckv" +
-	"dtc9dxn--efvn9somaxn--efvy88hair-surveillancexn--ehqz56nxn--elqq" +
-	"16hakatanortonxn--estv75gxn--eveni-0qa01gaxn--f6qx53axn--fct429k" +
-	"osakaerodromegallupinbarreauctionflfanfshostrowiecaseihichisobet" +
-	"suldalimoliserniaustraliaisondriobranconagawalesundemoneyokozebi" +
-	"nordreisa-geekaragandamusementashkentatamotors3-ap-southeast-1pa" +
-	"sswordd-dnshome-webservercellikes-piedmonticellocus-4xn--fhbeiar" +
-	"nxn--finny-yuaxn--fiq228c5hsomnarviikamitondabayashiogamagorizia" +
-	"xn--fiq64bbcasertairavennagatorockartuzyukuhashimoichinosekigaha" +
-	"ravocatanzarowebredirectmetacentrumetlifeinsurancempresashibetsu" +
-	"kuiitatebayashiibajddarchitecturealtydalipayomitanoceanographiqu" +
-	"emrevistanbulminamidaitomandalimanowarudaurskog-holandroverhalla" +
-	"-speziajudygarlanddnss3-ap-south-1kappchizippodhaleangaviikadena" +
-	"amesjevuemielno-ip6xn--fiqs8sooxn--fiqz9sopotritonxn--fjord-lrax" +
-	"n--fjq720axn--fl-ziaxn--flor-jraxn--flw351exn--fpcrj9c3dxn--frde" +
-	"-grandrapidsor-odalxn--frna-woaraisaijosoyrorosor-varangerxn--fr" +
-	"ya-hraxn--fzc2c9e2clickashiwaraxn--fzys8d69uvgmailxn--g2xx48clin" +
-	"ichernihivguccieszynissandnessjoenissayokkaichiropracticheltenha" +
-	"m-radio-opencraftrainingripescaravantaaxn--gckr3f0fbxosaxoxn--ge" +
-	"crj9cliniquenoharaxn--ggaviika-8ya47hakodatexn--gildeskl-g0axn--" +
-	"givuotna-8yasakaiminatoyookannamilanotteroyxn--gjvik-wuaxn--gk3a" +
-	"t1exn--gls-elacaixaxn--gmq050is-very-evillagexn--gmqw5axn--h-2fa" +
-	"ilxn--h1aeghakonexn--h2breg3evenesorfoldxn--h2brj9c8clintonoshoe" +
-	"santoandreamhostersanukis-a-designerimarnardalucernexn--h3cuzk1d" +
-	"igitalxn--hbmer-xqaxn--hcesuolo-7ya35bbtattoolsztynsettlers3-us-" +
-	"west-1xn--hery-iraxn--hgebostad-g3axn--hmmrfeasta-s4accident-pre" +
-	"vention-webhopenairbusantiquest-a-la-maisondre-landroidvagsoyeri" +
-	"cssonyoursidealerimo-i-ranadexeterxn--hnefoss-q1axn--hobl-iraxn-" +
-	"-holtlen-hxaxn--hpmir-xqaxn--hxt814exn--hyanger-q1axn--hylandet-" +
-	"54axn--i1b6b1a6a2exn--imr513nxn--indery-fyasugivingxn--io0a7is-v" +
-	"ery-goodhandsonxn--j1aefedorapeopleikangerxn--j1amhakubahccavuot" +
-	"nagareyamakeupowiathletajimabaridagawalbrzycharternidxn--j6w193g" +
-	"xn--jlq61u9w7bbvacationswatch-and-clockerhcloudns3-us-west-2xn--" +
-	"jlster-byasuokanraxn--jrpeland-54axn--jvr189mishimasudaxn--k7yn9" +
-	"5exn--karmy-yuaxn--kbrq7oxn--kcrx77d1x4axn--kfjord-iuaxn--klbu-w" +
-	"oaxn--klt787dxn--kltp7dxn--kltx9axn--klty5xn--3e0b707exn--koluok" +
-	"ta-7ya57hakuis-a-liberalxn--kprw13dxn--kpry57dxn--kpu716fedorapr" +
-	"ojectransportexn--kput3is-very-nicexn--krager-gyatomitamamuraxn-" +
-	"-kranghke-b0axn--krdsherad-m8axn--krehamn-dxaxn--krjohka-hwab49j" +
-	"dfastlylbarcelonagasakikuchikuseikarugamvikarasjokarasuyamarugam" +
-	"e-hostrolekamiminers3-external-1xn--ksnes-uuaxn--kvfjord-nxaxn--" +
-	"kvitsy-fyatsukanumazuryxn--kvnangen-k0axn--l-1fairwindsorocabals" +
-	"fjordxn--l1accentureklamborghinikis-very-sweetpepperxn--laheadju" +
-	"-7yatsushiroxn--langevg-jxaxn--lcvr32dxn--ldingen-q1axn--leagavi" +
-	"ika-52bentleyurihonjournalistgoryusuharavoues3-eu-west-2xn--lesu" +
-	"nd-huaxn--lgbbat1ad8jelenia-goraxn--lgrd-poacctunkongsbergxn--lh" +
-	"ppi-xqaxn--linds-pramericanarturystykanoyaltakasakiyokawaraxn--l" +
-	"ns-qlapyatigorskoseis-a-studentalxn--loabt-0qaxn--lrdal-sraxn--l" +
-	"renskog-54axn--lt-liaclothingdustkagoshimalselvendrellukowhaling" +
-	"rossetouchijiwadegreexn--lten-granexn--lury-iraxn--m3ch0j3axn--m" +
-	"ely-iraxn--merker-kuaxn--mgb2ddesorreisahayakawakamiichikawamisa" +
-	"toursimple-urlxn--mgb9awbfeiraquarellebesbyglandynulvikasuyanaga" +
-	"waxn--mgba3a3ejtuscanyxn--mgba3a4f16axn--mgba3a4franamizuholding" +
-	"smilevangerxn--mgba7c0bbn0axn--mgbaakc7dvfermochizukirkenesbscho" +
-	"koladenxn--mgbaam7a8hakusandiegooglecodespotrentino-alto-adigexn" +
-	"--mgbab2bdxn--mgbai9a5eva00beppublishproxyzjampagefrontappalmspr" +
-	"ingsakerxn--mgbai9azgqp6jeonnamerikawauexn--mgbayh7gpalacexn--mg" +
-	"bb9fbpobanazawaxn--mgbbh1a71exn--mgbc0a9azcgxn--mgbca7dzdoxn--mg" +
-	"berp4a5d4a87gxn--mgberp4a5d4arxn--mgbgu82axn--mgbi4ecexposedxn--" +
-	"mgbpl2fhskoleirfjordxn--mgbqly7c0a67fbcngroundhandlingroznyxn--m" +
-	"gbqly7cvafranziskanerdpolicexn--mgbt3dhdxn--mgbtf8flatangerxn--m" +
-	"gbtx2beskidyn-o-saurlandes3-website-ap-northeast-1xn--mgbx4cd0ab" +
-	"bvieeexn--mix082ferraraxn--mix891ferrarittoguraxn--mjndalen-64ax" +
-	"n--mk0axindigenaklodzkochikushinonsenergyxn--mk1bu44cnsaobernard" +
-	"ownloadyndns-picsaogoncartierxn--mkru45is-with-thebandovre-eiker" +
-	"xn--mlatvuopmi-s4axn--mli-tlaquilanciaxn--mlselv-iuaxn--moreke-j" +
-	"uaxn--mori-qsakuragawaxn--mosjen-eyawaraxn--mot-tlarvikosherbroo" +
-	"kegawaxn--mre-og-romsdal-qqbestbuyshouses3-website-ap-southeast-" +
-	"1xn--msy-ula0haldenxn--mtta-vrjjat-k7afamilycompanycntoystre-sli" +
-	"drettozawaxn--muost-0qaxn--mxtq1missilezajsklabudhabikinokawabar" +
-	"thaebaruminamiuonumassa-carrara-massacarraramassabusinessebykleg" +
-	"allocalhistoryggeelvinckaufenxn--ngbc5azdxn--ngbe9e0axn--ngbrxn-" +
-	"-3hcrj9cistrondheimmobilienxn--nit225koshimizumakizunokunimimata" +
-	"kasugais-a-teacherkassymantechnologyxn--nmesjevuemie-tcbaltimore" +
-	"-og-romsdalpha-myqnapcloudaccesscambridgestoneuesortlandxn--nnx3" +
-	"88axn--nodessakuraisleofmanchesterxn--nqv7fs00emaxn--nry-yla5gxn" +
-	"--ntso0iqx3axn--ntsq17gxn--nttery-byaeserveexchangexn--nvuotna-h" +
-	"waxn--nyqy26axn--o1achattanooganordkappimientakazakis-leetnedalx" +
-	"n--o3cw4halsaintlouis-a-anarchistoireggiocalabriaxn--o3cyx2axn--" +
-	"od0algxn--od0aq3betainaboxfusejnynysagaeroclubmedecincinnationwi" +
-	"dealstahaugesunderseaportsinfolldalabamagasakishimabaraogakibich" +
-	"uomutashinaindustriesteambulanceu-4xn--ogbpf8flekkefjordxn--oppe" +
-	"grd-ixaxn--ostery-fyawatahamaxn--osyro-wuaxn--p1acferreroticampo" +
-	"bassociatestinguovdageaidnuslivinghistoryxn--p1aissmarterthanyou" +
-	"xn--pbt977coguchikuzenxn--pgbs0dhlxn--porsgu-sta26fetsundynv6xn-" +
-	"-pssu33lxn--pssy2uxn--q9jyb4collectionxn--qcka1pmckinseyxn--qqqt" +
-	"11misugitokuyamatsumaebashikshacknetrentino-suedtirolxn--qxamune" +
-	"ustarhubsoruminternationalfirearmshintokushimaxn--rady-iraxn--rd" +
-	"al-poaxn--rde-ulavagiskexn--rdy-0nabariwchonanbuildingroks-thisa" +
-	"yamanobeokakudamatsuexn--rennesy-v1axn--rhkkervju-01aflakstadaok" +
-	"agakicks-assedicolognextdirectozsdeloittemp-dnsaotomelhusdecorat" +
-	"iveartsapodlasiellaktyubinskiptveterinairealtorlandyndns-remotew" +
-	"dyndns-serverdaluroyxn--rholt-mragowoodsideltaitogliattiresouthc" +
-	"arolinarvikomonoxn--rhqv96gxn--rht27zxn--rht3dxn--rht61exn--risa" +
-	"-5nativeamericanantiquesouthwestfalenxn--risr-iraxn--rland-uuaxn" +
-	"--rlingen-mxaxn--rmskog-byaxn--rny31hammarfeastafricapebretonami" +
-	"crosoftbankautokeinowruzhgorodeoxn--rovu88bhzcasinorddalindaskoy" +
-	"abearalvahkijobserverisignieznogataijinfinitintuitaxihuanikkoebe" +
-	"nhavnikolaevents3-website-ap-southeast-2xn--rros-granvindafjordx" +
-	"n--rskog-uuaxn--rst-0naturalhistorymuseumcenterxn--rsta-francais" +
-	"eharaxn--rvc1e0am3exn--ryken-vuaxn--ryrvik-byaxn--s-1faithruhere" +
-	"dumbrellajollamericanexpressexyxn--s9brj9colonialwilliamsburgrpa" +
-	"rocherkasyno-dsapporoxn--sandnessjen-ogbizxn--sandy-yuaxn--seral" +
-	"-lraxn--ses554gxn--sgne-gratangenxn--skierv-utazassnasabaerobati" +
-	"cketsowaxn--skjervy-v1axn--skjk-soaxn--sknit-yqaxn--sknland-fxax" +
-	"n--slat-5naturalsciencesnaturellespjelkavikomorotsukamiokamikita" +
-	"yamatsuris-a-socialistcgrouphdxn--slt-elabcgxn--smla-hraxn--smna" +
-	"-gratis-a-bulls-fanxn--snase-nraxn--sndre-land-0cbremangerxn--sn" +
-	"es-poaxn--snsa-roaxn--sr-aurdal-l8axn--sr-fron-q1axn--sr-odal-q1" +
-	"axn--sr-varanger-ggbieigersundivtasvuodnakaniikawatanaguraxauste" +
-	"vollavangenaval-d-aosta-valleyokotebinagisoccertificationavigati" +
-	"onavoibestadds3-ca-central-1xn--srfold-byaxn--srreisa-q1axn--sru" +
-	"m-grazxn--stfold-9xaxn--stjrdal-s1axn--stjrdalshalsen-sqbielawal" +
-	"terxn--stre-toten-zcbspreadbettingxn--t60b56axn--tckweatherchann" +
-	"elxn--tiq49xqyjetztrentino-sudtirolxn--tjme-hraxn--tn0agrinet-fr" +
-	"eakspydebergxn--tnsberg-q1axn--tor131oxn--trany-yuaxn--trgstad-r" +
-	"1axn--trna-woaxn--troms-zuaxn--tysvr-vraxn--uc0atvaroyxn--uc0ay4" +
-	"axn--uist22hamurakamigoris-a-libertarianxn--uisz3gxn--unjrga-rta" +
-	"obaomoriguchiharagusartsrlxn--unup4yxn--uuwu58axn--vads-jraxn--v" +
-	"ard-jraxn--vegrshei-c0axn--vermgensberater-ctbiellaakesvuemielec" +
-	"ceverbankareliancevje-og-hornnes3-website-eu-west-1xn--vermgensb" +
-	"eratung-pwbieszczadygeyachimataikikugawarszawashingtondclkariyam" +
-	"elbournexn--vestvgy-ixa6oxn--vg-yiabkhaziaxn--vgan-qoaxn--vgsy-q" +
-	"oa0jevnakershuscultureggioemiliaromagnamsosnowiechoseiroumuenche" +
-	"nxn--vgu402coloradoplateaudioxn--vhquvbarrell-of-knowledgeometre" +
-	"-experts-comptables3-us-east-2xn--vler-qoaxn--vre-eiker-k8axn--v" +
-	"rggt-xqadxn--vry-yla5gxn--vuq861bievatmallorcadaques3-website-sa" +
-	"-east-1xn--w4r85el8fhu5dnraxn--w4rs40lxn--wcvs22dxn--wgbh1columb" +
-	"usheyxn--wgbl6axn--xhq521bifukagawashtenawdev-myqnapcloudapplebt" +
-	"imnetzlgjovikarlsoyusuisserveftpanamatta-varjjatjeldsundivttasvu" +
-	"otnakanojohanamakinoharaxn--xkc2al3hye2axn--xkc2dl3a5ee0hangglid" +
-	"ingxn--y9a3aquariumitourismolangevagrarchaeologyeongbukmpspbaref" +
-	"ootballfinanzgorzeleccoffeedbackplaneapplinziiyamanouchikuhokury" +
-	"ugasakitchenayorovigovtateshinanomachimkentateyamaustinnavuotnar" +
-	"ashinobninsk12xn--yer-znaturbruksgymnxn--yfro4i67oxn--ygarden-p1" +
-	"axn--ygbi2ammxn--3oq18vl8pn36axn--ystre-slidre-ujbihorologyuucon" +
-	"nectjmaxxxfinityuzawaxn--zbx025dxn--zf0ao64axn--zf0avxn--3pxu8ko" +
-	"nyvelolxn--zfr164bikedagestangeorgeorgiaxperiaxz"
+const text = "9guacuiababia-goracleaningroks-theatreebinagisobetsumidatlantica" +
+	"sertairanzanquannefrankfurtatarantoyakokonoebinordre-landd-dnsho" +
+	"me-webservercelliguriagrocerybnikahokutobamagentositecnologiajud" +
+	"aicable-modemocraciaugustowadaeguambulancebizenakatombetsumitaka" +
+	"giizehimeji234lima-cityeatselinogradultarnobrzegyptian4tarumizus" +
+	"awaetnagahamaroyereportashkentatamotors3-ap-northeast-20001wwweb" +
+	"redirectmemsettsupport3l3p0rtargets-itargivestbytomaritimekeepin" +
+	"g12038biomutashinaindigenamsosnowiecatholicaxiascolipicenodumetl" +
+	"ifeinsurancebirdartcenterprisesakimobetsuitainairforceoppdalimol" +
+	"iserniabirkenesoddtangenovaraholtalenikonanporovnobirthplacebitb" +
+	"allooningjovikariyaltakasagotembaixadabjarkoyukuhashimoichinosek" +
+	"igaharabjerkreimbarclaycards3-eu-west-1bjugnieznord-aurdalpha-my" +
+	"qnapcloud66blackfridayurihonjournalisteinkjerusalembroideryusuha" +
+	"rablancomedicaltanissettaipeiheijindustriabloombergbauernuoroche" +
+	"sterbloxcms3-website-sa-east-1bluedancebmoattachments3-website-u" +
+	"s-east-1bms3-website-us-west-1bmweddingladefensells-for-less3-we" +
+	"bsite-us-west-2bnpparibaselburglassassinationalheritagebnrwedepl" +
+	"oyusuisserveirchattanooganordkappanamatsuzakindustriesteamfamber" +
+	"keleyuu2-localhostrowwlkpmgleezebomloabathsbcheltenham-radio-ope" +
+	"nairbusantiquest-a-la-maisondre-landroidivttasvuotnakanojohanama" +
+	"kinoharabondiyuzawabonninohekinannestadnpanasonichernigovernment" +
+	"jmaxxxboxenapponazure-mobilebookingliwiceboomladbrokes5yboschaef" +
+	"flerdalvdalaskanittedallasallebesbyglandroverhalla-speziabostika" +
+	"rlsoybostonakijinsekikogentinglobalashovhachinohedmarkarmoybotan" +
+	"icalgardeninomiyakonojorpelandrangedalindaskvollindesnesakyotana" +
+	"bellunombresciabotanicgardenirasakinfinitintuitjomemorialinkyard" +
+	"-cloudeitybotanybouncemerckmsdnipropetrovskjervoyagebounty-fulle" +
+	"nsakerrypropertiesalangenishiazainuyamashinatsukigatakarazukameo" +
+	"kameyamatotakadaboutiquebechernihivgubarclays3-eu-west-2bozen-su" +
+	"edtirolkuszczytnord-frontierbplacedekagaminord-odalwaysdatabaseb" +
+	"allangenoamishirasatochigiessensiositelekommunikationishigovtjxf" +
+	"initybrandywinevalleybrasiliabrindisibenikebristoloseyouripirang" +
+	"ap-northeast-3britishcolumbialowiezachpomorskienishiharabroadcas" +
+	"tlefrakkestadray-dnstracebroadwaybroke-itkmaxxjavald-aostaplesal" +
+	"ondonetskarpaczeladzlgloboavistaprintelligencebrokerbronnoysundr" +
+	"ayddnsfreebox-osascoli-picenordlandraydnsupdaterbrothermesaverde" +
+	"alstahaugesunderseaportsinfolldalivornobrowsersafetymarketsaltda" +
+	"lomzaporizhzhegurinvestmentsaludrivefsnillfjordrobaknoluoktagajo" +
+	"bojinzais-a-candidatebrumunddalondrinaplesalvadordalibabalsan-su" +
+	"edtirollagdenesnaaseralingenkainanaejrietisalatinabenonichernivt" +
+	"siciliabrunelasticbeanstalkaruizawabrusselsalzburglogowegroweibo" +
+	"lognagatorockartuzybruxellesamegawabryanskleppgafanpachigasakiev" +
+	"ennodesaarlandrudunsamnangerbrynewjerseybuskerudinewportlligatks" +
+	"atxn--0trq7p7nnishiizunazukis-a-catererbuzentsujiiebuzzparaglidi" +
+	"ngloppenzaolbia-tempio-olbiatempioolbialystokkembuchikumagayagaw" +
+	"akuyabukihokumakogenglandupontariodejaneirodoybweirbzhitomirumal" +
+	"atvuopmicrolightinglugmbhartiffanycoloradoplateaudiocolumbusheyc" +
+	"ommunitysvardoharuovatozsdeloittemp-dnsanokashiwaracomobaracompa" +
+	"remarkerryhotelsantabarbaracompute-1computerhistoryofscience-fic" +
+	"tioncomsecuritytacticsantacruzsantafedjejuifminamidaitomandaluce" +
+	"rnecondoshichinohealth-carereformitakeharaconferenceconstruction" +
+	"consuladollsantamariakeconsultanthropologyconsultingrossetouchih" +
+	"ayaakasakawaharacontactrani-andria-barletta-trani-andriacontagem" +
+	"atsubaracontemporaryarteducationalchikugojomedio-campidano-medio" +
+	"campidanomediocontractorskenconventureshinodearthdfcbankashiwaza" +
+	"kiyosemitecookingchannelsdvrdnsdojoetsuwanouchikujogaszkolahppia" +
+	"cenzagancoolukowfashioncooperativano-frankivskoleikangercopenhag" +
+	"encyclopedichitachinakagawatchandclockarumaifarsundyndns-blogdns" +
+	"amsclubindalorenskogrimstadyndns-freeboxosloftranakasatsunairpor" +
+	"tland-4-salernoboribetsucksamsungripescaravantaacorsicagliaribei" +
+	"raokinawashirosatochiokinoshimaizuruhrcorvettemasekasukabedzin-t" +
+	"he-bandaioiraseeklogesurancechirealmpmncosenzakopanerairguardian" +
+	"nakadomarinebraskaunjargalsacertmgretachikawakeisenbahncosidnsfo" +
+	"r-better-thanawatchesantoandreamhostersanukis-a-democratraniandr" +
+	"iabarlettatraniandriacostumedizinhistorischesaobernardownloadynd" +
+	"ns-remotewdyndns-serverdaluroycouchpotatofriesaogoncartoonartdec" +
+	"ologiacouncilutskasumigaurawa-mazowszextraspace-to-rentalstomako" +
+	"maibaracouponsaotomeloyalistjordalshalsencoursesapporocq-acranbr" +
+	"ookuwanalyticsardegnaroycreditcardyndns-webhopencraftranoycredit" +
+	"unioncremonashgabadaddjaguarqhachiojiyahoooshikamaishimodatecrew" +
+	"halingroundhandlingroznycricketrzyncrimeast-kazakhstanangercroto" +
+	"nexus-3crowniparsardiniacrsvpartis-a-designercruisesarluxembourg" +
+	"rpartsarpsborgruecryptonomichigangwoncuisinellair-traffic-contro" +
+	"lleyculturalcenternopilawawhoswhokksundyndns-wikiracuneocupcakec" +
+	"uritibaghdadyndns-workisboringuidefinimakanegasakinkobayashikaoi" +
+	"rminamiechizencxn--12c1fe0bradescorporationcyberlevagangaviikano" +
+	"njis-a-doctoraycymrussiacyonabaruminamifuranocyoutheworkpccwiihe" +
+	"yakageferrarissagamiharaferreroticanonoichinomiyakefetsundynnsar" +
+	"ufutsunomiyawakasaikaitakoelnfguitarsaudafhvalerfidonnakanotodde" +
+	"nfieldynservebbsasayamafigueresinstagingujoinvillevangerfilateli" +
+	"afilegearfilminamiizukamishihoronobeauxartsandcraftsauheradynuco" +
+	"nnectransportefinalfinancefineartsavannahgafinlandynv6finnoyfire" +
+	"baseappartyfirenzefirestonefirmdaleirvikasuyamelbournefishingolf" +
+	"fansaves-the-whalessandria-trani-barletta-andriatranibarlettaand" +
+	"riafitjarfitnessettlementravelchannelfjalerflesbergulenflickrage" +
+	"rotikakamigaharaflightsavonarusawaflirflogintogurafloraflorencef" +
+	"loridavvenjargaulardalfloripaderbornfloristanohatajirittohmalvik" +
+	"aszubyflorogersaxoflowersbschokokekschokoladenfltravelersinsuran" +
+	"ceflynnhosting-clusterflynnhubargainstitutelemarkarasjohkamikoan" +
+	"iikappueblockbustermezgorzeleccoffeedbackplaneapplegodoesntexist" +
+	"eingeekarasjokarasuyamarugame-hostrolekamiminers3-eu-west-3utili" +
+	"tiesquare7fndynvpnplus-4for-ourfor-someeresistancefor-theaterfor" +
+	"exrothachirogatakamatsukawaforgotdnscholarshipschoolforsaleitung" +
+	"senforsandasuololfortalfortmissoulancashireggio-calabriafortwort" +
+	"hadanorthwesternmutualforumzwildlifedorainfracloudcontrolappasad" +
+	"enaritakurashikis-a-geekatowicefosneschulefotarivnefoxfordeatnur" +
+	"embergunmapartmentschwarzgwangjuniperfozorafredrikstadtvschweizf" +
+	"reeddnsgeekgalaxyfreedesktoperauniteroizumizakirovogradoyfreemas" +
+	"onryfreesitevadsoccertificationfreetlsciencecentersciencehistory" +
+	"freiburguovdageaidnulvikatsushikabeeldengeluidyroyfreightrdfrese" +
+	"niuscountryestateofdelawarezzoologyfribourgushikamifuranorth-kaz" +
+	"akhstanfriuli-v-giuliafriuli-ve-giuliafriuli-vegiuliafriuli-vene" +
+	"zia-giuliafriuli-veneziagiuliafriuli-vgiuliafriuliv-giuliafriuli" +
+	"ve-giuliafriulivegiuliafriulivenezia-giuliafriuliveneziagiuliafr" +
+	"iulivgiuliafrlfroganscientistockholmestrandfrognfrolandfrom-akre" +
+	"hamnfrom-alfrom-arfrom-azfrom-capebretonamicrosoftbankatsuyamaru" +
+	"morimachidafrom-codynaliasdaburfrom-ctrentin-sued-tirolfrom-dchi" +
+	"tosetogitsuldalotenkawafrom-debianfrom-flanderscjohnsonfrom-gaus" +
+	"dalfrom-hichisochildrensgardenfrom-iafrom-idfrom-ilfrom-incheonf" +
+	"rom-kscotlandfrom-kyowariasahikawafrom-lancasterfrom-mangonoheji" +
+	"s-a-greenfrom-mdfrom-meethnologyfrom-mifunefrom-mnfrom-modalenfr" +
+	"om-mscrapper-sitefrom-mtnfrom-nchocolatelevisionishikawazukamits" +
+	"uefrom-ndfrom-nefrom-nh-serveblogsitexashorokanaiefrom-njaworzno" +
+	"togawafrom-nminamimakis-a-gurunzenfrom-nv-infoodnetworkshoppingw" +
+	"iddlewismillerfrom-nyfrom-ohkurafrom-oketohnoshooguyfrom-orfrom-" +
+	"padovaksdalfrom-pratohobby-sitextileksvikaufenfrom-ris-a-hard-wo" +
+	"rkerfrom-schoenbrunnfrom-sdfrom-tnfrom-txn--12co0c3b4evalleaosta" +
+	"ticscrappingxn--1ck2e1barreauctionavigationavoibmdeportenrightat" +
+	"homeftpalmaseratiitatebayashiibajddarchitecturealtydalces3-exter" +
+	"nal-1from-utazuerichardlikescandynamic-dnscrysechofunatoriginsur" +
+	"ecreationishimerafrom-val-daostavalleyfrom-vtrentin-suedtirolfro" +
+	"m-wafrom-wielunnerfrom-wvalled-aostatoilfrom-wyfrosinonefrostalo" +
+	"wa-wolawafroyahikobeardubaiduckdnserveminecraftrentino-a-adigefs" +
+	"tavernfujiiderafujikawaguchikonefujiminokamoenairtelecitychyatto" +
+	"rneyagawakkanaibetsubamericanfamilydscloudapplinzis-a-hunterfuji" +
+	"nomiyadavvesiidattowebcampinashikiminohosteroyrvikingfujiokayama" +
+	"ngyshlakasamatsudontexistmein-iservebeerfujisatoshonairtrafficpl" +
+	"exus-1fujisawafujishiroishidakabiratoridedyn-ip24fujitsurugashim" +
+	"aniwakuratefujixeroxn--1ctwolominamatakkokaminoyamaxunusualperso" +
+	"nfujiyoshidazaifudaigokaseljordfukayabeatservemp3fukuchiyamadafu" +
+	"kudominichonanbuildingriwataraidyndns-homednsandnessjoenishinomi" +
+	"yashironofukuis-a-knightpointtokamachintaifun-dnsaliasiafukumits" +
+	"ubishigakiryuohtawaramotoineppuboliviajessheimperiafukuokazakisa" +
+	"razurecontainerdpolicefukuroishikarikaturindalfukusakishiwadafuk" +
+	"uyamagatakaharuslivinghistoryfunabashiriuchinadafunagatakahashim" +
+	"amakisofukushimannore-og-uvdalfunahashikamiamakusatsumasendaisen" +
+	"nangoodyearfundaciofuoiskujukuriyamansionservep2passagenservepic" +
+	"servequakefuosskoczowilliamhillfurnitureggio-emilia-romagnakatsu" +
+	"gawafurubirafurudonostiaarpassenger-associationfurukawais-a-land" +
+	"scaperfusodegaurafussaikisosakitagawafutabayamaguchinomigawafutb" +
+	"oldlygoingnowhere-for-morenakayamanxn--1lqs03nfuttsurugiminamimi" +
+	"nowafuturecmservesarcasmatartanddesignfuturehostingfuturemailing" +
+	"fvgfylkesbiblackbaudcdn77-securecifederationfyresdalhannanmokuiz" +
+	"umodenaklodzkobierzycehannosegawahanyuzenhapmirhareidsbergenhars" +
+	"tadharvestcelebrationhasamarcheapaviancarrierhasaminami-alpssell" +
+	"s-itrentino-aadigehashbanghasudahasura-appfizerhasvikazohatogaya" +
+	"itakamoriokalmykiahatoyamazakitakamiizumisanofidelityhatsukaichi" +
+	"kaiseis-a-libertarianhattfjelldalhayashimamotobungotakadaplierne" +
+	"wmexicoalhazuminobusellsyourhomegoodsevenassisicilyhbodoes-itved" +
+	"estrandhelsinkitakatakanabeautysnesewinbarrel-of-knowledgeologyo" +
+	"kozeu-1hembygdsforbundhemnesharis-a-linux-useranishiaritabashijo" +
+	"nawatehemsedalhepforgeherokussldheroyhgtvalledaostavangerhigashi" +
+	"agatsumagoianiahigashichichibunkyonanaoshimageandsoundandvisionh" +
+	"igashihiroshimanehigashiizumozakitakyushuaiahigashikagawahigashi" +
+	"kagurasoedahigashikawakitaaikitamihamadahigashikurumeguromskoghi" +
+	"gashimatsushimaritimodernhigashimatsuyamakitaakitadaitoigawahiga" +
+	"shimurayamamotorcyclesharpgfoggiahigashinarusembokukitamotosumy-" +
+	"gatewayhigashinehigashiomihachimanaustdalhigashiosakasayamanakak" +
+	"ogawahigashishirakawamatakanezawahigashisumiyoshikawaminamiaikit" +
+	"anakagusukumoduminamiogunicomcastresindeviceshawaiijimarnardalhi" +
+	"gashitsunoshiroomurahigashiurausukitashiobarahigashiyamatokoriya" +
+	"manashifteditchyouripharmacienshellaspeziahigashiyodogawahigashi" +
+	"yoshinogaris-a-llamarriottrentino-alto-adigehiraizumisatokaizuka" +
+	"luganskypehirakatashinagawahiranais-a-musicianhirarahiratsukagaw" +
+	"ahirayaizuwakamatsubushikusakadogawahistorichouseshimojis-a-nasc" +
+	"arfanhitachiomiyagildeskaliszhitachiotagooglecodespotaruis-a-nur" +
+	"servegame-serverhitraeumtgeradellogliastradinghjartdalhjelmeland" +
+	"holeckochikushinonsenergyholidayhomeipharmacyshimokawahomelinkit" +
+	"oolsztynsettlershimokitayamahomelinuxn--1lqs71dhomeofficehomesec" +
+	"uritymacaparecidahomesecuritypchoseiroumuenchenishinoomotegohome" +
+	"senseminehomeunixn--1qqw23ahondahoneywellbeingzonehongopocznorfo" +
+	"lkebiblelhonjyoitakaokamakurazakitaurayasudahornindalhorseoullen" +
+	"svanguardhorteneis-a-painteractivegaskimitsubatamibudejjuedische" +
+	"sapeakebayernrtrentino-altoadigehospitalhoteleshimonitayanagithu" +
+	"busercontentrentino-s-tirolhotmailhoyangerhoylandetroitskazunowr" +
+	"uzhgorodeohumanitieshimonosekikawahurdalhurumajis-a-patsfanhylle" +
+	"stadhyogoris-a-personaltrainerhyugawarahyundaiwafunejfkharkovaoj" +
+	"lchoshibuyachiyodattorelayjlljmphilipsynology-diskstationjnjcphi" +
+	"latelyjoyentrentinoa-adigejoyokaichibalatinogiftshinjournalismai" +
+	"lillehammerfeste-iphoenixn--2m4a15ejpmorganjpnchoyodobashichikas" +
+	"hukujitawaravennakamagayachtsandoyjprshinjukumanojurkoshunantank" +
+	"hmelnitskiyamarylandkosugekotohiradomainshintokushimakotourakouh" +
+	"okutamakis-a-teacherkassymantechnologykounosupplieshintomikasaha" +
+	"rakouyamashikekouzushimashikis-a-techietis-a-photographerokuapph" +
+	"dkozagawakozakis-a-therapistoiakozowindmillkpnkppspdnshinyoshito" +
+	"miokamogawakrasnodarkredstonekristiansandcatshiojirishirifujieda" +
+	"kristiansundkrodsheradkrokstadelvaldaostarnbergkryminamisanrikub" +
+	"etsurfastpanelblagrarchaeologyeongbuklugsmileasinglest-mon-blogu" +
+	"eurovisionionjukudoyamaceratabusebastopologyeonggiehtavuoatnagai" +
+	"vuotnagaokakyotambabydgoszczecinemadridvagsoygardendoftheinterne" +
+	"tflixilovecollegefantasyleaguernseykumatorinokumejimasoykumenant" +
+	"okonamegatakasugais-an-accountantshimosuwalkis-a-playerkunisakis" +
+	"-an-actorkunitachiarailwaykunitomigusukumamotoyamashikokuchuokun" +
+	"neppugliakunstsammlungkunstunddesignkuokgroupictetrentinoaadigek" +
+	"urehabmerkurgankurobelaudiblebtimnetzkurogiminamiashigarakuroiso" +
+	"ftwarendalenugkuromatsunais-an-actresshimotsukekurotakikawasakis" +
+	"-an-anarchistoricalsocietykushirogawakustanais-an-artisteigenkus" +
+	"upplykutchanelkutnokuzumakis-an-engineeringkvafjordkvalsundkvaml" +
+	"idlugolekafjordkvanangenkvinesdalkvinnheradkviteseidskogkvitsoyk" +
+	"wpspectruminamitanekzmissilezajskmpspbarrell-of-knowledgeometre-" +
+	"experts-comptables3-fips-us-gov-west-1misugitokuyamatsumaebashik" +
+	"shacknetrentinoalto-adigemitourismolangevagrigentomologyeongname" +
+	"gawakayamagazineat-urlmitoyoakemiuramiyazurewebsiteshikagamiishi" +
+	"bukawamiyotamanomjondalenmlbfanmonstermontrealestatefarmequipmen" +
+	"trentinoaltoadigemonza-brianzaporizhzhiamonza-e-della-brianzappo" +
+	"shirakofuefukihaborokunohealthcareershiranukanagawamonzabrianzap" +
+	"tokyotangotpantheonsitemonzaebrianzaramonzaedellabrianzamoonscal" +
+	"emoparachutingmordoviamoriyamatsumotofukemoriyoshiminamiawajikis" +
+	"-foundationmormonmouthaebaruericssonyoursidegreemoroyamatsunomor" +
+	"tgagemoscowindowshiraois-gonemoseushistorymosjoenmoskeneshiraoka" +
+	"naniimihoboleslawiechristmasakinderoymosshiratakahagitlabormosvi" +
+	"knx-serverrankoshigayanagawamoteginowaniihamatamakawajimaoris-in" +
+	"to-animeiwamarshallstatebankfhappousrlmoviemovimientolgamovistar" +
+	"gardmozilla-iotrentinos-tirolmtranbymuenstermuginozawaonsenmuika" +
+	"misunagawamukodairamulhouservehalflifestylemunakatanemuncienciam" +
+	"uosattemupictureshishikuis-into-carshimotsumamurmanskolobrzegers" +
+	"undmurotorcraftrentinostirolmusashimurayamatsusakahoginankokubun" +
+	"jis-into-cartoonshinichinanmusashinoharamuseetrentinosued-tirolm" +
+	"useumverenigingmusicargodaddyn-vpndnshisognemutsuzawamy-vigorgem" +
+	"y-wanggouvicenzamyactivedirectorymyasustor-elvdalmycdn77-sslattu" +
+	"minamiuonumassa-carrara-massacarraramassabusinessebyklegalloansh" +
+	"ioyanaizumydattolocalhistorymyddnskingmydissentrentinosuedtirolm" +
+	"ydroboehringerikemydshisuifuelveruminamiyamashirokawanabelembets" +
+	"ukubankhmelnytskyivaporcloudnshinkamigotoyohashimotottoris-a-roc" +
+	"kstarachowicemyeffectrentinsued-tirolmyfirewallonieruchomoscienc" +
+	"eandindustrynmyfritzmyftpaccesshitaramamyhome-servermyjinomykola" +
+	"ivarggatrentinsuedtirolmymailermymediapchromedicinakamurataishin" +
+	"omakindlegnicafedexhibitionishinoshimatsushigemyokohamamatsudamy" +
+	"pepiemontemypetshizukuishimofusaitamatsukuris-into-gamessinazawa" +
+	"myphotoshibalestrandabergamoarekeymachinewhampshirebungoonoipifo" +
+	"nyminanomypiagetmyiphostfoldnavymypsxn--30rr7ymysecuritycamerake" +
+	"rmyshopblockshizuokanazawamytis-a-bookkeeperugiamytuleapilotshou" +
+	"jis-leetnedalmyvnchryslermywireitrentoyonezawapiszpittsburghoffi" +
+	"cialpiwatepixolinopizzapkomakiyosunndalplanetariumincommbanklabu" +
+	"dhabikinokawabarthadselfipatriaplantationplantshowaplatformshang" +
+	"rilanshowtimemergencyahabahcavuotnagareyamakeupowiathletajimabar" +
+	"idagawalbrzycharitysfjordplaystationplazaplchungnamdalseidfjordy" +
+	"ndns-iparliamentmparmatta-varjjatoyosatoyonakagyokutoyokawaplumb" +
+	"ingoplurinacionalpodlasiellaktyubinskiptveterinairealtorlandpodz" +
+	"onepohlpoivronpokerpokrovskomatsushimasfjordenpoliticartierpolit" +
+	"iendapolkowicepoltavalle-aostarostwodzislawinnershriramsterdamns" +
+	"erverbaniapomorzeszowiosienarutomobellevuelosangelesjabbottrevis" +
+	"ohughesigdalpordenonepornporsangerporsangugeporsgrunnanyokoshiba" +
+	"hikariwanumatakazakis-lostrodawarapoznanpraxis-a-bruinsfanprdpre" +
+	"servationpresidioprgmrprimelhusdecorativeartsilkomforbarsycenter" +
+	"tainmentattooceanographics3-sa-east-1principeprivatizehealthinsu" +
+	"ranceprochowiceproductionsimple-urlprofesionalprogressivenneslas" +
+	"kerrylogisticsirdalpromombetsurgeonshalloffameldalpropertyprotec" +
+	"tionprotonetritonprudentialpruszkowitdkommunalforbundprzeworskog" +
+	"ptplusgardenpupimientakayamattelefonicarbonia-iglesias-carboniai" +
+	"glesiascarboniapvhagakhanamigawapvtroandinosaurepaircraftingvoll" +
+	"ombardynamisches-dnslingpwchurcharternidyndns-mailottepzqldqponq" +
+	"slgbtrogstadquicksytestingquipelementslupskommuneqvcircleverapps" +
+	"potagerstorfjordstorjdevcloudcontrolledstpetersburgstreamuneueso" +
+	"kndalstudiostudyndns-at-homedepotenzamamidsundstuff-4-salestufft" +
+	"oread-booksnesolarssonstuttgartrusteesusakis-not-certifieducator" +
+	"ahimeshimamateramobilysusonosuzakaniepcesuzukanmakiwiensuzukis-s" +
+	"avedunetbankhakassiasvalbardunloppacificircustomersveiosvelvikon" +
+	"gsbergsvizzerasvn-reposologneswedenswidnicasacamdvrcampinagrande" +
+	"bugattipschlesischesolundbeckomonowtvareservehttphonefosshinshin" +
+	"otsurgeryswiebodzindianapolis-a-bloggerswiftcoverswinoujsciencea" +
+	"ndhistoryswisshikis-slickharkivanylvenicesynology-dsolutionslztu" +
+	"shuissier-justicetuvalle-daostatic-accessopotromsakakinokiatuxfa" +
+	"milytwmailvestre-slidrepbodynathomebuiltrvbashkiriautoscanadaeje" +
+	"onbuk12vestre-totennishiawakuravestvagoyvevelstadvibo-valentiavi" +
+	"bovalentiavideovillasnesoddenmarkhangelskjakdnepropetrovskiervaa" +
+	"psteiermarkoninjambylvinnicasadelamonedatingvinnytsiavipsinaappi" +
+	"nkomaganevirginiavirtual-userveexchangevirtualuserveftpioneervir" +
+	"tueeldomein-vigorlicevirtuelvisakegawaviterboknowsitallvivoldavi" +
+	"xn--32vp30hagebostadvlaanderenvladikavkazimierz-dolnyvladimirvlo" +
+	"goipippulawyvolkswagentsor-varangervologdanskonskowolayangroupho" +
+	"tographysiovolvolkenkundenvolyngdalvossevangenvotevotingvotoyono" +
+	"wiwatsukiyonoticiaskoyabearalvahkijobserveronagarahkkeravjuegosh" +
+	"ikikonaikawachinaganoharamcoachampionshiphoptobishimaintenancebe" +
+	"tsuikidsmynasushiobarackmazerbaijan-mayenebakkeshibechambagricul" +
+	"turennebudapest-a-la-masionthewifiat-band-campaniawloclawekonsul" +
+	"atrobeepilepsydneywmflabsorfoldworldworse-thandawowithgoogleapis" +
+	"a-hockeynutsiracusakataketomisatotalwpdevcloudyclusterwritesthis" +
+	"blogsytewroclawithyoutuberspacekitagatakinouewtcminnesotaketakat" +
+	"oris-an-entertainerwtfastvps-serverisignwuozuwzmiuwajimaxn--3pxu" +
+	"8konyvelombardiamondshinshiroxn--42c2d9axn--45br5cylxn--45brj9ci" +
+	"tadeliveryggeelvinckasaokaminokawanishiaizubangexn--45q11citiche" +
+	"rnovtsykkylvenetogakushimotoganewyorkshirecipesaro-urbino-pesaro" +
+	"urbinopesaromasvuotnakaiwamizawassamukawataricohdatsunanjoburgmi" +
+	"nakamichiharaxn--4gbriminingxn--4it168dxn--4it797kooris-a-soxfan" +
+	"xn--4pvxs4allxn--54b7fta0ccivilaviationishiwakis-a-conservativeg" +
+	"arsheis-a-cpadualstackashibatakasakiyosatokigawaxn--55qw42gxn--5" +
+	"5qx5dxn--5js045dxn--5rtp49civilisationissandiegoxn--5rtq34koperv" +
+	"ikhersonxn--5su34j936bgsgxn--5tzm5gxn--6btw5axn--6frz82gxn--6orx" +
+	"2rxn--6qq986b3xlxn--7t0a264civilizationissayokkaichiropractichir" +
+	"urgiens-dentistes-en-francexn--80adxhksorocabalsfjordxn--80ao21a" +
+	"xn--80aqecdr1axn--80asehdbasilicataniaveroykeniwaizumiotsukumiya" +
+	"mazonawsadodgemologicallavangenaval-d-aosta-valleyokotemrevistan" +
+	"bulsan-suedtirolaziobninskaragandaustrheimatunduhrennesoyboltate" +
+	"shinanomachimkentateyamaustevoll-o-g-i-naturhistorisches3-ap-sou" +
+	"theast-1kappchizippodhaleangaviikadenaamesjevuemielno-ip6xn--80a" +
+	"swgxn--80audnedalnxn--8ltr62koryokamikawanehonbetsurutaharaxn--8" +
+	"pvr4uxn--8y0a063axn--90a3academiamicaaarborteaches-yogasawaracin" +
+	"gxn--90aeroportalabamagasakishimabaraogakibichuoxn--90aishobarak" +
+	"awagoexn--90azhytomyravendbasketballyngenvironmentalconservation" +
+	"ayorovigotsukitahatakahatakaishimogosenflfanfshostrowiecasinordd" +
+	"alillesandefjordgcahcesuolocus-2xn--9dbhblg6dietcimdbatodayolasi" +
+	"teu-3xn--9dbq2axn--9et52uxn--9krt00axn--andy-iraxn--aroport-byan" +
+	"dexn--3bst00minternationalfirearmshirahamatonbetsurnadalxn--asky" +
+	"-iraxn--aurskog-hland-jnbatsfjordiscountyombolzano-altoadigeu-4x" +
+	"n--avery-yuasakuhokkaidoomdnsiskinkyotobetsulikes-piedmonticello" +
+	"dingenxn--b-5gaxn--b4w605ferdxn--balsan-sudtirol-rqis-uberleetre" +
+	"ntino-sued-tirolxn--bck1b9a5dre4civilwarmanagementoyotaparocherk" +
+	"asyno-dsandvikcoromantovalle-d-aostathellexn--bdddj-mrabdxn--bea" +
+	"ralvhki-y4axn--berlevg-jxaxn--bhcavuotna-s4axn--bhccavuotna-k7ax" +
+	"n--bidr-5nachikatsuuraxn--bievt-0qa2xn--bjarky-fyaotsurreyxn--bj" +
+	"ddar-ptamayufuettertdasnetzxn--blt-elabourxn--bmlo-graingerxn--b" +
+	"od-2natalxn--bozen-sudtirol-76haibarakitahiroshimarburgxn--brnny" +
+	"-wuacademy-firewall-gatewayxn--brnnysund-m8accident-investigatio" +
+	"n-aptibleaseating-organicbcieszynxn--brum-voagatrysiljanxn--btsf" +
+	"jord-9zaxn--bulsan-sudtirol-rqis-very-badajozxn--c1avgxn--c2br7g" +
+	"xn--c3s14misakis-byxn--cck2b3bauhausposts-and-telecommunications" +
+	"ncfdiscoveryomitanoddavocatanzarownproviderhcloudfunctions3-ca-c" +
+	"entral-1xn--cesena-forli-c2gxn--cesenaforli-0jgoraxn--cg4bkis-ve" +
+	"ry-evillagexn--ciqpnxn--clchc0ea0b2g2a9gcdxn--comunicaes-v6a2oxn" +
+	"--correios-e-telecomunicaes-ghc29axn--czr694bbcn-north-1xn--czrs" +
+	"0tulanxessomaxn--czru2dxn--czrw28bbtcp4xn--d1acj3bbvacationswatc" +
+	"h-and-clockerxn--d1alfaromeoxn--d1atunesomnarviikamitondabayashi" +
+	"ogamagoriziaxn--d5qv7z876claimsanfranciscofreakunemurorangeiseiy" +
+	"oichippubetsubetsugarugbyengerdalaheadjudygarlandyndns-picsangox" +
+	"n--davvenjrga-y4axn--djrs72d6uyxn--djty4kosaigawaxn--dnna-grajew" +
+	"olterskluwerxn--drbak-wuaxn--dyry-iraxn--e1a4clanbibaidarmeniaxn" +
+	"--eckvdtc9dxn--efvn9sorreisahayakawakamiichikawamisatoursnoasait" +
+	"oshimayfirstjohnxn--efvy88hair-surveillancexn--ehqz56nxn--elqq16" +
+	"hakatanortonxn--estv75gxn--eveni-0qa01gaxn--f6qx53axn--fct429kos" +
+	"akaerodromegallupinbarsyonlinewhollandevelopmentaxihuanavuotnara" +
+	"shinoceanographiqueu-2xn--fhbeiarnxn--finny-yuaxn--fiq228c5hsort" +
+	"landxn--fiq64beneventoeidsvollillyonagoyavoues3-eu-central-1xn--" +
+	"fiqs8soruminiserversicherungxn--fiqz9soundcastronomy-routerxn--f" +
+	"jord-lraxn--fjq720axn--fl-ziaxn--flor-jraxn--flw351exn--forli-ce" +
+	"sena-41gxn--forlicesena-ujgxn--fpcrj9c3dxn--frde-grandrapidsouth" +
+	"carolinarvikomorotsukamiokamikitayamatsuris-a-socialistcgrouphil" +
+	"adelphiaareadmyblogspotrentino-stirolxn--frna-woaraisaijosoyroro" +
+	"southwestfalenxn--frya-hraxn--fzc2c9e2cldmailouvreisenissedalowi" +
+	"czest-le-patronisshingucciprianiigataitogliattiresanjotoyotomiya" +
+	"zakis-a-cubicle-slavellinotairestaurantoyotsukaidoxn--fzys8d69uv" +
+	"gmailxn--g2xx48clickashiharaxn--gckr3f0fauskedsmokorsetagayasell" +
+	"s-for-ufcfanxn--gecrj9clinichiryukyuragifuchungbukharaumalopolsk" +
+	"anlandurbanamexnetlifyis-a-celticsfanishikatakatsukis-a-chefarms" +
+	"teadurhamburgmodellingmxn--11b4c3dyndns-at-workinggrouparisor-fr" +
+	"onishikatsuragit-repostre-totendofinternet-dnsampagespeedmobiliz" +
+	"eroxn--ggaviika-8ya47hakodatexn--gildeskl-g0axn--givuotna-8yasak" +
+	"aiminatoyookannamilanotteroyxn--gjvik-wuaxn--gk3at1exn--gls-elac" +
+	"aixaxn--gmq050is-very-goodhandsonxn--gmqw5axn--h-2failxn--h1aegh" +
+	"akonexn--h2breg3evenesowaxn--h2brj9c8cliniquenoharaxn--h3cuzk1di" +
+	"gitalxn--hbmer-xqaxn--hcesuolo-7ya35bentleyonaguniversityoriikar" +
+	"ateverbankaratsuginamikatagamilitaryoshiokaracoldwarmiastagevje-" +
+	"og-hornnes3-us-east-2xn--hery-iraxn--hgebostad-g3axn--hmmrfeasta" +
+	"-s4accident-prevention-webhostingxn--hnefoss-q1axn--hobl-iraxn--" +
+	"holtlen-hxaxn--hpmir-xqaxn--hxt814exn--hyanger-q1axn--hylandet-5" +
+	"4axn--i1b6b1a6a2exn--imr513nxn--indery-fyasugivingxn--io0a7is-ve" +
+	"ry-nicexn--j1aefbsbxn--12cfi8ixb8luxuryxn--j1amhakubahccavuotnag" +
+	"asakikuchikuseikarugamvikautokeinow-dnservicesevastopolexn--j6w1" +
+	"93gxn--jlq61u9w7beppublishproxyzjampagefrontappalmspringsakerxn-" +
+	"-jlster-byasuokanraxn--jrpeland-54axn--jvr189misasaguris-certifi" +
+	"edogawarabikomaezakirunordreisa-geekddielddanuorrikuzentakatajim" +
+	"idoriopretogoldpoint2thisamitsukexn--k7yn95exn--karmy-yuaxn--kbr" +
+	"q7oxn--kcrx77d1x4axn--kfjord-iuaxn--klbu-woaxn--klt787dxn--kltp7" +
+	"dxn--kltx9axn--klty5xn--3ds443gxn--koluokta-7ya57hakuis-a-lawyer" +
+	"xn--kprw13dxn--kpry57dxn--kpu716fbx-osasebofagexn--kput3is-very-" +
+	"sweetpepperxn--krager-gyatomitamamuraxn--kranghke-b0axn--krdsher" +
+	"ad-m8axn--krehamn-dxaxn--krjohka-hwab49jdfastlylbarefootballfina" +
+	"nzgorautomotiveconomiasakuchinotsuchiurakawalmartatsunobiraustra" +
+	"liaisondriobranconagawalesundds3-ap-southeast-2ix4432-bananarepu" +
+	"blicaseihicampobassociatest-iservecounterstrike12hpaleobihirosak" +
+	"ikamijimatsuurabogadocscbgdyniabruzzoologicalvinklein-addrammenu" +
+	"ernberggfarmerseine164-barcelonagasukeastcoastaldefenceatonsberg" +
+	"jemnes3-ap-northeast-1337xn--ksnes-uuaxn--kvfjord-nxaxn--kvitsy-" +
+	"fyatsukanumazuryxn--kvnangen-k0axn--l-1fairwindspeedpartnersokan" +
+	"eyamazoexn--l1accentureklamborghinikis-with-thebandovre-eikerxn-" +
+	"-laheadju-7yatsushiroxn--langevg-jxaxn--lcvr32dxn--ldingen-q1axn" +
+	"--leagaviika-52beskidyn-o-saurlandes3-us-gov-west-1xn--lesund-hu" +
+	"axn--lgbbat1ad8jelenia-goraxn--lgrd-poacctunkongsvingerxn--lhppi" +
+	"-xqaxn--linds-pramericanarturystykanoyakumoldelmenhorstalbansoox" +
+	"n--lns-qlapyxn--loabt-0qaxn--lrdal-sraxn--lrenskog-54axn--lt-lia" +
+	"clintonoshoesannaniyodogawaxn--lten-granexn--lury-iraxn--m3ch0j3" +
+	"axn--mely-iraxn--merker-kuaxn--mgb2ddespiegelxn--mgb9awbfbxosask" +
+	"atchewanxn--mgba3a3ejtuscanyxn--mgba3a4f16axn--mgba3a4franamizuh" +
+	"oldingspjelkavikomvuxn--2scrj9christiansburgroks-thisayamanobeok" +
+	"akudamatsuexn--mgba7c0bbn0axn--mgbaakc7dvfedorapeopleirfjordyndn" +
+	"s1xn--mgbaam7a8hakusanagochijiwadell-ogliastraderxn--mgbab2bdxn-" +
+	"-mgbai9a5eva00bestbuyshouses3-us-west-1xn--mgbai9azgqp6jeonnamer" +
+	"ikawauexn--mgbayh7gpalacexn--mgbb9fbpobanazawaxn--mgbbh1a71exn--" +
+	"mgbc0a9azcgxn--mgbca7dzdoxn--mgberp4a5d4a87gxn--mgberp4a5d4arxn-" +
+	"-mgbgu82axn--mgbi4ecexposedxn--mgbpl2fhskydivingxn--mgbqly7c0a67" +
+	"fbclothingdustkagoshimalselvendrellucaniaxn--mgbqly7cvafranziska" +
+	"nerimaringatlantakahamamurogawaxn--mgbt3dhdxn--mgbtf8flatangerxn" +
+	"--mgbtx2betainaboxfusejnynysagaeroclubmedecincinnationwidealerim" +
+	"o-i-ranadexeterxn--mgbx4cd0abbvieeexn--mix082fedoraprojectransur" +
+	"luzernxn--mix891feiraquarelleborkangerxn--mjndalen-64axn--mk0axi" +
+	"ndianmarketingxn--mk1bu44cngrondarxn--mkru45isleofmanchesterxn--" +
+	"mlatvuopmi-s4axn--mli-tlaquilanciaxn--mlselv-iuaxn--moreke-juaxn" +
+	"--mori-qsakuragawaxn--mosjen-eyawaraxn--mot-tlarvikoseis-a-stude" +
+	"ntalxn--mre-og-romsdal-qqbhzcateringebuilderschmidtre-gauldalima" +
+	"nowarudaxauthordalandemoneyokosukanzakiyokawaraustinnatuurwetens" +
+	"chappenaumburgjerstadotsuruokakegawaurskog-holandingjerdrumetace" +
+	"ntrumeteorappalermomahachijolstereviewskrakowebspacempresashibet" +
+	"sukuibigawaukraanghkepnogataijibestaddnslivelanddnss3-ap-south-1" +
+	"6-bambleclerc66xn--msy-ula0haldenxn--mtta-vrjjat-k7afamilycompan" +
+	"ycnpyatigorskodjeffersonxn--muost-0qaxn--mxtq1misawaxn--ngbc5azd" +
+	"xn--ngbe9e0axn--ngbrxn--3e0b707exn--nit225kosherbrookegawaxn--nm" +
+	"esjevuemie-tcbaltimore-og-romsdalipayxn--nnx388axn--nodessakurai" +
+	"ssmarterthanyoutwentexn--nqv7fs00emaxn--nry-yla5gxn--ntso0iqx3ax" +
+	"n--ntsq17gxn--nttery-byaeservehumourxn--nvuotna-hwaxn--nyqy26axn" +
+	"--o1achaseljeepsongdalenviknaharimalborkdalxn--o3cw4halsaintloui" +
+	"s-a-anarchistoireggiocalabriaxn--o3cyx2axn--od0algxn--od0aq3biei" +
+	"gersundishakotanhktjeldsundisrechtrainingjesdalimitedivtasvuodna" +
+	"kaniikawatanaguraxn--ogbpf8flekkefjordxn--oppegrd-ixaxn--ostery-" +
+	"fyawatahamaxn--osyro-wuaxn--otu796dxn--p1acfermochizukirkenesass" +
+	"aris-a-financialadvisor-aurdalvivanovodkamisatokashikiwakunigami" +
+	"harulminamiiselectrapaniizaxn--p1aixn--pbt977cnsannohelplfinanci" +
+	"aluccapitalonewspaperxn--pgbs0dhlxn--porsgu-sta26ferraraxn--pssu" +
+	"33lxn--pssy2uxn--q9jyb4cntoyouraxn--qcka1pmckinseyxn--qqqt11misc" +
+	"onfusedxn--qxamusementdllcube-serversaillespreadbettingxn--rady-" +
+	"iraxn--rdal-poaxn--rde-ulavagiskexn--rdy-0nabarixn--rennesy-v1ax" +
+	"n--rhkkervju-01aflakstadaokagakicks-assedicoguchikuzenxn--rholt-" +
+	"mragowoodsideltaiwanairlinedre-eikerxn--rhqv96gxn--rht27zxn--rht" +
+	"3dxn--rht61exn--risa-5nativeamericanantiquespydebergxn--risr-ira" +
+	"xn--rland-uuaxn--rlingen-mxaxn--rmskog-byaxn--rny31hammarfeastaf" +
+	"ricapetownnews-stagingxn--rovu88bielawalterxn--rros-granvindafjo" +
+	"rdxn--rskog-uuaxn--rst-0naturalhistorymuseumcenterxn--rsta-franc" +
+	"aiseharaxn--rvc1e0am3exn--ryken-vuaxn--ryrvik-byaxn--s-1faithruh" +
+	"eredumbrellajollamericanexpressexyxn--s9brj9collectionxn--sandne" +
+	"ssjen-ogbizxn--sandy-yuaxn--seral-lraxn--ses554gxn--sgne-gratang" +
+	"enxn--skierv-utazassnasabaerobaticketsrtromsojamisonxn--skjervy-" +
+	"v1axn--skjk-soaxn--sknit-yqaxn--sknland-fxaxn--slat-5naturalscie" +
+	"ncesnaturellesrvaroyxn--slt-elabcgxn--smla-hraxn--smna-gratis-a-" +
+	"bulls-fanxn--snase-nraxn--sndre-land-0cbremangerxn--snes-poaxn--" +
+	"snsa-roaxn--sr-aurdal-l8axn--sr-fron-q1axn--sr-odal-q1axn--sr-va" +
+	"ranger-ggbiellaakesvuemieleccexn--srfold-byaxn--srreisa-q1axn--s" +
+	"rum-grazxn--stfold-9xaxn--stjrdal-s1axn--stjrdalshalsen-sqbieszc" +
+	"zadygeyachimataikikugawarszawashingtondclkareliancexn--stre-tote" +
+	"n-zcbstoragexn--sudtirol-y0emmafann-arboretumbriamallamaceioxn--" +
+	"t60b56axn--tckweatherchannelxn--tiq49xqyjetztrentino-suedtirolxn" +
+	"--tjme-hraxn--tn0agrinet-freakstordalxn--tnsberg-q1axn--tor131ox" +
+	"n--trany-yuaxn--trentin-sud-tirol-tsjcbnlxn--trentin-sudtirol-b9" +
+	"ixn--trentino-sud-tirol-dckoshimizumakizunokunimimatakashimarylh" +
+	"urstgoryxn--trentino-sudtirol-usjevnakershuscultureggioemiliarom" +
+	"agnamsskoganeis-a-republicancerresearchaeologicaliforniaxn--tren" +
+	"tinosud-tirol-tsjewelryxn--trentinosudtirol-b9ixn--trentinsud-ti" +
+	"rol-98ixn--trentinsudtirol-rqixn--trgstad-r1axn--trna-woaxn--tro" +
+	"ms-zuaxn--tysvr-vraxn--uc0atvestfoldxn--uc0ay4axn--uist22hamurak" +
+	"amigoris-a-liberalxn--uisz3gxn--unjrga-rtaobaomoriguchiharagusar" +
+	"tstoregontrailroadxn--unup4yxn--uuwu58axn--vads-jraxn--vallee-ao" +
+	"ste-i2gxn--vallee-d-aoste-43hangglidingxn--valleeaoste-6jgxn--va" +
+	"lleedaoste-i2gxn--vard-jraxn--vegrshei-c0axn--vermgensberater-ct" +
+	"bievatmallorcadaques3-us-west-2xn--vermgensberatung-pwbifukagawa" +
+	"shtenawdev-myqnapcloudaccesscambridgestoneustarhubs3-website-ap-" +
+	"northeast-1xn--vestvgy-ixa6oxn--vg-yiabkhaziaxn--vgan-qoaxn--vgs" +
+	"y-qoa0jewishartgalleryxn--vgu402colognextdirectoystre-slidrettoz" +
+	"awaxn--vhquvestnesor-odalxn--vler-qoaxn--vre-eiker-k8axn--vrggt-" +
+	"xqadxn--vry-yla5gxn--vuq861bihorologyukiiyamanouchikuhokuryugasa" +
+	"kitchenhlfanhs3-website-ap-southeast-1xn--w4r85el8fhu5dnraxn--w4" +
+	"rs40lxn--wcvs22dxn--wgbh1colonialwilliamsburgrongaxn--wgbl6axn--" +
+	"xhq521bikedagestangeorgeorgiaxn--xkc2al3hye2axn--xkc2dl3a5ee0han" +
+	"goutsystemscloudfrontdoorxn--y9a3aquariumishimasudaxn--yer-znatu" +
+	"rbruksgymnxn--yfro4i67oxn--ygarden-p1axn--ygbi2ammxn--3hcrj9cist" +
+	"rondheimmobilienishiokoppegardyndns-office-on-the-weberlincolnis" +
+	"hitosashimizunaminamibosogndalottokorozawaxn--ystre-slidre-ujbil" +
+	"baogashimadachicagoboats3-website-ap-southeast-2xn--zbx025dxn--z" +
+	"f0ao64axn--zf0avxn--3oq18vl8pn36axn--zfr164billustrationikkoeben" +
+	"havnikolaevents3-website-eu-west-1xnbayxz"
 
 // nodes is the list of nodes. Each node is represented as a uint32, which
 // encodes the node's children, wildcard bit and node type (as an index into
@@ -500,8517 +512,8696 @@ const text = "0emmafann-arboretumbriamallamaceiobihirosakikamijimatsuzaki234li"
 //	[15 bits] text index
 //	[ 6 bits] text length
 var nodes = [...]uint32{
-	0x31a803,
-	0x284d84,
-	0x382f06,
-	0x2f37c3,
-	0x2f37c6,
-	0x37af86,
-	0x3a7a03,
-	0x31b604,
-	0x322487,
-	0x382b48,
-	0x1a00742,
-	0x32e147,
-	0x3672c9,
-	0x2b4eca,
-	0x2b4ecb,
-	0x232183,
-	0x2ab9c6,
-	0x238485,
-	0x1e01482,
-	0x203b44,
-	0x260543,
-	0x201485,
-	0x2215842,
-	0x332603,
-	0x271b0c4,
-	0x31fe05,
-	0x2a00102,
-	0x38194e,
-	0x256483,
-	0x39cbc6,
-	0x2e03d02,
-	0x2c8047,
-	0x23e146,
-	0x3205c42,
-	0x257dc3,
-	0x257dc4,
-	0x357406,
-	0x205d08,
-	0x277146,
-	0x302004,
-	0x3600602,
-	0x33acc9,
-	0x211307,
-	0x347986,
-	0x3c1109,
-	0x2c78c8,
-	0x331004,
-	0x241286,
-	0x230106,
-	0x3a00582,
-	0x3a234f,
-	0x21f4ce,
-	0x226484,
-	0x2c1545,
-	0x31a705,
-	0x2f6809,
-	0x244689,
-	0x357c07,
-	0x22bbc6,
-	0x206dc3,
-	0x3e03942,
-	0x21d6c3,
-	0x220d4a,
-	0x21fbc3,
-	0x3bde45,
-	0x2f2542,
-	0x370749,
-	0x4200282,
-	0x216c84,
-	0x2ef006,
-	0x2bb6c5,
-	0x2d7c04,
-	0x4a14344,
-	0x205583,
-	0x2374c4,
-	0x4e02b82,
-	0x267184,
-	0x527eac4,
-	0x39004a,
-	0x5600cc2,
-	0x35c447,
-	0x2774c8,
-	0x6207ec2,
-	0x340687,
-	0x2bde44,
-	0x2bde47,
-	0x3b9605,
-	0x339407,
-	0x31ca86,
-	0x325384,
-	0x3314c5,
-	0x298307,
-	0x720fc02,
-	0x335a43,
-	0x21ab82,
-	0x3aae43,
-	0x7612442,
-	0x27f485,
-	0x7a023c2,
-	0x293584,
-	0x276005,
-	0x2263c7,
-	0x20974e,
-	0x2391c4,
-	0x238cc4,
-	0x20b583,
-	0x364209,
-	0x30e2cb,
-	0x259e48,
-	0x3c0ec8,
-	0x316488,
-	0x215cc8,
-	0x330e4a,
-	0x339307,
-	0x309d86,
-	0x7e6e442,
-	0x345243,
-	0x355943,
-	0x35d344,
-	0x3a7a43,
-	0x32f6c3,
-	0x172a782,
-	0x8203102,
-	0x27b385,
-	0x28df86,
-	0x2a9f04,
-	0x369187,
-	0x23ce86,
-	0x3806c4,
-	0x3806c7,
-	0x205a83,
-	0x86c31c2,
-	0x8b14902,
-	0x8e21182,
-	0x221186,
-	0x9200882,
-	0x286c45,
-	0x32bcc3,
-	0x3c6444,
-	0x2e3804,
-	0x2e3805,
-	0x2053c3,
-	0x96b6c03,
-	0x9a09342,
-	0x289b05,
-	0x289b0b,
-	0x20bd06,
-	0x331f4b,
-	0x22aa44,
-	0x20cec9,
-	0x20d784,
-	0x9e0d9c2,
-	0x20ef03,
-	0x20fec3,
-	0x1610702,
-	0x2fb9c3,
-	0x21070a,
-	0xa200302,
-	0x203dc5,
-	0x2d400a,
-	0x243384,
-	0x210f03,
-	0x212984,
-	0x213b83,
-	0x213b84,
-	0x213b87,
-	0x2153c5,
-	0x215705,
-	0x216d46,
-	0x2170c6,
-	0x217d43,
-	0x21a708,
-	0x212d43,
-	0xa6004c2,
-	0x22c3c8,
-	0x3878cb,
-	0x223088,
-	0x225f06,
-	0x227447,
-	0x22a1c8,
-	0xb604002,
-	0xbaf21c2,
-	0x23b388,
-	0x3031c7,
-	0x207a45,
-	0x207a48,
-	0x383c48,
-	0x2fa9c3,
-	0x22f384,
-	0x35d382,
-	0xbe2f582,
-	0xc201bc2,
-	0xca30502,
-	0x230503,
-	0xce03cc2,
-	0x31b5c3,
-	0x2f1b84,
-	0x20bf83,
-	0x335e04,
-	0x322b8b,
-	0x237c03,
-	0x2db106,
-	0x237c04,
-	0x2e21ce,
-	0x2669c5,
-	0x33d7c8,
-	0x251107,
-	0x25110a,
-	0x2342c3,
-	0x34f747,
-	0x30e485,
-	0x2342c4,
-	0x2d4b86,
-	0x2d4b87,
-	0x2d0204,
-	0x37d587,
-	0x209a84,
-	0x340c44,
-	0x340c46,
-	0x25d944,
-	0x39db46,
-	0x207803,
-	0x207808,
-	0x21a988,
-	0x238c83,
-	0x2fb983,
-	0x3a8c04,
-	0x3ae4c3,
-	0xd24d5c2,
-	0xd6d2fc2,
-	0x2083c3,
-	0x205646,
-	0x241383,
-	0x354bc4,
-	0xda4b182,
-	0x24cb83,
-	0x339c03,
-	0x218882,
-	0xde03c02,
-	0x2c0b06,
-	0x23c007,
-	0x2eab45,
-	0x38a504,
-	0x2981c5,
-	0x27e687,
-	0x2d84c9,
-	0x2dcd46,
-	0x307788,
-	0x2eaa46,
-	0xe2010c2,
-	0x2f1408,
-	0x2f3e06,
-	0x223a85,
-	0x30fe07,
-	0x310344,
-	0x310345,
-	0x2010c4,
-	0x2010c8,
-	0xe619382,
-	0xea02642,
-	0x3292c6,
-	0x202648,
-	0x34d485,
-	0x34df06,
-	0x350108,
-	0x36d548,
-	0xee1f8c5,
-	0xf21d0c4,
-	0x38ca87,
-	0xf60d642,
-	0xfaefa02,
-	0x10e02c42,
-	0x2ef105,
-	0x373905,
-	0x3c1546,
-	0x3208c7,
-	0x3973c7,
-	0x1160be03,
-	0x26f507,
-	0x2b99c8,
-	0x231a09,
-	0x381b07,
-	0x2321c7,
-	0x232b08,
-	0x233306,
-	0x233dc6,
-	0x234a0c,
-	0x235e4a,
-	0x2364c7,
-	0x23834b,
-	0x23be47,
-	0x23be4e,
-	0x1a23d104,
-	0x23d744,
-	0x23e847,
-	0x2616c7,
-	0x243806,
-	0x243807,
-	0x243c87,
-	0x1a630a42,
-	0x2449c6,
-	0x2449ca,
-	0x244f4b,
-	0x246d07,
-	0x2478c5,
-	0x247c03,
-	0x248146,
-	0x248147,
-	0x322643,
-	0x1aa022c2,
-	0x248a4a,
-	0x1af68802,
-	0x1b24d602,
-	0x1b64afc2,
-	0x1ba3e242,
-	0x24cc85,
-	0x24d2c4,
-	0x1c204ac2,
-	0x267205,
-	0x245543,
-	0x20d885,
-	0x215bc4,
-	0x20f984,
-	0x209d86,
-	0x2505c6,
-	0x289d03,
-	0x3b6d84,
-	0x3ac2c3,
-	0x1ca02e02,
-	0x3582c4,
-	0x3582c6,
-	0x38d005,
-	0x36e3c6,
-	0x30ff08,
-	0x227b84,
-	0x397848,
-	0x399a45,
-	0x311708,
-	0x36c6c6,
-	0x265847,
-	0x27b984,
-	0x27b986,
-	0x26f803,
-	0x3917c3,
-	0x20b648,
-	0x31c684,
-	0x354fc7,
-	0x2d2906,
-	0x2d2909,
-	0x20a1c8,
-	0x317908,
-	0x338884,
-	0x2067c3,
-	0x23dd42,
-	0x1da4c3c2,
-	0x1de14202,
-	0x207583,
-	0x1e20a502,
-	0x3225c4,
-	0x2440c6,
-	0x335b45,
-	0x283403,
-	0x234ec4,
-	0x2b1a07,
-	0x336bc3,
-	0x37cfc8,
-	0x21ea85,
-	0x25f7c3,
-	0x275f85,
-	0x2760c4,
-	0x2f9c06,
-	0x222704,
-	0x225986,
-	0x226306,
-	0x357d84,
-	0x23c203,
-	0x1e614582,
-	0x238ac5,
+	0x329903,
+	0x28a5c4,
+	0x2ea306,
+	0x2f1d43,
+	0x2f1d46,
+	0x3896c6,
+	0x3af783,
+	0x2030c4,
+	0x372387,
+	0x2e9f48,
+	0x1a000c2,
+	0x1f390c7,
+	0x376389,
+	0x2bf5ca,
+	0x2bf5cb,
+	0x22fc83,
+	0x2ac706,
+	0x2364c5,
+	0x22036c2,
+	0x3d0244,
+	0x262343,
+	0x204885,
+	0x2603742,
+	0x203743,
+	0x2b2a1c4,
+	0x205085,
+	0x2e24bc2,
+	0x393cce,
+	0x2553c3,
+	0x3a7f86,
+	0x3200a82,
+	0x2fa487,
+	0x238f86,
+	0x3601102,
+	0x281483,
+	0x281484,
+	0x213046,
+	0x208b88,
+	0x27bb86,
+	0x309a84,
+	0x3a08e82,
+	0x3424c9,
+	0x226c87,
+	0x3967c6,
+	0x36ee49,
+	0x2d4408,
+	0x32b844,
+	0x23e606,
+	0x242dc6,
+	0x3e02a42,
+	0x3ab40f,
+	0x27c54e,
+	0x3572c4,
+	0x211e05,
+	0x329805,
+	0x2f0d49,
+	0x244149,
+	0x213847,
+	0x201286,
 	0x2011c3,
-	0x1ea05ec2,
-	0x2319c3,
-	0x21c8c5,
-	0x237583,
-	0x237589,
-	0x1ee01f02,
-	0x1f608ac2,
-	0x289645,
-	0x219286,
-	0x37c8c6,
-	0x2bfcc8,
-	0x2bfccb,
-	0x20568b,
-	0x21c145,
-	0x2ead45,
-	0x2c3909,
-	0x1603142,
-	0x357f48,
-	0x23e504,
-	0x1fe01b02,
-	0x20aac3,
-	0x20661886,
-	0x224fc8,
-	0x20a003c2,
-	0x307348,
-	0x20e0a6c2,
-	0x23994a,
-	0x212c8d03,
-	0x39f286,
-	0x3b5048,
-	0x389ac8,
-	0x3ba046,
-	0x377d47,
-	0x3a2547,
-	0x23fe0a,
-	0x243404,
-	0x352f84,
-	0x366b89,
-	0x21ba1d45,
-	0x21f6c6,
-	0x200143,
-	0x255184,
-	0x21e25784,
-	0x323307,
-	0x22f607,
-	0x364044,
-	0x2d3345,
-	0x3c1608,
-	0x37b847,
-	0x38fc87,
-	0x22208882,
-	0x23b9c4,
-	0x28e948,
-	0x24e244,
-	0x252944,
-	0x253005,
-	0x253147,
-	0x22b509,
-	0x254004,
-	0x2547c9,
-	0x254a08,
-	0x254f04,
-	0x254f07,
-	0x226553c3,
-	0x255547,
-	0x1626d02,
-	0x16ad402,
-	0x255e86,
-	0x2564c7,
-	0x256b04,
-	0x258487,
-	0x258f47,
-	0x259783,
-	0x329982,
-	0x205dc2,
-	0x270003,
-	0x270004,
-	0x27000b,
-	0x3c0fc8,
-	0x25f184,
-	0x25ad05,
-	0x25cac7,
-	0x25e5c5,
-	0x30590a,
-	0x25f0c3,
-	0x22a12c42,
-	0x212c44,
-	0x261489,
-	0x265183,
-	0x265247,
-	0x2f61c9,
-	0x336308,
-	0x25d1c3,
-	0x27a247,
-	0x27aa89,
-	0x26be83,
-	0x281b04,
-	0x283c89,
-	0x287dc6,
-	0x2266c3,
-	0x2039c2,
-	0x241243,
-	0x2ad207,
-	0x383fc5,
-	0x340346,
-	0x268984,
-	0x2dba05,
-	0x220d03,
-	0x217f86,
-	0x20d0c2,
-	0x3a3984,
-	0x22e2ab02,
-	0x22ab03,
-	0x23201802,
-	0x252843,
-	0x217544,
-	0x217547,
-	0x3c6746,
-	0x255e42,
-	0x23629942,
-	0x384384,
-	0x23a30b82,
-	0x23e01a42,
-	0x337304,
-	0x337305,
-	0x201a45,
-	0x35ab46,
-	0x24208742,
-	0x208745,
-	0x2100c5,
-	0x210ac3,
-	0x213d06,
-	0x214885,
-	0x221102,
-	0x34db45,
-	0x221104,
-	0x227ac3,
-	0x227d03,
-	0x2460ad82,
-	0x298507,
-	0x33a504,
-	0x33a509,
-	0x255084,
-	0x281903,
-	0x35b109,
-	0x281908,
-	0x24b0cc04,
-	0x30cc06,
-	0x2a2c83,
-	0x20cb03,
-	0x30e843,
-	0x24eefe82,
-	0x375502,
-	0x25201402,
-	0x32d8c8,
-	0x327088,
-	0x3a8046,
-	0x2544c5,
-	0x34f5c5,
-	0x31e0c7,
-	0x229985,
-	0x25cd82,
-	0x25694cc2,
-	0x1602202,
-	0x240a88,
-	0x34e285,
-	0x27ca84,
-	0x2e7205,
-	0x241d87,
-	0x25efc4,
-	0x248942,
-	0x25a2dac2,
-	0x33e704,
-	0x226ec7,
-	0x289fc7,
-	0x3393c4,
-	0x291003,
-	0x238bc4,
-	0x238bc8,
-	0x234106,
-	0x2d4a0a,
-	0x22b3c4,
-	0x291508,
-	0x288204,
-	0x227546,
-	0x294c84,
-	0x2ef406,
-	0x33a7c9,
-	0x26d007,
-	0x34e1c3,
-	0x25eebfc2,
-	0x331203,
-	0x207c82,
-	0x2625c982,
-	0x30cf06,
-	0x371e48,
-	0x2a44c7,
-	0x2f7209,
-	0x290ac9,
-	0x2a61c5,
-	0x2a73c9,
-	0x2a7b85,
-	0x2a7cc9,
-	0x2a9045,
-	0x2aa008,
-	0x266598c4,
-	0x26a598c7,
-	0x232583,
-	0x2aa207,
-	0x232586,
-	0x2aa5c7,
-	0x2a0f45,
-	0x2ca8c3,
-	0x26e35c02,
-	0x2ea984,
-	0x27230bc2,
-	0x276552c2,
-	0x2f3ac6,
-	0x277445,
-	0x2acac7,
-	0x326403,
-	0x32f644,
-	0x2130c3,
-	0x23b0c3,
-	0x27a07d02,
-	0x28206202,
-	0x37b084,
-	0x329943,
-	0x24b905,
-	0x28603882,
-	0x28e00c42,
-	0x2e0586,
-	0x31c7c4,
-	0x385444,
-	0x38544a,
-	0x29601342,
-	0x38e2ca,
-	0x39e948,
-	0x29a6ff84,
-	0x201fc3,
-	0x208c43,
-	0x3165c9,
-	0x267709,
-	0x2a6e06,
-	0x29e14bc3,
-	0x214bc5,
-	0x39434d,
-	0x39eb06,
-	0x20e84b,
-	0x2a200802,
-	0x220b88,
-	0x2ca1a802,
-	0x2ce00942,
-	0x2c9a85,
-	0x2d205842,
-	0x21b147,
-	0x2b0747,
-	0x214a43,
-	0x348148,
-	0x2d601102,
-	0x29f384,
-	0x291203,
-	0x325545,
-	0x395983,
-	0x245646,
-	0x223504,
-	0x2fb943,
-	0x2aec03,
-	0x2da03202,
-	0x2eacc4,
-	0x3af385,
-	0x2ace07,
-	0x277e03,
-	0x2ad9c3,
-	0x2ae803,
-	0x16ae8c2,
-	0x2ae8c3,
-	0x2aeb83,
-	0x2de0b0c2,
-	0x39e304,
-	0x2507c6,
-	0x22a443,
-	0x2af343,
-	0x2e2b0102,
-	0x2b0108,
-	0x2b03c4,
-	0x2ee8c6,
-	0x256947,
-	0x3845c6,
-	0x2a4f04,
-	0x3be01ec2,
-	0x23244b,
-	0x2ff28e,
-	0x219e0f,
-	0x2c7b83,
-	0x3c65fe82,
-	0x1647302,
-	0x3ca00a82,
-	0x25b4c3,
-	0x205983,
-	0x2d8746,
-	0x2f1946,
-	0x3c2147,
-	0x2f9084,
-	0x3ce193c2,
-	0x3d21edc2,
-	0x2425c5,
-	0x2e44c7,
-	0x37fd86,
-	0x3d64d542,
-	0x30de04,
-	0x2b7b43,
-	0x3da09602,
-	0x3df63443,
-	0x2b8444,
-	0x2bd289,
-	0x16c2482,
-	0x3e20dd82,
-	0x327e05,
-	0x3e6c2702,
-	0x3ea00682,
-	0x352307,
-	0x214fc9,
-	0x36754b,
-	0x3a2305,
-	0x26ad09,
-	0x37e806,
-	0x20bd47,
-	0x3ee074c4,
-	0x348c89,
-	0x337b07,
-	0x224c87,
-	0x230803,
-	0x2afc46,
-	0x30a7c7,
-	0x20fbc3,
-	0x2f0d46,
-	0x3f6038c2,
-	0x3fa0e402,
-	0x3bec83,
-	0x32f245,
-	0x332807,
-	0x222386,
-	0x383f45,
-	0x2f3f04,
-	0x278f45,
-	0x2f2144,
-	0x3fe00f82,
-	0x341587,
-	0x2f2984,
-	0x26a444,
-	0x34694d,
-	0x26a449,
-	0x230b08,
-	0x25c404,
-	0x335ec5,
-	0x20a047,
-	0x341144,
-	0x23cf47,
-	0x204cc5,
-	0x402a4e44,
-	0x30bcc5,
-	0x263e44,
-	0x390706,
-	0x3206c5,
-	0x406291c2,
-	0x210fc4,
-	0x210fc5,
-	0x35d8c6,
-	0x343b85,
-	0x25d144,
-	0x3c6103,
-	0x20eb46,
-	0x22b705,
-	0x22f045,
-	0x3207c4,
-	0x22b443,
-	0x22b44c,
-	0x40aacf02,
-	0x40e0a5c2,
-	0x41201542,
-	0x20f003,
-	0x20f004,
-	0x41604482,
-	0x30ae88,
-	0x340405,
-	0x236184,
-	0x243686,
-	0x41a0e302,
-	0x41e1de42,
-	0x422000c2,
-	0x2b2cc5,
-	0x294346,
-	0x229304,
-	0x357946,
-	0x35c206,
-	0x222a83,
-	0x4272850a,
-	0x26b085,
-	0x28b003,
-	0x228606,
-	0x304789,
-	0x228607,
-	0x292288,
-	0x2c7789,
-	0x31d348,
-	0x250e46,
-	0x209703,
-	0x42a6f582,
-	0x392c08,
-	0x42e54ac2,
-	0x43201e42,
-	0x20be83,
-	0x2d8345,
-	0x26ba04,
-	0x3b6fc9,
-	0x2ee004,
-	0x21b388,
-	0x20dc03,
-	0x323004,
-	0x2a5fc3,
-	0x2192c8,
-	0x346887,
-	0x43a25242,
-	0x290ec2,
-	0x31a685,
-	0x39cf89,
-	0x21f743,
-	0x27bfc4,
-	0x394304,
-	0x20a0c3,
-	0x27d04a,
-	0x43f7c0c2,
-	0x44210f82,
-	0x2c3143,
-	0x37ea83,
-	0x1600082,
-	0x200083,
-	0x44603282,
-	0x44a05a02,
-	0x44e1a484,
-	0x322046,
-	0x2e07c6,
-	0x245e44,
-	0x277043,
-	0x345c03,
-	0x2ec1c3,
-	0x2452c6,
-	0x341d05,
-	0x2c32c7,
-	0x2c6445,
-	0x2c7d86,
-	0x2c8708,
-	0x2c8906,
-	0x24efc4,
-	0x29960b,
-	0x2cb583,
-	0x2cb585,
-	0x2cba08,
-	0x21a202,
-	0x352602,
-	0x4524cd02,
-	0x4560d682,
-	0x219403,
-	0x45a6cd82,
-	0x26cd83,
-	0x2cbd04,
-	0x2cc543,
-	0x462168c2,
-	0x466d0e06,
-	0x25e446,
-	0x46ad0f42,
-	0x46e0ff02,
-	0x47227d42,
-	0x4763a3c2,
-	0x47a1b5c2,
-	0x47e047c2,
-	0x20dec3,
-	0x358645,
-	0x2b6306,
-	0x48226444,
-	0x38ce0a,
-	0x3a0546,
-	0x21c384,
-	0x277943,
-	0x48e02f02,
-	0x2032c2,
-	0x26fb43,
-	0x4920ec83,
-	0x2e6747,
-	0x3205c7,
-	0x4aa70107,
-	0x393f87,
-	0x22cd03,
-	0x3176ca,
-	0x251304,
-	0x397504,
-	0x39750a,
-	0x247705,
-	0x4ae1f682,
-	0x258443,
-	0x4b202002,
-	0x228803,
-	0x3311c3,
-	0x4ba02742,
-	0x26f484,
-	0x220704,
-	0x2046c5,
-	0x3080c5,
-	0x34e4c6,
-	0x34e846,
-	0x4be53982,
-	0x4c201382,
-	0x2f8545,
-	0x25e152,
-	0x33f206,
-	0x25e8c3,
-	0x39d486,
-	0x2a1f45,
-	0x1604842,
-	0x54610c82,
-	0x35e3c3,
-	0x210c83,
-	0x27e483,
-	0x54a0c502,
-	0x381c43,
-	0x54e06e02,
+	0x4221d42,
+	0x22c243,
+	0x26024a,
+	0x4611783,
+	0x259b85,
+	0x323182,
+	0x38a509,
+	0x4a01742,
+	0x20b104,
+	0x311586,
+	0x2768c5,
+	0x369c44,
+	0x5222244,
+	0x208403,
+	0x235504,
+	0x5600fc2,
+	0x26a604,
+	0x5a83d04,
+	0x37140a,
+	0x5e00882,
+	0x2ebc87,
+	0x27bf08,
+	0x6e034c2,
+	0x2756c7,
+	0x22ebc4,
+	0x2c2587,
+	0x22ebc5,
+	0x33c847,
+	0x38f246,
+	0x307c84,
+	0x307c85,
+	0x290847,
+	0x7e05002,
+	0x324143,
+	0x207ac2,
+	0x38f1c3,
+	0x8215402,
+	0x215405,
+	0x8600202,
+	0x2bd444,
+	0x27a605,
+	0x357207,
+	0x370d8e,
+	0x23d0c4,
+	0x236d04,
+	0x20b403,
+	0x3735c9,
+	0x20b40b,
+	0x21c948,
+	0x36ec08,
+	0x258748,
+	0x21dec8,
+	0x32b68a,
+	0x33c747,
+	0x2ad1c6,
+	0x8a4f342,
+	0x340b03,
+	0x341843,
+	0x341c44,
+	0x3af7c3,
+	0x340b43,
+	0x1734b82,
+	0x8e00bc2,
+	0x281945,
+	0x295646,
+	0x27e904,
+	0x35e907,
+	0x3ced06,
+	0x382384,
+	0x382387,
+	0x200bc3,
+	0x92cb6c2,
+	0x9720542,
+	0x9a2e5c2,
+	0x22e5c6,
+	0x9e00282,
+	0x2ab0c5,
+	0x3360c3,
+	0x3cb184,
+	0x2edfc4,
+	0x2edfc5,
+	0x207183,
+	0xa203a83,
+	0xa60a982,
+	0x20c2c5,
+	0x20c2cb,
+	0x20d086,
+	0x25920b,
+	0x239e44,
+	0x20da89,
+	0x20e784,
+	0xaa0e9c2,
+	0x20f203,
+	0x20f783,
+	0x1602742,
+	0x3b8983,
+	0x2103ca,
+	0xae12802,
+	0x3d04c5,
+	0x2de10a,
+	0x36ca44,
+	0x212803,
+	0x214204,
+	0x215703,
+	0x215704,
+	0x215707,
+	0x215e05,
+	0x216e46,
+	0x217146,
+	0x217ec3,
+	0x21c408,
+	0x215183,
+	0xb204ac2,
+	0x24b688,
+	0x3c47cb,
+	0x221648,
+	0x222b86,
+	0x223c07,
+	0x2288c8,
+	0xc202142,
+	0xc6c2742,
+	0x3131c8,
+	0x303007,
+	0x282385,
+	0x38e948,
+	0x2dca48,
+	0x2b11c3,
+	0x22bcc4,
+	0x341c82,
+	0xca2db82,
+	0xce06b82,
+	0xd62dcc2,
+	0x22dcc3,
+	0xda00f82,
+	0x203083,
+	0x2e3304,
+	0x20d303,
+	0x324504,
+	0x372a8b,
+	0x235c43,
+	0x2e6e06,
+	0x235c44,
+	0x3bb64e,
+	0x24d845,
+	0x3a8088,
+	0x3a0107,
+	0x3a010a,
+	0x20b5c3,
+	0x23b987,
+	0x20b5c5,
+	0x2325c4,
+	0x2cd786,
+	0x2cd787,
+	0x2d7804,
+	0x2efd07,
+	0x302a44,
+	0x200f84,
+	0x3710c6,
+	0x25d904,
+	0x32cdc6,
+	0x2078c3,
+	0x38e708,
+	0x2078c8,
+	0x236cc3,
+	0x3b8943,
+	0x3b0984,
+	0x3b50c3,
+	0xde4ce42,
+	0xe28e502,
+	0x203a03,
+	0x2084c6,
+	0x208d03,
+	0x231f84,
+	0xe73d042,
+	0x356203,
+	0x33d043,
+	0x219542,
+	0xea0ae02,
+	0x2c5206,
+	0x237447,
+	0x2ec307,
+	0x399145,
+	0x211384,
+	0x290705,
+	0x2838c7,
+	0x2d24c9,
+	0x2e29c6,
+	0x2e8448,
+	0x2fb686,
+	0xee03442,
+	0x353608,
+	0x2fccc6,
+	0x343945,
+	0x318f87,
+	0x319e44,
+	0x319e45,
+	0x2044c4,
+	0x2044c8,
+	0xf20c382,
+	0xf600482,
+	0x343646,
+	0x200488,
+	0x3553c5,
+	0x356586,
+	0x35d948,
+	0x386088,
+	0xfa0c105,
+	0xfe3a0c4,
+	0x388887,
+	0x1020e202,
+	0x10602d42,
+	0x11a07c02,
+	0x311685,
+	0x2a5b45,
+	0x259786,
+	0x2be287,
+	0x3c6807,
+	0x1220d183,
+	0x29f687,
+	0x2e9d08,
+	0x1b62efc9,
+	0x393e87,
+	0x22fec7,
+	0x230908,
+	0x231106,
+	0x2320c6,
+	0x232d0c,
+	0x233a8a,
+	0x234407,
+	0x23638b,
+	0x237287,
+	0x23728e,
+	0x1ba38204,
+	0x2385c4,
+	0x23bc07,
+	0x264107,
+	0x2431c6,
+	0x2431c7,
+	0x243a47,
+	0x1be03382,
+	0x244606,
+	0x24460a,
+	0x244e8b,
+	0x246607,
+	0x2471c5,
+	0x247603,
+	0x247b46,
+	0x247b47,
+	0x275083,
+	0x1c200102,
+	0x24894a,
+	0x1c777a42,
+	0x1ca4ce82,
+	0x1ce4b382,
+	0x1d239082,
+	0x24c3c5,
+	0x24cb44,
+	0x1da1d2c2,
+	0x26a685,
+	0x245483,
+	0x20e885,
+	0x21ddc4,
+	0x223ac4,
+	0x30a986,
+	0x31bc06,
+	0x20c4c3,
+	0x3b4984,
+	0x370703,
+	0x1ea03282,
+	0x223f84,
+	0x388e06,
+	0x223f85,
+	0x2d0a86,
+	0x319088,
+	0x2a6744,
+	0x22f648,
+	0x3a52c5,
+	0x23fc08,
+	0x38df86,
+	0x322207,
+	0x247944,
+	0x247946,
+	0x29f983,
+	0x3a0783,
+	0x318348,
+	0x32db04,
+	0x35df87,
+	0x1fe06086,
+	0x2db609,
+	0x330808,
+	0x33d0c8,
+	0x39b184,
+	0x2142c3,
+	0x231942,
+	0x20211702,
+	0x20617c42,
+	0x214983,
+	0x20a22082,
+	0x3724c4,
+	0x24c1c6,
+	0x324245,
+	0x2a1cc3,
+	0x22f304,
+	0x2b5887,
+	0x390503,
+	0x240d48,
+	0x2257c5,
+	0x260d43,
+	0x27a585,
+	0x27a6c4,
+	0x3016c6,
+	0x22a404,
+	0x22d606,
+	0x357146,
+	0x2bd984,
+	0x237643,
+	0x20e22482,
+	0x236b05,
 	0x200843,
-	0x39e348,
-	0x285603,
-	0x2a6046,
-	0x23ecc7,
-	0x30b986,
-	0x30b98b,
-	0x21c2c7,
-	0x2ea784,
-	0x55601c82,
-	0x340285,
-	0x55a09cc3,
-	0x292c83,
-	0x239b45,
-	0x3175c3,
-	0x55f175c6,
-	0x3580ca,
-	0x245ac3,
-	0x23e004,
-	0x202586,
-	0x223e86,
-	0x56241d03,
-	0x32f507,
-	0x2a6d07,
-	0x29ae85,
+	0x21202d02,
+	0x232083,
+	0x21d845,
+	0x2355c3,
+	0x2355c9,
+	0x21600942,
+	0x21e03782,
+	0x28de05,
+	0x21a546,
+	0x2a74c6,
+	0x2c5808,
+	0x2c580b,
+	0x20850b,
+	0x359485,
+	0x399345,
+	0x2cbe09,
+	0x1601042,
+	0x2d0708,
+	0x209084,
+	0x22606ac2,
+	0x25b083,
+	0x22e642c6,
+	0x23d508,
+	0x23200c02,
+	0x2279c8,
+	0x2360b782,
+	0x2bc00a,
+	0x23ad1803,
+	0x3d2246,
+	0x35f088,
+	0x30b7c8,
+	0x2c8006,
+	0x385507,
+	0x3ab607,
+	0x24294a,
+	0x36cac4,
+	0x35cc84,
+	0x3759c9,
+	0x243aae05,
+	0x27c746,
+	0x229c03,
+	0x253004,
+	0x246cbd04,
+	0x373207,
+	0x238407,
+	0x2bb144,
+	0x2e3385,
+	0x259848,
+	0x24d187,
+	0x24d607,
+	0x24a19902,
+	0x313804,
+	0x292b48,
+	0x24ec04,
+	0x250244,
+	0x251385,
+	0x2514c7,
+	0x39e1c9,
+	0x251f04,
+	0x252489,
+	0x2526c8,
+	0x252d84,
+	0x252d87,
+	0x24e540c3,
+	0x254247,
+	0x1625a82,
+	0x16b0d42,
+	0x254dc6,
+	0x255407,
+	0x255884,
+	0x256907,
+	0x257487,
+	0x258083,
+	0x231ac2,
+	0x208c42,
+	0x271b03,
+	0x271b04,
+	0x271b0b,
+	0x36ed08,
+	0x25fd84,
+	0x25bf45,
+	0x25cd07,
+	0x25e585,
+	0x2d004a,
+	0x25fcc3,
+	0x25201482,
+	0x223184,
+	0x263ec9,
+	0x2682c3,
+	0x268387,
+	0x3cc409,
+	0x21d508,
+	0x23ab03,
+	0x27fc47,
+	0x2802c9,
+	0x26e9c3,
+	0x2882c4,
+	0x2897c9,
+	0x28bf06,
+	0x357503,
+	0x2051c2,
+	0x23e5c3,
+	0x3c63c7,
+	0x2dcdc5,
+	0x34a2c6,
+	0x25a644,
+	0x2e4cc5,
+	0x21ffc3,
+	0x218106,
+	0x20dc82,
+	0x3ac1c4,
+	0x25627242,
+	0x25a39f03,
+	0x25e02b02,
+	0x250143,
+	0x202b04,
+	0x2175c7,
+	0x3cb486,
+	0x27dd02,
+	0x2625dac2,
+	0x319284,
+	0x2662e342,
+	0x26a00ac2,
+	0x2b2b04,
+	0x2b2b05,
+	0x206a05,
+	0x363b06,
+	0x26e0f982,
+	0x20f985,
+	0x210785,
+	0x212683,
+	0x217746,
+	0x222545,
+	0x22e542,
+	0x355005,
+	0x22e544,
+	0x2cf343,
+	0x358543,
+	0x2720ba82,
+	0x2da587,
+	0x3692c4,
+	0x3692c9,
+	0x252f04,
+	0x2880c3,
+	0x35c589,
+	0x2880c8,
+	0x276a59c4,
+	0x2a59c6,
+	0x2aad43,
+	0x20a683,
+	0x214d83,
+	0x27af8fc2,
+	0x2fc642,
+	0x27e00642,
+	0x337cc8,
+	0x2f5488,
+	0x3afdc6,
+	0x26e105,
+	0x23b805,
+	0x202587,
+	0x2c1a05,
+	0x25cfc2,
+	0x28297982,
+	0x28600042,
+	0x23de08,
+	0x353545,
+	0x2f2a04,
+	0x24a745,
+	0x24e787,
+	0x271684,
+	0x248842,
+	0x28a04bc2,
+	0x348684,
+	0x358187,
+	0x3cbf47,
+	0x33c804,
+	0x294cc3,
+	0x236c04,
+	0x236c08,
+	0x232406,
+	0x2cd60a,
+	0x39fd04,
+	0x2951c8,
+	0x28c344,
+	0x223d06,
+	0x297944,
 	0x311986,
-	0x22b743,
-	0x58e13f43,
-	0x59206f02,
-	0x21a244,
-	0x207609,
-	0x240887,
-	0x229a85,
-	0x247d04,
-	0x26c7c8,
-	0x273b85,
-	0x59676405,
-	0x284e49,
-	0x347a43,
-	0x24d584,
-	0x59a0b182,
-	0x219603,
-	0x59e94742,
-	0x299986,
-	0x162bac2,
-	0x5a2a47c2,
-	0x2b2bc8,
-	0x3a76c3,
-	0x30bc07,
-	0x2ce245,
-	0x2b2785,
-	0x2d8e4b,
-	0x2d9846,
-	0x2d9046,
-	0x2dc486,
-	0x279f04,
-	0x2dc6c6,
-	0x5a6f0248,
-	0x237cc3,
-	0x201f83,
-	0x201f84,
-	0x2ddbc4,
-	0x2dde87,
-	0x2df2c5,
-	0x5aadf402,
-	0x5ae08302,
-	0x208305,
-	0x2bb184,
-	0x2e298b,
-	0x2e3708,
-	0x298804,
-	0x230982,
-	0x5b64e882,
-	0x24e883,
-	0x2e3f04,
-	0x2e41c5,
-	0x2e4d07,
-	0x2e6d44,
-	0x21c184,
-	0x5ba057c2,
-	0x36b449,
-	0x2e84c5,
-	0x3a25c5,
-	0x2e9045,
-	0x5be19543,
-	0x2e9d04,
-	0x2e9d0b,
-	0x2ea0c4,
-	0x2ea38b,
-	0x2ec105,
-	0x219f4a,
-	0x2ecec8,
-	0x2ed0ca,
-	0x2ed983,
-	0x2ed98a,
-	0x5c21fc42,
-	0x5c648602,
-	0x209943,
-	0x5caf1382,
-	0x2f1383,
-	0x5cf6c182,
-	0x5d32c442,
-	0x2f1fc4,
-	0x21a846,
-	0x357685,
-	0x2f3d83,
-	0x31adc6,
-	0x34f085,
-	0x250ac4,
-	0x5d600382,
-	0x2aefc4,
-	0x2c358a,
-	0x398a07,
-	0x3477c6,
-	0x24f3c7,
-	0x244a03,
-	0x2b8488,
-	0x3a1f8b,
-	0x2bd905,
-	0x27c785,
-	0x27c786,
-	0x2dd704,
-	0x3b5288,
-	0x21d343,
-	0x230004,
-	0x230007,
-	0x2f4a06,
-	0x31fa06,
-	0x2e200a,
-	0x254844,
-	0x31104a,
-	0x5db364c6,
-	0x3364c7,
-	0x25ad87,
-	0x273544,
-	0x273549,
-	0x250485,
-	0x31cf4b,
-	0x2e1283,
-	0x225b43,
-	0x5de20b43,
-	0x2344c4,
-	0x5e200982,
-	0x3a3006,
-	0x5e6ca645,
-	0x39d6c5,
-	0x258c46,
-	0x29cd44,
-	0x5ea07bc2,
-	0x247c44,
-	0x5ee16f02,
-	0x224645,
-	0x23f4c4,
-	0x228d83,
-	0x5f610cc2,
-	0x210cc3,
-	0x267b86,
-	0x5fa00a02,
-	0x2073c8,
-	0x228484,
-	0x228486,
-	0x37f306,
-	0x25cb84,
-	0x20eac5,
-	0x21cfc8,
-	0x220f87,
-	0x2227c7,
-	0x2227cf,
-	0x28e846,
-	0x309bc3,
-	0x398184,
-	0x233744,
-	0x2101c3,
-	0x227684,
-	0x34fd84,
-	0x5fe030c2,
-	0x289a43,
-	0x372e83,
-	0x60207c02,
-	0x25c503,
-	0x322683,
-	0x21578a,
-	0x207c07,
-	0x2534cc,
-	0x253786,
-	0x255246,
-	0x256647,
-	0x60632f47,
-	0x25c889,
-	0x22c504,
-	0x25eb04,
-	0x60a09f82,
-	0x60e01282,
-	0x2e23c6,
+	0x369589,
+	0x239307,
+	0x21c803,
+	0x28e05642,
+	0x39b403,
+	0x20ebc2,
+	0x2923ed42,
+	0x315086,
+	0x37efc8,
+	0x2a7647,
+	0x2fe609,
+	0x294709,
+	0x2a8e45,
+	0x2a9f09,
+	0x2aa6c5,
+	0x2aa809,
+	0x2abd45,
+	0x2ad808,
+	0x29612384,
+	0x29a581c7,
+	0x230283,
+	0x2ada07,
+	0x230286,
+	0x2ae6c7,
+	0x2a4b05,
+	0x2e01c3,
+	0x29e33842,
+	0x212a44,
+	0x2a22e382,
+	0x2a6586c2,
+	0x2f2046,
+	0x27be85,
+	0x2b09c7,
+	0x275b83,
+	0x33a5c4,
+	0x207d43,
+	0x312f03,
+	0x2aa00d42,
+	0x2b207842,
+	0x3897c4,
+	0x231a83,
+	0x24bec5,
+	0x2b615642,
+	0x2be04182,
+	0x3001c6,
+	0x32dc44,
+	0x3ce184,
+	0x3ce18a,
+	0x2c6005c2,
+	0x26ce03,
+	0x211b0a,
+	0x219888,
+	0x2ca24604,
+	0x2005c3,
+	0x20c9c3,
+	0x258889,
+	0x2080c9,
+	0x277ec6,
+	0x2ce19a43,
+	0x222885,
+	0x32f34d,
+	0x219a46,
+	0x22544b,
+	0x2d2071c2,
+	0x21fe48,
+	0x2fa13282,
+	0x2fe01142,
+	0x2b9c45,
+	0x30200b02,
+	0x39f2c7,
+	0x2b2ec7,
+	0x20c8c3,
+	0x324ec8,
+	0x30602c82,
+	0x2ab804,
+	0x294ec3,
+	0x36f305,
+	0x245586,
+	0x221b84,
+	0x3b8903,
+	0x2b1ec3,
+	0x30a0b202,
+	0x3992c4,
+	0x3b6a05,
+	0x3bc407,
+	0x27ddc3,
+	0x2b0fc3,
+	0x2b1683,
+	0x1615002,
+	0x2b1743,
+	0x2b1e43,
+	0x30e0a242,
+	0x310884,
+	0x31be06,
+	0x353d03,
+	0x2b2183,
+	0x312b38c2,
+	0x2b38c8,
+	0x2b4884,
+	0x310e46,
+	0x260787,
+	0x273a06,
+	0x3688c4,
+	0x3ee05682,
+	0x23014b,
+	0x2f700e,
+	0x21b0cf,
+	0x2d46c3,
+	0x3f661282,
+	0x1646c02,
+	0x3fa08802,
+	0x2923c3,
+	0x208803,
+	0x2d2746,
+	0x2e30c6,
+	0x3c9007,
+	0x300c44,
+	0x3fe1a682,
+	0x40225cc2,
+	0x24e605,
+	0x2ef687,
+	0x395a86,
+	0x406125c2,
+	0x2125c4,
+	0x2b8ac3,
+	0x40a0b2c2,
+	0x40f6de43,
+	0x2b9504,
+	0x2c1909,
+	0x412c6fc2,
+	0x41618e42,
+	0x331885,
+	0x41ac74c2,
+	0x41e00e42,
+	0x35bf47,
+	0x215b49,
+	0x37660b,
+	0x3ab3c5,
+	0x26d9c9,
+	0x38c706,
+	0x20d0c7,
+	0x42201d44,
+	0x216909,
+	0x3410c7,
+	0x2165c7,
+	0x227b03,
+	0x2b2986,
+	0x313fc7,
+	0x249583,
+	0x36be86,
+	0x42a10682,
+	0x42e35842,
+	0x39b543,
+	0x33a1c5,
+	0x393187,
+	0x221046,
+	0x2dcd45,
+	0x259c44,
+	0x27efc5,
+	0x2fc044,
+	0x432023c2,
+	0x370007,
+	0x2c5fc4,
+	0x207fc4,
+	0x207fcd,
+	0x2d6889,
+	0x22e2c8,
+	0x2775c4,
+	0x34c745,
+	0x39bb87,
+	0x208ec4,
+	0x3cedc7,
+	0x218bc5,
+	0x43619e04,
+	0x2b1885,
+	0x266f84,
+	0x286406,
+	0x2be085,
+	0x43a12582,
+	0x3a25c3,
+	0x2dce84,
+	0x2dce85,
+	0x3421c6,
+	0x32d645,
+	0x23aa84,
+	0x25d383,
+	0x221fc6,
+	0x2fbc45,
+	0x3cf745,
+	0x2be184,
+	0x2e9983,
+	0x39fd8c,
+	0x43f4e142,
+	0x4420fc42,
+	0x44604942,
+	0x224f03,
+	0x224f04,
+	0x44a0e7c2,
+	0x303548,
+	0x34a385,
+	0x247d84,
+	0x364846,
+	0x44e16182,
+	0x4522c9c2,
+	0x45602a82,
+	0x2a7a45,
+	0x2bd846,
+	0x239a44,
+	0x213586,
+	0x2eba46,
+	0x231dc3,
+	0x45b33a0a,
+	0x26dd45,
+	0x260203,
+	0x224d06,
+	0x38b149,
+	0x224d07,
+	0x2a2488,
+	0x2d42c9,
+	0x276248,
+	0x2f9686,
+	0x20a783,
+	0x45e9f702,
+	0x3a1a88,
+	0x46252782,
+	0x46602002,
+	0x20d203,
+	0x2e2845,
+	0x26e544,
+	0x252b49,
+	0x2eb2c4,
+	0x219c48,
+	0x20ec03,
+	0x46f72f04,
+	0x21a588,
+	0x207f07,
+	0x47212642,
+	0x23f7c2,
+	0x329785,
+	0x269a49,
+	0x272203,
+	0x282104,
 	0x32f304,
-	0x2d3146,
-	0x2333c8,
-	0x239444,
-	0x21b186,
-	0x37c885,
-	0x285048,
-	0x205883,
-	0x28a685,
-	0x290cc3,
-	0x3a26c3,
-	0x3a26c4,
-	0x212c03,
-	0x6125fd82,
-	0x61603a42,
-	0x2e1149,
-	0x299885,
-	0x2a1084,
-	0x2a4a45,
-	0x212384,
-	0x393607,
-	0x353f05,
-	0x2702c4,
-	0x2702c8,
-	0x2e61c6,
-	0x2e9f84,
-	0x2ede88,
-	0x2f27c7,
-	0x61a04042,
-	0x316244,
-	0x210284,
-	0x224e87,
-	0x61e04044,
-	0x2c9002,
-	0x6220ed42,
-	0x221b83,
-	0x2d37c4,
-	0x29bb43,
-	0x2aacc5,
-	0x6262e642,
-	0x2fddc5,
-	0x23a382,
-	0x390c85,
-	0x372005,
-	0x62a04e02,
-	0x339b84,
-	0x62e06a42,
-	0x3aba46,
-	0x3a7346,
-	0x39d0c8,
-	0x2be888,
-	0x2f3a44,
-	0x303685,
-	0x316049,
-	0x2eadc4,
-	0x358084,
-	0x2b6983,
-	0x6320fd85,
-	0x2c2547,
-	0x21fc84,
-	0x3ae54d,
-	0x2f4682,
-	0x3b35c3,
-	0x2f4683,
-	0x63601b42,
-	0x396e45,
-	0x223747,
-	0x2b9604,
-	0x394047,
-	0x2c7989,
-	0x2c36c9,
-	0x275247,
-	0x202bc3,
-	0x3a7508,
-	0x25b949,
-	0x2f5487,
-	0x2f5805,
-	0x2f6706,
-	0x2f6d46,
-	0x2f6ec5,
-	0x26a545,
-	0x63a00d42,
-	0x2b7685,
-	0x2b3a08,
-	0x2c08c6,
-	0x63e872c7,
-	0x2ec344,
-	0x2b8047,
-	0x2f9206,
-	0x6420a402,
-	0x35d5c6,
-	0x2fc9ca,
-	0x2fd245,
-	0x646da942,
-	0x64a4eb02,
-	0x30ab06,
-	0x386548,
-	0x64e8a187,
-	0x6523c902,
-	0x215c43,
-	0x20c246,
-	0x229144,
-	0x3b2f86,
-	0x201746,
-	0x34290a,
-	0x325e45,
-	0x3559c6,
-	0x39ec43,
-	0x39ec44,
-	0x202c02,
-	0x31c743,
-	0x6560f042,
-	0x30b743,
-	0x38e544,
-	0x2b2484,
-	0x38668a,
-	0x214c43,
-	0x277208,
-	0x250f0a,
-	0x23f747,
-	0x300986,
-	0x260484,
-	0x21c242,
-	0x2a3702,
-	0x65a02982,
-	0x238b83,
-	0x25ab47,
-	0x202987,
-	0x284d04,
-	0x3a4f87,
-	0x2e4e06,
-	0x221287,
-	0x303304,
-	0x399d85,
-	0x292705,
-	0x65e1b2c2,
-	0x3c50c6,
-	0x223443,
-	0x22a4c2,
-	0x22a4c6,
-	0x66222342,
-	0x6660e982,
-	0x3bb945,
-	0x66a27882,
-	0x66e01c42,
-	0x334e85,
-	0x2c51c5,
-	0x355a85,
-	0x289043,
-	0x244185,
-	0x2d9907,
-	0x2feb45,
-	0x370005,
-	0x33d8c4,
-	0x310806,
-	0x381d44,
-	0x67202a82,
-	0x67ee7585,
-	0x2a3ac7,
-	0x34f408,
-	0x261146,
-	0x26114d,
-	0x2674c9,
-	0x2674d2,
-	0x300585,
-	0x309f43,
-	0x6820c202,
-	0x30ee44,
-	0x39eb83,
-	0x33b0c5,
-	0x2fdf05,
-	0x68630882,
-	0x25f803,
-	0x68a51b02,
-	0x692d6142,
-	0x69602242,
-	0x2a1d45,
-	0x394183,
-	0x3c4f08,
-	0x69a0ad42,
-	0x69e0c842,
-	0x26f446,
-	0x317c4a,
-	0x20e043,
-	0x25d0c3,
-	0x337d03,
-	0x6aa04182,
-	0x78e0c542,
-	0x79600d82,
-	0x206d02,
-	0x35d3c9,
-	0x2c18c4,
-	0x2a9348,
-	0x79af3dc2,
-	0x79e01ac2,
-	0x2ea5c5,
-	0x238788,
-	0x39e488,
-	0x268b8c,
-	0x23f683,
-	0x7a263802,
-	0x7a611d82,
-	0x270d46,
-	0x301805,
-	0x2787c3,
-	0x253c06,
-	0x301946,
-	0x29bc83,
-	0x303b03,
-	0x303f46,
-	0x304b84,
-	0x239a46,
-	0x214a05,
-	0x214a0a,
-	0x24c1c4,
-	0x305244,
-	0x305b8a,
-	0x7aa04982,
-	0x24c345,
-	0x30798a,
-	0x308305,
-	0x308bc4,
-	0x308cc6,
-	0x308e44,
-	0x2198c6,
-	0x7ae308c2,
-	0x2f3446,
-	0x341ac5,
-	0x325cc7,
-	0x3adf46,
-	0x256844,
-	0x2d2387,
-	0x328446,
-	0x241a05,
-	0x241a07,
-	0x3aed07,
-	0x3aed0e,
-	0x2ebb06,
-	0x23ce05,
-	0x203f87,
-	0x20ff43,
-	0x20ff47,
-	0x217945,
-	0x22f484,
-	0x22f5c2,
-	0x246087,
-	0x2f9104,
-	0x244dc4,
-	0x290d4b,
-	0x220003,
-	0x2e58c7,
-	0x220004,
-	0x2e6047,
-	0x2903c3,
-	0x33ca0d,
-	0x3998c8,
-	0x2297c4,
-	0x2701c5,
-	0x30b205,
-	0x30b643,
-	0x7b228382,
-	0x30d5c3,
-	0x30da83,
-	0x321c04,
-	0x27ab85,
-	0x3c5247,
-	0x39ecc6,
-	0x37c1c3,
-	0x22a60b,
-	0x30e04b,
-	0x2a5c8b,
-	0x2fa5cb,
-	0x2bd60a,
-	0x30548b,
-	0x3245cb,
-	0x360a8c,
-	0x384f4b,
-	0x3c4351,
-	0x3c5d4a,
-	0x30f5cb,
-	0x30f88c,
-	0x30fb8b,
-	0x31010a,
-	0x311bca,
-	0x312bce,
-	0x31324b,
-	0x31350a,
-	0x3145d1,
-	0x314a0a,
-	0x314f0b,
-	0x31544e,
-	0x315d8c,
-	0x316b8b,
-	0x316e4e,
-	0x3171cc,
-	0x318d4a,
-	0x31a04c,
-	0x7b71a34a,
-	0x31af48,
-	0x31ba49,
-	0x32368a,
-	0x32390a,
-	0x323b8b,
-	0x328b4e,
-	0x328ed1,
-	0x330349,
-	0x33058a,
-	0x330bcb,
-	0x332a4a,
-	0x333296,
-	0x334b8b,
-	0x33784a,
-	0x33818a,
-	0x33908b,
-	0x33ab49,
-	0x33d389,
-	0x33de0d,
-	0x33e48b,
-	0x33f38b,
-	0x33fd4b,
-	0x343d49,
-	0x34438e,
-	0x34500a,
-	0x34a4ca,
-	0x34a7ca,
-	0x34afcb,
-	0x34b80b,
-	0x34bacd,
-	0x34d18d,
-	0x34d7d0,
-	0x34dc8b,
-	0x34f9cc,
-	0x34fe8b,
-	0x351e0b,
-	0x35344e,
-	0x353a0b,
-	0x353a0d,
-	0x35964b,
-	0x35a0cf,
-	0x35a48b,
-	0x35acca,
-	0x35b3c9,
-	0x35ba89,
-	0x35cd4b,
-	0x35d00e,
-	0x35e88b,
-	0x35f64f,
-	0x36160b,
-	0x3618cb,
-	0x361b8b,
-	0x36238a,
-	0x367149,
-	0x36a18f,
-	0x36f54c,
-	0x37038c,
-	0x37108e,
-	0x37158f,
-	0x37194e,
-	0x3722d0,
-	0x3726cf,
-	0x3731ce,
-	0x373f8c,
-	0x374292,
-	0x375211,
-	0x375a0e,
-	0x375e8e,
-	0x3763ce,
-	0x37674f,
-	0x376b0e,
-	0x376e93,
-	0x377351,
-	0x37778c,
-	0x377a8e,
-	0x377f0c,
-	0x378513,
-	0x378ed0,
-	0x37970c,
-	0x379a0c,
-	0x379ecb,
-	0x37ac8e,
-	0x37b18b,
-	0x37b5cb,
-	0x37ca4c,
-	0x3825ca,
-	0x38474c,
-	0x384a4c,
-	0x384d49,
-	0x387e0b,
-	0x3880c8,
-	0x388889,
-	0x38888f,
-	0x38a08b,
-	0x7bb8afca,
-	0x38e8cc,
-	0x38fa89,
-	0x390a48,
-	0x39100b,
-	0x39158b,
-	0x39220a,
-	0x39248b,
-	0x39298c,
-	0x393d48,
-	0x39a40b,
-	0x39d80b,
-	0x3a114e,
-	0x3a27cb,
-	0x3a410b,
-	0x3ae88b,
-	0x3aeb49,
-	0x3af08d,
-	0x3b368a,
-	0x3b45d7,
-	0x3b5cd8,
-	0x3b9749,
-	0x3bb58b,
-	0x3bc1d4,
-	0x3bc6cb,
-	0x3bcc4a,
-	0x3bd14a,
-	0x3bd3cb,
-	0x3bf610,
-	0x3bfa11,
-	0x3c00ca,
-	0x3c394d,
-	0x3c404d,
-	0x3c61cb,
-	0x3c6a06,
-	0x3c51c3,
-	0x7bf74a03,
-	0x2dd1c6,
-	0x245a05,
-	0x252087,
-	0x324486,
-	0x1601182,
-	0x2cbe89,
-	0x31abc4,
-	0x2d8988,
-	0x220a83,
-	0x30ed87,
-	0x201c02,
-	0x2acb03,
-	0x7c200dc2,
-	0x2c4946,
-	0x2c5c84,
-	0x21a604,
-	0x349a43,
-	0x349a45,
-	0x7cac2742,
-	0x7cea8044,
-	0x273487,
-	0x7d22f442,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x20ae43,
-	0x200742,
-	0xcd588,
-	0x202c42,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0x207c03,
-	0x32eb56,
-	0x356d13,
-	0x3a4e09,
-	0x38c988,
-	0x340109,
-	0x307b06,
-	0x33e750,
-	0x248c93,
-	0x2f4ac8,
-	0x2a5687,
-	0x2b6f87,
-	0x278c8a,
-	0x38e5c9,
-	0x342549,
-	0x28b30b,
-	0x31ca86,
-	0x20850a,
-	0x225f06,
-	0x31a7c3,
-	0x298445,
-	0x207808,
-	0x3abb0d,
-	0x2ef1cc,
-	0x35cac7,
-	0x312f0d,
-	0x21d0c4,
-	0x23478a,
-	0x23598a,
-	0x235e4a,
-	0x21fa07,
-	0x243507,
-	0x245fc4,
-	0x27b986,
-	0x3264c4,
-	0x2e01c8,
-	0x2ee049,
-	0x2bfcc6,
-	0x2bfcc8,
-	0x24944d,
-	0x2c3909,
-	0x389ac8,
-	0x3a2547,
-	0x2f1c0a,
-	0x2564c6,
-	0x260fc7,
-	0x306a04,
-	0x214707,
-	0x3105ca,
-	0x378a0e,
-	0x229985,
-	0x3bfe0b,
-	0x300389,
-	0x267709,
-	0x2b0587,
-	0x3694ca,
-	0x224dc7,
-	0x2ff3c9,
-	0x31e5c8,
-	0x239e8b,
-	0x2d8345,
-	0x2309ca,
-	0x227b09,
-	0x3abe0a,
-	0x2c64cb,
-	0x21460b,
-	0x28b095,
-	0x306745,
-	0x3a25c5,
-	0x2e9d0a,
-	0x2a6f0a,
-	0x300107,
-	0x2388c3,
-	0x2e2348,
-	0x2cf00a,
-	0x228486,
-	0x25b789,
-	0x285048,
-	0x2e9f84,
-	0x29bb49,
-	0x2be888,
-	0x36c607,
-	0x2e7586,
-	0x2a3ac7,
-	0x2ac6c7,
-	0x2450c5,
-	0x2297cc,
-	0x2701c5,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x202c42,
-	0x20be03,
-	0x20ec83,
-	0x20ae43,
-	0x241d03,
-	0x20be03,
-	0x20ec83,
-	0xae43,
-	0x285603,
-	0x241d03,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0xcd588,
-	0x202c42,
-	0x209d42,
-	0x236082,
-	0x201102,
-	0x2013c2,
-	0x2db482,
-	0x460be03,
-	0x237583,
-	0x203d43,
-	0x30e843,
-	0x214bc3,
-	0x21f743,
-	0x2d1206,
-	0x20ec83,
-	0x241d03,
-	0x238843,
-	0xcd588,
-	0x323584,
-	0x322dc7,
-	0x34a403,
-	0x2402c4,
-	0x21b903,
-	0x283cc3,
-	0x30e843,
-	0x15da87,
-	0x1221c4,
-	0x121b83,
-	0xf45,
-	0x200742,
-	0xb6c03,
-	0x5a02c42,
-	0x1488d09,
-	0x891cd,
-	0x8950d,
-	0x236082,
-	0x6ff84,
-	0xf89,
-	0x200342,
-	0x5f8d588,
-	0xe9484,
-	0xcd588,
-	0x1426502,
-	0x1508546,
-	0x233603,
-	0x2b8283,
-	0x660be03,
-	0x234784,
-	0x6a37583,
-	0x6f0e843,
-	0x207d02,
-	0x26ff84,
-	0x20ec83,
-	0x2fbbc3,
-	0x2056c2,
-	0x241d03,
-	0x21c4c2,
-	0x2f1f03,
-	0x200a02,
-	0x29d2c3,
-	0x26f883,
-	0x20fc42,
-	0xcd588,
-	0x233603,
-	0x2fbbc3,
-	0x2056c2,
-	0x2f1f03,
-	0x200a02,
-	0x29d2c3,
-	0x26f883,
-	0x20fc42,
-	0x2f1f03,
-	0x200a02,
-	0x29d2c3,
-	0x26f883,
-	0x20fc42,
-	0x20be03,
-	0x2b6c03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x214bc3,
-	0x21f743,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x204bc2,
-	0x219543,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x2b6c03,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x20ec83,
-	0x241d03,
-	0x2f5805,
-	0x230882,
-	0x200742,
-	0xcd588,
-	0x1455908,
-	0x1367ca,
-	0x30e843,
+	0x203e83,
+	0x283f0a,
+	0x47726302,
+	0x47a12882,
+	0x2cb643,
+	0x38c983,
+	0x161ea82,
+	0x3a7d43,
+	0x47e2a542,
+	0x48203202,
+	0x48615584,
+	0x215586,
+	0x300406,
+	0x245d84,
+	0x27ba83,
+	0x20ad43,
+	0x2f7583,
+	0x245206,
+	0x38f585,
+	0x2cb7c7,
+	0x2cf045,
+	0x2d02c6,
+	0x2d0f48,
+	0x2d1146,
+	0x205844,
+	0x29c2cb,
+	0x2d4983,
+	0x2d4985,
+	0x2d4e08,
+	0x22c482,
+	0x35c242,
+	0x48a4c442,
+	0x48e06282,
+	0x21a6c3,
+	0x4926f582,
+	0x26f583,
+	0x2d5743,
+	0x49a07242,
+	0x49ed9fc6,
+	0x25e406,
+	0x4a2da102,
+	0x4a60f7c2,
+	0x4ab58582,
+	0x4ae0bf82,
+	0x4b225082,
+	0x4b600a42,
+	0x218f83,
+	0x389185,
+	0x34c8c6,
+	0x4babf0c4,
+	0x388c0a,
+	0x3a9606,
+	0x2e6704,
+	0x23ec83,
+	0x4c6039c2,
+	0x201402,
+	0x232043,
+	0x4ca22103,
+	0x301147,
+	0x2bdf87,
+	0x4e271c07,
+	0x3c4a07,
+	0x22a7c3,
+	0x34a70a,
+	0x3a0304,
+	0x3c6944,
+	0x3c694a,
+	0x247005,
+	0x4e6198c2,
+	0x254d83,
+	0x4ea00602,
+	0x252ec3,
+	0x39b3c3,
+	0x4f200582,
+	0x29f604,
+	0x21f9c4,
+	0x209905,
+	0x30a305,
+	0x31f946,
+	0x321986,
+	0x4f640e02,
+	0x4fa01a42,
+	0x306d85,
+	0x25e112,
+	0x349186,
+	0x207783,
+	0x2aef06,
+	0x303805,
+	0x1609a82,
+	0x57e10e02,
+	0x367403,
+	0x210e03,
+	0x2836c3,
+	0x5820de02,
+	0x22e803,
+	0x58601202,
+	0x209c43,
+	0x3108c8,
+	0x2597c3,
+	0x2a8cc6,
+	0x23c087,
+	0x30ecc6,
+	0x30eccb,
+	0x2e6647,
+	0x2faf44,
+	0x58e01fc2,
+	0x34a205,
+	0x592220c3,
+	0x2aacc3,
+	0x2bc205,
+	0x34a603,
+	0x5974a606,
+	0x2d088a,
+	0x245a03,
+	0x212f44,
+	0x2003c6,
+	0x343d46,
+	0x59a482c3,
+	0x33a487,
+	0x277dc7,
+	0x29dc05,
+	0x350406,
+	0x2a25c3,
+	0x5c617983,
+	0x5ca10482,
+	0x359c04,
+	0x214a09,
+	0x23dc07,
+	0x358d85,
+	0x247344,
+	0x375d08,
+	0x248045,
+	0x5ce52185,
+	0x288c09,
+	0x396883,
+	0x24ce04,
+	0x5d20d682,
+	0x21a8c3,
+	0x5d691a42,
+	0x291a46,
+	0x1629b42,
+	0x5da0be82,
+	0x2a7948,
+	0x2b7f83,
+	0x2b17c7,
+	0x303c05,
+	0x2b7b45,
+	0x30ef4b,
+	0x2e5086,
+	0x30f146,
+	0x2e6286,
+	0x288f44,
+	0x2c1b06,
+	0x5ded7248,
+	0x235d03,
+	0x206f43,
+	0x206f44,
+	0x30af84,
+	0x30bd87,
+	0x2e9485,
+	0x5e2e95c2,
+	0x5e609dc2,
+	0x209dc5,
+	0x2bfc44,
+	0x2ec64b,
+	0x2edec8,
+	0x25b484,
+	0x5ee12602,
+	0x5f25b402,
+	0x2b3b03,
+	0x2ef0c4,
+	0x2ef385,
+	0x2efec7,
+	0x2f2544,
+	0x33c904,
+	0x5f608642,
+	0x37a389,
+	0x2f3a05,
+	0x3ab685,
+	0x2f4585,
+	0x5fa1a803,
+	0x2f63c4,
+	0x2f63cb,
+	0x2f68c4,
+	0x2f6b8b,
+	0x2f74c5,
+	0x21b20a,
+	0x2f7c88,
+	0x2f7e8a,
+	0x2f8443,
+	0x2f844a,
+	0x60248202,
+	0x60604c42,
+	0x60a84743,
+	0x60efb602,
+	0x2fb603,
+	0x6137b282,
+	0x61736842,
+	0x2fbec4,
+	0x21c546,
+	0x2132c5,
+	0x2fcc43,
+	0x329ec6,
+	0x212dc5,
+	0x282704,
+	0x61a00902,
+	0x2ff044,
+	0x2cba8a,
+	0x2eec47,
+	0x276b46,
+	0x31aa07,
+	0x206003,
+	0x2b9548,
+	0x3ab04b,
+	0x2c2045,
+	0x352c05,
+	0x352c06,
+	0x2e8744,
+	0x3b4ac8,
+	0x232bc3,
+	0x242cc4,
+	0x242cc7,
+	0x2fab86,
+	0x205446,
+	0x3bb48a,
+	0x252504,
+	0x35474a,
+	0x61f91806,
+	0x391807,
+	0x25bfc7,
+	0x277404,
+	0x277409,
+	0x31bac5,
+	0x275e4b,
+	0x2eb003,
+	0x22d7c3,
+	0x6221fe03,
+	0x2327c4,
+	0x62600682,
+	0x333e46,
+	0x62adff45,
+	0x2af145,
+	0x257246,
+	0x2a0344,
+	0x62e05942,
+	0x247644,
+	0x63204e42,
+	0x344505,
+	0x23c884,
+	0x63e28203,
+	0x64210e42,
+	0x210e43,
+	0x356786,
+	0x64604fc2,
+	0x22a188,
+	0x224b84,
+	0x224b86,
+	0x38d206,
+	0x20cb84,
+	0x221f45,
+	0x239fc8,
+	0x23b687,
+	0x3341c7,
+	0x3341cf,
+	0x292a46,
+	0x243bc3,
+	0x247cc4,
+	0x210883,
+	0x223e44,
+	0x257384,
+	0x64a12a82,
+	0x28e203,
+	0x257603,
+	0x64e07bc2,
+	0x23b943,
+	0x372583,
+	0x215e8a,
+	0x38eb07,
+	0x25c8cc,
+	0x25cb86,
+	0x25f906,
+	0x260487,
+	0x65230d47,
+	0x26bb89,
+	0x24b7c4,
+	0x26d144,
+	0x6561a702,
+	0x65a01002,
+	0x3bb846,
+	0x33a284,
+	0x28e686,
+	0x2311c8,
+	0x23d344,
+	0x39f306,
+	0x2a7485,
+	0x365988,
+	0x208703,
+	0x294905,
+	0x295883,
+	0x3ab783,
+	0x3ab784,
+	0x223143,
+	0x65e61182,
+	0x66201f42,
+	0x2eaec9,
+	0x29c545,
+	0x29fb04,
+	0x2a1785,
+	0x21b684,
+	0x2c8f07,
+	0x37c205,
+	0x66671dc4,
+	0x271dc8,
+	0x2e7f06,
+	0x2eab84,
+	0x2eb148,
+	0x2f0c07,
+	0x66a02c42,
+	0x2f4b04,
+	0x210944,
+	0x2bbb87,
+	0x66e02c44,
+	0x258d02,
+	0x67216302,
+	0x220ac3,
+	0x2dd844,
+	0x2a3143,
+	0x2a3145,
+	0x6763aa42,
+	0x2fb4c5,
+	0x2721c2,
+	0x397045,
+	0x2bba05,
+	0x67a07742,
+	0x33cfc4,
+	0x67e00b42,
+	0x2623c6,
+	0x350b86,
+	0x269b88,
+	0x2c2f88,
+	0x2f1fc4,
+	0x2ff345,
+	0x305cc9,
+	0x3993c4,
+	0x2d0844,
+	0x217083,
+	0x68242a85,
+	0x37d987,
+	0x251205,
+	0x2a5c44,
+	0x3a2a8d,
+	0x2d48c2,
+	0x2d48c3,
+	0x3ad943,
+	0x686035c2,
+	0x3a4505,
+	0x221dc7,
+	0x2ba984,
+	0x3c4ac7,
+	0x2d44c9,
+	0x2cbbc9,
+	0x279847,
+	0x290203,
+	0x350d48,
+	0x2686c9,
+	0x3b5147,
+	0x3c0045,
+	0x2fdcc6,
+	0x2fe146,
+	0x2fe2c5,
+	0x2d6985,
+	0x68a00c82,
+	0x23b585,
+	0x2b6ac8,
+	0x2c4fc6,
+	0x68e063c7,
+	0x2bb084,
+	0x304087,
+	0x300dc6,
+	0x69213b42,
+	0x341ec6,
+	0x3049ca,
+	0x305245,
+	0x696e68c2,
+	0x69a945c2,
+	0x314306,
+	0x2b65c8,
+	0x69fcc107,
+	0x6a21d242,
+	0x21de43,
+	0x20d5c6,
+	0x2285c4,
+	0x3bfa06,
+	0x206706,
+	0x20574a,
+	0x201685,
+	0x2f51c6,
+	0x34abc3,
+	0x34abc4,
+	0x208482,
+	0x32dbc3,
+	0x6a624f42,
+	0x2f8903,
+	0x211d84,
+	0x2b6704,
+	0x2b670a,
+	0x21e903,
+	0x27bc48,
+	0x2f974a,
+	0x23cb07,
+	0x308406,
+	0x262284,
+	0x293602,
+	0x2a6602,
+	0x6aa007c2,
+	0x236bc3,
+	0x25bd87,
+	0x2007c7,
+	0x28a544,
+	0x3ad7c7,
+	0x2effc6,
+	0x22e6c7,
+	0x303144,
+	0x353b45,
+	0x21d085,
+	0x6ae14fc2,
+	0x214fc6,
+	0x21ef03,
+	0x221a02,
+	0x221a06,
+	0x6b200e02,
+	0x6b6061c2,
+	0x3c3145,
+	0x6ba05102,
+	0x6be01842,
+	0x32dd85,
+	0x2ce005,
+	0x2a7fc5,
+	0x6c261643,
+	0x24c285,
+	0x2e5147,
+	0x3157c5,
+	0x347d05,
+	0x3a8184,
+	0x333c46,
+	0x3c6b84,
+	0x6c6008c2,
+	0x6d381ac5,
+	0x2a69c7,
+	0x39b848,
+	0x254606,
+	0x25460d,
+	0x257c09,
+	0x257c12,
+	0x2ff785,
+	0x3079c3,
+	0x6d606342,
+	0x316544,
+	0x219ac3,
+	0x3428c5,
+	0x305f85,
+	0x6da2e042,
+	0x260d83,
+	0x6de5dec2,
+	0x6e6c28c2,
+	0x6ea00082,
+	0x2df085,
+	0x3c4c03,
+	0x250f48,
+	0x6ee03502,
+	0x6f20ab42,
+	0x29f5c6,
+	0x35ebca,
+	0x219103,
+	0x25d303,
+	0x2fc9c3,
+	0x70203582,
+	0x7e61b882,
+	0x7ee11a02,
+	0x209642,
+	0x341cc9,
+	0x2c6404,
+	0x2ac048,
+	0x7f2fcc82,
+	0x7f602242,
+	0x2ac805,
+	0x2367c8,
+	0x317808,
+	0x34d40c,
+	0x23ca43,
+	0x7fa1c882,
+	0x7fe0a2c2,
+	0x2848c6,
+	0x309285,
+	0x2758c3,
+	0x27dbc6,
+	0x3093c6,
+	0x286483,
+	0x30ad43,
+	0x30b246,
+	0x30c704,
+	0x26fa86,
+	0x2226c5,
+	0x2226ca,
+	0x39e784,
+	0x30cdc4,
+	0x30d50a,
+	0x80209bc2,
+	0x39e905,
+	0x30e30a,
+	0x30f2c5,
+	0x30fb84,
+	0x30fc86,
+	0x30fe04,
+	0x21ab86,
+	0x80613b82,
+	0x2f19c6,
+	0x370545,
+	0x36fa87,
+	0x3a8946,
+	0x260684,
+	0x2db087,
+	0x333946,
+	0x239645,
+	0x23f387,
+	0x3b6387,
+	0x3b638e,
+	0x27d4c6,
+	0x3cec85,
+	0x20e347,
+	0x20f803,
+	0x20f807,
+	0x228ec5,
+	0x22dbc4,
+	0x2383c2,
+	0x249687,
+	0x300cc4,
+	0x249b44,
+	0x28950b,
+	0x21f2c3,
+	0x2d1287,
+	0x21f2c4,
+	0x2f0a87,
+	0x294003,
+	0x345fcd,
+	0x3a5148,
+	0x24a484,
+	0x271cc5,
+	0x3147c5,
+	0x314c03,
+	0x80a24a82,
+	0x316b43,
+	0x3174c3,
+	0x215144,
+	0x2803c5,
+	0x21ef87,
+	0x34ac46,
+	0x38af83,
+	0x3585cb,
+	0x27530b,
+	0x2aa40b,
+	0x37f50b,
+	0x2e690a,
+	0x32f08b,
+	0x36b50b,
+	0x39550c,
+	0x3cdc8b,
+	0x3d1411,
+	0x317e0a,
+	0x31874b,
+	0x318a0c,
+	0x318d0b,
+	0x319c0a,
+	0x31c34a,
+	0x31d34e,
+	0x31ec0b,
+	0x31eeca,
+	0x320211,
+	0x32064a,
+	0x320b4b,
+	0x32108e,
+	0x3226cc,
+	0x322d4b,
+	0x32300e,
+	0x32338c,
+	0x327e4a,
+	0x32914c,
+	0x80f2944a,
+	0x32a048,
+	0x32ac09,
+	0x32e14a,
+	0x32e3ca,
+	0x32e64b,
+	0x3323ce,
+	0x333411,
+	0x33bb49,
+	0x33bd8a,
+	0x33c4cb,
+	0x33ec8a,
+	0x33f516,
+	0x34088b,
+	0x340e0a,
+	0x34134a,
+	0x3419cb,
+	0x342349,
+	0x346949,
+	0x346f8d,
+	0x34840b,
+	0x34930b,
+	0x349ccb,
+	0x34b589,
+	0x34bbce,
+	0x34c10a,
+	0x34cf0a,
+	0x34d70a,
+	0x34e20b,
+	0x34ea4b,
+	0x34f6cd,
+	0x35268d,
+	0x354c90,
+	0x35514b,
+	0x35570c,
+	0x35630b,
+	0x35ba4b,
+	0x35d14e,
+	0x35d64b,
+	0x35d64d,
+	0x36260b,
+	0x36308f,
+	0x36344b,
+	0x363c8a,
+	0x3641c9,
+	0x3649c9,
+	0x81365e0b,
+	0x3660ce,
+	0x3678cb,
+	0x36a0cf,
+	0x36c00b,
+	0x36c2cb,
+	0x36c58b,
+	0x36cbca,
+	0x376209,
+	0x37904f,
+	0x37d6cc,
+	0x37db4c,
+	0x37e20e,
+	0x37e70f,
+	0x37eace,
+	0x3802d0,
+	0x3806cf,
+	0x38108e,
+	0x381c4c,
+	0x381f52,
+	0x3829d1,
+	0x3831ce,
+	0x38364e,
+	0x383b8b,
+	0x383b8e,
+	0x383f0f,
+	0x3842ce,
+	0x384653,
+	0x384b11,
+	0x384f4c,
+	0x38524e,
+	0x3856cc,
+	0x385c13,
+	0x386a50,
+	0x3877cc,
+	0x387acc,
+	0x387f8b,
+	0x3893ce,
+	0x3898cb,
+	0x38a18b,
+	0x38b38c,
+	0x39494a,
+	0x394d0c,
+	0x39500c,
+	0x395309,
+	0x39694b,
+	0x396c08,
+	0x397549,
+	0x39754f,
+	0x398ccb,
+	0x81799aca,
+	0x39c44c,
+	0x39d60b,
+	0x39d8c9,
+	0x39f6c8,
+	0x39f8cb,
+	0x3a054b,
+	0x3a10ca,
+	0x3a134b,
+	0x3a180c,
+	0x3a21c8,
+	0x3a590b,
+	0x3a858b,
+	0x3aa20e,
+	0x3ab88b,
+	0x3ac94b,
+	0x3b5f0b,
+	0x3b61c9,
+	0x3b670d,
+	0x3c048a,
+	0x3c2a97,
+	0x3c37d8,
+	0x3c70c9,
+	0x3c844b,
+	0x3c9994,
+	0x3c9e8b,
+	0x3ca40a,
+	0x3cac8a,
+	0x3caf0b,
+	0x3cb750,
+	0x3cbb51,
+	0x3cc64a,
+	0x3cd28d,
+	0x3cd98d,
+	0x3d184b,
+	0x2150c3,
+	0x81b66743,
+	0x2b45c6,
+	0x245945,
+	0x280bc7,
+	0x32ef46,
+	0x1604582,
+	0x2b3c49,
+	0x329cc4,
+	0x2e3bc8,
+	0x21fd43,
+	0x316487,
+	0x206bc2,
+	0x2b0a03,
+	0x81e01242,
+	0x2ccec6,
+	0x2ce884,
+	0x359fc4,
+	0x3273c3,
+	0x3273c5,
+	0x826c7502,
+	0x82aaab84,
+	0x277347,
+	0x82e5e6c2,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0xe8f08,
+	0x2182c3,
+	0x2000c2,
+	0x1513c8,
+	0x207c02,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x215e83,
+	0x339ad6,
+	0x3610d3,
+	0x3ad649,
+	0x388788,
+	0x34a089,
+	0x30e486,
+	0x3486d0,
+	0x248b93,
+	0x2fac48,
+	0x3a5507,
+	0x23ae87,
+	0x27ed0a,
+	0x203849,
+	0x3a2349,
+	0x28a90b,
+	0x38f246,
+	0x209fca,
+	0x222b86,
+	0x3298c3,
+	0x2da4c5,
+	0x38e708,
+	0x26248d,
+	0x31174c,
+	0x2fb787,
+	0x31d68d,
+	0x23a0c4,
+	0x232a8a,
+	0x2335ca,
+	0x233a8a,
+	0x248e87,
+	0x242187,
+	0x245f04,
+	0x247946,
+	0x32d3c4,
+	0x2ffe08,
+	0x2eb309,
+	0x2c5806,
+	0x2c5808,
+	0x2f4ecd,
+	0x2cbe09,
+	0x30b7c8,
+	0x3ab607,
+	0x28e88a,
+	0x255406,
+	0x263c87,
+	0x2de684,
+	0x22bec7,
+	0x214d8a,
+	0x24614e,
+	0x2c1a05,
+	0x3c170b,
+	0x3077c9,
+	0x2080c9,
+	0x20c707,
+	0x20c70a,
+	0x2bbac7,
+	0x2f7149,
+	0x2ca208,
+	0x311ccb,
+	0x2e2845,
+	0x22e18a,
+	0x358349,
+	0x27584a,
+	0x2cf0cb,
+	0x22bdcb,
+	0x28a695,
+	0x2e7dc5,
+	0x3ab685,
+	0x2f63ca,
+	0x277fca,
+	0x307547,
+	0x219243,
+	0x3bb7c8,
+	0x2d814a,
+	0x224b86,
+	0x268509,
+	0x365988,
+	0x2eab84,
+	0x3859c9,
+	0x2c2f88,
+	0x38dec7,
+	0x381ac6,
+	0x2a69c7,
+	0x2b05c7,
+	0x245005,
+	0x358acc,
+	0x271cc5,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x207c02,
+	0x20d183,
+	0x222103,
+	0x2182c3,
+	0x2482c3,
+	0x20d183,
+	0x222103,
+	0x182c3,
+	0x2597c3,
+	0x2482c3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x1513c8,
+	0x207c02,
+	0x206042,
+	0x2faec2,
+	0x202c82,
+	0x202e42,
+	0x2c7902,
+	0x91806,
+	0x4e0d183,
+	0x2355c3,
+	0x3d0443,
+	0x214d83,
+	0x219a43,
+	0x272203,
+	0x2da3c6,
+	0x222103,
+	0x2482c3,
+	0x236883,
+	0x1513c8,
+	0x373484,
+	0x372cc7,
+	0x327d83,
+	0x2b9c44,
+	0x202483,
+	0x20c783,
+	0x214d83,
+	0xdf5c7,
+	0x171bc4,
+	0x170b83,
+	0x4345,
+	0x2000c2,
+	0x3a83,
+	0x6207c02,
+	0x648d109,
+	0x8d98d,
+	0x8dccd,
+	0x2faec2,
+	0x24604,
+	0x4389,
+	0x2003c2,
+	0x6a24508,
+	0xf5b44,
+	0x1513c8,
+	0x1442942,
+	0x14005c2,
+	0x1442942,
+	0x150f506,
+	0x231403,
+	0x2b9343,
+	0x720d183,
+	0x232a84,
+	0x76355c3,
+	0x7a14d83,
+	0x200d42,
+	0x224604,
+	0x222103,
+	0x302883,
+	0x200ec2,
+	0x2482c3,
+	0x21ce42,
+	0x2fbe03,
+	0x204fc2,
+	0x205583,
+	0x29fa03,
+	0x203682,
+	0x1513c8,
+	0x231403,
+	0x302883,
+	0x200ec2,
+	0x2fbe03,
+	0x204fc2,
+	0x205583,
+	0x29fa03,
+	0x203682,
+	0x2fbe03,
+	0x204fc2,
+	0x205583,
+	0x29fa03,
+	0x203682,
+	0x20d183,
+	0x203a83,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x219a43,
+	0x272203,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x206442,
+	0x21a803,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x203a83,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x222103,
+	0x2482c3,
+	0x3c0045,
+	0x22e042,
+	0x2000c2,
+	0x1513c8,
+	0x1589e48,
+	0x1615ca,
+	0x214d83,
+	0x205dc1,
+	0x205e81,
+	0x2042c1,
+	0x204301,
+	0x204341,
+	0x215d81,
+	0x20c241,
+	0x22b281,
+	0x207141,
 	0x200001,
-	0x202081,
-	0x200ec1,
-	0x200f01,
-	0x200f41,
-	0x20d701,
-	0x312181,
-	0x203801,
-	0x24b241,
-	0x2021c1,
+	0x2000c1,
+	0x200201,
+	0xf4d45,
+	0x1513c8,
 	0x200101,
-	0x200301,
-	0x117485,
-	0xcd588,
-	0x200781,
-	0x2014c1,
+	0x200d81,
+	0x200501,
+	0x201481,
 	0x200041,
-	0x200141,
-	0x201401,
-	0x200901,
-	0x200541,
-	0x200c01,
-	0x200a81,
-	0x200641,
-	0x200081,
-	0x2001c1,
-	0x200341,
-	0x201681,
-	0x20ab41,
-	0x2002c1,
-	0x200a01,
+	0x200801,
+	0x200181,
+	0x202f41,
+	0x200701,
+	0x2004c1,
+	0x200d01,
+	0x200581,
+	0x2003c1,
+	0x204c41,
+	0x201301,
 	0x200401,
-	0x200441,
-	0x201ac1,
-	0x203f81,
-	0x20d601,
-	0x201181,
-	0x200dc1,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x200342,
-	0x241d03,
-	0x15da87,
-	0x1f847,
-	0x29546,
-	0x4160a,
-	0x88348,
-	0x5a588,
-	0x5aa47,
-	0x86,
-	0xd61c5,
-	0x14a345,
-	0x7dac6,
-	0x157206,
-	0x28b304,
-	0x340547,
-	0xcd588,
-	0x2d2484,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x31a548,
-	0x31e084,
-	0x2374c4,
-	0x22aa44,
-	0x270c47,
-	0x2cde07,
-	0x20be03,
-	0x23d74b,
-	0x31b7ca,
-	0x31cd47,
-	0x2fc048,
-	0x3255c8,
-	0x237583,
-	0x346c47,
-	0x203d43,
-	0x37c208,
-	0x335049,
-	0x26ff84,
-	0x214bc3,
-	0x2dce48,
-	0x21f743,
-	0x2cb6ca,
-	0x2d1206,
-	0x3a0547,
-	0x20ec83,
-	0x2da606,
-	0x309308,
-	0x241d03,
-	0x28d806,
-	0x2e394d,
-	0x2e49c8,
-	0x2ea0cb,
-	0x331e86,
-	0x348087,
-	0x20f605,
-	0x2ef98a,
-	0x22bfc5,
-	0x36210a,
-	0x230882,
-	0x203f83,
-	0x244dc4,
-	0x2021c6,
-	0x3a7a03,
-	0x2af043,
-	0x24be43,
-	0x23b003,
-	0x349183,
-	0x200582,
-	0x2d7285,
-	0x2a6589,
-	0x245743,
-	0x205583,
-	0x202fc3,
-	0x200301,
-	0x2a1a85,
-	0x39da83,
-	0x2053c3,
-	0x22aa44,
-	0x326443,
-	0x214948,
-	0x2ec443,
-	0x302e8d,
-	0x2ebbc8,
-	0x21ab46,
-	0x31c783,
-	0x378983,
-	0x381cc3,
-	0xaa0be03,
-	0x236dc8,
-	0x23d744,
-	0x246d03,
-	0x2022c6,
-	0x249bc8,
-	0x202e03,
-	0x2ef9c3,
-	0x2319c3,
-	0x237583,
-	0x21d8c3,
-	0x21e903,
-	0x21a303,
-	0x31c703,
-	0x2b25c3,
-	0x225783,
-	0x370645,
-	0x256c04,
-	0x258107,
-	0x329982,
-	0x25a303,
-	0x25d486,
-	0x25ed03,
-	0x25f3c3,
-	0x276543,
-	0x202043,
-	0x323283,
-	0x269687,
-	0xaf0e843,
-	0x2363c3,
-	0x2096c3,
-	0x204d03,
-	0x26ff83,
-	0x2f3783,
-	0x374ac5,
-	0x363fc3,
-	0x246889,
-	0x20b0c3,
-	0x2fe203,
-	0xb2527c3,
-	0x286d03,
-	0x21cd08,
-	0x2a64c6,
-	0x200706,
-	0x29aa46,
-	0x27a5c7,
-	0x200c83,
-	0x20be83,
-	0x21f743,
-	0x288446,
-	0x21a202,
-	0x29ea43,
-	0x32dd05,
-	0x20ec83,
-	0x2a2e47,
-	0x160ae43,
-	0x24e483,
-	0x21fa83,
-	0x225e03,
-	0x241d03,
-	0x212e46,
-	0x31d286,
-	0x36aa43,
-	0x22ba83,
-	0x219543,
-	0x253743,
-	0x303b83,
-	0x2f0603,
-	0x2f20c3,
-	0x34f085,
-	0x24f3c3,
-	0x2d3246,
-	0x23eb08,
-	0x225b43,
-	0x341789,
-	0x33a308,
-	0x2110c8,
-	0x21a185,
-	0x32a38a,
-	0x35400a,
-	0x37cd8b,
-	0x37d408,
-	0x2fb903,
-	0x2f2103,
-	0x33b1c3,
-	0x366d88,
-	0x2f4e83,
-	0x39ec44,
-	0x261983,
-	0x202983,
+	0x200741,
+	0x2007c1,
+	0x200081,
+	0x202241,
+	0x2020c1,
+	0x207b01,
+	0x2018c1,
+	0x201241,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x2003c2,
+	0x2482c3,
+	0xdf5c7,
+	0x7c8c7,
+	0x39c86,
+	0x3ef8a,
+	0x8c488,
+	0x5b7c8,
+	0x5bc87,
+	0x1b5706,
+	0xe1505,
+	0x127cc5,
+	0xea506,
+	0x44a06,
+	0x28a904,
+	0x275587,
+	0x1513c8,
+	0x2db184,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x329648,
+	0x202544,
+	0x235504,
+	0x239e44,
+	0x2847c7,
+	0x2d6e07,
+	0x20d183,
+	0x2385cb,
+	0x20328a,
+	0x275c47,
+	0x241f88,
+	0x36f388,
+	0x2355c3,
+	0x391cc7,
+	0x3d0443,
+	0x207488,
+	0x20d849,
+	0x224604,
+	0x219a43,
+	0x2e2ac8,
+	0x272203,
+	0x2d4aca,
+	0x2da3c6,
+	0x3a9607,
+	0x222103,
+	0x219146,
+	0x3102c8,
+	0x2482c3,
+	0x2ea646,
+	0x2ee10d,
+	0x2efb88,
+	0x2f68cb,
+	0x259146,
+	0x324e07,
+	0x2256c5,
+	0x202cca,
+	0x22af45,
+	0x25110a,
+	0x22e042,
+	0x2020c3,
+	0x249b44,
+	0x200006,
+	0x3af783,
+	0x3512c3,
+	0x308bc3,
+	0x202543,
+	0x202f03,
+	0x202a42,
+	0x2d1fc5,
+	0x2a9209,
+	0x245683,
+	0x208403,
+	0x203c43,
+	0x200201,
+	0x2d0607,
+	0x2dedc5,
+	0x38e643,
+	0x207183,
+	0x239e44,
+	0x275bc3,
+	0x222608,
+	0x364403,
+	0x302ccd,
+	0x27d588,
+	0x207a86,
+	0x32dc03,
+	0x38b643,
+	0x3a15c3,
+	0xb60d183,
+	0x234e08,
+	0x2385c4,
+	0x246603,
+	0x200106,
+	0x249fc8,
+	0x20fa43,
+	0x202d03,
+	0x232083,
+	0x2355c3,
+	0x22c443,
 	0x22d483,
-	0x26fcc3,
-	0x238843,
-	0x230882,
-	0x22d0c3,
-	0x23f683,
-	0x305403,
-	0x3065c4,
-	0x244dc4,
-	0x3be143,
-	0xcd588,
-	0x200742,
-	0x200602,
-	0x200582,
-	0x203402,
-	0x2023c2,
-	0x200782,
-	0x238c02,
-	0x201b02,
-	0x202542,
+	0x2a5c03,
+	0x32db83,
+	0x2279c3,
+	0x239b03,
+	0x38a405,
+	0x255984,
+	0x256587,
+	0x231ac2,
+	0x25b283,
+	0x25d446,
+	0x25fa83,
+	0x260943,
+	0x27af83,
+	0x207003,
+	0x373183,
+	0x298207,
+	0xba14d83,
+	0x248343,
+	0x20b383,
+	0x207483,
+	0x219883,
+	0x2f1d03,
+	0x366805,
+	0x36e9c3,
+	0x24fa49,
+	0x218543,
+	0x306283,
+	0xbe500c3,
+	0x2ab183,
+	0x226788,
+	0x2a9146,
+	0x3b5d86,
+	0x29d7c6,
+	0x387107,
+	0x211903,
+	0x20d203,
+	0x272203,
+	0x28c586,
+	0x22c482,
+	0x2a3983,
+	0x338105,
+	0x222103,
+	0x261807,
+	0x16182c3,
+	0x24ee43,
+	0x236403,
+	0x22da83,
+	0x2482c3,
+	0x223386,
+	0x276186,
+	0x379903,
+	0x229b03,
+	0x21a803,
+	0x25cb43,
+	0x30adc3,
+	0x2fa3c3,
+	0x2fbfc3,
+	0x212dc5,
+	0x206103,
+	0x28e786,
+	0x23bec8,
+	0x22d7c3,
+	0x370209,
+	0x3690c8,
+	0x226a48,
+	0x359b45,
+	0x2332ca,
+	0x23f50a,
+	0x240b0b,
+	0x241b48,
+	0x3b88c3,
+	0x2fc003,
+	0x305ec3,
+	0x322988,
+	0x3af343,
+	0x34abc4,
+	0x2643c3,
+	0x2007c3,
+	0x2ed3c3,
+	0x263e03,
+	0x236883,
+	0x22e042,
+	0x22ab83,
+	0x23ca43,
+	0x30cf83,
+	0x30df44,
+	0x249b44,
+	0x2224c3,
+	0x1513c8,
 	0x2000c2,
-	0x225242,
+	0x208e82,
+	0x202a42,
+	0x205a42,
+	0x200202,
+	0x202302,
+	0x236c42,
+	0x206ac2,
+	0x200382,
+	0x202a82,
+	0x212642,
+	0x206282,
+	0x26f582,
+	0x210482,
+	0x2c7902,
 	0x20d682,
-	0x26cd82,
-	0x206f02,
-	0x2db482,
-	0x20b182,
-	0x201f82,
-	0x2057c2,
-	0x2f5f42,
-	0x208102,
-	0x200982,
-	0x219e82,
+	0x206f42,
+	0x208642,
+	0x2ed702,
+	0x204a02,
+	0x200682,
+	0x21b142,
+	0x205942,
 	0x207bc2,
-	0x207c02,
-	0x201282,
-	0x20fd82,
-	0x201c42,
-	0x742,
-	0x602,
-	0x582,
-	0x3402,
-	0x23c2,
-	0x782,
-	0x38c02,
-	0x1b02,
-	0x2542,
+	0x201002,
+	0x216cc2,
+	0x201842,
 	0xc2,
-	0x25242,
+	0x8e82,
+	0x2a42,
+	0x5a42,
+	0x202,
+	0x2302,
+	0x36c42,
+	0x6ac2,
+	0x382,
+	0x2a82,
+	0x12642,
+	0x6282,
+	0x6f582,
+	0x10482,
+	0xc7902,
 	0xd682,
-	0x6cd82,
-	0x6f02,
-	0xdb482,
-	0xb182,
-	0x1f82,
-	0x57c2,
-	0xf5f42,
-	0x8102,
-	0x982,
-	0x19e82,
+	0x6f42,
+	0x8642,
+	0xed702,
+	0x4a02,
+	0x682,
+	0x1b142,
+	0x5942,
 	0x7bc2,
+	0x1002,
+	0x16cc2,
+	0x1842,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x20c2,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x207c02,
+	0x2482c3,
+	0xd20d183,
+	0x214d83,
+	0x272203,
+	0xe6003,
+	0x230cc2,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0x1242,
+	0x2001c2,
+	0x15c4145,
+	0x212ac2,
+	0x1513c8,
 	0x7c02,
-	0x1282,
-	0xfd82,
-	0x1c42,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x3f82,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x202c42,
-	0x241d03,
-	0xc60be03,
-	0x30e843,
-	0x21f743,
-	0xaff03,
-	0x223b82,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0xaff03,
-	0x241d03,
-	0xdc2,
-	0x142f49,
-	0x202382,
-	0x15bda05,
-	0x2eaa02,
-	0xcd588,
-	0x2c42,
-	0x23bfc2,
-	0x200482,
-	0x244482,
-	0x21f682,
-	0x253982,
-	0x14a345,
-	0x203082,
-	0x2056c2,
-	0x20c502,
-	0x203042,
-	0x20b182,
-	0x392a82,
-	0x20ed42,
-	0x24eb42,
-	0x15da87,
-	0x120a8d,
-	0xd6249,
-	0x6898b,
-	0xd97c8,
-	0x60b89,
-	0xfeec6,
-	0x30e843,
-	0xcd588,
-	0x1221c4,
-	0x121b83,
-	0xf45,
-	0xcd588,
-	0x5b646,
-	0xf89,
-	0xab07,
-	0x200742,
-	0x28b304,
-	0x202c42,
-	0x20be03,
-	0x209d42,
-	0x237583,
-	0x202542,
-	0x2d2484,
-	0x214bc3,
-	0x254ac2,
-	0x20ec83,
-	0x200342,
-	0x241d03,
-	0x3a25c6,
-	0x32414f,
-	0x70ec03,
-	0xcd588,
-	0x202c42,
-	0x203d43,
-	0x30e843,
-	0x21f743,
-	0xae43,
-	0x14ef74b,
-	0x141650a,
-	0x14eca47,
-	0x78d4b,
-	0xd7e45,
-	0x15da87,
-	0x202c42,
-	0x20be03,
-	0x30e843,
-	0x20ec83,
-	0x200742,
-	0x211a42,
-	0x209342,
-	0xfe0be03,
-	0x2442c2,
-	0x237583,
-	0x226d02,
-	0x22ab02,
-	0x30e843,
-	0x25cd82,
-	0x251942,
-	0x2a8002,
-	0x211742,
-	0x28d302,
-	0x2029c2,
-	0x200902,
-	0x2ebfc2,
-	0x278142,
-	0x25c982,
-	0x2ad9c2,
-	0x2fcdc2,
-	0x223482,
-	0x23d082,
-	0x21f743,
-	0x205a02,
-	0x20ec83,
-	0x211e82,
-	0x2c9fc2,
-	0x241d03,
-	0x2457c2,
+	0x237402,
+	0x203882,
+	0x23ec82,
+	0x2198c2,
+	0x240e02,
+	0x127cc5,
+	0x201f02,
+	0x200ec2,
+	0x20de02,
+	0x201a02,
+	0x20d682,
+	0x3a1902,
+	0x216302,
+	0x292382,
+	0xdf5c7,
+	0xbe44d,
+	0xe1589,
+	0xa614b,
+	0xe5008,
+	0x750c9,
+	0x107106,
+	0x214d83,
+	0x1513c8,
+	0x171bc4,
+	0x170b83,
+	0x4345,
+	0x1513c8,
+	0xdd7c7,
+	0x5c786,
+	0x4389,
+	0x19e0e,
+	0x5b0c7,
+	0x2000c2,
+	0x28a904,
 	0x207c02,
-	0x209f82,
-	0x203a42,
-	0x204e02,
-	0x2da942,
-	0x21b2c2,
-	0x251b02,
-	0x2234c2,
-	0x31350a,
-	0x35acca,
-	0x38bf0a,
-	0x3c6b82,
-	0x20f2c2,
-	0x374a82,
-	0x103358c9,
-	0x1072f70a,
-	0x14328c7,
-	0x10a03fc2,
-	0x1410983,
-	0x3342,
-	0x12f70a,
-	0x253404,
-	0x1120be03,
-	0x237583,
-	0x254a04,
-	0x30e843,
-	0x26ff84,
-	0x214bc3,
-	0x21f743,
-	0x20ec83,
-	0x1aec5,
-	0x20ae43,
-	0x241d03,
-	0x24f3c3,
-	0x203f83,
-	0xcd588,
-	0x1400004,
-	0x149845,
-	0x142f49,
-	0xa8ca,
-	0x119fc2,
-	0x19cbc6,
-	0x187251,
-	0x11b358c9,
-	0x1498c8,
-	0x1c1948,
-	0x1fbc7,
-	0x282,
-	0x11748b,
-	0x18c40a,
-	0x844a,
-	0x2aa47,
-	0xcd588,
-	0x10c788,
-	0xd547,
-	0x18419a4b,
-	0x1c787,
-	0x4c2,
-	0x5e87,
-	0x23a8a,
-	0x1f8cf,
-	0x8308f,
-	0xefa02,
-	0x2c42,
-	0x173908,
-	0xf698a,
-	0x12b48,
-	0x5fcc8,
-	0xd3708,
-	0x2e02,
-	0x1bda8f,
-	0x9dc8b,
-	0x7e948,
-	0x3c2c7,
-	0x127c0a,
-	0xf400b,
-	0x78449,
-	0x127b07,
-	0x12a48,
-	0x1541cc,
-	0x3a347,
-	0x17a28a,
-	0x67008,
-	0xf6f8e,
-	0x2954e,
-	0x2a88b,
-	0x2e28b,
-	0x30e8b,
-	0x50b89,
-	0xe32cb,
-	0xeb5cd,
-	0x17d18b,
-	0x198c8d,
-	0x19900d,
-	0x3cc4a,
-	0x44c0b,
-	0x4638b,
-	0x49ec5,
-	0x18828e50,
-	0x15770f,
-	0x3b4cf,
-	0xfb1cd,
-	0x39610,
-	0xa6c2,
-	0x18e071c8,
-	0x1f6c8,
-	0x192ec405,
-	0x5400b,
-	0x12e350,
-	0x59c88,
-	0x12c4a,
-	0x2e449,
-	0x66007,
-	0x66347,
-	0x66507,
-	0x66887,
-	0x67347,
-	0x67947,
-	0x68187,
-	0x68547,
-	0x68e87,
-	0x69187,
-	0x69847,
-	0x69a07,
-	0x69bc7,
-	0x69d87,
-	0x6a087,
-	0x6a687,
-	0x6af47,
-	0x6b707,
-	0x6bcc7,
-	0x6bf87,
-	0x6c147,
-	0x6c447,
-	0x6cc47,
-	0x6ce47,
-	0x6dd87,
-	0x6df47,
-	0x6e107,
-	0x6ebc7,
-	0x6f0c7,
-	0x6fd87,
-	0x70687,
-	0x71147,
-	0x71647,
-	0x71807,
-	0x71c07,
-	0x72447,
-	0x726c7,
-	0x72ac7,
-	0x72c87,
-	0x72e47,
-	0x73287,
-	0x73e87,
-	0x743c7,
-	0x74947,
-	0x74b07,
-	0x74e87,
-	0x75407,
-	0xd0c2,
-	0x5fdca,
-	0xdc547,
-	0x84785,
-	0xb3111,
-	0x10ac6,
-	0x10cc0a,
-	0x17378a,
-	0x5b646,
-	0xcb0b,
-	0x1402,
-	0x34111,
-	0xb29c9,
-	0x948c9,
-	0xebfc2,
-	0x71e8a,
-	0xa5a89,
-	0xa61cf,
-	0xa67ce,
-	0xa7708,
-	0x552c2,
-	0x549,
-	0x18b4ce,
-	0xfc6cc,
-	0xdbe0f,
-	0x1a814e,
-	0x1840c,
-	0x25589,
-	0x26751,
-	0x2f988,
-	0x1109d2,
-	0x1115cd,
-	0x1545cd,
-	0x43f8b,
-	0x4bad5,
-	0x52c49,
-	0x5438a,
-	0x5ee89,
-	0x6b310,
-	0x7cc8b,
-	0x85ecf,
-	0xf0c0b,
-	0x16130c,
-	0x1b2610,
-	0x9208a,
-	0x9e90d,
-	0x9fc4e,
-	0xa9bca,
-	0xab6cc,
-	0xac394,
-	0xb2651,
-	0xbb04b,
-	0xe1ecf,
-	0xca50d,
-	0x1a720e,
-	0x16c4cc,
-	0x18618c,
-	0xb234b,
-	0xb428e,
-	0xb4d50,
-	0xb584b,
-	0xbaa8d,
-	0xbb4cf,
-	0xbef4c,
-	0xbfb4e,
-	0xc0411,
-	0xdff4c,
-	0x10d8c7,
-	0xc738d,
-	0xd000c,
-	0xd65d0,
-	0xdb80d,
-	0x18acc7,
-	0xe6310,
-	0xf9348,
-	0xfd44b,
-	0x17d9cf,
-	0x142188,
-	0x10ce0d,
-	0x190c10,
-	0xf5f89,
-	0x196af346,
-	0xb0303,
-	0xb5b05,
-	0x9602,
-	0x143709,
-	0x5c40a,
-	0x106606,
-	0x2098a,
-	0x1991f309,
-	0x264c3,
-	0xd2711,
-	0xd2b49,
-	0xd3ec7,
-	0x1873cb,
-	0xdae90,
-	0xdb34c,
-	0xdc2c8,
-	0xdcc45,
-	0x11e748,
-	0x1afe8a,
-	0x26587,
-	0x140947,
-	0x1382,
-	0x12f04a,
-	0x3b809,
-	0x71505,
-	0xa2cca,
-	0x8a0cf,
-	0x4794b,
-	0x174b8c,
-	0x1a252,
-	0x9df05,
-	0xdf0c8,
-	0x13a60a,
-	0x19ee8f05,
-	0x17478c,
-	0x12c443,
-	0x192a82,
-	0xf258a,
-	0x14f2d8c,
-	0x3a6c8,
-	0x198e48,
-	0x15da07,
-	0x16f02,
-	0xa02,
-	0x49fd0,
-	0x653c7,
-	0x1282,
-	0x333cf,
-	0x7dac6,
-	0x79a8e,
-	0xdeb8b,
-	0x6e308,
-	0xa9dc9,
-	0xf5012,
-	0x18998d,
-	0x1be608,
-	0x68849,
-	0x6a20d,
-	0x6c5c9,
-	0x6c98b,
-	0x6e4c8,
-	0x73c88,
-	0x76248,
-	0x79dc9,
-	0x79fca,
-	0x7b48c,
-	0x17010a,
-	0x103bc7,
-	0x2fdcd,
-	0xf7a8b,
-	0x11a9cc,
-	0x1979c8,
-	0x4d3c9,
-	0x13d8d0,
-	0xc842,
-	0x521cd,
-	0x4182,
-	0xc542,
-	0x103b0a,
-	0x10cb0a,
-	0x10ec8b,
-	0x4654c,
-	0x10c28a,
-	0x10c50e,
-	0x121ccd,
-	0xb6a08,
-	0xdc2,
-	0x11e0340e,
-	0x1272184e,
-	0x12f4960a,
-	0x13742c0e,
-	0x13f374ce,
-	0x147ac40c,
-	0x14328c7,
-	0x14328c9,
-	0x1410983,
-	0x14eb784c,
-	0x15727309,
-	0x15f69bc9,
-	0x1660a6c9,
-	0x3342,
-	0x3351,
-	0x121791,
-	0x14954d,
-	0x142b51,
-	0x137411,
-	0x1ac34f,
-	0xb778f,
-	0x12724c,
-	0x169b0c,
-	0xa60c,
-	0x1654cd,
-	0x10e595,
-	0x5a00c,
-	0x1ba48c,
-	0x138c90,
-	0x155e8c,
-	0x15dc0c,
-	0x17a659,
-	0x180a19,
-	0x19f3d9,
-	0x1b57d4,
-	0x1bbcd4,
-	0x3ed4,
-	0x4ed4,
-	0xb814,
-	0x16e5a0c9,
-	0x17404189,
-	0x17fba549,
-	0x1222fb89,
-	0x3342,
-	0x12a2fb89,
-	0x3342,
-	0x3eca,
-	0x3342,
-	0x1322fb89,
-	0x3342,
-	0x3eca,
-	0x3342,
-	0x13a2fb89,
-	0x3342,
-	0x1422fb89,
-	0x3342,
-	0x14a2fb89,
-	0x3342,
-	0x3eca,
-	0x3342,
-	0x1522fb89,
-	0x3342,
-	0x3eca,
-	0x3342,
-	0x15a2fb89,
-	0x3342,
-	0x1622fb89,
-	0x3342,
-	0x3eca,
-	0x3342,
-	0x16a2fb89,
-	0x3342,
-	0x3eca,
-	0x3342,
-	0x1722fb89,
-	0x3342,
-	0x17a2fb89,
-	0x3342,
-	0x1822fb89,
-	0x3342,
-	0x3eca,
-	0x3342,
-	0x187245,
-	0x18c404,
-	0x340e,
-	0x12184e,
-	0x14960a,
-	0x142c0e,
-	0x1374ce,
-	0x1ac40c,
-	0xb784c,
-	0x127309,
-	0x169bc9,
-	0xa6c9,
-	0x5a0c9,
-	0x4189,
-	0x1ba549,
-	0x10e78d,
-	0x5189,
-	0xbac9,
-	0x116a84,
-	0x118c44,
-	0x13aa44,
-	0x18e7c4,
-	0x79004,
-	0x98884,
-	0x477c4,
-	0x143c44,
-	0x1fbc4,
-	0x157cd03,
-	0xa6c2,
-	0x121cc3,
-	0x2e02,
-	0x200742,
-	0x202c42,
-	0x209d42,
-	0x208882,
-	0x202542,
-	0x200342,
-	0x200a02,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff83,
-	0x20ec83,
-	0x241d03,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x20ec83,
-	0x241d03,
-	0x1a9c3,
-	0x30e843,
-	0x6ff84,
-	0x200742,
-	0x2b6c03,
-	0x1be0be03,
-	0x2394c7,
-	0x30e843,
-	0x20f003,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x22d50a,
-	0x3a25c5,
-	0x219543,
-	0x20e982,
-	0xcd588,
-	0xcd588,
-	0x2c42,
-	0x129242,
-	0x1c74660b,
-	0x5fc5,
-	0x1f8c5,
-	0xf9fc6,
-	0x1221c4,
-	0x121b83,
-	0xf45,
-	0x117485,
-	0xcd588,
-	0x1c787,
-	0xbe03,
-	0x1ce41447,
-	0x143146,
-	0x1d149445,
-	0x143207,
-	0xf84a,
-	0xf708,
-	0x13407,
-	0x68348,
-	0x98647,
-	0xf28f,
-	0x47f87,
-	0x4e786,
-	0x12e350,
-	0x12cf0f,
-	0x1c009,
-	0x106684,
-	0x1d5432ce,
-	0xa978c,
-	0xf420a,
-	0x785c7,
-	0xd9f8a,
-	0x11e909,
-	0xada0c,
-	0x1bdf0a,
-	0x5cc0a,
-	0xf89,
-	0x106606,
-	0x7868a,
-	0x11d84a,
-	0x9a209,
-	0xd1fc8,
-	0xd22c6,
-	0xd6c0d,
-	0xb7cc5,
-	0xab07,
-	0xfb709,
-	0x1a3207,
-	0x10bd94,
-	0xfdb4b,
-	0x7e78a,
-	0xa358d,
-	0xf283,
-	0xf283,
-	0x29546,
-	0xf283,
-	0xb6c03,
-	0xcd588,
-	0x2c42,
-	0x54a04,
-	0x5da83,
-	0xf5805,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x205583,
-	0x20be03,
-	0x237583,
-	0x203d43,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x294a83,
-	0x203f83,
-	0x205583,
-	0x28b304,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x235cc3,
-	0x20be03,
-	0x237583,
-	0x208883,
-	0x203d43,
-	0x30e843,
-	0x26ff84,
-	0x3c32c3,
-	0x20be83,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x219543,
-	0x20c283,
-	0x1f20be03,
-	0x237583,
-	0x24e683,
-	0x30e843,
-	0x211343,
-	0x20be83,
-	0x241d03,
-	0x2057c3,
-	0x317f04,
-	0xcd588,
-	0x1fa0be03,
-	0x237583,
-	0x2a77c3,
-	0x30e843,
-	0x21f743,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x232f43,
-	0xcd588,
-	0x2020be03,
-	0x237583,
-	0x203d43,
-	0x20ae43,
-	0x241d03,
-	0xcd588,
-	0x14328c7,
-	0x2b6c03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x142f49,
-	0x117485,
-	0x15da87,
-	0x10bfcb,
-	0xd2f44,
-	0xb7cc5,
-	0x1455908,
-	0xa7e0d,
-	0x21676405,
-	0x8f204,
-	0x10ec3,
-	0xf5e85,
-	0x31cc45,
-	0xcd588,
-	0xf282,
-	0x3a283,
-	0xefec6,
-	0x31b0c8,
-	0x397247,
-	0x28b304,
-	0x346046,
-	0x3699c6,
-	0xcd588,
-	0x312ec3,
-	0x23aec9,
-	0x265555,
-	0x6555f,
-	0x20be03,
-	0x3ba052,
-	0x10db06,
-	0x14fc85,
-	0x12c4a,
-	0x2e449,
-	0x3b9e0f,
-	0x2d2484,
-	0x225285,
-	0x2fdfd0,
-	0x38cb87,
-	0x20ae43,
-	0x310f08,
-	0x157146,
-	0x2a47ca,
-	0x22d244,
-	0x2e8943,
-	0x3a25c6,
-	0x20e982,
-	0x3987cb,
-	0xae43,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x2f0ec3,
-	0x202c42,
-	0xee203,
-	0x20ec83,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20f003,
-	0x227b03,
-	0x241d03,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0x200742,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x1f8c5,
-	0x28b304,
-	0x20be03,
-	0x237583,
-	0x21a484,
-	0x20ec83,
-	0x241d03,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0xaff03,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x203d43,
-	0x204d03,
-	0x21f743,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x357d43,
-	0x3cf83,
-	0xf003,
-	0x20ec83,
-	0x241d03,
-	0x31350a,
-	0x333049,
-	0x3524cb,
-	0x352b4a,
-	0x35acca,
-	0x3686cb,
-	0x37bfca,
-	0x3825ca,
-	0x38bf0a,
-	0x38c18b,
-	0x3afbc9,
-	0x3b1a0a,
-	0x3b1d8b,
-	0x3bc98b,
-	0x3c5b0a,
-	0x20be03,
-	0x237583,
-	0x203d43,
-	0x21f743,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0x18754b,
-	0x60308,
-	0x14f209,
-	0xcd588,
-	0x20be03,
-	0x266004,
-	0x206302,
-	0x226444,
-	0x201485,
-	0x205583,
-	0x28b304,
-	0x20be03,
-	0x23d744,
-	0x237583,
-	0x254a04,
-	0x2d2484,
-	0x26ff84,
-	0x20be83,
-	0x20ec83,
-	0x241d03,
-	0x252385,
-	0x235cc3,
-	0x219543,
-	0x2b5d83,
-	0x2702c4,
-	0x2020c4,
-	0x3c0885,
-	0xcd588,
-	0x320f04,
-	0x39db46,
-	0x2010c4,
-	0x202c42,
-	0x38fd87,
-	0x256087,
-	0x252944,
-	0x25e5c5,
-	0x2dba05,
-	0x232585,
-	0x26ff84,
-	0x27a688,
-	0x23c806,
-	0x3c5f88,
-	0x278185,
-	0x2d8345,
-	0x251304,
-	0x241d03,
-	0x2e9484,
-	0x367486,
-	0x3a26c3,
-	0x2702c4,
-	0x362205,
-	0x26e984,
-	0x23fd84,
-	0x20e982,
-	0x397746,
-	0x3a4b06,
-	0x301805,
-	0x200742,
-	0x2b6c03,
-	0x27e02c42,
-	0x207344,
-	0x202542,
-	0x21f743,
-	0x23a3c2,
-	0x20ec83,
-	0x200342,
-	0x207c03,
-	0x203f83,
-	0xcd588,
-	0xcd588,
-	0x30e843,
-	0x200742,
-	0x28a02c42,
-	0x30e843,
-	0x2574c3,
-	0x3c32c3,
-	0x2168c4,
-	0x20ec83,
-	0x241d03,
-	0xcd588,
-	0x200742,
-	0x29202c42,
-	0x20be03,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0x982,
-	0x20c202,
-	0x230882,
-	0x20f003,
-	0x2e2d83,
-	0x200742,
-	0x117485,
-	0xcd588,
-	0x15da87,
-	0x202c42,
-	0x237583,
-	0x254a04,
-	0x206c03,
-	0x30e843,
-	0x204d03,
-	0x21f743,
-	0x20ec83,
-	0x207783,
-	0x241d03,
-	0x2388c3,
-	0xb5cd3,
-	0x1b9994,
-	0x15da87,
-	0x102dc6,
-	0x5c60b,
-	0x29546,
-	0x5a3c7,
-	0x2809,
-	0x195d4a,
-	0x8820d,
-	0x12078c,
-	0x104fca,
-	0x14a345,
-	0xf888,
-	0x7dac6,
-	0x6ff06,
-	0x157206,
-	0x20a6c2,
-	0x1c170c,
-	0x18c5c7,
-	0x282d1,
-	0x20be03,
-	0x682c5,
-	0x8808,
-	0x22644,
-	0x2a507646,
-	0xb3106,
-	0xd95c6,
-	0x8d5ca,
-	0x19dac3,
-	0x2aa48c44,
-	0x27c5,
-	0x15cc83,
-	0x2ae38a07,
-	0x1aec5,
-	0xcbcc,
-	0xed348,
-	0x6f6cb,
-	0x2b25168c,
-	0x140d6c3,
-	0xb8888,
-	0x9db09,
-	0x3ff48,
-	0x14208c6,
-	0x2b76d609,
-	0xd7e4a,
-	0x10d08,
-	0xf9fc8,
-	0x1fbc4,
-	0x118b45,
-	0x6f807,
-	0x2ba6f803,
-	0x2bf39c86,
-	0x2c2e9d04,
-	0x2c790207,
-	0xf9fc4,
-	0xf9fc4,
-	0xf9fc4,
-	0xf9fc4,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x200742,
-	0x202c42,
-	0x30e843,
-	0x207d02,
-	0x20ec83,
-	0x241d03,
-	0x207c03,
-	0x37158f,
-	0x37194e,
-	0xcd588,
-	0x20be03,
-	0x49a07,
-	0x237583,
-	0x30e843,
-	0x214bc3,
-	0x20ec83,
-	0x241d03,
-	0x220443,
-	0x322887,
-	0x203d02,
-	0x292889,
-	0x200602,
-	0x24a2cb,
-	0x2cf44a,
-	0x28d009,
-	0x200182,
-	0x3418c6,
-	0x235295,
-	0x24a415,
-	0x236793,
-	0x24a993,
-	0x203942,
-	0x222dc5,
-	0x3ab48c,
-	0x27410b,
-	0x2a2205,
-	0x203402,
-	0x2f2542,
-	0x37e706,
-	0x200282,
-	0x261bc6,
-	0x212ecd,
-	0x21ac4c,
-	0x228ec4,
-	0x200cc2,
-	0x2149c2,
-	0x310d88,
-	0x2023c2,
-	0x211446,
-	0x35c704,
-	0x235455,
-	0x236913,
-	0x2108c3,
-	0x32508a,
-	0x20df47,
-	0x30eec9,
-	0x2d9d07,
-	0x314902,
+	0x20d183,
+	0x206042,
+	0x2355c3,
+	0x200382,
+	0x2db184,
+	0x219a43,
+	0x252782,
+	0x222103,
+	0x2003c2,
+	0x2482c3,
+	0x3ab686,
+	0x32ec0f,
+	0x605ec3,
+	0x1513c8,
+	0x207c02,
+	0x3d0443,
+	0x214d83,
+	0x272203,
+	0x182c3,
+	0x19e08,
+	0x1402a8b,
+	0x141e70a,
+	0x1474f47,
+	0x7edcb,
+	0xdf485,
+	0xf4d45,
+	0xdf5c7,
+	0x207c02,
+	0x20d183,
+	0x214d83,
+	0x222103,
+	0x2000c2,
+	0x202842,
+	0x20a982,
+	0x10a0d183,
+	0x243d82,
+	0x2355c3,
+	0x225a82,
+	0x227242,
+	0x214d83,
+	0x25cfc2,
+	0x2752c2,
+	0x2aab42,
+	0x205242,
+	0x291542,
+	0x200802,
+	0x204142,
+	0x205642,
+	0x27e102,
+	0x23ed42,
+	0x2b0fc2,
+	0x2c7782,
+	0x21ef42,
+	0x24e6c2,
+	0x272203,
+	0x203202,
+	0x222103,
+	0x214ec2,
+	0x28c882,
+	0x2482c3,
+	0x245702,
+	0x207bc2,
+	0x21a702,
+	0x201f42,
+	0x207742,
+	0x2e68c2,
+	0x214fc2,
+	0x25dec2,
+	0x221b42,
+	0x31eeca,
+	0x363c8a,
+	0x39aa0a,
+	0x3d29c2,
+	0x22a782,
+	0x3667c2,
+	0x10f23fc9,
+	0x11340b8a,
+	0x14306c7,
+	0x11600982,
+	0x1410643,
+	0x5982,
+	0x140b8a,
+	0x248084,
+	0x11e0d183,
+	0x2355c3,
+	0x2526c4,
+	0x214d83,
+	0x224604,
+	0x219a43,
+	0x272203,
+	0xe6204,
+	0x4d43,
+	0x222103,
+	0x7e05,
+	0x2182c3,
+	0x2482c3,
+	0x1533d04,
+	0x206103,
+	0x2020c3,
+	0x1513c8,
+	0x5e06,
+	0x15b5684,
+	0x1271c5,
+	0x5ae8a,
+	0x1290c2,
+	0x1a7f86,
+	0xbe11,
+	0x12723fc9,
+	0x127248,
+	0x7ca88,
+	0xfcf07,
+	0x1742,
+	0xf4d4b,
+	0x14a4cb,
+	0x18820a,
+	0x9f0a,
+	0x39e47,
+	0x1513c8,
+	0x116008,
+	0xe107,
+	0x1901ad0b,
+	0x1d707,
+	0x4ac2,
+	0x3d687,
+	0x14394a,
+	0x5eb4f,
+	0xfd60f,
+	0x2d42,
+	0x7c02,
+	0xa5b48,
+	0xf0eca,
+	0xdd2ca,
+	0xb140a,
+	0x7d388,
+	0x23088,
+	0x610c8,
+	0xdd788,
+	0x192908,
+	0x3282,
+	0x1c41cf,
+	0xa128b,
+	0x83b88,
+	0x37707,
+	0x13168a,
+	0x59d4b,
+	0x7e409,
+	0x131587,
+	0x22f88,
+	0x3f6cc,
+	0x112187,
+	0x17850a,
+	0x6a488,
+	0xfe38e,
+	0x15884e,
+	0x39c8b,
+	0x3a68b,
+	0x827cb,
+	0xecf89,
+	0xfb9cb,
+	0x1ce74d,
+	0x144c0b,
+	0x40f0d,
+	0x4128d,
+	0x4484a,
+	0x4998b,
+	0x4a2cb,
+	0x4de45,
+	0x194282d0,
+	0x1334f,
+	0x11330f,
+	0x15308d,
+	0xbbcd0,
+	0xb782,
+	0x19a29f88,
+	0x7c748,
+	0x11754e,
+	0x19f643c5,
+	0x51f0b,
+	0x1392d0,
+	0x58588,
+	0x2318a,
+	0x3a849,
+	0x68dc7,
+	0x69107,
+	0x692c7,
+	0x69647,
+	0x6a7c7,
+	0x6adc7,
+	0x6b5c7,
+	0x6b887,
+	0x6bdc7,
+	0x6c0c7,
+	0x6c787,
+	0x6c947,
+	0x6cb07,
+	0x6ccc7,
+	0x6cfc7,
+	0x6d347,
+	0x6dc07,
+	0x6e247,
+	0x6e807,
+	0x6eac7,
+	0x6ec87,
+	0x6ef87,
+	0x6f447,
+	0x6f647,
+	0x70087,
+	0x70247,
+	0x70407,
+	0x70c87,
+	0x71187,
+	0x71887,
+	0x72547,
+	0x72807,
+	0x72d07,
+	0x72ec7,
+	0x732c7,
+	0x73b87,
+	0x74107,
+	0x74507,
+	0x746c7,
+	0x74887,
+	0x77147,
+	0x78447,
+	0x78987,
+	0x78f47,
+	0x79107,
+	0x79487,
+	0x79a07,
+	0xdc82,
+	0x611ca,
+	0xe6347,
+	0x4005,
+	0xaded1,
+	0x12686,
+	0x114d8a,
+	0xa59ca,
+	0x5c786,
+	0xce20b,
+	0x642,
+	0x32411,
+	0xb7d89,
+	0x97589,
+	0x5642,
+	0x7354a,
+	0xa8709,
+	0xa8e4f,
+	0xa944e,
+	0xaa248,
+	0x586c2,
+	0x1b5bc9,
+	0x199fce,
+	0x1046cc,
+	0xe774f,
+	0x1afece,
+	0x2b6cc,
+	0x157cc9,
+	0x11db91,
+	0x11e148,
+	0x1540d2,
+	0x3facd,
+	0x4780d,
+	0x4c08b,
+	0x19e095,
+	0x5f3c9,
+	0x6dfca,
+	0x71549,
+	0x73d10,
+	0x7cc4b,
+	0x8adcf,
+	0x16bd4b,
+	0x1bf18c,
+	0x93150,
+	0xa228a,
+	0xa384d,
+	0xa4dce,
+	0xa5e0a,
+	0xac40c,
+	0xb0294,
+	0xb7a11,
+	0xbfb0b,
+	0x1bb34f,
+	0xdfe0d,
+	0x150a4e,
+	0x18dd8c,
+	0xb620c,
+	0xb770b,
+	0xb838e,
+	0xbf450,
+	0xbff8b,
+	0xc364d,
+	0xc3f8f,
+	0xc4b0c,
+	0xc568e,
+	0x117091,
+	0x167d8c,
+	0xd1587,
+	0xd3ecd,
+	0xd760c,
+	0xd9050,
+	0xe4acd,
+	0xe8047,
+	0xffa90,
+	0x105448,
+	0x132ccb,
+	0x17690f,
+	0x168708,
+	0x114f8d,
+	0x196fd0,
+	0xfd509,
+	0x1a2b2186,
+	0xb3ac3,
+	0xb87c5,
+	0xb2c2,
+	0x131b09,
+	0x775ca,
+	0x1a63d884,
+	0x10df86,
+	0x1fc4a,
+	0x1a991109,
+	0x94043,
+	0x14d24a,
+	0xdb411,
+	0xdb849,
+	0xdd247,
+	0xddfc7,
+	0xe6408,
+	0xbf8b,
+	0x12b489,
+	0xe6b90,
+	0xe704c,
+	0xe7c08,
+	0xe8345,
+	0xca388,
+	0x1b754a,
+	0x1573c7,
+	0x12cac7,
+	0x1a42,
+	0x139fca,
+	0x113649,
+	0x72bc5,
+	0x6168a,
+	0x1cc04f,
+	0x13d80b,
+	0x1668cc,
+	0x159c12,
+	0x9c645,
+	0xe9288,
+	0x1693ca,
+	0x1aef4445,
+	0x1664cc,
+	0x136843,
+	0x1a1902,
+	0xfc30a,
+	0x14fc68c,
+	0x112508,
+	0x410c8,
+	0x13da87,
+	0x4e42,
+	0x4fc2,
+	0x530d0,
+	0x77a47,
+	0x311cf,
+	0xea506,
+	0xfb8e,
+	0x155f0b,
+	0x4f208,
+	0x7e7c9,
+	0x171752,
+	0x10b68d,
+	0x10bbc8,
+	0xa6009,
+	0xd664d,
+	0x103a09,
+	0x19864b,
+	0x111c8,
+	0x81a48,
+	0x88a48,
+	0x88e09,
+	0x8900a,
+	0x8d30c,
+	0xf664a,
+	0x10ae07,
+	0x42a8d,
+	0xfee8b,
+	0x129acc,
+	0x2f7c8,
+	0x4cc49,
+	0x1a8190,
+	0xab42,
+	0x80d0d,
+	0x3582,
+	0x1b882,
+	0x10ad4a,
+	0x114c8a,
+	0x11638b,
+	0x4a48c,
+	0x11590a,
+	0x115d8e,
+	0x1520d,
+	0x1b1d2885,
+	0x12de88,
+	0x1242,
+	0x12b7420e,
+	0x13205a4e,
+	0x13b92d8a,
+	0x14326e8e,
+	0x14b7084e,
+	0x1533df0c,
+	0x14306c7,
+	0x14306c9,
+	0x1410643,
+	0x15b4cc0c,
+	0x1620b789,
+	0x16a1cbc9,
+	0x1725ac89,
+	0x5982,
+	0x174151,
+	0x5991,
+	0x192ccd,
+	0x126dd1,
+	0x170791,
+	0x13de4f,
+	0x14cb4f,
+	0xb6cc,
+	0x1cb0c,
+	0x5abcc,
+	0x76e0d,
+	0xc8455,
+	0xf564c,
+	0x16024c,
+	0x1788d0,
+	0x1826cc,
+	0x1c34cc,
+	0x1c4c99,
+	0x1c9359,
+	0x1d05d9,
+	0x1d2394,
+	0xe294,
+	0xed14,
+	0xf294,
+	0xfed4,
+	0x17a0e549,
+	0x1800efc9,
+	0x18b60309,
+	0x12f1e349,
+	0x5982,
+	0x1371e349,
+	0x5982,
+	0xe28a,
+	0x5982,
+	0x13f1e349,
+	0x5982,
+	0xe28a,
+	0x5982,
+	0x1471e349,
+	0x5982,
+	0x14f1e349,
+	0x5982,
+	0x1571e349,
+	0x5982,
+	0xe28a,
+	0x5982,
+	0x15f1e349,
+	0x5982,
+	0xe28a,
+	0x5982,
+	0x1671e349,
+	0x5982,
+	0x16f1e349,
+	0x5982,
+	0xe28a,
+	0x5982,
+	0x1771e349,
+	0x5982,
+	0xe28a,
+	0x5982,
+	0x17f1e349,
+	0x5982,
+	0x1871e349,
+	0x5982,
+	0x18f1e349,
+	0x5982,
+	0xe28a,
+	0x5982,
+	0xbe05,
+	0x188204,
+	0x17420e,
+	0x5a4e,
+	0x2000e,
+	0x192d8a,
+	0x126e8e,
+	0x17084e,
+	0x13df0c,
+	0x14cc0c,
+	0xb789,
+	0x1cbc9,
+	0x5ac89,
+	0xe549,
+	0xefc9,
+	0x160309,
+	0xc864d,
+	0xf549,
+	0x10189,
+	0x960c4,
+	0x14b484,
+	0x12e044,
+	0x130ec4,
+	0x7f084,
+	0x12d704,
+	0x470c4,
+	0x5b504,
+	0xfcf04,
+	0x159fb43,
+	0x11783,
+	0xb782,
+	0x15203,
+	0x12182,
+	0x12188,
+	0x12b507,
+	0x3282,
+	0x2000c2,
+	0x207c02,
+	0x206042,
+	0x219902,
+	0x200382,
+	0x2003c2,
+	0x204fc2,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x219883,
+	0x222103,
+	0x2482c3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x222103,
+	0x2482c3,
+	0x7903,
+	0x214d83,
+	0x24604,
+	0x2000c2,
+	0x203a83,
+	0x1d60d183,
+	0x23d3c7,
+	0x214d83,
+	0x224f03,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x2ed18a,
+	0x3ab685,
+	0x21a803,
+	0x2061c2,
+	0x1513c8,
+	0x1513c8,
+	0x7c02,
+	0x133782,
+	0x1df90e8b,
+	0x1e21eac4,
+	0x3d7c5,
+	0xc105,
+	0x101a86,
+	0x1e60c105,
+	0x57b83,
+	0xd4883,
+	0x171bc4,
+	0x170b83,
+	0x4345,
+	0xf4d45,
+	0x1513c8,
+	0x1d707,
+	0xd183,
+	0x1ee3edc7,
+	0x1e06,
+	0x1f192bc5,
+	0x1ec7,
+	0x2398a,
+	0x21308,
+	0x23887,
+	0x7fa48,
+	0xda6c7,
+	0xfb14f,
+	0x180ec7,
+	0x5b306,
+	0x1392d0,
+	0x13730f,
+	0x159349,
+	0x10e004,
+	0x1f401f8e,
+	0x15988c,
+	0x59f4a,
+	0x7e587,
+	0xe57ca,
+	0x1267c9,
+	0x1a260c,
+	0xc26ca,
+	0x5ce4a,
+	0x4389,
+	0x10df86,
+	0x7e64a,
+	0x10c1ca,
+	0x9cf4a,
+	0x14dc89,
+	0xdad48,
+	0xdafc6,
+	0xe19cd,
+	0xb8c45,
+	0x1fb75bcc,
+	0x5b0c7,
+	0x102389,
+	0x134047,
+	0xb1954,
+	0x105a4b,
+	0x839ca,
+	0x1715ca,
+	0xa648d,
+	0x1516589,
+	0x10b44c,
+	0x10b9cb,
+	0x39c83,
+	0x39c83,
+	0x39c86,
+	0x39c83,
+	0x101a88,
+	0xbb149,
+	0x3a83,
+	0x1513c8,
+	0x7c02,
+	0x526c4,
+	0x5da43,
+	0x1c0045,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x208403,
+	0x20d183,
+	0x2355c3,
+	0x3d0443,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x297743,
+	0x2020c3,
+	0x208403,
+	0x28a904,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x233903,
+	0x20d183,
+	0x2355c3,
+	0x219903,
+	0x3d0443,
+	0x214d83,
+	0x224604,
+	0x308103,
+	0x20d203,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x21a803,
+	0x20d603,
+	0x21a0d183,
+	0x2355c3,
+	0x24f043,
+	0x214d83,
+	0x226cc3,
+	0x20d203,
+	0x2482c3,
+	0x208643,
+	0x35ee84,
+	0x1513c8,
+	0x2220d183,
+	0x2355c3,
+	0x2aa303,
+	0x214d83,
+	0x272203,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x2192c3,
+	0x1513c8,
+	0x22a0d183,
+	0x2355c3,
+	0x3d0443,
+	0x2182c3,
+	0x2482c3,
+	0x1513c8,
+	0x14306c7,
+	0x203a83,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0xf4d45,
+	0xdf5c7,
+	0xb1b8b,
+	0xdbc44,
+	0xb8c45,
+	0x1589e48,
+	0xaa94d,
+	0x23e52185,
+	0x96a84,
+	0x15dc3,
+	0xfd405,
+	0x38f405,
+	0x1513c8,
+	0x1f242,
+	0x49b83,
+	0xf9006,
+	0x32a1c8,
+	0x3a4907,
+	0x28a904,
+	0x33d546,
+	0x34ca06,
+	0x1513c8,
+	0x31d643,
+	0x312d09,
+	0x321f15,
+	0x121f1f,
+	0x20d183,
+	0x2c8012,
+	0x16c806,
+	0x17de05,
+	0x2318a,
+	0x3a849,
+	0x2c7dcf,
+	0x2db184,
+	0x23e845,
+	0x306050,
+	0x388987,
+	0x2182c3,
+	0x354608,
+	0x161506,
+	0x2a150a,
+	0x2054c4,
+	0x2f3e83,
+	0x3ab686,
+	0x2061c2,
+	0x2eea0b,
+	0x182c3,
+	0x194044,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x2fa803,
+	0x207c02,
+	0xeb4c3,
+	0x222103,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224f03,
+	0x203203,
+	0x2482c3,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x2000c2,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0xc105,
+	0x28a904,
+	0x20d183,
+	0x2355c3,
+	0x215584,
+	0x222103,
+	0x2482c3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x3d0443,
+	0x207483,
+	0x272203,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x2037c4,
+	0x224604,
+	0x222103,
+	0x2482c3,
+	0x2020c3,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x2bd943,
+	0x6ce03,
+	0x24f03,
+	0x222103,
+	0x2482c3,
+	0x31eeca,
+	0x33f2c9,
+	0x35c10b,
+	0x35c84a,
+	0x363c8a,
+	0x37790b,
+	0x38ad8a,
+	0x39494a,
+	0x39aa0a,
+	0x39ac8b,
+	0x3b7289,
+	0x3be4ca,
+	0x3be90b,
+	0x3ca14b,
+	0x3d11ca,
+	0x20d183,
+	0x2355c3,
+	0x3d0443,
+	0x272203,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x1c444b,
+	0x62108,
+	0xd6784,
+	0xc0c6,
+	0x44b09,
+	0x1513c8,
+	0x20d183,
+	0x268dc4,
+	0x203ac2,
+	0x2bf0c4,
+	0x204885,
+	0x208403,
+	0x28a904,
+	0x20d183,
+	0x2385c4,
+	0x2355c3,
+	0x2526c4,
+	0x2db184,
+	0x224604,
+	0x20d203,
+	0x222103,
+	0x2482c3,
+	0x280ec5,
+	0x233903,
+	0x21a803,
+	0x295a83,
+	0x271dc4,
+	0x205d84,
+	0x2bb405,
+	0x1513c8,
+	0x325e44,
+	0x32cdc6,
+	0x2044c4,
+	0x207c02,
+	0x24d707,
+	0x254fc7,
+	0x250244,
+	0x25e585,
+	0x2e4cc5,
+	0x230285,
+	0x224604,
+	0x3871c8,
+	0x237c46,
+	0x318048,
+	0x27e145,
+	0x2e2845,
+	0x3a0304,
+	0x2482c3,
+	0x2f5b44,
+	0x376546,
+	0x3ab783,
+	0x271dc4,
+	0x251205,
+	0x331a84,
+	0x2428c4,
+	0x2061c2,
+	0x22f546,
+	0x3ad346,
+	0x309285,
+	0x2000c2,
+	0x203a83,
+	0x2ae07c02,
+	0x22a104,
+	0x200382,
+	0x272203,
+	0x20bf82,
+	0x222103,
+	0x2003c2,
+	0x215e83,
+	0x2020c3,
+	0xaab84,
+	0x1513c8,
+	0x1513c8,
+	0x214d83,
+	0xe6003,
+	0x2000c2,
+	0x2ba07c02,
+	0x214d83,
+	0x26ca83,
+	0x308103,
+	0x21eac4,
+	0x222103,
+	0x2482c3,
+	0x1513c8,
+	0x2000c2,
+	0x2c207c02,
+	0x20d183,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x682,
+	0x206342,
+	0x22e042,
+	0x224f03,
+	0x2eca43,
+	0x2000c2,
+	0xf4d45,
+	0x1513c8,
+	0xdf5c7,
+	0x207c02,
+	0x2355c3,
+	0x2526c4,
+	0x202b03,
+	0x214d83,
+	0x207483,
+	0x272203,
+	0x222103,
+	0x214b83,
+	0x2482c3,
+	0x219243,
+	0x959d3,
+	0xc7954,
+	0xf4d45,
+	0xdf5c7,
+	0x102c06,
+	0x777cb,
+	0x39c86,
+	0x5b607,
+	0x5e586,
+	0x649,
+	0x17faca,
+	0x8c34d,
+	0xbe14c,
+	0x10cb4a,
+	0x148108,
+	0x127cc5,
+	0x239c8,
+	0xea506,
+	0x71a06,
+	0x44a06,
+	0x20b782,
+	0x7084,
+	0x8504e,
+	0x5994c,
+	0xf4d45,
+	0x1883c7,
+	0x249d1,
+	0xfcd8a,
+	0x20d183,
+	0x7f9c5,
+	0x4a808,
+	0x2a344,
+	0x2d427cc6,
+	0xadec6,
+	0xd2cc6,
+	0x9180a,
+	0x18e683,
+	0x2da48b44,
+	0x605,
+	0xfb943,
+	0x2de36a47,
+	0x7e05,
+	0xce2cc,
+	0xf8108,
+	0x9f84b,
+	0x2e24f70c,
+	0x1415d43,
+	0xb9948,
+	0xa1109,
+	0x116688,
+	0x141fb86,
+	0x2e786149,
+	0x197387,
+	0xdf48a,
+	0x10e88,
+	0x101a88,
+	0xfcf04,
+	0x15fdc5,
+	0x9f987,
+	0x2ea9f983,
+	0x2ef9b686,
+	0x2f2f63c4,
+	0x2f6fc4c7,
+	0x101a84,
+	0x101a84,
+	0x101a84,
+	0x101a84,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x2000c2,
+	0x207c02,
+	0x214d83,
+	0x200d42,
+	0x222103,
+	0x2482c3,
+	0x215e83,
+	0x37e70f,
+	0x37eace,
+	0x1513c8,
+	0x20d183,
+	0x49e07,
+	0x2355c3,
+	0x214d83,
+	0x219a43,
+	0x222103,
+	0x2482c3,
+	0x192fc4,
+	0x170cc4,
+	0x173504,
+	0x21f703,
+	0x372787,
+	0x200a82,
+	0x2c9a49,
+	0x208e82,
+	0x2533cb,
+	0x2a288a,
+	0x2ad5c9,
+	0x200542,
+	0x370346,
+	0x234715,
+	0x253515,
+	0x23ff13,
+	0x253a93,
+	0x221d42,
+	0x221d45,
+	0x32498c,
+	0x2786cb,
+	0x3c0f85,
+	0x205a42,
+	0x323182,
+	0x38c606,
+	0x201742,
+	0x264606,
+	0x22340d,
+	0x207b8c,
+	0x228344,
 	0x200882,
-	0x3b4b46,
-	0x2099c2,
-	0xcd588,
-	0x210702,
-	0x200302,
-	0x217a07,
-	0x336087,
-	0x21c485,
-	0x2004c2,
-	0x2da6c7,
-	0x220488,
-	0x204002,
-	0x2f21c2,
-	0x230502,
-	0x203cc2,
-	0x23e988,
-	0x20bf83,
-	0x25dc48,
-	0x20bf8d,
-	0x237c03,
-	0x23bc48,
-	0x237c0f,
-	0x237fce,
-	0x38feca,
-	0x2d1311,
-	0x2d1790,
-	0x38360d,
-	0x38394c,
-	0x3452c7,
-	0x325207,
-	0x346109,
-	0x228fc2,
-	0x200782,
-	0x25becc,
-	0x25c1cb,
-	0x203c02,
-	0x2b2506,
-	0x2010c2,
-	0x202642,
-	0x2efa02,
-	0x202c42,
-	0x231fc4,
-	0x240647,
-	0x230a42,
-	0x245207,
-	0x2475c7,
-	0x21bc02,
-	0x21b282,
-	0x2498c5,
+	0x221bc2,
+	0x354488,
+	0x200202,
+	0x226dc6,
+	0x33284f,
+	0x226dd0,
+	0x2ebf44,
+	0x2348d5,
+	0x240093,
+	0x210583,
+	0x32364a,
+	0x219007,
+	0x34c349,
+	0x2e5547,
+	0x320542,
+	0x200282,
+	0x3b2246,
+	0x203102,
+	0x1513c8,
+	0x202742,
+	0x212802,
+	0x228f87,
+	0x330ac7,
+	0x330ad1,
+	0x21ce05,
+	0x33834e,
+	0x21ce0f,
 	0x204ac2,
-	0x2e72ce,
-	0x2a384d,
-	0x237583,
-	0x28400e,
-	0x3b868d,
-	0x348003,
-	0x202ec2,
-	0x2817c4,
-	0x238c42,
-	0x202e82,
-	0x372a45,
-	0x37b407,
-	0x24d902,
-	0x208882,
-	0x254607,
-	0x257688,
-	0x329982,
-	0x29df86,
-	0x25bd4c,
-	0x25c08b,
-	0x212c42,
-	0x26208f,
-	0x262450,
-	0x26284f,
-	0x262c15,
-	0x263154,
-	0x26364e,
-	0x2639ce,
-	0x263d4f,
-	0x26410e,
-	0x264494,
-	0x264993,
-	0x264e4d,
-	0x2755c9,
-	0x289843,
-	0x201802,
-	0x215f45,
-	0x206c06,
-	0x202542,
-	0x344e47,
-	0x30e843,
-	0x201402,
-	0x36dfc8,
-	0x2d1551,
-	0x2d1990,
-	0x200c42,
-	0x270f87,
-	0x205842,
-	0x341287,
-	0x209602,
-	0x348f89,
-	0x37e6c7,
-	0x2a4b48,
-	0x307486,
-	0x2e2c83,
-	0x326e05,
-	0x20e402,
-	0x202682,
-	0x3b4f45,
-	0x3c1485,
+	0x219207,
+	0x21f748,
+	0x202142,
+	0x2c2742,
+	0x325006,
+	0x33b30f,
+	0x325010,
+	0x22dcc2,
 	0x200f82,
-	0x214d03,
-	0x26ea07,
-	0x208007,
-	0x2085c2,
-	0x22e684,
-	0x20b4c3,
-	0x20b4c9,
-	0x20f108,
-	0x201542,
-	0x204482,
-	0x2e3547,
-	0x33d705,
-	0x293988,
-	0x222a87,
-	0x201cc3,
-	0x298106,
-	0x38348d,
-	0x38380c,
-	0x2e0646,
+	0x23bd48,
+	0x20d303,
+	0x25dc08,
+	0x20d30d,
+	0x235c43,
+	0x313a88,
+	0x235c4f,
+	0x23600e,
+	0x37128a,
+	0x2f9951,
+	0x2f9dd0,
+	0x2dc40d,
+	0x2dc74c,
+	0x200f87,
+	0x3237c7,
+	0x33d609,
+	0x228442,
+	0x202302,
+	0x33e30c,
+	0x33e80b,
+	0x20ae02,
+	0x2b78c6,
+	0x203442,
 	0x200482,
-	0x26f582,
-	0x201e42,
-	0x237a8f,
-	0x237e8e,
-	0x2dba87,
-	0x200b82,
-	0x3517c5,
-	0x3517c6,
-	0x203282,
-	0x205a02,
-	0x28ad86,
-	0x292ac3,
-	0x3411c6,
-	0x2c3ec5,
-	0x2c3ecd,
-	0x2c4495,
-	0x2c4e8c,
-	0x2c59cd,
-	0x2c5d92,
-	0x20d682,
-	0x26cd82,
-	0x2047c2,
-	0x21ce86,
-	0x2fc586,
-	0x201382,
-	0x206c86,
-	0x20c502,
-	0x20d245,
-	0x2013c2,
-	0x2a3949,
-	0x21d70c,
-	0x21da4b,
-	0x200342,
-	0x258508,
-	0x20cb42,
-	0x206f02,
-	0x271946,
-	0x22fb05,
-	0x31f507,
-	0x250d85,
-	0x2982c5,
-	0x249a82,
-	0x204c02,
-	0x20b182,
-	0x2dc107,
-	0x24f4cd,
-	0x24f84c,
-	0x34f687,
-	0x22bac2,
-	0x201f82,
-	0x23d488,
-	0x343888,
-	0x303d48,
-	0x30cdc4,
-	0x2b4507,
-	0x2e3c83,
-	0x24e882,
-	0x204882,
-	0x2e6b09,
-	0x2f7387,
-	0x2057c2,
-	0x271d45,
-	0x248602,
-	0x209942,
-	0x2bca43,
-	0x2bca46,
-	0x2f0602,
-	0x2f1e82,
-	0x201442,
-	0x3b33c6,
-	0x3454c7,
-	0x205e42,
+	0x202d42,
+	0x207c02,
+	0x22fcc4,
+	0x23d9c7,
+	0x203382,
+	0x245147,
+	0x246ec7,
+	0x231502,
+	0x206182,
+	0x249cc5,
+	0x21d2c2,
+	0x38180e,
+	0x2a674d,
+	0x2355c3,
+	0x289b4e,
+	0x3badcd,
+	0x324d83,
+	0x202b42,
+	0x287f84,
+	0x236c82,
+	0x208042,
+	0x39dac5,
+	0x3a0c47,
+	0x24e742,
+	0x219902,
+	0x2522c7,
+	0x255dc8,
+	0x231ac2,
+	0x29c6c6,
+	0x34ee0c,
+	0x34f30b,
+	0x201482,
+	0x2651cf,
+	0x265590,
+	0x26598f,
+	0x265d55,
+	0x266294,
+	0x26678e,
+	0x266b0e,
+	0x266e8f,
+	0x26724e,
+	0x2675d4,
+	0x267ad3,
+	0x267f8d,
+	0x279bc9,
+	0x28e003,
+	0x202b02,
+	0x21e145,
+	0x209546,
 	0x200382,
-	0x25da8f,
-	0x283e4d,
-	0x38b8ce,
-	0x3b850c,
-	0x2017c2,
-	0x200502,
-	0x3072c5,
-	0x311d86,
-	0x209002,
-	0x208102,
-	0x200982,
-	0x222a04,
-	0x2dcdc4,
-	0x3c23c6,
-	0x200a02,
-	0x2b7307,
-	0x231d03,
-	0x231d08,
-	0x2326c8,
-	0x243e07,
-	0x2ecbc6,
-	0x204042,
-	0x23e683,
-	0x23e687,
-	0x28a8c6,
-	0x2f3045,
-	0x30d148,
-	0x206a42,
-	0x341687,
-	0x20fd82,
-	0x2f4682,
-	0x20c142,
-	0x2f1149,
-	0x20a402,
-	0x201742,
-	0x24adc3,
-	0x325ec7,
-	0x2040c2,
-	0x21d88c,
-	0x21db8b,
-	0x2e06c6,
-	0x35cbc5,
-	0x227882,
-	0x201c42,
-	0x2ba046,
-	0x22e983,
-	0x331547,
-	0x20cb82,
-	0x202a82,
-	0x235115,
-	0x24a5d5,
-	0x236653,
-	0x24ab13,
-	0x25d207,
-	0x274548,
-	0x274550,
-	0x28744f,
-	0x373ad3,
-	0x28cdd2,
-	0x292450,
-	0x2b350f,
-	0x2fd6d2,
-	0x3af491,
-	0x2af493,
-	0x3938d2,
-	0x2c3b0f,
-	0x2cd74e,
-	0x2cf252,
-	0x2d09d1,
-	0x2d3b0f,
-	0x2d528e,
-	0x2dc811,
-	0x2dd7d0,
-	0x2ed512,
-	0x2f0f51,
-	0x2f2206,
-	0x2f3907,
-	0x38e407,
+	0x343147,
+	0x214d83,
+	0x200642,
+	0x233cc8,
+	0x2f9b91,
+	0x2f9fd0,
+	0x204182,
+	0x284b07,
+	0x200b02,
+	0x209007,
+	0x20b2c2,
+	0x216c09,
+	0x38c5c7,
+	0x2a1888,
+	0x227b06,
+	0x2ec943,
+	0x3253c5,
+	0x235842,
+	0x2004c2,
+	0x3b2645,
+	0x2596c5,
+	0x2023c2,
+	0x2023c3,
+	0x2023c7,
+	0x224807,
+	0x202e02,
+	0x331f84,
+	0x225003,
+	0x3181c9,
+	0x2fafc8,
+	0x204942,
+	0x20e7c2,
+	0x386887,
+	0x3a0045,
+	0x2bc548,
+	0x334487,
+	0x2052c3,
+	0x290646,
+	0x2dc28d,
+	0x2dc60c,
+	0x300286,
+	0x203882,
+	0x29f702,
+	0x202002,
+	0x235acf,
+	0x235ece,
+	0x2e4d47,
 	0x200d02,
-	0x27efc5,
-	0x3713c7,
-	0x230882,
-	0x20f6c2,
-	0x22d0c5,
-	0x200443,
-	0x200446,
-	0x24f68d,
-	0x24f9cc,
-	0x206d02,
-	0x3ab30b,
-	0x273fca,
-	0x22358a,
-	0x2b9489,
-	0x2e530b,
-	0x222bcd,
-	0x2fe44c,
-	0x2ec88a,
-	0x27500c,
-	0x294d4b,
-	0x2a204c,
-	0x2f968b,
-	0x2b9e83,
-	0x2f4f06,
-	0x3b9942,
-	0x2f3dc2,
-	0x20e343,
-	0x201ac2,
-	0x207203,
-	0x24ec86,
-	0x262dc7,
-	0x2ad706,
-	0x2f6b48,
-	0x343588,
-	0x2ca146,
-	0x211d82,
-	0x3011cd,
-	0x30150c,
-	0x2d2547,
-	0x304e07,
-	0x23c242,
-	0x219742,
-	0x23e602,
-	0x257a42,
-	0x202c42,
-	0x20ec83,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x207c03,
-	0x200742,
-	0x201482,
-	0x2e68ecc5,
-	0x2ea8e4c5,
-	0x2efb3086,
-	0xcd588,
-	0x2f2afb05,
+	0x35b405,
+	0x35b406,
+	0x22a542,
+	0x203202,
+	0x28f046,
+	0x208f43,
+	0x208f46,
+	0x2cc445,
+	0x2cc44d,
+	0x2cca15,
+	0x2cdccc,
+	0x2ce5cd,
+	0x2ce992,
+	0x206282,
+	0x26f582,
+	0x200a42,
+	0x226906,
+	0x304586,
+	0x201a42,
+	0x2095c6,
+	0x20de02,
+	0x20de05,
+	0x202e42,
+	0x2a6849,
+	0x22c28c,
+	0x22c5cb,
+	0x2003c2,
+	0x256988,
+	0x205882,
+	0x210482,
+	0x273006,
+	0x31e2c5,
+	0x391307,
+	0x2ed445,
+	0x290805,
+	0x20c0c2,
+	0x208e02,
+	0x20d682,
+	0x2e7a47,
+	0x31ab0d,
+	0x31ae8c,
+	0x23b8c7,
+	0x229b42,
+	0x206f42,
+	0x237f48,
+	0x331c88,
+	0x2e4088,
+	0x314f44,
+	0x2b8607,
+	0x23d903,
+	0x25b402,
+	0x2054c2,
+	0x2f2309,
+	0x2fe787,
+	0x208642,
+	0x273405,
+	0x204c42,
+	0x230782,
+	0x2c10c3,
+	0x2c10c6,
+	0x2fa3c2,
+	0x2fbd82,
+	0x200402,
+	0x3bfe46,
+	0x2b4287,
+	0x2022c2,
+	0x200902,
+	0x25da4f,
+	0x28998d,
+	0x39a3ce,
+	0x3bac4c,
+	0x206782,
+	0x2024c2,
+	0x227945,
+	0x31c506,
+	0x217dc2,
+	0x204a02,
+	0x200682,
+	0x289d04,
+	0x2e2a44,
+	0x32c0c6,
+	0x204fc2,
+	0x23b207,
+	0x244343,
+	0x244348,
+	0x247408,
+	0x39df07,
+	0x255586,
 	0x202c42,
-	0x209d42,
-	0x2f726285,
-	0x2fa7cb85,
-	0x2fe7d647,
-	0x302867c9,
-	0x30667d84,
-	0x202542,
+	0x228003,
+	0x228007,
+	0x294b46,
+	0x2f15c5,
+	0x3152c8,
+	0x200b42,
+	0x370107,
+	0x216cc2,
+	0x2d48c2,
+	0x20d4c2,
+	0x21cf89,
+	0x213b42,
+	0x2010c2,
+	0x23bb43,
+	0x201707,
+	0x202cc2,
+	0x22c40c,
+	0x22c70b,
+	0x300306,
+	0x2fb885,
+	0x205102,
+	0x201842,
+	0x2be9c6,
+	0x202bc3,
+	0x307d07,
+	0x276142,
+	0x2008c2,
+	0x234595,
+	0x2536d5,
+	0x23fdd3,
+	0x253c13,
+	0x39f447,
+	0x3b8411,
+	0x3b8b50,
+	0x26a952,
+	0x278b11,
+	0x27ab88,
+	0x27ab90,
+	0x2910cf,
+	0x2a2653,
+	0x2ad392,
+	0x2ae2d0,
+	0x35158f,
+	0x3b9152,
+	0x3ba311,
+	0x332f53,
+	0x3b6b12,
+	0x2b22cf,
+	0x2c1c4e,
+	0x2c91d2,
+	0x2cc011,
+	0x2d538f,
+	0x2d838e,
+	0x3bbf11,
+	0x3bc6d0,
+	0x2d9b52,
+	0x2ddb91,
+	0x3bccd0,
+	0x3bd2cf,
+	0x2e0511,
+	0x2e21d0,
+	0x2e8806,
+	0x2f1e87,
+	0x211c47,
+	0x200c42,
+	0x285985,
+	0x37e547,
+	0x22e042,
+	0x202f82,
+	0x22ab85,
+	0x220603,
+	0x3b5ac6,
+	0x31accd,
+	0x31b00c,
+	0x209642,
+	0x32480b,
+	0x27858a,
+	0x221c0a,
+	0x2ba809,
+	0x2f04cb,
+	0x3345cd,
+	0x3064cc,
+	0x274d8a,
+	0x27960c,
+	0x297a0b,
+	0x3c0dcc,
+	0x3c12ce,
+	0x3c1acb,
+	0x3c1f8c,
+	0x2b0f03,
+	0x303906,
+	0x307a42,
+	0x2fcc82,
+	0x2161c3,
+	0x202242,
+	0x229fc3,
+	0x31a2c6,
+	0x265f07,
+	0x3058c6,
+	0x2f1088,
+	0x202248,
+	0x310a06,
+	0x20a2c2,
+	0x308c4d,
+	0x308f8c,
+	0x2db247,
+	0x30c987,
+	0x237682,
+	0x21aa02,
+	0x213a42,
+	0x256182,
+	0x332757,
+	0x338256,
+	0x33b217,
+	0x33e214,
+	0x33e713,
+	0x34ed14,
+	0x34f213,
+	0x3b5310,
+	0x3b8319,
+	0x3b8a58,
+	0x3b905a,
+	0x3ba219,
+	0x3bbe19,
+	0x3bc5d8,
+	0x3bcbd8,
+	0x3bd1d7,
+	0x3c0cd4,
+	0x3c11d6,
+	0x3c19d3,
+	0x3c1e94,
+	0x207c02,
+	0x222103,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x215e83,
+	0x2000c2,
+	0x2036c2,
+	0x31692ec5,
+	0x31a8b705,
+	0x31fbfb06,
+	0x1513c8,
+	0x322b2845,
+	0x207c02,
+	0x206042,
+	0x32604105,
+	0x32a83245,
+	0x32e84cc7,
+	0x332871c9,
+	0x33756984,
+	0x200382,
+	0x200642,
+	0x33a60145,
+	0x33e99189,
+	0x34331408,
+	0x346b0105,
+	0x34b38807,
+	0x34e6fc08,
+	0x352e9145,
+	0x35639546,
+	0x35b86389,
+	0x35ecdac8,
+	0x362c3dc8,
+	0x366997ca,
+	0x36a7a404,
+	0x36ea7145,
+	0x372c0988,
+	0x37731885,
+	0x2180c2,
+	0x37a4b143,
+	0x37ea5346,
+	0x38353f08,
+	0x387113c6,
+	0x38b64f48,
+	0x38f4c8c6,
+	0x3934af04,
 	0x201402,
-	0x30b0dec5,
-	0x30e95f49,
-	0x31327988,
-	0x316ac205,
-	0x31af0707,
-	0x31e21cc8,
-	0x322def85,
-	0x3266d246,
-	0x32b6d849,
-	0x32ed4ec8,
-	0x332bf988,
-	0x3369658a,
-	0x33a75e04,
-	0x33f7c545,
-	0x342bc308,
-	0x34727e05,
-	0x217f42,
-	0x34a061c3,
-	0x34ea2606,
-	0x35311408,
-	0x356eee46,
-	0x35b643c8,
-	0x35eb6306,
-	0x363c2f44,
-	0x2032c2,
-	0x366f1587,
-	0x36aa8644,
-	0x36e77e87,
-	0x3723ecc7,
-	0x200342,
-	0x3769ae85,
-	0x37a403c4,
-	0x37ee1787,
-	0x383a3387,
-	0x38681606,
-	0x38a7d205,
-	0x38e96047,
-	0x392e5a48,
-	0x396162c7,
-	0x39b94949,
-	0x39ec51c5,
-	0x3a2b4107,
-	0x3a68e306,
-	0x3aa941c8,
-	0x227d8d,
-	0x251989,
-	0x272fcb,
-	0x27ac8b,
-	0x2a78cb,
-	0x2da98b,
-	0x311f8b,
-	0x31224b,
-	0x312889,
-	0x31378b,
-	0x313a4b,
-	0x313fcb,
-	0x314c8a,
-	0x3151ca,
-	0x3157cc,
-	0x31938b,
-	0x319dca,
-	0x33080a,
-	0x33b28e,
-	0x33be8e,
-	0x33c20a,
-	0x33e14a,
-	0x33eb4b,
-	0x33ee0b,
-	0x33fa8b,
-	0x35edcb,
-	0x35f3ca,
-	0x36008b,
-	0x36034a,
-	0x3605ca,
-	0x36084a,
-	0x37d74b,
-	0x3856cb,
-	0x388f8e,
-	0x38930b,
-	0x391f4b,
-	0x392e0b,
-	0x39a6ca,
-	0x39a949,
-	0x39ab8a,
-	0x39c6ca,
-	0x3b06cb,
-	0x3b204b,
-	0x3b2a0a,
-	0x3b390b,
-	0x3b904b,
-	0x3c554b,
-	0x3ae7fd48,
-	0x3b287989,
-	0x3b69d989,
-	0x3bad8988,
-	0x34c805,
-	0x200583,
-	0x22a3c4,
-	0x217c05,
-	0x267ac6,
-	0x26cfc5,
-	0x286284,
-	0x344d48,
-	0x30b505,
-	0x290604,
-	0x2064c7,
-	0x29cf0a,
-	0x266b4a,
-	0x2dbb87,
-	0x20c4c7,
-	0x2fd2c7,
-	0x282187,
-	0x2f8c45,
-	0x3b6e46,
-	0x386007,
-	0x244e44,
-	0x2df546,
-	0x2df446,
-	0x204745,
-	0x3389c4,
-	0x2975c6,
-	0x29bfc7,
-	0x22df06,
-	0x27c8c7,
-	0x250803,
-	0x3912c6,
-	0x234f05,
-	0x27d747,
-	0x26a84a,
-	0x26e7c4,
-	0x21bd88,
-	0x2b8a49,
-	0x2e0d07,
-	0x319c46,
-	0x258788,
-	0x2ef589,
-	0x30f084,
-	0x33a484,
-	0x29ef05,
-	0x2ba648,
-	0x2c2807,
-	0x2b3e49,
-	0x22dc08,
-	0x2f2306,
-	0x310806,
-	0x297f88,
-	0x362bc6,
-	0x28e4c5,
-	0x2816c6,
-	0x278988,
-	0x237986,
-	0x25af0b,
-	0x2c7c06,
-	0x299b0d,
-	0x369405,
-	0x2a8506,
-	0x21f085,
-	0x331b49,
-	0x3a6cc7,
-	0x318308,
-	0x2a1e46,
-	0x298d89,
-	0x33ffc6,
-	0x26a7c5,
-	0x24c486,
-	0x288b86,
-	0x2c6e49,
-	0x31e2c6,
-	0x29cc07,
-	0x245e85,
-	0x203983,
-	0x25b085,
-	0x299dc7,
-	0x3ab746,
-	0x369309,
-	0x3b3086,
-	0x26b146,
-	0x213fc9,
-	0x2810c9,
-	0x29fac7,
-	0x200908,
-	0x2b2f49,
-	0x27ec48,
-	0x330a46,
-	0x2d1d85,
-	0x240c8a,
-	0x26b1c6,
-	0x239346,
-	0x2cac05,
-	0x2d4888,
-	0x22b287,
-	0x233f0a,
-	0x254f86,
-	0x251dc5,
-	0x3324c6,
-	0x224507,
-	0x319b07,
-	0x2835c5,
-	0x26a985,
-	0x395a06,
-	0x3b8c06,
-	0x2fa846,
-	0x2bc7c4,
-	0x280449,
-	0x288806,
-	0x2c814a,
-	0x227248,
-	0x36fd08,
-	0x266b4a,
-	0x212505,
-	0x29bf05,
-	0x2dd048,
-	0x2c9688,
-	0x233907,
-	0x2ba946,
-	0x32bf88,
-	0x309507,
-	0x27f348,
-	0x2b5706,
-	0x281e48,
-	0x295586,
-	0x278307,
-	0x33a206,
-	0x2975c6,
-	0x22ecca,
-	0x232046,
-	0x2d1d89,
-	0x2ee586,
-	0x35c00a,
-	0x3c2f49,
-	0x27dd86,
-	0x2b8304,
-	0x21600d,
-	0x287c07,
-	0x239c06,
-	0x2bf845,
-	0x340045,
-	0x37f306,
-	0x2e15c9,
-	0x2d4407,
-	0x279406,
-	0x306886,
-	0x286309,
-	0x2a3204,
-	0x242544,
-	0x3c2a88,
-	0x24f046,
-	0x271348,
-	0x2e8008,
-	0x29f447,
-	0x3b6589,
-	0x2faa47,
-	0x2af9ca,
-	0x2e79cf,
-	0x31194a,
-	0x3070c5,
-	0x278bc5,
-	0x218b05,
-	0x35c647,
-	0x2240c3,
-	0x200b08,
-	0x21e646,
-	0x21e749,
-	0x2d8646,
-	0x2c8547,
-	0x298b49,
-	0x318208,
-	0x2cacc7,
-	0x30eb43,
-	0x34c885,
-	0x224045,
-	0x2bc60b,
-	0x327ec4,
-	0x2d6884,
-	0x276bc6,
-	0x30f407,
-	0x38f4ca,
-	0x206247,
-	0x20c347,
-	0x27cb85,
-	0x3c6485,
-	0x282609,
-	0x2975c6,
-	0x2060cd,
-	0x31e505,
-	0x2b18c3,
-	0x20b003,
-	0x3a4d45,
-	0x351305,
-	0x258788,
-	0x27a347,
-	0x2422c6,
-	0x29d606,
-	0x22de05,
-	0x237847,
-	0x3c1d47,
-	0x23c6c7,
-	0x37c5ca,
-	0x391388,
-	0x2bc7c4,
-	0x257bc7,
-	0x27bb07,
-	0x33f086,
-	0x2692c7,
-	0x2a1808,
-	0x395f08,
-	0x329b06,
-	0x20c708,
-	0x2cfbc4,
-	0x386006,
-	0x370d86,
-	0x36bd46,
-	0x277806,
-	0x29b244,
-	0x282246,
-	0x2be246,
-	0x297986,
-	0x2060c6,
-	0x20aec6,
-	0x2a1646,
-	0x2421c8,
-	0x385a88,
-	0x2cdac8,
-	0x26d1c8,
-	0x2dcfc6,
-	0x212305,
-	0x39e746,
-	0x2ac285,
-	0x396f87,
-	0x22dcc5,
-	0x213c03,
-	0x38e045,
-	0x33dd04,
-	0x20b005,
-	0x247643,
-	0x33c4c7,
-	0x30d708,
-	0x27c986,
-	0x2c930d,
-	0x278b86,
-	0x296f45,
-	0x222083,
-	0x2bbcc9,
-	0x2a3386,
-	0x291706,
-	0x271e04,
-	0x3118c7,
-	0x23a1c6,
-	0x2d46c5,
-	0x21af83,
-	0x3be4c4,
-	0x27bcc6,
-	0x3b6f44,
-	0x370e88,
-	0x3459c9,
-	0x2317c9,
-	0x29ed0a,
-	0x2a05cd,
-	0x2118c7,
-	0x2391c6,
-	0x20f984,
-	0x2867c9,
-	0x284ac8,
-	0x287806,
-	0x241906,
-	0x2692c7,
-	0x2d9346,
-	0x22a046,
-	0x347086,
-	0x23ed4a,
-	0x221cc8,
-	0x22f885,
-	0x2a2fc9,
-	0x27f84a,
-	0x2ff648,
-	0x29b6c8,
-	0x291688,
-	0x29d24c,
-	0x3124c5,
-	0x29d888,
-	0x385d86,
+	0x39753787,
+	0x39aab384,
+	0x39e7de47,
+	0x3a23c087,
+	0x2003c2,
+	0x3a69dc05,
+	0x3aa4d384,
+	0x3aee4787,
+	0x3b243bc7,
+	0x3b687dc6,
+	0x3ba840c5,
+	0x3be99287,
+	0x3c2e7308,
+	0x3c61e4c7,
+	0x3cab5b09,
+	0x3cece005,
+	0x3d2dfc87,
+	0x3d692506,
+	0x3daca088,
+	0x22b08d,
+	0x2804c9,
+	0x28c8cb,
+	0x2a890b,
+	0x2b360b,
+	0x30d00b,
+	0x31c70b,
+	0x31c9cb,
+	0x31d009,
+	0x31f14b,
+	0x31f40b,
+	0x31fc0b,
+	0x3208ca,
+	0x320e0a,
+	0x32140c,
+	0x32848b,
+	0x328eca,
+	0x33c00a,
+	0x34330e,
+	0x34544e,
+	0x3457ca,
+	0x3472ca,
+	0x348acb,
+	0x348d8b,
+	0x349a0b,
+	0x36984b,
+	0x369e4a,
+	0x36ab0b,
+	0x36adca,
+	0x36b04a,
+	0x36b2ca,
+	0x38b88b,
+	0x39580b,
+	0x397c4e,
+	0x397fcb,
+	0x3a0e0b,
+	0x3a1c8b,
+	0x3a5bca,
+	0x3a5e49,
+	0x3a608a,
+	0x3a7a8a,
+	0x3b7d0b,
+	0x3bebcb,
+	0x3bf48a,
+	0x3c070b,
+	0x3c658b,
+	0x3d0c0b,
+	0x3de86048,
+	0x3e28bac9,
+	0x3e6a0f89,
+	0x3eae3bc8,
+	0x351c85,
+	0x202a43,
+	0x31bd84,
+	0x373845,
+	0x3566c6,
+	0x2392c5,
+	0x28b184,
+	0x343048,
+	0x314ac5,
+	0x294244,
+	0x214687,
+	0x2a050a,
+	0x24d9ca,
+	0x2e4e47,
+	0x21b807,
+	0x3052c7,
+	0x280087,
+	0x300805,
+	0x20a346,
+	0x2bf2c7,
+	0x249bc4,
+	0x2e9706,
+	0x2e9606,
+	0x209985,
+	0x39b2c4,
+	0x29a806,
+	0x29ea87,
+	0x3ce3c6,
+	0x353387,
+	0x293b43,
+	0x3a4ac6,
+	0x22f345,
+	0x284dc7,
+	0x26d50a,
+	0x233dc4,
+	0x3590c8,
+	0x318509,
+	0x2e1787,
+	0x328d46,
+	0x3873c8,
+	0x311b09,
+	0x34c504,
+	0x369244,
+	0x2a2dc5,
+	0x2befc8,
+	0x2ca607,
+	0x2df9c9,
+	0x2edcc8,
+	0x2e8906,
+	0x333c46,
+	0x29b1c8,
+	0x36d5c6,
+	0x28b705,
+	0x287e86,
+	0x27ea08,
+	0x2359c6,
+	0x25c14b,
+	0x2d4746,
+	0x29c84d,
+	0x20c645,
+	0x2ab246,
+	0x23ea05,
+	0x258e09,
+	0x350507,
+	0x35f588,
+	0x2aee06,
+	0x29ba49,
+	0x349f46,
+	0x26d485,
+	0x2a2cc6,
+	0x2c7346,
+	0x2cfa49,
+	0x202786,
+	0x2a0207,
+	0x245dc5,
+	0x211583,
+	0x25c2c5,
+	0x29cb07,
+	0x324c46,
+	0x20c549,
+	0x3bfb06,
+	0x26de06,
+	0x217a09,
+	0x287889,
+	0x2a36c7,
+	0x371e48,
+	0x2add09,
+	0x285608,
+	0x394b86,
+	0x2dab05,
+	0x23e00a,
+	0x26de86,
+	0x23d246,
+	0x2d38c5,
+	0x2cd488,
+	0x39fbc7,
+	0x23220a,
+	0x252e06,
+	0x280905,
+	0x203606,
+	0x3443c7,
+	0x328c07,
+	0x368205,
+	0x26d645,
+	0x282206,
+	0x2a9786,
+	0x2b1046,
+	0x2c0e44,
+	0x286749,
+	0x28cb86,
+	0x2fa58a,
+	0x31c148,
+	0x347a08,
+	0x24d9ca,
+	0x2260c5,
+	0x29e9c5,
+	0x2b4448,
+	0x2b90c8,
+	0x22fa87,
+	0x316f46,
+	0x336388,
+	0x2ac947,
+	0x284f08,
+	0x2b8246,
+	0x288608,
+	0x2987c6,
+	0x27e2c7,
+	0x368fc6,
+	0x29a806,
+	0x3cf3ca,
+	0x22fd46,
+	0x2dab09,
+	0x310b06,
+	0x2eb84a,
+	0x34af09,
+	0x25f046,
+	0x2b93c4,
+	0x21e20d,
+	0x28bd47,
+	0x2bc2c6,
+	0x2c3c85,
+	0x349fc5,
+	0x38d206,
+	0x2e45c9,
+	0x2cd007,
+	0x27f486,
+	0x2de506,
+	0x28b209,
+	0x28b644,
+	0x24e584,
+	0x326408,
+	0x31a686,
+	0x272a08,
+	0x315648,
+	0x2ab8c7,
+	0x3b4189,
+	0x2b1247,
+	0x2b270a,
+	0x2f2dcf,
+	0x354a0a,
+	0x227745,
+	0x27ec45,
+	0x357a05,
+	0x2ebe87,
+	0x237043,
+	0x372048,
+	0x22d1c6,
+	0x22d2c9,
+	0x2d2646,
+	0x2d0d87,
+	0x29b809,
+	0x35f488,
+	0x2d3987,
+	0x317a83,
+	0x351d05,
+	0x343f05,
+	0x2c0c8b,
+	0x331944,
+	0x241d84,
+	0x27b606,
+	0x317c47,
+	0x39d04a,
+	0x24b1c7,
+	0x20d6c7,
+	0x283245,
+	0x3cb1c5,
+	0x269d49,
+	0x29a806,
+	0x24b04d,
+	0x2029c5,
+	0x2b5743,
+	0x201a03,
+	0x3ad585,
+	0x35af45,
+	0x3873c8,
+	0x27fd47,
+	0x24e306,
+	0x2a0c06,
+	0x22b9c5,
+	0x235887,
+	0x3c8c07,
+	0x237b07,
+	0x2a71ca,
+	0x3a4b88,
+	0x2c0e44,
+	0x281287,
+	0x281c47,
+	0x349006,
+	0x297e47,
+	0x2deb48,
+	0x37fc88,
+	0x250446,
+	0x21ba48,
+	0x202804,
+	0x2bf2c6,
+	0x2529c6,
+	0x38fa46,
+	0x23eb46,
+	0x29dfc4,
+	0x280146,
+	0x2c2946,
+	0x29abc6,
+	0x231b06,
+	0x218346,
+	0x2de986,
+	0x24e208,
+	0x3b97c8,
+	0x2d6ac8,
+	0x2394c8,
+	0x2b43c6,
+	0x21b605,
+	0x392586,
+	0x2b0185,
+	0x3a4647,
+	0x2a7c45,
+	0x215783,
+	0x207205,
+	0x3cab84,
+	0x218485,
+	0x205883,
+	0x345a87,
+	0x367bc8,
+	0x353446,
+	0x2b8d4d,
+	0x27ec06,
+	0x29a185,
+	0x21cf83,
+	0x2c0349,
+	0x28b7c6,
+	0x2953c6,
+	0x2734c4,
+	0x354987,
+	0x312006,
+	0x2cd2c5,
+	0x200cc3,
+	0x211084,
+	0x281e06,
+	0x252ac4,
+	0x2d3508,
+	0x20ab09,
+	0x3199c9,
+	0x2a2bca,
+	0x2a418d,
+	0x234147,
+	0x23d0c6,
+	0x223ac4,
+	0x2871c9,
+	0x28a308,
+	0x28b946,
+	0x23f286,
+	0x297e47,
+	0x2d2a46,
+	0x2830c6,
+	0x276406,
+	0x23c10a,
+	0x26fc08,
+	0x31da85,
+	0x261989,
+	0x2cad8a,
+	0x375f48,
+	0x29e448,
+	0x295348,
+	0x2a084c,
+	0x31cc45,
+	0x2a0e88,
+	0x3b9ac6,
+	0x39ef86,
+	0x3cca07,
+	0x24b0c5,
+	0x288005,
+	0x319889,
+	0x21ed07,
+	0x22d285,
+	0x2a9d47,
+	0x201a03,
+	0x2cb245,
+	0x2296c8,
+	0x32c747,
+	0x29e309,
+	0x2eab85,
+	0x341244,
+	0x2a3e48,
+	0x2e2e47,
+	0x2d3b48,
+	0x39c248,
+	0x2ac305,
+	0x22d0c6,
+	0x21c106,
+	0x350849,
+	0x2dd087,
+	0x2b07c6,
+	0x229c47,
+	0x203b43,
+	0x356984,
+	0x2d8d05,
+	0x259cc4,
+	0x24f9c4,
+	0x286e87,
+	0x26c207,
+	0x26a1c4,
+	0x29e150,
+	0x392107,
+	0x3cb1c5,
+	0x25510c,
+	0x216344,
+	0x2b6e88,
+	0x27e1c9,
+	0x383046,
+	0x3167c8,
+	0x21da04,
+	0x27b908,
+	0x232806,
+	0x3cf248,
+	0x29cdc6,
+	0x289e4b,
+	0x32a945,
+	0x2d8b88,
+	0x20af44,
+	0x20af4a,
+	0x29e309,
+	0x368ec6,
+	0x2f9508,
+	0x2a5d05,
+	0x31ea04,
+	0x2b6d86,
+	0x2379c8,
+	0x286048,
+	0x336c06,
+	0x32c044,
+	0x23df86,
+	0x2b12c7,
+	0x27dd47,
+	0x297e4f,
+	0x2086c7,
+	0x25f107,
+	0x35b2c5,
+	0x367385,
+	0x2a3389,
+	0x2ea246,
+	0x284205,
+	0x287b87,
+	0x2c8dc8,
+	0x2d4185,
+	0x368fc6,
+	0x31bf88,
+	0x3113ca,
+	0x213c88,
+	0x28edc7,
+	0x2f3206,
+	0x261946,
+	0x2003c3,
+	0x217f03,
+	0x2caf49,
+	0x2adb89,
+	0x2b5a06,
+	0x2eab85,
+	0x31e708,
+	0x2f9508,
+	0x36d748,
+	0x27648b,
+	0x2b8f87,
+	0x310109,
+	0x2980c8,
+	0x35dac4,
+	0x35f8c8,
+	0x290b89,
+	0x2b0ac5,
+	0x2ebd87,
+	0x356a05,
+	0x285f48,
+	0x292d4b,
+	0x298fd0,
+	0x2aac85,
+	0x21738c,
+	0x24e4c5,
+	0x2832c3,
+	0x2b4ac6,
+	0x2c1fc4,
+	0x24d486,
+	0x29ea87,
+	0x203b84,
+	0x248588,
+	0x371f0d,
+	0x316d85,
+	0x234184,
+	0x227484,
+	0x296ac9,
+	0x2d9408,
+	0x32ae07,
+	0x232888,
+	0x286808,
+	0x27f785,
+	0x27c347,
+	0x27f707,
+	0x312ac7,
+	0x26d649,
+	0x391e49,
+	0x270986,
+	0x2dc946,
+	0x287c46,
+	0x346c45,
+	0x39af04,
+	0x3c3d86,
+	0x3c86c6,
+	0x27f7c8,
+	0x34408b,
+	0x26af47,
+	0x223ac4,
+	0x311f46,
+	0x2dee87,
+	0x323b05,
+	0x388f05,
+	0x23f4c4,
+	0x391dc6,
+	0x3c3e08,
+	0x2871c9,
 	0x24c9c6,
-	0x35eb07,
-	0x206145,
-	0x281845,
-	0x231689,
-	0x2139c7,
-	0x21e705,
-	0x22aec7,
-	0x20b003,
-	0x2c2d45,
-	0x2151c8,
-	0x280d47,
-	0x29b589,
-	0x2e9f85,
-	0x33e384,
-	0x2a0288,
-	0x2f16c7,
-	0x2cae88,
-	0x3aac88,
-	0x2e1dc5,
-	0x21e546,
-	0x29d706,
-	0x3a7009,
-	0x2cb3c7,
-	0x2ac8c6,
-	0x206e87,
-	0x239fc3,
-	0x267d84,
-	0x2cfcc5,
-	0x2f3f84,
-	0x246804,
-	0x27ffc7,
-	0x340d87,
-	0x26dc84,
-	0x29b3d0,
-	0x31d507,
-	0x3c6485,
-	0x2561cc,
-	0x224a04,
-	0x2c4c88,
-	0x278209,
-	0x375886,
-	0x240088,
-	0x21ca84,
-	0x276ec8,
-	0x234506,
-	0x22eb48,
-	0x29a086,
-	0x28854b,
-	0x38ddc5,
-	0x2cfb48,
-	0x2173c4,
-	0x345e0a,
-	0x29b589,
-	0x33a106,
-	0x218bc8,
-	0x25ed85,
-	0x31dec4,
-	0x2c4b86,
-	0x23c588,
-	0x27fd48,
-	0x32c806,
-	0x3c2344,
-	0x240c06,
-	0x2faac7,
-	0x277d87,
-	0x2692cf,
-	0x205847,
-	0x27de47,
-	0x351685,
-	0x35e345,
-	0x29f789,
-	0x382e46,
-	0x27d885,
-	0x2813c7,
-	0x3934c8,
-	0x2c7645,
-	0x33a206,
-	0x227088,
-	0x2eee4a,
-	0x3bf088,
-	0x28ab07,
-	0x2e7e06,
-	0x2a2f86,
-	0x202583,
-	0x20de03,
-	0x27fa09,
-	0x2b2dc9,
-	0x2c4a86,
-	0x2e9f85,
-	0x36bac8,
-	0x218bc8,
-	0x362d48,
-	0x34710b,
-	0x2c9547,
-	0x309149,
-	0x269548,
-	0x350284,
-	0x318648,
-	0x28c889,
-	0x2acbc5,
-	0x35c547,
-	0x267e05,
-	0x27fc48,
-	0x28eb4b,
-	0x295d90,
-	0x2a8145,
-	0x21730c,
-	0x242485,
-	0x27cc03,
-	0x2b1d06,
-	0x2bd884,
-	0x2404c6,
-	0x29bfc7,
-	0x227104,
-	0x248688,
-	0x2009cd,
-	0x2dfc05,
-	0x211904,
-	0x28f244,
-	0x28f249,
-	0x2ae548,
-	0x31bc47,
-	0x234588,
-	0x280508,
-	0x279705,
-	0x21f2c7,
-	0x279687,
-	0x23ac87,
-	0x26a989,
-	0x346dc9,
-	0x272146,
-	0x383b46,
-	0x269506,
-	0x33b6c5,
-	0x3aa4c4,
-	0x3bd646,
-	0x3c4c46,
-	0x279748,
-	0x2241cb,
-	0x26e687,
-	0x20f984,
-	0x23a106,
-	0x2a1b47,
-	0x335405,
-	0x3583c5,
-	0x223884,
-	0x346d46,
-	0x3bd6c8,
-	0x2867c9,
-	0x2091c6,
-	0x2848c8,
-	0x2d4786,
-	0x350908,
-	0x2ce58c,
-	0x2795c6,
-	0x296c0d,
-	0x29708b,
-	0x29ccc5,
-	0x3c1e87,
-	0x31e3c6,
-	0x3199c8,
-	0x2721c9,
-	0x329dc8,
-	0x3c6485,
-	0x208947,
-	0x27ed48,
-	0x24ff89,
-	0x2a5586,
-	0x24da8a,
-	0x319748,
-	0x329c0b,
-	0x2ccd8c,
-	0x276fc8,
-	0x27b286,
-	0x21dfc8,
-	0x2eeac7,
-	0x205989,
-	0x2f084d,
-	0x2974c6,
-	0x31dd48,
-	0x385949,
-	0x2bc8c8,
-	0x281f48,
-	0x2bec8c,
-	0x2bff87,
-	0x2c0a47,
-	0x26a7c5,
-	0x2b4807,
-	0x393388,
-	0x2c4c06,
-	0x20904c,
-	0x2ec1c8,
-	0x2c8c48,
-	0x250286,
-	0x223dc7,
-	0x272344,
-	0x26d1c8,
-	0x2b6d0c,
-	0x28430c,
-	0x307145,
-	0x2047c7,
-	0x3c22c6,
-	0x223d46,
-	0x331d08,
-	0x367784,
-	0x22df0b,
-	0x2b744b,
-	0x2e7e06,
-	0x200847,
-	0x322385,
-	0x271285,
-	0x22e046,
-	0x25ed45,
-	0x327e85,
-	0x2c6c87,
+	0x28a108,
+	0x2cd386,
+	0x35a548,
+	0x32f98c,
+	0x27f646,
+	0x299e4d,
+	0x29a2cb,
+	0x2a02c5,
+	0x3c8d47,
+	0x202886,
+	0x328ac8,
 	0x270a09,
-	0x3b8dc4,
-	0x25f405,
-	0x2de045,
-	0x2add08,
-	0x2da405,
-	0x287109,
-	0x2c9ac7,
-	0x2c9acb,
-	0x24fbc6,
-	0x241f09,
-	0x338908,
-	0x291f85,
-	0x23ad88,
-	0x346e08,
-	0x2570c7,
-	0x208e47,
-	0x280049,
-	0x22ea87,
-	0x2aa389,
-	0x2b7dcc,
-	0x394848,
-	0x2d4d09,
-	0x2d6447,
-	0x2805c9,
-	0x340ec7,
-	0x2cce88,
-	0x3b6745,
-	0x385f86,
-	0x2bf888,
-	0x30d3c8,
-	0x27f709,
-	0x327ec7,
-	0x256d85,
-	0x2301c9,
-	0x201c46,
-	0x28e304,
-	0x326006,
-	0x311288,
-	0x328747,
-	0x2243c8,
-	0x20c7c9,
-	0x325b87,
-	0x29d0c6,
-	0x3c1f44,
-	0x38e0c9,
-	0x21f148,
-	0x250147,
-	0x2adf86,
-	0x224106,
-	0x2392c4,
-	0x26d846,
-	0x20af83,
-	0x38d949,
-	0x38dd86,
-	0x20ca45,
-	0x29d606,
-	0x2c7205,
-	0x27f1c8,
-	0x2ee987,
-	0x2eb146,
-	0x3262c6,
-	0x36fd08,
-	0x29f907,
-	0x297505,
-	0x29b1c8,
-	0x3b2448,
-	0x319748,
-	0x242345,
-	0x386006,
-	0x231589,
-	0x3a6e84,
-	0x2c708b,
-	0x229d4b,
-	0x22f789,
-	0x20b003,
-	0x25cf45,
-	0x22abc6,
-	0x242cc8,
-	0x34e904,
-	0x27c986,
-	0x37c709,
-	0x2f0405,
-	0x2c6bc6,
-	0x2f16c6,
-	0x20c984,
-	0x2a86ca,
-	0x20c988,
-	0x30d3c6,
-	0x2934c5,
-	0x331287,
-	0x351547,
-	0x21e544,
-	0x229f87,
-	0x22dc84,
-	0x22dc86,
-	0x200b43,
-	0x26a985,
-	0x37dc85,
-	0x364648,
-	0x257d85,
-	0x279309,
-	0x26d007,
-	0x26d00b,
-	0x2a240c,
-	0x2a2a0a,
-	0x2f0707,
-	0x205c83,
-	0x2ebcc8,
-	0x242505,
-	0x2c76c5,
-	0x34c944,
-	0x2ccd86,
-	0x278206,
-	0x26d887,
-	0x23f8cb,
-	0x29b244,
-	0x2d7404,
-	0x2c2784,
-	0x2c6986,
-	0x227104,
-	0x2ba748,
-	0x34c745,
-	0x258a45,
-	0x362c87,
-	0x3c1f89,
-	0x351305,
-	0x37f30a,
-	0x245d89,
-	0x2d698a,
-	0x23ee89,
-	0x3a5104,
-	0x306945,
-	0x2d9448,
-	0x2e184b,
-	0x29ef05,
+	0x250708,
+	0x3cb1c5,
+	0x24a947,
+	0x285708,
+	0x31b5c9,
+	0x3a5406,
+	0x264bca,
+	0x328848,
+	0x25054b,
+	0x2d5f8c,
+	0x27ba08,
+	0x281846,
+	0x22cb48,
+	0x311047,
+	0x208809,
+	0x33894d,
+	0x29a706,
+	0x31e888,
+	0x3b9689,
+	0x2c0f48,
+	0x288708,
+	0x2c338c,
+	0x2c4687,
+	0x2c5147,
+	0x26d485,
+	0x2b71c7,
+	0x2c8c88,
+	0x2b6e06,
+	0x24c84c,
+	0x2f7588,
+	0x2d1748,
+	0x31b8c6,
+	0x343c87,
+	0x270b84,
+	0x2394c8,
+	0x23ac0c,
+	0x203b8c,
+	0x2277c5,
+	0x209a07,
+	0x32bfc6,
+	0x343c06,
+	0x258fc8,
+	0x376844,
+	0x3ce3cb,
+	0x23b34b,
 	0x2f3206,
-	0x247684,
-	0x279846,
-	0x325a09,
-	0x2a1c47,
-	0x3b3248,
-	0x2a0946,
-	0x2faa47,
-	0x27fd48,
-	0x37f886,
-	0x334f84,
-	0x371c87,
-	0x361205,
-	0x373507,
-	0x21c984,
-	0x31e346,
-	0x2e5bc8,
-	0x297248,
-	0x2e44c7,
-	0x24e388,
-	0x295645,
-	0x20ae44,
-	0x266a48,
-	0x24e484,
-	0x208e45,
-	0x2f8e44,
-	0x309607,
-	0x2888c7,
-	0x280708,
-	0x2cb006,
-	0x257d05,
-	0x279108,
-	0x3bf288,
-	0x29ec49,
-	0x22a046,
-	0x233f88,
-	0x345c8a,
-	0x335488,
-	0x2def85,
-	0x225446,
-	0x245c48,
-	0x208a0a,
-	0x229207,
-	0x285dc5,
-	0x28e508,
-	0x2cc2c4,
-	0x2d4906,
-	0x2c0dc8,
-	0x20aec6,
-	0x31fc48,
-	0x25b247,
-	0x2063c6,
-	0x2b8304,
-	0x2a6b87,
-	0x2b0d44,
-	0x3259c7,
-	0x2a524d,
-	0x22f805,
-	0x2e13cb,
-	0x284586,
-	0x258608,
-	0x248644,
-	0x2ee246,
-	0x27bcc6,
-	0x21e307,
-	0x2968cd,
-	0x24b947,
-	0x2b1808,
-	0x286985,
-	0x364e48,
-	0x2c2786,
-	0x2956c8,
-	0x354486,
-	0x336b47,
-	0x2c5689,
-	0x353e07,
-	0x287ac8,
-	0x2733c5,
-	0x21c508,
-	0x223c85,
-	0x2f7505,
-	0x23f105,
-	0x24c4c3,
-	0x277884,
-	0x28e705,
-	0x36d849,
-	0x36b906,
-	0x2a1908,
-	0x208c05,
-	0x2b46c7,
-	0x29f14a,
-	0x2c6b09,
-	0x288a8a,
-	0x2cdb48,
-	0x22ad0c,
-	0x28144d,
-	0x34a703,
-	0x31fb48,
-	0x3be485,
-	0x2eec06,
-	0x318086,
-	0x2deac5,
-	0x206f89,
-	0x3ab885,
-	0x279108,
-	0x25e046,
-	0x3532c6,
-	0x2a0149,
-	0x3a0f87,
-	0x28ee06,
-	0x29f0c8,
-	0x36bc48,
-	0x2d8b87,
-	0x2be3ce,
-	0x2c29c5,
-	0x24fe85,
-	0x20adc8,
-	0x3269c7,
-	0x208f82,
-	0x2be804,
-	0x2403ca,
-	0x250208,
-	0x346f46,
-	0x298c88,
-	0x29d706,
-	0x31da88,
-	0x2ac8c8,
-	0x2f74c4,
-	0x2b4a85,
-	0x6010c4,
-	0x6010c4,
-	0x6010c4,
-	0x200a43,
-	0x223f86,
-	0x2795c6,
-	0x29c98c,
-	0x201343,
-	0x21c986,
-	0x200b04,
-	0x2a3308,
-	0x37c545,
-	0x2404c6,
-	0x2bc408,
-	0x2cef86,
-	0x2eb0c6,
-	0x339f08,
-	0x2cfd47,
-	0x22e849,
-	0x2a714a,
-	0x211644,
-	0x22dcc5,
-	0x2b3e05,
-	0x2c5406,
-	0x211906,
-	0x29c706,
-	0x2f8686,
-	0x22e984,
-	0x22e98b,
-	0x22d744,
-	0x242085,
-	0x2ab5c5,
-	0x29f506,
-	0x369808,
-	0x281307,
-	0x38dd04,
-	0x2076c3,
-	0x2cbdc5,
-	0x22dac7,
-	0x28120b,
-	0x364547,
-	0x2bc308,
-	0x2b4bc7,
-	0x26be06,
-	0x251c48,
-	0x26f24b,
-	0x217b46,
-	0x216b09,
-	0x26f3c5,
-	0x30eb43,
-	0x2c6bc6,
-	0x25b148,
-	0x20c843,
-	0x22dbc3,
-	0x27fd46,
-	0x29d706,
-	0x36808a,
-	0x27b2c5,
-	0x27bb0b,
-	0x29d54b,
-	0x247b03,
-	0x220043,
-	0x2af944,
-	0x2a88c7,
-	0x25b1c4,
-	0x240084,
-	0x385c04,
-	0x335788,
-	0x293408,
-	0x20dd89,
-	0x2c5248,
-	0x23f387,
-	0x2060c6,
-	0x2a154f,
-	0x2c2b06,
-	0x2cd084,
-	0x29324a,
-	0x22d9c7,
-	0x2b0e46,
-	0x28e349,
-	0x20dd05,
-	0x364785,
-	0x20de46,
-	0x21c643,
-	0x2cc309,
-	0x221e46,
-	0x20c589,
-	0x38f4c6,
-	0x26a985,
-	0x307545,
-	0x205843,
-	0x2a8a08,
-	0x31be07,
-	0x21e644,
-	0x2a3188,
-	0x24c744,
-	0x39a286,
-	0x2b1d06,
-	0x2445c6,
-	0x2cfa09,
-	0x2c7645,
-	0x2975c6,
-	0x21afc9,
-	0x393086,
-	0x2a1646,
-	0x395846,
-	0x203a45,
-	0x2f8e46,
-	0x336b44,
-	0x3b6745,
-	0x2bf884,
-	0x2b2206,
-	0x31e4c4,
-	0x200d03,
-	0x284b85,
-	0x238888,
-	0x2509c7,
-	0x34e989,
-	0x285cc8,
-	0x297d51,
-	0x2f174a,
-	0x2e7d47,
-	0x396246,
-	0x200b04,
-	0x2bf988,
-	0x26d9c8,
-	0x297f0a,
-	0x286ecd,
-	0x24c486,
-	0x33a006,
-	0x2a6c46,
-	0x283447,
-	0x2b18c5,
-	0x341987,
-	0x2009c5,
-	0x2c9c04,
-	0x2a7586,
-	0x26d6c7,
-	0x2cc00d,
-	0x245b87,
-	0x344c48,
-	0x279409,
-	0x225346,
-	0x2a5505,
-	0x2fa084,
-	0x311386,
-	0x21e446,
-	0x250386,
-	0x299508,
-	0x21d683,
-	0x208d83,
-	0x341f45,
-	0x257e46,
-	0x2ac885,
-	0x2a0b48,
-	0x29c18a,
-	0x39e284,
-	0x2a3308,
-	0x291688,
-	0x29f347,
-	0x208cc9,
-	0x2bc008,
-	0x286847,
-	0x385e86,
-	0x20aeca,
-	0x311408,
-	0x3a6b09,
-	0x2ae608,
-	0x228089,
-	0x396107,
-	0x2fea85,
-	0x347306,
-	0x2c4a88,
-	0x27a888,
-	0x28de08,
-	0x38ab08,
-	0x242085,
-	0x203bc4,
-	0x236ec8,
-	0x209784,
-	0x23ec84,
-	0x26a985,
-	0x290647,
-	0x3c1d49,
-	0x21e107,
-	0x214045,
-	0x276dc6,
-	0x35bc86,
-	0x211a84,
-	0x2a0486,
-	0x257b44,
-	0x2a11c6,
-	0x3c1b06,
-	0x2181c6,
-	0x3c6485,
-	0x2a0a07,
-	0x205c83,
-	0x216e89,
-	0x36fb08,
-	0x2866c4,
-	0x2866cd,
-	0x297348,
-	0x2ddc88,
-	0x3a6a86,
-	0x2c5789,
-	0x2c6b09,
-	0x325705,
-	0x29c28a,
-	0x252a0a,
-	0x25e6cc,
-	0x25e846,
-	0x277c06,
-	0x2c2c86,
-	0x372b09,
-	0x2eee46,
-	0x29f946,
-	0x3ab946,
-	0x26d1c8,
-	0x24e386,
-	0x2cca0b,
-	0x2907c5,
-	0x258a45,
-	0x277e85,
-	0x3c2806,
-	0x20ae83,
-	0x244546,
-	0x245b07,
-	0x2bf845,
-	0x3108c5,
-	0x340045,
-	0x2f83c6,
-	0x3257c4,
-	0x327886,
-	0x2bad89,
-	0x3c268c,
-	0x2c9948,
-	0x23c504,
-	0x2f8b46,
-	0x284686,
-	0x25b148,
-	0x218bc8,
-	0x3c2589,
-	0x331287,
-	0x24ed89,
-	0x37ba46,
-	0x230604,
-	0x20d804,
-	0x280344,
-	0x27fd48,
-	0x3c1b8a,
-	0x351286,
-	0x35e207,
-	0x36e207,
-	0x242005,
-	0x2b3dc4,
-	0x28c846,
-	0x2b1906,
-	0x23a283,
+	0x371d87,
+	0x36fd85,
+	0x272945,
+	0x3ce506,
+	0x2a5cc5,
+	0x331905,
+	0x2cf887,
+	0x284589,
+	0x2a9944,
+	0x260985,
+	0x30e0c5,
+	0x2d3288,
+	0x2e5c45,
+	0x2baec9,
+	0x2b9c87,
+	0x2b9c8b,
+	0x31b206,
+	0x24df49,
+	0x39b208,
+	0x2966c5,
+	0x312bc8,
+	0x391e88,
+	0x263707,
+	0x24ae47,
+	0x286f09,
+	0x3b9707,
+	0x2a7b49,
+	0x303e0c,
+	0x2b5a08,
+	0x2cd909,
+	0x2d1407,
+	0x2868c9,
+	0x200b47,
+	0x2d6088,
+	0x3b4345,
+	0x2bf246,
+	0x2c3cc8,
+	0x316948,
+	0x2cac49,
+	0x331947,
+	0x256dc5,
+	0x242e89,
+	0x206c06,
+	0x201844,
+	0x201846,
+	0x353d88,
+	0x3a1647,
+	0x344288,
+	0x21bb09,
 	0x36f947,
-	0x3aab88,
-	0x32584a,
-	0x22ca48,
-	0x3643c8,
-	0x31e505,
-	0x29cdc5,
-	0x26e785,
-	0x2423c6,
-	0x243286,
-	0x340cc5,
-	0x38db89,
-	0x2b3bcc,
-	0x26e847,
-	0x297f88,
-	0x2dee05,
-	0x6010c4,
-	0x24d184,
-	0x280e84,
-	0x21b846,
-	0x29e4ce,
-	0x364807,
-	0x283645,
-	0x3a6e0c,
-	0x2f8f47,
-	0x26d647,
-	0x2f4449,
-	0x21be49,
-	0x285dc5,
-	0x36fb08,
-	0x231589,
-	0x319605,
-	0x2bf788,
-	0x221fc6,
-	0x266cc6,
-	0x3c2f44,
-	0x28b688,
-	0x225503,
-	0x3875c4,
-	0x2cbe45,
-	0x388307,
-	0x228785,
-	0x345b49,
-	0x2ab04d,
-	0x2b0486,
-	0x207704,
-	0x2ba8c8,
-	0x27084a,
-	0x228b87,
-	0x31ce85,
-	0x23b3c3,
-	0x29d70e,
-	0x2a8b0c,
-	0x2ff747,
-	0x29e687,
-	0x217b83,
-	0x2eee85,
-	0x280e85,
-	0x299048,
-	0x2963c9,
-	0x23c406,
-	0x25b1c4,
-	0x2e7c86,
-	0x23390b,
-	0x38320c,
-	0x33a8c7,
-	0x2cccc5,
-	0x3b2348,
-	0x2d8945,
-	0x293247,
-	0x2f1587,
-	0x245945,
-	0x20ae83,
-	0x335ac4,
-	0x22a385,
-	0x3b8cc5,
-	0x3b8cc6,
-	0x2b5308,
-	0x26d6c7,
-	0x318386,
-	0x205c06,
-	0x23f046,
-	0x27e509,
-	0x21f3c7,
-	0x250646,
-	0x383386,
-	0x275d06,
-	0x2a8605,
-	0x3c53c6,
-	0x3746c5,
-	0x2da488,
-	0x28ff4b,
-	0x28c586,
-	0x36e244,
-	0x2e0409,
-	0x26d004,
-	0x221f48,
-	0x326107,
-	0x281e44,
-	0x2bb308,
-	0x2c0844,
-	0x2a8644,
-	0x286605,
-	0x2dfc46,
-	0x3356c7,
-	0x27f283,
-	0x29d185,
-	0x32ce84,
-	0x24fec6,
-	0x325788,
-	0x2b6c05,
-	0x28fc09,
-	0x2303c5,
-	0x21c988,
-	0x2312c7,
-	0x38de88,
-	0x2ba487,
-	0x27df09,
-	0x2820c6,
-	0x305706,
-	0x2b3084,
-	0x2d7345,
-	0x300a4c,
-	0x277e87,
-	0x278a87,
-	0x36e0c8,
-	0x2b0486,
-	0x271484,
-	0x30a244,
-	0x27fec9,
-	0x2c2d86,
-	0x282687,
-	0x277784,
-	0x24d786,
-	0x317bc5,
-	0x2cab47,
-	0x2cc986,
-	0x24d949,
-	0x383047,
-	0x2692c7,
-	0x29ffc6,
-	0x24d6c5,
-	0x27d1c8,
-	0x221cc8,
-	0x348546,
-	0x2b6c45,
-	0x349e86,
-	0x206543,
-	0x298ec9,
-	0x29c48e,
-	0x2ba1c8,
-	0x24c848,
-	0x34834b,
-	0x28fe46,
-	0x211584,
-	0x281044,
-	0x29c58a,
-	0x217207,
-	0x250705,
-	0x216b09,
-	0x2be305,
-	0x23ecc7,
-	0x24e304,
-	0x2a9a47,
-	0x2e7f08,
-	0x2e0dc6,
-	0x24c589,
-	0x2bc10a,
-	0x217186,
-	0x296e86,
-	0x2ab545,
-	0x3898c5,
-	0x347ac7,
-	0x24cf08,
-	0x317b08,
-	0x2f74c6,
-	0x3075c5,
-	0x21168e,
-	0x2bc7c4,
-	0x298fc5,
-	0x276749,
-	0x382c48,
-	0x28aa46,
-	0x29accc,
-	0x29bd90,
-	0x29e10f,
-	0x29f688,
-	0x2f0707,
-	0x3c6485,
-	0x28e705,
-	0x335549,
-	0x28e709,
-	0x240d06,
-	0x29ef87,
-	0x2d7245,
-	0x34d589,
-	0x33f106,
-	0x2eec8d,
-	0x280209,
-	0x240084,
-	0x2b9f48,
-	0x236f89,
-	0x351446,
-	0x2ebec5,
-	0x305706,
-	0x3b3109,
-	0x277608,
-	0x212305,
-	0x28b684,
-	0x29ae8b,
-	0x351305,
-	0x242d46,
-	0x281786,
-	0x285206,
-	0x28f64b,
-	0x28fd09,
-	0x205b45,
-	0x396e87,
-	0x2f16c6,
-	0x240206,
-	0x280c08,
-	0x2dfd49,
-	0x344a0c,
-	0x22d8c8,
-	0x308ec6,
-	0x32c803,
-	0x32a506,
-	0x27ddc5,
-	0x27be48,
-	0x306fc6,
-	0x2cad88,
-	0x2062c5,
-	0x27a585,
-	0x365288,
-	0x31dc07,
-	0x317fc7,
-	0x26d887,
-	0x240088,
-	0x2c5508,
-	0x2b1206,
-	0x2b2047,
-	0x267c47,
-	0x28f34a,
-	0x256c83,
-	0x3c2806,
-	0x23c645,
-	0x2403c4,
-	0x279409,
-	0x27de84,
-	0x250a44,
-	0x29a104,
-	0x29e68b,
-	0x31bd47,
-	0x2118c5,
-	0x295348,
-	0x276dc6,
-	0x276dc8,
-	0x27b206,
-	0x28b5c5,
-	0x28b885,
-	0x28d446,
-	0x28dbc8,
-	0x28e288,
-	0x2795c6,
-	0x29518f,
-	0x298990,
-	0x369405,
-	0x205c83,
-	0x2306c5,
-	0x309088,
-	0x28e609,
-	0x319748,
-	0x24c408,
-	0x238d88,
-	0x31be07,
-	0x276a89,
-	0x2caf88,
-	0x28dac4,
-	0x299f88,
-	0x2addc9,
-	0x2b38c7,
-	0x299f04,
-	0x21e1c8,
-	0x2a07ca,
-	0x2aff86,
-	0x24c486,
-	0x229f09,
-	0x29bfc7,
-	0x2c83c8,
-	0x345608,
-	0x294048,
-	0x25d345,
-	0x38a705,
-	0x258a45,
-	0x280e45,
-	0x37ffc7,
-	0x20ae85,
-	0x2bf845,
-	0x206d86,
-	0x319687,
-	0x2e1787,
-	0x2a0ac6,
-	0x2ce085,
-	0x242d46,
-	0x24c685,
-	0x2d70c8,
-	0x2ff5c4,
-	0x393106,
-	0x334e84,
-	0x31dec8,
-	0x22f10a,
-	0x27a34c,
-	0x23fac5,
-	0x283506,
-	0x344bc6,
-	0x341e06,
-	0x308f44,
-	0x317e85,
-	0x27b047,
-	0x29c049,
-	0x2c6f47,
-	0x6010c4,
-	0x6010c4,
-	0x31bbc5,
-	0x2cb984,
-	0x29a68a,
-	0x276c46,
-	0x251e84,
-	0x204745,
-	0x36c3c5,
-	0x2b1804,
-	0x2813c7,
-	0x230347,
-	0x2c6988,
-	0x31fec8,
-	0x212309,
-	0x26eec8,
-	0x29a84b,
-	0x2b7fc4,
-	0x37b985,
-	0x27d905,
-	0x26d809,
-	0x2dfd49,
-	0x2e0308,
-	0x22d748,
-	0x29f504,
-	0x2846c5,
-	0x200583,
-	0x2c53c5,
-	0x297646,
-	0x29620c,
-	0x21f046,
-	0x2ebdc6,
+	0x2a06c6,
+	0x3c8e04,
+	0x207289,
+	0x27c1c8,
+	0x31b787,
+	0x37a946,
+	0x343fc6,
+	0x23d1c4,
+	0x3b9d06,
+	0x201903,
+	0x32a4c9,
+	0x32a906,
+	0x20a5c5,
+	0x2a0c06,
+	0x2cfe05,
+	0x285b88,
+	0x310f07,
+	0x399746,
+	0x204146,
+	0x347a08,
+	0x2a3507,
+	0x29a745,
+	0x29df48,
+	0x3befc8,
+	0x328848,
+	0x24e385,
+	0x2bf2c6,
+	0x319789,
+	0x3506c4,
+	0x2cfc8b,
+	0x282dcb,
+	0x31d989,
+	0x201a03,
+	0x25d185,
+	0x37c306,
+	0x24f3c8,
+	0x321a44,
+	0x353446,
+	0x2a7309,
+	0x2da905,
+	0x2cf7c6,
+	0x2e2e46,
+	0x203f04,
+	0x21bcca,
+	0x20a508,
+	0x316946,
+	0x2bd385,
+	0x36fc07,
+	0x35b187,
+	0x22d0c4,
+	0x283007,
+	0x2b2704,
+	0x2edd46,
+	0x21d9c3,
+	0x26d645,
+	0x376bc5,
+	0x3651c8,
+	0x281445,
+	0x27f389,
+	0x239307,
+	0x23930b,
+	0x2a514c,
+	0x2a574a,
+	0x338807,
+	0x200a03,
+	0x27d688,
+	0x24e545,
+	0x2d4205,
+	0x351dc4,
+	0x2d5f86,
+	0x27e1c6,
+	0x3b9d47,
+	0x24240b,
+	0x29dfc4,
+	0x2d2144,
+	0x2c9644,
+	0x2cf586,
+	0x203b84,
+	0x2bf0c8,
+	0x351bc5,
+	0x271045,
+	0x36d687,
+	0x3c8e49,
+	0x35af45,
+	0x38d20a,
+	0x245cc9,
+	0x2d78ca,
+	0x23c249,
+	0x35d544,
+	0x2de5c5,
+	0x2d2b48,
+	0x2e484b,
+	0x2a2dc5,
+	0x2f1786,
+	0x246f84,
+	0x27f8c6,
+	0x36f7c9,
+	0x2def87,
+	0x3bfcc8,
+	0x2a4506,
+	0x2b1247,
+	0x286048,
+	0x38d786,
+	0x3c8904,
+	0x37ee07,
+	0x36bc45,
+	0x3813c7,
+	0x21d904,
+	0x202806,
+	0x2e7488,
+	0x29a488,
+	0x2ef687,
+	0x24ed48,
+	0x298885,
+	0x2182c4,
+	0x24d8c8,
+	0x24ee44,
+	0x245ac5,
+	0x300a04,
+	0x2aca47,
+	0x28cc47,
+	0x286a08,
+	0x2d3cc6,
+	0x2813c5,
+	0x27f188,
+	0x213e88,
+	0x2a2b09,
+	0x2830c6,
+	0x232288,
+	0x20adca,
+	0x323b88,
+	0x2e9145,
+	0x225f86,
+	0x245b88,
+	0x24aa0a,
+	0x239947,
 	0x28acc5,
-	0x2f8448,
-	0x35ec46,
-	0x3963c6,
-	0x24c486,
-	0x22c7cc,
+	0x292708,
+	0x2b4084,
+	0x2cd506,
+	0x2c54c8,
+	0x218346,
+	0x204ec8,
+	0x292147,
+	0x214586,
+	0x2b93c4,
+	0x277c47,
+	0x2b4d44,
+	0x36f787,
+	0x368c0d,
+	0x22fb05,
+	0x2e43cb,
+	0x203e06,
+	0x256a88,
+	0x248544,
+	0x2eb506,
+	0x281e06,
+	0x22ce87,
+	0x299b0d,
+	0x24bf07,
+	0x2b5688,
+	0x287385,
+	0x25a548,
+	0x2ca586,
+	0x298908,
+	0x23f986,
+	0x390487,
+	0x25c389,
+	0x37c107,
+	0x28bc08,
+	0x277285,
+	0x22ba48,
+	0x343b45,
+	0x2fe905,
+	0x23c4c5,
+	0x227a43,
+	0x23ebc4,
+	0x261985,
+	0x386389,
+	0x37a846,
+	0x2dec48,
+	0x24ac05,
+	0x2b7087,
+	0x2ab5ca,
+	0x2cf709,
+	0x2c724a,
+	0x2d6b48,
+	0x2a9b8c,
+	0x287c0d,
+	0x37af03,
+	0x204dc8,
+	0x211045,
+	0x311186,
+	0x35f306,
+	0x355e45,
+	0x229d49,
+	0x200985,
+	0x27f188,
+	0x25e006,
+	0x35cfc6,
+	0x2a3d09,
+	0x3aa047,
+	0x293006,
+	0x2ab548,
+	0x38f948,
+	0x2e3dc7,
+	0x2c2ace,
+	0x2ca7c5,
+	0x31b4c5,
+	0x218248,
+	0x2f36c7,
+	0x20ad82,
+	0x2c2f04,
+	0x24d38a,
+	0x31b848,
+	0x391fc6,
+	0x29b948,
+	0x21c106,
+	0x38f688,
+	0x2b07c8,
+	0x2fe8c4,
+	0x2b7445,
+	0x6044c4,
+	0x6044c4,
+	0x6044c4,
+	0x2087c3,
+	0x343e46,
+	0x27f646,
+	0x29ff8c,
+	0x201b43,
+	0x21d906,
 	0x250544,
-	0x23f18a,
-	0x28ac08,
-	0x296047,
-	0x32cd86,
-	0x23c4c7,
-	0x2e7885,
-	0x2adf86,
-	0x35aa46,
-	0x366207,
-	0x250a84,
-	0x309705,
-	0x276744,
-	0x2c9c87,
-	0x276988,
-	0x277a8a,
-	0x27ebc7,
-	0x2a8207,
-	0x2f0687,
-	0x2d8a89,
-	0x29620a,
-	0x22e943,
-	0x250985,
-	0x218203,
-	0x385c49,
-	0x336dc8,
-	0x351687,
-	0x319849,
-	0x221dc6,
-	0x3b6808,
-	0x33c445,
-	0x3bf38a,
-	0x200c89,
-	0x3299c9,
-	0x35eb07,
-	0x26dac9,
-	0x2180c8,
-	0x3663c6,
-	0x2836c8,
-	0x203a47,
-	0x22ea87,
-	0x245d87,
-	0x2e5a48,
-	0x2f89c6,
-	0x2a0585,
-	0x27b047,
-	0x296988,
-	0x334e04,
-	0x2c8004,
-	0x28ed07,
-	0x2acc47,
-	0x23140a,
-	0x366346,
-	0x364c4a,
-	0x2be747,
-	0x2bc587,
-	0x3097c4,
-	0x2aa444,
-	0x2caa46,
-	0x23a444,
-	0x23a44c,
-	0x39ee05,
-	0x218a09,
+	0x28b748,
+	0x2a7145,
+	0x24d486,
+	0x2c0a88,
+	0x2d80c6,
+	0x3996c6,
+	0x2e2c48,
+	0x2d8d87,
+	0x3cef49,
+	0x37c44a,
+	0x21e504,
+	0x2a7c45,
+	0x2df985,
+	0x32c206,
+	0x234186,
+	0x29f1c6,
+	0x2ff946,
+	0x3cf084,
+	0x3cf08b,
+	0x2ca604,
+	0x24e0c5,
+	0x2afac5,
+	0x2ab986,
+	0x20ce88,
+	0x287ac7,
+	0x32a884,
+	0x214ac3,
+	0x2b3b85,
+	0x2edb87,
+	0x2879cb,
+	0x3650c7,
+	0x2c0988,
+	0x2b7587,
+	0x26e946,
+	0x280788,
+	0x29f3cb,
+	0x373786,
+	0x220bc9,
+	0x29f545,
+	0x317a83,
+	0x2cf7c6,
+	0x292048,
+	0x21bb83,
+	0x202943,
+	0x286046,
+	0x21c106,
+	0x3772ca,
+	0x281885,
+	0x281c4b,
+	0x2a0b4b,
+	0x20cd83,
+	0x21f303,
+	0x2b2684,
+	0x21bec7,
+	0x27ba04,
+	0x28b744,
+	0x3b9944,
+	0x323e88,
+	0x2bd2c8,
+	0x218e49,
+	0x2ce088,
+	0x23c747,
+	0x231b06,
+	0x2de88f,
+	0x2ca906,
+	0x2d6284,
+	0x2bd10a,
+	0x2eda87,
+	0x2b4e46,
+	0x292549,
+	0x218dc5,
+	0x365305,
+	0x218f06,
+	0x22bb83,
+	0x2b40c9,
+	0x26fd86,
+	0x21b8c9,
+	0x39d046,
+	0x26d645,
+	0x227bc5,
+	0x2086c3,
+	0x21c008,
+	0x32afc7,
+	0x22d1c4,
+	0x28b5c8,
+	0x39ed04,
+	0x303706,
+	0x2b4ac6,
+	0x244086,
+	0x2d8a49,
+	0x2d4185,
+	0x29a806,
+	0x39f149,
+	0x2c8986,
+	0x2de986,
+	0x3a3a86,
+	0x23c685,
+	0x300a06,
+	0x390484,
+	0x3b4345,
+	0x2c3cc4,
+	0x2b60c6,
+	0x202984,
+	0x200c43,
+	0x28a3c5,
+	0x2368c8,
+	0x282607,
+	0x321ac9,
+	0x28abc8,
+	0x29af91,
+	0x2e2eca,
+	0x2f3147,
+	0x37ffc6,
+	0x250544,
+	0x2c3dc8,
+	0x269f08,
+	0x29b14a,
+	0x2bac8d,
+	0x2a2cc6,
+	0x2e2d46,
+	0x277d06,
+	0x368087,
+	0x2b5745,
+	0x370407,
+	0x28b685,
+	0x2b9dc4,
+	0x2aa0c6,
+	0x31e5c7,
+	0x2b3dcd,
+	0x245ac7,
+	0x342f48,
+	0x27f489,
+	0x225e86,
+	0x3a5385,
+	0x243404,
+	0x353e86,
+	0x22cfc6,
+	0x31b9c6,
+	0x29c1c8,
+	0x22c203,
+	0x22ce83,
+	0x201ac5,
+	0x281506,
+	0x2b0785,
+	0x2a4708,
+	0x29ec4a,
+	0x310804,
+	0x28b748,
+	0x295348,
+	0x2ab7c7,
+	0x24acc9,
+	0x2c0688,
+	0x287247,
+	0x3b9bc6,
+	0x21834a,
+	0x353f08,
+	0x350349,
+	0x2d94c8,
+	0x278209,
+	0x37fe87,
+	0x347f05,
+	0x276686,
+	0x2b6c88,
+	0x2861c8,
+	0x2954c8,
+	0x2f3308,
+	0x24e0c5,
+	0x217a44,
+	0x234f08,
+	0x246d04,
+	0x23c044,
+	0x26d645,
+	0x294287,
+	0x3c8c09,
+	0x22cc87,
+	0x20ae05,
+	0x27b806,
+	0x364bc6,
+	0x20b0c4,
+	0x2a4046,
+	0x27d304,
+	0x29fc46,
+	0x3c89c6,
+	0x22b486,
+	0x3cb1c5,
+	0x2a45c7,
+	0x200a03,
+	0x228689,
+	0x347808,
+	0x2870c4,
+	0x2870cd,
+	0x29a588,
+	0x30b048,
+	0x3502c6,
+	0x25c489,
+	0x2cf709,
+	0x36f4c5,
+	0x29ed4a,
+	0x27130a,
+	0x28ce0c,
+	0x28cf86,
+	0x27d086,
+	0x2cb186,
+	0x39db89,
+	0x3113c6,
+	0x2a3546,
+	0x200a46,
+	0x2394c8,
+	0x213c86,
+	0x2d5c0b,
+	0x294405,
+	0x271045,
+	0x27de45,
+	0x326186,
+	0x218303,
+	0x244006,
+	0x245a47,
+	0x2c3c85,
+	0x25fac5,
+	0x349fc5,
+	0x306c06,
+	0x331304,
+	0x331306,
+	0x2bf849,
+	0x32600c,
+	0x2b9b08,
+	0x237944,
+	0x300706,
+	0x203f06,
+	0x292048,
+	0x2f9508,
+	0x325f09,
+	0x36fc07,
+	0x31a3c9,
+	0x255b06,
+	0x22ddc4,
+	0x20e804,
+	0x203684,
+	0x286048,
+	0x3c8a4a,
+	0x35aec6,
+	0x367247,
+	0x381647,
+	0x24e045,
+	0x2df944,
+	0x290b46,
+	0x2b5786,
+	0x249b83,
+	0x347647,
+	0x39c148,
+	0x36f60a,
+	0x3721c8,
+	0x364f48,
+	0x2029c5,
+	0x2a03c5,
+	0x26b045,
+	0x24e406,
+	0x36c946,
+	0x371145,
+	0x32a709,
+	0x2df74c,
+	0x26b107,
+	0x29b1c8,
+	0x271745,
+	0x6044c4,
+	0x2b4744,
+	0x32c884,
+	0x225306,
+	0x2a1e4e,
+	0x365387,
+	0x368285,
+	0x35064c,
+	0x300b07,
+	0x31e547,
+	0x3554c9,
+	0x359189,
+	0x28acc5,
+	0x347808,
+	0x319789,
+	0x328705,
+	0x2c3bc8,
+	0x26ff06,
+	0x24db46,
+	0x34af04,
+	0x28f648,
+	0x226043,
+	0x27c9c4,
+	0x2b3c05,
+	0x396e47,
+	0x344e85,
+	0x20ac89,
+	0x2a83cd,
+	0x2b2c06,
+	0x214b04,
+	0x316ec8,
+	0x2843ca,
+	0x26b407,
+	0x275d85,
+	0x202f83,
+	0x2a0d0e,
+	0x21c10c,
+	0x376047,
+	0x2a2007,
+	0x205183,
+	0x311405,
+	0x32c885,
+	0x29bd08,
+	0x299609,
+	0x237846,
+	0x27ba04,
+	0x2f3086,
+	0x236dcb,
+	0x2dc00c,
+	0x369687,
+	0x2d5ec5,
+	0x3beec8,
+	0x2e3b85,
+	0x2bd107,
+	0x353787,
+	0x245885,
+	0x218303,
+	0x3241c4,
+	0x353c45,
+	0x2a9845,
+	0x2a9846,
+	0x2af688,
+	0x31e5c7,
+	0x35f606,
+	0x208a86,
+	0x23c406,
+	0x283749,
+	0x27c447,
+	0x31bc86,
+	0x2dc186,
+	0x27a306,
+	0x2ab345,
+	0x214346,
+	0x366405,
+	0x2e5cc8,
+	0x293b8b,
+	0x290546,
+	0x381684,
+	0x300049,
+	0x239304,
+	0x26fe88,
+	0x201947,
+	0x288604,
+	0x2bfdc8,
+	0x2c4f44,
+	0x2ab384,
+	0x28b505,
+	0x316dc6,
+	0x323dc7,
+	0x204f83,
+	0x2a0785,
 	0x337284,
-	0x2b18c5,
-	0x2707c8,
-	0x239dc5,
-	0x37f306,
-	0x2311c4,
-	0x2d02ca,
-	0x2cb2c6,
-	0x29180a,
-	0x2162c7,
-	0x224505,
-	0x21c645,
-	0x24204a,
-	0x28dd45,
-	0x29ed06,
-	0x209784,
-	0x2afac6,
-	0x347b85,
-	0x307086,
-	0x2e44cc,
-	0x218d4a,
-	0x252b04,
-	0x2060c6,
-	0x29bfc7,
-	0x2cc904,
-	0x26d1c8,
-	0x2f3106,
-	0x211509,
-	0x2db609,
-	0x394949,
-	0x2c7246,
-	0x203b46,
-	0x283807,
-	0x38dac8,
-	0x203949,
-	0x31bd47,
-	0x2954c6,
-	0x2faac7,
-	0x2a6b05,
-	0x2bc7c4,
-	0x2833c7,
-	0x267e05,
-	0x286545,
-	0x31f747,
-	0x245808,
-	0x3b22c6,
-	0x2977cd,
-	0x29924f,
-	0x29d54d,
-	0x214084,
-	0x238986,
-	0x2d0688,
-	0x3ab905,
-	0x28f508,
-	0x256f8a,
-	0x240084,
-	0x233b46,
-	0x2cd107,
-	0x2ca387,
-	0x2cfe09,
-	0x283685,
-	0x2b1804,
-	0x2b49ca,
-	0x2bbbc9,
-	0x26dbc7,
-	0x297a86,
-	0x351446,
-	0x284606,
-	0x371d46,
-	0x2cf6cf,
-	0x2d0549,
-	0x24e386,
-	0x354846,
-	0x31ac09,
-	0x2b2147,
-	0x20be43,
-	0x22c946,
-	0x20de03,
-	0x2de988,
-	0x2fa907,
-	0x29f889,
-	0x2b1b88,
-	0x318108,
-	0x328006,
-	0x21ef89,
-	0x399b05,
-	0x2b2204,
-	0x2e8187,
-	0x372b85,
-	0x214084,
-	0x211988,
-	0x2174c4,
-	0x2b1e87,
-	0x30d686,
-	0x395ac5,
-	0x2ae608,
-	0x35130b,
-	0x2b4107,
-	0x2422c6,
-	0x2c2b84,
-	0x2b6286,
-	0x26a985,
-	0x267e05,
-	0x27cf49,
-	0x280fc9,
-	0x22eac4,
-	0x22eb05,
-	0x206105,
-	0x3bf206,
-	0x36fc08,
-	0x2bdc86,
-	0x3aa9cb,
-	0x37570a,
-	0x2ba585,
-	0x28b906,
-	0x39df85,
-	0x345405,
-	0x29b847,
-	0x3c2a88,
-	0x24ed84,
-	0x39ce86,
-	0x28e306,
-	0x218287,
-	0x30eb04,
-	0x27bcc6,
-	0x35c745,
-	0x35c749,
-	0x203d44,
-	0x2b3f49,
-	0x2795c6,
-	0x2c0048,
-	0x206105,
-	0x36e305,
-	0x307086,
-	0x344909,
-	0x21be49,
-	0x2ebe46,
-	0x382d48,
-	0x2ab188,
-	0x39df44,
-	0x2b5504,
-	0x2b5508,
-	0x239d08,
-	0x24ee89,
-	0x2975c6,
-	0x24c486,
-	0x32be4d,
-	0x27c986,
-	0x2ce449,
-	0x39e845,
-	0x20de46,
-	0x2941c8,
-	0x3277c5,
-	0x267c84,
-	0x26a985,
-	0x280908,
-	0x29a449,
-	0x276804,
-	0x31e346,
-	0x251f0a,
-	0x2ff648,
-	0x231589,
-	0x25890a,
-	0x3197c6,
-	0x299408,
-	0x293005,
-	0x28ae88,
-	0x2e7905,
-	0x221c89,
-	0x376189,
-	0x23c442,
-	0x26f3c5,
-	0x2ebf86,
-	0x279507,
-	0x38c8c5,
-	0x30d2c6,
-	0x304c08,
-	0x2b0486,
-	0x2d9309,
-	0x278b86,
-	0x280a88,
-	0x2a9605,
-	0x382106,
-	0x336c48,
-	0x27fd48,
-	0x396008,
-	0x2f2388,
-	0x3c53c4,
-	0x21e583,
-	0x2d9544,
-	0x27edc6,
-	0x2a6b44,
-	0x24c787,
-	0x3962c9,
-	0x3c0485,
-	0x345606,
-	0x22c946,
-	0x2b514b,
-	0x2b0d86,
-	0x293b06,
-	0x393208,
-	0x310806,
-	0x224303,
-	0x3c4e83,
-	0x2bc7c4,
+	0x31b506,
+	0x36f548,
+	0x203a85,
+	0x293849,
+	0x243085,
+	0x21d908,
+	0x3194c7,
+	0x32aa08,
+	0x2bee07,
+	0x25f1c9,
+	0x27ffc6,
+	0x33c246,
+	0x200a44,
+	0x2d2085,
+	0x3084cc,
+	0x27de47,
+	0x27eb07,
+	0x233dc8,
+	0x2b2c06,
+	0x272b44,
+	0x3adac4,
+	0x286d89,
+	0x2cb286,
+	0x269dc7,
+	0x23eac4,
+	0x24d006,
+	0x35eb45,
+	0x2d3807,
+	0x2d5b86,
+	0x264a89,
+	0x2d0547,
+	0x297e47,
+	0x2a3b86,
+	0x24cf45,
+	0x284088,
+	0x26fc08,
+	0x231d06,
+	0x203ac5,
+	0x327806,
+	0x211ac3,
+	0x29bb89,
+	0x29ef4e,
+	0x2beb48,
+	0x39ee08,
+	0x231b0b,
+	0x293a86,
+	0x34c8c4,
+	0x287804,
+	0x29f04a,
+	0x217287,
+	0x31bd45,
+	0x220bc9,
+	0x2c2a05,
+	0x23c087,
+	0x24ecc4,
+	0x2a4c47,
+	0x315548,
+	0x2e1846,
+	0x39eb49,
+	0x2c078a,
+	0x217206,
+	0x29a0c6,
+	0x2afa45,
+	0x398585,
+	0x33d2c7,
+	0x24c648,
+	0x35ea88,
+	0x2fe8c6,
+	0x227c45,
+	0x233f0e,
+	0x2c0e44,
+	0x231c85,
+	0x27b189,
+	0x2ea048,
+	0x28ed06,
+	0x29da4c,
+	0x29e850,
+	0x2a1a8f,
+	0x2a3288,
+	0x338807,
+	0x3cb1c5,
+	0x261985,
+	0x323c49,
+	0x292909,
+	0x23e086,
+	0x2a2e47,
+	0x2d1f85,
+	0x22fa89,
+	0x349086,
+	0x31120d,
+	0x285d09,
+	0x28b744,
+	0x2be8c8,
+	0x234fc9,
+	0x35b086,
+	0x27d885,
+	0x33c246,
+	0x3bfb89,
+	0x27c048,
+	0x21b605,
+	0x20aec4,
+	0x29dc0b,
+	0x35af45,
+	0x24f446,
+	0x287f46,
+	0x2062c6,
+	0x296ecb,
+	0x293949,
+	0x2089c5,
+	0x3a4547,
+	0x2e2e46,
+	0x256c06,
+	0x32c608,
+	0x357ac9,
+	0x342d0c,
+	0x2ed988,
+	0x30fe86,
+	0x336c03,
+	0x233446,
+	0x25f085,
+	0x281f88,
+	0x227646,
+	0x2d3a48,
+	0x24b245,
+	0x29b305,
+	0x25a988,
+	0x38f807,
+	0x35f247,
+	0x3b9d47,
+	0x3167c8,
+	0x32c308,
+	0x2b5206,
+	0x2b5f07,
+	0x356847,
+	0x296bca,
+	0x202e43,
+	0x326186,
 	0x233e85,
-	0x2d45c7,
-	0x276988,
-	0x27698f,
-	0x27af4b,
-	0x36fa08,
-	0x31e3c6,
-	0x36fd0e,
-	0x242483,
-	0x2d4544,
-	0x2b0d05,
-	0x2b1686,
-	0x28c94b,
-	0x290706,
-	0x227109,
-	0x395ac5,
-	0x2eccc8,
-	0x20e688,
-	0x21bd0c,
-	0x29e6c6,
-	0x2c5406,
-	0x2e9f85,
-	0x287888,
-	0x27a345,
-	0x350288,
-	0x29b04a,
-	0x29d989,
-	0x6010c4,
-	0x200742,
-	0x3c202c42,
-	0x202542,
-	0x26ff84,
-	0x201e42,
-	0x21a484,
-	0x2032c2,
-	0x200342,
-	0x207c02,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x2b6c03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x20ec83,
-	0x241d03,
-	0x210143,
-	0x28b304,
-	0x20be03,
-	0x23d744,
-	0x237583,
-	0x2d2484,
-	0x30e843,
-	0x38cb87,
-	0x21f743,
-	0x20ae43,
-	0x310f08,
-	0x241d03,
-	0x2a47cb,
-	0x2e8943,
-	0x3a25c6,
-	0x20e982,
-	0x3987cb,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x241d03,
-	0x2098c3,
-	0x204543,
-	0x200742,
-	0xcd588,
-	0x3574c5,
-	0x267e88,
-	0x2e2e08,
-	0x202c42,
-	0x3325c5,
-	0x331707,
-	0x201b02,
-	0x248887,
-	0x202542,
-	0x256807,
-	0x3c0b89,
-	0x292bc8,
-	0x293ec9,
-	0x247342,
-	0x269ec7,
-	0x329844,
-	0x3317c7,
-	0x375607,
-	0x25fe82,
-	0x21f743,
-	0x20d682,
-	0x2032c2,
-	0x200342,
-	0x20b182,
+	0x24d384,
+	0x27f489,
+	0x25f144,
+	0x201704,
+	0x29ce44,
+	0x2a200b,
+	0x32af07,
+	0x234145,
+	0x298588,
+	0x27b806,
+	0x27b808,
+	0x2817c6,
+	0x28f585,
+	0x28f845,
+	0x291686,
+	0x291e08,
+	0x292488,
+	0x27f646,
+	0x2983cf,
+	0x29b650,
+	0x20c645,
+	0x200a03,
+	0x22de85,
+	0x310048,
+	0x292809,
+	0x328848,
+	0x39e9c8,
+	0x23cc88,
+	0x32afc7,
+	0x27b4c9,
+	0x2d3c48,
+	0x291d04,
+	0x29ccc8,
+	0x2d3349,
+	0x2b6987,
+	0x29cc44,
+	0x22cd48,
+	0x2a438a,
+	0x2e6086,
+	0x2a2cc6,
+	0x282f89,
+	0x29ea87,
+	0x2d0c08,
+	0x2290c8,
+	0x2c9f08,
+	0x39f585,
+	0x211585,
+	0x271045,
+	0x32c845,
+	0x395cc7,
+	0x218305,
+	0x2c3c85,
+	0x201186,
+	0x328787,
+	0x2e4787,
+	0x2a4686,
+	0x2d7085,
+	0x24f446,
+	0x25f2c5,
+	0x2d1e08,
+	0x375ec4,
+	0x2c8a06,
+	0x32dd84,
+	0x31ea08,
+	0x3cf80a,
+	0x27fd4c,
+	0x242605,
+	0x368146,
+	0x342ec6,
+	0x295f86,
+	0x30ff04,
+	0x35ee05,
+	0x281147,
+	0x29eb09,
+	0x2cfb47,
+	0x6044c4,
+	0x6044c4,
+	0x32ad85,
+	0x2d4d84,
+	0x29d40a,
+	0x27b686,
+	0x2809c4,
+	0x209985,
+	0x38dc85,
+	0x2b5684,
+	0x287b87,
+	0x243007,
+	0x2cf588,
+	0x205148,
+	0x21b609,
+	0x270f88,
+	0x29d5cb,
+	0x2c3a44,
+	0x256d05,
+	0x284285,
+	0x3b9cc9,
+	0x357ac9,
+	0x2fff48,
+	0x2ed808,
+	0x2ab984,
+	0x203f45,
+	0x202a43,
+	0x32c1c5,
+	0x29a886,
+	0x29944c,
+	0x23e9c6,
+	0x27d786,
+	0x28ef85,
+	0x306c88,
+	0x3ccb46,
+	0x380146,
+	0x2a2cc6,
+	0x2e368c,
+	0x31bb84,
+	0x23c54a,
+	0x28eec8,
+	0x299287,
+	0x337186,
+	0x237907,
+	0x2f2c85,
+	0x37a946,
+	0x363a06,
+	0x375047,
+	0x2826c4,
+	0x2acb45,
+	0x27b184,
+	0x2b9e47,
+	0x27b3c8,
+	0x27cf0a,
+	0x285587,
+	0x20a687,
+	0x338787,
+	0x2e3cc9,
+	0x29944a,
+	0x22dd83,
+	0x2825c5,
+	0x204f03,
+	0x3b9989,
+	0x390708,
+	0x35b2c7,
+	0x328949,
+	0x26fd06,
+	0x3b4408,
+	0x345a05,
+	0x213f8a,
+	0x211909,
+	0x250309,
+	0x3cca07,
+	0x26a009,
+	0x22b388,
+	0x375206,
+	0x368308,
+	0x3d0147,
+	0x3b9707,
+	0x245cc7,
+	0x2e7308,
+	0x300586,
+	0x2a4145,
+	0x281147,
+	0x299bc8,
+	0x32dd04,
+	0x2fa444,
+	0x292f07,
+	0x2b0b47,
+	0x31960a,
+	0x375186,
+	0x25a34a,
+	0x2c2e47,
+	0x2c0c07,
+	0x2acc04,
+	0x2a7c04,
+	0x2d3706,
+	0x312284,
+	0x31228c,
+	0x3d1dc5,
+	0x357909,
+	0x2b2a84,
+	0x2b5745,
+	0x284348,
+	0x280b85,
+	0x38d206,
+	0x22f984,
+	0x2c394a,
+	0x2dcf86,
+	0x29e5ca,
+	0x21e4c7,
+	0x289f45,
+	0x22bb85,
+	0x24e08a,
+	0x291f85,
+	0x2a2bc6,
+	0x246d04,
+	0x2b2806,
+	0x33d385,
+	0x227706,
+	0x2ef68c,
+	0x2e390a,
+	0x271404,
+	0x231b06,
+	0x29ea87,
+	0x2d5b04,
+	0x2394c8,
+	0x2f1686,
+	0x3814c9,
+	0x2d7409,
+	0x2b5b09,
+	0x2cfe46,
+	0x3d0246,
+	0x368447,
+	0x32a648,
+	0x3d0049,
+	0x32af07,
+	0x298706,
+	0x2b12c7,
+	0x277bc5,
+	0x2c0e44,
+	0x368007,
+	0x356a05,
+	0x28b445,
+	0x391547,
+	0x245748,
+	0x3bee46,
+	0x29aa0d,
+	0x29bf0f,
+	0x2a0b4d,
+	0x20ae44,
+	0x2369c6,
+	0x2d9808,
+	0x200a05,
+	0x296d88,
+	0x2635ca,
+	0x28b744,
+	0x237006,
+	0x2d6307,
+	0x3bb1c7,
+	0x2d8e49,
+	0x3682c5,
+	0x2b5684,
+	0x2b738a,
+	0x2c0249,
+	0x26a107,
+	0x29acc6,
+	0x35b086,
+	0x203e86,
+	0x37eec6,
+	0x2d870f,
+	0x2d96c9,
+	0x213c86,
+	0x387006,
+	0x329d09,
+	0x2b6007,
+	0x201fc3,
+	0x23c646,
+	0x217f03,
+	0x355d08,
+	0x2b1107,
+	0x2a3489,
+	0x2b4948,
+	0x35f388,
+	0x200c86,
+	0x23e909,
+	0x3538c5,
+	0x233384,
+	0x347fc7,
+	0x39dc05,
+	0x20ae44,
+	0x234208,
+	0x217544,
+	0x2b5d47,
+	0x367b46,
+	0x2822c5,
+	0x2d94c8,
+	0x35af4b,
+	0x2dfc87,
+	0x24e306,
+	0x2ca984,
+	0x34c846,
+	0x26d645,
+	0x356a05,
+	0x283e09,
+	0x287789,
+	0x2cfc04,
+	0x3b9785,
+	0x231b45,
+	0x213e06,
+	0x347908,
+	0x2c23c6,
+	0x39bf8b,
+	0x382eca,
+	0x2bef05,
+	0x28f8c6,
+	0x310505,
+	0x2010c5,
+	0x2ab407,
+	0x326408,
+	0x271004,
+	0x269946,
+	0x292506,
+	0x22b547,
+	0x317a44,
+	0x281e06,
+	0x2ebf85,
+	0x2ebf89,
+	0x3d0444,
+	0x2dfac9,
+	0x27f646,
+	0x2c4748,
+	0x231b45,
+	0x381745,
+	0x227706,
+	0x342c09,
+	0x359189,
+	0x27d806,
+	0x2ea148,
+	0x2a8508,
+	0x3104c4,
+	0x2b8044,
+	0x2b8048,
+	0x2bc3c8,
+	0x31a4c9,
+	0x29a806,
+	0x2a2cc6,
+	0x33624d,
+	0x353446,
+	0x32f849,
+	0x392685,
+	0x218f06,
+	0x2ca088,
+	0x331245,
+	0x356884,
+	0x26d645,
+	0x286c08,
+	0x29d1c9,
+	0x27b244,
+	0x202806,
+	0x280a4a,
+	0x375f48,
+	0x319789,
+	0x38754a,
+	0x3288c6,
+	0x29c0c8,
+	0x2bcec5,
+	0x28c688,
+	0x2f2d05,
+	0x26fbc9,
+	0x383949,
+	0x201a82,
+	0x29f545,
+	0x272686,
+	0x27f587,
+	0x3886c5,
+	0x315446,
+	0x30c788,
+	0x2b2c06,
+	0x2d2a09,
+	0x27ec06,
+	0x32c488,
+	0x359705,
+	0x3c6f46,
+	0x390588,
+	0x286048,
+	0x37fd88,
+	0x2e8988,
+	0x214344,
+	0x22d103,
+	0x2d2c44,
+	0x285786,
+	0x277c04,
+	0x39ed47,
+	0x380049,
+	0x2c9645,
+	0x2290c6,
+	0x23c646,
+	0x2af4cb,
+	0x2b4d86,
+	0x2bc6c6,
+	0x2c8b08,
+	0x333c46,
+	0x2baf83,
+	0x212103,
+	0x2c0e44,
+	0x232185,
+	0x2cd1c7,
+	0x27b3c8,
+	0x27b3cf,
+	0x28104b,
+	0x347708,
+	0x202886,
+	0x347a0e,
+	0x227703,
+	0x2cd144,
+	0x2b4d05,
+	0x2b5506,
+	0x290c4b,
+	0x294346,
+	0x31c009,
+	0x2822c5,
+	0x255688,
+	0x2196c8,
+	0x35904c,
+	0x2a2046,
+	0x32c206,
+	0x2eab85,
+	0x28b9c8,
+	0x27fd45,
+	0x35dac8,
+	0x29ddca,
+	0x2a0f89,
+	0x6044c4,
+	0x2000c2,
+	0x3f207c02,
 	0x200382,
+	0x224604,
+	0x202002,
+	0x215584,
+	0x201402,
+	0x182c3,
+	0x2003c2,
+	0x207bc2,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x203a83,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x222103,
+	0x2482c3,
+	0x210803,
+	0x28a904,
+	0x20d183,
+	0x2385c4,
+	0x2355c3,
+	0x2db184,
+	0x214d83,
+	0x388987,
+	0x272203,
+	0x2182c3,
+	0x354608,
+	0x2482c3,
+	0x2a150b,
+	0x2f3e83,
+	0x3ab686,
+	0x2061c2,
+	0x2eea0b,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x2482c3,
+	0x205443,
+	0x221503,
+	0x2000c2,
+	0x1513c8,
+	0x213105,
+	0x356a88,
+	0x2ecac8,
 	0x207c02,
-	0x2a9105,
-	0x24d0c5,
-	0x2c42,
-	0x37583,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0xaff03,
-	0x241d03,
-	0x10c43,
-	0x781,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x214bc3,
-	0x20ec83,
-	0xaff03,
-	0x241d03,
-	0x21a003,
-	0x3f0eca46,
-	0x6f803,
-	0x7f685,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x9482,
-	0xcd588,
-	0xae43,
-	0xaff03,
-	0x4cec4,
-	0xd8d45,
-	0x200742,
-	0x3a4c04,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x3a2f03,
-	0x232585,
-	0x214bc3,
-	0x20f003,
-	0x20ec83,
-	0x228803,
-	0x241d03,
-	0x207c03,
-	0x2605c3,
-	0x203f83,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x202c42,
-	0x241d03,
-	0xcd588,
-	0x30e843,
-	0xaff03,
-	0xcd588,
-	0xaff03,
-	0x2b8283,
-	0x20be03,
-	0x234784,
-	0x237583,
-	0x30e843,
-	0x207d02,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x207d02,
-	0x20be83,
-	0x20ec83,
-	0x241d03,
-	0x2e2d83,
-	0x207c03,
-	0x200742,
-	0x202c42,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x3a25c5,
-	0x9a2c6,
-	0x28b304,
-	0x20e982,
-	0xcd588,
-	0x200742,
-	0x20288,
-	0x132983,
-	0x202c42,
-	0x43490186,
-	0x12b44,
-	0x10bfcb,
-	0x41546,
-	0x1f847,
-	0x237583,
-	0x52748,
-	0x30e843,
-	0xef4c5,
-	0xe84,
-	0x222003,
-	0x56c47,
-	0xd4344,
-	0x20ec83,
-	0xafd44,
-	0xaff03,
-	0x241d03,
-	0x2e9484,
-	0xfdb48,
-	0x157206,
-	0x10d08,
-	0x135fc5,
-	0x126749,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ae43,
-	0x241d03,
-	0x2e8943,
-	0x20e982,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff83,
-	0x226444,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x2d2484,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x3a25c6,
-	0x237583,
-	0x30e843,
-	0x181c43,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x1f847,
-	0xcd588,
-	0x30e843,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x45e0be03,
-	0x237583,
-	0x20ec83,
-	0x241d03,
-	0xcd588,
-	0x200742,
-	0x202c42,
-	0x20be03,
-	0x30e843,
-	0x20ec83,
-	0x200342,
-	0x241d03,
-	0x32e147,
-	0x23b00b,
-	0x205d03,
-	0x2409c8,
-	0x38d847,
-	0x224906,
-	0x2c1605,
-	0x38e5c9,
-	0x21f4c8,
-	0x36b4c9,
-	0x39b210,
-	0x36b4cb,
-	0x2f6809,
-	0x207503,
-	0x22bcc9,
-	0x235b46,
-	0x235b4c,
-	0x357588,
-	0x3c02c8,
-	0x200289,
-	0x2e244e,
-	0x3c094b,
-	0x34754c,
-	0x205583,
-	0x27b80c,
-	0x205589,
-	0x2fbf47,
-	0x2374cc,
-	0x2ad14a,
-	0x253404,
-	0x32a08d,
-	0x27b6c8,
-	0x21014d,
-	0x28a7c6,
-	0x28b30b,
-	0x31d689,
-	0x27a747,
-	0x3c2c46,
-	0x341409,
-	0x32538a,
-	0x313048,
-	0x2e8544,
-	0x332e87,
-	0x249d47,
-	0x277984,
-	0x2d9a44,
-	0x386dc9,
-	0x364209,
-	0x215cc8,
-	0x2108c5,
-	0x2ea8c5,
-	0x20d106,
-	0x329f49,
-	0x25720d,
-	0x2f3308,
-	0x20d007,
-	0x2c1688,
-	0x23ce86,
-	0x37ce44,
-	0x286c45,
-	0x203846,
-	0x2043c4,
-	0x205487,
-	0x2081ca,
-	0x213904,
-	0x2170c6,
-	0x217d49,
-	0x217d4f,
-	0x21870d,
-	0x218fc6,
-	0x21fe90,
-	0x220286,
-	0x220807,
-	0x221447,
-	0x22144f,
-	0x222149,
-	0x228d46,
-	0x22a1c7,
-	0x22a1c8,
-	0x22b089,
-	0x395b88,
-	0x2de4c7,
-	0x22cf43,
-	0x3bcfc6,
-	0x3bbb08,
-	0x2e270a,
-	0x387809,
-	0x212743,
-	0x331606,
-	0x39ccca,
-	0x2e4b47,
-	0x2fbd8a,
-	0x209a8e,
-	0x222286,
-	0x26f5c7,
-	0x21bac6,
-	0x205646,
-	0x38a50b,
-	0x34edca,
-	0x309b0d,
-	0x203c07,
-	0x260648,
-	0x260649,
-	0x26064f,
-	0x34eb0c,
-	0x27c0c9,
-	0x2d778e,
-	0x38cc8a,
-	0x293886,
-	0x2f9f06,
-	0x313ccc,
-	0x315a8c,
-	0x328308,
-	0x353d07,
-	0x26d545,
-	0x290504,
-	0x202c4e,
-	0x266f84,
-	0x3188c7,
-	0x39270a,
-	0x3a2a54,
-	0x3b92cf,
-	0x221608,
-	0x3bce88,
-	0x33984d,
-	0x33984e,
-	0x231a09,
-	0x232b08,
-	0x232b0f,
-	0x2371cc,
-	0x2371cf,
-	0x2386c7,
-	0x23dfca,
-	0x22c54b,
-	0x23f5c8,
-	0x242707,
-	0x2616cd,
-	0x20a286,
-	0x32a246,
-	0x2443c9,
-	0x2a6f88,
-	0x249208,
-	0x24920e,
-	0x23b107,
-	0x24b505,
-	0x24cc85,
-	0x204c44,
-	0x224bc6,
-	0x215bc8,
-	0x322ec3,
-	0x397e4e,
-	0x261a88,
-	0x2ae14b,
-	0x301c07,
-	0x2f7305,
-	0x27b986,
-	0x2aab07,
-	0x2f4848,
-	0x317909,
-	0x20a505,
-	0x284bc8,
-	0x226e06,
-	0x39caca,
-	0x202b49,
-	0x237589,
-	0x23758b,
-	0x3211c8,
-	0x277849,
-	0x210986,
-	0x36db0a,
-	0x2bf50a,
-	0x23e1cc,
-	0x21e907,
-	0x2929ca,
-	0x211d0b,
-	0x211d19,
-	0x30a988,
-	0x3a2645,
-	0x261886,
-	0x26ba89,
-	0x358706,
-	0x2d340a,
-	0x21f6c6,
-	0x225784,
-	0x2c380d,
-	0x323307,
-	0x225789,
-	0x24e685,
-	0x251548,
-	0x252509,
-	0x252944,
-	0x253307,
-	0x253308,
-	0x253907,
-	0x268688,
-	0x257887,
-	0x205dc5,
-	0x25d60c,
-	0x25de49,
-	0x30590a,
-	0x3a0e09,
-	0x22bdc9,
-	0x37924c,
-	0x26004b,
-	0x260dc8,
-	0x261e88,
-	0x265244,
-	0x281b08,
-	0x283c89,
-	0x2ad207,
-	0x217f86,
-	0x31d907,
-	0x3843c9,
-	0x335c0b,
-	0x2b6107,
-	0x3c6847,
-	0x216407,
-	0x2100c4,
-	0x2100c5,
-	0x278845,
-	0x34c04b,
-	0x3ad084,
-	0x320d08,
-	0x28550a,
-	0x226ec7,
-	0x35b207,
-	0x28c112,
-	0x2a10c6,
-	0x234106,
-	0x2b658e,
-	0x2a4a86,
-	0x291508,
-	0x291a8f,
-	0x210508,
-	0x38b748,
-	0x2bb78a,
-	0x2bb791,
-	0x2a0d4e,
-	0x242a0a,
-	0x242a0c,
-	0x232d07,
-	0x232d10,
-	0x3c4cc8,
-	0x2a0f45,
-	0x2aae0a,
-	0x20440c,
-	0x29580d,
-	0x2fc446,
-	0x2fc447,
-	0x2fc44c,
-	0x30460c,
-	0x214bcc,
-	0x2ab88b,
-	0x3706c4,
-	0x211dc4,
-	0x388489,
-	0x30a2c7,
-	0x23dd89,
-	0x2bf349,
-	0x2ace07,
-	0x2acfc6,
-	0x2acfc9,
-	0x2ad3c3,
-	0x2b058a,
-	0x31b487,
-	0x3491cb,
-	0x30998a,
-	0x3298c4,
-	0x316946,
-	0x27ee49,
-	0x23a2c4,
-	0x39eeca,
-	0x2425c5,
-	0x2bcbc5,
-	0x2bcbcd,
-	0x2bcf0e,
-	0x2d9685,
-	0x32d506,
-	0x3a21c7,
-	0x25d88a,
-	0x37a506,
-	0x2e1304,
-	0x303707,
-	0x246a4b,
-	0x23cf47,
-	0x3c1a04,
-	0x390706,
-	0x39070d,
-	0x38408c,
-	0x20eb46,
-	0x2f350a,
-	0x27c686,
-	0x285788,
-	0x354b47,
-	0x23618a,
-	0x24b386,
-	0x203b03,
-	0x294346,
-	0x3bb988,
-	0x38860a,
-	0x2cb107,
-	0x2cb108,
-	0x30df84,
-	0x28c687,
-	0x201cc8,
-	0x2a12c8,
-	0x2827c8,
-	0x2b130a,
-	0x2d8345,
-	0x20be87,
-	0x242853,
-	0x25a706,
-	0x21b388,
-	0x227609,
-	0x248748,
-	0x32808b,
-	0x318488,
-	0x246b84,
-	0x365386,
-	0x311e06,
-	0x2dfa89,
-	0x382807,
-	0x25d708,
-	0x29c806,
-	0x31f644,
-	0x341d05,
-	0x2c7e48,
-	0x34398a,
-	0x2c3488,
-	0x2c8906,
-	0x29960a,
-	0x3b8e48,
-	0x2cc708,
-	0x2cd2c8,
-	0x2cdd46,
-	0x2d0886,
-	0x3a08cc,
-	0x2d0e10,
-	0x29ea45,
-	0x210308,
-	0x394490,
-	0x210310,
-	0x39b08e,
-	0x3a054e,
-	0x3a0554,
-	0x3a624f,
-	0x3a6606,
-	0x321391,
-	0x31eb13,
-	0x31ef88,
-	0x3ab285,
-	0x240f08,
-	0x387b05,
-	0x2da18c,
-	0x22cd09,
-	0x290349,
-	0x22d187,
-	0x251309,
-	0x24f147,
-	0x2f8cc6,
-	0x286a47,
-	0x2034c5,
-	0x210c83,
-	0x323089,
-	0x2278c9,
-	0x381c43,
-	0x38c7c4,
-	0x326f0d,
-	0x347c8f,
-	0x31f685,
-	0x3175c6,
-	0x225a47,
-	0x357307,
-	0x2f5886,
-	0x2f588b,
-	0x2a2bc5,
-	0x25f106,
-	0x2f9d87,
-	0x258249,
-	0x375d06,
-	0x322285,
-	0x374e4b,
-	0x3be7c6,
-	0x229a85,
-	0x27dc08,
-	0x2b2bc8,
-	0x2aec8c,
-	0x2aec90,
-	0x2ae949,
-	0x2bd487,
-	0x2d8e4b,
-	0x306746,
-	0x2de38a,
-	0x2df80b,
-	0x2e094a,
-	0x2e0bc6,
-	0x2e2c45,
-	0x31b1c6,
-	0x2b7048,
-	0x22d24a,
-	0x3394dc,
-	0x2e8a0c,
-	0x2e8d08,
-	0x3a25c5,
-	0x361f87,
-	0x209946,
-	0x270bc5,
-	0x21a846,
-	0x2f5a48,
-	0x2bbe47,
-	0x2e2348,
-	0x25a7ca,
-	0x225b4c,
-	0x20d309,
-	0x345787,
-	0x222a04,
-	0x24cd46,
-	0x38b2ca,
-	0x2bf445,
-	0x2110cc,
-	0x213588,
-	0x373608,
-	0x2238cc,
-	0x2dd30c,
-	0x329409,
-	0x329647,
-	0x24398c,
-	0x22c044,
-	0x2482ca,
-	0x3033cc,
-	0x27280b,
-	0x372f0b,
-	0x253786,
-	0x258d87,
-	0x232f47,
-	0x232f4f,
-	0x2fce11,
-	0x2d5b52,
-	0x2590cd,
-	0x2590ce,
-	0x25940e,
-	0x3a6408,
-	0x3a6412,
-	0x25eb08,
-	0x38d487,
-	0x2556ca,
-	0x355cc8,
-	0x2a4a45,
-	0x37fe0a,
-	0x220607,
-	0x316244,
-	0x221b83,
-	0x378205,
-	0x2bba07,
-	0x307c47,
-	0x295a0e,
-	0x399e8d,
-	0x39b5c9,
-	0x20fd85,
-	0x3b00c3,
-	0x20ab06,
-	0x25f705,
-	0x2ae388,
-	0x2b9609,
-	0x2618c5,
-	0x2618cf,
-	0x2e2a87,
-	0x38e505,
-	0x3025ca,
-	0x2b1506,
-	0x25b949,
-	0x2f640c,
-	0x2f80c9,
-	0x3be506,
-	0x28530c,
-	0x32c906,
-	0x2fb508,
-	0x2fba86,
-	0x30ab06,
-	0x2b0f04,
-	0x30d603,
-	0x38668a,
-	0x216711,
-	0x27c28a,
-	0x272085,
-	0x282347,
-	0x25ab47,
-	0x201dc4,
-	0x201dcb,
-	0x293d48,
-	0x2ba046,
-	0x36e145,
-	0x33d8c4,
-	0x362109,
-	0x202a84,
-	0x249047,
-	0x300585,
-	0x300587,
-	0x2b67c5,
-	0x3482c3,
-	0x38d348,
-	0x317c4a,
-	0x27f283,
-	0x35750a,
-	0x3b3486,
-	0x26164f,
-	0x3b8349,
-	0x397dd0,
-	0x2effc8,
-	0x2c8d49,
-	0x296707,
-	0x39068f,
-	0x319c04,
-	0x2d2504,
-	0x220106,
-	0x34f846,
-	0x2d6e8a,
-	0x253c06,
-	0x352987,
-	0x303f48,
-	0x304147,
-	0x3049c7,
-	0x305b8a,
-	0x3083cb,
-	0x341ac5,
-	0x2d5788,
-	0x256703,
-	0x3b6b0c,
-	0x35d60f,
-	0x26d34d,
-	0x25e287,
-	0x39b709,
-	0x36de47,
-	0x282c48,
-	0x3a2c4c,
-	0x2c8a48,
-	0x2701c8,
-	0x31c38e,
-	0x333d94,
-	0x3342a4,
-	0x35308a,
-	0x36becb,
-	0x24f204,
-	0x24f209,
-	0x233bc8,
-	0x24d305,
-	0x3229ca,
-	0x261cc7,
-	0x31b0c4,
-	0x2b6c03,
-	0x20be03,
-	0x23d744,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x214bc3,
-	0x21f743,
-	0x2d0e06,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x219543,
-	0x200742,
-	0x2b6c03,
-	0x202c42,
-	0x20be03,
-	0x23d744,
-	0x237583,
-	0x30e843,
-	0x214bc3,
-	0x2d0e06,
-	0x20ec83,
-	0x241d03,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x203d43,
-	0x20ec83,
-	0xaff03,
-	0x241d03,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x200742,
-	0x24be43,
-	0x202c42,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x203cc2,
-	0x24d5c2,
-	0x202c42,
-	0x20be03,
-	0x20b2c2,
-	0x201342,
-	0x26ff84,
-	0x21a484,
-	0x227d42,
-	0x226444,
-	0x200342,
-	0x241d03,
-	0x219543,
-	0x253786,
-	0x230882,
-	0x204182,
-	0x228382,
-	0x48610503,
-	0x48a32d03,
-	0x5b586,
-	0x5b586,
-	0x28b304,
-	0x20ae43,
-	0x15a4a,
-	0x3ba4c,
-	0x121ecc,
-	0x7f48d,
-	0x117485,
-	0x2aa47,
-	0x14ec6,
-	0x19148,
-	0x1c787,
-	0x23288,
-	0x1807ca,
-	0x102c07,
-	0x496d2fc5,
-	0x133789,
-	0x3c00b,
-	0x18754b,
-	0x1bdd08,
-	0xf608a,
-	0x8a34e,
-	0x144854b,
-	0x12b44,
-	0x5f246,
-	0x8808,
-	0x7e948,
-	0x3c2c7,
-	0x910c7,
-	0x78449,
-	0x3a347,
-	0x67008,
-	0x100249,
-	0x170bc4,
-	0x191e05,
-	0x12f34e,
-	0xa964d,
-	0x1f6c8,
-	0x49b64046,
-	0x4a564048,
-	0x739c8,
-	0x12e350,
-	0x5978c,
-	0x666c7,
-	0x66e47,
-	0x6abc7,
-	0x704c7,
-	0xd0c2,
-	0x1807,
-	0x14ef8c,
-	0x11d107,
-	0xa4686,
-	0xa5a89,
-	0xa7708,
-	0x552c2,
-	0x1342,
-	0x3900b,
-	0xafdc7,
-	0x25589,
-	0x52c49,
-	0x142188,
-	0xb0102,
-	0x1970c9,
-	0xc9f8a,
-	0xc6209,
-	0xd3909,
-	0xd50c8,
-	0xd6007,
-	0xd82c9,
-	0xda885,
-	0xdae90,
-	0x138ac6,
-	0x14a345,
-	0xeb78d,
-	0x2bac6,
-	0xe3d47,
-	0xe9498,
-	0x3a6c8,
-	0x14640a,
-	0x16f02,
-	0x5f88d,
-	0x1282,
-	0x7dac6,
-	0x8cc08,
-	0x6e308,
-	0xcd449,
-	0x1be608,
-	0x6f98e,
-	0xab07,
-	0xfe68d,
-	0xf26c5,
-	0x1588,
-	0x1a1e08,
-	0xfeec6,
-	0xc842,
-	0x157206,
-	0xdc2,
-	0x2c1,
-	0x60a07,
-	0x8b003,
-	0x49ee9d04,
-	0x4a294a43,
-	0x101,
-	0x13d06,
+	0x203705,
+	0x307ec7,
+	0x206ac2,
+	0x248787,
+	0x200382,
+	0x260647,
+	0x2bb709,
+	0x2bca88,
+	0x2c9d89,
+	0x212a42,
+	0x26ce07,
+	0x231984,
+	0x307f87,
+	0x382dc7,
+	0x261282,
+	0x272203,
+	0x206282,
+	0x201402,
+	0x2003c2,
+	0x20d682,
+	0x200902,
+	0x207bc2,
+	0x2abe05,
+	0x325045,
+	0x7c02,
+	0x355c3,
+	0x20d183,
+	0x2355c3,
+	0x20a743,
+	0x214d83,
+	0x207483,
+	0x222103,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0x10dc3,
 	0x101,
-	0x301,
-	0x13d06,
-	0x8b003,
-	0x140e3c5,
-	0x253404,
-	0x20be03,
-	0x254a04,
-	0x26ff84,
-	0x20ec83,
-	0x2274c5,
-	0x21a003,
-	0x24f3c3,
-	0x2f5805,
-	0x203f83,
-	0x4b60be03,
-	0x237583,
-	0x30e843,
-	0x200541,
-	0x21f743,
-	0x21a484,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x207c03,
-	0xcd588,
-	0x200742,
-	0x2b6c03,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x203d43,
-	0x201342,
-	0x26ff84,
-	0x214bc3,
-	0x21f743,
-	0x20ec83,
-	0x20ae43,
-	0x241d03,
-	0x203f83,
-	0xcd588,
-	0x35d382,
-	0x1851c7,
-	0x2c42,
-	0x141c85,
-	0x598cf,
-	0x1455908,
-	0x10430e,
-	0x4c607402,
-	0x31a848,
-	0x307206,
-	0x2c1146,
-	0x306b87,
-	0x4ca11a42,
-	0x4cfb81c8,
-	0x21ed8a,
-	0x266148,
-	0x200602,
-	0x31b2c9,
-	0x341b07,
-	0x217f06,
-	0x38d089,
-	0x20bfc4,
-	0x20e2c6,
-	0x2f2904,
-	0x270984,
-	0x25cf89,
-	0x3030c6,
-	0x24d185,
-	0x2faf45,
-	0x2322c7,
-	0x2be9c7,
-	0x354984,
-	0x306dc6,
-	0x2ff205,
-	0x309485,
-	0x39dec5,
-	0x2ea687,
-	0x301a45,
-	0x319149,
-	0x336f85,
-	0x2f4984,
-	0x37a447,
-	0x348a0e,
-	0x3aaec9,
-	0x2b6449,
-	0x335246,
-	0x2454c8,
-	0x2ee34b,
-	0x35bd8c,
-	0x33b746,
-	0x347407,
-	0x2afbc5,
-	0x2d9a4a,
-	0x215dc9,
-	0x366f09,
-	0x332706,
-	0x2f9b45,
-	0x383105,
-	0x338689,
-	0x39e04b,
-	0x275e86,
-	0x343ec6,
-	0x203104,
-	0x28bdc6,
-	0x24b588,
-	0x3bb806,
-	0x21d186,
-	0x206888,
-	0x209347,
-	0x209509,
-	0x20acc5,
-	0xcd588,
-	0x291044,
-	0x304f44,
-	0x210f05,
-	0x3a8c49,
-	0x226087,
-	0x22608b,
-	0x2288ca,
-	0x22cc45,
-	0x4d207a42,
-	0x309847,
-	0x4d62cf48,
-	0x370a47,
-	0x383e85,
-	0x32654a,
-	0x2c42,
-	0x2fac0b,
-	0x2579ca,
-	0x2277c6,
-	0x210d83,
-	0x2a4f8d,
-	0x3aa74c,
-	0x3bedcd,
-	0x24e2c5,
-	0x37dd45,
-	0x322f07,
-	0x20b2c9,
-	0x21ec86,
-	0x253a85,
-	0x2ced88,
-	0x28bcc3,
-	0x2e3108,
-	0x28bcc8,
-	0x2c2107,
-	0x30f108,
-	0x3aa549,
-	0x286d47,
-	0x23ab87,
-	0x224788,
-	0x38ae04,
-	0x38ae07,
-	0x28a6c8,
-	0x353706,
-	0x3b544f,
-	0x2293c7,
-	0x2de646,
-	0x329785,
-	0x228503,
-	0x391c87,
-	0x378183,
-	0x253e86,
-	0x2553c6,
-	0x255b06,
-	0x28fa05,
-	0x268683,
-	0x396d48,
-	0x379c89,
-	0x38eb4b,
-	0x255c88,
-	0x257545,
-	0x258b85,
-	0x4db29982,
-	0x286b09,
-	0x38d707,
-	0x25f185,
-	0x25ce87,
-	0x25e9c6,
-	0x371c05,
-	0x25f54b,
-	0x260dc4,
-	0x265d05,
-	0x265e47,
-	0x275806,
-	0x275c45,
-	0x281d07,
-	0x2829c7,
-	0x2e1704,
-	0x28990a,
-	0x289dc8,
-	0x293089,
-	0x241245,
-	0x364946,
-	0x24b74a,
-	0x2fae46,
-	0x268fc7,
-	0x292d4d,
-	0x2a2709,
-	0x3954c5,
-	0x2031c7,
-	0x31f148,
-	0x336a08,
-	0x209ec7,
-	0x3be1c6,
-	0x21d4c7,
-	0x255083,
-	0x303044,
-	0x36e785,
-	0x39fc47,
-	0x3a4609,
-	0x230cc8,
-	0x33dc85,
-	0x2363c4,
-	0x253d45,
-	0x39038d,
-	0x211742,
-	0x2bd986,
-	0x27da06,
-	0x2dac0a,
-	0x381346,
-	0x38b205,
-	0x31ffc5,
-	0x31ffc7,
-	0x39c90c,
-	0x27384a,
-	0x28ba86,
-	0x2c4d85,
-	0x28bc06,
-	0x28bf47,
-	0x28d986,
-	0x28f90c,
-	0x38d1c9,
-	0x4de14187,
-	0x291e45,
-	0x291e46,
-	0x2944c8,
-	0x247e85,
-	0x2a3505,
-	0x2a3c88,
-	0x2a3e8a,
-	0x4e278142,
-	0x4e607c82,
-	0x2d7485,
-	0x2a6b43,
-	0x2461c8,
-	0x211b83,
-	0x2a4104,
-	0x25ba8b,
-	0x211b88,
-	0x2ce288,
-	0x4eb1cb49,
-	0x2a8e09,
-	0x2a9546,
-	0x2aa788,
-	0x2aa989,
-	0x2ab386,
-	0x2ab505,
-	0x24e0c6,
-	0x2abfc9,
-	0x3ac147,
-	0x381fc6,
-	0x2d8787,
-	0x21eb07,
-	0x34e204,
-	0x4ee3a9c9,
-	0x270e08,
-	0x3b80c8,
-	0x31f887,
-	0x2c2f46,
-	0x20b0c9,
-	0x2f2bc7,
-	0x33194a,
-	0x364a88,
-	0x3be307,
-	0x20ed86,
-	0x39d28a,
-	0x372cc8,
-	0x382ac5,
-	0x22b9c5,
-	0x30b047,
-	0x36ac49,
-	0x30280b,
-	0x314248,
-	0x337009,
-	0x255f87,
-	0x2b868c,
-	0x2b8c8c,
-	0x2b8f8a,
-	0x2b920c,
-	0x2c10c8,
-	0x2c12c8,
-	0x2c14c4,
-	0x2c1889,
-	0x2c1ac9,
-	0x2c1d0a,
-	0x2c1f89,
-	0x2c22c7,
-	0x3b4c4c,
-	0x23d386,
-	0x3c0708,
-	0x2faf06,
-	0x37fc46,
-	0x3953c7,
-	0x3ab0c8,
-	0x349c4b,
-	0x370907,
-	0x35b849,
-	0x3782c9,
-	0x254b87,
-	0x2f2b44,
-	0x282487,
-	0x2eaf46,
-	0x215946,
-	0x2f36c5,
-	0x3720c8,
-	0x290244,
-	0x290246,
-	0x27370b,
-	0x2b0889,
-	0x39ddc6,
-	0x204cc9,
-	0x2ea806,
-	0x22e688,
-	0x20b4c3,
-	0x2f9cc5,
-	0x21d2c9,
-	0x228b05,
-	0x30ae84,
-	0x274d06,
-	0x3993c5,
-	0x259b06,
-	0x308747,
-	0x331086,
-	0x23078b,
-	0x36da07,
-	0x256e46,
-	0x348606,
-	0x232386,
-	0x354949,
-	0x2e474a,
-	0x2ba345,
-	0x3be8cd,
-	0x2a3f86,
-	0x2e9106,
-	0x397cc6,
-	0x285705,
-	0x2db187,
-	0x2f75c7,
-	0x207cce,
-	0x21f743,
-	0x2c2f09,
-	0x358489,
-	0x2d9e47,
-	0x26c287,
-	0x2a1445,
-	0x2ae085,
-	0x4f386f0f,
-	0x2c8f87,
-	0x2c9148,
-	0x2c9884,
-	0x2c9e46,
-	0x4f64cd02,
-	0x2cdfc6,
-	0x2d0e06,
-	0x349f8e,
-	0x2e2f4a,
-	0x3b8946,
-	0x2ca24a,
-	0x2065c9,
-	0x231e85,
-	0x344788,
-	0x39a146,
-	0x29aac8,
-	0x3c2dc8,
-	0x2a57cb,
-	0x306c85,
-	0x301ac8,
-	0x2069cc,
-	0x383d47,
-	0x255606,
-	0x27c4c8,
-	0x224a88,
-	0x4fa53982,
-	0x20e08b,
-	0x3361c9,
-	0x21cb09,
-	0x39dc47,
-	0x38a7c8,
-	0x4fe3ca88,
-	0x21318b,
-	0x342009,
-	0x28394d,
-	0x24e488,
-	0x3518c8,
-	0x502056c2,
-	0x331404,
-	0x50623b82,
-	0x2f7e06,
-	0x50a0a542,
-	0x24fc8a,
-	0x204b86,
-	0x22e0c8,
-	0x2be048,
-	0x326cc6,
-	0x398b46,
-	0x2efd46,
-	0x2ae305,
-	0x240684,
-	0x50e2e604,
-	0x34c986,
-	0x2a2247,
-	0x5121c1c7,
-	0x2e1bcb,
-	0x348dc9,
-	0x37dd8a,
-	0x357ec4,
-	0x320108,
-	0x381d8d,
-	0x2e6e49,
-	0x2e7088,
-	0x2e7709,
-	0x2e9484,
-	0x22c404,
-	0x27d505,
-	0x2ee68b,
-	0x211b06,
-	0x34c7c5,
-	0x222449,
-	0x306e88,
-	0x29fb44,
-	0x2d9bc9,
-	0x326b05,
-	0x2bea08,
-	0x23b247,
-	0x2b6848,
-	0x27f046,
-	0x207907,
-	0x2d4109,
-	0x374fc9,
-	0x229b05,
-	0x240305,
-	0x51607482,
-	0x2f4744,
-	0x225dc5,
-	0x292786,
-	0x2f8305,
-	0x297b87,
-	0x34ca85,
-	0x275844,
-	0x335306,
-	0x253b07,
-	0x234fc6,
-	0x384305,
-	0x20e4c8,
-	0x307405,
-	0x20ef87,
-	0x2154c9,
-	0x2b09ca,
-	0x34e587,
-	0x34e58c,
-	0x24d146,
-	0x241b89,
-	0x244885,
-	0x247dc8,
-	0x201283,
-	0x210945,
-	0x2eac05,
-	0x257f47,
-	0x51a12c02,
-	0x398347,
-	0x2f3c06,
-	0x32fdc6,
-	0x2f7f46,
-	0x2249c6,
-	0x2eb408,
-	0x241045,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x219a43,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0x21b2c3,
+	0x42474f46,
+	0x9f983,
+	0xcabc5,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0x1882,
+	0x1513c8,
+	0x182c3,
+	0xe6003,
+	0x4c604,
+	0xe3f85,
+	0x2000c2,
+	0x3ad444,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x247fc3,
+	0x230285,
+	0x219a43,
+	0x224f03,
+	0x222103,
+	0x252ec3,
+	0x2482c3,
+	0x215e83,
+	0x2623c3,
+	0x2020c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x207c02,
+	0x2482c3,
+	0x1513c8,
+	0x214d83,
+	0xe6003,
+	0x1513c8,
+	0xe6003,
+	0x2b9343,
+	0x20d183,
+	0x232a84,
+	0x2355c3,
+	0x214d83,
+	0x200d42,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x200d42,
+	0x20d203,
+	0x222103,
+	0x2482c3,
+	0x2eca43,
+	0x215e83,
+	0x2000c2,
+	0x207c02,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x3ab685,
+	0x14dd46,
+	0x28a904,
+	0x2061c2,
+	0x1513c8,
+	0x2000c2,
+	0xf4d45,
+	0x1f548,
+	0x193303,
+	0x207c02,
+	0x46893dc6,
+	0x23084,
+	0xb1b8b,
+	0x3eec6,
+	0x7c8c7,
+	0x2355c3,
+	0x50048,
+	0x214d83,
+	0x111a45,
+	0x4284,
+	0x26b1c3,
+	0x559c7,
+	0xde444,
+	0x222103,
+	0x7d906,
+	0xe5e44,
+	0xe6003,
+	0x2482c3,
+	0x2f5b44,
+	0x12b507,
+	0x14d949,
+	0xb1948,
+	0x1418c4,
+	0x44a06,
+	0x10e88,
+	0x130a05,
+	0x12249,
+	0xf4d45,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x2182c3,
+	0x2482c3,
+	0x2f3e83,
+	0x2061c2,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x219883,
+	0x2bf0c4,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x2db184,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x3ab686,
+	0x2355c3,
+	0x214d83,
+	0x2e803,
+	0xe6003,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0xf4d45,
+	0x7c8c7,
+	0x1513c8,
+	0x214d83,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x4960d183,
+	0x2355c3,
+	0x222103,
+	0x2482c3,
+	0x1513c8,
+	0x2000c2,
+	0x207c02,
+	0x20d183,
+	0x214d83,
+	0x222103,
+	0x2003c2,
+	0x2482c3,
+	0x3390c7,
+	0x312e4b,
+	0x201103,
+	0x23dd48,
+	0x32a3c7,
+	0x216246,
+	0x211ec5,
+	0x203849,
+	0x27c548,
+	0x37a409,
+	0x3a6710,
+	0x37a40b,
+	0x2f0d49,
+	0x201d83,
+	0x201389,
+	0x233786,
+	0x23378c,
+	0x2131c8,
+	0x3cc848,
+	0x3b5909,
+	0x3bb8ce,
+	0x2bb4cb,
+	0x2768cc,
+	0x208403,
+	0x28d68c,
+	0x208409,
+	0x241e87,
+	0x23550c,
+	0x3c630a,
+	0x248084,
+	0x2509cd,
+	0x28d548,
+	0x21080d,
+	0x294a46,
+	0x28a90b,
+	0x34dac9,
+	0x387287,
+	0x38fb86,
+	0x36fe89,
+	0x36f14a,
+	0x31d7c8,
+	0x2f3a84,
+	0x33b987,
+	0x24a147,
+	0x23ecc4,
+	0x2e5284,
+	0x396349,
+	0x3735c9,
+	0x21dec8,
+	0x210585,
+	0x212985,
+	0x20dcc6,
+	0x250889,
+	0x26384d,
+	0x2f1888,
+	0x20dbc7,
+	0x211f48,
+	0x3ced06,
+	0x240bc4,
+	0x2ab0c5,
+	0x3cff46,
+	0x3d1ac4,
+	0x208307,
+	0x209c8a,
+	0x2144c4,
+	0x217146,
+	0x217ec9,
+	0x217ecf,
+	0x2193cd,
+	0x21a286,
+	0x21f150,
+	0x21f546,
+	0x21fac7,
+	0x220387,
+	0x22038f,
+	0x220e09,
+	0x2281c6,
+	0x2288c7,
+	0x2288c8,
+	0x2294c9,
+	0x282388,
+	0x2e8dc7,
+	0x213103,
+	0x22ee46,
+	0x3c3308,
+	0x3bbb8a,
+	0x3c4709,
+	0x226303,
+	0x307dc6,
+	0x26978a,
+	0x290987,
+	0x241cca,
+	0x30a68e,
+	0x220f46,
+	0x29f747,
+	0x3576c6,
+	0x2084c6,
+	0x21138b,
+	0x212b0a,
+	0x2acf4d,
+	0x3d0307,
+	0x26c3c8,
+	0x26c3c9,
+	0x26c3cf,
+	0x321c4c,
+	0x26f7c9,
+	0x37f78e,
+	0x388a8a,
+	0x2bd746,
+	0x3019c6,
+	0x31f68c,
+	0x3216cc,
+	0x333808,
+	0x37c007,
+	0x239845,
+	0x294144,
+	0x373a4e,
+	0x26a404,
+	0x35fb47,
+	0x3abb0a,
+	0x3ca654,
+	0x22e88f,
+	0x220548,
+	0x22ed08,
+	0x33cc8d,
+	0x33cc8e,
+	0x22efc9,
+	0x230908,
+	0x23090f,
+	0x23520c,
+	0x23520f,
+	0x236707,
+	0x238e0a,
+	0x24b80b,
+	0x23c988,
+	0x240547,
+	0x26410d,
+	0x3308c6,
+	0x250b86,
+	0x243e89,
+	0x278048,
+	0x249108,
+	0x24910e,
+	0x312f47,
+	0x24bac5,
+	0x24c3c5,
+	0x208e44,
+	0x216506,
+	0x21ddc8,
+	0x372dc3,
+	0x2f47ce,
+	0x2644c8,
+	0x37ab0b,
+	0x309687,
+	0x2fe705,
+	0x247946,
+	0x2aec07,
+	0x2fa9c8,
+	0x33d0c9,
+	0x2331c5,
+	0x28a408,
+	0x3580c6,
+	0x3a7e8a,
+	0x373949,
+	0x2355c9,
+	0x2355cb,
+	0x204b88,
+	0x23eb89,
+	0x210646,
+	0x38664a,
+	0x20cc4a,
+	0x23900c,
+	0x22d487,
+	0x2c9b8a,
+	0x32b9cb,
+	0x32b9d9,
+	0x314188,
+	0x3ab705,
+	0x2642c6,
+	0x26e5c9,
+	0x389246,
+	0x2e344a,
+	0x27c746,
+	0x2cbd04,
+	0x2cbd0d,
+	0x373207,
+	0x357ec9,
+	0x24f045,
+	0x24f5c8,
+	0x24fe09,
+	0x250244,
+	0x251687,
+	0x251688,
+	0x251ac7,
+	0x26b9c8,
+	0x255fc7,
+	0x208c45,
+	0x25d5cc,
+	0x25de09,
+	0x2d004a,
+	0x3a9ec9,
+	0x201489,
+	0x386dcc,
+	0x261e4b,
+	0x263008,
+	0x2648c8,
+	0x268384,
+	0x2882c8,
+	0x2897c9,
+	0x3c63c7,
+	0x218106,
+	0x29d007,
+	0x3192c9,
+	0x32430b,
+	0x295e07,
+	0x3cb587,
+	0x21e607,
+	0x210784,
+	0x210785,
+	0x2dae85,
+	0x34fc4b,
+	0x3b3104,
+	0x2be6c8,
+	0x2f790a,
+	0x358187,
+	0x35c687,
+	0x2900d2,
+	0x29fb46,
+	0x232406,
+	0x32598e,
+	0x2a17c6,
+	0x2951c8,
+	0x2961cf,
+	0x210bc8,
+	0x39a248,
+	0x2c424a,
+	0x2c4251,
+	0x2a490e,
+	0x24084a,
+	0x24084c,
+	0x230b07,
+	0x230b10,
+	0x3c8748,
+	0x2a4b05,
+	0x2af28a,
+	0x3d1b0c,
+	0x298a4d,
+	0x304446,
+	0x304447,
+	0x30444c,
+	0x38afcc,
+	0x22288c,
+	0x2ac5cb,
+	0x38a484,
+	0x283104,
+	0x38bb09,
+	0x3adb47,
+	0x3943c9,
+	0x20ca89,
+	0x3bc407,
+	0x3c6186,
+	0x3c6189,
+	0x2b0d03,
+	0x2b2d0a,
+	0x202f47,
+	0x34498b,
+	0x2acdca,
+	0x231a04,
+	0x35ef46,
+	0x285809,
+	0x312104,
+	0x3d1e8a,
+	0x24e605,
+	0x2c1245,
+	0x2c124d,
+	0x2c158e,
+	0x2d2d85,
+	0x337906,
+	0x3ab287,
+	0x25d84a,
+	0x378786,
+	0x2eb084,
+	0x2ff3c7,
+	0x2720cb,
+	0x3cedc7,
+	0x27cb44,
+	0x286406,
+	0x28640d,
+	0x2dd40c,
+	0x221fc6,
+	0x2f1a8a,
+	0x352b06,
+	0x243508,
+	0x231f07,
+	0x247d8a,
+	0x38a006,
+	0x281e83,
+	0x2bd846,
+	0x3c3188,
+	0x38bc8a,
+	0x288887,
+	0x288888,
+	0x28c804,
+	0x338c07,
+	0x206c88,
+	0x29b348,
+	0x2b5308,
+	0x3b9e8a,
+	0x2e2845,
+	0x20d207,
+	0x240693,
+	0x25b946,
+	0x219c48,
+	0x223dc9,
+	0x248648,
+	0x200d0b,
+	0x35f708,
+	0x272204,
+	0x25aa86,
+	0x31c586,
+	0x316c09,
+	0x2c7547,
+	0x25d6c8,
+	0x29b4c6,
+	0x391444,
+	0x38f585,
+	0x2d0388,
+	0x331d8a,
+	0x2cb988,
+	0x2d1146,
+	0x29c2ca,
+	0x2a99c8,
+	0x2d5908,
+	0x2d64c8,
+	0x2d6d46,
+	0x2d9a06,
+	0x3a998c,
+	0x2d9fd0,
+	0x2a3985,
+	0x2109c8,
+	0x32f490,
+	0x2109d0,
+	0x3a658e,
+	0x3a960e,
+	0x3a9614,
+	0x3aed4f,
+	0x3af106,
+	0x3269d1,
+	0x38fd13,
+	0x390188,
+	0x324785,
+	0x23e288,
+	0x2fde85,
+	0x2e59cc,
+	0x22a7c9,
+	0x293f89,
+	0x22ac47,
+	0x3a0309,
+	0x31a787,
+	0x300886,
+	0x2aaec7,
+	0x205b05,
+	0x210e03,
+	0x372f89,
+	0x25ff49,
+	0x22e803,
+	0x3885c4,
+	0x2f530d,
+	0x34b10f,
+	0x391485,
+	0x34a606,
+	0x22d6c7,
+	0x212f47,
+	0x3c00c6,
+	0x3c00cb,
+	0x2a5905,
+	0x25fd06,
+	0x301847,
+	0x2566c9,
+	0x3834c6,
+	0x371c85,
+	0x366b8b,
+	0x211806,
+	0x358d85,
+	0x25eec8,
+	0x2a7948,
+	0x350f0c,
+	0x350f10,
+	0x2b1f49,
+	0x2b3487,
+	0x30ef4b,
+	0x2e7dc6,
+	0x2e8c8a,
+	0x2e99cb,
+	0x2ea7ca,
+	0x2eaa46,
+	0x2ec905,
+	0x32a2c6,
+	0x23af48,
+	0x22ad0a,
+	0x33c91c,
+	0x2f3f4c,
+	0x2f4248,
+	0x3ab685,
+	0x389cc7,
+	0x370f86,
+	0x284745,
+	0x21c546,
+	0x3c0288,
+	0x2c04c7,
+	0x3bb7c8,
+	0x25ba0a,
+	0x22d7cc,
+	0x20dec9,
+	0x229247,
+	0x289d04,
+	0x24c486,
+	0x399dca,
+	0x20cb85,
+	0x226a4c,
+	0x228a88,
+	0x31fa08,
+	0x34378c,
+	0x2303cc,
+	0x231549,
+	0x231787,
+	0x37df0c,
+	0x22afc4,
+	0x25184a,
+	0x30320c,
+	0x27424b,
+	0x2578cb,
+	0x25cb86,
+	0x260e07,
+	0x230d47,
+	0x230d4f,
+	0x304e11,
+	0x2e0e92,
+	0x26294d,
+	0x26294e,
+	0x262c8e,
+	0x3aef08,
+	0x3aef12,
+	0x26d148,
+	0x224407,
+	0x2543ca,
+	0x2a8208,
+	0x2a1785,
+	0x395b0a,
+	0x21f8c7,
+	0x2f4b04,
+	0x220ac3,
+	0x238b05,
+	0x2c44c7,
+	0x302587,
+	0x298c4e,
+	0x34fecd,
+	0x352009,
+	0x242a85,
+	0x3a6ac3,
+	0x25b0c6,
+	0x260c85,
+	0x37ad48,
+	0x2ba989,
+	0x264305,
+	0x26430f,
+	0x2b1c87,
+	0x211d45,
+	0x30a04a,
+	0x348286,
+	0x2686c9,
+	0x2fd9cc,
+	0x2ff589,
+	0x2110c6,
+	0x2f770c,
+	0x336d06,
+	0x302188,
+	0x302746,
+	0x314306,
+	0x2b4f04,
+	0x316b83,
+	0x2b670a,
+	0x21e911,
+	0x26f98a,
+	0x2708c5,
+	0x273747,
+	0x25bd87,
+	0x206d84,
+	0x206d8b,
+	0x2bc908,
+	0x2be9c6,
+	0x233e45,
+	0x3a8184,
+	0x251109,
+	0x2008c4,
+	0x248f47,
+	0x2ff785,
+	0x2ff787,
+	0x325bc5,
+	0x39f0c3,
+	0x2242c8,
+	0x35ebca,
+	0x204f83,
+	0x21314a,
+	0x3bff06,
+	0x26408f,
+	0x3baa89,
+	0x2f4750,
+	0x2f9108,
+	0x2d1849,
+	0x299947,
+	0x28638f,
+	0x328d04,
+	0x2db204,
+	0x21f3c6,
+	0x23ba86,
+	0x3a284a,
+	0x27dbc6,
+	0x33f107,
+	0x30b248,
+	0x30b447,
+	0x30c547,
+	0x30d50a,
+	0x30f38b,
+	0x370545,
+	0x2e0ac8,
+	0x22fbc3,
+	0x3b470c,
+	0x341f0f,
+	0x23964d,
+	0x25e247,
+	0x352149,
+	0x245fc7,
+	0x25e708,
+	0x3ca84c,
+	0x2b88c8,
+	0x271cc8,
+	0x32d80e,
+	0x33fa94,
+	0x33ffa4,
+	0x35cd8a,
+	0x37afcb,
+	0x31a844,
+	0x31a849,
+	0x237088,
+	0x24cb85,
+	0x3728ca,
+	0x264707,
+	0x32a1c4,
+	0x203a83,
+	0x20d183,
+	0x2385c4,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x219a43,
+	0x272203,
+	0x2d9fc6,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x21a803,
+	0x2000c2,
+	0x203a83,
+	0x207c02,
+	0x20d183,
+	0x2385c4,
+	0x2355c3,
+	0x214d83,
+	0x219a43,
+	0x2d9fc6,
+	0x222103,
+	0x2482c3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x3d0443,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x2000c2,
+	0x308bc3,
+	0x207c02,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x200f82,
+	0x24ce42,
+	0x207c02,
+	0x20d183,
+	0x201c42,
+	0x2005c2,
+	0x224604,
+	0x215584,
+	0x358582,
+	0x2bf0c4,
+	0x2003c2,
+	0x2482c3,
+	0x21a803,
+	0x25cb86,
+	0x22e042,
+	0x203582,
+	0x224a82,
+	0x4be10bc3,
+	0x4c230b03,
+	0x5c6c6,
+	0x5c6c6,
+	0x28a904,
+	0x2182c3,
+	0x1dc4a,
+	0x11388c,
+	0x1540c,
+	0xca9cd,
+	0xf4d45,
+	0x8e2cc,
+	0x39e47,
+	0x15a46,
+	0x1a408,
+	0x1d707,
+	0x21848,
+	0x18248a,
+	0x102a47,
+	0x4ce8e505,
+	0xdbcc9,
+	0x3744b,
+	0x1c444b,
+	0x7c948,
+	0x1a049,
+	0x1cc2ca,
+	0x13db0e,
+	0x115a4d,
+	0x144844b,
+	0xdd2ca,
+	0x23084,
+	0x6b706,
+	0x4a808,
+	0x83b88,
+	0x37707,
+	0x23985,
+	0x94d87,
+	0x7e409,
+	0x112187,
+	0x6a488,
+	0x107689,
+	0x50e84,
+	0x51c45,
+	0x13a2ce,
+	0x15974d,
+	0x7c748,
+	0x4d36ea46,
+	0x4dd6ea48,
+	0xb32c8,
+	0x1392d0,
+	0x5808c,
+	0x69487,
+	0x6a2c7,
+	0x6d887,
+	0x72387,
+	0xdc82,
+	0x67c7,
+	0x12ccc,
+	0x171205,
+	0x76007,
+	0xa7806,
+	0xa8709,
+	0xaa248,
+	0x586c2,
+	0x5c2,
+	0x3cf0b,
+	0xe5ec7,
+	0x157cc9,
+	0x5f3c9,
+	0x168708,
+	0xb38c2,
+	0x1a4789,
+	0xd300a,
+	0x6206,
+	0xcee09,
+	0xdd247,
+	0xdd989,
+	0xe0348,
+	0xe1347,
+	0xe27c9,
+	0xe6805,
+	0xe6b90,
+	0x1c9186,
+	0x127cc5,
+	0x165807,
+	0x1ce90d,
+	0x47245,
+	0x29b46,
+	0xeef07,
+	0xf5b58,
+	0x112508,
+	0x600a,
+	0x4e42,
+	0x5768a,
+	0x6f10d,
+	0x1002,
+	0xea506,
+	0x90f08,
+	0x4f208,
+	0x70609,
+	0x10bbc8,
+	0x7a84e,
+	0x5b0c7,
+	0x10670d,
+	0xfc445,
+	0x6548,
+	0x1aaec8,
+	0x107106,
+	0xab42,
+	0xda7c6,
+	0x44a06,
+	0x1242,
+	0x401,
+	0x627c7,
+	0x60203,
+	0x4d6f63c4,
+	0x4da97703,
+	0xc1,
+	0x17746,
+	0xc1,
+	0x201,
+	0x17746,
+	0x60203,
+	0x1476d05,
+	0x248084,
+	0x20d183,
+	0x2526c4,
+	0x224604,
+	0x222103,
+	0x223c85,
+	0x21b2c3,
+	0x206103,
+	0x3c0045,
+	0x2020c3,
+	0x4ee0d183,
+	0x2355c3,
+	0x214d83,
+	0x200181,
+	0x272203,
+	0x215584,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x215e83,
+	0x1513c8,
+	0x2000c2,
+	0x203a83,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x3d0443,
+	0x2005c2,
+	0x224604,
+	0x219a43,
+	0x272203,
+	0x222103,
+	0x2182c3,
+	0x2482c3,
+	0x2020c3,
+	0x1513c8,
+	0x341c82,
+	0x1cdf07,
+	0x7c02,
+	0x18f505,
+	0x581cf,
+	0x1589e48,
+	0x10bf4e,
+	0x4fe27402,
+	0x329948,
+	0x227886,
+	0x2c5b46,
+	0x227207,
+	0x50202842,
+	0x507ba908,
+	0x225c8a,
+	0x268f08,
+	0x208e82,
+	0x3447c9,
+	0x370587,
+	0x218086,
+	0x224009,
+	0x20a484,
+	0x216146,
+	0x2c5f44,
+	0x205804,
+	0x25d1c9,
+	0x302f06,
+	0x2b4745,
+	0x256445,
+	0x22ffc7,
+	0x2c30c7,
+	0x29fd84,
+	0x227446,
+	0x2f6f85,
+	0x2ac8c5,
+	0x310445,
+	0x218a47,
+	0x3094c5,
+	0x328249,
+	0x392285,
+	0x2fab04,
+	0x3786c7,
+	0x3908ce,
+	0x3265c9,
+	0x325849,
+	0x323946,
+	0x245408,
+	0x2eb60b,
+	0x364ccc,
+	0x346cc6,
+	0x276787,
+	0x2b2905,
+	0x2e528a,
+	0x21dfc9,
+	0x322b09,
+	0x393086,
+	0x301605,
+	0x24c745,
+	0x330609,
+	0x3105cb,
+	0x27a486,
+	0x34b706,
+	0x20dbc4,
+	0x28fd86,
+	0x24bb48,
+	0x3c3006,
+	0x23a186,
+	0x2091c8,
+	0x20a987,
+	0x20b1c9,
+	0x20b9c5,
+	0x1513c8,
+	0x294d04,
+	0x30cac4,
+	0x212805,
+	0x3b09c9,
+	0x222d07,
+	0x222d0b,
+	0x22654a,
+	0x22a705,
+	0x50a038c2,
+	0x2acc87,
+	0x50e2aa08,
+	0x216847,
+	0x2dcc85,
+	0x32d44a,
+	0x7c02,
+	0x25610b,
+	0x27d18a,
+	0x25fe46,
+	0x210f03,
+	0x36894d,
+	0x39bd0c,
+	0x2139cd,
+	0x24ec85,
+	0x376c85,
+	0x372e07,
+	0x218749,
+	0x225b86,
+	0x263b45,
+	0x2d7ec8,
+	0x28fc83,
+	0x2ecdc8,
+	0x28fc88,
+	0x2c6c47,
+	0x34c588,
+	0x39af89,
 	0x2de707,
-	0x2de70d,
-	0x221b83,
-	0x221b85,
-	0x302387,
-	0x398688,
-	0x301f45,
-	0x219788,
-	0x23dc86,
-	0x333947,
-	0x3c0645,
-	0x306d06,
-	0x3a4c85,
-	0x226bca,
-	0x2fe986,
-	0x22eec7,
-	0x2f04c5,
-	0x2ffc87,
-	0x303684,
-	0x30ae06,
-	0x3446c5,
-	0x357a0b,
-	0x2eadc9,
-	0x24bf4a,
-	0x229b88,
-	0x34c2c8,
-	0x34cb8c,
-	0x353847,
-	0x36f808,
-	0x387c08,
-	0x394205,
-	0x3a684a,
-	0x3b00c9,
-	0x51e01b42,
-	0x3c6646,
-	0x222e44,
-	0x222e49,
-	0x294f49,
-	0x276587,
-	0x2f9887,
-	0x2bf1c9,
-	0x285908,
-	0x28590f,
-	0x21dec6,
-	0x2d2c8b,
-	0x2f5645,
-	0x2f5647,
-	0x2f5c49,
-	0x25bbc6,
-	0x2d9b47,
-	0x2d5ec5,
-	0x234dc4,
-	0x341006,
-	0x226244,
-	0x2df647,
-	0x2ce808,
-	0x522f9a48,
-	0x2fa1c5,
-	0x2fa307,
-	0x24eb09,
-	0x20de44,
-	0x2473c8,
-	0x52716788,
-	0x201dc4,
-	0x235fc8,
-	0x3c2d04,
-	0x3bebc9,
-	0x21b2c5,
-	0x52a0e982,
-	0x21df05,
-	0x2cb8c5,
-	0x203008,
-	0x238507,
-	0x52e02a82,
-	0x339e45,
-	0x2cc586,
-	0x249746,
-	0x2f4708,
-	0x2f4c88,
-	0x2f82c6,
-	0x30a146,
-	0x385289,
-	0x32fd06,
-	0x29124b,
-	0x3478c5,
-	0x355c06,
-	0x28e088,
-	0x231bc6,
-	0x20a386,
-	0x219c4a,
-	0x2a91ca,
-	0x370c85,
-	0x241107,
-	0x30d0c6,
-	0x53206d02,
-	0x3024c7,
-	0x260505,
+	0x3129c7,
+	0x344648,
+	0x2e8184,
+	0x2e8187,
+	0x294948,
+	0x35d406,
+	0x35fecf,
+	0x239b07,
+	0x3559c6,
+	0x2318c5,
+	0x224c03,
+	0x24dcc7,
+	0x385943,
+	0x251d86,
+	0x2540c6,
+	0x254946,
+	0x293645,
+	0x26b9c3,
+	0x3a4408,
+	0x387d49,
+	0x39c6cb,
+	0x254ac8,
+	0x255c85,
+	0x257185,
+	0x51231ac2,
+	0x2aaf89,
+	0x224687,
+	0x25fd85,
+	0x25d0c7,
+	0x25f7c6,
+	0x37ed85,
+	0x260acb,
+	0x263004,
+	0x268ac5,
+	0x268c07,
+	0x279e06,
+	0x27a245,
+	0x2884c7,
+	0x289287,
+	0x2e4704,
+	0x28e0ca,
+	0x28eb08,
+	0x2bcf49,
+	0x23e5c5,
+	0x3654c6,
+	0x24bd0a,
+	0x256346,
+	0x26bf07,
+	0x2bcc0d,
+	0x2a5449,
+	0x3a3705,
+	0x373fc7,
+	0x390cc8,
+	0x390348,
+	0x39ba07,
+	0x20a206,
+	0x22c047,
+	0x252f03,
+	0x302e84,
+	0x37c905,
+	0x3a8d07,
+	0x3ace49,
+	0x23a4c8,
+	0x3cab05,
+	0x248344,
+	0x254c85,
+	0x2631cd,
+	0x205242,
+	0x2c20c6,
+	0x2ea446,
+	0x30d28a,
+	0x3936c6,
+	0x399d05,
+	0x205245,
+	0x205247,
+	0x3a7ccc,
+	0x2b314a,
+	0x28fa46,
+	0x2d9905,
+	0x28fbc6,
+	0x28ff07,
+	0x291bc6,
+	0x29354c,
+	0x224149,
+	0x51617bc7,
+	0x296585,
+	0x296586,
+	0x297188,
+	0x250d85,
+	0x2a6405,
+	0x2a6b88,
+	0x2a6d8a,
+	0x51a7e102,
+	0x51e0ebc2,
+	0x2d21c5,
+	0x277c03,
+	0x2497c8,
+	0x207983,
+	0x2a7004,
+	0x26880b,
+	0x209748,
+	0x303c48,
+	0x5238f309,
+	0x2abb09,
+	0x2ac246,
+	0x2ae888,
+	0x2aea89,
+	0x2af886,
+	0x2afa05,
+	0x24ea86,
+	0x2afec9,
+	0x392787,
+	0x3c6e06,
+	0x2d2787,
+	0x392a47,
+	0x21c844,
+	0x52712809,
+	0x284988,
+	0x3ba808,
+	0x391687,
+	0x2cb446,
+	0x218549,
+	0x2c6207,
+	0x258c0a,
+	0x25a188,
+	0x216f87,
+	0x217d46,
+	0x36560a,
+	0x39dd48,
+	0x2e9ec5,
+	0x229a45,
+	0x2fca87,
+	0x301f49,
+	0x379b0b,
+	0x31fe88,
+	0x392309,
+	0x254ec7,
+	0x2b974c,
+	0x2ba00c,
+	0x2ba30a,
+	0x2ba58c,
+	0x2c5ac8,
+	0x2c5cc8,
+	0x2c5ec4,
+	0x2c63c9,
+	0x2c6609,
+	0x2c684a,
+	0x2c6ac9,
+	0x2c6e07,
+	0x3b234c,
+	0x237e46,
+	0x2c98c8,
+	0x256406,
+	0x38db46,
+	0x3a3607,
+	0x3245c8,
+	0x3275cb,
+	0x216707,
+	0x238bc9,
+	0x380cc9,
+	0x252847,
+	0x25a904,
+	0x273887,
+	0x399546,
+	0x216046,
+	0x2f1c45,
+	0x24fc08,
+	0x293e84,
+	0x293e86,
+	0x2b300b,
+	0x32d049,
+	0x218946,
+	0x218bc9,
+	0x2128c6,
+	0x331f88,
+	0x225003,
+	0x301785,
+	0x23a2c9,
+	0x26b385,
+	0x303544,
+	0x279306,
+	0x241645,
+	0x258406,
+	0x30f707,
+	0x32b8c6,
+	0x22df4b,
+	0x386547,
+	0x256e86,
+	0x231dc6,
+	0x230086,
+	0x29fd49,
+	0x2ef90a,
+	0x2becc5,
+	0x2ed50d,
+	0x2a6e86,
+	0x2f7b06,
+	0x2f4646,
+	0x243485,
+	0x2e6e87,
+	0x2fe9c7,
+	0x38ebce,
+	0x272203,
+	0x2cb409,
+	0x388fc9,
+	0x2e5687,
+	0x26edc7,
+	0x29f2c5,
+	0x37aa45,
+	0x52b9648f,
+	0x2d1a87,
+	0x2d1c48,
+	0x2d2944,
+	0x2d2ec6,
+	0x52e4c442,
+	0x2d6fc6,
+	0x2d9fc6,
+	0x32790e,
+	0x2ecc0a,
+	0x207606,
+	0x3bb08a,
+	0x214789,
+	0x2444c5,
+	0x342a88,
+	0x350186,
+	0x29d848,
+	0x34ad88,
+	0x3a564b,
+	0x227305,
+	0x309548,
+	0x20930c,
+	0x2dcb47,
+	0x254306,
+	0x352d48,
+	0x2163c8,
+	0x53240e02,
+	0x20bbcb,
+	0x21d3c9,
+	0x21da89,
+	0x32cec7,
+	0x211648,
+	0x536236c8,
+	0x201b8b,
+	0x368589,
+	0x28744d,
+	0x24ee48,
+	0x35b508,
+	0x53a00ec2,
+	0x33d484,
+	0x53e30cc2,
+	0x2ff206,
+	0x54202dc2,
+	0x31b2ca,
+	0x208d86,
+	0x3ce588,
+	0x38a788,
+	0x399946,
+	0x2eed86,
+	0x2f8e86,
+	0x37acc5,
+	0x23da04,
+	0x5463aa04,
+	0x351e06,
+	0x27d9c7,
+	0x54ae6547,
+	0x35950b,
+	0x216a49,
+	0x376cca,
+	0x205384,
+	0x2bdac8,
+	0x3c6bcd,
+	0x2f2649,
+	0x2f2888,
+	0x2f2b09,
+	0x2f5b44,
 	0x24b6c4,
-	0x24b6c5,
-	0x357dc6,
-	0x271a47,
-	0x220105,
-	0x295004,
-	0x2ad5c8,
-	0x20a445,
-	0x309fc7,
-	0x3b1c45,
-	0x226b05,
-	0x268904,
-	0x2abac9,
-	0x2ff048,
-	0x399286,
-	0x2adc46,
-	0x201ac6,
-	0x536ff908,
-	0x2ffb07,
-	0x2ffe4d,
-	0x30074c,
-	0x300d49,
-	0x300f89,
-	0x53b65c82,
-	0x3b7e83,
-	0x2228c3,
-	0x2eb005,
-	0x39fd4a,
-	0x32fbc6,
-	0x3052c5,
-	0x308904,
-	0x30890b,
-	0x323e4c,
-	0x32488c,
-	0x324b95,
-	0x32754d,
-	0x32a68f,
-	0x32aa52,
-	0x32aecf,
-	0x32b292,
-	0x32b713,
-	0x32bbcd,
-	0x32c18d,
-	0x32c50e,
-	0x32ca8e,
-	0x32d2cc,
-	0x32d68c,
-	0x32dacb,
-	0x32de4e,
-	0x32e752,
-	0x32f98c,
-	0x32ff50,
-	0x33ba12,
-	0x33c68c,
-	0x33cd4d,
-	0x33d08c,
-	0x33f651,
-	0x34404d,
-	0x34ac8d,
-	0x34b28a,
-	0x34b50c,
-	0x34be0c,
-	0x34c4cc,
-	0x34ce8c,
-	0x350493,
-	0x350b10,
-	0x350f10,
-	0x351acd,
-	0x3520cc,
-	0x352dc9,
-	0x35518d,
-	0x3554d3,
-	0x356491,
-	0x3568d3,
-	0x35888f,
-	0x358c4c,
-	0x358f4f,
-	0x35930d,
-	0x35990f,
-	0x359cd0,
-	0x35a74e,
-	0x35df0e,
-	0x35e490,
-	0x35f08d,
-	0x35fa0e,
-	0x35fd8c,
-	0x360d93,
-	0x3628ce,
-	0x362f50,
-	0x363351,
-	0x36378f,
-	0x363b53,
-	0x36580d,
-	0x365b4f,
-	0x365f0e,
-	0x3665d0,
-	0x3669c9,
-	0x367d10,
-	0x36830f,
-	0x36898f,
-	0x368d52,
-	0x369e0e,
-	0x36a80d,
-	0x36ae8d,
-	0x36b1cd,
-	0x36c84d,
-	0x36cb8d,
-	0x36ced0,
-	0x36d2cb,
-	0x36e54c,
-	0x36e8cc,
-	0x36eecc,
-	0x36f1ce,
-	0x37bbd0,
-	0x37e012,
-	0x37e48b,
-	0x37e98e,
-	0x37ed0e,
-	0x37f58e,
-	0x37fa0b,
-	0x53f80196,
-	0x38104d,
-	0x3814d4,
-	0x38228d,
-	0x386915,
-	0x388c4d,
-	0x3895cf,
-	0x389ccf,
-	0x38ee0f,
-	0x38f1ce,
-	0x38f74d,
-	0x391891,
-	0x394b8c,
-	0x394e8c,
-	0x39518b,
-	0x39560c,
-	0x39654f,
-	0x396912,
-	0x39950d,
-	0x39ae0c,
-	0x39b94c,
-	0x39bc4d,
-	0x39bf8f,
-	0x39c34e,
-	0x39fa0c,
-	0x39ffcd,
-	0x3a030b,
-	0x3a0bcc,
-	0x3a14cd,
-	0x3a180e,
-	0x3a1b89,
-	0x3a3553,
-	0x3a3a8d,
-	0x3a3dcd,
-	0x3a43cc,
-	0x3a484e,
-	0x3a520f,
-	0x3a55cc,
-	0x3a58cd,
-	0x3a5c0f,
-	0x3a5fcc,
-	0x3a778c,
-	0x3a7b0c,
-	0x3a7e0c,
-	0x3a84cd,
-	0x3a8812,
-	0x3a8e8c,
-	0x3a918c,
-	0x3a9491,
-	0x3a98cf,
-	0x3a9c8f,
-	0x3aa053,
-	0x3ac70e,
-	0x3aca8f,
-	0x3ace4c,
-	0x543ad18e,
-	0x3ad50f,
-	0x3ad8d6,
-	0x3ae0d2,
-	0x3af8cc,
-	0x3b030f,
-	0x3b098d,
-	0x3b0ccf,
-	0x3b108c,
-	0x3b138d,
-	0x3b16cd,
-	0x3b2c8e,
-	0x3b3bcc,
-	0x3b3ecc,
-	0x3b41d0,
-	0x3b7211,
-	0x3b764b,
-	0x3b7a8c,
-	0x3b7d8e,
-	0x3baa91,
-	0x3baece,
-	0x3bb24d,
-	0x3c338b,
-	0x3c3c8f,
-	0x3c4794,
-	0x25cd82,
-	0x25cd82,
-	0x2032c3,
-	0x25cd82,
-	0x2032c3,
-	0x25cd82,
-	0x2009c2,
-	0x24e105,
-	0x3ba78c,
-	0x25cd82,
-	0x25cd82,
-	0x2009c2,
-	0x25cd82,
-	0x294b45,
-	0x2b09c5,
-	0x25cd82,
-	0x25cd82,
-	0x200302,
-	0x294b45,
-	0x328909,
-	0x35618c,
-	0x25cd82,
-	0x25cd82,
-	0x25cd82,
-	0x25cd82,
-	0x24e105,
-	0x25cd82,
-	0x25cd82,
-	0x25cd82,
-	0x25cd82,
-	0x200302,
-	0x328909,
-	0x25cd82,
-	0x25cd82,
-	0x25cd82,
-	0x2b09c5,
-	0x25cd82,
-	0x2b09c5,
-	0x35618c,
-	0x3ba78c,
-	0x2b6c03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x20ec83,
-	0x241d03,
-	0x1233c8,
-	0x6fac4,
-	0xae43,
-	0x193708,
-	0x200742,
-	0x55202c42,
-	0x246d03,
-	0x252d84,
-	0x206c03,
-	0x3c24c4,
-	0x234106,
-	0x2137c3,
-	0x2f9084,
-	0x2f0b05,
-	0x21f743,
-	0x20ec83,
-	0xaff03,
-	0x241d03,
-	0x22d50a,
-	0x253786,
-	0x37f08c,
-	0xcd588,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20be83,
-	0x2d0e06,
-	0x20ec83,
-	0x241d03,
-	0x219543,
-	0xa4d48,
-	0x117485,
-	0x187689,
-	0x15842,
-	0x56793ec5,
-	0x2aa47,
-	0xaf148,
-	0xd9ce,
-	0x87e92,
-	0x11b5cb,
-	0x102d06,
-	0x56ad2fc5,
-	0x56ed2fcc,
-	0x25147,
-	0x15da87,
-	0x1208ca,
-	0x42ed0,
-	0x149445,
-	0x10bfcb,
-	0x7e948,
-	0x3c2c7,
-	0xf400b,
-	0x78449,
-	0x127b07,
-	0x3a347,
-	0x760c7,
-	0x3c206,
-	0x67008,
-	0x57429546,
-	0xa964d,
-	0x120290,
-	0x5780a6c2,
-	0x1f6c8,
-	0x82dd0,
-	0x15b5cc,
-	0x57f61e0d,
-	0x5fbc8,
-	0x6b8c7,
-	0x164f49,
-	0x5b646,
-	0x946c8,
-	0xebfc2,
-	0x71e8a,
-	0x31047,
-	0x11d107,
-	0xa5a89,
-	0xa7708,
-	0xef4c5,
-	0xe85ce,
-	0x1260e,
-	0x1b98f,
-	0x25589,
-	0x52c49,
-	0x7e10b,
-	0x8ef4f,
-	0xabccc,
-	0x1125cb,
-	0x105848,
-	0xe1ac7,
-	0xf87c8,
-	0x132c8b,
-	0x15274c,
-	0x15af0c,
-	0x1625cc,
-	0x16784d,
-	0x142188,
-	0xfcdc2,
-	0x1970c9,
-	0x133acb,
-	0xc3146,
-	0x12e28b,
-	0xd560a,
-	0xd61c5,
-	0xdae90,
-	0xdd606,
-	0x140806,
-	0x14a345,
-	0x18a988,
-	0xe3d47,
-	0xe4007,
-	0x1fcc7,
-	0xf7c4a,
-	0xaefca,
-	0x7dac6,
-	0x9088d,
-	0x6e308,
-	0x1be608,
-	0x68849,
-	0xb7cc5,
-	0xf778c,
-	0x167a4b,
-	0x16ab84,
-	0xfec89,
-	0xfeec6,
-	0x4cb06,
-	0x4182,
-	0x157206,
-	0x14634b,
-	0x10ac87,
-	0xdc2,
-	0xc5105,
-	0x16704,
-	0x781,
-	0x7bc3,
-	0x572a6d06,
-	0x94a43,
-	0x2542,
-	0x31044,
-	0x602,
-	0x8b304,
-	0xcc2,
-	0x7ec2,
-	0x3102,
-	0x114902,
-	0x3cc2,
-	0xd2fc2,
-	0x3c02,
-	0xefa02,
-	0x3e242,
-	0x4ac2,
-	0x2e02,
-	0x4c3c2,
-	0x37583,
-	0x1f02,
-	0x1b02,
-	0x8882,
-	0x12c42,
-	0x1402,
-	0x35c02,
-	0x552c2,
-	0x6202,
-	0x3882,
-	0x1342,
-	0x14bc3,
-	0x5842,
-	0x1102,
-	0xb0102,
-	0x9602,
-	0x1542,
-	0x4482,
-	0xe302,
-	0x6f582,
-	0x1e42,
-	0x17c0c2,
-	0x6cd82,
-	0x3a3c2,
-	0xec83,
+	0x261d05,
+	0x310c0b,
+	0x2096c6,
+	0x351c45,
+	0x221109,
+	0x227508,
+	0x23ab84,
+	0x2e5409,
+	0x356d05,
+	0x2c3108,
+	0x313087,
+	0x325c48,
+	0x285a06,
+	0x38e807,
+	0x2de209,
+	0x366d09,
+	0x358e05,
+	0x24d2c5,
+	0x54e17002,
+	0x2fa8c4,
+	0x22da45,
+	0x227106,
+	0x306b45,
+	0x29adc7,
+	0x351f05,
+	0x279e44,
+	0x323a06,
+	0x27dac7,
+	0x22f406,
+	0x319205,
+	0x21b448,
+	0x227a85,
+	0x224e87,
+	0x22a4c9,
+	0x32d18a,
+	0x282b07,
+	0x282b0c,
+	0x2b4706,
+	0x248149,
+	0x24e905,
+	0x250cc8,
+	0x204683,
+	0x210605,
+	0x399205,
+	0x281607,
+	0x55223142,
+	0x2ee587,
+	0x2f2186,
+	0x33ac86,
+	0x2f7346,
+	0x216306,
+	0x356f88,
+	0x23e3c5,
+	0x355a87,
+	0x355a8d,
+	0x220ac3,
+	0x220ac5,
+	0x309e07,
+	0x2ee8c8,
+	0x3099c5,
+	0x21aa48,
+	0x3942c6,
+	0x2dbe87,
+	0x2c9805,
+	0x227386,
+	0x3ad4c5,
+	0x22594a,
+	0x347e06,
+	0x3cf5c7,
+	0x2da9c5,
+	0x2fdf87,
+	0x2ff344,
+	0x3034c6,
+	0x3429c5,
+	0x21364b,
+	0x3993c9,
+	0x39e50a,
+	0x358e88,
+	0x3c7448,
+	0x30e5cc,
+	0x314607,
+	0x347508,
+	0x34bf08,
+	0x34d145,
+	0x37f18a,
+	0x3a6ac9,
+	0x556035c2,
+	0x3cb386,
+	0x264304,
+	0x334849,
+	0x297c09,
+	0x27afc7,
+	0x2c4d87,
+	0x20c909,
+	0x243688,
+	0x24368f,
+	0x22ca46,
+	0x2db98b,
+	0x3b7785,
+	0x3b7787,
+	0x2fd1c9,
+	0x268946,
+	0x2e5387,
+	0x2e1205,
+	0x2330c4,
+	0x26b246,
+	0x222ec4,
+	0x2e9807,
+	0x32fc08,
+	0x55b01508,
+	0x301c85,
+	0x301dc7,
+	0x31a149,
+	0x218f04,
+	0x246cc8,
+	0x55e58a48,
+	0x206d84,
+	0x2fae08,
+	0x38fc44,
+	0x39b489,
+	0x219b85,
+	0x562061c2,
+	0x22ca85,
+	0x2d4cc5,
+	0x373e08,
+	0x236547,
+	0x566008c2,
+	0x23ab45,
+	0x2d5786,
+	0x244d06,
+	0x2fa888,
+	0x2fc108,
+	0x306b06,
+	0x3ad9c6,
+	0x3cdfc9,
+	0x33abc6,
+	0x294f0b,
+	0x276c45,
+	0x2a8146,
+	0x2ec448,
+	0x295746,
+	0x22f186,
+	0x21af0a,
+	0x2abeca,
+	0x2634c5,
+	0x23e487,
+	0x315246,
+	0x56a09642,
+	0x309f47,
+	0x262305,
+	0x24bc84,
+	0x24bc85,
+	0x2bd9c6,
+	0x273107,
+	0x21f3c5,
+	0x24fc84,
+	0x305788,
+	0x22f245,
+	0x2e2047,
+	0x3af3c5,
+	0x225885,
+	0x2a60c4,
+	0x31df49,
+	0x2f6dc8,
+	0x241506,
+	0x2d31c6,
+	0x206a86,
+	0x56fbe708,
+	0x3c72c7,
+	0x30728d,
+	0x3081cc,
+	0x3087c9,
+	0x308a09,
+	0x57374ac2,
+	0x3c5f43,
+	0x20a2c3,
+	0x399605,
+	0x3a8e0a,
+	0x33aa86,
+	0x30ce45,
+	0x30f8c4,
+	0x30f8cb,
+	0x32e90c,
+	0x32fe0c,
+	0x330115,
+	0x330fcd,
+	0x334a8f,
+	0x334e52,
+	0x3352cf,
+	0x335692,
+	0x335b13,
+	0x335fcd,
+	0x33658d,
+	0x33690e,
+	0x336e8e,
+	0x3376cc,
+	0x337a8c,
+	0x337ecb,
+	0x338dce,
+	0x3396d2,
+	0x33a84c,
+	0x33ae10,
+	0x344fd2,
+	0x345c4c,
+	0x34630d,
+	0x34664c,
+	0x3495d1,
+	0x34b88d,
+	0x34decd,
+	0x34e4ca,
+	0x34e74c,
+	0x34fa0c,
+	0x35194c,
+	0x35238c,
+	0x35a0d3,
+	0x35a750,
+	0x35ab50,
+	0x35b70d,
+	0x35bd0c,
+	0x35cac9,
+	0x35e14d,
+	0x35e493,
+	0x360851,
+	0x360c93,
+	0x36184f,
+	0x361c0c,
+	0x361f0f,
+	0x3622cd,
+	0x3628cf,
+	0x362c90,
+	0x36370e,
+	0x366f4e,
+	0x3674d0,
+	0x369b0d,
+	0x36a48e,
+	0x36a80c,
+	0x36b7d3,
+	0x36d2ce,
+	0x36d950,
+	0x36dd51,
+	0x36e18f,
+	0x36e553,
+	0x37464d,
+	0x37498f,
+	0x374d4e,
+	0x375410,
+	0x375809,
+	0x376f50,
+	0x37754f,
+	0x377bcf,
+	0x377f92,
+	0x378cce,
+	0x3796cd,
+	0x379dcd,
+	0x37a10d,
+	0x37b30d,
+	0x37b64d,
+	0x37b990,
+	0x37bd8b,
+	0x37c6cc,
+	0x37ca4c,
+	0x37d04c,
+	0x37d34e,
+	0x38a990,
+	0x38bf12,
+	0x38c38b,
+	0x38c88e,
+	0x38cc0e,
+	0x38d48e,
+	0x38d90b,
+	0x5778e116,
+	0x3933cd,
+	0x393854,
+	0x39460d,
+	0x395e95,
+	0x39790d,
+	0x39828f,
+	0x39890f,
+	0x39c98f,
+	0x39cd4e,
+	0x39d2cd,
+	0x3a0851,
+	0x3a2dcc,
+	0x3a30cc,
+	0x3a33cb,
+	0x3a384c,
+	0x3a3c0f,
+	0x3a3fd2,
+	0x3a4d8d,
+	0x3a630c,
+	0x3a6d0c,
+	0x3a700d,
+	0x3a734f,
+	0x3a770e,
+	0x3a8acc,
+	0x3a908d,
+	0x3a93cb,
+	0x3a9c8c,
+	0x3aa58d,
+	0x3aa8ce,
+	0x3aac49,
+	0x3abd93,
+	0x3ac2cd,
+	0x3ac60d,
+	0x3acc0c,
+	0x3ad08e,
+	0x3add0f,
+	0x3ae0cc,
+	0x3ae3cd,
+	0x3ae70f,
+	0x3aeacc,
+	0x3af50c,
+	0x3af88c,
+	0x3afb8c,
+	0x3b024d,
+	0x3b0592,
+	0x3b0c0c,
+	0x3b0f0c,
+	0x3b1211,
+	0x3b164f,
+	0x3b1a0f,
+	0x3b1dd3,
+	0x3b278e,
+	0x3b2b0f,
+	0x3b2ecc,
+	0x57bb320e,
+	0x3b358f,
+	0x3b3956,
+	0x3b4cd2,
+	0x3b6f8c,
+	0x3b794f,
+	0x3b7fcd,
+	0x3bd78f,
+	0x3bdb4c,
+	0x3bde4d,
+	0x3be18d,
+	0x3bf70e,
+	0x3c09cc,
+	0x3c238c,
+	0x3c2690,
+	0x3c52d1,
+	0x3c570b,
+	0x3c5b4c,
+	0x3c5e4e,
+	0x3c7951,
+	0x3c7d8e,
+	0x3c810d,
+	0x3ccccb,
+	0x3cd5cf,
+	0x3cfa94,
+	0x25cfc2,
+	0x25cfc2,
+	0x209303,
+	0x25cfc2,
+	0x209303,
+	0x25cfc2,
+	0x202c02,
+	0x24eac5,
+	0x3c764c,
+	0x25cfc2,
+	0x25cfc2,
+	0x202c02,
+	0x25cfc2,
+	0x297805,
+	0x32d185,
+	0x25cfc2,
+	0x25cfc2,
+	0x212802,
+	0x297805,
+	0x332189,
+	0x36054c,
+	0x25cfc2,
+	0x25cfc2,
+	0x25cfc2,
+	0x25cfc2,
+	0x24eac5,
+	0x25cfc2,
+	0x25cfc2,
+	0x25cfc2,
+	0x25cfc2,
+	0x212802,
+	0x332189,
+	0x25cfc2,
+	0x25cfc2,
+	0x25cfc2,
+	0x32d185,
+	0x25cfc2,
+	0x32d185,
+	0x36054c,
+	0x3c764c,
+	0x203a83,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x222103,
+	0x2482c3,
+	0x1732c8,
+	0x5aa84,
+	0x182c3,
+	0xc9008,
+	0x2000c2,
+	0x58a07c02,
+	0x246603,
+	0x25a0c4,
+	0x202b03,
+	0x21ee44,
+	0x232406,
+	0x215903,
+	0x300c44,
+	0x2d3dc5,
+	0x272203,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0x2ed18a,
+	0x25cb86,
+	0x38cf8c,
+	0x1513c8,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x20d203,
+	0x2d9fc6,
+	0x222103,
+	0x2482c3,
+	0x21a803,
+	0xa7d88,
+	0xf4d45,
+	0x1c4589,
+	0x3742,
+	0x59efddc5,
+	0xf4d45,
+	0x39e47,
+	0x70748,
+	0xe9ce,
+	0x8bfd2,
+	0x308b,
+	0x102b46,
+	0x5a28e505,
+	0x5a68e50c,
+	0x3e707,
+	0xdf5c7,
+	0xbe28a,
+	0x41790,
+	0x192bc5,
+	0xb1b8b,
+	0x83b88,
+	0x37707,
+	0x59d4b,
+	0x7e409,
+	0x131587,
+	0x112187,
+	0x7a6c7,
+	0x37646,
+	0x6a488,
+	0x5ac39c86,
+	0x4f147,
+	0x15974d,
+	0xbdc50,
+	0x5b00b782,
+	0x7c748,
+	0x5e890,
+	0x180a4c,
+	0x5b789b4d,
+	0x60fc8,
+	0x6144b,
+	0x6e407,
+	0x5a649,
+	0x5c786,
+	0x97388,
+	0x5642,
+	0x7354a,
+	0x82987,
+	0x76007,
+	0xa8709,
+	0xaa248,
+	0x111a45,
+	0xf3b0e,
+	0x261ce,
+	0x15758f,
+	0x157cc9,
+	0x5f3c9,
+	0x8334b,
+	0x967cf,
+	0xafbcc,
+	0x11cd4b,
+	0xcff88,
+	0xf34c7,
+	0x100f08,
+	0x13b78b,
+	0x13eecc,
+	0x15c38c,
+	0x163ecc,
+	0x16ce0d,
+	0x168708,
+	0xc7782,
+	0x1a4789,
+	0x148108,
+	0x1a1f0b,
+	0xcb646,
+	0xd510b,
+	0x13920b,
+	0xe094a,
+	0xe1505,
+	0xe6b90,
+	0xe8646,
+	0x12c986,
+	0x127cc5,
+	0x165807,
+	0xf9388,
+	0xeef07,
+	0xef1c7,
+	0xfd007,
+	0xff04a,
+	0x15124a,
+	0xea506,
+	0x944cd,
+	0x4f208,
+	0x10bbc8,
+	0xa6009,
+	0xb8c45,
+	0xfeb8c,
+	0x16d00b,
+	0x179a44,
+	0x106ec9,
+	0x107106,
+	0x156186,
+	0xbb8c6,
+	0x3582,
+	0x44a06,
+	0x5f4b,
+	0x114487,
+	0x1242,
+	0xcdf45,
+	0x1e904,
+	0x101,
+	0x62c43,
+	0x5aa77dc6,
+	0x97703,
+	0x382,
+	0x1f84,
+	0x8e82,
+	0x8a904,
+	0x882,
+	0x34c2,
+	0xbc2,
+	0x120542,
+	0xf82,
+	0x8e502,
+	0xae02,
+	0x2d42,
+	0x39082,
+	0x1d2c2,
+	0x3282,
+	0x11702,
+	0x355c3,
+	0x942,
+	0x6ac2,
+	0x19902,
+	0x1482,
+	0x642,
+	0x33842,
+	0x586c2,
+	0x7842,
+	0x15642,
+	0x5c2,
+	0x19a43,
+	0xb02,
+	0x2c82,
+	0xb38c2,
+	0xb2c2,
+	0x4942,
+	0xe7c2,
+	0x16182,
+	0x9f702,
 	0x2002,
-	0x53982,
-	0x1382,
-	0x6e02,
-	0x29a85,
-	0x8302,
-	0x48602,
-	0x44303,
-	0x982,
-	0x16f02,
-	0x1282,
-	0x4042,
-	0xed42,
-	0x2a82,
-	0xc842,
-	0x4182,
-	0x1f8c5,
-	0x582009c2,
-	0x587696c3,
-	0x1fbc3,
-	0x58a009c2,
-	0x1fbc3,
-	0x179487,
-	0x215383,
-	0x200742,
-	0x20be03,
-	0x237583,
-	0x203d43,
-	0x201fc3,
-	0x20be83,
-	0x20ec83,
-	0x20ae43,
-	0x241d03,
-	0x294a83,
-	0x10ec3,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x203d43,
-	0x21f743,
-	0x20ec83,
-	0x20ae43,
-	0xaff03,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x200541,
-	0x21f743,
-	0x20ec83,
-	0x228803,
-	0x241d03,
-	0x3744,
-	0x2b6c03,
-	0x20be03,
-	0x237583,
-	0x21f6c3,
-	0x203d43,
-	0x257e43,
-	0x26b143,
-	0x2a2c83,
-	0x280e83,
-	0x30e843,
-	0x26ff84,
-	0x20ec83,
-	0x241d03,
-	0x203f83,
-	0x31e084,
-	0x250b03,
-	0x5583,
-	0x22d443,
-	0x332388,
-	0x325384,
-	0x2023ca,
-	0x238f06,
-	0x10a904,
-	0x37a147,
-	0x22174a,
-	0x21dd89,
-	0x3ade07,
-	0x3b628a,
-	0x2b6c03,
-	0x2d750b,
-	0x293609,
-	0x201bc5,
-	0x34e347,
+	0x126302,
+	0x6f582,
+	0xbf82,
+	0x22103,
+	0x602,
+	0x40e02,
+	0x1a42,
+	0x1202,
+	0x158d85,
+	0x9dc2,
+	0x4c42,
+	0x43dc3,
+	0x682,
+	0x4e42,
+	0x1002,
 	0x2c42,
-	0x20be03,
-	0x214447,
-	0x2fb145,
-	0x2f2a09,
-	0x237583,
-	0x306a86,
-	0x2c0c03,
-	0xeae83,
-	0x107f06,
-	0x122746,
-	0x13747,
-	0x2176c6,
-	0x227045,
-	0x39e607,
-	0x2d2107,
-	0x5b30e843,
-	0x33c8c7,
-	0x371fc3,
-	0x20fb85,
-	0x26ff84,
-	0x26ed48,
-	0x36a50c,
-	0x2ad885,
-	0x2a2886,
-	0x214307,
-	0x345847,
-	0x252e47,
-	0x254d08,
-	0x30600f,
-	0x3371c5,
-	0x246e07,
-	0x37c407,
-	0x2a424a,
-	0x2cebc9,
-	0x308045,
-	0x30b7ca,
-	0x136686,
-	0x2c0c85,
-	0x36c104,
-	0x2bdf86,
-	0x2f1a47,
-	0x382947,
-	0x348748,
-	0x21b545,
-	0x2fb046,
-	0x21d105,
-	0x36dd45,
-	0x289684,
-	0x326bc7,
-	0x2eb24a,
-	0x23fc48,
-	0x366446,
-	0xbe83,
-	0x2d8345,
-	0x318a86,
-	0x3b4e86,
-	0x34a246,
-	0x21f743,
-	0x399787,
-	0x37c385,
-	0x20ec83,
-	0x2d58cd,
-	0x20ae43,
-	0x348848,
-	0x38c844,
-	0x275b05,
-	0x2a4146,
-	0x23d186,
-	0x355b07,
-	0x204a07,
-	0x289085,
-	0x241d03,
-	0x3268c7,
-	0x3650c9,
-	0x340a49,
-	0x30dc0a,
-	0x249a82,
-	0x20fb44,
-	0x2de284,
-	0x349b07,
-	0x398208,
-	0x2e4f89,
-	0x221a49,
-	0x2e5dc7,
-	0x35c346,
-	0xe8346,
-	0x2e9484,
-	0x2e9a8a,
-	0x2edc08,
-	0x2efc09,
-	0x2de106,
-	0x2b1985,
-	0x23fb08,
-	0x2c358a,
-	0x2b5d83,
-	0x31e206,
-	0x2e5ec7,
-	0x2311c5,
-	0x38c705,
-	0x3a26c3,
-	0x2702c4,
-	0x22b985,
-	0x282ac7,
-	0x2ff185,
-	0x337c86,
-	0x14aa05,
-	0x2a3203,
-	0x3b8a09,
-	0x2758cc,
-	0x2ca74c,
-	0x2cbb08,
-	0x2baec7,
-	0x2fbc08,
-	0x2fc24a,
-	0x2fcc4b,
-	0x293748,
-	0x23c908,
-	0x23d286,
-	0x201985,
-	0x320fca,
-	0x369705,
-	0x20e982,
-	0x3c0507,
-	0x261146,
-	0x367405,
-	0x36b749,
-	0x277385,
-	0x36d785,
-	0x35c909,
-	0x3189c6,
-	0x3b6988,
-	0x20fc43,
-	0x217806,
-	0x274c46,
-	0x30a485,
-	0x30a489,
-	0x2e56c9,
-	0x251b47,
-	0x10c984,
-	0x30c987,
-	0x221949,
-	0x23d605,
-	0x40788,
-	0x346245,
-	0x332285,
-	0x3c1309,
-	0x203402,
-	0x250904,
-	0x203c82,
-	0x205842,
-	0x3c0d85,
-	0x30a688,
-	0x2b7c05,
-	0x2c2483,
-	0x2c2485,
-	0x2ce1c3,
-	0x20ff02,
-	0x208f84,
-	0x2c7d03,
-	0x206f02,
-	0x340484,
-	0x2def43,
-	0x204882,
-	0x21fc43,
-	0x28cb84,
-	0x2f01c3,
-	0x256784,
-	0x200a02,
-	0x219443,
-	0x21d403,
-	0x206a42,
-	0x2f4682,
-	0x2e5509,
-	0x20ad42,
-	0x2889c4,
-	0x200442,
-	0x23f984,
-	0x35c304,
-	0x287304,
-	0x204182,
-	0x23c542,
-	0x3295c3,
-	0x23b943,
-	0x24d644,
-	0x2b5c04,
-	0x2eddc4,
-	0x30b6c4,
-	0x309043,
-	0x335a83,
-	0x336604,
-	0x30eac4,
-	0x30f306,
-	0x2145c2,
-	0x202c42,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x200742,
-	0x2b6c03,
-	0x20be03,
-	0x237583,
-	0x201b03,
-	0x30e843,
-	0x26ff84,
-	0x2e57c4,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x219543,
-	0x2ea0c4,
-	0x31a803,
-	0x2a6503,
-	0x36aac4,
-	0x346046,
-	0x20b583,
-	0x15da87,
-	0x22fac3,
-	0x21e903,
-	0x2b0c43,
-	0x20fbc3,
-	0x20be83,
-	0x339d45,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x210e03,
-	0x2333c3,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x214bc3,
-	0x20ec83,
-	0x238184,
-	0xaff03,
-	0x241d03,
-	0x209944,
-	0x2bdd85,
-	0x15da87,
-	0x202c42,
-	0x209d42,
-	0x202542,
-	0x2032c2,
-	0xae43,
-	0x200342,
-	0x20be03,
-	0x23d744,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x226444,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0x207c03,
-	0x28b304,
-	0xcd588,
-	0x20be03,
-	0x20ae43,
-	0x10ec3,
-	0x13b5c4,
-	0x253404,
-	0xcd588,
-	0x20be03,
-	0x254a04,
-	0x26ff84,
-	0x20ae43,
-	0x2056c2,
-	0x241d03,
-	0x24f3c3,
-	0x702c4,
-	0x2f5805,
-	0x20e982,
-	0x30ec03,
-	0xf89,
-	0xd3686,
-	0xfcc8,
-	0x200742,
-	0xcd588,
-	0x202c42,
-	0x237583,
-	0x30e843,
-	0x201342,
-	0xae43,
-	0x241d03,
-	0x200742,
-	0x1b6447,
-	0x11c889,
-	0x5483,
-	0xcd588,
-	0x1226c3,
-	0x5f33d587,
-	0xbe03,
-	0x1c6548,
-	0x237583,
-	0x30e843,
-	0x178d46,
-	0x214bc3,
-	0x5b388,
-	0xc0248,
-	0x40e06,
-	0x21f743,
-	0xc6788,
-	0x97c03,
-	0xdbd45,
-	0x37787,
-	0xec83,
-	0x6c83,
-	0x41d03,
-	0x4bc2,
-	0x16c18a,
-	0x1c0e43,
-	0x30c5c4,
-	0x105e0b,
-	0x1063c8,
-	0x8d302,
-	0x200742,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x2d2484,
-	0x30e843,
-	0x214bc3,
-	0x21f743,
-	0x20ec83,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20be83,
-	0x20ec83,
-	0x241d03,
-	0x209943,
-	0x207c03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x10ec3,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x20be83,
-	0x20ec83,
-	0x241d03,
-	0x230882,
+	0x16302,
+	0x8c2,
+	0xab42,
+	0x3582,
+	0xc105,
+	0x5ba02c02,
+	0x5bfba083,
+	0x11783,
+	0x5c202c02,
+	0x11783,
+	0x85307,
+	0x2141c3,
+	0x2000c2,
+	0x20d183,
+	0x2355c3,
+	0x3d0443,
+	0x2005c3,
+	0x20d203,
+	0x222103,
+	0x2182c3,
+	0x2482c3,
+	0x297743,
+	0x15dc3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x3d0443,
+	0x272203,
+	0x222103,
+	0x2182c3,
+	0xe6003,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x200181,
+	0x272203,
+	0x222103,
+	0x252ec3,
+	0x2482c3,
+	0x174544,
+	0x203a83,
+	0x20d183,
+	0x2355c3,
+	0x211e83,
+	0x3d0443,
+	0x281503,
+	0x241c03,
+	0x2aad43,
+	0x2bd583,
+	0x214d83,
+	0x224604,
+	0x222103,
+	0x2482c3,
+	0x2020c3,
+	0x202544,
+	0x2633c3,
+	0x8403,
+	0x3c3103,
+	0x2034c8,
+	0x307c84,
+	0x20020a,
+	0x23ce06,
+	0x114104,
+	0x3783c7,
+	0x22068a,
+	0x22c909,
+	0x3a8807,
+	0x3b3e8a,
+	0x203a83,
+	0x2d224b,
+	0x2bd4c9,
+	0x206b85,
+	0x33a687,
+	0x7c02,
+	0x20d183,
+	0x222347,
+	0x353005,
+	0x2c6049,
+	0x2355c3,
+	0x2bb306,
+	0x2c5303,
+	0xf2203,
+	0x10e9c6,
+	0x172646,
+	0x15887,
+	0x228c46,
+	0x31bf45,
+	0x20ba87,
+	0x30c387,
+	0x5ea14d83,
+	0x345e87,
+	0x2bb9c3,
+	0x249545,
+	0x224604,
+	0x270e08,
+	0x3793cc,
+	0x33eb45,
+	0x2a55c6,
+	0x222207,
+	0x229307,
+	0x256fc7,
+	0x25f5c8,
+	0x30d98f,
+	0x3924c5,
+	0x246707,
+	0x28f1c7,
+	0x28f30a,
+	0x2d7d09,
+	0x30a285,
+	0x30eb0a,
+	0x1919c6,
+	0x2c5385,
+	0x37b204,
+	0x38a6c6,
+	0x2e31c7,
+	0x2c7687,
+	0x38ef08,
+	0x225005,
+	0x352f06,
+	0x23a105,
+	0x2382c5,
+	0x28de44,
+	0x399847,
+	0x356dca,
+	0x242788,
+	0x375286,
+	0xd203,
+	0x2e2845,
+	0x35fd06,
+	0x3b2586,
+	0x327bc6,
+	0x272203,
+	0x3a5007,
+	0x28f145,
+	0x222103,
+	0x2e0c0d,
+	0x2182c3,
+	0x38f008,
+	0x388644,
+	0x27a105,
+	0x2a7046,
+	0x21d146,
+	0x2a8047,
+	0x2aad87,
+	0x365cc5,
+	0x2482c3,
+	0x2f35c7,
+	0x25a7c9,
+	0x32cbc9,
+	0x2123ca,
+	0x20c0c2,
+	0x249504,
+	0x2e8b84,
+	0x327487,
+	0x2ee448,
+	0x2f0149,
+	0x220989,
+	0x2f1287,
+	0x2ebb86,
+	0xf3886,
+	0x2f5b44,
+	0x2f614a,
+	0x2f86c8,
+	0x2f8d49,
+	0x30e186,
+	0x2b5805,
+	0x242648,
+	0x2cba8a,
+	0x295a83,
+	0x2026c6,
+	0x2f1387,
+	0x22f985,
+	0x388505,
+	0x3ab783,
+	0x271dc4,
+	0x229a05,
+	0x289387,
+	0x2f6f05,
+	0x2fc946,
+	0x106a05,
+	0x2076c3,
+	0x2076c9,
+	0x279ecc,
+	0x2e004c,
+	0x2d4f08,
+	0x2bf987,
+	0x3028c8,
+	0x30424a,
+	0x304c4b,
+	0x2bd608,
+	0x21d248,
+	0x237d46,
+	0x206945,
+	0x20498a,
+	0x3ba0c5,
+	0x2061c2,
+	0x2c96c7,
+	0x254606,
+	0x3764c5,
+	0x37a689,
+	0x27bdc5,
+	0x3862c5,
+	0x2ec149,
+	0x35fc46,
+	0x3b4588,
+	0x249603,
+	0x228d86,
+	0x279246,
+	0x313c85,
+	0x313c89,
+	0x2f0889,
+	0x280687,
+	0x116204,
+	0x316207,
+	0x220889,
+	0x2380c5,
+	0x3db08,
+	0x33d745,
+	0x36f045,
+	0x259549,
+	0x205a42,
+	0x282544,
+	0x200f42,
+	0x200b02,
+	0x2c7805,
+	0x313e88,
+	0x2b8b85,
+	0x2c6fc3,
+	0x2c6fc5,
+	0x2d71c3,
+	0x20f7c2,
+	0x24af84,
+	0x2a9943,
+	0x210482,
+	0x34a404,
+	0x2e9103,
+	0x2054c2,
+	0x2b8c03,
+	0x290e84,
+	0x2f9303,
+	0x2605c4,
+	0x204fc2,
+	0x21a703,
+	0x238b03,
+	0x200b42,
+	0x2d48c2,
+	0x2f06c9,
+	0x203502,
+	0x28cd44,
+	0x200cc2,
+	0x2424c4,
+	0x2ebb44,
+	0x206404,
+	0x203582,
+	0x237982,
+	0x231703,
+	0x304a03,
+	0x24cec4,
+	0x295904,
+	0x2f1504,
+	0x2f8884,
+	0x310003,
+	0x324183,
+	0x391944,
+	0x317a04,
+	0x317b46,
+	0x22bd82,
+	0x40d83,
+	0x207c02,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x2000c2,
+	0x203a83,
+	0x20d183,
+	0x2355c3,
+	0x206ac3,
+	0x214d83,
+	0x224604,
+	0x2f0984,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x21a803,
+	0x2f68c4,
+	0x329903,
+	0x2a9183,
+	0x379984,
+	0x33d546,
+	0x20b403,
+	0xf4d45,
+	0xdf5c7,
+	0x31e283,
+	0x5fe21448,
+	0x22d483,
+	0x2b4c43,
+	0x249583,
+	0x20d203,
+	0x39b745,
+	0x13a643,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x210f83,
+	0x2311c3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x219a43,
+	0x222103,
+	0x2361c4,
+	0xe6003,
+	0x2482c3,
+	0x3664c4,
+	0xf4d45,
+	0x2c24c5,
+	0xdf5c7,
+	0x207c02,
+	0x206042,
+	0x200382,
+	0x201402,
+	0x182c3,
+	0x2003c2,
+	0x170c04,
+	0x20d183,
+	0x2385c4,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x2bf0c4,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x215e83,
+	0x28a904,
+	0x1513c8,
+	0x20d183,
+	0x2182c3,
+	0x15dc3,
+	0x146b44,
+	0x248084,
+	0x1513c8,
+	0x20d183,
+	0x2526c4,
+	0x224604,
+	0x2182c3,
+	0x200ec2,
+	0xe6003,
+	0x2482c3,
+	0x206103,
+	0x71dc4,
+	0x3c0045,
+	0x2061c2,
+	0x205ec3,
+	0x4389,
+	0xdd706,
+	0x191b08,
+	0x2000c2,
+	0x1513c8,
+	0x207c02,
+	0x2355c3,
+	0x214d83,
+	0x2005c2,
+	0x182c3,
+	0x2482c3,
+	0xe182,
+	0x2000c2,
+	0x1b4047,
+	0x107a89,
+	0x8303,
+	0x1513c8,
+	0x1725c3,
+	0x63752987,
+	0xd183,
+	0x1cb288,
+	0x2355c3,
+	0x214d83,
+	0x46486,
+	0x219a43,
+	0x92288,
+	0xc4948,
+	0x3e186,
+	0x272203,
+	0xcf388,
+	0x9ae43,
+	0x638e1d06,
+	0xe7685,
+	0x357c7,
+	0x22103,
+	0x95c3,
+	0x482c3,
+	0x6442,
+	0x1940ca,
+	0x19743,
+	0xc78c3,
+	0x2fc4c4,
+	0x10d78b,
+	0x10dd48,
+	0x91542,
+	0x14581c7,
+	0x1590b47,
+	0x14c7088,
+	0x1517643,
+	0x14a94b,
+	0x12b507,
+	0x2000c2,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x2db184,
+	0x214d83,
+	0x219a43,
+	0x272203,
+	0x222103,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x20d203,
+	0x222103,
+	0x2482c3,
+	0x284743,
+	0x215e83,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x15dc3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x20d203,
+	0x222103,
+	0x2482c3,
+	0x22e042,
+	0x2000c1,
+	0x2000c2,
+	0x200201,
+	0x334b82,
+	0x1513c8,
+	0x21f145,
 	0x200101,
-	0x200742,
-	0x200301,
-	0x32a782,
-	0xcd588,
-	0x21fe85,
-	0x200781,
-	0xbe03,
-	0x2014c1,
+	0xd183,
+	0x200d81,
+	0x200501,
+	0x201481,
+	0x24ea42,
+	0x385944,
+	0x24ea43,
 	0x200041,
-	0x200141,
-	0x24e082,
-	0x378184,
-	0x24e083,
-	0x201401,
-	0x200901,
-	0x200541,
-	0x200a81,
-	0x316307,
-	0x337dcf,
-	0x2fa486,
-	0x200641,
-	0x33b606,
-	0x200081,
-	0x2001c1,
-	0x3c35ce,
-	0x200341,
-	0x241d03,
-	0x201681,
-	0x254285,
-	0x204bc2,
-	0x3a25c5,
-	0x2002c1,
-	0x200a01,
+	0x200801,
+	0x200181,
+	0x200701,
+	0x2f4bc7,
+	0x2f898f,
+	0x37f3c6,
+	0x2004c1,
+	0x346b86,
+	0x200d01,
+	0x200581,
+	0x3ccf0e,
+	0x2003c1,
+	0x2482c3,
+	0x204c41,
+	0x247705,
+	0x206442,
+	0x3ab685,
 	0x200401,
-	0x20e982,
-	0x200441,
-	0x203f81,
-	0x20d601,
-	0x201181,
-	0x200dc1,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x21a003,
-	0x20be03,
-	0x30e843,
-	0x8d248,
-	0x21f743,
-	0x20ec83,
-	0x5e8c3,
-	0x241d03,
-	0x14e0f48,
-	0x10d08,
-	0xcd588,
-	0xae43,
-	0x24704,
-	0x4cec4,
-	0x14e0f4a,
-	0xcd588,
-	0xaff03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x20ec83,
-	0x241d03,
-	0x205583,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x2d2484,
-	0x241d03,
-	0x252385,
-	0x317c44,
-	0x20be03,
-	0x20ec83,
-	0x241d03,
-	0x2fc8a,
-	0xfd504,
-	0x112a46,
-	0x202c42,
-	0x20be03,
-	0x234d09,
-	0x237583,
-	0x2a82c9,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x2e9288,
-	0x397b87,
-	0x2f5805,
-	0x1b7888,
-	0x1b6447,
-	0x19848a,
-	0x101d0b,
-	0x13b847,
-	0x45388,
-	0x3a80a,
-	0x13dc8,
-	0x11c889,
-	0x2b847,
-	0x67fc7,
-	0x1c28c8,
-	0x1c6548,
-	0x470cf,
-	0x26505,
-	0x1c6847,
-	0x178d46,
-	0x4c207,
-	0x108186,
-	0x5b388,
-	0x9b986,
-	0x1187c7,
-	0x142349,
-	0x1b5207,
-	0xe68c9,
-	0xb8209,
-	0xbdb06,
-	0xc0248,
-	0xbeb45,
-	0x77fca,
-	0xc6788,
-	0x97c03,
-	0xcea08,
-	0x37787,
-	0x1ac045,
-	0x4dc90,
-	0x6c83,
-	0xaff03,
-	0x1c3147,
-	0x1d5c5,
-	0xe4308,
-	0x605c5,
-	0x1c0e43,
-	0x142748,
-	0x132146,
-	0x199bc9,
-	0xaab87,
-	0x124b,
-	0x137a84,
-	0xfe3c4,
-	0x105e0b,
-	0x1063c8,
-	0x107e07,
-	0x117485,
-	0x20be03,
-	0x237583,
-	0x203d43,
-	0x241d03,
-	0x244a03,
-	0x30e843,
-	0xaff03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x7e24b,
-	0x200742,
-	0x202c42,
-	0x241d03,
-	0xcd588,
-	0x200742,
-	0x202c42,
-	0x202542,
-	0x201342,
-	0x200b82,
-	0x20ec83,
-	0x200342,
-	0x200742,
-	0x2b6c03,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x202542,
-	0x30e843,
-	0x214bc3,
-	0x21f743,
-	0x226444,
-	0x20ec83,
-	0x207783,
-	0x241d03,
-	0x30c5c4,
-	0x203f83,
-	0x30e843,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x20ae43,
-	0x241d03,
-	0x3afd87,
-	0x20be03,
-	0x279947,
-	0x2e6686,
-	0x216543,
-	0x208883,
-	0x30e843,
-	0x204d03,
-	0x26ff84,
-	0x38b344,
-	0x2b9906,
-	0x20c743,
-	0x20ec83,
-	0x241d03,
-	0x252385,
-	0x309e84,
-	0x320dc3,
-	0x20d203,
-	0x3c0507,
-	0x23b1c5,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x98747,
-	0x2149c2,
-	0x26e443,
-	0x20df43,
-	0x2b6c03,
-	0x6760be03,
+	0x200741,
+	0x2007c1,
+	0x2061c2,
+	0x200081,
+	0x2020c1,
+	0x207b01,
+	0x2018c1,
+	0x201241,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x21b2c3,
+	0x20d183,
+	0x214d83,
+	0x91488,
+	0x272203,
+	0x222103,
+	0x7783,
+	0x2482c3,
+	0x14eacc8,
+	0x10e88,
+	0xf4d45,
+	0x1513c8,
+	0x182c3,
+	0xf4d45,
+	0x1445c4,
+	0x4c604,
+	0x14eacca,
+	0x1513c8,
+	0xe6003,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x222103,
+	0x2482c3,
+	0x208403,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x2db184,
+	0x2482c3,
+	0x280ec5,
+	0x35ebc4,
+	0x20d183,
+	0x222103,
+	0x2482c3,
+	0xa7e8a,
+	0x116584,
+	0x11d1c6,
+	0x207c02,
+	0x20d183,
+	0x233009,
+	0x2355c3,
+	0x20a749,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x7d904,
+	0x182c3,
+	0x2482c3,
+	0x2f5948,
+	0x243347,
+	0x3c0045,
+	0x1c5948,
+	0x1b4047,
+	0xee6ca,
+	0x10978b,
+	0x146dc7,
+	0x452c8,
+	0x11264a,
+	0x17808,
+	0x107a89,
+	0x298c7,
+	0x156bc7,
+	0x126248,
+	0x1cb288,
+	0x469cf,
+	0x157345,
+	0x1cb587,
+	0x46486,
+	0x19e7c7,
+	0x10a3c6,
+	0x92288,
+	0xa2f86,
+	0x15fa47,
+	0x125649,
+	0x1b4a47,
+	0x1012c9,
+	0xb92c9,
+	0xc2246,
+	0xc4948,
+	0xc3245,
+	0x7df8a,
+	0xcf388,
+	0x9ae43,
+	0xd7b48,
+	0x357c7,
+	0x75a85,
+	0x64dd0,
+	0x95c3,
+	0xe6003,
+	0x1254c7,
+	0x2c145,
+	0xef4c8,
+	0x6c345,
+	0xc78c3,
+	0x5588,
+	0x59406,
+	0x153989,
+	0xaec87,
+	0x464b,
+	0x141044,
+	0x106444,
+	0x10d78b,
+	0x10dd48,
+	0x10e8c7,
+	0xf4d45,
+	0x20d183,
+	0x2355c3,
+	0x3d0443,
+	0x2482c3,
+	0x206003,
+	0x214d83,
+	0xe6003,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x8348b,
+	0x2000c2,
+	0x207c02,
+	0x2482c3,
+	0x1513c8,
+	0x2000c2,
+	0x207c02,
+	0x200382,
+	0x2005c2,
+	0x200d02,
+	0x222103,
+	0x2003c2,
+	0x2000c2,
+	0x203a83,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x200382,
+	0x214d83,
+	0x219a43,
+	0x272203,
+	0x2bf0c4,
+	0x222103,
+	0x214b83,
+	0x182c3,
+	0x2482c3,
+	0x2fc4c4,
+	0x2020c3,
+	0x214d83,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2182c3,
+	0x2482c3,
+	0x3b7447,
+	0x20d183,
+	0x20fa47,
+	0x301086,
+	0x20fb03,
+	0x219903,
+	0x214d83,
+	0x207483,
+	0x224604,
+	0x399e44,
+	0x2e9c46,
+	0x2109c3,
+	0x222103,
+	0x2482c3,
+	0x280ec5,
+	0x2ad2c4,
+	0x2be783,
+	0x20ddc3,
+	0x2c96c7,
+	0x313005,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x5b3c7,
+	0x165807,
+	0x1a2505,
+	0x221bc2,
+	0x24f343,
+	0x219003,
+	0x203a83,
+	0x6ca0d183,
+	0x201c42,
+	0x2355c3,
+	0x202b03,
+	0x214d83,
+	0x224604,
+	0x308103,
+	0x3924c3,
+	0x272203,
+	0x2bf0c4,
+	0x6ce039c2,
+	0x222103,
+	0x2482c3,
+	0x233903,
+	0x21e903,
+	0x22e042,
+	0x2020c3,
+	0x1513c8,
+	0x214d83,
+	0x15dc3,
+	0x32a1c4,
+	0x203a83,
+	0x207c02,
+	0x20d183,
+	0x2385c4,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x219a43,
+	0x310884,
+	0x215584,
+	0x2d9fc6,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x21a803,
+	0x254606,
+	0x3f08b,
+	0x39c86,
+	0x1ceaca,
+	0x11490a,
+	0x1513c8,
+	0x23a0c4,
+	0x6e20d183,
+	0x203a44,
+	0x2355c3,
+	0x25a644,
+	0x214d83,
+	0x2bd943,
+	0x272203,
+	0x222103,
+	0xe6003,
+	0x2482c3,
+	0xca4c3,
+	0x3415cb,
+	0x3be4ca,
+	0x3d0ecc,
+	0xe25c8,
+	0x2000c2,
+	0x207c02,
+	0x200382,
+	0x230285,
+	0x224604,
+	0x202002,
+	0x272203,
+	0x215584,
+	0x201402,
+	0x2003c2,
+	0x207bc2,
+	0x22e042,
+	0x3a83,
+	0x4ce42,
+	0x2b6409,
+	0x333ec8,
+	0x214c09,
+	0x21c689,
+	0x227e0a,
+	0x319f4a,
+	0x20c382,
+	0x202d42,
+	0x7c02,
+	0x20d183,
+	0x203382,
+	0x2468c6,
+	0x377a42,
+	0x201ec2,
+	0x309b0e,
+	0x21a74e,
+	0x282087,
+	0x222087,
+	0x2853c2,
+	0x2355c3,
+	0x214d83,
+	0x208002,
+	0x2005c2,
+	0x19883,
+	0x2387cf,
+	0x246c02,
+	0x305607,
+	0x2b0d87,
+	0x320047,
+	0x2b4fcc,
+	0x2df18c,
+	0x229f04,
+	0x261b4a,
+	0x21a682,
 	0x20b2c2,
-	0x237583,
-	0x206c03,
-	0x30e843,
-	0x26ff84,
-	0x3c32c3,
-	0x3371c3,
-	0x21f743,
-	0x226444,
-	0x67a02f02,
-	0x20ec83,
-	0x241d03,
-	0x235cc3,
-	0x214c43,
-	0x230882,
-	0x203f83,
-	0xcd588,
-	0x30e843,
-	0x10ec3,
-	0x31b0c4,
-	0x2b6c03,
-	0x202c42,
-	0x20be03,
-	0x23d744,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x214bc3,
-	0x39e304,
-	0x21a484,
-	0x2d0e06,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x219543,
-	0x261146,
-	0x4170b,
-	0x29546,
-	0xeb94a,
-	0x10b34a,
-	0xcd588,
-	0x21d0c4,
-	0x68e0be03,
-	0x2b6bc4,
-	0x237583,
-	0x268984,
-	0x30e843,
-	0x357d43,
-	0x21f743,
-	0x20ec83,
-	0xaff03,
-	0x241d03,
-	0x55a43,
-	0x33840b,
-	0x3b1a0a,
-	0x3c580c,
-	0xd80c8,
-	0x200742,
-	0x202c42,
-	0x202542,
-	0x232585,
-	0x26ff84,
-	0x201e42,
-	0x21f743,
-	0x21a484,
-	0x2032c2,
-	0x200342,
+	0x2babc4,
+	0x200702,
+	0x218ac2,
+	0x2df3c4,
+	0x2180c2,
+	0x204942,
+	0x24f03,
+	0x2a3007,
+	0x242305,
+	0x216182,
+	0x30cd84,
+	0x326302,
+	0x2e1e88,
+	0x222103,
+	0x3d20c8,
+	0x203242,
+	0x22a0c5,
+	0x396d46,
+	0x2482c3,
+	0x209dc2,
+	0x2f0387,
+	0x6442,
+	0x25fb85,
+	0x209b45,
+	0x202202,
+	0x212a82,
+	0x2bc7ca,
+	0x365b4a,
+	0x2721c2,
+	0x29cec4,
+	0x202cc2,
+	0x2493c8,
+	0x211a02,
+	0x2af008,
+	0x30a547,
+	0x30ab09,
+	0x209bc2,
+	0x30f685,
+	0x20a445,
+	0x2250cb,
+	0x2cc70c,
+	0x22dd08,
+	0x32b348,
+	0x22bd82,
+	0x2a8102,
+	0x2000c2,
+	0x1513c8,
 	0x207c02,
-	0x230882,
-	0xb6c03,
-	0x4d5c2,
-	0x386389,
-	0x3a3088,
-	0x310449,
-	0x34e049,
-	0x23e48a,
-	0x24e90a,
-	0x219382,
-	0x2efa02,
-	0x2c42,
-	0x20be03,
-	0x230a42,
-	0x246fc6,
-	0x368802,
-	0x207582,
-	0x30208e,
-	0x21948e,
-	0x27bf47,
-	0x20ec07,
-	0x2e89c2,
-	0x237583,
-	0x30e843,
-	0x209182,
-	0x201342,
-	0x6ff83,
-	0x23d94f,
-	0x247302,
-	0x2f9507,
-	0x2ad447,
-	0x314407,
-	0x2b0fcc,
-	0x2b9b8c,
-	0x207144,
-	0x27d34a,
-	0x2193c2,
-	0x209602,
-	0x2b9844,
-	0x2028c2,
-	0x2c10c2,
-	0x2b9dc4,
-	0x217f42,
-	0x201542,
-	0xf003,
-	0x29ba07,
-	0x233805,
-	0x20e302,
-	0x24c184,
-	0x37c0c2,
-	0x2d7c88,
-	0x20ec83,
-	0x39f108,
-	0x206a82,
-	0x207305,
-	0x388206,
-	0x241d03,
-	0x208302,
-	0x2e51c7,
-	0x4bc2,
-	0x272585,
-	0x204905,
-	0x212182,
-	0x2030c2,
-	0x293c0a,
-	0x288f0a,
-	0x23a382,
-	0x29a184,
-	0x2040c2,
-	0x20fa08,
-	0x200d82,
-	0x39d588,
-	0x302ac7,
-	0x3038c9,
-	0x204982,
-	0x3086c5,
-	0x36ba05,
-	0x21b60b,
-	0x2c418c,
-	0x230548,
-	0x31c188,
-	0x2145c2,
-	0x355bc2,
-	0x200742,
-	0xcd588,
-	0x202c42,
-	0x20be03,
-	0x202542,
-	0x2032c2,
-	0xae43,
-	0x200342,
-	0x241d03,
+	0x20d183,
+	0x200382,
+	0x201402,
+	0x182c3,
+	0x2003c2,
+	0x2482c3,
+	0x207bc2,
+	0x2000c2,
+	0xf4d45,
+	0x6f607c02,
+	0x6fa14d83,
+	0x224f03,
+	0x202002,
+	0x222103,
+	0x3c92c3,
+	0x6fe482c3,
+	0x2eca43,
+	0x285406,
+	0x1615e83,
+	0xf4d45,
+	0x14a4cb,
+	0x1513c8,
+	0x71f87,
+	0x70547,
+	0x127cc5,
+	0xaa94d,
+	0xa8bca,
+	0x165987,
+	0x2e484,
+	0x2e4c3,
+	0xbb944,
+	0x70601902,
+	0x70a08e82,
+	0x70e01742,
+	0x71200fc2,
+	0x71615402,
+	0x71a00f82,
+	0xdf5c7,
+	0x71e07c02,
+	0x72206182,
+	0x72620f02,
+	0x72a03282,
+	0x21a743,
+	0x2a344,
+	0x2318c3,
+	0x72e16002,
+	0x60fc8,
+	0x732051c2,
+	0x52f07,
+	0x73600042,
+	0x73a04142,
+	0x73e00182,
+	0x74200d42,
+	0x74615642,
+	0x74a005c2,
+	0x13c385,
+	0x227a43,
+	0x312104,
+	0x74e00702,
+	0x75218e42,
+	0x75600e42,
+	0x3b04b,
+	0x75a02a82,
+	0x76252782,
+	0x76602002,
+	0x76a00d02,
+	0x76e2a542,
+	0x77203202,
+	0x77606282,
+	0x77a6f582,
+	0x77e039c2,
+	0x78201dc2,
+	0x78601402,
+	0x78a12c82,
+	0x78e0c6c2,
+	0x79214ec2,
+	0xe5e44,
+	0x33cf83,
+	0x79625482,
+	0x79a1a382,
+	0x79e13e42,
+	0x7a2006c2,
+	0x7a6003c2,
+	0x7aa10482,
+	0x83607,
+	0x7ae08642,
+	0x7b2024c2,
+	0x7b607bc2,
+	0x7ba1a702,
+	0xfeb8c,
+	0x7be05102,
+	0x7c22b042,
+	0x7c602942,
+	0x7ca09642,
+	0x7ce0a2c2,
+	0x7d213a42,
+	0x7d603682,
+	0x7da07802,
+	0x7de795c2,
+	0x7e279b42,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x26cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x75f08103,
+	0x226cc3,
+	0x39b7c4,
+	0x333dc6,
+	0x2fa803,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x3b5809,
+	0x24ce42,
+	0x3a4a83,
+	0x2b95c3,
+	0x373d85,
+	0x202b03,
+	0x308103,
+	0x226cc3,
+	0x2a3983,
+	0x202cc3,
+	0x3c3f89,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x24ce42,
+	0x24ce42,
+	0x308103,
+	0x226cc3,
+	0x7ea0d183,
+	0x2355c3,
+	0x21c8c3,
+	0x272203,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x1513c8,
 	0x207c02,
-	0x200742,
-	0x6a202c42,
-	0x6a70e843,
-	0x20f003,
-	0x201e42,
-	0x20ec83,
-	0x338c03,
-	0x241d03,
-	0x2e2d83,
-	0x379586,
-	0x1607c03,
-	0xcd588,
-	0x6e247,
-	0x14a345,
-	0xa7e0d,
-	0xa5f4a,
-	0x85047,
-	0x6ae00a42,
-	0x6b200602,
-	0x6b600282,
-	0x6ba02b82,
-	0x6be12442,
-	0x6c203cc2,
-	0x15da87,
-	0x6c602c42,
-	0x6ca1b282,
-	0x6ce1f9c2,
-	0x6d202e02,
-	0x219483,
-	0x22644,
-	0x282dc3,
-	0x6d615902,
-	0x6da039c2,
-	0x55087,
-	0x6de02202,
-	0x6e200902,
-	0x6e600542,
-	0x6ea07d02,
-	0x6ee03882,
-	0x6f201342,
-	0xc0f85,
-	0x24c4c3,
-	0x23a2c4,
-	0x6f6028c2,
-	0x6fa0dd82,
-	0x6fe00682,
-	0xb714b,
-	0x702000c2,
-	0x70a54ac2,
-	0x70e01e42,
-	0x71200b82,
-	0x71603282,
-	0x71a05a02,
-	0x71e0d682,
-	0x7226cd82,
-	0x72602f02,
-	0x72a04d42,
-	0x72e032c2,
-	0x7323e0c2,
-	0x7362a402,
-	0x73a11e82,
-	0xafd44,
-	0x339b43,
-	0x73e0e882,
-	0x742190c2,
-	0x74606482,
-	0x74a02882,
-	0x74e00342,
-	0x75206f02,
-	0x7e3c7,
-	0x756057c2,
-	0x75a00502,
-	0x75e07c02,
-	0x76209f82,
-	0xf778c,
-	0x76627882,
-	0x76a2c0c2,
-	0x76e0a902,
-	0x77206d02,
-	0x77611d82,
-	0x77a3e602,
-	0x77e0fc42,
-	0x78213802,
-	0x78674fc2,
-	0x78a4f1c2,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x11343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x707c32c3,
-	0x211343,
-	0x339dc4,
-	0x3a2f86,
-	0x2f0ec3,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x200189,
-	0x24d5c2,
-	0x391283,
-	0x2b8503,
-	0x202f85,
-	0x206c03,
-	0x3c32c3,
-	0x211343,
-	0x29ea43,
-	0x233d43,
-	0x3bd849,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x24d5c2,
-	0x24d5c2,
-	0x3c32c3,
-	0x211343,
-	0x7920be03,
-	0x237583,
-	0x332683,
-	0x21f743,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0xcd588,
-	0x202c42,
-	0x20be03,
-	0x20ec83,
-	0x241d03,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x21f743,
-	0x20ec83,
-	0xae43,
-	0x241d03,
-	0x253404,
-	0x202c42,
-	0x20be03,
-	0x322183,
-	0x237583,
-	0x254a04,
-	0x203d43,
-	0x30e843,
-	0x26ff84,
-	0x214bc3,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x24f3c3,
-	0x2f5805,
-	0x233d43,
-	0x203f83,
-	0xae43,
-	0x202c42,
-	0x20be03,
-	0x3c32c3,
-	0x20ec83,
-	0x241d03,
-	0x200742,
-	0x2b6c03,
-	0xcd588,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x234106,
-	0x26ff84,
-	0x214bc3,
-	0x226444,
-	0x20ec83,
-	0x241d03,
-	0x219543,
-	0x20be03,
-	0x237583,
-	0x20ec83,
-	0x241d03,
-	0x144be47,
-	0x20be03,
-	0x29546,
-	0x237583,
-	0x30e843,
-	0xd91c6,
-	0x20ec83,
-	0x241d03,
-	0x318fc8,
-	0x31bfc9,
-	0x330349,
-	0x33af08,
-	0x38a348,
-	0x38a349,
-	0x22c10d,
-	0x24b00f,
-	0x2ec510,
-	0x354d0d,
-	0x36ebcc,
-	0x38bc4b,
-	0xaf148,
-	0xc7bc5,
-	0x200742,
-	0x23b005,
-	0x20bfc3,
-	0x7c602c42,
-	0x237583,
-	0x30e843,
-	0x2d7ac7,
-	0x20fbc3,
-	0x21f743,
-	0x20ec83,
-	0x228803,
-	0x20c0c3,
-	0x20ae43,
-	0x241d03,
-	0x253786,
-	0x20e982,
-	0x203f83,
-	0xcd588,
-	0x200742,
-	0x2b6c03,
-	0x202c42,
-	0x20be03,
-	0x237583,
-	0x30e843,
-	0x26ff84,
-	0x21f743,
-	0x20ec83,
-	0x241d03,
-	0x207c03,
-	0xf84,
-	0x154ab06,
-	0x200742,
-	0x202c42,
-	0x30e843,
-	0x21f743,
-	0x241d03,
+	0x20d183,
+	0x222103,
+	0x2482c3,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x272203,
+	0x222103,
+	0x182c3,
+	0x2482c3,
+	0x248084,
+	0x207c02,
+	0x20d183,
+	0x371b83,
+	0x2355c3,
+	0x2526c4,
+	0x3d0443,
+	0x214d83,
+	0x224604,
+	0x219a43,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x206103,
+	0x3c0045,
+	0x202cc3,
+	0x2020c3,
+	0x182c3,
+	0x207c02,
+	0x20d183,
+	0x308103,
+	0x222103,
+	0x2482c3,
+	0x2000c2,
+	0x203a83,
+	0x1513c8,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x232406,
+	0x224604,
+	0x219a43,
+	0x2bf0c4,
+	0x222103,
+	0x2482c3,
+	0x21a803,
+	0x20d183,
+	0x2355c3,
+	0x222103,
+	0x2482c3,
+	0x159e407,
+	0xc107,
+	0x20d183,
+	0x39c86,
+	0x2355c3,
+	0x214d83,
+	0xe4286,
+	0x222103,
+	0x2482c3,
+	0x3280c8,
+	0x32b189,
+	0x33bb49,
+	0x342708,
+	0x398f88,
+	0x398f89,
+	0x31eeca,
+	0x35c84a,
+	0x39494a,
+	0x39aa0a,
+	0x3be4ca,
+	0x3ca14b,
+	0x24b3cd,
+	0x3644cf,
+	0x274a10,
+	0x35dccd,
+	0x37cd4c,
+	0x39a74b,
+	0x70748,
+	0xfad08,
+	0xd4705,
+	0xcdf45,
+	0x2000c2,
+	0x312e45,
+	0x20a483,
+	0x82207c02,
+	0x2355c3,
+	0x214d83,
+	0x38b6c7,
+	0x249583,
+	0x272203,
+	0x222103,
+	0x252ec3,
+	0x20d443,
+	0x2182c3,
+	0x2482c3,
+	0x25cb86,
+	0x2061c2,
+	0x2020c3,
+	0x1513c8,
+	0x2000c2,
+	0x203a83,
+	0x207c02,
+	0x20d183,
+	0x2355c3,
+	0x214d83,
+	0x224604,
+	0x272203,
+	0x222103,
+	0x2482c3,
+	0x215e83,
+	0x4384,
+	0x14f82c6,
+	0x2000c2,
+	0x207c02,
+	0x214d83,
+	0x272203,
+	0x2482c3,
 }
 
 // children is the list of nodes' children, the parent's wildcard bit and the
@@ -9032,503 +9223,526 @@ var children = [...]uint32{
 	0x60000000,
 	0x185460f,
 	0x1858615,
-	0x187c616,
-	0x19d861f,
-	0x19ec676,
-	0x1a0067b,
-	0x1a14680,
-	0x1a34685,
-	0x1a3868d,
-	0x1a5068e,
-	0x1a78694,
-	0x1a7c69e,
-	0x1a9469f,
-	0x1a986a5,
-	0x1a9c6a6,
-	0x1ad86a7,
-	0x1adc6b6,
-	0x21ae46b7,
-	0x1b2c6b9,
-	0x1b306cb,
-	0x1b506cc,
-	0x1b646d4,
-	0x1b686d9,
-	0x1b986da,
-	0x1bb46e6,
-	0x1bdc6ed,
-	0x1bec6f7,
-	0x1bf06fb,
-	0x1c886fc,
-	0x1c9c722,
+	0x185c616,
+	0x1880617,
+	0x19dc620,
+	0x19f4677,
+	0x1a0867d,
+	0x1a1c682,
+	0x1a3c687,
+	0x1a4068f,
+	0x1a58690,
+	0x1a5c696,
+	0x1a84697,
+	0x1a886a1,
+	0x1aa06a2,
+	0x1aa46a8,
+	0x1aa86a9,
+	0x1ae46aa,
+	0x1ae86b9,
+	0x61af06ba,
+	0x21af86bc,
+	0x1b406be,
+	0x1b446d0,
+	0x1b646d1,
+	0x1b786d9,
+	0x1b7c6de,
+	0x1bac6df,
+	0x1bc86eb,
+	0x1bf06f2,
+	0x1c006fc,
+	0x1c04700,
+	0x1c9c701,
 	0x1cb0727,
-	0x1ce072c,
-	0x1cf0738,
-	0x1d0473c,
-	0x1da8741,
-	0x1fa076a,
-	0x1fa47e8,
-	0x20107e9,
-	0x207c804,
-	0x209481f,
-	0x20a8825,
-	0x20b082a,
-	0x20c482c,
-	0x20c8831,
-	0x20e4832,
-	0x2134839,
-	0x215084d,
-	0x2154854,
-	0x2158855,
-	0x2174856,
-	0x21b085d,
-	0x621b486c,
-	0x21cc86d,
-	0x21e0873,
-	0x21e4878,
-	0x21f4879,
-	0x22a487d,
-	0x22a88a9,
-	0x222b88aa,
-	0x222bc8ae,
-	0x222c08af,
-	0x22f88b0,
-	0x22fc8be,
-	0x278c8bf,
-	0x228349e3,
-	0x22838a0d,
-	0x2283ca0e,
-	0x22848a0f,
-	0x2284ca12,
-	0x22858a13,
-	0x2285ca16,
-	0x22860a17,
-	0x22864a18,
-	0x22868a19,
-	0x2286ca1a,
-	0x22878a1b,
-	0x2287ca1e,
-	0x22888a1f,
-	0x2288ca22,
-	0x22890a23,
+	0x1cc472c,
+	0x1cf4731,
+	0x1d0473d,
+	0x1d18741,
+	0x1dbc746,
+	0x1fb876f,
+	0x1fbc7ee,
+	0x20287ef,
+	0x209480a,
+	0x20ac825,
+	0x20c082b,
+	0x20c8830,
+	0x20dc832,
+	0x20e0837,
+	0x20fc838,
+	0x214883f,
+	0x2164852,
+	0x2168859,
+	0x216c85a,
+	0x219085b,
+	0x21cc864,
+	0x621d0873,
+	0x21e8874,
+	0x220087a,
+	0x2208880,
+	0x2218882,
+	0x22c8886,
+	0x22cc8b2,
+	0x222dc8b3,
+	0x222e08b7,
+	0x222e48b8,
+	0x23288b9,
+	0x232c8ca,
+	0x27e88cb,
+	0x228909fa,
 	0x22894a24,
-	0x228a0a25,
-	0x228a4a28,
-	0x228b0a29,
-	0x228b4a2c,
+	0x22898a25,
+	0x228a4a26,
+	0x228a8a29,
+	0x228b4a2a,
 	0x228b8a2d,
 	0x228bca2e,
-	0x28c0a2f,
+	0x228c0a2f,
 	0x228c4a30,
-	0x228d0a31,
-	0x228d4a34,
-	0x28dca35,
-	0x291ca37,
-	0x2293ca47,
-	0x22940a4f,
-	0x22944a50,
-	0x2948a51,
-	0x2294ca52,
-	0x2950a53,
-	0x296ca54,
-	0x2984a5b,
-	0x2988a61,
-	0x2998a62,
-	0x29a4a66,
-	0x29d8a69,
-	0x29dca76,
-	0x29f0a77,
-	0x229f8a7c,
-	0x2ab8a7e,
-	0x22abcaae,
-	0x2ac4aaf,
-	0x2ac8ab1,
-	0x2ae0ab2,
-	0x2af4ab8,
-	0x2b1cabd,
-	0x2b3cac7,
-	0x2b6cacf,
-	0x2b94adb,
-	0x2b98ae5,
-	0x2bbcae6,
-	0x2bc0aef,
-	0x2bd4af0,
-	0x2bd8af5,
-	0x2bdcaf6,
-	0x2bfcaf7,
-	0x2c1caff,
-	0x2c20b07,
-	0x22c24b08,
-	0x2c28b09,
-	0x2c2cb0a,
-	0x2c3cb0b,
-	0x2c40b0f,
-	0x2cb8b10,
+	0x228c8a31,
+	0x228d4a32,
+	0x228d8a35,
+	0x228e4a36,
+	0x228e8a39,
+	0x228eca3a,
+	0x228f0a3b,
+	0x228fca3c,
+	0x22900a3f,
+	0x2290ca40,
+	0x22910a43,
+	0x22914a44,
+	0x22918a45,
+	0x291ca46,
+	0x22920a47,
+	0x2292ca48,
+	0x22930a4b,
+	0x2938a4c,
+	0x297ca4e,
+	0x2299ca5f,
+	0x229a0a67,
+	0x229a4a68,
+	0x229a8a69,
+	0x29aca6a,
+	0x229b0a6b,
+	0x29b8a6c,
+	0x29bca6e,
+	0x29c0a6f,
+	0x29dca70,
+	0x29f4a77,
+	0x29f8a7d,
+	0x2a08a7e,
+	0x2a14a82,
+	0x2a48a85,
+	0x2a4ca92,
+	0x2a64a93,
+	0x22a6ca99,
+	0x22a70a9b,
+	0x22a78a9c,
+	0x2b50a9e,
+	0x22b54ad4,
+	0x2b5cad5,
+	0x2b60ad7,
+	0x22b64ad8,
+	0x2b68ad9,
+	0x2b80ada,
+	0x2b94ae0,
+	0x2bbcae5,
+	0x2bdcaef,
+	0x2c0caf7,
+	0x2c34b03,
+	0x2c38b0d,
+	0x2c5cb0e,
+	0x2c60b17,
+	0x2c74b18,
+	0x2c78b1d,
+	0x2c7cb1e,
+	0x2c9cb1f,
+	0x2cb8b27,
 	0x2cbcb2e,
-	0x2cd8b2f,
-	0x2ce8b36,
-	0x2cfcb3a,
-	0x2d14b3f,
-	0x2d2cb45,
-	0x2d44b4b,
-	0x2d48b51,
-	0x2d60b52,
-	0x2d7cb58,
-	0x2d9cb5f,
-	0x2db4b67,
-	0x2e14b6d,
-	0x2e30b85,
-	0x2e38b8c,
-	0x2e3cb8e,
-	0x2e50b8f,
-	0x2e94b94,
-	0x2f14ba5,
-	0x2f40bc5,
-	0x2f44bd0,
-	0x2f4cbd1,
-	0x2f6cbd3,
-	0x2f70bdb,
-	0x2f94bdc,
-	0x2f9cbe5,
-	0x2fd8be7,
-	0x301cbf6,
-	0x3020c07,
-	0x3094c08,
-	0x3098c25,
-	0x2309cc26,
-	0x230a0c27,
-	0x230a4c28,
-	0x230b4c29,
-	0x230b8c2d,
-	0x230bcc2e,
-	0x230c0c2f,
-	0x230c4c30,
-	0x30dcc31,
-	0x3100c37,
-	0x3120c40,
-	0x36e4c48,
-	0x36f0db9,
-	0x3710dbc,
-	0x38ccdc4,
-	0x399ce33,
-	0x3a0ce67,
-	0x3a64e83,
-	0x3b4ce99,
-	0x3ba4ed3,
-	0x3be0ee9,
-	0x3cdcef8,
-	0x3da8f37,
-	0x3e40f6a,
-	0x3ed0f90,
-	0x3f34fb4,
-	0x416cfcd,
-	0x422505b,
-	0x42f1089,
-	0x433d0bc,
-	0x43c50cf,
-	0x44010f1,
-	0x4451100,
-	0x44c9114,
-	0x644cd132,
-	0x644d1133,
-	0x644d5134,
-	0x4551135,
-	0x45ad154,
-	0x462916b,
-	0x46a118a,
-	0x47211a8,
-	0x478d1c8,
-	0x48b91e3,
-	0x491122e,
-	0x64915244,
-	0x49ad245,
-	0x4a3526b,
-	0x4a8128d,
-	0x4ae92a0,
-	0x4b912ba,
-	0x4c592e4,
-	0x4cc1316,
-	0x4dd5330,
-	0x64dd9375,
-	0x64ddd376,
-	0x4e39377,
-	0x4e9538e,
-	0x4f253a5,
-	0x4fa13c9,
-	0x4fe53e8,
-	0x50c93f9,
-	0x50fd432,
-	0x515d43f,
-	0x51d1457,
-	0x5259474,
-	0x5299496,
-	0x53094a6,
-	0x6530d4c2,
-	0x53314c3,
-	0x53354cc,
-	0x534d4cd,
-	0x53694d3,
-	0x53ad4da,
-	0x53bd4eb,
-	0x53d54ef,
-	0x544d4f5,
-	0x5455513,
-	0x5469515,
-	0x548551a,
-	0x54b1521,
-	0x54b552c,
-	0x54bd52d,
-	0x54d152f,
-	0x54ed534,
-	0x54f953b,
-	0x550153e,
-	0x553d540,
-	0x555154f,
-	0x5559554,
-	0x5565556,
-	0x556d559,
-	0x559155b,
-	0x55b5564,
-	0x55cd56d,
-	0x55d1573,
-	0x55d9574,
-	0x55dd576,
-	0x5645577,
-	0x5649591,
-	0x566d592,
-	0x569159b,
-	0x56ad5a4,
-	0x56bd5ab,
-	0x56d15af,
-	0x56d55b4,
-	0x56dd5b5,
-	0x56f15b7,
-	0x57015bc,
-	0x57055c0,
-	0x57215c1,
-	0x5fb15c8,
-	0x5fe97ec,
-	0x60157fa,
-	0x6031805,
-	0x605180c,
-	0x6071814,
-	0x60b581c,
-	0x60bd82d,
-	0x260c182f,
-	0x260c5830,
-	0x60cd831,
-	0x6245833,
-	0x26249891,
-	0x26259892,
-	0x26261896,
-	0x2626d898,
-	0x627189b,
-	0x627589c,
-	0x629d89d,
-	0x62c58a7,
-	0x62c98b1,
-	0x63018b2,
-	0x63218c0,
-	0x6e798c8,
-	0x6e7db9e,
-	0x6e81b9f,
-	0x26e85ba0,
-	0x6e89ba1,
-	0x26e8dba2,
-	0x6e91ba3,
-	0x26e9dba4,
-	0x6ea1ba7,
-	0x6ea5ba8,
-	0x26ea9ba9,
-	0x6eadbaa,
-	0x26eb5bab,
-	0x6eb9bad,
-	0x6ebdbae,
-	0x26ecdbaf,
-	0x6ed1bb3,
-	0x6ed5bb4,
-	0x6ed9bb5,
-	0x6eddbb6,
-	0x26ee1bb7,
-	0x6ee5bb8,
-	0x6ee9bb9,
-	0x6eedbba,
-	0x6ef1bbb,
-	0x26ef9bbc,
-	0x6efdbbe,
-	0x6f01bbf,
-	0x6f05bc0,
-	0x26f09bc1,
-	0x6f0dbc2,
-	0x26f15bc3,
-	0x26f19bc5,
-	0x6f35bc6,
-	0x6f45bcd,
-	0x6f89bd1,
-	0x6f8dbe2,
-	0x6fb1be3,
-	0x6fb5bec,
-	0x6fb9bed,
-	0x7145bee,
-	0x27149c51,
-	0x27151c52,
-	0x27155c54,
-	0x27159c55,
-	0x7161c56,
-	0x723dc58,
-	0x27249c8f,
-	0x2724dc92,
-	0x27251c93,
-	0x27255c94,
-	0x7259c95,
-	0x7285c96,
-	0x7289ca1,
-	0x72adca2,
-	0x72b9cab,
-	0x72d9cae,
-	0x72ddcb6,
-	0x7315cb7,
-	0x75adcc5,
-	0x7669d6b,
-	0x767dd9a,
-	0x76b1d9f,
-	0x76e1dac,
-	0x76fddb8,
-	0x7725dbf,
-	0x7745dc9,
-	0x7761dd1,
-	0x7789dd8,
-	0x7799de2,
-	0x779dde6,
-	0x77a1de7,
-	0x77d5de8,
-	0x77e1df5,
-	0x7801df8,
-	0x7879e00,
-	0x2787de1e,
-	0x78a1e1f,
-	0x78c1e28,
-	0x78d5e30,
-	0x78e9e35,
-	0x78ede3a,
-	0x790de3b,
-	0x79b1e43,
-	0x79cde6c,
-	0x79f1e73,
-	0x79f9e7c,
-	0x7a05e7e,
-	0x7a0de81,
-	0x7a21e83,
-	0x7a41e88,
-	0x7a4de90,
-	0x7a59e93,
-	0x7a89e96,
-	0x7b5dea2,
-	0x7b61ed7,
-	0x7b75ed8,
-	0x7b7dedd,
-	0x7b95edf,
-	0x7b99ee5,
-	0x7ba5ee6,
-	0x7ba9ee9,
-	0x7bc5eea,
-	0x7c01ef1,
-	0x7c05f00,
-	0x7c25f01,
-	0x7c75f09,
-	0x7c91f1d,
-	0x7ce5f24,
-	0x7ce9f39,
-	0x7cedf3a,
-	0x7cf1f3b,
-	0x7d35f3c,
-	0x7d45f4d,
-	0x7d85f51,
-	0x7d89f61,
-	0x7db9f62,
-	0x7f01f6e,
-	0x7f29fc0,
-	0x7f55fca,
-	0x7f65fd5,
-	0x7f6dfd9,
-	0x807dfdb,
-	0x808a01f,
-	0x8096022,
-	0x80a2025,
-	0x80ae028,
-	0x80ba02b,
-	0x80c602e,
-	0x80d2031,
-	0x80de034,
-	0x80ea037,
-	0x80f603a,
-	0x810203d,
-	0x810e040,
-	0x811a043,
-	0x8122046,
-	0x812e048,
-	0x813a04b,
-	0x814604e,
-	0x8152051,
-	0x815e054,
-	0x816a057,
-	0x817605a,
-	0x818205d,
-	0x818e060,
-	0x819a063,
-	0x81a6066,
-	0x81d2069,
-	0x81de074,
-	0x81ea077,
-	0x81f607a,
-	0x820207d,
-	0x820e080,
-	0x8216083,
-	0x8222085,
-	0x822e088,
-	0x823a08b,
-	0x824608e,
-	0x8252091,
-	0x825e094,
-	0x826a097,
-	0x827609a,
-	0x828209d,
-	0x828e0a0,
-	0x829a0a3,
-	0x82a60a6,
-	0x82b20a9,
-	0x82ba0ac,
-	0x82c60ae,
-	0x82d20b1,
-	0x82de0b4,
-	0x82ea0b7,
-	0x82f60ba,
-	0x83020bd,
-	0x830e0c0,
-	0x831a0c3,
-	0x831e0c6,
-	0x832a0c7,
-	0x83460ca,
-	0x834a0d1,
-	0x835a0d2,
-	0x83760d6,
-	0x83ba0dd,
-	0x83be0ee,
-	0x83d20ef,
-	0x84060f4,
-	0x8416101,
-	0x8436105,
-	0x844e10d,
-	0x8466113,
-	0x846e119,
-	0x284b211b,
-	0x84b612c,
-	0x84e212d,
-	0x84ea138,
-	0x84fe13a,
+	0x22cc0b2f,
+	0x2cc4b30,
+	0x2cc8b31,
+	0x2cd8b32,
+	0x2cdcb36,
+	0x2d54b37,
+	0x2d58b55,
+	0x2d5cb56,
+	0x2d7cb57,
+	0x2d8cb5f,
+	0x2da0b63,
+	0x2db8b68,
+	0x2dd0b6e,
+	0x2de8b74,
+	0x2decb7a,
+	0x2e04b7b,
+	0x2e20b81,
+	0x2e40b88,
+	0x2e60b90,
+	0x2e7cb98,
+	0x2edcb9f,
+	0x2ef8bb7,
+	0x2f08bbe,
+	0x2f0cbc2,
+	0x2f20bc3,
+	0x2f64bc8,
+	0x2fe4bd9,
+	0x3014bf9,
+	0x3018c05,
+	0x3024c06,
+	0x3044c09,
+	0x3048c11,
+	0x306cc12,
+	0x3074c1b,
+	0x30b0c1d,
+	0x3100c2c,
+	0x3104c40,
+	0x318cc41,
+	0x3190c63,
+	0x23194c64,
+	0x23198c65,
+	0x2319cc66,
+	0x231acc67,
+	0x231b0c6b,
+	0x231b4c6c,
+	0x231b8c6d,
+	0x231bcc6e,
+	0x31d4c6f,
+	0x31f8c75,
+	0x3218c7e,
+	0x3880c86,
+	0x388ce20,
+	0x38ace23,
+	0x3a68e2b,
+	0x3b38e9a,
+	0x3ba8ece,
+	0x3c00eea,
+	0x3ce8f00,
+	0x3d40f3a,
+	0x3d7cf50,
+	0x3e78f5f,
+	0x3f44f9e,
+	0x3fdcfd1,
+	0x406cff7,
+	0x40d101b,
+	0x4309034,
+	0x43c10c2,
+	0x448d0f0,
+	0x44d9123,
+	0x4561136,
+	0x459d158,
+	0x45ed167,
+	0x466517b,
+	0x64669199,
+	0x6466d19a,
+	0x6467119b,
+	0x46ed19c,
+	0x47491bb,
+	0x47c51d2,
+	0x483d1f1,
+	0x48bd20f,
+	0x492922f,
+	0x4a5524a,
+	0x4aad295,
+	0x64ab12ab,
+	0x4b492ac,
+	0x4bd12d2,
+	0x4c1d2f4,
+	0x4c85307,
+	0x4d2d321,
+	0x4df534b,
+	0x4e5d37d,
+	0x4f71397,
+	0x64f753dc,
+	0x64f793dd,
+	0x4fd53de,
+	0x50313f5,
+	0x50c140c,
+	0x513d430,
+	0x518144f,
+	0x5265460,
+	0x5299499,
+	0x52f94a6,
+	0x536d4be,
+	0x53f54db,
+	0x54354fd,
+	0x54a550d,
+	0x654a9529,
+	0x54d152a,
+	0x54d5534,
+	0x54ed535,
+	0x550953b,
+	0x554d542,
+	0x555d553,
+	0x5575557,
+	0x55ed55d,
+	0x55f557b,
+	0x561157d,
+	0x5625584,
+	0x5641589,
+	0x566d590,
+	0x567159b,
+	0x567959c,
+	0x568d59e,
+	0x56ad5a3,
+	0x56b95ab,
+	0x56c15ae,
+	0x56fd5b0,
+	0x57115bf,
+	0x57195c4,
+	0x57255c6,
+	0x572d5c9,
+	0x57515cb,
+	0x57755d4,
+	0x578d5dd,
+	0x57915e3,
+	0x57995e4,
+	0x579d5e6,
+	0x58195e7,
+	0x581d606,
+	0x5821607,
+	0x5845608,
+	0x5869611,
+	0x588561a,
+	0x5899621,
+	0x58ad626,
+	0x58b562b,
+	0x58bd62d,
+	0x58d162f,
+	0x58e1634,
+	0x58e5638,
+	0x5901639,
+	0x6191640,
+	0x61c9864,
+	0x61f5872,
+	0x621187d,
+	0x6231884,
+	0x625188c,
+	0x6295894,
+	0x629d8a5,
+	0x262a18a7,
+	0x262a58a8,
+	0x62ad8a9,
+	0x64558ab,
+	0x26459915,
+	0x26469916,
+	0x2647191a,
+	0x2647d91c,
+	0x648191f,
+	0x6485920,
+	0x64ad921,
+	0x64d592b,
+	0x64d9935,
+	0x6511936,
+	0x6531944,
+	0x708994c,
+	0x708dc22,
+	0x7091c23,
+	0x27095c24,
+	0x7099c25,
+	0x2709dc26,
+	0x70a1c27,
+	0x270adc28,
+	0x70b1c2b,
+	0x70b5c2c,
+	0x270b9c2d,
+	0x70bdc2e,
+	0x270c5c2f,
+	0x70c9c31,
+	0x70cdc32,
+	0x270ddc33,
+	0x70e1c37,
+	0x70e5c38,
+	0x70e9c39,
+	0x70edc3a,
+	0x270f1c3b,
+	0x70f5c3c,
+	0x70f9c3d,
+	0x70fdc3e,
+	0x7101c3f,
+	0x27109c40,
+	0x710dc42,
+	0x7111c43,
+	0x7115c44,
+	0x27119c45,
+	0x711dc46,
+	0x27125c47,
+	0x27129c49,
+	0x7145c4a,
+	0x7155c51,
+	0x7199c55,
+	0x719dc66,
+	0x71c1c67,
+	0x71c5c70,
+	0x71c9c71,
+	0x7371c72,
+	0x27375cdc,
+	0x2737dcdd,
+	0x27381cdf,
+	0x27385ce0,
+	0x738dce1,
+	0x7469ce3,
+	0x27475d1a,
+	0x27479d1d,
+	0x2747dd1e,
+	0x27481d1f,
+	0x7485d20,
+	0x74b1d21,
+	0x74b5d2c,
+	0x74d9d2d,
+	0x74e5d36,
+	0x7505d39,
+	0x7509d41,
+	0x7541d42,
+	0x77d9d50,
+	0x7895df6,
+	0x7899e25,
+	0x78ade26,
+	0x78e1e2b,
+	0x7919e38,
+	0x2791de46,
+	0x7939e47,
+	0x7961e4e,
+	0x7965e58,
+	0x7989e59,
+	0x79a5e62,
+	0x79cde69,
+	0x79dde73,
+	0x79e1e77,
+	0x79e5e78,
+	0x7a1de79,
+	0x7a29e87,
+	0x7a4de8a,
+	0x7acde93,
+	0x27ad1eb3,
+	0x7ae1eb4,
+	0x7ae9eb8,
+	0x7b0deba,
+	0x7b2dec3,
+	0x7b41ecb,
+	0x7b55ed0,
+	0x7b59ed5,
+	0x7b79ed6,
+	0x7c1dede,
+	0x7c39f07,
+	0x7c5df0e,
+	0x7c61f17,
+	0x7c69f18,
+	0x7c79f1a,
+	0x7c81f1e,
+	0x7c95f20,
+	0x7cb5f25,
+	0x7cc1f2d,
+	0x7ccdf30,
+	0x7d05f33,
+	0x7dd9f41,
+	0x7dddf76,
+	0x7df1f77,
+	0x7df9f7c,
+	0x7e11f7e,
+	0x7e15f84,
+	0x7e21f85,
+	0x7e25f88,
+	0x7e41f89,
+	0x7e81f90,
+	0x7e85fa0,
+	0x7ea5fa1,
+	0x7ef5fa9,
+	0x7f11fbd,
+	0x7f19fc4,
+	0x7f6dfc6,
+	0x7f71fdb,
+	0x7f75fdc,
+	0x7f79fdd,
+	0x7fbdfde,
+	0x7fcdfef,
+	0x800dff3,
+	0x8012003,
+	0x8042004,
+	0x818a010,
+	0x81b2062,
+	0x81e206c,
+	0x81fe078,
+	0x820607f,
+	0x8212081,
+	0x8326084,
+	0x83320c9,
+	0x833e0cc,
+	0x834a0cf,
+	0x83560d2,
+	0x83620d5,
+	0x836e0d8,
+	0x837a0db,
+	0x83860de,
+	0x83920e1,
+	0x839e0e4,
+	0x83aa0e7,
+	0x83b60ea,
+	0x83c20ed,
+	0x83ca0f0,
+	0x83d60f2,
+	0x83e20f5,
+	0x83ee0f8,
+	0x83fa0fb,
+	0x84060fe,
+	0x8412101,
+	0x841e104,
+	0x842a107,
+	0x843610a,
+	0x844210d,
+	0x844e110,
+	0x847a113,
+	0x848611e,
+	0x8492121,
+	0x849e124,
+	0x84aa127,
+	0x84b612a,
+	0x84be12d,
+	0x84ca12f,
+	0x84d6132,
+	0x84e2135,
+	0x84ee138,
+	0x84fa13b,
+	0x850613e,
+	0x8512141,
+	0x851e144,
+	0x852a147,
+	0x853614a,
+	0x854214d,
+	0x854e150,
+	0x855a153,
+	0x8562156,
+	0x856e158,
+	0x857a15b,
+	0x858615e,
+	0x8592161,
+	0x859e164,
+	0x85aa167,
+	0x85b616a,
+	0x85c216d,
+	0x85c6170,
+	0x85d2171,
+	0x85ee174,
+	0x85f217b,
+	0x860217c,
+	0x861e180,
+	0x8662187,
+	0x8666198,
+	0x867a199,
+	0x86ae19e,
+	0x86be1ab,
+	0x86e21af,
+	0x86fa1b8,
+	0x87121be,
+	0x872a1c4,
+	0x873a1ca,
+	0x2877e1ce,
+	0x87821df,
+	0x87ae1e0,
+	0x87b61eb,
+	0x87ca1ed,
 }
 
-// max children 500 (capacity 1023)
-// max text offset 29102 (capacity 32767)
+// max children 523 (capacity 1023)
+// max text offset 29863 (capacity 32767)
 // max text length 36 (capacity 63)
-// max hi 8511 (capacity 16383)
-// max lo 8506 (capacity 16383)
+// max hi 8690 (capacity 16383)
+// max lo 8685 (capacity 16383)
diff --git a/vendor/golang.org/x/net/publicsuffix/table_test.go b/vendor/golang.org/x/net/publicsuffix/table_test.go
index 228010ca..6f15cc9a 100644
--- a/vendor/golang.org/x/net/publicsuffix/table_test.go
+++ b/vendor/golang.org/x/net/publicsuffix/table_test.go
@@ -355,6 +355,7 @@ var rules = [...]string{
 	"art.br",
 	"ato.br",
 	"b.br",
+	"barueri.br",
 	"belem.br",
 	"bhz.br",
 	"bio.br",
@@ -850,7 +851,15 @@ var rules = [...]string{
 	"mil.gt",
 	"net.gt",
 	"org.gt",
-	"*.gu",
+	"gu",
+	"com.gu",
+	"edu.gu",
+	"gov.gu",
+	"guam.gu",
+	"info.gu",
+	"net.gu",
+	"org.gu",
+	"web.gu",
 	"gw",
 	"gy",
 	"co.gy",
@@ -1074,6 +1083,12 @@ var rules = [...]string{
 	"taa.it",
 	"tos.it",
 	"toscana.it",
+	"trentin-sud-tirol.it",
+	"xn--trentin-sud-tirol-tsj.it",
+	"trentin-sudtirol.it",
+	"xn--trentin-sudtirol-b9i.it",
+	"trentin-sued-tirol.it",
+	"trentin-suedtirol.it",
 	"trentino-a-adige.it",
 	"trentino-aadige.it",
 	"trentino-alto-adige.it",
@@ -1081,9 +1096,12 @@ var rules = [...]string{
 	"trentino-s-tirol.it",
 	"trentino-stirol.it",
 	"trentino-sud-tirol.it",
+	"xn--trentino-sud-tirol-dck.it",
 	"trentino-sudtirol.it",
+	"xn--trentino-sudtirol-usj.it",
 	"trentino-sued-tirol.it",
 	"trentino-suedtirol.it",
+	"trentino.it",
 	"trentinoa-adige.it",
 	"trentinoaadige.it",
 	"trentinoalto-adige.it",
@@ -1091,9 +1109,17 @@ var rules = [...]string{
 	"trentinos-tirol.it",
 	"trentinostirol.it",
 	"trentinosud-tirol.it",
+	"xn--trentinosud-tirol-tsj.it",
 	"trentinosudtirol.it",
+	"xn--trentinosudtirol-b9i.it",
 	"trentinosued-tirol.it",
 	"trentinosuedtirol.it",
+	"trentinsud-tirol.it",
+	"xn--trentinsud-tirol-98i.it",
+	"trentinsudtirol.it",
+	"xn--trentinsudtirol-rqi.it",
+	"trentinsued-tirol.it",
+	"trentinsuedtirol.it",
 	"tuscany.it",
 	"umb.it",
 	"umbria.it",
@@ -1108,7 +1134,13 @@ var rules = [...]string{
 	"valled-aosta.it",
 	"valledaosta.it",
 	"vallee-aoste.it",
+	"xn--vallee-aoste-i2g.it",
+	"vallee-d-aoste.it",
+	"xn--vallee-d-aoste-43h.it",
 	"valleeaoste.it",
+	"xn--valleeaoste-6jg.it",
+	"valleedaoste.it",
+	"xn--valleedaoste-i2g.it",
 	"vao.it",
 	"vda.it",
 	"ven.it",
@@ -1140,6 +1172,9 @@ var rules = [...]string{
 	"av.it",
 	"avellino.it",
 	"ba.it",
+	"balsan-sudtirol.it",
+	"xn--balsan-sudtirol-rqi.it",
+	"balsan-suedtirol.it",
 	"balsan.it",
 	"bari.it",
 	"barletta-trani-andria.it",
@@ -1154,13 +1189,21 @@ var rules = [...]string{
 	"bn.it",
 	"bo.it",
 	"bologna.it",
+	"bolzano-altoadige.it",
 	"bolzano.it",
+	"bozen-sudtirol.it",
+	"xn--bozen-sudtirol-76h.it",
+	"bozen-suedtirol.it",
 	"bozen.it",
 	"br.it",
 	"brescia.it",
 	"brindisi.it",
 	"bs.it",
 	"bt.it",
+	"bulsan-sudtirol.it",
+	"xn--bulsan-sudtirol-rqi.it",
+	"bulsan-suedtirol.it",
+	"bulsan.it",
 	"bz.it",
 	"ca.it",
 	"cagliari.it",
@@ -1178,7 +1221,9 @@ var rules = [...]string{
 	"cb.it",
 	"ce.it",
 	"cesena-forli.it",
+	"xn--cesena-forli-c2g.it",
 	"cesenaforli.it",
+	"xn--cesenaforli-0jg.it",
 	"ch.it",
 	"chieti.it",
 	"ci.it",
@@ -1209,7 +1254,9 @@ var rules = [...]string{
 	"fm.it",
 	"foggia.it",
 	"forli-cesena.it",
+	"xn--forli-cesena-41g.it",
 	"forlicesena.it",
+	"xn--forlicesena-ujg.it",
 	"fr.it",
 	"frosinone.it",
 	"ge.it",
@@ -1340,6 +1387,7 @@ var rules = [...]string{
 	"sr.it",
 	"ss.it",
 	"suedtirol.it",
+	"xn--sudtirol-y0e.it",
 	"sv.it",
 	"ta.it",
 	"taranto.it",
@@ -1358,7 +1406,6 @@ var rules = [...]string{
 	"traniandriabarletta.it",
 	"tranibarlettaandria.it",
 	"trapani.it",
-	"trentino.it",
 	"trento.it",
 	"treviso.it",
 	"trieste.it",
@@ -3280,7 +3327,14 @@ var rules = [...]string{
 	"jeonnam.kr",
 	"seoul.kr",
 	"ulsan.kr",
-	"*.kw",
+	"kw",
+	"com.kw",
+	"edu.kw",
+	"emb.kw",
+	"gov.kw",
+	"ind.kw",
+	"net.kw",
+	"org.kw",
 	"ky",
 	"edu.ky",
 	"gov.ky",
@@ -5499,7 +5553,6 @@ var rules = [...]string{
 	"kep.tr",
 	"nc.tr",
 	"gov.nc.tr",
-	"travel",
 	"tt",
 	"co.tt",
 	"com.tt",
@@ -5959,6 +6012,12 @@ var rules = [...]string{
 	"xn--node",
 	"xn--qxam",
 	"xn--j6w193g",
+	"xn--55qx5d.xn--j6w193g",
+	"xn--wcvs22d.xn--j6w193g",
+	"xn--mxtq1m.xn--j6w193g",
+	"xn--gmqw5a.xn--j6w193g",
+	"xn--od0alg.xn--j6w193g",
+	"xn--uc0atv.xn--j6w193g",
 	"xn--2scrj9c",
 	"xn--3hcrj9c",
 	"xn--45br5cyl",
@@ -5967,6 +6026,7 @@ var rules = [...]string{
 	"xn--mgbgu82a",
 	"xn--rvc1e0am3e",
 	"xn--h2brj9c",
+	"xn--mgbbh1a",
 	"xn--mgbbh1a71e",
 	"xn--fpcrj9c3d",
 	"xn--gecrj9c",
@@ -6192,7 +6252,6 @@ var rules = [...]string{
 	"boo",
 	"book",
 	"booking",
-	"boots",
 	"bosch",
 	"bostik",
 	"boston",
@@ -6253,6 +6312,7 @@ var rules = [...]string{
 	"cfd",
 	"chanel",
 	"channel",
+	"charity",
 	"chase",
 	"chat",
 	"cheap",
@@ -6561,6 +6621,7 @@ var rules = [...]string{
 	"imdb",
 	"immo",
 	"immobilien",
+	"inc",
 	"industries",
 	"infiniti",
 	"ing",
@@ -6581,7 +6642,6 @@ var rules = [...]string{
 	"itau",
 	"itv",
 	"iveco",
-	"iwc",
 	"jaguar",
 	"java",
 	"jcb",
@@ -6663,6 +6723,7 @@ var rules = [...]string{
 	"live",
 	"living",
 	"lixil",
+	"llc",
 	"loan",
 	"loans",
 	"locker",
@@ -6707,7 +6768,6 @@ var rules = [...]string{
 	"memorial",
 	"men",
 	"menu",
-	"meo",
 	"merckmsd",
 	"metlife",
 	"miami",
@@ -6739,7 +6799,6 @@ var rules = [...]string{
 	"movistar",
 	"msd",
 	"mtn",
-	"mtpc",
 	"mtr",
 	"mutual",
 	"nab",
@@ -6923,7 +6982,6 @@ var rules = [...]string{
 	"sandvikcoromant",
 	"sanofi",
 	"sap",
-	"sapo",
 	"sarl",
 	"sas",
 	"save",
@@ -6993,6 +7051,7 @@ var rules = [...]string{
 	"soy",
 	"space",
 	"spiegel",
+	"sport",
 	"spot",
 	"spreadbetting",
 	"srl",
@@ -7074,6 +7133,7 @@ var rules = [...]string{
 	"trade",
 	"trading",
 	"training",
+	"travel",
 	"travelchannel",
 	"travelers",
 	"travelersinsurance",
@@ -7236,6 +7296,7 @@ var rules = [...]string{
 	"xn--nqv7f",
 	"xn--nqv7fs00ema",
 	"xn--nyqy26a",
+	"xn--otu796d",
 	"xn--p1acf",
 	"xn--pbt977c",
 	"xn--pssy2u",
@@ -7256,7 +7317,6 @@ var rules = [...]string{
 	"xn--w4rs40l",
 	"xn--xhq521b",
 	"xn--zfr164b",
-	"xperia",
 	"xyz",
 	"yachts",
 	"yahoo",
@@ -7278,9 +7338,6 @@ var rules = [...]string{
 	"cc.ua",
 	"inf.ua",
 	"ltd.ua",
-	"1password.ca",
-	"1password.com",
-	"1password.eu",
 	"beep.pl",
 	"*.compute.estate",
 	"*.alces.network",
@@ -7294,6 +7351,7 @@ var rules = [...]string{
 	"elasticbeanstalk.com",
 	"ap-northeast-1.elasticbeanstalk.com",
 	"ap-northeast-2.elasticbeanstalk.com",
+	"ap-northeast-3.elasticbeanstalk.com",
 	"ap-south-1.elasticbeanstalk.com",
 	"ap-southeast-1.elasticbeanstalk.com",
 	"ap-southeast-2.elasticbeanstalk.com",
@@ -7379,6 +7437,7 @@ var rules = [...]string{
 	"backplaneapp.io",
 	"betainabox.com",
 	"bnr.la",
+	"blackbaudcdn.net",
 	"boomla.net",
 	"boxfuse.io",
 	"square7.ch",
@@ -7409,7 +7468,6 @@ var rules = [...]string{
 	"qc.com",
 	"ru.com",
 	"sa.com",
-	"se.com",
 	"se.net",
 	"uk.com",
 	"uk.net",
@@ -7426,7 +7484,9 @@ var rules = [...]string{
 	"certmgr.org",
 	"xenapponazure.com",
 	"virtueeldomein.nl",
+	"cleverapps.io",
 	"c66.me",
+	"cloud66.ws",
 	"jdevcloud.com",
 	"wpdevcloud.com",
 	"cloudaccess.host",
@@ -7435,6 +7495,7 @@ var rules = [...]string{
 	"cloudcontrolled.com",
 	"cloudcontrolapp.com",
 	"co.ca",
+	"*.otap.co",
 	"co.cz",
 	"c.cdn77.org",
 	"cdn77-ssl.net",
@@ -7452,6 +7513,8 @@ var rules = [...]string{
 	"cloudns.pro",
 	"cloudns.pw",
 	"cloudns.us",
+	"cloudeity.net",
+	"cnpy.gdn",
 	"co.nl",
 	"co.no",
 	"webhosting.be",
@@ -7472,6 +7535,12 @@ var rules = [...]string{
 	"cyon.site",
 	"daplie.me",
 	"localhost.daplie.me",
+	"dattolocal.com",
+	"dattorelay.com",
+	"dattoweb.com",
+	"mydatto.com",
+	"dattolocal.net",
+	"mydatto.net",
 	"biz.dk",
 	"co.dk",
 	"firm.dk",
@@ -7778,6 +7847,7 @@ var rules = [...]string{
 	"ddnss.org",
 	"definima.net",
 	"definima.io",
+	"bci.dnstrace.pro",
 	"ddnsfree.com",
 	"ddnsgeek.com",
 	"giize.com",
@@ -7952,6 +8022,8 @@ var rules = [...]string{
 	"a.ssl.fastly.net",
 	"b.ssl.fastly.net",
 	"global.ssl.fastly.net",
+	"fastpanel.direct",
+	"fastvps-server.com",
 	"fhapp.xyz",
 	"fedorainfracloud.org",
 	"fedorapeople.org",
@@ -7968,7 +8040,10 @@ var rules = [...]string{
 	"fbxos.fr",
 	"freebox-os.fr",
 	"freeboxos.fr",
+	"freedesktop.org",
 	"*.futurecms.at",
+	"*.ex.futurecms.at",
+	"*.in.futurecms.at",
 	"futurehosting.at",
 	"futuremailing.at",
 	"*.ex.ortsinfo.at",
@@ -8068,10 +8143,16 @@ var rules = [...]string{
 	"withgoogle.com",
 	"withyoutube.com",
 	"hashbang.sh",
+	"hasura.app",
 	"hasura-app.io",
 	"hepforge.org",
 	"herokuapp.com",
 	"herokussl.com",
+	"myravendb.com",
+	"ravendb.community",
+	"ravendb.me",
+	"development.run",
+	"ravendb.run",
 	"moonscale.net",
 	"iki.fi",
 	"biz.at",
@@ -8106,6 +8187,13 @@ var rules = [...]string{
 	"to.leg.br",
 	"pixolino.com",
 	"ipifony.net",
+	"mein-iserv.de",
+	"test-iserv.de",
+	"myjino.ru",
+	"*.hosting.myjino.ru",
+	"*.landing.myjino.ru",
+	"*.spectrum.myjino.ru",
+	"*.vps.myjino.ru",
 	"*.triton.zone",
 	"*.cns.joyent.com",
 	"js.org",
@@ -8116,25 +8204,56 @@ var rules = [...]string{
 	"git-repos.de",
 	"lcube-server.de",
 	"svn-repos.de",
+	"app.lmpm.com",
+	"linkitools.space",
+	"linkyard.cloud",
+	"linkyard-cloud.ch",
 	"we.bs",
+	"uklugs.org",
+	"glug.org.uk",
+	"lug.org.uk",
+	"lugs.org.uk",
 	"barsy.bg",
+	"barsy.co.uk",
+	"barsyonline.co.uk",
+	"barsycenter.com",
 	"barsyonline.com",
+	"barsy.club",
 	"barsy.de",
 	"barsy.eu",
 	"barsy.in",
+	"barsy.info",
+	"barsy.io",
+	"barsy.me",
+	"barsy.menu",
+	"barsy.mobi",
 	"barsy.net",
 	"barsy.online",
+	"barsy.org",
+	"barsy.pro",
+	"barsy.pub",
+	"barsy.shop",
+	"barsy.site",
 	"barsy.support",
+	"barsy.uk",
 	"*.magentosite.cloud",
+	"mayfirst.info",
+	"mayfirst.org",
 	"hb.cldmail.ru",
+	"miniserver.com",
+	"memset.net",
 	"cloud.metacentrum.cz",
 	"custom.metacentrum.cz",
+	"flt.cloud.muni.cz",
+	"usr.cloud.muni.cz",
 	"meteorapp.com",
 	"eu.meteorapp.com",
 	"co.pl",
+	"azurecontainer.io",
 	"azurewebsites.net",
 	"azure-mobile.net",
 	"cloudapp.net",
+	"mozilla-iot.org",
 	"bmoattachments.org",
 	"net.ru",
 	"org.ru",
@@ -8145,6 +8264,31 @@ var rules = [...]string{
 	"ngrok.io",
 	"nh-serv.co.uk",
 	"nfshost.com",
+	"dnsking.ch",
+	"mypi.co",
+	"n4t.co",
+	"001www.com",
+	"ddnslive.com",
+	"myiphost.com",
+	"forumz.info",
+	"16-b.it",
+	"32-b.it",
+	"64-b.it",
+	"soundcast.me",
+	"tcp4.me",
+	"dnsup.net",
+	"hicam.net",
+	"now-dns.net",
+	"ownip.net",
+	"vpndns.net",
+	"dynserv.org",
+	"now-dns.org",
+	"x443.pw",
+	"now-dns.top",
+	"ntdll.top",
+	"freeddns.us",
+	"crafting.xyz",
+	"zapto.xyz",
 	"nsupdate.info",
 	"nerdpol.ovh",
 	"blogsyte.com",
@@ -8235,27 +8379,35 @@ var rules = [...]string{
 	"stage.nodeart.io",
 	"nodum.co",
 	"nodum.io",
+	"pcloud.host",
 	"nyc.mn",
 	"nom.ae",
+	"nom.af",
 	"nom.ai",
 	"nom.al",
 	"nym.by",
 	"nym.bz",
 	"nom.cl",
 	"nom.gd",
+	"nom.ge",
 	"nom.gl",
 	"nym.gr",
 	"nom.gt",
+	"nym.gy",
 	"nom.hn",
+	"nym.ie",
 	"nom.im",
+	"nom.ke",
 	"nym.kz",
 	"nym.la",
+	"nym.lc",
 	"nom.li",
 	"nym.li",
 	"nym.lt",
 	"nym.lu",
 	"nym.me",
 	"nom.mk",
+	"nym.mn",
 	"nym.mx",
 	"nom.nu",
 	"nym.nz",
@@ -8263,22 +8415,28 @@ var rules = [...]string{
 	"nym.pt",
 	"nom.pw",
 	"nom.qa",
+	"nym.ro",
 	"nom.rs",
 	"nom.si",
 	"nym.sk",
+	"nom.st",
 	"nym.su",
 	"nym.sx",
+	"nom.tj",
 	"nym.tw",
 	"nom.ug",
 	"nom.uy",
 	"nom.vc",
 	"nom.vg",
 	"cya.gg",
+	"cloudycluster.net",
 	"nid.io",
 	"opencraft.hosting",
 	"operaunite.com",
 	"outsystemscloud.com",
 	"ownprovider.com",
+	"own.pm",
+	"ox.rs",
 	"oy.lc",
 	"pgfog.com",
 	"pagefrontapp.com",
@@ -8299,6 +8457,7 @@ var rules = [...]string{
 	"protonet.io",
 	"chirurgiens-dentistes-en-france.fr",
 	"byen.site",
+	"ras.ru",
 	"qa2.com",
 	"dev-myqnapcloud.com",
 	"alpha-myqnapcloud.com",
@@ -8318,6 +8477,7 @@ var rules = [...]string{
 	"sandcats.io",
 	"logoip.de",
 	"logoip.com",
+	"schokokeks.net",
 	"scrysec.com",
 	"firewall-gateway.com",
 	"firewall-gateway.de",
@@ -8350,8 +8510,9 @@ var rules = [...]string{
 	"apps.lair.io",
 	"*.stolos.io",
 	"spacekit.io",
-	"stackspace.space",
+	"customer.speedpartner.de",
 	"storj.farm",
+	"utwente.io",
 	"temp-dns.com",
 	"diskstation.me",
 	"dscloud.biz",
@@ -8373,6 +8534,7 @@ var rules = [...]string{
 	"gdynia.pl",
 	"med.pl",
 	"sopot.pl",
+	"gwiddle.co.uk",
 	"cust.dev.thingdust.io",
 	"cust.disrec.thingdust.io",
 	"cust.prod.thingdust.io",
@@ -8416,11 +8578,15 @@ var rules = [...]string{
 	"synology-diskstation.de",
 	"synology-ds.de",
 	"uber.space",
+	"*.uberspace.de",
 	"hk.com",
 	"hk.org",
 	"ltd.hk",
 	"inc.hk",
+	"virtualuser.de",
+	"virtual-user.de",
 	"lib.de.us",
+	"2038.io",
 	"router.management",
 	"v-info.info",
 	"wedeploy.io",
@@ -8428,9 +8594,14 @@ var rules = [...]string{
 	"wedeploy.sh",
 	"remotewd.com",
 	"wmflabs.org",
+	"half.host",
+	"xnbay.com",
+	"u2.xnbay.com",
+	"u2-local.xnbay.com",
 	"cistron.nl",
 	"demon.nl",
 	"xs4all.space",
+	"official.academy",
 	"yolasite.com",
 	"ybo.faith",
 	"yombo.me",
@@ -8439,9 +8610,12 @@ var rules = [...]string{
 	"ybo.review",
 	"ybo.science",
 	"ybo.trade",
+	"nohost.me",
+	"noho.st",
 	"za.net",
 	"za.org",
 	"now.sh",
+	"zone.id",
 }
 
 var nodeLabels = [...]string{
@@ -8611,7 +8785,6 @@ var nodeLabels = [...]string{
 	"boo",
 	"book",
 	"booking",
-	"boots",
 	"bosch",
 	"bostik",
 	"boston",
@@ -8686,6 +8859,7 @@ var nodeLabels = [...]string{
 	"ch",
 	"chanel",
 	"channel",
+	"charity",
 	"chase",
 	"chat",
 	"cheap",
@@ -9060,6 +9234,7 @@ var nodeLabels = [...]string{
 	"immo",
 	"immobilien",
 	"in",
+	"inc",
 	"industries",
 	"infiniti",
 	"info",
@@ -9087,7 +9262,6 @@ var nodeLabels = [...]string{
 	"itau",
 	"itv",
 	"iveco",
-	"iwc",
 	"jaguar",
 	"java",
 	"jcb",
@@ -9190,6 +9364,7 @@ var nodeLabels = [...]string{
 	"living",
 	"lixil",
 	"lk",
+	"llc",
 	"loan",
 	"loans",
 	"locker",
@@ -9244,7 +9419,6 @@ var nodeLabels = [...]string{
 	"memorial",
 	"men",
 	"menu",
-	"meo",
 	"merckmsd",
 	"metlife",
 	"mg",
@@ -9290,7 +9464,6 @@ var nodeLabels = [...]string{
 	"msd",
 	"mt",
 	"mtn",
-	"mtpc",
 	"mtr",
 	"mu",
 	"museum",
@@ -9521,7 +9694,6 @@ var nodeLabels = [...]string{
 	"sandvikcoromant",
 	"sanofi",
 	"sap",
-	"sapo",
 	"sarl",
 	"sas",
 	"save",
@@ -9604,6 +9776,7 @@ var nodeLabels = [...]string{
 	"soy",
 	"space",
 	"spiegel",
+	"sport",
 	"spot",
 	"spreadbetting",
 	"sr",
@@ -9911,6 +10084,7 @@ var nodeLabels = [...]string{
 	"xn--mgbai9azgqp6j",
 	"xn--mgbayh7gpa",
 	"xn--mgbb9fbpob",
+	"xn--mgbbh1a",
 	"xn--mgbbh1a71e",
 	"xn--mgbc0a9azcg",
 	"xn--mgbca7dzdo",
@@ -9939,6 +10113,7 @@ var nodeLabels = [...]string{
 	"xn--nyqy26a",
 	"xn--o3cw4h",
 	"xn--ogbpf8fl",
+	"xn--otu796d",
 	"xn--p1acf",
 	"xn--p1ai",
 	"xn--pbt977c",
@@ -9971,7 +10146,6 @@ var nodeLabels = [...]string{
 	"xn--yfro4i67o",
 	"xn--ygbi2ammx",
 	"xn--zfr164b",
-	"xperia",
 	"xxx",
 	"xyz",
 	"yachts",
@@ -10002,6 +10176,7 @@ var nodeLabels = [...]string{
 	"mil",
 	"net",
 	"org",
+	"official",
 	"nom",
 	"ac",
 	"blogspot",
@@ -10103,6 +10278,7 @@ var nodeLabels = [...]string{
 	"edu",
 	"gov",
 	"net",
+	"nom",
 	"org",
 	"co",
 	"com",
@@ -10129,6 +10305,7 @@ var nodeLabels = [...]string{
 	"it",
 	"og",
 	"pb",
+	"hasura",
 	"com",
 	"edu",
 	"gob",
@@ -10165,6 +10342,8 @@ var nodeLabels = [...]string{
 	"priv",
 	"blogspot",
 	"ex",
+	"in",
+	"ex",
 	"kunden",
 	"act",
 	"asn",
@@ -10356,6 +10535,7 @@ var nodeLabels = [...]string{
 	"art",
 	"ato",
 	"b",
+	"barueri",
 	"belem",
 	"bhz",
 	"bio",
@@ -10550,7 +10730,6 @@ var nodeLabels = [...]string{
 	"nym",
 	"org",
 	"za",
-	"1password",
 	"ab",
 	"awdev",
 	"bc",
@@ -10583,8 +10762,10 @@ var nodeLabels = [...]string{
 	"2ix",
 	"4lima",
 	"blogspot",
+	"dnsking",
 	"gotdns",
 	"lima-city",
+	"linkyard-cloud",
 	"square7",
 	"ac",
 	"asso",
@@ -10608,11 +10789,13 @@ var nodeLabels = [...]string{
 	"gov",
 	"mil",
 	"nom",
+	"linkyard",
 	"magentosite",
 	"sensiosite",
 	"statics",
 	"trafficplex",
 	"vapor",
+	"barsy",
 	"cloudns",
 	"co",
 	"com",
@@ -10677,16 +10860,19 @@ var nodeLabels = [...]string{
 	"info",
 	"int",
 	"mil",
+	"mypi",
+	"n4t",
 	"net",
 	"nodum",
 	"nom",
 	"org",
+	"otap",
 	"rec",
 	"web",
 	"blogspot",
+	"001www",
 	"0emm",
 	"1kapp",
-	"1password",
 	"3utilities",
 	"4u",
 	"africa",
@@ -10696,6 +10882,7 @@ var nodeLabels = [...]string{
 	"applinzi",
 	"appspot",
 	"ar",
+	"barsycenter",
 	"barsyonline",
 	"betainabox",
 	"bitballoon",
@@ -10714,9 +10901,13 @@ var nodeLabels = [...]string{
 	"co",
 	"codespot",
 	"damnserver",
+	"dattolocal",
+	"dattorelay",
+	"dattoweb",
 	"ddnsfree",
 	"ddnsgeek",
 	"ddnsking",
+	"ddnslive",
 	"de",
 	"dev-myqnapcloud",
 	"ditchyourip",
@@ -10754,6 +10945,7 @@ var nodeLabels = [...]string{
 	"eu",
 	"evennode",
 	"familyds",
+	"fastvps-server",
 	"fbsbx",
 	"firebaseapp",
 	"firewall-gateway",
@@ -10894,14 +11086,19 @@ var nodeLabels = [...]string{
 	"kr",
 	"likes-pie",
 	"likescandy",
+	"lmpm",
 	"logoip",
 	"loseyourip",
 	"meteorapp",
 	"mex",
+	"miniserver",
 	"myactivedirectory",
 	"myasustor",
+	"mydatto",
 	"mydrobo",
+	"myiphost",
 	"myqnapcloud",
+	"myravendb",
 	"mysecuritycamera",
 	"myshopblocks",
 	"mytuleap",
@@ -10935,7 +11132,6 @@ var nodeLabels = [...]string{
 	"sa",
 	"saves-the-whales",
 	"scrysec",
-	"se",
 	"securitytactics",
 	"selfip",
 	"sells-for-less",
@@ -10974,6 +11170,7 @@ var nodeLabels = [...]string{
 	"wpdevcloud",
 	"writesthisblog",
 	"xenapponazure",
+	"xnbay",
 	"yolasite",
 	"za",
 	"ap-northeast-1",
@@ -11062,6 +11259,7 @@ var nodeLabels = [...]string{
 	"beta",
 	"ap-northeast-1",
 	"ap-northeast-2",
+	"ap-northeast-3",
 	"ap-south-1",
 	"ap-southeast-1",
 	"ap-southeast-2",
@@ -11086,8 +11284,12 @@ var nodeLabels = [...]string{
 	"us-4",
 	"apps",
 	"cns",
+	"app",
 	"eu",
 	"xen",
+	"u2",
+	"u2-local",
+	"ravendb",
 	"de",
 	"ac",
 	"co",
@@ -11128,9 +11330,13 @@ var nodeLabels = [...]string{
 	"co",
 	"e4",
 	"metacentrum",
+	"muni",
 	"realm",
 	"cloud",
 	"custom",
+	"cloud",
+	"flt",
+	"usr",
 	"12hp",
 	"2ix",
 	"4lima",
@@ -11165,6 +11371,7 @@ var nodeLabels = [...]string{
 	"leitungsen",
 	"lima-city",
 	"logoip",
+	"mein-iserv",
 	"mein-vigor",
 	"my-gateway",
 	"my-router",
@@ -11172,17 +11379,24 @@ var nodeLabels = [...]string{
 	"my-wan",
 	"myhome-server",
 	"spdns",
+	"speedpartner",
 	"square7",
 	"svn-repos",
 	"syno-ds",
 	"synology-diskstation",
 	"synology-ds",
 	"taifun-dns",
+	"test-iserv",
 	"traeumtgerade",
+	"uberspace",
+	"virtual-user",
+	"virtualuser",
 	"dyn",
 	"dyn",
 	"dyndns",
 	"dyn",
+	"customer",
+	"fastpanel",
 	"biz",
 	"blogspot",
 	"co",
@@ -11260,7 +11474,6 @@ var nodeLabels = [...]string{
 	"name",
 	"net",
 	"org",
-	"1password",
 	"barsy",
 	"cloudns",
 	"diskstation",
@@ -11308,11 +11521,13 @@ var nodeLabels = [...]string{
 	"tm",
 	"veterinaire",
 	"nom",
+	"cnpy",
 	"com",
 	"edu",
 	"gov",
 	"mil",
 	"net",
+	"nom",
 	"org",
 	"pvt",
 	"co",
@@ -11364,11 +11579,20 @@ var nodeLabels = [...]string{
 	"net",
 	"nom",
 	"org",
+	"com",
+	"edu",
+	"gov",
+	"guam",
+	"info",
+	"net",
+	"org",
+	"web",
 	"co",
 	"com",
 	"edu",
 	"gov",
 	"net",
+	"nym",
 	"org",
 	"blogspot",
 	"com",
@@ -11403,6 +11627,8 @@ var nodeLabels = [...]string{
 	"org",
 	"cloudaccess",
 	"freesite",
+	"half",
+	"pcloud",
 	"opencraft",
 	"blogspot",
 	"com",
@@ -11469,9 +11695,11 @@ var nodeLabels = [...]string{
 	"or",
 	"sch",
 	"web",
+	"zone",
 	"blogspot",
 	"blogspot",
 	"gov",
+	"nym",
 	"ac",
 	"co",
 	"gov",
@@ -11509,25 +11737,32 @@ var nodeLabels = [...]string{
 	"res",
 	"barrel-of-knowledge",
 	"barrell-of-knowledge",
+	"barsy",
 	"cloudns",
 	"dvrcam",
 	"dynamic-dns",
 	"dyndns",
 	"for-our",
+	"forumz",
 	"groks-the",
 	"groks-this",
 	"here-for-more",
 	"ilovecollege",
 	"knowsitall",
+	"mayfirst",
 	"no-ip",
 	"nsupdate",
 	"selfip",
 	"v-info",
 	"webhop",
 	"eu",
+	"2038",
+	"azurecontainer",
 	"backplaneapp",
+	"barsy",
 	"boxfuse",
 	"browsersafetymark",
+	"cleverapps",
 	"com",
 	"dedyn",
 	"definima",
@@ -11552,6 +11787,7 @@ var nodeLabels = [...]string{
 	"spacekit",
 	"stolos",
 	"thingdust",
+	"utwente",
 	"vaporcloud",
 	"wedeploy",
 	"customer",
@@ -11589,6 +11825,9 @@ var nodeLabels = [...]string{
 	"int",
 	"net",
 	"org",
+	"16-b",
+	"32-b",
+	"64-b",
 	"abr",
 	"abruzzo",
 	"ag",
@@ -11621,6 +11860,8 @@ var nodeLabels = [...]string{
 	"avellino",
 	"ba",
 	"balsan",
+	"balsan-sudtirol",
+	"balsan-suedtirol",
 	"bari",
 	"barletta-trani-andria",
 	"barlettatraniandria",
@@ -11638,12 +11879,18 @@ var nodeLabels = [...]string{
 	"bo",
 	"bologna",
 	"bolzano",
+	"bolzano-altoadige",
 	"bozen",
+	"bozen-sudtirol",
+	"bozen-suedtirol",
 	"br",
 	"brescia",
 	"brindisi",
 	"bs",
 	"bt",
+	"bulsan",
+	"bulsan-sudtirol",
+	"bulsan-suedtirol",
 	"bz",
 	"ca",
 	"cagliari",
@@ -11889,6 +12136,10 @@ var nodeLabels = [...]string{
 	"traniandriabarletta",
 	"tranibarlettaandria",
 	"trapani",
+	"trentin-sud-tirol",
+	"trentin-sudtirol",
+	"trentin-sued-tirol",
+	"trentin-suedtirol",
 	"trentino",
 	"trentino-a-adige",
 	"trentino-aadige",
@@ -11910,6 +12161,10 @@ var nodeLabels = [...]string{
 	"trentinosudtirol",
 	"trentinosued-tirol",
 	"trentinosuedtirol",
+	"trentinsud-tirol",
+	"trentinsudtirol",
+	"trentinsued-tirol",
+	"trentinsuedtirol",
 	"trento",
 	"treviso",
 	"trieste",
@@ -11935,7 +12190,9 @@ var nodeLabels = [...]string{
 	"valled-aosta",
 	"valledaosta",
 	"vallee-aoste",
+	"vallee-d-aoste",
 	"valleeaoste",
+	"valleedaoste",
 	"vao",
 	"varese",
 	"vb",
@@ -11958,6 +12215,26 @@ var nodeLabels = [...]string{
 	"vs",
 	"vt",
 	"vv",
+	"xn--balsan-sudtirol-rqi",
+	"xn--bozen-sudtirol-76h",
+	"xn--bulsan-sudtirol-rqi",
+	"xn--cesena-forli-c2g",
+	"xn--cesenaforli-0jg",
+	"xn--forli-cesena-41g",
+	"xn--forlicesena-ujg",
+	"xn--sudtirol-y0e",
+	"xn--trentin-sud-tirol-tsj",
+	"xn--trentin-sudtirol-b9i",
+	"xn--trentino-sud-tirol-dck",
+	"xn--trentino-sudtirol-usj",
+	"xn--trentinosud-tirol-tsj",
+	"xn--trentinosudtirol-b9i",
+	"xn--trentinsud-tirol-98i",
+	"xn--trentinsudtirol-rqi",
+	"xn--vallee-aoste-i2g",
+	"xn--vallee-d-aoste-43h",
+	"xn--valleeaoste-6jg",
+	"xn--valleedaoste-i2g",
 	"co",
 	"net",
 	"org",
@@ -13767,6 +14044,7 @@ var nodeLabels = [...]string{
 	"me",
 	"mobi",
 	"ne",
+	"nom",
 	"or",
 	"sc",
 	"blogspot",
@@ -13844,6 +14122,13 @@ var nodeLabels = [...]string{
 	"edu",
 	"com",
 	"edu",
+	"emb",
+	"gov",
+	"ind",
+	"net",
+	"org",
+	"com",
+	"edu",
 	"gov",
 	"net",
 	"org",
@@ -13878,6 +14163,7 @@ var nodeLabels = [...]string{
 	"edu",
 	"gov",
 	"net",
+	"nym",
 	"org",
 	"oy",
 	"blogspot",
@@ -13941,6 +14227,7 @@ var nodeLabels = [...]string{
 	"tm",
 	"blogspot",
 	"ac",
+	"barsy",
 	"brasilia",
 	"c66",
 	"co",
@@ -13958,15 +14245,20 @@ var nodeLabels = [...]string{
 	"loginto",
 	"myds",
 	"net",
+	"nohost",
 	"noip",
 	"nym",
 	"org",
 	"priv",
+	"ravendb",
+	"soundcast",
 	"synology",
+	"tcp4",
 	"webhop",
 	"wedeploy",
 	"yombo",
 	"localhost",
+	"barsy",
 	"co",
 	"com",
 	"edu",
@@ -13995,12 +14287,14 @@ var nodeLabels = [...]string{
 	"edu",
 	"gov",
 	"nyc",
+	"nym",
 	"org",
 	"com",
 	"edu",
 	"gov",
 	"net",
 	"org",
+	"barsy",
 	"dscloud",
 	"blogspot",
 	"gov",
@@ -14645,6 +14939,7 @@ var nodeLabels = [...]string{
 	"azure-mobile",
 	"azurewebsites",
 	"barsy",
+	"blackbaudcdn",
 	"blogdns",
 	"boomla",
 	"bounceme",
@@ -14657,14 +14952,18 @@ var nodeLabels = [...]string{
 	"channelsdvr",
 	"cloudaccess",
 	"cloudapp",
+	"cloudeity",
 	"cloudfront",
 	"cloudfunctions",
+	"cloudycluster",
 	"cryptonomic",
+	"dattolocal",
 	"ddns",
 	"debian",
 	"definima",
 	"dnsalias",
 	"dnsdojo",
+	"dnsup",
 	"does-it",
 	"dontexist",
 	"dsmynas",
@@ -14687,6 +14986,7 @@ var nodeLabels = [...]string{
 	"gb",
 	"gets-it",
 	"ham-radio-op",
+	"hicam",
 	"homeftp",
 	"homeip",
 	"homelinux",
@@ -14701,7 +15001,9 @@ var nodeLabels = [...]string{
 	"jp",
 	"kicks-ass",
 	"knx-server",
+	"memset",
 	"moonscale",
+	"mydatto",
 	"mydissent",
 	"myeffect",
 	"myfritz",
@@ -14710,13 +15012,16 @@ var nodeLabels = [...]string{
 	"mysecuritycamera",
 	"nhlfan",
 	"no-ip",
+	"now-dns",
 	"office-on-the",
+	"ownip",
 	"pgafan",
 	"podzone",
 	"privatizehealthinsurance",
 	"rackmaze",
 	"redirectme",
 	"ru",
+	"schokokeks",
 	"scrapper-site",
 	"se",
 	"selfip",
@@ -14732,6 +15037,7 @@ var nodeLabels = [...]string{
 	"thruhere",
 	"twmail",
 	"uk",
+	"vpndns",
 	"webhop",
 	"za",
 	"r",
@@ -15598,6 +15904,7 @@ var nodeLabels = [...]string{
 	"accesscam",
 	"ae",
 	"amune",
+	"barsy",
 	"blogdns",
 	"blogsite",
 	"bmoattachments",
@@ -15622,6 +15929,7 @@ var nodeLabels = [...]string{
 	"dvrdns",
 	"dynalias",
 	"dyndns",
+	"dynserv",
 	"endofinternet",
 	"endoftheinternet",
 	"eu",
@@ -15630,6 +15938,7 @@ var nodeLabels = [...]string{
 	"fedorapeople",
 	"fedoraproject",
 	"freeddns",
+	"freedesktop",
 	"from-me",
 	"game-host",
 	"gotdns",
@@ -15661,8 +15970,10 @@ var nodeLabels = [...]string{
 	"isa-geek",
 	"js",
 	"kicks-ass",
+	"mayfirst",
 	"misconfused",
 	"mlbfan",
+	"mozilla-iot",
 	"my-firewall",
 	"myfirewall",
 	"myftp",
@@ -15670,6 +15981,7 @@ var nodeLabels = [...]string{
 	"mywire",
 	"nflfan",
 	"no-ip",
+	"now-dns",
 	"pimienta",
 	"podzone",
 	"poivron",
@@ -15688,6 +16000,7 @@ var nodeLabels = [...]string{
 	"tuxfamily",
 	"twmail",
 	"ufcfan",
+	"uklugs",
 	"us",
 	"webhop",
 	"webredirect",
@@ -16023,6 +16336,7 @@ var nodeLabels = [...]string{
 	"wuoz",
 	"wzmiuw",
 	"zp",
+	"own",
 	"co",
 	"edu",
 	"gov",
@@ -16046,13 +16360,16 @@ var nodeLabels = [...]string{
 	"acct",
 	"avocat",
 	"bar",
+	"barsy",
 	"cloudns",
 	"cpa",
+	"dnstrace",
 	"eng",
 	"jur",
 	"law",
 	"med",
 	"recht",
+	"bci",
 	"com",
 	"edu",
 	"gov",
@@ -16070,6 +16387,7 @@ var nodeLabels = [...]string{
 	"nym",
 	"org",
 	"publ",
+	"barsy",
 	"belau",
 	"cloudns",
 	"co",
@@ -16078,6 +16396,7 @@ var nodeLabels = [...]string{
 	"ne",
 	"nom",
 	"or",
+	"x443",
 	"com",
 	"coop",
 	"edu",
@@ -16108,6 +16427,7 @@ var nodeLabels = [...]string{
 	"info",
 	"nom",
 	"nt",
+	"nym",
 	"org",
 	"rec",
 	"shop",
@@ -16125,6 +16445,7 @@ var nodeLabels = [...]string{
 	"in",
 	"nom",
 	"org",
+	"ox",
 	"ac",
 	"adygeya",
 	"bashkiria",
@@ -16144,6 +16465,7 @@ var nodeLabels = [...]string{
 	"mil",
 	"mordovia",
 	"msk",
+	"myjino",
 	"mytis",
 	"nalchik",
 	"net",
@@ -16151,11 +16473,18 @@ var nodeLabels = [...]string{
 	"org",
 	"pp",
 	"pyatigorsk",
+	"ras",
 	"spb",
 	"test",
 	"vladikavkaz",
 	"vladimir",
 	"hb",
+	"hosting",
+	"landing",
+	"spectrum",
+	"vps",
+	"development",
+	"ravendb",
 	"ac",
 	"co",
 	"com",
@@ -16249,8 +16578,10 @@ var nodeLabels = [...]string{
 	"org",
 	"platform",
 	"wedeploy",
+	"barsy",
 	"blogspot",
 	"nom",
+	"barsy",
 	"byen",
 	"cyon",
 	"platformsh",
@@ -16272,7 +16603,7 @@ var nodeLabels = [...]string{
 	"com",
 	"net",
 	"org",
-	"stackspace",
+	"linkitools",
 	"uber",
 	"xs4all",
 	"co",
@@ -16283,6 +16614,8 @@ var nodeLabels = [...]string{
 	"gov",
 	"mil",
 	"net",
+	"noho",
+	"nom",
 	"org",
 	"principe",
 	"saotome",
@@ -16378,6 +16711,7 @@ var nodeLabels = [...]string{
 	"name",
 	"net",
 	"nic",
+	"nom",
 	"org",
 	"test",
 	"web",
@@ -16417,6 +16751,8 @@ var nodeLabels = [...]string{
 	"net",
 	"org",
 	"vpnplus",
+	"now-dns",
+	"ntdll",
 	"av",
 	"bbs",
 	"bel",
@@ -16584,6 +16920,7 @@ var nodeLabels = [...]string{
 	"org",
 	"sc",
 	"ac",
+	"barsy",
 	"co",
 	"gov",
 	"ltd",
@@ -16594,12 +16931,18 @@ var nodeLabels = [...]string{
 	"plc",
 	"police",
 	"sch",
+	"barsy",
+	"barsyonline",
 	"blogspot",
+	"gwiddle",
 	"nh-serv",
 	"no-ip",
 	"wellbeingzone",
 	"homeoffice",
 	"service",
+	"glug",
+	"lug",
+	"lugs",
 	"ak",
 	"al",
 	"ar",
@@ -16615,6 +16958,7 @@ var nodeLabels = [...]string{
 	"drud",
 	"fed",
 	"fl",
+	"freeddns",
 	"ga",
 	"golffan",
 	"gu",
@@ -16899,6 +17243,7 @@ var nodeLabels = [...]string{
 	"net",
 	"org",
 	"advisor",
+	"cloud66",
 	"com",
 	"dyndns",
 	"edu",
@@ -16912,6 +17257,12 @@ var nodeLabels = [...]string{
 	"xn--d1at",
 	"xn--o1ac",
 	"xn--o1ach",
+	"xn--55qx5d",
+	"xn--gmqw5a",
+	"xn--mxtq1m",
+	"xn--od0alg",
+	"xn--uc0atv",
+	"xn--wcvs22d",
 	"xn--12c1fe0br",
 	"xn--12cfi8ixb8l",
 	"xn--12co0c3b4eva",
@@ -16919,7 +17270,9 @@ var nodeLabels = [...]string{
 	"xn--m3ch0j3a",
 	"xn--o3cyx2a",
 	"blogsite",
+	"crafting",
 	"fhapp",
+	"zapto",
 	"ac",
 	"agric",
 	"alt",
diff --git a/vendor/golang.org/x/net/route/syscall.go b/vendor/golang.org/x/net/route/syscall.go
index c211188b..5f69ea63 100644
--- a/vendor/golang.org/x/net/route/syscall.go
+++ b/vendor/golang.org/x/net/route/syscall.go
@@ -20,7 +20,7 @@ func sysctl(mib []int32, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 	} else {
 		p = unsafe.Pointer(&zero)
 	}
-	_, _, errno := syscall.Syscall6(syscall.SYS___SYSCTL, uintptr(p), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	_, _, errno := syscall.Syscall6(syscall.SYS___SYSCTL, uintptr(p), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), newlen)
 	if errno != 0 {
 		return error(errno)
 	}
diff --git a/vendor/golang.org/x/net/trace/trace.go b/vendor/golang.org/x/net/trace/trace.go
index bb72a527..f00d869f 100644
--- a/vendor/golang.org/x/net/trace/trace.go
+++ b/vendor/golang.org/x/net/trace/trace.go
@@ -70,6 +70,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"net/url"
 	"runtime"
 	"sort"
 	"strconv"
@@ -110,6 +111,13 @@ var AuthRequest = func(req *http.Request) (any, sensitive bool) {
 }
 
 func init() {
+	_, pat := http.DefaultServeMux.Handler(&http.Request{URL: &url.URL{Path: "/debug/requests"}})
+	if pat != "" {
+		panic("/debug/requests is already registered. You may have two independent copies of " +
+			"golang.org/x/net/trace in your binary, trying to maintain separate state. This may " +
+			"involve a vendored copy of golang.org/x/net/trace.")
+	}
+
 	// TODO(jbd): Serve Traces from /debug/traces in the future?
 	// There is no requirement for a request to be present to have traces.
 	http.HandleFunc("/debug/requests", Traces)
@@ -368,7 +376,11 @@ func New(family, title string) Trace {
 }
 
 func (tr *trace) Finish() {
-	tr.Elapsed = time.Now().Sub(tr.Start)
+	elapsed := time.Now().Sub(tr.Start)
+	tr.mu.Lock()
+	tr.Elapsed = elapsed
+	tr.mu.Unlock()
+
 	if DebugUseAfterFinish {
 		buf := make([]byte, 4<<10) // 4 KB should be enough
 		n := runtime.Stack(buf, false)
@@ -381,14 +393,17 @@ func (tr *trace) Finish() {
 	m.Remove(tr)
 
 	f := getFamily(tr.Family, true)
+	tr.mu.RLock() // protects tr fields in Cond.match calls
 	for _, b := range f.Buckets {
 		if b.Cond.match(tr) {
 			b.Add(tr)
 		}
 	}
+	tr.mu.RUnlock()
+
 	// Add a sample of elapsed time as microseconds to the family's timeseries
 	h := new(histogram)
-	h.addMeasurement(tr.Elapsed.Nanoseconds() / 1e3)
+	h.addMeasurement(elapsed.Nanoseconds() / 1e3)
 	f.LatencyMu.Lock()
 	f.Latency.Add(h)
 	f.LatencyMu.Unlock()
@@ -684,25 +699,20 @@ type trace struct {
 	// Title is the title of this trace.
 	Title string
 
-	// Timing information.
-	Start   time.Time
-	Elapsed time.Duration // zero while active
-
-	// Trace information if non-zero.
-	traceID uint64
-	spanID  uint64
+	// Start time of the this trace.
+	Start time.Time
 
-	// Whether this trace resulted in an error.
-	IsError bool
-
-	// Append-only sequence of events (modulo discards).
 	mu        sync.RWMutex
-	events    []event
+	events    []event // Append-only sequence of events (modulo discards).
 	maxEvents int
+	recycler  func(interface{})
+	IsError   bool          // Whether this trace resulted in an error.
+	Elapsed   time.Duration // Elapsed time for this trace, zero while active.
+	traceID   uint64        // Trace information if non-zero.
+	spanID    uint64
 
-	refs     int32 // how many buckets this is in
-	recycler func(interface{})
-	disc     discarded // scratch space to avoid allocation
+	refs int32     // how many buckets this is in
+	disc discarded // scratch space to avoid allocation
 
 	finishStack []byte // where finish was called, if DebugUseAfterFinish is set
 
@@ -714,14 +724,18 @@ func (tr *trace) reset() {
 	tr.Family = ""
 	tr.Title = ""
 	tr.Start = time.Time{}
+
+	tr.mu.Lock()
 	tr.Elapsed = 0
 	tr.traceID = 0
 	tr.spanID = 0
 	tr.IsError = false
 	tr.maxEvents = 0
 	tr.events = nil
-	tr.refs = 0
 	tr.recycler = nil
+	tr.mu.Unlock()
+
+	tr.refs = 0
 	tr.disc = 0
 	tr.finishStack = nil
 	for i := range tr.eventsBuf {
@@ -801,21 +815,31 @@ func (tr *trace) LazyPrintf(format string, a ...interface{}) {
 	tr.addEvent(&lazySprintf{format, a}, false, false)
 }
 
-func (tr *trace) SetError() { tr.IsError = true }
+func (tr *trace) SetError() {
+	tr.mu.Lock()
+	tr.IsError = true
+	tr.mu.Unlock()
+}
 
 func (tr *trace) SetRecycler(f func(interface{})) {
+	tr.mu.Lock()
 	tr.recycler = f
+	tr.mu.Unlock()
 }
 
 func (tr *trace) SetTraceInfo(traceID, spanID uint64) {
+	tr.mu.Lock()
 	tr.traceID, tr.spanID = traceID, spanID
+	tr.mu.Unlock()
 }
 
 func (tr *trace) SetMaxEvents(m int) {
+	tr.mu.Lock()
 	// Always keep at least three events: first, discarded count, last.
 	if len(tr.events) == 0 && m > 3 {
 		tr.maxEvents = m
 	}
+	tr.mu.Unlock()
 }
 
 func (tr *trace) ref() {
@@ -824,6 +848,7 @@ func (tr *trace) ref() {
 
 func (tr *trace) unref() {
 	if atomic.AddInt32(&tr.refs, -1) == 0 {
+		tr.mu.RLock()
 		if tr.recycler != nil {
 			// freeTrace clears tr, so we hold tr.recycler and tr.events here.
 			go func(f func(interface{}), es []event) {
@@ -834,6 +859,7 @@ func (tr *trace) unref() {
 				}
 			}(tr.recycler, tr.events)
 		}
+		tr.mu.RUnlock()
 
 		freeTrace(tr)
 	}
@@ -844,7 +870,10 @@ func (tr *trace) When() string {
 }
 
 func (tr *trace) ElapsedTime() string {
+	tr.mu.RLock()
 	t := tr.Elapsed
+	tr.mu.RUnlock()
+
 	if t == 0 {
 		// Active trace.
 		t = time.Since(tr.Start)
diff --git a/vendor/golang.org/x/net/webdav/prop.go b/vendor/golang.org/x/net/webdav/prop.go
index e36a3b31..4d7be349 100644
--- a/vendor/golang.org/x/net/webdav/prop.go
+++ b/vendor/golang.org/x/net/webdav/prop.go
@@ -7,6 +7,7 @@ package webdav
 import (
 	"bytes"
 	"encoding/xml"
+	"errors"
 	"fmt"
 	"io"
 	"mime"
@@ -376,10 +377,37 @@ func findContentLength(ctx context.Context, fs FileSystem, ls LockSystem, name s
 }
 
 func findLastModified(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
-	return fi.ModTime().Format(http.TimeFormat), nil
+	return fi.ModTime().UTC().Format(http.TimeFormat), nil
+}
+
+// ErrNotImplemented should be returned by optional interfaces if they
+// want the original implementation to be used.
+var ErrNotImplemented = errors.New("not implemented")
+
+// ContentTyper is an optional interface for the os.FileInfo
+// objects returned by the FileSystem.
+//
+// If this interface is defined then it will be used to read the
+// content type from the object.
+//
+// If this interface is not defined the file will be opened and the
+// content type will be guessed from the initial contents of the file.
+type ContentTyper interface {
+	// ContentType returns the content type for the file.
+	//
+	// If this returns error ErrNotImplemented then the error will
+	// be ignored and the base implementation will be used
+	// instead.
+	ContentType(ctx context.Context) (string, error)
 }
 
 func findContentType(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
+	if do, ok := fi.(ContentTyper); ok {
+		ctype, err := do.ContentType(ctx)
+		if err != ErrNotImplemented {
+			return ctype, err
+		}
+	}
 	f, err := fs.OpenFile(ctx, name, os.O_RDONLY, 0)
 	if err != nil {
 		return "", err
@@ -402,7 +430,31 @@ func findContentType(ctx context.Context, fs FileSystem, ls LockSystem, name str
 	return ctype, err
 }
 
+// ETager is an optional interface for the os.FileInfo objects
+// returned by the FileSystem.
+//
+// If this interface is defined then it will be used to read the ETag
+// for the object.
+//
+// If this interface is not defined an ETag will be computed using the
+// ModTime() and the Size() methods of the os.FileInfo object.
+type ETager interface {
+	// ETag returns an ETag for the file.  This should be of the
+	// form "value" or W/"value"
+	//
+	// If this returns error ErrNotImplemented then the error will
+	// be ignored and the base implementation will be used
+	// instead.
+	ETag(ctx context.Context) (string, error)
+}
+
 func findETag(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
+	if do, ok := fi.(ETager); ok {
+		etag, err := do.ETag(ctx)
+		if err != ErrNotImplemented {
+			return etag, err
+		}
+	}
 	// The Apache http 2.4 web server by default concatenates the
 	// modification time and size of a file. We replicate the heuristic
 	// with nanosecond granularity.
diff --git a/vendor/golang.org/x/net/webdav/prop_test.go b/vendor/golang.org/x/net/webdav/prop_test.go
index 57d0e826..bc42b913 100644
--- a/vendor/golang.org/x/net/webdav/prop_test.go
+++ b/vendor/golang.org/x/net/webdav/prop_test.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"os"
 	"reflect"
+	"regexp"
 	"sort"
 	"testing"
 
@@ -29,7 +30,7 @@ func TestMemPS(t *testing.T) {
 			for i, p := range pst.Props {
 				switch p.XMLName {
 				case xml.Name{Space: "DAV:", Local: "getlastmodified"}:
-					p.InnerXML = []byte(fi.ModTime().Format(http.TimeFormat))
+					p.InnerXML = []byte(fi.ModTime().UTC().Format(http.TimeFormat))
 					pst.Props[i] = p
 				case xml.Name{Space: "DAV:", Local: "getetag"}:
 					if fi.IsDir() {
@@ -611,3 +612,106 @@ func (f noDeadPropsFile) Readdir(count int) ([]os.FileInfo, error)  { return f.f
 func (f noDeadPropsFile) Seek(off int64, whence int) (int64, error) { return f.f.Seek(off, whence) }
 func (f noDeadPropsFile) Stat() (os.FileInfo, error)                { return f.f.Stat() }
 func (f noDeadPropsFile) Write(p []byte) (int, error)               { return f.f.Write(p) }
+
+type overrideContentType struct {
+	os.FileInfo
+	contentType string
+	err         error
+}
+
+func (o *overrideContentType) ContentType(ctx context.Context) (string, error) {
+	return o.contentType, o.err
+}
+
+func TestFindContentTypeOverride(t *testing.T) {
+	fs, err := buildTestFS([]string{"touch /file"})
+	if err != nil {
+		t.Fatalf("cannot create test filesystem: %v", err)
+	}
+	ctx := context.Background()
+	fi, err := fs.Stat(ctx, "/file")
+	if err != nil {
+		t.Fatalf("cannot Stat /file: %v", err)
+	}
+
+	// Check non overridden case
+	originalContentType, err := findContentType(ctx, fs, nil, "/file", fi)
+	if err != nil {
+		t.Fatalf("findContentType /file failed: %v", err)
+	}
+	if originalContentType != "text/plain; charset=utf-8" {
+		t.Fatalf("ContentType wrong want %q got %q", "text/plain; charset=utf-8", originalContentType)
+	}
+
+	// Now try overriding the ContentType
+	o := &overrideContentType{fi, "OverriddenContentType", nil}
+	ContentType, err := findContentType(ctx, fs, nil, "/file", o)
+	if err != nil {
+		t.Fatalf("findContentType /file failed: %v", err)
+	}
+	if ContentType != o.contentType {
+		t.Fatalf("ContentType wrong want %q got %q", o.contentType, ContentType)
+	}
+
+	// Now return ErrNotImplemented and check we get the original content type
+	o = &overrideContentType{fi, "OverriddenContentType", ErrNotImplemented}
+	ContentType, err = findContentType(ctx, fs, nil, "/file", o)
+	if err != nil {
+		t.Fatalf("findContentType /file failed: %v", err)
+	}
+	if ContentType != originalContentType {
+		t.Fatalf("ContentType wrong want %q got %q", originalContentType, ContentType)
+	}
+}
+
+type overrideETag struct {
+	os.FileInfo
+	eTag string
+	err  error
+}
+
+func (o *overrideETag) ETag(ctx context.Context) (string, error) {
+	return o.eTag, o.err
+}
+
+func TestFindETagOverride(t *testing.T) {
+	fs, err := buildTestFS([]string{"touch /file"})
+	if err != nil {
+		t.Fatalf("cannot create test filesystem: %v", err)
+	}
+	ctx := context.Background()
+	fi, err := fs.Stat(ctx, "/file")
+	if err != nil {
+		t.Fatalf("cannot Stat /file: %v", err)
+	}
+
+	// Check non overridden case
+	originalETag, err := findETag(ctx, fs, nil, "/file", fi)
+	if err != nil {
+		t.Fatalf("findETag /file failed: %v", err)
+	}
+	matchETag := regexp.MustCompile(`^"-?[0-9a-f]{6,}"$`)
+	if !matchETag.MatchString(originalETag) {
+		t.Fatalf("ETag wrong, wanted something matching %v got %q", matchETag, originalETag)
+	}
+
+	// Now try overriding the ETag
+	o := &overrideETag{fi, `"OverriddenETag"`, nil}
+	ETag, err := findETag(ctx, fs, nil, "/file", o)
+	if err != nil {
+		t.Fatalf("findETag /file failed: %v", err)
+	}
+	if ETag != o.eTag {
+		t.Fatalf("ETag wrong want %q got %q", o.eTag, ETag)
+	}
+
+	// Now return ErrNotImplemented and check we get the original Etag
+	o = &overrideETag{fi, `"OverriddenETag"`, ErrNotImplemented}
+	ETag, err = findETag(ctx, fs, nil, "/file", o)
+	if err != nil {
+		t.Fatalf("findETag /file failed: %v", err)
+	}
+	if ETag != originalETag {
+		t.Fatalf("ETag wrong want %q got %q", originalETag, ETag)
+	}
+}
diff --git a/vendor/golang.org/x/net/websocket/websocket.go b/vendor/golang.org/x/net/websocket/websocket.go
index e242c89a..1f4f7be4 100644
--- a/vendor/golang.org/x/net/websocket/websocket.go
+++ b/vendor/golang.org/x/net/websocket/websocket.go
@@ -241,7 +241,10 @@ func (ws *Conn) Close() error {
 	return err1
 }
 
+// IsClientConn reports whether ws is a client-side connection.
 func (ws *Conn) IsClientConn() bool { return ws.request == nil }
+
+// IsServerConn reports whether ws is a server-side connection.
 func (ws *Conn) IsServerConn() bool { return ws.request != nil }
 
 // LocalAddr returns the WebSocket Origin for the connection for client, or
diff --git a/vendor/golang.org/x/sys/.gitattributes b/vendor/golang.org/x/sys/.gitattributes
new file mode 100644
index 00000000..d2f212e5
--- /dev/null
+++ b/vendor/golang.org/x/sys/.gitattributes
@@ -0,0 +1,10 @@
+# Treat all files in this repo as binary, with no git magic updating
+# line endings. Windows users contributing to Go will need to use a
+# modern version of git and editors capable of LF line endings.
+#
+# We'll prevent accidental CRLF line endings from entering the repo
+# via the git-review gofmt checks.
+#
+# See golang.org/issue/9281
+
+* -text
diff --git a/vendor/golang.org/x/sys/.gitignore b/vendor/golang.org/x/sys/.gitignore
new file mode 100644
index 00000000..8339fd61
--- /dev/null
+++ b/vendor/golang.org/x/sys/.gitignore
@@ -0,0 +1,2 @@
+# Add no patterns to .hgignore except for files generated by the build.
+last-change
diff --git a/vendor/golang.org/x/sys/AUTHORS b/vendor/golang.org/x/sys/AUTHORS
new file mode 100644
index 00000000..15167cd7
--- /dev/null
+++ b/vendor/golang.org/x/sys/AUTHORS
@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at http://tip.golang.org/AUTHORS.
diff --git a/vendor/golang.org/x/sys/CONTRIBUTING.md b/vendor/golang.org/x/sys/CONTRIBUTING.md
new file mode 100644
index 00000000..d0485e88
--- /dev/null
+++ b/vendor/golang.org/x/sys/CONTRIBUTING.md
@@ -0,0 +1,26 @@
+# Contributing to Go
+
+Go is an open source project.
+
+It is the work of hundreds of contributors. We appreciate your help!
+
+## Filing issues
+
+When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
+
+1.  What version of Go are you using (`go version`)?
+2.  What operating system and processor architecture are you using?
+3.  What did you do?
+4.  What did you expect to see?
+5.  What did you see instead?
+
+General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
+The gophers there will answer or ask you to file an issue if you've tripped over a bug.
+
+## Contributing code
+
+Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
+before sending patches.
+
+Unless otherwise noted, the Go source files are distributed under
+the BSD-style license found in the LICENSE file.
diff --git a/vendor/golang.org/x/sys/CONTRIBUTORS b/vendor/golang.org/x/sys/CONTRIBUTORS
new file mode 100644
index 00000000..1c4577e9
--- /dev/null
+++ b/vendor/golang.org/x/sys/CONTRIBUTORS
@@ -0,0 +1,3 @@
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.
diff --git a/vendor/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE
new file mode 100644
index 00000000..6a66aea5
--- /dev/null
+++ b/vendor/golang.org/x/sys/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/sys/PATENTS b/vendor/golang.org/x/sys/PATENTS
new file mode 100644
index 00000000..73309904
--- /dev/null
+++ b/vendor/golang.org/x/sys/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/sys/README.md b/vendor/golang.org/x/sys/README.md
new file mode 100644
index 00000000..ef6c9e59
--- /dev/null
+++ b/vendor/golang.org/x/sys/README.md
@@ -0,0 +1,18 @@
+# sys
+
+This repository holds supplemental Go packages for low-level interactions with
+the operating system.
+
+## Download/Install
+
+The easiest way to install is to run `go get -u golang.org/x/sys`. You can
+also manually git clone the repository to `$GOPATH/src/golang.org/x/sys`.
+
+## Report Issues / Send Patches
+
+This repository uses Gerrit for code changes. To learn how to submit changes to
+this repository, see https://golang.org/doc/contribute.html.
+
+The main issue tracker for the sys repository is located at
+https://github.com/golang/go/issues. Prefix your issue with "x/sys:" in the
+subject line, so it is easy to find.
diff --git a/vendor/golang.org/x/sys/codereview.cfg b/vendor/golang.org/x/sys/codereview.cfg
new file mode 100644
index 00000000..3f8b14b6
--- /dev/null
+++ b/vendor/golang.org/x/sys/codereview.cfg
@@ -0,0 +1 @@
+issuerepo: golang/go
diff --git a/vendor/golang.org/x/sys/cpu/cpu.go b/vendor/golang.org/x/sys/cpu/cpu.go
new file mode 100644
index 00000000..3d88f866
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu.go
@@ -0,0 +1,38 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package cpu implements processor feature detection for
+// various CPU architectures.
+package cpu
+
+// CacheLinePad is used to pad structs to avoid false sharing.
+type CacheLinePad struct{ _ [cacheLineSize]byte }
+
+// X86 contains the supported CPU features of the
+// current X86/AMD64 platform. If the current platform
+// is not X86/AMD64 then all feature flags are false.
+//
+// X86 is padded to avoid false sharing. Further the HasAVX
+// and HasAVX2 are only set if the OS supports XMM and YMM
+// registers in addition to the CPUID feature bit being set.
+var X86 struct {
+	_            CacheLinePad
+	HasAES       bool // AES hardware implementation (AES NI)
+	HasADX       bool // Multi-precision add-carry instruction extensions
+	HasAVX       bool // Advanced vector extension
+	HasAVX2      bool // Advanced vector extension 2
+	HasBMI1      bool // Bit manipulation instruction set 1
+	HasBMI2      bool // Bit manipulation instruction set 2
+	HasERMS      bool // Enhanced REP for MOVSB and STOSB
+	HasFMA       bool // Fused-multiply-add instructions
+	HasOSXSAVE   bool // OS supports XSAVE/XRESTOR for saving/restoring XMM registers.
+	HasPCLMULQDQ bool // PCLMULQDQ instruction - most often used for AES-GCM
+	HasPOPCNT    bool // Hamming weight instruction POPCNT.
+	HasSSE2      bool // Streaming SIMD extension 2 (always available on amd64)
+	HasSSE3      bool // Streaming SIMD extension 3
+	HasSSSE3     bool // Supplemental streaming SIMD extension 3
+	HasSSE41     bool // Streaming SIMD extension 4 and 4.1
+	HasSSE42     bool // Streaming SIMD extension 4 and 4.2
+	_            CacheLinePad
+}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm.go b/vendor/golang.org/x/sys/cpu/cpu_arm.go
new file mode 100644
index 00000000..d93036f7
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_arm.go
@@ -0,0 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cpu
+
+const cacheLineSize = 32
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_arm64.go
new file mode 100644
index 00000000..1d2ab290
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_arm64.go
@@ -0,0 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cpu
+
+const cacheLineSize = 64
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go b/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go
new file mode 100644
index 00000000..f7cb4697
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go
@@ -0,0 +1,16 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386 amd64 amd64p32
+// +build !gccgo
+
+package cpu
+
+// cpuid is implemented in cpu_x86.s for gc compiler
+// and in cpu_gccgo.c for gccgo.
+func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32)
+
+// xgetbv with ecx = 0 is implemented in cpu_x86.s for gc compiler
+// and in cpu_gccgo.c for gccgo.
+func xgetbv() (eax, edx uint32)
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo.c b/vendor/golang.org/x/sys/cpu/cpu_gccgo.c
new file mode 100644
index 00000000..e363c7d1
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_gccgo.c
@@ -0,0 +1,43 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386 amd64 amd64p32
+// +build gccgo
+
+#include <cpuid.h>
+#include <stdint.h>
+
+// Need to wrap __get_cpuid_count because it's declared as static.
+int
+gccgoGetCpuidCount(uint32_t leaf, uint32_t subleaf,
+                   uint32_t *eax, uint32_t *ebx,
+                   uint32_t *ecx, uint32_t *edx)
+{
+	return __get_cpuid_count(leaf, subleaf, eax, ebx, ecx, edx);
+}
+
+// xgetbv reads the contents of an XCR (Extended Control Register)
+// specified in the ECX register into registers EDX:EAX.
+// Currently, the only supported value for XCR is 0.
+//
+// TODO: Replace with a better alternative:
+//
+//     #include <xsaveintrin.h>
+//
+//     #pragma GCC target("xsave")
+//
+//     void gccgoXgetbv(uint32_t *eax, uint32_t *edx) {
+//       unsigned long long x = _xgetbv(0);
+//       *eax = x & 0xffffffff;
+//       *edx = (x >> 32) & 0xffffffff;
+//     }
+//
+// Note that _xgetbv is defined starting with GCC 8.
+void
+gccgoXgetbv(uint32_t *eax, uint32_t *edx)
+{
+	__asm("  xorl %%ecx, %%ecx\n"
+	      "  xgetbv"
+	    : "=a"(*eax), "=d"(*edx));
+}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo.go b/vendor/golang.org/x/sys/cpu/cpu_gccgo.go
new file mode 100644
index 00000000..ba49b91b
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_gccgo.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386 amd64 amd64p32
+// +build gccgo
+
+package cpu
+
+//extern gccgoGetCpuidCount
+func gccgoGetCpuidCount(eaxArg, ecxArg uint32, eax, ebx, ecx, edx *uint32)
+
+func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32) {
+	var a, b, c, d uint32
+	gccgoGetCpuidCount(eaxArg, ecxArg, &a, &b, &c, &d)
+	return a, b, c, d
+}
+
+//extern gccgoXgetbv
+func gccgoXgetbv(eax, edx *uint32)
+
+func xgetbv() (eax, edx uint32) {
+	var a, d uint32
+	gccgoXgetbv(&a, &d)
+	return a, d
+}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_mips64x.go b/vendor/golang.org/x/sys/cpu/cpu_mips64x.go
new file mode 100644
index 00000000..6165f121
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_mips64x.go
@@ -0,0 +1,9 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build mips64 mips64le
+
+package cpu
+
+const cacheLineSize = 32
diff --git a/vendor/golang.org/x/sys/cpu/cpu_mipsx.go b/vendor/golang.org/x/sys/cpu/cpu_mipsx.go
new file mode 100644
index 00000000..1269eee8
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_mipsx.go
@@ -0,0 +1,9 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build mips mipsle
+
+package cpu
+
+const cacheLineSize = 32
diff --git a/vendor/golang.org/x/sys/cpu/cpu_ppc64x.go b/vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
new file mode 100644
index 00000000..d10759a5
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
@@ -0,0 +1,9 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ppc64 ppc64le
+
+package cpu
+
+const cacheLineSize = 128
diff --git a/vendor/golang.org/x/sys/cpu/cpu_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_s390x.go
new file mode 100644
index 00000000..684c4f00
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_s390x.go
@@ -0,0 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cpu
+
+const cacheLineSize = 256
diff --git a/vendor/golang.org/x/sys/cpu/cpu_test.go b/vendor/golang.org/x/sys/cpu/cpu_test.go
new file mode 100644
index 00000000..baf4b87b
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_test.go
@@ -0,0 +1,28 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cpu_test
+
+import (
+	"runtime"
+	"testing"
+
+	"golang.org/x/sys/cpu"
+)
+
+func TestAMD64minimalFeatures(t *testing.T) {
+	if runtime.GOARCH == "amd64" {
+		if !cpu.X86.HasSSE2 {
+			t.Fatal("HasSSE2 expected true, got false")
+		}
+	}
+}
+
+func TestAVX2hasAVX(t *testing.T) {
+	if runtime.GOARCH == "amd64" {
+		if cpu.X86.HasAVX2 && !cpu.X86.HasAVX {
+			t.Fatal("HasAVX expected true, got false")
+		}
+	}
+}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_x86.go b/vendor/golang.org/x/sys/cpu/cpu_x86.go
new file mode 100644
index 00000000..71e288b0
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_x86.go
@@ -0,0 +1,55 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386 amd64 amd64p32
+
+package cpu
+
+const cacheLineSize = 64
+
+func init() {
+	maxID, _, _, _ := cpuid(0, 0)
+
+	if maxID < 1 {
+		return
+	}
+
+	_, _, ecx1, edx1 := cpuid(1, 0)
+	X86.HasSSE2 = isSet(26, edx1)
+
+	X86.HasSSE3 = isSet(0, ecx1)
+	X86.HasPCLMULQDQ = isSet(1, ecx1)
+	X86.HasSSSE3 = isSet(9, ecx1)
+	X86.HasFMA = isSet(12, ecx1)
+	X86.HasSSE41 = isSet(19, ecx1)
+	X86.HasSSE42 = isSet(20, ecx1)
+	X86.HasPOPCNT = isSet(23, ecx1)
+	X86.HasAES = isSet(25, ecx1)
+	X86.HasOSXSAVE = isSet(27, ecx1)
+
+	osSupportsAVX := false
+	// For XGETBV, OSXSAVE bit is required and sufficient.
+	if X86.HasOSXSAVE {
+		eax, _ := xgetbv()
+		// Check if XMM and YMM registers have OS support.
+		osSupportsAVX = isSet(1, eax) && isSet(2, eax)
+	}
+
+	X86.HasAVX = isSet(28, ecx1) && osSupportsAVX
+
+	if maxID < 7 {
+		return
+	}
+
+	_, ebx7, _, _ := cpuid(7, 0)
+	X86.HasBMI1 = isSet(3, ebx7)
+	X86.HasAVX2 = isSet(5, ebx7) && osSupportsAVX
+	X86.HasBMI2 = isSet(8, ebx7)
+	X86.HasERMS = isSet(9, ebx7)
+	X86.HasADX = isSet(19, ebx7)
+}
+
+func isSet(bitpos uint, value uint32) bool {
+	return value&(1<<bitpos) != 0
+}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_x86.s b/vendor/golang.org/x/sys/cpu/cpu_x86.s
new file mode 100644
index 00000000..47f08412
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/cpu_x86.s
@@ -0,0 +1,27 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386 amd64 amd64p32
+// +build !gccgo
+
+#include "textflag.h"
+
+// func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·cpuid(SB), NOSPLIT, $0-24
+	MOVL eaxArg+0(FP), AX
+	MOVL ecxArg+4(FP), CX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
+
+// func xgetbv() (eax, edx uint32)
+TEXT ·xgetbv(SB),NOSPLIT,$0-8
+	MOVL $0, CX
+	XGETBV
+	MOVL AX, eax+0(FP)
+	MOVL DX, edx+4(FP)
+	RET
diff --git a/vendor/golang.org/x/sys/plan9/asm.s b/vendor/golang.org/x/sys/plan9/asm.s
new file mode 100644
index 00000000..06449ebf
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/asm.s
@@ -0,0 +1,8 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "textflag.h"
+
+TEXT ·use(SB),NOSPLIT,$0
+	RET
diff --git a/vendor/golang.org/x/sys/plan9/asm_plan9_386.s b/vendor/golang.org/x/sys/plan9/asm_plan9_386.s
new file mode 100644
index 00000000..bc5cab1f
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/asm_plan9_386.s
@@ -0,0 +1,30 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "textflag.h"
+
+//
+// System call support for 386, Plan 9
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-32
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-44
+	JMP	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·seek(SB),NOSPLIT,$0-36
+	JMP	syscall·seek(SB)
+
+TEXT ·exit(SB),NOSPLIT,$4-4
+	JMP	syscall·exit(SB)
diff --git a/vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s b/vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s
new file mode 100644
index 00000000..d3448e67
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s
@@ -0,0 +1,30 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "textflag.h"
+
+//
+// System call support for amd64, Plan 9
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-64
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-88
+	JMP	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·seek(SB),NOSPLIT,$0-56
+	JMP	syscall·seek(SB)
+
+TEXT ·exit(SB),NOSPLIT,$8-8
+	JMP	syscall·exit(SB)
diff --git a/vendor/golang.org/x/sys/plan9/asm_plan9_arm.s b/vendor/golang.org/x/sys/plan9/asm_plan9_arm.s
new file mode 100644
index 00000000..afb7c0a9
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/asm_plan9_arm.s
@@ -0,0 +1,25 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "textflag.h"
+
+// System call support for plan9 on arm
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-32
+	JMP	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-44
+	JMP	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·seek(SB),NOSPLIT,$0-36
+	JMP	syscall·exit(SB)
diff --git a/vendor/golang.org/x/sys/plan9/const_plan9.go b/vendor/golang.org/x/sys/plan9/const_plan9.go
new file mode 100644
index 00000000..b4e85a3a
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/const_plan9.go
@@ -0,0 +1,70 @@
+package plan9
+
+// Plan 9 Constants
+
+// Open modes
+const (
+	O_RDONLY  = 0
+	O_WRONLY  = 1
+	O_RDWR    = 2
+	O_TRUNC   = 16
+	O_CLOEXEC = 32
+	O_EXCL    = 0x1000
+)
+
+// Rfork flags
+const (
+	RFNAMEG  = 1 << 0
+	RFENVG   = 1 << 1
+	RFFDG    = 1 << 2
+	RFNOTEG  = 1 << 3
+	RFPROC   = 1 << 4
+	RFMEM    = 1 << 5
+	RFNOWAIT = 1 << 6
+	RFCNAMEG = 1 << 10
+	RFCENVG  = 1 << 11
+	RFCFDG   = 1 << 12
+	RFREND   = 1 << 13
+	RFNOMNT  = 1 << 14
+)
+
+// Qid.Type bits
+const (
+	QTDIR    = 0x80
+	QTAPPEND = 0x40
+	QTEXCL   = 0x20
+	QTMOUNT  = 0x10
+	QTAUTH   = 0x08
+	QTTMP    = 0x04
+	QTFILE   = 0x00
+)
+
+// Dir.Mode bits
+const (
+	DMDIR    = 0x80000000
+	DMAPPEND = 0x40000000
+	DMEXCL   = 0x20000000
+	DMMOUNT  = 0x10000000
+	DMAUTH   = 0x08000000
+	DMTMP    = 0x04000000
+	DMREAD   = 0x4
+	DMWRITE  = 0x2
+	DMEXEC   = 0x1
+)
+
+const (
+	STATMAX    = 65535
+	ERRMAX     = 128
+	STATFIXLEN = 49
+)
+
+// Mount and bind flags
+const (
+	MREPL   = 0x0000
+	MBEFORE = 0x0001
+	MAFTER  = 0x0002
+	MORDER  = 0x0003
+	MCREATE = 0x0004
+	MCACHE  = 0x0010
+	MMASK   = 0x0017
+)
diff --git a/vendor/golang.org/x/sys/plan9/dir_plan9.go b/vendor/golang.org/x/sys/plan9/dir_plan9.go
new file mode 100644
index 00000000..0955e0c5
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/dir_plan9.go
@@ -0,0 +1,212 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Plan 9 directory marshalling. See intro(5).
+
+package plan9
+
+import "errors"
+
+var (
+	ErrShortStat = errors.New("stat buffer too short")
+	ErrBadStat   = errors.New("malformed stat buffer")
+	ErrBadName   = errors.New("bad character in file name")
+)
+
+// A Qid represents a 9P server's unique identification for a file.
+type Qid struct {
+	Path uint64 // the file server's unique identification for the file
+	Vers uint32 // version number for given Path
+	Type uint8  // the type of the file (plan9.QTDIR for example)
+}
+
+// A Dir contains the metadata for a file.
+type Dir struct {
+	// system-modified data
+	Type uint16 // server type
+	Dev  uint32 // server subtype
+
+	// file data
+	Qid    Qid    // unique id from server
+	Mode   uint32 // permissions
+	Atime  uint32 // last read time
+	Mtime  uint32 // last write time
+	Length int64  // file length
+	Name   string // last element of path
+	Uid    string // owner name
+	Gid    string // group name
+	Muid   string // last modifier name
+}
+
+var nullDir = Dir{
+	Type: ^uint16(0),
+	Dev:  ^uint32(0),
+	Qid: Qid{
+		Path: ^uint64(0),
+		Vers: ^uint32(0),
+		Type: ^uint8(0),
+	},
+	Mode:   ^uint32(0),
+	Atime:  ^uint32(0),
+	Mtime:  ^uint32(0),
+	Length: ^int64(0),
+}
+
+// Null assigns special "don't touch" values to members of d to
+// avoid modifying them during plan9.Wstat.
+func (d *Dir) Null() { *d = nullDir }
+
+// Marshal encodes a 9P stat message corresponding to d into b
+//
+// If there isn't enough space in b for a stat message, ErrShortStat is returned.
+func (d *Dir) Marshal(b []byte) (n int, err error) {
+	n = STATFIXLEN + len(d.Name) + len(d.Uid) + len(d.Gid) + len(d.Muid)
+	if n > len(b) {
+		return n, ErrShortStat
+	}
+
+	for _, c := range d.Name {
+		if c == '/' {
+			return n, ErrBadName
+		}
+	}
+
+	b = pbit16(b, uint16(n)-2)
+	b = pbit16(b, d.Type)
+	b = pbit32(b, d.Dev)
+	b = pbit8(b, d.Qid.Type)
+	b = pbit32(b, d.Qid.Vers)
+	b = pbit64(b, d.Qid.Path)
+	b = pbit32(b, d.Mode)
+	b = pbit32(b, d.Atime)
+	b = pbit32(b, d.Mtime)
+	b = pbit64(b, uint64(d.Length))
+	b = pstring(b, d.Name)
+	b = pstring(b, d.Uid)
+	b = pstring(b, d.Gid)
+	b = pstring(b, d.Muid)
+
+	return n, nil
+}
+
+// UnmarshalDir decodes a single 9P stat message from b and returns the resulting Dir.
+//
+// If b is too small to hold a valid stat message, ErrShortStat is returned.
+//
+// If the stat message itself is invalid, ErrBadStat is returned.
+func UnmarshalDir(b []byte) (*Dir, error) {
+	if len(b) < STATFIXLEN {
+		return nil, ErrShortStat
+	}
+	size, buf := gbit16(b)
+	if len(b) != int(size)+2 {
+		return nil, ErrBadStat
+	}
+	b = buf
+
+	var d Dir
+	d.Type, b = gbit16(b)
+	d.Dev, b = gbit32(b)
+	d.Qid.Type, b = gbit8(b)
+	d.Qid.Vers, b = gbit32(b)
+	d.Qid.Path, b = gbit64(b)
+	d.Mode, b = gbit32(b)
+	d.Atime, b = gbit32(b)
+	d.Mtime, b = gbit32(b)
+
+	n, b := gbit64(b)
+	d.Length = int64(n)
+
+	var ok bool
+	if d.Name, b, ok = gstring(b); !ok {
+		return nil, ErrBadStat
+	}
+	if d.Uid, b, ok = gstring(b); !ok {
+		return nil, ErrBadStat
+	}
+	if d.Gid, b, ok = gstring(b); !ok {
+		return nil, ErrBadStat
+	}
+	if d.Muid, b, ok = gstring(b); !ok {
+		return nil, ErrBadStat
+	}
+
+	return &d, nil
+}
+
+// pbit8 copies the 8-bit number v to b and returns the remaining slice of b.
+func pbit8(b []byte, v uint8) []byte {
+	b[0] = byte(v)
+	return b[1:]
+}
+
+// pbit16 copies the 16-bit number v to b in little-endian order and returns the remaining slice of b.
+func pbit16(b []byte, v uint16) []byte {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+	return b[2:]
+}
+
+// pbit32 copies the 32-bit number v to b in little-endian order and returns the remaining slice of b.
+func pbit32(b []byte, v uint32) []byte {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+	b[2] = byte(v >> 16)
+	b[3] = byte(v >> 24)
+	return b[4:]
+}
+
+// pbit64 copies the 64-bit number v to b in little-endian order and returns the remaining slice of b.
+func pbit64(b []byte, v uint64) []byte {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+	b[2] = byte(v >> 16)
+	b[3] = byte(v >> 24)
+	b[4] = byte(v >> 32)
+	b[5] = byte(v >> 40)
+	b[6] = byte(v >> 48)
+	b[7] = byte(v >> 56)
+	return b[8:]
+}
+
+// pstring copies the string s to b, prepending it with a 16-bit length in little-endian order, and
+// returning the remaining slice of b..
+func pstring(b []byte, s string) []byte {
+	b = pbit16(b, uint16(len(s)))
+	n := copy(b, s)
+	return b[n:]
+}
+
+// gbit8 reads an 8-bit number from b and returns it with the remaining slice of b.
+func gbit8(b []byte) (uint8, []byte) {
+	return uint8(b[0]), b[1:]
+}
+
+// gbit16 reads a 16-bit number in little-endian order from b and returns it with the remaining slice of b.
+func gbit16(b []byte) (uint16, []byte) {
+	return uint16(b[0]) | uint16(b[1])<<8, b[2:]
+}
+
+// gbit32 reads a 32-bit number in little-endian order from b and returns it with the remaining slice of b.
+func gbit32(b []byte) (uint32, []byte) {
+	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24, b[4:]
+}
+
+// gbit64 reads a 64-bit number in little-endian order from b and returns it with the remaining slice of b.
+func gbit64(b []byte) (uint64, []byte) {
+	lo := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+	hi := uint32(b[4]) | uint32(b[5])<<8 | uint32(b[6])<<16 | uint32(b[7])<<24
+	return uint64(lo) | uint64(hi)<<32, b[8:]
+}
+
+// gstring reads a string from b, prefixed with a 16-bit length in little-endian order.
+// It returns the string with the remaining slice of b and a boolean. If the length is
+// greater than the number of bytes in b, the boolean will be false.
+func gstring(b []byte) (string, []byte, bool) {
+	n, b := gbit16(b)
+	if int(n) > len(b) {
+		return "", b, false
+	}
+	return string(b[:n]), b[n:], true
+}
diff --git a/vendor/golang.org/x/sys/plan9/env_plan9.go b/vendor/golang.org/x/sys/plan9/env_plan9.go
new file mode 100644
index 00000000..8f191800
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/env_plan9.go
@@ -0,0 +1,31 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Plan 9 environment variables.
+
+package plan9
+
+import (
+	"syscall"
+)
+
+func Getenv(key string) (value string, found bool) {
+	return syscall.Getenv(key)
+}
+
+func Setenv(key, value string) error {
+	return syscall.Setenv(key, value)
+}
+
+func Clearenv() {
+	syscall.Clearenv()
+}
+
+func Environ() []string {
+	return syscall.Environ()
+}
+
+func Unsetenv(key string) error {
+	return syscall.Unsetenv(key)
+}
diff --git a/vendor/golang.org/x/sys/plan9/errors_plan9.go b/vendor/golang.org/x/sys/plan9/errors_plan9.go
new file mode 100644
index 00000000..65fe74d3
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/errors_plan9.go
@@ -0,0 +1,50 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package plan9
+
+import "syscall"
+
+// Constants
+const (
+	// Invented values to support what package os expects.
+	O_CREAT    = 0x02000
+	O_APPEND   = 0x00400
+	O_NOCTTY   = 0x00000
+	O_NONBLOCK = 0x00000
+	O_SYNC     = 0x00000
+	O_ASYNC    = 0x00000
+
+	S_IFMT   = 0x1f000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+)
+
+// Errors
+var (
+	EINVAL       = syscall.NewError("bad arg in system call")
+	ENOTDIR      = syscall.NewError("not a directory")
+	EISDIR       = syscall.NewError("file is a directory")
+	ENOENT       = syscall.NewError("file does not exist")
+	EEXIST       = syscall.NewError("file already exists")
+	EMFILE       = syscall.NewError("no free file descriptors")
+	EIO          = syscall.NewError("i/o error")
+	ENAMETOOLONG = syscall.NewError("file name too long")
+	EINTR        = syscall.NewError("interrupted")
+	EPERM        = syscall.NewError("permission denied")
+	EBUSY        = syscall.NewError("no free devices")
+	ETIMEDOUT    = syscall.NewError("connection timed out")
+	EPLAN9       = syscall.NewError("not supported by plan 9")
+
+	// The following errors do not correspond to any
+	// Plan 9 system messages. Invented to support
+	// what package os and others expect.
+	EACCES       = syscall.NewError("access permission denied")
+	EAFNOSUPPORT = syscall.NewError("address family not supported by protocol")
+)
diff --git a/vendor/golang.org/x/sys/plan9/mkall.sh b/vendor/golang.org/x/sys/plan9/mkall.sh
new file mode 100755
index 00000000..9f73c606
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/mkall.sh
@@ -0,0 +1,138 @@
+#!/usr/bin/env bash
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# The plan9 package provides access to the raw system call
+# interface of the underlying operating system.  Porting Go to
+# a new architecture/operating system combination requires
+# some manual effort, though there are tools that automate
+# much of the process.  The auto-generated files have names
+# beginning with z.
+#
+# This script runs or (given -n) prints suggested commands to generate z files
+# for the current system.  Running those commands is not automatic.
+# This script is documentation more than anything else.
+#
+# * asm_${GOOS}_${GOARCH}.s
+#
+# This hand-written assembly file implements system call dispatch.
+# There are three entry points:
+#
+# 	func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr);
+# 	func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr);
+# 	func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr);
+#
+# The first and second are the standard ones; they differ only in
+# how many arguments can be passed to the kernel.
+# The third is for low-level use by the ForkExec wrapper;
+# unlike the first two, it does not call into the scheduler to
+# let it know that a system call is running.
+#
+# * syscall_${GOOS}.go
+#
+# This hand-written Go file implements system calls that need
+# special handling and lists "//sys" comments giving prototypes
+# for ones that can be auto-generated.  Mksyscall reads those
+# comments to generate the stubs.
+#
+# * syscall_${GOOS}_${GOARCH}.go
+#
+# Same as syscall_${GOOS}.go except that it contains code specific
+# to ${GOOS} on one particular architecture.
+#
+# * types_${GOOS}.c
+#
+# This hand-written C file includes standard C headers and then
+# creates typedef or enum names beginning with a dollar sign
+# (use of $ in variable names is a gcc extension).  The hardest
+# part about preparing this file is figuring out which headers to
+# include and which symbols need to be #defined to get the
+# actual data structures that pass through to the kernel system calls.
+# Some C libraries present alternate versions for binary compatibility
+# and translate them on the way in and out of system calls, but
+# there is almost always a #define that can get the real ones.
+# See types_darwin.c and types_linux.c for examples.
+#
+# * zerror_${GOOS}_${GOARCH}.go
+#
+# This machine-generated file defines the system's error numbers,
+# error strings, and signal numbers.  The generator is "mkerrors.sh".
+# Usually no arguments are needed, but mkerrors.sh will pass its
+# arguments on to godefs.
+#
+# * zsyscall_${GOOS}_${GOARCH}.go
+#
+# Generated by mksyscall.pl; see syscall_${GOOS}.go above.
+#
+# * zsysnum_${GOOS}_${GOARCH}.go
+#
+# Generated by mksysnum_${GOOS}.
+#
+# * ztypes_${GOOS}_${GOARCH}.go
+#
+# Generated by godefs; see types_${GOOS}.c above.
+
+GOOSARCH="${GOOS}_${GOARCH}"
+
+# defaults
+mksyscall="./mksyscall.pl"
+mkerrors="./mkerrors.sh"
+zerrors="zerrors_$GOOSARCH.go"
+mksysctl=""
+zsysctl="zsysctl_$GOOSARCH.go"
+mksysnum=
+mktypes=
+run="sh"
+
+case "$1" in
+-syscalls)
+	for i in zsyscall*go
+	do
+		sed 1q $i | sed 's;^// ;;' | sh > _$i && gofmt < _$i > $i
+		rm _$i
+	done
+	exit 0
+	;;
+-n)
+	run="cat"
+	shift
+esac
+
+case "$#" in
+0)
+	;;
+*)
+	echo 'usage: mkall.sh [-n]' 1>&2
+	exit 2
+esac
+
+case "$GOOSARCH" in
+_* | *_ | _)
+	echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2
+	exit 1
+	;;
+plan9_386)
+	mkerrors=
+	mksyscall="./mksyscall.pl -l32 -plan9"
+	mksysnum="./mksysnum_plan9.sh /n/sources/plan9/sys/src/libc/9syscall/sys.h"
+	mktypes="XXX"
+	;;
+*)
+	echo 'unrecognized $GOOS_$GOARCH: ' "$GOOSARCH" 1>&2
+	exit 1
+	;;
+esac
+
+(
+	if [ -n "$mkerrors" ]; then echo "$mkerrors |gofmt >$zerrors"; fi
+	case "$GOOS" in
+	plan9)
+		syscall_goos="syscall_$GOOS.go"
+		if [ -n "$mksyscall" ]; then echo "$mksyscall $syscall_goos syscall_$GOOSARCH.go |gofmt >zsyscall_$GOOSARCH.go"; fi
+		;;
+	esac
+	if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
+	if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
+	if [ -n "$mktypes" ]; then echo "$mktypes types_$GOOS.go |gofmt >ztypes_$GOOSARCH.go"; fi
+) | $run
diff --git a/vendor/golang.org/x/sys/plan9/mkerrors.sh b/vendor/golang.org/x/sys/plan9/mkerrors.sh
new file mode 100755
index 00000000..85309c4a
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/mkerrors.sh
@@ -0,0 +1,246 @@
+#!/usr/bin/env bash
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# Generate Go code listing errors and other #defined constant
+# values (ENAMETOOLONG etc.), by asking the preprocessor
+# about the definitions.
+
+unset LANG
+export LC_ALL=C
+export LC_CTYPE=C
+
+CC=${CC:-gcc}
+
+uname=$(uname)
+
+includes='
+#include <sys/types.h>
+#include <sys/file.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/tcp.h>
+#include <errno.h>
+#include <sys/signal.h>
+#include <signal.h>
+#include <sys/resource.h>
+'
+
+ccflags="$@"
+
+# Write go tool cgo -godefs input.
+(
+	echo package plan9
+	echo
+	echo '/*'
+	indirect="includes_$(uname)"
+	echo "${!indirect} $includes"
+	echo '*/'
+	echo 'import "C"'
+	echo
+	echo 'const ('
+
+	# The gcc command line prints all the #defines
+	# it encounters while processing the input
+	echo "${!indirect} $includes" | $CC -x c - -E -dM $ccflags |
+	awk '
+		$1 != "#define" || $2 ~ /\(/ || $3 == "" {next}
+
+		$2 ~ /^E([ABCD]X|[BIS]P|[SD]I|S|FL)$/ {next}  # 386 registers
+		$2 ~ /^(SIGEV_|SIGSTKSZ|SIGRT(MIN|MAX))/ {next}
+		$2 ~ /^(SCM_SRCRT)$/ {next}
+		$2 ~ /^(MAP_FAILED)$/ {next}
+
+		$2 !~ /^ETH_/ &&
+		$2 !~ /^EPROC_/ &&
+		$2 !~ /^EQUIV_/ &&
+		$2 !~ /^EXPR_/ &&
+		$2 ~ /^E[A-Z0-9_]+$/ ||
+		$2 ~ /^B[0-9_]+$/ ||
+		$2 ~ /^V[A-Z0-9]+$/ ||
+		$2 ~ /^CS[A-Z0-9]/ ||
+		$2 ~ /^I(SIG|CANON|CRNL|EXTEN|MAXBEL|STRIP|UTF8)$/ ||
+		$2 ~ /^IGN/ ||
+		$2 ~ /^IX(ON|ANY|OFF)$/ ||
+		$2 ~ /^IN(LCR|PCK)$/ ||
+		$2 ~ /(^FLU?SH)|(FLU?SH$)/ ||
+		$2 ~ /^C(LOCAL|READ)$/ ||
+		$2 == "BRKINT" ||
+		$2 == "HUPCL" ||
+		$2 == "PENDIN" ||
+		$2 == "TOSTOP" ||
+		$2 ~ /^PAR/ ||
+		$2 ~ /^SIG[^_]/ ||
+		$2 ~ /^O[CNPFP][A-Z]+[^_][A-Z]+$/ ||
+		$2 ~ /^IN_/ ||
+		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
+		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|EVFILT|NOTE|EV|SHUT|PROT|MAP|PACKET|MSG|SCM|MCL|DT|MADV|PR)_/ ||
+		$2 == "ICMPV6_FILTER" ||
+		$2 == "SOMAXCONN" ||
+		$2 == "NAME_MAX" ||
+		$2 == "IFNAMSIZ" ||
+		$2 ~ /^CTL_(MAXNAME|NET|QUERY)$/ ||
+		$2 ~ /^SYSCTL_VERS/ ||
+		$2 ~ /^(MS|MNT)_/ ||
+		$2 ~ /^TUN(SET|GET|ATTACH|DETACH)/ ||
+		$2 ~ /^(O|F|FD|NAME|S|PTRACE|PT)_/ ||
+		$2 ~ /^LINUX_REBOOT_CMD_/ ||
+		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
+		$2 !~ "NLA_TYPE_MASK" &&
+		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P)_/ ||
+		$2 ~ /^SIOC/ ||
+		$2 ~ /^TIOC/ ||
+		$2 !~ "RTF_BITS" &&
+		$2 ~ /^(IFF|IFT|NET_RT|RTM|RTF|RTV|RTA|RTAX)_/ ||
+		$2 ~ /^BIOC/ ||
+		$2 ~ /^RUSAGE_(SELF|CHILDREN|THREAD)/ ||
+		$2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|NOFILE|STACK)|RLIM_INFINITY/ ||
+		$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
+		$2 ~ /^CLONE_[A-Z_]+/ ||
+		$2 !~ /^(BPF_TIMEVAL)$/ &&
+		$2 ~ /^(BPF|DLT)_/ ||
+		$2 !~ "WMESGLEN" &&
+		$2 ~ /^W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", $2, $2)}
+		$2 ~ /^__WCOREFLAG$/ {next}
+		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
+
+		{next}
+	' | sort
+
+	echo ')'
+) >_const.go
+
+# Pull out the error names for later.
+errors=$(
+	echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
+	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print $2 }' |
+	sort
+)
+
+# Pull out the signal names for later.
+signals=$(
+	echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
+	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' |
+	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
+	sort
+)
+
+# Again, writing regexps to a file.
+echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
+	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print "^\t" $2 "[ \t]*=" }' |
+	sort >_error.grep
+echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
+	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' |
+	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
+	sort >_signal.grep
+
+echo '// mkerrors.sh' "$@"
+echo '// Code generated by the command above; DO NOT EDIT.'
+echo
+go tool cgo -godefs -- "$@" _const.go >_error.out
+cat _error.out | grep -vf _error.grep | grep -vf _signal.grep
+echo
+echo '// Errors'
+echo 'const ('
+cat _error.out | grep -f _error.grep | sed 's/=\(.*\)/= Errno(\1)/'
+echo ')'
+
+echo
+echo '// Signals'
+echo 'const ('
+cat _error.out | grep -f _signal.grep | sed 's/=\(.*\)/= Signal(\1)/'
+echo ')'
+
+# Run C program to print error and syscall strings.
+(
+	echo -E "
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <string.h>
+#include <signal.h>
+
+#define nelem(x) (sizeof(x)/sizeof((x)[0]))
+
+enum { A = 'A', Z = 'Z', a = 'a', z = 'z' }; // avoid need for single quotes below
+
+int errors[] = {
+"
+	for i in $errors
+	do
+		echo -E '	'$i,
+	done
+
+	echo -E "
+};
+
+int signals[] = {
+"
+	for i in $signals
+	do
+		echo -E '	'$i,
+	done
+
+	# Use -E because on some systems bash builtin interprets \n itself.
+	echo -E '
+};
+
+static int
+intcmp(const void *a, const void *b)
+{
+	return *(int*)a - *(int*)b;
+}
+
+int
+main(void)
+{
+	int i, j, e;
+	char buf[1024], *p;
+
+	printf("\n\n// Error table\n");
+	printf("var errors = [...]string {\n");
+	qsort(errors, nelem(errors), sizeof errors[0], intcmp);
+	for(i=0; i<nelem(errors); i++) {
+		e = errors[i];
+		if(i > 0 && errors[i-1] == e)
+			continue;
+		strcpy(buf, strerror(e));
+		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
+			buf[0] += a - A;
+		printf("\t%d: \"%s\",\n", e, buf);
+	}
+	printf("}\n\n");
+	
+	printf("\n\n// Signal table\n");
+	printf("var signals = [...]string {\n");
+	qsort(signals, nelem(signals), sizeof signals[0], intcmp);
+	for(i=0; i<nelem(signals); i++) {
+		e = signals[i];
+		if(i > 0 && signals[i-1] == e)
+			continue;
+		strcpy(buf, strsignal(e));
+		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
+			buf[0] += a - A;
+		// cut trailing : number.
+		p = strrchr(buf, ":"[0]);
+		if(p)
+			*p = '\0';
+		printf("\t%d: \"%s\",\n", e, buf);
+	}
+	printf("}\n\n");
+
+	return 0;
+}
+
+'
+) >_errors.c
+
+$CC $ccflags -o _errors _errors.c && $GORUN ./_errors && rm -f _errors.c _errors _const.go _error.grep _signal.grep _error.out
diff --git a/vendor/golang.org/x/sys/plan9/mksyscall.pl b/vendor/golang.org/x/sys/plan9/mksyscall.pl
new file mode 100755
index 00000000..252e89e1
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/mksyscall.pl
@@ -0,0 +1,319 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# This program reads a file containing function prototypes
+# (like syscall_plan9.go) and generates system call bodies.
+# The prototypes are marked by lines beginning with "//sys"
+# and read like func declarations if //sys is replaced by func, but:
+#	* The parameter lists must give a name for each argument.
+#	  This includes return parameters.
+#	* The parameter lists must give a type for each argument:
+#	  the (x, y, z int) shorthand is not allowed.
+#	* If the return parameter is an error number, it must be named errno.
+
+# A line beginning with //sysnb is like //sys, except that the
+# goroutine will not be suspended during the execution of the system
+# call.  This must only be used for system calls which can never
+# block, as otherwise the system call could cause all goroutines to
+# hang.
+
+use strict;
+
+my $cmdline = "mksyscall.pl " . join(' ', @ARGV);
+my $errors = 0;
+my $_32bit = "";
+my $plan9 = 0;
+my $openbsd = 0;
+my $netbsd = 0;
+my $dragonfly = 0;
+my $nacl = 0;
+my $arm = 0; # 64-bit value should use (even, odd)-pair
+
+if($ARGV[0] eq "-b32") {
+	$_32bit = "big-endian";
+	shift;
+} elsif($ARGV[0] eq "-l32") {
+	$_32bit = "little-endian";
+	shift;
+}
+if($ARGV[0] eq "-plan9") {
+	$plan9 = 1;
+	shift;
+}
+if($ARGV[0] eq "-openbsd") {
+	$openbsd = 1;
+	shift;
+}
+if($ARGV[0] eq "-netbsd") {
+	$netbsd = 1;
+	shift;
+}
+if($ARGV[0] eq "-dragonfly") {
+	$dragonfly = 1;
+	shift;
+}
+if($ARGV[0] eq "-nacl") {
+	$nacl = 1;
+	shift;
+}
+if($ARGV[0] eq "-arm") {
+	$arm = 1;
+	shift;
+}
+
+if($ARGV[0] =~ /^-/) {
+	print STDERR "usage: mksyscall.pl [-b32 | -l32] [file ...]\n";
+	exit 1;
+}
+
+sub parseparamlist($) {
+	my ($list) = @_;
+	$list =~ s/^\s*//;
+	$list =~ s/\s*$//;
+	if($list eq "") {
+		return ();
+	}
+	return split(/\s*,\s*/, $list);
+}
+
+sub parseparam($) {
+	my ($p) = @_;
+	if($p !~ /^(\S*) (\S*)$/) {
+		print STDERR "$ARGV:$.: malformed parameter: $p\n";
+		$errors = 1;
+		return ("xx", "int");
+	}
+	return ($1, $2);
+}
+
+my $text = "";
+while(<>) {
+	chomp;
+	s/\s+/ /g;
+	s/^\s+//;
+	s/\s+$//;
+	my $nonblock = /^\/\/sysnb /;
+	next if !/^\/\/sys / && !$nonblock;
+
+	# Line must be of the form
+	#	func Open(path string, mode int, perm int) (fd int, errno error)
+	# Split into name, in params, out params.
+	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*((?i)SYS_[A-Z0-9_]+))?$/) {
+		print STDERR "$ARGV:$.: malformed //sys declaration\n";
+		$errors = 1;
+		next;
+	}
+	my ($func, $in, $out, $sysname) = ($2, $3, $4, $5);
+
+	# Split argument lists on comma.
+	my @in = parseparamlist($in);
+	my @out = parseparamlist($out);
+
+	# Try in vain to keep people from editing this file.
+	# The theory is that they jump into the middle of the file
+	# without reading the header.
+	$text .= "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n";
+
+	# Go function header.
+	my $out_decl = @out ? sprintf(" (%s)", join(', ', @out)) : "";
+	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out_decl;
+
+	# Check if err return available
+	my $errvar = "";
+	foreach my $p (@out) {
+		my ($name, $type) = parseparam($p);
+		if($type eq "error") {
+			$errvar = $name;
+			last;
+		}
+	}
+
+	# Prepare arguments to Syscall.
+	my @args = ();
+	my @uses = ();
+	my $n = 0;
+	foreach my $p (@in) {
+		my ($name, $type) = parseparam($p);
+		if($type =~ /^\*/) {
+			push @args, "uintptr(unsafe.Pointer($name))";
+		} elsif($type eq "string" && $errvar ne "") {
+			$text .= "\tvar _p$n *byte\n";
+			$text .= "\t_p$n, $errvar = BytePtrFromString($name)\n";
+			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
+			push @args, "uintptr(unsafe.Pointer(_p$n))";
+			push @uses, "use(unsafe.Pointer(_p$n))";
+			$n++;
+		} elsif($type eq "string") {
+			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
+			$text .= "\tvar _p$n *byte\n";
+			$text .= "\t_p$n, _ = BytePtrFromString($name)\n";
+			push @args, "uintptr(unsafe.Pointer(_p$n))";
+			push @uses, "use(unsafe.Pointer(_p$n))";
+			$n++;
+		} elsif($type =~ /^\[\](.*)/) {
+			# Convert slice into pointer, length.
+			# Have to be careful not to take address of &a[0] if len == 0:
+			# pass dummy pointer in that case.
+			# Used to pass nil, but some OSes or simulators reject write(fd, nil, 0).
+			$text .= "\tvar _p$n unsafe.Pointer\n";
+			$text .= "\tif len($name) > 0 {\n\t\t_p$n = unsafe.Pointer(\&${name}[0])\n\t}";
+			$text .= " else {\n\t\t_p$n = unsafe.Pointer(&_zero)\n\t}";
+			$text .= "\n";
+			push @args, "uintptr(_p$n)", "uintptr(len($name))";
+			$n++;
+		} elsif($type eq "int64" && ($openbsd || $netbsd)) {
+			push @args, "0";
+			if($_32bit eq "big-endian") {
+				push @args, "uintptr($name>>32)", "uintptr($name)";
+			} elsif($_32bit eq "little-endian") {
+				push @args, "uintptr($name)", "uintptr($name>>32)";
+			} else {
+				push @args, "uintptr($name)";
+			}
+		} elsif($type eq "int64" && $dragonfly) {
+			if ($func !~ /^extp(read|write)/i) {
+				push @args, "0";
+			}
+			if($_32bit eq "big-endian") {
+				push @args, "uintptr($name>>32)", "uintptr($name)";
+			} elsif($_32bit eq "little-endian") {
+				push @args, "uintptr($name)", "uintptr($name>>32)";
+			} else {
+				push @args, "uintptr($name)";
+			}
+		} elsif($type eq "int64" && $_32bit ne "") {
+			if(@args % 2 && $arm) {
+				# arm abi specifies 64-bit argument uses 
+				# (even, odd) pair
+				push @args, "0"
+			}
+			if($_32bit eq "big-endian") {
+				push @args, "uintptr($name>>32)", "uintptr($name)";
+			} else {
+				push @args, "uintptr($name)", "uintptr($name>>32)";
+			}
+		} else {
+			push @args, "uintptr($name)";
+		}
+	}
+
+	# Determine which form to use; pad args with zeros.
+	my $asm = "Syscall";
+	if ($nonblock) {
+		$asm = "RawSyscall";
+	}
+	if(@args <= 3) {
+		while(@args < 3) {
+			push @args, "0";
+		}
+	} elsif(@args <= 6) {
+		$asm .= "6";
+		while(@args < 6) {
+			push @args, "0";
+		}
+	} elsif(@args <= 9) {
+		$asm .= "9";
+		while(@args < 9) {
+			push @args, "0";
+		}
+	} else {
+		print STDERR "$ARGV:$.: too many arguments to system call\n";
+	}
+
+	# System call number.
+	if($sysname eq "") {
+		$sysname = "SYS_$func";
+		$sysname =~ s/([a-z])([A-Z])/${1}_$2/g;	# turn FooBar into Foo_Bar
+		$sysname =~ y/a-z/A-Z/;
+		if($nacl) {
+			$sysname =~ y/A-Z/a-z/;
+		}
+	}
+
+	# Actual call.
+	my $args = join(', ', @args);
+	my $call = "$asm($sysname, $args)";
+
+	# Assign return values.
+	my $body = "";
+	my @ret = ("_", "_", "_");
+	my $do_errno = 0;
+	for(my $i=0; $i<@out; $i++) {
+		my $p = $out[$i];
+		my ($name, $type) = parseparam($p);
+		my $reg = "";
+		if($name eq "err" && !$plan9) {
+			$reg = "e1";
+			$ret[2] = $reg;
+			$do_errno = 1;
+		} elsif($name eq "err" && $plan9) {
+			$ret[0] = "r0";
+			$ret[2] = "e1";
+			next;
+		} else {
+			$reg = sprintf("r%d", $i);
+			$ret[$i] = $reg;
+		}
+		if($type eq "bool") {
+			$reg = "$reg != 0";
+		}
+		if($type eq "int64" && $_32bit ne "") {
+			# 64-bit number in r1:r0 or r0:r1.
+			if($i+2 > @out) {
+				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
+			}
+			if($_32bit eq "big-endian") {
+				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
+			} else {
+				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
+			}
+			$ret[$i] = sprintf("r%d", $i);
+			$ret[$i+1] = sprintf("r%d", $i+1);
+		}
+		if($reg ne "e1" || $plan9) {
+			$body .= "\t$name = $type($reg)\n";
+		}
+	}
+	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
+		$text .= "\t$call\n";
+	} else {
+		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
+	}
+	foreach my $use (@uses) {
+		$text .= "\t$use\n";
+	}
+	$text .= $body;
+	
+	if ($plan9 && $ret[2] eq "e1") {
+		$text .= "\tif int32(r0) == -1 {\n";
+		$text .= "\t\terr = e1\n";
+		$text .= "\t}\n";
+	} elsif ($do_errno) {
+		$text .= "\tif e1 != 0 {\n";
+		$text .= "\t\terr = e1\n";
+		$text .= "\t}\n";
+	}
+	$text .= "\treturn\n";
+	$text .= "}\n\n";
+}
+
+chomp $text;
+chomp $text;
+
+if($errors) {
+	exit 1;
+}
+
+print <<EOF;
+// $cmdline
+// Code generated by the command above; DO NOT EDIT.
+
+package plan9
+
+import "unsafe"
+
+$text
+EOF
+exit 0;
diff --git a/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh b/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh
new file mode 100755
index 00000000..3c3ab058
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+COMMAND="mksysnum_plan9.sh $@"
+
+cat <<EOF
+// $COMMAND
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+package plan9
+
+const(
+EOF
+
+SP='[ 	]' # space or tab
+sed "s/^#define${SP}\\([A-Z0-9_][A-Z0-9_]*\\)${SP}${SP}*\\([0-9][0-9]*\\)/SYS_\\1=\\2/g" \
+	< $1 | grep -v SYS__
+
+cat <<EOF
+)
+EOF
diff --git a/vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go b/vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go
new file mode 100644
index 00000000..87ae9d2a
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go
@@ -0,0 +1,21 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.5
+
+package plan9
+
+import "syscall"
+
+func fixwd() {
+	syscall.Fixwd()
+}
+
+func Getwd() (wd string, err error) {
+	return syscall.Getwd()
+}
+
+func Chdir(path string) error {
+	return syscall.Chdir(path)
+}
diff --git a/vendor/golang.org/x/sys/plan9/pwd_plan9.go b/vendor/golang.org/x/sys/plan9/pwd_plan9.go
new file mode 100644
index 00000000..c07c798b
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/pwd_plan9.go
@@ -0,0 +1,23 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !go1.5
+
+package plan9
+
+func fixwd() {
+}
+
+func Getwd() (wd string, err error) {
+	fd, err := open(".", O_RDONLY)
+	if err != nil {
+		return "", err
+	}
+	defer Close(fd)
+	return Fd2path(fd)
+}
+
+func Chdir(path string) error {
+	return chdir(path)
+}
diff --git a/vendor/golang.org/x/sys/plan9/race.go b/vendor/golang.org/x/sys/plan9/race.go
new file mode 100644
index 00000000..42edd93e
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/race.go
@@ -0,0 +1,30 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build plan9,race
+
+package plan9
+
+import (
+	"runtime"
+	"unsafe"
+)
+
+const raceenabled = true
+
+func raceAcquire(addr unsafe.Pointer) {
+	runtime.RaceAcquire(addr)
+}
+
+func raceReleaseMerge(addr unsafe.Pointer) {
+	runtime.RaceReleaseMerge(addr)
+}
+
+func raceReadRange(addr unsafe.Pointer, len int) {
+	runtime.RaceReadRange(addr, len)
+}
+
+func raceWriteRange(addr unsafe.Pointer, len int) {
+	runtime.RaceWriteRange(addr, len)
+}
diff --git a/vendor/golang.org/x/sys/plan9/race0.go b/vendor/golang.org/x/sys/plan9/race0.go
new file mode 100644
index 00000000..c89cf8fc
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/race0.go
@@ -0,0 +1,25 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build plan9,!race
+
+package plan9
+
+import (
+	"unsafe"
+)
+
+const raceenabled = false
+
+func raceAcquire(addr unsafe.Pointer) {
+}
+
+func raceReleaseMerge(addr unsafe.Pointer) {
+}
+
+func raceReadRange(addr unsafe.Pointer, len int) {
+}
+
+func raceWriteRange(addr unsafe.Pointer, len int) {
+}
diff --git a/vendor/golang.org/x/sys/plan9/str.go b/vendor/golang.org/x/sys/plan9/str.go
new file mode 100644
index 00000000..4f7f9ad7
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/str.go
@@ -0,0 +1,22 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build plan9
+
+package plan9
+
+func itoa(val int) string { // do it here rather than with fmt to avoid dependency
+	if val < 0 {
+		return "-" + itoa(-val)
+	}
+	var buf [32]byte // big enough for int64
+	i := len(buf) - 1
+	for val >= 10 {
+		buf[i] = byte(val%10 + '0')
+		i--
+		val /= 10
+	}
+	buf[i] = byte(val + '0')
+	return string(buf[i:])
+}
diff --git a/vendor/golang.org/x/sys/plan9/syscall.go b/vendor/golang.org/x/sys/plan9/syscall.go
new file mode 100644
index 00000000..163254ce
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/syscall.go
@@ -0,0 +1,77 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build plan9
+
+// Package plan9 contains an interface to the low-level operating system
+// primitives. OS details vary depending on the underlying system, and
+// by default, godoc will display the OS-specific documentation for the current
+// system. If you want godoc to display documentation for another
+// system, set $GOOS and $GOARCH to the desired system. For example, if
+// you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
+// to freebsd and $GOARCH to arm.
+//
+// The primary use of this package is inside other packages that provide a more
+// portable interface to the system, such as "os", "time" and "net".  Use
+// those packages rather than this one if you can.
+//
+// For details of the functions and data types in this package consult
+// the manuals for the appropriate operating system.
+//
+// These calls return err == nil to indicate success; otherwise
+// err represents an operating system error describing the failure and
+// holds a value of type syscall.ErrorString.
+package plan9 // import "golang.org/x/sys/plan9"
+
+import "unsafe"
+
+// ByteSliceFromString returns a NUL-terminated slice of bytes
+// containing the text of s. If s contains a NUL byte at any
+// location, it returns (nil, EINVAL).
+func ByteSliceFromString(s string) ([]byte, error) {
+	for i := 0; i < len(s); i++ {
+		if s[i] == 0 {
+			return nil, EINVAL
+		}
+	}
+	a := make([]byte, len(s)+1)
+	copy(a, s)
+	return a, nil
+}
+
+// BytePtrFromString returns a pointer to a NUL-terminated array of
+// bytes containing the text of s. If s contains a NUL byte at any
+// location, it returns (nil, EINVAL).
+func BytePtrFromString(s string) (*byte, error) {
+	a, err := ByteSliceFromString(s)
+	if err != nil {
+		return nil, err
+	}
+	return &a[0], nil
+}
+
+// Single-word zero for use when we need a valid pointer to 0 bytes.
+// See mksyscall.pl.
+var _zero uintptr
+
+func (ts *Timespec) Unix() (sec int64, nsec int64) {
+	return int64(ts.Sec), int64(ts.Nsec)
+}
+
+func (tv *Timeval) Unix() (sec int64, nsec int64) {
+	return int64(tv.Sec), int64(tv.Usec) * 1000
+}
+
+func (ts *Timespec) Nano() int64 {
+	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
+}
+
+func (tv *Timeval) Nano() int64 {
+	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
+}
+
+// use is a no-op, but the compiler cannot see that it is.
+// Calling use(p) ensures that p is kept live until that point.
+//go:noescape
+func use(p unsafe.Pointer)
diff --git a/vendor/golang.org/x/sys/plan9/syscall_plan9.go b/vendor/golang.org/x/sys/plan9/syscall_plan9.go
new file mode 100644
index 00000000..84e14714
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/syscall_plan9.go
@@ -0,0 +1,349 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Plan 9 system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and
+// wrap it in our own nicer implementation.
+
+package plan9
+
+import (
+	"bytes"
+	"syscall"
+	"unsafe"
+)
+
+// A Note is a string describing a process note.
+// It implements the os.Signal interface.
+type Note string
+
+func (n Note) Signal() {}
+
+func (n Note) String() string {
+	return string(n)
+}
+
+var (
+	Stdin  = 0
+	Stdout = 1
+	Stderr = 2
+)
+
+// For testing: clients can set this flag to force
+// creation of IPv6 sockets to return EAFNOSUPPORT.
+var SocketDisableIPv6 bool
+
+func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.ErrorString)
+func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.ErrorString)
+func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
+func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr)
+
+func atoi(b []byte) (n uint) {
+	n = 0
+	for i := 0; i < len(b); i++ {
+		n = n*10 + uint(b[i]-'0')
+	}
+	return
+}
+
+func cstring(s []byte) string {
+	i := bytes.IndexByte(s, 0)
+	if i == -1 {
+		i = len(s)
+	}
+	return string(s[:i])
+}
+
+func errstr() string {
+	var buf [ERRMAX]byte
+
+	RawSyscall(SYS_ERRSTR, uintptr(unsafe.Pointer(&buf[0])), uintptr(len(buf)), 0)
+
+	buf[len(buf)-1] = 0
+	return cstring(buf[:])
+}
+
+// Implemented in assembly to import from runtime.
+func exit(code int)
+
+func Exit(code int) { exit(code) }
+
+func readnum(path string) (uint, error) {
+	var b [12]byte
+
+	fd, e := Open(path, O_RDONLY)
+	if e != nil {
+		return 0, e
+	}
+	defer Close(fd)
+
+	n, e := Pread(fd, b[:], 0)
+
+	if e != nil {
+		return 0, e
+	}
+
+	m := 0
+	for ; m < n && b[m] == ' '; m++ {
+	}
+
+	return atoi(b[m : n-1]), nil
+}
+
+func Getpid() (pid int) {
+	n, _ := readnum("#c/pid")
+	return int(n)
+}
+
+func Getppid() (ppid int) {
+	n, _ := readnum("#c/ppid")
+	return int(n)
+}
+
+func Read(fd int, p []byte) (n int, err error) {
+	return Pread(fd, p, -1)
+}
+
+func Write(fd int, p []byte) (n int, err error) {
+	return Pwrite(fd, p, -1)
+}
+
+var ioSync int64
+
+//sys	fd2path(fd int, buf []byte) (err error)
+func Fd2path(fd int) (path string, err error) {
+	var buf [512]byte
+
+	e := fd2path(fd, buf[:])
+	if e != nil {
+		return "", e
+	}
+	return cstring(buf[:]), nil
+}
+
+//sys	pipe(p *[2]int32) (err error)
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return syscall.ErrorString("bad arg in system call")
+	}
+	var pp [2]int32
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+// Underlying system call writes to newoffset via pointer.
+// Implemented in assembly to avoid allocation.
+func seek(placeholder uintptr, fd int, offset int64, whence int) (newoffset int64, err string)
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	newoffset, e := seek(0, fd, offset, whence)
+
+	if newoffset == -1 {
+		err = syscall.ErrorString(e)
+	}
+	return
+}
+
+func Mkdir(path string, mode uint32) (err error) {
+	fd, err := Create(path, O_RDONLY, DMDIR|mode)
+
+	if fd != -1 {
+		Close(fd)
+	}
+
+	return
+}
+
+type Waitmsg struct {
+	Pid  int
+	Time [3]uint32
+	Msg  string
+}
+
+func (w Waitmsg) Exited() bool   { return true }
+func (w Waitmsg) Signaled() bool { return false }
+
+func (w Waitmsg) ExitStatus() int {
+	if len(w.Msg) == 0 {
+		// a normal exit returns no message
+		return 0
+	}
+	return 1
+}
+
+//sys	await(s []byte) (n int, err error)
+func Await(w *Waitmsg) (err error) {
+	var buf [512]byte
+	var f [5][]byte
+
+	n, err := await(buf[:])
+
+	if err != nil || w == nil {
+		return
+	}
+
+	nf := 0
+	p := 0
+	for i := 0; i < n && nf < len(f)-1; i++ {
+		if buf[i] == ' ' {
+			f[nf] = buf[p:i]
+			p = i + 1
+			nf++
+		}
+	}
+	f[nf] = buf[p:]
+	nf++
+
+	if nf != len(f) {
+		return syscall.ErrorString("invalid wait message")
+	}
+	w.Pid = int(atoi(f[0]))
+	w.Time[0] = uint32(atoi(f[1]))
+	w.Time[1] = uint32(atoi(f[2]))
+	w.Time[2] = uint32(atoi(f[3]))
+	w.Msg = cstring(f[4])
+	if w.Msg == "''" {
+		// await() returns '' for no error
+		w.Msg = ""
+	}
+	return
+}
+
+func Unmount(name, old string) (err error) {
+	fixwd()
+	oldp, err := BytePtrFromString(old)
+	if err != nil {
+		return err
+	}
+	oldptr := uintptr(unsafe.Pointer(oldp))
+
+	var r0 uintptr
+	var e syscall.ErrorString
+
+	// bind(2) man page: If name is zero, everything bound or mounted upon old is unbound or unmounted.
+	if name == "" {
+		r0, _, e = Syscall(SYS_UNMOUNT, _zero, oldptr, 0)
+	} else {
+		namep, err := BytePtrFromString(name)
+		if err != nil {
+			return err
+		}
+		r0, _, e = Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(namep)), oldptr, 0)
+	}
+
+	if int32(r0) == -1 {
+		err = e
+	}
+	return
+}
+
+func Fchdir(fd int) (err error) {
+	path, err := Fd2path(fd)
+
+	if err != nil {
+		return
+	}
+
+	return Chdir(path)
+}
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int32(nsec / 1e9)
+	return
+}
+
+func nsec() int64 {
+	var scratch int64
+
+	r0, _, _ := Syscall(SYS_NSEC, uintptr(unsafe.Pointer(&scratch)), 0, 0)
+	// TODO(aram): remove hack after I fix _nsec in the pc64 kernel.
+	if r0 == 0 {
+		return scratch
+	}
+	return int64(r0)
+}
+
+func Gettimeofday(tv *Timeval) error {
+	nsec := nsec()
+	*tv = NsecToTimeval(nsec)
+	return nil
+}
+
+func Getpagesize() int { return 0x1000 }
+
+func Getegid() (egid int) { return -1 }
+func Geteuid() (euid int) { return -1 }
+func Getgid() (gid int)   { return -1 }
+func Getuid() (uid int)   { return -1 }
+
+func Getgroups() (gids []int, err error) {
+	return make([]int, 0), nil
+}
+
+//sys	open(path string, mode int) (fd int, err error)
+func Open(path string, mode int) (fd int, err error) {
+	fixwd()
+	return open(path, mode)
+}
+
+//sys	create(path string, mode int, perm uint32) (fd int, err error)
+func Create(path string, mode int, perm uint32) (fd int, err error) {
+	fixwd()
+	return create(path, mode, perm)
+}
+
+//sys	remove(path string) (err error)
+func Remove(path string) error {
+	fixwd()
+	return remove(path)
+}
+
+//sys	stat(path string, edir []byte) (n int, err error)
+func Stat(path string, edir []byte) (n int, err error) {
+	fixwd()
+	return stat(path, edir)
+}
+
+//sys	bind(name string, old string, flag int) (err error)
+func Bind(name string, old string, flag int) (err error) {
+	fixwd()
+	return bind(name, old, flag)
+}
+
+//sys	mount(fd int, afd int, old string, flag int, aname string) (err error)
+func Mount(fd int, afd int, old string, flag int, aname string) (err error) {
+	fixwd()
+	return mount(fd, afd, old, flag, aname)
+}
+
+//sys	wstat(path string, edir []byte) (err error)
+func Wstat(path string, edir []byte) (err error) {
+	fixwd()
+	return wstat(path, edir)
+}
+
+//sys	chdir(path string) (err error)
+//sys	Dup(oldfd int, newfd int) (fd int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	Close(fd int) (err error)
+//sys	Fstat(fd int, edir []byte) (n int, err error)
+//sys	Fwstat(fd int, edir []byte) (err error)
diff --git a/vendor/golang.org/x/sys/plan9/syscall_test.go b/vendor/golang.org/x/sys/plan9/syscall_test.go
new file mode 100644
index 00000000..8f829bad
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/syscall_test.go
@@ -0,0 +1,33 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build plan9
+
+package plan9_test
+
+import (
+	"testing"
+
+	"golang.org/x/sys/plan9"
+)
+
+func testSetGetenv(t *testing.T, key, value string) {
+	err := plan9.Setenv(key, value)
+	if err != nil {
+		t.Fatalf("Setenv failed to set %q: %v", value, err)
+	}
+	newvalue, found := plan9.Getenv(key)
+	if !found {
+		t.Fatalf("Getenv failed to find %v variable (want value %q)", key, value)
+	}
+	if newvalue != value {
+		t.Fatalf("Getenv(%v) = %q; want %q", key, newvalue, value)
+	}
+}
+
+func TestEnv(t *testing.T) {
+	testSetGetenv(t, "TESTENV", "AVALUE")
+	// make sure TESTENV gets set to "", not deleted
+	testSetGetenv(t, "TESTENV", "")
+}
diff --git a/vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go b/vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go
new file mode 100644
index 00000000..78d8465e
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go
@@ -0,0 +1,292 @@
+// mksyscall.pl -l32 -plan9 syscall_plan9.go
+// Code generated by the command above; DO NOT EDIT.
+
+package plan9
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fd2path(fd int, buf []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FD2PATH, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]int32) (err error) {
+	r0, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func await(s []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(s) > 0 {
+		_p0 = unsafe.Pointer(&s[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_AWAIT, uintptr(_p0), uintptr(len(s)), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func open(path string, mode int) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func create(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func remove(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_REMOVE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, edir []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(edir) > 0 {
+		_p1 = unsafe.Pointer(&edir[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(name string, old string, flag int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(old)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_BIND, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(fd int, afd int, old string, flag int, aname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(old)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(aname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_MOUNT, uintptr(fd), uintptr(afd), uintptr(unsafe.Pointer(_p0)), uintptr(flag), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wstat(path string, edir []byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(edir) > 0 {
+		_p1 = unsafe.Pointer(&edir[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
+	use(unsafe.Pointer(_p0))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int, newfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), uintptr(newfd), 0)
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	r0, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, edir []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(edir) > 0 {
+		_p0 = unsafe.Pointer(&edir[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fwstat(fd int, edir []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(edir) > 0 {
+		_p0 = unsafe.Pointer(&edir[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FWSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go b/vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go
new file mode 100644
index 00000000..78d8465e
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go
@@ -0,0 +1,292 @@
+// mksyscall.pl -l32 -plan9 syscall_plan9.go
+// Code generated by the command above; DO NOT EDIT.
+
+package plan9
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fd2path(fd int, buf []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FD2PATH, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]int32) (err error) {
+	r0, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func await(s []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(s) > 0 {
+		_p0 = unsafe.Pointer(&s[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_AWAIT, uintptr(_p0), uintptr(len(s)), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func open(path string, mode int) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func create(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func remove(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_REMOVE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, edir []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(edir) > 0 {
+		_p1 = unsafe.Pointer(&edir[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(name string, old string, flag int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(old)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_BIND, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(fd int, afd int, old string, flag int, aname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(old)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(aname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_MOUNT, uintptr(fd), uintptr(afd), uintptr(unsafe.Pointer(_p0)), uintptr(flag), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wstat(path string, edir []byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(edir) > 0 {
+		_p1 = unsafe.Pointer(&edir[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
+	use(unsafe.Pointer(_p0))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int, newfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), uintptr(newfd), 0)
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	r0, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, edir []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(edir) > 0 {
+		_p0 = unsafe.Pointer(&edir[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fwstat(fd int, edir []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(edir) > 0 {
+		_p0 = unsafe.Pointer(&edir[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FWSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/plan9/zsyscall_plan9_arm.go b/vendor/golang.org/x/sys/plan9/zsyscall_plan9_arm.go
new file mode 100644
index 00000000..4ff9e23d
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/zsyscall_plan9_arm.go
@@ -0,0 +1,284 @@
+// mksyscall.pl -l32 -plan9 -tags plan9,arm syscall_plan9.go
+// Code generated by the command above; DO NOT EDIT.
+
+// +build plan9,arm
+
+package plan9
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fd2path(fd int, buf []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FD2PATH, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]int32) (err error) {
+	r0, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func await(s []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(s) > 0 {
+		_p0 = unsafe.Pointer(&s[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_AWAIT, uintptr(_p0), uintptr(len(s)), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func open(path string, mode int) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func create(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func remove(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_REMOVE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, edir []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(edir) > 0 {
+		_p1 = unsafe.Pointer(&edir[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(name string, old string, flag int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(old)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_BIND, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(fd int, afd int, old string, flag int, aname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(old)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(aname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_MOUNT, uintptr(fd), uintptr(afd), uintptr(unsafe.Pointer(_p0)), uintptr(flag), uintptr(unsafe.Pointer(_p1)), 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wstat(path string, edir []byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(edir) > 0 {
+		_p1 = unsafe.Pointer(&edir[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int, newfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), uintptr(newfd), 0)
+	fd = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	r0, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, edir []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(edir) > 0 {
+		_p0 = unsafe.Pointer(&edir[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
+	n = int(r0)
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fwstat(fd int, edir []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(edir) > 0 {
+		_p0 = unsafe.Pointer(&edir[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FWSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
+	if int32(r0) == -1 {
+		err = e1
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/plan9/zsysnum_plan9.go b/vendor/golang.org/x/sys/plan9/zsysnum_plan9.go
new file mode 100644
index 00000000..22e8abd4
--- /dev/null
+++ b/vendor/golang.org/x/sys/plan9/zsysnum_plan9.go
@@ -0,0 +1,49 @@
+// mksysnum_plan9.sh /opt/plan9/sys/src/libc/9syscall/sys.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+package plan9
+
+const (
+	SYS_SYSR1       = 0
+	SYS_BIND        = 2
+	SYS_CHDIR       = 3
+	SYS_CLOSE       = 4
+	SYS_DUP         = 5
+	SYS_ALARM       = 6
+	SYS_EXEC        = 7
+	SYS_EXITS       = 8
+	SYS_FAUTH       = 10
+	SYS_SEGBRK      = 12
+	SYS_OPEN        = 14
+	SYS_OSEEK       = 16
+	SYS_SLEEP       = 17
+	SYS_RFORK       = 19
+	SYS_PIPE        = 21
+	SYS_CREATE      = 22
+	SYS_FD2PATH     = 23
+	SYS_BRK_        = 24
+	SYS_REMOVE      = 25
+	SYS_NOTIFY      = 28
+	SYS_NOTED       = 29
+	SYS_SEGATTACH   = 30
+	SYS_SEGDETACH   = 31
+	SYS_SEGFREE     = 32
+	SYS_SEGFLUSH    = 33
+	SYS_RENDEZVOUS  = 34
+	SYS_UNMOUNT     = 35
+	SYS_SEMACQUIRE  = 37
+	SYS_SEMRELEASE  = 38
+	SYS_SEEK        = 39
+	SYS_FVERSION    = 40
+	SYS_ERRSTR      = 41
+	SYS_STAT        = 42
+	SYS_FSTAT       = 43
+	SYS_WSTAT       = 44
+	SYS_FWSTAT      = 45
+	SYS_MOUNT       = 46
+	SYS_AWAIT       = 47
+	SYS_PREAD       = 50
+	SYS_PWRITE      = 51
+	SYS_TSEMACQUIRE = 52
+	SYS_NSEC        = 53
+)
diff --git a/vendor/golang.org/x/sys/unix/.gitignore b/vendor/golang.org/x/sys/unix/.gitignore
new file mode 100644
index 00000000..e3e0fc6f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/.gitignore
@@ -0,0 +1,2 @@
+_obj/
+unix.test
diff --git a/vendor/golang.org/x/sys/unix/README.md b/vendor/golang.org/x/sys/unix/README.md
new file mode 100644
index 00000000..bc6f6031
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/README.md
@@ -0,0 +1,173 @@
+# Building `sys/unix`
+
+The sys/unix package provides access to the raw system call interface of the
+underlying operating system. See: https://godoc.org/golang.org/x/sys/unix
+
+Porting Go to a new architecture/OS combination or adding syscalls, types, or
+constants to an existing architecture/OS pair requires some manual effort;
+however, there are tools that automate much of the process.
+
+## Build Systems
+
+There are currently two ways we generate the necessary files. We are currently
+migrating the build system to use containers so the builds are reproducible.
+This is being done on an OS-by-OS basis. Please update this documentation as
+components of the build system change.
+
+### Old Build System (currently for `GOOS != "Linux" || GOARCH == "sparc64"`)
+
+The old build system generates the Go files based on the C header files
+present on your system. This means that files
+for a given GOOS/GOARCH pair must be generated on a system with that OS and
+architecture. This also means that the generated code can differ from system
+to system, based on differences in the header files.
+
+To avoid this, if you are using the old build system, only generate the Go
+files on an installation with unmodified header files. It is also important to
+keep track of which version of the OS the files were generated from (ex.
+Darwin 14 vs Darwin 15). This makes it easier to track the progress of changes
+and have each OS upgrade correspond to a single change.
+
+To build the files for your current OS and architecture, make sure GOOS and
+GOARCH are set correctly and run `mkall.sh`. This will generate the files for
+your specific system. Running `mkall.sh -n` shows the commands that will be run.
+
+Requirements: bash, perl, go
+
+### New Build System (currently for `GOOS == "Linux" && GOARCH != "sparc64"`)
+
+The new build system uses a Docker container to generate the go files directly
+from source checkouts of the kernel and various system libraries. This means
+that on any platform that supports Docker, all the files using the new build
+system can be generated at once, and generated files will not change based on
+what the person running the scripts has installed on their computer.
+
+The OS specific files for the new build system are located in the `${GOOS}`
+directory, and the build is coordinated by the `${GOOS}/mkall.go` program. When
+the kernel or system library updates, modify the Dockerfile at
+`${GOOS}/Dockerfile` to checkout the new release of the source.
+
+To build all the files under the new build system, you must be on an amd64/Linux
+system and have your GOOS and GOARCH set accordingly. Running `mkall.sh` will
+then generate all of the files for all of the GOOS/GOARCH pairs in the new build
+system. Running `mkall.sh -n` shows the commands that will be run.
+
+Requirements: bash, perl, go, docker
+
+## Component files
+
+This section describes the various files used in the code generation process.
+It also contains instructions on how to modify these files to add a new
+architecture/OS or to add additional syscalls, types, or constants. Note that
+if you are using the new build system, the scripts cannot be called normally.
+They must be called from within the docker container.
+
+### asm files
+
+The hand-written assembly file at `asm_${GOOS}_${GOARCH}.s` implements system
+call dispatch. There are three entry points:
+```
+  func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
+  func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr)
+  func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
+```
+The first and second are the standard ones; they differ only in how many
+arguments can be passed to the kernel. The third is for low-level use by the
+ForkExec wrapper. Unlike the first two, it does not call into the scheduler to
+let it know that a system call is running.
+
+When porting Go to an new architecture/OS, this file must be implemented for
+each GOOS/GOARCH pair.
+
+### mksysnum
+
+Mksysnum is a script located at `${GOOS}/mksysnum.pl` (or `mksysnum_${GOOS}.pl`
+for the old system). This script takes in a list of header files containing the
+syscall number declarations and parses them to produce the corresponding list of
+Go numeric constants. See `zsysnum_${GOOS}_${GOARCH}.go` for the generated
+constants.
+
+Adding new syscall numbers is mostly done by running the build on a sufficiently
+new installation of the target OS (or updating the source checkouts for the
+new build system). However, depending on the OS, you make need to update the
+parsing in mksysnum.
+
+### mksyscall.pl
+
+The `syscall.go`, `syscall_${GOOS}.go`, `syscall_${GOOS}_${GOARCH}.go` are
+hand-written Go files which implement system calls (for unix, the specific OS,
+or the specific OS/Architecture pair respectively) that need special handling
+and list `//sys` comments giving prototypes for ones that can be generated.
+
+The mksyscall.pl script takes the `//sys` and `//sysnb` comments and converts
+them into syscalls. This requires the name of the prototype in the comment to
+match a syscall number in the `zsysnum_${GOOS}_${GOARCH}.go` file. The function
+prototype can be exported (capitalized) or not.
+
+Adding a new syscall often just requires adding a new `//sys` function prototype
+with the desired arguments and a capitalized name so it is exported. However, if
+you want the interface to the syscall to be different, often one will make an
+unexported `//sys` prototype, an then write a custom wrapper in
+`syscall_${GOOS}.go`.
+
+### types files
+
+For each OS, there is a hand-written Go file at `${GOOS}/types.go` (or
+`types_${GOOS}.go` on the old system). This file includes standard C headers and
+creates Go type aliases to the corresponding C types. The file is then fed
+through godef to get the Go compatible definitions. Finally, the generated code
+is fed though mkpost.go to format the code correctly and remove any hidden or
+private identifiers. This cleaned-up code is written to
+`ztypes_${GOOS}_${GOARCH}.go`.
+
+The hardest part about preparing this file is figuring out which headers to
+include and which symbols need to be `#define`d to get the actual data
+structures that pass through to the kernel system calls. Some C libraries
+preset alternate versions for binary compatibility and translate them on the
+way in and out of system calls, but there is almost always a `#define` that can
+get the real ones.
+See `types_darwin.go` and `linux/types.go` for examples.
+
+To add a new type, add in the necessary include statement at the top of the
+file (if it is not already there) and add in a type alias line. Note that if
+your type is significantly different on different architectures, you may need
+some `#if/#elif` macros in your include statements.
+
+### mkerrors.sh
+
+This script is used to generate the system's various constants. This doesn't
+just include the error numbers and error strings, but also the signal numbers
+an a wide variety of miscellaneous constants. The constants come from the list
+of include files in the `includes_${uname}` variable. A regex then picks out
+the desired `#define` statements, and generates the corresponding Go constants.
+The error numbers and strings are generated from `#include <errno.h>`, and the
+signal numbers and strings are generated from `#include <signal.h>`. All of
+these constants are written to `zerrors_${GOOS}_${GOARCH}.go` via a C program,
+`_errors.c`, which prints out all the constants.
+
+To add a constant, add the header that includes it to the appropriate variable.
+Then, edit the regex (if necessary) to match the desired constant. Avoid making
+the regex too broad to avoid matching unintended constants.
+
+
+## Generated files
+
+### `zerror_${GOOS}_${GOARCH}.go`
+
+A file containing all of the system's generated error numbers, error strings,
+signal numbers, and constants. Generated by `mkerrors.sh` (see above).
+
+### `zsyscall_${GOOS}_${GOARCH}.go`
+
+A file containing all the generated syscalls for a specific GOOS and GOARCH.
+Generated by `mksyscall.pl` (see above).
+
+### `zsysnum_${GOOS}_${GOARCH}.go`
+
+A list of numeric constants for all the syscall number of the specific GOOS
+and GOARCH. Generated by mksysnum (see above).
+
+### `ztypes_${GOOS}_${GOARCH}.go`
+
+A file containing Go types for passing into (or returning from) syscalls.
+Generated by godefs and the types file (see above).
diff --git a/vendor/golang.org/x/sys/unix/affinity_linux.go b/vendor/golang.org/x/sys/unix/affinity_linux.go
new file mode 100644
index 00000000..72afe333
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/affinity_linux.go
@@ -0,0 +1,124 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// CPU affinity functions
+
+package unix
+
+import (
+	"unsafe"
+)
+
+const cpuSetSize = _CPU_SETSIZE / _NCPUBITS
+
+// CPUSet represents a CPU affinity mask.
+type CPUSet [cpuSetSize]cpuMask
+
+func schedAffinity(trap uintptr, pid int, set *CPUSet) error {
+	_, _, e := RawSyscall(trap, uintptr(pid), uintptr(unsafe.Sizeof(*set)), uintptr(unsafe.Pointer(set)))
+	if e != 0 {
+		return errnoErr(e)
+	}
+	return nil
+}
+
+// SchedGetaffinity gets the CPU affinity mask of the thread specified by pid.
+// If pid is 0 the calling thread is used.
+func SchedGetaffinity(pid int, set *CPUSet) error {
+	return schedAffinity(SYS_SCHED_GETAFFINITY, pid, set)
+}
+
+// SchedSetaffinity sets the CPU affinity mask of the thread specified by pid.
+// If pid is 0 the calling thread is used.
+func SchedSetaffinity(pid int, set *CPUSet) error {
+	return schedAffinity(SYS_SCHED_SETAFFINITY, pid, set)
+}
+
+// Zero clears the set s, so that it contains no CPUs.
+func (s *CPUSet) Zero() {
+	for i := range s {
+		s[i] = 0
+	}
+}
+
+func cpuBitsIndex(cpu int) int {
+	return cpu / _NCPUBITS
+}
+
+func cpuBitsMask(cpu int) cpuMask {
+	return cpuMask(1 << (uint(cpu) % _NCPUBITS))
+}
+
+// Set adds cpu to the set s.
+func (s *CPUSet) Set(cpu int) {
+	i := cpuBitsIndex(cpu)
+	if i < len(s) {
+		s[i] |= cpuBitsMask(cpu)
+	}
+}
+
+// Clear removes cpu from the set s.
+func (s *CPUSet) Clear(cpu int) {
+	i := cpuBitsIndex(cpu)
+	if i < len(s) {
+		s[i] &^= cpuBitsMask(cpu)
+	}
+}
+
+// IsSet reports whether cpu is in the set s.
+func (s *CPUSet) IsSet(cpu int) bool {
+	i := cpuBitsIndex(cpu)
+	if i < len(s) {
+		return s[i]&cpuBitsMask(cpu) != 0
+	}
+	return false
+}
+
+// Count returns the number of CPUs in the set s.
+func (s *CPUSet) Count() int {
+	c := 0
+	for _, b := range s {
+		c += onesCount64(uint64(b))
+	}
+	return c
+}
+
+// onesCount64 is a copy of Go 1.9's math/bits.OnesCount64.
+// Once this package can require Go 1.9, we can delete this
+// and update the caller to use bits.OnesCount64.
+func onesCount64(x uint64) int {
+	const m0 = 0x5555555555555555 // 01010101 ...
+	const m1 = 0x3333333333333333 // 00110011 ...
+	const m2 = 0x0f0f0f0f0f0f0f0f // 00001111 ...
+	const m3 = 0x00ff00ff00ff00ff // etc.
+	const m4 = 0x0000ffff0000ffff
+
+	// Implementation: Parallel summing of adjacent bits.
+	// See "Hacker's Delight", Chap. 5: Counting Bits.
+	// The following pattern shows the general approach:
+	//
+	//   x = x>>1&(m0&m) + x&(m0&m)
+	//   x = x>>2&(m1&m) + x&(m1&m)
+	//   x = x>>4&(m2&m) + x&(m2&m)
+	//   x = x>>8&(m3&m) + x&(m3&m)
+	//   x = x>>16&(m4&m) + x&(m4&m)
+	//   x = x>>32&(m5&m) + x&(m5&m)
+	//   return int(x)
+	//
+	// Masking (& operations) can be left away when there's no
+	// danger that a field's sum will carry over into the next
+	// field: Since the result cannot be > 64, 8 bits is enough
+	// and we can ignore the masks for the shifts by 8 and up.
+	// Per "Hacker's Delight", the first line can be simplified
+	// more, but it saves at best one instruction, so we leave
+	// it alone for clarity.
+	const m = 1<<64 - 1
+	x = x>>1&(m0&m) + x&(m0&m)
+	x = x>>2&(m1&m) + x&(m1&m)
+	x = (x>>4 + x) & (m2 & m)
+	x += x >> 8
+	x += x >> 16
+	x += x >> 32
+	return int(x) & (1<<7 - 1)
+}
diff --git a/vendor/golang.org/x/sys/unix/aliases.go b/vendor/golang.org/x/sys/unix/aliases.go
new file mode 100644
index 00000000..d87a681b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/aliases.go
@@ -0,0 +1,14 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build go1.9
+
+package unix
+
+import "syscall"
+
+type Signal = syscall.Signal
+type Errno = syscall.Errno
+type SysProcAttr = syscall.SysProcAttr
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_386.s b/vendor/golang.org/x/sys/unix/asm_darwin_386.s
new file mode 100644
index 00000000..8a727831
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_darwin_386.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for 386, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s b/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s
new file mode 100644
index 00000000..6321421f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_arm.s b/vendor/golang.org/x/sys/unix/asm_darwin_arm.s
new file mode 100644
index 00000000..333242d5
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_darwin_arm.s
@@ -0,0 +1,30 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+// +build arm,darwin
+
+#include "textflag.h"
+
+//
+// System call support for ARM, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s b/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s
new file mode 100644
index 00000000..97e01743
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s
@@ -0,0 +1,30 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+// +build arm64,darwin
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
new file mode 100644
index 00000000..603dd572
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, DragonFly
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_386.s b/vendor/golang.org/x/sys/unix/asm_freebsd_386.s
new file mode 100644
index 00000000..c9a0a260
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_freebsd_386.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for 386, FreeBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s
new file mode 100644
index 00000000..35172477
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, FreeBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s b/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s
new file mode 100644
index 00000000..9227c875
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s
@@ -0,0 +1,29 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for ARM, FreeBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_386.s b/vendor/golang.org/x/sys/unix/asm_linux_386.s
new file mode 100644
index 00000000..448bebbb
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_386.s
@@ -0,0 +1,65 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for 386, Linux
+//
+
+// See ../runtime/sys_linux_386.s for the reason why we always use int 0x80
+// instead of the glibc-specific "CALL 0x10(GS)".
+#define INVOKE_SYSCALL	INT	$0x80
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+	CALL	runtime·entersyscall(SB)
+	MOVL	trap+0(FP), AX  // syscall entry
+	MOVL	a1+4(FP), BX
+	MOVL	a2+8(FP), CX
+	MOVL	a3+12(FP), DX
+	MOVL	$0, SI
+	MOVL	$0, DI
+	INVOKE_SYSCALL
+	MOVL	AX, r1+16(FP)
+	MOVL	DX, r2+20(FP)
+	CALL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+	MOVL	trap+0(FP), AX  // syscall entry
+	MOVL	a1+4(FP), BX
+	MOVL	a2+8(FP), CX
+	MOVL	a3+12(FP), DX
+	MOVL	$0, SI
+	MOVL	$0, DI
+	INVOKE_SYSCALL
+	MOVL	AX, r1+16(FP)
+	MOVL	DX, r2+20(FP)
+	RET
+
+TEXT ·socketcall(SB),NOSPLIT,$0-36
+	JMP	syscall·socketcall(SB)
+
+TEXT ·rawsocketcall(SB),NOSPLIT,$0-36
+	JMP	syscall·rawsocketcall(SB)
+
+TEXT ·seek(SB),NOSPLIT,$0-28
+	JMP	syscall·seek(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
new file mode 100644
index 00000000..c6468a95
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
@@ -0,0 +1,57 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for AMD64, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	CALL	runtime·entersyscall(SB)
+	MOVQ	a1+8(FP), DI
+	MOVQ	a2+16(FP), SI
+	MOVQ	a3+24(FP), DX
+	MOVQ	$0, R10
+	MOVQ	$0, R8
+	MOVQ	$0, R9
+	MOVQ	trap+0(FP), AX	// syscall entry
+	SYSCALL
+	MOVQ	AX, r1+32(FP)
+	MOVQ	DX, r2+40(FP)
+	CALL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVQ	a1+8(FP), DI
+	MOVQ	a2+16(FP), SI
+	MOVQ	a3+24(FP), DX
+	MOVQ	$0, R10
+	MOVQ	$0, R8
+	MOVQ	$0, R9
+	MOVQ	trap+0(FP), AX	// syscall entry
+	SYSCALL
+	MOVQ	AX, r1+32(FP)
+	MOVQ	DX, r2+40(FP)
+	RET
+
+TEXT ·gettimeofday(SB),NOSPLIT,$0-16
+	JMP	syscall·gettimeofday(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
new file mode 100644
index 00000000..cf0f3575
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
@@ -0,0 +1,56 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for arm, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+	BL	runtime·entersyscall(SB)
+	MOVW	trap+0(FP), R7
+	MOVW	a1+4(FP), R0
+	MOVW	a2+8(FP), R1
+	MOVW	a3+12(FP), R2
+	MOVW	$0, R3
+	MOVW	$0, R4
+	MOVW	$0, R5
+	SWI	$0
+	MOVW	R0, r1+16(FP)
+	MOVW	$0, R0
+	MOVW	R0, r2+20(FP)
+	BL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+	MOVW	trap+0(FP), R7	// syscall entry
+	MOVW	a1+4(FP), R0
+	MOVW	a2+8(FP), R1
+	MOVW	a3+12(FP), R2
+	SWI	$0
+	MOVW	R0, r1+16(FP)
+	MOVW	$0, R0
+	MOVW	R0, r2+20(FP)
+	RET
+
+TEXT ·seek(SB),NOSPLIT,$0-28
+	B	syscall·seek(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
new file mode 100644
index 00000000..afe6fdf6
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
@@ -0,0 +1,52 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build arm64
+// +build !gccgo
+
+#include "textflag.h"
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-56
+	B	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	B	syscall·Syscall6(SB)
+
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R0
+	MOVD	a2+16(FP), R1
+	MOVD	a3+24(FP), R2
+	MOVD	$0, R3
+	MOVD	$0, R4
+	MOVD	$0, R5
+	MOVD	trap+0(FP), R8	// syscall entry
+	SVC
+	MOVD	R0, r1+32(FP)	// r1
+	MOVD	R1, r2+40(FP)	// r2
+	BL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	B	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	B	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVD	a1+8(FP), R0
+	MOVD	a2+16(FP), R1
+	MOVD	a3+24(FP), R2
+	MOVD	$0, R3
+	MOVD	$0, R4
+	MOVD	$0, R5
+	MOVD	trap+0(FP), R8	// syscall entry
+	SVC
+	MOVD	R0, r1+32(FP)
+	MOVD	R1, r2+40(FP)
+	RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
new file mode 100644
index 00000000..ab9d6383
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
@@ -0,0 +1,56 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build mips64 mips64le
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for mips64, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	JAL	runtime·entersyscall(SB)
+	MOVV	a1+8(FP), R4
+	MOVV	a2+16(FP), R5
+	MOVV	a3+24(FP), R6
+	MOVV	R0, R7
+	MOVV	R0, R8
+	MOVV	R0, R9
+	MOVV	trap+0(FP), R2	// syscall entry
+	SYSCALL
+	MOVV	R2, r1+32(FP)
+	MOVV	R3, r2+40(FP)
+	JAL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVV	a1+8(FP), R4
+	MOVV	a2+16(FP), R5
+	MOVV	a3+24(FP), R6
+	MOVV	R0, R7
+	MOVV	R0, R8
+	MOVV	R0, R9
+	MOVV	trap+0(FP), R2	// syscall entry
+	SYSCALL
+	MOVV	R2, r1+32(FP)
+	MOVV	R3, r2+40(FP)
+	RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
new file mode 100644
index 00000000..99e53990
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
@@ -0,0 +1,54 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build mips mipsle
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for mips, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-28
+	JMP syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
+	JMP syscall·Syscall6(SB)
+
+TEXT ·Syscall9(SB),NOSPLIT,$0-52
+	JMP syscall·Syscall9(SB)
+
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+	JAL	runtime·entersyscall(SB)
+	MOVW	a1+4(FP), R4
+	MOVW	a2+8(FP), R5
+	MOVW	a3+12(FP), R6
+	MOVW	R0, R7
+	MOVW	trap+0(FP), R2	// syscall entry
+	SYSCALL
+	MOVW	R2, r1+16(FP)	// r1
+	MOVW	R3, r2+20(FP)	// r2
+	JAL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+	MOVW	a1+4(FP), R4
+	MOVW	a2+8(FP), R5
+	MOVW	a3+12(FP), R6
+	MOVW	trap+0(FP), R2	// syscall entry
+	SYSCALL
+	MOVW	R2, r1+16(FP)
+	MOVW	R3, r2+20(FP)
+	RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
new file mode 100644
index 00000000..649e5871
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
@@ -0,0 +1,56 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build ppc64 ppc64le
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for ppc64, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-56
+	BR	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	BR	syscall·Syscall6(SB)
+
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R3
+	MOVD	a2+16(FP), R4
+	MOVD	a3+24(FP), R5
+	MOVD	R0, R6
+	MOVD	R0, R7
+	MOVD	R0, R8
+	MOVD	trap+0(FP), R9	// syscall entry
+	SYSCALL R9
+	MOVD	R3, r1+32(FP)
+	MOVD	R4, r2+40(FP)
+	BL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	BR	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	BR	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVD	a1+8(FP), R3
+	MOVD	a2+16(FP), R4
+	MOVD	a3+24(FP), R5
+	MOVD	R0, R6
+	MOVD	R0, R7
+	MOVD	R0, R8
+	MOVD	trap+0(FP), R9	// syscall entry
+	SYSCALL R9
+	MOVD	R3, r1+32(FP)
+	MOVD	R4, r2+40(FP)
+	RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
new file mode 100644
index 00000000..a5a863c6
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
@@ -0,0 +1,56 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x
+// +build linux
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for s390x, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-56
+	BR	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	BR	syscall·Syscall6(SB)
+
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R2
+	MOVD	a2+16(FP), R3
+	MOVD	a3+24(FP), R4
+	MOVD	$0, R5
+	MOVD	$0, R6
+	MOVD	$0, R7
+	MOVD	trap+0(FP), R1	// syscall entry
+	SYSCALL
+	MOVD	R2, r1+32(FP)
+	MOVD	R3, r2+40(FP)
+	BL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	BR	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	BR	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVD	a1+8(FP), R2
+	MOVD	a2+16(FP), R3
+	MOVD	a3+24(FP), R4
+	MOVD	$0, R5
+	MOVD	$0, R6
+	MOVD	$0, R7
+	MOVD	trap+0(FP), R1	// syscall entry
+	SYSCALL
+	MOVD	R2, r1+32(FP)
+	MOVD	R3, r2+40(FP)
+	RET
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_386.s b/vendor/golang.org/x/sys/unix/asm_netbsd_386.s
new file mode 100644
index 00000000..48bdcd76
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_netbsd_386.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for 386, NetBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s
new file mode 100644
index 00000000..2ede05c7
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, NetBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s b/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s
new file mode 100644
index 00000000..e8928571
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s
@@ -0,0 +1,29 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for ARM, NetBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_openbsd_386.s b/vendor/golang.org/x/sys/unix/asm_openbsd_386.s
new file mode 100644
index 00000000..00576f3c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_openbsd_386.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for 386, OpenBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s
new file mode 100644
index 00000000..790ef77f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, OpenBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_openbsd_arm.s b/vendor/golang.org/x/sys/unix/asm_openbsd_arm.s
new file mode 100644
index 00000000..469bfa10
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_openbsd_arm.s
@@ -0,0 +1,29 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for ARM, OpenBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s b/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
new file mode 100644
index 00000000..ded8260f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
@@ -0,0 +1,17 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for amd64, Solaris are implemented in runtime/syscall_solaris.go
+//
+
+TEXT ·sysvicall6(SB),NOSPLIT,$0-88
+	JMP	syscall·sysvicall6(SB)
+
+TEXT ·rawSysvicall6(SB),NOSPLIT,$0-88
+	JMP	syscall·rawSysvicall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/bluetooth_linux.go b/vendor/golang.org/x/sys/unix/bluetooth_linux.go
new file mode 100644
index 00000000..6e322969
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/bluetooth_linux.go
@@ -0,0 +1,35 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Bluetooth sockets and messages
+
+package unix
+
+// Bluetooth Protocols
+const (
+	BTPROTO_L2CAP  = 0
+	BTPROTO_HCI    = 1
+	BTPROTO_SCO    = 2
+	BTPROTO_RFCOMM = 3
+	BTPROTO_BNEP   = 4
+	BTPROTO_CMTP   = 5
+	BTPROTO_HIDP   = 6
+	BTPROTO_AVDTP  = 7
+)
+
+const (
+	HCI_CHANNEL_RAW     = 0
+	HCI_CHANNEL_USER    = 1
+	HCI_CHANNEL_MONITOR = 2
+	HCI_CHANNEL_CONTROL = 3
+)
+
+// Socketoption Level
+const (
+	SOL_BLUETOOTH = 0x112
+	SOL_HCI       = 0x0
+	SOL_L2CAP     = 0x6
+	SOL_RFCOMM    = 0x12
+	SOL_SCO       = 0x11
+)
diff --git a/vendor/golang.org/x/sys/unix/cap_freebsd.go b/vendor/golang.org/x/sys/unix/cap_freebsd.go
new file mode 100644
index 00000000..df520487
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/cap_freebsd.go
@@ -0,0 +1,195 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build freebsd
+
+package unix
+
+import (
+	"errors"
+	"fmt"
+)
+
+// Go implementation of C mostly found in /usr/src/sys/kern/subr_capability.c
+
+const (
+	// This is the version of CapRights this package understands. See C implementation for parallels.
+	capRightsGoVersion = CAP_RIGHTS_VERSION_00
+	capArSizeMin       = CAP_RIGHTS_VERSION_00 + 2
+	capArSizeMax       = capRightsGoVersion + 2
+)
+
+var (
+	bit2idx = []int{
+		-1, 0, 1, -1, 2, -1, -1, -1, 3, -1, -1, -1, -1, -1, -1, -1,
+		4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	}
+)
+
+func capidxbit(right uint64) int {
+	return int((right >> 57) & 0x1f)
+}
+
+func rightToIndex(right uint64) (int, error) {
+	idx := capidxbit(right)
+	if idx < 0 || idx >= len(bit2idx) {
+		return -2, fmt.Errorf("index for right 0x%x out of range", right)
+	}
+	return bit2idx[idx], nil
+}
+
+func caprver(right uint64) int {
+	return int(right >> 62)
+}
+
+func capver(rights *CapRights) int {
+	return caprver(rights.Rights[0])
+}
+
+func caparsize(rights *CapRights) int {
+	return capver(rights) + 2
+}
+
+// CapRightsSet sets the permissions in setrights in rights.
+func CapRightsSet(rights *CapRights, setrights []uint64) error {
+	// This is essentially a copy of cap_rights_vset()
+	if capver(rights) != CAP_RIGHTS_VERSION_00 {
+		return fmt.Errorf("bad rights version %d", capver(rights))
+	}
+
+	n := caparsize(rights)
+	if n < capArSizeMin || n > capArSizeMax {
+		return errors.New("bad rights size")
+	}
+
+	for _, right := range setrights {
+		if caprver(right) != CAP_RIGHTS_VERSION_00 {
+			return errors.New("bad right version")
+		}
+		i, err := rightToIndex(right)
+		if err != nil {
+			return err
+		}
+		if i >= n {
+			return errors.New("index overflow")
+		}
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return errors.New("index mismatch")
+		}
+		rights.Rights[i] |= right
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return errors.New("index mismatch (after assign)")
+		}
+	}
+
+	return nil
+}
+
+// CapRightsClear clears the permissions in clearrights from rights.
+func CapRightsClear(rights *CapRights, clearrights []uint64) error {
+	// This is essentially a copy of cap_rights_vclear()
+	if capver(rights) != CAP_RIGHTS_VERSION_00 {
+		return fmt.Errorf("bad rights version %d", capver(rights))
+	}
+
+	n := caparsize(rights)
+	if n < capArSizeMin || n > capArSizeMax {
+		return errors.New("bad rights size")
+	}
+
+	for _, right := range clearrights {
+		if caprver(right) != CAP_RIGHTS_VERSION_00 {
+			return errors.New("bad right version")
+		}
+		i, err := rightToIndex(right)
+		if err != nil {
+			return err
+		}
+		if i >= n {
+			return errors.New("index overflow")
+		}
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return errors.New("index mismatch")
+		}
+		rights.Rights[i] &= ^(right & 0x01FFFFFFFFFFFFFF)
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return errors.New("index mismatch (after assign)")
+		}
+	}
+
+	return nil
+}
+
+// CapRightsIsSet checks whether all the permissions in setrights are present in rights.
+func CapRightsIsSet(rights *CapRights, setrights []uint64) (bool, error) {
+	// This is essentially a copy of cap_rights_is_vset()
+	if capver(rights) != CAP_RIGHTS_VERSION_00 {
+		return false, fmt.Errorf("bad rights version %d", capver(rights))
+	}
+
+	n := caparsize(rights)
+	if n < capArSizeMin || n > capArSizeMax {
+		return false, errors.New("bad rights size")
+	}
+
+	for _, right := range setrights {
+		if caprver(right) != CAP_RIGHTS_VERSION_00 {
+			return false, errors.New("bad right version")
+		}
+		i, err := rightToIndex(right)
+		if err != nil {
+			return false, err
+		}
+		if i >= n {
+			return false, errors.New("index overflow")
+		}
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return false, errors.New("index mismatch")
+		}
+		if (rights.Rights[i] & right) != right {
+			return false, nil
+		}
+	}
+
+	return true, nil
+}
+
+func capright(idx uint64, bit uint64) uint64 {
+	return ((1 << (57 + idx)) | bit)
+}
+
+// CapRightsInit returns a pointer to an initialised CapRights structure filled with rights.
+// See man cap_rights_init(3) and rights(4).
+func CapRightsInit(rights []uint64) (*CapRights, error) {
+	var r CapRights
+	r.Rights[0] = (capRightsGoVersion << 62) | capright(0, 0)
+	r.Rights[1] = capright(1, 0)
+
+	err := CapRightsSet(&r, rights)
+	if err != nil {
+		return nil, err
+	}
+	return &r, nil
+}
+
+// CapRightsLimit reduces the operations permitted on fd to at most those contained in rights.
+// The capability rights on fd can never be increased by CapRightsLimit.
+// See man cap_rights_limit(2) and rights(4).
+func CapRightsLimit(fd uintptr, rights *CapRights) error {
+	return capRightsLimit(int(fd), rights)
+}
+
+// CapRightsGet returns a CapRights structure containing the operations permitted on fd.
+// See man cap_rights_get(3) and rights(4).
+func CapRightsGet(fd uintptr) (*CapRights, error) {
+	r, err := CapRightsInit(nil)
+	if err != nil {
+		return nil, err
+	}
+	err = capRightsGet(capRightsGoVersion, int(fd), r)
+	if err != nil {
+		return nil, err
+	}
+	return r, nil
+}
diff --git a/vendor/golang.org/x/sys/unix/constants.go b/vendor/golang.org/x/sys/unix/constants.go
new file mode 100644
index 00000000..a96f0ebc
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/constants.go
@@ -0,0 +1,13 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+const (
+	R_OK = 0x4
+	W_OK = 0x2
+	X_OK = 0x1
+)
diff --git a/vendor/golang.org/x/sys/unix/creds_test.go b/vendor/golang.org/x/sys/unix/creds_test.go
new file mode 100644
index 00000000..1b508319
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/creds_test.go
@@ -0,0 +1,134 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+
+package unix_test
+
+import (
+	"bytes"
+	"go/build"
+	"net"
+	"os"
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+// TestSCMCredentials tests the sending and receiving of credentials
+// (PID, UID, GID) in an ancillary message between two UNIX
+// sockets. The SO_PASSCRED socket option is enabled on the sending
+// socket for this to work.
+func TestSCMCredentials(t *testing.T) {
+	socketTypeTests := []struct {
+		socketType int
+		dataLen    int
+	}{
+		{
+			unix.SOCK_STREAM,
+			1,
+		}, {
+			unix.SOCK_DGRAM,
+			0,
+		},
+	}
+
+	for _, tt := range socketTypeTests {
+		if tt.socketType == unix.SOCK_DGRAM && !atLeast1p10() {
+			t.Log("skipping DGRAM test on pre-1.10")
+			continue
+		}
+
+		fds, err := unix.Socketpair(unix.AF_LOCAL, tt.socketType, 0)
+		if err != nil {
+			t.Fatalf("Socketpair: %v", err)
+		}
+		defer unix.Close(fds[0])
+		defer unix.Close(fds[1])
+
+		err = unix.SetsockoptInt(fds[0], unix.SOL_SOCKET, unix.SO_PASSCRED, 1)
+		if err != nil {
+			t.Fatalf("SetsockoptInt: %v", err)
+		}
+
+		srvFile := os.NewFile(uintptr(fds[0]), "server")
+		defer srvFile.Close()
+		srv, err := net.FileConn(srvFile)
+		if err != nil {
+			t.Errorf("FileConn: %v", err)
+			return
+		}
+		defer srv.Close()
+
+		cliFile := os.NewFile(uintptr(fds[1]), "client")
+		defer cliFile.Close()
+		cli, err := net.FileConn(cliFile)
+		if err != nil {
+			t.Errorf("FileConn: %v", err)
+			return
+		}
+		defer cli.Close()
+
+		var ucred unix.Ucred
+		ucred.Pid = int32(os.Getpid())
+		ucred.Uid = uint32(os.Getuid())
+		ucred.Gid = uint32(os.Getgid())
+		oob := unix.UnixCredentials(&ucred)
+
+		// On SOCK_STREAM, this is internally going to send a dummy byte
+		n, oobn, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil)
+		if err != nil {
+			t.Fatalf("WriteMsgUnix: %v", err)
+		}
+		if n != 0 {
+			t.Fatalf("WriteMsgUnix n = %d, want 0", n)
+		}
+		if oobn != len(oob) {
+			t.Fatalf("WriteMsgUnix oobn = %d, want %d", oobn, len(oob))
+		}
+
+		oob2 := make([]byte, 10*len(oob))
+		n, oobn2, flags, _, err := srv.(*net.UnixConn).ReadMsgUnix(nil, oob2)
+		if err != nil {
+			t.Fatalf("ReadMsgUnix: %v", err)
+		}
+		if flags != 0 {
+			t.Fatalf("ReadMsgUnix flags = 0x%x, want 0", flags)
+		}
+		if n != tt.dataLen {
+			t.Fatalf("ReadMsgUnix n = %d, want %d", n, tt.dataLen)
+		}
+		if oobn2 != oobn {
+			// without SO_PASSCRED set on the socket, ReadMsgUnix will
+			// return zero oob bytes
+			t.Fatalf("ReadMsgUnix oobn = %d, want %d", oobn2, oobn)
+		}
+		oob2 = oob2[:oobn2]
+		if !bytes.Equal(oob, oob2) {
+			t.Fatal("ReadMsgUnix oob bytes don't match")
+		}
+
+		scm, err := unix.ParseSocketControlMessage(oob2)
+		if err != nil {
+			t.Fatalf("ParseSocketControlMessage: %v", err)
+		}
+		newUcred, err := unix.ParseUnixCredentials(&scm[0])
+		if err != nil {
+			t.Fatalf("ParseUnixCredentials: %v", err)
+		}
+		if *newUcred != ucred {
+			t.Fatalf("ParseUnixCredentials = %+v, want %+v", newUcred, ucred)
+		}
+	}
+}
+
+// atLeast1p10 reports whether we are running on Go 1.10 or later.
+func atLeast1p10() bool {
+	for _, ver := range build.Default.ReleaseTags {
+		if ver == "go1.10" {
+			return true
+		}
+	}
+	return false
+}
diff --git a/vendor/golang.org/x/sys/unix/dev_darwin.go b/vendor/golang.org/x/sys/unix/dev_darwin.go
new file mode 100644
index 00000000..8d1dc0fa
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/dev_darwin.go
@@ -0,0 +1,24 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in Darwin's sys/types.h header.
+
+package unix
+
+// Major returns the major component of a Darwin device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev >> 24) & 0xff)
+}
+
+// Minor returns the minor component of a Darwin device number.
+func Minor(dev uint64) uint32 {
+	return uint32(dev & 0xffffff)
+}
+
+// Mkdev returns a Darwin device number generated from the given major and minor
+// components.
+func Mkdev(major, minor uint32) uint64 {
+	return (uint64(major) << 24) | uint64(minor)
+}
diff --git a/vendor/golang.org/x/sys/unix/dev_dragonfly.go b/vendor/golang.org/x/sys/unix/dev_dragonfly.go
new file mode 100644
index 00000000..8502f202
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/dev_dragonfly.go
@@ -0,0 +1,30 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in Dragonfly's sys/types.h header.
+//
+// The information below is extracted and adapted from sys/types.h:
+//
+// Minor gives a cookie instead of an index since in order to avoid changing the
+// meanings of bits 0-15 or wasting time and space shifting bits 16-31 for
+// devices that don't use them.
+
+package unix
+
+// Major returns the major component of a DragonFlyBSD device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev >> 8) & 0xff)
+}
+
+// Minor returns the minor component of a DragonFlyBSD device number.
+func Minor(dev uint64) uint32 {
+	return uint32(dev & 0xffff00ff)
+}
+
+// Mkdev returns a DragonFlyBSD device number generated from the given major and
+// minor components.
+func Mkdev(major, minor uint32) uint64 {
+	return (uint64(major) << 8) | uint64(minor)
+}
diff --git a/vendor/golang.org/x/sys/unix/dev_freebsd.go b/vendor/golang.org/x/sys/unix/dev_freebsd.go
new file mode 100644
index 00000000..eba3b4bd
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/dev_freebsd.go
@@ -0,0 +1,30 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in FreeBSD's sys/types.h header.
+//
+// The information below is extracted and adapted from sys/types.h:
+//
+// Minor gives a cookie instead of an index since in order to avoid changing the
+// meanings of bits 0-15 or wasting time and space shifting bits 16-31 for
+// devices that don't use them.
+
+package unix
+
+// Major returns the major component of a FreeBSD device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev >> 8) & 0xff)
+}
+
+// Minor returns the minor component of a FreeBSD device number.
+func Minor(dev uint64) uint32 {
+	return uint32(dev & 0xffff00ff)
+}
+
+// Mkdev returns a FreeBSD device number generated from the given major and
+// minor components.
+func Mkdev(major, minor uint32) uint64 {
+	return (uint64(major) << 8) | uint64(minor)
+}
diff --git a/vendor/golang.org/x/sys/unix/dev_linux.go b/vendor/golang.org/x/sys/unix/dev_linux.go
new file mode 100644
index 00000000..d165d6f3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/dev_linux.go
@@ -0,0 +1,42 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used by the Linux kernel and glibc.
+//
+// The information below is extracted and adapted from bits/sysmacros.h in the
+// glibc sources:
+//
+// dev_t in glibc is 64-bit, with 32-bit major and minor numbers. glibc's
+// default encoding is MMMM Mmmm mmmM MMmm, where M is a hex digit of the major
+// number and m is a hex digit of the minor number. This is backward compatible
+// with legacy systems where dev_t is 16 bits wide, encoded as MMmm. It is also
+// backward compatible with the Linux kernel, which for some architectures uses
+// 32-bit dev_t, encoded as mmmM MMmm.
+
+package unix
+
+// Major returns the major component of a Linux device number.
+func Major(dev uint64) uint32 {
+	major := uint32((dev & 0x00000000000fff00) >> 8)
+	major |= uint32((dev & 0xfffff00000000000) >> 32)
+	return major
+}
+
+// Minor returns the minor component of a Linux device number.
+func Minor(dev uint64) uint32 {
+	minor := uint32((dev & 0x00000000000000ff) >> 0)
+	minor |= uint32((dev & 0x00000ffffff00000) >> 12)
+	return minor
+}
+
+// Mkdev returns a Linux device number generated from the given major and minor
+// components.
+func Mkdev(major, minor uint32) uint64 {
+	dev := (uint64(major) & 0x00000fff) << 8
+	dev |= (uint64(major) & 0xfffff000) << 32
+	dev |= (uint64(minor) & 0x000000ff) << 0
+	dev |= (uint64(minor) & 0xffffff00) << 12
+	return dev
+}
diff --git a/vendor/golang.org/x/sys/unix/dev_linux_test.go b/vendor/golang.org/x/sys/unix/dev_linux_test.go
new file mode 100644
index 00000000..51645289
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/dev_linux_test.go
@@ -0,0 +1,56 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.7
+
+package unix_test
+
+import (
+	"fmt"
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+func TestDevices(t *testing.T) {
+	testCases := []struct {
+		path  string
+		major uint32
+		minor uint32
+	}{
+		// well known major/minor numbers according to
+		// https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/admin-guide/devices.txt
+		{"/dev/null", 1, 3},
+		{"/dev/zero", 1, 5},
+		{"/dev/random", 1, 8},
+		{"/dev/full", 1, 7},
+		{"/dev/urandom", 1, 9},
+		{"/dev/tty", 5, 0},
+	}
+	for _, tc := range testCases {
+		t.Run(fmt.Sprintf("%s %v:%v", tc.path, tc.major, tc.minor), func(t *testing.T) {
+			var stat unix.Stat_t
+			err := unix.Stat(tc.path, &stat)
+			if err != nil {
+				if err == unix.EACCES {
+					t.Skip("no permission to stat device, skipping test")
+				}
+				t.Errorf("failed to stat device: %v", err)
+				return
+			}
+
+			dev := uint64(stat.Rdev)
+			if unix.Major(dev) != tc.major {
+				t.Errorf("for %s Major(%#x) == %d, want %d", tc.path, dev, unix.Major(dev), tc.major)
+			}
+			if unix.Minor(dev) != tc.minor {
+				t.Errorf("for %s Minor(%#x) == %d, want %d", tc.path, dev, unix.Minor(dev), tc.minor)
+			}
+			if unix.Mkdev(tc.major, tc.minor) != dev {
+				t.Errorf("for %s Mkdev(%d, %d) == %#x, want %#x", tc.path, tc.major, tc.minor, unix.Mkdev(tc.major, tc.minor), dev)
+			}
+		})
+
+	}
+}
diff --git a/vendor/golang.org/x/sys/unix/dev_netbsd.go b/vendor/golang.org/x/sys/unix/dev_netbsd.go
new file mode 100644
index 00000000..b4a203d0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/dev_netbsd.go
@@ -0,0 +1,29 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in NetBSD's sys/types.h header.
+
+package unix
+
+// Major returns the major component of a NetBSD device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev & 0x000fff00) >> 8)
+}
+
+// Minor returns the minor component of a NetBSD device number.
+func Minor(dev uint64) uint32 {
+	minor := uint32((dev & 0x000000ff) >> 0)
+	minor |= uint32((dev & 0xfff00000) >> 12)
+	return minor
+}
+
+// Mkdev returns a NetBSD device number generated from the given major and minor
+// components.
+func Mkdev(major, minor uint32) uint64 {
+	dev := (uint64(major) << 8) & 0x000fff00
+	dev |= (uint64(minor) << 12) & 0xfff00000
+	dev |= (uint64(minor) << 0) & 0x000000ff
+	return dev
+}
diff --git a/vendor/golang.org/x/sys/unix/dev_openbsd.go b/vendor/golang.org/x/sys/unix/dev_openbsd.go
new file mode 100644
index 00000000..f3430c42
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/dev_openbsd.go
@@ -0,0 +1,29 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in OpenBSD's sys/types.h header.
+
+package unix
+
+// Major returns the major component of an OpenBSD device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev & 0x0000ff00) >> 8)
+}
+
+// Minor returns the minor component of an OpenBSD device number.
+func Minor(dev uint64) uint32 {
+	minor := uint32((dev & 0x000000ff) >> 0)
+	minor |= uint32((dev & 0xffff0000) >> 8)
+	return minor
+}
+
+// Mkdev returns an OpenBSD device number generated from the given major and minor
+// components.
+func Mkdev(major, minor uint32) uint64 {
+	dev := (uint64(major) << 8) & 0x0000ff00
+	dev |= (uint64(minor) << 8) & 0xffff0000
+	dev |= (uint64(minor) << 0) & 0x000000ff
+	return dev
+}
diff --git a/vendor/golang.org/x/sys/unix/dirent.go b/vendor/golang.org/x/sys/unix/dirent.go
new file mode 100644
index 00000000..95fd3531
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/dirent.go
@@ -0,0 +1,17 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+
+package unix
+
+import "syscall"
+
+// ParseDirent parses up to max directory entries in buf,
+// appending the names to names. It returns the number of
+// bytes consumed from buf, the number of entries added
+// to names, and the new names slice.
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	return syscall.ParseDirent(buf, max, names)
+}
diff --git a/vendor/golang.org/x/sys/unix/endian_big.go b/vendor/golang.org/x/sys/unix/endian_big.go
new file mode 100644
index 00000000..5e926906
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/endian_big.go
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+// +build ppc64 s390x mips mips64
+
+package unix
+
+const isBigEndian = true
diff --git a/vendor/golang.org/x/sys/unix/endian_little.go b/vendor/golang.org/x/sys/unix/endian_little.go
new file mode 100644
index 00000000..085df2d8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/endian_little.go
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le
+
+package unix
+
+const isBigEndian = false
diff --git a/vendor/golang.org/x/sys/unix/env_unix.go b/vendor/golang.org/x/sys/unix/env_unix.go
new file mode 100644
index 00000000..706b3cd1
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/env_unix.go
@@ -0,0 +1,31 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+// Unix environment variables.
+
+package unix
+
+import "syscall"
+
+func Getenv(key string) (value string, found bool) {
+	return syscall.Getenv(key)
+}
+
+func Setenv(key, value string) error {
+	return syscall.Setenv(key, value)
+}
+
+func Clearenv() {
+	syscall.Clearenv()
+}
+
+func Environ() []string {
+	return syscall.Environ()
+}
+
+func Unsetenv(key string) error {
+	return syscall.Unsetenv(key)
+}
diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_386.go b/vendor/golang.org/x/sys/unix/errors_freebsd_386.go
new file mode 100644
index 00000000..c56bc8b0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/errors_freebsd_386.go
@@ -0,0 +1,227 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Constants that were deprecated or moved to enums in the FreeBSD headers. Keep
+// them here for backwards compatibility.
+
+package unix
+
+const (
+	IFF_SMART                         = 0x20
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IPPROTO_MAXID                     = 0x34
+	IPV6_FAITH                        = 0x1d
+	IP_FAITH                          = 0x16
+	MAP_NORESERVE                     = 0x40
+	MAP_RENAME                        = 0x20
+	NET_RT_MAXID                      = 0x6
+	RTF_PRCLONING                     = 0x10000
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	SIOCADDRT                         = 0x8030720a
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCDELRT                         = 0x8030720b
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCSLIFPHYADDR                   = 0x8118694a
+)
diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
new file mode 100644
index 00000000..3e977117
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
@@ -0,0 +1,227 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Constants that were deprecated or moved to enums in the FreeBSD headers. Keep
+// them here for backwards compatibility.
+
+package unix
+
+const (
+	IFF_SMART                         = 0x20
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IPPROTO_MAXID                     = 0x34
+	IPV6_FAITH                        = 0x1d
+	IP_FAITH                          = 0x16
+	MAP_NORESERVE                     = 0x40
+	MAP_RENAME                        = 0x20
+	NET_RT_MAXID                      = 0x6
+	RTF_PRCLONING                     = 0x10000
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	SIOCADDRT                         = 0x8040720a
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCDELRT                         = 0x8040720b
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCSLIFPHYADDR                   = 0x8118694a
+)
diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
new file mode 100644
index 00000000..856dca32
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
@@ -0,0 +1,226 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+const (
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+
+	// missing constants on FreeBSD-11.1-RELEASE, copied from old values in ztypes_freebsd_arm.go
+	IFF_SMART       = 0x20
+	IFT_FAITH       = 0xf2
+	IFT_IPXIP       = 0xf9
+	IPPROTO_MAXID   = 0x34
+	IPV6_FAITH      = 0x1d
+	IP_FAITH        = 0x16
+	MAP_NORESERVE   = 0x40
+	MAP_RENAME      = 0x20
+	NET_RT_MAXID    = 0x6
+	RTF_PRCLONING   = 0x10000
+	RTM_OLDADD      = 0x9
+	RTM_OLDDEL      = 0xa
+	SIOCADDRT       = 0x8030720a
+	SIOCALIFADDR    = 0x8118691b
+	SIOCDELRT       = 0x8030720b
+	SIOCDLIFADDR    = 0x8118691d
+	SIOCGLIFADDR    = 0xc118691c
+	SIOCGLIFPHYADDR = 0xc118694b
+	SIOCSLIFPHYADDR = 0x8118694a
+)
diff --git a/vendor/golang.org/x/sys/unix/example_test.go b/vendor/golang.org/x/sys/unix/example_test.go
new file mode 100644
index 00000000..10619afd
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/example_test.go
@@ -0,0 +1,19 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix_test
+
+import (
+	"log"
+	"os"
+
+	"golang.org/x/sys/unix"
+)
+
+func ExampleExec() {
+	err := unix.Exec("/bin/ls", []string{"ls", "-al"}, os.Environ())
+	log.Fatal(err)
+}
diff --git a/vendor/golang.org/x/sys/unix/export_test.go b/vendor/golang.org/x/sys/unix/export_test.go
new file mode 100644
index 00000000..e8024690
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/export_test.go
@@ -0,0 +1,9 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+var Itoa = itoa
diff --git a/vendor/golang.org/x/sys/unix/fcntl.go b/vendor/golang.org/x/sys/unix/fcntl.go
new file mode 100644
index 00000000..9379ba9c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/fcntl.go
@@ -0,0 +1,32 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
+package unix
+
+import "unsafe"
+
+// fcntl64Syscall is usually SYS_FCNTL, but is overridden on 32-bit Linux
+// systems by flock_linux_32bit.go to be SYS_FCNTL64.
+var fcntl64Syscall uintptr = SYS_FCNTL
+
+// FcntlInt performs a fcntl syscall on fd with the provided command and argument.
+func FcntlInt(fd uintptr, cmd, arg int) (int, error) {
+	valptr, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(arg))
+	var err error
+	if errno != 0 {
+		err = errno
+	}
+	return int(valptr), err
+}
+
+// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
+func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
+	_, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(unsafe.Pointer(lk)))
+	if errno == 0 {
+		return nil
+	}
+	return errno
+}
diff --git a/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go b/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
new file mode 100644
index 00000000..fc0e50e0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
@@ -0,0 +1,13 @@
+// +build linux,386 linux,arm linux,mips linux,mipsle
+
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+func init() {
+	// On 32-bit Linux systems, the fcntl syscall that matches Go's
+	// Flock_t type is SYS_FCNTL64, not SYS_FCNTL.
+	fcntl64Syscall = SYS_FCNTL64
+}
diff --git a/vendor/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go
new file mode 100644
index 00000000..50062e3c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/gccgo.go
@@ -0,0 +1,61 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gccgo
+
+package unix
+
+import "syscall"
+
+// We can't use the gc-syntax .s files for gccgo. On the plus side
+// much of the functionality can be written directly in Go.
+
+//extern gccgoRealSyscallNoError
+func realSyscallNoError(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r uintptr)
+
+//extern gccgoRealSyscall
+func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
+
+func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
+	syscall.Entersyscall()
+	r := realSyscallNoError(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+	syscall.Exitsyscall()
+	return r, 0
+}
+
+func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	syscall.Entersyscall()
+	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+	syscall.Exitsyscall()
+	return r, 0, syscall.Errno(errno)
+}
+
+func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	syscall.Entersyscall()
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
+	syscall.Exitsyscall()
+	return r, 0, syscall.Errno(errno)
+}
+
+func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	syscall.Entersyscall()
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9)
+	syscall.Exitsyscall()
+	return r, 0, syscall.Errno(errno)
+}
+
+func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
+	r := realSyscallNoError(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+	return r, 0
+}
+
+func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+	return r, 0, syscall.Errno(errno)
+}
+
+func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
+	return r, 0, syscall.Errno(errno)
+}
diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c
new file mode 100644
index 00000000..46523ced
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/gccgo_c.c
@@ -0,0 +1,38 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gccgo
+
+#include <errno.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#define _STRINGIFY2_(x) #x
+#define _STRINGIFY_(x) _STRINGIFY2_(x)
+#define GOSYM_PREFIX _STRINGIFY_(__USER_LABEL_PREFIX__)
+
+// Call syscall from C code because the gccgo support for calling from
+// Go to C does not support varargs functions.
+
+struct ret {
+	uintptr_t r;
+	uintptr_t err;
+};
+
+struct ret
+gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
+{
+	struct ret r;
+
+	errno = 0;
+	r.r = syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+	r.err = errno;
+	return r;
+}
+
+uintptr_t
+gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
+{
+	return syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+}
diff --git a/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
new file mode 100644
index 00000000..251a977a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
@@ -0,0 +1,20 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gccgo,linux,amd64
+
+package unix
+
+import "syscall"
+
+//extern gettimeofday
+func realGettimeofday(*Timeval, *byte) int32
+
+func gettimeofday(tv *Timeval) (err syscall.Errno) {
+	r := realGettimeofday(tv, nil)
+	if r < 0 {
+		return syscall.GetErrno()
+	}
+	return 0
+}
diff --git a/vendor/golang.org/x/sys/unix/ioctl.go b/vendor/golang.org/x/sys/unix/ioctl.go
new file mode 100644
index 00000000..8c9aaeb2
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ioctl.go
@@ -0,0 +1,30 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+import "runtime"
+
+// IoctlSetWinsize performs an ioctl on fd with a *Winsize argument.
+//
+// To change fd's window size, the req argument should be TIOCSWINSZ.
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+	// TODO: if we get the chance, remove the req parameter and
+	// hardcode TIOCSWINSZ.
+	err := ioctlSetWinsize(fd, req, value)
+	runtime.KeepAlive(value)
+	return err
+}
+
+// IoctlSetTermios performs an ioctl on fd with a *Termios.
+//
+// The req value will usually be TCSETA or TIOCSETA.
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+	// TODO: if we get the chance, remove the req parameter.
+	err := ioctlSetTermios(fd, req, value)
+	runtime.KeepAlive(value)
+	return err
+}
diff --git a/vendor/golang.org/x/sys/unix/linux/Dockerfile b/vendor/golang.org/x/sys/unix/linux/Dockerfile
new file mode 100644
index 00000000..b4d85461
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/linux/Dockerfile
@@ -0,0 +1,52 @@
+FROM ubuntu:18.04
+
+# Dependencies to get the git sources and go binaries
+RUN apt-get update && apt-get install -y  --no-install-recommends \
+        ca-certificates \
+        curl \
+        git \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Get the git sources. If not cached, this takes O(5 minutes).
+WORKDIR /git
+RUN git config --global advice.detachedHead false
+# Linux Kernel: Released 12 Aug 2018
+RUN git clone --branch v4.18 --depth 1 https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
+# GNU C library: Released 01 Aug 2018 (we should try to get a secure way to clone this)
+RUN git clone --branch glibc-2.28 --depth 1 git://sourceware.org/git/glibc.git
+
+# Get Go
+ENV GOLANG_VERSION 1.11beta3
+ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
+ENV GOLANG_DOWNLOAD_SHA256 674c1091f4712c1cfdcd77ecddafe6aef81cbda740af64a6e3f893ddf3dfb11c
+
+RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
+    && echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
+    && tar -C /usr/local -xzf golang.tar.gz \
+    && rm golang.tar.gz
+
+ENV PATH /usr/local/go/bin:$PATH
+
+# Linux and Glibc build dependencies and emulator
+RUN apt-get update && apt-get install -y  --no-install-recommends \
+        bison gawk make python \
+        gcc gcc-multilib \
+        gettext texinfo \
+        qemu \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+# Cross compilers (install recommended packages to get cross libc-dev)
+RUN apt-get update && apt-get install -y \
+        gcc-aarch64-linux-gnu       gcc-arm-linux-gnueabi     \
+        gcc-mips-linux-gnu          gcc-mips64-linux-gnuabi64 \
+        gcc-mips64el-linux-gnuabi64 gcc-mipsel-linux-gnu      \
+        gcc-powerpc64-linux-gnu     gcc-powerpc64le-linux-gnu \
+        gcc-s390x-linux-gnu         gcc-sparc64-linux-gnu     \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Let the scripts know they are in the docker environment
+ENV GOLANG_SYS_BUILD docker
+WORKDIR /build
+ENTRYPOINT ["go", "run", "linux/mkall.go", "/git/linux", "/git/glibc"]
diff --git a/vendor/golang.org/x/sys/unix/linux/mkall.go b/vendor/golang.org/x/sys/unix/linux/mkall.go
new file mode 100644
index 00000000..40b5cf4e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/linux/mkall.go
@@ -0,0 +1,750 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// linux/mkall.go - Generates all Linux zsysnum, zsyscall, zerror, and ztype
+// files for all 11 linux architectures supported by the go compiler. See
+// README.md for more information about the build system.
+
+// To run it you must have a git checkout of the Linux kernel and glibc. Once
+// the appropriate sources are ready, the program is run as:
+//     go run linux/mkall.go <linux_dir> <glibc_dir>
+
+// +build ignore
+
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"debug/elf"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"unicode"
+)
+
+// These will be paths to the appropriate source directories.
+var LinuxDir string
+var GlibcDir string
+
+const TempDir = "/tmp"
+const IncludeDir = TempDir + "/include" // To hold our C headers
+const BuildDir = TempDir + "/build"     // To hold intermediate build files
+
+const GOOS = "linux"       // Only for Linux targets
+const BuildArch = "amd64"  // Must be built on this architecture
+const MinKernel = "2.6.23" // https://golang.org/doc/install#requirements
+
+type target struct {
+	GoArch     string // Architecture name according to Go
+	LinuxArch  string // Architecture name according to the Linux Kernel
+	GNUArch    string // Architecture name according to GNU tools (https://wiki.debian.org/Multiarch/Tuples)
+	BigEndian  bool   // Default Little Endian
+	SignedChar bool   // Is -fsigned-char needed (default no)
+	Bits       int
+}
+
+// List of the 11 Linux targets supported by the go compiler. sparc64 is not
+// currently supported, though a port is in progress.
+var targets = []target{
+	{
+		GoArch:    "386",
+		LinuxArch: "x86",
+		GNUArch:   "i686-linux-gnu", // Note "i686" not "i386"
+		Bits:      32,
+	},
+	{
+		GoArch:    "amd64",
+		LinuxArch: "x86",
+		GNUArch:   "x86_64-linux-gnu",
+		Bits:      64,
+	},
+	{
+		GoArch:     "arm64",
+		LinuxArch:  "arm64",
+		GNUArch:    "aarch64-linux-gnu",
+		SignedChar: true,
+		Bits:       64,
+	},
+	{
+		GoArch:    "arm",
+		LinuxArch: "arm",
+		GNUArch:   "arm-linux-gnueabi",
+		Bits:      32,
+	},
+	{
+		GoArch:    "mips",
+		LinuxArch: "mips",
+		GNUArch:   "mips-linux-gnu",
+		BigEndian: true,
+		Bits:      32,
+	},
+	{
+		GoArch:    "mipsle",
+		LinuxArch: "mips",
+		GNUArch:   "mipsel-linux-gnu",
+		Bits:      32,
+	},
+	{
+		GoArch:    "mips64",
+		LinuxArch: "mips",
+		GNUArch:   "mips64-linux-gnuabi64",
+		BigEndian: true,
+		Bits:      64,
+	},
+	{
+		GoArch:    "mips64le",
+		LinuxArch: "mips",
+		GNUArch:   "mips64el-linux-gnuabi64",
+		Bits:      64,
+	},
+	{
+		GoArch:    "ppc64",
+		LinuxArch: "powerpc",
+		GNUArch:   "powerpc64-linux-gnu",
+		BigEndian: true,
+		Bits:      64,
+	},
+	{
+		GoArch:    "ppc64le",
+		LinuxArch: "powerpc",
+		GNUArch:   "powerpc64le-linux-gnu",
+		Bits:      64,
+	},
+	{
+		GoArch:     "s390x",
+		LinuxArch:  "s390",
+		GNUArch:    "s390x-linux-gnu",
+		BigEndian:  true,
+		SignedChar: true,
+		Bits:       64,
+	},
+	// {
+	// 	GoArch:    "sparc64",
+	// 	LinuxArch: "sparc",
+	// 	GNUArch:   "sparc64-linux-gnu",
+	// 	BigEndian: true,
+	// 	Bits:      64,
+	// },
+}
+
+// ptracePairs is a list of pairs of targets that can, in some cases,
+// run each other's binaries.
+var ptracePairs = []struct{ a1, a2 string }{
+	{"386", "amd64"},
+	{"arm", "arm64"},
+	{"mips", "mips64"},
+	{"mipsle", "mips64le"},
+}
+
+func main() {
+	if runtime.GOOS != GOOS || runtime.GOARCH != BuildArch {
+		fmt.Printf("Build system has GOOS_GOARCH = %s_%s, need %s_%s\n",
+			runtime.GOOS, runtime.GOARCH, GOOS, BuildArch)
+		return
+	}
+
+	// Check that we are using the new build system if we should
+	if os.Getenv("GOLANG_SYS_BUILD") != "docker" {
+		fmt.Println("In the new build system, mkall.go should not be called directly.")
+		fmt.Println("See README.md")
+		return
+	}
+
+	// Parse the command line options
+	if len(os.Args) != 3 {
+		fmt.Println("USAGE: go run linux/mkall.go <linux_dir> <glibc_dir>")
+		return
+	}
+	LinuxDir = os.Args[1]
+	GlibcDir = os.Args[2]
+
+	for _, t := range targets {
+		fmt.Printf("----- GENERATING: %s -----\n", t.GoArch)
+		if err := t.generateFiles(); err != nil {
+			fmt.Printf("%v\n***** FAILURE:    %s *****\n\n", err, t.GoArch)
+		} else {
+			fmt.Printf("----- SUCCESS:    %s -----\n\n", t.GoArch)
+		}
+	}
+
+	fmt.Printf("----- GENERATING ptrace pairs -----\n")
+	ok := true
+	for _, p := range ptracePairs {
+		if err := generatePtracePair(p.a1, p.a2); err != nil {
+			fmt.Printf("%v\n***** FAILURE: %s/%s *****\n\n", err, p.a1, p.a2)
+			ok = false
+		}
+	}
+	if ok {
+		fmt.Printf("----- SUCCESS ptrace pairs    -----\n\n")
+	}
+}
+
+// Makes an exec.Cmd with Stderr attached to os.Stderr
+func makeCommand(name string, args ...string) *exec.Cmd {
+	cmd := exec.Command(name, args...)
+	cmd.Stderr = os.Stderr
+	return cmd
+}
+
+// Runs the command, pipes output to a formatter, pipes that to an output file.
+func (t *target) commandFormatOutput(formatter string, outputFile string,
+	name string, args ...string) (err error) {
+	mainCmd := makeCommand(name, args...)
+
+	fmtCmd := makeCommand(formatter)
+	if formatter == "mkpost" {
+		fmtCmd = makeCommand("go", "run", "mkpost.go")
+		// Set GOARCH_TARGET so mkpost knows what GOARCH is..
+		fmtCmd.Env = append(os.Environ(), "GOARCH_TARGET="+t.GoArch)
+		// Set GOARCH to host arch for mkpost, so it can run natively.
+		for i, s := range fmtCmd.Env {
+			if strings.HasPrefix(s, "GOARCH=") {
+				fmtCmd.Env[i] = "GOARCH=" + BuildArch
+			}
+		}
+	}
+
+	// mainCmd | fmtCmd > outputFile
+	if fmtCmd.Stdin, err = mainCmd.StdoutPipe(); err != nil {
+		return
+	}
+	if fmtCmd.Stdout, err = os.Create(outputFile); err != nil {
+		return
+	}
+
+	// Make sure the formatter eventually closes
+	if err = fmtCmd.Start(); err != nil {
+		return
+	}
+	defer func() {
+		fmtErr := fmtCmd.Wait()
+		if err == nil {
+			err = fmtErr
+		}
+	}()
+
+	return mainCmd.Run()
+}
+
+// Generates all the files for a Linux target
+func (t *target) generateFiles() error {
+	// Setup environment variables
+	os.Setenv("GOOS", GOOS)
+	os.Setenv("GOARCH", t.GoArch)
+
+	// Get appropriate compiler and emulator (unless on x86)
+	if t.LinuxArch != "x86" {
+		// Check/Setup cross compiler
+		compiler := t.GNUArch + "-gcc"
+		if _, err := exec.LookPath(compiler); err != nil {
+			return err
+		}
+		os.Setenv("CC", compiler)
+
+		// Check/Setup emulator (usually first component of GNUArch)
+		qemuArchName := t.GNUArch[:strings.Index(t.GNUArch, "-")]
+		if t.LinuxArch == "powerpc" {
+			qemuArchName = t.GoArch
+		}
+		os.Setenv("GORUN", "qemu-"+qemuArchName)
+	} else {
+		os.Setenv("CC", "gcc")
+	}
+
+	// Make the include directory and fill it with headers
+	if err := os.MkdirAll(IncludeDir, os.ModePerm); err != nil {
+		return err
+	}
+	defer os.RemoveAll(IncludeDir)
+	if err := t.makeHeaders(); err != nil {
+		return fmt.Errorf("could not make header files: %v", err)
+	}
+	fmt.Println("header files generated")
+
+	// Make each of the four files
+	if err := t.makeZSysnumFile(); err != nil {
+		return fmt.Errorf("could not make zsysnum file: %v", err)
+	}
+	fmt.Println("zsysnum file generated")
+
+	if err := t.makeZSyscallFile(); err != nil {
+		return fmt.Errorf("could not make zsyscall file: %v", err)
+	}
+	fmt.Println("zsyscall file generated")
+
+	if err := t.makeZTypesFile(); err != nil {
+		return fmt.Errorf("could not make ztypes file: %v", err)
+	}
+	fmt.Println("ztypes file generated")
+
+	if err := t.makeZErrorsFile(); err != nil {
+		return fmt.Errorf("could not make zerrors file: %v", err)
+	}
+	fmt.Println("zerrors file generated")
+
+	return nil
+}
+
+// Create the Linux, glibc and ABI (C compiler convention) headers in the include directory.
+func (t *target) makeHeaders() error {
+	// Make the Linux headers we need for this architecture
+	linuxMake := makeCommand("make", "headers_install", "ARCH="+t.LinuxArch, "INSTALL_HDR_PATH="+TempDir)
+	linuxMake.Dir = LinuxDir
+	if err := linuxMake.Run(); err != nil {
+		return err
+	}
+
+	// A Temporary build directory for glibc
+	if err := os.MkdirAll(BuildDir, os.ModePerm); err != nil {
+		return err
+	}
+	defer os.RemoveAll(BuildDir)
+
+	// Make the glibc headers we need for this architecture
+	confScript := filepath.Join(GlibcDir, "configure")
+	glibcConf := makeCommand(confScript, "--prefix="+TempDir, "--host="+t.GNUArch, "--enable-kernel="+MinKernel)
+	glibcConf.Dir = BuildDir
+	if err := glibcConf.Run(); err != nil {
+		return err
+	}
+	glibcMake := makeCommand("make", "install-headers")
+	glibcMake.Dir = BuildDir
+	if err := glibcMake.Run(); err != nil {
+		return err
+	}
+	// We only need an empty stubs file
+	stubsFile := filepath.Join(IncludeDir, "gnu/stubs.h")
+	if file, err := os.Create(stubsFile); err != nil {
+		return err
+	} else {
+		file.Close()
+	}
+
+	// ABI headers will specify C compiler behavior for the target platform.
+	return t.makeABIHeaders()
+}
+
+// makeABIHeaders generates C header files based on the platform's calling convention.
+// While many platforms have formal Application Binary Interfaces, in practice, whatever the
+// dominant C compilers generate is the de-facto calling convention.
+//
+// We generate C headers instead of a Go file, so as to enable references to the ABI from Cgo.
+func (t *target) makeABIHeaders() (err error) {
+	abiDir := filepath.Join(IncludeDir, "abi")
+	if err = os.Mkdir(abiDir, os.ModePerm); err != nil {
+		return err
+	}
+
+	cc := os.Getenv("CC")
+	if cc == "" {
+		return errors.New("CC (compiler) env var not set")
+	}
+
+	// Build a sacrificial ELF file, to mine for C compiler behavior.
+	binPath := filepath.Join(TempDir, "tmp_abi.o")
+	bin, err := t.buildELF(cc, cCode, binPath)
+	if err != nil {
+		return fmt.Errorf("cannot build ELF to analyze: %v", err)
+	}
+	defer bin.Close()
+	defer os.Remove(binPath)
+
+	// Right now, we put everything in abi.h, but we may change this later.
+	abiFile, err := os.Create(filepath.Join(abiDir, "abi.h"))
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if cerr := abiFile.Close(); cerr != nil && err == nil {
+			err = cerr
+		}
+	}()
+
+	if err = t.writeBitFieldMasks(bin, abiFile); err != nil {
+		return fmt.Errorf("cannot write bitfield masks: %v", err)
+	}
+
+	return nil
+}
+
+func (t *target) buildELF(cc, src, path string) (*elf.File, error) {
+	// Compile the cCode source using the set compiler - we will need its .data section.
+	// Do not link the binary, so that we can find .data section offsets from the symbol values.
+	ccCmd := makeCommand(cc, "-o", path, "-gdwarf", "-x", "c", "-c", "-")
+	ccCmd.Stdin = strings.NewReader(src)
+	ccCmd.Stdout = os.Stdout
+	if err := ccCmd.Run(); err != nil {
+		return nil, fmt.Errorf("compiler error: %v", err)
+	}
+
+	bin, err := elf.Open(path)
+	if err != nil {
+		return nil, fmt.Errorf("cannot read ELF file %s: %v", path, err)
+	}
+
+	return bin, nil
+}
+
+func (t *target) writeBitFieldMasks(bin *elf.File, out io.Writer) error {
+	symbols, err := bin.Symbols()
+	if err != nil {
+		return fmt.Errorf("getting ELF symbols: %v", err)
+	}
+	var masksSym *elf.Symbol
+
+	for _, sym := range symbols {
+		if sym.Name == "masks" {
+			masksSym = &sym
+		}
+	}
+
+	if masksSym == nil {
+		return errors.New("could not find the 'masks' symbol in ELF symtab")
+	}
+
+	dataSection := bin.Section(".data")
+	if dataSection == nil {
+		return errors.New("ELF file has no .data section")
+	}
+
+	data, err := dataSection.Data()
+	if err != nil {
+		return fmt.Errorf("could not read .data section: %v\n", err)
+	}
+
+	var bo binary.ByteOrder
+	if t.BigEndian {
+		bo = binary.BigEndian
+	} else {
+		bo = binary.LittleEndian
+	}
+
+	// 64 bit masks of type uint64 are stored in the data section starting at masks.Value.
+	// Here we are running on AMD64, but these values may be big endian or little endian,
+	// depending on target architecture.
+	for i := uint64(0); i < 64; i++ {
+		off := masksSym.Value + i*8
+		// Define each mask in native by order, so as to match target endian.
+		fmt.Fprintf(out, "#define BITFIELD_MASK_%d %dULL\n", i, bo.Uint64(data[off:off+8]))
+	}
+
+	return nil
+}
+
+// makes the zsysnum_linux_$GOARCH.go file
+func (t *target) makeZSysnumFile() error {
+	zsysnumFile := fmt.Sprintf("zsysnum_linux_%s.go", t.GoArch)
+	unistdFile := filepath.Join(IncludeDir, "asm/unistd.h")
+
+	args := append(t.cFlags(), unistdFile)
+	return t.commandFormatOutput("gofmt", zsysnumFile, "linux/mksysnum.pl", args...)
+}
+
+// makes the zsyscall_linux_$GOARCH.go file
+func (t *target) makeZSyscallFile() error {
+	zsyscallFile := fmt.Sprintf("zsyscall_linux_%s.go", t.GoArch)
+	// Find the correct architecture syscall file (might end with x.go)
+	archSyscallFile := fmt.Sprintf("syscall_linux_%s.go", t.GoArch)
+	if _, err := os.Stat(archSyscallFile); os.IsNotExist(err) {
+		shortArch := strings.TrimSuffix(t.GoArch, "le")
+		archSyscallFile = fmt.Sprintf("syscall_linux_%sx.go", shortArch)
+	}
+
+	args := append(t.mksyscallFlags(), "-tags", "linux,"+t.GoArch,
+		"syscall_linux.go", archSyscallFile)
+	return t.commandFormatOutput("gofmt", zsyscallFile, "./mksyscall.pl", args...)
+}
+
+// makes the zerrors_linux_$GOARCH.go file
+func (t *target) makeZErrorsFile() error {
+	zerrorsFile := fmt.Sprintf("zerrors_linux_%s.go", t.GoArch)
+
+	return t.commandFormatOutput("gofmt", zerrorsFile, "./mkerrors.sh", t.cFlags()...)
+}
+
+// makes the ztypes_linux_$GOARCH.go file
+func (t *target) makeZTypesFile() error {
+	ztypesFile := fmt.Sprintf("ztypes_linux_%s.go", t.GoArch)
+
+	args := []string{"tool", "cgo", "-godefs", "--"}
+	args = append(args, t.cFlags()...)
+	args = append(args, "linux/types.go")
+	return t.commandFormatOutput("mkpost", ztypesFile, "go", args...)
+}
+
+// Flags that should be given to gcc and cgo for this target
+func (t *target) cFlags() []string {
+	// Compile statically to avoid cross-architecture dynamic linking.
+	flags := []string{"-Wall", "-Werror", "-static", "-I" + IncludeDir}
+
+	// Architecture-specific flags
+	if t.SignedChar {
+		flags = append(flags, "-fsigned-char")
+	}
+	if t.LinuxArch == "x86" {
+		flags = append(flags, fmt.Sprintf("-m%d", t.Bits))
+	}
+
+	return flags
+}
+
+// Flags that should be given to mksyscall for this target
+func (t *target) mksyscallFlags() (flags []string) {
+	if t.Bits == 32 {
+		if t.BigEndian {
+			flags = append(flags, "-b32")
+		} else {
+			flags = append(flags, "-l32")
+		}
+	}
+
+	// This flag menas a 64-bit value should use (even, odd)-pair.
+	if t.GoArch == "arm" || (t.LinuxArch == "mips" && t.Bits == 32) {
+		flags = append(flags, "-arm")
+	}
+	return
+}
+
+// generatePtracePair takes a pair of GOARCH values that can run each
+// other's binaries, such as 386 and amd64. It extracts the PtraceRegs
+// type for each one. It writes a new file defining the types
+// PtraceRegsArch1 and PtraceRegsArch2 and the corresponding functions
+// Ptrace{Get,Set}Regs{arch1,arch2}. This permits debugging the other
+// binary on a native system.
+func generatePtracePair(arch1, arch2 string) error {
+	def1, err := ptraceDef(arch1)
+	if err != nil {
+		return err
+	}
+	def2, err := ptraceDef(arch2)
+	if err != nil {
+		return err
+	}
+	f, err := os.Create(fmt.Sprintf("zptrace%s_linux.go", arch1))
+	if err != nil {
+		return err
+	}
+	buf := bufio.NewWriter(f)
+	fmt.Fprintf(buf, "// Code generated by linux/mkall.go generatePtracePair(%s, %s). DO NOT EDIT.\n", arch1, arch2)
+	fmt.Fprintf(buf, "\n")
+	fmt.Fprintf(buf, "// +build linux\n")
+	fmt.Fprintf(buf, "// +build %s %s\n", arch1, arch2)
+	fmt.Fprintf(buf, "\n")
+	fmt.Fprintf(buf, "package unix\n")
+	fmt.Fprintf(buf, "\n")
+	fmt.Fprintf(buf, "%s\n", `import "unsafe"`)
+	fmt.Fprintf(buf, "\n")
+	writeOnePtrace(buf, arch1, def1)
+	fmt.Fprintf(buf, "\n")
+	writeOnePtrace(buf, arch2, def2)
+	if err := buf.Flush(); err != nil {
+		return err
+	}
+	if err := f.Close(); err != nil {
+		return err
+	}
+	return nil
+}
+
+// ptraceDef returns the definition of PtraceRegs for arch.
+func ptraceDef(arch string) (string, error) {
+	filename := fmt.Sprintf("ztypes_linux_%s.go", arch)
+	data, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return "", fmt.Errorf("reading %s: %v", filename, err)
+	}
+	start := bytes.Index(data, []byte("type PtraceRegs struct"))
+	if start < 0 {
+		return "", fmt.Errorf("%s: no definition of PtraceRegs", filename)
+	}
+	data = data[start:]
+	end := bytes.Index(data, []byte("\n}\n"))
+	if end < 0 {
+		return "", fmt.Errorf("%s: can't find end of PtraceRegs definition", filename)
+	}
+	return string(data[:end+2]), nil
+}
+
+// writeOnePtrace writes out the ptrace definitions for arch.
+func writeOnePtrace(w io.Writer, arch, def string) {
+	uarch := string(unicode.ToUpper(rune(arch[0]))) + arch[1:]
+	fmt.Fprintf(w, "// PtraceRegs%s is the registers used by %s binaries.\n", uarch, arch)
+	fmt.Fprintf(w, "%s\n", strings.Replace(def, "PtraceRegs", "PtraceRegs"+uarch, 1))
+	fmt.Fprintf(w, "\n")
+	fmt.Fprintf(w, "// PtraceGetRegs%s fetches the registers used by %s binaries.\n", uarch, arch)
+	fmt.Fprintf(w, "func PtraceGetRegs%s(pid int, regsout *PtraceRegs%s) error {\n", uarch, uarch)
+	fmt.Fprintf(w, "\treturn ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))\n")
+	fmt.Fprintf(w, "}\n")
+	fmt.Fprintf(w, "\n")
+	fmt.Fprintf(w, "// PtraceSetRegs%s sets the registers used by %s binaries.\n", uarch, arch)
+	fmt.Fprintf(w, "func PtraceSetRegs%s(pid int, regs *PtraceRegs%s) error {\n", uarch, uarch)
+	fmt.Fprintf(w, "\treturn ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))\n")
+	fmt.Fprintf(w, "}\n")
+}
+
+// cCode is compiled for the target architecture, and the resulting data section is carved for
+// the statically initialized bit masks.
+const cCode = `
+// Bit fields are used in some system calls and other ABIs, but their memory layout is
+// implementation-defined [1]. Even with formal ABIs, bit fields are a source of subtle bugs [2].
+// Here we generate the offsets for all 64 bits in an uint64.
+// 1: http://en.cppreference.com/w/c/language/bit_field
+// 2: https://lwn.net/Articles/478657/
+
+#include <stdint.h>
+
+struct bitfield {
+	union {
+		uint64_t val;
+		struct {
+			uint64_t u64_bit_0 : 1;
+			uint64_t u64_bit_1 : 1;
+			uint64_t u64_bit_2 : 1;
+			uint64_t u64_bit_3 : 1;
+			uint64_t u64_bit_4 : 1;
+			uint64_t u64_bit_5 : 1;
+			uint64_t u64_bit_6 : 1;
+			uint64_t u64_bit_7 : 1;
+			uint64_t u64_bit_8 : 1;
+			uint64_t u64_bit_9 : 1;
+			uint64_t u64_bit_10 : 1;
+			uint64_t u64_bit_11 : 1;
+			uint64_t u64_bit_12 : 1;
+			uint64_t u64_bit_13 : 1;
+			uint64_t u64_bit_14 : 1;
+			uint64_t u64_bit_15 : 1;
+			uint64_t u64_bit_16 : 1;
+			uint64_t u64_bit_17 : 1;
+			uint64_t u64_bit_18 : 1;
+			uint64_t u64_bit_19 : 1;
+			uint64_t u64_bit_20 : 1;
+			uint64_t u64_bit_21 : 1;
+			uint64_t u64_bit_22 : 1;
+			uint64_t u64_bit_23 : 1;
+			uint64_t u64_bit_24 : 1;
+			uint64_t u64_bit_25 : 1;
+			uint64_t u64_bit_26 : 1;
+			uint64_t u64_bit_27 : 1;
+			uint64_t u64_bit_28 : 1;
+			uint64_t u64_bit_29 : 1;
+			uint64_t u64_bit_30 : 1;
+			uint64_t u64_bit_31 : 1;
+			uint64_t u64_bit_32 : 1;
+			uint64_t u64_bit_33 : 1;
+			uint64_t u64_bit_34 : 1;
+			uint64_t u64_bit_35 : 1;
+			uint64_t u64_bit_36 : 1;
+			uint64_t u64_bit_37 : 1;
+			uint64_t u64_bit_38 : 1;
+			uint64_t u64_bit_39 : 1;
+			uint64_t u64_bit_40 : 1;
+			uint64_t u64_bit_41 : 1;
+			uint64_t u64_bit_42 : 1;
+			uint64_t u64_bit_43 : 1;
+			uint64_t u64_bit_44 : 1;
+			uint64_t u64_bit_45 : 1;
+			uint64_t u64_bit_46 : 1;
+			uint64_t u64_bit_47 : 1;
+			uint64_t u64_bit_48 : 1;
+			uint64_t u64_bit_49 : 1;
+			uint64_t u64_bit_50 : 1;
+			uint64_t u64_bit_51 : 1;
+			uint64_t u64_bit_52 : 1;
+			uint64_t u64_bit_53 : 1;
+			uint64_t u64_bit_54 : 1;
+			uint64_t u64_bit_55 : 1;
+			uint64_t u64_bit_56 : 1;
+			uint64_t u64_bit_57 : 1;
+			uint64_t u64_bit_58 : 1;
+			uint64_t u64_bit_59 : 1;
+			uint64_t u64_bit_60 : 1;
+			uint64_t u64_bit_61 : 1;
+			uint64_t u64_bit_62 : 1;
+			uint64_t u64_bit_63 : 1;
+		};
+	};
+};
+
+struct bitfield masks[] = {
+	{.u64_bit_0 = 1},
+	{.u64_bit_1 = 1},
+	{.u64_bit_2 = 1},
+	{.u64_bit_3 = 1},
+	{.u64_bit_4 = 1},
+	{.u64_bit_5 = 1},
+	{.u64_bit_6 = 1},
+	{.u64_bit_7 = 1},
+	{.u64_bit_8 = 1},
+	{.u64_bit_9 = 1},
+	{.u64_bit_10 = 1},
+	{.u64_bit_11 = 1},
+	{.u64_bit_12 = 1},
+	{.u64_bit_13 = 1},
+	{.u64_bit_14 = 1},
+	{.u64_bit_15 = 1},
+	{.u64_bit_16 = 1},
+	{.u64_bit_17 = 1},
+	{.u64_bit_18 = 1},
+	{.u64_bit_19 = 1},
+	{.u64_bit_20 = 1},
+	{.u64_bit_21 = 1},
+	{.u64_bit_22 = 1},
+	{.u64_bit_23 = 1},
+	{.u64_bit_24 = 1},
+	{.u64_bit_25 = 1},
+	{.u64_bit_26 = 1},
+	{.u64_bit_27 = 1},
+	{.u64_bit_28 = 1},
+	{.u64_bit_29 = 1},
+	{.u64_bit_30 = 1},
+	{.u64_bit_31 = 1},
+	{.u64_bit_32 = 1},
+	{.u64_bit_33 = 1},
+	{.u64_bit_34 = 1},
+	{.u64_bit_35 = 1},
+	{.u64_bit_36 = 1},
+	{.u64_bit_37 = 1},
+	{.u64_bit_38 = 1},
+	{.u64_bit_39 = 1},
+	{.u64_bit_40 = 1},
+	{.u64_bit_41 = 1},
+	{.u64_bit_42 = 1},
+	{.u64_bit_43 = 1},
+	{.u64_bit_44 = 1},
+	{.u64_bit_45 = 1},
+	{.u64_bit_46 = 1},
+	{.u64_bit_47 = 1},
+	{.u64_bit_48 = 1},
+	{.u64_bit_49 = 1},
+	{.u64_bit_50 = 1},
+	{.u64_bit_51 = 1},
+	{.u64_bit_52 = 1},
+	{.u64_bit_53 = 1},
+	{.u64_bit_54 = 1},
+	{.u64_bit_55 = 1},
+	{.u64_bit_56 = 1},
+	{.u64_bit_57 = 1},
+	{.u64_bit_58 = 1},
+	{.u64_bit_59 = 1},
+	{.u64_bit_60 = 1},
+	{.u64_bit_61 = 1},
+	{.u64_bit_62 = 1},
+	{.u64_bit_63 = 1}
+};
+
+int main(int argc, char **argv) {
+	struct bitfield *mask_ptr = &masks[0];
+	return mask_ptr->val;
+}
+
+`
diff --git a/vendor/golang.org/x/sys/unix/linux/mksysnum.pl b/vendor/golang.org/x/sys/unix/linux/mksysnum.pl
new file mode 100755
index 00000000..63fd800b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/linux/mksysnum.pl
@@ -0,0 +1,85 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+use strict;
+
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
+# Check that we are using the new build system if we should
+if($ENV{'GOLANG_SYS_BUILD'} ne "docker") {
+	print STDERR "In the new build system, mksysnum should not be called directly.\n";
+	print STDERR "See README.md\n";
+	exit 1;
+}
+
+my $command = "$0 ". join(' ', @ARGV);
+
+print <<EOF;
+// $command
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
+package unix
+
+const(
+EOF
+
+my $offset = 0;
+
+sub fmt {
+	my ($name, $num) = @_;
+	if($num > 999){
+		# ignore deprecated syscalls that are no longer implemented
+		# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h?id=refs/heads/master#n716
+		return;
+	}
+	$name =~ y/a-z/A-Z/;
+	$num = $num + $offset;
+	print "	SYS_$name = $num;\n";
+}
+
+my $prev;
+open(CC, "$ENV{'CC'} -E -dD @ARGV |") || die "can't run $ENV{'CC'}";
+while(<CC>){
+	if(/^#define __NR_Linux\s+([0-9]+)/){
+		# mips/mips64: extract offset
+		$offset = $1;
+	}
+	elsif(/^#define __NR(\w*)_SYSCALL_BASE\s+([0-9]+)/){
+		# arm: extract offset
+		$offset = $1;
+	}
+	elsif(/^#define __NR_syscalls\s+/) {
+		# ignore redefinitions of __NR_syscalls
+	}
+	elsif(/^#define __NR_(\w*)Linux_syscalls\s+/) {
+		# mips/mips64: ignore definitions about the number of syscalls
+	}
+	elsif(/^#define __NR_(\w+)\s+([0-9]+)/){
+		$prev = $2;
+		fmt($1, $2);
+	}
+	elsif(/^#define __NR3264_(\w+)\s+([0-9]+)/){
+		$prev = $2;
+		fmt($1, $2);
+	}
+	elsif(/^#define __NR_(\w+)\s+\(\w+\+\s*([0-9]+)\)/){
+		fmt($1, $prev+$2)
+	}
+	elsif(/^#define __NR_(\w+)\s+\(__NR_Linux \+ ([0-9]+)/){
+		fmt($1, $2);
+	}
+	elsif(/^#define __NR_(\w+)\s+\(__NR_SYSCALL_BASE \+ ([0-9]+)/){
+		fmt($1, $2);
+	}
+}
+
+print <<EOF;
+)
+EOF
diff --git a/vendor/golang.org/x/sys/unix/linux/types.go b/vendor/golang.org/x/sys/unix/linux/types.go
new file mode 100644
index 00000000..a20f3549
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/linux/types.go
@@ -0,0 +1,1553 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See README.md
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define _LARGEFILE_SOURCE
+#define _LARGEFILE64_SOURCE
+#define _FILE_OFFSET_BITS 64
+#define _GNU_SOURCE
+
+#include <dirent.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <poll.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdio.h>
+#include <sys/epoll.h>
+#include <sys/inotify.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/statfs.h>
+#include <sys/statvfs.h>
+#include <sys/sysinfo.h>
+#include <sys/time.h>
+#include <sys/times.h>
+#include <sys/timex.h>
+#include <sys/un.h>
+#include <sys/user.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <linux/filter.h>
+#include <linux/icmpv6.h>
+#include <linux/keyctl.h>
+#include <linux/netfilter/nf_tables.h>
+#include <linux/netfilter/nfnetlink.h>
+#include <linux/netfilter.h>
+#include <linux/netlink.h>
+#include <linux/perf_event.h>
+#include <linux/rtnetlink.h>
+#include <linux/stat.h>
+#include <asm/termbits.h>
+#include <asm/ptrace.h>
+#include <time.h>
+#include <unistd.h>
+#include <utime.h>
+#include <linux/can.h>
+#include <linux/if_alg.h>
+#include <linux/if_packet.h>
+#include <linux/fs.h>
+#include <linux/vm_sockets.h>
+#include <linux/random.h>
+#include <linux/taskstats.h>
+#include <linux/cgroupstats.h>
+#include <linux/genetlink.h>
+#include <linux/socket.h>
+#include <linux/hdreg.h>
+#include <linux/rtc.h>
+#include <linux/blkpg.h>
+#include <linux/net_namespace.h>
+
+// abi/abi.h generated by mkall.go.
+#include "abi/abi.h"
+
+// On mips64, the glibc stat and kernel stat do not agree
+#if (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI64)
+
+// Use the stat defined by the kernel with a few modifications. These are:
+//	* The time fields (like st_atime and st_atimensec) use the timespec
+//	  struct (like st_atim) for consistency with the glibc fields.
+//	* The padding fields get different names to not break compatibility.
+//	* st_blocks is signed, again for compatibility.
+struct stat {
+	unsigned int		st_dev;
+	unsigned int		st_pad1[3]; // Reserved for st_dev expansion
+
+	unsigned long		st_ino;
+
+	mode_t			st_mode;
+	__u32			st_nlink;
+
+	uid_t			st_uid;
+	gid_t			st_gid;
+
+	unsigned int		st_rdev;
+	unsigned int		st_pad2[3]; // Reserved for st_rdev expansion
+
+	off_t			st_size;
+
+	// These are declared as separate fields in the kernel. Here we use
+	// the timespec struct for consistency with the other stat structs.
+	struct timespec		st_atim;
+	struct timespec		st_mtim;
+	struct timespec		st_ctim;
+
+	unsigned int		st_blksize;
+	unsigned int		st_pad4;
+
+	long			st_blocks;
+};
+
+// These are needed because we do not include fcntl.h or sys/types.h
+#include <linux/fcntl.h>
+#include <linux/fadvise.h>
+
+#else
+
+// Use the stat defined by glibc
+#include <fcntl.h>
+#include <sys/types.h>
+
+#endif
+
+// These are defined in linux/fcntl.h, but including it globally causes
+// conflicts with fcntl.h
+#ifndef AT_STATX_SYNC_TYPE
+# define AT_STATX_SYNC_TYPE	0x6000	// Type of synchronisation required from statx()
+#endif
+#ifndef AT_STATX_SYNC_AS_STAT
+# define AT_STATX_SYNC_AS_STAT	0x0000	// - Do whatever stat() does
+#endif
+#ifndef AT_STATX_FORCE_SYNC
+# define AT_STATX_FORCE_SYNC	0x2000	// - Force the attributes to be sync'd with the server
+#endif
+#ifndef AT_STATX_DONT_SYNC
+# define AT_STATX_DONT_SYNC	0x4000	// - Don't sync attributes with the server
+#endif
+
+#ifndef AT_EACCESS
+# define AT_EACCESS		0x200	// Test access permitted for effective IDs, not real IDs.
+#endif
+
+#ifdef TCSETS2
+// On systems that have "struct termios2" use this as type Termios.
+typedef struct termios2 termios_t;
+#else
+typedef struct termios termios_t;
+#endif
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_ll s5;
+	struct sockaddr_nl s6;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+// copied from /usr/include/bluetooth/hci.h
+struct sockaddr_hci {
+        sa_family_t     hci_family;
+        unsigned short  hci_dev;
+        unsigned short  hci_channel;
+};
+
+// copied from /usr/include/bluetooth/bluetooth.h
+#define BDADDR_BREDR           0x00
+#define BDADDR_LE_PUBLIC       0x01
+#define BDADDR_LE_RANDOM       0x02
+
+// copied from /usr/include/bluetooth/l2cap.h
+struct sockaddr_l2 {
+	sa_family_t	l2_family;
+	unsigned short	l2_psm;
+	uint8_t		l2_bdaddr[6];
+	unsigned short	l2_cid;
+	uint8_t		l2_bdaddr_type;
+};
+
+// copied from /usr/include/net/bluetooth/rfcomm.h
+struct sockaddr_rc {
+	sa_family_t rc_family;
+	uint8_t     rc_bdaddr[6];
+	uint8_t     rc_channel;
+};
+
+// copied from /usr/include/linux/un.h
+struct my_sockaddr_un {
+	sa_family_t sun_family;
+#if defined(__ARM_EABI__) || defined(__powerpc64__)
+	// on ARM char is by default unsigned
+	signed char sun_path[108];
+#else
+	char sun_path[108];
+#endif
+};
+
+#ifdef __ARM_EABI__
+typedef struct user_regs PtraceRegs;
+#elif defined(__aarch64__)
+typedef struct user_pt_regs PtraceRegs;
+#elif defined(__mips__) || defined(__powerpc64__)
+typedef struct pt_regs PtraceRegs;
+#elif defined(__s390x__)
+typedef struct _user_regs_struct PtraceRegs;
+#elif defined(__sparc__)
+#include <asm/ptrace.h>
+typedef struct pt_regs PtraceRegs;
+#else
+typedef struct user_regs_struct PtraceRegs;
+#endif
+
+#if defined(__s390x__)
+typedef struct _user_psw_struct ptracePsw;
+typedef struct _user_fpregs_struct ptraceFpregs;
+typedef struct _user_per_struct ptracePer;
+#else
+typedef struct {} ptracePsw;
+typedef struct {} ptraceFpregs;
+typedef struct {} ptracePer;
+#endif
+
+// The real epoll_event is a union, and godefs doesn't handle it well.
+struct my_epoll_event {
+	uint32_t events;
+#if defined(__ARM_EABI__) || defined(__aarch64__) || (defined(__mips__) && _MIPS_SIM == _ABIO32)
+	// padding is not specified in linux/eventpoll.h but added to conform to the
+	// alignment requirements of EABI
+	int32_t padFd;
+#elif defined(__powerpc64__) || defined(__s390x__) || defined(__sparc__)
+	int32_t _padFd;
+#endif
+	int32_t fd;
+	int32_t pad;
+};
+
+// Copied from <linux/perf_event.h> with the following modifications:
+// 1) bit field after read_format redeclared as '__u64 bits' to make it
+//    accessible from Go
+// 2) collapsed the unions, to avoid confusing godoc for the generated output
+//    (e.g. having to use BpAddr as an extension of Config)
+struct perf_event_attr_go {
+	__u32 type;
+
+	__u32 size;
+	__u64 config;
+
+	// union {
+	//   __u64 sample_period;
+	//   __u64 sample_freq;
+	// };
+	__u64 sample;
+
+	__u64 sample_type;
+	__u64 read_format;
+
+	// Replaces the bit field. Flags are defined as constants.
+	__u64 bits;
+
+	// union {
+	//   __u32 wakeup_events;
+	//   __u32 wakeup_watermark;
+	// };
+	__u32 wakeup;
+
+	__u32 bp_type;
+
+	// union {
+	//   __u64 bp_addr;
+	//   __u64 config1;
+	// };
+	__u64 ext1;
+
+	// union {
+	//   __u64 bp_len;
+	//   __u64 config2;
+	// };
+	__u64 ext2;
+
+	__u64 branch_sample_type;
+
+	__u64 sample_regs_user;
+
+	__u32 sample_stack_user;
+
+	__s32 clockid;
+	__u64 sample_regs_intr;
+	__u32 aux_watermark;
+	__u32 __reserved_2;
+};
+
+// ustat is deprecated and glibc 2.28 removed ustat.h. Provide the type here for
+// backwards compatibility. Copied from /usr/include/bits/ustat.h
+struct ustat {
+	__daddr_t f_tfree;
+	__ino_t f_tinode;
+	char f_fname[6];
+	char f_fpack[6];
+};
+
+// my_blkpg_partition is blkpg_partition with unsigned devname & volname.
+struct my_blkpg_partition {
+	long long start;
+	long long length;
+	int pno;
+	unsigned char devname[BLKPG_DEVNAMELTH];
+	unsigned char volname[BLKPG_VOLNAMELTH];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+	PathMax        = C.PATH_MAX
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+type Timex C.struct_timex
+
+type Time_t C.time_t
+
+type Tms C.struct_tms
+
+type Utimbuf C.struct_utimbuf
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+type Stat_t C.struct_stat
+
+type StatxTimestamp C.struct_statx_timestamp
+
+type Statx_t C.struct_statx
+
+type Dirent C.struct_dirent
+
+type Fsid C.fsid_t
+
+type Flock_t C.struct_flock
+
+// Filesystem Encryption
+
+type FscryptPolicy C.struct_fscrypt_policy
+
+type FscryptKey C.struct_fscrypt_key
+
+// Structure for Keyctl
+
+type KeyctlDHParams C.struct_keyctl_dh_params
+
+// Advice to Fadvise
+
+const (
+	FADV_NORMAL     = C.POSIX_FADV_NORMAL
+	FADV_RANDOM     = C.POSIX_FADV_RANDOM
+	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
+	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
+	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
+	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
+)
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_my_sockaddr_un
+
+type RawSockaddrLinklayer C.struct_sockaddr_ll
+
+type RawSockaddrNetlink C.struct_sockaddr_nl
+
+type RawSockaddrHCI C.struct_sockaddr_hci
+
+type RawSockaddrL2 C.struct_sockaddr_l2
+
+type RawSockaddrRFCOMM C.struct_sockaddr_rc
+
+type RawSockaddrCAN C.struct_sockaddr_can
+
+type RawSockaddrALG C.struct_sockaddr_alg
+
+type RawSockaddrVM C.struct_sockaddr_vm
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPMreqn C.struct_ip_mreqn
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type PacketMreq C.struct_packet_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet4Pktinfo C.struct_in_pktinfo
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+type Ucred C.struct_ucred
+
+type TCPInfo C.struct_tcp_info
+
+const (
+	SizeofSockaddrInet4     = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6     = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny       = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix      = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrLinklayer = C.sizeof_struct_sockaddr_ll
+	SizeofSockaddrNetlink   = C.sizeof_struct_sockaddr_nl
+	SizeofSockaddrHCI       = C.sizeof_struct_sockaddr_hci
+	SizeofSockaddrL2        = C.sizeof_struct_sockaddr_l2
+	SizeofSockaddrRFCOMM    = C.sizeof_struct_sockaddr_rc
+	SizeofSockaddrCAN       = C.sizeof_struct_sockaddr_can
+	SizeofSockaddrALG       = C.sizeof_struct_sockaddr_alg
+	SizeofSockaddrVM        = C.sizeof_struct_sockaddr_vm
+	SizeofLinger            = C.sizeof_struct_linger
+	SizeofIovec             = C.sizeof_struct_iovec
+	SizeofIPMreq            = C.sizeof_struct_ip_mreq
+	SizeofIPMreqn           = C.sizeof_struct_ip_mreqn
+	SizeofIPv6Mreq          = C.sizeof_struct_ipv6_mreq
+	SizeofPacketMreq        = C.sizeof_struct_packet_mreq
+	SizeofMsghdr            = C.sizeof_struct_msghdr
+	SizeofCmsghdr           = C.sizeof_struct_cmsghdr
+	SizeofInet4Pktinfo      = C.sizeof_struct_in_pktinfo
+	SizeofInet6Pktinfo      = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo       = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter      = C.sizeof_struct_icmp6_filter
+	SizeofUcred             = C.sizeof_struct_ucred
+	SizeofTCPInfo           = C.sizeof_struct_tcp_info
+)
+
+// Netlink routing and interface messages
+
+const (
+	IFA_UNSPEC           = C.IFA_UNSPEC
+	IFA_ADDRESS          = C.IFA_ADDRESS
+	IFA_LOCAL            = C.IFA_LOCAL
+	IFA_LABEL            = C.IFA_LABEL
+	IFA_BROADCAST        = C.IFA_BROADCAST
+	IFA_ANYCAST          = C.IFA_ANYCAST
+	IFA_CACHEINFO        = C.IFA_CACHEINFO
+	IFA_MULTICAST        = C.IFA_MULTICAST
+	IFLA_UNSPEC          = C.IFLA_UNSPEC
+	IFLA_ADDRESS         = C.IFLA_ADDRESS
+	IFLA_BROADCAST       = C.IFLA_BROADCAST
+	IFLA_IFNAME          = C.IFLA_IFNAME
+	IFLA_INFO_KIND       = C.IFLA_INFO_KIND
+	IFLA_MTU             = C.IFLA_MTU
+	IFLA_LINK            = C.IFLA_LINK
+	IFLA_QDISC           = C.IFLA_QDISC
+	IFLA_STATS           = C.IFLA_STATS
+	IFLA_COST            = C.IFLA_COST
+	IFLA_PRIORITY        = C.IFLA_PRIORITY
+	IFLA_MASTER          = C.IFLA_MASTER
+	IFLA_WIRELESS        = C.IFLA_WIRELESS
+	IFLA_PROTINFO        = C.IFLA_PROTINFO
+	IFLA_TXQLEN          = C.IFLA_TXQLEN
+	IFLA_MAP             = C.IFLA_MAP
+	IFLA_WEIGHT          = C.IFLA_WEIGHT
+	IFLA_OPERSTATE       = C.IFLA_OPERSTATE
+	IFLA_LINKMODE        = C.IFLA_LINKMODE
+	IFLA_LINKINFO        = C.IFLA_LINKINFO
+	IFLA_NET_NS_PID      = C.IFLA_NET_NS_PID
+	IFLA_IFALIAS         = C.IFLA_IFALIAS
+	IFLA_NUM_VF          = C.IFLA_NUM_VF
+	IFLA_VFINFO_LIST     = C.IFLA_VFINFO_LIST
+	IFLA_STATS64         = C.IFLA_STATS64
+	IFLA_VF_PORTS        = C.IFLA_VF_PORTS
+	IFLA_PORT_SELF       = C.IFLA_PORT_SELF
+	IFLA_AF_SPEC         = C.IFLA_AF_SPEC
+	IFLA_GROUP           = C.IFLA_GROUP
+	IFLA_NET_NS_FD       = C.IFLA_NET_NS_FD
+	IFLA_EXT_MASK        = C.IFLA_EXT_MASK
+	IFLA_PROMISCUITY     = C.IFLA_PROMISCUITY
+	IFLA_NUM_TX_QUEUES   = C.IFLA_NUM_TX_QUEUES
+	IFLA_NUM_RX_QUEUES   = C.IFLA_NUM_RX_QUEUES
+	IFLA_CARRIER         = C.IFLA_CARRIER
+	IFLA_PHYS_PORT_ID    = C.IFLA_PHYS_PORT_ID
+	IFLA_CARRIER_CHANGES = C.IFLA_CARRIER_CHANGES
+	IFLA_PHYS_SWITCH_ID  = C.IFLA_PHYS_SWITCH_ID
+	IFLA_LINK_NETNSID    = C.IFLA_LINK_NETNSID
+	IFLA_PHYS_PORT_NAME  = C.IFLA_PHYS_PORT_NAME
+	IFLA_PROTO_DOWN      = C.IFLA_PROTO_DOWN
+	IFLA_GSO_MAX_SEGS    = C.IFLA_GSO_MAX_SEGS
+	IFLA_GSO_MAX_SIZE    = C.IFLA_GSO_MAX_SIZE
+	IFLA_PAD             = C.IFLA_PAD
+	IFLA_XDP             = C.IFLA_XDP
+	IFLA_EVENT           = C.IFLA_EVENT
+	IFLA_NEW_NETNSID     = C.IFLA_NEW_NETNSID
+	IFLA_IF_NETNSID      = C.IFLA_IF_NETNSID
+	IFLA_MAX             = C.IFLA_MAX
+	RT_SCOPE_UNIVERSE    = C.RT_SCOPE_UNIVERSE
+	RT_SCOPE_SITE        = C.RT_SCOPE_SITE
+	RT_SCOPE_LINK        = C.RT_SCOPE_LINK
+	RT_SCOPE_HOST        = C.RT_SCOPE_HOST
+	RT_SCOPE_NOWHERE     = C.RT_SCOPE_NOWHERE
+	RT_TABLE_UNSPEC      = C.RT_TABLE_UNSPEC
+	RT_TABLE_COMPAT      = C.RT_TABLE_COMPAT
+	RT_TABLE_DEFAULT     = C.RT_TABLE_DEFAULT
+	RT_TABLE_MAIN        = C.RT_TABLE_MAIN
+	RT_TABLE_LOCAL       = C.RT_TABLE_LOCAL
+	RT_TABLE_MAX         = C.RT_TABLE_MAX
+	RTA_UNSPEC           = C.RTA_UNSPEC
+	RTA_DST              = C.RTA_DST
+	RTA_SRC              = C.RTA_SRC
+	RTA_IIF              = C.RTA_IIF
+	RTA_OIF              = C.RTA_OIF
+	RTA_GATEWAY          = C.RTA_GATEWAY
+	RTA_PRIORITY         = C.RTA_PRIORITY
+	RTA_PREFSRC          = C.RTA_PREFSRC
+	RTA_METRICS          = C.RTA_METRICS
+	RTA_MULTIPATH        = C.RTA_MULTIPATH
+	RTA_FLOW             = C.RTA_FLOW
+	RTA_CACHEINFO        = C.RTA_CACHEINFO
+	RTA_TABLE            = C.RTA_TABLE
+	RTN_UNSPEC           = C.RTN_UNSPEC
+	RTN_UNICAST          = C.RTN_UNICAST
+	RTN_LOCAL            = C.RTN_LOCAL
+	RTN_BROADCAST        = C.RTN_BROADCAST
+	RTN_ANYCAST          = C.RTN_ANYCAST
+	RTN_MULTICAST        = C.RTN_MULTICAST
+	RTN_BLACKHOLE        = C.RTN_BLACKHOLE
+	RTN_UNREACHABLE      = C.RTN_UNREACHABLE
+	RTN_PROHIBIT         = C.RTN_PROHIBIT
+	RTN_THROW            = C.RTN_THROW
+	RTN_NAT              = C.RTN_NAT
+	RTN_XRESOLVE         = C.RTN_XRESOLVE
+	RTNLGRP_NONE         = C.RTNLGRP_NONE
+	RTNLGRP_LINK         = C.RTNLGRP_LINK
+	RTNLGRP_NOTIFY       = C.RTNLGRP_NOTIFY
+	RTNLGRP_NEIGH        = C.RTNLGRP_NEIGH
+	RTNLGRP_TC           = C.RTNLGRP_TC
+	RTNLGRP_IPV4_IFADDR  = C.RTNLGRP_IPV4_IFADDR
+	RTNLGRP_IPV4_MROUTE  = C.RTNLGRP_IPV4_MROUTE
+	RTNLGRP_IPV4_ROUTE   = C.RTNLGRP_IPV4_ROUTE
+	RTNLGRP_IPV4_RULE    = C.RTNLGRP_IPV4_RULE
+	RTNLGRP_IPV6_IFADDR  = C.RTNLGRP_IPV6_IFADDR
+	RTNLGRP_IPV6_MROUTE  = C.RTNLGRP_IPV6_MROUTE
+	RTNLGRP_IPV6_ROUTE   = C.RTNLGRP_IPV6_ROUTE
+	RTNLGRP_IPV6_IFINFO  = C.RTNLGRP_IPV6_IFINFO
+	RTNLGRP_IPV6_PREFIX  = C.RTNLGRP_IPV6_PREFIX
+	RTNLGRP_IPV6_RULE    = C.RTNLGRP_IPV6_RULE
+	RTNLGRP_ND_USEROPT   = C.RTNLGRP_ND_USEROPT
+	SizeofNlMsghdr       = C.sizeof_struct_nlmsghdr
+	SizeofNlMsgerr       = C.sizeof_struct_nlmsgerr
+	SizeofRtGenmsg       = C.sizeof_struct_rtgenmsg
+	SizeofNlAttr         = C.sizeof_struct_nlattr
+	SizeofRtAttr         = C.sizeof_struct_rtattr
+	SizeofIfInfomsg      = C.sizeof_struct_ifinfomsg
+	SizeofIfAddrmsg      = C.sizeof_struct_ifaddrmsg
+	SizeofRtMsg          = C.sizeof_struct_rtmsg
+	SizeofRtNexthop      = C.sizeof_struct_rtnexthop
+)
+
+type NlMsghdr C.struct_nlmsghdr
+
+type NlMsgerr C.struct_nlmsgerr
+
+type RtGenmsg C.struct_rtgenmsg
+
+type NlAttr C.struct_nlattr
+
+type RtAttr C.struct_rtattr
+
+type IfInfomsg C.struct_ifinfomsg
+
+type IfAddrmsg C.struct_ifaddrmsg
+
+type RtMsg C.struct_rtmsg
+
+type RtNexthop C.struct_rtnexthop
+
+// Linux socket filter
+
+const (
+	SizeofSockFilter = C.sizeof_struct_sock_filter
+	SizeofSockFprog  = C.sizeof_struct_sock_fprog
+)
+
+type SockFilter C.struct_sock_filter
+
+type SockFprog C.struct_sock_fprog
+
+// Inotify
+
+type InotifyEvent C.struct_inotify_event
+
+const SizeofInotifyEvent = C.sizeof_struct_inotify_event
+
+// Ptrace
+
+// Register structures
+type PtraceRegs C.PtraceRegs
+
+// Structures contained in PtraceRegs on s390x (exported by mkpost.go)
+type PtracePsw C.ptracePsw
+
+type PtraceFpregs C.ptraceFpregs
+
+type PtracePer C.ptracePer
+
+// Misc
+
+type FdSet C.fd_set
+
+type Sysinfo_t C.struct_sysinfo
+
+type Utsname C.struct_utsname
+
+type Ustat_t C.struct_ustat
+
+type EpollEvent C.struct_my_epoll_event
+
+const (
+	AT_EMPTY_PATH   = C.AT_EMPTY_PATH
+	AT_FDCWD        = C.AT_FDCWD
+	AT_NO_AUTOMOUNT = C.AT_NO_AUTOMOUNT
+	AT_REMOVEDIR    = C.AT_REMOVEDIR
+
+	AT_STATX_SYNC_AS_STAT = C.AT_STATX_SYNC_AS_STAT
+	AT_STATX_FORCE_SYNC   = C.AT_STATX_FORCE_SYNC
+	AT_STATX_DONT_SYNC    = C.AT_STATX_DONT_SYNC
+
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+
+	AT_EACCESS = C.AT_EACCESS
+)
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLIN    = C.POLLIN
+	POLLPRI   = C.POLLPRI
+	POLLOUT   = C.POLLOUT
+	POLLRDHUP = C.POLLRDHUP
+	POLLERR   = C.POLLERR
+	POLLHUP   = C.POLLHUP
+	POLLNVAL  = C.POLLNVAL
+)
+
+type Sigset_t C.sigset_t
+
+const RNDGETENTCNT = C.RNDGETENTCNT
+
+const PERF_IOC_FLAG_GROUP = C.PERF_IOC_FLAG_GROUP
+
+// Terminal handling
+
+type Termios C.termios_t
+
+type Winsize C.struct_winsize
+
+// Taskstats and cgroup stats.
+
+type Taskstats C.struct_taskstats
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = C.TASKSTATS_CMD_UNSPEC
+	TASKSTATS_CMD_GET                     = C.TASKSTATS_CMD_GET
+	TASKSTATS_CMD_NEW                     = C.TASKSTATS_CMD_NEW
+	TASKSTATS_TYPE_UNSPEC                 = C.TASKSTATS_TYPE_UNSPEC
+	TASKSTATS_TYPE_PID                    = C.TASKSTATS_TYPE_PID
+	TASKSTATS_TYPE_TGID                   = C.TASKSTATS_TYPE_TGID
+	TASKSTATS_TYPE_STATS                  = C.TASKSTATS_TYPE_STATS
+	TASKSTATS_TYPE_AGGR_PID               = C.TASKSTATS_TYPE_AGGR_PID
+	TASKSTATS_TYPE_AGGR_TGID              = C.TASKSTATS_TYPE_AGGR_TGID
+	TASKSTATS_TYPE_NULL                   = C.TASKSTATS_TYPE_NULL
+	TASKSTATS_CMD_ATTR_UNSPEC             = C.TASKSTATS_CMD_ATTR_UNSPEC
+	TASKSTATS_CMD_ATTR_PID                = C.TASKSTATS_CMD_ATTR_PID
+	TASKSTATS_CMD_ATTR_TGID               = C.TASKSTATS_CMD_ATTR_TGID
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = C.TASKSTATS_CMD_ATTR_REGISTER_CPUMASK
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = C.TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK
+)
+
+type CGroupStats C.struct_cgroupstats
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = C.__TASKSTATS_CMD_MAX
+	CGROUPSTATS_CMD_GET           = C.CGROUPSTATS_CMD_GET
+	CGROUPSTATS_CMD_NEW           = C.CGROUPSTATS_CMD_NEW
+	CGROUPSTATS_TYPE_UNSPEC       = C.CGROUPSTATS_TYPE_UNSPEC
+	CGROUPSTATS_TYPE_CGROUP_STATS = C.CGROUPSTATS_TYPE_CGROUP_STATS
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = C.CGROUPSTATS_CMD_ATTR_UNSPEC
+	CGROUPSTATS_CMD_ATTR_FD       = C.CGROUPSTATS_CMD_ATTR_FD
+)
+
+// Generic netlink
+
+type Genlmsghdr C.struct_genlmsghdr
+
+const (
+	CTRL_CMD_UNSPEC            = C.CTRL_CMD_UNSPEC
+	CTRL_CMD_NEWFAMILY         = C.CTRL_CMD_NEWFAMILY
+	CTRL_CMD_DELFAMILY         = C.CTRL_CMD_DELFAMILY
+	CTRL_CMD_GETFAMILY         = C.CTRL_CMD_GETFAMILY
+	CTRL_CMD_NEWOPS            = C.CTRL_CMD_NEWOPS
+	CTRL_CMD_DELOPS            = C.CTRL_CMD_DELOPS
+	CTRL_CMD_GETOPS            = C.CTRL_CMD_GETOPS
+	CTRL_CMD_NEWMCAST_GRP      = C.CTRL_CMD_NEWMCAST_GRP
+	CTRL_CMD_DELMCAST_GRP      = C.CTRL_CMD_DELMCAST_GRP
+	CTRL_CMD_GETMCAST_GRP      = C.CTRL_CMD_GETMCAST_GRP
+	CTRL_ATTR_UNSPEC           = C.CTRL_ATTR_UNSPEC
+	CTRL_ATTR_FAMILY_ID        = C.CTRL_ATTR_FAMILY_ID
+	CTRL_ATTR_FAMILY_NAME      = C.CTRL_ATTR_FAMILY_NAME
+	CTRL_ATTR_VERSION          = C.CTRL_ATTR_VERSION
+	CTRL_ATTR_HDRSIZE          = C.CTRL_ATTR_HDRSIZE
+	CTRL_ATTR_MAXATTR          = C.CTRL_ATTR_MAXATTR
+	CTRL_ATTR_OPS              = C.CTRL_ATTR_OPS
+	CTRL_ATTR_MCAST_GROUPS     = C.CTRL_ATTR_MCAST_GROUPS
+	CTRL_ATTR_OP_UNSPEC        = C.CTRL_ATTR_OP_UNSPEC
+	CTRL_ATTR_OP_ID            = C.CTRL_ATTR_OP_ID
+	CTRL_ATTR_OP_FLAGS         = C.CTRL_ATTR_OP_FLAGS
+	CTRL_ATTR_MCAST_GRP_UNSPEC = C.CTRL_ATTR_MCAST_GRP_UNSPEC
+	CTRL_ATTR_MCAST_GRP_NAME   = C.CTRL_ATTR_MCAST_GRP_NAME
+	CTRL_ATTR_MCAST_GRP_ID     = C.CTRL_ATTR_MCAST_GRP_ID
+)
+
+// CPU affinity
+
+type cpuMask C.__cpu_mask
+
+const (
+	_CPU_SETSIZE = C.__CPU_SETSIZE
+	_NCPUBITS    = C.__NCPUBITS
+)
+
+// Bluetooth
+
+const (
+	BDADDR_BREDR     = C.BDADDR_BREDR
+	BDADDR_LE_PUBLIC = C.BDADDR_LE_PUBLIC
+	BDADDR_LE_RANDOM = C.BDADDR_LE_RANDOM
+)
+
+// Perf subsystem
+
+type PerfEventAttr C.struct_perf_event_attr_go
+
+type PerfEventMmapPage C.struct_perf_event_mmap_page
+
+// Bit field in struct perf_event_attr expanded as flags.
+// Set these on PerfEventAttr.Bits by ORing them together.
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = C.PERF_TYPE_HARDWARE
+	PERF_TYPE_SOFTWARE   = C.PERF_TYPE_SOFTWARE
+	PERF_TYPE_TRACEPOINT = C.PERF_TYPE_TRACEPOINT
+	PERF_TYPE_HW_CACHE   = C.PERF_TYPE_HW_CACHE
+	PERF_TYPE_RAW        = C.PERF_TYPE_RAW
+	PERF_TYPE_BREAKPOINT = C.PERF_TYPE_BREAKPOINT
+
+	PERF_COUNT_HW_CPU_CYCLES              = C.PERF_COUNT_HW_CPU_CYCLES
+	PERF_COUNT_HW_INSTRUCTIONS            = C.PERF_COUNT_HW_INSTRUCTIONS
+	PERF_COUNT_HW_CACHE_REFERENCES        = C.PERF_COUNT_HW_CACHE_REFERENCES
+	PERF_COUNT_HW_CACHE_MISSES            = C.PERF_COUNT_HW_CACHE_MISSES
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = C.PERF_COUNT_HW_BRANCH_INSTRUCTIONS
+	PERF_COUNT_HW_BRANCH_MISSES           = C.PERF_COUNT_HW_BRANCH_MISSES
+	PERF_COUNT_HW_BUS_CYCLES              = C.PERF_COUNT_HW_BUS_CYCLES
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = C.PERF_COUNT_HW_STALLED_CYCLES_FRONTEND
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = C.PERF_COUNT_HW_STALLED_CYCLES_BACKEND
+	PERF_COUNT_HW_REF_CPU_CYCLES          = C.PERF_COUNT_HW_REF_CPU_CYCLES
+
+	PERF_COUNT_HW_CACHE_L1D  = C.PERF_COUNT_HW_CACHE_L1D
+	PERF_COUNT_HW_CACHE_L1I  = C.PERF_COUNT_HW_CACHE_L1I
+	PERF_COUNT_HW_CACHE_LL   = C.PERF_COUNT_HW_CACHE_LL
+	PERF_COUNT_HW_CACHE_DTLB = C.PERF_COUNT_HW_CACHE_DTLB
+	PERF_COUNT_HW_CACHE_ITLB = C.PERF_COUNT_HW_CACHE_ITLB
+	PERF_COUNT_HW_CACHE_BPU  = C.PERF_COUNT_HW_CACHE_BPU
+	PERF_COUNT_HW_CACHE_NODE = C.PERF_COUNT_HW_CACHE_NODE
+
+	PERF_COUNT_HW_CACHE_OP_READ     = C.PERF_COUNT_HW_CACHE_OP_READ
+	PERF_COUNT_HW_CACHE_OP_WRITE    = C.PERF_COUNT_HW_CACHE_OP_WRITE
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = C.PERF_COUNT_HW_CACHE_OP_PREFETCH
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = C.PERF_COUNT_HW_CACHE_RESULT_ACCESS
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = C.PERF_COUNT_HW_CACHE_RESULT_MISS
+
+	PERF_COUNT_SW_CPU_CLOCK        = C.PERF_COUNT_SW_CPU_CLOCK
+	PERF_COUNT_SW_TASK_CLOCK       = C.PERF_COUNT_SW_TASK_CLOCK
+	PERF_COUNT_SW_PAGE_FAULTS      = C.PERF_COUNT_SW_PAGE_FAULTS
+	PERF_COUNT_SW_CONTEXT_SWITCHES = C.PERF_COUNT_SW_CONTEXT_SWITCHES
+	PERF_COUNT_SW_CPU_MIGRATIONS   = C.PERF_COUNT_SW_CPU_MIGRATIONS
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = C.PERF_COUNT_SW_PAGE_FAULTS_MIN
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = C.PERF_COUNT_SW_PAGE_FAULTS_MAJ
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = C.PERF_COUNT_SW_ALIGNMENT_FAULTS
+	PERF_COUNT_SW_EMULATION_FAULTS = C.PERF_COUNT_SW_EMULATION_FAULTS
+	PERF_COUNT_SW_DUMMY            = C.PERF_COUNT_SW_DUMMY
+
+	PERF_SAMPLE_IP           = C.PERF_SAMPLE_IP
+	PERF_SAMPLE_TID          = C.PERF_SAMPLE_TID
+	PERF_SAMPLE_TIME         = C.PERF_SAMPLE_TIME
+	PERF_SAMPLE_ADDR         = C.PERF_SAMPLE_ADDR
+	PERF_SAMPLE_READ         = C.PERF_SAMPLE_READ
+	PERF_SAMPLE_CALLCHAIN    = C.PERF_SAMPLE_CALLCHAIN
+	PERF_SAMPLE_ID           = C.PERF_SAMPLE_ID
+	PERF_SAMPLE_CPU          = C.PERF_SAMPLE_CPU
+	PERF_SAMPLE_PERIOD       = C.PERF_SAMPLE_PERIOD
+	PERF_SAMPLE_STREAM_ID    = C.PERF_SAMPLE_STREAM_ID
+	PERF_SAMPLE_RAW          = C.PERF_SAMPLE_RAW
+	PERF_SAMPLE_BRANCH_STACK = C.PERF_SAMPLE_BRANCH_STACK
+
+	PERF_SAMPLE_BRANCH_USER       = C.PERF_SAMPLE_BRANCH_USER
+	PERF_SAMPLE_BRANCH_KERNEL     = C.PERF_SAMPLE_BRANCH_KERNEL
+	PERF_SAMPLE_BRANCH_HV         = C.PERF_SAMPLE_BRANCH_HV
+	PERF_SAMPLE_BRANCH_ANY        = C.PERF_SAMPLE_BRANCH_ANY
+	PERF_SAMPLE_BRANCH_ANY_CALL   = C.PERF_SAMPLE_BRANCH_ANY_CALL
+	PERF_SAMPLE_BRANCH_ANY_RETURN = C.PERF_SAMPLE_BRANCH_ANY_RETURN
+	PERF_SAMPLE_BRANCH_IND_CALL   = C.PERF_SAMPLE_BRANCH_IND_CALL
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = C.PERF_FORMAT_TOTAL_TIME_ENABLED
+	PERF_FORMAT_TOTAL_TIME_RUNNING = C.PERF_FORMAT_TOTAL_TIME_RUNNING
+	PERF_FORMAT_ID                 = C.PERF_FORMAT_ID
+	PERF_FORMAT_GROUP              = C.PERF_FORMAT_GROUP
+
+	PERF_RECORD_MMAP       = C.PERF_RECORD_MMAP
+	PERF_RECORD_LOST       = C.PERF_RECORD_LOST
+	PERF_RECORD_COMM       = C.PERF_RECORD_COMM
+	PERF_RECORD_EXIT       = C.PERF_RECORD_EXIT
+	PERF_RECORD_THROTTLE   = C.PERF_RECORD_THROTTLE
+	PERF_RECORD_UNTHROTTLE = C.PERF_RECORD_UNTHROTTLE
+	PERF_RECORD_FORK       = C.PERF_RECORD_FORK
+	PERF_RECORD_READ       = C.PERF_RECORD_READ
+	PERF_RECORD_SAMPLE     = C.PERF_RECORD_SAMPLE
+
+	PERF_CONTEXT_HV     = C.PERF_CONTEXT_HV
+	PERF_CONTEXT_KERNEL = C.PERF_CONTEXT_KERNEL
+	PERF_CONTEXT_USER   = C.PERF_CONTEXT_USER
+
+	PERF_CONTEXT_GUEST        = C.PERF_CONTEXT_GUEST
+	PERF_CONTEXT_GUEST_KERNEL = C.PERF_CONTEXT_GUEST_KERNEL
+	PERF_CONTEXT_GUEST_USER   = C.PERF_CONTEXT_GUEST_USER
+
+	PERF_FLAG_FD_NO_GROUP = C.PERF_FLAG_FD_NO_GROUP
+	PERF_FLAG_FD_OUTPUT   = C.PERF_FLAG_FD_OUTPUT
+	PERF_FLAG_PID_CGROUP  = C.PERF_FLAG_PID_CGROUP
+)
+
+// Platform ABI and calling convention
+
+// Bit field masks for interoperability with C code that uses bit fields.
+// Each mask corresponds to a single bit set - bit field behavior can be replicated by combining
+// the masks with bitwise OR.
+const (
+	CBitFieldMaskBit0  = C.BITFIELD_MASK_0
+	CBitFieldMaskBit1  = C.BITFIELD_MASK_1
+	CBitFieldMaskBit2  = C.BITFIELD_MASK_2
+	CBitFieldMaskBit3  = C.BITFIELD_MASK_3
+	CBitFieldMaskBit4  = C.BITFIELD_MASK_4
+	CBitFieldMaskBit5  = C.BITFIELD_MASK_5
+	CBitFieldMaskBit6  = C.BITFIELD_MASK_6
+	CBitFieldMaskBit7  = C.BITFIELD_MASK_7
+	CBitFieldMaskBit8  = C.BITFIELD_MASK_8
+	CBitFieldMaskBit9  = C.BITFIELD_MASK_9
+	CBitFieldMaskBit10 = C.BITFIELD_MASK_10
+	CBitFieldMaskBit11 = C.BITFIELD_MASK_11
+	CBitFieldMaskBit12 = C.BITFIELD_MASK_12
+	CBitFieldMaskBit13 = C.BITFIELD_MASK_13
+	CBitFieldMaskBit14 = C.BITFIELD_MASK_14
+	CBitFieldMaskBit15 = C.BITFIELD_MASK_15
+	CBitFieldMaskBit16 = C.BITFIELD_MASK_16
+	CBitFieldMaskBit17 = C.BITFIELD_MASK_17
+	CBitFieldMaskBit18 = C.BITFIELD_MASK_18
+	CBitFieldMaskBit19 = C.BITFIELD_MASK_19
+	CBitFieldMaskBit20 = C.BITFIELD_MASK_20
+	CBitFieldMaskBit21 = C.BITFIELD_MASK_21
+	CBitFieldMaskBit22 = C.BITFIELD_MASK_22
+	CBitFieldMaskBit23 = C.BITFIELD_MASK_23
+	CBitFieldMaskBit24 = C.BITFIELD_MASK_24
+	CBitFieldMaskBit25 = C.BITFIELD_MASK_25
+	CBitFieldMaskBit26 = C.BITFIELD_MASK_26
+	CBitFieldMaskBit27 = C.BITFIELD_MASK_27
+	CBitFieldMaskBit28 = C.BITFIELD_MASK_28
+	CBitFieldMaskBit29 = C.BITFIELD_MASK_29
+	CBitFieldMaskBit30 = C.BITFIELD_MASK_30
+	CBitFieldMaskBit31 = C.BITFIELD_MASK_31
+	CBitFieldMaskBit32 = C.BITFIELD_MASK_32
+	CBitFieldMaskBit33 = C.BITFIELD_MASK_33
+	CBitFieldMaskBit34 = C.BITFIELD_MASK_34
+	CBitFieldMaskBit35 = C.BITFIELD_MASK_35
+	CBitFieldMaskBit36 = C.BITFIELD_MASK_36
+	CBitFieldMaskBit37 = C.BITFIELD_MASK_37
+	CBitFieldMaskBit38 = C.BITFIELD_MASK_38
+	CBitFieldMaskBit39 = C.BITFIELD_MASK_39
+	CBitFieldMaskBit40 = C.BITFIELD_MASK_40
+	CBitFieldMaskBit41 = C.BITFIELD_MASK_41
+	CBitFieldMaskBit42 = C.BITFIELD_MASK_42
+	CBitFieldMaskBit43 = C.BITFIELD_MASK_43
+	CBitFieldMaskBit44 = C.BITFIELD_MASK_44
+	CBitFieldMaskBit45 = C.BITFIELD_MASK_45
+	CBitFieldMaskBit46 = C.BITFIELD_MASK_46
+	CBitFieldMaskBit47 = C.BITFIELD_MASK_47
+	CBitFieldMaskBit48 = C.BITFIELD_MASK_48
+	CBitFieldMaskBit49 = C.BITFIELD_MASK_49
+	CBitFieldMaskBit50 = C.BITFIELD_MASK_50
+	CBitFieldMaskBit51 = C.BITFIELD_MASK_51
+	CBitFieldMaskBit52 = C.BITFIELD_MASK_52
+	CBitFieldMaskBit53 = C.BITFIELD_MASK_53
+	CBitFieldMaskBit54 = C.BITFIELD_MASK_54
+	CBitFieldMaskBit55 = C.BITFIELD_MASK_55
+	CBitFieldMaskBit56 = C.BITFIELD_MASK_56
+	CBitFieldMaskBit57 = C.BITFIELD_MASK_57
+	CBitFieldMaskBit58 = C.BITFIELD_MASK_58
+	CBitFieldMaskBit59 = C.BITFIELD_MASK_59
+	CBitFieldMaskBit60 = C.BITFIELD_MASK_60
+	CBitFieldMaskBit61 = C.BITFIELD_MASK_61
+	CBitFieldMaskBit62 = C.BITFIELD_MASK_62
+	CBitFieldMaskBit63 = C.BITFIELD_MASK_63
+)
+
+// TCP-MD5 signature.
+
+type SockaddrStorage C.struct_sockaddr_storage
+
+type TCPMD5Sig C.struct_tcp_md5sig
+
+// Disk drive operations.
+
+type HDDriveCmdHdr C.struct_hd_drive_cmd_hdr
+
+type HDGeometry C.struct_hd_geometry
+
+type HDDriveID C.struct_hd_driveid
+
+// Statfs
+
+type Statfs_t C.struct_statfs
+
+const (
+	ST_MANDLOCK    = C.ST_MANDLOCK
+	ST_NOATIME     = C.ST_NOATIME
+	ST_NODEV       = C.ST_NODEV
+	ST_NODIRATIME  = C.ST_NODIRATIME
+	ST_NOEXEC      = C.ST_NOEXEC
+	ST_NOSUID      = C.ST_NOSUID
+	ST_RDONLY      = C.ST_RDONLY
+	ST_RELATIME    = C.ST_RELATIME
+	ST_SYNCHRONOUS = C.ST_SYNCHRONOUS
+)
+
+// TPacket
+
+type TpacketHdr C.struct_tpacket_hdr
+
+type Tpacket2Hdr C.struct_tpacket2_hdr
+
+type Tpacket3Hdr C.struct_tpacket3_hdr
+
+type TpacketHdrVariant1 C.struct_tpacket_hdr_variant1
+
+type TpacketBlockDesc C.struct_tpacket_block_desc
+
+type TpacketReq C.struct_tpacket_req
+
+type TpacketReq3 C.struct_tpacket_req3
+
+type TpacketStats C.struct_tpacket_stats
+
+type TpacketStatsV3 C.struct_tpacket_stats_v3
+
+type TpacketAuxdata C.struct_tpacket_auxdata
+
+const (
+	TPACKET_V1 = C.TPACKET_V1
+	TPACKET_V2 = C.TPACKET_V2
+	TPACKET_V3 = C.TPACKET_V3
+)
+
+const (
+	SizeofTpacketHdr  = C.sizeof_struct_tpacket_hdr
+	SizeofTpacket2Hdr = C.sizeof_struct_tpacket2_hdr
+	SizeofTpacket3Hdr = C.sizeof_struct_tpacket3_hdr
+)
+
+// netfilter
+// generated using:
+// perl -nlE '/^\s*(NF\w+)/ && say "$1 = C.$1"' /usr/include/linux/netfilter.h
+const (
+	NF_INET_PRE_ROUTING  = C.NF_INET_PRE_ROUTING
+	NF_INET_LOCAL_IN     = C.NF_INET_LOCAL_IN
+	NF_INET_FORWARD      = C.NF_INET_FORWARD
+	NF_INET_LOCAL_OUT    = C.NF_INET_LOCAL_OUT
+	NF_INET_POST_ROUTING = C.NF_INET_POST_ROUTING
+	NF_INET_NUMHOOKS     = C.NF_INET_NUMHOOKS
+)
+
+const (
+	NF_NETDEV_INGRESS  = C.NF_NETDEV_INGRESS
+	NF_NETDEV_NUMHOOKS = C.NF_NETDEV_NUMHOOKS
+)
+
+const (
+	NFPROTO_UNSPEC   = C.NFPROTO_UNSPEC
+	NFPROTO_INET     = C.NFPROTO_INET
+	NFPROTO_IPV4     = C.NFPROTO_IPV4
+	NFPROTO_ARP      = C.NFPROTO_ARP
+	NFPROTO_NETDEV   = C.NFPROTO_NETDEV
+	NFPROTO_BRIDGE   = C.NFPROTO_BRIDGE
+	NFPROTO_IPV6     = C.NFPROTO_IPV6
+	NFPROTO_DECNET   = C.NFPROTO_DECNET
+	NFPROTO_NUMPROTO = C.NFPROTO_NUMPROTO
+)
+
+// netfilter nfnetlink
+type Nfgenmsg C.struct_nfgenmsg
+
+const (
+	NFNL_BATCH_UNSPEC = C.NFNL_BATCH_UNSPEC
+	NFNL_BATCH_GENID  = C.NFNL_BATCH_GENID
+)
+
+// netfilter nf_tables
+// generated using:
+// perl -nlE '/^\s*(NFT\w+)/ && say "$1 = C.$1"' /usr/include/linux/netfilter/nf_tables.h
+const (
+	NFT_REG_VERDICT                   = C.NFT_REG_VERDICT
+	NFT_REG_1                         = C.NFT_REG_1
+	NFT_REG_2                         = C.NFT_REG_2
+	NFT_REG_3                         = C.NFT_REG_3
+	NFT_REG_4                         = C.NFT_REG_4
+	NFT_REG32_00                      = C.NFT_REG32_00
+	NFT_REG32_01                      = C.NFT_REG32_01
+	NFT_REG32_02                      = C.NFT_REG32_02
+	NFT_REG32_03                      = C.NFT_REG32_03
+	NFT_REG32_04                      = C.NFT_REG32_04
+	NFT_REG32_05                      = C.NFT_REG32_05
+	NFT_REG32_06                      = C.NFT_REG32_06
+	NFT_REG32_07                      = C.NFT_REG32_07
+	NFT_REG32_08                      = C.NFT_REG32_08
+	NFT_REG32_09                      = C.NFT_REG32_09
+	NFT_REG32_10                      = C.NFT_REG32_10
+	NFT_REG32_11                      = C.NFT_REG32_11
+	NFT_REG32_12                      = C.NFT_REG32_12
+	NFT_REG32_13                      = C.NFT_REG32_13
+	NFT_REG32_14                      = C.NFT_REG32_14
+	NFT_REG32_15                      = C.NFT_REG32_15
+	NFT_CONTINUE                      = C.NFT_CONTINUE
+	NFT_BREAK                         = C.NFT_BREAK
+	NFT_JUMP                          = C.NFT_JUMP
+	NFT_GOTO                          = C.NFT_GOTO
+	NFT_RETURN                        = C.NFT_RETURN
+	NFT_MSG_NEWTABLE                  = C.NFT_MSG_NEWTABLE
+	NFT_MSG_GETTABLE                  = C.NFT_MSG_GETTABLE
+	NFT_MSG_DELTABLE                  = C.NFT_MSG_DELTABLE
+	NFT_MSG_NEWCHAIN                  = C.NFT_MSG_NEWCHAIN
+	NFT_MSG_GETCHAIN                  = C.NFT_MSG_GETCHAIN
+	NFT_MSG_DELCHAIN                  = C.NFT_MSG_DELCHAIN
+	NFT_MSG_NEWRULE                   = C.NFT_MSG_NEWRULE
+	NFT_MSG_GETRULE                   = C.NFT_MSG_GETRULE
+	NFT_MSG_DELRULE                   = C.NFT_MSG_DELRULE
+	NFT_MSG_NEWSET                    = C.NFT_MSG_NEWSET
+	NFT_MSG_GETSET                    = C.NFT_MSG_GETSET
+	NFT_MSG_DELSET                    = C.NFT_MSG_DELSET
+	NFT_MSG_NEWSETELEM                = C.NFT_MSG_NEWSETELEM
+	NFT_MSG_GETSETELEM                = C.NFT_MSG_GETSETELEM
+	NFT_MSG_DELSETELEM                = C.NFT_MSG_DELSETELEM
+	NFT_MSG_NEWGEN                    = C.NFT_MSG_NEWGEN
+	NFT_MSG_GETGEN                    = C.NFT_MSG_GETGEN
+	NFT_MSG_TRACE                     = C.NFT_MSG_TRACE
+	NFT_MSG_NEWOBJ                    = C.NFT_MSG_NEWOBJ
+	NFT_MSG_GETOBJ                    = C.NFT_MSG_GETOBJ
+	NFT_MSG_DELOBJ                    = C.NFT_MSG_DELOBJ
+	NFT_MSG_GETOBJ_RESET              = C.NFT_MSG_GETOBJ_RESET
+	NFT_MSG_MAX                       = C.NFT_MSG_MAX
+	NFTA_LIST_UNPEC                   = C.NFTA_LIST_UNPEC
+	NFTA_LIST_ELEM                    = C.NFTA_LIST_ELEM
+	NFTA_HOOK_UNSPEC                  = C.NFTA_HOOK_UNSPEC
+	NFTA_HOOK_HOOKNUM                 = C.NFTA_HOOK_HOOKNUM
+	NFTA_HOOK_PRIORITY                = C.NFTA_HOOK_PRIORITY
+	NFTA_HOOK_DEV                     = C.NFTA_HOOK_DEV
+	NFT_TABLE_F_DORMANT               = C.NFT_TABLE_F_DORMANT
+	NFTA_TABLE_UNSPEC                 = C.NFTA_TABLE_UNSPEC
+	NFTA_TABLE_NAME                   = C.NFTA_TABLE_NAME
+	NFTA_TABLE_FLAGS                  = C.NFTA_TABLE_FLAGS
+	NFTA_TABLE_USE                    = C.NFTA_TABLE_USE
+	NFTA_CHAIN_UNSPEC                 = C.NFTA_CHAIN_UNSPEC
+	NFTA_CHAIN_TABLE                  = C.NFTA_CHAIN_TABLE
+	NFTA_CHAIN_HANDLE                 = C.NFTA_CHAIN_HANDLE
+	NFTA_CHAIN_NAME                   = C.NFTA_CHAIN_NAME
+	NFTA_CHAIN_HOOK                   = C.NFTA_CHAIN_HOOK
+	NFTA_CHAIN_POLICY                 = C.NFTA_CHAIN_POLICY
+	NFTA_CHAIN_USE                    = C.NFTA_CHAIN_USE
+	NFTA_CHAIN_TYPE                   = C.NFTA_CHAIN_TYPE
+	NFTA_CHAIN_COUNTERS               = C.NFTA_CHAIN_COUNTERS
+	NFTA_CHAIN_PAD                    = C.NFTA_CHAIN_PAD
+	NFTA_RULE_UNSPEC                  = C.NFTA_RULE_UNSPEC
+	NFTA_RULE_TABLE                   = C.NFTA_RULE_TABLE
+	NFTA_RULE_CHAIN                   = C.NFTA_RULE_CHAIN
+	NFTA_RULE_HANDLE                  = C.NFTA_RULE_HANDLE
+	NFTA_RULE_EXPRESSIONS             = C.NFTA_RULE_EXPRESSIONS
+	NFTA_RULE_COMPAT                  = C.NFTA_RULE_COMPAT
+	NFTA_RULE_POSITION                = C.NFTA_RULE_POSITION
+	NFTA_RULE_USERDATA                = C.NFTA_RULE_USERDATA
+	NFTA_RULE_PAD                     = C.NFTA_RULE_PAD
+	NFTA_RULE_ID                      = C.NFTA_RULE_ID
+	NFT_RULE_COMPAT_F_INV             = C.NFT_RULE_COMPAT_F_INV
+	NFT_RULE_COMPAT_F_MASK            = C.NFT_RULE_COMPAT_F_MASK
+	NFTA_RULE_COMPAT_UNSPEC           = C.NFTA_RULE_COMPAT_UNSPEC
+	NFTA_RULE_COMPAT_PROTO            = C.NFTA_RULE_COMPAT_PROTO
+	NFTA_RULE_COMPAT_FLAGS            = C.NFTA_RULE_COMPAT_FLAGS
+	NFT_SET_ANONYMOUS                 = C.NFT_SET_ANONYMOUS
+	NFT_SET_CONSTANT                  = C.NFT_SET_CONSTANT
+	NFT_SET_INTERVAL                  = C.NFT_SET_INTERVAL
+	NFT_SET_MAP                       = C.NFT_SET_MAP
+	NFT_SET_TIMEOUT                   = C.NFT_SET_TIMEOUT
+	NFT_SET_EVAL                      = C.NFT_SET_EVAL
+	NFT_SET_OBJECT                    = C.NFT_SET_OBJECT
+	NFT_SET_POL_PERFORMANCE           = C.NFT_SET_POL_PERFORMANCE
+	NFT_SET_POL_MEMORY                = C.NFT_SET_POL_MEMORY
+	NFTA_SET_DESC_UNSPEC              = C.NFTA_SET_DESC_UNSPEC
+	NFTA_SET_DESC_SIZE                = C.NFTA_SET_DESC_SIZE
+	NFTA_SET_UNSPEC                   = C.NFTA_SET_UNSPEC
+	NFTA_SET_TABLE                    = C.NFTA_SET_TABLE
+	NFTA_SET_NAME                     = C.NFTA_SET_NAME
+	NFTA_SET_FLAGS                    = C.NFTA_SET_FLAGS
+	NFTA_SET_KEY_TYPE                 = C.NFTA_SET_KEY_TYPE
+	NFTA_SET_KEY_LEN                  = C.NFTA_SET_KEY_LEN
+	NFTA_SET_DATA_TYPE                = C.NFTA_SET_DATA_TYPE
+	NFTA_SET_DATA_LEN                 = C.NFTA_SET_DATA_LEN
+	NFTA_SET_POLICY                   = C.NFTA_SET_POLICY
+	NFTA_SET_DESC                     = C.NFTA_SET_DESC
+	NFTA_SET_ID                       = C.NFTA_SET_ID
+	NFTA_SET_TIMEOUT                  = C.NFTA_SET_TIMEOUT
+	NFTA_SET_GC_INTERVAL              = C.NFTA_SET_GC_INTERVAL
+	NFTA_SET_USERDATA                 = C.NFTA_SET_USERDATA
+	NFTA_SET_PAD                      = C.NFTA_SET_PAD
+	NFTA_SET_OBJ_TYPE                 = C.NFTA_SET_OBJ_TYPE
+	NFT_SET_ELEM_INTERVAL_END         = C.NFT_SET_ELEM_INTERVAL_END
+	NFTA_SET_ELEM_UNSPEC              = C.NFTA_SET_ELEM_UNSPEC
+	NFTA_SET_ELEM_KEY                 = C.NFTA_SET_ELEM_KEY
+	NFTA_SET_ELEM_DATA                = C.NFTA_SET_ELEM_DATA
+	NFTA_SET_ELEM_FLAGS               = C.NFTA_SET_ELEM_FLAGS
+	NFTA_SET_ELEM_TIMEOUT             = C.NFTA_SET_ELEM_TIMEOUT
+	NFTA_SET_ELEM_EXPIRATION          = C.NFTA_SET_ELEM_EXPIRATION
+	NFTA_SET_ELEM_USERDATA            = C.NFTA_SET_ELEM_USERDATA
+	NFTA_SET_ELEM_EXPR                = C.NFTA_SET_ELEM_EXPR
+	NFTA_SET_ELEM_PAD                 = C.NFTA_SET_ELEM_PAD
+	NFTA_SET_ELEM_OBJREF              = C.NFTA_SET_ELEM_OBJREF
+	NFTA_SET_ELEM_LIST_UNSPEC         = C.NFTA_SET_ELEM_LIST_UNSPEC
+	NFTA_SET_ELEM_LIST_TABLE          = C.NFTA_SET_ELEM_LIST_TABLE
+	NFTA_SET_ELEM_LIST_SET            = C.NFTA_SET_ELEM_LIST_SET
+	NFTA_SET_ELEM_LIST_ELEMENTS       = C.NFTA_SET_ELEM_LIST_ELEMENTS
+	NFTA_SET_ELEM_LIST_SET_ID         = C.NFTA_SET_ELEM_LIST_SET_ID
+	NFT_DATA_VALUE                    = C.NFT_DATA_VALUE
+	NFT_DATA_VERDICT                  = C.NFT_DATA_VERDICT
+	NFTA_DATA_UNSPEC                  = C.NFTA_DATA_UNSPEC
+	NFTA_DATA_VALUE                   = C.NFTA_DATA_VALUE
+	NFTA_DATA_VERDICT                 = C.NFTA_DATA_VERDICT
+	NFTA_VERDICT_UNSPEC               = C.NFTA_VERDICT_UNSPEC
+	NFTA_VERDICT_CODE                 = C.NFTA_VERDICT_CODE
+	NFTA_VERDICT_CHAIN                = C.NFTA_VERDICT_CHAIN
+	NFTA_EXPR_UNSPEC                  = C.NFTA_EXPR_UNSPEC
+	NFTA_EXPR_NAME                    = C.NFTA_EXPR_NAME
+	NFTA_EXPR_DATA                    = C.NFTA_EXPR_DATA
+	NFTA_IMMEDIATE_UNSPEC             = C.NFTA_IMMEDIATE_UNSPEC
+	NFTA_IMMEDIATE_DREG               = C.NFTA_IMMEDIATE_DREG
+	NFTA_IMMEDIATE_DATA               = C.NFTA_IMMEDIATE_DATA
+	NFTA_BITWISE_UNSPEC               = C.NFTA_BITWISE_UNSPEC
+	NFTA_BITWISE_SREG                 = C.NFTA_BITWISE_SREG
+	NFTA_BITWISE_DREG                 = C.NFTA_BITWISE_DREG
+	NFTA_BITWISE_LEN                  = C.NFTA_BITWISE_LEN
+	NFTA_BITWISE_MASK                 = C.NFTA_BITWISE_MASK
+	NFTA_BITWISE_XOR                  = C.NFTA_BITWISE_XOR
+	NFT_BYTEORDER_NTOH                = C.NFT_BYTEORDER_NTOH
+	NFT_BYTEORDER_HTON                = C.NFT_BYTEORDER_HTON
+	NFTA_BYTEORDER_UNSPEC             = C.NFTA_BYTEORDER_UNSPEC
+	NFTA_BYTEORDER_SREG               = C.NFTA_BYTEORDER_SREG
+	NFTA_BYTEORDER_DREG               = C.NFTA_BYTEORDER_DREG
+	NFTA_BYTEORDER_OP                 = C.NFTA_BYTEORDER_OP
+	NFTA_BYTEORDER_LEN                = C.NFTA_BYTEORDER_LEN
+	NFTA_BYTEORDER_SIZE               = C.NFTA_BYTEORDER_SIZE
+	NFT_CMP_EQ                        = C.NFT_CMP_EQ
+	NFT_CMP_NEQ                       = C.NFT_CMP_NEQ
+	NFT_CMP_LT                        = C.NFT_CMP_LT
+	NFT_CMP_LTE                       = C.NFT_CMP_LTE
+	NFT_CMP_GT                        = C.NFT_CMP_GT
+	NFT_CMP_GTE                       = C.NFT_CMP_GTE
+	NFTA_CMP_UNSPEC                   = C.NFTA_CMP_UNSPEC
+	NFTA_CMP_SREG                     = C.NFTA_CMP_SREG
+	NFTA_CMP_OP                       = C.NFTA_CMP_OP
+	NFTA_CMP_DATA                     = C.NFTA_CMP_DATA
+	NFT_RANGE_EQ                      = C.NFT_RANGE_EQ
+	NFT_RANGE_NEQ                     = C.NFT_RANGE_NEQ
+	NFTA_RANGE_UNSPEC                 = C.NFTA_RANGE_UNSPEC
+	NFTA_RANGE_SREG                   = C.NFTA_RANGE_SREG
+	NFTA_RANGE_OP                     = C.NFTA_RANGE_OP
+	NFTA_RANGE_FROM_DATA              = C.NFTA_RANGE_FROM_DATA
+	NFTA_RANGE_TO_DATA                = C.NFTA_RANGE_TO_DATA
+	NFT_LOOKUP_F_INV                  = C.NFT_LOOKUP_F_INV
+	NFTA_LOOKUP_UNSPEC                = C.NFTA_LOOKUP_UNSPEC
+	NFTA_LOOKUP_SET                   = C.NFTA_LOOKUP_SET
+	NFTA_LOOKUP_SREG                  = C.NFTA_LOOKUP_SREG
+	NFTA_LOOKUP_DREG                  = C.NFTA_LOOKUP_DREG
+	NFTA_LOOKUP_SET_ID                = C.NFTA_LOOKUP_SET_ID
+	NFTA_LOOKUP_FLAGS                 = C.NFTA_LOOKUP_FLAGS
+	NFT_DYNSET_OP_ADD                 = C.NFT_DYNSET_OP_ADD
+	NFT_DYNSET_OP_UPDATE              = C.NFT_DYNSET_OP_UPDATE
+	NFT_DYNSET_F_INV                  = C.NFT_DYNSET_F_INV
+	NFTA_DYNSET_UNSPEC                = C.NFTA_DYNSET_UNSPEC
+	NFTA_DYNSET_SET_NAME              = C.NFTA_DYNSET_SET_NAME
+	NFTA_DYNSET_SET_ID                = C.NFTA_DYNSET_SET_ID
+	NFTA_DYNSET_OP                    = C.NFTA_DYNSET_OP
+	NFTA_DYNSET_SREG_KEY              = C.NFTA_DYNSET_SREG_KEY
+	NFTA_DYNSET_SREG_DATA             = C.NFTA_DYNSET_SREG_DATA
+	NFTA_DYNSET_TIMEOUT               = C.NFTA_DYNSET_TIMEOUT
+	NFTA_DYNSET_EXPR                  = C.NFTA_DYNSET_EXPR
+	NFTA_DYNSET_PAD                   = C.NFTA_DYNSET_PAD
+	NFTA_DYNSET_FLAGS                 = C.NFTA_DYNSET_FLAGS
+	NFT_PAYLOAD_LL_HEADER             = C.NFT_PAYLOAD_LL_HEADER
+	NFT_PAYLOAD_NETWORK_HEADER        = C.NFT_PAYLOAD_NETWORK_HEADER
+	NFT_PAYLOAD_TRANSPORT_HEADER      = C.NFT_PAYLOAD_TRANSPORT_HEADER
+	NFT_PAYLOAD_CSUM_NONE             = C.NFT_PAYLOAD_CSUM_NONE
+	NFT_PAYLOAD_CSUM_INET             = C.NFT_PAYLOAD_CSUM_INET
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = C.NFT_PAYLOAD_L4CSUM_PSEUDOHDR
+	NFTA_PAYLOAD_UNSPEC               = C.NFTA_PAYLOAD_UNSPEC
+	NFTA_PAYLOAD_DREG                 = C.NFTA_PAYLOAD_DREG
+	NFTA_PAYLOAD_BASE                 = C.NFTA_PAYLOAD_BASE
+	NFTA_PAYLOAD_OFFSET               = C.NFTA_PAYLOAD_OFFSET
+	NFTA_PAYLOAD_LEN                  = C.NFTA_PAYLOAD_LEN
+	NFTA_PAYLOAD_SREG                 = C.NFTA_PAYLOAD_SREG
+	NFTA_PAYLOAD_CSUM_TYPE            = C.NFTA_PAYLOAD_CSUM_TYPE
+	NFTA_PAYLOAD_CSUM_OFFSET          = C.NFTA_PAYLOAD_CSUM_OFFSET
+	NFTA_PAYLOAD_CSUM_FLAGS           = C.NFTA_PAYLOAD_CSUM_FLAGS
+	NFT_EXTHDR_F_PRESENT              = C.NFT_EXTHDR_F_PRESENT
+	NFT_EXTHDR_OP_IPV6                = C.NFT_EXTHDR_OP_IPV6
+	NFT_EXTHDR_OP_TCPOPT              = C.NFT_EXTHDR_OP_TCPOPT
+	NFTA_EXTHDR_UNSPEC                = C.NFTA_EXTHDR_UNSPEC
+	NFTA_EXTHDR_DREG                  = C.NFTA_EXTHDR_DREG
+	NFTA_EXTHDR_TYPE                  = C.NFTA_EXTHDR_TYPE
+	NFTA_EXTHDR_OFFSET                = C.NFTA_EXTHDR_OFFSET
+	NFTA_EXTHDR_LEN                   = C.NFTA_EXTHDR_LEN
+	NFTA_EXTHDR_FLAGS                 = C.NFTA_EXTHDR_FLAGS
+	NFTA_EXTHDR_OP                    = C.NFTA_EXTHDR_OP
+	NFTA_EXTHDR_SREG                  = C.NFTA_EXTHDR_SREG
+	NFT_META_LEN                      = C.NFT_META_LEN
+	NFT_META_PROTOCOL                 = C.NFT_META_PROTOCOL
+	NFT_META_PRIORITY                 = C.NFT_META_PRIORITY
+	NFT_META_MARK                     = C.NFT_META_MARK
+	NFT_META_IIF                      = C.NFT_META_IIF
+	NFT_META_OIF                      = C.NFT_META_OIF
+	NFT_META_IIFNAME                  = C.NFT_META_IIFNAME
+	NFT_META_OIFNAME                  = C.NFT_META_OIFNAME
+	NFT_META_IIFTYPE                  = C.NFT_META_IIFTYPE
+	NFT_META_OIFTYPE                  = C.NFT_META_OIFTYPE
+	NFT_META_SKUID                    = C.NFT_META_SKUID
+	NFT_META_SKGID                    = C.NFT_META_SKGID
+	NFT_META_NFTRACE                  = C.NFT_META_NFTRACE
+	NFT_META_RTCLASSID                = C.NFT_META_RTCLASSID
+	NFT_META_SECMARK                  = C.NFT_META_SECMARK
+	NFT_META_NFPROTO                  = C.NFT_META_NFPROTO
+	NFT_META_L4PROTO                  = C.NFT_META_L4PROTO
+	NFT_META_BRI_IIFNAME              = C.NFT_META_BRI_IIFNAME
+	NFT_META_BRI_OIFNAME              = C.NFT_META_BRI_OIFNAME
+	NFT_META_PKTTYPE                  = C.NFT_META_PKTTYPE
+	NFT_META_CPU                      = C.NFT_META_CPU
+	NFT_META_IIFGROUP                 = C.NFT_META_IIFGROUP
+	NFT_META_OIFGROUP                 = C.NFT_META_OIFGROUP
+	NFT_META_CGROUP                   = C.NFT_META_CGROUP
+	NFT_META_PRANDOM                  = C.NFT_META_PRANDOM
+	NFT_RT_CLASSID                    = C.NFT_RT_CLASSID
+	NFT_RT_NEXTHOP4                   = C.NFT_RT_NEXTHOP4
+	NFT_RT_NEXTHOP6                   = C.NFT_RT_NEXTHOP6
+	NFT_RT_TCPMSS                     = C.NFT_RT_TCPMSS
+	NFT_HASH_JENKINS                  = C.NFT_HASH_JENKINS
+	NFT_HASH_SYM                      = C.NFT_HASH_SYM
+	NFTA_HASH_UNSPEC                  = C.NFTA_HASH_UNSPEC
+	NFTA_HASH_SREG                    = C.NFTA_HASH_SREG
+	NFTA_HASH_DREG                    = C.NFTA_HASH_DREG
+	NFTA_HASH_LEN                     = C.NFTA_HASH_LEN
+	NFTA_HASH_MODULUS                 = C.NFTA_HASH_MODULUS
+	NFTA_HASH_SEED                    = C.NFTA_HASH_SEED
+	NFTA_HASH_OFFSET                  = C.NFTA_HASH_OFFSET
+	NFTA_HASH_TYPE                    = C.NFTA_HASH_TYPE
+	NFTA_META_UNSPEC                  = C.NFTA_META_UNSPEC
+	NFTA_META_DREG                    = C.NFTA_META_DREG
+	NFTA_META_KEY                     = C.NFTA_META_KEY
+	NFTA_META_SREG                    = C.NFTA_META_SREG
+	NFTA_RT_UNSPEC                    = C.NFTA_RT_UNSPEC
+	NFTA_RT_DREG                      = C.NFTA_RT_DREG
+	NFTA_RT_KEY                       = C.NFTA_RT_KEY
+	NFT_CT_STATE                      = C.NFT_CT_STATE
+	NFT_CT_DIRECTION                  = C.NFT_CT_DIRECTION
+	NFT_CT_STATUS                     = C.NFT_CT_STATUS
+	NFT_CT_MARK                       = C.NFT_CT_MARK
+	NFT_CT_SECMARK                    = C.NFT_CT_SECMARK
+	NFT_CT_EXPIRATION                 = C.NFT_CT_EXPIRATION
+	NFT_CT_HELPER                     = C.NFT_CT_HELPER
+	NFT_CT_L3PROTOCOL                 = C.NFT_CT_L3PROTOCOL
+	NFT_CT_SRC                        = C.NFT_CT_SRC
+	NFT_CT_DST                        = C.NFT_CT_DST
+	NFT_CT_PROTOCOL                   = C.NFT_CT_PROTOCOL
+	NFT_CT_PROTO_SRC                  = C.NFT_CT_PROTO_SRC
+	NFT_CT_PROTO_DST                  = C.NFT_CT_PROTO_DST
+	NFT_CT_LABELS                     = C.NFT_CT_LABELS
+	NFT_CT_PKTS                       = C.NFT_CT_PKTS
+	NFT_CT_BYTES                      = C.NFT_CT_BYTES
+	NFT_CT_AVGPKT                     = C.NFT_CT_AVGPKT
+	NFT_CT_ZONE                       = C.NFT_CT_ZONE
+	NFT_CT_EVENTMASK                  = C.NFT_CT_EVENTMASK
+	NFTA_CT_UNSPEC                    = C.NFTA_CT_UNSPEC
+	NFTA_CT_DREG                      = C.NFTA_CT_DREG
+	NFTA_CT_KEY                       = C.NFTA_CT_KEY
+	NFTA_CT_DIRECTION                 = C.NFTA_CT_DIRECTION
+	NFTA_CT_SREG                      = C.NFTA_CT_SREG
+	NFT_LIMIT_PKTS                    = C.NFT_LIMIT_PKTS
+	NFT_LIMIT_PKT_BYTES               = C.NFT_LIMIT_PKT_BYTES
+	NFT_LIMIT_F_INV                   = C.NFT_LIMIT_F_INV
+	NFTA_LIMIT_UNSPEC                 = C.NFTA_LIMIT_UNSPEC
+	NFTA_LIMIT_RATE                   = C.NFTA_LIMIT_RATE
+	NFTA_LIMIT_UNIT                   = C.NFTA_LIMIT_UNIT
+	NFTA_LIMIT_BURST                  = C.NFTA_LIMIT_BURST
+	NFTA_LIMIT_TYPE                   = C.NFTA_LIMIT_TYPE
+	NFTA_LIMIT_FLAGS                  = C.NFTA_LIMIT_FLAGS
+	NFTA_LIMIT_PAD                    = C.NFTA_LIMIT_PAD
+	NFTA_COUNTER_UNSPEC               = C.NFTA_COUNTER_UNSPEC
+	NFTA_COUNTER_BYTES                = C.NFTA_COUNTER_BYTES
+	NFTA_COUNTER_PACKETS              = C.NFTA_COUNTER_PACKETS
+	NFTA_COUNTER_PAD                  = C.NFTA_COUNTER_PAD
+	NFTA_LOG_UNSPEC                   = C.NFTA_LOG_UNSPEC
+	NFTA_LOG_GROUP                    = C.NFTA_LOG_GROUP
+	NFTA_LOG_PREFIX                   = C.NFTA_LOG_PREFIX
+	NFTA_LOG_SNAPLEN                  = C.NFTA_LOG_SNAPLEN
+	NFTA_LOG_QTHRESHOLD               = C.NFTA_LOG_QTHRESHOLD
+	NFTA_LOG_LEVEL                    = C.NFTA_LOG_LEVEL
+	NFTA_LOG_FLAGS                    = C.NFTA_LOG_FLAGS
+	NFTA_QUEUE_UNSPEC                 = C.NFTA_QUEUE_UNSPEC
+	NFTA_QUEUE_NUM                    = C.NFTA_QUEUE_NUM
+	NFTA_QUEUE_TOTAL                  = C.NFTA_QUEUE_TOTAL
+	NFTA_QUEUE_FLAGS                  = C.NFTA_QUEUE_FLAGS
+	NFTA_QUEUE_SREG_QNUM              = C.NFTA_QUEUE_SREG_QNUM
+	NFT_QUOTA_F_INV                   = C.NFT_QUOTA_F_INV
+	NFT_QUOTA_F_DEPLETED              = C.NFT_QUOTA_F_DEPLETED
+	NFTA_QUOTA_UNSPEC                 = C.NFTA_QUOTA_UNSPEC
+	NFTA_QUOTA_BYTES                  = C.NFTA_QUOTA_BYTES
+	NFTA_QUOTA_FLAGS                  = C.NFTA_QUOTA_FLAGS
+	NFTA_QUOTA_PAD                    = C.NFTA_QUOTA_PAD
+	NFTA_QUOTA_CONSUMED               = C.NFTA_QUOTA_CONSUMED
+	NFT_REJECT_ICMP_UNREACH           = C.NFT_REJECT_ICMP_UNREACH
+	NFT_REJECT_TCP_RST                = C.NFT_REJECT_TCP_RST
+	NFT_REJECT_ICMPX_UNREACH          = C.NFT_REJECT_ICMPX_UNREACH
+	NFT_REJECT_ICMPX_NO_ROUTE         = C.NFT_REJECT_ICMPX_NO_ROUTE
+	NFT_REJECT_ICMPX_PORT_UNREACH     = C.NFT_REJECT_ICMPX_PORT_UNREACH
+	NFT_REJECT_ICMPX_HOST_UNREACH     = C.NFT_REJECT_ICMPX_HOST_UNREACH
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = C.NFT_REJECT_ICMPX_ADMIN_PROHIBITED
+	NFTA_REJECT_UNSPEC                = C.NFTA_REJECT_UNSPEC
+	NFTA_REJECT_TYPE                  = C.NFTA_REJECT_TYPE
+	NFTA_REJECT_ICMP_CODE             = C.NFTA_REJECT_ICMP_CODE
+	NFT_NAT_SNAT                      = C.NFT_NAT_SNAT
+	NFT_NAT_DNAT                      = C.NFT_NAT_DNAT
+	NFTA_NAT_UNSPEC                   = C.NFTA_NAT_UNSPEC
+	NFTA_NAT_TYPE                     = C.NFTA_NAT_TYPE
+	NFTA_NAT_FAMILY                   = C.NFTA_NAT_FAMILY
+	NFTA_NAT_REG_ADDR_MIN             = C.NFTA_NAT_REG_ADDR_MIN
+	NFTA_NAT_REG_ADDR_MAX             = C.NFTA_NAT_REG_ADDR_MAX
+	NFTA_NAT_REG_PROTO_MIN            = C.NFTA_NAT_REG_PROTO_MIN
+	NFTA_NAT_REG_PROTO_MAX            = C.NFTA_NAT_REG_PROTO_MAX
+	NFTA_NAT_FLAGS                    = C.NFTA_NAT_FLAGS
+	NFTA_MASQ_UNSPEC                  = C.NFTA_MASQ_UNSPEC
+	NFTA_MASQ_FLAGS                   = C.NFTA_MASQ_FLAGS
+	NFTA_MASQ_REG_PROTO_MIN           = C.NFTA_MASQ_REG_PROTO_MIN
+	NFTA_MASQ_REG_PROTO_MAX           = C.NFTA_MASQ_REG_PROTO_MAX
+	NFTA_REDIR_UNSPEC                 = C.NFTA_REDIR_UNSPEC
+	NFTA_REDIR_REG_PROTO_MIN          = C.NFTA_REDIR_REG_PROTO_MIN
+	NFTA_REDIR_REG_PROTO_MAX          = C.NFTA_REDIR_REG_PROTO_MAX
+	NFTA_REDIR_FLAGS                  = C.NFTA_REDIR_FLAGS
+	NFTA_DUP_UNSPEC                   = C.NFTA_DUP_UNSPEC
+	NFTA_DUP_SREG_ADDR                = C.NFTA_DUP_SREG_ADDR
+	NFTA_DUP_SREG_DEV                 = C.NFTA_DUP_SREG_DEV
+	NFTA_FWD_UNSPEC                   = C.NFTA_FWD_UNSPEC
+	NFTA_FWD_SREG_DEV                 = C.NFTA_FWD_SREG_DEV
+	NFTA_OBJREF_UNSPEC                = C.NFTA_OBJREF_UNSPEC
+	NFTA_OBJREF_IMM_TYPE              = C.NFTA_OBJREF_IMM_TYPE
+	NFTA_OBJREF_IMM_NAME              = C.NFTA_OBJREF_IMM_NAME
+	NFTA_OBJREF_SET_SREG              = C.NFTA_OBJREF_SET_SREG
+	NFTA_OBJREF_SET_NAME              = C.NFTA_OBJREF_SET_NAME
+	NFTA_OBJREF_SET_ID                = C.NFTA_OBJREF_SET_ID
+	NFTA_GEN_UNSPEC                   = C.NFTA_GEN_UNSPEC
+	NFTA_GEN_ID                       = C.NFTA_GEN_ID
+	NFTA_GEN_PROC_PID                 = C.NFTA_GEN_PROC_PID
+	NFTA_GEN_PROC_NAME                = C.NFTA_GEN_PROC_NAME
+	NFTA_FIB_UNSPEC                   = C.NFTA_FIB_UNSPEC
+	NFTA_FIB_DREG                     = C.NFTA_FIB_DREG
+	NFTA_FIB_RESULT                   = C.NFTA_FIB_RESULT
+	NFTA_FIB_FLAGS                    = C.NFTA_FIB_FLAGS
+	NFT_FIB_RESULT_UNSPEC             = C.NFT_FIB_RESULT_UNSPEC
+	NFT_FIB_RESULT_OIF                = C.NFT_FIB_RESULT_OIF
+	NFT_FIB_RESULT_OIFNAME            = C.NFT_FIB_RESULT_OIFNAME
+	NFT_FIB_RESULT_ADDRTYPE           = C.NFT_FIB_RESULT_ADDRTYPE
+	NFTA_FIB_F_SADDR                  = C.NFTA_FIB_F_SADDR
+	NFTA_FIB_F_DADDR                  = C.NFTA_FIB_F_DADDR
+	NFTA_FIB_F_MARK                   = C.NFTA_FIB_F_MARK
+	NFTA_FIB_F_IIF                    = C.NFTA_FIB_F_IIF
+	NFTA_FIB_F_OIF                    = C.NFTA_FIB_F_OIF
+	NFTA_FIB_F_PRESENT                = C.NFTA_FIB_F_PRESENT
+	NFTA_CT_HELPER_UNSPEC             = C.NFTA_CT_HELPER_UNSPEC
+	NFTA_CT_HELPER_NAME               = C.NFTA_CT_HELPER_NAME
+	NFTA_CT_HELPER_L3PROTO            = C.NFTA_CT_HELPER_L3PROTO
+	NFTA_CT_HELPER_L4PROTO            = C.NFTA_CT_HELPER_L4PROTO
+	NFTA_OBJ_UNSPEC                   = C.NFTA_OBJ_UNSPEC
+	NFTA_OBJ_TABLE                    = C.NFTA_OBJ_TABLE
+	NFTA_OBJ_NAME                     = C.NFTA_OBJ_NAME
+	NFTA_OBJ_TYPE                     = C.NFTA_OBJ_TYPE
+	NFTA_OBJ_DATA                     = C.NFTA_OBJ_DATA
+	NFTA_OBJ_USE                      = C.NFTA_OBJ_USE
+	NFTA_TRACE_UNSPEC                 = C.NFTA_TRACE_UNSPEC
+	NFTA_TRACE_TABLE                  = C.NFTA_TRACE_TABLE
+	NFTA_TRACE_CHAIN                  = C.NFTA_TRACE_CHAIN
+	NFTA_TRACE_RULE_HANDLE            = C.NFTA_TRACE_RULE_HANDLE
+	NFTA_TRACE_TYPE                   = C.NFTA_TRACE_TYPE
+	NFTA_TRACE_VERDICT                = C.NFTA_TRACE_VERDICT
+	NFTA_TRACE_ID                     = C.NFTA_TRACE_ID
+	NFTA_TRACE_LL_HEADER              = C.NFTA_TRACE_LL_HEADER
+	NFTA_TRACE_NETWORK_HEADER         = C.NFTA_TRACE_NETWORK_HEADER
+	NFTA_TRACE_TRANSPORT_HEADER       = C.NFTA_TRACE_TRANSPORT_HEADER
+	NFTA_TRACE_IIF                    = C.NFTA_TRACE_IIF
+	NFTA_TRACE_IIFTYPE                = C.NFTA_TRACE_IIFTYPE
+	NFTA_TRACE_OIF                    = C.NFTA_TRACE_OIF
+	NFTA_TRACE_OIFTYPE                = C.NFTA_TRACE_OIFTYPE
+	NFTA_TRACE_MARK                   = C.NFTA_TRACE_MARK
+	NFTA_TRACE_NFPROTO                = C.NFTA_TRACE_NFPROTO
+	NFTA_TRACE_POLICY                 = C.NFTA_TRACE_POLICY
+	NFTA_TRACE_PAD                    = C.NFTA_TRACE_PAD
+	NFT_TRACETYPE_UNSPEC              = C.NFT_TRACETYPE_UNSPEC
+	NFT_TRACETYPE_POLICY              = C.NFT_TRACETYPE_POLICY
+	NFT_TRACETYPE_RETURN              = C.NFT_TRACETYPE_RETURN
+	NFT_TRACETYPE_RULE                = C.NFT_TRACETYPE_RULE
+	NFTA_NG_UNSPEC                    = C.NFTA_NG_UNSPEC
+	NFTA_NG_DREG                      = C.NFTA_NG_DREG
+	NFTA_NG_MODULUS                   = C.NFTA_NG_MODULUS
+	NFTA_NG_TYPE                      = C.NFTA_NG_TYPE
+	NFTA_NG_OFFSET                    = C.NFTA_NG_OFFSET
+	NFT_NG_INCREMENTAL                = C.NFT_NG_INCREMENTAL
+	NFT_NG_RANDOM                     = C.NFT_NG_RANDOM
+)
+
+type RTCTime C.struct_rtc_time
+
+type RTCWkAlrm C.struct_rtc_wkalrm
+
+type RTCPLLInfo C.struct_rtc_pll_info
+
+// BLKPG ioctl:
+
+type BlkpgIoctlArg C.struct_blkpg_ioctl_arg
+
+type BlkpgPartition C.struct_my_blkpg_partition
+
+const (
+	BLKPG                  = C.BLKPG
+	BLKPG_ADD_PARTITION    = C.BLKPG_ADD_PARTITION
+	BLKPG_DEL_PARTITION    = C.BLKPG_DEL_PARTITION
+	BLKPG_RESIZE_PARTITION = C.BLKPG_RESIZE_PARTITION
+)
+
+// netlink namespace
+// generated from
+// perl -nlE '/^\s*(NETNSA\w+)/ && say "$1 = C.$1"' /usr/include/linux/net_namespace.h
+const (
+	NETNSA_NONE = C.NETNSA_NONE
+	NETNSA_NSID = C.NETNSA_NSID
+	NETNSA_PID  = C.NETNSA_PID
+	NETNSA_FD   = C.NETNSA_FD
+)
diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh
new file mode 100755
index 00000000..1715122b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mkall.sh
@@ -0,0 +1,188 @@
+#!/usr/bin/env bash
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# This script runs or (given -n) prints suggested commands to generate files for
+# the Architecture/OS specified by the GOARCH and GOOS environment variables.
+# See README.md for more information about how the build system works.
+
+GOOSARCH="${GOOS}_${GOARCH}"
+
+# defaults
+mksyscall="./mksyscall.pl"
+mkerrors="./mkerrors.sh"
+zerrors="zerrors_$GOOSARCH.go"
+mksysctl=""
+zsysctl="zsysctl_$GOOSARCH.go"
+mksysnum=
+mktypes=
+run="sh"
+cmd=""
+
+case "$1" in
+-syscalls)
+	for i in zsyscall*go
+	do
+		# Run the command line that appears in the first line
+		# of the generated file to regenerate it.
+		sed 1q $i | sed 's;^// ;;' | sh > _$i && gofmt < _$i > $i
+		rm _$i
+	done
+	exit 0
+	;;
+-n)
+	run="cat"
+	cmd="echo"
+	shift
+esac
+
+case "$#" in
+0)
+	;;
+*)
+	echo 'usage: mkall.sh [-n]' 1>&2
+	exit 2
+esac
+
+if [[ "$GOOS" = "linux" ]] && [[ "$GOARCH" != "sparc64" ]]; then
+	# Use then new build system
+	# Files generated through docker (use $cmd so you can Ctl-C the build or run)
+	$cmd docker build --tag generate:$GOOS $GOOS
+	$cmd docker run --interactive --tty --volume $(dirname "$(readlink -f "$0")"):/build generate:$GOOS
+	exit
+fi
+
+GOOSARCH_in=syscall_$GOOSARCH.go
+case "$GOOSARCH" in
+_* | *_ | _)
+	echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2
+	exit 1
+	;;
+darwin_386)
+	mkerrors="$mkerrors -m32"
+	mksyscall="./mksyscall.pl -l32"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+darwin_amd64)
+	mkerrors="$mkerrors -m64"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+darwin_arm)
+	mkerrors="$mkerrors"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+darwin_arm64)
+	mkerrors="$mkerrors -m64"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+dragonfly_amd64)
+	mkerrors="$mkerrors -m64"
+	mksyscall="./mksyscall.pl -dragonfly"
+	mksysnum="curl -s 'http://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/sys/kern/syscalls.master' | ./mksysnum_dragonfly.pl"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+freebsd_386)
+	mkerrors="$mkerrors -m32"
+	mksyscall="./mksyscall.pl -l32"
+	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+freebsd_amd64)
+	mkerrors="$mkerrors -m64"
+	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+freebsd_arm)
+	mkerrors="$mkerrors"
+	mksyscall="./mksyscall.pl -l32 -arm"
+	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
+	# Let the type of C char be signed for making the bare syscall
+	# API consistent across platforms.
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
+	;;
+linux_sparc64)
+	GOOSARCH_in=syscall_linux_sparc64.go
+	unistd_h=/usr/include/sparc64-linux-gnu/asm/unistd.h
+	mkerrors="$mkerrors -m64"
+	mksysnum="./mksysnum_linux.pl $unistd_h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+netbsd_386)
+	mkerrors="$mkerrors -m32"
+	mksyscall="./mksyscall.pl -l32 -netbsd"
+	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+netbsd_amd64)
+	mkerrors="$mkerrors -m64"
+	mksyscall="./mksyscall.pl -netbsd"
+	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+netbsd_arm)
+	mkerrors="$mkerrors"
+	mksyscall="./mksyscall.pl -l32 -netbsd -arm"
+	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
+	# Let the type of C char be signed for making the bare syscall
+	# API consistent across platforms.
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
+	;;
+openbsd_386)
+	mkerrors="$mkerrors -m32"
+	mksyscall="./mksyscall.pl -l32 -openbsd"
+	mksysctl="./mksysctl_openbsd.pl"
+	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+openbsd_amd64)
+	mkerrors="$mkerrors -m64"
+	mksyscall="./mksyscall.pl -openbsd"
+	mksysctl="./mksysctl_openbsd.pl"
+	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+openbsd_arm)
+	mkerrors="$mkerrors"
+	mksyscall="./mksyscall.pl -l32 -openbsd -arm"
+	mksysctl="./mksysctl_openbsd.pl"
+	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
+	# Let the type of C char be signed for making the bare syscall
+	# API consistent across platforms.
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
+	;;
+solaris_amd64)
+	mksyscall="./mksyscall_solaris.pl"
+	mkerrors="$mkerrors -m64"
+	mksysnum=
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+*)
+	echo 'unrecognized $GOOS_$GOARCH: ' "$GOOSARCH" 1>&2
+	exit 1
+	;;
+esac
+
+(
+	if [ -n "$mkerrors" ]; then echo "$mkerrors |gofmt >$zerrors"; fi
+	case "$GOOS" in
+	*)
+		syscall_goos="syscall_$GOOS.go"
+		case "$GOOS" in
+		darwin | dragonfly | freebsd | netbsd | openbsd)
+			syscall_goos="syscall_bsd.go $syscall_goos"
+			;;
+		esac
+		if [ -n "$mksyscall" ]; then echo "$mksyscall -tags $GOOS,$GOARCH $syscall_goos $GOOSARCH_in |gofmt >zsyscall_$GOOSARCH.go"; fi
+		;;
+	esac
+	if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
+	if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
+	if [ -n "$mktypes" ]; then
+		echo "$mktypes types_$GOOS.go | go run mkpost.go > ztypes_$GOOSARCH.go";
+	fi
+) | $run
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh
new file mode 100755
index 00000000..30939da0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mkerrors.sh
@@ -0,0 +1,608 @@
+#!/usr/bin/env bash
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# Generate Go code listing errors and other #defined constant
+# values (ENAMETOOLONG etc.), by asking the preprocessor
+# about the definitions.
+
+unset LANG
+export LC_ALL=C
+export LC_CTYPE=C
+
+if test -z "$GOARCH" -o -z "$GOOS"; then
+	echo 1>&2 "GOARCH or GOOS not defined in environment"
+	exit 1
+fi
+
+# Check that we are using the new build system if we should
+if [[ "$GOOS" = "linux" ]] && [[ "$GOARCH" != "sparc64" ]]; then
+	if [[ "$GOLANG_SYS_BUILD" != "docker" ]]; then
+		echo 1>&2 "In the new build system, mkerrors should not be called directly."
+		echo 1>&2 "See README.md"
+		exit 1
+	fi
+fi
+
+CC=${CC:-cc}
+
+if [[ "$GOOS" = "solaris" ]]; then
+	# Assumes GNU versions of utilities in PATH.
+	export PATH=/usr/gnu/bin:$PATH
+fi
+
+uname=$(uname)
+
+includes_Darwin='
+#define _DARWIN_C_SOURCE
+#define KERNEL
+#define _DARWIN_USE_64_BIT_INODE
+#include <stdint.h>
+#include <sys/attr.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/ptrace.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <sys/xattr.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <termios.h>
+'
+
+includes_DragonFly='
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <termios.h>
+#include <netinet/ip.h>
+#include <net/ip_mroute/ip_mroute.h>
+'
+
+includes_FreeBSD='
+#include <sys/capability.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <termios.h>
+#include <netinet/ip.h>
+#include <netinet/ip_mroute.h>
+#include <sys/extattr.h>
+
+#if __FreeBSD__ >= 10
+#define IFT_CARP	0xf8	// IFT_CARP is deprecated in FreeBSD 10
+#undef SIOCAIFADDR
+#define SIOCAIFADDR	_IOW(105, 26, struct oifaliasreq)	// ifaliasreq contains if_data
+#undef SIOCSIFPHYADDR
+#define SIOCSIFPHYADDR	_IOW(105, 70, struct oifaliasreq)	// ifaliasreq contains if_data
+#endif
+'
+
+includes_Linux='
+#define _LARGEFILE_SOURCE
+#define _LARGEFILE64_SOURCE
+#ifndef __LP64__
+#define _FILE_OFFSET_BITS 64
+#endif
+#define _GNU_SOURCE
+
+// <sys/ioctl.h> is broken on powerpc64, as it fails to include definitions of
+// these structures. We just include them copied from <bits/termios.h>.
+#if defined(__powerpc__)
+struct sgttyb {
+        char    sg_ispeed;
+        char    sg_ospeed;
+        char    sg_erase;
+        char    sg_kill;
+        short   sg_flags;
+};
+
+struct tchars {
+        char    t_intrc;
+        char    t_quitc;
+        char    t_startc;
+        char    t_stopc;
+        char    t_eofc;
+        char    t_brkc;
+};
+
+struct ltchars {
+        char    t_suspc;
+        char    t_dsuspc;
+        char    t_rprntc;
+        char    t_flushc;
+        char    t_werasc;
+        char    t_lnextc;
+};
+#endif
+
+#include <bits/sockaddr.h>
+#include <sys/epoll.h>
+#include <sys/eventfd.h>
+#include <sys/inotify.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/prctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/xattr.h>
+#include <linux/if.h>
+#include <linux/if_alg.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/if_tun.h>
+#include <linux/if_packet.h>
+#include <linux/if_addr.h>
+#include <linux/falloc.h>
+#include <linux/filter.h>
+#include <linux/fs.h>
+#include <linux/keyctl.h>
+#include <linux/magic.h>
+#include <linux/netfilter/nfnetlink.h>
+#include <linux/netlink.h>
+#include <linux/net_namespace.h>
+#include <linux/perf_event.h>
+#include <linux/random.h>
+#include <linux/reboot.h>
+#include <linux/rtnetlink.h>
+#include <linux/ptrace.h>
+#include <linux/sched.h>
+#include <linux/seccomp.h>
+#include <linux/sockios.h>
+#include <linux/wait.h>
+#include <linux/icmpv6.h>
+#include <linux/serial.h>
+#include <linux/can.h>
+#include <linux/vm_sockets.h>
+#include <linux/taskstats.h>
+#include <linux/genetlink.h>
+#include <linux/watchdog.h>
+#include <linux/hdreg.h>
+#include <linux/rtc.h>
+#include <net/route.h>
+#include <asm/termbits.h>
+
+#ifndef MSG_FASTOPEN
+#define MSG_FASTOPEN    0x20000000
+#endif
+
+#ifndef PTRACE_GETREGS
+#define PTRACE_GETREGS	0xc
+#endif
+
+#ifndef PTRACE_SETREGS
+#define PTRACE_SETREGS	0xd
+#endif
+
+#ifndef SOL_NETLINK
+#define SOL_NETLINK	270
+#endif
+
+#ifdef SOL_BLUETOOTH
+// SPARC includes this in /usr/include/sparc64-linux-gnu/bits/socket.h
+// but it is already in bluetooth_linux.go
+#undef SOL_BLUETOOTH
+#endif
+
+// Certain constants are missing from the fs/crypto UAPI
+#define FS_KEY_DESC_PREFIX              "fscrypt:"
+#define FS_KEY_DESC_PREFIX_SIZE         8
+#define FS_MAX_KEY_SIZE                 64
+'
+
+includes_NetBSD='
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/event.h>
+#include <sys/extattr.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/termios.h>
+#include <sys/ttycom.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_mroute.h>
+#include <netinet/if_ether.h>
+
+// Needed since <sys/param.h> refers to it...
+#define schedppq 1
+'
+
+includes_OpenBSD='
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/termios.h>
+#include <sys/ttycom.h>
+#include <sys/unistd.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/if_var.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_mroute.h>
+#include <netinet/if_ether.h>
+#include <net/if_bridge.h>
+
+// We keep some constants not supported in OpenBSD 5.5 and beyond for
+// the promise of compatibility.
+#define EMUL_ENABLED		0x1
+#define EMUL_NATIVE		0x2
+#define IPV6_FAITH		0x1d
+#define IPV6_OPTIONS		0x1
+#define IPV6_RTHDR_STRICT	0x1
+#define IPV6_SOCKOPT_RESERVED1	0x3
+#define SIOCGIFGENERIC		0xc020693a
+#define SIOCSIFGENERIC		0x80206939
+#define WALTSIG			0x4
+'
+
+includes_SunOS='
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <sys/mkdev.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_types.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <termios.h>
+#include <netinet/ip.h>
+#include <netinet/ip_mroute.h>
+'
+
+
+includes='
+#include <sys/types.h>
+#include <sys/file.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/tcp.h>
+#include <errno.h>
+#include <sys/signal.h>
+#include <signal.h>
+#include <sys/resource.h>
+#include <time.h>
+'
+ccflags="$@"
+
+# Write go tool cgo -godefs input.
+(
+	echo package unix
+	echo
+	echo '/*'
+	indirect="includes_$(uname)"
+	echo "${!indirect} $includes"
+	echo '*/'
+	echo 'import "C"'
+	echo 'import "syscall"'
+	echo
+	echo 'const ('
+
+	# The gcc command line prints all the #defines
+	# it encounters while processing the input
+	echo "${!indirect} $includes" | $CC -x c - -E -dM $ccflags |
+	awk '
+		$1 != "#define" || $2 ~ /\(/ || $3 == "" {next}
+
+		$2 ~ /^E([ABCD]X|[BIS]P|[SD]I|S|FL)$/ {next}  # 386 registers
+		$2 ~ /^(SIGEV_|SIGSTKSZ|SIGRT(MIN|MAX))/ {next}
+		$2 ~ /^(SCM_SRCRT)$/ {next}
+		$2 ~ /^(MAP_FAILED)$/ {next}
+		$2 ~ /^ELF_.*$/ {next}# <asm/elf.h> contains ELF_ARCH, etc.
+
+		$2 ~ /^EXTATTR_NAMESPACE_NAMES/ ||
+		$2 ~ /^EXTATTR_NAMESPACE_[A-Z]+_STRING/ {next}
+
+		$2 !~ /^ETH_/ &&
+		$2 !~ /^EPROC_/ &&
+		$2 !~ /^EQUIV_/ &&
+		$2 !~ /^EXPR_/ &&
+		$2 ~ /^E[A-Z0-9_]+$/ ||
+		$2 ~ /^B[0-9_]+$/ ||
+		$2 ~ /^(OLD|NEW)DEV$/ ||
+		$2 == "BOTHER" ||
+		$2 ~ /^CI?BAUD(EX)?$/ ||
+		$2 == "IBSHIFT" ||
+		$2 ~ /^V[A-Z0-9]+$/ ||
+		$2 ~ /^CS[A-Z0-9]/ ||
+		$2 ~ /^I(SIG|CANON|CRNL|UCLC|EXTEN|MAXBEL|STRIP|UTF8)$/ ||
+		$2 ~ /^IGN/ ||
+		$2 ~ /^IX(ON|ANY|OFF)$/ ||
+		$2 ~ /^IN(LCR|PCK)$/ ||
+		$2 !~ "X86_CR3_PCID_NOFLUSH" &&
+		$2 ~ /(^FLU?SH)|(FLU?SH$)/ ||
+		$2 ~ /^C(LOCAL|READ|MSPAR|RTSCTS)$/ ||
+		$2 == "BRKINT" ||
+		$2 == "HUPCL" ||
+		$2 == "PENDIN" ||
+		$2 == "TOSTOP" ||
+		$2 == "XCASE" ||
+		$2 == "ALTWERASE" ||
+		$2 == "NOKERNINFO" ||
+		$2 ~ /^PAR/ ||
+		$2 ~ /^SIG[^_]/ ||
+		$2 ~ /^O[CNPFPL][A-Z]+[^_][A-Z]+$/ ||
+		$2 ~ /^(NL|CR|TAB|BS|VT|FF)DLY$/ ||
+		$2 ~ /^(NL|CR|TAB|BS|VT|FF)[0-9]$/ ||
+		$2 ~ /^O?XTABS$/ ||
+		$2 ~ /^TC[IO](ON|OFF)$/ ||
+		$2 ~ /^IN_/ ||
+		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
+		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|EVFILT|NOTE|EV|SHUT|PROT|MAP|T?PACKET|MSG|SCM|MCL|DT|MADV|PR)_/ ||
+		$2 ~ /^TP_STATUS_/ ||
+		$2 ~ /^FALLOC_/ ||
+		$2 == "ICMPV6_FILTER" ||
+		$2 == "SOMAXCONN" ||
+		$2 == "NAME_MAX" ||
+		$2 == "IFNAMSIZ" ||
+		$2 ~ /^CTL_(HW|KERN|MAXNAME|NET|QUERY)$/ ||
+		$2 ~ /^KERN_(HOSTNAME|OS(RELEASE|TYPE)|VERSION)$/ ||
+		$2 ~ /^HW_MACHINE$/ ||
+		$2 ~ /^SYSCTL_VERS/ ||
+		$2 ~ /^(MS|MNT|UMOUNT)_/ ||
+		$2 ~ /^TUN(SET|GET|ATTACH|DETACH)/ ||
+		$2 ~ /^(O|F|E?FD|NAME|S|PTRACE|PT)_/ ||
+		$2 ~ /^LINUX_REBOOT_CMD_/ ||
+		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
+		$2 !~ "NLA_TYPE_MASK" &&
+		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTC|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P|NETNSA)_/ ||
+		$2 ~ /^SIOC/ ||
+		$2 ~ /^TIOC/ ||
+		$2 ~ /^TCGET/ ||
+		$2 ~ /^TCSET/ ||
+		$2 ~ /^TC(FLSH|SBRKP?|XONC)$/ ||
+		$2 !~ "RTF_BITS" &&
+		$2 ~ /^(IFF|IFT|NET_RT|RTM|RTF|RTV|RTA|RTAX)_/ ||
+		$2 ~ /^BIOC/ ||
+		$2 ~ /^RUSAGE_(SELF|CHILDREN|THREAD)/ ||
+		$2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|LOCKS|MEMLOCK|MSGQUEUE|NICE|NOFILE|NPROC|RSS|RTPRIO|RTTIME|SIGPENDING|STACK)|RLIM_INFINITY/ ||
+		$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
+		$2 ~ /^CLONE_[A-Z_]+/ ||
+		$2 !~ /^(BPF_TIMEVAL)$/ &&
+		$2 ~ /^(BPF|DLT)_/ ||
+		$2 ~ /^CLOCK_/ ||
+		$2 ~ /^CAN_/ ||
+		$2 ~ /^CAP_/ ||
+		$2 ~ /^ALG_/ ||
+		$2 ~ /^FS_(POLICY_FLAGS|KEY_DESC|ENCRYPTION_MODE|[A-Z0-9_]+_KEY_SIZE|IOC_(GET|SET)_ENCRYPTION)/ ||
+		$2 ~ /^GRND_/ ||
+		$2 ~ /^KEY_(SPEC|REQKEY_DEFL)_/ ||
+		$2 ~ /^KEYCTL_/ ||
+		$2 ~ /^PERF_EVENT_IOC_/ ||
+		$2 ~ /^SECCOMP_MODE_/ ||
+		$2 ~ /^SPLICE_/ ||
+		$2 !~ /^AUDIT_RECORD_MAGIC/ &&
+		$2 ~ /^[A-Z0-9_]+_MAGIC2?$/ ||
+		$2 ~ /^(VM|VMADDR)_/ ||
+		$2 ~ /^IOCTL_VM_SOCKETS_/ ||
+		$2 ~ /^(TASKSTATS|TS)_/ ||
+		$2 ~ /^CGROUPSTATS_/ ||
+		$2 ~ /^GENL_/ ||
+		$2 ~ /^STATX_/ ||
+		$2 ~ /^RENAME/ ||
+		$2 ~ /^UTIME_/ ||
+		$2 ~ /^XATTR_(CREATE|REPLACE|NO(DEFAULT|FOLLOW|SECURITY)|SHOWCOMPRESSION)/ ||
+		$2 ~ /^ATTR_(BIT_MAP_COUNT|(CMN|VOL|FILE)_)/ ||
+		$2 ~ /^FSOPT_/ ||
+		$2 ~ /^WDIOC_/ ||
+		$2 ~ /^NFN/ ||
+		$2 ~ /^(HDIO|WIN|SMART)_/ ||
+		$2 !~ "WMESGLEN" &&
+		$2 ~ /^W[A-Z0-9]+$/ ||
+		$2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE)/ {printf("\t%s = C.%s\n", $2, $2)}
+		$2 ~ /^__WCOREFLAG$/ {next}
+		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
+
+		{next}
+	' | sort
+
+	echo ')'
+) >_const.go
+
+# Pull out the error names for later.
+errors=$(
+	echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
+	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print $2 }' |
+	sort
+)
+
+# Pull out the signal names for later.
+signals=$(
+	echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
+	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' |
+	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
+	sort
+)
+
+# Again, writing regexps to a file.
+echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
+	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print "^\t" $2 "[ \t]*=" }' |
+	sort >_error.grep
+echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
+	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' |
+	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
+	sort >_signal.grep
+
+echo '// mkerrors.sh' "$@"
+echo '// Code generated by the command above; see README.md. DO NOT EDIT.'
+echo
+echo "// +build ${GOARCH},${GOOS}"
+echo
+go tool cgo -godefs -- "$@" _const.go >_error.out
+cat _error.out | grep -vf _error.grep | grep -vf _signal.grep
+echo
+echo '// Errors'
+echo 'const ('
+cat _error.out | grep -f _error.grep | sed 's/=\(.*\)/= syscall.Errno(\1)/'
+echo ')'
+
+echo
+echo '// Signals'
+echo 'const ('
+cat _error.out | grep -f _signal.grep | sed 's/=\(.*\)/= syscall.Signal(\1)/'
+echo ')'
+
+# Run C program to print error and syscall strings.
+(
+	echo -E "
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <string.h>
+#include <signal.h>
+
+#define nelem(x) (sizeof(x)/sizeof((x)[0]))
+
+enum { A = 'A', Z = 'Z', a = 'a', z = 'z' }; // avoid need for single quotes below
+
+struct tuple {
+	int num;
+	const char *name;
+};
+
+struct tuple errors[] = {
+"
+	for i in $errors
+	do
+		echo -E '	{'$i', "'$i'" },'
+	done
+
+	echo -E "
+};
+
+struct tuple signals[] = {
+"
+	for i in $signals
+	do
+		echo -E '	{'$i', "'$i'" },'
+	done
+
+	# Use -E because on some systems bash builtin interprets \n itself.
+	echo -E '
+};
+
+static int
+tuplecmp(const void *a, const void *b)
+{
+	return ((struct tuple *)a)->num - ((struct tuple *)b)->num;
+}
+
+int
+main(void)
+{
+	int i, e;
+	char buf[1024], *p;
+
+	printf("\n\n// Error table\n");
+	printf("var errorList = [...]struct {\n");
+	printf("\tnum  syscall.Errno\n");
+	printf("\tname string\n");
+	printf("\tdesc string\n");
+	printf("} {\n");
+	qsort(errors, nelem(errors), sizeof errors[0], tuplecmp);
+	for(i=0; i<nelem(errors); i++) {
+		e = errors[i].num;
+		if(i > 0 && errors[i-1].num == e)
+			continue;
+		strcpy(buf, strerror(e));
+		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
+			buf[0] += a - A;
+		printf("\t{ %d, \"%s\", \"%s\" },\n", e, errors[i].name, buf);
+	}
+	printf("}\n\n");
+
+	printf("\n\n// Signal table\n");
+	printf("var signalList = [...]struct {\n");
+	printf("\tnum  syscall.Signal\n");
+	printf("\tname string\n");
+	printf("\tdesc string\n");
+	printf("} {\n");
+	qsort(signals, nelem(signals), sizeof signals[0], tuplecmp);
+	for(i=0; i<nelem(signals); i++) {
+		e = signals[i].num;
+		if(i > 0 && signals[i-1].num == e)
+			continue;
+		strcpy(buf, strsignal(e));
+		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
+			buf[0] += a - A;
+		// cut trailing : number.
+		p = strrchr(buf, ":"[0]);
+		if(p)
+			*p = '\0';
+		printf("\t{ %d, \"%s\", \"%s\" },\n", e, signals[i].name, buf);
+	}
+	printf("}\n\n");
+
+	return 0;
+}
+
+'
+) >_errors.c
+
+$CC $ccflags -o _errors _errors.c && $GORUN ./_errors && rm -f _errors.c _errors _const.go _error.grep _signal.grep _error.out
diff --git a/vendor/golang.org/x/sys/unix/mkpost.go b/vendor/golang.org/x/sys/unix/mkpost.go
new file mode 100644
index 00000000..7e5c22c4
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mkpost.go
@@ -0,0 +1,98 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// mkpost processes the output of cgo -godefs to
+// modify the generated types. It is used to clean up
+// the sys API in an architecture specific manner.
+//
+// mkpost is run after cgo -godefs; see README.md.
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"log"
+	"os"
+	"regexp"
+)
+
+func main() {
+	// Get the OS and architecture (using GOARCH_TARGET if it exists)
+	goos := os.Getenv("GOOS")
+	goarch := os.Getenv("GOARCH_TARGET")
+	if goarch == "" {
+		goarch = os.Getenv("GOARCH")
+	}
+	// Check that we are using the new build system if we should be.
+	if goos == "linux" && goarch != "sparc64" {
+		if os.Getenv("GOLANG_SYS_BUILD") != "docker" {
+			os.Stderr.WriteString("In the new build system, mkpost should not be called directly.\n")
+			os.Stderr.WriteString("See README.md\n")
+			os.Exit(1)
+		}
+	}
+
+	b, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Intentionally export __val fields in Fsid and Sigset_t
+	valRegex := regexp.MustCompile(`type (Fsid|Sigset_t) struct {(\s+)X__val(\s+\S+\s+)}`)
+	b = valRegex.ReplaceAll(b, []byte("type $1 struct {${2}Val$3}"))
+
+	// If we have empty Ptrace structs, we should delete them. Only s390x emits
+	// nonempty Ptrace structs.
+	ptraceRexexp := regexp.MustCompile(`type Ptrace((Psw|Fpregs|Per) struct {\s*})`)
+	b = ptraceRexexp.ReplaceAll(b, nil)
+
+	// Replace the control_regs union with a blank identifier for now.
+	controlRegsRegex := regexp.MustCompile(`(Control_regs)\s+\[0\]uint64`)
+	b = controlRegsRegex.ReplaceAll(b, []byte("_ [0]uint64"))
+
+	// Remove fields that are added by glibc
+	// Note that this is unstable as the identifers are private.
+	removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`)
+	b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
+
+	// Convert [65]int8 to [65]byte in Utsname members to simplify
+	// conversion to string; see golang.org/issue/20753
+	convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`)
+	b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte"))
+
+	// Remove spare fields (e.g. in Statx_t)
+	spareFieldsRegex := regexp.MustCompile(`X__spare\S*`)
+	b = spareFieldsRegex.ReplaceAll(b, []byte("_"))
+
+	// Remove cgo padding fields
+	removePaddingFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`)
+	b = removePaddingFieldsRegex.ReplaceAll(b, []byte("_"))
+
+	// Remove padding, hidden, or unused fields
+	removeFieldsRegex = regexp.MustCompile(`\b(X_\S+|Padding)`)
+	b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
+
+	// Remove the first line of warning from cgo
+	b = b[bytes.IndexByte(b, '\n')+1:]
+	// Modify the command in the header to include:
+	//  mkpost, our own warning, and a build tag.
+	replacement := fmt.Sprintf(`$1 | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build %s,%s`, goarch, goos)
+	cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`)
+	b = cgoCommandRegex.ReplaceAll(b, []byte(replacement))
+
+	// gofmt
+	b, err = format.Source(b)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	os.Stdout.Write(b)
+}
diff --git a/vendor/golang.org/x/sys/unix/mksyscall.pl b/vendor/golang.org/x/sys/unix/mksyscall.pl
new file mode 100755
index 00000000..1f6b926f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mksyscall.pl
@@ -0,0 +1,341 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# This program reads a file containing function prototypes
+# (like syscall_darwin.go) and generates system call bodies.
+# The prototypes are marked by lines beginning with "//sys"
+# and read like func declarations if //sys is replaced by func, but:
+#	* The parameter lists must give a name for each argument.
+#	  This includes return parameters.
+#	* The parameter lists must give a type for each argument:
+#	  the (x, y, z int) shorthand is not allowed.
+#	* If the return parameter is an error number, it must be named errno.
+
+# A line beginning with //sysnb is like //sys, except that the
+# goroutine will not be suspended during the execution of the system
+# call.  This must only be used for system calls which can never
+# block, as otherwise the system call could cause all goroutines to
+# hang.
+
+use strict;
+
+my $cmdline = "mksyscall.pl " . join(' ', @ARGV);
+my $errors = 0;
+my $_32bit = "";
+my $plan9 = 0;
+my $openbsd = 0;
+my $netbsd = 0;
+my $dragonfly = 0;
+my $arm = 0; # 64-bit value should use (even, odd)-pair
+my $tags = "";  # build tags
+
+if($ARGV[0] eq "-b32") {
+	$_32bit = "big-endian";
+	shift;
+} elsif($ARGV[0] eq "-l32") {
+	$_32bit = "little-endian";
+	shift;
+}
+if($ARGV[0] eq "-plan9") {
+	$plan9 = 1;
+	shift;
+}
+if($ARGV[0] eq "-openbsd") {
+	$openbsd = 1;
+	shift;
+}
+if($ARGV[0] eq "-netbsd") {
+	$netbsd = 1;
+	shift;
+}
+if($ARGV[0] eq "-dragonfly") {
+	$dragonfly = 1;
+	shift;
+}
+if($ARGV[0] eq "-arm") {
+	$arm = 1;
+	shift;
+}
+if($ARGV[0] eq "-tags") {
+	shift;
+	$tags = $ARGV[0];
+	shift;
+}
+
+if($ARGV[0] =~ /^-/) {
+	print STDERR "usage: mksyscall.pl [-b32 | -l32] [-tags x,y] [file ...]\n";
+	exit 1;
+}
+
+# Check that we are using the new build system if we should
+if($ENV{'GOOS'} eq "linux" && $ENV{'GOARCH'} ne "sparc64") {
+	if($ENV{'GOLANG_SYS_BUILD'} ne "docker") {
+		print STDERR "In the new build system, mksyscall should not be called directly.\n";
+		print STDERR "See README.md\n";
+		exit 1;
+	}
+}
+
+
+sub parseparamlist($) {
+	my ($list) = @_;
+	$list =~ s/^\s*//;
+	$list =~ s/\s*$//;
+	if($list eq "") {
+		return ();
+	}
+	return split(/\s*,\s*/, $list);
+}
+
+sub parseparam($) {
+	my ($p) = @_;
+	if($p !~ /^(\S*) (\S*)$/) {
+		print STDERR "$ARGV:$.: malformed parameter: $p\n";
+		$errors = 1;
+		return ("xx", "int");
+	}
+	return ($1, $2);
+}
+
+my $text = "";
+while(<>) {
+	chomp;
+	s/\s+/ /g;
+	s/^\s+//;
+	s/\s+$//;
+	my $nonblock = /^\/\/sysnb /;
+	next if !/^\/\/sys / && !$nonblock;
+
+	# Line must be of the form
+	#	func Open(path string, mode int, perm int) (fd int, errno error)
+	# Split into name, in params, out params.
+	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*((?i)SYS_[A-Z0-9_]+))?$/) {
+		print STDERR "$ARGV:$.: malformed //sys declaration\n";
+		$errors = 1;
+		next;
+	}
+	my ($func, $in, $out, $sysname) = ($2, $3, $4, $5);
+
+	# Split argument lists on comma.
+	my @in = parseparamlist($in);
+	my @out = parseparamlist($out);
+
+	# Try in vain to keep people from editing this file.
+	# The theory is that they jump into the middle of the file
+	# without reading the header.
+	$text .= "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n";
+
+	# Go function header.
+	my $out_decl = @out ? sprintf(" (%s)", join(', ', @out)) : "";
+	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out_decl;
+
+	# Check if err return available
+	my $errvar = "";
+	foreach my $p (@out) {
+		my ($name, $type) = parseparam($p);
+		if($type eq "error") {
+			$errvar = $name;
+			last;
+		}
+	}
+
+	# Prepare arguments to Syscall.
+	my @args = ();
+	my $n = 0;
+	foreach my $p (@in) {
+		my ($name, $type) = parseparam($p);
+		if($type =~ /^\*/) {
+			push @args, "uintptr(unsafe.Pointer($name))";
+		} elsif($type eq "string" && $errvar ne "") {
+			$text .= "\tvar _p$n *byte\n";
+			$text .= "\t_p$n, $errvar = BytePtrFromString($name)\n";
+			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
+			push @args, "uintptr(unsafe.Pointer(_p$n))";
+			$n++;
+		} elsif($type eq "string") {
+			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
+			$text .= "\tvar _p$n *byte\n";
+			$text .= "\t_p$n, _ = BytePtrFromString($name)\n";
+			push @args, "uintptr(unsafe.Pointer(_p$n))";
+			$n++;
+		} elsif($type =~ /^\[\](.*)/) {
+			# Convert slice into pointer, length.
+			# Have to be careful not to take address of &a[0] if len == 0:
+			# pass dummy pointer in that case.
+			# Used to pass nil, but some OSes or simulators reject write(fd, nil, 0).
+			$text .= "\tvar _p$n unsafe.Pointer\n";
+			$text .= "\tif len($name) > 0 {\n\t\t_p$n = unsafe.Pointer(\&${name}[0])\n\t}";
+			$text .= " else {\n\t\t_p$n = unsafe.Pointer(&_zero)\n\t}";
+			$text .= "\n";
+			push @args, "uintptr(_p$n)", "uintptr(len($name))";
+			$n++;
+		} elsif($type eq "int64" && ($openbsd || $netbsd)) {
+			push @args, "0";
+			if($_32bit eq "big-endian") {
+				push @args, "uintptr($name>>32)", "uintptr($name)";
+			} elsif($_32bit eq "little-endian") {
+				push @args, "uintptr($name)", "uintptr($name>>32)";
+			} else {
+				push @args, "uintptr($name)";
+			}
+		} elsif($type eq "int64" && $dragonfly) {
+			if ($func !~ /^extp(read|write)/i) {
+				push @args, "0";
+			}
+			if($_32bit eq "big-endian") {
+				push @args, "uintptr($name>>32)", "uintptr($name)";
+			} elsif($_32bit eq "little-endian") {
+				push @args, "uintptr($name)", "uintptr($name>>32)";
+			} else {
+				push @args, "uintptr($name)";
+			}
+		} elsif($type eq "int64" && $_32bit ne "") {
+			if(@args % 2 && $arm) {
+				# arm abi specifies 64-bit argument uses
+				# (even, odd) pair
+				push @args, "0"
+			}
+			if($_32bit eq "big-endian") {
+				push @args, "uintptr($name>>32)", "uintptr($name)";
+			} else {
+				push @args, "uintptr($name)", "uintptr($name>>32)";
+			}
+		} else {
+			push @args, "uintptr($name)";
+		}
+	}
+
+	# Determine which form to use; pad args with zeros.
+	my $asm = "Syscall";
+	if ($nonblock) {
+		if ($errvar eq "" && $ENV{'GOOS'} eq "linux") {
+			$asm = "RawSyscallNoError";
+		} else {
+			$asm = "RawSyscall";
+		}
+	} else {
+		if ($errvar eq "" && $ENV{'GOOS'} eq "linux") {
+			$asm = "SyscallNoError";
+		}
+	}
+	if(@args <= 3) {
+		while(@args < 3) {
+			push @args, "0";
+		}
+	} elsif(@args <= 6) {
+		$asm .= "6";
+		while(@args < 6) {
+			push @args, "0";
+		}
+	} elsif(@args <= 9) {
+		$asm .= "9";
+		while(@args < 9) {
+			push @args, "0";
+		}
+	} else {
+		print STDERR "$ARGV:$.: too many arguments to system call\n";
+	}
+
+	# System call number.
+	if($sysname eq "") {
+		$sysname = "SYS_$func";
+		$sysname =~ s/([a-z])([A-Z])/${1}_$2/g;	# turn FooBar into Foo_Bar
+		$sysname =~ y/a-z/A-Z/;
+	}
+
+	# Actual call.
+	my $args = join(', ', @args);
+	my $call = "$asm($sysname, $args)";
+
+	# Assign return values.
+	my $body = "";
+	my @ret = ("_", "_", "_");
+	my $do_errno = 0;
+	for(my $i=0; $i<@out; $i++) {
+		my $p = $out[$i];
+		my ($name, $type) = parseparam($p);
+		my $reg = "";
+		if($name eq "err" && !$plan9) {
+			$reg = "e1";
+			$ret[2] = $reg;
+			$do_errno = 1;
+		} elsif($name eq "err" && $plan9) {
+			$ret[0] = "r0";
+			$ret[2] = "e1";
+			next;
+		} else {
+			$reg = sprintf("r%d", $i);
+			$ret[$i] = $reg;
+		}
+		if($type eq "bool") {
+			$reg = "$reg != 0";
+		}
+		if($type eq "int64" && $_32bit ne "") {
+			# 64-bit number in r1:r0 or r0:r1.
+			if($i+2 > @out) {
+				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
+			}
+			if($_32bit eq "big-endian") {
+				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
+			} else {
+				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
+			}
+			$ret[$i] = sprintf("r%d", $i);
+			$ret[$i+1] = sprintf("r%d", $i+1);
+		}
+		if($reg ne "e1" || $plan9) {
+			$body .= "\t$name = $type($reg)\n";
+		}
+	}
+	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
+		$text .= "\t$call\n";
+	} else {
+		if ($errvar eq "" && $ENV{'GOOS'} eq "linux") {
+			# raw syscall without error on Linux, see golang.org/issue/22924
+			$text .= "\t$ret[0], $ret[1] := $call\n";
+		} else {
+			$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
+		}
+	}
+	$text .= $body;
+
+	if ($plan9 && $ret[2] eq "e1") {
+		$text .= "\tif int32(r0) == -1 {\n";
+		$text .= "\t\terr = e1\n";
+		$text .= "\t}\n";
+	} elsif ($do_errno) {
+		$text .= "\tif e1 != 0 {\n";
+		$text .= "\t\terr = errnoErr(e1)\n";
+		$text .= "\t}\n";
+	}
+	$text .= "\treturn\n";
+	$text .= "}\n\n";
+}
+
+chomp $text;
+chomp $text;
+
+if($errors) {
+	exit 1;
+}
+
+print <<EOF;
+// $cmdline
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build $tags
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+$text
+EOF
+exit 0;
diff --git a/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl b/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl
new file mode 100755
index 00000000..3e6ed9df
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl
@@ -0,0 +1,289 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# This program reads a file containing function prototypes
+# (like syscall_solaris.go) and generates system call bodies.
+# The prototypes are marked by lines beginning with "//sys"
+# and read like func declarations if //sys is replaced by func, but:
+#	* The parameter lists must give a name for each argument.
+#	  This includes return parameters.
+#	* The parameter lists must give a type for each argument:
+#	  the (x, y, z int) shorthand is not allowed.
+#	* If the return parameter is an error number, it must be named err.
+#	* If go func name needs to be different than its libc name,
+#	* or the function is not in libc, name could be specified
+#	* at the end, after "=" sign, like
+#	  //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt
+
+use strict;
+
+my $cmdline = "mksyscall_solaris.pl " . join(' ', @ARGV);
+my $errors = 0;
+my $_32bit = "";
+my $tags = "";  # build tags
+
+binmode STDOUT;
+
+if($ARGV[0] eq "-b32") {
+	$_32bit = "big-endian";
+	shift;
+} elsif($ARGV[0] eq "-l32") {
+	$_32bit = "little-endian";
+	shift;
+}
+if($ARGV[0] eq "-tags") {
+	shift;
+	$tags = $ARGV[0];
+	shift;
+}
+
+if($ARGV[0] =~ /^-/) {
+	print STDERR "usage: mksyscall_solaris.pl [-b32 | -l32] [-tags x,y] [file ...]\n";
+	exit 1;
+}
+
+sub parseparamlist($) {
+	my ($list) = @_;
+	$list =~ s/^\s*//;
+	$list =~ s/\s*$//;
+	if($list eq "") {
+		return ();
+	}
+	return split(/\s*,\s*/, $list);
+}
+
+sub parseparam($) {
+	my ($p) = @_;
+	if($p !~ /^(\S*) (\S*)$/) {
+		print STDERR "$ARGV:$.: malformed parameter: $p\n";
+		$errors = 1;
+		return ("xx", "int");
+	}
+	return ($1, $2);
+}
+
+my $package = "";
+my $text = "";
+my $dynimports = "";
+my $linknames = "";
+my @vars = ();
+while(<>) {
+	chomp;
+	s/\s+/ /g;
+	s/^\s+//;
+	s/\s+$//;
+	$package = $1 if !$package && /^package (\S+)$/;
+	my $nonblock = /^\/\/sysnb /;
+	next if !/^\/\/sys / && !$nonblock;
+
+	# Line must be of the form
+	#	func Open(path string, mode int, perm int) (fd int, err error)
+	# Split into name, in params, out params.
+	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$/) {
+		print STDERR "$ARGV:$.: malformed //sys declaration\n";
+		$errors = 1;
+		next;
+	}
+	my ($nb, $func, $in, $out, $modname, $sysname) = ($1, $2, $3, $4, $5, $6);
+
+	# Split argument lists on comma.
+	my @in = parseparamlist($in);
+	my @out = parseparamlist($out);
+
+	# So file name.
+	if($modname eq "") {
+		$modname = "libc";
+	}
+
+	# System call name.
+	if($sysname eq "") {
+		$sysname = "$func";
+	}
+
+	# System call pointer variable name.
+	my $sysvarname = "proc$sysname";
+
+	my $strconvfunc = "BytePtrFromString";
+	my $strconvtype = "*byte";
+
+	$sysname =~ y/A-Z/a-z/; # All libc functions are lowercase.
+
+	# Runtime import of function to allow cross-platform builds.
+	$dynimports .= "//go:cgo_import_dynamic libc_${sysname} ${sysname} \"$modname.so\"\n";
+	# Link symbol to proc address variable.
+	$linknames .= "//go:linkname ${sysvarname} libc_${sysname}\n";
+	# Library proc address variable.
+	push @vars, $sysvarname;
+
+	# Go function header.
+	$out = join(', ', @out);
+	if($out ne "") {
+		$out = " ($out)";
+	}
+	if($text ne "") {
+		$text .= "\n"
+	}
+	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out;
+
+	# Check if err return available
+	my $errvar = "";
+	foreach my $p (@out) {
+		my ($name, $type) = parseparam($p);
+		if($type eq "error") {
+			$errvar = $name;
+			last;
+		}
+	}
+
+	# Prepare arguments to Syscall.
+	my @args = ();
+	my $n = 0;
+	foreach my $p (@in) {
+		my ($name, $type) = parseparam($p);
+		if($type =~ /^\*/) {
+			push @args, "uintptr(unsafe.Pointer($name))";
+		} elsif($type eq "string" && $errvar ne "") {
+			$text .= "\tvar _p$n $strconvtype\n";
+			$text .= "\t_p$n, $errvar = $strconvfunc($name)\n";
+			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
+			push @args, "uintptr(unsafe.Pointer(_p$n))";
+			$n++;
+		} elsif($type eq "string") {
+			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
+			$text .= "\tvar _p$n $strconvtype\n";
+			$text .= "\t_p$n, _ = $strconvfunc($name)\n";
+			push @args, "uintptr(unsafe.Pointer(_p$n))";
+			$n++;
+		} elsif($type =~ /^\[\](.*)/) {
+			# Convert slice into pointer, length.
+			# Have to be careful not to take address of &a[0] if len == 0:
+			# pass nil in that case.
+			$text .= "\tvar _p$n *$1\n";
+			$text .= "\tif len($name) > 0 {\n\t\t_p$n = \&$name\[0]\n\t}\n";
+			push @args, "uintptr(unsafe.Pointer(_p$n))", "uintptr(len($name))";
+			$n++;
+		} elsif($type eq "int64" && $_32bit ne "") {
+			if($_32bit eq "big-endian") {
+				push @args, "uintptr($name >> 32)", "uintptr($name)";
+			} else {
+				push @args, "uintptr($name)", "uintptr($name >> 32)";
+			}
+		} elsif($type eq "bool") {
+ 			$text .= "\tvar _p$n uint32\n";
+			$text .= "\tif $name {\n\t\t_p$n = 1\n\t} else {\n\t\t_p$n = 0\n\t}\n";
+			push @args, "uintptr(_p$n)";
+			$n++;
+		} else {
+			push @args, "uintptr($name)";
+		}
+	}
+	my $nargs = @args;
+
+	# Determine which form to use; pad args with zeros.
+	my $asm = "sysvicall6";
+	if ($nonblock) {
+		$asm = "rawSysvicall6";
+	}
+	if(@args <= 6) {
+		while(@args < 6) {
+			push @args, "0";
+		}
+	} else {
+		print STDERR "$ARGV:$.: too many arguments to system call\n";
+	}
+
+	# Actual call.
+	my $args = join(', ', @args);
+	my $call = "$asm(uintptr(unsafe.Pointer(&$sysvarname)), $nargs, $args)";
+
+	# Assign return values.
+	my $body = "";
+	my $failexpr = "";
+	my @ret = ("_", "_", "_");
+	my @pout= ();
+	my $do_errno = 0;
+	for(my $i=0; $i<@out; $i++) {
+		my $p = $out[$i];
+		my ($name, $type) = parseparam($p);
+		my $reg = "";
+		if($name eq "err") {
+			$reg = "e1";
+			$ret[2] = $reg;
+			$do_errno = 1;
+		} else {
+			$reg = sprintf("r%d", $i);
+			$ret[$i] = $reg;
+		}
+		if($type eq "bool") {
+			$reg = "$reg != 0";
+		}
+		if($type eq "int64" && $_32bit ne "") {
+			# 64-bit number in r1:r0 or r0:r1.
+			if($i+2 > @out) {
+				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
+			}
+			if($_32bit eq "big-endian") {
+				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
+			} else {
+				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
+			}
+			$ret[$i] = sprintf("r%d", $i);
+			$ret[$i+1] = sprintf("r%d", $i+1);
+		}
+		if($reg ne "e1") {
+			$body .= "\t$name = $type($reg)\n";
+		}
+	}
+	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
+		$text .= "\t$call\n";
+	} else {
+		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
+	}
+	$text .= $body;
+
+	if ($do_errno) {
+		$text .= "\tif e1 != 0 {\n";
+		$text .= "\t\terr = e1\n";
+		$text .= "\t}\n";
+	}
+	$text .= "\treturn\n";
+	$text .= "}\n";
+}
+
+if($errors) {
+	exit 1;
+}
+
+print <<EOF;
+// $cmdline
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build $tags
+
+package $package
+
+import (
+	"syscall"
+	"unsafe"
+)
+EOF
+
+print "import \"golang.org/x/sys/unix\"\n" if $package ne "unix";
+
+my $vardecls = "\t" . join(",\n\t", @vars);
+$vardecls .= " syscallFunc";
+
+chomp($_=<<EOF);
+
+$dynimports
+$linknames
+var (
+$vardecls
+)
+
+$text
+EOF
+print $_;
+exit 0;
diff --git a/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl b/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl
new file mode 100755
index 00000000..49f186f8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl
@@ -0,0 +1,264 @@
+#!/usr/bin/env perl
+
+# Copyright 2011 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+#
+# Parse the header files for OpenBSD and generate a Go usable sysctl MIB.
+#
+# Build a MIB with each entry being an array containing the level, type and
+# a hash that will contain additional entries if the current entry is a node.
+# We then walk this MIB and create a flattened sysctl name to OID hash.
+#
+
+use strict;
+
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
+my $debug = 0;
+my %ctls = ();
+
+my @headers = qw (
+	sys/sysctl.h
+	sys/socket.h
+	sys/tty.h
+	sys/malloc.h
+	sys/mount.h
+	sys/namei.h
+	sys/sem.h
+	sys/shm.h
+	sys/vmmeter.h
+	uvm/uvm_param.h
+	uvm/uvm_swap_encrypt.h
+	ddb/db_var.h
+	net/if.h
+	net/if_pfsync.h
+	net/pipex.h
+	netinet/in.h
+	netinet/icmp_var.h
+	netinet/igmp_var.h
+	netinet/ip_ah.h
+	netinet/ip_carp.h
+	netinet/ip_divert.h
+	netinet/ip_esp.h
+	netinet/ip_ether.h
+	netinet/ip_gre.h
+	netinet/ip_ipcomp.h
+	netinet/ip_ipip.h
+	netinet/pim_var.h
+	netinet/tcp_var.h
+	netinet/udp_var.h
+	netinet6/in6.h
+	netinet6/ip6_divert.h
+	netinet6/pim6_var.h
+	netinet/icmp6.h
+	netmpls/mpls.h
+);
+
+my @ctls = qw (
+	kern
+	vm
+	fs
+	net
+	#debug				# Special handling required
+	hw
+	#machdep			# Arch specific
+	user
+	ddb
+	#vfs				# Special handling required
+	fs.posix
+	kern.forkstat
+	kern.intrcnt
+	kern.malloc
+	kern.nchstats
+	kern.seminfo
+	kern.shminfo
+	kern.timecounter
+	kern.tty
+	kern.watchdog
+	net.bpf
+	net.ifq
+	net.inet
+	net.inet.ah
+	net.inet.carp
+	net.inet.divert
+	net.inet.esp
+	net.inet.etherip
+	net.inet.gre
+	net.inet.icmp
+	net.inet.igmp
+	net.inet.ip
+	net.inet.ip.ifq
+	net.inet.ipcomp
+	net.inet.ipip
+	net.inet.mobileip
+	net.inet.pfsync
+	net.inet.pim
+	net.inet.tcp
+	net.inet.udp
+	net.inet6
+	net.inet6.divert
+	net.inet6.ip6
+	net.inet6.icmp6
+	net.inet6.pim6
+	net.inet6.tcp6
+	net.inet6.udp6
+	net.mpls
+	net.mpls.ifq
+	net.key
+	net.pflow
+	net.pfsync
+	net.pipex
+	net.rt
+	vm.swapencrypt
+	#vfsgenctl			# Special handling required
+);
+
+# Node name "fixups"
+my %ctl_map = (
+	"ipproto" => "net.inet",
+	"net.inet.ipproto" => "net.inet",
+	"net.inet6.ipv6proto" => "net.inet6",
+	"net.inet6.ipv6" => "net.inet6.ip6",
+	"net.inet.icmpv6" => "net.inet6.icmp6",
+	"net.inet6.divert6" => "net.inet6.divert",
+	"net.inet6.tcp6" => "net.inet.tcp",
+	"net.inet6.udp6" => "net.inet.udp",
+	"mpls" => "net.mpls",
+	"swpenc" => "vm.swapencrypt"
+);
+
+# Node mappings
+my %node_map = (
+	"net.inet.ip.ifq" => "net.ifq",
+	"net.inet.pfsync" => "net.pfsync",
+	"net.mpls.ifq" => "net.ifq"
+);
+
+my $ctlname;
+my %mib = ();
+my %sysctl = ();
+my $node;
+
+sub debug() {
+	print STDERR "$_[0]\n" if $debug;
+}
+
+# Walk the MIB and build a sysctl name to OID mapping.
+sub build_sysctl() {
+	my ($node, $name, $oid) = @_;
+	my %node = %{$node};
+	my @oid = @{$oid};
+
+	foreach my $key (sort keys %node) {
+		my @node = @{$node{$key}};
+		my $nodename = $name.($name ne '' ? '.' : '').$key;
+		my @nodeoid = (@oid, $node[0]);
+		if ($node[1] eq 'CTLTYPE_NODE') {
+			if (exists $node_map{$nodename}) {
+				$node = \%mib;
+				$ctlname = $node_map{$nodename};
+				foreach my $part (split /\./, $ctlname) {
+					$node = \%{@{$$node{$part}}[2]};
+				}
+			} else {
+				$node = $node[2];
+			}
+			&build_sysctl($node, $nodename, \@nodeoid);
+		} elsif ($node[1] ne '') {
+			$sysctl{$nodename} = \@nodeoid;
+		}
+	}
+}
+
+foreach my $ctl (@ctls) {
+	$ctls{$ctl} = $ctl;
+}
+
+# Build MIB
+foreach my $header (@headers) {
+	&debug("Processing $header...");
+	open HEADER, "/usr/include/$header" ||
+	    print STDERR "Failed to open $header\n";
+	while (<HEADER>) {
+		if ($_ =~ /^#define\s+(CTL_NAMES)\s+{/ ||
+		    $_ =~ /^#define\s+(CTL_(.*)_NAMES)\s+{/ ||
+		    $_ =~ /^#define\s+((.*)CTL_NAMES)\s+{/) {
+			if ($1 eq 'CTL_NAMES') {
+				# Top level.
+				$node = \%mib;
+			} else {
+				# Node.
+				my $nodename = lc($2);
+				if ($header =~ /^netinet\//) {
+					$ctlname = "net.inet.$nodename";
+				} elsif ($header =~ /^netinet6\//) {
+					$ctlname = "net.inet6.$nodename";
+				} elsif ($header =~ /^net\//) {
+					$ctlname = "net.$nodename";
+				} else {
+					$ctlname = "$nodename";
+					$ctlname =~ s/^(fs|net|kern)_/$1\./;
+				}
+				if (exists $ctl_map{$ctlname}) {
+					$ctlname = $ctl_map{$ctlname};
+				}
+				if (not exists $ctls{$ctlname}) {
+					&debug("Ignoring $ctlname...");
+					next;
+				}
+
+				# Walk down from the top of the MIB.
+				$node = \%mib;
+				foreach my $part (split /\./, $ctlname) {
+					if (not exists $$node{$part}) {
+						&debug("Missing node $part");
+						$$node{$part} = [ 0, '', {} ];
+					}
+					$node = \%{@{$$node{$part}}[2]};
+				}
+			}
+
+			# Populate current node with entries.
+			my $i = -1;
+			while (defined($_) && $_ !~ /^}/) {
+				$_ = <HEADER>;
+				$i++ if $_ =~ /{.*}/;
+				next if $_ !~ /{\s+"(\w+)",\s+(CTLTYPE_[A-Z]+)\s+}/;
+				$$node{$1} = [ $i, $2, {} ];
+			}
+		}
+	}
+	close HEADER;
+}
+
+&build_sysctl(\%mib, "", []);
+
+print <<EOF;
+// mksysctl_openbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
+package unix;
+
+type mibentry struct {
+	ctlname string
+	ctloid []_C_int
+}
+
+var sysctlMib = []mibentry {
+EOF
+
+foreach my $name (sort keys %sysctl) {
+	my @oid = @{$sysctl{$name}};
+	print "\t{ \"$name\", []_C_int{ ", join(', ', @oid), " } }, \n";
+}
+
+print <<EOF;
+}
+EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl b/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl
new file mode 100755
index 00000000..5453c53b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl
@@ -0,0 +1,39 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# Generate system call table for Darwin from sys/syscall.h
+
+use strict;
+
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
+my $command = "mksysnum_darwin.pl " . join(' ', @ARGV);
+
+print <<EOF;
+// $command
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
+package unix
+
+const (
+EOF
+
+while(<>){
+	if(/^#define\s+SYS_(\w+)\s+([0-9]+)/){
+		my $name = $1;
+		my $num = $2;
+		$name =~ y/a-z/A-Z/;
+		print "	SYS_$name = $num;"
+	}
+}
+
+print <<EOF;
+)
+EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl b/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl
new file mode 100755
index 00000000..6804f412
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# Generate system call table for DragonFly from master list
+# (for example, /usr/src/sys/kern/syscalls.master).
+
+use strict;
+
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
+my $command = "mksysnum_dragonfly.pl " . join(' ', @ARGV);
+
+print <<EOF;
+// $command
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
+package unix
+
+const (
+EOF
+
+while(<>){
+	if(/^([0-9]+)\s+STD\s+({ \S+\s+(\w+).*)$/){
+		my $num = $1;
+		my $proto = $2;
+		my $name = "SYS_$3";
+		$name =~ y/a-z/A-Z/;
+
+		# There are multiple entries for enosys and nosys, so comment them out.
+		if($name =~ /^SYS_E?NOSYS$/){
+			$name = "// $name";
+		}
+		if($name eq 'SYS_SYS_EXIT'){
+			$name = 'SYS_EXIT';
+		}
+
+		print "	$name = $num;  // $proto\n";
+	}
+}
+
+print <<EOF;
+)
+EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl
new file mode 100755
index 00000000..a0a22bf5
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# Generate system call table for FreeBSD from master list
+# (for example, /usr/src/sys/kern/syscalls.master).
+
+use strict;
+
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
+my $command = "mksysnum_freebsd.pl " . join(' ', @ARGV);
+
+print <<EOF;
+// $command
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
+package unix
+
+const (
+EOF
+
+while(<>){
+	if(/^([0-9]+)\s+\S+\s+STD\s+({ \S+\s+(\w+).*)$/){
+		my $num = $1;
+		my $proto = $2;
+		my $name = "SYS_$3";
+		$name =~ y/a-z/A-Z/;
+
+		# There are multiple entries for enosys and nosys, so comment them out.
+		if($name =~ /^SYS_E?NOSYS$/){
+			$name = "// $name";
+		}
+		if($name eq 'SYS_SYS_EXIT'){
+			$name = 'SYS_EXIT';
+		}
+
+		print "	$name = $num;  // $proto\n";
+	}
+}
+
+print <<EOF;
+)
+EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl
new file mode 100755
index 00000000..85988b14
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl
@@ -0,0 +1,58 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# Generate system call table for OpenBSD from master list
+# (for example, /usr/src/sys/kern/syscalls.master).
+
+use strict;
+
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
+my $command = "mksysnum_netbsd.pl " . join(' ', @ARGV);
+
+print <<EOF;
+// $command
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
+package unix
+
+const (
+EOF
+
+my $line = '';
+while(<>){
+	if($line =~ /^(.*)\\$/) {
+		# Handle continuation
+		$line = $1;
+		$_ =~ s/^\s+//;
+		$line .= $_;
+	} else {
+		# New line
+		$line = $_;
+	}
+	next if $line =~ /\\$/;
+	if($line =~ /^([0-9]+)\s+((STD)|(NOERR))\s+(RUMP\s+)?({\s+\S+\s*\*?\s*\|(\S+)\|(\S*)\|(\w+).*\s+})(\s+(\S+))?$/) {
+		my $num = $1;
+		my $proto = $6;
+		my $compat = $8;
+		my $name = "$7_$9";
+
+		$name = "$7_$11" if $11 ne '';
+		$name =~ y/a-z/A-Z/;
+
+		if($compat eq '' || $compat eq '13' || $compat eq '30' || $compat eq '50') {
+			print "	$name = $num;  // $proto\n";
+		}
+	}
+}
+
+print <<EOF;
+)
+EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl
new file mode 100755
index 00000000..84edf60c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/env perl
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# Generate system call table for OpenBSD from master list
+# (for example, /usr/src/sys/kern/syscalls.master).
+
+use strict;
+
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
+my $command = "mksysnum_openbsd.pl " . join(' ', @ARGV);
+
+print <<EOF;
+// $command
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
+package unix
+
+const (
+EOF
+
+while(<>){
+	if(/^([0-9]+)\s+STD\s+(NOLOCK\s+)?({ \S+\s+\*?(\w+).*)$/){
+		my $num = $1;
+		my $proto = $3;
+		my $name = $4;
+		$name =~ y/a-z/A-Z/;
+
+		# There are multiple entries for enosys and nosys, so comment them out.
+		if($name =~ /^SYS_E?NOSYS$/){
+			$name = "// $name";
+		}
+		if($name eq 'SYS_SYS_EXIT'){
+			$name = 'SYS_EXIT';
+		}
+
+		print "	$name = $num;  // $proto\n";
+	}
+}
+
+print <<EOF;
+)
+EOF
diff --git a/vendor/golang.org/x/sys/unix/mmap_unix_test.go b/vendor/golang.org/x/sys/unix/mmap_unix_test.go
new file mode 100644
index 00000000..3258ca32
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mmap_unix_test.go
@@ -0,0 +1,35 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix_test
+
+import (
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+func TestMmap(t *testing.T) {
+	b, err := unix.Mmap(-1, 0, unix.Getpagesize(), unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
+	if err != nil {
+		t.Fatalf("Mmap: %v", err)
+	}
+	if err := unix.Mprotect(b, unix.PROT_READ|unix.PROT_WRITE); err != nil {
+		t.Fatalf("Mprotect: %v", err)
+	}
+
+	b[0] = 42
+
+	if err := unix.Msync(b, unix.MS_SYNC); err != nil {
+		t.Fatalf("Msync: %v", err)
+	}
+	if err := unix.Madvise(b, unix.MADV_DONTNEED); err != nil {
+		t.Fatalf("Madvise: %v", err)
+	}
+	if err := unix.Munmap(b); err != nil {
+		t.Fatalf("Munmap: %v", err)
+	}
+}
diff --git a/vendor/golang.org/x/sys/unix/openbsd_pledge.go b/vendor/golang.org/x/sys/unix/openbsd_pledge.go
new file mode 100644
index 00000000..11388e5d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/openbsd_pledge.go
@@ -0,0 +1,95 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build openbsd
+// +build 386 amd64 arm
+
+package unix
+
+import (
+	"errors"
+	"fmt"
+	"strconv"
+	"syscall"
+	"unsafe"
+)
+
+const (
+	_SYS_PLEDGE = 108
+)
+
+// Pledge implements the pledge syscall.
+//
+// The pledge syscall does not accept execpromises on OpenBSD releases
+// before 6.3.
+//
+// execpromises must be empty when Pledge is called on OpenBSD
+// releases predating 6.3, otherwise an error will be returned.
+//
+// For more information see pledge(2).
+func Pledge(promises, execpromises string) error {
+	maj, min, err := majmin()
+	if err != nil {
+		return err
+	}
+
+	// If OpenBSD <= 5.9, pledge is not available.
+	if (maj == 5 && min != 9) || maj < 5 {
+		return fmt.Errorf("pledge syscall is not available on OpenBSD %d.%d", maj, min)
+	}
+
+	// If OpenBSD <= 6.2 and execpromises is not empty
+	// return an error - execpromises is not available before 6.3
+	if (maj < 6 || (maj == 6 && min <= 2)) && execpromises != "" {
+		return fmt.Errorf("cannot use execpromises on OpenBSD %d.%d", maj, min)
+	}
+
+	pptr, err := syscall.BytePtrFromString(promises)
+	if err != nil {
+		return err
+	}
+
+	// This variable will hold either a nil unsafe.Pointer or
+	// an unsafe.Pointer to a string (execpromises).
+	var expr unsafe.Pointer
+
+	// If we're running on OpenBSD > 6.2, pass execpromises to the syscall.
+	if maj > 6 || (maj == 6 && min > 2) {
+		exptr, err := syscall.BytePtrFromString(execpromises)
+		if err != nil {
+			return err
+		}
+		expr = unsafe.Pointer(exptr)
+	}
+
+	_, _, e := syscall.Syscall(_SYS_PLEDGE, uintptr(unsafe.Pointer(pptr)), uintptr(expr), 0)
+	if e != 0 {
+		return e
+	}
+
+	return nil
+}
+
+// majmin returns major and minor version number for an OpenBSD system.
+func majmin() (major int, minor int, err error) {
+	var v Utsname
+	err = Uname(&v)
+	if err != nil {
+		return
+	}
+
+	major, err = strconv.Atoi(string(v.Release[0]))
+	if err != nil {
+		err = errors.New("cannot parse major version number returned by uname")
+		return
+	}
+
+	minor, err = strconv.Atoi(string(v.Release[2]))
+	if err != nil {
+		err = errors.New("cannot parse minor version number returned by uname")
+		return
+	}
+
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/openbsd_test.go b/vendor/golang.org/x/sys/unix/openbsd_test.go
new file mode 100644
index 00000000..3ded9607
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/openbsd_test.go
@@ -0,0 +1,113 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build openbsd
+
+// This, on the face of it, bizarre testing mechanism is necessary because
+// the only reliable way to gauge whether or not a pledge(2) call has succeeded
+// is that the program has been killed as a result of breaking its pledge.
+
+package unix_test
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+type testProc struct {
+	fn      func()       // should always exit instead of returning
+	cleanup func() error // for instance, delete coredumps from testing pledge
+	success bool         // whether zero-exit means success or failure
+}
+
+var (
+	testProcs = map[string]testProc{}
+	procName  = ""
+)
+
+const (
+	optName = "sys-unix-internal-procname"
+)
+
+func init() {
+	flag.StringVar(&procName, optName, "", "internal use only")
+}
+
+// testCmd generates a proper command that, when executed, runs the test
+// corresponding to the given key.
+func testCmd(procName string) (*exec.Cmd, error) {
+	exe, err := filepath.Abs(os.Args[0])
+	if err != nil {
+		return nil, err
+	}
+	cmd := exec.Command(exe, "-"+optName+"="+procName)
+	cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
+	return cmd, nil
+}
+
+// ExitsCorrectly is a comprehensive, one-line-of-use wrapper for testing
+// a testProc with a key.
+func ExitsCorrectly(procName string, t *testing.T) {
+	s := testProcs[procName]
+	c, err := testCmd(procName)
+	defer func() {
+		if s.cleanup() != nil {
+			t.Fatalf("Failed to run cleanup for %s", procName)
+		}
+	}()
+	if err != nil {
+		t.Fatalf("Failed to construct command for %s", procName)
+	}
+	if (c.Run() == nil) != s.success {
+		result := "succeed"
+		if !s.success {
+			result = "fail"
+		}
+		t.Fatalf("Process did not %s when it was supposed to", result)
+	}
+}
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+	if procName != "" {
+		testProcs[procName].fn()
+	}
+	os.Exit(m.Run())
+}
+
+// For example, add a test for pledge.
+func init() {
+	testProcs["pledge"] = testProc{
+		func() {
+			fmt.Println(unix.Pledge("", ""))
+			os.Exit(0)
+		},
+		func() error {
+			files, err := ioutil.ReadDir(".")
+			if err != nil {
+				return err
+			}
+			for _, file := range files {
+				if filepath.Ext(file.Name()) == ".core" {
+					if err := os.Remove(file.Name()); err != nil {
+						return err
+					}
+				}
+			}
+			return nil
+		},
+		false,
+	}
+}
+
+func TestPledge(t *testing.T) {
+	ExitsCorrectly("pledge", t)
+}
diff --git a/vendor/golang.org/x/sys/unix/pagesize_unix.go b/vendor/golang.org/x/sys/unix/pagesize_unix.go
new file mode 100644
index 00000000..83c85e01
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/pagesize_unix.go
@@ -0,0 +1,15 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+// For Unix, get the pagesize from the runtime.
+
+package unix
+
+import "syscall"
+
+func Getpagesize() int {
+	return syscall.Getpagesize()
+}
diff --git a/vendor/golang.org/x/sys/unix/race.go b/vendor/golang.org/x/sys/unix/race.go
new file mode 100644
index 00000000..61712b51
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/race.go
@@ -0,0 +1,30 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin,race linux,race freebsd,race
+
+package unix
+
+import (
+	"runtime"
+	"unsafe"
+)
+
+const raceenabled = true
+
+func raceAcquire(addr unsafe.Pointer) {
+	runtime.RaceAcquire(addr)
+}
+
+func raceReleaseMerge(addr unsafe.Pointer) {
+	runtime.RaceReleaseMerge(addr)
+}
+
+func raceReadRange(addr unsafe.Pointer, len int) {
+	runtime.RaceReadRange(addr, len)
+}
+
+func raceWriteRange(addr unsafe.Pointer, len int) {
+	runtime.RaceWriteRange(addr, len)
+}
diff --git a/vendor/golang.org/x/sys/unix/race0.go b/vendor/golang.org/x/sys/unix/race0.go
new file mode 100644
index 00000000..dd082043
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/race0.go
@@ -0,0 +1,25 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin,!race linux,!race freebsd,!race netbsd openbsd solaris dragonfly
+
+package unix
+
+import (
+	"unsafe"
+)
+
+const raceenabled = false
+
+func raceAcquire(addr unsafe.Pointer) {
+}
+
+func raceReleaseMerge(addr unsafe.Pointer) {
+}
+
+func raceReadRange(addr unsafe.Pointer, len int) {
+}
+
+func raceWriteRange(addr unsafe.Pointer, len int) {
+}
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_linux.go b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
new file mode 100644
index 00000000..6079eb4a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
@@ -0,0 +1,36 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Socket control messages
+
+package unix
+
+import "unsafe"
+
+// UnixCredentials encodes credentials into a socket control message
+// for sending to another process. This can be used for
+// authentication.
+func UnixCredentials(ucred *Ucred) []byte {
+	b := make([]byte, CmsgSpace(SizeofUcred))
+	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
+	h.Level = SOL_SOCKET
+	h.Type = SCM_CREDENTIALS
+	h.SetLen(CmsgLen(SizeofUcred))
+	*((*Ucred)(cmsgData(h))) = *ucred
+	return b
+}
+
+// ParseUnixCredentials decodes a socket control message that contains
+// credentials in a Ucred structure. To receive such a message, the
+// SO_PASSCRED option must be enabled on the socket.
+func ParseUnixCredentials(m *SocketControlMessage) (*Ucred, error) {
+	if m.Header.Level != SOL_SOCKET {
+		return nil, EINVAL
+	}
+	if m.Header.Type != SCM_CREDENTIALS {
+		return nil, EINVAL
+	}
+	ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
+	return &ucred, nil
+}
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
new file mode 100644
index 00000000..bb756ece
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
@@ -0,0 +1,104 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+// Socket control messages
+
+package unix
+
+import "unsafe"
+
+// Round the length of a raw sockaddr up to align it properly.
+func cmsgAlignOf(salen int) int {
+	salign := sizeofPtr
+	// NOTE: It seems like 64-bit Darwin, DragonFly BSD and
+	// Solaris kernels still require 32-bit aligned access to
+	// network subsystem.
+	if darwin64Bit || dragonfly64Bit || solaris64Bit {
+		salign = 4
+	}
+	return (salen + salign - 1) & ^(salign - 1)
+}
+
+// CmsgLen returns the value to store in the Len field of the Cmsghdr
+// structure, taking into account any necessary alignment.
+func CmsgLen(datalen int) int {
+	return cmsgAlignOf(SizeofCmsghdr) + datalen
+}
+
+// CmsgSpace returns the number of bytes an ancillary element with
+// payload of the passed data length occupies.
+func CmsgSpace(datalen int) int {
+	return cmsgAlignOf(SizeofCmsghdr) + cmsgAlignOf(datalen)
+}
+
+func cmsgData(h *Cmsghdr) unsafe.Pointer {
+	return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(SizeofCmsghdr)))
+}
+
+// SocketControlMessage represents a socket control message.
+type SocketControlMessage struct {
+	Header Cmsghdr
+	Data   []byte
+}
+
+// ParseSocketControlMessage parses b as an array of socket control
+// messages.
+func ParseSocketControlMessage(b []byte) ([]SocketControlMessage, error) {
+	var msgs []SocketControlMessage
+	i := 0
+	for i+CmsgLen(0) <= len(b) {
+		h, dbuf, err := socketControlMessageHeaderAndData(b[i:])
+		if err != nil {
+			return nil, err
+		}
+		m := SocketControlMessage{Header: *h, Data: dbuf}
+		msgs = append(msgs, m)
+		i += cmsgAlignOf(int(h.Len))
+	}
+	return msgs, nil
+}
+
+func socketControlMessageHeaderAndData(b []byte) (*Cmsghdr, []byte, error) {
+	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
+	if h.Len < SizeofCmsghdr || uint64(h.Len) > uint64(len(b)) {
+		return nil, nil, EINVAL
+	}
+	return h, b[cmsgAlignOf(SizeofCmsghdr):h.Len], nil
+}
+
+// UnixRights encodes a set of open file descriptors into a socket
+// control message for sending to another process.
+func UnixRights(fds ...int) []byte {
+	datalen := len(fds) * 4
+	b := make([]byte, CmsgSpace(datalen))
+	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
+	h.Level = SOL_SOCKET
+	h.Type = SCM_RIGHTS
+	h.SetLen(CmsgLen(datalen))
+	data := cmsgData(h)
+	for _, fd := range fds {
+		*(*int32)(data) = int32(fd)
+		data = unsafe.Pointer(uintptr(data) + 4)
+	}
+	return b
+}
+
+// ParseUnixRights decodes a socket control message that contains an
+// integer array of open file descriptors from another process.
+func ParseUnixRights(m *SocketControlMessage) ([]int, error) {
+	if m.Header.Level != SOL_SOCKET {
+		return nil, EINVAL
+	}
+	if m.Header.Type != SCM_RIGHTS {
+		return nil, EINVAL
+	}
+	fds := make([]int, len(m.Data)>>2)
+	for i, j := 0, 0; i < len(m.Data); i += 4 {
+		fds[j] = int(*(*int32)(unsafe.Pointer(&m.Data[i])))
+		j++
+	}
+	return fds, nil
+}
diff --git a/vendor/golang.org/x/sys/unix/str.go b/vendor/golang.org/x/sys/unix/str.go
new file mode 100644
index 00000000..35ed6643
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/str.go
@@ -0,0 +1,26 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+func itoa(val int) string { // do it here rather than with fmt to avoid dependency
+	if val < 0 {
+		return "-" + uitoa(uint(-val))
+	}
+	return uitoa(uint(val))
+}
+
+func uitoa(val uint) string {
+	var buf [32]byte // big enough for int64
+	i := len(buf) - 1
+	for val >= 10 {
+		buf[i] = byte(val%10 + '0')
+		i--
+		val /= 10
+	}
+	buf[i] = byte(val + '0')
+	return string(buf[i:])
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall.go b/vendor/golang.org/x/sys/unix/syscall.go
new file mode 100644
index 00000000..ef35fce8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall.go
@@ -0,0 +1,54 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+// Package unix contains an interface to the low-level operating system
+// primitives. OS details vary depending on the underlying system, and
+// by default, godoc will display OS-specific documentation for the current
+// system. If you want godoc to display OS documentation for another
+// system, set $GOOS and $GOARCH to the desired system. For example, if
+// you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
+// to freebsd and $GOARCH to arm.
+//
+// The primary use of this package is inside other packages that provide a more
+// portable interface to the system, such as "os", "time" and "net".  Use
+// those packages rather than this one if you can.
+//
+// For details of the functions and data types in this package consult
+// the manuals for the appropriate operating system.
+//
+// These calls return err == nil to indicate success; otherwise
+// err represents an operating system error describing the failure and
+// holds a value of type syscall.Errno.
+package unix // import "golang.org/x/sys/unix"
+
+import "strings"
+
+// ByteSliceFromString returns a NUL-terminated slice of bytes
+// containing the text of s. If s contains a NUL byte at any
+// location, it returns (nil, EINVAL).
+func ByteSliceFromString(s string) ([]byte, error) {
+	if strings.IndexByte(s, 0) != -1 {
+		return nil, EINVAL
+	}
+	a := make([]byte, len(s)+1)
+	copy(a, s)
+	return a, nil
+}
+
+// BytePtrFromString returns a pointer to a NUL-terminated array of
+// bytes containing the text of s. If s contains a NUL byte at any
+// location, it returns (nil, EINVAL).
+func BytePtrFromString(s string) (*byte, error) {
+	a, err := ByteSliceFromString(s)
+	if err != nil {
+		return nil, err
+	}
+	return &a[0], nil
+}
+
+// Single-word zero for use when we need a valid pointer to 0 bytes.
+// See mkunix.pl.
+var _zero uintptr
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
new file mode 100644
index 00000000..33c8b5f0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -0,0 +1,624 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd netbsd openbsd
+
+// BSD system call wrappers shared by *BSD based systems
+// including OS X (Darwin) and FreeBSD.  Like the other
+// syscall_*.go files it is compiled as Go code but also
+// used as input to mksyscall which parses the //sys
+// lines and generates system call stubs.
+
+package unix
+
+import (
+	"runtime"
+	"syscall"
+	"unsafe"
+)
+
+/*
+ * Wrapped
+ */
+
+//sysnb	getgroups(ngid int, gid *_Gid_t) (n int, err error)
+//sysnb	setgroups(ngid int, gid *_Gid_t) (err error)
+
+func Getgroups() (gids []int, err error) {
+	n, err := getgroups(0, nil)
+	if err != nil {
+		return nil, err
+	}
+	if n == 0 {
+		return nil, nil
+	}
+
+	// Sanity check group count. Max is 16 on BSD.
+	if n < 0 || n > 1000 {
+		return nil, EINVAL
+	}
+
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
+	if err != nil {
+		return nil, err
+	}
+	gids = make([]int, n)
+	for i, v := range a[0:n] {
+		gids[i] = int(v)
+	}
+	return
+}
+
+func Setgroups(gids []int) (err error) {
+	if len(gids) == 0 {
+		return setgroups(0, nil)
+	}
+
+	a := make([]_Gid_t, len(gids))
+	for i, v := range gids {
+		a[i] = _Gid_t(v)
+	}
+	return setgroups(len(a), &a[0])
+}
+
+func ReadDirent(fd int, buf []byte) (n int, err error) {
+	// Final argument is (basep *uintptr) and the syscall doesn't take nil.
+	// 64 bits should be enough. (32 bits isn't even on 386). Since the
+	// actual system call is getdirentries64, 64 is a good guess.
+	// TODO(rsc): Can we use a single global basep for all calls?
+	var base = (*uintptr)(unsafe.Pointer(new(uint64)))
+	return Getdirentries(fd, buf, base)
+}
+
+// Wait status is 7 bits at bottom, either 0 (exited),
+// 0x7F (stopped), or a signal number that caused an exit.
+// The 0x80 bit is whether there was a core dump.
+// An extra number (exit code, signal causing a stop)
+// is in the high bits.
+
+type WaitStatus uint32
+
+const (
+	mask  = 0x7F
+	core  = 0x80
+	shift = 8
+
+	exited  = 0
+	stopped = 0x7F
+)
+
+func (w WaitStatus) Exited() bool { return w&mask == exited }
+
+func (w WaitStatus) ExitStatus() int {
+	if w&mask != exited {
+		return -1
+	}
+	return int(w >> shift)
+}
+
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
+
+func (w WaitStatus) Signal() syscall.Signal {
+	sig := syscall.Signal(w & mask)
+	if sig == stopped || sig == 0 {
+		return -1
+	}
+	return sig
+}
+
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
+
+func (w WaitStatus) Stopped() bool { return w&mask == stopped && syscall.Signal(w>>shift) != SIGSTOP }
+
+func (w WaitStatus) Continued() bool { return w&mask == stopped && syscall.Signal(w>>shift) == SIGSTOP }
+
+func (w WaitStatus) StopSignal() syscall.Signal {
+	if !w.Stopped() {
+		return -1
+	}
+	return syscall.Signal(w>>shift) & 0xFF
+}
+
+func (w WaitStatus) TrapCause() int { return -1 }
+
+//sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error)
+
+func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
+	var status _C_int
+	wpid, err = wait4(pid, &status, options, rusage)
+	if wstatus != nil {
+		*wstatus = WaitStatus(status)
+	}
+	return
+}
+
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	Shutdown(s int, how int) (err error)
+
+func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Len = SizeofSockaddrInet4
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
+}
+
+func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Len = SizeofSockaddrInet6
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	sa.raw.Scope_id = sa.ZoneId
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
+}
+
+func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	name := sa.Name
+	n := len(name)
+	if n >= len(sa.raw.Path) || n == 0 {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Len = byte(3 + n) // 2 for Family, Len; 1 for NUL
+	sa.raw.Family = AF_UNIX
+	for i := 0; i < n; i++ {
+		sa.raw.Path[i] = int8(name[i])
+	}
+	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
+}
+
+func (sa *SockaddrDatalink) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Index == 0 {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Len = sa.Len
+	sa.raw.Family = AF_LINK
+	sa.raw.Index = sa.Index
+	sa.raw.Type = sa.Type
+	sa.raw.Nlen = sa.Nlen
+	sa.raw.Alen = sa.Alen
+	sa.raw.Slen = sa.Slen
+	for i := 0; i < len(sa.raw.Data); i++ {
+		sa.raw.Data[i] = sa.Data[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrDatalink, nil
+}
+
+func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
+	switch rsa.Addr.Family {
+	case AF_LINK:
+		pp := (*RawSockaddrDatalink)(unsafe.Pointer(rsa))
+		sa := new(SockaddrDatalink)
+		sa.Len = pp.Len
+		sa.Family = pp.Family
+		sa.Index = pp.Index
+		sa.Type = pp.Type
+		sa.Nlen = pp.Nlen
+		sa.Alen = pp.Alen
+		sa.Slen = pp.Slen
+		for i := 0; i < len(sa.Data); i++ {
+			sa.Data[i] = pp.Data[i]
+		}
+		return sa, nil
+
+	case AF_UNIX:
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
+		if pp.Len < 2 || pp.Len > SizeofSockaddrUnix {
+			return nil, EINVAL
+		}
+		sa := new(SockaddrUnix)
+
+		// Some BSDs include the trailing NUL in the length, whereas
+		// others do not. Work around this by subtracting the leading
+		// family and len. The path is then scanned to see if a NUL
+		// terminator still exists within the length.
+		n := int(pp.Len) - 2 // subtract leading Family, Len
+		for i := 0; i < n; i++ {
+			if pp.Path[i] == 0 {
+				// found early NUL; assume Len included the NUL
+				// or was overestimating.
+				n = i
+				break
+			}
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
+		return sa, nil
+
+	case AF_INET:
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_INET6:
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		sa.ZoneId = pp.Scope_id
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+	}
+	return nil, EAFNOSUPPORT
+}
+
+func Accept(fd int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept(fd, &rsa, &len)
+	if err != nil {
+		return
+	}
+	if runtime.GOOS == "darwin" && len == 0 {
+		// Accepted socket has no address.
+		// This is likely due to a bug in xnu kernels,
+		// where instead of ECONNABORTED error socket
+		// is accepted, but has no address.
+		Close(nfd)
+		return 0, nil, ECONNABORTED
+	}
+	sa, err = anyToSockaddr(fd, &rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+func Getsockname(fd int) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if err = getsockname(fd, &rsa, &len); err != nil {
+		return
+	}
+	// TODO(jsing): DragonFly has a "bug" (see issue 3349), which should be
+	// reported upstream.
+	if runtime.GOOS == "dragonfly" && rsa.Addr.Family == AF_UNSPEC && rsa.Addr.Len == 0 {
+		rsa.Addr.Family = AF_UNIX
+		rsa.Addr.Len = SizeofSockaddrUnix
+	}
+	return anyToSockaddr(fd, &rsa)
+}
+
+//sysnb socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+	buf := make([]byte, 256)
+	vallen := _Socklen(len(buf))
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+	if err != nil {
+		return "", err
+	}
+	return string(buf[:vallen-1]), nil
+}
+
+//sys   recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys   sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
+	var msg Msghdr
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
+	msg.Namelen = uint32(SizeofSockaddrAny)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy byte
+	if len(oob) > 0 {
+		// receive at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
+		msg.SetControllen(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = recvmsg(fd, &msg, flags); err != nil {
+		return
+	}
+	oobn = int(msg.Controllen)
+	recvflags = int(msg.Flags)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(fd, &rsa)
+	}
+	return
+}
+
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
+	return
+}
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
+	var msg Msghdr
+	msg.Name = (*byte)(unsafe.Pointer(ptr))
+	msg.Namelen = uint32(salen)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy byte
+	if len(oob) > 0 {
+		// send at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
+		msg.SetControllen(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = sendmsg(fd, &msg, flags); err != nil {
+		return 0, err
+	}
+	if len(oob) > 0 && len(p) == 0 {
+		n = 0
+	}
+	return n, nil
+}
+
+//sys	kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error)
+
+func Kevent(kq int, changes, events []Kevent_t, timeout *Timespec) (n int, err error) {
+	var change, event unsafe.Pointer
+	if len(changes) > 0 {
+		change = unsafe.Pointer(&changes[0])
+	}
+	if len(events) > 0 {
+		event = unsafe.Pointer(&events[0])
+	}
+	return kevent(kq, change, len(changes), event, len(events), timeout)
+}
+
+//sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
+
+// sysctlmib translates name to mib number and appends any additional args.
+func sysctlmib(name string, args ...int) ([]_C_int, error) {
+	// Translate name to mib number.
+	mib, err := nametomib(name)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, a := range args {
+		mib = append(mib, _C_int(a))
+	}
+
+	return mib, nil
+}
+
+func Sysctl(name string) (string, error) {
+	return SysctlArgs(name)
+}
+
+func SysctlArgs(name string, args ...int) (string, error) {
+	buf, err := SysctlRaw(name, args...)
+	if err != nil {
+		return "", err
+	}
+	n := len(buf)
+
+	// Throw away terminating NUL.
+	if n > 0 && buf[n-1] == '\x00' {
+		n--
+	}
+	return string(buf[0:n]), nil
+}
+
+func SysctlUint32(name string) (uint32, error) {
+	return SysctlUint32Args(name)
+}
+
+func SysctlUint32Args(name string, args ...int) (uint32, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return 0, err
+	}
+
+	n := uintptr(4)
+	buf := make([]byte, 4)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return 0, err
+	}
+	if n != 4 {
+		return 0, EIO
+	}
+	return *(*uint32)(unsafe.Pointer(&buf[0])), nil
+}
+
+func SysctlUint64(name string, args ...int) (uint64, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return 0, err
+	}
+
+	n := uintptr(8)
+	buf := make([]byte, 8)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return 0, err
+	}
+	if n != 8 {
+		return 0, EIO
+	}
+	return *(*uint64)(unsafe.Pointer(&buf[0])), nil
+}
+
+func SysctlRaw(name string, args ...int) ([]byte, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return nil, err
+	}
+
+	// Find size.
+	n := uintptr(0)
+	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
+		return nil, err
+	}
+	if n == 0 {
+		return nil, nil
+	}
+
+	// Read into buffer of that size.
+	buf := make([]byte, n)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return nil, err
+	}
+
+	// The actual call may return less than the original reported required
+	// size so ensure we deal with that.
+	return buf[:n], nil
+}
+
+//sys	utimes(path string, timeval *[2]Timeval) (err error)
+
+func Utimes(path string, tv []Timeval) error {
+	if tv == nil {
+		return utimes(path, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		err := utimensat(AT_FDCWD, path, nil, 0)
+		if err != ENOSYS {
+			return err
+		}
+		return utimes(path, nil)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	// Darwin setattrlist can set nanosecond timestamps
+	err := setattrlistTimes(path, ts, 0)
+	if err != ENOSYS {
+		return err
+	}
+	err = utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	if err != ENOSYS {
+		return err
+	}
+	// Not as efficient as it could be because Timespec and
+	// Timeval have different types in the different OSes
+	tv := [2]Timeval{
+		NsecToTimeval(TimespecToNsec(ts[0])),
+		NsecToTimeval(TimespecToNsec(ts[1])),
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
+	if ts == nil {
+		return utimensat(dirfd, path, nil, flags)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	err := setattrlistTimes(path, ts, flags)
+	if err != ENOSYS {
+		return err
+	}
+	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
+}
+
+//sys	futimes(fd int, timeval *[2]Timeval) (err error)
+
+func Futimes(fd int, tv []Timeval) error {
+	if tv == nil {
+		return futimes(fd, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimes(fd, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
+
+//sys   poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
+// TODO: wrap
+//	Acct(name nil-string) (err error)
+//	Gethostuuid(uuid *byte, timeout *Timespec) (err error)
+//	Ptrace(req int, pid int, addr uintptr, data int) (ret uintptr, err error)
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
+//sys	Madvise(b []byte, behav int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Msync(b []byte, flags int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd_test.go b/vendor/golang.org/x/sys/unix/syscall_bsd_test.go
new file mode 100644
index 00000000..6c4e2aca
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd_test.go
@@ -0,0 +1,93 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd openbsd
+
+package unix_test
+
+import (
+	"os/exec"
+	"runtime"
+	"testing"
+	"time"
+
+	"golang.org/x/sys/unix"
+)
+
+const MNT_WAIT = 1
+const MNT_NOWAIT = 2
+
+func TestGetfsstat(t *testing.T) {
+	const flags = MNT_NOWAIT // see golang.org/issue/16937
+	n, err := unix.Getfsstat(nil, flags)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	data := make([]unix.Statfs_t, n)
+	n2, err := unix.Getfsstat(data, flags)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n != n2 {
+		t.Errorf("Getfsstat(nil) = %d, but subsequent Getfsstat(slice) = %d", n, n2)
+	}
+	for i, stat := range data {
+		if stat == (unix.Statfs_t{}) {
+			t.Errorf("index %v is an empty Statfs_t struct", i)
+		}
+	}
+	if t.Failed() {
+		for i, stat := range data[:n2] {
+			t.Logf("data[%v] = %+v", i, stat)
+		}
+		mount, err := exec.Command("mount").CombinedOutput()
+		if err != nil {
+			t.Logf("mount: %v\n%s", err, mount)
+		} else {
+			t.Logf("mount: %s", mount)
+		}
+	}
+}
+
+func TestSelect(t *testing.T) {
+	err := unix.Select(0, nil, nil, nil, &unix.Timeval{Sec: 0, Usec: 0})
+	if err != nil {
+		t.Fatalf("Select: %v", err)
+	}
+
+	dur := 250 * time.Millisecond
+	tv := unix.NsecToTimeval(int64(dur))
+	start := time.Now()
+	err = unix.Select(0, nil, nil, nil, &tv)
+	took := time.Since(start)
+	if err != nil {
+		t.Fatalf("Select: %v", err)
+	}
+
+	// On some BSDs the actual timeout might also be slightly less than the requested.
+	// Add an acceptable margin to avoid flaky tests.
+	if took < dur*2/3 {
+		t.Errorf("Select: timeout should have been at least %v, got %v", dur, took)
+	}
+}
+
+func TestSysctlRaw(t *testing.T) {
+	if runtime.GOOS == "openbsd" {
+		t.Skip("kern.proc.pid does not exist on OpenBSD")
+	}
+
+	_, err := unix.SysctlRaw("kern.proc.pid", unix.Getpid())
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestSysctlUint32(t *testing.T) {
+	maxproc, err := unix.SysctlUint32("kern.maxproc")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("kern.maxproc: %v", maxproc)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
new file mode 100644
index 00000000..1aabc560
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -0,0 +1,700 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Darwin system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import (
+	"errors"
+	"syscall"
+	"unsafe"
+)
+
+const ImplementsGetwd = true
+
+func Getwd() (string, error) {
+	buf := make([]byte, 2048)
+	attrs, err := getAttrList(".", attrList{CommonAttr: attrCmnFullpath}, buf, 0)
+	if err == nil && len(attrs) == 1 && len(attrs[0]) >= 2 {
+		wd := string(attrs[0])
+		// Sanity check that it's an absolute path and ends
+		// in a null byte, which we then strip.
+		if wd[0] == '/' && wd[len(wd)-1] == 0 {
+			return wd[:len(wd)-1], nil
+		}
+	}
+	// If pkg/os/getwd.go gets ENOTSUP, it will fall back to the
+	// slow algorithm.
+	return "", ENOTSUP
+}
+
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+	raw    RawSockaddrDatalink
+}
+
+// Translate "kern.hostname" to []_C_int{0,1,2,3}.
+func nametomib(name string) (mib []_C_int, err error) {
+	const siz = unsafe.Sizeof(mib[0])
+
+	// NOTE(rsc): It seems strange to set the buffer to have
+	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
+	// as the size. I don't know why the +2 is here, but the
+	// kernel uses +2 for its own implementation of this function.
+	// I am scared that if we don't include the +2 here, the kernel
+	// will silently write 2 words farther than we specify
+	// and we'll get memory corruption.
+	var buf [CTL_MAXNAME + 2]_C_int
+	n := uintptr(CTL_MAXNAME) * siz
+
+	p := (*byte)(unsafe.Pointer(&buf[0]))
+	bytes, err := ByteSliceFromString(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// Magic sysctl: "setting" 0.3 to a string name
+	// lets you read back the array of integers form.
+	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
+		return nil, err
+	}
+	return buf[0 : n/siz], nil
+}
+
+//sys   ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
+func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
+func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
+
+const (
+	attrBitMapCount = 5
+	attrCmnFullpath = 0x08000000
+)
+
+type attrList struct {
+	bitmapCount uint16
+	_           uint16
+	CommonAttr  uint32
+	VolAttr     uint32
+	DirAttr     uint32
+	FileAttr    uint32
+	Forkattr    uint32
+}
+
+func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) (attrs [][]byte, err error) {
+	if len(attrBuf) < 4 {
+		return nil, errors.New("attrBuf too small")
+	}
+	attrList.bitmapCount = attrBitMapCount
+
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return nil, err
+	}
+
+	_, _, e1 := Syscall6(
+		SYS_GETATTRLIST,
+		uintptr(unsafe.Pointer(_p0)),
+		uintptr(unsafe.Pointer(&attrList)),
+		uintptr(unsafe.Pointer(&attrBuf[0])),
+		uintptr(len(attrBuf)),
+		uintptr(options),
+		0,
+	)
+	if e1 != 0 {
+		return nil, e1
+	}
+	size := *(*uint32)(unsafe.Pointer(&attrBuf[0]))
+
+	// dat is the section of attrBuf that contains valid data,
+	// without the 4 byte length header. All attribute offsets
+	// are relative to dat.
+	dat := attrBuf
+	if int(size) < len(attrBuf) {
+		dat = dat[:size]
+	}
+	dat = dat[4:] // remove length prefix
+
+	for i := uint32(0); int(i) < len(dat); {
+		header := dat[i:]
+		if len(header) < 8 {
+			return attrs, errors.New("truncated attribute header")
+		}
+		datOff := *(*int32)(unsafe.Pointer(&header[0]))
+		attrLen := *(*uint32)(unsafe.Pointer(&header[4]))
+		if datOff < 0 || uint32(datOff)+attrLen > uint32(len(dat)) {
+			return attrs, errors.New("truncated results; attrBuf too small")
+		}
+		end := uint32(datOff) + attrLen
+		attrs = append(attrs, dat[datOff:end])
+		i = end
+		if r := i % 4; r != 0 {
+			i += (4 - r)
+		}
+	}
+	return
+}
+
+//sysnb pipe() (r int, w int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	var bufsize uintptr
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+	}
+	r0, _, e1 := Syscall(SYS_GETFSSTAT64, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func xattrPointer(dest []byte) *byte {
+	// It's only when dest is set to NULL that the OS X implementations of
+	// getxattr() and listxattr() return the current sizes of the named attributes.
+	// An empty byte array is not sufficient. To maintain the same behaviour as the
+	// linux implementation, we wrap around the system calls and pass in NULL when
+	// dest is empty.
+	var destp *byte
+	if len(dest) > 0 {
+		destp = &dest[0]
+	}
+	return destp
+}
+
+//sys	getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error)
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	return getxattr(path, attr, xattrPointer(dest), len(dest), 0, 0)
+}
+
+func Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
+	return getxattr(link, attr, xattrPointer(dest), len(dest), 0, XATTR_NOFOLLOW)
+}
+
+//sys	fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error)
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	return fgetxattr(fd, attr, xattrPointer(dest), len(dest), 0, 0)
+}
+
+//sys	setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error)
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	// The parameters for the OS X implementation vary slightly compared to the
+	// linux system call, specifically the position parameter:
+	//
+	//  linux:
+	//      int setxattr(
+	//          const char *path,
+	//          const char *name,
+	//          const void *value,
+	//          size_t size,
+	//          int flags
+	//      );
+	//
+	//  darwin:
+	//      int setxattr(
+	//          const char *path,
+	//          const char *name,
+	//          void *value,
+	//          size_t size,
+	//          u_int32_t position,
+	//          int options
+	//      );
+	//
+	// position specifies the offset within the extended attribute. In the
+	// current implementation, only the resource fork extended attribute makes
+	// use of this argument. For all others, position is reserved. We simply
+	// default to setting it to zero.
+	return setxattr(path, attr, xattrPointer(data), len(data), 0, flags)
+}
+
+func Lsetxattr(link string, attr string, data []byte, flags int) (err error) {
+	return setxattr(link, attr, xattrPointer(data), len(data), 0, flags|XATTR_NOFOLLOW)
+}
+
+//sys	fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error)
+
+func Fsetxattr(fd int, attr string, data []byte, flags int) (err error) {
+	return fsetxattr(fd, attr, xattrPointer(data), len(data), 0, 0)
+}
+
+//sys	removexattr(path string, attr string, options int) (err error)
+
+func Removexattr(path string, attr string) (err error) {
+	// We wrap around and explicitly zero out the options provided to the OS X
+	// implementation of removexattr, we do so for interoperability with the
+	// linux variant.
+	return removexattr(path, attr, 0)
+}
+
+func Lremovexattr(link string, attr string) (err error) {
+	return removexattr(link, attr, XATTR_NOFOLLOW)
+}
+
+//sys	fremovexattr(fd int, attr string, options int) (err error)
+
+func Fremovexattr(fd int, attr string) (err error) {
+	return fremovexattr(fd, attr, 0)
+}
+
+//sys	listxattr(path string, dest *byte, size int, options int) (sz int, err error)
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	return listxattr(path, xattrPointer(dest), len(dest), 0)
+}
+
+func Llistxattr(link string, dest []byte) (sz int, err error) {
+	return listxattr(link, xattrPointer(dest), len(dest), XATTR_NOFOLLOW)
+}
+
+//sys	flistxattr(fd int, dest *byte, size int, options int) (sz int, err error)
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	return flistxattr(fd, xattrPointer(dest), len(dest), 0)
+}
+
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	_p0, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+
+	var attrList attrList
+	attrList.bitmapCount = ATTR_BIT_MAP_COUNT
+	attrList.CommonAttr = ATTR_CMN_MODTIME | ATTR_CMN_ACCTIME
+
+	// order is mtime, atime: the opposite of Chtimes
+	attributes := [2]Timespec{times[1], times[0]}
+	options := 0
+	if flags&AT_SYMLINK_NOFOLLOW != 0 {
+		options |= FSOPT_NOFOLLOW
+	}
+	_, _, e1 := Syscall6(
+		SYS_SETATTRLIST,
+		uintptr(unsafe.Pointer(_p0)),
+		uintptr(unsafe.Pointer(&attrList)),
+		uintptr(unsafe.Pointer(&attributes)),
+		uintptr(unsafe.Sizeof(attributes)),
+		uintptr(options),
+		0,
+	)
+	if e1 != 0 {
+		return e1
+	}
+	return nil
+}
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) error {
+	// Darwin doesn't support SYS_UTIMENSAT
+	return ENOSYS
+}
+
+/*
+ * Wrapped
+ */
+
+//sys	kill(pid int, signum int, posix int) (err error)
+
+func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(signum), 1) }
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exchangedata(path1 string, path2 string, options int) (err error)
+//sys	Exit(code int)
+//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
+//sys	Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) = SYS_GETDIRENTRIES64
+//sys	Getdtablesize() (size int)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Getuid() (uid int)
+//sysnb	Issetugid() (tainted bool)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Renameat(fromfd int, from string, tofd int, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sys	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Setlogin(name string) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sys	Setprivexec(flag int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
+//sys	Statfs(path string, stat *Statfs_t) (err error) = SYS_STATFS64
+//sys	Symlink(path string, link string) (err error)
+//sys	Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Undelete(path string) (err error)
+//sys	Unlink(path string) (err error)
+//sys	Unlinkat(dirfd int, path string, flags int) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys   munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+
+/*
+ * Unimplemented
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Ioctl
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Watchevent
+// Waitevent
+// Modwatch
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// sendfile
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Poll_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_386.go b/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
new file mode 100644
index 00000000..b3ac109a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
@@ -0,0 +1,68 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused. The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = int32(sec)
+	tv.Usec = int32(usec)
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/386 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
new file mode 100644
index 00000000..75219444
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
@@ -0,0 +1,68 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused. The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = sec
+	tv.Usec = usec
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/amd64 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
new file mode 100644
index 00000000..faae207a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
@@ -0,0 +1,66 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused. The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = int32(sec)
+	tv.Usec = int32(usec)
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/arm the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
new file mode 100644
index 00000000..d6d96280
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
@@ -0,0 +1,68 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm64,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused. The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = sec
+	tv.Usec = usec
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/arm64 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_test.go b/vendor/golang.org/x/sys/unix/syscall_darwin_test.go
new file mode 100644
index 00000000..65691d5c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_test.go
@@ -0,0 +1,19 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix_test
+
+// stringsFromByteSlice converts a sequence of attributes to a []string.
+// On Darwin, each entry is a NULL-terminated string.
+func stringsFromByteSlice(buf []byte) []string {
+	var result []string
+	off := 0
+	for i, b := range buf {
+		if b == 0 {
+			result = append(result, string(buf[off:i]))
+			off = i + 1
+		}
+	}
+	return result
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
new file mode 100644
index 00000000..79d125b3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -0,0 +1,523 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// DragonFly BSD system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import "unsafe"
+
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+	Rcf    uint16
+	Route  [16]uint16
+	raw    RawSockaddrDatalink
+}
+
+// Translate "kern.hostname" to []_C_int{0,1,2,3}.
+func nametomib(name string) (mib []_C_int, err error) {
+	const siz = unsafe.Sizeof(mib[0])
+
+	// NOTE(rsc): It seems strange to set the buffer to have
+	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
+	// as the size. I don't know why the +2 is here, but the
+	// kernel uses +2 for its own implementation of this function.
+	// I am scared that if we don't include the +2 here, the kernel
+	// will silently write 2 words farther than we specify
+	// and we'll get memory corruption.
+	var buf [CTL_MAXNAME + 2]_C_int
+	n := uintptr(CTL_MAXNAME) * siz
+
+	p := (*byte)(unsafe.Pointer(&buf[0]))
+	bytes, err := ByteSliceFromString(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// Magic sysctl: "setting" 0.3 to a string name
+	// lets you read back the array of integers form.
+	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
+		return nil, err
+	}
+	return buf[0 : n/siz], nil
+}
+
+//sysnb pipe() (r int, w int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+//sys	extpread(fd int, p []byte, flags int, offset int64) (n int, err error)
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	return extpread(fd, p, 0, offset)
+}
+
+//sys	extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error)
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	return extpwrite(fd, p, 0, offset)
+}
+
+func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept4(fd, &rsa, &len, flags)
+	if err != nil {
+		return
+	}
+	if len > SizeofSockaddrAny {
+		panic("RawSockaddrAny too small")
+	}
+	sa, err = anyToSockaddr(fd, &rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
+func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	var bufsize uintptr
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+	}
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func sysctlUname(mib []_C_int, old *byte, oldlen *uintptr) error {
+	err := sysctl(mib, old, oldlen, nil, 0)
+	if err != nil {
+		// Utsname members on Dragonfly are only 32 bytes and
+		// the syscall returns ENOMEM in case the actual value
+		// is longer.
+		if err == ENOMEM {
+			err = nil
+		}
+	}
+	return err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctlUname(mib, &uname.Sysname[0], &n); err != nil {
+		return err
+	}
+	uname.Sysname[unsafe.Sizeof(uname.Sysname)-1] = 0
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctlUname(mib, &uname.Nodename[0], &n); err != nil {
+		return err
+	}
+	uname.Nodename[unsafe.Sizeof(uname.Nodename)-1] = 0
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctlUname(mib, &uname.Release[0], &n); err != nil {
+		return err
+	}
+	uname.Release[unsafe.Sizeof(uname.Release)-1] = 0
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctlUname(mib, &uname.Version[0], &n); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctlUname(mib, &uname.Machine[0], &n); err != nil {
+		return err
+	}
+	uname.Machine[unsafe.Sizeof(uname.Machine)-1] = 0
+
+	return nil
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exit(code int)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
+//sys	Getdtablesize() (size int)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Issetugid() (tainted bool)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Setlogin(name string) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, stat *Statfs_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Undelete(path string) (err error)
+//sys	Unlink(path string) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys   munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+//sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+
+/*
+ * Unimplemented
+ * TODO(jsing): Update this list for DragonFly.
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Watchevent
+// Waitevent
+// Modwatch
+// Getxattr
+// Fgetxattr
+// Setxattr
+// Fsetxattr
+// Removexattr
+// Fremovexattr
+// Listxattr
+// Flistxattr
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
new file mode 100644
index 00000000..9babb31e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
@@ -0,0 +1,52 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,dragonfly
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var writtenOut uint64 = 0
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
+
+	written = int(writtenOut)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
new file mode 100644
index 00000000..7bc830d0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -0,0 +1,528 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// FreeBSD system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import (
+	"unsafe"
+)
+
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [46]int8
+	raw    RawSockaddrDatalink
+}
+
+// Translate "kern.hostname" to []_C_int{0,1,2,3}.
+func nametomib(name string) (mib []_C_int, err error) {
+	const siz = unsafe.Sizeof(mib[0])
+
+	// NOTE(rsc): It seems strange to set the buffer to have
+	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
+	// as the size. I don't know why the +2 is here, but the
+	// kernel uses +2 for its own implementation of this function.
+	// I am scared that if we don't include the +2 here, the kernel
+	// will silently write 2 words farther than we specify
+	// and we'll get memory corruption.
+	var buf [CTL_MAXNAME + 2]_C_int
+	n := uintptr(CTL_MAXNAME) * siz
+
+	p := (*byte)(unsafe.Pointer(&buf[0]))
+	bytes, err := ByteSliceFromString(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// Magic sysctl: "setting" 0.3 to a string name
+	// lets you read back the array of integers form.
+	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
+		return nil, err
+	}
+	return buf[0 : n/siz], nil
+}
+
+//sysnb pipe() (r int, w int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
+	var value IPMreqn
+	vallen := _Socklen(SizeofIPMreqn)
+	errno := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, errno
+}
+
+func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
+}
+
+func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept4(fd, &rsa, &len, flags)
+	if err != nil {
+		return
+	}
+	if len > SizeofSockaddrAny {
+		panic("RawSockaddrAny too small")
+	}
+	sa, err = anyToSockaddr(fd, &rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
+func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	var bufsize uintptr
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+	}
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
+//sys   ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	CapEnter() (err error)
+//sys	capRightsGet(version int, fd int, rightsp *CapRights) (err error) = SYS___CAP_RIGHTS_GET
+//sys	capRightsLimit(fd int, rightsp *CapRights) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exit(code int)
+//sys	ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_POSIX_FADVISE
+//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sys	Getdents(fd int, buf []byte) (n int, err error)
+//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
+//sys	Getdtablesize() (size int)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Issetugid() (tainted bool)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Openat(fdat int, path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Renameat(fromfd int, from string, tofd int, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Setlogin(name string) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, stat *Statfs_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Undelete(path string) (err error)
+//sys	Unlink(path string) (err error)
+//sys	Unlinkat(dirfd int, path string, flags int) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys   munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+//sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+
+/*
+ * Unimplemented
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Ioctl
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Watchevent
+// Waitevent
+// Modwatch
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Poll_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
new file mode 100644
index 00000000..21e03958
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
@@ -0,0 +1,52 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var writtenOut uint64 = 0
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
+
+	written = int(writtenOut)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
new file mode 100644
index 00000000..9c945a65
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
@@ -0,0 +1,52 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var writtenOut uint64 = 0
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
+
+	written = int(writtenOut)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
new file mode 100644
index 00000000..5cd6243f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
@@ -0,0 +1,52 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var writtenOut uint64 = 0
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
+
+	written = int(writtenOut)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go
new file mode 100644
index 00000000..0fec1a82
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go
@@ -0,0 +1,312 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build freebsd
+
+package unix_test
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"runtime"
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+func TestSysctlUint64(t *testing.T) {
+	_, err := unix.SysctlUint64("vm.swap_total")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// FIXME: Infrastructure for launching tests in subprocesses stolen from openbsd_test.go - refactor?
+// testCmd generates a proper command that, when executed, runs the test
+// corresponding to the given key.
+
+type testProc struct {
+	fn      func()                    // should always exit instead of returning
+	arg     func(t *testing.T) string // generate argument for test
+	cleanup func(arg string) error    // for instance, delete coredumps from testing pledge
+	success bool                      // whether zero-exit means success or failure
+}
+
+var (
+	testProcs = map[string]testProc{}
+	procName  = ""
+	procArg   = ""
+)
+
+const (
+	optName = "sys-unix-internal-procname"
+	optArg  = "sys-unix-internal-arg"
+)
+
+func init() {
+	flag.StringVar(&procName, optName, "", "internal use only")
+	flag.StringVar(&procArg, optArg, "", "internal use only")
+
+}
+
+func testCmd(procName string, procArg string) (*exec.Cmd, error) {
+	exe, err := filepath.Abs(os.Args[0])
+	if err != nil {
+		return nil, err
+	}
+	cmd := exec.Command(exe, "-"+optName+"="+procName, "-"+optArg+"="+procArg)
+	cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
+	return cmd, nil
+}
+
+// ExitsCorrectly is a comprehensive, one-line-of-use wrapper for testing
+// a testProc with a key.
+func ExitsCorrectly(t *testing.T, procName string) {
+	s := testProcs[procName]
+	arg := "-"
+	if s.arg != nil {
+		arg = s.arg(t)
+	}
+	c, err := testCmd(procName, arg)
+	defer func(arg string) {
+		if err := s.cleanup(arg); err != nil {
+			t.Fatalf("Failed to run cleanup for %s %s %#v", procName, err, err)
+		}
+	}(arg)
+	if err != nil {
+		t.Fatalf("Failed to construct command for %s", procName)
+	}
+	if (c.Run() == nil) != s.success {
+		result := "succeed"
+		if !s.success {
+			result = "fail"
+		}
+		t.Fatalf("Process did not %s when it was supposed to", result)
+	}
+}
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+	if procName != "" {
+		t := testProcs[procName]
+		t.fn()
+		os.Stderr.WriteString("test function did not exit\n")
+		if t.success {
+			os.Exit(1)
+		} else {
+			os.Exit(0)
+		}
+	}
+	os.Exit(m.Run())
+}
+
+// end of infrastructure
+
+const testfile = "gocapmodetest"
+const testfile2 = testfile + "2"
+
+func CapEnterTest() {
+	_, err := os.OpenFile(path.Join(procArg, testfile), os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		panic(fmt.Sprintf("OpenFile: %s", err))
+	}
+
+	err = unix.CapEnter()
+	if err != nil {
+		panic(fmt.Sprintf("CapEnter: %s", err))
+	}
+
+	_, err = os.OpenFile(path.Join(procArg, testfile2), os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err == nil {
+		panic("OpenFile works!")
+	}
+	if err.(*os.PathError).Err != unix.ECAPMODE {
+		panic(fmt.Sprintf("OpenFile failed wrong: %s %#v", err, err))
+	}
+	os.Exit(0)
+}
+
+func makeTempDir(t *testing.T) string {
+	d, err := ioutil.TempDir("", "go_openat_test")
+	if err != nil {
+		t.Fatalf("TempDir failed: %s", err)
+	}
+	return d
+}
+
+func removeTempDir(arg string) error {
+	err := os.RemoveAll(arg)
+	if err != nil && err.(*os.PathError).Err == unix.ENOENT {
+		return nil
+	}
+	return err
+}
+
+func init() {
+	testProcs["cap_enter"] = testProc{
+		CapEnterTest,
+		makeTempDir,
+		removeTempDir,
+		true,
+	}
+}
+
+func TestCapEnter(t *testing.T) {
+	if runtime.GOARCH != "amd64" {
+		t.Skipf("skipping test on %s", runtime.GOARCH)
+	}
+	ExitsCorrectly(t, "cap_enter")
+}
+
+func OpenatTest() {
+	f, err := os.Open(procArg)
+	if err != nil {
+		panic(err)
+	}
+
+	err = unix.CapEnter()
+	if err != nil {
+		panic(fmt.Sprintf("CapEnter: %s", err))
+	}
+
+	fxx, err := unix.Openat(int(f.Fd()), "xx", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		panic(err)
+	}
+	unix.Close(fxx)
+
+	// The right to open BASE/xx is not ambient
+	_, err = os.OpenFile(procArg+"/xx", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err == nil {
+		panic("OpenFile succeeded")
+	}
+	if err.(*os.PathError).Err != unix.ECAPMODE {
+		panic(fmt.Sprintf("OpenFile failed wrong: %s %#v", err, err))
+	}
+
+	// Can't make a new directory either
+	err = os.Mkdir(procArg+"2", 0777)
+	if err == nil {
+		panic("MKdir succeeded")
+	}
+	if err.(*os.PathError).Err != unix.ECAPMODE {
+		panic(fmt.Sprintf("Mkdir failed wrong: %s %#v", err, err))
+	}
+
+	// Remove all caps except read and lookup.
+	r, err := unix.CapRightsInit([]uint64{unix.CAP_READ, unix.CAP_LOOKUP})
+	if err != nil {
+		panic(fmt.Sprintf("CapRightsInit failed: %s %#v", err, err))
+	}
+	err = unix.CapRightsLimit(f.Fd(), r)
+	if err != nil {
+		panic(fmt.Sprintf("CapRightsLimit failed: %s %#v", err, err))
+	}
+
+	// Check we can get the rights back again
+	r, err = unix.CapRightsGet(f.Fd())
+	if err != nil {
+		panic(fmt.Sprintf("CapRightsGet failed: %s %#v", err, err))
+	}
+	b, err := unix.CapRightsIsSet(r, []uint64{unix.CAP_READ, unix.CAP_LOOKUP})
+	if err != nil {
+		panic(fmt.Sprintf("CapRightsIsSet failed: %s %#v", err, err))
+	}
+	if !b {
+		panic(fmt.Sprintf("Unexpected rights"))
+	}
+	b, err = unix.CapRightsIsSet(r, []uint64{unix.CAP_READ, unix.CAP_LOOKUP, unix.CAP_WRITE})
+	if err != nil {
+		panic(fmt.Sprintf("CapRightsIsSet failed: %s %#v", err, err))
+	}
+	if b {
+		panic(fmt.Sprintf("Unexpected rights (2)"))
+	}
+
+	// Can no longer create a file
+	_, err = unix.Openat(int(f.Fd()), "xx2", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err == nil {
+		panic("Openat succeeded")
+	}
+	if err != unix.ENOTCAPABLE {
+		panic(fmt.Sprintf("OpenFileAt failed wrong: %s %#v", err, err))
+	}
+
+	// But can read an existing one
+	_, err = unix.Openat(int(f.Fd()), "xx", os.O_RDONLY, 0666)
+	if err != nil {
+		panic(fmt.Sprintf("Openat failed: %s %#v", err, err))
+	}
+
+	os.Exit(0)
+}
+
+func init() {
+	testProcs["openat"] = testProc{
+		OpenatTest,
+		makeTempDir,
+		removeTempDir,
+		true,
+	}
+}
+
+func TestOpenat(t *testing.T) {
+	if runtime.GOARCH != "amd64" {
+		t.Skipf("skipping test on %s", runtime.GOARCH)
+	}
+	ExitsCorrectly(t, "openat")
+}
+
+func TestCapRightsSetAndClear(t *testing.T) {
+	r, err := unix.CapRightsInit([]uint64{unix.CAP_READ, unix.CAP_WRITE, unix.CAP_PDWAIT})
+	if err != nil {
+		t.Fatalf("CapRightsInit failed: %s", err)
+	}
+
+	err = unix.CapRightsSet(r, []uint64{unix.CAP_EVENT, unix.CAP_LISTEN})
+	if err != nil {
+		t.Fatalf("CapRightsSet failed: %s", err)
+	}
+
+	b, err := unix.CapRightsIsSet(r, []uint64{unix.CAP_READ, unix.CAP_WRITE, unix.CAP_PDWAIT, unix.CAP_EVENT, unix.CAP_LISTEN})
+	if err != nil {
+		t.Fatalf("CapRightsIsSet failed: %s", err)
+	}
+	if !b {
+		t.Fatalf("Wrong rights set")
+	}
+
+	err = unix.CapRightsClear(r, []uint64{unix.CAP_READ, unix.CAP_PDWAIT})
+	if err != nil {
+		t.Fatalf("CapRightsClear failed: %s", err)
+	}
+
+	b, err = unix.CapRightsIsSet(r, []uint64{unix.CAP_WRITE, unix.CAP_EVENT, unix.CAP_LISTEN})
+	if err != nil {
+		t.Fatalf("CapRightsIsSet failed: %s", err)
+	}
+	if !b {
+		t.Fatalf("Wrong rights set")
+	}
+}
+
+// stringsFromByteSlice converts a sequence of attributes to a []string.
+// On FreeBSD, each entry consists of a single byte containing the length
+// of the attribute name, followed by the attribute name.
+// The name is _not_ NULL-terminated.
+func stringsFromByteSlice(buf []byte) []string {
+	var result []string
+	i := 0
+	for i < len(buf) {
+		next := i + 1 + int(buf[i])
+		result = append(result, string(buf[i+1:next]))
+		i = next
+	}
+	return result
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
new file mode 100644
index 00000000..eb633540
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -0,0 +1,1600 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Linux system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and
+// wrap it in our own nicer implementation.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+/*
+ * Wrapped
+ */
+
+func Access(path string, mode uint32) (err error) {
+	return Faccessat(AT_FDCWD, path, mode, 0)
+}
+
+func Chmod(path string, mode uint32) (err error) {
+	return Fchmodat(AT_FDCWD, path, mode, 0)
+}
+
+func Chown(path string, uid int, gid int) (err error) {
+	return Fchownat(AT_FDCWD, path, uid, gid, 0)
+}
+
+func Creat(path string, mode uint32) (fd int, err error) {
+	return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode)
+}
+
+//sys	fchmodat(dirfd int, path string, mode uint32) (err error)
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	// Linux fchmodat doesn't support the flags parameter. Mimick glibc's behavior
+	// and check the flags. Otherwise the mode would be applied to the symlink
+	// destination which is not what the user expects.
+	if flags&^AT_SYMLINK_NOFOLLOW != 0 {
+		return EINVAL
+	} else if flags&AT_SYMLINK_NOFOLLOW != 0 {
+		return EOPNOTSUPP
+	}
+	return fchmodat(dirfd, path, mode)
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+//sys	Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error)
+
+func Link(oldpath string, newpath string) (err error) {
+	return Linkat(AT_FDCWD, oldpath, AT_FDCWD, newpath, 0)
+}
+
+func Mkdir(path string, mode uint32) (err error) {
+	return Mkdirat(AT_FDCWD, path, mode)
+}
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	return Mknodat(AT_FDCWD, path, mode, dev)
+}
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	return openat(AT_FDCWD, path, mode|O_LARGEFILE, perm)
+}
+
+//sys	openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
+
+func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	return openat(dirfd, path, flags|O_LARGEFILE, mode)
+}
+
+//sys	ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error)
+
+func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	if len(fds) == 0 {
+		return ppoll(nil, 0, timeout, sigmask)
+	}
+	return ppoll(&fds[0], len(fds), timeout, sigmask)
+}
+
+//sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	return Readlinkat(AT_FDCWD, path, buf)
+}
+
+func Rename(oldpath string, newpath string) (err error) {
+	return Renameat(AT_FDCWD, oldpath, AT_FDCWD, newpath)
+}
+
+func Rmdir(path string) error {
+	return Unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
+}
+
+//sys	Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
+
+func Symlink(oldpath string, newpath string) (err error) {
+	return Symlinkat(oldpath, AT_FDCWD, newpath)
+}
+
+func Unlink(path string) error {
+	return Unlinkat(AT_FDCWD, path, 0)
+}
+
+//sys	Unlinkat(dirfd int, path string, flags int) (err error)
+
+func Utimes(path string, tv []Timeval) error {
+	if tv == nil {
+		err := utimensat(AT_FDCWD, path, nil, 0)
+		if err != ENOSYS {
+			return err
+		}
+		return utimes(path, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	var ts [2]Timespec
+	ts[0] = NsecToTimespec(TimevalToNsec(tv[0]))
+	ts[1] = NsecToTimespec(TimevalToNsec(tv[1]))
+	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	if err != ENOSYS {
+		return err
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+
+func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		err := utimensat(AT_FDCWD, path, nil, 0)
+		if err != ENOSYS {
+			return err
+		}
+		return utimes(path, nil)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	if err != ENOSYS {
+		return err
+	}
+	// If the utimensat syscall isn't available (utimensat was added to Linux
+	// in 2.6.22, Released, 8 July 2007) then fall back to utimes
+	var tv [2]Timeval
+	for i := 0; i < 2; i++ {
+		tv[i] = NsecToTimeval(TimespecToNsec(ts[i]))
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
+	if ts == nil {
+		return utimensat(dirfd, path, nil, flags)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
+}
+
+func Futimesat(dirfd int, path string, tv []Timeval) error {
+	if tv == nil {
+		return futimesat(dirfd, path, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimesat(dirfd, path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func Futimes(fd int, tv []Timeval) (err error) {
+	// Believe it or not, this is the best we can do on Linux
+	// (and is what glibc does).
+	return Utimes("/proc/self/fd/"+itoa(fd), tv)
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error)
+
+func Getwd() (wd string, err error) {
+	var buf [PathMax]byte
+	n, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	// Getcwd returns the number of bytes written to buf, including the NUL.
+	if n < 1 || n > len(buf) || buf[n-1] != 0 {
+		return "", EINVAL
+	}
+	return string(buf[0 : n-1]), nil
+}
+
+func Getgroups() (gids []int, err error) {
+	n, err := getgroups(0, nil)
+	if err != nil {
+		return nil, err
+	}
+	if n == 0 {
+		return nil, nil
+	}
+
+	// Sanity check group count. Max is 1<<16 on Linux.
+	if n < 0 || n > 1<<20 {
+		return nil, EINVAL
+	}
+
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
+	if err != nil {
+		return nil, err
+	}
+	gids = make([]int, n)
+	for i, v := range a[0:n] {
+		gids[i] = int(v)
+	}
+	return
+}
+
+func Setgroups(gids []int) (err error) {
+	if len(gids) == 0 {
+		return setgroups(0, nil)
+	}
+
+	a := make([]_Gid_t, len(gids))
+	for i, v := range gids {
+		a[i] = _Gid_t(v)
+	}
+	return setgroups(len(a), &a[0])
+}
+
+type WaitStatus uint32
+
+// Wait status is 7 bits at bottom, either 0 (exited),
+// 0x7F (stopped), or a signal number that caused an exit.
+// The 0x80 bit is whether there was a core dump.
+// An extra number (exit code, signal causing a stop)
+// is in the high bits. At least that's the idea.
+// There are various irregularities. For example, the
+// "continued" status is 0xFFFF, distinguishing itself
+// from stopped via the core dump bit.
+
+const (
+	mask    = 0x7F
+	core    = 0x80
+	exited  = 0x00
+	stopped = 0x7F
+	shift   = 8
+)
+
+func (w WaitStatus) Exited() bool { return w&mask == exited }
+
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != exited }
+
+func (w WaitStatus) Stopped() bool { return w&0xFF == stopped }
+
+func (w WaitStatus) Continued() bool { return w == 0xFFFF }
+
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
+
+func (w WaitStatus) ExitStatus() int {
+	if !w.Exited() {
+		return -1
+	}
+	return int(w>>shift) & 0xFF
+}
+
+func (w WaitStatus) Signal() syscall.Signal {
+	if !w.Signaled() {
+		return -1
+	}
+	return syscall.Signal(w & mask)
+}
+
+func (w WaitStatus) StopSignal() syscall.Signal {
+	if !w.Stopped() {
+		return -1
+	}
+	return syscall.Signal(w>>shift) & 0xFF
+}
+
+func (w WaitStatus) TrapCause() int {
+	if w.StopSignal() != SIGTRAP {
+		return -1
+	}
+	return int(w>>shift) >> 8
+}
+
+//sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error)
+
+func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
+	var status _C_int
+	wpid, err = wait4(pid, &status, options, rusage)
+	if wstatus != nil {
+		*wstatus = WaitStatus(status)
+	}
+	return
+}
+
+func Mkfifo(path string, mode uint32) error {
+	return Mknod(path, mode|S_IFIFO, 0)
+}
+
+func Mkfifoat(dirfd int, path string, mode uint32) error {
+	return Mknodat(dirfd, path, mode|S_IFIFO, 0)
+}
+
+func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
+}
+
+func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	sa.raw.Scope_id = sa.ZoneId
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
+}
+
+func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	name := sa.Name
+	n := len(name)
+	if n >= len(sa.raw.Path) {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_UNIX
+	for i := 0; i < n; i++ {
+		sa.raw.Path[i] = int8(name[i])
+	}
+	// length is family (uint16), name, NUL.
+	sl := _Socklen(2)
+	if n > 0 {
+		sl += _Socklen(n) + 1
+	}
+	if sa.raw.Path[0] == '@' {
+		sa.raw.Path[0] = 0
+		// Don't count trailing NUL for abstract address.
+		sl--
+	}
+
+	return unsafe.Pointer(&sa.raw), sl, nil
+}
+
+// SockaddrLinklayer implements the Sockaddr interface for AF_PACKET type sockets.
+type SockaddrLinklayer struct {
+	Protocol uint16
+	Ifindex  int
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]byte
+	raw      RawSockaddrLinklayer
+}
+
+func (sa *SockaddrLinklayer) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Ifindex < 0 || sa.Ifindex > 0x7fffffff {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_PACKET
+	sa.raw.Protocol = sa.Protocol
+	sa.raw.Ifindex = int32(sa.Ifindex)
+	sa.raw.Hatype = sa.Hatype
+	sa.raw.Pkttype = sa.Pkttype
+	sa.raw.Halen = sa.Halen
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrLinklayer, nil
+}
+
+// SockaddrNetlink implements the Sockaddr interface for AF_NETLINK type sockets.
+type SockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+	raw    RawSockaddrNetlink
+}
+
+func (sa *SockaddrNetlink) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_NETLINK
+	sa.raw.Pad = sa.Pad
+	sa.raw.Pid = sa.Pid
+	sa.raw.Groups = sa.Groups
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrNetlink, nil
+}
+
+// SockaddrHCI implements the Sockaddr interface for AF_BLUETOOTH type sockets
+// using the HCI protocol.
+type SockaddrHCI struct {
+	Dev     uint16
+	Channel uint16
+	raw     RawSockaddrHCI
+}
+
+func (sa *SockaddrHCI) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_BLUETOOTH
+	sa.raw.Dev = sa.Dev
+	sa.raw.Channel = sa.Channel
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrHCI, nil
+}
+
+// SockaddrL2 implements the Sockaddr interface for AF_BLUETOOTH type sockets
+// using the L2CAP protocol.
+type SockaddrL2 struct {
+	PSM      uint16
+	CID      uint16
+	Addr     [6]uint8
+	AddrType uint8
+	raw      RawSockaddrL2
+}
+
+func (sa *SockaddrL2) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_BLUETOOTH
+	psm := (*[2]byte)(unsafe.Pointer(&sa.raw.Psm))
+	psm[0] = byte(sa.PSM)
+	psm[1] = byte(sa.PSM >> 8)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Bdaddr[i] = sa.Addr[len(sa.Addr)-1-i]
+	}
+	cid := (*[2]byte)(unsafe.Pointer(&sa.raw.Cid))
+	cid[0] = byte(sa.CID)
+	cid[1] = byte(sa.CID >> 8)
+	sa.raw.Bdaddr_type = sa.AddrType
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrL2, nil
+}
+
+// SockaddrRFCOMM implements the Sockaddr interface for AF_BLUETOOTH type sockets
+// using the RFCOMM protocol.
+//
+// Server example:
+//
+//      fd, _ := Socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)
+//      _ = unix.Bind(fd, &unix.SockaddrRFCOMM{
+//      	Channel: 1,
+//      	Addr:    [6]uint8{0, 0, 0, 0, 0, 0}, // BDADDR_ANY or 00:00:00:00:00:00
+//      })
+//      _ = Listen(fd, 1)
+//      nfd, sa, _ := Accept(fd)
+//      fmt.Printf("conn addr=%v fd=%d", sa.(*unix.SockaddrRFCOMM).Addr, nfd)
+//      Read(nfd, buf)
+//
+// Client example:
+//
+//      fd, _ := Socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)
+//      _ = Connect(fd, &SockaddrRFCOMM{
+//      	Channel: 1,
+//      	Addr:    [6]byte{0x11, 0x22, 0x33, 0xaa, 0xbb, 0xcc}, // CC:BB:AA:33:22:11
+//      })
+//      Write(fd, []byte(`hello`))
+type SockaddrRFCOMM struct {
+	// Addr represents a bluetooth address, byte ordering is little-endian.
+	Addr [6]uint8
+
+	// Channel is a designated bluetooth channel, only 1-30 are available for use.
+	// Since Linux 2.6.7 and further zero value is the first available channel.
+	Channel uint8
+
+	raw RawSockaddrRFCOMM
+}
+
+func (sa *SockaddrRFCOMM) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_BLUETOOTH
+	sa.raw.Channel = sa.Channel
+	sa.raw.Bdaddr = sa.Addr
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrRFCOMM, nil
+}
+
+// SockaddrCAN implements the Sockaddr interface for AF_CAN type sockets.
+// The RxID and TxID fields are used for transport protocol addressing in
+// (CAN_TP16, CAN_TP20, CAN_MCNET, and CAN_ISOTP), they can be left with
+// zero values for CAN_RAW and CAN_BCM sockets as they have no meaning.
+//
+// The SockaddrCAN struct must be bound to the socket file descriptor
+// using Bind before the CAN socket can be used.
+//
+//      // Read one raw CAN frame
+//      fd, _ := Socket(AF_CAN, SOCK_RAW, CAN_RAW)
+//      addr := &SockaddrCAN{Ifindex: index}
+//      Bind(fd, addr)
+//      frame := make([]byte, 16)
+//      Read(fd, frame)
+//
+// The full SocketCAN documentation can be found in the linux kernel
+// archives at: https://www.kernel.org/doc/Documentation/networking/can.txt
+type SockaddrCAN struct {
+	Ifindex int
+	RxID    uint32
+	TxID    uint32
+	raw     RawSockaddrCAN
+}
+
+func (sa *SockaddrCAN) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Ifindex < 0 || sa.Ifindex > 0x7fffffff {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_CAN
+	sa.raw.Ifindex = int32(sa.Ifindex)
+	rx := (*[4]byte)(unsafe.Pointer(&sa.RxID))
+	for i := 0; i < 4; i++ {
+		sa.raw.Addr[i] = rx[i]
+	}
+	tx := (*[4]byte)(unsafe.Pointer(&sa.TxID))
+	for i := 0; i < 4; i++ {
+		sa.raw.Addr[i+4] = tx[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrCAN, nil
+}
+
+// SockaddrALG implements the Sockaddr interface for AF_ALG type sockets.
+// SockaddrALG enables userspace access to the Linux kernel's cryptography
+// subsystem. The Type and Name fields specify which type of hash or cipher
+// should be used with a given socket.
+//
+// To create a file descriptor that provides access to a hash or cipher, both
+// Bind and Accept must be used. Once the setup process is complete, input
+// data can be written to the socket, processed by the kernel, and then read
+// back as hash output or ciphertext.
+//
+// Here is an example of using an AF_ALG socket with SHA1 hashing.
+// The initial socket setup process is as follows:
+//
+//      // Open a socket to perform SHA1 hashing.
+//      fd, _ := unix.Socket(unix.AF_ALG, unix.SOCK_SEQPACKET, 0)
+//      addr := &unix.SockaddrALG{Type: "hash", Name: "sha1"}
+//      unix.Bind(fd, addr)
+//      // Note: unix.Accept does not work at this time; must invoke accept()
+//      // manually using unix.Syscall.
+//      hashfd, _, _ := unix.Syscall(unix.SYS_ACCEPT, uintptr(fd), 0, 0)
+//
+// Once a file descriptor has been returned from Accept, it may be used to
+// perform SHA1 hashing. The descriptor is not safe for concurrent use, but
+// may be re-used repeatedly with subsequent Write and Read operations.
+//
+// When hashing a small byte slice or string, a single Write and Read may
+// be used:
+//
+//      // Assume hashfd is already configured using the setup process.
+//      hash := os.NewFile(hashfd, "sha1")
+//      // Hash an input string and read the results. Each Write discards
+//      // previous hash state. Read always reads the current state.
+//      b := make([]byte, 20)
+//      for i := 0; i < 2; i++ {
+//          io.WriteString(hash, "Hello, world.")
+//          hash.Read(b)
+//          fmt.Println(hex.EncodeToString(b))
+//      }
+//      // Output:
+//      // 2ae01472317d1935a84797ec1983ae243fc6aa28
+//      // 2ae01472317d1935a84797ec1983ae243fc6aa28
+//
+// For hashing larger byte slices, or byte streams such as those read from
+// a file or socket, use Sendto with MSG_MORE to instruct the kernel to update
+// the hash digest instead of creating a new one for a given chunk and finalizing it.
+//
+//      // Assume hashfd and addr are already configured using the setup process.
+//      hash := os.NewFile(hashfd, "sha1")
+//      // Hash the contents of a file.
+//      f, _ := os.Open("/tmp/linux-4.10-rc7.tar.xz")
+//      b := make([]byte, 4096)
+//      for {
+//          n, err := f.Read(b)
+//          if err == io.EOF {
+//              break
+//          }
+//          unix.Sendto(hashfd, b[:n], unix.MSG_MORE, addr)
+//      }
+//      hash.Read(b)
+//      fmt.Println(hex.EncodeToString(b))
+//      // Output: 85cdcad0c06eef66f805ecce353bec9accbeecc5
+//
+// For more information, see: http://www.chronox.de/crypto-API/crypto/userspace-if.html.
+type SockaddrALG struct {
+	Type    string
+	Name    string
+	Feature uint32
+	Mask    uint32
+	raw     RawSockaddrALG
+}
+
+func (sa *SockaddrALG) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	// Leave room for NUL byte terminator.
+	if len(sa.Type) > 13 {
+		return nil, 0, EINVAL
+	}
+	if len(sa.Name) > 63 {
+		return nil, 0, EINVAL
+	}
+
+	sa.raw.Family = AF_ALG
+	sa.raw.Feat = sa.Feature
+	sa.raw.Mask = sa.Mask
+
+	typ, err := ByteSliceFromString(sa.Type)
+	if err != nil {
+		return nil, 0, err
+	}
+	name, err := ByteSliceFromString(sa.Name)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	copy(sa.raw.Type[:], typ)
+	copy(sa.raw.Name[:], name)
+
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrALG, nil
+}
+
+// SockaddrVM implements the Sockaddr interface for AF_VSOCK type sockets.
+// SockaddrVM provides access to Linux VM sockets: a mechanism that enables
+// bidirectional communication between a hypervisor and its guest virtual
+// machines.
+type SockaddrVM struct {
+	// CID and Port specify a context ID and port address for a VM socket.
+	// Guests have a unique CID, and hosts may have a well-known CID of:
+	//  - VMADDR_CID_HYPERVISOR: refers to the hypervisor process.
+	//  - VMADDR_CID_HOST: refers to other processes on the host.
+	CID  uint32
+	Port uint32
+	raw  RawSockaddrVM
+}
+
+func (sa *SockaddrVM) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_VSOCK
+	sa.raw.Port = sa.Port
+	sa.raw.Cid = sa.CID
+
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrVM, nil
+}
+
+func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
+	switch rsa.Addr.Family {
+	case AF_NETLINK:
+		pp := (*RawSockaddrNetlink)(unsafe.Pointer(rsa))
+		sa := new(SockaddrNetlink)
+		sa.Family = pp.Family
+		sa.Pad = pp.Pad
+		sa.Pid = pp.Pid
+		sa.Groups = pp.Groups
+		return sa, nil
+
+	case AF_PACKET:
+		pp := (*RawSockaddrLinklayer)(unsafe.Pointer(rsa))
+		sa := new(SockaddrLinklayer)
+		sa.Protocol = pp.Protocol
+		sa.Ifindex = int(pp.Ifindex)
+		sa.Hatype = pp.Hatype
+		sa.Pkttype = pp.Pkttype
+		sa.Halen = pp.Halen
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_UNIX:
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
+		sa := new(SockaddrUnix)
+		if pp.Path[0] == 0 {
+			// "Abstract" Unix domain socket.
+			// Rewrite leading NUL as @ for textual display.
+			// (This is the standard convention.)
+			// Not friendly to overwrite in place,
+			// but the callers below don't care.
+			pp.Path[0] = '@'
+		}
+
+		// Assume path ends at NUL.
+		// This is not technically the Linux semantics for
+		// abstract Unix domain sockets--they are supposed
+		// to be uninterpreted fixed-size binary blobs--but
+		// everyone uses this convention.
+		n := 0
+		for n < len(pp.Path) && pp.Path[n] != 0 {
+			n++
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
+		return sa, nil
+
+	case AF_INET:
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_INET6:
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		sa.ZoneId = pp.Scope_id
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_VSOCK:
+		pp := (*RawSockaddrVM)(unsafe.Pointer(rsa))
+		sa := &SockaddrVM{
+			CID:  pp.Cid,
+			Port: pp.Port,
+		}
+		return sa, nil
+	case AF_BLUETOOTH:
+		proto, err := GetsockoptInt(fd, SOL_SOCKET, SO_PROTOCOL)
+		if err != nil {
+			return nil, err
+		}
+		// only BTPROTO_L2CAP and BTPROTO_RFCOMM can accept connections
+		switch proto {
+		case BTPROTO_L2CAP:
+			pp := (*RawSockaddrL2)(unsafe.Pointer(rsa))
+			sa := &SockaddrL2{
+				PSM:      pp.Psm,
+				CID:      pp.Cid,
+				Addr:     pp.Bdaddr,
+				AddrType: pp.Bdaddr_type,
+			}
+			return sa, nil
+		case BTPROTO_RFCOMM:
+			pp := (*RawSockaddrRFCOMM)(unsafe.Pointer(rsa))
+			sa := &SockaddrRFCOMM{
+				Channel: pp.Channel,
+				Addr:    pp.Bdaddr,
+			}
+			return sa, nil
+		}
+	}
+	return nil, EAFNOSUPPORT
+}
+
+func Accept(fd int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept(fd, &rsa, &len)
+	if err != nil {
+		return
+	}
+	sa, err = anyToSockaddr(fd, &rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept4(fd, &rsa, &len, flags)
+	if err != nil {
+		return
+	}
+	if len > SizeofSockaddrAny {
+		panic("RawSockaddrAny too small")
+	}
+	sa, err = anyToSockaddr(fd, &rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+func Getsockname(fd int) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if err = getsockname(fd, &rsa, &len); err != nil {
+		return
+	}
+	return anyToSockaddr(fd, &rsa)
+}
+
+func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
+	var value IPMreqn
+	vallen := _Socklen(SizeofIPMreqn)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptUcred(fd, level, opt int) (*Ucred, error) {
+	var value Ucred
+	vallen := _Socklen(SizeofUcred)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptTCPInfo(fd, level, opt int) (*TCPInfo, error) {
+	var value TCPInfo
+	vallen := _Socklen(SizeofTCPInfo)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+	buf := make([]byte, 256)
+	vallen := _Socklen(len(buf))
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+	if err != nil {
+		if err == ERANGE {
+			buf = make([]byte, vallen)
+			err = getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+		}
+		if err != nil {
+			return "", err
+		}
+	}
+	return string(buf[:vallen-1]), nil
+}
+
+func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
+}
+
+// Keyctl Commands (http://man7.org/linux/man-pages/man2/keyctl.2.html)
+
+// KeyctlInt calls keyctl commands in which each argument is an int.
+// These commands are KEYCTL_REVOKE, KEYCTL_CHOWN, KEYCTL_CLEAR, KEYCTL_LINK,
+// KEYCTL_UNLINK, KEYCTL_NEGATE, KEYCTL_SET_REQKEY_KEYRING, KEYCTL_SET_TIMEOUT,
+// KEYCTL_ASSUME_AUTHORITY, KEYCTL_SESSION_TO_PARENT, KEYCTL_REJECT,
+// KEYCTL_INVALIDATE, and KEYCTL_GET_PERSISTENT.
+//sys	KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlBuffer calls keyctl commands in which the third and fourth
+// arguments are a buffer and its length, respectively.
+// These commands are KEYCTL_UPDATE, KEYCTL_READ, and KEYCTL_INSTANTIATE.
+//sys	KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlString calls keyctl commands which return a string.
+// These commands are KEYCTL_DESCRIBE and KEYCTL_GET_SECURITY.
+func KeyctlString(cmd int, id int) (string, error) {
+	// We must loop as the string data may change in between the syscalls.
+	// We could allocate a large buffer here to reduce the chance that the
+	// syscall needs to be called twice; however, this is unnecessary as
+	// the performance loss is negligible.
+	var buffer []byte
+	for {
+		// Try to fill the buffer with data
+		length, err := KeyctlBuffer(cmd, id, buffer, 0)
+		if err != nil {
+			return "", err
+		}
+
+		// Check if the data was written
+		if length <= len(buffer) {
+			// Exclude the null terminator
+			return string(buffer[:length-1]), nil
+		}
+
+		// Make a bigger buffer if needed
+		buffer = make([]byte, length)
+	}
+}
+
+// Keyctl commands with special signatures.
+
+// KeyctlGetKeyringID implements the KEYCTL_GET_KEYRING_ID command.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_get_keyring_ID.3.html
+func KeyctlGetKeyringID(id int, create bool) (ringid int, err error) {
+	createInt := 0
+	if create {
+		createInt = 1
+	}
+	return KeyctlInt(KEYCTL_GET_KEYRING_ID, id, createInt, 0, 0)
+}
+
+// KeyctlSetperm implements the KEYCTL_SETPERM command. The perm value is the
+// key handle permission mask as described in the "keyctl setperm" section of
+// http://man7.org/linux/man-pages/man1/keyctl.1.html.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_setperm.3.html
+func KeyctlSetperm(id int, perm uint32) error {
+	_, err := KeyctlInt(KEYCTL_SETPERM, id, int(perm), 0, 0)
+	return err
+}
+
+//sys	keyctlJoin(cmd int, arg2 string) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlJoinSessionKeyring implements the KEYCTL_JOIN_SESSION_KEYRING command.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_join_session_keyring.3.html
+func KeyctlJoinSessionKeyring(name string) (ringid int, err error) {
+	return keyctlJoin(KEYCTL_JOIN_SESSION_KEYRING, name)
+}
+
+//sys	keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlSearch implements the KEYCTL_SEARCH command.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_search.3.html
+func KeyctlSearch(ringid int, keyType, description string, destRingid int) (id int, err error) {
+	return keyctlSearch(KEYCTL_SEARCH, ringid, keyType, description, destRingid)
+}
+
+//sys	keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) = SYS_KEYCTL
+
+// KeyctlInstantiateIOV implements the KEYCTL_INSTANTIATE_IOV command. This
+// command is similar to KEYCTL_INSTANTIATE, except that the payload is a slice
+// of Iovec (each of which represents a buffer) instead of a single buffer.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_instantiate_iov.3.html
+func KeyctlInstantiateIOV(id int, payload []Iovec, ringid int) error {
+	return keyctlIOV(KEYCTL_INSTANTIATE_IOV, id, payload, ringid)
+}
+
+//sys	keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlDHCompute implements the KEYCTL_DH_COMPUTE command. This command
+// computes a Diffie-Hellman shared secret based on the provide params. The
+// secret is written to the provided buffer and the returned size is the number
+// of bytes written (returning an error if there is insufficient space in the
+// buffer). If a nil buffer is passed in, this function returns the minimum
+// buffer length needed to store the appropriate data. Note that this differs
+// from KEYCTL_READ's behavior which always returns the requested payload size.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_dh_compute.3.html
+func KeyctlDHCompute(params *KeyctlDHParams, buffer []byte) (size int, err error) {
+	return keyctlDH(KEYCTL_DH_COMPUTE, params, buffer)
+}
+
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
+	var msg Msghdr
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
+	msg.Namelen = uint32(SizeofSockaddrAny)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = &p[0]
+		iov.SetLen(len(p))
+	}
+	var dummy byte
+	if len(oob) > 0 {
+		if len(p) == 0 {
+			var sockType int
+			sockType, err = GetsockoptInt(fd, SOL_SOCKET, SO_TYPE)
+			if err != nil {
+				return
+			}
+			// receive at least one normal byte
+			if sockType != SOCK_DGRAM {
+				iov.Base = &dummy
+				iov.SetLen(1)
+			}
+		}
+		msg.Control = &oob[0]
+		msg.SetControllen(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = recvmsg(fd, &msg, flags); err != nil {
+		return
+	}
+	oobn = int(msg.Controllen)
+	recvflags = int(msg.Flags)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(fd, &rsa)
+	}
+	return
+}
+
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
+	return
+}
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		var err error
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
+	var msg Msghdr
+	msg.Name = (*byte)(ptr)
+	msg.Namelen = uint32(salen)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = &p[0]
+		iov.SetLen(len(p))
+	}
+	var dummy byte
+	if len(oob) > 0 {
+		if len(p) == 0 {
+			var sockType int
+			sockType, err = GetsockoptInt(fd, SOL_SOCKET, SO_TYPE)
+			if err != nil {
+				return 0, err
+			}
+			// send at least one normal byte
+			if sockType != SOCK_DGRAM {
+				iov.Base = &dummy
+				iov.SetLen(1)
+			}
+		}
+		msg.Control = &oob[0]
+		msg.SetControllen(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = sendmsg(fd, &msg, flags); err != nil {
+		return 0, err
+	}
+	if len(oob) > 0 && len(p) == 0 {
+		n = 0
+	}
+	return n, nil
+}
+
+// BindToDevice binds the socket associated with fd to device.
+func BindToDevice(fd int, device string) (err error) {
+	return SetsockoptString(fd, SOL_SOCKET, SO_BINDTODEVICE, device)
+}
+
+//sys	ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
+
+func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err error) {
+	// The peek requests are machine-size oriented, so we wrap it
+	// to retrieve arbitrary-length data.
+
+	// The ptrace syscall differs from glibc's ptrace.
+	// Peeks returns the word in *data, not as the return value.
+
+	var buf [sizeofPtr]byte
+
+	// Leading edge. PEEKTEXT/PEEKDATA don't require aligned
+	// access (PEEKUSER warns that it might), but if we don't
+	// align our reads, we might straddle an unmapped page
+	// boundary and not get the bytes leading up to the page
+	// boundary.
+	n := 0
+	if addr%sizeofPtr != 0 {
+		err = ptrace(req, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
+		if err != nil {
+			return 0, err
+		}
+		n += copy(out, buf[addr%sizeofPtr:])
+		out = out[n:]
+	}
+
+	// Remainder.
+	for len(out) > 0 {
+		// We use an internal buffer to guarantee alignment.
+		// It's not documented if this is necessary, but we're paranoid.
+		err = ptrace(req, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
+		if err != nil {
+			return n, err
+		}
+		copied := copy(out, buf[0:])
+		n += copied
+		out = out[copied:]
+	}
+
+	return n, nil
+}
+
+func PtracePeekText(pid int, addr uintptr, out []byte) (count int, err error) {
+	return ptracePeek(PTRACE_PEEKTEXT, pid, addr, out)
+}
+
+func PtracePeekData(pid int, addr uintptr, out []byte) (count int, err error) {
+	return ptracePeek(PTRACE_PEEKDATA, pid, addr, out)
+}
+
+func PtracePeekUser(pid int, addr uintptr, out []byte) (count int, err error) {
+	return ptracePeek(PTRACE_PEEKUSR, pid, addr, out)
+}
+
+func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (count int, err error) {
+	// As for ptracePeek, we need to align our accesses to deal
+	// with the possibility of straddling an invalid page.
+
+	// Leading edge.
+	n := 0
+	if addr%sizeofPtr != 0 {
+		var buf [sizeofPtr]byte
+		err = ptrace(peekReq, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
+		if err != nil {
+			return 0, err
+		}
+		n += copy(buf[addr%sizeofPtr:], data)
+		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
+		err = ptrace(pokeReq, pid, addr-addr%sizeofPtr, word)
+		if err != nil {
+			return 0, err
+		}
+		data = data[n:]
+	}
+
+	// Interior.
+	for len(data) > sizeofPtr {
+		word := *((*uintptr)(unsafe.Pointer(&data[0])))
+		err = ptrace(pokeReq, pid, addr+uintptr(n), word)
+		if err != nil {
+			return n, err
+		}
+		n += sizeofPtr
+		data = data[sizeofPtr:]
+	}
+
+	// Trailing edge.
+	if len(data) > 0 {
+		var buf [sizeofPtr]byte
+		err = ptrace(peekReq, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
+		if err != nil {
+			return n, err
+		}
+		copy(buf[0:], data)
+		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
+		err = ptrace(pokeReq, pid, addr+uintptr(n), word)
+		if err != nil {
+			return n, err
+		}
+		n += len(data)
+	}
+
+	return n, nil
+}
+
+func PtracePokeText(pid int, addr uintptr, data []byte) (count int, err error) {
+	return ptracePoke(PTRACE_POKETEXT, PTRACE_PEEKTEXT, pid, addr, data)
+}
+
+func PtracePokeData(pid int, addr uintptr, data []byte) (count int, err error) {
+	return ptracePoke(PTRACE_POKEDATA, PTRACE_PEEKDATA, pid, addr, data)
+}
+
+func PtracePokeUser(pid int, addr uintptr, data []byte) (count int, err error) {
+	return ptracePoke(PTRACE_POKEUSR, PTRACE_PEEKUSR, pid, addr, data)
+}
+
+func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+func PtraceSetRegs(pid int, regs *PtraceRegs) (err error) {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+func PtraceSetOptions(pid int, options int) (err error) {
+	return ptrace(PTRACE_SETOPTIONS, pid, 0, uintptr(options))
+}
+
+func PtraceGetEventMsg(pid int) (msg uint, err error) {
+	var data _C_long
+	err = ptrace(PTRACE_GETEVENTMSG, pid, 0, uintptr(unsafe.Pointer(&data)))
+	msg = uint(data)
+	return
+}
+
+func PtraceCont(pid int, signal int) (err error) {
+	return ptrace(PTRACE_CONT, pid, 0, uintptr(signal))
+}
+
+func PtraceSyscall(pid int, signal int) (err error) {
+	return ptrace(PTRACE_SYSCALL, pid, 0, uintptr(signal))
+}
+
+func PtraceSingleStep(pid int) (err error) { return ptrace(PTRACE_SINGLESTEP, pid, 0, 0) }
+
+func PtraceAttach(pid int) (err error) { return ptrace(PTRACE_ATTACH, pid, 0, 0) }
+
+func PtraceDetach(pid int) (err error) { return ptrace(PTRACE_DETACH, pid, 0, 0) }
+
+//sys	reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error)
+
+func Reboot(cmd int) (err error) {
+	return reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, "")
+}
+
+func ReadDirent(fd int, buf []byte) (n int, err error) {
+	return Getdents(fd, buf)
+}
+
+//sys	mount(source string, target string, fstype string, flags uintptr, data *byte) (err error)
+
+func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
+	// Certain file systems get rather angry and EINVAL if you give
+	// them an empty string of data, rather than NULL.
+	if data == "" {
+		return mount(source, target, fstype, flags, nil)
+	}
+	datap, err := BytePtrFromString(data)
+	if err != nil {
+		return err
+	}
+	return mount(source, target, fstype, flags, datap)
+}
+
+// Sendto
+// Recvfrom
+// Socketpair
+
+/*
+ * Direct access
+ */
+//sys	Acct(path string) (err error)
+//sys	AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error)
+//sys	Adjtimex(buf *Timex) (state int, err error)
+//sys	Chdir(path string) (err error)
+//sys	Chroot(path string) (err error)
+//sys	ClockGettime(clockid int32, time *Timespec) (err error)
+//sys	Close(fd int) (err error)
+//sys	CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
+//sys	Dup(oldfd int) (fd int, err error)
+//sys	Dup3(oldfd int, newfd int, flags int) (err error)
+//sysnb	EpollCreate1(flag int) (fd int, err error)
+//sysnb	EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error)
+//sys	Eventfd(initval uint, flags int) (fd int, err error) = SYS_EVENTFD2
+//sys	Exit(code int) = SYS_EXIT_GROUP
+//sys	Fallocate(fd int, mode uint32, off int64, len int64) (err error)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
+//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
+//sys	Fdatasync(fd int) (err error)
+//sys	Fgetxattr(fd int, attr string, dest []byte) (sz int, err error)
+//sys	Flistxattr(fd int, dest []byte) (sz int, err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fremovexattr(fd int, attr string) (err error)
+//sys	Fsetxattr(fd int, attr string, dest []byte, flags int) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Getdents(fd int, buf []byte) (n int, err error) = SYS_GETDENTS64
+//sysnb	Getpgid(pid int) (pgid int, err error)
+
+func Getpgrp() (pid int) {
+	pid, _ = Getpgid(0)
+	return
+}
+
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sys	Getrandom(buf []byte, flags int) (n int, err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettid() (tid int)
+//sys	Getxattr(path string, attr string, dest []byte) (sz int, err error)
+//sys	InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error)
+//sysnb	InotifyInit1(flags int) (fd int, err error)
+//sysnb	InotifyRmWatch(fd int, watchdesc uint32) (success int, err error)
+//sysnb	Kill(pid int, sig syscall.Signal) (err error)
+//sys	Klogctl(typ int, buf []byte) (n int, err error) = SYS_SYSLOG
+//sys	Lgetxattr(path string, attr string, dest []byte) (sz int, err error)
+//sys	Listxattr(path string, dest []byte) (sz int, err error)
+//sys	Llistxattr(path string, dest []byte) (sz int, err error)
+//sys	Lremovexattr(path string, attr string) (err error)
+//sys	Lsetxattr(path string, attr string, data []byte, flags int) (err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
+//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error)
+//sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
+//sysnb prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) = SYS_PRLIMIT64
+//sys   Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
+//sys	Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) = SYS_PSELECT6
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Removexattr(path string, attr string) (err error)
+//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
+//sys	Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error)
+//sys	RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error)
+//sys	Setdomainname(p []byte) (err error)
+//sys	Sethostname(p []byte) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tv *Timeval) (err error)
+//sys	Setns(fd int, nstype int) (err error)
+
+// issue 1435.
+// On linux Setuid and Setgid only affects the current thread, not the process.
+// This does not match what most callers expect so we must return an error
+// here rather than letting the caller think that the call succeeded.
+
+func Setuid(uid int) (err error) {
+	return EOPNOTSUPP
+}
+
+func Setgid(uid int) (err error) {
+	return EOPNOTSUPP
+}
+
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
+//sys	Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error)
+//sys	Sync()
+//sys	Syncfs(fd int) (err error)
+//sysnb	Sysinfo(info *Sysinfo_t) (err error)
+//sys	Tee(rfd int, wfd int, len int, flags int) (n int64, err error)
+//sysnb	Tgkill(tgid int, tid int, sig syscall.Signal) (err error)
+//sysnb	Times(tms *Tms) (ticks uintptr, err error)
+//sysnb	Umask(mask int) (oldmask int)
+//sysnb	Uname(buf *Utsname) (err error)
+//sys	Unmount(target string, flags int) (err error) = SYS_UMOUNT2
+//sys	Unshare(flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys	exitThread(code int) (err error) = SYS_EXIT
+//sys	readlen(fd int, p *byte, np int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, p *byte, np int) (n int, err error) = SYS_WRITE
+
+// mmap varies by architecture; see syscall_linux_*.go.
+//sys	munmap(addr uintptr, length uintptr) (err error)
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
+//sys	Madvise(b []byte, advice int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Msync(b []byte, flags int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
+
+// Vmsplice splices user pages from a slice of Iovecs into a pipe specified by fd,
+// using the specified flags.
+func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
+	n, _, errno := Syscall6(
+		SYS_VMSPLICE,
+		uintptr(fd),
+		uintptr(unsafe.Pointer(&iovs[0])),
+		uintptr(len(iovs)),
+		uintptr(flags),
+		0,
+		0,
+	)
+	if errno != 0 {
+		return 0, syscall.Errno(errno)
+	}
+
+	return int(n), nil
+}
+
+//sys	faccessat(dirfd int, path string, mode uint32) (err error)
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	if flags & ^(AT_SYMLINK_NOFOLLOW|AT_EACCESS) != 0 {
+		return EINVAL
+	}
+
+	// The Linux kernel faccessat system call does not take any flags.
+	// The glibc faccessat implements the flags itself; see
+	// https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/faccessat.c;hb=HEAD
+	// Because people naturally expect syscall.Faccessat to act
+	// like C faccessat, we do the same.
+
+	if flags == 0 {
+		return faccessat(dirfd, path, mode)
+	}
+
+	var st Stat_t
+	if err := Fstatat(dirfd, path, &st, flags&AT_SYMLINK_NOFOLLOW); err != nil {
+		return err
+	}
+
+	mode &= 7
+	if mode == 0 {
+		return nil
+	}
+
+	var uid int
+	if flags&AT_EACCESS != 0 {
+		uid = Geteuid()
+	} else {
+		uid = Getuid()
+	}
+
+	if uid == 0 {
+		if mode&1 == 0 {
+			// Root can read and write any file.
+			return nil
+		}
+		if st.Mode&0111 != 0 {
+			// Root can execute any file that anybody can execute.
+			return nil
+		}
+		return EACCES
+	}
+
+	var fmode uint32
+	if uint32(uid) == st.Uid {
+		fmode = (st.Mode >> 6) & 7
+	} else {
+		var gid int
+		if flags&AT_EACCESS != 0 {
+			gid = Getegid()
+		} else {
+			gid = Getgid()
+		}
+
+		if uint32(gid) == st.Gid {
+			fmode = (st.Mode >> 3) & 7
+		} else {
+			fmode = st.Mode & 7
+		}
+	}
+
+	if fmode&mode == mode {
+		return nil
+	}
+
+	return EACCES
+}
+
+/*
+ * Unimplemented
+ */
+// AfsSyscall
+// Alarm
+// ArchPrctl
+// Brk
+// Capget
+// Capset
+// ClockGetres
+// ClockNanosleep
+// ClockSettime
+// Clone
+// CreateModule
+// DeleteModule
+// EpollCtlOld
+// EpollPwait
+// EpollWaitOld
+// Execve
+// Fork
+// Futex
+// GetKernelSyms
+// GetMempolicy
+// GetRobustList
+// GetThreadArea
+// Getitimer
+// Getpmsg
+// IoCancel
+// IoDestroy
+// IoGetevents
+// IoSetup
+// IoSubmit
+// IoprioGet
+// IoprioSet
+// KexecLoad
+// LookupDcookie
+// Mbind
+// MigratePages
+// Mincore
+// ModifyLdt
+// Mount
+// MovePages
+// MqGetsetattr
+// MqNotify
+// MqOpen
+// MqTimedreceive
+// MqTimedsend
+// MqUnlink
+// Mremap
+// Msgctl
+// Msgget
+// Msgrcv
+// Msgsnd
+// Nfsservctl
+// Personality
+// Pselect6
+// Ptrace
+// Putpmsg
+// QueryModule
+// Quotactl
+// Readahead
+// Readv
+// RemapFilePages
+// RestartSyscall
+// RtSigaction
+// RtSigpending
+// RtSigprocmask
+// RtSigqueueinfo
+// RtSigreturn
+// RtSigsuspend
+// RtSigtimedwait
+// SchedGetPriorityMax
+// SchedGetPriorityMin
+// SchedGetparam
+// SchedGetscheduler
+// SchedRrGetInterval
+// SchedSetparam
+// SchedYield
+// Security
+// Semctl
+// Semget
+// Semop
+// Semtimedop
+// SetMempolicy
+// SetRobustList
+// SetThreadArea
+// SetTidAddress
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Sigaltstack
+// Signalfd
+// Swapoff
+// Swapon
+// Sysfs
+// TimerCreate
+// TimerDelete
+// TimerGetoverrun
+// TimerGettime
+// TimerSettime
+// Timerfd
+// Tkill (obsolete)
+// Tuxcall
+// Umount2
+// Uselib
+// Utimensat
+// Vfork
+// Vhangup
+// Vserver
+// Waitid
+// _Sysctl
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
new file mode 100644
index 00000000..74bc098c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
@@ -0,0 +1,385 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// TODO(rsc): Rewrite all nn(SP) references into name+(nn-8)(FP)
+// so that go vet can check that they are correct.
+
+// +build 386,linux
+
+package unix
+
+import (
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
+}
+
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+// 64-bit file system and 32-bit uid calls
+// (386 default is 32-bit file system and 16-bit uid).
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
+//sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
+//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
+//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
+//sysnb	Getegid() (egid int) = SYS_GETEGID32
+//sysnb	Geteuid() (euid int) = SYS_GETEUID32
+//sysnb	Getgid() (gid int) = SYS_GETGID32
+//sysnb	Getuid() (uid int) = SYS_GETUID32
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Ioperm(from int, num int, on int) (err error)
+//sys	Iopl(level int) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
+//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
+//sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
+//sys	Setfsuid(uid int) (err error) = SYS_SETFSUID32
+//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
+//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
+//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
+//sysnb	setgroups(n int, list *_Gid_t) (err error) = SYS_SETGROUPS32
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
+
+//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
+//sys	Pause() (err error)
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	page := uintptr(offset / 4096)
+	if offset != int64(page)*4096 {
+		return 0, EINVAL
+	}
+	return mmap2(addr, length, prot, flags, fd, page)
+}
+
+type rlimit32 struct {
+	Cur uint32
+	Max uint32
+}
+
+//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_GETRLIMIT
+
+const rlimInf32 = ^uint32(0)
+const rlimInf64 = ^uint64(0)
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, nil, rlim)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	err = getrlimit(resource, &rl)
+	if err != nil {
+		return
+	}
+
+	if rl.Cur == rlimInf32 {
+		rlim.Cur = rlimInf64
+	} else {
+		rlim.Cur = uint64(rl.Cur)
+	}
+
+	if rl.Max == rlimInf32 {
+		rlim.Max = rlimInf64
+	} else {
+		rlim.Max = uint64(rl.Max)
+	}
+	return
+}
+
+//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	newoffset, errno := seek(fd, offset, whence)
+	if errno != 0 {
+		return 0, errno
+	}
+	return newoffset, nil
+}
+
+//sys	futimesat(dirfd int, path string, times *[2]Timeval) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Time(t *Time_t) (tt Time_t, err error)
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+// On x86 Linux, all the socket calls go through an extra indirection,
+// I think because the 5-register system call interface can't handle
+// the 6-argument calls like sendto and recvfrom. Instead the
+// arguments to the underlying system call are the number below
+// and a pointer to an array of uintptr. We hide the pointer in the
+// socketcall assembly to avoid allocation on every system call.
+
+const (
+	// see linux/net.h
+	_SOCKET      = 1
+	_BIND        = 2
+	_CONNECT     = 3
+	_LISTEN      = 4
+	_ACCEPT      = 5
+	_GETSOCKNAME = 6
+	_GETPEERNAME = 7
+	_SOCKETPAIR  = 8
+	_SEND        = 9
+	_RECV        = 10
+	_SENDTO      = 11
+	_RECVFROM    = 12
+	_SHUTDOWN    = 13
+	_SETSOCKOPT  = 14
+	_GETSOCKOPT  = 15
+	_SENDMSG     = 16
+	_RECVMSG     = 17
+	_ACCEPT4     = 18
+	_RECVMMSG    = 19
+	_SENDMMSG    = 20
+)
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	fd, e := socketcall(_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	fd, e := socketcall(_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, e := rawsocketcall(_GETSOCKNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, e := rawsocketcall(_GETPEERNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func socketpair(domain int, typ int, flags int, fd *[2]int32) (err error) {
+	_, e := rawsocketcall(_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, e := socketcall(_BIND, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, e := socketcall(_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	fd, e := rawsocketcall(_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, e := socketcall(_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, e := socketcall(_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), vallen, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	n, e := socketcall(_RECVFROM, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	_, e := socketcall(_SENDTO, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	n, e := socketcall(_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	n, e := socketcall(_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Listen(s int, n int) (err error) {
+	_, e := socketcall(_LISTEN, uintptr(s), uintptr(n), 0, 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Shutdown(s, how int) (err error) {
+	_, e := socketcall(_SHUTDOWN, uintptr(s), uintptr(how), 0, 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(pathp)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return uint64(uint32(r.Eip)) }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Eip = int32(pc) }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
new file mode 100644
index 00000000..5f9b2454
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -0,0 +1,162 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,linux
+
+package unix
+
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Ioperm(from int, num int, on int) (err error)
+//sys	Iopl(level int) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	var ts *Timespec
+	if timeout != nil {
+		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
+	}
+	return Pselect(nfd, r, w, e, ts, nil)
+}
+
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+
+func Stat(path string, stat *Stat_t) (err error) {
+	// Use fstatat, because Android's seccomp policy blocks stat.
+	return Fstatat(AT_FDCWD, path, stat, 0)
+}
+
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+//sys	futimesat(dirfd int, path string, times *[2]Timeval) (err error)
+
+func Gettimeofday(tv *Timeval) (err error) {
+	errno := gettimeofday(tv)
+	if errno != 0 {
+		return errno
+	}
+	return nil
+}
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	errno := gettimeofday(&tv)
+	if errno != 0 {
+		return 0, errno
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Rip }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Rip = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
new file mode 100644
index 00000000..21a4946b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
@@ -0,0 +1,13 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,linux
+// +build !gccgo
+
+package unix
+
+import "syscall"
+
+//go:noescape
+func gettimeofday(tv *Timeval) (err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
new file mode 100644
index 00000000..3ec7a932
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
@@ -0,0 +1,259 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
+}
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+// Underlying system call writes to newoffset via pointer.
+// Implemented in assembly to avoid allocation.
+func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	newoffset, errno := seek(fd, offset, whence)
+	if errno != 0 {
+		return 0, errno
+	}
+	return newoffset, nil
+}
+
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
+//sysnb	setgroups(n int, list *_Gid_t) (err error) = SYS_SETGROUPS32
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	socketpair(domain int, typ int, flags int, fd *[2]int32) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+
+// 64-bit file system and 32-bit uid calls
+// (16-bit uid calls are not always supported in newer kernels)
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
+//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
+//sysnb	Getegid() (egid int) = SYS_GETEGID32
+//sysnb	Geteuid() (euid int) = SYS_GETEUID32
+//sysnb	Getgid() (gid int) = SYS_GETGID32
+//sysnb	Getuid() (uid int) = SYS_GETUID32
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
+//sys	Listen(s int, n int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
+//sys	Pause() (err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
+//sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
+//sys	Setfsuid(uid int) (err error) = SYS_SETFSUID32
+//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
+//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
+//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+
+//sys	futimesat(dirfd int, path string, times *[2]Timeval) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func Time(t *Time_t) (Time_t, error) {
+	var tv Timeval
+	err := Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+func Utime(path string, buf *Utimbuf) error {
+	tv := []Timeval{
+		{Sec: buf.Actime},
+		{Sec: buf.Modtime},
+	}
+	return Utimes(path, tv)
+}
+
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+//sys   Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys   Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
+//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_ARM_FADVISE64_64, uintptr(fd), uintptr(advice), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(pathp)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	page := uintptr(offset / 4096)
+	if offset != int64(page)*4096 {
+		return 0, EINVAL
+	}
+	return mmap2(addr, length, prot, flags, fd, page)
+}
+
+type rlimit32 struct {
+	Cur uint32
+	Max uint32
+}
+
+//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_UGETRLIMIT
+
+const rlimInf32 = ^uint32(0)
+const rlimInf64 = ^uint64(0)
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, nil, rlim)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	err = getrlimit(resource, &rl)
+	if err != nil {
+		return
+	}
+
+	if rl.Cur == rlimInf32 {
+		rlim.Cur = rlimInf64
+	} else {
+		rlim.Cur = uint64(rl.Cur)
+	}
+
+	if rl.Max == rlimInf32 {
+		rlim.Max = rlimInf64
+	} else {
+		rlim.Max = uint64(rl.Max)
+	}
+	return
+}
+
+//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
+func (r *PtraceRegs) PC() uint64 { return uint64(r.Uregs[15]) }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Uregs[15] = uint32(pc) }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
new file mode 100644
index 00000000..646f295a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
@@ -0,0 +1,212 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm64,linux
+
+package unix
+
+import "unsafe"
+
+func EpollCreate(size int) (fd int, err error) {
+	if size <= 0 {
+		return -1, EINVAL
+	}
+	return EpollCreate1(0)
+}
+
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Listen(s int, n int) (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	var ts *Timespec
+	if timeout != nil {
+		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
+	}
+	return Pselect(nfd, r, w, e, ts, nil)
+}
+
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+
+func Stat(path string, stat *Stat_t) (err error) {
+	return Fstatat(AT_FDCWD, path, stat, 0)
+}
+
+func Lchown(path string, uid int, gid int) (err error) {
+	return Fchownat(AT_FDCWD, path, uid, gid, AT_SYMLINK_NOFOLLOW)
+}
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	return Fstatat(AT_FDCWD, path, stat, AT_SYMLINK_NOFOLLOW)
+}
+
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	return ENOSYS
+}
+
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+func futimesat(dirfd int, path string, tv *[2]Timeval) (err error) {
+	if tv == nil {
+		return utimensat(dirfd, path, nil, 0)
+	}
+
+	ts := []Timespec{
+		NsecToTimespec(TimevalToNsec(tv[0])),
+		NsecToTimespec(TimevalToNsec(tv[1])),
+	}
+	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+}
+
+func Time(t *Time_t) (Time_t, error) {
+	var tv Timeval
+	err := Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+func Utime(path string, buf *Utimbuf) error {
+	tv := []Timeval{
+		{Sec: buf.Actime},
+		{Sec: buf.Modtime},
+	}
+	return Utimes(path, tv)
+}
+
+func utimes(path string, tv *[2]Timeval) (err error) {
+	if tv == nil {
+		return utimensat(AT_FDCWD, path, nil, 0)
+	}
+
+	ts := []Timespec{
+		NsecToTimespec(TimevalToNsec(tv[0])),
+		NsecToTimespec(TimevalToNsec(tv[1])),
+	}
+	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+}
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Pc }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+func InotifyInit() (fd int, err error) {
+	return InotifyInit1(0)
+}
+
+func Dup2(oldfd int, newfd int) (err error) {
+	return Dup3(oldfd, newfd, 0)
+}
+
+func Pause() (err error) {
+	_, _, e1 := Syscall6(SYS_PPOLL, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	var ts *Timespec
+	if timeout >= 0 {
+		ts = new(Timespec)
+		*ts = NsecToTimespec(int64(timeout) * 1e6)
+	}
+	if len(fds) == 0 {
+		return ppoll(nil, 0, ts, nil)
+	}
+	return ppoll(&fds[0], len(fds), ts, nil)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gc.go b/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
new file mode 100644
index 00000000..c26e6ec2
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
@@ -0,0 +1,14 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux,!gccgo
+
+package unix
+
+// SyscallNoError may be used instead of Syscall for syscalls that don't fail.
+func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr)
+
+// RawSyscallNoError may be used instead of RawSyscall for syscalls that don't
+// fail.
+func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go
new file mode 100644
index 00000000..070bd389
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go
@@ -0,0 +1,16 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux,!gccgo,386
+
+package unix
+
+import "syscall"
+
+// Underlying system call writes to newoffset via pointer.
+// Implemented in assembly to avoid allocation.
+func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
+
+func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
+func rawsocketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go
new file mode 100644
index 00000000..308eb7ae
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go
@@ -0,0 +1,30 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux,gccgo,386
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func seek(fd int, offset int64, whence int) (int64, syscall.Errno) {
+	var newoffset int64
+	offsetLow := uint32(offset & 0xffffffff)
+	offsetHigh := uint32((offset >> 32) & 0xffffffff)
+	_, _, err := Syscall6(SYS__LLSEEK, uintptr(fd), uintptr(offsetHigh), uintptr(offsetLow), uintptr(unsafe.Pointer(&newoffset)), uintptr(whence), 0)
+	return newoffset, err
+}
+
+func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (int, syscall.Errno) {
+	fd, _, err := Syscall(SYS_SOCKETCALL, uintptr(call), uintptr(unsafe.Pointer(&a0)), 0)
+	return int(fd), err
+}
+
+func rawsocketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (int, syscall.Errno) {
+	fd, _, err := RawSyscall(SYS_SOCKETCALL, uintptr(call), uintptr(unsafe.Pointer(&a0)), 0)
+	return int(fd), err
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go
new file mode 100644
index 00000000..aa7fc9e1
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go
@@ -0,0 +1,20 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux,gccgo,arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func seek(fd int, offset int64, whence int) (int64, syscall.Errno) {
+	var newoffset int64
+	offsetLow := uint32(offset & 0xffffffff)
+	offsetHigh := uint32((offset >> 32) & 0xffffffff)
+	_, _, err := Syscall6(SYS__LLSEEK, uintptr(fd), uintptr(offsetHigh), uintptr(offsetLow), uintptr(unsafe.Pointer(&newoffset)), uintptr(whence), 0)
+	return newoffset, err
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
new file mode 100644
index 00000000..ad991031
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
@@ -0,0 +1,214 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build mips64 mips64le
+
+package unix
+
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	var ts *Timespec
+	if timeout != nil {
+		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
+	}
+	return Pselect(nfd, r, w, e, ts, nil)
+}
+
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+//sys	futimesat(dirfd int, path string, times *[2]Timeval) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	err = Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Ioperm(from int, num int, on int) (err error) {
+	return ENOSYS
+}
+
+func Iopl(level int) (err error) {
+	return ENOSYS
+}
+
+type stat_t struct {
+	Dev        uint32
+	Pad0       [3]int32
+	Ino        uint64
+	Mode       uint32
+	Nlink      uint32
+	Uid        uint32
+	Gid        uint32
+	Rdev       uint32
+	Pad1       [3]uint32
+	Size       int64
+	Atime      uint32
+	Atime_nsec uint32
+	Mtime      uint32
+	Mtime_nsec uint32
+	Ctime      uint32
+	Ctime_nsec uint32
+	Blksize    uint32
+	Pad2       uint32
+	Blocks     int64
+}
+
+//sys	fstat(fd int, st *stat_t) (err error)
+//sys	lstat(path string, st *stat_t) (err error)
+//sys	stat(path string, st *stat_t) (err error)
+
+func Fstat(fd int, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = fstat(fd, st)
+	fillStat_t(s, st)
+	return
+}
+
+func Lstat(path string, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = lstat(path, st)
+	fillStat_t(s, st)
+	return
+}
+
+func Stat(path string, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = stat(path, st)
+	fillStat_t(s, st)
+	return
+}
+
+func fillStat_t(s *Stat_t, st *stat_t) {
+	s.Dev = st.Dev
+	s.Ino = st.Ino
+	s.Mode = st.Mode
+	s.Nlink = st.Nlink
+	s.Uid = st.Uid
+	s.Gid = st.Gid
+	s.Rdev = st.Rdev
+	s.Size = st.Size
+	s.Atim = Timespec{int64(st.Atime), int64(st.Atime_nsec)}
+	s.Mtim = Timespec{int64(st.Mtime), int64(st.Mtime_nsec)}
+	s.Ctim = Timespec{int64(st.Ctime), int64(st.Ctime_nsec)}
+	s.Blksize = st.Blksize
+	s.Blocks = st.Blocks
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Epc }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Epc = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
new file mode 100644
index 00000000..99e0e999
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
@@ -0,0 +1,233 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build mips mipsle
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getuid() (uid int)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Ioperm(from int, num int, on int) (err error)
+//sys	Iopl(level int) (err error)
+
+//sys	futimesat(dirfd int, path string, times *[2]Timeval) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Time(t *Time_t) (tt Time_t, err error)
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
+//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
+//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
+
+//sys	Pause() (err error)
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = errnoErr(e)
+	}
+	return
+}
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	p, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(p)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = errnoErr(e)
+	}
+	return
+}
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	_, _, e := Syscall6(SYS__LLSEEK, uintptr(fd), uintptr(offset>>32), uintptr(offset), uintptr(unsafe.Pointer(&off)), uintptr(whence), 0)
+	if e != 0 {
+		err = errnoErr(e)
+	}
+	return
+}
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe() (p1 int, p2 int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	page := uintptr(offset / 4096)
+	if offset != int64(page)*4096 {
+		return 0, EINVAL
+	}
+	return mmap2(addr, length, prot, flags, fd, page)
+}
+
+const rlimInf32 = ^uint32(0)
+const rlimInf64 = ^uint64(0)
+
+type rlimit32 struct {
+	Cur uint32
+	Max uint32
+}
+
+//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_GETRLIMIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, nil, rlim)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	err = getrlimit(resource, &rl)
+	if err != nil {
+		return
+	}
+
+	if rl.Cur == rlimInf32 {
+		rlim.Cur = rlimInf64
+	} else {
+		rlim.Cur = uint64(rl.Cur)
+	}
+
+	if rl.Max == rlimInf32 {
+		rlim.Max = rlimInf64
+	} else {
+		rlim.Max = uint64(rl.Max)
+	}
+	return
+}
+
+//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Epc }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Epc = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
new file mode 100644
index 00000000..8c6720f7
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
@@ -0,0 +1,131 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build ppc64 ppc64le
+
+package unix
+
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error) = SYS_UGETRLIMIT
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Ioperm(from int, num int, on int) (err error)
+//sys	Iopl(level int) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error) = SYS_SYNC_FILE_RANGE2
+//sys	Truncate(path string, length int64) (err error)
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+//sys	futimesat(dirfd int, path string, times *[2]Timeval) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Time(t *Time_t) (tt Time_t, err error)
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Nip }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Nip = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+//sysnb pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
new file mode 100644
index 00000000..6e4ee0cf
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
@@ -0,0 +1,324 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x,linux
+
+package unix
+
+import (
+	"unsafe"
+)
+
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+
+//sys	futimesat(dirfd int, path string, times *[2]Timeval) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	err = Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0) // pipe2 is the same as pipe when flags are set to 0.
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Ioperm(from int, num int, on int) (err error) {
+	return ENOSYS
+}
+
+func Iopl(level int) (err error) {
+	return ENOSYS
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Psw.Addr }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Psw.Addr = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+// Linux on s390x uses the old mmap interface, which requires arguments to be passed in a struct.
+// mmap2 also requires arguments to be passed in a struct; it is currently not exposed in <asm/unistd.h>.
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	mmap_args := [6]uintptr{addr, length, uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset)}
+	r0, _, e1 := Syscall(SYS_MMAP, uintptr(unsafe.Pointer(&mmap_args[0])), 0, 0)
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// On s390x Linux, all the socket calls go through an extra indirection.
+// The arguments to the underlying system call (SYS_SOCKETCALL) are the
+// number below and a pointer to an array of uintptr.
+const (
+	// see linux/net.h
+	netSocket      = 1
+	netBind        = 2
+	netConnect     = 3
+	netListen      = 4
+	netAccept      = 5
+	netGetSockName = 6
+	netGetPeerName = 7
+	netSocketPair  = 8
+	netSend        = 9
+	netRecv        = 10
+	netSendTo      = 11
+	netRecvFrom    = 12
+	netShutdown    = 13
+	netSetSockOpt  = 14
+	netGetSockOpt  = 15
+	netSendMsg     = 16
+	netRecvMsg     = 17
+	netAccept4     = 18
+	netRecvMMsg    = 19
+	netSendMMsg    = 20
+)
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (int, error) {
+	args := [4]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags)}
+	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept4, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetSockName, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetPeerName, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func socketpair(domain int, typ int, flags int, fd *[2]int32) error {
+	args := [4]uintptr{uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netSocketPair, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netBind, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netConnect, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func socket(domain int, typ int, proto int) (int, error) {
+	args := [3]uintptr{uintptr(domain), uintptr(typ), uintptr(proto)}
+	fd, _, err := RawSyscall(SYS_SOCKETCALL, netSocket, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) error {
+	args := [5]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen))}
+	_, _, err := Syscall(SYS_SOCKETCALL, netGetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) error {
+	args := [4]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netSetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (int, error) {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen))}
+	n, _, err := Syscall(SYS_SOCKETCALL, netRecvFrom, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) error {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netSendTo, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func recvmsg(s int, msg *Msghdr, flags int) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
+	n, _, err := Syscall(SYS_SOCKETCALL, netRecvMsg, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func sendmsg(s int, msg *Msghdr, flags int) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
+	n, _, err := Syscall(SYS_SOCKETCALL, netSendMsg, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func Listen(s int, n int) error {
+	args := [2]uintptr{uintptr(s), uintptr(n)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netListen, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func Shutdown(s, how int) error {
+	args := [2]uintptr{uintptr(s), uintptr(how)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netShutdown, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
new file mode 100644
index 00000000..72e64187
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
@@ -0,0 +1,146 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build sparc64,linux
+
+package unix
+
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+func Ioperm(from int, num int, on int) (err error) {
+	return ENOSYS
+}
+
+func Iopl(level int) (err error) {
+	return ENOSYS
+}
+
+//sys	futimesat(dirfd int, path string, times *[2]Timeval) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	err = Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Tpc }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Tpc = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+//sysnb pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_test.go b/vendor/golang.org/x/sys/unix/syscall_linux_test.go
new file mode 100644
index 00000000..7fb5804f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_test.go
@@ -0,0 +1,443 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+
+package unix_test
+
+import (
+	"os"
+	"runtime"
+	"runtime/debug"
+	"testing"
+	"time"
+
+	"golang.org/x/sys/unix"
+)
+
+func TestIoctlGetInt(t *testing.T) {
+	f, err := os.Open("/dev/random")
+	if err != nil {
+		t.Fatalf("failed to open device: %v", err)
+	}
+	defer f.Close()
+
+	v, err := unix.IoctlGetInt(int(f.Fd()), unix.RNDGETENTCNT)
+	if err != nil {
+		t.Fatalf("failed to perform ioctl: %v", err)
+	}
+
+	t.Logf("%d bits of entropy available", v)
+}
+
+func TestPpoll(t *testing.T) {
+	if runtime.GOOS == "android" {
+		t.Skip("mkfifo syscall is not available on android, skipping test")
+	}
+
+	f, cleanup := mktmpfifo(t)
+	defer cleanup()
+
+	const timeout = 100 * time.Millisecond
+
+	ok := make(chan bool, 1)
+	go func() {
+		select {
+		case <-time.After(10 * timeout):
+			t.Errorf("Ppoll: failed to timeout after %d", 10*timeout)
+		case <-ok:
+		}
+	}()
+
+	fds := []unix.PollFd{{Fd: int32(f.Fd()), Events: unix.POLLIN}}
+	timeoutTs := unix.NsecToTimespec(int64(timeout))
+	n, err := unix.Ppoll(fds, &timeoutTs, nil)
+	ok <- true
+	if err != nil {
+		t.Errorf("Ppoll: unexpected error: %v", err)
+		return
+	}
+	if n != 0 {
+		t.Errorf("Ppoll: wrong number of events: got %v, expected %v", n, 0)
+		return
+	}
+}
+
+func TestTime(t *testing.T) {
+	var ut unix.Time_t
+	ut2, err := unix.Time(&ut)
+	if err != nil {
+		t.Fatalf("Time: %v", err)
+	}
+	if ut != ut2 {
+		t.Errorf("Time: return value %v should be equal to argument %v", ut2, ut)
+	}
+
+	var now time.Time
+
+	for i := 0; i < 10; i++ {
+		ut, err = unix.Time(nil)
+		if err != nil {
+			t.Fatalf("Time: %v", err)
+		}
+
+		now = time.Now()
+
+		if int64(ut) == now.Unix() {
+			return
+		}
+	}
+
+	t.Errorf("Time: return value %v should be nearly equal to time.Now().Unix() %v", ut, now.Unix())
+}
+
+func TestUtime(t *testing.T) {
+	defer chtmpdir(t)()
+
+	touch(t, "file1")
+
+	buf := &unix.Utimbuf{
+		Modtime: 12345,
+	}
+
+	err := unix.Utime("file1", buf)
+	if err != nil {
+		t.Fatalf("Utime: %v", err)
+	}
+
+	fi, err := os.Stat("file1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if fi.ModTime().Unix() != 12345 {
+		t.Errorf("Utime: failed to change modtime: expected %v, got %v", 12345, fi.ModTime().Unix())
+	}
+}
+
+func TestUtimesNanoAt(t *testing.T) {
+	defer chtmpdir(t)()
+
+	symlink := "symlink1"
+	os.Remove(symlink)
+	err := os.Symlink("nonexisting", symlink)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ts := []unix.Timespec{
+		{Sec: 1111, Nsec: 2222},
+		{Sec: 3333, Nsec: 4444},
+	}
+	err = unix.UtimesNanoAt(unix.AT_FDCWD, symlink, ts, unix.AT_SYMLINK_NOFOLLOW)
+	if err != nil {
+		t.Fatalf("UtimesNanoAt: %v", err)
+	}
+
+	var st unix.Stat_t
+	err = unix.Lstat(symlink, &st)
+	if err != nil {
+		t.Fatalf("Lstat: %v", err)
+	}
+
+	// Only check Mtim, Atim might not be supported by the underlying filesystem
+	expected := ts[1]
+	if st.Mtim.Nsec == 0 {
+		// Some filesystems only support 1-second time stamp resolution
+		// and will always set Nsec to 0.
+		expected.Nsec = 0
+	}
+	if st.Mtim != expected {
+		t.Errorf("UtimesNanoAt: wrong mtime: expected %v, got %v", expected, st.Mtim)
+	}
+}
+
+func TestRlimitAs(t *testing.T) {
+	// disable GC during to avoid flaky test
+	defer debug.SetGCPercent(debug.SetGCPercent(-1))
+
+	var rlim unix.Rlimit
+	err := unix.Getrlimit(unix.RLIMIT_AS, &rlim)
+	if err != nil {
+		t.Fatalf("Getrlimit: %v", err)
+	}
+	var zero unix.Rlimit
+	if zero == rlim {
+		t.Fatalf("Getrlimit: got zero value %#v", rlim)
+	}
+	set := rlim
+	set.Cur = uint64(unix.Getpagesize())
+	err = unix.Setrlimit(unix.RLIMIT_AS, &set)
+	if err != nil {
+		t.Fatalf("Setrlimit: set failed: %#v %v", set, err)
+	}
+
+	// RLIMIT_AS was set to the page size, so mmap()'ing twice the page size
+	// should fail. See 'man 2 getrlimit'.
+	_, err = unix.Mmap(-1, 0, 2*unix.Getpagesize(), unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
+	if err == nil {
+		t.Fatal("Mmap: unexpectedly suceeded after setting RLIMIT_AS")
+	}
+
+	err = unix.Setrlimit(unix.RLIMIT_AS, &rlim)
+	if err != nil {
+		t.Fatalf("Setrlimit: restore failed: %#v %v", rlim, err)
+	}
+
+	b, err := unix.Mmap(-1, 0, 2*unix.Getpagesize(), unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
+	if err != nil {
+		t.Fatalf("Mmap: %v", err)
+	}
+	err = unix.Munmap(b)
+	if err != nil {
+		t.Fatalf("Munmap: %v", err)
+	}
+}
+
+func TestSelect(t *testing.T) {
+	_, err := unix.Select(0, nil, nil, nil, &unix.Timeval{Sec: 0, Usec: 0})
+	if err != nil {
+		t.Fatalf("Select: %v", err)
+	}
+
+	dur := 150 * time.Millisecond
+	tv := unix.NsecToTimeval(int64(dur))
+	start := time.Now()
+	_, err = unix.Select(0, nil, nil, nil, &tv)
+	took := time.Since(start)
+	if err != nil {
+		t.Fatalf("Select: %v", err)
+	}
+
+	if took < dur {
+		t.Errorf("Select: timeout should have been at least %v, got %v", dur, took)
+	}
+}
+
+func TestPselect(t *testing.T) {
+	_, err := unix.Pselect(0, nil, nil, nil, &unix.Timespec{Sec: 0, Nsec: 0}, nil)
+	if err != nil {
+		t.Fatalf("Pselect: %v", err)
+	}
+
+	dur := 2500 * time.Microsecond
+	ts := unix.NsecToTimespec(int64(dur))
+	start := time.Now()
+	_, err = unix.Pselect(0, nil, nil, nil, &ts, nil)
+	took := time.Since(start)
+	if err != nil {
+		t.Fatalf("Pselect: %v", err)
+	}
+
+	if took < dur {
+		t.Errorf("Pselect: timeout should have been at least %v, got %v", dur, took)
+	}
+}
+
+func TestSchedSetaffinity(t *testing.T) {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	var oldMask unix.CPUSet
+	err := unix.SchedGetaffinity(0, &oldMask)
+	if err != nil {
+		t.Fatalf("SchedGetaffinity: %v", err)
+	}
+
+	var newMask unix.CPUSet
+	newMask.Zero()
+	if newMask.Count() != 0 {
+		t.Errorf("CpuZero: didn't zero CPU set: %v", newMask)
+	}
+	cpu := 1
+	newMask.Set(cpu)
+	if newMask.Count() != 1 || !newMask.IsSet(cpu) {
+		t.Errorf("CpuSet: didn't set CPU %d in set: %v", cpu, newMask)
+	}
+	cpu = 5
+	newMask.Set(cpu)
+	if newMask.Count() != 2 || !newMask.IsSet(cpu) {
+		t.Errorf("CpuSet: didn't set CPU %d in set: %v", cpu, newMask)
+	}
+	newMask.Clear(cpu)
+	if newMask.Count() != 1 || newMask.IsSet(cpu) {
+		t.Errorf("CpuClr: didn't clear CPU %d in set: %v", cpu, newMask)
+	}
+
+	if runtime.NumCPU() < 2 {
+		t.Skip("skipping setaffinity tests on single CPU system")
+	}
+	if runtime.GOOS == "android" {
+		t.Skip("skipping setaffinity tests on android")
+	}
+
+	err = unix.SchedSetaffinity(0, &newMask)
+	if err != nil {
+		t.Fatalf("SchedSetaffinity: %v", err)
+	}
+
+	var gotMask unix.CPUSet
+	err = unix.SchedGetaffinity(0, &gotMask)
+	if err != nil {
+		t.Fatalf("SchedGetaffinity: %v", err)
+	}
+
+	if gotMask != newMask {
+		t.Errorf("SchedSetaffinity: returned affinity mask does not match set affinity mask")
+	}
+
+	// Restore old mask so it doesn't affect successive tests
+	err = unix.SchedSetaffinity(0, &oldMask)
+	if err != nil {
+		t.Fatalf("SchedSetaffinity: %v", err)
+	}
+}
+
+func TestStatx(t *testing.T) {
+	var stx unix.Statx_t
+	err := unix.Statx(unix.AT_FDCWD, ".", 0, 0, &stx)
+	if err == unix.ENOSYS || err == unix.EPERM {
+		t.Skip("statx syscall is not available, skipping test")
+	} else if err != nil {
+		t.Fatalf("Statx: %v", err)
+	}
+
+	defer chtmpdir(t)()
+	touch(t, "file1")
+
+	var st unix.Stat_t
+	err = unix.Stat("file1", &st)
+	if err != nil {
+		t.Fatalf("Stat: %v", err)
+	}
+
+	flags := unix.AT_STATX_SYNC_AS_STAT
+	err = unix.Statx(unix.AT_FDCWD, "file1", flags, unix.STATX_ALL, &stx)
+	if err != nil {
+		t.Fatalf("Statx: %v", err)
+	}
+
+	if uint32(stx.Mode) != st.Mode {
+		t.Errorf("Statx: returned stat mode does not match Stat")
+	}
+
+	ctime := unix.StatxTimestamp{Sec: int64(st.Ctim.Sec), Nsec: uint32(st.Ctim.Nsec)}
+	mtime := unix.StatxTimestamp{Sec: int64(st.Mtim.Sec), Nsec: uint32(st.Mtim.Nsec)}
+
+	if stx.Ctime != ctime {
+		t.Errorf("Statx: returned stat ctime does not match Stat")
+	}
+	if stx.Mtime != mtime {
+		t.Errorf("Statx: returned stat mtime does not match Stat")
+	}
+
+	err = os.Symlink("file1", "symlink1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = unix.Lstat("symlink1", &st)
+	if err != nil {
+		t.Fatalf("Lstat: %v", err)
+	}
+
+	err = unix.Statx(unix.AT_FDCWD, "symlink1", flags, unix.STATX_BASIC_STATS, &stx)
+	if err != nil {
+		t.Fatalf("Statx: %v", err)
+	}
+
+	// follow symlink, expect a regulat file
+	if stx.Mode&unix.S_IFREG == 0 {
+		t.Errorf("Statx: didn't follow symlink")
+	}
+
+	err = unix.Statx(unix.AT_FDCWD, "symlink1", flags|unix.AT_SYMLINK_NOFOLLOW, unix.STATX_ALL, &stx)
+	if err != nil {
+		t.Fatalf("Statx: %v", err)
+	}
+
+	// follow symlink, expect a symlink
+	if stx.Mode&unix.S_IFLNK == 0 {
+		t.Errorf("Statx: unexpectedly followed symlink")
+	}
+	if uint32(stx.Mode) != st.Mode {
+		t.Errorf("Statx: returned stat mode does not match Lstat")
+	}
+
+	ctime = unix.StatxTimestamp{Sec: int64(st.Ctim.Sec), Nsec: uint32(st.Ctim.Nsec)}
+	mtime = unix.StatxTimestamp{Sec: int64(st.Mtim.Sec), Nsec: uint32(st.Mtim.Nsec)}
+
+	if stx.Ctime != ctime {
+		t.Errorf("Statx: returned stat ctime does not match Lstat")
+	}
+	if stx.Mtime != mtime {
+		t.Errorf("Statx: returned stat mtime does not match Lstat")
+	}
+}
+
+// stringsFromByteSlice converts a sequence of attributes to a []string.
+// On Linux, each entry is a NULL-terminated string.
+func stringsFromByteSlice(buf []byte) []string {
+	var result []string
+	off := 0
+	for i, b := range buf {
+		if b == 0 {
+			result = append(result, string(buf[off:i]))
+			off = i + 1
+		}
+	}
+	return result
+}
+
+func TestFaccessat(t *testing.T) {
+	defer chtmpdir(t)()
+	touch(t, "file1")
+
+	err := unix.Faccessat(unix.AT_FDCWD, "file1", unix.R_OK, 0)
+	if err != nil {
+		t.Errorf("Faccessat: unexpected error: %v", err)
+	}
+
+	err = unix.Faccessat(unix.AT_FDCWD, "file1", unix.R_OK, 2)
+	if err != unix.EINVAL {
+		t.Errorf("Faccessat: unexpected error: %v, want EINVAL", err)
+	}
+
+	err = unix.Faccessat(unix.AT_FDCWD, "file1", unix.R_OK, unix.AT_EACCESS)
+	if err != nil {
+		t.Errorf("Faccessat: unexpected error: %v", err)
+	}
+
+	err = os.Symlink("file1", "symlink1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = unix.Faccessat(unix.AT_FDCWD, "symlink1", unix.R_OK, unix.AT_SYMLINK_NOFOLLOW)
+	if err != nil {
+		t.Errorf("Faccessat SYMLINK_NOFOLLOW: unexpected error %v", err)
+	}
+
+	// We can't really test AT_SYMLINK_NOFOLLOW, because there
+	// doesn't seem to be any way to change the mode of a symlink.
+	// We don't test AT_EACCESS because such tests are only
+	// meaningful if run as root.
+
+	err = unix.Fchmodat(unix.AT_FDCWD, "file1", 0, 0)
+	if err != nil {
+		t.Errorf("Fchmodat: unexpected error %v", err)
+	}
+
+	err = unix.Faccessat(unix.AT_FDCWD, "file1", unix.F_OK, unix.AT_SYMLINK_NOFOLLOW)
+	if err != nil {
+		t.Errorf("Faccessat: unexpected error: %v", err)
+	}
+
+	err = unix.Faccessat(unix.AT_FDCWD, "file1", unix.R_OK, unix.AT_SYMLINK_NOFOLLOW)
+	if err != unix.EACCES {
+		if unix.Getuid() != 0 {
+			t.Errorf("Faccessat: unexpected error: %v, want EACCES", err)
+		}
+	}
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
new file mode 100644
index 00000000..6f8ebde3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -0,0 +1,580 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// NetBSD system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+	raw    RawSockaddrDatalink
+}
+
+func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+func sysctlNodes(mib []_C_int) (nodes []Sysctlnode, err error) {
+	var olen uintptr
+
+	// Get a list of all sysctl nodes below the given MIB by performing
+	// a sysctl for the given MIB with CTL_QUERY appended.
+	mib = append(mib, CTL_QUERY)
+	qnode := Sysctlnode{Flags: SYSCTL_VERS_1}
+	qp := (*byte)(unsafe.Pointer(&qnode))
+	sz := unsafe.Sizeof(qnode)
+	if err = sysctl(mib, nil, &olen, qp, sz); err != nil {
+		return nil, err
+	}
+
+	// Now that we know the size, get the actual nodes.
+	nodes = make([]Sysctlnode, olen/sz)
+	np := (*byte)(unsafe.Pointer(&nodes[0]))
+	if err = sysctl(mib, np, &olen, qp, sz); err != nil {
+		return nil, err
+	}
+
+	return nodes, nil
+}
+
+func nametomib(name string) (mib []_C_int, err error) {
+	// Split name into components.
+	var parts []string
+	last := 0
+	for i := 0; i < len(name); i++ {
+		if name[i] == '.' {
+			parts = append(parts, name[last:i])
+			last = i + 1
+		}
+	}
+	parts = append(parts, name[last:])
+
+	// Discover the nodes and construct the MIB OID.
+	for partno, part := range parts {
+		nodes, err := sysctlNodes(mib)
+		if err != nil {
+			return nil, err
+		}
+		for _, node := range nodes {
+			n := make([]byte, 0)
+			for i := range node.Name {
+				if node.Name[i] != 0 {
+					n = append(n, byte(node.Name[i]))
+				}
+			}
+			if string(n) == part {
+				mib = append(mib, _C_int(node.Num))
+				break
+			}
+		}
+		if len(mib) != partno+1 {
+			return nil, EINVAL
+		}
+	}
+
+	return mib, nil
+}
+
+//sysnb pipe() (fd1 int, fd2 int, err error)
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+//sys getdents(fd int, buf []byte) (n int, err error)
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	return getdents(fd, buf)
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
+// TODO
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	return -1, ENOSYS
+}
+
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exit(code int)
+//sys	ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_POSIX_FADVISE
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Issetugid() (tainted bool)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Unlink(path string) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+
+/*
+ * Unimplemented
+ */
+// ____semctl13
+// __clone
+// __fhopen40
+// __fhstat40
+// __fhstatvfs140
+// __fstat30
+// __getcwd
+// __getfh30
+// __getlogin
+// __lstat30
+// __mount50
+// __msgctl13
+// __msync13
+// __ntp_gettime30
+// __posix_chown
+// __posix_fchown
+// __posix_lchown
+// __posix_rename
+// __setlogin
+// __shmctl13
+// __sigaction_sigtramp
+// __sigaltstack14
+// __sigpending14
+// __sigprocmask14
+// __sigsuspend14
+// __sigtimedwait
+// __stat30
+// __syscall
+// __vfork14
+// _ksem_close
+// _ksem_destroy
+// _ksem_getvalue
+// _ksem_init
+// _ksem_open
+// _ksem_post
+// _ksem_trywait
+// _ksem_unlink
+// _ksem_wait
+// _lwp_continue
+// _lwp_create
+// _lwp_ctl
+// _lwp_detach
+// _lwp_exit
+// _lwp_getname
+// _lwp_getprivate
+// _lwp_kill
+// _lwp_park
+// _lwp_self
+// _lwp_setname
+// _lwp_setprivate
+// _lwp_suspend
+// _lwp_unpark
+// _lwp_unpark_all
+// _lwp_wait
+// _lwp_wakeup
+// _pset_bind
+// _sched_getaffinity
+// _sched_getparam
+// _sched_setaffinity
+// _sched_setparam
+// acct
+// aio_cancel
+// aio_error
+// aio_fsync
+// aio_read
+// aio_return
+// aio_suspend
+// aio_write
+// break
+// clock_getres
+// clock_gettime
+// clock_settime
+// compat_09_ogetdomainname
+// compat_09_osetdomainname
+// compat_09_ouname
+// compat_10_omsgsys
+// compat_10_osemsys
+// compat_10_oshmsys
+// compat_12_fstat12
+// compat_12_getdirentries
+// compat_12_lstat12
+// compat_12_msync
+// compat_12_oreboot
+// compat_12_oswapon
+// compat_12_stat12
+// compat_13_sigaction13
+// compat_13_sigaltstack13
+// compat_13_sigpending13
+// compat_13_sigprocmask13
+// compat_13_sigreturn13
+// compat_13_sigsuspend13
+// compat_14___semctl
+// compat_14_msgctl
+// compat_14_shmctl
+// compat_16___sigaction14
+// compat_16___sigreturn14
+// compat_20_fhstatfs
+// compat_20_fstatfs
+// compat_20_getfsstat
+// compat_20_statfs
+// compat_30___fhstat30
+// compat_30___fstat13
+// compat_30___lstat13
+// compat_30___stat13
+// compat_30_fhopen
+// compat_30_fhstat
+// compat_30_fhstatvfs1
+// compat_30_getdents
+// compat_30_getfh
+// compat_30_ntp_gettime
+// compat_30_socket
+// compat_40_mount
+// compat_43_fstat43
+// compat_43_lstat43
+// compat_43_oaccept
+// compat_43_ocreat
+// compat_43_oftruncate
+// compat_43_ogetdirentries
+// compat_43_ogetdtablesize
+// compat_43_ogethostid
+// compat_43_ogethostname
+// compat_43_ogetkerninfo
+// compat_43_ogetpagesize
+// compat_43_ogetpeername
+// compat_43_ogetrlimit
+// compat_43_ogetsockname
+// compat_43_okillpg
+// compat_43_olseek
+// compat_43_ommap
+// compat_43_oquota
+// compat_43_orecv
+// compat_43_orecvfrom
+// compat_43_orecvmsg
+// compat_43_osend
+// compat_43_osendmsg
+// compat_43_osethostid
+// compat_43_osethostname
+// compat_43_osetrlimit
+// compat_43_osigblock
+// compat_43_osigsetmask
+// compat_43_osigstack
+// compat_43_osigvec
+// compat_43_otruncate
+// compat_43_owait
+// compat_43_stat43
+// execve
+// extattr_delete_fd
+// extattr_delete_file
+// extattr_delete_link
+// extattr_get_fd
+// extattr_get_file
+// extattr_get_link
+// extattr_list_fd
+// extattr_list_file
+// extattr_list_link
+// extattr_set_fd
+// extattr_set_file
+// extattr_set_link
+// extattrctl
+// fchroot
+// fdatasync
+// fgetxattr
+// fktrace
+// flistxattr
+// fork
+// fremovexattr
+// fsetxattr
+// fstatvfs1
+// fsync_range
+// getcontext
+// getitimer
+// getvfsstat
+// getxattr
+// ktrace
+// lchflags
+// lchmod
+// lfs_bmapv
+// lfs_markv
+// lfs_segclean
+// lfs_segwait
+// lgetxattr
+// lio_listio
+// listxattr
+// llistxattr
+// lremovexattr
+// lseek
+// lsetxattr
+// lutimes
+// madvise
+// mincore
+// minherit
+// modctl
+// mq_close
+// mq_getattr
+// mq_notify
+// mq_open
+// mq_receive
+// mq_send
+// mq_setattr
+// mq_timedreceive
+// mq_timedsend
+// mq_unlink
+// mremap
+// msgget
+// msgrcv
+// msgsnd
+// nfssvc
+// ntp_adjtime
+// pmc_control
+// pmc_get_info
+// pollts
+// preadv
+// profil
+// pselect
+// pset_assign
+// pset_create
+// pset_destroy
+// ptrace
+// pwritev
+// quotactl
+// rasctl
+// readv
+// reboot
+// removexattr
+// sa_enable
+// sa_preempt
+// sa_register
+// sa_setconcurrency
+// sa_stacks
+// sa_yield
+// sbrk
+// sched_yield
+// semconfig
+// semget
+// semop
+// setcontext
+// setitimer
+// setxattr
+// shmat
+// shmdt
+// shmget
+// sstk
+// statvfs1
+// swapctl
+// sysarch
+// syscall
+// timer_create
+// timer_delete
+// timer_getoverrun
+// timer_gettime
+// timer_settime
+// undelete
+// utrace
+// uuidgen
+// vadvise
+// vfork
+// writev
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
new file mode 100644
index 00000000..24f74e58
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
@@ -0,0 +1,33 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386,netbsd
+
+package unix
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = uint32(mode)
+	k.Flags = uint32(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
new file mode 100644
index 00000000..6878bf7f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
@@ -0,0 +1,33 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,netbsd
+
+package unix
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = uint32(mode)
+	k.Flags = uint32(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
new file mode 100644
index 00000000..dbbfcf71
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
@@ -0,0 +1,33 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm,netbsd
+
+package unix
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = uint32(mode)
+	k.Flags = uint32(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_test.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_test.go
new file mode 100644
index 00000000..de8c0797
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_test.go
@@ -0,0 +1,20 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix_test
+
+// stringsFromByteSlice converts a sequence of attributes to a []string.
+// On NetBSD, each entry consists of a single byte containing the length
+// of the attribute name, followed by the attribute name.
+// The name is _not_ NULL-terminated.
+func stringsFromByteSlice(buf []byte) []string {
+	var result []string
+	i := 0
+	for i < len(buf) {
+		next := i + 1 + int(buf[i])
+		result = append(result, string(buf[i+1:next]))
+		i = next
+	}
+	return result
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
new file mode 100644
index 00000000..07e6669c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -0,0 +1,368 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// OpenBSD system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import (
+	"sort"
+	"syscall"
+	"unsafe"
+)
+
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [24]int8
+	raw    RawSockaddrDatalink
+}
+
+func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+func nametomib(name string) (mib []_C_int, err error) {
+	i := sort.Search(len(sysctlMib), func(i int) bool {
+		return sysctlMib[i].ctlname >= name
+	})
+	if i < len(sysctlMib) && sysctlMib[i].ctlname == name {
+		return sysctlMib[i].ctloid, nil
+	}
+	return nil, EINVAL
+}
+
+//sysnb pipe(p *[2]_C_int) (err error)
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sys getdents(fd int, buf []byte) (n int, err error)
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	return getdents(fd, buf)
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
+// TODO
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	return -1, ENOSYS
+}
+
+func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	var bufsize uintptr
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+	}
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exit(code int)
+//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrtable() (rtable int, err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Issetugid() (tainted bool)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Setlogin(name string) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setrtable(rtable int) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, stat *Statfs_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Unlink(path string) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+
+/*
+ * Unimplemented
+ */
+// __getcwd
+// __semctl
+// __syscall
+// __sysctl
+// adjfreq
+// break
+// clock_getres
+// clock_gettime
+// clock_settime
+// closefrom
+// execve
+// faccessat
+// fchmodat
+// fchownat
+// fcntl
+// fhopen
+// fhstat
+// fhstatfs
+// fork
+// fstatat
+// futimens
+// getfh
+// getgid
+// getitimer
+// getlogin
+// getresgid
+// getresuid
+// getthrid
+// ktrace
+// lfs_bmapv
+// lfs_markv
+// lfs_segclean
+// lfs_segwait
+// linkat
+// mincore
+// minherit
+// mkdirat
+// mkfifoat
+// mknodat
+// mount
+// mquery
+// msgctl
+// msgget
+// msgrcv
+// msgsnd
+// nfssvc
+// nnpfspioctl
+// openat
+// preadv
+// profil
+// pwritev
+// quotactl
+// readlinkat
+// readv
+// reboot
+// renameat
+// rfork
+// sched_yield
+// semget
+// semop
+// setgroups
+// setitimer
+// setsockopt
+// shmat
+// shmctl
+// shmdt
+// shmget
+// sigaction
+// sigaltstack
+// sigpending
+// sigprocmask
+// sigreturn
+// sigsuspend
+// symlinkat
+// sysarch
+// syscall
+// threxit
+// thrsigdivert
+// thrsleep
+// thrwakeup
+// unlinkat
+// vfork
+// writev
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
new file mode 100644
index 00000000..994964a9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
@@ -0,0 +1,33 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386,openbsd
+
+package unix
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
new file mode 100644
index 00000000..9a35334c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
@@ -0,0 +1,37 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,openbsd
+
+package unix
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of openbsd/amd64 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
new file mode 100644
index 00000000..59844f50
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
@@ -0,0 +1,33 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm,openbsd
+
+package unix
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go
new file mode 100644
index 00000000..53b80782
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go
@@ -0,0 +1,730 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Solaris system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_solaris.go or syscall_unix.go.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// Implemented in runtime/syscall_solaris.go.
+type syscallFunc uintptr
+
+func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
+type SockaddrDatalink struct {
+	Family uint16
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [244]int8
+	raw    RawSockaddrDatalink
+}
+
+//sysnb	pipe(p *[2]_C_int) (n int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	n, err := pipe(&pp)
+	if n != 0 {
+		return err
+	}
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return nil
+}
+
+func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
+}
+
+func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	sa.raw.Scope_id = sa.ZoneId
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
+}
+
+func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	name := sa.Name
+	n := len(name)
+	if n >= len(sa.raw.Path) {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_UNIX
+	for i := 0; i < n; i++ {
+		sa.raw.Path[i] = int8(name[i])
+	}
+	// length is family (uint16), name, NUL.
+	sl := _Socklen(2)
+	if n > 0 {
+		sl += _Socklen(n) + 1
+	}
+	if sa.raw.Path[0] == '@' {
+		sa.raw.Path[0] = 0
+		// Don't count trailing NUL for abstract address.
+		sl--
+	}
+
+	return unsafe.Pointer(&sa.raw), sl, nil
+}
+
+//sys	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getsockname
+
+func Getsockname(fd int) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if err = getsockname(fd, &rsa, &len); err != nil {
+		return
+	}
+	return anyToSockaddr(fd, &rsa)
+}
+
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+	buf := make([]byte, 256)
+	vallen := _Socklen(len(buf))
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+	if err != nil {
+		return "", err
+	}
+	return string(buf[:vallen-1]), nil
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error)
+
+func Getwd() (wd string, err error) {
+	var buf [PathMax]byte
+	// Getcwd will return an error if it failed for any reason.
+	_, err = Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
+/*
+ * Wrapped
+ */
+
+//sysnb	getgroups(ngid int, gid *_Gid_t) (n int, err error)
+//sysnb	setgroups(ngid int, gid *_Gid_t) (err error)
+
+func Getgroups() (gids []int, err error) {
+	n, err := getgroups(0, nil)
+	// Check for error and sanity check group count. Newer versions of
+	// Solaris allow up to 1024 (NGROUPS_MAX).
+	if n < 0 || n > 1024 {
+		if err != nil {
+			return nil, err
+		}
+		return nil, EINVAL
+	} else if n == 0 {
+		return nil, nil
+	}
+
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
+	if n == -1 {
+		return nil, err
+	}
+	gids = make([]int, n)
+	for i, v := range a[0:n] {
+		gids[i] = int(v)
+	}
+	return
+}
+
+func Setgroups(gids []int) (err error) {
+	if len(gids) == 0 {
+		return setgroups(0, nil)
+	}
+
+	a := make([]_Gid_t, len(gids))
+	for i, v := range gids {
+		a[i] = _Gid_t(v)
+	}
+	return setgroups(len(a), &a[0])
+}
+
+func ReadDirent(fd int, buf []byte) (n int, err error) {
+	// Final argument is (basep *uintptr) and the syscall doesn't take nil.
+	// TODO(rsc): Can we use a single global basep for all calls?
+	return Getdents(fd, buf, new(uintptr))
+}
+
+// Wait status is 7 bits at bottom, either 0 (exited),
+// 0x7F (stopped), or a signal number that caused an exit.
+// The 0x80 bit is whether there was a core dump.
+// An extra number (exit code, signal causing a stop)
+// is in the high bits.
+
+type WaitStatus uint32
+
+const (
+	mask  = 0x7F
+	core  = 0x80
+	shift = 8
+
+	exited  = 0
+	stopped = 0x7F
+)
+
+func (w WaitStatus) Exited() bool { return w&mask == exited }
+
+func (w WaitStatus) ExitStatus() int {
+	if w&mask != exited {
+		return -1
+	}
+	return int(w >> shift)
+}
+
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
+
+func (w WaitStatus) Signal() syscall.Signal {
+	sig := syscall.Signal(w & mask)
+	if sig == stopped || sig == 0 {
+		return -1
+	}
+	return sig
+}
+
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
+
+func (w WaitStatus) Stopped() bool { return w&mask == stopped && syscall.Signal(w>>shift) != SIGSTOP }
+
+func (w WaitStatus) Continued() bool { return w&mask == stopped && syscall.Signal(w>>shift) == SIGSTOP }
+
+func (w WaitStatus) StopSignal() syscall.Signal {
+	if !w.Stopped() {
+		return -1
+	}
+	return syscall.Signal(w>>shift) & 0xFF
+}
+
+func (w WaitStatus) TrapCause() int { return -1 }
+
+//sys	wait4(pid int32, statusp *_C_int, options int, rusage *Rusage) (wpid int32, err error)
+
+func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (int, error) {
+	var status _C_int
+	rpid, err := wait4(int32(pid), &status, options, rusage)
+	wpid := int(rpid)
+	if wpid == -1 {
+		return wpid, err
+	}
+	if wstatus != nil {
+		*wstatus = WaitStatus(status)
+	}
+	return wpid, nil
+}
+
+//sys	gethostname(buf []byte) (n int, err error)
+
+func Gethostname() (name string, err error) {
+	var buf [MaxHostNameLen]byte
+	n, err := gethostname(buf[:])
+	if n != 0 {
+		return "", err
+	}
+	n = clen(buf[:])
+	if n < 1 {
+		return "", EFAULT
+	}
+	return string(buf[:n]), nil
+}
+
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func Utimes(path string, tv []Timeval) (err error) {
+	if tv == nil {
+		return utimes(path, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys	utimensat(fd int, path string, times *[2]Timespec, flag int) (err error)
+
+func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		return utimensat(AT_FDCWD, path, nil, 0)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+}
+
+func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
+	if ts == nil {
+		return utimensat(dirfd, path, nil, flags)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
+}
+
+//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
+
+// FcntlInt performs a fcntl syscall on fd with the provided command and argument.
+func FcntlInt(fd uintptr, cmd, arg int) (int, error) {
+	valptr, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
+	var err error
+	if errno != 0 {
+		err = errno
+	}
+	return int(valptr), err
+}
+
+// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
+func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(lk)), 0, 0, 0)
+	if e1 != 0 {
+		return e1
+	}
+	return nil
+}
+
+//sys	futimesat(fildes int, path *byte, times *[2]Timeval) (err error)
+
+func Futimesat(dirfd int, path string, tv []Timeval) error {
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	if tv == nil {
+		return futimesat(dirfd, pathp, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+// Solaris doesn't have an futimes function because it allows NULL to be
+// specified as the path for futimesat. However, Go doesn't like
+// NULL-style string interfaces, so this simple wrapper is provided.
+func Futimes(fd int, tv []Timeval) error {
+	if tv == nil {
+		return futimesat(fd, nil, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimesat(fd, nil, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
+	switch rsa.Addr.Family {
+	case AF_UNIX:
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
+		sa := new(SockaddrUnix)
+		// Assume path ends at NUL.
+		// This is not technically the Solaris semantics for
+		// abstract Unix domain sockets -- they are supposed
+		// to be uninterpreted fixed-size binary blobs -- but
+		// everyone uses this convention.
+		n := 0
+		for n < len(pp.Path) && pp.Path[n] != 0 {
+			n++
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
+		return sa, nil
+
+	case AF_INET:
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_INET6:
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		sa.ZoneId = pp.Scope_id
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+	}
+	return nil, EAFNOSUPPORT
+}
+
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) = libsocket.accept
+
+func Accept(fd int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept(fd, &rsa, &len)
+	if nfd == -1 {
+		return
+	}
+	sa, err = anyToSockaddr(fd, &rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.__xnet_recvmsg
+
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
+	var msg Msghdr
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
+	msg.Namelen = uint32(SizeofSockaddrAny)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy int8
+	if len(oob) > 0 {
+		// receive at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Accrightslen = int32(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = recvmsg(fd, &msg, flags); n == -1 {
+		return
+	}
+	oobn = int(msg.Accrightslen)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(fd, &rsa)
+	}
+	return
+}
+
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
+	return
+}
+
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.__xnet_sendmsg
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
+	var msg Msghdr
+	msg.Name = (*byte)(unsafe.Pointer(ptr))
+	msg.Namelen = uint32(salen)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy int8
+	if len(oob) > 0 {
+		// send at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Accrightslen = int32(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = sendmsg(fd, &msg, flags); err != nil {
+		return 0, err
+	}
+	if len(oob) > 0 && len(p) == 0 {
+		n = 0
+	}
+	return n, nil
+}
+
+//sys	acct(path *byte) (err error)
+
+func Acct(path string) (err error) {
+	if len(path) == 0 {
+		// Assume caller wants to disable accounting.
+		return acct(nil)
+	}
+
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	return acct(pathp)
+}
+
+//sys	__makedev(version int, major uint, minor uint) (val uint64)
+
+func Mkdev(major, minor uint32) uint64 {
+	return __makedev(NEWDEV, uint(major), uint(minor))
+}
+
+//sys	__major(version int, dev uint64) (val uint)
+
+func Major(dev uint64) uint32 {
+	return uint32(__major(NEWDEV, dev))
+}
+
+//sys	__minor(version int, dev uint64) (val uint)
+
+func Minor(dev uint64) uint32 {
+	return uint32(__minor(NEWDEV, dev))
+}
+
+/*
+ * Expose the ioctl function
+ */
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+func IoctlSetInt(fd int, req uint, value int) (err error) {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func ioctlSetWinsize(fd int, req uint, value *Winsize) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func ioctlSetTermios(fd int, req uint, value *Termios) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermio(fd int, req uint, value *Termio) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermio(fd int, req uint) (*Termio, error) {
+	var value Termio
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+//sys   poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Creat(path string, mode uint32) (fd int, err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Exit(code int)
+//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
+//sys	Fdatasync(fd int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fstatvfs(fd int, vfsstat *Statvfs_t) (err error)
+//sys	Getdents(fd int, buf []byte, basep *uintptr) (n int, err error)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgid int, err error)
+//sys	Geteuid() (euid int)
+//sys	Getegid() (egid int)
+//sys	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (n int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error) = libsocket.__xnet_llisten
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Madvise(b []byte, advice int) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mkfifoat(dirfd int, path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Msync(b []byte, flags int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = lseek
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Sethostname(p []byte) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Shutdown(s int, how int) (err error) = libsocket.shutdown
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statvfs(path string, vfsstat *Statvfs_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sysnb	Times(tms *Tms) (ticks uintptr, err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sys	Umask(mask int) (oldmask int)
+//sysnb	Uname(buf *Utsname) (err error)
+//sys	Unmount(target string, flags int) (err error) = libc.umount
+//sys	Unlink(path string) (err error)
+//sys	Unlinkat(dirfd int, path string, flags int) (err error)
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.__xnet_bind
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.__xnet_connect
+//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = libsendfile.sendfile
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.__xnet_sendto
+//sys	socket(domain int, typ int, proto int) (fd int, err error) = libsocket.__xnet_socket
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) = libsocket.__xnet_socketpair
+//sys	write(fd int, p []byte) (n int, err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) = libsocket.__xnet_getsockopt
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getpeername
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) = libsocket.setsockopt
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = libsocket.recvfrom
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
new file mode 100644
index 00000000..91c32ddf
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
@@ -0,0 +1,23 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,solaris
+
+package unix
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris_test.go b/vendor/golang.org/x/sys/unix/syscall_solaris_test.go
new file mode 100644
index 00000000..57dba882
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris_test.go
@@ -0,0 +1,55 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build solaris
+
+package unix_test
+
+import (
+	"os/exec"
+	"testing"
+	"time"
+
+	"golang.org/x/sys/unix"
+)
+
+func TestSelect(t *testing.T) {
+	err := unix.Select(0, nil, nil, nil, &unix.Timeval{Sec: 0, Usec: 0})
+	if err != nil {
+		t.Fatalf("Select: %v", err)
+	}
+
+	dur := 150 * time.Millisecond
+	tv := unix.NsecToTimeval(int64(dur))
+	start := time.Now()
+	err = unix.Select(0, nil, nil, nil, &tv)
+	took := time.Since(start)
+	if err != nil {
+		t.Fatalf("Select: %v", err)
+	}
+
+	if took < dur {
+		t.Errorf("Select: timeout should have been at least %v, got %v", dur, took)
+	}
+}
+
+func TestStatvfs(t *testing.T) {
+	if err := unix.Statvfs("", nil); err == nil {
+		t.Fatal(`Statvfs("") expected failure`)
+	}
+
+	statvfs := unix.Statvfs_t{}
+	if err := unix.Statvfs("/", &statvfs); err != nil {
+		t.Errorf(`Statvfs("/") failed: %v`, err)
+	}
+
+	if t.Failed() {
+		mount, err := exec.Command("mount").CombinedOutput()
+		if err != nil {
+			t.Logf("mount: %v\n%s", err, mount)
+		} else {
+			t.Logf("mount: %s", mount)
+		}
+	}
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_test.go b/vendor/golang.org/x/sys/unix/syscall_test.go
new file mode 100644
index 00000000..a8eef7cf
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_test.go
@@ -0,0 +1,60 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix_test
+
+import (
+	"fmt"
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+func testSetGetenv(t *testing.T, key, value string) {
+	err := unix.Setenv(key, value)
+	if err != nil {
+		t.Fatalf("Setenv failed to set %q: %v", value, err)
+	}
+	newvalue, found := unix.Getenv(key)
+	if !found {
+		t.Fatalf("Getenv failed to find %v variable (want value %q)", key, value)
+	}
+	if newvalue != value {
+		t.Fatalf("Getenv(%v) = %q; want %q", key, newvalue, value)
+	}
+}
+
+func TestEnv(t *testing.T) {
+	testSetGetenv(t, "TESTENV", "AVALUE")
+	// make sure TESTENV gets set to "", not deleted
+	testSetGetenv(t, "TESTENV", "")
+}
+
+func TestItoa(t *testing.T) {
+	// Make most negative integer: 0x8000...
+	i := 1
+	for i<<1 != 0 {
+		i <<= 1
+	}
+	if i >= 0 {
+		t.Fatal("bad math")
+	}
+	s := unix.Itoa(i)
+	f := fmt.Sprint(i)
+	if s != f {
+		t.Fatalf("itoa(%d) = %s, want %s", i, s, f)
+	}
+}
+
+func TestUname(t *testing.T) {
+	var utsname unix.Utsname
+	err := unix.Uname(&utsname)
+	if err != nil {
+		t.Fatalf("Uname: %v", err)
+	}
+
+	t.Logf("OS: %s/%s %s", utsname.Sysname[:], utsname.Machine[:], utsname.Release[:])
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go
new file mode 100644
index 00000000..95b2180a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_unix.go
@@ -0,0 +1,394 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+import (
+	"bytes"
+	"runtime"
+	"sort"
+	"sync"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	Stdin  = 0
+	Stdout = 1
+	Stderr = 2
+)
+
+const (
+	darwin64Bit    = runtime.GOOS == "darwin" && sizeofPtr == 8
+	dragonfly64Bit = runtime.GOOS == "dragonfly" && sizeofPtr == 8
+	netbsd32Bit    = runtime.GOOS == "netbsd" && sizeofPtr == 4
+	solaris64Bit   = runtime.GOOS == "solaris" && sizeofPtr == 8
+)
+
+// Do the interface allocations only once for common
+// Errno values.
+var (
+	errEAGAIN error = syscall.EAGAIN
+	errEINVAL error = syscall.EINVAL
+	errENOENT error = syscall.ENOENT
+)
+
+// errnoErr returns common boxed Errno values, to prevent
+// allocations at runtime.
+func errnoErr(e syscall.Errno) error {
+	switch e {
+	case 0:
+		return nil
+	case EAGAIN:
+		return errEAGAIN
+	case EINVAL:
+		return errEINVAL
+	case ENOENT:
+		return errENOENT
+	}
+	return e
+}
+
+// ErrnoName returns the error name for error number e.
+func ErrnoName(e syscall.Errno) string {
+	i := sort.Search(len(errorList), func(i int) bool {
+		return errorList[i].num >= e
+	})
+	if i < len(errorList) && errorList[i].num == e {
+		return errorList[i].name
+	}
+	return ""
+}
+
+// SignalName returns the signal name for signal number s.
+func SignalName(s syscall.Signal) string {
+	i := sort.Search(len(signalList), func(i int) bool {
+		return signalList[i].num >= s
+	})
+	if i < len(signalList) && signalList[i].num == s {
+		return signalList[i].name
+	}
+	return ""
+}
+
+// clen returns the index of the first NULL byte in n or len(n) if n contains no NULL byte.
+func clen(n []byte) int {
+	i := bytes.IndexByte(n, 0)
+	if i == -1 {
+		i = len(n)
+	}
+	return i
+}
+
+// Mmap manager, for use by operating system-specific implementations.
+
+type mmapper struct {
+	sync.Mutex
+	active map[*byte][]byte // active mappings; key is last byte in mapping
+	mmap   func(addr, length uintptr, prot, flags, fd int, offset int64) (uintptr, error)
+	munmap func(addr uintptr, length uintptr) error
+}
+
+func (m *mmapper) Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	if length <= 0 {
+		return nil, EINVAL
+	}
+
+	// Map the requested memory.
+	addr, errno := m.mmap(0, uintptr(length), prot, flags, fd, offset)
+	if errno != nil {
+		return nil, errno
+	}
+
+	// Slice memory layout
+	var sl = struct {
+		addr uintptr
+		len  int
+		cap  int
+	}{addr, length, length}
+
+	// Use unsafe to turn sl into a []byte.
+	b := *(*[]byte)(unsafe.Pointer(&sl))
+
+	// Register mapping in m and return it.
+	p := &b[cap(b)-1]
+	m.Lock()
+	defer m.Unlock()
+	m.active[p] = b
+	return b, nil
+}
+
+func (m *mmapper) Munmap(data []byte) (err error) {
+	if len(data) == 0 || len(data) != cap(data) {
+		return EINVAL
+	}
+
+	// Find the base of the mapping.
+	p := &data[cap(data)-1]
+	m.Lock()
+	defer m.Unlock()
+	b := m.active[p]
+	if b == nil || &b[0] != &data[0] {
+		return EINVAL
+	}
+
+	// Unmap the memory and update m.
+	if errno := m.munmap(uintptr(unsafe.Pointer(&b[0])), uintptr(len(b))); errno != nil {
+		return errno
+	}
+	delete(m.active, p)
+	return nil
+}
+
+func Read(fd int, p []byte) (n int, err error) {
+	n, err = read(fd, p)
+	if raceenabled {
+		if n > 0 {
+			raceWriteRange(unsafe.Pointer(&p[0]), n)
+		}
+		if err == nil {
+			raceAcquire(unsafe.Pointer(&ioSync))
+		}
+	}
+	return
+}
+
+func Write(fd int, p []byte) (n int, err error) {
+	if raceenabled {
+		raceReleaseMerge(unsafe.Pointer(&ioSync))
+	}
+	n, err = write(fd, p)
+	if raceenabled && n > 0 {
+		raceReadRange(unsafe.Pointer(&p[0]), n)
+	}
+	return
+}
+
+// For testing: clients can set this flag to force
+// creation of IPv6 sockets to return EAFNOSUPPORT.
+var SocketDisableIPv6 bool
+
+// Sockaddr represents a socket address.
+type Sockaddr interface {
+	sockaddr() (ptr unsafe.Pointer, len _Socklen, err error) // lowercase; only we can define Sockaddrs
+}
+
+// SockaddrInet4 implements the Sockaddr interface for AF_INET type sockets.
+type SockaddrInet4 struct {
+	Port int
+	Addr [4]byte
+	raw  RawSockaddrInet4
+}
+
+// SockaddrInet6 implements the Sockaddr interface for AF_INET6 type sockets.
+type SockaddrInet6 struct {
+	Port   int
+	ZoneId uint32
+	Addr   [16]byte
+	raw    RawSockaddrInet6
+}
+
+// SockaddrUnix implements the Sockaddr interface for AF_UNIX type sockets.
+type SockaddrUnix struct {
+	Name string
+	raw  RawSockaddrUnix
+}
+
+func Bind(fd int, sa Sockaddr) (err error) {
+	ptr, n, err := sa.sockaddr()
+	if err != nil {
+		return err
+	}
+	return bind(fd, ptr, n)
+}
+
+func Connect(fd int, sa Sockaddr) (err error) {
+	ptr, n, err := sa.sockaddr()
+	if err != nil {
+		return err
+	}
+	return connect(fd, ptr, n)
+}
+
+func Getpeername(fd int) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if err = getpeername(fd, &rsa, &len); err != nil {
+		return
+	}
+	return anyToSockaddr(fd, &rsa)
+}
+
+func GetsockoptByte(fd, level, opt int) (value byte, err error) {
+	var n byte
+	vallen := _Socklen(1)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
+	return n, err
+}
+
+func GetsockoptInt(fd, level, opt int) (value int, err error) {
+	var n int32
+	vallen := _Socklen(4)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
+	return int(n), err
+}
+
+func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
+	vallen := _Socklen(4)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
+	return value, err
+}
+
+func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
+	var value IPMreq
+	vallen := _Socklen(SizeofIPMreq)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
+	var value IPv6Mreq
+	vallen := _Socklen(SizeofIPv6Mreq)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
+	var value IPv6MTUInfo
+	vallen := _Socklen(SizeofIPv6MTUInfo)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
+	var value ICMPv6Filter
+	vallen := _Socklen(SizeofICMPv6Filter)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptLinger(fd, level, opt int) (*Linger, error) {
+	var linger Linger
+	vallen := _Socklen(SizeofLinger)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&linger), &vallen)
+	return &linger, err
+}
+
+func GetsockoptTimeval(fd, level, opt int) (*Timeval, error) {
+	var tv Timeval
+	vallen := _Socklen(unsafe.Sizeof(tv))
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&tv), &vallen)
+	return &tv, err
+}
+
+func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if n, err = recvfrom(fd, p, flags, &rsa, &len); err != nil {
+		return
+	}
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(fd, &rsa)
+	}
+	return
+}
+
+func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) {
+	ptr, n, err := to.sockaddr()
+	if err != nil {
+		return err
+	}
+	return sendto(fd, p, flags, ptr, n)
+}
+
+func SetsockoptByte(fd, level, opt int, value byte) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(&value), 1)
+}
+
+func SetsockoptInt(fd, level, opt int, value int) (err error) {
+	var n = int32(value)
+	return setsockopt(fd, level, opt, unsafe.Pointer(&n), 4)
+}
+
+func SetsockoptInet4Addr(fd, level, opt int, value [4]byte) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(&value[0]), 4)
+}
+
+func SetsockoptIPMreq(fd, level, opt int, mreq *IPMreq) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPMreq)
+}
+
+func SetsockoptIPv6Mreq(fd, level, opt int, mreq *IPv6Mreq) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPv6Mreq)
+}
+
+func SetsockoptICMPv6Filter(fd, level, opt int, filter *ICMPv6Filter) error {
+	return setsockopt(fd, level, opt, unsafe.Pointer(filter), SizeofICMPv6Filter)
+}
+
+func SetsockoptLinger(fd, level, opt int, l *Linger) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(l), SizeofLinger)
+}
+
+func SetsockoptString(fd, level, opt int, s string) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(&[]byte(s)[0]), uintptr(len(s)))
+}
+
+func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(tv), unsafe.Sizeof(*tv))
+}
+
+func Socket(domain, typ, proto int) (fd int, err error) {
+	if domain == AF_INET6 && SocketDisableIPv6 {
+		return -1, EAFNOSUPPORT
+	}
+	fd, err = socket(domain, typ, proto)
+	return
+}
+
+func Socketpair(domain, typ, proto int) (fd [2]int, err error) {
+	var fdx [2]int32
+	err = socketpair(domain, typ, proto, &fdx)
+	if err == nil {
+		fd[0] = int(fdx[0])
+		fd[1] = int(fdx[1])
+	}
+	return
+}
+
+func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	if raceenabled {
+		raceReleaseMerge(unsafe.Pointer(&ioSync))
+	}
+	return sendfile(outfd, infd, offset, count)
+}
+
+var ioSync int64
+
+func CloseOnExec(fd int) { fcntl(fd, F_SETFD, FD_CLOEXEC) }
+
+func SetNonblock(fd int, nonblocking bool) (err error) {
+	flag, err := fcntl(fd, F_GETFL, 0)
+	if err != nil {
+		return err
+	}
+	if nonblocking {
+		flag |= O_NONBLOCK
+	} else {
+		flag &= ^O_NONBLOCK
+	}
+	_, err = fcntl(fd, F_SETFL, flag)
+	return err
+}
+
+// Exec calls execve(2), which replaces the calling executable in the process
+// tree. argv0 should be the full path to an executable ("/bin/ls") and the
+// executable name should also be the first argument in argv (["ls", "-l"]).
+// envv are the environment variables that should be passed to the new
+// process (["USER=go", "PWD=/tmp"]).
+func Exec(argv0 string, argv []string, envv []string) error {
+	return syscall.Exec(argv0, argv, envv)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix_gc.go b/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
new file mode 100644
index 00000000..4cb8e8ed
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
@@ -0,0 +1,15 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build !gccgo
+
+package unix
+
+import "syscall"
+
+func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix_test.go b/vendor/golang.org/x/sys/unix/syscall_unix_test.go
new file mode 100644
index 00000000..d694990d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_unix_test.go
@@ -0,0 +1,657 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix_test
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"syscall"
+	"testing"
+	"time"
+
+	"golang.org/x/sys/unix"
+)
+
+// Tests that below functions, structures and constants are consistent
+// on all Unix-like systems.
+func _() {
+	// program scheduling priority functions and constants
+	var (
+		_ func(int, int, int) error   = unix.Setpriority
+		_ func(int, int) (int, error) = unix.Getpriority
+	)
+	const (
+		_ int = unix.PRIO_USER
+		_ int = unix.PRIO_PROCESS
+		_ int = unix.PRIO_PGRP
+	)
+
+	// termios constants
+	const (
+		_ int = unix.TCIFLUSH
+		_ int = unix.TCIOFLUSH
+		_ int = unix.TCOFLUSH
+	)
+
+	// fcntl file locking structure and constants
+	var (
+		_ = unix.Flock_t{
+			Type:   int16(0),
+			Whence: int16(0),
+			Start:  int64(0),
+			Len:    int64(0),
+			Pid:    int32(0),
+		}
+	)
+	const (
+		_ = unix.F_GETLK
+		_ = unix.F_SETLK
+		_ = unix.F_SETLKW
+	)
+}
+
+func TestErrnoSignalName(t *testing.T) {
+	testErrors := []struct {
+		num  syscall.Errno
+		name string
+	}{
+		{syscall.EPERM, "EPERM"},
+		{syscall.EINVAL, "EINVAL"},
+		{syscall.ENOENT, "ENOENT"},
+	}
+
+	for _, te := range testErrors {
+		t.Run(fmt.Sprintf("%d/%s", te.num, te.name), func(t *testing.T) {
+			e := unix.ErrnoName(te.num)
+			if e != te.name {
+				t.Errorf("ErrnoName(%d) returned %s, want %s", te.num, e, te.name)
+			}
+		})
+	}
+
+	testSignals := []struct {
+		num  syscall.Signal
+		name string
+	}{
+		{syscall.SIGHUP, "SIGHUP"},
+		{syscall.SIGPIPE, "SIGPIPE"},
+		{syscall.SIGSEGV, "SIGSEGV"},
+	}
+
+	for _, ts := range testSignals {
+		t.Run(fmt.Sprintf("%d/%s", ts.num, ts.name), func(t *testing.T) {
+			s := unix.SignalName(ts.num)
+			if s != ts.name {
+				t.Errorf("SignalName(%d) returned %s, want %s", ts.num, s, ts.name)
+			}
+		})
+	}
+}
+
+func TestFcntlInt(t *testing.T) {
+	t.Parallel()
+	file, err := ioutil.TempFile("", "TestFnctlInt")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(file.Name())
+	defer file.Close()
+	f := file.Fd()
+	flags, err := unix.FcntlInt(f, unix.F_GETFD, 0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if flags&unix.FD_CLOEXEC == 0 {
+		t.Errorf("flags %#x do not include FD_CLOEXEC", flags)
+	}
+}
+
+// TestFcntlFlock tests whether the file locking structure matches
+// the calling convention of each kernel.
+func TestFcntlFlock(t *testing.T) {
+	name := filepath.Join(os.TempDir(), "TestFcntlFlock")
+	fd, err := unix.Open(name, unix.O_CREAT|unix.O_RDWR|unix.O_CLOEXEC, 0)
+	if err != nil {
+		t.Fatalf("Open failed: %v", err)
+	}
+	defer unix.Unlink(name)
+	defer unix.Close(fd)
+	flock := unix.Flock_t{
+		Type:  unix.F_RDLCK,
+		Start: 0, Len: 0, Whence: 1,
+	}
+	if err := unix.FcntlFlock(uintptr(fd), unix.F_GETLK, &flock); err != nil {
+		t.Fatalf("FcntlFlock failed: %v", err)
+	}
+}
+
+// TestPassFD tests passing a file descriptor over a Unix socket.
+//
+// This test involved both a parent and child process. The parent
+// process is invoked as a normal test, with "go test", which then
+// runs the child process by running the current test binary with args
+// "-test.run=^TestPassFD$" and an environment variable used to signal
+// that the test should become the child process instead.
+func TestPassFD(t *testing.T) {
+	if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
+		t.Skip("cannot exec subprocess on iOS, skipping test")
+	}
+
+	if os.Getenv("GO_WANT_HELPER_PROCESS") == "1" {
+		passFDChild()
+		return
+	}
+
+	tempDir, err := ioutil.TempDir("", "TestPassFD")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	fds, err := unix.Socketpair(unix.AF_LOCAL, unix.SOCK_STREAM, 0)
+	if err != nil {
+		t.Fatalf("Socketpair: %v", err)
+	}
+	defer unix.Close(fds[0])
+	defer unix.Close(fds[1])
+	writeFile := os.NewFile(uintptr(fds[0]), "child-writes")
+	readFile := os.NewFile(uintptr(fds[1]), "parent-reads")
+	defer writeFile.Close()
+	defer readFile.Close()
+
+	cmd := exec.Command(os.Args[0], "-test.run=^TestPassFD$", "--", tempDir)
+	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+	if lp := os.Getenv("LD_LIBRARY_PATH"); lp != "" {
+		cmd.Env = append(cmd.Env, "LD_LIBRARY_PATH="+lp)
+	}
+	cmd.ExtraFiles = []*os.File{writeFile}
+
+	out, err := cmd.CombinedOutput()
+	if len(out) > 0 || err != nil {
+		t.Fatalf("child process: %q, %v", out, err)
+	}
+
+	c, err := net.FileConn(readFile)
+	if err != nil {
+		t.Fatalf("FileConn: %v", err)
+	}
+	defer c.Close()
+
+	uc, ok := c.(*net.UnixConn)
+	if !ok {
+		t.Fatalf("unexpected FileConn type; expected UnixConn, got %T", c)
+	}
+
+	buf := make([]byte, 32) // expect 1 byte
+	oob := make([]byte, 32) // expect 24 bytes
+	closeUnix := time.AfterFunc(5*time.Second, func() {
+		t.Logf("timeout reading from unix socket")
+		uc.Close()
+	})
+	_, oobn, _, _, err := uc.ReadMsgUnix(buf, oob)
+	if err != nil {
+		t.Fatalf("ReadMsgUnix: %v", err)
+	}
+	closeUnix.Stop()
+
+	scms, err := unix.ParseSocketControlMessage(oob[:oobn])
+	if err != nil {
+		t.Fatalf("ParseSocketControlMessage: %v", err)
+	}
+	if len(scms) != 1 {
+		t.Fatalf("expected 1 SocketControlMessage; got scms = %#v", scms)
+	}
+	scm := scms[0]
+	gotFds, err := unix.ParseUnixRights(&scm)
+	if err != nil {
+		t.Fatalf("unix.ParseUnixRights: %v", err)
+	}
+	if len(gotFds) != 1 {
+		t.Fatalf("wanted 1 fd; got %#v", gotFds)
+	}
+
+	f := os.NewFile(uintptr(gotFds[0]), "fd-from-child")
+	defer f.Close()
+
+	got, err := ioutil.ReadAll(f)
+	want := "Hello from child process!\n"
+	if string(got) != want {
+		t.Errorf("child process ReadAll: %q, %v; want %q", got, err, want)
+	}
+}
+
+// passFDChild is the child process used by TestPassFD.
+func passFDChild() {
+	defer os.Exit(0)
+
+	// Look for our fd. It should be fd 3, but we work around an fd leak
+	// bug here (http://golang.org/issue/2603) to let it be elsewhere.
+	var uc *net.UnixConn
+	for fd := uintptr(3); fd <= 10; fd++ {
+		f := os.NewFile(fd, "unix-conn")
+		var ok bool
+		netc, _ := net.FileConn(f)
+		uc, ok = netc.(*net.UnixConn)
+		if ok {
+			break
+		}
+	}
+	if uc == nil {
+		fmt.Println("failed to find unix fd")
+		return
+	}
+
+	// Make a file f to send to our parent process on uc.
+	// We make it in tempDir, which our parent will clean up.
+	flag.Parse()
+	tempDir := flag.Arg(0)
+	f, err := ioutil.TempFile(tempDir, "")
+	if err != nil {
+		fmt.Printf("TempFile: %v", err)
+		return
+	}
+
+	f.Write([]byte("Hello from child process!\n"))
+	f.Seek(0, 0)
+
+	rights := unix.UnixRights(int(f.Fd()))
+	dummyByte := []byte("x")
+	n, oobn, err := uc.WriteMsgUnix(dummyByte, rights, nil)
+	if err != nil {
+		fmt.Printf("WriteMsgUnix: %v", err)
+		return
+	}
+	if n != 1 || oobn != len(rights) {
+		fmt.Printf("WriteMsgUnix = %d, %d; want 1, %d", n, oobn, len(rights))
+		return
+	}
+}
+
+// TestUnixRightsRoundtrip tests that UnixRights, ParseSocketControlMessage,
+// and ParseUnixRights are able to successfully round-trip lists of file descriptors.
+func TestUnixRightsRoundtrip(t *testing.T) {
+	testCases := [...][][]int{
+		{{42}},
+		{{1, 2}},
+		{{3, 4, 5}},
+		{{}},
+		{{1, 2}, {3, 4, 5}, {}, {7}},
+	}
+	for _, testCase := range testCases {
+		b := []byte{}
+		var n int
+		for _, fds := range testCase {
+			// Last assignment to n wins
+			n = len(b) + unix.CmsgLen(4*len(fds))
+			b = append(b, unix.UnixRights(fds...)...)
+		}
+		// Truncate b
+		b = b[:n]
+
+		scms, err := unix.ParseSocketControlMessage(b)
+		if err != nil {
+			t.Fatalf("ParseSocketControlMessage: %v", err)
+		}
+		if len(scms) != len(testCase) {
+			t.Fatalf("expected %v SocketControlMessage; got scms = %#v", len(testCase), scms)
+		}
+		for i, scm := range scms {
+			gotFds, err := unix.ParseUnixRights(&scm)
+			if err != nil {
+				t.Fatalf("ParseUnixRights: %v", err)
+			}
+			wantFds := testCase[i]
+			if len(gotFds) != len(wantFds) {
+				t.Fatalf("expected %v fds, got %#v", len(wantFds), gotFds)
+			}
+			for j, fd := range gotFds {
+				if fd != wantFds[j] {
+					t.Fatalf("expected fd %v, got %v", wantFds[j], fd)
+				}
+			}
+		}
+	}
+}
+
+func TestRlimit(t *testing.T) {
+	var rlimit, zero unix.Rlimit
+	err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rlimit)
+	if err != nil {
+		t.Fatalf("Getrlimit: save failed: %v", err)
+	}
+	if zero == rlimit {
+		t.Fatalf("Getrlimit: save failed: got zero value %#v", rlimit)
+	}
+	set := rlimit
+	set.Cur = set.Max - 1
+	err = unix.Setrlimit(unix.RLIMIT_NOFILE, &set)
+	if err != nil {
+		t.Fatalf("Setrlimit: set failed: %#v %v", set, err)
+	}
+	var get unix.Rlimit
+	err = unix.Getrlimit(unix.RLIMIT_NOFILE, &get)
+	if err != nil {
+		t.Fatalf("Getrlimit: get failed: %v", err)
+	}
+	set = rlimit
+	set.Cur = set.Max - 1
+	if set != get {
+		// Seems like Darwin requires some privilege to
+		// increase the soft limit of rlimit sandbox, though
+		// Setrlimit never reports an error.
+		switch runtime.GOOS {
+		case "darwin":
+		default:
+			t.Fatalf("Rlimit: change failed: wanted %#v got %#v", set, get)
+		}
+	}
+	err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rlimit)
+	if err != nil {
+		t.Fatalf("Setrlimit: restore failed: %#v %v", rlimit, err)
+	}
+}
+
+func TestSeekFailure(t *testing.T) {
+	_, err := unix.Seek(-1, 0, 0)
+	if err == nil {
+		t.Fatalf("Seek(-1, 0, 0) did not fail")
+	}
+	str := err.Error() // used to crash on Linux
+	t.Logf("Seek: %v", str)
+	if str == "" {
+		t.Fatalf("Seek(-1, 0, 0) return error with empty message")
+	}
+}
+
+func TestDup(t *testing.T) {
+	file, err := ioutil.TempFile("", "TestDup")
+	if err != nil {
+		t.Fatalf("Tempfile failed: %v", err)
+	}
+	defer os.Remove(file.Name())
+	defer file.Close()
+	f := int(file.Fd())
+
+	newFd, err := unix.Dup(f)
+	if err != nil {
+		t.Fatalf("Dup: %v", err)
+	}
+
+	err = unix.Dup2(newFd, newFd+1)
+	if err != nil {
+		t.Fatalf("Dup2: %v", err)
+	}
+
+	b1 := []byte("Test123")
+	b2 := make([]byte, 7)
+	_, err = unix.Write(newFd+1, b1)
+	if err != nil {
+		t.Fatalf("Write to dup2 fd failed: %v", err)
+	}
+	_, err = unix.Seek(f, 0, 0)
+	if err != nil {
+		t.Fatalf("Seek failed: %v", err)
+	}
+	_, err = unix.Read(f, b2)
+	if err != nil {
+		t.Fatalf("Read back failed: %v", err)
+	}
+	if string(b1) != string(b2) {
+		t.Errorf("Dup: stdout write not in file, expected %v, got %v", string(b1), string(b2))
+	}
+}
+
+func TestPoll(t *testing.T) {
+	if runtime.GOOS == "android" ||
+		(runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64")) {
+		t.Skip("mkfifo syscall is not available on android and iOS, skipping test")
+	}
+
+	f, cleanup := mktmpfifo(t)
+	defer cleanup()
+
+	const timeout = 100
+
+	ok := make(chan bool, 1)
+	go func() {
+		select {
+		case <-time.After(10 * timeout * time.Millisecond):
+			t.Errorf("Poll: failed to timeout after %d milliseconds", 10*timeout)
+		case <-ok:
+		}
+	}()
+
+	fds := []unix.PollFd{{Fd: int32(f.Fd()), Events: unix.POLLIN}}
+	n, err := unix.Poll(fds, timeout)
+	ok <- true
+	if err != nil {
+		t.Errorf("Poll: unexpected error: %v", err)
+		return
+	}
+	if n != 0 {
+		t.Errorf("Poll: wrong number of events: got %v, expected %v", n, 0)
+		return
+	}
+}
+
+func TestGetwd(t *testing.T) {
+	fd, err := os.Open(".")
+	if err != nil {
+		t.Fatalf("Open .: %s", err)
+	}
+	defer fd.Close()
+	// These are chosen carefully not to be symlinks on a Mac
+	// (unlike, say, /var, /etc)
+	dirs := []string{"/", "/usr/bin"}
+	switch runtime.GOOS {
+	case "android":
+		dirs = []string{"/", "/system/bin"}
+	case "darwin":
+		switch runtime.GOARCH {
+		case "arm", "arm64":
+			d1, err := ioutil.TempDir("", "d1")
+			if err != nil {
+				t.Fatalf("TempDir: %v", err)
+			}
+			d2, err := ioutil.TempDir("", "d2")
+			if err != nil {
+				t.Fatalf("TempDir: %v", err)
+			}
+			dirs = []string{d1, d2}
+		}
+	}
+	oldwd := os.Getenv("PWD")
+	for _, d := range dirs {
+		err = os.Chdir(d)
+		if err != nil {
+			t.Fatalf("Chdir: %v", err)
+		}
+		pwd, err := unix.Getwd()
+		if err != nil {
+			t.Fatalf("Getwd in %s: %s", d, err)
+		}
+		os.Setenv("PWD", oldwd)
+		err = fd.Chdir()
+		if err != nil {
+			// We changed the current directory and cannot go back.
+			// Don't let the tests continue; they'll scribble
+			// all over some other directory.
+			fmt.Fprintf(os.Stderr, "fchdir back to dot failed: %s\n", err)
+			os.Exit(1)
+		}
+		if pwd != d {
+			t.Fatalf("Getwd returned %q want %q", pwd, d)
+		}
+	}
+}
+
+func TestFstatat(t *testing.T) {
+	defer chtmpdir(t)()
+
+	touch(t, "file1")
+
+	var st1 unix.Stat_t
+	err := unix.Stat("file1", &st1)
+	if err != nil {
+		t.Fatalf("Stat: %v", err)
+	}
+
+	var st2 unix.Stat_t
+	err = unix.Fstatat(unix.AT_FDCWD, "file1", &st2, 0)
+	if err != nil {
+		t.Fatalf("Fstatat: %v", err)
+	}
+
+	if st1 != st2 {
+		t.Errorf("Fstatat: returned stat does not match Stat")
+	}
+
+	err = os.Symlink("file1", "symlink1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = unix.Lstat("symlink1", &st1)
+	if err != nil {
+		t.Fatalf("Lstat: %v", err)
+	}
+
+	err = unix.Fstatat(unix.AT_FDCWD, "symlink1", &st2, unix.AT_SYMLINK_NOFOLLOW)
+	if err != nil {
+		t.Fatalf("Fstatat: %v", err)
+	}
+
+	if st1 != st2 {
+		t.Errorf("Fstatat: returned stat does not match Lstat")
+	}
+}
+
+func TestFchmodat(t *testing.T) {
+	defer chtmpdir(t)()
+
+	touch(t, "file1")
+	err := os.Symlink("file1", "symlink1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	mode := os.FileMode(0444)
+	err = unix.Fchmodat(unix.AT_FDCWD, "symlink1", uint32(mode), 0)
+	if err != nil {
+		t.Fatalf("Fchmodat: unexpected error: %v", err)
+	}
+
+	fi, err := os.Stat("file1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if fi.Mode() != mode {
+		t.Errorf("Fchmodat: failed to change file mode: expected %v, got %v", mode, fi.Mode())
+	}
+
+	mode = os.FileMode(0644)
+	didChmodSymlink := true
+	err = unix.Fchmodat(unix.AT_FDCWD, "symlink1", uint32(mode), unix.AT_SYMLINK_NOFOLLOW)
+	if err != nil {
+		if (runtime.GOOS == "android" || runtime.GOOS == "linux" || runtime.GOOS == "solaris") && err == unix.EOPNOTSUPP {
+			// Linux and Illumos don't support flags != 0
+			didChmodSymlink = false
+		} else {
+			t.Fatalf("Fchmodat: unexpected error: %v", err)
+		}
+	}
+
+	if !didChmodSymlink {
+		// Didn't change mode of the symlink. On Linux, the permissions
+		// of a symbolic link are always 0777 according to symlink(7)
+		mode = os.FileMode(0777)
+	}
+
+	var st unix.Stat_t
+	err = unix.Lstat("symlink1", &st)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	got := os.FileMode(st.Mode & 0777)
+	if got != mode {
+		t.Errorf("Fchmodat: failed to change symlink mode: expected %v, got %v", mode, got)
+	}
+}
+
+func TestMkdev(t *testing.T) {
+	major := uint32(42)
+	minor := uint32(7)
+	dev := unix.Mkdev(major, minor)
+
+	if unix.Major(dev) != major {
+		t.Errorf("Major(%#x) == %d, want %d", dev, unix.Major(dev), major)
+	}
+	if unix.Minor(dev) != minor {
+		t.Errorf("Minor(%#x) == %d, want %d", dev, unix.Minor(dev), minor)
+	}
+}
+
+// mktmpfifo creates a temporary FIFO and provides a cleanup function.
+func mktmpfifo(t *testing.T) (*os.File, func()) {
+	err := unix.Mkfifo("fifo", 0666)
+	if err != nil {
+		t.Fatalf("mktmpfifo: failed to create FIFO: %v", err)
+	}
+
+	f, err := os.OpenFile("fifo", os.O_RDWR, 0666)
+	if err != nil {
+		os.Remove("fifo")
+		t.Fatalf("mktmpfifo: failed to open FIFO: %v", err)
+	}
+
+	return f, func() {
+		f.Close()
+		os.Remove("fifo")
+	}
+}
+
+// utilities taken from os/os_test.go
+
+func touch(t *testing.T, name string) {
+	f, err := os.Create(name)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := f.Close(); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// chtmpdir changes the working directory to a new temporary directory and
+// provides a cleanup function. Used when PWD is read-only.
+func chtmpdir(t *testing.T) func() {
+	oldwd, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("chtmpdir: %v", err)
+	}
+	d, err := ioutil.TempDir("", "test")
+	if err != nil {
+		t.Fatalf("chtmpdir: %v", err)
+	}
+	if err := os.Chdir(d); err != nil {
+		t.Fatalf("chtmpdir: %v", err)
+	}
+	return func() {
+		if err := os.Chdir(oldwd); err != nil {
+			t.Fatalf("chtmpdir: %v", err)
+		}
+		os.RemoveAll(d)
+	}
+}
diff --git a/vendor/golang.org/x/sys/unix/timestruct.go b/vendor/golang.org/x/sys/unix/timestruct.go
new file mode 100644
index 00000000..47b9011e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/timestruct.go
@@ -0,0 +1,82 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+import "time"
+
+// TimespecToNsec converts a Timespec value into a number of
+// nanoseconds since the Unix epoch.
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+// NsecToTimespec takes a number of nanoseconds since the Unix epoch
+// and returns the corresponding Timespec value.
+func NsecToTimespec(nsec int64) Timespec {
+	sec := nsec / 1e9
+	nsec = nsec % 1e9
+	if nsec < 0 {
+		nsec += 1e9
+		sec--
+	}
+	return setTimespec(sec, nsec)
+}
+
+// TimeToTimespec converts t into a Timespec.
+// On some 32-bit systems the range of valid Timespec values are smaller
+// than that of time.Time values.  So if t is out of the valid range of
+// Timespec, it returns a zero Timespec and ERANGE.
+func TimeToTimespec(t time.Time) (Timespec, error) {
+	sec := t.Unix()
+	nsec := int64(t.Nanosecond())
+	ts := setTimespec(sec, nsec)
+
+	// Currently all targets have either int32 or int64 for Timespec.Sec.
+	// If there were a new target with floating point type for it, we have
+	// to consider the rounding error.
+	if int64(ts.Sec) != sec {
+		return Timespec{}, ERANGE
+	}
+	return ts, nil
+}
+
+// TimevalToNsec converts a Timeval value into a number of nanoseconds
+// since the Unix epoch.
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+
+// NsecToTimeval takes a number of nanoseconds since the Unix epoch
+// and returns the corresponding Timeval value.
+func NsecToTimeval(nsec int64) Timeval {
+	nsec += 999 // round up to microsecond
+	usec := nsec % 1e9 / 1e3
+	sec := nsec / 1e9
+	if usec < 0 {
+		usec += 1e6
+		sec--
+	}
+	return setTimeval(sec, usec)
+}
+
+// Unix returns ts as the number of seconds and nanoseconds elapsed since the
+// Unix epoch.
+func (ts *Timespec) Unix() (sec int64, nsec int64) {
+	return int64(ts.Sec), int64(ts.Nsec)
+}
+
+// Unix returns tv as the number of seconds and nanoseconds elapsed since the
+// Unix epoch.
+func (tv *Timeval) Unix() (sec int64, nsec int64) {
+	return int64(tv.Sec), int64(tv.Usec) * 1000
+}
+
+// Nano returns ts as the number of nanoseconds elapsed since the Unix epoch.
+func (ts *Timespec) Nano() int64 {
+	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
+}
+
+// Nano returns tv as the number of nanoseconds elapsed since the Unix epoch.
+func (tv *Timeval) Nano() int64 {
+	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
+}
diff --git a/vendor/golang.org/x/sys/unix/timestruct_test.go b/vendor/golang.org/x/sys/unix/timestruct_test.go
new file mode 100644
index 00000000..4215f46d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/timestruct_test.go
@@ -0,0 +1,54 @@
+// Copyright 2017 The Go Authors. All right reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix_test
+
+import (
+	"testing"
+	"time"
+	"unsafe"
+
+	"golang.org/x/sys/unix"
+)
+
+func TestTimeToTimespec(t *testing.T) {
+	timeTests := []struct {
+		time  time.Time
+		valid bool
+	}{
+		{time.Unix(0, 0), true},
+		{time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC), true},
+		{time.Date(2262, time.December, 31, 23, 0, 0, 0, time.UTC), false},
+		{time.Unix(0x7FFFFFFF, 0), true},
+		{time.Unix(0x80000000, 0), false},
+		{time.Unix(0x7FFFFFFF, 1000000000), false},
+		{time.Unix(0x7FFFFFFF, 999999999), true},
+		{time.Unix(-0x80000000, 0), true},
+		{time.Unix(-0x80000001, 0), false},
+		{time.Date(2038, time.January, 19, 3, 14, 7, 0, time.UTC), true},
+		{time.Date(2038, time.January, 19, 3, 14, 8, 0, time.UTC), false},
+		{time.Date(1901, time.December, 13, 20, 45, 52, 0, time.UTC), true},
+		{time.Date(1901, time.December, 13, 20, 45, 51, 0, time.UTC), false},
+	}
+
+	// Currently all targets have either int32 or int64 for Timespec.Sec.
+	// If there were a new target with unsigned or floating point type for
+	// it, this test must be adjusted.
+	have64BitTime := (unsafe.Sizeof(unix.Timespec{}.Sec) == 8)
+	for _, tt := range timeTests {
+		ts, err := unix.TimeToTimespec(tt.time)
+		tt.valid = tt.valid || have64BitTime
+		if tt.valid && err != nil {
+			t.Errorf("TimeToTimespec(%v): %v", tt.time, err)
+		}
+		if err == nil {
+			tstime := time.Unix(int64(ts.Sec), int64(ts.Nsec))
+			if !tstime.Equal(tt.time) {
+				t.Errorf("TimeToTimespec(%v) is the time %v", tt.time, tstime)
+			}
+		}
+	}
+}
diff --git a/vendor/golang.org/x/sys/unix/types_darwin.go b/vendor/golang.org/x/sys/unix/types_darwin.go
new file mode 100644
index 00000000..46b9908e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_darwin.go
@@ -0,0 +1,277 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See README.md
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define __DARWIN_UNIX03 0
+#define KERNEL
+#define _DARWIN_USE_64_BIT_INODE
+#include <dirent.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <signal.h>
+#include <termios.h>
+#include <unistd.h>
+#include <mach/mach.h>
+#include <mach/message.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_var.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+type Timeval32 C.struct_timeval32
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+type Stat_t C.struct_stat64
+
+type Statfs_t C.struct_statfs64
+
+type Flock_t C.struct_flock
+
+type Fstore_t C.struct_fstore
+
+type Radvisory_t C.struct_radvisory
+
+type Fbootstraptransfer_t C.struct_fbootstraptransfer
+
+type Log2phys_t C.struct_log2phys
+
+type Fsid C.struct_fsid
+
+type Dirent C.struct_dirent
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet4Pktinfo C.struct_in_pktinfo
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet4Pktinfo     = C.sizeof_struct_in_pktinfo
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr    = C.sizeof_struct_if_msghdr
+	SizeofIfData      = C.sizeof_struct_if_data
+	SizeofIfaMsghdr   = C.sizeof_struct_ifa_msghdr
+	SizeofIfmaMsghdr  = C.sizeof_struct_ifma_msghdr
+	SizeofIfmaMsghdr2 = C.sizeof_struct_ifma_msghdr2
+	SizeofRtMsghdr    = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics   = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfmaMsghdr C.struct_ifma_msghdr
+
+type IfmaMsghdr2 C.struct_ifma_msghdr2
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
+
+// uname
+
+type Utsname C.struct_utsname
diff --git a/vendor/golang.org/x/sys/unix/types_dragonfly.go b/vendor/golang.org/x/sys/unix/types_dragonfly.go
new file mode 100644
index 00000000..0c633048
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_dragonfly.go
@@ -0,0 +1,280 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See README.md
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+#include <dirent.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <signal.h>
+#include <termios.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+const ( // Directory mode bits
+	S_IFMT   = C.S_IFMT
+	S_IFIFO  = C.S_IFIFO
+	S_IFCHR  = C.S_IFCHR
+	S_IFDIR  = C.S_IFDIR
+	S_IFBLK  = C.S_IFBLK
+	S_IFREG  = C.S_IFREG
+	S_IFLNK  = C.S_IFLNK
+	S_IFSOCK = C.S_IFSOCK
+	S_ISUID  = C.S_ISUID
+	S_ISGID  = C.S_ISGID
+	S_ISVTX  = C.S_ISVTX
+	S_IRUSR  = C.S_IRUSR
+	S_IWUSR  = C.S_IWUSR
+	S_IXUSR  = C.S_IXUSR
+)
+
+type Stat_t C.struct_stat
+
+type Statfs_t C.struct_statfs
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+type Fsid C.struct_fsid
+
+// File system limits
+
+const (
+	PathMax = C.PATH_MAX
+)
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
+	SizeofIfData           = C.sizeof_struct_if_data
+	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
+	SizeofIfmaMsghdr       = C.sizeof_struct_ifma_msghdr
+	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
+	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfmaMsghdr C.struct_ifma_msghdr
+
+type IfAnnounceMsghdr C.struct_if_announcemsghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
+
+// Uname
+
+type Utsname C.struct_utsname
diff --git a/vendor/golang.org/x/sys/unix/types_freebsd.go b/vendor/golang.org/x/sys/unix/types_freebsd.go
new file mode 100644
index 00000000..f4b6bf96
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_freebsd.go
@@ -0,0 +1,404 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See README.md
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+#include <dirent.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <signal.h>
+#include <termios.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/capability.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+// This structure is a duplicate of stat on FreeBSD 8-STABLE.
+// See /usr/include/sys/stat.h.
+struct stat8 {
+#undef st_atimespec	st_atim
+#undef st_mtimespec	st_mtim
+#undef st_ctimespec	st_ctim
+#undef st_birthtimespec	st_birthtim
+	__dev_t   st_dev;
+	ino_t     st_ino;
+	mode_t    st_mode;
+	nlink_t   st_nlink;
+	uid_t     st_uid;
+	gid_t     st_gid;
+	__dev_t   st_rdev;
+#if __BSD_VISIBLE
+	struct  timespec st_atimespec;
+	struct  timespec st_mtimespec;
+	struct  timespec st_ctimespec;
+#else
+	time_t    st_atime;
+	long      __st_atimensec;
+	time_t    st_mtime;
+	long      __st_mtimensec;
+	time_t    st_ctime;
+	long      __st_ctimensec;
+#endif
+	off_t     st_size;
+	blkcnt_t st_blocks;
+	blksize_t st_blksize;
+	fflags_t  st_flags;
+	__uint32_t st_gen;
+	__int32_t st_lspare;
+#if __BSD_VISIBLE
+	struct timespec st_birthtimespec;
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
+#else
+	time_t    st_birthtime;
+	long      st_birthtimensec;
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
+#endif
+};
+
+// This structure is a duplicate of if_data on FreeBSD 8-STABLE.
+// See /usr/include/net/if.h.
+struct if_data8 {
+	u_char  ifi_type;
+	u_char  ifi_physical;
+	u_char  ifi_addrlen;
+	u_char  ifi_hdrlen;
+	u_char  ifi_link_state;
+	u_char  ifi_spare_char1;
+	u_char  ifi_spare_char2;
+	u_char  ifi_datalen;
+	u_long  ifi_mtu;
+	u_long  ifi_metric;
+	u_long  ifi_baudrate;
+	u_long  ifi_ipackets;
+	u_long  ifi_ierrors;
+	u_long  ifi_opackets;
+	u_long  ifi_oerrors;
+	u_long  ifi_collisions;
+	u_long  ifi_ibytes;
+	u_long  ifi_obytes;
+	u_long  ifi_imcasts;
+	u_long  ifi_omcasts;
+	u_long  ifi_iqdrops;
+	u_long  ifi_noproto;
+	u_long  ifi_hwassist;
+// FIXME: these are now unions, so maybe need to change definitions?
+#undef ifi_epoch
+	time_t  ifi_epoch;
+#undef ifi_lastchange
+	struct  timeval ifi_lastchange;
+};
+
+// This structure is a duplicate of if_msghdr on FreeBSD 8-STABLE.
+// See /usr/include/net/if.h.
+struct if_msghdr8 {
+	u_short ifm_msglen;
+	u_char  ifm_version;
+	u_char  ifm_type;
+	int     ifm_addrs;
+	int     ifm_flags;
+	u_short ifm_index;
+	struct  if_data8 ifm_data;
+};
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+const ( // Directory mode bits
+	S_IFMT   = C.S_IFMT
+	S_IFIFO  = C.S_IFIFO
+	S_IFCHR  = C.S_IFCHR
+	S_IFDIR  = C.S_IFDIR
+	S_IFBLK  = C.S_IFBLK
+	S_IFREG  = C.S_IFREG
+	S_IFLNK  = C.S_IFLNK
+	S_IFSOCK = C.S_IFSOCK
+	S_ISUID  = C.S_ISUID
+	S_ISGID  = C.S_ISGID
+	S_ISVTX  = C.S_ISVTX
+	S_IRUSR  = C.S_IRUSR
+	S_IWUSR  = C.S_IWUSR
+	S_IXUSR  = C.S_IXUSR
+	S_IRWXG  = C.S_IRWXG
+	S_IRWXO  = C.S_IRWXO
+)
+
+type Stat_t C.struct_stat8
+
+type Statfs_t C.struct_statfs
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+type Fsid C.struct_fsid
+
+// File system limits
+
+const (
+	PathMax = C.PATH_MAX
+)
+
+// Advice to Fadvise
+
+const (
+	FADV_NORMAL     = C.POSIX_FADV_NORMAL
+	FADV_RANDOM     = C.POSIX_FADV_RANDOM
+	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
+	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
+	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
+	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
+)
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPMreqn C.struct_ip_mreqn
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPMreqn          = C.sizeof_struct_ip_mreqn
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	sizeofIfMsghdr         = C.sizeof_struct_if_msghdr
+	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr8
+	sizeofIfData           = C.sizeof_struct_if_data
+	SizeofIfData           = C.sizeof_struct_if_data8
+	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
+	SizeofIfmaMsghdr       = C.sizeof_struct_ifma_msghdr
+	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
+	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
+)
+
+type ifMsghdr C.struct_if_msghdr
+
+type IfMsghdr C.struct_if_msghdr8
+
+type ifData C.struct_if_data
+
+type IfData C.struct_if_data8
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfmaMsghdr C.struct_ifma_msghdr
+
+type IfAnnounceMsghdr C.struct_if_announcemsghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion    = C.sizeof_struct_bpf_version
+	SizeofBpfStat       = C.sizeof_struct_bpf_stat
+	SizeofBpfZbuf       = C.sizeof_struct_bpf_zbuf
+	SizeofBpfProgram    = C.sizeof_struct_bpf_program
+	SizeofBpfInsn       = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr        = C.sizeof_struct_bpf_hdr
+	SizeofBpfZbufHeader = C.sizeof_struct_bpf_zbuf_header
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfZbuf C.struct_bpf_zbuf
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+type BpfZbufHeader C.struct_bpf_zbuf_header
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR      = C.POLLERR
+	POLLHUP      = C.POLLHUP
+	POLLIN       = C.POLLIN
+	POLLINIGNEOF = C.POLLINIGNEOF
+	POLLNVAL     = C.POLLNVAL
+	POLLOUT      = C.POLLOUT
+	POLLPRI      = C.POLLPRI
+	POLLRDBAND   = C.POLLRDBAND
+	POLLRDNORM   = C.POLLRDNORM
+	POLLWRBAND   = C.POLLWRBAND
+	POLLWRNORM   = C.POLLWRNORM
+)
+
+// Capabilities
+
+type CapRights C.struct_cap_rights
+
+// Uname
+
+type Utsname C.struct_utsname
diff --git a/vendor/golang.org/x/sys/unix/types_netbsd.go b/vendor/golang.org/x/sys/unix/types_netbsd.go
new file mode 100644
index 00000000..1494aafc
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_netbsd.go
@@ -0,0 +1,281 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See README.md
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+#include <dirent.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <signal.h>
+#include <termios.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+type Stat_t C.struct_stat
+
+type Statfs_t C.struct_statfs
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+type Fsid C.fsid_t
+
+// File system limits
+
+const (
+	PathMax = C.PATH_MAX
+)
+
+// Advice to Fadvise
+
+const (
+	FADV_NORMAL     = C.POSIX_FADV_NORMAL
+	FADV_RANDOM     = C.POSIX_FADV_RANDOM
+	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
+	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
+	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
+	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
+)
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
+	SizeofIfData           = C.sizeof_struct_if_data
+	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
+	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
+	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfAnnounceMsghdr C.struct_if_announcemsghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+type Mclpool C.struct_mclpool
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+type BpfTimeval C.struct_bpf_timeval
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
+
+// Sysctl
+
+type Sysctlnode C.struct_sysctlnode
+
+// Uname
+
+type Utsname C.struct_utsname
diff --git a/vendor/golang.org/x/sys/unix/types_openbsd.go b/vendor/golang.org/x/sys/unix/types_openbsd.go
new file mode 100644
index 00000000..8f2fe704
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_openbsd.go
@@ -0,0 +1,265 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See README.md
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+#include <dirent.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <signal.h>
+#include <termios.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+type Stat_t C.struct_stat
+
+type Statfs_t C.struct_statfs
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+type Fsid C.fsid_t
+
+// File system limits
+
+const (
+	PathMax = C.PATH_MAX
+)
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
+	SizeofIfData           = C.sizeof_struct_if_data
+	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
+	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
+	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfAnnounceMsghdr C.struct_if_announcemsghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+type Mclpool C.struct_mclpool
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+type BpfTimeval C.struct_bpf_timeval
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
+
+// Uname
+
+type Utsname C.struct_utsname
diff --git a/vendor/golang.org/x/sys/unix/types_solaris.go b/vendor/golang.org/x/sys/unix/types_solaris.go
new file mode 100644
index 00000000..f7771554
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_solaris.go
@@ -0,0 +1,283 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See README.md
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+// These defines ensure that builds done on newer versions of Solaris are
+// backwards-compatible with older versions of Solaris and
+// OpenSolaris-based derivatives.
+#define __USE_SUNOS_SOCKETS__          // msghdr
+#define __USE_LEGACY_PROTOTYPES__      // iovec
+#include <dirent.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <limits.h>
+#include <poll.h>
+#include <signal.h>
+#include <termios.h>
+#include <termio.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <sys/time.h>
+#include <sys/times.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+#include <ustat.h>
+#include <utime.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+	PathMax        = C.PATH_MAX
+	MaxHostNameLen = C.MAXHOSTNAMELEN
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+type Timeval32 C.struct_timeval32
+
+type Tms C.struct_tms
+
+type Utimbuf C.struct_utimbuf
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+const ( // Directory mode bits
+	S_IFMT   = C.S_IFMT
+	S_IFIFO  = C.S_IFIFO
+	S_IFCHR  = C.S_IFCHR
+	S_IFDIR  = C.S_IFDIR
+	S_IFBLK  = C.S_IFBLK
+	S_IFREG  = C.S_IFREG
+	S_IFLNK  = C.S_IFLNK
+	S_IFSOCK = C.S_IFSOCK
+	S_ISUID  = C.S_ISUID
+	S_ISGID  = C.S_ISGID
+	S_ISVTX  = C.S_ISVTX
+	S_IRUSR  = C.S_IRUSR
+	S_IWUSR  = C.S_IWUSR
+	S_IXUSR  = C.S_IXUSR
+)
+
+type Stat_t C.struct_stat
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+// Filesystems
+
+type _Fsblkcnt_t C.fsblkcnt_t
+
+type Statvfs_t C.struct_statvfs
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Select
+
+type FdSet C.fd_set
+
+// Misc
+
+type Utsname C.struct_utsname
+
+type Ustat_t C.struct_ustat
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
+	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_EACCESS          = C.AT_EACCESS
+)
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr  = C.sizeof_struct_if_msghdr
+	SizeofIfData    = C.sizeof_struct_if_data
+	SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr
+	SizeofRtMsghdr  = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfTimeval C.struct_bpf_timeval
+
+type BpfHdr C.struct_bpf_hdr
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+type Termio C.struct_termio
+
+type Winsize C.struct_winsize
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
diff --git a/vendor/golang.org/x/sys/unix/xattr_bsd.go b/vendor/golang.org/x/sys/unix/xattr_bsd.go
new file mode 100644
index 00000000..93049932
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/xattr_bsd.go
@@ -0,0 +1,231 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build freebsd netbsd
+
+package unix
+
+import (
+	"strings"
+	"unsafe"
+)
+
+// Derive extattr namespace and attribute name
+
+func xattrnamespace(fullattr string) (ns int, attr string, err error) {
+	s := strings.IndexByte(fullattr, '.')
+	if s == -1 {
+		return -1, "", ENOATTR
+	}
+
+	namespace := fullattr[0:s]
+	attr = fullattr[s+1:]
+
+	switch namespace {
+	case "user":
+		return EXTATTR_NAMESPACE_USER, attr, nil
+	case "system":
+		return EXTATTR_NAMESPACE_SYSTEM, attr, nil
+	default:
+		return -1, "", ENOATTR
+	}
+}
+
+func initxattrdest(dest []byte, idx int) (d unsafe.Pointer) {
+	if len(dest) > idx {
+		return unsafe.Pointer(&dest[idx])
+	} else {
+		return unsafe.Pointer(_zero)
+	}
+}
+
+// FreeBSD and NetBSD implement their own syscalls to handle extended attributes
+
+func Getxattr(file string, attr string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsize := len(dest)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return -1, err
+	}
+
+	return ExtattrGetFile(file, nsid, a, uintptr(d), destsize)
+}
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsize := len(dest)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return -1, err
+	}
+
+	return ExtattrGetFd(fd, nsid, a, uintptr(d), destsize)
+}
+
+func Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsize := len(dest)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return -1, err
+	}
+
+	return ExtattrGetLink(link, nsid, a, uintptr(d), destsize)
+}
+
+// flags are unused on FreeBSD
+
+func Fsetxattr(fd int, attr string, data []byte, flags int) (err error) {
+	d := unsafe.Pointer(&data[0])
+	datasiz := len(data)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	_, err = ExtattrSetFd(fd, nsid, a, uintptr(d), datasiz)
+	return
+}
+
+func Setxattr(file string, attr string, data []byte, flags int) (err error) {
+	d := unsafe.Pointer(&data[0])
+	datasiz := len(data)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	_, err = ExtattrSetFile(file, nsid, a, uintptr(d), datasiz)
+	return
+}
+
+func Lsetxattr(link string, attr string, data []byte, flags int) (err error) {
+	d := unsafe.Pointer(&data[0])
+	datasiz := len(data)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	_, err = ExtattrSetLink(link, nsid, a, uintptr(d), datasiz)
+	return
+}
+
+func Removexattr(file string, attr string) (err error) {
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	err = ExtattrDeleteFile(file, nsid, a)
+	return
+}
+
+func Fremovexattr(fd int, attr string) (err error) {
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	err = ExtattrDeleteFd(fd, nsid, a)
+	return
+}
+
+func Lremovexattr(link string, attr string) (err error) {
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	err = ExtattrDeleteLink(link, nsid, a)
+	return
+}
+
+func Listxattr(file string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsiz := len(dest)
+
+	// FreeBSD won't allow you to list xattrs from multiple namespaces
+	s := 0
+	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
+		stmp, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
+
+		/* Errors accessing system attrs are ignored so that
+		 * we can implement the Linux-like behavior of omitting errors that
+		 * we don't have read permissions on
+		 *
+		 * Linux will still error if we ask for user attributes on a file that
+		 * we don't have read permissions on, so don't ignore those errors
+		 */
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			continue
+		} else if e != nil {
+			return s, e
+		}
+
+		s += stmp
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
+		}
+		d = initxattrdest(dest, s)
+	}
+
+	return s, nil
+}
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsiz := len(dest)
+
+	s := 0
+	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
+		stmp, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			continue
+		} else if e != nil {
+			return s, e
+		}
+
+		s += stmp
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
+		}
+		d = initxattrdest(dest, s)
+	}
+
+	return s, nil
+}
+
+func Llistxattr(link string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsiz := len(dest)
+
+	s := 0
+	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
+		stmp, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			continue
+		} else if e != nil {
+			return s, e
+		}
+
+		s += stmp
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
+		}
+		d = initxattrdest(dest, s)
+	}
+
+	return s, nil
+}
diff --git a/vendor/golang.org/x/sys/unix/xattr_test.go b/vendor/golang.org/x/sys/unix/xattr_test.go
new file mode 100644
index 00000000..11a76ce2
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/xattr_test.go
@@ -0,0 +1,201 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin freebsd linux netbsd
+
+package unix_test
+
+import (
+	"io/ioutil"
+	"os"
+	"runtime"
+	"strings"
+	"testing"
+
+	"golang.org/x/sys/unix"
+)
+
+func TestXattr(t *testing.T) {
+	defer chtmpdir(t)()
+
+	f := "xattr1"
+	touch(t, f)
+
+	xattrName := "user.test"
+	xattrDataSet := "gopher"
+	err := unix.Setxattr(f, xattrName, []byte(xattrDataSet), 0)
+	if err == unix.ENOTSUP || err == unix.EOPNOTSUPP {
+		t.Skip("filesystem does not support extended attributes, skipping test")
+	} else if err != nil {
+		t.Fatalf("Setxattr: %v", err)
+	}
+
+	// find size
+	size, err := unix.Listxattr(f, nil)
+	if err != nil {
+		t.Fatalf("Listxattr: %v", err)
+	}
+
+	if size <= 0 {
+		t.Fatalf("Listxattr returned an empty list of attributes")
+	}
+
+	buf := make([]byte, size)
+	read, err := unix.Listxattr(f, buf)
+	if err != nil {
+		t.Fatalf("Listxattr: %v", err)
+	}
+
+	xattrs := stringsFromByteSlice(buf[:read])
+
+	xattrWant := xattrName
+	if runtime.GOOS == "freebsd" {
+		// On FreeBSD, the namespace is stored separately from the xattr
+		// name and Listxattr doesn't return the namespace prefix.
+		xattrWant = strings.TrimPrefix(xattrWant, "user.")
+	}
+	found := false
+	for _, name := range xattrs {
+		if name == xattrWant {
+			found = true
+		}
+	}
+
+	if !found {
+		t.Errorf("Listxattr did not return previously set attribute '%s'", xattrName)
+	}
+
+	// find size
+	size, err = unix.Getxattr(f, xattrName, nil)
+	if err != nil {
+		t.Fatalf("Getxattr: %v", err)
+	}
+
+	if size <= 0 {
+		t.Fatalf("Getxattr returned an empty attribute")
+	}
+
+	xattrDataGet := make([]byte, size)
+	_, err = unix.Getxattr(f, xattrName, xattrDataGet)
+	if err != nil {
+		t.Fatalf("Getxattr: %v", err)
+	}
+
+	got := string(xattrDataGet)
+	if got != xattrDataSet {
+		t.Errorf("Getxattr: expected attribute value %s, got %s", xattrDataSet, got)
+	}
+
+	err = unix.Removexattr(f, xattrName)
+	if err != nil {
+		t.Fatalf("Removexattr: %v", err)
+	}
+
+	n := "nonexistent"
+	err = unix.Lsetxattr(n, xattrName, []byte(xattrDataSet), 0)
+	if err != unix.ENOENT {
+		t.Errorf("Lsetxattr: expected %v on non-existent file, got %v", unix.ENOENT, err)
+	}
+
+	_, err = unix.Lgetxattr(n, xattrName, nil)
+	if err != unix.ENOENT {
+		t.Errorf("Lgetxattr: %v", err)
+	}
+
+	s := "symlink1"
+	err = os.Symlink(n, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = unix.Lsetxattr(s, xattrName, []byte(xattrDataSet), 0)
+	if err != nil {
+		// Linux and Android doen't support xattrs on symlinks according
+		// to xattr(7), so just test that we get the proper error.
+		if (runtime.GOOS != "linux" && runtime.GOOS != "android") || err != unix.EPERM {
+			t.Fatalf("Lsetxattr: %v", err)
+		}
+	}
+}
+
+func TestFdXattr(t *testing.T) {
+	file, err := ioutil.TempFile("", "TestFdXattr")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(file.Name())
+	defer file.Close()
+
+	fd := int(file.Fd())
+	xattrName := "user.test"
+	xattrDataSet := "gopher"
+
+	err = unix.Fsetxattr(fd, xattrName, []byte(xattrDataSet), 0)
+	if err == unix.ENOTSUP || err == unix.EOPNOTSUPP {
+		t.Skip("filesystem does not support extended attributes, skipping test")
+	} else if err != nil {
+		t.Fatalf("Fsetxattr: %v", err)
+	}
+
+	// find size
+	size, err := unix.Flistxattr(fd, nil)
+	if err != nil {
+		t.Fatalf("Flistxattr: %v", err)
+	}
+
+	if size <= 0 {
+		t.Fatalf("Flistxattr returned an empty list of attributes")
+	}
+
+	buf := make([]byte, size)
+	read, err := unix.Flistxattr(fd, buf)
+	if err != nil {
+		t.Fatalf("Flistxattr: %v", err)
+	}
+
+	xattrs := stringsFromByteSlice(buf[:read])
+
+	xattrWant := xattrName
+	if runtime.GOOS == "freebsd" {
+		// On FreeBSD, the namespace is stored separately from the xattr
+		// name and Listxattr doesn't return the namespace prefix.
+		xattrWant = strings.TrimPrefix(xattrWant, "user.")
+	}
+	found := false
+	for _, name := range xattrs {
+		if name == xattrWant {
+			found = true
+		}
+	}
+
+	if !found {
+		t.Errorf("Flistxattr did not return previously set attribute '%s'", xattrName)
+	}
+
+	// find size
+	size, err = unix.Fgetxattr(fd, xattrName, nil)
+	if err != nil {
+		t.Fatalf("Fgetxattr: %v", err)
+	}
+
+	if size <= 0 {
+		t.Fatalf("Fgetxattr returned an empty attribute")
+	}
+
+	xattrDataGet := make([]byte, size)
+	_, err = unix.Fgetxattr(fd, xattrName, xattrDataGet)
+	if err != nil {
+		t.Fatalf("Fgetxattr: %v", err)
+	}
+
+	got := string(xattrDataGet)
+	if got != xattrDataSet {
+		t.Errorf("Fgetxattr: expected attribute value %s, got %s", xattrDataSet, got)
+	}
+
+	err = unix.Fremovexattr(fd, xattrName)
+	if err != nil {
+		t.Fatalf("Fremovexattr: %v", err)
+	}
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
new file mode 100644
index 00000000..3b39d740
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
@@ -0,0 +1,1783 @@
+// mkerrors.sh -m32
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,darwin
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x41c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4008426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80084267
+	BIOCSETFNR                        = 0x8008427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8008426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xf
+	EVFILT_THREADMARKER               = 0xf
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
+	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_RETURN              = 0x61
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x300
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_ROOTFS                        = 0x4000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0x17f0f5ff
+	MNT_WAIT                          = 0x1
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
+	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	OXTABS                            = 0x4
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc01c697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc0086924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc0286938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6981
+	SIOCRSLVMULTI                     = 0xc008693b
+	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
+	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
+	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
+	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40087458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40087459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x20
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+	XATTR_CREATE                      = 0x2
+	XATTR_NODEFAULT                   = 0x10
+	XATTR_NOFOLLOW                    = 0x1
+	XATTR_NOSECURITY                  = 0x8
+	XATTR_REPLACE                     = 0x4
+	XATTR_SHOWCOMPRESSION             = 0x20
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "ENOTSUP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EPWROFF", "device power is off"},
+	{83, "EDEVERR", "device error"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EBADEXEC", "bad executable (or shared library)"},
+	{86, "EBADARCH", "bad CPU type in executable"},
+	{87, "ESHLIBVERS", "shared library version mismatch"},
+	{88, "EBADMACHO", "malformed Mach-o file"},
+	{89, "ECANCELED", "operation canceled"},
+	{90, "EIDRM", "identifier removed"},
+	{91, "ENOMSG", "no message of desired type"},
+	{92, "EILSEQ", "illegal byte sequence"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EBADMSG", "bad message"},
+	{95, "EMULTIHOP", "EMULTIHOP (Reserved)"},
+	{96, "ENODATA", "no message available on STREAM"},
+	{97, "ENOLINK", "ENOLINK (Reserved)"},
+	{98, "ENOSR", "no STREAM resources"},
+	{99, "ENOSTR", "not a STREAM"},
+	{100, "EPROTO", "protocol error"},
+	{101, "ETIME", "STREAM ioctl timeout"},
+	{102, "EOPNOTSUPP", "operation not supported on socket"},
+	{103, "ENOPOLICY", "policy not found"},
+	{104, "ENOTRECOVERABLE", "state not recoverable"},
+	{105, "EOWNERDEAD", "previous owner died"},
+	{106, "EQFULL", "interface output queue is full"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
new file mode 100644
index 00000000..8fe55477
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
@@ -0,0 +1,1783 @@
+// mkerrors.sh -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,darwin
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x41c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xf
+	EVFILT_THREADMARKER               = 0xf
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
+	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_RETURN              = 0x61
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x300
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_ROOTFS                        = 0x4000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0x17f0f5ff
+	MNT_WAIT                          = 0x1
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
+	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	OXTABS                            = 0x4
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
+	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
+	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
+	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+	XATTR_CREATE                      = 0x2
+	XATTR_NODEFAULT                   = 0x10
+	XATTR_NOFOLLOW                    = 0x1
+	XATTR_NOSECURITY                  = 0x8
+	XATTR_REPLACE                     = 0x4
+	XATTR_SHOWCOMPRESSION             = 0x20
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "ENOTSUP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EPWROFF", "device power is off"},
+	{83, "EDEVERR", "device error"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EBADEXEC", "bad executable (or shared library)"},
+	{86, "EBADARCH", "bad CPU type in executable"},
+	{87, "ESHLIBVERS", "shared library version mismatch"},
+	{88, "EBADMACHO", "malformed Mach-o file"},
+	{89, "ECANCELED", "operation canceled"},
+	{90, "EIDRM", "identifier removed"},
+	{91, "ENOMSG", "no message of desired type"},
+	{92, "EILSEQ", "illegal byte sequence"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EBADMSG", "bad message"},
+	{95, "EMULTIHOP", "EMULTIHOP (Reserved)"},
+	{96, "ENODATA", "no message available on STREAM"},
+	{97, "ENOLINK", "ENOLINK (Reserved)"},
+	{98, "ENOSR", "no STREAM resources"},
+	{99, "ENOSTR", "not a STREAM"},
+	{100, "EPROTO", "protocol error"},
+	{101, "ETIME", "STREAM ioctl timeout"},
+	{102, "EOPNOTSUPP", "operation not supported on socket"},
+	{103, "ENOPOLICY", "policy not found"},
+	{104, "ENOTRECOVERABLE", "state not recoverable"},
+	{105, "EOWNERDEAD", "previous owner died"},
+	{106, "EQFULL", "interface output queue is full"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
new file mode 100644
index 00000000..7a977770
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
@@ -0,0 +1,1783 @@
+// mkerrors.sh
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,darwin
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x41c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xf
+	EVFILT_THREADMARKER               = 0xf
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
+	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_RETURN              = 0x61
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x300
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_ROOTFS                        = 0x4000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0x17f0f5ff
+	MNT_WAIT                          = 0x1
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
+	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	OXTABS                            = 0x4
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
+	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
+	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
+	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+	XATTR_CREATE                      = 0x2
+	XATTR_NODEFAULT                   = 0x10
+	XATTR_NOFOLLOW                    = 0x1
+	XATTR_NOSECURITY                  = 0x8
+	XATTR_REPLACE                     = 0x4
+	XATTR_SHOWCOMPRESSION             = 0x20
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "ENOTSUP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EPWROFF", "device power is off"},
+	{83, "EDEVERR", "device error"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EBADEXEC", "bad executable (or shared library)"},
+	{86, "EBADARCH", "bad CPU type in executable"},
+	{87, "ESHLIBVERS", "shared library version mismatch"},
+	{88, "EBADMACHO", "malformed Mach-o file"},
+	{89, "ECANCELED", "operation canceled"},
+	{90, "EIDRM", "identifier removed"},
+	{91, "ENOMSG", "no message of desired type"},
+	{92, "EILSEQ", "illegal byte sequence"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EBADMSG", "bad message"},
+	{95, "EMULTIHOP", "EMULTIHOP (Reserved)"},
+	{96, "ENODATA", "no message available on STREAM"},
+	{97, "ENOLINK", "ENOLINK (Reserved)"},
+	{98, "ENOSR", "no STREAM resources"},
+	{99, "ENOSTR", "not a STREAM"},
+	{100, "EPROTO", "protocol error"},
+	{101, "ETIME", "STREAM ioctl timeout"},
+	{102, "EOPNOTSUPP", "operation not supported on socket"},
+	{103, "ENOPOLICY", "policy not found"},
+	{104, "ENOTRECOVERABLE", "state not recoverable"},
+	{105, "EOWNERDEAD", "previous owner died"},
+	{106, "EQFULL", "interface output queue is full"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
new file mode 100644
index 00000000..6d56d8a0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
@@ -0,0 +1,1783 @@
+// mkerrors.sh -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm64,darwin
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x41c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xf
+	EVFILT_THREADMARKER               = 0xf
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
+	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_RETURN              = 0x61
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x300
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_ROOTFS                        = 0x4000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0x17f0f5ff
+	MNT_WAIT                          = 0x1
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
+	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	OXTABS                            = 0x4
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
+	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
+	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
+	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+	XATTR_CREATE                      = 0x2
+	XATTR_NODEFAULT                   = 0x10
+	XATTR_NOFOLLOW                    = 0x1
+	XATTR_NOSECURITY                  = 0x8
+	XATTR_REPLACE                     = 0x4
+	XATTR_SHOWCOMPRESSION             = 0x20
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "ENOTSUP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EPWROFF", "device power is off"},
+	{83, "EDEVERR", "device error"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EBADEXEC", "bad executable (or shared library)"},
+	{86, "EBADARCH", "bad CPU type in executable"},
+	{87, "ESHLIBVERS", "shared library version mismatch"},
+	{88, "EBADMACHO", "malformed Mach-o file"},
+	{89, "ECANCELED", "operation canceled"},
+	{90, "EIDRM", "identifier removed"},
+	{91, "ENOMSG", "no message of desired type"},
+	{92, "EILSEQ", "illegal byte sequence"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EBADMSG", "bad message"},
+	{95, "EMULTIHOP", "EMULTIHOP (Reserved)"},
+	{96, "ENODATA", "no message available on STREAM"},
+	{97, "ENOLINK", "ENOLINK (Reserved)"},
+	{98, "ENOSR", "no STREAM resources"},
+	{99, "ENOSTR", "not a STREAM"},
+	{100, "EPROTO", "protocol error"},
+	{101, "ETIME", "STREAM ioctl timeout"},
+	{102, "EOPNOTSUPP", "operation not supported on socket"},
+	{103, "ENOPOLICY", "policy not found"},
+	{104, "ENOTRECOVERABLE", "state not recoverable"},
+	{105, "EOWNERDEAD", "previous owner died"},
+	{106, "EQFULL", "interface output queue is full"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
new file mode 100644
index 00000000..46a082b6
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
@@ -0,0 +1,1586 @@
+// mkerrors.sh -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,dragonfly
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ATM                            = 0x1e
+	AF_BLUETOOTH                      = 0x21
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x23
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1c
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x24
+	AF_MPLS                           = 0x22
+	AF_NATM                           = 0x1d
+	AF_NETBIOS                        = 0x6
+	AF_NETGRAPH                       = 0x20
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ALTWERASE                         = 0x200
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0104279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x2000427a
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x8010427b
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x8
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DEFAULTBUFSIZE                = 0x1000
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MAX_CLONES                    = 0x80
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x4
+	CLOCK_MONOTONIC_FAST              = 0xc
+	CLOCK_MONOTONIC_PRECISE           = 0xb
+	CLOCK_PROCESS_CPUTIME_ID          = 0xf
+	CLOCK_PROF                        = 0x2
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_REALTIME_FAST               = 0xa
+	CLOCK_REALTIME_PRECISE            = 0x9
+	CLOCK_SECOND                      = 0xd
+	CLOCK_THREAD_CPUTIME_ID           = 0xe
+	CLOCK_UPTIME                      = 0x5
+	CLOCK_UPTIME_FAST                 = 0x8
+	CLOCK_UPTIME_PRECISE              = 0x7
+	CLOCK_VIRTUAL                     = 0x1
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DOCSIS                        = 0x8f
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_REDBACK_SMARTEDGE             = 0x20
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DBF                            = 0xf
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0x8
+	EVFILT_FS                         = -0xa
+	EVFILT_MARKER                     = 0xf
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xa
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0x9
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_NODATA                         = 0x1000
+	EV_ONESHOT                        = 0x10
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTEXIT_LWP                       = 0x10000
+	EXTEXIT_PROC                      = 0x0
+	EXTEXIT_SETINT                    = 0x1
+	EXTEXIT_SIMPLE                    = 0x0
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_DUP2FD                          = 0xa
+	F_DUP2FD_CLOEXEC                  = 0x12
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x11
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETOWN                          = 0x5
+	F_OK                              = 0x0
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x118e72
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MONITOR                       = 0x40000
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NPOLLING                      = 0x100000
+	IFF_OACTIVE                       = 0x400
+	IFF_OACTIVE_COMPAT                = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_POLLING                       = 0x10000
+	IFF_POLLING_COMPAT                = 0x10000
+	IFF_PPROMISC                      = 0x20000
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_SMART                         = 0x20
+	IFF_STATICARP                     = 0x80000
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xf3
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SKIP                      = 0x39
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TLSP                      = 0x38
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_UNKNOWN                   = 0x102
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MINHLIM                      = 0x28
+	IPV6_MMTU                         = 0x500
+	IPV6_MSFILTER                     = 0x4a
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PKTOPTIONS                   = 0x34
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_PREFER_TEMPADDR              = 0x3f
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x32
+	IP_FW_DEL                         = 0x33
+	IP_FW_FLUSH                       = 0x34
+	IP_FW_GET                         = 0x36
+	IP_FW_RESETLOG                    = 0x37
+	IP_FW_X                           = 0x31
+	IP_FW_ZERO                        = 0x35
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x42
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x41
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_AUTOSYNC                     = 0x7
+	MADV_CONTROL_END                  = 0xb
+	MADV_CONTROL_START                = 0xa
+	MADV_CORE                         = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_INVAL                        = 0xa
+	MADV_NOCORE                       = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_NOSYNC                       = 0x6
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SETMAP                       = 0xb
+	MADV_WILLNEED                     = 0x3
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_NOCORE                        = 0x20000
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_NOSYNC                        = 0x800
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_SIZEALIGN                     = 0x40000
+	MAP_STACK                         = 0x400
+	MAP_TRYFIXED                      = 0x10000
+	MAP_VPAGETABLE                    = 0x2000
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CMSG_CLOEXEC                  = 0x1000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FBLOCKING                     = 0x10000
+	MSG_FMASK                         = 0xffff0000
+	MSG_FNONBLOCKING                  = 0x20000
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_SYNC                          = 0x800
+	MSG_TRUNC                         = 0x10
+	MSG_UNUSED09                      = 0x200
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x0
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_MAXID                      = 0x4
+	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_OOB                          = 0x2
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	OXTABS                            = 0x4
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x20000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x10000
+	O_DIRECTORY                       = 0x8000000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FAPPEND                         = 0x100000
+	O_FASYNCWRITE                     = 0x800000
+	O_FBLOCKING                       = 0x40000
+	O_FMASK                           = 0xfc0000
+	O_FNONBLOCKING                    = 0x80000
+	O_FOFFSET                         = 0x200000
+	O_FSYNC                           = 0x80
+	O_FSYNCWRITE                      = 0x400000
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0xb
+	RTAX_MPLS1                        = 0x8
+	RTAX_MPLS2                        = 0x9
+	RTAX_MPLS3                        = 0xa
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_MPLS1                         = 0x100
+	RTA_MPLS2                         = 0x200
+	RTA_MPLS3                         = 0x400
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MPLSOPS                       = 0x1000000
+	RTF_MULTICAST                     = 0x800000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_REJECT                        = 0x8
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x12
+	RTM_IFANNOUNCE                    = 0x11
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x6
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_IWCAPSEGS                     = 0x400
+	RTV_IWMAXSEGS                     = 0x200
+	RTV_MSL                           = 0x100
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCADDRT                         = 0x8040720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDELRT                         = 0x8040720b
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETSGCNT                      = 0xc0207210
+	SIOCGETVIFCNT                     = 0xc028720f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020691f
+	SIOCGIFCONF                       = 0xc0106924
+	SIOCGIFDATA                       = 0xc0206926
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc028698a
+	SIOCGIFINDEX                      = 0xc0206920
+	SIOCGIFMEDIA                      = 0xc0306938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPOLLCPU                    = 0xc020697e
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFSTATUS                     = 0xc331693b
+	SIOCGIFTSOLEN                     = 0xc0206980
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGPRIVATE_0                    = 0xc0206950
+	SIOCGPRIVATE_1                    = 0xc0206951
+	SIOCIFCREATE                      = 0xc020697a
+	SIOCIFCREATE2                     = 0xc020697c
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106978
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020691e
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNAME                       = 0x80206928
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFPOLLCPU                    = 0x8020697d
+	SIOCSIFTSOLEN                     = 0x8020697f
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_CPUHINT                        = 0x1030
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NOSIGPIPE                      = 0x800
+	SO_OOBINLINE                      = 0x100
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDSPACE                       = 0x100a
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
+	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
+	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
+	TCP_FASTKEEP                      = 0x80
+	TCP_KEEPCNT                       = 0x400
+	TCP_KEEPIDLE                      = 0x100
+	TCP_KEEPINIT                      = 0x20
+	TCP_KEEPINTVL                     = 0x200
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0x100
+	TCP_MIN_WINSHIFT                  = 0x5
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_SIGNATURE_ENABLE              = 0x10
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGSID                          = 0x40047463
+	TIOCGSIZE                         = 0x40087468
+	TIOCGWINSZ                        = 0x40087468
+	TIOCISPTMASTER                    = 0x20007455
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSSIZE                         = 0x80087467
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VCHECKPT                          = 0x13
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VERASE2                           = 0x7
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VM_BCACHE_SIZE_MAX                = 0x0
+	VM_SWZONE_SIZE_MAX                = 0x4000000000
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x4
+	WCOREFLAG                         = 0x80
+	WLINUXCLONE                       = 0x80000000
+	WNOHANG                           = 0x1
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EASYNC          = syscall.Errno(0x63)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x59)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x55)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOOFUS         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x56)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x63)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5a)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x57)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5b)
+	ENOMEDIUM       = syscall.Errno(0x5d)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5c)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUNUSED94       = syscall.Errno(0x5e)
+	EUNUSED95       = syscall.Errno(0x5f)
+	EUNUSED96       = syscall.Errno(0x60)
+	EUNUSED97       = syscall.Errno(0x61)
+	EUNUSED98       = syscall.Errno(0x62)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT     = syscall.Signal(0x6)
+	SIGALRM     = syscall.Signal(0xe)
+	SIGBUS      = syscall.Signal(0xa)
+	SIGCHLD     = syscall.Signal(0x14)
+	SIGCKPT     = syscall.Signal(0x21)
+	SIGCKPTEXIT = syscall.Signal(0x22)
+	SIGCONT     = syscall.Signal(0x13)
+	SIGEMT      = syscall.Signal(0x7)
+	SIGFPE      = syscall.Signal(0x8)
+	SIGHUP      = syscall.Signal(0x1)
+	SIGILL      = syscall.Signal(0x4)
+	SIGINFO     = syscall.Signal(0x1d)
+	SIGINT      = syscall.Signal(0x2)
+	SIGIO       = syscall.Signal(0x17)
+	SIGIOT      = syscall.Signal(0x6)
+	SIGKILL     = syscall.Signal(0x9)
+	SIGPIPE     = syscall.Signal(0xd)
+	SIGPROF     = syscall.Signal(0x1b)
+	SIGQUIT     = syscall.Signal(0x3)
+	SIGSEGV     = syscall.Signal(0xb)
+	SIGSTOP     = syscall.Signal(0x11)
+	SIGSYS      = syscall.Signal(0xc)
+	SIGTERM     = syscall.Signal(0xf)
+	SIGTHR      = syscall.Signal(0x20)
+	SIGTRAP     = syscall.Signal(0x5)
+	SIGTSTP     = syscall.Signal(0x12)
+	SIGTTIN     = syscall.Signal(0x15)
+	SIGTTOU     = syscall.Signal(0x16)
+	SIGURG      = syscall.Signal(0x10)
+	SIGUSR1     = syscall.Signal(0x1e)
+	SIGUSR2     = syscall.Signal(0x1f)
+	SIGVTALRM   = syscall.Signal(0x1a)
+	SIGWINCH    = syscall.Signal(0x1c)
+	SIGXCPU     = syscall.Signal(0x18)
+	SIGXFSZ     = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "ECANCELED", "operation canceled"},
+	{86, "EILSEQ", "illegal byte sequence"},
+	{87, "ENOATTR", "attribute not found"},
+	{88, "EDOOFUS", "programming error"},
+	{89, "EBADMSG", "bad message"},
+	{90, "EMULTIHOP", "multihop attempted"},
+	{91, "ENOLINK", "link has been severed"},
+	{92, "EPROTO", "protocol error"},
+	{93, "ENOMEDIUM", "no medium found"},
+	{94, "EUNUSED94", "unknown error: 94"},
+	{95, "EUNUSED95", "unknown error: 95"},
+	{96, "EUNUSED96", "unknown error: 96"},
+	{97, "EUNUSED97", "unknown error: 97"},
+	{98, "EUNUSED98", "unknown error: 98"},
+	{99, "ELAST", "unknown error: 99"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "thread Scheduler"},
+	{33, "SIGCKPT", "checkPoint"},
+	{34, "SIGCKPTEXIT", "checkPointExit"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
new file mode 100644
index 00000000..2947dc03
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
@@ -0,0 +1,1764 @@
+// mkerrors.sh -m32
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,freebsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                   = 0x10
+	AF_ARP                         = 0x23
+	AF_ATM                         = 0x1e
+	AF_BLUETOOTH                   = 0x24
+	AF_CCITT                       = 0xa
+	AF_CHAOS                       = 0x5
+	AF_CNT                         = 0x15
+	AF_COIP                        = 0x14
+	AF_DATAKIT                     = 0x9
+	AF_DECnet                      = 0xc
+	AF_DLI                         = 0xd
+	AF_E164                        = 0x1a
+	AF_ECMA                        = 0x8
+	AF_HYLINK                      = 0xf
+	AF_IEEE80211                   = 0x25
+	AF_IMPLINK                     = 0x3
+	AF_INET                        = 0x2
+	AF_INET6                       = 0x1c
+	AF_INET6_SDP                   = 0x2a
+	AF_INET_SDP                    = 0x28
+	AF_IPX                         = 0x17
+	AF_ISDN                        = 0x1a
+	AF_ISO                         = 0x7
+	AF_LAT                         = 0xe
+	AF_LINK                        = 0x12
+	AF_LOCAL                       = 0x1
+	AF_MAX                         = 0x2a
+	AF_NATM                        = 0x1d
+	AF_NETBIOS                     = 0x6
+	AF_NETGRAPH                    = 0x20
+	AF_OSI                         = 0x7
+	AF_PUP                         = 0x4
+	AF_ROUTE                       = 0x11
+	AF_SCLUSTER                    = 0x22
+	AF_SIP                         = 0x18
+	AF_SLOW                        = 0x21
+	AF_SNA                         = 0xb
+	AF_UNIX                        = 0x1
+	AF_UNSPEC                      = 0x0
+	AF_VENDOR00                    = 0x27
+	AF_VENDOR01                    = 0x29
+	AF_VENDOR02                    = 0x2b
+	AF_VENDOR03                    = 0x2d
+	AF_VENDOR04                    = 0x2f
+	AF_VENDOR05                    = 0x31
+	AF_VENDOR06                    = 0x33
+	AF_VENDOR07                    = 0x35
+	AF_VENDOR08                    = 0x37
+	AF_VENDOR09                    = 0x39
+	AF_VENDOR10                    = 0x3b
+	AF_VENDOR11                    = 0x3d
+	AF_VENDOR12                    = 0x3f
+	AF_VENDOR13                    = 0x41
+	AF_VENDOR14                    = 0x43
+	AF_VENDOR15                    = 0x45
+	AF_VENDOR16                    = 0x47
+	AF_VENDOR17                    = 0x49
+	AF_VENDOR18                    = 0x4b
+	AF_VENDOR19                    = 0x4d
+	AF_VENDOR20                    = 0x4f
+	AF_VENDOR21                    = 0x51
+	AF_VENDOR22                    = 0x53
+	AF_VENDOR23                    = 0x55
+	AF_VENDOR24                    = 0x57
+	AF_VENDOR25                    = 0x59
+	AF_VENDOR26                    = 0x5b
+	AF_VENDOR27                    = 0x5d
+	AF_VENDOR28                    = 0x5f
+	AF_VENDOR29                    = 0x61
+	AF_VENDOR30                    = 0x63
+	AF_VENDOR31                    = 0x65
+	AF_VENDOR32                    = 0x67
+	AF_VENDOR33                    = 0x69
+	AF_VENDOR34                    = 0x6b
+	AF_VENDOR35                    = 0x6d
+	AF_VENDOR36                    = 0x6f
+	AF_VENDOR37                    = 0x71
+	AF_VENDOR38                    = 0x73
+	AF_VENDOR39                    = 0x75
+	AF_VENDOR40                    = 0x77
+	AF_VENDOR41                    = 0x79
+	AF_VENDOR42                    = 0x7b
+	AF_VENDOR43                    = 0x7d
+	AF_VENDOR44                    = 0x7f
+	AF_VENDOR45                    = 0x81
+	AF_VENDOR46                    = 0x83
+	AF_VENDOR47                    = 0x85
+	ALTWERASE                      = 0x200
+	B0                             = 0x0
+	B110                           = 0x6e
+	B115200                        = 0x1c200
+	B1200                          = 0x4b0
+	B134                           = 0x86
+	B14400                         = 0x3840
+	B150                           = 0x96
+	B1800                          = 0x708
+	B19200                         = 0x4b00
+	B200                           = 0xc8
+	B230400                        = 0x38400
+	B2400                          = 0x960
+	B28800                         = 0x7080
+	B300                           = 0x12c
+	B38400                         = 0x9600
+	B460800                        = 0x70800
+	B4800                          = 0x12c0
+	B50                            = 0x32
+	B57600                         = 0xe100
+	B600                           = 0x258
+	B7200                          = 0x1c20
+	B75                            = 0x4b
+	B76800                         = 0x12c00
+	B921600                        = 0xe1000
+	B9600                          = 0x2580
+	BIOCFEEDBACK                   = 0x8004427c
+	BIOCFLUSH                      = 0x20004268
+	BIOCGBLEN                      = 0x40044266
+	BIOCGDIRECTION                 = 0x40044276
+	BIOCGDLT                       = 0x4004426a
+	BIOCGDLTLIST                   = 0xc0084279
+	BIOCGETBUFMODE                 = 0x4004427d
+	BIOCGETIF                      = 0x4020426b
+	BIOCGETZMAX                    = 0x4004427f
+	BIOCGHDRCMPLT                  = 0x40044274
+	BIOCGRSIG                      = 0x40044272
+	BIOCGRTIMEOUT                  = 0x4008426e
+	BIOCGSEESENT                   = 0x40044276
+	BIOCGSTATS                     = 0x4008426f
+	BIOCGTSTAMP                    = 0x40044283
+	BIOCIMMEDIATE                  = 0x80044270
+	BIOCLOCK                       = 0x2000427a
+	BIOCPROMISC                    = 0x20004269
+	BIOCROTZBUF                    = 0x400c4280
+	BIOCSBLEN                      = 0xc0044266
+	BIOCSDIRECTION                 = 0x80044277
+	BIOCSDLT                       = 0x80044278
+	BIOCSETBUFMODE                 = 0x8004427e
+	BIOCSETF                       = 0x80084267
+	BIOCSETFNR                     = 0x80084282
+	BIOCSETIF                      = 0x8020426c
+	BIOCSETWF                      = 0x8008427b
+	BIOCSETZBUF                    = 0x800c4281
+	BIOCSHDRCMPLT                  = 0x80044275
+	BIOCSRSIG                      = 0x80044273
+	BIOCSRTIMEOUT                  = 0x8008426d
+	BIOCSSEESENT                   = 0x80044277
+	BIOCSTSTAMP                    = 0x80044284
+	BIOCVERSION                    = 0x40044271
+	BPF_A                          = 0x10
+	BPF_ABS                        = 0x20
+	BPF_ADD                        = 0x0
+	BPF_ALIGNMENT                  = 0x4
+	BPF_ALU                        = 0x4
+	BPF_AND                        = 0x50
+	BPF_B                          = 0x10
+	BPF_BUFMODE_BUFFER             = 0x1
+	BPF_BUFMODE_ZBUF               = 0x2
+	BPF_DIV                        = 0x30
+	BPF_H                          = 0x8
+	BPF_IMM                        = 0x0
+	BPF_IND                        = 0x40
+	BPF_JA                         = 0x0
+	BPF_JEQ                        = 0x10
+	BPF_JGE                        = 0x30
+	BPF_JGT                        = 0x20
+	BPF_JMP                        = 0x5
+	BPF_JSET                       = 0x40
+	BPF_K                          = 0x0
+	BPF_LD                         = 0x0
+	BPF_LDX                        = 0x1
+	BPF_LEN                        = 0x80
+	BPF_LSH                        = 0x60
+	BPF_MAJOR_VERSION              = 0x1
+	BPF_MAXBUFSIZE                 = 0x80000
+	BPF_MAXINSNS                   = 0x200
+	BPF_MEM                        = 0x60
+	BPF_MEMWORDS                   = 0x10
+	BPF_MINBUFSIZE                 = 0x20
+	BPF_MINOR_VERSION              = 0x1
+	BPF_MISC                       = 0x7
+	BPF_MOD                        = 0x90
+	BPF_MSH                        = 0xa0
+	BPF_MUL                        = 0x20
+	BPF_NEG                        = 0x80
+	BPF_OR                         = 0x40
+	BPF_RELEASE                    = 0x30bb6
+	BPF_RET                        = 0x6
+	BPF_RSH                        = 0x70
+	BPF_ST                         = 0x2
+	BPF_STX                        = 0x3
+	BPF_SUB                        = 0x10
+	BPF_TAX                        = 0x0
+	BPF_TXA                        = 0x80
+	BPF_T_BINTIME                  = 0x2
+	BPF_T_BINTIME_FAST             = 0x102
+	BPF_T_BINTIME_MONOTONIC        = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST   = 0x302
+	BPF_T_FAST                     = 0x100
+	BPF_T_FLAG_MASK                = 0x300
+	BPF_T_FORMAT_MASK              = 0x3
+	BPF_T_MICROTIME                = 0x0
+	BPF_T_MICROTIME_FAST           = 0x100
+	BPF_T_MICROTIME_MONOTONIC      = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
+	BPF_T_MONOTONIC                = 0x200
+	BPF_T_MONOTONIC_FAST           = 0x300
+	BPF_T_NANOTIME                 = 0x1
+	BPF_T_NANOTIME_FAST            = 0x101
+	BPF_T_NANOTIME_MONOTONIC       = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST  = 0x301
+	BPF_T_NONE                     = 0x3
+	BPF_T_NORMAL                   = 0x0
+	BPF_W                          = 0x0
+	BPF_X                          = 0x8
+	BPF_XOR                        = 0xa0
+	BRKINT                         = 0x2
+	CAP_ACCEPT                     = 0x200000020000000
+	CAP_ACL_CHECK                  = 0x400000000010000
+	CAP_ACL_DELETE                 = 0x400000000020000
+	CAP_ACL_GET                    = 0x400000000040000
+	CAP_ACL_SET                    = 0x400000000080000
+	CAP_ALL0                       = 0x20007ffffffffff
+	CAP_ALL1                       = 0x4000000001fffff
+	CAP_BIND                       = 0x200000040000000
+	CAP_BINDAT                     = 0x200008000000400
+	CAP_CHFLAGSAT                  = 0x200000000001400
+	CAP_CONNECT                    = 0x200000080000000
+	CAP_CONNECTAT                  = 0x200010000000400
+	CAP_CREATE                     = 0x200000000000040
+	CAP_EVENT                      = 0x400000000000020
+	CAP_EXTATTR_DELETE             = 0x400000000001000
+	CAP_EXTATTR_GET                = 0x400000000002000
+	CAP_EXTATTR_LIST               = 0x400000000004000
+	CAP_EXTATTR_SET                = 0x400000000008000
+	CAP_FCHDIR                     = 0x200000000000800
+	CAP_FCHFLAGS                   = 0x200000000001000
+	CAP_FCHMOD                     = 0x200000000002000
+	CAP_FCHMODAT                   = 0x200000000002400
+	CAP_FCHOWN                     = 0x200000000004000
+	CAP_FCHOWNAT                   = 0x200000000004400
+	CAP_FCNTL                      = 0x200000000008000
+	CAP_FCNTL_ALL                  = 0x78
+	CAP_FCNTL_GETFL                = 0x8
+	CAP_FCNTL_GETOWN               = 0x20
+	CAP_FCNTL_SETFL                = 0x10
+	CAP_FCNTL_SETOWN               = 0x40
+	CAP_FEXECVE                    = 0x200000000000080
+	CAP_FLOCK                      = 0x200000000010000
+	CAP_FPATHCONF                  = 0x200000000020000
+	CAP_FSCK                       = 0x200000000040000
+	CAP_FSTAT                      = 0x200000000080000
+	CAP_FSTATAT                    = 0x200000000080400
+	CAP_FSTATFS                    = 0x200000000100000
+	CAP_FSYNC                      = 0x200000000000100
+	CAP_FTRUNCATE                  = 0x200000000000200
+	CAP_FUTIMES                    = 0x200000000200000
+	CAP_FUTIMESAT                  = 0x200000000200400
+	CAP_GETPEERNAME                = 0x200000100000000
+	CAP_GETSOCKNAME                = 0x200000200000000
+	CAP_GETSOCKOPT                 = 0x200000400000000
+	CAP_IOCTL                      = 0x400000000000080
+	CAP_IOCTLS_ALL                 = 0x7fffffff
+	CAP_KQUEUE                     = 0x400000000100040
+	CAP_KQUEUE_CHANGE              = 0x400000000100000
+	CAP_KQUEUE_EVENT               = 0x400000000000040
+	CAP_LINKAT_SOURCE              = 0x200020000000400
+	CAP_LINKAT_TARGET              = 0x200000000400400
+	CAP_LISTEN                     = 0x200000800000000
+	CAP_LOOKUP                     = 0x200000000000400
+	CAP_MAC_GET                    = 0x400000000000001
+	CAP_MAC_SET                    = 0x400000000000002
+	CAP_MKDIRAT                    = 0x200000000800400
+	CAP_MKFIFOAT                   = 0x200000001000400
+	CAP_MKNODAT                    = 0x200000002000400
+	CAP_MMAP                       = 0x200000000000010
+	CAP_MMAP_R                     = 0x20000000000001d
+	CAP_MMAP_RW                    = 0x20000000000001f
+	CAP_MMAP_RWX                   = 0x20000000000003f
+	CAP_MMAP_RX                    = 0x20000000000003d
+	CAP_MMAP_W                     = 0x20000000000001e
+	CAP_MMAP_WX                    = 0x20000000000003e
+	CAP_MMAP_X                     = 0x20000000000003c
+	CAP_PDGETPID                   = 0x400000000000200
+	CAP_PDKILL                     = 0x400000000000800
+	CAP_PDWAIT                     = 0x400000000000400
+	CAP_PEELOFF                    = 0x200001000000000
+	CAP_POLL_EVENT                 = 0x400000000000020
+	CAP_PREAD                      = 0x20000000000000d
+	CAP_PWRITE                     = 0x20000000000000e
+	CAP_READ                       = 0x200000000000001
+	CAP_RECV                       = 0x200000000000001
+	CAP_RENAMEAT_SOURCE            = 0x200000004000400
+	CAP_RENAMEAT_TARGET            = 0x200040000000400
+	CAP_RIGHTS_VERSION             = 0x0
+	CAP_RIGHTS_VERSION_00          = 0x0
+	CAP_SEEK                       = 0x20000000000000c
+	CAP_SEEK_TELL                  = 0x200000000000004
+	CAP_SEM_GETVALUE               = 0x400000000000004
+	CAP_SEM_POST                   = 0x400000000000008
+	CAP_SEM_WAIT                   = 0x400000000000010
+	CAP_SEND                       = 0x200000000000002
+	CAP_SETSOCKOPT                 = 0x200002000000000
+	CAP_SHUTDOWN                   = 0x200004000000000
+	CAP_SOCK_CLIENT                = 0x200007780000003
+	CAP_SOCK_SERVER                = 0x200007f60000003
+	CAP_SYMLINKAT                  = 0x200000008000400
+	CAP_TTYHOOK                    = 0x400000000000100
+	CAP_UNLINKAT                   = 0x200000010000400
+	CAP_UNUSED0_44                 = 0x200080000000000
+	CAP_UNUSED0_57                 = 0x300000000000000
+	CAP_UNUSED1_22                 = 0x400000000200000
+	CAP_UNUSED1_57                 = 0x500000000000000
+	CAP_WRITE                      = 0x200000000000002
+	CFLUSH                         = 0xf
+	CLOCAL                         = 0x8000
+	CLOCK_MONOTONIC                = 0x4
+	CLOCK_MONOTONIC_FAST           = 0xc
+	CLOCK_MONOTONIC_PRECISE        = 0xb
+	CLOCK_PROCESS_CPUTIME_ID       = 0xf
+	CLOCK_PROF                     = 0x2
+	CLOCK_REALTIME                 = 0x0
+	CLOCK_REALTIME_FAST            = 0xa
+	CLOCK_REALTIME_PRECISE         = 0x9
+	CLOCK_SECOND                   = 0xd
+	CLOCK_THREAD_CPUTIME_ID        = 0xe
+	CLOCK_UPTIME                   = 0x5
+	CLOCK_UPTIME_FAST              = 0x8
+	CLOCK_UPTIME_PRECISE           = 0x7
+	CLOCK_VIRTUAL                  = 0x1
+	CREAD                          = 0x800
+	CRTSCTS                        = 0x30000
+	CS5                            = 0x0
+	CS6                            = 0x100
+	CS7                            = 0x200
+	CS8                            = 0x300
+	CSIZE                          = 0x300
+	CSTART                         = 0x11
+	CSTATUS                        = 0x14
+	CSTOP                          = 0x13
+	CSTOPB                         = 0x400
+	CSUSP                          = 0x1a
+	CTL_HW                         = 0x6
+	CTL_KERN                       = 0x1
+	CTL_MAXNAME                    = 0x18
+	CTL_NET                        = 0x4
+	DLT_A429                       = 0xb8
+	DLT_A653_ICM                   = 0xb9
+	DLT_AIRONET_HEADER             = 0x78
+	DLT_AOS                        = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394     = 0x8a
+	DLT_ARCNET                     = 0x7
+	DLT_ARCNET_LINUX               = 0x81
+	DLT_ATM_CLIP                   = 0x13
+	DLT_ATM_RFC1483                = 0xb
+	DLT_AURORA                     = 0x7e
+	DLT_AX25                       = 0x3
+	DLT_AX25_KISS                  = 0xca
+	DLT_BACNET_MS_TP               = 0xa5
+	DLT_BLUETOOTH_BREDR_BB         = 0xff
+	DLT_BLUETOOTH_HCI_H4           = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
+	DLT_BLUETOOTH_LE_LL            = 0xfb
+	DLT_BLUETOOTH_LE_LL_WITH_PHDR  = 0x100
+	DLT_BLUETOOTH_LINUX_MONITOR    = 0xfe
+	DLT_CAN20B                     = 0xbe
+	DLT_CAN_SOCKETCAN              = 0xe3
+	DLT_CHAOS                      = 0x5
+	DLT_CHDLC                      = 0x68
+	DLT_CISCO_IOS                  = 0x76
+	DLT_C_HDLC                     = 0x68
+	DLT_C_HDLC_WITH_DIR            = 0xcd
+	DLT_DBUS                       = 0xe7
+	DLT_DECT                       = 0xdd
+	DLT_DOCSIS                     = 0x8f
+	DLT_DVB_CI                     = 0xeb
+	DLT_ECONET                     = 0x73
+	DLT_EN10MB                     = 0x1
+	DLT_EN3MB                      = 0x2
+	DLT_ENC                        = 0x6d
+	DLT_EPON                       = 0x103
+	DLT_ERF                        = 0xc5
+	DLT_ERF_ETH                    = 0xaf
+	DLT_ERF_POS                    = 0xb0
+	DLT_FC_2                       = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
+	DLT_FDDI                       = 0xa
+	DLT_FLEXRAY                    = 0xd2
+	DLT_FRELAY                     = 0x6b
+	DLT_FRELAY_WITH_DIR            = 0xce
+	DLT_GCOM_SERIAL                = 0xad
+	DLT_GCOM_T1E1                  = 0xac
+	DLT_GPF_F                      = 0xab
+	DLT_GPF_T                      = 0xaa
+	DLT_GPRS_LLC                   = 0xa9
+	DLT_GSMTAP_ABIS                = 0xda
+	DLT_GSMTAP_UM                  = 0xd9
+	DLT_HHDLC                      = 0x79
+	DLT_IBM_SN                     = 0x92
+	DLT_IBM_SP                     = 0x91
+	DLT_IEEE802                    = 0x6
+	DLT_IEEE802_11                 = 0x69
+	DLT_IEEE802_11_RADIO           = 0x7f
+	DLT_IEEE802_11_RADIO_AVS       = 0xa3
+	DLT_IEEE802_15_4               = 0xc3
+	DLT_IEEE802_15_4_LINUX         = 0xbf
+	DLT_IEEE802_15_4_NOFCS         = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY    = 0xd7
+	DLT_IEEE802_16_MAC_CPS         = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
+	DLT_INFINIBAND                 = 0xf7
+	DLT_IPFILTER                   = 0x74
+	DLT_IPMB                       = 0xc7
+	DLT_IPMB_LINUX                 = 0xd1
+	DLT_IPMI_HPM_2                 = 0x104
+	DLT_IPNET                      = 0xe2
+	DLT_IPOIB                      = 0xf2
+	DLT_IPV4                       = 0xe4
+	DLT_IPV6                       = 0xe5
+	DLT_IP_OVER_FC                 = 0x7a
+	DLT_JUNIPER_ATM1               = 0x89
+	DLT_JUNIPER_ATM2               = 0x87
+	DLT_JUNIPER_ATM_CEMIC          = 0xee
+	DLT_JUNIPER_CHDLC              = 0xb5
+	DLT_JUNIPER_ES                 = 0x84
+	DLT_JUNIPER_ETHER              = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL       = 0xea
+	DLT_JUNIPER_FRELAY             = 0xb4
+	DLT_JUNIPER_GGSN               = 0x85
+	DLT_JUNIPER_ISM                = 0xc2
+	DLT_JUNIPER_MFR                = 0x86
+	DLT_JUNIPER_MLFR               = 0x83
+	DLT_JUNIPER_MLPPP              = 0x82
+	DLT_JUNIPER_MONITOR            = 0xa4
+	DLT_JUNIPER_PIC_PEER           = 0xae
+	DLT_JUNIPER_PPP                = 0xb3
+	DLT_JUNIPER_PPPOE              = 0xa7
+	DLT_JUNIPER_PPPOE_ATM          = 0xa8
+	DLT_JUNIPER_SERVICES           = 0x88
+	DLT_JUNIPER_SRX_E2E            = 0xe9
+	DLT_JUNIPER_ST                 = 0xc8
+	DLT_JUNIPER_VP                 = 0xb7
+	DLT_JUNIPER_VS                 = 0xe8
+	DLT_LAPB_WITH_DIR              = 0xcf
+	DLT_LAPD                       = 0xcb
+	DLT_LIN                        = 0xd4
+	DLT_LINUX_EVDEV                = 0xd8
+	DLT_LINUX_IRDA                 = 0x90
+	DLT_LINUX_LAPD                 = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
+	DLT_LINUX_SLL                  = 0x71
+	DLT_LOOP                       = 0x6c
+	DLT_LTALK                      = 0x72
+	DLT_MATCHING_MAX               = 0x104
+	DLT_MATCHING_MIN               = 0x68
+	DLT_MFR                        = 0xb6
+	DLT_MOST                       = 0xd3
+	DLT_MPEG_2_TS                  = 0xf3
+	DLT_MPLS                       = 0xdb
+	DLT_MTP2                       = 0x8c
+	DLT_MTP2_WITH_PHDR             = 0x8b
+	DLT_MTP3                       = 0x8d
+	DLT_MUX27010                   = 0xec
+	DLT_NETANALYZER                = 0xf0
+	DLT_NETANALYZER_TRANSPARENT    = 0xf1
+	DLT_NETLINK                    = 0xfd
+	DLT_NFC_LLCP                   = 0xf5
+	DLT_NFLOG                      = 0xef
+	DLT_NG40                       = 0xf4
+	DLT_NULL                       = 0x0
+	DLT_PCI_EXP                    = 0x7d
+	DLT_PFLOG                      = 0x75
+	DLT_PFSYNC                     = 0x79
+	DLT_PKTAP                      = 0x102
+	DLT_PPI                        = 0xc0
+	DLT_PPP                        = 0x9
+	DLT_PPP_BSDOS                  = 0x10
+	DLT_PPP_ETHER                  = 0x33
+	DLT_PPP_PPPD                   = 0xa6
+	DLT_PPP_SERIAL                 = 0x32
+	DLT_PPP_WITH_DIR               = 0xcc
+	DLT_PPP_WITH_DIRECTION         = 0xa6
+	DLT_PRISM_HEADER               = 0x77
+	DLT_PROFIBUS_DL                = 0x101
+	DLT_PRONET                     = 0x4
+	DLT_RAIF1                      = 0xc6
+	DLT_RAW                        = 0xc
+	DLT_RIO                        = 0x7c
+	DLT_RTAC_SERIAL                = 0xfa
+	DLT_SCCP                       = 0x8e
+	DLT_SCTP                       = 0xf8
+	DLT_SITA                       = 0xc4
+	DLT_SLIP                       = 0x8
+	DLT_SLIP_BSDOS                 = 0xf
+	DLT_STANAG_5066_D_PDU          = 0xed
+	DLT_SUNATM                     = 0x7b
+	DLT_SYMANTEC_FIREWALL          = 0x63
+	DLT_TZSP                       = 0x80
+	DLT_USB                        = 0xba
+	DLT_USBPCAP                    = 0xf9
+	DLT_USB_LINUX                  = 0xbd
+	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USER0                      = 0x93
+	DLT_USER1                      = 0x94
+	DLT_USER10                     = 0x9d
+	DLT_USER11                     = 0x9e
+	DLT_USER12                     = 0x9f
+	DLT_USER13                     = 0xa0
+	DLT_USER14                     = 0xa1
+	DLT_USER15                     = 0xa2
+	DLT_USER2                      = 0x95
+	DLT_USER3                      = 0x96
+	DLT_USER4                      = 0x97
+	DLT_USER5                      = 0x98
+	DLT_USER6                      = 0x99
+	DLT_USER7                      = 0x9a
+	DLT_USER8                      = 0x9b
+	DLT_USER9                      = 0x9c
+	DLT_WIHART                     = 0xdf
+	DLT_WIRESHARK_UPPER_PDU        = 0xfc
+	DLT_X2E_SERIAL                 = 0xd5
+	DLT_X2E_XORAYA                 = 0xd6
+	DT_BLK                         = 0x6
+	DT_CHR                         = 0x2
+	DT_DIR                         = 0x4
+	DT_FIFO                        = 0x1
+	DT_LNK                         = 0xa
+	DT_REG                         = 0x8
+	DT_SOCK                        = 0xc
+	DT_UNKNOWN                     = 0x0
+	DT_WHT                         = 0xe
+	ECHO                           = 0x8
+	ECHOCTL                        = 0x40
+	ECHOE                          = 0x2
+	ECHOK                          = 0x4
+	ECHOKE                         = 0x1
+	ECHONL                         = 0x10
+	ECHOPRT                        = 0x20
+	EVFILT_AIO                     = -0x3
+	EVFILT_FS                      = -0x9
+	EVFILT_LIO                     = -0xa
+	EVFILT_PROC                    = -0x5
+	EVFILT_PROCDESC                = -0x8
+	EVFILT_READ                    = -0x1
+	EVFILT_SENDFILE                = -0xc
+	EVFILT_SIGNAL                  = -0x6
+	EVFILT_SYSCOUNT                = 0xc
+	EVFILT_TIMER                   = -0x7
+	EVFILT_USER                    = -0xb
+	EVFILT_VNODE                   = -0x4
+	EVFILT_WRITE                   = -0x2
+	EV_ADD                         = 0x1
+	EV_CLEAR                       = 0x20
+	EV_DELETE                      = 0x2
+	EV_DISABLE                     = 0x8
+	EV_DISPATCH                    = 0x80
+	EV_DROP                        = 0x1000
+	EV_ENABLE                      = 0x4
+	EV_EOF                         = 0x8000
+	EV_ERROR                       = 0x4000
+	EV_FLAG1                       = 0x2000
+	EV_FLAG2                       = 0x4000
+	EV_FORCEONESHOT                = 0x100
+	EV_ONESHOT                     = 0x10
+	EV_RECEIPT                     = 0x40
+	EV_SYSFLAGS                    = 0xf000
+	EXTA                           = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY        = 0x0
+	EXTATTR_NAMESPACE_SYSTEM       = 0x2
+	EXTATTR_NAMESPACE_USER         = 0x1
+	EXTB                           = 0x9600
+	EXTPROC                        = 0x800
+	FD_CLOEXEC                     = 0x1
+	FD_SETSIZE                     = 0x400
+	FLUSHO                         = 0x800000
+	F_CANCEL                       = 0x5
+	F_DUP2FD                       = 0xa
+	F_DUP2FD_CLOEXEC               = 0x12
+	F_DUPFD                        = 0x0
+	F_DUPFD_CLOEXEC                = 0x11
+	F_GETFD                        = 0x1
+	F_GETFL                        = 0x3
+	F_GETLK                        = 0xb
+	F_GETOWN                       = 0x5
+	F_OGETLK                       = 0x7
+	F_OK                           = 0x0
+	F_OSETLK                       = 0x8
+	F_OSETLKW                      = 0x9
+	F_RDAHEAD                      = 0x10
+	F_RDLCK                        = 0x1
+	F_READAHEAD                    = 0xf
+	F_SETFD                        = 0x2
+	F_SETFL                        = 0x4
+	F_SETLK                        = 0xc
+	F_SETLKW                       = 0xd
+	F_SETLK_REMOTE                 = 0xe
+	F_SETOWN                       = 0x6
+	F_UNLCK                        = 0x2
+	F_UNLCKSYS                     = 0x4
+	F_WRLCK                        = 0x3
+	HUPCL                          = 0x4000
+	HW_MACHINE                     = 0x1
+	ICANON                         = 0x100
+	ICMP6_FILTER                   = 0x12
+	ICRNL                          = 0x100
+	IEXTEN                         = 0x400
+	IFAN_ARRIVAL                   = 0x0
+	IFAN_DEPARTURE                 = 0x1
+	IFF_ALLMULTI                   = 0x200
+	IFF_ALTPHYS                    = 0x4000
+	IFF_BROADCAST                  = 0x2
+	IFF_CANTCHANGE                 = 0x218f52
+	IFF_CANTCONFIG                 = 0x10000
+	IFF_DEBUG                      = 0x4
+	IFF_DRV_OACTIVE                = 0x400
+	IFF_DRV_RUNNING                = 0x40
+	IFF_DYING                      = 0x200000
+	IFF_LINK0                      = 0x1000
+	IFF_LINK1                      = 0x2000
+	IFF_LINK2                      = 0x4000
+	IFF_LOOPBACK                   = 0x8
+	IFF_MONITOR                    = 0x40000
+	IFF_MULTICAST                  = 0x8000
+	IFF_NOARP                      = 0x80
+	IFF_OACTIVE                    = 0x400
+	IFF_POINTOPOINT                = 0x10
+	IFF_PPROMISC                   = 0x20000
+	IFF_PROMISC                    = 0x100
+	IFF_RENAMING                   = 0x400000
+	IFF_RUNNING                    = 0x40
+	IFF_SIMPLEX                    = 0x800
+	IFF_STATICARP                  = 0x80000
+	IFF_UP                         = 0x1
+	IFNAMSIZ                       = 0x10
+	IFT_BRIDGE                     = 0xd1
+	IFT_CARP                       = 0xf8
+	IFT_IEEE1394                   = 0x90
+	IFT_INFINIBAND                 = 0xc7
+	IFT_L2VLAN                     = 0x87
+	IFT_L3IPVLAN                   = 0x88
+	IFT_PPP                        = 0x17
+	IFT_PROPVIRTUAL                = 0x35
+	IGNBRK                         = 0x1
+	IGNCR                          = 0x80
+	IGNPAR                         = 0x4
+	IMAXBEL                        = 0x2000
+	INLCR                          = 0x40
+	INPCK                          = 0x10
+	IN_CLASSA_HOST                 = 0xffffff
+	IN_CLASSA_MAX                  = 0x80
+	IN_CLASSA_NET                  = 0xff000000
+	IN_CLASSA_NSHIFT               = 0x18
+	IN_CLASSB_HOST                 = 0xffff
+	IN_CLASSB_MAX                  = 0x10000
+	IN_CLASSB_NET                  = 0xffff0000
+	IN_CLASSB_NSHIFT               = 0x10
+	IN_CLASSC_HOST                 = 0xff
+	IN_CLASSC_NET                  = 0xffffff00
+	IN_CLASSC_NSHIFT               = 0x8
+	IN_CLASSD_HOST                 = 0xfffffff
+	IN_CLASSD_NET                  = 0xf0000000
+	IN_CLASSD_NSHIFT               = 0x1c
+	IN_LOOPBACKNET                 = 0x7f
+	IN_RFC3021_MASK                = 0xfffffffe
+	IPPROTO_3PC                    = 0x22
+	IPPROTO_ADFS                   = 0x44
+	IPPROTO_AH                     = 0x33
+	IPPROTO_AHIP                   = 0x3d
+	IPPROTO_APES                   = 0x63
+	IPPROTO_ARGUS                  = 0xd
+	IPPROTO_AX25                   = 0x5d
+	IPPROTO_BHA                    = 0x31
+	IPPROTO_BLT                    = 0x1e
+	IPPROTO_BRSATMON               = 0x4c
+	IPPROTO_CARP                   = 0x70
+	IPPROTO_CFTP                   = 0x3e
+	IPPROTO_CHAOS                  = 0x10
+	IPPROTO_CMTP                   = 0x26
+	IPPROTO_CPHB                   = 0x49
+	IPPROTO_CPNX                   = 0x48
+	IPPROTO_DDP                    = 0x25
+	IPPROTO_DGP                    = 0x56
+	IPPROTO_DIVERT                 = 0x102
+	IPPROTO_DONE                   = 0x101
+	IPPROTO_DSTOPTS                = 0x3c
+	IPPROTO_EGP                    = 0x8
+	IPPROTO_EMCON                  = 0xe
+	IPPROTO_ENCAP                  = 0x62
+	IPPROTO_EON                    = 0x50
+	IPPROTO_ESP                    = 0x32
+	IPPROTO_ETHERIP                = 0x61
+	IPPROTO_FRAGMENT               = 0x2c
+	IPPROTO_GGP                    = 0x3
+	IPPROTO_GMTP                   = 0x64
+	IPPROTO_GRE                    = 0x2f
+	IPPROTO_HELLO                  = 0x3f
+	IPPROTO_HIP                    = 0x8b
+	IPPROTO_HMP                    = 0x14
+	IPPROTO_HOPOPTS                = 0x0
+	IPPROTO_ICMP                   = 0x1
+	IPPROTO_ICMPV6                 = 0x3a
+	IPPROTO_IDP                    = 0x16
+	IPPROTO_IDPR                   = 0x23
+	IPPROTO_IDRP                   = 0x2d
+	IPPROTO_IGMP                   = 0x2
+	IPPROTO_IGP                    = 0x55
+	IPPROTO_IGRP                   = 0x58
+	IPPROTO_IL                     = 0x28
+	IPPROTO_INLSP                  = 0x34
+	IPPROTO_INP                    = 0x20
+	IPPROTO_IP                     = 0x0
+	IPPROTO_IPCOMP                 = 0x6c
+	IPPROTO_IPCV                   = 0x47
+	IPPROTO_IPEIP                  = 0x5e
+	IPPROTO_IPIP                   = 0x4
+	IPPROTO_IPPC                   = 0x43
+	IPPROTO_IPV4                   = 0x4
+	IPPROTO_IPV6                   = 0x29
+	IPPROTO_IRTP                   = 0x1c
+	IPPROTO_KRYPTOLAN              = 0x41
+	IPPROTO_LARP                   = 0x5b
+	IPPROTO_LEAF1                  = 0x19
+	IPPROTO_LEAF2                  = 0x1a
+	IPPROTO_MAX                    = 0x100
+	IPPROTO_MEAS                   = 0x13
+	IPPROTO_MH                     = 0x87
+	IPPROTO_MHRP                   = 0x30
+	IPPROTO_MICP                   = 0x5f
+	IPPROTO_MOBILE                 = 0x37
+	IPPROTO_MPLS                   = 0x89
+	IPPROTO_MTP                    = 0x5c
+	IPPROTO_MUX                    = 0x12
+	IPPROTO_ND                     = 0x4d
+	IPPROTO_NHRP                   = 0x36
+	IPPROTO_NONE                   = 0x3b
+	IPPROTO_NSP                    = 0x1f
+	IPPROTO_NVPII                  = 0xb
+	IPPROTO_OLD_DIVERT             = 0xfe
+	IPPROTO_OSPFIGP                = 0x59
+	IPPROTO_PFSYNC                 = 0xf0
+	IPPROTO_PGM                    = 0x71
+	IPPROTO_PIGP                   = 0x9
+	IPPROTO_PIM                    = 0x67
+	IPPROTO_PRM                    = 0x15
+	IPPROTO_PUP                    = 0xc
+	IPPROTO_PVP                    = 0x4b
+	IPPROTO_RAW                    = 0xff
+	IPPROTO_RCCMON                 = 0xa
+	IPPROTO_RDP                    = 0x1b
+	IPPROTO_RESERVED_253           = 0xfd
+	IPPROTO_RESERVED_254           = 0xfe
+	IPPROTO_ROUTING                = 0x2b
+	IPPROTO_RSVP                   = 0x2e
+	IPPROTO_RVD                    = 0x42
+	IPPROTO_SATEXPAK               = 0x40
+	IPPROTO_SATMON                 = 0x45
+	IPPROTO_SCCSP                  = 0x60
+	IPPROTO_SCTP                   = 0x84
+	IPPROTO_SDRP                   = 0x2a
+	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
+	IPPROTO_SHIM6                  = 0x8c
+	IPPROTO_SKIP                   = 0x39
+	IPPROTO_SPACER                 = 0x7fff
+	IPPROTO_SRPC                   = 0x5a
+	IPPROTO_ST                     = 0x7
+	IPPROTO_SVMTP                  = 0x52
+	IPPROTO_SWIPE                  = 0x35
+	IPPROTO_TCF                    = 0x57
+	IPPROTO_TCP                    = 0x6
+	IPPROTO_TLSP                   = 0x38
+	IPPROTO_TP                     = 0x1d
+	IPPROTO_TPXX                   = 0x27
+	IPPROTO_TRUNK1                 = 0x17
+	IPPROTO_TRUNK2                 = 0x18
+	IPPROTO_TTP                    = 0x54
+	IPPROTO_UDP                    = 0x11
+	IPPROTO_UDPLITE                = 0x88
+	IPPROTO_VINES                  = 0x53
+	IPPROTO_VISA                   = 0x46
+	IPPROTO_VMTP                   = 0x51
+	IPPROTO_WBEXPAK                = 0x4f
+	IPPROTO_WBMON                  = 0x4e
+	IPPROTO_WSN                    = 0x4a
+	IPPROTO_XNET                   = 0xf
+	IPPROTO_XTP                    = 0x24
+	IPV6_AUTOFLOWLABEL             = 0x3b
+	IPV6_BINDANY                   = 0x40
+	IPV6_BINDMULTI                 = 0x41
+	IPV6_BINDV6ONLY                = 0x1b
+	IPV6_CHECKSUM                  = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS    = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP    = 0x1
+	IPV6_DEFHLIM                   = 0x40
+	IPV6_DONTFRAG                  = 0x3e
+	IPV6_DSTOPTS                   = 0x32
+	IPV6_FLOWID                    = 0x43
+	IPV6_FLOWINFO_MASK             = 0xffffff0f
+	IPV6_FLOWLABEL_MASK            = 0xffff0f00
+	IPV6_FLOWTYPE                  = 0x44
+	IPV6_FRAGTTL                   = 0x78
+	IPV6_FW_ADD                    = 0x1e
+	IPV6_FW_DEL                    = 0x1f
+	IPV6_FW_FLUSH                  = 0x20
+	IPV6_FW_GET                    = 0x22
+	IPV6_FW_ZERO                   = 0x21
+	IPV6_HLIMDEC                   = 0x1
+	IPV6_HOPLIMIT                  = 0x2f
+	IPV6_HOPOPTS                   = 0x31
+	IPV6_IPSEC_POLICY              = 0x1c
+	IPV6_JOIN_GROUP                = 0xc
+	IPV6_LEAVE_GROUP               = 0xd
+	IPV6_MAXHLIM                   = 0xff
+	IPV6_MAXOPTHDR                 = 0x800
+	IPV6_MAXPACKET                 = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
+	IPV6_MAX_MEMBERSHIPS           = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
+	IPV6_MIN_MEMBERSHIPS           = 0x1f
+	IPV6_MMTU                      = 0x500
+	IPV6_MSFILTER                  = 0x4a
+	IPV6_MULTICAST_HOPS            = 0xa
+	IPV6_MULTICAST_IF              = 0x9
+	IPV6_MULTICAST_LOOP            = 0xb
+	IPV6_NEXTHOP                   = 0x30
+	IPV6_PATHMTU                   = 0x2c
+	IPV6_PKTINFO                   = 0x2e
+	IPV6_PORTRANGE                 = 0xe
+	IPV6_PORTRANGE_DEFAULT         = 0x0
+	IPV6_PORTRANGE_HIGH            = 0x1
+	IPV6_PORTRANGE_LOW             = 0x2
+	IPV6_PREFER_TEMPADDR           = 0x3f
+	IPV6_RECVDSTOPTS               = 0x28
+	IPV6_RECVFLOWID                = 0x46
+	IPV6_RECVHOPLIMIT              = 0x25
+	IPV6_RECVHOPOPTS               = 0x27
+	IPV6_RECVPATHMTU               = 0x2b
+	IPV6_RECVPKTINFO               = 0x24
+	IPV6_RECVRSSBUCKETID           = 0x47
+	IPV6_RECVRTHDR                 = 0x26
+	IPV6_RECVTCLASS                = 0x39
+	IPV6_RSSBUCKETID               = 0x45
+	IPV6_RSS_LISTEN_BUCKET         = 0x42
+	IPV6_RTHDR                     = 0x33
+	IPV6_RTHDRDSTOPTS              = 0x23
+	IPV6_RTHDR_LOOSE               = 0x0
+	IPV6_RTHDR_STRICT              = 0x1
+	IPV6_RTHDR_TYPE_0              = 0x0
+	IPV6_SOCKOPT_RESERVED1         = 0x3
+	IPV6_TCLASS                    = 0x3d
+	IPV6_UNICAST_HOPS              = 0x4
+	IPV6_USE_MIN_MTU               = 0x2a
+	IPV6_V6ONLY                    = 0x1b
+	IPV6_VERSION                   = 0x60
+	IPV6_VERSION_MASK              = 0xf0
+	IP_ADD_MEMBERSHIP              = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
+	IP_BINDANY                     = 0x18
+	IP_BINDMULTI                   = 0x19
+	IP_BLOCK_SOURCE                = 0x48
+	IP_DEFAULT_MULTICAST_LOOP      = 0x1
+	IP_DEFAULT_MULTICAST_TTL       = 0x1
+	IP_DF                          = 0x4000
+	IP_DONTFRAG                    = 0x43
+	IP_DROP_MEMBERSHIP             = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP      = 0x47
+	IP_DUMMYNET3                   = 0x31
+	IP_DUMMYNET_CONFIGURE          = 0x3c
+	IP_DUMMYNET_DEL                = 0x3d
+	IP_DUMMYNET_FLUSH              = 0x3e
+	IP_DUMMYNET_GET                = 0x40
+	IP_FLOWID                      = 0x5a
+	IP_FLOWTYPE                    = 0x5b
+	IP_FW3                         = 0x30
+	IP_FW_ADD                      = 0x32
+	IP_FW_DEL                      = 0x33
+	IP_FW_FLUSH                    = 0x34
+	IP_FW_GET                      = 0x36
+	IP_FW_NAT_CFG                  = 0x38
+	IP_FW_NAT_DEL                  = 0x39
+	IP_FW_NAT_GET_CONFIG           = 0x3a
+	IP_FW_NAT_GET_LOG              = 0x3b
+	IP_FW_RESETLOG                 = 0x37
+	IP_FW_TABLE_ADD                = 0x28
+	IP_FW_TABLE_DEL                = 0x29
+	IP_FW_TABLE_FLUSH              = 0x2a
+	IP_FW_TABLE_GETSIZE            = 0x2b
+	IP_FW_TABLE_LIST               = 0x2c
+	IP_FW_ZERO                     = 0x35
+	IP_HDRINCL                     = 0x2
+	IP_IPSEC_POLICY                = 0x15
+	IP_MAXPACKET                   = 0xffff
+	IP_MAX_GROUP_SRC_FILTER        = 0x200
+	IP_MAX_MEMBERSHIPS             = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER        = 0x80
+	IP_MAX_SOCK_SRC_FILTER         = 0x80
+	IP_MAX_SOURCE_FILTER           = 0x400
+	IP_MF                          = 0x2000
+	IP_MINTTL                      = 0x42
+	IP_MIN_MEMBERSHIPS             = 0x1f
+	IP_MSFILTER                    = 0x4a
+	IP_MSS                         = 0x240
+	IP_MULTICAST_IF                = 0x9
+	IP_MULTICAST_LOOP              = 0xb
+	IP_MULTICAST_TTL               = 0xa
+	IP_MULTICAST_VIF               = 0xe
+	IP_OFFMASK                     = 0x1fff
+	IP_ONESBCAST                   = 0x17
+	IP_OPTIONS                     = 0x1
+	IP_PORTRANGE                   = 0x13
+	IP_PORTRANGE_DEFAULT           = 0x0
+	IP_PORTRANGE_HIGH              = 0x1
+	IP_PORTRANGE_LOW               = 0x2
+	IP_RECVDSTADDR                 = 0x7
+	IP_RECVFLOWID                  = 0x5d
+	IP_RECVIF                      = 0x14
+	IP_RECVOPTS                    = 0x5
+	IP_RECVRETOPTS                 = 0x6
+	IP_RECVRSSBUCKETID             = 0x5e
+	IP_RECVTOS                     = 0x44
+	IP_RECVTTL                     = 0x41
+	IP_RETOPTS                     = 0x8
+	IP_RF                          = 0x8000
+	IP_RSSBUCKETID                 = 0x5c
+	IP_RSS_LISTEN_BUCKET           = 0x1a
+	IP_RSVP_OFF                    = 0x10
+	IP_RSVP_ON                     = 0xf
+	IP_RSVP_VIF_OFF                = 0x12
+	IP_RSVP_VIF_ON                 = 0x11
+	IP_SENDSRCADDR                 = 0x7
+	IP_TOS                         = 0x3
+	IP_TTL                         = 0x4
+	IP_UNBLOCK_SOURCE              = 0x49
+	ISIG                           = 0x80
+	ISTRIP                         = 0x20
+	IXANY                          = 0x800
+	IXOFF                          = 0x400
+	IXON                           = 0x200
+	KERN_HOSTNAME                  = 0xa
+	KERN_OSRELEASE                 = 0x2
+	KERN_OSTYPE                    = 0x1
+	KERN_VERSION                   = 0x4
+	LOCK_EX                        = 0x2
+	LOCK_NB                        = 0x4
+	LOCK_SH                        = 0x1
+	LOCK_UN                        = 0x8
+	MADV_AUTOSYNC                  = 0x7
+	MADV_CORE                      = 0x9
+	MADV_DONTNEED                  = 0x4
+	MADV_FREE                      = 0x5
+	MADV_NOCORE                    = 0x8
+	MADV_NORMAL                    = 0x0
+	MADV_NOSYNC                    = 0x6
+	MADV_PROTECT                   = 0xa
+	MADV_RANDOM                    = 0x1
+	MADV_SEQUENTIAL                = 0x2
+	MADV_WILLNEED                  = 0x3
+	MAP_ALIGNED_SUPER              = 0x1000000
+	MAP_ALIGNMENT_MASK             = -0x1000000
+	MAP_ALIGNMENT_SHIFT            = 0x18
+	MAP_ANON                       = 0x1000
+	MAP_ANONYMOUS                  = 0x1000
+	MAP_COPY                       = 0x2
+	MAP_EXCL                       = 0x4000
+	MAP_FILE                       = 0x0
+	MAP_FIXED                      = 0x10
+	MAP_HASSEMAPHORE               = 0x200
+	MAP_NOCORE                     = 0x20000
+	MAP_NOSYNC                     = 0x800
+	MAP_PREFAULT_READ              = 0x40000
+	MAP_PRIVATE                    = 0x2
+	MAP_RESERVED0020               = 0x20
+	MAP_RESERVED0040               = 0x40
+	MAP_RESERVED0080               = 0x80
+	MAP_RESERVED0100               = 0x100
+	MAP_SHARED                     = 0x1
+	MAP_STACK                      = 0x400
+	MCL_CURRENT                    = 0x1
+	MCL_FUTURE                     = 0x2
+	MNT_ACLS                       = 0x8000000
+	MNT_ASYNC                      = 0x40
+	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_BYFSID                     = 0x8000000
+	MNT_CMDFLAGS                   = 0xd0f0000
+	MNT_DEFEXPORTED                = 0x200
+	MNT_DELEXPORT                  = 0x20000
+	MNT_EXKERB                     = 0x800
+	MNT_EXPORTANON                 = 0x400
+	MNT_EXPORTED                   = 0x100
+	MNT_EXPUBLIC                   = 0x20000000
+	MNT_EXRDONLY                   = 0x80
+	MNT_FORCE                      = 0x80000
+	MNT_GJOURNAL                   = 0x2000000
+	MNT_IGNORE                     = 0x800000
+	MNT_LAZY                       = 0x3
+	MNT_LOCAL                      = 0x1000
+	MNT_MULTILABEL                 = 0x4000000
+	MNT_NFS4ACLS                   = 0x10
+	MNT_NOATIME                    = 0x10000000
+	MNT_NOCLUSTERR                 = 0x40000000
+	MNT_NOCLUSTERW                 = 0x80000000
+	MNT_NOEXEC                     = 0x4
+	MNT_NONBUSY                    = 0x4000000
+	MNT_NOSUID                     = 0x8
+	MNT_NOSYMFOLLOW                = 0x400000
+	MNT_NOWAIT                     = 0x2
+	MNT_QUOTA                      = 0x2000
+	MNT_RDONLY                     = 0x1
+	MNT_RELOAD                     = 0x40000
+	MNT_ROOTFS                     = 0x4000
+	MNT_SNAPSHOT                   = 0x1000000
+	MNT_SOFTDEP                    = 0x200000
+	MNT_SUIDDIR                    = 0x100000
+	MNT_SUJ                        = 0x100000000
+	MNT_SUSPEND                    = 0x4
+	MNT_SYNCHRONOUS                = 0x2
+	MNT_UNION                      = 0x20
+	MNT_UPDATE                     = 0x10000
+	MNT_UPDATEMASK                 = 0x2d8d0807e
+	MNT_USER                       = 0x8000
+	MNT_VISFLAGMASK                = 0x3fef0ffff
+	MNT_WAIT                       = 0x1
+	MSG_CMSG_CLOEXEC               = 0x40000
+	MSG_COMPAT                     = 0x8000
+	MSG_CTRUNC                     = 0x20
+	MSG_DONTROUTE                  = 0x4
+	MSG_DONTWAIT                   = 0x80
+	MSG_EOF                        = 0x100
+	MSG_EOR                        = 0x8
+	MSG_NBIO                       = 0x4000
+	MSG_NOSIGNAL                   = 0x20000
+	MSG_NOTIFICATION               = 0x2000
+	MSG_OOB                        = 0x1
+	MSG_PEEK                       = 0x2
+	MSG_TRUNC                      = 0x10
+	MSG_WAITALL                    = 0x40
+	MSG_WAITFORONE                 = 0x80000
+	MS_ASYNC                       = 0x1
+	MS_INVALIDATE                  = 0x2
+	MS_SYNC                        = 0x0
+	NAME_MAX                       = 0xff
+	NET_RT_DUMP                    = 0x1
+	NET_RT_FLAGS                   = 0x2
+	NET_RT_IFLIST                  = 0x3
+	NET_RT_IFLISTL                 = 0x5
+	NET_RT_IFMALIST                = 0x4
+	NOFLSH                         = 0x80000000
+	NOKERNINFO                     = 0x2000000
+	NOTE_ATTRIB                    = 0x8
+	NOTE_CHILD                     = 0x4
+	NOTE_CLOSE                     = 0x100
+	NOTE_CLOSE_WRITE               = 0x200
+	NOTE_DELETE                    = 0x1
+	NOTE_EXEC                      = 0x20000000
+	NOTE_EXIT                      = 0x80000000
+	NOTE_EXTEND                    = 0x4
+	NOTE_FFAND                     = 0x40000000
+	NOTE_FFCOPY                    = 0xc0000000
+	NOTE_FFCTRLMASK                = 0xc0000000
+	NOTE_FFLAGSMASK                = 0xffffff
+	NOTE_FFNOP                     = 0x0
+	NOTE_FFOR                      = 0x80000000
+	NOTE_FILE_POLL                 = 0x2
+	NOTE_FORK                      = 0x40000000
+	NOTE_LINK                      = 0x10
+	NOTE_LOWAT                     = 0x1
+	NOTE_MSECONDS                  = 0x2
+	NOTE_NSECONDS                  = 0x8
+	NOTE_OPEN                      = 0x80
+	NOTE_PCTRLMASK                 = 0xf0000000
+	NOTE_PDATAMASK                 = 0xfffff
+	NOTE_READ                      = 0x400
+	NOTE_RENAME                    = 0x20
+	NOTE_REVOKE                    = 0x40
+	NOTE_SECONDS                   = 0x1
+	NOTE_TRACK                     = 0x1
+	NOTE_TRACKERR                  = 0x2
+	NOTE_TRIGGER                   = 0x1000000
+	NOTE_USECONDS                  = 0x4
+	NOTE_WRITE                     = 0x2
+	OCRNL                          = 0x10
+	ONLCR                          = 0x2
+	ONLRET                         = 0x40
+	ONOCR                          = 0x20
+	ONOEOT                         = 0x8
+	OPOST                          = 0x1
+	OXTABS                         = 0x4
+	O_ACCMODE                      = 0x3
+	O_APPEND                       = 0x8
+	O_ASYNC                        = 0x40
+	O_CLOEXEC                      = 0x100000
+	O_CREAT                        = 0x200
+	O_DIRECT                       = 0x10000
+	O_DIRECTORY                    = 0x20000
+	O_EXCL                         = 0x800
+	O_EXEC                         = 0x40000
+	O_EXLOCK                       = 0x20
+	O_FSYNC                        = 0x80
+	O_NDELAY                       = 0x4
+	O_NOCTTY                       = 0x8000
+	O_NOFOLLOW                     = 0x100
+	O_NONBLOCK                     = 0x4
+	O_RDONLY                       = 0x0
+	O_RDWR                         = 0x2
+	O_SHLOCK                       = 0x10
+	O_SYNC                         = 0x80
+	O_TRUNC                        = 0x400
+	O_TTY_INIT                     = 0x80000
+	O_VERIFY                       = 0x200000
+	O_WRONLY                       = 0x1
+	PARENB                         = 0x1000
+	PARMRK                         = 0x8
+	PARODD                         = 0x2000
+	PENDIN                         = 0x20000000
+	PRIO_PGRP                      = 0x1
+	PRIO_PROCESS                   = 0x0
+	PRIO_USER                      = 0x2
+	PROT_EXEC                      = 0x4
+	PROT_NONE                      = 0x0
+	PROT_READ                      = 0x1
+	PROT_WRITE                     = 0x2
+	RLIMIT_AS                      = 0xa
+	RLIMIT_CORE                    = 0x4
+	RLIMIT_CPU                     = 0x0
+	RLIMIT_DATA                    = 0x2
+	RLIMIT_FSIZE                   = 0x1
+	RLIMIT_MEMLOCK                 = 0x6
+	RLIMIT_NOFILE                  = 0x8
+	RLIMIT_NPROC                   = 0x7
+	RLIMIT_RSS                     = 0x5
+	RLIMIT_STACK                   = 0x3
+	RLIM_INFINITY                  = 0x7fffffffffffffff
+	RTAX_AUTHOR                    = 0x6
+	RTAX_BRD                       = 0x7
+	RTAX_DST                       = 0x0
+	RTAX_GATEWAY                   = 0x1
+	RTAX_GENMASK                   = 0x3
+	RTAX_IFA                       = 0x5
+	RTAX_IFP                       = 0x4
+	RTAX_MAX                       = 0x8
+	RTAX_NETMASK                   = 0x2
+	RTA_AUTHOR                     = 0x40
+	RTA_BRD                        = 0x80
+	RTA_DST                        = 0x1
+	RTA_GATEWAY                    = 0x2
+	RTA_GENMASK                    = 0x8
+	RTA_IFA                        = 0x20
+	RTA_IFP                        = 0x10
+	RTA_NETMASK                    = 0x4
+	RTF_BLACKHOLE                  = 0x1000
+	RTF_BROADCAST                  = 0x400000
+	RTF_DONE                       = 0x40
+	RTF_DYNAMIC                    = 0x10
+	RTF_FIXEDMTU                   = 0x80000
+	RTF_FMASK                      = 0x1004d808
+	RTF_GATEWAY                    = 0x2
+	RTF_GWFLAG_COMPAT              = 0x80000000
+	RTF_HOST                       = 0x4
+	RTF_LLDATA                     = 0x400
+	RTF_LLINFO                     = 0x400
+	RTF_LOCAL                      = 0x200000
+	RTF_MODIFIED                   = 0x20
+	RTF_MULTICAST                  = 0x800000
+	RTF_PINNED                     = 0x100000
+	RTF_PROTO1                     = 0x8000
+	RTF_PROTO2                     = 0x4000
+	RTF_PROTO3                     = 0x40000
+	RTF_REJECT                     = 0x8
+	RTF_RNH_LOCKED                 = 0x40000000
+	RTF_STATIC                     = 0x800
+	RTF_STICKY                     = 0x10000000
+	RTF_UP                         = 0x1
+	RTF_XRESOLVE                   = 0x200
+	RTM_ADD                        = 0x1
+	RTM_CHANGE                     = 0x3
+	RTM_DELADDR                    = 0xd
+	RTM_DELETE                     = 0x2
+	RTM_DELMADDR                   = 0x10
+	RTM_GET                        = 0x4
+	RTM_IEEE80211                  = 0x12
+	RTM_IFANNOUNCE                 = 0x11
+	RTM_IFINFO                     = 0xe
+	RTM_LOCK                       = 0x8
+	RTM_LOSING                     = 0x5
+	RTM_MISS                       = 0x7
+	RTM_NEWADDR                    = 0xc
+	RTM_NEWMADDR                   = 0xf
+	RTM_REDIRECT                   = 0x6
+	RTM_RESOLVE                    = 0xb
+	RTM_RTTUNIT                    = 0xf4240
+	RTM_VERSION                    = 0x5
+	RTV_EXPIRE                     = 0x4
+	RTV_HOPCOUNT                   = 0x2
+	RTV_MTU                        = 0x1
+	RTV_RPIPE                      = 0x8
+	RTV_RTT                        = 0x40
+	RTV_RTTVAR                     = 0x80
+	RTV_SPIPE                      = 0x10
+	RTV_SSTHRESH                   = 0x20
+	RTV_WEIGHT                     = 0x100
+	RT_ALL_FIBS                    = -0x1
+	RT_BLACKHOLE                   = 0x40
+	RT_CACHING_CONTEXT             = 0x1
+	RT_DEFAULT_FIB                 = 0x0
+	RT_HAS_GW                      = 0x80
+	RT_HAS_HEADER                  = 0x10
+	RT_HAS_HEADER_BIT              = 0x4
+	RT_L2_ME                       = 0x4
+	RT_L2_ME_BIT                   = 0x2
+	RT_LLE_CACHE                   = 0x100
+	RT_MAY_LOOP                    = 0x8
+	RT_MAY_LOOP_BIT                = 0x3
+	RT_NORTREF                     = 0x2
+	RT_REJECT                      = 0x20
+	RUSAGE_CHILDREN                = -0x1
+	RUSAGE_SELF                    = 0x0
+	RUSAGE_THREAD                  = 0x1
+	SCM_BINTIME                    = 0x4
+	SCM_CREDS                      = 0x3
+	SCM_RIGHTS                     = 0x1
+	SCM_TIMESTAMP                  = 0x2
+	SHUT_RD                        = 0x0
+	SHUT_RDWR                      = 0x2
+	SHUT_WR                        = 0x1
+	SIOCADDMULTI                   = 0x80206931
+	SIOCAIFADDR                    = 0x8040691a
+	SIOCAIFGROUP                   = 0x80246987
+	SIOCATMARK                     = 0x40047307
+	SIOCDELMULTI                   = 0x80206932
+	SIOCDIFADDR                    = 0x80206919
+	SIOCDIFGROUP                   = 0x80246989
+	SIOCDIFPHYADDR                 = 0x80206949
+	SIOCGDRVSPEC                   = 0xc01c697b
+	SIOCGETSGCNT                   = 0xc0147210
+	SIOCGETVIFCNT                  = 0xc014720f
+	SIOCGHIWAT                     = 0x40047301
+	SIOCGI2C                       = 0xc020693d
+	SIOCGIFADDR                    = 0xc0206921
+	SIOCGIFBRDADDR                 = 0xc0206923
+	SIOCGIFCAP                     = 0xc020691f
+	SIOCGIFCONF                    = 0xc0086924
+	SIOCGIFDESCR                   = 0xc020692a
+	SIOCGIFDSTADDR                 = 0xc0206922
+	SIOCGIFFIB                     = 0xc020695c
+	SIOCGIFFLAGS                   = 0xc0206911
+	SIOCGIFGENERIC                 = 0xc020693a
+	SIOCGIFGMEMB                   = 0xc024698a
+	SIOCGIFGROUP                   = 0xc0246988
+	SIOCGIFINDEX                   = 0xc0206920
+	SIOCGIFMAC                     = 0xc0206926
+	SIOCGIFMEDIA                   = 0xc0286938
+	SIOCGIFMETRIC                  = 0xc0206917
+	SIOCGIFMTU                     = 0xc0206933
+	SIOCGIFNETMASK                 = 0xc0206925
+	SIOCGIFPDSTADDR                = 0xc0206948
+	SIOCGIFPHYS                    = 0xc0206935
+	SIOCGIFPSRCADDR                = 0xc0206947
+	SIOCGIFSTATUS                  = 0xc331693b
+	SIOCGIFXMEDIA                  = 0xc028698b
+	SIOCGLOWAT                     = 0x40047303
+	SIOCGPGRP                      = 0x40047309
+	SIOCGPRIVATE_0                 = 0xc0206950
+	SIOCGPRIVATE_1                 = 0xc0206951
+	SIOCGTUNFIB                    = 0xc020695e
+	SIOCIFCREATE                   = 0xc020697a
+	SIOCIFCREATE2                  = 0xc020697c
+	SIOCIFDESTROY                  = 0x80206979
+	SIOCIFGCLONERS                 = 0xc00c6978
+	SIOCSDRVSPEC                   = 0x801c697b
+	SIOCSHIWAT                     = 0x80047300
+	SIOCSIFADDR                    = 0x8020690c
+	SIOCSIFBRDADDR                 = 0x80206913
+	SIOCSIFCAP                     = 0x8020691e
+	SIOCSIFDESCR                   = 0x80206929
+	SIOCSIFDSTADDR                 = 0x8020690e
+	SIOCSIFFIB                     = 0x8020695d
+	SIOCSIFFLAGS                   = 0x80206910
+	SIOCSIFGENERIC                 = 0x80206939
+	SIOCSIFLLADDR                  = 0x8020693c
+	SIOCSIFMAC                     = 0x80206927
+	SIOCSIFMEDIA                   = 0xc0206937
+	SIOCSIFMETRIC                  = 0x80206918
+	SIOCSIFMTU                     = 0x80206934
+	SIOCSIFNAME                    = 0x80206928
+	SIOCSIFNETMASK                 = 0x80206916
+	SIOCSIFPHYADDR                 = 0x80406946
+	SIOCSIFPHYS                    = 0x80206936
+	SIOCSIFRVNET                   = 0xc020695b
+	SIOCSIFVNET                    = 0xc020695a
+	SIOCSLOWAT                     = 0x80047302
+	SIOCSPGRP                      = 0x80047308
+	SIOCSTUNFIB                    = 0x8020695f
+	SOCK_CLOEXEC                   = 0x10000000
+	SOCK_DGRAM                     = 0x2
+	SOCK_MAXADDRLEN                = 0xff
+	SOCK_NONBLOCK                  = 0x20000000
+	SOCK_RAW                       = 0x3
+	SOCK_RDM                       = 0x4
+	SOCK_SEQPACKET                 = 0x5
+	SOCK_STREAM                    = 0x1
+	SOL_SOCKET                     = 0xffff
+	SOMAXCONN                      = 0x80
+	SO_ACCEPTCONN                  = 0x2
+	SO_ACCEPTFILTER                = 0x1000
+	SO_BINTIME                     = 0x2000
+	SO_BROADCAST                   = 0x20
+	SO_DEBUG                       = 0x1
+	SO_DONTROUTE                   = 0x10
+	SO_ERROR                       = 0x1007
+	SO_KEEPALIVE                   = 0x8
+	SO_LABEL                       = 0x1009
+	SO_LINGER                      = 0x80
+	SO_LISTENINCQLEN               = 0x1013
+	SO_LISTENQLEN                  = 0x1012
+	SO_LISTENQLIMIT                = 0x1011
+	SO_NOSIGPIPE                   = 0x800
+	SO_NO_DDP                      = 0x8000
+	SO_NO_OFFLOAD                  = 0x4000
+	SO_OOBINLINE                   = 0x100
+	SO_PEERLABEL                   = 0x1010
+	SO_PROTOCOL                    = 0x1016
+	SO_PROTOTYPE                   = 0x1016
+	SO_RCVBUF                      = 0x1002
+	SO_RCVLOWAT                    = 0x1004
+	SO_RCVTIMEO                    = 0x1006
+	SO_REUSEADDR                   = 0x4
+	SO_REUSEPORT                   = 0x200
+	SO_SETFIB                      = 0x1014
+	SO_SNDBUF                      = 0x1001
+	SO_SNDLOWAT                    = 0x1003
+	SO_SNDTIMEO                    = 0x1005
+	SO_TIMESTAMP                   = 0x400
+	SO_TYPE                        = 0x1008
+	SO_USELOOPBACK                 = 0x40
+	SO_USER_COOKIE                 = 0x1015
+	SO_VENDOR                      = 0x80000000
+	TAB0                           = 0x0
+	TAB3                           = 0x4
+	TABDLY                         = 0x4
+	TCIFLUSH                       = 0x1
+	TCIOFF                         = 0x3
+	TCIOFLUSH                      = 0x3
+	TCION                          = 0x4
+	TCOFLUSH                       = 0x2
+	TCOOFF                         = 0x1
+	TCOON                          = 0x2
+	TCP_CA_NAME_MAX                = 0x10
+	TCP_CCALGOOPT                  = 0x41
+	TCP_CONGESTION                 = 0x40
+	TCP_FASTOPEN                   = 0x401
+	TCP_FUNCTION_BLK               = 0x2000
+	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
+	TCP_INFO                       = 0x20
+	TCP_KEEPCNT                    = 0x400
+	TCP_KEEPIDLE                   = 0x100
+	TCP_KEEPINIT                   = 0x80
+	TCP_KEEPINTVL                  = 0x200
+	TCP_MAXBURST                   = 0x4
+	TCP_MAXHLEN                    = 0x3c
+	TCP_MAXOLEN                    = 0x28
+	TCP_MAXSEG                     = 0x2
+	TCP_MAXWIN                     = 0xffff
+	TCP_MAX_SACK                   = 0x4
+	TCP_MAX_WINSHIFT               = 0xe
+	TCP_MD5SIG                     = 0x10
+	TCP_MINMSS                     = 0xd8
+	TCP_MSS                        = 0x218
+	TCP_NODELAY                    = 0x1
+	TCP_NOOPT                      = 0x8
+	TCP_NOPUSH                     = 0x4
+	TCP_PCAP_IN                    = 0x1000
+	TCP_PCAP_OUT                   = 0x800
+	TCP_VENDOR                     = 0x80000000
+	TCSAFLUSH                      = 0x2
+	TIOCCBRK                       = 0x2000747a
+	TIOCCDTR                       = 0x20007478
+	TIOCCONS                       = 0x80047462
+	TIOCDRAIN                      = 0x2000745e
+	TIOCEXCL                       = 0x2000740d
+	TIOCEXT                        = 0x80047460
+	TIOCFLUSH                      = 0x80047410
+	TIOCGDRAINWAIT                 = 0x40047456
+	TIOCGETA                       = 0x402c7413
+	TIOCGETD                       = 0x4004741a
+	TIOCGPGRP                      = 0x40047477
+	TIOCGPTN                       = 0x4004740f
+	TIOCGSID                       = 0x40047463
+	TIOCGWINSZ                     = 0x40087468
+	TIOCMBIC                       = 0x8004746b
+	TIOCMBIS                       = 0x8004746c
+	TIOCMGDTRWAIT                  = 0x4004745a
+	TIOCMGET                       = 0x4004746a
+	TIOCMSDTRWAIT                  = 0x8004745b
+	TIOCMSET                       = 0x8004746d
+	TIOCM_CAR                      = 0x40
+	TIOCM_CD                       = 0x40
+	TIOCM_CTS                      = 0x20
+	TIOCM_DCD                      = 0x40
+	TIOCM_DSR                      = 0x100
+	TIOCM_DTR                      = 0x2
+	TIOCM_LE                       = 0x1
+	TIOCM_RI                       = 0x80
+	TIOCM_RNG                      = 0x80
+	TIOCM_RTS                      = 0x4
+	TIOCM_SR                       = 0x10
+	TIOCM_ST                       = 0x8
+	TIOCNOTTY                      = 0x20007471
+	TIOCNXCL                       = 0x2000740e
+	TIOCOUTQ                       = 0x40047473
+	TIOCPKT                        = 0x80047470
+	TIOCPKT_DATA                   = 0x0
+	TIOCPKT_DOSTOP                 = 0x20
+	TIOCPKT_FLUSHREAD              = 0x1
+	TIOCPKT_FLUSHWRITE             = 0x2
+	TIOCPKT_IOCTL                  = 0x40
+	TIOCPKT_NOSTOP                 = 0x10
+	TIOCPKT_START                  = 0x8
+	TIOCPKT_STOP                   = 0x4
+	TIOCPTMASTER                   = 0x2000741c
+	TIOCSBRK                       = 0x2000747b
+	TIOCSCTTY                      = 0x20007461
+	TIOCSDRAINWAIT                 = 0x80047457
+	TIOCSDTR                       = 0x20007479
+	TIOCSETA                       = 0x802c7414
+	TIOCSETAF                      = 0x802c7416
+	TIOCSETAW                      = 0x802c7415
+	TIOCSETD                       = 0x8004741b
+	TIOCSIG                        = 0x2004745f
+	TIOCSPGRP                      = 0x80047476
+	TIOCSTART                      = 0x2000746e
+	TIOCSTAT                       = 0x20007465
+	TIOCSTI                        = 0x80017472
+	TIOCSTOP                       = 0x2000746f
+	TIOCSWINSZ                     = 0x80087467
+	TIOCTIMESTAMP                  = 0x40087459
+	TIOCUCNTL                      = 0x80047466
+	TOSTOP                         = 0x400000
+	VDISCARD                       = 0xf
+	VDSUSP                         = 0xb
+	VEOF                           = 0x0
+	VEOL                           = 0x1
+	VEOL2                          = 0x2
+	VERASE                         = 0x3
+	VERASE2                        = 0x7
+	VINTR                          = 0x8
+	VKILL                          = 0x5
+	VLNEXT                         = 0xe
+	VMIN                           = 0x10
+	VQUIT                          = 0x9
+	VREPRINT                       = 0x6
+	VSTART                         = 0xc
+	VSTATUS                        = 0x12
+	VSTOP                          = 0xd
+	VSUSP                          = 0xa
+	VTIME                          = 0x11
+	VWERASE                        = 0x4
+	WCONTINUED                     = 0x4
+	WCOREFLAG                      = 0x80
+	WEXITED                        = 0x10
+	WLINUXCLONE                    = 0x80000000
+	WNOHANG                        = 0x1
+	WNOWAIT                        = 0x8
+	WSTOPPED                       = 0x2
+	WTRAPPED                       = 0x20
+	WUNTRACED                      = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x59)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x55)
+	ECAPMODE        = syscall.Errno(0x5e)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOOFUS         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x56)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5a)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x57)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCAPABLE     = syscall.Errno(0x5d)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x5f)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x60)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5c)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGLIBRT  = syscall.Signal(0x21)
+	SIGLWP    = syscall.Signal(0x20)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "ECANCELED", "operation canceled"},
+	{86, "EILSEQ", "illegal byte sequence"},
+	{87, "ENOATTR", "attribute not found"},
+	{88, "EDOOFUS", "programming error"},
+	{89, "EBADMSG", "bad message"},
+	{90, "EMULTIHOP", "multihop attempted"},
+	{91, "ENOLINK", "link has been severed"},
+	{92, "EPROTO", "protocol error"},
+	{93, "ENOTCAPABLE", "capabilities insufficient"},
+	{94, "ECAPMODE", "not permitted in capability mode"},
+	{95, "ENOTRECOVERABLE", "state not recoverable"},
+	{96, "EOWNERDEAD", "previous owner died"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "unknown signal"},
+	{33, "SIGLIBRT", "unknown signal"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
new file mode 100644
index 00000000..c600d012
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
@@ -0,0 +1,1765 @@
+// mkerrors.sh -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,freebsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                   = 0x10
+	AF_ARP                         = 0x23
+	AF_ATM                         = 0x1e
+	AF_BLUETOOTH                   = 0x24
+	AF_CCITT                       = 0xa
+	AF_CHAOS                       = 0x5
+	AF_CNT                         = 0x15
+	AF_COIP                        = 0x14
+	AF_DATAKIT                     = 0x9
+	AF_DECnet                      = 0xc
+	AF_DLI                         = 0xd
+	AF_E164                        = 0x1a
+	AF_ECMA                        = 0x8
+	AF_HYLINK                      = 0xf
+	AF_IEEE80211                   = 0x25
+	AF_IMPLINK                     = 0x3
+	AF_INET                        = 0x2
+	AF_INET6                       = 0x1c
+	AF_INET6_SDP                   = 0x2a
+	AF_INET_SDP                    = 0x28
+	AF_IPX                         = 0x17
+	AF_ISDN                        = 0x1a
+	AF_ISO                         = 0x7
+	AF_LAT                         = 0xe
+	AF_LINK                        = 0x12
+	AF_LOCAL                       = 0x1
+	AF_MAX                         = 0x2a
+	AF_NATM                        = 0x1d
+	AF_NETBIOS                     = 0x6
+	AF_NETGRAPH                    = 0x20
+	AF_OSI                         = 0x7
+	AF_PUP                         = 0x4
+	AF_ROUTE                       = 0x11
+	AF_SCLUSTER                    = 0x22
+	AF_SIP                         = 0x18
+	AF_SLOW                        = 0x21
+	AF_SNA                         = 0xb
+	AF_UNIX                        = 0x1
+	AF_UNSPEC                      = 0x0
+	AF_VENDOR00                    = 0x27
+	AF_VENDOR01                    = 0x29
+	AF_VENDOR02                    = 0x2b
+	AF_VENDOR03                    = 0x2d
+	AF_VENDOR04                    = 0x2f
+	AF_VENDOR05                    = 0x31
+	AF_VENDOR06                    = 0x33
+	AF_VENDOR07                    = 0x35
+	AF_VENDOR08                    = 0x37
+	AF_VENDOR09                    = 0x39
+	AF_VENDOR10                    = 0x3b
+	AF_VENDOR11                    = 0x3d
+	AF_VENDOR12                    = 0x3f
+	AF_VENDOR13                    = 0x41
+	AF_VENDOR14                    = 0x43
+	AF_VENDOR15                    = 0x45
+	AF_VENDOR16                    = 0x47
+	AF_VENDOR17                    = 0x49
+	AF_VENDOR18                    = 0x4b
+	AF_VENDOR19                    = 0x4d
+	AF_VENDOR20                    = 0x4f
+	AF_VENDOR21                    = 0x51
+	AF_VENDOR22                    = 0x53
+	AF_VENDOR23                    = 0x55
+	AF_VENDOR24                    = 0x57
+	AF_VENDOR25                    = 0x59
+	AF_VENDOR26                    = 0x5b
+	AF_VENDOR27                    = 0x5d
+	AF_VENDOR28                    = 0x5f
+	AF_VENDOR29                    = 0x61
+	AF_VENDOR30                    = 0x63
+	AF_VENDOR31                    = 0x65
+	AF_VENDOR32                    = 0x67
+	AF_VENDOR33                    = 0x69
+	AF_VENDOR34                    = 0x6b
+	AF_VENDOR35                    = 0x6d
+	AF_VENDOR36                    = 0x6f
+	AF_VENDOR37                    = 0x71
+	AF_VENDOR38                    = 0x73
+	AF_VENDOR39                    = 0x75
+	AF_VENDOR40                    = 0x77
+	AF_VENDOR41                    = 0x79
+	AF_VENDOR42                    = 0x7b
+	AF_VENDOR43                    = 0x7d
+	AF_VENDOR44                    = 0x7f
+	AF_VENDOR45                    = 0x81
+	AF_VENDOR46                    = 0x83
+	AF_VENDOR47                    = 0x85
+	ALTWERASE                      = 0x200
+	B0                             = 0x0
+	B110                           = 0x6e
+	B115200                        = 0x1c200
+	B1200                          = 0x4b0
+	B134                           = 0x86
+	B14400                         = 0x3840
+	B150                           = 0x96
+	B1800                          = 0x708
+	B19200                         = 0x4b00
+	B200                           = 0xc8
+	B230400                        = 0x38400
+	B2400                          = 0x960
+	B28800                         = 0x7080
+	B300                           = 0x12c
+	B38400                         = 0x9600
+	B460800                        = 0x70800
+	B4800                          = 0x12c0
+	B50                            = 0x32
+	B57600                         = 0xe100
+	B600                           = 0x258
+	B7200                          = 0x1c20
+	B75                            = 0x4b
+	B76800                         = 0x12c00
+	B921600                        = 0xe1000
+	B9600                          = 0x2580
+	BIOCFEEDBACK                   = 0x8004427c
+	BIOCFLUSH                      = 0x20004268
+	BIOCGBLEN                      = 0x40044266
+	BIOCGDIRECTION                 = 0x40044276
+	BIOCGDLT                       = 0x4004426a
+	BIOCGDLTLIST                   = 0xc0104279
+	BIOCGETBUFMODE                 = 0x4004427d
+	BIOCGETIF                      = 0x4020426b
+	BIOCGETZMAX                    = 0x4008427f
+	BIOCGHDRCMPLT                  = 0x40044274
+	BIOCGRSIG                      = 0x40044272
+	BIOCGRTIMEOUT                  = 0x4010426e
+	BIOCGSEESENT                   = 0x40044276
+	BIOCGSTATS                     = 0x4008426f
+	BIOCGTSTAMP                    = 0x40044283
+	BIOCIMMEDIATE                  = 0x80044270
+	BIOCLOCK                       = 0x2000427a
+	BIOCPROMISC                    = 0x20004269
+	BIOCROTZBUF                    = 0x40184280
+	BIOCSBLEN                      = 0xc0044266
+	BIOCSDIRECTION                 = 0x80044277
+	BIOCSDLT                       = 0x80044278
+	BIOCSETBUFMODE                 = 0x8004427e
+	BIOCSETF                       = 0x80104267
+	BIOCSETFNR                     = 0x80104282
+	BIOCSETIF                      = 0x8020426c
+	BIOCSETWF                      = 0x8010427b
+	BIOCSETZBUF                    = 0x80184281
+	BIOCSHDRCMPLT                  = 0x80044275
+	BIOCSRSIG                      = 0x80044273
+	BIOCSRTIMEOUT                  = 0x8010426d
+	BIOCSSEESENT                   = 0x80044277
+	BIOCSTSTAMP                    = 0x80044284
+	BIOCVERSION                    = 0x40044271
+	BPF_A                          = 0x10
+	BPF_ABS                        = 0x20
+	BPF_ADD                        = 0x0
+	BPF_ALIGNMENT                  = 0x8
+	BPF_ALU                        = 0x4
+	BPF_AND                        = 0x50
+	BPF_B                          = 0x10
+	BPF_BUFMODE_BUFFER             = 0x1
+	BPF_BUFMODE_ZBUF               = 0x2
+	BPF_DIV                        = 0x30
+	BPF_H                          = 0x8
+	BPF_IMM                        = 0x0
+	BPF_IND                        = 0x40
+	BPF_JA                         = 0x0
+	BPF_JEQ                        = 0x10
+	BPF_JGE                        = 0x30
+	BPF_JGT                        = 0x20
+	BPF_JMP                        = 0x5
+	BPF_JSET                       = 0x40
+	BPF_K                          = 0x0
+	BPF_LD                         = 0x0
+	BPF_LDX                        = 0x1
+	BPF_LEN                        = 0x80
+	BPF_LSH                        = 0x60
+	BPF_MAJOR_VERSION              = 0x1
+	BPF_MAXBUFSIZE                 = 0x80000
+	BPF_MAXINSNS                   = 0x200
+	BPF_MEM                        = 0x60
+	BPF_MEMWORDS                   = 0x10
+	BPF_MINBUFSIZE                 = 0x20
+	BPF_MINOR_VERSION              = 0x1
+	BPF_MISC                       = 0x7
+	BPF_MOD                        = 0x90
+	BPF_MSH                        = 0xa0
+	BPF_MUL                        = 0x20
+	BPF_NEG                        = 0x80
+	BPF_OR                         = 0x40
+	BPF_RELEASE                    = 0x30bb6
+	BPF_RET                        = 0x6
+	BPF_RSH                        = 0x70
+	BPF_ST                         = 0x2
+	BPF_STX                        = 0x3
+	BPF_SUB                        = 0x10
+	BPF_TAX                        = 0x0
+	BPF_TXA                        = 0x80
+	BPF_T_BINTIME                  = 0x2
+	BPF_T_BINTIME_FAST             = 0x102
+	BPF_T_BINTIME_MONOTONIC        = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST   = 0x302
+	BPF_T_FAST                     = 0x100
+	BPF_T_FLAG_MASK                = 0x300
+	BPF_T_FORMAT_MASK              = 0x3
+	BPF_T_MICROTIME                = 0x0
+	BPF_T_MICROTIME_FAST           = 0x100
+	BPF_T_MICROTIME_MONOTONIC      = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
+	BPF_T_MONOTONIC                = 0x200
+	BPF_T_MONOTONIC_FAST           = 0x300
+	BPF_T_NANOTIME                 = 0x1
+	BPF_T_NANOTIME_FAST            = 0x101
+	BPF_T_NANOTIME_MONOTONIC       = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST  = 0x301
+	BPF_T_NONE                     = 0x3
+	BPF_T_NORMAL                   = 0x0
+	BPF_W                          = 0x0
+	BPF_X                          = 0x8
+	BPF_XOR                        = 0xa0
+	BRKINT                         = 0x2
+	CAP_ACCEPT                     = 0x200000020000000
+	CAP_ACL_CHECK                  = 0x400000000010000
+	CAP_ACL_DELETE                 = 0x400000000020000
+	CAP_ACL_GET                    = 0x400000000040000
+	CAP_ACL_SET                    = 0x400000000080000
+	CAP_ALL0                       = 0x20007ffffffffff
+	CAP_ALL1                       = 0x4000000001fffff
+	CAP_BIND                       = 0x200000040000000
+	CAP_BINDAT                     = 0x200008000000400
+	CAP_CHFLAGSAT                  = 0x200000000001400
+	CAP_CONNECT                    = 0x200000080000000
+	CAP_CONNECTAT                  = 0x200010000000400
+	CAP_CREATE                     = 0x200000000000040
+	CAP_EVENT                      = 0x400000000000020
+	CAP_EXTATTR_DELETE             = 0x400000000001000
+	CAP_EXTATTR_GET                = 0x400000000002000
+	CAP_EXTATTR_LIST               = 0x400000000004000
+	CAP_EXTATTR_SET                = 0x400000000008000
+	CAP_FCHDIR                     = 0x200000000000800
+	CAP_FCHFLAGS                   = 0x200000000001000
+	CAP_FCHMOD                     = 0x200000000002000
+	CAP_FCHMODAT                   = 0x200000000002400
+	CAP_FCHOWN                     = 0x200000000004000
+	CAP_FCHOWNAT                   = 0x200000000004400
+	CAP_FCNTL                      = 0x200000000008000
+	CAP_FCNTL_ALL                  = 0x78
+	CAP_FCNTL_GETFL                = 0x8
+	CAP_FCNTL_GETOWN               = 0x20
+	CAP_FCNTL_SETFL                = 0x10
+	CAP_FCNTL_SETOWN               = 0x40
+	CAP_FEXECVE                    = 0x200000000000080
+	CAP_FLOCK                      = 0x200000000010000
+	CAP_FPATHCONF                  = 0x200000000020000
+	CAP_FSCK                       = 0x200000000040000
+	CAP_FSTAT                      = 0x200000000080000
+	CAP_FSTATAT                    = 0x200000000080400
+	CAP_FSTATFS                    = 0x200000000100000
+	CAP_FSYNC                      = 0x200000000000100
+	CAP_FTRUNCATE                  = 0x200000000000200
+	CAP_FUTIMES                    = 0x200000000200000
+	CAP_FUTIMESAT                  = 0x200000000200400
+	CAP_GETPEERNAME                = 0x200000100000000
+	CAP_GETSOCKNAME                = 0x200000200000000
+	CAP_GETSOCKOPT                 = 0x200000400000000
+	CAP_IOCTL                      = 0x400000000000080
+	CAP_IOCTLS_ALL                 = 0x7fffffffffffffff
+	CAP_KQUEUE                     = 0x400000000100040
+	CAP_KQUEUE_CHANGE              = 0x400000000100000
+	CAP_KQUEUE_EVENT               = 0x400000000000040
+	CAP_LINKAT_SOURCE              = 0x200020000000400
+	CAP_LINKAT_TARGET              = 0x200000000400400
+	CAP_LISTEN                     = 0x200000800000000
+	CAP_LOOKUP                     = 0x200000000000400
+	CAP_MAC_GET                    = 0x400000000000001
+	CAP_MAC_SET                    = 0x400000000000002
+	CAP_MKDIRAT                    = 0x200000000800400
+	CAP_MKFIFOAT                   = 0x200000001000400
+	CAP_MKNODAT                    = 0x200000002000400
+	CAP_MMAP                       = 0x200000000000010
+	CAP_MMAP_R                     = 0x20000000000001d
+	CAP_MMAP_RW                    = 0x20000000000001f
+	CAP_MMAP_RWX                   = 0x20000000000003f
+	CAP_MMAP_RX                    = 0x20000000000003d
+	CAP_MMAP_W                     = 0x20000000000001e
+	CAP_MMAP_WX                    = 0x20000000000003e
+	CAP_MMAP_X                     = 0x20000000000003c
+	CAP_PDGETPID                   = 0x400000000000200
+	CAP_PDKILL                     = 0x400000000000800
+	CAP_PDWAIT                     = 0x400000000000400
+	CAP_PEELOFF                    = 0x200001000000000
+	CAP_POLL_EVENT                 = 0x400000000000020
+	CAP_PREAD                      = 0x20000000000000d
+	CAP_PWRITE                     = 0x20000000000000e
+	CAP_READ                       = 0x200000000000001
+	CAP_RECV                       = 0x200000000000001
+	CAP_RENAMEAT_SOURCE            = 0x200000004000400
+	CAP_RENAMEAT_TARGET            = 0x200040000000400
+	CAP_RIGHTS_VERSION             = 0x0
+	CAP_RIGHTS_VERSION_00          = 0x0
+	CAP_SEEK                       = 0x20000000000000c
+	CAP_SEEK_TELL                  = 0x200000000000004
+	CAP_SEM_GETVALUE               = 0x400000000000004
+	CAP_SEM_POST                   = 0x400000000000008
+	CAP_SEM_WAIT                   = 0x400000000000010
+	CAP_SEND                       = 0x200000000000002
+	CAP_SETSOCKOPT                 = 0x200002000000000
+	CAP_SHUTDOWN                   = 0x200004000000000
+	CAP_SOCK_CLIENT                = 0x200007780000003
+	CAP_SOCK_SERVER                = 0x200007f60000003
+	CAP_SYMLINKAT                  = 0x200000008000400
+	CAP_TTYHOOK                    = 0x400000000000100
+	CAP_UNLINKAT                   = 0x200000010000400
+	CAP_UNUSED0_44                 = 0x200080000000000
+	CAP_UNUSED0_57                 = 0x300000000000000
+	CAP_UNUSED1_22                 = 0x400000000200000
+	CAP_UNUSED1_57                 = 0x500000000000000
+	CAP_WRITE                      = 0x200000000000002
+	CFLUSH                         = 0xf
+	CLOCAL                         = 0x8000
+	CLOCK_MONOTONIC                = 0x4
+	CLOCK_MONOTONIC_FAST           = 0xc
+	CLOCK_MONOTONIC_PRECISE        = 0xb
+	CLOCK_PROCESS_CPUTIME_ID       = 0xf
+	CLOCK_PROF                     = 0x2
+	CLOCK_REALTIME                 = 0x0
+	CLOCK_REALTIME_FAST            = 0xa
+	CLOCK_REALTIME_PRECISE         = 0x9
+	CLOCK_SECOND                   = 0xd
+	CLOCK_THREAD_CPUTIME_ID        = 0xe
+	CLOCK_UPTIME                   = 0x5
+	CLOCK_UPTIME_FAST              = 0x8
+	CLOCK_UPTIME_PRECISE           = 0x7
+	CLOCK_VIRTUAL                  = 0x1
+	CREAD                          = 0x800
+	CRTSCTS                        = 0x30000
+	CS5                            = 0x0
+	CS6                            = 0x100
+	CS7                            = 0x200
+	CS8                            = 0x300
+	CSIZE                          = 0x300
+	CSTART                         = 0x11
+	CSTATUS                        = 0x14
+	CSTOP                          = 0x13
+	CSTOPB                         = 0x400
+	CSUSP                          = 0x1a
+	CTL_HW                         = 0x6
+	CTL_KERN                       = 0x1
+	CTL_MAXNAME                    = 0x18
+	CTL_NET                        = 0x4
+	DLT_A429                       = 0xb8
+	DLT_A653_ICM                   = 0xb9
+	DLT_AIRONET_HEADER             = 0x78
+	DLT_AOS                        = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394     = 0x8a
+	DLT_ARCNET                     = 0x7
+	DLT_ARCNET_LINUX               = 0x81
+	DLT_ATM_CLIP                   = 0x13
+	DLT_ATM_RFC1483                = 0xb
+	DLT_AURORA                     = 0x7e
+	DLT_AX25                       = 0x3
+	DLT_AX25_KISS                  = 0xca
+	DLT_BACNET_MS_TP               = 0xa5
+	DLT_BLUETOOTH_BREDR_BB         = 0xff
+	DLT_BLUETOOTH_HCI_H4           = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
+	DLT_BLUETOOTH_LE_LL            = 0xfb
+	DLT_BLUETOOTH_LE_LL_WITH_PHDR  = 0x100
+	DLT_BLUETOOTH_LINUX_MONITOR    = 0xfe
+	DLT_CAN20B                     = 0xbe
+	DLT_CAN_SOCKETCAN              = 0xe3
+	DLT_CHAOS                      = 0x5
+	DLT_CHDLC                      = 0x68
+	DLT_CISCO_IOS                  = 0x76
+	DLT_C_HDLC                     = 0x68
+	DLT_C_HDLC_WITH_DIR            = 0xcd
+	DLT_DBUS                       = 0xe7
+	DLT_DECT                       = 0xdd
+	DLT_DOCSIS                     = 0x8f
+	DLT_DVB_CI                     = 0xeb
+	DLT_ECONET                     = 0x73
+	DLT_EN10MB                     = 0x1
+	DLT_EN3MB                      = 0x2
+	DLT_ENC                        = 0x6d
+	DLT_EPON                       = 0x103
+	DLT_ERF                        = 0xc5
+	DLT_ERF_ETH                    = 0xaf
+	DLT_ERF_POS                    = 0xb0
+	DLT_FC_2                       = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
+	DLT_FDDI                       = 0xa
+	DLT_FLEXRAY                    = 0xd2
+	DLT_FRELAY                     = 0x6b
+	DLT_FRELAY_WITH_DIR            = 0xce
+	DLT_GCOM_SERIAL                = 0xad
+	DLT_GCOM_T1E1                  = 0xac
+	DLT_GPF_F                      = 0xab
+	DLT_GPF_T                      = 0xaa
+	DLT_GPRS_LLC                   = 0xa9
+	DLT_GSMTAP_ABIS                = 0xda
+	DLT_GSMTAP_UM                  = 0xd9
+	DLT_HHDLC                      = 0x79
+	DLT_IBM_SN                     = 0x92
+	DLT_IBM_SP                     = 0x91
+	DLT_IEEE802                    = 0x6
+	DLT_IEEE802_11                 = 0x69
+	DLT_IEEE802_11_RADIO           = 0x7f
+	DLT_IEEE802_11_RADIO_AVS       = 0xa3
+	DLT_IEEE802_15_4               = 0xc3
+	DLT_IEEE802_15_4_LINUX         = 0xbf
+	DLT_IEEE802_15_4_NOFCS         = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY    = 0xd7
+	DLT_IEEE802_16_MAC_CPS         = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
+	DLT_INFINIBAND                 = 0xf7
+	DLT_IPFILTER                   = 0x74
+	DLT_IPMB                       = 0xc7
+	DLT_IPMB_LINUX                 = 0xd1
+	DLT_IPMI_HPM_2                 = 0x104
+	DLT_IPNET                      = 0xe2
+	DLT_IPOIB                      = 0xf2
+	DLT_IPV4                       = 0xe4
+	DLT_IPV6                       = 0xe5
+	DLT_IP_OVER_FC                 = 0x7a
+	DLT_JUNIPER_ATM1               = 0x89
+	DLT_JUNIPER_ATM2               = 0x87
+	DLT_JUNIPER_ATM_CEMIC          = 0xee
+	DLT_JUNIPER_CHDLC              = 0xb5
+	DLT_JUNIPER_ES                 = 0x84
+	DLT_JUNIPER_ETHER              = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL       = 0xea
+	DLT_JUNIPER_FRELAY             = 0xb4
+	DLT_JUNIPER_GGSN               = 0x85
+	DLT_JUNIPER_ISM                = 0xc2
+	DLT_JUNIPER_MFR                = 0x86
+	DLT_JUNIPER_MLFR               = 0x83
+	DLT_JUNIPER_MLPPP              = 0x82
+	DLT_JUNIPER_MONITOR            = 0xa4
+	DLT_JUNIPER_PIC_PEER           = 0xae
+	DLT_JUNIPER_PPP                = 0xb3
+	DLT_JUNIPER_PPPOE              = 0xa7
+	DLT_JUNIPER_PPPOE_ATM          = 0xa8
+	DLT_JUNIPER_SERVICES           = 0x88
+	DLT_JUNIPER_SRX_E2E            = 0xe9
+	DLT_JUNIPER_ST                 = 0xc8
+	DLT_JUNIPER_VP                 = 0xb7
+	DLT_JUNIPER_VS                 = 0xe8
+	DLT_LAPB_WITH_DIR              = 0xcf
+	DLT_LAPD                       = 0xcb
+	DLT_LIN                        = 0xd4
+	DLT_LINUX_EVDEV                = 0xd8
+	DLT_LINUX_IRDA                 = 0x90
+	DLT_LINUX_LAPD                 = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
+	DLT_LINUX_SLL                  = 0x71
+	DLT_LOOP                       = 0x6c
+	DLT_LTALK                      = 0x72
+	DLT_MATCHING_MAX               = 0x104
+	DLT_MATCHING_MIN               = 0x68
+	DLT_MFR                        = 0xb6
+	DLT_MOST                       = 0xd3
+	DLT_MPEG_2_TS                  = 0xf3
+	DLT_MPLS                       = 0xdb
+	DLT_MTP2                       = 0x8c
+	DLT_MTP2_WITH_PHDR             = 0x8b
+	DLT_MTP3                       = 0x8d
+	DLT_MUX27010                   = 0xec
+	DLT_NETANALYZER                = 0xf0
+	DLT_NETANALYZER_TRANSPARENT    = 0xf1
+	DLT_NETLINK                    = 0xfd
+	DLT_NFC_LLCP                   = 0xf5
+	DLT_NFLOG                      = 0xef
+	DLT_NG40                       = 0xf4
+	DLT_NULL                       = 0x0
+	DLT_PCI_EXP                    = 0x7d
+	DLT_PFLOG                      = 0x75
+	DLT_PFSYNC                     = 0x79
+	DLT_PKTAP                      = 0x102
+	DLT_PPI                        = 0xc0
+	DLT_PPP                        = 0x9
+	DLT_PPP_BSDOS                  = 0x10
+	DLT_PPP_ETHER                  = 0x33
+	DLT_PPP_PPPD                   = 0xa6
+	DLT_PPP_SERIAL                 = 0x32
+	DLT_PPP_WITH_DIR               = 0xcc
+	DLT_PPP_WITH_DIRECTION         = 0xa6
+	DLT_PRISM_HEADER               = 0x77
+	DLT_PROFIBUS_DL                = 0x101
+	DLT_PRONET                     = 0x4
+	DLT_RAIF1                      = 0xc6
+	DLT_RAW                        = 0xc
+	DLT_RIO                        = 0x7c
+	DLT_RTAC_SERIAL                = 0xfa
+	DLT_SCCP                       = 0x8e
+	DLT_SCTP                       = 0xf8
+	DLT_SITA                       = 0xc4
+	DLT_SLIP                       = 0x8
+	DLT_SLIP_BSDOS                 = 0xf
+	DLT_STANAG_5066_D_PDU          = 0xed
+	DLT_SUNATM                     = 0x7b
+	DLT_SYMANTEC_FIREWALL          = 0x63
+	DLT_TZSP                       = 0x80
+	DLT_USB                        = 0xba
+	DLT_USBPCAP                    = 0xf9
+	DLT_USB_LINUX                  = 0xbd
+	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USER0                      = 0x93
+	DLT_USER1                      = 0x94
+	DLT_USER10                     = 0x9d
+	DLT_USER11                     = 0x9e
+	DLT_USER12                     = 0x9f
+	DLT_USER13                     = 0xa0
+	DLT_USER14                     = 0xa1
+	DLT_USER15                     = 0xa2
+	DLT_USER2                      = 0x95
+	DLT_USER3                      = 0x96
+	DLT_USER4                      = 0x97
+	DLT_USER5                      = 0x98
+	DLT_USER6                      = 0x99
+	DLT_USER7                      = 0x9a
+	DLT_USER8                      = 0x9b
+	DLT_USER9                      = 0x9c
+	DLT_WIHART                     = 0xdf
+	DLT_WIRESHARK_UPPER_PDU        = 0xfc
+	DLT_X2E_SERIAL                 = 0xd5
+	DLT_X2E_XORAYA                 = 0xd6
+	DT_BLK                         = 0x6
+	DT_CHR                         = 0x2
+	DT_DIR                         = 0x4
+	DT_FIFO                        = 0x1
+	DT_LNK                         = 0xa
+	DT_REG                         = 0x8
+	DT_SOCK                        = 0xc
+	DT_UNKNOWN                     = 0x0
+	DT_WHT                         = 0xe
+	ECHO                           = 0x8
+	ECHOCTL                        = 0x40
+	ECHOE                          = 0x2
+	ECHOK                          = 0x4
+	ECHOKE                         = 0x1
+	ECHONL                         = 0x10
+	ECHOPRT                        = 0x20
+	EVFILT_AIO                     = -0x3
+	EVFILT_FS                      = -0x9
+	EVFILT_LIO                     = -0xa
+	EVFILT_PROC                    = -0x5
+	EVFILT_PROCDESC                = -0x8
+	EVFILT_READ                    = -0x1
+	EVFILT_SENDFILE                = -0xc
+	EVFILT_SIGNAL                  = -0x6
+	EVFILT_SYSCOUNT                = 0xc
+	EVFILT_TIMER                   = -0x7
+	EVFILT_USER                    = -0xb
+	EVFILT_VNODE                   = -0x4
+	EVFILT_WRITE                   = -0x2
+	EV_ADD                         = 0x1
+	EV_CLEAR                       = 0x20
+	EV_DELETE                      = 0x2
+	EV_DISABLE                     = 0x8
+	EV_DISPATCH                    = 0x80
+	EV_DROP                        = 0x1000
+	EV_ENABLE                      = 0x4
+	EV_EOF                         = 0x8000
+	EV_ERROR                       = 0x4000
+	EV_FLAG1                       = 0x2000
+	EV_FLAG2                       = 0x4000
+	EV_FORCEONESHOT                = 0x100
+	EV_ONESHOT                     = 0x10
+	EV_RECEIPT                     = 0x40
+	EV_SYSFLAGS                    = 0xf000
+	EXTA                           = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY        = 0x0
+	EXTATTR_NAMESPACE_SYSTEM       = 0x2
+	EXTATTR_NAMESPACE_USER         = 0x1
+	EXTB                           = 0x9600
+	EXTPROC                        = 0x800
+	FD_CLOEXEC                     = 0x1
+	FD_SETSIZE                     = 0x400
+	FLUSHO                         = 0x800000
+	F_CANCEL                       = 0x5
+	F_DUP2FD                       = 0xa
+	F_DUP2FD_CLOEXEC               = 0x12
+	F_DUPFD                        = 0x0
+	F_DUPFD_CLOEXEC                = 0x11
+	F_GETFD                        = 0x1
+	F_GETFL                        = 0x3
+	F_GETLK                        = 0xb
+	F_GETOWN                       = 0x5
+	F_OGETLK                       = 0x7
+	F_OK                           = 0x0
+	F_OSETLK                       = 0x8
+	F_OSETLKW                      = 0x9
+	F_RDAHEAD                      = 0x10
+	F_RDLCK                        = 0x1
+	F_READAHEAD                    = 0xf
+	F_SETFD                        = 0x2
+	F_SETFL                        = 0x4
+	F_SETLK                        = 0xc
+	F_SETLKW                       = 0xd
+	F_SETLK_REMOTE                 = 0xe
+	F_SETOWN                       = 0x6
+	F_UNLCK                        = 0x2
+	F_UNLCKSYS                     = 0x4
+	F_WRLCK                        = 0x3
+	HUPCL                          = 0x4000
+	HW_MACHINE                     = 0x1
+	ICANON                         = 0x100
+	ICMP6_FILTER                   = 0x12
+	ICRNL                          = 0x100
+	IEXTEN                         = 0x400
+	IFAN_ARRIVAL                   = 0x0
+	IFAN_DEPARTURE                 = 0x1
+	IFF_ALLMULTI                   = 0x200
+	IFF_ALTPHYS                    = 0x4000
+	IFF_BROADCAST                  = 0x2
+	IFF_CANTCHANGE                 = 0x218f52
+	IFF_CANTCONFIG                 = 0x10000
+	IFF_DEBUG                      = 0x4
+	IFF_DRV_OACTIVE                = 0x400
+	IFF_DRV_RUNNING                = 0x40
+	IFF_DYING                      = 0x200000
+	IFF_LINK0                      = 0x1000
+	IFF_LINK1                      = 0x2000
+	IFF_LINK2                      = 0x4000
+	IFF_LOOPBACK                   = 0x8
+	IFF_MONITOR                    = 0x40000
+	IFF_MULTICAST                  = 0x8000
+	IFF_NOARP                      = 0x80
+	IFF_OACTIVE                    = 0x400
+	IFF_POINTOPOINT                = 0x10
+	IFF_PPROMISC                   = 0x20000
+	IFF_PROMISC                    = 0x100
+	IFF_RENAMING                   = 0x400000
+	IFF_RUNNING                    = 0x40
+	IFF_SIMPLEX                    = 0x800
+	IFF_STATICARP                  = 0x80000
+	IFF_UP                         = 0x1
+	IFNAMSIZ                       = 0x10
+	IFT_BRIDGE                     = 0xd1
+	IFT_CARP                       = 0xf8
+	IFT_IEEE1394                   = 0x90
+	IFT_INFINIBAND                 = 0xc7
+	IFT_L2VLAN                     = 0x87
+	IFT_L3IPVLAN                   = 0x88
+	IFT_PPP                        = 0x17
+	IFT_PROPVIRTUAL                = 0x35
+	IGNBRK                         = 0x1
+	IGNCR                          = 0x80
+	IGNPAR                         = 0x4
+	IMAXBEL                        = 0x2000
+	INLCR                          = 0x40
+	INPCK                          = 0x10
+	IN_CLASSA_HOST                 = 0xffffff
+	IN_CLASSA_MAX                  = 0x80
+	IN_CLASSA_NET                  = 0xff000000
+	IN_CLASSA_NSHIFT               = 0x18
+	IN_CLASSB_HOST                 = 0xffff
+	IN_CLASSB_MAX                  = 0x10000
+	IN_CLASSB_NET                  = 0xffff0000
+	IN_CLASSB_NSHIFT               = 0x10
+	IN_CLASSC_HOST                 = 0xff
+	IN_CLASSC_NET                  = 0xffffff00
+	IN_CLASSC_NSHIFT               = 0x8
+	IN_CLASSD_HOST                 = 0xfffffff
+	IN_CLASSD_NET                  = 0xf0000000
+	IN_CLASSD_NSHIFT               = 0x1c
+	IN_LOOPBACKNET                 = 0x7f
+	IN_RFC3021_MASK                = 0xfffffffe
+	IPPROTO_3PC                    = 0x22
+	IPPROTO_ADFS                   = 0x44
+	IPPROTO_AH                     = 0x33
+	IPPROTO_AHIP                   = 0x3d
+	IPPROTO_APES                   = 0x63
+	IPPROTO_ARGUS                  = 0xd
+	IPPROTO_AX25                   = 0x5d
+	IPPROTO_BHA                    = 0x31
+	IPPROTO_BLT                    = 0x1e
+	IPPROTO_BRSATMON               = 0x4c
+	IPPROTO_CARP                   = 0x70
+	IPPROTO_CFTP                   = 0x3e
+	IPPROTO_CHAOS                  = 0x10
+	IPPROTO_CMTP                   = 0x26
+	IPPROTO_CPHB                   = 0x49
+	IPPROTO_CPNX                   = 0x48
+	IPPROTO_DDP                    = 0x25
+	IPPROTO_DGP                    = 0x56
+	IPPROTO_DIVERT                 = 0x102
+	IPPROTO_DONE                   = 0x101
+	IPPROTO_DSTOPTS                = 0x3c
+	IPPROTO_EGP                    = 0x8
+	IPPROTO_EMCON                  = 0xe
+	IPPROTO_ENCAP                  = 0x62
+	IPPROTO_EON                    = 0x50
+	IPPROTO_ESP                    = 0x32
+	IPPROTO_ETHERIP                = 0x61
+	IPPROTO_FRAGMENT               = 0x2c
+	IPPROTO_GGP                    = 0x3
+	IPPROTO_GMTP                   = 0x64
+	IPPROTO_GRE                    = 0x2f
+	IPPROTO_HELLO                  = 0x3f
+	IPPROTO_HIP                    = 0x8b
+	IPPROTO_HMP                    = 0x14
+	IPPROTO_HOPOPTS                = 0x0
+	IPPROTO_ICMP                   = 0x1
+	IPPROTO_ICMPV6                 = 0x3a
+	IPPROTO_IDP                    = 0x16
+	IPPROTO_IDPR                   = 0x23
+	IPPROTO_IDRP                   = 0x2d
+	IPPROTO_IGMP                   = 0x2
+	IPPROTO_IGP                    = 0x55
+	IPPROTO_IGRP                   = 0x58
+	IPPROTO_IL                     = 0x28
+	IPPROTO_INLSP                  = 0x34
+	IPPROTO_INP                    = 0x20
+	IPPROTO_IP                     = 0x0
+	IPPROTO_IPCOMP                 = 0x6c
+	IPPROTO_IPCV                   = 0x47
+	IPPROTO_IPEIP                  = 0x5e
+	IPPROTO_IPIP                   = 0x4
+	IPPROTO_IPPC                   = 0x43
+	IPPROTO_IPV4                   = 0x4
+	IPPROTO_IPV6                   = 0x29
+	IPPROTO_IRTP                   = 0x1c
+	IPPROTO_KRYPTOLAN              = 0x41
+	IPPROTO_LARP                   = 0x5b
+	IPPROTO_LEAF1                  = 0x19
+	IPPROTO_LEAF2                  = 0x1a
+	IPPROTO_MAX                    = 0x100
+	IPPROTO_MEAS                   = 0x13
+	IPPROTO_MH                     = 0x87
+	IPPROTO_MHRP                   = 0x30
+	IPPROTO_MICP                   = 0x5f
+	IPPROTO_MOBILE                 = 0x37
+	IPPROTO_MPLS                   = 0x89
+	IPPROTO_MTP                    = 0x5c
+	IPPROTO_MUX                    = 0x12
+	IPPROTO_ND                     = 0x4d
+	IPPROTO_NHRP                   = 0x36
+	IPPROTO_NONE                   = 0x3b
+	IPPROTO_NSP                    = 0x1f
+	IPPROTO_NVPII                  = 0xb
+	IPPROTO_OLD_DIVERT             = 0xfe
+	IPPROTO_OSPFIGP                = 0x59
+	IPPROTO_PFSYNC                 = 0xf0
+	IPPROTO_PGM                    = 0x71
+	IPPROTO_PIGP                   = 0x9
+	IPPROTO_PIM                    = 0x67
+	IPPROTO_PRM                    = 0x15
+	IPPROTO_PUP                    = 0xc
+	IPPROTO_PVP                    = 0x4b
+	IPPROTO_RAW                    = 0xff
+	IPPROTO_RCCMON                 = 0xa
+	IPPROTO_RDP                    = 0x1b
+	IPPROTO_RESERVED_253           = 0xfd
+	IPPROTO_RESERVED_254           = 0xfe
+	IPPROTO_ROUTING                = 0x2b
+	IPPROTO_RSVP                   = 0x2e
+	IPPROTO_RVD                    = 0x42
+	IPPROTO_SATEXPAK               = 0x40
+	IPPROTO_SATMON                 = 0x45
+	IPPROTO_SCCSP                  = 0x60
+	IPPROTO_SCTP                   = 0x84
+	IPPROTO_SDRP                   = 0x2a
+	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
+	IPPROTO_SHIM6                  = 0x8c
+	IPPROTO_SKIP                   = 0x39
+	IPPROTO_SPACER                 = 0x7fff
+	IPPROTO_SRPC                   = 0x5a
+	IPPROTO_ST                     = 0x7
+	IPPROTO_SVMTP                  = 0x52
+	IPPROTO_SWIPE                  = 0x35
+	IPPROTO_TCF                    = 0x57
+	IPPROTO_TCP                    = 0x6
+	IPPROTO_TLSP                   = 0x38
+	IPPROTO_TP                     = 0x1d
+	IPPROTO_TPXX                   = 0x27
+	IPPROTO_TRUNK1                 = 0x17
+	IPPROTO_TRUNK2                 = 0x18
+	IPPROTO_TTP                    = 0x54
+	IPPROTO_UDP                    = 0x11
+	IPPROTO_UDPLITE                = 0x88
+	IPPROTO_VINES                  = 0x53
+	IPPROTO_VISA                   = 0x46
+	IPPROTO_VMTP                   = 0x51
+	IPPROTO_WBEXPAK                = 0x4f
+	IPPROTO_WBMON                  = 0x4e
+	IPPROTO_WSN                    = 0x4a
+	IPPROTO_XNET                   = 0xf
+	IPPROTO_XTP                    = 0x24
+	IPV6_AUTOFLOWLABEL             = 0x3b
+	IPV6_BINDANY                   = 0x40
+	IPV6_BINDMULTI                 = 0x41
+	IPV6_BINDV6ONLY                = 0x1b
+	IPV6_CHECKSUM                  = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS    = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP    = 0x1
+	IPV6_DEFHLIM                   = 0x40
+	IPV6_DONTFRAG                  = 0x3e
+	IPV6_DSTOPTS                   = 0x32
+	IPV6_FLOWID                    = 0x43
+	IPV6_FLOWINFO_MASK             = 0xffffff0f
+	IPV6_FLOWLABEL_MASK            = 0xffff0f00
+	IPV6_FLOWTYPE                  = 0x44
+	IPV6_FRAGTTL                   = 0x78
+	IPV6_FW_ADD                    = 0x1e
+	IPV6_FW_DEL                    = 0x1f
+	IPV6_FW_FLUSH                  = 0x20
+	IPV6_FW_GET                    = 0x22
+	IPV6_FW_ZERO                   = 0x21
+	IPV6_HLIMDEC                   = 0x1
+	IPV6_HOPLIMIT                  = 0x2f
+	IPV6_HOPOPTS                   = 0x31
+	IPV6_IPSEC_POLICY              = 0x1c
+	IPV6_JOIN_GROUP                = 0xc
+	IPV6_LEAVE_GROUP               = 0xd
+	IPV6_MAXHLIM                   = 0xff
+	IPV6_MAXOPTHDR                 = 0x800
+	IPV6_MAXPACKET                 = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
+	IPV6_MAX_MEMBERSHIPS           = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
+	IPV6_MIN_MEMBERSHIPS           = 0x1f
+	IPV6_MMTU                      = 0x500
+	IPV6_MSFILTER                  = 0x4a
+	IPV6_MULTICAST_HOPS            = 0xa
+	IPV6_MULTICAST_IF              = 0x9
+	IPV6_MULTICAST_LOOP            = 0xb
+	IPV6_NEXTHOP                   = 0x30
+	IPV6_PATHMTU                   = 0x2c
+	IPV6_PKTINFO                   = 0x2e
+	IPV6_PORTRANGE                 = 0xe
+	IPV6_PORTRANGE_DEFAULT         = 0x0
+	IPV6_PORTRANGE_HIGH            = 0x1
+	IPV6_PORTRANGE_LOW             = 0x2
+	IPV6_PREFER_TEMPADDR           = 0x3f
+	IPV6_RECVDSTOPTS               = 0x28
+	IPV6_RECVFLOWID                = 0x46
+	IPV6_RECVHOPLIMIT              = 0x25
+	IPV6_RECVHOPOPTS               = 0x27
+	IPV6_RECVPATHMTU               = 0x2b
+	IPV6_RECVPKTINFO               = 0x24
+	IPV6_RECVRSSBUCKETID           = 0x47
+	IPV6_RECVRTHDR                 = 0x26
+	IPV6_RECVTCLASS                = 0x39
+	IPV6_RSSBUCKETID               = 0x45
+	IPV6_RSS_LISTEN_BUCKET         = 0x42
+	IPV6_RTHDR                     = 0x33
+	IPV6_RTHDRDSTOPTS              = 0x23
+	IPV6_RTHDR_LOOSE               = 0x0
+	IPV6_RTHDR_STRICT              = 0x1
+	IPV6_RTHDR_TYPE_0              = 0x0
+	IPV6_SOCKOPT_RESERVED1         = 0x3
+	IPV6_TCLASS                    = 0x3d
+	IPV6_UNICAST_HOPS              = 0x4
+	IPV6_USE_MIN_MTU               = 0x2a
+	IPV6_V6ONLY                    = 0x1b
+	IPV6_VERSION                   = 0x60
+	IPV6_VERSION_MASK              = 0xf0
+	IP_ADD_MEMBERSHIP              = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
+	IP_BINDANY                     = 0x18
+	IP_BINDMULTI                   = 0x19
+	IP_BLOCK_SOURCE                = 0x48
+	IP_DEFAULT_MULTICAST_LOOP      = 0x1
+	IP_DEFAULT_MULTICAST_TTL       = 0x1
+	IP_DF                          = 0x4000
+	IP_DONTFRAG                    = 0x43
+	IP_DROP_MEMBERSHIP             = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP      = 0x47
+	IP_DUMMYNET3                   = 0x31
+	IP_DUMMYNET_CONFIGURE          = 0x3c
+	IP_DUMMYNET_DEL                = 0x3d
+	IP_DUMMYNET_FLUSH              = 0x3e
+	IP_DUMMYNET_GET                = 0x40
+	IP_FLOWID                      = 0x5a
+	IP_FLOWTYPE                    = 0x5b
+	IP_FW3                         = 0x30
+	IP_FW_ADD                      = 0x32
+	IP_FW_DEL                      = 0x33
+	IP_FW_FLUSH                    = 0x34
+	IP_FW_GET                      = 0x36
+	IP_FW_NAT_CFG                  = 0x38
+	IP_FW_NAT_DEL                  = 0x39
+	IP_FW_NAT_GET_CONFIG           = 0x3a
+	IP_FW_NAT_GET_LOG              = 0x3b
+	IP_FW_RESETLOG                 = 0x37
+	IP_FW_TABLE_ADD                = 0x28
+	IP_FW_TABLE_DEL                = 0x29
+	IP_FW_TABLE_FLUSH              = 0x2a
+	IP_FW_TABLE_GETSIZE            = 0x2b
+	IP_FW_TABLE_LIST               = 0x2c
+	IP_FW_ZERO                     = 0x35
+	IP_HDRINCL                     = 0x2
+	IP_IPSEC_POLICY                = 0x15
+	IP_MAXPACKET                   = 0xffff
+	IP_MAX_GROUP_SRC_FILTER        = 0x200
+	IP_MAX_MEMBERSHIPS             = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER        = 0x80
+	IP_MAX_SOCK_SRC_FILTER         = 0x80
+	IP_MAX_SOURCE_FILTER           = 0x400
+	IP_MF                          = 0x2000
+	IP_MINTTL                      = 0x42
+	IP_MIN_MEMBERSHIPS             = 0x1f
+	IP_MSFILTER                    = 0x4a
+	IP_MSS                         = 0x240
+	IP_MULTICAST_IF                = 0x9
+	IP_MULTICAST_LOOP              = 0xb
+	IP_MULTICAST_TTL               = 0xa
+	IP_MULTICAST_VIF               = 0xe
+	IP_OFFMASK                     = 0x1fff
+	IP_ONESBCAST                   = 0x17
+	IP_OPTIONS                     = 0x1
+	IP_PORTRANGE                   = 0x13
+	IP_PORTRANGE_DEFAULT           = 0x0
+	IP_PORTRANGE_HIGH              = 0x1
+	IP_PORTRANGE_LOW               = 0x2
+	IP_RECVDSTADDR                 = 0x7
+	IP_RECVFLOWID                  = 0x5d
+	IP_RECVIF                      = 0x14
+	IP_RECVOPTS                    = 0x5
+	IP_RECVRETOPTS                 = 0x6
+	IP_RECVRSSBUCKETID             = 0x5e
+	IP_RECVTOS                     = 0x44
+	IP_RECVTTL                     = 0x41
+	IP_RETOPTS                     = 0x8
+	IP_RF                          = 0x8000
+	IP_RSSBUCKETID                 = 0x5c
+	IP_RSS_LISTEN_BUCKET           = 0x1a
+	IP_RSVP_OFF                    = 0x10
+	IP_RSVP_ON                     = 0xf
+	IP_RSVP_VIF_OFF                = 0x12
+	IP_RSVP_VIF_ON                 = 0x11
+	IP_SENDSRCADDR                 = 0x7
+	IP_TOS                         = 0x3
+	IP_TTL                         = 0x4
+	IP_UNBLOCK_SOURCE              = 0x49
+	ISIG                           = 0x80
+	ISTRIP                         = 0x20
+	IXANY                          = 0x800
+	IXOFF                          = 0x400
+	IXON                           = 0x200
+	KERN_HOSTNAME                  = 0xa
+	KERN_OSRELEASE                 = 0x2
+	KERN_OSTYPE                    = 0x1
+	KERN_VERSION                   = 0x4
+	LOCK_EX                        = 0x2
+	LOCK_NB                        = 0x4
+	LOCK_SH                        = 0x1
+	LOCK_UN                        = 0x8
+	MADV_AUTOSYNC                  = 0x7
+	MADV_CORE                      = 0x9
+	MADV_DONTNEED                  = 0x4
+	MADV_FREE                      = 0x5
+	MADV_NOCORE                    = 0x8
+	MADV_NORMAL                    = 0x0
+	MADV_NOSYNC                    = 0x6
+	MADV_PROTECT                   = 0xa
+	MADV_RANDOM                    = 0x1
+	MADV_SEQUENTIAL                = 0x2
+	MADV_WILLNEED                  = 0x3
+	MAP_32BIT                      = 0x80000
+	MAP_ALIGNED_SUPER              = 0x1000000
+	MAP_ALIGNMENT_MASK             = -0x1000000
+	MAP_ALIGNMENT_SHIFT            = 0x18
+	MAP_ANON                       = 0x1000
+	MAP_ANONYMOUS                  = 0x1000
+	MAP_COPY                       = 0x2
+	MAP_EXCL                       = 0x4000
+	MAP_FILE                       = 0x0
+	MAP_FIXED                      = 0x10
+	MAP_HASSEMAPHORE               = 0x200
+	MAP_NOCORE                     = 0x20000
+	MAP_NOSYNC                     = 0x800
+	MAP_PREFAULT_READ              = 0x40000
+	MAP_PRIVATE                    = 0x2
+	MAP_RESERVED0020               = 0x20
+	MAP_RESERVED0040               = 0x40
+	MAP_RESERVED0080               = 0x80
+	MAP_RESERVED0100               = 0x100
+	MAP_SHARED                     = 0x1
+	MAP_STACK                      = 0x400
+	MCL_CURRENT                    = 0x1
+	MCL_FUTURE                     = 0x2
+	MNT_ACLS                       = 0x8000000
+	MNT_ASYNC                      = 0x40
+	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_BYFSID                     = 0x8000000
+	MNT_CMDFLAGS                   = 0xd0f0000
+	MNT_DEFEXPORTED                = 0x200
+	MNT_DELEXPORT                  = 0x20000
+	MNT_EXKERB                     = 0x800
+	MNT_EXPORTANON                 = 0x400
+	MNT_EXPORTED                   = 0x100
+	MNT_EXPUBLIC                   = 0x20000000
+	MNT_EXRDONLY                   = 0x80
+	MNT_FORCE                      = 0x80000
+	MNT_GJOURNAL                   = 0x2000000
+	MNT_IGNORE                     = 0x800000
+	MNT_LAZY                       = 0x3
+	MNT_LOCAL                      = 0x1000
+	MNT_MULTILABEL                 = 0x4000000
+	MNT_NFS4ACLS                   = 0x10
+	MNT_NOATIME                    = 0x10000000
+	MNT_NOCLUSTERR                 = 0x40000000
+	MNT_NOCLUSTERW                 = 0x80000000
+	MNT_NOEXEC                     = 0x4
+	MNT_NONBUSY                    = 0x4000000
+	MNT_NOSUID                     = 0x8
+	MNT_NOSYMFOLLOW                = 0x400000
+	MNT_NOWAIT                     = 0x2
+	MNT_QUOTA                      = 0x2000
+	MNT_RDONLY                     = 0x1
+	MNT_RELOAD                     = 0x40000
+	MNT_ROOTFS                     = 0x4000
+	MNT_SNAPSHOT                   = 0x1000000
+	MNT_SOFTDEP                    = 0x200000
+	MNT_SUIDDIR                    = 0x100000
+	MNT_SUJ                        = 0x100000000
+	MNT_SUSPEND                    = 0x4
+	MNT_SYNCHRONOUS                = 0x2
+	MNT_UNION                      = 0x20
+	MNT_UPDATE                     = 0x10000
+	MNT_UPDATEMASK                 = 0x2d8d0807e
+	MNT_USER                       = 0x8000
+	MNT_VISFLAGMASK                = 0x3fef0ffff
+	MNT_WAIT                       = 0x1
+	MSG_CMSG_CLOEXEC               = 0x40000
+	MSG_COMPAT                     = 0x8000
+	MSG_CTRUNC                     = 0x20
+	MSG_DONTROUTE                  = 0x4
+	MSG_DONTWAIT                   = 0x80
+	MSG_EOF                        = 0x100
+	MSG_EOR                        = 0x8
+	MSG_NBIO                       = 0x4000
+	MSG_NOSIGNAL                   = 0x20000
+	MSG_NOTIFICATION               = 0x2000
+	MSG_OOB                        = 0x1
+	MSG_PEEK                       = 0x2
+	MSG_TRUNC                      = 0x10
+	MSG_WAITALL                    = 0x40
+	MSG_WAITFORONE                 = 0x80000
+	MS_ASYNC                       = 0x1
+	MS_INVALIDATE                  = 0x2
+	MS_SYNC                        = 0x0
+	NAME_MAX                       = 0xff
+	NET_RT_DUMP                    = 0x1
+	NET_RT_FLAGS                   = 0x2
+	NET_RT_IFLIST                  = 0x3
+	NET_RT_IFLISTL                 = 0x5
+	NET_RT_IFMALIST                = 0x4
+	NOFLSH                         = 0x80000000
+	NOKERNINFO                     = 0x2000000
+	NOTE_ATTRIB                    = 0x8
+	NOTE_CHILD                     = 0x4
+	NOTE_CLOSE                     = 0x100
+	NOTE_CLOSE_WRITE               = 0x200
+	NOTE_DELETE                    = 0x1
+	NOTE_EXEC                      = 0x20000000
+	NOTE_EXIT                      = 0x80000000
+	NOTE_EXTEND                    = 0x4
+	NOTE_FFAND                     = 0x40000000
+	NOTE_FFCOPY                    = 0xc0000000
+	NOTE_FFCTRLMASK                = 0xc0000000
+	NOTE_FFLAGSMASK                = 0xffffff
+	NOTE_FFNOP                     = 0x0
+	NOTE_FFOR                      = 0x80000000
+	NOTE_FILE_POLL                 = 0x2
+	NOTE_FORK                      = 0x40000000
+	NOTE_LINK                      = 0x10
+	NOTE_LOWAT                     = 0x1
+	NOTE_MSECONDS                  = 0x2
+	NOTE_NSECONDS                  = 0x8
+	NOTE_OPEN                      = 0x80
+	NOTE_PCTRLMASK                 = 0xf0000000
+	NOTE_PDATAMASK                 = 0xfffff
+	NOTE_READ                      = 0x400
+	NOTE_RENAME                    = 0x20
+	NOTE_REVOKE                    = 0x40
+	NOTE_SECONDS                   = 0x1
+	NOTE_TRACK                     = 0x1
+	NOTE_TRACKERR                  = 0x2
+	NOTE_TRIGGER                   = 0x1000000
+	NOTE_USECONDS                  = 0x4
+	NOTE_WRITE                     = 0x2
+	OCRNL                          = 0x10
+	ONLCR                          = 0x2
+	ONLRET                         = 0x40
+	ONOCR                          = 0x20
+	ONOEOT                         = 0x8
+	OPOST                          = 0x1
+	OXTABS                         = 0x4
+	O_ACCMODE                      = 0x3
+	O_APPEND                       = 0x8
+	O_ASYNC                        = 0x40
+	O_CLOEXEC                      = 0x100000
+	O_CREAT                        = 0x200
+	O_DIRECT                       = 0x10000
+	O_DIRECTORY                    = 0x20000
+	O_EXCL                         = 0x800
+	O_EXEC                         = 0x40000
+	O_EXLOCK                       = 0x20
+	O_FSYNC                        = 0x80
+	O_NDELAY                       = 0x4
+	O_NOCTTY                       = 0x8000
+	O_NOFOLLOW                     = 0x100
+	O_NONBLOCK                     = 0x4
+	O_RDONLY                       = 0x0
+	O_RDWR                         = 0x2
+	O_SHLOCK                       = 0x10
+	O_SYNC                         = 0x80
+	O_TRUNC                        = 0x400
+	O_TTY_INIT                     = 0x80000
+	O_VERIFY                       = 0x200000
+	O_WRONLY                       = 0x1
+	PARENB                         = 0x1000
+	PARMRK                         = 0x8
+	PARODD                         = 0x2000
+	PENDIN                         = 0x20000000
+	PRIO_PGRP                      = 0x1
+	PRIO_PROCESS                   = 0x0
+	PRIO_USER                      = 0x2
+	PROT_EXEC                      = 0x4
+	PROT_NONE                      = 0x0
+	PROT_READ                      = 0x1
+	PROT_WRITE                     = 0x2
+	RLIMIT_AS                      = 0xa
+	RLIMIT_CORE                    = 0x4
+	RLIMIT_CPU                     = 0x0
+	RLIMIT_DATA                    = 0x2
+	RLIMIT_FSIZE                   = 0x1
+	RLIMIT_MEMLOCK                 = 0x6
+	RLIMIT_NOFILE                  = 0x8
+	RLIMIT_NPROC                   = 0x7
+	RLIMIT_RSS                     = 0x5
+	RLIMIT_STACK                   = 0x3
+	RLIM_INFINITY                  = 0x7fffffffffffffff
+	RTAX_AUTHOR                    = 0x6
+	RTAX_BRD                       = 0x7
+	RTAX_DST                       = 0x0
+	RTAX_GATEWAY                   = 0x1
+	RTAX_GENMASK                   = 0x3
+	RTAX_IFA                       = 0x5
+	RTAX_IFP                       = 0x4
+	RTAX_MAX                       = 0x8
+	RTAX_NETMASK                   = 0x2
+	RTA_AUTHOR                     = 0x40
+	RTA_BRD                        = 0x80
+	RTA_DST                        = 0x1
+	RTA_GATEWAY                    = 0x2
+	RTA_GENMASK                    = 0x8
+	RTA_IFA                        = 0x20
+	RTA_IFP                        = 0x10
+	RTA_NETMASK                    = 0x4
+	RTF_BLACKHOLE                  = 0x1000
+	RTF_BROADCAST                  = 0x400000
+	RTF_DONE                       = 0x40
+	RTF_DYNAMIC                    = 0x10
+	RTF_FIXEDMTU                   = 0x80000
+	RTF_FMASK                      = 0x1004d808
+	RTF_GATEWAY                    = 0x2
+	RTF_GWFLAG_COMPAT              = 0x80000000
+	RTF_HOST                       = 0x4
+	RTF_LLDATA                     = 0x400
+	RTF_LLINFO                     = 0x400
+	RTF_LOCAL                      = 0x200000
+	RTF_MODIFIED                   = 0x20
+	RTF_MULTICAST                  = 0x800000
+	RTF_PINNED                     = 0x100000
+	RTF_PROTO1                     = 0x8000
+	RTF_PROTO2                     = 0x4000
+	RTF_PROTO3                     = 0x40000
+	RTF_REJECT                     = 0x8
+	RTF_RNH_LOCKED                 = 0x40000000
+	RTF_STATIC                     = 0x800
+	RTF_STICKY                     = 0x10000000
+	RTF_UP                         = 0x1
+	RTF_XRESOLVE                   = 0x200
+	RTM_ADD                        = 0x1
+	RTM_CHANGE                     = 0x3
+	RTM_DELADDR                    = 0xd
+	RTM_DELETE                     = 0x2
+	RTM_DELMADDR                   = 0x10
+	RTM_GET                        = 0x4
+	RTM_IEEE80211                  = 0x12
+	RTM_IFANNOUNCE                 = 0x11
+	RTM_IFINFO                     = 0xe
+	RTM_LOCK                       = 0x8
+	RTM_LOSING                     = 0x5
+	RTM_MISS                       = 0x7
+	RTM_NEWADDR                    = 0xc
+	RTM_NEWMADDR                   = 0xf
+	RTM_REDIRECT                   = 0x6
+	RTM_RESOLVE                    = 0xb
+	RTM_RTTUNIT                    = 0xf4240
+	RTM_VERSION                    = 0x5
+	RTV_EXPIRE                     = 0x4
+	RTV_HOPCOUNT                   = 0x2
+	RTV_MTU                        = 0x1
+	RTV_RPIPE                      = 0x8
+	RTV_RTT                        = 0x40
+	RTV_RTTVAR                     = 0x80
+	RTV_SPIPE                      = 0x10
+	RTV_SSTHRESH                   = 0x20
+	RTV_WEIGHT                     = 0x100
+	RT_ALL_FIBS                    = -0x1
+	RT_BLACKHOLE                   = 0x40
+	RT_CACHING_CONTEXT             = 0x1
+	RT_DEFAULT_FIB                 = 0x0
+	RT_HAS_GW                      = 0x80
+	RT_HAS_HEADER                  = 0x10
+	RT_HAS_HEADER_BIT              = 0x4
+	RT_L2_ME                       = 0x4
+	RT_L2_ME_BIT                   = 0x2
+	RT_LLE_CACHE                   = 0x100
+	RT_MAY_LOOP                    = 0x8
+	RT_MAY_LOOP_BIT                = 0x3
+	RT_NORTREF                     = 0x2
+	RT_REJECT                      = 0x20
+	RUSAGE_CHILDREN                = -0x1
+	RUSAGE_SELF                    = 0x0
+	RUSAGE_THREAD                  = 0x1
+	SCM_BINTIME                    = 0x4
+	SCM_CREDS                      = 0x3
+	SCM_RIGHTS                     = 0x1
+	SCM_TIMESTAMP                  = 0x2
+	SHUT_RD                        = 0x0
+	SHUT_RDWR                      = 0x2
+	SHUT_WR                        = 0x1
+	SIOCADDMULTI                   = 0x80206931
+	SIOCAIFADDR                    = 0x8040691a
+	SIOCAIFGROUP                   = 0x80286987
+	SIOCATMARK                     = 0x40047307
+	SIOCDELMULTI                   = 0x80206932
+	SIOCDIFADDR                    = 0x80206919
+	SIOCDIFGROUP                   = 0x80286989
+	SIOCDIFPHYADDR                 = 0x80206949
+	SIOCGDRVSPEC                   = 0xc028697b
+	SIOCGETSGCNT                   = 0xc0207210
+	SIOCGETVIFCNT                  = 0xc028720f
+	SIOCGHIWAT                     = 0x40047301
+	SIOCGI2C                       = 0xc020693d
+	SIOCGIFADDR                    = 0xc0206921
+	SIOCGIFBRDADDR                 = 0xc0206923
+	SIOCGIFCAP                     = 0xc020691f
+	SIOCGIFCONF                    = 0xc0106924
+	SIOCGIFDESCR                   = 0xc020692a
+	SIOCGIFDSTADDR                 = 0xc0206922
+	SIOCGIFFIB                     = 0xc020695c
+	SIOCGIFFLAGS                   = 0xc0206911
+	SIOCGIFGENERIC                 = 0xc020693a
+	SIOCGIFGMEMB                   = 0xc028698a
+	SIOCGIFGROUP                   = 0xc0286988
+	SIOCGIFINDEX                   = 0xc0206920
+	SIOCGIFMAC                     = 0xc0206926
+	SIOCGIFMEDIA                   = 0xc0306938
+	SIOCGIFMETRIC                  = 0xc0206917
+	SIOCGIFMTU                     = 0xc0206933
+	SIOCGIFNETMASK                 = 0xc0206925
+	SIOCGIFPDSTADDR                = 0xc0206948
+	SIOCGIFPHYS                    = 0xc0206935
+	SIOCGIFPSRCADDR                = 0xc0206947
+	SIOCGIFSTATUS                  = 0xc331693b
+	SIOCGIFXMEDIA                  = 0xc030698b
+	SIOCGLOWAT                     = 0x40047303
+	SIOCGPGRP                      = 0x40047309
+	SIOCGPRIVATE_0                 = 0xc0206950
+	SIOCGPRIVATE_1                 = 0xc0206951
+	SIOCGTUNFIB                    = 0xc020695e
+	SIOCIFCREATE                   = 0xc020697a
+	SIOCIFCREATE2                  = 0xc020697c
+	SIOCIFDESTROY                  = 0x80206979
+	SIOCIFGCLONERS                 = 0xc0106978
+	SIOCSDRVSPEC                   = 0x8028697b
+	SIOCSHIWAT                     = 0x80047300
+	SIOCSIFADDR                    = 0x8020690c
+	SIOCSIFBRDADDR                 = 0x80206913
+	SIOCSIFCAP                     = 0x8020691e
+	SIOCSIFDESCR                   = 0x80206929
+	SIOCSIFDSTADDR                 = 0x8020690e
+	SIOCSIFFIB                     = 0x8020695d
+	SIOCSIFFLAGS                   = 0x80206910
+	SIOCSIFGENERIC                 = 0x80206939
+	SIOCSIFLLADDR                  = 0x8020693c
+	SIOCSIFMAC                     = 0x80206927
+	SIOCSIFMEDIA                   = 0xc0206937
+	SIOCSIFMETRIC                  = 0x80206918
+	SIOCSIFMTU                     = 0x80206934
+	SIOCSIFNAME                    = 0x80206928
+	SIOCSIFNETMASK                 = 0x80206916
+	SIOCSIFPHYADDR                 = 0x80406946
+	SIOCSIFPHYS                    = 0x80206936
+	SIOCSIFRVNET                   = 0xc020695b
+	SIOCSIFVNET                    = 0xc020695a
+	SIOCSLOWAT                     = 0x80047302
+	SIOCSPGRP                      = 0x80047308
+	SIOCSTUNFIB                    = 0x8020695f
+	SOCK_CLOEXEC                   = 0x10000000
+	SOCK_DGRAM                     = 0x2
+	SOCK_MAXADDRLEN                = 0xff
+	SOCK_NONBLOCK                  = 0x20000000
+	SOCK_RAW                       = 0x3
+	SOCK_RDM                       = 0x4
+	SOCK_SEQPACKET                 = 0x5
+	SOCK_STREAM                    = 0x1
+	SOL_SOCKET                     = 0xffff
+	SOMAXCONN                      = 0x80
+	SO_ACCEPTCONN                  = 0x2
+	SO_ACCEPTFILTER                = 0x1000
+	SO_BINTIME                     = 0x2000
+	SO_BROADCAST                   = 0x20
+	SO_DEBUG                       = 0x1
+	SO_DONTROUTE                   = 0x10
+	SO_ERROR                       = 0x1007
+	SO_KEEPALIVE                   = 0x8
+	SO_LABEL                       = 0x1009
+	SO_LINGER                      = 0x80
+	SO_LISTENINCQLEN               = 0x1013
+	SO_LISTENQLEN                  = 0x1012
+	SO_LISTENQLIMIT                = 0x1011
+	SO_NOSIGPIPE                   = 0x800
+	SO_NO_DDP                      = 0x8000
+	SO_NO_OFFLOAD                  = 0x4000
+	SO_OOBINLINE                   = 0x100
+	SO_PEERLABEL                   = 0x1010
+	SO_PROTOCOL                    = 0x1016
+	SO_PROTOTYPE                   = 0x1016
+	SO_RCVBUF                      = 0x1002
+	SO_RCVLOWAT                    = 0x1004
+	SO_RCVTIMEO                    = 0x1006
+	SO_REUSEADDR                   = 0x4
+	SO_REUSEPORT                   = 0x200
+	SO_SETFIB                      = 0x1014
+	SO_SNDBUF                      = 0x1001
+	SO_SNDLOWAT                    = 0x1003
+	SO_SNDTIMEO                    = 0x1005
+	SO_TIMESTAMP                   = 0x400
+	SO_TYPE                        = 0x1008
+	SO_USELOOPBACK                 = 0x40
+	SO_USER_COOKIE                 = 0x1015
+	SO_VENDOR                      = 0x80000000
+	TAB0                           = 0x0
+	TAB3                           = 0x4
+	TABDLY                         = 0x4
+	TCIFLUSH                       = 0x1
+	TCIOFF                         = 0x3
+	TCIOFLUSH                      = 0x3
+	TCION                          = 0x4
+	TCOFLUSH                       = 0x2
+	TCOOFF                         = 0x1
+	TCOON                          = 0x2
+	TCP_CA_NAME_MAX                = 0x10
+	TCP_CCALGOOPT                  = 0x41
+	TCP_CONGESTION                 = 0x40
+	TCP_FASTOPEN                   = 0x401
+	TCP_FUNCTION_BLK               = 0x2000
+	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
+	TCP_INFO                       = 0x20
+	TCP_KEEPCNT                    = 0x400
+	TCP_KEEPIDLE                   = 0x100
+	TCP_KEEPINIT                   = 0x80
+	TCP_KEEPINTVL                  = 0x200
+	TCP_MAXBURST                   = 0x4
+	TCP_MAXHLEN                    = 0x3c
+	TCP_MAXOLEN                    = 0x28
+	TCP_MAXSEG                     = 0x2
+	TCP_MAXWIN                     = 0xffff
+	TCP_MAX_SACK                   = 0x4
+	TCP_MAX_WINSHIFT               = 0xe
+	TCP_MD5SIG                     = 0x10
+	TCP_MINMSS                     = 0xd8
+	TCP_MSS                        = 0x218
+	TCP_NODELAY                    = 0x1
+	TCP_NOOPT                      = 0x8
+	TCP_NOPUSH                     = 0x4
+	TCP_PCAP_IN                    = 0x1000
+	TCP_PCAP_OUT                   = 0x800
+	TCP_VENDOR                     = 0x80000000
+	TCSAFLUSH                      = 0x2
+	TIOCCBRK                       = 0x2000747a
+	TIOCCDTR                       = 0x20007478
+	TIOCCONS                       = 0x80047462
+	TIOCDRAIN                      = 0x2000745e
+	TIOCEXCL                       = 0x2000740d
+	TIOCEXT                        = 0x80047460
+	TIOCFLUSH                      = 0x80047410
+	TIOCGDRAINWAIT                 = 0x40047456
+	TIOCGETA                       = 0x402c7413
+	TIOCGETD                       = 0x4004741a
+	TIOCGPGRP                      = 0x40047477
+	TIOCGPTN                       = 0x4004740f
+	TIOCGSID                       = 0x40047463
+	TIOCGWINSZ                     = 0x40087468
+	TIOCMBIC                       = 0x8004746b
+	TIOCMBIS                       = 0x8004746c
+	TIOCMGDTRWAIT                  = 0x4004745a
+	TIOCMGET                       = 0x4004746a
+	TIOCMSDTRWAIT                  = 0x8004745b
+	TIOCMSET                       = 0x8004746d
+	TIOCM_CAR                      = 0x40
+	TIOCM_CD                       = 0x40
+	TIOCM_CTS                      = 0x20
+	TIOCM_DCD                      = 0x40
+	TIOCM_DSR                      = 0x100
+	TIOCM_DTR                      = 0x2
+	TIOCM_LE                       = 0x1
+	TIOCM_RI                       = 0x80
+	TIOCM_RNG                      = 0x80
+	TIOCM_RTS                      = 0x4
+	TIOCM_SR                       = 0x10
+	TIOCM_ST                       = 0x8
+	TIOCNOTTY                      = 0x20007471
+	TIOCNXCL                       = 0x2000740e
+	TIOCOUTQ                       = 0x40047473
+	TIOCPKT                        = 0x80047470
+	TIOCPKT_DATA                   = 0x0
+	TIOCPKT_DOSTOP                 = 0x20
+	TIOCPKT_FLUSHREAD              = 0x1
+	TIOCPKT_FLUSHWRITE             = 0x2
+	TIOCPKT_IOCTL                  = 0x40
+	TIOCPKT_NOSTOP                 = 0x10
+	TIOCPKT_START                  = 0x8
+	TIOCPKT_STOP                   = 0x4
+	TIOCPTMASTER                   = 0x2000741c
+	TIOCSBRK                       = 0x2000747b
+	TIOCSCTTY                      = 0x20007461
+	TIOCSDRAINWAIT                 = 0x80047457
+	TIOCSDTR                       = 0x20007479
+	TIOCSETA                       = 0x802c7414
+	TIOCSETAF                      = 0x802c7416
+	TIOCSETAW                      = 0x802c7415
+	TIOCSETD                       = 0x8004741b
+	TIOCSIG                        = 0x2004745f
+	TIOCSPGRP                      = 0x80047476
+	TIOCSTART                      = 0x2000746e
+	TIOCSTAT                       = 0x20007465
+	TIOCSTI                        = 0x80017472
+	TIOCSTOP                       = 0x2000746f
+	TIOCSWINSZ                     = 0x80087467
+	TIOCTIMESTAMP                  = 0x40107459
+	TIOCUCNTL                      = 0x80047466
+	TOSTOP                         = 0x400000
+	VDISCARD                       = 0xf
+	VDSUSP                         = 0xb
+	VEOF                           = 0x0
+	VEOL                           = 0x1
+	VEOL2                          = 0x2
+	VERASE                         = 0x3
+	VERASE2                        = 0x7
+	VINTR                          = 0x8
+	VKILL                          = 0x5
+	VLNEXT                         = 0xe
+	VMIN                           = 0x10
+	VQUIT                          = 0x9
+	VREPRINT                       = 0x6
+	VSTART                         = 0xc
+	VSTATUS                        = 0x12
+	VSTOP                          = 0xd
+	VSUSP                          = 0xa
+	VTIME                          = 0x11
+	VWERASE                        = 0x4
+	WCONTINUED                     = 0x4
+	WCOREFLAG                      = 0x80
+	WEXITED                        = 0x10
+	WLINUXCLONE                    = 0x80000000
+	WNOHANG                        = 0x1
+	WNOWAIT                        = 0x8
+	WSTOPPED                       = 0x2
+	WTRAPPED                       = 0x20
+	WUNTRACED                      = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x59)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x55)
+	ECAPMODE        = syscall.Errno(0x5e)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOOFUS         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x56)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5a)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x57)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCAPABLE     = syscall.Errno(0x5d)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x5f)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x60)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5c)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGLIBRT  = syscall.Signal(0x21)
+	SIGLWP    = syscall.Signal(0x20)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "ECANCELED", "operation canceled"},
+	{86, "EILSEQ", "illegal byte sequence"},
+	{87, "ENOATTR", "attribute not found"},
+	{88, "EDOOFUS", "programming error"},
+	{89, "EBADMSG", "bad message"},
+	{90, "EMULTIHOP", "multihop attempted"},
+	{91, "ENOLINK", "link has been severed"},
+	{92, "EPROTO", "protocol error"},
+	{93, "ENOTCAPABLE", "capabilities insufficient"},
+	{94, "ECAPMODE", "not permitted in capability mode"},
+	{95, "ENOTRECOVERABLE", "state not recoverable"},
+	{96, "EOWNERDEAD", "previous owner died"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "unknown signal"},
+	{33, "SIGLIBRT", "unknown signal"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
new file mode 100644
index 00000000..e8240d23
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
@@ -0,0 +1,1773 @@
+// mkerrors.sh
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,freebsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                   = 0x10
+	AF_ARP                         = 0x23
+	AF_ATM                         = 0x1e
+	AF_BLUETOOTH                   = 0x24
+	AF_CCITT                       = 0xa
+	AF_CHAOS                       = 0x5
+	AF_CNT                         = 0x15
+	AF_COIP                        = 0x14
+	AF_DATAKIT                     = 0x9
+	AF_DECnet                      = 0xc
+	AF_DLI                         = 0xd
+	AF_E164                        = 0x1a
+	AF_ECMA                        = 0x8
+	AF_HYLINK                      = 0xf
+	AF_IEEE80211                   = 0x25
+	AF_IMPLINK                     = 0x3
+	AF_INET                        = 0x2
+	AF_INET6                       = 0x1c
+	AF_INET6_SDP                   = 0x2a
+	AF_INET_SDP                    = 0x28
+	AF_IPX                         = 0x17
+	AF_ISDN                        = 0x1a
+	AF_ISO                         = 0x7
+	AF_LAT                         = 0xe
+	AF_LINK                        = 0x12
+	AF_LOCAL                       = 0x1
+	AF_MAX                         = 0x2a
+	AF_NATM                        = 0x1d
+	AF_NETBIOS                     = 0x6
+	AF_NETGRAPH                    = 0x20
+	AF_OSI                         = 0x7
+	AF_PUP                         = 0x4
+	AF_ROUTE                       = 0x11
+	AF_SCLUSTER                    = 0x22
+	AF_SIP                         = 0x18
+	AF_SLOW                        = 0x21
+	AF_SNA                         = 0xb
+	AF_UNIX                        = 0x1
+	AF_UNSPEC                      = 0x0
+	AF_VENDOR00                    = 0x27
+	AF_VENDOR01                    = 0x29
+	AF_VENDOR02                    = 0x2b
+	AF_VENDOR03                    = 0x2d
+	AF_VENDOR04                    = 0x2f
+	AF_VENDOR05                    = 0x31
+	AF_VENDOR06                    = 0x33
+	AF_VENDOR07                    = 0x35
+	AF_VENDOR08                    = 0x37
+	AF_VENDOR09                    = 0x39
+	AF_VENDOR10                    = 0x3b
+	AF_VENDOR11                    = 0x3d
+	AF_VENDOR12                    = 0x3f
+	AF_VENDOR13                    = 0x41
+	AF_VENDOR14                    = 0x43
+	AF_VENDOR15                    = 0x45
+	AF_VENDOR16                    = 0x47
+	AF_VENDOR17                    = 0x49
+	AF_VENDOR18                    = 0x4b
+	AF_VENDOR19                    = 0x4d
+	AF_VENDOR20                    = 0x4f
+	AF_VENDOR21                    = 0x51
+	AF_VENDOR22                    = 0x53
+	AF_VENDOR23                    = 0x55
+	AF_VENDOR24                    = 0x57
+	AF_VENDOR25                    = 0x59
+	AF_VENDOR26                    = 0x5b
+	AF_VENDOR27                    = 0x5d
+	AF_VENDOR28                    = 0x5f
+	AF_VENDOR29                    = 0x61
+	AF_VENDOR30                    = 0x63
+	AF_VENDOR31                    = 0x65
+	AF_VENDOR32                    = 0x67
+	AF_VENDOR33                    = 0x69
+	AF_VENDOR34                    = 0x6b
+	AF_VENDOR35                    = 0x6d
+	AF_VENDOR36                    = 0x6f
+	AF_VENDOR37                    = 0x71
+	AF_VENDOR38                    = 0x73
+	AF_VENDOR39                    = 0x75
+	AF_VENDOR40                    = 0x77
+	AF_VENDOR41                    = 0x79
+	AF_VENDOR42                    = 0x7b
+	AF_VENDOR43                    = 0x7d
+	AF_VENDOR44                    = 0x7f
+	AF_VENDOR45                    = 0x81
+	AF_VENDOR46                    = 0x83
+	AF_VENDOR47                    = 0x85
+	ALTWERASE                      = 0x200
+	B0                             = 0x0
+	B110                           = 0x6e
+	B115200                        = 0x1c200
+	B1200                          = 0x4b0
+	B134                           = 0x86
+	B14400                         = 0x3840
+	B150                           = 0x96
+	B1800                          = 0x708
+	B19200                         = 0x4b00
+	B200                           = 0xc8
+	B230400                        = 0x38400
+	B2400                          = 0x960
+	B28800                         = 0x7080
+	B300                           = 0x12c
+	B38400                         = 0x9600
+	B460800                        = 0x70800
+	B4800                          = 0x12c0
+	B50                            = 0x32
+	B57600                         = 0xe100
+	B600                           = 0x258
+	B7200                          = 0x1c20
+	B75                            = 0x4b
+	B76800                         = 0x12c00
+	B921600                        = 0xe1000
+	B9600                          = 0x2580
+	BIOCFEEDBACK                   = 0x8004427c
+	BIOCFLUSH                      = 0x20004268
+	BIOCGBLEN                      = 0x40044266
+	BIOCGDIRECTION                 = 0x40044276
+	BIOCGDLT                       = 0x4004426a
+	BIOCGDLTLIST                   = 0xc0084279
+	BIOCGETBUFMODE                 = 0x4004427d
+	BIOCGETIF                      = 0x4020426b
+	BIOCGETZMAX                    = 0x4004427f
+	BIOCGHDRCMPLT                  = 0x40044274
+	BIOCGRSIG                      = 0x40044272
+	BIOCGRTIMEOUT                  = 0x4010426e
+	BIOCGSEESENT                   = 0x40044276
+	BIOCGSTATS                     = 0x4008426f
+	BIOCGTSTAMP                    = 0x40044283
+	BIOCIMMEDIATE                  = 0x80044270
+	BIOCLOCK                       = 0x2000427a
+	BIOCPROMISC                    = 0x20004269
+	BIOCROTZBUF                    = 0x400c4280
+	BIOCSBLEN                      = 0xc0044266
+	BIOCSDIRECTION                 = 0x80044277
+	BIOCSDLT                       = 0x80044278
+	BIOCSETBUFMODE                 = 0x8004427e
+	BIOCSETF                       = 0x80084267
+	BIOCSETFNR                     = 0x80084282
+	BIOCSETIF                      = 0x8020426c
+	BIOCSETWF                      = 0x8008427b
+	BIOCSETZBUF                    = 0x800c4281
+	BIOCSHDRCMPLT                  = 0x80044275
+	BIOCSRSIG                      = 0x80044273
+	BIOCSRTIMEOUT                  = 0x8010426d
+	BIOCSSEESENT                   = 0x80044277
+	BIOCSTSTAMP                    = 0x80044284
+	BIOCVERSION                    = 0x40044271
+	BPF_A                          = 0x10
+	BPF_ABS                        = 0x20
+	BPF_ADD                        = 0x0
+	BPF_ALIGNMENT                  = 0x4
+	BPF_ALU                        = 0x4
+	BPF_AND                        = 0x50
+	BPF_B                          = 0x10
+	BPF_BUFMODE_BUFFER             = 0x1
+	BPF_BUFMODE_ZBUF               = 0x2
+	BPF_DIV                        = 0x30
+	BPF_H                          = 0x8
+	BPF_IMM                        = 0x0
+	BPF_IND                        = 0x40
+	BPF_JA                         = 0x0
+	BPF_JEQ                        = 0x10
+	BPF_JGE                        = 0x30
+	BPF_JGT                        = 0x20
+	BPF_JMP                        = 0x5
+	BPF_JSET                       = 0x40
+	BPF_K                          = 0x0
+	BPF_LD                         = 0x0
+	BPF_LDX                        = 0x1
+	BPF_LEN                        = 0x80
+	BPF_LSH                        = 0x60
+	BPF_MAJOR_VERSION              = 0x1
+	BPF_MAXBUFSIZE                 = 0x80000
+	BPF_MAXINSNS                   = 0x200
+	BPF_MEM                        = 0x60
+	BPF_MEMWORDS                   = 0x10
+	BPF_MINBUFSIZE                 = 0x20
+	BPF_MINOR_VERSION              = 0x1
+	BPF_MISC                       = 0x7
+	BPF_MOD                        = 0x90
+	BPF_MSH                        = 0xa0
+	BPF_MUL                        = 0x20
+	BPF_NEG                        = 0x80
+	BPF_OR                         = 0x40
+	BPF_RELEASE                    = 0x30bb6
+	BPF_RET                        = 0x6
+	BPF_RSH                        = 0x70
+	BPF_ST                         = 0x2
+	BPF_STX                        = 0x3
+	BPF_SUB                        = 0x10
+	BPF_TAX                        = 0x0
+	BPF_TXA                        = 0x80
+	BPF_T_BINTIME                  = 0x2
+	BPF_T_BINTIME_FAST             = 0x102
+	BPF_T_BINTIME_MONOTONIC        = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST   = 0x302
+	BPF_T_FAST                     = 0x100
+	BPF_T_FLAG_MASK                = 0x300
+	BPF_T_FORMAT_MASK              = 0x3
+	BPF_T_MICROTIME                = 0x0
+	BPF_T_MICROTIME_FAST           = 0x100
+	BPF_T_MICROTIME_MONOTONIC      = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
+	BPF_T_MONOTONIC                = 0x200
+	BPF_T_MONOTONIC_FAST           = 0x300
+	BPF_T_NANOTIME                 = 0x1
+	BPF_T_NANOTIME_FAST            = 0x101
+	BPF_T_NANOTIME_MONOTONIC       = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST  = 0x301
+	BPF_T_NONE                     = 0x3
+	BPF_T_NORMAL                   = 0x0
+	BPF_W                          = 0x0
+	BPF_X                          = 0x8
+	BPF_XOR                        = 0xa0
+	BRKINT                         = 0x2
+	CAP_ACCEPT                     = 0x200000020000000
+	CAP_ACL_CHECK                  = 0x400000000010000
+	CAP_ACL_DELETE                 = 0x400000000020000
+	CAP_ACL_GET                    = 0x400000000040000
+	CAP_ACL_SET                    = 0x400000000080000
+	CAP_ALL0                       = 0x20007ffffffffff
+	CAP_ALL1                       = 0x4000000001fffff
+	CAP_BIND                       = 0x200000040000000
+	CAP_BINDAT                     = 0x200008000000400
+	CAP_CHFLAGSAT                  = 0x200000000001400
+	CAP_CONNECT                    = 0x200000080000000
+	CAP_CONNECTAT                  = 0x200010000000400
+	CAP_CREATE                     = 0x200000000000040
+	CAP_EVENT                      = 0x400000000000020
+	CAP_EXTATTR_DELETE             = 0x400000000001000
+	CAP_EXTATTR_GET                = 0x400000000002000
+	CAP_EXTATTR_LIST               = 0x400000000004000
+	CAP_EXTATTR_SET                = 0x400000000008000
+	CAP_FCHDIR                     = 0x200000000000800
+	CAP_FCHFLAGS                   = 0x200000000001000
+	CAP_FCHMOD                     = 0x200000000002000
+	CAP_FCHMODAT                   = 0x200000000002400
+	CAP_FCHOWN                     = 0x200000000004000
+	CAP_FCHOWNAT                   = 0x200000000004400
+	CAP_FCNTL                      = 0x200000000008000
+	CAP_FCNTL_ALL                  = 0x78
+	CAP_FCNTL_GETFL                = 0x8
+	CAP_FCNTL_GETOWN               = 0x20
+	CAP_FCNTL_SETFL                = 0x10
+	CAP_FCNTL_SETOWN               = 0x40
+	CAP_FEXECVE                    = 0x200000000000080
+	CAP_FLOCK                      = 0x200000000010000
+	CAP_FPATHCONF                  = 0x200000000020000
+	CAP_FSCK                       = 0x200000000040000
+	CAP_FSTAT                      = 0x200000000080000
+	CAP_FSTATAT                    = 0x200000000080400
+	CAP_FSTATFS                    = 0x200000000100000
+	CAP_FSYNC                      = 0x200000000000100
+	CAP_FTRUNCATE                  = 0x200000000000200
+	CAP_FUTIMES                    = 0x200000000200000
+	CAP_FUTIMESAT                  = 0x200000000200400
+	CAP_GETPEERNAME                = 0x200000100000000
+	CAP_GETSOCKNAME                = 0x200000200000000
+	CAP_GETSOCKOPT                 = 0x200000400000000
+	CAP_IOCTL                      = 0x400000000000080
+	CAP_IOCTLS_ALL                 = 0x7fffffff
+	CAP_KQUEUE                     = 0x400000000100040
+	CAP_KQUEUE_CHANGE              = 0x400000000100000
+	CAP_KQUEUE_EVENT               = 0x400000000000040
+	CAP_LINKAT_SOURCE              = 0x200020000000400
+	CAP_LINKAT_TARGET              = 0x200000000400400
+	CAP_LISTEN                     = 0x200000800000000
+	CAP_LOOKUP                     = 0x200000000000400
+	CAP_MAC_GET                    = 0x400000000000001
+	CAP_MAC_SET                    = 0x400000000000002
+	CAP_MKDIRAT                    = 0x200000000800400
+	CAP_MKFIFOAT                   = 0x200000001000400
+	CAP_MKNODAT                    = 0x200000002000400
+	CAP_MMAP                       = 0x200000000000010
+	CAP_MMAP_R                     = 0x20000000000001d
+	CAP_MMAP_RW                    = 0x20000000000001f
+	CAP_MMAP_RWX                   = 0x20000000000003f
+	CAP_MMAP_RX                    = 0x20000000000003d
+	CAP_MMAP_W                     = 0x20000000000001e
+	CAP_MMAP_WX                    = 0x20000000000003e
+	CAP_MMAP_X                     = 0x20000000000003c
+	CAP_PDGETPID                   = 0x400000000000200
+	CAP_PDKILL                     = 0x400000000000800
+	CAP_PDWAIT                     = 0x400000000000400
+	CAP_PEELOFF                    = 0x200001000000000
+	CAP_POLL_EVENT                 = 0x400000000000020
+	CAP_PREAD                      = 0x20000000000000d
+	CAP_PWRITE                     = 0x20000000000000e
+	CAP_READ                       = 0x200000000000001
+	CAP_RECV                       = 0x200000000000001
+	CAP_RENAMEAT_SOURCE            = 0x200000004000400
+	CAP_RENAMEAT_TARGET            = 0x200040000000400
+	CAP_RIGHTS_VERSION             = 0x0
+	CAP_RIGHTS_VERSION_00          = 0x0
+	CAP_SEEK                       = 0x20000000000000c
+	CAP_SEEK_TELL                  = 0x200000000000004
+	CAP_SEM_GETVALUE               = 0x400000000000004
+	CAP_SEM_POST                   = 0x400000000000008
+	CAP_SEM_WAIT                   = 0x400000000000010
+	CAP_SEND                       = 0x200000000000002
+	CAP_SETSOCKOPT                 = 0x200002000000000
+	CAP_SHUTDOWN                   = 0x200004000000000
+	CAP_SOCK_CLIENT                = 0x200007780000003
+	CAP_SOCK_SERVER                = 0x200007f60000003
+	CAP_SYMLINKAT                  = 0x200000008000400
+	CAP_TTYHOOK                    = 0x400000000000100
+	CAP_UNLINKAT                   = 0x200000010000400
+	CAP_UNUSED0_44                 = 0x200080000000000
+	CAP_UNUSED0_57                 = 0x300000000000000
+	CAP_UNUSED1_22                 = 0x400000000200000
+	CAP_UNUSED1_57                 = 0x500000000000000
+	CAP_WRITE                      = 0x200000000000002
+	CFLUSH                         = 0xf
+	CLOCAL                         = 0x8000
+	CLOCK_MONOTONIC                = 0x4
+	CLOCK_MONOTONIC_FAST           = 0xc
+	CLOCK_MONOTONIC_PRECISE        = 0xb
+	CLOCK_PROCESS_CPUTIME_ID       = 0xf
+	CLOCK_PROF                     = 0x2
+	CLOCK_REALTIME                 = 0x0
+	CLOCK_REALTIME_FAST            = 0xa
+	CLOCK_REALTIME_PRECISE         = 0x9
+	CLOCK_SECOND                   = 0xd
+	CLOCK_THREAD_CPUTIME_ID        = 0xe
+	CLOCK_UPTIME                   = 0x5
+	CLOCK_UPTIME_FAST              = 0x8
+	CLOCK_UPTIME_PRECISE           = 0x7
+	CLOCK_VIRTUAL                  = 0x1
+	CREAD                          = 0x800
+	CRTSCTS                        = 0x30000
+	CS5                            = 0x0
+	CS6                            = 0x100
+	CS7                            = 0x200
+	CS8                            = 0x300
+	CSIZE                          = 0x300
+	CSTART                         = 0x11
+	CSTATUS                        = 0x14
+	CSTOP                          = 0x13
+	CSTOPB                         = 0x400
+	CSUSP                          = 0x1a
+	CTL_HW                         = 0x6
+	CTL_KERN                       = 0x1
+	CTL_MAXNAME                    = 0x18
+	CTL_NET                        = 0x4
+	DLT_A429                       = 0xb8
+	DLT_A653_ICM                   = 0xb9
+	DLT_AIRONET_HEADER             = 0x78
+	DLT_AOS                        = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394     = 0x8a
+	DLT_ARCNET                     = 0x7
+	DLT_ARCNET_LINUX               = 0x81
+	DLT_ATM_CLIP                   = 0x13
+	DLT_ATM_RFC1483                = 0xb
+	DLT_AURORA                     = 0x7e
+	DLT_AX25                       = 0x3
+	DLT_AX25_KISS                  = 0xca
+	DLT_BACNET_MS_TP               = 0xa5
+	DLT_BLUETOOTH_BREDR_BB         = 0xff
+	DLT_BLUETOOTH_HCI_H4           = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
+	DLT_BLUETOOTH_LE_LL            = 0xfb
+	DLT_BLUETOOTH_LE_LL_WITH_PHDR  = 0x100
+	DLT_BLUETOOTH_LINUX_MONITOR    = 0xfe
+	DLT_CAN20B                     = 0xbe
+	DLT_CAN_SOCKETCAN              = 0xe3
+	DLT_CHAOS                      = 0x5
+	DLT_CHDLC                      = 0x68
+	DLT_CISCO_IOS                  = 0x76
+	DLT_CLASS_NETBSD_RAWAF         = 0x2240000
+	DLT_C_HDLC                     = 0x68
+	DLT_C_HDLC_WITH_DIR            = 0xcd
+	DLT_DBUS                       = 0xe7
+	DLT_DECT                       = 0xdd
+	DLT_DOCSIS                     = 0x8f
+	DLT_DVB_CI                     = 0xeb
+	DLT_ECONET                     = 0x73
+	DLT_EN10MB                     = 0x1
+	DLT_EN3MB                      = 0x2
+	DLT_ENC                        = 0x6d
+	DLT_EPON                       = 0x103
+	DLT_ERF                        = 0xc5
+	DLT_ERF_ETH                    = 0xaf
+	DLT_ERF_POS                    = 0xb0
+	DLT_FC_2                       = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
+	DLT_FDDI                       = 0xa
+	DLT_FLEXRAY                    = 0xd2
+	DLT_FRELAY                     = 0x6b
+	DLT_FRELAY_WITH_DIR            = 0xce
+	DLT_GCOM_SERIAL                = 0xad
+	DLT_GCOM_T1E1                  = 0xac
+	DLT_GPF_F                      = 0xab
+	DLT_GPF_T                      = 0xaa
+	DLT_GPRS_LLC                   = 0xa9
+	DLT_GSMTAP_ABIS                = 0xda
+	DLT_GSMTAP_UM                  = 0xd9
+	DLT_IBM_SN                     = 0x92
+	DLT_IBM_SP                     = 0x91
+	DLT_IEEE802                    = 0x6
+	DLT_IEEE802_11                 = 0x69
+	DLT_IEEE802_11_RADIO           = 0x7f
+	DLT_IEEE802_11_RADIO_AVS       = 0xa3
+	DLT_IEEE802_15_4               = 0xc3
+	DLT_IEEE802_15_4_LINUX         = 0xbf
+	DLT_IEEE802_15_4_NOFCS         = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY    = 0xd7
+	DLT_IEEE802_16_MAC_CPS         = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
+	DLT_INFINIBAND                 = 0xf7
+	DLT_IPFILTER                   = 0x74
+	DLT_IPMB                       = 0xc7
+	DLT_IPMB_LINUX                 = 0xd1
+	DLT_IPMI_HPM_2                 = 0x104
+	DLT_IPNET                      = 0xe2
+	DLT_IPOIB                      = 0xf2
+	DLT_IPV4                       = 0xe4
+	DLT_IPV6                       = 0xe5
+	DLT_IP_OVER_FC                 = 0x7a
+	DLT_ISO_14443                  = 0x108
+	DLT_JUNIPER_ATM1               = 0x89
+	DLT_JUNIPER_ATM2               = 0x87
+	DLT_JUNIPER_ATM_CEMIC          = 0xee
+	DLT_JUNIPER_CHDLC              = 0xb5
+	DLT_JUNIPER_ES                 = 0x84
+	DLT_JUNIPER_ETHER              = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL       = 0xea
+	DLT_JUNIPER_FRELAY             = 0xb4
+	DLT_JUNIPER_GGSN               = 0x85
+	DLT_JUNIPER_ISM                = 0xc2
+	DLT_JUNIPER_MFR                = 0x86
+	DLT_JUNIPER_MLFR               = 0x83
+	DLT_JUNIPER_MLPPP              = 0x82
+	DLT_JUNIPER_MONITOR            = 0xa4
+	DLT_JUNIPER_PIC_PEER           = 0xae
+	DLT_JUNIPER_PPP                = 0xb3
+	DLT_JUNIPER_PPPOE              = 0xa7
+	DLT_JUNIPER_PPPOE_ATM          = 0xa8
+	DLT_JUNIPER_SERVICES           = 0x88
+	DLT_JUNIPER_SRX_E2E            = 0xe9
+	DLT_JUNIPER_ST                 = 0xc8
+	DLT_JUNIPER_VP                 = 0xb7
+	DLT_JUNIPER_VS                 = 0xe8
+	DLT_LAPB_WITH_DIR              = 0xcf
+	DLT_LAPD                       = 0xcb
+	DLT_LIN                        = 0xd4
+	DLT_LINUX_EVDEV                = 0xd8
+	DLT_LINUX_IRDA                 = 0x90
+	DLT_LINUX_LAPD                 = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
+	DLT_LINUX_SLL                  = 0x71
+	DLT_LOOP                       = 0x6c
+	DLT_LTALK                      = 0x72
+	DLT_MATCHING_MAX               = 0x109
+	DLT_MATCHING_MIN               = 0x68
+	DLT_MFR                        = 0xb6
+	DLT_MOST                       = 0xd3
+	DLT_MPEG_2_TS                  = 0xf3
+	DLT_MPLS                       = 0xdb
+	DLT_MTP2                       = 0x8c
+	DLT_MTP2_WITH_PHDR             = 0x8b
+	DLT_MTP3                       = 0x8d
+	DLT_MUX27010                   = 0xec
+	DLT_NETANALYZER                = 0xf0
+	DLT_NETANALYZER_TRANSPARENT    = 0xf1
+	DLT_NETLINK                    = 0xfd
+	DLT_NFC_LLCP                   = 0xf5
+	DLT_NFLOG                      = 0xef
+	DLT_NG40                       = 0xf4
+	DLT_NULL                       = 0x0
+	DLT_PCI_EXP                    = 0x7d
+	DLT_PFLOG                      = 0x75
+	DLT_PFSYNC                     = 0x79
+	DLT_PKTAP                      = 0x102
+	DLT_PPI                        = 0xc0
+	DLT_PPP                        = 0x9
+	DLT_PPP_BSDOS                  = 0xe
+	DLT_PPP_ETHER                  = 0x33
+	DLT_PPP_PPPD                   = 0xa6
+	DLT_PPP_SERIAL                 = 0x32
+	DLT_PPP_WITH_DIR               = 0xcc
+	DLT_PPP_WITH_DIRECTION         = 0xa6
+	DLT_PRISM_HEADER               = 0x77
+	DLT_PROFIBUS_DL                = 0x101
+	DLT_PRONET                     = 0x4
+	DLT_RAIF1                      = 0xc6
+	DLT_RAW                        = 0xc
+	DLT_RDS                        = 0x109
+	DLT_REDBACK_SMARTEDGE          = 0x20
+	DLT_RIO                        = 0x7c
+	DLT_RTAC_SERIAL                = 0xfa
+	DLT_SCCP                       = 0x8e
+	DLT_SCTP                       = 0xf8
+	DLT_SITA                       = 0xc4
+	DLT_SLIP                       = 0x8
+	DLT_SLIP_BSDOS                 = 0xd
+	DLT_STANAG_5066_D_PDU          = 0xed
+	DLT_SUNATM                     = 0x7b
+	DLT_SYMANTEC_FIREWALL          = 0x63
+	DLT_TZSP                       = 0x80
+	DLT_USB                        = 0xba
+	DLT_USBPCAP                    = 0xf9
+	DLT_USB_FREEBSD                = 0xba
+	DLT_USB_LINUX                  = 0xbd
+	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USER0                      = 0x93
+	DLT_USER1                      = 0x94
+	DLT_USER10                     = 0x9d
+	DLT_USER11                     = 0x9e
+	DLT_USER12                     = 0x9f
+	DLT_USER13                     = 0xa0
+	DLT_USER14                     = 0xa1
+	DLT_USER15                     = 0xa2
+	DLT_USER2                      = 0x95
+	DLT_USER3                      = 0x96
+	DLT_USER4                      = 0x97
+	DLT_USER5                      = 0x98
+	DLT_USER6                      = 0x99
+	DLT_USER7                      = 0x9a
+	DLT_USER8                      = 0x9b
+	DLT_USER9                      = 0x9c
+	DLT_WATTSTOPPER_DLM            = 0x107
+	DLT_WIHART                     = 0xdf
+	DLT_WIRESHARK_UPPER_PDU        = 0xfc
+	DLT_X2E_SERIAL                 = 0xd5
+	DLT_X2E_XORAYA                 = 0xd6
+	DLT_ZWAVE_R1_R2                = 0x105
+	DLT_ZWAVE_R3                   = 0x106
+	DT_BLK                         = 0x6
+	DT_CHR                         = 0x2
+	DT_DIR                         = 0x4
+	DT_FIFO                        = 0x1
+	DT_LNK                         = 0xa
+	DT_REG                         = 0x8
+	DT_SOCK                        = 0xc
+	DT_UNKNOWN                     = 0x0
+	DT_WHT                         = 0xe
+	ECHO                           = 0x8
+	ECHOCTL                        = 0x40
+	ECHOE                          = 0x2
+	ECHOK                          = 0x4
+	ECHOKE                         = 0x1
+	ECHONL                         = 0x10
+	ECHOPRT                        = 0x20
+	EVFILT_AIO                     = -0x3
+	EVFILT_FS                      = -0x9
+	EVFILT_LIO                     = -0xa
+	EVFILT_PROC                    = -0x5
+	EVFILT_PROCDESC                = -0x8
+	EVFILT_READ                    = -0x1
+	EVFILT_SENDFILE                = -0xc
+	EVFILT_SIGNAL                  = -0x6
+	EVFILT_SYSCOUNT                = 0xc
+	EVFILT_TIMER                   = -0x7
+	EVFILT_USER                    = -0xb
+	EVFILT_VNODE                   = -0x4
+	EVFILT_WRITE                   = -0x2
+	EV_ADD                         = 0x1
+	EV_CLEAR                       = 0x20
+	EV_DELETE                      = 0x2
+	EV_DISABLE                     = 0x8
+	EV_DISPATCH                    = 0x80
+	EV_DROP                        = 0x1000
+	EV_ENABLE                      = 0x4
+	EV_EOF                         = 0x8000
+	EV_ERROR                       = 0x4000
+	EV_FLAG1                       = 0x2000
+	EV_FLAG2                       = 0x4000
+	EV_FORCEONESHOT                = 0x100
+	EV_ONESHOT                     = 0x10
+	EV_RECEIPT                     = 0x40
+	EV_SYSFLAGS                    = 0xf000
+	EXTA                           = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY        = 0x0
+	EXTATTR_NAMESPACE_SYSTEM       = 0x2
+	EXTATTR_NAMESPACE_USER         = 0x1
+	EXTB                           = 0x9600
+	EXTPROC                        = 0x800
+	FD_CLOEXEC                     = 0x1
+	FD_SETSIZE                     = 0x400
+	FLUSHO                         = 0x800000
+	F_CANCEL                       = 0x5
+	F_DUP2FD                       = 0xa
+	F_DUP2FD_CLOEXEC               = 0x12
+	F_DUPFD                        = 0x0
+	F_DUPFD_CLOEXEC                = 0x11
+	F_GETFD                        = 0x1
+	F_GETFL                        = 0x3
+	F_GETLK                        = 0xb
+	F_GETOWN                       = 0x5
+	F_OGETLK                       = 0x7
+	F_OK                           = 0x0
+	F_OSETLK                       = 0x8
+	F_OSETLKW                      = 0x9
+	F_RDAHEAD                      = 0x10
+	F_RDLCK                        = 0x1
+	F_READAHEAD                    = 0xf
+	F_SETFD                        = 0x2
+	F_SETFL                        = 0x4
+	F_SETLK                        = 0xc
+	F_SETLKW                       = 0xd
+	F_SETLK_REMOTE                 = 0xe
+	F_SETOWN                       = 0x6
+	F_UNLCK                        = 0x2
+	F_UNLCKSYS                     = 0x4
+	F_WRLCK                        = 0x3
+	HUPCL                          = 0x4000
+	HW_MACHINE                     = 0x1
+	ICANON                         = 0x100
+	ICMP6_FILTER                   = 0x12
+	ICRNL                          = 0x100
+	IEXTEN                         = 0x400
+	IFAN_ARRIVAL                   = 0x0
+	IFAN_DEPARTURE                 = 0x1
+	IFF_ALLMULTI                   = 0x200
+	IFF_ALTPHYS                    = 0x4000
+	IFF_BROADCAST                  = 0x2
+	IFF_CANTCHANGE                 = 0x218f52
+	IFF_CANTCONFIG                 = 0x10000
+	IFF_DEBUG                      = 0x4
+	IFF_DRV_OACTIVE                = 0x400
+	IFF_DRV_RUNNING                = 0x40
+	IFF_DYING                      = 0x200000
+	IFF_LINK0                      = 0x1000
+	IFF_LINK1                      = 0x2000
+	IFF_LINK2                      = 0x4000
+	IFF_LOOPBACK                   = 0x8
+	IFF_MONITOR                    = 0x40000
+	IFF_MULTICAST                  = 0x8000
+	IFF_NOARP                      = 0x80
+	IFF_OACTIVE                    = 0x400
+	IFF_POINTOPOINT                = 0x10
+	IFF_PPROMISC                   = 0x20000
+	IFF_PROMISC                    = 0x100
+	IFF_RENAMING                   = 0x400000
+	IFF_RUNNING                    = 0x40
+	IFF_SIMPLEX                    = 0x800
+	IFF_STATICARP                  = 0x80000
+	IFF_UP                         = 0x1
+	IFNAMSIZ                       = 0x10
+	IFT_BRIDGE                     = 0xd1
+	IFT_CARP                       = 0xf8
+	IFT_IEEE1394                   = 0x90
+	IFT_INFINIBAND                 = 0xc7
+	IFT_L2VLAN                     = 0x87
+	IFT_L3IPVLAN                   = 0x88
+	IFT_PPP                        = 0x17
+	IFT_PROPVIRTUAL                = 0x35
+	IGNBRK                         = 0x1
+	IGNCR                          = 0x80
+	IGNPAR                         = 0x4
+	IMAXBEL                        = 0x2000
+	INLCR                          = 0x40
+	INPCK                          = 0x10
+	IN_CLASSA_HOST                 = 0xffffff
+	IN_CLASSA_MAX                  = 0x80
+	IN_CLASSA_NET                  = 0xff000000
+	IN_CLASSA_NSHIFT               = 0x18
+	IN_CLASSB_HOST                 = 0xffff
+	IN_CLASSB_MAX                  = 0x10000
+	IN_CLASSB_NET                  = 0xffff0000
+	IN_CLASSB_NSHIFT               = 0x10
+	IN_CLASSC_HOST                 = 0xff
+	IN_CLASSC_NET                  = 0xffffff00
+	IN_CLASSC_NSHIFT               = 0x8
+	IN_CLASSD_HOST                 = 0xfffffff
+	IN_CLASSD_NET                  = 0xf0000000
+	IN_CLASSD_NSHIFT               = 0x1c
+	IN_LOOPBACKNET                 = 0x7f
+	IN_RFC3021_MASK                = 0xfffffffe
+	IPPROTO_3PC                    = 0x22
+	IPPROTO_ADFS                   = 0x44
+	IPPROTO_AH                     = 0x33
+	IPPROTO_AHIP                   = 0x3d
+	IPPROTO_APES                   = 0x63
+	IPPROTO_ARGUS                  = 0xd
+	IPPROTO_AX25                   = 0x5d
+	IPPROTO_BHA                    = 0x31
+	IPPROTO_BLT                    = 0x1e
+	IPPROTO_BRSATMON               = 0x4c
+	IPPROTO_CARP                   = 0x70
+	IPPROTO_CFTP                   = 0x3e
+	IPPROTO_CHAOS                  = 0x10
+	IPPROTO_CMTP                   = 0x26
+	IPPROTO_CPHB                   = 0x49
+	IPPROTO_CPNX                   = 0x48
+	IPPROTO_DDP                    = 0x25
+	IPPROTO_DGP                    = 0x56
+	IPPROTO_DIVERT                 = 0x102
+	IPPROTO_DONE                   = 0x101
+	IPPROTO_DSTOPTS                = 0x3c
+	IPPROTO_EGP                    = 0x8
+	IPPROTO_EMCON                  = 0xe
+	IPPROTO_ENCAP                  = 0x62
+	IPPROTO_EON                    = 0x50
+	IPPROTO_ESP                    = 0x32
+	IPPROTO_ETHERIP                = 0x61
+	IPPROTO_FRAGMENT               = 0x2c
+	IPPROTO_GGP                    = 0x3
+	IPPROTO_GMTP                   = 0x64
+	IPPROTO_GRE                    = 0x2f
+	IPPROTO_HELLO                  = 0x3f
+	IPPROTO_HIP                    = 0x8b
+	IPPROTO_HMP                    = 0x14
+	IPPROTO_HOPOPTS                = 0x0
+	IPPROTO_ICMP                   = 0x1
+	IPPROTO_ICMPV6                 = 0x3a
+	IPPROTO_IDP                    = 0x16
+	IPPROTO_IDPR                   = 0x23
+	IPPROTO_IDRP                   = 0x2d
+	IPPROTO_IGMP                   = 0x2
+	IPPROTO_IGP                    = 0x55
+	IPPROTO_IGRP                   = 0x58
+	IPPROTO_IL                     = 0x28
+	IPPROTO_INLSP                  = 0x34
+	IPPROTO_INP                    = 0x20
+	IPPROTO_IP                     = 0x0
+	IPPROTO_IPCOMP                 = 0x6c
+	IPPROTO_IPCV                   = 0x47
+	IPPROTO_IPEIP                  = 0x5e
+	IPPROTO_IPIP                   = 0x4
+	IPPROTO_IPPC                   = 0x43
+	IPPROTO_IPV4                   = 0x4
+	IPPROTO_IPV6                   = 0x29
+	IPPROTO_IRTP                   = 0x1c
+	IPPROTO_KRYPTOLAN              = 0x41
+	IPPROTO_LARP                   = 0x5b
+	IPPROTO_LEAF1                  = 0x19
+	IPPROTO_LEAF2                  = 0x1a
+	IPPROTO_MAX                    = 0x100
+	IPPROTO_MEAS                   = 0x13
+	IPPROTO_MH                     = 0x87
+	IPPROTO_MHRP                   = 0x30
+	IPPROTO_MICP                   = 0x5f
+	IPPROTO_MOBILE                 = 0x37
+	IPPROTO_MPLS                   = 0x89
+	IPPROTO_MTP                    = 0x5c
+	IPPROTO_MUX                    = 0x12
+	IPPROTO_ND                     = 0x4d
+	IPPROTO_NHRP                   = 0x36
+	IPPROTO_NONE                   = 0x3b
+	IPPROTO_NSP                    = 0x1f
+	IPPROTO_NVPII                  = 0xb
+	IPPROTO_OLD_DIVERT             = 0xfe
+	IPPROTO_OSPFIGP                = 0x59
+	IPPROTO_PFSYNC                 = 0xf0
+	IPPROTO_PGM                    = 0x71
+	IPPROTO_PIGP                   = 0x9
+	IPPROTO_PIM                    = 0x67
+	IPPROTO_PRM                    = 0x15
+	IPPROTO_PUP                    = 0xc
+	IPPROTO_PVP                    = 0x4b
+	IPPROTO_RAW                    = 0xff
+	IPPROTO_RCCMON                 = 0xa
+	IPPROTO_RDP                    = 0x1b
+	IPPROTO_RESERVED_253           = 0xfd
+	IPPROTO_RESERVED_254           = 0xfe
+	IPPROTO_ROUTING                = 0x2b
+	IPPROTO_RSVP                   = 0x2e
+	IPPROTO_RVD                    = 0x42
+	IPPROTO_SATEXPAK               = 0x40
+	IPPROTO_SATMON                 = 0x45
+	IPPROTO_SCCSP                  = 0x60
+	IPPROTO_SCTP                   = 0x84
+	IPPROTO_SDRP                   = 0x2a
+	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
+	IPPROTO_SHIM6                  = 0x8c
+	IPPROTO_SKIP                   = 0x39
+	IPPROTO_SPACER                 = 0x7fff
+	IPPROTO_SRPC                   = 0x5a
+	IPPROTO_ST                     = 0x7
+	IPPROTO_SVMTP                  = 0x52
+	IPPROTO_SWIPE                  = 0x35
+	IPPROTO_TCF                    = 0x57
+	IPPROTO_TCP                    = 0x6
+	IPPROTO_TLSP                   = 0x38
+	IPPROTO_TP                     = 0x1d
+	IPPROTO_TPXX                   = 0x27
+	IPPROTO_TRUNK1                 = 0x17
+	IPPROTO_TRUNK2                 = 0x18
+	IPPROTO_TTP                    = 0x54
+	IPPROTO_UDP                    = 0x11
+	IPPROTO_UDPLITE                = 0x88
+	IPPROTO_VINES                  = 0x53
+	IPPROTO_VISA                   = 0x46
+	IPPROTO_VMTP                   = 0x51
+	IPPROTO_WBEXPAK                = 0x4f
+	IPPROTO_WBMON                  = 0x4e
+	IPPROTO_WSN                    = 0x4a
+	IPPROTO_XNET                   = 0xf
+	IPPROTO_XTP                    = 0x24
+	IPV6_AUTOFLOWLABEL             = 0x3b
+	IPV6_BINDANY                   = 0x40
+	IPV6_BINDMULTI                 = 0x41
+	IPV6_BINDV6ONLY                = 0x1b
+	IPV6_CHECKSUM                  = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS    = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP    = 0x1
+	IPV6_DEFHLIM                   = 0x40
+	IPV6_DONTFRAG                  = 0x3e
+	IPV6_DSTOPTS                   = 0x32
+	IPV6_FLOWID                    = 0x43
+	IPV6_FLOWINFO_MASK             = 0xffffff0f
+	IPV6_FLOWLABEL_MASK            = 0xffff0f00
+	IPV6_FLOWTYPE                  = 0x44
+	IPV6_FRAGTTL                   = 0x78
+	IPV6_FW_ADD                    = 0x1e
+	IPV6_FW_DEL                    = 0x1f
+	IPV6_FW_FLUSH                  = 0x20
+	IPV6_FW_GET                    = 0x22
+	IPV6_FW_ZERO                   = 0x21
+	IPV6_HLIMDEC                   = 0x1
+	IPV6_HOPLIMIT                  = 0x2f
+	IPV6_HOPOPTS                   = 0x31
+	IPV6_IPSEC_POLICY              = 0x1c
+	IPV6_JOIN_GROUP                = 0xc
+	IPV6_LEAVE_GROUP               = 0xd
+	IPV6_MAXHLIM                   = 0xff
+	IPV6_MAXOPTHDR                 = 0x800
+	IPV6_MAXPACKET                 = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
+	IPV6_MAX_MEMBERSHIPS           = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
+	IPV6_MIN_MEMBERSHIPS           = 0x1f
+	IPV6_MMTU                      = 0x500
+	IPV6_MSFILTER                  = 0x4a
+	IPV6_MULTICAST_HOPS            = 0xa
+	IPV6_MULTICAST_IF              = 0x9
+	IPV6_MULTICAST_LOOP            = 0xb
+	IPV6_NEXTHOP                   = 0x30
+	IPV6_PATHMTU                   = 0x2c
+	IPV6_PKTINFO                   = 0x2e
+	IPV6_PORTRANGE                 = 0xe
+	IPV6_PORTRANGE_DEFAULT         = 0x0
+	IPV6_PORTRANGE_HIGH            = 0x1
+	IPV6_PORTRANGE_LOW             = 0x2
+	IPV6_PREFER_TEMPADDR           = 0x3f
+	IPV6_RECVDSTOPTS               = 0x28
+	IPV6_RECVFLOWID                = 0x46
+	IPV6_RECVHOPLIMIT              = 0x25
+	IPV6_RECVHOPOPTS               = 0x27
+	IPV6_RECVPATHMTU               = 0x2b
+	IPV6_RECVPKTINFO               = 0x24
+	IPV6_RECVRSSBUCKETID           = 0x47
+	IPV6_RECVRTHDR                 = 0x26
+	IPV6_RECVTCLASS                = 0x39
+	IPV6_RSSBUCKETID               = 0x45
+	IPV6_RSS_LISTEN_BUCKET         = 0x42
+	IPV6_RTHDR                     = 0x33
+	IPV6_RTHDRDSTOPTS              = 0x23
+	IPV6_RTHDR_LOOSE               = 0x0
+	IPV6_RTHDR_STRICT              = 0x1
+	IPV6_RTHDR_TYPE_0              = 0x0
+	IPV6_SOCKOPT_RESERVED1         = 0x3
+	IPV6_TCLASS                    = 0x3d
+	IPV6_UNICAST_HOPS              = 0x4
+	IPV6_USE_MIN_MTU               = 0x2a
+	IPV6_V6ONLY                    = 0x1b
+	IPV6_VERSION                   = 0x60
+	IPV6_VERSION_MASK              = 0xf0
+	IP_ADD_MEMBERSHIP              = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
+	IP_BINDANY                     = 0x18
+	IP_BINDMULTI                   = 0x19
+	IP_BLOCK_SOURCE                = 0x48
+	IP_DEFAULT_MULTICAST_LOOP      = 0x1
+	IP_DEFAULT_MULTICAST_TTL       = 0x1
+	IP_DF                          = 0x4000
+	IP_DONTFRAG                    = 0x43
+	IP_DROP_MEMBERSHIP             = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP      = 0x47
+	IP_DUMMYNET3                   = 0x31
+	IP_DUMMYNET_CONFIGURE          = 0x3c
+	IP_DUMMYNET_DEL                = 0x3d
+	IP_DUMMYNET_FLUSH              = 0x3e
+	IP_DUMMYNET_GET                = 0x40
+	IP_FLOWID                      = 0x5a
+	IP_FLOWTYPE                    = 0x5b
+	IP_FW3                         = 0x30
+	IP_FW_ADD                      = 0x32
+	IP_FW_DEL                      = 0x33
+	IP_FW_FLUSH                    = 0x34
+	IP_FW_GET                      = 0x36
+	IP_FW_NAT_CFG                  = 0x38
+	IP_FW_NAT_DEL                  = 0x39
+	IP_FW_NAT_GET_CONFIG           = 0x3a
+	IP_FW_NAT_GET_LOG              = 0x3b
+	IP_FW_RESETLOG                 = 0x37
+	IP_FW_TABLE_ADD                = 0x28
+	IP_FW_TABLE_DEL                = 0x29
+	IP_FW_TABLE_FLUSH              = 0x2a
+	IP_FW_TABLE_GETSIZE            = 0x2b
+	IP_FW_TABLE_LIST               = 0x2c
+	IP_FW_ZERO                     = 0x35
+	IP_HDRINCL                     = 0x2
+	IP_IPSEC_POLICY                = 0x15
+	IP_MAXPACKET                   = 0xffff
+	IP_MAX_GROUP_SRC_FILTER        = 0x200
+	IP_MAX_MEMBERSHIPS             = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER        = 0x80
+	IP_MAX_SOCK_SRC_FILTER         = 0x80
+	IP_MAX_SOURCE_FILTER           = 0x400
+	IP_MF                          = 0x2000
+	IP_MINTTL                      = 0x42
+	IP_MIN_MEMBERSHIPS             = 0x1f
+	IP_MSFILTER                    = 0x4a
+	IP_MSS                         = 0x240
+	IP_MULTICAST_IF                = 0x9
+	IP_MULTICAST_LOOP              = 0xb
+	IP_MULTICAST_TTL               = 0xa
+	IP_MULTICAST_VIF               = 0xe
+	IP_OFFMASK                     = 0x1fff
+	IP_ONESBCAST                   = 0x17
+	IP_OPTIONS                     = 0x1
+	IP_PORTRANGE                   = 0x13
+	IP_PORTRANGE_DEFAULT           = 0x0
+	IP_PORTRANGE_HIGH              = 0x1
+	IP_PORTRANGE_LOW               = 0x2
+	IP_RECVDSTADDR                 = 0x7
+	IP_RECVFLOWID                  = 0x5d
+	IP_RECVIF                      = 0x14
+	IP_RECVOPTS                    = 0x5
+	IP_RECVRETOPTS                 = 0x6
+	IP_RECVRSSBUCKETID             = 0x5e
+	IP_RECVTOS                     = 0x44
+	IP_RECVTTL                     = 0x41
+	IP_RETOPTS                     = 0x8
+	IP_RF                          = 0x8000
+	IP_RSSBUCKETID                 = 0x5c
+	IP_RSS_LISTEN_BUCKET           = 0x1a
+	IP_RSVP_OFF                    = 0x10
+	IP_RSVP_ON                     = 0xf
+	IP_RSVP_VIF_OFF                = 0x12
+	IP_RSVP_VIF_ON                 = 0x11
+	IP_SENDSRCADDR                 = 0x7
+	IP_TOS                         = 0x3
+	IP_TTL                         = 0x4
+	IP_UNBLOCK_SOURCE              = 0x49
+	ISIG                           = 0x80
+	ISTRIP                         = 0x20
+	IXANY                          = 0x800
+	IXOFF                          = 0x400
+	IXON                           = 0x200
+	KERN_HOSTNAME                  = 0xa
+	KERN_OSRELEASE                 = 0x2
+	KERN_OSTYPE                    = 0x1
+	KERN_VERSION                   = 0x4
+	LOCK_EX                        = 0x2
+	LOCK_NB                        = 0x4
+	LOCK_SH                        = 0x1
+	LOCK_UN                        = 0x8
+	MADV_AUTOSYNC                  = 0x7
+	MADV_CORE                      = 0x9
+	MADV_DONTNEED                  = 0x4
+	MADV_FREE                      = 0x5
+	MADV_NOCORE                    = 0x8
+	MADV_NORMAL                    = 0x0
+	MADV_NOSYNC                    = 0x6
+	MADV_PROTECT                   = 0xa
+	MADV_RANDOM                    = 0x1
+	MADV_SEQUENTIAL                = 0x2
+	MADV_WILLNEED                  = 0x3
+	MAP_ALIGNED_SUPER              = 0x1000000
+	MAP_ALIGNMENT_MASK             = -0x1000000
+	MAP_ALIGNMENT_SHIFT            = 0x18
+	MAP_ANON                       = 0x1000
+	MAP_ANONYMOUS                  = 0x1000
+	MAP_COPY                       = 0x2
+	MAP_EXCL                       = 0x4000
+	MAP_FILE                       = 0x0
+	MAP_FIXED                      = 0x10
+	MAP_GUARD                      = 0x2000
+	MAP_HASSEMAPHORE               = 0x200
+	MAP_NOCORE                     = 0x20000
+	MAP_NOSYNC                     = 0x800
+	MAP_PREFAULT_READ              = 0x40000
+	MAP_PRIVATE                    = 0x2
+	MAP_RESERVED0020               = 0x20
+	MAP_RESERVED0040               = 0x40
+	MAP_RESERVED0080               = 0x80
+	MAP_RESERVED0100               = 0x100
+	MAP_SHARED                     = 0x1
+	MAP_STACK                      = 0x400
+	MCL_CURRENT                    = 0x1
+	MCL_FUTURE                     = 0x2
+	MNT_ACLS                       = 0x8000000
+	MNT_ASYNC                      = 0x40
+	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_BYFSID                     = 0x8000000
+	MNT_CMDFLAGS                   = 0xd0f0000
+	MNT_DEFEXPORTED                = 0x200
+	MNT_DELEXPORT                  = 0x20000
+	MNT_EXKERB                     = 0x800
+	MNT_EXPORTANON                 = 0x400
+	MNT_EXPORTED                   = 0x100
+	MNT_EXPUBLIC                   = 0x20000000
+	MNT_EXRDONLY                   = 0x80
+	MNT_FORCE                      = 0x80000
+	MNT_GJOURNAL                   = 0x2000000
+	MNT_IGNORE                     = 0x800000
+	MNT_LAZY                       = 0x3
+	MNT_LOCAL                      = 0x1000
+	MNT_MULTILABEL                 = 0x4000000
+	MNT_NFS4ACLS                   = 0x10
+	MNT_NOATIME                    = 0x10000000
+	MNT_NOCLUSTERR                 = 0x40000000
+	MNT_NOCLUSTERW                 = 0x80000000
+	MNT_NOEXEC                     = 0x4
+	MNT_NONBUSY                    = 0x4000000
+	MNT_NOSUID                     = 0x8
+	MNT_NOSYMFOLLOW                = 0x400000
+	MNT_NOWAIT                     = 0x2
+	MNT_QUOTA                      = 0x2000
+	MNT_RDONLY                     = 0x1
+	MNT_RELOAD                     = 0x40000
+	MNT_ROOTFS                     = 0x4000
+	MNT_SNAPSHOT                   = 0x1000000
+	MNT_SOFTDEP                    = 0x200000
+	MNT_SUIDDIR                    = 0x100000
+	MNT_SUJ                        = 0x100000000
+	MNT_SUSPEND                    = 0x4
+	MNT_SYNCHRONOUS                = 0x2
+	MNT_UNION                      = 0x20
+	MNT_UPDATE                     = 0x10000
+	MNT_UPDATEMASK                 = 0x2d8d0807e
+	MNT_USER                       = 0x8000
+	MNT_VISFLAGMASK                = 0x3fef0ffff
+	MNT_WAIT                       = 0x1
+	MSG_CMSG_CLOEXEC               = 0x40000
+	MSG_COMPAT                     = 0x8000
+	MSG_CTRUNC                     = 0x20
+	MSG_DONTROUTE                  = 0x4
+	MSG_DONTWAIT                   = 0x80
+	MSG_EOF                        = 0x100
+	MSG_EOR                        = 0x8
+	MSG_NBIO                       = 0x4000
+	MSG_NOSIGNAL                   = 0x20000
+	MSG_NOTIFICATION               = 0x2000
+	MSG_OOB                        = 0x1
+	MSG_PEEK                       = 0x2
+	MSG_TRUNC                      = 0x10
+	MSG_WAITALL                    = 0x40
+	MSG_WAITFORONE                 = 0x80000
+	MS_ASYNC                       = 0x1
+	MS_INVALIDATE                  = 0x2
+	MS_SYNC                        = 0x0
+	NAME_MAX                       = 0xff
+	NET_RT_DUMP                    = 0x1
+	NET_RT_FLAGS                   = 0x2
+	NET_RT_IFLIST                  = 0x3
+	NET_RT_IFLISTL                 = 0x5
+	NET_RT_IFMALIST                = 0x4
+	NOFLSH                         = 0x80000000
+	NOKERNINFO                     = 0x2000000
+	NOTE_ATTRIB                    = 0x8
+	NOTE_CHILD                     = 0x4
+	NOTE_CLOSE                     = 0x100
+	NOTE_CLOSE_WRITE               = 0x200
+	NOTE_DELETE                    = 0x1
+	NOTE_EXEC                      = 0x20000000
+	NOTE_EXIT                      = 0x80000000
+	NOTE_EXTEND                    = 0x4
+	NOTE_FFAND                     = 0x40000000
+	NOTE_FFCOPY                    = 0xc0000000
+	NOTE_FFCTRLMASK                = 0xc0000000
+	NOTE_FFLAGSMASK                = 0xffffff
+	NOTE_FFNOP                     = 0x0
+	NOTE_FFOR                      = 0x80000000
+	NOTE_FILE_POLL                 = 0x2
+	NOTE_FORK                      = 0x40000000
+	NOTE_LINK                      = 0x10
+	NOTE_LOWAT                     = 0x1
+	NOTE_MSECONDS                  = 0x2
+	NOTE_NSECONDS                  = 0x8
+	NOTE_OPEN                      = 0x80
+	NOTE_PCTRLMASK                 = 0xf0000000
+	NOTE_PDATAMASK                 = 0xfffff
+	NOTE_READ                      = 0x400
+	NOTE_RENAME                    = 0x20
+	NOTE_REVOKE                    = 0x40
+	NOTE_SECONDS                   = 0x1
+	NOTE_TRACK                     = 0x1
+	NOTE_TRACKERR                  = 0x2
+	NOTE_TRIGGER                   = 0x1000000
+	NOTE_USECONDS                  = 0x4
+	NOTE_WRITE                     = 0x2
+	OCRNL                          = 0x10
+	ONLCR                          = 0x2
+	ONLRET                         = 0x40
+	ONOCR                          = 0x20
+	ONOEOT                         = 0x8
+	OPOST                          = 0x1
+	OXTABS                         = 0x4
+	O_ACCMODE                      = 0x3
+	O_APPEND                       = 0x8
+	O_ASYNC                        = 0x40
+	O_CLOEXEC                      = 0x100000
+	O_CREAT                        = 0x200
+	O_DIRECT                       = 0x10000
+	O_DIRECTORY                    = 0x20000
+	O_EXCL                         = 0x800
+	O_EXEC                         = 0x40000
+	O_EXLOCK                       = 0x20
+	O_FSYNC                        = 0x80
+	O_NDELAY                       = 0x4
+	O_NOCTTY                       = 0x8000
+	O_NOFOLLOW                     = 0x100
+	O_NONBLOCK                     = 0x4
+	O_RDONLY                       = 0x0
+	O_RDWR                         = 0x2
+	O_SHLOCK                       = 0x10
+	O_SYNC                         = 0x80
+	O_TRUNC                        = 0x400
+	O_TTY_INIT                     = 0x80000
+	O_VERIFY                       = 0x200000
+	O_WRONLY                       = 0x1
+	PARENB                         = 0x1000
+	PARMRK                         = 0x8
+	PARODD                         = 0x2000
+	PENDIN                         = 0x20000000
+	PRIO_PGRP                      = 0x1
+	PRIO_PROCESS                   = 0x0
+	PRIO_USER                      = 0x2
+	PROT_EXEC                      = 0x4
+	PROT_NONE                      = 0x0
+	PROT_READ                      = 0x1
+	PROT_WRITE                     = 0x2
+	RLIMIT_AS                      = 0xa
+	RLIMIT_CORE                    = 0x4
+	RLIMIT_CPU                     = 0x0
+	RLIMIT_DATA                    = 0x2
+	RLIMIT_FSIZE                   = 0x1
+	RLIMIT_MEMLOCK                 = 0x6
+	RLIMIT_NOFILE                  = 0x8
+	RLIMIT_NPROC                   = 0x7
+	RLIMIT_RSS                     = 0x5
+	RLIMIT_STACK                   = 0x3
+	RLIM_INFINITY                  = 0x7fffffffffffffff
+	RTAX_AUTHOR                    = 0x6
+	RTAX_BRD                       = 0x7
+	RTAX_DST                       = 0x0
+	RTAX_GATEWAY                   = 0x1
+	RTAX_GENMASK                   = 0x3
+	RTAX_IFA                       = 0x5
+	RTAX_IFP                       = 0x4
+	RTAX_MAX                       = 0x8
+	RTAX_NETMASK                   = 0x2
+	RTA_AUTHOR                     = 0x40
+	RTA_BRD                        = 0x80
+	RTA_DST                        = 0x1
+	RTA_GATEWAY                    = 0x2
+	RTA_GENMASK                    = 0x8
+	RTA_IFA                        = 0x20
+	RTA_IFP                        = 0x10
+	RTA_NETMASK                    = 0x4
+	RTF_BLACKHOLE                  = 0x1000
+	RTF_BROADCAST                  = 0x400000
+	RTF_DONE                       = 0x40
+	RTF_DYNAMIC                    = 0x10
+	RTF_FIXEDMTU                   = 0x80000
+	RTF_FMASK                      = 0x1004d808
+	RTF_GATEWAY                    = 0x2
+	RTF_GWFLAG_COMPAT              = 0x80000000
+	RTF_HOST                       = 0x4
+	RTF_LLDATA                     = 0x400
+	RTF_LLINFO                     = 0x400
+	RTF_LOCAL                      = 0x200000
+	RTF_MODIFIED                   = 0x20
+	RTF_MULTICAST                  = 0x800000
+	RTF_PINNED                     = 0x100000
+	RTF_PROTO1                     = 0x8000
+	RTF_PROTO2                     = 0x4000
+	RTF_PROTO3                     = 0x40000
+	RTF_REJECT                     = 0x8
+	RTF_RNH_LOCKED                 = 0x40000000
+	RTF_STATIC                     = 0x800
+	RTF_STICKY                     = 0x10000000
+	RTF_UP                         = 0x1
+	RTF_XRESOLVE                   = 0x200
+	RTM_ADD                        = 0x1
+	RTM_CHANGE                     = 0x3
+	RTM_DELADDR                    = 0xd
+	RTM_DELETE                     = 0x2
+	RTM_DELMADDR                   = 0x10
+	RTM_GET                        = 0x4
+	RTM_IEEE80211                  = 0x12
+	RTM_IFANNOUNCE                 = 0x11
+	RTM_IFINFO                     = 0xe
+	RTM_LOCK                       = 0x8
+	RTM_LOSING                     = 0x5
+	RTM_MISS                       = 0x7
+	RTM_NEWADDR                    = 0xc
+	RTM_NEWMADDR                   = 0xf
+	RTM_REDIRECT                   = 0x6
+	RTM_RESOLVE                    = 0xb
+	RTM_RTTUNIT                    = 0xf4240
+	RTM_VERSION                    = 0x5
+	RTV_EXPIRE                     = 0x4
+	RTV_HOPCOUNT                   = 0x2
+	RTV_MTU                        = 0x1
+	RTV_RPIPE                      = 0x8
+	RTV_RTT                        = 0x40
+	RTV_RTTVAR                     = 0x80
+	RTV_SPIPE                      = 0x10
+	RTV_SSTHRESH                   = 0x20
+	RTV_WEIGHT                     = 0x100
+	RT_ALL_FIBS                    = -0x1
+	RT_BLACKHOLE                   = 0x40
+	RT_CACHING_CONTEXT             = 0x1
+	RT_DEFAULT_FIB                 = 0x0
+	RT_HAS_GW                      = 0x80
+	RT_HAS_HEADER                  = 0x10
+	RT_HAS_HEADER_BIT              = 0x4
+	RT_L2_ME                       = 0x4
+	RT_L2_ME_BIT                   = 0x2
+	RT_LLE_CACHE                   = 0x100
+	RT_MAY_LOOP                    = 0x8
+	RT_MAY_LOOP_BIT                = 0x3
+	RT_NORTREF                     = 0x2
+	RT_REJECT                      = 0x20
+	RUSAGE_CHILDREN                = -0x1
+	RUSAGE_SELF                    = 0x0
+	RUSAGE_THREAD                  = 0x1
+	SCM_BINTIME                    = 0x4
+	SCM_CREDS                      = 0x3
+	SCM_RIGHTS                     = 0x1
+	SCM_TIMESTAMP                  = 0x2
+	SHUT_RD                        = 0x0
+	SHUT_RDWR                      = 0x2
+	SHUT_WR                        = 0x1
+	SIOCADDMULTI                   = 0x80206931
+	SIOCAIFADDR                    = 0x8040691a
+	SIOCAIFGROUP                   = 0x80246987
+	SIOCATMARK                     = 0x40047307
+	SIOCDELMULTI                   = 0x80206932
+	SIOCDIFADDR                    = 0x80206919
+	SIOCDIFGROUP                   = 0x80246989
+	SIOCDIFPHYADDR                 = 0x80206949
+	SIOCGDRVSPEC                   = 0xc01c697b
+	SIOCGETSGCNT                   = 0xc0147210
+	SIOCGETVIFCNT                  = 0xc014720f
+	SIOCGHIWAT                     = 0x40047301
+	SIOCGHWADDR                    = 0xc020693e
+	SIOCGI2C                       = 0xc020693d
+	SIOCGIFADDR                    = 0xc0206921
+	SIOCGIFBRDADDR                 = 0xc0206923
+	SIOCGIFCAP                     = 0xc020691f
+	SIOCGIFCONF                    = 0xc0086924
+	SIOCGIFDESCR                   = 0xc020692a
+	SIOCGIFDSTADDR                 = 0xc0206922
+	SIOCGIFFIB                     = 0xc020695c
+	SIOCGIFFLAGS                   = 0xc0206911
+	SIOCGIFGENERIC                 = 0xc020693a
+	SIOCGIFGMEMB                   = 0xc024698a
+	SIOCGIFGROUP                   = 0xc0246988
+	SIOCGIFINDEX                   = 0xc0206920
+	SIOCGIFMAC                     = 0xc0206926
+	SIOCGIFMEDIA                   = 0xc0286938
+	SIOCGIFMETRIC                  = 0xc0206917
+	SIOCGIFMTU                     = 0xc0206933
+	SIOCGIFNETMASK                 = 0xc0206925
+	SIOCGIFPDSTADDR                = 0xc0206948
+	SIOCGIFPHYS                    = 0xc0206935
+	SIOCGIFPSRCADDR                = 0xc0206947
+	SIOCGIFSTATUS                  = 0xc331693b
+	SIOCGIFXMEDIA                  = 0xc028698b
+	SIOCGLOWAT                     = 0x40047303
+	SIOCGPGRP                      = 0x40047309
+	SIOCGPRIVATE_0                 = 0xc0206950
+	SIOCGPRIVATE_1                 = 0xc0206951
+	SIOCGTUNFIB                    = 0xc020695e
+	SIOCIFCREATE                   = 0xc020697a
+	SIOCIFCREATE2                  = 0xc020697c
+	SIOCIFDESTROY                  = 0x80206979
+	SIOCIFGCLONERS                 = 0xc00c6978
+	SIOCSDRVSPEC                   = 0x801c697b
+	SIOCSHIWAT                     = 0x80047300
+	SIOCSIFADDR                    = 0x8020690c
+	SIOCSIFBRDADDR                 = 0x80206913
+	SIOCSIFCAP                     = 0x8020691e
+	SIOCSIFDESCR                   = 0x80206929
+	SIOCSIFDSTADDR                 = 0x8020690e
+	SIOCSIFFIB                     = 0x8020695d
+	SIOCSIFFLAGS                   = 0x80206910
+	SIOCSIFGENERIC                 = 0x80206939
+	SIOCSIFLLADDR                  = 0x8020693c
+	SIOCSIFMAC                     = 0x80206927
+	SIOCSIFMEDIA                   = 0xc0206937
+	SIOCSIFMETRIC                  = 0x80206918
+	SIOCSIFMTU                     = 0x80206934
+	SIOCSIFNAME                    = 0x80206928
+	SIOCSIFNETMASK                 = 0x80206916
+	SIOCSIFPHYADDR                 = 0x80406946
+	SIOCSIFPHYS                    = 0x80206936
+	SIOCSIFRVNET                   = 0xc020695b
+	SIOCSIFVNET                    = 0xc020695a
+	SIOCSLOWAT                     = 0x80047302
+	SIOCSPGRP                      = 0x80047308
+	SIOCSTUNFIB                    = 0x8020695f
+	SOCK_CLOEXEC                   = 0x10000000
+	SOCK_DGRAM                     = 0x2
+	SOCK_MAXADDRLEN                = 0xff
+	SOCK_NONBLOCK                  = 0x20000000
+	SOCK_RAW                       = 0x3
+	SOCK_RDM                       = 0x4
+	SOCK_SEQPACKET                 = 0x5
+	SOCK_STREAM                    = 0x1
+	SOL_SOCKET                     = 0xffff
+	SOMAXCONN                      = 0x80
+	SO_ACCEPTCONN                  = 0x2
+	SO_ACCEPTFILTER                = 0x1000
+	SO_BINTIME                     = 0x2000
+	SO_BROADCAST                   = 0x20
+	SO_DEBUG                       = 0x1
+	SO_DONTROUTE                   = 0x10
+	SO_ERROR                       = 0x1007
+	SO_KEEPALIVE                   = 0x8
+	SO_LABEL                       = 0x1009
+	SO_LINGER                      = 0x80
+	SO_LISTENINCQLEN               = 0x1013
+	SO_LISTENQLEN                  = 0x1012
+	SO_LISTENQLIMIT                = 0x1011
+	SO_NOSIGPIPE                   = 0x800
+	SO_NO_DDP                      = 0x8000
+	SO_NO_OFFLOAD                  = 0x4000
+	SO_OOBINLINE                   = 0x100
+	SO_PEERLABEL                   = 0x1010
+	SO_PROTOCOL                    = 0x1016
+	SO_PROTOTYPE                   = 0x1016
+	SO_RCVBUF                      = 0x1002
+	SO_RCVLOWAT                    = 0x1004
+	SO_RCVTIMEO                    = 0x1006
+	SO_REUSEADDR                   = 0x4
+	SO_REUSEPORT                   = 0x200
+	SO_SETFIB                      = 0x1014
+	SO_SNDBUF                      = 0x1001
+	SO_SNDLOWAT                    = 0x1003
+	SO_SNDTIMEO                    = 0x1005
+	SO_TIMESTAMP                   = 0x400
+	SO_TYPE                        = 0x1008
+	SO_USELOOPBACK                 = 0x40
+	SO_USER_COOKIE                 = 0x1015
+	SO_VENDOR                      = 0x80000000
+	TAB0                           = 0x0
+	TAB3                           = 0x4
+	TABDLY                         = 0x4
+	TCIFLUSH                       = 0x1
+	TCIOFF                         = 0x3
+	TCIOFLUSH                      = 0x3
+	TCION                          = 0x4
+	TCOFLUSH                       = 0x2
+	TCOOFF                         = 0x1
+	TCOON                          = 0x2
+	TCP_CA_NAME_MAX                = 0x10
+	TCP_CCALGOOPT                  = 0x41
+	TCP_CONGESTION                 = 0x40
+	TCP_FASTOPEN                   = 0x401
+	TCP_FUNCTION_BLK               = 0x2000
+	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
+	TCP_INFO                       = 0x20
+	TCP_KEEPCNT                    = 0x400
+	TCP_KEEPIDLE                   = 0x100
+	TCP_KEEPINIT                   = 0x80
+	TCP_KEEPINTVL                  = 0x200
+	TCP_MAXBURST                   = 0x4
+	TCP_MAXHLEN                    = 0x3c
+	TCP_MAXOLEN                    = 0x28
+	TCP_MAXSEG                     = 0x2
+	TCP_MAXWIN                     = 0xffff
+	TCP_MAX_SACK                   = 0x4
+	TCP_MAX_WINSHIFT               = 0xe
+	TCP_MD5SIG                     = 0x10
+	TCP_MINMSS                     = 0xd8
+	TCP_MSS                        = 0x218
+	TCP_NODELAY                    = 0x1
+	TCP_NOOPT                      = 0x8
+	TCP_NOPUSH                     = 0x4
+	TCP_PCAP_IN                    = 0x1000
+	TCP_PCAP_OUT                   = 0x800
+	TCP_VENDOR                     = 0x80000000
+	TCSAFLUSH                      = 0x2
+	TIOCCBRK                       = 0x2000747a
+	TIOCCDTR                       = 0x20007478
+	TIOCCONS                       = 0x80047462
+	TIOCDRAIN                      = 0x2000745e
+	TIOCEXCL                       = 0x2000740d
+	TIOCEXT                        = 0x80047460
+	TIOCFLUSH                      = 0x80047410
+	TIOCGDRAINWAIT                 = 0x40047456
+	TIOCGETA                       = 0x402c7413
+	TIOCGETD                       = 0x4004741a
+	TIOCGPGRP                      = 0x40047477
+	TIOCGPTN                       = 0x4004740f
+	TIOCGSID                       = 0x40047463
+	TIOCGWINSZ                     = 0x40087468
+	TIOCMBIC                       = 0x8004746b
+	TIOCMBIS                       = 0x8004746c
+	TIOCMGDTRWAIT                  = 0x4004745a
+	TIOCMGET                       = 0x4004746a
+	TIOCMSDTRWAIT                  = 0x8004745b
+	TIOCMSET                       = 0x8004746d
+	TIOCM_CAR                      = 0x40
+	TIOCM_CD                       = 0x40
+	TIOCM_CTS                      = 0x20
+	TIOCM_DCD                      = 0x40
+	TIOCM_DSR                      = 0x100
+	TIOCM_DTR                      = 0x2
+	TIOCM_LE                       = 0x1
+	TIOCM_RI                       = 0x80
+	TIOCM_RNG                      = 0x80
+	TIOCM_RTS                      = 0x4
+	TIOCM_SR                       = 0x10
+	TIOCM_ST                       = 0x8
+	TIOCNOTTY                      = 0x20007471
+	TIOCNXCL                       = 0x2000740e
+	TIOCOUTQ                       = 0x40047473
+	TIOCPKT                        = 0x80047470
+	TIOCPKT_DATA                   = 0x0
+	TIOCPKT_DOSTOP                 = 0x20
+	TIOCPKT_FLUSHREAD              = 0x1
+	TIOCPKT_FLUSHWRITE             = 0x2
+	TIOCPKT_IOCTL                  = 0x40
+	TIOCPKT_NOSTOP                 = 0x10
+	TIOCPKT_START                  = 0x8
+	TIOCPKT_STOP                   = 0x4
+	TIOCPTMASTER                   = 0x2000741c
+	TIOCSBRK                       = 0x2000747b
+	TIOCSCTTY                      = 0x20007461
+	TIOCSDRAINWAIT                 = 0x80047457
+	TIOCSDTR                       = 0x20007479
+	TIOCSETA                       = 0x802c7414
+	TIOCSETAF                      = 0x802c7416
+	TIOCSETAW                      = 0x802c7415
+	TIOCSETD                       = 0x8004741b
+	TIOCSIG                        = 0x2004745f
+	TIOCSPGRP                      = 0x80047476
+	TIOCSTART                      = 0x2000746e
+	TIOCSTAT                       = 0x20007465
+	TIOCSTI                        = 0x80017472
+	TIOCSTOP                       = 0x2000746f
+	TIOCSWINSZ                     = 0x80087467
+	TIOCTIMESTAMP                  = 0x40107459
+	TIOCUCNTL                      = 0x80047466
+	TOSTOP                         = 0x400000
+	VDISCARD                       = 0xf
+	VDSUSP                         = 0xb
+	VEOF                           = 0x0
+	VEOL                           = 0x1
+	VEOL2                          = 0x2
+	VERASE                         = 0x3
+	VERASE2                        = 0x7
+	VINTR                          = 0x8
+	VKILL                          = 0x5
+	VLNEXT                         = 0xe
+	VMIN                           = 0x10
+	VQUIT                          = 0x9
+	VREPRINT                       = 0x6
+	VSTART                         = 0xc
+	VSTATUS                        = 0x12
+	VSTOP                          = 0xd
+	VSUSP                          = 0xa
+	VTIME                          = 0x11
+	VWERASE                        = 0x4
+	WCONTINUED                     = 0x4
+	WCOREFLAG                      = 0x80
+	WEXITED                        = 0x10
+	WLINUXCLONE                    = 0x80000000
+	WNOHANG                        = 0x1
+	WNOWAIT                        = 0x8
+	WSTOPPED                       = 0x2
+	WTRAPPED                       = 0x20
+	WUNTRACED                      = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x59)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x55)
+	ECAPMODE        = syscall.Errno(0x5e)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOOFUS         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x56)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5a)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x57)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCAPABLE     = syscall.Errno(0x5d)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x5f)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x60)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5c)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGLIBRT  = syscall.Signal(0x21)
+	SIGLWP    = syscall.Signal(0x20)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "ECANCELED", "operation canceled"},
+	{86, "EILSEQ", "illegal byte sequence"},
+	{87, "ENOATTR", "attribute not found"},
+	{88, "EDOOFUS", "programming error"},
+	{89, "EBADMSG", "bad message"},
+	{90, "EMULTIHOP", "multihop attempted"},
+	{91, "ENOLINK", "link has been severed"},
+	{92, "EPROTO", "protocol error"},
+	{93, "ENOTCAPABLE", "capabilities insufficient"},
+	{94, "ECAPMODE", "not permitted in capability mode"},
+	{95, "ENOTRECOVERABLE", "state not recoverable"},
+	{96, "EOWNERDEAD", "previous owner died"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "unknown signal"},
+	{33, "SIGLIBRT", "unknown signal"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
new file mode 100644
index 00000000..34c9590c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -0,0 +1,2620 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -m32
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80041270
+	BLKBSZSET                            = 0x40041271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80041272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FP_XSTATE_MAGIC2                     = 0x46505845
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0xc
+	F_GETLK64                            = 0xc
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0xd
+	F_SETLK64                            = 0xd
+	F_SETLKW                             = 0xe
+	F_SETLKW64                           = 0xe
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_32BIT                            = 0x40
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x20000
+	MAP_SYNC                             = 0x80000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x4000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x8000
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80042407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x4004240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc004240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40042406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETFPXREGS                    = 0x12
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETFPXREGS                    = 0x13
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SINGLEBLOCK                   = 0x21
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_SYSEMU                        = 0x1f
+	PTRACE_SYSEMU_SINGLESTEP             = 0x20
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x7002
+	RTC_AIE_ON                           = 0x7001
+	RTC_ALM_READ                         = 0x80247008
+	RTC_ALM_SET                          = 0x40247007
+	RTC_EPOCH_READ                       = 0x8004700d
+	RTC_EPOCH_SET                        = 0x4004700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x8004700b
+	RTC_IRQP_SET                         = 0x4004700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x7006
+	RTC_PIE_ON                           = 0x7005
+	RTC_PLL_GET                          = 0x801c7011
+	RTC_PLL_SET                          = 0x401c7012
+	RTC_RD_TIME                          = 0x80247009
+	RTC_SET_TIME                         = 0x4024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x7004
+	RTC_UIE_ON                           = 0x7003
+	RTC_VL_CLR                           = 0x7014
+	RTC_VL_READ                          = 0x80047013
+	RTC_WIE_OFF                          = 0x7010
+	RTC_WIE_ON                           = 0x700f
+	RTC_WKALM_RD                         = 0x80287010
+	RTC_WKALM_SET                        = 0x4028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x400854d5
+	TUNDETACHFILTER                      = 0x400854d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x800854db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x20
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	X86_FXSR_MAGIC                       = 0x0
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
new file mode 100644
index 00000000..22d9527d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -0,0 +1,2620 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80081270
+	BLKBSZSET                            = 0x40081271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80081272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FP_XSTATE_MAGIC2                     = 0x46505845
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0x5
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_32BIT                            = 0x40
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x20000
+	MAP_SYNC                             = 0x80000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x4000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80082407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x4008240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ARCH_PRCTL                    = 0x1e
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETFPXREGS                    = 0x12
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETFPXREGS                    = 0x13
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SINGLEBLOCK                   = 0x21
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_SYSEMU                        = 0x1f
+	PTRACE_SYSEMU_SINGLESTEP             = 0x20
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x7002
+	RTC_AIE_ON                           = 0x7001
+	RTC_ALM_READ                         = 0x80247008
+	RTC_ALM_SET                          = 0x40247007
+	RTC_EPOCH_READ                       = 0x8008700d
+	RTC_EPOCH_SET                        = 0x4008700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x8008700b
+	RTC_IRQP_SET                         = 0x4008700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x7006
+	RTC_PIE_ON                           = 0x7005
+	RTC_PLL_GET                          = 0x80207011
+	RTC_PLL_SET                          = 0x40207012
+	RTC_RD_TIME                          = 0x80247009
+	RTC_SET_TIME                         = 0x4024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x7004
+	RTC_UIE_ON                           = 0x7003
+	RTC_VL_CLR                           = 0x7014
+	RTC_VL_READ                          = 0x80047013
+	RTC_WIE_OFF                          = 0x7010
+	RTC_WIE_ON                           = 0x700f
+	RTC_WKALM_RD                         = 0x80287010
+	RTC_WKALM_SET                        = 0x4028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x401054d5
+	TUNDETACHFILTER                      = 0x401054d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x801054db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
new file mode 100644
index 00000000..0deac0b3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -0,0 +1,2626 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80041270
+	BLKBSZSET                            = 0x40041271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80041272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0xc
+	F_GETLK64                            = 0xc
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0xd
+	F_SETLK64                            = 0xd
+	F_SETLKW                             = 0xe
+	F_SETLKW64                           = 0xe
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x20000
+	MAP_SYNC                             = 0x80000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x10000
+	O_DIRECTORY                          = 0x4000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x20000
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x8000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x404000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80042407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x4004240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc004240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40042406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETCRUNCHREGS                 = 0x19
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFDPIC                      = 0x1f
+	PTRACE_GETFDPIC_EXEC                 = 0x0
+	PTRACE_GETFDPIC_INTERP               = 0x1
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETHBPREGS                    = 0x1d
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GETVFPREGS                    = 0x1b
+	PTRACE_GETWMMXREGS                   = 0x12
+	PTRACE_GET_THREAD_AREA               = 0x16
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETCRUNCHREGS                 = 0x1a
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETHBPREGS                    = 0x1e
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SETVFPREGS                    = 0x1c
+	PTRACE_SETWMMXREGS                   = 0x13
+	PTRACE_SET_SYSCALL                   = 0x17
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	PT_DATA_ADDR                         = 0x10004
+	PT_TEXT_ADDR                         = 0x10000
+	PT_TEXT_END_ADDR                     = 0x10008
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x7002
+	RTC_AIE_ON                           = 0x7001
+	RTC_ALM_READ                         = 0x80247008
+	RTC_ALM_SET                          = 0x40247007
+	RTC_EPOCH_READ                       = 0x8004700d
+	RTC_EPOCH_SET                        = 0x4004700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x8004700b
+	RTC_IRQP_SET                         = 0x4004700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x7006
+	RTC_PIE_ON                           = 0x7005
+	RTC_PLL_GET                          = 0x801c7011
+	RTC_PLL_SET                          = 0x401c7012
+	RTC_RD_TIME                          = 0x80247009
+	RTC_SET_TIME                         = 0x4024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x7004
+	RTC_UIE_ON                           = 0x7003
+	RTC_VL_CLR                           = 0x7014
+	RTC_VL_READ                          = 0x80047013
+	RTC_WIE_OFF                          = 0x7010
+	RTC_WIE_ON                           = 0x700f
+	RTC_WKALM_RD                         = 0x80287010
+	RTC_WKALM_SET                        = 0x4028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x400854d5
+	TUNDETACHFILTER                      = 0x400854d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x800854db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x20
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
new file mode 100644
index 00000000..3c391769
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -0,0 +1,2611 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm64,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80081270
+	BLKBSZSET                            = 0x40081271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80081272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ESR_MAGIC                            = 0x45535201
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	EXTRA_MAGIC                          = 0x45585401
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FPSIMD_MAGIC                         = 0x46508001
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0x5
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x20000
+	MAP_SYNC                             = 0x80000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x10000
+	O_DIRECTORY                          = 0x4000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x8000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x404000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80082407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x4008240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x7002
+	RTC_AIE_ON                           = 0x7001
+	RTC_ALM_READ                         = 0x80247008
+	RTC_ALM_SET                          = 0x40247007
+	RTC_EPOCH_READ                       = 0x8008700d
+	RTC_EPOCH_SET                        = 0x4008700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x8008700b
+	RTC_IRQP_SET                         = 0x4008700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x7006
+	RTC_PIE_ON                           = 0x7005
+	RTC_PLL_GET                          = 0x80207011
+	RTC_PLL_SET                          = 0x40207012
+	RTC_RD_TIME                          = 0x80247009
+	RTC_SET_TIME                         = 0x4024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x7004
+	RTC_UIE_ON                           = 0x7003
+	RTC_VL_CLR                           = 0x7014
+	RTC_VL_READ                          = 0x80047013
+	RTC_WIE_OFF                          = 0x7010
+	RTC_WIE_ON                           = 0x700f
+	RTC_WKALM_RD                         = 0x80287010
+	RTC_WKALM_SET                        = 0x4028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SVE_MAGIC                            = 0x53564501
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x401054d5
+	TUNDETACHFILTER                      = 0x401054d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x801054db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
new file mode 100644
index 00000000..c17a0d0f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -0,0 +1,2627 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40041270
+	BLKBSZSET                            = 0x80041271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40041272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x80
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x2000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x21
+	F_GETLK64                            = 0x21
+	F_GETOWN                             = 0x17
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x22
+	F_SETLK64                            = 0x22
+	F_SETLKW                             = 0x23
+	F_SETLKW64                           = 0x23
+	F_SETOWN                             = 0x18
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x100
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x80
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x800
+	MAP_ANONYMOUS                        = 0x800
+	MAP_DENYWRITE                        = 0x2000
+	MAP_EXECUTABLE                       = 0x4000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x1000
+	MAP_HUGETLB                          = 0x80000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x8000
+	MAP_NONBLOCK                         = 0x20000
+	MAP_NORESERVE                        = 0x400
+	MAP_POPULATE                         = 0x10000
+	MAP_PRIVATE                          = 0x2
+	MAP_RENAME                           = 0x800
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x40000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x8
+	O_ASYNC                              = 0x1000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x100
+	O_DIRECT                             = 0x8000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x10
+	O_EXCL                               = 0x400
+	O_FSYNC                              = 0x4010
+	O_LARGEFILE                          = 0x2000
+	O_NDELAY                             = 0x80
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x800
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x80
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x4010
+	O_SYNC                               = 0x4010
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40042407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x8004240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc004240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80042406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_GET_THREAD_AREA_3264          = 0xc4
+	PTRACE_GET_WATCH_REGS                = 0xd0
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_3264                 = 0xc1
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_3264                 = 0xc0
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_3264                 = 0xc3
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_3264                 = 0xc2
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SET_WATCH_REGS                = 0xd1
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x6
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x9
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x5
+	RLIMIT_NPROC                         = 0x8
+	RLIMIT_RSS                           = 0x7
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x20007002
+	RTC_AIE_ON                           = 0x20007001
+	RTC_ALM_READ                         = 0x40247008
+	RTC_ALM_SET                          = 0x80247007
+	RTC_EPOCH_READ                       = 0x4004700d
+	RTC_EPOCH_SET                        = 0x8004700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x4004700b
+	RTC_IRQP_SET                         = 0x8004700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x20007006
+	RTC_PIE_ON                           = 0x20007005
+	RTC_PLL_GET                          = 0x401c7011
+	RTC_PLL_SET                          = 0x801c7012
+	RTC_RD_TIME                          = 0x40247009
+	RTC_SET_TIME                         = 0x8024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x20007004
+	RTC_UIE_ON                           = 0x20007003
+	RTC_VL_CLR                           = 0x20007014
+	RTC_VL_READ                          = 0x40047013
+	RTC_WIE_OFF                          = 0x20007010
+	RTC_WIE_ON                           = 0x2000700f
+	RTC_WKALM_RD                         = 0x40287010
+	RTC_WKALM_SET                        = 0x8028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x40047307
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x40047309
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x467f
+	SIOCOUTQ                             = 0x7472
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x80047308
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x1
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x80
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x2
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0xffff
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1009
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x20
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x1029
+	SO_DONTROUTE                         = 0x10
+	SO_ERROR                             = 0x1007
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x8
+	SO_LINGER                            = 0x80
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0x100
+	SO_PASSCRED                          = 0x11
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x12
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1e
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x1028
+	SO_RCVBUF                            = 0x1002
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x1004
+	SO_RCVTIMEO                          = 0x1006
+	SO_REUSEADDR                         = 0x4
+	SO_REUSEPORT                         = 0x200
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x1001
+	SO_SNDBUFFORCE                       = 0x1f
+	SO_SNDLOWAT                          = 0x1003
+	SO_SNDTIMEO                          = 0x1005
+	SO_STYLE                             = 0x1008
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x5407
+	TCGETA                               = 0x5401
+	TCGETS                               = 0x540d
+	TCGETS2                              = 0x4030542a
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x5410
+	TCSBRK                               = 0x5405
+	TCSBRKP                              = 0x5486
+	TCSETA                               = 0x5402
+	TCSETAF                              = 0x5404
+	TCSETAW                              = 0x5403
+	TCSETS                               = 0x540e
+	TCSETS2                              = 0x8030542b
+	TCSETSF                              = 0x5410
+	TCSETSF2                             = 0x8030542d
+	TCSETSW                              = 0x540f
+	TCSETSW2                             = 0x8030542c
+	TCXONC                               = 0x5406
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x80047478
+	TIOCEXCL                             = 0x740d
+	TIOCGDEV                             = 0x40045432
+	TIOCGETD                             = 0x7400
+	TIOCGETP                             = 0x7408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x5492
+	TIOCGLCKTRMIOS                       = 0x548b
+	TIOCGLTC                             = 0x7474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x4020542e
+	TIOCGSERIAL                          = 0x5484
+	TIOCGSID                             = 0x7416
+	TIOCGSOFTCAR                         = 0x5481
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x467f
+	TIOCLINUX                            = 0x5483
+	TIOCMBIC                             = 0x741c
+	TIOCMBIS                             = 0x741b
+	TIOCMGET                             = 0x741d
+	TIOCMIWAIT                           = 0x5491
+	TIOCMSET                             = 0x741a
+	TIOCM_CAR                            = 0x100
+	TIOCM_CD                             = 0x100
+	TIOCM_CTS                            = 0x40
+	TIOCM_DSR                            = 0x400
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x200
+	TIOCM_RNG                            = 0x200
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x20
+	TIOCM_ST                             = 0x10
+	TIOCNOTTY                            = 0x5471
+	TIOCNXCL                             = 0x740e
+	TIOCOUTQ                             = 0x7472
+	TIOCPKT                              = 0x5470
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x5480
+	TIOCSERCONFIG                        = 0x5488
+	TIOCSERGETLSR                        = 0x548e
+	TIOCSERGETMULTI                      = 0x548f
+	TIOCSERGSTRUCT                       = 0x548d
+	TIOCSERGWILD                         = 0x5489
+	TIOCSERSETMULTI                      = 0x5490
+	TIOCSERSWILD                         = 0x548a
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x7401
+	TIOCSETN                             = 0x740a
+	TIOCSETP                             = 0x7409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x548c
+	TIOCSLTC                             = 0x7475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0xc020542f
+	TIOCSSERIAL                          = 0x5485
+	TIOCSSOFTCAR                         = 0x5482
+	TIOCSTI                              = 0x5472
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x8000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x800854d5
+	TUNDETACHFILTER                      = 0x800854d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x400854db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x10
+	VEOL                                 = 0x11
+	VEOL2                                = 0x6
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x4
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VSWTCH                               = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x20
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x9e)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x46d)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EHWPOISON       = syscall.Errno(0xa8)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINIT           = syscall.Errno(0x8d)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x8b)
+	EKEYEXPIRED     = syscall.Errno(0xa2)
+	EKEYREJECTED    = syscall.Errno(0xa4)
+	EKEYREVOKED     = syscall.Errno(0xa3)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOOP           = syscall.Errno(0x5a)
+	EMEDIUMTYPE     = syscall.Errno(0xa0)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENAVAIL         = syscall.Errno(0x8a)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0xa1)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x9f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTNAM         = syscall.Errno(0x89)
+	ENOTRECOVERABLE = syscall.Errno(0xa6)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x7a)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0xa5)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMDEV         = syscall.Errno(0x8e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x8c)
+	ERESTART        = syscall.Errno(0x5b)
+	ERFKILL         = syscall.Errno(0xa7)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x87)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x12)
+	SIGCLD    = syscall.Signal(0x12)
+	SIGCONT   = syscall.Signal(0x19)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x16)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x16)
+	SIGPROF   = syscall.Signal(0x1d)
+	SIGPWR    = syscall.Signal(0x13)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x17)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x18)
+	SIGTTIN   = syscall.Signal(0x1a)
+	SIGTTOU   = syscall.Signal(0x1b)
+	SIGURG    = syscall.Signal(0x15)
+	SIGUSR1   = syscall.Signal(0x10)
+	SIGUSR2   = syscall.Signal(0x11)
+	SIGVTALRM = syscall.Signal(0x1c)
+	SIGWINCH  = syscall.Signal(0x14)
+	SIGXCPU   = syscall.Signal(0x1e)
+	SIGXFSZ   = syscall.Signal(0x1f)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "resource deadlock avoided"},
+	{46, "ENOLCK", "no locks available"},
+	{50, "EBADE", "invalid exchange"},
+	{51, "EBADR", "invalid request descriptor"},
+	{52, "EXFULL", "exchange full"},
+	{53, "ENOANO", "no anode"},
+	{54, "EBADRQC", "invalid request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "bad message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{87, "ELIBEXEC", "cannot exec a shared library directly"},
+	{88, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{89, "ENOSYS", "function not implemented"},
+	{90, "ELOOP", "too many levels of symbolic links"},
+	{91, "ERESTART", "interrupted system call should be restarted"},
+	{92, "ESTRPIPE", "streams pipe error"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "protocol not available"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "ENOTSUP", "operation not supported"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection on reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{135, "EUCLEAN", "structure needs cleaning"},
+	{137, "ENOTNAM", "not a XENIX named type file"},
+	{138, "ENAVAIL", "no XENIX semaphores available"},
+	{139, "EISNAM", "is a named type file"},
+	{140, "EREMOTEIO", "remote I/O error"},
+	{141, "EINIT", "unknown error 141"},
+	{142, "EREMDEV", "unknown error 142"},
+	{143, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale file handle"},
+	{158, "ECANCELED", "operation canceled"},
+	{159, "ENOMEDIUM", "no medium found"},
+	{160, "EMEDIUMTYPE", "wrong medium type"},
+	{161, "ENOKEY", "required key not available"},
+	{162, "EKEYEXPIRED", "key has expired"},
+	{163, "EKEYREVOKED", "key has been revoked"},
+	{164, "EKEYREJECTED", "key was rejected by service"},
+	{165, "EOWNERDEAD", "owner died"},
+	{166, "ENOTRECOVERABLE", "state not recoverable"},
+	{167, "ERFKILL", "operation not possible due to RF-kill"},
+	{168, "EHWPOISON", "memory page has hardware error"},
+	{1133, "EDQUOT", "disk quota exceeded"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user defined signal 1"},
+	{17, "SIGUSR2", "user defined signal 2"},
+	{18, "SIGCHLD", "child exited"},
+	{19, "SIGPWR", "power failure"},
+	{20, "SIGWINCH", "window changed"},
+	{21, "SIGURG", "urgent I/O condition"},
+	{22, "SIGIO", "I/O possible"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual timer expired"},
+	{29, "SIGPROF", "profiling timer expired"},
+	{30, "SIGXCPU", "CPU time limit exceeded"},
+	{31, "SIGXFSZ", "file size limit exceeded"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
new file mode 100644
index 00000000..7dd9c861
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -0,0 +1,2627 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips64,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40081270
+	BLKBSZSET                            = 0x80081271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40081272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x80
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x2000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0xe
+	F_GETLK64                            = 0xe
+	F_GETOWN                             = 0x17
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x18
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x100
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x80
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x800
+	MAP_ANONYMOUS                        = 0x800
+	MAP_DENYWRITE                        = 0x2000
+	MAP_EXECUTABLE                       = 0x4000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x1000
+	MAP_HUGETLB                          = 0x80000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x8000
+	MAP_NONBLOCK                         = 0x20000
+	MAP_NORESERVE                        = 0x400
+	MAP_POPULATE                         = 0x10000
+	MAP_PRIVATE                          = 0x2
+	MAP_RENAME                           = 0x800
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x40000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x8
+	O_ASYNC                              = 0x1000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x100
+	O_DIRECT                             = 0x8000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x10
+	O_EXCL                               = 0x400
+	O_FSYNC                              = 0x4010
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x80
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x800
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x80
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x4010
+	O_SYNC                               = 0x4010
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40082407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x8008240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_GET_THREAD_AREA_3264          = 0xc4
+	PTRACE_GET_WATCH_REGS                = 0xd0
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_3264                 = 0xc1
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_3264                 = 0xc0
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_3264                 = 0xc3
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_3264                 = 0xc2
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SET_WATCH_REGS                = 0xd1
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x6
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x9
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x5
+	RLIMIT_NPROC                         = 0x8
+	RLIMIT_RSS                           = 0x7
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x20007002
+	RTC_AIE_ON                           = 0x20007001
+	RTC_ALM_READ                         = 0x40247008
+	RTC_ALM_SET                          = 0x80247007
+	RTC_EPOCH_READ                       = 0x4008700d
+	RTC_EPOCH_SET                        = 0x8008700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x4008700b
+	RTC_IRQP_SET                         = 0x8008700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x20007006
+	RTC_PIE_ON                           = 0x20007005
+	RTC_PLL_GET                          = 0x40207011
+	RTC_PLL_SET                          = 0x80207012
+	RTC_RD_TIME                          = 0x40247009
+	RTC_SET_TIME                         = 0x8024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x20007004
+	RTC_UIE_ON                           = 0x20007003
+	RTC_VL_CLR                           = 0x20007014
+	RTC_VL_READ                          = 0x40047013
+	RTC_WIE_OFF                          = 0x20007010
+	RTC_WIE_ON                           = 0x2000700f
+	RTC_WKALM_RD                         = 0x40287010
+	RTC_WKALM_SET                        = 0x8028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x40047307
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x40047309
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x467f
+	SIOCOUTQ                             = 0x7472
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x80047308
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x1
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x80
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x2
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0xffff
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1009
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x20
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x1029
+	SO_DONTROUTE                         = 0x10
+	SO_ERROR                             = 0x1007
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x8
+	SO_LINGER                            = 0x80
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0x100
+	SO_PASSCRED                          = 0x11
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x12
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1e
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x1028
+	SO_RCVBUF                            = 0x1002
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x1004
+	SO_RCVTIMEO                          = 0x1006
+	SO_REUSEADDR                         = 0x4
+	SO_REUSEPORT                         = 0x200
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x1001
+	SO_SNDBUFFORCE                       = 0x1f
+	SO_SNDLOWAT                          = 0x1003
+	SO_SNDTIMEO                          = 0x1005
+	SO_STYLE                             = 0x1008
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x5407
+	TCGETA                               = 0x5401
+	TCGETS                               = 0x540d
+	TCGETS2                              = 0x4030542a
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x5410
+	TCSBRK                               = 0x5405
+	TCSBRKP                              = 0x5486
+	TCSETA                               = 0x5402
+	TCSETAF                              = 0x5404
+	TCSETAW                              = 0x5403
+	TCSETS                               = 0x540e
+	TCSETS2                              = 0x8030542b
+	TCSETSF                              = 0x5410
+	TCSETSF2                             = 0x8030542d
+	TCSETSW                              = 0x540f
+	TCSETSW2                             = 0x8030542c
+	TCXONC                               = 0x5406
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x80047478
+	TIOCEXCL                             = 0x740d
+	TIOCGDEV                             = 0x40045432
+	TIOCGETD                             = 0x7400
+	TIOCGETP                             = 0x7408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x5492
+	TIOCGLCKTRMIOS                       = 0x548b
+	TIOCGLTC                             = 0x7474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x4020542e
+	TIOCGSERIAL                          = 0x5484
+	TIOCGSID                             = 0x7416
+	TIOCGSOFTCAR                         = 0x5481
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x467f
+	TIOCLINUX                            = 0x5483
+	TIOCMBIC                             = 0x741c
+	TIOCMBIS                             = 0x741b
+	TIOCMGET                             = 0x741d
+	TIOCMIWAIT                           = 0x5491
+	TIOCMSET                             = 0x741a
+	TIOCM_CAR                            = 0x100
+	TIOCM_CD                             = 0x100
+	TIOCM_CTS                            = 0x40
+	TIOCM_DSR                            = 0x400
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x200
+	TIOCM_RNG                            = 0x200
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x20
+	TIOCM_ST                             = 0x10
+	TIOCNOTTY                            = 0x5471
+	TIOCNXCL                             = 0x740e
+	TIOCOUTQ                             = 0x7472
+	TIOCPKT                              = 0x5470
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x5480
+	TIOCSERCONFIG                        = 0x5488
+	TIOCSERGETLSR                        = 0x548e
+	TIOCSERGETMULTI                      = 0x548f
+	TIOCSERGSTRUCT                       = 0x548d
+	TIOCSERGWILD                         = 0x5489
+	TIOCSERSETMULTI                      = 0x5490
+	TIOCSERSWILD                         = 0x548a
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x7401
+	TIOCSETN                             = 0x740a
+	TIOCSETP                             = 0x7409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x548c
+	TIOCSLTC                             = 0x7475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0xc020542f
+	TIOCSSERIAL                          = 0x5485
+	TIOCSSOFTCAR                         = 0x5482
+	TIOCSTI                              = 0x5472
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x8000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x801054d5
+	TUNDETACHFILTER                      = 0x801054d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x401054db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x10
+	VEOL                                 = 0x11
+	VEOL2                                = 0x6
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x4
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VSWTCH                               = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x9e)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x46d)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EHWPOISON       = syscall.Errno(0xa8)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINIT           = syscall.Errno(0x8d)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x8b)
+	EKEYEXPIRED     = syscall.Errno(0xa2)
+	EKEYREJECTED    = syscall.Errno(0xa4)
+	EKEYREVOKED     = syscall.Errno(0xa3)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOOP           = syscall.Errno(0x5a)
+	EMEDIUMTYPE     = syscall.Errno(0xa0)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENAVAIL         = syscall.Errno(0x8a)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0xa1)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x9f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTNAM         = syscall.Errno(0x89)
+	ENOTRECOVERABLE = syscall.Errno(0xa6)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x7a)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0xa5)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMDEV         = syscall.Errno(0x8e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x8c)
+	ERESTART        = syscall.Errno(0x5b)
+	ERFKILL         = syscall.Errno(0xa7)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x87)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x12)
+	SIGCLD    = syscall.Signal(0x12)
+	SIGCONT   = syscall.Signal(0x19)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x16)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x16)
+	SIGPROF   = syscall.Signal(0x1d)
+	SIGPWR    = syscall.Signal(0x13)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x17)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x18)
+	SIGTTIN   = syscall.Signal(0x1a)
+	SIGTTOU   = syscall.Signal(0x1b)
+	SIGURG    = syscall.Signal(0x15)
+	SIGUSR1   = syscall.Signal(0x10)
+	SIGUSR2   = syscall.Signal(0x11)
+	SIGVTALRM = syscall.Signal(0x1c)
+	SIGWINCH  = syscall.Signal(0x14)
+	SIGXCPU   = syscall.Signal(0x1e)
+	SIGXFSZ   = syscall.Signal(0x1f)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "resource deadlock avoided"},
+	{46, "ENOLCK", "no locks available"},
+	{50, "EBADE", "invalid exchange"},
+	{51, "EBADR", "invalid request descriptor"},
+	{52, "EXFULL", "exchange full"},
+	{53, "ENOANO", "no anode"},
+	{54, "EBADRQC", "invalid request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "bad message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{87, "ELIBEXEC", "cannot exec a shared library directly"},
+	{88, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{89, "ENOSYS", "function not implemented"},
+	{90, "ELOOP", "too many levels of symbolic links"},
+	{91, "ERESTART", "interrupted system call should be restarted"},
+	{92, "ESTRPIPE", "streams pipe error"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "protocol not available"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "ENOTSUP", "operation not supported"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection on reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{135, "EUCLEAN", "structure needs cleaning"},
+	{137, "ENOTNAM", "not a XENIX named type file"},
+	{138, "ENAVAIL", "no XENIX semaphores available"},
+	{139, "EISNAM", "is a named type file"},
+	{140, "EREMOTEIO", "remote I/O error"},
+	{141, "EINIT", "unknown error 141"},
+	{142, "EREMDEV", "unknown error 142"},
+	{143, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale file handle"},
+	{158, "ECANCELED", "operation canceled"},
+	{159, "ENOMEDIUM", "no medium found"},
+	{160, "EMEDIUMTYPE", "wrong medium type"},
+	{161, "ENOKEY", "required key not available"},
+	{162, "EKEYEXPIRED", "key has expired"},
+	{163, "EKEYREVOKED", "key has been revoked"},
+	{164, "EKEYREJECTED", "key was rejected by service"},
+	{165, "EOWNERDEAD", "owner died"},
+	{166, "ENOTRECOVERABLE", "state not recoverable"},
+	{167, "ERFKILL", "operation not possible due to RF-kill"},
+	{168, "EHWPOISON", "memory page has hardware error"},
+	{1133, "EDQUOT", "disk quota exceeded"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user defined signal 1"},
+	{17, "SIGUSR2", "user defined signal 2"},
+	{18, "SIGCHLD", "child exited"},
+	{19, "SIGPWR", "power failure"},
+	{20, "SIGWINCH", "window changed"},
+	{21, "SIGURG", "urgent I/O condition"},
+	{22, "SIGIO", "I/O possible"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual timer expired"},
+	{29, "SIGPROF", "profiling timer expired"},
+	{30, "SIGXCPU", "CPU time limit exceeded"},
+	{31, "SIGXFSZ", "file size limit exceeded"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
new file mode 100644
index 00000000..1563da14
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -0,0 +1,2627 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips64le,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40081270
+	BLKBSZSET                            = 0x80081271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40081272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x80
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x2000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0xe
+	F_GETLK64                            = 0xe
+	F_GETOWN                             = 0x17
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x18
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x100
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x80
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x800
+	MAP_ANONYMOUS                        = 0x800
+	MAP_DENYWRITE                        = 0x2000
+	MAP_EXECUTABLE                       = 0x4000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x1000
+	MAP_HUGETLB                          = 0x80000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x8000
+	MAP_NONBLOCK                         = 0x20000
+	MAP_NORESERVE                        = 0x400
+	MAP_POPULATE                         = 0x10000
+	MAP_PRIVATE                          = 0x2
+	MAP_RENAME                           = 0x800
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x40000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x8
+	O_ASYNC                              = 0x1000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x100
+	O_DIRECT                             = 0x8000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x10
+	O_EXCL                               = 0x400
+	O_FSYNC                              = 0x4010
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x80
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x800
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x80
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x4010
+	O_SYNC                               = 0x4010
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40082407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x8008240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_GET_THREAD_AREA_3264          = 0xc4
+	PTRACE_GET_WATCH_REGS                = 0xd0
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_3264                 = 0xc1
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_3264                 = 0xc0
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_3264                 = 0xc3
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_3264                 = 0xc2
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SET_WATCH_REGS                = 0xd1
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x6
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x9
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x5
+	RLIMIT_NPROC                         = 0x8
+	RLIMIT_RSS                           = 0x7
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x20007002
+	RTC_AIE_ON                           = 0x20007001
+	RTC_ALM_READ                         = 0x40247008
+	RTC_ALM_SET                          = 0x80247007
+	RTC_EPOCH_READ                       = 0x4008700d
+	RTC_EPOCH_SET                        = 0x8008700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x4008700b
+	RTC_IRQP_SET                         = 0x8008700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x20007006
+	RTC_PIE_ON                           = 0x20007005
+	RTC_PLL_GET                          = 0x40207011
+	RTC_PLL_SET                          = 0x80207012
+	RTC_RD_TIME                          = 0x40247009
+	RTC_SET_TIME                         = 0x8024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x20007004
+	RTC_UIE_ON                           = 0x20007003
+	RTC_VL_CLR                           = 0x20007014
+	RTC_VL_READ                          = 0x40047013
+	RTC_WIE_OFF                          = 0x20007010
+	RTC_WIE_ON                           = 0x2000700f
+	RTC_WKALM_RD                         = 0x40287010
+	RTC_WKALM_SET                        = 0x8028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x40047307
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x40047309
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x467f
+	SIOCOUTQ                             = 0x7472
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x80047308
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x1
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x80
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x2
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0xffff
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1009
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x20
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x1029
+	SO_DONTROUTE                         = 0x10
+	SO_ERROR                             = 0x1007
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x8
+	SO_LINGER                            = 0x80
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0x100
+	SO_PASSCRED                          = 0x11
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x12
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1e
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x1028
+	SO_RCVBUF                            = 0x1002
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x1004
+	SO_RCVTIMEO                          = 0x1006
+	SO_REUSEADDR                         = 0x4
+	SO_REUSEPORT                         = 0x200
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x1001
+	SO_SNDBUFFORCE                       = 0x1f
+	SO_SNDLOWAT                          = 0x1003
+	SO_SNDTIMEO                          = 0x1005
+	SO_STYLE                             = 0x1008
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x5407
+	TCGETA                               = 0x5401
+	TCGETS                               = 0x540d
+	TCGETS2                              = 0x4030542a
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x5410
+	TCSBRK                               = 0x5405
+	TCSBRKP                              = 0x5486
+	TCSETA                               = 0x5402
+	TCSETAF                              = 0x5404
+	TCSETAW                              = 0x5403
+	TCSETS                               = 0x540e
+	TCSETS2                              = 0x8030542b
+	TCSETSF                              = 0x5410
+	TCSETSF2                             = 0x8030542d
+	TCSETSW                              = 0x540f
+	TCSETSW2                             = 0x8030542c
+	TCXONC                               = 0x5406
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x80047478
+	TIOCEXCL                             = 0x740d
+	TIOCGDEV                             = 0x40045432
+	TIOCGETD                             = 0x7400
+	TIOCGETP                             = 0x7408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x5492
+	TIOCGLCKTRMIOS                       = 0x548b
+	TIOCGLTC                             = 0x7474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x4020542e
+	TIOCGSERIAL                          = 0x5484
+	TIOCGSID                             = 0x7416
+	TIOCGSOFTCAR                         = 0x5481
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x467f
+	TIOCLINUX                            = 0x5483
+	TIOCMBIC                             = 0x741c
+	TIOCMBIS                             = 0x741b
+	TIOCMGET                             = 0x741d
+	TIOCMIWAIT                           = 0x5491
+	TIOCMSET                             = 0x741a
+	TIOCM_CAR                            = 0x100
+	TIOCM_CD                             = 0x100
+	TIOCM_CTS                            = 0x40
+	TIOCM_DSR                            = 0x400
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x200
+	TIOCM_RNG                            = 0x200
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x20
+	TIOCM_ST                             = 0x10
+	TIOCNOTTY                            = 0x5471
+	TIOCNXCL                             = 0x740e
+	TIOCOUTQ                             = 0x7472
+	TIOCPKT                              = 0x5470
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x5480
+	TIOCSERCONFIG                        = 0x5488
+	TIOCSERGETLSR                        = 0x548e
+	TIOCSERGETMULTI                      = 0x548f
+	TIOCSERGSTRUCT                       = 0x548d
+	TIOCSERGWILD                         = 0x5489
+	TIOCSERSETMULTI                      = 0x5490
+	TIOCSERSWILD                         = 0x548a
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x7401
+	TIOCSETN                             = 0x740a
+	TIOCSETP                             = 0x7409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x548c
+	TIOCSLTC                             = 0x7475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0xc020542f
+	TIOCSSERIAL                          = 0x5485
+	TIOCSSOFTCAR                         = 0x5482
+	TIOCSTI                              = 0x5472
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x8000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x801054d5
+	TUNDETACHFILTER                      = 0x801054d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x401054db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x10
+	VEOL                                 = 0x11
+	VEOL2                                = 0x6
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x4
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VSWTCH                               = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x9e)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x46d)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EHWPOISON       = syscall.Errno(0xa8)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINIT           = syscall.Errno(0x8d)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x8b)
+	EKEYEXPIRED     = syscall.Errno(0xa2)
+	EKEYREJECTED    = syscall.Errno(0xa4)
+	EKEYREVOKED     = syscall.Errno(0xa3)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOOP           = syscall.Errno(0x5a)
+	EMEDIUMTYPE     = syscall.Errno(0xa0)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENAVAIL         = syscall.Errno(0x8a)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0xa1)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x9f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTNAM         = syscall.Errno(0x89)
+	ENOTRECOVERABLE = syscall.Errno(0xa6)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x7a)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0xa5)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMDEV         = syscall.Errno(0x8e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x8c)
+	ERESTART        = syscall.Errno(0x5b)
+	ERFKILL         = syscall.Errno(0xa7)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x87)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x12)
+	SIGCLD    = syscall.Signal(0x12)
+	SIGCONT   = syscall.Signal(0x19)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x16)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x16)
+	SIGPROF   = syscall.Signal(0x1d)
+	SIGPWR    = syscall.Signal(0x13)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x17)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x18)
+	SIGTTIN   = syscall.Signal(0x1a)
+	SIGTTOU   = syscall.Signal(0x1b)
+	SIGURG    = syscall.Signal(0x15)
+	SIGUSR1   = syscall.Signal(0x10)
+	SIGUSR2   = syscall.Signal(0x11)
+	SIGVTALRM = syscall.Signal(0x1c)
+	SIGWINCH  = syscall.Signal(0x14)
+	SIGXCPU   = syscall.Signal(0x1e)
+	SIGXFSZ   = syscall.Signal(0x1f)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "resource deadlock avoided"},
+	{46, "ENOLCK", "no locks available"},
+	{50, "EBADE", "invalid exchange"},
+	{51, "EBADR", "invalid request descriptor"},
+	{52, "EXFULL", "exchange full"},
+	{53, "ENOANO", "no anode"},
+	{54, "EBADRQC", "invalid request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "bad message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{87, "ELIBEXEC", "cannot exec a shared library directly"},
+	{88, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{89, "ENOSYS", "function not implemented"},
+	{90, "ELOOP", "too many levels of symbolic links"},
+	{91, "ERESTART", "interrupted system call should be restarted"},
+	{92, "ESTRPIPE", "streams pipe error"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "protocol not available"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "ENOTSUP", "operation not supported"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection on reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{135, "EUCLEAN", "structure needs cleaning"},
+	{137, "ENOTNAM", "not a XENIX named type file"},
+	{138, "ENAVAIL", "no XENIX semaphores available"},
+	{139, "EISNAM", "is a named type file"},
+	{140, "EREMOTEIO", "remote I/O error"},
+	{141, "EINIT", "unknown error 141"},
+	{142, "EREMDEV", "unknown error 142"},
+	{143, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale file handle"},
+	{158, "ECANCELED", "operation canceled"},
+	{159, "ENOMEDIUM", "no medium found"},
+	{160, "EMEDIUMTYPE", "wrong medium type"},
+	{161, "ENOKEY", "required key not available"},
+	{162, "EKEYEXPIRED", "key has expired"},
+	{163, "EKEYREVOKED", "key has been revoked"},
+	{164, "EKEYREJECTED", "key was rejected by service"},
+	{165, "EOWNERDEAD", "owner died"},
+	{166, "ENOTRECOVERABLE", "state not recoverable"},
+	{167, "ERFKILL", "operation not possible due to RF-kill"},
+	{168, "EHWPOISON", "memory page has hardware error"},
+	{1133, "EDQUOT", "disk quota exceeded"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user defined signal 1"},
+	{17, "SIGUSR2", "user defined signal 2"},
+	{18, "SIGCHLD", "child exited"},
+	{19, "SIGPWR", "power failure"},
+	{20, "SIGWINCH", "window changed"},
+	{21, "SIGURG", "urgent I/O condition"},
+	{22, "SIGIO", "I/O possible"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual timer expired"},
+	{29, "SIGPROF", "profiling timer expired"},
+	{30, "SIGXCPU", "CPU time limit exceeded"},
+	{31, "SIGXFSZ", "file size limit exceeded"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
new file mode 100644
index 00000000..15ece799
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -0,0 +1,2627 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mipsle,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40041270
+	BLKBSZSET                            = 0x80041271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40041272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x80
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x2000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x21
+	F_GETLK64                            = 0x21
+	F_GETOWN                             = 0x17
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x22
+	F_SETLK64                            = 0x22
+	F_SETLKW                             = 0x23
+	F_SETLKW64                           = 0x23
+	F_SETOWN                             = 0x18
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x100
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x80
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x800
+	MAP_ANONYMOUS                        = 0x800
+	MAP_DENYWRITE                        = 0x2000
+	MAP_EXECUTABLE                       = 0x4000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x1000
+	MAP_HUGETLB                          = 0x80000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x8000
+	MAP_NONBLOCK                         = 0x20000
+	MAP_NORESERVE                        = 0x400
+	MAP_POPULATE                         = 0x10000
+	MAP_PRIVATE                          = 0x2
+	MAP_RENAME                           = 0x800
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x40000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x8
+	O_ASYNC                              = 0x1000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x100
+	O_DIRECT                             = 0x8000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x10
+	O_EXCL                               = 0x400
+	O_FSYNC                              = 0x4010
+	O_LARGEFILE                          = 0x2000
+	O_NDELAY                             = 0x80
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x800
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x80
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x4010
+	O_SYNC                               = 0x4010
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40042407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x8004240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc004240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80042406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_GET_THREAD_AREA_3264          = 0xc4
+	PTRACE_GET_WATCH_REGS                = 0xd0
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_3264                 = 0xc1
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_3264                 = 0xc0
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_3264                 = 0xc3
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_3264                 = 0xc2
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SET_WATCH_REGS                = 0xd1
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x6
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x9
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x5
+	RLIMIT_NPROC                         = 0x8
+	RLIMIT_RSS                           = 0x7
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x20007002
+	RTC_AIE_ON                           = 0x20007001
+	RTC_ALM_READ                         = 0x40247008
+	RTC_ALM_SET                          = 0x80247007
+	RTC_EPOCH_READ                       = 0x4004700d
+	RTC_EPOCH_SET                        = 0x8004700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x4004700b
+	RTC_IRQP_SET                         = 0x8004700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x20007006
+	RTC_PIE_ON                           = 0x20007005
+	RTC_PLL_GET                          = 0x401c7011
+	RTC_PLL_SET                          = 0x801c7012
+	RTC_RD_TIME                          = 0x40247009
+	RTC_SET_TIME                         = 0x8024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x20007004
+	RTC_UIE_ON                           = 0x20007003
+	RTC_VL_CLR                           = 0x20007014
+	RTC_VL_READ                          = 0x40047013
+	RTC_WIE_OFF                          = 0x20007010
+	RTC_WIE_ON                           = 0x2000700f
+	RTC_WKALM_RD                         = 0x40287010
+	RTC_WKALM_SET                        = 0x8028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x40047307
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x40047309
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x467f
+	SIOCOUTQ                             = 0x7472
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x80047308
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x1
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x80
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x2
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0xffff
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1009
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x20
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x1029
+	SO_DONTROUTE                         = 0x10
+	SO_ERROR                             = 0x1007
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x8
+	SO_LINGER                            = 0x80
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0x100
+	SO_PASSCRED                          = 0x11
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x12
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1e
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x1028
+	SO_RCVBUF                            = 0x1002
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x1004
+	SO_RCVTIMEO                          = 0x1006
+	SO_REUSEADDR                         = 0x4
+	SO_REUSEPORT                         = 0x200
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x1001
+	SO_SNDBUFFORCE                       = 0x1f
+	SO_SNDLOWAT                          = 0x1003
+	SO_SNDTIMEO                          = 0x1005
+	SO_STYLE                             = 0x1008
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x5407
+	TCGETA                               = 0x5401
+	TCGETS                               = 0x540d
+	TCGETS2                              = 0x4030542a
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x5410
+	TCSBRK                               = 0x5405
+	TCSBRKP                              = 0x5486
+	TCSETA                               = 0x5402
+	TCSETAF                              = 0x5404
+	TCSETAW                              = 0x5403
+	TCSETS                               = 0x540e
+	TCSETS2                              = 0x8030542b
+	TCSETSF                              = 0x5410
+	TCSETSF2                             = 0x8030542d
+	TCSETSW                              = 0x540f
+	TCSETSW2                             = 0x8030542c
+	TCXONC                               = 0x5406
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x80047478
+	TIOCEXCL                             = 0x740d
+	TIOCGDEV                             = 0x40045432
+	TIOCGETD                             = 0x7400
+	TIOCGETP                             = 0x7408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x5492
+	TIOCGLCKTRMIOS                       = 0x548b
+	TIOCGLTC                             = 0x7474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x4020542e
+	TIOCGSERIAL                          = 0x5484
+	TIOCGSID                             = 0x7416
+	TIOCGSOFTCAR                         = 0x5481
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x467f
+	TIOCLINUX                            = 0x5483
+	TIOCMBIC                             = 0x741c
+	TIOCMBIS                             = 0x741b
+	TIOCMGET                             = 0x741d
+	TIOCMIWAIT                           = 0x5491
+	TIOCMSET                             = 0x741a
+	TIOCM_CAR                            = 0x100
+	TIOCM_CD                             = 0x100
+	TIOCM_CTS                            = 0x40
+	TIOCM_DSR                            = 0x400
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x200
+	TIOCM_RNG                            = 0x200
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x20
+	TIOCM_ST                             = 0x10
+	TIOCNOTTY                            = 0x5471
+	TIOCNXCL                             = 0x740e
+	TIOCOUTQ                             = 0x7472
+	TIOCPKT                              = 0x5470
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x5480
+	TIOCSERCONFIG                        = 0x5488
+	TIOCSERGETLSR                        = 0x548e
+	TIOCSERGETMULTI                      = 0x548f
+	TIOCSERGSTRUCT                       = 0x548d
+	TIOCSERGWILD                         = 0x5489
+	TIOCSERSETMULTI                      = 0x5490
+	TIOCSERSWILD                         = 0x548a
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x7401
+	TIOCSETN                             = 0x740a
+	TIOCSETP                             = 0x7409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x548c
+	TIOCSLTC                             = 0x7475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0xc020542f
+	TIOCSSERIAL                          = 0x5485
+	TIOCSSOFTCAR                         = 0x5482
+	TIOCSTI                              = 0x5472
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x8000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x800854d5
+	TUNDETACHFILTER                      = 0x800854d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x400854db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x10
+	VEOL                                 = 0x11
+	VEOL2                                = 0x6
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x4
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VSWTCH                               = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x20
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x9e)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x46d)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EHWPOISON       = syscall.Errno(0xa8)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINIT           = syscall.Errno(0x8d)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x8b)
+	EKEYEXPIRED     = syscall.Errno(0xa2)
+	EKEYREJECTED    = syscall.Errno(0xa4)
+	EKEYREVOKED     = syscall.Errno(0xa3)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOOP           = syscall.Errno(0x5a)
+	EMEDIUMTYPE     = syscall.Errno(0xa0)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENAVAIL         = syscall.Errno(0x8a)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0xa1)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x9f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTNAM         = syscall.Errno(0x89)
+	ENOTRECOVERABLE = syscall.Errno(0xa6)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x7a)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0xa5)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMDEV         = syscall.Errno(0x8e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x8c)
+	ERESTART        = syscall.Errno(0x5b)
+	ERFKILL         = syscall.Errno(0xa7)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x87)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x12)
+	SIGCLD    = syscall.Signal(0x12)
+	SIGCONT   = syscall.Signal(0x19)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x16)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x16)
+	SIGPROF   = syscall.Signal(0x1d)
+	SIGPWR    = syscall.Signal(0x13)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x17)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x18)
+	SIGTTIN   = syscall.Signal(0x1a)
+	SIGTTOU   = syscall.Signal(0x1b)
+	SIGURG    = syscall.Signal(0x15)
+	SIGUSR1   = syscall.Signal(0x10)
+	SIGUSR2   = syscall.Signal(0x11)
+	SIGVTALRM = syscall.Signal(0x1c)
+	SIGWINCH  = syscall.Signal(0x14)
+	SIGXCPU   = syscall.Signal(0x1e)
+	SIGXFSZ   = syscall.Signal(0x1f)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "resource deadlock avoided"},
+	{46, "ENOLCK", "no locks available"},
+	{50, "EBADE", "invalid exchange"},
+	{51, "EBADR", "invalid request descriptor"},
+	{52, "EXFULL", "exchange full"},
+	{53, "ENOANO", "no anode"},
+	{54, "EBADRQC", "invalid request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "bad message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{87, "ELIBEXEC", "cannot exec a shared library directly"},
+	{88, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{89, "ENOSYS", "function not implemented"},
+	{90, "ELOOP", "too many levels of symbolic links"},
+	{91, "ERESTART", "interrupted system call should be restarted"},
+	{92, "ESTRPIPE", "streams pipe error"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "protocol not available"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "ENOTSUP", "operation not supported"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection on reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{135, "EUCLEAN", "structure needs cleaning"},
+	{137, "ENOTNAM", "not a XENIX named type file"},
+	{138, "ENAVAIL", "no XENIX semaphores available"},
+	{139, "EISNAM", "is a named type file"},
+	{140, "EREMOTEIO", "remote I/O error"},
+	{141, "EINIT", "unknown error 141"},
+	{142, "EREMDEV", "unknown error 142"},
+	{143, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale file handle"},
+	{158, "ECANCELED", "operation canceled"},
+	{159, "ENOMEDIUM", "no medium found"},
+	{160, "EMEDIUMTYPE", "wrong medium type"},
+	{161, "ENOKEY", "required key not available"},
+	{162, "EKEYEXPIRED", "key has expired"},
+	{163, "EKEYREVOKED", "key has been revoked"},
+	{164, "EKEYREJECTED", "key was rejected by service"},
+	{165, "EOWNERDEAD", "owner died"},
+	{166, "ENOTRECOVERABLE", "state not recoverable"},
+	{167, "ERFKILL", "operation not possible due to RF-kill"},
+	{168, "EHWPOISON", "memory page has hardware error"},
+	{1133, "EDQUOT", "disk quota exceeded"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user defined signal 1"},
+	{17, "SIGUSR2", "user defined signal 2"},
+	{18, "SIGCHLD", "child exited"},
+	{19, "SIGPWR", "power failure"},
+	{20, "SIGWINCH", "window changed"},
+	{21, "SIGURG", "urgent I/O condition"},
+	{22, "SIGIO", "I/O possible"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual timer expired"},
+	{29, "SIGPROF", "profiling timer expired"},
+	{30, "SIGXCPU", "CPU time limit exceeded"},
+	{31, "SIGXFSZ", "file size limit exceeded"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
new file mode 100644
index 00000000..890ae83a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -0,0 +1,2680 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build ppc64,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x17
+	B110                                 = 0x3
+	B115200                              = 0x11
+	B1152000                             = 0x18
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x19
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x1a
+	B230400                              = 0x12
+	B2400                                = 0xb
+	B2500000                             = 0x1b
+	B300                                 = 0x7
+	B3000000                             = 0x1c
+	B3500000                             = 0x1d
+	B38400                               = 0xf
+	B4000000                             = 0x1e
+	B460800                              = 0x13
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x14
+	B57600                               = 0x10
+	B576000                              = 0x15
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x16
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40081270
+	BLKBSZSET                            = 0x80081271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40081272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1f
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x8000
+	BSDLY                                = 0x8000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0xff
+	CBAUDEX                              = 0x0
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0xff0000
+	CLOCAL                               = 0x8000
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x1000
+	CR2                                  = 0x2000
+	CR3                                  = 0x3000
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x3000
+	CREAD                                = 0x800
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x100
+	CS7                                  = 0x200
+	CS8                                  = 0x300
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x300
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x400
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x40
+	ECHOE                                = 0x2
+	ECHOK                                = 0x4
+	ECHOKE                               = 0x1
+	ECHONL                               = 0x10
+	ECHOPRT                              = 0x20
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x4000
+	FFDLY                                = 0x4000
+	FLUSHO                               = 0x800000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0xc
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0xd
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0xe
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x4000
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x100
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x400
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x80
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x1000
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x400
+	IXON                                 = 0x200
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x80
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x40
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x2000
+	MCL_FUTURE                           = 0x4000
+	MCL_ONFAULT                          = 0x8000
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NL2                                  = 0x200
+	NL3                                  = 0x300
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x300
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80000000
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x4
+	ONLCR                                = 0x2
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x20000
+	O_DIRECTORY                          = 0x4000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x8000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x404000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x1000
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x2000
+	PENDIN                               = 0x20000000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40082407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x8008240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_SAO                             = 0x10
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETEVRREGS                    = 0x14
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGS64                     = 0x16
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GETVRREGS                     = 0x12
+	PTRACE_GETVSRREGS                    = 0x1b
+	PTRACE_GET_DEBUGREG                  = 0x19
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETEVRREGS                    = 0x15
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGS64                     = 0x17
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SETVRREGS                     = 0x13
+	PTRACE_SETVSRREGS                    = 0x1c
+	PTRACE_SET_DEBUGREG                  = 0x1a
+	PTRACE_SINGLEBLOCK                   = 0x100
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	PT_CCR                               = 0x26
+	PT_CTR                               = 0x23
+	PT_DAR                               = 0x29
+	PT_DSCR                              = 0x2c
+	PT_DSISR                             = 0x2a
+	PT_FPR0                              = 0x30
+	PT_FPSCR                             = 0x50
+	PT_LNK                               = 0x24
+	PT_MSR                               = 0x21
+	PT_NIP                               = 0x20
+	PT_ORIG_R3                           = 0x22
+	PT_R0                                = 0x0
+	PT_R1                                = 0x1
+	PT_R10                               = 0xa
+	PT_R11                               = 0xb
+	PT_R12                               = 0xc
+	PT_R13                               = 0xd
+	PT_R14                               = 0xe
+	PT_R15                               = 0xf
+	PT_R16                               = 0x10
+	PT_R17                               = 0x11
+	PT_R18                               = 0x12
+	PT_R19                               = 0x13
+	PT_R2                                = 0x2
+	PT_R20                               = 0x14
+	PT_R21                               = 0x15
+	PT_R22                               = 0x16
+	PT_R23                               = 0x17
+	PT_R24                               = 0x18
+	PT_R25                               = 0x19
+	PT_R26                               = 0x1a
+	PT_R27                               = 0x1b
+	PT_R28                               = 0x1c
+	PT_R29                               = 0x1d
+	PT_R3                                = 0x3
+	PT_R30                               = 0x1e
+	PT_R31                               = 0x1f
+	PT_R4                                = 0x4
+	PT_R5                                = 0x5
+	PT_R6                                = 0x6
+	PT_R7                                = 0x7
+	PT_R8                                = 0x8
+	PT_R9                                = 0x9
+	PT_REGS_COUNT                        = 0x2c
+	PT_RESULT                            = 0x2b
+	PT_SOFTE                             = 0x27
+	PT_TRAP                              = 0x28
+	PT_VR0                               = 0x52
+	PT_VRSAVE                            = 0x94
+	PT_VSCR                              = 0x93
+	PT_VSR0                              = 0x96
+	PT_VSR31                             = 0xd4
+	PT_XER                               = 0x25
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x20007002
+	RTC_AIE_ON                           = 0x20007001
+	RTC_ALM_READ                         = 0x40247008
+	RTC_ALM_SET                          = 0x80247007
+	RTC_EPOCH_READ                       = 0x4008700d
+	RTC_EPOCH_SET                        = 0x8008700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x4008700b
+	RTC_IRQP_SET                         = 0x8008700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x20007006
+	RTC_PIE_ON                           = 0x20007005
+	RTC_PLL_GET                          = 0x40207011
+	RTC_PLL_SET                          = 0x80207012
+	RTC_RD_TIME                          = 0x40247009
+	RTC_SET_TIME                         = 0x8024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x20007004
+	RTC_UIE_ON                           = 0x20007003
+	RTC_VL_CLR                           = 0x20007014
+	RTC_VL_READ                          = 0x40047013
+	RTC_WIE_OFF                          = 0x20007010
+	RTC_WIE_ON                           = 0x2000700f
+	RTC_WKALM_RD                         = 0x40287010
+	RTC_WKALM_SET                        = 0x8028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x4004667f
+	SIOCOUTQ                             = 0x40047473
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x14
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x15
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x10
+	SO_RCVTIMEO                          = 0x12
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x11
+	SO_SNDTIMEO                          = 0x13
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x400
+	TAB2                                 = 0x800
+	TAB3                                 = 0xc00
+	TABDLY                               = 0xc00
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x2000741f
+	TCGETA                               = 0x40147417
+	TCGETS                               = 0x402c7413
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x2000741d
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x80147418
+	TCSETAF                              = 0x8014741c
+	TCSETAW                              = 0x80147419
+	TCSETS                               = 0x802c7414
+	TCSETSF                              = 0x802c7416
+	TCSETSW                              = 0x802c7415
+	TCXONC                               = 0x2000741e
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x40045432
+	TIOCGETC                             = 0x40067412
+	TIOCGETD                             = 0x5424
+	TIOCGETP                             = 0x40067408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGLTC                             = 0x40067474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x4004667f
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_LOOP                           = 0x8000
+	TIOCM_OUT1                           = 0x2000
+	TIOCM_OUT2                           = 0x4000
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x40047473
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETC                             = 0x80067411
+	TIOCSETD                             = 0x5423
+	TIOCSETN                             = 0x8006740a
+	TIOCSETP                             = 0x80067409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSLTC                             = 0x80067475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTART                            = 0x2000746e
+	TIOCSTI                              = 0x5412
+	TIOCSTOP                             = 0x2000746f
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x400000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x801054d5
+	TUNDETACHFILTER                      = 0x801054d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x401054db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0x10
+	VEOF                                 = 0x4
+	VEOL                                 = 0x6
+	VEOL2                                = 0x8
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x5
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xb
+	VSTART                               = 0xd
+	VSTOP                                = 0xe
+	VSUSP                                = 0xc
+	VSWTC                                = 0x9
+	VT0                                  = 0x0
+	VT1                                  = 0x10000
+	VTDLY                                = 0x10000
+	VTIME                                = 0x7
+	VWERASE                              = 0xa
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4000
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0xc00
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x3a)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{58, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
new file mode 100644
index 00000000..d5b75355
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -0,0 +1,2680 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build ppc64le,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x17
+	B110                                 = 0x3
+	B115200                              = 0x11
+	B1152000                             = 0x18
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x19
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x1a
+	B230400                              = 0x12
+	B2400                                = 0xb
+	B2500000                             = 0x1b
+	B300                                 = 0x7
+	B3000000                             = 0x1c
+	B3500000                             = 0x1d
+	B38400                               = 0xf
+	B4000000                             = 0x1e
+	B460800                              = 0x13
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x14
+	B57600                               = 0x10
+	B576000                              = 0x15
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x16
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40081270
+	BLKBSZSET                            = 0x80081271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40081272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1f
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x8000
+	BSDLY                                = 0x8000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0xff
+	CBAUDEX                              = 0x0
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0xff0000
+	CLOCAL                               = 0x8000
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x1000
+	CR2                                  = 0x2000
+	CR3                                  = 0x3000
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x3000
+	CREAD                                = 0x800
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x100
+	CS7                                  = 0x200
+	CS8                                  = 0x300
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x300
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x400
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x40
+	ECHOE                                = 0x2
+	ECHOK                                = 0x4
+	ECHOKE                               = 0x1
+	ECHONL                               = 0x10
+	ECHOPRT                              = 0x20
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x4000
+	FFDLY                                = 0x4000
+	FLUSHO                               = 0x800000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0xc
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0xd
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0xe
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x4000
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x100
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x400
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x80
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x1000
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x400
+	IXON                                 = 0x200
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x80
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x40
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x2000
+	MCL_FUTURE                           = 0x4000
+	MCL_ONFAULT                          = 0x8000
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NL2                                  = 0x200
+	NL3                                  = 0x300
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x300
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80000000
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x4
+	ONLCR                                = 0x2
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x20000
+	O_DIRECTORY                          = 0x4000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x8000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x404000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x1000
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x2000
+	PENDIN                               = 0x20000000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40082407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x8008240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_SAO                             = 0x10
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETEVRREGS                    = 0x14
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGS64                     = 0x16
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GETVRREGS                     = 0x12
+	PTRACE_GETVSRREGS                    = 0x1b
+	PTRACE_GET_DEBUGREG                  = 0x19
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETEVRREGS                    = 0x15
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGS64                     = 0x17
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SETVRREGS                     = 0x13
+	PTRACE_SETVSRREGS                    = 0x1c
+	PTRACE_SET_DEBUGREG                  = 0x1a
+	PTRACE_SINGLEBLOCK                   = 0x100
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	PT_CCR                               = 0x26
+	PT_CTR                               = 0x23
+	PT_DAR                               = 0x29
+	PT_DSCR                              = 0x2c
+	PT_DSISR                             = 0x2a
+	PT_FPR0                              = 0x30
+	PT_FPSCR                             = 0x50
+	PT_LNK                               = 0x24
+	PT_MSR                               = 0x21
+	PT_NIP                               = 0x20
+	PT_ORIG_R3                           = 0x22
+	PT_R0                                = 0x0
+	PT_R1                                = 0x1
+	PT_R10                               = 0xa
+	PT_R11                               = 0xb
+	PT_R12                               = 0xc
+	PT_R13                               = 0xd
+	PT_R14                               = 0xe
+	PT_R15                               = 0xf
+	PT_R16                               = 0x10
+	PT_R17                               = 0x11
+	PT_R18                               = 0x12
+	PT_R19                               = 0x13
+	PT_R2                                = 0x2
+	PT_R20                               = 0x14
+	PT_R21                               = 0x15
+	PT_R22                               = 0x16
+	PT_R23                               = 0x17
+	PT_R24                               = 0x18
+	PT_R25                               = 0x19
+	PT_R26                               = 0x1a
+	PT_R27                               = 0x1b
+	PT_R28                               = 0x1c
+	PT_R29                               = 0x1d
+	PT_R3                                = 0x3
+	PT_R30                               = 0x1e
+	PT_R31                               = 0x1f
+	PT_R4                                = 0x4
+	PT_R5                                = 0x5
+	PT_R6                                = 0x6
+	PT_R7                                = 0x7
+	PT_R8                                = 0x8
+	PT_R9                                = 0x9
+	PT_REGS_COUNT                        = 0x2c
+	PT_RESULT                            = 0x2b
+	PT_SOFTE                             = 0x27
+	PT_TRAP                              = 0x28
+	PT_VR0                               = 0x52
+	PT_VRSAVE                            = 0x94
+	PT_VSCR                              = 0x93
+	PT_VSR0                              = 0x96
+	PT_VSR31                             = 0xd4
+	PT_XER                               = 0x25
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x20007002
+	RTC_AIE_ON                           = 0x20007001
+	RTC_ALM_READ                         = 0x40247008
+	RTC_ALM_SET                          = 0x80247007
+	RTC_EPOCH_READ                       = 0x4008700d
+	RTC_EPOCH_SET                        = 0x8008700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x4008700b
+	RTC_IRQP_SET                         = 0x8008700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x20007006
+	RTC_PIE_ON                           = 0x20007005
+	RTC_PLL_GET                          = 0x40207011
+	RTC_PLL_SET                          = 0x80207012
+	RTC_RD_TIME                          = 0x40247009
+	RTC_SET_TIME                         = 0x8024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x20007004
+	RTC_UIE_ON                           = 0x20007003
+	RTC_VL_CLR                           = 0x20007014
+	RTC_VL_READ                          = 0x40047013
+	RTC_WIE_OFF                          = 0x20007010
+	RTC_WIE_ON                           = 0x2000700f
+	RTC_WKALM_RD                         = 0x40287010
+	RTC_WKALM_SET                        = 0x8028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x4004667f
+	SIOCOUTQ                             = 0x40047473
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x14
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x15
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x10
+	SO_RCVTIMEO                          = 0x12
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x11
+	SO_SNDTIMEO                          = 0x13
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x400
+	TAB2                                 = 0x800
+	TAB3                                 = 0xc00
+	TABDLY                               = 0xc00
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x2000741f
+	TCGETA                               = 0x40147417
+	TCGETS                               = 0x402c7413
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x2000741d
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x80147418
+	TCSETAF                              = 0x8014741c
+	TCSETAW                              = 0x80147419
+	TCSETS                               = 0x802c7414
+	TCSETSF                              = 0x802c7416
+	TCSETSW                              = 0x802c7415
+	TCXONC                               = 0x2000741e
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x40045432
+	TIOCGETC                             = 0x40067412
+	TIOCGETD                             = 0x5424
+	TIOCGETP                             = 0x40067408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGLTC                             = 0x40067474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x4004667f
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_LOOP                           = 0x8000
+	TIOCM_OUT1                           = 0x2000
+	TIOCM_OUT2                           = 0x4000
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x40047473
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETC                             = 0x80067411
+	TIOCSETD                             = 0x5423
+	TIOCSETN                             = 0x8006740a
+	TIOCSETP                             = 0x80067409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSLTC                             = 0x80067475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTART                            = 0x2000746e
+	TIOCSTI                              = 0x5412
+	TIOCSTOP                             = 0x2000746f
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x400000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x801054d5
+	TUNDETACHFILTER                      = 0x801054d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x401054db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0x10
+	VEOF                                 = 0x4
+	VEOL                                 = 0x6
+	VEOL2                                = 0x8
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x5
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xb
+	VSTART                               = 0xd
+	VSTOP                                = 0xe
+	VSUSP                                = 0xc
+	VSWTC                                = 0x9
+	VT0                                  = 0x0
+	VT1                                  = 0x10000
+	VTDLY                                = 0x10000
+	VTIME                                = 0x7
+	VWERASE                              = 0xa
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4000
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0xc00
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x3a)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{58, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
new file mode 100644
index 00000000..6054d054
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -0,0 +1,2680 @@
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build s390x,linux
+
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80081270
+	BLKBSZSET                            = 0x40081271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80081272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PREAUTH                        = 0x88c7
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_ENCRYPTION_MODE_SPECK128_256_CTS  = 0x8
+	FS_ENCRYPTION_MODE_SPECK128_256_XTS  = 0x7
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0x5
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x9
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_FREEBIND                        = 0x4e
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_FIXED_NOREPLACE                  = 0x100000
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_SHARED_VALIDATE                  = 0x3
+	MAP_STACK                            = 0x20000
+	MAP_SYNC                             = 0x80000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
+	NFNETLINK_V0                         = 0x0
+	NFNLGRP_ACCT_QUOTA                   = 0x8
+	NFNLGRP_CONNTRACK_DESTROY            = 0x3
+	NFNLGRP_CONNTRACK_EXP_DESTROY        = 0x6
+	NFNLGRP_CONNTRACK_EXP_NEW            = 0x4
+	NFNLGRP_CONNTRACK_EXP_UPDATE         = 0x5
+	NFNLGRP_CONNTRACK_NEW                = 0x1
+	NFNLGRP_CONNTRACK_UPDATE             = 0x2
+	NFNLGRP_MAX                          = 0x9
+	NFNLGRP_NFTABLES                     = 0x7
+	NFNLGRP_NFTRACE                      = 0x9
+	NFNLGRP_NONE                         = 0x0
+	NFNL_BATCH_MAX                       = 0x1
+	NFNL_MSG_BATCH_BEGIN                 = 0x10
+	NFNL_MSG_BATCH_END                   = 0x11
+	NFNL_NFA_NEST                        = 0x8000
+	NFNL_SUBSYS_ACCT                     = 0x7
+	NFNL_SUBSYS_COUNT                    = 0xc
+	NFNL_SUBSYS_CTHELPER                 = 0x9
+	NFNL_SUBSYS_CTNETLINK                = 0x1
+	NFNL_SUBSYS_CTNETLINK_EXP            = 0x2
+	NFNL_SUBSYS_CTNETLINK_TIMEOUT        = 0x8
+	NFNL_SUBSYS_IPSET                    = 0x6
+	NFNL_SUBSYS_NFTABLES                 = 0xa
+	NFNL_SUBSYS_NFT_COMPAT               = 0xb
+	NFNL_SUBSYS_NONE                     = 0x0
+	NFNL_SUBSYS_OSF                      = 0x5
+	NFNL_SUBSYS_QUEUE                    = 0x3
+	NFNL_SUBSYS_ULOG                     = 0x4
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x4000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80082407
+	PERF_EVENT_IOC_MODIFY_ATTRIBUTES     = 0x4008240b
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_SPECULATION_CTRL              = 0x34
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_SPECULATION_CTRL              = 0x35
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SPEC_DISABLE                      = 0x4
+	PR_SPEC_ENABLE                       = 0x2
+	PR_SPEC_FORCE_DISABLE                = 0x8
+	PR_SPEC_NOT_AFFECTED                 = 0x0
+	PR_SPEC_PRCTL                        = 0x1
+	PR_SPEC_STORE_BYPASS                 = 0x0
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_DISABLE_TE                    = 0x5010
+	PTRACE_ENABLE_TE                     = 0x5009
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_LAST_BREAK                = 0x5006
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_AREA                 = 0x5003
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_AREA                 = 0x5002
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_PEEKUSR_AREA                  = 0x5000
+	PTRACE_PEEK_SYSTEM_CALL              = 0x5007
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_AREA                 = 0x5005
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_AREA                 = 0x5004
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_POKEUSR_AREA                  = 0x5001
+	PTRACE_POKE_SYSTEM_CALL              = 0x5008
+	PTRACE_PROT                          = 0x15
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SINGLEBLOCK                   = 0xc
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TE_ABORT_RAND                 = 0x5011
+	PTRACE_TRACEME                       = 0x0
+	PT_ACR0                              = 0x90
+	PT_ACR1                              = 0x94
+	PT_ACR10                             = 0xb8
+	PT_ACR11                             = 0xbc
+	PT_ACR12                             = 0xc0
+	PT_ACR13                             = 0xc4
+	PT_ACR14                             = 0xc8
+	PT_ACR15                             = 0xcc
+	PT_ACR2                              = 0x98
+	PT_ACR3                              = 0x9c
+	PT_ACR4                              = 0xa0
+	PT_ACR5                              = 0xa4
+	PT_ACR6                              = 0xa8
+	PT_ACR7                              = 0xac
+	PT_ACR8                              = 0xb0
+	PT_ACR9                              = 0xb4
+	PT_CR_10                             = 0x168
+	PT_CR_11                             = 0x170
+	PT_CR_9                              = 0x160
+	PT_ENDREGS                           = 0x1af
+	PT_FPC                               = 0xd8
+	PT_FPR0                              = 0xe0
+	PT_FPR1                              = 0xe8
+	PT_FPR10                             = 0x130
+	PT_FPR11                             = 0x138
+	PT_FPR12                             = 0x140
+	PT_FPR13                             = 0x148
+	PT_FPR14                             = 0x150
+	PT_FPR15                             = 0x158
+	PT_FPR2                              = 0xf0
+	PT_FPR3                              = 0xf8
+	PT_FPR4                              = 0x100
+	PT_FPR5                              = 0x108
+	PT_FPR6                              = 0x110
+	PT_FPR7                              = 0x118
+	PT_FPR8                              = 0x120
+	PT_FPR9                              = 0x128
+	PT_GPR0                              = 0x10
+	PT_GPR1                              = 0x18
+	PT_GPR10                             = 0x60
+	PT_GPR11                             = 0x68
+	PT_GPR12                             = 0x70
+	PT_GPR13                             = 0x78
+	PT_GPR14                             = 0x80
+	PT_GPR15                             = 0x88
+	PT_GPR2                              = 0x20
+	PT_GPR3                              = 0x28
+	PT_GPR4                              = 0x30
+	PT_GPR5                              = 0x38
+	PT_GPR6                              = 0x40
+	PT_GPR7                              = 0x48
+	PT_GPR8                              = 0x50
+	PT_GPR9                              = 0x58
+	PT_IEEE_IP                           = 0x1a8
+	PT_LASTOFF                           = 0x1a8
+	PT_ORIGGPR2                          = 0xd0
+	PT_PSWADDR                           = 0x8
+	PT_PSWMASK                           = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1d
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTC_AF                               = 0x20
+	RTC_AIE_OFF                          = 0x7002
+	RTC_AIE_ON                           = 0x7001
+	RTC_ALM_READ                         = 0x80247008
+	RTC_ALM_SET                          = 0x40247007
+	RTC_EPOCH_READ                       = 0x8008700d
+	RTC_EPOCH_SET                        = 0x4008700e
+	RTC_IRQF                             = 0x80
+	RTC_IRQP_READ                        = 0x8008700b
+	RTC_IRQP_SET                         = 0x4008700c
+	RTC_MAX_FREQ                         = 0x2000
+	RTC_PF                               = 0x40
+	RTC_PIE_OFF                          = 0x7006
+	RTC_PIE_ON                           = 0x7005
+	RTC_PLL_GET                          = 0x80207011
+	RTC_PLL_SET                          = 0x40207012
+	RTC_RD_TIME                          = 0x80247009
+	RTC_SET_TIME                         = 0x4024700a
+	RTC_UF                               = 0x10
+	RTC_UIE_OFF                          = 0x7004
+	RTC_UIE_ON                           = 0x7003
+	RTC_VL_CLR                           = 0x7014
+	RTC_VL_READ                          = 0x80047013
+	RTC_WIE_OFF                          = 0x7010
+	RTC_WIE_ON                           = 0x700f
+	RTC_WKALM_RD                         = 0x80287010
+	RTC_WKALM_SET                        = 0x4028700f
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BGP                           = 0xba
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_EIGRP                         = 0xc0
+	RTPROT_GATED                         = 0x8
+	RTPROT_ISIS                          = 0xbb
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_OSPF                          = 0xbc
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_RIP                           = 0xbd
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_FASTOPEN_KEY                     = 0x21
+	TCP_FASTOPEN_NO_COOKIE               = 0x22
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x401054d5
+	TUNDETACHFILTER                      = 0x401054d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x801054db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
new file mode 100644
index 00000000..7fdc85b1
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
@@ -0,0 +1,2142 @@
+// mkerrors.sh -m64
+// Code generated by the command above; DO NOT EDIT.
+
+// +build sparc64,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IB                            = 0x1b
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KCM                           = 0x29
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x2a
+	AF_MPLS                          = 0x1c
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ALG_OP_DECRYPT                   = 0x0
+	ALG_OP_ENCRYPT                   = 0x1
+	ALG_SET_AEAD_ASSOCLEN            = 0x4
+	ALG_SET_AEAD_AUTHSIZE            = 0x5
+	ALG_SET_IV                       = 0x2
+	ALG_SET_KEY                      = 0x1
+	ALG_SET_OP                       = 0x3
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	ASI_LEON_DFLUSH                  = 0x11
+	ASI_LEON_IFLUSH                  = 0x10
+	ASI_LEON_MMUFLUSH                = 0x18
+	B0                               = 0x0
+	B1000000                         = 0x100c
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x100d
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100e
+	B153600                          = 0x1006
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100f
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B300                             = 0x7
+	B307200                          = 0x1007
+	B38400                           = 0xf
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x100a
+	B57600                           = 0x1001
+	B576000                          = 0x100b
+	B600                             = 0x8
+	B614400                          = 0x1008
+	B75                              = 0x2
+	B76800                           = 0x1005
+	B921600                          = 0x1009
+	B9600                            = 0xd
+	BLKBSZGET                        = 0x80081270
+	BLKBSZSET                        = 0x40081271
+	BLKFLSBUF                        = 0x1261
+	BLKFRAGET                        = 0x1265
+	BLKFRASET                        = 0x1264
+	BLKGETSIZE                       = 0x1260
+	BLKGETSIZE64                     = 0x80081272
+	BLKRAGET                         = 0x1263
+	BLKRASET                         = 0x1262
+	BLKROGET                         = 0x125e
+	BLKROSET                         = 0x125d
+	BLKRRPART                        = 0x125f
+	BLKSECTGET                       = 0x1267
+	BLKSECTSET                       = 0x1266
+	BLKSSZGET                        = 0x1268
+	BOTHER                           = 0x1000
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LL_OFF                       = -0x200000
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_NET_OFF                      = -0x100000
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CAN_BCM                          = 0x2
+	CAN_EFF_FLAG                     = 0x80000000
+	CAN_EFF_ID_BITS                  = 0x1d
+	CAN_EFF_MASK                     = 0x1fffffff
+	CAN_ERR_FLAG                     = 0x20000000
+	CAN_ERR_MASK                     = 0x1fffffff
+	CAN_INV_FILTER                   = 0x20000000
+	CAN_ISOTP                        = 0x6
+	CAN_MAX_DLC                      = 0x8
+	CAN_MAX_DLEN                     = 0x8
+	CAN_MCNET                        = 0x5
+	CAN_MTU                          = 0x10
+	CAN_NPROTO                       = 0x7
+	CAN_RAW                          = 0x1
+	CAN_RTR_FLAG                     = 0x40000000
+	CAN_SFF_ID_BITS                  = 0xb
+	CAN_SFF_MASK                     = 0x7ff
+	CAN_TP16                         = 0x3
+	CAN_TP20                         = 0x4
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_TAI                        = 0xb
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	EMT_TAGOVF                       = 0x1
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLEXCLUSIVE                   = 0x10000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x400000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_HSR                        = 0x892f
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MACSEC                     = 0x88e5
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_TSN                        = 0x22f0
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FALLOC_FL_COLLAPSE_RANGE         = 0x8
+	FALLOC_FL_INSERT_RANGE           = 0x20
+	FALLOC_FL_KEEP_SIZE              = 0x1
+	FALLOC_FL_NO_HIDE_STALE          = 0x4
+	FALLOC_FL_PUNCH_HOLE             = 0x2
+	FALLOC_FL_ZERO_RANGE             = 0x10
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x2000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x7
+	F_GETLK64                        = 0x7
+	F_GETOWN                         = 0x5
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x1
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x8
+	F_SETLK64                        = 0x8
+	F_SETLKW                         = 0x9
+	F_SETLKW64                       = 0x9
+	F_SETOWN                         = 0x6
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x3
+	F_WRLCK                          = 0x2
+	GRND_NONBLOCK                    = 0x1
+	GRND_RANDOM                      = 0x2
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_MCAUTOJOIN                 = 0x400
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_STABLE_PRIVACY             = 0x800
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x400000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x4000
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MPLS                     = 0x89
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DONTFRAG                    = 0x3e
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HDRINCL                     = 0x24
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PATHMTU                     = 0x3d
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPATHMTU                 = 0x3c
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BIND_ADDRESS_NO_PORT          = 0x18
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_CHECKSUM                      = 0x17
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_FREE                        = 0x8
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x200
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x100
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x40
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_RENAME                       = 0x20
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x2000
+	MCL_FUTURE                       = 0x4000
+	MCL_ONFAULT                      = 0x8000
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_BATCH                        = 0x40000
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_LAZYTIME                      = 0x2000000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x2800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CAP_ACK                  = 0xa
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_LISTEN_ALL_NSID          = 0x8
+	NETLINK_LIST_MEMBERSHIPS         = 0x9
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_FILTERED              = 0x20
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x8
+	O_ASYNC                          = 0x40
+	O_CLOEXEC                        = 0x400000
+	O_CREAT                          = 0x200
+	O_DIRECT                         = 0x100000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x2000
+	O_EXCL                           = 0x800
+	O_FSYNC                          = 0x802000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x4004
+	O_NOATIME                        = 0x200000
+	O_NOCTTY                         = 0x8000
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x4000
+	O_PATH                           = 0x1000000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x802000
+	O_SYNC                           = 0x802000
+	O_TMPFILE                        = 0x2010000
+	O_TRUNC                          = 0x400
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CBPF               = 0x6
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_DATA               = 0x16
+	PACKET_FANOUT_EBPF               = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_ROLLOVER_STATS            = 0x15
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_CAP_AMBIENT                   = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
+	PR_CAP_AMBIENT_IS_SET            = 0x1
+	PR_CAP_AMBIENT_LOWER             = 0x3
+	PR_CAP_AMBIENT_RAISE             = 0x2
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_FP_MODE_FR                    = 0x1
+	PR_FP_MODE_FRE                   = 0x2
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_FP_MODE                   = 0x2e
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_FP_MODE                   = 0x2d
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPAREGS                = 0x14
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETFPREGS64               = 0x19
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGS64                 = 0x16
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_READDATA                  = 0x10
+	PTRACE_READTEXT                  = 0x12
+	PTRACE_SECCOMP_GET_FILTER        = 0x420c
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETFPAREGS                = 0x15
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETFPREGS64               = 0x1a
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGS64                 = 0x17
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SPARC_DETACH              = 0xb
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	PTRACE_WRITEDATA                 = 0x11
+	PTRACE_WRITETEXT                 = 0x13
+	PT_FP                            = 0x48
+	PT_G0                            = 0x10
+	PT_G1                            = 0x14
+	PT_G2                            = 0x18
+	PT_G3                            = 0x1c
+	PT_G4                            = 0x20
+	PT_G5                            = 0x24
+	PT_G6                            = 0x28
+	PT_G7                            = 0x2c
+	PT_I0                            = 0x30
+	PT_I1                            = 0x34
+	PT_I2                            = 0x38
+	PT_I3                            = 0x3c
+	PT_I4                            = 0x40
+	PT_I5                            = 0x44
+	PT_I6                            = 0x48
+	PT_I7                            = 0x4c
+	PT_NPC                           = 0x8
+	PT_PC                            = 0x4
+	PT_PSR                           = 0x0
+	PT_REGS_MAGIC                    = 0x57ac6c00
+	PT_TNPC                          = 0x90
+	PT_TPC                           = 0x88
+	PT_TSTATE                        = 0x80
+	PT_V9_FP                         = 0x70
+	PT_V9_G0                         = 0x0
+	PT_V9_G1                         = 0x8
+	PT_V9_G2                         = 0x10
+	PT_V9_G3                         = 0x18
+	PT_V9_G4                         = 0x20
+	PT_V9_G5                         = 0x28
+	PT_V9_G6                         = 0x30
+	PT_V9_G7                         = 0x38
+	PT_V9_I0                         = 0x40
+	PT_V9_I1                         = 0x48
+	PT_V9_I2                         = 0x50
+	PT_V9_I3                         = 0x58
+	PT_V9_I4                         = 0x60
+	PT_V9_I5                         = 0x68
+	PT_V9_I6                         = 0x70
+	PT_V9_I7                         = 0x78
+	PT_V9_MAGIC                      = 0x9c
+	PT_V9_TNPC                       = 0x90
+	PT_V9_TPC                        = 0x88
+	PT_V9_TSTATE                     = 0x80
+	PT_V9_Y                          = 0x98
+	PT_WIM                           = 0x10
+	PT_Y                             = 0xc
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x6
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CC_ALGO                     = 0x10
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_MASK                = 0xf
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0x10
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x18
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELNSID                      = 0x59
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_LOOKUP_TABLE               = 0x1000
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETNSID                      = 0x5a
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETSTATS                     = 0x5e
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x5f
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWNSID                      = 0x58
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWSTATS                     = 0x5c
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x14
+	RTM_NR_MSGTYPES                  = 0x50
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_COMPARE_MASK                = 0x11
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_LINKDOWN                  = 0x10
+	RTNH_F_OFFLOAD                   = 0x8
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BABEL                     = 0x2a
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x23
+	SCM_TIMESTAMPNS                  = 0x21
+	SCM_WIFI_STATUS                  = 0x25
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCBONDCHANGEACTIVE             = 0x8995
+	SIOCBONDENSLAVE                  = 0x8990
+	SIOCBONDINFOQUERY                = 0x8994
+	SIOCBONDRELEASE                  = 0x8991
+	SIOCBONDSETHWADDR                = 0x8992
+	SIOCBONDSLAVEINFOQUERY           = 0x8993
+	SIOCBRADDBR                      = 0x89a0
+	SIOCBRADDIF                      = 0x89a2
+	SIOCBRDELBR                      = 0x89a1
+	SIOCBRDELIF                      = 0x89a3
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCETHTOOL                      = 0x8946
+	SIOCGARP                         = 0x8954
+	SIOCGHWTSTAMP                    = 0x89b1
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGIFVLAN                      = 0x8982
+	SIOCGMIIPHY                      = 0x8947
+	SIOCGMIIREG                      = 0x8948
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCINQ                          = 0x4004667f
+	SIOCOUTQ                         = 0x40047473
+	SIOCOUTQNSD                      = 0x894b
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSHWTSTAMP                    = 0x89b0
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSIFVLAN                      = 0x8983
+	SIOCSMIIREG                      = 0x8949
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SIOCWANDEV                       = 0x894a
+	SOCK_CLOEXEC                     = 0x400000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x4000
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ALG                          = 0x117
+	SOL_ATM                          = 0x108
+	SOL_CAIF                         = 0x116
+	SOL_DCCP                         = 0x10d
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_IUCV                         = 0x115
+	SOL_KCM                          = 0x119
+	SOL_LLC                          = 0x10c
+	SOL_NETBEUI                      = 0x10b
+	SOL_NETLINK                      = 0x10e
+	SOL_NFC                          = 0x118
+	SOL_PACKET                       = 0x107
+	SOL_PNPIPE                       = 0x113
+	SOL_PPPOL2TP                     = 0x111
+	SOL_RAW                          = 0xff
+	SOL_RDS                          = 0x114
+	SOL_RXRPC                        = 0x110
+	SOL_SOCKET                       = 0xffff
+	SOL_TCP                          = 0x6
+	SOL_TIPC                         = 0x10f
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x8000
+	SO_ATTACH_BPF                    = 0x34
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF         = 0x35
+	SO_ATTACH_REUSEPORT_EBPF         = 0x36
+	SO_BINDTODEVICE                  = 0xd
+	SO_BPF_EXTENSIONS                = 0x32
+	SO_BROADCAST                     = 0x20
+	SO_BSDCOMPAT                     = 0x400
+	SO_BUSY_POLL                     = 0x30
+	SO_CNX_ADVICE                    = 0x37
+	SO_DEBUG                         = 0x1
+	SO_DETACH_BPF                    = 0x1b
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x1029
+	SO_DONTROUTE                     = 0x10
+	SO_ERROR                         = 0x1007
+	SO_GET_FILTER                    = 0x1a
+	SO_INCOMING_CPU                  = 0x33
+	SO_KEEPALIVE                     = 0x8
+	SO_LINGER                        = 0x80
+	SO_LOCK_FILTER                   = 0x28
+	SO_MARK                          = 0x22
+	SO_MAX_PACING_RATE               = 0x31
+	SO_NOFCS                         = 0x27
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0x100
+	SO_PASSCRED                      = 0x2
+	SO_PASSSEC                       = 0x1f
+	SO_PEEK_OFF                      = 0x26
+	SO_PEERCRED                      = 0x40
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1e
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x1028
+	SO_RCVBUF                        = 0x1002
+	SO_RCVBUFFORCE                   = 0x100b
+	SO_RCVLOWAT                      = 0x800
+	SO_RCVTIMEO                      = 0x2000
+	SO_REUSEADDR                     = 0x4
+	SO_REUSEPORT                     = 0x200
+	SO_RXQ_OVFL                      = 0x24
+	SO_SECURITY_AUTHENTICATION       = 0x5001
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x5004
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x5002
+	SO_SELECT_ERR_QUEUE              = 0x29
+	SO_SNDBUF                        = 0x1001
+	SO_SNDBUFFORCE                   = 0x100a
+	SO_SNDLOWAT                      = 0x1000
+	SO_SNDTIMEO                      = 0x4000
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x23
+	SO_TIMESTAMPNS                   = 0x21
+	SO_TYPE                          = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
+	SO_VM_SOCKETS_TRUSTED            = 0x5
+	SO_WIFI_STATUS                   = 0x25
+	SPLICE_F_GIFT                    = 0x8
+	SPLICE_F_MORE                    = 0x4
+	SPLICE_F_MOVE                    = 0x1
+	SPLICE_F_NONBLOCK                = 0x2
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x20005407
+	TCGETA                           = 0x40125401
+	TCGETS                           = 0x40245408
+	TCGETS2                          = 0x402c540c
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CC_INFO                      = 0x1a
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_NOTSENT_LOWAT                = 0x19
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SAVED_SYN                    = 0x1c
+	TCP_SAVE_SYN                     = 0x1b
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x20005405
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x80125402
+	TCSETAF                          = 0x80125404
+	TCSETAW                          = 0x80125403
+	TCSETS                           = 0x80245409
+	TCSETS2                          = 0x802c540d
+	TCSETSF                          = 0x8024540b
+	TCSETSF2                         = 0x802c540f
+	TCSETSW                          = 0x8024540a
+	TCSETSW2                         = 0x802c540e
+	TCXONC                           = 0x20005406
+	TIOCCBRK                         = 0x2000747a
+	TIOCCONS                         = 0x20007424
+	TIOCEXCL                         = 0x2000740d
+	TIOCGDEV                         = 0x40045432
+	TIOCGETD                         = 0x40047400
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGPGRP                        = 0x40047483
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40047486
+	TIOCGRS485                       = 0x40205441
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x40047485
+	TIOCGSOFTCAR                     = 0x40047464
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x4004667f
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x8004746b
+	TIOCMBIS                         = 0x8004746c
+	TIOCMGET                         = 0x4004746a
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x8004746d
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_LOOP                       = 0x8000
+	TIOCM_OUT1                       = 0x2000
+	TIOCM_OUT2                       = 0x4000
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x20007471
+	TIOCNXCL                         = 0x2000740e
+	TIOCOUTQ                         = 0x40047473
+	TIOCPKT                          = 0x80047470
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x2000747b
+	TIOCSCTTY                        = 0x20007484
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x80047401
+	TIOCSIG                          = 0x80047488
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSPGRP                        = 0x80047482
+	TIOCSPTLCK                       = 0x80047487
+	TIOCSRS485                       = 0xc0205442
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x80047465
+	TIOCSTART                        = 0x2000746e
+	TIOCSTI                          = 0x80017472
+	TIOCSTOP                         = 0x2000746f
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x20005437
+	TOSTOP                           = 0x100
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETBE                     = 0x400454df
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNGETVNETLE                     = 0x400454dd
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETBE                     = 0x800454de
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	TUNSETVNETLE                     = 0x800454dc
+	VDISCARD                         = 0xd
+	VDSUSP                           = 0xb
+	VEOF                             = 0x4
+	VEOL                             = 0x5
+	VEOL2                            = 0x6
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMADDR_CID_ANY                   = 0xffffffff
+	VMADDR_CID_HOST                  = 0x2
+	VMADDR_CID_HYPERVISOR            = 0x0
+	VMADDR_CID_RESERVED              = 0x1
+	VMADDR_PORT_ANY                  = 0xffffffff
+	VMIN                             = 0x4
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WRAP                             = 0x20000
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
+	__TIOCFLUSH                      = 0x80047410
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EADV            = syscall.Errno(0x53)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x25)
+	EBADE           = syscall.Errno(0x66)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x5d)
+	EBADMSG         = syscall.Errno(0x4c)
+	EBADR           = syscall.Errno(0x67)
+	EBADRQC         = syscall.Errno(0x6a)
+	EBADSLT         = syscall.Errno(0x6b)
+	EBFONT          = syscall.Errno(0x6d)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7f)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x5e)
+	ECOMM           = syscall.Errno(0x55)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0x4e)
+	EDEADLOCK       = syscall.Errno(0x6c)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EHWPOISON       = syscall.Errno(0x87)
+	EIDRM           = syscall.Errno(0x4d)
+	EILSEQ          = syscall.Errno(0x7a)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x81)
+	EKEYREJECTED    = syscall.Errno(0x83)
+	EKEYREVOKED     = syscall.Errno(0x82)
+	EL2HLT          = syscall.Errno(0x65)
+	EL2NSYNC        = syscall.Errno(0x5f)
+	EL3HLT          = syscall.Errno(0x60)
+	EL3RST          = syscall.Errno(0x61)
+	ELIBACC         = syscall.Errno(0x72)
+	ELIBBAD         = syscall.Errno(0x70)
+	ELIBEXEC        = syscall.Errno(0x6e)
+	ELIBMAX         = syscall.Errno(0x7b)
+	ELIBSCN         = syscall.Errno(0x7c)
+	ELNRNG          = syscall.Errno(0x62)
+	ELOOP           = syscall.Errno(0x3e)
+	EMEDIUMTYPE     = syscall.Errno(0x7e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x57)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x69)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENOCSI          = syscall.Errno(0x64)
+	ENODATA         = syscall.Errno(0x6f)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x80)
+	ENOLCK          = syscall.Errno(0x4f)
+	ENOLINK         = syscall.Errno(0x52)
+	ENOMEDIUM       = syscall.Errno(0x7d)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x4b)
+	ENONET          = syscall.Errno(0x50)
+	ENOPKG          = syscall.Errno(0x71)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x4a)
+	ENOSTR          = syscall.Errno(0x48)
+	ENOSYS          = syscall.Errno(0x5a)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x85)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x73)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x5c)
+	EOWNERDEAD      = syscall.Errno(0x84)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROTO          = syscall.Errno(0x56)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x59)
+	EREMOTE         = syscall.Errno(0x47)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x74)
+	ERFKILL         = syscall.Errno(0x86)
+	EROFS           = syscall.Errno(0x1e)
+	ERREMOTE        = syscall.Errno(0x51)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x54)
+	ESTALE          = syscall.Errno(0x46)
+	ESTRPIPE        = syscall.Errno(0x5b)
+	ETIME           = syscall.Errno(0x49)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x63)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x68)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCLD    = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGLOST   = syscall.Signal(0x1d)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x17)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1d)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	36:  "operation now in progress",
+	37:  "operation already in progress",
+	38:  "socket operation on non-socket",
+	39:  "destination address required",
+	40:  "message too long",
+	41:  "protocol wrong type for socket",
+	42:  "protocol not available",
+	43:  "protocol not supported",
+	44:  "socket type not supported",
+	45:  "operation not supported",
+	46:  "protocol family not supported",
+	47:  "address family not supported by protocol",
+	48:  "address already in use",
+	49:  "cannot assign requested address",
+	50:  "network is down",
+	51:  "network is unreachable",
+	52:  "network dropped connection on reset",
+	53:  "software caused connection abort",
+	54:  "connection reset by peer",
+	55:  "no buffer space available",
+	56:  "transport endpoint is already connected",
+	57:  "transport endpoint is not connected",
+	58:  "cannot send after transport endpoint shutdown",
+	59:  "too many references: cannot splice",
+	60:  "connection timed out",
+	61:  "connection refused",
+	62:  "too many levels of symbolic links",
+	63:  "file name too long",
+	64:  "host is down",
+	65:  "no route to host",
+	66:  "directory not empty",
+	67:  "too many processes",
+	68:  "too many users",
+	69:  "disk quota exceeded",
+	70:  "stale file handle",
+	71:  "object is remote",
+	72:  "device not a stream",
+	73:  "timer expired",
+	74:  "out of streams resources",
+	75:  "no message of desired type",
+	76:  "bad message",
+	77:  "identifier removed",
+	78:  "resource deadlock avoided",
+	79:  "no locks available",
+	80:  "machine is not on the network",
+	81:  "unknown error 81",
+	82:  "link has been severed",
+	83:  "advertise error",
+	84:  "srmount error",
+	85:  "communication error on send",
+	86:  "protocol error",
+	87:  "multihop attempted",
+	88:  "RFS specific error",
+	89:  "remote address changed",
+	90:  "function not implemented",
+	91:  "streams pipe error",
+	92:  "value too large for defined data type",
+	93:  "file descriptor in bad state",
+	94:  "channel number out of range",
+	95:  "level 2 not synchronized",
+	96:  "level 3 halted",
+	97:  "level 3 reset",
+	98:  "link number out of range",
+	99:  "protocol driver not attached",
+	100: "no CSI structure available",
+	101: "level 2 halted",
+	102: "invalid exchange",
+	103: "invalid request descriptor",
+	104: "exchange full",
+	105: "no anode",
+	106: "invalid request code",
+	107: "invalid slot",
+	108: "file locking deadlock error",
+	109: "bad font file format",
+	110: "cannot exec a shared library directly",
+	111: "no data available",
+	112: "accessing a corrupted shared library",
+	113: "package not installed",
+	114: "can not access a needed shared library",
+	115: "name not unique on network",
+	116: "interrupted system call should be restarted",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "invalid or incomplete multibyte or wide character",
+	123: "attempting to link in too many shared libraries",
+	124: ".lib section in a.out corrupted",
+	125: "no medium found",
+	126: "wrong medium type",
+	127: "operation canceled",
+	128: "required key not available",
+	129: "key has expired",
+	130: "key has been revoked",
+	131: "key was rejected by service",
+	132: "owner died",
+	133: "state not recoverable",
+	134: "operation not possible due to RF-kill",
+	135: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "stopped (signal)",
+	18: "stopped",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "resource lost",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
new file mode 100644
index 00000000..19316b1d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
@@ -0,0 +1,1732 @@
+// mkerrors.sh -m32
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,netbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x1c
+	AF_BLUETOOTH                      = 0x1f
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x20
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x23
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OROUTE                         = 0x11
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x22
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ARCNET                     = 0x7
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	ARPHRD_STRIP                      = 0x17
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427d
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0084277
+	BIOCGETIF                         = 0x4090426b
+	BIOCGFEEDBACK                     = 0x4004427c
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRTIMEOUT                     = 0x400c427b
+	BIOCGSEESENT                      = 0x40044278
+	BIOCGSTATS                        = 0x4080426f
+	BIOCGSTATSOLD                     = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044276
+	BIOCSETF                          = 0x80084267
+	BIOCSETIF                         = 0x8090426c
+	BIOCSFEEDBACK                     = 0x8004427d
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRTIMEOUT                     = 0x800c427a
+	BIOCSSEESENT                      = 0x80044279
+	BIOCSTCPF                         = 0x80084272
+	BIOCSUDPF                         = 0x80084273
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALIGNMENT32                   = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DFLTBUFSIZE                   = 0x100000
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x1000000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLONE_CSIGNAL                     = 0xff
+	CLONE_FILES                       = 0x400
+	CLONE_FS                          = 0x200
+	CLONE_PID                         = 0x1000
+	CLONE_PTRACE                      = 0x2000
+	CLONE_SIGHAND                     = 0x800
+	CLONE_VFORK                       = 0x4000
+	CLONE_VM                          = 0x100
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	CTL_QUERY                         = -0x2
+	DIOCBSFLUSH                       = 0x20006478
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HDLC                          = 0x10
+	DLT_HHDLC                         = 0x79
+	DLT_HIPPI                         = 0xf
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0xe
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RAWAF_MASK                    = 0x2240000
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xd
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMUL_LINUX                        = 0x1
+	EMUL_LINUX32                      = 0x5
+	EMUL_MAXID                        = 0x6
+	EN_SW_CTL_INF                     = 0x1000
+	EN_SW_CTL_PREC                    = 0x300
+	EN_SW_CTL_ROUND                   = 0xc00
+	EN_SW_DATACHAIN                   = 0x80
+	EN_SW_DENORM                      = 0x2
+	EN_SW_INVOP                       = 0x1
+	EN_SW_OVERFLOW                    = 0x8
+	EN_SW_PRECLOSS                    = 0x20
+	EN_SW_UNDERFLOW                   = 0x10
+	EN_SW_ZERODIV                     = 0x4
+	ETHERCAP_JUMBO_MTU                = 0x4
+	ETHERCAP_VLAN_HWTAGGING           = 0x2
+	ETHERCAP_VLAN_MTU                 = 0x1
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERMTU_JUMBO                    = 0x2328
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MAX_LEN_JUMBO               = 0x233a
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_PPPOE_ENCAP_LEN             = 0x8
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = 0x2
+	EVFILT_PROC                       = 0x4
+	EVFILT_READ                       = 0x0
+	EVFILT_SIGNAL                     = 0x5
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = 0x6
+	EVFILT_VNODE                      = 0x3
+	EVFILT_WRITE                      = 0x1
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTATTR_CMD_START                 = 0x1
+	EXTATTR_CMD_STOP                  = 0x2
+	EXTATTR_NAMESPACE_SYSTEM          = 0x2
+	EXTATTR_NAMESPACE_USER            = 0x1
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x100
+	FLUSHO                            = 0x800000
+	F_CLOSEM                          = 0xa
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xc
+	F_FSCTL                           = -0x80000000
+	F_FSDIRMASK                       = 0x70000000
+	F_FSIN                            = 0x10000000
+	F_FSINOUT                         = 0x30000000
+	F_FSOUT                           = 0x20000000
+	F_FSPRIV                          = 0x8000
+	F_FSVOID                          = 0x40000000
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETNOSIGPIPE                    = 0xd
+	F_GETOWN                          = 0x5
+	F_MAXFD                           = 0xb
+	F_OK                              = 0x0
+	F_PARAM_MASK                      = 0xfff
+	F_PARAM_MAX                       = 0xfff
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETNOSIGPIPE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8f52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IPV6_ICMP                 = 0x3a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VRRP                      = 0x70
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_EF                             = 0x8000
+	IP_ERRORMTU                       = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x16
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MF                             = 0x2000
+	IP_MINFRAGSIZE                    = 0x45
+	IP_MINTTL                         = 0x18
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x17
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ALIGNMENT_16MB                = 0x18000000
+	MAP_ALIGNMENT_1TB                 = 0x28000000
+	MAP_ALIGNMENT_256TB               = 0x30000000
+	MAP_ALIGNMENT_4GB                 = 0x20000000
+	MAP_ALIGNMENT_64KB                = 0x10000000
+	MAP_ALIGNMENT_64PB                = 0x38000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DEFAULT               = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x2000
+	MAP_TRYFIXED                      = 0x400
+	MAP_WIRED                         = 0x800
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CONTROLMBUF                   = 0x2000000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_IOVUSRSPACE                   = 0x4000000
+	MSG_LENUSRSPACE                   = 0x8000000
+	MSG_MCAST                         = 0x200
+	MSG_NAMEMBUF                      = 0x1000000
+	MSG_NBIO                          = 0x1000
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_USERFLAGS                     = 0xffffff
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x4
+	NAME_MAX                          = 0x1ff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x5
+	NET_RT_MAXID                      = 0x6
+	NET_RT_OIFLIST                    = 0x4
+	NET_RT_OOIFLIST                   = 0x3
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFIOGETBMAP                       = 0xc004667a
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALT_IO                          = 0x40000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x400000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x80000
+	O_DIRECTORY                       = 0x200000
+	O_DSYNC                           = 0x10000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_NOSIGPIPE                       = 0x1000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x20000
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PRI_IOFLUSH                       = 0x7c
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x9
+	RTAX_NETMASK                      = 0x2
+	RTAX_TAG                          = 0x8
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTA_TAG                           = 0x100
+	RTF_ANNOUNCE                      = 0x20000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x2000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_REJECT                        = 0x8
+	RTF_SRC                           = 0x10000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_CHGADDR                       = 0x15
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x11
+	RTM_IFANNOUNCE                    = 0x10
+	RTM_IFINFO                        = 0x14
+	RTM_LLINFO_UPD                    = 0x13
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_OIFINFO                       = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_OOIFINFO                      = 0xe
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_SETGATE                       = 0x12
+	RTM_VERSION                       = 0x4
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x4
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x8
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80906931
+	SIOCADDRT                         = 0x8030720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCALIFADDR                      = 0x8118691c
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80906932
+	SIOCDELRT                         = 0x8030720b
+	SIOCDIFADDR                       = 0x80906919
+	SIOCDIFPHYADDR                    = 0x80906949
+	SIOCDLIFADDR                      = 0x8118691e
+	SIOCGDRVSPEC                      = 0xc01c697b
+	SIOCGETPFSYNC                     = 0xc09069f8
+	SIOCGETSGCNT                      = 0xc0147534
+	SIOCGETVIFCNT                     = 0xc0147533
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0906921
+	SIOCGIFADDRPREF                   = 0xc0946920
+	SIOCGIFALIAS                      = 0xc040691b
+	SIOCGIFBRDADDR                    = 0xc0906923
+	SIOCGIFCAP                        = 0xc0206976
+	SIOCGIFCONF                       = 0xc0086926
+	SIOCGIFDATA                       = 0xc0946985
+	SIOCGIFDLT                        = 0xc0906977
+	SIOCGIFDSTADDR                    = 0xc0906922
+	SIOCGIFFLAGS                      = 0xc0906911
+	SIOCGIFGENERIC                    = 0xc090693a
+	SIOCGIFMEDIA                      = 0xc0286936
+	SIOCGIFMETRIC                     = 0xc0906917
+	SIOCGIFMTU                        = 0xc090697e
+	SIOCGIFNETMASK                    = 0xc0906925
+	SIOCGIFPDSTADDR                   = 0xc0906948
+	SIOCGIFPSRCADDR                   = 0xc0906947
+	SIOCGLIFADDR                      = 0xc118691d
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLINKSTR                      = 0xc01c6987
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGVH                           = 0xc0906983
+	SIOCIFCREATE                      = 0x8090697a
+	SIOCIFDESTROY                     = 0x80906979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCINITIFADDR                    = 0xc0446984
+	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCSETPFSYNC                     = 0x809069f7
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8090690c
+	SIOCSIFADDRPREF                   = 0x8094691f
+	SIOCSIFBRDADDR                    = 0x80906913
+	SIOCSIFCAP                        = 0x80206975
+	SIOCSIFDSTADDR                    = 0x8090690e
+	SIOCSIFFLAGS                      = 0x80906910
+	SIOCSIFGENERIC                    = 0x80906939
+	SIOCSIFMEDIA                      = 0xc0906935
+	SIOCSIFMETRIC                     = 0x80906918
+	SIOCSIFMTU                        = 0x8090697f
+	SIOCSIFNETMASK                    = 0x80906916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLINKSTR                      = 0x801c6988
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSVH                           = 0xc0906982
+	SIOCZIFDATA                       = 0xc0946986
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_FLAGS_MASK                   = 0xf0000000
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_NOSIGPIPE                    = 0x40000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NOHEADER                       = 0x100a
+	SO_NOSIGPIPE                      = 0x800
+	SO_OOBINLINE                      = 0x100
+	SO_OVERFLOWED                     = 0x1009
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x100c
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x100b
+	SO_TIMESTAMP                      = 0x2000
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SYSCTL_VERSION                    = 0x1000000
+	SYSCTL_VERS_0                     = 0x0
+	SYSCTL_VERS_1                     = 0x1000000
+	SYSCTL_VERS_MASK                  = 0xff000000
+	S_ARCH1                           = 0x10000
+	S_ARCH2                           = 0x20000
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	S_LOGIN_SET                       = 0x1
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONGCTL                       = 0x20
+	TCP_KEEPCNT                       = 0x6
+	TCP_KEEPIDLE                      = 0x3
+	TCP_KEEPINIT                      = 0x7
+	TCP_KEEPINTVL                     = 0x5
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x400c7458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CDTRCTS                  = 0x10
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGLINED                        = 0x40207442
+	TIOCGPGRP                         = 0x40047477
+	TIOCGQSIZE                        = 0x40047481
+	TIOCGRANTPT                       = 0x20007447
+	TIOCGSID                          = 0x40047463
+	TIOCGSIZE                         = 0x40087468
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMGET                        = 0x40287446
+	TIOCPTSNAME                       = 0x40287448
+	TIOCRCVFRAME                      = 0x80047445
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x2000745f
+	TIOCSLINED                        = 0x80207443
+	TIOCSPGRP                         = 0x80047476
+	TIOCSQSIZE                        = 0x80047480
+	TIOCSSIZE                         = 0x80087467
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TIOCXMTFRAME                      = 0x80047444
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALL                              = 0x8
+	WALLSIG                           = 0x8
+	WALTSIG                           = 0x4
+	WCLONE                            = 0x4
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x10000
+	WNOZOMBIE                         = 0x20000
+	WOPTSCHECKED                      = 0x40000
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x58)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x57)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x55)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5e)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x59)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x5a)
+	ENOSTR          = syscall.Errno(0x5b)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x56)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x60)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x5c)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x20)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large or too small"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol option not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "connection timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EILSEQ", "illegal byte sequence"},
+	{86, "ENOTSUP", "not supported"},
+	{87, "ECANCELED", "operation Canceled"},
+	{88, "EBADMSG", "bad or Corrupt message"},
+	{89, "ENODATA", "no message available"},
+	{90, "ENOSR", "no STREAM resources"},
+	{91, "ENOSTR", "not a STREAM"},
+	{92, "ETIME", "STREAM ioctl timeout"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EMULTIHOP", "multihop attempted"},
+	{95, "ENOLINK", "link has been severed"},
+	{96, "ELAST", "protocol error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "stopped (signal)"},
+	{18, "SIGTSTP", "stopped"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGPWR", "power fail/restart"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
new file mode 100644
index 00000000..f2cf500f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
@@ -0,0 +1,1722 @@
+// mkerrors.sh -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,netbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x1c
+	AF_BLUETOOTH                      = 0x1f
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x20
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x23
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OROUTE                         = 0x11
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x22
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ARCNET                     = 0x7
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	ARPHRD_STRIP                      = 0x17
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427d
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0104277
+	BIOCGETIF                         = 0x4090426b
+	BIOCGFEEDBACK                     = 0x4004427c
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRTIMEOUT                     = 0x4010427b
+	BIOCGSEESENT                      = 0x40044278
+	BIOCGSTATS                        = 0x4080426f
+	BIOCGSTATSOLD                     = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044276
+	BIOCSETF                          = 0x80104267
+	BIOCSETIF                         = 0x8090426c
+	BIOCSFEEDBACK                     = 0x8004427d
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRTIMEOUT                     = 0x8010427a
+	BIOCSSEESENT                      = 0x80044279
+	BIOCSTCPF                         = 0x80104272
+	BIOCSUDPF                         = 0x80104273
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x8
+	BPF_ALIGNMENT32                   = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DFLTBUFSIZE                   = 0x100000
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x1000000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLONE_CSIGNAL                     = 0xff
+	CLONE_FILES                       = 0x400
+	CLONE_FS                          = 0x200
+	CLONE_PID                         = 0x1000
+	CLONE_PTRACE                      = 0x2000
+	CLONE_SIGHAND                     = 0x800
+	CLONE_VFORK                       = 0x4000
+	CLONE_VM                          = 0x100
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	CTL_QUERY                         = -0x2
+	DIOCBSFLUSH                       = 0x20006478
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HDLC                          = 0x10
+	DLT_HHDLC                         = 0x79
+	DLT_HIPPI                         = 0xf
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0xe
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RAWAF_MASK                    = 0x2240000
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xd
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMUL_LINUX                        = 0x1
+	EMUL_LINUX32                      = 0x5
+	EMUL_MAXID                        = 0x6
+	ETHERCAP_JUMBO_MTU                = 0x4
+	ETHERCAP_VLAN_HWTAGGING           = 0x2
+	ETHERCAP_VLAN_MTU                 = 0x1
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERMTU_JUMBO                    = 0x2328
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MAX_LEN_JUMBO               = 0x233a
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_PPPOE_ENCAP_LEN             = 0x8
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = 0x2
+	EVFILT_PROC                       = 0x4
+	EVFILT_READ                       = 0x0
+	EVFILT_SIGNAL                     = 0x5
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = 0x6
+	EVFILT_VNODE                      = 0x3
+	EVFILT_WRITE                      = 0x1
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTATTR_CMD_START                 = 0x1
+	EXTATTR_CMD_STOP                  = 0x2
+	EXTATTR_NAMESPACE_SYSTEM          = 0x2
+	EXTATTR_NAMESPACE_USER            = 0x1
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x100
+	FLUSHO                            = 0x800000
+	F_CLOSEM                          = 0xa
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xc
+	F_FSCTL                           = -0x80000000
+	F_FSDIRMASK                       = 0x70000000
+	F_FSIN                            = 0x10000000
+	F_FSINOUT                         = 0x30000000
+	F_FSOUT                           = 0x20000000
+	F_FSPRIV                          = 0x8000
+	F_FSVOID                          = 0x40000000
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETNOSIGPIPE                    = 0xd
+	F_GETOWN                          = 0x5
+	F_MAXFD                           = 0xb
+	F_OK                              = 0x0
+	F_PARAM_MASK                      = 0xfff
+	F_PARAM_MAX                       = 0xfff
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETNOSIGPIPE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8f52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IPV6_ICMP                 = 0x3a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VRRP                      = 0x70
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_EF                             = 0x8000
+	IP_ERRORMTU                       = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x16
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MF                             = 0x2000
+	IP_MINFRAGSIZE                    = 0x45
+	IP_MINTTL                         = 0x18
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x17
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ALIGNMENT_16MB                = 0x18000000
+	MAP_ALIGNMENT_1TB                 = 0x28000000
+	MAP_ALIGNMENT_256TB               = 0x30000000
+	MAP_ALIGNMENT_4GB                 = 0x20000000
+	MAP_ALIGNMENT_64KB                = 0x10000000
+	MAP_ALIGNMENT_64PB                = 0x38000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DEFAULT               = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x2000
+	MAP_TRYFIXED                      = 0x400
+	MAP_WIRED                         = 0x800
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CONTROLMBUF                   = 0x2000000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_IOVUSRSPACE                   = 0x4000000
+	MSG_LENUSRSPACE                   = 0x8000000
+	MSG_MCAST                         = 0x200
+	MSG_NAMEMBUF                      = 0x1000000
+	MSG_NBIO                          = 0x1000
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_USERFLAGS                     = 0xffffff
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x4
+	NAME_MAX                          = 0x1ff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x5
+	NET_RT_MAXID                      = 0x6
+	NET_RT_OIFLIST                    = 0x4
+	NET_RT_OOIFLIST                   = 0x3
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFIOGETBMAP                       = 0xc004667a
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALT_IO                          = 0x40000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x400000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x80000
+	O_DIRECTORY                       = 0x200000
+	O_DSYNC                           = 0x10000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_NOSIGPIPE                       = 0x1000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x20000
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PRI_IOFLUSH                       = 0x7c
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x9
+	RTAX_NETMASK                      = 0x2
+	RTAX_TAG                          = 0x8
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTA_TAG                           = 0x100
+	RTF_ANNOUNCE                      = 0x20000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x2000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_REJECT                        = 0x8
+	RTF_SRC                           = 0x10000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_CHGADDR                       = 0x15
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x11
+	RTM_IFANNOUNCE                    = 0x10
+	RTM_IFINFO                        = 0x14
+	RTM_LLINFO_UPD                    = 0x13
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_OIFINFO                       = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_OOIFINFO                      = 0xe
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_SETGATE                       = 0x12
+	RTM_VERSION                       = 0x4
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x4
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x8
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80906931
+	SIOCADDRT                         = 0x8038720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCALIFADDR                      = 0x8118691c
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80906932
+	SIOCDELRT                         = 0x8038720b
+	SIOCDIFADDR                       = 0x80906919
+	SIOCDIFPHYADDR                    = 0x80906949
+	SIOCDLIFADDR                      = 0x8118691e
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETPFSYNC                     = 0xc09069f8
+	SIOCGETSGCNT                      = 0xc0207534
+	SIOCGETVIFCNT                     = 0xc0287533
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0906921
+	SIOCGIFADDRPREF                   = 0xc0986920
+	SIOCGIFALIAS                      = 0xc040691b
+	SIOCGIFBRDADDR                    = 0xc0906923
+	SIOCGIFCAP                        = 0xc0206976
+	SIOCGIFCONF                       = 0xc0106926
+	SIOCGIFDATA                       = 0xc0986985
+	SIOCGIFDLT                        = 0xc0906977
+	SIOCGIFDSTADDR                    = 0xc0906922
+	SIOCGIFFLAGS                      = 0xc0906911
+	SIOCGIFGENERIC                    = 0xc090693a
+	SIOCGIFMEDIA                      = 0xc0306936
+	SIOCGIFMETRIC                     = 0xc0906917
+	SIOCGIFMTU                        = 0xc090697e
+	SIOCGIFNETMASK                    = 0xc0906925
+	SIOCGIFPDSTADDR                   = 0xc0906948
+	SIOCGIFPSRCADDR                   = 0xc0906947
+	SIOCGLIFADDR                      = 0xc118691d
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLINKSTR                      = 0xc0286987
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGVH                           = 0xc0906983
+	SIOCIFCREATE                      = 0x8090697a
+	SIOCIFDESTROY                     = 0x80906979
+	SIOCIFGCLONERS                    = 0xc0106978
+	SIOCINITIFADDR                    = 0xc0706984
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETPFSYNC                     = 0x809069f7
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8090690c
+	SIOCSIFADDRPREF                   = 0x8098691f
+	SIOCSIFBRDADDR                    = 0x80906913
+	SIOCSIFCAP                        = 0x80206975
+	SIOCSIFDSTADDR                    = 0x8090690e
+	SIOCSIFFLAGS                      = 0x80906910
+	SIOCSIFGENERIC                    = 0x80906939
+	SIOCSIFMEDIA                      = 0xc0906935
+	SIOCSIFMETRIC                     = 0x80906918
+	SIOCSIFMTU                        = 0x8090697f
+	SIOCSIFNETMASK                    = 0x80906916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLINKSTR                      = 0x80286988
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSVH                           = 0xc0906982
+	SIOCZIFDATA                       = 0xc0986986
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_FLAGS_MASK                   = 0xf0000000
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_NOSIGPIPE                    = 0x40000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NOHEADER                       = 0x100a
+	SO_NOSIGPIPE                      = 0x800
+	SO_OOBINLINE                      = 0x100
+	SO_OVERFLOWED                     = 0x1009
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x100c
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x100b
+	SO_TIMESTAMP                      = 0x2000
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SYSCTL_VERSION                    = 0x1000000
+	SYSCTL_VERS_0                     = 0x0
+	SYSCTL_VERS_1                     = 0x1000000
+	SYSCTL_VERS_MASK                  = 0xff000000
+	S_ARCH1                           = 0x10000
+	S_ARCH2                           = 0x20000
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	S_LOGIN_SET                       = 0x1
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONGCTL                       = 0x20
+	TCP_KEEPCNT                       = 0x6
+	TCP_KEEPIDLE                      = 0x3
+	TCP_KEEPINIT                      = 0x7
+	TCP_KEEPINTVL                     = 0x5
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CDTRCTS                  = 0x10
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGLINED                        = 0x40207442
+	TIOCGPGRP                         = 0x40047477
+	TIOCGQSIZE                        = 0x40047481
+	TIOCGRANTPT                       = 0x20007447
+	TIOCGSID                          = 0x40047463
+	TIOCGSIZE                         = 0x40087468
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMGET                        = 0x40287446
+	TIOCPTSNAME                       = 0x40287448
+	TIOCRCVFRAME                      = 0x80087445
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x2000745f
+	TIOCSLINED                        = 0x80207443
+	TIOCSPGRP                         = 0x80047476
+	TIOCSQSIZE                        = 0x80047480
+	TIOCSSIZE                         = 0x80087467
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TIOCXMTFRAME                      = 0x80087444
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALL                              = 0x8
+	WALLSIG                           = 0x8
+	WALTSIG                           = 0x4
+	WCLONE                            = 0x4
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x10000
+	WNOZOMBIE                         = 0x20000
+	WOPTSCHECKED                      = 0x40000
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x58)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x57)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x55)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5e)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x59)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x5a)
+	ENOSTR          = syscall.Errno(0x5b)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x56)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x60)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x5c)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x20)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large or too small"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol option not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "connection timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EILSEQ", "illegal byte sequence"},
+	{86, "ENOTSUP", "not supported"},
+	{87, "ECANCELED", "operation Canceled"},
+	{88, "EBADMSG", "bad or Corrupt message"},
+	{89, "ENODATA", "no message available"},
+	{90, "ENOSR", "no STREAM resources"},
+	{91, "ENOSTR", "not a STREAM"},
+	{92, "ETIME", "STREAM ioctl timeout"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EMULTIHOP", "multihop attempted"},
+	{95, "ENOLINK", "link has been severed"},
+	{96, "ELAST", "protocol error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "stopped (signal)"},
+	{18, "SIGTSTP", "stopped"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGPWR", "power fail/restart"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
new file mode 100644
index 00000000..858e2999
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
@@ -0,0 +1,1711 @@
+// mkerrors.sh -marm
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,netbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -marm _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x1c
+	AF_BLUETOOTH                      = 0x1f
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x20
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x23
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OROUTE                         = 0x11
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x22
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ARCNET                     = 0x7
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	ARPHRD_STRIP                      = 0x17
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427d
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0084277
+	BIOCGETIF                         = 0x4090426b
+	BIOCGFEEDBACK                     = 0x4004427c
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRTIMEOUT                     = 0x400c427b
+	BIOCGSEESENT                      = 0x40044278
+	BIOCGSTATS                        = 0x4080426f
+	BIOCGSTATSOLD                     = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044276
+	BIOCSETF                          = 0x80084267
+	BIOCSETIF                         = 0x8090426c
+	BIOCSFEEDBACK                     = 0x8004427d
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRTIMEOUT                     = 0x800c427a
+	BIOCSSEESENT                      = 0x80044279
+	BIOCSTCPF                         = 0x80084272
+	BIOCSUDPF                         = 0x80084273
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALIGNMENT32                   = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DFLTBUFSIZE                   = 0x100000
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x1000000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	CTL_QUERY                         = -0x2
+	DIOCBSFLUSH                       = 0x20006478
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HDLC                          = 0x10
+	DLT_HHDLC                         = 0x79
+	DLT_HIPPI                         = 0xf
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0xe
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RAWAF_MASK                    = 0x2240000
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xd
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMUL_LINUX                        = 0x1
+	EMUL_LINUX32                      = 0x5
+	EMUL_MAXID                        = 0x6
+	ETHERCAP_JUMBO_MTU                = 0x4
+	ETHERCAP_VLAN_HWTAGGING           = 0x2
+	ETHERCAP_VLAN_MTU                 = 0x1
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERMTU_JUMBO                    = 0x2328
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MAX_LEN_JUMBO               = 0x233a
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_PPPOE_ENCAP_LEN             = 0x8
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = 0x2
+	EVFILT_PROC                       = 0x4
+	EVFILT_READ                       = 0x0
+	EVFILT_SIGNAL                     = 0x5
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = 0x6
+	EVFILT_VNODE                      = 0x3
+	EVFILT_WRITE                      = 0x1
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTATTR_CMD_START                 = 0x1
+	EXTATTR_CMD_STOP                  = 0x2
+	EXTATTR_NAMESPACE_SYSTEM          = 0x2
+	EXTATTR_NAMESPACE_USER            = 0x1
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x100
+	FLUSHO                            = 0x800000
+	F_CLOSEM                          = 0xa
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xc
+	F_FSCTL                           = -0x80000000
+	F_FSDIRMASK                       = 0x70000000
+	F_FSIN                            = 0x10000000
+	F_FSINOUT                         = 0x30000000
+	F_FSOUT                           = 0x20000000
+	F_FSPRIV                          = 0x8000
+	F_FSVOID                          = 0x40000000
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETNOSIGPIPE                    = 0xd
+	F_GETOWN                          = 0x5
+	F_MAXFD                           = 0xb
+	F_OK                              = 0x0
+	F_PARAM_MASK                      = 0xfff
+	F_PARAM_MAX                       = 0xfff
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETNOSIGPIPE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8f52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IPV6_ICMP                 = 0x3a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VRRP                      = 0x70
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_EF                             = 0x8000
+	IP_ERRORMTU                       = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x16
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MF                             = 0x2000
+	IP_MINFRAGSIZE                    = 0x45
+	IP_MINTTL                         = 0x18
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x17
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ALIGNMENT_16MB                = 0x18000000
+	MAP_ALIGNMENT_1TB                 = 0x28000000
+	MAP_ALIGNMENT_256TB               = 0x30000000
+	MAP_ALIGNMENT_4GB                 = 0x20000000
+	MAP_ALIGNMENT_64KB                = 0x10000000
+	MAP_ALIGNMENT_64PB                = 0x38000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DEFAULT               = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x2000
+	MAP_TRYFIXED                      = 0x400
+	MAP_WIRED                         = 0x800
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CONTROLMBUF                   = 0x2000000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_IOVUSRSPACE                   = 0x4000000
+	MSG_LENUSRSPACE                   = 0x8000000
+	MSG_MCAST                         = 0x200
+	MSG_NAMEMBUF                      = 0x1000000
+	MSG_NBIO                          = 0x1000
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_USERFLAGS                     = 0xffffff
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x4
+	NAME_MAX                          = 0x1ff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x5
+	NET_RT_MAXID                      = 0x6
+	NET_RT_OIFLIST                    = 0x4
+	NET_RT_OOIFLIST                   = 0x3
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFIOGETBMAP                       = 0xc004667a
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALT_IO                          = 0x40000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x400000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x80000
+	O_DIRECTORY                       = 0x200000
+	O_DSYNC                           = 0x10000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_NOSIGPIPE                       = 0x1000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x20000
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PRI_IOFLUSH                       = 0x7c
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x9
+	RTAX_NETMASK                      = 0x2
+	RTAX_TAG                          = 0x8
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTA_TAG                           = 0x100
+	RTF_ANNOUNCE                      = 0x20000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x2000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_REJECT                        = 0x8
+	RTF_SRC                           = 0x10000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_CHGADDR                       = 0x15
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x11
+	RTM_IFANNOUNCE                    = 0x10
+	RTM_IFINFO                        = 0x14
+	RTM_LLINFO_UPD                    = 0x13
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_OIFINFO                       = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_OOIFINFO                      = 0xe
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_SETGATE                       = 0x12
+	RTM_VERSION                       = 0x4
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x4
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x8
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80906931
+	SIOCADDRT                         = 0x8030720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCALIFADDR                      = 0x8118691c
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80906932
+	SIOCDELRT                         = 0x8030720b
+	SIOCDIFADDR                       = 0x80906919
+	SIOCDIFPHYADDR                    = 0x80906949
+	SIOCDLIFADDR                      = 0x8118691e
+	SIOCGDRVSPEC                      = 0xc01c697b
+	SIOCGETPFSYNC                     = 0xc09069f8
+	SIOCGETSGCNT                      = 0xc0147534
+	SIOCGETVIFCNT                     = 0xc0147533
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0906921
+	SIOCGIFADDRPREF                   = 0xc0946920
+	SIOCGIFALIAS                      = 0xc040691b
+	SIOCGIFBRDADDR                    = 0xc0906923
+	SIOCGIFCAP                        = 0xc0206976
+	SIOCGIFCONF                       = 0xc0086926
+	SIOCGIFDATA                       = 0xc0946985
+	SIOCGIFDLT                        = 0xc0906977
+	SIOCGIFDSTADDR                    = 0xc0906922
+	SIOCGIFFLAGS                      = 0xc0906911
+	SIOCGIFGENERIC                    = 0xc090693a
+	SIOCGIFMEDIA                      = 0xc0286936
+	SIOCGIFMETRIC                     = 0xc0906917
+	SIOCGIFMTU                        = 0xc090697e
+	SIOCGIFNETMASK                    = 0xc0906925
+	SIOCGIFPDSTADDR                   = 0xc0906948
+	SIOCGIFPSRCADDR                   = 0xc0906947
+	SIOCGLIFADDR                      = 0xc118691d
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLINKSTR                      = 0xc01c6987
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGVH                           = 0xc0906983
+	SIOCIFCREATE                      = 0x8090697a
+	SIOCIFDESTROY                     = 0x80906979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCINITIFADDR                    = 0xc0446984
+	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCSETPFSYNC                     = 0x809069f7
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8090690c
+	SIOCSIFADDRPREF                   = 0x8094691f
+	SIOCSIFBRDADDR                    = 0x80906913
+	SIOCSIFCAP                        = 0x80206975
+	SIOCSIFDSTADDR                    = 0x8090690e
+	SIOCSIFFLAGS                      = 0x80906910
+	SIOCSIFGENERIC                    = 0x80906939
+	SIOCSIFMEDIA                      = 0xc0906935
+	SIOCSIFMETRIC                     = 0x80906918
+	SIOCSIFMTU                        = 0x8090697f
+	SIOCSIFNETMASK                    = 0x80906916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLINKSTR                      = 0x801c6988
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSVH                           = 0xc0906982
+	SIOCZIFDATA                       = 0xc0946986
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_FLAGS_MASK                   = 0xf0000000
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_NOSIGPIPE                    = 0x40000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NOHEADER                       = 0x100a
+	SO_NOSIGPIPE                      = 0x800
+	SO_OOBINLINE                      = 0x100
+	SO_OVERFLOWED                     = 0x1009
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x100c
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x100b
+	SO_TIMESTAMP                      = 0x2000
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SYSCTL_VERSION                    = 0x1000000
+	SYSCTL_VERS_0                     = 0x0
+	SYSCTL_VERS_1                     = 0x1000000
+	SYSCTL_VERS_MASK                  = 0xff000000
+	S_ARCH1                           = 0x10000
+	S_ARCH2                           = 0x20000
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONGCTL                       = 0x20
+	TCP_KEEPCNT                       = 0x6
+	TCP_KEEPIDLE                      = 0x3
+	TCP_KEEPINIT                      = 0x7
+	TCP_KEEPINTVL                     = 0x5
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x400c7458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CDTRCTS                  = 0x10
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGLINED                        = 0x40207442
+	TIOCGPGRP                         = 0x40047477
+	TIOCGQSIZE                        = 0x40047481
+	TIOCGRANTPT                       = 0x20007447
+	TIOCGSID                          = 0x40047463
+	TIOCGSIZE                         = 0x40087468
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMGET                        = 0x48087446
+	TIOCPTSNAME                       = 0x48087448
+	TIOCRCVFRAME                      = 0x80047445
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x2000745f
+	TIOCSLINED                        = 0x80207443
+	TIOCSPGRP                         = 0x80047476
+	TIOCSQSIZE                        = 0x80047480
+	TIOCSSIZE                         = 0x80087467
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TIOCXMTFRAME                      = 0x80047444
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALL                              = 0x8
+	WALLSIG                           = 0x8
+	WALTSIG                           = 0x4
+	WCLONE                            = 0x4
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x10000
+	WNOZOMBIE                         = 0x20000
+	WOPTSCHECKED                      = 0x40000
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x58)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x57)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x55)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5e)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x59)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x5a)
+	ENOSTR          = syscall.Errno(0x5b)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x56)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x60)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x5c)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x20)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large or too small"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol option not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "connection timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EILSEQ", "illegal byte sequence"},
+	{86, "ENOTSUP", "not supported"},
+	{87, "ECANCELED", "operation Canceled"},
+	{88, "EBADMSG", "bad or Corrupt message"},
+	{89, "ENODATA", "no message available"},
+	{90, "ENOSR", "no STREAM resources"},
+	{91, "ENOSTR", "not a STREAM"},
+	{92, "ETIME", "STREAM ioctl timeout"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EMULTIHOP", "multihop attempted"},
+	{95, "ENOLINK", "link has been severed"},
+	{96, "ELAST", "protocol error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "stopped (signal)"},
+	{18, "SIGTSTP", "stopped"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGPWR", "power fail/restart"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
new file mode 100644
index 00000000..7d92f2c5
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
@@ -0,0 +1,1628 @@
+// mkerrors.sh -m32
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,openbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_BLUETOOTH                      = 0x20
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_ENCAP                          = 0x1c
+	AF_HYLINK                         = 0xf
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_KEY                            = 0x1e
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x24
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x1d
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRFILT                      = 0x4004427c
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc008427b
+	BIOCGETIF                         = 0x4020426b
+	BIOCGFILDROP                      = 0x40044278
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044273
+	BIOCGRTIMEOUT                     = 0x400c426e
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x20004276
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRFILT                      = 0x8004427d
+	BIOCSDLT                          = 0x8004427a
+	BIOCSETF                          = 0x80084267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x80084277
+	BIOCSFILDROP                      = 0x80044279
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044272
+	BIOCSRTIMEOUT                     = 0x800c426d
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIRECTION_IN                  = 0x1
+	BPF_DIRECTION_OUT                 = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x200000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0xff
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DIOCOSFPFLUSH                     = 0x2000444e
+	DLT_ARCNET                        = 0x7
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AX25                          = 0x3
+	DLT_CHAOS                         = 0x5
+	DLT_C_HDLC                        = 0x68
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0xd
+	DLT_FDDI                          = 0xa
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_LOOP                          = 0xc
+	DLT_MPLS                          = 0xdb
+	DLT_NULL                          = 0x0
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PRONET                        = 0x4
+	DLT_RAW                           = 0xe
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMT_TAGOVF                        = 0x1
+	EMUL_ENABLED                      = 0x1
+	EMUL_NATIVE                       = 0x2
+	ENDRUNDISC                        = 0x9
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_AOE                     = 0x88a2
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LLDP                    = 0x88cc
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_QINQ                    = 0x88a8
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOW                    = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_ALIGN                       = 0x2
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_DIX_LEN                 = 0x600
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = -0x3
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = -0x7
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xa
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETOWN                          = 0x5
+	F_OK                              = 0x0
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8e52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BLUETOOTH                     = 0xf8
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf7
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DUMMY                         = 0xf1
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf3
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFLOW                         = 0xf9
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf2
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_HOST                   = 0x1
+	IN_RFC3021_NET                    = 0xfffffffe
+	IN_RFC3021_NSHIFT                 = 0x1f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DIVERT_INIT               = 0x2
+	IPPROTO_DIVERT_RESP               = 0x1
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x103
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPV6_AUTH_LEVEL                   = 0x35
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_ESP_NETWORK_LEVEL            = 0x37
+	IPV6_ESP_TRANS_LEVEL              = 0x36
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPCOMP_LEVEL                 = 0x3c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_OPTIONS                      = 0x1
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PIPEX                        = 0x3f
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVDSTPORT                  = 0x40
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTABLE                       = 0x1021
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_AUTH_LEVEL                     = 0x14
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DIVERTFL                       = 0x1022
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_ESP_NETWORK_LEVEL              = 0x16
+	IP_ESP_TRANS_LEVEL                = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPCOMP_LEVEL                   = 0x1d
+	IP_IPSECFLOWINFO                  = 0x24
+	IP_IPSEC_LOCAL_AUTH               = 0x1b
+	IP_IPSEC_LOCAL_CRED               = 0x19
+	IP_IPSEC_LOCAL_ID                 = 0x17
+	IP_IPSEC_REMOTE_AUTH              = 0x1c
+	IP_IPSEC_REMOTE_CRED              = 0x1a
+	IP_IPSEC_REMOTE_ID                = 0x18
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x20
+	IP_MIN_MEMBERSHIPS                = 0xf
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PIPEX                          = 0x22
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVDSTPORT                    = 0x21
+	IP_RECVIF                         = 0x1e
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVRTABLE                     = 0x23
+	IP_RECVTTL                        = 0x1f
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RTABLE                         = 0x1021
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LCNT_OVERLOAD_FLUSH               = 0x6
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x4
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_FLAGMASK                      = 0x1ff7
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_TRYFIXED                      = 0x400
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_MCAST                         = 0x200
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x4
+	MS_SYNC                           = 0x2
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_MAXID                      = 0x6
+	NET_RT_STATS                      = 0x4
+	NET_RT_TABLE                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EOF                          = 0x2
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRUNCATE                     = 0x80
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x80
+	ONOCR                             = 0x40
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x10000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x20000
+	O_DSYNC                           = 0x80
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x80
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PF_FLUSH                          = 0x1
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_MASK                           = 0x3ff000
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_LABEL                        = 0xa
+	RTAX_MAX                          = 0xb
+	RTAX_NETMASK                      = 0x2
+	RTAX_SRC                          = 0x8
+	RTAX_SRCMASK                      = 0x9
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_LABEL                         = 0x400
+	RTA_NETMASK                       = 0x4
+	RTA_SRC                           = 0x100
+	RTA_SRCMASK                       = 0x200
+	RTF_ANNOUNCE                      = 0x4000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x10000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x10f808
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_MPATH                         = 0x40000
+	RTF_MPLS                          = 0x100000
+	RTF_PERMANENT_ARP                 = 0x2000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x2000
+	RTF_REJECT                        = 0x8
+	RTF_SOURCE                        = 0x20000
+	RTF_STATIC                        = 0x800
+	RTF_TUNNEL                        = 0x100000
+	RTF_UP                            = 0x1
+	RTF_USETRAILERS                   = 0x8000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DESYNC                        = 0x10
+	RTM_GET                           = 0x4
+	RTM_IFANNOUNCE                    = 0xf
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MAXSIZE                       = 0x800
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RT_TABLEID_MAX                    = 0xff
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80246987
+	SIOCALIFADDR                      = 0x8218691c
+	SIOCATMARK                        = 0x40047307
+	SIOCBRDGADD                       = 0x8054693c
+	SIOCBRDGADDS                      = 0x80546941
+	SIOCBRDGARL                       = 0x806e694d
+	SIOCBRDGDADDR                     = 0x81286947
+	SIOCBRDGDEL                       = 0x8054693d
+	SIOCBRDGDELS                      = 0x80546942
+	SIOCBRDGFLUSH                     = 0x80546948
+	SIOCBRDGFRL                       = 0x806e694e
+	SIOCBRDGGCACHE                    = 0xc0146941
+	SIOCBRDGGFD                       = 0xc0146952
+	SIOCBRDGGHT                       = 0xc0146951
+	SIOCBRDGGIFFLGS                   = 0xc054693e
+	SIOCBRDGGMA                       = 0xc0146953
+	SIOCBRDGGPARAM                    = 0xc03c6958
+	SIOCBRDGGPRI                      = 0xc0146950
+	SIOCBRDGGRL                       = 0xc028694f
+	SIOCBRDGGSIFS                     = 0xc054693c
+	SIOCBRDGGTO                       = 0xc0146946
+	SIOCBRDGIFS                       = 0xc0546942
+	SIOCBRDGRTS                       = 0xc0186943
+	SIOCBRDGSADDR                     = 0xc1286944
+	SIOCBRDGSCACHE                    = 0x80146940
+	SIOCBRDGSFD                       = 0x80146952
+	SIOCBRDGSHT                       = 0x80146951
+	SIOCBRDGSIFCOST                   = 0x80546955
+	SIOCBRDGSIFFLGS                   = 0x8054693f
+	SIOCBRDGSIFPRIO                   = 0x80546954
+	SIOCBRDGSMA                       = 0x80146953
+	SIOCBRDGSPRI                      = 0x80146950
+	SIOCBRDGSPROTO                    = 0x8014695a
+	SIOCBRDGSTO                       = 0x80146945
+	SIOCBRDGSTXHC                     = 0x80146959
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80246989
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8218691e
+	SIOCGETKALIVE                     = 0xc01869a4
+	SIOCGETLABEL                      = 0x8020699a
+	SIOCGETPFLOW                      = 0xc02069fe
+	SIOCGETPFSYNC                     = 0xc02069f8
+	SIOCGETSGCNT                      = 0xc0147534
+	SIOCGETVIFCNT                     = 0xc0147533
+	SIOCGETVLAN                       = 0xc0206990
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCONF                       = 0xc0086924
+	SIOCGIFDATA                       = 0xc020691b
+	SIOCGIFDESCR                      = 0xc0206981
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGATTR                      = 0xc024698b
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc024698a
+	SIOCGIFGROUP                      = 0xc0246988
+	SIOCGIFHARDMTU                    = 0xc02069a5
+	SIOCGIFMEDIA                      = 0xc0286936
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc020697e
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPRIORITY                   = 0xc020699c
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFRDOMAIN                    = 0xc02069a0
+	SIOCGIFRTLABEL                    = 0xc0206983
+	SIOCGIFTIMESLOT                   = 0xc0206986
+	SIOCGIFXFLAGS                     = 0xc020699e
+	SIOCGLIFADDR                      = 0xc218691d
+	SIOCGLIFPHYADDR                   = 0xc218694b
+	SIOCGLIFPHYRTABLE                 = 0xc02069a2
+	SIOCGLIFPHYTTL                    = 0xc02069a9
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGSPPPPARAMS                   = 0xc0206994
+	SIOCGVH                           = 0xc02069f6
+	SIOCGVNETID                       = 0xc02069a7
+	SIOCIFCREATE                      = 0x8020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCSETKALIVE                     = 0x801869a3
+	SIOCSETLABEL                      = 0x80206999
+	SIOCSETPFLOW                      = 0x802069fd
+	SIOCSETPFSYNC                     = 0x802069f7
+	SIOCSETVLAN                       = 0x8020698f
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFDESCR                      = 0x80206980
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGATTR                      = 0x8024698c
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020691f
+	SIOCSIFMEDIA                      = 0xc0206935
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x8020697f
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPRIORITY                   = 0x8020699b
+	SIOCSIFRDOMAIN                    = 0x8020699f
+	SIOCSIFRTLABEL                    = 0x80206982
+	SIOCSIFTIMESLOT                   = 0x80206985
+	SIOCSIFXFLAGS                     = 0x8020699d
+	SIOCSLIFPHYADDR                   = 0x8218694a
+	SIOCSLIFPHYRTABLE                 = 0x802069a1
+	SIOCSLIFPHYTTL                    = 0x802069a8
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSSPPPPARAMS                   = 0x80206993
+	SIOCSVH                           = 0xc02069f5
+	SIOCSVNETID                       = 0x802069a6
+	SOCK_DGRAM                        = 0x2
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BINDANY                        = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NETPROC                        = 0x1020
+	SO_OOBINLINE                      = 0x100
+	SO_PEERCRED                       = 0x1022
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_RTABLE                         = 0x1021
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_SPLICE                         = 0x1023
+	SO_TIMESTAMP                      = 0x800
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x3
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x4
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOPUSH                        = 0x10
+	TCP_NSTATES                       = 0xb
+	TCP_SACK_ENABLE                   = 0x8
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_PPS                      = 0x10
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGPGRP                         = 0x40047477
+	TIOCGSID                          = 0x40047463
+	TIOCGTSTAMP                       = 0x400c745b
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x4004746a
+	TIOCMODS                          = 0x8004746d
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x8004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSTSTAMP                       = 0x8008745a
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALTSIG                           = 0x4
+	WCONTINUED                        = 0x8
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x58)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x59)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EIPSEC          = syscall.Errno(0x52)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x5b)
+	ELOOP           = syscall.Errno(0x3e)
+	EMEDIUMTYPE     = syscall.Errno(0x56)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x53)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOMEDIUM       = syscall.Errno(0x55)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5a)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x5b)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x57)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disk quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC program not available"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIPSEC", "IPsec processing failure"},
+	{83, "ENOATTR", "attribute not found"},
+	{84, "EILSEQ", "illegal byte sequence"},
+	{85, "ENOMEDIUM", "no medium found"},
+	{86, "EMEDIUMTYPE", "wrong medium type"},
+	{87, "EOVERFLOW", "value too large to be stored in data type"},
+	{88, "ECANCELED", "operation canceled"},
+	{89, "EIDRM", "identifier removed"},
+	{90, "ENOMSG", "no message of desired type"},
+	{91, "ELAST", "not supported"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "thread AST"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
new file mode 100644
index 00000000..b0a7ebaf
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
@@ -0,0 +1,1735 @@
+// mkerrors.sh -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,openbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_BLUETOOTH                      = 0x20
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_ENCAP                          = 0x1c
+	AF_HYLINK                         = 0xf
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_KEY                            = 0x1e
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x24
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x1d
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ALTWERASE                         = 0x200
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRFILT                      = 0x4004427c
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc010427b
+	BIOCGETIF                         = 0x4020426b
+	BIOCGFILDROP                      = 0x40044278
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044273
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x20004276
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRFILT                      = 0x8004427d
+	BIOCSDLT                          = 0x8004427a
+	BIOCSETF                          = 0x80104267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x80104277
+	BIOCSFILDROP                      = 0x80044279
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044272
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIRECTION_IN                  = 0x1
+	BPF_DIRECTION_OUT                 = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x200000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_BOOTTIME                    = 0x6
+	CLOCK_MONOTONIC                   = 0x3
+	CLOCK_PROCESS_CPUTIME_ID          = 0x2
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x4
+	CLOCK_UPTIME                      = 0x5
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0xff
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DIOCOSFPFLUSH                     = 0x2000444e
+	DLT_ARCNET                        = 0x7
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AX25                          = 0x3
+	DLT_CHAOS                         = 0x5
+	DLT_C_HDLC                        = 0x68
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0xd
+	DLT_FDDI                          = 0xa
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_LOOP                          = 0xc
+	DLT_MPLS                          = 0xdb
+	DLT_NULL                          = 0x0
+	DLT_OPENFLOW                      = 0x10b
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PRONET                        = 0x4
+	DLT_RAW                           = 0xe
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_USBPCAP                       = 0xf9
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMT_TAGOVF                        = 0x1
+	EMUL_ENABLED                      = 0x1
+	EMUL_NATIVE                       = 0x2
+	ENDRUNDISC                        = 0x9
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_AOE                     = 0x88a2
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LLDP                    = 0x88cc
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_QINQ                    = 0x88a8
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOW                    = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_ALIGN                       = 0x2
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_DIX_LEN                 = 0x600
+	ETHER_MAX_HARDMTU_LEN             = 0xff9b
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = -0x3
+	EVFILT_DEVICE                     = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x8
+	EVFILT_TIMER                      = -0x7
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EVL_ENCAPLEN                      = 0x4
+	EVL_PRIO_BITS                     = 0xd
+	EVL_PRIO_MAX                      = 0x7
+	EVL_VLID_MASK                     = 0xfff
+	EVL_VLID_MAX                      = 0xffe
+	EVL_VLID_MIN                      = 0x1
+	EVL_VLID_NULL                     = 0x0
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xa
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETOWN                          = 0x5
+	F_ISATTY                          = 0xb
+	F_OK                              = 0x0
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8e52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_STATICARP                     = 0x20
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BLUETOOTH                     = 0xf8
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf7
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DUMMY                         = 0xf1
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf3
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MBIM                          = 0xfa
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFLOW                         = 0xf9
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf2
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_HOST                   = 0x1
+	IN_RFC3021_NET                    = 0xfffffffe
+	IN_RFC3021_NSHIFT                 = 0x1f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x103
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPV6_AUTH_LEVEL                   = 0x35
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_ESP_NETWORK_LEVEL            = 0x37
+	IPV6_ESP_TRANS_LEVEL              = 0x36
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPCOMP_LEVEL                 = 0x3c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MINHOPCOUNT                  = 0x41
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_OPTIONS                      = 0x1
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PIPEX                        = 0x3f
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVDSTPORT                  = 0x40
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTABLE                       = 0x1021
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_AUTH_LEVEL                     = 0x14
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_ESP_NETWORK_LEVEL              = 0x16
+	IP_ESP_TRANS_LEVEL                = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPCOMP_LEVEL                   = 0x1d
+	IP_IPDEFTTL                       = 0x25
+	IP_IPSECFLOWINFO                  = 0x24
+	IP_IPSEC_LOCAL_AUTH               = 0x1b
+	IP_IPSEC_LOCAL_CRED               = 0x19
+	IP_IPSEC_LOCAL_ID                 = 0x17
+	IP_IPSEC_REMOTE_AUTH              = 0x1c
+	IP_IPSEC_REMOTE_CRED              = 0x1a
+	IP_IPSEC_REMOTE_ID                = 0x18
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x20
+	IP_MIN_MEMBERSHIPS                = 0xf
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PIPEX                          = 0x22
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVDSTPORT                    = 0x21
+	IP_RECVIF                         = 0x1e
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVRTABLE                     = 0x23
+	IP_RECVTTL                        = 0x1f
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RTABLE                         = 0x1021
+	IP_SENDSRCADDR                    = 0x7
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUCLC                             = 0x1000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LCNT_OVERLOAD_FLUSH               = 0x6
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_FLAGMASK                      = 0x7ff7
+	MAP_HASSEMAPHORE                  = 0x0
+	MAP_INHERIT                       = 0x0
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_INHERIT_ZERO                  = 0x3
+	MAP_NOEXTEND                      = 0x0
+	MAP_NORESERVE                     = 0x0
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x0
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x4000
+	MAP_TRYFIXED                      = 0x0
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_MCAST                         = 0x200
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x4
+	MS_SYNC                           = 0x2
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFNAMES                    = 0x6
+	NET_RT_MAXID                      = 0x7
+	NET_RT_STATS                      = 0x4
+	NET_RT_TABLE                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHANGE                       = 0x1
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EOF                          = 0x2
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRUNCATE                     = 0x80
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OLCUC                             = 0x20
+	ONLCR                             = 0x2
+	ONLRET                            = 0x80
+	ONOCR                             = 0x40
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	OXTABS                            = 0x4
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x10000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x20000
+	O_DSYNC                           = 0x80
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x80
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PF_FLUSH                          = 0x1
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BFD                          = 0xb
+	RTAX_BRD                          = 0x7
+	RTAX_DNS                          = 0xc
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_LABEL                        = 0xa
+	RTAX_MAX                          = 0xf
+	RTAX_NETMASK                      = 0x2
+	RTAX_SEARCH                       = 0xe
+	RTAX_SRC                          = 0x8
+	RTAX_SRCMASK                      = 0x9
+	RTAX_STATIC                       = 0xd
+	RTA_AUTHOR                        = 0x40
+	RTA_BFD                           = 0x800
+	RTA_BRD                           = 0x80
+	RTA_DNS                           = 0x1000
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_LABEL                         = 0x400
+	RTA_NETMASK                       = 0x4
+	RTA_SEARCH                        = 0x4000
+	RTA_SRC                           = 0x100
+	RTA_SRCMASK                       = 0x200
+	RTA_STATIC                        = 0x2000
+	RTF_ANNOUNCE                      = 0x4000
+	RTF_BFD                           = 0x1000000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CACHED                        = 0x20000
+	RTF_CLONED                        = 0x10000
+	RTF_CLONING                       = 0x100
+	RTF_CONNECTED                     = 0x800000
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x110fc08
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MPATH                         = 0x40000
+	RTF_MPLS                          = 0x100000
+	RTF_MULTICAST                     = 0x200
+	RTF_PERMANENT_ARP                 = 0x2000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x2000
+	RTF_REJECT                        = 0x8
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_USETRAILERS                   = 0x8000
+	RTM_ADD                           = 0x1
+	RTM_BFD                           = 0x12
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DESYNC                        = 0x10
+	RTM_GET                           = 0x4
+	RTM_IFANNOUNCE                    = 0xf
+	RTM_IFINFO                        = 0xe
+	RTM_INVALIDATE                    = 0x11
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MAXSIZE                       = 0x800
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_PROPOSAL                      = 0x13
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RT_TABLEID_BITS                   = 0x8
+	RT_TABLEID_MASK                   = 0xff
+	RT_TABLEID_MAX                    = 0xff
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80286987
+	SIOCATMARK                        = 0x40047307
+	SIOCBRDGADD                       = 0x8060693c
+	SIOCBRDGADDL                      = 0x80606949
+	SIOCBRDGADDS                      = 0x80606941
+	SIOCBRDGARL                       = 0x808c694d
+	SIOCBRDGDADDR                     = 0x81286947
+	SIOCBRDGDEL                       = 0x8060693d
+	SIOCBRDGDELS                      = 0x80606942
+	SIOCBRDGFLUSH                     = 0x80606948
+	SIOCBRDGFRL                       = 0x808c694e
+	SIOCBRDGGCACHE                    = 0xc0186941
+	SIOCBRDGGFD                       = 0xc0186952
+	SIOCBRDGGHT                       = 0xc0186951
+	SIOCBRDGGIFFLGS                   = 0xc060693e
+	SIOCBRDGGMA                       = 0xc0186953
+	SIOCBRDGGPARAM                    = 0xc0406958
+	SIOCBRDGGPRI                      = 0xc0186950
+	SIOCBRDGGRL                       = 0xc030694f
+	SIOCBRDGGTO                       = 0xc0186946
+	SIOCBRDGIFS                       = 0xc0606942
+	SIOCBRDGRTS                       = 0xc0206943
+	SIOCBRDGSADDR                     = 0xc1286944
+	SIOCBRDGSCACHE                    = 0x80186940
+	SIOCBRDGSFD                       = 0x80186952
+	SIOCBRDGSHT                       = 0x80186951
+	SIOCBRDGSIFCOST                   = 0x80606955
+	SIOCBRDGSIFFLGS                   = 0x8060693f
+	SIOCBRDGSIFPRIO                   = 0x80606954
+	SIOCBRDGSIFPROT                   = 0x8060694a
+	SIOCBRDGSMA                       = 0x80186953
+	SIOCBRDGSPRI                      = 0x80186950
+	SIOCBRDGSPROTO                    = 0x8018695a
+	SIOCBRDGSTO                       = 0x80186945
+	SIOCBRDGSTXHC                     = 0x80186959
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80286989
+	SIOCDIFPARENT                     = 0x802069b4
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDVNETID                       = 0x802069af
+	SIOCGETKALIVE                     = 0xc01869a4
+	SIOCGETLABEL                      = 0x8020699a
+	SIOCGETMPWCFG                     = 0xc02069ae
+	SIOCGETPFLOW                      = 0xc02069fe
+	SIOCGETPFSYNC                     = 0xc02069f8
+	SIOCGETSGCNT                      = 0xc0207534
+	SIOCGETVIFCNT                     = 0xc0287533
+	SIOCGETVLAN                       = 0xc0206990
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCONF                       = 0xc0106924
+	SIOCGIFDATA                       = 0xc020691b
+	SIOCGIFDESCR                      = 0xc0206981
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGATTR                      = 0xc028698b
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc028698a
+	SIOCGIFGROUP                      = 0xc0286988
+	SIOCGIFHARDMTU                    = 0xc02069a5
+	SIOCGIFLLPRIO                     = 0xc02069b6
+	SIOCGIFMEDIA                      = 0xc0406938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc020697e
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPAIR                       = 0xc02069b1
+	SIOCGIFPARENT                     = 0xc02069b3
+	SIOCGIFPRIORITY                   = 0xc020699c
+	SIOCGIFRDOMAIN                    = 0xc02069a0
+	SIOCGIFRTLABEL                    = 0xc0206983
+	SIOCGIFRXR                        = 0x802069aa
+	SIOCGIFXFLAGS                     = 0xc020699e
+	SIOCGLIFPHYADDR                   = 0xc218694b
+	SIOCGLIFPHYDF                     = 0xc02069c2
+	SIOCGLIFPHYRTABLE                 = 0xc02069a2
+	SIOCGLIFPHYTTL                    = 0xc02069a9
+	SIOCGPGRP                         = 0x40047309
+	SIOCGSPPPPARAMS                   = 0xc0206994
+	SIOCGUMBINFO                      = 0xc02069be
+	SIOCGUMBPARAM                     = 0xc02069c0
+	SIOCGVH                           = 0xc02069f6
+	SIOCGVNETFLOWID                   = 0xc02069c4
+	SIOCGVNETID                       = 0xc02069a7
+	SIOCIFAFATTACH                    = 0x801169ab
+	SIOCIFAFDETACH                    = 0x801169ac
+	SIOCIFCREATE                      = 0x8020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106978
+	SIOCSETKALIVE                     = 0x801869a3
+	SIOCSETLABEL                      = 0x80206999
+	SIOCSETMPWCFG                     = 0x802069ad
+	SIOCSETPFLOW                      = 0x802069fd
+	SIOCSETPFSYNC                     = 0x802069f7
+	SIOCSETVLAN                       = 0x8020698f
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFDESCR                      = 0x80206980
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGATTR                      = 0x8028698c
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020691f
+	SIOCSIFLLPRIO                     = 0x802069b5
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x8020697f
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPAIR                       = 0x802069b0
+	SIOCSIFPARENT                     = 0x802069b2
+	SIOCSIFPRIORITY                   = 0x8020699b
+	SIOCSIFRDOMAIN                    = 0x8020699f
+	SIOCSIFRTLABEL                    = 0x80206982
+	SIOCSIFXFLAGS                     = 0x8020699d
+	SIOCSLIFPHYADDR                   = 0x8218694a
+	SIOCSLIFPHYDF                     = 0x802069c1
+	SIOCSLIFPHYRTABLE                 = 0x802069a1
+	SIOCSLIFPHYTTL                    = 0x802069a8
+	SIOCSPGRP                         = 0x80047308
+	SIOCSSPPPPARAMS                   = 0x80206993
+	SIOCSUMBPARAM                     = 0x802069bf
+	SIOCSVH                           = 0xc02069f5
+	SIOCSVNETFLOWID                   = 0x802069c3
+	SIOCSVNETID                       = 0x802069a6
+	SIOCSWGDPID                       = 0xc018695b
+	SIOCSWGMAXFLOW                    = 0xc0186960
+	SIOCSWGMAXGROUP                   = 0xc018695d
+	SIOCSWSDPID                       = 0x8018695c
+	SIOCSWSPORTNO                     = 0xc060695f
+	SOCK_CLOEXEC                      = 0x8000
+	SOCK_DGRAM                        = 0x2
+	SOCK_DNS                          = 0x1000
+	SOCK_NONBLOCK                     = 0x4000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BINDANY                        = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NETPROC                        = 0x1020
+	SO_OOBINLINE                      = 0x100
+	SO_PEERCRED                       = 0x1022
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_RTABLE                         = 0x1021
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_SPLICE                         = 0x1023
+	SO_TIMESTAMP                      = 0x800
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SO_ZEROIZE                        = 0x2000
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
+	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
+	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x3
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x4
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOPUSH                        = 0x10
+	TCP_SACK_ENABLE                   = 0x8
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCHKVERAUTH                    = 0x2000741e
+	TIOCCLRVERAUTH                    = 0x2000741d
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_PPS                      = 0x10
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGPGRP                         = 0x40047477
+	TIOCGSID                          = 0x40047463
+	TIOCGTSTAMP                       = 0x4010745b
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x4004746a
+	TIOCMODS                          = 0x8004746d
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSETVERAUTH                    = 0x8004741c
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x8004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSTSTAMP                       = 0x8008745a
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TIOCUCNTL_CBRK                    = 0x7a
+	TIOCUCNTL_SBRK                    = 0x7b
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VM_ANONMIN                        = 0x7
+	VM_LOADAVG                        = 0x2
+	VM_MAXID                          = 0xc
+	VM_MAXSLP                         = 0xa
+	VM_METER                          = 0x1
+	VM_NKMEMPAGES                     = 0x6
+	VM_PSSTRINGS                      = 0x3
+	VM_SWAPENCRYPT                    = 0x5
+	VM_USPACE                         = 0xb
+	VM_UVMEXP                         = 0x4
+	VM_VNODEMIN                       = 0x9
+	VM_VTEXTMIN                       = 0x8
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALTSIG                           = 0x4
+	WCONTINUED                        = 0x8
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WUNTRACED                         = 0x2
+	XCASE                             = 0x1000000
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x5c)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x58)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x59)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EIPSEC          = syscall.Errno(0x52)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x5f)
+	ELOOP           = syscall.Errno(0x3e)
+	EMEDIUMTYPE     = syscall.Errno(0x56)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x53)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOMEDIUM       = syscall.Errno(0x55)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5a)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x5d)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x5b)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x57)
+	EOWNERDEAD      = syscall.Errno(0x5e)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5f)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disk quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC program not available"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIPSEC", "IPsec processing failure"},
+	{83, "ENOATTR", "attribute not found"},
+	{84, "EILSEQ", "illegal byte sequence"},
+	{85, "ENOMEDIUM", "no medium found"},
+	{86, "EMEDIUMTYPE", "wrong medium type"},
+	{87, "EOVERFLOW", "value too large to be stored in data type"},
+	{88, "ECANCELED", "operation canceled"},
+	{89, "EIDRM", "identifier removed"},
+	{90, "ENOMSG", "no message of desired type"},
+	{91, "ENOTSUP", "not supported"},
+	{92, "EBADMSG", "bad message"},
+	{93, "ENOTRECOVERABLE", "state not recoverable"},
+	{94, "EOWNERDEAD", "previous owner died"},
+	{95, "ELAST", "protocol error"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "thread AST"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
new file mode 100644
index 00000000..50c1d9f3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
@@ -0,0 +1,1630 @@
+// mkerrors.sh
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+// +build arm,openbsd
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_BLUETOOTH                      = 0x20
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_ENCAP                          = 0x1c
+	AF_HYLINK                         = 0xf
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_KEY                            = 0x1e
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x24
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x1d
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRFILT                      = 0x4004427c
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc008427b
+	BIOCGETIF                         = 0x4020426b
+	BIOCGFILDROP                      = 0x40044278
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044273
+	BIOCGRTIMEOUT                     = 0x400c426e
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x20004276
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRFILT                      = 0x8004427d
+	BIOCSDLT                          = 0x8004427a
+	BIOCSETF                          = 0x80084267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x80084277
+	BIOCSFILDROP                      = 0x80044279
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044272
+	BIOCSRTIMEOUT                     = 0x800c426d
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIRECTION_IN                  = 0x1
+	BPF_DIRECTION_OUT                 = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x200000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0xff
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DIOCOSFPFLUSH                     = 0x2000444e
+	DLT_ARCNET                        = 0x7
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AX25                          = 0x3
+	DLT_CHAOS                         = 0x5
+	DLT_C_HDLC                        = 0x68
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0xd
+	DLT_FDDI                          = 0xa
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_LOOP                          = 0xc
+	DLT_MPLS                          = 0xdb
+	DLT_NULL                          = 0x0
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PRONET                        = 0x4
+	DLT_RAW                           = 0xe
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMT_TAGOVF                        = 0x1
+	EMUL_ENABLED                      = 0x1
+	EMUL_NATIVE                       = 0x2
+	ENDRUNDISC                        = 0x9
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_AOE                     = 0x88a2
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LLDP                    = 0x88cc
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_QINQ                    = 0x88a8
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOW                    = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_ALIGN                       = 0x2
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_DIX_LEN                 = 0x600
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = -0x3
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = -0x7
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xa
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETOWN                          = 0x5
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8e52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BLUETOOTH                     = 0xf8
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf7
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DUMMY                         = 0xf1
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf3
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFLOW                         = 0xf9
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf2
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_HOST                   = 0x1
+	IN_RFC3021_NET                    = 0xfffffffe
+	IN_RFC3021_NSHIFT                 = 0x1f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DIVERT_INIT               = 0x2
+	IPPROTO_DIVERT_RESP               = 0x1
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x103
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPV6_AUTH_LEVEL                   = 0x35
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_ESP_NETWORK_LEVEL            = 0x37
+	IPV6_ESP_TRANS_LEVEL              = 0x36
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPCOMP_LEVEL                 = 0x3c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_OPTIONS                      = 0x1
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PIPEX                        = 0x3f
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVDSTPORT                  = 0x40
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTABLE                       = 0x1021
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_AUTH_LEVEL                     = 0x14
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DIVERTFL                       = 0x1022
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_ESP_NETWORK_LEVEL              = 0x16
+	IP_ESP_TRANS_LEVEL                = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPCOMP_LEVEL                   = 0x1d
+	IP_IPSECFLOWINFO                  = 0x24
+	IP_IPSEC_LOCAL_AUTH               = 0x1b
+	IP_IPSEC_LOCAL_CRED               = 0x19
+	IP_IPSEC_LOCAL_ID                 = 0x17
+	IP_IPSEC_REMOTE_AUTH              = 0x1c
+	IP_IPSEC_REMOTE_CRED              = 0x1a
+	IP_IPSEC_REMOTE_ID                = 0x18
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x20
+	IP_MIN_MEMBERSHIPS                = 0xf
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PIPEX                          = 0x22
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVDSTPORT                    = 0x21
+	IP_RECVIF                         = 0x1e
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVRTABLE                     = 0x23
+	IP_RECVTTL                        = 0x1f
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RTABLE                         = 0x1021
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LCNT_OVERLOAD_FLUSH               = 0x6
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_FLAGMASK                      = 0x3ff7
+	MAP_HASSEMAPHORE                  = 0x0
+	MAP_INHERIT                       = 0x0
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_INHERIT_ZERO                  = 0x3
+	MAP_NOEXTEND                      = 0x0
+	MAP_NORESERVE                     = 0x0
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x0
+	MAP_SHARED                        = 0x1
+	MAP_TRYFIXED                      = 0x0
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_MCAST                         = 0x200
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x4
+	MS_SYNC                           = 0x2
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_MAXID                      = 0x6
+	NET_RT_STATS                      = 0x4
+	NET_RT_TABLE                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EOF                          = 0x2
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRUNCATE                     = 0x80
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x80
+	ONOCR                             = 0x40
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x10000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x20000
+	O_DSYNC                           = 0x80
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x80
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PF_FLUSH                          = 0x1
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_LABEL                        = 0xa
+	RTAX_MAX                          = 0xb
+	RTAX_NETMASK                      = 0x2
+	RTAX_SRC                          = 0x8
+	RTAX_SRCMASK                      = 0x9
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_LABEL                         = 0x400
+	RTA_NETMASK                       = 0x4
+	RTA_SRC                           = 0x100
+	RTA_SRCMASK                       = 0x200
+	RTF_ANNOUNCE                      = 0x4000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONED                        = 0x10000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x70f808
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_MPATH                         = 0x40000
+	RTF_MPLS                          = 0x100000
+	RTF_PERMANENT_ARP                 = 0x2000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x2000
+	RTF_REJECT                        = 0x8
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_USETRAILERS                   = 0x8000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DESYNC                        = 0x10
+	RTM_GET                           = 0x4
+	RTM_IFANNOUNCE                    = 0xf
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MAXSIZE                       = 0x800
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RT_TABLEID_MAX                    = 0xff
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80246987
+	SIOCALIFADDR                      = 0x8218691c
+	SIOCATMARK                        = 0x40047307
+	SIOCBRDGADD                       = 0x8054693c
+	SIOCBRDGADDS                      = 0x80546941
+	SIOCBRDGARL                       = 0x806e694d
+	SIOCBRDGDADDR                     = 0x81286947
+	SIOCBRDGDEL                       = 0x8054693d
+	SIOCBRDGDELS                      = 0x80546942
+	SIOCBRDGFLUSH                     = 0x80546948
+	SIOCBRDGFRL                       = 0x806e694e
+	SIOCBRDGGCACHE                    = 0xc0146941
+	SIOCBRDGGFD                       = 0xc0146952
+	SIOCBRDGGHT                       = 0xc0146951
+	SIOCBRDGGIFFLGS                   = 0xc054693e
+	SIOCBRDGGMA                       = 0xc0146953
+	SIOCBRDGGPARAM                    = 0xc03c6958
+	SIOCBRDGGPRI                      = 0xc0146950
+	SIOCBRDGGRL                       = 0xc028694f
+	SIOCBRDGGSIFS                     = 0xc054693c
+	SIOCBRDGGTO                       = 0xc0146946
+	SIOCBRDGIFS                       = 0xc0546942
+	SIOCBRDGRTS                       = 0xc0186943
+	SIOCBRDGSADDR                     = 0xc1286944
+	SIOCBRDGSCACHE                    = 0x80146940
+	SIOCBRDGSFD                       = 0x80146952
+	SIOCBRDGSHT                       = 0x80146951
+	SIOCBRDGSIFCOST                   = 0x80546955
+	SIOCBRDGSIFFLGS                   = 0x8054693f
+	SIOCBRDGSIFPRIO                   = 0x80546954
+	SIOCBRDGSMA                       = 0x80146953
+	SIOCBRDGSPRI                      = 0x80146950
+	SIOCBRDGSPROTO                    = 0x8014695a
+	SIOCBRDGSTO                       = 0x80146945
+	SIOCBRDGSTXHC                     = 0x80146959
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80246989
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8218691e
+	SIOCGETKALIVE                     = 0xc01869a4
+	SIOCGETLABEL                      = 0x8020699a
+	SIOCGETPFLOW                      = 0xc02069fe
+	SIOCGETPFSYNC                     = 0xc02069f8
+	SIOCGETSGCNT                      = 0xc0147534
+	SIOCGETVIFCNT                     = 0xc0147533
+	SIOCGETVLAN                       = 0xc0206990
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCONF                       = 0xc0086924
+	SIOCGIFDATA                       = 0xc020691b
+	SIOCGIFDESCR                      = 0xc0206981
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGATTR                      = 0xc024698b
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc024698a
+	SIOCGIFGROUP                      = 0xc0246988
+	SIOCGIFHARDMTU                    = 0xc02069a5
+	SIOCGIFMEDIA                      = 0xc0286936
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc020697e
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPRIORITY                   = 0xc020699c
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFRDOMAIN                    = 0xc02069a0
+	SIOCGIFRTLABEL                    = 0xc0206983
+	SIOCGIFRXR                        = 0x802069aa
+	SIOCGIFTIMESLOT                   = 0xc0206986
+	SIOCGIFXFLAGS                     = 0xc020699e
+	SIOCGLIFADDR                      = 0xc218691d
+	SIOCGLIFPHYADDR                   = 0xc218694b
+	SIOCGLIFPHYRTABLE                 = 0xc02069a2
+	SIOCGLIFPHYTTL                    = 0xc02069a9
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGSPPPPARAMS                   = 0xc0206994
+	SIOCGVH                           = 0xc02069f6
+	SIOCGVNETID                       = 0xc02069a7
+	SIOCIFCREATE                      = 0x8020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCSETKALIVE                     = 0x801869a3
+	SIOCSETLABEL                      = 0x80206999
+	SIOCSETPFLOW                      = 0x802069fd
+	SIOCSETPFSYNC                     = 0x802069f7
+	SIOCSETVLAN                       = 0x8020698f
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFDESCR                      = 0x80206980
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGATTR                      = 0x8024698c
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020691f
+	SIOCSIFMEDIA                      = 0xc0206935
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x8020697f
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPRIORITY                   = 0x8020699b
+	SIOCSIFRDOMAIN                    = 0x8020699f
+	SIOCSIFRTLABEL                    = 0x80206982
+	SIOCSIFTIMESLOT                   = 0x80206985
+	SIOCSIFXFLAGS                     = 0x8020699d
+	SIOCSLIFPHYADDR                   = 0x8218694a
+	SIOCSLIFPHYRTABLE                 = 0x802069a1
+	SIOCSLIFPHYTTL                    = 0x802069a8
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSSPPPPARAMS                   = 0x80206993
+	SIOCSVH                           = 0xc02069f5
+	SIOCSVNETID                       = 0x802069a6
+	SOCK_CLOEXEC                      = 0x8000
+	SOCK_DGRAM                        = 0x2
+	SOCK_NONBLOCK                     = 0x4000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BINDANY                        = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NETPROC                        = 0x1020
+	SO_OOBINLINE                      = 0x100
+	SO_PEERCRED                       = 0x1022
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_RTABLE                         = 0x1021
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_SPLICE                         = 0x1023
+	SO_TIMESTAMP                      = 0x800
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x3
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x4
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOPUSH                        = 0x10
+	TCP_NSTATES                       = 0xb
+	TCP_SACK_ENABLE                   = 0x8
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_PPS                      = 0x10
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGPGRP                         = 0x40047477
+	TIOCGSID                          = 0x40047463
+	TIOCGTSTAMP                       = 0x400c745b
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x4004746a
+	TIOCMODS                          = 0x8004746d
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x8004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSTSTAMP                       = 0x8008745a
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALTSIG                           = 0x4
+	WCONTINUED                        = 0x8
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x58)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x59)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EIPSEC          = syscall.Errno(0x52)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x5b)
+	ELOOP           = syscall.Errno(0x3e)
+	EMEDIUMTYPE     = syscall.Errno(0x56)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x53)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOMEDIUM       = syscall.Errno(0x55)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5a)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x5b)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x57)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disk quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC program not available"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIPSEC", "IPsec processing failure"},
+	{83, "ENOATTR", "attribute not found"},
+	{84, "EILSEQ", "illegal byte sequence"},
+	{85, "ENOMEDIUM", "no medium found"},
+	{86, "EMEDIUMTYPE", "wrong medium type"},
+	{87, "EOVERFLOW", "value too large to be stored in data type"},
+	{88, "ECANCELED", "operation canceled"},
+	{89, "EIDRM", "identifier removed"},
+	{90, "ENOMSG", "no message of desired type"},
+	{91, "ELAST", "not supported"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "thread AST"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
new file mode 100644
index 00000000..be42830c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
@@ -0,0 +1,1497 @@
+// mkerrors.sh -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,solaris
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_802                        = 0x12
+	AF_APPLETALK                  = 0x10
+	AF_CCITT                      = 0xa
+	AF_CHAOS                      = 0x5
+	AF_DATAKIT                    = 0x9
+	AF_DECnet                     = 0xc
+	AF_DLI                        = 0xd
+	AF_ECMA                       = 0x8
+	AF_FILE                       = 0x1
+	AF_GOSIP                      = 0x16
+	AF_HYLINK                     = 0xf
+	AF_IMPLINK                    = 0x3
+	AF_INET                       = 0x2
+	AF_INET6                      = 0x1a
+	AF_INET_OFFLOAD               = 0x1e
+	AF_IPX                        = 0x17
+	AF_KEY                        = 0x1b
+	AF_LAT                        = 0xe
+	AF_LINK                       = 0x19
+	AF_LOCAL                      = 0x1
+	AF_MAX                        = 0x20
+	AF_NBS                        = 0x7
+	AF_NCA                        = 0x1c
+	AF_NIT                        = 0x11
+	AF_NS                         = 0x6
+	AF_OSI                        = 0x13
+	AF_OSINET                     = 0x15
+	AF_PACKET                     = 0x20
+	AF_POLICY                     = 0x1d
+	AF_PUP                        = 0x4
+	AF_ROUTE                      = 0x18
+	AF_SNA                        = 0xb
+	AF_TRILL                      = 0x1f
+	AF_UNIX                       = 0x1
+	AF_UNSPEC                     = 0x0
+	AF_X25                        = 0x14
+	ARPHRD_ARCNET                 = 0x7
+	ARPHRD_ATM                    = 0x10
+	ARPHRD_AX25                   = 0x3
+	ARPHRD_CHAOS                  = 0x5
+	ARPHRD_EETHER                 = 0x2
+	ARPHRD_ETHER                  = 0x1
+	ARPHRD_FC                     = 0x12
+	ARPHRD_FRAME                  = 0xf
+	ARPHRD_HDLC                   = 0x11
+	ARPHRD_IB                     = 0x20
+	ARPHRD_IEEE802                = 0x6
+	ARPHRD_IPATM                  = 0x13
+	ARPHRD_METRICOM               = 0x17
+	ARPHRD_TUNNEL                 = 0x1f
+	B0                            = 0x0
+	B110                          = 0x3
+	B115200                       = 0x12
+	B1200                         = 0x9
+	B134                          = 0x4
+	B150                          = 0x5
+	B153600                       = 0x13
+	B1800                         = 0xa
+	B19200                        = 0xe
+	B200                          = 0x6
+	B230400                       = 0x14
+	B2400                         = 0xb
+	B300                          = 0x7
+	B307200                       = 0x15
+	B38400                        = 0xf
+	B460800                       = 0x16
+	B4800                         = 0xc
+	B50                           = 0x1
+	B57600                        = 0x10
+	B600                          = 0x8
+	B75                           = 0x2
+	B76800                        = 0x11
+	B921600                       = 0x17
+	B9600                         = 0xd
+	BIOCFLUSH                     = 0x20004268
+	BIOCGBLEN                     = 0x40044266
+	BIOCGDLT                      = 0x4004426a
+	BIOCGDLTLIST                  = -0x3fefbd89
+	BIOCGDLTLIST32                = -0x3ff7bd89
+	BIOCGETIF                     = 0x4020426b
+	BIOCGETLIF                    = 0x4078426b
+	BIOCGHDRCMPLT                 = 0x40044274
+	BIOCGRTIMEOUT                 = 0x4010427b
+	BIOCGRTIMEOUT32               = 0x4008427b
+	BIOCGSEESENT                  = 0x40044278
+	BIOCGSTATS                    = 0x4080426f
+	BIOCGSTATSOLD                 = 0x4008426f
+	BIOCIMMEDIATE                 = -0x7ffbbd90
+	BIOCPROMISC                   = 0x20004269
+	BIOCSBLEN                     = -0x3ffbbd9a
+	BIOCSDLT                      = -0x7ffbbd8a
+	BIOCSETF                      = -0x7fefbd99
+	BIOCSETF32                    = -0x7ff7bd99
+	BIOCSETIF                     = -0x7fdfbd94
+	BIOCSETLIF                    = -0x7f87bd94
+	BIOCSHDRCMPLT                 = -0x7ffbbd8b
+	BIOCSRTIMEOUT                 = -0x7fefbd86
+	BIOCSRTIMEOUT32               = -0x7ff7bd86
+	BIOCSSEESENT                  = -0x7ffbbd87
+	BIOCSTCPF                     = -0x7fefbd8e
+	BIOCSUDPF                     = -0x7fefbd8d
+	BIOCVERSION                   = 0x40044271
+	BPF_A                         = 0x10
+	BPF_ABS                       = 0x20
+	BPF_ADD                       = 0x0
+	BPF_ALIGNMENT                 = 0x4
+	BPF_ALU                       = 0x4
+	BPF_AND                       = 0x50
+	BPF_B                         = 0x10
+	BPF_DFLTBUFSIZE               = 0x100000
+	BPF_DIV                       = 0x30
+	BPF_H                         = 0x8
+	BPF_IMM                       = 0x0
+	BPF_IND                       = 0x40
+	BPF_JA                        = 0x0
+	BPF_JEQ                       = 0x10
+	BPF_JGE                       = 0x30
+	BPF_JGT                       = 0x20
+	BPF_JMP                       = 0x5
+	BPF_JSET                      = 0x40
+	BPF_K                         = 0x0
+	BPF_LD                        = 0x0
+	BPF_LDX                       = 0x1
+	BPF_LEN                       = 0x80
+	BPF_LSH                       = 0x60
+	BPF_MAJOR_VERSION             = 0x1
+	BPF_MAXBUFSIZE                = 0x1000000
+	BPF_MAXINSNS                  = 0x200
+	BPF_MEM                       = 0x60
+	BPF_MEMWORDS                  = 0x10
+	BPF_MINBUFSIZE                = 0x20
+	BPF_MINOR_VERSION             = 0x1
+	BPF_MISC                      = 0x7
+	BPF_MSH                       = 0xa0
+	BPF_MUL                       = 0x20
+	BPF_NEG                       = 0x80
+	BPF_OR                        = 0x40
+	BPF_RELEASE                   = 0x30bb6
+	BPF_RET                       = 0x6
+	BPF_RSH                       = 0x70
+	BPF_ST                        = 0x2
+	BPF_STX                       = 0x3
+	BPF_SUB                       = 0x10
+	BPF_TAX                       = 0x0
+	BPF_TXA                       = 0x80
+	BPF_W                         = 0x0
+	BPF_X                         = 0x8
+	BRKINT                        = 0x2
+	BS0                           = 0x0
+	BS1                           = 0x2000
+	BSDLY                         = 0x2000
+	CBAUD                         = 0xf
+	CFLUSH                        = 0xf
+	CIBAUD                        = 0xf0000
+	CLOCAL                        = 0x800
+	CLOCK_HIGHRES                 = 0x4
+	CLOCK_LEVEL                   = 0xa
+	CLOCK_MONOTONIC               = 0x4
+	CLOCK_PROCESS_CPUTIME_ID      = 0x5
+	CLOCK_PROF                    = 0x2
+	CLOCK_REALTIME                = 0x3
+	CLOCK_THREAD_CPUTIME_ID       = 0x2
+	CLOCK_VIRTUAL                 = 0x1
+	CR0                           = 0x0
+	CR1                           = 0x200
+	CR2                           = 0x400
+	CR3                           = 0x600
+	CRDLY                         = 0x600
+	CREAD                         = 0x80
+	CRTSCTS                       = 0x80000000
+	CS5                           = 0x0
+	CS6                           = 0x10
+	CS7                           = 0x20
+	CS8                           = 0x30
+	CSIZE                         = 0x30
+	CSTART                        = 0x11
+	CSTATUS                       = 0x14
+	CSTOP                         = 0x13
+	CSTOPB                        = 0x40
+	CSUSP                         = 0x1a
+	CSWTCH                        = 0x1a
+	DLT_AIRONET_HEADER            = 0x78
+	DLT_APPLE_IP_OVER_IEEE1394    = 0x8a
+	DLT_ARCNET                    = 0x7
+	DLT_ARCNET_LINUX              = 0x81
+	DLT_ATM_CLIP                  = 0x13
+	DLT_ATM_RFC1483               = 0xb
+	DLT_AURORA                    = 0x7e
+	DLT_AX25                      = 0x3
+	DLT_BACNET_MS_TP              = 0xa5
+	DLT_CHAOS                     = 0x5
+	DLT_CISCO_IOS                 = 0x76
+	DLT_C_HDLC                    = 0x68
+	DLT_DOCSIS                    = 0x8f
+	DLT_ECONET                    = 0x73
+	DLT_EN10MB                    = 0x1
+	DLT_EN3MB                     = 0x2
+	DLT_ENC                       = 0x6d
+	DLT_ERF_ETH                   = 0xaf
+	DLT_ERF_POS                   = 0xb0
+	DLT_FDDI                      = 0xa
+	DLT_FRELAY                    = 0x6b
+	DLT_GCOM_SERIAL               = 0xad
+	DLT_GCOM_T1E1                 = 0xac
+	DLT_GPF_F                     = 0xab
+	DLT_GPF_T                     = 0xaa
+	DLT_GPRS_LLC                  = 0xa9
+	DLT_HDLC                      = 0x10
+	DLT_HHDLC                     = 0x79
+	DLT_HIPPI                     = 0xf
+	DLT_IBM_SN                    = 0x92
+	DLT_IBM_SP                    = 0x91
+	DLT_IEEE802                   = 0x6
+	DLT_IEEE802_11                = 0x69
+	DLT_IEEE802_11_RADIO          = 0x7f
+	DLT_IEEE802_11_RADIO_AVS      = 0xa3
+	DLT_IPNET                     = 0xe2
+	DLT_IPOIB                     = 0xa2
+	DLT_IP_OVER_FC                = 0x7a
+	DLT_JUNIPER_ATM1              = 0x89
+	DLT_JUNIPER_ATM2              = 0x87
+	DLT_JUNIPER_CHDLC             = 0xb5
+	DLT_JUNIPER_ES                = 0x84
+	DLT_JUNIPER_ETHER             = 0xb2
+	DLT_JUNIPER_FRELAY            = 0xb4
+	DLT_JUNIPER_GGSN              = 0x85
+	DLT_JUNIPER_MFR               = 0x86
+	DLT_JUNIPER_MLFR              = 0x83
+	DLT_JUNIPER_MLPPP             = 0x82
+	DLT_JUNIPER_MONITOR           = 0xa4
+	DLT_JUNIPER_PIC_PEER          = 0xae
+	DLT_JUNIPER_PPP               = 0xb3
+	DLT_JUNIPER_PPPOE             = 0xa7
+	DLT_JUNIPER_PPPOE_ATM         = 0xa8
+	DLT_JUNIPER_SERVICES          = 0x88
+	DLT_LINUX_IRDA                = 0x90
+	DLT_LINUX_LAPD                = 0xb1
+	DLT_LINUX_SLL                 = 0x71
+	DLT_LOOP                      = 0x6c
+	DLT_LTALK                     = 0x72
+	DLT_MTP2                      = 0x8c
+	DLT_MTP2_WITH_PHDR            = 0x8b
+	DLT_MTP3                      = 0x8d
+	DLT_NULL                      = 0x0
+	DLT_PCI_EXP                   = 0x7d
+	DLT_PFLOG                     = 0x75
+	DLT_PFSYNC                    = 0x12
+	DLT_PPP                       = 0x9
+	DLT_PPP_BSDOS                 = 0xe
+	DLT_PPP_PPPD                  = 0xa6
+	DLT_PRISM_HEADER              = 0x77
+	DLT_PRONET                    = 0x4
+	DLT_RAW                       = 0xc
+	DLT_RAWAF_MASK                = 0x2240000
+	DLT_RIO                       = 0x7c
+	DLT_SCCP                      = 0x8e
+	DLT_SLIP                      = 0x8
+	DLT_SLIP_BSDOS                = 0xd
+	DLT_SUNATM                    = 0x7b
+	DLT_SYMANTEC_FIREWALL         = 0x63
+	DLT_TZSP                      = 0x80
+	ECHO                          = 0x8
+	ECHOCTL                       = 0x200
+	ECHOE                         = 0x10
+	ECHOK                         = 0x20
+	ECHOKE                        = 0x800
+	ECHONL                        = 0x40
+	ECHOPRT                       = 0x400
+	EMPTY_SET                     = 0x0
+	EMT_CPCOVF                    = 0x1
+	EQUALITY_CHECK                = 0x0
+	EXTA                          = 0xe
+	EXTB                          = 0xf
+	FD_CLOEXEC                    = 0x1
+	FD_NFDBITS                    = 0x40
+	FD_SETSIZE                    = 0x10000
+	FF0                           = 0x0
+	FF1                           = 0x8000
+	FFDLY                         = 0x8000
+	FLUSHALL                      = 0x1
+	FLUSHDATA                     = 0x0
+	FLUSHO                        = 0x2000
+	F_ALLOCSP                     = 0xa
+	F_ALLOCSP64                   = 0xa
+	F_BADFD                       = 0x2e
+	F_BLKSIZE                     = 0x13
+	F_BLOCKS                      = 0x12
+	F_CHKFL                       = 0x8
+	F_COMPAT                      = 0x8
+	F_DUP2FD                      = 0x9
+	F_DUP2FD_CLOEXEC              = 0x24
+	F_DUPFD                       = 0x0
+	F_DUPFD_CLOEXEC               = 0x25
+	F_FLOCK                       = 0x35
+	F_FLOCK64                     = 0x35
+	F_FLOCKW                      = 0x36
+	F_FLOCKW64                    = 0x36
+	F_FREESP                      = 0xb
+	F_FREESP64                    = 0xb
+	F_GETFD                       = 0x1
+	F_GETFL                       = 0x3
+	F_GETLK                       = 0xe
+	F_GETLK64                     = 0xe
+	F_GETOWN                      = 0x17
+	F_GETXFL                      = 0x2d
+	F_HASREMOTELOCKS              = 0x1a
+	F_ISSTREAM                    = 0xd
+	F_MANDDNY                     = 0x10
+	F_MDACC                       = 0x20
+	F_NODNY                       = 0x0
+	F_NPRIV                       = 0x10
+	F_OFD_GETLK                   = 0x2f
+	F_OFD_GETLK64                 = 0x2f
+	F_OFD_SETLK                   = 0x30
+	F_OFD_SETLK64                 = 0x30
+	F_OFD_SETLKW                  = 0x31
+	F_OFD_SETLKW64                = 0x31
+	F_PRIV                        = 0xf
+	F_QUOTACTL                    = 0x11
+	F_RDACC                       = 0x1
+	F_RDDNY                       = 0x1
+	F_RDLCK                       = 0x1
+	F_REVOKE                      = 0x19
+	F_RMACC                       = 0x4
+	F_RMDNY                       = 0x4
+	F_RWACC                       = 0x3
+	F_RWDNY                       = 0x3
+	F_SETFD                       = 0x2
+	F_SETFL                       = 0x4
+	F_SETLK                       = 0x6
+	F_SETLK64                     = 0x6
+	F_SETLK64_NBMAND              = 0x2a
+	F_SETLKW                      = 0x7
+	F_SETLKW64                    = 0x7
+	F_SETLK_NBMAND                = 0x2a
+	F_SETOWN                      = 0x18
+	F_SHARE                       = 0x28
+	F_SHARE_NBMAND                = 0x2b
+	F_UNLCK                       = 0x3
+	F_UNLKSYS                     = 0x4
+	F_UNSHARE                     = 0x29
+	F_WRACC                       = 0x2
+	F_WRDNY                       = 0x2
+	F_WRLCK                       = 0x2
+	HUPCL                         = 0x400
+	IBSHIFT                       = 0x10
+	ICANON                        = 0x2
+	ICRNL                         = 0x100
+	IEXTEN                        = 0x8000
+	IFF_ADDRCONF                  = 0x80000
+	IFF_ALLMULTI                  = 0x200
+	IFF_ANYCAST                   = 0x400000
+	IFF_BROADCAST                 = 0x2
+	IFF_CANTCHANGE                = 0x7f203003b5a
+	IFF_COS_ENABLED               = 0x200000000
+	IFF_DEBUG                     = 0x4
+	IFF_DEPRECATED                = 0x40000
+	IFF_DHCPRUNNING               = 0x4000
+	IFF_DUPLICATE                 = 0x4000000000
+	IFF_FAILED                    = 0x10000000
+	IFF_FIXEDMTU                  = 0x1000000000
+	IFF_INACTIVE                  = 0x40000000
+	IFF_INTELLIGENT               = 0x400
+	IFF_IPMP                      = 0x8000000000
+	IFF_IPMP_CANTCHANGE           = 0x10000000
+	IFF_IPMP_INVALID              = 0x1ec200080
+	IFF_IPV4                      = 0x1000000
+	IFF_IPV6                      = 0x2000000
+	IFF_L3PROTECT                 = 0x40000000000
+	IFF_LOOPBACK                  = 0x8
+	IFF_MULTICAST                 = 0x800
+	IFF_MULTI_BCAST               = 0x1000
+	IFF_NOACCEPT                  = 0x4000000
+	IFF_NOARP                     = 0x80
+	IFF_NOFAILOVER                = 0x8000000
+	IFF_NOLINKLOCAL               = 0x20000000000
+	IFF_NOLOCAL                   = 0x20000
+	IFF_NONUD                     = 0x200000
+	IFF_NORTEXCH                  = 0x800000
+	IFF_NOTRAILERS                = 0x20
+	IFF_NOXMIT                    = 0x10000
+	IFF_OFFLINE                   = 0x80000000
+	IFF_POINTOPOINT               = 0x10
+	IFF_PREFERRED                 = 0x400000000
+	IFF_PRIVATE                   = 0x8000
+	IFF_PROMISC                   = 0x100
+	IFF_ROUTER                    = 0x100000
+	IFF_RUNNING                   = 0x40
+	IFF_STANDBY                   = 0x20000000
+	IFF_TEMPORARY                 = 0x800000000
+	IFF_UNNUMBERED                = 0x2000
+	IFF_UP                        = 0x1
+	IFF_VIRTUAL                   = 0x2000000000
+	IFF_VRRP                      = 0x10000000000
+	IFF_XRESOLV                   = 0x100000000
+	IFNAMSIZ                      = 0x10
+	IFT_1822                      = 0x2
+	IFT_6TO4                      = 0xca
+	IFT_AAL5                      = 0x31
+	IFT_ARCNET                    = 0x23
+	IFT_ARCNETPLUS                = 0x24
+	IFT_ATM                       = 0x25
+	IFT_CEPT                      = 0x13
+	IFT_DS3                       = 0x1e
+	IFT_EON                       = 0x19
+	IFT_ETHER                     = 0x6
+	IFT_FDDI                      = 0xf
+	IFT_FRELAY                    = 0x20
+	IFT_FRELAYDCE                 = 0x2c
+	IFT_HDH1822                   = 0x3
+	IFT_HIPPI                     = 0x2f
+	IFT_HSSI                      = 0x2e
+	IFT_HY                        = 0xe
+	IFT_IB                        = 0xc7
+	IFT_IPV4                      = 0xc8
+	IFT_IPV6                      = 0xc9
+	IFT_ISDNBASIC                 = 0x14
+	IFT_ISDNPRIMARY               = 0x15
+	IFT_ISO88022LLC               = 0x29
+	IFT_ISO88023                  = 0x7
+	IFT_ISO88024                  = 0x8
+	IFT_ISO88025                  = 0x9
+	IFT_ISO88026                  = 0xa
+	IFT_LAPB                      = 0x10
+	IFT_LOCALTALK                 = 0x2a
+	IFT_LOOP                      = 0x18
+	IFT_MIOX25                    = 0x26
+	IFT_MODEM                     = 0x30
+	IFT_NSIP                      = 0x1b
+	IFT_OTHER                     = 0x1
+	IFT_P10                       = 0xc
+	IFT_P80                       = 0xd
+	IFT_PARA                      = 0x22
+	IFT_PPP                       = 0x17
+	IFT_PROPMUX                   = 0x36
+	IFT_PROPVIRTUAL               = 0x35
+	IFT_PTPSERIAL                 = 0x16
+	IFT_RS232                     = 0x21
+	IFT_SDLC                      = 0x11
+	IFT_SIP                       = 0x1f
+	IFT_SLIP                      = 0x1c
+	IFT_SMDSDXI                   = 0x2b
+	IFT_SMDSICIP                  = 0x34
+	IFT_SONET                     = 0x27
+	IFT_SONETPATH                 = 0x32
+	IFT_SONETVT                   = 0x33
+	IFT_STARLAN                   = 0xb
+	IFT_T1                        = 0x12
+	IFT_ULTRA                     = 0x1d
+	IFT_V35                       = 0x2d
+	IFT_X25                       = 0x5
+	IFT_X25DDN                    = 0x4
+	IFT_X25PLE                    = 0x28
+	IFT_XETHER                    = 0x1a
+	IGNBRK                        = 0x1
+	IGNCR                         = 0x80
+	IGNPAR                        = 0x4
+	IMAXBEL                       = 0x2000
+	INLCR                         = 0x40
+	INPCK                         = 0x10
+	IN_AUTOCONF_MASK              = 0xffff0000
+	IN_AUTOCONF_NET               = 0xa9fe0000
+	IN_CLASSA_HOST                = 0xffffff
+	IN_CLASSA_MAX                 = 0x80
+	IN_CLASSA_NET                 = 0xff000000
+	IN_CLASSA_NSHIFT              = 0x18
+	IN_CLASSB_HOST                = 0xffff
+	IN_CLASSB_MAX                 = 0x10000
+	IN_CLASSB_NET                 = 0xffff0000
+	IN_CLASSB_NSHIFT              = 0x10
+	IN_CLASSC_HOST                = 0xff
+	IN_CLASSC_NET                 = 0xffffff00
+	IN_CLASSC_NSHIFT              = 0x8
+	IN_CLASSD_HOST                = 0xfffffff
+	IN_CLASSD_NET                 = 0xf0000000
+	IN_CLASSD_NSHIFT              = 0x1c
+	IN_CLASSE_NET                 = 0xffffffff
+	IN_LOOPBACKNET                = 0x7f
+	IN_PRIVATE12_MASK             = 0xfff00000
+	IN_PRIVATE12_NET              = 0xac100000
+	IN_PRIVATE16_MASK             = 0xffff0000
+	IN_PRIVATE16_NET              = 0xc0a80000
+	IN_PRIVATE8_MASK              = 0xff000000
+	IN_PRIVATE8_NET               = 0xa000000
+	IPPROTO_AH                    = 0x33
+	IPPROTO_DSTOPTS               = 0x3c
+	IPPROTO_EGP                   = 0x8
+	IPPROTO_ENCAP                 = 0x4
+	IPPROTO_EON                   = 0x50
+	IPPROTO_ESP                   = 0x32
+	IPPROTO_FRAGMENT              = 0x2c
+	IPPROTO_GGP                   = 0x3
+	IPPROTO_HELLO                 = 0x3f
+	IPPROTO_HOPOPTS               = 0x0
+	IPPROTO_ICMP                  = 0x1
+	IPPROTO_ICMPV6                = 0x3a
+	IPPROTO_IDP                   = 0x16
+	IPPROTO_IGMP                  = 0x2
+	IPPROTO_IP                    = 0x0
+	IPPROTO_IPV6                  = 0x29
+	IPPROTO_MAX                   = 0x100
+	IPPROTO_ND                    = 0x4d
+	IPPROTO_NONE                  = 0x3b
+	IPPROTO_OSPF                  = 0x59
+	IPPROTO_PIM                   = 0x67
+	IPPROTO_PUP                   = 0xc
+	IPPROTO_RAW                   = 0xff
+	IPPROTO_ROUTING               = 0x2b
+	IPPROTO_RSVP                  = 0x2e
+	IPPROTO_SCTP                  = 0x84
+	IPPROTO_TCP                   = 0x6
+	IPPROTO_UDP                   = 0x11
+	IPV6_ADD_MEMBERSHIP           = 0x9
+	IPV6_BOUND_IF                 = 0x41
+	IPV6_CHECKSUM                 = 0x18
+	IPV6_DONTFRAG                 = 0x21
+	IPV6_DROP_MEMBERSHIP          = 0xa
+	IPV6_DSTOPTS                  = 0xf
+	IPV6_FLOWINFO_FLOWLABEL       = 0xffff0f00
+	IPV6_FLOWINFO_TCLASS          = 0xf00f
+	IPV6_HOPLIMIT                 = 0xc
+	IPV6_HOPOPTS                  = 0xe
+	IPV6_JOIN_GROUP               = 0x9
+	IPV6_LEAVE_GROUP              = 0xa
+	IPV6_MULTICAST_HOPS           = 0x7
+	IPV6_MULTICAST_IF             = 0x6
+	IPV6_MULTICAST_LOOP           = 0x8
+	IPV6_NEXTHOP                  = 0xd
+	IPV6_PAD1_OPT                 = 0x0
+	IPV6_PATHMTU                  = 0x25
+	IPV6_PKTINFO                  = 0xb
+	IPV6_PREFER_SRC_CGA           = 0x20
+	IPV6_PREFER_SRC_CGADEFAULT    = 0x10
+	IPV6_PREFER_SRC_CGAMASK       = 0x30
+	IPV6_PREFER_SRC_COA           = 0x2
+	IPV6_PREFER_SRC_DEFAULT       = 0x15
+	IPV6_PREFER_SRC_HOME          = 0x1
+	IPV6_PREFER_SRC_MASK          = 0x3f
+	IPV6_PREFER_SRC_MIPDEFAULT    = 0x1
+	IPV6_PREFER_SRC_MIPMASK       = 0x3
+	IPV6_PREFER_SRC_NONCGA        = 0x10
+	IPV6_PREFER_SRC_PUBLIC        = 0x4
+	IPV6_PREFER_SRC_TMP           = 0x8
+	IPV6_PREFER_SRC_TMPDEFAULT    = 0x4
+	IPV6_PREFER_SRC_TMPMASK       = 0xc
+	IPV6_RECVDSTOPTS              = 0x28
+	IPV6_RECVHOPLIMIT             = 0x13
+	IPV6_RECVHOPOPTS              = 0x14
+	IPV6_RECVPATHMTU              = 0x24
+	IPV6_RECVPKTINFO              = 0x12
+	IPV6_RECVRTHDR                = 0x16
+	IPV6_RECVRTHDRDSTOPTS         = 0x17
+	IPV6_RECVTCLASS               = 0x19
+	IPV6_RTHDR                    = 0x10
+	IPV6_RTHDRDSTOPTS             = 0x11
+	IPV6_RTHDR_TYPE_0             = 0x0
+	IPV6_SEC_OPT                  = 0x22
+	IPV6_SRC_PREFERENCES          = 0x23
+	IPV6_TCLASS                   = 0x26
+	IPV6_UNICAST_HOPS             = 0x5
+	IPV6_UNSPEC_SRC               = 0x42
+	IPV6_USE_MIN_MTU              = 0x20
+	IPV6_V6ONLY                   = 0x27
+	IP_ADD_MEMBERSHIP             = 0x13
+	IP_ADD_SOURCE_MEMBERSHIP      = 0x17
+	IP_BLOCK_SOURCE               = 0x15
+	IP_BOUND_IF                   = 0x41
+	IP_BROADCAST                  = 0x106
+	IP_BROADCAST_TTL              = 0x43
+	IP_DEFAULT_MULTICAST_LOOP     = 0x1
+	IP_DEFAULT_MULTICAST_TTL      = 0x1
+	IP_DF                         = 0x4000
+	IP_DHCPINIT_IF                = 0x45
+	IP_DONTFRAG                   = 0x1b
+	IP_DONTROUTE                  = 0x105
+	IP_DROP_MEMBERSHIP            = 0x14
+	IP_DROP_SOURCE_MEMBERSHIP     = 0x18
+	IP_HDRINCL                    = 0x2
+	IP_MAXPACKET                  = 0xffff
+	IP_MF                         = 0x2000
+	IP_MSS                        = 0x240
+	IP_MULTICAST_IF               = 0x10
+	IP_MULTICAST_LOOP             = 0x12
+	IP_MULTICAST_TTL              = 0x11
+	IP_NEXTHOP                    = 0x19
+	IP_OPTIONS                    = 0x1
+	IP_PKTINFO                    = 0x1a
+	IP_RECVDSTADDR                = 0x7
+	IP_RECVIF                     = 0x9
+	IP_RECVOPTS                   = 0x5
+	IP_RECVPKTINFO                = 0x1a
+	IP_RECVRETOPTS                = 0x6
+	IP_RECVSLLA                   = 0xa
+	IP_RECVTTL                    = 0xb
+	IP_RETOPTS                    = 0x8
+	IP_REUSEADDR                  = 0x104
+	IP_SEC_OPT                    = 0x22
+	IP_TOS                        = 0x3
+	IP_TTL                        = 0x4
+	IP_UNBLOCK_SOURCE             = 0x16
+	IP_UNSPEC_SRC                 = 0x42
+	ISIG                          = 0x1
+	ISTRIP                        = 0x20
+	IUCLC                         = 0x200
+	IXANY                         = 0x800
+	IXOFF                         = 0x1000
+	IXON                          = 0x400
+	LOCK_EX                       = 0x2
+	LOCK_NB                       = 0x4
+	LOCK_SH                       = 0x1
+	LOCK_UN                       = 0x8
+	MADV_ACCESS_DEFAULT           = 0x6
+	MADV_ACCESS_LWP               = 0x7
+	MADV_ACCESS_MANY              = 0x8
+	MADV_DONTNEED                 = 0x4
+	MADV_FREE                     = 0x5
+	MADV_NORMAL                   = 0x0
+	MADV_PURGE                    = 0x9
+	MADV_RANDOM                   = 0x1
+	MADV_SEQUENTIAL               = 0x2
+	MADV_WILLNEED                 = 0x3
+	MAP_32BIT                     = 0x80
+	MAP_ALIGN                     = 0x200
+	MAP_ANON                      = 0x100
+	MAP_ANONYMOUS                 = 0x100
+	MAP_FILE                      = 0x0
+	MAP_FIXED                     = 0x10
+	MAP_INITDATA                  = 0x800
+	MAP_NORESERVE                 = 0x40
+	MAP_PRIVATE                   = 0x2
+	MAP_RENAME                    = 0x20
+	MAP_SHARED                    = 0x1
+	MAP_TEXT                      = 0x400
+	MAP_TYPE                      = 0xf
+	MCL_CURRENT                   = 0x1
+	MCL_FUTURE                    = 0x2
+	MSG_CTRUNC                    = 0x10
+	MSG_DONTROUTE                 = 0x4
+	MSG_DONTWAIT                  = 0x80
+	MSG_DUPCTRL                   = 0x800
+	MSG_EOR                       = 0x8
+	MSG_MAXIOVLEN                 = 0x10
+	MSG_NOTIFICATION              = 0x100
+	MSG_OOB                       = 0x1
+	MSG_PEEK                      = 0x2
+	MSG_TRUNC                     = 0x20
+	MSG_WAITALL                   = 0x40
+	MSG_XPG4_2                    = 0x8000
+	MS_ASYNC                      = 0x1
+	MS_INVALIDATE                 = 0x2
+	MS_OLDSYNC                    = 0x0
+	MS_SYNC                       = 0x4
+	M_FLUSH                       = 0x86
+	NAME_MAX                      = 0xff
+	NEWDEV                        = 0x1
+	NL0                           = 0x0
+	NL1                           = 0x100
+	NLDLY                         = 0x100
+	NOFLSH                        = 0x80
+	OCRNL                         = 0x8
+	OFDEL                         = 0x80
+	OFILL                         = 0x40
+	OLCUC                         = 0x2
+	OLDDEV                        = 0x0
+	ONBITSMAJOR                   = 0x7
+	ONBITSMINOR                   = 0x8
+	ONLCR                         = 0x4
+	ONLRET                        = 0x20
+	ONOCR                         = 0x10
+	OPENFAIL                      = -0x1
+	OPOST                         = 0x1
+	O_ACCMODE                     = 0x600003
+	O_APPEND                      = 0x8
+	O_CLOEXEC                     = 0x800000
+	O_CREAT                       = 0x100
+	O_DSYNC                       = 0x40
+	O_EXCL                        = 0x400
+	O_EXEC                        = 0x400000
+	O_LARGEFILE                   = 0x2000
+	O_NDELAY                      = 0x4
+	O_NOCTTY                      = 0x800
+	O_NOFOLLOW                    = 0x20000
+	O_NOLINKS                     = 0x40000
+	O_NONBLOCK                    = 0x80
+	O_RDONLY                      = 0x0
+	O_RDWR                        = 0x2
+	O_RSYNC                       = 0x8000
+	O_SEARCH                      = 0x200000
+	O_SIOCGIFCONF                 = -0x3ff796ec
+	O_SIOCGLIFCONF                = -0x3fef9688
+	O_SYNC                        = 0x10
+	O_TRUNC                       = 0x200
+	O_WRONLY                      = 0x1
+	O_XATTR                       = 0x4000
+	PARENB                        = 0x100
+	PAREXT                        = 0x100000
+	PARMRK                        = 0x8
+	PARODD                        = 0x200
+	PENDIN                        = 0x4000
+	PRIO_PGRP                     = 0x1
+	PRIO_PROCESS                  = 0x0
+	PRIO_USER                     = 0x2
+	PROT_EXEC                     = 0x4
+	PROT_NONE                     = 0x0
+	PROT_READ                     = 0x1
+	PROT_WRITE                    = 0x2
+	RLIMIT_AS                     = 0x6
+	RLIMIT_CORE                   = 0x4
+	RLIMIT_CPU                    = 0x0
+	RLIMIT_DATA                   = 0x2
+	RLIMIT_FSIZE                  = 0x1
+	RLIMIT_NOFILE                 = 0x5
+	RLIMIT_STACK                  = 0x3
+	RLIM_INFINITY                 = -0x3
+	RTAX_AUTHOR                   = 0x6
+	RTAX_BRD                      = 0x7
+	RTAX_DST                      = 0x0
+	RTAX_GATEWAY                  = 0x1
+	RTAX_GENMASK                  = 0x3
+	RTAX_IFA                      = 0x5
+	RTAX_IFP                      = 0x4
+	RTAX_MAX                      = 0x9
+	RTAX_NETMASK                  = 0x2
+	RTAX_SRC                      = 0x8
+	RTA_AUTHOR                    = 0x40
+	RTA_BRD                       = 0x80
+	RTA_DST                       = 0x1
+	RTA_GATEWAY                   = 0x2
+	RTA_GENMASK                   = 0x8
+	RTA_IFA                       = 0x20
+	RTA_IFP                       = 0x10
+	RTA_NETMASK                   = 0x4
+	RTA_NUMBITS                   = 0x9
+	RTA_SRC                       = 0x100
+	RTF_BLACKHOLE                 = 0x1000
+	RTF_CLONING                   = 0x100
+	RTF_DONE                      = 0x40
+	RTF_DYNAMIC                   = 0x10
+	RTF_GATEWAY                   = 0x2
+	RTF_HOST                      = 0x4
+	RTF_INDIRECT                  = 0x40000
+	RTF_KERNEL                    = 0x80000
+	RTF_LLINFO                    = 0x400
+	RTF_MASK                      = 0x80
+	RTF_MODIFIED                  = 0x20
+	RTF_MULTIRT                   = 0x10000
+	RTF_PRIVATE                   = 0x2000
+	RTF_PROTO1                    = 0x8000
+	RTF_PROTO2                    = 0x4000
+	RTF_REJECT                    = 0x8
+	RTF_SETSRC                    = 0x20000
+	RTF_STATIC                    = 0x800
+	RTF_UP                        = 0x1
+	RTF_XRESOLVE                  = 0x200
+	RTF_ZONE                      = 0x100000
+	RTM_ADD                       = 0x1
+	RTM_CHANGE                    = 0x3
+	RTM_CHGADDR                   = 0xf
+	RTM_DELADDR                   = 0xd
+	RTM_DELETE                    = 0x2
+	RTM_FREEADDR                  = 0x10
+	RTM_GET                       = 0x4
+	RTM_IFINFO                    = 0xe
+	RTM_LOCK                      = 0x8
+	RTM_LOSING                    = 0x5
+	RTM_MISS                      = 0x7
+	RTM_NEWADDR                   = 0xc
+	RTM_OLDADD                    = 0x9
+	RTM_OLDDEL                    = 0xa
+	RTM_REDIRECT                  = 0x6
+	RTM_RESOLVE                   = 0xb
+	RTM_VERSION                   = 0x3
+	RTV_EXPIRE                    = 0x4
+	RTV_HOPCOUNT                  = 0x2
+	RTV_MTU                       = 0x1
+	RTV_RPIPE                     = 0x8
+	RTV_RTT                       = 0x40
+	RTV_RTTVAR                    = 0x80
+	RTV_SPIPE                     = 0x10
+	RTV_SSTHRESH                  = 0x20
+	RT_AWARE                      = 0x1
+	RUSAGE_CHILDREN               = -0x1
+	RUSAGE_SELF                   = 0x0
+	SCM_RIGHTS                    = 0x1010
+	SCM_TIMESTAMP                 = 0x1013
+	SCM_UCRED                     = 0x1012
+	SHUT_RD                       = 0x0
+	SHUT_RDWR                     = 0x2
+	SHUT_WR                       = 0x1
+	SIG2STR_MAX                   = 0x20
+	SIOCADDMULTI                  = -0x7fdf96cf
+	SIOCADDRT                     = -0x7fcf8df6
+	SIOCATMARK                    = 0x40047307
+	SIOCDARP                      = -0x7fdb96e0
+	SIOCDELMULTI                  = -0x7fdf96ce
+	SIOCDELRT                     = -0x7fcf8df5
+	SIOCDXARP                     = -0x7fff9658
+	SIOCGARP                      = -0x3fdb96e1
+	SIOCGDSTINFO                  = -0x3fff965c
+	SIOCGENADDR                   = -0x3fdf96ab
+	SIOCGENPSTATS                 = -0x3fdf96c7
+	SIOCGETLSGCNT                 = -0x3fef8deb
+	SIOCGETNAME                   = 0x40107334
+	SIOCGETPEER                   = 0x40107335
+	SIOCGETPROP                   = -0x3fff8f44
+	SIOCGETSGCNT                  = -0x3feb8deb
+	SIOCGETSYNC                   = -0x3fdf96d3
+	SIOCGETVIFCNT                 = -0x3feb8dec
+	SIOCGHIWAT                    = 0x40047301
+	SIOCGIFADDR                   = -0x3fdf96f3
+	SIOCGIFBRDADDR                = -0x3fdf96e9
+	SIOCGIFCONF                   = -0x3ff796a4
+	SIOCGIFDSTADDR                = -0x3fdf96f1
+	SIOCGIFFLAGS                  = -0x3fdf96ef
+	SIOCGIFHWADDR                 = -0x3fdf9647
+	SIOCGIFINDEX                  = -0x3fdf96a6
+	SIOCGIFMEM                    = -0x3fdf96ed
+	SIOCGIFMETRIC                 = -0x3fdf96e5
+	SIOCGIFMTU                    = -0x3fdf96ea
+	SIOCGIFMUXID                  = -0x3fdf96a8
+	SIOCGIFNETMASK                = -0x3fdf96e7
+	SIOCGIFNUM                    = 0x40046957
+	SIOCGIP6ADDRPOLICY            = -0x3fff965e
+	SIOCGIPMSFILTER               = -0x3ffb964c
+	SIOCGLIFADDR                  = -0x3f87968f
+	SIOCGLIFBINDING               = -0x3f879666
+	SIOCGLIFBRDADDR               = -0x3f879685
+	SIOCGLIFCONF                  = -0x3fef965b
+	SIOCGLIFDADSTATE              = -0x3f879642
+	SIOCGLIFDSTADDR               = -0x3f87968d
+	SIOCGLIFFLAGS                 = -0x3f87968b
+	SIOCGLIFGROUPINFO             = -0x3f4b9663
+	SIOCGLIFGROUPNAME             = -0x3f879664
+	SIOCGLIFHWADDR                = -0x3f879640
+	SIOCGLIFINDEX                 = -0x3f87967b
+	SIOCGLIFLNKINFO               = -0x3f879674
+	SIOCGLIFMETRIC                = -0x3f879681
+	SIOCGLIFMTU                   = -0x3f879686
+	SIOCGLIFMUXID                 = -0x3f87967d
+	SIOCGLIFNETMASK               = -0x3f879683
+	SIOCGLIFNUM                   = -0x3ff3967e
+	SIOCGLIFSRCOF                 = -0x3fef964f
+	SIOCGLIFSUBNET                = -0x3f879676
+	SIOCGLIFTOKEN                 = -0x3f879678
+	SIOCGLIFUSESRC                = -0x3f879651
+	SIOCGLIFZONE                  = -0x3f879656
+	SIOCGLOWAT                    = 0x40047303
+	SIOCGMSFILTER                 = -0x3ffb964e
+	SIOCGPGRP                     = 0x40047309
+	SIOCGSTAMP                    = -0x3fef9646
+	SIOCGXARP                     = -0x3fff9659
+	SIOCIFDETACH                  = -0x7fdf96c8
+	SIOCILB                       = -0x3ffb9645
+	SIOCLIFADDIF                  = -0x3f879691
+	SIOCLIFDELND                  = -0x7f879673
+	SIOCLIFGETND                  = -0x3f879672
+	SIOCLIFREMOVEIF               = -0x7f879692
+	SIOCLIFSETND                  = -0x7f879671
+	SIOCLOWER                     = -0x7fdf96d7
+	SIOCSARP                      = -0x7fdb96e2
+	SIOCSCTPGOPT                  = -0x3fef9653
+	SIOCSCTPPEELOFF               = -0x3ffb9652
+	SIOCSCTPSOPT                  = -0x7fef9654
+	SIOCSENABLESDP                = -0x3ffb9649
+	SIOCSETPROP                   = -0x7ffb8f43
+	SIOCSETSYNC                   = -0x7fdf96d4
+	SIOCSHIWAT                    = -0x7ffb8d00
+	SIOCSIFADDR                   = -0x7fdf96f4
+	SIOCSIFBRDADDR                = -0x7fdf96e8
+	SIOCSIFDSTADDR                = -0x7fdf96f2
+	SIOCSIFFLAGS                  = -0x7fdf96f0
+	SIOCSIFINDEX                  = -0x7fdf96a5
+	SIOCSIFMEM                    = -0x7fdf96ee
+	SIOCSIFMETRIC                 = -0x7fdf96e4
+	SIOCSIFMTU                    = -0x7fdf96eb
+	SIOCSIFMUXID                  = -0x7fdf96a7
+	SIOCSIFNAME                   = -0x7fdf96b7
+	SIOCSIFNETMASK                = -0x7fdf96e6
+	SIOCSIP6ADDRPOLICY            = -0x7fff965d
+	SIOCSIPMSFILTER               = -0x7ffb964b
+	SIOCSLGETREQ                  = -0x3fdf96b9
+	SIOCSLIFADDR                  = -0x7f879690
+	SIOCSLIFBRDADDR               = -0x7f879684
+	SIOCSLIFDSTADDR               = -0x7f87968e
+	SIOCSLIFFLAGS                 = -0x7f87968c
+	SIOCSLIFGROUPNAME             = -0x7f879665
+	SIOCSLIFINDEX                 = -0x7f87967a
+	SIOCSLIFLNKINFO               = -0x7f879675
+	SIOCSLIFMETRIC                = -0x7f879680
+	SIOCSLIFMTU                   = -0x7f879687
+	SIOCSLIFMUXID                 = -0x7f87967c
+	SIOCSLIFNAME                  = -0x3f87967f
+	SIOCSLIFNETMASK               = -0x7f879682
+	SIOCSLIFPREFIX                = -0x3f879641
+	SIOCSLIFSUBNET                = -0x7f879677
+	SIOCSLIFTOKEN                 = -0x7f879679
+	SIOCSLIFUSESRC                = -0x7f879650
+	SIOCSLIFZONE                  = -0x7f879655
+	SIOCSLOWAT                    = -0x7ffb8cfe
+	SIOCSLSTAT                    = -0x7fdf96b8
+	SIOCSMSFILTER                 = -0x7ffb964d
+	SIOCSPGRP                     = -0x7ffb8cf8
+	SIOCSPROMISC                  = -0x7ffb96d0
+	SIOCSQPTR                     = -0x3ffb9648
+	SIOCSSDSTATS                  = -0x3fdf96d2
+	SIOCSSESTATS                  = -0x3fdf96d1
+	SIOCSXARP                     = -0x7fff965a
+	SIOCTMYADDR                   = -0x3ff79670
+	SIOCTMYSITE                   = -0x3ff7966e
+	SIOCTONLINK                   = -0x3ff7966f
+	SIOCUPPER                     = -0x7fdf96d8
+	SIOCX25RCV                    = -0x3fdf96c4
+	SIOCX25TBL                    = -0x3fdf96c3
+	SIOCX25XMT                    = -0x3fdf96c5
+	SIOCXPROTO                    = 0x20007337
+	SOCK_CLOEXEC                  = 0x80000
+	SOCK_DGRAM                    = 0x1
+	SOCK_NDELAY                   = 0x200000
+	SOCK_NONBLOCK                 = 0x100000
+	SOCK_RAW                      = 0x4
+	SOCK_RDM                      = 0x5
+	SOCK_SEQPACKET                = 0x6
+	SOCK_STREAM                   = 0x2
+	SOCK_TYPE_MASK                = 0xffff
+	SOL_FILTER                    = 0xfffc
+	SOL_PACKET                    = 0xfffd
+	SOL_ROUTE                     = 0xfffe
+	SOL_SOCKET                    = 0xffff
+	SOMAXCONN                     = 0x80
+	SO_ACCEPTCONN                 = 0x2
+	SO_ALL                        = 0x3f
+	SO_ALLZONES                   = 0x1014
+	SO_ANON_MLP                   = 0x100a
+	SO_ATTACH_FILTER              = 0x40000001
+	SO_BAND                       = 0x4000
+	SO_BROADCAST                  = 0x20
+	SO_COPYOPT                    = 0x80000
+	SO_DEBUG                      = 0x1
+	SO_DELIM                      = 0x8000
+	SO_DETACH_FILTER              = 0x40000002
+	SO_DGRAM_ERRIND               = 0x200
+	SO_DOMAIN                     = 0x100c
+	SO_DONTLINGER                 = -0x81
+	SO_DONTROUTE                  = 0x10
+	SO_ERROPT                     = 0x40000
+	SO_ERROR                      = 0x1007
+	SO_EXCLBIND                   = 0x1015
+	SO_HIWAT                      = 0x10
+	SO_ISNTTY                     = 0x800
+	SO_ISTTY                      = 0x400
+	SO_KEEPALIVE                  = 0x8
+	SO_LINGER                     = 0x80
+	SO_LOWAT                      = 0x20
+	SO_MAC_EXEMPT                 = 0x100b
+	SO_MAC_IMPLICIT               = 0x1016
+	SO_MAXBLK                     = 0x100000
+	SO_MAXPSZ                     = 0x8
+	SO_MINPSZ                     = 0x4
+	SO_MREADOFF                   = 0x80
+	SO_MREADON                    = 0x40
+	SO_NDELOFF                    = 0x200
+	SO_NDELON                     = 0x100
+	SO_NODELIM                    = 0x10000
+	SO_OOBINLINE                  = 0x100
+	SO_PROTOTYPE                  = 0x1009
+	SO_RCVBUF                     = 0x1002
+	SO_RCVLOWAT                   = 0x1004
+	SO_RCVPSH                     = 0x100d
+	SO_RCVTIMEO                   = 0x1006
+	SO_READOPT                    = 0x1
+	SO_RECVUCRED                  = 0x400
+	SO_REUSEADDR                  = 0x4
+	SO_SECATTR                    = 0x1011
+	SO_SNDBUF                     = 0x1001
+	SO_SNDLOWAT                   = 0x1003
+	SO_SNDTIMEO                   = 0x1005
+	SO_STRHOLD                    = 0x20000
+	SO_TAIL                       = 0x200000
+	SO_TIMESTAMP                  = 0x1013
+	SO_TONSTOP                    = 0x2000
+	SO_TOSTOP                     = 0x1000
+	SO_TYPE                       = 0x1008
+	SO_USELOOPBACK                = 0x40
+	SO_VRRP                       = 0x1017
+	SO_WROFF                      = 0x2
+	TAB0                          = 0x0
+	TAB1                          = 0x800
+	TAB2                          = 0x1000
+	TAB3                          = 0x1800
+	TABDLY                        = 0x1800
+	TCFLSH                        = 0x5407
+	TCGETA                        = 0x5401
+	TCGETS                        = 0x540d
+	TCIFLUSH                      = 0x0
+	TCIOFF                        = 0x2
+	TCIOFLUSH                     = 0x2
+	TCION                         = 0x3
+	TCOFLUSH                      = 0x1
+	TCOOFF                        = 0x0
+	TCOON                         = 0x1
+	TCP_ABORT_THRESHOLD           = 0x11
+	TCP_ANONPRIVBIND              = 0x20
+	TCP_CONN_ABORT_THRESHOLD      = 0x13
+	TCP_CONN_NOTIFY_THRESHOLD     = 0x12
+	TCP_CORK                      = 0x18
+	TCP_EXCLBIND                  = 0x21
+	TCP_INIT_CWND                 = 0x15
+	TCP_KEEPALIVE                 = 0x8
+	TCP_KEEPALIVE_ABORT_THRESHOLD = 0x17
+	TCP_KEEPALIVE_THRESHOLD       = 0x16
+	TCP_KEEPCNT                   = 0x23
+	TCP_KEEPIDLE                  = 0x22
+	TCP_KEEPINTVL                 = 0x24
+	TCP_LINGER2                   = 0x1c
+	TCP_MAXSEG                    = 0x2
+	TCP_MSS                       = 0x218
+	TCP_NODELAY                   = 0x1
+	TCP_NOTIFY_THRESHOLD          = 0x10
+	TCP_RECVDSTADDR               = 0x14
+	TCP_RTO_INITIAL               = 0x19
+	TCP_RTO_MAX                   = 0x1b
+	TCP_RTO_MIN                   = 0x1a
+	TCSAFLUSH                     = 0x5410
+	TCSBRK                        = 0x5405
+	TCSETA                        = 0x5402
+	TCSETAF                       = 0x5404
+	TCSETAW                       = 0x5403
+	TCSETS                        = 0x540e
+	TCSETSF                       = 0x5410
+	TCSETSW                       = 0x540f
+	TCXONC                        = 0x5406
+	TIOC                          = 0x5400
+	TIOCCBRK                      = 0x747a
+	TIOCCDTR                      = 0x7478
+	TIOCCILOOP                    = 0x746c
+	TIOCEXCL                      = 0x740d
+	TIOCFLUSH                     = 0x7410
+	TIOCGETC                      = 0x7412
+	TIOCGETD                      = 0x7400
+	TIOCGETP                      = 0x7408
+	TIOCGLTC                      = 0x7474
+	TIOCGPGRP                     = 0x7414
+	TIOCGPPS                      = 0x547d
+	TIOCGPPSEV                    = 0x547f
+	TIOCGSID                      = 0x7416
+	TIOCGSOFTCAR                  = 0x5469
+	TIOCGWINSZ                    = 0x5468
+	TIOCHPCL                      = 0x7402
+	TIOCKBOF                      = 0x5409
+	TIOCKBON                      = 0x5408
+	TIOCLBIC                      = 0x747e
+	TIOCLBIS                      = 0x747f
+	TIOCLGET                      = 0x747c
+	TIOCLSET                      = 0x747d
+	TIOCMBIC                      = 0x741c
+	TIOCMBIS                      = 0x741b
+	TIOCMGET                      = 0x741d
+	TIOCMSET                      = 0x741a
+	TIOCM_CAR                     = 0x40
+	TIOCM_CD                      = 0x40
+	TIOCM_CTS                     = 0x20
+	TIOCM_DSR                     = 0x100
+	TIOCM_DTR                     = 0x2
+	TIOCM_LE                      = 0x1
+	TIOCM_RI                      = 0x80
+	TIOCM_RNG                     = 0x80
+	TIOCM_RTS                     = 0x4
+	TIOCM_SR                      = 0x10
+	TIOCM_ST                      = 0x8
+	TIOCNOTTY                     = 0x7471
+	TIOCNXCL                      = 0x740e
+	TIOCOUTQ                      = 0x7473
+	TIOCREMOTE                    = 0x741e
+	TIOCSBRK                      = 0x747b
+	TIOCSCTTY                     = 0x7484
+	TIOCSDTR                      = 0x7479
+	TIOCSETC                      = 0x7411
+	TIOCSETD                      = 0x7401
+	TIOCSETN                      = 0x740a
+	TIOCSETP                      = 0x7409
+	TIOCSIGNAL                    = 0x741f
+	TIOCSILOOP                    = 0x746d
+	TIOCSLTC                      = 0x7475
+	TIOCSPGRP                     = 0x7415
+	TIOCSPPS                      = 0x547e
+	TIOCSSOFTCAR                  = 0x546a
+	TIOCSTART                     = 0x746e
+	TIOCSTI                       = 0x7417
+	TIOCSTOP                      = 0x746f
+	TIOCSWINSZ                    = 0x5467
+	TOSTOP                        = 0x100
+	VCEOF                         = 0x8
+	VCEOL                         = 0x9
+	VDISCARD                      = 0xd
+	VDSUSP                        = 0xb
+	VEOF                          = 0x4
+	VEOL                          = 0x5
+	VEOL2                         = 0x6
+	VERASE                        = 0x2
+	VERASE2                       = 0x11
+	VINTR                         = 0x0
+	VKILL                         = 0x3
+	VLNEXT                        = 0xf
+	VMIN                          = 0x4
+	VQUIT                         = 0x1
+	VREPRINT                      = 0xc
+	VSTART                        = 0x8
+	VSTATUS                       = 0x10
+	VSTOP                         = 0x9
+	VSUSP                         = 0xa
+	VSWTCH                        = 0x7
+	VT0                           = 0x0
+	VT1                           = 0x4000
+	VTDLY                         = 0x4000
+	VTIME                         = 0x5
+	VWERASE                       = 0xe
+	WCONTFLG                      = 0xffff
+	WCONTINUED                    = 0x8
+	WCOREFLG                      = 0x80
+	WEXITED                       = 0x1
+	WNOHANG                       = 0x40
+	WNOWAIT                       = 0x80
+	WOPTMASK                      = 0xcf
+	WRAP                          = 0x20000
+	WSIGMASK                      = 0x7f
+	WSTOPFLG                      = 0x7f
+	WSTOPPED                      = 0x4
+	WTRAPPED                      = 0x2
+	WUNTRACED                     = 0x4
+	XCASE                         = 0x4
+	XTABS                         = 0x1800
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x39)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x2f)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x31)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOCKUNMAPPED   = syscall.Errno(0x48)
+	ELOOP           = syscall.Errno(0x5a)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTACTIVE      = syscall.Errno(0x49)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTRECOVERABLE = syscall.Errno(0x3b)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x30)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0x3a)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMOTE         = syscall.Errno(0x42)
+	ERESTART        = syscall.Errno(0x5b)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT    = syscall.Signal(0x6)
+	SIGALRM    = syscall.Signal(0xe)
+	SIGBUS     = syscall.Signal(0xa)
+	SIGCANCEL  = syscall.Signal(0x24)
+	SIGCHLD    = syscall.Signal(0x12)
+	SIGCLD     = syscall.Signal(0x12)
+	SIGCONT    = syscall.Signal(0x19)
+	SIGEMT     = syscall.Signal(0x7)
+	SIGFPE     = syscall.Signal(0x8)
+	SIGFREEZE  = syscall.Signal(0x22)
+	SIGHUP     = syscall.Signal(0x1)
+	SIGILL     = syscall.Signal(0x4)
+	SIGINFO    = syscall.Signal(0x29)
+	SIGINT     = syscall.Signal(0x2)
+	SIGIO      = syscall.Signal(0x16)
+	SIGIOT     = syscall.Signal(0x6)
+	SIGJVM1    = syscall.Signal(0x27)
+	SIGJVM2    = syscall.Signal(0x28)
+	SIGKILL    = syscall.Signal(0x9)
+	SIGLOST    = syscall.Signal(0x25)
+	SIGLWP     = syscall.Signal(0x21)
+	SIGPIPE    = syscall.Signal(0xd)
+	SIGPOLL    = syscall.Signal(0x16)
+	SIGPROF    = syscall.Signal(0x1d)
+	SIGPWR     = syscall.Signal(0x13)
+	SIGQUIT    = syscall.Signal(0x3)
+	SIGSEGV    = syscall.Signal(0xb)
+	SIGSTOP    = syscall.Signal(0x17)
+	SIGSYS     = syscall.Signal(0xc)
+	SIGTERM    = syscall.Signal(0xf)
+	SIGTHAW    = syscall.Signal(0x23)
+	SIGTRAP    = syscall.Signal(0x5)
+	SIGTSTP    = syscall.Signal(0x18)
+	SIGTTIN    = syscall.Signal(0x1a)
+	SIGTTOU    = syscall.Signal(0x1b)
+	SIGURG     = syscall.Signal(0x15)
+	SIGUSR1    = syscall.Signal(0x10)
+	SIGUSR2    = syscall.Signal(0x11)
+	SIGVTALRM  = syscall.Signal(0x1c)
+	SIGWAITING = syscall.Signal(0x20)
+	SIGWINCH   = syscall.Signal(0x14)
+	SIGXCPU    = syscall.Signal(0x1e)
+	SIGXFSZ    = syscall.Signal(0x1f)
+	SIGXRES    = syscall.Signal(0x26)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "not owner"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "I/O error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "arg list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file number"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "not enough space"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "file table overflow"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "deadlock situation detected/avoided"},
+	{46, "ENOLCK", "no record locks available"},
+	{47, "ECANCELED", "operation canceled"},
+	{48, "ENOTSUP", "operation not supported"},
+	{49, "EDQUOT", "disc quota exceeded"},
+	{50, "EBADE", "bad exchange descriptor"},
+	{51, "EBADR", "bad request descriptor"},
+	{52, "EXFULL", "message tables full"},
+	{53, "ENOANO", "anode table overflow"},
+	{54, "EBADRQC", "bad request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock"},
+	{57, "EBFONT", "bad font file format"},
+	{58, "EOWNERDEAD", "owner of the lock died"},
+	{59, "ENOTRECOVERABLE", "lock is not recoverable"},
+	{60, "ENOSTR", "not a stream device"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of stream resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "ELOCKUNMAPPED", "locked lock was unmapped "},
+	{73, "ENOTACTIVE", "facility is not active"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "not a data message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in more shared libraries than system limit"},
+	{87, "ELIBEXEC", "can not exec a shared library directly"},
+	{88, "EILSEQ", "illegal byte sequence"},
+	{89, "ENOSYS", "operation not applicable"},
+	{90, "ELOOP", "number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS"},
+	{91, "ERESTART", "error 91"},
+	{92, "ESTRPIPE", "error 92"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "option not supported by protocol"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "EOPNOTSUPP", "operation not supported on transport endpoint"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection because of reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{143, "ESHUTDOWN", "cannot send after socket shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale NFS file handle"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal Instruction"},
+	{5, "SIGTRAP", "trace/Breakpoint Trap"},
+	{6, "SIGABRT", "abort"},
+	{7, "SIGEMT", "emulation Trap"},
+	{8, "SIGFPE", "arithmetic Exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus Error"},
+	{11, "SIGSEGV", "segmentation Fault"},
+	{12, "SIGSYS", "bad System Call"},
+	{13, "SIGPIPE", "broken Pipe"},
+	{14, "SIGALRM", "alarm Clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user Signal 1"},
+	{17, "SIGUSR2", "user Signal 2"},
+	{18, "SIGCHLD", "child Status Changed"},
+	{19, "SIGPWR", "power-Fail/Restart"},
+	{20, "SIGWINCH", "window Size Change"},
+	{21, "SIGURG", "urgent Socket Condition"},
+	{22, "SIGIO", "pollable Event"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped (user)"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual Timer Expired"},
+	{29, "SIGPROF", "profiling Timer Expired"},
+	{30, "SIGXCPU", "cpu Limit Exceeded"},
+	{31, "SIGXFSZ", "file Size Limit Exceeded"},
+	{32, "SIGWAITING", "no runnable lwp"},
+	{33, "SIGLWP", "inter-lwp signal"},
+	{34, "SIGFREEZE", "checkpoint Freeze"},
+	{35, "SIGTHAW", "checkpoint Thaw"},
+	{36, "SIGCANCEL", "thread Cancellation"},
+	{37, "SIGLOST", "resource Lost"},
+	{38, "SIGXRES", "resource Control Exceeded"},
+	{39, "SIGJVM1", "reserved for JVM 1"},
+	{40, "SIGJVM2", "reserved for JVM 2"},
+	{41, "SIGINFO", "information Request"},
+}
diff --git a/vendor/golang.org/x/sys/unix/zptrace386_linux.go b/vendor/golang.org/x/sys/unix/zptrace386_linux.go
new file mode 100644
index 00000000..2d21c49e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zptrace386_linux.go
@@ -0,0 +1,80 @@
+// Code generated by linux/mkall.go generatePtracePair(386, amd64). DO NOT EDIT.
+
+// +build linux
+// +build 386 amd64
+
+package unix
+
+import "unsafe"
+
+// PtraceRegs386 is the registers used by 386 binaries.
+type PtraceRegs386 struct {
+	Ebx      int32
+	Ecx      int32
+	Edx      int32
+	Esi      int32
+	Edi      int32
+	Ebp      int32
+	Eax      int32
+	Xds      int32
+	Xes      int32
+	Xfs      int32
+	Xgs      int32
+	Orig_eax int32
+	Eip      int32
+	Xcs      int32
+	Eflags   int32
+	Esp      int32
+	Xss      int32
+}
+
+// PtraceGetRegs386 fetches the registers used by 386 binaries.
+func PtraceGetRegs386(pid int, regsout *PtraceRegs386) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegs386 sets the registers used by 386 binaries.
+func PtraceSetRegs386(pid int, regs *PtraceRegs386) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+// PtraceRegsAmd64 is the registers used by amd64 binaries.
+type PtraceRegsAmd64 struct {
+	R15      uint64
+	R14      uint64
+	R13      uint64
+	R12      uint64
+	Rbp      uint64
+	Rbx      uint64
+	R11      uint64
+	R10      uint64
+	R9       uint64
+	R8       uint64
+	Rax      uint64
+	Rcx      uint64
+	Rdx      uint64
+	Rsi      uint64
+	Rdi      uint64
+	Orig_rax uint64
+	Rip      uint64
+	Cs       uint64
+	Eflags   uint64
+	Rsp      uint64
+	Ss       uint64
+	Fs_base  uint64
+	Gs_base  uint64
+	Ds       uint64
+	Es       uint64
+	Fs       uint64
+	Gs       uint64
+}
+
+// PtraceGetRegsAmd64 fetches the registers used by amd64 binaries.
+func PtraceGetRegsAmd64(pid int, regsout *PtraceRegsAmd64) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsAmd64 sets the registers used by amd64 binaries.
+func PtraceSetRegsAmd64(pid int, regs *PtraceRegsAmd64) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
diff --git a/vendor/golang.org/x/sys/unix/zptracearm_linux.go b/vendor/golang.org/x/sys/unix/zptracearm_linux.go
new file mode 100644
index 00000000..faf23bbe
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zptracearm_linux.go
@@ -0,0 +1,41 @@
+// Code generated by linux/mkall.go generatePtracePair(arm, arm64). DO NOT EDIT.
+
+// +build linux
+// +build arm arm64
+
+package unix
+
+import "unsafe"
+
+// PtraceRegsArm is the registers used by arm binaries.
+type PtraceRegsArm struct {
+	Uregs [18]uint32
+}
+
+// PtraceGetRegsArm fetches the registers used by arm binaries.
+func PtraceGetRegsArm(pid int, regsout *PtraceRegsArm) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsArm sets the registers used by arm binaries.
+func PtraceSetRegsArm(pid int, regs *PtraceRegsArm) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+// PtraceRegsArm64 is the registers used by arm64 binaries.
+type PtraceRegsArm64 struct {
+	Regs   [31]uint64
+	Sp     uint64
+	Pc     uint64
+	Pstate uint64
+}
+
+// PtraceGetRegsArm64 fetches the registers used by arm64 binaries.
+func PtraceGetRegsArm64(pid int, regsout *PtraceRegsArm64) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsArm64 sets the registers used by arm64 binaries.
+func PtraceSetRegsArm64(pid int, regs *PtraceRegsArm64) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
diff --git a/vendor/golang.org/x/sys/unix/zptracemips_linux.go b/vendor/golang.org/x/sys/unix/zptracemips_linux.go
new file mode 100644
index 00000000..c431131e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zptracemips_linux.go
@@ -0,0 +1,50 @@
+// Code generated by linux/mkall.go generatePtracePair(mips, mips64). DO NOT EDIT.
+
+// +build linux
+// +build mips mips64
+
+package unix
+
+import "unsafe"
+
+// PtraceRegsMips is the registers used by mips binaries.
+type PtraceRegsMips struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+// PtraceGetRegsMips fetches the registers used by mips binaries.
+func PtraceGetRegsMips(pid int, regsout *PtraceRegsMips) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsMips sets the registers used by mips binaries.
+func PtraceSetRegsMips(pid int, regs *PtraceRegsMips) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+// PtraceRegsMips64 is the registers used by mips64 binaries.
+type PtraceRegsMips64 struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+// PtraceGetRegsMips64 fetches the registers used by mips64 binaries.
+func PtraceGetRegsMips64(pid int, regsout *PtraceRegsMips64) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsMips64 sets the registers used by mips64 binaries.
+func PtraceSetRegsMips64(pid int, regs *PtraceRegsMips64) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
diff --git a/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go b/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go
new file mode 100644
index 00000000..dc3d6d37
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go
@@ -0,0 +1,50 @@
+// Code generated by linux/mkall.go generatePtracePair(mipsle, mips64le). DO NOT EDIT.
+
+// +build linux
+// +build mipsle mips64le
+
+package unix
+
+import "unsafe"
+
+// PtraceRegsMipsle is the registers used by mipsle binaries.
+type PtraceRegsMipsle struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+// PtraceGetRegsMipsle fetches the registers used by mipsle binaries.
+func PtraceGetRegsMipsle(pid int, regsout *PtraceRegsMipsle) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsMipsle sets the registers used by mipsle binaries.
+func PtraceSetRegsMipsle(pid int, regs *PtraceRegsMipsle) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+// PtraceRegsMips64le is the registers used by mips64le binaries.
+type PtraceRegsMips64le struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+// PtraceGetRegsMips64le fetches the registers used by mips64le binaries.
+func PtraceGetRegsMips64le(pid int, regsout *PtraceRegsMips64le) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsMips64le sets the registers used by mips64le binaries.
+func PtraceSetRegsMips64le(pid int, regs *PtraceRegsMips64le) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
new file mode 100644
index 00000000..9ce06df6
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
@@ -0,0 +1,1769 @@
+// mksyscall.pl -l32 -tags darwin,386 syscall_bsd.go syscall_darwin.go syscall_darwin_386.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build darwin,386
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func removexattr(path string, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fremovexattr(fd int, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func listxattr(path string, dest *byte, size int, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func flistxattr(fd int, dest *byte, size int, options int) (sz int, err error) {
+	r0, _, e1 := Syscall6(SYS_FLISTXATTR, uintptr(fd), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int32(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
new file mode 100644
index 00000000..de992704
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -0,0 +1,1769 @@
+// mksyscall.pl -tags darwin,amd64 syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build darwin,amd64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func removexattr(path string, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fremovexattr(fd int, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func listxattr(path string, dest *byte, size int, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func flistxattr(fd int, dest *byte, size int, options int) (sz int, err error) {
+	r0, _, e1 := Syscall6(SYS_FLISTXATTR, uintptr(fd), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int64(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
new file mode 100644
index 00000000..81c4f093
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
@@ -0,0 +1,1769 @@
+// mksyscall.pl -l32 -tags darwin,arm syscall_bsd.go syscall_darwin.go syscall_darwin_arm.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build darwin,arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func removexattr(path string, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fremovexattr(fd int, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func listxattr(path string, dest *byte, size int, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func flistxattr(fd int, dest *byte, size int, options int) (sz int, err error) {
+	r0, _, e1 := Syscall6(SYS_FLISTXATTR, uintptr(fd), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int32(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
new file mode 100644
index 00000000..338c32d4
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -0,0 +1,1769 @@
+// mksyscall.pl -tags darwin,arm64 syscall_bsd.go syscall_darwin.go syscall_darwin_arm64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build darwin,arm64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func removexattr(path string, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fremovexattr(fd int, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func listxattr(path string, dest *byte, size int, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func flistxattr(fd int, dest *byte, size int, options int) (sz int, err error) {
+	r0, _, e1 := Syscall6(SYS_FLISTXATTR, uintptr(fd), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int64(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
new file mode 100644
index 00000000..91f36e9e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -0,0 +1,1508 @@
+// mksyscall.pl -dragonfly -tags dragonfly,amd64 syscall_bsd.go syscall_dragonfly.go syscall_dragonfly_amd64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build dragonfly,amd64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func extpread(fd int, p []byte, flags int, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EXTPREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EXTPWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
new file mode 100644
index 00000000..a86434a7
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
@@ -0,0 +1,1937 @@
+// mksyscall.pl -l32 -tags freebsd,386 syscall_bsd.go syscall_freebsd.go syscall_freebsd_386.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build freebsd,386
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CapEnter() (err error) {
+	_, _, e1 := Syscall(SYS_CAP_ENTER, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsGet(version int, fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS___CAP_RIGHTS_GET, uintptr(version), uintptr(fd), uintptr(unsafe.Pointer(rightsp)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsLimit(fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS_CAP_RIGHTS_LIMIT, uintptr(fd), uintptr(unsafe.Pointer(rightsp)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Openat(fdat int, path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(fdat), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
new file mode 100644
index 00000000..040e2f76
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
@@ -0,0 +1,1937 @@
+// mksyscall.pl -tags freebsd,amd64 syscall_bsd.go syscall_freebsd.go syscall_freebsd_amd64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build freebsd,amd64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CapEnter() (err error) {
+	_, _, e1 := Syscall(SYS_CAP_ENTER, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsGet(version int, fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS___CAP_RIGHTS_GET, uintptr(version), uintptr(fd), uintptr(unsafe.Pointer(rightsp)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsLimit(fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS_CAP_RIGHTS_LIMIT, uintptr(fd), uintptr(unsafe.Pointer(rightsp)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Openat(fdat int, path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(fdat), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
new file mode 100644
index 00000000..cddc5e86
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
@@ -0,0 +1,1937 @@
+// mksyscall.pl -l32 -arm -tags freebsd,arm syscall_bsd.go syscall_freebsd.go syscall_freebsd_arm.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build freebsd,arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CapEnter() (err error) {
+	_, _, e1 := Syscall(SYS_CAP_ENTER, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsGet(version int, fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS___CAP_RIGHTS_GET, uintptr(version), uintptr(fd), uintptr(unsafe.Pointer(rightsp)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsLimit(fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS_CAP_RIGHTS_LIMIT, uintptr(fd), uintptr(unsafe.Pointer(rightsp)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Openat(fdat int, path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(fdat), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
new file mode 100644
index 00000000..8e8d427d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -0,0 +1,2105 @@
+// mksyscall.pl -l32 -tags linux,386 syscall_linux.go syscall_linux_386.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,386
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64_64, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE64, uintptr(fd), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID32, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID32, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID32, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID32, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
new file mode 100644
index 00000000..2f60780c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -0,0 +1,2272 @@
+// mksyscall.pl -tags linux,amd64 syscall_linux.go syscall_linux_amd64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,amd64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
new file mode 100644
index 00000000..d29a11c9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -0,0 +1,2207 @@
+// mksyscall.pl -l32 -arm -tags linux,arm syscall_linux.go syscall_linux_arm.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, flags int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID32, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID32, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID32, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID32, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE64, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
new file mode 100644
index 00000000..d03eb296
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -0,0 +1,2114 @@
+// mksyscall.pl -tags linux,arm64 syscall_linux.go syscall_linux_arm64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,arm64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
new file mode 100644
index 00000000..dea09328
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
@@ -0,0 +1,2285 @@
+// mksyscall.pl -b32 -arm -tags linux,mips syscall_linux.go syscall_linux_mipsx.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,mips
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off>>32), uintptr(off), uintptr(len>>32), uintptr(len))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(int64(r0)<<32 | int64(r1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_FADVISE64, uintptr(fd), 0, uintptr(offset>>32), uintptr(offset), uintptr(length>>32), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE64, uintptr(fd), 0, uintptr(length>>32), uintptr(length), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset>>32), uintptr(offset))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset>>32), uintptr(offset))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall9(SYS_SYNC_FILE_RANGE, uintptr(fd), 0, uintptr(off>>32), uintptr(off), uintptr(n>>32), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length>>32), uintptr(length), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (p1 int, p2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	p1 = int(r0)
+	p2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
new file mode 100644
index 00000000..31bbcff4
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -0,0 +1,2256 @@
+// mksyscall.pl -tags linux,mips64 syscall_linux.go syscall_linux_mips64x.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,mips64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstat(fd int, st *stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func lstat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
new file mode 100644
index 00000000..e025a33a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -0,0 +1,2256 @@
+// mksyscall.pl -tags linux,mips64le syscall_linux.go syscall_linux_mips64x.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,mips64le
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstat(fd int, st *stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func lstat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
new file mode 100644
index 00000000..57d7d931
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
@@ -0,0 +1,2285 @@
+// mksyscall.pl -l32 -arm -tags linux,mipsle syscall_linux.go syscall_linux_mipsx.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,mipsle
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_FADVISE64, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE64, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall9(SYS_SYNC_FILE_RANGE, uintptr(fd), 0, uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (p1 int, p2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	p1 = int(r0)
+	p2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
new file mode 100644
index 00000000..2f7110d7
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -0,0 +1,2319 @@
+// mksyscall.pl -tags linux,ppc64 syscall_linux.go syscall_linux_ppc64x.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,ppc64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
new file mode 100644
index 00000000..bb3bd595
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -0,0 +1,2319 @@
+// mksyscall.pl -tags linux,ppc64le syscall_linux.go syscall_linux_ppc64x.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,ppc64le
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
new file mode 100644
index 00000000..c637da95
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -0,0 +1,2089 @@
+// mksyscall.pl -tags linux,s390x syscall_linux.go syscall_linux_s390x.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,s390x
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func faccessat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
new file mode 100644
index 00000000..b26aee95
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
@@ -0,0 +1,2172 @@
+// mksyscall.pl -tags linux,sparc64 syscall_linux.go syscall_linux_sparc64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build linux,sparc64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
new file mode 100644
index 00000000..f1874d5a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
@@ -0,0 +1,1653 @@
+// mksyscall.pl -l32 -netbsd -tags netbsd,386 syscall_bsd.go syscall_netbsd.go syscall_netbsd_386.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build netbsd,386
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), 0, uintptr(length), uintptr(length>>32), uintptr(advice), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
new file mode 100644
index 00000000..eb802839
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
@@ -0,0 +1,1653 @@
+// mksyscall.pl -netbsd -tags netbsd,amd64 syscall_bsd.go syscall_netbsd.go syscall_netbsd_amd64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build netbsd,amd64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), 0, uintptr(length), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
new file mode 100644
index 00000000..7b36499d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
@@ -0,0 +1,1653 @@
+// mksyscall.pl -l32 -netbsd -arm -tags netbsd,arm syscall_bsd.go syscall_netbsd.go syscall_netbsd_arm.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build netbsd,arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), 0, uintptr(length), uintptr(length>>32), uintptr(advice), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
new file mode 100644
index 00000000..1942049b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -0,0 +1,1508 @@
+// mksyscall.pl -l32 -openbsd -tags openbsd,386 syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build openbsd,386
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrtable() (rtable int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
+	rtable = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrtable(rtable int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
new file mode 100644
index 00000000..d351c72c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -0,0 +1,1508 @@
+// mksyscall.pl -openbsd -tags openbsd,amd64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build openbsd,amd64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrtable() (rtable int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
+	rtable = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrtable(rtable int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
new file mode 100644
index 00000000..617d47f0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
@@ -0,0 +1,1508 @@
+// mksyscall.pl -l32 -openbsd -arm -tags openbsd,arm syscall_bsd.go syscall_openbsd.go syscall_openbsd_arm.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build openbsd,arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrtable() (rtable int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
+	rtable = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrtable(rtable int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
new file mode 100644
index 00000000..e2e5fc5e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
@@ -0,0 +1,1697 @@
+// mksyscall_solaris.pl -tags solaris,amd64 syscall_solaris.go syscall_solaris_amd64.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build solaris,amd64
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+//go:cgo_import_dynamic libc_pipe pipe "libc.so"
+//go:cgo_import_dynamic libc_getsockname getsockname "libsocket.so"
+//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
+//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
+//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
+//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
+//go:cgo_import_dynamic libc_gethostname gethostname "libc.so"
+//go:cgo_import_dynamic libc_utimes utimes "libc.so"
+//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+//go:cgo_import_dynamic libc_futimesat futimesat "libc.so"
+//go:cgo_import_dynamic libc_accept accept "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_recvmsg __xnet_recvmsg "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_sendmsg __xnet_sendmsg "libsocket.so"
+//go:cgo_import_dynamic libc_acct acct "libc.so"
+//go:cgo_import_dynamic libc___makedev __makedev "libc.so"
+//go:cgo_import_dynamic libc___major __major "libc.so"
+//go:cgo_import_dynamic libc___minor __minor "libc.so"
+//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
+//go:cgo_import_dynamic libc_poll poll "libc.so"
+//go:cgo_import_dynamic libc_access access "libc.so"
+//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
+//go:cgo_import_dynamic libc_chdir chdir "libc.so"
+//go:cgo_import_dynamic libc_chmod chmod "libc.so"
+//go:cgo_import_dynamic libc_chown chown "libc.so"
+//go:cgo_import_dynamic libc_chroot chroot "libc.so"
+//go:cgo_import_dynamic libc_close close "libc.so"
+//go:cgo_import_dynamic libc_creat creat "libc.so"
+//go:cgo_import_dynamic libc_dup dup "libc.so"
+//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
+//go:cgo_import_dynamic libc_exit exit "libc.so"
+//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
+//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
+//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
+//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
+//go:cgo_import_dynamic libc_fchown fchown "libc.so"
+//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
+//go:cgo_import_dynamic libc_fdatasync fdatasync "libc.so"
+//go:cgo_import_dynamic libc_flock flock "libc.so"
+//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
+//go:cgo_import_dynamic libc_fstat fstat "libc.so"
+//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
+//go:cgo_import_dynamic libc_fstatvfs fstatvfs "libc.so"
+//go:cgo_import_dynamic libc_getdents getdents "libc.so"
+//go:cgo_import_dynamic libc_getgid getgid "libc.so"
+//go:cgo_import_dynamic libc_getpid getpid "libc.so"
+//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
+//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
+//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
+//go:cgo_import_dynamic libc_getegid getegid "libc.so"
+//go:cgo_import_dynamic libc_getppid getppid "libc.so"
+//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
+//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
+//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
+//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
+//go:cgo_import_dynamic libc_getuid getuid "libc.so"
+//go:cgo_import_dynamic libc_kill kill "libc.so"
+//go:cgo_import_dynamic libc_lchown lchown "libc.so"
+//go:cgo_import_dynamic libc_link link "libc.so"
+//go:cgo_import_dynamic libc___xnet_llisten __xnet_llisten "libsocket.so"
+//go:cgo_import_dynamic libc_lstat lstat "libc.so"
+//go:cgo_import_dynamic libc_madvise madvise "libc.so"
+//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
+//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
+//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
+//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
+//go:cgo_import_dynamic libc_mknod mknod "libc.so"
+//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
+//go:cgo_import_dynamic libc_mlock mlock "libc.so"
+//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
+//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
+//go:cgo_import_dynamic libc_msync msync "libc.so"
+//go:cgo_import_dynamic libc_munlock munlock "libc.so"
+//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
+//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
+//go:cgo_import_dynamic libc_open open "libc.so"
+//go:cgo_import_dynamic libc_openat openat "libc.so"
+//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
+//go:cgo_import_dynamic libc_pause pause "libc.so"
+//go:cgo_import_dynamic libc_pread pread "libc.so"
+//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
+//go:cgo_import_dynamic libc_read read "libc.so"
+//go:cgo_import_dynamic libc_readlink readlink "libc.so"
+//go:cgo_import_dynamic libc_rename rename "libc.so"
+//go:cgo_import_dynamic libc_renameat renameat "libc.so"
+//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
+//go:cgo_import_dynamic libc_lseek lseek "libc.so"
+//go:cgo_import_dynamic libc_select select "libc.so"
+//go:cgo_import_dynamic libc_setegid setegid "libc.so"
+//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
+//go:cgo_import_dynamic libc_setgid setgid "libc.so"
+//go:cgo_import_dynamic libc_sethostname sethostname "libc.so"
+//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
+//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
+//go:cgo_import_dynamic libc_setregid setregid "libc.so"
+//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
+//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
+//go:cgo_import_dynamic libc_setsid setsid "libc.so"
+//go:cgo_import_dynamic libc_setuid setuid "libc.so"
+//go:cgo_import_dynamic libc_shutdown shutdown "libsocket.so"
+//go:cgo_import_dynamic libc_stat stat "libc.so"
+//go:cgo_import_dynamic libc_statvfs statvfs "libc.so"
+//go:cgo_import_dynamic libc_symlink symlink "libc.so"
+//go:cgo_import_dynamic libc_sync sync "libc.so"
+//go:cgo_import_dynamic libc_times times "libc.so"
+//go:cgo_import_dynamic libc_truncate truncate "libc.so"
+//go:cgo_import_dynamic libc_fsync fsync "libc.so"
+//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
+//go:cgo_import_dynamic libc_umask umask "libc.so"
+//go:cgo_import_dynamic libc_uname uname "libc.so"
+//go:cgo_import_dynamic libc_umount umount "libc.so"
+//go:cgo_import_dynamic libc_unlink unlink "libc.so"
+//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
+//go:cgo_import_dynamic libc_ustat ustat "libc.so"
+//go:cgo_import_dynamic libc_utime utime "libc.so"
+//go:cgo_import_dynamic libc___xnet_bind __xnet_bind "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_connect __xnet_connect "libsocket.so"
+//go:cgo_import_dynamic libc_mmap mmap "libc.so"
+//go:cgo_import_dynamic libc_munmap munmap "libc.so"
+//go:cgo_import_dynamic libc_sendfile sendfile "libsendfile.so"
+//go:cgo_import_dynamic libc___xnet_sendto __xnet_sendto "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_socket __xnet_socket "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_socketpair __xnet_socketpair "libsocket.so"
+//go:cgo_import_dynamic libc_write write "libc.so"
+//go:cgo_import_dynamic libc___xnet_getsockopt __xnet_getsockopt "libsocket.so"
+//go:cgo_import_dynamic libc_getpeername getpeername "libsocket.so"
+//go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
+//go:cgo_import_dynamic libc_recvfrom recvfrom "libsocket.so"
+
+//go:linkname procpipe libc_pipe
+//go:linkname procgetsockname libc_getsockname
+//go:linkname procGetcwd libc_getcwd
+//go:linkname procgetgroups libc_getgroups
+//go:linkname procsetgroups libc_setgroups
+//go:linkname procwait4 libc_wait4
+//go:linkname procgethostname libc_gethostname
+//go:linkname procutimes libc_utimes
+//go:linkname procutimensat libc_utimensat
+//go:linkname procfcntl libc_fcntl
+//go:linkname procfutimesat libc_futimesat
+//go:linkname procaccept libc_accept
+//go:linkname proc__xnet_recvmsg libc___xnet_recvmsg
+//go:linkname proc__xnet_sendmsg libc___xnet_sendmsg
+//go:linkname procacct libc_acct
+//go:linkname proc__makedev libc___makedev
+//go:linkname proc__major libc___major
+//go:linkname proc__minor libc___minor
+//go:linkname procioctl libc_ioctl
+//go:linkname procpoll libc_poll
+//go:linkname procAccess libc_access
+//go:linkname procAdjtime libc_adjtime
+//go:linkname procChdir libc_chdir
+//go:linkname procChmod libc_chmod
+//go:linkname procChown libc_chown
+//go:linkname procChroot libc_chroot
+//go:linkname procClose libc_close
+//go:linkname procCreat libc_creat
+//go:linkname procDup libc_dup
+//go:linkname procDup2 libc_dup2
+//go:linkname procExit libc_exit
+//go:linkname procFaccessat libc_faccessat
+//go:linkname procFchdir libc_fchdir
+//go:linkname procFchmod libc_fchmod
+//go:linkname procFchmodat libc_fchmodat
+//go:linkname procFchown libc_fchown
+//go:linkname procFchownat libc_fchownat
+//go:linkname procFdatasync libc_fdatasync
+//go:linkname procFlock libc_flock
+//go:linkname procFpathconf libc_fpathconf
+//go:linkname procFstat libc_fstat
+//go:linkname procFstatat libc_fstatat
+//go:linkname procFstatvfs libc_fstatvfs
+//go:linkname procGetdents libc_getdents
+//go:linkname procGetgid libc_getgid
+//go:linkname procGetpid libc_getpid
+//go:linkname procGetpgid libc_getpgid
+//go:linkname procGetpgrp libc_getpgrp
+//go:linkname procGeteuid libc_geteuid
+//go:linkname procGetegid libc_getegid
+//go:linkname procGetppid libc_getppid
+//go:linkname procGetpriority libc_getpriority
+//go:linkname procGetrlimit libc_getrlimit
+//go:linkname procGetrusage libc_getrusage
+//go:linkname procGettimeofday libc_gettimeofday
+//go:linkname procGetuid libc_getuid
+//go:linkname procKill libc_kill
+//go:linkname procLchown libc_lchown
+//go:linkname procLink libc_link
+//go:linkname proc__xnet_llisten libc___xnet_llisten
+//go:linkname procLstat libc_lstat
+//go:linkname procMadvise libc_madvise
+//go:linkname procMkdir libc_mkdir
+//go:linkname procMkdirat libc_mkdirat
+//go:linkname procMkfifo libc_mkfifo
+//go:linkname procMkfifoat libc_mkfifoat
+//go:linkname procMknod libc_mknod
+//go:linkname procMknodat libc_mknodat
+//go:linkname procMlock libc_mlock
+//go:linkname procMlockall libc_mlockall
+//go:linkname procMprotect libc_mprotect
+//go:linkname procMsync libc_msync
+//go:linkname procMunlock libc_munlock
+//go:linkname procMunlockall libc_munlockall
+//go:linkname procNanosleep libc_nanosleep
+//go:linkname procOpen libc_open
+//go:linkname procOpenat libc_openat
+//go:linkname procPathconf libc_pathconf
+//go:linkname procPause libc_pause
+//go:linkname procPread libc_pread
+//go:linkname procPwrite libc_pwrite
+//go:linkname procread libc_read
+//go:linkname procReadlink libc_readlink
+//go:linkname procRename libc_rename
+//go:linkname procRenameat libc_renameat
+//go:linkname procRmdir libc_rmdir
+//go:linkname proclseek libc_lseek
+//go:linkname procSelect libc_select
+//go:linkname procSetegid libc_setegid
+//go:linkname procSeteuid libc_seteuid
+//go:linkname procSetgid libc_setgid
+//go:linkname procSethostname libc_sethostname
+//go:linkname procSetpgid libc_setpgid
+//go:linkname procSetpriority libc_setpriority
+//go:linkname procSetregid libc_setregid
+//go:linkname procSetreuid libc_setreuid
+//go:linkname procSetrlimit libc_setrlimit
+//go:linkname procSetsid libc_setsid
+//go:linkname procSetuid libc_setuid
+//go:linkname procshutdown libc_shutdown
+//go:linkname procStat libc_stat
+//go:linkname procStatvfs libc_statvfs
+//go:linkname procSymlink libc_symlink
+//go:linkname procSync libc_sync
+//go:linkname procTimes libc_times
+//go:linkname procTruncate libc_truncate
+//go:linkname procFsync libc_fsync
+//go:linkname procFtruncate libc_ftruncate
+//go:linkname procUmask libc_umask
+//go:linkname procUname libc_uname
+//go:linkname procumount libc_umount
+//go:linkname procUnlink libc_unlink
+//go:linkname procUnlinkat libc_unlinkat
+//go:linkname procUstat libc_ustat
+//go:linkname procUtime libc_utime
+//go:linkname proc__xnet_bind libc___xnet_bind
+//go:linkname proc__xnet_connect libc___xnet_connect
+//go:linkname procmmap libc_mmap
+//go:linkname procmunmap libc_munmap
+//go:linkname procsendfile libc_sendfile
+//go:linkname proc__xnet_sendto libc___xnet_sendto
+//go:linkname proc__xnet_socket libc___xnet_socket
+//go:linkname proc__xnet_socketpair libc___xnet_socketpair
+//go:linkname procwrite libc_write
+//go:linkname proc__xnet_getsockopt libc___xnet_getsockopt
+//go:linkname procgetpeername libc_getpeername
+//go:linkname procsetsockopt libc_setsockopt
+//go:linkname procrecvfrom libc_recvfrom
+
+var (
+	procpipe,
+	procgetsockname,
+	procGetcwd,
+	procgetgroups,
+	procsetgroups,
+	procwait4,
+	procgethostname,
+	procutimes,
+	procutimensat,
+	procfcntl,
+	procfutimesat,
+	procaccept,
+	proc__xnet_recvmsg,
+	proc__xnet_sendmsg,
+	procacct,
+	proc__makedev,
+	proc__major,
+	proc__minor,
+	procioctl,
+	procpoll,
+	procAccess,
+	procAdjtime,
+	procChdir,
+	procChmod,
+	procChown,
+	procChroot,
+	procClose,
+	procCreat,
+	procDup,
+	procDup2,
+	procExit,
+	procFaccessat,
+	procFchdir,
+	procFchmod,
+	procFchmodat,
+	procFchown,
+	procFchownat,
+	procFdatasync,
+	procFlock,
+	procFpathconf,
+	procFstat,
+	procFstatat,
+	procFstatvfs,
+	procGetdents,
+	procGetgid,
+	procGetpid,
+	procGetpgid,
+	procGetpgrp,
+	procGeteuid,
+	procGetegid,
+	procGetppid,
+	procGetpriority,
+	procGetrlimit,
+	procGetrusage,
+	procGettimeofday,
+	procGetuid,
+	procKill,
+	procLchown,
+	procLink,
+	proc__xnet_llisten,
+	procLstat,
+	procMadvise,
+	procMkdir,
+	procMkdirat,
+	procMkfifo,
+	procMkfifoat,
+	procMknod,
+	procMknodat,
+	procMlock,
+	procMlockall,
+	procMprotect,
+	procMsync,
+	procMunlock,
+	procMunlockall,
+	procNanosleep,
+	procOpen,
+	procOpenat,
+	procPathconf,
+	procPause,
+	procPread,
+	procPwrite,
+	procread,
+	procReadlink,
+	procRename,
+	procRenameat,
+	procRmdir,
+	proclseek,
+	procSelect,
+	procSetegid,
+	procSeteuid,
+	procSetgid,
+	procSethostname,
+	procSetpgid,
+	procSetpriority,
+	procSetregid,
+	procSetreuid,
+	procSetrlimit,
+	procSetsid,
+	procSetuid,
+	procshutdown,
+	procStat,
+	procStatvfs,
+	procSymlink,
+	procSync,
+	procTimes,
+	procTruncate,
+	procFsync,
+	procFtruncate,
+	procUmask,
+	procUname,
+	procumount,
+	procUnlink,
+	procUnlinkat,
+	procUstat,
+	procUtime,
+	proc__xnet_bind,
+	proc__xnet_connect,
+	procmmap,
+	procmunmap,
+	procsendfile,
+	proc__xnet_sendto,
+	proc__xnet_socket,
+	proc__xnet_socketpair,
+	procwrite,
+	proc__xnet_getsockopt,
+	procgetpeername,
+	procsetsockopt,
+	procrecvfrom syscallFunc
+)
+
+func pipe(p *[2]_C_int) (n int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procpipe)), 1, uintptr(unsafe.Pointer(p)), 0, 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockname)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetcwd)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func wait4(pid int32, statusp *_C_int, options int, rusage *Rusage) (wpid int32, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwait4)), 4, uintptr(pid), uintptr(unsafe.Pointer(statusp)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int32(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func gethostname(buf []byte) (n int, err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimes)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func utimensat(fd int, path string, times *[2]Timespec, flag int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimensat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func futimesat(fildes int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfutimesat)), 3, uintptr(fildes), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procaccept)), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_recvmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_sendmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func acct(path *byte) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procacct)), 1, uintptr(unsafe.Pointer(path)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func __makedev(version int, major uint, minor uint) (val uint64) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&proc__makedev)), 3, uintptr(version), uintptr(major), uintptr(minor), 0, 0, 0)
+	val = uint64(r0)
+	return
+}
+
+func __major(version int, dev uint64) (val uint) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&proc__major)), 2, uintptr(version), uintptr(dev), 0, 0, 0, 0)
+	val = uint(r0)
+	return
+}
+
+func __minor(version int, dev uint64) (val uint) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&proc__minor)), 2, uintptr(version), uintptr(dev), 0, 0, 0, 0)
+	val = uint(r0)
+	return
+}
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procpoll)), 3, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAccess)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAdjtime)), 2, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChmod)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChroot)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Close(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procClose)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Creat(path string, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procCreat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup2)), 2, uintptr(oldfd), uintptr(newfd), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Exit(code int) {
+	sysvicall6(uintptr(unsafe.Pointer(&procExit)), 1, uintptr(code), 0, 0, 0, 0, 0)
+	return
+}
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFaccessat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchdir)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmod)), 2, uintptr(fd), uintptr(mode), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchown)), 3, uintptr(fd), uintptr(uid), uintptr(gid), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchownat)), 5, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFdatasync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFlock)), 2, uintptr(fd), uintptr(how), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFpathconf)), 2, uintptr(fd), uintptr(name), 0, 0, 0, 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstat)), 2, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstatat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fstatvfs(fd int, vfsstat *Statvfs_t) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstatvfs)), 2, uintptr(fd), uintptr(unsafe.Pointer(vfsstat)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getdents(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetdents)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getgid() (gid int) {
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetgid)), 0, 0, 0, 0, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+func Getpid() (pid int) {
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpid)), 0, 0, 0, 0, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgid)), 1, uintptr(pid), 0, 0, 0, 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getpgrp() (pgid int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgrp)), 0, 0, 0, 0, 0, 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Geteuid() (euid int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGeteuid)), 0, 0, 0, 0, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+func Getegid() (egid int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetegid)), 0, 0, 0, 0, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+func Getppid() (ppid int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetppid)), 0, 0, 0, 0, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+func Getpriority(which int, who int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetpriority)), 2, uintptr(which), uintptr(who), 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrusage)), 2, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGettimeofday)), 1, uintptr(unsafe.Pointer(tv)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getuid() (uid int) {
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetuid)), 0, 0, 0, 0, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procKill)), 2, uintptr(pid), uintptr(signum), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLchown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_llisten)), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLstat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMadvise)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(advice), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdir)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdirat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifo)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifoat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknod)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mlock(b []byte) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlockall)), 1, uintptr(flags), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMprotect)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(prot), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMsync)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(flags), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Munlock(b []byte) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Munlockall() (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlockall)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procNanosleep)), 2, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpen)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpenat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPathconf)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0, 0, 0, 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Pause() (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPause)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPread)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPwrite)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	if len(buf) > 0 {
+		_p1 = &buf[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procReadlink)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(len(buf)), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRename)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRenameat)), 4, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRmdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclseek)), 3, uintptr(fd), uintptr(offset), uintptr(whence), 0, 0, 0)
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSelect)), 5, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetegid)), 1, uintptr(egid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSeteuid)), 1, uintptr(euid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetgid)), 1, uintptr(gid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Sethostname(p []byte) (err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetpgid)), 2, uintptr(pid), uintptr(pgid), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSetpriority)), 3, uintptr(which), uintptr(who), uintptr(prio), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetregid)), 2, uintptr(rgid), uintptr(egid), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetreuid)), 2, uintptr(ruid), uintptr(euid), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetsid)), 0, 0, 0, 0, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetuid)), 1, uintptr(uid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procshutdown)), 2, uintptr(s), uintptr(how), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Statvfs(path string, vfsstat *Statvfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStatvfs)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(vfsstat)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSymlink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Sync() (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSync)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procTimes)), 1, uintptr(unsafe.Pointer(tms)), 0, 0, 0, 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procTruncate)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFsync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFtruncate)), 2, uintptr(fd), uintptr(length), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procUmask)), 1, uintptr(mask), 0, 0, 0, 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procUname)), 1, uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procumount)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlink)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlinkat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUstat)), 2, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUtime)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_bind)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_connect)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmmap)), 6, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmunmap)), 2, uintptr(addr), uintptr(length), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendfile)), 4, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_sendto)), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_socket)), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&proc__xnet_socketpair)), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_getsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetpeername)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvfrom)), 6, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
new file mode 100644
index 00000000..b005031a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
@@ -0,0 +1,270 @@
+// mksysctl_openbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+package unix
+
+type mibentry struct {
+	ctlname string
+	ctloid  []_C_int
+}
+
+var sysctlMib = []mibentry{
+	{"ddb.console", []_C_int{9, 6}},
+	{"ddb.log", []_C_int{9, 7}},
+	{"ddb.max_line", []_C_int{9, 3}},
+	{"ddb.max_width", []_C_int{9, 2}},
+	{"ddb.panic", []_C_int{9, 5}},
+	{"ddb.radix", []_C_int{9, 1}},
+	{"ddb.tab_stop_width", []_C_int{9, 4}},
+	{"ddb.trigger", []_C_int{9, 8}},
+	{"fs.posix.setuid", []_C_int{3, 1, 1}},
+	{"hw.allowpowerdown", []_C_int{6, 22}},
+	{"hw.byteorder", []_C_int{6, 4}},
+	{"hw.cpuspeed", []_C_int{6, 12}},
+	{"hw.diskcount", []_C_int{6, 10}},
+	{"hw.disknames", []_C_int{6, 8}},
+	{"hw.diskstats", []_C_int{6, 9}},
+	{"hw.machine", []_C_int{6, 1}},
+	{"hw.model", []_C_int{6, 2}},
+	{"hw.ncpu", []_C_int{6, 3}},
+	{"hw.ncpufound", []_C_int{6, 21}},
+	{"hw.pagesize", []_C_int{6, 7}},
+	{"hw.physmem", []_C_int{6, 19}},
+	{"hw.product", []_C_int{6, 15}},
+	{"hw.serialno", []_C_int{6, 17}},
+	{"hw.setperf", []_C_int{6, 13}},
+	{"hw.usermem", []_C_int{6, 20}},
+	{"hw.uuid", []_C_int{6, 18}},
+	{"hw.vendor", []_C_int{6, 14}},
+	{"hw.version", []_C_int{6, 16}},
+	{"kern.arandom", []_C_int{1, 37}},
+	{"kern.argmax", []_C_int{1, 8}},
+	{"kern.boottime", []_C_int{1, 21}},
+	{"kern.bufcachepercent", []_C_int{1, 72}},
+	{"kern.ccpu", []_C_int{1, 45}},
+	{"kern.clockrate", []_C_int{1, 12}},
+	{"kern.consdev", []_C_int{1, 75}},
+	{"kern.cp_time", []_C_int{1, 40}},
+	{"kern.cp_time2", []_C_int{1, 71}},
+	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
+	{"kern.domainname", []_C_int{1, 22}},
+	{"kern.file", []_C_int{1, 73}},
+	{"kern.forkstat", []_C_int{1, 42}},
+	{"kern.fscale", []_C_int{1, 46}},
+	{"kern.fsync", []_C_int{1, 33}},
+	{"kern.hostid", []_C_int{1, 11}},
+	{"kern.hostname", []_C_int{1, 10}},
+	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
+	{"kern.job_control", []_C_int{1, 19}},
+	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
+	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
+	{"kern.maxclusters", []_C_int{1, 67}},
+	{"kern.maxfiles", []_C_int{1, 7}},
+	{"kern.maxlocksperuid", []_C_int{1, 70}},
+	{"kern.maxpartitions", []_C_int{1, 23}},
+	{"kern.maxproc", []_C_int{1, 6}},
+	{"kern.maxthread", []_C_int{1, 25}},
+	{"kern.maxvnodes", []_C_int{1, 5}},
+	{"kern.mbstat", []_C_int{1, 59}},
+	{"kern.msgbuf", []_C_int{1, 48}},
+	{"kern.msgbufsize", []_C_int{1, 38}},
+	{"kern.nchstats", []_C_int{1, 41}},
+	{"kern.netlivelocks", []_C_int{1, 76}},
+	{"kern.nfiles", []_C_int{1, 56}},
+	{"kern.ngroups", []_C_int{1, 18}},
+	{"kern.nosuidcoredump", []_C_int{1, 32}},
+	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
+	{"kern.nthreads", []_C_int{1, 26}},
+	{"kern.numvnodes", []_C_int{1, 58}},
+	{"kern.osrelease", []_C_int{1, 2}},
+	{"kern.osrevision", []_C_int{1, 3}},
+	{"kern.ostype", []_C_int{1, 1}},
+	{"kern.osversion", []_C_int{1, 27}},
+	{"kern.pool_debug", []_C_int{1, 77}},
+	{"kern.posix1version", []_C_int{1, 17}},
+	{"kern.proc", []_C_int{1, 66}},
+	{"kern.random", []_C_int{1, 31}},
+	{"kern.rawpartition", []_C_int{1, 24}},
+	{"kern.saved_ids", []_C_int{1, 20}},
+	{"kern.securelevel", []_C_int{1, 9}},
+	{"kern.seminfo", []_C_int{1, 61}},
+	{"kern.shminfo", []_C_int{1, 62}},
+	{"kern.somaxconn", []_C_int{1, 28}},
+	{"kern.sominconn", []_C_int{1, 29}},
+	{"kern.splassert", []_C_int{1, 54}},
+	{"kern.stackgap_random", []_C_int{1, 50}},
+	{"kern.sysvipc_info", []_C_int{1, 51}},
+	{"kern.sysvmsg", []_C_int{1, 34}},
+	{"kern.sysvsem", []_C_int{1, 35}},
+	{"kern.sysvshm", []_C_int{1, 36}},
+	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
+	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
+	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
+	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
+	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
+	{"kern.tty.nptys", []_C_int{1, 44, 7}},
+	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
+	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
+	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
+	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
+	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
+	{"kern.ttycount", []_C_int{1, 57}},
+	{"kern.userasymcrypto", []_C_int{1, 60}},
+	{"kern.usercrypto", []_C_int{1, 52}},
+	{"kern.usermount", []_C_int{1, 30}},
+	{"kern.version", []_C_int{1, 4}},
+	{"kern.vnode", []_C_int{1, 13}},
+	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
+	{"kern.watchdog.period", []_C_int{1, 64, 1}},
+	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
+	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
+	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
+	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
+	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
+	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
+	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
+	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
+	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
+	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
+	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
+	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
+	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
+	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
+	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
+	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
+	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
+	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
+	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
+	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
+	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
+	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
+	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
+	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
+	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
+	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
+	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
+	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
+	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
+	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
+	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
+	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
+	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
+	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
+	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
+	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
+	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
+	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
+	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
+	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
+	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
+	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
+	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
+	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
+	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
+	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
+	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
+	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
+	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
+	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
+	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
+	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
+	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
+	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
+	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
+	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
+	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
+	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
+	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
+	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
+	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
+	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
+	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
+	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
+	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
+	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
+	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
+	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
+	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
+	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
+	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
+	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
+	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
+	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
+	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
+	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
+	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
+	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
+	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
+	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
+	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
+	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
+	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
+	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
+	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
+	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
+	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
+	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
+	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
+	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
+	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
+	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
+	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
+	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
+	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
+	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
+	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
+	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
+	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
+	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
+	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
+	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
+	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
+	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
+	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
+	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
+	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
+	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
+	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
+	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
+	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
+	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
+	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
+	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
+	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
+	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
+	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
+	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
+	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
+	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
+	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
+	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
+	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
+	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
+	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
+	{"net.key.spd_dump", []_C_int{4, 30, 2}},
+	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
+	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
+	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
+	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
+	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
+	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
+	{"net.mpls.ttl", []_C_int{4, 33, 2}},
+	{"net.pflow.stats", []_C_int{4, 34, 1}},
+	{"net.pipex.enable", []_C_int{4, 35, 1}},
+	{"vm.anonmin", []_C_int{2, 7}},
+	{"vm.loadavg", []_C_int{2, 2}},
+	{"vm.maxslp", []_C_int{2, 10}},
+	{"vm.nkmempages", []_C_int{2, 6}},
+	{"vm.psstrings", []_C_int{2, 3}},
+	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
+	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
+	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
+	{"vm.uspace", []_C_int{2, 11}},
+	{"vm.uvmexp", []_C_int{2, 4}},
+	{"vm.vmmeter", []_C_int{2, 1}},
+	{"vm.vnodemin", []_C_int{2, 9}},
+	{"vm.vtextmin", []_C_int{2, 8}},
+}
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
new file mode 100644
index 00000000..90c95c2c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
@@ -0,0 +1,257 @@
+// mksysctl_openbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+// +build amd64,openbsd
+
+package unix
+
+type mibentry struct {
+	ctlname string
+	ctloid  []_C_int
+}
+
+var sysctlMib = []mibentry{
+	{"ddb.console", []_C_int{9, 6}},
+	{"ddb.log", []_C_int{9, 7}},
+	{"ddb.max_line", []_C_int{9, 3}},
+	{"ddb.max_width", []_C_int{9, 2}},
+	{"ddb.panic", []_C_int{9, 5}},
+	{"ddb.profile", []_C_int{9, 9}},
+	{"ddb.radix", []_C_int{9, 1}},
+	{"ddb.tab_stop_width", []_C_int{9, 4}},
+	{"ddb.trigger", []_C_int{9, 8}},
+	{"fs.posix.setuid", []_C_int{3, 1, 1}},
+	{"hw.allowpowerdown", []_C_int{6, 22}},
+	{"hw.byteorder", []_C_int{6, 4}},
+	{"hw.cpuspeed", []_C_int{6, 12}},
+	{"hw.diskcount", []_C_int{6, 10}},
+	{"hw.disknames", []_C_int{6, 8}},
+	{"hw.diskstats", []_C_int{6, 9}},
+	{"hw.machine", []_C_int{6, 1}},
+	{"hw.model", []_C_int{6, 2}},
+	{"hw.ncpu", []_C_int{6, 3}},
+	{"hw.ncpufound", []_C_int{6, 21}},
+	{"hw.pagesize", []_C_int{6, 7}},
+	{"hw.perfpolicy", []_C_int{6, 23}},
+	{"hw.physmem", []_C_int{6, 19}},
+	{"hw.product", []_C_int{6, 15}},
+	{"hw.serialno", []_C_int{6, 17}},
+	{"hw.setperf", []_C_int{6, 13}},
+	{"hw.usermem", []_C_int{6, 20}},
+	{"hw.uuid", []_C_int{6, 18}},
+	{"hw.vendor", []_C_int{6, 14}},
+	{"hw.version", []_C_int{6, 16}},
+	{"kern.allowkmem", []_C_int{1, 52}},
+	{"kern.argmax", []_C_int{1, 8}},
+	{"kern.boottime", []_C_int{1, 21}},
+	{"kern.bufcachepercent", []_C_int{1, 72}},
+	{"kern.ccpu", []_C_int{1, 45}},
+	{"kern.clockrate", []_C_int{1, 12}},
+	{"kern.consdev", []_C_int{1, 75}},
+	{"kern.cp_time", []_C_int{1, 40}},
+	{"kern.cp_time2", []_C_int{1, 71}},
+	{"kern.dnsjackport", []_C_int{1, 13}},
+	{"kern.domainname", []_C_int{1, 22}},
+	{"kern.file", []_C_int{1, 73}},
+	{"kern.forkstat", []_C_int{1, 42}},
+	{"kern.fscale", []_C_int{1, 46}},
+	{"kern.fsync", []_C_int{1, 33}},
+	{"kern.global_ptrace", []_C_int{1, 81}},
+	{"kern.hostid", []_C_int{1, 11}},
+	{"kern.hostname", []_C_int{1, 10}},
+	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
+	{"kern.job_control", []_C_int{1, 19}},
+	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
+	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
+	{"kern.maxclusters", []_C_int{1, 67}},
+	{"kern.maxfiles", []_C_int{1, 7}},
+	{"kern.maxlocksperuid", []_C_int{1, 70}},
+	{"kern.maxpartitions", []_C_int{1, 23}},
+	{"kern.maxproc", []_C_int{1, 6}},
+	{"kern.maxthread", []_C_int{1, 25}},
+	{"kern.maxvnodes", []_C_int{1, 5}},
+	{"kern.mbstat", []_C_int{1, 59}},
+	{"kern.msgbuf", []_C_int{1, 48}},
+	{"kern.msgbufsize", []_C_int{1, 38}},
+	{"kern.nchstats", []_C_int{1, 41}},
+	{"kern.netlivelocks", []_C_int{1, 76}},
+	{"kern.nfiles", []_C_int{1, 56}},
+	{"kern.ngroups", []_C_int{1, 18}},
+	{"kern.nosuidcoredump", []_C_int{1, 32}},
+	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
+	{"kern.nthreads", []_C_int{1, 26}},
+	{"kern.numvnodes", []_C_int{1, 58}},
+	{"kern.osrelease", []_C_int{1, 2}},
+	{"kern.osrevision", []_C_int{1, 3}},
+	{"kern.ostype", []_C_int{1, 1}},
+	{"kern.osversion", []_C_int{1, 27}},
+	{"kern.pool_debug", []_C_int{1, 77}},
+	{"kern.posix1version", []_C_int{1, 17}},
+	{"kern.proc", []_C_int{1, 66}},
+	{"kern.rawpartition", []_C_int{1, 24}},
+	{"kern.saved_ids", []_C_int{1, 20}},
+	{"kern.securelevel", []_C_int{1, 9}},
+	{"kern.seminfo", []_C_int{1, 61}},
+	{"kern.shminfo", []_C_int{1, 62}},
+	{"kern.somaxconn", []_C_int{1, 28}},
+	{"kern.sominconn", []_C_int{1, 29}},
+	{"kern.splassert", []_C_int{1, 54}},
+	{"kern.stackgap_random", []_C_int{1, 50}},
+	{"kern.sysvipc_info", []_C_int{1, 51}},
+	{"kern.sysvmsg", []_C_int{1, 34}},
+	{"kern.sysvsem", []_C_int{1, 35}},
+	{"kern.sysvshm", []_C_int{1, 36}},
+	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
+	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
+	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
+	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
+	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
+	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
+	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
+	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
+	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
+	{"kern.ttycount", []_C_int{1, 57}},
+	{"kern.version", []_C_int{1, 4}},
+	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
+	{"kern.watchdog.period", []_C_int{1, 64, 1}},
+	{"kern.wxabort", []_C_int{1, 74}},
+	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
+	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
+	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
+	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
+	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
+	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
+	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
+	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
+	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
+	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
+	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
+	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
+	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
+	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
+	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
+	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
+	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
+	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
+	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
+	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
+	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
+	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
+	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
+	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
+	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
+	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
+	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
+	{"net.inet.ip.arpdown", []_C_int{4, 2, 0, 40}},
+	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
+	{"net.inet.ip.arptimeout", []_C_int{4, 2, 0, 39}},
+	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
+	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
+	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
+	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
+	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
+	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
+	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
+	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
+	{"net.inet.ip.mrtmfc", []_C_int{4, 2, 0, 37}},
+	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
+	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
+	{"net.inet.ip.mrtvif", []_C_int{4, 2, 0, 38}},
+	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
+	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
+	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
+	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
+	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
+	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
+	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
+	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
+	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
+	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
+	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
+	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
+	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
+	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
+	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
+	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
+	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
+	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
+	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
+	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
+	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
+	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
+	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
+	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
+	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
+	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
+	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
+	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
+	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
+	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
+	{"net.inet.tcp.rootonly", []_C_int{4, 2, 6, 24}},
+	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
+	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
+	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
+	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
+	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
+	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
+	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
+	{"net.inet.tcp.synhashsize", []_C_int{4, 2, 6, 25}},
+	{"net.inet.tcp.synuselimit", []_C_int{4, 2, 6, 23}},
+	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
+	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
+	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
+	{"net.inet.udp.rootonly", []_C_int{4, 2, 17, 6}},
+	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
+	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
+	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
+	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
+	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
+	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
+	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
+	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
+	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
+	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
+	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
+	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
+	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
+	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
+	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
+	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
+	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
+	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
+	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
+	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
+	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
+	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
+	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
+	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
+	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
+	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
+	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
+	{"net.inet6.ip6.mrtmfc", []_C_int{4, 24, 17, 53}},
+	{"net.inet6.ip6.mrtmif", []_C_int{4, 24, 17, 52}},
+	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
+	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
+	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
+	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
+	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
+	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
+	{"net.inet6.ip6.soiikey", []_C_int{4, 24, 17, 54}},
+	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
+	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
+	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
+	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
+	{"net.key.spd_dump", []_C_int{4, 30, 2}},
+	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
+	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
+	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
+	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
+	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
+	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
+	{"net.mpls.ttl", []_C_int{4, 33, 2}},
+	{"net.pflow.stats", []_C_int{4, 34, 1}},
+	{"net.pipex.enable", []_C_int{4, 35, 1}},
+}
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
new file mode 100644
index 00000000..b005031a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
@@ -0,0 +1,270 @@
+// mksysctl_openbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+package unix
+
+type mibentry struct {
+	ctlname string
+	ctloid  []_C_int
+}
+
+var sysctlMib = []mibentry{
+	{"ddb.console", []_C_int{9, 6}},
+	{"ddb.log", []_C_int{9, 7}},
+	{"ddb.max_line", []_C_int{9, 3}},
+	{"ddb.max_width", []_C_int{9, 2}},
+	{"ddb.panic", []_C_int{9, 5}},
+	{"ddb.radix", []_C_int{9, 1}},
+	{"ddb.tab_stop_width", []_C_int{9, 4}},
+	{"ddb.trigger", []_C_int{9, 8}},
+	{"fs.posix.setuid", []_C_int{3, 1, 1}},
+	{"hw.allowpowerdown", []_C_int{6, 22}},
+	{"hw.byteorder", []_C_int{6, 4}},
+	{"hw.cpuspeed", []_C_int{6, 12}},
+	{"hw.diskcount", []_C_int{6, 10}},
+	{"hw.disknames", []_C_int{6, 8}},
+	{"hw.diskstats", []_C_int{6, 9}},
+	{"hw.machine", []_C_int{6, 1}},
+	{"hw.model", []_C_int{6, 2}},
+	{"hw.ncpu", []_C_int{6, 3}},
+	{"hw.ncpufound", []_C_int{6, 21}},
+	{"hw.pagesize", []_C_int{6, 7}},
+	{"hw.physmem", []_C_int{6, 19}},
+	{"hw.product", []_C_int{6, 15}},
+	{"hw.serialno", []_C_int{6, 17}},
+	{"hw.setperf", []_C_int{6, 13}},
+	{"hw.usermem", []_C_int{6, 20}},
+	{"hw.uuid", []_C_int{6, 18}},
+	{"hw.vendor", []_C_int{6, 14}},
+	{"hw.version", []_C_int{6, 16}},
+	{"kern.arandom", []_C_int{1, 37}},
+	{"kern.argmax", []_C_int{1, 8}},
+	{"kern.boottime", []_C_int{1, 21}},
+	{"kern.bufcachepercent", []_C_int{1, 72}},
+	{"kern.ccpu", []_C_int{1, 45}},
+	{"kern.clockrate", []_C_int{1, 12}},
+	{"kern.consdev", []_C_int{1, 75}},
+	{"kern.cp_time", []_C_int{1, 40}},
+	{"kern.cp_time2", []_C_int{1, 71}},
+	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
+	{"kern.domainname", []_C_int{1, 22}},
+	{"kern.file", []_C_int{1, 73}},
+	{"kern.forkstat", []_C_int{1, 42}},
+	{"kern.fscale", []_C_int{1, 46}},
+	{"kern.fsync", []_C_int{1, 33}},
+	{"kern.hostid", []_C_int{1, 11}},
+	{"kern.hostname", []_C_int{1, 10}},
+	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
+	{"kern.job_control", []_C_int{1, 19}},
+	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
+	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
+	{"kern.maxclusters", []_C_int{1, 67}},
+	{"kern.maxfiles", []_C_int{1, 7}},
+	{"kern.maxlocksperuid", []_C_int{1, 70}},
+	{"kern.maxpartitions", []_C_int{1, 23}},
+	{"kern.maxproc", []_C_int{1, 6}},
+	{"kern.maxthread", []_C_int{1, 25}},
+	{"kern.maxvnodes", []_C_int{1, 5}},
+	{"kern.mbstat", []_C_int{1, 59}},
+	{"kern.msgbuf", []_C_int{1, 48}},
+	{"kern.msgbufsize", []_C_int{1, 38}},
+	{"kern.nchstats", []_C_int{1, 41}},
+	{"kern.netlivelocks", []_C_int{1, 76}},
+	{"kern.nfiles", []_C_int{1, 56}},
+	{"kern.ngroups", []_C_int{1, 18}},
+	{"kern.nosuidcoredump", []_C_int{1, 32}},
+	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
+	{"kern.nthreads", []_C_int{1, 26}},
+	{"kern.numvnodes", []_C_int{1, 58}},
+	{"kern.osrelease", []_C_int{1, 2}},
+	{"kern.osrevision", []_C_int{1, 3}},
+	{"kern.ostype", []_C_int{1, 1}},
+	{"kern.osversion", []_C_int{1, 27}},
+	{"kern.pool_debug", []_C_int{1, 77}},
+	{"kern.posix1version", []_C_int{1, 17}},
+	{"kern.proc", []_C_int{1, 66}},
+	{"kern.random", []_C_int{1, 31}},
+	{"kern.rawpartition", []_C_int{1, 24}},
+	{"kern.saved_ids", []_C_int{1, 20}},
+	{"kern.securelevel", []_C_int{1, 9}},
+	{"kern.seminfo", []_C_int{1, 61}},
+	{"kern.shminfo", []_C_int{1, 62}},
+	{"kern.somaxconn", []_C_int{1, 28}},
+	{"kern.sominconn", []_C_int{1, 29}},
+	{"kern.splassert", []_C_int{1, 54}},
+	{"kern.stackgap_random", []_C_int{1, 50}},
+	{"kern.sysvipc_info", []_C_int{1, 51}},
+	{"kern.sysvmsg", []_C_int{1, 34}},
+	{"kern.sysvsem", []_C_int{1, 35}},
+	{"kern.sysvshm", []_C_int{1, 36}},
+	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
+	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
+	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
+	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
+	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
+	{"kern.tty.nptys", []_C_int{1, 44, 7}},
+	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
+	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
+	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
+	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
+	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
+	{"kern.ttycount", []_C_int{1, 57}},
+	{"kern.userasymcrypto", []_C_int{1, 60}},
+	{"kern.usercrypto", []_C_int{1, 52}},
+	{"kern.usermount", []_C_int{1, 30}},
+	{"kern.version", []_C_int{1, 4}},
+	{"kern.vnode", []_C_int{1, 13}},
+	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
+	{"kern.watchdog.period", []_C_int{1, 64, 1}},
+	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
+	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
+	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
+	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
+	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
+	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
+	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
+	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
+	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
+	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
+	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
+	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
+	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
+	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
+	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
+	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
+	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
+	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
+	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
+	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
+	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
+	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
+	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
+	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
+	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
+	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
+	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
+	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
+	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
+	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
+	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
+	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
+	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
+	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
+	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
+	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
+	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
+	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
+	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
+	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
+	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
+	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
+	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
+	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
+	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
+	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
+	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
+	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
+	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
+	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
+	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
+	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
+	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
+	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
+	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
+	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
+	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
+	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
+	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
+	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
+	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
+	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
+	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
+	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
+	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
+	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
+	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
+	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
+	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
+	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
+	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
+	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
+	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
+	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
+	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
+	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
+	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
+	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
+	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
+	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
+	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
+	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
+	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
+	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
+	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
+	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
+	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
+	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
+	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
+	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
+	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
+	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
+	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
+	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
+	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
+	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
+	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
+	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
+	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
+	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
+	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
+	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
+	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
+	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
+	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
+	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
+	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
+	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
+	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
+	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
+	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
+	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
+	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
+	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
+	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
+	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
+	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
+	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
+	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
+	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
+	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
+	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
+	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
+	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
+	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
+	{"net.key.spd_dump", []_C_int{4, 30, 2}},
+	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
+	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
+	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
+	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
+	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
+	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
+	{"net.mpls.ttl", []_C_int{4, 33, 2}},
+	{"net.pflow.stats", []_C_int{4, 34, 1}},
+	{"net.pipex.enable", []_C_int{4, 35, 1}},
+	{"vm.anonmin", []_C_int{2, 7}},
+	{"vm.loadavg", []_C_int{2, 2}},
+	{"vm.maxslp", []_C_int{2, 10}},
+	{"vm.nkmempages", []_C_int{2, 6}},
+	{"vm.psstrings", []_C_int{2, 3}},
+	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
+	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
+	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
+	{"vm.uspace", []_C_int{2, 11}},
+	{"vm.uvmexp", []_C_int{2, 4}},
+	{"vm.vmmeter", []_C_int{2, 1}},
+	{"vm.vnodemin", []_C_int{2, 9}},
+	{"vm.vtextmin", []_C_int{2, 8}},
+}
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
new file mode 100644
index 00000000..d1d36da3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
@@ -0,0 +1,436 @@
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TYPEFILTER              = 177
+	SYS_KDEBUG_TRACE_STRING            = 178
+	SYS_KDEBUG_TRACE64                 = 179
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_THREAD_SELFCOUNTS              = 186
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS_SYSCTL                         = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SYSCTLBYNAME                   = 274
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS_KEVENT_QOS                     = 374
+	SYS_KEVENT_ID                      = 375
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS_PSELECT                        = 394
+	SYS_PSELECT_NOCANCEL               = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_USRCTL                         = 445
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_CLONEFILEAT                    = 462
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAMEATX_NP                   = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_NETAGENT_TRIGGER               = 490
+	SYS_STACK_SNAPSHOT_WITH_CONFIG     = 491
+	SYS_MICROSTACKSHOT                 = 492
+	SYS_GRAB_PGO_DATA                  = 493
+	SYS_PERSONA                        = 494
+	SYS_WORK_INTERVAL_CTL              = 499
+	SYS_GETENTROPY                     = 500
+	SYS_NECP_OPEN                      = 501
+	SYS_NECP_CLIENT_ACTION             = 502
+	SYS___NEXUS_OPEN                   = 503
+	SYS___NEXUS_REGISTER               = 504
+	SYS___NEXUS_DEREGISTER             = 505
+	SYS___NEXUS_CREATE                 = 506
+	SYS___NEXUS_DESTROY                = 507
+	SYS___NEXUS_GET_OPT                = 508
+	SYS___NEXUS_SET_OPT                = 509
+	SYS___CHANNEL_OPEN                 = 510
+	SYS___CHANNEL_GET_INFO             = 511
+	SYS___CHANNEL_SYNC                 = 512
+	SYS___CHANNEL_GET_OPT              = 513
+	SYS___CHANNEL_SET_OPT              = 514
+	SYS_ULOCK_WAIT                     = 515
+	SYS_ULOCK_WAKE                     = 516
+	SYS_FCLONEFILEAT                   = 517
+	SYS_FS_SNAPSHOT                    = 518
+	SYS_TERMINATE_WITH_PAYLOAD         = 520
+	SYS_ABORT_WITH_PAYLOAD             = 521
+	SYS_NECP_SESSION_OPEN              = 522
+	SYS_NECP_SESSION_ACTION            = 523
+	SYS_SETATTRLISTAT                  = 524
+	SYS_NET_QOS_GUIDELINE              = 525
+	SYS_FMOUNT                         = 526
+	SYS_NTP_ADJTIME                    = 527
+	SYS_NTP_GETTIME                    = 528
+	SYS_OS_FAULT_WITH_PAYLOAD          = 529
+	SYS_MAXSYSCALL                     = 530
+	SYS_INVALID                        = 63
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
new file mode 100644
index 00000000..e35de414
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
@@ -0,0 +1,436 @@
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TYPEFILTER              = 177
+	SYS_KDEBUG_TRACE_STRING            = 178
+	SYS_KDEBUG_TRACE64                 = 179
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_THREAD_SELFCOUNTS              = 186
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS_SYSCTL                         = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SYSCTLBYNAME                   = 274
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS_KEVENT_QOS                     = 374
+	SYS_KEVENT_ID                      = 375
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS_PSELECT                        = 394
+	SYS_PSELECT_NOCANCEL               = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_USRCTL                         = 445
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_CLONEFILEAT                    = 462
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAMEATX_NP                   = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_NETAGENT_TRIGGER               = 490
+	SYS_STACK_SNAPSHOT_WITH_CONFIG     = 491
+	SYS_MICROSTACKSHOT                 = 492
+	SYS_GRAB_PGO_DATA                  = 493
+	SYS_PERSONA                        = 494
+	SYS_WORK_INTERVAL_CTL              = 499
+	SYS_GETENTROPY                     = 500
+	SYS_NECP_OPEN                      = 501
+	SYS_NECP_CLIENT_ACTION             = 502
+	SYS___NEXUS_OPEN                   = 503
+	SYS___NEXUS_REGISTER               = 504
+	SYS___NEXUS_DEREGISTER             = 505
+	SYS___NEXUS_CREATE                 = 506
+	SYS___NEXUS_DESTROY                = 507
+	SYS___NEXUS_GET_OPT                = 508
+	SYS___NEXUS_SET_OPT                = 509
+	SYS___CHANNEL_OPEN                 = 510
+	SYS___CHANNEL_GET_INFO             = 511
+	SYS___CHANNEL_SYNC                 = 512
+	SYS___CHANNEL_GET_OPT              = 513
+	SYS___CHANNEL_SET_OPT              = 514
+	SYS_ULOCK_WAIT                     = 515
+	SYS_ULOCK_WAKE                     = 516
+	SYS_FCLONEFILEAT                   = 517
+	SYS_FS_SNAPSHOT                    = 518
+	SYS_TERMINATE_WITH_PAYLOAD         = 520
+	SYS_ABORT_WITH_PAYLOAD             = 521
+	SYS_NECP_SESSION_OPEN              = 522
+	SYS_NECP_SESSION_ACTION            = 523
+	SYS_SETATTRLISTAT                  = 524
+	SYS_NET_QOS_GUIDELINE              = 525
+	SYS_FMOUNT                         = 526
+	SYS_NTP_ADJTIME                    = 527
+	SYS_NTP_GETTIME                    = 528
+	SYS_OS_FAULT_WITH_PAYLOAD          = 529
+	SYS_MAXSYSCALL                     = 530
+	SYS_INVALID                        = 63
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
new file mode 100644
index 00000000..f2df27db
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
@@ -0,0 +1,436 @@
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.1.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TYPEFILTER              = 177
+	SYS_KDEBUG_TRACE_STRING            = 178
+	SYS_KDEBUG_TRACE64                 = 179
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_THREAD_SELFCOUNTS              = 186
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS_SYSCTL                         = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SYSCTLBYNAME                   = 274
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS_KEVENT_QOS                     = 374
+	SYS_KEVENT_ID                      = 375
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS_PSELECT                        = 394
+	SYS_PSELECT_NOCANCEL               = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_USRCTL                         = 445
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_CLONEFILEAT                    = 462
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAMEATX_NP                   = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_NETAGENT_TRIGGER               = 490
+	SYS_STACK_SNAPSHOT_WITH_CONFIG     = 491
+	SYS_MICROSTACKSHOT                 = 492
+	SYS_GRAB_PGO_DATA                  = 493
+	SYS_PERSONA                        = 494
+	SYS_WORK_INTERVAL_CTL              = 499
+	SYS_GETENTROPY                     = 500
+	SYS_NECP_OPEN                      = 501
+	SYS_NECP_CLIENT_ACTION             = 502
+	SYS___NEXUS_OPEN                   = 503
+	SYS___NEXUS_REGISTER               = 504
+	SYS___NEXUS_DEREGISTER             = 505
+	SYS___NEXUS_CREATE                 = 506
+	SYS___NEXUS_DESTROY                = 507
+	SYS___NEXUS_GET_OPT                = 508
+	SYS___NEXUS_SET_OPT                = 509
+	SYS___CHANNEL_OPEN                 = 510
+	SYS___CHANNEL_GET_INFO             = 511
+	SYS___CHANNEL_SYNC                 = 512
+	SYS___CHANNEL_GET_OPT              = 513
+	SYS___CHANNEL_SET_OPT              = 514
+	SYS_ULOCK_WAIT                     = 515
+	SYS_ULOCK_WAKE                     = 516
+	SYS_FCLONEFILEAT                   = 517
+	SYS_FS_SNAPSHOT                    = 518
+	SYS_TERMINATE_WITH_PAYLOAD         = 520
+	SYS_ABORT_WITH_PAYLOAD             = 521
+	SYS_NECP_SESSION_OPEN              = 522
+	SYS_NECP_SESSION_ACTION            = 523
+	SYS_SETATTRLISTAT                  = 524
+	SYS_NET_QOS_GUIDELINE              = 525
+	SYS_FMOUNT                         = 526
+	SYS_NTP_ADJTIME                    = 527
+	SYS_NTP_GETTIME                    = 528
+	SYS_OS_FAULT_WITH_PAYLOAD          = 529
+	SYS_MAXSYSCALL                     = 530
+	SYS_INVALID                        = 63
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
new file mode 100644
index 00000000..96946302
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
@@ -0,0 +1,436 @@
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.1.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm64,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TYPEFILTER              = 177
+	SYS_KDEBUG_TRACE_STRING            = 178
+	SYS_KDEBUG_TRACE64                 = 179
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_THREAD_SELFCOUNTS              = 186
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS_SYSCTL                         = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SYSCTLBYNAME                   = 274
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS_KEVENT_QOS                     = 374
+	SYS_KEVENT_ID                      = 375
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS_PSELECT                        = 394
+	SYS_PSELECT_NOCANCEL               = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_USRCTL                         = 445
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_CLONEFILEAT                    = 462
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAMEATX_NP                   = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_NETAGENT_TRIGGER               = 490
+	SYS_STACK_SNAPSHOT_WITH_CONFIG     = 491
+	SYS_MICROSTACKSHOT                 = 492
+	SYS_GRAB_PGO_DATA                  = 493
+	SYS_PERSONA                        = 494
+	SYS_WORK_INTERVAL_CTL              = 499
+	SYS_GETENTROPY                     = 500
+	SYS_NECP_OPEN                      = 501
+	SYS_NECP_CLIENT_ACTION             = 502
+	SYS___NEXUS_OPEN                   = 503
+	SYS___NEXUS_REGISTER               = 504
+	SYS___NEXUS_DEREGISTER             = 505
+	SYS___NEXUS_CREATE                 = 506
+	SYS___NEXUS_DESTROY                = 507
+	SYS___NEXUS_GET_OPT                = 508
+	SYS___NEXUS_SET_OPT                = 509
+	SYS___CHANNEL_OPEN                 = 510
+	SYS___CHANNEL_GET_INFO             = 511
+	SYS___CHANNEL_SYNC                 = 512
+	SYS___CHANNEL_GET_OPT              = 513
+	SYS___CHANNEL_SET_OPT              = 514
+	SYS_ULOCK_WAIT                     = 515
+	SYS_ULOCK_WAKE                     = 516
+	SYS_FCLONEFILEAT                   = 517
+	SYS_FS_SNAPSHOT                    = 518
+	SYS_TERMINATE_WITH_PAYLOAD         = 520
+	SYS_ABORT_WITH_PAYLOAD             = 521
+	SYS_NECP_SESSION_OPEN              = 522
+	SYS_NECP_SESSION_ACTION            = 523
+	SYS_SETATTRLISTAT                  = 524
+	SYS_NET_QOS_GUIDELINE              = 525
+	SYS_FMOUNT                         = 526
+	SYS_NTP_ADJTIME                    = 527
+	SYS_NTP_GETTIME                    = 528
+	SYS_OS_FAULT_WITH_PAYLOAD          = 529
+	SYS_MAXSYSCALL                     = 530
+	SYS_INVALID                        = 63
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
new file mode 100644
index 00000000..b2c9ef81
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
@@ -0,0 +1,315 @@
+// mksysnum_dragonfly.pl
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,dragonfly
+
+package unix
+
+const (
+	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
+	SYS_EXIT          = 1   // { void exit(int rval); }
+	SYS_FORK          = 2   // { int fork(void); }
+	SYS_READ          = 3   // { ssize_t read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE         = 4   // { ssize_t write(int fd, const void *buf, size_t nbyte); }
+	SYS_OPEN          = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE         = 6   // { int close(int fd); }
+	SYS_WAIT4         = 7   // { int wait4(int pid, int *status, int options, \
+	SYS_LINK          = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK        = 10  // { int unlink(char *path); }
+	SYS_CHDIR         = 12  // { int chdir(char *path); }
+	SYS_FCHDIR        = 13  // { int fchdir(int fd); }
+	SYS_MKNOD         = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD         = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN         = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK        = 17  // { int obreak(char *nsize); } break obreak_args int
+	SYS_GETFSSTAT     = 18  // { int getfsstat(struct statfs *buf, long bufsize, \
+	SYS_GETPID        = 20  // { pid_t getpid(void); }
+	SYS_MOUNT         = 21  // { int mount(char *type, char *path, int flags, \
+	SYS_UNMOUNT       = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID        = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID        = 24  // { uid_t getuid(void); }
+	SYS_GETEUID       = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE        = 26  // { int ptrace(int req, pid_t pid, caddr_t addr, \
+	SYS_RECVMSG       = 27  // { int recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG       = 28  // { int sendmsg(int s, caddr_t msg, int flags); }
+	SYS_RECVFROM      = 29  // { int recvfrom(int s, caddr_t buf, size_t len, \
+	SYS_ACCEPT        = 30  // { int accept(int s, caddr_t name, int *anamelen); }
+	SYS_GETPEERNAME   = 31  // { int getpeername(int fdes, caddr_t asa, int *alen); }
+	SYS_GETSOCKNAME   = 32  // { int getsockname(int fdes, caddr_t asa, int *alen); }
+	SYS_ACCESS        = 33  // { int access(char *path, int flags); }
+	SYS_CHFLAGS       = 34  // { int chflags(char *path, int flags); }
+	SYS_FCHFLAGS      = 35  // { int fchflags(int fd, int flags); }
+	SYS_SYNC          = 36  // { int sync(void); }
+	SYS_KILL          = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID       = 39  // { pid_t getppid(void); }
+	SYS_DUP           = 41  // { int dup(int fd); }
+	SYS_PIPE          = 42  // { int pipe(void); }
+	SYS_GETEGID       = 43  // { gid_t getegid(void); }
+	SYS_PROFIL        = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE        = 45  // { int ktrace(const char *fname, int ops, int facs, \
+	SYS_GETGID        = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN      = 49  // { int getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN      = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT          = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK   = 53  // { int sigaltstack(stack_t *ss, stack_t *oss); }
+	SYS_IOCTL         = 54  // { int ioctl(int fd, u_long com, caddr_t data); }
+	SYS_REBOOT        = 55  // { int reboot(int opt); }
+	SYS_REVOKE        = 56  // { int revoke(char *path); }
+	SYS_SYMLINK       = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK      = 58  // { int readlink(char *path, char *buf, int count); }
+	SYS_EXECVE        = 59  // { int execve(char *fname, char **argv, char **envv); }
+	SYS_UMASK         = 60  // { int umask(int newmask); } umask umask_args int
+	SYS_CHROOT        = 61  // { int chroot(char *path); }
+	SYS_MSYNC         = 65  // { int msync(void *addr, size_t len, int flags); }
+	SYS_VFORK         = 66  // { pid_t vfork(void); }
+	SYS_SBRK          = 69  // { int sbrk(int incr); }
+	SYS_SSTK          = 70  // { int sstk(int incr); }
+	SYS_MUNMAP        = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT      = 74  // { int mprotect(void *addr, size_t len, int prot); }
+	SYS_MADVISE       = 75  // { int madvise(void *addr, size_t len, int behav); }
+	SYS_MINCORE       = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS     = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS     = 80  // { int setgroups(u_int gidsetsize, gid_t *gidset); }
+	SYS_GETPGRP       = 81  // { int getpgrp(void); }
+	SYS_SETPGID       = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER     = 83  // { int setitimer(u_int which, struct itimerval *itv, \
+	SYS_SWAPON        = 85  // { int swapon(char *name); }
+	SYS_GETITIMER     = 86  // { int getitimer(u_int which, struct itimerval *itv); }
+	SYS_GETDTABLESIZE = 89  // { int getdtablesize(void); }
+	SYS_DUP2          = 90  // { int dup2(int from, int to); }
+	SYS_FCNTL         = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT        = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC         = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY   = 96  // { int setpriority(int which, int who, int prio); }
+	SYS_SOCKET        = 97  // { int socket(int domain, int type, int protocol); }
+	SYS_CONNECT       = 98  // { int connect(int s, caddr_t name, int namelen); }
+	SYS_GETPRIORITY   = 100 // { int getpriority(int which, int who); }
+	SYS_BIND          = 104 // { int bind(int s, caddr_t name, int namelen); }
+	SYS_SETSOCKOPT    = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN        = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY  = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE     = 117 // { int getrusage(int who, struct rusage *rusage); }
+	SYS_GETSOCKOPT    = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV         = 120 // { int readv(int fd, struct iovec *iovp, u_int iovcnt); }
+	SYS_WRITEV        = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY  = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN        = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD        = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID      = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID      = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME        = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK         = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO        = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO        = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN      = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR    = 135 // { int socketpair(int domain, int type, int protocol, \
+	SYS_MKDIR         = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR         = 137 // { int rmdir(char *path); }
+	SYS_UTIMES        = 138 // { int utimes(char *path, struct timeval *tptr); }
+	SYS_ADJTIME       = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID        = 147 // { int setsid(void); }
+	SYS_QUOTACTL      = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_STATFS        = 157 // { int statfs(char *path, struct statfs *buf); }
+	SYS_FSTATFS       = 158 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_GETFH         = 161 // { int getfh(char *fname, struct fhandle *fhp); }
+	SYS_GETDOMAINNAME = 162 // { int getdomainname(char *domainname, int len); }
+	SYS_SETDOMAINNAME = 163 // { int setdomainname(char *domainname, int len); }
+	SYS_UNAME         = 164 // { int uname(struct utsname *name); }
+	SYS_SYSARCH       = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO        = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_EXTPREAD      = 173 // { ssize_t extpread(int fd, void *buf, \
+	SYS_EXTPWRITE     = 174 // { ssize_t extpwrite(int fd, const void *buf, \
+	SYS_NTP_ADJTIME   = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID        = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID       = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID       = 183 // { int seteuid(uid_t euid); }
+	SYS_PATHCONF      = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF     = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT     = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT     = 195 // { int setrlimit(u_int which, \
+	SYS_MMAP          = 197 // { caddr_t mmap(caddr_t addr, size_t len, int prot, \
+	// SYS_NOSYS = 198;  // { int nosys(void); } __syscall __syscall_args int
+	SYS_LSEEK                  = 199 // { off_t lseek(int fd, int pad, off_t offset, \
+	SYS_TRUNCATE               = 200 // { int truncate(char *path, int pad, off_t length); }
+	SYS_FTRUNCATE              = 201 // { int ftruncate(int fd, int pad, off_t length); }
+	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, void *old, \
+	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE               = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS___SEMCTL               = 220 // { int __semctl(int semid, int semnum, int cmd, \
+	SYS_SEMGET                 = 221 // { int semget(key_t key, int nsems, int semflg); }
+	SYS_SEMOP                  = 222 // { int semop(int semid, struct sembuf *sops, \
+	SYS_MSGCTL                 = 224 // { int msgctl(int msqid, int cmd, \
+	SYS_MSGGET                 = 225 // { int msgget(key_t key, int msgflg); }
+	SYS_MSGSND                 = 226 // { int msgsnd(int msqid, const void *msgp, size_t msgsz, \
+	SYS_MSGRCV                 = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, \
+	SYS_SHMAT                  = 228 // { caddr_t shmat(int shmid, const void *shmaddr, \
+	SYS_SHMCTL                 = 229 // { int shmctl(int shmid, int cmd, \
+	SYS_SHMDT                  = 230 // { int shmdt(const void *shmaddr); }
+	SYS_SHMGET                 = 231 // { int shmget(key_t key, size_t size, int shmflg); }
+	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME          = 233 // { int clock_settime(clockid_t clock_id, \
+	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, int inherit); }
+	SYS_RFORK                  = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, \
+	SYS_ISSETUGID              = 253 // { int issetugid(void); }
+	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                = 276 // { int lutimes(char *path, struct timeval *tptr); }
+	SYS_EXTPREADV              = 289 // { ssize_t extpreadv(int fd, struct iovec *iovp, \
+	SYS_EXTPWRITEV             = 290 // { ssize_t extpwritev(int fd, struct iovec *iovp,\
+	SYS_FHSTATFS               = 297 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
+	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
+	SYS_MODNEXT                = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                = 301 // { int modstat(int modid, struct module_stat* stat); }
+	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
+	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
+	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
+	SYS_AIO_RETURN             = 314 // { int aio_return(struct aiocb *aiocbp); }
+	SYS_AIO_SUSPEND            = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
+	SYS_AIO_CANCEL             = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
+	SYS_AIO_ERROR              = 317 // { int aio_error(struct aiocb *aiocbp); }
+	SYS_AIO_READ               = 318 // { int aio_read(struct aiocb *aiocbp); }
+	SYS_AIO_WRITE              = 319 // { int aio_write(struct aiocb *aiocbp); }
+	SYS_LIO_LISTIO             = 320 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
+	SYS_YIELD                  = 321 // { int yield(void); }
+	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
+	SYS___GETCWD               = 326 // { int __getcwd(u_char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
+	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
+	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
+	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, struct timespec *interval); }
+	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, void *data); }
+	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, const sigset_t *set, \
+	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGACTION              = 342 // { int sigaction(int sig, const struct sigaction *act, \
+	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGRETURN              = 344 // { int sigreturn(ucontext_t *sigcntxp); }
+	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set,\
+	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set,\
+	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, acl_type_t type, \
+	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, acl_type_t type, \
+	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, acl_type_t type); }
+	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, \
+	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE       = 356 // { int extattr_set_file(const char *path, \
+	SYS_EXTATTR_GET_FILE       = 357 // { int extattr_get_file(const char *path, \
+	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
+	SYS_AIO_WAITCOMPLETE       = 359 // { int aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
+	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
+	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
+	SYS_KQUEUE                 = 362 // { int kqueue(void); }
+	SYS_KEVENT                 = 363 // { int kevent(int fd, \
+	SYS_KENV                   = 390 // { int kenv(int what, const char *name, char *value, int len); }
+	SYS_LCHFLAGS               = 391 // { int lchflags(char *path, int flags); }
+	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, int count); }
+	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, \
+	SYS_VARSYM_SET             = 450 // { int varsym_set(int level, const char *name, const char *data); }
+	SYS_VARSYM_GET             = 451 // { int varsym_get(int mask, const char *wild, char *buf, int bufsize); }
+	SYS_VARSYM_LIST            = 452 // { int varsym_list(int level, char *buf, int maxsize, int *marker); }
+	SYS_EXEC_SYS_REGISTER      = 465 // { int exec_sys_register(void *entry); }
+	SYS_EXEC_SYS_UNREGISTER    = 466 // { int exec_sys_unregister(int id); }
+	SYS_SYS_CHECKPOINT         = 467 // { int sys_checkpoint(int type, int fd, pid_t pid, int retval); }
+	SYS_MOUNTCTL               = 468 // { int mountctl(const char *path, int op, int fd, const void *ctl, int ctllen, void *buf, int buflen); }
+	SYS_UMTX_SLEEP             = 469 // { int umtx_sleep(volatile const int *ptr, int value, int timeout); }
+	SYS_UMTX_WAKEUP            = 470 // { int umtx_wakeup(volatile const int *ptr, int count); }
+	SYS_JAIL_ATTACH            = 471 // { int jail_attach(int jid); }
+	SYS_SET_TLS_AREA           = 472 // { int set_tls_area(int which, struct tls_info *info, size_t infosize); }
+	SYS_GET_TLS_AREA           = 473 // { int get_tls_area(int which, struct tls_info *info, size_t infosize); }
+	SYS_CLOSEFROM              = 474 // { int closefrom(int fd); }
+	SYS_STAT                   = 475 // { int stat(const char *path, struct stat *ub); }
+	SYS_FSTAT                  = 476 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                  = 477 // { int lstat(const char *path, struct stat *ub); }
+	SYS_FHSTAT                 = 478 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
+	SYS_GETDIRENTRIES          = 479 // { int getdirentries(int fd, char *buf, u_int count, \
+	SYS_GETDENTS               = 480 // { int getdents(int fd, char *buf, size_t count); }
+	SYS_USCHED_SET             = 481 // { int usched_set(pid_t pid, int cmd, void *data, \
+	SYS_EXTACCEPT              = 482 // { int extaccept(int s, int flags, caddr_t name, int *anamelen); }
+	SYS_EXTCONNECT             = 483 // { int extconnect(int s, int flags, caddr_t name, int namelen); }
+	SYS_MCONTROL               = 485 // { int mcontrol(void *addr, size_t len, int behav, off_t value); }
+	SYS_VMSPACE_CREATE         = 486 // { int vmspace_create(void *id, int type, void *data); }
+	SYS_VMSPACE_DESTROY        = 487 // { int vmspace_destroy(void *id); }
+	SYS_VMSPACE_CTL            = 488 // { int vmspace_ctl(void *id, int cmd, 		\
+	SYS_VMSPACE_MMAP           = 489 // { int vmspace_mmap(void *id, void *addr, size_t len, \
+	SYS_VMSPACE_MUNMAP         = 490 // { int vmspace_munmap(void *id, void *addr,	\
+	SYS_VMSPACE_MCONTROL       = 491 // { int vmspace_mcontrol(void *id, void *addr, 	\
+	SYS_VMSPACE_PREAD          = 492 // { ssize_t vmspace_pread(void *id, void *buf, \
+	SYS_VMSPACE_PWRITE         = 493 // { ssize_t vmspace_pwrite(void *id, const void *buf, \
+	SYS_EXTEXIT                = 494 // { void extexit(int how, int status, void *addr); }
+	SYS_LWP_CREATE             = 495 // { int lwp_create(struct lwp_params *params); }
+	SYS_LWP_GETTID             = 496 // { lwpid_t lwp_gettid(void); }
+	SYS_LWP_KILL               = 497 // { int lwp_kill(pid_t pid, lwpid_t tid, int signum); }
+	SYS_LWP_RTPRIO             = 498 // { int lwp_rtprio(int function, pid_t pid, lwpid_t tid, struct rtprio *rtp); }
+	SYS_PSELECT                = 499 // { int pselect(int nd, fd_set *in, fd_set *ou, \
+	SYS_STATVFS                = 500 // { int statvfs(const char *path, struct statvfs *buf); }
+	SYS_FSTATVFS               = 501 // { int fstatvfs(int fd, struct statvfs *buf); }
+	SYS_FHSTATVFS              = 502 // { int fhstatvfs(const struct fhandle *u_fhp, struct statvfs *buf); }
+	SYS_GETVFSSTAT             = 503 // { int getvfsstat(struct statfs *buf,          \
+	SYS_OPENAT                 = 504 // { int openat(int fd, char *path, int flags, int mode); }
+	SYS_FSTATAT                = 505 // { int fstatat(int fd, char *path, 	\
+	SYS_FCHMODAT               = 506 // { int fchmodat(int fd, char *path, int mode, \
+	SYS_FCHOWNAT               = 507 // { int fchownat(int fd, char *path, int uid, int gid, \
+	SYS_UNLINKAT               = 508 // { int unlinkat(int fd, char *path, int flags); }
+	SYS_FACCESSAT              = 509 // { int faccessat(int fd, char *path, int amode, \
+	SYS_MQ_OPEN                = 510 // { mqd_t mq_open(const char * name, int oflag, \
+	SYS_MQ_CLOSE               = 511 // { int mq_close(mqd_t mqdes); }
+	SYS_MQ_UNLINK              = 512 // { int mq_unlink(const char *name); }
+	SYS_MQ_GETATTR             = 513 // { int mq_getattr(mqd_t mqdes, \
+	SYS_MQ_SETATTR             = 514 // { int mq_setattr(mqd_t mqdes, \
+	SYS_MQ_NOTIFY              = 515 // { int mq_notify(mqd_t mqdes, \
+	SYS_MQ_SEND                = 516 // { int mq_send(mqd_t mqdes, const char *msg_ptr, \
+	SYS_MQ_RECEIVE             = 517 // { ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, \
+	SYS_MQ_TIMEDSEND           = 518 // { int mq_timedsend(mqd_t mqdes, \
+	SYS_MQ_TIMEDRECEIVE        = 519 // { ssize_t mq_timedreceive(mqd_t mqdes, \
+	SYS_IOPRIO_SET             = 520 // { int ioprio_set(int which, int who, int prio); }
+	SYS_IOPRIO_GET             = 521 // { int ioprio_get(int which, int who); }
+	SYS_CHROOT_KERNEL          = 522 // { int chroot_kernel(char *path); }
+	SYS_RENAMEAT               = 523 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_MKDIRAT                = 524 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT               = 525 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                = 526 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_READLINKAT             = 527 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_SYMLINKAT              = 528 // { int symlinkat(char *path1, int fd, char *path2); }
+	SYS_SWAPOFF                = 529 // { int swapoff(char *name); }
+	SYS_VQUOTACTL              = 530 // { int vquotactl(const char *path, \
+	SYS_LINKAT                 = 531 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_EACCESS                = 532 // { int eaccess(char *path, int flags); }
+	SYS_LPATHCONF              = 533 // { int lpathconf(char *path, int name); }
+	SYS_VMM_GUEST_CTL          = 534 // { int vmm_guest_ctl(int op, struct vmm_guest_options *options); }
+	SYS_VMM_GUEST_SYNC_ADDR    = 535 // { int vmm_guest_sync_addr(long *dstaddr, long *srcaddr); }
+	SYS_PROCCTL                = 536 // { int procctl(idtype_t idtype, id_t id, int cmd, void *data); }
+	SYS_CHFLAGSAT              = 537 // { int chflagsat(int fd, const char *path, int flags, int atflags);}
+	SYS_PIPE2                  = 538 // { int pipe2(int *fildes, int flags); }
+	SYS_UTIMENSAT              = 539 // { int utimensat(int fd, const char *path, const struct timespec *ts, int flags); }
+	SYS_FUTIMENS               = 540 // { int futimens(int fd, const struct timespec *ts); }
+	SYS_ACCEPT4                = 541 // { int accept4(int s, caddr_t name, int *anamelen, int flags); }
+	SYS_LWP_SETNAME            = 542 // { int lwp_setname(lwpid_t tid, const char *name); }
+	SYS_PPOLL                  = 543 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_LWP_SETAFFINITY        = 544 // { int lwp_setaffinity(pid_t pid, lwpid_t tid, const cpumask_t *mask); }
+	SYS_LWP_GETAFFINITY        = 545 // { int lwp_getaffinity(pid_t pid, lwpid_t tid, cpumask_t *mask); }
+	SYS_LWP_CREATE2            = 546 // { int lwp_create2(struct lwp_params *params, const cpumask_t *mask); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
new file mode 100644
index 00000000..b64a8122
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
@@ -0,0 +1,353 @@
+// mksysnum_freebsd.pl
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,freebsd
+
+package unix
+
+const (
+	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
+	SYS_EXIT                   = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                   = 2   // { int fork(void); }
+	SYS_READ                   = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                  = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                   = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                  = 6   // { int close(int fd); }
+	SYS_WAIT4                  = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                   = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                 = 10  // { int unlink(char *path); }
+	SYS_CHDIR                  = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                 = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                  = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                  = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                  = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                 = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                 = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                  = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                 = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                 = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                 = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM               = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                 = 30  // { int accept(int s, \
+	SYS_GETPEERNAME            = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME            = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                 = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS               = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                   = 36  // { int sync(void); }
+	SYS_KILL                   = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                = 39  // { pid_t getppid(void); }
+	SYS_DUP                    = 41  // { int dup(u_int fd); }
+	SYS_PIPE                   = 42  // { int pipe(void); }
+	SYS_GETEGID                = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                 = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                 = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                 = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN               = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN               = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                   = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK            = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                  = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                 = 55  // { int reboot(int opt); }
+	SYS_REVOKE                 = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK               = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                 = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                  = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                 = 61  // { int chroot(char *path); }
+	SYS_MSYNC                  = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                  = 66  // { int vfork(void); }
+	SYS_SBRK                   = 69  // { int sbrk(int incr); }
+	SYS_SSTK                   = 70  // { int sstk(int incr); }
+	SYS_OVADVISE               = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                 = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT               = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS              = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS              = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                = 81  // { int getpgrp(void); }
+	SYS_SETPGID                = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER              = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                 = 85  // { int swapon(char *name); }
+	SYS_GETITIMER              = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE          = 89  // { int getdtablesize(void); }
+	SYS_DUP2                   = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                  = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                 = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                  = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY            = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                 = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY            = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                   = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT             = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                 = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY           = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE              = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT             = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                  = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                 = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY           = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                 = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                 = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID               = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID               = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                 = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                  = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                 = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                 = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN               = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR             = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                  = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                  = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                 = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                 = 147 // { int setsid(void); }
+	SYS_QUOTACTL               = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                 = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                  = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                 = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD         = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE        = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                 = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME            = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                 = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                   = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                  = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                  = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF               = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF              = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT              = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT              = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES          = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP          = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK         = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE      = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE     = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE               = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME          = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE          = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE          = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME         = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME         = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN      = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER     = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE    = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE    = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2   = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME            = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                  = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID              = 253 // { int issetugid(void); }
+	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS               = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                  = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                 = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                 = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                 = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                 = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                  = 321 // { int yield(void); }
+	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
+	SYS___GETCWD               = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE       = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE       = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                 = 362 // { int kqueue(void); }
+	SYS_KEVENT                 = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD         = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD         = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD      = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID              = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                 = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC         = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC         = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD           = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE         = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD           = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE         = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                   = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS               = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL            = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT              = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                 = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS               = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID          = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK         = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK         = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK       = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK       = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK    = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE           = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION              = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN              = 417 // { int sigreturn( \
+	SYS_GETCONTEXT             = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT             = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT            = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK         = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK         = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK      = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK    = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE             = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT               = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF               = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL               = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK             = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK           = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH            = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD        = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE      = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK      = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND            = 442 // { int thr_suspend( \
+	SYS_THR_WAKE               = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF             = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                  = 445 // { int audit(const void *record, \
+	SYS_AUDITON                = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT               = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT               = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR          = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR          = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL               = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP               = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE               = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                 = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME           = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD          = 466 // { int rtprio_thread(int function, \
+	SYS_PREAD                  = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                 = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                   = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                  = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE               = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE              = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2              = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN               = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK             = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                 = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID           = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID           = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY     = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY     = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT              = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT               = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT               = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT              = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                 = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT               = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                 = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT             = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT               = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT              = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT               = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT           = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET               = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET               = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE            = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM              = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF              = 513 // { int lpathconf(char *path, int name); }
+	SYS___CAP_RIGHTS_GET       = 515 // { int __cap_rights_get(int version, \
+	SYS_CAP_ENTER              = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE            = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                 = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                 = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID               = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS          = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS          = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT         = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES         = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS        = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE          = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE       = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE        = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE          = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                  = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_CAP_RIGHTS_LIMIT       = 533 // { int cap_rights_limit(int fd, \
+	SYS_CAP_IOCTLS_LIMIT       = 534 // { int cap_ioctls_limit(int fd, \
+	SYS_CAP_IOCTLS_GET         = 535 // { ssize_t cap_ioctls_get(int fd, \
+	SYS_CAP_FCNTLS_LIMIT       = 536 // { int cap_fcntls_limit(int fd, \
+	SYS_CAP_FCNTLS_GET         = 537 // { int cap_fcntls_get(int fd, \
+	SYS_BINDAT                 = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT              = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT              = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                = 541 // { int accept4(int s, \
+	SYS_PIPE2                  = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                  = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_FUTIMENS               = 546 // { int futimens(int fd, \
+	SYS_UTIMENSAT              = 547 // { int utimensat(int fd, \
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
new file mode 100644
index 00000000..81722ac9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
@@ -0,0 +1,353 @@
+// mksysnum_freebsd.pl
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,freebsd
+
+package unix
+
+const (
+	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
+	SYS_EXIT                   = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                   = 2   // { int fork(void); }
+	SYS_READ                   = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                  = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                   = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                  = 6   // { int close(int fd); }
+	SYS_WAIT4                  = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                   = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                 = 10  // { int unlink(char *path); }
+	SYS_CHDIR                  = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                 = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                  = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                  = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                  = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                 = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                 = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                  = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                 = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                 = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                 = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM               = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                 = 30  // { int accept(int s, \
+	SYS_GETPEERNAME            = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME            = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                 = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS               = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                   = 36  // { int sync(void); }
+	SYS_KILL                   = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                = 39  // { pid_t getppid(void); }
+	SYS_DUP                    = 41  // { int dup(u_int fd); }
+	SYS_PIPE                   = 42  // { int pipe(void); }
+	SYS_GETEGID                = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                 = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                 = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                 = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN               = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN               = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                   = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK            = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                  = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                 = 55  // { int reboot(int opt); }
+	SYS_REVOKE                 = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK               = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                 = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                  = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                 = 61  // { int chroot(char *path); }
+	SYS_MSYNC                  = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                  = 66  // { int vfork(void); }
+	SYS_SBRK                   = 69  // { int sbrk(int incr); }
+	SYS_SSTK                   = 70  // { int sstk(int incr); }
+	SYS_OVADVISE               = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                 = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT               = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS              = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS              = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                = 81  // { int getpgrp(void); }
+	SYS_SETPGID                = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER              = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                 = 85  // { int swapon(char *name); }
+	SYS_GETITIMER              = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE          = 89  // { int getdtablesize(void); }
+	SYS_DUP2                   = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                  = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                 = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                  = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY            = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                 = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY            = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                   = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT             = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                 = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY           = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE              = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT             = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                  = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                 = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY           = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                 = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                 = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID               = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID               = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                 = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                  = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                 = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                 = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN               = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR             = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                  = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                  = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                 = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                 = 147 // { int setsid(void); }
+	SYS_QUOTACTL               = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                 = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                  = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                 = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD         = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE        = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                 = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME            = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                 = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                   = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                  = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                  = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF               = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF              = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT              = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT              = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES          = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP          = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK         = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE      = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE     = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE               = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME          = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE          = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE          = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME         = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME         = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN      = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER     = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE    = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE    = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2   = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME            = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                  = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID              = 253 // { int issetugid(void); }
+	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS               = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                  = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                 = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                 = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                 = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                 = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                  = 321 // { int yield(void); }
+	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
+	SYS___GETCWD               = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE       = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE       = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                 = 362 // { int kqueue(void); }
+	SYS_KEVENT                 = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD         = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD         = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD      = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID              = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                 = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC         = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC         = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD           = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE         = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD           = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE         = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                   = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS               = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL            = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT              = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                 = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS               = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID          = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK         = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK         = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK       = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK       = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK    = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE           = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION              = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN              = 417 // { int sigreturn( \
+	SYS_GETCONTEXT             = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT             = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT            = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK         = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK         = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK      = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK    = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE             = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT               = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF               = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL               = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK             = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK           = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH            = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD        = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE      = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK      = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND            = 442 // { int thr_suspend( \
+	SYS_THR_WAKE               = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF             = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                  = 445 // { int audit(const void *record, \
+	SYS_AUDITON                = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT               = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT               = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR          = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR          = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL               = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP               = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE               = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                 = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME           = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD          = 466 // { int rtprio_thread(int function, \
+	SYS_PREAD                  = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                 = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                   = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                  = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE               = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE              = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2              = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN               = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK             = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                 = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID           = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID           = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY     = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY     = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT              = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT               = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT               = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT              = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                 = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT               = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                 = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT             = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT               = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT              = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT               = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT           = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET               = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET               = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE            = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM              = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF              = 513 // { int lpathconf(char *path, int name); }
+	SYS___CAP_RIGHTS_GET       = 515 // { int __cap_rights_get(int version, \
+	SYS_CAP_ENTER              = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE            = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                 = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                 = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID               = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS          = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS          = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT         = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES         = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS        = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE          = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE       = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE        = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE          = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                  = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_CAP_RIGHTS_LIMIT       = 533 // { int cap_rights_limit(int fd, \
+	SYS_CAP_IOCTLS_LIMIT       = 534 // { int cap_ioctls_limit(int fd, \
+	SYS_CAP_IOCTLS_GET         = 535 // { ssize_t cap_ioctls_get(int fd, \
+	SYS_CAP_FCNTLS_LIMIT       = 536 // { int cap_fcntls_limit(int fd, \
+	SYS_CAP_FCNTLS_GET         = 537 // { int cap_fcntls_get(int fd, \
+	SYS_BINDAT                 = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT              = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT              = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                = 541 // { int accept4(int s, \
+	SYS_PIPE2                  = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                  = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_FUTIMENS               = 546 // { int futimens(int fd, \
+	SYS_UTIMENSAT              = 547 // { int utimensat(int fd, \
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
new file mode 100644
index 00000000..44883141
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
@@ -0,0 +1,353 @@
+// mksysnum_freebsd.pl
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,freebsd
+
+package unix
+
+const (
+	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
+	SYS_EXIT                   = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                   = 2   // { int fork(void); }
+	SYS_READ                   = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                  = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                   = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                  = 6   // { int close(int fd); }
+	SYS_WAIT4                  = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                   = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                 = 10  // { int unlink(char *path); }
+	SYS_CHDIR                  = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                 = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                  = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                  = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                  = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                 = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                 = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                  = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                 = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                 = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                 = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM               = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                 = 30  // { int accept(int s, \
+	SYS_GETPEERNAME            = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME            = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                 = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS               = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                   = 36  // { int sync(void); }
+	SYS_KILL                   = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                = 39  // { pid_t getppid(void); }
+	SYS_DUP                    = 41  // { int dup(u_int fd); }
+	SYS_PIPE                   = 42  // { int pipe(void); }
+	SYS_GETEGID                = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                 = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                 = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                 = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN               = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN               = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                   = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK            = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                  = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                 = 55  // { int reboot(int opt); }
+	SYS_REVOKE                 = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK               = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                 = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                  = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                 = 61  // { int chroot(char *path); }
+	SYS_MSYNC                  = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                  = 66  // { int vfork(void); }
+	SYS_SBRK                   = 69  // { int sbrk(int incr); }
+	SYS_SSTK                   = 70  // { int sstk(int incr); }
+	SYS_OVADVISE               = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                 = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT               = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS              = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS              = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                = 81  // { int getpgrp(void); }
+	SYS_SETPGID                = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER              = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                 = 85  // { int swapon(char *name); }
+	SYS_GETITIMER              = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE          = 89  // { int getdtablesize(void); }
+	SYS_DUP2                   = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                  = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                 = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                  = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY            = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                 = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY            = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                   = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT             = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                 = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY           = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE              = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT             = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                  = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                 = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY           = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                 = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                 = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID               = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID               = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                 = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                  = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                 = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                 = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN               = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR             = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                  = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                  = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                 = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                 = 147 // { int setsid(void); }
+	SYS_QUOTACTL               = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                 = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                  = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                 = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD         = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE        = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                 = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME            = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                 = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                   = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                  = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                  = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF               = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF              = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT              = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT              = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES          = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP          = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK         = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE      = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE     = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE               = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME          = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE          = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE          = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME         = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME         = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN      = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER     = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE    = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE    = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2   = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME            = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                  = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID              = 253 // { int issetugid(void); }
+	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS               = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                  = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                 = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                 = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                 = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                 = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                  = 321 // { int yield(void); }
+	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
+	SYS___GETCWD               = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE       = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE       = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                 = 362 // { int kqueue(void); }
+	SYS_KEVENT                 = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD         = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD         = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD      = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID              = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                 = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC         = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC         = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD           = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE         = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD           = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE         = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                   = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS               = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL            = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT              = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                 = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS               = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID          = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK         = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK         = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK       = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK       = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK    = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE           = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION              = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN              = 417 // { int sigreturn( \
+	SYS_GETCONTEXT             = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT             = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT            = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK         = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK         = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK      = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK    = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE             = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT               = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF               = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL               = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK             = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK           = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH            = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD        = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE      = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK      = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND            = 442 // { int thr_suspend( \
+	SYS_THR_WAKE               = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF             = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                  = 445 // { int audit(const void *record, \
+	SYS_AUDITON                = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT               = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT               = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR          = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR          = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL               = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP               = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE               = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                 = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME           = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD          = 466 // { int rtprio_thread(int function, \
+	SYS_PREAD                  = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                 = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                   = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                  = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE               = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE              = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2              = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN               = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK             = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                 = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID           = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID           = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY     = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY     = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT              = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT               = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT               = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT              = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                 = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT               = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                 = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT             = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT               = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT              = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT               = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT           = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET               = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET               = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE            = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM              = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF              = 513 // { int lpathconf(char *path, int name); }
+	SYS___CAP_RIGHTS_GET       = 515 // { int __cap_rights_get(int version, \
+	SYS_CAP_ENTER              = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE            = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                 = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                 = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID               = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS          = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS          = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT         = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES         = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS        = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE          = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE       = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE        = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE          = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                  = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_CAP_RIGHTS_LIMIT       = 533 // { int cap_rights_limit(int fd, \
+	SYS_CAP_IOCTLS_LIMIT       = 534 // { int cap_ioctls_limit(int fd, \
+	SYS_CAP_IOCTLS_GET         = 535 // { ssize_t cap_ioctls_get(int fd, \
+	SYS_CAP_FCNTLS_LIMIT       = 536 // { int cap_fcntls_limit(int fd, \
+	SYS_CAP_FCNTLS_GET         = 537 // { int cap_fcntls_get(int fd, \
+	SYS_BINDAT                 = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT              = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT              = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                = 541 // { int accept4(int s, \
+	SYS_PIPE2                  = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                  = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_FUTIMENS               = 546 // { int futimens(int fd, \
+	SYS_UTIMENSAT              = 547 // { int utimensat(int fd, \
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
new file mode 100644
index 00000000..8f33ece7
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
@@ -0,0 +1,392 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -m32 /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86OLD                = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_VM86                   = 166
+	SYS_QUERY_MODULE           = 167
+	SYS_POLL                   = 168
+	SYS_NFSSERVCTL             = 169
+	SYS_SETRESGID              = 170
+	SYS_GETRESGID              = 171
+	SYS_PRCTL                  = 172
+	SYS_RT_SIGRETURN           = 173
+	SYS_RT_SIGACTION           = 174
+	SYS_RT_SIGPROCMASK         = 175
+	SYS_RT_SIGPENDING          = 176
+	SYS_RT_SIGTIMEDWAIT        = 177
+	SYS_RT_SIGQUEUEINFO        = 178
+	SYS_RT_SIGSUSPEND          = 179
+	SYS_PREAD64                = 180
+	SYS_PWRITE64               = 181
+	SYS_CHOWN                  = 182
+	SYS_GETCWD                 = 183
+	SYS_CAPGET                 = 184
+	SYS_CAPSET                 = 185
+	SYS_SIGALTSTACK            = 186
+	SYS_SENDFILE               = 187
+	SYS_GETPMSG                = 188
+	SYS_PUTPMSG                = 189
+	SYS_VFORK                  = 190
+	SYS_UGETRLIMIT             = 191
+	SYS_MMAP2                  = 192
+	SYS_TRUNCATE64             = 193
+	SYS_FTRUNCATE64            = 194
+	SYS_STAT64                 = 195
+	SYS_LSTAT64                = 196
+	SYS_FSTAT64                = 197
+	SYS_LCHOWN32               = 198
+	SYS_GETUID32               = 199
+	SYS_GETGID32               = 200
+	SYS_GETEUID32              = 201
+	SYS_GETEGID32              = 202
+	SYS_SETREUID32             = 203
+	SYS_SETREGID32             = 204
+	SYS_GETGROUPS32            = 205
+	SYS_SETGROUPS32            = 206
+	SYS_FCHOWN32               = 207
+	SYS_SETRESUID32            = 208
+	SYS_GETRESUID32            = 209
+	SYS_SETRESGID32            = 210
+	SYS_GETRESGID32            = 211
+	SYS_CHOWN32                = 212
+	SYS_SETUID32               = 213
+	SYS_SETGID32               = 214
+	SYS_SETFSUID32             = 215
+	SYS_SETFSGID32             = 216
+	SYS_PIVOT_ROOT             = 217
+	SYS_MINCORE                = 218
+	SYS_MADVISE                = 219
+	SYS_GETDENTS64             = 220
+	SYS_FCNTL64                = 221
+	SYS_GETTID                 = 224
+	SYS_READAHEAD              = 225
+	SYS_SETXATTR               = 226
+	SYS_LSETXATTR              = 227
+	SYS_FSETXATTR              = 228
+	SYS_GETXATTR               = 229
+	SYS_LGETXATTR              = 230
+	SYS_FGETXATTR              = 231
+	SYS_LISTXATTR              = 232
+	SYS_LLISTXATTR             = 233
+	SYS_FLISTXATTR             = 234
+	SYS_REMOVEXATTR            = 235
+	SYS_LREMOVEXATTR           = 236
+	SYS_FREMOVEXATTR           = 237
+	SYS_TKILL                  = 238
+	SYS_SENDFILE64             = 239
+	SYS_FUTEX                  = 240
+	SYS_SCHED_SETAFFINITY      = 241
+	SYS_SCHED_GETAFFINITY      = 242
+	SYS_SET_THREAD_AREA        = 243
+	SYS_GET_THREAD_AREA        = 244
+	SYS_IO_SETUP               = 245
+	SYS_IO_DESTROY             = 246
+	SYS_IO_GETEVENTS           = 247
+	SYS_IO_SUBMIT              = 248
+	SYS_IO_CANCEL              = 249
+	SYS_FADVISE64              = 250
+	SYS_EXIT_GROUP             = 252
+	SYS_LOOKUP_DCOOKIE         = 253
+	SYS_EPOLL_CREATE           = 254
+	SYS_EPOLL_CTL              = 255
+	SYS_EPOLL_WAIT             = 256
+	SYS_REMAP_FILE_PAGES       = 257
+	SYS_SET_TID_ADDRESS        = 258
+	SYS_TIMER_CREATE           = 259
+	SYS_TIMER_SETTIME          = 260
+	SYS_TIMER_GETTIME          = 261
+	SYS_TIMER_GETOVERRUN       = 262
+	SYS_TIMER_DELETE           = 263
+	SYS_CLOCK_SETTIME          = 264
+	SYS_CLOCK_GETTIME          = 265
+	SYS_CLOCK_GETRES           = 266
+	SYS_CLOCK_NANOSLEEP        = 267
+	SYS_STATFS64               = 268
+	SYS_FSTATFS64              = 269
+	SYS_TGKILL                 = 270
+	SYS_UTIMES                 = 271
+	SYS_FADVISE64_64           = 272
+	SYS_VSERVER                = 273
+	SYS_MBIND                  = 274
+	SYS_GET_MEMPOLICY          = 275
+	SYS_SET_MEMPOLICY          = 276
+	SYS_MQ_OPEN                = 277
+	SYS_MQ_UNLINK              = 278
+	SYS_MQ_TIMEDSEND           = 279
+	SYS_MQ_TIMEDRECEIVE        = 280
+	SYS_MQ_NOTIFY              = 281
+	SYS_MQ_GETSETATTR          = 282
+	SYS_KEXEC_LOAD             = 283
+	SYS_WAITID                 = 284
+	SYS_ADD_KEY                = 286
+	SYS_REQUEST_KEY            = 287
+	SYS_KEYCTL                 = 288
+	SYS_IOPRIO_SET             = 289
+	SYS_IOPRIO_GET             = 290
+	SYS_INOTIFY_INIT           = 291
+	SYS_INOTIFY_ADD_WATCH      = 292
+	SYS_INOTIFY_RM_WATCH       = 293
+	SYS_MIGRATE_PAGES          = 294
+	SYS_OPENAT                 = 295
+	SYS_MKDIRAT                = 296
+	SYS_MKNODAT                = 297
+	SYS_FCHOWNAT               = 298
+	SYS_FUTIMESAT              = 299
+	SYS_FSTATAT64              = 300
+	SYS_UNLINKAT               = 301
+	SYS_RENAMEAT               = 302
+	SYS_LINKAT                 = 303
+	SYS_SYMLINKAT              = 304
+	SYS_READLINKAT             = 305
+	SYS_FCHMODAT               = 306
+	SYS_FACCESSAT              = 307
+	SYS_PSELECT6               = 308
+	SYS_PPOLL                  = 309
+	SYS_UNSHARE                = 310
+	SYS_SET_ROBUST_LIST        = 311
+	SYS_GET_ROBUST_LIST        = 312
+	SYS_SPLICE                 = 313
+	SYS_SYNC_FILE_RANGE        = 314
+	SYS_TEE                    = 315
+	SYS_VMSPLICE               = 316
+	SYS_MOVE_PAGES             = 317
+	SYS_GETCPU                 = 318
+	SYS_EPOLL_PWAIT            = 319
+	SYS_UTIMENSAT              = 320
+	SYS_SIGNALFD               = 321
+	SYS_TIMERFD_CREATE         = 322
+	SYS_EVENTFD                = 323
+	SYS_FALLOCATE              = 324
+	SYS_TIMERFD_SETTIME        = 325
+	SYS_TIMERFD_GETTIME        = 326
+	SYS_SIGNALFD4              = 327
+	SYS_EVENTFD2               = 328
+	SYS_EPOLL_CREATE1          = 329
+	SYS_DUP3                   = 330
+	SYS_PIPE2                  = 331
+	SYS_INOTIFY_INIT1          = 332
+	SYS_PREADV                 = 333
+	SYS_PWRITEV                = 334
+	SYS_RT_TGSIGQUEUEINFO      = 335
+	SYS_PERF_EVENT_OPEN        = 336
+	SYS_RECVMMSG               = 337
+	SYS_FANOTIFY_INIT          = 338
+	SYS_FANOTIFY_MARK          = 339
+	SYS_PRLIMIT64              = 340
+	SYS_NAME_TO_HANDLE_AT      = 341
+	SYS_OPEN_BY_HANDLE_AT      = 342
+	SYS_CLOCK_ADJTIME          = 343
+	SYS_SYNCFS                 = 344
+	SYS_SENDMMSG               = 345
+	SYS_SETNS                  = 346
+	SYS_PROCESS_VM_READV       = 347
+	SYS_PROCESS_VM_WRITEV      = 348
+	SYS_KCMP                   = 349
+	SYS_FINIT_MODULE           = 350
+	SYS_SCHED_SETATTR          = 351
+	SYS_SCHED_GETATTR          = 352
+	SYS_RENAMEAT2              = 353
+	SYS_SECCOMP                = 354
+	SYS_GETRANDOM              = 355
+	SYS_MEMFD_CREATE           = 356
+	SYS_BPF                    = 357
+	SYS_EXECVEAT               = 358
+	SYS_SOCKET                 = 359
+	SYS_SOCKETPAIR             = 360
+	SYS_BIND                   = 361
+	SYS_CONNECT                = 362
+	SYS_LISTEN                 = 363
+	SYS_ACCEPT4                = 364
+	SYS_GETSOCKOPT             = 365
+	SYS_SETSOCKOPT             = 366
+	SYS_GETSOCKNAME            = 367
+	SYS_GETPEERNAME            = 368
+	SYS_SENDTO                 = 369
+	SYS_SENDMSG                = 370
+	SYS_RECVFROM               = 371
+	SYS_RECVMSG                = 372
+	SYS_SHUTDOWN               = 373
+	SYS_USERFAULTFD            = 374
+	SYS_MEMBARRIER             = 375
+	SYS_MLOCK2                 = 376
+	SYS_COPY_FILE_RANGE        = 377
+	SYS_PREADV2                = 378
+	SYS_PWRITEV2               = 379
+	SYS_PKEY_MPROTECT          = 380
+	SYS_PKEY_ALLOC             = 381
+	SYS_PKEY_FREE              = 382
+	SYS_STATX                  = 383
+	SYS_ARCH_PRCTL             = 384
+	SYS_IO_PGETEVENTS          = 385
+	SYS_RSEQ                   = 386
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
new file mode 100644
index 00000000..70c1a2c1
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
@@ -0,0 +1,344 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -m64 /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,linux
+
+package unix
+
+const (
+	SYS_READ                   = 0
+	SYS_WRITE                  = 1
+	SYS_OPEN                   = 2
+	SYS_CLOSE                  = 3
+	SYS_STAT                   = 4
+	SYS_FSTAT                  = 5
+	SYS_LSTAT                  = 6
+	SYS_POLL                   = 7
+	SYS_LSEEK                  = 8
+	SYS_MMAP                   = 9
+	SYS_MPROTECT               = 10
+	SYS_MUNMAP                 = 11
+	SYS_BRK                    = 12
+	SYS_RT_SIGACTION           = 13
+	SYS_RT_SIGPROCMASK         = 14
+	SYS_RT_SIGRETURN           = 15
+	SYS_IOCTL                  = 16
+	SYS_PREAD64                = 17
+	SYS_PWRITE64               = 18
+	SYS_READV                  = 19
+	SYS_WRITEV                 = 20
+	SYS_ACCESS                 = 21
+	SYS_PIPE                   = 22
+	SYS_SELECT                 = 23
+	SYS_SCHED_YIELD            = 24
+	SYS_MREMAP                 = 25
+	SYS_MSYNC                  = 26
+	SYS_MINCORE                = 27
+	SYS_MADVISE                = 28
+	SYS_SHMGET                 = 29
+	SYS_SHMAT                  = 30
+	SYS_SHMCTL                 = 31
+	SYS_DUP                    = 32
+	SYS_DUP2                   = 33
+	SYS_PAUSE                  = 34
+	SYS_NANOSLEEP              = 35
+	SYS_GETITIMER              = 36
+	SYS_ALARM                  = 37
+	SYS_SETITIMER              = 38
+	SYS_GETPID                 = 39
+	SYS_SENDFILE               = 40
+	SYS_SOCKET                 = 41
+	SYS_CONNECT                = 42
+	SYS_ACCEPT                 = 43
+	SYS_SENDTO                 = 44
+	SYS_RECVFROM               = 45
+	SYS_SENDMSG                = 46
+	SYS_RECVMSG                = 47
+	SYS_SHUTDOWN               = 48
+	SYS_BIND                   = 49
+	SYS_LISTEN                 = 50
+	SYS_GETSOCKNAME            = 51
+	SYS_GETPEERNAME            = 52
+	SYS_SOCKETPAIR             = 53
+	SYS_SETSOCKOPT             = 54
+	SYS_GETSOCKOPT             = 55
+	SYS_CLONE                  = 56
+	SYS_FORK                   = 57
+	SYS_VFORK                  = 58
+	SYS_EXECVE                 = 59
+	SYS_EXIT                   = 60
+	SYS_WAIT4                  = 61
+	SYS_KILL                   = 62
+	SYS_UNAME                  = 63
+	SYS_SEMGET                 = 64
+	SYS_SEMOP                  = 65
+	SYS_SEMCTL                 = 66
+	SYS_SHMDT                  = 67
+	SYS_MSGGET                 = 68
+	SYS_MSGSND                 = 69
+	SYS_MSGRCV                 = 70
+	SYS_MSGCTL                 = 71
+	SYS_FCNTL                  = 72
+	SYS_FLOCK                  = 73
+	SYS_FSYNC                  = 74
+	SYS_FDATASYNC              = 75
+	SYS_TRUNCATE               = 76
+	SYS_FTRUNCATE              = 77
+	SYS_GETDENTS               = 78
+	SYS_GETCWD                 = 79
+	SYS_CHDIR                  = 80
+	SYS_FCHDIR                 = 81
+	SYS_RENAME                 = 82
+	SYS_MKDIR                  = 83
+	SYS_RMDIR                  = 84
+	SYS_CREAT                  = 85
+	SYS_LINK                   = 86
+	SYS_UNLINK                 = 87
+	SYS_SYMLINK                = 88
+	SYS_READLINK               = 89
+	SYS_CHMOD                  = 90
+	SYS_FCHMOD                 = 91
+	SYS_CHOWN                  = 92
+	SYS_FCHOWN                 = 93
+	SYS_LCHOWN                 = 94
+	SYS_UMASK                  = 95
+	SYS_GETTIMEOFDAY           = 96
+	SYS_GETRLIMIT              = 97
+	SYS_GETRUSAGE              = 98
+	SYS_SYSINFO                = 99
+	SYS_TIMES                  = 100
+	SYS_PTRACE                 = 101
+	SYS_GETUID                 = 102
+	SYS_SYSLOG                 = 103
+	SYS_GETGID                 = 104
+	SYS_SETUID                 = 105
+	SYS_SETGID                 = 106
+	SYS_GETEUID                = 107
+	SYS_GETEGID                = 108
+	SYS_SETPGID                = 109
+	SYS_GETPPID                = 110
+	SYS_GETPGRP                = 111
+	SYS_SETSID                 = 112
+	SYS_SETREUID               = 113
+	SYS_SETREGID               = 114
+	SYS_GETGROUPS              = 115
+	SYS_SETGROUPS              = 116
+	SYS_SETRESUID              = 117
+	SYS_GETRESUID              = 118
+	SYS_SETRESGID              = 119
+	SYS_GETRESGID              = 120
+	SYS_GETPGID                = 121
+	SYS_SETFSUID               = 122
+	SYS_SETFSGID               = 123
+	SYS_GETSID                 = 124
+	SYS_CAPGET                 = 125
+	SYS_CAPSET                 = 126
+	SYS_RT_SIGPENDING          = 127
+	SYS_RT_SIGTIMEDWAIT        = 128
+	SYS_RT_SIGQUEUEINFO        = 129
+	SYS_RT_SIGSUSPEND          = 130
+	SYS_SIGALTSTACK            = 131
+	SYS_UTIME                  = 132
+	SYS_MKNOD                  = 133
+	SYS_USELIB                 = 134
+	SYS_PERSONALITY            = 135
+	SYS_USTAT                  = 136
+	SYS_STATFS                 = 137
+	SYS_FSTATFS                = 138
+	SYS_SYSFS                  = 139
+	SYS_GETPRIORITY            = 140
+	SYS_SETPRIORITY            = 141
+	SYS_SCHED_SETPARAM         = 142
+	SYS_SCHED_GETPARAM         = 143
+	SYS_SCHED_SETSCHEDULER     = 144
+	SYS_SCHED_GETSCHEDULER     = 145
+	SYS_SCHED_GET_PRIORITY_MAX = 146
+	SYS_SCHED_GET_PRIORITY_MIN = 147
+	SYS_SCHED_RR_GET_INTERVAL  = 148
+	SYS_MLOCK                  = 149
+	SYS_MUNLOCK                = 150
+	SYS_MLOCKALL               = 151
+	SYS_MUNLOCKALL             = 152
+	SYS_VHANGUP                = 153
+	SYS_MODIFY_LDT             = 154
+	SYS_PIVOT_ROOT             = 155
+	SYS__SYSCTL                = 156
+	SYS_PRCTL                  = 157
+	SYS_ARCH_PRCTL             = 158
+	SYS_ADJTIMEX               = 159
+	SYS_SETRLIMIT              = 160
+	SYS_CHROOT                 = 161
+	SYS_SYNC                   = 162
+	SYS_ACCT                   = 163
+	SYS_SETTIMEOFDAY           = 164
+	SYS_MOUNT                  = 165
+	SYS_UMOUNT2                = 166
+	SYS_SWAPON                 = 167
+	SYS_SWAPOFF                = 168
+	SYS_REBOOT                 = 169
+	SYS_SETHOSTNAME            = 170
+	SYS_SETDOMAINNAME          = 171
+	SYS_IOPL                   = 172
+	SYS_IOPERM                 = 173
+	SYS_CREATE_MODULE          = 174
+	SYS_INIT_MODULE            = 175
+	SYS_DELETE_MODULE          = 176
+	SYS_GET_KERNEL_SYMS        = 177
+	SYS_QUERY_MODULE           = 178
+	SYS_QUOTACTL               = 179
+	SYS_NFSSERVCTL             = 180
+	SYS_GETPMSG                = 181
+	SYS_PUTPMSG                = 182
+	SYS_AFS_SYSCALL            = 183
+	SYS_TUXCALL                = 184
+	SYS_SECURITY               = 185
+	SYS_GETTID                 = 186
+	SYS_READAHEAD              = 187
+	SYS_SETXATTR               = 188
+	SYS_LSETXATTR              = 189
+	SYS_FSETXATTR              = 190
+	SYS_GETXATTR               = 191
+	SYS_LGETXATTR              = 192
+	SYS_FGETXATTR              = 193
+	SYS_LISTXATTR              = 194
+	SYS_LLISTXATTR             = 195
+	SYS_FLISTXATTR             = 196
+	SYS_REMOVEXATTR            = 197
+	SYS_LREMOVEXATTR           = 198
+	SYS_FREMOVEXATTR           = 199
+	SYS_TKILL                  = 200
+	SYS_TIME                   = 201
+	SYS_FUTEX                  = 202
+	SYS_SCHED_SETAFFINITY      = 203
+	SYS_SCHED_GETAFFINITY      = 204
+	SYS_SET_THREAD_AREA        = 205
+	SYS_IO_SETUP               = 206
+	SYS_IO_DESTROY             = 207
+	SYS_IO_GETEVENTS           = 208
+	SYS_IO_SUBMIT              = 209
+	SYS_IO_CANCEL              = 210
+	SYS_GET_THREAD_AREA        = 211
+	SYS_LOOKUP_DCOOKIE         = 212
+	SYS_EPOLL_CREATE           = 213
+	SYS_EPOLL_CTL_OLD          = 214
+	SYS_EPOLL_WAIT_OLD         = 215
+	SYS_REMAP_FILE_PAGES       = 216
+	SYS_GETDENTS64             = 217
+	SYS_SET_TID_ADDRESS        = 218
+	SYS_RESTART_SYSCALL        = 219
+	SYS_SEMTIMEDOP             = 220
+	SYS_FADVISE64              = 221
+	SYS_TIMER_CREATE           = 222
+	SYS_TIMER_SETTIME          = 223
+	SYS_TIMER_GETTIME          = 224
+	SYS_TIMER_GETOVERRUN       = 225
+	SYS_TIMER_DELETE           = 226
+	SYS_CLOCK_SETTIME          = 227
+	SYS_CLOCK_GETTIME          = 228
+	SYS_CLOCK_GETRES           = 229
+	SYS_CLOCK_NANOSLEEP        = 230
+	SYS_EXIT_GROUP             = 231
+	SYS_EPOLL_WAIT             = 232
+	SYS_EPOLL_CTL              = 233
+	SYS_TGKILL                 = 234
+	SYS_UTIMES                 = 235
+	SYS_VSERVER                = 236
+	SYS_MBIND                  = 237
+	SYS_SET_MEMPOLICY          = 238
+	SYS_GET_MEMPOLICY          = 239
+	SYS_MQ_OPEN                = 240
+	SYS_MQ_UNLINK              = 241
+	SYS_MQ_TIMEDSEND           = 242
+	SYS_MQ_TIMEDRECEIVE        = 243
+	SYS_MQ_NOTIFY              = 244
+	SYS_MQ_GETSETATTR          = 245
+	SYS_KEXEC_LOAD             = 246
+	SYS_WAITID                 = 247
+	SYS_ADD_KEY                = 248
+	SYS_REQUEST_KEY            = 249
+	SYS_KEYCTL                 = 250
+	SYS_IOPRIO_SET             = 251
+	SYS_IOPRIO_GET             = 252
+	SYS_INOTIFY_INIT           = 253
+	SYS_INOTIFY_ADD_WATCH      = 254
+	SYS_INOTIFY_RM_WATCH       = 255
+	SYS_MIGRATE_PAGES          = 256
+	SYS_OPENAT                 = 257
+	SYS_MKDIRAT                = 258
+	SYS_MKNODAT                = 259
+	SYS_FCHOWNAT               = 260
+	SYS_FUTIMESAT              = 261
+	SYS_NEWFSTATAT             = 262
+	SYS_UNLINKAT               = 263
+	SYS_RENAMEAT               = 264
+	SYS_LINKAT                 = 265
+	SYS_SYMLINKAT              = 266
+	SYS_READLINKAT             = 267
+	SYS_FCHMODAT               = 268
+	SYS_FACCESSAT              = 269
+	SYS_PSELECT6               = 270
+	SYS_PPOLL                  = 271
+	SYS_UNSHARE                = 272
+	SYS_SET_ROBUST_LIST        = 273
+	SYS_GET_ROBUST_LIST        = 274
+	SYS_SPLICE                 = 275
+	SYS_TEE                    = 276
+	SYS_SYNC_FILE_RANGE        = 277
+	SYS_VMSPLICE               = 278
+	SYS_MOVE_PAGES             = 279
+	SYS_UTIMENSAT              = 280
+	SYS_EPOLL_PWAIT            = 281
+	SYS_SIGNALFD               = 282
+	SYS_TIMERFD_CREATE         = 283
+	SYS_EVENTFD                = 284
+	SYS_FALLOCATE              = 285
+	SYS_TIMERFD_SETTIME        = 286
+	SYS_TIMERFD_GETTIME        = 287
+	SYS_ACCEPT4                = 288
+	SYS_SIGNALFD4              = 289
+	SYS_EVENTFD2               = 290
+	SYS_EPOLL_CREATE1          = 291
+	SYS_DUP3                   = 292
+	SYS_PIPE2                  = 293
+	SYS_INOTIFY_INIT1          = 294
+	SYS_PREADV                 = 295
+	SYS_PWRITEV                = 296
+	SYS_RT_TGSIGQUEUEINFO      = 297
+	SYS_PERF_EVENT_OPEN        = 298
+	SYS_RECVMMSG               = 299
+	SYS_FANOTIFY_INIT          = 300
+	SYS_FANOTIFY_MARK          = 301
+	SYS_PRLIMIT64              = 302
+	SYS_NAME_TO_HANDLE_AT      = 303
+	SYS_OPEN_BY_HANDLE_AT      = 304
+	SYS_CLOCK_ADJTIME          = 305
+	SYS_SYNCFS                 = 306
+	SYS_SENDMMSG               = 307
+	SYS_SETNS                  = 308
+	SYS_GETCPU                 = 309
+	SYS_PROCESS_VM_READV       = 310
+	SYS_PROCESS_VM_WRITEV      = 311
+	SYS_KCMP                   = 312
+	SYS_FINIT_MODULE           = 313
+	SYS_SCHED_SETATTR          = 314
+	SYS_SCHED_GETATTR          = 315
+	SYS_RENAMEAT2              = 316
+	SYS_SECCOMP                = 317
+	SYS_GETRANDOM              = 318
+	SYS_MEMFD_CREATE           = 319
+	SYS_KEXEC_FILE_LOAD        = 320
+	SYS_BPF                    = 321
+	SYS_EXECVEAT               = 322
+	SYS_USERFAULTFD            = 323
+	SYS_MEMBARRIER             = 324
+	SYS_MLOCK2                 = 325
+	SYS_COPY_FILE_RANGE        = 326
+	SYS_PREADV2                = 327
+	SYS_PWRITEV2               = 328
+	SYS_PKEY_MPROTECT          = 329
+	SYS_PKEY_ALLOC             = 330
+	SYS_PKEY_FREE              = 331
+	SYS_STATX                  = 332
+	SYS_IO_PGETEVENTS          = 333
+	SYS_RSEQ                   = 334
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
new file mode 100644
index 00000000..a1db143f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
@@ -0,0 +1,363 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_PTRACE                 = 26
+	SYS_PAUSE                  = 29
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_SETPGID                = 57
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SYMLINK                = 83
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_VHANGUP                = 111
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_POLL                   = 168
+	SYS_NFSSERVCTL             = 169
+	SYS_SETRESGID              = 170
+	SYS_GETRESGID              = 171
+	SYS_PRCTL                  = 172
+	SYS_RT_SIGRETURN           = 173
+	SYS_RT_SIGACTION           = 174
+	SYS_RT_SIGPROCMASK         = 175
+	SYS_RT_SIGPENDING          = 176
+	SYS_RT_SIGTIMEDWAIT        = 177
+	SYS_RT_SIGQUEUEINFO        = 178
+	SYS_RT_SIGSUSPEND          = 179
+	SYS_PREAD64                = 180
+	SYS_PWRITE64               = 181
+	SYS_CHOWN                  = 182
+	SYS_GETCWD                 = 183
+	SYS_CAPGET                 = 184
+	SYS_CAPSET                 = 185
+	SYS_SIGALTSTACK            = 186
+	SYS_SENDFILE               = 187
+	SYS_VFORK                  = 190
+	SYS_UGETRLIMIT             = 191
+	SYS_MMAP2                  = 192
+	SYS_TRUNCATE64             = 193
+	SYS_FTRUNCATE64            = 194
+	SYS_STAT64                 = 195
+	SYS_LSTAT64                = 196
+	SYS_FSTAT64                = 197
+	SYS_LCHOWN32               = 198
+	SYS_GETUID32               = 199
+	SYS_GETGID32               = 200
+	SYS_GETEUID32              = 201
+	SYS_GETEGID32              = 202
+	SYS_SETREUID32             = 203
+	SYS_SETREGID32             = 204
+	SYS_GETGROUPS32            = 205
+	SYS_SETGROUPS32            = 206
+	SYS_FCHOWN32               = 207
+	SYS_SETRESUID32            = 208
+	SYS_GETRESUID32            = 209
+	SYS_SETRESGID32            = 210
+	SYS_GETRESGID32            = 211
+	SYS_CHOWN32                = 212
+	SYS_SETUID32               = 213
+	SYS_SETGID32               = 214
+	SYS_SETFSUID32             = 215
+	SYS_SETFSGID32             = 216
+	SYS_GETDENTS64             = 217
+	SYS_PIVOT_ROOT             = 218
+	SYS_MINCORE                = 219
+	SYS_MADVISE                = 220
+	SYS_FCNTL64                = 221
+	SYS_GETTID                 = 224
+	SYS_READAHEAD              = 225
+	SYS_SETXATTR               = 226
+	SYS_LSETXATTR              = 227
+	SYS_FSETXATTR              = 228
+	SYS_GETXATTR               = 229
+	SYS_LGETXATTR              = 230
+	SYS_FGETXATTR              = 231
+	SYS_LISTXATTR              = 232
+	SYS_LLISTXATTR             = 233
+	SYS_FLISTXATTR             = 234
+	SYS_REMOVEXATTR            = 235
+	SYS_LREMOVEXATTR           = 236
+	SYS_FREMOVEXATTR           = 237
+	SYS_TKILL                  = 238
+	SYS_SENDFILE64             = 239
+	SYS_FUTEX                  = 240
+	SYS_SCHED_SETAFFINITY      = 241
+	SYS_SCHED_GETAFFINITY      = 242
+	SYS_IO_SETUP               = 243
+	SYS_IO_DESTROY             = 244
+	SYS_IO_GETEVENTS           = 245
+	SYS_IO_SUBMIT              = 246
+	SYS_IO_CANCEL              = 247
+	SYS_EXIT_GROUP             = 248
+	SYS_LOOKUP_DCOOKIE         = 249
+	SYS_EPOLL_CREATE           = 250
+	SYS_EPOLL_CTL              = 251
+	SYS_EPOLL_WAIT             = 252
+	SYS_REMAP_FILE_PAGES       = 253
+	SYS_SET_TID_ADDRESS        = 256
+	SYS_TIMER_CREATE           = 257
+	SYS_TIMER_SETTIME          = 258
+	SYS_TIMER_GETTIME          = 259
+	SYS_TIMER_GETOVERRUN       = 260
+	SYS_TIMER_DELETE           = 261
+	SYS_CLOCK_SETTIME          = 262
+	SYS_CLOCK_GETTIME          = 263
+	SYS_CLOCK_GETRES           = 264
+	SYS_CLOCK_NANOSLEEP        = 265
+	SYS_STATFS64               = 266
+	SYS_FSTATFS64              = 267
+	SYS_TGKILL                 = 268
+	SYS_UTIMES                 = 269
+	SYS_ARM_FADVISE64_64       = 270
+	SYS_PCICONFIG_IOBASE       = 271
+	SYS_PCICONFIG_READ         = 272
+	SYS_PCICONFIG_WRITE        = 273
+	SYS_MQ_OPEN                = 274
+	SYS_MQ_UNLINK              = 275
+	SYS_MQ_TIMEDSEND           = 276
+	SYS_MQ_TIMEDRECEIVE        = 277
+	SYS_MQ_NOTIFY              = 278
+	SYS_MQ_GETSETATTR          = 279
+	SYS_WAITID                 = 280
+	SYS_SOCKET                 = 281
+	SYS_BIND                   = 282
+	SYS_CONNECT                = 283
+	SYS_LISTEN                 = 284
+	SYS_ACCEPT                 = 285
+	SYS_GETSOCKNAME            = 286
+	SYS_GETPEERNAME            = 287
+	SYS_SOCKETPAIR             = 288
+	SYS_SEND                   = 289
+	SYS_SENDTO                 = 290
+	SYS_RECV                   = 291
+	SYS_RECVFROM               = 292
+	SYS_SHUTDOWN               = 293
+	SYS_SETSOCKOPT             = 294
+	SYS_GETSOCKOPT             = 295
+	SYS_SENDMSG                = 296
+	SYS_RECVMSG                = 297
+	SYS_SEMOP                  = 298
+	SYS_SEMGET                 = 299
+	SYS_SEMCTL                 = 300
+	SYS_MSGSND                 = 301
+	SYS_MSGRCV                 = 302
+	SYS_MSGGET                 = 303
+	SYS_MSGCTL                 = 304
+	SYS_SHMAT                  = 305
+	SYS_SHMDT                  = 306
+	SYS_SHMGET                 = 307
+	SYS_SHMCTL                 = 308
+	SYS_ADD_KEY                = 309
+	SYS_REQUEST_KEY            = 310
+	SYS_KEYCTL                 = 311
+	SYS_SEMTIMEDOP             = 312
+	SYS_VSERVER                = 313
+	SYS_IOPRIO_SET             = 314
+	SYS_IOPRIO_GET             = 315
+	SYS_INOTIFY_INIT           = 316
+	SYS_INOTIFY_ADD_WATCH      = 317
+	SYS_INOTIFY_RM_WATCH       = 318
+	SYS_MBIND                  = 319
+	SYS_GET_MEMPOLICY          = 320
+	SYS_SET_MEMPOLICY          = 321
+	SYS_OPENAT                 = 322
+	SYS_MKDIRAT                = 323
+	SYS_MKNODAT                = 324
+	SYS_FCHOWNAT               = 325
+	SYS_FUTIMESAT              = 326
+	SYS_FSTATAT64              = 327
+	SYS_UNLINKAT               = 328
+	SYS_RENAMEAT               = 329
+	SYS_LINKAT                 = 330
+	SYS_SYMLINKAT              = 331
+	SYS_READLINKAT             = 332
+	SYS_FCHMODAT               = 333
+	SYS_FACCESSAT              = 334
+	SYS_PSELECT6               = 335
+	SYS_PPOLL                  = 336
+	SYS_UNSHARE                = 337
+	SYS_SET_ROBUST_LIST        = 338
+	SYS_GET_ROBUST_LIST        = 339
+	SYS_SPLICE                 = 340
+	SYS_ARM_SYNC_FILE_RANGE    = 341
+	SYS_TEE                    = 342
+	SYS_VMSPLICE               = 343
+	SYS_MOVE_PAGES             = 344
+	SYS_GETCPU                 = 345
+	SYS_EPOLL_PWAIT            = 346
+	SYS_KEXEC_LOAD             = 347
+	SYS_UTIMENSAT              = 348
+	SYS_SIGNALFD               = 349
+	SYS_TIMERFD_CREATE         = 350
+	SYS_EVENTFD                = 351
+	SYS_FALLOCATE              = 352
+	SYS_TIMERFD_SETTIME        = 353
+	SYS_TIMERFD_GETTIME        = 354
+	SYS_SIGNALFD4              = 355
+	SYS_EVENTFD2               = 356
+	SYS_EPOLL_CREATE1          = 357
+	SYS_DUP3                   = 358
+	SYS_PIPE2                  = 359
+	SYS_INOTIFY_INIT1          = 360
+	SYS_PREADV                 = 361
+	SYS_PWRITEV                = 362
+	SYS_RT_TGSIGQUEUEINFO      = 363
+	SYS_PERF_EVENT_OPEN        = 364
+	SYS_RECVMMSG               = 365
+	SYS_ACCEPT4                = 366
+	SYS_FANOTIFY_INIT          = 367
+	SYS_FANOTIFY_MARK          = 368
+	SYS_PRLIMIT64              = 369
+	SYS_NAME_TO_HANDLE_AT      = 370
+	SYS_OPEN_BY_HANDLE_AT      = 371
+	SYS_CLOCK_ADJTIME          = 372
+	SYS_SYNCFS                 = 373
+	SYS_SENDMMSG               = 374
+	SYS_SETNS                  = 375
+	SYS_PROCESS_VM_READV       = 376
+	SYS_PROCESS_VM_WRITEV      = 377
+	SYS_KCMP                   = 378
+	SYS_FINIT_MODULE           = 379
+	SYS_SCHED_SETATTR          = 380
+	SYS_SCHED_GETATTR          = 381
+	SYS_RENAMEAT2              = 382
+	SYS_SECCOMP                = 383
+	SYS_GETRANDOM              = 384
+	SYS_MEMFD_CREATE           = 385
+	SYS_BPF                    = 386
+	SYS_EXECVEAT               = 387
+	SYS_USERFAULTFD            = 388
+	SYS_MEMBARRIER             = 389
+	SYS_MLOCK2                 = 390
+	SYS_COPY_FILE_RANGE        = 391
+	SYS_PREADV2                = 392
+	SYS_PWRITEV2               = 393
+	SYS_PKEY_MPROTECT          = 394
+	SYS_PKEY_ALLOC             = 395
+	SYS_PKEY_FREE              = 396
+	SYS_STATX                  = 397
+	SYS_RSEQ                   = 398
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
new file mode 100644
index 00000000..2e4cee70
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
@@ -0,0 +1,287 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm64,linux
+
+package unix
+
+const (
+	SYS_IO_SETUP               = 0
+	SYS_IO_DESTROY             = 1
+	SYS_IO_SUBMIT              = 2
+	SYS_IO_CANCEL              = 3
+	SYS_IO_GETEVENTS           = 4
+	SYS_SETXATTR               = 5
+	SYS_LSETXATTR              = 6
+	SYS_FSETXATTR              = 7
+	SYS_GETXATTR               = 8
+	SYS_LGETXATTR              = 9
+	SYS_FGETXATTR              = 10
+	SYS_LISTXATTR              = 11
+	SYS_LLISTXATTR             = 12
+	SYS_FLISTXATTR             = 13
+	SYS_REMOVEXATTR            = 14
+	SYS_LREMOVEXATTR           = 15
+	SYS_FREMOVEXATTR           = 16
+	SYS_GETCWD                 = 17
+	SYS_LOOKUP_DCOOKIE         = 18
+	SYS_EVENTFD2               = 19
+	SYS_EPOLL_CREATE1          = 20
+	SYS_EPOLL_CTL              = 21
+	SYS_EPOLL_PWAIT            = 22
+	SYS_DUP                    = 23
+	SYS_DUP3                   = 24
+	SYS_FCNTL                  = 25
+	SYS_INOTIFY_INIT1          = 26
+	SYS_INOTIFY_ADD_WATCH      = 27
+	SYS_INOTIFY_RM_WATCH       = 28
+	SYS_IOCTL                  = 29
+	SYS_IOPRIO_SET             = 30
+	SYS_IOPRIO_GET             = 31
+	SYS_FLOCK                  = 32
+	SYS_MKNODAT                = 33
+	SYS_MKDIRAT                = 34
+	SYS_UNLINKAT               = 35
+	SYS_SYMLINKAT              = 36
+	SYS_LINKAT                 = 37
+	SYS_RENAMEAT               = 38
+	SYS_UMOUNT2                = 39
+	SYS_MOUNT                  = 40
+	SYS_PIVOT_ROOT             = 41
+	SYS_NFSSERVCTL             = 42
+	SYS_STATFS                 = 43
+	SYS_FSTATFS                = 44
+	SYS_TRUNCATE               = 45
+	SYS_FTRUNCATE              = 46
+	SYS_FALLOCATE              = 47
+	SYS_FACCESSAT              = 48
+	SYS_CHDIR                  = 49
+	SYS_FCHDIR                 = 50
+	SYS_CHROOT                 = 51
+	SYS_FCHMOD                 = 52
+	SYS_FCHMODAT               = 53
+	SYS_FCHOWNAT               = 54
+	SYS_FCHOWN                 = 55
+	SYS_OPENAT                 = 56
+	SYS_CLOSE                  = 57
+	SYS_VHANGUP                = 58
+	SYS_PIPE2                  = 59
+	SYS_QUOTACTL               = 60
+	SYS_GETDENTS64             = 61
+	SYS_LSEEK                  = 62
+	SYS_READ                   = 63
+	SYS_WRITE                  = 64
+	SYS_READV                  = 65
+	SYS_WRITEV                 = 66
+	SYS_PREAD64                = 67
+	SYS_PWRITE64               = 68
+	SYS_PREADV                 = 69
+	SYS_PWRITEV                = 70
+	SYS_SENDFILE               = 71
+	SYS_PSELECT6               = 72
+	SYS_PPOLL                  = 73
+	SYS_SIGNALFD4              = 74
+	SYS_VMSPLICE               = 75
+	SYS_SPLICE                 = 76
+	SYS_TEE                    = 77
+	SYS_READLINKAT             = 78
+	SYS_FSTATAT                = 79
+	SYS_FSTAT                  = 80
+	SYS_SYNC                   = 81
+	SYS_FSYNC                  = 82
+	SYS_FDATASYNC              = 83
+	SYS_SYNC_FILE_RANGE        = 84
+	SYS_TIMERFD_CREATE         = 85
+	SYS_TIMERFD_SETTIME        = 86
+	SYS_TIMERFD_GETTIME        = 87
+	SYS_UTIMENSAT              = 88
+	SYS_ACCT                   = 89
+	SYS_CAPGET                 = 90
+	SYS_CAPSET                 = 91
+	SYS_PERSONALITY            = 92
+	SYS_EXIT                   = 93
+	SYS_EXIT_GROUP             = 94
+	SYS_WAITID                 = 95
+	SYS_SET_TID_ADDRESS        = 96
+	SYS_UNSHARE                = 97
+	SYS_FUTEX                  = 98
+	SYS_SET_ROBUST_LIST        = 99
+	SYS_GET_ROBUST_LIST        = 100
+	SYS_NANOSLEEP              = 101
+	SYS_GETITIMER              = 102
+	SYS_SETITIMER              = 103
+	SYS_KEXEC_LOAD             = 104
+	SYS_INIT_MODULE            = 105
+	SYS_DELETE_MODULE          = 106
+	SYS_TIMER_CREATE           = 107
+	SYS_TIMER_GETTIME          = 108
+	SYS_TIMER_GETOVERRUN       = 109
+	SYS_TIMER_SETTIME          = 110
+	SYS_TIMER_DELETE           = 111
+	SYS_CLOCK_SETTIME          = 112
+	SYS_CLOCK_GETTIME          = 113
+	SYS_CLOCK_GETRES           = 114
+	SYS_CLOCK_NANOSLEEP        = 115
+	SYS_SYSLOG                 = 116
+	SYS_PTRACE                 = 117
+	SYS_SCHED_SETPARAM         = 118
+	SYS_SCHED_SETSCHEDULER     = 119
+	SYS_SCHED_GETSCHEDULER     = 120
+	SYS_SCHED_GETPARAM         = 121
+	SYS_SCHED_SETAFFINITY      = 122
+	SYS_SCHED_GETAFFINITY      = 123
+	SYS_SCHED_YIELD            = 124
+	SYS_SCHED_GET_PRIORITY_MAX = 125
+	SYS_SCHED_GET_PRIORITY_MIN = 126
+	SYS_SCHED_RR_GET_INTERVAL  = 127
+	SYS_RESTART_SYSCALL        = 128
+	SYS_KILL                   = 129
+	SYS_TKILL                  = 130
+	SYS_TGKILL                 = 131
+	SYS_SIGALTSTACK            = 132
+	SYS_RT_SIGSUSPEND          = 133
+	SYS_RT_SIGACTION           = 134
+	SYS_RT_SIGPROCMASK         = 135
+	SYS_RT_SIGPENDING          = 136
+	SYS_RT_SIGTIMEDWAIT        = 137
+	SYS_RT_SIGQUEUEINFO        = 138
+	SYS_RT_SIGRETURN           = 139
+	SYS_SETPRIORITY            = 140
+	SYS_GETPRIORITY            = 141
+	SYS_REBOOT                 = 142
+	SYS_SETREGID               = 143
+	SYS_SETGID                 = 144
+	SYS_SETREUID               = 145
+	SYS_SETUID                 = 146
+	SYS_SETRESUID              = 147
+	SYS_GETRESUID              = 148
+	SYS_SETRESGID              = 149
+	SYS_GETRESGID              = 150
+	SYS_SETFSUID               = 151
+	SYS_SETFSGID               = 152
+	SYS_TIMES                  = 153
+	SYS_SETPGID                = 154
+	SYS_GETPGID                = 155
+	SYS_GETSID                 = 156
+	SYS_SETSID                 = 157
+	SYS_GETGROUPS              = 158
+	SYS_SETGROUPS              = 159
+	SYS_UNAME                  = 160
+	SYS_SETHOSTNAME            = 161
+	SYS_SETDOMAINNAME          = 162
+	SYS_GETRLIMIT              = 163
+	SYS_SETRLIMIT              = 164
+	SYS_GETRUSAGE              = 165
+	SYS_UMASK                  = 166
+	SYS_PRCTL                  = 167
+	SYS_GETCPU                 = 168
+	SYS_GETTIMEOFDAY           = 169
+	SYS_SETTIMEOFDAY           = 170
+	SYS_ADJTIMEX               = 171
+	SYS_GETPID                 = 172
+	SYS_GETPPID                = 173
+	SYS_GETUID                 = 174
+	SYS_GETEUID                = 175
+	SYS_GETGID                 = 176
+	SYS_GETEGID                = 177
+	SYS_GETTID                 = 178
+	SYS_SYSINFO                = 179
+	SYS_MQ_OPEN                = 180
+	SYS_MQ_UNLINK              = 181
+	SYS_MQ_TIMEDSEND           = 182
+	SYS_MQ_TIMEDRECEIVE        = 183
+	SYS_MQ_NOTIFY              = 184
+	SYS_MQ_GETSETATTR          = 185
+	SYS_MSGGET                 = 186
+	SYS_MSGCTL                 = 187
+	SYS_MSGRCV                 = 188
+	SYS_MSGSND                 = 189
+	SYS_SEMGET                 = 190
+	SYS_SEMCTL                 = 191
+	SYS_SEMTIMEDOP             = 192
+	SYS_SEMOP                  = 193
+	SYS_SHMGET                 = 194
+	SYS_SHMCTL                 = 195
+	SYS_SHMAT                  = 196
+	SYS_SHMDT                  = 197
+	SYS_SOCKET                 = 198
+	SYS_SOCKETPAIR             = 199
+	SYS_BIND                   = 200
+	SYS_LISTEN                 = 201
+	SYS_ACCEPT                 = 202
+	SYS_CONNECT                = 203
+	SYS_GETSOCKNAME            = 204
+	SYS_GETPEERNAME            = 205
+	SYS_SENDTO                 = 206
+	SYS_RECVFROM               = 207
+	SYS_SETSOCKOPT             = 208
+	SYS_GETSOCKOPT             = 209
+	SYS_SHUTDOWN               = 210
+	SYS_SENDMSG                = 211
+	SYS_RECVMSG                = 212
+	SYS_READAHEAD              = 213
+	SYS_BRK                    = 214
+	SYS_MUNMAP                 = 215
+	SYS_MREMAP                 = 216
+	SYS_ADD_KEY                = 217
+	SYS_REQUEST_KEY            = 218
+	SYS_KEYCTL                 = 219
+	SYS_CLONE                  = 220
+	SYS_EXECVE                 = 221
+	SYS_MMAP                   = 222
+	SYS_FADVISE64              = 223
+	SYS_SWAPON                 = 224
+	SYS_SWAPOFF                = 225
+	SYS_MPROTECT               = 226
+	SYS_MSYNC                  = 227
+	SYS_MLOCK                  = 228
+	SYS_MUNLOCK                = 229
+	SYS_MLOCKALL               = 230
+	SYS_MUNLOCKALL             = 231
+	SYS_MINCORE                = 232
+	SYS_MADVISE                = 233
+	SYS_REMAP_FILE_PAGES       = 234
+	SYS_MBIND                  = 235
+	SYS_GET_MEMPOLICY          = 236
+	SYS_SET_MEMPOLICY          = 237
+	SYS_MIGRATE_PAGES          = 238
+	SYS_MOVE_PAGES             = 239
+	SYS_RT_TGSIGQUEUEINFO      = 240
+	SYS_PERF_EVENT_OPEN        = 241
+	SYS_ACCEPT4                = 242
+	SYS_RECVMMSG               = 243
+	SYS_ARCH_SPECIFIC_SYSCALL  = 244
+	SYS_WAIT4                  = 260
+	SYS_PRLIMIT64              = 261
+	SYS_FANOTIFY_INIT          = 262
+	SYS_FANOTIFY_MARK          = 263
+	SYS_NAME_TO_HANDLE_AT      = 264
+	SYS_OPEN_BY_HANDLE_AT      = 265
+	SYS_CLOCK_ADJTIME          = 266
+	SYS_SYNCFS                 = 267
+	SYS_SETNS                  = 268
+	SYS_SENDMMSG               = 269
+	SYS_PROCESS_VM_READV       = 270
+	SYS_PROCESS_VM_WRITEV      = 271
+	SYS_KCMP                   = 272
+	SYS_FINIT_MODULE           = 273
+	SYS_SCHED_SETATTR          = 274
+	SYS_SCHED_GETATTR          = 275
+	SYS_RENAMEAT2              = 276
+	SYS_SECCOMP                = 277
+	SYS_GETRANDOM              = 278
+	SYS_MEMFD_CREATE           = 279
+	SYS_BPF                    = 280
+	SYS_EXECVEAT               = 281
+	SYS_USERFAULTFD            = 282
+	SYS_MEMBARRIER             = 283
+	SYS_MLOCK2                 = 284
+	SYS_COPY_FILE_RANGE        = 285
+	SYS_PREADV2                = 286
+	SYS_PWRITEV2               = 287
+	SYS_PKEY_MPROTECT          = 288
+	SYS_PKEY_ALLOC             = 289
+	SYS_PKEY_FREE              = 290
+	SYS_STATX                  = 291
+	SYS_IO_PGETEVENTS          = 292
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
new file mode 100644
index 00000000..16714491
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
@@ -0,0 +1,377 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips,linux
+
+package unix
+
+const (
+	SYS_SYSCALL                = 4000
+	SYS_EXIT                   = 4001
+	SYS_FORK                   = 4002
+	SYS_READ                   = 4003
+	SYS_WRITE                  = 4004
+	SYS_OPEN                   = 4005
+	SYS_CLOSE                  = 4006
+	SYS_WAITPID                = 4007
+	SYS_CREAT                  = 4008
+	SYS_LINK                   = 4009
+	SYS_UNLINK                 = 4010
+	SYS_EXECVE                 = 4011
+	SYS_CHDIR                  = 4012
+	SYS_TIME                   = 4013
+	SYS_MKNOD                  = 4014
+	SYS_CHMOD                  = 4015
+	SYS_LCHOWN                 = 4016
+	SYS_BREAK                  = 4017
+	SYS_UNUSED18               = 4018
+	SYS_LSEEK                  = 4019
+	SYS_GETPID                 = 4020
+	SYS_MOUNT                  = 4021
+	SYS_UMOUNT                 = 4022
+	SYS_SETUID                 = 4023
+	SYS_GETUID                 = 4024
+	SYS_STIME                  = 4025
+	SYS_PTRACE                 = 4026
+	SYS_ALARM                  = 4027
+	SYS_UNUSED28               = 4028
+	SYS_PAUSE                  = 4029
+	SYS_UTIME                  = 4030
+	SYS_STTY                   = 4031
+	SYS_GTTY                   = 4032
+	SYS_ACCESS                 = 4033
+	SYS_NICE                   = 4034
+	SYS_FTIME                  = 4035
+	SYS_SYNC                   = 4036
+	SYS_KILL                   = 4037
+	SYS_RENAME                 = 4038
+	SYS_MKDIR                  = 4039
+	SYS_RMDIR                  = 4040
+	SYS_DUP                    = 4041
+	SYS_PIPE                   = 4042
+	SYS_TIMES                  = 4043
+	SYS_PROF                   = 4044
+	SYS_BRK                    = 4045
+	SYS_SETGID                 = 4046
+	SYS_GETGID                 = 4047
+	SYS_SIGNAL                 = 4048
+	SYS_GETEUID                = 4049
+	SYS_GETEGID                = 4050
+	SYS_ACCT                   = 4051
+	SYS_UMOUNT2                = 4052
+	SYS_LOCK                   = 4053
+	SYS_IOCTL                  = 4054
+	SYS_FCNTL                  = 4055
+	SYS_MPX                    = 4056
+	SYS_SETPGID                = 4057
+	SYS_ULIMIT                 = 4058
+	SYS_UNUSED59               = 4059
+	SYS_UMASK                  = 4060
+	SYS_CHROOT                 = 4061
+	SYS_USTAT                  = 4062
+	SYS_DUP2                   = 4063
+	SYS_GETPPID                = 4064
+	SYS_GETPGRP                = 4065
+	SYS_SETSID                 = 4066
+	SYS_SIGACTION              = 4067
+	SYS_SGETMASK               = 4068
+	SYS_SSETMASK               = 4069
+	SYS_SETREUID               = 4070
+	SYS_SETREGID               = 4071
+	SYS_SIGSUSPEND             = 4072
+	SYS_SIGPENDING             = 4073
+	SYS_SETHOSTNAME            = 4074
+	SYS_SETRLIMIT              = 4075
+	SYS_GETRLIMIT              = 4076
+	SYS_GETRUSAGE              = 4077
+	SYS_GETTIMEOFDAY           = 4078
+	SYS_SETTIMEOFDAY           = 4079
+	SYS_GETGROUPS              = 4080
+	SYS_SETGROUPS              = 4081
+	SYS_RESERVED82             = 4082
+	SYS_SYMLINK                = 4083
+	SYS_UNUSED84               = 4084
+	SYS_READLINK               = 4085
+	SYS_USELIB                 = 4086
+	SYS_SWAPON                 = 4087
+	SYS_REBOOT                 = 4088
+	SYS_READDIR                = 4089
+	SYS_MMAP                   = 4090
+	SYS_MUNMAP                 = 4091
+	SYS_TRUNCATE               = 4092
+	SYS_FTRUNCATE              = 4093
+	SYS_FCHMOD                 = 4094
+	SYS_FCHOWN                 = 4095
+	SYS_GETPRIORITY            = 4096
+	SYS_SETPRIORITY            = 4097
+	SYS_PROFIL                 = 4098
+	SYS_STATFS                 = 4099
+	SYS_FSTATFS                = 4100
+	SYS_IOPERM                 = 4101
+	SYS_SOCKETCALL             = 4102
+	SYS_SYSLOG                 = 4103
+	SYS_SETITIMER              = 4104
+	SYS_GETITIMER              = 4105
+	SYS_STAT                   = 4106
+	SYS_LSTAT                  = 4107
+	SYS_FSTAT                  = 4108
+	SYS_UNUSED109              = 4109
+	SYS_IOPL                   = 4110
+	SYS_VHANGUP                = 4111
+	SYS_IDLE                   = 4112
+	SYS_VM86                   = 4113
+	SYS_WAIT4                  = 4114
+	SYS_SWAPOFF                = 4115
+	SYS_SYSINFO                = 4116
+	SYS_IPC                    = 4117
+	SYS_FSYNC                  = 4118
+	SYS_SIGRETURN              = 4119
+	SYS_CLONE                  = 4120
+	SYS_SETDOMAINNAME          = 4121
+	SYS_UNAME                  = 4122
+	SYS_MODIFY_LDT             = 4123
+	SYS_ADJTIMEX               = 4124
+	SYS_MPROTECT               = 4125
+	SYS_SIGPROCMASK            = 4126
+	SYS_CREATE_MODULE          = 4127
+	SYS_INIT_MODULE            = 4128
+	SYS_DELETE_MODULE          = 4129
+	SYS_GET_KERNEL_SYMS        = 4130
+	SYS_QUOTACTL               = 4131
+	SYS_GETPGID                = 4132
+	SYS_FCHDIR                 = 4133
+	SYS_BDFLUSH                = 4134
+	SYS_SYSFS                  = 4135
+	SYS_PERSONALITY            = 4136
+	SYS_AFS_SYSCALL            = 4137
+	SYS_SETFSUID               = 4138
+	SYS_SETFSGID               = 4139
+	SYS__LLSEEK                = 4140
+	SYS_GETDENTS               = 4141
+	SYS__NEWSELECT             = 4142
+	SYS_FLOCK                  = 4143
+	SYS_MSYNC                  = 4144
+	SYS_READV                  = 4145
+	SYS_WRITEV                 = 4146
+	SYS_CACHEFLUSH             = 4147
+	SYS_CACHECTL               = 4148
+	SYS_SYSMIPS                = 4149
+	SYS_UNUSED150              = 4150
+	SYS_GETSID                 = 4151
+	SYS_FDATASYNC              = 4152
+	SYS__SYSCTL                = 4153
+	SYS_MLOCK                  = 4154
+	SYS_MUNLOCK                = 4155
+	SYS_MLOCKALL               = 4156
+	SYS_MUNLOCKALL             = 4157
+	SYS_SCHED_SETPARAM         = 4158
+	SYS_SCHED_GETPARAM         = 4159
+	SYS_SCHED_SETSCHEDULER     = 4160
+	SYS_SCHED_GETSCHEDULER     = 4161
+	SYS_SCHED_YIELD            = 4162
+	SYS_SCHED_GET_PRIORITY_MAX = 4163
+	SYS_SCHED_GET_PRIORITY_MIN = 4164
+	SYS_SCHED_RR_GET_INTERVAL  = 4165
+	SYS_NANOSLEEP              = 4166
+	SYS_MREMAP                 = 4167
+	SYS_ACCEPT                 = 4168
+	SYS_BIND                   = 4169
+	SYS_CONNECT                = 4170
+	SYS_GETPEERNAME            = 4171
+	SYS_GETSOCKNAME            = 4172
+	SYS_GETSOCKOPT             = 4173
+	SYS_LISTEN                 = 4174
+	SYS_RECV                   = 4175
+	SYS_RECVFROM               = 4176
+	SYS_RECVMSG                = 4177
+	SYS_SEND                   = 4178
+	SYS_SENDMSG                = 4179
+	SYS_SENDTO                 = 4180
+	SYS_SETSOCKOPT             = 4181
+	SYS_SHUTDOWN               = 4182
+	SYS_SOCKET                 = 4183
+	SYS_SOCKETPAIR             = 4184
+	SYS_SETRESUID              = 4185
+	SYS_GETRESUID              = 4186
+	SYS_QUERY_MODULE           = 4187
+	SYS_POLL                   = 4188
+	SYS_NFSSERVCTL             = 4189
+	SYS_SETRESGID              = 4190
+	SYS_GETRESGID              = 4191
+	SYS_PRCTL                  = 4192
+	SYS_RT_SIGRETURN           = 4193
+	SYS_RT_SIGACTION           = 4194
+	SYS_RT_SIGPROCMASK         = 4195
+	SYS_RT_SIGPENDING          = 4196
+	SYS_RT_SIGTIMEDWAIT        = 4197
+	SYS_RT_SIGQUEUEINFO        = 4198
+	SYS_RT_SIGSUSPEND          = 4199
+	SYS_PREAD64                = 4200
+	SYS_PWRITE64               = 4201
+	SYS_CHOWN                  = 4202
+	SYS_GETCWD                 = 4203
+	SYS_CAPGET                 = 4204
+	SYS_CAPSET                 = 4205
+	SYS_SIGALTSTACK            = 4206
+	SYS_SENDFILE               = 4207
+	SYS_GETPMSG                = 4208
+	SYS_PUTPMSG                = 4209
+	SYS_MMAP2                  = 4210
+	SYS_TRUNCATE64             = 4211
+	SYS_FTRUNCATE64            = 4212
+	SYS_STAT64                 = 4213
+	SYS_LSTAT64                = 4214
+	SYS_FSTAT64                = 4215
+	SYS_PIVOT_ROOT             = 4216
+	SYS_MINCORE                = 4217
+	SYS_MADVISE                = 4218
+	SYS_GETDENTS64             = 4219
+	SYS_FCNTL64                = 4220
+	SYS_RESERVED221            = 4221
+	SYS_GETTID                 = 4222
+	SYS_READAHEAD              = 4223
+	SYS_SETXATTR               = 4224
+	SYS_LSETXATTR              = 4225
+	SYS_FSETXATTR              = 4226
+	SYS_GETXATTR               = 4227
+	SYS_LGETXATTR              = 4228
+	SYS_FGETXATTR              = 4229
+	SYS_LISTXATTR              = 4230
+	SYS_LLISTXATTR             = 4231
+	SYS_FLISTXATTR             = 4232
+	SYS_REMOVEXATTR            = 4233
+	SYS_LREMOVEXATTR           = 4234
+	SYS_FREMOVEXATTR           = 4235
+	SYS_TKILL                  = 4236
+	SYS_SENDFILE64             = 4237
+	SYS_FUTEX                  = 4238
+	SYS_SCHED_SETAFFINITY      = 4239
+	SYS_SCHED_GETAFFINITY      = 4240
+	SYS_IO_SETUP               = 4241
+	SYS_IO_DESTROY             = 4242
+	SYS_IO_GETEVENTS           = 4243
+	SYS_IO_SUBMIT              = 4244
+	SYS_IO_CANCEL              = 4245
+	SYS_EXIT_GROUP             = 4246
+	SYS_LOOKUP_DCOOKIE         = 4247
+	SYS_EPOLL_CREATE           = 4248
+	SYS_EPOLL_CTL              = 4249
+	SYS_EPOLL_WAIT             = 4250
+	SYS_REMAP_FILE_PAGES       = 4251
+	SYS_SET_TID_ADDRESS        = 4252
+	SYS_RESTART_SYSCALL        = 4253
+	SYS_FADVISE64              = 4254
+	SYS_STATFS64               = 4255
+	SYS_FSTATFS64              = 4256
+	SYS_TIMER_CREATE           = 4257
+	SYS_TIMER_SETTIME          = 4258
+	SYS_TIMER_GETTIME          = 4259
+	SYS_TIMER_GETOVERRUN       = 4260
+	SYS_TIMER_DELETE           = 4261
+	SYS_CLOCK_SETTIME          = 4262
+	SYS_CLOCK_GETTIME          = 4263
+	SYS_CLOCK_GETRES           = 4264
+	SYS_CLOCK_NANOSLEEP        = 4265
+	SYS_TGKILL                 = 4266
+	SYS_UTIMES                 = 4267
+	SYS_MBIND                  = 4268
+	SYS_GET_MEMPOLICY          = 4269
+	SYS_SET_MEMPOLICY          = 4270
+	SYS_MQ_OPEN                = 4271
+	SYS_MQ_UNLINK              = 4272
+	SYS_MQ_TIMEDSEND           = 4273
+	SYS_MQ_TIMEDRECEIVE        = 4274
+	SYS_MQ_NOTIFY              = 4275
+	SYS_MQ_GETSETATTR          = 4276
+	SYS_VSERVER                = 4277
+	SYS_WAITID                 = 4278
+	SYS_ADD_KEY                = 4280
+	SYS_REQUEST_KEY            = 4281
+	SYS_KEYCTL                 = 4282
+	SYS_SET_THREAD_AREA        = 4283
+	SYS_INOTIFY_INIT           = 4284
+	SYS_INOTIFY_ADD_WATCH      = 4285
+	SYS_INOTIFY_RM_WATCH       = 4286
+	SYS_MIGRATE_PAGES          = 4287
+	SYS_OPENAT                 = 4288
+	SYS_MKDIRAT                = 4289
+	SYS_MKNODAT                = 4290
+	SYS_FCHOWNAT               = 4291
+	SYS_FUTIMESAT              = 4292
+	SYS_FSTATAT64              = 4293
+	SYS_UNLINKAT               = 4294
+	SYS_RENAMEAT               = 4295
+	SYS_LINKAT                 = 4296
+	SYS_SYMLINKAT              = 4297
+	SYS_READLINKAT             = 4298
+	SYS_FCHMODAT               = 4299
+	SYS_FACCESSAT              = 4300
+	SYS_PSELECT6               = 4301
+	SYS_PPOLL                  = 4302
+	SYS_UNSHARE                = 4303
+	SYS_SPLICE                 = 4304
+	SYS_SYNC_FILE_RANGE        = 4305
+	SYS_TEE                    = 4306
+	SYS_VMSPLICE               = 4307
+	SYS_MOVE_PAGES             = 4308
+	SYS_SET_ROBUST_LIST        = 4309
+	SYS_GET_ROBUST_LIST        = 4310
+	SYS_KEXEC_LOAD             = 4311
+	SYS_GETCPU                 = 4312
+	SYS_EPOLL_PWAIT            = 4313
+	SYS_IOPRIO_SET             = 4314
+	SYS_IOPRIO_GET             = 4315
+	SYS_UTIMENSAT              = 4316
+	SYS_SIGNALFD               = 4317
+	SYS_TIMERFD                = 4318
+	SYS_EVENTFD                = 4319
+	SYS_FALLOCATE              = 4320
+	SYS_TIMERFD_CREATE         = 4321
+	SYS_TIMERFD_GETTIME        = 4322
+	SYS_TIMERFD_SETTIME        = 4323
+	SYS_SIGNALFD4              = 4324
+	SYS_EVENTFD2               = 4325
+	SYS_EPOLL_CREATE1          = 4326
+	SYS_DUP3                   = 4327
+	SYS_PIPE2                  = 4328
+	SYS_INOTIFY_INIT1          = 4329
+	SYS_PREADV                 = 4330
+	SYS_PWRITEV                = 4331
+	SYS_RT_TGSIGQUEUEINFO      = 4332
+	SYS_PERF_EVENT_OPEN        = 4333
+	SYS_ACCEPT4                = 4334
+	SYS_RECVMMSG               = 4335
+	SYS_FANOTIFY_INIT          = 4336
+	SYS_FANOTIFY_MARK          = 4337
+	SYS_PRLIMIT64              = 4338
+	SYS_NAME_TO_HANDLE_AT      = 4339
+	SYS_OPEN_BY_HANDLE_AT      = 4340
+	SYS_CLOCK_ADJTIME          = 4341
+	SYS_SYNCFS                 = 4342
+	SYS_SENDMMSG               = 4343
+	SYS_SETNS                  = 4344
+	SYS_PROCESS_VM_READV       = 4345
+	SYS_PROCESS_VM_WRITEV      = 4346
+	SYS_KCMP                   = 4347
+	SYS_FINIT_MODULE           = 4348
+	SYS_SCHED_SETATTR          = 4349
+	SYS_SCHED_GETATTR          = 4350
+	SYS_RENAMEAT2              = 4351
+	SYS_SECCOMP                = 4352
+	SYS_GETRANDOM              = 4353
+	SYS_MEMFD_CREATE           = 4354
+	SYS_BPF                    = 4355
+	SYS_EXECVEAT               = 4356
+	SYS_USERFAULTFD            = 4357
+	SYS_MEMBARRIER             = 4358
+	SYS_MLOCK2                 = 4359
+	SYS_COPY_FILE_RANGE        = 4360
+	SYS_PREADV2                = 4361
+	SYS_PWRITEV2               = 4362
+	SYS_PKEY_MPROTECT          = 4363
+	SYS_PKEY_ALLOC             = 4364
+	SYS_PKEY_FREE              = 4365
+	SYS_STATX                  = 4366
+	SYS_RSEQ                   = 4367
+	SYS_IO_PGETEVENTS          = 4368
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
new file mode 100644
index 00000000..1270a1c9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
@@ -0,0 +1,337 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips64,linux
+
+package unix
+
+const (
+	SYS_READ                   = 5000
+	SYS_WRITE                  = 5001
+	SYS_OPEN                   = 5002
+	SYS_CLOSE                  = 5003
+	SYS_STAT                   = 5004
+	SYS_FSTAT                  = 5005
+	SYS_LSTAT                  = 5006
+	SYS_POLL                   = 5007
+	SYS_LSEEK                  = 5008
+	SYS_MMAP                   = 5009
+	SYS_MPROTECT               = 5010
+	SYS_MUNMAP                 = 5011
+	SYS_BRK                    = 5012
+	SYS_RT_SIGACTION           = 5013
+	SYS_RT_SIGPROCMASK         = 5014
+	SYS_IOCTL                  = 5015
+	SYS_PREAD64                = 5016
+	SYS_PWRITE64               = 5017
+	SYS_READV                  = 5018
+	SYS_WRITEV                 = 5019
+	SYS_ACCESS                 = 5020
+	SYS_PIPE                   = 5021
+	SYS__NEWSELECT             = 5022
+	SYS_SCHED_YIELD            = 5023
+	SYS_MREMAP                 = 5024
+	SYS_MSYNC                  = 5025
+	SYS_MINCORE                = 5026
+	SYS_MADVISE                = 5027
+	SYS_SHMGET                 = 5028
+	SYS_SHMAT                  = 5029
+	SYS_SHMCTL                 = 5030
+	SYS_DUP                    = 5031
+	SYS_DUP2                   = 5032
+	SYS_PAUSE                  = 5033
+	SYS_NANOSLEEP              = 5034
+	SYS_GETITIMER              = 5035
+	SYS_SETITIMER              = 5036
+	SYS_ALARM                  = 5037
+	SYS_GETPID                 = 5038
+	SYS_SENDFILE               = 5039
+	SYS_SOCKET                 = 5040
+	SYS_CONNECT                = 5041
+	SYS_ACCEPT                 = 5042
+	SYS_SENDTO                 = 5043
+	SYS_RECVFROM               = 5044
+	SYS_SENDMSG                = 5045
+	SYS_RECVMSG                = 5046
+	SYS_SHUTDOWN               = 5047
+	SYS_BIND                   = 5048
+	SYS_LISTEN                 = 5049
+	SYS_GETSOCKNAME            = 5050
+	SYS_GETPEERNAME            = 5051
+	SYS_SOCKETPAIR             = 5052
+	SYS_SETSOCKOPT             = 5053
+	SYS_GETSOCKOPT             = 5054
+	SYS_CLONE                  = 5055
+	SYS_FORK                   = 5056
+	SYS_EXECVE                 = 5057
+	SYS_EXIT                   = 5058
+	SYS_WAIT4                  = 5059
+	SYS_KILL                   = 5060
+	SYS_UNAME                  = 5061
+	SYS_SEMGET                 = 5062
+	SYS_SEMOP                  = 5063
+	SYS_SEMCTL                 = 5064
+	SYS_SHMDT                  = 5065
+	SYS_MSGGET                 = 5066
+	SYS_MSGSND                 = 5067
+	SYS_MSGRCV                 = 5068
+	SYS_MSGCTL                 = 5069
+	SYS_FCNTL                  = 5070
+	SYS_FLOCK                  = 5071
+	SYS_FSYNC                  = 5072
+	SYS_FDATASYNC              = 5073
+	SYS_TRUNCATE               = 5074
+	SYS_FTRUNCATE              = 5075
+	SYS_GETDENTS               = 5076
+	SYS_GETCWD                 = 5077
+	SYS_CHDIR                  = 5078
+	SYS_FCHDIR                 = 5079
+	SYS_RENAME                 = 5080
+	SYS_MKDIR                  = 5081
+	SYS_RMDIR                  = 5082
+	SYS_CREAT                  = 5083
+	SYS_LINK                   = 5084
+	SYS_UNLINK                 = 5085
+	SYS_SYMLINK                = 5086
+	SYS_READLINK               = 5087
+	SYS_CHMOD                  = 5088
+	SYS_FCHMOD                 = 5089
+	SYS_CHOWN                  = 5090
+	SYS_FCHOWN                 = 5091
+	SYS_LCHOWN                 = 5092
+	SYS_UMASK                  = 5093
+	SYS_GETTIMEOFDAY           = 5094
+	SYS_GETRLIMIT              = 5095
+	SYS_GETRUSAGE              = 5096
+	SYS_SYSINFO                = 5097
+	SYS_TIMES                  = 5098
+	SYS_PTRACE                 = 5099
+	SYS_GETUID                 = 5100
+	SYS_SYSLOG                 = 5101
+	SYS_GETGID                 = 5102
+	SYS_SETUID                 = 5103
+	SYS_SETGID                 = 5104
+	SYS_GETEUID                = 5105
+	SYS_GETEGID                = 5106
+	SYS_SETPGID                = 5107
+	SYS_GETPPID                = 5108
+	SYS_GETPGRP                = 5109
+	SYS_SETSID                 = 5110
+	SYS_SETREUID               = 5111
+	SYS_SETREGID               = 5112
+	SYS_GETGROUPS              = 5113
+	SYS_SETGROUPS              = 5114
+	SYS_SETRESUID              = 5115
+	SYS_GETRESUID              = 5116
+	SYS_SETRESGID              = 5117
+	SYS_GETRESGID              = 5118
+	SYS_GETPGID                = 5119
+	SYS_SETFSUID               = 5120
+	SYS_SETFSGID               = 5121
+	SYS_GETSID                 = 5122
+	SYS_CAPGET                 = 5123
+	SYS_CAPSET                 = 5124
+	SYS_RT_SIGPENDING          = 5125
+	SYS_RT_SIGTIMEDWAIT        = 5126
+	SYS_RT_SIGQUEUEINFO        = 5127
+	SYS_RT_SIGSUSPEND          = 5128
+	SYS_SIGALTSTACK            = 5129
+	SYS_UTIME                  = 5130
+	SYS_MKNOD                  = 5131
+	SYS_PERSONALITY            = 5132
+	SYS_USTAT                  = 5133
+	SYS_STATFS                 = 5134
+	SYS_FSTATFS                = 5135
+	SYS_SYSFS                  = 5136
+	SYS_GETPRIORITY            = 5137
+	SYS_SETPRIORITY            = 5138
+	SYS_SCHED_SETPARAM         = 5139
+	SYS_SCHED_GETPARAM         = 5140
+	SYS_SCHED_SETSCHEDULER     = 5141
+	SYS_SCHED_GETSCHEDULER     = 5142
+	SYS_SCHED_GET_PRIORITY_MAX = 5143
+	SYS_SCHED_GET_PRIORITY_MIN = 5144
+	SYS_SCHED_RR_GET_INTERVAL  = 5145
+	SYS_MLOCK                  = 5146
+	SYS_MUNLOCK                = 5147
+	SYS_MLOCKALL               = 5148
+	SYS_MUNLOCKALL             = 5149
+	SYS_VHANGUP                = 5150
+	SYS_PIVOT_ROOT             = 5151
+	SYS__SYSCTL                = 5152
+	SYS_PRCTL                  = 5153
+	SYS_ADJTIMEX               = 5154
+	SYS_SETRLIMIT              = 5155
+	SYS_CHROOT                 = 5156
+	SYS_SYNC                   = 5157
+	SYS_ACCT                   = 5158
+	SYS_SETTIMEOFDAY           = 5159
+	SYS_MOUNT                  = 5160
+	SYS_UMOUNT2                = 5161
+	SYS_SWAPON                 = 5162
+	SYS_SWAPOFF                = 5163
+	SYS_REBOOT                 = 5164
+	SYS_SETHOSTNAME            = 5165
+	SYS_SETDOMAINNAME          = 5166
+	SYS_CREATE_MODULE          = 5167
+	SYS_INIT_MODULE            = 5168
+	SYS_DELETE_MODULE          = 5169
+	SYS_GET_KERNEL_SYMS        = 5170
+	SYS_QUERY_MODULE           = 5171
+	SYS_QUOTACTL               = 5172
+	SYS_NFSSERVCTL             = 5173
+	SYS_GETPMSG                = 5174
+	SYS_PUTPMSG                = 5175
+	SYS_AFS_SYSCALL            = 5176
+	SYS_RESERVED177            = 5177
+	SYS_GETTID                 = 5178
+	SYS_READAHEAD              = 5179
+	SYS_SETXATTR               = 5180
+	SYS_LSETXATTR              = 5181
+	SYS_FSETXATTR              = 5182
+	SYS_GETXATTR               = 5183
+	SYS_LGETXATTR              = 5184
+	SYS_FGETXATTR              = 5185
+	SYS_LISTXATTR              = 5186
+	SYS_LLISTXATTR             = 5187
+	SYS_FLISTXATTR             = 5188
+	SYS_REMOVEXATTR            = 5189
+	SYS_LREMOVEXATTR           = 5190
+	SYS_FREMOVEXATTR           = 5191
+	SYS_TKILL                  = 5192
+	SYS_RESERVED193            = 5193
+	SYS_FUTEX                  = 5194
+	SYS_SCHED_SETAFFINITY      = 5195
+	SYS_SCHED_GETAFFINITY      = 5196
+	SYS_CACHEFLUSH             = 5197
+	SYS_CACHECTL               = 5198
+	SYS_SYSMIPS                = 5199
+	SYS_IO_SETUP               = 5200
+	SYS_IO_DESTROY             = 5201
+	SYS_IO_GETEVENTS           = 5202
+	SYS_IO_SUBMIT              = 5203
+	SYS_IO_CANCEL              = 5204
+	SYS_EXIT_GROUP             = 5205
+	SYS_LOOKUP_DCOOKIE         = 5206
+	SYS_EPOLL_CREATE           = 5207
+	SYS_EPOLL_CTL              = 5208
+	SYS_EPOLL_WAIT             = 5209
+	SYS_REMAP_FILE_PAGES       = 5210
+	SYS_RT_SIGRETURN           = 5211
+	SYS_SET_TID_ADDRESS        = 5212
+	SYS_RESTART_SYSCALL        = 5213
+	SYS_SEMTIMEDOP             = 5214
+	SYS_FADVISE64              = 5215
+	SYS_TIMER_CREATE           = 5216
+	SYS_TIMER_SETTIME          = 5217
+	SYS_TIMER_GETTIME          = 5218
+	SYS_TIMER_GETOVERRUN       = 5219
+	SYS_TIMER_DELETE           = 5220
+	SYS_CLOCK_SETTIME          = 5221
+	SYS_CLOCK_GETTIME          = 5222
+	SYS_CLOCK_GETRES           = 5223
+	SYS_CLOCK_NANOSLEEP        = 5224
+	SYS_TGKILL                 = 5225
+	SYS_UTIMES                 = 5226
+	SYS_MBIND                  = 5227
+	SYS_GET_MEMPOLICY          = 5228
+	SYS_SET_MEMPOLICY          = 5229
+	SYS_MQ_OPEN                = 5230
+	SYS_MQ_UNLINK              = 5231
+	SYS_MQ_TIMEDSEND           = 5232
+	SYS_MQ_TIMEDRECEIVE        = 5233
+	SYS_MQ_NOTIFY              = 5234
+	SYS_MQ_GETSETATTR          = 5235
+	SYS_VSERVER                = 5236
+	SYS_WAITID                 = 5237
+	SYS_ADD_KEY                = 5239
+	SYS_REQUEST_KEY            = 5240
+	SYS_KEYCTL                 = 5241
+	SYS_SET_THREAD_AREA        = 5242
+	SYS_INOTIFY_INIT           = 5243
+	SYS_INOTIFY_ADD_WATCH      = 5244
+	SYS_INOTIFY_RM_WATCH       = 5245
+	SYS_MIGRATE_PAGES          = 5246
+	SYS_OPENAT                 = 5247
+	SYS_MKDIRAT                = 5248
+	SYS_MKNODAT                = 5249
+	SYS_FCHOWNAT               = 5250
+	SYS_FUTIMESAT              = 5251
+	SYS_NEWFSTATAT             = 5252
+	SYS_UNLINKAT               = 5253
+	SYS_RENAMEAT               = 5254
+	SYS_LINKAT                 = 5255
+	SYS_SYMLINKAT              = 5256
+	SYS_READLINKAT             = 5257
+	SYS_FCHMODAT               = 5258
+	SYS_FACCESSAT              = 5259
+	SYS_PSELECT6               = 5260
+	SYS_PPOLL                  = 5261
+	SYS_UNSHARE                = 5262
+	SYS_SPLICE                 = 5263
+	SYS_SYNC_FILE_RANGE        = 5264
+	SYS_TEE                    = 5265
+	SYS_VMSPLICE               = 5266
+	SYS_MOVE_PAGES             = 5267
+	SYS_SET_ROBUST_LIST        = 5268
+	SYS_GET_ROBUST_LIST        = 5269
+	SYS_KEXEC_LOAD             = 5270
+	SYS_GETCPU                 = 5271
+	SYS_EPOLL_PWAIT            = 5272
+	SYS_IOPRIO_SET             = 5273
+	SYS_IOPRIO_GET             = 5274
+	SYS_UTIMENSAT              = 5275
+	SYS_SIGNALFD               = 5276
+	SYS_TIMERFD                = 5277
+	SYS_EVENTFD                = 5278
+	SYS_FALLOCATE              = 5279
+	SYS_TIMERFD_CREATE         = 5280
+	SYS_TIMERFD_GETTIME        = 5281
+	SYS_TIMERFD_SETTIME        = 5282
+	SYS_SIGNALFD4              = 5283
+	SYS_EVENTFD2               = 5284
+	SYS_EPOLL_CREATE1          = 5285
+	SYS_DUP3                   = 5286
+	SYS_PIPE2                  = 5287
+	SYS_INOTIFY_INIT1          = 5288
+	SYS_PREADV                 = 5289
+	SYS_PWRITEV                = 5290
+	SYS_RT_TGSIGQUEUEINFO      = 5291
+	SYS_PERF_EVENT_OPEN        = 5292
+	SYS_ACCEPT4                = 5293
+	SYS_RECVMMSG               = 5294
+	SYS_FANOTIFY_INIT          = 5295
+	SYS_FANOTIFY_MARK          = 5296
+	SYS_PRLIMIT64              = 5297
+	SYS_NAME_TO_HANDLE_AT      = 5298
+	SYS_OPEN_BY_HANDLE_AT      = 5299
+	SYS_CLOCK_ADJTIME          = 5300
+	SYS_SYNCFS                 = 5301
+	SYS_SENDMMSG               = 5302
+	SYS_SETNS                  = 5303
+	SYS_PROCESS_VM_READV       = 5304
+	SYS_PROCESS_VM_WRITEV      = 5305
+	SYS_KCMP                   = 5306
+	SYS_FINIT_MODULE           = 5307
+	SYS_GETDENTS64             = 5308
+	SYS_SCHED_SETATTR          = 5309
+	SYS_SCHED_GETATTR          = 5310
+	SYS_RENAMEAT2              = 5311
+	SYS_SECCOMP                = 5312
+	SYS_GETRANDOM              = 5313
+	SYS_MEMFD_CREATE           = 5314
+	SYS_BPF                    = 5315
+	SYS_EXECVEAT               = 5316
+	SYS_USERFAULTFD            = 5317
+	SYS_MEMBARRIER             = 5318
+	SYS_MLOCK2                 = 5319
+	SYS_COPY_FILE_RANGE        = 5320
+	SYS_PREADV2                = 5321
+	SYS_PWRITEV2               = 5322
+	SYS_PKEY_MPROTECT          = 5323
+	SYS_PKEY_ALLOC             = 5324
+	SYS_PKEY_FREE              = 5325
+	SYS_STATX                  = 5326
+	SYS_RSEQ                   = 5327
+	SYS_IO_PGETEVENTS          = 5328
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
new file mode 100644
index 00000000..93980be1
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
@@ -0,0 +1,337 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips64le,linux
+
+package unix
+
+const (
+	SYS_READ                   = 5000
+	SYS_WRITE                  = 5001
+	SYS_OPEN                   = 5002
+	SYS_CLOSE                  = 5003
+	SYS_STAT                   = 5004
+	SYS_FSTAT                  = 5005
+	SYS_LSTAT                  = 5006
+	SYS_POLL                   = 5007
+	SYS_LSEEK                  = 5008
+	SYS_MMAP                   = 5009
+	SYS_MPROTECT               = 5010
+	SYS_MUNMAP                 = 5011
+	SYS_BRK                    = 5012
+	SYS_RT_SIGACTION           = 5013
+	SYS_RT_SIGPROCMASK         = 5014
+	SYS_IOCTL                  = 5015
+	SYS_PREAD64                = 5016
+	SYS_PWRITE64               = 5017
+	SYS_READV                  = 5018
+	SYS_WRITEV                 = 5019
+	SYS_ACCESS                 = 5020
+	SYS_PIPE                   = 5021
+	SYS__NEWSELECT             = 5022
+	SYS_SCHED_YIELD            = 5023
+	SYS_MREMAP                 = 5024
+	SYS_MSYNC                  = 5025
+	SYS_MINCORE                = 5026
+	SYS_MADVISE                = 5027
+	SYS_SHMGET                 = 5028
+	SYS_SHMAT                  = 5029
+	SYS_SHMCTL                 = 5030
+	SYS_DUP                    = 5031
+	SYS_DUP2                   = 5032
+	SYS_PAUSE                  = 5033
+	SYS_NANOSLEEP              = 5034
+	SYS_GETITIMER              = 5035
+	SYS_SETITIMER              = 5036
+	SYS_ALARM                  = 5037
+	SYS_GETPID                 = 5038
+	SYS_SENDFILE               = 5039
+	SYS_SOCKET                 = 5040
+	SYS_CONNECT                = 5041
+	SYS_ACCEPT                 = 5042
+	SYS_SENDTO                 = 5043
+	SYS_RECVFROM               = 5044
+	SYS_SENDMSG                = 5045
+	SYS_RECVMSG                = 5046
+	SYS_SHUTDOWN               = 5047
+	SYS_BIND                   = 5048
+	SYS_LISTEN                 = 5049
+	SYS_GETSOCKNAME            = 5050
+	SYS_GETPEERNAME            = 5051
+	SYS_SOCKETPAIR             = 5052
+	SYS_SETSOCKOPT             = 5053
+	SYS_GETSOCKOPT             = 5054
+	SYS_CLONE                  = 5055
+	SYS_FORK                   = 5056
+	SYS_EXECVE                 = 5057
+	SYS_EXIT                   = 5058
+	SYS_WAIT4                  = 5059
+	SYS_KILL                   = 5060
+	SYS_UNAME                  = 5061
+	SYS_SEMGET                 = 5062
+	SYS_SEMOP                  = 5063
+	SYS_SEMCTL                 = 5064
+	SYS_SHMDT                  = 5065
+	SYS_MSGGET                 = 5066
+	SYS_MSGSND                 = 5067
+	SYS_MSGRCV                 = 5068
+	SYS_MSGCTL                 = 5069
+	SYS_FCNTL                  = 5070
+	SYS_FLOCK                  = 5071
+	SYS_FSYNC                  = 5072
+	SYS_FDATASYNC              = 5073
+	SYS_TRUNCATE               = 5074
+	SYS_FTRUNCATE              = 5075
+	SYS_GETDENTS               = 5076
+	SYS_GETCWD                 = 5077
+	SYS_CHDIR                  = 5078
+	SYS_FCHDIR                 = 5079
+	SYS_RENAME                 = 5080
+	SYS_MKDIR                  = 5081
+	SYS_RMDIR                  = 5082
+	SYS_CREAT                  = 5083
+	SYS_LINK                   = 5084
+	SYS_UNLINK                 = 5085
+	SYS_SYMLINK                = 5086
+	SYS_READLINK               = 5087
+	SYS_CHMOD                  = 5088
+	SYS_FCHMOD                 = 5089
+	SYS_CHOWN                  = 5090
+	SYS_FCHOWN                 = 5091
+	SYS_LCHOWN                 = 5092
+	SYS_UMASK                  = 5093
+	SYS_GETTIMEOFDAY           = 5094
+	SYS_GETRLIMIT              = 5095
+	SYS_GETRUSAGE              = 5096
+	SYS_SYSINFO                = 5097
+	SYS_TIMES                  = 5098
+	SYS_PTRACE                 = 5099
+	SYS_GETUID                 = 5100
+	SYS_SYSLOG                 = 5101
+	SYS_GETGID                 = 5102
+	SYS_SETUID                 = 5103
+	SYS_SETGID                 = 5104
+	SYS_GETEUID                = 5105
+	SYS_GETEGID                = 5106
+	SYS_SETPGID                = 5107
+	SYS_GETPPID                = 5108
+	SYS_GETPGRP                = 5109
+	SYS_SETSID                 = 5110
+	SYS_SETREUID               = 5111
+	SYS_SETREGID               = 5112
+	SYS_GETGROUPS              = 5113
+	SYS_SETGROUPS              = 5114
+	SYS_SETRESUID              = 5115
+	SYS_GETRESUID              = 5116
+	SYS_SETRESGID              = 5117
+	SYS_GETRESGID              = 5118
+	SYS_GETPGID                = 5119
+	SYS_SETFSUID               = 5120
+	SYS_SETFSGID               = 5121
+	SYS_GETSID                 = 5122
+	SYS_CAPGET                 = 5123
+	SYS_CAPSET                 = 5124
+	SYS_RT_SIGPENDING          = 5125
+	SYS_RT_SIGTIMEDWAIT        = 5126
+	SYS_RT_SIGQUEUEINFO        = 5127
+	SYS_RT_SIGSUSPEND          = 5128
+	SYS_SIGALTSTACK            = 5129
+	SYS_UTIME                  = 5130
+	SYS_MKNOD                  = 5131
+	SYS_PERSONALITY            = 5132
+	SYS_USTAT                  = 5133
+	SYS_STATFS                 = 5134
+	SYS_FSTATFS                = 5135
+	SYS_SYSFS                  = 5136
+	SYS_GETPRIORITY            = 5137
+	SYS_SETPRIORITY            = 5138
+	SYS_SCHED_SETPARAM         = 5139
+	SYS_SCHED_GETPARAM         = 5140
+	SYS_SCHED_SETSCHEDULER     = 5141
+	SYS_SCHED_GETSCHEDULER     = 5142
+	SYS_SCHED_GET_PRIORITY_MAX = 5143
+	SYS_SCHED_GET_PRIORITY_MIN = 5144
+	SYS_SCHED_RR_GET_INTERVAL  = 5145
+	SYS_MLOCK                  = 5146
+	SYS_MUNLOCK                = 5147
+	SYS_MLOCKALL               = 5148
+	SYS_MUNLOCKALL             = 5149
+	SYS_VHANGUP                = 5150
+	SYS_PIVOT_ROOT             = 5151
+	SYS__SYSCTL                = 5152
+	SYS_PRCTL                  = 5153
+	SYS_ADJTIMEX               = 5154
+	SYS_SETRLIMIT              = 5155
+	SYS_CHROOT                 = 5156
+	SYS_SYNC                   = 5157
+	SYS_ACCT                   = 5158
+	SYS_SETTIMEOFDAY           = 5159
+	SYS_MOUNT                  = 5160
+	SYS_UMOUNT2                = 5161
+	SYS_SWAPON                 = 5162
+	SYS_SWAPOFF                = 5163
+	SYS_REBOOT                 = 5164
+	SYS_SETHOSTNAME            = 5165
+	SYS_SETDOMAINNAME          = 5166
+	SYS_CREATE_MODULE          = 5167
+	SYS_INIT_MODULE            = 5168
+	SYS_DELETE_MODULE          = 5169
+	SYS_GET_KERNEL_SYMS        = 5170
+	SYS_QUERY_MODULE           = 5171
+	SYS_QUOTACTL               = 5172
+	SYS_NFSSERVCTL             = 5173
+	SYS_GETPMSG                = 5174
+	SYS_PUTPMSG                = 5175
+	SYS_AFS_SYSCALL            = 5176
+	SYS_RESERVED177            = 5177
+	SYS_GETTID                 = 5178
+	SYS_READAHEAD              = 5179
+	SYS_SETXATTR               = 5180
+	SYS_LSETXATTR              = 5181
+	SYS_FSETXATTR              = 5182
+	SYS_GETXATTR               = 5183
+	SYS_LGETXATTR              = 5184
+	SYS_FGETXATTR              = 5185
+	SYS_LISTXATTR              = 5186
+	SYS_LLISTXATTR             = 5187
+	SYS_FLISTXATTR             = 5188
+	SYS_REMOVEXATTR            = 5189
+	SYS_LREMOVEXATTR           = 5190
+	SYS_FREMOVEXATTR           = 5191
+	SYS_TKILL                  = 5192
+	SYS_RESERVED193            = 5193
+	SYS_FUTEX                  = 5194
+	SYS_SCHED_SETAFFINITY      = 5195
+	SYS_SCHED_GETAFFINITY      = 5196
+	SYS_CACHEFLUSH             = 5197
+	SYS_CACHECTL               = 5198
+	SYS_SYSMIPS                = 5199
+	SYS_IO_SETUP               = 5200
+	SYS_IO_DESTROY             = 5201
+	SYS_IO_GETEVENTS           = 5202
+	SYS_IO_SUBMIT              = 5203
+	SYS_IO_CANCEL              = 5204
+	SYS_EXIT_GROUP             = 5205
+	SYS_LOOKUP_DCOOKIE         = 5206
+	SYS_EPOLL_CREATE           = 5207
+	SYS_EPOLL_CTL              = 5208
+	SYS_EPOLL_WAIT             = 5209
+	SYS_REMAP_FILE_PAGES       = 5210
+	SYS_RT_SIGRETURN           = 5211
+	SYS_SET_TID_ADDRESS        = 5212
+	SYS_RESTART_SYSCALL        = 5213
+	SYS_SEMTIMEDOP             = 5214
+	SYS_FADVISE64              = 5215
+	SYS_TIMER_CREATE           = 5216
+	SYS_TIMER_SETTIME          = 5217
+	SYS_TIMER_GETTIME          = 5218
+	SYS_TIMER_GETOVERRUN       = 5219
+	SYS_TIMER_DELETE           = 5220
+	SYS_CLOCK_SETTIME          = 5221
+	SYS_CLOCK_GETTIME          = 5222
+	SYS_CLOCK_GETRES           = 5223
+	SYS_CLOCK_NANOSLEEP        = 5224
+	SYS_TGKILL                 = 5225
+	SYS_UTIMES                 = 5226
+	SYS_MBIND                  = 5227
+	SYS_GET_MEMPOLICY          = 5228
+	SYS_SET_MEMPOLICY          = 5229
+	SYS_MQ_OPEN                = 5230
+	SYS_MQ_UNLINK              = 5231
+	SYS_MQ_TIMEDSEND           = 5232
+	SYS_MQ_TIMEDRECEIVE        = 5233
+	SYS_MQ_NOTIFY              = 5234
+	SYS_MQ_GETSETATTR          = 5235
+	SYS_VSERVER                = 5236
+	SYS_WAITID                 = 5237
+	SYS_ADD_KEY                = 5239
+	SYS_REQUEST_KEY            = 5240
+	SYS_KEYCTL                 = 5241
+	SYS_SET_THREAD_AREA        = 5242
+	SYS_INOTIFY_INIT           = 5243
+	SYS_INOTIFY_ADD_WATCH      = 5244
+	SYS_INOTIFY_RM_WATCH       = 5245
+	SYS_MIGRATE_PAGES          = 5246
+	SYS_OPENAT                 = 5247
+	SYS_MKDIRAT                = 5248
+	SYS_MKNODAT                = 5249
+	SYS_FCHOWNAT               = 5250
+	SYS_FUTIMESAT              = 5251
+	SYS_NEWFSTATAT             = 5252
+	SYS_UNLINKAT               = 5253
+	SYS_RENAMEAT               = 5254
+	SYS_LINKAT                 = 5255
+	SYS_SYMLINKAT              = 5256
+	SYS_READLINKAT             = 5257
+	SYS_FCHMODAT               = 5258
+	SYS_FACCESSAT              = 5259
+	SYS_PSELECT6               = 5260
+	SYS_PPOLL                  = 5261
+	SYS_UNSHARE                = 5262
+	SYS_SPLICE                 = 5263
+	SYS_SYNC_FILE_RANGE        = 5264
+	SYS_TEE                    = 5265
+	SYS_VMSPLICE               = 5266
+	SYS_MOVE_PAGES             = 5267
+	SYS_SET_ROBUST_LIST        = 5268
+	SYS_GET_ROBUST_LIST        = 5269
+	SYS_KEXEC_LOAD             = 5270
+	SYS_GETCPU                 = 5271
+	SYS_EPOLL_PWAIT            = 5272
+	SYS_IOPRIO_SET             = 5273
+	SYS_IOPRIO_GET             = 5274
+	SYS_UTIMENSAT              = 5275
+	SYS_SIGNALFD               = 5276
+	SYS_TIMERFD                = 5277
+	SYS_EVENTFD                = 5278
+	SYS_FALLOCATE              = 5279
+	SYS_TIMERFD_CREATE         = 5280
+	SYS_TIMERFD_GETTIME        = 5281
+	SYS_TIMERFD_SETTIME        = 5282
+	SYS_SIGNALFD4              = 5283
+	SYS_EVENTFD2               = 5284
+	SYS_EPOLL_CREATE1          = 5285
+	SYS_DUP3                   = 5286
+	SYS_PIPE2                  = 5287
+	SYS_INOTIFY_INIT1          = 5288
+	SYS_PREADV                 = 5289
+	SYS_PWRITEV                = 5290
+	SYS_RT_TGSIGQUEUEINFO      = 5291
+	SYS_PERF_EVENT_OPEN        = 5292
+	SYS_ACCEPT4                = 5293
+	SYS_RECVMMSG               = 5294
+	SYS_FANOTIFY_INIT          = 5295
+	SYS_FANOTIFY_MARK          = 5296
+	SYS_PRLIMIT64              = 5297
+	SYS_NAME_TO_HANDLE_AT      = 5298
+	SYS_OPEN_BY_HANDLE_AT      = 5299
+	SYS_CLOCK_ADJTIME          = 5300
+	SYS_SYNCFS                 = 5301
+	SYS_SENDMMSG               = 5302
+	SYS_SETNS                  = 5303
+	SYS_PROCESS_VM_READV       = 5304
+	SYS_PROCESS_VM_WRITEV      = 5305
+	SYS_KCMP                   = 5306
+	SYS_FINIT_MODULE           = 5307
+	SYS_GETDENTS64             = 5308
+	SYS_SCHED_SETATTR          = 5309
+	SYS_SCHED_GETATTR          = 5310
+	SYS_RENAMEAT2              = 5311
+	SYS_SECCOMP                = 5312
+	SYS_GETRANDOM              = 5313
+	SYS_MEMFD_CREATE           = 5314
+	SYS_BPF                    = 5315
+	SYS_EXECVEAT               = 5316
+	SYS_USERFAULTFD            = 5317
+	SYS_MEMBARRIER             = 5318
+	SYS_MLOCK2                 = 5319
+	SYS_COPY_FILE_RANGE        = 5320
+	SYS_PREADV2                = 5321
+	SYS_PWRITEV2               = 5322
+	SYS_PKEY_MPROTECT          = 5323
+	SYS_PKEY_ALLOC             = 5324
+	SYS_PKEY_FREE              = 5325
+	SYS_STATX                  = 5326
+	SYS_RSEQ                   = 5327
+	SYS_IO_PGETEVENTS          = 5328
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
new file mode 100644
index 00000000..0fc77261
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
@@ -0,0 +1,377 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mipsle,linux
+
+package unix
+
+const (
+	SYS_SYSCALL                = 4000
+	SYS_EXIT                   = 4001
+	SYS_FORK                   = 4002
+	SYS_READ                   = 4003
+	SYS_WRITE                  = 4004
+	SYS_OPEN                   = 4005
+	SYS_CLOSE                  = 4006
+	SYS_WAITPID                = 4007
+	SYS_CREAT                  = 4008
+	SYS_LINK                   = 4009
+	SYS_UNLINK                 = 4010
+	SYS_EXECVE                 = 4011
+	SYS_CHDIR                  = 4012
+	SYS_TIME                   = 4013
+	SYS_MKNOD                  = 4014
+	SYS_CHMOD                  = 4015
+	SYS_LCHOWN                 = 4016
+	SYS_BREAK                  = 4017
+	SYS_UNUSED18               = 4018
+	SYS_LSEEK                  = 4019
+	SYS_GETPID                 = 4020
+	SYS_MOUNT                  = 4021
+	SYS_UMOUNT                 = 4022
+	SYS_SETUID                 = 4023
+	SYS_GETUID                 = 4024
+	SYS_STIME                  = 4025
+	SYS_PTRACE                 = 4026
+	SYS_ALARM                  = 4027
+	SYS_UNUSED28               = 4028
+	SYS_PAUSE                  = 4029
+	SYS_UTIME                  = 4030
+	SYS_STTY                   = 4031
+	SYS_GTTY                   = 4032
+	SYS_ACCESS                 = 4033
+	SYS_NICE                   = 4034
+	SYS_FTIME                  = 4035
+	SYS_SYNC                   = 4036
+	SYS_KILL                   = 4037
+	SYS_RENAME                 = 4038
+	SYS_MKDIR                  = 4039
+	SYS_RMDIR                  = 4040
+	SYS_DUP                    = 4041
+	SYS_PIPE                   = 4042
+	SYS_TIMES                  = 4043
+	SYS_PROF                   = 4044
+	SYS_BRK                    = 4045
+	SYS_SETGID                 = 4046
+	SYS_GETGID                 = 4047
+	SYS_SIGNAL                 = 4048
+	SYS_GETEUID                = 4049
+	SYS_GETEGID                = 4050
+	SYS_ACCT                   = 4051
+	SYS_UMOUNT2                = 4052
+	SYS_LOCK                   = 4053
+	SYS_IOCTL                  = 4054
+	SYS_FCNTL                  = 4055
+	SYS_MPX                    = 4056
+	SYS_SETPGID                = 4057
+	SYS_ULIMIT                 = 4058
+	SYS_UNUSED59               = 4059
+	SYS_UMASK                  = 4060
+	SYS_CHROOT                 = 4061
+	SYS_USTAT                  = 4062
+	SYS_DUP2                   = 4063
+	SYS_GETPPID                = 4064
+	SYS_GETPGRP                = 4065
+	SYS_SETSID                 = 4066
+	SYS_SIGACTION              = 4067
+	SYS_SGETMASK               = 4068
+	SYS_SSETMASK               = 4069
+	SYS_SETREUID               = 4070
+	SYS_SETREGID               = 4071
+	SYS_SIGSUSPEND             = 4072
+	SYS_SIGPENDING             = 4073
+	SYS_SETHOSTNAME            = 4074
+	SYS_SETRLIMIT              = 4075
+	SYS_GETRLIMIT              = 4076
+	SYS_GETRUSAGE              = 4077
+	SYS_GETTIMEOFDAY           = 4078
+	SYS_SETTIMEOFDAY           = 4079
+	SYS_GETGROUPS              = 4080
+	SYS_SETGROUPS              = 4081
+	SYS_RESERVED82             = 4082
+	SYS_SYMLINK                = 4083
+	SYS_UNUSED84               = 4084
+	SYS_READLINK               = 4085
+	SYS_USELIB                 = 4086
+	SYS_SWAPON                 = 4087
+	SYS_REBOOT                 = 4088
+	SYS_READDIR                = 4089
+	SYS_MMAP                   = 4090
+	SYS_MUNMAP                 = 4091
+	SYS_TRUNCATE               = 4092
+	SYS_FTRUNCATE              = 4093
+	SYS_FCHMOD                 = 4094
+	SYS_FCHOWN                 = 4095
+	SYS_GETPRIORITY            = 4096
+	SYS_SETPRIORITY            = 4097
+	SYS_PROFIL                 = 4098
+	SYS_STATFS                 = 4099
+	SYS_FSTATFS                = 4100
+	SYS_IOPERM                 = 4101
+	SYS_SOCKETCALL             = 4102
+	SYS_SYSLOG                 = 4103
+	SYS_SETITIMER              = 4104
+	SYS_GETITIMER              = 4105
+	SYS_STAT                   = 4106
+	SYS_LSTAT                  = 4107
+	SYS_FSTAT                  = 4108
+	SYS_UNUSED109              = 4109
+	SYS_IOPL                   = 4110
+	SYS_VHANGUP                = 4111
+	SYS_IDLE                   = 4112
+	SYS_VM86                   = 4113
+	SYS_WAIT4                  = 4114
+	SYS_SWAPOFF                = 4115
+	SYS_SYSINFO                = 4116
+	SYS_IPC                    = 4117
+	SYS_FSYNC                  = 4118
+	SYS_SIGRETURN              = 4119
+	SYS_CLONE                  = 4120
+	SYS_SETDOMAINNAME          = 4121
+	SYS_UNAME                  = 4122
+	SYS_MODIFY_LDT             = 4123
+	SYS_ADJTIMEX               = 4124
+	SYS_MPROTECT               = 4125
+	SYS_SIGPROCMASK            = 4126
+	SYS_CREATE_MODULE          = 4127
+	SYS_INIT_MODULE            = 4128
+	SYS_DELETE_MODULE          = 4129
+	SYS_GET_KERNEL_SYMS        = 4130
+	SYS_QUOTACTL               = 4131
+	SYS_GETPGID                = 4132
+	SYS_FCHDIR                 = 4133
+	SYS_BDFLUSH                = 4134
+	SYS_SYSFS                  = 4135
+	SYS_PERSONALITY            = 4136
+	SYS_AFS_SYSCALL            = 4137
+	SYS_SETFSUID               = 4138
+	SYS_SETFSGID               = 4139
+	SYS__LLSEEK                = 4140
+	SYS_GETDENTS               = 4141
+	SYS__NEWSELECT             = 4142
+	SYS_FLOCK                  = 4143
+	SYS_MSYNC                  = 4144
+	SYS_READV                  = 4145
+	SYS_WRITEV                 = 4146
+	SYS_CACHEFLUSH             = 4147
+	SYS_CACHECTL               = 4148
+	SYS_SYSMIPS                = 4149
+	SYS_UNUSED150              = 4150
+	SYS_GETSID                 = 4151
+	SYS_FDATASYNC              = 4152
+	SYS__SYSCTL                = 4153
+	SYS_MLOCK                  = 4154
+	SYS_MUNLOCK                = 4155
+	SYS_MLOCKALL               = 4156
+	SYS_MUNLOCKALL             = 4157
+	SYS_SCHED_SETPARAM         = 4158
+	SYS_SCHED_GETPARAM         = 4159
+	SYS_SCHED_SETSCHEDULER     = 4160
+	SYS_SCHED_GETSCHEDULER     = 4161
+	SYS_SCHED_YIELD            = 4162
+	SYS_SCHED_GET_PRIORITY_MAX = 4163
+	SYS_SCHED_GET_PRIORITY_MIN = 4164
+	SYS_SCHED_RR_GET_INTERVAL  = 4165
+	SYS_NANOSLEEP              = 4166
+	SYS_MREMAP                 = 4167
+	SYS_ACCEPT                 = 4168
+	SYS_BIND                   = 4169
+	SYS_CONNECT                = 4170
+	SYS_GETPEERNAME            = 4171
+	SYS_GETSOCKNAME            = 4172
+	SYS_GETSOCKOPT             = 4173
+	SYS_LISTEN                 = 4174
+	SYS_RECV                   = 4175
+	SYS_RECVFROM               = 4176
+	SYS_RECVMSG                = 4177
+	SYS_SEND                   = 4178
+	SYS_SENDMSG                = 4179
+	SYS_SENDTO                 = 4180
+	SYS_SETSOCKOPT             = 4181
+	SYS_SHUTDOWN               = 4182
+	SYS_SOCKET                 = 4183
+	SYS_SOCKETPAIR             = 4184
+	SYS_SETRESUID              = 4185
+	SYS_GETRESUID              = 4186
+	SYS_QUERY_MODULE           = 4187
+	SYS_POLL                   = 4188
+	SYS_NFSSERVCTL             = 4189
+	SYS_SETRESGID              = 4190
+	SYS_GETRESGID              = 4191
+	SYS_PRCTL                  = 4192
+	SYS_RT_SIGRETURN           = 4193
+	SYS_RT_SIGACTION           = 4194
+	SYS_RT_SIGPROCMASK         = 4195
+	SYS_RT_SIGPENDING          = 4196
+	SYS_RT_SIGTIMEDWAIT        = 4197
+	SYS_RT_SIGQUEUEINFO        = 4198
+	SYS_RT_SIGSUSPEND          = 4199
+	SYS_PREAD64                = 4200
+	SYS_PWRITE64               = 4201
+	SYS_CHOWN                  = 4202
+	SYS_GETCWD                 = 4203
+	SYS_CAPGET                 = 4204
+	SYS_CAPSET                 = 4205
+	SYS_SIGALTSTACK            = 4206
+	SYS_SENDFILE               = 4207
+	SYS_GETPMSG                = 4208
+	SYS_PUTPMSG                = 4209
+	SYS_MMAP2                  = 4210
+	SYS_TRUNCATE64             = 4211
+	SYS_FTRUNCATE64            = 4212
+	SYS_STAT64                 = 4213
+	SYS_LSTAT64                = 4214
+	SYS_FSTAT64                = 4215
+	SYS_PIVOT_ROOT             = 4216
+	SYS_MINCORE                = 4217
+	SYS_MADVISE                = 4218
+	SYS_GETDENTS64             = 4219
+	SYS_FCNTL64                = 4220
+	SYS_RESERVED221            = 4221
+	SYS_GETTID                 = 4222
+	SYS_READAHEAD              = 4223
+	SYS_SETXATTR               = 4224
+	SYS_LSETXATTR              = 4225
+	SYS_FSETXATTR              = 4226
+	SYS_GETXATTR               = 4227
+	SYS_LGETXATTR              = 4228
+	SYS_FGETXATTR              = 4229
+	SYS_LISTXATTR              = 4230
+	SYS_LLISTXATTR             = 4231
+	SYS_FLISTXATTR             = 4232
+	SYS_REMOVEXATTR            = 4233
+	SYS_LREMOVEXATTR           = 4234
+	SYS_FREMOVEXATTR           = 4235
+	SYS_TKILL                  = 4236
+	SYS_SENDFILE64             = 4237
+	SYS_FUTEX                  = 4238
+	SYS_SCHED_SETAFFINITY      = 4239
+	SYS_SCHED_GETAFFINITY      = 4240
+	SYS_IO_SETUP               = 4241
+	SYS_IO_DESTROY             = 4242
+	SYS_IO_GETEVENTS           = 4243
+	SYS_IO_SUBMIT              = 4244
+	SYS_IO_CANCEL              = 4245
+	SYS_EXIT_GROUP             = 4246
+	SYS_LOOKUP_DCOOKIE         = 4247
+	SYS_EPOLL_CREATE           = 4248
+	SYS_EPOLL_CTL              = 4249
+	SYS_EPOLL_WAIT             = 4250
+	SYS_REMAP_FILE_PAGES       = 4251
+	SYS_SET_TID_ADDRESS        = 4252
+	SYS_RESTART_SYSCALL        = 4253
+	SYS_FADVISE64              = 4254
+	SYS_STATFS64               = 4255
+	SYS_FSTATFS64              = 4256
+	SYS_TIMER_CREATE           = 4257
+	SYS_TIMER_SETTIME          = 4258
+	SYS_TIMER_GETTIME          = 4259
+	SYS_TIMER_GETOVERRUN       = 4260
+	SYS_TIMER_DELETE           = 4261
+	SYS_CLOCK_SETTIME          = 4262
+	SYS_CLOCK_GETTIME          = 4263
+	SYS_CLOCK_GETRES           = 4264
+	SYS_CLOCK_NANOSLEEP        = 4265
+	SYS_TGKILL                 = 4266
+	SYS_UTIMES                 = 4267
+	SYS_MBIND                  = 4268
+	SYS_GET_MEMPOLICY          = 4269
+	SYS_SET_MEMPOLICY          = 4270
+	SYS_MQ_OPEN                = 4271
+	SYS_MQ_UNLINK              = 4272
+	SYS_MQ_TIMEDSEND           = 4273
+	SYS_MQ_TIMEDRECEIVE        = 4274
+	SYS_MQ_NOTIFY              = 4275
+	SYS_MQ_GETSETATTR          = 4276
+	SYS_VSERVER                = 4277
+	SYS_WAITID                 = 4278
+	SYS_ADD_KEY                = 4280
+	SYS_REQUEST_KEY            = 4281
+	SYS_KEYCTL                 = 4282
+	SYS_SET_THREAD_AREA        = 4283
+	SYS_INOTIFY_INIT           = 4284
+	SYS_INOTIFY_ADD_WATCH      = 4285
+	SYS_INOTIFY_RM_WATCH       = 4286
+	SYS_MIGRATE_PAGES          = 4287
+	SYS_OPENAT                 = 4288
+	SYS_MKDIRAT                = 4289
+	SYS_MKNODAT                = 4290
+	SYS_FCHOWNAT               = 4291
+	SYS_FUTIMESAT              = 4292
+	SYS_FSTATAT64              = 4293
+	SYS_UNLINKAT               = 4294
+	SYS_RENAMEAT               = 4295
+	SYS_LINKAT                 = 4296
+	SYS_SYMLINKAT              = 4297
+	SYS_READLINKAT             = 4298
+	SYS_FCHMODAT               = 4299
+	SYS_FACCESSAT              = 4300
+	SYS_PSELECT6               = 4301
+	SYS_PPOLL                  = 4302
+	SYS_UNSHARE                = 4303
+	SYS_SPLICE                 = 4304
+	SYS_SYNC_FILE_RANGE        = 4305
+	SYS_TEE                    = 4306
+	SYS_VMSPLICE               = 4307
+	SYS_MOVE_PAGES             = 4308
+	SYS_SET_ROBUST_LIST        = 4309
+	SYS_GET_ROBUST_LIST        = 4310
+	SYS_KEXEC_LOAD             = 4311
+	SYS_GETCPU                 = 4312
+	SYS_EPOLL_PWAIT            = 4313
+	SYS_IOPRIO_SET             = 4314
+	SYS_IOPRIO_GET             = 4315
+	SYS_UTIMENSAT              = 4316
+	SYS_SIGNALFD               = 4317
+	SYS_TIMERFD                = 4318
+	SYS_EVENTFD                = 4319
+	SYS_FALLOCATE              = 4320
+	SYS_TIMERFD_CREATE         = 4321
+	SYS_TIMERFD_GETTIME        = 4322
+	SYS_TIMERFD_SETTIME        = 4323
+	SYS_SIGNALFD4              = 4324
+	SYS_EVENTFD2               = 4325
+	SYS_EPOLL_CREATE1          = 4326
+	SYS_DUP3                   = 4327
+	SYS_PIPE2                  = 4328
+	SYS_INOTIFY_INIT1          = 4329
+	SYS_PREADV                 = 4330
+	SYS_PWRITEV                = 4331
+	SYS_RT_TGSIGQUEUEINFO      = 4332
+	SYS_PERF_EVENT_OPEN        = 4333
+	SYS_ACCEPT4                = 4334
+	SYS_RECVMMSG               = 4335
+	SYS_FANOTIFY_INIT          = 4336
+	SYS_FANOTIFY_MARK          = 4337
+	SYS_PRLIMIT64              = 4338
+	SYS_NAME_TO_HANDLE_AT      = 4339
+	SYS_OPEN_BY_HANDLE_AT      = 4340
+	SYS_CLOCK_ADJTIME          = 4341
+	SYS_SYNCFS                 = 4342
+	SYS_SENDMMSG               = 4343
+	SYS_SETNS                  = 4344
+	SYS_PROCESS_VM_READV       = 4345
+	SYS_PROCESS_VM_WRITEV      = 4346
+	SYS_KCMP                   = 4347
+	SYS_FINIT_MODULE           = 4348
+	SYS_SCHED_SETATTR          = 4349
+	SYS_SCHED_GETATTR          = 4350
+	SYS_RENAMEAT2              = 4351
+	SYS_SECCOMP                = 4352
+	SYS_GETRANDOM              = 4353
+	SYS_MEMFD_CREATE           = 4354
+	SYS_BPF                    = 4355
+	SYS_EXECVEAT               = 4356
+	SYS_USERFAULTFD            = 4357
+	SYS_MEMBARRIER             = 4358
+	SYS_MLOCK2                 = 4359
+	SYS_COPY_FILE_RANGE        = 4360
+	SYS_PREADV2                = 4361
+	SYS_PWRITEV2               = 4362
+	SYS_PKEY_MPROTECT          = 4363
+	SYS_PKEY_ALLOC             = 4364
+	SYS_PKEY_FREE              = 4365
+	SYS_STATX                  = 4366
+	SYS_RSEQ                   = 4367
+	SYS_IO_PGETEVENTS          = 4368
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
new file mode 100644
index 00000000..a5c5f3de
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
@@ -0,0 +1,375 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build ppc64,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86                   = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_QUERY_MODULE           = 166
+	SYS_POLL                   = 167
+	SYS_NFSSERVCTL             = 168
+	SYS_SETRESGID              = 169
+	SYS_GETRESGID              = 170
+	SYS_PRCTL                  = 171
+	SYS_RT_SIGRETURN           = 172
+	SYS_RT_SIGACTION           = 173
+	SYS_RT_SIGPROCMASK         = 174
+	SYS_RT_SIGPENDING          = 175
+	SYS_RT_SIGTIMEDWAIT        = 176
+	SYS_RT_SIGQUEUEINFO        = 177
+	SYS_RT_SIGSUSPEND          = 178
+	SYS_PREAD64                = 179
+	SYS_PWRITE64               = 180
+	SYS_CHOWN                  = 181
+	SYS_GETCWD                 = 182
+	SYS_CAPGET                 = 183
+	SYS_CAPSET                 = 184
+	SYS_SIGALTSTACK            = 185
+	SYS_SENDFILE               = 186
+	SYS_GETPMSG                = 187
+	SYS_PUTPMSG                = 188
+	SYS_VFORK                  = 189
+	SYS_UGETRLIMIT             = 190
+	SYS_READAHEAD              = 191
+	SYS_PCICONFIG_READ         = 198
+	SYS_PCICONFIG_WRITE        = 199
+	SYS_PCICONFIG_IOBASE       = 200
+	SYS_MULTIPLEXER            = 201
+	SYS_GETDENTS64             = 202
+	SYS_PIVOT_ROOT             = 203
+	SYS_MADVISE                = 205
+	SYS_MINCORE                = 206
+	SYS_GETTID                 = 207
+	SYS_TKILL                  = 208
+	SYS_SETXATTR               = 209
+	SYS_LSETXATTR              = 210
+	SYS_FSETXATTR              = 211
+	SYS_GETXATTR               = 212
+	SYS_LGETXATTR              = 213
+	SYS_FGETXATTR              = 214
+	SYS_LISTXATTR              = 215
+	SYS_LLISTXATTR             = 216
+	SYS_FLISTXATTR             = 217
+	SYS_REMOVEXATTR            = 218
+	SYS_LREMOVEXATTR           = 219
+	SYS_FREMOVEXATTR           = 220
+	SYS_FUTEX                  = 221
+	SYS_SCHED_SETAFFINITY      = 222
+	SYS_SCHED_GETAFFINITY      = 223
+	SYS_TUXCALL                = 225
+	SYS_IO_SETUP               = 227
+	SYS_IO_DESTROY             = 228
+	SYS_IO_GETEVENTS           = 229
+	SYS_IO_SUBMIT              = 230
+	SYS_IO_CANCEL              = 231
+	SYS_SET_TID_ADDRESS        = 232
+	SYS_FADVISE64              = 233
+	SYS_EXIT_GROUP             = 234
+	SYS_LOOKUP_DCOOKIE         = 235
+	SYS_EPOLL_CREATE           = 236
+	SYS_EPOLL_CTL              = 237
+	SYS_EPOLL_WAIT             = 238
+	SYS_REMAP_FILE_PAGES       = 239
+	SYS_TIMER_CREATE           = 240
+	SYS_TIMER_SETTIME          = 241
+	SYS_TIMER_GETTIME          = 242
+	SYS_TIMER_GETOVERRUN       = 243
+	SYS_TIMER_DELETE           = 244
+	SYS_CLOCK_SETTIME          = 245
+	SYS_CLOCK_GETTIME          = 246
+	SYS_CLOCK_GETRES           = 247
+	SYS_CLOCK_NANOSLEEP        = 248
+	SYS_SWAPCONTEXT            = 249
+	SYS_TGKILL                 = 250
+	SYS_UTIMES                 = 251
+	SYS_STATFS64               = 252
+	SYS_FSTATFS64              = 253
+	SYS_RTAS                   = 255
+	SYS_SYS_DEBUG_SETCONTEXT   = 256
+	SYS_MIGRATE_PAGES          = 258
+	SYS_MBIND                  = 259
+	SYS_GET_MEMPOLICY          = 260
+	SYS_SET_MEMPOLICY          = 261
+	SYS_MQ_OPEN                = 262
+	SYS_MQ_UNLINK              = 263
+	SYS_MQ_TIMEDSEND           = 264
+	SYS_MQ_TIMEDRECEIVE        = 265
+	SYS_MQ_NOTIFY              = 266
+	SYS_MQ_GETSETATTR          = 267
+	SYS_KEXEC_LOAD             = 268
+	SYS_ADD_KEY                = 269
+	SYS_REQUEST_KEY            = 270
+	SYS_KEYCTL                 = 271
+	SYS_WAITID                 = 272
+	SYS_IOPRIO_SET             = 273
+	SYS_IOPRIO_GET             = 274
+	SYS_INOTIFY_INIT           = 275
+	SYS_INOTIFY_ADD_WATCH      = 276
+	SYS_INOTIFY_RM_WATCH       = 277
+	SYS_SPU_RUN                = 278
+	SYS_SPU_CREATE             = 279
+	SYS_PSELECT6               = 280
+	SYS_PPOLL                  = 281
+	SYS_UNSHARE                = 282
+	SYS_SPLICE                 = 283
+	SYS_TEE                    = 284
+	SYS_VMSPLICE               = 285
+	SYS_OPENAT                 = 286
+	SYS_MKDIRAT                = 287
+	SYS_MKNODAT                = 288
+	SYS_FCHOWNAT               = 289
+	SYS_FUTIMESAT              = 290
+	SYS_NEWFSTATAT             = 291
+	SYS_UNLINKAT               = 292
+	SYS_RENAMEAT               = 293
+	SYS_LINKAT                 = 294
+	SYS_SYMLINKAT              = 295
+	SYS_READLINKAT             = 296
+	SYS_FCHMODAT               = 297
+	SYS_FACCESSAT              = 298
+	SYS_GET_ROBUST_LIST        = 299
+	SYS_SET_ROBUST_LIST        = 300
+	SYS_MOVE_PAGES             = 301
+	SYS_GETCPU                 = 302
+	SYS_EPOLL_PWAIT            = 303
+	SYS_UTIMENSAT              = 304
+	SYS_SIGNALFD               = 305
+	SYS_TIMERFD_CREATE         = 306
+	SYS_EVENTFD                = 307
+	SYS_SYNC_FILE_RANGE2       = 308
+	SYS_FALLOCATE              = 309
+	SYS_SUBPAGE_PROT           = 310
+	SYS_TIMERFD_SETTIME        = 311
+	SYS_TIMERFD_GETTIME        = 312
+	SYS_SIGNALFD4              = 313
+	SYS_EVENTFD2               = 314
+	SYS_EPOLL_CREATE1          = 315
+	SYS_DUP3                   = 316
+	SYS_PIPE2                  = 317
+	SYS_INOTIFY_INIT1          = 318
+	SYS_PERF_EVENT_OPEN        = 319
+	SYS_PREADV                 = 320
+	SYS_PWRITEV                = 321
+	SYS_RT_TGSIGQUEUEINFO      = 322
+	SYS_FANOTIFY_INIT          = 323
+	SYS_FANOTIFY_MARK          = 324
+	SYS_PRLIMIT64              = 325
+	SYS_SOCKET                 = 326
+	SYS_BIND                   = 327
+	SYS_CONNECT                = 328
+	SYS_LISTEN                 = 329
+	SYS_ACCEPT                 = 330
+	SYS_GETSOCKNAME            = 331
+	SYS_GETPEERNAME            = 332
+	SYS_SOCKETPAIR             = 333
+	SYS_SEND                   = 334
+	SYS_SENDTO                 = 335
+	SYS_RECV                   = 336
+	SYS_RECVFROM               = 337
+	SYS_SHUTDOWN               = 338
+	SYS_SETSOCKOPT             = 339
+	SYS_GETSOCKOPT             = 340
+	SYS_SENDMSG                = 341
+	SYS_RECVMSG                = 342
+	SYS_RECVMMSG               = 343
+	SYS_ACCEPT4                = 344
+	SYS_NAME_TO_HANDLE_AT      = 345
+	SYS_OPEN_BY_HANDLE_AT      = 346
+	SYS_CLOCK_ADJTIME          = 347
+	SYS_SYNCFS                 = 348
+	SYS_SENDMMSG               = 349
+	SYS_SETNS                  = 350
+	SYS_PROCESS_VM_READV       = 351
+	SYS_PROCESS_VM_WRITEV      = 352
+	SYS_FINIT_MODULE           = 353
+	SYS_KCMP                   = 354
+	SYS_SCHED_SETATTR          = 355
+	SYS_SCHED_GETATTR          = 356
+	SYS_RENAMEAT2              = 357
+	SYS_SECCOMP                = 358
+	SYS_GETRANDOM              = 359
+	SYS_MEMFD_CREATE           = 360
+	SYS_BPF                    = 361
+	SYS_EXECVEAT               = 362
+	SYS_SWITCH_ENDIAN          = 363
+	SYS_USERFAULTFD            = 364
+	SYS_MEMBARRIER             = 365
+	SYS_MLOCK2                 = 378
+	SYS_COPY_FILE_RANGE        = 379
+	SYS_PREADV2                = 380
+	SYS_PWRITEV2               = 381
+	SYS_KEXEC_FILE_LOAD        = 382
+	SYS_STATX                  = 383
+	SYS_PKEY_ALLOC             = 384
+	SYS_PKEY_FREE              = 385
+	SYS_PKEY_MPROTECT          = 386
+	SYS_RSEQ                   = 387
+	SYS_IO_PGETEVENTS          = 388
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
new file mode 100644
index 00000000..5470eadb
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
@@ -0,0 +1,375 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build ppc64le,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86                   = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_QUERY_MODULE           = 166
+	SYS_POLL                   = 167
+	SYS_NFSSERVCTL             = 168
+	SYS_SETRESGID              = 169
+	SYS_GETRESGID              = 170
+	SYS_PRCTL                  = 171
+	SYS_RT_SIGRETURN           = 172
+	SYS_RT_SIGACTION           = 173
+	SYS_RT_SIGPROCMASK         = 174
+	SYS_RT_SIGPENDING          = 175
+	SYS_RT_SIGTIMEDWAIT        = 176
+	SYS_RT_SIGQUEUEINFO        = 177
+	SYS_RT_SIGSUSPEND          = 178
+	SYS_PREAD64                = 179
+	SYS_PWRITE64               = 180
+	SYS_CHOWN                  = 181
+	SYS_GETCWD                 = 182
+	SYS_CAPGET                 = 183
+	SYS_CAPSET                 = 184
+	SYS_SIGALTSTACK            = 185
+	SYS_SENDFILE               = 186
+	SYS_GETPMSG                = 187
+	SYS_PUTPMSG                = 188
+	SYS_VFORK                  = 189
+	SYS_UGETRLIMIT             = 190
+	SYS_READAHEAD              = 191
+	SYS_PCICONFIG_READ         = 198
+	SYS_PCICONFIG_WRITE        = 199
+	SYS_PCICONFIG_IOBASE       = 200
+	SYS_MULTIPLEXER            = 201
+	SYS_GETDENTS64             = 202
+	SYS_PIVOT_ROOT             = 203
+	SYS_MADVISE                = 205
+	SYS_MINCORE                = 206
+	SYS_GETTID                 = 207
+	SYS_TKILL                  = 208
+	SYS_SETXATTR               = 209
+	SYS_LSETXATTR              = 210
+	SYS_FSETXATTR              = 211
+	SYS_GETXATTR               = 212
+	SYS_LGETXATTR              = 213
+	SYS_FGETXATTR              = 214
+	SYS_LISTXATTR              = 215
+	SYS_LLISTXATTR             = 216
+	SYS_FLISTXATTR             = 217
+	SYS_REMOVEXATTR            = 218
+	SYS_LREMOVEXATTR           = 219
+	SYS_FREMOVEXATTR           = 220
+	SYS_FUTEX                  = 221
+	SYS_SCHED_SETAFFINITY      = 222
+	SYS_SCHED_GETAFFINITY      = 223
+	SYS_TUXCALL                = 225
+	SYS_IO_SETUP               = 227
+	SYS_IO_DESTROY             = 228
+	SYS_IO_GETEVENTS           = 229
+	SYS_IO_SUBMIT              = 230
+	SYS_IO_CANCEL              = 231
+	SYS_SET_TID_ADDRESS        = 232
+	SYS_FADVISE64              = 233
+	SYS_EXIT_GROUP             = 234
+	SYS_LOOKUP_DCOOKIE         = 235
+	SYS_EPOLL_CREATE           = 236
+	SYS_EPOLL_CTL              = 237
+	SYS_EPOLL_WAIT             = 238
+	SYS_REMAP_FILE_PAGES       = 239
+	SYS_TIMER_CREATE           = 240
+	SYS_TIMER_SETTIME          = 241
+	SYS_TIMER_GETTIME          = 242
+	SYS_TIMER_GETOVERRUN       = 243
+	SYS_TIMER_DELETE           = 244
+	SYS_CLOCK_SETTIME          = 245
+	SYS_CLOCK_GETTIME          = 246
+	SYS_CLOCK_GETRES           = 247
+	SYS_CLOCK_NANOSLEEP        = 248
+	SYS_SWAPCONTEXT            = 249
+	SYS_TGKILL                 = 250
+	SYS_UTIMES                 = 251
+	SYS_STATFS64               = 252
+	SYS_FSTATFS64              = 253
+	SYS_RTAS                   = 255
+	SYS_SYS_DEBUG_SETCONTEXT   = 256
+	SYS_MIGRATE_PAGES          = 258
+	SYS_MBIND                  = 259
+	SYS_GET_MEMPOLICY          = 260
+	SYS_SET_MEMPOLICY          = 261
+	SYS_MQ_OPEN                = 262
+	SYS_MQ_UNLINK              = 263
+	SYS_MQ_TIMEDSEND           = 264
+	SYS_MQ_TIMEDRECEIVE        = 265
+	SYS_MQ_NOTIFY              = 266
+	SYS_MQ_GETSETATTR          = 267
+	SYS_KEXEC_LOAD             = 268
+	SYS_ADD_KEY                = 269
+	SYS_REQUEST_KEY            = 270
+	SYS_KEYCTL                 = 271
+	SYS_WAITID                 = 272
+	SYS_IOPRIO_SET             = 273
+	SYS_IOPRIO_GET             = 274
+	SYS_INOTIFY_INIT           = 275
+	SYS_INOTIFY_ADD_WATCH      = 276
+	SYS_INOTIFY_RM_WATCH       = 277
+	SYS_SPU_RUN                = 278
+	SYS_SPU_CREATE             = 279
+	SYS_PSELECT6               = 280
+	SYS_PPOLL                  = 281
+	SYS_UNSHARE                = 282
+	SYS_SPLICE                 = 283
+	SYS_TEE                    = 284
+	SYS_VMSPLICE               = 285
+	SYS_OPENAT                 = 286
+	SYS_MKDIRAT                = 287
+	SYS_MKNODAT                = 288
+	SYS_FCHOWNAT               = 289
+	SYS_FUTIMESAT              = 290
+	SYS_NEWFSTATAT             = 291
+	SYS_UNLINKAT               = 292
+	SYS_RENAMEAT               = 293
+	SYS_LINKAT                 = 294
+	SYS_SYMLINKAT              = 295
+	SYS_READLINKAT             = 296
+	SYS_FCHMODAT               = 297
+	SYS_FACCESSAT              = 298
+	SYS_GET_ROBUST_LIST        = 299
+	SYS_SET_ROBUST_LIST        = 300
+	SYS_MOVE_PAGES             = 301
+	SYS_GETCPU                 = 302
+	SYS_EPOLL_PWAIT            = 303
+	SYS_UTIMENSAT              = 304
+	SYS_SIGNALFD               = 305
+	SYS_TIMERFD_CREATE         = 306
+	SYS_EVENTFD                = 307
+	SYS_SYNC_FILE_RANGE2       = 308
+	SYS_FALLOCATE              = 309
+	SYS_SUBPAGE_PROT           = 310
+	SYS_TIMERFD_SETTIME        = 311
+	SYS_TIMERFD_GETTIME        = 312
+	SYS_SIGNALFD4              = 313
+	SYS_EVENTFD2               = 314
+	SYS_EPOLL_CREATE1          = 315
+	SYS_DUP3                   = 316
+	SYS_PIPE2                  = 317
+	SYS_INOTIFY_INIT1          = 318
+	SYS_PERF_EVENT_OPEN        = 319
+	SYS_PREADV                 = 320
+	SYS_PWRITEV                = 321
+	SYS_RT_TGSIGQUEUEINFO      = 322
+	SYS_FANOTIFY_INIT          = 323
+	SYS_FANOTIFY_MARK          = 324
+	SYS_PRLIMIT64              = 325
+	SYS_SOCKET                 = 326
+	SYS_BIND                   = 327
+	SYS_CONNECT                = 328
+	SYS_LISTEN                 = 329
+	SYS_ACCEPT                 = 330
+	SYS_GETSOCKNAME            = 331
+	SYS_GETPEERNAME            = 332
+	SYS_SOCKETPAIR             = 333
+	SYS_SEND                   = 334
+	SYS_SENDTO                 = 335
+	SYS_RECV                   = 336
+	SYS_RECVFROM               = 337
+	SYS_SHUTDOWN               = 338
+	SYS_SETSOCKOPT             = 339
+	SYS_GETSOCKOPT             = 340
+	SYS_SENDMSG                = 341
+	SYS_RECVMSG                = 342
+	SYS_RECVMMSG               = 343
+	SYS_ACCEPT4                = 344
+	SYS_NAME_TO_HANDLE_AT      = 345
+	SYS_OPEN_BY_HANDLE_AT      = 346
+	SYS_CLOCK_ADJTIME          = 347
+	SYS_SYNCFS                 = 348
+	SYS_SENDMMSG               = 349
+	SYS_SETNS                  = 350
+	SYS_PROCESS_VM_READV       = 351
+	SYS_PROCESS_VM_WRITEV      = 352
+	SYS_FINIT_MODULE           = 353
+	SYS_KCMP                   = 354
+	SYS_SCHED_SETATTR          = 355
+	SYS_SCHED_GETATTR          = 356
+	SYS_RENAMEAT2              = 357
+	SYS_SECCOMP                = 358
+	SYS_GETRANDOM              = 359
+	SYS_MEMFD_CREATE           = 360
+	SYS_BPF                    = 361
+	SYS_EXECVEAT               = 362
+	SYS_SWITCH_ENDIAN          = 363
+	SYS_USERFAULTFD            = 364
+	SYS_MEMBARRIER             = 365
+	SYS_MLOCK2                 = 378
+	SYS_COPY_FILE_RANGE        = 379
+	SYS_PREADV2                = 380
+	SYS_PWRITEV2               = 381
+	SYS_KEXEC_FILE_LOAD        = 382
+	SYS_STATX                  = 383
+	SYS_PKEY_ALLOC             = 384
+	SYS_PKEY_FREE              = 385
+	SYS_PKEY_MPROTECT          = 386
+	SYS_RSEQ                   = 387
+	SYS_IO_PGETEVENTS          = 388
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
new file mode 100644
index 00000000..de0245a9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
@@ -0,0 +1,337 @@
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build s390x,linux
+
+package unix
+
+const (
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_RESTART_SYSCALL        = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_BRK                    = 45
+	SYS_SIGNAL                 = 48
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_SETPGID                = 57
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_SYMLINK                = 83
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_LOOKUP_DCOOKIE         = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_GETDENTS               = 141
+	SYS_SELECT                 = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_QUERY_MODULE           = 167
+	SYS_POLL                   = 168
+	SYS_NFSSERVCTL             = 169
+	SYS_PRCTL                  = 172
+	SYS_RT_SIGRETURN           = 173
+	SYS_RT_SIGACTION           = 174
+	SYS_RT_SIGPROCMASK         = 175
+	SYS_RT_SIGPENDING          = 176
+	SYS_RT_SIGTIMEDWAIT        = 177
+	SYS_RT_SIGQUEUEINFO        = 178
+	SYS_RT_SIGSUSPEND          = 179
+	SYS_PREAD64                = 180
+	SYS_PWRITE64               = 181
+	SYS_GETCWD                 = 183
+	SYS_CAPGET                 = 184
+	SYS_CAPSET                 = 185
+	SYS_SIGALTSTACK            = 186
+	SYS_SENDFILE               = 187
+	SYS_GETPMSG                = 188
+	SYS_PUTPMSG                = 189
+	SYS_VFORK                  = 190
+	SYS_GETRLIMIT              = 191
+	SYS_LCHOWN                 = 198
+	SYS_GETUID                 = 199
+	SYS_GETGID                 = 200
+	SYS_GETEUID                = 201
+	SYS_GETEGID                = 202
+	SYS_SETREUID               = 203
+	SYS_SETREGID               = 204
+	SYS_GETGROUPS              = 205
+	SYS_SETGROUPS              = 206
+	SYS_FCHOWN                 = 207
+	SYS_SETRESUID              = 208
+	SYS_GETRESUID              = 209
+	SYS_SETRESGID              = 210
+	SYS_GETRESGID              = 211
+	SYS_CHOWN                  = 212
+	SYS_SETUID                 = 213
+	SYS_SETGID                 = 214
+	SYS_SETFSUID               = 215
+	SYS_SETFSGID               = 216
+	SYS_PIVOT_ROOT             = 217
+	SYS_MINCORE                = 218
+	SYS_MADVISE                = 219
+	SYS_GETDENTS64             = 220
+	SYS_READAHEAD              = 222
+	SYS_SETXATTR               = 224
+	SYS_LSETXATTR              = 225
+	SYS_FSETXATTR              = 226
+	SYS_GETXATTR               = 227
+	SYS_LGETXATTR              = 228
+	SYS_FGETXATTR              = 229
+	SYS_LISTXATTR              = 230
+	SYS_LLISTXATTR             = 231
+	SYS_FLISTXATTR             = 232
+	SYS_REMOVEXATTR            = 233
+	SYS_LREMOVEXATTR           = 234
+	SYS_FREMOVEXATTR           = 235
+	SYS_GETTID                 = 236
+	SYS_TKILL                  = 237
+	SYS_FUTEX                  = 238
+	SYS_SCHED_SETAFFINITY      = 239
+	SYS_SCHED_GETAFFINITY      = 240
+	SYS_TGKILL                 = 241
+	SYS_IO_SETUP               = 243
+	SYS_IO_DESTROY             = 244
+	SYS_IO_GETEVENTS           = 245
+	SYS_IO_SUBMIT              = 246
+	SYS_IO_CANCEL              = 247
+	SYS_EXIT_GROUP             = 248
+	SYS_EPOLL_CREATE           = 249
+	SYS_EPOLL_CTL              = 250
+	SYS_EPOLL_WAIT             = 251
+	SYS_SET_TID_ADDRESS        = 252
+	SYS_FADVISE64              = 253
+	SYS_TIMER_CREATE           = 254
+	SYS_TIMER_SETTIME          = 255
+	SYS_TIMER_GETTIME          = 256
+	SYS_TIMER_GETOVERRUN       = 257
+	SYS_TIMER_DELETE           = 258
+	SYS_CLOCK_SETTIME          = 259
+	SYS_CLOCK_GETTIME          = 260
+	SYS_CLOCK_GETRES           = 261
+	SYS_CLOCK_NANOSLEEP        = 262
+	SYS_STATFS64               = 265
+	SYS_FSTATFS64              = 266
+	SYS_REMAP_FILE_PAGES       = 267
+	SYS_MBIND                  = 268
+	SYS_GET_MEMPOLICY          = 269
+	SYS_SET_MEMPOLICY          = 270
+	SYS_MQ_OPEN                = 271
+	SYS_MQ_UNLINK              = 272
+	SYS_MQ_TIMEDSEND           = 273
+	SYS_MQ_TIMEDRECEIVE        = 274
+	SYS_MQ_NOTIFY              = 275
+	SYS_MQ_GETSETATTR          = 276
+	SYS_KEXEC_LOAD             = 277
+	SYS_ADD_KEY                = 278
+	SYS_REQUEST_KEY            = 279
+	SYS_KEYCTL                 = 280
+	SYS_WAITID                 = 281
+	SYS_IOPRIO_SET             = 282
+	SYS_IOPRIO_GET             = 283
+	SYS_INOTIFY_INIT           = 284
+	SYS_INOTIFY_ADD_WATCH      = 285
+	SYS_INOTIFY_RM_WATCH       = 286
+	SYS_MIGRATE_PAGES          = 287
+	SYS_OPENAT                 = 288
+	SYS_MKDIRAT                = 289
+	SYS_MKNODAT                = 290
+	SYS_FCHOWNAT               = 291
+	SYS_FUTIMESAT              = 292
+	SYS_NEWFSTATAT             = 293
+	SYS_UNLINKAT               = 294
+	SYS_RENAMEAT               = 295
+	SYS_LINKAT                 = 296
+	SYS_SYMLINKAT              = 297
+	SYS_READLINKAT             = 298
+	SYS_FCHMODAT               = 299
+	SYS_FACCESSAT              = 300
+	SYS_PSELECT6               = 301
+	SYS_PPOLL                  = 302
+	SYS_UNSHARE                = 303
+	SYS_SET_ROBUST_LIST        = 304
+	SYS_GET_ROBUST_LIST        = 305
+	SYS_SPLICE                 = 306
+	SYS_SYNC_FILE_RANGE        = 307
+	SYS_TEE                    = 308
+	SYS_VMSPLICE               = 309
+	SYS_MOVE_PAGES             = 310
+	SYS_GETCPU                 = 311
+	SYS_EPOLL_PWAIT            = 312
+	SYS_UTIMES                 = 313
+	SYS_FALLOCATE              = 314
+	SYS_UTIMENSAT              = 315
+	SYS_SIGNALFD               = 316
+	SYS_TIMERFD                = 317
+	SYS_EVENTFD                = 318
+	SYS_TIMERFD_CREATE         = 319
+	SYS_TIMERFD_SETTIME        = 320
+	SYS_TIMERFD_GETTIME        = 321
+	SYS_SIGNALFD4              = 322
+	SYS_EVENTFD2               = 323
+	SYS_INOTIFY_INIT1          = 324
+	SYS_PIPE2                  = 325
+	SYS_DUP3                   = 326
+	SYS_EPOLL_CREATE1          = 327
+	SYS_PREADV                 = 328
+	SYS_PWRITEV                = 329
+	SYS_RT_TGSIGQUEUEINFO      = 330
+	SYS_PERF_EVENT_OPEN        = 331
+	SYS_FANOTIFY_INIT          = 332
+	SYS_FANOTIFY_MARK          = 333
+	SYS_PRLIMIT64              = 334
+	SYS_NAME_TO_HANDLE_AT      = 335
+	SYS_OPEN_BY_HANDLE_AT      = 336
+	SYS_CLOCK_ADJTIME          = 337
+	SYS_SYNCFS                 = 338
+	SYS_SETNS                  = 339
+	SYS_PROCESS_VM_READV       = 340
+	SYS_PROCESS_VM_WRITEV      = 341
+	SYS_S390_RUNTIME_INSTR     = 342
+	SYS_KCMP                   = 343
+	SYS_FINIT_MODULE           = 344
+	SYS_SCHED_SETATTR          = 345
+	SYS_SCHED_GETATTR          = 346
+	SYS_RENAMEAT2              = 347
+	SYS_SECCOMP                = 348
+	SYS_GETRANDOM              = 349
+	SYS_MEMFD_CREATE           = 350
+	SYS_BPF                    = 351
+	SYS_S390_PCI_MMIO_WRITE    = 352
+	SYS_S390_PCI_MMIO_READ     = 353
+	SYS_EXECVEAT               = 354
+	SYS_USERFAULTFD            = 355
+	SYS_MEMBARRIER             = 356
+	SYS_RECVMMSG               = 357
+	SYS_SENDMMSG               = 358
+	SYS_SOCKET                 = 359
+	SYS_SOCKETPAIR             = 360
+	SYS_BIND                   = 361
+	SYS_CONNECT                = 362
+	SYS_LISTEN                 = 363
+	SYS_ACCEPT4                = 364
+	SYS_GETSOCKOPT             = 365
+	SYS_SETSOCKOPT             = 366
+	SYS_GETSOCKNAME            = 367
+	SYS_GETPEERNAME            = 368
+	SYS_SENDTO                 = 369
+	SYS_SENDMSG                = 370
+	SYS_RECVFROM               = 371
+	SYS_RECVMSG                = 372
+	SYS_SHUTDOWN               = 373
+	SYS_MLOCK2                 = 374
+	SYS_COPY_FILE_RANGE        = 375
+	SYS_PREADV2                = 376
+	SYS_PWRITEV2               = 377
+	SYS_S390_GUARDED_STORAGE   = 378
+	SYS_STATX                  = 379
+	SYS_S390_STHYI             = 380
+	SYS_KEXEC_FILE_LOAD        = 381
+	SYS_IO_PGETEVENTS          = 382
+	SYS_RSEQ                   = 383
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
new file mode 100644
index 00000000..2d099367
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
@@ -0,0 +1,348 @@
+// mksysnum_linux.pl -Ilinux/usr/include -m64 -D__arch64__ linux/usr/include/asm/unistd.h
+// Code generated by the command above; DO NOT EDIT.
+
+// +build sparc64,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAIT4                  = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECV                  = 11
+	SYS_CHDIR                  = 12
+	SYS_CHOWN                  = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BRK                    = 17
+	SYS_PERFCTR                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_CAPGET                 = 21
+	SYS_CAPSET                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_VMSPLICE               = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_SIGALTSTACK            = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_STAT                   = 38
+	SYS_SENDFILE               = 39
+	SYS_LSTAT                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_UMOUNT2                = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_MEMORY_ORDERING        = 52
+	SYS_IOCTL                  = 54
+	SYS_REBOOT                 = 55
+	SYS_SYMLINK                = 57
+	SYS_READLINK               = 58
+	SYS_EXECVE                 = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_FSTAT                  = 62
+	SYS_FSTAT64                = 63
+	SYS_GETPAGESIZE            = 64
+	SYS_MSYNC                  = 65
+	SYS_VFORK                  = 66
+	SYS_PREAD64                = 67
+	SYS_PWRITE64               = 68
+	SYS_MMAP                   = 71
+	SYS_MUNMAP                 = 73
+	SYS_MPROTECT               = 74
+	SYS_MADVISE                = 75
+	SYS_VHANGUP                = 76
+	SYS_MINCORE                = 78
+	SYS_GETGROUPS              = 79
+	SYS_SETGROUPS              = 80
+	SYS_GETPGRP                = 81
+	SYS_SETITIMER              = 83
+	SYS_SWAPON                 = 85
+	SYS_GETITIMER              = 86
+	SYS_SETHOSTNAME            = 88
+	SYS_DUP2                   = 90
+	SYS_FCNTL                  = 92
+	SYS_SELECT                 = 93
+	SYS_FSYNC                  = 95
+	SYS_SETPRIORITY            = 96
+	SYS_SOCKET                 = 97
+	SYS_CONNECT                = 98
+	SYS_ACCEPT                 = 99
+	SYS_GETPRIORITY            = 100
+	SYS_RT_SIGRETURN           = 101
+	SYS_RT_SIGACTION           = 102
+	SYS_RT_SIGPROCMASK         = 103
+	SYS_RT_SIGPENDING          = 104
+	SYS_RT_SIGTIMEDWAIT        = 105
+	SYS_RT_SIGQUEUEINFO        = 106
+	SYS_RT_SIGSUSPEND          = 107
+	SYS_SETRESUID              = 108
+	SYS_GETRESUID              = 109
+	SYS_SETRESGID              = 110
+	SYS_GETRESGID              = 111
+	SYS_RECVMSG                = 113
+	SYS_SENDMSG                = 114
+	SYS_GETTIMEOFDAY           = 116
+	SYS_GETRUSAGE              = 117
+	SYS_GETSOCKOPT             = 118
+	SYS_GETCWD                 = 119
+	SYS_READV                  = 120
+	SYS_WRITEV                 = 121
+	SYS_SETTIMEOFDAY           = 122
+	SYS_FCHOWN                 = 123
+	SYS_FCHMOD                 = 124
+	SYS_RECVFROM               = 125
+	SYS_SETREUID               = 126
+	SYS_SETREGID               = 127
+	SYS_RENAME                 = 128
+	SYS_TRUNCATE               = 129
+	SYS_FTRUNCATE              = 130
+	SYS_FLOCK                  = 131
+	SYS_LSTAT64                = 132
+	SYS_SENDTO                 = 133
+	SYS_SHUTDOWN               = 134
+	SYS_SOCKETPAIR             = 135
+	SYS_MKDIR                  = 136
+	SYS_RMDIR                  = 137
+	SYS_UTIMES                 = 138
+	SYS_STAT64                 = 139
+	SYS_SENDFILE64             = 140
+	SYS_GETPEERNAME            = 141
+	SYS_FUTEX                  = 142
+	SYS_GETTID                 = 143
+	SYS_GETRLIMIT              = 144
+	SYS_SETRLIMIT              = 145
+	SYS_PIVOT_ROOT             = 146
+	SYS_PRCTL                  = 147
+	SYS_PCICONFIG_READ         = 148
+	SYS_PCICONFIG_WRITE        = 149
+	SYS_GETSOCKNAME            = 150
+	SYS_INOTIFY_INIT           = 151
+	SYS_INOTIFY_ADD_WATCH      = 152
+	SYS_POLL                   = 153
+	SYS_GETDENTS64             = 154
+	SYS_INOTIFY_RM_WATCH       = 156
+	SYS_STATFS                 = 157
+	SYS_FSTATFS                = 158
+	SYS_UMOUNT                 = 159
+	SYS_SCHED_SET_AFFINITY     = 160
+	SYS_SCHED_GET_AFFINITY     = 161
+	SYS_GETDOMAINNAME          = 162
+	SYS_SETDOMAINNAME          = 163
+	SYS_UTRAP_INSTALL          = 164
+	SYS_QUOTACTL               = 165
+	SYS_SET_TID_ADDRESS        = 166
+	SYS_MOUNT                  = 167
+	SYS_USTAT                  = 168
+	SYS_SETXATTR               = 169
+	SYS_LSETXATTR              = 170
+	SYS_FSETXATTR              = 171
+	SYS_GETXATTR               = 172
+	SYS_LGETXATTR              = 173
+	SYS_GETDENTS               = 174
+	SYS_SETSID                 = 175
+	SYS_FCHDIR                 = 176
+	SYS_FGETXATTR              = 177
+	SYS_LISTXATTR              = 178
+	SYS_LLISTXATTR             = 179
+	SYS_FLISTXATTR             = 180
+	SYS_REMOVEXATTR            = 181
+	SYS_LREMOVEXATTR           = 182
+	SYS_SIGPENDING             = 183
+	SYS_QUERY_MODULE           = 184
+	SYS_SETPGID                = 185
+	SYS_FREMOVEXATTR           = 186
+	SYS_TKILL                  = 187
+	SYS_EXIT_GROUP             = 188
+	SYS_UNAME                  = 189
+	SYS_INIT_MODULE            = 190
+	SYS_PERSONALITY            = 191
+	SYS_REMAP_FILE_PAGES       = 192
+	SYS_EPOLL_CREATE           = 193
+	SYS_EPOLL_CTL              = 194
+	SYS_EPOLL_WAIT             = 195
+	SYS_IOPRIO_SET             = 196
+	SYS_GETPPID                = 197
+	SYS_SIGACTION              = 198
+	SYS_SGETMASK               = 199
+	SYS_SSETMASK               = 200
+	SYS_SIGSUSPEND             = 201
+	SYS_OLDLSTAT               = 202
+	SYS_USELIB                 = 203
+	SYS_READDIR                = 204
+	SYS_READAHEAD              = 205
+	SYS_SOCKETCALL             = 206
+	SYS_SYSLOG                 = 207
+	SYS_LOOKUP_DCOOKIE         = 208
+	SYS_FADVISE64              = 209
+	SYS_FADVISE64_64           = 210
+	SYS_TGKILL                 = 211
+	SYS_WAITPID                = 212
+	SYS_SWAPOFF                = 213
+	SYS_SYSINFO                = 214
+	SYS_IPC                    = 215
+	SYS_SIGRETURN              = 216
+	SYS_CLONE                  = 217
+	SYS_IOPRIO_GET             = 218
+	SYS_ADJTIMEX               = 219
+	SYS_SIGPROCMASK            = 220
+	SYS_CREATE_MODULE          = 221
+	SYS_DELETE_MODULE          = 222
+	SYS_GET_KERNEL_SYMS        = 223
+	SYS_GETPGID                = 224
+	SYS_BDFLUSH                = 225
+	SYS_SYSFS                  = 226
+	SYS_AFS_SYSCALL            = 227
+	SYS_SETFSUID               = 228
+	SYS_SETFSGID               = 229
+	SYS__NEWSELECT             = 230
+	SYS_SPLICE                 = 232
+	SYS_STIME                  = 233
+	SYS_STATFS64               = 234
+	SYS_FSTATFS64              = 235
+	SYS__LLSEEK                = 236
+	SYS_MLOCK                  = 237
+	SYS_MUNLOCK                = 238
+	SYS_MLOCKALL               = 239
+	SYS_MUNLOCKALL             = 240
+	SYS_SCHED_SETPARAM         = 241
+	SYS_SCHED_GETPARAM         = 242
+	SYS_SCHED_SETSCHEDULER     = 243
+	SYS_SCHED_GETSCHEDULER     = 244
+	SYS_SCHED_YIELD            = 245
+	SYS_SCHED_GET_PRIORITY_MAX = 246
+	SYS_SCHED_GET_PRIORITY_MIN = 247
+	SYS_SCHED_RR_GET_INTERVAL  = 248
+	SYS_NANOSLEEP              = 249
+	SYS_MREMAP                 = 250
+	SYS__SYSCTL                = 251
+	SYS_GETSID                 = 252
+	SYS_FDATASYNC              = 253
+	SYS_NFSSERVCTL             = 254
+	SYS_SYNC_FILE_RANGE        = 255
+	SYS_CLOCK_SETTIME          = 256
+	SYS_CLOCK_GETTIME          = 257
+	SYS_CLOCK_GETRES           = 258
+	SYS_CLOCK_NANOSLEEP        = 259
+	SYS_SCHED_GETAFFINITY      = 260
+	SYS_SCHED_SETAFFINITY      = 261
+	SYS_TIMER_SETTIME          = 262
+	SYS_TIMER_GETTIME          = 263
+	SYS_TIMER_GETOVERRUN       = 264
+	SYS_TIMER_DELETE           = 265
+	SYS_TIMER_CREATE           = 266
+	SYS_IO_SETUP               = 268
+	SYS_IO_DESTROY             = 269
+	SYS_IO_SUBMIT              = 270
+	SYS_IO_CANCEL              = 271
+	SYS_IO_GETEVENTS           = 272
+	SYS_MQ_OPEN                = 273
+	SYS_MQ_UNLINK              = 274
+	SYS_MQ_TIMEDSEND           = 275
+	SYS_MQ_TIMEDRECEIVE        = 276
+	SYS_MQ_NOTIFY              = 277
+	SYS_MQ_GETSETATTR          = 278
+	SYS_WAITID                 = 279
+	SYS_TEE                    = 280
+	SYS_ADD_KEY                = 281
+	SYS_REQUEST_KEY            = 282
+	SYS_KEYCTL                 = 283
+	SYS_OPENAT                 = 284
+	SYS_MKDIRAT                = 285
+	SYS_MKNODAT                = 286
+	SYS_FCHOWNAT               = 287
+	SYS_FUTIMESAT              = 288
+	SYS_FSTATAT64              = 289
+	SYS_UNLINKAT               = 290
+	SYS_RENAMEAT               = 291
+	SYS_LINKAT                 = 292
+	SYS_SYMLINKAT              = 293
+	SYS_READLINKAT             = 294
+	SYS_FCHMODAT               = 295
+	SYS_FACCESSAT              = 296
+	SYS_PSELECT6               = 297
+	SYS_PPOLL                  = 298
+	SYS_UNSHARE                = 299
+	SYS_SET_ROBUST_LIST        = 300
+	SYS_GET_ROBUST_LIST        = 301
+	SYS_MIGRATE_PAGES          = 302
+	SYS_MBIND                  = 303
+	SYS_GET_MEMPOLICY          = 304
+	SYS_SET_MEMPOLICY          = 305
+	SYS_KEXEC_LOAD             = 306
+	SYS_MOVE_PAGES             = 307
+	SYS_GETCPU                 = 308
+	SYS_EPOLL_PWAIT            = 309
+	SYS_UTIMENSAT              = 310
+	SYS_SIGNALFD               = 311
+	SYS_TIMERFD_CREATE         = 312
+	SYS_EVENTFD                = 313
+	SYS_FALLOCATE              = 314
+	SYS_TIMERFD_SETTIME        = 315
+	SYS_TIMERFD_GETTIME        = 316
+	SYS_SIGNALFD4              = 317
+	SYS_EVENTFD2               = 318
+	SYS_EPOLL_CREATE1          = 319
+	SYS_DUP3                   = 320
+	SYS_PIPE2                  = 321
+	SYS_INOTIFY_INIT1          = 322
+	SYS_ACCEPT4                = 323
+	SYS_PREADV                 = 324
+	SYS_PWRITEV                = 325
+	SYS_RT_TGSIGQUEUEINFO      = 326
+	SYS_PERF_EVENT_OPEN        = 327
+	SYS_RECVMMSG               = 328
+	SYS_FANOTIFY_INIT          = 329
+	SYS_FANOTIFY_MARK          = 330
+	SYS_PRLIMIT64              = 331
+	SYS_NAME_TO_HANDLE_AT      = 332
+	SYS_OPEN_BY_HANDLE_AT      = 333
+	SYS_CLOCK_ADJTIME          = 334
+	SYS_SYNCFS                 = 335
+	SYS_SENDMMSG               = 336
+	SYS_SETNS                  = 337
+	SYS_PROCESS_VM_READV       = 338
+	SYS_PROCESS_VM_WRITEV      = 339
+	SYS_KERN_FEATURES          = 340
+	SYS_KCMP                   = 341
+	SYS_FINIT_MODULE           = 342
+	SYS_SCHED_SETATTR          = 343
+	SYS_SCHED_GETATTR          = 344
+	SYS_RENAMEAT2              = 345
+	SYS_SECCOMP                = 346
+	SYS_GETRANDOM              = 347
+	SYS_MEMFD_CREATE           = 348
+	SYS_BPF                    = 349
+	SYS_EXECVEAT               = 350
+	SYS_MEMBARRIER             = 351
+	SYS_USERFAULTFD            = 352
+	SYS_BIND                   = 353
+	SYS_LISTEN                 = 354
+	SYS_SETSOCKOPT             = 355
+	SYS_MLOCK2                 = 356
+	SYS_COPY_FILE_RANGE        = 357
+	SYS_PREADV2                = 358
+	SYS_PWRITEV2               = 359
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
new file mode 100644
index 00000000..f0daa05a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
@@ -0,0 +1,274 @@
+// mksysnum_netbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+// +build 386,netbsd
+
+package unix
+
+const (
+	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
+	SYS_FORK                 = 2   // { int|sys||fork(void); }
+	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
+	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
+	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
+	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
+	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
+	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
+	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
+	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
+	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
+	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
+	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
+	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
+	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
+	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
+	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
+	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
+	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
+	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
+	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
+	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
+	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
+	SYS_SYNC                 = 36  // { void|sys||sync(void); }
+	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
+	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
+	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
+	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
+	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
+	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
+	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
+	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
+	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
+	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
+	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
+	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
+	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
+	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
+	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
+	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
+	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
+	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
+	SYS_VFORK                = 66  // { int|sys||vfork(void); }
+	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
+	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
+	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
+	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
+	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
+	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
+	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
+	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
+	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
+	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
+	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
+	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
+	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
+	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
+	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
+	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
+	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
+	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
+	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
+	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
+	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
+	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
+	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
+	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
+	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
+	SYS_SETSID               = 147 // { int|sys||setsid(void); }
+	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
+	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
+	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
+	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
+	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
+	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
+	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
+	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
+	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
+	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
+	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
+	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
+	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
+	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
+	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
+	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
+	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
+	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
+	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
+	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
+	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
+	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
+	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
+	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
+	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
+	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
+	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
+	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
+	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
+	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
+	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
+	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
+	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
+	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
+	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
+	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
+	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
+	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
+	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
+	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_MSYNC                = 277 // { int|sys|13|msync(void *addr, size_t len, int flags); }
+	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
+	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
+	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
+	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
+	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
+	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
+	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
+	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
+	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
+	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
+	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
+	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
+	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
+	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
+	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
+	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
+	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
+	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
+	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
+	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
+	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
+	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
+	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
+	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
+	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
+	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
+	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
+	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
+	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
+	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
+	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
+	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
+	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
+	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
+	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
+	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
+	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
+	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
+	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
+	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
+	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
+	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
+	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
+	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
+	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
+	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
+	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
+	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
+	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
+	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
+	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
+	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
+	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
+	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
+	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
+	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
+	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
+	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
+	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
+	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
+	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
+	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
+	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
+	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
+	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
+	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
+	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
+	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
+	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
+	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
+	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
+	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
+	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
+	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
+	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
+	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
+	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
+	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
+	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
+	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
+	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
+	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
+	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
+	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
+	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
+	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
+	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
+	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
+	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
+	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
+	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
+	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
+	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
+	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
+	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
+	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
+	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
+	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
+	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
+	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
+	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
+	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
+	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
+	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
+	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
+	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
+	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
+	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
+	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
+	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
new file mode 100644
index 00000000..ddb25b94
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
@@ -0,0 +1,274 @@
+// mksysnum_netbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+// +build amd64,netbsd
+
+package unix
+
+const (
+	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
+	SYS_FORK                 = 2   // { int|sys||fork(void); }
+	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
+	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
+	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
+	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
+	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
+	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
+	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
+	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
+	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
+	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
+	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
+	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
+	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
+	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
+	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
+	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
+	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
+	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
+	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
+	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
+	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
+	SYS_SYNC                 = 36  // { void|sys||sync(void); }
+	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
+	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
+	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
+	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
+	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
+	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
+	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
+	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
+	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
+	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
+	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
+	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
+	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
+	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
+	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
+	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
+	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
+	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
+	SYS_VFORK                = 66  // { int|sys||vfork(void); }
+	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
+	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
+	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
+	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
+	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
+	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
+	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
+	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
+	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
+	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
+	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
+	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
+	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
+	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
+	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
+	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
+	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
+	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
+	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
+	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
+	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
+	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
+	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
+	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
+	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
+	SYS_SETSID               = 147 // { int|sys||setsid(void); }
+	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
+	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
+	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
+	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
+	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
+	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
+	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
+	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
+	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
+	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
+	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
+	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
+	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
+	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
+	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
+	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
+	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
+	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
+	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
+	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
+	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
+	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
+	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
+	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
+	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
+	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
+	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
+	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
+	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
+	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
+	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
+	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
+	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
+	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
+	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
+	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
+	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
+	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
+	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
+	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_MSYNC                = 277 // { int|sys|13|msync(void *addr, size_t len, int flags); }
+	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
+	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
+	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
+	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
+	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
+	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
+	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
+	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
+	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
+	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
+	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
+	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
+	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
+	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
+	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
+	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
+	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
+	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
+	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
+	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
+	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
+	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
+	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
+	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
+	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
+	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
+	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
+	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
+	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
+	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
+	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
+	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
+	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
+	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
+	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
+	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
+	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
+	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
+	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
+	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
+	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
+	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
+	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
+	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
+	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
+	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
+	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
+	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
+	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
+	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
+	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
+	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
+	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
+	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
+	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
+	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
+	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
+	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
+	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
+	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
+	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
+	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
+	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
+	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
+	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
+	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
+	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
+	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
+	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
+	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
+	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
+	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
+	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
+	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
+	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
+	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
+	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
+	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
+	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
+	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
+	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
+	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
+	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
+	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
+	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
+	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
+	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
+	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
+	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
+	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
+	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
+	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
+	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
+	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
+	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
+	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
+	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
+	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
+	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
+	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
+	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
+	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
+	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
+	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
+	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
+	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
+	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
+	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
+	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
+	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
new file mode 100644
index 00000000..315bd63f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
@@ -0,0 +1,274 @@
+// mksysnum_netbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+// +build arm,netbsd
+
+package unix
+
+const (
+	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
+	SYS_FORK                 = 2   // { int|sys||fork(void); }
+	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
+	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
+	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
+	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
+	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
+	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
+	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
+	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
+	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
+	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
+	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
+	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
+	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
+	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
+	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
+	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
+	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
+	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
+	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
+	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
+	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
+	SYS_SYNC                 = 36  // { void|sys||sync(void); }
+	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
+	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
+	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
+	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
+	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
+	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
+	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
+	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
+	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
+	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
+	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
+	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
+	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
+	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
+	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
+	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
+	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
+	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
+	SYS_VFORK                = 66  // { int|sys||vfork(void); }
+	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
+	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
+	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
+	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
+	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
+	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
+	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
+	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
+	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
+	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
+	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
+	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
+	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
+	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
+	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
+	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
+	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
+	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
+	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
+	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
+	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
+	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
+	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
+	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
+	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
+	SYS_SETSID               = 147 // { int|sys||setsid(void); }
+	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
+	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
+	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
+	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
+	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
+	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
+	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
+	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
+	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
+	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
+	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
+	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
+	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
+	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
+	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
+	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
+	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
+	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
+	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
+	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
+	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
+	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
+	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
+	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
+	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
+	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
+	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
+	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
+	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
+	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
+	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
+	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
+	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
+	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
+	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
+	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
+	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
+	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
+	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
+	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_MSYNC                = 277 // { int|sys|13|msync(void *addr, size_t len, int flags); }
+	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
+	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
+	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
+	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
+	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
+	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
+	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
+	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
+	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
+	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
+	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
+	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
+	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
+	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
+	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
+	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
+	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
+	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
+	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
+	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
+	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
+	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
+	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
+	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
+	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
+	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
+	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
+	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
+	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
+	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
+	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
+	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
+	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
+	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
+	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
+	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
+	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
+	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
+	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
+	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
+	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
+	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
+	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
+	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
+	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
+	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
+	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
+	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
+	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
+	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
+	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
+	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
+	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
+	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
+	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
+	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
+	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
+	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
+	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
+	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
+	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
+	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
+	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
+	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
+	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
+	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
+	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
+	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
+	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
+	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
+	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
+	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
+	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
+	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
+	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
+	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
+	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
+	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
+	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
+	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
+	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
+	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
+	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
+	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
+	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
+	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
+	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
+	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
+	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
+	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
+	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
+	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
+	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
+	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
+	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
+	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
+	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
+	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
+	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
+	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
+	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
+	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
+	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
+	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
+	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
+	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
+	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
+	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
+	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
+	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
new file mode 100644
index 00000000..07787301
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
@@ -0,0 +1,207 @@
+// mksysnum_openbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+// +build 386,openbsd
+
+package unix
+
+const (
+	SYS_EXIT           = 1   // { void sys_exit(int rval); }
+	SYS_FORK           = 2   // { int sys_fork(void); }
+	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
+	SYS_OPEN           = 5   // { int sys_open(const char *path, \
+	SYS_CLOSE          = 6   // { int sys_close(int fd); }
+	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
+	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
+	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
+	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
+	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
+	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
+	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
+	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
+	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
+	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
+	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
+	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
+	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
+	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
+	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
+	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
+	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
+	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
+	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
+	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
+	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
+	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
+	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
+	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
+	SYS_ACCESS         = 33  // { int sys_access(const char *path, int flags); }
+	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
+	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
+	SYS_SYNC           = 36  // { void sys_sync(void); }
+	SYS_KILL           = 37  // { int sys_kill(int pid, int signum); }
+	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
+	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
+	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
+	SYS_DUP            = 41  // { int sys_dup(int fd); }
+	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
+	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
+	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
+	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
+	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
+	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
+	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
+	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
+	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
+	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
+	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
+	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
+	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
+	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
+	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
+	SYS_READLINK       = 58  // { int sys_readlink(const char *path, char *buf, \
+	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
+	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
+	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
+	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
+	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
+	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
+	SYS_VFORK          = 66  // { int sys_vfork(void); }
+	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
+	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
+	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
+	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
+	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
+	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
+	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
+	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
+	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
+	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
+	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
+	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
+	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
+	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
+	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
+	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, int pgid); }
+	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
+	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
+	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
+	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
+	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
+	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
+	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
+	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
+	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
+	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
+	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
+	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
+	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
+	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
+	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
+	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
+	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
+	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
+	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
+	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
+	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
+	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
+	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
+	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
+	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
+	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
+	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
+	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
+	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
+	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
+	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
+	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
+	SYS_SETSID         = 147 // { int sys_setsid(void); }
+	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
+	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
+	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
+	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
+	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
+	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
+	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
+	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
+	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
+	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
+	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
+	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
+	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
+	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
+	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
+	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
+	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
+	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
+	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
+	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
+	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
+	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
+	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
+	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
+	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
+	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
+	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
+	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
+	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
+	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
+	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
+	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
+	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
+	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
+	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
+	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
+	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
+	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
+	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
+	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
+	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
+	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
+	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
+	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
+	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
+	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
+	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
+	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
+	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
+	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
+	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
+	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
+	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
+	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
+	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
+	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
+	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
+	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
+	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
+	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
+	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
+	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
+	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
+	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
+	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
+	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
+	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
+	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
+	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
+	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
+	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
+	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
+	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
+	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
new file mode 100644
index 00000000..bc7fa579
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
@@ -0,0 +1,218 @@
+// mksysnum_openbsd.pl
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,openbsd
+
+package unix
+
+const (
+	SYS_EXIT           = 1   // { void sys_exit(int rval); }
+	SYS_FORK           = 2   // { int sys_fork(void); }
+	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
+	SYS_OPEN           = 5   // { int sys_open(const char *path, \
+	SYS_CLOSE          = 6   // { int sys_close(int fd); }
+	SYS_GETENTROPY     = 7   // { int sys_getentropy(void *buf, size_t nbyte); }
+	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
+	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
+	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
+	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
+	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
+	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
+	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
+	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
+	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
+	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
+	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
+	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
+	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
+	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
+	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
+	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
+	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
+	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
+	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
+	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
+	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
+	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
+	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
+	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
+	SYS_ACCESS         = 33  // { int sys_access(const char *path, int amode); }
+	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
+	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
+	SYS_SYNC           = 36  // { void sys_sync(void); }
+	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
+	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
+	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
+	SYS_DUP            = 41  // { int sys_dup(int fd); }
+	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
+	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
+	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
+	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
+	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
+	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
+	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
+	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
+	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
+	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
+	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
+	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
+	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
+	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
+	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
+	SYS_READLINK       = 58  // { ssize_t sys_readlink(const char *path, \
+	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
+	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
+	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
+	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
+	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
+	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
+	SYS_VFORK          = 66  // { int sys_vfork(void); }
+	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
+	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
+	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
+	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
+	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
+	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
+	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
+	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
+	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
+	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
+	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
+	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
+	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
+	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
+	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
+	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, pid_t pgid); }
+	SYS_FUTEX          = 83  // { int sys_futex(uint32_t *f, int op, int val, \
+	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
+	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
+	SYS_KBIND          = 86  // { int sys_kbind(const struct __kbind *param, \
+	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
+	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
+	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
+	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
+	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
+	SYS_ACCEPT4        = 93  // { int sys_accept4(int s, struct sockaddr *name, \
+	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
+	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
+	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
+	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
+	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
+	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
+	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
+	SYS_PIPE2          = 101 // { int sys_pipe2(int *fdp, int flags); }
+	SYS_DUP3           = 102 // { int sys_dup3(int from, int to, int flags); }
+	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
+	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
+	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
+	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
+	SYS_CHFLAGSAT      = 107 // { int sys_chflagsat(int fd, const char *path, \
+	SYS_PLEDGE         = 108 // { int sys_pledge(const char *promises, \
+	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
+	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
+	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
+	SYS_SENDSYSLOG     = 112 // { int sys_sendsyslog(const char *buf, size_t nbyte, \
+	SYS_UNVEIL         = 114 // { int sys_unveil(const char *path, \
+	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
+	SYS_THRKILL        = 119 // { int sys_thrkill(pid_t tid, int signum, void *tcb); }
+	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
+	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
+	SYS_KILL           = 122 // { int sys_kill(int pid, int signum); }
+	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
+	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
+	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
+	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
+	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
+	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
+	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
+	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
+	SYS_GETLOGIN_R     = 141 // { int sys_getlogin_r(char *namebuf, u_int namelen); }
+	SYS_SETSID         = 147 // { int sys_setsid(void); }
+	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
+	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
+	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
+	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
+	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
+	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
+	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
+	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
+	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
+	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
+	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
+	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
+	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
+	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
+	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
+	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
+	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
+	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
+	SYS_SYSCTL         = 202 // { int sys_sysctl(const int *name, u_int namelen, \
+	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
+	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
+	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
+	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
+	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
+	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
+	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
+	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
+	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
+	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
+	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
+	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
+	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
+	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
+	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
+	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
+	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
+	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
+	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
+	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
+	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
+	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
+	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
+	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
+	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
+	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
+	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
+	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
+	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
+	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
+	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
+	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
+	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
+	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
+	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
+	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
+	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
+	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
+	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
+	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
+	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
+	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
+	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
+	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
+	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
+	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
+	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
+	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
+	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
+	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
+	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
+	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
+	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
+	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
+	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
new file mode 100644
index 00000000..7a1693ac
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
@@ -0,0 +1,213 @@
+// mksysnum_openbsd.pl
+// Code generated by the command above; DO NOT EDIT.
+
+// +build arm,openbsd
+
+package unix
+
+const (
+	SYS_EXIT           = 1   // { void sys_exit(int rval); }
+	SYS_FORK           = 2   // { int sys_fork(void); }
+	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
+	SYS_OPEN           = 5   // { int sys_open(const char *path, \
+	SYS_CLOSE          = 6   // { int sys_close(int fd); }
+	SYS_GETENTROPY     = 7   // { int sys_getentropy(void *buf, size_t nbyte); }
+	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
+	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
+	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
+	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
+	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
+	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
+	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
+	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
+	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
+	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
+	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
+	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
+	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
+	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
+	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
+	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
+	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
+	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
+	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
+	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
+	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
+	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
+	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
+	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
+	SYS_ACCESS         = 33  // { int sys_access(const char *path, int amode); }
+	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
+	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
+	SYS_SYNC           = 36  // { void sys_sync(void); }
+	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
+	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
+	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
+	SYS_DUP            = 41  // { int sys_dup(int fd); }
+	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
+	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
+	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
+	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
+	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
+	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
+	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
+	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
+	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
+	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
+	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
+	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
+	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
+	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
+	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
+	SYS_READLINK       = 58  // { ssize_t sys_readlink(const char *path, \
+	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
+	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
+	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
+	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
+	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
+	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
+	SYS_VFORK          = 66  // { int sys_vfork(void); }
+	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
+	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
+	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
+	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
+	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
+	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
+	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
+	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
+	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
+	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
+	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
+	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
+	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
+	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
+	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
+	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, pid_t pgid); }
+	SYS_SENDSYSLOG     = 83  // { int sys_sendsyslog(const void *buf, size_t nbyte); }
+	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
+	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
+	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
+	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
+	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
+	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
+	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
+	SYS_ACCEPT4        = 93  // { int sys_accept4(int s, struct sockaddr *name, \
+	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
+	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
+	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
+	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
+	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
+	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
+	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
+	SYS_PIPE2          = 101 // { int sys_pipe2(int *fdp, int flags); }
+	SYS_DUP3           = 102 // { int sys_dup3(int from, int to, int flags); }
+	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
+	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
+	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
+	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
+	SYS_CHFLAGSAT      = 107 // { int sys_chflagsat(int fd, const char *path, \
+	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
+	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
+	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
+	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
+	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
+	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
+	SYS_KILL           = 122 // { int sys_kill(int pid, int signum); }
+	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
+	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
+	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
+	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
+	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
+	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
+	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
+	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
+	SYS_SETSID         = 147 // { int sys_setsid(void); }
+	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
+	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
+	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
+	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
+	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
+	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
+	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
+	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
+	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
+	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
+	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
+	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
+	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
+	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
+	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
+	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
+	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
+	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
+	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
+	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
+	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
+	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
+	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
+	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
+	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
+	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
+	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
+	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
+	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
+	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
+	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
+	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
+	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
+	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
+	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
+	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
+	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
+	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
+	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
+	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
+	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
+	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
+	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
+	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
+	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
+	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
+	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
+	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
+	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
+	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
+	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
+	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
+	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
+	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
+	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
+	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
+	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
+	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
+	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
+	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
+	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
+	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
+	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
+	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
+	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
+	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
+	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
+	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
+	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
+	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
+	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
+	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
+	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
+	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
new file mode 100644
index 00000000..327af5fb
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
@@ -0,0 +1,489 @@
+// cgo -godefs types_darwin.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,darwin
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timeval32 struct{}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset int64
+	Count  int32
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint32
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags       uint32
+	Contigbytes int64
+	Devoffset   int64
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	_       [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
+}
+
+type IfmaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Addrs    int32
+	Flags    int32
+	Index    uint16
+	_        [2]byte
+	Refcount int32
+}
+
+type RtMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp  Timeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x2
+	AT_REMOVEDIR        = 0x80
+	AT_SYMLINK_FOLLOW   = 0x40
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
new file mode 100644
index 00000000..116e6e07
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
@@ -0,0 +1,499 @@
+// cgo -godefs types_darwin.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,darwin
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int32
+	_    [4]byte
+}
+
+type Timeval32 struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	_             [4]byte
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset int64
+	Count  int32
+	_      [4]byte
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint64
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags uint32
+	_     [8]byte
+	_     [8]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	_       [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	_          [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval32
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
+}
+
+type IfmaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Addrs    int32
+	Flags    int32
+	Index    uint16
+	_        [2]byte
+	Refcount int32
+}
+
+type RtMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp  Timeval32
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
+}
+
+type Termios struct {
+	Iflag  uint64
+	Oflag  uint64
+	Cflag  uint64
+	Lflag  uint64
+	Cc     [20]uint8
+	_      [4]byte
+	Ispeed uint64
+	Ospeed uint64
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x2
+	AT_REMOVEDIR        = 0x80
+	AT_SYMLINK_FOLLOW   = 0x40
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
new file mode 100644
index 00000000..2750ad76
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
@@ -0,0 +1,490 @@
+// NOTE: cgo can't generate struct Stat_t and struct Statfs_t yet
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+// +build arm,darwin
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timeval32 [0]byte
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset int64
+	Count  int32
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint32
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags       uint32
+	Contigbytes int64
+	Devoffset   int64
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	_       [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
+}
+
+type IfmaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Addrs    int32
+	Flags    int32
+	Index    uint16
+	_        [2]byte
+	Refcount int32
+}
+
+type RtMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp  Timeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x2
+	AT_REMOVEDIR        = 0x80
+	AT_SYMLINK_FOLLOW   = 0x40
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
new file mode 100644
index 00000000..8cead099
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
@@ -0,0 +1,499 @@
+// cgo -godefs types_darwin.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm64,darwin
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int32
+	_    [4]byte
+}
+
+type Timeval32 struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	_             [4]byte
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset int64
+	Count  int32
+	_      [4]byte
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint64
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags uint32
+	_     [8]byte
+	_     [8]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	_       [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	_          [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval32
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
+}
+
+type IfmaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Addrs    int32
+	Flags    int32
+	Index    uint16
+	_        [2]byte
+	Refcount int32
+}
+
+type RtMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp  Timeval32
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
+}
+
+type Termios struct {
+	Iflag  uint64
+	Oflag  uint64
+	Cflag  uint64
+	Lflag  uint64
+	Cc     [20]uint8
+	_      [4]byte
+	Ispeed uint64
+	Ospeed uint64
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x2
+	AT_REMOVEDIR        = 0x80
+	AT_SYMLINK_FOLLOW   = 0x40
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
new file mode 100644
index 00000000..315a553b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
@@ -0,0 +1,486 @@
+// cgo -godefs types_dragonfly.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,dragonfly
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur int64
+	Max int64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Ino      uint64
+	Nlink    uint32
+	Dev      uint32
+	Mode     uint16
+	Padding1 uint16
+	Uid      uint32
+	Gid      uint32
+	Rdev     uint32
+	Atim     Timespec
+	Mtim     Timespec
+	Ctim     Timespec
+	Size     int64
+	Blocks   int64
+	Blksize  uint32
+	Flags    uint32
+	Gen      uint32
+	Lspare   int32
+	Qspare1  int64
+	Qspare2  int64
+}
+
+type Statfs_t struct {
+	Spare2      int64
+	Bsize       int64
+	Iosize      int64
+	Blocks      int64
+	Bfree       int64
+	Bavail      int64
+	Files       int64
+	Ffree       int64
+	Fsid        Fsid
+	Owner       uint32
+	Type        int32
+	Flags       int32
+	_           [4]byte
+	Syncwrites  int64
+	Asyncwrites int64
+	Fstypename  [16]int8
+	Mntonname   [80]int8
+	Syncreads   int64
+	Asyncreads  int64
+	Spares1     int16
+	Mntfromname [80]int8
+	Spares2     int16
+	_           [4]byte
+	Spare       [2]int64
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno  uint64
+	Namlen  uint16
+	Type    uint8
+	Unused1 uint8
+	Unused2 uint32
+	Name    [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+	Rcf    uint16
+	Route  [16]uint16
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	_          [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x36
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [16]uint64
+}
+
+const (
+	SizeofIfMsghdr         = 0xb0
+	SizeofIfData           = 0xa0
+	SizeofIfaMsghdr        = 0x14
+	SizeofIfmaMsghdr       = 0x10
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x98
+	SizeofRtMetrics        = 0x70
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	_          [2]byte
+	Mtu        uint64
+	Metric     uint64
+	Link_state uint64
+	Baudrate   uint64
+	Ipackets   uint64
+	Ierrors    uint64
+	Opackets   uint64
+	Oerrors    uint64
+	Collisions uint64
+	Ibytes     uint64
+	Obytes     uint64
+	Imcasts    uint64
+	Omcasts    uint64
+	Iqdrops    uint64
+	Noproto    uint64
+	Hwassist   uint64
+	Oqdrops    uint64
+	Lastchange Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
+}
+
+type IfmaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint64
+	Rmx     RtMetrics
+}
+
+type RtMetrics struct {
+	Locks     uint64
+	Mtu       uint64
+	Pksent    uint64
+	Expire    uint64
+	Sendpipe  uint64
+	Ssthresh  uint64
+	Rtt       uint64
+	Rttvar    uint64
+	Recvpipe  uint64
+	Hopcount  uint64
+	Mssopt    uint16
+	Pad       uint16
+	_         [4]byte
+	Msl       uint64
+	Iwmaxsegs uint64
+	Iwcapsegs uint64
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp  Timeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [6]byte
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = 0xfffafdcd
+	AT_SYMLINK_NOFOLLOW = 0x1
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [32]byte
+	Nodename [32]byte
+	Release  [32]byte
+	Version  [32]byte
+	Machine  [32]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
new file mode 100644
index 00000000..81793a2a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
@@ -0,0 +1,555 @@
+// cgo -godefs types_freebsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,freebsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur int64
+	Max int64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+	S_IRWXG  = 0x38
+	S_IRWXO  = 0x7
+)
+
+type Stat_t struct {
+	Dev           uint32
+	Ino           uint32
+	Mode          uint16
+	Nlink         uint16
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Birthtimespec Timespec
+	Pad_cgo_0     [8]byte
+}
+
+type Statfs_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+	Sysid  int32
+}
+
+type Dirent struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [46]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x36
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPMreqn          = 0xc
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
+}
+
+type FdSet struct {
+	X__fds_bits [32]uint32
+}
+
+const (
+	sizeofIfMsghdr         = 0xa8
+	SizeofIfMsghdr         = 0x60
+	sizeofIfData           = 0x98
+	SizeofIfData           = 0x50
+	SizeofIfaMsghdr        = 0x14
+	SizeofIfmaMsghdr       = 0x10
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x5c
+	SizeofRtMetrics        = 0x38
+)
+
+type ifMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      ifData
+}
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type ifData struct {
+	Type              uint8
+	Physical          uint8
+	Addrlen           uint8
+	Hdrlen            uint8
+	Link_state        uint8
+	Vhid              uint8
+	Datalen           uint16
+	Mtu               uint32
+	Metric            uint32
+	Baudrate          uint64
+	Ipackets          uint64
+	Ierrors           uint64
+	Opackets          uint64
+	Oerrors           uint64
+	Collisions        uint64
+	Ibytes            uint64
+	Obytes            uint64
+	Imcasts           uint64
+	Omcasts           uint64
+	Iqdrops           uint64
+	Oqdrops           uint64
+	Noproto           uint64
+	Hwassist          uint64
+	X__ifi_epoch      [8]byte
+	X__ifi_lastchange [16]byte
+}
+
+type IfData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Spare_char1 uint8
+	Spare_char2 uint8
+	Datalen     uint8
+	Mtu         uint32
+	Metric      uint32
+	Baudrate    uint32
+	Ipackets    uint32
+	Ierrors     uint32
+	Opackets    uint32
+	Oerrors     uint32
+	Collisions  uint32
+	Ibytes      uint32
+	Obytes      uint32
+	Imcasts     uint32
+	Omcasts     uint32
+	Iqdrops     uint32
+	Noproto     uint32
+	Hwassist    uint32
+	Epoch       int32
+	Lastchange  Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Fmask     int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Weight   uint32
+	Filler   [3]uint32
+}
+
+const (
+	SizeofBpfVersion    = 0x4
+	SizeofBpfStat       = 0x8
+	SizeofBpfZbuf       = 0xc
+	SizeofBpfProgram    = 0x8
+	SizeofBpfInsn       = 0x8
+	SizeofBpfHdr        = 0x14
+	SizeofBpfZbufHeader = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfZbuf struct {
+	Bufa   *byte
+	Bufb   *byte
+	Buflen uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfZbufHeader struct {
+	Kernel_gen uint32
+	Kernel_len uint32
+	User_gen   uint32
+	X_bzh_pad  [5]uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x800
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR      = 0x8
+	POLLHUP      = 0x10
+	POLLIN       = 0x1
+	POLLINIGNEOF = 0x2000
+	POLLNVAL     = 0x20
+	POLLOUT      = 0x4
+	POLLPRI      = 0x2
+	POLLRDBAND   = 0x80
+	POLLRDNORM   = 0x40
+	POLLWRBAND   = 0x100
+	POLLWRNORM   = 0x4
+)
+
+type CapRights struct {
+	Rights [2]uint64
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
new file mode 100644
index 00000000..6c7589b4
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
@@ -0,0 +1,558 @@
+// cgo -godefs types_freebsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,freebsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur int64
+	Max int64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+	S_IRWXG  = 0x38
+	S_IRWXO  = 0x7
+)
+
+type Stat_t struct {
+	Dev           uint32
+	Ino           uint32
+	Mode          uint16
+	Nlink         uint16
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Birthtimespec Timespec
+}
+
+type Statfs_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
+}
+
+type Flock_t struct {
+	Start     int64
+	Len       int64
+	Pid       int32
+	Type      int16
+	Whence    int16
+	Sysid     int32
+	Pad_cgo_0 [4]byte
+}
+
+type Dirent struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [46]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x36
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPMreqn          = 0xc
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	X__fds_bits [16]uint64
+}
+
+const (
+	sizeofIfMsghdr         = 0xa8
+	SizeofIfMsghdr         = 0xa8
+	sizeofIfData           = 0x98
+	SizeofIfData           = 0x98
+	SizeofIfaMsghdr        = 0x14
+	SizeofIfmaMsghdr       = 0x10
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x98
+	SizeofRtMetrics        = 0x70
+)
+
+type ifMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      ifData
+}
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type ifData struct {
+	Type              uint8
+	Physical          uint8
+	Addrlen           uint8
+	Hdrlen            uint8
+	Link_state        uint8
+	Vhid              uint8
+	Datalen           uint16
+	Mtu               uint32
+	Metric            uint32
+	Baudrate          uint64
+	Ipackets          uint64
+	Ierrors           uint64
+	Opackets          uint64
+	Oerrors           uint64
+	Collisions        uint64
+	Ibytes            uint64
+	Obytes            uint64
+	Imcasts           uint64
+	Omcasts           uint64
+	Iqdrops           uint64
+	Oqdrops           uint64
+	Noproto           uint64
+	Hwassist          uint64
+	X__ifi_epoch      [8]byte
+	X__ifi_lastchange [16]byte
+}
+
+type IfData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Spare_char1 uint8
+	Spare_char2 uint8
+	Datalen     uint8
+	Mtu         uint64
+	Metric      uint64
+	Baudrate    uint64
+	Ipackets    uint64
+	Ierrors     uint64
+	Opackets    uint64
+	Oerrors     uint64
+	Collisions  uint64
+	Ibytes      uint64
+	Obytes      uint64
+	Imcasts     uint64
+	Omcasts     uint64
+	Iqdrops     uint64
+	Noproto     uint64
+	Hwassist    uint64
+	Epoch       int64
+	Lastchange  Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Fmask     int32
+	Inits     uint64
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint64
+	Mtu      uint64
+	Hopcount uint64
+	Expire   uint64
+	Recvpipe uint64
+	Sendpipe uint64
+	Ssthresh uint64
+	Rtt      uint64
+	Rttvar   uint64
+	Pksent   uint64
+	Weight   uint64
+	Filler   [3]uint64
+}
+
+const (
+	SizeofBpfVersion    = 0x4
+	SizeofBpfStat       = 0x8
+	SizeofBpfZbuf       = 0x18
+	SizeofBpfProgram    = 0x10
+	SizeofBpfInsn       = 0x8
+	SizeofBpfHdr        = 0x20
+	SizeofBpfZbufHeader = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfZbuf struct {
+	Bufa   *byte
+	Bufb   *byte
+	Buflen uint64
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [6]byte
+}
+
+type BpfZbufHeader struct {
+	Kernel_gen uint32
+	Kernel_len uint32
+	User_gen   uint32
+	X_bzh_pad  [5]uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x800
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR      = 0x8
+	POLLHUP      = 0x10
+	POLLIN       = 0x1
+	POLLINIGNEOF = 0x2000
+	POLLNVAL     = 0x20
+	POLLOUT      = 0x4
+	POLLPRI      = 0x2
+	POLLRDBAND   = 0x80
+	POLLRDNORM   = 0x40
+	POLLWRBAND   = 0x100
+	POLLWRNORM   = 0x4
+)
+
+type CapRights struct {
+	Rights [2]uint64
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
new file mode 100644
index 00000000..f620a125
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
@@ -0,0 +1,558 @@
+// cgo -godefs -- -fsigned-char types_freebsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,freebsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec       int64
+	Nsec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur int64
+	Max int64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+	S_IRWXG  = 0x38
+	S_IRWXO  = 0x7
+)
+
+type Stat_t struct {
+	Dev           uint32
+	Ino           uint32
+	Mode          uint16
+	Nlink         uint16
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Birthtimespec Timespec
+}
+
+type Statfs_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
+}
+
+type Flock_t struct {
+	Start     int64
+	Len       int64
+	Pid       int32
+	Type      int16
+	Whence    int16
+	Sysid     int32
+	Pad_cgo_0 [4]byte
+}
+
+type Dirent struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [46]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x36
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPMreqn          = 0xc
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
+}
+
+type FdSet struct {
+	X__fds_bits [32]uint32
+}
+
+const (
+	sizeofIfMsghdr         = 0xa8
+	SizeofIfMsghdr         = 0x70
+	sizeofIfData           = 0x98
+	SizeofIfData           = 0x60
+	SizeofIfaMsghdr        = 0x14
+	SizeofIfmaMsghdr       = 0x10
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x5c
+	SizeofRtMetrics        = 0x38
+)
+
+type ifMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      ifData
+}
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type ifData struct {
+	Type              uint8
+	Physical          uint8
+	Addrlen           uint8
+	Hdrlen            uint8
+	Link_state        uint8
+	Vhid              uint8
+	Datalen           uint16
+	Mtu               uint32
+	Metric            uint32
+	Baudrate          uint64
+	Ipackets          uint64
+	Ierrors           uint64
+	Opackets          uint64
+	Oerrors           uint64
+	Collisions        uint64
+	Ibytes            uint64
+	Obytes            uint64
+	Imcasts           uint64
+	Omcasts           uint64
+	Iqdrops           uint64
+	Oqdrops           uint64
+	Noproto           uint64
+	Hwassist          uint64
+	X__ifi_epoch      [8]byte
+	X__ifi_lastchange [16]byte
+}
+
+type IfData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Spare_char1 uint8
+	Spare_char2 uint8
+	Datalen     uint8
+	Mtu         uint32
+	Metric      uint32
+	Baudrate    uint32
+	Ipackets    uint32
+	Ierrors     uint32
+	Opackets    uint32
+	Oerrors     uint32
+	Collisions  uint32
+	Ibytes      uint32
+	Obytes      uint32
+	Imcasts     uint32
+	Omcasts     uint32
+	Iqdrops     uint32
+	Noproto     uint32
+	Hwassist    uint32
+	Pad_cgo_0   [4]byte
+	Epoch       int64
+	Lastchange  Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Fmask     int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Weight   uint32
+	Filler   [3]uint32
+}
+
+const (
+	SizeofBpfVersion    = 0x4
+	SizeofBpfStat       = 0x8
+	SizeofBpfZbuf       = 0xc
+	SizeofBpfProgram    = 0x8
+	SizeofBpfInsn       = 0x8
+	SizeofBpfHdr        = 0x20
+	SizeofBpfZbufHeader = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfZbuf struct {
+	Bufa   *byte
+	Bufb   *byte
+	Buflen uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [6]byte
+}
+
+type BpfZbufHeader struct {
+	Kernel_gen uint32
+	Kernel_len uint32
+	User_gen   uint32
+	X_bzh_pad  [5]uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x800
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR      = 0x8
+	POLLHUP      = 0x10
+	POLLIN       = 0x1
+	POLLINIGNEOF = 0x2000
+	POLLNVAL     = 0x20
+	POLLOUT      = 0x4
+	POLLPRI      = 0x2
+	POLLRDBAND   = 0x80
+	POLLRDNORM   = 0x40
+	POLLWRBAND   = 0x100
+	POLLWRNORM   = 0x4
+)
+
+type CapRights struct {
+	Rights [2]uint64
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
new file mode 100644
index 00000000..cb3729ea
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -0,0 +1,1884 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timex struct {
+	Modes     uint32
+	Offset    int32
+	Freq      int32
+	Maxerror  int32
+	Esterror  int32
+	Status    int32
+	Constant  int32
+	Precision int32
+	Tolerance int32
+	Time      Timeval
+	Tick      int32
+	Ppsfreq   int32
+	Jitter    int32
+	Shift     int32
+	Stabil    int32
+	Jitcnt    int32
+	Calcnt    int32
+	Errcnt    int32
+	Stbcnt    int32
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int32
+
+type Tms struct {
+	Utime  int32
+	Stime  int32
+	Cutime int32
+	Cstime int32
+}
+
+type Utimbuf struct {
+	Actime  int32
+	Modtime int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	_       uint16
+	_       [2]byte
+	_       uint32
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint64
+	_       uint16
+	_       [2]byte
+	Size    int64
+	Blksize int32
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Ino     uint64
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [1]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	Start  int64
+	Len    int64
+	Pid    int32
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x1c
+	SizeofCmsghdr           = 0xc
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x8
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [2]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Ebx      int32
+	Ecx      int32
+	Edx      int32
+	Esi      int32
+	Edi      int32
+	Ebp      int32
+	Eax      int32
+	Xds      int32
+	Xes      int32
+	Xfs      int32
+	Xgs      int32
+	Orig_eax int32
+	Eip      int32
+	Xcs      int32
+	Eflags   int32
+	Esp      int32
+	Xss      int32
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+type Sysinfo_t struct {
+	Uptime    int32
+	Loads     [3]uint32
+	Totalram  uint32
+	Freeram   uint32
+	Sharedram uint32
+	Bufferram uint32
+	Totalswap uint32
+	Freeswap  uint32
+	Procs     uint16
+	Pad       uint16
+	Totalhigh uint32
+	Freehigh  uint32
+	Unit      uint32
+	_         [8]int8
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	Tinode uint32
+	Fname  [6]int8
+	Fpack  [6]int8
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [32]uint32
+}
+
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint32
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x20
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [122]int8
+	_      uint32
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	Start     uint32
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int32
+	Frsize  int32
+	Flags   int32
+	Spare   [4]int32
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint32
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x18
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int32
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
new file mode 100644
index 00000000..0f3c0fb5
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -0,0 +1,1906 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Blksize int64
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	_       [3]int64
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	R15      uint64
+	R14      uint64
+	R13      uint64
+	R12      uint64
+	Rbp      uint64
+	Rbx      uint64
+	R11      uint64
+	R10      uint64
+	R9       uint64
+	R8       uint64
+	Rax      uint64
+	Rcx      uint64
+	Rdx      uint64
+	Rsi      uint64
+	Rdi      uint64
+	Orig_rax uint64
+	Rip      uint64
+	Cs       uint64
+	Eflags   uint64
+	Rsp      uint64
+	Ss       uint64
+	Fs_base  uint64
+	Gs_base  uint64
+	Ds       uint64
+	Es       uint64
+	Fs       uint64
+	Gs       uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]int8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [16]uint64
+}
+
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int64
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
new file mode 100644
index 00000000..bd534da8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -0,0 +1,1874 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timex struct {
+	Modes     uint32
+	Offset    int32
+	Freq      int32
+	Maxerror  int32
+	Esterror  int32
+	Status    int32
+	Constant  int32
+	Precision int32
+	Tolerance int32
+	Time      Timeval
+	Tick      int32
+	Ppsfreq   int32
+	Jitter    int32
+	Shift     int32
+	Stabil    int32
+	Jitcnt    int32
+	Calcnt    int32
+	Errcnt    int32
+	Stbcnt    int32
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int32
+
+type Tms struct {
+	Utime  int32
+	Stime  int32
+	Cutime int32
+	Cstime int32
+}
+
+type Utimbuf struct {
+	Actime  int32
+	Modtime int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	_       uint16
+	_       [2]byte
+	_       uint32
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint64
+	_       uint16
+	_       [6]byte
+	Size    int64
+	Blksize int32
+	_       [4]byte
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Ino     uint64
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]uint8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]uint8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]uint8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x1c
+	SizeofCmsghdr           = 0xc
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x8
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [2]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Uregs [18]uint32
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+type Sysinfo_t struct {
+	Uptime    int32
+	Loads     [3]uint32
+	Totalram  uint32
+	Freeram   uint32
+	Sharedram uint32
+	Bufferram uint32
+	Totalswap uint32
+	Freeswap  uint32
+	Procs     uint16
+	Pad       uint16
+	Totalhigh uint32
+	Freehigh  uint32
+	Unit      uint32
+	_         [8]uint8
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	Tinode uint32
+	Fname  [6]uint8
+	Fpack  [6]uint8
+}
+
+type EpollEvent struct {
+	Events uint32
+	PadFd  int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [32]uint32
+}
+
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]uint8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint32
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x20
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [122]uint8
+	_      uint32
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	Start     uint32
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int32
+	Frsize  int32
+	Flags   int32
+	Spare   [4]int32
+	_       [4]byte
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint32
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x18
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int32
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
new file mode 100644
index 00000000..3a72fd9f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -0,0 +1,1885 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm64,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint64
+	_       uint64
+	Size    int64
+	Blksize int32
+	_       int32
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	_       [2]int32
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs   [31]uint64
+	Sp     uint64
+	Pc     uint64
+	Pstate uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]int8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	PadFd  int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [16]uint64
+}
+
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int64
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
new file mode 100644
index 00000000..cd360b27
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
@@ -0,0 +1,1879 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timex struct {
+	Modes     uint32
+	Offset    int32
+	Freq      int32
+	Maxerror  int32
+	Esterror  int32
+	Status    int32
+	Constant  int32
+	Precision int32
+	Tolerance int32
+	Time      Timeval
+	Tick      int32
+	Ppsfreq   int32
+	Jitter    int32
+	Shift     int32
+	Stabil    int32
+	Jitcnt    int32
+	Calcnt    int32
+	Errcnt    int32
+	Stbcnt    int32
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int32
+
+type Tms struct {
+	Utime  int32
+	Stime  int32
+	Cutime int32
+	Cstime int32
+}
+
+type Utimbuf struct {
+	Actime  int32
+	Modtime int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint32
+	Pad1    [3]int32
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Pad2    [3]int32
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize int32
+	Pad4    int32
+	Blocks  int64
+	Pad5    [14]int32
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x1c
+	SizeofCmsghdr           = 0xc
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x8
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [2]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+type Sysinfo_t struct {
+	Uptime    int32
+	Loads     [3]uint32
+	Totalram  uint32
+	Freeram   uint32
+	Sharedram uint32
+	Bufferram uint32
+	Totalswap uint32
+	Freeswap  uint32
+	Procs     uint16
+	Pad       uint16
+	Totalhigh uint32
+	Freehigh  uint32
+	Unit      uint32
+	_         [8]int8
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	Tinode uint32
+	Fname  [6]int8
+	Fpack  [6]int8
+}
+
+type EpollEvent struct {
+	Events uint32
+	PadFd  int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [32]uint32
+}
+
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [23]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint32
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x20
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x8000000000000000
+	CBitFieldMaskBit1  = 0x4000000000000000
+	CBitFieldMaskBit2  = 0x2000000000000000
+	CBitFieldMaskBit3  = 0x1000000000000000
+	CBitFieldMaskBit4  = 0x800000000000000
+	CBitFieldMaskBit5  = 0x400000000000000
+	CBitFieldMaskBit6  = 0x200000000000000
+	CBitFieldMaskBit7  = 0x100000000000000
+	CBitFieldMaskBit8  = 0x80000000000000
+	CBitFieldMaskBit9  = 0x40000000000000
+	CBitFieldMaskBit10 = 0x20000000000000
+	CBitFieldMaskBit11 = 0x10000000000000
+	CBitFieldMaskBit12 = 0x8000000000000
+	CBitFieldMaskBit13 = 0x4000000000000
+	CBitFieldMaskBit14 = 0x2000000000000
+	CBitFieldMaskBit15 = 0x1000000000000
+	CBitFieldMaskBit16 = 0x800000000000
+	CBitFieldMaskBit17 = 0x400000000000
+	CBitFieldMaskBit18 = 0x200000000000
+	CBitFieldMaskBit19 = 0x100000000000
+	CBitFieldMaskBit20 = 0x80000000000
+	CBitFieldMaskBit21 = 0x40000000000
+	CBitFieldMaskBit22 = 0x20000000000
+	CBitFieldMaskBit23 = 0x10000000000
+	CBitFieldMaskBit24 = 0x8000000000
+	CBitFieldMaskBit25 = 0x4000000000
+	CBitFieldMaskBit26 = 0x2000000000
+	CBitFieldMaskBit27 = 0x1000000000
+	CBitFieldMaskBit28 = 0x800000000
+	CBitFieldMaskBit29 = 0x400000000
+	CBitFieldMaskBit30 = 0x200000000
+	CBitFieldMaskBit31 = 0x100000000
+	CBitFieldMaskBit32 = 0x80000000
+	CBitFieldMaskBit33 = 0x40000000
+	CBitFieldMaskBit34 = 0x20000000
+	CBitFieldMaskBit35 = 0x10000000
+	CBitFieldMaskBit36 = 0x8000000
+	CBitFieldMaskBit37 = 0x4000000
+	CBitFieldMaskBit38 = 0x2000000
+	CBitFieldMaskBit39 = 0x1000000
+	CBitFieldMaskBit40 = 0x800000
+	CBitFieldMaskBit41 = 0x400000
+	CBitFieldMaskBit42 = 0x200000
+	CBitFieldMaskBit43 = 0x100000
+	CBitFieldMaskBit44 = 0x80000
+	CBitFieldMaskBit45 = 0x40000
+	CBitFieldMaskBit46 = 0x20000
+	CBitFieldMaskBit47 = 0x10000
+	CBitFieldMaskBit48 = 0x8000
+	CBitFieldMaskBit49 = 0x4000
+	CBitFieldMaskBit50 = 0x2000
+	CBitFieldMaskBit51 = 0x1000
+	CBitFieldMaskBit52 = 0x800
+	CBitFieldMaskBit53 = 0x400
+	CBitFieldMaskBit54 = 0x200
+	CBitFieldMaskBit55 = 0x100
+	CBitFieldMaskBit56 = 0x80
+	CBitFieldMaskBit57 = 0x40
+	CBitFieldMaskBit58 = 0x20
+	CBitFieldMaskBit59 = 0x10
+	CBitFieldMaskBit60 = 0x8
+	CBitFieldMaskBit61 = 0x4
+	CBitFieldMaskBit62 = 0x2
+	CBitFieldMaskBit63 = 0x1
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [122]int8
+	_      uint32
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	Start     uint32
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Frsize  int32
+	_       [4]byte
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int32
+	Flags   int32
+	Spare   [5]int32
+	_       [4]byte
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint32
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x18
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int32
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
new file mode 100644
index 00000000..d35ec602
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -0,0 +1,1887 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips64,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint32
+	Pad1    [3]uint32
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Pad2    [3]uint32
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize uint32
+	Pad4    uint32
+	Blocks  int64
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]int8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [16]uint64
+}
+
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [23]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x8000000000000000
+	CBitFieldMaskBit1  = 0x4000000000000000
+	CBitFieldMaskBit2  = 0x2000000000000000
+	CBitFieldMaskBit3  = 0x1000000000000000
+	CBitFieldMaskBit4  = 0x800000000000000
+	CBitFieldMaskBit5  = 0x400000000000000
+	CBitFieldMaskBit6  = 0x200000000000000
+	CBitFieldMaskBit7  = 0x100000000000000
+	CBitFieldMaskBit8  = 0x80000000000000
+	CBitFieldMaskBit9  = 0x40000000000000
+	CBitFieldMaskBit10 = 0x20000000000000
+	CBitFieldMaskBit11 = 0x10000000000000
+	CBitFieldMaskBit12 = 0x8000000000000
+	CBitFieldMaskBit13 = 0x4000000000000
+	CBitFieldMaskBit14 = 0x2000000000000
+	CBitFieldMaskBit15 = 0x1000000000000
+	CBitFieldMaskBit16 = 0x800000000000
+	CBitFieldMaskBit17 = 0x400000000000
+	CBitFieldMaskBit18 = 0x200000000000
+	CBitFieldMaskBit19 = 0x100000000000
+	CBitFieldMaskBit20 = 0x80000000000
+	CBitFieldMaskBit21 = 0x40000000000
+	CBitFieldMaskBit22 = 0x20000000000
+	CBitFieldMaskBit23 = 0x10000000000
+	CBitFieldMaskBit24 = 0x8000000000
+	CBitFieldMaskBit25 = 0x4000000000
+	CBitFieldMaskBit26 = 0x2000000000
+	CBitFieldMaskBit27 = 0x1000000000
+	CBitFieldMaskBit28 = 0x800000000
+	CBitFieldMaskBit29 = 0x400000000
+	CBitFieldMaskBit30 = 0x200000000
+	CBitFieldMaskBit31 = 0x100000000
+	CBitFieldMaskBit32 = 0x80000000
+	CBitFieldMaskBit33 = 0x40000000
+	CBitFieldMaskBit34 = 0x20000000
+	CBitFieldMaskBit35 = 0x10000000
+	CBitFieldMaskBit36 = 0x8000000
+	CBitFieldMaskBit37 = 0x4000000
+	CBitFieldMaskBit38 = 0x2000000
+	CBitFieldMaskBit39 = 0x1000000
+	CBitFieldMaskBit40 = 0x800000
+	CBitFieldMaskBit41 = 0x400000
+	CBitFieldMaskBit42 = 0x200000
+	CBitFieldMaskBit43 = 0x100000
+	CBitFieldMaskBit44 = 0x80000
+	CBitFieldMaskBit45 = 0x40000
+	CBitFieldMaskBit46 = 0x20000
+	CBitFieldMaskBit47 = 0x10000
+	CBitFieldMaskBit48 = 0x8000
+	CBitFieldMaskBit49 = 0x4000
+	CBitFieldMaskBit50 = 0x2000
+	CBitFieldMaskBit51 = 0x1000
+	CBitFieldMaskBit52 = 0x800
+	CBitFieldMaskBit53 = 0x400
+	CBitFieldMaskBit54 = 0x200
+	CBitFieldMaskBit55 = 0x100
+	CBitFieldMaskBit56 = 0x80
+	CBitFieldMaskBit57 = 0x40
+	CBitFieldMaskBit58 = 0x20
+	CBitFieldMaskBit59 = 0x10
+	CBitFieldMaskBit60 = 0x8
+	CBitFieldMaskBit61 = 0x4
+	CBitFieldMaskBit62 = 0x2
+	CBitFieldMaskBit63 = 0x1
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Frsize  int64
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int64
+	Flags   int64
+	Spare   [5]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int64
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
new file mode 100644
index 00000000..0f499302
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -0,0 +1,1887 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mips64le,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint32
+	Pad1    [3]uint32
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Pad2    [3]uint32
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize uint32
+	Pad4    uint32
+	Blocks  int64
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]int8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [16]uint64
+}
+
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [23]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Frsize  int64
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int64
+	Flags   int64
+	Spare   [5]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int64
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
new file mode 100644
index 00000000..55f97c5c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
@@ -0,0 +1,1879 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build mipsle,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timex struct {
+	Modes     uint32
+	Offset    int32
+	Freq      int32
+	Maxerror  int32
+	Esterror  int32
+	Status    int32
+	Constant  int32
+	Precision int32
+	Tolerance int32
+	Time      Timeval
+	Tick      int32
+	Ppsfreq   int32
+	Jitter    int32
+	Shift     int32
+	Stabil    int32
+	Jitcnt    int32
+	Calcnt    int32
+	Errcnt    int32
+	Stbcnt    int32
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int32
+
+type Tms struct {
+	Utime  int32
+	Stime  int32
+	Cutime int32
+	Cstime int32
+}
+
+type Utimbuf struct {
+	Actime  int32
+	Modtime int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint32
+	Pad1    [3]int32
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Pad2    [3]int32
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize int32
+	Pad4    int32
+	Blocks  int64
+	Pad5    [14]int32
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x1c
+	SizeofCmsghdr           = 0xc
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x8
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [2]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+type Sysinfo_t struct {
+	Uptime    int32
+	Loads     [3]uint32
+	Totalram  uint32
+	Freeram   uint32
+	Sharedram uint32
+	Bufferram uint32
+	Totalswap uint32
+	Freeswap  uint32
+	Procs     uint16
+	Pad       uint16
+	Totalhigh uint32
+	Freehigh  uint32
+	Unit      uint32
+	_         [8]int8
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	Tinode uint32
+	Fname  [6]int8
+	Fpack  [6]int8
+}
+
+type EpollEvent struct {
+	Events uint32
+	PadFd  int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [32]uint32
+}
+
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [23]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint32
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x20
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [122]int8
+	_      uint32
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	Start     uint32
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Frsize  int32
+	_       [4]byte
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int32
+	Flags   int32
+	Spare   [5]int32
+	_       [4]byte
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint32
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x18
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int32
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
new file mode 100644
index 00000000..f1d42644
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -0,0 +1,1895 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build ppc64,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Blksize int64
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	_       uint64
+	_       uint64
+	_       uint64
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]uint8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]uint8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]uint8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Gpr       [32]uint64
+	Nip       uint64
+	Msr       uint64
+	Orig_gpr3 uint64
+	Ctr       uint64
+	Link      uint64
+	Xer       uint64
+	Ccr       uint64
+	Softe     uint64
+	Trap      uint64
+	Dar       uint64
+	Dsisr     uint64
+	Result    uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]uint8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]uint8
+	Fpack  [6]uint8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	_      int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [16]uint64
+}
+
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [19]uint8
+	Line   uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]uint8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x8000000000000000
+	CBitFieldMaskBit1  = 0x4000000000000000
+	CBitFieldMaskBit2  = 0x2000000000000000
+	CBitFieldMaskBit3  = 0x1000000000000000
+	CBitFieldMaskBit4  = 0x800000000000000
+	CBitFieldMaskBit5  = 0x400000000000000
+	CBitFieldMaskBit6  = 0x200000000000000
+	CBitFieldMaskBit7  = 0x100000000000000
+	CBitFieldMaskBit8  = 0x80000000000000
+	CBitFieldMaskBit9  = 0x40000000000000
+	CBitFieldMaskBit10 = 0x20000000000000
+	CBitFieldMaskBit11 = 0x10000000000000
+	CBitFieldMaskBit12 = 0x8000000000000
+	CBitFieldMaskBit13 = 0x4000000000000
+	CBitFieldMaskBit14 = 0x2000000000000
+	CBitFieldMaskBit15 = 0x1000000000000
+	CBitFieldMaskBit16 = 0x800000000000
+	CBitFieldMaskBit17 = 0x400000000000
+	CBitFieldMaskBit18 = 0x200000000000
+	CBitFieldMaskBit19 = 0x100000000000
+	CBitFieldMaskBit20 = 0x80000000000
+	CBitFieldMaskBit21 = 0x40000000000
+	CBitFieldMaskBit22 = 0x20000000000
+	CBitFieldMaskBit23 = 0x10000000000
+	CBitFieldMaskBit24 = 0x8000000000
+	CBitFieldMaskBit25 = 0x4000000000
+	CBitFieldMaskBit26 = 0x2000000000
+	CBitFieldMaskBit27 = 0x1000000000
+	CBitFieldMaskBit28 = 0x800000000
+	CBitFieldMaskBit29 = 0x400000000
+	CBitFieldMaskBit30 = 0x200000000
+	CBitFieldMaskBit31 = 0x100000000
+	CBitFieldMaskBit32 = 0x80000000
+	CBitFieldMaskBit33 = 0x40000000
+	CBitFieldMaskBit34 = 0x20000000
+	CBitFieldMaskBit35 = 0x10000000
+	CBitFieldMaskBit36 = 0x8000000
+	CBitFieldMaskBit37 = 0x4000000
+	CBitFieldMaskBit38 = 0x2000000
+	CBitFieldMaskBit39 = 0x1000000
+	CBitFieldMaskBit40 = 0x800000
+	CBitFieldMaskBit41 = 0x400000
+	CBitFieldMaskBit42 = 0x200000
+	CBitFieldMaskBit43 = 0x100000
+	CBitFieldMaskBit44 = 0x80000
+	CBitFieldMaskBit45 = 0x40000
+	CBitFieldMaskBit46 = 0x20000
+	CBitFieldMaskBit47 = 0x10000
+	CBitFieldMaskBit48 = 0x8000
+	CBitFieldMaskBit49 = 0x4000
+	CBitFieldMaskBit50 = 0x2000
+	CBitFieldMaskBit51 = 0x1000
+	CBitFieldMaskBit52 = 0x800
+	CBitFieldMaskBit53 = 0x400
+	CBitFieldMaskBit54 = 0x200
+	CBitFieldMaskBit55 = 0x100
+	CBitFieldMaskBit56 = 0x80
+	CBitFieldMaskBit57 = 0x40
+	CBitFieldMaskBit58 = 0x20
+	CBitFieldMaskBit59 = 0x10
+	CBitFieldMaskBit60 = 0x8
+	CBitFieldMaskBit61 = 0x4
+	CBitFieldMaskBit62 = 0x2
+	CBitFieldMaskBit63 = 0x1
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]uint8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int64
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
new file mode 100644
index 00000000..90ab1f7a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -0,0 +1,1895 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build ppc64le,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Blksize int64
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	_       uint64
+	_       uint64
+	_       uint64
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]uint8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]uint8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]uint8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Gpr       [32]uint64
+	Nip       uint64
+	Msr       uint64
+	Orig_gpr3 uint64
+	Ctr       uint64
+	Link      uint64
+	Xer       uint64
+	Ccr       uint64
+	Softe     uint64
+	Trap      uint64
+	Dar       uint64
+	Dsisr     uint64
+	Result    uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]uint8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]uint8
+	Fpack  [6]uint8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	_      int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [16]uint64
+}
+
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [19]uint8
+	Line   uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]uint8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]uint8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int64
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
new file mode 100644
index 00000000..898ac451
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -0,0 +1,1912 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build s390x,linux
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize int64
+	Blocks  int64
+	_       [3]int64
+}
+
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x6
+	FADV_NOREUSE    = 0x7
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
+type RawSockaddrCAN struct {
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Psw                      PtracePsw
+	Gprs                     [16]uint64
+	Acrs                     [16]uint32
+	Orig_gpr2                uint64
+	Fp_regs                  PtraceFpregs
+	Per_info                 PtracePer
+	Ieee_instruction_pointer uint64
+}
+
+type PtracePsw struct {
+	Mask uint64
+	Addr uint64
+}
+
+type PtraceFpregs struct {
+	Fpc  uint32
+	_    [4]byte
+	Fprs [16]float64
+}
+
+type PtracePer struct {
+	_             [0]uint64
+	_             [24]byte
+	_             [8]byte
+	Starting_addr uint64
+	Ending_addr   uint64
+	Perc_atmid    uint16
+	_             [6]byte
+	Address       uint64
+	Access_id     uint8
+	_             [7]byte
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]int8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	_      int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+
+	AT_EACCESS = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x2000
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	Val [16]uint64
+}
+
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x8000000000000000
+	CBitFieldMaskBit1  = 0x4000000000000000
+	CBitFieldMaskBit2  = 0x2000000000000000
+	CBitFieldMaskBit3  = 0x1000000000000000
+	CBitFieldMaskBit4  = 0x800000000000000
+	CBitFieldMaskBit5  = 0x400000000000000
+	CBitFieldMaskBit6  = 0x200000000000000
+	CBitFieldMaskBit7  = 0x100000000000000
+	CBitFieldMaskBit8  = 0x80000000000000
+	CBitFieldMaskBit9  = 0x40000000000000
+	CBitFieldMaskBit10 = 0x20000000000000
+	CBitFieldMaskBit11 = 0x10000000000000
+	CBitFieldMaskBit12 = 0x8000000000000
+	CBitFieldMaskBit13 = 0x4000000000000
+	CBitFieldMaskBit14 = 0x2000000000000
+	CBitFieldMaskBit15 = 0x1000000000000
+	CBitFieldMaskBit16 = 0x800000000000
+	CBitFieldMaskBit17 = 0x400000000000
+	CBitFieldMaskBit18 = 0x200000000000
+	CBitFieldMaskBit19 = 0x100000000000
+	CBitFieldMaskBit20 = 0x80000000000
+	CBitFieldMaskBit21 = 0x40000000000
+	CBitFieldMaskBit22 = 0x20000000000
+	CBitFieldMaskBit23 = 0x10000000000
+	CBitFieldMaskBit24 = 0x8000000000
+	CBitFieldMaskBit25 = 0x4000000000
+	CBitFieldMaskBit26 = 0x2000000000
+	CBitFieldMaskBit27 = 0x1000000000
+	CBitFieldMaskBit28 = 0x800000000
+	CBitFieldMaskBit29 = 0x400000000
+	CBitFieldMaskBit30 = 0x200000000
+	CBitFieldMaskBit31 = 0x100000000
+	CBitFieldMaskBit32 = 0x80000000
+	CBitFieldMaskBit33 = 0x40000000
+	CBitFieldMaskBit34 = 0x20000000
+	CBitFieldMaskBit35 = 0x10000000
+	CBitFieldMaskBit36 = 0x8000000
+	CBitFieldMaskBit37 = 0x4000000
+	CBitFieldMaskBit38 = 0x2000000
+	CBitFieldMaskBit39 = 0x1000000
+	CBitFieldMaskBit40 = 0x800000
+	CBitFieldMaskBit41 = 0x400000
+	CBitFieldMaskBit42 = 0x200000
+	CBitFieldMaskBit43 = 0x100000
+	CBitFieldMaskBit44 = 0x80000
+	CBitFieldMaskBit45 = 0x40000
+	CBitFieldMaskBit46 = 0x20000
+	CBitFieldMaskBit47 = 0x10000
+	CBitFieldMaskBit48 = 0x8000
+	CBitFieldMaskBit49 = 0x4000
+	CBitFieldMaskBit50 = 0x2000
+	CBitFieldMaskBit51 = 0x1000
+	CBitFieldMaskBit52 = 0x800
+	CBitFieldMaskBit53 = 0x400
+	CBitFieldMaskBit54 = 0x200
+	CBitFieldMaskBit55 = 0x100
+	CBitFieldMaskBit56 = 0x80
+	CBitFieldMaskBit57 = 0x40
+	CBitFieldMaskBit58 = 0x20
+	CBitFieldMaskBit59 = 0x10
+	CBitFieldMaskBit60 = 0x8
+	CBitFieldMaskBit61 = 0x4
+	CBitFieldMaskBit62 = 0x2
+	CBitFieldMaskBit63 = 0x1
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    uint32
+	Bsize   uint32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen uint32
+	Frsize  uint32
+	Flags   uint32
+	Spare   [4]uint32
+	_       [4]byte
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
+
+const (
+	NF_INET_PRE_ROUTING  = 0x0
+	NF_INET_LOCAL_IN     = 0x1
+	NF_INET_FORWARD      = 0x2
+	NF_INET_LOCAL_OUT    = 0x3
+	NF_INET_POST_ROUTING = 0x4
+	NF_INET_NUMHOOKS     = 0x5
+)
+
+const (
+	NF_NETDEV_INGRESS  = 0x0
+	NF_NETDEV_NUMHOOKS = 0x1
+)
+
+const (
+	NFPROTO_UNSPEC   = 0x0
+	NFPROTO_INET     = 0x1
+	NFPROTO_IPV4     = 0x2
+	NFPROTO_ARP      = 0x3
+	NFPROTO_NETDEV   = 0x5
+	NFPROTO_BRIDGE   = 0x7
+	NFPROTO_IPV6     = 0xa
+	NFPROTO_DECNET   = 0xc
+	NFPROTO_NUMPROTO = 0xd
+)
+
+type Nfgenmsg struct {
+	Nfgen_family uint8
+	Version      uint8
+	Res_id       uint16
+}
+
+const (
+	NFNL_BATCH_UNSPEC = 0x0
+	NFNL_BATCH_GENID  = 0x1
+)
+
+const (
+	NFT_REG_VERDICT                   = 0x0
+	NFT_REG_1                         = 0x1
+	NFT_REG_2                         = 0x2
+	NFT_REG_3                         = 0x3
+	NFT_REG_4                         = 0x4
+	NFT_REG32_00                      = 0x8
+	NFT_REG32_01                      = 0x9
+	NFT_REG32_02                      = 0xa
+	NFT_REG32_03                      = 0xb
+	NFT_REG32_04                      = 0xc
+	NFT_REG32_05                      = 0xd
+	NFT_REG32_06                      = 0xe
+	NFT_REG32_07                      = 0xf
+	NFT_REG32_08                      = 0x10
+	NFT_REG32_09                      = 0x11
+	NFT_REG32_10                      = 0x12
+	NFT_REG32_11                      = 0x13
+	NFT_REG32_12                      = 0x14
+	NFT_REG32_13                      = 0x15
+	NFT_REG32_14                      = 0x16
+	NFT_REG32_15                      = 0x17
+	NFT_CONTINUE                      = -0x1
+	NFT_BREAK                         = -0x2
+	NFT_JUMP                          = -0x3
+	NFT_GOTO                          = -0x4
+	NFT_RETURN                        = -0x5
+	NFT_MSG_NEWTABLE                  = 0x0
+	NFT_MSG_GETTABLE                  = 0x1
+	NFT_MSG_DELTABLE                  = 0x2
+	NFT_MSG_NEWCHAIN                  = 0x3
+	NFT_MSG_GETCHAIN                  = 0x4
+	NFT_MSG_DELCHAIN                  = 0x5
+	NFT_MSG_NEWRULE                   = 0x6
+	NFT_MSG_GETRULE                   = 0x7
+	NFT_MSG_DELRULE                   = 0x8
+	NFT_MSG_NEWSET                    = 0x9
+	NFT_MSG_GETSET                    = 0xa
+	NFT_MSG_DELSET                    = 0xb
+	NFT_MSG_NEWSETELEM                = 0xc
+	NFT_MSG_GETSETELEM                = 0xd
+	NFT_MSG_DELSETELEM                = 0xe
+	NFT_MSG_NEWGEN                    = 0xf
+	NFT_MSG_GETGEN                    = 0x10
+	NFT_MSG_TRACE                     = 0x11
+	NFT_MSG_NEWOBJ                    = 0x12
+	NFT_MSG_GETOBJ                    = 0x13
+	NFT_MSG_DELOBJ                    = 0x14
+	NFT_MSG_GETOBJ_RESET              = 0x15
+	NFT_MSG_MAX                       = 0x19
+	NFTA_LIST_UNPEC                   = 0x0
+	NFTA_LIST_ELEM                    = 0x1
+	NFTA_HOOK_UNSPEC                  = 0x0
+	NFTA_HOOK_HOOKNUM                 = 0x1
+	NFTA_HOOK_PRIORITY                = 0x2
+	NFTA_HOOK_DEV                     = 0x3
+	NFT_TABLE_F_DORMANT               = 0x1
+	NFTA_TABLE_UNSPEC                 = 0x0
+	NFTA_TABLE_NAME                   = 0x1
+	NFTA_TABLE_FLAGS                  = 0x2
+	NFTA_TABLE_USE                    = 0x3
+	NFTA_CHAIN_UNSPEC                 = 0x0
+	NFTA_CHAIN_TABLE                  = 0x1
+	NFTA_CHAIN_HANDLE                 = 0x2
+	NFTA_CHAIN_NAME                   = 0x3
+	NFTA_CHAIN_HOOK                   = 0x4
+	NFTA_CHAIN_POLICY                 = 0x5
+	NFTA_CHAIN_USE                    = 0x6
+	NFTA_CHAIN_TYPE                   = 0x7
+	NFTA_CHAIN_COUNTERS               = 0x8
+	NFTA_CHAIN_PAD                    = 0x9
+	NFTA_RULE_UNSPEC                  = 0x0
+	NFTA_RULE_TABLE                   = 0x1
+	NFTA_RULE_CHAIN                   = 0x2
+	NFTA_RULE_HANDLE                  = 0x3
+	NFTA_RULE_EXPRESSIONS             = 0x4
+	NFTA_RULE_COMPAT                  = 0x5
+	NFTA_RULE_POSITION                = 0x6
+	NFTA_RULE_USERDATA                = 0x7
+	NFTA_RULE_PAD                     = 0x8
+	NFTA_RULE_ID                      = 0x9
+	NFT_RULE_COMPAT_F_INV             = 0x2
+	NFT_RULE_COMPAT_F_MASK            = 0x2
+	NFTA_RULE_COMPAT_UNSPEC           = 0x0
+	NFTA_RULE_COMPAT_PROTO            = 0x1
+	NFTA_RULE_COMPAT_FLAGS            = 0x2
+	NFT_SET_ANONYMOUS                 = 0x1
+	NFT_SET_CONSTANT                  = 0x2
+	NFT_SET_INTERVAL                  = 0x4
+	NFT_SET_MAP                       = 0x8
+	NFT_SET_TIMEOUT                   = 0x10
+	NFT_SET_EVAL                      = 0x20
+	NFT_SET_OBJECT                    = 0x40
+	NFT_SET_POL_PERFORMANCE           = 0x0
+	NFT_SET_POL_MEMORY                = 0x1
+	NFTA_SET_DESC_UNSPEC              = 0x0
+	NFTA_SET_DESC_SIZE                = 0x1
+	NFTA_SET_UNSPEC                   = 0x0
+	NFTA_SET_TABLE                    = 0x1
+	NFTA_SET_NAME                     = 0x2
+	NFTA_SET_FLAGS                    = 0x3
+	NFTA_SET_KEY_TYPE                 = 0x4
+	NFTA_SET_KEY_LEN                  = 0x5
+	NFTA_SET_DATA_TYPE                = 0x6
+	NFTA_SET_DATA_LEN                 = 0x7
+	NFTA_SET_POLICY                   = 0x8
+	NFTA_SET_DESC                     = 0x9
+	NFTA_SET_ID                       = 0xa
+	NFTA_SET_TIMEOUT                  = 0xb
+	NFTA_SET_GC_INTERVAL              = 0xc
+	NFTA_SET_USERDATA                 = 0xd
+	NFTA_SET_PAD                      = 0xe
+	NFTA_SET_OBJ_TYPE                 = 0xf
+	NFT_SET_ELEM_INTERVAL_END         = 0x1
+	NFTA_SET_ELEM_UNSPEC              = 0x0
+	NFTA_SET_ELEM_KEY                 = 0x1
+	NFTA_SET_ELEM_DATA                = 0x2
+	NFTA_SET_ELEM_FLAGS               = 0x3
+	NFTA_SET_ELEM_TIMEOUT             = 0x4
+	NFTA_SET_ELEM_EXPIRATION          = 0x5
+	NFTA_SET_ELEM_USERDATA            = 0x6
+	NFTA_SET_ELEM_EXPR                = 0x7
+	NFTA_SET_ELEM_PAD                 = 0x8
+	NFTA_SET_ELEM_OBJREF              = 0x9
+	NFTA_SET_ELEM_LIST_UNSPEC         = 0x0
+	NFTA_SET_ELEM_LIST_TABLE          = 0x1
+	NFTA_SET_ELEM_LIST_SET            = 0x2
+	NFTA_SET_ELEM_LIST_ELEMENTS       = 0x3
+	NFTA_SET_ELEM_LIST_SET_ID         = 0x4
+	NFT_DATA_VALUE                    = 0x0
+	NFT_DATA_VERDICT                  = 0xffffff00
+	NFTA_DATA_UNSPEC                  = 0x0
+	NFTA_DATA_VALUE                   = 0x1
+	NFTA_DATA_VERDICT                 = 0x2
+	NFTA_VERDICT_UNSPEC               = 0x0
+	NFTA_VERDICT_CODE                 = 0x1
+	NFTA_VERDICT_CHAIN                = 0x2
+	NFTA_EXPR_UNSPEC                  = 0x0
+	NFTA_EXPR_NAME                    = 0x1
+	NFTA_EXPR_DATA                    = 0x2
+	NFTA_IMMEDIATE_UNSPEC             = 0x0
+	NFTA_IMMEDIATE_DREG               = 0x1
+	NFTA_IMMEDIATE_DATA               = 0x2
+	NFTA_BITWISE_UNSPEC               = 0x0
+	NFTA_BITWISE_SREG                 = 0x1
+	NFTA_BITWISE_DREG                 = 0x2
+	NFTA_BITWISE_LEN                  = 0x3
+	NFTA_BITWISE_MASK                 = 0x4
+	NFTA_BITWISE_XOR                  = 0x5
+	NFT_BYTEORDER_NTOH                = 0x0
+	NFT_BYTEORDER_HTON                = 0x1
+	NFTA_BYTEORDER_UNSPEC             = 0x0
+	NFTA_BYTEORDER_SREG               = 0x1
+	NFTA_BYTEORDER_DREG               = 0x2
+	NFTA_BYTEORDER_OP                 = 0x3
+	NFTA_BYTEORDER_LEN                = 0x4
+	NFTA_BYTEORDER_SIZE               = 0x5
+	NFT_CMP_EQ                        = 0x0
+	NFT_CMP_NEQ                       = 0x1
+	NFT_CMP_LT                        = 0x2
+	NFT_CMP_LTE                       = 0x3
+	NFT_CMP_GT                        = 0x4
+	NFT_CMP_GTE                       = 0x5
+	NFTA_CMP_UNSPEC                   = 0x0
+	NFTA_CMP_SREG                     = 0x1
+	NFTA_CMP_OP                       = 0x2
+	NFTA_CMP_DATA                     = 0x3
+	NFT_RANGE_EQ                      = 0x0
+	NFT_RANGE_NEQ                     = 0x1
+	NFTA_RANGE_UNSPEC                 = 0x0
+	NFTA_RANGE_SREG                   = 0x1
+	NFTA_RANGE_OP                     = 0x2
+	NFTA_RANGE_FROM_DATA              = 0x3
+	NFTA_RANGE_TO_DATA                = 0x4
+	NFT_LOOKUP_F_INV                  = 0x1
+	NFTA_LOOKUP_UNSPEC                = 0x0
+	NFTA_LOOKUP_SET                   = 0x1
+	NFTA_LOOKUP_SREG                  = 0x2
+	NFTA_LOOKUP_DREG                  = 0x3
+	NFTA_LOOKUP_SET_ID                = 0x4
+	NFTA_LOOKUP_FLAGS                 = 0x5
+	NFT_DYNSET_OP_ADD                 = 0x0
+	NFT_DYNSET_OP_UPDATE              = 0x1
+	NFT_DYNSET_F_INV                  = 0x1
+	NFTA_DYNSET_UNSPEC                = 0x0
+	NFTA_DYNSET_SET_NAME              = 0x1
+	NFTA_DYNSET_SET_ID                = 0x2
+	NFTA_DYNSET_OP                    = 0x3
+	NFTA_DYNSET_SREG_KEY              = 0x4
+	NFTA_DYNSET_SREG_DATA             = 0x5
+	NFTA_DYNSET_TIMEOUT               = 0x6
+	NFTA_DYNSET_EXPR                  = 0x7
+	NFTA_DYNSET_PAD                   = 0x8
+	NFTA_DYNSET_FLAGS                 = 0x9
+	NFT_PAYLOAD_LL_HEADER             = 0x0
+	NFT_PAYLOAD_NETWORK_HEADER        = 0x1
+	NFT_PAYLOAD_TRANSPORT_HEADER      = 0x2
+	NFT_PAYLOAD_CSUM_NONE             = 0x0
+	NFT_PAYLOAD_CSUM_INET             = 0x1
+	NFT_PAYLOAD_L4CSUM_PSEUDOHDR      = 0x1
+	NFTA_PAYLOAD_UNSPEC               = 0x0
+	NFTA_PAYLOAD_DREG                 = 0x1
+	NFTA_PAYLOAD_BASE                 = 0x2
+	NFTA_PAYLOAD_OFFSET               = 0x3
+	NFTA_PAYLOAD_LEN                  = 0x4
+	NFTA_PAYLOAD_SREG                 = 0x5
+	NFTA_PAYLOAD_CSUM_TYPE            = 0x6
+	NFTA_PAYLOAD_CSUM_OFFSET          = 0x7
+	NFTA_PAYLOAD_CSUM_FLAGS           = 0x8
+	NFT_EXTHDR_F_PRESENT              = 0x1
+	NFT_EXTHDR_OP_IPV6                = 0x0
+	NFT_EXTHDR_OP_TCPOPT              = 0x1
+	NFTA_EXTHDR_UNSPEC                = 0x0
+	NFTA_EXTHDR_DREG                  = 0x1
+	NFTA_EXTHDR_TYPE                  = 0x2
+	NFTA_EXTHDR_OFFSET                = 0x3
+	NFTA_EXTHDR_LEN                   = 0x4
+	NFTA_EXTHDR_FLAGS                 = 0x5
+	NFTA_EXTHDR_OP                    = 0x6
+	NFTA_EXTHDR_SREG                  = 0x7
+	NFT_META_LEN                      = 0x0
+	NFT_META_PROTOCOL                 = 0x1
+	NFT_META_PRIORITY                 = 0x2
+	NFT_META_MARK                     = 0x3
+	NFT_META_IIF                      = 0x4
+	NFT_META_OIF                      = 0x5
+	NFT_META_IIFNAME                  = 0x6
+	NFT_META_OIFNAME                  = 0x7
+	NFT_META_IIFTYPE                  = 0x8
+	NFT_META_OIFTYPE                  = 0x9
+	NFT_META_SKUID                    = 0xa
+	NFT_META_SKGID                    = 0xb
+	NFT_META_NFTRACE                  = 0xc
+	NFT_META_RTCLASSID                = 0xd
+	NFT_META_SECMARK                  = 0xe
+	NFT_META_NFPROTO                  = 0xf
+	NFT_META_L4PROTO                  = 0x10
+	NFT_META_BRI_IIFNAME              = 0x11
+	NFT_META_BRI_OIFNAME              = 0x12
+	NFT_META_PKTTYPE                  = 0x13
+	NFT_META_CPU                      = 0x14
+	NFT_META_IIFGROUP                 = 0x15
+	NFT_META_OIFGROUP                 = 0x16
+	NFT_META_CGROUP                   = 0x17
+	NFT_META_PRANDOM                  = 0x18
+	NFT_RT_CLASSID                    = 0x0
+	NFT_RT_NEXTHOP4                   = 0x1
+	NFT_RT_NEXTHOP6                   = 0x2
+	NFT_RT_TCPMSS                     = 0x3
+	NFT_HASH_JENKINS                  = 0x0
+	NFT_HASH_SYM                      = 0x1
+	NFTA_HASH_UNSPEC                  = 0x0
+	NFTA_HASH_SREG                    = 0x1
+	NFTA_HASH_DREG                    = 0x2
+	NFTA_HASH_LEN                     = 0x3
+	NFTA_HASH_MODULUS                 = 0x4
+	NFTA_HASH_SEED                    = 0x5
+	NFTA_HASH_OFFSET                  = 0x6
+	NFTA_HASH_TYPE                    = 0x7
+	NFTA_META_UNSPEC                  = 0x0
+	NFTA_META_DREG                    = 0x1
+	NFTA_META_KEY                     = 0x2
+	NFTA_META_SREG                    = 0x3
+	NFTA_RT_UNSPEC                    = 0x0
+	NFTA_RT_DREG                      = 0x1
+	NFTA_RT_KEY                       = 0x2
+	NFT_CT_STATE                      = 0x0
+	NFT_CT_DIRECTION                  = 0x1
+	NFT_CT_STATUS                     = 0x2
+	NFT_CT_MARK                       = 0x3
+	NFT_CT_SECMARK                    = 0x4
+	NFT_CT_EXPIRATION                 = 0x5
+	NFT_CT_HELPER                     = 0x6
+	NFT_CT_L3PROTOCOL                 = 0x7
+	NFT_CT_SRC                        = 0x8
+	NFT_CT_DST                        = 0x9
+	NFT_CT_PROTOCOL                   = 0xa
+	NFT_CT_PROTO_SRC                  = 0xb
+	NFT_CT_PROTO_DST                  = 0xc
+	NFT_CT_LABELS                     = 0xd
+	NFT_CT_PKTS                       = 0xe
+	NFT_CT_BYTES                      = 0xf
+	NFT_CT_AVGPKT                     = 0x10
+	NFT_CT_ZONE                       = 0x11
+	NFT_CT_EVENTMASK                  = 0x12
+	NFTA_CT_UNSPEC                    = 0x0
+	NFTA_CT_DREG                      = 0x1
+	NFTA_CT_KEY                       = 0x2
+	NFTA_CT_DIRECTION                 = 0x3
+	NFTA_CT_SREG                      = 0x4
+	NFT_LIMIT_PKTS                    = 0x0
+	NFT_LIMIT_PKT_BYTES               = 0x1
+	NFT_LIMIT_F_INV                   = 0x1
+	NFTA_LIMIT_UNSPEC                 = 0x0
+	NFTA_LIMIT_RATE                   = 0x1
+	NFTA_LIMIT_UNIT                   = 0x2
+	NFTA_LIMIT_BURST                  = 0x3
+	NFTA_LIMIT_TYPE                   = 0x4
+	NFTA_LIMIT_FLAGS                  = 0x5
+	NFTA_LIMIT_PAD                    = 0x6
+	NFTA_COUNTER_UNSPEC               = 0x0
+	NFTA_COUNTER_BYTES                = 0x1
+	NFTA_COUNTER_PACKETS              = 0x2
+	NFTA_COUNTER_PAD                  = 0x3
+	NFTA_LOG_UNSPEC                   = 0x0
+	NFTA_LOG_GROUP                    = 0x1
+	NFTA_LOG_PREFIX                   = 0x2
+	NFTA_LOG_SNAPLEN                  = 0x3
+	NFTA_LOG_QTHRESHOLD               = 0x4
+	NFTA_LOG_LEVEL                    = 0x5
+	NFTA_LOG_FLAGS                    = 0x6
+	NFTA_QUEUE_UNSPEC                 = 0x0
+	NFTA_QUEUE_NUM                    = 0x1
+	NFTA_QUEUE_TOTAL                  = 0x2
+	NFTA_QUEUE_FLAGS                  = 0x3
+	NFTA_QUEUE_SREG_QNUM              = 0x4
+	NFT_QUOTA_F_INV                   = 0x1
+	NFT_QUOTA_F_DEPLETED              = 0x2
+	NFTA_QUOTA_UNSPEC                 = 0x0
+	NFTA_QUOTA_BYTES                  = 0x1
+	NFTA_QUOTA_FLAGS                  = 0x2
+	NFTA_QUOTA_PAD                    = 0x3
+	NFTA_QUOTA_CONSUMED               = 0x4
+	NFT_REJECT_ICMP_UNREACH           = 0x0
+	NFT_REJECT_TCP_RST                = 0x1
+	NFT_REJECT_ICMPX_UNREACH          = 0x2
+	NFT_REJECT_ICMPX_NO_ROUTE         = 0x0
+	NFT_REJECT_ICMPX_PORT_UNREACH     = 0x1
+	NFT_REJECT_ICMPX_HOST_UNREACH     = 0x2
+	NFT_REJECT_ICMPX_ADMIN_PROHIBITED = 0x3
+	NFTA_REJECT_UNSPEC                = 0x0
+	NFTA_REJECT_TYPE                  = 0x1
+	NFTA_REJECT_ICMP_CODE             = 0x2
+	NFT_NAT_SNAT                      = 0x0
+	NFT_NAT_DNAT                      = 0x1
+	NFTA_NAT_UNSPEC                   = 0x0
+	NFTA_NAT_TYPE                     = 0x1
+	NFTA_NAT_FAMILY                   = 0x2
+	NFTA_NAT_REG_ADDR_MIN             = 0x3
+	NFTA_NAT_REG_ADDR_MAX             = 0x4
+	NFTA_NAT_REG_PROTO_MIN            = 0x5
+	NFTA_NAT_REG_PROTO_MAX            = 0x6
+	NFTA_NAT_FLAGS                    = 0x7
+	NFTA_MASQ_UNSPEC                  = 0x0
+	NFTA_MASQ_FLAGS                   = 0x1
+	NFTA_MASQ_REG_PROTO_MIN           = 0x2
+	NFTA_MASQ_REG_PROTO_MAX           = 0x3
+	NFTA_REDIR_UNSPEC                 = 0x0
+	NFTA_REDIR_REG_PROTO_MIN          = 0x1
+	NFTA_REDIR_REG_PROTO_MAX          = 0x2
+	NFTA_REDIR_FLAGS                  = 0x3
+	NFTA_DUP_UNSPEC                   = 0x0
+	NFTA_DUP_SREG_ADDR                = 0x1
+	NFTA_DUP_SREG_DEV                 = 0x2
+	NFTA_FWD_UNSPEC                   = 0x0
+	NFTA_FWD_SREG_DEV                 = 0x1
+	NFTA_OBJREF_UNSPEC                = 0x0
+	NFTA_OBJREF_IMM_TYPE              = 0x1
+	NFTA_OBJREF_IMM_NAME              = 0x2
+	NFTA_OBJREF_SET_SREG              = 0x3
+	NFTA_OBJREF_SET_NAME              = 0x4
+	NFTA_OBJREF_SET_ID                = 0x5
+	NFTA_GEN_UNSPEC                   = 0x0
+	NFTA_GEN_ID                       = 0x1
+	NFTA_GEN_PROC_PID                 = 0x2
+	NFTA_GEN_PROC_NAME                = 0x3
+	NFTA_FIB_UNSPEC                   = 0x0
+	NFTA_FIB_DREG                     = 0x1
+	NFTA_FIB_RESULT                   = 0x2
+	NFTA_FIB_FLAGS                    = 0x3
+	NFT_FIB_RESULT_UNSPEC             = 0x0
+	NFT_FIB_RESULT_OIF                = 0x1
+	NFT_FIB_RESULT_OIFNAME            = 0x2
+	NFT_FIB_RESULT_ADDRTYPE           = 0x3
+	NFTA_FIB_F_SADDR                  = 0x1
+	NFTA_FIB_F_DADDR                  = 0x2
+	NFTA_FIB_F_MARK                   = 0x4
+	NFTA_FIB_F_IIF                    = 0x8
+	NFTA_FIB_F_OIF                    = 0x10
+	NFTA_FIB_F_PRESENT                = 0x20
+	NFTA_CT_HELPER_UNSPEC             = 0x0
+	NFTA_CT_HELPER_NAME               = 0x1
+	NFTA_CT_HELPER_L3PROTO            = 0x2
+	NFTA_CT_HELPER_L4PROTO            = 0x3
+	NFTA_OBJ_UNSPEC                   = 0x0
+	NFTA_OBJ_TABLE                    = 0x1
+	NFTA_OBJ_NAME                     = 0x2
+	NFTA_OBJ_TYPE                     = 0x3
+	NFTA_OBJ_DATA                     = 0x4
+	NFTA_OBJ_USE                      = 0x5
+	NFTA_TRACE_UNSPEC                 = 0x0
+	NFTA_TRACE_TABLE                  = 0x1
+	NFTA_TRACE_CHAIN                  = 0x2
+	NFTA_TRACE_RULE_HANDLE            = 0x3
+	NFTA_TRACE_TYPE                   = 0x4
+	NFTA_TRACE_VERDICT                = 0x5
+	NFTA_TRACE_ID                     = 0x6
+	NFTA_TRACE_LL_HEADER              = 0x7
+	NFTA_TRACE_NETWORK_HEADER         = 0x8
+	NFTA_TRACE_TRANSPORT_HEADER       = 0x9
+	NFTA_TRACE_IIF                    = 0xa
+	NFTA_TRACE_IIFTYPE                = 0xb
+	NFTA_TRACE_OIF                    = 0xc
+	NFTA_TRACE_OIFTYPE                = 0xd
+	NFTA_TRACE_MARK                   = 0xe
+	NFTA_TRACE_NFPROTO                = 0xf
+	NFTA_TRACE_POLICY                 = 0x10
+	NFTA_TRACE_PAD                    = 0x11
+	NFT_TRACETYPE_UNSPEC              = 0x0
+	NFT_TRACETYPE_POLICY              = 0x1
+	NFT_TRACETYPE_RETURN              = 0x2
+	NFT_TRACETYPE_RULE                = 0x3
+	NFTA_NG_UNSPEC                    = 0x0
+	NFTA_NG_DREG                      = 0x1
+	NFTA_NG_MODULUS                   = 0x2
+	NFTA_NG_TYPE                      = 0x3
+	NFTA_NG_OFFSET                    = 0x4
+	NFT_NG_INCREMENTAL                = 0x0
+	NFT_NG_RANDOM                     = 0x1
+)
+
+type RTCTime struct {
+	Sec   int32
+	Min   int32
+	Hour  int32
+	Mday  int32
+	Mon   int32
+	Year  int32
+	Wday  int32
+	Yday  int32
+	Isdst int32
+}
+
+type RTCWkAlrm struct {
+	Enabled uint8
+	Pending uint8
+	_       [2]byte
+	Time    RTCTime
+}
+
+type RTCPLLInfo struct {
+	Ctrl    int32
+	Value   int32
+	Max     int32
+	Min     int32
+	Posmult int32
+	Negmult int32
+	Clock   int64
+}
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
new file mode 100644
index 00000000..8e7384b8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
@@ -0,0 +1,690 @@
+// +build sparc64,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go | go run mkpost.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev                uint64
+	X__pad1            uint16
+	Pad_cgo_0          [6]byte
+	Ino                uint64
+	Mode               uint32
+	Nlink              uint32
+	Uid                uint32
+	Gid                uint32
+	Rdev               uint64
+	X__pad2            uint16
+	Pad_cgo_1          [6]byte
+	Size               int64
+	Blksize            int64
+	Blocks             int64
+	Atim               Timespec
+	Mtim               Timespec
+	Ctim               Timespec
+	X__glibc_reserved4 uint64
+	X__glibc_reserved5 uint64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type              int16
+	Whence            int16
+	Pad_cgo_0         [4]byte
+	Start             int64
+	Len               int64
+	Pid               int32
+	X__glibc_reserved int16
+	Pad_cgo_1         [2]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddrCAN struct {
+	Family    uint16
+	Pad_cgo_0 [2]byte
+	Ifindex   int32
+	Addr      [8]byte
+}
+
+type RawSockaddrALG struct {
+	Family uint16
+	Type   [14]uint8
+	Feat   uint32
+	Mask   uint32
+	Name   [64]uint8
+}
+
+type RawSockaddrVM struct {
+	Family    uint16
+	Reserved1 uint16
+	Port      uint32
+	Cid       uint32
+	Zero      [4]uint8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrCAN       = 0x10
+	SizeofSockaddrALG       = 0x58
+	SizeofSockaddrVM        = 0x10
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x2e
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs   [16]uint64
+	Tstate uint64
+	Tpc    uint64
+	Tnpc   uint64
+	Y      uint32
+	Magic  uint32
+}
+
+type ptracePsw struct {
+}
+
+type ptraceFpregs struct {
+}
+
+type ptracePer struct {
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]int8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events  uint32
+	X_padFd int32
+	Fd      int32
+	Pad     int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLIN    = 0x1
+	POLLPRI   = 0x2
+	POLLOUT   = 0x4
+	POLLRDHUP = 0x800
+	POLLERR   = 0x8
+	POLLHUP   = 0x10
+	POLLNVAL  = 0x20
+)
+
+type Sigset_t struct {
+	X__val [16]uint64
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
new file mode 100644
index 00000000..4b86fb2b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
@@ -0,0 +1,448 @@
+// cgo -godefs types_netbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,netbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           uint64
+	Mode          uint32
+	Ino           uint64
+	Nlink         uint32
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint64
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Spare         [2]uint32
+}
+
+type Statfs_t [0]byte
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno    uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [512]int8
+	Pad_cgo_0 [3]byte
+}
+
+type Fsid struct {
+	X__fsid_val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter uint32
+	Flags  uint32
+	Fflags uint32
+	Data   int64
+	Udata  int32
+}
+
+type FdSet struct {
+	Bits [8]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0x98
+	SizeofIfData           = 0x84
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x78
+	SizeofRtMetrics        = 0x50
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+	Pad_cgo_1 [4]byte
+}
+
+type IfData struct {
+	Type       uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Pad_cgo_0  [1]byte
+	Link_state int32
+	Mtu        uint64
+	Metric     uint64
+	Baudrate   uint64
+	Ipackets   uint64
+	Ierrors    uint64
+	Opackets   uint64
+	Oerrors    uint64
+	Collisions uint64
+	Ibytes     uint64
+	Obytes     uint64
+	Imcasts    uint64
+	Omcasts    uint64
+	Iqdrops    uint64
+	Noproto    uint64
+	Lastchange Timespec
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Metric    int32
+	Index     uint16
+	Pad_cgo_0 [6]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     int32
+	Pad_cgo_1 [4]byte
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint64
+	Mtu      uint64
+	Hopcount uint64
+	Recvpipe uint64
+	Sendpipe uint64
+	Ssthresh uint64
+	Rtt      uint64
+	Rttvar   uint64
+	Expire   int64
+	Pksent   int64
+}
+
+type Mclpool [0]byte
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x80
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv    uint64
+	Drop    uint64
+	Capt    uint64
+	Padding [13]uint64
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Sysctlnode struct {
+	Flags           uint32
+	Num             int32
+	Name            [32]int8
+	Ver             uint32
+	X__rsvd         uint32
+	Un              [16]byte
+	X_sysctl_size   [8]byte
+	X_sysctl_func   [8]byte
+	X_sysctl_parent [8]byte
+	X_sysctl_desc   [8]byte
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
new file mode 100644
index 00000000..9048a509
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
@@ -0,0 +1,455 @@
+// cgo -godefs types_netbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,netbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           uint64
+	Mode          uint32
+	Pad_cgo_0     [4]byte
+	Ino           uint64
+	Nlink         uint32
+	Uid           uint32
+	Gid           uint32
+	Pad_cgo_1     [4]byte
+	Rdev          uint64
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Spare         [2]uint32
+	Pad_cgo_2     [4]byte
+}
+
+type Statfs_t [0]byte
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno    uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [512]int8
+	Pad_cgo_0 [3]byte
+}
+
+type Fsid struct {
+	X__fsid_val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident     uint64
+	Filter    uint32
+	Flags     uint32
+	Fflags    uint32
+	Pad_cgo_0 [4]byte
+	Data      int64
+	Udata     int64
+}
+
+type FdSet struct {
+	Bits [8]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0x98
+	SizeofIfData           = 0x88
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x78
+	SizeofRtMetrics        = 0x50
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Pad_cgo_0  [1]byte
+	Link_state int32
+	Mtu        uint64
+	Metric     uint64
+	Baudrate   uint64
+	Ipackets   uint64
+	Ierrors    uint64
+	Opackets   uint64
+	Oerrors    uint64
+	Collisions uint64
+	Ibytes     uint64
+	Obytes     uint64
+	Imcasts    uint64
+	Omcasts    uint64
+	Iqdrops    uint64
+	Noproto    uint64
+	Lastchange Timespec
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Metric    int32
+	Index     uint16
+	Pad_cgo_0 [6]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     int32
+	Pad_cgo_1 [4]byte
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint64
+	Mtu      uint64
+	Hopcount uint64
+	Recvpipe uint64
+	Sendpipe uint64
+	Ssthresh uint64
+	Rtt      uint64
+	Rttvar   uint64
+	Expire   int64
+	Pksent   int64
+}
+
+type Mclpool [0]byte
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x80
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv    uint64
+	Drop    uint64
+	Capt    uint64
+	Padding [13]uint64
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [6]byte
+}
+
+type BpfTimeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Sysctlnode struct {
+	Flags           uint32
+	Num             int32
+	Name            [32]int8
+	Ver             uint32
+	X__rsvd         uint32
+	Un              [16]byte
+	X_sysctl_size   [8]byte
+	X_sysctl_func   [8]byte
+	X_sysctl_parent [8]byte
+	X_sysctl_desc   [8]byte
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
new file mode 100644
index 00000000..00525e7b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
@@ -0,0 +1,453 @@
+// cgo -godefs types_netbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,netbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec       int64
+	Nsec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           uint64
+	Mode          uint32
+	Pad_cgo_0     [4]byte
+	Ino           uint64
+	Nlink         uint32
+	Uid           uint32
+	Gid           uint32
+	Pad_cgo_1     [4]byte
+	Rdev          uint64
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Spare         [2]uint32
+	Pad_cgo_2     [4]byte
+}
+
+type Statfs_t [0]byte
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno    uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [512]int8
+	Pad_cgo_0 [3]byte
+}
+
+type Fsid struct {
+	X__fsid_val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident     uint32
+	Filter    uint32
+	Flags     uint32
+	Fflags    uint32
+	Data      int64
+	Udata     int32
+	Pad_cgo_0 [4]byte
+}
+
+type FdSet struct {
+	Bits [8]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0x98
+	SizeofIfData           = 0x88
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x78
+	SizeofRtMetrics        = 0x50
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Pad_cgo_0  [1]byte
+	Link_state int32
+	Mtu        uint64
+	Metric     uint64
+	Baudrate   uint64
+	Ipackets   uint64
+	Ierrors    uint64
+	Opackets   uint64
+	Oerrors    uint64
+	Collisions uint64
+	Ibytes     uint64
+	Obytes     uint64
+	Imcasts    uint64
+	Omcasts    uint64
+	Iqdrops    uint64
+	Noproto    uint64
+	Lastchange Timespec
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Metric    int32
+	Index     uint16
+	Pad_cgo_0 [6]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     int32
+	Pad_cgo_1 [4]byte
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint64
+	Mtu      uint64
+	Hopcount uint64
+	Recvpipe uint64
+	Sendpipe uint64
+	Ssthresh uint64
+	Rtt      uint64
+	Rttvar   uint64
+	Expire   int64
+	Pksent   int64
+}
+
+type Mclpool [0]byte
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x80
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv    uint64
+	Drop    uint64
+	Capt    uint64
+	Padding [13]uint64
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Sysctlnode struct {
+	Flags           uint32
+	Num             int32
+	Name            [32]int8
+	Ver             uint32
+	X__rsvd         uint32
+	Un              [16]byte
+	X_sysctl_size   [8]byte
+	X_sysctl_func   [8]byte
+	X_sysctl_parent [8]byte
+	X_sysctl_desc   [8]byte
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
new file mode 100644
index 00000000..231f4e8e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
@@ -0,0 +1,467 @@
+// cgo -godefs types_openbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build 386,openbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Mode           uint32
+	Dev            int32
+	Ino            uint64
+	Nlink          uint32
+	Uid            uint32
+	Gid            uint32
+	Rdev           int32
+	Atim           Timespec
+	Mtim           Timespec
+	Ctim           Timespec
+	Size           int64
+	Blocks         int64
+	Blksize        uint32
+	Flags          uint32
+	Gen            uint32
+	X__st_birthtim Timespec
+}
+
+type Statfs_t struct {
+	F_flags       uint32
+	F_bsize       uint32
+	F_iosize      uint32
+	F_blocks      uint64
+	F_bfree       uint64
+	F_bavail      int64
+	F_files       uint64
+	F_ffree       uint64
+	F_favail      int64
+	F_syncwrites  uint64
+	F_syncreads   uint64
+	F_asyncwrites uint64
+	F_asyncreads  uint64
+	F_fsid        Fsid
+	F_namemax     uint32
+	F_owner       uint32
+	F_ctime       uint64
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
+	Pad_cgo_0     [2]byte
+	Mount_info    [160]byte
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno       uint64
+	Off          int64
+	Reclen       uint16
+	Type         uint8
+	Namlen       uint8
+	X__d_padding [4]uint8
+	Name         [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [24]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x20
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0xec
+	SizeofIfData           = 0xd4
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x1a
+	SizeofRtMsghdr         = 0x60
+	SizeofRtMetrics        = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Xflags  int32
+	Data    IfData
+}
+
+type IfData struct {
+	Type         uint8
+	Addrlen      uint8
+	Hdrlen       uint8
+	Link_state   uint8
+	Mtu          uint32
+	Metric       uint32
+	Pad          uint32
+	Baudrate     uint64
+	Ipackets     uint64
+	Ierrors      uint64
+	Opackets     uint64
+	Oerrors      uint64
+	Collisions   uint64
+	Ibytes       uint64
+	Obytes       uint64
+	Imcasts      uint64
+	Omcasts      uint64
+	Iqdrops      uint64
+	Noproto      uint64
+	Capabilities uint32
+	Lastchange   Timeval
+	Mclpool      [7]Mclpool
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Metric  int32
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	What    uint16
+	Name    [16]int8
+}
+
+type RtMsghdr struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Hdrlen   uint16
+	Index    uint16
+	Tableid  uint16
+	Priority uint8
+	Mpls     uint8
+	Addrs    int32
+	Flags    int32
+	Fmask    int32
+	Pid      int32
+	Seq      int32
+	Errno    int32
+	Inits    uint32
+	Rmx      RtMetrics
+}
+
+type RtMetrics struct {
+	Pksent   uint64
+	Expire   int64
+	Locks    uint32
+	Mtu      uint32
+	Refcnt   uint32
+	Hopcount uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pad      uint32
+}
+
+type Mclpool struct {
+	Grown int32
+	Alive uint16
+	Hwm   uint16
+	Cwm   uint16
+	Lwm   uint16
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  uint32
+	Usec uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x2
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
new file mode 100644
index 00000000..bb2c4488
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
@@ -0,0 +1,467 @@
+// cgo -godefs types_openbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,openbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Mode    uint32
+	Dev     int32
+	Ino     uint64
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    int32
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Size    int64
+	Blocks  int64
+	Blksize int32
+	Flags   uint32
+	Gen     uint32
+	_       [4]byte
+	_       Timespec
+}
+
+type Statfs_t struct {
+	F_flags       uint32
+	F_bsize       uint32
+	F_iosize      uint32
+	_             [4]byte
+	F_blocks      uint64
+	F_bfree       uint64
+	F_bavail      int64
+	F_files       uint64
+	F_ffree       uint64
+	F_favail      int64
+	F_syncwrites  uint64
+	F_syncreads   uint64
+	F_asyncwrites uint64
+	F_asyncreads  uint64
+	F_fsid        Fsid
+	F_namemax     uint32
+	F_owner       uint32
+	F_ctime       uint64
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
+	_             [2]byte
+	Mount_info    [160]byte
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	_      [4]uint8
+	Name   [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [24]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint32
+	_          [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x20
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0xa8
+	SizeofIfData           = 0x90
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x1a
+	SizeofRtMsghdr         = 0x60
+	SizeofRtMetrics        = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Xflags  int32
+	Data    IfData
+}
+
+type IfData struct {
+	Type         uint8
+	Addrlen      uint8
+	Hdrlen       uint8
+	Link_state   uint8
+	Mtu          uint32
+	Metric       uint32
+	Rdomain      uint32
+	Baudrate     uint64
+	Ipackets     uint64
+	Ierrors      uint64
+	Opackets     uint64
+	Oerrors      uint64
+	Collisions   uint64
+	Ibytes       uint64
+	Obytes       uint64
+	Imcasts      uint64
+	Omcasts      uint64
+	Iqdrops      uint64
+	Oqdrops      uint64
+	Noproto      uint64
+	Capabilities uint32
+	_            [4]byte
+	Lastchange   Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Metric  int32
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	What    uint16
+	Name    [16]int8
+}
+
+type RtMsghdr struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Hdrlen   uint16
+	Index    uint16
+	Tableid  uint16
+	Priority uint8
+	Mpls     uint8
+	Addrs    int32
+	Flags    int32
+	Fmask    int32
+	Pid      int32
+	Seq      int32
+	Errno    int32
+	Inits    uint32
+	Rmx      RtMetrics
+}
+
+type RtMetrics struct {
+	Pksent   uint64
+	Expire   int64
+	Locks    uint32
+	Mtu      uint32
+	Refcnt   uint32
+	Hopcount uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pad      uint32
+}
+
+type Mclpool struct{}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp  BpfTimeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  uint32
+	Usec uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x2
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
new file mode 100644
index 00000000..941367ca
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
@@ -0,0 +1,460 @@
+// cgo -godefs types_openbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,openbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Mode           uint32
+	Dev            int32
+	Ino            uint64
+	Nlink          uint32
+	Uid            uint32
+	Gid            uint32
+	Rdev           int32
+	Atim           Timespec
+	Mtim           Timespec
+	Ctim           Timespec
+	Size           int64
+	Blocks         int64
+	Blksize        int32
+	Flags          uint32
+	Gen            uint32
+	X__st_birthtim Timespec
+}
+
+type Statfs_t struct {
+	F_flags       uint32
+	F_bsize       uint32
+	F_iosize      uint32
+	F_blocks      uint64
+	F_bfree       uint64
+	F_bavail      int64
+	F_files       uint64
+	F_ffree       uint64
+	F_favail      int64
+	F_syncwrites  uint64
+	F_syncreads   uint64
+	F_asyncwrites uint64
+	F_asyncreads  uint64
+	F_fsid        Fsid
+	F_namemax     uint32
+	F_owner       uint32
+	F_ctime       uint64
+	F_fstypename  [16]uint8
+	F_mntonname   [90]uint8
+	F_mntfromname [90]uint8
+	F_mntfromspec [90]uint8
+	Pad_cgo_0     [2]byte
+	Mount_info    [160]byte
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno       uint64
+	Off          int64
+	Reclen       uint16
+	Type         uint8
+	Namlen       uint8
+	X__d_padding [4]uint8
+	Name         [256]uint8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [24]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x20
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0x98
+	SizeofIfData           = 0x80
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x1a
+	SizeofRtMsghdr         = 0x60
+	SizeofRtMetrics        = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Xflags  int32
+	Data    IfData
+}
+
+type IfData struct {
+	Type         uint8
+	Addrlen      uint8
+	Hdrlen       uint8
+	Link_state   uint8
+	Mtu          uint32
+	Metric       uint32
+	Pad          uint32
+	Baudrate     uint64
+	Ipackets     uint64
+	Ierrors      uint64
+	Opackets     uint64
+	Oerrors      uint64
+	Collisions   uint64
+	Ibytes       uint64
+	Obytes       uint64
+	Imcasts      uint64
+	Omcasts      uint64
+	Iqdrops      uint64
+	Noproto      uint64
+	Capabilities uint32
+	Lastchange   Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Metric  int32
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	What    uint16
+	Name    [16]uint8
+}
+
+type RtMsghdr struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Hdrlen   uint16
+	Index    uint16
+	Tableid  uint16
+	Priority uint8
+	Mpls     uint8
+	Addrs    int32
+	Flags    int32
+	Fmask    int32
+	Pid      int32
+	Seq      int32
+	Errno    int32
+	Inits    uint32
+	Rmx      RtMetrics
+}
+
+type RtMetrics struct {
+	Pksent   uint64
+	Expire   int64
+	Locks    uint32
+	Mtu      uint32
+	Refcnt   uint32
+	Hopcount uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pad      uint32
+}
+
+type Mclpool struct{}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  uint32
+	Usec uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x2
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
new file mode 100644
index 00000000..2248598d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
@@ -0,0 +1,459 @@
+// cgo -godefs types_solaris.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,solaris
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x400
+	MaxHostNameLen = 0x100
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timeval32 struct {
+	Sec  int32
+	Usec int32
+}
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Dev     uint64
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint64
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize int32
+	_       [4]byte
+	Blocks  int64
+	Fstype  [16]int8
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Sysid  int32
+	Pid    int32
+	Pad    [4]int64
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Name   [1]int8
+	_      [5]byte
+}
+
+type _Fsblkcnt_t uint64
+
+type Statvfs_t struct {
+	Bsize    uint64
+	Frsize   uint64
+	Blocks   uint64
+	Bfree    uint64
+	Bavail   uint64
+	Files    uint64
+	Ffree    uint64
+	Favail   uint64
+	Fsid     uint64
+	Basetype [16]int8
+	Flag     uint64
+	Namemax  uint64
+	Fstr     [32]int8
+}
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Family         uint16
+	Port           uint16
+	Flowinfo       uint32
+	Addr           [16]byte /* in6_addr */
+	Scope_id       uint32
+	X__sin6_src_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrDatalink struct {
+	Family uint16
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [244]int8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [236]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *int8
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name         *byte
+	Namelen      uint32
+	_            [4]byte
+	Iov          *Iovec
+	Iovlen       int32
+	_            [4]byte
+	Accrights    *int8
+	Accrightslen int32
+	_            [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	X__icmp6_filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x20
+	SizeofSockaddrAny      = 0xfc
+	SizeofSockaddrUnix     = 0x6e
+	SizeofSockaddrDatalink = 0xfc
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x24
+	SizeofICMPv6Filter     = 0x20
+)
+
+type FdSet struct {
+	Bits [1024]int64
+}
+
+type Utsname struct {
+	Sysname  [257]byte
+	Nodename [257]byte
+	Release  [257]byte
+	Version  [257]byte
+	Machine  [257]byte
+}
+
+type Ustat_t struct {
+	Tfree  int64
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
+}
+
+const (
+	AT_FDCWD            = 0xffd19553
+	AT_SYMLINK_NOFOLLOW = 0x1000
+	AT_SYMLINK_FOLLOW   = 0x2000
+	AT_REMOVEDIR        = 0x1
+	AT_EACCESS          = 0x4
+)
+
+const (
+	SizeofIfMsghdr  = 0x54
+	SizeofIfData    = 0x44
+	SizeofIfaMsghdr = 0x14
+	SizeofRtMsghdr  = 0x4c
+	SizeofRtMetrics = 0x28
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	_          [1]byte
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Lastchange Timeval32
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
+}
+
+type RtMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x80
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv    uint64
+	Drop    uint64
+	Capt    uint64
+	Padding [13]uint64
+}
+
+type BpfProgram struct {
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfTimeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type BpfHdr struct {
+	Tstamp  BpfTimeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
+}
+
+type Termios struct {
+	Iflag uint32
+	Oflag uint32
+	Cflag uint32
+	Lflag uint32
+	Cc    [19]uint8
+	_     [1]byte
+}
+
+type Termio struct {
+	Iflag uint16
+	Oflag uint16
+	Cflag uint16
+	Lflag uint16
+	Line  int8
+	Cc    [8]uint8
+	_     [1]byte
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
diff --git a/vendor/golang.org/x/sys/windows/aliases.go b/vendor/golang.org/x/sys/windows/aliases.go
new file mode 100644
index 00000000..af3af60d
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/aliases.go
@@ -0,0 +1,13 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+// +build go1.9
+
+package windows
+
+import "syscall"
+
+type Errno = syscall.Errno
+type SysProcAttr = syscall.SysProcAttr
diff --git a/vendor/golang.org/x/sys/windows/asm_windows_386.s b/vendor/golang.org/x/sys/windows/asm_windows_386.s
new file mode 100644
index 00000000..21d994d3
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/asm_windows_386.s
@@ -0,0 +1,13 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//
+// System calls for 386, Windows are implemented in runtime/syscall_windows.goc
+//
+
+TEXT ·getprocaddress(SB), 7, $0-16
+	JMP	syscall·getprocaddress(SB)
+
+TEXT ·loadlibrary(SB), 7, $0-12
+	JMP	syscall·loadlibrary(SB)
diff --git a/vendor/golang.org/x/sys/windows/asm_windows_amd64.s b/vendor/golang.org/x/sys/windows/asm_windows_amd64.s
new file mode 100644
index 00000000..5bfdf797
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/asm_windows_amd64.s
@@ -0,0 +1,13 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//
+// System calls for amd64, Windows are implemented in runtime/syscall_windows.goc
+//
+
+TEXT ·getprocaddress(SB), 7, $0-32
+	JMP	syscall·getprocaddress(SB)
+
+TEXT ·loadlibrary(SB), 7, $0-24
+	JMP	syscall·loadlibrary(SB)
diff --git a/vendor/golang.org/x/sys/windows/dll_windows.go b/vendor/golang.org/x/sys/windows/dll_windows.go
new file mode 100644
index 00000000..e92c05b2
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/dll_windows.go
@@ -0,0 +1,378 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+import (
+	"sync"
+	"sync/atomic"
+	"syscall"
+	"unsafe"
+)
+
+// DLLError describes reasons for DLL load failures.
+type DLLError struct {
+	Err     error
+	ObjName string
+	Msg     string
+}
+
+func (e *DLLError) Error() string { return e.Msg }
+
+// Implemented in runtime/syscall_windows.goc; we provide jumps to them in our assembly file.
+func loadlibrary(filename *uint16) (handle uintptr, err syscall.Errno)
+func getprocaddress(handle uintptr, procname *uint8) (proc uintptr, err syscall.Errno)
+
+// A DLL implements access to a single DLL.
+type DLL struct {
+	Name   string
+	Handle Handle
+}
+
+// LoadDLL loads DLL file into memory.
+//
+// Warning: using LoadDLL without an absolute path name is subject to
+// DLL preloading attacks. To safely load a system DLL, use LazyDLL
+// with System set to true, or use LoadLibraryEx directly.
+func LoadDLL(name string) (dll *DLL, err error) {
+	namep, err := UTF16PtrFromString(name)
+	if err != nil {
+		return nil, err
+	}
+	h, e := loadlibrary(namep)
+	if e != 0 {
+		return nil, &DLLError{
+			Err:     e,
+			ObjName: name,
+			Msg:     "Failed to load " + name + ": " + e.Error(),
+		}
+	}
+	d := &DLL{
+		Name:   name,
+		Handle: Handle(h),
+	}
+	return d, nil
+}
+
+// MustLoadDLL is like LoadDLL but panics if load operation failes.
+func MustLoadDLL(name string) *DLL {
+	d, e := LoadDLL(name)
+	if e != nil {
+		panic(e)
+	}
+	return d
+}
+
+// FindProc searches DLL d for procedure named name and returns *Proc
+// if found. It returns an error if search fails.
+func (d *DLL) FindProc(name string) (proc *Proc, err error) {
+	namep, err := BytePtrFromString(name)
+	if err != nil {
+		return nil, err
+	}
+	a, e := getprocaddress(uintptr(d.Handle), namep)
+	if e != 0 {
+		return nil, &DLLError{
+			Err:     e,
+			ObjName: name,
+			Msg:     "Failed to find " + name + " procedure in " + d.Name + ": " + e.Error(),
+		}
+	}
+	p := &Proc{
+		Dll:  d,
+		Name: name,
+		addr: a,
+	}
+	return p, nil
+}
+
+// MustFindProc is like FindProc but panics if search fails.
+func (d *DLL) MustFindProc(name string) *Proc {
+	p, e := d.FindProc(name)
+	if e != nil {
+		panic(e)
+	}
+	return p
+}
+
+// Release unloads DLL d from memory.
+func (d *DLL) Release() (err error) {
+	return FreeLibrary(d.Handle)
+}
+
+// A Proc implements access to a procedure inside a DLL.
+type Proc struct {
+	Dll  *DLL
+	Name string
+	addr uintptr
+}
+
+// Addr returns the address of the procedure represented by p.
+// The return value can be passed to Syscall to run the procedure.
+func (p *Proc) Addr() uintptr {
+	return p.addr
+}
+
+//go:uintptrescapes
+
+// Call executes procedure p with arguments a. It will panic, if more than 15 arguments
+// are supplied.
+//
+// The returned error is always non-nil, constructed from the result of GetLastError.
+// Callers must inspect the primary return value to decide whether an error occurred
+// (according to the semantics of the specific function being called) before consulting
+// the error. The error will be guaranteed to contain windows.Errno.
+func (p *Proc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
+	switch len(a) {
+	case 0:
+		return syscall.Syscall(p.Addr(), uintptr(len(a)), 0, 0, 0)
+	case 1:
+		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], 0, 0)
+	case 2:
+		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], 0)
+	case 3:
+		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], a[2])
+	case 4:
+		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], 0, 0)
+	case 5:
+		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], 0)
+	case 6:
+		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5])
+	case 7:
+		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], 0, 0)
+	case 8:
+		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], 0)
+	case 9:
+		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8])
+	case 10:
+		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], 0, 0)
+	case 11:
+		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], 0)
+	case 12:
+		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11])
+	case 13:
+		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], 0, 0)
+	case 14:
+		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], 0)
+	case 15:
+		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14])
+	default:
+		panic("Call " + p.Name + " with too many arguments " + itoa(len(a)) + ".")
+	}
+}
+
+// A LazyDLL implements access to a single DLL.
+// It will delay the load of the DLL until the first
+// call to its Handle method or to one of its
+// LazyProc's Addr method.
+type LazyDLL struct {
+	Name string
+
+	// System determines whether the DLL must be loaded from the
+	// Windows System directory, bypassing the normal DLL search
+	// path.
+	System bool
+
+	mu  sync.Mutex
+	dll *DLL // non nil once DLL is loaded
+}
+
+// Load loads DLL file d.Name into memory. It returns an error if fails.
+// Load will not try to load DLL, if it is already loaded into memory.
+func (d *LazyDLL) Load() error {
+	// Non-racy version of:
+	// if d.dll != nil {
+	if atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&d.dll))) != nil {
+		return nil
+	}
+	d.mu.Lock()
+	defer d.mu.Unlock()
+	if d.dll != nil {
+		return nil
+	}
+
+	// kernel32.dll is special, since it's where LoadLibraryEx comes from.
+	// The kernel already special-cases its name, so it's always
+	// loaded from system32.
+	var dll *DLL
+	var err error
+	if d.Name == "kernel32.dll" {
+		dll, err = LoadDLL(d.Name)
+	} else {
+		dll, err = loadLibraryEx(d.Name, d.System)
+	}
+	if err != nil {
+		return err
+	}
+
+	// Non-racy version of:
+	// d.dll = dll
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&d.dll)), unsafe.Pointer(dll))
+	return nil
+}
+
+// mustLoad is like Load but panics if search fails.
+func (d *LazyDLL) mustLoad() {
+	e := d.Load()
+	if e != nil {
+		panic(e)
+	}
+}
+
+// Handle returns d's module handle.
+func (d *LazyDLL) Handle() uintptr {
+	d.mustLoad()
+	return uintptr(d.dll.Handle)
+}
+
+// NewProc returns a LazyProc for accessing the named procedure in the DLL d.
+func (d *LazyDLL) NewProc(name string) *LazyProc {
+	return &LazyProc{l: d, Name: name}
+}
+
+// NewLazyDLL creates new LazyDLL associated with DLL file.
+func NewLazyDLL(name string) *LazyDLL {
+	return &LazyDLL{Name: name}
+}
+
+// NewLazySystemDLL is like NewLazyDLL, but will only
+// search Windows System directory for the DLL if name is
+// a base name (like "advapi32.dll").
+func NewLazySystemDLL(name string) *LazyDLL {
+	return &LazyDLL{Name: name, System: true}
+}
+
+// A LazyProc implements access to a procedure inside a LazyDLL.
+// It delays the lookup until the Addr method is called.
+type LazyProc struct {
+	Name string
+
+	mu   sync.Mutex
+	l    *LazyDLL
+	proc *Proc
+}
+
+// Find searches DLL for procedure named p.Name. It returns
+// an error if search fails. Find will not search procedure,
+// if it is already found and loaded into memory.
+func (p *LazyProc) Find() error {
+	// Non-racy version of:
+	// if p.proc == nil {
+	if atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&p.proc))) == nil {
+		p.mu.Lock()
+		defer p.mu.Unlock()
+		if p.proc == nil {
+			e := p.l.Load()
+			if e != nil {
+				return e
+			}
+			proc, e := p.l.dll.FindProc(p.Name)
+			if e != nil {
+				return e
+			}
+			// Non-racy version of:
+			// p.proc = proc
+			atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&p.proc)), unsafe.Pointer(proc))
+		}
+	}
+	return nil
+}
+
+// mustFind is like Find but panics if search fails.
+func (p *LazyProc) mustFind() {
+	e := p.Find()
+	if e != nil {
+		panic(e)
+	}
+}
+
+// Addr returns the address of the procedure represented by p.
+// The return value can be passed to Syscall to run the procedure.
+// It will panic if the procedure cannot be found.
+func (p *LazyProc) Addr() uintptr {
+	p.mustFind()
+	return p.proc.Addr()
+}
+
+//go:uintptrescapes
+
+// Call executes procedure p with arguments a. It will panic, if more than 15 arguments
+// are supplied. It will also panic if the procedure cannot be found.
+//
+// The returned error is always non-nil, constructed from the result of GetLastError.
+// Callers must inspect the primary return value to decide whether an error occurred
+// (according to the semantics of the specific function being called) before consulting
+// the error. The error will be guaranteed to contain windows.Errno.
+func (p *LazyProc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
+	p.mustFind()
+	return p.proc.Call(a...)
+}
+
+var canDoSearchSystem32Once struct {
+	sync.Once
+	v bool
+}
+
+func initCanDoSearchSystem32() {
+	// https://msdn.microsoft.com/en-us/library/ms684179(v=vs.85).aspx says:
+	// "Windows 7, Windows Server 2008 R2, Windows Vista, and Windows
+	// Server 2008: The LOAD_LIBRARY_SEARCH_* flags are available on
+	// systems that have KB2533623 installed. To determine whether the
+	// flags are available, use GetProcAddress to get the address of the
+	// AddDllDirectory, RemoveDllDirectory, or SetDefaultDllDirectories
+	// function. If GetProcAddress succeeds, the LOAD_LIBRARY_SEARCH_*
+	// flags can be used with LoadLibraryEx."
+	canDoSearchSystem32Once.v = (modkernel32.NewProc("AddDllDirectory").Find() == nil)
+}
+
+func canDoSearchSystem32() bool {
+	canDoSearchSystem32Once.Do(initCanDoSearchSystem32)
+	return canDoSearchSystem32Once.v
+}
+
+func isBaseName(name string) bool {
+	for _, c := range name {
+		if c == ':' || c == '/' || c == '\\' {
+			return false
+		}
+	}
+	return true
+}
+
+// loadLibraryEx wraps the Windows LoadLibraryEx function.
+//
+// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms684179(v=vs.85).aspx
+//
+// If name is not an absolute path, LoadLibraryEx searches for the DLL
+// in a variety of automatic locations unless constrained by flags.
+// See: https://msdn.microsoft.com/en-us/library/ff919712%28VS.85%29.aspx
+func loadLibraryEx(name string, system bool) (*DLL, error) {
+	loadDLL := name
+	var flags uintptr
+	if system {
+		if canDoSearchSystem32() {
+			const LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
+			flags = LOAD_LIBRARY_SEARCH_SYSTEM32
+		} else if isBaseName(name) {
+			// WindowsXP or unpatched Windows machine
+			// trying to load "foo.dll" out of the system
+			// folder, but LoadLibraryEx doesn't support
+			// that yet on their system, so emulate it.
+			windir, _ := Getenv("WINDIR") // old var; apparently works on XP
+			if windir == "" {
+				return nil, errString("%WINDIR% not defined")
+			}
+			loadDLL = windir + "\\System32\\" + name
+		}
+	}
+	h, err := LoadLibraryEx(loadDLL, 0, flags)
+	if err != nil {
+		return nil, err
+	}
+	return &DLL{Name: name, Handle: h}, nil
+}
+
+type errString string
+
+func (s errString) Error() string { return string(s) }
diff --git a/vendor/golang.org/x/sys/windows/env_windows.go b/vendor/golang.org/x/sys/windows/env_windows.go
new file mode 100644
index 00000000..bdc71e24
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/env_windows.go
@@ -0,0 +1,29 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Windows environment variables.
+
+package windows
+
+import "syscall"
+
+func Getenv(key string) (value string, found bool) {
+	return syscall.Getenv(key)
+}
+
+func Setenv(key, value string) error {
+	return syscall.Setenv(key, value)
+}
+
+func Clearenv() {
+	syscall.Clearenv()
+}
+
+func Environ() []string {
+	return syscall.Environ()
+}
+
+func Unsetenv(key string) error {
+	return syscall.Unsetenv(key)
+}
diff --git a/vendor/golang.org/x/sys/windows/eventlog.go b/vendor/golang.org/x/sys/windows/eventlog.go
new file mode 100644
index 00000000..40af946e
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/eventlog.go
@@ -0,0 +1,20 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package windows
+
+const (
+	EVENTLOG_SUCCESS          = 0
+	EVENTLOG_ERROR_TYPE       = 1
+	EVENTLOG_WARNING_TYPE     = 2
+	EVENTLOG_INFORMATION_TYPE = 4
+	EVENTLOG_AUDIT_SUCCESS    = 8
+	EVENTLOG_AUDIT_FAILURE    = 16
+)
+
+//sys	RegisterEventSource(uncServerName *uint16, sourceName *uint16) (handle Handle, err error) [failretval==0] = advapi32.RegisterEventSourceW
+//sys	DeregisterEventSource(handle Handle) (err error) = advapi32.DeregisterEventSource
+//sys	ReportEvent(log Handle, etype uint16, category uint16, eventId uint32, usrSId uintptr, numStrings uint16, dataSize uint32, strings **uint16, rawData *byte) (err error) = advapi32.ReportEventW
diff --git a/vendor/golang.org/x/sys/windows/exec_windows.go b/vendor/golang.org/x/sys/windows/exec_windows.go
new file mode 100644
index 00000000..3606c3a8
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/exec_windows.go
@@ -0,0 +1,97 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Fork, exec, wait, etc.
+
+package windows
+
+// EscapeArg rewrites command line argument s as prescribed
+// in http://msdn.microsoft.com/en-us/library/ms880421.
+// This function returns "" (2 double quotes) if s is empty.
+// Alternatively, these transformations are done:
+// - every back slash (\) is doubled, but only if immediately
+//   followed by double quote (");
+// - every double quote (") is escaped by back slash (\);
+// - finally, s is wrapped with double quotes (arg -> "arg"),
+//   but only if there is space or tab inside s.
+func EscapeArg(s string) string {
+	if len(s) == 0 {
+		return "\"\""
+	}
+	n := len(s)
+	hasSpace := false
+	for i := 0; i < len(s); i++ {
+		switch s[i] {
+		case '"', '\\':
+			n++
+		case ' ', '\t':
+			hasSpace = true
+		}
+	}
+	if hasSpace {
+		n += 2
+	}
+	if n == len(s) {
+		return s
+	}
+
+	qs := make([]byte, n)
+	j := 0
+	if hasSpace {
+		qs[j] = '"'
+		j++
+	}
+	slashes := 0
+	for i := 0; i < len(s); i++ {
+		switch s[i] {
+		default:
+			slashes = 0
+			qs[j] = s[i]
+		case '\\':
+			slashes++
+			qs[j] = s[i]
+		case '"':
+			for ; slashes > 0; slashes-- {
+				qs[j] = '\\'
+				j++
+			}
+			qs[j] = '\\'
+			j++
+			qs[j] = s[i]
+		}
+		j++
+	}
+	if hasSpace {
+		for ; slashes > 0; slashes-- {
+			qs[j] = '\\'
+			j++
+		}
+		qs[j] = '"'
+		j++
+	}
+	return string(qs[:j])
+}
+
+func CloseOnExec(fd Handle) {
+	SetHandleInformation(Handle(fd), HANDLE_FLAG_INHERIT, 0)
+}
+
+// FullPath retrieves the full path of the specified file.
+func FullPath(name string) (path string, err error) {
+	p, err := UTF16PtrFromString(name)
+	if err != nil {
+		return "", err
+	}
+	n := uint32(100)
+	for {
+		buf := make([]uint16, n)
+		n, err = GetFullPathName(p, uint32(len(buf)), &buf[0], nil)
+		if err != nil {
+			return "", err
+		}
+		if n <= uint32(len(buf)) {
+			return UTF16ToString(buf[:n]), nil
+		}
+	}
+}
diff --git a/vendor/golang.org/x/sys/windows/memory_windows.go b/vendor/golang.org/x/sys/windows/memory_windows.go
new file mode 100644
index 00000000..f80a4204
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/memory_windows.go
@@ -0,0 +1,26 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+const (
+	MEM_COMMIT      = 0x00001000
+	MEM_RESERVE     = 0x00002000
+	MEM_DECOMMIT    = 0x00004000
+	MEM_RELEASE     = 0x00008000
+	MEM_RESET       = 0x00080000
+	MEM_TOP_DOWN    = 0x00100000
+	MEM_WRITE_WATCH = 0x00200000
+	MEM_PHYSICAL    = 0x00400000
+	MEM_RESET_UNDO  = 0x01000000
+	MEM_LARGE_PAGES = 0x20000000
+
+	PAGE_NOACCESS          = 0x01
+	PAGE_READONLY          = 0x02
+	PAGE_READWRITE         = 0x04
+	PAGE_WRITECOPY         = 0x08
+	PAGE_EXECUTE_READ      = 0x20
+	PAGE_EXECUTE_READWRITE = 0x40
+	PAGE_EXECUTE_WRITECOPY = 0x80
+)
diff --git a/vendor/golang.org/x/sys/windows/mksyscall.go b/vendor/golang.org/x/sys/windows/mksyscall.go
new file mode 100644
index 00000000..fb7db0ef
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/mksyscall.go
@@ -0,0 +1,7 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go eventlog.go service.go syscall_windows.go security_windows.go
diff --git a/vendor/golang.org/x/sys/windows/race.go b/vendor/golang.org/x/sys/windows/race.go
new file mode 100644
index 00000000..a74e3e24
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/race.go
@@ -0,0 +1,30 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows,race
+
+package windows
+
+import (
+	"runtime"
+	"unsafe"
+)
+
+const raceenabled = true
+
+func raceAcquire(addr unsafe.Pointer) {
+	runtime.RaceAcquire(addr)
+}
+
+func raceReleaseMerge(addr unsafe.Pointer) {
+	runtime.RaceReleaseMerge(addr)
+}
+
+func raceReadRange(addr unsafe.Pointer, len int) {
+	runtime.RaceReadRange(addr, len)
+}
+
+func raceWriteRange(addr unsafe.Pointer, len int) {
+	runtime.RaceWriteRange(addr, len)
+}
diff --git a/vendor/golang.org/x/sys/windows/race0.go b/vendor/golang.org/x/sys/windows/race0.go
new file mode 100644
index 00000000..e44a3cbf
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/race0.go
@@ -0,0 +1,25 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows,!race
+
+package windows
+
+import (
+	"unsafe"
+)
+
+const raceenabled = false
+
+func raceAcquire(addr unsafe.Pointer) {
+}
+
+func raceReleaseMerge(addr unsafe.Pointer) {
+}
+
+func raceReadRange(addr unsafe.Pointer, len int) {
+}
+
+func raceWriteRange(addr unsafe.Pointer, len int) {
+}
diff --git a/vendor/golang.org/x/sys/windows/registry/export_test.go b/vendor/golang.org/x/sys/windows/registry/export_test.go
new file mode 100644
index 00000000..8badf6fd
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/registry/export_test.go
@@ -0,0 +1,11 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package registry
+
+func (k Key) SetValue(name string, valtype uint32, data []byte) error {
+	return k.setValue(name, valtype, data)
+}
diff --git a/vendor/golang.org/x/sys/windows/registry/key.go b/vendor/golang.org/x/sys/windows/registry/key.go
new file mode 100644
index 00000000..c2564834
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/registry/key.go
@@ -0,0 +1,198 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// Package registry provides access to the Windows registry.
+//
+// Here is a simple example, opening a registry key and reading a string value from it.
+//
+//	k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
+//	if err != nil {
+//		log.Fatal(err)
+//	}
+//	defer k.Close()
+//
+//	s, _, err := k.GetStringValue("SystemRoot")
+//	if err != nil {
+//		log.Fatal(err)
+//	}
+//	fmt.Printf("Windows system root is %q\n", s)
+//
+package registry
+
+import (
+	"io"
+	"syscall"
+	"time"
+)
+
+const (
+	// Registry key security and access rights.
+	// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms724878.aspx
+	// for details.
+	ALL_ACCESS         = 0xf003f
+	CREATE_LINK        = 0x00020
+	CREATE_SUB_KEY     = 0x00004
+	ENUMERATE_SUB_KEYS = 0x00008
+	EXECUTE            = 0x20019
+	NOTIFY             = 0x00010
+	QUERY_VALUE        = 0x00001
+	READ               = 0x20019
+	SET_VALUE          = 0x00002
+	WOW64_32KEY        = 0x00200
+	WOW64_64KEY        = 0x00100
+	WRITE              = 0x20006
+)
+
+// Key is a handle to an open Windows registry key.
+// Keys can be obtained by calling OpenKey; there are
+// also some predefined root keys such as CURRENT_USER.
+// Keys can be used directly in the Windows API.
+type Key syscall.Handle
+
+const (
+	// Windows defines some predefined root keys that are always open.
+	// An application can use these keys as entry points to the registry.
+	// Normally these keys are used in OpenKey to open new keys,
+	// but they can also be used anywhere a Key is required.
+	CLASSES_ROOT     = Key(syscall.HKEY_CLASSES_ROOT)
+	CURRENT_USER     = Key(syscall.HKEY_CURRENT_USER)
+	LOCAL_MACHINE    = Key(syscall.HKEY_LOCAL_MACHINE)
+	USERS            = Key(syscall.HKEY_USERS)
+	CURRENT_CONFIG   = Key(syscall.HKEY_CURRENT_CONFIG)
+	PERFORMANCE_DATA = Key(syscall.HKEY_PERFORMANCE_DATA)
+)
+
+// Close closes open key k.
+func (k Key) Close() error {
+	return syscall.RegCloseKey(syscall.Handle(k))
+}
+
+// OpenKey opens a new key with path name relative to key k.
+// It accepts any open key, including CURRENT_USER and others,
+// and returns the new key and an error.
+// The access parameter specifies desired access rights to the
+// key to be opened.
+func OpenKey(k Key, path string, access uint32) (Key, error) {
+	p, err := syscall.UTF16PtrFromString(path)
+	if err != nil {
+		return 0, err
+	}
+	var subkey syscall.Handle
+	err = syscall.RegOpenKeyEx(syscall.Handle(k), p, 0, access, &subkey)
+	if err != nil {
+		return 0, err
+	}
+	return Key(subkey), nil
+}
+
+// OpenRemoteKey opens a predefined registry key on another
+// computer pcname. The key to be opened is specified by k, but
+// can only be one of LOCAL_MACHINE, PERFORMANCE_DATA or USERS.
+// If pcname is "", OpenRemoteKey returns local computer key.
+func OpenRemoteKey(pcname string, k Key) (Key, error) {
+	var err error
+	var p *uint16
+	if pcname != "" {
+		p, err = syscall.UTF16PtrFromString(`\\` + pcname)
+		if err != nil {
+			return 0, err
+		}
+	}
+	var remoteKey syscall.Handle
+	err = regConnectRegistry(p, syscall.Handle(k), &remoteKey)
+	if err != nil {
+		return 0, err
+	}
+	return Key(remoteKey), nil
+}
+
+// ReadSubKeyNames returns the names of subkeys of key k.
+// The parameter n controls the number of returned names,
+// analogous to the way os.File.Readdirnames works.
+func (k Key) ReadSubKeyNames(n int) ([]string, error) {
+	names := make([]string, 0)
+	// Registry key size limit is 255 bytes and described there:
+	// https://msdn.microsoft.com/library/windows/desktop/ms724872.aspx
+	buf := make([]uint16, 256) //plus extra room for terminating zero byte
+loopItems:
+	for i := uint32(0); ; i++ {
+		if n > 0 {
+			if len(names) == n {
+				return names, nil
+			}
+		}
+		l := uint32(len(buf))
+		for {
+			err := syscall.RegEnumKeyEx(syscall.Handle(k), i, &buf[0], &l, nil, nil, nil, nil)
+			if err == nil {
+				break
+			}
+			if err == syscall.ERROR_MORE_DATA {
+				// Double buffer size and try again.
+				l = uint32(2 * len(buf))
+				buf = make([]uint16, l)
+				continue
+			}
+			if err == _ERROR_NO_MORE_ITEMS {
+				break loopItems
+			}
+			return names, err
+		}
+		names = append(names, syscall.UTF16ToString(buf[:l]))
+	}
+	if n > len(names) {
+		return names, io.EOF
+	}
+	return names, nil
+}
+
+// CreateKey creates a key named path under open key k.
+// CreateKey returns the new key and a boolean flag that reports
+// whether the key already existed.
+// The access parameter specifies the access rights for the key
+// to be created.
+func CreateKey(k Key, path string, access uint32) (newk Key, openedExisting bool, err error) {
+	var h syscall.Handle
+	var d uint32
+	err = regCreateKeyEx(syscall.Handle(k), syscall.StringToUTF16Ptr(path),
+		0, nil, _REG_OPTION_NON_VOLATILE, access, nil, &h, &d)
+	if err != nil {
+		return 0, false, err
+	}
+	return Key(h), d == _REG_OPENED_EXISTING_KEY, nil
+}
+
+// DeleteKey deletes the subkey path of key k and its values.
+func DeleteKey(k Key, path string) error {
+	return regDeleteKey(syscall.Handle(k), syscall.StringToUTF16Ptr(path))
+}
+
+// A KeyInfo describes the statistics of a key. It is returned by Stat.
+type KeyInfo struct {
+	SubKeyCount     uint32
+	MaxSubKeyLen    uint32 // size of the key's subkey with the longest name, in Unicode characters, not including the terminating zero byte
+	ValueCount      uint32
+	MaxValueNameLen uint32 // size of the key's longest value name, in Unicode characters, not including the terminating zero byte
+	MaxValueLen     uint32 // longest data component among the key's values, in bytes
+	lastWriteTime   syscall.Filetime
+}
+
+// ModTime returns the key's last write time.
+func (ki *KeyInfo) ModTime() time.Time {
+	return time.Unix(0, ki.lastWriteTime.Nanoseconds())
+}
+
+// Stat retrieves information about the open key k.
+func (k Key) Stat() (*KeyInfo, error) {
+	var ki KeyInfo
+	err := syscall.RegQueryInfoKey(syscall.Handle(k), nil, nil, nil,
+		&ki.SubKeyCount, &ki.MaxSubKeyLen, nil, &ki.ValueCount,
+		&ki.MaxValueNameLen, &ki.MaxValueLen, nil, &ki.lastWriteTime)
+	if err != nil {
+		return nil, err
+	}
+	return &ki, nil
+}
diff --git a/vendor/golang.org/x/sys/windows/registry/mksyscall.go b/vendor/golang.org/x/sys/windows/registry/mksyscall.go
new file mode 100644
index 00000000..0ac95ffe
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/registry/mksyscall.go
@@ -0,0 +1,7 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package registry
+
+//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go syscall.go
diff --git a/vendor/golang.org/x/sys/windows/registry/registry_test.go b/vendor/golang.org/x/sys/windows/registry/registry_test.go
new file mode 100644
index 00000000..2f4dd69e
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/registry/registry_test.go
@@ -0,0 +1,756 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package registry_test
+
+import (
+	"bytes"
+	"crypto/rand"
+	"os"
+	"syscall"
+	"testing"
+	"time"
+	"unsafe"
+
+	"golang.org/x/sys/windows/registry"
+)
+
+func randKeyName(prefix string) string {
+	const numbers = "0123456789"
+	buf := make([]byte, 10)
+	rand.Read(buf)
+	for i, b := range buf {
+		buf[i] = numbers[b%byte(len(numbers))]
+	}
+	return prefix + string(buf)
+}
+
+func TestReadSubKeyNames(t *testing.T) {
+	k, err := registry.OpenKey(registry.CLASSES_ROOT, "TypeLib", registry.ENUMERATE_SUB_KEYS)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer k.Close()
+
+	names, err := k.ReadSubKeyNames(-1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	var foundStdOle bool
+	for _, name := range names {
+		// Every PC has "stdole 2.0 OLE Automation" library installed.
+		if name == "{00020430-0000-0000-C000-000000000046}" {
+			foundStdOle = true
+		}
+	}
+	if !foundStdOle {
+		t.Fatal("could not find stdole 2.0 OLE Automation")
+	}
+}
+
+func TestCreateOpenDeleteKey(t *testing.T) {
+	k, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer k.Close()
+
+	testKName := randKeyName("TestCreateOpenDeleteKey_")
+
+	testK, exist, err := registry.CreateKey(k, testKName, registry.CREATE_SUB_KEY)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer testK.Close()
+
+	if exist {
+		t.Fatalf("key %q already exists", testKName)
+	}
+
+	testKAgain, exist, err := registry.CreateKey(k, testKName, registry.CREATE_SUB_KEY)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer testKAgain.Close()
+
+	if !exist {
+		t.Fatalf("key %q should already exist", testKName)
+	}
+
+	testKOpened, err := registry.OpenKey(k, testKName, registry.ENUMERATE_SUB_KEYS)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer testKOpened.Close()
+
+	err = registry.DeleteKey(k, testKName)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	testKOpenedAgain, err := registry.OpenKey(k, testKName, registry.ENUMERATE_SUB_KEYS)
+	if err == nil {
+		defer testKOpenedAgain.Close()
+		t.Fatalf("key %q should already been deleted", testKName)
+	}
+	if err != registry.ErrNotExist {
+		t.Fatalf(`unexpected error ("not exist" expected): %v`, err)
+	}
+}
+
+func equalStringSlice(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	if a == nil {
+		return true
+	}
+	for i := range a {
+		if a[i] != b[i] {
+			return false
+		}
+	}
+	return true
+}
+
+type ValueTest struct {
+	Type     uint32
+	Name     string
+	Value    interface{}
+	WillFail bool
+}
+
+var ValueTests = []ValueTest{
+	{Type: registry.SZ, Name: "String1", Value: ""},
+	{Type: registry.SZ, Name: "String2", Value: "\000", WillFail: true},
+	{Type: registry.SZ, Name: "String3", Value: "Hello World"},
+	{Type: registry.SZ, Name: "String4", Value: "Hello World\000", WillFail: true},
+	{Type: registry.EXPAND_SZ, Name: "ExpString1", Value: ""},
+	{Type: registry.EXPAND_SZ, Name: "ExpString2", Value: "\000", WillFail: true},
+	{Type: registry.EXPAND_SZ, Name: "ExpString3", Value: "Hello World"},
+	{Type: registry.EXPAND_SZ, Name: "ExpString4", Value: "Hello\000World", WillFail: true},
+	{Type: registry.EXPAND_SZ, Name: "ExpString5", Value: "%PATH%"},
+	{Type: registry.EXPAND_SZ, Name: "ExpString6", Value: "%NO_SUCH_VARIABLE%"},
+	{Type: registry.EXPAND_SZ, Name: "ExpString7", Value: "%PATH%;."},
+	{Type: registry.BINARY, Name: "Binary1", Value: []byte{}},
+	{Type: registry.BINARY, Name: "Binary2", Value: []byte{1, 2, 3}},
+	{Type: registry.BINARY, Name: "Binary3", Value: []byte{3, 2, 1, 0, 1, 2, 3}},
+	{Type: registry.DWORD, Name: "Dword1", Value: uint64(0)},
+	{Type: registry.DWORD, Name: "Dword2", Value: uint64(1)},
+	{Type: registry.DWORD, Name: "Dword3", Value: uint64(0xff)},
+	{Type: registry.DWORD, Name: "Dword4", Value: uint64(0xffff)},
+	{Type: registry.QWORD, Name: "Qword1", Value: uint64(0)},
+	{Type: registry.QWORD, Name: "Qword2", Value: uint64(1)},
+	{Type: registry.QWORD, Name: "Qword3", Value: uint64(0xff)},
+	{Type: registry.QWORD, Name: "Qword4", Value: uint64(0xffff)},
+	{Type: registry.QWORD, Name: "Qword5", Value: uint64(0xffffff)},
+	{Type: registry.QWORD, Name: "Qword6", Value: uint64(0xffffffff)},
+	{Type: registry.MULTI_SZ, Name: "MultiString1", Value: []string{"a", "b", "c"}},
+	{Type: registry.MULTI_SZ, Name: "MultiString2", Value: []string{"abc", "", "cba"}},
+	{Type: registry.MULTI_SZ, Name: "MultiString3", Value: []string{""}},
+	{Type: registry.MULTI_SZ, Name: "MultiString4", Value: []string{"abcdef"}},
+	{Type: registry.MULTI_SZ, Name: "MultiString5", Value: []string{"\000"}, WillFail: true},
+	{Type: registry.MULTI_SZ, Name: "MultiString6", Value: []string{"a\000b"}, WillFail: true},
+	{Type: registry.MULTI_SZ, Name: "MultiString7", Value: []string{"ab", "\000", "cd"}, WillFail: true},
+	{Type: registry.MULTI_SZ, Name: "MultiString8", Value: []string{"\000", "cd"}, WillFail: true},
+	{Type: registry.MULTI_SZ, Name: "MultiString9", Value: []string{"ab", "\000"}, WillFail: true},
+}
+
+func setValues(t *testing.T, k registry.Key) {
+	for _, test := range ValueTests {
+		var err error
+		switch test.Type {
+		case registry.SZ:
+			err = k.SetStringValue(test.Name, test.Value.(string))
+		case registry.EXPAND_SZ:
+			err = k.SetExpandStringValue(test.Name, test.Value.(string))
+		case registry.MULTI_SZ:
+			err = k.SetStringsValue(test.Name, test.Value.([]string))
+		case registry.BINARY:
+			err = k.SetBinaryValue(test.Name, test.Value.([]byte))
+		case registry.DWORD:
+			err = k.SetDWordValue(test.Name, uint32(test.Value.(uint64)))
+		case registry.QWORD:
+			err = k.SetQWordValue(test.Name, test.Value.(uint64))
+		default:
+			t.Fatalf("unsupported type %d for %s value", test.Type, test.Name)
+		}
+		if test.WillFail {
+			if err == nil {
+				t.Fatalf("setting %s value %q should fail, but succeeded", test.Name, test.Value)
+			}
+		} else {
+			if err != nil {
+				t.Fatal(err)
+			}
+		}
+	}
+}
+
+func enumerateValues(t *testing.T, k registry.Key) {
+	names, err := k.ReadValueNames(-1)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	haveNames := make(map[string]bool)
+	for _, n := range names {
+		haveNames[n] = false
+	}
+	for _, test := range ValueTests {
+		wantFound := !test.WillFail
+		_, haveFound := haveNames[test.Name]
+		if wantFound && !haveFound {
+			t.Errorf("value %s is not found while enumerating", test.Name)
+		}
+		if haveFound && !wantFound {
+			t.Errorf("value %s is found while enumerating, but expected to fail", test.Name)
+		}
+		if haveFound {
+			delete(haveNames, test.Name)
+		}
+	}
+	for n, v := range haveNames {
+		t.Errorf("value %s (%v) is found while enumerating, but has not been cretaed", n, v)
+	}
+}
+
+func testErrNotExist(t *testing.T, name string, err error) {
+	if err == nil {
+		t.Errorf("%s value should not exist", name)
+		return
+	}
+	if err != registry.ErrNotExist {
+		t.Errorf("reading %s value should return 'not exist' error, but got: %s", name, err)
+		return
+	}
+}
+
+func testErrUnexpectedType(t *testing.T, test ValueTest, gottype uint32, err error) {
+	if err == nil {
+		t.Errorf("GetXValue(%q) should not succeed", test.Name)
+		return
+	}
+	if err != registry.ErrUnexpectedType {
+		t.Errorf("reading %s value should return 'unexpected key value type' error, but got: %s", test.Name, err)
+		return
+	}
+	if gottype != test.Type {
+		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
+		return
+	}
+}
+
+func testGetStringValue(t *testing.T, k registry.Key, test ValueTest) {
+	got, gottype, err := k.GetStringValue(test.Name)
+	if err != nil {
+		t.Errorf("GetStringValue(%s) failed: %v", test.Name, err)
+		return
+	}
+	if got != test.Value {
+		t.Errorf("want %s value %q, got %q", test.Name, test.Value, got)
+		return
+	}
+	if gottype != test.Type {
+		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
+		return
+	}
+	if gottype == registry.EXPAND_SZ {
+		_, err = registry.ExpandString(got)
+		if err != nil {
+			t.Errorf("ExpandString(%s) failed: %v", got, err)
+			return
+		}
+	}
+}
+
+func testGetIntegerValue(t *testing.T, k registry.Key, test ValueTest) {
+	got, gottype, err := k.GetIntegerValue(test.Name)
+	if err != nil {
+		t.Errorf("GetIntegerValue(%s) failed: %v", test.Name, err)
+		return
+	}
+	if got != test.Value.(uint64) {
+		t.Errorf("want %s value %v, got %v", test.Name, test.Value, got)
+		return
+	}
+	if gottype != test.Type {
+		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
+		return
+	}
+}
+
+func testGetBinaryValue(t *testing.T, k registry.Key, test ValueTest) {
+	got, gottype, err := k.GetBinaryValue(test.Name)
+	if err != nil {
+		t.Errorf("GetBinaryValue(%s) failed: %v", test.Name, err)
+		return
+	}
+	if !bytes.Equal(got, test.Value.([]byte)) {
+		t.Errorf("want %s value %v, got %v", test.Name, test.Value, got)
+		return
+	}
+	if gottype != test.Type {
+		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
+		return
+	}
+}
+
+func testGetStringsValue(t *testing.T, k registry.Key, test ValueTest) {
+	got, gottype, err := k.GetStringsValue(test.Name)
+	if err != nil {
+		t.Errorf("GetStringsValue(%s) failed: %v", test.Name, err)
+		return
+	}
+	if !equalStringSlice(got, test.Value.([]string)) {
+		t.Errorf("want %s value %#v, got %#v", test.Name, test.Value, got)
+		return
+	}
+	if gottype != test.Type {
+		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
+		return
+	}
+}
+
+func testGetValue(t *testing.T, k registry.Key, test ValueTest, size int) {
+	if size <= 0 {
+		return
+	}
+	// read data with no buffer
+	gotsize, gottype, err := k.GetValue(test.Name, nil)
+	if err != nil {
+		t.Errorf("GetValue(%s, [%d]byte) failed: %v", test.Name, size, err)
+		return
+	}
+	if gotsize != size {
+		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
+		return
+	}
+	if gottype != test.Type {
+		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
+		return
+	}
+	// read data with short buffer
+	gotsize, gottype, err = k.GetValue(test.Name, make([]byte, size-1))
+	if err == nil {
+		t.Errorf("GetValue(%s, [%d]byte) should fail, but succeeded", test.Name, size-1)
+		return
+	}
+	if err != registry.ErrShortBuffer {
+		t.Errorf("reading %s value should return 'short buffer' error, but got: %s", test.Name, err)
+		return
+	}
+	if gotsize != size {
+		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
+		return
+	}
+	if gottype != test.Type {
+		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
+		return
+	}
+	// read full data
+	gotsize, gottype, err = k.GetValue(test.Name, make([]byte, size))
+	if err != nil {
+		t.Errorf("GetValue(%s, [%d]byte) failed: %v", test.Name, size, err)
+		return
+	}
+	if gotsize != size {
+		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
+		return
+	}
+	if gottype != test.Type {
+		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
+		return
+	}
+	// check GetValue returns ErrNotExist as required
+	_, _, err = k.GetValue(test.Name+"_not_there", make([]byte, size))
+	if err == nil {
+		t.Errorf("GetValue(%q) should not succeed", test.Name)
+		return
+	}
+	if err != registry.ErrNotExist {
+		t.Errorf("GetValue(%q) should return 'not exist' error, but got: %s", test.Name, err)
+		return
+	}
+}
+
+func testValues(t *testing.T, k registry.Key) {
+	for _, test := range ValueTests {
+		switch test.Type {
+		case registry.SZ, registry.EXPAND_SZ:
+			if test.WillFail {
+				_, _, err := k.GetStringValue(test.Name)
+				testErrNotExist(t, test.Name, err)
+			} else {
+				testGetStringValue(t, k, test)
+				_, gottype, err := k.GetIntegerValue(test.Name)
+				testErrUnexpectedType(t, test, gottype, err)
+				// Size of utf16 string in bytes is not perfect,
+				// but correct for current test values.
+				// Size also includes terminating 0.
+				testGetValue(t, k, test, (len(test.Value.(string))+1)*2)
+			}
+			_, _, err := k.GetStringValue(test.Name + "_string_not_created")
+			testErrNotExist(t, test.Name+"_string_not_created", err)
+		case registry.DWORD, registry.QWORD:
+			testGetIntegerValue(t, k, test)
+			_, gottype, err := k.GetBinaryValue(test.Name)
+			testErrUnexpectedType(t, test, gottype, err)
+			_, _, err = k.GetIntegerValue(test.Name + "_int_not_created")
+			testErrNotExist(t, test.Name+"_int_not_created", err)
+			size := 8
+			if test.Type == registry.DWORD {
+				size = 4
+			}
+			testGetValue(t, k, test, size)
+		case registry.BINARY:
+			testGetBinaryValue(t, k, test)
+			_, gottype, err := k.GetStringsValue(test.Name)
+			testErrUnexpectedType(t, test, gottype, err)
+			_, _, err = k.GetBinaryValue(test.Name + "_byte_not_created")
+			testErrNotExist(t, test.Name+"_byte_not_created", err)
+			testGetValue(t, k, test, len(test.Value.([]byte)))
+		case registry.MULTI_SZ:
+			if test.WillFail {
+				_, _, err := k.GetStringsValue(test.Name)
+				testErrNotExist(t, test.Name, err)
+			} else {
+				testGetStringsValue(t, k, test)
+				_, gottype, err := k.GetStringValue(test.Name)
+				testErrUnexpectedType(t, test, gottype, err)
+				size := 0
+				for _, s := range test.Value.([]string) {
+					size += len(s) + 1 // nil terminated
+				}
+				size += 1 // extra nil at the end
+				size *= 2 // count bytes, not uint16
+				testGetValue(t, k, test, size)
+			}
+			_, _, err := k.GetStringsValue(test.Name + "_strings_not_created")
+			testErrNotExist(t, test.Name+"_strings_not_created", err)
+		default:
+			t.Errorf("unsupported type %d for %s value", test.Type, test.Name)
+			continue
+		}
+	}
+}
+
+func testStat(t *testing.T, k registry.Key) {
+	subk, _, err := registry.CreateKey(k, "subkey", registry.CREATE_SUB_KEY)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	defer subk.Close()
+
+	defer registry.DeleteKey(k, "subkey")
+
+	ki, err := k.Stat()
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	if ki.SubKeyCount != 1 {
+		t.Error("key must have 1 subkey")
+	}
+	if ki.MaxSubKeyLen != 6 {
+		t.Error("key max subkey name length must be 6")
+	}
+	if ki.ValueCount != 24 {
+		t.Errorf("key must have 24 values, but is %d", ki.ValueCount)
+	}
+	if ki.MaxValueNameLen != 12 {
+		t.Errorf("key max value name length must be 10, but is %d", ki.MaxValueNameLen)
+	}
+	if ki.MaxValueLen != 38 {
+		t.Errorf("key max value length must be 38, but is %d", ki.MaxValueLen)
+	}
+	if mt, ct := ki.ModTime(), time.Now(); ct.Sub(mt) > 100*time.Millisecond {
+		t.Errorf("key mod time is not close to current time: mtime=%v current=%v delta=%v", mt, ct, ct.Sub(mt))
+	}
+}
+
+func deleteValues(t *testing.T, k registry.Key) {
+	for _, test := range ValueTests {
+		if test.WillFail {
+			continue
+		}
+		err := k.DeleteValue(test.Name)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+	}
+	names, err := k.ReadValueNames(-1)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	if len(names) != 0 {
+		t.Errorf("some values remain after deletion: %v", names)
+	}
+}
+
+func TestValues(t *testing.T) {
+	softwareK, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer softwareK.Close()
+
+	testKName := randKeyName("TestValues_")
+
+	k, exist, err := registry.CreateKey(softwareK, testKName, registry.CREATE_SUB_KEY|registry.QUERY_VALUE|registry.SET_VALUE)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer k.Close()
+
+	if exist {
+		t.Fatalf("key %q already exists", testKName)
+	}
+
+	defer registry.DeleteKey(softwareK, testKName)
+
+	setValues(t, k)
+
+	enumerateValues(t, k)
+
+	testValues(t, k)
+
+	testStat(t, k)
+
+	deleteValues(t, k)
+}
+
+func walkKey(t *testing.T, k registry.Key, kname string) {
+	names, err := k.ReadValueNames(-1)
+	if err != nil {
+		t.Fatalf("reading value names of %s failed: %v", kname, err)
+	}
+	for _, name := range names {
+		_, valtype, err := k.GetValue(name, nil)
+		if err != nil {
+			t.Fatalf("reading value type of %s of %s failed: %v", name, kname, err)
+		}
+		switch valtype {
+		case registry.NONE:
+		case registry.SZ:
+			_, _, err := k.GetStringValue(name)
+			if err != nil {
+				t.Error(err)
+			}
+		case registry.EXPAND_SZ:
+			s, _, err := k.GetStringValue(name)
+			if err != nil {
+				t.Error(err)
+			}
+			_, err = registry.ExpandString(s)
+			if err != nil {
+				t.Error(err)
+			}
+		case registry.DWORD, registry.QWORD:
+			_, _, err := k.GetIntegerValue(name)
+			if err != nil {
+				t.Error(err)
+			}
+		case registry.BINARY:
+			_, _, err := k.GetBinaryValue(name)
+			if err != nil {
+				t.Error(err)
+			}
+		case registry.MULTI_SZ:
+			_, _, err := k.GetStringsValue(name)
+			if err != nil {
+				t.Error(err)
+			}
+		case registry.FULL_RESOURCE_DESCRIPTOR, registry.RESOURCE_LIST, registry.RESOURCE_REQUIREMENTS_LIST:
+			// TODO: not implemented
+		default:
+			t.Fatalf("value type %d of %s of %s failed: %v", valtype, name, kname, err)
+		}
+	}
+
+	names, err = k.ReadSubKeyNames(-1)
+	if err != nil {
+		t.Fatalf("reading sub-keys of %s failed: %v", kname, err)
+	}
+	for _, name := range names {
+		func() {
+			subk, err := registry.OpenKey(k, name, registry.ENUMERATE_SUB_KEYS|registry.QUERY_VALUE)
+			if err != nil {
+				if err == syscall.ERROR_ACCESS_DENIED {
+					// ignore error, if we are not allowed to access this key
+					return
+				}
+				t.Fatalf("opening sub-keys %s of %s failed: %v", name, kname, err)
+			}
+			defer subk.Close()
+
+			walkKey(t, subk, kname+`\`+name)
+		}()
+	}
+}
+
+func TestWalkFullRegistry(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping long running test in short mode")
+	}
+	walkKey(t, registry.CLASSES_ROOT, "CLASSES_ROOT")
+	walkKey(t, registry.CURRENT_USER, "CURRENT_USER")
+	walkKey(t, registry.LOCAL_MACHINE, "LOCAL_MACHINE")
+	walkKey(t, registry.USERS, "USERS")
+	walkKey(t, registry.CURRENT_CONFIG, "CURRENT_CONFIG")
+}
+
+func TestExpandString(t *testing.T) {
+	got, err := registry.ExpandString("%PATH%")
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := os.Getenv("PATH")
+	if got != want {
+		t.Errorf("want %q string expanded, got %q", want, got)
+	}
+}
+
+func TestInvalidValues(t *testing.T) {
+	softwareK, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer softwareK.Close()
+
+	testKName := randKeyName("TestInvalidValues_")
+
+	k, exist, err := registry.CreateKey(softwareK, testKName, registry.CREATE_SUB_KEY|registry.QUERY_VALUE|registry.SET_VALUE)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer k.Close()
+
+	if exist {
+		t.Fatalf("key %q already exists", testKName)
+	}
+
+	defer registry.DeleteKey(softwareK, testKName)
+
+	var tests = []struct {
+		Type uint32
+		Name string
+		Data []byte
+	}{
+		{registry.DWORD, "Dword1", nil},
+		{registry.DWORD, "Dword2", []byte{1, 2, 3}},
+		{registry.QWORD, "Qword1", nil},
+		{registry.QWORD, "Qword2", []byte{1, 2, 3}},
+		{registry.QWORD, "Qword3", []byte{1, 2, 3, 4, 5, 6, 7}},
+		{registry.MULTI_SZ, "MultiString1", nil},
+		{registry.MULTI_SZ, "MultiString2", []byte{0}},
+		{registry.MULTI_SZ, "MultiString3", []byte{'a', 'b', 0}},
+		{registry.MULTI_SZ, "MultiString4", []byte{'a', 0, 0, 'b', 0}},
+		{registry.MULTI_SZ, "MultiString5", []byte{'a', 0, 0}},
+	}
+
+	for _, test := range tests {
+		err := k.SetValue(test.Name, test.Type, test.Data)
+		if err != nil {
+			t.Fatalf("SetValue for %q failed: %v", test.Name, err)
+		}
+	}
+
+	for _, test := range tests {
+		switch test.Type {
+		case registry.DWORD, registry.QWORD:
+			value, valType, err := k.GetIntegerValue(test.Name)
+			if err == nil {
+				t.Errorf("GetIntegerValue(%q) succeeded. Returns type=%d value=%v", test.Name, valType, value)
+			}
+		case registry.MULTI_SZ:
+			value, valType, err := k.GetStringsValue(test.Name)
+			if err == nil {
+				if len(value) != 0 {
+					t.Errorf("GetStringsValue(%q) succeeded. Returns type=%d value=%v", test.Name, valType, value)
+				}
+			}
+		default:
+			t.Errorf("unsupported type %d for %s value", test.Type, test.Name)
+		}
+	}
+}
+
+func TestGetMUIStringValue(t *testing.T) {
+	if err := registry.LoadRegLoadMUIString(); err != nil {
+		t.Skip("regLoadMUIString not supported; skipping")
+	}
+	if err := procGetDynamicTimeZoneInformation.Find(); err != nil {
+		t.Skipf("%s not supported; skipping", procGetDynamicTimeZoneInformation.Name)
+	}
+	var dtzi DynamicTimezoneinformation
+	if _, err := GetDynamicTimeZoneInformation(&dtzi); err != nil {
+		t.Fatal(err)
+	}
+	tzKeyName := syscall.UTF16ToString(dtzi.TimeZoneKeyName[:])
+	timezoneK, err := registry.OpenKey(registry.LOCAL_MACHINE,
+		`SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\`+tzKeyName, registry.READ)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer timezoneK.Close()
+
+	type testType struct {
+		name string
+		want string
+	}
+	var tests = []testType{
+		{"MUI_Std", syscall.UTF16ToString(dtzi.StandardName[:])},
+	}
+	if dtzi.DynamicDaylightTimeDisabled == 0 {
+		tests = append(tests, testType{"MUI_Dlt", syscall.UTF16ToString(dtzi.DaylightName[:])})
+	}
+
+	for _, test := range tests {
+		got, err := timezoneK.GetMUIStringValue(test.name)
+		if err != nil {
+			t.Error("GetMUIStringValue:", err)
+		}
+
+		if got != test.want {
+			t.Errorf("GetMUIStringValue: %s: Got %q, want %q", test.name, got, test.want)
+		}
+	}
+}
+
+type DynamicTimezoneinformation struct {
+	Bias                        int32
+	StandardName                [32]uint16
+	StandardDate                syscall.Systemtime
+	StandardBias                int32
+	DaylightName                [32]uint16
+	DaylightDate                syscall.Systemtime
+	DaylightBias                int32
+	TimeZoneKeyName             [128]uint16
+	DynamicDaylightTimeDisabled uint8
+}
+
+var (
+	kernel32DLL = syscall.NewLazyDLL("kernel32")
+
+	procGetDynamicTimeZoneInformation = kernel32DLL.NewProc("GetDynamicTimeZoneInformation")
+)
+
+func GetDynamicTimeZoneInformation(dtzi *DynamicTimezoneinformation) (rc uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetDynamicTimeZoneInformation.Addr(), 1, uintptr(unsafe.Pointer(dtzi)), 0, 0)
+	rc = uint32(r0)
+	if rc == 0xffffffff {
+		if e1 != 0 {
+			err = error(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/windows/registry/syscall.go b/vendor/golang.org/x/sys/windows/registry/syscall.go
new file mode 100644
index 00000000..e66643cb
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/registry/syscall.go
@@ -0,0 +1,32 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package registry
+
+import "syscall"
+
+const (
+	_REG_OPTION_NON_VOLATILE = 0
+
+	_REG_CREATED_NEW_KEY     = 1
+	_REG_OPENED_EXISTING_KEY = 2
+
+	_ERROR_NO_MORE_ITEMS syscall.Errno = 259
+)
+
+func LoadRegLoadMUIString() error {
+	return procRegLoadMUIStringW.Find()
+}
+
+//sys	regCreateKeyEx(key syscall.Handle, subkey *uint16, reserved uint32, class *uint16, options uint32, desired uint32, sa *syscall.SecurityAttributes, result *syscall.Handle, disposition *uint32) (regerrno error) = advapi32.RegCreateKeyExW
+//sys	regDeleteKey(key syscall.Handle, subkey *uint16) (regerrno error) = advapi32.RegDeleteKeyW
+//sys	regSetValueEx(key syscall.Handle, valueName *uint16, reserved uint32, vtype uint32, buf *byte, bufsize uint32) (regerrno error) = advapi32.RegSetValueExW
+//sys	regEnumValue(key syscall.Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) = advapi32.RegEnumValueW
+//sys	regDeleteValue(key syscall.Handle, name *uint16) (regerrno error) = advapi32.RegDeleteValueW
+//sys   regLoadMUIString(key syscall.Handle, name *uint16, buf *uint16, buflen uint32, buflenCopied *uint32, flags uint32, dir *uint16) (regerrno error) = advapi32.RegLoadMUIStringW
+//sys	regConnectRegistry(machinename *uint16, key syscall.Handle, result *syscall.Handle) (regerrno error) = advapi32.RegConnectRegistryW
+
+//sys	expandEnvironmentStrings(src *uint16, dst *uint16, size uint32) (n uint32, err error) = kernel32.ExpandEnvironmentStringsW
diff --git a/vendor/golang.org/x/sys/windows/registry/value.go b/vendor/golang.org/x/sys/windows/registry/value.go
new file mode 100644
index 00000000..71d4e15b
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/registry/value.go
@@ -0,0 +1,384 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package registry
+
+import (
+	"errors"
+	"io"
+	"syscall"
+	"unicode/utf16"
+	"unsafe"
+)
+
+const (
+	// Registry value types.
+	NONE                       = 0
+	SZ                         = 1
+	EXPAND_SZ                  = 2
+	BINARY                     = 3
+	DWORD                      = 4
+	DWORD_BIG_ENDIAN           = 5
+	LINK                       = 6
+	MULTI_SZ                   = 7
+	RESOURCE_LIST              = 8
+	FULL_RESOURCE_DESCRIPTOR   = 9
+	RESOURCE_REQUIREMENTS_LIST = 10
+	QWORD                      = 11
+)
+
+var (
+	// ErrShortBuffer is returned when the buffer was too short for the operation.
+	ErrShortBuffer = syscall.ERROR_MORE_DATA
+
+	// ErrNotExist is returned when a registry key or value does not exist.
+	ErrNotExist = syscall.ERROR_FILE_NOT_FOUND
+
+	// ErrUnexpectedType is returned by Get*Value when the value's type was unexpected.
+	ErrUnexpectedType = errors.New("unexpected key value type")
+)
+
+// GetValue retrieves the type and data for the specified value associated
+// with an open key k. It fills up buffer buf and returns the retrieved
+// byte count n. If buf is too small to fit the stored value it returns
+// ErrShortBuffer error along with the required buffer size n.
+// If no buffer is provided, it returns true and actual buffer size n.
+// If no buffer is provided, GetValue returns the value's type only.
+// If the value does not exist, the error returned is ErrNotExist.
+//
+// GetValue is a low level function. If value's type is known, use the appropriate
+// Get*Value function instead.
+func (k Key) GetValue(name string, buf []byte) (n int, valtype uint32, err error) {
+	pname, err := syscall.UTF16PtrFromString(name)
+	if err != nil {
+		return 0, 0, err
+	}
+	var pbuf *byte
+	if len(buf) > 0 {
+		pbuf = (*byte)(unsafe.Pointer(&buf[0]))
+	}
+	l := uint32(len(buf))
+	err = syscall.RegQueryValueEx(syscall.Handle(k), pname, nil, &valtype, pbuf, &l)
+	if err != nil {
+		return int(l), valtype, err
+	}
+	return int(l), valtype, nil
+}
+
+func (k Key) getValue(name string, buf []byte) (date []byte, valtype uint32, err error) {
+	p, err := syscall.UTF16PtrFromString(name)
+	if err != nil {
+		return nil, 0, err
+	}
+	var t uint32
+	n := uint32(len(buf))
+	for {
+		err = syscall.RegQueryValueEx(syscall.Handle(k), p, nil, &t, (*byte)(unsafe.Pointer(&buf[0])), &n)
+		if err == nil {
+			return buf[:n], t, nil
+		}
+		if err != syscall.ERROR_MORE_DATA {
+			return nil, 0, err
+		}
+		if n <= uint32(len(buf)) {
+			return nil, 0, err
+		}
+		buf = make([]byte, n)
+	}
+}
+
+// GetStringValue retrieves the string value for the specified
+// value name associated with an open key k. It also returns the value's type.
+// If value does not exist, GetStringValue returns ErrNotExist.
+// If value is not SZ or EXPAND_SZ, it will return the correct value
+// type and ErrUnexpectedType.
+func (k Key) GetStringValue(name string) (val string, valtype uint32, err error) {
+	data, typ, err2 := k.getValue(name, make([]byte, 64))
+	if err2 != nil {
+		return "", typ, err2
+	}
+	switch typ {
+	case SZ, EXPAND_SZ:
+	default:
+		return "", typ, ErrUnexpectedType
+	}
+	if len(data) == 0 {
+		return "", typ, nil
+	}
+	u := (*[1 << 29]uint16)(unsafe.Pointer(&data[0]))[:]
+	return syscall.UTF16ToString(u), typ, nil
+}
+
+// GetMUIStringValue retrieves the localized string value for
+// the specified value name associated with an open key k.
+// If the value name doesn't exist or the localized string value
+// can't be resolved, GetMUIStringValue returns ErrNotExist.
+// GetMUIStringValue panics if the system doesn't support
+// regLoadMUIString; use LoadRegLoadMUIString to check if
+// regLoadMUIString is supported before calling this function.
+func (k Key) GetMUIStringValue(name string) (string, error) {
+	pname, err := syscall.UTF16PtrFromString(name)
+	if err != nil {
+		return "", err
+	}
+
+	buf := make([]uint16, 1024)
+	var buflen uint32
+	var pdir *uint16
+
+	err = regLoadMUIString(syscall.Handle(k), pname, &buf[0], uint32(len(buf)), &buflen, 0, pdir)
+	if err == syscall.ERROR_FILE_NOT_FOUND { // Try fallback path
+
+		// Try to resolve the string value using the system directory as
+		// a DLL search path; this assumes the string value is of the form
+		// @[path]\dllname,-strID but with no path given, e.g. @tzres.dll,-320.
+
+		// This approach works with tzres.dll but may have to be revised
+		// in the future to allow callers to provide custom search paths.
+
+		var s string
+		s, err = ExpandString("%SystemRoot%\\system32\\")
+		if err != nil {
+			return "", err
+		}
+		pdir, err = syscall.UTF16PtrFromString(s)
+		if err != nil {
+			return "", err
+		}
+
+		err = regLoadMUIString(syscall.Handle(k), pname, &buf[0], uint32(len(buf)), &buflen, 0, pdir)
+	}
+
+	for err == syscall.ERROR_MORE_DATA { // Grow buffer if needed
+		if buflen <= uint32(len(buf)) {
+			break // Buffer not growing, assume race; break
+		}
+		buf = make([]uint16, buflen)
+		err = regLoadMUIString(syscall.Handle(k), pname, &buf[0], uint32(len(buf)), &buflen, 0, pdir)
+	}
+
+	if err != nil {
+		return "", err
+	}
+
+	return syscall.UTF16ToString(buf), nil
+}
+
+// ExpandString expands environment-variable strings and replaces
+// them with the values defined for the current user.
+// Use ExpandString to expand EXPAND_SZ strings.
+func ExpandString(value string) (string, error) {
+	if value == "" {
+		return "", nil
+	}
+	p, err := syscall.UTF16PtrFromString(value)
+	if err != nil {
+		return "", err
+	}
+	r := make([]uint16, 100)
+	for {
+		n, err := expandEnvironmentStrings(p, &r[0], uint32(len(r)))
+		if err != nil {
+			return "", err
+		}
+		if n <= uint32(len(r)) {
+			u := (*[1 << 29]uint16)(unsafe.Pointer(&r[0]))[:]
+			return syscall.UTF16ToString(u), nil
+		}
+		r = make([]uint16, n)
+	}
+}
+
+// GetStringsValue retrieves the []string value for the specified
+// value name associated with an open key k. It also returns the value's type.
+// If value does not exist, GetStringsValue returns ErrNotExist.
+// If value is not MULTI_SZ, it will return the correct value
+// type and ErrUnexpectedType.
+func (k Key) GetStringsValue(name string) (val []string, valtype uint32, err error) {
+	data, typ, err2 := k.getValue(name, make([]byte, 64))
+	if err2 != nil {
+		return nil, typ, err2
+	}
+	if typ != MULTI_SZ {
+		return nil, typ, ErrUnexpectedType
+	}
+	if len(data) == 0 {
+		return nil, typ, nil
+	}
+	p := (*[1 << 29]uint16)(unsafe.Pointer(&data[0]))[:len(data)/2]
+	if len(p) == 0 {
+		return nil, typ, nil
+	}
+	if p[len(p)-1] == 0 {
+		p = p[:len(p)-1] // remove terminating null
+	}
+	val = make([]string, 0, 5)
+	from := 0
+	for i, c := range p {
+		if c == 0 {
+			val = append(val, string(utf16.Decode(p[from:i])))
+			from = i + 1
+		}
+	}
+	return val, typ, nil
+}
+
+// GetIntegerValue retrieves the integer value for the specified
+// value name associated with an open key k. It also returns the value's type.
+// If value does not exist, GetIntegerValue returns ErrNotExist.
+// If value is not DWORD or QWORD, it will return the correct value
+// type and ErrUnexpectedType.
+func (k Key) GetIntegerValue(name string) (val uint64, valtype uint32, err error) {
+	data, typ, err2 := k.getValue(name, make([]byte, 8))
+	if err2 != nil {
+		return 0, typ, err2
+	}
+	switch typ {
+	case DWORD:
+		if len(data) != 4 {
+			return 0, typ, errors.New("DWORD value is not 4 bytes long")
+		}
+		return uint64(*(*uint32)(unsafe.Pointer(&data[0]))), DWORD, nil
+	case QWORD:
+		if len(data) != 8 {
+			return 0, typ, errors.New("QWORD value is not 8 bytes long")
+		}
+		return uint64(*(*uint64)(unsafe.Pointer(&data[0]))), QWORD, nil
+	default:
+		return 0, typ, ErrUnexpectedType
+	}
+}
+
+// GetBinaryValue retrieves the binary value for the specified
+// value name associated with an open key k. It also returns the value's type.
+// If value does not exist, GetBinaryValue returns ErrNotExist.
+// If value is not BINARY, it will return the correct value
+// type and ErrUnexpectedType.
+func (k Key) GetBinaryValue(name string) (val []byte, valtype uint32, err error) {
+	data, typ, err2 := k.getValue(name, make([]byte, 64))
+	if err2 != nil {
+		return nil, typ, err2
+	}
+	if typ != BINARY {
+		return nil, typ, ErrUnexpectedType
+	}
+	return data, typ, nil
+}
+
+func (k Key) setValue(name string, valtype uint32, data []byte) error {
+	p, err := syscall.UTF16PtrFromString(name)
+	if err != nil {
+		return err
+	}
+	if len(data) == 0 {
+		return regSetValueEx(syscall.Handle(k), p, 0, valtype, nil, 0)
+	}
+	return regSetValueEx(syscall.Handle(k), p, 0, valtype, &data[0], uint32(len(data)))
+}
+
+// SetDWordValue sets the data and type of a name value
+// under key k to value and DWORD.
+func (k Key) SetDWordValue(name string, value uint32) error {
+	return k.setValue(name, DWORD, (*[4]byte)(unsafe.Pointer(&value))[:])
+}
+
+// SetQWordValue sets the data and type of a name value
+// under key k to value and QWORD.
+func (k Key) SetQWordValue(name string, value uint64) error {
+	return k.setValue(name, QWORD, (*[8]byte)(unsafe.Pointer(&value))[:])
+}
+
+func (k Key) setStringValue(name string, valtype uint32, value string) error {
+	v, err := syscall.UTF16FromString(value)
+	if err != nil {
+		return err
+	}
+	buf := (*[1 << 29]byte)(unsafe.Pointer(&v[0]))[:len(v)*2]
+	return k.setValue(name, valtype, buf)
+}
+
+// SetStringValue sets the data and type of a name value
+// under key k to value and SZ. The value must not contain a zero byte.
+func (k Key) SetStringValue(name, value string) error {
+	return k.setStringValue(name, SZ, value)
+}
+
+// SetExpandStringValue sets the data and type of a name value
+// under key k to value and EXPAND_SZ. The value must not contain a zero byte.
+func (k Key) SetExpandStringValue(name, value string) error {
+	return k.setStringValue(name, EXPAND_SZ, value)
+}
+
+// SetStringsValue sets the data and type of a name value
+// under key k to value and MULTI_SZ. The value strings
+// must not contain a zero byte.
+func (k Key) SetStringsValue(name string, value []string) error {
+	ss := ""
+	for _, s := range value {
+		for i := 0; i < len(s); i++ {
+			if s[i] == 0 {
+				return errors.New("string cannot have 0 inside")
+			}
+		}
+		ss += s + "\x00"
+	}
+	v := utf16.Encode([]rune(ss + "\x00"))
+	buf := (*[1 << 29]byte)(unsafe.Pointer(&v[0]))[:len(v)*2]
+	return k.setValue(name, MULTI_SZ, buf)
+}
+
+// SetBinaryValue sets the data and type of a name value
+// under key k to value and BINARY.
+func (k Key) SetBinaryValue(name string, value []byte) error {
+	return k.setValue(name, BINARY, value)
+}
+
+// DeleteValue removes a named value from the key k.
+func (k Key) DeleteValue(name string) error {
+	return regDeleteValue(syscall.Handle(k), syscall.StringToUTF16Ptr(name))
+}
+
+// ReadValueNames returns the value names of key k.
+// The parameter n controls the number of returned names,
+// analogous to the way os.File.Readdirnames works.
+func (k Key) ReadValueNames(n int) ([]string, error) {
+	ki, err := k.Stat()
+	if err != nil {
+		return nil, err
+	}
+	names := make([]string, 0, ki.ValueCount)
+	buf := make([]uint16, ki.MaxValueNameLen+1) // extra room for terminating null character
+loopItems:
+	for i := uint32(0); ; i++ {
+		if n > 0 {
+			if len(names) == n {
+				return names, nil
+			}
+		}
+		l := uint32(len(buf))
+		for {
+			err := regEnumValue(syscall.Handle(k), i, &buf[0], &l, nil, nil, nil, nil)
+			if err == nil {
+				break
+			}
+			if err == syscall.ERROR_MORE_DATA {
+				// Double buffer size and try again.
+				l = uint32(2 * len(buf))
+				buf = make([]uint16, l)
+				continue
+			}
+			if err == _ERROR_NO_MORE_ITEMS {
+				break loopItems
+			}
+			return names, err
+		}
+		names = append(names, syscall.UTF16ToString(buf[:l]))
+	}
+	if n > len(names) {
+		return names, io.EOF
+	}
+	return names, nil
+}
diff --git a/vendor/golang.org/x/sys/windows/registry/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/registry/zsyscall_windows.go
new file mode 100644
index 00000000..3778075d
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/registry/zsyscall_windows.go
@@ -0,0 +1,120 @@
+// Code generated by 'go generate'; DO NOT EDIT.
+
+package registry
+
+import (
+	"syscall"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+var _ unsafe.Pointer
+
+// Do the interface allocations only once for common
+// Errno values.
+const (
+	errnoERROR_IO_PENDING = 997
+)
+
+var (
+	errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING)
+)
+
+// errnoErr returns common boxed Errno values, to prevent
+// allocations at runtime.
+func errnoErr(e syscall.Errno) error {
+	switch e {
+	case 0:
+		return nil
+	case errnoERROR_IO_PENDING:
+		return errERROR_IO_PENDING
+	}
+	// TODO: add more here, after collecting data on the common
+	// error values see on Windows. (perhaps when running
+	// all.bat?)
+	return e
+}
+
+var (
+	modadvapi32 = windows.NewLazySystemDLL("advapi32.dll")
+	modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
+
+	procRegCreateKeyExW           = modadvapi32.NewProc("RegCreateKeyExW")
+	procRegDeleteKeyW             = modadvapi32.NewProc("RegDeleteKeyW")
+	procRegSetValueExW            = modadvapi32.NewProc("RegSetValueExW")
+	procRegEnumValueW             = modadvapi32.NewProc("RegEnumValueW")
+	procRegDeleteValueW           = modadvapi32.NewProc("RegDeleteValueW")
+	procRegLoadMUIStringW         = modadvapi32.NewProc("RegLoadMUIStringW")
+	procRegConnectRegistryW       = modadvapi32.NewProc("RegConnectRegistryW")
+	procExpandEnvironmentStringsW = modkernel32.NewProc("ExpandEnvironmentStringsW")
+)
+
+func regCreateKeyEx(key syscall.Handle, subkey *uint16, reserved uint32, class *uint16, options uint32, desired uint32, sa *syscall.SecurityAttributes, result *syscall.Handle, disposition *uint32) (regerrno error) {
+	r0, _, _ := syscall.Syscall9(procRegCreateKeyExW.Addr(), 9, uintptr(key), uintptr(unsafe.Pointer(subkey)), uintptr(reserved), uintptr(unsafe.Pointer(class)), uintptr(options), uintptr(desired), uintptr(unsafe.Pointer(sa)), uintptr(unsafe.Pointer(result)), uintptr(unsafe.Pointer(disposition)))
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func regDeleteKey(key syscall.Handle, subkey *uint16) (regerrno error) {
+	r0, _, _ := syscall.Syscall(procRegDeleteKeyW.Addr(), 2, uintptr(key), uintptr(unsafe.Pointer(subkey)), 0)
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func regSetValueEx(key syscall.Handle, valueName *uint16, reserved uint32, vtype uint32, buf *byte, bufsize uint32) (regerrno error) {
+	r0, _, _ := syscall.Syscall6(procRegSetValueExW.Addr(), 6, uintptr(key), uintptr(unsafe.Pointer(valueName)), uintptr(reserved), uintptr(vtype), uintptr(unsafe.Pointer(buf)), uintptr(bufsize))
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func regEnumValue(key syscall.Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) {
+	r0, _, _ := syscall.Syscall9(procRegEnumValueW.Addr(), 8, uintptr(key), uintptr(index), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(valtype)), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(buflen)), 0)
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func regDeleteValue(key syscall.Handle, name *uint16) (regerrno error) {
+	r0, _, _ := syscall.Syscall(procRegDeleteValueW.Addr(), 2, uintptr(key), uintptr(unsafe.Pointer(name)), 0)
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func regLoadMUIString(key syscall.Handle, name *uint16, buf *uint16, buflen uint32, buflenCopied *uint32, flags uint32, dir *uint16) (regerrno error) {
+	r0, _, _ := syscall.Syscall9(procRegLoadMUIStringW.Addr(), 7, uintptr(key), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(buf)), uintptr(buflen), uintptr(unsafe.Pointer(buflenCopied)), uintptr(flags), uintptr(unsafe.Pointer(dir)), 0, 0)
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func regConnectRegistry(machinename *uint16, key syscall.Handle, result *syscall.Handle) (regerrno error) {
+	r0, _, _ := syscall.Syscall(procRegConnectRegistryW.Addr(), 3, uintptr(unsafe.Pointer(machinename)), uintptr(key), uintptr(unsafe.Pointer(result)))
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func expandEnvironmentStrings(src *uint16, dst *uint16, size uint32) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procExpandEnvironmentStringsW.Addr(), 3, uintptr(unsafe.Pointer(src)), uintptr(unsafe.Pointer(dst)), uintptr(size))
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go
new file mode 100644
index 00000000..4f17a333
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/security_windows.go
@@ -0,0 +1,478 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+const (
+	STANDARD_RIGHTS_REQUIRED = 0xf0000
+	STANDARD_RIGHTS_READ     = 0x20000
+	STANDARD_RIGHTS_WRITE    = 0x20000
+	STANDARD_RIGHTS_EXECUTE  = 0x20000
+	STANDARD_RIGHTS_ALL      = 0x1F0000
+)
+
+const (
+	NameUnknown          = 0
+	NameFullyQualifiedDN = 1
+	NameSamCompatible    = 2
+	NameDisplay          = 3
+	NameUniqueId         = 6
+	NameCanonical        = 7
+	NameUserPrincipal    = 8
+	NameCanonicalEx      = 9
+	NameServicePrincipal = 10
+	NameDnsDomain        = 12
+)
+
+// This function returns 1 byte BOOLEAN rather than the 4 byte BOOL.
+// http://blogs.msdn.com/b/drnick/archive/2007/12/19/windows-and-upn-format-credentials.aspx
+//sys	TranslateName(accName *uint16, accNameFormat uint32, desiredNameFormat uint32, translatedName *uint16, nSize *uint32) (err error) [failretval&0xff==0] = secur32.TranslateNameW
+//sys	GetUserNameEx(nameFormat uint32, nameBuffre *uint16, nSize *uint32) (err error) [failretval&0xff==0] = secur32.GetUserNameExW
+
+// TranslateAccountName converts a directory service
+// object name from one format to another.
+func TranslateAccountName(username string, from, to uint32, initSize int) (string, error) {
+	u, e := UTF16PtrFromString(username)
+	if e != nil {
+		return "", e
+	}
+	n := uint32(50)
+	for {
+		b := make([]uint16, n)
+		e = TranslateName(u, from, to, &b[0], &n)
+		if e == nil {
+			return UTF16ToString(b[:n]), nil
+		}
+		if e != ERROR_INSUFFICIENT_BUFFER {
+			return "", e
+		}
+		if n <= uint32(len(b)) {
+			return "", e
+		}
+	}
+}
+
+const (
+	// do not reorder
+	NetSetupUnknownStatus = iota
+	NetSetupUnjoined
+	NetSetupWorkgroupName
+	NetSetupDomainName
+)
+
+type UserInfo10 struct {
+	Name       *uint16
+	Comment    *uint16
+	UsrComment *uint16
+	FullName   *uint16
+}
+
+//sys	NetUserGetInfo(serverName *uint16, userName *uint16, level uint32, buf **byte) (neterr error) = netapi32.NetUserGetInfo
+//sys	NetGetJoinInformation(server *uint16, name **uint16, bufType *uint32) (neterr error) = netapi32.NetGetJoinInformation
+//sys	NetApiBufferFree(buf *byte) (neterr error) = netapi32.NetApiBufferFree
+
+const (
+	// do not reorder
+	SidTypeUser = 1 + iota
+	SidTypeGroup
+	SidTypeDomain
+	SidTypeAlias
+	SidTypeWellKnownGroup
+	SidTypeDeletedAccount
+	SidTypeInvalid
+	SidTypeUnknown
+	SidTypeComputer
+	SidTypeLabel
+)
+
+type SidIdentifierAuthority struct {
+	Value [6]byte
+}
+
+var (
+	SECURITY_NULL_SID_AUTHORITY        = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 0}}
+	SECURITY_WORLD_SID_AUTHORITY       = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 1}}
+	SECURITY_LOCAL_SID_AUTHORITY       = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 2}}
+	SECURITY_CREATOR_SID_AUTHORITY     = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 3}}
+	SECURITY_NON_UNIQUE_AUTHORITY      = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 4}}
+	SECURITY_NT_AUTHORITY              = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 5}}
+	SECURITY_MANDATORY_LABEL_AUTHORITY = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 16}}
+)
+
+const (
+	SECURITY_NULL_RID                   = 0
+	SECURITY_WORLD_RID                  = 0
+	SECURITY_LOCAL_RID                  = 0
+	SECURITY_CREATOR_OWNER_RID          = 0
+	SECURITY_CREATOR_GROUP_RID          = 1
+	SECURITY_DIALUP_RID                 = 1
+	SECURITY_NETWORK_RID                = 2
+	SECURITY_BATCH_RID                  = 3
+	SECURITY_INTERACTIVE_RID            = 4
+	SECURITY_LOGON_IDS_RID              = 5
+	SECURITY_SERVICE_RID                = 6
+	SECURITY_LOCAL_SYSTEM_RID           = 18
+	SECURITY_BUILTIN_DOMAIN_RID         = 32
+	SECURITY_PRINCIPAL_SELF_RID         = 10
+	SECURITY_CREATOR_OWNER_SERVER_RID   = 0x2
+	SECURITY_CREATOR_GROUP_SERVER_RID   = 0x3
+	SECURITY_LOGON_IDS_RID_COUNT        = 0x3
+	SECURITY_ANONYMOUS_LOGON_RID        = 0x7
+	SECURITY_PROXY_RID                  = 0x8
+	SECURITY_ENTERPRISE_CONTROLLERS_RID = 0x9
+	SECURITY_SERVER_LOGON_RID           = SECURITY_ENTERPRISE_CONTROLLERS_RID
+	SECURITY_AUTHENTICATED_USER_RID     = 0xb
+	SECURITY_RESTRICTED_CODE_RID        = 0xc
+	SECURITY_NT_NON_UNIQUE_RID          = 0x15
+)
+
+// Predefined domain-relative RIDs for local groups.
+// See https://msdn.microsoft.com/en-us/library/windows/desktop/aa379649(v=vs.85).aspx
+const (
+	DOMAIN_ALIAS_RID_ADMINS                         = 0x220
+	DOMAIN_ALIAS_RID_USERS                          = 0x221
+	DOMAIN_ALIAS_RID_GUESTS                         = 0x222
+	DOMAIN_ALIAS_RID_POWER_USERS                    = 0x223
+	DOMAIN_ALIAS_RID_ACCOUNT_OPS                    = 0x224
+	DOMAIN_ALIAS_RID_SYSTEM_OPS                     = 0x225
+	DOMAIN_ALIAS_RID_PRINT_OPS                      = 0x226
+	DOMAIN_ALIAS_RID_BACKUP_OPS                     = 0x227
+	DOMAIN_ALIAS_RID_REPLICATOR                     = 0x228
+	DOMAIN_ALIAS_RID_RAS_SERVERS                    = 0x229
+	DOMAIN_ALIAS_RID_PREW2KCOMPACCESS               = 0x22a
+	DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS           = 0x22b
+	DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS      = 0x22c
+	DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS = 0x22d
+	DOMAIN_ALIAS_RID_MONITORING_USERS               = 0X22e
+	DOMAIN_ALIAS_RID_LOGGING_USERS                  = 0x22f
+	DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS            = 0x230
+	DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS             = 0x231
+	DOMAIN_ALIAS_RID_DCOM_USERS                     = 0x232
+	DOMAIN_ALIAS_RID_IUSERS                         = 0x238
+	DOMAIN_ALIAS_RID_CRYPTO_OPERATORS               = 0x239
+	DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP     = 0x23b
+	DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP = 0x23c
+	DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP        = 0x23d
+	DOMAIN_ALIAS_RID_CERTSVC_DCOM_ACCESS_GROUP      = 0x23e
+)
+
+//sys	LookupAccountSid(systemName *uint16, sid *SID, name *uint16, nameLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) = advapi32.LookupAccountSidW
+//sys	LookupAccountName(systemName *uint16, accountName *uint16, sid *SID, sidLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) = advapi32.LookupAccountNameW
+//sys	ConvertSidToStringSid(sid *SID, stringSid **uint16) (err error) = advapi32.ConvertSidToStringSidW
+//sys	ConvertStringSidToSid(stringSid *uint16, sid **SID) (err error) = advapi32.ConvertStringSidToSidW
+//sys	GetLengthSid(sid *SID) (len uint32) = advapi32.GetLengthSid
+//sys	CopySid(destSidLen uint32, destSid *SID, srcSid *SID) (err error) = advapi32.CopySid
+//sys	AllocateAndInitializeSid(identAuth *SidIdentifierAuthority, subAuth byte, subAuth0 uint32, subAuth1 uint32, subAuth2 uint32, subAuth3 uint32, subAuth4 uint32, subAuth5 uint32, subAuth6 uint32, subAuth7 uint32, sid **SID) (err error) = advapi32.AllocateAndInitializeSid
+//sys	FreeSid(sid *SID) (err error) [failretval!=0] = advapi32.FreeSid
+//sys	EqualSid(sid1 *SID, sid2 *SID) (isEqual bool) = advapi32.EqualSid
+
+// The security identifier (SID) structure is a variable-length
+// structure used to uniquely identify users or groups.
+type SID struct{}
+
+// StringToSid converts a string-format security identifier
+// sid into a valid, functional sid.
+func StringToSid(s string) (*SID, error) {
+	var sid *SID
+	p, e := UTF16PtrFromString(s)
+	if e != nil {
+		return nil, e
+	}
+	e = ConvertStringSidToSid(p, &sid)
+	if e != nil {
+		return nil, e
+	}
+	defer LocalFree((Handle)(unsafe.Pointer(sid)))
+	return sid.Copy()
+}
+
+// LookupSID retrieves a security identifier sid for the account
+// and the name of the domain on which the account was found.
+// System specify target computer to search.
+func LookupSID(system, account string) (sid *SID, domain string, accType uint32, err error) {
+	if len(account) == 0 {
+		return nil, "", 0, syscall.EINVAL
+	}
+	acc, e := UTF16PtrFromString(account)
+	if e != nil {
+		return nil, "", 0, e
+	}
+	var sys *uint16
+	if len(system) > 0 {
+		sys, e = UTF16PtrFromString(system)
+		if e != nil {
+			return nil, "", 0, e
+		}
+	}
+	n := uint32(50)
+	dn := uint32(50)
+	for {
+		b := make([]byte, n)
+		db := make([]uint16, dn)
+		sid = (*SID)(unsafe.Pointer(&b[0]))
+		e = LookupAccountName(sys, acc, sid, &n, &db[0], &dn, &accType)
+		if e == nil {
+			return sid, UTF16ToString(db), accType, nil
+		}
+		if e != ERROR_INSUFFICIENT_BUFFER {
+			return nil, "", 0, e
+		}
+		if n <= uint32(len(b)) {
+			return nil, "", 0, e
+		}
+	}
+}
+
+// String converts sid to a string format
+// suitable for display, storage, or transmission.
+func (sid *SID) String() (string, error) {
+	var s *uint16
+	e := ConvertSidToStringSid(sid, &s)
+	if e != nil {
+		return "", e
+	}
+	defer LocalFree((Handle)(unsafe.Pointer(s)))
+	return UTF16ToString((*[256]uint16)(unsafe.Pointer(s))[:]), nil
+}
+
+// Len returns the length, in bytes, of a valid security identifier sid.
+func (sid *SID) Len() int {
+	return int(GetLengthSid(sid))
+}
+
+// Copy creates a duplicate of security identifier sid.
+func (sid *SID) Copy() (*SID, error) {
+	b := make([]byte, sid.Len())
+	sid2 := (*SID)(unsafe.Pointer(&b[0]))
+	e := CopySid(uint32(len(b)), sid2, sid)
+	if e != nil {
+		return nil, e
+	}
+	return sid2, nil
+}
+
+// LookupAccount retrieves the name of the account for this sid
+// and the name of the first domain on which this sid is found.
+// System specify target computer to search for.
+func (sid *SID) LookupAccount(system string) (account, domain string, accType uint32, err error) {
+	var sys *uint16
+	if len(system) > 0 {
+		sys, err = UTF16PtrFromString(system)
+		if err != nil {
+			return "", "", 0, err
+		}
+	}
+	n := uint32(50)
+	dn := uint32(50)
+	for {
+		b := make([]uint16, n)
+		db := make([]uint16, dn)
+		e := LookupAccountSid(sys, sid, &b[0], &n, &db[0], &dn, &accType)
+		if e == nil {
+			return UTF16ToString(b), UTF16ToString(db), accType, nil
+		}
+		if e != ERROR_INSUFFICIENT_BUFFER {
+			return "", "", 0, e
+		}
+		if n <= uint32(len(b)) {
+			return "", "", 0, e
+		}
+	}
+}
+
+const (
+	// do not reorder
+	TOKEN_ASSIGN_PRIMARY = 1 << iota
+	TOKEN_DUPLICATE
+	TOKEN_IMPERSONATE
+	TOKEN_QUERY
+	TOKEN_QUERY_SOURCE
+	TOKEN_ADJUST_PRIVILEGES
+	TOKEN_ADJUST_GROUPS
+	TOKEN_ADJUST_DEFAULT
+	TOKEN_ADJUST_SESSIONID
+
+	TOKEN_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED |
+		TOKEN_ASSIGN_PRIMARY |
+		TOKEN_DUPLICATE |
+		TOKEN_IMPERSONATE |
+		TOKEN_QUERY |
+		TOKEN_QUERY_SOURCE |
+		TOKEN_ADJUST_PRIVILEGES |
+		TOKEN_ADJUST_GROUPS |
+		TOKEN_ADJUST_DEFAULT |
+		TOKEN_ADJUST_SESSIONID
+	TOKEN_READ  = STANDARD_RIGHTS_READ | TOKEN_QUERY
+	TOKEN_WRITE = STANDARD_RIGHTS_WRITE |
+		TOKEN_ADJUST_PRIVILEGES |
+		TOKEN_ADJUST_GROUPS |
+		TOKEN_ADJUST_DEFAULT
+	TOKEN_EXECUTE = STANDARD_RIGHTS_EXECUTE
+)
+
+const (
+	// do not reorder
+	TokenUser = 1 + iota
+	TokenGroups
+	TokenPrivileges
+	TokenOwner
+	TokenPrimaryGroup
+	TokenDefaultDacl
+	TokenSource
+	TokenType
+	TokenImpersonationLevel
+	TokenStatistics
+	TokenRestrictedSids
+	TokenSessionId
+	TokenGroupsAndPrivileges
+	TokenSessionReference
+	TokenSandBoxInert
+	TokenAuditPolicy
+	TokenOrigin
+	TokenElevationType
+	TokenLinkedToken
+	TokenElevation
+	TokenHasRestrictions
+	TokenAccessInformation
+	TokenVirtualizationAllowed
+	TokenVirtualizationEnabled
+	TokenIntegrityLevel
+	TokenUIAccess
+	TokenMandatoryPolicy
+	TokenLogonSid
+	MaxTokenInfoClass
+)
+
+type SIDAndAttributes struct {
+	Sid        *SID
+	Attributes uint32
+}
+
+type Tokenuser struct {
+	User SIDAndAttributes
+}
+
+type Tokenprimarygroup struct {
+	PrimaryGroup *SID
+}
+
+type Tokengroups struct {
+	GroupCount uint32
+	Groups     [1]SIDAndAttributes
+}
+
+// Authorization Functions
+//sys checkTokenMembership(tokenHandle Token, sidToCheck *SID, isMember *int32) (err error) = advapi32.CheckTokenMembership
+//sys	OpenProcessToken(h Handle, access uint32, token *Token) (err error) = advapi32.OpenProcessToken
+//sys	GetTokenInformation(t Token, infoClass uint32, info *byte, infoLen uint32, returnedLen *uint32) (err error) = advapi32.GetTokenInformation
+//sys	GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) = userenv.GetUserProfileDirectoryW
+
+// An access token contains the security information for a logon session.
+// The system creates an access token when a user logs on, and every
+// process executed on behalf of the user has a copy of the token.
+// The token identifies the user, the user's groups, and the user's
+// privileges. The system uses the token to control access to securable
+// objects and to control the ability of the user to perform various
+// system-related operations on the local computer.
+type Token Handle
+
+// OpenCurrentProcessToken opens the access token
+// associated with current process.
+func OpenCurrentProcessToken() (Token, error) {
+	p, e := GetCurrentProcess()
+	if e != nil {
+		return 0, e
+	}
+	var t Token
+	e = OpenProcessToken(p, TOKEN_QUERY, &t)
+	if e != nil {
+		return 0, e
+	}
+	return t, nil
+}
+
+// Close releases access to access token.
+func (t Token) Close() error {
+	return CloseHandle(Handle(t))
+}
+
+// getInfo retrieves a specified type of information about an access token.
+func (t Token) getInfo(class uint32, initSize int) (unsafe.Pointer, error) {
+	n := uint32(initSize)
+	for {
+		b := make([]byte, n)
+		e := GetTokenInformation(t, class, &b[0], uint32(len(b)), &n)
+		if e == nil {
+			return unsafe.Pointer(&b[0]), nil
+		}
+		if e != ERROR_INSUFFICIENT_BUFFER {
+			return nil, e
+		}
+		if n <= uint32(len(b)) {
+			return nil, e
+		}
+	}
+}
+
+// GetTokenUser retrieves access token t user account information.
+func (t Token) GetTokenUser() (*Tokenuser, error) {
+	i, e := t.getInfo(TokenUser, 50)
+	if e != nil {
+		return nil, e
+	}
+	return (*Tokenuser)(i), nil
+}
+
+// GetTokenGroups retrieves group accounts associated with access token t.
+func (t Token) GetTokenGroups() (*Tokengroups, error) {
+	i, e := t.getInfo(TokenGroups, 50)
+	if e != nil {
+		return nil, e
+	}
+	return (*Tokengroups)(i), nil
+}
+
+// GetTokenPrimaryGroup retrieves access token t primary group information.
+// A pointer to a SID structure representing a group that will become
+// the primary group of any objects created by a process using this access token.
+func (t Token) GetTokenPrimaryGroup() (*Tokenprimarygroup, error) {
+	i, e := t.getInfo(TokenPrimaryGroup, 50)
+	if e != nil {
+		return nil, e
+	}
+	return (*Tokenprimarygroup)(i), nil
+}
+
+// GetUserProfileDirectory retrieves path to the
+// root directory of the access token t user's profile.
+func (t Token) GetUserProfileDirectory() (string, error) {
+	n := uint32(100)
+	for {
+		b := make([]uint16, n)
+		e := GetUserProfileDirectory(t, &b[0], &n)
+		if e == nil {
+			return UTF16ToString(b), nil
+		}
+		if e != ERROR_INSUFFICIENT_BUFFER {
+			return "", e
+		}
+		if n <= uint32(len(b)) {
+			return "", e
+		}
+	}
+}
+
+// IsMember reports whether the access token t is a member of the provided SID.
+func (t Token) IsMember(sid *SID) (bool, error) {
+	var b int32
+	if e := checkTokenMembership(t, sid, &b); e != nil {
+		return false, e
+	}
+	return b != 0, nil
+}
diff --git a/vendor/golang.org/x/sys/windows/service.go b/vendor/golang.org/x/sys/windows/service.go
new file mode 100644
index 00000000..62fc31b4
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/service.go
@@ -0,0 +1,183 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package windows
+
+const (
+	SC_MANAGER_CONNECT            = 1
+	SC_MANAGER_CREATE_SERVICE     = 2
+	SC_MANAGER_ENUMERATE_SERVICE  = 4
+	SC_MANAGER_LOCK               = 8
+	SC_MANAGER_QUERY_LOCK_STATUS  = 16
+	SC_MANAGER_MODIFY_BOOT_CONFIG = 32
+	SC_MANAGER_ALL_ACCESS         = 0xf003f
+)
+
+//sys	OpenSCManager(machineName *uint16, databaseName *uint16, access uint32) (handle Handle, err error) [failretval==0] = advapi32.OpenSCManagerW
+
+const (
+	SERVICE_KERNEL_DRIVER       = 1
+	SERVICE_FILE_SYSTEM_DRIVER  = 2
+	SERVICE_ADAPTER             = 4
+	SERVICE_RECOGNIZER_DRIVER   = 8
+	SERVICE_WIN32_OWN_PROCESS   = 16
+	SERVICE_WIN32_SHARE_PROCESS = 32
+	SERVICE_WIN32               = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS
+	SERVICE_INTERACTIVE_PROCESS = 256
+	SERVICE_DRIVER              = SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_RECOGNIZER_DRIVER
+	SERVICE_TYPE_ALL            = SERVICE_WIN32 | SERVICE_ADAPTER | SERVICE_DRIVER | SERVICE_INTERACTIVE_PROCESS
+
+	SERVICE_BOOT_START   = 0
+	SERVICE_SYSTEM_START = 1
+	SERVICE_AUTO_START   = 2
+	SERVICE_DEMAND_START = 3
+	SERVICE_DISABLED     = 4
+
+	SERVICE_ERROR_IGNORE   = 0
+	SERVICE_ERROR_NORMAL   = 1
+	SERVICE_ERROR_SEVERE   = 2
+	SERVICE_ERROR_CRITICAL = 3
+
+	SC_STATUS_PROCESS_INFO = 0
+
+	SC_ACTION_NONE        = 0
+	SC_ACTION_RESTART     = 1
+	SC_ACTION_REBOOT      = 2
+	SC_ACTION_RUN_COMMAND = 3
+
+	SERVICE_STOPPED          = 1
+	SERVICE_START_PENDING    = 2
+	SERVICE_STOP_PENDING     = 3
+	SERVICE_RUNNING          = 4
+	SERVICE_CONTINUE_PENDING = 5
+	SERVICE_PAUSE_PENDING    = 6
+	SERVICE_PAUSED           = 7
+	SERVICE_NO_CHANGE        = 0xffffffff
+
+	SERVICE_ACCEPT_STOP                  = 1
+	SERVICE_ACCEPT_PAUSE_CONTINUE        = 2
+	SERVICE_ACCEPT_SHUTDOWN              = 4
+	SERVICE_ACCEPT_PARAMCHANGE           = 8
+	SERVICE_ACCEPT_NETBINDCHANGE         = 16
+	SERVICE_ACCEPT_HARDWAREPROFILECHANGE = 32
+	SERVICE_ACCEPT_POWEREVENT            = 64
+	SERVICE_ACCEPT_SESSIONCHANGE         = 128
+
+	SERVICE_CONTROL_STOP                  = 1
+	SERVICE_CONTROL_PAUSE                 = 2
+	SERVICE_CONTROL_CONTINUE              = 3
+	SERVICE_CONTROL_INTERROGATE           = 4
+	SERVICE_CONTROL_SHUTDOWN              = 5
+	SERVICE_CONTROL_PARAMCHANGE           = 6
+	SERVICE_CONTROL_NETBINDADD            = 7
+	SERVICE_CONTROL_NETBINDREMOVE         = 8
+	SERVICE_CONTROL_NETBINDENABLE         = 9
+	SERVICE_CONTROL_NETBINDDISABLE        = 10
+	SERVICE_CONTROL_DEVICEEVENT           = 11
+	SERVICE_CONTROL_HARDWAREPROFILECHANGE = 12
+	SERVICE_CONTROL_POWEREVENT            = 13
+	SERVICE_CONTROL_SESSIONCHANGE         = 14
+
+	SERVICE_ACTIVE    = 1
+	SERVICE_INACTIVE  = 2
+	SERVICE_STATE_ALL = 3
+
+	SERVICE_QUERY_CONFIG           = 1
+	SERVICE_CHANGE_CONFIG          = 2
+	SERVICE_QUERY_STATUS           = 4
+	SERVICE_ENUMERATE_DEPENDENTS   = 8
+	SERVICE_START                  = 16
+	SERVICE_STOP                   = 32
+	SERVICE_PAUSE_CONTINUE         = 64
+	SERVICE_INTERROGATE            = 128
+	SERVICE_USER_DEFINED_CONTROL   = 256
+	SERVICE_ALL_ACCESS             = STANDARD_RIGHTS_REQUIRED | SERVICE_QUERY_CONFIG | SERVICE_CHANGE_CONFIG | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_START | SERVICE_STOP | SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_USER_DEFINED_CONTROL
+	SERVICE_RUNS_IN_SYSTEM_PROCESS = 1
+	SERVICE_CONFIG_DESCRIPTION     = 1
+	SERVICE_CONFIG_FAILURE_ACTIONS = 2
+
+	NO_ERROR = 0
+
+	SC_ENUM_PROCESS_INFO = 0
+)
+
+type SERVICE_STATUS struct {
+	ServiceType             uint32
+	CurrentState            uint32
+	ControlsAccepted        uint32
+	Win32ExitCode           uint32
+	ServiceSpecificExitCode uint32
+	CheckPoint              uint32
+	WaitHint                uint32
+}
+
+type SERVICE_TABLE_ENTRY struct {
+	ServiceName *uint16
+	ServiceProc uintptr
+}
+
+type QUERY_SERVICE_CONFIG struct {
+	ServiceType      uint32
+	StartType        uint32
+	ErrorControl     uint32
+	BinaryPathName   *uint16
+	LoadOrderGroup   *uint16
+	TagId            uint32
+	Dependencies     *uint16
+	ServiceStartName *uint16
+	DisplayName      *uint16
+}
+
+type SERVICE_DESCRIPTION struct {
+	Description *uint16
+}
+
+type SERVICE_STATUS_PROCESS struct {
+	ServiceType             uint32
+	CurrentState            uint32
+	ControlsAccepted        uint32
+	Win32ExitCode           uint32
+	ServiceSpecificExitCode uint32
+	CheckPoint              uint32
+	WaitHint                uint32
+	ProcessId               uint32
+	ServiceFlags            uint32
+}
+
+type ENUM_SERVICE_STATUS_PROCESS struct {
+	ServiceName          *uint16
+	DisplayName          *uint16
+	ServiceStatusProcess SERVICE_STATUS_PROCESS
+}
+
+type SERVICE_FAILURE_ACTIONS struct {
+	ResetPeriod  uint32
+	RebootMsg    *uint16
+	Command      *uint16
+	ActionsCount uint32
+	Actions      *SC_ACTION
+}
+
+type SC_ACTION struct {
+	Type  uint32
+	Delay uint32
+}
+
+//sys	CloseServiceHandle(handle Handle) (err error) = advapi32.CloseServiceHandle
+//sys	CreateService(mgr Handle, serviceName *uint16, displayName *uint16, access uint32, srvType uint32, startType uint32, errCtl uint32, pathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16) (handle Handle, err error) [failretval==0] = advapi32.CreateServiceW
+//sys	OpenService(mgr Handle, serviceName *uint16, access uint32) (handle Handle, err error) [failretval==0] = advapi32.OpenServiceW
+//sys	DeleteService(service Handle) (err error) = advapi32.DeleteService
+//sys	StartService(service Handle, numArgs uint32, argVectors **uint16) (err error) = advapi32.StartServiceW
+//sys	QueryServiceStatus(service Handle, status *SERVICE_STATUS) (err error) = advapi32.QueryServiceStatus
+//sys	ControlService(service Handle, control uint32, status *SERVICE_STATUS) (err error) = advapi32.ControlService
+//sys	StartServiceCtrlDispatcher(serviceTable *SERVICE_TABLE_ENTRY) (err error) = advapi32.StartServiceCtrlDispatcherW
+//sys	SetServiceStatus(service Handle, serviceStatus *SERVICE_STATUS) (err error) = advapi32.SetServiceStatus
+//sys	ChangeServiceConfig(service Handle, serviceType uint32, startType uint32, errorControl uint32, binaryPathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16, displayName *uint16) (err error) = advapi32.ChangeServiceConfigW
+//sys	QueryServiceConfig(service Handle, serviceConfig *QUERY_SERVICE_CONFIG, bufSize uint32, bytesNeeded *uint32) (err error) = advapi32.QueryServiceConfigW
+//sys	ChangeServiceConfig2(service Handle, infoLevel uint32, info *byte) (err error) = advapi32.ChangeServiceConfig2W
+//sys	QueryServiceConfig2(service Handle, infoLevel uint32, buff *byte, buffSize uint32, bytesNeeded *uint32) (err error) = advapi32.QueryServiceConfig2W
+//sys	EnumServicesStatusEx(mgr Handle, infoLevel uint32, serviceType uint32, serviceState uint32, services *byte, bufSize uint32, bytesNeeded *uint32, servicesReturned *uint32, resumeHandle *uint32, groupName *uint16) (err error) = advapi32.EnumServicesStatusExW
+//sys   QueryServiceStatusEx(service Handle, infoLevel uint32, buff *byte, buffSize uint32, bytesNeeded *uint32) (err error) = advapi32.QueryServiceStatusEx
diff --git a/vendor/golang.org/x/sys/windows/str.go b/vendor/golang.org/x/sys/windows/str.go
new file mode 100644
index 00000000..917cc2aa
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/str.go
@@ -0,0 +1,22 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package windows
+
+func itoa(val int) string { // do it here rather than with fmt to avoid dependency
+	if val < 0 {
+		return "-" + itoa(-val)
+	}
+	var buf [32]byte // big enough for int64
+	i := len(buf) - 1
+	for val >= 10 {
+		buf[i] = byte(val%10 + '0')
+		i--
+		val /= 10
+	}
+	buf[i] = byte(val + '0')
+	return string(buf[i:])
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/debug/log.go b/vendor/golang.org/x/sys/windows/svc/debug/log.go
new file mode 100644
index 00000000..e51ab42a
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/debug/log.go
@@ -0,0 +1,56 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package debug
+
+import (
+	"os"
+	"strconv"
+)
+
+// Log interface allows different log implementations to be used.
+type Log interface {
+	Close() error
+	Info(eid uint32, msg string) error
+	Warning(eid uint32, msg string) error
+	Error(eid uint32, msg string) error
+}
+
+// ConsoleLog provides access to the console.
+type ConsoleLog struct {
+	Name string
+}
+
+// New creates new ConsoleLog.
+func New(source string) *ConsoleLog {
+	return &ConsoleLog{Name: source}
+}
+
+// Close closes console log l.
+func (l *ConsoleLog) Close() error {
+	return nil
+}
+
+func (l *ConsoleLog) report(kind string, eid uint32, msg string) error {
+	s := l.Name + "." + kind + "(" + strconv.Itoa(int(eid)) + "): " + msg + "\n"
+	_, err := os.Stdout.Write([]byte(s))
+	return err
+}
+
+// Info writes an information event msg with event id eid to the console l.
+func (l *ConsoleLog) Info(eid uint32, msg string) error {
+	return l.report("info", eid, msg)
+}
+
+// Warning writes an warning event msg with event id eid to the console l.
+func (l *ConsoleLog) Warning(eid uint32, msg string) error {
+	return l.report("warn", eid, msg)
+}
+
+// Error writes an error event msg with event id eid to the console l.
+func (l *ConsoleLog) Error(eid uint32, msg string) error {
+	return l.report("error", eid, msg)
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/debug/service.go b/vendor/golang.org/x/sys/windows/svc/debug/service.go
new file mode 100644
index 00000000..e621b87a
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/debug/service.go
@@ -0,0 +1,45 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// Package debug provides facilities to execute svc.Handler on console.
+//
+package debug
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+
+	"golang.org/x/sys/windows/svc"
+)
+
+// Run executes service name by calling appropriate handler function.
+// The process is running on console, unlike real service. Use Ctrl+C to
+// send "Stop" command to your service.
+func Run(name string, handler svc.Handler) error {
+	cmds := make(chan svc.ChangeRequest)
+	changes := make(chan svc.Status)
+
+	sig := make(chan os.Signal)
+	signal.Notify(sig)
+
+	go func() {
+		status := svc.Status{State: svc.Stopped}
+		for {
+			select {
+			case <-sig:
+				cmds <- svc.ChangeRequest{Cmd: svc.Stop, CurrentStatus: status}
+			case status = <-changes:
+			}
+		}
+	}()
+
+	_, errno := handler.Execute([]string{name}, cmds, changes)
+	if errno != 0 {
+		return syscall.Errno(errno)
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/event.go b/vendor/golang.org/x/sys/windows/svc/event.go
new file mode 100644
index 00000000..0508e228
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/event.go
@@ -0,0 +1,48 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package svc
+
+import (
+	"errors"
+
+	"golang.org/x/sys/windows"
+)
+
+// event represents auto-reset, initially non-signaled Windows event.
+// It is used to communicate between go and asm parts of this package.
+type event struct {
+	h windows.Handle
+}
+
+func newEvent() (*event, error) {
+	h, err := windows.CreateEvent(nil, 0, 0, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &event{h: h}, nil
+}
+
+func (e *event) Close() error {
+	return windows.CloseHandle(e.h)
+}
+
+func (e *event) Set() error {
+	return windows.SetEvent(e.h)
+}
+
+func (e *event) Wait() error {
+	s, err := windows.WaitForSingleObject(e.h, windows.INFINITE)
+	switch s {
+	case windows.WAIT_OBJECT_0:
+		break
+	case windows.WAIT_FAILED:
+		return err
+	default:
+		return errors.New("unexpected result from WaitForSingleObject")
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/eventlog/install.go b/vendor/golang.org/x/sys/windows/svc/eventlog/install.go
new file mode 100644
index 00000000..c76a3760
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/eventlog/install.go
@@ -0,0 +1,80 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package eventlog
+
+import (
+	"errors"
+
+	"golang.org/x/sys/windows"
+	"golang.org/x/sys/windows/registry"
+)
+
+const (
+	// Log levels.
+	Info    = windows.EVENTLOG_INFORMATION_TYPE
+	Warning = windows.EVENTLOG_WARNING_TYPE
+	Error   = windows.EVENTLOG_ERROR_TYPE
+)
+
+const addKeyName = `SYSTEM\CurrentControlSet\Services\EventLog\Application`
+
+// Install modifies PC registry to allow logging with an event source src.
+// It adds all required keys and values to the event log registry key.
+// Install uses msgFile as the event message file. If useExpandKey is true,
+// the event message file is installed as REG_EXPAND_SZ value,
+// otherwise as REG_SZ. Use bitwise of log.Error, log.Warning and
+// log.Info to specify events supported by the new event source.
+func Install(src, msgFile string, useExpandKey bool, eventsSupported uint32) error {
+	appkey, err := registry.OpenKey(registry.LOCAL_MACHINE, addKeyName, registry.CREATE_SUB_KEY)
+	if err != nil {
+		return err
+	}
+	defer appkey.Close()
+
+	sk, alreadyExist, err := registry.CreateKey(appkey, src, registry.SET_VALUE)
+	if err != nil {
+		return err
+	}
+	defer sk.Close()
+	if alreadyExist {
+		return errors.New(addKeyName + `\` + src + " registry key already exists")
+	}
+
+	err = sk.SetDWordValue("CustomSource", 1)
+	if err != nil {
+		return err
+	}
+	if useExpandKey {
+		err = sk.SetExpandStringValue("EventMessageFile", msgFile)
+	} else {
+		err = sk.SetStringValue("EventMessageFile", msgFile)
+	}
+	if err != nil {
+		return err
+	}
+	err = sk.SetDWordValue("TypesSupported", eventsSupported)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// InstallAsEventCreate is the same as Install, but uses
+// %SystemRoot%\System32\EventCreate.exe as the event message file.
+func InstallAsEventCreate(src string, eventsSupported uint32) error {
+	return Install(src, "%SystemRoot%\\System32\\EventCreate.exe", true, eventsSupported)
+}
+
+// Remove deletes all registry elements installed by the correspondent Install.
+func Remove(src string) error {
+	appkey, err := registry.OpenKey(registry.LOCAL_MACHINE, addKeyName, registry.SET_VALUE)
+	if err != nil {
+		return err
+	}
+	defer appkey.Close()
+	return registry.DeleteKey(appkey, src)
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/eventlog/log.go b/vendor/golang.org/x/sys/windows/svc/eventlog/log.go
new file mode 100644
index 00000000..46e5153d
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/eventlog/log.go
@@ -0,0 +1,70 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// Package eventlog implements access to Windows event log.
+//
+package eventlog
+
+import (
+	"errors"
+	"syscall"
+
+	"golang.org/x/sys/windows"
+)
+
+// Log provides access to the system log.
+type Log struct {
+	Handle windows.Handle
+}
+
+// Open retrieves a handle to the specified event log.
+func Open(source string) (*Log, error) {
+	return OpenRemote("", source)
+}
+
+// OpenRemote does the same as Open, but on different computer host.
+func OpenRemote(host, source string) (*Log, error) {
+	if source == "" {
+		return nil, errors.New("Specify event log source")
+	}
+	var s *uint16
+	if host != "" {
+		s = syscall.StringToUTF16Ptr(host)
+	}
+	h, err := windows.RegisterEventSource(s, syscall.StringToUTF16Ptr(source))
+	if err != nil {
+		return nil, err
+	}
+	return &Log{Handle: h}, nil
+}
+
+// Close closes event log l.
+func (l *Log) Close() error {
+	return windows.DeregisterEventSource(l.Handle)
+}
+
+func (l *Log) report(etype uint16, eid uint32, msg string) error {
+	ss := []*uint16{syscall.StringToUTF16Ptr(msg)}
+	return windows.ReportEvent(l.Handle, etype, 0, eid, 0, 1, 0, &ss[0], nil)
+}
+
+// Info writes an information event msg with event id eid to the end of event log l.
+// When EventCreate.exe is used, eid must be between 1 and 1000.
+func (l *Log) Info(eid uint32, msg string) error {
+	return l.report(windows.EVENTLOG_INFORMATION_TYPE, eid, msg)
+}
+
+// Warning writes an warning event msg with event id eid to the end of event log l.
+// When EventCreate.exe is used, eid must be between 1 and 1000.
+func (l *Log) Warning(eid uint32, msg string) error {
+	return l.report(windows.EVENTLOG_WARNING_TYPE, eid, msg)
+}
+
+// Error writes an error event msg with event id eid to the end of event log l.
+// When EventCreate.exe is used, eid must be between 1 and 1000.
+func (l *Log) Error(eid uint32, msg string) error {
+	return l.report(windows.EVENTLOG_ERROR_TYPE, eid, msg)
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go b/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go
new file mode 100644
index 00000000..6fbbd4a8
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go
@@ -0,0 +1,51 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package eventlog_test
+
+import (
+	"testing"
+
+	"golang.org/x/sys/windows/svc/eventlog"
+)
+
+func TestLog(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode - it modifies system logs")
+	}
+
+	const name = "mylog"
+	const supports = eventlog.Error | eventlog.Warning | eventlog.Info
+	err := eventlog.InstallAsEventCreate(name, supports)
+	if err != nil {
+		t.Fatalf("Install failed: %s", err)
+	}
+	defer func() {
+		err = eventlog.Remove(name)
+		if err != nil {
+			t.Fatalf("Remove failed: %s", err)
+		}
+	}()
+
+	l, err := eventlog.Open(name)
+	if err != nil {
+		t.Fatalf("Open failed: %s", err)
+	}
+	defer l.Close()
+
+	err = l.Info(1, "info")
+	if err != nil {
+		t.Fatalf("Info failed: %s", err)
+	}
+	err = l.Warning(2, "warning")
+	if err != nil {
+		t.Fatalf("Warning failed: %s", err)
+	}
+	err = l.Error(3, "error")
+	if err != nil {
+		t.Fatalf("Error failed: %s", err)
+	}
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/example/beep.go b/vendor/golang.org/x/sys/windows/svc/example/beep.go
new file mode 100644
index 00000000..dcf23408
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/example/beep.go
@@ -0,0 +1,22 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package main
+
+import (
+	"syscall"
+)
+
+// BUG(brainman): MessageBeep Windows api is broken on Windows 7,
+// so this example does not beep when runs as service on Windows 7.
+
+var (
+	beepFunc = syscall.MustLoadDLL("user32.dll").MustFindProc("MessageBeep")
+)
+
+func beep() {
+	beepFunc.Call(0xffffffff)
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/example/install.go b/vendor/golang.org/x/sys/windows/svc/example/install.go
new file mode 100644
index 00000000..39cb00d2
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/example/install.go
@@ -0,0 +1,92 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"golang.org/x/sys/windows/svc/eventlog"
+	"golang.org/x/sys/windows/svc/mgr"
+)
+
+func exePath() (string, error) {
+	prog := os.Args[0]
+	p, err := filepath.Abs(prog)
+	if err != nil {
+		return "", err
+	}
+	fi, err := os.Stat(p)
+	if err == nil {
+		if !fi.Mode().IsDir() {
+			return p, nil
+		}
+		err = fmt.Errorf("%s is directory", p)
+	}
+	if filepath.Ext(p) == "" {
+		p += ".exe"
+		fi, err := os.Stat(p)
+		if err == nil {
+			if !fi.Mode().IsDir() {
+				return p, nil
+			}
+			err = fmt.Errorf("%s is directory", p)
+		}
+	}
+	return "", err
+}
+
+func installService(name, desc string) error {
+	exepath, err := exePath()
+	if err != nil {
+		return err
+	}
+	m, err := mgr.Connect()
+	if err != nil {
+		return err
+	}
+	defer m.Disconnect()
+	s, err := m.OpenService(name)
+	if err == nil {
+		s.Close()
+		return fmt.Errorf("service %s already exists", name)
+	}
+	s, err = m.CreateService(name, exepath, mgr.Config{DisplayName: desc}, "is", "auto-started")
+	if err != nil {
+		return err
+	}
+	defer s.Close()
+	err = eventlog.InstallAsEventCreate(name, eventlog.Error|eventlog.Warning|eventlog.Info)
+	if err != nil {
+		s.Delete()
+		return fmt.Errorf("SetupEventLogSource() failed: %s", err)
+	}
+	return nil
+}
+
+func removeService(name string) error {
+	m, err := mgr.Connect()
+	if err != nil {
+		return err
+	}
+	defer m.Disconnect()
+	s, err := m.OpenService(name)
+	if err != nil {
+		return fmt.Errorf("service %s is not installed", name)
+	}
+	defer s.Close()
+	err = s.Delete()
+	if err != nil {
+		return err
+	}
+	err = eventlog.Remove(name)
+	if err != nil {
+		return fmt.Errorf("RemoveEventLogSource() failed: %s", err)
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/example/main.go b/vendor/golang.org/x/sys/windows/svc/example/main.go
new file mode 100644
index 00000000..dc96c081
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/example/main.go
@@ -0,0 +1,76 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// Example service program that beeps.
+//
+// The program demonstrates how to create Windows service and
+// install / remove it on a computer. It also shows how to
+// stop / start / pause / continue any service, and how to
+// write to event log. It also shows how to use debug
+// facilities available in debug package.
+//
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"strings"
+
+	"golang.org/x/sys/windows/svc"
+)
+
+func usage(errmsg string) {
+	fmt.Fprintf(os.Stderr,
+		"%s\n\n"+
+			"usage: %s <command>\n"+
+			"       where <command> is one of\n"+
+			"       install, remove, debug, start, stop, pause or continue.\n",
+		errmsg, os.Args[0])
+	os.Exit(2)
+}
+
+func main() {
+	const svcName = "myservice"
+
+	isIntSess, err := svc.IsAnInteractiveSession()
+	if err != nil {
+		log.Fatalf("failed to determine if we are running in an interactive session: %v", err)
+	}
+	if !isIntSess {
+		runService(svcName, false)
+		return
+	}
+
+	if len(os.Args) < 2 {
+		usage("no command specified")
+	}
+
+	cmd := strings.ToLower(os.Args[1])
+	switch cmd {
+	case "debug":
+		runService(svcName, true)
+		return
+	case "install":
+		err = installService(svcName, "my service")
+	case "remove":
+		err = removeService(svcName)
+	case "start":
+		err = startService(svcName)
+	case "stop":
+		err = controlService(svcName, svc.Stop, svc.Stopped)
+	case "pause":
+		err = controlService(svcName, svc.Pause, svc.Paused)
+	case "continue":
+		err = controlService(svcName, svc.Continue, svc.Running)
+	default:
+		usage(fmt.Sprintf("invalid command %s", cmd))
+	}
+	if err != nil {
+		log.Fatalf("failed to %s %s: %v", cmd, svcName, err)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/example/manage.go b/vendor/golang.org/x/sys/windows/svc/example/manage.go
new file mode 100644
index 00000000..782dbd96
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/example/manage.go
@@ -0,0 +1,62 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/mgr"
+)
+
+func startService(name string) error {
+	m, err := mgr.Connect()
+	if err != nil {
+		return err
+	}
+	defer m.Disconnect()
+	s, err := m.OpenService(name)
+	if err != nil {
+		return fmt.Errorf("could not access service: %v", err)
+	}
+	defer s.Close()
+	err = s.Start("is", "manual-started")
+	if err != nil {
+		return fmt.Errorf("could not start service: %v", err)
+	}
+	return nil
+}
+
+func controlService(name string, c svc.Cmd, to svc.State) error {
+	m, err := mgr.Connect()
+	if err != nil {
+		return err
+	}
+	defer m.Disconnect()
+	s, err := m.OpenService(name)
+	if err != nil {
+		return fmt.Errorf("could not access service: %v", err)
+	}
+	defer s.Close()
+	status, err := s.Control(c)
+	if err != nil {
+		return fmt.Errorf("could not send control=%d: %v", c, err)
+	}
+	timeout := time.Now().Add(10 * time.Second)
+	for status.State != to {
+		if timeout.Before(time.Now()) {
+			return fmt.Errorf("timeout waiting for service to go to state=%d", to)
+		}
+		time.Sleep(300 * time.Millisecond)
+		status, err = s.Query()
+		if err != nil {
+			return fmt.Errorf("could not retrieve service status: %v", err)
+		}
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/example/service.go b/vendor/golang.org/x/sys/windows/svc/example/service.go
new file mode 100644
index 00000000..74c93930
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/example/service.go
@@ -0,0 +1,84 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package main
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/debug"
+	"golang.org/x/sys/windows/svc/eventlog"
+)
+
+var elog debug.Log
+
+type myservice struct{}
+
+func (m *myservice) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
+	const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown | svc.AcceptPauseAndContinue
+	changes <- svc.Status{State: svc.StartPending}
+	fasttick := time.Tick(500 * time.Millisecond)
+	slowtick := time.Tick(2 * time.Second)
+	tick := fasttick
+	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
+	elog.Info(1, strings.Join(args, "-"))
+loop:
+	for {
+		select {
+		case <-tick:
+			beep()
+			elog.Info(1, "beep")
+		case c := <-r:
+			switch c.Cmd {
+			case svc.Interrogate:
+				changes <- c.CurrentStatus
+				// Testing deadlock from https://code.google.com/p/winsvc/issues/detail?id=4
+				time.Sleep(100 * time.Millisecond)
+				changes <- c.CurrentStatus
+			case svc.Stop, svc.Shutdown:
+				break loop
+			case svc.Pause:
+				changes <- svc.Status{State: svc.Paused, Accepts: cmdsAccepted}
+				tick = slowtick
+			case svc.Continue:
+				changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
+				tick = fasttick
+			default:
+				elog.Error(1, fmt.Sprintf("unexpected control request #%d", c))
+			}
+		}
+	}
+	changes <- svc.Status{State: svc.StopPending}
+	return
+}
+
+func runService(name string, isDebug bool) {
+	var err error
+	if isDebug {
+		elog = debug.New(name)
+	} else {
+		elog, err = eventlog.Open(name)
+		if err != nil {
+			return
+		}
+	}
+	defer elog.Close()
+
+	elog.Info(1, fmt.Sprintf("starting %s service", name))
+	run := svc.Run
+	if isDebug {
+		run = debug.Run
+	}
+	err = run(name, &myservice{})
+	if err != nil {
+		elog.Error(1, fmt.Sprintf("%s service failed: %v", name, err))
+		return
+	}
+	elog.Info(1, fmt.Sprintf("%s service stopped", name))
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/go12.c b/vendor/golang.org/x/sys/windows/svc/go12.c
new file mode 100644
index 00000000..6f1be1fa
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/go12.c
@@ -0,0 +1,24 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+// +build !go1.3
+
+// copied from pkg/runtime
+typedef	unsigned int	uint32;
+typedef	unsigned long long int	uint64;
+#ifdef _64BIT
+typedef	uint64		uintptr;
+#else
+typedef	uint32		uintptr;
+#endif
+
+// from sys_386.s or sys_amd64.s
+void ·servicemain(void);
+
+void
+·getServiceMain(uintptr *r)
+{
+	*r = (uintptr)·servicemain;
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/go12.go b/vendor/golang.org/x/sys/windows/svc/go12.go
new file mode 100644
index 00000000..cd8b913c
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/go12.go
@@ -0,0 +1,11 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+// +build !go1.3
+
+package svc
+
+// from go12.c
+func getServiceMain(r *uintptr)
diff --git a/vendor/golang.org/x/sys/windows/svc/go13.go b/vendor/golang.org/x/sys/windows/svc/go13.go
new file mode 100644
index 00000000..9d7f3cec
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/go13.go
@@ -0,0 +1,31 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+// +build go1.3
+
+package svc
+
+import "unsafe"
+
+const ptrSize = 4 << (^uintptr(0) >> 63) // unsafe.Sizeof(uintptr(0)) but an ideal const
+
+// Should be a built-in for unsafe.Pointer?
+func add(p unsafe.Pointer, x uintptr) unsafe.Pointer {
+	return unsafe.Pointer(uintptr(p) + x)
+}
+
+// funcPC returns the entry PC of the function f.
+// It assumes that f is a func value. Otherwise the behavior is undefined.
+func funcPC(f interface{}) uintptr {
+	return **(**uintptr)(add(unsafe.Pointer(&f), ptrSize))
+}
+
+// from sys_386.s and sys_amd64.s
+func servicectlhandler(ctl uint32) uintptr
+func servicemain(argc uint32, argv **uint16)
+
+func getServiceMain(r *uintptr) {
+	*r = funcPC(servicemain)
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/mgr/config.go b/vendor/golang.org/x/sys/windows/svc/mgr/config.go
new file mode 100644
index 00000000..d804e31f
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/mgr/config.go
@@ -0,0 +1,145 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package mgr
+
+import (
+	"syscall"
+	"unicode/utf16"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+const (
+	// Service start types.
+	StartManual    = windows.SERVICE_DEMAND_START // the service must be started manually
+	StartAutomatic = windows.SERVICE_AUTO_START   // the service will start by itself whenever the computer reboots
+	StartDisabled  = windows.SERVICE_DISABLED     // the service cannot be started
+
+	// The severity of the error, and action taken,
+	// if this service fails to start.
+	ErrorCritical = windows.SERVICE_ERROR_CRITICAL
+	ErrorIgnore   = windows.SERVICE_ERROR_IGNORE
+	ErrorNormal   = windows.SERVICE_ERROR_NORMAL
+	ErrorSevere   = windows.SERVICE_ERROR_SEVERE
+)
+
+// TODO(brainman): Password is not returned by windows.QueryServiceConfig, not sure how to get it.
+
+type Config struct {
+	ServiceType      uint32
+	StartType        uint32
+	ErrorControl     uint32
+	BinaryPathName   string // fully qualified path to the service binary file, can also include arguments for an auto-start service
+	LoadOrderGroup   string
+	TagId            uint32
+	Dependencies     []string
+	ServiceStartName string // name of the account under which the service should run
+	DisplayName      string
+	Password         string
+	Description      string
+}
+
+func toString(p *uint16) string {
+	if p == nil {
+		return ""
+	}
+	return syscall.UTF16ToString((*[4096]uint16)(unsafe.Pointer(p))[:])
+}
+
+func toStringSlice(ps *uint16) []string {
+	if ps == nil {
+		return nil
+	}
+	r := make([]string, 0)
+	for from, i, p := 0, 0, (*[1 << 24]uint16)(unsafe.Pointer(ps)); true; i++ {
+		if p[i] == 0 {
+			// empty string marks the end
+			if i <= from {
+				break
+			}
+			r = append(r, string(utf16.Decode(p[from:i])))
+			from = i + 1
+		}
+	}
+	return r
+}
+
+// Config retrieves service s configuration paramteres.
+func (s *Service) Config() (Config, error) {
+	var p *windows.QUERY_SERVICE_CONFIG
+	n := uint32(1024)
+	for {
+		b := make([]byte, n)
+		p = (*windows.QUERY_SERVICE_CONFIG)(unsafe.Pointer(&b[0]))
+		err := windows.QueryServiceConfig(s.Handle, p, n, &n)
+		if err == nil {
+			break
+		}
+		if err.(syscall.Errno) != syscall.ERROR_INSUFFICIENT_BUFFER {
+			return Config{}, err
+		}
+		if n <= uint32(len(b)) {
+			return Config{}, err
+		}
+	}
+
+	b, err := s.queryServiceConfig2(windows.SERVICE_CONFIG_DESCRIPTION)
+	if err != nil {
+		return Config{}, err
+	}
+	p2 := (*windows.SERVICE_DESCRIPTION)(unsafe.Pointer(&b[0]))
+
+	return Config{
+		ServiceType:      p.ServiceType,
+		StartType:        p.StartType,
+		ErrorControl:     p.ErrorControl,
+		BinaryPathName:   toString(p.BinaryPathName),
+		LoadOrderGroup:   toString(p.LoadOrderGroup),
+		TagId:            p.TagId,
+		Dependencies:     toStringSlice(p.Dependencies),
+		ServiceStartName: toString(p.ServiceStartName),
+		DisplayName:      toString(p.DisplayName),
+		Description:      toString(p2.Description),
+	}, nil
+}
+
+func updateDescription(handle windows.Handle, desc string) error {
+	d := windows.SERVICE_DESCRIPTION{Description: toPtr(desc)}
+	return windows.ChangeServiceConfig2(handle,
+		windows.SERVICE_CONFIG_DESCRIPTION, (*byte)(unsafe.Pointer(&d)))
+}
+
+// UpdateConfig updates service s configuration parameters.
+func (s *Service) UpdateConfig(c Config) error {
+	err := windows.ChangeServiceConfig(s.Handle, c.ServiceType, c.StartType,
+		c.ErrorControl, toPtr(c.BinaryPathName), toPtr(c.LoadOrderGroup),
+		nil, toStringBlock(c.Dependencies), toPtr(c.ServiceStartName),
+		toPtr(c.Password), toPtr(c.DisplayName))
+	if err != nil {
+		return err
+	}
+	return updateDescription(s.Handle, c.Description)
+}
+
+// queryServiceConfig2 calls Windows QueryServiceConfig2 with infoLevel parameter and returns retrieved service configuration information.
+func (s *Service) queryServiceConfig2(infoLevel uint32) ([]byte, error) {
+	n := uint32(1024)
+	for {
+		b := make([]byte, n)
+		err := windows.QueryServiceConfig2(s.Handle, infoLevel, &b[0], n, &n)
+		if err == nil {
+			return b, nil
+		}
+		if err.(syscall.Errno) != syscall.ERROR_INSUFFICIENT_BUFFER {
+			return nil, err
+		}
+		if n <= uint32(len(b)) {
+			return nil, err
+		}
+	}
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/mgr/mgr.go b/vendor/golang.org/x/sys/windows/svc/mgr/mgr.go
new file mode 100644
index 00000000..76965b56
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/mgr/mgr.go
@@ -0,0 +1,162 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// Package mgr can be used to manage Windows service programs.
+// It can be used to install and remove them. It can also start,
+// stop and pause them. The package can query / change current
+// service state and config parameters.
+//
+package mgr
+
+import (
+	"syscall"
+	"unicode/utf16"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+// Mgr is used to manage Windows service.
+type Mgr struct {
+	Handle windows.Handle
+}
+
+// Connect establishes a connection to the service control manager.
+func Connect() (*Mgr, error) {
+	return ConnectRemote("")
+}
+
+// ConnectRemote establishes a connection to the
+// service control manager on computer named host.
+func ConnectRemote(host string) (*Mgr, error) {
+	var s *uint16
+	if host != "" {
+		s = syscall.StringToUTF16Ptr(host)
+	}
+	h, err := windows.OpenSCManager(s, nil, windows.SC_MANAGER_ALL_ACCESS)
+	if err != nil {
+		return nil, err
+	}
+	return &Mgr{Handle: h}, nil
+}
+
+// Disconnect closes connection to the service control manager m.
+func (m *Mgr) Disconnect() error {
+	return windows.CloseServiceHandle(m.Handle)
+}
+
+func toPtr(s string) *uint16 {
+	if len(s) == 0 {
+		return nil
+	}
+	return syscall.StringToUTF16Ptr(s)
+}
+
+// toStringBlock terminates strings in ss with 0, and then
+// concatenates them together. It also adds extra 0 at the end.
+func toStringBlock(ss []string) *uint16 {
+	if len(ss) == 0 {
+		return nil
+	}
+	t := ""
+	for _, s := range ss {
+		if s != "" {
+			t += s + "\x00"
+		}
+	}
+	if t == "" {
+		return nil
+	}
+	t += "\x00"
+	return &utf16.Encode([]rune(t))[0]
+}
+
+// CreateService installs new service name on the system.
+// The service will be executed by running exepath binary.
+// Use config c to specify service parameters.
+// Any args will be passed as command-line arguments when
+// the service is started; these arguments are distinct from
+// the arguments passed to Service.Start or via the "Start
+// parameters" field in the service's Properties dialog box.
+func (m *Mgr) CreateService(name, exepath string, c Config, args ...string) (*Service, error) {
+	if c.StartType == 0 {
+		c.StartType = StartManual
+	}
+	if c.ErrorControl == 0 {
+		c.ErrorControl = ErrorNormal
+	}
+	if c.ServiceType == 0 {
+		c.ServiceType = windows.SERVICE_WIN32_OWN_PROCESS
+	}
+	s := syscall.EscapeArg(exepath)
+	for _, v := range args {
+		s += " " + syscall.EscapeArg(v)
+	}
+	h, err := windows.CreateService(m.Handle, toPtr(name), toPtr(c.DisplayName),
+		windows.SERVICE_ALL_ACCESS, c.ServiceType,
+		c.StartType, c.ErrorControl, toPtr(s), toPtr(c.LoadOrderGroup),
+		nil, toStringBlock(c.Dependencies), toPtr(c.ServiceStartName), toPtr(c.Password))
+	if err != nil {
+		return nil, err
+	}
+	if c.Description != "" {
+		err = updateDescription(h, c.Description)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return &Service{Name: name, Handle: h}, nil
+}
+
+// OpenService retrieves access to service name, so it can
+// be interrogated and controlled.
+func (m *Mgr) OpenService(name string) (*Service, error) {
+	h, err := windows.OpenService(m.Handle, syscall.StringToUTF16Ptr(name), windows.SERVICE_ALL_ACCESS)
+	if err != nil {
+		return nil, err
+	}
+	return &Service{Name: name, Handle: h}, nil
+}
+
+// ListServices enumerates services in the specified
+// service control manager database m.
+// If the caller does not have the SERVICE_QUERY_STATUS
+// access right to a service, the service is silently
+// omitted from the list of services returned.
+func (m *Mgr) ListServices() ([]string, error) {
+	var err error
+	var bytesNeeded, servicesReturned uint32
+	var buf []byte
+	for {
+		var p *byte
+		if len(buf) > 0 {
+			p = &buf[0]
+		}
+		err = windows.EnumServicesStatusEx(m.Handle, windows.SC_ENUM_PROCESS_INFO,
+			windows.SERVICE_WIN32, windows.SERVICE_STATE_ALL,
+			p, uint32(len(buf)), &bytesNeeded, &servicesReturned, nil, nil)
+		if err == nil {
+			break
+		}
+		if err != syscall.ERROR_MORE_DATA {
+			return nil, err
+		}
+		if bytesNeeded <= uint32(len(buf)) {
+			return nil, err
+		}
+		buf = make([]byte, bytesNeeded)
+	}
+	if servicesReturned == 0 {
+		return nil, nil
+	}
+	services := (*[1 << 20]windows.ENUM_SERVICE_STATUS_PROCESS)(unsafe.Pointer(&buf[0]))[:servicesReturned]
+	var names []string
+	for _, s := range services {
+		name := syscall.UTF16ToString((*[1 << 20]uint16)(unsafe.Pointer(s.ServiceName))[:])
+		names = append(names, name)
+	}
+	return names, nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go b/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go
new file mode 100644
index 00000000..9171f5bc
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go
@@ -0,0 +1,282 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package mgr_test
+
+import (
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"syscall"
+	"testing"
+	"time"
+
+	"golang.org/x/sys/windows/svc/mgr"
+)
+
+func TestOpenLanManServer(t *testing.T) {
+	m, err := mgr.Connect()
+	if err != nil {
+		if errno, ok := err.(syscall.Errno); ok && errno == syscall.ERROR_ACCESS_DENIED {
+			t.Skip("Skipping test: we don't have rights to manage services.")
+		}
+		t.Fatalf("SCM connection failed: %s", err)
+	}
+	defer m.Disconnect()
+
+	s, err := m.OpenService("LanmanServer")
+	if err != nil {
+		t.Fatalf("OpenService(lanmanserver) failed: %s", err)
+	}
+	defer s.Close()
+
+	_, err = s.Config()
+	if err != nil {
+		t.Fatalf("Config failed: %s", err)
+	}
+}
+
+func install(t *testing.T, m *mgr.Mgr, name, exepath string, c mgr.Config) {
+	// Sometimes it takes a while for the service to get
+	// removed after previous test run.
+	for i := 0; ; i++ {
+		s, err := m.OpenService(name)
+		if err != nil {
+			break
+		}
+		s.Close()
+
+		if i > 10 {
+			t.Fatalf("service %s already exists", name)
+		}
+		time.Sleep(300 * time.Millisecond)
+	}
+
+	s, err := m.CreateService(name, exepath, c)
+	if err != nil {
+		t.Fatalf("CreateService(%s) failed: %v", name, err)
+	}
+	defer s.Close()
+}
+
+func depString(d []string) string {
+	if len(d) == 0 {
+		return ""
+	}
+	for i := range d {
+		d[i] = strings.ToLower(d[i])
+	}
+	ss := sort.StringSlice(d)
+	ss.Sort()
+	return strings.Join([]string(ss), " ")
+}
+
+func testConfig(t *testing.T, s *mgr.Service, should mgr.Config) mgr.Config {
+	is, err := s.Config()
+	if err != nil {
+		t.Fatalf("Config failed: %s", err)
+	}
+	if should.DisplayName != is.DisplayName {
+		t.Fatalf("config mismatch: DisplayName is %q, but should have %q", is.DisplayName, should.DisplayName)
+	}
+	if should.StartType != is.StartType {
+		t.Fatalf("config mismatch: StartType is %v, but should have %v", is.StartType, should.StartType)
+	}
+	if should.Description != is.Description {
+		t.Fatalf("config mismatch: Description is %q, but should have %q", is.Description, should.Description)
+	}
+	if depString(should.Dependencies) != depString(is.Dependencies) {
+		t.Fatalf("config mismatch: Dependencies is %v, but should have %v", is.Dependencies, should.Dependencies)
+	}
+	return is
+}
+
+func testRecoveryActions(t *testing.T, s *mgr.Service, should []mgr.RecoveryAction) {
+	is, err := s.RecoveryActions()
+	if err != nil {
+		t.Fatalf("RecoveryActions failed: %s", err)
+	}
+	if len(should) != len(is) {
+		t.Errorf("recovery action mismatch: contains %v actions, but should have %v", len(is), len(should))
+	}
+	for i, _ := range is {
+		if should[i].Type != is[i].Type {
+			t.Errorf("recovery action mismatch: Type is %v, but should have %v", is[i].Type, should[i].Type)
+		}
+		if should[i].Delay != is[i].Delay {
+			t.Errorf("recovery action mismatch: Delay is %v, but should have %v", is[i].Delay, should[i].Delay)
+		}
+	}
+}
+
+func testResetPeriod(t *testing.T, s *mgr.Service, should uint32) {
+	is, err := s.ResetPeriod()
+	if err != nil {
+		t.Fatalf("ResetPeriod failed: %s", err)
+	}
+	if should != is {
+		t.Errorf("reset period mismatch: reset period is %v, but should have %v", is, should)
+	}
+}
+
+func testSetRecoveryActions(t *testing.T, s *mgr.Service) {
+	r := []mgr.RecoveryAction{
+		mgr.RecoveryAction{
+			Type:  mgr.NoAction,
+			Delay: 60000 * time.Millisecond,
+		},
+		mgr.RecoveryAction{
+			Type:  mgr.ServiceRestart,
+			Delay: 4 * time.Minute,
+		},
+		mgr.RecoveryAction{
+			Type:  mgr.ServiceRestart,
+			Delay: time.Minute,
+		},
+		mgr.RecoveryAction{
+			Type:  mgr.RunCommand,
+			Delay: 4000 * time.Millisecond,
+		},
+	}
+
+	// 4 recovery actions with reset period
+	err := s.SetRecoveryActions(r, uint32(10000))
+	if err != nil {
+		t.Fatalf("SetRecoveryActions failed: %v", err)
+	}
+	testRecoveryActions(t, s, r)
+	testResetPeriod(t, s, uint32(10000))
+
+	// Infinite reset period
+	err = s.SetRecoveryActions(r, syscall.INFINITE)
+	if err != nil {
+		t.Fatalf("SetRecoveryActions failed: %v", err)
+	}
+	testRecoveryActions(t, s, r)
+	testResetPeriod(t, s, syscall.INFINITE)
+
+	// nil recovery actions
+	err = s.SetRecoveryActions(nil, 0)
+	if err.Error() != "recoveryActions cannot be nil" {
+		t.Fatalf("SetRecoveryActions failed with unexpected error message of %q", err)
+	}
+
+	// Delete all recovery actions and reset period
+	err = s.ResetRecoveryActions()
+	if err != nil {
+		t.Fatalf("ResetRecoveryActions failed: %v", err)
+	}
+	testRecoveryActions(t, s, nil)
+	testResetPeriod(t, s, 0)
+}
+
+func testRebootMessage(t *testing.T, s *mgr.Service, should string) {
+	err := s.SetRebootMessage(should)
+	if err != nil {
+		t.Fatalf("SetRebootMessage failed: %v", err)
+	}
+	is, err := s.RebootMessage()
+	if err != nil {
+		t.Fatalf("RebootMessage failed: %v", err)
+	}
+	if should != is {
+		t.Errorf("reboot message mismatch: message is %q, but should have %q", is, should)
+	}
+}
+
+func testRecoveryCommand(t *testing.T, s *mgr.Service, should string) {
+	err := s.SetRecoveryCommand(should)
+	if err != nil {
+		t.Fatalf("SetRecoveryCommand failed: %v", err)
+	}
+	is, err := s.RecoveryCommand()
+	if err != nil {
+		t.Fatalf("RecoveryCommand failed: %v", err)
+	}
+	if should != is {
+		t.Errorf("recovery command mismatch: command is %q, but should have %q", is, should)
+	}
+}
+
+func remove(t *testing.T, s *mgr.Service) {
+	err := s.Delete()
+	if err != nil {
+		t.Fatalf("Delete failed: %s", err)
+	}
+}
+
+func TestMyService(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode - it modifies system services")
+	}
+
+	const name = "myservice"
+
+	m, err := mgr.Connect()
+	if err != nil {
+		if errno, ok := err.(syscall.Errno); ok && errno == syscall.ERROR_ACCESS_DENIED {
+			t.Skip("Skipping test: we don't have rights to manage services.")
+		}
+		t.Fatalf("SCM connection failed: %s", err)
+	}
+	defer m.Disconnect()
+
+	c := mgr.Config{
+		StartType:    mgr.StartDisabled,
+		DisplayName:  "my service",
+		Description:  "my service is just a test",
+		Dependencies: []string{"LanmanServer", "W32Time"},
+	}
+
+	exename := os.Args[0]
+	exepath, err := filepath.Abs(exename)
+	if err != nil {
+		t.Fatalf("filepath.Abs(%s) failed: %s", exename, err)
+	}
+
+	install(t, m, name, exepath, c)
+
+	s, err := m.OpenService(name)
+	if err != nil {
+		t.Fatalf("service %s is not installed", name)
+	}
+	defer s.Close()
+
+	c.BinaryPathName = exepath
+	c = testConfig(t, s, c)
+
+	c.StartType = mgr.StartManual
+	err = s.UpdateConfig(c)
+	if err != nil {
+		t.Fatalf("UpdateConfig failed: %v", err)
+	}
+
+	testConfig(t, s, c)
+
+	svcnames, err := m.ListServices()
+	if err != nil {
+		t.Fatalf("ListServices failed: %v", err)
+	}
+	var myserviceIsInstalled bool
+	for _, sn := range svcnames {
+		if sn == name {
+			myserviceIsInstalled = true
+			break
+		}
+	}
+	if !myserviceIsInstalled {
+		t.Errorf("ListServices failed to find %q service", name)
+	}
+
+	testSetRecoveryActions(t, s)
+	testRebootMessage(t, s, "myservice failed")
+	testRebootMessage(t, s, "") // delete reboot message
+	testRecoveryCommand(t, s, "sc query myservice")
+	testRecoveryCommand(t, s, "") // delete recovery command
+
+	remove(t, s)
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/mgr/recovery.go b/vendor/golang.org/x/sys/windows/svc/mgr/recovery.go
new file mode 100644
index 00000000..71ce2b81
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/mgr/recovery.go
@@ -0,0 +1,135 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package mgr
+
+import (
+	"errors"
+	"syscall"
+	"time"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+const (
+	// Possible recovery actions that the service control manager can perform.
+	NoAction       = windows.SC_ACTION_NONE        // no action
+	ComputerReboot = windows.SC_ACTION_REBOOT      // reboot the computer
+	ServiceRestart = windows.SC_ACTION_RESTART     // restart the service
+	RunCommand     = windows.SC_ACTION_RUN_COMMAND // run a command
+)
+
+// RecoveryAction represents an action that the service control manager can perform when service fails.
+// A service is considered failed when it terminates without reporting a status of SERVICE_STOPPED to the service controller.
+type RecoveryAction struct {
+	Type  int           // one of NoAction, ComputerReboot, ServiceRestart or RunCommand
+	Delay time.Duration // the time to wait before performing the specified action
+}
+
+// SetRecoveryActions sets actions that service controller performs when service fails and
+// the time after which to reset the service failure count to zero if there are no failures, in seconds.
+// Specify INFINITE to indicate that service failure count should never be reset.
+func (s *Service) SetRecoveryActions(recoveryActions []RecoveryAction, resetPeriod uint32) error {
+	if recoveryActions == nil {
+		return errors.New("recoveryActions cannot be nil")
+	}
+	actions := []windows.SC_ACTION{}
+	for _, a := range recoveryActions {
+		action := windows.SC_ACTION{
+			Type:  uint32(a.Type),
+			Delay: uint32(a.Delay.Nanoseconds() / 1000000),
+		}
+		actions = append(actions, action)
+	}
+	rActions := windows.SERVICE_FAILURE_ACTIONS{
+		ActionsCount: uint32(len(actions)),
+		Actions:      &actions[0],
+		ResetPeriod:  resetPeriod,
+	}
+	return windows.ChangeServiceConfig2(s.Handle, windows.SERVICE_CONFIG_FAILURE_ACTIONS, (*byte)(unsafe.Pointer(&rActions)))
+}
+
+// RecoveryActions returns actions that service controller performs when service fails.
+// The service control manager counts the number of times service s has failed since the system booted.
+// The count is reset to 0 if the service has not failed for ResetPeriod seconds.
+// When the service fails for the Nth time, the service controller performs the action specified in element [N-1] of returned slice.
+// If N is greater than slice length, the service controller repeats the last action in the slice.
+func (s *Service) RecoveryActions() ([]RecoveryAction, error) {
+	b, err := s.queryServiceConfig2(windows.SERVICE_CONFIG_FAILURE_ACTIONS)
+	if err != nil {
+		return nil, err
+	}
+	p := (*windows.SERVICE_FAILURE_ACTIONS)(unsafe.Pointer(&b[0]))
+	if p.Actions == nil {
+		return nil, err
+	}
+
+	var recoveryActions []RecoveryAction
+	actions := (*[1024]windows.SC_ACTION)(unsafe.Pointer(p.Actions))[:p.ActionsCount]
+	for _, action := range actions {
+		recoveryActions = append(recoveryActions, RecoveryAction{Type: int(action.Type), Delay: time.Duration(action.Delay) * time.Millisecond})
+	}
+	return recoveryActions, nil
+}
+
+// ResetRecoveryActions deletes both reset period and array of failure actions.
+func (s *Service) ResetRecoveryActions() error {
+	actions := make([]windows.SC_ACTION, 1)
+	rActions := windows.SERVICE_FAILURE_ACTIONS{
+		Actions: &actions[0],
+	}
+	return windows.ChangeServiceConfig2(s.Handle, windows.SERVICE_CONFIG_FAILURE_ACTIONS, (*byte)(unsafe.Pointer(&rActions)))
+}
+
+// ResetPeriod is the time after which to reset the service failure
+// count to zero if there are no failures, in seconds.
+func (s *Service) ResetPeriod() (uint32, error) {
+	b, err := s.queryServiceConfig2(windows.SERVICE_CONFIG_FAILURE_ACTIONS)
+	if err != nil {
+		return 0, err
+	}
+	p := (*windows.SERVICE_FAILURE_ACTIONS)(unsafe.Pointer(&b[0]))
+	return p.ResetPeriod, nil
+}
+
+// SetRebootMessage sets service s reboot message.
+// If msg is "", the reboot message is deleted and no message is broadcast.
+func (s *Service) SetRebootMessage(msg string) error {
+	rActions := windows.SERVICE_FAILURE_ACTIONS{
+		RebootMsg: syscall.StringToUTF16Ptr(msg),
+	}
+	return windows.ChangeServiceConfig2(s.Handle, windows.SERVICE_CONFIG_FAILURE_ACTIONS, (*byte)(unsafe.Pointer(&rActions)))
+}
+
+// RebootMessage is broadcast to server users before rebooting in response to the ComputerReboot service controller action.
+func (s *Service) RebootMessage() (string, error) {
+	b, err := s.queryServiceConfig2(windows.SERVICE_CONFIG_FAILURE_ACTIONS)
+	if err != nil {
+		return "", err
+	}
+	p := (*windows.SERVICE_FAILURE_ACTIONS)(unsafe.Pointer(&b[0]))
+	return toString(p.RebootMsg), nil
+}
+
+// SetRecoveryCommand sets the command line of the process to execute in response to the RunCommand service controller action.
+// If cmd is "", the command is deleted and no program is run when the service fails.
+func (s *Service) SetRecoveryCommand(cmd string) error {
+	rActions := windows.SERVICE_FAILURE_ACTIONS{
+		Command: syscall.StringToUTF16Ptr(cmd),
+	}
+	return windows.ChangeServiceConfig2(s.Handle, windows.SERVICE_CONFIG_FAILURE_ACTIONS, (*byte)(unsafe.Pointer(&rActions)))
+}
+
+// RecoveryCommand is the command line of the process to execute in response to the RunCommand service controller action. This process runs under the same account as the service.
+func (s *Service) RecoveryCommand() (string, error) {
+	b, err := s.queryServiceConfig2(windows.SERVICE_CONFIG_FAILURE_ACTIONS)
+	if err != nil {
+		return "", err
+	}
+	p := (*windows.SERVICE_FAILURE_ACTIONS)(unsafe.Pointer(&b[0]))
+	return toString(p.Command), nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/mgr/service.go b/vendor/golang.org/x/sys/windows/svc/mgr/service.go
new file mode 100644
index 00000000..fdc46af5
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/mgr/service.go
@@ -0,0 +1,72 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package mgr
+
+import (
+	"syscall"
+
+	"golang.org/x/sys/windows"
+	"golang.org/x/sys/windows/svc"
+)
+
+// TODO(brainman): Use EnumDependentServices to enumerate dependent services.
+
+// Service is used to access Windows service.
+type Service struct {
+	Name   string
+	Handle windows.Handle
+}
+
+// Delete marks service s for deletion from the service control manager database.
+func (s *Service) Delete() error {
+	return windows.DeleteService(s.Handle)
+}
+
+// Close relinquish access to the service s.
+func (s *Service) Close() error {
+	return windows.CloseServiceHandle(s.Handle)
+}
+
+// Start starts service s.
+// args will be passed to svc.Handler.Execute.
+func (s *Service) Start(args ...string) error {
+	var p **uint16
+	if len(args) > 0 {
+		vs := make([]*uint16, len(args))
+		for i := range vs {
+			vs[i] = syscall.StringToUTF16Ptr(args[i])
+		}
+		p = &vs[0]
+	}
+	return windows.StartService(s.Handle, uint32(len(args)), p)
+}
+
+// Control sends state change request c to the servce s.
+func (s *Service) Control(c svc.Cmd) (svc.Status, error) {
+	var t windows.SERVICE_STATUS
+	err := windows.ControlService(s.Handle, uint32(c), &t)
+	if err != nil {
+		return svc.Status{}, err
+	}
+	return svc.Status{
+		State:   svc.State(t.CurrentState),
+		Accepts: svc.Accepted(t.ControlsAccepted),
+	}, nil
+}
+
+// Query returns current status of service s.
+func (s *Service) Query() (svc.Status, error) {
+	var t windows.SERVICE_STATUS
+	err := windows.QueryServiceStatus(s.Handle, &t)
+	if err != nil {
+		return svc.Status{}, err
+	}
+	return svc.Status{
+		State:   svc.State(t.CurrentState),
+		Accepts: svc.Accepted(t.ControlsAccepted),
+	}, nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/security.go b/vendor/golang.org/x/sys/windows/svc/security.go
new file mode 100644
index 00000000..6fbc9236
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/security.go
@@ -0,0 +1,62 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package svc
+
+import (
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+func allocSid(subAuth0 uint32) (*windows.SID, error) {
+	var sid *windows.SID
+	err := windows.AllocateAndInitializeSid(&windows.SECURITY_NT_AUTHORITY,
+		1, subAuth0, 0, 0, 0, 0, 0, 0, 0, &sid)
+	if err != nil {
+		return nil, err
+	}
+	return sid, nil
+}
+
+// IsAnInteractiveSession determines if calling process is running interactively.
+// It queries the process token for membership in the Interactive group.
+// http://stackoverflow.com/questions/2668851/how-do-i-detect-that-my-application-is-running-as-service-or-in-an-interactive-s
+func IsAnInteractiveSession() (bool, error) {
+	interSid, err := allocSid(windows.SECURITY_INTERACTIVE_RID)
+	if err != nil {
+		return false, err
+	}
+	defer windows.FreeSid(interSid)
+
+	serviceSid, err := allocSid(windows.SECURITY_SERVICE_RID)
+	if err != nil {
+		return false, err
+	}
+	defer windows.FreeSid(serviceSid)
+
+	t, err := windows.OpenCurrentProcessToken()
+	if err != nil {
+		return false, err
+	}
+	defer t.Close()
+
+	gs, err := t.GetTokenGroups()
+	if err != nil {
+		return false, err
+	}
+	p := unsafe.Pointer(&gs.Groups[0])
+	groups := (*[2 << 20]windows.SIDAndAttributes)(p)[:gs.GroupCount]
+	for _, g := range groups {
+		if windows.EqualSid(g.Sid, interSid) {
+			return true, nil
+		}
+		if windows.EqualSid(g.Sid, serviceSid) {
+			return false, nil
+		}
+	}
+	return false, nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/service.go b/vendor/golang.org/x/sys/windows/svc/service.go
new file mode 100644
index 00000000..cda26b54
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/service.go
@@ -0,0 +1,363 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// Package svc provides everything required to build Windows service.
+//
+package svc
+
+import (
+	"errors"
+	"runtime"
+	"syscall"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+// State describes service execution state (Stopped, Running and so on).
+type State uint32
+
+const (
+	Stopped         = State(windows.SERVICE_STOPPED)
+	StartPending    = State(windows.SERVICE_START_PENDING)
+	StopPending     = State(windows.SERVICE_STOP_PENDING)
+	Running         = State(windows.SERVICE_RUNNING)
+	ContinuePending = State(windows.SERVICE_CONTINUE_PENDING)
+	PausePending    = State(windows.SERVICE_PAUSE_PENDING)
+	Paused          = State(windows.SERVICE_PAUSED)
+)
+
+// Cmd represents service state change request. It is sent to a service
+// by the service manager, and should be actioned upon by the service.
+type Cmd uint32
+
+const (
+	Stop                  = Cmd(windows.SERVICE_CONTROL_STOP)
+	Pause                 = Cmd(windows.SERVICE_CONTROL_PAUSE)
+	Continue              = Cmd(windows.SERVICE_CONTROL_CONTINUE)
+	Interrogate           = Cmd(windows.SERVICE_CONTROL_INTERROGATE)
+	Shutdown              = Cmd(windows.SERVICE_CONTROL_SHUTDOWN)
+	ParamChange           = Cmd(windows.SERVICE_CONTROL_PARAMCHANGE)
+	NetBindAdd            = Cmd(windows.SERVICE_CONTROL_NETBINDADD)
+	NetBindRemove         = Cmd(windows.SERVICE_CONTROL_NETBINDREMOVE)
+	NetBindEnable         = Cmd(windows.SERVICE_CONTROL_NETBINDENABLE)
+	NetBindDisable        = Cmd(windows.SERVICE_CONTROL_NETBINDDISABLE)
+	DeviceEvent           = Cmd(windows.SERVICE_CONTROL_DEVICEEVENT)
+	HardwareProfileChange = Cmd(windows.SERVICE_CONTROL_HARDWAREPROFILECHANGE)
+	PowerEvent            = Cmd(windows.SERVICE_CONTROL_POWEREVENT)
+	SessionChange         = Cmd(windows.SERVICE_CONTROL_SESSIONCHANGE)
+)
+
+// Accepted is used to describe commands accepted by the service.
+// Note that Interrogate is always accepted.
+type Accepted uint32
+
+const (
+	AcceptStop                  = Accepted(windows.SERVICE_ACCEPT_STOP)
+	AcceptShutdown              = Accepted(windows.SERVICE_ACCEPT_SHUTDOWN)
+	AcceptPauseAndContinue      = Accepted(windows.SERVICE_ACCEPT_PAUSE_CONTINUE)
+	AcceptParamChange           = Accepted(windows.SERVICE_ACCEPT_PARAMCHANGE)
+	AcceptNetBindChange         = Accepted(windows.SERVICE_ACCEPT_NETBINDCHANGE)
+	AcceptHardwareProfileChange = Accepted(windows.SERVICE_ACCEPT_HARDWAREPROFILECHANGE)
+	AcceptPowerEvent            = Accepted(windows.SERVICE_ACCEPT_POWEREVENT)
+	AcceptSessionChange         = Accepted(windows.SERVICE_ACCEPT_SESSIONCHANGE)
+)
+
+// Status combines State and Accepted commands to fully describe running service.
+type Status struct {
+	State      State
+	Accepts    Accepted
+	CheckPoint uint32 // used to report progress during a lengthy operation
+	WaitHint   uint32 // estimated time required for a pending operation, in milliseconds
+}
+
+// ChangeRequest is sent to the service Handler to request service status change.
+type ChangeRequest struct {
+	Cmd           Cmd
+	EventType     uint32
+	EventData     uintptr
+	CurrentStatus Status
+}
+
+// Handler is the interface that must be implemented to build Windows service.
+type Handler interface {
+
+	// Execute will be called by the package code at the start of
+	// the service, and the service will exit once Execute completes.
+	// Inside Execute you must read service change requests from r and
+	// act accordingly. You must keep service control manager up to date
+	// about state of your service by writing into s as required.
+	// args contains service name followed by argument strings passed
+	// to the service.
+	// You can provide service exit code in exitCode return parameter,
+	// with 0 being "no error". You can also indicate if exit code,
+	// if any, is service specific or not by using svcSpecificEC
+	// parameter.
+	Execute(args []string, r <-chan ChangeRequest, s chan<- Status) (svcSpecificEC bool, exitCode uint32)
+}
+
+var (
+	// These are used by asm code.
+	goWaitsH                       uintptr
+	cWaitsH                        uintptr
+	ssHandle                       uintptr
+	sName                          *uint16
+	sArgc                          uintptr
+	sArgv                          **uint16
+	ctlHandlerExProc               uintptr
+	cSetEvent                      uintptr
+	cWaitForSingleObject           uintptr
+	cRegisterServiceCtrlHandlerExW uintptr
+)
+
+func init() {
+	k := syscall.MustLoadDLL("kernel32.dll")
+	cSetEvent = k.MustFindProc("SetEvent").Addr()
+	cWaitForSingleObject = k.MustFindProc("WaitForSingleObject").Addr()
+	a := syscall.MustLoadDLL("advapi32.dll")
+	cRegisterServiceCtrlHandlerExW = a.MustFindProc("RegisterServiceCtrlHandlerExW").Addr()
+}
+
+// The HandlerEx prototype also has a context pointer but since we don't use
+// it at start-up time we don't have to pass it over either.
+type ctlEvent struct {
+	cmd       Cmd
+	eventType uint32
+	eventData uintptr
+	errno     uint32
+}
+
+// service provides access to windows service api.
+type service struct {
+	name    string
+	h       windows.Handle
+	cWaits  *event
+	goWaits *event
+	c       chan ctlEvent
+	handler Handler
+}
+
+func newService(name string, handler Handler) (*service, error) {
+	var s service
+	var err error
+	s.name = name
+	s.c = make(chan ctlEvent)
+	s.handler = handler
+	s.cWaits, err = newEvent()
+	if err != nil {
+		return nil, err
+	}
+	s.goWaits, err = newEvent()
+	if err != nil {
+		s.cWaits.Close()
+		return nil, err
+	}
+	return &s, nil
+}
+
+func (s *service) close() error {
+	s.cWaits.Close()
+	s.goWaits.Close()
+	return nil
+}
+
+type exitCode struct {
+	isSvcSpecific bool
+	errno         uint32
+}
+
+func (s *service) updateStatus(status *Status, ec *exitCode) error {
+	if s.h == 0 {
+		return errors.New("updateStatus with no service status handle")
+	}
+	var t windows.SERVICE_STATUS
+	t.ServiceType = windows.SERVICE_WIN32_OWN_PROCESS
+	t.CurrentState = uint32(status.State)
+	if status.Accepts&AcceptStop != 0 {
+		t.ControlsAccepted |= windows.SERVICE_ACCEPT_STOP
+	}
+	if status.Accepts&AcceptShutdown != 0 {
+		t.ControlsAccepted |= windows.SERVICE_ACCEPT_SHUTDOWN
+	}
+	if status.Accepts&AcceptPauseAndContinue != 0 {
+		t.ControlsAccepted |= windows.SERVICE_ACCEPT_PAUSE_CONTINUE
+	}
+	if status.Accepts&AcceptParamChange != 0 {
+		t.ControlsAccepted |= windows.SERVICE_ACCEPT_PARAMCHANGE
+	}
+	if status.Accepts&AcceptNetBindChange != 0 {
+		t.ControlsAccepted |= windows.SERVICE_ACCEPT_NETBINDCHANGE
+	}
+	if status.Accepts&AcceptHardwareProfileChange != 0 {
+		t.ControlsAccepted |= windows.SERVICE_ACCEPT_HARDWAREPROFILECHANGE
+	}
+	if status.Accepts&AcceptPowerEvent != 0 {
+		t.ControlsAccepted |= windows.SERVICE_ACCEPT_POWEREVENT
+	}
+	if status.Accepts&AcceptSessionChange != 0 {
+		t.ControlsAccepted |= windows.SERVICE_ACCEPT_SESSIONCHANGE
+	}
+	if ec.errno == 0 {
+		t.Win32ExitCode = windows.NO_ERROR
+		t.ServiceSpecificExitCode = windows.NO_ERROR
+	} else if ec.isSvcSpecific {
+		t.Win32ExitCode = uint32(windows.ERROR_SERVICE_SPECIFIC_ERROR)
+		t.ServiceSpecificExitCode = ec.errno
+	} else {
+		t.Win32ExitCode = ec.errno
+		t.ServiceSpecificExitCode = windows.NO_ERROR
+	}
+	t.CheckPoint = status.CheckPoint
+	t.WaitHint = status.WaitHint
+	return windows.SetServiceStatus(s.h, &t)
+}
+
+const (
+	sysErrSetServiceStatusFailed = uint32(syscall.APPLICATION_ERROR) + iota
+	sysErrNewThreadInCallback
+)
+
+func (s *service) run() {
+	s.goWaits.Wait()
+	s.h = windows.Handle(ssHandle)
+	argv := (*[100]*int16)(unsafe.Pointer(sArgv))[:sArgc]
+	args := make([]string, len(argv))
+	for i, a := range argv {
+		args[i] = syscall.UTF16ToString((*[1 << 20]uint16)(unsafe.Pointer(a))[:])
+	}
+
+	cmdsToHandler := make(chan ChangeRequest)
+	changesFromHandler := make(chan Status)
+	exitFromHandler := make(chan exitCode)
+
+	go func() {
+		ss, errno := s.handler.Execute(args, cmdsToHandler, changesFromHandler)
+		exitFromHandler <- exitCode{ss, errno}
+	}()
+
+	status := Status{State: Stopped}
+	ec := exitCode{isSvcSpecific: true, errno: 0}
+	var outch chan ChangeRequest
+	inch := s.c
+	var cmd Cmd
+	var evtype uint32
+	var evdata uintptr
+loop:
+	for {
+		select {
+		case r := <-inch:
+			if r.errno != 0 {
+				ec.errno = r.errno
+				break loop
+			}
+			inch = nil
+			outch = cmdsToHandler
+			cmd = r.cmd
+			evtype = r.eventType
+			evdata = r.eventData
+		case outch <- ChangeRequest{cmd, evtype, evdata, status}:
+			inch = s.c
+			outch = nil
+		case c := <-changesFromHandler:
+			err := s.updateStatus(&c, &ec)
+			if err != nil {
+				// best suitable error number
+				ec.errno = sysErrSetServiceStatusFailed
+				if err2, ok := err.(syscall.Errno); ok {
+					ec.errno = uint32(err2)
+				}
+				break loop
+			}
+			status = c
+		case ec = <-exitFromHandler:
+			break loop
+		}
+	}
+
+	s.updateStatus(&Status{State: Stopped}, &ec)
+	s.cWaits.Set()
+}
+
+func newCallback(fn interface{}) (cb uintptr, err error) {
+	defer func() {
+		r := recover()
+		if r == nil {
+			return
+		}
+		cb = 0
+		switch v := r.(type) {
+		case string:
+			err = errors.New(v)
+		case error:
+			err = v
+		default:
+			err = errors.New("unexpected panic in syscall.NewCallback")
+		}
+	}()
+	return syscall.NewCallback(fn), nil
+}
+
+// BUG(brainman): There is no mechanism to run multiple services
+// inside one single executable. Perhaps, it can be overcome by
+// using RegisterServiceCtrlHandlerEx Windows api.
+
+// Run executes service name by calling appropriate handler function.
+func Run(name string, handler Handler) error {
+	runtime.LockOSThread()
+
+	tid := windows.GetCurrentThreadId()
+
+	s, err := newService(name, handler)
+	if err != nil {
+		return err
+	}
+
+	ctlHandler := func(ctl uint32, evtype uint32, evdata uintptr, context uintptr) uintptr {
+		e := ctlEvent{cmd: Cmd(ctl), eventType: evtype, eventData: evdata}
+		// We assume that this callback function is running on
+		// the same thread as Run. Nowhere in MS documentation
+		// I could find statement to guarantee that. So putting
+		// check here to verify, otherwise things will go bad
+		// quickly, if ignored.
+		i := windows.GetCurrentThreadId()
+		if i != tid {
+			e.errno = sysErrNewThreadInCallback
+		}
+		s.c <- e
+		// Always return NO_ERROR (0) for now.
+		return 0
+	}
+
+	var svcmain uintptr
+	getServiceMain(&svcmain)
+	t := []windows.SERVICE_TABLE_ENTRY{
+		{ServiceName: syscall.StringToUTF16Ptr(s.name), ServiceProc: svcmain},
+		{ServiceName: nil, ServiceProc: 0},
+	}
+
+	goWaitsH = uintptr(s.goWaits.h)
+	cWaitsH = uintptr(s.cWaits.h)
+	sName = t[0].ServiceName
+	ctlHandlerExProc, err = newCallback(ctlHandler)
+	if err != nil {
+		return err
+	}
+
+	go s.run()
+
+	err = windows.StartServiceCtrlDispatcher(&t[0])
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// StatusHandle returns service status handle. It is safe to call this function
+// from inside the Handler.Execute because then it is guaranteed to be set.
+// This code will have to change once multiple services are possible per process.
+func StatusHandle() windows.Handle {
+	return windows.Handle(ssHandle)
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/svc_test.go b/vendor/golang.org/x/sys/windows/svc/svc_test.go
new file mode 100644
index 00000000..60eb4478
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/svc_test.go
@@ -0,0 +1,135 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package svc_test
+
+import (
+	"fmt"
+	"io/ioutil"
+	"math/rand"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/mgr"
+)
+
+func getState(t *testing.T, s *mgr.Service) svc.State {
+	status, err := s.Query()
+	if err != nil {
+		t.Fatalf("Query(%s) failed: %s", s.Name, err)
+	}
+	return status.State
+}
+
+func testState(t *testing.T, s *mgr.Service, want svc.State) {
+	have := getState(t, s)
+	if have != want {
+		t.Fatalf("%s state is=%d want=%d", s.Name, have, want)
+	}
+}
+
+func waitState(t *testing.T, s *mgr.Service, want svc.State) {
+	for i := 0; ; i++ {
+		have := getState(t, s)
+		if have == want {
+			return
+		}
+		if i > 10 {
+			t.Fatalf("%s state is=%d, waiting timeout", s.Name, have)
+		}
+		time.Sleep(300 * time.Millisecond)
+	}
+}
+
+func TestExample(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode - it modifies system services")
+	}
+
+	const name = "myservice"
+
+	m, err := mgr.Connect()
+	if err != nil {
+		t.Fatalf("SCM connection failed: %s", err)
+	}
+	defer m.Disconnect()
+
+	dir, err := ioutil.TempDir("", "svc")
+	if err != nil {
+		t.Fatalf("failed to create temp directory: %v", err)
+	}
+	defer os.RemoveAll(dir)
+
+	exepath := filepath.Join(dir, "a.exe")
+	o, err := exec.Command("go", "build", "-o", exepath, "golang.org/x/sys/windows/svc/example").CombinedOutput()
+	if err != nil {
+		t.Fatalf("failed to build service program: %v\n%v", err, string(o))
+	}
+
+	s, err := m.OpenService(name)
+	if err == nil {
+		err = s.Delete()
+		if err != nil {
+			s.Close()
+			t.Fatalf("Delete failed: %s", err)
+		}
+		s.Close()
+	}
+	s, err = m.CreateService(name, exepath, mgr.Config{DisplayName: "my service"}, "is", "auto-started")
+	if err != nil {
+		t.Fatalf("CreateService(%s) failed: %v", name, err)
+	}
+	defer s.Close()
+
+	args := []string{"is", "manual-started", fmt.Sprintf("%d", rand.Int())}
+
+	testState(t, s, svc.Stopped)
+	err = s.Start(args...)
+	if err != nil {
+		t.Fatalf("Start(%s) failed: %s", s.Name, err)
+	}
+	waitState(t, s, svc.Running)
+	time.Sleep(1 * time.Second)
+
+	// testing deadlock from issues 4.
+	_, err = s.Control(svc.Interrogate)
+	if err != nil {
+		t.Fatalf("Control(%s) failed: %s", s.Name, err)
+	}
+	_, err = s.Control(svc.Interrogate)
+	if err != nil {
+		t.Fatalf("Control(%s) failed: %s", s.Name, err)
+	}
+	time.Sleep(1 * time.Second)
+
+	_, err = s.Control(svc.Stop)
+	if err != nil {
+		t.Fatalf("Control(%s) failed: %s", s.Name, err)
+	}
+	waitState(t, s, svc.Stopped)
+
+	err = s.Delete()
+	if err != nil {
+		t.Fatalf("Delete failed: %s", err)
+	}
+
+	cmd := `Get-Eventlog -LogName Application -Newest 100` +
+		` | Where Source -eq "myservice"` +
+		` | Select -first 10` +
+		` | Format-table -HideTableHeaders -property ReplacementStrings`
+	out, err := exec.Command("powershell", "-Command", cmd).CombinedOutput()
+	if err != nil {
+		t.Fatalf("powershell failed: %v\n%v", err, string(out))
+	}
+	if want := strings.Join(append([]string{name}, args...), "-"); !strings.Contains(string(out), want) {
+		t.Errorf("%q string does not contain %q", string(out), want)
+	}
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/sys_386.s b/vendor/golang.org/x/sys/windows/svc/sys_386.s
new file mode 100644
index 00000000..2c82a9d9
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/sys_386.s
@@ -0,0 +1,68 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// func servicemain(argc uint32, argv **uint16)
+TEXT ·servicemain(SB),7,$0
+	MOVL	argc+0(FP), AX
+	MOVL	AX, ·sArgc(SB)
+	MOVL	argv+4(FP), AX
+	MOVL	AX, ·sArgv(SB)
+
+	PUSHL	BP
+	PUSHL	BX
+	PUSHL	SI
+	PUSHL	DI
+
+	SUBL	$12, SP
+
+	MOVL	·sName(SB), AX
+	MOVL	AX, (SP)
+	MOVL	$·servicectlhandler(SB), AX
+	MOVL	AX, 4(SP)
+	MOVL	$0, 8(SP)
+	MOVL	·cRegisterServiceCtrlHandlerExW(SB), AX
+	MOVL	SP, BP
+	CALL	AX
+	MOVL	BP, SP
+	CMPL	AX, $0
+	JE	exit
+	MOVL	AX, ·ssHandle(SB)
+
+	MOVL	·goWaitsH(SB), AX
+	MOVL	AX, (SP)
+	MOVL	·cSetEvent(SB), AX
+	MOVL	SP, BP
+	CALL	AX
+	MOVL	BP, SP
+
+	MOVL	·cWaitsH(SB), AX
+	MOVL	AX, (SP)
+	MOVL	$-1, AX
+	MOVL	AX, 4(SP)
+	MOVL	·cWaitForSingleObject(SB), AX
+	MOVL	SP, BP
+	CALL	AX
+	MOVL	BP, SP
+
+exit:
+	ADDL	$12, SP
+
+	POPL	DI
+	POPL	SI
+	POPL	BX
+	POPL	BP
+
+	MOVL	0(SP), CX
+	ADDL	$12, SP
+	JMP	CX
+
+// I do not know why, but this seems to be the only way to call
+// ctlHandlerProc on Windows 7.
+
+// func servicectlhandler(ctl uint32, evtype uint32, evdata uintptr, context uintptr) uintptr {
+TEXT ·servicectlhandler(SB),7,$0
+	MOVL	·ctlHandlerExProc(SB), CX
+	JMP	CX
diff --git a/vendor/golang.org/x/sys/windows/svc/sys_amd64.s b/vendor/golang.org/x/sys/windows/svc/sys_amd64.s
new file mode 100644
index 00000000..bde25e9c
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/svc/sys_amd64.s
@@ -0,0 +1,42 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// func servicemain(argc uint32, argv **uint16)
+TEXT ·servicemain(SB),7,$0
+	MOVL	CX, ·sArgc(SB)
+	MOVQ	DX, ·sArgv(SB)
+
+	SUBQ	$32, SP		// stack for the first 4 syscall params
+
+	MOVQ	·sName(SB), CX
+	MOVQ	$·servicectlhandler(SB), DX
+	// BUG(pastarmovj): Figure out a way to pass in context in R8.
+	MOVQ	·cRegisterServiceCtrlHandlerExW(SB), AX
+	CALL	AX
+	CMPQ	AX, $0
+	JE	exit
+	MOVQ	AX, ·ssHandle(SB)
+
+	MOVQ	·goWaitsH(SB), CX
+	MOVQ	·cSetEvent(SB), AX
+	CALL	AX
+
+	MOVQ	·cWaitsH(SB), CX
+	MOVQ	$4294967295, DX
+	MOVQ	·cWaitForSingleObject(SB), AX
+	CALL	AX
+
+exit:
+	ADDQ	$32, SP
+	RET
+
+// I do not know why, but this seems to be the only way to call
+// ctlHandlerProc on Windows 7.
+
+// func ·servicectlhandler(ctl uint32, evtype uint32, evdata uintptr, context uintptr) uintptr {
+TEXT ·servicectlhandler(SB),7,$0
+	MOVQ	·ctlHandlerExProc(SB), AX
+	JMP	AX
diff --git a/vendor/golang.org/x/sys/windows/syscall.go b/vendor/golang.org/x/sys/windows/syscall.go
new file mode 100644
index 00000000..af828a91
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/syscall.go
@@ -0,0 +1,74 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// Package windows contains an interface to the low-level operating system
+// primitives. OS details vary depending on the underlying system, and
+// by default, godoc will display the OS-specific documentation for the current
+// system. If you want godoc to display syscall documentation for another
+// system, set $GOOS and $GOARCH to the desired system. For example, if
+// you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
+// to freebsd and $GOARCH to arm.
+//
+// The primary use of this package is inside other packages that provide a more
+// portable interface to the system, such as "os", "time" and "net".  Use
+// those packages rather than this one if you can.
+//
+// For details of the functions and data types in this package consult
+// the manuals for the appropriate operating system.
+//
+// These calls return err == nil to indicate success; otherwise
+// err represents an operating system error describing the failure and
+// holds a value of type syscall.Errno.
+package windows // import "golang.org/x/sys/windows"
+
+import (
+	"syscall"
+)
+
+// ByteSliceFromString returns a NUL-terminated slice of bytes
+// containing the text of s. If s contains a NUL byte at any
+// location, it returns (nil, syscall.EINVAL).
+func ByteSliceFromString(s string) ([]byte, error) {
+	for i := 0; i < len(s); i++ {
+		if s[i] == 0 {
+			return nil, syscall.EINVAL
+		}
+	}
+	a := make([]byte, len(s)+1)
+	copy(a, s)
+	return a, nil
+}
+
+// BytePtrFromString returns a pointer to a NUL-terminated array of
+// bytes containing the text of s. If s contains a NUL byte at any
+// location, it returns (nil, syscall.EINVAL).
+func BytePtrFromString(s string) (*byte, error) {
+	a, err := ByteSliceFromString(s)
+	if err != nil {
+		return nil, err
+	}
+	return &a[0], nil
+}
+
+// Single-word zero for use when we need a valid pointer to 0 bytes.
+// See mksyscall.pl.
+var _zero uintptr
+
+func (ts *Timespec) Unix() (sec int64, nsec int64) {
+	return int64(ts.Sec), int64(ts.Nsec)
+}
+
+func (tv *Timeval) Unix() (sec int64, nsec int64) {
+	return int64(tv.Sec), int64(tv.Usec) * 1000
+}
+
+func (ts *Timespec) Nano() int64 {
+	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
+}
+
+func (tv *Timeval) Nano() int64 {
+	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
+}
diff --git a/vendor/golang.org/x/sys/windows/syscall_test.go b/vendor/golang.org/x/sys/windows/syscall_test.go
new file mode 100644
index 00000000..d7009e44
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/syscall_test.go
@@ -0,0 +1,53 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package windows_test
+
+import (
+	"syscall"
+	"testing"
+
+	"golang.org/x/sys/windows"
+)
+
+func testSetGetenv(t *testing.T, key, value string) {
+	err := windows.Setenv(key, value)
+	if err != nil {
+		t.Fatalf("Setenv failed to set %q: %v", value, err)
+	}
+	newvalue, found := windows.Getenv(key)
+	if !found {
+		t.Fatalf("Getenv failed to find %v variable (want value %q)", key, value)
+	}
+	if newvalue != value {
+		t.Fatalf("Getenv(%v) = %q; want %q", key, newvalue, value)
+	}
+}
+
+func TestEnv(t *testing.T) {
+	testSetGetenv(t, "TESTENV", "AVALUE")
+	// make sure TESTENV gets set to "", not deleted
+	testSetGetenv(t, "TESTENV", "")
+}
+
+func TestGetProcAddressByOrdinal(t *testing.T) {
+	// Attempt calling shlwapi.dll:IsOS, resolving it by ordinal, as
+	// suggested in
+	// https://msdn.microsoft.com/en-us/library/windows/desktop/bb773795.aspx
+	h, err := windows.LoadLibrary("shlwapi.dll")
+	if err != nil {
+		t.Fatalf("Failed to load shlwapi.dll: %s", err)
+	}
+	procIsOS, err := windows.GetProcAddressByOrdinal(h, 437)
+	if err != nil {
+		t.Fatalf("Could not find shlwapi.dll:IsOS by ordinal: %s", err)
+	}
+	const OS_NT = 1
+	r, _, _ := syscall.Syscall(procIsOS, 1, OS_NT, 0, 0)
+	if r == 0 {
+		t.Error("shlwapi.dll:IsOS(OS_NT) returned 0, expected non-zero value")
+	}
+}
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
new file mode 100644
index 00000000..fd89e08e
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -0,0 +1,1155 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Windows system calls.
+
+package windows
+
+import (
+	errorspkg "errors"
+	"sync"
+	"syscall"
+	"unicode/utf16"
+	"unsafe"
+)
+
+type Handle uintptr
+
+const (
+	InvalidHandle = ^Handle(0)
+
+	// Flags for DefineDosDevice.
+	DDD_EXACT_MATCH_ON_REMOVE = 0x00000004
+	DDD_NO_BROADCAST_SYSTEM   = 0x00000008
+	DDD_RAW_TARGET_PATH       = 0x00000001
+	DDD_REMOVE_DEFINITION     = 0x00000002
+
+	// Return values for GetDriveType.
+	DRIVE_UNKNOWN     = 0
+	DRIVE_NO_ROOT_DIR = 1
+	DRIVE_REMOVABLE   = 2
+	DRIVE_FIXED       = 3
+	DRIVE_REMOTE      = 4
+	DRIVE_CDROM       = 5
+	DRIVE_RAMDISK     = 6
+
+	// File system flags from GetVolumeInformation and GetVolumeInformationByHandle.
+	FILE_CASE_SENSITIVE_SEARCH        = 0x00000001
+	FILE_CASE_PRESERVED_NAMES         = 0x00000002
+	FILE_FILE_COMPRESSION             = 0x00000010
+	FILE_DAX_VOLUME                   = 0x20000000
+	FILE_NAMED_STREAMS                = 0x00040000
+	FILE_PERSISTENT_ACLS              = 0x00000008
+	FILE_READ_ONLY_VOLUME             = 0x00080000
+	FILE_SEQUENTIAL_WRITE_ONCE        = 0x00100000
+	FILE_SUPPORTS_ENCRYPTION          = 0x00020000
+	FILE_SUPPORTS_EXTENDED_ATTRIBUTES = 0x00800000
+	FILE_SUPPORTS_HARD_LINKS          = 0x00400000
+	FILE_SUPPORTS_OBJECT_IDS          = 0x00010000
+	FILE_SUPPORTS_OPEN_BY_FILE_ID     = 0x01000000
+	FILE_SUPPORTS_REPARSE_POINTS      = 0x00000080
+	FILE_SUPPORTS_SPARSE_FILES        = 0x00000040
+	FILE_SUPPORTS_TRANSACTIONS        = 0x00200000
+	FILE_SUPPORTS_USN_JOURNAL         = 0x02000000
+	FILE_UNICODE_ON_DISK              = 0x00000004
+	FILE_VOLUME_IS_COMPRESSED         = 0x00008000
+	FILE_VOLUME_QUOTAS                = 0x00000020
+)
+
+// StringToUTF16 is deprecated. Use UTF16FromString instead.
+// If s contains a NUL byte this function panics instead of
+// returning an error.
+func StringToUTF16(s string) []uint16 {
+	a, err := UTF16FromString(s)
+	if err != nil {
+		panic("windows: string with NUL passed to StringToUTF16")
+	}
+	return a
+}
+
+// UTF16FromString returns the UTF-16 encoding of the UTF-8 string
+// s, with a terminating NUL added. If s contains a NUL byte at any
+// location, it returns (nil, syscall.EINVAL).
+func UTF16FromString(s string) ([]uint16, error) {
+	for i := 0; i < len(s); i++ {
+		if s[i] == 0 {
+			return nil, syscall.EINVAL
+		}
+	}
+	return utf16.Encode([]rune(s + "\x00")), nil
+}
+
+// UTF16ToString returns the UTF-8 encoding of the UTF-16 sequence s,
+// with a terminating NUL removed.
+func UTF16ToString(s []uint16) string {
+	for i, v := range s {
+		if v == 0 {
+			s = s[0:i]
+			break
+		}
+	}
+	return string(utf16.Decode(s))
+}
+
+// StringToUTF16Ptr is deprecated. Use UTF16PtrFromString instead.
+// If s contains a NUL byte this function panics instead of
+// returning an error.
+func StringToUTF16Ptr(s string) *uint16 { return &StringToUTF16(s)[0] }
+
+// UTF16PtrFromString returns pointer to the UTF-16 encoding of
+// the UTF-8 string s, with a terminating NUL added. If s
+// contains a NUL byte at any location, it returns (nil, syscall.EINVAL).
+func UTF16PtrFromString(s string) (*uint16, error) {
+	a, err := UTF16FromString(s)
+	if err != nil {
+		return nil, err
+	}
+	return &a[0], nil
+}
+
+func Getpagesize() int { return 4096 }
+
+// NewCallback converts a Go function to a function pointer conforming to the stdcall calling convention.
+// This is useful when interoperating with Windows code requiring callbacks.
+// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
+func NewCallback(fn interface{}) uintptr {
+	return syscall.NewCallback(fn)
+}
+
+// NewCallbackCDecl converts a Go function to a function pointer conforming to the cdecl calling convention.
+// This is useful when interoperating with Windows code requiring callbacks.
+// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
+func NewCallbackCDecl(fn interface{}) uintptr {
+	return syscall.NewCallbackCDecl(fn)
+}
+
+// windows api calls
+
+//sys	GetLastError() (lasterr error)
+//sys	LoadLibrary(libname string) (handle Handle, err error) = LoadLibraryW
+//sys	LoadLibraryEx(libname string, zero Handle, flags uintptr) (handle Handle, err error) = LoadLibraryExW
+//sys	FreeLibrary(handle Handle) (err error)
+//sys	GetProcAddress(module Handle, procname string) (proc uintptr, err error)
+//sys	GetVersion() (ver uint32, err error)
+//sys	FormatMessage(flags uint32, msgsrc uintptr, msgid uint32, langid uint32, buf []uint16, args *byte) (n uint32, err error) = FormatMessageW
+//sys	ExitProcess(exitcode uint32)
+//sys	CreateFile(name *uint16, access uint32, mode uint32, sa *SecurityAttributes, createmode uint32, attrs uint32, templatefile int32) (handle Handle, err error) [failretval==InvalidHandle] = CreateFileW
+//sys	ReadFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error)
+//sys	WriteFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error)
+//sys	SetFilePointer(handle Handle, lowoffset int32, highoffsetptr *int32, whence uint32) (newlowoffset uint32, err error) [failretval==0xffffffff]
+//sys	CloseHandle(handle Handle) (err error)
+//sys	GetStdHandle(stdhandle uint32) (handle Handle, err error) [failretval==InvalidHandle]
+//sys	SetStdHandle(stdhandle uint32, handle Handle) (err error)
+//sys	findFirstFile1(name *uint16, data *win32finddata1) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstFileW
+//sys	findNextFile1(handle Handle, data *win32finddata1) (err error) = FindNextFileW
+//sys	FindClose(handle Handle) (err error)
+//sys	GetFileInformationByHandle(handle Handle, data *ByHandleFileInformation) (err error)
+//sys	GetCurrentDirectory(buflen uint32, buf *uint16) (n uint32, err error) = GetCurrentDirectoryW
+//sys	SetCurrentDirectory(path *uint16) (err error) = SetCurrentDirectoryW
+//sys	CreateDirectory(path *uint16, sa *SecurityAttributes) (err error) = CreateDirectoryW
+//sys	RemoveDirectory(path *uint16) (err error) = RemoveDirectoryW
+//sys	DeleteFile(path *uint16) (err error) = DeleteFileW
+//sys	MoveFile(from *uint16, to *uint16) (err error) = MoveFileW
+//sys	MoveFileEx(from *uint16, to *uint16, flags uint32) (err error) = MoveFileExW
+//sys	GetComputerName(buf *uint16, n *uint32) (err error) = GetComputerNameW
+//sys	GetComputerNameEx(nametype uint32, buf *uint16, n *uint32) (err error) = GetComputerNameExW
+//sys	SetEndOfFile(handle Handle) (err error)
+//sys	GetSystemTimeAsFileTime(time *Filetime)
+//sys	GetSystemTimePreciseAsFileTime(time *Filetime)
+//sys	GetTimeZoneInformation(tzi *Timezoneinformation) (rc uint32, err error) [failretval==0xffffffff]
+//sys	CreateIoCompletionPort(filehandle Handle, cphandle Handle, key uint32, threadcnt uint32) (handle Handle, err error)
+//sys	GetQueuedCompletionStatus(cphandle Handle, qty *uint32, key *uint32, overlapped **Overlapped, timeout uint32) (err error)
+//sys	PostQueuedCompletionStatus(cphandle Handle, qty uint32, key uint32, overlapped *Overlapped) (err error)
+//sys	CancelIo(s Handle) (err error)
+//sys	CancelIoEx(s Handle, o *Overlapped) (err error)
+//sys	CreateProcess(appName *uint16, commandLine *uint16, procSecurity *SecurityAttributes, threadSecurity *SecurityAttributes, inheritHandles bool, creationFlags uint32, env *uint16, currentDir *uint16, startupInfo *StartupInfo, outProcInfo *ProcessInformation) (err error) = CreateProcessW
+//sys	OpenProcess(da uint32, inheritHandle bool, pid uint32) (handle Handle, err error)
+//sys	TerminateProcess(handle Handle, exitcode uint32) (err error)
+//sys	GetExitCodeProcess(handle Handle, exitcode *uint32) (err error)
+//sys	GetStartupInfo(startupInfo *StartupInfo) (err error) = GetStartupInfoW
+//sys	GetCurrentProcess() (pseudoHandle Handle, err error)
+//sys	GetProcessTimes(handle Handle, creationTime *Filetime, exitTime *Filetime, kernelTime *Filetime, userTime *Filetime) (err error)
+//sys	DuplicateHandle(hSourceProcessHandle Handle, hSourceHandle Handle, hTargetProcessHandle Handle, lpTargetHandle *Handle, dwDesiredAccess uint32, bInheritHandle bool, dwOptions uint32) (err error)
+//sys	WaitForSingleObject(handle Handle, waitMilliseconds uint32) (event uint32, err error) [failretval==0xffffffff]
+//sys	GetTempPath(buflen uint32, buf *uint16) (n uint32, err error) = GetTempPathW
+//sys	CreatePipe(readhandle *Handle, writehandle *Handle, sa *SecurityAttributes, size uint32) (err error)
+//sys	GetFileType(filehandle Handle) (n uint32, err error)
+//sys	CryptAcquireContext(provhandle *Handle, container *uint16, provider *uint16, provtype uint32, flags uint32) (err error) = advapi32.CryptAcquireContextW
+//sys	CryptReleaseContext(provhandle Handle, flags uint32) (err error) = advapi32.CryptReleaseContext
+//sys	CryptGenRandom(provhandle Handle, buflen uint32, buf *byte) (err error) = advapi32.CryptGenRandom
+//sys	GetEnvironmentStrings() (envs *uint16, err error) [failretval==nil] = kernel32.GetEnvironmentStringsW
+//sys	FreeEnvironmentStrings(envs *uint16) (err error) = kernel32.FreeEnvironmentStringsW
+//sys	GetEnvironmentVariable(name *uint16, buffer *uint16, size uint32) (n uint32, err error) = kernel32.GetEnvironmentVariableW
+//sys	SetEnvironmentVariable(name *uint16, value *uint16) (err error) = kernel32.SetEnvironmentVariableW
+//sys	SetFileTime(handle Handle, ctime *Filetime, atime *Filetime, wtime *Filetime) (err error)
+//sys	GetFileAttributes(name *uint16) (attrs uint32, err error) [failretval==INVALID_FILE_ATTRIBUTES] = kernel32.GetFileAttributesW
+//sys	SetFileAttributes(name *uint16, attrs uint32) (err error) = kernel32.SetFileAttributesW
+//sys	GetFileAttributesEx(name *uint16, level uint32, info *byte) (err error) = kernel32.GetFileAttributesExW
+//sys	GetCommandLine() (cmd *uint16) = kernel32.GetCommandLineW
+//sys	CommandLineToArgv(cmd *uint16, argc *int32) (argv *[8192]*[8192]uint16, err error) [failretval==nil] = shell32.CommandLineToArgvW
+//sys	LocalFree(hmem Handle) (handle Handle, err error) [failretval!=0]
+//sys	SetHandleInformation(handle Handle, mask uint32, flags uint32) (err error)
+//sys	FlushFileBuffers(handle Handle) (err error)
+//sys	GetFullPathName(path *uint16, buflen uint32, buf *uint16, fname **uint16) (n uint32, err error) = kernel32.GetFullPathNameW
+//sys	GetLongPathName(path *uint16, buf *uint16, buflen uint32) (n uint32, err error) = kernel32.GetLongPathNameW
+//sys	GetShortPathName(longpath *uint16, shortpath *uint16, buflen uint32) (n uint32, err error) = kernel32.GetShortPathNameW
+//sys	CreateFileMapping(fhandle Handle, sa *SecurityAttributes, prot uint32, maxSizeHigh uint32, maxSizeLow uint32, name *uint16) (handle Handle, err error) = kernel32.CreateFileMappingW
+//sys	MapViewOfFile(handle Handle, access uint32, offsetHigh uint32, offsetLow uint32, length uintptr) (addr uintptr, err error)
+//sys	UnmapViewOfFile(addr uintptr) (err error)
+//sys	FlushViewOfFile(addr uintptr, length uintptr) (err error)
+//sys	VirtualLock(addr uintptr, length uintptr) (err error)
+//sys	VirtualUnlock(addr uintptr, length uintptr) (err error)
+//sys	VirtualAlloc(address uintptr, size uintptr, alloctype uint32, protect uint32) (value uintptr, err error) = kernel32.VirtualAlloc
+//sys	VirtualFree(address uintptr, size uintptr, freetype uint32) (err error) = kernel32.VirtualFree
+//sys	VirtualProtect(address uintptr, size uintptr, newprotect uint32, oldprotect *uint32) (err error) = kernel32.VirtualProtect
+//sys	TransmitFile(s Handle, handle Handle, bytesToWrite uint32, bytsPerSend uint32, overlapped *Overlapped, transmitFileBuf *TransmitFileBuffers, flags uint32) (err error) = mswsock.TransmitFile
+//sys	ReadDirectoryChanges(handle Handle, buf *byte, buflen uint32, watchSubTree bool, mask uint32, retlen *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) = kernel32.ReadDirectoryChangesW
+//sys	CertOpenSystemStore(hprov Handle, name *uint16) (store Handle, err error) = crypt32.CertOpenSystemStoreW
+//sys   CertOpenStore(storeProvider uintptr, msgAndCertEncodingType uint32, cryptProv uintptr, flags uint32, para uintptr) (handle Handle, err error) [failretval==InvalidHandle] = crypt32.CertOpenStore
+//sys	CertEnumCertificatesInStore(store Handle, prevContext *CertContext) (context *CertContext, err error) [failretval==nil] = crypt32.CertEnumCertificatesInStore
+//sys   CertAddCertificateContextToStore(store Handle, certContext *CertContext, addDisposition uint32, storeContext **CertContext) (err error) = crypt32.CertAddCertificateContextToStore
+//sys	CertCloseStore(store Handle, flags uint32) (err error) = crypt32.CertCloseStore
+//sys   CertGetCertificateChain(engine Handle, leaf *CertContext, time *Filetime, additionalStore Handle, para *CertChainPara, flags uint32, reserved uintptr, chainCtx **CertChainContext) (err error) = crypt32.CertGetCertificateChain
+//sys   CertFreeCertificateChain(ctx *CertChainContext) = crypt32.CertFreeCertificateChain
+//sys   CertCreateCertificateContext(certEncodingType uint32, certEncoded *byte, encodedLen uint32) (context *CertContext, err error) [failretval==nil] = crypt32.CertCreateCertificateContext
+//sys   CertFreeCertificateContext(ctx *CertContext) (err error) = crypt32.CertFreeCertificateContext
+//sys   CertVerifyCertificateChainPolicy(policyOID uintptr, chain *CertChainContext, para *CertChainPolicyPara, status *CertChainPolicyStatus) (err error) = crypt32.CertVerifyCertificateChainPolicy
+//sys	RegOpenKeyEx(key Handle, subkey *uint16, options uint32, desiredAccess uint32, result *Handle) (regerrno error) = advapi32.RegOpenKeyExW
+//sys	RegCloseKey(key Handle) (regerrno error) = advapi32.RegCloseKey
+//sys	RegQueryInfoKey(key Handle, class *uint16, classLen *uint32, reserved *uint32, subkeysLen *uint32, maxSubkeyLen *uint32, maxClassLen *uint32, valuesLen *uint32, maxValueNameLen *uint32, maxValueLen *uint32, saLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegQueryInfoKeyW
+//sys	RegEnumKeyEx(key Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, class *uint16, classLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegEnumKeyExW
+//sys	RegQueryValueEx(key Handle, name *uint16, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) = advapi32.RegQueryValueExW
+//sys	getCurrentProcessId() (pid uint32) = kernel32.GetCurrentProcessId
+//sys	GetConsoleMode(console Handle, mode *uint32) (err error) = kernel32.GetConsoleMode
+//sys	SetConsoleMode(console Handle, mode uint32) (err error) = kernel32.SetConsoleMode
+//sys	GetConsoleScreenBufferInfo(console Handle, info *ConsoleScreenBufferInfo) (err error) = kernel32.GetConsoleScreenBufferInfo
+//sys	WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) = kernel32.WriteConsoleW
+//sys	ReadConsole(console Handle, buf *uint16, toread uint32, read *uint32, inputControl *byte) (err error) = kernel32.ReadConsoleW
+//sys	CreateToolhelp32Snapshot(flags uint32, processId uint32) (handle Handle, err error) [failretval==InvalidHandle] = kernel32.CreateToolhelp32Snapshot
+//sys	Process32First(snapshot Handle, procEntry *ProcessEntry32) (err error) = kernel32.Process32FirstW
+//sys	Process32Next(snapshot Handle, procEntry *ProcessEntry32) (err error) = kernel32.Process32NextW
+//sys	DeviceIoControl(handle Handle, ioControlCode uint32, inBuffer *byte, inBufferSize uint32, outBuffer *byte, outBufferSize uint32, bytesReturned *uint32, overlapped *Overlapped) (err error)
+// This function returns 1 byte BOOLEAN rather than the 4 byte BOOL.
+//sys	CreateSymbolicLink(symlinkfilename *uint16, targetfilename *uint16, flags uint32) (err error) [failretval&0xff==0] = CreateSymbolicLinkW
+//sys	CreateHardLink(filename *uint16, existingfilename *uint16, reserved uintptr) (err error) [failretval&0xff==0] = CreateHardLinkW
+//sys	GetCurrentThreadId() (id uint32)
+//sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle Handle, err error) = kernel32.CreateEventW
+//sys	CreateEventEx(eventAttrs *SecurityAttributes, name *uint16, flags uint32, desiredAccess uint32) (handle Handle, err error) = kernel32.CreateEventExW
+//sys	OpenEvent(desiredAccess uint32, inheritHandle bool, name *uint16) (handle Handle, err error) = kernel32.OpenEventW
+//sys	SetEvent(event Handle) (err error) = kernel32.SetEvent
+//sys	ResetEvent(event Handle) (err error) = kernel32.ResetEvent
+//sys	PulseEvent(event Handle) (err error) = kernel32.PulseEvent
+
+// Volume Management Functions
+//sys	DefineDosDevice(flags uint32, deviceName *uint16, targetPath *uint16) (err error) = DefineDosDeviceW
+//sys	DeleteVolumeMountPoint(volumeMountPoint *uint16) (err error) = DeleteVolumeMountPointW
+//sys	FindFirstVolume(volumeName *uint16, bufferLength uint32) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstVolumeW
+//sys	FindFirstVolumeMountPoint(rootPathName *uint16, volumeMountPoint *uint16, bufferLength uint32) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstVolumeMountPointW
+//sys	FindNextVolume(findVolume Handle, volumeName *uint16, bufferLength uint32) (err error) = FindNextVolumeW
+//sys	FindNextVolumeMountPoint(findVolumeMountPoint Handle, volumeMountPoint *uint16, bufferLength uint32) (err error) = FindNextVolumeMountPointW
+//sys	FindVolumeClose(findVolume Handle) (err error)
+//sys	FindVolumeMountPointClose(findVolumeMountPoint Handle) (err error)
+//sys	GetDriveType(rootPathName *uint16) (driveType uint32) = GetDriveTypeW
+//sys	GetLogicalDrives() (drivesBitMask uint32, err error) [failretval==0]
+//sys	GetLogicalDriveStrings(bufferLength uint32, buffer *uint16) (n uint32, err error) [failretval==0] = GetLogicalDriveStringsW
+//sys	GetVolumeInformation(rootPathName *uint16, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) = GetVolumeInformationW
+//sys	GetVolumeInformationByHandle(file Handle, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) = GetVolumeInformationByHandleW
+//sys	GetVolumeNameForVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16, bufferlength uint32) (err error) = GetVolumeNameForVolumeMountPointW
+//sys	GetVolumePathName(fileName *uint16, volumePathName *uint16, bufferLength uint32) (err error) = GetVolumePathNameW
+//sys	GetVolumePathNamesForVolumeName(volumeName *uint16, volumePathNames *uint16, bufferLength uint32, returnLength *uint32) (err error) = GetVolumePathNamesForVolumeNameW
+//sys	QueryDosDevice(deviceName *uint16, targetPath *uint16, max uint32) (n uint32, err error) [failretval==0] = QueryDosDeviceW
+//sys	SetVolumeLabel(rootPathName *uint16, volumeName *uint16) (err error) = SetVolumeLabelW
+//sys	SetVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16) (err error) = SetVolumeMountPointW
+
+// syscall interface implementation for other packages
+
+// GetProcAddressByOrdinal retrieves the address of the exported
+// function from module by ordinal.
+func GetProcAddressByOrdinal(module Handle, ordinal uintptr) (proc uintptr, err error) {
+	r0, _, e1 := syscall.Syscall(procGetProcAddress.Addr(), 2, uintptr(module), ordinal, 0)
+	proc = uintptr(r0)
+	if proc == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func Exit(code int) { ExitProcess(uint32(code)) }
+
+func makeInheritSa() *SecurityAttributes {
+	var sa SecurityAttributes
+	sa.Length = uint32(unsafe.Sizeof(sa))
+	sa.InheritHandle = 1
+	return &sa
+}
+
+func Open(path string, mode int, perm uint32) (fd Handle, err error) {
+	if len(path) == 0 {
+		return InvalidHandle, ERROR_FILE_NOT_FOUND
+	}
+	pathp, err := UTF16PtrFromString(path)
+	if err != nil {
+		return InvalidHandle, err
+	}
+	var access uint32
+	switch mode & (O_RDONLY | O_WRONLY | O_RDWR) {
+	case O_RDONLY:
+		access = GENERIC_READ
+	case O_WRONLY:
+		access = GENERIC_WRITE
+	case O_RDWR:
+		access = GENERIC_READ | GENERIC_WRITE
+	}
+	if mode&O_CREAT != 0 {
+		access |= GENERIC_WRITE
+	}
+	if mode&O_APPEND != 0 {
+		access &^= GENERIC_WRITE
+		access |= FILE_APPEND_DATA
+	}
+	sharemode := uint32(FILE_SHARE_READ | FILE_SHARE_WRITE)
+	var sa *SecurityAttributes
+	if mode&O_CLOEXEC == 0 {
+		sa = makeInheritSa()
+	}
+	var createmode uint32
+	switch {
+	case mode&(O_CREAT|O_EXCL) == (O_CREAT | O_EXCL):
+		createmode = CREATE_NEW
+	case mode&(O_CREAT|O_TRUNC) == (O_CREAT | O_TRUNC):
+		createmode = CREATE_ALWAYS
+	case mode&O_CREAT == O_CREAT:
+		createmode = OPEN_ALWAYS
+	case mode&O_TRUNC == O_TRUNC:
+		createmode = TRUNCATE_EXISTING
+	default:
+		createmode = OPEN_EXISTING
+	}
+	h, e := CreateFile(pathp, access, sharemode, sa, createmode, FILE_ATTRIBUTE_NORMAL, 0)
+	return h, e
+}
+
+func Read(fd Handle, p []byte) (n int, err error) {
+	var done uint32
+	e := ReadFile(fd, p, &done, nil)
+	if e != nil {
+		if e == ERROR_BROKEN_PIPE {
+			// NOTE(brainman): work around ERROR_BROKEN_PIPE is returned on reading EOF from stdin
+			return 0, nil
+		}
+		return 0, e
+	}
+	if raceenabled {
+		if done > 0 {
+			raceWriteRange(unsafe.Pointer(&p[0]), int(done))
+		}
+		raceAcquire(unsafe.Pointer(&ioSync))
+	}
+	return int(done), nil
+}
+
+func Write(fd Handle, p []byte) (n int, err error) {
+	if raceenabled {
+		raceReleaseMerge(unsafe.Pointer(&ioSync))
+	}
+	var done uint32
+	e := WriteFile(fd, p, &done, nil)
+	if e != nil {
+		return 0, e
+	}
+	if raceenabled && done > 0 {
+		raceReadRange(unsafe.Pointer(&p[0]), int(done))
+	}
+	return int(done), nil
+}
+
+var ioSync int64
+
+func Seek(fd Handle, offset int64, whence int) (newoffset int64, err error) {
+	var w uint32
+	switch whence {
+	case 0:
+		w = FILE_BEGIN
+	case 1:
+		w = FILE_CURRENT
+	case 2:
+		w = FILE_END
+	}
+	hi := int32(offset >> 32)
+	lo := int32(offset)
+	// use GetFileType to check pipe, pipe can't do seek
+	ft, _ := GetFileType(fd)
+	if ft == FILE_TYPE_PIPE {
+		return 0, syscall.EPIPE
+	}
+	rlo, e := SetFilePointer(fd, lo, &hi, w)
+	if e != nil {
+		return 0, e
+	}
+	return int64(hi)<<32 + int64(rlo), nil
+}
+
+func Close(fd Handle) (err error) {
+	return CloseHandle(fd)
+}
+
+var (
+	Stdin  = getStdHandle(STD_INPUT_HANDLE)
+	Stdout = getStdHandle(STD_OUTPUT_HANDLE)
+	Stderr = getStdHandle(STD_ERROR_HANDLE)
+)
+
+func getStdHandle(stdhandle uint32) (fd Handle) {
+	r, _ := GetStdHandle(stdhandle)
+	CloseOnExec(r)
+	return r
+}
+
+const ImplementsGetwd = true
+
+func Getwd() (wd string, err error) {
+	b := make([]uint16, 300)
+	n, e := GetCurrentDirectory(uint32(len(b)), &b[0])
+	if e != nil {
+		return "", e
+	}
+	return string(utf16.Decode(b[0:n])), nil
+}
+
+func Chdir(path string) (err error) {
+	pathp, err := UTF16PtrFromString(path)
+	if err != nil {
+		return err
+	}
+	return SetCurrentDirectory(pathp)
+}
+
+func Mkdir(path string, mode uint32) (err error) {
+	pathp, err := UTF16PtrFromString(path)
+	if err != nil {
+		return err
+	}
+	return CreateDirectory(pathp, nil)
+}
+
+func Rmdir(path string) (err error) {
+	pathp, err := UTF16PtrFromString(path)
+	if err != nil {
+		return err
+	}
+	return RemoveDirectory(pathp)
+}
+
+func Unlink(path string) (err error) {
+	pathp, err := UTF16PtrFromString(path)
+	if err != nil {
+		return err
+	}
+	return DeleteFile(pathp)
+}
+
+func Rename(oldpath, newpath string) (err error) {
+	from, err := UTF16PtrFromString(oldpath)
+	if err != nil {
+		return err
+	}
+	to, err := UTF16PtrFromString(newpath)
+	if err != nil {
+		return err
+	}
+	return MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING)
+}
+
+func ComputerName() (name string, err error) {
+	var n uint32 = MAX_COMPUTERNAME_LENGTH + 1
+	b := make([]uint16, n)
+	e := GetComputerName(&b[0], &n)
+	if e != nil {
+		return "", e
+	}
+	return string(utf16.Decode(b[0:n])), nil
+}
+
+func Ftruncate(fd Handle, length int64) (err error) {
+	curoffset, e := Seek(fd, 0, 1)
+	if e != nil {
+		return e
+	}
+	defer Seek(fd, curoffset, 0)
+	_, e = Seek(fd, length, 0)
+	if e != nil {
+		return e
+	}
+	e = SetEndOfFile(fd)
+	if e != nil {
+		return e
+	}
+	return nil
+}
+
+func Gettimeofday(tv *Timeval) (err error) {
+	var ft Filetime
+	GetSystemTimeAsFileTime(&ft)
+	*tv = NsecToTimeval(ft.Nanoseconds())
+	return nil
+}
+
+func Pipe(p []Handle) (err error) {
+	if len(p) != 2 {
+		return syscall.EINVAL
+	}
+	var r, w Handle
+	e := CreatePipe(&r, &w, makeInheritSa(), 0)
+	if e != nil {
+		return e
+	}
+	p[0] = r
+	p[1] = w
+	return nil
+}
+
+func Utimes(path string, tv []Timeval) (err error) {
+	if len(tv) != 2 {
+		return syscall.EINVAL
+	}
+	pathp, e := UTF16PtrFromString(path)
+	if e != nil {
+		return e
+	}
+	h, e := CreateFile(pathp,
+		FILE_WRITE_ATTRIBUTES, FILE_SHARE_WRITE, nil,
+		OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0)
+	if e != nil {
+		return e
+	}
+	defer Close(h)
+	a := NsecToFiletime(tv[0].Nanoseconds())
+	w := NsecToFiletime(tv[1].Nanoseconds())
+	return SetFileTime(h, nil, &a, &w)
+}
+
+func UtimesNano(path string, ts []Timespec) (err error) {
+	if len(ts) != 2 {
+		return syscall.EINVAL
+	}
+	pathp, e := UTF16PtrFromString(path)
+	if e != nil {
+		return e
+	}
+	h, e := CreateFile(pathp,
+		FILE_WRITE_ATTRIBUTES, FILE_SHARE_WRITE, nil,
+		OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0)
+	if e != nil {
+		return e
+	}
+	defer Close(h)
+	a := NsecToFiletime(TimespecToNsec(ts[0]))
+	w := NsecToFiletime(TimespecToNsec(ts[1]))
+	return SetFileTime(h, nil, &a, &w)
+}
+
+func Fsync(fd Handle) (err error) {
+	return FlushFileBuffers(fd)
+}
+
+func Chmod(path string, mode uint32) (err error) {
+	if mode == 0 {
+		return syscall.EINVAL
+	}
+	p, e := UTF16PtrFromString(path)
+	if e != nil {
+		return e
+	}
+	attrs, e := GetFileAttributes(p)
+	if e != nil {
+		return e
+	}
+	if mode&S_IWRITE != 0 {
+		attrs &^= FILE_ATTRIBUTE_READONLY
+	} else {
+		attrs |= FILE_ATTRIBUTE_READONLY
+	}
+	return SetFileAttributes(p, attrs)
+}
+
+func LoadGetSystemTimePreciseAsFileTime() error {
+	return procGetSystemTimePreciseAsFileTime.Find()
+}
+
+func LoadCancelIoEx() error {
+	return procCancelIoEx.Find()
+}
+
+func LoadSetFileCompletionNotificationModes() error {
+	return procSetFileCompletionNotificationModes.Find()
+}
+
+// net api calls
+
+const socket_error = uintptr(^uint32(0))
+
+//sys	WSAStartup(verreq uint32, data *WSAData) (sockerr error) = ws2_32.WSAStartup
+//sys	WSACleanup() (err error) [failretval==socket_error] = ws2_32.WSACleanup
+//sys	WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbob uint32, cbbr *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) [failretval==socket_error] = ws2_32.WSAIoctl
+//sys	socket(af int32, typ int32, protocol int32) (handle Handle, err error) [failretval==InvalidHandle] = ws2_32.socket
+//sys	Setsockopt(s Handle, level int32, optname int32, optval *byte, optlen int32) (err error) [failretval==socket_error] = ws2_32.setsockopt
+//sys	Getsockopt(s Handle, level int32, optname int32, optval *byte, optlen *int32) (err error) [failretval==socket_error] = ws2_32.getsockopt
+//sys	bind(s Handle, name unsafe.Pointer, namelen int32) (err error) [failretval==socket_error] = ws2_32.bind
+//sys	connect(s Handle, name unsafe.Pointer, namelen int32) (err error) [failretval==socket_error] = ws2_32.connect
+//sys	getsockname(s Handle, rsa *RawSockaddrAny, addrlen *int32) (err error) [failretval==socket_error] = ws2_32.getsockname
+//sys	getpeername(s Handle, rsa *RawSockaddrAny, addrlen *int32) (err error) [failretval==socket_error] = ws2_32.getpeername
+//sys	listen(s Handle, backlog int32) (err error) [failretval==socket_error] = ws2_32.listen
+//sys	shutdown(s Handle, how int32) (err error) [failretval==socket_error] = ws2_32.shutdown
+//sys	Closesocket(s Handle) (err error) [failretval==socket_error] = ws2_32.closesocket
+//sys	AcceptEx(ls Handle, as Handle, buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, recvd *uint32, overlapped *Overlapped) (err error) = mswsock.AcceptEx
+//sys	GetAcceptExSockaddrs(buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, lrsa **RawSockaddrAny, lrsalen *int32, rrsa **RawSockaddrAny, rrsalen *int32) = mswsock.GetAcceptExSockaddrs
+//sys	WSARecv(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSARecv
+//sys	WSASend(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSASend
+//sys	WSARecvFrom(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32,  from *RawSockaddrAny, fromlen *int32, overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSARecvFrom
+//sys	WSASendTo(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to *RawSockaddrAny, tolen int32,  overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSASendTo
+//sys	GetHostByName(name string) (h *Hostent, err error) [failretval==nil] = ws2_32.gethostbyname
+//sys	GetServByName(name string, proto string) (s *Servent, err error) [failretval==nil] = ws2_32.getservbyname
+//sys	Ntohs(netshort uint16) (u uint16) = ws2_32.ntohs
+//sys	GetProtoByName(name string) (p *Protoent, err error) [failretval==nil] = ws2_32.getprotobyname
+//sys	DnsQuery(name string, qtype uint16, options uint32, extra *byte, qrs **DNSRecord, pr *byte) (status error) = dnsapi.DnsQuery_W
+//sys	DnsRecordListFree(rl *DNSRecord, freetype uint32) = dnsapi.DnsRecordListFree
+//sys	DnsNameCompare(name1 *uint16, name2 *uint16) (same bool) = dnsapi.DnsNameCompare_W
+//sys	GetAddrInfoW(nodename *uint16, servicename *uint16, hints *AddrinfoW, result **AddrinfoW) (sockerr error) = ws2_32.GetAddrInfoW
+//sys	FreeAddrInfoW(addrinfo *AddrinfoW) = ws2_32.FreeAddrInfoW
+//sys	GetIfEntry(pIfRow *MibIfRow) (errcode error) = iphlpapi.GetIfEntry
+//sys	GetAdaptersInfo(ai *IpAdapterInfo, ol *uint32) (errcode error) = iphlpapi.GetAdaptersInfo
+//sys	SetFileCompletionNotificationModes(handle Handle, flags uint8) (err error) = kernel32.SetFileCompletionNotificationModes
+//sys	WSAEnumProtocols(protocols *int32, protocolBuffer *WSAProtocolInfo, bufferLength *uint32) (n int32, err error) [failretval==-1] = ws2_32.WSAEnumProtocolsW
+//sys	GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizePointer *uint32) (errcode error) = iphlpapi.GetAdaptersAddresses
+//sys	GetACP() (acp uint32) = kernel32.GetACP
+//sys	MultiByteToWideChar(codePage uint32, dwFlags uint32, str *byte, nstr int32, wchar *uint16, nwchar int32) (nwrite int32, err error) = kernel32.MultiByteToWideChar
+
+// For testing: clients can set this flag to force
+// creation of IPv6 sockets to return EAFNOSUPPORT.
+var SocketDisableIPv6 bool
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type Sockaddr interface {
+	sockaddr() (ptr unsafe.Pointer, len int32, err error) // lowercase; only we can define Sockaddrs
+}
+
+type SockaddrInet4 struct {
+	Port int
+	Addr [4]byte
+	raw  RawSockaddrInet4
+}
+
+func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, int32, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, syscall.EINVAL
+	}
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), int32(unsafe.Sizeof(sa.raw)), nil
+}
+
+type SockaddrInet6 struct {
+	Port   int
+	ZoneId uint32
+	Addr   [16]byte
+	raw    RawSockaddrInet6
+}
+
+func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, int32, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, syscall.EINVAL
+	}
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	sa.raw.Scope_id = sa.ZoneId
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), int32(unsafe.Sizeof(sa.raw)), nil
+}
+
+type SockaddrUnix struct {
+	Name string
+}
+
+func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, int32, error) {
+	// TODO(brainman): implement SockaddrUnix.sockaddr()
+	return nil, 0, syscall.EWINDOWS
+}
+
+func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) {
+	switch rsa.Addr.Family {
+	case AF_UNIX:
+		return nil, syscall.EWINDOWS
+
+	case AF_INET:
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_INET6:
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		sa.ZoneId = pp.Scope_id
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+	}
+	return nil, syscall.EAFNOSUPPORT
+}
+
+func Socket(domain, typ, proto int) (fd Handle, err error) {
+	if domain == AF_INET6 && SocketDisableIPv6 {
+		return InvalidHandle, syscall.EAFNOSUPPORT
+	}
+	return socket(int32(domain), int32(typ), int32(proto))
+}
+
+func SetsockoptInt(fd Handle, level, opt int, value int) (err error) {
+	v := int32(value)
+	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(&v)), int32(unsafe.Sizeof(v)))
+}
+
+func Bind(fd Handle, sa Sockaddr) (err error) {
+	ptr, n, err := sa.sockaddr()
+	if err != nil {
+		return err
+	}
+	return bind(fd, ptr, n)
+}
+
+func Connect(fd Handle, sa Sockaddr) (err error) {
+	ptr, n, err := sa.sockaddr()
+	if err != nil {
+		return err
+	}
+	return connect(fd, ptr, n)
+}
+
+func Getsockname(fd Handle) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	l := int32(unsafe.Sizeof(rsa))
+	if err = getsockname(fd, &rsa, &l); err != nil {
+		return
+	}
+	return rsa.Sockaddr()
+}
+
+func Getpeername(fd Handle) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	l := int32(unsafe.Sizeof(rsa))
+	if err = getpeername(fd, &rsa, &l); err != nil {
+		return
+	}
+	return rsa.Sockaddr()
+}
+
+func Listen(s Handle, n int) (err error) {
+	return listen(s, int32(n))
+}
+
+func Shutdown(fd Handle, how int) (err error) {
+	return shutdown(fd, int32(how))
+}
+
+func WSASendto(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to Sockaddr, overlapped *Overlapped, croutine *byte) (err error) {
+	rsa, l, err := to.sockaddr()
+	if err != nil {
+		return err
+	}
+	return WSASendTo(s, bufs, bufcnt, sent, flags, (*RawSockaddrAny)(unsafe.Pointer(rsa)), l, overlapped, croutine)
+}
+
+func LoadGetAddrInfo() error {
+	return procGetAddrInfoW.Find()
+}
+
+var connectExFunc struct {
+	once sync.Once
+	addr uintptr
+	err  error
+}
+
+func LoadConnectEx() error {
+	connectExFunc.once.Do(func() {
+		var s Handle
+		s, connectExFunc.err = Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)
+		if connectExFunc.err != nil {
+			return
+		}
+		defer CloseHandle(s)
+		var n uint32
+		connectExFunc.err = WSAIoctl(s,
+			SIO_GET_EXTENSION_FUNCTION_POINTER,
+			(*byte)(unsafe.Pointer(&WSAID_CONNECTEX)),
+			uint32(unsafe.Sizeof(WSAID_CONNECTEX)),
+			(*byte)(unsafe.Pointer(&connectExFunc.addr)),
+			uint32(unsafe.Sizeof(connectExFunc.addr)),
+			&n, nil, 0)
+	})
+	return connectExFunc.err
+}
+
+func connectEx(s Handle, name unsafe.Pointer, namelen int32, sendBuf *byte, sendDataLen uint32, bytesSent *uint32, overlapped *Overlapped) (err error) {
+	r1, _, e1 := syscall.Syscall9(connectExFunc.addr, 7, uintptr(s), uintptr(name), uintptr(namelen), uintptr(unsafe.Pointer(sendBuf)), uintptr(sendDataLen), uintptr(unsafe.Pointer(bytesSent)), uintptr(unsafe.Pointer(overlapped)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = error(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ConnectEx(fd Handle, sa Sockaddr, sendBuf *byte, sendDataLen uint32, bytesSent *uint32, overlapped *Overlapped) error {
+	err := LoadConnectEx()
+	if err != nil {
+		return errorspkg.New("failed to find ConnectEx: " + err.Error())
+	}
+	ptr, n, err := sa.sockaddr()
+	if err != nil {
+		return err
+	}
+	return connectEx(fd, ptr, n, sendBuf, sendDataLen, bytesSent, overlapped)
+}
+
+var sendRecvMsgFunc struct {
+	once     sync.Once
+	sendAddr uintptr
+	recvAddr uintptr
+	err      error
+}
+
+func loadWSASendRecvMsg() error {
+	sendRecvMsgFunc.once.Do(func() {
+		var s Handle
+		s, sendRecvMsgFunc.err = Socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)
+		if sendRecvMsgFunc.err != nil {
+			return
+		}
+		defer CloseHandle(s)
+		var n uint32
+		sendRecvMsgFunc.err = WSAIoctl(s,
+			SIO_GET_EXTENSION_FUNCTION_POINTER,
+			(*byte)(unsafe.Pointer(&WSAID_WSARECVMSG)),
+			uint32(unsafe.Sizeof(WSAID_WSARECVMSG)),
+			(*byte)(unsafe.Pointer(&sendRecvMsgFunc.recvAddr)),
+			uint32(unsafe.Sizeof(sendRecvMsgFunc.recvAddr)),
+			&n, nil, 0)
+		if sendRecvMsgFunc.err != nil {
+			return
+		}
+		sendRecvMsgFunc.err = WSAIoctl(s,
+			SIO_GET_EXTENSION_FUNCTION_POINTER,
+			(*byte)(unsafe.Pointer(&WSAID_WSASENDMSG)),
+			uint32(unsafe.Sizeof(WSAID_WSASENDMSG)),
+			(*byte)(unsafe.Pointer(&sendRecvMsgFunc.sendAddr)),
+			uint32(unsafe.Sizeof(sendRecvMsgFunc.sendAddr)),
+			&n, nil, 0)
+	})
+	return sendRecvMsgFunc.err
+}
+
+func WSASendMsg(fd Handle, msg *WSAMsg, flags uint32, bytesSent *uint32, overlapped *Overlapped, croutine *byte) error {
+	err := loadWSASendRecvMsg()
+	if err != nil {
+		return err
+	}
+	r1, _, e1 := syscall.Syscall6(sendRecvMsgFunc.sendAddr, 6, uintptr(fd), uintptr(unsafe.Pointer(msg)), uintptr(flags), uintptr(unsafe.Pointer(bytesSent)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return err
+}
+
+func WSARecvMsg(fd Handle, msg *WSAMsg, bytesReceived *uint32, overlapped *Overlapped, croutine *byte) error {
+	err := loadWSASendRecvMsg()
+	if err != nil {
+		return err
+	}
+	r1, _, e1 := syscall.Syscall6(sendRecvMsgFunc.recvAddr, 5, uintptr(fd), uintptr(unsafe.Pointer(msg)), uintptr(unsafe.Pointer(bytesReceived)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return err
+}
+
+// Invented structures to support what package os expects.
+type Rusage struct {
+	CreationTime Filetime
+	ExitTime     Filetime
+	KernelTime   Filetime
+	UserTime     Filetime
+}
+
+type WaitStatus struct {
+	ExitCode uint32
+}
+
+func (w WaitStatus) Exited() bool { return true }
+
+func (w WaitStatus) ExitStatus() int { return int(w.ExitCode) }
+
+func (w WaitStatus) Signal() Signal { return -1 }
+
+func (w WaitStatus) CoreDump() bool { return false }
+
+func (w WaitStatus) Stopped() bool { return false }
+
+func (w WaitStatus) Continued() bool { return false }
+
+func (w WaitStatus) StopSignal() Signal { return -1 }
+
+func (w WaitStatus) Signaled() bool { return false }
+
+func (w WaitStatus) TrapCause() int { return -1 }
+
+// Timespec is an invented structure on Windows, but here for
+// consistency with the corresponding package for other operating systems.
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+// TODO(brainman): fix all needed for net
+
+func Accept(fd Handle) (nfd Handle, sa Sockaddr, err error) { return 0, nil, syscall.EWINDOWS }
+func Recvfrom(fd Handle, p []byte, flags int) (n int, from Sockaddr, err error) {
+	return 0, nil, syscall.EWINDOWS
+}
+func Sendto(fd Handle, p []byte, flags int, to Sockaddr) (err error)       { return syscall.EWINDOWS }
+func SetsockoptTimeval(fd Handle, level, opt int, tv *Timeval) (err error) { return syscall.EWINDOWS }
+
+// The Linger struct is wrong but we only noticed after Go 1.
+// sysLinger is the real system call structure.
+
+// BUG(brainman): The definition of Linger is not appropriate for direct use
+// with Setsockopt and Getsockopt.
+// Use SetsockoptLinger instead.
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type sysLinger struct {
+	Onoff  uint16
+	Linger uint16
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+func GetsockoptInt(fd Handle, level, opt int) (int, error) { return -1, syscall.EWINDOWS }
+
+func SetsockoptLinger(fd Handle, level, opt int, l *Linger) (err error) {
+	sys := sysLinger{Onoff: uint16(l.Onoff), Linger: uint16(l.Linger)}
+	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(&sys)), int32(unsafe.Sizeof(sys)))
+}
+
+func SetsockoptInet4Addr(fd Handle, level, opt int, value [4]byte) (err error) {
+	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(&value[0])), 4)
+}
+func SetsockoptIPMreq(fd Handle, level, opt int, mreq *IPMreq) (err error) {
+	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(mreq)), int32(unsafe.Sizeof(*mreq)))
+}
+func SetsockoptIPv6Mreq(fd Handle, level, opt int, mreq *IPv6Mreq) (err error) {
+	return syscall.EWINDOWS
+}
+
+func Getpid() (pid int) { return int(getCurrentProcessId()) }
+
+func FindFirstFile(name *uint16, data *Win32finddata) (handle Handle, err error) {
+	// NOTE(rsc): The Win32finddata struct is wrong for the system call:
+	// the two paths are each one uint16 short. Use the correct struct,
+	// a win32finddata1, and then copy the results out.
+	// There is no loss of expressivity here, because the final
+	// uint16, if it is used, is supposed to be a NUL, and Go doesn't need that.
+	// For Go 1.1, we might avoid the allocation of win32finddata1 here
+	// by adding a final Bug [2]uint16 field to the struct and then
+	// adjusting the fields in the result directly.
+	var data1 win32finddata1
+	handle, err = findFirstFile1(name, &data1)
+	if err == nil {
+		copyFindData(data, &data1)
+	}
+	return
+}
+
+func FindNextFile(handle Handle, data *Win32finddata) (err error) {
+	var data1 win32finddata1
+	err = findNextFile1(handle, &data1)
+	if err == nil {
+		copyFindData(data, &data1)
+	}
+	return
+}
+
+func getProcessEntry(pid int) (*ProcessEntry32, error) {
+	snapshot, err := CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)
+	if err != nil {
+		return nil, err
+	}
+	defer CloseHandle(snapshot)
+	var procEntry ProcessEntry32
+	procEntry.Size = uint32(unsafe.Sizeof(procEntry))
+	if err = Process32First(snapshot, &procEntry); err != nil {
+		return nil, err
+	}
+	for {
+		if procEntry.ProcessID == uint32(pid) {
+			return &procEntry, nil
+		}
+		err = Process32Next(snapshot, &procEntry)
+		if err != nil {
+			return nil, err
+		}
+	}
+}
+
+func Getppid() (ppid int) {
+	pe, err := getProcessEntry(Getpid())
+	if err != nil {
+		return -1
+	}
+	return int(pe.ParentProcessID)
+}
+
+// TODO(brainman): fix all needed for os
+func Fchdir(fd Handle) (err error)             { return syscall.EWINDOWS }
+func Link(oldpath, newpath string) (err error) { return syscall.EWINDOWS }
+func Symlink(path, link string) (err error)    { return syscall.EWINDOWS }
+
+func Fchmod(fd Handle, mode uint32) (err error)        { return syscall.EWINDOWS }
+func Chown(path string, uid int, gid int) (err error)  { return syscall.EWINDOWS }
+func Lchown(path string, uid int, gid int) (err error) { return syscall.EWINDOWS }
+func Fchown(fd Handle, uid int, gid int) (err error)   { return syscall.EWINDOWS }
+
+func Getuid() (uid int)                  { return -1 }
+func Geteuid() (euid int)                { return -1 }
+func Getgid() (gid int)                  { return -1 }
+func Getegid() (egid int)                { return -1 }
+func Getgroups() (gids []int, err error) { return nil, syscall.EWINDOWS }
+
+type Signal int
+
+func (s Signal) Signal() {}
+
+func (s Signal) String() string {
+	if 0 <= s && int(s) < len(signals) {
+		str := signals[s]
+		if str != "" {
+			return str
+		}
+	}
+	return "signal " + itoa(int(s))
+}
+
+func LoadCreateSymbolicLink() error {
+	return procCreateSymbolicLinkW.Find()
+}
+
+// Readlink returns the destination of the named symbolic link.
+func Readlink(path string, buf []byte) (n int, err error) {
+	fd, err := CreateFile(StringToUTF16Ptr(path), GENERIC_READ, 0, nil, OPEN_EXISTING,
+		FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, 0)
+	if err != nil {
+		return -1, err
+	}
+	defer CloseHandle(fd)
+
+	rdbbuf := make([]byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE)
+	var bytesReturned uint32
+	err = DeviceIoControl(fd, FSCTL_GET_REPARSE_POINT, nil, 0, &rdbbuf[0], uint32(len(rdbbuf)), &bytesReturned, nil)
+	if err != nil {
+		return -1, err
+	}
+
+	rdb := (*reparseDataBuffer)(unsafe.Pointer(&rdbbuf[0]))
+	var s string
+	switch rdb.ReparseTag {
+	case IO_REPARSE_TAG_SYMLINK:
+		data := (*symbolicLinkReparseBuffer)(unsafe.Pointer(&rdb.reparseBuffer))
+		p := (*[0xffff]uint16)(unsafe.Pointer(&data.PathBuffer[0]))
+		s = UTF16ToString(p[data.PrintNameOffset/2 : (data.PrintNameLength-data.PrintNameOffset)/2])
+	case IO_REPARSE_TAG_MOUNT_POINT:
+		data := (*mountPointReparseBuffer)(unsafe.Pointer(&rdb.reparseBuffer))
+		p := (*[0xffff]uint16)(unsafe.Pointer(&data.PathBuffer[0]))
+		s = UTF16ToString(p[data.PrintNameOffset/2 : (data.PrintNameLength-data.PrintNameOffset)/2])
+	default:
+		// the path is not a symlink or junction but another type of reparse
+		// point
+		return -1, syscall.ENOENT
+	}
+	n = copy(buf, []byte(s))
+
+	return n, nil
+}
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows_test.go b/vendor/golang.org/x/sys/windows/syscall_windows_test.go
new file mode 100644
index 00000000..0e27464e
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/syscall_windows_test.go
@@ -0,0 +1,113 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows_test
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"syscall"
+	"testing"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+func TestWin32finddata(t *testing.T) {
+	dir, err := ioutil.TempDir("", "go-build")
+	if err != nil {
+		t.Fatalf("failed to create temp directory: %v", err)
+	}
+	defer os.RemoveAll(dir)
+
+	path := filepath.Join(dir, "long_name.and_extension")
+	f, err := os.Create(path)
+	if err != nil {
+		t.Fatalf("failed to create %v: %v", path, err)
+	}
+	f.Close()
+
+	type X struct {
+		fd  windows.Win32finddata
+		got byte
+		pad [10]byte // to protect ourselves
+
+	}
+	var want byte = 2 // it is unlikely to have this character in the filename
+	x := X{got: want}
+
+	pathp, _ := windows.UTF16PtrFromString(path)
+	h, err := windows.FindFirstFile(pathp, &(x.fd))
+	if err != nil {
+		t.Fatalf("FindFirstFile failed: %v", err)
+	}
+	err = windows.FindClose(h)
+	if err != nil {
+		t.Fatalf("FindClose failed: %v", err)
+	}
+
+	if x.got != want {
+		t.Fatalf("memory corruption: want=%d got=%d", want, x.got)
+	}
+}
+
+func TestFormatMessage(t *testing.T) {
+	dll := windows.MustLoadDLL("pdh.dll")
+
+	pdhOpenQuery := func(datasrc *uint16, userdata uint32, query *windows.Handle) (errno uintptr) {
+		r0, _, _ := syscall.Syscall(dll.MustFindProc("PdhOpenQueryW").Addr(), 3, uintptr(unsafe.Pointer(datasrc)), uintptr(userdata), uintptr(unsafe.Pointer(query)))
+		return r0
+	}
+
+	pdhCloseQuery := func(query windows.Handle) (errno uintptr) {
+		r0, _, _ := syscall.Syscall(dll.MustFindProc("PdhCloseQuery").Addr(), 1, uintptr(query), 0, 0)
+		return r0
+	}
+
+	var q windows.Handle
+	name, err := windows.UTF16PtrFromString("no_such_source")
+	if err != nil {
+		t.Fatal(err)
+	}
+	errno := pdhOpenQuery(name, 0, &q)
+	if errno == 0 {
+		pdhCloseQuery(q)
+		t.Fatal("PdhOpenQuery succeeded, but expected to fail.")
+	}
+
+	const flags uint32 = syscall.FORMAT_MESSAGE_FROM_HMODULE | syscall.FORMAT_MESSAGE_ARGUMENT_ARRAY | syscall.FORMAT_MESSAGE_IGNORE_INSERTS
+	buf := make([]uint16, 300)
+	_, err = windows.FormatMessage(flags, uintptr(dll.Handle), uint32(errno), 0, buf, nil)
+	if err != nil {
+		t.Fatalf("FormatMessage for handle=%x and errno=%x failed: %v", dll.Handle, errno, err)
+	}
+}
+
+func abort(funcname string, err error) {
+	panic(funcname + " failed: " + err.Error())
+}
+
+func ExampleLoadLibrary() {
+	h, err := windows.LoadLibrary("kernel32.dll")
+	if err != nil {
+		abort("LoadLibrary", err)
+	}
+	defer windows.FreeLibrary(h)
+	proc, err := windows.GetProcAddress(h, "GetVersion")
+	if err != nil {
+		abort("GetProcAddress", err)
+	}
+	r, _, _ := syscall.Syscall(uintptr(proc), 0, 0, 0, 0)
+	major := byte(r)
+	minor := uint8(r >> 8)
+	build := uint16(r >> 16)
+	print("windows version ", major, ".", minor, " (Build ", build, ")\n")
+}
+
+func TestTOKEN_ALL_ACCESS(t *testing.T) {
+	if windows.TOKEN_ALL_ACCESS != 0xF01FF {
+		t.Errorf("TOKEN_ALL_ACCESS = %x, want 0xF01FF", windows.TOKEN_ALL_ACCESS)
+	}
+}
diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go
new file mode 100644
index 00000000..7d2a6794
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/types_windows.go
@@ -0,0 +1,1366 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+import "syscall"
+
+const (
+	// Windows errors.
+	ERROR_FILE_NOT_FOUND         syscall.Errno = 2
+	ERROR_PATH_NOT_FOUND         syscall.Errno = 3
+	ERROR_ACCESS_DENIED          syscall.Errno = 5
+	ERROR_NO_MORE_FILES          syscall.Errno = 18
+	ERROR_HANDLE_EOF             syscall.Errno = 38
+	ERROR_NETNAME_DELETED        syscall.Errno = 64
+	ERROR_FILE_EXISTS            syscall.Errno = 80
+	ERROR_BROKEN_PIPE            syscall.Errno = 109
+	ERROR_BUFFER_OVERFLOW        syscall.Errno = 111
+	ERROR_INSUFFICIENT_BUFFER    syscall.Errno = 122
+	ERROR_MOD_NOT_FOUND          syscall.Errno = 126
+	ERROR_PROC_NOT_FOUND         syscall.Errno = 127
+	ERROR_ALREADY_EXISTS         syscall.Errno = 183
+	ERROR_ENVVAR_NOT_FOUND       syscall.Errno = 203
+	ERROR_MORE_DATA              syscall.Errno = 234
+	ERROR_OPERATION_ABORTED      syscall.Errno = 995
+	ERROR_IO_PENDING             syscall.Errno = 997
+	ERROR_SERVICE_SPECIFIC_ERROR syscall.Errno = 1066
+	ERROR_NOT_FOUND              syscall.Errno = 1168
+	ERROR_PRIVILEGE_NOT_HELD     syscall.Errno = 1314
+	WSAEACCES                    syscall.Errno = 10013
+	WSAEMSGSIZE                  syscall.Errno = 10040
+	WSAECONNRESET                syscall.Errno = 10054
+)
+
+const (
+	// Invented values to support what package os expects.
+	O_RDONLY   = 0x00000
+	O_WRONLY   = 0x00001
+	O_RDWR     = 0x00002
+	O_CREAT    = 0x00040
+	O_EXCL     = 0x00080
+	O_NOCTTY   = 0x00100
+	O_TRUNC    = 0x00200
+	O_NONBLOCK = 0x00800
+	O_APPEND   = 0x00400
+	O_SYNC     = 0x01000
+	O_ASYNC    = 0x02000
+	O_CLOEXEC  = 0x80000
+)
+
+const (
+	// More invented values for signals
+	SIGHUP  = Signal(0x1)
+	SIGINT  = Signal(0x2)
+	SIGQUIT = Signal(0x3)
+	SIGILL  = Signal(0x4)
+	SIGTRAP = Signal(0x5)
+	SIGABRT = Signal(0x6)
+	SIGBUS  = Signal(0x7)
+	SIGFPE  = Signal(0x8)
+	SIGKILL = Signal(0x9)
+	SIGSEGV = Signal(0xb)
+	SIGPIPE = Signal(0xd)
+	SIGALRM = Signal(0xe)
+	SIGTERM = Signal(0xf)
+)
+
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+}
+
+const (
+	GENERIC_READ    = 0x80000000
+	GENERIC_WRITE   = 0x40000000
+	GENERIC_EXECUTE = 0x20000000
+	GENERIC_ALL     = 0x10000000
+
+	FILE_LIST_DIRECTORY   = 0x00000001
+	FILE_APPEND_DATA      = 0x00000004
+	FILE_WRITE_ATTRIBUTES = 0x00000100
+
+	FILE_SHARE_READ   = 0x00000001
+	FILE_SHARE_WRITE  = 0x00000002
+	FILE_SHARE_DELETE = 0x00000004
+
+	FILE_ATTRIBUTE_READONLY              = 0x00000001
+	FILE_ATTRIBUTE_HIDDEN                = 0x00000002
+	FILE_ATTRIBUTE_SYSTEM                = 0x00000004
+	FILE_ATTRIBUTE_DIRECTORY             = 0x00000010
+	FILE_ATTRIBUTE_ARCHIVE               = 0x00000020
+	FILE_ATTRIBUTE_DEVICE                = 0x00000040
+	FILE_ATTRIBUTE_NORMAL                = 0x00000080
+	FILE_ATTRIBUTE_TEMPORARY             = 0x00000100
+	FILE_ATTRIBUTE_SPARSE_FILE           = 0x00000200
+	FILE_ATTRIBUTE_REPARSE_POINT         = 0x00000400
+	FILE_ATTRIBUTE_COMPRESSED            = 0x00000800
+	FILE_ATTRIBUTE_OFFLINE               = 0x00001000
+	FILE_ATTRIBUTE_NOT_CONTENT_INDEXED   = 0x00002000
+	FILE_ATTRIBUTE_ENCRYPTED             = 0x00004000
+	FILE_ATTRIBUTE_INTEGRITY_STREAM      = 0x00008000
+	FILE_ATTRIBUTE_VIRTUAL               = 0x00010000
+	FILE_ATTRIBUTE_NO_SCRUB_DATA         = 0x00020000
+	FILE_ATTRIBUTE_RECALL_ON_OPEN        = 0x00040000
+	FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS = 0x00400000
+
+	INVALID_FILE_ATTRIBUTES = 0xffffffff
+
+	CREATE_NEW        = 1
+	CREATE_ALWAYS     = 2
+	OPEN_EXISTING     = 3
+	OPEN_ALWAYS       = 4
+	TRUNCATE_EXISTING = 5
+
+	FILE_FLAG_OPEN_REPARSE_POINT = 0x00200000
+	FILE_FLAG_BACKUP_SEMANTICS   = 0x02000000
+	FILE_FLAG_OVERLAPPED         = 0x40000000
+
+	HANDLE_FLAG_INHERIT    = 0x00000001
+	STARTF_USESTDHANDLES   = 0x00000100
+	STARTF_USESHOWWINDOW   = 0x00000001
+	DUPLICATE_CLOSE_SOURCE = 0x00000001
+	DUPLICATE_SAME_ACCESS  = 0x00000002
+
+	STD_INPUT_HANDLE  = -10 & (1<<32 - 1)
+	STD_OUTPUT_HANDLE = -11 & (1<<32 - 1)
+	STD_ERROR_HANDLE  = -12 & (1<<32 - 1)
+
+	FILE_BEGIN   = 0
+	FILE_CURRENT = 1
+	FILE_END     = 2
+
+	LANG_ENGLISH       = 0x09
+	SUBLANG_ENGLISH_US = 0x01
+
+	FORMAT_MESSAGE_ALLOCATE_BUFFER = 256
+	FORMAT_MESSAGE_IGNORE_INSERTS  = 512
+	FORMAT_MESSAGE_FROM_STRING     = 1024
+	FORMAT_MESSAGE_FROM_HMODULE    = 2048
+	FORMAT_MESSAGE_FROM_SYSTEM     = 4096
+	FORMAT_MESSAGE_ARGUMENT_ARRAY  = 8192
+	FORMAT_MESSAGE_MAX_WIDTH_MASK  = 255
+
+	MAX_PATH      = 260
+	MAX_LONG_PATH = 32768
+
+	MAX_COMPUTERNAME_LENGTH = 15
+
+	TIME_ZONE_ID_UNKNOWN  = 0
+	TIME_ZONE_ID_STANDARD = 1
+
+	TIME_ZONE_ID_DAYLIGHT = 2
+	IGNORE                = 0
+	INFINITE              = 0xffffffff
+
+	WAIT_TIMEOUT   = 258
+	WAIT_ABANDONED = 0x00000080
+	WAIT_OBJECT_0  = 0x00000000
+	WAIT_FAILED    = 0xFFFFFFFF
+
+	PROCESS_TERMINATE         = 1
+	PROCESS_QUERY_INFORMATION = 0x00000400
+	SYNCHRONIZE               = 0x00100000
+
+	FILE_MAP_COPY    = 0x01
+	FILE_MAP_WRITE   = 0x02
+	FILE_MAP_READ    = 0x04
+	FILE_MAP_EXECUTE = 0x20
+
+	CTRL_C_EVENT     = 0
+	CTRL_BREAK_EVENT = 1
+
+	// Windows reserves errors >= 1<<29 for application use.
+	APPLICATION_ERROR = 1 << 29
+)
+
+const (
+	// Process creation flags.
+	CREATE_BREAKAWAY_FROM_JOB        = 0x01000000
+	CREATE_DEFAULT_ERROR_MODE        = 0x04000000
+	CREATE_NEW_CONSOLE               = 0x00000010
+	CREATE_NEW_PROCESS_GROUP         = 0x00000200
+	CREATE_NO_WINDOW                 = 0x08000000
+	CREATE_PROTECTED_PROCESS         = 0x00040000
+	CREATE_PRESERVE_CODE_AUTHZ_LEVEL = 0x02000000
+	CREATE_SEPARATE_WOW_VDM          = 0x00000800
+	CREATE_SHARED_WOW_VDM            = 0x00001000
+	CREATE_SUSPENDED                 = 0x00000004
+	CREATE_UNICODE_ENVIRONMENT       = 0x00000400
+	DEBUG_ONLY_THIS_PROCESS          = 0x00000002
+	DEBUG_PROCESS                    = 0x00000001
+	DETACHED_PROCESS                 = 0x00000008
+	EXTENDED_STARTUPINFO_PRESENT     = 0x00080000
+	INHERIT_PARENT_AFFINITY          = 0x00010000
+)
+
+const (
+	// flags for CreateToolhelp32Snapshot
+	TH32CS_SNAPHEAPLIST = 0x01
+	TH32CS_SNAPPROCESS  = 0x02
+	TH32CS_SNAPTHREAD   = 0x04
+	TH32CS_SNAPMODULE   = 0x08
+	TH32CS_SNAPMODULE32 = 0x10
+	TH32CS_SNAPALL      = TH32CS_SNAPHEAPLIST | TH32CS_SNAPMODULE | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD
+	TH32CS_INHERIT      = 0x80000000
+)
+
+const (
+	// filters for ReadDirectoryChangesW
+	FILE_NOTIFY_CHANGE_FILE_NAME   = 0x001
+	FILE_NOTIFY_CHANGE_DIR_NAME    = 0x002
+	FILE_NOTIFY_CHANGE_ATTRIBUTES  = 0x004
+	FILE_NOTIFY_CHANGE_SIZE        = 0x008
+	FILE_NOTIFY_CHANGE_LAST_WRITE  = 0x010
+	FILE_NOTIFY_CHANGE_LAST_ACCESS = 0x020
+	FILE_NOTIFY_CHANGE_CREATION    = 0x040
+	FILE_NOTIFY_CHANGE_SECURITY    = 0x100
+)
+
+const (
+	// do not reorder
+	FILE_ACTION_ADDED = iota + 1
+	FILE_ACTION_REMOVED
+	FILE_ACTION_MODIFIED
+	FILE_ACTION_RENAMED_OLD_NAME
+	FILE_ACTION_RENAMED_NEW_NAME
+)
+
+const (
+	// wincrypt.h
+	PROV_RSA_FULL                    = 1
+	PROV_RSA_SIG                     = 2
+	PROV_DSS                         = 3
+	PROV_FORTEZZA                    = 4
+	PROV_MS_EXCHANGE                 = 5
+	PROV_SSL                         = 6
+	PROV_RSA_SCHANNEL                = 12
+	PROV_DSS_DH                      = 13
+	PROV_EC_ECDSA_SIG                = 14
+	PROV_EC_ECNRA_SIG                = 15
+	PROV_EC_ECDSA_FULL               = 16
+	PROV_EC_ECNRA_FULL               = 17
+	PROV_DH_SCHANNEL                 = 18
+	PROV_SPYRUS_LYNKS                = 20
+	PROV_RNG                         = 21
+	PROV_INTEL_SEC                   = 22
+	PROV_REPLACE_OWF                 = 23
+	PROV_RSA_AES                     = 24
+	CRYPT_VERIFYCONTEXT              = 0xF0000000
+	CRYPT_NEWKEYSET                  = 0x00000008
+	CRYPT_DELETEKEYSET               = 0x00000010
+	CRYPT_MACHINE_KEYSET             = 0x00000020
+	CRYPT_SILENT                     = 0x00000040
+	CRYPT_DEFAULT_CONTAINER_OPTIONAL = 0x00000080
+
+	USAGE_MATCH_TYPE_AND = 0
+	USAGE_MATCH_TYPE_OR  = 1
+
+	X509_ASN_ENCODING   = 0x00000001
+	PKCS_7_ASN_ENCODING = 0x00010000
+
+	CERT_STORE_PROV_MEMORY = 2
+
+	CERT_STORE_ADD_ALWAYS = 4
+
+	CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG = 0x00000004
+
+	CERT_TRUST_NO_ERROR                          = 0x00000000
+	CERT_TRUST_IS_NOT_TIME_VALID                 = 0x00000001
+	CERT_TRUST_IS_REVOKED                        = 0x00000004
+	CERT_TRUST_IS_NOT_SIGNATURE_VALID            = 0x00000008
+	CERT_TRUST_IS_NOT_VALID_FOR_USAGE            = 0x00000010
+	CERT_TRUST_IS_UNTRUSTED_ROOT                 = 0x00000020
+	CERT_TRUST_REVOCATION_STATUS_UNKNOWN         = 0x00000040
+	CERT_TRUST_IS_CYCLIC                         = 0x00000080
+	CERT_TRUST_INVALID_EXTENSION                 = 0x00000100
+	CERT_TRUST_INVALID_POLICY_CONSTRAINTS        = 0x00000200
+	CERT_TRUST_INVALID_BASIC_CONSTRAINTS         = 0x00000400
+	CERT_TRUST_INVALID_NAME_CONSTRAINTS          = 0x00000800
+	CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT = 0x00001000
+	CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT   = 0x00002000
+	CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT = 0x00004000
+	CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT      = 0x00008000
+	CERT_TRUST_IS_OFFLINE_REVOCATION             = 0x01000000
+	CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY          = 0x02000000
+	CERT_TRUST_IS_EXPLICIT_DISTRUST              = 0x04000000
+	CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT    = 0x08000000
+
+	CERT_CHAIN_POLICY_BASE              = 1
+	CERT_CHAIN_POLICY_AUTHENTICODE      = 2
+	CERT_CHAIN_POLICY_AUTHENTICODE_TS   = 3
+	CERT_CHAIN_POLICY_SSL               = 4
+	CERT_CHAIN_POLICY_BASIC_CONSTRAINTS = 5
+	CERT_CHAIN_POLICY_NT_AUTH           = 6
+	CERT_CHAIN_POLICY_MICROSOFT_ROOT    = 7
+	CERT_CHAIN_POLICY_EV                = 8
+
+	CERT_E_EXPIRED       = 0x800B0101
+	CERT_E_ROLE          = 0x800B0103
+	CERT_E_PURPOSE       = 0x800B0106
+	CERT_E_UNTRUSTEDROOT = 0x800B0109
+	CERT_E_CN_NO_MATCH   = 0x800B010F
+
+	AUTHTYPE_CLIENT = 1
+	AUTHTYPE_SERVER = 2
+)
+
+var (
+	OID_PKIX_KP_SERVER_AUTH = []byte("1.3.6.1.5.5.7.3.1\x00")
+	OID_SERVER_GATED_CRYPTO = []byte("1.3.6.1.4.1.311.10.3.3\x00")
+	OID_SGC_NETSCAPE        = []byte("2.16.840.1.113730.4.1\x00")
+)
+
+// Pointer represents a pointer to an arbitrary Windows type.
+//
+// Pointer-typed fields may point to one of many different types. It's
+// up to the caller to provide a pointer to the appropriate type, cast
+// to Pointer. The caller must obey the unsafe.Pointer rules while
+// doing so.
+type Pointer *struct{}
+
+// Invented values to support what package os expects.
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+func (tv *Timeval) Nanoseconds() int64 {
+	return (int64(tv.Sec)*1e6 + int64(tv.Usec)) * 1e3
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	tv.Sec = int32(nsec / 1e9)
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	return
+}
+
+type SecurityAttributes struct {
+	Length             uint32
+	SecurityDescriptor uintptr
+	InheritHandle      uint32
+}
+
+type Overlapped struct {
+	Internal     uintptr
+	InternalHigh uintptr
+	Offset       uint32
+	OffsetHigh   uint32
+	HEvent       Handle
+}
+
+type FileNotifyInformation struct {
+	NextEntryOffset uint32
+	Action          uint32
+	FileNameLength  uint32
+	FileName        uint16
+}
+
+type Filetime struct {
+	LowDateTime  uint32
+	HighDateTime uint32
+}
+
+// Nanoseconds returns Filetime ft in nanoseconds
+// since Epoch (00:00:00 UTC, January 1, 1970).
+func (ft *Filetime) Nanoseconds() int64 {
+	// 100-nanosecond intervals since January 1, 1601
+	nsec := int64(ft.HighDateTime)<<32 + int64(ft.LowDateTime)
+	// change starting time to the Epoch (00:00:00 UTC, January 1, 1970)
+	nsec -= 116444736000000000
+	// convert into nanoseconds
+	nsec *= 100
+	return nsec
+}
+
+func NsecToFiletime(nsec int64) (ft Filetime) {
+	// convert into 100-nanosecond
+	nsec /= 100
+	// change starting time to January 1, 1601
+	nsec += 116444736000000000
+	// split into high / low
+	ft.LowDateTime = uint32(nsec & 0xffffffff)
+	ft.HighDateTime = uint32(nsec >> 32 & 0xffffffff)
+	return ft
+}
+
+type Win32finddata struct {
+	FileAttributes    uint32
+	CreationTime      Filetime
+	LastAccessTime    Filetime
+	LastWriteTime     Filetime
+	FileSizeHigh      uint32
+	FileSizeLow       uint32
+	Reserved0         uint32
+	Reserved1         uint32
+	FileName          [MAX_PATH - 1]uint16
+	AlternateFileName [13]uint16
+}
+
+// This is the actual system call structure.
+// Win32finddata is what we committed to in Go 1.
+type win32finddata1 struct {
+	FileAttributes    uint32
+	CreationTime      Filetime
+	LastAccessTime    Filetime
+	LastWriteTime     Filetime
+	FileSizeHigh      uint32
+	FileSizeLow       uint32
+	Reserved0         uint32
+	Reserved1         uint32
+	FileName          [MAX_PATH]uint16
+	AlternateFileName [14]uint16
+}
+
+func copyFindData(dst *Win32finddata, src *win32finddata1) {
+	dst.FileAttributes = src.FileAttributes
+	dst.CreationTime = src.CreationTime
+	dst.LastAccessTime = src.LastAccessTime
+	dst.LastWriteTime = src.LastWriteTime
+	dst.FileSizeHigh = src.FileSizeHigh
+	dst.FileSizeLow = src.FileSizeLow
+	dst.Reserved0 = src.Reserved0
+	dst.Reserved1 = src.Reserved1
+
+	// The src is 1 element bigger than dst, but it must be NUL.
+	copy(dst.FileName[:], src.FileName[:])
+	copy(dst.AlternateFileName[:], src.AlternateFileName[:])
+}
+
+type ByHandleFileInformation struct {
+	FileAttributes     uint32
+	CreationTime       Filetime
+	LastAccessTime     Filetime
+	LastWriteTime      Filetime
+	VolumeSerialNumber uint32
+	FileSizeHigh       uint32
+	FileSizeLow        uint32
+	NumberOfLinks      uint32
+	FileIndexHigh      uint32
+	FileIndexLow       uint32
+}
+
+const (
+	GetFileExInfoStandard = 0
+	GetFileExMaxInfoLevel = 1
+)
+
+type Win32FileAttributeData struct {
+	FileAttributes uint32
+	CreationTime   Filetime
+	LastAccessTime Filetime
+	LastWriteTime  Filetime
+	FileSizeHigh   uint32
+	FileSizeLow    uint32
+}
+
+// ShowWindow constants
+const (
+	// winuser.h
+	SW_HIDE            = 0
+	SW_NORMAL          = 1
+	SW_SHOWNORMAL      = 1
+	SW_SHOWMINIMIZED   = 2
+	SW_SHOWMAXIMIZED   = 3
+	SW_MAXIMIZE        = 3
+	SW_SHOWNOACTIVATE  = 4
+	SW_SHOW            = 5
+	SW_MINIMIZE        = 6
+	SW_SHOWMINNOACTIVE = 7
+	SW_SHOWNA          = 8
+	SW_RESTORE         = 9
+	SW_SHOWDEFAULT     = 10
+	SW_FORCEMINIMIZE   = 11
+)
+
+type StartupInfo struct {
+	Cb            uint32
+	_             *uint16
+	Desktop       *uint16
+	Title         *uint16
+	X             uint32
+	Y             uint32
+	XSize         uint32
+	YSize         uint32
+	XCountChars   uint32
+	YCountChars   uint32
+	FillAttribute uint32
+	Flags         uint32
+	ShowWindow    uint16
+	_             uint16
+	_             *byte
+	StdInput      Handle
+	StdOutput     Handle
+	StdErr        Handle
+}
+
+type ProcessInformation struct {
+	Process   Handle
+	Thread    Handle
+	ProcessId uint32
+	ThreadId  uint32
+}
+
+type ProcessEntry32 struct {
+	Size            uint32
+	Usage           uint32
+	ProcessID       uint32
+	DefaultHeapID   uintptr
+	ModuleID        uint32
+	Threads         uint32
+	ParentProcessID uint32
+	PriClassBase    int32
+	Flags           uint32
+	ExeFile         [MAX_PATH]uint16
+}
+
+type Systemtime struct {
+	Year         uint16
+	Month        uint16
+	DayOfWeek    uint16
+	Day          uint16
+	Hour         uint16
+	Minute       uint16
+	Second       uint16
+	Milliseconds uint16
+}
+
+type Timezoneinformation struct {
+	Bias         int32
+	StandardName [32]uint16
+	StandardDate Systemtime
+	StandardBias int32
+	DaylightName [32]uint16
+	DaylightDate Systemtime
+	DaylightBias int32
+}
+
+// Socket related.
+
+const (
+	AF_UNSPEC  = 0
+	AF_UNIX    = 1
+	AF_INET    = 2
+	AF_INET6   = 23
+	AF_NETBIOS = 17
+
+	SOCK_STREAM    = 1
+	SOCK_DGRAM     = 2
+	SOCK_RAW       = 3
+	SOCK_SEQPACKET = 5
+
+	IPPROTO_IP   = 0
+	IPPROTO_IPV6 = 0x29
+	IPPROTO_TCP  = 6
+	IPPROTO_UDP  = 17
+
+	SOL_SOCKET                = 0xffff
+	SO_REUSEADDR              = 4
+	SO_KEEPALIVE              = 8
+	SO_DONTROUTE              = 16
+	SO_BROADCAST              = 32
+	SO_LINGER                 = 128
+	SO_RCVBUF                 = 0x1002
+	SO_SNDBUF                 = 0x1001
+	SO_UPDATE_ACCEPT_CONTEXT  = 0x700b
+	SO_UPDATE_CONNECT_CONTEXT = 0x7010
+
+	IOC_OUT                            = 0x40000000
+	IOC_IN                             = 0x80000000
+	IOC_VENDOR                         = 0x18000000
+	IOC_INOUT                          = IOC_IN | IOC_OUT
+	IOC_WS2                            = 0x08000000
+	SIO_GET_EXTENSION_FUNCTION_POINTER = IOC_INOUT | IOC_WS2 | 6
+	SIO_KEEPALIVE_VALS                 = IOC_IN | IOC_VENDOR | 4
+	SIO_UDP_CONNRESET                  = IOC_IN | IOC_VENDOR | 12
+
+	// cf. http://support.microsoft.com/default.aspx?scid=kb;en-us;257460
+
+	IP_TOS             = 0x3
+	IP_TTL             = 0x4
+	IP_MULTICAST_IF    = 0x9
+	IP_MULTICAST_TTL   = 0xa
+	IP_MULTICAST_LOOP  = 0xb
+	IP_ADD_MEMBERSHIP  = 0xc
+	IP_DROP_MEMBERSHIP = 0xd
+
+	IPV6_V6ONLY         = 0x1b
+	IPV6_UNICAST_HOPS   = 0x4
+	IPV6_MULTICAST_IF   = 0x9
+	IPV6_MULTICAST_HOPS = 0xa
+	IPV6_MULTICAST_LOOP = 0xb
+	IPV6_JOIN_GROUP     = 0xc
+	IPV6_LEAVE_GROUP    = 0xd
+
+	MSG_OOB       = 0x1
+	MSG_PEEK      = 0x2
+	MSG_DONTROUTE = 0x4
+	MSG_WAITALL   = 0x8
+
+	MSG_TRUNC  = 0x0100
+	MSG_CTRUNC = 0x0200
+	MSG_BCAST  = 0x0400
+	MSG_MCAST  = 0x0800
+
+	SOMAXCONN = 0x7fffffff
+
+	TCP_NODELAY = 1
+
+	SHUT_RD   = 0
+	SHUT_WR   = 1
+	SHUT_RDWR = 2
+
+	WSADESCRIPTION_LEN = 256
+	WSASYS_STATUS_LEN  = 128
+)
+
+type WSABuf struct {
+	Len uint32
+	Buf *byte
+}
+
+type WSAMsg struct {
+	Name        *syscall.RawSockaddrAny
+	Namelen     int32
+	Buffers     *WSABuf
+	BufferCount uint32
+	Control     WSABuf
+	Flags       uint32
+}
+
+// Invented values to support what package os expects.
+const (
+	S_IFMT   = 0x1f000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWRITE = 0x80
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+const (
+	FILE_TYPE_CHAR    = 0x0002
+	FILE_TYPE_DISK    = 0x0001
+	FILE_TYPE_PIPE    = 0x0003
+	FILE_TYPE_REMOTE  = 0x8000
+	FILE_TYPE_UNKNOWN = 0x0000
+)
+
+type Hostent struct {
+	Name     *byte
+	Aliases  **byte
+	AddrType uint16
+	Length   uint16
+	AddrList **byte
+}
+
+type Protoent struct {
+	Name    *byte
+	Aliases **byte
+	Proto   uint16
+}
+
+const (
+	DNS_TYPE_A       = 0x0001
+	DNS_TYPE_NS      = 0x0002
+	DNS_TYPE_MD      = 0x0003
+	DNS_TYPE_MF      = 0x0004
+	DNS_TYPE_CNAME   = 0x0005
+	DNS_TYPE_SOA     = 0x0006
+	DNS_TYPE_MB      = 0x0007
+	DNS_TYPE_MG      = 0x0008
+	DNS_TYPE_MR      = 0x0009
+	DNS_TYPE_NULL    = 0x000a
+	DNS_TYPE_WKS     = 0x000b
+	DNS_TYPE_PTR     = 0x000c
+	DNS_TYPE_HINFO   = 0x000d
+	DNS_TYPE_MINFO   = 0x000e
+	DNS_TYPE_MX      = 0x000f
+	DNS_TYPE_TEXT    = 0x0010
+	DNS_TYPE_RP      = 0x0011
+	DNS_TYPE_AFSDB   = 0x0012
+	DNS_TYPE_X25     = 0x0013
+	DNS_TYPE_ISDN    = 0x0014
+	DNS_TYPE_RT      = 0x0015
+	DNS_TYPE_NSAP    = 0x0016
+	DNS_TYPE_NSAPPTR = 0x0017
+	DNS_TYPE_SIG     = 0x0018
+	DNS_TYPE_KEY     = 0x0019
+	DNS_TYPE_PX      = 0x001a
+	DNS_TYPE_GPOS    = 0x001b
+	DNS_TYPE_AAAA    = 0x001c
+	DNS_TYPE_LOC     = 0x001d
+	DNS_TYPE_NXT     = 0x001e
+	DNS_TYPE_EID     = 0x001f
+	DNS_TYPE_NIMLOC  = 0x0020
+	DNS_TYPE_SRV     = 0x0021
+	DNS_TYPE_ATMA    = 0x0022
+	DNS_TYPE_NAPTR   = 0x0023
+	DNS_TYPE_KX      = 0x0024
+	DNS_TYPE_CERT    = 0x0025
+	DNS_TYPE_A6      = 0x0026
+	DNS_TYPE_DNAME   = 0x0027
+	DNS_TYPE_SINK    = 0x0028
+	DNS_TYPE_OPT     = 0x0029
+	DNS_TYPE_DS      = 0x002B
+	DNS_TYPE_RRSIG   = 0x002E
+	DNS_TYPE_NSEC    = 0x002F
+	DNS_TYPE_DNSKEY  = 0x0030
+	DNS_TYPE_DHCID   = 0x0031
+	DNS_TYPE_UINFO   = 0x0064
+	DNS_TYPE_UID     = 0x0065
+	DNS_TYPE_GID     = 0x0066
+	DNS_TYPE_UNSPEC  = 0x0067
+	DNS_TYPE_ADDRS   = 0x00f8
+	DNS_TYPE_TKEY    = 0x00f9
+	DNS_TYPE_TSIG    = 0x00fa
+	DNS_TYPE_IXFR    = 0x00fb
+	DNS_TYPE_AXFR    = 0x00fc
+	DNS_TYPE_MAILB   = 0x00fd
+	DNS_TYPE_MAILA   = 0x00fe
+	DNS_TYPE_ALL     = 0x00ff
+	DNS_TYPE_ANY     = 0x00ff
+	DNS_TYPE_WINS    = 0xff01
+	DNS_TYPE_WINSR   = 0xff02
+	DNS_TYPE_NBSTAT  = 0xff01
+)
+
+const (
+	DNS_INFO_NO_RECORDS = 0x251D
+)
+
+const (
+	// flags inside DNSRecord.Dw
+	DnsSectionQuestion   = 0x0000
+	DnsSectionAnswer     = 0x0001
+	DnsSectionAuthority  = 0x0002
+	DnsSectionAdditional = 0x0003
+)
+
+type DNSSRVData struct {
+	Target   *uint16
+	Priority uint16
+	Weight   uint16
+	Port     uint16
+	Pad      uint16
+}
+
+type DNSPTRData struct {
+	Host *uint16
+}
+
+type DNSMXData struct {
+	NameExchange *uint16
+	Preference   uint16
+	Pad          uint16
+}
+
+type DNSTXTData struct {
+	StringCount uint16
+	StringArray [1]*uint16
+}
+
+type DNSRecord struct {
+	Next     *DNSRecord
+	Name     *uint16
+	Type     uint16
+	Length   uint16
+	Dw       uint32
+	Ttl      uint32
+	Reserved uint32
+	Data     [40]byte
+}
+
+const (
+	TF_DISCONNECT         = 1
+	TF_REUSE_SOCKET       = 2
+	TF_WRITE_BEHIND       = 4
+	TF_USE_DEFAULT_WORKER = 0
+	TF_USE_SYSTEM_THREAD  = 16
+	TF_USE_KERNEL_APC     = 32
+)
+
+type TransmitFileBuffers struct {
+	Head       uintptr
+	HeadLength uint32
+	Tail       uintptr
+	TailLength uint32
+}
+
+const (
+	IFF_UP           = 1
+	IFF_BROADCAST    = 2
+	IFF_LOOPBACK     = 4
+	IFF_POINTTOPOINT = 8
+	IFF_MULTICAST    = 16
+)
+
+const SIO_GET_INTERFACE_LIST = 0x4004747F
+
+// TODO(mattn): SockaddrGen is union of sockaddr/sockaddr_in/sockaddr_in6_old.
+// will be fixed to change variable type as suitable.
+
+type SockaddrGen [24]byte
+
+type InterfaceInfo struct {
+	Flags            uint32
+	Address          SockaddrGen
+	BroadcastAddress SockaddrGen
+	Netmask          SockaddrGen
+}
+
+type IpAddressString struct {
+	String [16]byte
+}
+
+type IpMaskString IpAddressString
+
+type IpAddrString struct {
+	Next      *IpAddrString
+	IpAddress IpAddressString
+	IpMask    IpMaskString
+	Context   uint32
+}
+
+const MAX_ADAPTER_NAME_LENGTH = 256
+const MAX_ADAPTER_DESCRIPTION_LENGTH = 128
+const MAX_ADAPTER_ADDRESS_LENGTH = 8
+
+type IpAdapterInfo struct {
+	Next                *IpAdapterInfo
+	ComboIndex          uint32
+	AdapterName         [MAX_ADAPTER_NAME_LENGTH + 4]byte
+	Description         [MAX_ADAPTER_DESCRIPTION_LENGTH + 4]byte
+	AddressLength       uint32
+	Address             [MAX_ADAPTER_ADDRESS_LENGTH]byte
+	Index               uint32
+	Type                uint32
+	DhcpEnabled         uint32
+	CurrentIpAddress    *IpAddrString
+	IpAddressList       IpAddrString
+	GatewayList         IpAddrString
+	DhcpServer          IpAddrString
+	HaveWins            bool
+	PrimaryWinsServer   IpAddrString
+	SecondaryWinsServer IpAddrString
+	LeaseObtained       int64
+	LeaseExpires        int64
+}
+
+const MAXLEN_PHYSADDR = 8
+const MAX_INTERFACE_NAME_LEN = 256
+const MAXLEN_IFDESCR = 256
+
+type MibIfRow struct {
+	Name            [MAX_INTERFACE_NAME_LEN]uint16
+	Index           uint32
+	Type            uint32
+	Mtu             uint32
+	Speed           uint32
+	PhysAddrLen     uint32
+	PhysAddr        [MAXLEN_PHYSADDR]byte
+	AdminStatus     uint32
+	OperStatus      uint32
+	LastChange      uint32
+	InOctets        uint32
+	InUcastPkts     uint32
+	InNUcastPkts    uint32
+	InDiscards      uint32
+	InErrors        uint32
+	InUnknownProtos uint32
+	OutOctets       uint32
+	OutUcastPkts    uint32
+	OutNUcastPkts   uint32
+	OutDiscards     uint32
+	OutErrors       uint32
+	OutQLen         uint32
+	DescrLen        uint32
+	Descr           [MAXLEN_IFDESCR]byte
+}
+
+type CertInfo struct {
+	// Not implemented
+}
+
+type CertContext struct {
+	EncodingType uint32
+	EncodedCert  *byte
+	Length       uint32
+	CertInfo     *CertInfo
+	Store        Handle
+}
+
+type CertChainContext struct {
+	Size                       uint32
+	TrustStatus                CertTrustStatus
+	ChainCount                 uint32
+	Chains                     **CertSimpleChain
+	LowerQualityChainCount     uint32
+	LowerQualityChains         **CertChainContext
+	HasRevocationFreshnessTime uint32
+	RevocationFreshnessTime    uint32
+}
+
+type CertTrustListInfo struct {
+	// Not implemented
+}
+
+type CertSimpleChain struct {
+	Size                       uint32
+	TrustStatus                CertTrustStatus
+	NumElements                uint32
+	Elements                   **CertChainElement
+	TrustListInfo              *CertTrustListInfo
+	HasRevocationFreshnessTime uint32
+	RevocationFreshnessTime    uint32
+}
+
+type CertChainElement struct {
+	Size              uint32
+	CertContext       *CertContext
+	TrustStatus       CertTrustStatus
+	RevocationInfo    *CertRevocationInfo
+	IssuanceUsage     *CertEnhKeyUsage
+	ApplicationUsage  *CertEnhKeyUsage
+	ExtendedErrorInfo *uint16
+}
+
+type CertRevocationCrlInfo struct {
+	// Not implemented
+}
+
+type CertRevocationInfo struct {
+	Size             uint32
+	RevocationResult uint32
+	RevocationOid    *byte
+	OidSpecificInfo  Pointer
+	HasFreshnessTime uint32
+	FreshnessTime    uint32
+	CrlInfo          *CertRevocationCrlInfo
+}
+
+type CertTrustStatus struct {
+	ErrorStatus uint32
+	InfoStatus  uint32
+}
+
+type CertUsageMatch struct {
+	Type  uint32
+	Usage CertEnhKeyUsage
+}
+
+type CertEnhKeyUsage struct {
+	Length           uint32
+	UsageIdentifiers **byte
+}
+
+type CertChainPara struct {
+	Size                         uint32
+	RequestedUsage               CertUsageMatch
+	RequstedIssuancePolicy       CertUsageMatch
+	URLRetrievalTimeout          uint32
+	CheckRevocationFreshnessTime uint32
+	RevocationFreshnessTime      uint32
+	CacheResync                  *Filetime
+}
+
+type CertChainPolicyPara struct {
+	Size            uint32
+	Flags           uint32
+	ExtraPolicyPara Pointer
+}
+
+type SSLExtraCertChainPolicyPara struct {
+	Size       uint32
+	AuthType   uint32
+	Checks     uint32
+	ServerName *uint16
+}
+
+type CertChainPolicyStatus struct {
+	Size              uint32
+	Error             uint32
+	ChainIndex        uint32
+	ElementIndex      uint32
+	ExtraPolicyStatus Pointer
+}
+
+const (
+	// do not reorder
+	HKEY_CLASSES_ROOT = 0x80000000 + iota
+	HKEY_CURRENT_USER
+	HKEY_LOCAL_MACHINE
+	HKEY_USERS
+	HKEY_PERFORMANCE_DATA
+	HKEY_CURRENT_CONFIG
+	HKEY_DYN_DATA
+
+	KEY_QUERY_VALUE        = 1
+	KEY_SET_VALUE          = 2
+	KEY_CREATE_SUB_KEY     = 4
+	KEY_ENUMERATE_SUB_KEYS = 8
+	KEY_NOTIFY             = 16
+	KEY_CREATE_LINK        = 32
+	KEY_WRITE              = 0x20006
+	KEY_EXECUTE            = 0x20019
+	KEY_READ               = 0x20019
+	KEY_WOW64_64KEY        = 0x0100
+	KEY_WOW64_32KEY        = 0x0200
+	KEY_ALL_ACCESS         = 0xf003f
+)
+
+const (
+	// do not reorder
+	REG_NONE = iota
+	REG_SZ
+	REG_EXPAND_SZ
+	REG_BINARY
+	REG_DWORD_LITTLE_ENDIAN
+	REG_DWORD_BIG_ENDIAN
+	REG_LINK
+	REG_MULTI_SZ
+	REG_RESOURCE_LIST
+	REG_FULL_RESOURCE_DESCRIPTOR
+	REG_RESOURCE_REQUIREMENTS_LIST
+	REG_QWORD_LITTLE_ENDIAN
+	REG_DWORD = REG_DWORD_LITTLE_ENDIAN
+	REG_QWORD = REG_QWORD_LITTLE_ENDIAN
+)
+
+type AddrinfoW struct {
+	Flags     int32
+	Family    int32
+	Socktype  int32
+	Protocol  int32
+	Addrlen   uintptr
+	Canonname *uint16
+	Addr      uintptr
+	Next      *AddrinfoW
+}
+
+const (
+	AI_PASSIVE     = 1
+	AI_CANONNAME   = 2
+	AI_NUMERICHOST = 4
+)
+
+type GUID struct {
+	Data1 uint32
+	Data2 uint16
+	Data3 uint16
+	Data4 [8]byte
+}
+
+var WSAID_CONNECTEX = GUID{
+	0x25a207b9,
+	0xddf3,
+	0x4660,
+	[8]byte{0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e},
+}
+
+var WSAID_WSASENDMSG = GUID{
+	0xa441e712,
+	0x754f,
+	0x43ca,
+	[8]byte{0x84, 0xa7, 0x0d, 0xee, 0x44, 0xcf, 0x60, 0x6d},
+}
+
+var WSAID_WSARECVMSG = GUID{
+	0xf689d7c8,
+	0x6f1f,
+	0x436b,
+	[8]byte{0x8a, 0x53, 0xe5, 0x4f, 0xe3, 0x51, 0xc3, 0x22},
+}
+
+const (
+	FILE_SKIP_COMPLETION_PORT_ON_SUCCESS = 1
+	FILE_SKIP_SET_EVENT_ON_HANDLE        = 2
+)
+
+const (
+	WSAPROTOCOL_LEN    = 255
+	MAX_PROTOCOL_CHAIN = 7
+	BASE_PROTOCOL      = 1
+	LAYERED_PROTOCOL   = 0
+
+	XP1_CONNECTIONLESS           = 0x00000001
+	XP1_GUARANTEED_DELIVERY      = 0x00000002
+	XP1_GUARANTEED_ORDER         = 0x00000004
+	XP1_MESSAGE_ORIENTED         = 0x00000008
+	XP1_PSEUDO_STREAM            = 0x00000010
+	XP1_GRACEFUL_CLOSE           = 0x00000020
+	XP1_EXPEDITED_DATA           = 0x00000040
+	XP1_CONNECT_DATA             = 0x00000080
+	XP1_DISCONNECT_DATA          = 0x00000100
+	XP1_SUPPORT_BROADCAST        = 0x00000200
+	XP1_SUPPORT_MULTIPOINT       = 0x00000400
+	XP1_MULTIPOINT_CONTROL_PLANE = 0x00000800
+	XP1_MULTIPOINT_DATA_PLANE    = 0x00001000
+	XP1_QOS_SUPPORTED            = 0x00002000
+	XP1_UNI_SEND                 = 0x00008000
+	XP1_UNI_RECV                 = 0x00010000
+	XP1_IFS_HANDLES              = 0x00020000
+	XP1_PARTIAL_MESSAGE          = 0x00040000
+	XP1_SAN_SUPPORT_SDP          = 0x00080000
+
+	PFL_MULTIPLE_PROTO_ENTRIES  = 0x00000001
+	PFL_RECOMMENDED_PROTO_ENTRY = 0x00000002
+	PFL_HIDDEN                  = 0x00000004
+	PFL_MATCHES_PROTOCOL_ZERO   = 0x00000008
+	PFL_NETWORKDIRECT_PROVIDER  = 0x00000010
+)
+
+type WSAProtocolInfo struct {
+	ServiceFlags1     uint32
+	ServiceFlags2     uint32
+	ServiceFlags3     uint32
+	ServiceFlags4     uint32
+	ProviderFlags     uint32
+	ProviderId        GUID
+	CatalogEntryId    uint32
+	ProtocolChain     WSAProtocolChain
+	Version           int32
+	AddressFamily     int32
+	MaxSockAddr       int32
+	MinSockAddr       int32
+	SocketType        int32
+	Protocol          int32
+	ProtocolMaxOffset int32
+	NetworkByteOrder  int32
+	SecurityScheme    int32
+	MessageSize       uint32
+	ProviderReserved  uint32
+	ProtocolName      [WSAPROTOCOL_LEN + 1]uint16
+}
+
+type WSAProtocolChain struct {
+	ChainLen     int32
+	ChainEntries [MAX_PROTOCOL_CHAIN]uint32
+}
+
+type TCPKeepalive struct {
+	OnOff    uint32
+	Time     uint32
+	Interval uint32
+}
+
+type symbolicLinkReparseBuffer struct {
+	SubstituteNameOffset uint16
+	SubstituteNameLength uint16
+	PrintNameOffset      uint16
+	PrintNameLength      uint16
+	Flags                uint32
+	PathBuffer           [1]uint16
+}
+
+type mountPointReparseBuffer struct {
+	SubstituteNameOffset uint16
+	SubstituteNameLength uint16
+	PrintNameOffset      uint16
+	PrintNameLength      uint16
+	PathBuffer           [1]uint16
+}
+
+type reparseDataBuffer struct {
+	ReparseTag        uint32
+	ReparseDataLength uint16
+	Reserved          uint16
+
+	// GenericReparseBuffer
+	reparseBuffer byte
+}
+
+const (
+	FSCTL_GET_REPARSE_POINT          = 0x900A8
+	MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16 * 1024
+	IO_REPARSE_TAG_MOUNT_POINT       = 0xA0000003
+	IO_REPARSE_TAG_SYMLINK           = 0xA000000C
+	SYMBOLIC_LINK_FLAG_DIRECTORY     = 0x1
+)
+
+const (
+	ComputerNameNetBIOS                   = 0
+	ComputerNameDnsHostname               = 1
+	ComputerNameDnsDomain                 = 2
+	ComputerNameDnsFullyQualified         = 3
+	ComputerNamePhysicalNetBIOS           = 4
+	ComputerNamePhysicalDnsHostname       = 5
+	ComputerNamePhysicalDnsDomain         = 6
+	ComputerNamePhysicalDnsFullyQualified = 7
+	ComputerNameMax                       = 8
+)
+
+const (
+	MOVEFILE_REPLACE_EXISTING      = 0x1
+	MOVEFILE_COPY_ALLOWED          = 0x2
+	MOVEFILE_DELAY_UNTIL_REBOOT    = 0x4
+	MOVEFILE_WRITE_THROUGH         = 0x8
+	MOVEFILE_CREATE_HARDLINK       = 0x10
+	MOVEFILE_FAIL_IF_NOT_TRACKABLE = 0x20
+)
+
+const GAA_FLAG_INCLUDE_PREFIX = 0x00000010
+
+const (
+	IF_TYPE_OTHER              = 1
+	IF_TYPE_ETHERNET_CSMACD    = 6
+	IF_TYPE_ISO88025_TOKENRING = 9
+	IF_TYPE_PPP                = 23
+	IF_TYPE_SOFTWARE_LOOPBACK  = 24
+	IF_TYPE_ATM                = 37
+	IF_TYPE_IEEE80211          = 71
+	IF_TYPE_TUNNEL             = 131
+	IF_TYPE_IEEE1394           = 144
+)
+
+type SocketAddress struct {
+	Sockaddr       *syscall.RawSockaddrAny
+	SockaddrLength int32
+}
+
+type IpAdapterUnicastAddress struct {
+	Length             uint32
+	Flags              uint32
+	Next               *IpAdapterUnicastAddress
+	Address            SocketAddress
+	PrefixOrigin       int32
+	SuffixOrigin       int32
+	DadState           int32
+	ValidLifetime      uint32
+	PreferredLifetime  uint32
+	LeaseLifetime      uint32
+	OnLinkPrefixLength uint8
+}
+
+type IpAdapterAnycastAddress struct {
+	Length  uint32
+	Flags   uint32
+	Next    *IpAdapterAnycastAddress
+	Address SocketAddress
+}
+
+type IpAdapterMulticastAddress struct {
+	Length  uint32
+	Flags   uint32
+	Next    *IpAdapterMulticastAddress
+	Address SocketAddress
+}
+
+type IpAdapterDnsServerAdapter struct {
+	Length   uint32
+	Reserved uint32
+	Next     *IpAdapterDnsServerAdapter
+	Address  SocketAddress
+}
+
+type IpAdapterPrefix struct {
+	Length       uint32
+	Flags        uint32
+	Next         *IpAdapterPrefix
+	Address      SocketAddress
+	PrefixLength uint32
+}
+
+type IpAdapterAddresses struct {
+	Length                uint32
+	IfIndex               uint32
+	Next                  *IpAdapterAddresses
+	AdapterName           *byte
+	FirstUnicastAddress   *IpAdapterUnicastAddress
+	FirstAnycastAddress   *IpAdapterAnycastAddress
+	FirstMulticastAddress *IpAdapterMulticastAddress
+	FirstDnsServerAddress *IpAdapterDnsServerAdapter
+	DnsSuffix             *uint16
+	Description           *uint16
+	FriendlyName          *uint16
+	PhysicalAddress       [syscall.MAX_ADAPTER_ADDRESS_LENGTH]byte
+	PhysicalAddressLength uint32
+	Flags                 uint32
+	Mtu                   uint32
+	IfType                uint32
+	OperStatus            uint32
+	Ipv6IfIndex           uint32
+	ZoneIndices           [16]uint32
+	FirstPrefix           *IpAdapterPrefix
+	/* more fields might be present here. */
+}
+
+const (
+	IfOperStatusUp             = 1
+	IfOperStatusDown           = 2
+	IfOperStatusTesting        = 3
+	IfOperStatusUnknown        = 4
+	IfOperStatusDormant        = 5
+	IfOperStatusNotPresent     = 6
+	IfOperStatusLowerLayerDown = 7
+)
+
+// Console related constants used for the mode parameter to SetConsoleMode. See
+// https://docs.microsoft.com/en-us/windows/console/setconsolemode for details.
+
+const (
+	ENABLE_PROCESSED_INPUT        = 0x1
+	ENABLE_LINE_INPUT             = 0x2
+	ENABLE_ECHO_INPUT             = 0x4
+	ENABLE_WINDOW_INPUT           = 0x8
+	ENABLE_MOUSE_INPUT            = 0x10
+	ENABLE_INSERT_MODE            = 0x20
+	ENABLE_QUICK_EDIT_MODE        = 0x40
+	ENABLE_EXTENDED_FLAGS         = 0x80
+	ENABLE_AUTO_POSITION          = 0x100
+	ENABLE_VIRTUAL_TERMINAL_INPUT = 0x200
+
+	ENABLE_PROCESSED_OUTPUT            = 0x1
+	ENABLE_WRAP_AT_EOL_OUTPUT          = 0x2
+	ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x4
+	DISABLE_NEWLINE_AUTO_RETURN        = 0x8
+	ENABLE_LVB_GRID_WORLDWIDE          = 0x10
+)
+
+type Coord struct {
+	X int16
+	Y int16
+}
+
+type SmallRect struct {
+	Left   int16
+	Top    int16
+	Right  int16
+	Bottom int16
+}
+
+// Used with GetConsoleScreenBuffer to retreive information about a console
+// screen buffer. See
+// https://docs.microsoft.com/en-us/windows/console/console-screen-buffer-info-str
+// for details.
+
+type ConsoleScreenBufferInfo struct {
+	Size              Coord
+	CursorPosition    Coord
+	Attributes        uint16
+	Window            SmallRect
+	MaximumWindowSize Coord
+}
diff --git a/vendor/golang.org/x/sys/windows/types_windows_386.go b/vendor/golang.org/x/sys/windows/types_windows_386.go
new file mode 100644
index 00000000..fe0ddd03
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/types_windows_386.go
@@ -0,0 +1,22 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+type WSAData struct {
+	Version      uint16
+	HighVersion  uint16
+	Description  [WSADESCRIPTION_LEN + 1]byte
+	SystemStatus [WSASYS_STATUS_LEN + 1]byte
+	MaxSockets   uint16
+	MaxUdpDg     uint16
+	VendorInfo   *byte
+}
+
+type Servent struct {
+	Name    *byte
+	Aliases **byte
+	Port    uint16
+	Proto   *byte
+}
diff --git a/vendor/golang.org/x/sys/windows/types_windows_amd64.go b/vendor/golang.org/x/sys/windows/types_windows_amd64.go
new file mode 100644
index 00000000..7e154c2d
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/types_windows_amd64.go
@@ -0,0 +1,22 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+type WSAData struct {
+	Version      uint16
+	HighVersion  uint16
+	MaxSockets   uint16
+	MaxUdpDg     uint16
+	VendorInfo   *byte
+	Description  [WSADESCRIPTION_LEN + 1]byte
+	SystemStatus [WSASYS_STATUS_LEN + 1]byte
+}
+
+type Servent struct {
+	Name    *byte
+	Aliases **byte
+	Proto   *byte
+	Port    uint16
+}
diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
new file mode 100644
index 00000000..fc56aec0
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
@@ -0,0 +1,2700 @@
+// Code generated by 'go generate'; DO NOT EDIT.
+
+package windows
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ unsafe.Pointer
+
+// Do the interface allocations only once for common
+// Errno values.
+const (
+	errnoERROR_IO_PENDING = 997
+)
+
+var (
+	errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING)
+)
+
+// errnoErr returns common boxed Errno values, to prevent
+// allocations at runtime.
+func errnoErr(e syscall.Errno) error {
+	switch e {
+	case 0:
+		return nil
+	case errnoERROR_IO_PENDING:
+		return errERROR_IO_PENDING
+	}
+	// TODO: add more here, after collecting data on the common
+	// error values see on Windows. (perhaps when running
+	// all.bat?)
+	return e
+}
+
+var (
+	modadvapi32 = NewLazySystemDLL("advapi32.dll")
+	modkernel32 = NewLazySystemDLL("kernel32.dll")
+	modshell32  = NewLazySystemDLL("shell32.dll")
+	modmswsock  = NewLazySystemDLL("mswsock.dll")
+	modcrypt32  = NewLazySystemDLL("crypt32.dll")
+	modws2_32   = NewLazySystemDLL("ws2_32.dll")
+	moddnsapi   = NewLazySystemDLL("dnsapi.dll")
+	modiphlpapi = NewLazySystemDLL("iphlpapi.dll")
+	modsecur32  = NewLazySystemDLL("secur32.dll")
+	modnetapi32 = NewLazySystemDLL("netapi32.dll")
+	moduserenv  = NewLazySystemDLL("userenv.dll")
+
+	procRegisterEventSourceW               = modadvapi32.NewProc("RegisterEventSourceW")
+	procDeregisterEventSource              = modadvapi32.NewProc("DeregisterEventSource")
+	procReportEventW                       = modadvapi32.NewProc("ReportEventW")
+	procOpenSCManagerW                     = modadvapi32.NewProc("OpenSCManagerW")
+	procCloseServiceHandle                 = modadvapi32.NewProc("CloseServiceHandle")
+	procCreateServiceW                     = modadvapi32.NewProc("CreateServiceW")
+	procOpenServiceW                       = modadvapi32.NewProc("OpenServiceW")
+	procDeleteService                      = modadvapi32.NewProc("DeleteService")
+	procStartServiceW                      = modadvapi32.NewProc("StartServiceW")
+	procQueryServiceStatus                 = modadvapi32.NewProc("QueryServiceStatus")
+	procControlService                     = modadvapi32.NewProc("ControlService")
+	procStartServiceCtrlDispatcherW        = modadvapi32.NewProc("StartServiceCtrlDispatcherW")
+	procSetServiceStatus                   = modadvapi32.NewProc("SetServiceStatus")
+	procChangeServiceConfigW               = modadvapi32.NewProc("ChangeServiceConfigW")
+	procQueryServiceConfigW                = modadvapi32.NewProc("QueryServiceConfigW")
+	procChangeServiceConfig2W              = modadvapi32.NewProc("ChangeServiceConfig2W")
+	procQueryServiceConfig2W               = modadvapi32.NewProc("QueryServiceConfig2W")
+	procEnumServicesStatusExW              = modadvapi32.NewProc("EnumServicesStatusExW")
+	procQueryServiceStatusEx               = modadvapi32.NewProc("QueryServiceStatusEx")
+	procGetLastError                       = modkernel32.NewProc("GetLastError")
+	procLoadLibraryW                       = modkernel32.NewProc("LoadLibraryW")
+	procLoadLibraryExW                     = modkernel32.NewProc("LoadLibraryExW")
+	procFreeLibrary                        = modkernel32.NewProc("FreeLibrary")
+	procGetProcAddress                     = modkernel32.NewProc("GetProcAddress")
+	procGetVersion                         = modkernel32.NewProc("GetVersion")
+	procFormatMessageW                     = modkernel32.NewProc("FormatMessageW")
+	procExitProcess                        = modkernel32.NewProc("ExitProcess")
+	procCreateFileW                        = modkernel32.NewProc("CreateFileW")
+	procReadFile                           = modkernel32.NewProc("ReadFile")
+	procWriteFile                          = modkernel32.NewProc("WriteFile")
+	procSetFilePointer                     = modkernel32.NewProc("SetFilePointer")
+	procCloseHandle                        = modkernel32.NewProc("CloseHandle")
+	procGetStdHandle                       = modkernel32.NewProc("GetStdHandle")
+	procSetStdHandle                       = modkernel32.NewProc("SetStdHandle")
+	procFindFirstFileW                     = modkernel32.NewProc("FindFirstFileW")
+	procFindNextFileW                      = modkernel32.NewProc("FindNextFileW")
+	procFindClose                          = modkernel32.NewProc("FindClose")
+	procGetFileInformationByHandle         = modkernel32.NewProc("GetFileInformationByHandle")
+	procGetCurrentDirectoryW               = modkernel32.NewProc("GetCurrentDirectoryW")
+	procSetCurrentDirectoryW               = modkernel32.NewProc("SetCurrentDirectoryW")
+	procCreateDirectoryW                   = modkernel32.NewProc("CreateDirectoryW")
+	procRemoveDirectoryW                   = modkernel32.NewProc("RemoveDirectoryW")
+	procDeleteFileW                        = modkernel32.NewProc("DeleteFileW")
+	procMoveFileW                          = modkernel32.NewProc("MoveFileW")
+	procMoveFileExW                        = modkernel32.NewProc("MoveFileExW")
+	procGetComputerNameW                   = modkernel32.NewProc("GetComputerNameW")
+	procGetComputerNameExW                 = modkernel32.NewProc("GetComputerNameExW")
+	procSetEndOfFile                       = modkernel32.NewProc("SetEndOfFile")
+	procGetSystemTimeAsFileTime            = modkernel32.NewProc("GetSystemTimeAsFileTime")
+	procGetSystemTimePreciseAsFileTime     = modkernel32.NewProc("GetSystemTimePreciseAsFileTime")
+	procGetTimeZoneInformation             = modkernel32.NewProc("GetTimeZoneInformation")
+	procCreateIoCompletionPort             = modkernel32.NewProc("CreateIoCompletionPort")
+	procGetQueuedCompletionStatus          = modkernel32.NewProc("GetQueuedCompletionStatus")
+	procPostQueuedCompletionStatus         = modkernel32.NewProc("PostQueuedCompletionStatus")
+	procCancelIo                           = modkernel32.NewProc("CancelIo")
+	procCancelIoEx                         = modkernel32.NewProc("CancelIoEx")
+	procCreateProcessW                     = modkernel32.NewProc("CreateProcessW")
+	procOpenProcess                        = modkernel32.NewProc("OpenProcess")
+	procTerminateProcess                   = modkernel32.NewProc("TerminateProcess")
+	procGetExitCodeProcess                 = modkernel32.NewProc("GetExitCodeProcess")
+	procGetStartupInfoW                    = modkernel32.NewProc("GetStartupInfoW")
+	procGetCurrentProcess                  = modkernel32.NewProc("GetCurrentProcess")
+	procGetProcessTimes                    = modkernel32.NewProc("GetProcessTimes")
+	procDuplicateHandle                    = modkernel32.NewProc("DuplicateHandle")
+	procWaitForSingleObject                = modkernel32.NewProc("WaitForSingleObject")
+	procGetTempPathW                       = modkernel32.NewProc("GetTempPathW")
+	procCreatePipe                         = modkernel32.NewProc("CreatePipe")
+	procGetFileType                        = modkernel32.NewProc("GetFileType")
+	procCryptAcquireContextW               = modadvapi32.NewProc("CryptAcquireContextW")
+	procCryptReleaseContext                = modadvapi32.NewProc("CryptReleaseContext")
+	procCryptGenRandom                     = modadvapi32.NewProc("CryptGenRandom")
+	procGetEnvironmentStringsW             = modkernel32.NewProc("GetEnvironmentStringsW")
+	procFreeEnvironmentStringsW            = modkernel32.NewProc("FreeEnvironmentStringsW")
+	procGetEnvironmentVariableW            = modkernel32.NewProc("GetEnvironmentVariableW")
+	procSetEnvironmentVariableW            = modkernel32.NewProc("SetEnvironmentVariableW")
+	procSetFileTime                        = modkernel32.NewProc("SetFileTime")
+	procGetFileAttributesW                 = modkernel32.NewProc("GetFileAttributesW")
+	procSetFileAttributesW                 = modkernel32.NewProc("SetFileAttributesW")
+	procGetFileAttributesExW               = modkernel32.NewProc("GetFileAttributesExW")
+	procGetCommandLineW                    = modkernel32.NewProc("GetCommandLineW")
+	procCommandLineToArgvW                 = modshell32.NewProc("CommandLineToArgvW")
+	procLocalFree                          = modkernel32.NewProc("LocalFree")
+	procSetHandleInformation               = modkernel32.NewProc("SetHandleInformation")
+	procFlushFileBuffers                   = modkernel32.NewProc("FlushFileBuffers")
+	procGetFullPathNameW                   = modkernel32.NewProc("GetFullPathNameW")
+	procGetLongPathNameW                   = modkernel32.NewProc("GetLongPathNameW")
+	procGetShortPathNameW                  = modkernel32.NewProc("GetShortPathNameW")
+	procCreateFileMappingW                 = modkernel32.NewProc("CreateFileMappingW")
+	procMapViewOfFile                      = modkernel32.NewProc("MapViewOfFile")
+	procUnmapViewOfFile                    = modkernel32.NewProc("UnmapViewOfFile")
+	procFlushViewOfFile                    = modkernel32.NewProc("FlushViewOfFile")
+	procVirtualLock                        = modkernel32.NewProc("VirtualLock")
+	procVirtualUnlock                      = modkernel32.NewProc("VirtualUnlock")
+	procVirtualAlloc                       = modkernel32.NewProc("VirtualAlloc")
+	procVirtualFree                        = modkernel32.NewProc("VirtualFree")
+	procVirtualProtect                     = modkernel32.NewProc("VirtualProtect")
+	procTransmitFile                       = modmswsock.NewProc("TransmitFile")
+	procReadDirectoryChangesW              = modkernel32.NewProc("ReadDirectoryChangesW")
+	procCertOpenSystemStoreW               = modcrypt32.NewProc("CertOpenSystemStoreW")
+	procCertOpenStore                      = modcrypt32.NewProc("CertOpenStore")
+	procCertEnumCertificatesInStore        = modcrypt32.NewProc("CertEnumCertificatesInStore")
+	procCertAddCertificateContextToStore   = modcrypt32.NewProc("CertAddCertificateContextToStore")
+	procCertCloseStore                     = modcrypt32.NewProc("CertCloseStore")
+	procCertGetCertificateChain            = modcrypt32.NewProc("CertGetCertificateChain")
+	procCertFreeCertificateChain           = modcrypt32.NewProc("CertFreeCertificateChain")
+	procCertCreateCertificateContext       = modcrypt32.NewProc("CertCreateCertificateContext")
+	procCertFreeCertificateContext         = modcrypt32.NewProc("CertFreeCertificateContext")
+	procCertVerifyCertificateChainPolicy   = modcrypt32.NewProc("CertVerifyCertificateChainPolicy")
+	procRegOpenKeyExW                      = modadvapi32.NewProc("RegOpenKeyExW")
+	procRegCloseKey                        = modadvapi32.NewProc("RegCloseKey")
+	procRegQueryInfoKeyW                   = modadvapi32.NewProc("RegQueryInfoKeyW")
+	procRegEnumKeyExW                      = modadvapi32.NewProc("RegEnumKeyExW")
+	procRegQueryValueExW                   = modadvapi32.NewProc("RegQueryValueExW")
+	procGetCurrentProcessId                = modkernel32.NewProc("GetCurrentProcessId")
+	procGetConsoleMode                     = modkernel32.NewProc("GetConsoleMode")
+	procSetConsoleMode                     = modkernel32.NewProc("SetConsoleMode")
+	procGetConsoleScreenBufferInfo         = modkernel32.NewProc("GetConsoleScreenBufferInfo")
+	procWriteConsoleW                      = modkernel32.NewProc("WriteConsoleW")
+	procReadConsoleW                       = modkernel32.NewProc("ReadConsoleW")
+	procCreateToolhelp32Snapshot           = modkernel32.NewProc("CreateToolhelp32Snapshot")
+	procProcess32FirstW                    = modkernel32.NewProc("Process32FirstW")
+	procProcess32NextW                     = modkernel32.NewProc("Process32NextW")
+	procDeviceIoControl                    = modkernel32.NewProc("DeviceIoControl")
+	procCreateSymbolicLinkW                = modkernel32.NewProc("CreateSymbolicLinkW")
+	procCreateHardLinkW                    = modkernel32.NewProc("CreateHardLinkW")
+	procGetCurrentThreadId                 = modkernel32.NewProc("GetCurrentThreadId")
+	procCreateEventW                       = modkernel32.NewProc("CreateEventW")
+	procCreateEventExW                     = modkernel32.NewProc("CreateEventExW")
+	procOpenEventW                         = modkernel32.NewProc("OpenEventW")
+	procSetEvent                           = modkernel32.NewProc("SetEvent")
+	procResetEvent                         = modkernel32.NewProc("ResetEvent")
+	procPulseEvent                         = modkernel32.NewProc("PulseEvent")
+	procDefineDosDeviceW                   = modkernel32.NewProc("DefineDosDeviceW")
+	procDeleteVolumeMountPointW            = modkernel32.NewProc("DeleteVolumeMountPointW")
+	procFindFirstVolumeW                   = modkernel32.NewProc("FindFirstVolumeW")
+	procFindFirstVolumeMountPointW         = modkernel32.NewProc("FindFirstVolumeMountPointW")
+	procFindNextVolumeW                    = modkernel32.NewProc("FindNextVolumeW")
+	procFindNextVolumeMountPointW          = modkernel32.NewProc("FindNextVolumeMountPointW")
+	procFindVolumeClose                    = modkernel32.NewProc("FindVolumeClose")
+	procFindVolumeMountPointClose          = modkernel32.NewProc("FindVolumeMountPointClose")
+	procGetDriveTypeW                      = modkernel32.NewProc("GetDriveTypeW")
+	procGetLogicalDrives                   = modkernel32.NewProc("GetLogicalDrives")
+	procGetLogicalDriveStringsW            = modkernel32.NewProc("GetLogicalDriveStringsW")
+	procGetVolumeInformationW              = modkernel32.NewProc("GetVolumeInformationW")
+	procGetVolumeInformationByHandleW      = modkernel32.NewProc("GetVolumeInformationByHandleW")
+	procGetVolumeNameForVolumeMountPointW  = modkernel32.NewProc("GetVolumeNameForVolumeMountPointW")
+	procGetVolumePathNameW                 = modkernel32.NewProc("GetVolumePathNameW")
+	procGetVolumePathNamesForVolumeNameW   = modkernel32.NewProc("GetVolumePathNamesForVolumeNameW")
+	procQueryDosDeviceW                    = modkernel32.NewProc("QueryDosDeviceW")
+	procSetVolumeLabelW                    = modkernel32.NewProc("SetVolumeLabelW")
+	procSetVolumeMountPointW               = modkernel32.NewProc("SetVolumeMountPointW")
+	procWSAStartup                         = modws2_32.NewProc("WSAStartup")
+	procWSACleanup                         = modws2_32.NewProc("WSACleanup")
+	procWSAIoctl                           = modws2_32.NewProc("WSAIoctl")
+	procsocket                             = modws2_32.NewProc("socket")
+	procsetsockopt                         = modws2_32.NewProc("setsockopt")
+	procgetsockopt                         = modws2_32.NewProc("getsockopt")
+	procbind                               = modws2_32.NewProc("bind")
+	procconnect                            = modws2_32.NewProc("connect")
+	procgetsockname                        = modws2_32.NewProc("getsockname")
+	procgetpeername                        = modws2_32.NewProc("getpeername")
+	proclisten                             = modws2_32.NewProc("listen")
+	procshutdown                           = modws2_32.NewProc("shutdown")
+	procclosesocket                        = modws2_32.NewProc("closesocket")
+	procAcceptEx                           = modmswsock.NewProc("AcceptEx")
+	procGetAcceptExSockaddrs               = modmswsock.NewProc("GetAcceptExSockaddrs")
+	procWSARecv                            = modws2_32.NewProc("WSARecv")
+	procWSASend                            = modws2_32.NewProc("WSASend")
+	procWSARecvFrom                        = modws2_32.NewProc("WSARecvFrom")
+	procWSASendTo                          = modws2_32.NewProc("WSASendTo")
+	procgethostbyname                      = modws2_32.NewProc("gethostbyname")
+	procgetservbyname                      = modws2_32.NewProc("getservbyname")
+	procntohs                              = modws2_32.NewProc("ntohs")
+	procgetprotobyname                     = modws2_32.NewProc("getprotobyname")
+	procDnsQuery_W                         = moddnsapi.NewProc("DnsQuery_W")
+	procDnsRecordListFree                  = moddnsapi.NewProc("DnsRecordListFree")
+	procDnsNameCompare_W                   = moddnsapi.NewProc("DnsNameCompare_W")
+	procGetAddrInfoW                       = modws2_32.NewProc("GetAddrInfoW")
+	procFreeAddrInfoW                      = modws2_32.NewProc("FreeAddrInfoW")
+	procGetIfEntry                         = modiphlpapi.NewProc("GetIfEntry")
+	procGetAdaptersInfo                    = modiphlpapi.NewProc("GetAdaptersInfo")
+	procSetFileCompletionNotificationModes = modkernel32.NewProc("SetFileCompletionNotificationModes")
+	procWSAEnumProtocolsW                  = modws2_32.NewProc("WSAEnumProtocolsW")
+	procGetAdaptersAddresses               = modiphlpapi.NewProc("GetAdaptersAddresses")
+	procGetACP                             = modkernel32.NewProc("GetACP")
+	procMultiByteToWideChar                = modkernel32.NewProc("MultiByteToWideChar")
+	procTranslateNameW                     = modsecur32.NewProc("TranslateNameW")
+	procGetUserNameExW                     = modsecur32.NewProc("GetUserNameExW")
+	procNetUserGetInfo                     = modnetapi32.NewProc("NetUserGetInfo")
+	procNetGetJoinInformation              = modnetapi32.NewProc("NetGetJoinInformation")
+	procNetApiBufferFree                   = modnetapi32.NewProc("NetApiBufferFree")
+	procLookupAccountSidW                  = modadvapi32.NewProc("LookupAccountSidW")
+	procLookupAccountNameW                 = modadvapi32.NewProc("LookupAccountNameW")
+	procConvertSidToStringSidW             = modadvapi32.NewProc("ConvertSidToStringSidW")
+	procConvertStringSidToSidW             = modadvapi32.NewProc("ConvertStringSidToSidW")
+	procGetLengthSid                       = modadvapi32.NewProc("GetLengthSid")
+	procCopySid                            = modadvapi32.NewProc("CopySid")
+	procAllocateAndInitializeSid           = modadvapi32.NewProc("AllocateAndInitializeSid")
+	procFreeSid                            = modadvapi32.NewProc("FreeSid")
+	procEqualSid                           = modadvapi32.NewProc("EqualSid")
+	procCheckTokenMembership               = modadvapi32.NewProc("CheckTokenMembership")
+	procOpenProcessToken                   = modadvapi32.NewProc("OpenProcessToken")
+	procGetTokenInformation                = modadvapi32.NewProc("GetTokenInformation")
+	procGetUserProfileDirectoryW           = moduserenv.NewProc("GetUserProfileDirectoryW")
+)
+
+func RegisterEventSource(uncServerName *uint16, sourceName *uint16) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procRegisterEventSourceW.Addr(), 2, uintptr(unsafe.Pointer(uncServerName)), uintptr(unsafe.Pointer(sourceName)), 0)
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DeregisterEventSource(handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procDeregisterEventSource.Addr(), 1, uintptr(handle), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ReportEvent(log Handle, etype uint16, category uint16, eventId uint32, usrSId uintptr, numStrings uint16, dataSize uint32, strings **uint16, rawData *byte) (err error) {
+	r1, _, e1 := syscall.Syscall9(procReportEventW.Addr(), 9, uintptr(log), uintptr(etype), uintptr(category), uintptr(eventId), uintptr(usrSId), uintptr(numStrings), uintptr(dataSize), uintptr(unsafe.Pointer(strings)), uintptr(unsafe.Pointer(rawData)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func OpenSCManager(machineName *uint16, databaseName *uint16, access uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procOpenSCManagerW.Addr(), 3, uintptr(unsafe.Pointer(machineName)), uintptr(unsafe.Pointer(databaseName)), uintptr(access))
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CloseServiceHandle(handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procCloseServiceHandle.Addr(), 1, uintptr(handle), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateService(mgr Handle, serviceName *uint16, displayName *uint16, access uint32, srvType uint32, startType uint32, errCtl uint32, pathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall15(procCreateServiceW.Addr(), 13, uintptr(mgr), uintptr(unsafe.Pointer(serviceName)), uintptr(unsafe.Pointer(displayName)), uintptr(access), uintptr(srvType), uintptr(startType), uintptr(errCtl), uintptr(unsafe.Pointer(pathName)), uintptr(unsafe.Pointer(loadOrderGroup)), uintptr(unsafe.Pointer(tagId)), uintptr(unsafe.Pointer(dependencies)), uintptr(unsafe.Pointer(serviceStartName)), uintptr(unsafe.Pointer(password)), 0, 0)
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func OpenService(mgr Handle, serviceName *uint16, access uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procOpenServiceW.Addr(), 3, uintptr(mgr), uintptr(unsafe.Pointer(serviceName)), uintptr(access))
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DeleteService(service Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procDeleteService.Addr(), 1, uintptr(service), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func StartService(service Handle, numArgs uint32, argVectors **uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procStartServiceW.Addr(), 3, uintptr(service), uintptr(numArgs), uintptr(unsafe.Pointer(argVectors)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func QueryServiceStatus(service Handle, status *SERVICE_STATUS) (err error) {
+	r1, _, e1 := syscall.Syscall(procQueryServiceStatus.Addr(), 2, uintptr(service), uintptr(unsafe.Pointer(status)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ControlService(service Handle, control uint32, status *SERVICE_STATUS) (err error) {
+	r1, _, e1 := syscall.Syscall(procControlService.Addr(), 3, uintptr(service), uintptr(control), uintptr(unsafe.Pointer(status)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func StartServiceCtrlDispatcher(serviceTable *SERVICE_TABLE_ENTRY) (err error) {
+	r1, _, e1 := syscall.Syscall(procStartServiceCtrlDispatcherW.Addr(), 1, uintptr(unsafe.Pointer(serviceTable)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetServiceStatus(service Handle, serviceStatus *SERVICE_STATUS) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetServiceStatus.Addr(), 2, uintptr(service), uintptr(unsafe.Pointer(serviceStatus)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ChangeServiceConfig(service Handle, serviceType uint32, startType uint32, errorControl uint32, binaryPathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16, displayName *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall12(procChangeServiceConfigW.Addr(), 11, uintptr(service), uintptr(serviceType), uintptr(startType), uintptr(errorControl), uintptr(unsafe.Pointer(binaryPathName)), uintptr(unsafe.Pointer(loadOrderGroup)), uintptr(unsafe.Pointer(tagId)), uintptr(unsafe.Pointer(dependencies)), uintptr(unsafe.Pointer(serviceStartName)), uintptr(unsafe.Pointer(password)), uintptr(unsafe.Pointer(displayName)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func QueryServiceConfig(service Handle, serviceConfig *QUERY_SERVICE_CONFIG, bufSize uint32, bytesNeeded *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procQueryServiceConfigW.Addr(), 4, uintptr(service), uintptr(unsafe.Pointer(serviceConfig)), uintptr(bufSize), uintptr(unsafe.Pointer(bytesNeeded)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ChangeServiceConfig2(service Handle, infoLevel uint32, info *byte) (err error) {
+	r1, _, e1 := syscall.Syscall(procChangeServiceConfig2W.Addr(), 3, uintptr(service), uintptr(infoLevel), uintptr(unsafe.Pointer(info)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func QueryServiceConfig2(service Handle, infoLevel uint32, buff *byte, buffSize uint32, bytesNeeded *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procQueryServiceConfig2W.Addr(), 5, uintptr(service), uintptr(infoLevel), uintptr(unsafe.Pointer(buff)), uintptr(buffSize), uintptr(unsafe.Pointer(bytesNeeded)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func EnumServicesStatusEx(mgr Handle, infoLevel uint32, serviceType uint32, serviceState uint32, services *byte, bufSize uint32, bytesNeeded *uint32, servicesReturned *uint32, resumeHandle *uint32, groupName *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall12(procEnumServicesStatusExW.Addr(), 10, uintptr(mgr), uintptr(infoLevel), uintptr(serviceType), uintptr(serviceState), uintptr(unsafe.Pointer(services)), uintptr(bufSize), uintptr(unsafe.Pointer(bytesNeeded)), uintptr(unsafe.Pointer(servicesReturned)), uintptr(unsafe.Pointer(resumeHandle)), uintptr(unsafe.Pointer(groupName)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func QueryServiceStatusEx(service Handle, infoLevel uint32, buff *byte, buffSize uint32, bytesNeeded *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procQueryServiceStatusEx.Addr(), 5, uintptr(service), uintptr(infoLevel), uintptr(unsafe.Pointer(buff)), uintptr(buffSize), uintptr(unsafe.Pointer(bytesNeeded)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetLastError() (lasterr error) {
+	r0, _, _ := syscall.Syscall(procGetLastError.Addr(), 0, 0, 0, 0)
+	if r0 != 0 {
+		lasterr = syscall.Errno(r0)
+	}
+	return
+}
+
+func LoadLibrary(libname string) (handle Handle, err error) {
+	var _p0 *uint16
+	_p0, err = syscall.UTF16PtrFromString(libname)
+	if err != nil {
+		return
+	}
+	return _LoadLibrary(_p0)
+}
+
+func _LoadLibrary(libname *uint16) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procLoadLibraryW.Addr(), 1, uintptr(unsafe.Pointer(libname)), 0, 0)
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func LoadLibraryEx(libname string, zero Handle, flags uintptr) (handle Handle, err error) {
+	var _p0 *uint16
+	_p0, err = syscall.UTF16PtrFromString(libname)
+	if err != nil {
+		return
+	}
+	return _LoadLibraryEx(_p0, zero, flags)
+}
+
+func _LoadLibraryEx(libname *uint16, zero Handle, flags uintptr) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procLoadLibraryExW.Addr(), 3, uintptr(unsafe.Pointer(libname)), uintptr(zero), uintptr(flags))
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FreeLibrary(handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procFreeLibrary.Addr(), 1, uintptr(handle), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetProcAddress(module Handle, procname string) (proc uintptr, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(procname)
+	if err != nil {
+		return
+	}
+	return _GetProcAddress(module, _p0)
+}
+
+func _GetProcAddress(module Handle, procname *byte) (proc uintptr, err error) {
+	r0, _, e1 := syscall.Syscall(procGetProcAddress.Addr(), 2, uintptr(module), uintptr(unsafe.Pointer(procname)), 0)
+	proc = uintptr(r0)
+	if proc == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVersion() (ver uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetVersion.Addr(), 0, 0, 0, 0)
+	ver = uint32(r0)
+	if ver == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FormatMessage(flags uint32, msgsrc uintptr, msgid uint32, langid uint32, buf []uint16, args *byte) (n uint32, err error) {
+	var _p0 *uint16
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r0, _, e1 := syscall.Syscall9(procFormatMessageW.Addr(), 7, uintptr(flags), uintptr(msgsrc), uintptr(msgid), uintptr(langid), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(args)), 0, 0)
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ExitProcess(exitcode uint32) {
+	syscall.Syscall(procExitProcess.Addr(), 1, uintptr(exitcode), 0, 0)
+	return
+}
+
+func CreateFile(name *uint16, access uint32, mode uint32, sa *SecurityAttributes, createmode uint32, attrs uint32, templatefile int32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall9(procCreateFileW.Addr(), 7, uintptr(unsafe.Pointer(name)), uintptr(access), uintptr(mode), uintptr(unsafe.Pointer(sa)), uintptr(createmode), uintptr(attrs), uintptr(templatefile), 0, 0)
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ReadFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r1, _, e1 := syscall.Syscall6(procReadFile.Addr(), 5, uintptr(handle), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(done)), uintptr(unsafe.Pointer(overlapped)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WriteFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r1, _, e1 := syscall.Syscall6(procWriteFile.Addr(), 5, uintptr(handle), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(done)), uintptr(unsafe.Pointer(overlapped)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetFilePointer(handle Handle, lowoffset int32, highoffsetptr *int32, whence uint32) (newlowoffset uint32, err error) {
+	r0, _, e1 := syscall.Syscall6(procSetFilePointer.Addr(), 4, uintptr(handle), uintptr(lowoffset), uintptr(unsafe.Pointer(highoffsetptr)), uintptr(whence), 0, 0)
+	newlowoffset = uint32(r0)
+	if newlowoffset == 0xffffffff {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CloseHandle(handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procCloseHandle.Addr(), 1, uintptr(handle), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetStdHandle(stdhandle uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procGetStdHandle.Addr(), 1, uintptr(stdhandle), 0, 0)
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetStdHandle(stdhandle uint32, handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetStdHandle.Addr(), 2, uintptr(stdhandle), uintptr(handle), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func findFirstFile1(name *uint16, data *win32finddata1) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procFindFirstFileW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(data)), 0)
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func findNextFile1(handle Handle, data *win32finddata1) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindNextFileW.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(data)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindClose(handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindClose.Addr(), 1, uintptr(handle), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetFileInformationByHandle(handle Handle, data *ByHandleFileInformation) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetFileInformationByHandle.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(data)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetCurrentDirectory(buflen uint32, buf *uint16) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetCurrentDirectoryW.Addr(), 2, uintptr(buflen), uintptr(unsafe.Pointer(buf)), 0)
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetCurrentDirectory(path *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetCurrentDirectoryW.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateDirectory(path *uint16, sa *SecurityAttributes) (err error) {
+	r1, _, e1 := syscall.Syscall(procCreateDirectoryW.Addr(), 2, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(sa)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func RemoveDirectory(path *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procRemoveDirectoryW.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DeleteFile(path *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procDeleteFileW.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func MoveFile(from *uint16, to *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procMoveFileW.Addr(), 2, uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(to)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func MoveFileEx(from *uint16, to *uint16, flags uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procMoveFileExW.Addr(), 3, uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(to)), uintptr(flags))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetComputerName(buf *uint16, n *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetComputerNameW.Addr(), 2, uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(n)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetComputerNameEx(nametype uint32, buf *uint16, n *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetComputerNameExW.Addr(), 3, uintptr(nametype), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(n)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetEndOfFile(handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetEndOfFile.Addr(), 1, uintptr(handle), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetSystemTimeAsFileTime(time *Filetime) {
+	syscall.Syscall(procGetSystemTimeAsFileTime.Addr(), 1, uintptr(unsafe.Pointer(time)), 0, 0)
+	return
+}
+
+func GetSystemTimePreciseAsFileTime(time *Filetime) {
+	syscall.Syscall(procGetSystemTimePreciseAsFileTime.Addr(), 1, uintptr(unsafe.Pointer(time)), 0, 0)
+	return
+}
+
+func GetTimeZoneInformation(tzi *Timezoneinformation) (rc uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetTimeZoneInformation.Addr(), 1, uintptr(unsafe.Pointer(tzi)), 0, 0)
+	rc = uint32(r0)
+	if rc == 0xffffffff {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateIoCompletionPort(filehandle Handle, cphandle Handle, key uint32, threadcnt uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall6(procCreateIoCompletionPort.Addr(), 4, uintptr(filehandle), uintptr(cphandle), uintptr(key), uintptr(threadcnt), 0, 0)
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetQueuedCompletionStatus(cphandle Handle, qty *uint32, key *uint32, overlapped **Overlapped, timeout uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procGetQueuedCompletionStatus.Addr(), 5, uintptr(cphandle), uintptr(unsafe.Pointer(qty)), uintptr(unsafe.Pointer(key)), uintptr(unsafe.Pointer(overlapped)), uintptr(timeout), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func PostQueuedCompletionStatus(cphandle Handle, qty uint32, key uint32, overlapped *Overlapped) (err error) {
+	r1, _, e1 := syscall.Syscall6(procPostQueuedCompletionStatus.Addr(), 4, uintptr(cphandle), uintptr(qty), uintptr(key), uintptr(unsafe.Pointer(overlapped)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CancelIo(s Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procCancelIo.Addr(), 1, uintptr(s), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CancelIoEx(s Handle, o *Overlapped) (err error) {
+	r1, _, e1 := syscall.Syscall(procCancelIoEx.Addr(), 2, uintptr(s), uintptr(unsafe.Pointer(o)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateProcess(appName *uint16, commandLine *uint16, procSecurity *SecurityAttributes, threadSecurity *SecurityAttributes, inheritHandles bool, creationFlags uint32, env *uint16, currentDir *uint16, startupInfo *StartupInfo, outProcInfo *ProcessInformation) (err error) {
+	var _p0 uint32
+	if inheritHandles {
+		_p0 = 1
+	} else {
+		_p0 = 0
+	}
+	r1, _, e1 := syscall.Syscall12(procCreateProcessW.Addr(), 10, uintptr(unsafe.Pointer(appName)), uintptr(unsafe.Pointer(commandLine)), uintptr(unsafe.Pointer(procSecurity)), uintptr(unsafe.Pointer(threadSecurity)), uintptr(_p0), uintptr(creationFlags), uintptr(unsafe.Pointer(env)), uintptr(unsafe.Pointer(currentDir)), uintptr(unsafe.Pointer(startupInfo)), uintptr(unsafe.Pointer(outProcInfo)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func OpenProcess(da uint32, inheritHandle bool, pid uint32) (handle Handle, err error) {
+	var _p0 uint32
+	if inheritHandle {
+		_p0 = 1
+	} else {
+		_p0 = 0
+	}
+	r0, _, e1 := syscall.Syscall(procOpenProcess.Addr(), 3, uintptr(da), uintptr(_p0), uintptr(pid))
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func TerminateProcess(handle Handle, exitcode uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procTerminateProcess.Addr(), 2, uintptr(handle), uintptr(exitcode), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetExitCodeProcess(handle Handle, exitcode *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetExitCodeProcess.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(exitcode)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetStartupInfo(startupInfo *StartupInfo) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetStartupInfoW.Addr(), 1, uintptr(unsafe.Pointer(startupInfo)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetCurrentProcess() (pseudoHandle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procGetCurrentProcess.Addr(), 0, 0, 0, 0)
+	pseudoHandle = Handle(r0)
+	if pseudoHandle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetProcessTimes(handle Handle, creationTime *Filetime, exitTime *Filetime, kernelTime *Filetime, userTime *Filetime) (err error) {
+	r1, _, e1 := syscall.Syscall6(procGetProcessTimes.Addr(), 5, uintptr(handle), uintptr(unsafe.Pointer(creationTime)), uintptr(unsafe.Pointer(exitTime)), uintptr(unsafe.Pointer(kernelTime)), uintptr(unsafe.Pointer(userTime)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DuplicateHandle(hSourceProcessHandle Handle, hSourceHandle Handle, hTargetProcessHandle Handle, lpTargetHandle *Handle, dwDesiredAccess uint32, bInheritHandle bool, dwOptions uint32) (err error) {
+	var _p0 uint32
+	if bInheritHandle {
+		_p0 = 1
+	} else {
+		_p0 = 0
+	}
+	r1, _, e1 := syscall.Syscall9(procDuplicateHandle.Addr(), 7, uintptr(hSourceProcessHandle), uintptr(hSourceHandle), uintptr(hTargetProcessHandle), uintptr(unsafe.Pointer(lpTargetHandle)), uintptr(dwDesiredAccess), uintptr(_p0), uintptr(dwOptions), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WaitForSingleObject(handle Handle, waitMilliseconds uint32) (event uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procWaitForSingleObject.Addr(), 2, uintptr(handle), uintptr(waitMilliseconds), 0)
+	event = uint32(r0)
+	if event == 0xffffffff {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetTempPath(buflen uint32, buf *uint16) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetTempPathW.Addr(), 2, uintptr(buflen), uintptr(unsafe.Pointer(buf)), 0)
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreatePipe(readhandle *Handle, writehandle *Handle, sa *SecurityAttributes, size uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procCreatePipe.Addr(), 4, uintptr(unsafe.Pointer(readhandle)), uintptr(unsafe.Pointer(writehandle)), uintptr(unsafe.Pointer(sa)), uintptr(size), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetFileType(filehandle Handle) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetFileType.Addr(), 1, uintptr(filehandle), 0, 0)
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CryptAcquireContext(provhandle *Handle, container *uint16, provider *uint16, provtype uint32, flags uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procCryptAcquireContextW.Addr(), 5, uintptr(unsafe.Pointer(provhandle)), uintptr(unsafe.Pointer(container)), uintptr(unsafe.Pointer(provider)), uintptr(provtype), uintptr(flags), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CryptReleaseContext(provhandle Handle, flags uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procCryptReleaseContext.Addr(), 2, uintptr(provhandle), uintptr(flags), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CryptGenRandom(provhandle Handle, buflen uint32, buf *byte) (err error) {
+	r1, _, e1 := syscall.Syscall(procCryptGenRandom.Addr(), 3, uintptr(provhandle), uintptr(buflen), uintptr(unsafe.Pointer(buf)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetEnvironmentStrings() (envs *uint16, err error) {
+	r0, _, e1 := syscall.Syscall(procGetEnvironmentStringsW.Addr(), 0, 0, 0, 0)
+	envs = (*uint16)(unsafe.Pointer(r0))
+	if envs == nil {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FreeEnvironmentStrings(envs *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procFreeEnvironmentStringsW.Addr(), 1, uintptr(unsafe.Pointer(envs)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetEnvironmentVariable(name *uint16, buffer *uint16, size uint32) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetEnvironmentVariableW.Addr(), 3, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(buffer)), uintptr(size))
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetEnvironmentVariable(name *uint16, value *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetEnvironmentVariableW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(value)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetFileTime(handle Handle, ctime *Filetime, atime *Filetime, wtime *Filetime) (err error) {
+	r1, _, e1 := syscall.Syscall6(procSetFileTime.Addr(), 4, uintptr(handle), uintptr(unsafe.Pointer(ctime)), uintptr(unsafe.Pointer(atime)), uintptr(unsafe.Pointer(wtime)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetFileAttributes(name *uint16) (attrs uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetFileAttributesW.Addr(), 1, uintptr(unsafe.Pointer(name)), 0, 0)
+	attrs = uint32(r0)
+	if attrs == INVALID_FILE_ATTRIBUTES {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetFileAttributes(name *uint16, attrs uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetFileAttributesW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(attrs), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetFileAttributesEx(name *uint16, level uint32, info *byte) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetFileAttributesExW.Addr(), 3, uintptr(unsafe.Pointer(name)), uintptr(level), uintptr(unsafe.Pointer(info)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetCommandLine() (cmd *uint16) {
+	r0, _, _ := syscall.Syscall(procGetCommandLineW.Addr(), 0, 0, 0, 0)
+	cmd = (*uint16)(unsafe.Pointer(r0))
+	return
+}
+
+func CommandLineToArgv(cmd *uint16, argc *int32) (argv *[8192]*[8192]uint16, err error) {
+	r0, _, e1 := syscall.Syscall(procCommandLineToArgvW.Addr(), 2, uintptr(unsafe.Pointer(cmd)), uintptr(unsafe.Pointer(argc)), 0)
+	argv = (*[8192]*[8192]uint16)(unsafe.Pointer(r0))
+	if argv == nil {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func LocalFree(hmem Handle) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procLocalFree.Addr(), 1, uintptr(hmem), 0, 0)
+	handle = Handle(r0)
+	if handle != 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetHandleInformation(handle Handle, mask uint32, flags uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetHandleInformation.Addr(), 3, uintptr(handle), uintptr(mask), uintptr(flags))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FlushFileBuffers(handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procFlushFileBuffers.Addr(), 1, uintptr(handle), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetFullPathName(path *uint16, buflen uint32, buf *uint16, fname **uint16) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall6(procGetFullPathNameW.Addr(), 4, uintptr(unsafe.Pointer(path)), uintptr(buflen), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(fname)), 0, 0)
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetLongPathName(path *uint16, buf *uint16, buflen uint32) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetLongPathNameW.Addr(), 3, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(buf)), uintptr(buflen))
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetShortPathName(longpath *uint16, shortpath *uint16, buflen uint32) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetShortPathNameW.Addr(), 3, uintptr(unsafe.Pointer(longpath)), uintptr(unsafe.Pointer(shortpath)), uintptr(buflen))
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateFileMapping(fhandle Handle, sa *SecurityAttributes, prot uint32, maxSizeHigh uint32, maxSizeLow uint32, name *uint16) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall6(procCreateFileMappingW.Addr(), 6, uintptr(fhandle), uintptr(unsafe.Pointer(sa)), uintptr(prot), uintptr(maxSizeHigh), uintptr(maxSizeLow), uintptr(unsafe.Pointer(name)))
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func MapViewOfFile(handle Handle, access uint32, offsetHigh uint32, offsetLow uint32, length uintptr) (addr uintptr, err error) {
+	r0, _, e1 := syscall.Syscall6(procMapViewOfFile.Addr(), 5, uintptr(handle), uintptr(access), uintptr(offsetHigh), uintptr(offsetLow), uintptr(length), 0)
+	addr = uintptr(r0)
+	if addr == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func UnmapViewOfFile(addr uintptr) (err error) {
+	r1, _, e1 := syscall.Syscall(procUnmapViewOfFile.Addr(), 1, uintptr(addr), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FlushViewOfFile(addr uintptr, length uintptr) (err error) {
+	r1, _, e1 := syscall.Syscall(procFlushViewOfFile.Addr(), 2, uintptr(addr), uintptr(length), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func VirtualLock(addr uintptr, length uintptr) (err error) {
+	r1, _, e1 := syscall.Syscall(procVirtualLock.Addr(), 2, uintptr(addr), uintptr(length), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func VirtualUnlock(addr uintptr, length uintptr) (err error) {
+	r1, _, e1 := syscall.Syscall(procVirtualUnlock.Addr(), 2, uintptr(addr), uintptr(length), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func VirtualAlloc(address uintptr, size uintptr, alloctype uint32, protect uint32) (value uintptr, err error) {
+	r0, _, e1 := syscall.Syscall6(procVirtualAlloc.Addr(), 4, uintptr(address), uintptr(size), uintptr(alloctype), uintptr(protect), 0, 0)
+	value = uintptr(r0)
+	if value == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func VirtualFree(address uintptr, size uintptr, freetype uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procVirtualFree.Addr(), 3, uintptr(address), uintptr(size), uintptr(freetype))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func VirtualProtect(address uintptr, size uintptr, newprotect uint32, oldprotect *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procVirtualProtect.Addr(), 4, uintptr(address), uintptr(size), uintptr(newprotect), uintptr(unsafe.Pointer(oldprotect)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func TransmitFile(s Handle, handle Handle, bytesToWrite uint32, bytsPerSend uint32, overlapped *Overlapped, transmitFileBuf *TransmitFileBuffers, flags uint32) (err error) {
+	r1, _, e1 := syscall.Syscall9(procTransmitFile.Addr(), 7, uintptr(s), uintptr(handle), uintptr(bytesToWrite), uintptr(bytsPerSend), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(transmitFileBuf)), uintptr(flags), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ReadDirectoryChanges(handle Handle, buf *byte, buflen uint32, watchSubTree bool, mask uint32, retlen *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) {
+	var _p0 uint32
+	if watchSubTree {
+		_p0 = 1
+	} else {
+		_p0 = 0
+	}
+	r1, _, e1 := syscall.Syscall9(procReadDirectoryChangesW.Addr(), 8, uintptr(handle), uintptr(unsafe.Pointer(buf)), uintptr(buflen), uintptr(_p0), uintptr(mask), uintptr(unsafe.Pointer(retlen)), uintptr(unsafe.Pointer(overlapped)), uintptr(completionRoutine), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertOpenSystemStore(hprov Handle, name *uint16) (store Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procCertOpenSystemStoreW.Addr(), 2, uintptr(hprov), uintptr(unsafe.Pointer(name)), 0)
+	store = Handle(r0)
+	if store == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertOpenStore(storeProvider uintptr, msgAndCertEncodingType uint32, cryptProv uintptr, flags uint32, para uintptr) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall6(procCertOpenStore.Addr(), 5, uintptr(storeProvider), uintptr(msgAndCertEncodingType), uintptr(cryptProv), uintptr(flags), uintptr(para), 0)
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertEnumCertificatesInStore(store Handle, prevContext *CertContext) (context *CertContext, err error) {
+	r0, _, e1 := syscall.Syscall(procCertEnumCertificatesInStore.Addr(), 2, uintptr(store), uintptr(unsafe.Pointer(prevContext)), 0)
+	context = (*CertContext)(unsafe.Pointer(r0))
+	if context == nil {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertAddCertificateContextToStore(store Handle, certContext *CertContext, addDisposition uint32, storeContext **CertContext) (err error) {
+	r1, _, e1 := syscall.Syscall6(procCertAddCertificateContextToStore.Addr(), 4, uintptr(store), uintptr(unsafe.Pointer(certContext)), uintptr(addDisposition), uintptr(unsafe.Pointer(storeContext)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertCloseStore(store Handle, flags uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procCertCloseStore.Addr(), 2, uintptr(store), uintptr(flags), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertGetCertificateChain(engine Handle, leaf *CertContext, time *Filetime, additionalStore Handle, para *CertChainPara, flags uint32, reserved uintptr, chainCtx **CertChainContext) (err error) {
+	r1, _, e1 := syscall.Syscall9(procCertGetCertificateChain.Addr(), 8, uintptr(engine), uintptr(unsafe.Pointer(leaf)), uintptr(unsafe.Pointer(time)), uintptr(additionalStore), uintptr(unsafe.Pointer(para)), uintptr(flags), uintptr(reserved), uintptr(unsafe.Pointer(chainCtx)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertFreeCertificateChain(ctx *CertChainContext) {
+	syscall.Syscall(procCertFreeCertificateChain.Addr(), 1, uintptr(unsafe.Pointer(ctx)), 0, 0)
+	return
+}
+
+func CertCreateCertificateContext(certEncodingType uint32, certEncoded *byte, encodedLen uint32) (context *CertContext, err error) {
+	r0, _, e1 := syscall.Syscall(procCertCreateCertificateContext.Addr(), 3, uintptr(certEncodingType), uintptr(unsafe.Pointer(certEncoded)), uintptr(encodedLen))
+	context = (*CertContext)(unsafe.Pointer(r0))
+	if context == nil {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertFreeCertificateContext(ctx *CertContext) (err error) {
+	r1, _, e1 := syscall.Syscall(procCertFreeCertificateContext.Addr(), 1, uintptr(unsafe.Pointer(ctx)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CertVerifyCertificateChainPolicy(policyOID uintptr, chain *CertChainContext, para *CertChainPolicyPara, status *CertChainPolicyStatus) (err error) {
+	r1, _, e1 := syscall.Syscall6(procCertVerifyCertificateChainPolicy.Addr(), 4, uintptr(policyOID), uintptr(unsafe.Pointer(chain)), uintptr(unsafe.Pointer(para)), uintptr(unsafe.Pointer(status)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func RegOpenKeyEx(key Handle, subkey *uint16, options uint32, desiredAccess uint32, result *Handle) (regerrno error) {
+	r0, _, _ := syscall.Syscall6(procRegOpenKeyExW.Addr(), 5, uintptr(key), uintptr(unsafe.Pointer(subkey)), uintptr(options), uintptr(desiredAccess), uintptr(unsafe.Pointer(result)), 0)
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func RegCloseKey(key Handle) (regerrno error) {
+	r0, _, _ := syscall.Syscall(procRegCloseKey.Addr(), 1, uintptr(key), 0, 0)
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func RegQueryInfoKey(key Handle, class *uint16, classLen *uint32, reserved *uint32, subkeysLen *uint32, maxSubkeyLen *uint32, maxClassLen *uint32, valuesLen *uint32, maxValueNameLen *uint32, maxValueLen *uint32, saLen *uint32, lastWriteTime *Filetime) (regerrno error) {
+	r0, _, _ := syscall.Syscall12(procRegQueryInfoKeyW.Addr(), 12, uintptr(key), uintptr(unsafe.Pointer(class)), uintptr(unsafe.Pointer(classLen)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(subkeysLen)), uintptr(unsafe.Pointer(maxSubkeyLen)), uintptr(unsafe.Pointer(maxClassLen)), uintptr(unsafe.Pointer(valuesLen)), uintptr(unsafe.Pointer(maxValueNameLen)), uintptr(unsafe.Pointer(maxValueLen)), uintptr(unsafe.Pointer(saLen)), uintptr(unsafe.Pointer(lastWriteTime)))
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func RegEnumKeyEx(key Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, class *uint16, classLen *uint32, lastWriteTime *Filetime) (regerrno error) {
+	r0, _, _ := syscall.Syscall9(procRegEnumKeyExW.Addr(), 8, uintptr(key), uintptr(index), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(class)), uintptr(unsafe.Pointer(classLen)), uintptr(unsafe.Pointer(lastWriteTime)), 0)
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func RegQueryValueEx(key Handle, name *uint16, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) {
+	r0, _, _ := syscall.Syscall6(procRegQueryValueExW.Addr(), 6, uintptr(key), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(valtype)), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(buflen)))
+	if r0 != 0 {
+		regerrno = syscall.Errno(r0)
+	}
+	return
+}
+
+func getCurrentProcessId() (pid uint32) {
+	r0, _, _ := syscall.Syscall(procGetCurrentProcessId.Addr(), 0, 0, 0, 0)
+	pid = uint32(r0)
+	return
+}
+
+func GetConsoleMode(console Handle, mode *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(console), uintptr(unsafe.Pointer(mode)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetConsoleMode(console Handle, mode uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(console), uintptr(mode), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetConsoleScreenBufferInfo(console Handle, info *ConsoleScreenBufferInfo) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(console), uintptr(unsafe.Pointer(info)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) {
+	r1, _, e1 := syscall.Syscall6(procWriteConsoleW.Addr(), 5, uintptr(console), uintptr(unsafe.Pointer(buf)), uintptr(towrite), uintptr(unsafe.Pointer(written)), uintptr(unsafe.Pointer(reserved)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ReadConsole(console Handle, buf *uint16, toread uint32, read *uint32, inputControl *byte) (err error) {
+	r1, _, e1 := syscall.Syscall6(procReadConsoleW.Addr(), 5, uintptr(console), uintptr(unsafe.Pointer(buf)), uintptr(toread), uintptr(unsafe.Pointer(read)), uintptr(unsafe.Pointer(inputControl)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateToolhelp32Snapshot(flags uint32, processId uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procCreateToolhelp32Snapshot.Addr(), 2, uintptr(flags), uintptr(processId), 0)
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func Process32First(snapshot Handle, procEntry *ProcessEntry32) (err error) {
+	r1, _, e1 := syscall.Syscall(procProcess32FirstW.Addr(), 2, uintptr(snapshot), uintptr(unsafe.Pointer(procEntry)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func Process32Next(snapshot Handle, procEntry *ProcessEntry32) (err error) {
+	r1, _, e1 := syscall.Syscall(procProcess32NextW.Addr(), 2, uintptr(snapshot), uintptr(unsafe.Pointer(procEntry)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DeviceIoControl(handle Handle, ioControlCode uint32, inBuffer *byte, inBufferSize uint32, outBuffer *byte, outBufferSize uint32, bytesReturned *uint32, overlapped *Overlapped) (err error) {
+	r1, _, e1 := syscall.Syscall9(procDeviceIoControl.Addr(), 8, uintptr(handle), uintptr(ioControlCode), uintptr(unsafe.Pointer(inBuffer)), uintptr(inBufferSize), uintptr(unsafe.Pointer(outBuffer)), uintptr(outBufferSize), uintptr(unsafe.Pointer(bytesReturned)), uintptr(unsafe.Pointer(overlapped)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateSymbolicLink(symlinkfilename *uint16, targetfilename *uint16, flags uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procCreateSymbolicLinkW.Addr(), 3, uintptr(unsafe.Pointer(symlinkfilename)), uintptr(unsafe.Pointer(targetfilename)), uintptr(flags))
+	if r1&0xff == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateHardLink(filename *uint16, existingfilename *uint16, reserved uintptr) (err error) {
+	r1, _, e1 := syscall.Syscall(procCreateHardLinkW.Addr(), 3, uintptr(unsafe.Pointer(filename)), uintptr(unsafe.Pointer(existingfilename)), uintptr(reserved))
+	if r1&0xff == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetCurrentThreadId() (id uint32) {
+	r0, _, _ := syscall.Syscall(procGetCurrentThreadId.Addr(), 0, 0, 0, 0)
+	id = uint32(r0)
+	return
+}
+
+func CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall6(procCreateEventW.Addr(), 4, uintptr(unsafe.Pointer(eventAttrs)), uintptr(manualReset), uintptr(initialState), uintptr(unsafe.Pointer(name)), 0, 0)
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func CreateEventEx(eventAttrs *SecurityAttributes, name *uint16, flags uint32, desiredAccess uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall6(procCreateEventExW.Addr(), 4, uintptr(unsafe.Pointer(eventAttrs)), uintptr(unsafe.Pointer(name)), uintptr(flags), uintptr(desiredAccess), 0, 0)
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func OpenEvent(desiredAccess uint32, inheritHandle bool, name *uint16) (handle Handle, err error) {
+	var _p0 uint32
+	if inheritHandle {
+		_p0 = 1
+	} else {
+		_p0 = 0
+	}
+	r0, _, e1 := syscall.Syscall(procOpenEventW.Addr(), 3, uintptr(desiredAccess), uintptr(_p0), uintptr(unsafe.Pointer(name)))
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetEvent(event Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetEvent.Addr(), 1, uintptr(event), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ResetEvent(event Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procResetEvent.Addr(), 1, uintptr(event), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func PulseEvent(event Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procPulseEvent.Addr(), 1, uintptr(event), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DefineDosDevice(flags uint32, deviceName *uint16, targetPath *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procDefineDosDeviceW.Addr(), 3, uintptr(flags), uintptr(unsafe.Pointer(deviceName)), uintptr(unsafe.Pointer(targetPath)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DeleteVolumeMountPoint(volumeMountPoint *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procDeleteVolumeMountPointW.Addr(), 1, uintptr(unsafe.Pointer(volumeMountPoint)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindFirstVolume(volumeName *uint16, bufferLength uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procFindFirstVolumeW.Addr(), 2, uintptr(unsafe.Pointer(volumeName)), uintptr(bufferLength), 0)
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindFirstVolumeMountPoint(rootPathName *uint16, volumeMountPoint *uint16, bufferLength uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procFindFirstVolumeMountPointW.Addr(), 3, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(bufferLength))
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindNextVolume(findVolume Handle, volumeName *uint16, bufferLength uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindNextVolumeW.Addr(), 3, uintptr(findVolume), uintptr(unsafe.Pointer(volumeName)), uintptr(bufferLength))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindNextVolumeMountPoint(findVolumeMountPoint Handle, volumeMountPoint *uint16, bufferLength uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindNextVolumeMountPointW.Addr(), 3, uintptr(findVolumeMountPoint), uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(bufferLength))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindVolumeClose(findVolume Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindVolumeClose.Addr(), 1, uintptr(findVolume), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindVolumeMountPointClose(findVolumeMountPoint Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindVolumeMountPointClose.Addr(), 1, uintptr(findVolumeMountPoint), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetDriveType(rootPathName *uint16) (driveType uint32) {
+	r0, _, _ := syscall.Syscall(procGetDriveTypeW.Addr(), 1, uintptr(unsafe.Pointer(rootPathName)), 0, 0)
+	driveType = uint32(r0)
+	return
+}
+
+func GetLogicalDrives() (drivesBitMask uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetLogicalDrives.Addr(), 0, 0, 0, 0)
+	drivesBitMask = uint32(r0)
+	if drivesBitMask == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetLogicalDriveStrings(bufferLength uint32, buffer *uint16) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetLogicalDriveStringsW.Addr(), 2, uintptr(bufferLength), uintptr(unsafe.Pointer(buffer)), 0)
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumeInformation(rootPathName *uint16, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) {
+	r1, _, e1 := syscall.Syscall9(procGetVolumeInformationW.Addr(), 8, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeNameBuffer)), uintptr(volumeNameSize), uintptr(unsafe.Pointer(volumeNameSerialNumber)), uintptr(unsafe.Pointer(maximumComponentLength)), uintptr(unsafe.Pointer(fileSystemFlags)), uintptr(unsafe.Pointer(fileSystemNameBuffer)), uintptr(fileSystemNameSize), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumeInformationByHandle(file Handle, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) {
+	r1, _, e1 := syscall.Syscall9(procGetVolumeInformationByHandleW.Addr(), 8, uintptr(file), uintptr(unsafe.Pointer(volumeNameBuffer)), uintptr(volumeNameSize), uintptr(unsafe.Pointer(volumeNameSerialNumber)), uintptr(unsafe.Pointer(maximumComponentLength)), uintptr(unsafe.Pointer(fileSystemFlags)), uintptr(unsafe.Pointer(fileSystemNameBuffer)), uintptr(fileSystemNameSize), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumeNameForVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16, bufferlength uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetVolumeNameForVolumeMountPointW.Addr(), 3, uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(unsafe.Pointer(volumeName)), uintptr(bufferlength))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumePathName(fileName *uint16, volumePathName *uint16, bufferLength uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetVolumePathNameW.Addr(), 3, uintptr(unsafe.Pointer(fileName)), uintptr(unsafe.Pointer(volumePathName)), uintptr(bufferLength))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumePathNamesForVolumeName(volumeName *uint16, volumePathNames *uint16, bufferLength uint32, returnLength *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procGetVolumePathNamesForVolumeNameW.Addr(), 4, uintptr(unsafe.Pointer(volumeName)), uintptr(unsafe.Pointer(volumePathNames)), uintptr(bufferLength), uintptr(unsafe.Pointer(returnLength)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func QueryDosDevice(deviceName *uint16, targetPath *uint16, max uint32) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procQueryDosDeviceW.Addr(), 3, uintptr(unsafe.Pointer(deviceName)), uintptr(unsafe.Pointer(targetPath)), uintptr(max))
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetVolumeLabel(rootPathName *uint16, volumeName *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetVolumeLabelW.Addr(), 2, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeName)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetVolumeMountPointW.Addr(), 2, uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(unsafe.Pointer(volumeName)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WSAStartup(verreq uint32, data *WSAData) (sockerr error) {
+	r0, _, _ := syscall.Syscall(procWSAStartup.Addr(), 2, uintptr(verreq), uintptr(unsafe.Pointer(data)), 0)
+	if r0 != 0 {
+		sockerr = syscall.Errno(r0)
+	}
+	return
+}
+
+func WSACleanup() (err error) {
+	r1, _, e1 := syscall.Syscall(procWSACleanup.Addr(), 0, 0, 0, 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbob uint32, cbbr *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) {
+	r1, _, e1 := syscall.Syscall9(procWSAIoctl.Addr(), 9, uintptr(s), uintptr(iocc), uintptr(unsafe.Pointer(inbuf)), uintptr(cbif), uintptr(unsafe.Pointer(outbuf)), uintptr(cbob), uintptr(unsafe.Pointer(cbbr)), uintptr(unsafe.Pointer(overlapped)), uintptr(completionRoutine))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func socket(af int32, typ int32, protocol int32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procsocket.Addr(), 3, uintptr(af), uintptr(typ), uintptr(protocol))
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func Setsockopt(s Handle, level int32, optname int32, optval *byte, optlen int32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procsetsockopt.Addr(), 5, uintptr(s), uintptr(level), uintptr(optname), uintptr(unsafe.Pointer(optval)), uintptr(optlen), 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func Getsockopt(s Handle, level int32, optname int32, optval *byte, optlen *int32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procgetsockopt.Addr(), 5, uintptr(s), uintptr(level), uintptr(optname), uintptr(unsafe.Pointer(optval)), uintptr(unsafe.Pointer(optlen)), 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func bind(s Handle, name unsafe.Pointer, namelen int32) (err error) {
+	r1, _, e1 := syscall.Syscall(procbind.Addr(), 3, uintptr(s), uintptr(name), uintptr(namelen))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func connect(s Handle, name unsafe.Pointer, namelen int32) (err error) {
+	r1, _, e1 := syscall.Syscall(procconnect.Addr(), 3, uintptr(s), uintptr(name), uintptr(namelen))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func getsockname(s Handle, rsa *RawSockaddrAny, addrlen *int32) (err error) {
+	r1, _, e1 := syscall.Syscall(procgetsockname.Addr(), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func getpeername(s Handle, rsa *RawSockaddrAny, addrlen *int32) (err error) {
+	r1, _, e1 := syscall.Syscall(procgetpeername.Addr(), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func listen(s Handle, backlog int32) (err error) {
+	r1, _, e1 := syscall.Syscall(proclisten.Addr(), 2, uintptr(s), uintptr(backlog), 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func shutdown(s Handle, how int32) (err error) {
+	r1, _, e1 := syscall.Syscall(procshutdown.Addr(), 2, uintptr(s), uintptr(how), 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func Closesocket(s Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procclosesocket.Addr(), 1, uintptr(s), 0, 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func AcceptEx(ls Handle, as Handle, buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, recvd *uint32, overlapped *Overlapped) (err error) {
+	r1, _, e1 := syscall.Syscall9(procAcceptEx.Addr(), 8, uintptr(ls), uintptr(as), uintptr(unsafe.Pointer(buf)), uintptr(rxdatalen), uintptr(laddrlen), uintptr(raddrlen), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(overlapped)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetAcceptExSockaddrs(buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, lrsa **RawSockaddrAny, lrsalen *int32, rrsa **RawSockaddrAny, rrsalen *int32) {
+	syscall.Syscall9(procGetAcceptExSockaddrs.Addr(), 8, uintptr(unsafe.Pointer(buf)), uintptr(rxdatalen), uintptr(laddrlen), uintptr(raddrlen), uintptr(unsafe.Pointer(lrsa)), uintptr(unsafe.Pointer(lrsalen)), uintptr(unsafe.Pointer(rrsa)), uintptr(unsafe.Pointer(rrsalen)), 0)
+	return
+}
+
+func WSARecv(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, overlapped *Overlapped, croutine *byte) (err error) {
+	r1, _, e1 := syscall.Syscall9(procWSARecv.Addr(), 7, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0, 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WSASend(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, overlapped *Overlapped, croutine *byte) (err error) {
+	r1, _, e1 := syscall.Syscall9(procWSASend.Addr(), 7, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(sent)), uintptr(flags), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0, 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WSARecvFrom(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, from *RawSockaddrAny, fromlen *int32, overlapped *Overlapped, croutine *byte) (err error) {
+	r1, _, e1 := syscall.Syscall9(procWSARecvFrom.Addr(), 9, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WSASendTo(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to *RawSockaddrAny, tolen int32, overlapped *Overlapped, croutine *byte) (err error) {
+	r1, _, e1 := syscall.Syscall9(procWSASendTo.Addr(), 9, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(sent)), uintptr(flags), uintptr(unsafe.Pointer(to)), uintptr(tolen), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetHostByName(name string) (h *Hostent, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	return _GetHostByName(_p0)
+}
+
+func _GetHostByName(name *byte) (h *Hostent, err error) {
+	r0, _, e1 := syscall.Syscall(procgethostbyname.Addr(), 1, uintptr(unsafe.Pointer(name)), 0, 0)
+	h = (*Hostent)(unsafe.Pointer(r0))
+	if h == nil {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetServByName(name string, proto string) (s *Servent, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(proto)
+	if err != nil {
+		return
+	}
+	return _GetServByName(_p0, _p1)
+}
+
+func _GetServByName(name *byte, proto *byte) (s *Servent, err error) {
+	r0, _, e1 := syscall.Syscall(procgetservbyname.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(proto)), 0)
+	s = (*Servent)(unsafe.Pointer(r0))
+	if s == nil {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func Ntohs(netshort uint16) (u uint16) {
+	r0, _, _ := syscall.Syscall(procntohs.Addr(), 1, uintptr(netshort), 0, 0)
+	u = uint16(r0)
+	return
+}
+
+func GetProtoByName(name string) (p *Protoent, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	return _GetProtoByName(_p0)
+}
+
+func _GetProtoByName(name *byte) (p *Protoent, err error) {
+	r0, _, e1 := syscall.Syscall(procgetprotobyname.Addr(), 1, uintptr(unsafe.Pointer(name)), 0, 0)
+	p = (*Protoent)(unsafe.Pointer(r0))
+	if p == nil {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DnsQuery(name string, qtype uint16, options uint32, extra *byte, qrs **DNSRecord, pr *byte) (status error) {
+	var _p0 *uint16
+	_p0, status = syscall.UTF16PtrFromString(name)
+	if status != nil {
+		return
+	}
+	return _DnsQuery(_p0, qtype, options, extra, qrs, pr)
+}
+
+func _DnsQuery(name *uint16, qtype uint16, options uint32, extra *byte, qrs **DNSRecord, pr *byte) (status error) {
+	r0, _, _ := syscall.Syscall6(procDnsQuery_W.Addr(), 6, uintptr(unsafe.Pointer(name)), uintptr(qtype), uintptr(options), uintptr(unsafe.Pointer(extra)), uintptr(unsafe.Pointer(qrs)), uintptr(unsafe.Pointer(pr)))
+	if r0 != 0 {
+		status = syscall.Errno(r0)
+	}
+	return
+}
+
+func DnsRecordListFree(rl *DNSRecord, freetype uint32) {
+	syscall.Syscall(procDnsRecordListFree.Addr(), 2, uintptr(unsafe.Pointer(rl)), uintptr(freetype), 0)
+	return
+}
+
+func DnsNameCompare(name1 *uint16, name2 *uint16) (same bool) {
+	r0, _, _ := syscall.Syscall(procDnsNameCompare_W.Addr(), 2, uintptr(unsafe.Pointer(name1)), uintptr(unsafe.Pointer(name2)), 0)
+	same = r0 != 0
+	return
+}
+
+func GetAddrInfoW(nodename *uint16, servicename *uint16, hints *AddrinfoW, result **AddrinfoW) (sockerr error) {
+	r0, _, _ := syscall.Syscall6(procGetAddrInfoW.Addr(), 4, uintptr(unsafe.Pointer(nodename)), uintptr(unsafe.Pointer(servicename)), uintptr(unsafe.Pointer(hints)), uintptr(unsafe.Pointer(result)), 0, 0)
+	if r0 != 0 {
+		sockerr = syscall.Errno(r0)
+	}
+	return
+}
+
+func FreeAddrInfoW(addrinfo *AddrinfoW) {
+	syscall.Syscall(procFreeAddrInfoW.Addr(), 1, uintptr(unsafe.Pointer(addrinfo)), 0, 0)
+	return
+}
+
+func GetIfEntry(pIfRow *MibIfRow) (errcode error) {
+	r0, _, _ := syscall.Syscall(procGetIfEntry.Addr(), 1, uintptr(unsafe.Pointer(pIfRow)), 0, 0)
+	if r0 != 0 {
+		errcode = syscall.Errno(r0)
+	}
+	return
+}
+
+func GetAdaptersInfo(ai *IpAdapterInfo, ol *uint32) (errcode error) {
+	r0, _, _ := syscall.Syscall(procGetAdaptersInfo.Addr(), 2, uintptr(unsafe.Pointer(ai)), uintptr(unsafe.Pointer(ol)), 0)
+	if r0 != 0 {
+		errcode = syscall.Errno(r0)
+	}
+	return
+}
+
+func SetFileCompletionNotificationModes(handle Handle, flags uint8) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetFileCompletionNotificationModes.Addr(), 2, uintptr(handle), uintptr(flags), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func WSAEnumProtocols(protocols *int32, protocolBuffer *WSAProtocolInfo, bufferLength *uint32) (n int32, err error) {
+	r0, _, e1 := syscall.Syscall(procWSAEnumProtocolsW.Addr(), 3, uintptr(unsafe.Pointer(protocols)), uintptr(unsafe.Pointer(protocolBuffer)), uintptr(unsafe.Pointer(bufferLength)))
+	n = int32(r0)
+	if n == -1 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizePointer *uint32) (errcode error) {
+	r0, _, _ := syscall.Syscall6(procGetAdaptersAddresses.Addr(), 5, uintptr(family), uintptr(flags), uintptr(reserved), uintptr(unsafe.Pointer(adapterAddresses)), uintptr(unsafe.Pointer(sizePointer)), 0)
+	if r0 != 0 {
+		errcode = syscall.Errno(r0)
+	}
+	return
+}
+
+func GetACP() (acp uint32) {
+	r0, _, _ := syscall.Syscall(procGetACP.Addr(), 0, 0, 0, 0)
+	acp = uint32(r0)
+	return
+}
+
+func MultiByteToWideChar(codePage uint32, dwFlags uint32, str *byte, nstr int32, wchar *uint16, nwchar int32) (nwrite int32, err error) {
+	r0, _, e1 := syscall.Syscall6(procMultiByteToWideChar.Addr(), 6, uintptr(codePage), uintptr(dwFlags), uintptr(unsafe.Pointer(str)), uintptr(nstr), uintptr(unsafe.Pointer(wchar)), uintptr(nwchar))
+	nwrite = int32(r0)
+	if nwrite == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func TranslateName(accName *uint16, accNameFormat uint32, desiredNameFormat uint32, translatedName *uint16, nSize *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procTranslateNameW.Addr(), 5, uintptr(unsafe.Pointer(accName)), uintptr(accNameFormat), uintptr(desiredNameFormat), uintptr(unsafe.Pointer(translatedName)), uintptr(unsafe.Pointer(nSize)), 0)
+	if r1&0xff == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetUserNameEx(nameFormat uint32, nameBuffre *uint16, nSize *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetUserNameExW.Addr(), 3, uintptr(nameFormat), uintptr(unsafe.Pointer(nameBuffre)), uintptr(unsafe.Pointer(nSize)))
+	if r1&0xff == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func NetUserGetInfo(serverName *uint16, userName *uint16, level uint32, buf **byte) (neterr error) {
+	r0, _, _ := syscall.Syscall6(procNetUserGetInfo.Addr(), 4, uintptr(unsafe.Pointer(serverName)), uintptr(unsafe.Pointer(userName)), uintptr(level), uintptr(unsafe.Pointer(buf)), 0, 0)
+	if r0 != 0 {
+		neterr = syscall.Errno(r0)
+	}
+	return
+}
+
+func NetGetJoinInformation(server *uint16, name **uint16, bufType *uint32) (neterr error) {
+	r0, _, _ := syscall.Syscall(procNetGetJoinInformation.Addr(), 3, uintptr(unsafe.Pointer(server)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(bufType)))
+	if r0 != 0 {
+		neterr = syscall.Errno(r0)
+	}
+	return
+}
+
+func NetApiBufferFree(buf *byte) (neterr error) {
+	r0, _, _ := syscall.Syscall(procNetApiBufferFree.Addr(), 1, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if r0 != 0 {
+		neterr = syscall.Errno(r0)
+	}
+	return
+}
+
+func LookupAccountSid(systemName *uint16, sid *SID, name *uint16, nameLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall9(procLookupAccountSidW.Addr(), 7, uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)), uintptr(unsafe.Pointer(refdDomainName)), uintptr(unsafe.Pointer(refdDomainNameLen)), uintptr(unsafe.Pointer(use)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func LookupAccountName(systemName *uint16, accountName *uint16, sid *SID, sidLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall9(procLookupAccountNameW.Addr(), 7, uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(accountName)), uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(sidLen)), uintptr(unsafe.Pointer(refdDomainName)), uintptr(unsafe.Pointer(refdDomainNameLen)), uintptr(unsafe.Pointer(use)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ConvertSidToStringSid(sid *SID, stringSid **uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procConvertSidToStringSidW.Addr(), 2, uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(stringSid)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func ConvertStringSidToSid(stringSid *uint16, sid **SID) (err error) {
+	r1, _, e1 := syscall.Syscall(procConvertStringSidToSidW.Addr(), 2, uintptr(unsafe.Pointer(stringSid)), uintptr(unsafe.Pointer(sid)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetLengthSid(sid *SID) (len uint32) {
+	r0, _, _ := syscall.Syscall(procGetLengthSid.Addr(), 1, uintptr(unsafe.Pointer(sid)), 0, 0)
+	len = uint32(r0)
+	return
+}
+
+func CopySid(destSidLen uint32, destSid *SID, srcSid *SID) (err error) {
+	r1, _, e1 := syscall.Syscall(procCopySid.Addr(), 3, uintptr(destSidLen), uintptr(unsafe.Pointer(destSid)), uintptr(unsafe.Pointer(srcSid)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func AllocateAndInitializeSid(identAuth *SidIdentifierAuthority, subAuth byte, subAuth0 uint32, subAuth1 uint32, subAuth2 uint32, subAuth3 uint32, subAuth4 uint32, subAuth5 uint32, subAuth6 uint32, subAuth7 uint32, sid **SID) (err error) {
+	r1, _, e1 := syscall.Syscall12(procAllocateAndInitializeSid.Addr(), 11, uintptr(unsafe.Pointer(identAuth)), uintptr(subAuth), uintptr(subAuth0), uintptr(subAuth1), uintptr(subAuth2), uintptr(subAuth3), uintptr(subAuth4), uintptr(subAuth5), uintptr(subAuth6), uintptr(subAuth7), uintptr(unsafe.Pointer(sid)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FreeSid(sid *SID) (err error) {
+	r1, _, e1 := syscall.Syscall(procFreeSid.Addr(), 1, uintptr(unsafe.Pointer(sid)), 0, 0)
+	if r1 != 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func EqualSid(sid1 *SID, sid2 *SID) (isEqual bool) {
+	r0, _, _ := syscall.Syscall(procEqualSid.Addr(), 2, uintptr(unsafe.Pointer(sid1)), uintptr(unsafe.Pointer(sid2)), 0)
+	isEqual = r0 != 0
+	return
+}
+
+func checkTokenMembership(tokenHandle Token, sidToCheck *SID, isMember *int32) (err error) {
+	r1, _, e1 := syscall.Syscall(procCheckTokenMembership.Addr(), 3, uintptr(tokenHandle), uintptr(unsafe.Pointer(sidToCheck)), uintptr(unsafe.Pointer(isMember)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func OpenProcessToken(h Handle, access uint32, token *Token) (err error) {
+	r1, _, e1 := syscall.Syscall(procOpenProcessToken.Addr(), 3, uintptr(h), uintptr(access), uintptr(unsafe.Pointer(token)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetTokenInformation(t Token, infoClass uint32, info *byte, infoLen uint32, returnedLen *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procGetTokenInformation.Addr(), 5, uintptr(t), uintptr(infoClass), uintptr(unsafe.Pointer(info)), uintptr(infoLen), uintptr(unsafe.Pointer(returnedLen)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetUserProfileDirectoryW.Addr(), 3, uintptr(t), uintptr(unsafe.Pointer(dir)), uintptr(unsafe.Pointer(dirLen)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
diff --git a/vendor/google.golang.org/genproto/.travis.yml b/vendor/google.golang.org/genproto/.travis.yml
index e673e05e..bbe8fb30 100644
--- a/vendor/google.golang.org/genproto/.travis.yml
+++ b/vendor/google.golang.org/genproto/.travis.yml
@@ -2,7 +2,7 @@ language: go
 go:
   - 1.6
   - 1.7
-  - 1.8
+  - 1.x
 go_import_path: google.golang.org/genproto
 
 script:
diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go
index 53d57f67..9521b50e 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go
@@ -1,24 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/annotations.proto
 
-/*
-Package annotations is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/annotations.proto
-	google/api/http.proto
-
-It has these top-level messages:
-	Http
-	HttpRule
-	CustomHttpPattern
-*/
-package annotations
+package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
+import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -32,7 +20,7 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 var E_Http = &proto.ExtensionDesc{
-	ExtendedType:  (*google_protobuf.MethodOptions)(nil),
+	ExtendedType:  (*descriptor.MethodOptions)(nil),
 	ExtensionType: (*HttpRule)(nil),
 	Field:         72295728,
 	Name:          "google.api.http",
@@ -44,9 +32,11 @@ func init() {
 	proto.RegisterExtension(E_Http)
 }
 
-func init() { proto.RegisterFile("google/api/annotations.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/api/annotations.proto", fileDescriptor_annotations_55609bb51d80951d)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_annotations_55609bb51d80951d = []byte{
 	// 208 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xcc, 0xcb, 0xcb, 0x2f, 0x49, 0x2c, 0xc9, 0xcc,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go
index 73f050f7..1a8a27b6 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/http.proto
 
-package annotations
+package annotations // import "google.golang.org/genproto/googleapis/api/annotations"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Defines the HTTP configuration for an API service. It contains a list of
 // [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
 // to one or more HTTP REST API methods.
@@ -19,20 +25,42 @@ type Http struct {
 	// A list of HTTP configuration rules that apply to individual API methods.
 	//
 	// **NOTE:** All service configuration rules follow "last one wins" order.
-	Rules []*HttpRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"`
+	Rules []*HttpRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
 	// When set to true, URL path parmeters will be fully URI-decoded except in
 	// cases of single segment matches in reserved expansion, where "%2F" will be
 	// left encoded.
 	//
 	// The default behavior is to not decode RFC 6570 reserved characters in multi
 	// segment matches.
-	FullyDecodeReservedExpansion bool `protobuf:"varint,2,opt,name=fully_decode_reserved_expansion,json=fullyDecodeReservedExpansion" json:"fully_decode_reserved_expansion,omitempty"`
+	FullyDecodeReservedExpansion bool     `protobuf:"varint,2,opt,name=fully_decode_reserved_expansion,json=fullyDecodeReservedExpansion,proto3" json:"fully_decode_reserved_expansion,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	XXX_unrecognized             []byte   `json:"-"`
+	XXX_sizecache                int32    `json:"-"`
 }
 
-func (m *Http) Reset()                    { *m = Http{} }
-func (m *Http) String() string            { return proto.CompactTextString(m) }
-func (*Http) ProtoMessage()               {}
-func (*Http) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *Http) Reset()         { *m = Http{} }
+func (m *Http) String() string { return proto.CompactTextString(m) }
+func (*Http) ProtoMessage()    {}
+func (*Http) Descriptor() ([]byte, []int) {
+	return fileDescriptor_http_e457621dddd7365b, []int{0}
+}
+func (m *Http) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Http.Unmarshal(m, b)
+}
+func (m *Http) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Http.Marshal(b, m, deterministic)
+}
+func (dst *Http) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Http.Merge(dst, src)
+}
+func (m *Http) XXX_Size() int {
+	return xxx_messageInfo_Http.Size(m)
+}
+func (m *Http) XXX_DiscardUnknown() {
+	xxx_messageInfo_Http.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Http proto.InternalMessageInfo
 
 func (m *Http) GetRules() []*HttpRule {
 	if m != nil {
@@ -269,7 +297,7 @@ type HttpRule struct {
 	// Selects methods to which this rule applies.
 	//
 	// Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
-	Selector string `protobuf:"bytes,1,opt,name=selector" json:"selector,omitempty"`
+	Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"`
 	// Determines the URL pattern is matched by this rules. This pattern can be
 	// used with any of the {get|put|post|delete|patch} methods. A custom method
 	// can be defined using the 'custom' field.
@@ -286,46 +314,89 @@ type HttpRule struct {
 	// `*` for mapping all fields not captured by the path pattern to the HTTP
 	// body. NOTE: the referred field must not be a repeated field and must be
 	// present at the top-level of request message type.
-	Body string `protobuf:"bytes,7,opt,name=body" json:"body,omitempty"`
+	Body string `protobuf:"bytes,7,opt,name=body,proto3" json:"body,omitempty"`
+	// Optional. The name of the response field whose value is mapped to the HTTP
+	// body of response. Other response fields are ignored. When
+	// not set, the response message will be used as HTTP body of response.
+	ResponseBody string `protobuf:"bytes,12,opt,name=response_body,json=responseBody,proto3" json:"response_body,omitempty"`
 	// Additional HTTP bindings for the selector. Nested bindings must
 	// not contain an `additional_bindings` field themselves (that is,
 	// the nesting may only be one level deep).
-	AdditionalBindings []*HttpRule `protobuf:"bytes,11,rep,name=additional_bindings,json=additionalBindings" json:"additional_bindings,omitempty"`
+	AdditionalBindings   []*HttpRule `protobuf:"bytes,11,rep,name=additional_bindings,json=additionalBindings,proto3" json:"additional_bindings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *HttpRule) Reset()         { *m = HttpRule{} }
+func (m *HttpRule) String() string { return proto.CompactTextString(m) }
+func (*HttpRule) ProtoMessage()    {}
+func (*HttpRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_http_e457621dddd7365b, []int{1}
+}
+func (m *HttpRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpRule.Unmarshal(m, b)
+}
+func (m *HttpRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpRule.Marshal(b, m, deterministic)
+}
+func (dst *HttpRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpRule.Merge(dst, src)
+}
+func (m *HttpRule) XXX_Size() int {
+	return xxx_messageInfo_HttpRule.Size(m)
+}
+func (m *HttpRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpRule.DiscardUnknown(m)
 }
 
-func (m *HttpRule) Reset()                    { *m = HttpRule{} }
-func (m *HttpRule) String() string            { return proto.CompactTextString(m) }
-func (*HttpRule) ProtoMessage()               {}
-func (*HttpRule) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_HttpRule proto.InternalMessageInfo
+
+func (m *HttpRule) GetSelector() string {
+	if m != nil {
+		return m.Selector
+	}
+	return ""
+}
 
 type isHttpRule_Pattern interface {
 	isHttpRule_Pattern()
 }
 
 type HttpRule_Get struct {
-	Get string `protobuf:"bytes,2,opt,name=get,oneof"`
+	Get string `protobuf:"bytes,2,opt,name=get,proto3,oneof"`
 }
+
 type HttpRule_Put struct {
-	Put string `protobuf:"bytes,3,opt,name=put,oneof"`
+	Put string `protobuf:"bytes,3,opt,name=put,proto3,oneof"`
 }
+
 type HttpRule_Post struct {
-	Post string `protobuf:"bytes,4,opt,name=post,oneof"`
+	Post string `protobuf:"bytes,4,opt,name=post,proto3,oneof"`
 }
+
 type HttpRule_Delete struct {
-	Delete string `protobuf:"bytes,5,opt,name=delete,oneof"`
+	Delete string `protobuf:"bytes,5,opt,name=delete,proto3,oneof"`
 }
+
 type HttpRule_Patch struct {
-	Patch string `protobuf:"bytes,6,opt,name=patch,oneof"`
+	Patch string `protobuf:"bytes,6,opt,name=patch,proto3,oneof"`
 }
+
 type HttpRule_Custom struct {
-	Custom *CustomHttpPattern `protobuf:"bytes,8,opt,name=custom,oneof"`
+	Custom *CustomHttpPattern `protobuf:"bytes,8,opt,name=custom,proto3,oneof"`
 }
 
-func (*HttpRule_Get) isHttpRule_Pattern()    {}
-func (*HttpRule_Put) isHttpRule_Pattern()    {}
-func (*HttpRule_Post) isHttpRule_Pattern()   {}
+func (*HttpRule_Get) isHttpRule_Pattern() {}
+
+func (*HttpRule_Put) isHttpRule_Pattern() {}
+
+func (*HttpRule_Post) isHttpRule_Pattern() {}
+
 func (*HttpRule_Delete) isHttpRule_Pattern() {}
-func (*HttpRule_Patch) isHttpRule_Pattern()  {}
+
+func (*HttpRule_Patch) isHttpRule_Pattern() {}
+
 func (*HttpRule_Custom) isHttpRule_Pattern() {}
 
 func (m *HttpRule) GetPattern() isHttpRule_Pattern {
@@ -335,13 +406,6 @@ func (m *HttpRule) GetPattern() isHttpRule_Pattern {
 	return nil
 }
 
-func (m *HttpRule) GetSelector() string {
-	if m != nil {
-		return m.Selector
-	}
-	return ""
-}
-
 func (m *HttpRule) GetGet() string {
 	if x, ok := m.GetPattern().(*HttpRule_Get); ok {
 		return x.Get
@@ -391,6 +455,13 @@ func (m *HttpRule) GetBody() string {
 	return ""
 }
 
+func (m *HttpRule) GetResponseBody() string {
+	if m != nil {
+		return m.ResponseBody
+	}
+	return ""
+}
+
 func (m *HttpRule) GetAdditionalBindings() []*HttpRule {
 	if m != nil {
 		return m.AdditionalBindings
@@ -497,28 +568,28 @@ func _HttpRule_OneofSizer(msg proto.Message) (n int) {
 	// pattern
 	switch x := m.Pattern.(type) {
 	case *HttpRule_Get:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Get)))
 		n += len(x.Get)
 	case *HttpRule_Put:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Put)))
 		n += len(x.Put)
 	case *HttpRule_Post:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Post)))
 		n += len(x.Post)
 	case *HttpRule_Delete:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Delete)))
 		n += len(x.Delete)
 	case *HttpRule_Patch:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Patch)))
 		n += len(x.Patch)
 	case *HttpRule_Custom:
 		s := proto.Size(x.Custom)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -531,15 +602,37 @@ func _HttpRule_OneofSizer(msg proto.Message) (n int) {
 // A custom pattern is used for defining custom HTTP verb.
 type CustomHttpPattern struct {
 	// The name of this custom HTTP verb.
-	Kind string `protobuf:"bytes,1,opt,name=kind" json:"kind,omitempty"`
+	Kind string `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"`
 	// The path matched by this custom verb.
-	Path string `protobuf:"bytes,2,opt,name=path" json:"path,omitempty"`
+	Path                 string   `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CustomHttpPattern) Reset()         { *m = CustomHttpPattern{} }
+func (m *CustomHttpPattern) String() string { return proto.CompactTextString(m) }
+func (*CustomHttpPattern) ProtoMessage()    {}
+func (*CustomHttpPattern) Descriptor() ([]byte, []int) {
+	return fileDescriptor_http_e457621dddd7365b, []int{2}
+}
+func (m *CustomHttpPattern) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomHttpPattern.Unmarshal(m, b)
+}
+func (m *CustomHttpPattern) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomHttpPattern.Marshal(b, m, deterministic)
+}
+func (dst *CustomHttpPattern) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomHttpPattern.Merge(dst, src)
+}
+func (m *CustomHttpPattern) XXX_Size() int {
+	return xxx_messageInfo_CustomHttpPattern.Size(m)
+}
+func (m *CustomHttpPattern) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomHttpPattern.DiscardUnknown(m)
 }
 
-func (m *CustomHttpPattern) Reset()                    { *m = CustomHttpPattern{} }
-func (m *CustomHttpPattern) String() string            { return proto.CompactTextString(m) }
-func (*CustomHttpPattern) ProtoMessage()               {}
-func (*CustomHttpPattern) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_CustomHttpPattern proto.InternalMessageInfo
 
 func (m *CustomHttpPattern) GetKind() string {
 	if m != nil {
@@ -561,34 +654,35 @@ func init() {
 	proto.RegisterType((*CustomHttpPattern)(nil), "google.api.CustomHttpPattern")
 }
 
-func init() { proto.RegisterFile("google/api/http.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 401 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0xab, 0x13, 0x31,
-	0x10, 0xc7, 0xdd, 0x76, 0xdb, 0xd7, 0x4e, 0x41, 0x30, 0x3e, 0x25, 0x88, 0x62, 0xe9, 0xa9, 0x78,
-	0xd8, 0xc2, 0xf3, 0xe0, 0xe1, 0x9d, 0x5e, 0xb5, 0xf8, 0xbc, 0x95, 0x3d, 0x7a, 0x29, 0xe9, 0x66,
-	0x4c, 0xa3, 0x79, 0x49, 0xd8, 0xcc, 0x8a, 0xfd, 0x3a, 0x7e, 0x07, 0xbf, 0x9b, 0x47, 0x49, 0x36,
-	0xb5, 0x05, 0xc1, 0xdb, 0xfc, 0xff, 0xf3, 0xcb, 0xcc, 0x64, 0x18, 0x78, 0xa6, 0x9c, 0x53, 0x06,
-	0x57, 0xc2, 0xeb, 0xd5, 0x81, 0xc8, 0x57, 0xbe, 0x75, 0xe4, 0x18, 0xf4, 0x76, 0x25, 0xbc, 0x5e,
-	0x1c, 0xa1, 0xbc, 0x27, 0xf2, 0xec, 0x0d, 0x8c, 0xda, 0xce, 0x60, 0xe0, 0xc5, 0x7c, 0xb8, 0x9c,
-	0xdd, 0x5c, 0x57, 0x67, 0xa6, 0x8a, 0x40, 0xdd, 0x19, 0xac, 0x7b, 0x84, 0x6d, 0xe0, 0xf5, 0x97,
-	0xce, 0x98, 0xe3, 0x4e, 0x62, 0xe3, 0x24, 0xee, 0x5a, 0x0c, 0xd8, 0x7e, 0x47, 0xb9, 0xc3, 0x1f,
-	0x5e, 0xd8, 0xa0, 0x9d, 0xe5, 0x83, 0x79, 0xb1, 0x9c, 0xd4, 0x2f, 0x13, 0xf6, 0x21, 0x51, 0x75,
-	0x86, 0x36, 0x27, 0x66, 0xf1, 0x6b, 0x00, 0x93, 0x53, 0x69, 0xf6, 0x02, 0x26, 0x01, 0x0d, 0x36,
-	0xe4, 0x5a, 0x5e, 0xcc, 0x8b, 0xe5, 0xb4, 0xfe, 0xab, 0x19, 0x83, 0xa1, 0x42, 0x4a, 0x35, 0xa7,
-	0xf7, 0x8f, 0xea, 0x28, 0xa2, 0xe7, 0x3b, 0xe2, 0xc3, 0x93, 0xe7, 0x3b, 0x62, 0xd7, 0x50, 0x7a,
-	0x17, 0x88, 0x97, 0xd9, 0x4c, 0x8a, 0x71, 0x18, 0x4b, 0x34, 0x48, 0xc8, 0x47, 0xd9, 0xcf, 0x9a,
-	0x3d, 0x87, 0x91, 0x17, 0xd4, 0x1c, 0xf8, 0x38, 0x27, 0x7a, 0xc9, 0xde, 0xc1, 0xb8, 0xe9, 0x02,
-	0xb9, 0x07, 0x3e, 0x99, 0x17, 0xcb, 0xd9, 0xcd, 0xab, 0xcb, 0x65, 0xbc, 0x4f, 0x99, 0x38, 0xf7,
-	0x56, 0x10, 0x61, 0x6b, 0x63, 0xc1, 0x1e, 0x67, 0x0c, 0xca, 0xbd, 0x93, 0x47, 0x7e, 0x95, 0x3e,
-	0x90, 0x62, 0xb6, 0x81, 0xa7, 0x42, 0x4a, 0x4d, 0xda, 0x59, 0x61, 0x76, 0x7b, 0x6d, 0xa5, 0xb6,
-	0x2a, 0xf0, 0xd9, 0x7f, 0xd6, 0xcc, 0xce, 0x0f, 0xd6, 0x99, 0x5f, 0x4f, 0xe1, 0xca, 0xf7, 0xfd,
-	0x16, 0xb7, 0xf0, 0xe4, 0x9f, 0x21, 0x62, 0xeb, 0x6f, 0xda, 0xca, 0xbc, 0xbb, 0x14, 0x47, 0xcf,
-	0x0b, 0x3a, 0xf4, 0x8b, 0xab, 0x53, 0xbc, 0xfe, 0x0a, 0x8f, 0x1b, 0xf7, 0x70, 0xd1, 0x76, 0x3d,
-	0x4d, 0x65, 0xe2, 0x61, 0x6c, 0x8b, 0xcf, 0x77, 0x39, 0xa1, 0x9c, 0x11, 0x56, 0x55, 0xae, 0x55,
-	0x2b, 0x85, 0x36, 0x9d, 0xcd, 0xaa, 0x4f, 0x09, 0xaf, 0x43, 0x3a, 0x28, 0x61, 0xad, 0x23, 0x11,
-	0xc7, 0x0c, 0xb7, 0x17, 0xf1, 0xef, 0xa2, 0xf8, 0x39, 0x28, 0x3f, 0xde, 0x6d, 0x3f, 0xed, 0xc7,
-	0xe9, 0xdd, 0xdb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x73, 0x2c, 0xed, 0xfb, 0x87, 0x02, 0x00,
-	0x00,
+func init() { proto.RegisterFile("google/api/http.proto", fileDescriptor_http_e457621dddd7365b) }
+
+var fileDescriptor_http_e457621dddd7365b = []byte{
+	// 419 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x8e, 0xd3, 0x30,
+	0x10, 0x86, 0x49, 0x9b, 0x76, 0xdb, 0xe9, 0x82, 0x84, 0x59, 0x90, 0x85, 0x40, 0x54, 0xe5, 0x52,
+	0x71, 0x48, 0xa5, 0xe5, 0xc0, 0x61, 0x4f, 0x1b, 0xa8, 0x58, 0x6e, 0x55, 0x8e, 0x5c, 0x22, 0x37,
+	0x1e, 0x52, 0x83, 0xd7, 0xb6, 0xe2, 0x09, 0xa2, 0xaf, 0xc3, 0x63, 0xf1, 0x24, 0x1c, 0x91, 0x9d,
+	0x84, 0x56, 0x42, 0xe2, 0x36, 0xf3, 0xff, 0x9f, 0xa7, 0x7f, 0x27, 0x03, 0x4f, 0x6b, 0x6b, 0x6b,
+	0x8d, 0x1b, 0xe1, 0xd4, 0xe6, 0x40, 0xe4, 0x32, 0xd7, 0x58, 0xb2, 0x0c, 0x3a, 0x39, 0x13, 0x4e,
+	0xad, 0x8e, 0x90, 0xde, 0x11, 0x39, 0xf6, 0x06, 0x26, 0x4d, 0xab, 0xd1, 0xf3, 0x64, 0x39, 0x5e,
+	0x2f, 0xae, 0xaf, 0xb2, 0x13, 0x93, 0x05, 0xa0, 0x68, 0x35, 0x16, 0x1d, 0xc2, 0xb6, 0xf0, 0xea,
+	0x4b, 0xab, 0xf5, 0xb1, 0x94, 0x58, 0x59, 0x89, 0x65, 0x83, 0x1e, 0x9b, 0xef, 0x28, 0x4b, 0xfc,
+	0xe1, 0x84, 0xf1, 0xca, 0x1a, 0x3e, 0x5a, 0x26, 0xeb, 0x59, 0xf1, 0x22, 0x62, 0x1f, 0x22, 0x55,
+	0xf4, 0xd0, 0x76, 0x60, 0x56, 0xbf, 0x46, 0x30, 0x1b, 0x46, 0xb3, 0xe7, 0x30, 0xf3, 0xa8, 0xb1,
+	0x22, 0xdb, 0xf0, 0x64, 0x99, 0xac, 0xe7, 0xc5, 0xdf, 0x9e, 0x31, 0x18, 0xd7, 0x48, 0x71, 0xe6,
+	0xfc, 0xee, 0x41, 0x11, 0x9a, 0xa0, 0xb9, 0x96, 0xf8, 0x78, 0xd0, 0x5c, 0x4b, 0xec, 0x0a, 0x52,
+	0x67, 0x3d, 0xf1, 0xb4, 0x17, 0x63, 0xc7, 0x38, 0x4c, 0x25, 0x6a, 0x24, 0xe4, 0x93, 0x5e, 0xef,
+	0x7b, 0xf6, 0x0c, 0x26, 0x4e, 0x50, 0x75, 0xe0, 0xd3, 0xde, 0xe8, 0x5a, 0xf6, 0x0e, 0xa6, 0x55,
+	0xeb, 0xc9, 0xde, 0xf3, 0xd9, 0x32, 0x59, 0x2f, 0xae, 0x5f, 0x9e, 0x2f, 0xe3, 0x7d, 0x74, 0x42,
+	0xee, 0x9d, 0x20, 0xc2, 0xc6, 0x84, 0x81, 0x1d, 0xce, 0x18, 0xa4, 0x7b, 0x2b, 0x8f, 0xfc, 0x22,
+	0xfe, 0x81, 0x58, 0xb3, 0xd7, 0xf0, 0xb0, 0x41, 0xef, 0xac, 0xf1, 0x58, 0x46, 0xf3, 0x32, 0x9a,
+	0x97, 0x83, 0x98, 0x07, 0x68, 0x0b, 0x4f, 0x84, 0x94, 0x8a, 0x94, 0x35, 0x42, 0x97, 0x7b, 0x65,
+	0xa4, 0x32, 0xb5, 0xe7, 0x8b, 0xff, 0x7c, 0x0b, 0x76, 0x7a, 0x90, 0xf7, 0x7c, 0x3e, 0x87, 0x0b,
+	0xd7, 0x85, 0x5a, 0xdd, 0xc0, 0xe3, 0x7f, 0x92, 0x86, 0x7c, 0xdf, 0x94, 0x91, 0xfd, 0x82, 0x63,
+	0x1d, 0x34, 0x27, 0xe8, 0xd0, 0x6d, 0xb7, 0x88, 0x75, 0xfe, 0x15, 0x1e, 0x55, 0xf6, 0xfe, 0xec,
+	0x67, 0xf3, 0x79, 0x1c, 0x13, 0xae, 0x67, 0x97, 0x7c, 0xbe, 0xed, 0x8d, 0xda, 0x6a, 0x61, 0xea,
+	0xcc, 0x36, 0xf5, 0xa6, 0x46, 0x13, 0x6f, 0x6b, 0xd3, 0x59, 0xc2, 0x29, 0x1f, 0xaf, 0x4e, 0x18,
+	0x63, 0x49, 0x84, 0x98, 0xfe, 0xe6, 0xac, 0xfe, 0x9d, 0x24, 0x3f, 0x47, 0xe9, 0xc7, 0xdb, 0xdd,
+	0xa7, 0xfd, 0x34, 0xbe, 0x7b, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0xae, 0xde, 0xa1, 0xd0, 0xac,
+	0x02, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/authorization_config.pb.go b/vendor/google.golang.org/genproto/googleapis/api/authorization_config.pb.go
index 8062b961..1bd0eadc 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/authorization_config.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/authorization_config.pb.go
@@ -1,18 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/experimental/authorization_config.proto
 
-/*
-Package api is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/experimental/authorization_config.proto
-	google/api/experimental/experimental.proto
-
-It has these top-level messages:
-	AuthorizationConfig
-	Experimental
-*/
-package api
+package api // import "google.golang.org/genproto/googleapis/api"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -42,13 +31,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type AuthorizationConfig struct {
 	// The name of the authorization provider, such as
 	// firebaserules.googleapis.com.
-	Provider string `protobuf:"bytes,1,opt,name=provider" json:"provider,omitempty"`
+	Provider             string   `protobuf:"bytes,1,opt,name=provider,proto3" json:"provider,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AuthorizationConfig) Reset()                    { *m = AuthorizationConfig{} }
-func (m *AuthorizationConfig) String() string            { return proto.CompactTextString(m) }
-func (*AuthorizationConfig) ProtoMessage()               {}
-func (*AuthorizationConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *AuthorizationConfig) Reset()         { *m = AuthorizationConfig{} }
+func (m *AuthorizationConfig) String() string { return proto.CompactTextString(m) }
+func (*AuthorizationConfig) ProtoMessage()    {}
+func (*AuthorizationConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_authorization_config_87a128931232bc39, []int{0}
+}
+func (m *AuthorizationConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuthorizationConfig.Unmarshal(m, b)
+}
+func (m *AuthorizationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuthorizationConfig.Marshal(b, m, deterministic)
+}
+func (dst *AuthorizationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthorizationConfig.Merge(dst, src)
+}
+func (m *AuthorizationConfig) XXX_Size() int {
+	return xxx_messageInfo_AuthorizationConfig.Size(m)
+}
+func (m *AuthorizationConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuthorizationConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AuthorizationConfig proto.InternalMessageInfo
 
 func (m *AuthorizationConfig) GetProvider() string {
 	if m != nil {
@@ -61,9 +72,11 @@ func init() {
 	proto.RegisterType((*AuthorizationConfig)(nil), "google.api.AuthorizationConfig")
 }
 
-func init() { proto.RegisterFile("google/api/experimental/authorization_config.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/api/experimental/authorization_config.proto", fileDescriptor_authorization_config_87a128931232bc39)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_authorization_config_87a128931232bc39 = []byte{
 	// 180 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4a, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xad, 0x28, 0x48, 0x2d, 0xca, 0xcc, 0x4d, 0xcd,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/configchange/config_change.pb.go b/vendor/google.golang.org/genproto/googleapis/api/configchange/config_change.pb.go
index cf415000..fbf7811c 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/configchange/config_change.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/configchange/config_change.pb.go
@@ -1,17 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/config_change.proto
 
-/*
-Package configchange is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/config_change.proto
-
-It has these top-level messages:
-	ConfigChange
-	Advice
-*/
-package configchange
+package configchange // import "google.golang.org/genproto/googleapis/api/configchange"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -62,7 +52,9 @@ var ChangeType_value = map[string]int32{
 func (x ChangeType) String() string {
 	return proto.EnumName(ChangeType_name, int32(x))
 }
-func (ChangeType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (ChangeType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_config_change_575fa64fb42e14af, []int{0}
+}
 
 // Output generated from semantically comparing two versions of a service
 // configuration.
@@ -80,24 +72,46 @@ type ConfigChange struct {
 	// - visibility.rules[selector=="google.LibraryService.CreateBook"].restriction
 	// - quota.metric_rules[selector=="google"].metric_costs[key=="reads"].value
 	// - logging.producer_destinations[0]
-	Element string `protobuf:"bytes,1,opt,name=element" json:"element,omitempty"`
+	Element string `protobuf:"bytes,1,opt,name=element,proto3" json:"element,omitempty"`
 	// Value of the changed object in the old Service configuration,
 	// in JSON format. This field will not be populated if ChangeType == ADDED.
-	OldValue string `protobuf:"bytes,2,opt,name=old_value,json=oldValue" json:"old_value,omitempty"`
+	OldValue string `protobuf:"bytes,2,opt,name=old_value,json=oldValue,proto3" json:"old_value,omitempty"`
 	// Value of the changed object in the new Service configuration,
 	// in JSON format. This field will not be populated if ChangeType == REMOVED.
-	NewValue string `protobuf:"bytes,3,opt,name=new_value,json=newValue" json:"new_value,omitempty"`
+	NewValue string `protobuf:"bytes,3,opt,name=new_value,json=newValue,proto3" json:"new_value,omitempty"`
 	// The type for this change, either ADDED, REMOVED, or MODIFIED.
-	ChangeType ChangeType `protobuf:"varint,4,opt,name=change_type,json=changeType,enum=google.api.ChangeType" json:"change_type,omitempty"`
+	ChangeType ChangeType `protobuf:"varint,4,opt,name=change_type,json=changeType,proto3,enum=google.api.ChangeType" json:"change_type,omitempty"`
 	// Collection of advice provided for this change, useful for determining the
 	// possible impact of this change.
-	Advices []*Advice `protobuf:"bytes,5,rep,name=advices" json:"advices,omitempty"`
+	Advices              []*Advice `protobuf:"bytes,5,rep,name=advices,proto3" json:"advices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *ConfigChange) Reset()         { *m = ConfigChange{} }
+func (m *ConfigChange) String() string { return proto.CompactTextString(m) }
+func (*ConfigChange) ProtoMessage()    {}
+func (*ConfigChange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_config_change_575fa64fb42e14af, []int{0}
+}
+func (m *ConfigChange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConfigChange.Unmarshal(m, b)
+}
+func (m *ConfigChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConfigChange.Marshal(b, m, deterministic)
+}
+func (dst *ConfigChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigChange.Merge(dst, src)
+}
+func (m *ConfigChange) XXX_Size() int {
+	return xxx_messageInfo_ConfigChange.Size(m)
+}
+func (m *ConfigChange) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConfigChange.DiscardUnknown(m)
 }
 
-func (m *ConfigChange) Reset()                    { *m = ConfigChange{} }
-func (m *ConfigChange) String() string            { return proto.CompactTextString(m) }
-func (*ConfigChange) ProtoMessage()               {}
-func (*ConfigChange) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_ConfigChange proto.InternalMessageInfo
 
 func (m *ConfigChange) GetElement() string {
 	if m != nil {
@@ -139,13 +153,35 @@ func (m *ConfigChange) GetAdvices() []*Advice {
 type Advice struct {
 	// Useful description for why this advice was applied and what actions should
 	// be taken to mitigate any implied risks.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Advice) Reset()                    { *m = Advice{} }
-func (m *Advice) String() string            { return proto.CompactTextString(m) }
-func (*Advice) ProtoMessage()               {}
-func (*Advice) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Advice) Reset()         { *m = Advice{} }
+func (m *Advice) String() string { return proto.CompactTextString(m) }
+func (*Advice) ProtoMessage()    {}
+func (*Advice) Descriptor() ([]byte, []int) {
+	return fileDescriptor_config_change_575fa64fb42e14af, []int{1}
+}
+func (m *Advice) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Advice.Unmarshal(m, b)
+}
+func (m *Advice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Advice.Marshal(b, m, deterministic)
+}
+func (dst *Advice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Advice.Merge(dst, src)
+}
+func (m *Advice) XXX_Size() int {
+	return xxx_messageInfo_Advice.Size(m)
+}
+func (m *Advice) XXX_DiscardUnknown() {
+	xxx_messageInfo_Advice.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Advice proto.InternalMessageInfo
 
 func (m *Advice) GetDescription() string {
 	if m != nil {
@@ -160,9 +196,11 @@ func init() {
 	proto.RegisterEnum("google.api.ChangeType", ChangeType_name, ChangeType_value)
 }
 
-func init() { proto.RegisterFile("google/api/config_change.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/api/config_change.proto", fileDescriptor_config_change_575fa64fb42e14af)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_config_change_575fa64fb42e14af = []byte{
 	// 338 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0xcd, 0x4e, 0xc2, 0x40,
 	0x14, 0x85, 0x2d, 0xff, 0xdc, 0x12, 0x82, 0xb3, 0xd0, 0x26, 0x24, 0xa6, 0x61, 0x45, 0x88, 0x69,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/distribution/distribution.pb.go b/vendor/google.golang.org/genproto/googleapis/api/distribution/distribution.pb.go
index 68b702a1..ea459699 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/distribution/distribution.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/distribution/distribution.pb.go
@@ -1,23 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/distribution.proto
 
-/*
-Package distribution is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/distribution.proto
-
-It has these top-level messages:
-	Distribution
-*/
-package distribution
+package distribution // import "google.golang.org/genproto/googleapis/api/distribution"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -47,10 +36,10 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // will render the `mean` and `sum_of_squared_deviation` fields meaningless.
 type Distribution struct {
 	// The number of values in the population. Must be non-negative.
-	Count int64 `protobuf:"varint,1,opt,name=count" json:"count,omitempty"`
+	Count int64 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
 	// The arithmetic mean of the values in the population. If `count` is zero
 	// then this field must be zero.
-	Mean float64 `protobuf:"fixed64,2,opt,name=mean" json:"mean,omitempty"`
+	Mean float64 `protobuf:"fixed64,2,opt,name=mean,proto3" json:"mean,omitempty"`
 	// The sum of squared deviations from the mean of the values in the
 	// population.  For values x_i this is:
 	//
@@ -60,12 +49,12 @@ type Distribution struct {
 	// describes Welford's method for accumulating this sum in one pass.
 	//
 	// If `count` is zero then this field must be zero.
-	SumOfSquaredDeviation float64 `protobuf:"fixed64,3,opt,name=sum_of_squared_deviation,json=sumOfSquaredDeviation" json:"sum_of_squared_deviation,omitempty"`
+	SumOfSquaredDeviation float64 `protobuf:"fixed64,3,opt,name=sum_of_squared_deviation,json=sumOfSquaredDeviation,proto3" json:"sum_of_squared_deviation,omitempty"`
 	// If specified, contains the range of the population values. The field
 	// must not be present if the `count` is zero.
-	Range *Distribution_Range `protobuf:"bytes,4,opt,name=range" json:"range,omitempty"`
+	Range *Distribution_Range `protobuf:"bytes,4,opt,name=range,proto3" json:"range,omitempty"`
 	// Defines the histogram bucket boundaries.
-	BucketOptions *Distribution_BucketOptions `protobuf:"bytes,6,opt,name=bucket_options,json=bucketOptions" json:"bucket_options,omitempty"`
+	BucketOptions *Distribution_BucketOptions `protobuf:"bytes,6,opt,name=bucket_options,json=bucketOptions,proto3" json:"bucket_options,omitempty"`
 	// If `bucket_options` is given, then the sum of the values in `bucket_counts`
 	// must equal the value in `count`.  If `bucket_options` is not given, no
 	// `bucket_counts` fields may be given.
@@ -78,13 +67,35 @@ type Distribution struct {
 	// `bucket_options`.
 	//
 	// Any suffix of trailing zero bucket_count fields may be omitted.
-	BucketCounts []int64 `protobuf:"varint,7,rep,packed,name=bucket_counts,json=bucketCounts" json:"bucket_counts,omitempty"`
+	BucketCounts         []int64  `protobuf:"varint,7,rep,packed,name=bucket_counts,json=bucketCounts,proto3" json:"bucket_counts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Distribution) Reset()         { *m = Distribution{} }
+func (m *Distribution) String() string { return proto.CompactTextString(m) }
+func (*Distribution) ProtoMessage()    {}
+func (*Distribution) Descriptor() ([]byte, []int) {
+	return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0}
+}
+func (m *Distribution) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution.Unmarshal(m, b)
+}
+func (m *Distribution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution.Marshal(b, m, deterministic)
+}
+func (dst *Distribution) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution.Merge(dst, src)
+}
+func (m *Distribution) XXX_Size() int {
+	return xxx_messageInfo_Distribution.Size(m)
+}
+func (m *Distribution) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution.DiscardUnknown(m)
 }
 
-func (m *Distribution) Reset()                    { *m = Distribution{} }
-func (m *Distribution) String() string            { return proto.CompactTextString(m) }
-func (*Distribution) ProtoMessage()               {}
-func (*Distribution) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Distribution proto.InternalMessageInfo
 
 func (m *Distribution) GetCount() int64 {
 	if m != nil {
@@ -131,15 +142,37 @@ func (m *Distribution) GetBucketCounts() []int64 {
 // The range of the population values.
 type Distribution_Range struct {
 	// The minimum of the population values.
-	Min float64 `protobuf:"fixed64,1,opt,name=min" json:"min,omitempty"`
+	Min float64 `protobuf:"fixed64,1,opt,name=min,proto3" json:"min,omitempty"`
 	// The maximum of the population values.
-	Max float64 `protobuf:"fixed64,2,opt,name=max" json:"max,omitempty"`
+	Max                  float64  `protobuf:"fixed64,2,opt,name=max,proto3" json:"max,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Distribution_Range) Reset()                    { *m = Distribution_Range{} }
-func (m *Distribution_Range) String() string            { return proto.CompactTextString(m) }
-func (*Distribution_Range) ProtoMessage()               {}
-func (*Distribution_Range) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (m *Distribution_Range) Reset()         { *m = Distribution_Range{} }
+func (m *Distribution_Range) String() string { return proto.CompactTextString(m) }
+func (*Distribution_Range) ProtoMessage()    {}
+func (*Distribution_Range) Descriptor() ([]byte, []int) {
+	return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 0}
+}
+func (m *Distribution_Range) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution_Range.Unmarshal(m, b)
+}
+func (m *Distribution_Range) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution_Range.Marshal(b, m, deterministic)
+}
+func (dst *Distribution_Range) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_Range.Merge(dst, src)
+}
+func (m *Distribution_Range) XXX_Size() int {
+	return xxx_messageInfo_Distribution_Range.Size(m)
+}
+func (m *Distribution_Range) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution_Range.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Distribution_Range proto.InternalMessageInfo
 
 func (m *Distribution_Range) GetMin() float64 {
 	if m != nil {
@@ -185,31 +218,57 @@ type Distribution_BucketOptions struct {
 	//	*Distribution_BucketOptions_LinearBuckets
 	//	*Distribution_BucketOptions_ExponentialBuckets
 	//	*Distribution_BucketOptions_ExplicitBuckets
-	Options isDistribution_BucketOptions_Options `protobuf_oneof:"options"`
+	Options              isDistribution_BucketOptions_Options `protobuf_oneof:"options"`
+	XXX_NoUnkeyedLiteral struct{}                             `json:"-"`
+	XXX_unrecognized     []byte                               `json:"-"`
+	XXX_sizecache        int32                                `json:"-"`
+}
+
+func (m *Distribution_BucketOptions) Reset()         { *m = Distribution_BucketOptions{} }
+func (m *Distribution_BucketOptions) String() string { return proto.CompactTextString(m) }
+func (*Distribution_BucketOptions) ProtoMessage()    {}
+func (*Distribution_BucketOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 1}
+}
+func (m *Distribution_BucketOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution_BucketOptions.Unmarshal(m, b)
+}
+func (m *Distribution_BucketOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution_BucketOptions.Marshal(b, m, deterministic)
+}
+func (dst *Distribution_BucketOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_BucketOptions.Merge(dst, src)
+}
+func (m *Distribution_BucketOptions) XXX_Size() int {
+	return xxx_messageInfo_Distribution_BucketOptions.Size(m)
+}
+func (m *Distribution_BucketOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution_BucketOptions.DiscardUnknown(m)
 }
 
-func (m *Distribution_BucketOptions) Reset()                    { *m = Distribution_BucketOptions{} }
-func (m *Distribution_BucketOptions) String() string            { return proto.CompactTextString(m) }
-func (*Distribution_BucketOptions) ProtoMessage()               {}
-func (*Distribution_BucketOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 1} }
+var xxx_messageInfo_Distribution_BucketOptions proto.InternalMessageInfo
 
 type isDistribution_BucketOptions_Options interface {
 	isDistribution_BucketOptions_Options()
 }
 
 type Distribution_BucketOptions_LinearBuckets struct {
-	LinearBuckets *Distribution_BucketOptions_Linear `protobuf:"bytes,1,opt,name=linear_buckets,json=linearBuckets,oneof"`
+	LinearBuckets *Distribution_BucketOptions_Linear `protobuf:"bytes,1,opt,name=linear_buckets,json=linearBuckets,proto3,oneof"`
 }
+
 type Distribution_BucketOptions_ExponentialBuckets struct {
-	ExponentialBuckets *Distribution_BucketOptions_Exponential `protobuf:"bytes,2,opt,name=exponential_buckets,json=exponentialBuckets,oneof"`
+	ExponentialBuckets *Distribution_BucketOptions_Exponential `protobuf:"bytes,2,opt,name=exponential_buckets,json=exponentialBuckets,proto3,oneof"`
 }
+
 type Distribution_BucketOptions_ExplicitBuckets struct {
-	ExplicitBuckets *Distribution_BucketOptions_Explicit `protobuf:"bytes,3,opt,name=explicit_buckets,json=explicitBuckets,oneof"`
+	ExplicitBuckets *Distribution_BucketOptions_Explicit `protobuf:"bytes,3,opt,name=explicit_buckets,json=explicitBuckets,proto3,oneof"`
 }
 
-func (*Distribution_BucketOptions_LinearBuckets) isDistribution_BucketOptions_Options()      {}
+func (*Distribution_BucketOptions_LinearBuckets) isDistribution_BucketOptions_Options() {}
+
 func (*Distribution_BucketOptions_ExponentialBuckets) isDistribution_BucketOptions_Options() {}
-func (*Distribution_BucketOptions_ExplicitBuckets) isDistribution_BucketOptions_Options()    {}
+
+func (*Distribution_BucketOptions_ExplicitBuckets) isDistribution_BucketOptions_Options() {}
 
 func (m *Distribution_BucketOptions) GetOptions() isDistribution_BucketOptions_Options {
 	if m != nil {
@@ -312,17 +371,17 @@ func _Distribution_BucketOptions_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Options.(type) {
 	case *Distribution_BucketOptions_LinearBuckets:
 		s := proto.Size(x.LinearBuckets)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Distribution_BucketOptions_ExponentialBuckets:
 		s := proto.Size(x.ExponentialBuckets)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Distribution_BucketOptions_ExplicitBuckets:
 		s := proto.Size(x.ExplicitBuckets)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -343,20 +402,40 @@ func _Distribution_BucketOptions_OneofSizer(msg proto.Message) (n int) {
 //    Lower bound (1 <= i < N):       offset + (width * (i - 1)).
 type Distribution_BucketOptions_Linear struct {
 	// Must be greater than 0.
-	NumFiniteBuckets int32 `protobuf:"varint,1,opt,name=num_finite_buckets,json=numFiniteBuckets" json:"num_finite_buckets,omitempty"`
+	NumFiniteBuckets int32 `protobuf:"varint,1,opt,name=num_finite_buckets,json=numFiniteBuckets,proto3" json:"num_finite_buckets,omitempty"`
 	// Must be greater than 0.
-	Width float64 `protobuf:"fixed64,2,opt,name=width" json:"width,omitempty"`
+	Width float64 `protobuf:"fixed64,2,opt,name=width,proto3" json:"width,omitempty"`
 	// Lower bound of the first bucket.
-	Offset float64 `protobuf:"fixed64,3,opt,name=offset" json:"offset,omitempty"`
+	Offset               float64  `protobuf:"fixed64,3,opt,name=offset,proto3" json:"offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Distribution_BucketOptions_Linear) Reset()         { *m = Distribution_BucketOptions_Linear{} }
 func (m *Distribution_BucketOptions_Linear) String() string { return proto.CompactTextString(m) }
 func (*Distribution_BucketOptions_Linear) ProtoMessage()    {}
 func (*Distribution_BucketOptions_Linear) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 1, 0}
+	return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 1, 0}
+}
+func (m *Distribution_BucketOptions_Linear) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution_BucketOptions_Linear.Unmarshal(m, b)
+}
+func (m *Distribution_BucketOptions_Linear) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution_BucketOptions_Linear.Marshal(b, m, deterministic)
+}
+func (dst *Distribution_BucketOptions_Linear) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_BucketOptions_Linear.Merge(dst, src)
+}
+func (m *Distribution_BucketOptions_Linear) XXX_Size() int {
+	return xxx_messageInfo_Distribution_BucketOptions_Linear.Size(m)
+}
+func (m *Distribution_BucketOptions_Linear) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution_BucketOptions_Linear.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Distribution_BucketOptions_Linear proto.InternalMessageInfo
+
 func (m *Distribution_BucketOptions_Linear) GetNumFiniteBuckets() int32 {
 	if m != nil {
 		return m.NumFiniteBuckets
@@ -389,11 +468,14 @@ func (m *Distribution_BucketOptions_Linear) GetOffset() float64 {
 //    Lower bound (1 <= i < N):       scale * (growth_factor ^ (i - 1)).
 type Distribution_BucketOptions_Exponential struct {
 	// Must be greater than 0.
-	NumFiniteBuckets int32 `protobuf:"varint,1,opt,name=num_finite_buckets,json=numFiniteBuckets" json:"num_finite_buckets,omitempty"`
+	NumFiniteBuckets int32 `protobuf:"varint,1,opt,name=num_finite_buckets,json=numFiniteBuckets,proto3" json:"num_finite_buckets,omitempty"`
 	// Must be greater than 1.
-	GrowthFactor float64 `protobuf:"fixed64,2,opt,name=growth_factor,json=growthFactor" json:"growth_factor,omitempty"`
+	GrowthFactor float64 `protobuf:"fixed64,2,opt,name=growth_factor,json=growthFactor,proto3" json:"growth_factor,omitempty"`
 	// Must be greater than 0.
-	Scale float64 `protobuf:"fixed64,3,opt,name=scale" json:"scale,omitempty"`
+	Scale                float64  `protobuf:"fixed64,3,opt,name=scale,proto3" json:"scale,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Distribution_BucketOptions_Exponential) Reset() {
@@ -402,9 +484,26 @@ func (m *Distribution_BucketOptions_Exponential) Reset() {
 func (m *Distribution_BucketOptions_Exponential) String() string { return proto.CompactTextString(m) }
 func (*Distribution_BucketOptions_Exponential) ProtoMessage()    {}
 func (*Distribution_BucketOptions_Exponential) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 1, 1}
+	return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 1, 1}
+}
+func (m *Distribution_BucketOptions_Exponential) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution_BucketOptions_Exponential.Unmarshal(m, b)
+}
+func (m *Distribution_BucketOptions_Exponential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution_BucketOptions_Exponential.Marshal(b, m, deterministic)
+}
+func (dst *Distribution_BucketOptions_Exponential) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_BucketOptions_Exponential.Merge(dst, src)
+}
+func (m *Distribution_BucketOptions_Exponential) XXX_Size() int {
+	return xxx_messageInfo_Distribution_BucketOptions_Exponential.Size(m)
+}
+func (m *Distribution_BucketOptions_Exponential) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution_BucketOptions_Exponential.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Distribution_BucketOptions_Exponential proto.InternalMessageInfo
+
 func (m *Distribution_BucketOptions_Exponential) GetNumFiniteBuckets() int32 {
 	if m != nil {
 		return m.NumFiniteBuckets
@@ -439,16 +538,36 @@ func (m *Distribution_BucketOptions_Exponential) GetScale() float64 {
 // common boundary of the overflow and underflow buckets.
 type Distribution_BucketOptions_Explicit struct {
 	// The values must be monotonically increasing.
-	Bounds []float64 `protobuf:"fixed64,1,rep,packed,name=bounds" json:"bounds,omitempty"`
+	Bounds               []float64 `protobuf:"fixed64,1,rep,packed,name=bounds,proto3" json:"bounds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
 func (m *Distribution_BucketOptions_Explicit) Reset()         { *m = Distribution_BucketOptions_Explicit{} }
 func (m *Distribution_BucketOptions_Explicit) String() string { return proto.CompactTextString(m) }
 func (*Distribution_BucketOptions_Explicit) ProtoMessage()    {}
 func (*Distribution_BucketOptions_Explicit) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 1, 2}
+	return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 1, 2}
+}
+func (m *Distribution_BucketOptions_Explicit) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution_BucketOptions_Explicit.Unmarshal(m, b)
+}
+func (m *Distribution_BucketOptions_Explicit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution_BucketOptions_Explicit.Marshal(b, m, deterministic)
+}
+func (dst *Distribution_BucketOptions_Explicit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_BucketOptions_Explicit.Merge(dst, src)
+}
+func (m *Distribution_BucketOptions_Explicit) XXX_Size() int {
+	return xxx_messageInfo_Distribution_BucketOptions_Explicit.Size(m)
+}
+func (m *Distribution_BucketOptions_Explicit) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution_BucketOptions_Explicit.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Distribution_BucketOptions_Explicit proto.InternalMessageInfo
+
 func (m *Distribution_BucketOptions_Explicit) GetBounds() []float64 {
 	if m != nil {
 		return m.Bounds
@@ -465,42 +584,43 @@ func init() {
 	proto.RegisterType((*Distribution_BucketOptions_Explicit)(nil), "google.api.Distribution.BucketOptions.Explicit")
 }
 
-func init() { proto.RegisterFile("google/api/distribution.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 544 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5d, 0x6f, 0xd3, 0x30,
-	0x14, 0x5d, 0x96, 0xb5, 0x85, 0xdb, 0x0f, 0x8a, 0x19, 0x28, 0x44, 0x7c, 0x54, 0x9b, 0x84, 0x2a,
-	0x01, 0x89, 0x54, 0x90, 0x78, 0xe0, 0xad, 0x1b, 0x53, 0x1f, 0x40, 0x9b, 0x8c, 0xc4, 0x03, 0x42,
-	0x8a, 0x9c, 0xc4, 0xc9, 0x0c, 0x89, 0x1d, 0x62, 0x67, 0x2b, 0xef, 0xfc, 0x29, 0xfe, 0x1d, 0x8a,
-	0xed, 0x6e, 0x19, 0x08, 0xa9, 0xbc, 0xf9, 0xde, 0x73, 0x7c, 0xce, 0xb9, 0x57, 0x71, 0xe0, 0x71,
-	0x2e, 0x44, 0x5e, 0xd0, 0x90, 0x54, 0x2c, 0x4c, 0x99, 0x54, 0x35, 0x8b, 0x1b, 0xc5, 0x04, 0x0f,
-	0xaa, 0x5a, 0x28, 0x81, 0xc0, 0xc0, 0x01, 0xa9, 0x98, 0xff, 0xa8, 0x43, 0x25, 0x9c, 0x0b, 0x45,
-	0x5a, 0xa2, 0x34, 0x4c, 0xff, 0xa1, 0x45, 0x75, 0x15, 0x37, 0x59, 0x48, 0xf8, 0x0f, 0x0b, 0x3d,
-	0xfd, 0x13, 0x52, 0xac, 0xa4, 0x52, 0x91, 0xb2, 0x32, 0x84, 0x83, 0x9f, 0x03, 0x18, 0x1d, 0x77,
-	0xcc, 0xd1, 0x3e, 0xf4, 0x12, 0xd1, 0x70, 0xe5, 0x39, 0x33, 0x67, 0xee, 0x62, 0x53, 0x20, 0x04,
-	0x7b, 0x25, 0x25, 0xdc, 0xdb, 0x9d, 0x39, 0x73, 0x07, 0xeb, 0x33, 0x7a, 0x03, 0x9e, 0x6c, 0xca,
-	0x48, 0x64, 0x91, 0xfc, 0xde, 0x90, 0x9a, 0xa6, 0x51, 0x4a, 0x2f, 0x98, 0x4e, 0xe6, 0xb9, 0x9a,
-	0x77, 0x5f, 0x36, 0xe5, 0x69, 0xf6, 0xd1, 0xa0, 0xc7, 0x1b, 0x10, 0xbd, 0x86, 0x5e, 0x4d, 0x78,
-	0x4e, 0xbd, 0xbd, 0x99, 0x33, 0x1f, 0x2e, 0x9e, 0x04, 0xd7, 0x93, 0x06, 0xdd, 0x2c, 0x01, 0x6e,
-	0x59, 0xd8, 0x90, 0xd1, 0x07, 0x98, 0xc4, 0x4d, 0xf2, 0x8d, 0xaa, 0x48, 0x54, 0x7a, 0x7a, 0xaf,
-	0xaf, 0xaf, 0x3f, 0xfb, 0xe7, 0xf5, 0xa5, 0xa6, 0x9f, 0x1a, 0x36, 0x1e, 0xc7, 0xdd, 0x12, 0x1d,
-	0x82, 0x6d, 0x44, 0x7a, 0x42, 0xe9, 0x0d, 0x66, 0xee, 0xdc, 0xc5, 0x23, 0xd3, 0x3c, 0xd2, 0x3d,
-	0xff, 0x39, 0xf4, 0x74, 0x06, 0x34, 0x05, 0xb7, 0x64, 0x5c, 0xef, 0xc4, 0xc1, 0xed, 0x51, 0x77,
-	0xc8, 0xda, 0x2e, 0xa4, 0x3d, 0xfa, 0xbf, 0xf6, 0x60, 0x7c, 0xc3, 0x12, 0x7d, 0x82, 0x49, 0xc1,
-	0x38, 0x25, 0x75, 0x64, 0x54, 0xa5, 0x16, 0x18, 0x2e, 0x5e, 0x6e, 0x17, 0x39, 0x78, 0xaf, 0x2f,
-	0xaf, 0x76, 0xf0, 0xd8, 0xc8, 0x18, 0x54, 0x22, 0x0a, 0xf7, 0xe8, 0xba, 0x12, 0x9c, 0x72, 0xc5,
-	0x48, 0x71, 0x25, 0xbe, 0xab, 0xc5, 0x17, 0x5b, 0x8a, 0xbf, 0xbb, 0x56, 0x58, 0xed, 0x60, 0xd4,
-	0x11, 0xdc, 0xd8, 0x7c, 0x81, 0x29, 0x5d, 0x57, 0x05, 0x4b, 0x98, 0xba, 0xf2, 0x70, 0xb5, 0x47,
-	0xb8, 0xbd, 0x87, 0xbe, 0xbe, 0xda, 0xc1, 0x77, 0x36, 0x52, 0x56, 0xdd, 0x4f, 0xa1, 0x6f, 0xe6,
-	0x43, 0x2f, 0x00, 0xf1, 0xa6, 0x8c, 0x32, 0xc6, 0x99, 0xa2, 0x37, 0x56, 0xd5, 0xc3, 0x53, 0xde,
-	0x94, 0x27, 0x1a, 0xd8, 0xa4, 0xda, 0x87, 0xde, 0x25, 0x4b, 0xd5, 0xb9, 0x5d, 0xbd, 0x29, 0xd0,
-	0x03, 0xe8, 0x8b, 0x2c, 0x93, 0x54, 0xd9, 0x4f, 0xcf, 0x56, 0xfe, 0x05, 0x0c, 0x3b, 0x83, 0xfe,
-	0xa7, 0xd5, 0x21, 0x8c, 0xf3, 0x5a, 0x5c, 0xaa, 0xf3, 0x28, 0x23, 0x89, 0x12, 0xb5, 0xb5, 0x1c,
-	0x99, 0xe6, 0x89, 0xee, 0xb5, 0x79, 0x64, 0x42, 0x0a, 0x6a, 0x8d, 0x4d, 0xe1, 0x1f, 0xc0, 0xad,
-	0xcd, 0xf0, 0x6d, 0xb6, 0x58, 0x34, 0x3c, 0x6d, 0x8d, 0xdc, 0x36, 0x9b, 0xa9, 0x96, 0xb7, 0x61,
-	0x60, 0x3f, 0xe5, 0xe5, 0x57, 0x98, 0x24, 0xa2, 0xec, 0x6c, 0x75, 0x79, 0xb7, 0xbb, 0xd6, 0xb3,
-	0xf6, 0xad, 0x9e, 0x39, 0x9f, 0x8f, 0x2c, 0x21, 0x17, 0x05, 0xe1, 0x79, 0x20, 0xea, 0x3c, 0xcc,
-	0x29, 0xd7, 0x2f, 0x39, 0x34, 0x10, 0xa9, 0x98, 0xfc, 0xeb, 0x8f, 0xf2, 0xb6, 0x5b, 0xc4, 0x7d,
-	0xcd, 0x7f, 0xf5, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x88, 0x8e, 0xc5, 0x4b, 0x80, 0x04, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/api/distribution.proto", fileDescriptor_distribution_4362d2d5f4dd1b54)
+}
+
+var fileDescriptor_distribution_4362d2d5f4dd1b54 = []byte{
+	// 522 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5d, 0x6b, 0xd4, 0x40,
+	0x14, 0xdd, 0x34, 0xfb, 0xa1, 0x77, 0x3f, 0x5c, 0xc7, 0x2a, 0x21, 0xa8, 0x2c, 0x2d, 0xc8, 0x82,
+	0x9a, 0x85, 0x55, 0xf0, 0xc1, 0xb7, 0x6d, 0x2d, 0xfb, 0xa0, 0xb4, 0x8c, 0xe0, 0x83, 0x08, 0x61,
+	0x36, 0x99, 0xa4, 0xa3, 0xc9, 0x4c, 0xcc, 0x4c, 0xda, 0xfd, 0x01, 0xfe, 0x29, 0xff, 0x9d, 0xe4,
+	0x4e, 0xb6, 0x4d, 0x11, 0x61, 0x7d, 0x9b, 0x73, 0xef, 0x99, 0x73, 0xce, 0xbd, 0x64, 0x02, 0xcf,
+	0x52, 0xa5, 0xd2, 0x8c, 0x2f, 0x58, 0x21, 0x16, 0xb1, 0xd0, 0xa6, 0x14, 0x9b, 0xca, 0x08, 0x25,
+	0x83, 0xa2, 0x54, 0x46, 0x11, 0xb0, 0xed, 0x80, 0x15, 0xc2, 0x7f, 0xda, 0xa2, 0x32, 0x29, 0x95,
+	0x61, 0x35, 0x51, 0x5b, 0xe6, 0xd1, 0xaf, 0x01, 0x8c, 0x4e, 0x5b, 0x02, 0xe4, 0x10, 0x7a, 0x91,
+	0xaa, 0xa4, 0xf1, 0x9c, 0x99, 0x33, 0x77, 0xa9, 0x05, 0x84, 0x40, 0x37, 0xe7, 0x4c, 0x7a, 0x07,
+	0x33, 0x67, 0xee, 0x50, 0x3c, 0x93, 0x77, 0xe0, 0xe9, 0x2a, 0x0f, 0x55, 0x12, 0xea, 0x9f, 0x15,
+	0x2b, 0x79, 0x1c, 0xc6, 0xfc, 0x4a, 0xa0, 0xba, 0xe7, 0x22, 0xef, 0xb1, 0xae, 0xf2, 0xf3, 0xe4,
+	0xb3, 0xed, 0x9e, 0xee, 0x9a, 0xe4, 0x2d, 0xf4, 0x4a, 0x26, 0x53, 0xee, 0x75, 0x67, 0xce, 0x7c,
+	0xb8, 0x7c, 0x1e, 0xdc, 0xa6, 0x0d, 0xda, 0x59, 0x02, 0x5a, 0xb3, 0xa8, 0x25, 0x93, 0x4f, 0x30,
+	0xd9, 0x54, 0xd1, 0x0f, 0x6e, 0x42, 0x55, 0xe0, 0x04, 0x5e, 0x1f, 0xaf, 0xbf, 0xf8, 0xe7, 0xf5,
+	0x15, 0xd2, 0xcf, 0x2d, 0x9b, 0x8e, 0x37, 0x6d, 0x48, 0x8e, 0xa1, 0x29, 0x84, 0x38, 0xa1, 0xf6,
+	0x06, 0x33, 0x77, 0xee, 0xd2, 0x91, 0x2d, 0x9e, 0x60, 0xcd, 0x7f, 0x09, 0x3d, 0xcc, 0x40, 0xa6,
+	0xe0, 0xe6, 0x42, 0xe2, 0x4e, 0x1c, 0x5a, 0x1f, 0xb1, 0xc2, 0xb6, 0xcd, 0x42, 0xea, 0xa3, 0xff,
+	0xbb, 0x0b, 0xe3, 0x3b, 0x96, 0xe4, 0x0b, 0x4c, 0x32, 0x21, 0x39, 0x2b, 0x43, 0xab, 0xaa, 0x51,
+	0x60, 0xb8, 0x7c, 0xbd, 0x5f, 0xe4, 0xe0, 0x23, 0x5e, 0x5e, 0x77, 0xe8, 0xd8, 0xca, 0xd8, 0xae,
+	0x26, 0x1c, 0x1e, 0xf1, 0x6d, 0xa1, 0x24, 0x97, 0x46, 0xb0, 0xec, 0x46, 0xfc, 0x00, 0xc5, 0x97,
+	0x7b, 0x8a, 0x7f, 0xb8, 0x55, 0x58, 0x77, 0x28, 0x69, 0x09, 0xee, 0x6c, 0xbe, 0xc1, 0x94, 0x6f,
+	0x8b, 0x4c, 0x44, 0xc2, 0xdc, 0x78, 0xb8, 0xe8, 0xb1, 0xd8, 0xdf, 0x03, 0xaf, 0xaf, 0x3b, 0xf4,
+	0xc1, 0x4e, 0xaa, 0x51, 0xf7, 0x63, 0xe8, 0xdb, 0xf9, 0xc8, 0x2b, 0x20, 0xb2, 0xca, 0xc3, 0x44,
+	0x48, 0x61, 0xf8, 0x9d, 0x55, 0xf5, 0xe8, 0x54, 0x56, 0xf9, 0x19, 0x36, 0x76, 0xa9, 0x0e, 0xa1,
+	0x77, 0x2d, 0x62, 0x73, 0xd9, 0xac, 0xde, 0x02, 0xf2, 0x04, 0xfa, 0x2a, 0x49, 0x34, 0x37, 0xcd,
+	0xa7, 0xd7, 0x20, 0xff, 0x0a, 0x86, 0xad, 0x41, 0xff, 0xd3, 0xea, 0x18, 0xc6, 0x69, 0xa9, 0xae,
+	0xcd, 0x65, 0x98, 0xb0, 0xc8, 0xa8, 0xb2, 0xb1, 0x1c, 0xd9, 0xe2, 0x19, 0xd6, 0xea, 0x3c, 0x3a,
+	0x62, 0x19, 0x6f, 0x8c, 0x2d, 0xf0, 0x8f, 0xe0, 0xde, 0x6e, 0xf8, 0x3a, 0xdb, 0x46, 0x55, 0x32,
+	0xae, 0x8d, 0xdc, 0x3a, 0x9b, 0x45, 0xab, 0xfb, 0x30, 0x68, 0x3e, 0xe5, 0xd5, 0x77, 0x98, 0x44,
+	0x2a, 0x6f, 0x6d, 0x75, 0xf5, 0xb0, 0xbd, 0xd6, 0x8b, 0xfa, 0xad, 0x5e, 0x38, 0x5f, 0x4f, 0x1a,
+	0x42, 0xaa, 0x32, 0x26, 0xd3, 0x40, 0x95, 0xe9, 0x22, 0xe5, 0x12, 0x5f, 0xf2, 0xc2, 0xb6, 0x58,
+	0x21, 0xf4, 0x5f, 0x7f, 0x85, 0xf7, 0x6d, 0xb0, 0xe9, 0x23, 0xff, 0xcd, 0x9f, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x62, 0xb4, 0xef, 0x6b, 0x44, 0x04, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/experimental.pb.go b/vendor/google.golang.org/genproto/googleapis/api/experimental.pb.go
index a88df3d1..efd01eac 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/experimental.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/experimental.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/experimental/experimental.proto
 
-package api
+package api // import "google.golang.org/genproto/googleapis/api"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,17 +13,45 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Experimental service configuration. These configuration options can
 // only be used by whitelisted users.
 type Experimental struct {
 	// Authorization configuration.
-	Authorization *AuthorizationConfig `protobuf:"bytes,8,opt,name=authorization" json:"authorization,omitempty"`
+	Authorization        *AuthorizationConfig `protobuf:"bytes,8,opt,name=authorization,proto3" json:"authorization,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Experimental) Reset()         { *m = Experimental{} }
+func (m *Experimental) String() string { return proto.CompactTextString(m) }
+func (*Experimental) ProtoMessage()    {}
+func (*Experimental) Descriptor() ([]byte, []int) {
+	return fileDescriptor_experimental_8ffd851a3879187f, []int{0}
+}
+func (m *Experimental) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Experimental.Unmarshal(m, b)
+}
+func (m *Experimental) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Experimental.Marshal(b, m, deterministic)
+}
+func (dst *Experimental) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Experimental.Merge(dst, src)
+}
+func (m *Experimental) XXX_Size() int {
+	return xxx_messageInfo_Experimental.Size(m)
+}
+func (m *Experimental) XXX_DiscardUnknown() {
+	xxx_messageInfo_Experimental.DiscardUnknown(m)
 }
 
-func (m *Experimental) Reset()                    { *m = Experimental{} }
-func (m *Experimental) String() string            { return proto.CompactTextString(m) }
-func (*Experimental) ProtoMessage()               {}
-func (*Experimental) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Experimental proto.InternalMessageInfo
 
 func (m *Experimental) GetAuthorization() *AuthorizationConfig {
 	if m != nil {
@@ -36,9 +64,11 @@ func init() {
 	proto.RegisterType((*Experimental)(nil), "google.api.Experimental")
 }
 
-func init() { proto.RegisterFile("google/api/experimental/experimental.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/api/experimental/experimental.proto", fileDescriptor_experimental_8ffd851a3879187f)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_experimental_8ffd851a3879187f = []byte{
 	// 204 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4a, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xad, 0x28, 0x48, 0x2d, 0xca, 0xcc, 0x4d, 0xcd,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go b/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go
index c3e12e5e..51b54bd6 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go
@@ -1,20 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/httpbody.proto
 
-/*
-Package httpbody is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/httpbody.proto
-
-It has these top-level messages:
-	HttpBody
-*/
-package httpbody
+package httpbody // import "google.golang.org/genproto/googleapis/api/httpbody"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -67,15 +59,40 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // handled, all other features will continue to work unchanged.
 type HttpBody struct {
 	// The HTTP Content-Type string representing the content type of the body.
-	ContentType string `protobuf:"bytes,1,opt,name=content_type,json=contentType" json:"content_type,omitempty"`
+	ContentType string `protobuf:"bytes,1,opt,name=content_type,json=contentType,proto3" json:"content_type,omitempty"`
 	// HTTP body binary data.
 	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	// Application specific response metadata. Must be set in the first response
+	// for streaming APIs.
+	Extensions           []*any.Any `protobuf:"bytes,3,rep,name=extensions,proto3" json:"extensions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *HttpBody) Reset()         { *m = HttpBody{} }
+func (m *HttpBody) String() string { return proto.CompactTextString(m) }
+func (*HttpBody) ProtoMessage()    {}
+func (*HttpBody) Descriptor() ([]byte, []int) {
+	return fileDescriptor_httpbody_d3ca4c70025a4501, []int{0}
+}
+func (m *HttpBody) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpBody.Unmarshal(m, b)
+}
+func (m *HttpBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpBody.Marshal(b, m, deterministic)
+}
+func (dst *HttpBody) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpBody.Merge(dst, src)
+}
+func (m *HttpBody) XXX_Size() int {
+	return xxx_messageInfo_HttpBody.Size(m)
+}
+func (m *HttpBody) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpBody.DiscardUnknown(m)
 }
 
-func (m *HttpBody) Reset()                    { *m = HttpBody{} }
-func (m *HttpBody) String() string            { return proto.CompactTextString(m) }
-func (*HttpBody) ProtoMessage()               {}
-func (*HttpBody) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_HttpBody proto.InternalMessageInfo
 
 func (m *HttpBody) GetContentType() string {
 	if m != nil {
@@ -91,24 +108,34 @@ func (m *HttpBody) GetData() []byte {
 	return nil
 }
 
+func (m *HttpBody) GetExtensions() []*any.Any {
+	if m != nil {
+		return m.Extensions
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*HttpBody)(nil), "google.api.HttpBody")
 }
 
-func init() { proto.RegisterFile("google/api/httpbody.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/api/httpbody.proto", fileDescriptor_httpbody_d3ca4c70025a4501) }
 
-var fileDescriptor0 = []byte{
-	// 181 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0xcf, 0x28, 0x29, 0x29, 0x48, 0xca, 0x4f, 0xa9, 0xd4,
-	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x82, 0x48, 0xe9, 0x25, 0x16, 0x64, 0x2a, 0x39, 0x72,
-	0x71, 0x78, 0x94, 0x94, 0x14, 0x38, 0xe5, 0xa7, 0x54, 0x0a, 0x29, 0x72, 0xf1, 0x24, 0xe7, 0xe7,
-	0x95, 0xa4, 0xe6, 0x95, 0xc4, 0x97, 0x54, 0x16, 0xa4, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06,
-	0x71, 0x43, 0xc5, 0x42, 0x2a, 0x0b, 0x52, 0x85, 0x84, 0xb8, 0x58, 0x52, 0x12, 0x4b, 0x12, 0x25,
-	0x98, 0x14, 0x18, 0x35, 0x78, 0x82, 0xc0, 0x6c, 0xa7, 0x54, 0x2e, 0xbe, 0xe4, 0xfc, 0x5c, 0x3d,
-	0x84, 0xa1, 0x4e, 0xbc, 0x30, 0x23, 0x03, 0x40, 0xf6, 0x05, 0x30, 0x46, 0x59, 0x43, 0x25, 0xd3,
-	0xf3, 0x73, 0x12, 0xf3, 0xd2, 0xf5, 0xf2, 0x8b, 0xd2, 0xf5, 0xd3, 0x53, 0xf3, 0xc0, 0xae, 0xd1,
-	0x87, 0x48, 0x25, 0x16, 0x64, 0x16, 0xa3, 0xb8, 0xd5, 0x1a, 0xc6, 0x58, 0xc4, 0xc4, 0xe2, 0xee,
-	0x18, 0xe0, 0x99, 0xc4, 0x06, 0x56, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x3a, 0xdf,
-	0x30, 0xd9, 0x00, 0x00, 0x00,
+var fileDescriptor_httpbody_d3ca4c70025a4501 = []byte{
+	// 226 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0x3f, 0x4f, 0xc3, 0x30,
+	0x10, 0xc5, 0x95, 0xb6, 0x42, 0x70, 0x2d, 0x0c, 0x16, 0x43, 0x60, 0x0a, 0x4c, 0x99, 0x6c, 0x09,
+	0xd8, 0x3a, 0x35, 0x0b, 0xb0, 0x45, 0x11, 0x13, 0x0b, 0x72, 0x9a, 0xc3, 0x44, 0x2a, 0x77, 0xa7,
+	0xe6, 0x10, 0xf8, 0xeb, 0xf0, 0x49, 0x11, 0xf9, 0x23, 0xe8, 0xf6, 0xe4, 0xdf, 0xcf, 0x7e, 0xcf,
+	0x70, 0x11, 0x98, 0xc3, 0x0e, 0x9d, 0x97, 0xd6, 0xbd, 0xa9, 0x4a, 0xcd, 0x4d, 0xb4, 0xb2, 0x67,
+	0x65, 0x03, 0x03, 0xb2, 0x5e, 0xda, 0xcb, 0x49, 0xeb, 0x49, 0xfd, 0xf1, 0xea, 0x3c, 0x8d, 0xda,
+	0xf5, 0x27, 0x1c, 0x3f, 0xa8, 0x4a, 0xc1, 0x4d, 0x34, 0x57, 0xb0, 0xda, 0x32, 0x29, 0x92, 0xbe,
+	0x68, 0x14, 0x4c, 0x93, 0x2c, 0xc9, 0x4f, 0xaa, 0xe5, 0x78, 0xf6, 0x14, 0x05, 0x8d, 0x81, 0x45,
+	0xe3, 0xd5, 0xa7, 0xb3, 0x2c, 0xc9, 0x57, 0x55, 0x9f, 0xcd, 0x1d, 0x00, 0x7e, 0x29, 0x52, 0xd7,
+	0x32, 0x75, 0xe9, 0x3c, 0x9b, 0xe7, 0xcb, 0x9b, 0x73, 0x3b, 0xd6, 0x4f, 0x95, 0x76, 0x43, 0xb1,
+	0xfa, 0xe7, 0x15, 0x08, 0x67, 0x5b, 0x7e, 0xb7, 0x7f, 0x2b, 0x8b, 0xd3, 0x69, 0x48, 0xf9, 0x7b,
+	0xa7, 0x4c, 0x9e, 0xd7, 0x23, 0x0c, 0xbc, 0xf3, 0x14, 0x2c, 0xef, 0x83, 0x0b, 0x48, 0xfd, 0x8b,
+	0x6e, 0x40, 0x5e, 0xda, 0xee, 0xe0, 0xf3, 0xeb, 0x29, 0x7c, 0xcf, 0x16, 0xf7, 0x9b, 0xf2, 0xb1,
+	0x3e, 0xea, 0xf5, 0xdb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x11, 0x70, 0x02, 0x2a, 0x01,
+	0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go b/vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go
index 790f6c07..cae68236 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/label.proto
 
-/*
-Package label is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/label.proto
-
-It has these top-level messages:
-	LabelDescriptor
-*/
-package label
+package label // import "google.golang.org/genproto/googleapis/api/label"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -53,22 +44,46 @@ var LabelDescriptor_ValueType_value = map[string]int32{
 func (x LabelDescriptor_ValueType) String() string {
 	return proto.EnumName(LabelDescriptor_ValueType_name, int32(x))
 }
-func (LabelDescriptor_ValueType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (LabelDescriptor_ValueType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_label_7ab1ab74ef036f1c, []int{0, 0}
+}
 
 // A description of a label.
 type LabelDescriptor struct {
 	// The label key.
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// The type of data that can be assigned to the label.
-	ValueType LabelDescriptor_ValueType `protobuf:"varint,2,opt,name=value_type,json=valueType,enum=google.api.LabelDescriptor_ValueType" json:"value_type,omitempty"`
+	ValueType LabelDescriptor_ValueType `protobuf:"varint,2,opt,name=value_type,json=valueType,proto3,enum=google.api.LabelDescriptor_ValueType" json:"value_type,omitempty"`
 	// A human-readable description for the label.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelDescriptor) Reset()         { *m = LabelDescriptor{} }
+func (m *LabelDescriptor) String() string { return proto.CompactTextString(m) }
+func (*LabelDescriptor) ProtoMessage()    {}
+func (*LabelDescriptor) Descriptor() ([]byte, []int) {
+	return fileDescriptor_label_7ab1ab74ef036f1c, []int{0}
+}
+func (m *LabelDescriptor) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelDescriptor.Unmarshal(m, b)
+}
+func (m *LabelDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelDescriptor.Marshal(b, m, deterministic)
+}
+func (dst *LabelDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDescriptor.Merge(dst, src)
+}
+func (m *LabelDescriptor) XXX_Size() int {
+	return xxx_messageInfo_LabelDescriptor.Size(m)
+}
+func (m *LabelDescriptor) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelDescriptor.DiscardUnknown(m)
 }
 
-func (m *LabelDescriptor) Reset()                    { *m = LabelDescriptor{} }
-func (m *LabelDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*LabelDescriptor) ProtoMessage()               {}
-func (*LabelDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_LabelDescriptor proto.InternalMessageInfo
 
 func (m *LabelDescriptor) GetKey() string {
 	if m != nil {
@@ -96,9 +111,9 @@ func init() {
 	proto.RegisterEnum("google.api.LabelDescriptor_ValueType", LabelDescriptor_ValueType_name, LabelDescriptor_ValueType_value)
 }
 
-func init() { proto.RegisterFile("google/api/label.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/api/label.proto", fileDescriptor_label_7ab1ab74ef036f1c) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_label_7ab1ab74ef036f1c = []byte{
 	// 252 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0xcf, 0x49, 0x4c, 0x4a, 0xcd, 0xd1, 0x2b, 0x28, 0xca,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/metric/metric.pb.go b/vendor/google.golang.org/genproto/googleapis/api/metric/metric.pb.go
index df451ac5..f906777a 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/metric/metric.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/metric/metric.pb.go
@@ -1,22 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/metric.proto
 
-/*
-Package metric is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/metric.proto
-
-It has these top-level messages:
-	MetricDescriptor
-	Metric
-*/
-package metric
+package metric // import "google.golang.org/genproto/googleapis/api/metric"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_api "google.golang.org/genproto/googleapis/api/label"
+import label "google.golang.org/genproto/googleapis/api/label"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -64,7 +54,7 @@ func (x MetricDescriptor_MetricKind) String() string {
 	return proto.EnumName(MetricDescriptor_MetricKind_name, int32(x))
 }
 func (MetricDescriptor_MetricKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 0}
+	return fileDescriptor_metric_18b95065d4b7f9c0, []int{0, 0}
 }
 
 // The value type of a metric.
@@ -112,22 +102,15 @@ func (x MetricDescriptor_ValueType) String() string {
 	return proto.EnumName(MetricDescriptor_ValueType_name, int32(x))
 }
 func (MetricDescriptor_ValueType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 1}
+	return fileDescriptor_metric_18b95065d4b7f9c0, []int{0, 1}
 }
 
 // Defines a metric type and its schema. Once a metric descriptor is created,
 // deleting or altering it stops data collection and makes the metric type's
 // existing data unusable.
 type MetricDescriptor struct {
-	// The resource name of the metric descriptor. Depending on the
-	// implementation, the name typically includes: (1) the parent resource name
-	// that defines the scope of the metric type or of its data; and (2) the
-	// metric's URL-encoded type, which also appears in the `type` field of this
-	// descriptor. For example, following is the resource name of a custom
-	// metric within the GCP project `my-project-id`:
-	//
-	//     "projects/my-project-id/metricDescriptors/custom.googleapis.com%2Finvoice%2Fpaid%2Famount"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// The resource name of the metric descriptor.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The metric type, including its DNS name prefix. The type is not
 	// URL-encoded.  All user-defined custom metric types have the DNS name
 	// `custom.googleapis.com`.  Metric types should use a natural hierarchical
@@ -135,20 +118,20 @@ type MetricDescriptor struct {
 	//
 	//     "custom.googleapis.com/invoice/paid/amount"
 	//     "appengine.googleapis.com/http/server/response_latencies"
-	Type string `protobuf:"bytes,8,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,8,opt,name=type,proto3" json:"type,omitempty"`
 	// The set of labels that can be used to describe a specific
 	// instance of this metric type. For example, the
 	// `appengine.googleapis.com/http/server/response_latencies` metric
 	// type has a label for the HTTP response code, `response_code`, so
 	// you can look at latencies for successful responses or just
 	// for responses that failed.
-	Labels []*google_api.LabelDescriptor `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty"`
+	Labels []*label.LabelDescriptor `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty"`
 	// Whether the metric records instantaneous values, changes to a value, etc.
 	// Some combinations of `metric_kind` and `value_type` might not be supported.
-	MetricKind MetricDescriptor_MetricKind `protobuf:"varint,3,opt,name=metric_kind,json=metricKind,enum=google.api.MetricDescriptor_MetricKind" json:"metric_kind,omitempty"`
+	MetricKind MetricDescriptor_MetricKind `protobuf:"varint,3,opt,name=metric_kind,json=metricKind,proto3,enum=google.api.MetricDescriptor_MetricKind" json:"metric_kind,omitempty"`
 	// Whether the measurement is an integer, a floating-point number, etc.
 	// Some combinations of `metric_kind` and `value_type` might not be supported.
-	ValueType MetricDescriptor_ValueType `protobuf:"varint,4,opt,name=value_type,json=valueType,enum=google.api.MetricDescriptor_ValueType" json:"value_type,omitempty"`
+	ValueType MetricDescriptor_ValueType `protobuf:"varint,4,opt,name=value_type,json=valueType,proto3,enum=google.api.MetricDescriptor_ValueType" json:"value_type,omitempty"`
 	// The unit in which the metric value is reported. It is only applicable
 	// if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The
 	// supported units are a subset of [The Unified Code for Units of
@@ -188,8 +171,6 @@ type MetricDescriptor struct {
 	//
 	// **Grammar**
 	//
-	// The grammar includes the dimensionless unit `1`, such as `1/s`.
-	//
 	// The grammar also includes these connectors:
 	//
 	// * `/`    division (as an infix operator, e.g. `1/s`).
@@ -199,7 +180,7 @@ type MetricDescriptor struct {
 	//
 	//     Expression = Component { "." Component } { "/" Component } ;
 	//
-	//     Component = [ PREFIX ] UNIT [ Annotation ]
+	//     Component = ( [ PREFIX ] UNIT | "%" ) [ Annotation ]
 	//               | Annotation
 	//               | "1"
 	//               ;
@@ -213,18 +194,45 @@ type MetricDescriptor struct {
 	//    `{requests}/s == 1/s`, `By{transmitted}/s == By/s`.
 	// * `NAME` is a sequence of non-blank printable ASCII characters not
 	//    containing '{' or '}'.
-	Unit string `protobuf:"bytes,5,opt,name=unit" json:"unit,omitempty"`
+	// * `1` represents dimensionless value 1, such as in `1/s`.
+	// * `%` represents dimensionless value 1/100, and annotates values giving
+	//    a percentage.
+	Unit string `protobuf:"bytes,5,opt,name=unit,proto3" json:"unit,omitempty"`
 	// A detailed description of the metric, which can be used in documentation.
-	Description string `protobuf:"bytes,6,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"`
 	// A concise name for the metric, which can be displayed in user interfaces.
 	// Use sentence case without an ending period, for example "Request count".
-	DisplayName string `protobuf:"bytes,7,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	// This field is optional but it is recommended to be set for any metrics
+	// associated with user-visible concepts, such as Quota.
+	DisplayName          string   `protobuf:"bytes,7,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MetricDescriptor) Reset()         { *m = MetricDescriptor{} }
+func (m *MetricDescriptor) String() string { return proto.CompactTextString(m) }
+func (*MetricDescriptor) ProtoMessage()    {}
+func (*MetricDescriptor) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_18b95065d4b7f9c0, []int{0}
+}
+func (m *MetricDescriptor) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MetricDescriptor.Unmarshal(m, b)
+}
+func (m *MetricDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MetricDescriptor.Marshal(b, m, deterministic)
+}
+func (dst *MetricDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricDescriptor.Merge(dst, src)
+}
+func (m *MetricDescriptor) XXX_Size() int {
+	return xxx_messageInfo_MetricDescriptor.Size(m)
+}
+func (m *MetricDescriptor) XXX_DiscardUnknown() {
+	xxx_messageInfo_MetricDescriptor.DiscardUnknown(m)
 }
 
-func (m *MetricDescriptor) Reset()                    { *m = MetricDescriptor{} }
-func (m *MetricDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*MetricDescriptor) ProtoMessage()               {}
-func (*MetricDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_MetricDescriptor proto.InternalMessageInfo
 
 func (m *MetricDescriptor) GetName() string {
 	if m != nil {
@@ -240,7 +248,7 @@ func (m *MetricDescriptor) GetType() string {
 	return ""
 }
 
-func (m *MetricDescriptor) GetLabels() []*google_api.LabelDescriptor {
+func (m *MetricDescriptor) GetLabels() []*label.LabelDescriptor {
 	if m != nil {
 		return m.Labels
 	}
@@ -287,16 +295,38 @@ func (m *MetricDescriptor) GetDisplayName() string {
 type Metric struct {
 	// An existing metric type, see [google.api.MetricDescriptor][google.api.MetricDescriptor].
 	// For example, `custom.googleapis.com/invoice/paid/amount`.
-	Type string `protobuf:"bytes,3,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
 	// The set of label values that uniquely identify this metric. All
 	// labels listed in the `MetricDescriptor` must be assigned values.
-	Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Metric) Reset()         { *m = Metric{} }
+func (m *Metric) String() string { return proto.CompactTextString(m) }
+func (*Metric) ProtoMessage()    {}
+func (*Metric) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_18b95065d4b7f9c0, []int{1}
+}
+func (m *Metric) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Metric.Unmarshal(m, b)
+}
+func (m *Metric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Metric.Marshal(b, m, deterministic)
+}
+func (dst *Metric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metric.Merge(dst, src)
+}
+func (m *Metric) XXX_Size() int {
+	return xxx_messageInfo_Metric.Size(m)
+}
+func (m *Metric) XXX_DiscardUnknown() {
+	xxx_messageInfo_Metric.DiscardUnknown(m)
 }
 
-func (m *Metric) Reset()                    { *m = Metric{} }
-func (m *Metric) String() string            { return proto.CompactTextString(m) }
-func (*Metric) ProtoMessage()               {}
-func (*Metric) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Metric proto.InternalMessageInfo
 
 func (m *Metric) GetType() string {
 	if m != nil {
@@ -315,13 +345,14 @@ func (m *Metric) GetLabels() map[string]string {
 func init() {
 	proto.RegisterType((*MetricDescriptor)(nil), "google.api.MetricDescriptor")
 	proto.RegisterType((*Metric)(nil), "google.api.Metric")
+	proto.RegisterMapType((map[string]string)(nil), "google.api.Metric.LabelsEntry")
 	proto.RegisterEnum("google.api.MetricDescriptor_MetricKind", MetricDescriptor_MetricKind_name, MetricDescriptor_MetricKind_value)
 	proto.RegisterEnum("google.api.MetricDescriptor_ValueType", MetricDescriptor_ValueType_name, MetricDescriptor_ValueType_value)
 }
 
-func init() { proto.RegisterFile("google/api/metric.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/api/metric.proto", fileDescriptor_metric_18b95065d4b7f9c0) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_metric_18b95065d4b7f9c0 = []byte{
 	// 506 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0x4d, 0x6f, 0xda, 0x40,
 	0x10, 0xad, 0x3f, 0x70, 0xc3, 0x10, 0xa1, 0xd5, 0xaa, 0x4a, 0x2c, 0x22, 0x55, 0x94, 0x43, 0xcb,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/monitoredres/monitored_resource.pb.go b/vendor/google.golang.org/genproto/googleapis/api/monitoredres/monitored_resource.pb.go
index 3ce7eb74..653c7ae4 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/monitoredres/monitored_resource.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/monitoredres/monitored_resource.pb.go
@@ -1,22 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/monitored_resource.proto
 
-/*
-Package monitoredres is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/monitored_resource.proto
-
-It has these top-level messages:
-	MonitoredResourceDescriptor
-	MonitoredResource
-*/
-package monitoredres
+package monitoredres // import "google.golang.org/genproto/googleapis/api/monitoredres"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_api "google.golang.org/genproto/googleapis/api/label"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import label "google.golang.org/genproto/googleapis/api/label"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -45,29 +36,51 @@ type MonitoredResourceDescriptor struct {
 	// {project_id} is a project ID that provides API-specific context for
 	// accessing the type.  APIs that do not use project information can use the
 	// resource name format `"monitoredResourceDescriptors/{type}"`.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The monitored resource type. For example, the type
 	// `"cloudsql_database"` represents databases in Google Cloud SQL.
 	// The maximum length of this value is 256 characters.
-	Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
 	// Optional. A concise name for the monitored resource type that might be
 	// displayed in user interfaces. It should be a Title Cased Noun Phrase,
 	// without any article or other determiners. For example,
 	// `"Google Cloud SQL Database"`.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Optional. A detailed description of the monitored resource type that might
 	// be used in documentation.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Required. A set of labels used to describe instances of this monitored
 	// resource type. For example, an individual Google Cloud SQL database is
 	// identified by values for the labels `"database_id"` and `"zone"`.
-	Labels []*google_api.LabelDescriptor `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty"`
+	Labels               []*label.LabelDescriptor `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *MonitoredResourceDescriptor) Reset()         { *m = MonitoredResourceDescriptor{} }
+func (m *MonitoredResourceDescriptor) String() string { return proto.CompactTextString(m) }
+func (*MonitoredResourceDescriptor) ProtoMessage()    {}
+func (*MonitoredResourceDescriptor) Descriptor() ([]byte, []int) {
+	return fileDescriptor_monitored_resource_35ee91132be0d9ce, []int{0}
+}
+func (m *MonitoredResourceDescriptor) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MonitoredResourceDescriptor.Unmarshal(m, b)
+}
+func (m *MonitoredResourceDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MonitoredResourceDescriptor.Marshal(b, m, deterministic)
+}
+func (dst *MonitoredResourceDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MonitoredResourceDescriptor.Merge(dst, src)
+}
+func (m *MonitoredResourceDescriptor) XXX_Size() int {
+	return xxx_messageInfo_MonitoredResourceDescriptor.Size(m)
+}
+func (m *MonitoredResourceDescriptor) XXX_DiscardUnknown() {
+	xxx_messageInfo_MonitoredResourceDescriptor.DiscardUnknown(m)
 }
 
-func (m *MonitoredResourceDescriptor) Reset()                    { *m = MonitoredResourceDescriptor{} }
-func (m *MonitoredResourceDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*MonitoredResourceDescriptor) ProtoMessage()               {}
-func (*MonitoredResourceDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_MonitoredResourceDescriptor proto.InternalMessageInfo
 
 func (m *MonitoredResourceDescriptor) GetName() string {
 	if m != nil {
@@ -97,7 +110,7 @@ func (m *MonitoredResourceDescriptor) GetDescription() string {
 	return ""
 }
 
-func (m *MonitoredResourceDescriptor) GetLabels() []*google_api.LabelDescriptor {
+func (m *MonitoredResourceDescriptor) GetLabels() []*label.LabelDescriptor {
 	if m != nil {
 		return m.Labels
 	}
@@ -120,18 +133,40 @@ func (m *MonitoredResourceDescriptor) GetLabels() []*google_api.LabelDescriptor
 type MonitoredResource struct {
 	// Required. The monitored resource type. This field must match
 	// the `type` field of a [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] object. For
-	// example, the type of a Cloud SQL database is `"cloudsql_database"`.
-	Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
+	// example, the type of a Compute Engine VM instance is `gce_instance`.
+	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
 	// Required. Values for all of the labels listed in the associated monitored
-	// resource descriptor. For example, Cloud SQL databases use the labels
-	// `"database_id"` and `"zone"`.
-	Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// resource descriptor. For example, Compute Engine VM instances use the
+	// labels `"project_id"`, `"instance_id"`, and `"zone"`.
+	Labels               map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *MonitoredResource) Reset()         { *m = MonitoredResource{} }
+func (m *MonitoredResource) String() string { return proto.CompactTextString(m) }
+func (*MonitoredResource) ProtoMessage()    {}
+func (*MonitoredResource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_monitored_resource_35ee91132be0d9ce, []int{1}
+}
+func (m *MonitoredResource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MonitoredResource.Unmarshal(m, b)
+}
+func (m *MonitoredResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MonitoredResource.Marshal(b, m, deterministic)
+}
+func (dst *MonitoredResource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MonitoredResource.Merge(dst, src)
+}
+func (m *MonitoredResource) XXX_Size() int {
+	return xxx_messageInfo_MonitoredResource.Size(m)
+}
+func (m *MonitoredResource) XXX_DiscardUnknown() {
+	xxx_messageInfo_MonitoredResource.DiscardUnknown(m)
 }
 
-func (m *MonitoredResource) Reset()                    { *m = MonitoredResource{} }
-func (m *MonitoredResource) String() string            { return proto.CompactTextString(m) }
-func (*MonitoredResource) ProtoMessage()               {}
-func (*MonitoredResource) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_MonitoredResource proto.InternalMessageInfo
 
 func (m *MonitoredResource) GetType() string {
 	if m != nil {
@@ -147,34 +182,108 @@ func (m *MonitoredResource) GetLabels() map[string]string {
 	return nil
 }
 
+// Auxiliary metadata for a [MonitoredResource][google.api.MonitoredResource] object.
+// [MonitoredResource][google.api.MonitoredResource] objects contain the minimum set of information to
+// uniquely identify a monitored resource instance. There is some other useful
+// auxiliary metadata. Google Stackdriver Monitoring & Logging uses an ingestion
+// pipeline to extract metadata for cloud resources of all types , and stores
+// the metadata in this message.
+type MonitoredResourceMetadata struct {
+	// Output only. Values for predefined system metadata labels.
+	// System labels are a kind of metadata extracted by Google Stackdriver.
+	// Stackdriver determines what system labels are useful and how to obtain
+	// their values. Some examples: "machine_image", "vpc", "subnet_id",
+	// "security_group", "name", etc.
+	// System label values can be only strings, Boolean values, or a list of
+	// strings. For example:
+	//
+	//     { "name": "my-test-instance",
+	//       "security_group": ["a", "b", "c"],
+	//       "spot_instance": false }
+	SystemLabels *_struct.Struct `protobuf:"bytes,1,opt,name=system_labels,json=systemLabels,proto3" json:"system_labels,omitempty"`
+	// Output only. A map of user-defined metadata labels.
+	UserLabels           map[string]string `protobuf:"bytes,2,rep,name=user_labels,json=userLabels,proto3" json:"user_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *MonitoredResourceMetadata) Reset()         { *m = MonitoredResourceMetadata{} }
+func (m *MonitoredResourceMetadata) String() string { return proto.CompactTextString(m) }
+func (*MonitoredResourceMetadata) ProtoMessage()    {}
+func (*MonitoredResourceMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_monitored_resource_35ee91132be0d9ce, []int{2}
+}
+func (m *MonitoredResourceMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MonitoredResourceMetadata.Unmarshal(m, b)
+}
+func (m *MonitoredResourceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MonitoredResourceMetadata.Marshal(b, m, deterministic)
+}
+func (dst *MonitoredResourceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MonitoredResourceMetadata.Merge(dst, src)
+}
+func (m *MonitoredResourceMetadata) XXX_Size() int {
+	return xxx_messageInfo_MonitoredResourceMetadata.Size(m)
+}
+func (m *MonitoredResourceMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_MonitoredResourceMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MonitoredResourceMetadata proto.InternalMessageInfo
+
+func (m *MonitoredResourceMetadata) GetSystemLabels() *_struct.Struct {
+	if m != nil {
+		return m.SystemLabels
+	}
+	return nil
+}
+
+func (m *MonitoredResourceMetadata) GetUserLabels() map[string]string {
+	if m != nil {
+		return m.UserLabels
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*MonitoredResourceDescriptor)(nil), "google.api.MonitoredResourceDescriptor")
 	proto.RegisterType((*MonitoredResource)(nil), "google.api.MonitoredResource")
+	proto.RegisterMapType((map[string]string)(nil), "google.api.MonitoredResource.LabelsEntry")
+	proto.RegisterType((*MonitoredResourceMetadata)(nil), "google.api.MonitoredResourceMetadata")
+	proto.RegisterMapType((map[string]string)(nil), "google.api.MonitoredResourceMetadata.UserLabelsEntry")
+}
+
+func init() {
+	proto.RegisterFile("google/api/monitored_resource.proto", fileDescriptor_monitored_resource_35ee91132be0d9ce)
 }
 
-func init() { proto.RegisterFile("google/api/monitored_resource.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 321 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0x4b, 0x4b, 0x3b, 0x31,
-	0x10, 0x27, 0xdb, 0x07, 0xfc, 0x67, 0xff, 0x88, 0x06, 0x29, 0x4b, 0x7b, 0xa9, 0xf5, 0x52, 0x2f,
-	0xbb, 0x60, 0x2f, 0x3e, 0x4e, 0xad, 0x8a, 0x08, 0x2a, 0xa5, 0x47, 0x2f, 0x25, 0x6d, 0xc3, 0x12,
-	0xdc, 0x66, 0x42, 0xb2, 0x15, 0xf6, 0xeb, 0x08, 0x7e, 0x0e, 0xbf, 0x96, 0x47, 0xc9, 0xa3, 0x76,
-	0xa5, 0xde, 0x26, 0xbf, 0xf9, 0x3d, 0x66, 0x32, 0x70, 0x9a, 0x23, 0xe6, 0x05, 0xcf, 0x98, 0x12,
-	0xd9, 0x1a, 0xa5, 0x28, 0x51, 0xf3, 0xd5, 0x5c, 0x73, 0x83, 0x1b, 0xbd, 0xe4, 0xa9, 0xd2, 0x58,
-	0x22, 0x05, 0x4f, 0x4a, 0x99, 0x12, 0xdd, 0x4e, 0x4d, 0x50, 0xb0, 0x05, 0x2f, 0x3c, 0x67, 0xf0,
-	0x49, 0xa0, 0xf7, 0xb4, 0x35, 0x98, 0x05, 0xfd, 0x2d, 0x37, 0x4b, 0x2d, 0x54, 0x89, 0x9a, 0x52,
-	0x68, 0x4a, 0xb6, 0xe6, 0x49, 0xab, 0x4f, 0x86, 0xff, 0x66, 0xae, 0xb6, 0x58, 0x59, 0x29, 0x9e,
-	0x10, 0x8f, 0xd9, 0x9a, 0x9e, 0xc0, 0xff, 0x95, 0x30, 0xaa, 0x60, 0xd5, 0xdc, 0xf1, 0x23, 0xd7,
-	0x8b, 0x03, 0xf6, 0x6c, 0x65, 0x7d, 0x88, 0x57, 0xc1, 0x58, 0xa0, 0x4c, 0x1a, 0x81, 0xb1, 0x83,
-	0xe8, 0x08, 0xda, 0x6e, 0x36, 0x93, 0x34, 0xfb, 0x8d, 0x61, 0x7c, 0xde, 0x4b, 0x77, 0x1b, 0xa4,
-	0x8f, 0xb6, 0xb3, 0x9b, 0x6c, 0x16, 0xa8, 0x83, 0x0f, 0x02, 0x47, 0x7b, 0x1b, 0xfc, 0x39, 0xe3,
-	0xf8, 0xc7, 0x3e, 0x72, 0xf6, 0x67, 0x75, 0xfb, 0x3d, 0x0b, 0x1f, 0x68, 0xee, 0x64, 0xa9, 0xab,
-	0x6d, 0x58, 0xf7, 0x12, 0xe2, 0x1a, 0x4c, 0x0f, 0xa1, 0xf1, 0xca, 0xab, 0x10, 0x62, 0x4b, 0x7a,
-	0x0c, 0xad, 0x37, 0x56, 0x6c, 0xb6, 0x1f, 0xe0, 0x1f, 0x57, 0xd1, 0x05, 0x99, 0x54, 0x70, 0xb0,
-	0xc4, 0x75, 0x2d, 0x72, 0xd2, 0xd9, 0xcb, 0x9c, 0xda, 0x9b, 0x4c, 0xc9, 0xcb, 0x4d, 0x60, 0xe5,
-	0x58, 0x30, 0x99, 0xa7, 0xa8, 0xf3, 0x2c, 0xe7, 0xd2, 0x5d, 0x2c, 0xf3, 0x2d, 0xa6, 0x84, 0xf9,
-	0x7d, 0x7d, 0xcd, 0xcd, 0x75, 0xfd, 0xf1, 0x45, 0xc8, 0x7b, 0xd4, 0xbc, 0x1f, 0x4f, 0x1f, 0x16,
-	0x6d, 0xa7, 0x1c, 0x7d, 0x07, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xfb, 0xfb, 0x11, 0x36, 0x02, 0x00,
-	0x00,
+var fileDescriptor_monitored_resource_35ee91132be0d9ce = []byte{
+	// 415 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0xab, 0xd3, 0x40,
+	0x14, 0x65, 0xd2, 0x0f, 0xf0, 0xa6, 0x7e, 0x0d, 0x52, 0x63, 0xea, 0xa2, 0xd6, 0x4d, 0xdd, 0x24,
+	0xd0, 0x22, 0xf8, 0xb9, 0x68, 0x55, 0x44, 0xb0, 0x52, 0x22, 0xba, 0x70, 0x13, 0xa6, 0xc9, 0x18,
+	0x82, 0x49, 0x26, 0xcc, 0x4c, 0x84, 0xfc, 0x1d, 0xc1, 0xdf, 0xe1, 0x5f, 0x72, 0xe9, 0x52, 0x32,
+	0x33, 0x69, 0xd3, 0x97, 0xc7, 0x83, 0xb7, 0xbb, 0xf7, 0xdc, 0x73, 0xcf, 0x3d, 0x27, 0x43, 0xe0,
+	0x71, 0xc2, 0x58, 0x92, 0x51, 0x9f, 0x94, 0xa9, 0x9f, 0xb3, 0x22, 0x95, 0x8c, 0xd3, 0x38, 0xe4,
+	0x54, 0xb0, 0x8a, 0x47, 0xd4, 0x2b, 0x39, 0x93, 0x0c, 0x83, 0x26, 0x79, 0xa4, 0x4c, 0xdd, 0x69,
+	0x67, 0x21, 0x23, 0x07, 0x9a, 0x69, 0x8e, 0xfb, 0xd0, 0xe0, 0xaa, 0x3b, 0x54, 0xdf, 0x7d, 0x21,
+	0x79, 0x15, 0x49, 0x3d, 0x5d, 0xfc, 0x41, 0x30, 0xdb, 0xb5, 0xf2, 0x81, 0x51, 0x7f, 0x4b, 0x45,
+	0xc4, 0xd3, 0x52, 0x32, 0x8e, 0x31, 0x0c, 0x0b, 0x92, 0x53, 0x67, 0x34, 0x47, 0xcb, 0x1b, 0x81,
+	0xaa, 0x1b, 0x4c, 0xd6, 0x25, 0x75, 0x90, 0xc6, 0x9a, 0x1a, 0x3f, 0x82, 0x49, 0x9c, 0x8a, 0x32,
+	0x23, 0x75, 0xa8, 0xf8, 0x96, 0x9a, 0xd9, 0x06, 0xfb, 0xd4, 0xac, 0xcd, 0xc1, 0x8e, 0x8d, 0x70,
+	0xca, 0x0a, 0x67, 0x60, 0x18, 0x27, 0x08, 0xaf, 0x61, 0xac, 0x9c, 0x0b, 0x67, 0x38, 0x1f, 0x2c,
+	0xed, 0xd5, 0xcc, 0x3b, 0xe5, 0xf3, 0x3e, 0x36, 0x93, 0x93, 0xb3, 0xc0, 0x50, 0x17, 0xbf, 0x11,
+	0xdc, 0xed, 0x25, 0xb8, 0xd4, 0xe3, 0xe6, 0x28, 0x6f, 0x29, 0xf9, 0x27, 0x5d, 0xf9, 0x9e, 0x84,
+	0x3e, 0x28, 0xde, 0x15, 0x92, 0xd7, 0xed, 0x31, 0xf7, 0x39, 0xd8, 0x1d, 0x18, 0xdf, 0x81, 0xc1,
+	0x0f, 0x5a, 0x9b, 0x23, 0x4d, 0x89, 0xef, 0xc1, 0xe8, 0x27, 0xc9, 0xaa, 0xf6, 0x03, 0xe8, 0xe6,
+	0x85, 0xf5, 0x0c, 0x2d, 0xfe, 0x22, 0x78, 0xd0, 0x3b, 0xb2, 0xa3, 0x92, 0xc4, 0x44, 0x12, 0xfc,
+	0x0a, 0x6e, 0x8a, 0x5a, 0x48, 0x9a, 0x87, 0xc6, 0x62, 0xa3, 0x69, 0xaf, 0xee, 0xb7, 0x16, 0xdb,
+	0xd7, 0xf3, 0x3e, 0xab, 0xd7, 0x0b, 0x26, 0x9a, 0xad, 0xcd, 0xe0, 0xaf, 0x60, 0x57, 0x82, 0xf2,
+	0xf0, 0x2c, 0xde, 0xd3, 0x2b, 0xe3, 0xb5, 0x97, 0xbd, 0x2f, 0x82, 0xf2, 0x6e, 0x54, 0xa8, 0x8e,
+	0x80, 0xfb, 0x1a, 0x6e, 0x5f, 0x18, 0x5f, 0x27, 0xf2, 0xb6, 0x86, 0x5b, 0x11, 0xcb, 0x3b, 0x36,
+	0xb6, 0xd3, 0x9e, 0x8f, 0x7d, 0x13, 0x6c, 0x8f, 0xbe, 0xbd, 0x31, 0xac, 0x84, 0x65, 0xa4, 0x48,
+	0x3c, 0xc6, 0x13, 0x3f, 0xa1, 0x85, 0x8a, 0xed, 0xeb, 0x11, 0x29, 0x53, 0x71, 0xfe, 0x3b, 0x70,
+	0x2a, 0x5e, 0x76, 0x9b, 0x7f, 0x08, 0xfd, 0xb2, 0x86, 0xef, 0x37, 0xfb, 0x0f, 0x87, 0xb1, 0xda,
+	0x5c, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x10, 0x16, 0x7c, 0xe9, 0x47, 0x03, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/auth.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/auth.pb.go
index f0b7e90e..a5c695f3 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/auth.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/auth.pb.go
@@ -1,60 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/auth.proto
 
-/*
-Package serviceconfig is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/auth.proto
-	google/api/backend.proto
-	google/api/billing.proto
-	google/api/consumer.proto
-	google/api/context.proto
-	google/api/control.proto
-	google/api/documentation.proto
-	google/api/endpoint.proto
-	google/api/log.proto
-	google/api/logging.proto
-	google/api/monitoring.proto
-	google/api/quota.proto
-	google/api/service.proto
-	google/api/source_info.proto
-	google/api/system_parameter.proto
-	google/api/usage.proto
-
-It has these top-level messages:
-	Authentication
-	AuthenticationRule
-	AuthProvider
-	OAuthRequirements
-	AuthRequirement
-	Backend
-	BackendRule
-	Billing
-	ProjectProperties
-	Property
-	Context
-	ContextRule
-	Control
-	Documentation
-	DocumentationRule
-	Page
-	Endpoint
-	LogDescriptor
-	Logging
-	Monitoring
-	Quota
-	MetricRule
-	QuotaLimit
-	Service
-	SourceInfo
-	SystemParameters
-	SystemParameterRule
-	SystemParameter
-	Usage
-	UsageRule
-*/
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -90,15 +37,37 @@ type Authentication struct {
 	// A list of authentication rules that apply to individual API methods.
 	//
 	// **NOTE:** All service configuration rules follow "last one wins" order.
-	Rules []*AuthenticationRule `protobuf:"bytes,3,rep,name=rules" json:"rules,omitempty"`
+	Rules []*AuthenticationRule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"`
 	// Defines a set of authentication providers that a service supports.
-	Providers []*AuthProvider `protobuf:"bytes,4,rep,name=providers" json:"providers,omitempty"`
+	Providers            []*AuthProvider `protobuf:"bytes,4,rep,name=providers,proto3" json:"providers,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *Authentication) Reset()                    { *m = Authentication{} }
-func (m *Authentication) String() string            { return proto.CompactTextString(m) }
-func (*Authentication) ProtoMessage()               {}
-func (*Authentication) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Authentication) Reset()         { *m = Authentication{} }
+func (m *Authentication) String() string { return proto.CompactTextString(m) }
+func (*Authentication) ProtoMessage()    {}
+func (*Authentication) Descriptor() ([]byte, []int) {
+	return fileDescriptor_auth_88c4f5ae0863ae9c, []int{0}
+}
+func (m *Authentication) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Authentication.Unmarshal(m, b)
+}
+func (m *Authentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Authentication.Marshal(b, m, deterministic)
+}
+func (dst *Authentication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Authentication.Merge(dst, src)
+}
+func (m *Authentication) XXX_Size() int {
+	return xxx_messageInfo_Authentication.Size(m)
+}
+func (m *Authentication) XXX_DiscardUnknown() {
+	xxx_messageInfo_Authentication.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Authentication proto.InternalMessageInfo
 
 func (m *Authentication) GetRules() []*AuthenticationRule {
 	if m != nil {
@@ -127,25 +96,41 @@ type AuthenticationRule struct {
 	// Selects the methods to which this rule applies.
 	//
 	// Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
-	Selector string `protobuf:"bytes,1,opt,name=selector" json:"selector,omitempty"`
+	Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"`
 	// The requirements for OAuth credentials.
-	Oauth *OAuthRequirements `protobuf:"bytes,2,opt,name=oauth" json:"oauth,omitempty"`
-	// Whether to allow requests without a credential. The credential can be
-	// an OAuth token, Google cookies (first-party auth) or EndUserCreds.
-	//
-	// For requests without credentials, if the service control environment is
-	// specified, each incoming request **must** be associated with a service
-	// consumer. This can be done by passing an API key that belongs to a consumer
-	// project.
-	AllowWithoutCredential bool `protobuf:"varint,5,opt,name=allow_without_credential,json=allowWithoutCredential" json:"allow_without_credential,omitempty"`
+	Oauth *OAuthRequirements `protobuf:"bytes,2,opt,name=oauth,proto3" json:"oauth,omitempty"`
+	// If true, the service accepts API keys without any other credential.
+	AllowWithoutCredential bool `protobuf:"varint,5,opt,name=allow_without_credential,json=allowWithoutCredential,proto3" json:"allow_without_credential,omitempty"`
 	// Requirements for additional authentication providers.
-	Requirements []*AuthRequirement `protobuf:"bytes,7,rep,name=requirements" json:"requirements,omitempty"`
+	Requirements         []*AuthRequirement `protobuf:"bytes,7,rep,name=requirements,proto3" json:"requirements,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *AuthenticationRule) Reset()         { *m = AuthenticationRule{} }
+func (m *AuthenticationRule) String() string { return proto.CompactTextString(m) }
+func (*AuthenticationRule) ProtoMessage()    {}
+func (*AuthenticationRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_auth_88c4f5ae0863ae9c, []int{1}
+}
+func (m *AuthenticationRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuthenticationRule.Unmarshal(m, b)
+}
+func (m *AuthenticationRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuthenticationRule.Marshal(b, m, deterministic)
+}
+func (dst *AuthenticationRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthenticationRule.Merge(dst, src)
+}
+func (m *AuthenticationRule) XXX_Size() int {
+	return xxx_messageInfo_AuthenticationRule.Size(m)
+}
+func (m *AuthenticationRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuthenticationRule.DiscardUnknown(m)
 }
 
-func (m *AuthenticationRule) Reset()                    { *m = AuthenticationRule{} }
-func (m *AuthenticationRule) String() string            { return proto.CompactTextString(m) }
-func (*AuthenticationRule) ProtoMessage()               {}
-func (*AuthenticationRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_AuthenticationRule proto.InternalMessageInfo
 
 func (m *AuthenticationRule) GetSelector() string {
 	if m != nil {
@@ -182,14 +167,14 @@ type AuthProvider struct {
 	// `AuthRequirement.provider_id`.
 	//
 	// Example: "bookstore_auth".
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// Identifies the principal that issued the JWT. See
 	// https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1
 	// Usually a URL or an email address.
 	//
 	// Example: https://securetoken.google.com
 	// Example: 1234567-compute@developer.gserviceaccount.com
-	Issuer string `protobuf:"bytes,2,opt,name=issuer" json:"issuer,omitempty"`
+	Issuer string `protobuf:"bytes,2,opt,name=issuer,proto3" json:"issuer,omitempty"`
 	// URL of the provider's public key set to validate signature of the JWT. See
 	// [OpenID Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata).
 	// Optional if the key set document:
@@ -199,7 +184,7 @@ type AuthProvider struct {
 	//  - can be inferred from the email domain of the issuer (e.g. a Google service account).
 	//
 	// Example: https://www.googleapis.com/oauth2/v1/certs
-	JwksUri string `protobuf:"bytes,3,opt,name=jwks_uri,json=jwksUri" json:"jwks_uri,omitempty"`
+	JwksUri string `protobuf:"bytes,3,opt,name=jwks_uri,json=jwksUri,proto3" json:"jwks_uri,omitempty"`
 	// The list of JWT
 	// [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3).
 	// that are allowed to access. A JWT containing any of these audiences will
@@ -213,16 +198,38 @@ type AuthProvider struct {
 	//
 	//     audiences: bookstore_android.apps.googleusercontent.com,
 	//                bookstore_web.apps.googleusercontent.com
-	Audiences string `protobuf:"bytes,4,opt,name=audiences" json:"audiences,omitempty"`
+	Audiences string `protobuf:"bytes,4,opt,name=audiences,proto3" json:"audiences,omitempty"`
 	// Redirect URL if JWT token is required but no present or is expired.
 	// Implement authorizationUrl of securityDefinitions in OpenAPI spec.
-	AuthorizationUrl string `protobuf:"bytes,5,opt,name=authorization_url,json=authorizationUrl" json:"authorization_url,omitempty"`
+	AuthorizationUrl     string   `protobuf:"bytes,5,opt,name=authorization_url,json=authorizationUrl,proto3" json:"authorization_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AuthProvider) Reset()         { *m = AuthProvider{} }
+func (m *AuthProvider) String() string { return proto.CompactTextString(m) }
+func (*AuthProvider) ProtoMessage()    {}
+func (*AuthProvider) Descriptor() ([]byte, []int) {
+	return fileDescriptor_auth_88c4f5ae0863ae9c, []int{2}
+}
+func (m *AuthProvider) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuthProvider.Unmarshal(m, b)
+}
+func (m *AuthProvider) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuthProvider.Marshal(b, m, deterministic)
+}
+func (dst *AuthProvider) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthProvider.Merge(dst, src)
+}
+func (m *AuthProvider) XXX_Size() int {
+	return xxx_messageInfo_AuthProvider.Size(m)
+}
+func (m *AuthProvider) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuthProvider.DiscardUnknown(m)
 }
 
-func (m *AuthProvider) Reset()                    { *m = AuthProvider{} }
-func (m *AuthProvider) String() string            { return proto.CompactTextString(m) }
-func (*AuthProvider) ProtoMessage()               {}
-func (*AuthProvider) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_AuthProvider proto.InternalMessageInfo
 
 func (m *AuthProvider) GetId() string {
 	if m != nil {
@@ -285,13 +292,35 @@ type OAuthRequirements struct {
 	//
 	//      canonical_scopes: https://www.googleapis.com/auth/calendar,
 	//                        https://www.googleapis.com/auth/calendar.read
-	CanonicalScopes string `protobuf:"bytes,1,opt,name=canonical_scopes,json=canonicalScopes" json:"canonical_scopes,omitempty"`
+	CanonicalScopes      string   `protobuf:"bytes,1,opt,name=canonical_scopes,json=canonicalScopes,proto3" json:"canonical_scopes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OAuthRequirements) Reset()         { *m = OAuthRequirements{} }
+func (m *OAuthRequirements) String() string { return proto.CompactTextString(m) }
+func (*OAuthRequirements) ProtoMessage()    {}
+func (*OAuthRequirements) Descriptor() ([]byte, []int) {
+	return fileDescriptor_auth_88c4f5ae0863ae9c, []int{3}
+}
+func (m *OAuthRequirements) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OAuthRequirements.Unmarshal(m, b)
+}
+func (m *OAuthRequirements) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OAuthRequirements.Marshal(b, m, deterministic)
+}
+func (dst *OAuthRequirements) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OAuthRequirements.Merge(dst, src)
+}
+func (m *OAuthRequirements) XXX_Size() int {
+	return xxx_messageInfo_OAuthRequirements.Size(m)
+}
+func (m *OAuthRequirements) XXX_DiscardUnknown() {
+	xxx_messageInfo_OAuthRequirements.DiscardUnknown(m)
 }
 
-func (m *OAuthRequirements) Reset()                    { *m = OAuthRequirements{} }
-func (m *OAuthRequirements) String() string            { return proto.CompactTextString(m) }
-func (*OAuthRequirements) ProtoMessage()               {}
-func (*OAuthRequirements) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_OAuthRequirements proto.InternalMessageInfo
 
 func (m *OAuthRequirements) GetCanonicalScopes() string {
 	if m != nil {
@@ -308,7 +337,7 @@ type AuthRequirement struct {
 	// Example:
 	//
 	//     provider_id: bookstore_auth
-	ProviderId string `protobuf:"bytes,1,opt,name=provider_id,json=providerId" json:"provider_id,omitempty"`
+	ProviderId string `protobuf:"bytes,1,opt,name=provider_id,json=providerId,proto3" json:"provider_id,omitempty"`
 	// NOTE: This will be deprecated soon, once AuthProvider.audiences is
 	// implemented and accepted in all the runtime components.
 	//
@@ -325,13 +354,35 @@ type AuthRequirement struct {
 	//
 	//     audiences: bookstore_android.apps.googleusercontent.com,
 	//                bookstore_web.apps.googleusercontent.com
-	Audiences string `protobuf:"bytes,2,opt,name=audiences" json:"audiences,omitempty"`
+	Audiences            string   `protobuf:"bytes,2,opt,name=audiences,proto3" json:"audiences,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AuthRequirement) Reset()         { *m = AuthRequirement{} }
+func (m *AuthRequirement) String() string { return proto.CompactTextString(m) }
+func (*AuthRequirement) ProtoMessage()    {}
+func (*AuthRequirement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_auth_88c4f5ae0863ae9c, []int{4}
+}
+func (m *AuthRequirement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuthRequirement.Unmarshal(m, b)
+}
+func (m *AuthRequirement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuthRequirement.Marshal(b, m, deterministic)
+}
+func (dst *AuthRequirement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthRequirement.Merge(dst, src)
+}
+func (m *AuthRequirement) XXX_Size() int {
+	return xxx_messageInfo_AuthRequirement.Size(m)
+}
+func (m *AuthRequirement) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuthRequirement.DiscardUnknown(m)
 }
 
-func (m *AuthRequirement) Reset()                    { *m = AuthRequirement{} }
-func (m *AuthRequirement) String() string            { return proto.CompactTextString(m) }
-func (*AuthRequirement) ProtoMessage()               {}
-func (*AuthRequirement) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_AuthRequirement proto.InternalMessageInfo
 
 func (m *AuthRequirement) GetProviderId() string {
 	if m != nil {
@@ -355,9 +406,9 @@ func init() {
 	proto.RegisterType((*AuthRequirement)(nil), "google.api.AuthRequirement")
 }
 
-func init() { proto.RegisterFile("google/api/auth.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/api/auth.proto", fileDescriptor_auth_88c4f5ae0863ae9c) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_auth_88c4f5ae0863ae9c = []byte{
 	// 465 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x52, 0x5f, 0x6b, 0x13, 0x4f,
 	0x14, 0x65, 0x93, 0xa6, 0xcd, 0xde, 0x94, 0xb4, 0x1d, 0xf8, 0x95, 0xfd, 0xd5, 0xaa, 0x21, 0x4f,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/backend.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/backend.pb.go
index 5704d9b0..59f1f70d 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/backend.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/backend.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/backend.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,18 +12,46 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // `Backend` defines the backend configuration for a service.
 type Backend struct {
 	// A list of API backend rules that apply to individual API methods.
 	//
 	// **NOTE:** All service configuration rules follow "last one wins" order.
-	Rules []*BackendRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*BackendRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *Backend) Reset()                    { *m = Backend{} }
-func (m *Backend) String() string            { return proto.CompactTextString(m) }
-func (*Backend) ProtoMessage()               {}
-func (*Backend) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *Backend) Reset()         { *m = Backend{} }
+func (m *Backend) String() string { return proto.CompactTextString(m) }
+func (*Backend) ProtoMessage()    {}
+func (*Backend) Descriptor() ([]byte, []int) {
+	return fileDescriptor_backend_bb737a5d3bcbecd6, []int{0}
+}
+func (m *Backend) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Backend.Unmarshal(m, b)
+}
+func (m *Backend) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Backend.Marshal(b, m, deterministic)
+}
+func (dst *Backend) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Backend.Merge(dst, src)
+}
+func (m *Backend) XXX_Size() int {
+	return xxx_messageInfo_Backend.Size(m)
+}
+func (m *Backend) XXX_DiscardUnknown() {
+	xxx_messageInfo_Backend.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Backend proto.InternalMessageInfo
 
 func (m *Backend) GetRules() []*BackendRule {
 	if m != nil {
@@ -37,18 +65,43 @@ type BackendRule struct {
 	// Selects the methods to which this rule applies.
 	//
 	// Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
-	Selector string `protobuf:"bytes,1,opt,name=selector" json:"selector,omitempty"`
+	Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"`
 	// The address of the API backend.
-	Address string `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"`
-	// The number of seconds to wait for a response from a request.  The
-	// default depends on the deployment context.
-	Deadline float64 `protobuf:"fixed64,3,opt,name=deadline" json:"deadline,omitempty"`
+	Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
+	// The number of seconds to wait for a response from a request.  The default
+	// deadline for gRPC is infinite (no deadline) and HTTP requests is 5 seconds.
+	Deadline float64 `protobuf:"fixed64,3,opt,name=deadline,proto3" json:"deadline,omitempty"`
+	// Minimum deadline in seconds needed for this method. Calls having deadline
+	// value lower than this will be rejected.
+	MinDeadline          float64  `protobuf:"fixed64,4,opt,name=min_deadline,json=minDeadline,proto3" json:"min_deadline,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BackendRule) Reset()                    { *m = BackendRule{} }
-func (m *BackendRule) String() string            { return proto.CompactTextString(m) }
-func (*BackendRule) ProtoMessage()               {}
-func (*BackendRule) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *BackendRule) Reset()         { *m = BackendRule{} }
+func (m *BackendRule) String() string { return proto.CompactTextString(m) }
+func (*BackendRule) ProtoMessage()    {}
+func (*BackendRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_backend_bb737a5d3bcbecd6, []int{1}
+}
+func (m *BackendRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BackendRule.Unmarshal(m, b)
+}
+func (m *BackendRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BackendRule.Marshal(b, m, deterministic)
+}
+func (dst *BackendRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BackendRule.Merge(dst, src)
+}
+func (m *BackendRule) XXX_Size() int {
+	return xxx_messageInfo_BackendRule.Size(m)
+}
+func (m *BackendRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_BackendRule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BackendRule proto.InternalMessageInfo
 
 func (m *BackendRule) GetSelector() string {
 	if m != nil {
@@ -71,28 +124,36 @@ func (m *BackendRule) GetDeadline() float64 {
 	return 0
 }
 
+func (m *BackendRule) GetMinDeadline() float64 {
+	if m != nil {
+		return m.MinDeadline
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterType((*Backend)(nil), "google.api.Backend")
 	proto.RegisterType((*BackendRule)(nil), "google.api.BackendRule")
 }
 
-func init() { proto.RegisterFile("google/api/backend.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 227 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x31, 0x4f, 0x03, 0x21,
-	0x18, 0x86, 0x43, 0xab, 0x56, 0xbf, 0x1a, 0x87, 0x5b, 0x24, 0x4e, 0x97, 0x4e, 0xb7, 0xc8, 0x25,
-	0xba, 0x98, 0x38, 0x79, 0x89, 0x31, 0x6e, 0x17, 0x46, 0x17, 0x43, 0xe1, 0x93, 0x10, 0x91, 0x8f,
-	0x40, 0xeb, 0x0f, 0xf2, 0x97, 0x9a, 0xc2, 0x59, 0xdb, 0xf1, 0xe1, 0x79, 0xdf, 0xc0, 0x0b, 0x70,
-	0x4b, 0x64, 0x3d, 0xf6, 0x2a, 0xba, 0x7e, 0xad, 0xf4, 0x27, 0x06, 0x23, 0x62, 0xa2, 0x0d, 0x35,
-	0x50, 0x8d, 0x50, 0xd1, 0xad, 0x1e, 0x60, 0x31, 0x54, 0xd9, 0xdc, 0xc2, 0x69, 0xda, 0x7a, 0xcc,
-	0x9c, 0xb5, 0xf3, 0x6e, 0x79, 0x77, 0x2d, 0xfe, 0x63, 0x62, 0xca, 0xc8, 0xad, 0x47, 0x59, 0x53,
-	0xab, 0x77, 0x58, 0x1e, 0x9c, 0x36, 0x37, 0x70, 0x9e, 0xd1, 0xa3, 0xde, 0x50, 0xe2, 0xac, 0x65,
-	0xdd, 0x85, 0xdc, 0x73, 0xc3, 0x61, 0xa1, 0x8c, 0x49, 0x98, 0x33, 0x9f, 0x15, 0xf5, 0x87, 0xbb,
-	0x96, 0x41, 0x65, 0xbc, 0x0b, 0xc8, 0xe7, 0x2d, 0xeb, 0x98, 0xdc, 0xf3, 0x10, 0xe0, 0x4a, 0xd3,
-	0xd7, 0xc1, 0x2b, 0x86, 0xcb, 0xe9, 0xc2, 0x71, 0x37, 0x63, 0x64, 0x6f, 0xcf, 0x93, 0xb3, 0xe4,
-	0x55, 0xb0, 0x82, 0x92, 0xed, 0x2d, 0x86, 0x32, 0xb2, 0xaf, 0x4a, 0x45, 0x97, 0xcb, 0x0f, 0x64,
-	0x4c, 0xdf, 0x4e, 0xa3, 0xa6, 0xf0, 0xe1, 0xec, 0xe3, 0x11, 0xfd, 0xcc, 0x4e, 0x5e, 0x9e, 0xc6,
-	0xd7, 0xf5, 0x59, 0x29, 0xde, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x93, 0x9e, 0x00, 0x39,
-	0x01, 0x00, 0x00,
+func init() { proto.RegisterFile("google/api/backend.proto", fileDescriptor_backend_bb737a5d3bcbecd6) }
+
+var fileDescriptor_backend_bb737a5d3bcbecd6 = []byte{
+	// 246 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xb1, 0x4e, 0xc3, 0x30,
+	0x10, 0x86, 0xe5, 0xb6, 0x50, 0xb8, 0x54, 0x0c, 0x59, 0xb0, 0x98, 0x42, 0xa7, 0x2c, 0x38, 0x12,
+	0x2c, 0x48, 0x4c, 0x44, 0x20, 0xc4, 0x16, 0x65, 0x64, 0x41, 0xae, 0x7d, 0x58, 0x16, 0x8e, 0x2f,
+	0xb2, 0x5b, 0x1e, 0x80, 0x47, 0xe1, 0x49, 0x51, 0x9d, 0x10, 0xda, 0xf1, 0xbb, 0xef, 0x3f, 0xe9,
+	0xee, 0x07, 0x6e, 0x88, 0x8c, 0xc3, 0x4a, 0xf6, 0xb6, 0xda, 0x48, 0xf5, 0x89, 0x5e, 0x8b, 0x3e,
+	0xd0, 0x96, 0x72, 0x18, 0x8c, 0x90, 0xbd, 0x5d, 0xdf, 0xc3, 0xb2, 0x1e, 0x64, 0x7e, 0x03, 0x27,
+	0x61, 0xe7, 0x30, 0x72, 0x56, 0xcc, 0xcb, 0xec, 0xf6, 0x52, 0xfc, 0xc7, 0xc4, 0x98, 0x69, 0x77,
+	0x0e, 0xdb, 0x21, 0xb5, 0xfe, 0x66, 0x90, 0x1d, 0x8c, 0xf3, 0x2b, 0x38, 0x8b, 0xe8, 0x50, 0x6d,
+	0x29, 0x70, 0x56, 0xb0, 0xf2, 0xbc, 0x9d, 0x38, 0xe7, 0xb0, 0x94, 0x5a, 0x07, 0x8c, 0x91, 0xcf,
+	0x92, 0xfa, 0xc3, 0xfd, 0x96, 0x46, 0xa9, 0x9d, 0xf5, 0xc8, 0xe7, 0x05, 0x2b, 0x59, 0x3b, 0x71,
+	0x7e, 0x0d, 0xab, 0xce, 0xfa, 0xf7, 0xc9, 0x2f, 0x92, 0xcf, 0x3a, 0xeb, 0x9f, 0xc6, 0x51, 0xed,
+	0xe1, 0x42, 0x51, 0x77, 0x70, 0x69, 0xbd, 0x1a, 0x6f, 0x6a, 0xf6, 0xaf, 0x36, 0xec, 0xed, 0x79,
+	0x74, 0x86, 0x9c, 0xf4, 0x46, 0x50, 0x30, 0x95, 0x41, 0x9f, 0x8a, 0xa8, 0x06, 0x25, 0x7b, 0x1b,
+	0x53, 0x4b, 0x11, 0xc3, 0x97, 0x55, 0xa8, 0xc8, 0x7f, 0x58, 0xf3, 0x70, 0x44, 0x3f, 0xb3, 0xc5,
+	0xcb, 0x63, 0xf3, 0xba, 0x39, 0x4d, 0x8b, 0x77, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7d, 0xc3,
+	0xd8, 0x52, 0x5d, 0x01, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/billing.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/billing.pb.go
index 81def6a6..59cfa21a 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/billing.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/billing.pb.go
@@ -1,23 +1,29 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/billing.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/metric"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Billing related configuration of the service.
 //
 // The following example shows how to configure monitored resources and metrics
 // for billing:
+//
 //     monitored_resources:
 //     - type: library.googleapis.com/branch
 //       labels:
@@ -39,13 +45,35 @@ type Billing struct {
 	// There can be multiple consumer destinations per service, each one must have
 	// a different monitored resource type. A metric can be used in at most
 	// one consumer destination.
-	ConsumerDestinations []*Billing_BillingDestination `protobuf:"bytes,8,rep,name=consumer_destinations,json=consumerDestinations" json:"consumer_destinations,omitempty"`
+	ConsumerDestinations []*Billing_BillingDestination `protobuf:"bytes,8,rep,name=consumer_destinations,json=consumerDestinations,proto3" json:"consumer_destinations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *Billing) Reset()         { *m = Billing{} }
+func (m *Billing) String() string { return proto.CompactTextString(m) }
+func (*Billing) ProtoMessage()    {}
+func (*Billing) Descriptor() ([]byte, []int) {
+	return fileDescriptor_billing_36fc4fe99841ce3d, []int{0}
+}
+func (m *Billing) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Billing.Unmarshal(m, b)
+}
+func (m *Billing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Billing.Marshal(b, m, deterministic)
+}
+func (dst *Billing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Billing.Merge(dst, src)
+}
+func (m *Billing) XXX_Size() int {
+	return xxx_messageInfo_Billing.Size(m)
+}
+func (m *Billing) XXX_DiscardUnknown() {
+	xxx_messageInfo_Billing.DiscardUnknown(m)
 }
 
-func (m *Billing) Reset()                    { *m = Billing{} }
-func (m *Billing) String() string            { return proto.CompactTextString(m) }
-func (*Billing) ProtoMessage()               {}
-func (*Billing) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_Billing proto.InternalMessageInfo
 
 func (m *Billing) GetConsumerDestinations() []*Billing_BillingDestination {
 	if m != nil {
@@ -59,16 +87,38 @@ func (m *Billing) GetConsumerDestinations() []*Billing_BillingDestination {
 type Billing_BillingDestination struct {
 	// The monitored resource type. The type must be defined in
 	// [Service.monitored_resources][google.api.Service.monitored_resources] section.
-	MonitoredResource string `protobuf:"bytes,1,opt,name=monitored_resource,json=monitoredResource" json:"monitored_resource,omitempty"`
+	MonitoredResource string `protobuf:"bytes,1,opt,name=monitored_resource,json=monitoredResource,proto3" json:"monitored_resource,omitempty"`
 	// Names of the metrics to report to this billing destination.
 	// Each name must be defined in [Service.metrics][google.api.Service.metrics] section.
-	Metrics []string `protobuf:"bytes,2,rep,name=metrics" json:"metrics,omitempty"`
+	Metrics              []string `protobuf:"bytes,2,rep,name=metrics,proto3" json:"metrics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Billing_BillingDestination) Reset()                    { *m = Billing_BillingDestination{} }
-func (m *Billing_BillingDestination) String() string            { return proto.CompactTextString(m) }
-func (*Billing_BillingDestination) ProtoMessage()               {}
-func (*Billing_BillingDestination) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (m *Billing_BillingDestination) Reset()         { *m = Billing_BillingDestination{} }
+func (m *Billing_BillingDestination) String() string { return proto.CompactTextString(m) }
+func (*Billing_BillingDestination) ProtoMessage()    {}
+func (*Billing_BillingDestination) Descriptor() ([]byte, []int) {
+	return fileDescriptor_billing_36fc4fe99841ce3d, []int{0, 0}
+}
+func (m *Billing_BillingDestination) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Billing_BillingDestination.Unmarshal(m, b)
+}
+func (m *Billing_BillingDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Billing_BillingDestination.Marshal(b, m, deterministic)
+}
+func (dst *Billing_BillingDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Billing_BillingDestination.Merge(dst, src)
+}
+func (m *Billing_BillingDestination) XXX_Size() int {
+	return xxx_messageInfo_Billing_BillingDestination.Size(m)
+}
+func (m *Billing_BillingDestination) XXX_DiscardUnknown() {
+	xxx_messageInfo_Billing_BillingDestination.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Billing_BillingDestination proto.InternalMessageInfo
 
 func (m *Billing_BillingDestination) GetMonitoredResource() string {
 	if m != nil {
@@ -89,25 +139,25 @@ func init() {
 	proto.RegisterType((*Billing_BillingDestination)(nil), "google.api.Billing.BillingDestination")
 }
 
-func init() { proto.RegisterFile("google/api/billing.proto", fileDescriptor2) }
-
-var fileDescriptor2 = []byte{
-	// 265 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xc1, 0x4a, 0xc4, 0x30,
-	0x10, 0x86, 0xe9, 0xae, 0xb8, 0x6e, 0x14, 0xc1, 0xa0, 0x58, 0x8a, 0x87, 0xe2, 0x41, 0x7a, 0xb1,
-	0x05, 0x3d, 0x7a, 0xb2, 0x28, 0xe2, 0xad, 0xf4, 0xa8, 0xc8, 0x92, 0xcd, 0x8e, 0x61, 0xa0, 0x9d,
-	0x29, 0x49, 0xd6, 0x07, 0xf2, 0x5d, 0x7c, 0x2f, 0xb1, 0x69, 0xdd, 0x8a, 0xa7, 0x30, 0xf9, 0xfe,
-	0xf9, 0x67, 0xe6, 0x17, 0xb1, 0x61, 0x36, 0x0d, 0x14, 0xaa, 0xc3, 0x62, 0x8d, 0x4d, 0x83, 0x64,
-	0xf2, 0xce, 0xb2, 0x67, 0x29, 0x02, 0xc9, 0x55, 0x87, 0xc9, 0xc5, 0x44, 0xa5, 0x88, 0xd8, 0x2b,
-	0x8f, 0x4c, 0x2e, 0x28, 0x93, 0xf3, 0x09, 0x6d, 0xc1, 0x5b, 0xd4, 0x01, 0x5c, 0x7e, 0x45, 0x62,
-	0x51, 0x06, 0x53, 0xf9, 0x2a, 0xce, 0x34, 0x93, 0xdb, 0xb6, 0x60, 0x57, 0x1b, 0x70, 0x1e, 0x29,
-	0x78, 0xc4, 0x07, 0xe9, 0x3c, 0x3b, 0xbc, 0xb9, 0xca, 0x77, 0xe3, 0xf2, 0xa1, 0x67, 0x7c, 0x1f,
-	0x76, 0xf2, 0xfa, 0x74, 0x34, 0x99, 0x7c, 0xba, 0xe4, 0x4d, 0xc8, 0xff, 0x5a, 0x79, 0x2d, 0x64,
-	0xcb, 0x84, 0x9e, 0x2d, 0x6c, 0x56, 0x16, 0x1c, 0x6f, 0xad, 0x86, 0x38, 0x4a, 0xa3, 0x6c, 0x59,
-	0x9f, 0xfc, 0x92, 0x7a, 0x00, 0x32, 0x16, 0x8b, 0xb0, 0xbd, 0x8b, 0x67, 0xe9, 0x3c, 0x5b, 0xd6,
-	0x63, 0x59, 0x92, 0x38, 0xd6, 0xdc, 0x4e, 0x36, 0x2c, 0x8f, 0x86, 0x71, 0xd5, 0xcf, 0x9d, 0x55,
-	0xf4, 0xf2, 0x38, 0x30, 0xc3, 0x8d, 0x22, 0x93, 0xb3, 0x35, 0x85, 0x01, 0xea, 0x53, 0x28, 0x02,
-	0x52, 0x1d, 0xba, 0x3e, 0x21, 0x07, 0xf6, 0x03, 0x35, 0x68, 0xa6, 0x77, 0x34, 0x77, 0x7f, 0xaa,
-	0xcf, 0xd9, 0xde, 0xd3, 0x7d, 0xf5, 0xbc, 0xde, 0xef, 0x1b, 0x6f, 0xbf, 0x03, 0x00, 0x00, 0xff,
-	0xff, 0xca, 0x8b, 0xb4, 0x63, 0x9d, 0x01, 0x00, 0x00,
+func init() { proto.RegisterFile("google/api/billing.proto", fileDescriptor_billing_36fc4fe99841ce3d) }
+
+var fileDescriptor_billing_36fc4fe99841ce3d = []byte{
+	// 259 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xc1, 0x4a, 0xf4, 0x30,
+	0x10, 0xc7, 0xe9, 0xee, 0xc7, 0xb7, 0x6e, 0x14, 0xc1, 0xa0, 0x50, 0x16, 0x0f, 0xc5, 0x83, 0xf4,
+	0x62, 0x0a, 0x7a, 0xf4, 0x64, 0x51, 0xc4, 0x5b, 0xe9, 0x51, 0x91, 0x25, 0x9b, 0x1d, 0xc3, 0x40,
+	0x3b, 0x53, 0x92, 0xac, 0x0f, 0xe4, 0xbb, 0xf8, 0x5e, 0x62, 0xd3, 0xba, 0x15, 0x4f, 0x61, 0xf2,
+	0xfb, 0xfd, 0x27, 0x99, 0x11, 0xa9, 0x65, 0xb6, 0x0d, 0x14, 0xba, 0xc3, 0x62, 0x83, 0x4d, 0x83,
+	0x64, 0x55, 0xe7, 0x38, 0xb0, 0x14, 0x91, 0x28, 0xdd, 0xe1, 0xea, 0x7c, 0x62, 0x69, 0x22, 0x0e,
+	0x3a, 0x20, 0x93, 0x8f, 0xe6, 0xc5, 0x67, 0x22, 0x16, 0x65, 0xcc, 0xca, 0x17, 0x71, 0x66, 0x98,
+	0xfc, 0xae, 0x05, 0xb7, 0xde, 0x82, 0x0f, 0x48, 0x51, 0x4d, 0x0f, 0xb2, 0x79, 0x7e, 0x78, 0x7d,
+	0xa9, 0xf6, 0x5d, 0xd5, 0x90, 0x19, 0xcf, 0xfb, 0xbd, 0x5e, 0x9f, 0x8e, 0x4d, 0x26, 0x97, 0x7e,
+	0xf5, 0x2a, 0xe4, 0x5f, 0x57, 0x5e, 0x09, 0xd9, 0x32, 0x61, 0x60, 0x07, 0xdb, 0xb5, 0x03, 0xcf,
+	0x3b, 0x67, 0x20, 0x4d, 0xb2, 0x24, 0x5f, 0xd6, 0x27, 0x3f, 0xa4, 0x1e, 0x80, 0x4c, 0xc5, 0xa2,
+	0x85, 0xe0, 0xd0, 0xf8, 0x74, 0x96, 0xcd, 0xf3, 0x65, 0x3d, 0x96, 0x25, 0x89, 0x63, 0xc3, 0xed,
+	0xe4, 0x87, 0xe5, 0xd1, 0xf0, 0x5c, 0xf5, 0x3d, 0x67, 0x95, 0x3c, 0x3f, 0x0c, 0xcc, 0x72, 0xa3,
+	0xc9, 0x2a, 0x76, 0xb6, 0xb0, 0x40, 0xfd, 0x16, 0x8a, 0x88, 0x74, 0x87, 0xbe, 0x5f, 0x93, 0x07,
+	0xf7, 0x8e, 0x06, 0x0c, 0xd3, 0x1b, 0xda, 0xdb, 0x5f, 0xd5, 0xc7, 0xec, 0xdf, 0xe3, 0x5d, 0xf5,
+	0xb4, 0xf9, 0xdf, 0x07, 0x6f, 0xbe, 0x02, 0x00, 0x00, 0xff, 0xff, 0x82, 0x2a, 0x74, 0xa4, 0x84,
+	0x01, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/consumer.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/consumer.pb.go
index 3e92ac50..79b80416 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/consumer.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/consumer.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/consumer.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Supported data type of the property values
 type Property_PropertyType int32
 
@@ -46,7 +52,9 @@ var Property_PropertyType_value = map[string]int32{
 func (x Property_PropertyType) String() string {
 	return proto.EnumName(Property_PropertyType_name, int32(x))
 }
-func (Property_PropertyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{1, 0} }
+func (Property_PropertyType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_consumer_f6466e3bd2853ce5, []int{1, 0}
+}
 
 // A descriptor for defining project properties for a service. One service may
 // have many consumer projects, and the service may want to behave differently
@@ -66,13 +74,35 @@ func (Property_PropertyType) EnumDescriptor() ([]byte, []int) { return fileDescr
 //        type: INT64
 type ProjectProperties struct {
 	// List of per consumer project-specific properties.
-	Properties []*Property `protobuf:"bytes,1,rep,name=properties" json:"properties,omitempty"`
+	Properties           []*Property `protobuf:"bytes,1,rep,name=properties,proto3" json:"properties,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *ProjectProperties) Reset()         { *m = ProjectProperties{} }
+func (m *ProjectProperties) String() string { return proto.CompactTextString(m) }
+func (*ProjectProperties) ProtoMessage()    {}
+func (*ProjectProperties) Descriptor() ([]byte, []int) {
+	return fileDescriptor_consumer_f6466e3bd2853ce5, []int{0}
+}
+func (m *ProjectProperties) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProjectProperties.Unmarshal(m, b)
+}
+func (m *ProjectProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProjectProperties.Marshal(b, m, deterministic)
+}
+func (dst *ProjectProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectProperties.Merge(dst, src)
+}
+func (m *ProjectProperties) XXX_Size() int {
+	return xxx_messageInfo_ProjectProperties.Size(m)
+}
+func (m *ProjectProperties) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProjectProperties.DiscardUnknown(m)
 }
 
-func (m *ProjectProperties) Reset()                    { *m = ProjectProperties{} }
-func (m *ProjectProperties) String() string            { return proto.CompactTextString(m) }
-func (*ProjectProperties) ProtoMessage()               {}
-func (*ProjectProperties) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_ProjectProperties proto.InternalMessageInfo
 
 func (m *ProjectProperties) GetProperties() []*Property {
 	if m != nil {
@@ -93,17 +123,39 @@ func (m *ProjectProperties) GetProperties() []*Property {
 // define and set these properties.
 type Property struct {
 	// The name of the property (a.k.a key).
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The type of this property.
-	Type Property_PropertyType `protobuf:"varint,2,opt,name=type,enum=google.api.Property_PropertyType" json:"type,omitempty"`
+	Type Property_PropertyType `protobuf:"varint,2,opt,name=type,proto3,enum=google.api.Property_PropertyType" json:"type,omitempty"`
 	// The description of the property
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Property) Reset()         { *m = Property{} }
+func (m *Property) String() string { return proto.CompactTextString(m) }
+func (*Property) ProtoMessage()    {}
+func (*Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_consumer_f6466e3bd2853ce5, []int{1}
+}
+func (m *Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Property.Unmarshal(m, b)
+}
+func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
+}
+func (dst *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(dst, src)
+}
+func (m *Property) XXX_Size() int {
+	return xxx_messageInfo_Property.Size(m)
+}
+func (m *Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Property.DiscardUnknown(m)
 }
 
-func (m *Property) Reset()                    { *m = Property{} }
-func (m *Property) String() string            { return proto.CompactTextString(m) }
-func (*Property) ProtoMessage()               {}
-func (*Property) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+var xxx_messageInfo_Property proto.InternalMessageInfo
 
 func (m *Property) GetName() string {
 	if m != nil {
@@ -132,9 +184,9 @@ func init() {
 	proto.RegisterEnum("google.api.Property_PropertyType", Property_PropertyType_name, Property_PropertyType_value)
 }
 
-func init() { proto.RegisterFile("google/api/consumer.proto", fileDescriptor3) }
+func init() { proto.RegisterFile("google/api/consumer.proto", fileDescriptor_consumer_f6466e3bd2853ce5) }
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_consumer_f6466e3bd2853ce5 = []byte{
 	// 299 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x4f, 0xf2, 0x40,
 	0x10, 0xc6, 0xdf, 0x85, 0xbe, 0x04, 0x06, 0xc5, 0xba, 0xf1, 0x50, 0x6f, 0x95, 0x13, 0xa7, 0x36,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/context.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/context.pb.go
index f22859b0..4c1c6493 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/context.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/context.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/context.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // `Context` defines which contexts an API requests.
 //
 // Example:
@@ -33,13 +39,35 @@ type Context struct {
 	// A list of RPC context rules that apply to individual API methods.
 	//
 	// **NOTE:** All service configuration rules follow "last one wins" order.
-	Rules []*ContextRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*ContextRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *Context) Reset()         { *m = Context{} }
+func (m *Context) String() string { return proto.CompactTextString(m) }
+func (*Context) ProtoMessage()    {}
+func (*Context) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_7f48bb214df6c175, []int{0}
+}
+func (m *Context) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Context.Unmarshal(m, b)
+}
+func (m *Context) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Context.Marshal(b, m, deterministic)
+}
+func (dst *Context) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Context.Merge(dst, src)
+}
+func (m *Context) XXX_Size() int {
+	return xxx_messageInfo_Context.Size(m)
+}
+func (m *Context) XXX_DiscardUnknown() {
+	xxx_messageInfo_Context.DiscardUnknown(m)
 }
 
-func (m *Context) Reset()                    { *m = Context{} }
-func (m *Context) String() string            { return proto.CompactTextString(m) }
-func (*Context) ProtoMessage()               {}
-func (*Context) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_Context proto.InternalMessageInfo
 
 func (m *Context) GetRules() []*ContextRule {
 	if m != nil {
@@ -54,17 +82,39 @@ type ContextRule struct {
 	// Selects the methods to which this rule applies.
 	//
 	// Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
-	Selector string `protobuf:"bytes,1,opt,name=selector" json:"selector,omitempty"`
+	Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"`
 	// A list of full type names of requested contexts.
-	Requested []string `protobuf:"bytes,2,rep,name=requested" json:"requested,omitempty"`
+	Requested []string `protobuf:"bytes,2,rep,name=requested,proto3" json:"requested,omitempty"`
 	// A list of full type names of provided contexts.
-	Provided []string `protobuf:"bytes,3,rep,name=provided" json:"provided,omitempty"`
+	Provided             []string `protobuf:"bytes,3,rep,name=provided,proto3" json:"provided,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ContextRule) Reset()         { *m = ContextRule{} }
+func (m *ContextRule) String() string { return proto.CompactTextString(m) }
+func (*ContextRule) ProtoMessage()    {}
+func (*ContextRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_7f48bb214df6c175, []int{1}
+}
+func (m *ContextRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContextRule.Unmarshal(m, b)
+}
+func (m *ContextRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContextRule.Marshal(b, m, deterministic)
+}
+func (dst *ContextRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContextRule.Merge(dst, src)
+}
+func (m *ContextRule) XXX_Size() int {
+	return xxx_messageInfo_ContextRule.Size(m)
+}
+func (m *ContextRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContextRule.DiscardUnknown(m)
 }
 
-func (m *ContextRule) Reset()                    { *m = ContextRule{} }
-func (m *ContextRule) String() string            { return proto.CompactTextString(m) }
-func (*ContextRule) ProtoMessage()               {}
-func (*ContextRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+var xxx_messageInfo_ContextRule proto.InternalMessageInfo
 
 func (m *ContextRule) GetSelector() string {
 	if m != nil {
@@ -92,9 +142,9 @@ func init() {
 	proto.RegisterType((*ContextRule)(nil), "google.api.ContextRule")
 }
 
-func init() { proto.RegisterFile("google/api/context.proto", fileDescriptor4) }
+func init() { proto.RegisterFile("google/api/context.proto", fileDescriptor_context_7f48bb214df6c175) }
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_context_7f48bb214df6c175 = []byte{
 	// 231 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x4f, 0x4b, 0xc4, 0x30,
 	0x14, 0xc4, 0xe9, 0xd6, 0x7f, 0x7d, 0x2b, 0x1e, 0x7a, 0x31, 0x88, 0x87, 0xb2, 0xa7, 0x5e, 0x4c,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/control.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/control.pb.go
index 1f4d8678..de6677d2 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/control.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/control.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/control.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,19 +12,47 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Selects and configures the service controller used by the service.  The
 // service controller handles features like abuse, quota, billing, logging,
 // monitoring, etc.
 type Control struct {
 	// The service control environment to use. If empty, no control plane
 	// feature (like quota and billing) will be enabled.
-	Environment string `protobuf:"bytes,1,opt,name=environment" json:"environment,omitempty"`
+	Environment          string   `protobuf:"bytes,1,opt,name=environment,proto3" json:"environment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Control) Reset()         { *m = Control{} }
+func (m *Control) String() string { return proto.CompactTextString(m) }
+func (*Control) ProtoMessage()    {}
+func (*Control) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_f350b83573452faa, []int{0}
+}
+func (m *Control) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Control.Unmarshal(m, b)
+}
+func (m *Control) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Control.Marshal(b, m, deterministic)
+}
+func (dst *Control) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Control.Merge(dst, src)
+}
+func (m *Control) XXX_Size() int {
+	return xxx_messageInfo_Control.Size(m)
+}
+func (m *Control) XXX_DiscardUnknown() {
+	xxx_messageInfo_Control.DiscardUnknown(m)
 }
 
-func (m *Control) Reset()                    { *m = Control{} }
-func (m *Control) String() string            { return proto.CompactTextString(m) }
-func (*Control) ProtoMessage()               {}
-func (*Control) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+var xxx_messageInfo_Control proto.InternalMessageInfo
 
 func (m *Control) GetEnvironment() string {
 	if m != nil {
@@ -37,9 +65,9 @@ func init() {
 	proto.RegisterType((*Control)(nil), "google.api.Control")
 }
 
-func init() { proto.RegisterFile("google/api/control.proto", fileDescriptor5) }
+func init() { proto.RegisterFile("google/api/control.proto", fileDescriptor_control_f350b83573452faa) }
 
-var fileDescriptor5 = []byte{
+var fileDescriptor_control_f350b83573452faa = []byte{
 	// 165 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0xca, 0xcf, 0xd1, 0x2b,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/documentation.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/documentation.pb.go
index 99a568cf..df181da6 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/documentation.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/documentation.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/documentation.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // `Documentation` provides the information for describing a service.
 //
 // Example:
@@ -55,9 +61,7 @@ var _ = math.Inf
 // <pre><code>&#91;display text]&#91;fully.qualified.proto.name]</code></pre>
 // Text can be excluded from doc using the following notation:
 // <pre><code>&#40;-- internal comment --&#41;</code></pre>
-// Comments can be made conditional using a visibility label. The below
-// text will be only rendered if the `BETA` label is available:
-// <pre><code>&#40;--BETA: comment for BETA users --&#41;</code></pre>
+//
 // A few directives are available in documentation. Note that
 // directives must appear on a single line to be properly
 // identified. The `include` directive includes a markdown file from
@@ -72,15 +76,15 @@ var _ = math.Inf
 type Documentation struct {
 	// A short summary of what the service does. Can only be provided by
 	// plain text.
-	Summary string `protobuf:"bytes,1,opt,name=summary" json:"summary,omitempty"`
+	Summary string `protobuf:"bytes,1,opt,name=summary,proto3" json:"summary,omitempty"`
 	// The top level pages for the documentation set.
-	Pages []*Page `protobuf:"bytes,5,rep,name=pages" json:"pages,omitempty"`
+	Pages []*Page `protobuf:"bytes,5,rep,name=pages,proto3" json:"pages,omitempty"`
 	// A list of documentation rules that apply to individual API elements.
 	//
 	// **NOTE:** All service configuration rules follow "last one wins" order.
-	Rules []*DocumentationRule `protobuf:"bytes,3,rep,name=rules" json:"rules,omitempty"`
+	Rules []*DocumentationRule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"`
 	// The URL to the root of documentation.
-	DocumentationRootUrl string `protobuf:"bytes,4,opt,name=documentation_root_url,json=documentationRootUrl" json:"documentation_root_url,omitempty"`
+	DocumentationRootUrl string `protobuf:"bytes,4,opt,name=documentation_root_url,json=documentationRootUrl,proto3" json:"documentation_root_url,omitempty"`
 	// Declares a single overview page. For example:
 	// <pre><code>documentation:
 	//   summary: ...
@@ -94,13 +98,35 @@ type Documentation struct {
 	//     content: &#40;== include overview.md ==&#41;
 	// </code></pre>
 	// Note: you cannot specify both `overview` field and `pages` field.
-	Overview string `protobuf:"bytes,2,opt,name=overview" json:"overview,omitempty"`
+	Overview             string   `protobuf:"bytes,2,opt,name=overview,proto3" json:"overview,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Documentation) Reset()                    { *m = Documentation{} }
-func (m *Documentation) String() string            { return proto.CompactTextString(m) }
-func (*Documentation) ProtoMessage()               {}
-func (*Documentation) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+func (m *Documentation) Reset()         { *m = Documentation{} }
+func (m *Documentation) String() string { return proto.CompactTextString(m) }
+func (*Documentation) ProtoMessage()    {}
+func (*Documentation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_documentation_ed988d5b3c756a43, []int{0}
+}
+func (m *Documentation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Documentation.Unmarshal(m, b)
+}
+func (m *Documentation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Documentation.Marshal(b, m, deterministic)
+}
+func (dst *Documentation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Documentation.Merge(dst, src)
+}
+func (m *Documentation) XXX_Size() int {
+	return xxx_messageInfo_Documentation.Size(m)
+}
+func (m *Documentation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Documentation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Documentation proto.InternalMessageInfo
 
 func (m *Documentation) GetSummary() string {
 	if m != nil {
@@ -145,18 +171,40 @@ type DocumentationRule struct {
 	// qualified name, i.e. "foo.*" is ok, but not "foo.b*" or "foo.*.bar". To
 	// specify a default for all applicable elements, the whole pattern "*"
 	// is used.
-	Selector string `protobuf:"bytes,1,opt,name=selector" json:"selector,omitempty"`
+	Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"`
 	// Description of the selected API(s).
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Deprecation description of the selected element(s). It can be provided if an
 	// element is marked as `deprecated`.
-	DeprecationDescription string `protobuf:"bytes,3,opt,name=deprecation_description,json=deprecationDescription" json:"deprecation_description,omitempty"`
+	DeprecationDescription string   `protobuf:"bytes,3,opt,name=deprecation_description,json=deprecationDescription,proto3" json:"deprecation_description,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
 }
 
-func (m *DocumentationRule) Reset()                    { *m = DocumentationRule{} }
-func (m *DocumentationRule) String() string            { return proto.CompactTextString(m) }
-func (*DocumentationRule) ProtoMessage()               {}
-func (*DocumentationRule) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
+func (m *DocumentationRule) Reset()         { *m = DocumentationRule{} }
+func (m *DocumentationRule) String() string { return proto.CompactTextString(m) }
+func (*DocumentationRule) ProtoMessage()    {}
+func (*DocumentationRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_documentation_ed988d5b3c756a43, []int{1}
+}
+func (m *DocumentationRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DocumentationRule.Unmarshal(m, b)
+}
+func (m *DocumentationRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DocumentationRule.Marshal(b, m, deterministic)
+}
+func (dst *DocumentationRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentationRule.Merge(dst, src)
+}
+func (m *DocumentationRule) XXX_Size() int {
+	return xxx_messageInfo_DocumentationRule.Size(m)
+}
+func (m *DocumentationRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_DocumentationRule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DocumentationRule proto.InternalMessageInfo
 
 func (m *DocumentationRule) GetSelector() string {
 	if m != nil {
@@ -196,19 +244,41 @@ type Page struct {
 	// </code></pre>
 	// You can reference `Java` page using Markdown reference link syntax:
 	// `[Java][Tutorial.Java]`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The Markdown content of the page. You can use <code>&#40;== include {path} ==&#41;</code>
 	// to include content from a Markdown file.
-	Content string `protobuf:"bytes,2,opt,name=content" json:"content,omitempty"`
+	Content string `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"`
 	// Subpages of this page. The order of subpages specified here will be
 	// honored in the generated docset.
-	Subpages []*Page `protobuf:"bytes,3,rep,name=subpages" json:"subpages,omitempty"`
+	Subpages             []*Page  `protobuf:"bytes,3,rep,name=subpages,proto3" json:"subpages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Page) Reset()         { *m = Page{} }
+func (m *Page) String() string { return proto.CompactTextString(m) }
+func (*Page) ProtoMessage()    {}
+func (*Page) Descriptor() ([]byte, []int) {
+	return fileDescriptor_documentation_ed988d5b3c756a43, []int{2}
+}
+func (m *Page) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Page.Unmarshal(m, b)
+}
+func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
+}
+func (dst *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(dst, src)
+}
+func (m *Page) XXX_Size() int {
+	return xxx_messageInfo_Page.Size(m)
+}
+func (m *Page) XXX_DiscardUnknown() {
+	xxx_messageInfo_Page.DiscardUnknown(m)
 }
 
-func (m *Page) Reset()                    { *m = Page{} }
-func (m *Page) String() string            { return proto.CompactTextString(m) }
-func (*Page) ProtoMessage()               {}
-func (*Page) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{2} }
+var xxx_messageInfo_Page proto.InternalMessageInfo
 
 func (m *Page) GetName() string {
 	if m != nil {
@@ -237,9 +307,11 @@ func init() {
 	proto.RegisterType((*Page)(nil), "google.api.Page")
 }
 
-func init() { proto.RegisterFile("google/api/documentation.proto", fileDescriptor6) }
+func init() {
+	proto.RegisterFile("google/api/documentation.proto", fileDescriptor_documentation_ed988d5b3c756a43)
+}
 
-var fileDescriptor6 = []byte{
+var fileDescriptor_documentation_ed988d5b3c756a43 = []byte{
 	// 356 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xc1, 0x6a, 0xe3, 0x30,
 	0x14, 0x45, 0x71, 0xec, 0xcc, 0x64, 0x5e, 0x98, 0x61, 0x46, 0x0c, 0x19, 0x33, 0xd0, 0x12, 0xb2,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/endpoint.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/endpoint.pb.go
index 4bca1828..c6a1ef0a 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/endpoint.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/endpoint.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/endpoint.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // `Endpoint` describes a network endpoint that serves a set of APIs.
 // A service may expose any number of endpoints, and all endpoints share the
 // same service configuration, such as quota configuration and monitoring
@@ -31,35 +37,55 @@ var _ = math.Inf
 //       allow_cors: true
 type Endpoint struct {
 	// The canonical name of this endpoint.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// DEPRECATED: This field is no longer supported. Instead of using aliases,
-	// please specify multiple [google.api.Endpoint][google.api.Endpoint] for each of the intented
-	// alias.
+	// please specify multiple [google.api.Endpoint][google.api.Endpoint] for each of the intended
+	// aliases.
 	//
 	// Additional names that this endpoint will be hosted on.
-	Aliases []string `protobuf:"bytes,2,rep,name=aliases" json:"aliases,omitempty"`
-	// The list of APIs served by this endpoint.
-	Apis []string `protobuf:"bytes,3,rep,name=apis" json:"apis,omitempty"`
+	Aliases []string `protobuf:"bytes,2,rep,name=aliases,proto3" json:"aliases,omitempty"`
 	// The list of features enabled on this endpoint.
-	Features []string `protobuf:"bytes,4,rep,name=features" json:"features,omitempty"`
+	Features []string `protobuf:"bytes,4,rep,name=features,proto3" json:"features,omitempty"`
 	// The specification of an Internet routable address of API frontend that will
 	// handle requests to this [API Endpoint](https://cloud.google.com/apis/design/glossary).
 	// It should be either a valid IPv4 address or a fully-qualified domain name.
 	// For example, "8.8.8.8" or "myservice.appspot.com".
-	Target string `protobuf:"bytes,101,opt,name=target" json:"target,omitempty"`
+	Target string `protobuf:"bytes,101,opt,name=target,proto3" json:"target,omitempty"`
 	// Allowing
 	// [CORS](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing), aka
 	// cross-domain traffic, would allow the backends served from this endpoint to
 	// receive and respond to HTTP OPTIONS requests. The response will be used by
 	// the browser to determine whether the subsequent cross-origin request is
 	// allowed to proceed.
-	AllowCors bool `protobuf:"varint,5,opt,name=allow_cors,json=allowCors" json:"allow_cors,omitempty"`
+	AllowCors            bool     `protobuf:"varint,5,opt,name=allow_cors,json=allowCors,proto3" json:"allow_cors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Endpoint) Reset()                    { *m = Endpoint{} }
-func (m *Endpoint) String() string            { return proto.CompactTextString(m) }
-func (*Endpoint) ProtoMessage()               {}
-func (*Endpoint) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} }
+func (m *Endpoint) Reset()         { *m = Endpoint{} }
+func (m *Endpoint) String() string { return proto.CompactTextString(m) }
+func (*Endpoint) ProtoMessage()    {}
+func (*Endpoint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_endpoint_d87650ae3428bec5, []int{0}
+}
+func (m *Endpoint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Endpoint.Unmarshal(m, b)
+}
+func (m *Endpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Endpoint.Marshal(b, m, deterministic)
+}
+func (dst *Endpoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Endpoint.Merge(dst, src)
+}
+func (m *Endpoint) XXX_Size() int {
+	return xxx_messageInfo_Endpoint.Size(m)
+}
+func (m *Endpoint) XXX_DiscardUnknown() {
+	xxx_messageInfo_Endpoint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Endpoint proto.InternalMessageInfo
 
 func (m *Endpoint) GetName() string {
 	if m != nil {
@@ -75,13 +101,6 @@ func (m *Endpoint) GetAliases() []string {
 	return nil
 }
 
-func (m *Endpoint) GetApis() []string {
-	if m != nil {
-		return m.Apis
-	}
-	return nil
-}
-
 func (m *Endpoint) GetFeatures() []string {
 	if m != nil {
 		return m.Features
@@ -107,24 +126,24 @@ func init() {
 	proto.RegisterType((*Endpoint)(nil), "google.api.Endpoint")
 }
 
-func init() { proto.RegisterFile("google/api/endpoint.proto", fileDescriptor7) }
+func init() { proto.RegisterFile("google/api/endpoint.proto", fileDescriptor_endpoint_d87650ae3428bec5) }
 
-var fileDescriptor7 = []byte{
-	// 253 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x41, 0x4b, 0xc4, 0x30,
-	0x10, 0x85, 0xe9, 0x6e, 0x5d, 0xdb, 0x01, 0x3d, 0xe4, 0x20, 0x71, 0x51, 0x28, 0x9e, 0x7a, 0x6a,
-	0x0f, 0x1e, 0x3d, 0xb9, 0xb2, 0x88, 0xb7, 0xd2, 0xa3, 0x17, 0x19, 0xeb, 0x6c, 0x08, 0x64, 0x33,
-	0x21, 0x89, 0xfa, 0x73, 0x04, 0x7f, 0xa9, 0x34, 0xed, 0xaa, 0x7b, 0x9b, 0xef, 0xbd, 0x37, 0x61,
-	0x5e, 0xe0, 0x52, 0x31, 0x2b, 0x43, 0x2d, 0x3a, 0xdd, 0x92, 0x7d, 0x73, 0xac, 0x6d, 0x6c, 0x9c,
-	0xe7, 0xc8, 0x02, 0x26, 0xab, 0x41, 0xa7, 0xd7, 0x57, 0xff, 0x62, 0x68, 0x2d, 0x47, 0x8c, 0x9a,
-	0x6d, 0x98, 0x92, 0x37, 0x5f, 0x19, 0x14, 0xdb, 0x79, 0x59, 0x08, 0xc8, 0x2d, 0xee, 0x49, 0x66,
-	0x55, 0x56, 0x97, 0x7d, 0x9a, 0x85, 0x84, 0x53, 0x34, 0x1a, 0x03, 0x05, 0xb9, 0xa8, 0x96, 0x75,
-	0xd9, 0x1f, 0x70, 0x4c, 0xa3, 0xd3, 0x41, 0x2e, 0x93, 0x9c, 0x66, 0xb1, 0x86, 0x62, 0x47, 0x18,
-	0xdf, 0x3d, 0x05, 0x99, 0x27, 0xfd, 0x97, 0xc5, 0x05, 0xac, 0x22, 0x7a, 0x45, 0x51, 0x52, 0x7a,
-	0x7f, 0x26, 0x71, 0x0d, 0x80, 0xc6, 0xf0, 0xe7, 0xcb, 0xc0, 0x3e, 0xc8, 0x93, 0x2a, 0xab, 0x8b,
-	0xbe, 0x4c, 0xca, 0x03, 0xfb, 0xb0, 0x61, 0x38, 0x1f, 0x78, 0xdf, 0xfc, 0x35, 0xda, 0x9c, 0x1d,
-	0x0e, 0xee, 0xc6, 0x0a, 0x5d, 0xf6, 0xbc, 0x9d, 0x4d, 0xc5, 0x06, 0xad, 0x6a, 0xd8, 0xab, 0x56,
-	0x91, 0x4d, 0x05, 0xdb, 0xc9, 0x1a, 0x8f, 0x4b, 0x3f, 0x10, 0xc8, 0x7f, 0xe8, 0x81, 0x06, 0xb6,
-	0x3b, 0xad, 0xee, 0x8e, 0xe8, 0x7b, 0x91, 0x3f, 0xde, 0x77, 0x4f, 0xaf, 0xab, 0xb4, 0x78, 0xfb,
-	0x13, 0x00, 0x00, 0xff, 0xff, 0x34, 0x0e, 0xdd, 0x70, 0x60, 0x01, 0x00, 0x00,
+var fileDescriptor_endpoint_d87650ae3428bec5 = []byte{
+	// 245 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0xb1, 0x4e, 0xc3, 0x30,
+	0x10, 0x86, 0xe5, 0x12, 0x4a, 0x72, 0x12, 0x0c, 0x1e, 0x90, 0xa9, 0x40, 0x8a, 0x98, 0x32, 0x25,
+	0x03, 0x23, 0x13, 0x45, 0x15, 0x62, 0x8b, 0x32, 0xb2, 0xa0, 0x23, 0x5c, 0x2d, 0x4b, 0xae, 0xcf,
+	0xb2, 0x0d, 0x3c, 0x04, 0x6f, 0xc1, 0x93, 0x22, 0x9c, 0x14, 0xe8, 0xe6, 0xcf, 0xdf, 0xdd, 0xe9,
+	0xff, 0xe1, 0x42, 0x33, 0x6b, 0x4b, 0x1d, 0x7a, 0xd3, 0x91, 0x7b, 0xf5, 0x6c, 0x5c, 0x6a, 0x7d,
+	0xe0, 0xc4, 0x12, 0x26, 0xd5, 0xa2, 0x37, 0xab, 0xcb, 0x7f, 0x63, 0xe8, 0x1c, 0x27, 0x4c, 0x86,
+	0x5d, 0x9c, 0x26, 0xaf, 0x3f, 0x05, 0x94, 0x9b, 0x79, 0x59, 0x4a, 0x28, 0x1c, 0xee, 0x48, 0x89,
+	0x5a, 0x34, 0xd5, 0x90, 0xdf, 0x52, 0xc1, 0x09, 0x5a, 0x83, 0x91, 0xa2, 0x5a, 0xd4, 0x47, 0x4d,
+	0x35, 0xec, 0x51, 0xae, 0xa0, 0xdc, 0x12, 0xa6, 0xb7, 0x40, 0x51, 0x15, 0x59, 0xfd, 0xb2, 0x3c,
+	0x87, 0x65, 0xc2, 0xa0, 0x29, 0x29, 0xca, 0xb7, 0x66, 0x92, 0x57, 0x00, 0x68, 0x2d, 0x7f, 0x3c,
+	0x8f, 0x1c, 0xa2, 0x3a, 0xae, 0x45, 0x53, 0x0e, 0x55, 0xfe, 0xb9, 0xe7, 0x10, 0xd7, 0x0c, 0x67,
+	0x23, 0xef, 0xda, 0xbf, 0xf4, 0xeb, 0xd3, 0x7d, 0xb8, 0xfe, 0x27, 0x6e, 0x2f, 0x9e, 0x36, 0xb3,
+	0xd4, 0x6c, 0xd1, 0xe9, 0x96, 0x83, 0xee, 0x34, 0xb9, 0x5c, 0xa6, 0x9b, 0x14, 0x7a, 0x13, 0x73,
+	0xdb, 0x48, 0xe1, 0xdd, 0x8c, 0x34, 0xb2, 0xdb, 0x1a, 0x7d, 0x7b, 0x40, 0x5f, 0x8b, 0xe2, 0xe1,
+	0xae, 0x7f, 0x7c, 0x59, 0xe6, 0xc5, 0x9b, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x32, 0xa4,
+	0x36, 0x4c, 0x01, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/log.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/log.pb.go
index 09ed8bd8..355309ad 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/log.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/log.pb.go
@@ -1,18 +1,24 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/log.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_api2 "google.golang.org/genproto/googleapis/api/label"
+import label "google.golang.org/genproto/googleapis/api/label"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A description of a log type. Example in YAML format:
 //
 //     - name: library.googleapis.com/activity_history
@@ -26,23 +32,45 @@ type LogDescriptor struct {
 	// include the following characters: upper- and lower-case alphanumeric
 	// characters [A-Za-z0-9], and punctuation characters including
 	// slash, underscore, hyphen, period [/_-.].
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The set of labels that are available to describe a specific log entry.
 	// Runtime requests that contain labels not specified here are
 	// considered invalid.
-	Labels []*google_api2.LabelDescriptor `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty"`
+	Labels []*label.LabelDescriptor `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty"`
 	// A human-readable description of this log. This information appears in
 	// the documentation and can contain details.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// The human-readable name for this log. This information appears on
 	// the user interface and should be concise.
-	DisplayName string `protobuf:"bytes,4,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName          string   `protobuf:"bytes,4,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LogDescriptor) Reset()         { *m = LogDescriptor{} }
+func (m *LogDescriptor) String() string { return proto.CompactTextString(m) }
+func (*LogDescriptor) ProtoMessage()    {}
+func (*LogDescriptor) Descriptor() ([]byte, []int) {
+	return fileDescriptor_log_43ef3b42193db0e6, []int{0}
+}
+func (m *LogDescriptor) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogDescriptor.Unmarshal(m, b)
+}
+func (m *LogDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogDescriptor.Marshal(b, m, deterministic)
+}
+func (dst *LogDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogDescriptor.Merge(dst, src)
+}
+func (m *LogDescriptor) XXX_Size() int {
+	return xxx_messageInfo_LogDescriptor.Size(m)
+}
+func (m *LogDescriptor) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogDescriptor.DiscardUnknown(m)
 }
 
-func (m *LogDescriptor) Reset()                    { *m = LogDescriptor{} }
-func (m *LogDescriptor) String() string            { return proto.CompactTextString(m) }
-func (*LogDescriptor) ProtoMessage()               {}
-func (*LogDescriptor) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{0} }
+var xxx_messageInfo_LogDescriptor proto.InternalMessageInfo
 
 func (m *LogDescriptor) GetName() string {
 	if m != nil {
@@ -51,7 +79,7 @@ func (m *LogDescriptor) GetName() string {
 	return ""
 }
 
-func (m *LogDescriptor) GetLabels() []*google_api2.LabelDescriptor {
+func (m *LogDescriptor) GetLabels() []*label.LabelDescriptor {
 	if m != nil {
 		return m.Labels
 	}
@@ -76,9 +104,9 @@ func init() {
 	proto.RegisterType((*LogDescriptor)(nil), "google.api.LogDescriptor")
 }
 
-func init() { proto.RegisterFile("google/api/log.proto", fileDescriptor8) }
+func init() { proto.RegisterFile("google/api/log.proto", fileDescriptor_log_43ef3b42193db0e6) }
 
-var fileDescriptor8 = []byte{
+var fileDescriptor_log_43ef3b42193db0e6 = []byte{
 	// 238 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0xc1, 0x4a, 0xc3, 0x40,
 	0x10, 0x86, 0x49, 0x1b, 0x8a, 0x6e, 0xd5, 0xc3, 0x22, 0x12, 0xf4, 0x12, 0x3d, 0xf5, 0xb4, 0x01,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/logging.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/logging.pb.go
index b62778ae..c1ba79d4 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/logging.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/logging.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/logging.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Logging configuration of the service.
 //
 // The following example shows how to configure logs to be sent to the
@@ -47,18 +53,40 @@ type Logging struct {
 	// There can be multiple producer destinations, each one must have a
 	// different monitored resource type. A log can be used in at most
 	// one producer destination.
-	ProducerDestinations []*Logging_LoggingDestination `protobuf:"bytes,1,rep,name=producer_destinations,json=producerDestinations" json:"producer_destinations,omitempty"`
+	ProducerDestinations []*Logging_LoggingDestination `protobuf:"bytes,1,rep,name=producer_destinations,json=producerDestinations,proto3" json:"producer_destinations,omitempty"`
 	// Logging configurations for sending logs to the consumer project.
 	// There can be multiple consumer destinations, each one must have a
 	// different monitored resource type. A log can be used in at most
 	// one consumer destination.
-	ConsumerDestinations []*Logging_LoggingDestination `protobuf:"bytes,2,rep,name=consumer_destinations,json=consumerDestinations" json:"consumer_destinations,omitempty"`
+	ConsumerDestinations []*Logging_LoggingDestination `protobuf:"bytes,2,rep,name=consumer_destinations,json=consumerDestinations,proto3" json:"consumer_destinations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *Logging) Reset()         { *m = Logging{} }
+func (m *Logging) String() string { return proto.CompactTextString(m) }
+func (*Logging) ProtoMessage()    {}
+func (*Logging) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_d4ad8a3d4a3a3050, []int{0}
+}
+func (m *Logging) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Logging.Unmarshal(m, b)
+}
+func (m *Logging) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Logging.Marshal(b, m, deterministic)
+}
+func (dst *Logging) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Logging.Merge(dst, src)
+}
+func (m *Logging) XXX_Size() int {
+	return xxx_messageInfo_Logging.Size(m)
+}
+func (m *Logging) XXX_DiscardUnknown() {
+	xxx_messageInfo_Logging.DiscardUnknown(m)
 }
 
-func (m *Logging) Reset()                    { *m = Logging{} }
-func (m *Logging) String() string            { return proto.CompactTextString(m) }
-func (*Logging) ProtoMessage()               {}
-func (*Logging) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0} }
+var xxx_messageInfo_Logging proto.InternalMessageInfo
 
 func (m *Logging) GetProducerDestinations() []*Logging_LoggingDestination {
 	if m != nil {
@@ -79,18 +107,40 @@ func (m *Logging) GetConsumerDestinations() []*Logging_LoggingDestination {
 type Logging_LoggingDestination struct {
 	// The monitored resource type. The type must be defined in the
 	// [Service.monitored_resources][google.api.Service.monitored_resources] section.
-	MonitoredResource string `protobuf:"bytes,3,opt,name=monitored_resource,json=monitoredResource" json:"monitored_resource,omitempty"`
+	MonitoredResource string `protobuf:"bytes,3,opt,name=monitored_resource,json=monitoredResource,proto3" json:"monitored_resource,omitempty"`
 	// Names of the logs to be sent to this destination. Each name must
 	// be defined in the [Service.logs][google.api.Service.logs] section. If the log name is
 	// not a domain scoped name, it will be automatically prefixed with
 	// the service name followed by "/".
-	Logs []string `protobuf:"bytes,1,rep,name=logs" json:"logs,omitempty"`
+	Logs                 []string `protobuf:"bytes,1,rep,name=logs,proto3" json:"logs,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Logging_LoggingDestination) Reset()         { *m = Logging_LoggingDestination{} }
+func (m *Logging_LoggingDestination) String() string { return proto.CompactTextString(m) }
+func (*Logging_LoggingDestination) ProtoMessage()    {}
+func (*Logging_LoggingDestination) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_d4ad8a3d4a3a3050, []int{0, 0}
+}
+func (m *Logging_LoggingDestination) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Logging_LoggingDestination.Unmarshal(m, b)
+}
+func (m *Logging_LoggingDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Logging_LoggingDestination.Marshal(b, m, deterministic)
+}
+func (dst *Logging_LoggingDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Logging_LoggingDestination.Merge(dst, src)
+}
+func (m *Logging_LoggingDestination) XXX_Size() int {
+	return xxx_messageInfo_Logging_LoggingDestination.Size(m)
+}
+func (m *Logging_LoggingDestination) XXX_DiscardUnknown() {
+	xxx_messageInfo_Logging_LoggingDestination.DiscardUnknown(m)
 }
 
-func (m *Logging_LoggingDestination) Reset()                    { *m = Logging_LoggingDestination{} }
-func (m *Logging_LoggingDestination) String() string            { return proto.CompactTextString(m) }
-func (*Logging_LoggingDestination) ProtoMessage()               {}
-func (*Logging_LoggingDestination) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0, 0} }
+var xxx_messageInfo_Logging_LoggingDestination proto.InternalMessageInfo
 
 func (m *Logging_LoggingDestination) GetMonitoredResource() string {
 	if m != nil {
@@ -111,9 +161,9 @@ func init() {
 	proto.RegisterType((*Logging_LoggingDestination)(nil), "google.api.Logging.LoggingDestination")
 }
 
-func init() { proto.RegisterFile("google/api/logging.proto", fileDescriptor9) }
+func init() { proto.RegisterFile("google/api/logging.proto", fileDescriptor_logging_d4ad8a3d4a3a3050) }
 
-var fileDescriptor9 = []byte{
+var fileDescriptor_logging_d4ad8a3d4a3a3050 = []byte{
 	// 270 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0x4f, 0x4b, 0xc4, 0x30,
 	0x10, 0xc5, 0x69, 0x77, 0x51, 0x36, 0x8a, 0x60, 0x50, 0x28, 0x8b, 0x87, 0xc5, 0x83, 0xec, 0xc5,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/monitoring.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/monitoring.pb.go
index 3ebb6e14..1aad933d 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/monitoring.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/monitoring.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/monitoring.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Monitoring configuration of the service.
 //
 // The example below shows how to configure monitored resources and metrics
@@ -55,18 +61,40 @@ type Monitoring struct {
 	// There can be multiple producer destinations, each one must have a
 	// different monitored resource type. A metric can be used in at most
 	// one producer destination.
-	ProducerDestinations []*Monitoring_MonitoringDestination `protobuf:"bytes,1,rep,name=producer_destinations,json=producerDestinations" json:"producer_destinations,omitempty"`
+	ProducerDestinations []*Monitoring_MonitoringDestination `protobuf:"bytes,1,rep,name=producer_destinations,json=producerDestinations,proto3" json:"producer_destinations,omitempty"`
 	// Monitoring configurations for sending metrics to the consumer project.
 	// There can be multiple consumer destinations, each one must have a
 	// different monitored resource type. A metric can be used in at most
 	// one consumer destination.
-	ConsumerDestinations []*Monitoring_MonitoringDestination `protobuf:"bytes,2,rep,name=consumer_destinations,json=consumerDestinations" json:"consumer_destinations,omitempty"`
+	ConsumerDestinations []*Monitoring_MonitoringDestination `protobuf:"bytes,2,rep,name=consumer_destinations,json=consumerDestinations,proto3" json:"consumer_destinations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
+}
+
+func (m *Monitoring) Reset()         { *m = Monitoring{} }
+func (m *Monitoring) String() string { return proto.CompactTextString(m) }
+func (*Monitoring) ProtoMessage()    {}
+func (*Monitoring) Descriptor() ([]byte, []int) {
+	return fileDescriptor_monitoring_96ebaeded677bc82, []int{0}
+}
+func (m *Monitoring) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Monitoring.Unmarshal(m, b)
+}
+func (m *Monitoring) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Monitoring.Marshal(b, m, deterministic)
+}
+func (dst *Monitoring) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Monitoring.Merge(dst, src)
+}
+func (m *Monitoring) XXX_Size() int {
+	return xxx_messageInfo_Monitoring.Size(m)
+}
+func (m *Monitoring) XXX_DiscardUnknown() {
+	xxx_messageInfo_Monitoring.DiscardUnknown(m)
 }
 
-func (m *Monitoring) Reset()                    { *m = Monitoring{} }
-func (m *Monitoring) String() string            { return proto.CompactTextString(m) }
-func (*Monitoring) ProtoMessage()               {}
-func (*Monitoring) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{0} }
+var xxx_messageInfo_Monitoring proto.InternalMessageInfo
 
 func (m *Monitoring) GetProducerDestinations() []*Monitoring_MonitoringDestination {
 	if m != nil {
@@ -87,18 +115,38 @@ func (m *Monitoring) GetConsumerDestinations() []*Monitoring_MonitoringDestinati
 type Monitoring_MonitoringDestination struct {
 	// The monitored resource type. The type must be defined in
 	// [Service.monitored_resources][google.api.Service.monitored_resources] section.
-	MonitoredResource string `protobuf:"bytes,1,opt,name=monitored_resource,json=monitoredResource" json:"monitored_resource,omitempty"`
+	MonitoredResource string `protobuf:"bytes,1,opt,name=monitored_resource,json=monitoredResource,proto3" json:"monitored_resource,omitempty"`
 	// Names of the metrics to report to this monitoring destination.
 	// Each name must be defined in [Service.metrics][google.api.Service.metrics] section.
-	Metrics []string `protobuf:"bytes,2,rep,name=metrics" json:"metrics,omitempty"`
+	Metrics              []string `protobuf:"bytes,2,rep,name=metrics,proto3" json:"metrics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Monitoring_MonitoringDestination) Reset()         { *m = Monitoring_MonitoringDestination{} }
 func (m *Monitoring_MonitoringDestination) String() string { return proto.CompactTextString(m) }
 func (*Monitoring_MonitoringDestination) ProtoMessage()    {}
 func (*Monitoring_MonitoringDestination) Descriptor() ([]byte, []int) {
-	return fileDescriptor10, []int{0, 0}
+	return fileDescriptor_monitoring_96ebaeded677bc82, []int{0, 0}
 }
+func (m *Monitoring_MonitoringDestination) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Monitoring_MonitoringDestination.Unmarshal(m, b)
+}
+func (m *Monitoring_MonitoringDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Monitoring_MonitoringDestination.Marshal(b, m, deterministic)
+}
+func (dst *Monitoring_MonitoringDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Monitoring_MonitoringDestination.Merge(dst, src)
+}
+func (m *Monitoring_MonitoringDestination) XXX_Size() int {
+	return xxx_messageInfo_Monitoring_MonitoringDestination.Size(m)
+}
+func (m *Monitoring_MonitoringDestination) XXX_DiscardUnknown() {
+	xxx_messageInfo_Monitoring_MonitoringDestination.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Monitoring_MonitoringDestination proto.InternalMessageInfo
 
 func (m *Monitoring_MonitoringDestination) GetMonitoredResource() string {
 	if m != nil {
@@ -119,9 +167,11 @@ func init() {
 	proto.RegisterType((*Monitoring_MonitoringDestination)(nil), "google.api.Monitoring.MonitoringDestination")
 }
 
-func init() { proto.RegisterFile("google/api/monitoring.proto", fileDescriptor10) }
+func init() {
+	proto.RegisterFile("google/api/monitoring.proto", fileDescriptor_monitoring_96ebaeded677bc82)
+}
 
-var fileDescriptor10 = []byte{
+var fileDescriptor_monitoring_96ebaeded677bc82 = []byte{
 	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x51, 0xcd, 0x4a, 0xc4, 0x30,
 	0x10, 0xa6, 0x55, 0x94, 0x8d, 0xa0, 0x58, 0x5c, 0x28, 0xab, 0x87, 0xc5, 0xd3, 0x1e, 0xb4, 0x05,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/quota.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/quota.pb.go
index ac5ab097..dd99dadf 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/quota.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/quota.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/quota.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Quota configuration helps to achieve fairness and budgeting in service
 // usage.
 //
@@ -66,18 +72,40 @@ type Quota struct {
 	// List of `QuotaLimit` definitions for the service.
 	//
 	// Used by metric-based quotas only.
-	Limits []*QuotaLimit `protobuf:"bytes,3,rep,name=limits" json:"limits,omitempty"`
+	Limits []*QuotaLimit `protobuf:"bytes,3,rep,name=limits,proto3" json:"limits,omitempty"`
 	// List of `MetricRule` definitions, each one mapping a selected method to one
 	// or more metrics.
 	//
 	// Used by metric-based quotas only.
-	MetricRules []*MetricRule `protobuf:"bytes,4,rep,name=metric_rules,json=metricRules" json:"metric_rules,omitempty"`
+	MetricRules          []*MetricRule `protobuf:"bytes,4,rep,name=metric_rules,json=metricRules,proto3" json:"metric_rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *Quota) Reset()                    { *m = Quota{} }
-func (m *Quota) String() string            { return proto.CompactTextString(m) }
-func (*Quota) ProtoMessage()               {}
-func (*Quota) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{0} }
+func (m *Quota) Reset()         { *m = Quota{} }
+func (m *Quota) String() string { return proto.CompactTextString(m) }
+func (*Quota) ProtoMessage()    {}
+func (*Quota) Descriptor() ([]byte, []int) {
+	return fileDescriptor_quota_8acf07194df27b7e, []int{0}
+}
+func (m *Quota) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Quota.Unmarshal(m, b)
+}
+func (m *Quota) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Quota.Marshal(b, m, deterministic)
+}
+func (dst *Quota) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Quota.Merge(dst, src)
+}
+func (m *Quota) XXX_Size() int {
+	return xxx_messageInfo_Quota.Size(m)
+}
+func (m *Quota) XXX_DiscardUnknown() {
+	xxx_messageInfo_Quota.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Quota proto.InternalMessageInfo
 
 func (m *Quota) GetLimits() []*QuotaLimit {
 	if m != nil {
@@ -102,20 +130,42 @@ type MetricRule struct {
 	// Selects the methods to which this rule applies.
 	//
 	// Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
-	Selector string `protobuf:"bytes,1,opt,name=selector" json:"selector,omitempty"`
+	Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"`
 	// Metrics to update when the selected methods are called, and the associated
 	// cost applied to each metric.
 	//
 	// The key of the map is the metric name, and the values are the amount
 	// increased for the metric against which the quota limits are defined.
 	// The value must not be negative.
-	MetricCosts map[string]int64 `protobuf:"bytes,2,rep,name=metric_costs,json=metricCosts" json:"metric_costs,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	MetricCosts          map[string]int64 `protobuf:"bytes,2,rep,name=metric_costs,json=metricCosts,proto3" json:"metric_costs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *MetricRule) Reset()         { *m = MetricRule{} }
+func (m *MetricRule) String() string { return proto.CompactTextString(m) }
+func (*MetricRule) ProtoMessage()    {}
+func (*MetricRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_quota_8acf07194df27b7e, []int{1}
+}
+func (m *MetricRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MetricRule.Unmarshal(m, b)
+}
+func (m *MetricRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MetricRule.Marshal(b, m, deterministic)
+}
+func (dst *MetricRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricRule.Merge(dst, src)
+}
+func (m *MetricRule) XXX_Size() int {
+	return xxx_messageInfo_MetricRule.Size(m)
+}
+func (m *MetricRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_MetricRule.DiscardUnknown(m)
 }
 
-func (m *MetricRule) Reset()                    { *m = MetricRule{} }
-func (m *MetricRule) String() string            { return proto.CompactTextString(m) }
-func (*MetricRule) ProtoMessage()               {}
-func (*MetricRule) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{1} }
+var xxx_messageInfo_MetricRule proto.InternalMessageInfo
 
 func (m *MetricRule) GetSelector() string {
 	if m != nil {
@@ -153,11 +203,11 @@ type QuotaLimit struct {
 	// immutable. You can use the display_name field to provide a user-friendly
 	// name for the limit. The display name can be evolved over time without
 	// affecting the identity of the limit.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. User-visible, extended description for this quota limit.
 	// Should be used only when more context is needed to understand this limit
 	// than provided by the limit's display name (see: `display_name`).
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Default number of tokens that can be consumed during the specified
 	// duration. This is the number of tokens assigned when a client
 	// application developer activates the service for his/her project.
@@ -168,7 +218,7 @@ type QuotaLimit struct {
 	// negative values are allowed.
 	//
 	// Used by group-based quotas only.
-	DefaultLimit int64 `protobuf:"varint,3,opt,name=default_limit,json=defaultLimit" json:"default_limit,omitempty"`
+	DefaultLimit int64 `protobuf:"varint,3,opt,name=default_limit,json=defaultLimit,proto3" json:"default_limit,omitempty"`
 	// Maximum number of tokens that can be consumed during the specified
 	// duration. Client application developers can override the default limit up
 	// to this maximum. If specified, this value cannot be set to a value less
@@ -178,7 +228,7 @@ type QuotaLimit struct {
 	// indicating unlimited maximum quota.
 	//
 	// Used by group-based quotas only.
-	MaxLimit int64 `protobuf:"varint,4,opt,name=max_limit,json=maxLimit" json:"max_limit,omitempty"`
+	MaxLimit int64 `protobuf:"varint,4,opt,name=max_limit,json=maxLimit,proto3" json:"max_limit,omitempty"`
 	// Free tier value displayed in the Developers Console for this limit.
 	// The free tier is the number of tokens that will be subtracted from the
 	// billed amount when billing is enabled.
@@ -187,20 +237,20 @@ type QuotaLimit struct {
 	// defaults to 0, indicating that there is no free tier for this service.
 	//
 	// Used by group-based quotas only.
-	FreeTier int64 `protobuf:"varint,7,opt,name=free_tier,json=freeTier" json:"free_tier,omitempty"`
+	FreeTier int64 `protobuf:"varint,7,opt,name=free_tier,json=freeTier,proto3" json:"free_tier,omitempty"`
 	// Duration of this limit in textual notation. Example: "100s", "24h", "1d".
 	// For duration longer than a day, only multiple of days is supported. We
 	// support only "100s" and "1d" for now. Additional support will be added in
 	// the future. "0" indicates indefinite duration.
 	//
 	// Used by group-based quotas only.
-	Duration string `protobuf:"bytes,5,opt,name=duration" json:"duration,omitempty"`
+	Duration string `protobuf:"bytes,5,opt,name=duration,proto3" json:"duration,omitempty"`
 	// The name of the metric this quota limit applies to. The quota limits with
 	// the same metric will be checked together during runtime. The metric must be
 	// defined within the service config.
 	//
 	// Used by metric-based quotas only.
-	Metric string `protobuf:"bytes,8,opt,name=metric" json:"metric,omitempty"`
+	Metric string `protobuf:"bytes,8,opt,name=metric,proto3" json:"metric,omitempty"`
 	// Specify the unit of the quota limit. It uses the same syntax as
 	// [Metric.unit][]. The supported unit kinds are determined by the quota
 	// backend system.
@@ -232,7 +282,7 @@ type QuotaLimit struct {
 	// The "1" at the beginning is required to follow the metric unit syntax.
 	//
 	// Used by metric-based quotas only.
-	Unit string `protobuf:"bytes,9,opt,name=unit" json:"unit,omitempty"`
+	Unit string `protobuf:"bytes,9,opt,name=unit,proto3" json:"unit,omitempty"`
 	// Tiered limit values. Also allows for regional or zone overrides for these
 	// values if "/{region}" or "/{zone}" is specified in the unit field.
 	//
@@ -265,18 +315,40 @@ type QuotaLimit struct {
 	// tier as well.
 	//
 	// Used by metric-based quotas only.
-	Values map[string]int64 `protobuf:"bytes,10,rep,name=values" json:"values,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	Values map[string]int64 `protobuf:"bytes,10,rep,name=values,proto3" json:"values,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 	// User-visible display name for this limit.
 	// Optional. If not set, the UI will provide a default display name based on
 	// the quota configuration. This field can be used to override the default
 	// display name generated from the configuration.
-	DisplayName string `protobuf:"bytes,12,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName          string   `protobuf:"bytes,12,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *QuotaLimit) Reset()         { *m = QuotaLimit{} }
+func (m *QuotaLimit) String() string { return proto.CompactTextString(m) }
+func (*QuotaLimit) ProtoMessage()    {}
+func (*QuotaLimit) Descriptor() ([]byte, []int) {
+	return fileDescriptor_quota_8acf07194df27b7e, []int{2}
+}
+func (m *QuotaLimit) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QuotaLimit.Unmarshal(m, b)
+}
+func (m *QuotaLimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QuotaLimit.Marshal(b, m, deterministic)
+}
+func (dst *QuotaLimit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaLimit.Merge(dst, src)
+}
+func (m *QuotaLimit) XXX_Size() int {
+	return xxx_messageInfo_QuotaLimit.Size(m)
+}
+func (m *QuotaLimit) XXX_DiscardUnknown() {
+	xxx_messageInfo_QuotaLimit.DiscardUnknown(m)
 }
 
-func (m *QuotaLimit) Reset()                    { *m = QuotaLimit{} }
-func (m *QuotaLimit) String() string            { return proto.CompactTextString(m) }
-func (*QuotaLimit) ProtoMessage()               {}
-func (*QuotaLimit) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{2} }
+var xxx_messageInfo_QuotaLimit proto.InternalMessageInfo
 
 func (m *QuotaLimit) GetName() string {
 	if m != nil {
@@ -351,12 +423,14 @@ func (m *QuotaLimit) GetDisplayName() string {
 func init() {
 	proto.RegisterType((*Quota)(nil), "google.api.Quota")
 	proto.RegisterType((*MetricRule)(nil), "google.api.MetricRule")
+	proto.RegisterMapType((map[string]int64)(nil), "google.api.MetricRule.MetricCostsEntry")
 	proto.RegisterType((*QuotaLimit)(nil), "google.api.QuotaLimit")
+	proto.RegisterMapType((map[string]int64)(nil), "google.api.QuotaLimit.ValuesEntry")
 }
 
-func init() { proto.RegisterFile("google/api/quota.proto", fileDescriptor11) }
+func init() { proto.RegisterFile("google/api/quota.proto", fileDescriptor_quota_8acf07194df27b7e) }
 
-var fileDescriptor11 = []byte{
+var fileDescriptor_quota_8acf07194df27b7e = []byte{
 	// 466 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x8e, 0xd3, 0x30,
 	0x10, 0x55, 0x9a, 0xb6, 0xb4, 0xd3, 0x82, 0x56, 0x16, 0xaa, 0xac, 0xc2, 0xa1, 0x94, 0x03, 0x3d,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/service.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/service.pb.go
index cad0545a..3079d96e 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/service.pb.go
@@ -1,27 +1,29 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/service.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api5 "google.golang.org/genproto/googleapis/api"
-import google_api "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/label"
-import google_api3 "google.golang.org/genproto/googleapis/api/metric"
-import google_api6 "google.golang.org/genproto/googleapis/api/monitoredres"
-import _ "github.com/golang/protobuf/ptypes/any"
-import google_protobuf4 "google.golang.org/genproto/protobuf/api"
-import google_protobuf3 "google.golang.org/genproto/protobuf/ptype"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/wrappers"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+import annotations "google.golang.org/genproto/googleapis/api/annotations"
+import metric "google.golang.org/genproto/googleapis/api/metric"
+import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+import api "google.golang.org/genproto/protobuf/api"
+import ptype "google.golang.org/genproto/protobuf/ptype"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // `Service` is the root object of Google service configuration schema. It
 // describes basic information about a service, such as the name and the
 // title, and delegates other aspects to sub-sections. Each sub-section is
@@ -50,24 +52,24 @@ type Service struct {
 	// affects the interpretation of the service configuration. For example,
 	// certain features are enabled by default for certain config versions.
 	// The latest config version is `3`.
-	ConfigVersion *google_protobuf5.UInt32Value `protobuf:"bytes,20,opt,name=config_version,json=configVersion" json:"config_version,omitempty"`
+	ConfigVersion *wrappers.UInt32Value `protobuf:"bytes,20,opt,name=config_version,json=configVersion,proto3" json:"config_version,omitempty"`
 	// The DNS address at which this service is available,
 	// e.g. `calendar.googleapis.com`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A unique ID for a specific instance of this message, typically assigned
 	// by the client for tracking purpose. If empty, the server may choose to
 	// generate one instead.
-	Id string `protobuf:"bytes,33,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,33,opt,name=id,proto3" json:"id,omitempty"`
 	// The product title for this service.
-	Title string `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
 	// The Google project that owns this service.
-	ProducerProjectId string `protobuf:"bytes,22,opt,name=producer_project_id,json=producerProjectId" json:"producer_project_id,omitempty"`
+	ProducerProjectId string `protobuf:"bytes,22,opt,name=producer_project_id,json=producerProjectId,proto3" json:"producer_project_id,omitempty"`
 	// A list of API interfaces exported by this service. Only the `name` field
 	// of the [google.protobuf.Api][google.protobuf.Api] needs to be provided by the configuration
 	// author, as the remaining fields will be derived from the IDL during the
 	// normalization process. It is an error to specify an API interface here
 	// which cannot be resolved against the associated IDL files.
-	Apis []*google_protobuf4.Api `protobuf:"bytes,3,rep,name=apis" json:"apis,omitempty"`
+	Apis []*api.Api `protobuf:"bytes,3,rep,name=apis,proto3" json:"apis,omitempty"`
 	// A list of all proto message types included in this API service.
 	// Types referenced directly or indirectly by the `apis` are
 	// automatically included.  Messages which are not referenced but
@@ -76,7 +78,7 @@ type Service struct {
 	//
 	//     types:
 	//     - name: google.protobuf.Int32
-	Types []*google_protobuf3.Type `protobuf:"bytes,4,rep,name=types" json:"types,omitempty"`
+	Types []*ptype.Type `protobuf:"bytes,4,rep,name=types,proto3" json:"types,omitempty"`
 	// A list of all enum types included in this API service.  Enums
 	// referenced directly or indirectly by the `apis` are automatically
 	// included.  Enums which are not referenced but shall be included
@@ -84,54 +86,74 @@ type Service struct {
 	//
 	//     enums:
 	//     - name: google.someapi.v1.SomeEnum
-	Enums []*google_protobuf3.Enum `protobuf:"bytes,5,rep,name=enums" json:"enums,omitempty"`
+	Enums []*ptype.Enum `protobuf:"bytes,5,rep,name=enums,proto3" json:"enums,omitempty"`
 	// Additional API documentation.
-	Documentation *Documentation `protobuf:"bytes,6,opt,name=documentation" json:"documentation,omitempty"`
+	Documentation *Documentation `protobuf:"bytes,6,opt,name=documentation,proto3" json:"documentation,omitempty"`
 	// API backend configuration.
-	Backend *Backend `protobuf:"bytes,8,opt,name=backend" json:"backend,omitempty"`
+	Backend *Backend `protobuf:"bytes,8,opt,name=backend,proto3" json:"backend,omitempty"`
 	// HTTP configuration.
-	Http *google_api.Http `protobuf:"bytes,9,opt,name=http" json:"http,omitempty"`
+	Http *annotations.Http `protobuf:"bytes,9,opt,name=http,proto3" json:"http,omitempty"`
 	// Quota configuration.
-	Quota *Quota `protobuf:"bytes,10,opt,name=quota" json:"quota,omitempty"`
+	Quota *Quota `protobuf:"bytes,10,opt,name=quota,proto3" json:"quota,omitempty"`
 	// Auth configuration.
-	Authentication *Authentication `protobuf:"bytes,11,opt,name=authentication" json:"authentication,omitempty"`
+	Authentication *Authentication `protobuf:"bytes,11,opt,name=authentication,proto3" json:"authentication,omitempty"`
 	// Context configuration.
-	Context *Context `protobuf:"bytes,12,opt,name=context" json:"context,omitempty"`
+	Context *Context `protobuf:"bytes,12,opt,name=context,proto3" json:"context,omitempty"`
 	// Configuration controlling usage of this service.
-	Usage *Usage `protobuf:"bytes,15,opt,name=usage" json:"usage,omitempty"`
+	Usage *Usage `protobuf:"bytes,15,opt,name=usage,proto3" json:"usage,omitempty"`
 	// Configuration for network endpoints.  If this is empty, then an endpoint
 	// with the same name as the service is automatically generated to service all
 	// defined APIs.
-	Endpoints []*Endpoint `protobuf:"bytes,18,rep,name=endpoints" json:"endpoints,omitempty"`
+	Endpoints []*Endpoint `protobuf:"bytes,18,rep,name=endpoints,proto3" json:"endpoints,omitempty"`
 	// Configuration for the service control plane.
-	Control *Control `protobuf:"bytes,21,opt,name=control" json:"control,omitempty"`
+	Control *Control `protobuf:"bytes,21,opt,name=control,proto3" json:"control,omitempty"`
 	// Defines the logs used by this service.
-	Logs []*LogDescriptor `protobuf:"bytes,23,rep,name=logs" json:"logs,omitempty"`
+	Logs []*LogDescriptor `protobuf:"bytes,23,rep,name=logs,proto3" json:"logs,omitempty"`
 	// Defines the metrics used by this service.
-	Metrics []*google_api3.MetricDescriptor `protobuf:"bytes,24,rep,name=metrics" json:"metrics,omitempty"`
+	Metrics []*metric.MetricDescriptor `protobuf:"bytes,24,rep,name=metrics,proto3" json:"metrics,omitempty"`
 	// Defines the monitored resources used by this service. This is required
 	// by the [Service.monitoring][google.api.Service.monitoring] and [Service.logging][google.api.Service.logging] configurations.
-	MonitoredResources []*google_api6.MonitoredResourceDescriptor `protobuf:"bytes,25,rep,name=monitored_resources,json=monitoredResources" json:"monitored_resources,omitempty"`
+	MonitoredResources []*monitoredres.MonitoredResourceDescriptor `protobuf:"bytes,25,rep,name=monitored_resources,json=monitoredResources,proto3" json:"monitored_resources,omitempty"`
 	// Billing configuration.
-	Billing *Billing `protobuf:"bytes,26,opt,name=billing" json:"billing,omitempty"`
+	Billing *Billing `protobuf:"bytes,26,opt,name=billing,proto3" json:"billing,omitempty"`
 	// Logging configuration.
-	Logging *Logging `protobuf:"bytes,27,opt,name=logging" json:"logging,omitempty"`
+	Logging *Logging `protobuf:"bytes,27,opt,name=logging,proto3" json:"logging,omitempty"`
 	// Monitoring configuration.
-	Monitoring *Monitoring `protobuf:"bytes,28,opt,name=monitoring" json:"monitoring,omitempty"`
+	Monitoring *Monitoring `protobuf:"bytes,28,opt,name=monitoring,proto3" json:"monitoring,omitempty"`
 	// System parameter configuration.
-	SystemParameters *SystemParameters `protobuf:"bytes,29,opt,name=system_parameters,json=systemParameters" json:"system_parameters,omitempty"`
+	SystemParameters *SystemParameters `protobuf:"bytes,29,opt,name=system_parameters,json=systemParameters,proto3" json:"system_parameters,omitempty"`
 	// Output only. The source information for this configuration if available.
-	SourceInfo *SourceInfo `protobuf:"bytes,37,opt,name=source_info,json=sourceInfo" json:"source_info,omitempty"`
-	// Experimental configuration.
-	Experimental *google_api5.Experimental `protobuf:"bytes,101,opt,name=experimental" json:"experimental,omitempty"`
+	SourceInfo           *SourceInfo `protobuf:"bytes,37,opt,name=source_info,json=sourceInfo,proto3" json:"source_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *Service) Reset()                    { *m = Service{} }
-func (m *Service) String() string            { return proto.CompactTextString(m) }
-func (*Service) ProtoMessage()               {}
-func (*Service) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{0} }
+func (m *Service) Reset()         { *m = Service{} }
+func (m *Service) String() string { return proto.CompactTextString(m) }
+func (*Service) ProtoMessage()    {}
+func (*Service) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_e641d3f3e04723a1, []int{0}
+}
+func (m *Service) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Service.Unmarshal(m, b)
+}
+func (m *Service) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Service.Marshal(b, m, deterministic)
+}
+func (dst *Service) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Service.Merge(dst, src)
+}
+func (m *Service) XXX_Size() int {
+	return xxx_messageInfo_Service.Size(m)
+}
+func (m *Service) XXX_DiscardUnknown() {
+	xxx_messageInfo_Service.DiscardUnknown(m)
+}
 
-func (m *Service) GetConfigVersion() *google_protobuf5.UInt32Value {
+var xxx_messageInfo_Service proto.InternalMessageInfo
+
+func (m *Service) GetConfigVersion() *wrappers.UInt32Value {
 	if m != nil {
 		return m.ConfigVersion
 	}
@@ -166,21 +188,21 @@ func (m *Service) GetProducerProjectId() string {
 	return ""
 }
 
-func (m *Service) GetApis() []*google_protobuf4.Api {
+func (m *Service) GetApis() []*api.Api {
 	if m != nil {
 		return m.Apis
 	}
 	return nil
 }
 
-func (m *Service) GetTypes() []*google_protobuf3.Type {
+func (m *Service) GetTypes() []*ptype.Type {
 	if m != nil {
 		return m.Types
 	}
 	return nil
 }
 
-func (m *Service) GetEnums() []*google_protobuf3.Enum {
+func (m *Service) GetEnums() []*ptype.Enum {
 	if m != nil {
 		return m.Enums
 	}
@@ -201,7 +223,7 @@ func (m *Service) GetBackend() *Backend {
 	return nil
 }
 
-func (m *Service) GetHttp() *google_api.Http {
+func (m *Service) GetHttp() *annotations.Http {
 	if m != nil {
 		return m.Http
 	}
@@ -257,14 +279,14 @@ func (m *Service) GetLogs() []*LogDescriptor {
 	return nil
 }
 
-func (m *Service) GetMetrics() []*google_api3.MetricDescriptor {
+func (m *Service) GetMetrics() []*metric.MetricDescriptor {
 	if m != nil {
 		return m.Metrics
 	}
 	return nil
 }
 
-func (m *Service) GetMonitoredResources() []*google_api6.MonitoredResourceDescriptor {
+func (m *Service) GetMonitoredResources() []*monitoredres.MonitoredResourceDescriptor {
 	if m != nil {
 		return m.MonitoredResources
 	}
@@ -306,71 +328,62 @@ func (m *Service) GetSourceInfo() *SourceInfo {
 	return nil
 }
 
-func (m *Service) GetExperimental() *google_api5.Experimental {
-	if m != nil {
-		return m.Experimental
-	}
-	return nil
-}
-
 func init() {
 	proto.RegisterType((*Service)(nil), "google.api.Service")
 }
 
-func init() { proto.RegisterFile("google/api/service.proto", fileDescriptor12) }
-
-var fileDescriptor12 = []byte{
-	// 825 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x96, 0xdf, 0x6e, 0xdb, 0x36,
-	0x14, 0x87, 0x61, 0xd7, 0x6e, 0x16, 0x3a, 0xcd, 0x1a, 0xc6, 0x49, 0x19, 0xd7, 0x1b, 0xd2, 0xfd,
-	0x41, 0x8d, 0x0d, 0x95, 0x01, 0x17, 0xe8, 0x2e, 0x36, 0x60, 0x88, 0xdb, 0x60, 0x33, 0xd0, 0x01,
-	0x1e, 0xb3, 0x16, 0xc3, 0x6e, 0x0c, 0x5a, 0xa2, 0x55, 0x6e, 0x12, 0xc9, 0x91, 0x54, 0x17, 0x3f,
-	0xc7, 0xde, 0x60, 0x4f, 0x3a, 0x88, 0xa4, 0x62, 0xca, 0x52, 0xee, 0x22, 0x7e, 0xdf, 0x39, 0x38,
-	0x14, 0xa9, 0x9f, 0x03, 0x50, 0x2a, 0x44, 0x9a, 0xd1, 0x29, 0x91, 0x6c, 0xaa, 0xa9, 0xfa, 0xc8,
-	0x62, 0x1a, 0x49, 0x25, 0x8c, 0x80, 0xc0, 0x91, 0x88, 0x48, 0x36, 0x1a, 0x07, 0x16, 0xe1, 0x5c,
-	0x18, 0x62, 0x98, 0xe0, 0xda, 0x99, 0xa3, 0xb3, 0x90, 0x16, 0xe6, 0x83, 0x5f, 0x0e, 0x5b, 0xaf,
-	0x49, 0xfc, 0x17, 0xe5, 0x49, 0x1b, 0x61, 0x59, 0xc6, 0x78, 0xda, 0x42, 0x62, 0xc1, 0x0d, 0xbd,
-	0x35, 0xf7, 0x10, 0x25, 0x32, 0x4f, 0x3e, 0x0f, 0x48, 0x22, 0xe2, 0x22, 0xa7, 0xdc, 0xcd, 0xe7,
-	0xf9, 0x45, 0xc0, 0x29, 0x4f, 0xa4, 0x60, 0xbc, 0x6a, 0xfa, 0x4d, 0x88, 0x6e, 0x25, 0x55, 0xcc,
-	0x16, 0x67, 0xb5, 0x87, 0x96, 0x5d, 0x7e, 0x30, 0x46, 0xfa, 0xe5, 0xf3, 0x60, 0x39, 0x23, 0x6b,
-	0x5a, 0xe9, 0xc3, 0x70, 0x5d, 0xb4, 0xed, 0x2f, 0x13, 0x69, 0xba, 0xdb, 0xf9, 0x93, 0x80, 0xe4,
-	0xd4, 0x28, 0x16, 0x7b, 0xf0, 0x65, 0x08, 0x04, 0x67, 0x46, 0x28, 0x9a, 0xac, 0x14, 0xd5, 0xa2,
-	0x50, 0xd5, 0x61, 0x8d, 0x9e, 0x36, 0xa5, 0x5d, 0xeb, 0x70, 0xc4, 0xbf, 0x0b, 0x61, 0x88, 0x5f,
-	0x0f, 0x4f, 0xd5, 0x75, 0x5b, 0x31, 0xbe, 0x11, 0x9e, 0x3e, 0x0b, 0xe9, 0x56, 0x1b, 0x9a, 0xaf,
-	0x24, 0x51, 0x24, 0xa7, 0x86, 0xaa, 0x96, 0xc6, 0x85, 0x26, 0x29, 0xdd, 0x7b, 0xe3, 0xf6, 0x69,
-	0x5d, 0x6c, 0xa6, 0x84, 0x6f, 0xef, 0x45, 0x92, 0x79, 0x34, 0xda, 0x47, 0x66, 0x2b, 0xe9, 0xde,
-	0x19, 0xdf, 0xb1, 0x7f, 0x14, 0x91, 0x92, 0x2a, 0x7f, 0x05, 0xbf, 0xf8, 0x17, 0x80, 0x83, 0x1b,
-	0x77, 0x7d, 0xe1, 0x6b, 0x70, 0x1c, 0x0b, 0xbe, 0x61, 0xe9, 0xea, 0x23, 0x55, 0x9a, 0x09, 0x8e,
-	0x86, 0x97, 0x9d, 0xc9, 0x60, 0x36, 0x8e, 0xfc, 0x8d, 0xae, 0x9a, 0x44, 0xef, 0x16, 0xdc, 0xbc,
-	0x9c, 0xbd, 0x27, 0x59, 0x41, 0xf1, 0x23, 0x57, 0xf3, 0xde, 0x95, 0x40, 0x08, 0x7a, 0x9c, 0xe4,
-	0x14, 0x75, 0x2e, 0x3b, 0x93, 0x43, 0x6c, 0xff, 0x86, 0xc7, 0xa0, 0xcb, 0x12, 0xf4, 0xcc, 0xae,
-	0x74, 0x59, 0x02, 0x87, 0xa0, 0x6f, 0x98, 0xc9, 0x28, 0xea, 0xda, 0x25, 0xf7, 0x00, 0x23, 0x70,
-	0x2a, 0x95, 0x48, 0x8a, 0x98, 0xaa, 0x95, 0x54, 0xe2, 0x4f, 0x1a, 0x9b, 0x15, 0x4b, 0xd0, 0xb9,
-	0x75, 0x4e, 0x2a, 0xb4, 0x74, 0x64, 0x91, 0xc0, 0x09, 0xe8, 0x11, 0xc9, 0x34, 0x7a, 0x70, 0xf9,
-	0x60, 0x32, 0x98, 0x0d, 0x1b, 0x43, 0x5e, 0x49, 0x86, 0xad, 0x01, 0xbf, 0x05, 0xfd, 0xf2, 0x95,
-	0x68, 0xd4, 0xb3, 0xea, 0x59, 0x43, 0xfd, 0x6d, 0x2b, 0x29, 0x76, 0x4e, 0x29, 0x53, 0x5e, 0xe4,
-	0x1a, 0xf5, 0xef, 0x91, 0xaf, 0x79, 0x91, 0x63, 0xe7, 0xc0, 0x1f, 0xc1, 0xa3, 0xda, 0x97, 0x83,
-	0x1e, 0xda, 0x37, 0x76, 0x11, 0xed, 0x32, 0x20, 0x7a, 0x13, 0x0a, 0xb8, 0xee, 0xc3, 0x17, 0xe0,
-	0xc0, 0x7f, 0xe2, 0xe8, 0x13, 0x5b, 0x7a, 0x1a, 0x96, 0xce, 0x1d, 0xc2, 0x95, 0x03, 0xbf, 0x02,
-	0xbd, 0xf2, 0x13, 0x42, 0x87, 0xd6, 0x7d, 0x1c, 0xba, 0x3f, 0x1b, 0x23, 0xb1, 0xa5, 0xf0, 0x39,
-	0xe8, 0xdb, 0xeb, 0x8a, 0x80, 0xd5, 0x4e, 0x42, 0xed, 0xd7, 0x12, 0x60, 0xc7, 0xe1, 0x1c, 0x1c,
-	0x97, 0xb9, 0x43, 0xb9, 0x61, 0xb1, 0x9b, 0x7f, 0x60, 0x2b, 0x46, 0x61, 0xc5, 0x55, 0xcd, 0xc0,
-	0x7b, 0x15, 0xe5, 0x0e, 0x7c, 0xe0, 0xa0, 0xa3, 0xe6, 0x0e, 0x5e, 0x3b, 0x84, 0x2b, 0xa7, 0x9c,
-	0xcd, 0xde, 0x78, 0xf4, 0x69, 0x73, 0xb6, 0x77, 0x25, 0xc0, 0x8e, 0xc3, 0x19, 0x38, 0xac, 0x42,
-	0x47, 0x23, 0x58, 0x3f, 0xe3, 0x52, 0xbe, 0xf6, 0x10, 0xef, 0xb4, 0x6a, 0x16, 0x25, 0x32, 0x74,
-	0xd6, 0x3e, 0x8b, 0x12, 0x19, 0xae, 0x1c, 0xf8, 0x02, 0xf4, 0x32, 0x91, 0x6a, 0xf4, 0xc4, 0x76,
-	0xaf, 0x1d, 0xda, 0x5b, 0x91, 0xbe, 0xa1, 0x3a, 0x56, 0x4c, 0x1a, 0xa1, 0xb0, 0xd5, 0xe0, 0x2b,
-	0x70, 0xe0, 0x02, 0x46, 0x23, 0x64, 0x2b, 0xc6, 0x61, 0xc5, 0x2f, 0x16, 0x05, 0x45, 0x95, 0x0c,
-	0x7f, 0x07, 0xa7, 0xcd, 0xfc, 0xd1, 0xe8, 0xc2, 0xf6, 0x78, 0x5e, 0xeb, 0x51, 0x69, 0xd8, 0x5b,
-	0x41, 0x3b, 0x98, 0xef, 0x43, 0xbb, 0x5f, 0xff, 0x33, 0x80, 0x46, 0x2d, 0xb7, 0xc7, 0x21, 0x5c,
-	0x39, 0xa5, 0xee, 0xb3, 0x13, 0x3d, 0x6d, 0xea, 0x6f, 0x1d, 0xc2, 0x95, 0x03, 0x5f, 0x01, 0xb0,
-	0x8b, 0x44, 0x34, 0xb6, 0x15, 0xe7, 0x2d, 0xe3, 0x96, 0x45, 0x81, 0x09, 0x17, 0xe0, 0x64, 0x3f,
-	0xf7, 0x34, 0xfa, 0xac, 0x1e, 0x25, 0x65, 0xf9, 0x8d, 0x95, 0x96, 0x77, 0x0e, 0x7e, 0xac, 0xf7,
-	0x56, 0xe0, 0x77, 0x60, 0x10, 0x04, 0x2c, 0xfa, 0xba, 0x39, 0xc3, 0x8d, 0xc5, 0x0b, 0xbe, 0x11,
-	0x18, 0xe8, 0xbb, 0xbf, 0xe1, 0x0f, 0xe0, 0x28, 0xfc, 0x29, 0x42, 0xd4, 0x56, 0xa2, 0xda, 0x05,
-	0x0a, 0x38, 0xae, 0xd9, 0x73, 0x5e, 0x26, 0x61, 0x1e, 0xc8, 0xf3, 0x23, 0x1f, 0x92, 0xcb, 0x32,
-	0x05, 0x96, 0x9d, 0x3f, 0xae, 0x3d, 0x4b, 0x45, 0x46, 0x78, 0x1a, 0x09, 0x95, 0x4e, 0x53, 0xca,
-	0x6d, 0x46, 0x4c, 0x1d, 0x2a, 0x93, 0x27, 0xfc, 0xef, 0xc0, 0xc5, 0xe4, 0xf7, 0xb5, 0xa7, 0xff,
-	0xba, 0xbd, 0x9f, 0xae, 0x96, 0x8b, 0xf5, 0x43, 0x5b, 0xf8, 0xf2, 0xff, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xfe, 0x6c, 0x4b, 0xf7, 0x55, 0x08, 0x00, 0x00,
+func init() { proto.RegisterFile("google/api/service.proto", fileDescriptor_service_e641d3f3e04723a1) }
+
+var fileDescriptor_service_e641d3f3e04723a1 = []byte{
+	// 791 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x95, 0xdd, 0x6e, 0xdb, 0x36,
+	0x14, 0xc7, 0x61, 0xd7, 0x6e, 0x6a, 0xba, 0xcd, 0x12, 0xc6, 0x49, 0x19, 0xd7, 0x1b, 0xd2, 0x7d,
+	0xa0, 0x06, 0x86, 0xca, 0x80, 0x0b, 0x74, 0x17, 0xbb, 0x18, 0xe2, 0x36, 0xd8, 0x3c, 0x74, 0x80,
+	0xc7, 0xac, 0xc1, 0xb0, 0x1b, 0x43, 0x91, 0x68, 0x85, 0x9b, 0x44, 0x72, 0x24, 0x95, 0x2d, 0xaf,
+	0xb3, 0xd7, 0xda, 0xcb, 0x14, 0xfc, 0x50, 0x4c, 0x59, 0xca, 0x9d, 0xc5, 0xdf, 0xef, 0x1c, 0x1c,
+	0x89, 0xe4, 0xdf, 0x00, 0x65, 0x9c, 0x67, 0x39, 0x99, 0xc5, 0x82, 0xce, 0x14, 0x91, 0xb7, 0x34,
+	0x21, 0x91, 0x90, 0x5c, 0x73, 0x08, 0x1c, 0x89, 0x62, 0x41, 0xc7, 0x93, 0xc0, 0x8a, 0x19, 0xe3,
+	0x3a, 0xd6, 0x94, 0x33, 0xe5, 0xcc, 0xf1, 0x71, 0x48, 0x4b, 0x7d, 0xe3, 0x97, 0xc3, 0xd6, 0xd7,
+	0x71, 0xf2, 0x17, 0x61, 0x69, 0x1b, 0xa1, 0x79, 0x4e, 0x59, 0xd6, 0x42, 0x12, 0xce, 0x34, 0xf9,
+	0x57, 0x3f, 0x40, 0x24, 0xcf, 0x3d, 0xf9, 0x22, 0x20, 0x29, 0x4f, 0xca, 0x82, 0x30, 0x37, 0x9f,
+	0xe7, 0xa7, 0x01, 0x27, 0x2c, 0x15, 0x9c, 0x32, 0xdd, 0x32, 0xf9, 0x8d, 0xd6, 0xc2, 0x2f, 0x8f,
+	0x82, 0xe5, 0x9c, 0xb7, 0xcd, 0x96, 0xf3, 0x2c, 0xdb, 0x4e, 0xfd, 0x3c, 0x20, 0x05, 0xd1, 0x92,
+	0x26, 0x1e, 0x7c, 0x15, 0x02, 0xce, 0xa8, 0xe6, 0x92, 0xa4, 0x6b, 0x49, 0x14, 0x2f, 0x65, 0xf5,
+	0xa1, 0xc7, 0x2f, 0x9a, 0xd2, 0xb6, 0xf5, 0x49, 0x00, 0xff, 0x2e, 0xb9, 0x8e, 0xfd, 0x7a, 0xb8,
+	0x23, 0xae, 0xdb, 0x9a, 0xb2, 0x0d, 0xf7, 0xf4, 0x65, 0x48, 0xef, 0x94, 0x26, 0xc5, 0x5a, 0xc4,
+	0x32, 0x2e, 0x88, 0x26, 0xb2, 0xa5, 0x71, 0xa9, 0xe2, 0x8c, 0xec, 0x7c, 0x2d, 0xfb, 0x74, 0x5d,
+	0x6e, 0x8c, 0xe0, 0xd1, 0x78, 0x17, 0xe9, 0x3b, 0x41, 0x76, 0x36, 0xe1, 0x9e, 0xfd, 0x23, 0x63,
+	0x21, 0x88, 0xf4, 0x67, 0xe4, 0xcb, 0xff, 0x07, 0x60, 0xef, 0xd2, 0x9d, 0x2f, 0xf8, 0x0e, 0xec,
+	0x27, 0x9c, 0x6d, 0x68, 0xb6, 0xbe, 0x25, 0x52, 0x51, 0xce, 0xd0, 0xe8, 0xac, 0x33, 0x1d, 0xce,
+	0x27, 0x91, 0x3f, 0x72, 0x55, 0x93, 0xe8, 0xe3, 0x92, 0xe9, 0x37, 0xf3, 0xab, 0x38, 0x2f, 0x09,
+	0x7e, 0xe6, 0x6a, 0xae, 0x5c, 0x09, 0x84, 0xa0, 0xc7, 0xe2, 0x82, 0xa0, 0xce, 0x59, 0x67, 0x3a,
+	0xc0, 0xf6, 0x37, 0xdc, 0x07, 0x5d, 0x9a, 0xa2, 0x97, 0x76, 0xa5, 0x4b, 0x53, 0x38, 0x02, 0x7d,
+	0x4d, 0x75, 0x4e, 0x50, 0xd7, 0x2e, 0xb9, 0x07, 0x18, 0x81, 0x23, 0x21, 0x79, 0x5a, 0x26, 0x44,
+	0xae, 0x85, 0xe4, 0x7f, 0x92, 0x44, 0xaf, 0x69, 0x8a, 0x4e, 0xac, 0x73, 0x58, 0xa1, 0x95, 0x23,
+	0xcb, 0x14, 0x4e, 0x41, 0x2f, 0x16, 0x54, 0xa1, 0x47, 0x67, 0x8f, 0xa6, 0xc3, 0xf9, 0xa8, 0x31,
+	0xe4, 0xb9, 0xa0, 0xd8, 0x1a, 0xf0, 0x5b, 0xd0, 0x37, 0x9f, 0x44, 0xa1, 0x9e, 0x55, 0x8f, 0x1b,
+	0xea, 0x6f, 0x77, 0x82, 0x60, 0xe7, 0x18, 0x99, 0xb0, 0xb2, 0x50, 0xa8, 0xff, 0x80, 0x7c, 0xc1,
+	0xca, 0x02, 0x3b, 0x07, 0xfe, 0x00, 0x9e, 0xd5, 0x8e, 0x36, 0x7a, 0x6c, 0xbf, 0xd8, 0x69, 0xb4,
+	0xbd, 0xa4, 0xd1, 0xfb, 0x50, 0xc0, 0x75, 0x1f, 0xbe, 0x06, 0x7b, 0xfe, 0x0e, 0xa2, 0x27, 0xb6,
+	0xf4, 0x28, 0x2c, 0x5d, 0x38, 0x84, 0x2b, 0x07, 0x7e, 0x0d, 0x7a, 0xe6, 0x3e, 0xa0, 0x81, 0x75,
+	0x0f, 0x42, 0xf7, 0x27, 0xad, 0x05, 0xb6, 0x14, 0xbe, 0x02, 0x7d, 0x7b, 0x26, 0x11, 0xb0, 0xda,
+	0x61, 0xa8, 0xfd, 0x6a, 0x00, 0x76, 0x1c, 0x2e, 0xc0, 0xbe, 0x09, 0x06, 0xc2, 0x34, 0x4d, 0xdc,
+	0xfc, 0x43, 0x5b, 0x31, 0x0e, 0x2b, 0xce, 0x6b, 0x06, 0xde, 0xa9, 0x30, 0x6f, 0xe0, 0x13, 0x01,
+	0x3d, 0x6d, 0xbe, 0xc1, 0x3b, 0x87, 0x70, 0xe5, 0x98, 0xd9, 0xec, 0xb1, 0x46, 0x9f, 0x35, 0x67,
+	0xfb, 0x68, 0x00, 0x76, 0x1c, 0xce, 0xc1, 0xa0, 0x4a, 0x05, 0x85, 0x60, 0x7d, 0x8f, 0x8d, 0x7c,
+	0xe1, 0x21, 0xde, 0x6a, 0xd5, 0x2c, 0x92, 0xe7, 0xe8, 0xb8, 0x7d, 0x16, 0xc9, 0x73, 0x5c, 0x39,
+	0xf0, 0x35, 0xe8, 0xe5, 0x3c, 0x53, 0xe8, 0xb9, 0xed, 0x5e, 0xdb, 0xb4, 0x0f, 0x3c, 0x7b, 0x4f,
+	0x54, 0x22, 0xa9, 0xd0, 0x5c, 0x62, 0xab, 0xc1, 0xb7, 0x60, 0xcf, 0xa5, 0x88, 0x42, 0xc8, 0x56,
+	0x4c, 0xc2, 0x8a, 0x5f, 0x2c, 0x0a, 0x8a, 0x2a, 0x19, 0xfe, 0x0e, 0x8e, 0x9a, 0x21, 0xa3, 0xd0,
+	0xa9, 0xed, 0xf1, 0xaa, 0xd6, 0xa3, 0xd2, 0xb0, 0xb7, 0x82, 0x76, 0xb0, 0xd8, 0x85, 0xf6, 0x7d,
+	0x7d, 0x4e, 0xa3, 0x71, 0xcb, 0xe9, 0x71, 0x08, 0x57, 0x8e, 0xd1, 0x7d, 0x40, 0xa2, 0x17, 0x4d,
+	0xfd, 0x83, 0x43, 0xb8, 0x72, 0xe0, 0x5b, 0x00, 0xb6, 0xb9, 0x87, 0x26, 0xb6, 0xe2, 0xa4, 0x65,
+	0x5c, 0x53, 0x14, 0x98, 0x70, 0x09, 0x0e, 0x77, 0xc3, 0x4d, 0xa1, 0xcf, 0xeb, 0x51, 0x62, 0xca,
+	0x2f, 0xad, 0xb4, 0xba, 0x77, 0xf0, 0x81, 0xda, 0x59, 0x81, 0xdf, 0x81, 0x61, 0x90, 0xa2, 0xe8,
+	0x9b, 0xe6, 0x0c, 0x97, 0x16, 0x2f, 0xd9, 0x86, 0x63, 0xa0, 0xee, 0x7f, 0xff, 0xdc, 0x7b, 0x42,
+	0x0e, 0x36, 0x0b, 0x66, 0x12, 0xad, 0x08, 0xf4, 0xc5, 0x53, 0x1f, 0x76, 0x2b, 0x73, 0x9b, 0x57,
+	0x9d, 0x3f, 0x2e, 0x3c, 0xcb, 0x78, 0x1e, 0xb3, 0x2c, 0xe2, 0x32, 0x9b, 0x65, 0x84, 0xd9, 0xbb,
+	0x3e, 0x73, 0xc8, 0x24, 0x48, 0xf8, 0x37, 0xec, 0xe2, 0xee, 0xfb, 0xda, 0xd3, 0x7f, 0xdd, 0xde,
+	0x8f, 0xe7, 0xab, 0xe5, 0xf5, 0x63, 0x5b, 0xf8, 0xe6, 0x53, 0x00, 0x00, 0x00, 0xff, 0xff, 0x22,
+	0xb3, 0x0f, 0xc7, 0xbe, 0x07, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/source_info.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/source_info.pb.go
index 12780844..1b04e7ad 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/source_info.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/source_info.pb.go
@@ -1,30 +1,58 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/source_info.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
+import any "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Source information used to create a Service Config
 type SourceInfo struct {
 	// All files used during config generation.
-	SourceFiles []*google_protobuf1.Any `protobuf:"bytes,1,rep,name=source_files,json=sourceFiles" json:"source_files,omitempty"`
+	SourceFiles          []*any.Any `protobuf:"bytes,1,rep,name=source_files,json=sourceFiles,proto3" json:"source_files,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *SourceInfo) Reset()         { *m = SourceInfo{} }
+func (m *SourceInfo) String() string { return proto.CompactTextString(m) }
+func (*SourceInfo) ProtoMessage()    {}
+func (*SourceInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_info_65b7b902b6df926b, []int{0}
+}
+func (m *SourceInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceInfo.Unmarshal(m, b)
+}
+func (m *SourceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceInfo.Marshal(b, m, deterministic)
+}
+func (dst *SourceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceInfo.Merge(dst, src)
+}
+func (m *SourceInfo) XXX_Size() int {
+	return xxx_messageInfo_SourceInfo.Size(m)
+}
+func (m *SourceInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceInfo.DiscardUnknown(m)
 }
 
-func (m *SourceInfo) Reset()                    { *m = SourceInfo{} }
-func (m *SourceInfo) String() string            { return proto.CompactTextString(m) }
-func (*SourceInfo) ProtoMessage()               {}
-func (*SourceInfo) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{0} }
+var xxx_messageInfo_SourceInfo proto.InternalMessageInfo
 
-func (m *SourceInfo) GetSourceFiles() []*google_protobuf1.Any {
+func (m *SourceInfo) GetSourceFiles() []*any.Any {
 	if m != nil {
 		return m.SourceFiles
 	}
@@ -35,9 +63,11 @@ func init() {
 	proto.RegisterType((*SourceInfo)(nil), "google.api.SourceInfo")
 }
 
-func init() { proto.RegisterFile("google/api/source_info.proto", fileDescriptor13) }
+func init() {
+	proto.RegisterFile("google/api/source_info.proto", fileDescriptor_source_info_65b7b902b6df926b)
+}
 
-var fileDescriptor13 = []byte{
+var fileDescriptor_source_info_65b7b902b6df926b = []byte{
 	// 198 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xce, 0x2f, 0x2d, 0x4a, 0x4e, 0x8d, 0xcf, 0xcc,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/system_parameter.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/system_parameter.pb.go
index b3a59853..c5eed1b0 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/system_parameter.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/system_parameter.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/system_parameter.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // ### System parameter configuration
 //
 // A system parameter is a special kind of parameter defined by the API
@@ -48,13 +54,35 @@ type SystemParameters struct {
 	//               http_header: Api-Key2
 	//
 	// **NOTE:** All service configuration rules follow "last one wins" order.
-	Rules []*SystemParameterRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*SystemParameterRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *SystemParameters) Reset()         { *m = SystemParameters{} }
+func (m *SystemParameters) String() string { return proto.CompactTextString(m) }
+func (*SystemParameters) ProtoMessage()    {}
+func (*SystemParameters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_parameter_260dda33a71a8c82, []int{0}
+}
+func (m *SystemParameters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SystemParameters.Unmarshal(m, b)
+}
+func (m *SystemParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SystemParameters.Marshal(b, m, deterministic)
+}
+func (dst *SystemParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemParameters.Merge(dst, src)
+}
+func (m *SystemParameters) XXX_Size() int {
+	return xxx_messageInfo_SystemParameters.Size(m)
+}
+func (m *SystemParameters) XXX_DiscardUnknown() {
+	xxx_messageInfo_SystemParameters.DiscardUnknown(m)
 }
 
-func (m *SystemParameters) Reset()                    { *m = SystemParameters{} }
-func (m *SystemParameters) String() string            { return proto.CompactTextString(m) }
-func (*SystemParameters) ProtoMessage()               {}
-func (*SystemParameters) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{0} }
+var xxx_messageInfo_SystemParameters proto.InternalMessageInfo
 
 func (m *SystemParameters) GetRules() []*SystemParameterRule {
 	if m != nil {
@@ -70,19 +98,41 @@ type SystemParameterRule struct {
 	// methods in all APIs.
 	//
 	// Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
-	Selector string `protobuf:"bytes,1,opt,name=selector" json:"selector,omitempty"`
+	Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"`
 	// Define parameters. Multiple names may be defined for a parameter.
 	// For a given method call, only one of them should be used. If multiple
 	// names are used the behavior is implementation-dependent.
 	// If none of the specified names are present the behavior is
 	// parameter-dependent.
-	Parameters []*SystemParameter `protobuf:"bytes,2,rep,name=parameters" json:"parameters,omitempty"`
+	Parameters           []*SystemParameter `protobuf:"bytes,2,rep,name=parameters,proto3" json:"parameters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *SystemParameterRule) Reset()         { *m = SystemParameterRule{} }
+func (m *SystemParameterRule) String() string { return proto.CompactTextString(m) }
+func (*SystemParameterRule) ProtoMessage()    {}
+func (*SystemParameterRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_parameter_260dda33a71a8c82, []int{1}
+}
+func (m *SystemParameterRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SystemParameterRule.Unmarshal(m, b)
+}
+func (m *SystemParameterRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SystemParameterRule.Marshal(b, m, deterministic)
+}
+func (dst *SystemParameterRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemParameterRule.Merge(dst, src)
+}
+func (m *SystemParameterRule) XXX_Size() int {
+	return xxx_messageInfo_SystemParameterRule.Size(m)
+}
+func (m *SystemParameterRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_SystemParameterRule.DiscardUnknown(m)
 }
 
-func (m *SystemParameterRule) Reset()                    { *m = SystemParameterRule{} }
-func (m *SystemParameterRule) String() string            { return proto.CompactTextString(m) }
-func (*SystemParameterRule) ProtoMessage()               {}
-func (*SystemParameterRule) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{1} }
+var xxx_messageInfo_SystemParameterRule proto.InternalMessageInfo
 
 func (m *SystemParameterRule) GetSelector() string {
 	if m != nil {
@@ -103,19 +153,41 @@ func (m *SystemParameterRule) GetParameters() []*SystemParameter {
 // is implementation-dependent.
 type SystemParameter struct {
 	// Define the name of the parameter, such as "api_key" . It is case sensitive.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Define the HTTP header name to use for the parameter. It is case
 	// insensitive.
-	HttpHeader string `protobuf:"bytes,2,opt,name=http_header,json=httpHeader" json:"http_header,omitempty"`
+	HttpHeader string `protobuf:"bytes,2,opt,name=http_header,json=httpHeader,proto3" json:"http_header,omitempty"`
 	// Define the URL query parameter name to use for the parameter. It is case
 	// sensitive.
-	UrlQueryParameter string `protobuf:"bytes,3,opt,name=url_query_parameter,json=urlQueryParameter" json:"url_query_parameter,omitempty"`
+	UrlQueryParameter    string   `protobuf:"bytes,3,opt,name=url_query_parameter,json=urlQueryParameter,proto3" json:"url_query_parameter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SystemParameter) Reset()         { *m = SystemParameter{} }
+func (m *SystemParameter) String() string { return proto.CompactTextString(m) }
+func (*SystemParameter) ProtoMessage()    {}
+func (*SystemParameter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_system_parameter_260dda33a71a8c82, []int{2}
+}
+func (m *SystemParameter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SystemParameter.Unmarshal(m, b)
+}
+func (m *SystemParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SystemParameter.Marshal(b, m, deterministic)
+}
+func (dst *SystemParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SystemParameter.Merge(dst, src)
+}
+func (m *SystemParameter) XXX_Size() int {
+	return xxx_messageInfo_SystemParameter.Size(m)
+}
+func (m *SystemParameter) XXX_DiscardUnknown() {
+	xxx_messageInfo_SystemParameter.DiscardUnknown(m)
 }
 
-func (m *SystemParameter) Reset()                    { *m = SystemParameter{} }
-func (m *SystemParameter) String() string            { return proto.CompactTextString(m) }
-func (*SystemParameter) ProtoMessage()               {}
-func (*SystemParameter) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{2} }
+var xxx_messageInfo_SystemParameter proto.InternalMessageInfo
 
 func (m *SystemParameter) GetName() string {
 	if m != nil {
@@ -144,9 +216,11 @@ func init() {
 	proto.RegisterType((*SystemParameter)(nil), "google.api.SystemParameter")
 }
 
-func init() { proto.RegisterFile("google/api/system_parameter.proto", fileDescriptor14) }
+func init() {
+	proto.RegisterFile("google/api/system_parameter.proto", fileDescriptor_system_parameter_260dda33a71a8c82)
+}
 
-var fileDescriptor14 = []byte{
+var fileDescriptor_system_parameter_260dda33a71a8c82 = []byte{
 	// 286 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x4e, 0xc3, 0x30,
 	0x10, 0x87, 0x95, 0xb6, 0x20, 0xb8, 0x4a, 0xfc, 0x71, 0x19, 0x22, 0x18, 0x5a, 0x3a, 0x75, 0x72,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/usage.pb.go b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/usage.pb.go
index 1e7d710b..8f8bca17 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/usage.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/serviceconfig/usage.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/usage.proto
 
-package serviceconfig
+package serviceconfig // import "google.golang.org/genproto/googleapis/api/serviceconfig"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,16 +13,22 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Configuration controlling usage of a service.
 type Usage struct {
 	// Requirements that must be satisfied before a consumer project can use the
 	// service. Each requirement is of the form <service.name>/<requirement-id>;
 	// for example 'serviceusage.googleapis.com/billing-enabled'.
-	Requirements []string `protobuf:"bytes,1,rep,name=requirements" json:"requirements,omitempty"`
+	Requirements []string `protobuf:"bytes,1,rep,name=requirements,proto3" json:"requirements,omitempty"`
 	// A list of usage rules that apply to individual API methods.
 	//
 	// **NOTE:** All service configuration rules follow "last one wins" order.
-	Rules []*UsageRule `protobuf:"bytes,6,rep,name=rules" json:"rules,omitempty"`
+	Rules []*UsageRule `protobuf:"bytes,6,rep,name=rules,proto3" json:"rules,omitempty"`
 	// The full resource name of a channel used for sending notifications to the
 	// service producer.
 	//
@@ -31,13 +37,35 @@ type Usage struct {
 	// channel. To use Google Cloud Pub/Sub as the channel, this must be the name
 	// of a Cloud Pub/Sub topic that uses the Cloud Pub/Sub topic name format
 	// documented in https://cloud.google.com/pubsub/docs/overview.
-	ProducerNotificationChannel string `protobuf:"bytes,7,opt,name=producer_notification_channel,json=producerNotificationChannel" json:"producer_notification_channel,omitempty"`
+	ProducerNotificationChannel string   `protobuf:"bytes,7,opt,name=producer_notification_channel,json=producerNotificationChannel,proto3" json:"producer_notification_channel,omitempty"`
+	XXX_NoUnkeyedLiteral        struct{} `json:"-"`
+	XXX_unrecognized            []byte   `json:"-"`
+	XXX_sizecache               int32    `json:"-"`
+}
+
+func (m *Usage) Reset()         { *m = Usage{} }
+func (m *Usage) String() string { return proto.CompactTextString(m) }
+func (*Usage) ProtoMessage()    {}
+func (*Usage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_usage_d93cb687fa4d5498, []int{0}
+}
+func (m *Usage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Usage.Unmarshal(m, b)
+}
+func (m *Usage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Usage.Marshal(b, m, deterministic)
+}
+func (dst *Usage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Usage.Merge(dst, src)
+}
+func (m *Usage) XXX_Size() int {
+	return xxx_messageInfo_Usage.Size(m)
+}
+func (m *Usage) XXX_DiscardUnknown() {
+	xxx_messageInfo_Usage.DiscardUnknown(m)
 }
 
-func (m *Usage) Reset()                    { *m = Usage{} }
-func (m *Usage) String() string            { return proto.CompactTextString(m) }
-func (*Usage) ProtoMessage()               {}
-func (*Usage) Descriptor() ([]byte, []int) { return fileDescriptor15, []int{0} }
+var xxx_messageInfo_Usage proto.InternalMessageInfo
 
 func (m *Usage) GetRequirements() []string {
 	if m != nil {
@@ -90,18 +118,43 @@ type UsageRule struct {
 	// methods in all APIs.
 	//
 	// Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
-	Selector string `protobuf:"bytes,1,opt,name=selector" json:"selector,omitempty"`
-	// True, if the method allows unregistered calls; false otherwise.
-	AllowUnregisteredCalls bool `protobuf:"varint,2,opt,name=allow_unregistered_calls,json=allowUnregisteredCalls" json:"allow_unregistered_calls,omitempty"`
-	// True, if the method should skip service control. If so, no control plane
-	// feature (like quota and billing) will be enabled.
-	SkipServiceControl bool `protobuf:"varint,3,opt,name=skip_service_control,json=skipServiceControl" json:"skip_service_control,omitempty"`
+	Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"`
+	// If true, the selected method allows unregistered calls, e.g. calls
+	// that don't identify any user or application.
+	AllowUnregisteredCalls bool `protobuf:"varint,2,opt,name=allow_unregistered_calls,json=allowUnregisteredCalls,proto3" json:"allow_unregistered_calls,omitempty"`
+	// If true, the selected method should skip service control and the control
+	// plane features, such as quota and billing, will not be available.
+	// This flag is used by Google Cloud Endpoints to bypass checks for internal
+	// methods, such as service health check methods.
+	SkipServiceControl   bool     `protobuf:"varint,3,opt,name=skip_service_control,json=skipServiceControl,proto3" json:"skip_service_control,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UsageRule) Reset()         { *m = UsageRule{} }
+func (m *UsageRule) String() string { return proto.CompactTextString(m) }
+func (*UsageRule) ProtoMessage()    {}
+func (*UsageRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_usage_d93cb687fa4d5498, []int{1}
+}
+func (m *UsageRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UsageRule.Unmarshal(m, b)
+}
+func (m *UsageRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UsageRule.Marshal(b, m, deterministic)
+}
+func (dst *UsageRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UsageRule.Merge(dst, src)
+}
+func (m *UsageRule) XXX_Size() int {
+	return xxx_messageInfo_UsageRule.Size(m)
+}
+func (m *UsageRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_UsageRule.DiscardUnknown(m)
 }
 
-func (m *UsageRule) Reset()                    { *m = UsageRule{} }
-func (m *UsageRule) String() string            { return proto.CompactTextString(m) }
-func (*UsageRule) ProtoMessage()               {}
-func (*UsageRule) Descriptor() ([]byte, []int) { return fileDescriptor15, []int{1} }
+var xxx_messageInfo_UsageRule proto.InternalMessageInfo
 
 func (m *UsageRule) GetSelector() string {
 	if m != nil {
@@ -129,9 +182,9 @@ func init() {
 	proto.RegisterType((*UsageRule)(nil), "google.api.UsageRule")
 }
 
-func init() { proto.RegisterFile("google/api/usage.proto", fileDescriptor15) }
+func init() { proto.RegisterFile("google/api/usage.proto", fileDescriptor_usage_d93cb687fa4d5498) }
 
-var fileDescriptor15 = []byte{
+var fileDescriptor_usage_d93cb687fa4d5498 = []byte{
 	// 331 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xc1, 0x4b, 0xfb, 0x30,
 	0x14, 0xc7, 0xe9, 0xf6, 0xdb, 0x7e, 0x5b, 0x14, 0x0f, 0x41, 0x47, 0x99, 0x0a, 0x65, 0xa7, 0x82,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/check_error.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/check_error.pb.go
index cadea877..dcb474ec 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/check_error.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/check_error.pb.go
@@ -1,35 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/check_error.proto
 
-/*
-Package servicecontrol is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/servicecontrol/v1/check_error.proto
-	google/api/servicecontrol/v1/distribution.proto
-	google/api/servicecontrol/v1/log_entry.proto
-	google/api/servicecontrol/v1/metric_value.proto
-	google/api/servicecontrol/v1/operation.proto
-	google/api/servicecontrol/v1/quota_controller.proto
-	google/api/servicecontrol/v1/service_controller.proto
-
-It has these top-level messages:
-	CheckError
-	Distribution
-	LogEntry
-	MetricValue
-	MetricValueSet
-	Operation
-	AllocateQuotaRequest
-	QuotaOperation
-	AllocateQuotaResponse
-	QuotaError
-	CheckRequest
-	CheckResponse
-	ReportRequest
-	ReportResponse
-*/
-package servicecontrol
+package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -134,21 +106,45 @@ var CheckError_Code_value = map[string]int32{
 func (x CheckError_Code) String() string {
 	return proto.EnumName(CheckError_Code_name, int32(x))
 }
-func (CheckError_Code) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (CheckError_Code) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_check_error_1be1bde99e60d1aa, []int{0, 0}
+}
 
 // Defines the errors to be returned in
 // [google.api.servicecontrol.v1.CheckResponse.check_errors][google.api.servicecontrol.v1.CheckResponse.check_errors].
 type CheckError struct {
 	// The error code.
-	Code CheckError_Code `protobuf:"varint,1,opt,name=code,enum=google.api.servicecontrol.v1.CheckError_Code" json:"code,omitempty"`
+	Code CheckError_Code `protobuf:"varint,1,opt,name=code,proto3,enum=google.api.servicecontrol.v1.CheckError_Code" json:"code,omitempty"`
 	// Free-form text providing details on the error cause of the error.
-	Detail string `protobuf:"bytes,2,opt,name=detail" json:"detail,omitempty"`
+	Detail               string   `protobuf:"bytes,2,opt,name=detail,proto3" json:"detail,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CheckError) Reset()         { *m = CheckError{} }
+func (m *CheckError) String() string { return proto.CompactTextString(m) }
+func (*CheckError) ProtoMessage()    {}
+func (*CheckError) Descriptor() ([]byte, []int) {
+	return fileDescriptor_check_error_1be1bde99e60d1aa, []int{0}
+}
+func (m *CheckError) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckError.Unmarshal(m, b)
+}
+func (m *CheckError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckError.Marshal(b, m, deterministic)
+}
+func (dst *CheckError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckError.Merge(dst, src)
+}
+func (m *CheckError) XXX_Size() int {
+	return xxx_messageInfo_CheckError.Size(m)
+}
+func (m *CheckError) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckError.DiscardUnknown(m)
 }
 
-func (m *CheckError) Reset()                    { *m = CheckError{} }
-func (m *CheckError) String() string            { return proto.CompactTextString(m) }
-func (*CheckError) ProtoMessage()               {}
-func (*CheckError) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_CheckError proto.InternalMessageInfo
 
 func (m *CheckError) GetCode() CheckError_Code {
 	if m != nil {
@@ -169,9 +165,11 @@ func init() {
 	proto.RegisterEnum("google.api.servicecontrol.v1.CheckError_Code", CheckError_Code_name, CheckError_Code_value)
 }
 
-func init() { proto.RegisterFile("google/api/servicecontrol/v1/check_error.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/api/servicecontrol/v1/check_error.proto", fileDescriptor_check_error_1be1bde99e60d1aa)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_check_error_1be1bde99e60d1aa = []byte{
 	// 484 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xdd, 0x6e, 0xd3, 0x3e,
 	0x18, 0xc6, 0xff, 0xe9, 0xbf, 0x0c, 0x66, 0x09, 0x16, 0x0c, 0xab, 0x46, 0x55, 0x89, 0xb2, 0xa3,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/distribution.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/distribution.pb.go
index a4193182..d84574fe 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/distribution.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/distribution.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/distribution.proto
 
-package servicecontrol
+package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Distribution represents a frequency distribution of double-valued sample
 // points. It contains the size of the population of sample points plus
 // additional optional information:
@@ -22,19 +28,19 @@ var _ = math.Inf
 //   - a histogram of the values of the sample points
 type Distribution struct {
 	// The total number of samples in the distribution. Must be >= 0.
-	Count int64 `protobuf:"varint,1,opt,name=count" json:"count,omitempty"`
+	Count int64 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
 	// The arithmetic mean of the samples in the distribution. If `count` is
 	// zero then this field must be zero.
-	Mean float64 `protobuf:"fixed64,2,opt,name=mean" json:"mean,omitempty"`
+	Mean float64 `protobuf:"fixed64,2,opt,name=mean,proto3" json:"mean,omitempty"`
 	// The minimum of the population of values. Ignored if `count` is zero.
-	Minimum float64 `protobuf:"fixed64,3,opt,name=minimum" json:"minimum,omitempty"`
+	Minimum float64 `protobuf:"fixed64,3,opt,name=minimum,proto3" json:"minimum,omitempty"`
 	// The maximum of the population of values. Ignored if `count` is zero.
-	Maximum float64 `protobuf:"fixed64,4,opt,name=maximum" json:"maximum,omitempty"`
+	Maximum float64 `protobuf:"fixed64,4,opt,name=maximum,proto3" json:"maximum,omitempty"`
 	// The sum of squared deviations from the mean:
 	//   Sum[i=1..count]((x_i - mean)^2)
 	// where each x_i is a sample values. If `count` is zero then this field
 	// must be zero, otherwise validation of the request fails.
-	SumOfSquaredDeviation float64 `protobuf:"fixed64,5,opt,name=sum_of_squared_deviation,json=sumOfSquaredDeviation" json:"sum_of_squared_deviation,omitempty"`
+	SumOfSquaredDeviation float64 `protobuf:"fixed64,5,opt,name=sum_of_squared_deviation,json=sumOfSquaredDeviation,proto3" json:"sum_of_squared_deviation,omitempty"`
 	// The number of samples in each histogram bucket. `bucket_counts` are
 	// optional. If present, they must sum to the `count` value.
 	//
@@ -46,7 +52,7 @@ type Distribution struct {
 	// below for more details.
 	//
 	// Any suffix of trailing zeros may be omitted.
-	BucketCounts []int64 `protobuf:"varint,6,rep,packed,name=bucket_counts,json=bucketCounts" json:"bucket_counts,omitempty"`
+	BucketCounts []int64 `protobuf:"varint,6,rep,packed,name=bucket_counts,json=bucketCounts,proto3" json:"bucket_counts,omitempty"`
 	// Defines the buckets in the histogram. `bucket_option` and `bucket_counts`
 	// must be both set, or both unset.
 	//
@@ -75,38 +81,35 @@ type Distribution struct {
 	//	*Distribution_LinearBuckets_
 	//	*Distribution_ExponentialBuckets_
 	//	*Distribution_ExplicitBuckets_
-	BucketOption isDistribution_BucketOption `protobuf_oneof:"bucket_option"`
+	BucketOption         isDistribution_BucketOption `protobuf_oneof:"bucket_option"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
-func (m *Distribution) Reset()                    { *m = Distribution{} }
-func (m *Distribution) String() string            { return proto.CompactTextString(m) }
-func (*Distribution) ProtoMessage()               {}
-func (*Distribution) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-type isDistribution_BucketOption interface {
-	isDistribution_BucketOption()
+func (m *Distribution) Reset()         { *m = Distribution{} }
+func (m *Distribution) String() string { return proto.CompactTextString(m) }
+func (*Distribution) ProtoMessage()    {}
+func (*Distribution) Descriptor() ([]byte, []int) {
+	return fileDescriptor_distribution_dac88fdcde0e4047, []int{0}
 }
-
-type Distribution_LinearBuckets_ struct {
-	LinearBuckets *Distribution_LinearBuckets `protobuf:"bytes,7,opt,name=linear_buckets,json=linearBuckets,oneof"`
+func (m *Distribution) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution.Unmarshal(m, b)
 }
-type Distribution_ExponentialBuckets_ struct {
-	ExponentialBuckets *Distribution_ExponentialBuckets `protobuf:"bytes,8,opt,name=exponential_buckets,json=exponentialBuckets,oneof"`
+func (m *Distribution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution.Marshal(b, m, deterministic)
 }
-type Distribution_ExplicitBuckets_ struct {
-	ExplicitBuckets *Distribution_ExplicitBuckets `protobuf:"bytes,9,opt,name=explicit_buckets,json=explicitBuckets,oneof"`
+func (dst *Distribution) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution.Merge(dst, src)
 }
-
-func (*Distribution_LinearBuckets_) isDistribution_BucketOption()      {}
-func (*Distribution_ExponentialBuckets_) isDistribution_BucketOption() {}
-func (*Distribution_ExplicitBuckets_) isDistribution_BucketOption()    {}
-
-func (m *Distribution) GetBucketOption() isDistribution_BucketOption {
-	if m != nil {
-		return m.BucketOption
-	}
-	return nil
+func (m *Distribution) XXX_Size() int {
+	return xxx_messageInfo_Distribution.Size(m)
 }
+func (m *Distribution) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Distribution proto.InternalMessageInfo
 
 func (m *Distribution) GetCount() int64 {
 	if m != nil {
@@ -150,6 +153,35 @@ func (m *Distribution) GetBucketCounts() []int64 {
 	return nil
 }
 
+type isDistribution_BucketOption interface {
+	isDistribution_BucketOption()
+}
+
+type Distribution_LinearBuckets_ struct {
+	LinearBuckets *Distribution_LinearBuckets `protobuf:"bytes,7,opt,name=linear_buckets,json=linearBuckets,proto3,oneof"`
+}
+
+type Distribution_ExponentialBuckets_ struct {
+	ExponentialBuckets *Distribution_ExponentialBuckets `protobuf:"bytes,8,opt,name=exponential_buckets,json=exponentialBuckets,proto3,oneof"`
+}
+
+type Distribution_ExplicitBuckets_ struct {
+	ExplicitBuckets *Distribution_ExplicitBuckets `protobuf:"bytes,9,opt,name=explicit_buckets,json=explicitBuckets,proto3,oneof"`
+}
+
+func (*Distribution_LinearBuckets_) isDistribution_BucketOption() {}
+
+func (*Distribution_ExponentialBuckets_) isDistribution_BucketOption() {}
+
+func (*Distribution_ExplicitBuckets_) isDistribution_BucketOption() {}
+
+func (m *Distribution) GetBucketOption() isDistribution_BucketOption {
+	if m != nil {
+		return m.BucketOption
+	}
+	return nil
+}
+
 func (m *Distribution) GetLinearBuckets() *Distribution_LinearBuckets {
 	if x, ok := m.GetBucketOption().(*Distribution_LinearBuckets_); ok {
 		return x.LinearBuckets
@@ -244,17 +276,17 @@ func _Distribution_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.BucketOption.(type) {
 	case *Distribution_LinearBuckets_:
 		s := proto.Size(x.LinearBuckets)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Distribution_ExponentialBuckets_:
 		s := proto.Size(x.ExponentialBuckets)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Distribution_ExplicitBuckets_:
 		s := proto.Size(x.ExplicitBuckets)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -269,22 +301,44 @@ type Distribution_LinearBuckets struct {
 	// The number of finite buckets. With the underflow and overflow buckets,
 	// the total number of buckets is `num_finite_buckets` + 2.
 	// See comments on `bucket_options` for details.
-	NumFiniteBuckets int32 `protobuf:"varint,1,opt,name=num_finite_buckets,json=numFiniteBuckets" json:"num_finite_buckets,omitempty"`
+	NumFiniteBuckets int32 `protobuf:"varint,1,opt,name=num_finite_buckets,json=numFiniteBuckets,proto3" json:"num_finite_buckets,omitempty"`
 	// The i'th linear bucket covers the interval
 	//   [offset + (i-1) * width, offset + i * width)
 	// where i ranges from 1 to num_finite_buckets, inclusive.
 	// Must be strictly positive.
-	Width float64 `protobuf:"fixed64,2,opt,name=width" json:"width,omitempty"`
+	Width float64 `protobuf:"fixed64,2,opt,name=width,proto3" json:"width,omitempty"`
 	// The i'th linear bucket covers the interval
 	//   [offset + (i-1) * width, offset + i * width)
 	// where i ranges from 1 to num_finite_buckets, inclusive.
-	Offset float64 `protobuf:"fixed64,3,opt,name=offset" json:"offset,omitempty"`
+	Offset               float64  `protobuf:"fixed64,3,opt,name=offset,proto3" json:"offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Distribution_LinearBuckets) Reset()         { *m = Distribution_LinearBuckets{} }
+func (m *Distribution_LinearBuckets) String() string { return proto.CompactTextString(m) }
+func (*Distribution_LinearBuckets) ProtoMessage()    {}
+func (*Distribution_LinearBuckets) Descriptor() ([]byte, []int) {
+	return fileDescriptor_distribution_dac88fdcde0e4047, []int{0, 0}
+}
+func (m *Distribution_LinearBuckets) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution_LinearBuckets.Unmarshal(m, b)
+}
+func (m *Distribution_LinearBuckets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution_LinearBuckets.Marshal(b, m, deterministic)
+}
+func (dst *Distribution_LinearBuckets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_LinearBuckets.Merge(dst, src)
+}
+func (m *Distribution_LinearBuckets) XXX_Size() int {
+	return xxx_messageInfo_Distribution_LinearBuckets.Size(m)
+}
+func (m *Distribution_LinearBuckets) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution_LinearBuckets.DiscardUnknown(m)
 }
 
-func (m *Distribution_LinearBuckets) Reset()                    { *m = Distribution_LinearBuckets{} }
-func (m *Distribution_LinearBuckets) String() string            { return proto.CompactTextString(m) }
-func (*Distribution_LinearBuckets) ProtoMessage()               {}
-func (*Distribution_LinearBuckets) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+var xxx_messageInfo_Distribution_LinearBuckets proto.InternalMessageInfo
 
 func (m *Distribution_LinearBuckets) GetNumFiniteBuckets() int32 {
 	if m != nil {
@@ -312,26 +366,46 @@ type Distribution_ExponentialBuckets struct {
 	// The number of finite buckets. With the underflow and overflow buckets,
 	// the total number of buckets is `num_finite_buckets` + 2.
 	// See comments on `bucket_options` for details.
-	NumFiniteBuckets int32 `protobuf:"varint,1,opt,name=num_finite_buckets,json=numFiniteBuckets" json:"num_finite_buckets,omitempty"`
+	NumFiniteBuckets int32 `protobuf:"varint,1,opt,name=num_finite_buckets,json=numFiniteBuckets,proto3" json:"num_finite_buckets,omitempty"`
 	// The i'th exponential bucket covers the interval
 	//   [scale * growth_factor^(i-1), scale * growth_factor^i)
 	// where i ranges from 1 to num_finite_buckets inclusive.
 	// Must be larger than 1.0.
-	GrowthFactor float64 `protobuf:"fixed64,2,opt,name=growth_factor,json=growthFactor" json:"growth_factor,omitempty"`
+	GrowthFactor float64 `protobuf:"fixed64,2,opt,name=growth_factor,json=growthFactor,proto3" json:"growth_factor,omitempty"`
 	// The i'th exponential bucket covers the interval
 	//   [scale * growth_factor^(i-1), scale * growth_factor^i)
 	// where i ranges from 1 to num_finite_buckets inclusive.
 	// Must be > 0.
-	Scale float64 `protobuf:"fixed64,3,opt,name=scale" json:"scale,omitempty"`
+	Scale                float64  `protobuf:"fixed64,3,opt,name=scale,proto3" json:"scale,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Distribution_ExponentialBuckets) Reset()         { *m = Distribution_ExponentialBuckets{} }
 func (m *Distribution_ExponentialBuckets) String() string { return proto.CompactTextString(m) }
 func (*Distribution_ExponentialBuckets) ProtoMessage()    {}
 func (*Distribution_ExponentialBuckets) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{0, 1}
+	return fileDescriptor_distribution_dac88fdcde0e4047, []int{0, 1}
+}
+func (m *Distribution_ExponentialBuckets) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution_ExponentialBuckets.Unmarshal(m, b)
+}
+func (m *Distribution_ExponentialBuckets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution_ExponentialBuckets.Marshal(b, m, deterministic)
+}
+func (dst *Distribution_ExponentialBuckets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_ExponentialBuckets.Merge(dst, src)
+}
+func (m *Distribution_ExponentialBuckets) XXX_Size() int {
+	return xxx_messageInfo_Distribution_ExponentialBuckets.Size(m)
+}
+func (m *Distribution_ExponentialBuckets) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution_ExponentialBuckets.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Distribution_ExponentialBuckets proto.InternalMessageInfo
+
 func (m *Distribution_ExponentialBuckets) GetNumFiniteBuckets() int32 {
 	if m != nil {
 		return m.NumFiniteBuckets
@@ -370,13 +444,35 @@ type Distribution_ExplicitBuckets struct {
 	//  i == 0 (underflow)              -inf           bound[i]
 	//  0 < i < bound_size()            bound[i-1]     bound[i]
 	//  i == bound_size() (overflow)    bound[i-1]     +inf
-	Bounds []float64 `protobuf:"fixed64,1,rep,packed,name=bounds" json:"bounds,omitempty"`
+	Bounds               []float64 `protobuf:"fixed64,1,rep,packed,name=bounds,proto3" json:"bounds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *Distribution_ExplicitBuckets) Reset()         { *m = Distribution_ExplicitBuckets{} }
+func (m *Distribution_ExplicitBuckets) String() string { return proto.CompactTextString(m) }
+func (*Distribution_ExplicitBuckets) ProtoMessage()    {}
+func (*Distribution_ExplicitBuckets) Descriptor() ([]byte, []int) {
+	return fileDescriptor_distribution_dac88fdcde0e4047, []int{0, 2}
+}
+func (m *Distribution_ExplicitBuckets) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Distribution_ExplicitBuckets.Unmarshal(m, b)
+}
+func (m *Distribution_ExplicitBuckets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Distribution_ExplicitBuckets.Marshal(b, m, deterministic)
+}
+func (dst *Distribution_ExplicitBuckets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Distribution_ExplicitBuckets.Merge(dst, src)
+}
+func (m *Distribution_ExplicitBuckets) XXX_Size() int {
+	return xxx_messageInfo_Distribution_ExplicitBuckets.Size(m)
+}
+func (m *Distribution_ExplicitBuckets) XXX_DiscardUnknown() {
+	xxx_messageInfo_Distribution_ExplicitBuckets.DiscardUnknown(m)
 }
 
-func (m *Distribution_ExplicitBuckets) Reset()                    { *m = Distribution_ExplicitBuckets{} }
-func (m *Distribution_ExplicitBuckets) String() string            { return proto.CompactTextString(m) }
-func (*Distribution_ExplicitBuckets) ProtoMessage()               {}
-func (*Distribution_ExplicitBuckets) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 2} }
+var xxx_messageInfo_Distribution_ExplicitBuckets proto.InternalMessageInfo
 
 func (m *Distribution_ExplicitBuckets) GetBounds() []float64 {
 	if m != nil {
@@ -392,9 +488,11 @@ func init() {
 	proto.RegisterType((*Distribution_ExplicitBuckets)(nil), "google.api.servicecontrol.v1.Distribution.ExplicitBuckets")
 }
 
-func init() { proto.RegisterFile("google/api/servicecontrol/v1/distribution.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/api/servicecontrol/v1/distribution.proto", fileDescriptor_distribution_dac88fdcde0e4047)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_distribution_dac88fdcde0e4047 = []byte{
 	// 486 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4d, 0x6f, 0xd3, 0x40,
 	0x10, 0x86, 0x31, 0x6e, 0x52, 0x18, 0x12, 0x52, 0x96, 0x82, 0xac, 0x88, 0x83, 0x45, 0x2f, 0x41,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/log_entry.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/log_entry.pb.go
index 727a19b6..a5d31819 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/log_entry.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/log_entry.pb.go
@@ -1,78 +1,81 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/log_entry.proto
 
-package servicecontrol
+package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_logging_type "google.golang.org/genproto/googleapis/logging/type"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
+import _type "google.golang.org/genproto/googleapis/logging/type"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // An individual log entry.
 type LogEntry struct {
 	// Required. The log to which this log entry belongs. Examples: `"syslog"`,
 	// `"book_log"`.
-	Name string `protobuf:"bytes,10,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,10,opt,name=name,proto3" json:"name,omitempty"`
 	// The time the event described by the log entry occurred. If
 	// omitted, defaults to operation start time.
-	Timestamp *google_protobuf3.Timestamp `protobuf:"bytes,11,opt,name=timestamp" json:"timestamp,omitempty"`
+	Timestamp *timestamp.Timestamp `protobuf:"bytes,11,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	// The severity of the log entry. The default value is
 	// `LogSeverity.DEFAULT`.
-	Severity google_logging_type.LogSeverity `protobuf:"varint,12,opt,name=severity,enum=google.logging.type.LogSeverity" json:"severity,omitempty"`
+	Severity _type.LogSeverity `protobuf:"varint,12,opt,name=severity,proto3,enum=google.logging.type.LogSeverity" json:"severity,omitempty"`
 	// A unique ID for the log entry used for deduplication. If omitted,
 	// the implementation will generate one based on operation_id.
-	InsertId string `protobuf:"bytes,4,opt,name=insert_id,json=insertId" json:"insert_id,omitempty"`
+	InsertId string `protobuf:"bytes,4,opt,name=insert_id,json=insertId,proto3" json:"insert_id,omitempty"`
 	// A set of user-defined (key, value) data that provides additional
 	// information about the log entry.
-	Labels map[string]string `protobuf:"bytes,13,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,13,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The log entry payload, which can be one of multiple types.
 	//
 	// Types that are valid to be assigned to Payload:
 	//	*LogEntry_ProtoPayload
 	//	*LogEntry_TextPayload
 	//	*LogEntry_StructPayload
-	Payload isLogEntry_Payload `protobuf_oneof:"payload"`
+	Payload              isLogEntry_Payload `protobuf_oneof:"payload"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *LogEntry) Reset()                    { *m = LogEntry{} }
-func (m *LogEntry) String() string            { return proto.CompactTextString(m) }
-func (*LogEntry) ProtoMessage()               {}
-func (*LogEntry) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
-
-type isLogEntry_Payload interface {
-	isLogEntry_Payload()
+func (m *LogEntry) Reset()         { *m = LogEntry{} }
+func (m *LogEntry) String() string { return proto.CompactTextString(m) }
+func (*LogEntry) ProtoMessage()    {}
+func (*LogEntry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_log_entry_1cf8a0cea23f865a, []int{0}
 }
-
-type LogEntry_ProtoPayload struct {
-	ProtoPayload *google_protobuf1.Any `protobuf:"bytes,2,opt,name=proto_payload,json=protoPayload,oneof"`
+func (m *LogEntry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogEntry.Unmarshal(m, b)
 }
-type LogEntry_TextPayload struct {
-	TextPayload string `protobuf:"bytes,3,opt,name=text_payload,json=textPayload,oneof"`
+func (m *LogEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogEntry.Marshal(b, m, deterministic)
 }
-type LogEntry_StructPayload struct {
-	StructPayload *google_protobuf2.Struct `protobuf:"bytes,6,opt,name=struct_payload,json=structPayload,oneof"`
+func (dst *LogEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogEntry.Merge(dst, src)
 }
-
-func (*LogEntry_ProtoPayload) isLogEntry_Payload()  {}
-func (*LogEntry_TextPayload) isLogEntry_Payload()   {}
-func (*LogEntry_StructPayload) isLogEntry_Payload() {}
-
-func (m *LogEntry) GetPayload() isLogEntry_Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
+func (m *LogEntry) XXX_Size() int {
+	return xxx_messageInfo_LogEntry.Size(m)
+}
+func (m *LogEntry) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogEntry.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_LogEntry proto.InternalMessageInfo
+
 func (m *LogEntry) GetName() string {
 	if m != nil {
 		return m.Name
@@ -80,18 +83,18 @@ func (m *LogEntry) GetName() string {
 	return ""
 }
 
-func (m *LogEntry) GetTimestamp() *google_protobuf3.Timestamp {
+func (m *LogEntry) GetTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.Timestamp
 	}
 	return nil
 }
 
-func (m *LogEntry) GetSeverity() google_logging_type.LogSeverity {
+func (m *LogEntry) GetSeverity() _type.LogSeverity {
 	if m != nil {
 		return m.Severity
 	}
-	return google_logging_type.LogSeverity_DEFAULT
+	return _type.LogSeverity_DEFAULT
 }
 
 func (m *LogEntry) GetInsertId() string {
@@ -108,7 +111,36 @@ func (m *LogEntry) GetLabels() map[string]string {
 	return nil
 }
 
-func (m *LogEntry) GetProtoPayload() *google_protobuf1.Any {
+type isLogEntry_Payload interface {
+	isLogEntry_Payload()
+}
+
+type LogEntry_ProtoPayload struct {
+	ProtoPayload *any.Any `protobuf:"bytes,2,opt,name=proto_payload,json=protoPayload,proto3,oneof"`
+}
+
+type LogEntry_TextPayload struct {
+	TextPayload string `protobuf:"bytes,3,opt,name=text_payload,json=textPayload,proto3,oneof"`
+}
+
+type LogEntry_StructPayload struct {
+	StructPayload *_struct.Struct `protobuf:"bytes,6,opt,name=struct_payload,json=structPayload,proto3,oneof"`
+}
+
+func (*LogEntry_ProtoPayload) isLogEntry_Payload() {}
+
+func (*LogEntry_TextPayload) isLogEntry_Payload() {}
+
+func (*LogEntry_StructPayload) isLogEntry_Payload() {}
+
+func (m *LogEntry) GetPayload() isLogEntry_Payload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (m *LogEntry) GetProtoPayload() *any.Any {
 	if x, ok := m.GetPayload().(*LogEntry_ProtoPayload); ok {
 		return x.ProtoPayload
 	}
@@ -122,7 +154,7 @@ func (m *LogEntry) GetTextPayload() string {
 	return ""
 }
 
-func (m *LogEntry) GetStructPayload() *google_protobuf2.Struct {
+func (m *LogEntry) GetStructPayload() *_struct.Struct {
 	if x, ok := m.GetPayload().(*LogEntry_StructPayload); ok {
 		return x.StructPayload
 	}
@@ -169,7 +201,7 @@ func _LogEntry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Any)
+		msg := new(any.Any)
 		err := b.DecodeMessage(msg)
 		m.Payload = &LogEntry_ProtoPayload{msg}
 		return true, err
@@ -184,7 +216,7 @@ func _LogEntry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf2.Struct)
+		msg := new(_struct.Struct)
 		err := b.DecodeMessage(msg)
 		m.Payload = &LogEntry_StructPayload{msg}
 		return true, err
@@ -199,16 +231,16 @@ func _LogEntry_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Payload.(type) {
 	case *LogEntry_ProtoPayload:
 		s := proto.Size(x.ProtoPayload)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *LogEntry_TextPayload:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.TextPayload)))
 		n += len(x.TextPayload)
 	case *LogEntry_StructPayload:
 		s := proto.Size(x.StructPayload)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -220,11 +252,14 @@ func _LogEntry_OneofSizer(msg proto.Message) (n int) {
 
 func init() {
 	proto.RegisterType((*LogEntry)(nil), "google.api.servicecontrol.v1.LogEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.api.servicecontrol.v1.LogEntry.LabelsEntry")
 }
 
-func init() { proto.RegisterFile("google/api/servicecontrol/v1/log_entry.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/api/servicecontrol/v1/log_entry.proto", fileDescriptor_log_entry_1cf8a0cea23f865a)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_log_entry_1cf8a0cea23f865a = []byte{
 	// 454 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x4f, 0x8f, 0xd3, 0x30,
 	0x10, 0xc5, 0x9b, 0xed, 0x52, 0x1a, 0xa7, 0x5d, 0x21, 0x6b, 0x25, 0x42, 0xa8, 0x44, 0x04, 0x12,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/metric_value.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/metric_value.pb.go
index ab7ccb1e..5bd3b8e0 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/metric_value.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/metric_value.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/metric_value.proto
 
-package servicecontrol
+package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/type/money"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -15,20 +15,26 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Represents a single metric value.
 type MetricValue struct {
 	// The labels describing the metric value.
 	// See comments on [google.api.servicecontrol.v1.Operation.labels][google.api.servicecontrol.v1.Operation.labels] for
 	// the overriding relationship.
-	Labels map[string]string `protobuf:"bytes,1,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The start of the time period over which this metric value's measurement
 	// applies. The time period has different semantics for different metric
 	// types (cumulative, delta, and gauge). See the metric definition
 	// documentation in the service configuration for details.
-	StartTime *google_protobuf3.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The end of the time period over which this metric value's measurement
 	// applies.
-	EndTime *google_protobuf3.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The value. The type of value used in the request must
 	// agree with the metric definition in the service configuration, otherwise
 	// the MetricValue is rejected.
@@ -39,64 +45,94 @@ type MetricValue struct {
 	//	*MetricValue_DoubleValue
 	//	*MetricValue_StringValue
 	//	*MetricValue_DistributionValue
-	Value isMetricValue_Value `protobuf_oneof:"value"`
+	Value                isMetricValue_Value `protobuf_oneof:"value"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *MetricValue) Reset()                    { *m = MetricValue{} }
-func (m *MetricValue) String() string            { return proto.CompactTextString(m) }
-func (*MetricValue) ProtoMessage()               {}
-func (*MetricValue) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
-
-type isMetricValue_Value interface {
-	isMetricValue_Value()
+func (m *MetricValue) Reset()         { *m = MetricValue{} }
+func (m *MetricValue) String() string { return proto.CompactTextString(m) }
+func (*MetricValue) ProtoMessage()    {}
+func (*MetricValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_value_8054f3e00bcbeeb9, []int{0}
 }
-
-type MetricValue_BoolValue struct {
-	BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,oneof"`
+func (m *MetricValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MetricValue.Unmarshal(m, b)
 }
-type MetricValue_Int64Value struct {
-	Int64Value int64 `protobuf:"varint,5,opt,name=int64_value,json=int64Value,oneof"`
+func (m *MetricValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MetricValue.Marshal(b, m, deterministic)
 }
-type MetricValue_DoubleValue struct {
-	DoubleValue float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue,oneof"`
+func (dst *MetricValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricValue.Merge(dst, src)
 }
-type MetricValue_StringValue struct {
-	StringValue string `protobuf:"bytes,7,opt,name=string_value,json=stringValue,oneof"`
+func (m *MetricValue) XXX_Size() int {
+	return xxx_messageInfo_MetricValue.Size(m)
 }
-type MetricValue_DistributionValue struct {
-	DistributionValue *Distribution `protobuf:"bytes,8,opt,name=distribution_value,json=distributionValue,oneof"`
+func (m *MetricValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_MetricValue.DiscardUnknown(m)
 }
 
-func (*MetricValue_BoolValue) isMetricValue_Value()         {}
-func (*MetricValue_Int64Value) isMetricValue_Value()        {}
-func (*MetricValue_DoubleValue) isMetricValue_Value()       {}
-func (*MetricValue_StringValue) isMetricValue_Value()       {}
-func (*MetricValue_DistributionValue) isMetricValue_Value() {}
+var xxx_messageInfo_MetricValue proto.InternalMessageInfo
 
-func (m *MetricValue) GetValue() isMetricValue_Value {
+func (m *MetricValue) GetLabels() map[string]string {
 	if m != nil {
-		return m.Value
+		return m.Labels
 	}
 	return nil
 }
 
-func (m *MetricValue) GetLabels() map[string]string {
+func (m *MetricValue) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
-		return m.Labels
+		return m.StartTime
 	}
 	return nil
 }
 
-func (m *MetricValue) GetStartTime() *google_protobuf3.Timestamp {
+func (m *MetricValue) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
-		return m.StartTime
+		return m.EndTime
 	}
 	return nil
 }
 
-func (m *MetricValue) GetEndTime() *google_protobuf3.Timestamp {
+type isMetricValue_Value interface {
+	isMetricValue_Value()
+}
+
+type MetricValue_BoolValue struct {
+	BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,proto3,oneof"`
+}
+
+type MetricValue_Int64Value struct {
+	Int64Value int64 `protobuf:"varint,5,opt,name=int64_value,json=int64Value,proto3,oneof"`
+}
+
+type MetricValue_DoubleValue struct {
+	DoubleValue float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue,proto3,oneof"`
+}
+
+type MetricValue_StringValue struct {
+	StringValue string `protobuf:"bytes,7,opt,name=string_value,json=stringValue,proto3,oneof"`
+}
+
+type MetricValue_DistributionValue struct {
+	DistributionValue *Distribution `protobuf:"bytes,8,opt,name=distribution_value,json=distributionValue,proto3,oneof"`
+}
+
+func (*MetricValue_BoolValue) isMetricValue_Value() {}
+
+func (*MetricValue_Int64Value) isMetricValue_Value() {}
+
+func (*MetricValue_DoubleValue) isMetricValue_Value() {}
+
+func (*MetricValue_StringValue) isMetricValue_Value() {}
+
+func (*MetricValue_DistributionValue) isMetricValue_Value() {}
+
+func (m *MetricValue) GetValue() isMetricValue_Value {
 	if m != nil {
-		return m.EndTime
+		return m.Value
 	}
 	return nil
 }
@@ -228,21 +264,21 @@ func _MetricValue_OneofSizer(msg proto.Message) (n int) {
 	// value
 	switch x := m.Value.(type) {
 	case *MetricValue_BoolValue:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *MetricValue_Int64Value:
-		n += proto.SizeVarint(5<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.Int64Value))
 	case *MetricValue_DoubleValue:
-		n += proto.SizeVarint(6<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *MetricValue_StringValue:
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StringValue)))
 		n += len(x.StringValue)
 	case *MetricValue_DistributionValue:
 		s := proto.Size(x.DistributionValue)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -257,15 +293,37 @@ func _MetricValue_OneofSizer(msg proto.Message) (n int) {
 // end time, and label values.
 type MetricValueSet struct {
 	// The metric name defined in the service configuration.
-	MetricName string `protobuf:"bytes,1,opt,name=metric_name,json=metricName" json:"metric_name,omitempty"`
+	MetricName string `protobuf:"bytes,1,opt,name=metric_name,json=metricName,proto3" json:"metric_name,omitempty"`
 	// The values in this metric.
-	MetricValues []*MetricValue `protobuf:"bytes,2,rep,name=metric_values,json=metricValues" json:"metric_values,omitempty"`
+	MetricValues         []*MetricValue `protobuf:"bytes,2,rep,name=metric_values,json=metricValues,proto3" json:"metric_values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *MetricValueSet) Reset()         { *m = MetricValueSet{} }
+func (m *MetricValueSet) String() string { return proto.CompactTextString(m) }
+func (*MetricValueSet) ProtoMessage()    {}
+func (*MetricValueSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_value_8054f3e00bcbeeb9, []int{1}
+}
+func (m *MetricValueSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MetricValueSet.Unmarshal(m, b)
+}
+func (m *MetricValueSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MetricValueSet.Marshal(b, m, deterministic)
+}
+func (dst *MetricValueSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricValueSet.Merge(dst, src)
+}
+func (m *MetricValueSet) XXX_Size() int {
+	return xxx_messageInfo_MetricValueSet.Size(m)
+}
+func (m *MetricValueSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_MetricValueSet.DiscardUnknown(m)
 }
 
-func (m *MetricValueSet) Reset()                    { *m = MetricValueSet{} }
-func (m *MetricValueSet) String() string            { return proto.CompactTextString(m) }
-func (*MetricValueSet) ProtoMessage()               {}
-func (*MetricValueSet) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+var xxx_messageInfo_MetricValueSet proto.InternalMessageInfo
 
 func (m *MetricValueSet) GetMetricName() string {
 	if m != nil {
@@ -283,12 +341,15 @@ func (m *MetricValueSet) GetMetricValues() []*MetricValue {
 
 func init() {
 	proto.RegisterType((*MetricValue)(nil), "google.api.servicecontrol.v1.MetricValue")
+	proto.RegisterMapType((map[string]string)(nil), "google.api.servicecontrol.v1.MetricValue.LabelsEntry")
 	proto.RegisterType((*MetricValueSet)(nil), "google.api.servicecontrol.v1.MetricValueSet")
 }
 
-func init() { proto.RegisterFile("google/api/servicecontrol/v1/metric_value.proto", fileDescriptor3) }
+func init() {
+	proto.RegisterFile("google/api/servicecontrol/v1/metric_value.proto", fileDescriptor_metric_value_8054f3e00bcbeeb9)
+}
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_metric_value_8054f3e00bcbeeb9 = []byte{
 	// 482 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x8b, 0xd3, 0x40,
 	0x14, 0xc7, 0x3b, 0x8d, 0xdb, 0x1f, 0x2f, 0xab, 0x68, 0x14, 0x0c, 0x65, 0xa1, 0x71, 0xbd, 0x44,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/operation.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/operation.pb.go
index f94c2e7b..08f7e02e 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/operation.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/operation.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/operation.proto
 
-package servicecontrol
+package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Defines the importance of the data contained in the operation.
 type Operation_Importance int32
 
@@ -39,7 +45,9 @@ var Operation_Importance_value = map[string]int32{
 func (x Operation_Importance) String() string {
 	return proto.EnumName(Operation_Importance_name, int32(x))
 }
-func (Operation_Importance) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{0, 0} }
+func (Operation_Importance) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_operation_b9b924901f6a3776, []int{0, 0}
+}
 
 // Represents information regarding an operation.
 type Operation struct {
@@ -52,9 +60,9 @@ type Operation struct {
 	// In scenarios where an operation is computed from existing information
 	// and an idempotent id is desirable for deduplication purpose, UUID version 5
 	// is recommended. See RFC 4122 for details.
-	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// Fully qualified name of the operation. Reserved for future use.
-	OperationName string `protobuf:"bytes,2,opt,name=operation_name,json=operationName" json:"operation_name,omitempty"`
+	OperationName string `protobuf:"bytes,2,opt,name=operation_name,json=operationName,proto3" json:"operation_name,omitempty"`
 	// Identity of the consumer who is using the service.
 	// This field should be filled in for the operations initiated by a
 	// consumer, but not for service-initiated operations that are
@@ -64,13 +72,13 @@ type Operation struct {
 	//   project:<project_id>,
 	//   project_number:<project_number>,
 	//   api_key:<api_key>.
-	ConsumerId string `protobuf:"bytes,3,opt,name=consumer_id,json=consumerId" json:"consumer_id,omitempty"`
+	ConsumerId string `protobuf:"bytes,3,opt,name=consumer_id,json=consumerId,proto3" json:"consumer_id,omitempty"`
 	// Required. Start time of the operation.
-	StartTime *google_protobuf3.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of the operation.
 	// Required when the operation is used in [ServiceController.Report][google.api.servicecontrol.v1.ServiceController.Report],
 	// but optional when the operation is used in [ServiceController.Check][google.api.servicecontrol.v1.ServiceController.Check].
-	EndTime *google_protobuf3.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Labels describing the operation. Only the following labels are allowed:
 	//
 	// - Labels describing monitored resources as defined in
@@ -86,7 +94,7 @@ type Operation struct {
 	//        used to handle the API request (e.g. ESP),
 	//     - `servicecontrol.googleapis.com/platform` describing the platform
 	//        where the API is served (e.g. GAE, GCE, GKE).
-	Labels map[string]string `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Represents information about this operation. Each MetricValueSet
 	// corresponds to a metric defined in the service configuration.
 	// The data type used in the MetricValueSet must agree with
@@ -97,17 +105,39 @@ type Operation struct {
 	// label value combinations. If a request has such duplicated MetricValue
 	// instances, the entire request is rejected with
 	// an invalid argument error.
-	MetricValueSets []*MetricValueSet `protobuf:"bytes,7,rep,name=metric_value_sets,json=metricValueSets" json:"metric_value_sets,omitempty"`
+	MetricValueSets []*MetricValueSet `protobuf:"bytes,7,rep,name=metric_value_sets,json=metricValueSets,proto3" json:"metric_value_sets,omitempty"`
 	// Represents information to be logged.
-	LogEntries []*LogEntry `protobuf:"bytes,8,rep,name=log_entries,json=logEntries" json:"log_entries,omitempty"`
+	LogEntries []*LogEntry `protobuf:"bytes,8,rep,name=log_entries,json=logEntries,proto3" json:"log_entries,omitempty"`
 	// DO NOT USE. This is an experimental field.
-	Importance Operation_Importance `protobuf:"varint,11,opt,name=importance,enum=google.api.servicecontrol.v1.Operation_Importance" json:"importance,omitempty"`
+	Importance           Operation_Importance `protobuf:"varint,11,opt,name=importance,proto3,enum=google.api.servicecontrol.v1.Operation_Importance" json:"importance,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *Operation) Reset()                    { *m = Operation{} }
-func (m *Operation) String() string            { return proto.CompactTextString(m) }
-func (*Operation) ProtoMessage()               {}
-func (*Operation) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+func (m *Operation) Reset()         { *m = Operation{} }
+func (m *Operation) String() string { return proto.CompactTextString(m) }
+func (*Operation) ProtoMessage()    {}
+func (*Operation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operation_b9b924901f6a3776, []int{0}
+}
+func (m *Operation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Operation.Unmarshal(m, b)
+}
+func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
+}
+func (dst *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(dst, src)
+}
+func (m *Operation) XXX_Size() int {
+	return xxx_messageInfo_Operation.Size(m)
+}
+func (m *Operation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Operation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Operation proto.InternalMessageInfo
 
 func (m *Operation) GetOperationId() string {
 	if m != nil {
@@ -130,14 +160,14 @@ func (m *Operation) GetConsumerId() string {
 	return ""
 }
 
-func (m *Operation) GetStartTime() *google_protobuf3.Timestamp {
+func (m *Operation) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *Operation) GetEndTime() *google_protobuf3.Timestamp {
+func (m *Operation) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -174,12 +204,15 @@ func (m *Operation) GetImportance() Operation_Importance {
 
 func init() {
 	proto.RegisterType((*Operation)(nil), "google.api.servicecontrol.v1.Operation")
+	proto.RegisterMapType((map[string]string)(nil), "google.api.servicecontrol.v1.Operation.LabelsEntry")
 	proto.RegisterEnum("google.api.servicecontrol.v1.Operation_Importance", Operation_Importance_name, Operation_Importance_value)
 }
 
-func init() { proto.RegisterFile("google/api/servicecontrol/v1/operation.proto", fileDescriptor4) }
+func init() {
+	proto.RegisterFile("google/api/servicecontrol/v1/operation.proto", fileDescriptor_operation_b9b924901f6a3776)
+}
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_operation_b9b924901f6a3776 = []byte{
 	// 483 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6b, 0x13, 0x41,
 	0x14, 0xc7, 0x9d, 0xa6, 0xf9, 0xf5, 0x56, 0x63, 0x1c, 0x3c, 0x2c, 0xa1, 0x90, 0x58, 0x50, 0x72,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/quota_controller.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/quota_controller.pb.go
index 70f9c500..c6357cd8 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/quota_controller.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/quota_controller.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/quota_controller.proto
 
-package servicecontrol
+package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -18,6 +18,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Supported quota modes.
 type QuotaOperation_QuotaMode int32
 
@@ -56,7 +62,9 @@ var QuotaOperation_QuotaMode_value = map[string]int32{
 func (x QuotaOperation_QuotaMode) String() string {
 	return proto.EnumName(QuotaOperation_QuotaMode_name, int32(x))
 }
-func (QuotaOperation_QuotaMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{1, 0} }
+func (QuotaOperation_QuotaMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_quota_controller_5358e5cb4c246776, []int{1, 0}
+}
 
 // Error codes related to project config validations are deprecated since the
 // quota controller methods do not perform these validations. Instead services
@@ -102,7 +110,9 @@ var QuotaError_Code_value = map[string]int32{
 func (x QuotaError_Code) String() string {
 	return proto.EnumName(QuotaError_Code_name, int32(x))
 }
-func (QuotaError_Code) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{3, 0} }
+func (QuotaError_Code) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_quota_controller_5358e5cb4c246776, []int{3, 0}
+}
 
 // Request message for the AllocateQuota method.
 type AllocateQuotaRequest struct {
@@ -110,19 +120,41 @@ type AllocateQuotaRequest struct {
 	// `"pubsub.googleapis.com"`.
 	//
 	// See [google.api.Service][google.api.Service] for the definition of a service name.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// Operation that describes the quota allocation.
-	AllocateOperation *QuotaOperation `protobuf:"bytes,2,opt,name=allocate_operation,json=allocateOperation" json:"allocate_operation,omitempty"`
+	AllocateOperation *QuotaOperation `protobuf:"bytes,2,opt,name=allocate_operation,json=allocateOperation,proto3" json:"allocate_operation,omitempty"`
 	// Specifies which version of service configuration should be used to process
 	// the request. If unspecified or no matching version can be found, the latest
 	// one will be used.
-	ServiceConfigId string `protobuf:"bytes,4,opt,name=service_config_id,json=serviceConfigId" json:"service_config_id,omitempty"`
+	ServiceConfigId      string   `protobuf:"bytes,4,opt,name=service_config_id,json=serviceConfigId,proto3" json:"service_config_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AllocateQuotaRequest) Reset()                    { *m = AllocateQuotaRequest{} }
-func (m *AllocateQuotaRequest) String() string            { return proto.CompactTextString(m) }
-func (*AllocateQuotaRequest) ProtoMessage()               {}
-func (*AllocateQuotaRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+func (m *AllocateQuotaRequest) Reset()         { *m = AllocateQuotaRequest{} }
+func (m *AllocateQuotaRequest) String() string { return proto.CompactTextString(m) }
+func (*AllocateQuotaRequest) ProtoMessage()    {}
+func (*AllocateQuotaRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_quota_controller_5358e5cb4c246776, []int{0}
+}
+func (m *AllocateQuotaRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AllocateQuotaRequest.Unmarshal(m, b)
+}
+func (m *AllocateQuotaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AllocateQuotaRequest.Marshal(b, m, deterministic)
+}
+func (dst *AllocateQuotaRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateQuotaRequest.Merge(dst, src)
+}
+func (m *AllocateQuotaRequest) XXX_Size() int {
+	return xxx_messageInfo_AllocateQuotaRequest.Size(m)
+}
+func (m *AllocateQuotaRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AllocateQuotaRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AllocateQuotaRequest proto.InternalMessageInfo
 
 func (m *AllocateQuotaRequest) GetServiceName() string {
 	if m != nil {
@@ -155,7 +187,7 @@ type QuotaOperation struct {
 	// operation is computed from existing information and an idempotent id is
 	// desirable for deduplication purpose, UUID version 5 is recommended. See
 	// RFC 4122 for details.
-	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// Fully qualified name of the API method for which this quota operation is
 	// requested. This name is used for matching quota rules or metric rules and
 	// billing status rules defined in service configuration. This field is not
@@ -163,16 +195,16 @@ type QuotaOperation struct {
 	//
 	// Example of an RPC method name:
 	//     google.example.library.v1.LibraryService.CreateShelf
-	MethodName string `protobuf:"bytes,2,opt,name=method_name,json=methodName" json:"method_name,omitempty"`
+	MethodName string `protobuf:"bytes,2,opt,name=method_name,json=methodName,proto3" json:"method_name,omitempty"`
 	// Identity of the consumer for whom this quota operation is being performed.
 	//
 	// This can be in one of the following formats:
 	//   project:<project_id>,
 	//   project_number:<project_number>,
 	//   api_key:<api_key>.
-	ConsumerId string `protobuf:"bytes,3,opt,name=consumer_id,json=consumerId" json:"consumer_id,omitempty"`
+	ConsumerId string `protobuf:"bytes,3,opt,name=consumer_id,json=consumerId,proto3" json:"consumer_id,omitempty"`
 	// Labels describing the operation.
-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Represents information about this operation. Each MetricValueSet
 	// corresponds to a metric defined in the service configuration.
 	// The data type used in the MetricValueSet must agree with
@@ -183,15 +215,37 @@ type QuotaOperation struct {
 	// label value combinations. If a request has such duplicated MetricValue
 	// instances, the entire request is rejected with
 	// an invalid argument error.
-	QuotaMetrics []*MetricValueSet `protobuf:"bytes,5,rep,name=quota_metrics,json=quotaMetrics" json:"quota_metrics,omitempty"`
+	QuotaMetrics []*MetricValueSet `protobuf:"bytes,5,rep,name=quota_metrics,json=quotaMetrics,proto3" json:"quota_metrics,omitempty"`
 	// Quota mode for this operation.
-	QuotaMode QuotaOperation_QuotaMode `protobuf:"varint,6,opt,name=quota_mode,json=quotaMode,enum=google.api.servicecontrol.v1.QuotaOperation_QuotaMode" json:"quota_mode,omitempty"`
+	QuotaMode            QuotaOperation_QuotaMode `protobuf:"varint,6,opt,name=quota_mode,json=quotaMode,proto3,enum=google.api.servicecontrol.v1.QuotaOperation_QuotaMode" json:"quota_mode,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *QuotaOperation) Reset()         { *m = QuotaOperation{} }
+func (m *QuotaOperation) String() string { return proto.CompactTextString(m) }
+func (*QuotaOperation) ProtoMessage()    {}
+func (*QuotaOperation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_quota_controller_5358e5cb4c246776, []int{1}
+}
+func (m *QuotaOperation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QuotaOperation.Unmarshal(m, b)
+}
+func (m *QuotaOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QuotaOperation.Marshal(b, m, deterministic)
+}
+func (dst *QuotaOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaOperation.Merge(dst, src)
+}
+func (m *QuotaOperation) XXX_Size() int {
+	return xxx_messageInfo_QuotaOperation.Size(m)
+}
+func (m *QuotaOperation) XXX_DiscardUnknown() {
+	xxx_messageInfo_QuotaOperation.DiscardUnknown(m)
 }
 
-func (m *QuotaOperation) Reset()                    { *m = QuotaOperation{} }
-func (m *QuotaOperation) String() string            { return proto.CompactTextString(m) }
-func (*QuotaOperation) ProtoMessage()               {}
-func (*QuotaOperation) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
+var xxx_messageInfo_QuotaOperation proto.InternalMessageInfo
 
 func (m *QuotaOperation) GetOperationId() string {
 	if m != nil {
@@ -239,9 +293,9 @@ func (m *QuotaOperation) GetQuotaMode() QuotaOperation_QuotaMode {
 type AllocateQuotaResponse struct {
 	// The same operation_id value used in the AllocateQuotaRequest. Used for
 	// logging and diagnostics purposes.
-	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// Indicates the decision of the allocate.
-	AllocateErrors []*QuotaError `protobuf:"bytes,2,rep,name=allocate_errors,json=allocateErrors" json:"allocate_errors,omitempty"`
+	AllocateErrors []*QuotaError `protobuf:"bytes,2,rep,name=allocate_errors,json=allocateErrors,proto3" json:"allocate_errors,omitempty"`
 	// Quota metrics to indicate the result of allocation. Depending on the
 	// request, one or more of the following metrics will be included:
 	//
@@ -252,15 +306,37 @@ type AllocateQuotaResponse struct {
 	// 2. The quota limit reached condition will be specified using the following
 	// boolean metric :
 	//   "serviceruntime.googleapis.com/quota/exceeded"
-	QuotaMetrics []*MetricValueSet `protobuf:"bytes,3,rep,name=quota_metrics,json=quotaMetrics" json:"quota_metrics,omitempty"`
+	QuotaMetrics []*MetricValueSet `protobuf:"bytes,3,rep,name=quota_metrics,json=quotaMetrics,proto3" json:"quota_metrics,omitempty"`
 	// ID of the actual config used to process the request.
-	ServiceConfigId string `protobuf:"bytes,4,opt,name=service_config_id,json=serviceConfigId" json:"service_config_id,omitempty"`
+	ServiceConfigId      string   `protobuf:"bytes,4,opt,name=service_config_id,json=serviceConfigId,proto3" json:"service_config_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AllocateQuotaResponse) Reset()                    { *m = AllocateQuotaResponse{} }
-func (m *AllocateQuotaResponse) String() string            { return proto.CompactTextString(m) }
-func (*AllocateQuotaResponse) ProtoMessage()               {}
-func (*AllocateQuotaResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} }
+func (m *AllocateQuotaResponse) Reset()         { *m = AllocateQuotaResponse{} }
+func (m *AllocateQuotaResponse) String() string { return proto.CompactTextString(m) }
+func (*AllocateQuotaResponse) ProtoMessage()    {}
+func (*AllocateQuotaResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_quota_controller_5358e5cb4c246776, []int{2}
+}
+func (m *AllocateQuotaResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AllocateQuotaResponse.Unmarshal(m, b)
+}
+func (m *AllocateQuotaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AllocateQuotaResponse.Marshal(b, m, deterministic)
+}
+func (dst *AllocateQuotaResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateQuotaResponse.Merge(dst, src)
+}
+func (m *AllocateQuotaResponse) XXX_Size() int {
+	return xxx_messageInfo_AllocateQuotaResponse.Size(m)
+}
+func (m *AllocateQuotaResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AllocateQuotaResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AllocateQuotaResponse proto.InternalMessageInfo
 
 func (m *AllocateQuotaResponse) GetOperationId() string {
 	if m != nil {
@@ -293,19 +369,41 @@ func (m *AllocateQuotaResponse) GetServiceConfigId() string {
 // Represents error information for [QuotaOperation][google.api.servicecontrol.v1.QuotaOperation].
 type QuotaError struct {
 	// Error code.
-	Code QuotaError_Code `protobuf:"varint,1,opt,name=code,enum=google.api.servicecontrol.v1.QuotaError_Code" json:"code,omitempty"`
+	Code QuotaError_Code `protobuf:"varint,1,opt,name=code,proto3,enum=google.api.servicecontrol.v1.QuotaError_Code" json:"code,omitempty"`
 	// Subject to whom this error applies. See the specific enum for more details
 	// on this field. For example, "clientip:<ip address of client>" or
 	// "project:<Google developer project id>".
-	Subject string `protobuf:"bytes,2,opt,name=subject" json:"subject,omitempty"`
+	Subject string `protobuf:"bytes,2,opt,name=subject,proto3" json:"subject,omitempty"`
 	// Free-form text that provides details on the cause of the error.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *QuotaError) Reset()                    { *m = QuotaError{} }
-func (m *QuotaError) String() string            { return proto.CompactTextString(m) }
-func (*QuotaError) ProtoMessage()               {}
-func (*QuotaError) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{3} }
+func (m *QuotaError) Reset()         { *m = QuotaError{} }
+func (m *QuotaError) String() string { return proto.CompactTextString(m) }
+func (*QuotaError) ProtoMessage()    {}
+func (*QuotaError) Descriptor() ([]byte, []int) {
+	return fileDescriptor_quota_controller_5358e5cb4c246776, []int{3}
+}
+func (m *QuotaError) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QuotaError.Unmarshal(m, b)
+}
+func (m *QuotaError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QuotaError.Marshal(b, m, deterministic)
+}
+func (dst *QuotaError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaError.Merge(dst, src)
+}
+func (m *QuotaError) XXX_Size() int {
+	return xxx_messageInfo_QuotaError.Size(m)
+}
+func (m *QuotaError) XXX_DiscardUnknown() {
+	xxx_messageInfo_QuotaError.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QuotaError proto.InternalMessageInfo
 
 func (m *QuotaError) GetCode() QuotaError_Code {
 	if m != nil {
@@ -331,6 +429,7 @@ func (m *QuotaError) GetDescription() string {
 func init() {
 	proto.RegisterType((*AllocateQuotaRequest)(nil), "google.api.servicecontrol.v1.AllocateQuotaRequest")
 	proto.RegisterType((*QuotaOperation)(nil), "google.api.servicecontrol.v1.QuotaOperation")
+	proto.RegisterMapType((map[string]string)(nil), "google.api.servicecontrol.v1.QuotaOperation.LabelsEntry")
 	proto.RegisterType((*AllocateQuotaResponse)(nil), "google.api.servicecontrol.v1.AllocateQuotaResponse")
 	proto.RegisterType((*QuotaError)(nil), "google.api.servicecontrol.v1.QuotaError")
 	proto.RegisterEnum("google.api.servicecontrol.v1.QuotaOperation_QuotaMode", QuotaOperation_QuotaMode_name, QuotaOperation_QuotaMode_value)
@@ -345,8 +444,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for QuotaController service
-
+// QuotaControllerClient is the client API for QuotaController service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type QuotaControllerClient interface {
 	// Attempts to allocate quota for the specified consumer. It should be called
 	// before the operation is executed.
@@ -372,15 +472,14 @@ func NewQuotaControllerClient(cc *grpc.ClientConn) QuotaControllerClient {
 
 func (c *quotaControllerClient) AllocateQuota(ctx context.Context, in *AllocateQuotaRequest, opts ...grpc.CallOption) (*AllocateQuotaResponse, error) {
 	out := new(AllocateQuotaResponse)
-	err := grpc.Invoke(ctx, "/google.api.servicecontrol.v1.QuotaController/AllocateQuota", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicecontrol.v1.QuotaController/AllocateQuota", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for QuotaController service
-
+// QuotaControllerServer is the server API for QuotaController service.
 type QuotaControllerServer interface {
 	// Attempts to allocate quota for the specified consumer. It should be called
 	// before the operation is executed.
@@ -432,10 +531,10 @@ var _QuotaController_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/quota_controller.proto", fileDescriptor5)
+	proto.RegisterFile("google/api/servicecontrol/v1/quota_controller.proto", fileDescriptor_quota_controller_5358e5cb4c246776)
 }
 
-var fileDescriptor5 = []byte{
+var fileDescriptor_quota_controller_5358e5cb4c246776 = []byte{
 	// 775 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xc1, 0x6e, 0xea, 0x46,
 	0x14, 0xed, 0x18, 0x42, 0x9b, 0xeb, 0x04, 0x9c, 0x69, 0x5a, 0x59, 0x28, 0x52, 0x28, 0x2b, 0x1a,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/service_controller.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/service_controller.pb.go
index e3ecc9c9..388a978a 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/service_controller.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicecontrol/v1/service_controller.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicecontrol/v1/service_controller.proto
 
-package servicecontrol
+package servicecontrol // import "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -19,6 +19,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Request message for the Check method.
 type CheckRequest struct {
 	// The service name as specified in its service configuration. For example,
@@ -27,21 +33,43 @@ type CheckRequest struct {
 	// See
 	// [google.api.Service](https://cloud.google.com/service-management/reference/rpc/google.api#google.api.Service)
 	// for the definition of a service name.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The operation to be checked.
-	Operation *Operation `protobuf:"bytes,2,opt,name=operation" json:"operation,omitempty"`
+	Operation *Operation `protobuf:"bytes,2,opt,name=operation,proto3" json:"operation,omitempty"`
 	// Specifies which version of service configuration should be used to process
 	// the request.
 	//
 	// If unspecified or no matching version can be found, the
 	// latest one will be used.
-	ServiceConfigId string `protobuf:"bytes,4,opt,name=service_config_id,json=serviceConfigId" json:"service_config_id,omitempty"`
+	ServiceConfigId      string   `protobuf:"bytes,4,opt,name=service_config_id,json=serviceConfigId,proto3" json:"service_config_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CheckRequest) Reset()         { *m = CheckRequest{} }
+func (m *CheckRequest) String() string { return proto.CompactTextString(m) }
+func (*CheckRequest) ProtoMessage()    {}
+func (*CheckRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_controller_3b2da1557482bc9c, []int{0}
+}
+func (m *CheckRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckRequest.Unmarshal(m, b)
+}
+func (m *CheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckRequest.Marshal(b, m, deterministic)
+}
+func (dst *CheckRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckRequest.Merge(dst, src)
+}
+func (m *CheckRequest) XXX_Size() int {
+	return xxx_messageInfo_CheckRequest.Size(m)
+}
+func (m *CheckRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckRequest.DiscardUnknown(m)
 }
 
-func (m *CheckRequest) Reset()                    { *m = CheckRequest{} }
-func (m *CheckRequest) String() string            { return proto.CompactTextString(m) }
-func (*CheckRequest) ProtoMessage()               {}
-func (*CheckRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+var xxx_messageInfo_CheckRequest proto.InternalMessageInfo
 
 func (m *CheckRequest) GetServiceName() string {
 	if m != nil {
@@ -68,23 +96,45 @@ func (m *CheckRequest) GetServiceConfigId() string {
 type CheckResponse struct {
 	// The same operation_id value used in the [CheckRequest][google.api.servicecontrol.v1.CheckRequest].
 	// Used for logging and diagnostics purposes.
-	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// Indicate the decision of the check.
 	//
 	// If no check errors are present, the service should process the operation.
 	// Otherwise the service should use the list of errors to determine the
 	// appropriate action.
-	CheckErrors []*CheckError `protobuf:"bytes,2,rep,name=check_errors,json=checkErrors" json:"check_errors,omitempty"`
+	CheckErrors []*CheckError `protobuf:"bytes,2,rep,name=check_errors,json=checkErrors,proto3" json:"check_errors,omitempty"`
 	// The actual config id used to process the request.
-	ServiceConfigId string `protobuf:"bytes,5,opt,name=service_config_id,json=serviceConfigId" json:"service_config_id,omitempty"`
+	ServiceConfigId string `protobuf:"bytes,5,opt,name=service_config_id,json=serviceConfigId,proto3" json:"service_config_id,omitempty"`
 	// Feedback data returned from the server during processing a Check request.
-	CheckInfo *CheckResponse_CheckInfo `protobuf:"bytes,6,opt,name=check_info,json=checkInfo" json:"check_info,omitempty"`
+	CheckInfo            *CheckResponse_CheckInfo `protobuf:"bytes,6,opt,name=check_info,json=checkInfo,proto3" json:"check_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *CheckResponse) Reset()                    { *m = CheckResponse{} }
-func (m *CheckResponse) String() string            { return proto.CompactTextString(m) }
-func (*CheckResponse) ProtoMessage()               {}
-func (*CheckResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
+func (m *CheckResponse) Reset()         { *m = CheckResponse{} }
+func (m *CheckResponse) String() string { return proto.CompactTextString(m) }
+func (*CheckResponse) ProtoMessage()    {}
+func (*CheckResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_controller_3b2da1557482bc9c, []int{1}
+}
+func (m *CheckResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckResponse.Unmarshal(m, b)
+}
+func (m *CheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckResponse.Marshal(b, m, deterministic)
+}
+func (dst *CheckResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckResponse.Merge(dst, src)
+}
+func (m *CheckResponse) XXX_Size() int {
+	return xxx_messageInfo_CheckResponse.Size(m)
+}
+func (m *CheckResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckResponse proto.InternalMessageInfo
 
 func (m *CheckResponse) GetOperationId() string {
 	if m != nil {
@@ -116,13 +166,35 @@ func (m *CheckResponse) GetCheckInfo() *CheckResponse_CheckInfo {
 
 type CheckResponse_CheckInfo struct {
 	// Consumer info of this check.
-	ConsumerInfo *CheckResponse_ConsumerInfo `protobuf:"bytes,2,opt,name=consumer_info,json=consumerInfo" json:"consumer_info,omitempty"`
+	ConsumerInfo         *CheckResponse_ConsumerInfo `protobuf:"bytes,2,opt,name=consumer_info,json=consumerInfo,proto3" json:"consumer_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
-func (m *CheckResponse_CheckInfo) Reset()                    { *m = CheckResponse_CheckInfo{} }
-func (m *CheckResponse_CheckInfo) String() string            { return proto.CompactTextString(m) }
-func (*CheckResponse_CheckInfo) ProtoMessage()               {}
-func (*CheckResponse_CheckInfo) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1, 0} }
+func (m *CheckResponse_CheckInfo) Reset()         { *m = CheckResponse_CheckInfo{} }
+func (m *CheckResponse_CheckInfo) String() string { return proto.CompactTextString(m) }
+func (*CheckResponse_CheckInfo) ProtoMessage()    {}
+func (*CheckResponse_CheckInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_controller_3b2da1557482bc9c, []int{1, 0}
+}
+func (m *CheckResponse_CheckInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckResponse_CheckInfo.Unmarshal(m, b)
+}
+func (m *CheckResponse_CheckInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckResponse_CheckInfo.Marshal(b, m, deterministic)
+}
+func (dst *CheckResponse_CheckInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckResponse_CheckInfo.Merge(dst, src)
+}
+func (m *CheckResponse_CheckInfo) XXX_Size() int {
+	return xxx_messageInfo_CheckResponse_CheckInfo.Size(m)
+}
+func (m *CheckResponse_CheckInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckResponse_CheckInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckResponse_CheckInfo proto.InternalMessageInfo
 
 func (m *CheckResponse_CheckInfo) GetConsumerInfo() *CheckResponse_ConsumerInfo {
 	if m != nil {
@@ -135,13 +207,35 @@ func (m *CheckResponse_CheckInfo) GetConsumerInfo() *CheckResponse_ConsumerInfo
 type CheckResponse_ConsumerInfo struct {
 	// The Google cloud project number, e.g. 1234567890. A value of 0 indicates
 	// no project number is found.
-	ProjectNumber int64 `protobuf:"varint,1,opt,name=project_number,json=projectNumber" json:"project_number,omitempty"`
+	ProjectNumber        int64    `protobuf:"varint,1,opt,name=project_number,json=projectNumber,proto3" json:"project_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CheckResponse_ConsumerInfo) Reset()                    { *m = CheckResponse_ConsumerInfo{} }
-func (m *CheckResponse_ConsumerInfo) String() string            { return proto.CompactTextString(m) }
-func (*CheckResponse_ConsumerInfo) ProtoMessage()               {}
-func (*CheckResponse_ConsumerInfo) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1, 1} }
+func (m *CheckResponse_ConsumerInfo) Reset()         { *m = CheckResponse_ConsumerInfo{} }
+func (m *CheckResponse_ConsumerInfo) String() string { return proto.CompactTextString(m) }
+func (*CheckResponse_ConsumerInfo) ProtoMessage()    {}
+func (*CheckResponse_ConsumerInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_controller_3b2da1557482bc9c, []int{1, 1}
+}
+func (m *CheckResponse_ConsumerInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckResponse_ConsumerInfo.Unmarshal(m, b)
+}
+func (m *CheckResponse_ConsumerInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckResponse_ConsumerInfo.Marshal(b, m, deterministic)
+}
+func (dst *CheckResponse_ConsumerInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckResponse_ConsumerInfo.Merge(dst, src)
+}
+func (m *CheckResponse_ConsumerInfo) XXX_Size() int {
+	return xxx_messageInfo_CheckResponse_ConsumerInfo.Size(m)
+}
+func (m *CheckResponse_ConsumerInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckResponse_ConsumerInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckResponse_ConsumerInfo proto.InternalMessageInfo
 
 func (m *CheckResponse_ConsumerInfo) GetProjectNumber() int64 {
 	if m != nil {
@@ -158,7 +252,7 @@ type ReportRequest struct {
 	// See
 	// [google.api.Service](https://cloud.google.com/service-management/reference/rpc/google.api#google.api.Service)
 	// for the definition of a service name.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// Operations to be reported.
 	//
 	// Typically the service should report one operation per request.
@@ -169,19 +263,41 @@ type ReportRequest struct {
 	// If multiple operations are in a single request, the total request size
 	// should be no larger than 1MB. See [ReportResponse.report_errors][google.api.servicecontrol.v1.ReportResponse.report_errors] for
 	// partial failure behavior.
-	Operations []*Operation `protobuf:"bytes,2,rep,name=operations" json:"operations,omitempty"`
+	Operations []*Operation `protobuf:"bytes,2,rep,name=operations,proto3" json:"operations,omitempty"`
 	// Specifies which version of service config should be used to process the
 	// request.
 	//
 	// If unspecified or no matching version can be found, the
 	// latest one will be used.
-	ServiceConfigId string `protobuf:"bytes,3,opt,name=service_config_id,json=serviceConfigId" json:"service_config_id,omitempty"`
+	ServiceConfigId      string   `protobuf:"bytes,3,opt,name=service_config_id,json=serviceConfigId,proto3" json:"service_config_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ReportRequest) Reset()                    { *m = ReportRequest{} }
-func (m *ReportRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReportRequest) ProtoMessage()               {}
-func (*ReportRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{2} }
+func (m *ReportRequest) Reset()         { *m = ReportRequest{} }
+func (m *ReportRequest) String() string { return proto.CompactTextString(m) }
+func (*ReportRequest) ProtoMessage()    {}
+func (*ReportRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_controller_3b2da1557482bc9c, []int{2}
+}
+func (m *ReportRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportRequest.Unmarshal(m, b)
+}
+func (m *ReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReportRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportRequest.Merge(dst, src)
+}
+func (m *ReportRequest) XXX_Size() int {
+	return xxx_messageInfo_ReportRequest.Size(m)
+}
+func (m *ReportRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReportRequest proto.InternalMessageInfo
 
 func (m *ReportRequest) GetServiceName() string {
 	if m != nil {
@@ -220,15 +336,37 @@ type ReportResponse struct {
 	// 3. A failed RPC status indicates a general non-deterministic failure.
 	//    When this happens, it's impossible to know which of the
 	//    'Operations' in the request succeeded or failed.
-	ReportErrors []*ReportResponse_ReportError `protobuf:"bytes,1,rep,name=report_errors,json=reportErrors" json:"report_errors,omitempty"`
+	ReportErrors []*ReportResponse_ReportError `protobuf:"bytes,1,rep,name=report_errors,json=reportErrors,proto3" json:"report_errors,omitempty"`
 	// The actual config id used to process the request.
-	ServiceConfigId string `protobuf:"bytes,2,opt,name=service_config_id,json=serviceConfigId" json:"service_config_id,omitempty"`
+	ServiceConfigId      string   `protobuf:"bytes,2,opt,name=service_config_id,json=serviceConfigId,proto3" json:"service_config_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReportResponse) Reset()         { *m = ReportResponse{} }
+func (m *ReportResponse) String() string { return proto.CompactTextString(m) }
+func (*ReportResponse) ProtoMessage()    {}
+func (*ReportResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_controller_3b2da1557482bc9c, []int{3}
+}
+func (m *ReportResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportResponse.Unmarshal(m, b)
+}
+func (m *ReportResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReportResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportResponse.Merge(dst, src)
+}
+func (m *ReportResponse) XXX_Size() int {
+	return xxx_messageInfo_ReportResponse.Size(m)
+}
+func (m *ReportResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportResponse.DiscardUnknown(m)
 }
 
-func (m *ReportResponse) Reset()                    { *m = ReportResponse{} }
-func (m *ReportResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReportResponse) ProtoMessage()               {}
-func (*ReportResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{3} }
+var xxx_messageInfo_ReportResponse proto.InternalMessageInfo
 
 func (m *ReportResponse) GetReportErrors() []*ReportResponse_ReportError {
 	if m != nil {
@@ -247,15 +385,37 @@ func (m *ReportResponse) GetServiceConfigId() string {
 // Represents the processing error of one [Operation][google.api.servicecontrol.v1.Operation] in the request.
 type ReportResponse_ReportError struct {
 	// The [Operation.operation_id][google.api.servicecontrol.v1.Operation.operation_id] value from the request.
-	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// Details of the error when processing the [Operation][google.api.servicecontrol.v1.Operation].
-	Status *google_rpc.Status `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"`
+	Status               *status.Status `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *ReportResponse_ReportError) Reset()                    { *m = ReportResponse_ReportError{} }
-func (m *ReportResponse_ReportError) String() string            { return proto.CompactTextString(m) }
-func (*ReportResponse_ReportError) ProtoMessage()               {}
-func (*ReportResponse_ReportError) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{3, 0} }
+func (m *ReportResponse_ReportError) Reset()         { *m = ReportResponse_ReportError{} }
+func (m *ReportResponse_ReportError) String() string { return proto.CompactTextString(m) }
+func (*ReportResponse_ReportError) ProtoMessage()    {}
+func (*ReportResponse_ReportError) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_controller_3b2da1557482bc9c, []int{3, 0}
+}
+func (m *ReportResponse_ReportError) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportResponse_ReportError.Unmarshal(m, b)
+}
+func (m *ReportResponse_ReportError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportResponse_ReportError.Marshal(b, m, deterministic)
+}
+func (dst *ReportResponse_ReportError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportResponse_ReportError.Merge(dst, src)
+}
+func (m *ReportResponse_ReportError) XXX_Size() int {
+	return xxx_messageInfo_ReportResponse_ReportError.Size(m)
+}
+func (m *ReportResponse_ReportError) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportResponse_ReportError.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReportResponse_ReportError proto.InternalMessageInfo
 
 func (m *ReportResponse_ReportError) GetOperationId() string {
 	if m != nil {
@@ -264,7 +424,7 @@ func (m *ReportResponse_ReportError) GetOperationId() string {
 	return ""
 }
 
-func (m *ReportResponse_ReportError) GetStatus() *google_rpc.Status {
+func (m *ReportResponse_ReportError) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -289,8 +449,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ServiceController service
-
+// ServiceControllerClient is the client API for ServiceController service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ServiceControllerClient interface {
 	// Checks an operation with Google Service Control to decide whether
 	// the given operation should proceed. It should be called before the
@@ -333,7 +494,7 @@ func NewServiceControllerClient(cc *grpc.ClientConn) ServiceControllerClient {
 
 func (c *serviceControllerClient) Check(ctx context.Context, in *CheckRequest, opts ...grpc.CallOption) (*CheckResponse, error) {
 	out := new(CheckResponse)
-	err := grpc.Invoke(ctx, "/google.api.servicecontrol.v1.ServiceController/Check", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicecontrol.v1.ServiceController/Check", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -342,15 +503,14 @@ func (c *serviceControllerClient) Check(ctx context.Context, in *CheckRequest, o
 
 func (c *serviceControllerClient) Report(ctx context.Context, in *ReportRequest, opts ...grpc.CallOption) (*ReportResponse, error) {
 	out := new(ReportResponse)
-	err := grpc.Invoke(ctx, "/google.api.servicecontrol.v1.ServiceController/Report", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicecontrol.v1.ServiceController/Report", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ServiceController service
-
+// ServiceControllerServer is the server API for ServiceController service.
 type ServiceControllerServer interface {
 	// Checks an operation with Google Service Control to decide whether
 	// the given operation should proceed. It should be called before the
@@ -441,10 +601,10 @@ var _ServiceController_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicecontrol/v1/service_controller.proto", fileDescriptor6)
+	proto.RegisterFile("google/api/servicecontrol/v1/service_controller.proto", fileDescriptor_service_controller_3b2da1557482bc9c)
 }
 
-var fileDescriptor6 = []byte{
+var fileDescriptor_service_controller_3b2da1557482bc9c = []byte{
 	// 619 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xc1, 0x6e, 0xd3, 0x4c,
 	0x10, 0xd6, 0x3a, 0x6d, 0xa4, 0x4c, 0x9c, 0xfe, 0xea, 0x1e, 0x7e, 0x22, 0xab, 0x87, 0xd4, 0x12,
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicemanagement/v1/resources.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicemanagement/v1/resources.pb.go
index 94906476..23dbfebd 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicemanagement/v1/resources.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicemanagement/v1/resources.pb.go
@@ -1,58 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicemanagement/v1/resources.proto
 
-/*
-Package servicemanagement is a generated protocol buffer package.
-
-It is generated from these files:
-	google/api/servicemanagement/v1/resources.proto
-	google/api/servicemanagement/v1/servicemanager.proto
-
-It has these top-level messages:
-	ManagedService
-	OperationMetadata
-	Diagnostic
-	ConfigSource
-	ConfigFile
-	ConfigRef
-	ChangeReport
-	Rollout
-	ListServicesRequest
-	ListServicesResponse
-	GetServiceRequest
-	CreateServiceRequest
-	DeleteServiceRequest
-	UndeleteServiceRequest
-	UndeleteServiceResponse
-	GetServiceConfigRequest
-	ListServiceConfigsRequest
-	ListServiceConfigsResponse
-	CreateServiceConfigRequest
-	SubmitConfigSourceRequest
-	SubmitConfigSourceResponse
-	CreateServiceRolloutRequest
-	ListServiceRolloutsRequest
-	ListServiceRolloutsResponse
-	GetServiceRolloutRequest
-	EnableServiceRequest
-	DisableServiceRequest
-	GenerateConfigReportRequest
-	GenerateConfigReportResponse
-*/
-package servicemanagement
+package servicemanagement // import "google.golang.org/genproto/googleapis/api/servicemanagement/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _ "github.com/golang/protobuf/ptypes/any"
+import _ "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api2 "google.golang.org/genproto/googleapis/api/configchange"
+import configchange "google.golang.org/genproto/googleapis/api/configchange"
+import _ "google.golang.org/genproto/googleapis/api/metric"
 import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
 import _ "google.golang.org/genproto/googleapis/longrunning"
-import _ "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/protobuf/field_mask"
-import _ "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf9 "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/rpc/status"
+import _ "google.golang.org/genproto/protobuf/field_mask"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -65,21 +28,22 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
-// Code describes the status of one operation step.
+// Code describes the status of the operation (or one of its steps).
 type OperationMetadata_Status int32
 
 const (
 	// Unspecifed code.
 	OperationMetadata_STATUS_UNSPECIFIED OperationMetadata_Status = 0
-	// The step has completed without errors.
+	// The operation or step has completed without errors.
 	OperationMetadata_DONE OperationMetadata_Status = 1
-	// The step has not started yet.
+	// The operation or step has not started yet.
 	OperationMetadata_NOT_STARTED OperationMetadata_Status = 2
-	// The step is in progress.
+	// The operation or step is in progress.
 	OperationMetadata_IN_PROGRESS OperationMetadata_Status = 3
-	// The step has completed with errors.
+	// The operation or step has completed with errors. If the operation is
+	// rollbackable, the rollback completed with errors too.
 	OperationMetadata_FAILED OperationMetadata_Status = 4
-	// The step has completed with cancellation.
+	// The operation or step has completed with cancellation.
 	OperationMetadata_CANCELLED OperationMetadata_Status = 5
 )
 
@@ -103,7 +67,9 @@ var OperationMetadata_Status_value = map[string]int32{
 func (x OperationMetadata_Status) String() string {
 	return proto.EnumName(OperationMetadata_Status_name, int32(x))
 }
-func (OperationMetadata_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (OperationMetadata_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{1, 0}
+}
 
 // The kind of diagnostic information possible.
 type Diagnostic_Kind int32
@@ -127,7 +93,9 @@ var Diagnostic_Kind_value = map[string]int32{
 func (x Diagnostic_Kind) String() string {
 	return proto.EnumName(Diagnostic_Kind_name, int32(x))
 }
-func (Diagnostic_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (Diagnostic_Kind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{2, 0}
+}
 
 type ConfigFile_FileType int32
 
@@ -148,6 +116,12 @@ const (
 	//
 	// $protoc --include_imports --include_source_info test.proto -o out.pb
 	ConfigFile_FILE_DESCRIPTOR_SET_PROTO ConfigFile_FileType = 4
+	// Uncompiled Proto file. Used for storage and display purposes only,
+	// currently server-side compilation is not supported. Should match the
+	// inputs to 'protoc' command used to generated FILE_DESCRIPTOR_SET_PROTO. A
+	// file of this type can only be included if at least one file of type
+	// FILE_DESCRIPTOR_SET_PROTO is included.
+	ConfigFile_PROTO_FILE ConfigFile_FileType = 6
 )
 
 var ConfigFile_FileType_name = map[int32]string{
@@ -156,6 +130,7 @@ var ConfigFile_FileType_name = map[int32]string{
 	2: "OPEN_API_JSON",
 	3: "OPEN_API_YAML",
 	4: "FILE_DESCRIPTOR_SET_PROTO",
+	6: "PROTO_FILE",
 }
 var ConfigFile_FileType_value = map[string]int32{
 	"FILE_TYPE_UNSPECIFIED":     0,
@@ -163,12 +138,15 @@ var ConfigFile_FileType_value = map[string]int32{
 	"OPEN_API_JSON":             2,
 	"OPEN_API_YAML":             3,
 	"FILE_DESCRIPTOR_SET_PROTO": 4,
+	"PROTO_FILE":                6,
 }
 
 func (x ConfigFile_FileType) String() string {
 	return proto.EnumName(ConfigFile_FileType_name, int32(x))
 }
-func (ConfigFile_FileType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
+func (ConfigFile_FileType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{4, 0}
+}
 
 // Status of a Rollout.
 type Rollout_RolloutStatus int32
@@ -183,10 +161,13 @@ const (
 	// The Rollout has been cancelled. This can happen if you have overlapping
 	// Rollout pushes, and the previous ones will be cancelled.
 	Rollout_CANCELLED Rollout_RolloutStatus = 3
-	// The Rollout has failed. It is typically caused by configuration errors.
+	// The Rollout has failed and the rollback attempt has failed too.
 	Rollout_FAILED Rollout_RolloutStatus = 4
 	// The Rollout has not started yet and is pending for execution.
 	Rollout_PENDING Rollout_RolloutStatus = 5
+	// The Rollout has failed and rolled back to the previous successful
+	// Rollout.
+	Rollout_FAILED_ROLLED_BACK Rollout_RolloutStatus = 6
 )
 
 var Rollout_RolloutStatus_name = map[int32]string{
@@ -196,6 +177,7 @@ var Rollout_RolloutStatus_name = map[int32]string{
 	3: "CANCELLED",
 	4: "FAILED",
 	5: "PENDING",
+	6: "FAILED_ROLLED_BACK",
 }
 var Rollout_RolloutStatus_value = map[string]int32{
 	"ROLLOUT_STATUS_UNSPECIFIED": 0,
@@ -204,27 +186,52 @@ var Rollout_RolloutStatus_value = map[string]int32{
 	"CANCELLED":                  3,
 	"FAILED":                     4,
 	"PENDING":                    5,
+	"FAILED_ROLLED_BACK":         6,
 }
 
 func (x Rollout_RolloutStatus) String() string {
 	return proto.EnumName(Rollout_RolloutStatus_name, int32(x))
 }
-func (Rollout_RolloutStatus) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
+func (Rollout_RolloutStatus) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{7, 0}
+}
 
 // The full representation of a Service that is managed by
 // Google Service Management.
 type ManagedService struct {
 	// The name of the service. See the [overview](/service-management/overview)
 	// for naming requirements.
-	ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// ID of the project that produces and owns this service.
-	ProducerProjectId string `protobuf:"bytes,3,opt,name=producer_project_id,json=producerProjectId" json:"producer_project_id,omitempty"`
+	ProducerProjectId    string   `protobuf:"bytes,3,opt,name=producer_project_id,json=producerProjectId,proto3" json:"producer_project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ManagedService) Reset()         { *m = ManagedService{} }
+func (m *ManagedService) String() string { return proto.CompactTextString(m) }
+func (*ManagedService) ProtoMessage()    {}
+func (*ManagedService) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{0}
+}
+func (m *ManagedService) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ManagedService.Unmarshal(m, b)
+}
+func (m *ManagedService) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ManagedService.Marshal(b, m, deterministic)
+}
+func (dst *ManagedService) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedService.Merge(dst, src)
+}
+func (m *ManagedService) XXX_Size() int {
+	return xxx_messageInfo_ManagedService.Size(m)
+}
+func (m *ManagedService) XXX_DiscardUnknown() {
+	xxx_messageInfo_ManagedService.DiscardUnknown(m)
 }
 
-func (m *ManagedService) Reset()                    { *m = ManagedService{} }
-func (m *ManagedService) String() string            { return proto.CompactTextString(m) }
-func (*ManagedService) ProtoMessage()               {}
-func (*ManagedService) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_ManagedService proto.InternalMessageInfo
 
 func (m *ManagedService) GetServiceName() string {
 	if m != nil {
@@ -244,19 +251,41 @@ func (m *ManagedService) GetProducerProjectId() string {
 type OperationMetadata struct {
 	// The full name of the resources that this operation is directly
 	// associated with.
-	ResourceNames []string `protobuf:"bytes,1,rep,name=resource_names,json=resourceNames" json:"resource_names,omitempty"`
+	ResourceNames []string `protobuf:"bytes,1,rep,name=resource_names,json=resourceNames,proto3" json:"resource_names,omitempty"`
 	// Detailed status information for each step. The order is undetermined.
-	Steps []*OperationMetadata_Step `protobuf:"bytes,2,rep,name=steps" json:"steps,omitempty"`
+	Steps []*OperationMetadata_Step `protobuf:"bytes,2,rep,name=steps,proto3" json:"steps,omitempty"`
 	// Percentage of completion of this operation, ranging from 0 to 100.
-	ProgressPercentage int32 `protobuf:"varint,3,opt,name=progress_percentage,json=progressPercentage" json:"progress_percentage,omitempty"`
+	ProgressPercentage int32 `protobuf:"varint,3,opt,name=progress_percentage,json=progressPercentage,proto3" json:"progress_percentage,omitempty"`
 	// The start time of the operation.
-	StartTime *google_protobuf9.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime            *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *OperationMetadata) Reset()                    { *m = OperationMetadata{} }
-func (m *OperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*OperationMetadata) ProtoMessage()               {}
-func (*OperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
+func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata) ProtoMessage()    {}
+func (*OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{1}
+}
+func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
+}
+func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+}
+func (m *OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata.Size(m)
+}
+func (m *OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationMetadata proto.InternalMessageInfo
 
 func (m *OperationMetadata) GetResourceNames() []string {
 	if m != nil {
@@ -279,7 +308,7 @@ func (m *OperationMetadata) GetProgressPercentage() int32 {
 	return 0
 }
 
-func (m *OperationMetadata) GetStartTime() *google_protobuf9.Timestamp {
+func (m *OperationMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
@@ -289,15 +318,37 @@ func (m *OperationMetadata) GetStartTime() *google_protobuf9.Timestamp {
 // Represents the status of one operation step.
 type OperationMetadata_Step struct {
 	// The short description of the step.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// The status code.
-	Status OperationMetadata_Status `protobuf:"varint,4,opt,name=status,enum=google.api.servicemanagement.v1.OperationMetadata_Status" json:"status,omitempty"`
+	Status               OperationMetadata_Status `protobuf:"varint,4,opt,name=status,proto3,enum=google.api.servicemanagement.v1.OperationMetadata_Status" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *OperationMetadata_Step) Reset()                    { *m = OperationMetadata_Step{} }
-func (m *OperationMetadata_Step) String() string            { return proto.CompactTextString(m) }
-func (*OperationMetadata_Step) ProtoMessage()               {}
-func (*OperationMetadata_Step) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (m *OperationMetadata_Step) Reset()         { *m = OperationMetadata_Step{} }
+func (m *OperationMetadata_Step) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata_Step) ProtoMessage()    {}
+func (*OperationMetadata_Step) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{1, 0}
+}
+func (m *OperationMetadata_Step) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata_Step.Unmarshal(m, b)
+}
+func (m *OperationMetadata_Step) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata_Step.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata_Step) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata_Step.Merge(dst, src)
+}
+func (m *OperationMetadata_Step) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata_Step.Size(m)
+}
+func (m *OperationMetadata_Step) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata_Step.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationMetadata_Step proto.InternalMessageInfo
 
 func (m *OperationMetadata_Step) GetDescription() string {
 	if m != nil {
@@ -316,17 +367,39 @@ func (m *OperationMetadata_Step) GetStatus() OperationMetadata_Status {
 // Represents a diagnostic message (error or warning)
 type Diagnostic struct {
 	// File name and line number of the error or warning.
-	Location string `protobuf:"bytes,1,opt,name=location" json:"location,omitempty"`
+	Location string `protobuf:"bytes,1,opt,name=location,proto3" json:"location,omitempty"`
 	// The kind of diagnostic information provided.
-	Kind Diagnostic_Kind `protobuf:"varint,2,opt,name=kind,enum=google.api.servicemanagement.v1.Diagnostic_Kind" json:"kind,omitempty"`
+	Kind Diagnostic_Kind `protobuf:"varint,2,opt,name=kind,proto3,enum=google.api.servicemanagement.v1.Diagnostic_Kind" json:"kind,omitempty"`
 	// Message describing the error or warning.
-	Message string `protobuf:"bytes,3,opt,name=message" json:"message,omitempty"`
+	Message              string   `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Diagnostic) Reset()         { *m = Diagnostic{} }
+func (m *Diagnostic) String() string { return proto.CompactTextString(m) }
+func (*Diagnostic) ProtoMessage()    {}
+func (*Diagnostic) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{2}
+}
+func (m *Diagnostic) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Diagnostic.Unmarshal(m, b)
+}
+func (m *Diagnostic) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Diagnostic.Marshal(b, m, deterministic)
+}
+func (dst *Diagnostic) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Diagnostic.Merge(dst, src)
+}
+func (m *Diagnostic) XXX_Size() int {
+	return xxx_messageInfo_Diagnostic.Size(m)
+}
+func (m *Diagnostic) XXX_DiscardUnknown() {
+	xxx_messageInfo_Diagnostic.DiscardUnknown(m)
 }
 
-func (m *Diagnostic) Reset()                    { *m = Diagnostic{} }
-func (m *Diagnostic) String() string            { return proto.CompactTextString(m) }
-func (*Diagnostic) ProtoMessage()               {}
-func (*Diagnostic) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_Diagnostic proto.InternalMessageInfo
 
 func (m *Diagnostic) GetLocation() string {
 	if m != nil {
@@ -355,16 +428,38 @@ type ConfigSource struct {
 	// A unique ID for a specific instance of this message, typically assigned
 	// by the client for tracking purpose. If empty, the server may choose to
 	// generate one instead.
-	Id string `protobuf:"bytes,5,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,5,opt,name=id,proto3" json:"id,omitempty"`
 	// Set of source configuration files that are used to generate a service
 	// configuration (`google.api.Service`).
-	Files []*ConfigFile `protobuf:"bytes,2,rep,name=files" json:"files,omitempty"`
+	Files                []*ConfigFile `protobuf:"bytes,2,rep,name=files,proto3" json:"files,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ConfigSource) Reset()         { *m = ConfigSource{} }
+func (m *ConfigSource) String() string { return proto.CompactTextString(m) }
+func (*ConfigSource) ProtoMessage()    {}
+func (*ConfigSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{3}
+}
+func (m *ConfigSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConfigSource.Unmarshal(m, b)
+}
+func (m *ConfigSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConfigSource.Marshal(b, m, deterministic)
+}
+func (dst *ConfigSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigSource.Merge(dst, src)
+}
+func (m *ConfigSource) XXX_Size() int {
+	return xxx_messageInfo_ConfigSource.Size(m)
+}
+func (m *ConfigSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConfigSource.DiscardUnknown(m)
 }
 
-func (m *ConfigSource) Reset()                    { *m = ConfigSource{} }
-func (m *ConfigSource) String() string            { return proto.CompactTextString(m) }
-func (*ConfigSource) ProtoMessage()               {}
-func (*ConfigSource) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_ConfigSource proto.InternalMessageInfo
 
 func (m *ConfigSource) GetId() string {
 	if m != nil {
@@ -383,17 +478,39 @@ func (m *ConfigSource) GetFiles() []*ConfigFile {
 // Generic specification of a source configuration file
 type ConfigFile struct {
 	// The file name of the configuration file (full or relative path).
-	FilePath string `protobuf:"bytes,1,opt,name=file_path,json=filePath" json:"file_path,omitempty"`
+	FilePath string `protobuf:"bytes,1,opt,name=file_path,json=filePath,proto3" json:"file_path,omitempty"`
 	// The bytes that constitute the file.
 	FileContents []byte `protobuf:"bytes,3,opt,name=file_contents,json=fileContents,proto3" json:"file_contents,omitempty"`
 	// The type of configuration file this represents.
-	FileType ConfigFile_FileType `protobuf:"varint,4,opt,name=file_type,json=fileType,enum=google.api.servicemanagement.v1.ConfigFile_FileType" json:"file_type,omitempty"`
+	FileType             ConfigFile_FileType `protobuf:"varint,4,opt,name=file_type,json=fileType,proto3,enum=google.api.servicemanagement.v1.ConfigFile_FileType" json:"file_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *ConfigFile) Reset()                    { *m = ConfigFile{} }
-func (m *ConfigFile) String() string            { return proto.CompactTextString(m) }
-func (*ConfigFile) ProtoMessage()               {}
-func (*ConfigFile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ConfigFile) Reset()         { *m = ConfigFile{} }
+func (m *ConfigFile) String() string { return proto.CompactTextString(m) }
+func (*ConfigFile) ProtoMessage()    {}
+func (*ConfigFile) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{4}
+}
+func (m *ConfigFile) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConfigFile.Unmarshal(m, b)
+}
+func (m *ConfigFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConfigFile.Marshal(b, m, deterministic)
+}
+func (dst *ConfigFile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigFile.Merge(dst, src)
+}
+func (m *ConfigFile) XXX_Size() int {
+	return xxx_messageInfo_ConfigFile.Size(m)
+}
+func (m *ConfigFile) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConfigFile.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConfigFile proto.InternalMessageInfo
 
 func (m *ConfigFile) GetFilePath() string {
 	if m != nil {
@@ -420,13 +537,35 @@ func (m *ConfigFile) GetFileType() ConfigFile_FileType {
 type ConfigRef struct {
 	// Resource name of a service config. It must have the following
 	// format: "services/{service name}/configs/{config id}".
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ConfigRef) Reset()         { *m = ConfigRef{} }
+func (m *ConfigRef) String() string { return proto.CompactTextString(m) }
+func (*ConfigRef) ProtoMessage()    {}
+func (*ConfigRef) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{5}
+}
+func (m *ConfigRef) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConfigRef.Unmarshal(m, b)
+}
+func (m *ConfigRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConfigRef.Marshal(b, m, deterministic)
+}
+func (dst *ConfigRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigRef.Merge(dst, src)
+}
+func (m *ConfigRef) XXX_Size() int {
+	return xxx_messageInfo_ConfigRef.Size(m)
+}
+func (m *ConfigRef) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConfigRef.DiscardUnknown(m)
 }
 
-func (m *ConfigRef) Reset()                    { *m = ConfigRef{} }
-func (m *ConfigRef) String() string            { return proto.CompactTextString(m) }
-func (*ConfigRef) ProtoMessage()               {}
-func (*ConfigRef) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_ConfigRef proto.InternalMessageInfo
 
 func (m *ConfigRef) GetName() string {
 	if m != nil {
@@ -445,15 +584,37 @@ type ChangeReport struct {
 	// of each change.
 	// A ConfigChange identifier is a dot separated path to the configuration.
 	// Example: visibility.rules[selector='LibraryService.CreateBook'].restriction
-	ConfigChanges []*google_api2.ConfigChange `protobuf:"bytes,1,rep,name=config_changes,json=configChanges" json:"config_changes,omitempty"`
+	ConfigChanges        []*configchange.ConfigChange `protobuf:"bytes,1,rep,name=config_changes,json=configChanges,proto3" json:"config_changes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
 }
 
-func (m *ChangeReport) Reset()                    { *m = ChangeReport{} }
-func (m *ChangeReport) String() string            { return proto.CompactTextString(m) }
-func (*ChangeReport) ProtoMessage()               {}
-func (*ChangeReport) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *ChangeReport) Reset()         { *m = ChangeReport{} }
+func (m *ChangeReport) String() string { return proto.CompactTextString(m) }
+func (*ChangeReport) ProtoMessage()    {}
+func (*ChangeReport) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{6}
+}
+func (m *ChangeReport) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ChangeReport.Unmarshal(m, b)
+}
+func (m *ChangeReport) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ChangeReport.Marshal(b, m, deterministic)
+}
+func (dst *ChangeReport) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChangeReport.Merge(dst, src)
+}
+func (m *ChangeReport) XXX_Size() int {
+	return xxx_messageInfo_ChangeReport.Size(m)
+}
+func (m *ChangeReport) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChangeReport.DiscardUnknown(m)
+}
 
-func (m *ChangeReport) GetConfigChanges() []*google_api2.ConfigChange {
+var xxx_messageInfo_ChangeReport proto.InternalMessageInfo
+
+func (m *ChangeReport) GetConfigChanges() []*configchange.ConfigChange {
 	if m != nil {
 		return m.ConfigChanges
 	}
@@ -472,15 +633,15 @@ type Rollout struct {
 	// date in ISO 8601 format.  "revision number" is a monotonically increasing
 	// positive number that is reset every day for each service.
 	// An example of the generated rollout_id is '2016-02-16r1'
-	RolloutId string `protobuf:"bytes,1,opt,name=rollout_id,json=rolloutId" json:"rollout_id,omitempty"`
+	RolloutId string `protobuf:"bytes,1,opt,name=rollout_id,json=rolloutId,proto3" json:"rollout_id,omitempty"`
 	// Creation time of the rollout. Readonly.
-	CreateTime *google_protobuf9.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The user who created the Rollout. Readonly.
-	CreatedBy string `protobuf:"bytes,3,opt,name=created_by,json=createdBy" json:"created_by,omitempty"`
+	CreatedBy string `protobuf:"bytes,3,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
 	// The status of this rollout. Readonly. In case of a failed rollout,
 	// the system will automatically rollback to the current Rollout
 	// version. Readonly.
-	Status Rollout_RolloutStatus `protobuf:"varint,4,opt,name=status,enum=google.api.servicemanagement.v1.Rollout_RolloutStatus" json:"status,omitempty"`
+	Status Rollout_RolloutStatus `protobuf:"varint,4,opt,name=status,proto3,enum=google.api.servicemanagement.v1.Rollout_RolloutStatus" json:"status,omitempty"`
 	// Strategy that defines which versions of service configurations should be
 	// pushed
 	// and how they should be used at runtime.
@@ -490,34 +651,35 @@ type Rollout struct {
 	//	*Rollout_DeleteServiceStrategy_
 	Strategy isRollout_Strategy `protobuf_oneof:"strategy"`
 	// The name of the service associated with this Rollout.
-	ServiceName string `protobuf:"bytes,8,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName          string   `protobuf:"bytes,8,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Rollout) Reset()                    { *m = Rollout{} }
-func (m *Rollout) String() string            { return proto.CompactTextString(m) }
-func (*Rollout) ProtoMessage()               {}
-func (*Rollout) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-type isRollout_Strategy interface {
-	isRollout_Strategy()
+func (m *Rollout) Reset()         { *m = Rollout{} }
+func (m *Rollout) String() string { return proto.CompactTextString(m) }
+func (*Rollout) ProtoMessage()    {}
+func (*Rollout) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_3e116fd147dc632b, []int{7}
 }
-
-type Rollout_TrafficPercentStrategy_ struct {
-	TrafficPercentStrategy *Rollout_TrafficPercentStrategy `protobuf:"bytes,5,opt,name=traffic_percent_strategy,json=trafficPercentStrategy,oneof"`
+func (m *Rollout) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Rollout.Unmarshal(m, b)
 }
-type Rollout_DeleteServiceStrategy_ struct {
-	DeleteServiceStrategy *Rollout_DeleteServiceStrategy `protobuf:"bytes,200,opt,name=delete_service_strategy,json=deleteServiceStrategy,oneof"`
+func (m *Rollout) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Rollout.Marshal(b, m, deterministic)
 }
-
-func (*Rollout_TrafficPercentStrategy_) isRollout_Strategy() {}
-func (*Rollout_DeleteServiceStrategy_) isRollout_Strategy()  {}
-
-func (m *Rollout) GetStrategy() isRollout_Strategy {
-	if m != nil {
-		return m.Strategy
-	}
-	return nil
+func (dst *Rollout) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rollout.Merge(dst, src)
+}
+func (m *Rollout) XXX_Size() int {
+	return xxx_messageInfo_Rollout.Size(m)
 }
+func (m *Rollout) XXX_DiscardUnknown() {
+	xxx_messageInfo_Rollout.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Rollout proto.InternalMessageInfo
 
 func (m *Rollout) GetRolloutId() string {
 	if m != nil {
@@ -526,7 +688,7 @@ func (m *Rollout) GetRolloutId() string {
 	return ""
 }
 
-func (m *Rollout) GetCreateTime() *google_protobuf9.Timestamp {
+func (m *Rollout) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
@@ -547,6 +709,29 @@ func (m *Rollout) GetStatus() Rollout_RolloutStatus {
 	return Rollout_ROLLOUT_STATUS_UNSPECIFIED
 }
 
+type isRollout_Strategy interface {
+	isRollout_Strategy()
+}
+
+type Rollout_TrafficPercentStrategy_ struct {
+	TrafficPercentStrategy *Rollout_TrafficPercentStrategy `protobuf:"bytes,5,opt,name=traffic_percent_strategy,json=trafficPercentStrategy,proto3,oneof"`
+}
+
+type Rollout_DeleteServiceStrategy_ struct {
+	DeleteServiceStrategy *Rollout_DeleteServiceStrategy `protobuf:"bytes,200,opt,name=delete_service_strategy,json=deleteServiceStrategy,proto3,oneof"`
+}
+
+func (*Rollout_TrafficPercentStrategy_) isRollout_Strategy() {}
+
+func (*Rollout_DeleteServiceStrategy_) isRollout_Strategy() {}
+
+func (m *Rollout) GetStrategy() isRollout_Strategy {
+	if m != nil {
+		return m.Strategy
+	}
+	return nil
+}
+
 func (m *Rollout) GetTrafficPercentStrategy() *Rollout_TrafficPercentStrategy {
 	if x, ok := m.GetStrategy().(*Rollout_TrafficPercentStrategy_); ok {
 		return x.TrafficPercentStrategy
@@ -627,12 +812,12 @@ func _Rollout_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Strategy.(type) {
 	case *Rollout_TrafficPercentStrategy_:
 		s := proto.Size(x.TrafficPercentStrategy)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Rollout_DeleteServiceStrategy_:
 		s := proto.Size(x.DeleteServiceStrategy)
-		n += proto.SizeVarint(200<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -642,9 +827,10 @@ func _Rollout_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-// Strategy that specifies how Google Service Control should select
-// different
-// versions of service configurations based on traffic percentage.
+// Strategy that specifies how clients of Google Service Controller want to
+// send traffic to use different config versions. This is generally
+// used by API proxy to split traffic based on your configured precentage for
+// each config version.
 //
 // One example of how to gradually rollout a new service configuration using
 // this
@@ -675,15 +861,35 @@ type Rollout_TrafficPercentStrategy struct {
 	// Maps service configuration IDs to their corresponding traffic percentage.
 	// Key is the service configuration ID, Value is the traffic percentage
 	// which must be greater than 0.0 and the sum must equal to 100.0.
-	Percentages map[string]float64 `protobuf:"bytes,1,rep,name=percentages" json:"percentages,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
+	Percentages          map[string]float64 `protobuf:"bytes,1,rep,name=percentages,proto3" json:"percentages,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
 func (m *Rollout_TrafficPercentStrategy) Reset()         { *m = Rollout_TrafficPercentStrategy{} }
 func (m *Rollout_TrafficPercentStrategy) String() string { return proto.CompactTextString(m) }
 func (*Rollout_TrafficPercentStrategy) ProtoMessage()    {}
 func (*Rollout_TrafficPercentStrategy) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{7, 0}
+	return fileDescriptor_resources_3e116fd147dc632b, []int{7, 0}
 }
+func (m *Rollout_TrafficPercentStrategy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Rollout_TrafficPercentStrategy.Unmarshal(m, b)
+}
+func (m *Rollout_TrafficPercentStrategy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Rollout_TrafficPercentStrategy.Marshal(b, m, deterministic)
+}
+func (dst *Rollout_TrafficPercentStrategy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rollout_TrafficPercentStrategy.Merge(dst, src)
+}
+func (m *Rollout_TrafficPercentStrategy) XXX_Size() int {
+	return xxx_messageInfo_Rollout_TrafficPercentStrategy.Size(m)
+}
+func (m *Rollout_TrafficPercentStrategy) XXX_DiscardUnknown() {
+	xxx_messageInfo_Rollout_TrafficPercentStrategy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Rollout_TrafficPercentStrategy proto.InternalMessageInfo
 
 func (m *Rollout_TrafficPercentStrategy) GetPercentages() map[string]float64 {
 	if m != nil {
@@ -695,15 +901,35 @@ func (m *Rollout_TrafficPercentStrategy) GetPercentages() map[string]float64 {
 // Strategy used to delete a service. This strategy is a placeholder only
 // used by the system generated rollout to delete a service.
 type Rollout_DeleteServiceStrategy struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Rollout_DeleteServiceStrategy) Reset()         { *m = Rollout_DeleteServiceStrategy{} }
 func (m *Rollout_DeleteServiceStrategy) String() string { return proto.CompactTextString(m) }
 func (*Rollout_DeleteServiceStrategy) ProtoMessage()    {}
 func (*Rollout_DeleteServiceStrategy) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{7, 1}
+	return fileDescriptor_resources_3e116fd147dc632b, []int{7, 1}
+}
+func (m *Rollout_DeleteServiceStrategy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Rollout_DeleteServiceStrategy.Unmarshal(m, b)
+}
+func (m *Rollout_DeleteServiceStrategy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Rollout_DeleteServiceStrategy.Marshal(b, m, deterministic)
+}
+func (dst *Rollout_DeleteServiceStrategy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rollout_DeleteServiceStrategy.Merge(dst, src)
+}
+func (m *Rollout_DeleteServiceStrategy) XXX_Size() int {
+	return xxx_messageInfo_Rollout_DeleteServiceStrategy.Size(m)
+}
+func (m *Rollout_DeleteServiceStrategy) XXX_DiscardUnknown() {
+	xxx_messageInfo_Rollout_DeleteServiceStrategy.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Rollout_DeleteServiceStrategy proto.InternalMessageInfo
+
 func init() {
 	proto.RegisterType((*ManagedService)(nil), "google.api.servicemanagement.v1.ManagedService")
 	proto.RegisterType((*OperationMetadata)(nil), "google.api.servicemanagement.v1.OperationMetadata")
@@ -715,6 +941,7 @@ func init() {
 	proto.RegisterType((*ChangeReport)(nil), "google.api.servicemanagement.v1.ChangeReport")
 	proto.RegisterType((*Rollout)(nil), "google.api.servicemanagement.v1.Rollout")
 	proto.RegisterType((*Rollout_TrafficPercentStrategy)(nil), "google.api.servicemanagement.v1.Rollout.TrafficPercentStrategy")
+	proto.RegisterMapType((map[string]float64)(nil), "google.api.servicemanagement.v1.Rollout.TrafficPercentStrategy.PercentagesEntry")
 	proto.RegisterType((*Rollout_DeleteServiceStrategy)(nil), "google.api.servicemanagement.v1.Rollout.DeleteServiceStrategy")
 	proto.RegisterEnum("google.api.servicemanagement.v1.OperationMetadata_Status", OperationMetadata_Status_name, OperationMetadata_Status_value)
 	proto.RegisterEnum("google.api.servicemanagement.v1.Diagnostic_Kind", Diagnostic_Kind_name, Diagnostic_Kind_value)
@@ -722,81 +949,88 @@ func init() {
 	proto.RegisterEnum("google.api.servicemanagement.v1.Rollout_RolloutStatus", Rollout_RolloutStatus_name, Rollout_RolloutStatus_value)
 }
 
-func init() { proto.RegisterFile("google/api/servicemanagement/v1/resources.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/api/servicemanagement/v1/resources.proto", fileDescriptor_resources_3e116fd147dc632b)
+}
 
-var fileDescriptor0 = []byte{
-	// 1166 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_resources_3e116fd147dc632b = []byte{
+	// 1234 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xef, 0x8e, 0xdb, 0x44,
-	0x10, 0xaf, 0xf3, 0xe7, 0xee, 0x32, 0xb9, 0x0b, 0xee, 0x96, 0xf6, 0xd2, 0xd0, 0x3f, 0xc1, 0x15,
-	0xd2, 0x49, 0x48, 0x0e, 0x0d, 0x08, 0x28, 0x95, 0x5a, 0xe5, 0x12, 0xdf, 0x61, 0xc8, 0xd9, 0xee,
-	0xda, 0x07, 0x2a, 0x5f, 0xac, 0xad, 0xbd, 0x71, 0x4d, 0x13, 0xdb, 0xb2, 0x37, 0x27, 0x45, 0xfd,
-	0xc8, 0x0b, 0xf0, 0x0c, 0x7c, 0x81, 0x47, 0xe1, 0x03, 0x4f, 0x00, 0x2f, 0x83, 0xbc, 0x5e, 0xdf,
-	0xe5, 0xcf, 0xa1, 0x14, 0xf8, 0x92, 0xec, 0xfc, 0x66, 0xf6, 0x37, 0xb3, 0xb3, 0x33, 0xb3, 0x86,
-	0x5e, 0x10, 0xc7, 0xc1, 0x94, 0xf6, 0x48, 0x12, 0xf6, 0x32, 0x9a, 0x5e, 0x84, 0x1e, 0x9d, 0x91,
-	0x88, 0x04, 0x74, 0x46, 0x23, 0xd6, 0xbb, 0x78, 0xdc, 0x4b, 0x69, 0x16, 0xcf, 0x53, 0x8f, 0x66,
-	0x6a, 0x92, 0xc6, 0x2c, 0x46, 0x0f, 0x8b, 0x0d, 0x2a, 0x49, 0x42, 0x75, 0x63, 0x83, 0x7a, 0xf1,
-	0xb8, 0x73, 0x6f, 0x89, 0x91, 0x44, 0x51, 0xcc, 0x08, 0x0b, 0xe3, 0x48, 0x6c, 0xef, 0x3c, 0x58,
-	0xd2, 0x7a, 0x71, 0x34, 0x09, 0x03, 0xd7, 0x7b, 0x4d, 0xa2, 0x80, 0x0a, 0x7d, 0x7b, 0x33, 0x1e,
-	0xa1, 0x79, 0x24, 0x34, 0xd3, 0x38, 0x0a, 0xd2, 0x79, 0x14, 0x85, 0x51, 0xd0, 0x8b, 0x13, 0x9a,
-	0xae, 0xd0, 0xdf, 0x15, 0x46, 0x5c, 0x7a, 0x35, 0x9f, 0xf4, 0x48, 0xb4, 0x10, 0xaa, 0xee, 0xba,
-	0x6a, 0x12, 0xd2, 0xa9, 0xef, 0xce, 0x48, 0xf6, 0x46, 0x58, 0xdc, 0x5b, 0xb7, 0xc8, 0x58, 0x3a,
-	0xf7, 0x98, 0xd0, 0x3e, 0x5c, 0xd7, 0xb2, 0x70, 0x46, 0x33, 0x46, 0x66, 0x89, 0x30, 0x38, 0x14,
-	0x06, 0x69, 0xe2, 0xf5, 0x32, 0x46, 0xd8, 0x5c, 0x04, 0xa5, 0x78, 0xd0, 0x3a, 0xe3, 0x29, 0xf2,
-	0xed, 0xe2, 0x44, 0xe8, 0x43, 0xd8, 0x17, 0x87, 0x73, 0x23, 0x32, 0xa3, 0xed, 0x4a, 0x57, 0x3a,
-	0x6a, 0xe0, 0xa6, 0xc0, 0x0c, 0x32, 0xa3, 0x48, 0x85, 0x5b, 0x49, 0x1a, 0xfb, 0x73, 0x8f, 0xa6,
-	0x6e, 0x92, 0xc6, 0x3f, 0x52, 0x8f, 0xb9, 0xa1, 0xdf, 0xae, 0x72, 0xcb, 0x9b, 0xa5, 0xca, 0x2a,
-	0x34, 0xba, 0xaf, 0xfc, 0x55, 0x85, 0x9b, 0x66, 0x99, 0x8e, 0x33, 0xca, 0x88, 0x4f, 0x18, 0x41,
-	0x1f, 0x41, 0xab, 0xbc, 0x40, 0xee, 0x29, 0x6b, 0x4b, 0xdd, 0xea, 0x51, 0x03, 0x1f, 0x94, 0x68,
-	0xee, 0x2b, 0x43, 0x67, 0x50, 0xcf, 0x18, 0x4d, 0xb2, 0x76, 0xa5, 0x5b, 0x3d, 0x6a, 0xf6, 0xbf,
-	0x50, 0xb7, 0x5c, 0xb2, 0xba, 0xe1, 0x49, 0xb5, 0x19, 0x4d, 0x70, 0xc1, 0x82, 0x7a, 0x3c, 0xf6,
-	0x20, 0xa5, 0x59, 0xe6, 0x26, 0x34, 0xf5, 0x68, 0xc4, 0x48, 0x40, 0x79, 0xec, 0x75, 0x8c, 0x4a,
-	0x95, 0x75, 0xa9, 0x41, 0x4f, 0x00, 0x32, 0x46, 0x52, 0xe6, 0xe6, 0x39, 0x6d, 0xd7, 0xba, 0xd2,
-	0x51, 0xb3, 0xdf, 0x29, 0x83, 0x28, 0x13, 0xae, 0x3a, 0x65, 0xc2, 0x71, 0x83, 0x5b, 0xe7, 0x72,
-	0xe7, 0x2d, 0xd4, 0x72, 0xd7, 0xa8, 0x0b, 0x4d, 0x9f, 0x66, 0x5e, 0x1a, 0x26, 0x79, 0x58, 0x65,
-	0x46, 0x97, 0x20, 0xf4, 0x02, 0x76, 0x8a, 0x6b, 0xe1, 0x0e, 0x5a, 0xfd, 0x27, 0xff, 0xe9, 0x94,
-	0x39, 0x01, 0x16, 0x44, 0x4a, 0x00, 0x3b, 0x05, 0x82, 0xee, 0x00, 0xb2, 0x9d, 0x81, 0x73, 0x6e,
-	0xbb, 0xe7, 0x86, 0x6d, 0x69, 0x43, 0xfd, 0x44, 0xd7, 0x46, 0xf2, 0x0d, 0xb4, 0x07, 0xb5, 0x91,
-	0x69, 0x68, 0xb2, 0x84, 0xde, 0x83, 0xa6, 0x61, 0x3a, 0xae, 0xed, 0x0c, 0xb0, 0xa3, 0x8d, 0xe4,
-	0x4a, 0x0e, 0xe8, 0x86, 0x6b, 0x61, 0xf3, 0x14, 0x6b, 0xb6, 0x2d, 0x57, 0x11, 0xc0, 0xce, 0xc9,
-	0x40, 0x1f, 0x6b, 0x23, 0xb9, 0x86, 0x0e, 0xa0, 0x31, 0x1c, 0x18, 0x43, 0x6d, 0x9c, 0x8b, 0x75,
-	0xe5, 0x37, 0x09, 0x60, 0x14, 0x92, 0x20, 0x8a, 0x33, 0x16, 0x7a, 0xa8, 0x03, 0x7b, 0xd3, 0xd8,
-	0xe3, 0xa1, 0xb5, 0x25, 0x7e, 0xd2, 0x4b, 0x19, 0x8d, 0xa0, 0xf6, 0x26, 0x8c, 0x7c, 0x9e, 0x81,
-	0x56, 0xff, 0x93, 0xad, 0x87, 0xbc, 0xa2, 0x55, 0xbf, 0x0d, 0x23, 0x1f, 0xf3, 0xdd, 0xa8, 0x0d,
-	0xbb, 0x33, 0x9a, 0x65, 0xe5, 0xb5, 0x35, 0x70, 0x29, 0x2a, 0x0f, 0xa0, 0x96, 0xdb, 0xa1, 0x26,
-	0xec, 0x7e, 0x3f, 0xc0, 0x86, 0x6e, 0x9c, 0xca, 0x37, 0x50, 0x03, 0xea, 0x1a, 0xc6, 0x26, 0x96,
-	0x25, 0x85, 0xc0, 0xfe, 0x90, 0x37, 0xb6, 0xcd, 0x0b, 0x0c, 0xb5, 0xa0, 0x12, 0xfa, 0xed, 0x3a,
-	0x27, 0xa9, 0x84, 0x3e, 0x1a, 0x40, 0x7d, 0x12, 0x4e, 0x69, 0x59, 0x6b, 0x1f, 0x6f, 0x0d, 0xb0,
-	0x60, 0x3b, 0x09, 0xa7, 0x14, 0x17, 0x3b, 0x95, 0x5f, 0x2b, 0x00, 0x57, 0x28, 0xfa, 0x00, 0x1a,
-	0x39, 0xee, 0x26, 0x84, 0xbd, 0x2e, 0xd3, 0x91, 0x03, 0x16, 0x61, 0xaf, 0xd1, 0x23, 0x38, 0xe0,
-	0x4a, 0x2f, 0x8e, 0x18, 0x8d, 0x58, 0xc6, 0x8f, 0xb3, 0x8f, 0xf7, 0x73, 0x70, 0x28, 0x30, 0xf4,
-	0x42, 0x30, 0xb0, 0x45, 0x42, 0x45, 0x75, 0x7c, 0xf6, 0x2f, 0xe2, 0x52, 0xf3, 0x1f, 0x67, 0x91,
-	0xd0, 0xc2, 0x6f, 0xbe, 0x52, 0x7e, 0x92, 0x60, 0xaf, 0x84, 0xd1, 0x5d, 0xb8, 0x7d, 0xa2, 0x8f,
-	0x35, 0xd7, 0x79, 0x69, 0x69, 0x6b, 0x05, 0x72, 0x08, 0xb7, 0x6c, 0x0d, 0x7f, 0xa7, 0x0f, 0x35,
-	0x77, 0x68, 0x1a, 0x27, 0xfa, 0xa9, 0xfb, 0x72, 0x70, 0x36, 0x96, 0x25, 0x74, 0x13, 0x0e, 0x4c,
-	0x4b, 0x33, 0xdc, 0x81, 0xa5, 0xbb, 0xdf, 0xd8, 0xa6, 0x21, 0x57, 0x56, 0x20, 0x6e, 0x55, 0x45,
-	0xf7, 0xe1, 0x2e, 0x67, 0x1e, 0x69, 0xf6, 0x10, 0xeb, 0x96, 0x63, 0x62, 0xd7, 0xd6, 0x9c, 0xbc,
-	0xaa, 0x1c, 0x53, 0xae, 0x29, 0x0f, 0xa1, 0x51, 0x84, 0x89, 0xe9, 0x04, 0x21, 0xa8, 0xf1, 0x69,
-	0x53, 0xa4, 0x88, 0xaf, 0x15, 0x13, 0xf6, 0x87, 0x7c, 0xfe, 0x62, 0x9a, 0xc4, 0x29, 0x43, 0xcf,
-	0xa1, 0xb5, 0x32, 0x96, 0x8b, 0x81, 0xd1, 0xec, 0xb7, 0x97, 0xd3, 0x51, 0x50, 0x8a, 0x7d, 0x07,
-	0xde, 0x92, 0x94, 0x29, 0x7f, 0xee, 0xc0, 0x2e, 0x8e, 0xa7, 0xd3, 0x78, 0xce, 0xd0, 0x7d, 0x80,
-	0xb4, 0x58, 0xe6, 0xa3, 0xab, 0x70, 0xdb, 0x10, 0x88, 0xee, 0xa3, 0xa7, 0xd0, 0xf4, 0x52, 0x4a,
-	0x18, 0x2d, 0xda, 0xbe, 0xb2, 0xb5, 0xed, 0xa1, 0x30, 0xcf, 0x81, 0x9c, 0xbb, 0x90, 0x7c, 0xf7,
-	0xd5, 0x42, 0xd4, 0x68, 0x43, 0x20, 0xc7, 0x0b, 0x64, 0xac, 0x35, 0xfb, 0xe7, 0x5b, 0xaf, 0x53,
-	0x04, 0x5d, 0xfe, 0xaf, 0x76, 0x3a, 0x7a, 0x0b, 0x6d, 0x96, 0x92, 0xc9, 0x24, 0xf4, 0xca, 0x89,
-	0xe6, 0x66, 0x2c, 0x25, 0x8c, 0x06, 0x0b, 0x5e, 0xdb, 0xcd, 0xfe, 0xf3, 0x77, 0xf6, 0xe0, 0x14,
-	0x44, 0x62, 0xfe, 0xd9, 0x82, 0xe6, 0xeb, 0x1b, 0xf8, 0x0e, 0xbb, 0x56, 0x83, 0x16, 0x70, 0xe8,
-	0xd3, 0x29, 0x65, 0xd4, 0x2d, 0x5f, 0x8d, 0x4b, 0xdf, 0xbf, 0x4b, 0xdc, 0xf9, 0xb3, 0x77, 0x76,
-	0x3e, 0xe2, 0x44, 0xe2, 0x21, 0x5a, 0xf2, 0x7d, 0xdb, 0xbf, 0x4e, 0xb1, 0xf1, 0x52, 0xed, 0x6d,
-	0xbc, 0x54, 0x9d, 0x3f, 0x24, 0xb8, 0x73, 0xfd, 0x91, 0x50, 0x0a, 0xcd, 0xab, 0xf9, 0x5f, 0x96,
-	0x92, 0xf5, 0x3f, 0x13, 0xa5, 0x5e, 0x3d, 0x1c, 0x99, 0x16, 0xb1, 0x74, 0x81, 0x97, 0x9d, 0x74,
-	0x9e, 0x81, 0xbc, 0x6e, 0x80, 0x64, 0xa8, 0xbe, 0xa1, 0x0b, 0x51, 0x81, 0xf9, 0x12, 0xbd, 0x0f,
-	0xf5, 0x0b, 0x32, 0x9d, 0x17, 0x55, 0x27, 0xe1, 0x42, 0xf8, 0xaa, 0xf2, 0xa5, 0xd4, 0x39, 0x84,
-	0xdb, 0xd7, 0xe6, 0x48, 0x99, 0xc3, 0xc1, 0x4a, 0x6d, 0xa0, 0x07, 0xd0, 0xc1, 0xe6, 0x78, 0x6c,
-	0x9e, 0xf3, 0xa9, 0xbe, 0x39, 0xfb, 0xd7, 0x06, 0xbc, 0x94, 0x8f, 0x4c, 0xfb, 0x7c, 0x38, 0xcc,
-	0x85, 0xca, 0xea, 0x84, 0x5f, 0x1d, 0xfe, 0x4d, 0xd8, 0xb5, 0x34, 0x63, 0x94, 0x8f, 0xd6, 0xfa,
-	0x31, 0xc0, 0x5e, 0x79, 0xdb, 0xc7, 0x3f, 0x4b, 0xf0, 0xc8, 0x8b, 0x67, 0xdb, 0x12, 0x78, 0xdc,
-	0xc2, 0xe5, 0x57, 0x9b, 0x95, 0x77, 0x91, 0x25, 0xfd, 0x60, 0x89, 0x2d, 0x41, 0x3c, 0x25, 0x51,
-	0xa0, 0xc6, 0x69, 0xd0, 0x0b, 0x68, 0xc4, 0x7b, 0x4c, 0x7c, 0x02, 0x92, 0x24, 0xcc, 0xfe, 0xf1,
-	0x33, 0xf0, 0xe9, 0x06, 0xf8, 0x4b, 0xa5, 0x76, 0x3a, 0xb0, 0xcf, 0x5e, 0xed, 0x70, 0x8e, 0x4f,
-	0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x64, 0x4d, 0x1e, 0x49, 0x0a, 0x00, 0x00,
+	0x10, 0xaf, 0xf3, 0xef, 0x2e, 0x93, 0xbb, 0xe0, 0x6e, 0x69, 0x2f, 0x0d, 0xfd, 0x73, 0x4d, 0x85,
+	0x74, 0x12, 0x92, 0xc3, 0x1d, 0x08, 0x28, 0x95, 0x5a, 0xe5, 0x1c, 0xdf, 0x11, 0x7a, 0x67, 0xbb,
+	0xeb, 0x5c, 0x51, 0x51, 0x25, 0x6b, 0x6b, 0x6f, 0x5c, 0xd3, 0xc4, 0xb6, 0xec, 0xcd, 0x49, 0x51,
+	0x9f, 0x81, 0x4f, 0xbc, 0x01, 0x9f, 0x10, 0x2f, 0xc0, 0x2b, 0x20, 0xc4, 0x03, 0x20, 0xf1, 0x18,
+	0xbc, 0x00, 0xda, 0xf5, 0xba, 0x97, 0x3f, 0x87, 0x52, 0xe0, 0x4b, 0xb2, 0xf3, 0xfb, 0xcd, 0xce,
+	0xcc, 0xce, 0xce, 0xce, 0x18, 0xba, 0x41, 0x1c, 0x07, 0x63, 0xda, 0x25, 0x49, 0xd8, 0xcd, 0x68,
+	0x7a, 0x1e, 0x7a, 0x74, 0x42, 0x22, 0x12, 0xd0, 0x09, 0x8d, 0x58, 0xf7, 0x7c, 0xbf, 0x9b, 0xd2,
+	0x2c, 0x9e, 0xa6, 0x1e, 0xcd, 0xb4, 0x24, 0x8d, 0x59, 0x8c, 0xee, 0xe6, 0x1b, 0x34, 0x92, 0x84,
+	0xda, 0xca, 0x06, 0xed, 0x7c, 0xbf, 0x7d, 0x6b, 0xce, 0x22, 0x89, 0xa2, 0x98, 0x11, 0x16, 0xc6,
+	0x91, 0xdc, 0xde, 0xbe, 0x33, 0xc7, 0x7a, 0x71, 0x34, 0x0a, 0x03, 0xd7, 0x7b, 0x45, 0xa2, 0x80,
+	0x4a, 0x7e, 0x67, 0x8e, 0x9f, 0x50, 0x96, 0x86, 0x9e, 0x24, 0x5a, 0xab, 0x81, 0x4a, 0xe6, 0xbe,
+	0x64, 0xc6, 0x71, 0x14, 0xa4, 0xd3, 0x28, 0x0a, 0xa3, 0xa0, 0x1b, 0x27, 0x34, 0x5d, 0xf0, 0x7b,
+	0x53, 0x2a, 0x09, 0xe9, 0xe5, 0x74, 0xd4, 0x25, 0xd1, 0x4c, 0x52, 0xbb, 0xcb, 0xd4, 0x28, 0xa4,
+	0x63, 0xdf, 0x9d, 0x90, 0xec, 0xb5, 0xd4, 0xb8, 0xb5, 0xac, 0x91, 0xb1, 0x74, 0xea, 0x31, 0xc9,
+	0xde, 0x5d, 0x66, 0x59, 0x38, 0xa1, 0x19, 0x23, 0x93, 0x64, 0xe9, 0x4c, 0x69, 0xe2, 0x75, 0x33,
+	0x46, 0xd8, 0x54, 0x06, 0xd5, 0xf1, 0xa0, 0x79, 0x2a, 0x72, 0xe7, 0x3b, 0xf9, 0x89, 0xd0, 0x3d,
+	0xd8, 0x92, 0x87, 0x73, 0x23, 0x32, 0xa1, 0xad, 0xd2, 0xae, 0xb2, 0x57, 0xc7, 0x0d, 0x89, 0x99,
+	0x64, 0x42, 0x91, 0x06, 0xd7, 0x92, 0x34, 0xf6, 0xa7, 0x1e, 0x4d, 0xdd, 0x24, 0x8d, 0xbf, 0xa3,
+	0x1e, 0x73, 0x43, 0xbf, 0x55, 0x16, 0x9a, 0x57, 0x0b, 0xca, 0xce, 0x99, 0x81, 0xdf, 0xf9, 0xb3,
+	0x0c, 0x57, 0xad, 0x22, 0x1d, 0xa7, 0x94, 0x11, 0x9f, 0x30, 0x82, 0x3e, 0x84, 0x66, 0x71, 0xb3,
+	0xc2, 0x53, 0xd6, 0x52, 0x76, 0xcb, 0x7b, 0x75, 0xbc, 0x5d, 0xa0, 0xdc, 0x57, 0x86, 0x4e, 0xa1,
+	0x9a, 0x31, 0x9a, 0x64, 0xad, 0xd2, 0x6e, 0x79, 0xaf, 0x71, 0xf0, 0xb9, 0xb6, 0xe6, 0xf6, 0xb5,
+	0x15, 0x4f, 0x9a, 0xc3, 0x68, 0x82, 0x73, 0x2b, 0xa8, 0x2b, 0x62, 0x0f, 0x52, 0x9a, 0x65, 0x6e,
+	0x42, 0x53, 0x8f, 0x46, 0x8c, 0x04, 0x54, 0xc4, 0x5e, 0xc5, 0xa8, 0xa0, 0xec, 0xb7, 0x0c, 0x7a,
+	0x00, 0x90, 0x31, 0x92, 0x32, 0x97, 0xe7, 0xb4, 0x55, 0xd9, 0x55, 0xf6, 0x1a, 0x07, 0xed, 0x22,
+	0x88, 0x22, 0xe1, 0xda, 0xb0, 0x48, 0x38, 0xae, 0x0b, 0x6d, 0x2e, 0xb7, 0xdf, 0x40, 0x85, 0xbb,
+	0x46, 0xbb, 0xd0, 0xf0, 0x69, 0xe6, 0xa5, 0x61, 0xc2, 0xc3, 0x2a, 0x32, 0x3a, 0x07, 0xa1, 0xa7,
+	0x50, 0xcb, 0xaf, 0x45, 0x38, 0x68, 0x1e, 0x3c, 0xf8, 0x4f, 0xa7, 0xe4, 0x06, 0xb0, 0x34, 0xd4,
+	0x09, 0xa0, 0x96, 0x23, 0xe8, 0x06, 0x20, 0x67, 0xd8, 0x1b, 0x9e, 0x39, 0xee, 0x99, 0xe9, 0xd8,
+	0x86, 0x3e, 0x38, 0x1a, 0x18, 0x7d, 0xf5, 0x0a, 0xda, 0x84, 0x4a, 0xdf, 0x32, 0x0d, 0x55, 0x41,
+	0xef, 0x41, 0xc3, 0xb4, 0x86, 0xae, 0x33, 0xec, 0xe1, 0xa1, 0xd1, 0x57, 0x4b, 0x1c, 0x18, 0x98,
+	0xae, 0x8d, 0xad, 0x63, 0x6c, 0x38, 0x8e, 0x5a, 0x46, 0x00, 0xb5, 0xa3, 0xde, 0xe0, 0xc4, 0xe8,
+	0xab, 0x15, 0xb4, 0x0d, 0x75, 0xbd, 0x67, 0xea, 0xc6, 0x09, 0x17, 0xab, 0x9d, 0x9f, 0x14, 0x80,
+	0x7e, 0x48, 0x82, 0x28, 0xce, 0x58, 0xe8, 0xa1, 0x36, 0x6c, 0x8e, 0x63, 0x4f, 0x84, 0xd6, 0x52,
+	0xc4, 0x49, 0xdf, 0xca, 0xa8, 0x0f, 0x95, 0xd7, 0x61, 0xe4, 0x8b, 0x0c, 0x34, 0x0f, 0x3e, 0x5e,
+	0x7b, 0xc8, 0x0b, 0xb3, 0xda, 0x93, 0x30, 0xf2, 0xb1, 0xd8, 0x8d, 0x5a, 0xb0, 0x31, 0xa1, 0x59,
+	0x56, 0x5c, 0x5b, 0x1d, 0x17, 0x62, 0xe7, 0x0e, 0x54, 0xb8, 0x1e, 0x6a, 0xc0, 0xc6, 0x37, 0x3d,
+	0x6c, 0x0e, 0xcc, 0x63, 0xf5, 0x0a, 0xaa, 0x43, 0xd5, 0xc0, 0xd8, 0xc2, 0xaa, 0xd2, 0x21, 0xb0,
+	0xa5, 0x8b, 0x17, 0xef, 0x88, 0x02, 0x43, 0x4d, 0x28, 0x85, 0x7e, 0xab, 0x2a, 0x8c, 0x94, 0x42,
+	0x1f, 0xf5, 0xa0, 0x3a, 0x0a, 0xc7, 0xb4, 0xa8, 0xb5, 0x8f, 0xd6, 0x06, 0x98, 0x5b, 0x3b, 0x0a,
+	0xc7, 0x14, 0xe7, 0x3b, 0x3b, 0xbf, 0x94, 0x00, 0x2e, 0x50, 0xf4, 0x01, 0xd4, 0x39, 0xee, 0x26,
+	0x84, 0xbd, 0x2a, 0xd2, 0xc1, 0x01, 0x9b, 0xb0, 0x57, 0xe8, 0x3e, 0x6c, 0x0b, 0xd2, 0x8b, 0x23,
+	0x46, 0x23, 0x96, 0x89, 0xe3, 0x6c, 0xe1, 0x2d, 0x0e, 0xea, 0x12, 0x43, 0x4f, 0xa5, 0x05, 0x36,
+	0x4b, 0xa8, 0xac, 0x8e, 0x4f, 0xff, 0x45, 0x5c, 0x1a, 0xff, 0x19, 0xce, 0x12, 0x9a, 0xfb, 0xe5,
+	0xab, 0xce, 0x0f, 0x0a, 0x6c, 0x16, 0x30, 0xba, 0x09, 0xd7, 0x8f, 0x06, 0x27, 0x86, 0x3b, 0x7c,
+	0x6e, 0x1b, 0x4b, 0x05, 0xb2, 0x03, 0xd7, 0x1c, 0x03, 0x3f, 0x1b, 0xe8, 0x86, 0xab, 0x5b, 0xe6,
+	0xd1, 0xe0, 0xd8, 0x7d, 0xde, 0x3b, 0x3d, 0x51, 0x15, 0x74, 0x15, 0xb6, 0x2d, 0xdb, 0x30, 0xdd,
+	0x9e, 0x3d, 0x70, 0xbf, 0x76, 0x2c, 0x53, 0x2d, 0x2d, 0x40, 0x42, 0xab, 0x8c, 0x6e, 0xc3, 0x4d,
+	0x61, 0xb9, 0x6f, 0x38, 0x3a, 0x1e, 0xd8, 0x43, 0x0b, 0xbb, 0x8e, 0x31, 0xe4, 0x55, 0x35, 0xb4,
+	0xd4, 0x0a, 0x6a, 0x02, 0x88, 0xa5, 0xcb, 0x95, 0xd4, 0x5a, 0xe7, 0x2e, 0xd4, 0xf3, 0xb0, 0x31,
+	0x1d, 0x21, 0x04, 0x15, 0xd1, 0x7d, 0xf2, 0x94, 0x89, 0x75, 0xc7, 0x82, 0x2d, 0x5d, 0x34, 0x6a,
+	0x4c, 0x93, 0x38, 0x65, 0xe8, 0x31, 0x34, 0x17, 0xfa, 0x77, 0xde, 0x40, 0x1a, 0x07, 0xad, 0xf9,
+	0xf4, 0xe4, 0x26, 0xe5, 0xbe, 0x6d, 0x6f, 0x4e, 0xca, 0x3a, 0x7f, 0xd5, 0x60, 0x03, 0xc7, 0xe3,
+	0x71, 0x3c, 0x65, 0xe8, 0x36, 0x40, 0x9a, 0x2f, 0x79, 0x2b, 0xcb, 0xdd, 0xd6, 0x25, 0x32, 0xf0,
+	0xd1, 0x43, 0x68, 0x78, 0x29, 0x25, 0x8c, 0xe6, 0x6d, 0xa0, 0xb4, 0xb6, 0x0d, 0x40, 0xae, 0xce,
+	0x01, 0x6e, 0x3b, 0x97, 0x7c, 0xf7, 0xe5, 0x4c, 0xd6, 0x6c, 0x5d, 0x22, 0x87, 0x33, 0x64, 0x2e,
+	0x3d, 0xfe, 0xcf, 0xd6, 0x5e, 0xaf, 0x0c, 0xba, 0xf8, 0x5f, 0x7c, 0xf9, 0xe8, 0x0d, 0xb4, 0x58,
+	0x4a, 0x46, 0xa3, 0xd0, 0x2b, 0x3a, 0x9c, 0x9b, 0xb1, 0x94, 0x30, 0x1a, 0xcc, 0x44, 0xad, 0x37,
+	0x0e, 0x1e, 0xbf, 0xb3, 0x87, 0x61, 0x6e, 0x48, 0xf6, 0x43, 0x47, 0x9a, 0xf9, 0xea, 0x0a, 0xbe,
+	0xc1, 0x2e, 0x65, 0xd0, 0x0c, 0x76, 0x7c, 0x3a, 0xa6, 0x8c, 0xba, 0xc5, 0x14, 0x79, 0xeb, 0xfb,
+	0x57, 0x45, 0x38, 0x7f, 0xf4, 0xce, 0xce, 0xfb, 0xc2, 0x90, 0x1c, 0x4c, 0x73, 0xbe, 0xaf, 0xfb,
+	0x97, 0x11, 0x2b, 0x93, 0x6b, 0x73, 0x65, 0x72, 0xb5, 0x7f, 0x57, 0xe0, 0xc6, 0xe5, 0x47, 0x42,
+	0x29, 0x34, 0x2e, 0xe6, 0x41, 0x51, 0x4a, 0xf6, 0xff, 0x4c, 0x94, 0x76, 0x31, 0x48, 0x32, 0x23,
+	0x62, 0xe9, 0x0c, 0xcf, 0x3b, 0x69, 0x3f, 0x02, 0x75, 0x59, 0x01, 0xa9, 0x50, 0x7e, 0x4d, 0x67,
+	0xb2, 0x02, 0xf9, 0x12, 0xbd, 0x0f, 0xd5, 0x73, 0x32, 0x9e, 0xe6, 0x55, 0xa7, 0xe0, 0x5c, 0xf8,
+	0xb2, 0xf4, 0x85, 0xd2, 0xde, 0x81, 0xeb, 0x97, 0xe6, 0xa8, 0xf3, 0xbd, 0x02, 0xdb, 0x0b, 0xc5,
+	0x81, 0xee, 0x40, 0x1b, 0x5b, 0x27, 0x27, 0xd6, 0x99, 0x68, 0xf3, 0xab, 0xc3, 0x60, 0xa9, 0xe3,
+	0x2b, 0xbc, 0x87, 0x3a, 0x67, 0xba, 0xce, 0x85, 0xd2, 0x62, 0xcb, 0x5f, 0x9c, 0x06, 0x0d, 0xd8,
+	0xb0, 0x0d, 0xb3, 0xcf, 0x7b, 0x6d, 0x95, 0x8f, 0x9a, 0x9c, 0x70, 0xb9, 0x33, 0xa3, 0xef, 0x1e,
+	0xf6, 0xf4, 0x27, 0x6a, 0xed, 0x10, 0x60, 0xb3, 0x28, 0x83, 0xc3, 0x3f, 0x14, 0xb8, 0xef, 0xc5,
+	0x93, 0x75, 0x99, 0x3d, 0x6c, 0xe2, 0xe2, 0xbb, 0xcf, 0xe6, 0xcf, 0xcb, 0x56, 0xbe, 0xb5, 0xe5,
+	0x96, 0x20, 0x1e, 0x93, 0x28, 0xd0, 0xe2, 0x34, 0xe8, 0x06, 0x34, 0x12, 0x8f, 0x4f, 0x7e, 0x44,
+	0x92, 0x24, 0xcc, 0xfe, 0xf1, 0x43, 0xf2, 0xe1, 0x0a, 0xf8, 0x63, 0xa9, 0x72, 0xdc, 0x73, 0x4e,
+	0x7f, 0x2e, 0xdd, 0x3b, 0xce, 0x2d, 0xeb, 0xe3, 0x78, 0xea, 0x6b, 0x32, 0x9b, 0xa7, 0x17, 0xe1,
+	0x3c, 0xdb, 0xff, 0xad, 0xd0, 0x79, 0x21, 0x74, 0x5e, 0xac, 0xe8, 0xbc, 0x78, 0xb6, 0xff, 0xb2,
+	0x26, 0x62, 0xf9, 0xe4, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x67, 0x13, 0xc5, 0x22, 0xd3, 0x0a,
+	0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/api/servicemanagement/v1/servicemanager.pb.go b/vendor/google.golang.org/genproto/googleapis/api/servicemanagement/v1/servicemanager.pb.go
index cbd3fb2e..f433adaa 100644
--- a/vendor/google.golang.org/genproto/googleapis/api/servicemanagement/v1/servicemanager.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/api/servicemanagement/v1/servicemanager.pb.go
@@ -1,19 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/api/servicemanagement/v1/servicemanager.proto
 
-package servicemanagement
+package servicemanagement // import "google.golang.org/genproto/googleapis/api/servicemanagement/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import google_api22 "google.golang.org/genproto/googleapis/api/serviceconfig"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
-import _ "google.golang.org/genproto/protobuf/field_mask"
+import any "github.com/golang/protobuf/ptypes/any"
 import _ "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import serviceconfig "google.golang.org/genproto/googleapis/api/serviceconfig"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 import _ "google.golang.org/genproto/googleapis/rpc/status"
+import _ "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -25,6 +24,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type GetServiceConfigRequest_ConfigView int32
 
 const (
@@ -50,30 +55,52 @@ func (x GetServiceConfigRequest_ConfigView) String() string {
 	return proto.EnumName(GetServiceConfigRequest_ConfigView_name, int32(x))
 }
 func (GetServiceConfigRequest_ConfigView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{7, 0}
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{7, 0}
 }
 
 // Request message for `ListServices` method.
 type ListServicesRequest struct {
 	// Include services produced by the specified project.
-	ProducerProjectId string `protobuf:"bytes,1,opt,name=producer_project_id,json=producerProjectId" json:"producer_project_id,omitempty"`
+	ProducerProjectId string `protobuf:"bytes,1,opt,name=producer_project_id,json=producerProjectId,proto3" json:"producer_project_id,omitempty"`
 	// Requested size of the next page of data.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Token identifying which result to start with; returned by a previous list
 	// call.
-	PageToken string `protobuf:"bytes,6,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,6,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Include services consumed by the specified consumer.
 	//
 	// The Google Service Management implementation accepts the following
 	// forms:
 	// - project:<project_id>
-	ConsumerId string `protobuf:"bytes,7,opt,name=consumer_id,json=consumerId" json:"consumer_id,omitempty"`
+	ConsumerId           string   `protobuf:"bytes,7,opt,name=consumer_id,json=consumerId,proto3" json:"consumer_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListServicesRequest) Reset()                    { *m = ListServicesRequest{} }
-func (m *ListServicesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListServicesRequest) ProtoMessage()               {}
-func (*ListServicesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *ListServicesRequest) Reset()         { *m = ListServicesRequest{} }
+func (m *ListServicesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListServicesRequest) ProtoMessage()    {}
+func (*ListServicesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{0}
+}
+func (m *ListServicesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServicesRequest.Unmarshal(m, b)
+}
+func (m *ListServicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServicesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListServicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServicesRequest.Merge(dst, src)
+}
+func (m *ListServicesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListServicesRequest.Size(m)
+}
+func (m *ListServicesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServicesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListServicesRequest proto.InternalMessageInfo
 
 func (m *ListServicesRequest) GetProducerProjectId() string {
 	if m != nil {
@@ -106,15 +133,37 @@ func (m *ListServicesRequest) GetConsumerId() string {
 // Response message for `ListServices` method.
 type ListServicesResponse struct {
 	// The returned services will only have the name field set.
-	Services []*ManagedService `protobuf:"bytes,1,rep,name=services" json:"services,omitempty"`
+	Services []*ManagedService `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"`
 	// Token that can be passed to `ListServices` to resume a paginated query.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListServicesResponse) Reset()         { *m = ListServicesResponse{} }
+func (m *ListServicesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListServicesResponse) ProtoMessage()    {}
+func (*ListServicesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{1}
+}
+func (m *ListServicesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServicesResponse.Unmarshal(m, b)
+}
+func (m *ListServicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServicesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListServicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServicesResponse.Merge(dst, src)
+}
+func (m *ListServicesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListServicesResponse.Size(m)
+}
+func (m *ListServicesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServicesResponse.DiscardUnknown(m)
 }
 
-func (m *ListServicesResponse) Reset()                    { *m = ListServicesResponse{} }
-func (m *ListServicesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListServicesResponse) ProtoMessage()               {}
-func (*ListServicesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_ListServicesResponse proto.InternalMessageInfo
 
 func (m *ListServicesResponse) GetServices() []*ManagedService {
 	if m != nil {
@@ -134,13 +183,35 @@ func (m *ListServicesResponse) GetNextPageToken() string {
 type GetServiceRequest struct {
 	// The name of the service.  See the `ServiceManager` overview for naming
 	// requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName          string   `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetServiceRequest) Reset()                    { *m = GetServiceRequest{} }
-func (m *GetServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServiceRequest) ProtoMessage()               {}
-func (*GetServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *GetServiceRequest) Reset()         { *m = GetServiceRequest{} }
+func (m *GetServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServiceRequest) ProtoMessage()    {}
+func (*GetServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{2}
+}
+func (m *GetServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServiceRequest.Unmarshal(m, b)
+}
+func (m *GetServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceRequest.Merge(dst, src)
+}
+func (m *GetServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServiceRequest.Size(m)
+}
+func (m *GetServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServiceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetServiceRequest proto.InternalMessageInfo
 
 func (m *GetServiceRequest) GetServiceName() string {
 	if m != nil {
@@ -152,13 +223,35 @@ func (m *GetServiceRequest) GetServiceName() string {
 // Request message for CreateService method.
 type CreateServiceRequest struct {
 	// Initial values for the service resource.
-	Service *ManagedService `protobuf:"bytes,1,opt,name=service" json:"service,omitempty"`
+	Service              *ManagedService `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *CreateServiceRequest) Reset()         { *m = CreateServiceRequest{} }
+func (m *CreateServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateServiceRequest) ProtoMessage()    {}
+func (*CreateServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{3}
+}
+func (m *CreateServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateServiceRequest.Unmarshal(m, b)
+}
+func (m *CreateServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceRequest.Merge(dst, src)
+}
+func (m *CreateServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateServiceRequest.Size(m)
+}
+func (m *CreateServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateServiceRequest.DiscardUnknown(m)
 }
 
-func (m *CreateServiceRequest) Reset()                    { *m = CreateServiceRequest{} }
-func (m *CreateServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateServiceRequest) ProtoMessage()               {}
-func (*CreateServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_CreateServiceRequest proto.InternalMessageInfo
 
 func (m *CreateServiceRequest) GetService() *ManagedService {
 	if m != nil {
@@ -171,13 +264,35 @@ func (m *CreateServiceRequest) GetService() *ManagedService {
 type DeleteServiceRequest struct {
 	// The name of the service.  See the [overview](/service-management/overview)
 	// for naming requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName          string   `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteServiceRequest) Reset()         { *m = DeleteServiceRequest{} }
+func (m *DeleteServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteServiceRequest) ProtoMessage()    {}
+func (*DeleteServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{4}
+}
+func (m *DeleteServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteServiceRequest.Unmarshal(m, b)
+}
+func (m *DeleteServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteServiceRequest.Merge(dst, src)
+}
+func (m *DeleteServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteServiceRequest.Size(m)
+}
+func (m *DeleteServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteServiceRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteServiceRequest) Reset()                    { *m = DeleteServiceRequest{} }
-func (m *DeleteServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteServiceRequest) ProtoMessage()               {}
-func (*DeleteServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_DeleteServiceRequest proto.InternalMessageInfo
 
 func (m *DeleteServiceRequest) GetServiceName() string {
 	if m != nil {
@@ -190,13 +305,35 @@ func (m *DeleteServiceRequest) GetServiceName() string {
 type UndeleteServiceRequest struct {
 	// The name of the service. See the [overview](/service-management/overview)
 	// for naming requirements. For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName          string   `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UndeleteServiceRequest) Reset()                    { *m = UndeleteServiceRequest{} }
-func (m *UndeleteServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*UndeleteServiceRequest) ProtoMessage()               {}
-func (*UndeleteServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *UndeleteServiceRequest) Reset()         { *m = UndeleteServiceRequest{} }
+func (m *UndeleteServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*UndeleteServiceRequest) ProtoMessage()    {}
+func (*UndeleteServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{5}
+}
+func (m *UndeleteServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UndeleteServiceRequest.Unmarshal(m, b)
+}
+func (m *UndeleteServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UndeleteServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *UndeleteServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteServiceRequest.Merge(dst, src)
+}
+func (m *UndeleteServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_UndeleteServiceRequest.Size(m)
+}
+func (m *UndeleteServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UndeleteServiceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UndeleteServiceRequest proto.InternalMessageInfo
 
 func (m *UndeleteServiceRequest) GetServiceName() string {
 	if m != nil {
@@ -208,13 +345,35 @@ func (m *UndeleteServiceRequest) GetServiceName() string {
 // Response message for UndeleteService method.
 type UndeleteServiceResponse struct {
 	// Revived service resource.
-	Service *ManagedService `protobuf:"bytes,1,opt,name=service" json:"service,omitempty"`
+	Service              *ManagedService `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *UndeleteServiceResponse) Reset()         { *m = UndeleteServiceResponse{} }
+func (m *UndeleteServiceResponse) String() string { return proto.CompactTextString(m) }
+func (*UndeleteServiceResponse) ProtoMessage()    {}
+func (*UndeleteServiceResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{6}
+}
+func (m *UndeleteServiceResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UndeleteServiceResponse.Unmarshal(m, b)
+}
+func (m *UndeleteServiceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UndeleteServiceResponse.Marshal(b, m, deterministic)
+}
+func (dst *UndeleteServiceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteServiceResponse.Merge(dst, src)
+}
+func (m *UndeleteServiceResponse) XXX_Size() int {
+	return xxx_messageInfo_UndeleteServiceResponse.Size(m)
+}
+func (m *UndeleteServiceResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_UndeleteServiceResponse.DiscardUnknown(m)
 }
 
-func (m *UndeleteServiceResponse) Reset()                    { *m = UndeleteServiceResponse{} }
-func (m *UndeleteServiceResponse) String() string            { return proto.CompactTextString(m) }
-func (*UndeleteServiceResponse) ProtoMessage()               {}
-func (*UndeleteServiceResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_UndeleteServiceResponse proto.InternalMessageInfo
 
 func (m *UndeleteServiceResponse) GetService() *ManagedService {
 	if m != nil {
@@ -227,18 +386,40 @@ func (m *UndeleteServiceResponse) GetService() *ManagedService {
 type GetServiceConfigRequest struct {
 	// The name of the service.  See the [overview](/service-management/overview)
 	// for naming requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The id of the service configuration resource.
-	ConfigId string `protobuf:"bytes,2,opt,name=config_id,json=configId" json:"config_id,omitempty"`
+	ConfigId string `protobuf:"bytes,2,opt,name=config_id,json=configId,proto3" json:"config_id,omitempty"`
 	// Specifies which parts of the Service Config should be returned in the
 	// response.
-	View GetServiceConfigRequest_ConfigView `protobuf:"varint,3,opt,name=view,enum=google.api.servicemanagement.v1.GetServiceConfigRequest_ConfigView" json:"view,omitempty"`
+	View                 GetServiceConfigRequest_ConfigView `protobuf:"varint,3,opt,name=view,proto3,enum=google.api.servicemanagement.v1.GetServiceConfigRequest_ConfigView" json:"view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
+}
+
+func (m *GetServiceConfigRequest) Reset()         { *m = GetServiceConfigRequest{} }
+func (m *GetServiceConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServiceConfigRequest) ProtoMessage()    {}
+func (*GetServiceConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{7}
+}
+func (m *GetServiceConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServiceConfigRequest.Unmarshal(m, b)
+}
+func (m *GetServiceConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServiceConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServiceConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceConfigRequest.Merge(dst, src)
+}
+func (m *GetServiceConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServiceConfigRequest.Size(m)
+}
+func (m *GetServiceConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServiceConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetServiceConfigRequest) Reset()                    { *m = GetServiceConfigRequest{} }
-func (m *GetServiceConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServiceConfigRequest) ProtoMessage()               {}
-func (*GetServiceConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_GetServiceConfigRequest proto.InternalMessageInfo
 
 func (m *GetServiceConfigRequest) GetServiceName() string {
 	if m != nil {
@@ -265,17 +446,39 @@ func (m *GetServiceConfigRequest) GetView() GetServiceConfigRequest_ConfigView {
 type ListServiceConfigsRequest struct {
 	// The name of the service.  See the [overview](/service-management/overview)
 	// for naming requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The token of the page to retrieve.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The max number of items to include in the response list.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListServiceConfigsRequest) Reset()         { *m = ListServiceConfigsRequest{} }
+func (m *ListServiceConfigsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListServiceConfigsRequest) ProtoMessage()    {}
+func (*ListServiceConfigsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{8}
+}
+func (m *ListServiceConfigsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceConfigsRequest.Unmarshal(m, b)
+}
+func (m *ListServiceConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceConfigsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceConfigsRequest.Merge(dst, src)
+}
+func (m *ListServiceConfigsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListServiceConfigsRequest.Size(m)
+}
+func (m *ListServiceConfigsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceConfigsRequest.DiscardUnknown(m)
 }
 
-func (m *ListServiceConfigsRequest) Reset()                    { *m = ListServiceConfigsRequest{} }
-func (m *ListServiceConfigsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceConfigsRequest) ProtoMessage()               {}
-func (*ListServiceConfigsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+var xxx_messageInfo_ListServiceConfigsRequest proto.InternalMessageInfo
 
 func (m *ListServiceConfigsRequest) GetServiceName() string {
 	if m != nil {
@@ -301,17 +504,39 @@ func (m *ListServiceConfigsRequest) GetPageSize() int32 {
 // Response message for ListServiceConfigs method.
 type ListServiceConfigsResponse struct {
 	// The list of service configuration resources.
-	ServiceConfigs []*google_api22.Service `protobuf:"bytes,1,rep,name=service_configs,json=serviceConfigs" json:"service_configs,omitempty"`
+	ServiceConfigs []*serviceconfig.Service `protobuf:"bytes,1,rep,name=service_configs,json=serviceConfigs,proto3" json:"service_configs,omitempty"`
 	// The token of the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListServiceConfigsResponse) Reset()         { *m = ListServiceConfigsResponse{} }
+func (m *ListServiceConfigsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListServiceConfigsResponse) ProtoMessage()    {}
+func (*ListServiceConfigsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{9}
+}
+func (m *ListServiceConfigsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceConfigsResponse.Unmarshal(m, b)
+}
+func (m *ListServiceConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceConfigsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceConfigsResponse.Merge(dst, src)
+}
+func (m *ListServiceConfigsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListServiceConfigsResponse.Size(m)
+}
+func (m *ListServiceConfigsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceConfigsResponse.DiscardUnknown(m)
 }
 
-func (m *ListServiceConfigsResponse) Reset()                    { *m = ListServiceConfigsResponse{} }
-func (m *ListServiceConfigsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceConfigsResponse) ProtoMessage()               {}
-func (*ListServiceConfigsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_ListServiceConfigsResponse proto.InternalMessageInfo
 
-func (m *ListServiceConfigsResponse) GetServiceConfigs() []*google_api22.Service {
+func (m *ListServiceConfigsResponse) GetServiceConfigs() []*serviceconfig.Service {
 	if m != nil {
 		return m.ServiceConfigs
 	}
@@ -329,15 +554,37 @@ func (m *ListServiceConfigsResponse) GetNextPageToken() string {
 type CreateServiceConfigRequest struct {
 	// The name of the service.  See the [overview](/service-management/overview)
 	// for naming requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The service configuration resource.
-	ServiceConfig *google_api22.Service `protobuf:"bytes,2,opt,name=service_config,json=serviceConfig" json:"service_config,omitempty"`
+	ServiceConfig        *serviceconfig.Service `protobuf:"bytes,2,opt,name=service_config,json=serviceConfig,proto3" json:"service_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
-func (m *CreateServiceConfigRequest) Reset()                    { *m = CreateServiceConfigRequest{} }
-func (m *CreateServiceConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateServiceConfigRequest) ProtoMessage()               {}
-func (*CreateServiceConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *CreateServiceConfigRequest) Reset()         { *m = CreateServiceConfigRequest{} }
+func (m *CreateServiceConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateServiceConfigRequest) ProtoMessage()    {}
+func (*CreateServiceConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{10}
+}
+func (m *CreateServiceConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateServiceConfigRequest.Unmarshal(m, b)
+}
+func (m *CreateServiceConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateServiceConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateServiceConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceConfigRequest.Merge(dst, src)
+}
+func (m *CreateServiceConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateServiceConfigRequest.Size(m)
+}
+func (m *CreateServiceConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateServiceConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateServiceConfigRequest proto.InternalMessageInfo
 
 func (m *CreateServiceConfigRequest) GetServiceName() string {
 	if m != nil {
@@ -346,7 +593,7 @@ func (m *CreateServiceConfigRequest) GetServiceName() string {
 	return ""
 }
 
-func (m *CreateServiceConfigRequest) GetServiceConfig() *google_api22.Service {
+func (m *CreateServiceConfigRequest) GetServiceConfig() *serviceconfig.Service {
 	if m != nil {
 		return m.ServiceConfig
 	}
@@ -357,19 +604,41 @@ func (m *CreateServiceConfigRequest) GetServiceConfig() *google_api22.Service {
 type SubmitConfigSourceRequest struct {
 	// The name of the service.  See the [overview](/service-management/overview)
 	// for naming requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The source configuration for the service.
-	ConfigSource *ConfigSource `protobuf:"bytes,2,opt,name=config_source,json=configSource" json:"config_source,omitempty"`
+	ConfigSource *ConfigSource `protobuf:"bytes,2,opt,name=config_source,json=configSource,proto3" json:"config_source,omitempty"`
 	// Optional. If set, this will result in the generation of a
 	// `google.api.Service` configuration based on the `ConfigSource` provided,
 	// but the generated config and the sources will NOT be persisted.
-	ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly" json:"validate_only,omitempty"`
+	ValidateOnly         bool     `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SubmitConfigSourceRequest) Reset()         { *m = SubmitConfigSourceRequest{} }
+func (m *SubmitConfigSourceRequest) String() string { return proto.CompactTextString(m) }
+func (*SubmitConfigSourceRequest) ProtoMessage()    {}
+func (*SubmitConfigSourceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{11}
+}
+func (m *SubmitConfigSourceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SubmitConfigSourceRequest.Unmarshal(m, b)
+}
+func (m *SubmitConfigSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SubmitConfigSourceRequest.Marshal(b, m, deterministic)
+}
+func (dst *SubmitConfigSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubmitConfigSourceRequest.Merge(dst, src)
+}
+func (m *SubmitConfigSourceRequest) XXX_Size() int {
+	return xxx_messageInfo_SubmitConfigSourceRequest.Size(m)
+}
+func (m *SubmitConfigSourceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SubmitConfigSourceRequest.DiscardUnknown(m)
 }
 
-func (m *SubmitConfigSourceRequest) Reset()                    { *m = SubmitConfigSourceRequest{} }
-func (m *SubmitConfigSourceRequest) String() string            { return proto.CompactTextString(m) }
-func (*SubmitConfigSourceRequest) ProtoMessage()               {}
-func (*SubmitConfigSourceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+var xxx_messageInfo_SubmitConfigSourceRequest proto.InternalMessageInfo
 
 func (m *SubmitConfigSourceRequest) GetServiceName() string {
 	if m != nil {
@@ -395,15 +664,37 @@ func (m *SubmitConfigSourceRequest) GetValidateOnly() bool {
 // Response message for SubmitConfigSource method.
 type SubmitConfigSourceResponse struct {
 	// The generated service configuration.
-	ServiceConfig *google_api22.Service `protobuf:"bytes,1,opt,name=service_config,json=serviceConfig" json:"service_config,omitempty"`
+	ServiceConfig        *serviceconfig.Service `protobuf:"bytes,1,opt,name=service_config,json=serviceConfig,proto3" json:"service_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *SubmitConfigSourceResponse) Reset()         { *m = SubmitConfigSourceResponse{} }
+func (m *SubmitConfigSourceResponse) String() string { return proto.CompactTextString(m) }
+func (*SubmitConfigSourceResponse) ProtoMessage()    {}
+func (*SubmitConfigSourceResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{12}
+}
+func (m *SubmitConfigSourceResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SubmitConfigSourceResponse.Unmarshal(m, b)
+}
+func (m *SubmitConfigSourceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SubmitConfigSourceResponse.Marshal(b, m, deterministic)
+}
+func (dst *SubmitConfigSourceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubmitConfigSourceResponse.Merge(dst, src)
+}
+func (m *SubmitConfigSourceResponse) XXX_Size() int {
+	return xxx_messageInfo_SubmitConfigSourceResponse.Size(m)
+}
+func (m *SubmitConfigSourceResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SubmitConfigSourceResponse.DiscardUnknown(m)
 }
 
-func (m *SubmitConfigSourceResponse) Reset()                    { *m = SubmitConfigSourceResponse{} }
-func (m *SubmitConfigSourceResponse) String() string            { return proto.CompactTextString(m) }
-func (*SubmitConfigSourceResponse) ProtoMessage()               {}
-func (*SubmitConfigSourceResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+var xxx_messageInfo_SubmitConfigSourceResponse proto.InternalMessageInfo
 
-func (m *SubmitConfigSourceResponse) GetServiceConfig() *google_api22.Service {
+func (m *SubmitConfigSourceResponse) GetServiceConfig() *serviceconfig.Service {
 	if m != nil {
 		return m.ServiceConfig
 	}
@@ -414,15 +705,37 @@ func (m *SubmitConfigSourceResponse) GetServiceConfig() *google_api22.Service {
 type CreateServiceRolloutRequest struct {
 	// The name of the service.  See the [overview](/service-management/overview)
 	// for naming requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The rollout resource. The `service_name` field is output only.
-	Rollout *Rollout `protobuf:"bytes,2,opt,name=rollout" json:"rollout,omitempty"`
+	Rollout              *Rollout `protobuf:"bytes,2,opt,name=rollout,proto3" json:"rollout,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateServiceRolloutRequest) Reset()         { *m = CreateServiceRolloutRequest{} }
+func (m *CreateServiceRolloutRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateServiceRolloutRequest) ProtoMessage()    {}
+func (*CreateServiceRolloutRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{13}
+}
+func (m *CreateServiceRolloutRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateServiceRolloutRequest.Unmarshal(m, b)
+}
+func (m *CreateServiceRolloutRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateServiceRolloutRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateServiceRolloutRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceRolloutRequest.Merge(dst, src)
+}
+func (m *CreateServiceRolloutRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateServiceRolloutRequest.Size(m)
+}
+func (m *CreateServiceRolloutRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateServiceRolloutRequest.DiscardUnknown(m)
 }
 
-func (m *CreateServiceRolloutRequest) Reset()                    { *m = CreateServiceRolloutRequest{} }
-func (m *CreateServiceRolloutRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateServiceRolloutRequest) ProtoMessage()               {}
-func (*CreateServiceRolloutRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+var xxx_messageInfo_CreateServiceRolloutRequest proto.InternalMessageInfo
 
 func (m *CreateServiceRolloutRequest) GetServiceName() string {
 	if m != nil {
@@ -442,11 +755,11 @@ func (m *CreateServiceRolloutRequest) GetRollout() *Rollout {
 type ListServiceRolloutsRequest struct {
 	// The name of the service.  See the [overview](/service-management/overview)
 	// for naming requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The token of the page to retrieve.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The max number of items to include in the response list.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Use `filter` to return subset of rollouts.
 	// The following filters are supported:
 	//   -- To limit the results to only those in
@@ -455,13 +768,35 @@ type ListServiceRolloutsRequest struct {
 	//   -- To limit the results to those in
 	//      [status](google.api.servicemanagement.v1.RolloutStatus) 'CANCELLED'
 	//      or 'FAILED', use filter='status=CANCELLED OR status=FAILED'
-	Filter string `protobuf:"bytes,4,opt,name=filter" json:"filter,omitempty"`
+	Filter               string   `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListServiceRolloutsRequest) Reset()         { *m = ListServiceRolloutsRequest{} }
+func (m *ListServiceRolloutsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListServiceRolloutsRequest) ProtoMessage()    {}
+func (*ListServiceRolloutsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{14}
+}
+func (m *ListServiceRolloutsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceRolloutsRequest.Unmarshal(m, b)
+}
+func (m *ListServiceRolloutsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceRolloutsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceRolloutsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceRolloutsRequest.Merge(dst, src)
+}
+func (m *ListServiceRolloutsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListServiceRolloutsRequest.Size(m)
+}
+func (m *ListServiceRolloutsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceRolloutsRequest.DiscardUnknown(m)
 }
 
-func (m *ListServiceRolloutsRequest) Reset()                    { *m = ListServiceRolloutsRequest{} }
-func (m *ListServiceRolloutsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceRolloutsRequest) ProtoMessage()               {}
-func (*ListServiceRolloutsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+var xxx_messageInfo_ListServiceRolloutsRequest proto.InternalMessageInfo
 
 func (m *ListServiceRolloutsRequest) GetServiceName() string {
 	if m != nil {
@@ -494,15 +829,37 @@ func (m *ListServiceRolloutsRequest) GetFilter() string {
 // Response message for ListServiceRollouts method.
 type ListServiceRolloutsResponse struct {
 	// The list of rollout resources.
-	Rollouts []*Rollout `protobuf:"bytes,1,rep,name=rollouts" json:"rollouts,omitempty"`
+	Rollouts []*Rollout `protobuf:"bytes,1,rep,name=rollouts,proto3" json:"rollouts,omitempty"`
 	// The token of the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListServiceRolloutsResponse) Reset()                    { *m = ListServiceRolloutsResponse{} }
-func (m *ListServiceRolloutsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceRolloutsResponse) ProtoMessage()               {}
-func (*ListServiceRolloutsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+func (m *ListServiceRolloutsResponse) Reset()         { *m = ListServiceRolloutsResponse{} }
+func (m *ListServiceRolloutsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListServiceRolloutsResponse) ProtoMessage()    {}
+func (*ListServiceRolloutsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{15}
+}
+func (m *ListServiceRolloutsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceRolloutsResponse.Unmarshal(m, b)
+}
+func (m *ListServiceRolloutsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceRolloutsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceRolloutsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceRolloutsResponse.Merge(dst, src)
+}
+func (m *ListServiceRolloutsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListServiceRolloutsResponse.Size(m)
+}
+func (m *ListServiceRolloutsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceRolloutsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListServiceRolloutsResponse proto.InternalMessageInfo
 
 func (m *ListServiceRolloutsResponse) GetRollouts() []*Rollout {
 	if m != nil {
@@ -522,15 +879,37 @@ func (m *ListServiceRolloutsResponse) GetNextPageToken() string {
 type GetServiceRolloutRequest struct {
 	// The name of the service.  See the [overview](/service-management/overview)
 	// for naming requirements.  For example: `example.googleapis.com`.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The id of the rollout resource.
-	RolloutId string `protobuf:"bytes,2,opt,name=rollout_id,json=rolloutId" json:"rollout_id,omitempty"`
+	RolloutId            string   `protobuf:"bytes,2,opt,name=rollout_id,json=rolloutId,proto3" json:"rollout_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServiceRolloutRequest) Reset()         { *m = GetServiceRolloutRequest{} }
+func (m *GetServiceRolloutRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServiceRolloutRequest) ProtoMessage()    {}
+func (*GetServiceRolloutRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{16}
+}
+func (m *GetServiceRolloutRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServiceRolloutRequest.Unmarshal(m, b)
+}
+func (m *GetServiceRolloutRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServiceRolloutRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServiceRolloutRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceRolloutRequest.Merge(dst, src)
+}
+func (m *GetServiceRolloutRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServiceRolloutRequest.Size(m)
+}
+func (m *GetServiceRolloutRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServiceRolloutRequest.DiscardUnknown(m)
 }
 
-func (m *GetServiceRolloutRequest) Reset()                    { *m = GetServiceRolloutRequest{} }
-func (m *GetServiceRolloutRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServiceRolloutRequest) ProtoMessage()               {}
-func (*GetServiceRolloutRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+var xxx_messageInfo_GetServiceRolloutRequest proto.InternalMessageInfo
 
 func (m *GetServiceRolloutRequest) GetServiceName() string {
 	if m != nil {
@@ -550,7 +929,7 @@ func (m *GetServiceRolloutRequest) GetRolloutId() string {
 type EnableServiceRequest struct {
 	// Name of the service to enable. Specifying an unknown service name will
 	// cause the request to fail.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The identity of consumer resource which service enablement will be
 	// applied to.
 	//
@@ -560,13 +939,35 @@ type EnableServiceRequest struct {
 	//
 	// Note: this is made compatible with
 	// google.api.servicecontrol.v1.Operation.consumer_id.
-	ConsumerId string `protobuf:"bytes,2,opt,name=consumer_id,json=consumerId" json:"consumer_id,omitempty"`
+	ConsumerId           string   `protobuf:"bytes,2,opt,name=consumer_id,json=consumerId,proto3" json:"consumer_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EnableServiceRequest) Reset()         { *m = EnableServiceRequest{} }
+func (m *EnableServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*EnableServiceRequest) ProtoMessage()    {}
+func (*EnableServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{17}
+}
+func (m *EnableServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EnableServiceRequest.Unmarshal(m, b)
+}
+func (m *EnableServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EnableServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *EnableServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnableServiceRequest.Merge(dst, src)
+}
+func (m *EnableServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_EnableServiceRequest.Size(m)
+}
+func (m *EnableServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_EnableServiceRequest.DiscardUnknown(m)
 }
 
-func (m *EnableServiceRequest) Reset()                    { *m = EnableServiceRequest{} }
-func (m *EnableServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*EnableServiceRequest) ProtoMessage()               {}
-func (*EnableServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+var xxx_messageInfo_EnableServiceRequest proto.InternalMessageInfo
 
 func (m *EnableServiceRequest) GetServiceName() string {
 	if m != nil {
@@ -586,7 +987,7 @@ func (m *EnableServiceRequest) GetConsumerId() string {
 type DisableServiceRequest struct {
 	// Name of the service to disable. Specifying an unknown service name
 	// will cause the request to fail.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The identity of consumer resource which service disablement will be
 	// applied to.
 	//
@@ -596,13 +997,35 @@ type DisableServiceRequest struct {
 	//
 	// Note: this is made compatible with
 	// google.api.servicecontrol.v1.Operation.consumer_id.
-	ConsumerId string `protobuf:"bytes,2,opt,name=consumer_id,json=consumerId" json:"consumer_id,omitempty"`
+	ConsumerId           string   `protobuf:"bytes,2,opt,name=consumer_id,json=consumerId,proto3" json:"consumer_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DisableServiceRequest) Reset()         { *m = DisableServiceRequest{} }
+func (m *DisableServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*DisableServiceRequest) ProtoMessage()    {}
+func (*DisableServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{18}
+}
+func (m *DisableServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DisableServiceRequest.Unmarshal(m, b)
+}
+func (m *DisableServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DisableServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DisableServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DisableServiceRequest.Merge(dst, src)
+}
+func (m *DisableServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_DisableServiceRequest.Size(m)
+}
+func (m *DisableServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DisableServiceRequest.DiscardUnknown(m)
 }
 
-func (m *DisableServiceRequest) Reset()                    { *m = DisableServiceRequest{} }
-func (m *DisableServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DisableServiceRequest) ProtoMessage()               {}
-func (*DisableServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{18} }
+var xxx_messageInfo_DisableServiceRequest proto.InternalMessageInfo
 
 func (m *DisableServiceRequest) GetServiceName() string {
 	if m != nil {
@@ -625,28 +1048,50 @@ type GenerateConfigReportRequest struct {
 	// [google.api.servicemanagement.v1.ConfigRef][google.api.servicemanagement.v1.ConfigRef],
 	// [google.api.servicemanagement.v1.ConfigSource][google.api.servicemanagement.v1.ConfigSource],
 	// and [google.api.Service][google.api.Service]
-	NewConfig *google_protobuf1.Any `protobuf:"bytes,1,opt,name=new_config,json=newConfig" json:"new_config,omitempty"`
+	NewConfig *any.Any `protobuf:"bytes,1,opt,name=new_config,json=newConfig,proto3" json:"new_config,omitempty"`
 	// Service configuration against which the comparison will be done.
 	// For this version of API, the supported types are
 	// [google.api.servicemanagement.v1.ConfigRef][google.api.servicemanagement.v1.ConfigRef],
 	// [google.api.servicemanagement.v1.ConfigSource][google.api.servicemanagement.v1.ConfigSource],
 	// and [google.api.Service][google.api.Service]
-	OldConfig *google_protobuf1.Any `protobuf:"bytes,2,opt,name=old_config,json=oldConfig" json:"old_config,omitempty"`
+	OldConfig            *any.Any `protobuf:"bytes,2,opt,name=old_config,json=oldConfig,proto3" json:"old_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GenerateConfigReportRequest) Reset()         { *m = GenerateConfigReportRequest{} }
+func (m *GenerateConfigReportRequest) String() string { return proto.CompactTextString(m) }
+func (*GenerateConfigReportRequest) ProtoMessage()    {}
+func (*GenerateConfigReportRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{19}
+}
+func (m *GenerateConfigReportRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GenerateConfigReportRequest.Unmarshal(m, b)
+}
+func (m *GenerateConfigReportRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GenerateConfigReportRequest.Marshal(b, m, deterministic)
+}
+func (dst *GenerateConfigReportRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateConfigReportRequest.Merge(dst, src)
+}
+func (m *GenerateConfigReportRequest) XXX_Size() int {
+	return xxx_messageInfo_GenerateConfigReportRequest.Size(m)
+}
+func (m *GenerateConfigReportRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GenerateConfigReportRequest.DiscardUnknown(m)
 }
 
-func (m *GenerateConfigReportRequest) Reset()                    { *m = GenerateConfigReportRequest{} }
-func (m *GenerateConfigReportRequest) String() string            { return proto.CompactTextString(m) }
-func (*GenerateConfigReportRequest) ProtoMessage()               {}
-func (*GenerateConfigReportRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{19} }
+var xxx_messageInfo_GenerateConfigReportRequest proto.InternalMessageInfo
 
-func (m *GenerateConfigReportRequest) GetNewConfig() *google_protobuf1.Any {
+func (m *GenerateConfigReportRequest) GetNewConfig() *any.Any {
 	if m != nil {
 		return m.NewConfig
 	}
 	return nil
 }
 
-func (m *GenerateConfigReportRequest) GetOldConfig() *google_protobuf1.Any {
+func (m *GenerateConfigReportRequest) GetOldConfig() *any.Any {
 	if m != nil {
 		return m.OldConfig
 	}
@@ -656,22 +1101,44 @@ func (m *GenerateConfigReportRequest) GetOldConfig() *google_protobuf1.Any {
 // Response message for GenerateConfigReport method.
 type GenerateConfigReportResponse struct {
 	// Name of the service this report belongs to.
-	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// ID of the service configuration this report belongs to.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// list of ChangeReport, each corresponding to comparison between two
 	// service configurations.
-	ChangeReports []*ChangeReport `protobuf:"bytes,3,rep,name=change_reports,json=changeReports" json:"change_reports,omitempty"`
+	ChangeReports []*ChangeReport `protobuf:"bytes,3,rep,name=change_reports,json=changeReports,proto3" json:"change_reports,omitempty"`
 	// Errors / Linter warnings associated with the service definition this
 	// report
 	// belongs to.
-	Diagnostics []*Diagnostic `protobuf:"bytes,4,rep,name=diagnostics" json:"diagnostics,omitempty"`
+	Diagnostics          []*Diagnostic `protobuf:"bytes,4,rep,name=diagnostics,proto3" json:"diagnostics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *GenerateConfigReportResponse) Reset()         { *m = GenerateConfigReportResponse{} }
+func (m *GenerateConfigReportResponse) String() string { return proto.CompactTextString(m) }
+func (*GenerateConfigReportResponse) ProtoMessage()    {}
+func (*GenerateConfigReportResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_servicemanager_0ec806067c572a23, []int{20}
+}
+func (m *GenerateConfigReportResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GenerateConfigReportResponse.Unmarshal(m, b)
+}
+func (m *GenerateConfigReportResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GenerateConfigReportResponse.Marshal(b, m, deterministic)
+}
+func (dst *GenerateConfigReportResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateConfigReportResponse.Merge(dst, src)
+}
+func (m *GenerateConfigReportResponse) XXX_Size() int {
+	return xxx_messageInfo_GenerateConfigReportResponse.Size(m)
+}
+func (m *GenerateConfigReportResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GenerateConfigReportResponse.DiscardUnknown(m)
 }
 
-func (m *GenerateConfigReportResponse) Reset()                    { *m = GenerateConfigReportResponse{} }
-func (m *GenerateConfigReportResponse) String() string            { return proto.CompactTextString(m) }
-func (*GenerateConfigReportResponse) ProtoMessage()               {}
-func (*GenerateConfigReportResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{20} }
+var xxx_messageInfo_GenerateConfigReportResponse proto.InternalMessageInfo
 
 func (m *GenerateConfigReportResponse) GetServiceName() string {
 	if m != nil {
@@ -734,8 +1201,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ServiceManager service
-
+// ServiceManagerClient is the client API for ServiceManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ServiceManagerClient interface {
 	// Lists managed services.
 	//
@@ -754,31 +1222,35 @@ type ServiceManagerClient interface {
 	// Please note one producer project can own no more than 20 services.
 	//
 	// Operation<response: ManagedService>
-	CreateService(ctx context.Context, in *CreateServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateService(ctx context.Context, in *CreateServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes a managed service. This method will change the service to the
 	// `Soft-Delete` state for 30 days. Within this period, service producers may
 	// call [UndeleteService][google.api.servicemanagement.v1.ServiceManager.UndeleteService] to restore the service.
 	// After 30 days, the service will be permanently deleted.
 	//
 	// Operation<response: google.protobuf.Empty>
-	DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Revives a previously deleted managed service. The method restores the
 	// service using the configuration at the time the service was deleted.
 	// The target service must exist and must have been deleted within the
 	// last 30 days.
 	//
 	// Operation<response: UndeleteServiceResponse>
-	UndeleteService(ctx context.Context, in *UndeleteServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UndeleteService(ctx context.Context, in *UndeleteServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Lists the history of the service configuration for a managed service,
 	// from the newest to the oldest.
 	ListServiceConfigs(ctx context.Context, in *ListServiceConfigsRequest, opts ...grpc.CallOption) (*ListServiceConfigsResponse, error)
 	// Gets a service configuration (version) for a managed service.
-	GetServiceConfig(ctx context.Context, in *GetServiceConfigRequest, opts ...grpc.CallOption) (*google_api22.Service, error)
+	GetServiceConfig(ctx context.Context, in *GetServiceConfigRequest, opts ...grpc.CallOption) (*serviceconfig.Service, error)
 	// Creates a new service configuration (version) for a managed service.
 	// This method only stores the service configuration. To roll out the service
 	// configuration to backend systems please call
 	// [CreateServiceRollout][google.api.servicemanagement.v1.ServiceManager.CreateServiceRollout].
-	CreateServiceConfig(ctx context.Context, in *CreateServiceConfigRequest, opts ...grpc.CallOption) (*google_api22.Service, error)
+	//
+	// Only the 100 most recent service configurations and ones referenced by
+	// existing rollouts are kept for each service. The rest will be deleted
+	// eventually.
+	CreateServiceConfig(ctx context.Context, in *CreateServiceConfigRequest, opts ...grpc.CallOption) (*serviceconfig.Service, error)
 	// Creates a new service configuration (version) for a managed service based
 	// on
 	// user-supplied configuration source files (for example: OpenAPI
@@ -787,8 +1259,12 @@ type ServiceManagerClient interface {
 	// other services,
 	// please call [CreateServiceRollout][google.api.servicemanagement.v1.ServiceManager.CreateServiceRollout].
 	//
+	// Only the 100 most recent configuration sources and ones referenced by
+	// existing service configurtions are kept for each service. The rest will be
+	// deleted eventually.
+	//
 	// Operation<response: SubmitConfigSourceResponse>
-	SubmitConfigSource(ctx context.Context, in *SubmitConfigSourceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	SubmitConfigSource(ctx context.Context, in *SubmitConfigSourceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Lists the history of the service configuration rollouts for a managed
 	// service, from the newest to the oldest.
 	ListServiceRollouts(ctx context.Context, in *ListServiceRolloutsRequest, opts ...grpc.CallOption) (*ListServiceRolloutsResponse, error)
@@ -803,8 +1279,12 @@ type ServiceManagerClient interface {
 	// Operations will be automatically cancelled so that the latest Rollout will
 	// not be blocked by previous Rollouts.
 	//
+	// Only the 100 most recent (in any state) and the last 10 successful (if not
+	// already part of the set of 100 most recent) rollouts are kept for each
+	// service. The rest will be deleted eventually.
+	//
 	// Operation<response: Rollout>
-	CreateServiceRollout(ctx context.Context, in *CreateServiceRolloutRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateServiceRollout(ctx context.Context, in *CreateServiceRolloutRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Generates and returns a report (errors, warnings and changes from
 	// existing configurations) associated with
 	// GenerateConfigReportRequest.new_value
@@ -823,13 +1303,13 @@ type ServiceManagerClient interface {
 	// more information.
 	//
 	// Operation<response: EnableServiceResponse>
-	EnableService(ctx context.Context, in *EnableServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	EnableService(ctx context.Context, in *EnableServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Disables a [service][google.api.servicemanagement.v1.ManagedService] for a project, so it can no longer be
 	// be used for the project. It prevents accidental usage that may cause
 	// unexpected billing charges or security leaks.
 	//
 	// Operation<response: DisableServiceResponse>
-	DisableService(ctx context.Context, in *DisableServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DisableService(ctx context.Context, in *DisableServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type serviceManagerClient struct {
@@ -842,7 +1322,7 @@ func NewServiceManagerClient(cc *grpc.ClientConn) ServiceManagerClient {
 
 func (c *serviceManagerClient) ListServices(ctx context.Context, in *ListServicesRequest, opts ...grpc.CallOption) (*ListServicesResponse, error) {
 	out := new(ListServicesResponse)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/ListServices", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/ListServices", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -851,34 +1331,34 @@ func (c *serviceManagerClient) ListServices(ctx context.Context, in *ListService
 
 func (c *serviceManagerClient) GetService(ctx context.Context, in *GetServiceRequest, opts ...grpc.CallOption) (*ManagedService, error) {
 	out := new(ManagedService)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/GetService", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/GetService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) CreateService(ctx context.Context, in *CreateServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/CreateService", in, out, c.cc, opts...)
+func (c *serviceManagerClient) CreateService(ctx context.Context, in *CreateServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/CreateService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/DeleteService", in, out, c.cc, opts...)
+func (c *serviceManagerClient) DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/DeleteService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) UndeleteService(ctx context.Context, in *UndeleteServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/UndeleteService", in, out, c.cc, opts...)
+func (c *serviceManagerClient) UndeleteService(ctx context.Context, in *UndeleteServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/UndeleteService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -887,34 +1367,34 @@ func (c *serviceManagerClient) UndeleteService(ctx context.Context, in *Undelete
 
 func (c *serviceManagerClient) ListServiceConfigs(ctx context.Context, in *ListServiceConfigsRequest, opts ...grpc.CallOption) (*ListServiceConfigsResponse, error) {
 	out := new(ListServiceConfigsResponse)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/ListServiceConfigs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/ListServiceConfigs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) GetServiceConfig(ctx context.Context, in *GetServiceConfigRequest, opts ...grpc.CallOption) (*google_api22.Service, error) {
-	out := new(google_api22.Service)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/GetServiceConfig", in, out, c.cc, opts...)
+func (c *serviceManagerClient) GetServiceConfig(ctx context.Context, in *GetServiceConfigRequest, opts ...grpc.CallOption) (*serviceconfig.Service, error) {
+	out := new(serviceconfig.Service)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/GetServiceConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) CreateServiceConfig(ctx context.Context, in *CreateServiceConfigRequest, opts ...grpc.CallOption) (*google_api22.Service, error) {
-	out := new(google_api22.Service)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/CreateServiceConfig", in, out, c.cc, opts...)
+func (c *serviceManagerClient) CreateServiceConfig(ctx context.Context, in *CreateServiceConfigRequest, opts ...grpc.CallOption) (*serviceconfig.Service, error) {
+	out := new(serviceconfig.Service)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/CreateServiceConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) SubmitConfigSource(ctx context.Context, in *SubmitConfigSourceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/SubmitConfigSource", in, out, c.cc, opts...)
+func (c *serviceManagerClient) SubmitConfigSource(ctx context.Context, in *SubmitConfigSourceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/SubmitConfigSource", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -923,7 +1403,7 @@ func (c *serviceManagerClient) SubmitConfigSource(ctx context.Context, in *Submi
 
 func (c *serviceManagerClient) ListServiceRollouts(ctx context.Context, in *ListServiceRolloutsRequest, opts ...grpc.CallOption) (*ListServiceRolloutsResponse, error) {
 	out := new(ListServiceRolloutsResponse)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/ListServiceRollouts", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/ListServiceRollouts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -932,16 +1412,16 @@ func (c *serviceManagerClient) ListServiceRollouts(ctx context.Context, in *List
 
 func (c *serviceManagerClient) GetServiceRollout(ctx context.Context, in *GetServiceRolloutRequest, opts ...grpc.CallOption) (*Rollout, error) {
 	out := new(Rollout)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/GetServiceRollout", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/GetServiceRollout", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) CreateServiceRollout(ctx context.Context, in *CreateServiceRolloutRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/CreateServiceRollout", in, out, c.cc, opts...)
+func (c *serviceManagerClient) CreateServiceRollout(ctx context.Context, in *CreateServiceRolloutRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/CreateServiceRollout", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -950,33 +1430,32 @@ func (c *serviceManagerClient) CreateServiceRollout(ctx context.Context, in *Cre
 
 func (c *serviceManagerClient) GenerateConfigReport(ctx context.Context, in *GenerateConfigReportRequest, opts ...grpc.CallOption) (*GenerateConfigReportResponse, error) {
 	out := new(GenerateConfigReportResponse)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/GenerateConfigReport", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/GenerateConfigReport", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) EnableService(ctx context.Context, in *EnableServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/EnableService", in, out, c.cc, opts...)
+func (c *serviceManagerClient) EnableService(ctx context.Context, in *EnableServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/EnableService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *serviceManagerClient) DisableService(ctx context.Context, in *DisableServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/DisableService", in, out, c.cc, opts...)
+func (c *serviceManagerClient) DisableService(ctx context.Context, in *DisableServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.api.servicemanagement.v1.ServiceManager/DisableService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ServiceManager service
-
+// ServiceManagerServer is the server API for ServiceManager service.
 type ServiceManagerServer interface {
 	// Lists managed services.
 	//
@@ -995,31 +1474,35 @@ type ServiceManagerServer interface {
 	// Please note one producer project can own no more than 20 services.
 	//
 	// Operation<response: ManagedService>
-	CreateService(context.Context, *CreateServiceRequest) (*google_longrunning.Operation, error)
+	CreateService(context.Context, *CreateServiceRequest) (*longrunning.Operation, error)
 	// Deletes a managed service. This method will change the service to the
 	// `Soft-Delete` state for 30 days. Within this period, service producers may
 	// call [UndeleteService][google.api.servicemanagement.v1.ServiceManager.UndeleteService] to restore the service.
 	// After 30 days, the service will be permanently deleted.
 	//
 	// Operation<response: google.protobuf.Empty>
-	DeleteService(context.Context, *DeleteServiceRequest) (*google_longrunning.Operation, error)
+	DeleteService(context.Context, *DeleteServiceRequest) (*longrunning.Operation, error)
 	// Revives a previously deleted managed service. The method restores the
 	// service using the configuration at the time the service was deleted.
 	// The target service must exist and must have been deleted within the
 	// last 30 days.
 	//
 	// Operation<response: UndeleteServiceResponse>
-	UndeleteService(context.Context, *UndeleteServiceRequest) (*google_longrunning.Operation, error)
+	UndeleteService(context.Context, *UndeleteServiceRequest) (*longrunning.Operation, error)
 	// Lists the history of the service configuration for a managed service,
 	// from the newest to the oldest.
 	ListServiceConfigs(context.Context, *ListServiceConfigsRequest) (*ListServiceConfigsResponse, error)
 	// Gets a service configuration (version) for a managed service.
-	GetServiceConfig(context.Context, *GetServiceConfigRequest) (*google_api22.Service, error)
+	GetServiceConfig(context.Context, *GetServiceConfigRequest) (*serviceconfig.Service, error)
 	// Creates a new service configuration (version) for a managed service.
 	// This method only stores the service configuration. To roll out the service
 	// configuration to backend systems please call
 	// [CreateServiceRollout][google.api.servicemanagement.v1.ServiceManager.CreateServiceRollout].
-	CreateServiceConfig(context.Context, *CreateServiceConfigRequest) (*google_api22.Service, error)
+	//
+	// Only the 100 most recent service configurations and ones referenced by
+	// existing rollouts are kept for each service. The rest will be deleted
+	// eventually.
+	CreateServiceConfig(context.Context, *CreateServiceConfigRequest) (*serviceconfig.Service, error)
 	// Creates a new service configuration (version) for a managed service based
 	// on
 	// user-supplied configuration source files (for example: OpenAPI
@@ -1028,8 +1511,12 @@ type ServiceManagerServer interface {
 	// other services,
 	// please call [CreateServiceRollout][google.api.servicemanagement.v1.ServiceManager.CreateServiceRollout].
 	//
+	// Only the 100 most recent configuration sources and ones referenced by
+	// existing service configurtions are kept for each service. The rest will be
+	// deleted eventually.
+	//
 	// Operation<response: SubmitConfigSourceResponse>
-	SubmitConfigSource(context.Context, *SubmitConfigSourceRequest) (*google_longrunning.Operation, error)
+	SubmitConfigSource(context.Context, *SubmitConfigSourceRequest) (*longrunning.Operation, error)
 	// Lists the history of the service configuration rollouts for a managed
 	// service, from the newest to the oldest.
 	ListServiceRollouts(context.Context, *ListServiceRolloutsRequest) (*ListServiceRolloutsResponse, error)
@@ -1044,8 +1531,12 @@ type ServiceManagerServer interface {
 	// Operations will be automatically cancelled so that the latest Rollout will
 	// not be blocked by previous Rollouts.
 	//
+	// Only the 100 most recent (in any state) and the last 10 successful (if not
+	// already part of the set of 100 most recent) rollouts are kept for each
+	// service. The rest will be deleted eventually.
+	//
 	// Operation<response: Rollout>
-	CreateServiceRollout(context.Context, *CreateServiceRolloutRequest) (*google_longrunning.Operation, error)
+	CreateServiceRollout(context.Context, *CreateServiceRolloutRequest) (*longrunning.Operation, error)
 	// Generates and returns a report (errors, warnings and changes from
 	// existing configurations) associated with
 	// GenerateConfigReportRequest.new_value
@@ -1064,13 +1555,13 @@ type ServiceManagerServer interface {
 	// more information.
 	//
 	// Operation<response: EnableServiceResponse>
-	EnableService(context.Context, *EnableServiceRequest) (*google_longrunning.Operation, error)
+	EnableService(context.Context, *EnableServiceRequest) (*longrunning.Operation, error)
 	// Disables a [service][google.api.servicemanagement.v1.ManagedService] for a project, so it can no longer be
 	// be used for the project. It prevents accidental usage that may cause
 	// unexpected billing charges or security leaks.
 	//
 	// Operation<response: DisableServiceResponse>
-	DisableService(context.Context, *DisableServiceRequest) (*google_longrunning.Operation, error)
+	DisableService(context.Context, *DisableServiceRequest) (*longrunning.Operation, error)
 }
 
 func RegisterServiceManagerServer(s *grpc.Server, srv ServiceManagerServer) {
@@ -1417,98 +1908,100 @@ var _ServiceManager_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/api/servicemanagement/v1/servicemanager.proto", fileDescriptor1)
-}
-
-var fileDescriptor1 = []byte{
-	// 1420 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0x9c, 0xb4, 0x4d, 0x5e, 0x62, 0xb7, 0x9d, 0xb8, 0x8d, 0xeb, 0x34, 0x6a, 0xba, 0x81,
-	0x12, 0xa5, 0xd4, 0xab, 0xa4, 0xff, 0xa8, 0x53, 0x0e, 0x4d, 0x02, 0x55, 0x44, 0x4b, 0x23, 0xa7,
-	0x05, 0x54, 0x90, 0xac, 0xcd, 0xee, 0x64, 0xbb, 0x74, 0x3d, 0x63, 0x76, 0xd6, 0x09, 0x69, 0x94,
-	0x4b, 0x55, 0x09, 0x09, 0x4e, 0xa8, 0x40, 0x25, 0x8e, 0x15, 0xe2, 0xc0, 0x81, 0x0b, 0x07, 0x24,
-	0x0e, 0x48, 0x7c, 0x06, 0xc4, 0x37, 0xe0, 0x33, 0x70, 0x46, 0x9e, 0x9d, 0x75, 0x76, 0xec, 0x8d,
-	0x77, 0xd7, 0x02, 0x8e, 0xfb, 0x66, 0x7e, 0xef, 0xfd, 0xe6, 0xcd, 0x7b, 0x33, 0xbf, 0x59, 0xb8,
-	0x62, 0x33, 0x66, 0xbb, 0x44, 0x37, 0x9a, 0x8e, 0xce, 0x89, 0xb7, 0xed, 0x98, 0xa4, 0x61, 0x50,
-	0xc3, 0x26, 0x0d, 0x42, 0x7d, 0x7d, 0x7b, 0x41, 0x35, 0x7a, 0x95, 0xa6, 0xc7, 0x7c, 0x86, 0xcf,
-	0x05, 0xa8, 0x8a, 0xd1, 0x74, 0x2a, 0x3d, 0xa8, 0xca, 0xf6, 0x42, 0xf9, 0x6c, 0xc4, 0xad, 0x41,
-	0x29, 0xf3, 0x0d, 0xdf, 0x61, 0x94, 0x07, 0xf0, 0xf2, 0xa9, 0xe8, 0x68, 0xcb, 0x7f, 0x24, 0xcd,
-	0xa5, 0x5e, 0x2e, 0x72, 0x44, 0x4f, 0x62, 0xe9, 0x11, 0xce, 0x5a, 0x9e, 0x49, 0xc2, 0x08, 0xb3,
-	0x12, 0xe0, 0x32, 0x6a, 0x7b, 0x2d, 0x4a, 0x1d, 0x6a, 0xeb, 0xac, 0x49, 0x3c, 0x85, 0xc6, 0x19,
-	0x39, 0x49, 0x7c, 0x6d, 0xb6, 0xb6, 0x74, 0x83, 0xee, 0xca, 0xa1, 0x99, 0xee, 0xa1, 0x2d, 0x87,
-	0xb8, 0x56, 0xbd, 0x61, 0xf0, 0xc7, 0x72, 0xc6, 0xd9, 0xee, 0x19, 0xdc, 0xf7, 0x5a, 0xa6, 0x2f,
-	0x47, 0x27, 0xe5, 0xa8, 0xd7, 0x34, 0x75, 0xee, 0x1b, 0x7e, 0x4b, 0xc6, 0xd4, 0x5e, 0x22, 0x98,
-	0xb8, 0xe3, 0x70, 0x7f, 0x23, 0x58, 0x05, 0xaf, 0x91, 0x4f, 0x5b, 0x84, 0xfb, 0xb8, 0x02, 0x13,
-	0x4d, 0x8f, 0x59, 0x2d, 0x93, 0x78, 0xf5, 0xa6, 0xc7, 0x3e, 0x21, 0xa6, 0x5f, 0x77, 0xac, 0x12,
-	0x9a, 0x41, 0x73, 0xa3, 0xb5, 0x93, 0xe1, 0xd0, 0x7a, 0x30, 0xb2, 0x66, 0xe1, 0x29, 0x18, 0x6d,
-	0x1a, 0x36, 0xa9, 0x73, 0xe7, 0x09, 0x29, 0x1d, 0x99, 0x41, 0x73, 0x47, 0x6a, 0x23, 0x6d, 0xc3,
-	0x86, 0xf3, 0x84, 0xe0, 0x69, 0x00, 0x31, 0xe8, 0xb3, 0xc7, 0x84, 0x96, 0x8e, 0x0a, 0x1f, 0x62,
-	0xfa, 0xfd, 0xb6, 0x01, 0x9f, 0x83, 0x31, 0x93, 0x51, 0xde, 0x6a, 0x10, 0xaf, 0x1d, 0xe3, 0x98,
-	0x18, 0x87, 0xd0, 0xb4, 0x66, 0x69, 0x5f, 0x22, 0x28, 0xaa, 0x24, 0x79, 0x93, 0x51, 0x4e, 0xf0,
-	0xbb, 0x30, 0x22, 0xd3, 0xcf, 0x4b, 0x68, 0x66, 0x68, 0x6e, 0x6c, 0x51, 0xaf, 0x24, 0x94, 0x42,
-	0xe5, 0xae, 0xf8, 0xb2, 0xa4, 0xaf, 0x5a, 0xc7, 0x01, 0xbe, 0x00, 0xc7, 0x29, 0xf9, 0xcc, 0xaf,
-	0x47, 0xa8, 0xe6, 0x04, 0x95, 0x7c, 0xdb, 0xbc, 0x1e, 0xd2, 0xd5, 0xae, 0xc1, 0xc9, 0xdb, 0x24,
-	0xe4, 0x12, 0xe6, 0xeb, 0x3c, 0x8c, 0x4b, 0x47, 0x75, 0x6a, 0x34, 0x88, 0x4c, 0xd4, 0x98, 0xb4,
-	0xbd, 0x67, 0x34, 0x88, 0x66, 0x40, 0x71, 0xc5, 0x23, 0x86, 0x4f, 0xba, 0xa0, 0x6b, 0x70, 0x4c,
-	0x4e, 0x13, 0xa8, 0x01, 0xd6, 0x10, 0xe2, 0xb5, 0x1b, 0x50, 0x5c, 0x25, 0x2e, 0xe9, 0x09, 0x91,
-	0x82, 0xdd, 0x12, 0x9c, 0x7e, 0x40, 0xad, 0x01, 0xc1, 0x16, 0x4c, 0xf6, 0x80, 0xe5, 0x16, 0xfd,
-	0x8b, 0xab, 0xfb, 0x13, 0xc1, 0xe4, 0x41, 0xe6, 0x57, 0x18, 0xdd, 0x72, 0xec, 0xf4, 0x24, 0xdb,
-	0x25, 0x6a, 0x0a, 0x4c, 0xbb, 0xc8, 0x82, 0x9d, 0x1d, 0x09, 0x0c, 0x6b, 0x16, 0xfe, 0x00, 0x86,
-	0xb7, 0x1d, 0xb2, 0x53, 0x1a, 0x9a, 0x41, 0x73, 0x85, 0xc5, 0x95, 0x44, 0x8e, 0x87, 0xf0, 0xa8,
-	0x04, 0x5f, 0xef, 0x3b, 0x64, 0xa7, 0x26, 0x1c, 0x6a, 0xe7, 0x01, 0x0e, 0x6c, 0x78, 0x14, 0x8e,
-	0x2c, 0xdf, 0xda, 0x58, 0x5b, 0x39, 0xf1, 0x0a, 0x1e, 0x81, 0xe1, 0x77, 0x1e, 0xdc, 0xb9, 0x73,
-	0x02, 0x69, 0x4f, 0xe0, 0x4c, 0xa4, 0xba, 0x83, 0xd9, 0x3c, 0xc3, 0xc2, 0xd4, 0xf6, 0xca, 0x75,
-	0xb7, 0x97, 0xd2, 0x9a, 0x43, 0x6a, 0x6b, 0x6a, 0x4f, 0x11, 0x94, 0xe3, 0x82, 0xcb, 0xdd, 0xbb,
-	0x09, 0xc7, 0xc3, 0xe8, 0x41, 0xaa, 0xc2, 0x3e, 0x9b, 0x88, 0x66, 0x28, 0xdc, 0xa9, 0x02, 0x57,
-	0xbc, 0xa4, 0xee, 0xa8, 0x3d, 0x28, 0x2b, 0x9d, 0x91, 0x79, 0x6b, 0xab, 0x50, 0x50, 0x69, 0x8a,
-	0x38, 0x87, 0xb0, 0xcc, 0x2b, 0x2c, 0xb5, 0x5f, 0x10, 0x9c, 0xd9, 0x68, 0x6d, 0x36, 0x1c, 0x3f,
-	0x30, 0x6c, 0x88, 0x83, 0x3b, 0x43, 0xf0, 0x1a, 0xe4, 0x65, 0x5d, 0x05, 0x67, 0xbe, 0x8c, 0x7d,
-	0x29, 0xb1, 0x86, 0x94, 0x78, 0xe3, 0x66, 0xe4, 0x0b, 0xcf, 0x42, 0x7e, 0xdb, 0x70, 0x1d, 0xcb,
-	0xf0, 0x49, 0x9d, 0x51, 0x77, 0x57, 0xec, 0xdb, 0x48, 0x6d, 0x3c, 0x34, 0xde, 0xa3, 0xee, 0xae,
-	0xf6, 0x21, 0x94, 0xe3, 0x88, 0xcb, 0xad, 0xeb, 0xcd, 0x09, 0x4a, 0x9d, 0x93, 0x67, 0x08, 0xa6,
-	0xd4, 0xb3, 0x8a, 0xb9, 0x2e, 0x6b, 0xf9, 0x19, 0xb2, 0xb2, 0x0c, 0xc7, 0xbc, 0x00, 0x24, 0xf3,
-	0x31, 0x97, 0x98, 0x8f, 0x30, 0x48, 0x08, 0xd4, 0x9e, 0xab, 0xc5, 0x29, 0xc7, 0xff, 0xa7, 0xd6,
-	0xc0, 0xa7, 0xe1, 0xe8, 0x96, 0xe3, 0xfa, 0xc4, 0x2b, 0x0d, 0x0b, 0x9c, 0xfc, 0x6a, 0xdf, 0x46,
-	0x53, 0xb1, 0xac, 0x64, 0xe2, 0x57, 0x61, 0x44, 0x2e, 0x20, 0x6c, 0x96, 0xf4, 0x4b, 0xef, 0x20,
-	0x53, 0xf7, 0xce, 0xc7, 0x50, 0x8a, 0xdc, 0x46, 0x99, 0xb7, 0x69, 0x1a, 0x40, 0x86, 0x3c, 0x38,
-	0x15, 0x47, 0xa5, 0x65, 0xcd, 0xd2, 0x1e, 0x42, 0xf1, 0x6d, 0x6a, 0x6c, 0xba, 0xd9, 0xef, 0x84,
-	0xee, 0x5b, 0x3d, 0xd7, 0x73, 0xab, 0x7f, 0x04, 0xa7, 0x56, 0x1d, 0xfe, 0x1f, 0x39, 0xff, 0x1c,
-	0xc1, 0xd4, 0x6d, 0x42, 0xdb, 0x0a, 0xab, 0x73, 0x9c, 0x34, 0x99, 0xd7, 0x49, 0xcd, 0x65, 0x00,
-	0x4a, 0x76, 0xd4, 0xce, 0x28, 0x86, 0xdb, 0x14, 0x6a, 0xa8, 0xca, 0x2d, 0xba, 0x5b, 0x1b, 0xa5,
-	0x64, 0x27, 0xf0, 0xd0, 0x06, 0x31, 0xd7, 0x52, 0x8f, 0x98, 0x43, 0x40, 0xcc, 0xb5, 0x64, 0x2f,
-	0xfd, 0x8d, 0xe0, 0x6c, 0x3c, 0x13, 0x59, 0x2f, 0x29, 0x96, 0x5b, 0x80, 0x5c, 0x67, 0x95, 0x39,
-	0xc7, 0xc2, 0xf7, 0xa1, 0x60, 0x3e, 0x32, 0xa8, 0x4d, 0xea, 0x9e, 0xf0, 0xc5, 0x4b, 0x43, 0xa2,
-	0xd0, 0x52, 0x9c, 0x39, 0x02, 0x26, 0x19, 0xe4, 0xcd, 0xc8, 0x17, 0xc7, 0x77, 0x61, 0xcc, 0x72,
-	0x0c, 0x9b, 0x32, 0xee, 0x3b, 0x26, 0x2f, 0x0d, 0x0b, 0x97, 0x17, 0x13, 0x5d, 0xae, 0x76, 0x30,
-	0xb5, 0x28, 0x7e, 0xf1, 0xa7, 0x09, 0x28, 0xc8, 0x9d, 0x0d, 0x6e, 0x74, 0x0f, 0x7f, 0x85, 0x60,
-	0x3c, 0x2a, 0xe4, 0xf0, 0x95, 0x44, 0xef, 0x31, 0xe2, 0xb4, 0x7c, 0x35, 0x23, 0x2a, 0x48, 0xb4,
-	0x56, 0x7c, 0xfa, 0xc7, 0x5f, 0xcf, 0x73, 0x05, 0x3c, 0x1e, 0x79, 0x47, 0x70, 0xfc, 0x2d, 0x02,
-	0x38, 0xe8, 0x20, 0xbc, 0x98, 0xe1, 0xea, 0x0f, 0xf9, 0x64, 0x95, 0x34, 0xda, 0xac, 0x60, 0x32,
-	0x8d, 0xa7, 0xa2, 0x4c, 0xf4, 0xbd, 0x68, 0x19, 0xec, 0xe3, 0x67, 0x08, 0xf2, 0xca, 0x21, 0x8c,
-	0x93, 0xd7, 0x1d, 0x27, 0x30, 0xcb, 0xd3, 0x21, 0x2c, 0xf2, 0xfa, 0xa8, 0xdc, 0x0b, 0x5f, 0x1f,
-	0xda, 0xb4, 0x20, 0x33, 0xa9, 0x29, 0x69, 0xa9, 0x86, 0xaa, 0x0b, 0x7f, 0x81, 0x20, 0xaf, 0x88,
-	0xca, 0x14, 0x34, 0xe2, 0x44, 0x68, 0x12, 0x0d, 0x99, 0x93, 0xf9, 0xbe, 0x39, 0x79, 0x81, 0xe0,
-	0x78, 0x97, 0xd2, 0xc4, 0xd7, 0x13, 0xe9, 0xc4, 0x0b, 0xdb, 0x24, 0x42, 0x6f, 0x08, 0x42, 0x17,
-	0xb4, 0x57, 0xfb, 0x10, 0xaa, 0xb6, 0xa4, 0x6b, 0xfc, 0x2b, 0x02, 0xdc, 0x2b, 0xa4, 0x70, 0x35,
-	0x4b, 0xa9, 0xaa, 0xd2, 0xaf, 0xbc, 0x34, 0x10, 0x56, 0x16, 0xfb, 0x45, 0xc1, 0xfe, 0x35, 0x3c,
-	0xdb, 0x87, 0xbd, 0x2e, 0x35, 0x1d, 0xfe, 0x0e, 0xc1, 0x89, 0x6e, 0x45, 0x8b, 0xdf, 0x1c, 0x54,
-	0x04, 0x97, 0xe3, 0x24, 0x86, 0x76, 0x5d, 0x10, 0x5a, 0xc0, 0x7a, 0x0a, 0x42, 0xfa, 0x5e, 0x47,
-	0xa9, 0xef, 0xe3, 0xef, 0x11, 0x4c, 0xc4, 0xc8, 0x43, 0xbc, 0x94, 0xad, 0x1b, 0x52, 0x50, 0x5c,
-	0x12, 0x14, 0xaf, 0x6a, 0x69, 0x72, 0x56, 0xed, 0x52, 0x57, 0xf8, 0x07, 0x04, 0xb8, 0x57, 0x8e,
-	0xa5, 0x28, 0x80, 0x43, 0xc5, 0x67, 0x52, 0x81, 0x5e, 0x15, 0x74, 0x75, 0x6d, 0x3e, 0x0d, 0x5d,
-	0x2e, 0xa2, 0x54, 0xd1, 0x3c, 0xfe, 0x4d, 0x7d, 0xf2, 0x87, 0xfa, 0x05, 0x67, 0x2a, 0xb7, 0x2e,
-	0x2d, 0x56, 0xbe, 0x39, 0x18, 0x58, 0x16, 0xab, 0x6c, 0x35, 0xdc, 0xaf, 0xd5, 0xf4, 0x8e, 0x34,
-	0xfa, 0x19, 0x29, 0x2f, 0xf0, 0xc0, 0x8c, 0x6f, 0x64, 0x39, 0xb8, 0x15, 0x9d, 0x54, 0x4e, 0xad,
-	0xcf, 0xb4, 0x1b, 0x82, 0xe8, 0x65, 0xbc, 0x90, 0x86, 0xa8, 0xbe, 0x77, 0x20, 0xad, 0xf6, 0xf1,
-	0x8f, 0xa8, 0xfb, 0xfd, 0x2f, 0x89, 0xdf, 0xcc, 0x78, 0xaa, 0xab, 0xdc, 0x53, 0xd6, 0x48, 0xaa,
-	0xcc, 0x56, 0x43, 0xe5, 0x8d, 0x7f, 0x47, 0x50, 0x8c, 0x13, 0x2d, 0x29, 0xc8, 0xf6, 0x51, 0x5d,
-	0xe5, 0xb7, 0x06, 0x44, 0xab, 0x65, 0xa2, 0x9d, 0x57, 0x6e, 0x2a, 0x3b, 0x06, 0xd2, 0xae, 0xf3,
-	0xaf, 0x11, 0xe4, 0x15, 0xf1, 0x9a, 0xe2, 0xe2, 0x8a, 0x13, 0xbb, 0x49, 0x29, 0xbe, 0x24, 0x58,
-	0xbd, 0xae, 0x69, 0xfd, 0xee, 0x09, 0x22, 0x1c, 0xb7, 0x69, 0xbd, 0x40, 0x50, 0x50, 0x75, 0x2f,
-	0xbe, 0x96, 0x42, 0x63, 0xf1, 0xec, 0xc4, 0x2a, 0x82, 0xd8, 0x5c, 0xdf, 0xe3, 0xac, 0x6a, 0x05,
-	0x9e, 0xab, 0x68, 0x7e, 0xf9, 0x1b, 0x04, 0xb3, 0x26, 0x6b, 0x24, 0x91, 0x59, 0x9e, 0x50, 0x55,
-	0xdd, 0x7a, 0x5b, 0xf8, 0xae, 0xa3, 0x87, 0xeb, 0x12, 0x67, 0x33, 0xd7, 0xa0, 0x76, 0x85, 0x79,
-	0xb6, 0x6e, 0x13, 0x2a, 0x64, 0xb1, 0xfc, 0x5f, 0x6a, 0x34, 0x1d, 0x7e, 0xe8, 0x3f, 0xd3, 0xa5,
-	0x1e, 0xe3, 0xcb, 0xdc, 0xf0, 0xed, 0x5b, 0x1b, 0x77, 0x37, 0x8f, 0x0a, 0x1f, 0x97, 0xff, 0x09,
-	0x00, 0x00, 0xff, 0xff, 0x50, 0x43, 0x0b, 0xb9, 0x1c, 0x16, 0x00, 0x00,
+	proto.RegisterFile("google/api/servicemanagement/v1/servicemanager.proto", fileDescriptor_servicemanager_0ec806067c572a23)
+}
+
+var fileDescriptor_servicemanager_0ec806067c572a23 = []byte{
+	// 1447 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0xdc, 0x44,
+	0x14, 0x66, 0x36, 0x69, 0x9b, 0xbc, 0x64, 0xb7, 0xed, 0x64, 0x69, 0xb6, 0x9b, 0x46, 0x4d, 0x9c,
+	0x52, 0xa2, 0x94, 0xda, 0x4a, 0xfa, 0x03, 0xba, 0x29, 0x87, 0x26, 0x81, 0x28, 0xa2, 0xa5, 0xd1,
+	0xa6, 0x3f, 0x50, 0x09, 0x5a, 0x39, 0xf6, 0xc4, 0x98, 0x7a, 0x67, 0x16, 0xdb, 0x9b, 0x90, 0x46,
+	0xbd, 0x54, 0x95, 0x90, 0xe0, 0x84, 0x8a, 0xe8, 0xbd, 0x42, 0x1c, 0x7a, 0xe5, 0x80, 0xc4, 0x01,
+	0xc1, 0x95, 0x2b, 0x70, 0xe4, 0xc6, 0xdf, 0xc0, 0x19, 0xed, 0x78, 0xbc, 0xf1, 0xec, 0x3a, 0x6b,
+	0x7b, 0x05, 0x1c, 0xe7, 0xcd, 0x7c, 0xef, 0x7d, 0xf3, 0xe6, 0xbd, 0x99, 0xcf, 0x86, 0xcb, 0x16,
+	0x63, 0x96, 0x43, 0x34, 0xbd, 0x61, 0x6b, 0x1e, 0x71, 0x77, 0x6c, 0x83, 0xd4, 0x75, 0xaa, 0x5b,
+	0xa4, 0x4e, 0xa8, 0xaf, 0xed, 0xcc, 0xcb, 0x46, 0x57, 0x6d, 0xb8, 0xcc, 0x67, 0xf8, 0x6c, 0x80,
+	0x52, 0xf5, 0x86, 0xad, 0x76, 0xa1, 0xd4, 0x9d, 0xf9, 0xf2, 0x99, 0x88, 0x5b, 0x9d, 0x52, 0xe6,
+	0xeb, 0xbe, 0xcd, 0xa8, 0x17, 0xc0, 0xcb, 0xa5, 0xee, 0xa0, 0x62, 0x46, 0x4b, 0xa2, 0xe3, 0x12,
+	0x8f, 0x35, 0x5d, 0x83, 0x84, 0xae, 0x66, 0x04, 0xc0, 0x61, 0xd4, 0x72, 0x9b, 0x94, 0xda, 0xd4,
+	0xd2, 0x58, 0x83, 0xb8, 0x52, 0xbc, 0xd3, 0x62, 0x11, 0x1f, 0x6d, 0x35, 0xb7, 0x35, 0x9d, 0xee,
+	0x89, 0xa9, 0xa9, 0xce, 0xa9, 0x6d, 0x9b, 0x38, 0x66, 0xad, 0xae, 0x7b, 0x0f, 0xc5, 0x8a, 0x33,
+	0x9d, 0x2b, 0x3c, 0xdf, 0x6d, 0x1a, 0xbe, 0x98, 0x1d, 0x17, 0xb3, 0x6e, 0xc3, 0xd0, 0x3c, 0x5f,
+	0xf7, 0x9b, 0x22, 0xa6, 0xf2, 0x02, 0xc1, 0xd8, 0x4d, 0xdb, 0xf3, 0x37, 0x82, 0x5d, 0x78, 0x55,
+	0xf2, 0x69, 0x93, 0x78, 0x3e, 0x56, 0x61, 0xac, 0xe1, 0x32, 0xb3, 0x69, 0x10, 0xb7, 0xd6, 0x70,
+	0xd9, 0x27, 0xc4, 0xf0, 0x6b, 0xb6, 0x59, 0x42, 0x53, 0x68, 0x76, 0xb8, 0x7a, 0x32, 0x9c, 0x5a,
+	0x0f, 0x66, 0xd6, 0x4c, 0x3c, 0x01, 0xc3, 0x0d, 0xdd, 0x22, 0x35, 0xcf, 0x7e, 0x44, 0x4a, 0x47,
+	0xa6, 0xd0, 0xec, 0x91, 0xea, 0x50, 0xcb, 0xb0, 0x61, 0x3f, 0x22, 0x78, 0x12, 0x80, 0x4f, 0xfa,
+	0xec, 0x21, 0xa1, 0xa5, 0xa3, 0xdc, 0x07, 0x5f, 0x7e, 0xa7, 0x65, 0xc0, 0x67, 0x61, 0xc4, 0x60,
+	0xd4, 0x6b, 0xd6, 0x89, 0xdb, 0x8a, 0x71, 0x8c, 0xcf, 0x43, 0x68, 0x5a, 0x33, 0x95, 0x2f, 0x11,
+	0x14, 0x65, 0x92, 0x5e, 0x83, 0x51, 0x8f, 0xe0, 0xf7, 0x60, 0x48, 0xa4, 0xdf, 0x2b, 0xa1, 0xa9,
+	0x81, 0xd9, 0x91, 0x05, 0x4d, 0x4d, 0x38, 0x73, 0xf5, 0x16, 0x1f, 0x99, 0xc2, 0x57, 0xb5, 0xed,
+	0x00, 0x9f, 0x87, 0xe3, 0x94, 0x7c, 0xe6, 0xd7, 0x22, 0x54, 0x73, 0x9c, 0x4a, 0xbe, 0x65, 0x5e,
+	0x0f, 0xe9, 0x2a, 0x57, 0xe1, 0xe4, 0x2a, 0x09, 0xb9, 0x84, 0xf9, 0x9a, 0x86, 0x51, 0xe1, 0xa8,
+	0x46, 0xf5, 0x3a, 0x11, 0x89, 0x1a, 0x11, 0xb6, 0xf7, 0xf5, 0x3a, 0x51, 0x74, 0x28, 0x2e, 0xbb,
+	0x44, 0xf7, 0x49, 0x07, 0x74, 0x0d, 0x8e, 0x89, 0x65, 0x1c, 0xd5, 0xc7, 0x1e, 0x42, 0xbc, 0x72,
+	0x0d, 0x8a, 0x2b, 0xc4, 0x21, 0x5d, 0x21, 0x52, 0xb0, 0x5b, 0x84, 0x53, 0x77, 0xa9, 0xd9, 0x27,
+	0xd8, 0x84, 0xf1, 0x2e, 0xb0, 0x38, 0xa2, 0x7f, 0x71, 0x77, 0x7f, 0x20, 0x18, 0x3f, 0xc8, 0xfc,
+	0x32, 0xa3, 0xdb, 0xb6, 0x95, 0x9e, 0x64, 0xab, 0x44, 0x0d, 0x8e, 0x69, 0x15, 0x59, 0x70, 0xb2,
+	0x43, 0x81, 0x61, 0xcd, 0xc4, 0xf7, 0x61, 0x70, 0xc7, 0x26, 0xbb, 0xa5, 0x81, 0x29, 0x34, 0x5b,
+	0x58, 0x58, 0x4e, 0xe4, 0x78, 0x08, 0x0f, 0x35, 0x18, 0xdd, 0xb3, 0xc9, 0x6e, 0x95, 0x3b, 0x54,
+	0xa6, 0x01, 0x0e, 0x6c, 0x78, 0x18, 0x8e, 0x2c, 0xdd, 0xd8, 0x58, 0x5b, 0x3e, 0xf1, 0x0a, 0x1e,
+	0x82, 0xc1, 0x77, 0xef, 0xde, 0xbc, 0x79, 0x02, 0x29, 0x8f, 0xe0, 0x74, 0xa4, 0xba, 0x83, 0xd5,
+	0x5e, 0x86, 0x8d, 0xc9, 0xed, 0x95, 0xeb, 0x6c, 0x2f, 0xa9, 0x35, 0x07, 0xe4, 0xd6, 0x54, 0x9e,
+	0x20, 0x28, 0xc7, 0x05, 0x17, 0xa7, 0x77, 0x1d, 0x8e, 0x87, 0xd1, 0x83, 0x54, 0x85, 0x7d, 0x36,
+	0x16, 0xcd, 0x50, 0x78, 0x52, 0x05, 0x4f, 0xf2, 0x92, 0xba, 0xa3, 0xf6, 0xa1, 0x2c, 0x75, 0x46,
+	0xe6, 0xa3, 0xad, 0x40, 0x41, 0xa6, 0xc9, 0xe3, 0x1c, 0xc2, 0x32, 0x2f, 0xb1, 0x54, 0x7e, 0x40,
+	0x70, 0x7a, 0xa3, 0xb9, 0x55, 0xb7, 0xfd, 0xc0, 0xb0, 0xc1, 0x2f, 0xee, 0x0c, 0xc1, 0xab, 0x90,
+	0x17, 0x75, 0x15, 0xdc, 0xf9, 0x22, 0xf6, 0xc5, 0xc4, 0x1a, 0x92, 0xe2, 0x8d, 0x1a, 0x91, 0x11,
+	0x9e, 0x81, 0xfc, 0x8e, 0xee, 0xd8, 0xa6, 0xee, 0x93, 0x1a, 0xa3, 0xce, 0x1e, 0x3f, 0xb7, 0xa1,
+	0xea, 0x68, 0x68, 0xbc, 0x4d, 0x9d, 0x3d, 0xe5, 0x03, 0x28, 0xc7, 0x11, 0x17, 0x47, 0xd7, 0x9d,
+	0x13, 0x94, 0x3a, 0x27, 0x4f, 0x11, 0x4c, 0xc8, 0x77, 0x15, 0x73, 0x1c, 0xd6, 0xf4, 0x33, 0x64,
+	0x65, 0x09, 0x8e, 0xb9, 0x01, 0x48, 0xe4, 0x63, 0x36, 0x31, 0x1f, 0x61, 0x90, 0x10, 0xa8, 0x3c,
+	0x93, 0x8b, 0x53, 0xcc, 0xff, 0x4f, 0xad, 0x81, 0x4f, 0xc1, 0xd1, 0x6d, 0xdb, 0xf1, 0x89, 0x5b,
+	0x1a, 0xe4, 0x38, 0x31, 0x6a, 0xbd, 0x46, 0x13, 0xb1, 0xac, 0x44, 0xe2, 0x57, 0x60, 0x48, 0x6c,
+	0x20, 0x6c, 0x96, 0xf4, 0x5b, 0x6f, 0x23, 0x53, 0xf7, 0xce, 0x26, 0x94, 0x22, 0xaf, 0x51, 0xe6,
+	0x63, 0x9a, 0x04, 0x10, 0x21, 0x0f, 0x6e, 0xc5, 0x61, 0x61, 0x59, 0x33, 0x95, 0x07, 0x50, 0x7c,
+	0x87, 0xea, 0x5b, 0x4e, 0xf6, 0x37, 0xa1, 0xf3, 0x55, 0xcf, 0x75, 0xbd, 0xea, 0x1f, 0xc2, 0xab,
+	0x2b, 0xb6, 0xf7, 0x1f, 0x39, 0xff, 0x1c, 0xc1, 0xc4, 0x2a, 0xa1, 0x2d, 0x85, 0xd5, 0xbe, 0x4e,
+	0x1a, 0xcc, 0x6d, 0xa7, 0xe6, 0x12, 0x00, 0x25, 0xbb, 0x72, 0x67, 0x14, 0xc3, 0x63, 0x0a, 0x35,
+	0x94, 0x7a, 0x83, 0xee, 0x55, 0x87, 0x29, 0xd9, 0x0d, 0x3c, 0xb4, 0x40, 0xcc, 0x31, 0xe5, 0x2b,
+	0xe6, 0x10, 0x10, 0x73, 0x4c, 0xd1, 0x4b, 0x7f, 0x23, 0x38, 0x13, 0xcf, 0x44, 0xd4, 0x4b, 0x8a,
+	0xed, 0x16, 0x20, 0xd7, 0xde, 0x65, 0xce, 0x36, 0xf1, 0x1d, 0x28, 0x18, 0x1f, 0xeb, 0xd4, 0x22,
+	0x35, 0x97, 0xfb, 0xf2, 0x4a, 0x03, 0xbc, 0xd0, 0x52, 0xdc, 0x39, 0x1c, 0x26, 0x18, 0xe4, 0x8d,
+	0xc8, 0xc8, 0xc3, 0xb7, 0x60, 0xc4, 0xb4, 0x75, 0x8b, 0x32, 0xcf, 0xb7, 0x0d, 0xaf, 0x34, 0xc8,
+	0x5d, 0x5e, 0x48, 0x74, 0xb9, 0xd2, 0xc6, 0x54, 0xa3, 0xf8, 0x85, 0xdf, 0xc7, 0xa0, 0x20, 0x4e,
+	0x36, 0x78, 0xd1, 0x5d, 0xfc, 0x15, 0x82, 0xd1, 0xa8, 0x90, 0xc3, 0x97, 0x13, 0xbd, 0xc7, 0x88,
+	0xd3, 0xf2, 0x95, 0x8c, 0xa8, 0x20, 0xd1, 0x4a, 0xf1, 0xc9, 0x6f, 0x7f, 0x3d, 0xcb, 0x15, 0xf0,
+	0x68, 0xe4, 0x83, 0xc1, 0xc3, 0xdf, 0x20, 0x80, 0x83, 0x0e, 0xc2, 0x0b, 0x19, 0x9e, 0xfe, 0x90,
+	0x4f, 0x56, 0x49, 0xa3, 0xcc, 0x70, 0x26, 0x93, 0x78, 0x22, 0xca, 0x44, 0xdb, 0x8f, 0x96, 0xc1,
+	0x63, 0xfc, 0x14, 0x41, 0x5e, 0xba, 0x84, 0x71, 0xf2, 0xbe, 0xe3, 0x04, 0x66, 0x79, 0x32, 0x84,
+	0x45, 0xbe, 0x3e, 0xd4, 0xdb, 0xe1, 0xd7, 0x87, 0x32, 0xc9, 0xc9, 0x8c, 0x2b, 0x52, 0x5a, 0x2a,
+	0xa1, 0xea, 0xc2, 0x5f, 0x20, 0xc8, 0x4b, 0xa2, 0x32, 0x05, 0x8d, 0x38, 0x11, 0x9a, 0x44, 0x43,
+	0xe4, 0x64, 0xae, 0x67, 0x4e, 0x9e, 0x23, 0x38, 0xde, 0xa1, 0x34, 0xf1, 0x9b, 0x89, 0x74, 0xe2,
+	0x85, 0x6d, 0x12, 0xa1, 0x37, 0x38, 0xa1, 0xf3, 0xca, 0xb9, 0x1e, 0x84, 0x2a, 0x4d, 0xe1, 0x1a,
+	0xff, 0x88, 0x00, 0x77, 0x0b, 0x29, 0x5c, 0xc9, 0x52, 0xaa, 0xb2, 0xf4, 0x2b, 0x2f, 0xf6, 0x85,
+	0x15, 0xc5, 0x7e, 0x81, 0xb3, 0x7f, 0x0d, 0xcf, 0xf4, 0x60, 0xaf, 0x09, 0x4d, 0x87, 0x7f, 0x46,
+	0x70, 0xa2, 0x53, 0xd1, 0xe2, 0xb7, 0xfa, 0x15, 0xc1, 0xe5, 0x38, 0x89, 0xa1, 0x7c, 0xc4, 0x09,
+	0xdd, 0xc7, 0x5a, 0x0a, 0x42, 0xda, 0x7e, 0x5b, 0xa9, 0x3f, 0x7e, 0x70, 0x0e, 0x2b, 0xc9, 0x10,
+	0xfc, 0x2d, 0x82, 0xb1, 0x18, 0x11, 0x89, 0x17, 0xb3, 0xf5, 0x4c, 0x8a, 0x8d, 0x2c, 0xf2, 0x8d,
+	0x5c, 0x51, 0xd2, 0x64, 0xb6, 0xd2, 0xa1, 0xc1, 0xf0, 0x77, 0x08, 0x70, 0xb7, 0x68, 0x4b, 0x51,
+	0x26, 0x87, 0x4a, 0xd4, 0xa4, 0x32, 0xbe, 0xc2, 0xe9, 0x6a, 0xca, 0x5c, 0x1a, 0xba, 0x1e, 0x8f,
+	0x52, 0x41, 0x73, 0xf8, 0x27, 0xf9, 0xc7, 0x40, 0xa8, 0x72, 0x70, 0xa6, 0xa2, 0xec, 0x50, 0x6c,
+	0xe5, 0xeb, 0xfd, 0x81, 0x45, 0x49, 0x8b, 0x86, 0xc4, 0xbd, 0x1a, 0x52, 0x6b, 0x0b, 0xa8, 0xef,
+	0x91, 0xf4, 0x9d, 0x1e, 0x98, 0xf1, 0xb5, 0x2c, 0xd7, 0xbb, 0xa4, 0xa6, 0xca, 0xa9, 0x55, 0x9c,
+	0x72, 0x8d, 0x13, 0xbd, 0x84, 0xe7, 0xd3, 0x10, 0xd5, 0xf6, 0x0f, 0x04, 0xd8, 0x63, 0xfc, 0x12,
+	0x75, 0xfe, 0x25, 0x10, 0xc4, 0xaf, 0x67, 0xbc, 0xfb, 0x65, 0xee, 0x29, 0x6b, 0x24, 0x55, 0x66,
+	0x2b, 0xa1, 0x3e, 0xc7, 0xbf, 0x20, 0x28, 0xc6, 0x49, 0x9b, 0x14, 0x64, 0x7b, 0x68, 0xb3, 0xf2,
+	0xdb, 0x7d, 0xa2, 0xe5, 0x32, 0x51, 0xa6, 0xa5, 0xf7, 0xcc, 0x8a, 0x81, 0xb4, 0xea, 0xfc, 0x6b,
+	0x04, 0x79, 0x49, 0xe2, 0xa6, 0x78, 0xde, 0xe2, 0x24, 0x71, 0x52, 0x8a, 0x2f, 0x72, 0x56, 0xaf,
+	0x2b, 0xbd, 0xee, 0xb2, 0x0a, 0xe1, 0x8e, 0x5b, 0xb4, 0x9e, 0x23, 0x28, 0xc8, 0xea, 0x18, 0x5f,
+	0x4d, 0xa1, 0xc4, 0xbc, 0xec, 0xc4, 0x54, 0x4e, 0x6c, 0xb6, 0xe7, 0x75, 0x56, 0x31, 0x03, 0xcf,
+	0x15, 0x34, 0xb7, 0xf4, 0x27, 0x82, 0x19, 0x83, 0xd5, 0x93, 0xc8, 0x2c, 0x8d, 0xc9, 0xda, 0x6f,
+	0xbd, 0x25, 0x8f, 0xd7, 0xd1, 0x83, 0x75, 0x81, 0xb3, 0x98, 0xa3, 0x53, 0x4b, 0x65, 0xae, 0xa5,
+	0x59, 0x84, 0x72, 0xf1, 0x2c, 0xfe, 0xaa, 0xea, 0x0d, 0xdb, 0x3b, 0xf4, 0xcf, 0xea, 0x62, 0x97,
+	0xf1, 0x45, 0x6e, 0x70, 0xf5, 0xc6, 0xc6, 0xad, 0x97, 0xb9, 0xe9, 0xd5, 0xc0, 0xf3, 0xb2, 0xc3,
+	0x9a, 0xa6, 0x2a, 0x45, 0xe7, 0x9c, 0xee, 0xcd, 0xff, 0x1a, 0xae, 0xd9, 0xe4, 0x6b, 0x36, 0xbb,
+	0xd6, 0x6c, 0xde, 0x9b, 0xdf, 0x3a, 0xca, 0xb9, 0x5c, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0x0e,
+	0x92, 0xfd, 0x90, 0x73, 0x16, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/legacy/audit_data.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/legacy/audit_data.pb.go
index 48c409a9..efd0be33 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/legacy/audit_data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/legacy/audit_data.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/legacy/audit_data.proto
 
-/*
-Package legacy is a generated protocol buffer package.
-
-It is generated from these files:
-	google/appengine/legacy/audit_data.proto
-
-It has these top-level messages:
-	AuditData
-*/
-package legacy
+package legacy // import "google.golang.org/genproto/googleapis/appengine/legacy"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -31,16 +22,38 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type AuditData struct {
 	// Text description of the admin event.
 	// This is the "Event" column in Admin Console's Admin Logs.
-	EventMessage string `protobuf:"bytes,1,opt,name=event_message,json=eventMessage" json:"event_message,omitempty"`
+	EventMessage string `protobuf:"bytes,1,opt,name=event_message,json=eventMessage,proto3" json:"event_message,omitempty"`
 	// Arbitrary event data.
 	// This is the "Result" column in Admin Console's Admin Logs.
-	EventData map[string]string `protobuf:"bytes,2,rep,name=event_data,json=eventData" json:"event_data,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	EventData            map[string]string `protobuf:"bytes,2,rep,name=event_data,json=eventData,proto3" json:"event_data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *AuditData) Reset()                    { *m = AuditData{} }
-func (m *AuditData) String() string            { return proto.CompactTextString(m) }
-func (*AuditData) ProtoMessage()               {}
-func (*AuditData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *AuditData) Reset()         { *m = AuditData{} }
+func (m *AuditData) String() string { return proto.CompactTextString(m) }
+func (*AuditData) ProtoMessage()    {}
+func (*AuditData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_066939fa5b0d8e90, []int{0}
+}
+func (m *AuditData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuditData.Unmarshal(m, b)
+}
+func (m *AuditData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuditData.Marshal(b, m, deterministic)
+}
+func (dst *AuditData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditData.Merge(dst, src)
+}
+func (m *AuditData) XXX_Size() int {
+	return xxx_messageInfo_AuditData.Size(m)
+}
+func (m *AuditData) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuditData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AuditData proto.InternalMessageInfo
 
 func (m *AuditData) GetEventMessage() string {
 	if m != nil {
@@ -58,11 +71,14 @@ func (m *AuditData) GetEventData() map[string]string {
 
 func init() {
 	proto.RegisterType((*AuditData)(nil), "google.appengine.legacy.AuditData")
+	proto.RegisterMapType((map[string]string)(nil), "google.appengine.legacy.AuditData.EventDataEntry")
 }
 
-func init() { proto.RegisterFile("google/appengine/legacy/audit_data.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/appengine/legacy/audit_data.proto", fileDescriptor_audit_data_066939fa5b0d8e90)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_audit_data_066939fa5b0d8e90 = []byte{
 	// 247 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x4f, 0x4b, 0x03, 0x31,
 	0x10, 0xc5, 0xc9, 0x16, 0x85, 0x1d, 0xb5, 0x48, 0x10, 0x5c, 0xf4, 0x52, 0xf4, 0xb2, 0xa7, 0x04,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/logging/v1/request_log.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/logging/v1/request_log.pb.go
index 7fb8990e..c5870c22 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/logging/v1/request_log.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/logging/v1/request_log.pb.go
@@ -1,26 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/logging/v1/request_log.proto
 
-/*
-Package logging is a generated protocol buffer package.
-
-It is generated from these files:
-	google/appengine/logging/v1/request_log.proto
-
-It has these top-level messages:
-	LogLine
-	SourceLocation
-	SourceReference
-	RequestLog
-*/
-package logging
+package logging // import "google.golang.org/genproto/googleapis/appengine/logging/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_logging_type "google.golang.org/genproto/googleapis/logging/type"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _type "google.golang.org/genproto/googleapis/logging/type"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -36,32 +24,54 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Application log line emitted while processing a request.
 type LogLine struct {
 	// Approximate time when this log entry was made.
-	Time *google_protobuf2.Timestamp `protobuf:"bytes,1,opt,name=time" json:"time,omitempty"`
+	Time *timestamp.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
 	// Severity of this log entry.
-	Severity google_logging_type.LogSeverity `protobuf:"varint,2,opt,name=severity,enum=google.logging.type.LogSeverity" json:"severity,omitempty"`
+	Severity _type.LogSeverity `protobuf:"varint,2,opt,name=severity,proto3,enum=google.logging.type.LogSeverity" json:"severity,omitempty"`
 	// App-provided log message.
-	LogMessage string `protobuf:"bytes,3,opt,name=log_message,json=logMessage" json:"log_message,omitempty"`
+	LogMessage string `protobuf:"bytes,3,opt,name=log_message,json=logMessage,proto3" json:"log_message,omitempty"`
 	// Where in the source code this log message was written.
-	SourceLocation *SourceLocation `protobuf:"bytes,4,opt,name=source_location,json=sourceLocation" json:"source_location,omitempty"`
+	SourceLocation       *SourceLocation `protobuf:"bytes,4,opt,name=source_location,json=sourceLocation,proto3" json:"source_location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *LogLine) Reset()         { *m = LogLine{} }
+func (m *LogLine) String() string { return proto.CompactTextString(m) }
+func (*LogLine) ProtoMessage()    {}
+func (*LogLine) Descriptor() ([]byte, []int) {
+	return fileDescriptor_request_log_c4e4bcec179d2e52, []int{0}
+}
+func (m *LogLine) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogLine.Unmarshal(m, b)
+}
+func (m *LogLine) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogLine.Marshal(b, m, deterministic)
+}
+func (dst *LogLine) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogLine.Merge(dst, src)
+}
+func (m *LogLine) XXX_Size() int {
+	return xxx_messageInfo_LogLine.Size(m)
+}
+func (m *LogLine) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogLine.DiscardUnknown(m)
 }
 
-func (m *LogLine) Reset()                    { *m = LogLine{} }
-func (m *LogLine) String() string            { return proto.CompactTextString(m) }
-func (*LogLine) ProtoMessage()               {}
-func (*LogLine) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_LogLine proto.InternalMessageInfo
 
-func (m *LogLine) GetTime() *google_protobuf2.Timestamp {
+func (m *LogLine) GetTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.Time
 	}
 	return nil
 }
 
-func (m *LogLine) GetSeverity() google_logging_type.LogSeverity {
+func (m *LogLine) GetSeverity() _type.LogSeverity {
 	if m != nil {
 		return m.Severity
 	}
-	return google_logging_type.LogSeverity_DEFAULT
+	return _type.LogSeverity_DEFAULT
 }
 
 func (m *LogLine) GetLogMessage() string {
@@ -82,22 +92,44 @@ func (m *LogLine) GetSourceLocation() *SourceLocation {
 type SourceLocation struct {
 	// Source file name. Depending on the runtime environment, this might be a
 	// simple name or a fully-qualified name.
-	File string `protobuf:"bytes,1,opt,name=file" json:"file,omitempty"`
+	File string `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"`
 	// Line within the source file.
-	Line int64 `protobuf:"varint,2,opt,name=line" json:"line,omitempty"`
+	Line int64 `protobuf:"varint,2,opt,name=line,proto3" json:"line,omitempty"`
 	// Human-readable name of the function or method being invoked, with optional
 	// context such as the class or package name. This information is used in
 	// contexts such as the logs viewer, where a file and line number are less
 	// meaningful. The format can vary by language. For example:
 	// `qual.if.ied.Class.method` (Java), `dir/package.func` (Go), `function`
 	// (Python).
-	FunctionName string `protobuf:"bytes,3,opt,name=function_name,json=functionName" json:"function_name,omitempty"`
+	FunctionName         string   `protobuf:"bytes,3,opt,name=function_name,json=functionName,proto3" json:"function_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SourceLocation) Reset()         { *m = SourceLocation{} }
+func (m *SourceLocation) String() string { return proto.CompactTextString(m) }
+func (*SourceLocation) ProtoMessage()    {}
+func (*SourceLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_request_log_c4e4bcec179d2e52, []int{1}
+}
+func (m *SourceLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceLocation.Unmarshal(m, b)
+}
+func (m *SourceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceLocation.Marshal(b, m, deterministic)
+}
+func (dst *SourceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceLocation.Merge(dst, src)
+}
+func (m *SourceLocation) XXX_Size() int {
+	return xxx_messageInfo_SourceLocation.Size(m)
+}
+func (m *SourceLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceLocation.DiscardUnknown(m)
 }
 
-func (m *SourceLocation) Reset()                    { *m = SourceLocation{} }
-func (m *SourceLocation) String() string            { return proto.CompactTextString(m) }
-func (*SourceLocation) ProtoMessage()               {}
-func (*SourceLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_SourceLocation proto.InternalMessageInfo
 
 func (m *SourceLocation) GetFile() string {
 	if m != nil {
@@ -125,16 +157,38 @@ func (m *SourceLocation) GetFunctionName() string {
 type SourceReference struct {
 	// Optional. A URI string identifying the repository.
 	// Example: "https://github.com/GoogleCloudPlatform/kubernetes.git"
-	Repository string `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	Repository string `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
 	// The canonical and persistent identifier of the deployed revision.
 	// Example (git): "0035781c50ec7aa23385dc841529ce8a4b70db1b"
-	RevisionId string `protobuf:"bytes,2,opt,name=revision_id,json=revisionId" json:"revision_id,omitempty"`
+	RevisionId           string   `protobuf:"bytes,2,opt,name=revision_id,json=revisionId,proto3" json:"revision_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SourceReference) Reset()                    { *m = SourceReference{} }
-func (m *SourceReference) String() string            { return proto.CompactTextString(m) }
-func (*SourceReference) ProtoMessage()               {}
-func (*SourceReference) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *SourceReference) Reset()         { *m = SourceReference{} }
+func (m *SourceReference) String() string { return proto.CompactTextString(m) }
+func (*SourceReference) ProtoMessage()    {}
+func (*SourceReference) Descriptor() ([]byte, []int) {
+	return fileDescriptor_request_log_c4e4bcec179d2e52, []int{2}
+}
+func (m *SourceReference) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceReference.Unmarshal(m, b)
+}
+func (m *SourceReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceReference.Marshal(b, m, deterministic)
+}
+func (dst *SourceReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceReference.Merge(dst, src)
+}
+func (m *SourceReference) XXX_Size() int {
+	return xxx_messageInfo_SourceReference.Size(m)
+}
+func (m *SourceReference) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceReference.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SourceReference proto.InternalMessageInfo
 
 func (m *SourceReference) GetRepository() string {
 	if m != nil {
@@ -154,42 +208,42 @@ func (m *SourceReference) GetRevisionId() string {
 // application.
 type RequestLog struct {
 	// Application that handled this request.
-	AppId string `protobuf:"bytes,1,opt,name=app_id,json=appId" json:"app_id,omitempty"`
+	AppId string `protobuf:"bytes,1,opt,name=app_id,json=appId,proto3" json:"app_id,omitempty"`
 	// Module of the application that handled this request.
-	ModuleId string `protobuf:"bytes,37,opt,name=module_id,json=moduleId" json:"module_id,omitempty"`
+	ModuleId string `protobuf:"bytes,37,opt,name=module_id,json=moduleId,proto3" json:"module_id,omitempty"`
 	// Version of the application that handled this request.
-	VersionId string `protobuf:"bytes,2,opt,name=version_id,json=versionId" json:"version_id,omitempty"`
+	VersionId string `protobuf:"bytes,2,opt,name=version_id,json=versionId,proto3" json:"version_id,omitempty"`
 	// Globally unique identifier for a request, which is based on the request
 	// start time.  Request IDs for requests which started later will compare
 	// greater as strings than those for requests which started earlier.
-	RequestId string `protobuf:"bytes,3,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
+	RequestId string `protobuf:"bytes,3,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
 	// Origin IP address.
-	Ip string `protobuf:"bytes,4,opt,name=ip" json:"ip,omitempty"`
+	Ip string `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"`
 	// Time when the request started.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,6,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time when the request finished.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,7,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Latency of the request.
-	Latency *google_protobuf1.Duration `protobuf:"bytes,8,opt,name=latency" json:"latency,omitempty"`
+	Latency *duration.Duration `protobuf:"bytes,8,opt,name=latency,proto3" json:"latency,omitempty"`
 	// Number of CPU megacycles used to process request.
-	MegaCycles int64 `protobuf:"varint,9,opt,name=mega_cycles,json=megaCycles" json:"mega_cycles,omitempty"`
+	MegaCycles int64 `protobuf:"varint,9,opt,name=mega_cycles,json=megaCycles,proto3" json:"mega_cycles,omitempty"`
 	// Request method. Example: `"GET"`, `"HEAD"`, `"PUT"`, `"POST"`, `"DELETE"`.
-	Method string `protobuf:"bytes,10,opt,name=method" json:"method,omitempty"`
+	Method string `protobuf:"bytes,10,opt,name=method,proto3" json:"method,omitempty"`
 	// Contains the path and query portion of the URL that was requested. For
 	// example, if the URL was "http://example.com/app?name=val", the resource
 	// would be "/app?name=val".  The fragment identifier, which is identified by
 	// the `#` character, is not included.
-	Resource string `protobuf:"bytes,11,opt,name=resource" json:"resource,omitempty"`
+	Resource string `protobuf:"bytes,11,opt,name=resource,proto3" json:"resource,omitempty"`
 	// HTTP version of request. Example: `"HTTP/1.1"`.
-	HttpVersion string `protobuf:"bytes,12,opt,name=http_version,json=httpVersion" json:"http_version,omitempty"`
+	HttpVersion string `protobuf:"bytes,12,opt,name=http_version,json=httpVersion,proto3" json:"http_version,omitempty"`
 	// HTTP response status code. Example: 200, 404.
-	Status int32 `protobuf:"varint,13,opt,name=status" json:"status,omitempty"`
+	Status int32 `protobuf:"varint,13,opt,name=status,proto3" json:"status,omitempty"`
 	// Size in bytes sent back to client by request.
-	ResponseSize int64 `protobuf:"varint,14,opt,name=response_size,json=responseSize" json:"response_size,omitempty"`
+	ResponseSize int64 `protobuf:"varint,14,opt,name=response_size,json=responseSize,proto3" json:"response_size,omitempty"`
 	// Referrer URL of request.
-	Referrer string `protobuf:"bytes,15,opt,name=referrer" json:"referrer,omitempty"`
+	Referrer string `protobuf:"bytes,15,opt,name=referrer,proto3" json:"referrer,omitempty"`
 	// User agent that made the request.
-	UserAgent string `protobuf:"bytes,16,opt,name=user_agent,json=userAgent" json:"user_agent,omitempty"`
+	UserAgent string `protobuf:"bytes,16,opt,name=user_agent,json=userAgent,proto3" json:"user_agent,omitempty"`
 	// The logged-in user who made the request.
 	//
 	// Most likely, this is the part of the user's email before the `@` sign.  The
@@ -198,49 +252,71 @@ type RequestLog struct {
 	// available to the application via the App Engine Users API.
 	//
 	// This field will be populated starting with App Engine 1.9.21.
-	Nickname string `protobuf:"bytes,40,opt,name=nickname" json:"nickname,omitempty"`
+	Nickname string `protobuf:"bytes,40,opt,name=nickname,proto3" json:"nickname,omitempty"`
 	// File or class that handled the request.
-	UrlMapEntry string `protobuf:"bytes,17,opt,name=url_map_entry,json=urlMapEntry" json:"url_map_entry,omitempty"`
+	UrlMapEntry string `protobuf:"bytes,17,opt,name=url_map_entry,json=urlMapEntry,proto3" json:"url_map_entry,omitempty"`
 	// Internet host and port number of the resource being requested.
-	Host string `protobuf:"bytes,20,opt,name=host" json:"host,omitempty"`
+	Host string `protobuf:"bytes,20,opt,name=host,proto3" json:"host,omitempty"`
 	// An indication of the relative cost of serving this request.
-	Cost float64 `protobuf:"fixed64,21,opt,name=cost" json:"cost,omitempty"`
+	Cost float64 `protobuf:"fixed64,21,opt,name=cost,proto3" json:"cost,omitempty"`
 	// Queue name of the request, in the case of an offline request.
-	TaskQueueName string `protobuf:"bytes,22,opt,name=task_queue_name,json=taskQueueName" json:"task_queue_name,omitempty"`
+	TaskQueueName string `protobuf:"bytes,22,opt,name=task_queue_name,json=taskQueueName,proto3" json:"task_queue_name,omitempty"`
 	// Task name of the request, in the case of an offline request.
-	TaskName string `protobuf:"bytes,23,opt,name=task_name,json=taskName" json:"task_name,omitempty"`
+	TaskName string `protobuf:"bytes,23,opt,name=task_name,json=taskName,proto3" json:"task_name,omitempty"`
 	// Whether this was a loading request for the instance.
-	WasLoadingRequest bool `protobuf:"varint,24,opt,name=was_loading_request,json=wasLoadingRequest" json:"was_loading_request,omitempty"`
+	WasLoadingRequest bool `protobuf:"varint,24,opt,name=was_loading_request,json=wasLoadingRequest,proto3" json:"was_loading_request,omitempty"`
 	// Time this request spent in the pending request queue.
-	PendingTime *google_protobuf1.Duration `protobuf:"bytes,25,opt,name=pending_time,json=pendingTime" json:"pending_time,omitempty"`
+	PendingTime *duration.Duration `protobuf:"bytes,25,opt,name=pending_time,json=pendingTime,proto3" json:"pending_time,omitempty"`
 	// If the instance processing this request belongs to a manually scaled
 	// module, then this is the 0-based index of the instance. Otherwise, this
 	// value is -1.
-	InstanceIndex int32 `protobuf:"varint,26,opt,name=instance_index,json=instanceIndex" json:"instance_index,omitempty"`
+	InstanceIndex int32 `protobuf:"varint,26,opt,name=instance_index,json=instanceIndex,proto3" json:"instance_index,omitempty"`
 	// Whether this request is finished or active.
-	Finished bool `protobuf:"varint,27,opt,name=finished" json:"finished,omitempty"`
+	Finished bool `protobuf:"varint,27,opt,name=finished,proto3" json:"finished,omitempty"`
 	// Whether this is the first `RequestLog` entry for this request.  If an
 	// active request has several `RequestLog` entries written to Stackdriver
 	// Logging, then this field will be set for one of them.
-	First bool `protobuf:"varint,42,opt,name=first" json:"first,omitempty"`
+	First bool `protobuf:"varint,42,opt,name=first,proto3" json:"first,omitempty"`
 	// An identifier for the instance that handled the request.
-	InstanceId string `protobuf:"bytes,28,opt,name=instance_id,json=instanceId" json:"instance_id,omitempty"`
+	InstanceId string `protobuf:"bytes,28,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
 	// A list of log lines emitted by the application while serving this request.
-	Line []*LogLine `protobuf:"bytes,29,rep,name=line" json:"line,omitempty"`
+	Line []*LogLine `protobuf:"bytes,29,rep,name=line,proto3" json:"line,omitempty"`
 	// App Engine release version.
-	AppEngineRelease string `protobuf:"bytes,38,opt,name=app_engine_release,json=appEngineRelease" json:"app_engine_release,omitempty"`
+	AppEngineRelease string `protobuf:"bytes,38,opt,name=app_engine_release,json=appEngineRelease,proto3" json:"app_engine_release,omitempty"`
 	// Stackdriver Trace identifier for this request.
-	TraceId string `protobuf:"bytes,39,opt,name=trace_id,json=traceId" json:"trace_id,omitempty"`
+	TraceId string `protobuf:"bytes,39,opt,name=trace_id,json=traceId,proto3" json:"trace_id,omitempty"`
 	// Source code for the application that handled this request. There can be
 	// more than one source reference per deployed application if source code is
 	// distributed among multiple repositories.
-	SourceReference []*SourceReference `protobuf:"bytes,41,rep,name=source_reference,json=sourceReference" json:"source_reference,omitempty"`
+	SourceReference      []*SourceReference `protobuf:"bytes,41,rep,name=source_reference,json=sourceReference,proto3" json:"source_reference,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *RequestLog) Reset()         { *m = RequestLog{} }
+func (m *RequestLog) String() string { return proto.CompactTextString(m) }
+func (*RequestLog) ProtoMessage()    {}
+func (*RequestLog) Descriptor() ([]byte, []int) {
+	return fileDescriptor_request_log_c4e4bcec179d2e52, []int{3}
+}
+func (m *RequestLog) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RequestLog.Unmarshal(m, b)
+}
+func (m *RequestLog) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RequestLog.Marshal(b, m, deterministic)
+}
+func (dst *RequestLog) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestLog.Merge(dst, src)
+}
+func (m *RequestLog) XXX_Size() int {
+	return xxx_messageInfo_RequestLog.Size(m)
+}
+func (m *RequestLog) XXX_DiscardUnknown() {
+	xxx_messageInfo_RequestLog.DiscardUnknown(m)
 }
 
-func (m *RequestLog) Reset()                    { *m = RequestLog{} }
-func (m *RequestLog) String() string            { return proto.CompactTextString(m) }
-func (*RequestLog) ProtoMessage()               {}
-func (*RequestLog) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_RequestLog proto.InternalMessageInfo
 
 func (m *RequestLog) GetAppId() string {
 	if m != nil {
@@ -277,21 +353,21 @@ func (m *RequestLog) GetIp() string {
 	return ""
 }
 
-func (m *RequestLog) GetStartTime() *google_protobuf2.Timestamp {
+func (m *RequestLog) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *RequestLog) GetEndTime() *google_protobuf2.Timestamp {
+func (m *RequestLog) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
 	return nil
 }
 
-func (m *RequestLog) GetLatency() *google_protobuf1.Duration {
+func (m *RequestLog) GetLatency() *duration.Duration {
 	if m != nil {
 		return m.Latency
 	}
@@ -403,7 +479,7 @@ func (m *RequestLog) GetWasLoadingRequest() bool {
 	return false
 }
 
-func (m *RequestLog) GetPendingTime() *google_protobuf1.Duration {
+func (m *RequestLog) GetPendingTime() *duration.Duration {
 	if m != nil {
 		return m.PendingTime
 	}
@@ -473,9 +549,11 @@ func init() {
 	proto.RegisterType((*RequestLog)(nil), "google.appengine.logging.v1.RequestLog")
 }
 
-func init() { proto.RegisterFile("google/appengine/logging/v1/request_log.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/appengine/logging/v1/request_log.proto", fileDescriptor_request_log_c4e4bcec179d2e52)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_request_log_c4e4bcec179d2e52 = []byte{
 	// 921 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x7f, 0x6f, 0x1c, 0x35,
 	0x10, 0xd5, 0xe6, 0xe7, 0x9d, 0x2f, 0xb9, 0xa4, 0xa6, 0x2d, 0x4e, 0x42, 0x9b, 0x23, 0xd0, 0x70,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/app_yaml.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/app_yaml.pb.go
index af25606a..82d43fc3 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/app_yaml.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/app_yaml.pb.go
@@ -1,80 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/app_yaml.proto
 
-/*
-Package appengine is a generated protocol buffer package.
-
-It is generated from these files:
-	google/appengine/v1/app_yaml.proto
-	google/appengine/v1/appengine.proto
-	google/appengine/v1/application.proto
-	google/appengine/v1/audit_data.proto
-	google/appengine/v1/deploy.proto
-	google/appengine/v1/instance.proto
-	google/appengine/v1/location.proto
-	google/appengine/v1/operation.proto
-	google/appengine/v1/service.proto
-	google/appengine/v1/version.proto
-
-It has these top-level messages:
-	ApiConfigHandler
-	ErrorHandler
-	UrlMap
-	StaticFilesHandler
-	ScriptHandler
-	ApiEndpointHandler
-	HealthCheck
-	Library
-	GetApplicationRequest
-	RepairApplicationRequest
-	ListServicesRequest
-	ListServicesResponse
-	GetServiceRequest
-	UpdateServiceRequest
-	DeleteServiceRequest
-	ListVersionsRequest
-	ListVersionsResponse
-	GetVersionRequest
-	CreateVersionRequest
-	UpdateVersionRequest
-	DeleteVersionRequest
-	ListInstancesRequest
-	ListInstancesResponse
-	GetInstanceRequest
-	DeleteInstanceRequest
-	DebugInstanceRequest
-	Application
-	UrlDispatchRule
-	AuditData
-	UpdateServiceMethod
-	CreateVersionMethod
-	Deployment
-	FileInfo
-	ContainerInfo
-	ZipInfo
-	Instance
-	LocationMetadata
-	OperationMetadataV1
-	Service
-	TrafficSplit
-	Version
-	AutomaticScaling
-	BasicScaling
-	ManualScaling
-	CpuUtilization
-	RequestUtilization
-	DiskUtilization
-	NetworkUtilization
-	Network
-	Resources
-*/
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -115,7 +48,9 @@ var AuthFailAction_value = map[string]int32{
 func (x AuthFailAction) String() string {
 	return proto.EnumName(AuthFailAction_name, int32(x))
 }
-func (AuthFailAction) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (AuthFailAction) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{0}
+}
 
 // Methods to restrict access to a URL based on login status.
 type LoginRequirement int32
@@ -152,7 +87,9 @@ var LoginRequirement_value = map[string]int32{
 func (x LoginRequirement) String() string {
 	return proto.EnumName(LoginRequirement_name, int32(x))
 }
-func (LoginRequirement) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (LoginRequirement) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{1}
+}
 
 // Methods to enforce security (HTTPS) on a URL.
 type SecurityLevel int32
@@ -195,7 +132,9 @@ var SecurityLevel_value = map[string]int32{
 func (x SecurityLevel) String() string {
 	return proto.EnumName(SecurityLevel_name, int32(x))
 }
-func (SecurityLevel) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (SecurityLevel) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{2}
+}
 
 // Error codes.
 type ErrorHandler_ErrorCode int32
@@ -232,7 +171,9 @@ var ErrorHandler_ErrorCode_value = map[string]int32{
 func (x ErrorHandler_ErrorCode) String() string {
 	return proto.EnumName(ErrorHandler_ErrorCode_name, int32(x))
 }
-func (ErrorHandler_ErrorCode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (ErrorHandler_ErrorCode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{1, 0}
+}
 
 // Redirect codes.
 type UrlMap_RedirectHttpResponseCode int32
@@ -269,7 +210,7 @@ func (x UrlMap_RedirectHttpResponseCode) String() string {
 	return proto.EnumName(UrlMap_RedirectHttpResponseCode_name, int32(x))
 }
 func (UrlMap_RedirectHttpResponseCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 0}
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{2, 0}
 }
 
 // [Google Cloud Endpoints](https://cloud.google.com/appengine/docs/python/endpoints/)
@@ -277,22 +218,44 @@ func (UrlMap_RedirectHttpResponseCode) EnumDescriptor() ([]byte, []int) {
 type ApiConfigHandler struct {
 	// Action to take when users access resources that require
 	// authentication. Defaults to `redirect`.
-	AuthFailAction AuthFailAction `protobuf:"varint,1,opt,name=auth_fail_action,json=authFailAction,enum=google.appengine.v1.AuthFailAction" json:"auth_fail_action,omitempty"`
+	AuthFailAction AuthFailAction `protobuf:"varint,1,opt,name=auth_fail_action,json=authFailAction,proto3,enum=google.appengine.v1.AuthFailAction" json:"auth_fail_action,omitempty"`
 	// Level of login required to access this resource. Defaults to
 	// `optional`.
-	Login LoginRequirement `protobuf:"varint,2,opt,name=login,enum=google.appengine.v1.LoginRequirement" json:"login,omitempty"`
+	Login LoginRequirement `protobuf:"varint,2,opt,name=login,proto3,enum=google.appengine.v1.LoginRequirement" json:"login,omitempty"`
 	// Path to the script from the application root directory.
-	Script string `protobuf:"bytes,3,opt,name=script" json:"script,omitempty"`
+	Script string `protobuf:"bytes,3,opt,name=script,proto3" json:"script,omitempty"`
 	// Security (HTTPS) enforcement for this URL.
-	SecurityLevel SecurityLevel `protobuf:"varint,4,opt,name=security_level,json=securityLevel,enum=google.appengine.v1.SecurityLevel" json:"security_level,omitempty"`
+	SecurityLevel SecurityLevel `protobuf:"varint,4,opt,name=security_level,json=securityLevel,proto3,enum=google.appengine.v1.SecurityLevel" json:"security_level,omitempty"`
 	// URL to serve the endpoint at.
-	Url string `protobuf:"bytes,5,opt,name=url" json:"url,omitempty"`
+	Url                  string   `protobuf:"bytes,5,opt,name=url,proto3" json:"url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ApiConfigHandler) Reset()         { *m = ApiConfigHandler{} }
+func (m *ApiConfigHandler) String() string { return proto.CompactTextString(m) }
+func (*ApiConfigHandler) ProtoMessage()    {}
+func (*ApiConfigHandler) Descriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{0}
+}
+func (m *ApiConfigHandler) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ApiConfigHandler.Unmarshal(m, b)
+}
+func (m *ApiConfigHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ApiConfigHandler.Marshal(b, m, deterministic)
+}
+func (dst *ApiConfigHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApiConfigHandler.Merge(dst, src)
+}
+func (m *ApiConfigHandler) XXX_Size() int {
+	return xxx_messageInfo_ApiConfigHandler.Size(m)
+}
+func (m *ApiConfigHandler) XXX_DiscardUnknown() {
+	xxx_messageInfo_ApiConfigHandler.DiscardUnknown(m)
 }
 
-func (m *ApiConfigHandler) Reset()                    { *m = ApiConfigHandler{} }
-func (m *ApiConfigHandler) String() string            { return proto.CompactTextString(m) }
-func (*ApiConfigHandler) ProtoMessage()               {}
-func (*ApiConfigHandler) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_ApiConfigHandler proto.InternalMessageInfo
 
 func (m *ApiConfigHandler) GetAuthFailAction() AuthFailAction {
 	if m != nil {
@@ -332,17 +295,39 @@ func (m *ApiConfigHandler) GetUrl() string {
 // Custom static error page to be served when an error occurs.
 type ErrorHandler struct {
 	// Error condition this handler applies to.
-	ErrorCode ErrorHandler_ErrorCode `protobuf:"varint,1,opt,name=error_code,json=errorCode,enum=google.appengine.v1.ErrorHandler_ErrorCode" json:"error_code,omitempty"`
+	ErrorCode ErrorHandler_ErrorCode `protobuf:"varint,1,opt,name=error_code,json=errorCode,proto3,enum=google.appengine.v1.ErrorHandler_ErrorCode" json:"error_code,omitempty"`
 	// Static file content to be served for this error.
-	StaticFile string `protobuf:"bytes,2,opt,name=static_file,json=staticFile" json:"static_file,omitempty"`
+	StaticFile string `protobuf:"bytes,2,opt,name=static_file,json=staticFile,proto3" json:"static_file,omitempty"`
 	// MIME type of file. Defaults to `text/html`.
-	MimeType string `protobuf:"bytes,3,opt,name=mime_type,json=mimeType" json:"mime_type,omitempty"`
+	MimeType             string   `protobuf:"bytes,3,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ErrorHandler) Reset()         { *m = ErrorHandler{} }
+func (m *ErrorHandler) String() string { return proto.CompactTextString(m) }
+func (*ErrorHandler) ProtoMessage()    {}
+func (*ErrorHandler) Descriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{1}
+}
+func (m *ErrorHandler) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErrorHandler.Unmarshal(m, b)
+}
+func (m *ErrorHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErrorHandler.Marshal(b, m, deterministic)
+}
+func (dst *ErrorHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorHandler.Merge(dst, src)
+}
+func (m *ErrorHandler) XXX_Size() int {
+	return xxx_messageInfo_ErrorHandler.Size(m)
+}
+func (m *ErrorHandler) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErrorHandler.DiscardUnknown(m)
 }
 
-func (m *ErrorHandler) Reset()                    { *m = ErrorHandler{} }
-func (m *ErrorHandler) String() string            { return proto.CompactTextString(m) }
-func (*ErrorHandler) ProtoMessage()               {}
-func (*ErrorHandler) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_ErrorHandler proto.InternalMessageInfo
 
 func (m *ErrorHandler) GetErrorCode() ErrorHandler_ErrorCode {
 	if m != nil {
@@ -373,7 +358,7 @@ type UrlMap struct {
 	// special characters must be escaped, but should not contain groupings.
 	// All URLs that begin with this prefix are handled by this handler, using the
 	// portion of the URL after the prefix as part of the file path.
-	UrlRegex string `protobuf:"bytes,1,opt,name=url_regex,json=urlRegex" json:"url_regex,omitempty"`
+	UrlRegex string `protobuf:"bytes,1,opt,name=url_regex,json=urlRegex,proto3" json:"url_regex,omitempty"`
 	// Type of handler for this URL pattern.
 	//
 	// Types that are valid to be assigned to HandlerType:
@@ -382,38 +367,71 @@ type UrlMap struct {
 	//	*UrlMap_ApiEndpoint
 	HandlerType isUrlMap_HandlerType `protobuf_oneof:"handler_type"`
 	// Security (HTTPS) enforcement for this URL.
-	SecurityLevel SecurityLevel `protobuf:"varint,5,opt,name=security_level,json=securityLevel,enum=google.appengine.v1.SecurityLevel" json:"security_level,omitempty"`
+	SecurityLevel SecurityLevel `protobuf:"varint,5,opt,name=security_level,json=securityLevel,proto3,enum=google.appengine.v1.SecurityLevel" json:"security_level,omitempty"`
 	// Level of login required to access this resource.
-	Login LoginRequirement `protobuf:"varint,6,opt,name=login,enum=google.appengine.v1.LoginRequirement" json:"login,omitempty"`
+	Login LoginRequirement `protobuf:"varint,6,opt,name=login,proto3,enum=google.appengine.v1.LoginRequirement" json:"login,omitempty"`
 	// Action to take when users access resources that require
 	// authentication. Defaults to `redirect`.
-	AuthFailAction AuthFailAction `protobuf:"varint,7,opt,name=auth_fail_action,json=authFailAction,enum=google.appengine.v1.AuthFailAction" json:"auth_fail_action,omitempty"`
+	AuthFailAction AuthFailAction `protobuf:"varint,7,opt,name=auth_fail_action,json=authFailAction,proto3,enum=google.appengine.v1.AuthFailAction" json:"auth_fail_action,omitempty"`
 	// `30x` code to use when performing redirects for the `secure` field.
 	// Defaults to `302`.
-	RedirectHttpResponseCode UrlMap_RedirectHttpResponseCode `protobuf:"varint,8,opt,name=redirect_http_response_code,json=redirectHttpResponseCode,enum=google.appengine.v1.UrlMap_RedirectHttpResponseCode" json:"redirect_http_response_code,omitempty"`
+	RedirectHttpResponseCode UrlMap_RedirectHttpResponseCode `protobuf:"varint,8,opt,name=redirect_http_response_code,json=redirectHttpResponseCode,proto3,enum=google.appengine.v1.UrlMap_RedirectHttpResponseCode" json:"redirect_http_response_code,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{}                        `json:"-"`
+	XXX_unrecognized         []byte                          `json:"-"`
+	XXX_sizecache            int32                           `json:"-"`
+}
+
+func (m *UrlMap) Reset()         { *m = UrlMap{} }
+func (m *UrlMap) String() string { return proto.CompactTextString(m) }
+func (*UrlMap) ProtoMessage()    {}
+func (*UrlMap) Descriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{2}
+}
+func (m *UrlMap) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UrlMap.Unmarshal(m, b)
+}
+func (m *UrlMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UrlMap.Marshal(b, m, deterministic)
+}
+func (dst *UrlMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UrlMap.Merge(dst, src)
+}
+func (m *UrlMap) XXX_Size() int {
+	return xxx_messageInfo_UrlMap.Size(m)
+}
+func (m *UrlMap) XXX_DiscardUnknown() {
+	xxx_messageInfo_UrlMap.DiscardUnknown(m)
 }
 
-func (m *UrlMap) Reset()                    { *m = UrlMap{} }
-func (m *UrlMap) String() string            { return proto.CompactTextString(m) }
-func (*UrlMap) ProtoMessage()               {}
-func (*UrlMap) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_UrlMap proto.InternalMessageInfo
+
+func (m *UrlMap) GetUrlRegex() string {
+	if m != nil {
+		return m.UrlRegex
+	}
+	return ""
+}
 
 type isUrlMap_HandlerType interface {
 	isUrlMap_HandlerType()
 }
 
 type UrlMap_StaticFiles struct {
-	StaticFiles *StaticFilesHandler `protobuf:"bytes,2,opt,name=static_files,json=staticFiles,oneof"`
+	StaticFiles *StaticFilesHandler `protobuf:"bytes,2,opt,name=static_files,json=staticFiles,proto3,oneof"`
 }
+
 type UrlMap_Script struct {
-	Script *ScriptHandler `protobuf:"bytes,3,opt,name=script,oneof"`
+	Script *ScriptHandler `protobuf:"bytes,3,opt,name=script,proto3,oneof"`
 }
+
 type UrlMap_ApiEndpoint struct {
-	ApiEndpoint *ApiEndpointHandler `protobuf:"bytes,4,opt,name=api_endpoint,json=apiEndpoint,oneof"`
+	ApiEndpoint *ApiEndpointHandler `protobuf:"bytes,4,opt,name=api_endpoint,json=apiEndpoint,proto3,oneof"`
 }
 
 func (*UrlMap_StaticFiles) isUrlMap_HandlerType() {}
-func (*UrlMap_Script) isUrlMap_HandlerType()      {}
+
+func (*UrlMap_Script) isUrlMap_HandlerType() {}
+
 func (*UrlMap_ApiEndpoint) isUrlMap_HandlerType() {}
 
 func (m *UrlMap) GetHandlerType() isUrlMap_HandlerType {
@@ -423,13 +441,6 @@ func (m *UrlMap) GetHandlerType() isUrlMap_HandlerType {
 	return nil
 }
 
-func (m *UrlMap) GetUrlRegex() string {
-	if m != nil {
-		return m.UrlRegex
-	}
-	return ""
-}
-
 func (m *UrlMap) GetStaticFiles() *StaticFilesHandler {
 	if x, ok := m.GetHandlerType().(*UrlMap_StaticFiles); ok {
 		return x.StaticFiles
@@ -552,17 +563,17 @@ func _UrlMap_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.HandlerType.(type) {
 	case *UrlMap_StaticFiles:
 		s := proto.Size(x.StaticFiles)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *UrlMap_Script:
 		s := proto.Size(x.Script)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *UrlMap_ApiEndpoint:
 		s := proto.Size(x.ApiEndpoint)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -580,35 +591,57 @@ type StaticFilesHandler struct {
 	// Path to the static files matched by the URL pattern, from the
 	// application root directory. The path can refer to text matched in groupings
 	// in the URL pattern.
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// Regular expression that matches the file paths for all files that should be
 	// referenced by this handler.
-	UploadPathRegex string `protobuf:"bytes,2,opt,name=upload_path_regex,json=uploadPathRegex" json:"upload_path_regex,omitempty"`
+	UploadPathRegex string `protobuf:"bytes,2,opt,name=upload_path_regex,json=uploadPathRegex,proto3" json:"upload_path_regex,omitempty"`
 	// HTTP headers to use for all responses from these URLs.
-	HttpHeaders map[string]string `protobuf:"bytes,3,rep,name=http_headers,json=httpHeaders" json:"http_headers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	HttpHeaders map[string]string `protobuf:"bytes,3,rep,name=http_headers,json=httpHeaders,proto3" json:"http_headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// MIME type used to serve all files served by this handler.
 	//
 	// Defaults to file-specific MIME types, which are derived from each file's
 	// filename extension.
-	MimeType string `protobuf:"bytes,4,opt,name=mime_type,json=mimeType" json:"mime_type,omitempty"`
+	MimeType string `protobuf:"bytes,4,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
 	// Time a static file served by this handler should be cached
 	// by web proxies and browsers.
-	Expiration *google_protobuf1.Duration `protobuf:"bytes,5,opt,name=expiration" json:"expiration,omitempty"`
+	Expiration *duration.Duration `protobuf:"bytes,5,opt,name=expiration,proto3" json:"expiration,omitempty"`
 	// Whether this handler should match the request if the file
 	// referenced by the handler does not exist.
-	RequireMatchingFile bool `protobuf:"varint,6,opt,name=require_matching_file,json=requireMatchingFile" json:"require_matching_file,omitempty"`
+	RequireMatchingFile bool `protobuf:"varint,6,opt,name=require_matching_file,json=requireMatchingFile,proto3" json:"require_matching_file,omitempty"`
 	// Whether files should also be uploaded as code data. By default, files
 	// declared in static file handlers are uploaded as static
 	// data and are only served to end users; they cannot be read by the
 	// application. If enabled, uploads are charged against both your code and
 	// static data storage resource quotas.
-	ApplicationReadable bool `protobuf:"varint,7,opt,name=application_readable,json=applicationReadable" json:"application_readable,omitempty"`
+	ApplicationReadable  bool     `protobuf:"varint,7,opt,name=application_readable,json=applicationReadable,proto3" json:"application_readable,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StaticFilesHandler) Reset()         { *m = StaticFilesHandler{} }
+func (m *StaticFilesHandler) String() string { return proto.CompactTextString(m) }
+func (*StaticFilesHandler) ProtoMessage()    {}
+func (*StaticFilesHandler) Descriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{3}
+}
+func (m *StaticFilesHandler) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StaticFilesHandler.Unmarshal(m, b)
+}
+func (m *StaticFilesHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StaticFilesHandler.Marshal(b, m, deterministic)
+}
+func (dst *StaticFilesHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StaticFilesHandler.Merge(dst, src)
+}
+func (m *StaticFilesHandler) XXX_Size() int {
+	return xxx_messageInfo_StaticFilesHandler.Size(m)
+}
+func (m *StaticFilesHandler) XXX_DiscardUnknown() {
+	xxx_messageInfo_StaticFilesHandler.DiscardUnknown(m)
 }
 
-func (m *StaticFilesHandler) Reset()                    { *m = StaticFilesHandler{} }
-func (m *StaticFilesHandler) String() string            { return proto.CompactTextString(m) }
-func (*StaticFilesHandler) ProtoMessage()               {}
-func (*StaticFilesHandler) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_StaticFilesHandler proto.InternalMessageInfo
 
 func (m *StaticFilesHandler) GetPath() string {
 	if m != nil {
@@ -638,7 +671,7 @@ func (m *StaticFilesHandler) GetMimeType() string {
 	return ""
 }
 
-func (m *StaticFilesHandler) GetExpiration() *google_protobuf1.Duration {
+func (m *StaticFilesHandler) GetExpiration() *duration.Duration {
 	if m != nil {
 		return m.Expiration
 	}
@@ -662,13 +695,35 @@ func (m *StaticFilesHandler) GetApplicationReadable() bool {
 // Executes a script to handle the request that matches the URL pattern.
 type ScriptHandler struct {
 	// Path to the script from the application root directory.
-	ScriptPath string `protobuf:"bytes,1,opt,name=script_path,json=scriptPath" json:"script_path,omitempty"`
+	ScriptPath           string   `protobuf:"bytes,1,opt,name=script_path,json=scriptPath,proto3" json:"script_path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ScriptHandler) Reset()                    { *m = ScriptHandler{} }
-func (m *ScriptHandler) String() string            { return proto.CompactTextString(m) }
-func (*ScriptHandler) ProtoMessage()               {}
-func (*ScriptHandler) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ScriptHandler) Reset()         { *m = ScriptHandler{} }
+func (m *ScriptHandler) String() string { return proto.CompactTextString(m) }
+func (*ScriptHandler) ProtoMessage()    {}
+func (*ScriptHandler) Descriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{4}
+}
+func (m *ScriptHandler) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScriptHandler.Unmarshal(m, b)
+}
+func (m *ScriptHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScriptHandler.Marshal(b, m, deterministic)
+}
+func (dst *ScriptHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScriptHandler.Merge(dst, src)
+}
+func (m *ScriptHandler) XXX_Size() int {
+	return xxx_messageInfo_ScriptHandler.Size(m)
+}
+func (m *ScriptHandler) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScriptHandler.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScriptHandler proto.InternalMessageInfo
 
 func (m *ScriptHandler) GetScriptPath() string {
 	if m != nil {
@@ -680,13 +735,35 @@ func (m *ScriptHandler) GetScriptPath() string {
 // Uses Google Cloud Endpoints to handle requests.
 type ApiEndpointHandler struct {
 	// Path to the script from the application root directory.
-	ScriptPath string `protobuf:"bytes,1,opt,name=script_path,json=scriptPath" json:"script_path,omitempty"`
+	ScriptPath           string   `protobuf:"bytes,1,opt,name=script_path,json=scriptPath,proto3" json:"script_path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ApiEndpointHandler) Reset()         { *m = ApiEndpointHandler{} }
+func (m *ApiEndpointHandler) String() string { return proto.CompactTextString(m) }
+func (*ApiEndpointHandler) ProtoMessage()    {}
+func (*ApiEndpointHandler) Descriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{5}
+}
+func (m *ApiEndpointHandler) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ApiEndpointHandler.Unmarshal(m, b)
+}
+func (m *ApiEndpointHandler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ApiEndpointHandler.Marshal(b, m, deterministic)
+}
+func (dst *ApiEndpointHandler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ApiEndpointHandler.Merge(dst, src)
+}
+func (m *ApiEndpointHandler) XXX_Size() int {
+	return xxx_messageInfo_ApiEndpointHandler.Size(m)
+}
+func (m *ApiEndpointHandler) XXX_DiscardUnknown() {
+	xxx_messageInfo_ApiEndpointHandler.DiscardUnknown(m)
 }
 
-func (m *ApiEndpointHandler) Reset()                    { *m = ApiEndpointHandler{} }
-func (m *ApiEndpointHandler) String() string            { return proto.CompactTextString(m) }
-func (*ApiEndpointHandler) ProtoMessage()               {}
-func (*ApiEndpointHandler) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_ApiEndpointHandler proto.InternalMessageInfo
 
 func (m *ApiEndpointHandler) GetScriptPath() string {
 	if m != nil {
@@ -700,29 +777,51 @@ func (m *ApiEndpointHandler) GetScriptPath() string {
 // instances in App Engine flexible environment.
 type HealthCheck struct {
 	// Whether to explicitly disable health checks for this instance.
-	DisableHealthCheck bool `protobuf:"varint,1,opt,name=disable_health_check,json=disableHealthCheck" json:"disable_health_check,omitempty"`
+	DisableHealthCheck bool `protobuf:"varint,1,opt,name=disable_health_check,json=disableHealthCheck,proto3" json:"disable_health_check,omitempty"`
 	// Host header to send when performing an HTTP health check.
 	// Example: "myapp.appspot.com"
-	Host string `protobuf:"bytes,2,opt,name=host" json:"host,omitempty"`
+	Host string `protobuf:"bytes,2,opt,name=host,proto3" json:"host,omitempty"`
 	// Number of consecutive successful health checks required before receiving
 	// traffic.
-	HealthyThreshold uint32 `protobuf:"varint,3,opt,name=healthy_threshold,json=healthyThreshold" json:"healthy_threshold,omitempty"`
+	HealthyThreshold uint32 `protobuf:"varint,3,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"`
 	// Number of consecutive failed health checks required before removing
 	// traffic.
-	UnhealthyThreshold uint32 `protobuf:"varint,4,opt,name=unhealthy_threshold,json=unhealthyThreshold" json:"unhealthy_threshold,omitempty"`
+	UnhealthyThreshold uint32 `protobuf:"varint,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"`
 	// Number of consecutive failed health checks required before an instance is
 	// restarted.
-	RestartThreshold uint32 `protobuf:"varint,5,opt,name=restart_threshold,json=restartThreshold" json:"restart_threshold,omitempty"`
+	RestartThreshold uint32 `protobuf:"varint,5,opt,name=restart_threshold,json=restartThreshold,proto3" json:"restart_threshold,omitempty"`
 	// Interval between health checks.
-	CheckInterval *google_protobuf1.Duration `protobuf:"bytes,6,opt,name=check_interval,json=checkInterval" json:"check_interval,omitempty"`
+	CheckInterval *duration.Duration `protobuf:"bytes,6,opt,name=check_interval,json=checkInterval,proto3" json:"check_interval,omitempty"`
 	// Time before the health check is considered failed.
-	Timeout *google_protobuf1.Duration `protobuf:"bytes,7,opt,name=timeout" json:"timeout,omitempty"`
+	Timeout              *duration.Duration `protobuf:"bytes,7,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *HealthCheck) Reset()         { *m = HealthCheck{} }
+func (m *HealthCheck) String() string { return proto.CompactTextString(m) }
+func (*HealthCheck) ProtoMessage()    {}
+func (*HealthCheck) Descriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{6}
+}
+func (m *HealthCheck) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HealthCheck.Unmarshal(m, b)
+}
+func (m *HealthCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HealthCheck.Marshal(b, m, deterministic)
+}
+func (dst *HealthCheck) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HealthCheck.Merge(dst, src)
+}
+func (m *HealthCheck) XXX_Size() int {
+	return xxx_messageInfo_HealthCheck.Size(m)
+}
+func (m *HealthCheck) XXX_DiscardUnknown() {
+	xxx_messageInfo_HealthCheck.DiscardUnknown(m)
 }
 
-func (m *HealthCheck) Reset()                    { *m = HealthCheck{} }
-func (m *HealthCheck) String() string            { return proto.CompactTextString(m) }
-func (*HealthCheck) ProtoMessage()               {}
-func (*HealthCheck) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_HealthCheck proto.InternalMessageInfo
 
 func (m *HealthCheck) GetDisableHealthCheck() bool {
 	if m != nil {
@@ -759,14 +858,14 @@ func (m *HealthCheck) GetRestartThreshold() uint32 {
 	return 0
 }
 
-func (m *HealthCheck) GetCheckInterval() *google_protobuf1.Duration {
+func (m *HealthCheck) GetCheckInterval() *duration.Duration {
 	if m != nil {
 		return m.CheckInterval
 	}
 	return nil
 }
 
-func (m *HealthCheck) GetTimeout() *google_protobuf1.Duration {
+func (m *HealthCheck) GetTimeout() *duration.Duration {
 	if m != nil {
 		return m.Timeout
 	}
@@ -776,15 +875,37 @@ func (m *HealthCheck) GetTimeout() *google_protobuf1.Duration {
 // Third-party Python runtime library that is required by the application.
 type Library struct {
 	// Name of the library. Example: "django".
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Version of the library to select, or "latest".
-	Version string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
+	Version              string   `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Library) Reset()         { *m = Library{} }
+func (m *Library) String() string { return proto.CompactTextString(m) }
+func (*Library) ProtoMessage()    {}
+func (*Library) Descriptor() ([]byte, []int) {
+	return fileDescriptor_app_yaml_07fe113144fe6ee6, []int{7}
+}
+func (m *Library) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Library.Unmarshal(m, b)
+}
+func (m *Library) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Library.Marshal(b, m, deterministic)
+}
+func (dst *Library) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Library.Merge(dst, src)
+}
+func (m *Library) XXX_Size() int {
+	return xxx_messageInfo_Library.Size(m)
+}
+func (m *Library) XXX_DiscardUnknown() {
+	xxx_messageInfo_Library.DiscardUnknown(m)
 }
 
-func (m *Library) Reset()                    { *m = Library{} }
-func (m *Library) String() string            { return proto.CompactTextString(m) }
-func (*Library) ProtoMessage()               {}
-func (*Library) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_Library proto.InternalMessageInfo
 
 func (m *Library) GetName() string {
 	if m != nil {
@@ -805,6 +926,7 @@ func init() {
 	proto.RegisterType((*ErrorHandler)(nil), "google.appengine.v1.ErrorHandler")
 	proto.RegisterType((*UrlMap)(nil), "google.appengine.v1.UrlMap")
 	proto.RegisterType((*StaticFilesHandler)(nil), "google.appengine.v1.StaticFilesHandler")
+	proto.RegisterMapType((map[string]string)(nil), "google.appengine.v1.StaticFilesHandler.HttpHeadersEntry")
 	proto.RegisterType((*ScriptHandler)(nil), "google.appengine.v1.ScriptHandler")
 	proto.RegisterType((*ApiEndpointHandler)(nil), "google.appengine.v1.ApiEndpointHandler")
 	proto.RegisterType((*HealthCheck)(nil), "google.appengine.v1.HealthCheck")
@@ -816,9 +938,11 @@ func init() {
 	proto.RegisterEnum("google.appengine.v1.UrlMap_RedirectHttpResponseCode", UrlMap_RedirectHttpResponseCode_name, UrlMap_RedirectHttpResponseCode_value)
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/app_yaml.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/app_yaml.proto", fileDescriptor_app_yaml_07fe113144fe6ee6)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_app_yaml_07fe113144fe6ee6 = []byte{
 	// 1232 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x13, 0x47,
 	0x14, 0xc6, 0x76, 0x7e, 0x8f, 0x1d, 0xb3, 0x99, 0x00, 0x75, 0x02, 0x94, 0xd4, 0xa8, 0x02, 0x25,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/appengine.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/appengine.pb.go
index d4ce9eed..52475de6 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/appengine.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/appengine.pb.go
@@ -1,17 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/appengine.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _ "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "google.golang.org/genproto/googleapis/iam/v1"
-import _ "google.golang.org/genproto/googleapis/iam/v1"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf5 "google.golang.org/genproto/protobuf/field_mask"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -23,6 +22,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Fields that should be returned when [Version][google.appengine.v1.Version] resources
 // are retreived.
 type VersionView int32
@@ -49,18 +54,42 @@ var VersionView_value = map[string]int32{
 func (x VersionView) String() string {
 	return proto.EnumName(VersionView_name, int32(x))
 }
-func (VersionView) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (VersionView) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{0}
+}
 
 // Request message for `Applications.GetApplication`.
 type GetApplicationRequest struct {
 	// Name of the Application resource to get. Example: `apps/myapp`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetApplicationRequest) Reset()         { *m = GetApplicationRequest{} }
+func (m *GetApplicationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetApplicationRequest) ProtoMessage()    {}
+func (*GetApplicationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{0}
+}
+func (m *GetApplicationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetApplicationRequest.Unmarshal(m, b)
+}
+func (m *GetApplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetApplicationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetApplicationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetApplicationRequest.Merge(dst, src)
+}
+func (m *GetApplicationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetApplicationRequest.Size(m)
+}
+func (m *GetApplicationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetApplicationRequest.DiscardUnknown(m)
 }
 
-func (m *GetApplicationRequest) Reset()                    { *m = GetApplicationRequest{} }
-func (m *GetApplicationRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetApplicationRequest) ProtoMessage()               {}
-func (*GetApplicationRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_GetApplicationRequest proto.InternalMessageInfo
 
 func (m *GetApplicationRequest) GetName() string {
 	if m != nil {
@@ -72,13 +101,35 @@ func (m *GetApplicationRequest) GetName() string {
 // Request message for 'Applications.RepairApplication'.
 type RepairApplicationRequest struct {
 	// Name of the application to repair. Example: `apps/myapp`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RepairApplicationRequest) Reset()         { *m = RepairApplicationRequest{} }
+func (m *RepairApplicationRequest) String() string { return proto.CompactTextString(m) }
+func (*RepairApplicationRequest) ProtoMessage()    {}
+func (*RepairApplicationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{1}
+}
+func (m *RepairApplicationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RepairApplicationRequest.Unmarshal(m, b)
+}
+func (m *RepairApplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RepairApplicationRequest.Marshal(b, m, deterministic)
+}
+func (dst *RepairApplicationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepairApplicationRequest.Merge(dst, src)
+}
+func (m *RepairApplicationRequest) XXX_Size() int {
+	return xxx_messageInfo_RepairApplicationRequest.Size(m)
+}
+func (m *RepairApplicationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RepairApplicationRequest.DiscardUnknown(m)
 }
 
-func (m *RepairApplicationRequest) Reset()                    { *m = RepairApplicationRequest{} }
-func (m *RepairApplicationRequest) String() string            { return proto.CompactTextString(m) }
-func (*RepairApplicationRequest) ProtoMessage()               {}
-func (*RepairApplicationRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_RepairApplicationRequest proto.InternalMessageInfo
 
 func (m *RepairApplicationRequest) GetName() string {
 	if m != nil {
@@ -90,17 +141,39 @@ func (m *RepairApplicationRequest) GetName() string {
 // Request message for `Services.ListServices`.
 type ListServicesRequest struct {
 	// Name of the parent Application resource. Example: `apps/myapp`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Maximum results to return per page.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Continuation token for fetching the next page of results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListServicesRequest) Reset()         { *m = ListServicesRequest{} }
+func (m *ListServicesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListServicesRequest) ProtoMessage()    {}
+func (*ListServicesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{2}
+}
+func (m *ListServicesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServicesRequest.Unmarshal(m, b)
+}
+func (m *ListServicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServicesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListServicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServicesRequest.Merge(dst, src)
+}
+func (m *ListServicesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListServicesRequest.Size(m)
+}
+func (m *ListServicesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServicesRequest.DiscardUnknown(m)
 }
 
-func (m *ListServicesRequest) Reset()                    { *m = ListServicesRequest{} }
-func (m *ListServicesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListServicesRequest) ProtoMessage()               {}
-func (*ListServicesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_ListServicesRequest proto.InternalMessageInfo
 
 func (m *ListServicesRequest) GetParent() string {
 	if m != nil {
@@ -126,15 +199,37 @@ func (m *ListServicesRequest) GetPageToken() string {
 // Response message for `Services.ListServices`.
 type ListServicesResponse struct {
 	// The services belonging to the requested application.
-	Services []*Service `protobuf:"bytes,1,rep,name=services" json:"services,omitempty"`
+	Services []*Service `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"`
 	// Continuation token for fetching the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListServicesResponse) Reset()                    { *m = ListServicesResponse{} }
-func (m *ListServicesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListServicesResponse) ProtoMessage()               {}
-func (*ListServicesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *ListServicesResponse) Reset()         { *m = ListServicesResponse{} }
+func (m *ListServicesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListServicesResponse) ProtoMessage()    {}
+func (*ListServicesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{3}
+}
+func (m *ListServicesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServicesResponse.Unmarshal(m, b)
+}
+func (m *ListServicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServicesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListServicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServicesResponse.Merge(dst, src)
+}
+func (m *ListServicesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListServicesResponse.Size(m)
+}
+func (m *ListServicesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServicesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListServicesResponse proto.InternalMessageInfo
 
 func (m *ListServicesResponse) GetServices() []*Service {
 	if m != nil {
@@ -153,13 +248,35 @@ func (m *ListServicesResponse) GetNextPageToken() string {
 // Request message for `Services.GetService`.
 type GetServiceRequest struct {
 	// Name of the resource requested. Example: `apps/myapp/services/default`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetServiceRequest) Reset()                    { *m = GetServiceRequest{} }
-func (m *GetServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServiceRequest) ProtoMessage()               {}
-func (*GetServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (m *GetServiceRequest) Reset()         { *m = GetServiceRequest{} }
+func (m *GetServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServiceRequest) ProtoMessage()    {}
+func (*GetServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{4}
+}
+func (m *GetServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServiceRequest.Unmarshal(m, b)
+}
+func (m *GetServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceRequest.Merge(dst, src)
+}
+func (m *GetServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServiceRequest.Size(m)
+}
+func (m *GetServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServiceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetServiceRequest proto.InternalMessageInfo
 
 func (m *GetServiceRequest) GetName() string {
 	if m != nil {
@@ -171,12 +288,12 @@ func (m *GetServiceRequest) GetName() string {
 // Request message for `Services.UpdateService`.
 type UpdateServiceRequest struct {
 	// Name of the resource to update. Example: `apps/myapp/services/default`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A Service resource containing the updated service. Only fields set in the
 	// field mask will be updated.
-	Service *Service `protobuf:"bytes,2,opt,name=service" json:"service,omitempty"`
+	Service *Service `protobuf:"bytes,2,opt,name=service,proto3" json:"service,omitempty"`
 	// Standard field mask for the set of fields to be updated.
-	UpdateMask *google_protobuf5.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Set to `true` to gradually shift traffic from one version to another
 	// single version. By default, traffic is shifted immediately.
 	// For gradual traffic migration, the target version
@@ -189,13 +306,35 @@ type UpdateServiceRequest struct {
 	// field in the Service resource. Gradual traffic migration is not
 	// supported in the App Engine flexible environment. For examples, see
 	// [Migrating and Splitting Traffic](https://cloud.google.com/appengine/docs/admin-api/migrating-splitting-traffic).
-	MigrateTraffic bool `protobuf:"varint,4,opt,name=migrate_traffic,json=migrateTraffic" json:"migrate_traffic,omitempty"`
+	MigrateTraffic       bool     `protobuf:"varint,4,opt,name=migrate_traffic,json=migrateTraffic,proto3" json:"migrate_traffic,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateServiceRequest) Reset()         { *m = UpdateServiceRequest{} }
+func (m *UpdateServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateServiceRequest) ProtoMessage()    {}
+func (*UpdateServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{5}
+}
+func (m *UpdateServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateServiceRequest.Unmarshal(m, b)
+}
+func (m *UpdateServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateServiceRequest.Merge(dst, src)
+}
+func (m *UpdateServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateServiceRequest.Size(m)
+}
+func (m *UpdateServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateServiceRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateServiceRequest) Reset()                    { *m = UpdateServiceRequest{} }
-func (m *UpdateServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateServiceRequest) ProtoMessage()               {}
-func (*UpdateServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_UpdateServiceRequest proto.InternalMessageInfo
 
 func (m *UpdateServiceRequest) GetName() string {
 	if m != nil {
@@ -211,7 +350,7 @@ func (m *UpdateServiceRequest) GetService() *Service {
 	return nil
 }
 
-func (m *UpdateServiceRequest) GetUpdateMask() *google_protobuf5.FieldMask {
+func (m *UpdateServiceRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -228,13 +367,35 @@ func (m *UpdateServiceRequest) GetMigrateTraffic() bool {
 // Request message for `Services.DeleteService`.
 type DeleteServiceRequest struct {
 	// Name of the resource requested. Example: `apps/myapp/services/default`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteServiceRequest) Reset()                    { *m = DeleteServiceRequest{} }
-func (m *DeleteServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteServiceRequest) ProtoMessage()               {}
-func (*DeleteServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *DeleteServiceRequest) Reset()         { *m = DeleteServiceRequest{} }
+func (m *DeleteServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteServiceRequest) ProtoMessage()    {}
+func (*DeleteServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{6}
+}
+func (m *DeleteServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteServiceRequest.Unmarshal(m, b)
+}
+func (m *DeleteServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteServiceRequest.Merge(dst, src)
+}
+func (m *DeleteServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteServiceRequest.Size(m)
+}
+func (m *DeleteServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteServiceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteServiceRequest proto.InternalMessageInfo
 
 func (m *DeleteServiceRequest) GetName() string {
 	if m != nil {
@@ -247,19 +408,41 @@ func (m *DeleteServiceRequest) GetName() string {
 type ListVersionsRequest struct {
 	// Name of the parent Service resource. Example:
 	// `apps/myapp/services/default`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Controls the set of fields returned in the `List` response.
-	View VersionView `protobuf:"varint,2,opt,name=view,enum=google.appengine.v1.VersionView" json:"view,omitempty"`
+	View VersionView `protobuf:"varint,2,opt,name=view,proto3,enum=google.appengine.v1.VersionView" json:"view,omitempty"`
 	// Maximum results to return per page.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Continuation token for fetching the next page of results.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListVersionsRequest) Reset()                    { *m = ListVersionsRequest{} }
-func (m *ListVersionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListVersionsRequest) ProtoMessage()               {}
-func (*ListVersionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+func (m *ListVersionsRequest) Reset()         { *m = ListVersionsRequest{} }
+func (m *ListVersionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListVersionsRequest) ProtoMessage()    {}
+func (*ListVersionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{7}
+}
+func (m *ListVersionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVersionsRequest.Unmarshal(m, b)
+}
+func (m *ListVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVersionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListVersionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVersionsRequest.Merge(dst, src)
+}
+func (m *ListVersionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListVersionsRequest.Size(m)
+}
+func (m *ListVersionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVersionsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListVersionsRequest proto.InternalMessageInfo
 
 func (m *ListVersionsRequest) GetParent() string {
 	if m != nil {
@@ -292,15 +475,37 @@ func (m *ListVersionsRequest) GetPageToken() string {
 // Response message for `Versions.ListVersions`.
 type ListVersionsResponse struct {
 	// The versions belonging to the requested service.
-	Versions []*Version `protobuf:"bytes,1,rep,name=versions" json:"versions,omitempty"`
+	Versions []*Version `protobuf:"bytes,1,rep,name=versions,proto3" json:"versions,omitempty"`
 	// Continuation token for fetching the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListVersionsResponse) Reset()                    { *m = ListVersionsResponse{} }
-func (m *ListVersionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListVersionsResponse) ProtoMessage()               {}
-func (*ListVersionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+func (m *ListVersionsResponse) Reset()         { *m = ListVersionsResponse{} }
+func (m *ListVersionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListVersionsResponse) ProtoMessage()    {}
+func (*ListVersionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{8}
+}
+func (m *ListVersionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVersionsResponse.Unmarshal(m, b)
+}
+func (m *ListVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVersionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListVersionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVersionsResponse.Merge(dst, src)
+}
+func (m *ListVersionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListVersionsResponse.Size(m)
+}
+func (m *ListVersionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVersionsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListVersionsResponse proto.InternalMessageInfo
 
 func (m *ListVersionsResponse) GetVersions() []*Version {
 	if m != nil {
@@ -320,15 +525,37 @@ func (m *ListVersionsResponse) GetNextPageToken() string {
 type GetVersionRequest struct {
 	// Name of the resource requested. Example:
 	// `apps/myapp/services/default/versions/v1`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Controls the set of fields returned in the `Get` response.
-	View VersionView `protobuf:"varint,2,opt,name=view,enum=google.appengine.v1.VersionView" json:"view,omitempty"`
+	View                 VersionView `protobuf:"varint,2,opt,name=view,proto3,enum=google.appengine.v1.VersionView" json:"view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *GetVersionRequest) Reset()         { *m = GetVersionRequest{} }
+func (m *GetVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetVersionRequest) ProtoMessage()    {}
+func (*GetVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{9}
+}
+func (m *GetVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetVersionRequest.Unmarshal(m, b)
+}
+func (m *GetVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVersionRequest.Merge(dst, src)
+}
+func (m *GetVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetVersionRequest.Size(m)
+}
+func (m *GetVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetVersionRequest.DiscardUnknown(m)
 }
 
-func (m *GetVersionRequest) Reset()                    { *m = GetVersionRequest{} }
-func (m *GetVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetVersionRequest) ProtoMessage()               {}
-func (*GetVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_GetVersionRequest proto.InternalMessageInfo
 
 func (m *GetVersionRequest) GetName() string {
 	if m != nil {
@@ -348,15 +575,37 @@ func (m *GetVersionRequest) GetView() VersionView {
 type CreateVersionRequest struct {
 	// Name of the parent resource to create this version under. Example:
 	// `apps/myapp/services/default`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Application deployment configuration.
-	Version *Version `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
+	Version              *Version `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateVersionRequest) Reset()         { *m = CreateVersionRequest{} }
+func (m *CreateVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateVersionRequest) ProtoMessage()    {}
+func (*CreateVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{10}
+}
+func (m *CreateVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateVersionRequest.Unmarshal(m, b)
+}
+func (m *CreateVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVersionRequest.Merge(dst, src)
+}
+func (m *CreateVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateVersionRequest.Size(m)
+}
+func (m *CreateVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateVersionRequest.DiscardUnknown(m)
 }
 
-func (m *CreateVersionRequest) Reset()                    { *m = CreateVersionRequest{} }
-func (m *CreateVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateVersionRequest) ProtoMessage()               {}
-func (*CreateVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+var xxx_messageInfo_CreateVersionRequest proto.InternalMessageInfo
 
 func (m *CreateVersionRequest) GetParent() string {
 	if m != nil {
@@ -376,18 +625,40 @@ func (m *CreateVersionRequest) GetVersion() *Version {
 type UpdateVersionRequest struct {
 	// Name of the resource to update. Example:
 	// `apps/myapp/services/default/versions/1`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A Version containing the updated resource. Only fields set in the field
 	// mask will be updated.
-	Version *Version `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
+	Version *Version `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
 	// Standard field mask for the set of fields to be updated.
-	UpdateMask *google_protobuf5.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateVersionRequest) Reset()         { *m = UpdateVersionRequest{} }
+func (m *UpdateVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateVersionRequest) ProtoMessage()    {}
+func (*UpdateVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{11}
+}
+func (m *UpdateVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateVersionRequest.Unmarshal(m, b)
+}
+func (m *UpdateVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateVersionRequest.Merge(dst, src)
+}
+func (m *UpdateVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateVersionRequest.Size(m)
+}
+func (m *UpdateVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateVersionRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateVersionRequest) Reset()                    { *m = UpdateVersionRequest{} }
-func (m *UpdateVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateVersionRequest) ProtoMessage()               {}
-func (*UpdateVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+var xxx_messageInfo_UpdateVersionRequest proto.InternalMessageInfo
 
 func (m *UpdateVersionRequest) GetName() string {
 	if m != nil {
@@ -403,7 +674,7 @@ func (m *UpdateVersionRequest) GetVersion() *Version {
 	return nil
 }
 
-func (m *UpdateVersionRequest) GetUpdateMask() *google_protobuf5.FieldMask {
+func (m *UpdateVersionRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -414,13 +685,35 @@ func (m *UpdateVersionRequest) GetUpdateMask() *google_protobuf5.FieldMask {
 type DeleteVersionRequest struct {
 	// Name of the resource requested. Example:
 	// `apps/myapp/services/default/versions/v1`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteVersionRequest) Reset()                    { *m = DeleteVersionRequest{} }
-func (m *DeleteVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteVersionRequest) ProtoMessage()               {}
-func (*DeleteVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+func (m *DeleteVersionRequest) Reset()         { *m = DeleteVersionRequest{} }
+func (m *DeleteVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteVersionRequest) ProtoMessage()    {}
+func (*DeleteVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{12}
+}
+func (m *DeleteVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteVersionRequest.Unmarshal(m, b)
+}
+func (m *DeleteVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVersionRequest.Merge(dst, src)
+}
+func (m *DeleteVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteVersionRequest.Size(m)
+}
+func (m *DeleteVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteVersionRequest proto.InternalMessageInfo
 
 func (m *DeleteVersionRequest) GetName() string {
 	if m != nil {
@@ -433,17 +726,39 @@ func (m *DeleteVersionRequest) GetName() string {
 type ListInstancesRequest struct {
 	// Name of the parent Version resource. Example:
 	// `apps/myapp/services/default/versions/v1`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Maximum results to return per page.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Continuation token for fetching the next page of results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
+func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListInstancesRequest) ProtoMessage()    {}
+func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{13}
+}
+func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
+}
+func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+}
+func (m *ListInstancesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListInstancesRequest.Size(m)
+}
+func (m *ListInstancesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstancesRequest.DiscardUnknown(m)
 }
 
-func (m *ListInstancesRequest) Reset()                    { *m = ListInstancesRequest{} }
-func (m *ListInstancesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListInstancesRequest) ProtoMessage()               {}
-func (*ListInstancesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+var xxx_messageInfo_ListInstancesRequest proto.InternalMessageInfo
 
 func (m *ListInstancesRequest) GetParent() string {
 	if m != nil {
@@ -469,15 +784,37 @@ func (m *ListInstancesRequest) GetPageToken() string {
 // Response message for `Instances.ListInstances`.
 type ListInstancesResponse struct {
 	// The instances belonging to the requested version.
-	Instances []*Instance `protobuf:"bytes,1,rep,name=instances" json:"instances,omitempty"`
+	Instances []*Instance `protobuf:"bytes,1,rep,name=instances,proto3" json:"instances,omitempty"`
 	// Continuation token for fetching the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListInstancesResponse) Reset()                    { *m = ListInstancesResponse{} }
-func (m *ListInstancesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListInstancesResponse) ProtoMessage()               {}
-func (*ListInstancesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
+func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListInstancesResponse) ProtoMessage()    {}
+func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{14}
+}
+func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
+}
+func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+}
+func (m *ListInstancesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListInstancesResponse.Size(m)
+}
+func (m *ListInstancesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstancesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInstancesResponse proto.InternalMessageInfo
 
 func (m *ListInstancesResponse) GetInstances() []*Instance {
 	if m != nil {
@@ -497,13 +834,35 @@ func (m *ListInstancesResponse) GetNextPageToken() string {
 type GetInstanceRequest struct {
 	// Name of the resource requested. Example:
 	// `apps/myapp/services/default/versions/v1/instances/instance-1`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
+func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetInstanceRequest) ProtoMessage()    {}
+func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{15}
+}
+func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
+}
+func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+}
+func (m *GetInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetInstanceRequest.Size(m)
+}
+func (m *GetInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetInstanceRequest.DiscardUnknown(m)
 }
 
-func (m *GetInstanceRequest) Reset()                    { *m = GetInstanceRequest{} }
-func (m *GetInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetInstanceRequest) ProtoMessage()               {}
-func (*GetInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+var xxx_messageInfo_GetInstanceRequest proto.InternalMessageInfo
 
 func (m *GetInstanceRequest) GetName() string {
 	if m != nil {
@@ -516,13 +875,35 @@ func (m *GetInstanceRequest) GetName() string {
 type DeleteInstanceRequest struct {
 	// Name of the resource requested. Example:
 	// `apps/myapp/services/default/versions/v1/instances/instance-1`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
+func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteInstanceRequest) ProtoMessage()    {}
+func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{16}
+}
+func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
+}
+func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+}
+func (m *DeleteInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
+}
+func (m *DeleteInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteInstanceRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteInstanceRequest) Reset()                    { *m = DeleteInstanceRequest{} }
-func (m *DeleteInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteInstanceRequest) ProtoMessage()               {}
-func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+var xxx_messageInfo_DeleteInstanceRequest proto.InternalMessageInfo
 
 func (m *DeleteInstanceRequest) GetName() string {
 	if m != nil {
@@ -535,13 +916,35 @@ func (m *DeleteInstanceRequest) GetName() string {
 type DebugInstanceRequest struct {
 	// Name of the resource requested. Example:
 	// `apps/myapp/services/default/versions/v1/instances/instance-1`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DebugInstanceRequest) Reset()                    { *m = DebugInstanceRequest{} }
-func (m *DebugInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DebugInstanceRequest) ProtoMessage()               {}
-func (*DebugInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+func (m *DebugInstanceRequest) Reset()         { *m = DebugInstanceRequest{} }
+func (m *DebugInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*DebugInstanceRequest) ProtoMessage()    {}
+func (*DebugInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_appengine_2fc15a0f1846cd0f, []int{17}
+}
+func (m *DebugInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DebugInstanceRequest.Unmarshal(m, b)
+}
+func (m *DebugInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DebugInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DebugInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebugInstanceRequest.Merge(dst, src)
+}
+func (m *DebugInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_DebugInstanceRequest.Size(m)
+}
+func (m *DebugInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DebugInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DebugInstanceRequest proto.InternalMessageInfo
 
 func (m *DebugInstanceRequest) GetName() string {
 	if m != nil {
@@ -580,15 +983,16 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Instances service
-
+// InstancesClient is the client API for Instances service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type InstancesClient interface {
 	// Lists the instances of a version.
 	ListInstances(ctx context.Context, in *ListInstancesRequest, opts ...grpc.CallOption) (*ListInstancesResponse, error)
 	// Gets instance information.
 	GetInstance(ctx context.Context, in *GetInstanceRequest, opts ...grpc.CallOption) (*Instance, error)
 	// Stops a running instance.
-	DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Enables debugging on a VM instance. This allows you to use the SSH
 	// command to connect to the virtual machine where the instance lives.
 	// While in "debug mode", the instance continues to serve live traffic.
@@ -597,7 +1001,7 @@ type InstancesClient interface {
 	// should be started.
 	//
 	// Only applicable for instances in App Engine flexible environment.
-	DebugInstance(ctx context.Context, in *DebugInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DebugInstance(ctx context.Context, in *DebugInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type instancesClient struct {
@@ -610,7 +1014,7 @@ func NewInstancesClient(cc *grpc.ClientConn) InstancesClient {
 
 func (c *instancesClient) ListInstances(ctx context.Context, in *ListInstancesRequest, opts ...grpc.CallOption) (*ListInstancesResponse, error) {
 	out := new(ListInstancesResponse)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Instances/ListInstances", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Instances/ListInstances", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -619,40 +1023,39 @@ func (c *instancesClient) ListInstances(ctx context.Context, in *ListInstancesRe
 
 func (c *instancesClient) GetInstance(ctx context.Context, in *GetInstanceRequest, opts ...grpc.CallOption) (*Instance, error) {
 	out := new(Instance)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Instances/GetInstance", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Instances/GetInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *instancesClient) DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Instances/DeleteInstance", in, out, c.cc, opts...)
+func (c *instancesClient) DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Instances/DeleteInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *instancesClient) DebugInstance(ctx context.Context, in *DebugInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Instances/DebugInstance", in, out, c.cc, opts...)
+func (c *instancesClient) DebugInstance(ctx context.Context, in *DebugInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Instances/DebugInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Instances service
-
+// InstancesServer is the server API for Instances service.
 type InstancesServer interface {
 	// Lists the instances of a version.
 	ListInstances(context.Context, *ListInstancesRequest) (*ListInstancesResponse, error)
 	// Gets instance information.
 	GetInstance(context.Context, *GetInstanceRequest) (*Instance, error)
 	// Stops a running instance.
-	DeleteInstance(context.Context, *DeleteInstanceRequest) (*google_longrunning.Operation, error)
+	DeleteInstance(context.Context, *DeleteInstanceRequest) (*longrunning.Operation, error)
 	// Enables debugging on a VM instance. This allows you to use the SSH
 	// command to connect to the virtual machine where the instance lives.
 	// While in "debug mode", the instance continues to serve live traffic.
@@ -661,7 +1064,7 @@ type InstancesServer interface {
 	// should be started.
 	//
 	// Only applicable for instances in App Engine flexible environment.
-	DebugInstance(context.Context, *DebugInstanceRequest) (*google_longrunning.Operation, error)
+	DebugInstance(context.Context, *DebugInstanceRequest) (*longrunning.Operation, error)
 }
 
 func RegisterInstancesServer(s *grpc.Server, srv InstancesServer) {
@@ -765,8 +1168,9 @@ var _Instances_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/appengine/v1/appengine.proto",
 }
 
-// Client API for Versions service
-
+// VersionsClient is the client API for Versions service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VersionsClient interface {
 	// Lists the versions of a service.
 	ListVersions(ctx context.Context, in *ListVersionsRequest, opts ...grpc.CallOption) (*ListVersionsResponse, error)
@@ -775,7 +1179,7 @@ type VersionsClient interface {
 	// Specify the `FULL_VIEW` parameter to get the full resource.
 	GetVersion(ctx context.Context, in *GetVersionRequest, opts ...grpc.CallOption) (*Version, error)
 	// Deploys code and resource files to a new version.
-	CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Updates the specified Version resource.
 	// You can specify the following fields depending on the App Engine
 	// environment and type of scaling that the version resource uses:
@@ -791,9 +1195,9 @@ type VersionsClient interface {
 	// * [`automatic_scaling.max_idle_instances`](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services.versions#Version.FIELDS.automatic_scaling):
 	//   For Version resources that use automatic scaling and run in the App
 	//   Engine standard environment.
-	UpdateVersion(ctx context.Context, in *UpdateVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UpdateVersion(ctx context.Context, in *UpdateVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes an existing Version resource.
-	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type versionsClient struct {
@@ -806,7 +1210,7 @@ func NewVersionsClient(cc *grpc.ClientConn) VersionsClient {
 
 func (c *versionsClient) ListVersions(ctx context.Context, in *ListVersionsRequest, opts ...grpc.CallOption) (*ListVersionsResponse, error) {
 	out := new(ListVersionsResponse)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Versions/ListVersions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Versions/ListVersions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -815,42 +1219,41 @@ func (c *versionsClient) ListVersions(ctx context.Context, in *ListVersionsReque
 
 func (c *versionsClient) GetVersion(ctx context.Context, in *GetVersionRequest, opts ...grpc.CallOption) (*Version, error) {
 	out := new(Version)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Versions/GetVersion", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Versions/GetVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *versionsClient) CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Versions/CreateVersion", in, out, c.cc, opts...)
+func (c *versionsClient) CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Versions/CreateVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *versionsClient) UpdateVersion(ctx context.Context, in *UpdateVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Versions/UpdateVersion", in, out, c.cc, opts...)
+func (c *versionsClient) UpdateVersion(ctx context.Context, in *UpdateVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Versions/UpdateVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *versionsClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Versions/DeleteVersion", in, out, c.cc, opts...)
+func (c *versionsClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Versions/DeleteVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Versions service
-
+// VersionsServer is the server API for Versions service.
 type VersionsServer interface {
 	// Lists the versions of a service.
 	ListVersions(context.Context, *ListVersionsRequest) (*ListVersionsResponse, error)
@@ -859,7 +1262,7 @@ type VersionsServer interface {
 	// Specify the `FULL_VIEW` parameter to get the full resource.
 	GetVersion(context.Context, *GetVersionRequest) (*Version, error)
 	// Deploys code and resource files to a new version.
-	CreateVersion(context.Context, *CreateVersionRequest) (*google_longrunning.Operation, error)
+	CreateVersion(context.Context, *CreateVersionRequest) (*longrunning.Operation, error)
 	// Updates the specified Version resource.
 	// You can specify the following fields depending on the App Engine
 	// environment and type of scaling that the version resource uses:
@@ -875,9 +1278,9 @@ type VersionsServer interface {
 	// * [`automatic_scaling.max_idle_instances`](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services.versions#Version.FIELDS.automatic_scaling):
 	//   For Version resources that use automatic scaling and run in the App
 	//   Engine standard environment.
-	UpdateVersion(context.Context, *UpdateVersionRequest) (*google_longrunning.Operation, error)
+	UpdateVersion(context.Context, *UpdateVersionRequest) (*longrunning.Operation, error)
 	// Deletes an existing Version resource.
-	DeleteVersion(context.Context, *DeleteVersionRequest) (*google_longrunning.Operation, error)
+	DeleteVersion(context.Context, *DeleteVersionRequest) (*longrunning.Operation, error)
 }
 
 func RegisterVersionsServer(s *grpc.Server, srv VersionsServer) {
@@ -1003,17 +1406,18 @@ var _Versions_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/appengine/v1/appengine.proto",
 }
 
-// Client API for Services service
-
+// ServicesClient is the client API for Services service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ServicesClient interface {
 	// Lists all the services in the application.
 	ListServices(ctx context.Context, in *ListServicesRequest, opts ...grpc.CallOption) (*ListServicesResponse, error)
 	// Gets the current configuration of the specified service.
 	GetService(ctx context.Context, in *GetServiceRequest, opts ...grpc.CallOption) (*Service, error)
 	// Updates the configuration of the specified service.
-	UpdateService(ctx context.Context, in *UpdateServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UpdateService(ctx context.Context, in *UpdateServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes the specified service and all enclosed versions.
-	DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type servicesClient struct {
@@ -1026,7 +1430,7 @@ func NewServicesClient(cc *grpc.ClientConn) ServicesClient {
 
 func (c *servicesClient) ListServices(ctx context.Context, in *ListServicesRequest, opts ...grpc.CallOption) (*ListServicesResponse, error) {
 	out := new(ListServicesResponse)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Services/ListServices", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Services/ListServices", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1035,42 +1439,41 @@ func (c *servicesClient) ListServices(ctx context.Context, in *ListServicesReque
 
 func (c *servicesClient) GetService(ctx context.Context, in *GetServiceRequest, opts ...grpc.CallOption) (*Service, error) {
 	out := new(Service)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Services/GetService", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Services/GetService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *servicesClient) UpdateService(ctx context.Context, in *UpdateServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Services/UpdateService", in, out, c.cc, opts...)
+func (c *servicesClient) UpdateService(ctx context.Context, in *UpdateServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Services/UpdateService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *servicesClient) DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Services/DeleteService", in, out, c.cc, opts...)
+func (c *servicesClient) DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Services/DeleteService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Services service
-
+// ServicesServer is the server API for Services service.
 type ServicesServer interface {
 	// Lists all the services in the application.
 	ListServices(context.Context, *ListServicesRequest) (*ListServicesResponse, error)
 	// Gets the current configuration of the specified service.
 	GetService(context.Context, *GetServiceRequest) (*Service, error)
 	// Updates the configuration of the specified service.
-	UpdateService(context.Context, *UpdateServiceRequest) (*google_longrunning.Operation, error)
+	UpdateService(context.Context, *UpdateServiceRequest) (*longrunning.Operation, error)
 	// Deletes the specified service and all enclosed versions.
-	DeleteService(context.Context, *DeleteServiceRequest) (*google_longrunning.Operation, error)
+	DeleteService(context.Context, *DeleteServiceRequest) (*longrunning.Operation, error)
 }
 
 func RegisterServicesServer(s *grpc.Server, srv ServicesServer) {
@@ -1174,8 +1577,9 @@ var _Services_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/appengine/v1/appengine.proto",
 }
 
-// Client API for Applications service
-
+// ApplicationsClient is the client API for Applications service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ApplicationsClient interface {
 	// Gets information about an application.
 	GetApplication(ctx context.Context, in *GetApplicationRequest, opts ...grpc.CallOption) (*Application, error)
@@ -1183,7 +1587,7 @@ type ApplicationsClient interface {
 	// project, for example a Cloud Storage bucket or App Engine service account.
 	// Use this method if you receive an error message about a missing feature,
 	// for example "*Error retrieving the App Engine service account*".
-	RepairApplication(ctx context.Context, in *RepairApplicationRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	RepairApplication(ctx context.Context, in *RepairApplicationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type applicationsClient struct {
@@ -1196,24 +1600,23 @@ func NewApplicationsClient(cc *grpc.ClientConn) ApplicationsClient {
 
 func (c *applicationsClient) GetApplication(ctx context.Context, in *GetApplicationRequest, opts ...grpc.CallOption) (*Application, error) {
 	out := new(Application)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Applications/GetApplication", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Applications/GetApplication", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *applicationsClient) RepairApplication(ctx context.Context, in *RepairApplicationRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.appengine.v1.Applications/RepairApplication", in, out, c.cc, opts...)
+func (c *applicationsClient) RepairApplication(ctx context.Context, in *RepairApplicationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.appengine.v1.Applications/RepairApplication", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Applications service
-
+// ApplicationsServer is the server API for Applications service.
 type ApplicationsServer interface {
 	// Gets information about an application.
 	GetApplication(context.Context, *GetApplicationRequest) (*Application, error)
@@ -1221,7 +1624,7 @@ type ApplicationsServer interface {
 	// project, for example a Cloud Storage bucket or App Engine service account.
 	// Use this method if you receive an error message about a missing feature,
 	// for example "*Error retrieving the App Engine service account*".
-	RepairApplication(context.Context, *RepairApplicationRequest) (*google_longrunning.Operation, error)
+	RepairApplication(context.Context, *RepairApplicationRequest) (*longrunning.Operation, error)
 }
 
 func RegisterApplicationsServer(s *grpc.Server, srv ApplicationsServer) {
@@ -1281,9 +1684,11 @@ var _Applications_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/appengine/v1/appengine.proto",
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/appengine.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/appengine.proto", fileDescriptor_appengine_2fc15a0f1846cd0f)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_appengine_2fc15a0f1846cd0f = []byte{
 	// 1134 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdf, 0x6f, 0xdb, 0x54,
 	0x14, 0xc6, 0x6d, 0xba, 0x25, 0x27, 0x6b, 0xb6, 0xde, 0xb6, 0x10, 0xbc, 0x76, 0x0a, 0x1e, 0x2c,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/application.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/application.pb.go
index e029d64d..68bbd825 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/application.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/application.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/application.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // An Application resource contains the top-level configuration of an App
 // Engine application.
 type Application struct {
@@ -21,22 +27,22 @@ type Application struct {
 	// Example: `apps/myapp`.
 	//
 	// @OutputOnly
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Identifier of the Application resource. This identifier is equivalent
 	// to the project ID of the Google Cloud Platform project where you want to
 	// deploy your application.
 	// Example: `myapp`.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// HTTP path dispatch rules for requests to the application that do not
 	// explicitly target a service or version. Rules are order-dependent.
 	//
 	// @OutputOnly
-	DispatchRules []*UrlDispatchRule `protobuf:"bytes,3,rep,name=dispatch_rules,json=dispatchRules" json:"dispatch_rules,omitempty"`
+	DispatchRules []*UrlDispatchRule `protobuf:"bytes,3,rep,name=dispatch_rules,json=dispatchRules,proto3" json:"dispatch_rules,omitempty"`
 	// Google Apps authentication domain that controls which users can access
 	// this application.
 	//
 	// Defaults to open access for any Google Account.
-	AuthDomain string `protobuf:"bytes,6,opt,name=auth_domain,json=authDomain" json:"auth_domain,omitempty"`
+	AuthDomain string `protobuf:"bytes,6,opt,name=auth_domain,json=authDomain,proto3" json:"auth_domain,omitempty"`
 	// Location from which this application will be run. Application instances
 	// will run out of data centers in the chosen location, which is also where
 	// all of the application's end user content is stored.
@@ -50,32 +56,54 @@ type Application struct {
 	// `europe-west` - Western Europe
 	//
 	// `us-east1` - Eastern US
-	LocationId string `protobuf:"bytes,7,opt,name=location_id,json=locationId" json:"location_id,omitempty"`
+	LocationId string `protobuf:"bytes,7,opt,name=location_id,json=locationId,proto3" json:"location_id,omitempty"`
 	// Google Cloud Storage bucket that can be used for storing files
 	// associated with this application. This bucket is associated with the
 	// application and can be used by the gcloud deployment commands.
 	//
 	// @OutputOnly
-	CodeBucket string `protobuf:"bytes,8,opt,name=code_bucket,json=codeBucket" json:"code_bucket,omitempty"`
+	CodeBucket string `protobuf:"bytes,8,opt,name=code_bucket,json=codeBucket,proto3" json:"code_bucket,omitempty"`
 	// Cookie expiration policy for this application.
 	//
 	// @OutputOnly
-	DefaultCookieExpiration *google_protobuf1.Duration `protobuf:"bytes,9,opt,name=default_cookie_expiration,json=defaultCookieExpiration" json:"default_cookie_expiration,omitempty"`
+	DefaultCookieExpiration *duration.Duration `protobuf:"bytes,9,opt,name=default_cookie_expiration,json=defaultCookieExpiration,proto3" json:"default_cookie_expiration,omitempty"`
 	// Hostname used to reach this application, as resolved by App Engine.
 	//
 	// @OutputOnly
-	DefaultHostname string `protobuf:"bytes,11,opt,name=default_hostname,json=defaultHostname" json:"default_hostname,omitempty"`
+	DefaultHostname string `protobuf:"bytes,11,opt,name=default_hostname,json=defaultHostname,proto3" json:"default_hostname,omitempty"`
 	// Google Cloud Storage bucket that can be used by this application to store
 	// content.
 	//
 	// @OutputOnly
-	DefaultBucket string `protobuf:"bytes,12,opt,name=default_bucket,json=defaultBucket" json:"default_bucket,omitempty"`
+	DefaultBucket        string   `protobuf:"bytes,12,opt,name=default_bucket,json=defaultBucket,proto3" json:"default_bucket,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Application) Reset()                    { *m = Application{} }
-func (m *Application) String() string            { return proto.CompactTextString(m) }
-func (*Application) ProtoMessage()               {}
-func (*Application) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (m *Application) Reset()         { *m = Application{} }
+func (m *Application) String() string { return proto.CompactTextString(m) }
+func (*Application) ProtoMessage()    {}
+func (*Application) Descriptor() ([]byte, []int) {
+	return fileDescriptor_application_d5f9ae7b7e94b936, []int{0}
+}
+func (m *Application) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Application.Unmarshal(m, b)
+}
+func (m *Application) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Application.Marshal(b, m, deterministic)
+}
+func (dst *Application) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Application.Merge(dst, src)
+}
+func (m *Application) XXX_Size() int {
+	return xxx_messageInfo_Application.Size(m)
+}
+func (m *Application) XXX_DiscardUnknown() {
+	xxx_messageInfo_Application.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Application proto.InternalMessageInfo
 
 func (m *Application) GetName() string {
 	if m != nil {
@@ -119,7 +147,7 @@ func (m *Application) GetCodeBucket() string {
 	return ""
 }
 
-func (m *Application) GetDefaultCookieExpiration() *google_protobuf1.Duration {
+func (m *Application) GetDefaultCookieExpiration() *duration.Duration {
 	if m != nil {
 		return m.DefaultCookieExpiration
 	}
@@ -146,22 +174,44 @@ type UrlDispatchRule struct {
 	// specified before a period: "`*.`".
 	//
 	// Defaults to matching all domains: "`*`".
-	Domain string `protobuf:"bytes,1,opt,name=domain" json:"domain,omitempty"`
+	Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"`
 	// Pathname within the host. Must start with a "`/`". A
 	// single "`*`" can be included at the end of the path. The sum
 	// of the lengths of the domain and path may not exceed 100
 	// characters.
-	Path string `protobuf:"bytes,2,opt,name=path" json:"path,omitempty"`
+	Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
 	// Resource ID of a service in this application that should
 	// serve the matched request. The service must already
 	// exist. Example: `default`.
-	Service string `protobuf:"bytes,3,opt,name=service" json:"service,omitempty"`
+	Service              string   `protobuf:"bytes,3,opt,name=service,proto3" json:"service,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UrlDispatchRule) Reset()                    { *m = UrlDispatchRule{} }
-func (m *UrlDispatchRule) String() string            { return proto.CompactTextString(m) }
-func (*UrlDispatchRule) ProtoMessage()               {}
-func (*UrlDispatchRule) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (m *UrlDispatchRule) Reset()         { *m = UrlDispatchRule{} }
+func (m *UrlDispatchRule) String() string { return proto.CompactTextString(m) }
+func (*UrlDispatchRule) ProtoMessage()    {}
+func (*UrlDispatchRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_application_d5f9ae7b7e94b936, []int{1}
+}
+func (m *UrlDispatchRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UrlDispatchRule.Unmarshal(m, b)
+}
+func (m *UrlDispatchRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UrlDispatchRule.Marshal(b, m, deterministic)
+}
+func (dst *UrlDispatchRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UrlDispatchRule.Merge(dst, src)
+}
+func (m *UrlDispatchRule) XXX_Size() int {
+	return xxx_messageInfo_UrlDispatchRule.Size(m)
+}
+func (m *UrlDispatchRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_UrlDispatchRule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UrlDispatchRule proto.InternalMessageInfo
 
 func (m *UrlDispatchRule) GetDomain() string {
 	if m != nil {
@@ -189,9 +239,11 @@ func init() {
 	proto.RegisterType((*UrlDispatchRule)(nil), "google.appengine.v1.UrlDispatchRule")
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/application.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/application.proto", fileDescriptor_application_d5f9ae7b7e94b936)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_application_d5f9ae7b7e94b936 = []byte{
 	// 409 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x5f, 0x6b, 0xdb, 0x30,
 	0x14, 0xc5, 0x71, 0x3c, 0x92, 0x45, 0x5e, 0xfe, 0xa0, 0xc1, 0xa2, 0x84, 0xb1, 0x85, 0xb0, 0x40,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/audit_data.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/audit_data.pb.go
index 3bd16a74..53ac880e 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/audit_data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/audit_data.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/audit_data.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // App Engine admin service audit log.
 type AuditData struct {
 	// Detailed information about methods that require it. Does not include
@@ -23,26 +29,50 @@ type AuditData struct {
 	// Types that are valid to be assigned to Method:
 	//	*AuditData_UpdateService
 	//	*AuditData_CreateVersion
-	Method isAuditData_Method `protobuf_oneof:"method"`
+	Method               isAuditData_Method `protobuf_oneof:"method"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *AuditData) Reset()                    { *m = AuditData{} }
-func (m *AuditData) String() string            { return proto.CompactTextString(m) }
-func (*AuditData) ProtoMessage()               {}
-func (*AuditData) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (m *AuditData) Reset()         { *m = AuditData{} }
+func (m *AuditData) String() string { return proto.CompactTextString(m) }
+func (*AuditData) ProtoMessage()    {}
+func (*AuditData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_b5f7af765ea2d3aa, []int{0}
+}
+func (m *AuditData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuditData.Unmarshal(m, b)
+}
+func (m *AuditData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuditData.Marshal(b, m, deterministic)
+}
+func (dst *AuditData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditData.Merge(dst, src)
+}
+func (m *AuditData) XXX_Size() int {
+	return xxx_messageInfo_AuditData.Size(m)
+}
+func (m *AuditData) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuditData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AuditData proto.InternalMessageInfo
 
 type isAuditData_Method interface {
 	isAuditData_Method()
 }
 
 type AuditData_UpdateService struct {
-	UpdateService *UpdateServiceMethod `protobuf:"bytes,1,opt,name=update_service,json=updateService,oneof"`
+	UpdateService *UpdateServiceMethod `protobuf:"bytes,1,opt,name=update_service,json=updateService,proto3,oneof"`
 }
+
 type AuditData_CreateVersion struct {
-	CreateVersion *CreateVersionMethod `protobuf:"bytes,2,opt,name=create_version,json=createVersion,oneof"`
+	CreateVersion *CreateVersionMethod `protobuf:"bytes,2,opt,name=create_version,json=createVersion,proto3,oneof"`
 }
 
 func (*AuditData_UpdateService) isAuditData_Method() {}
+
 func (*AuditData_CreateVersion) isAuditData_Method() {}
 
 func (m *AuditData) GetMethod() isAuditData_Method {
@@ -125,12 +155,12 @@ func _AuditData_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Method.(type) {
 	case *AuditData_UpdateService:
 		s := proto.Size(x.UpdateService)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_CreateVersion:
 		s := proto.Size(x.CreateVersion)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -143,13 +173,35 @@ func _AuditData_OneofSizer(msg proto.Message) (n int) {
 // Detailed information about UpdateService call.
 type UpdateServiceMethod struct {
 	// Update service request.
-	Request *UpdateServiceRequest `protobuf:"bytes,1,opt,name=request" json:"request,omitempty"`
+	Request              *UpdateServiceRequest `protobuf:"bytes,1,opt,name=request,proto3" json:"request,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateServiceMethod) Reset()         { *m = UpdateServiceMethod{} }
+func (m *UpdateServiceMethod) String() string { return proto.CompactTextString(m) }
+func (*UpdateServiceMethod) ProtoMessage()    {}
+func (*UpdateServiceMethod) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_b5f7af765ea2d3aa, []int{1}
+}
+func (m *UpdateServiceMethod) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateServiceMethod.Unmarshal(m, b)
+}
+func (m *UpdateServiceMethod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateServiceMethod.Marshal(b, m, deterministic)
+}
+func (dst *UpdateServiceMethod) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateServiceMethod.Merge(dst, src)
+}
+func (m *UpdateServiceMethod) XXX_Size() int {
+	return xxx_messageInfo_UpdateServiceMethod.Size(m)
+}
+func (m *UpdateServiceMethod) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateServiceMethod.DiscardUnknown(m)
 }
 
-func (m *UpdateServiceMethod) Reset()                    { *m = UpdateServiceMethod{} }
-func (m *UpdateServiceMethod) String() string            { return proto.CompactTextString(m) }
-func (*UpdateServiceMethod) ProtoMessage()               {}
-func (*UpdateServiceMethod) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+var xxx_messageInfo_UpdateServiceMethod proto.InternalMessageInfo
 
 func (m *UpdateServiceMethod) GetRequest() *UpdateServiceRequest {
 	if m != nil {
@@ -161,13 +213,35 @@ func (m *UpdateServiceMethod) GetRequest() *UpdateServiceRequest {
 // Detailed information about CreateVersion call.
 type CreateVersionMethod struct {
 	// Create version request.
-	Request *CreateVersionRequest `protobuf:"bytes,1,opt,name=request" json:"request,omitempty"`
+	Request              *CreateVersionRequest `protobuf:"bytes,1,opt,name=request,proto3" json:"request,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *CreateVersionMethod) Reset()                    { *m = CreateVersionMethod{} }
-func (m *CreateVersionMethod) String() string            { return proto.CompactTextString(m) }
-func (*CreateVersionMethod) ProtoMessage()               {}
-func (*CreateVersionMethod) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
+func (m *CreateVersionMethod) Reset()         { *m = CreateVersionMethod{} }
+func (m *CreateVersionMethod) String() string { return proto.CompactTextString(m) }
+func (*CreateVersionMethod) ProtoMessage()    {}
+func (*CreateVersionMethod) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_b5f7af765ea2d3aa, []int{2}
+}
+func (m *CreateVersionMethod) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateVersionMethod.Unmarshal(m, b)
+}
+func (m *CreateVersionMethod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateVersionMethod.Marshal(b, m, deterministic)
+}
+func (dst *CreateVersionMethod) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVersionMethod.Merge(dst, src)
+}
+func (m *CreateVersionMethod) XXX_Size() int {
+	return xxx_messageInfo_CreateVersionMethod.Size(m)
+}
+func (m *CreateVersionMethod) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateVersionMethod.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateVersionMethod proto.InternalMessageInfo
 
 func (m *CreateVersionMethod) GetRequest() *CreateVersionRequest {
 	if m != nil {
@@ -182,9 +256,11 @@ func init() {
 	proto.RegisterType((*CreateVersionMethod)(nil), "google.appengine.v1.CreateVersionMethod")
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/audit_data.proto", fileDescriptor3) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/audit_data.proto", fileDescriptor_audit_data_b5f7af765ea2d3aa)
+}
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_audit_data_b5f7af765ea2d3aa = []byte{
 	// 290 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x4e, 0xc3, 0x30,
 	0x10, 0x86, 0x09, 0x43, 0x01, 0x23, 0x3a, 0xa4, 0x03, 0x55, 0x07, 0x84, 0x0a, 0x43, 0x59, 0x1c,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/deploy.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/deploy.pb.go
index 46ce408d..986270a8 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/deploy.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/deploy.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/deploy.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,23 +13,51 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Code and application artifacts used to deploy a version to App Engine.
 type Deployment struct {
 	// Manifest of the files stored in Google Cloud Storage that are included
 	// as part of this version. All files must be readable using the
 	// credentials supplied with this call.
-	Files map[string]*FileInfo `protobuf:"bytes,1,rep,name=files" json:"files,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Files map[string]*FileInfo `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// A Docker image that App Engine uses to run the version.
 	// Only applicable for instances in App Engine flexible environment.
-	Container *ContainerInfo `protobuf:"bytes,2,opt,name=container" json:"container,omitempty"`
+	Container *ContainerInfo `protobuf:"bytes,2,opt,name=container,proto3" json:"container,omitempty"`
 	// The zip file for this deployment, if this is a zip deployment.
-	Zip *ZipInfo `protobuf:"bytes,3,opt,name=zip" json:"zip,omitempty"`
+	Zip                  *ZipInfo `protobuf:"bytes,3,opt,name=zip,proto3" json:"zip,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Deployment) Reset()         { *m = Deployment{} }
+func (m *Deployment) String() string { return proto.CompactTextString(m) }
+func (*Deployment) ProtoMessage()    {}
+func (*Deployment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deploy_ed99bebbe4262e1c, []int{0}
+}
+func (m *Deployment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Deployment.Unmarshal(m, b)
+}
+func (m *Deployment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Deployment.Marshal(b, m, deterministic)
+}
+func (dst *Deployment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployment.Merge(dst, src)
+}
+func (m *Deployment) XXX_Size() int {
+	return xxx_messageInfo_Deployment.Size(m)
+}
+func (m *Deployment) XXX_DiscardUnknown() {
+	xxx_messageInfo_Deployment.DiscardUnknown(m)
 }
 
-func (m *Deployment) Reset()                    { *m = Deployment{} }
-func (m *Deployment) String() string            { return proto.CompactTextString(m) }
-func (*Deployment) ProtoMessage()               {}
-func (*Deployment) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_Deployment proto.InternalMessageInfo
 
 func (m *Deployment) GetFiles() map[string]*FileInfo {
 	if m != nil {
@@ -58,19 +86,41 @@ type FileInfo struct {
 	// URL source to use to fetch this file. Must be a URL to a resource in
 	// Google Cloud Storage in the form
 	// 'http(s)://storage.googleapis.com/\<bucket\>/\<object\>'.
-	SourceUrl string `protobuf:"bytes,1,opt,name=source_url,json=sourceUrl" json:"source_url,omitempty"`
+	SourceUrl string `protobuf:"bytes,1,opt,name=source_url,json=sourceUrl,proto3" json:"source_url,omitempty"`
 	// The SHA1 hash of the file, in hex.
-	Sha1Sum string `protobuf:"bytes,2,opt,name=sha1_sum,json=sha1Sum" json:"sha1_sum,omitempty"`
+	Sha1Sum string `protobuf:"bytes,2,opt,name=sha1_sum,json=sha1Sum,proto3" json:"sha1_sum,omitempty"`
 	// The MIME type of the file.
 	//
 	// Defaults to the value from Google Cloud Storage.
-	MimeType string `protobuf:"bytes,3,opt,name=mime_type,json=mimeType" json:"mime_type,omitempty"`
+	MimeType             string   `protobuf:"bytes,3,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FileInfo) Reset()                    { *m = FileInfo{} }
-func (m *FileInfo) String() string            { return proto.CompactTextString(m) }
-func (*FileInfo) ProtoMessage()               {}
-func (*FileInfo) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+func (m *FileInfo) Reset()         { *m = FileInfo{} }
+func (m *FileInfo) String() string { return proto.CompactTextString(m) }
+func (*FileInfo) ProtoMessage()    {}
+func (*FileInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deploy_ed99bebbe4262e1c, []int{1}
+}
+func (m *FileInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileInfo.Unmarshal(m, b)
+}
+func (m *FileInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileInfo.Marshal(b, m, deterministic)
+}
+func (dst *FileInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileInfo.Merge(dst, src)
+}
+func (m *FileInfo) XXX_Size() int {
+	return xxx_messageInfo_FileInfo.Size(m)
+}
+func (m *FileInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileInfo proto.InternalMessageInfo
 
 func (m *FileInfo) GetSourceUrl() string {
 	if m != nil {
@@ -99,13 +149,35 @@ type ContainerInfo struct {
 	// URI to the hosted container image in a Docker repository. The URI must be
 	// fully qualified and include a tag or digest.
 	// Examples: "gcr.io/my-project/image:tag" or "gcr.io/my-project/image@digest"
-	Image string `protobuf:"bytes,1,opt,name=image" json:"image,omitempty"`
+	Image                string   `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ContainerInfo) Reset()                    { *m = ContainerInfo{} }
-func (m *ContainerInfo) String() string            { return proto.CompactTextString(m) }
-func (*ContainerInfo) ProtoMessage()               {}
-func (*ContainerInfo) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
+func (m *ContainerInfo) Reset()         { *m = ContainerInfo{} }
+func (m *ContainerInfo) String() string { return proto.CompactTextString(m) }
+func (*ContainerInfo) ProtoMessage()    {}
+func (*ContainerInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deploy_ed99bebbe4262e1c, []int{2}
+}
+func (m *ContainerInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContainerInfo.Unmarshal(m, b)
+}
+func (m *ContainerInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContainerInfo.Marshal(b, m, deterministic)
+}
+func (dst *ContainerInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContainerInfo.Merge(dst, src)
+}
+func (m *ContainerInfo) XXX_Size() int {
+	return xxx_messageInfo_ContainerInfo.Size(m)
+}
+func (m *ContainerInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContainerInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContainerInfo proto.InternalMessageInfo
 
 func (m *ContainerInfo) GetImage() string {
 	if m != nil {
@@ -118,17 +190,39 @@ type ZipInfo struct {
 	// URL of the zip file to deploy from. Must be a URL to a resource in
 	// Google Cloud Storage in the form
 	// 'http(s)://storage.googleapis.com/\<bucket\>/\<object\>'.
-	SourceUrl string `protobuf:"bytes,3,opt,name=source_url,json=sourceUrl" json:"source_url,omitempty"`
+	SourceUrl string `protobuf:"bytes,3,opt,name=source_url,json=sourceUrl,proto3" json:"source_url,omitempty"`
 	// An estimate of the number of files in a zip for a zip deployment.
 	// If set, must be greater than or equal to the actual number of files.
 	// Used for optimizing performance; if not provided, deployment may be slow.
-	FilesCount int32 `protobuf:"varint,4,opt,name=files_count,json=filesCount" json:"files_count,omitempty"`
+	FilesCount           int32    `protobuf:"varint,4,opt,name=files_count,json=filesCount,proto3" json:"files_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ZipInfo) Reset()                    { *m = ZipInfo{} }
-func (m *ZipInfo) String() string            { return proto.CompactTextString(m) }
-func (*ZipInfo) ProtoMessage()               {}
-func (*ZipInfo) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+func (m *ZipInfo) Reset()         { *m = ZipInfo{} }
+func (m *ZipInfo) String() string { return proto.CompactTextString(m) }
+func (*ZipInfo) ProtoMessage()    {}
+func (*ZipInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deploy_ed99bebbe4262e1c, []int{3}
+}
+func (m *ZipInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ZipInfo.Unmarshal(m, b)
+}
+func (m *ZipInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ZipInfo.Marshal(b, m, deterministic)
+}
+func (dst *ZipInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ZipInfo.Merge(dst, src)
+}
+func (m *ZipInfo) XXX_Size() int {
+	return xxx_messageInfo_ZipInfo.Size(m)
+}
+func (m *ZipInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ZipInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ZipInfo proto.InternalMessageInfo
 
 func (m *ZipInfo) GetSourceUrl() string {
 	if m != nil {
@@ -146,14 +240,17 @@ func (m *ZipInfo) GetFilesCount() int32 {
 
 func init() {
 	proto.RegisterType((*Deployment)(nil), "google.appengine.v1.Deployment")
+	proto.RegisterMapType((map[string]*FileInfo)(nil), "google.appengine.v1.Deployment.FilesEntry")
 	proto.RegisterType((*FileInfo)(nil), "google.appengine.v1.FileInfo")
 	proto.RegisterType((*ContainerInfo)(nil), "google.appengine.v1.ContainerInfo")
 	proto.RegisterType((*ZipInfo)(nil), "google.appengine.v1.ZipInfo")
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/deploy.proto", fileDescriptor4) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/deploy.proto", fileDescriptor_deploy_ed99bebbe4262e1c)
+}
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_deploy_ed99bebbe4262e1c = []byte{
 	// 394 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xd1, 0xab, 0xd3, 0x30,
 	0x14, 0xc6, 0xe9, 0x6a, 0xbd, 0xeb, 0x29, 0x82, 0x44, 0xc1, 0x7a, 0xbd, 0x17, 0x4b, 0x41, 0x28,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/instance.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/instance.pb.go
index d2948ac1..f3680dcb 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/instance.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/instance.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/instance.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Availability of the instance.
 type Instance_Availability int32
 
@@ -37,7 +43,9 @@ var Instance_Availability_value = map[string]int32{
 func (x Instance_Availability) String() string {
 	return proto.EnumName(Instance_Availability_name, int32(x))
 }
-func (Instance_Availability) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 0} }
+func (Instance_Availability) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_instance_899688eaafc2a354, []int{0, 0}
+}
 
 // An Instance resource is the computing unit that App Engine uses to
 // automatically scale an application.
@@ -46,75 +54,97 @@ type Instance struct {
 	// Example: `apps/myapp/services/default/versions/v1/instances/instance-1`.
 	//
 	// @OutputOnly
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Relative name of the instance within the version.
 	// Example: `instance-1`.
 	//
 	// @OutputOnly
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// App Engine release this instance is running on.
 	//
 	// @OutputOnly
-	AppEngineRelease string `protobuf:"bytes,3,opt,name=app_engine_release,json=appEngineRelease" json:"app_engine_release,omitempty"`
+	AppEngineRelease string `protobuf:"bytes,3,opt,name=app_engine_release,json=appEngineRelease,proto3" json:"app_engine_release,omitempty"`
 	// Availability of the instance.
 	//
 	// @OutputOnly
-	Availability Instance_Availability `protobuf:"varint,4,opt,name=availability,enum=google.appengine.v1.Instance_Availability" json:"availability,omitempty"`
+	Availability Instance_Availability `protobuf:"varint,4,opt,name=availability,proto3,enum=google.appengine.v1.Instance_Availability" json:"availability,omitempty"`
 	// Name of the virtual machine where this instance lives. Only applicable
 	// for instances in App Engine flexible environment.
 	//
 	// @OutputOnly
-	VmName string `protobuf:"bytes,5,opt,name=vm_name,json=vmName" json:"vm_name,omitempty"`
+	VmName string `protobuf:"bytes,5,opt,name=vm_name,json=vmName,proto3" json:"vm_name,omitempty"`
 	// Zone where the virtual machine is located. Only applicable for instances
 	// in App Engine flexible environment.
 	//
 	// @OutputOnly
-	VmZoneName string `protobuf:"bytes,6,opt,name=vm_zone_name,json=vmZoneName" json:"vm_zone_name,omitempty"`
+	VmZoneName string `protobuf:"bytes,6,opt,name=vm_zone_name,json=vmZoneName,proto3" json:"vm_zone_name,omitempty"`
 	// Virtual machine ID of this instance. Only applicable for instances in
 	// App Engine flexible environment.
 	//
 	// @OutputOnly
-	VmId string `protobuf:"bytes,7,opt,name=vm_id,json=vmId" json:"vm_id,omitempty"`
+	VmId string `protobuf:"bytes,7,opt,name=vm_id,json=vmId,proto3" json:"vm_id,omitempty"`
 	// Time that this instance was started.
 	//
 	// @OutputOnly
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Number of requests since this instance was started.
 	//
 	// @OutputOnly
-	Requests int32 `protobuf:"varint,9,opt,name=requests" json:"requests,omitempty"`
+	Requests int32 `protobuf:"varint,9,opt,name=requests,proto3" json:"requests,omitempty"`
 	// Number of errors since this instance was started.
 	//
 	// @OutputOnly
-	Errors int32 `protobuf:"varint,10,opt,name=errors" json:"errors,omitempty"`
+	Errors int32 `protobuf:"varint,10,opt,name=errors,proto3" json:"errors,omitempty"`
 	// Average queries per second (QPS) over the last minute.
 	//
 	// @OutputOnly
-	Qps float32 `protobuf:"fixed32,11,opt,name=qps" json:"qps,omitempty"`
+	Qps float32 `protobuf:"fixed32,11,opt,name=qps,proto3" json:"qps,omitempty"`
 	// Average latency (ms) over the last minute.
 	//
 	// @OutputOnly
-	AverageLatency int32 `protobuf:"varint,12,opt,name=average_latency,json=averageLatency" json:"average_latency,omitempty"`
+	AverageLatency int32 `protobuf:"varint,12,opt,name=average_latency,json=averageLatency,proto3" json:"average_latency,omitempty"`
 	// Total memory in use (bytes).
 	//
 	// @OutputOnly
-	MemoryUsage int64 `protobuf:"varint,13,opt,name=memory_usage,json=memoryUsage" json:"memory_usage,omitempty"`
+	MemoryUsage int64 `protobuf:"varint,13,opt,name=memory_usage,json=memoryUsage,proto3" json:"memory_usage,omitempty"`
 	// Status of the virtual machine where this instance lives. Only applicable
 	// for instances in App Engine flexible environment.
 	//
 	// @OutputOnly
-	VmStatus string `protobuf:"bytes,14,opt,name=vm_status,json=vmStatus" json:"vm_status,omitempty"`
+	VmStatus string `protobuf:"bytes,14,opt,name=vm_status,json=vmStatus,proto3" json:"vm_status,omitempty"`
 	// Whether this instance is in debug mode. Only applicable for instances in
 	// App Engine flexible environment.
 	//
 	// @OutputOnly
-	VmDebugEnabled bool `protobuf:"varint,15,opt,name=vm_debug_enabled,json=vmDebugEnabled" json:"vm_debug_enabled,omitempty"`
+	VmDebugEnabled       bool     `protobuf:"varint,15,opt,name=vm_debug_enabled,json=vmDebugEnabled,proto3" json:"vm_debug_enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Instance) Reset()                    { *m = Instance{} }
-func (m *Instance) String() string            { return proto.CompactTextString(m) }
-func (*Instance) ProtoMessage()               {}
-func (*Instance) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+func (m *Instance) Reset()         { *m = Instance{} }
+func (m *Instance) String() string { return proto.CompactTextString(m) }
+func (*Instance) ProtoMessage()    {}
+func (*Instance) Descriptor() ([]byte, []int) {
+	return fileDescriptor_instance_899688eaafc2a354, []int{0}
+}
+func (m *Instance) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Instance.Unmarshal(m, b)
+}
+func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
+}
+func (dst *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(dst, src)
+}
+func (m *Instance) XXX_Size() int {
+	return xxx_messageInfo_Instance.Size(m)
+}
+func (m *Instance) XXX_DiscardUnknown() {
+	xxx_messageInfo_Instance.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Instance proto.InternalMessageInfo
 
 func (m *Instance) GetName() string {
 	if m != nil {
@@ -165,7 +195,7 @@ func (m *Instance) GetVmId() string {
 	return ""
 }
 
-func (m *Instance) GetStartTime() *google_protobuf2.Timestamp {
+func (m *Instance) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
@@ -226,9 +256,11 @@ func init() {
 	proto.RegisterEnum("google.appengine.v1.Instance_Availability", Instance_Availability_name, Instance_Availability_value)
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/instance.proto", fileDescriptor5) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/instance.proto", fileDescriptor_instance_899688eaafc2a354)
+}
 
-var fileDescriptor5 = []byte{
+var fileDescriptor_instance_899688eaafc2a354 = []byte{
 	// 521 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x5d, 0x6b, 0xdb, 0x3c,
 	0x14, 0x7e, 0x9d, 0xb6, 0xa9, 0x73, 0xe2, 0x26, 0x46, 0x85, 0xb7, 0x22, 0x1b, 0xcc, 0xcb, 0xcd,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/location.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/location.pb.go
index 83d2efd2..357dc799 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/location.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/location.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/location.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -14,22 +14,50 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Metadata for the given [google.cloud.location.Location][google.cloud.location.Location].
 type LocationMetadata struct {
 	// App Engine Standard Environment is available in the given location.
 	//
 	// @OutputOnly
-	StandardEnvironmentAvailable bool `protobuf:"varint,2,opt,name=standard_environment_available,json=standardEnvironmentAvailable" json:"standard_environment_available,omitempty"`
+	StandardEnvironmentAvailable bool `protobuf:"varint,2,opt,name=standard_environment_available,json=standardEnvironmentAvailable,proto3" json:"standard_environment_available,omitempty"`
 	// App Engine Flexible Environment is available in the given location.
 	//
 	// @OutputOnly
-	FlexibleEnvironmentAvailable bool `protobuf:"varint,4,opt,name=flexible_environment_available,json=flexibleEnvironmentAvailable" json:"flexible_environment_available,omitempty"`
+	FlexibleEnvironmentAvailable bool     `protobuf:"varint,4,opt,name=flexible_environment_available,json=flexibleEnvironmentAvailable,proto3" json:"flexible_environment_available,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
+	XXX_unrecognized             []byte   `json:"-"`
+	XXX_sizecache                int32    `json:"-"`
+}
+
+func (m *LocationMetadata) Reset()         { *m = LocationMetadata{} }
+func (m *LocationMetadata) String() string { return proto.CompactTextString(m) }
+func (*LocationMetadata) ProtoMessage()    {}
+func (*LocationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_location_22ad68e45e4328c7, []int{0}
+}
+func (m *LocationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocationMetadata.Unmarshal(m, b)
+}
+func (m *LocationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *LocationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationMetadata.Merge(dst, src)
+}
+func (m *LocationMetadata) XXX_Size() int {
+	return xxx_messageInfo_LocationMetadata.Size(m)
+}
+func (m *LocationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocationMetadata.DiscardUnknown(m)
 }
 
-func (m *LocationMetadata) Reset()                    { *m = LocationMetadata{} }
-func (m *LocationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*LocationMetadata) ProtoMessage()               {}
-func (*LocationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+var xxx_messageInfo_LocationMetadata proto.InternalMessageInfo
 
 func (m *LocationMetadata) GetStandardEnvironmentAvailable() bool {
 	if m != nil {
@@ -49,9 +77,11 @@ func init() {
 	proto.RegisterType((*LocationMetadata)(nil), "google.appengine.v1.LocationMetadata")
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/location.proto", fileDescriptor6) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/location.proto", fileDescriptor_location_22ad68e45e4328c7)
+}
 
-var fileDescriptor6 = []byte{
+var fileDescriptor_location_22ad68e45e4328c7 = []byte{
 	// 236 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x41, 0x4b, 0xc3, 0x40,
 	0x10, 0x85, 0x89, 0x88, 0x48, 0x40, 0x90, 0x7a, 0xb0, 0x94, 0x22, 0xd2, 0x93, 0xa7, 0x5d, 0x8a,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/operation.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/operation.pb.go
index 2000f6fc..869123ac 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/operation.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/operation.pb.go
@@ -1,49 +1,77 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/operation.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Metadata for the given [google.longrunning.Operation][google.longrunning.Operation].
 type OperationMetadataV1 struct {
 	// API method that initiated this operation. Example:
 	// `google.appengine.v1.Versions.CreateVersion`.
 	//
 	// @OutputOnly
-	Method string `protobuf:"bytes,1,opt,name=method" json:"method,omitempty"`
+	Method string `protobuf:"bytes,1,opt,name=method,proto3" json:"method,omitempty"`
 	// Time that this operation was created.
 	//
 	// @OutputOnly
-	InsertTime *google_protobuf2.Timestamp `protobuf:"bytes,2,opt,name=insert_time,json=insertTime" json:"insert_time,omitempty"`
+	InsertTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=insert_time,json=insertTime,proto3" json:"insert_time,omitempty"`
 	// Time that this operation completed.
 	//
 	// @OutputOnly
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// User who requested this operation.
 	//
 	// @OutputOnly
-	User string `protobuf:"bytes,4,opt,name=user" json:"user,omitempty"`
+	User string `protobuf:"bytes,4,opt,name=user,proto3" json:"user,omitempty"`
 	// Name of the resource that this operation is acting on. Example:
 	// `apps/myapp/services/default`.
 	//
 	// @OutputOnly
-	Target string `protobuf:"bytes,5,opt,name=target" json:"target,omitempty"`
+	Target               string   `protobuf:"bytes,5,opt,name=target,proto3" json:"target,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OperationMetadataV1) Reset()         { *m = OperationMetadataV1{} }
+func (m *OperationMetadataV1) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadataV1) ProtoMessage()    {}
+func (*OperationMetadataV1) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operation_b53f7e8fb6160f01, []int{0}
+}
+func (m *OperationMetadataV1) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadataV1.Unmarshal(m, b)
+}
+func (m *OperationMetadataV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadataV1.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadataV1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadataV1.Merge(dst, src)
+}
+func (m *OperationMetadataV1) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadataV1.Size(m)
+}
+func (m *OperationMetadataV1) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadataV1.DiscardUnknown(m)
 }
 
-func (m *OperationMetadataV1) Reset()                    { *m = OperationMetadataV1{} }
-func (m *OperationMetadataV1) String() string            { return proto.CompactTextString(m) }
-func (*OperationMetadataV1) ProtoMessage()               {}
-func (*OperationMetadataV1) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} }
+var xxx_messageInfo_OperationMetadataV1 proto.InternalMessageInfo
 
 func (m *OperationMetadataV1) GetMethod() string {
 	if m != nil {
@@ -52,14 +80,14 @@ func (m *OperationMetadataV1) GetMethod() string {
 	return ""
 }
 
-func (m *OperationMetadataV1) GetInsertTime() *google_protobuf2.Timestamp {
+func (m *OperationMetadataV1) GetInsertTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.InsertTime
 	}
 	return nil
 }
 
-func (m *OperationMetadataV1) GetEndTime() *google_protobuf2.Timestamp {
+func (m *OperationMetadataV1) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -84,9 +112,11 @@ func init() {
 	proto.RegisterType((*OperationMetadataV1)(nil), "google.appengine.v1.OperationMetadataV1")
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/operation.proto", fileDescriptor7) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/operation.proto", fileDescriptor_operation_b53f7e8fb6160f01)
+}
 
-var fileDescriptor7 = []byte{
+var fileDescriptor_operation_b53f7e8fb6160f01 = []byte{
 	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x41, 0x4b, 0x03, 0x31,
 	0x10, 0x85, 0x59, 0xad, 0x55, 0x53, 0xf0, 0xb0, 0x05, 0x5d, 0x16, 0xc1, 0xa2, 0x97, 0x9e, 0x12,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/service.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/service.pb.go
index 0ccbde77..379a4e17 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/service.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Available sharding mechanisms.
 type TrafficSplit_ShardBy int32
 
@@ -41,7 +47,9 @@ var TrafficSplit_ShardBy_value = map[string]int32{
 func (x TrafficSplit_ShardBy) String() string {
 	return proto.EnumName(TrafficSplit_ShardBy_name, int32(x))
 }
-func (TrafficSplit_ShardBy) EnumDescriptor() ([]byte, []int) { return fileDescriptor8, []int{1, 0} }
+func (TrafficSplit_ShardBy) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_service_c3b4fd6114e9d0a5, []int{1, 0}
+}
 
 // A Service resource is a logical component of an application that can share
 // state and communicate in a secure fashion with other services.
@@ -55,21 +63,43 @@ type Service struct {
 	// Example: `apps/myapp/services/default`.
 	//
 	// @OutputOnly
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Relative name of the service within the application.
 	// Example: `default`.
 	//
 	// @OutputOnly
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// Mapping that defines fractional HTTP traffic diversion to
 	// different versions within the service.
-	Split *TrafficSplit `protobuf:"bytes,3,opt,name=split" json:"split,omitempty"`
+	Split                *TrafficSplit `protobuf:"bytes,3,opt,name=split,proto3" json:"split,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *Service) Reset()         { *m = Service{} }
+func (m *Service) String() string { return proto.CompactTextString(m) }
+func (*Service) ProtoMessage()    {}
+func (*Service) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_c3b4fd6114e9d0a5, []int{0}
+}
+func (m *Service) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Service.Unmarshal(m, b)
+}
+func (m *Service) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Service.Marshal(b, m, deterministic)
+}
+func (dst *Service) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Service.Merge(dst, src)
+}
+func (m *Service) XXX_Size() int {
+	return xxx_messageInfo_Service.Size(m)
+}
+func (m *Service) XXX_DiscardUnknown() {
+	xxx_messageInfo_Service.DiscardUnknown(m)
 }
 
-func (m *Service) Reset()                    { *m = Service{} }
-func (m *Service) String() string            { return proto.CompactTextString(m) }
-func (*Service) ProtoMessage()               {}
-func (*Service) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{0} }
+var xxx_messageInfo_Service proto.InternalMessageInfo
 
 func (m *Service) GetName() string {
 	if m != nil {
@@ -98,7 +128,7 @@ type TrafficSplit struct {
 	// Mechanism used to determine which version a request is sent to.
 	// The traffic selection algorithm will
 	// be stable for either type until allocations are changed.
-	ShardBy TrafficSplit_ShardBy `protobuf:"varint,1,opt,name=shard_by,json=shardBy,enum=google.appengine.v1.TrafficSplit_ShardBy" json:"shard_by,omitempty"`
+	ShardBy TrafficSplit_ShardBy `protobuf:"varint,1,opt,name=shard_by,json=shardBy,proto3,enum=google.appengine.v1.TrafficSplit_ShardBy" json:"shard_by,omitempty"`
 	// Mapping from version IDs within the service to fractional
 	// (0.000, 1] allocations of traffic for that version. Each version can
 	// be specified only once, but some versions in the service may not
@@ -107,13 +137,35 @@ type TrafficSplit struct {
 	// their traffic allocation is removed. Allocations must sum to 1.
 	// Up to two decimal place precision is supported for IP-based splits and
 	// up to three decimal places is supported for cookie-based splits.
-	Allocations map[string]float64 `protobuf:"bytes,2,rep,name=allocations" json:"allocations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
+	Allocations          map[string]float64 `protobuf:"bytes,2,rep,name=allocations,proto3" json:"allocations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *TrafficSplit) Reset()                    { *m = TrafficSplit{} }
-func (m *TrafficSplit) String() string            { return proto.CompactTextString(m) }
-func (*TrafficSplit) ProtoMessage()               {}
-func (*TrafficSplit) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{1} }
+func (m *TrafficSplit) Reset()         { *m = TrafficSplit{} }
+func (m *TrafficSplit) String() string { return proto.CompactTextString(m) }
+func (*TrafficSplit) ProtoMessage()    {}
+func (*TrafficSplit) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_c3b4fd6114e9d0a5, []int{1}
+}
+func (m *TrafficSplit) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TrafficSplit.Unmarshal(m, b)
+}
+func (m *TrafficSplit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TrafficSplit.Marshal(b, m, deterministic)
+}
+func (dst *TrafficSplit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrafficSplit.Merge(dst, src)
+}
+func (m *TrafficSplit) XXX_Size() int {
+	return xxx_messageInfo_TrafficSplit.Size(m)
+}
+func (m *TrafficSplit) XXX_DiscardUnknown() {
+	xxx_messageInfo_TrafficSplit.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TrafficSplit proto.InternalMessageInfo
 
 func (m *TrafficSplit) GetShardBy() TrafficSplit_ShardBy {
 	if m != nil {
@@ -132,12 +184,15 @@ func (m *TrafficSplit) GetAllocations() map[string]float64 {
 func init() {
 	proto.RegisterType((*Service)(nil), "google.appengine.v1.Service")
 	proto.RegisterType((*TrafficSplit)(nil), "google.appengine.v1.TrafficSplit")
+	proto.RegisterMapType((map[string]float64)(nil), "google.appengine.v1.TrafficSplit.AllocationsEntry")
 	proto.RegisterEnum("google.appengine.v1.TrafficSplit_ShardBy", TrafficSplit_ShardBy_name, TrafficSplit_ShardBy_value)
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/service.proto", fileDescriptor8) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/service.proto", fileDescriptor_service_c3b4fd6114e9d0a5)
+}
 
-var fileDescriptor8 = []byte{
+var fileDescriptor_service_c3b4fd6114e9d0a5 = []byte{
 	// 356 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x51, 0x8b, 0xda, 0x40,
 	0x10, 0xc7, 0x9b, 0xb5, 0x6a, 0x3b, 0x11, 0x1b, 0xb6, 0x85, 0x06, 0xe9, 0x83, 0xfa, 0x64, 0x5f,
diff --git a/vendor/google.golang.org/genproto/googleapis/appengine/v1/version.pb.go b/vendor/google.golang.org/genproto/googleapis/appengine/v1/version.pb.go
index 21f86bf1..b5fe2ae9 100644
--- a/vendor/google.golang.org/genproto/googleapis/appengine/v1/version.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/appengine/v1/version.pb.go
@@ -1,20 +1,26 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/appengine/v1/version.proto
 
-package appengine
+package appengine // import "google.golang.org/genproto/googleapis/appengine/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Available inbound services.
 type InboundServiceType int32
 
@@ -66,7 +72,9 @@ var InboundServiceType_value = map[string]int32{
 func (x InboundServiceType) String() string {
 	return proto.EnumName(InboundServiceType_name, int32(x))
 }
-func (InboundServiceType) EnumDescriptor() ([]byte, []int) { return fileDescriptor9, []int{0} }
+func (InboundServiceType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{0}
+}
 
 // Run states of a version.
 type ServingStatus int32
@@ -97,7 +105,9 @@ var ServingStatus_value = map[string]int32{
 func (x ServingStatus) String() string {
 	return proto.EnumName(ServingStatus_name, int32(x))
 }
-func (ServingStatus) EnumDescriptor() ([]byte, []int) { return fileDescriptor9, []int{1} }
+func (ServingStatus) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{1}
+}
 
 // A Version resource is a specific set of source code and configuration files
 // that are deployed into a service.
@@ -106,11 +116,11 @@ type Version struct {
 	// `apps/myapp/services/default/versions/v1`.
 	//
 	// @OutputOnly
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Relative name of the version within the service.  Example: `v1`.
 	// Version names can contain only lowercase letters, numbers, or hyphens.
 	// Reserved names: "default", "latest", and any name with the prefix "ah-".
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// Controls how instances are created.
 	//
 	// Defaults to `AutomaticScaling`.
@@ -122,124 +132,164 @@ type Version struct {
 	Scaling isVersion_Scaling `protobuf_oneof:"scaling"`
 	// Before an application can receive email or XMPP messages, the application
 	// must be configured to enable the service.
-	InboundServices []InboundServiceType `protobuf:"varint,6,rep,packed,name=inbound_services,json=inboundServices,enum=google.appengine.v1.InboundServiceType" json:"inbound_services,omitempty"`
+	InboundServices []InboundServiceType `protobuf:"varint,6,rep,packed,name=inbound_services,json=inboundServices,proto3,enum=google.appengine.v1.InboundServiceType" json:"inbound_services,omitempty"`
 	// Instance class that is used to run this version. Valid values are:
 	// * AutomaticScaling: `F1`, `F2`, `F4`, `F4_1G`
 	// * ManualScaling or BasicScaling: `B1`, `B2`, `B4`, `B8`, `B4_1G`
 	//
 	// Defaults to `F1` for AutomaticScaling and `B1` for ManualScaling or
 	// BasicScaling.
-	InstanceClass string `protobuf:"bytes,7,opt,name=instance_class,json=instanceClass" json:"instance_class,omitempty"`
+	InstanceClass string `protobuf:"bytes,7,opt,name=instance_class,json=instanceClass,proto3" json:"instance_class,omitempty"`
 	// Extra network settings. Only applicable for VM runtimes.
-	Network *Network `protobuf:"bytes,8,opt,name=network" json:"network,omitempty"`
+	Network *Network `protobuf:"bytes,8,opt,name=network,proto3" json:"network,omitempty"`
 	// Machine resources for this version. Only applicable for VM runtimes.
-	Resources *Resources `protobuf:"bytes,9,opt,name=resources" json:"resources,omitempty"`
+	Resources *Resources `protobuf:"bytes,9,opt,name=resources,proto3" json:"resources,omitempty"`
 	// Desired runtime. Example: `python27`.
-	Runtime string `protobuf:"bytes,10,opt,name=runtime" json:"runtime,omitempty"`
+	Runtime string `protobuf:"bytes,10,opt,name=runtime,proto3" json:"runtime,omitempty"`
 	// Whether multiple requests can be dispatched to this version at once.
-	Threadsafe bool `protobuf:"varint,11,opt,name=threadsafe" json:"threadsafe,omitempty"`
+	Threadsafe bool `protobuf:"varint,11,opt,name=threadsafe,proto3" json:"threadsafe,omitempty"`
 	// Whether to deploy this version in a container on a virtual machine.
-	Vm bool `protobuf:"varint,12,opt,name=vm" json:"vm,omitempty"`
+	Vm bool `protobuf:"varint,12,opt,name=vm,proto3" json:"vm,omitempty"`
 	// Metadata settings that are supplied to this version to enable
 	// beta runtime features.
-	BetaSettings map[string]string `protobuf:"bytes,13,rep,name=beta_settings,json=betaSettings" json:"beta_settings,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	BetaSettings map[string]string `protobuf:"bytes,13,rep,name=beta_settings,json=betaSettings,proto3" json:"beta_settings,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// App Engine execution environment for this version.
 	//
 	// Defaults to `standard`.
-	Env string `protobuf:"bytes,14,opt,name=env" json:"env,omitempty"`
+	Env string `protobuf:"bytes,14,opt,name=env,proto3" json:"env,omitempty"`
 	// Current serving status of this version. Only the versions with a
 	// `SERVING` status create instances and can be billed.
 	//
 	// `SERVING_STATUS_UNSPECIFIED` is an invalid value. Defaults to `SERVING`.
-	ServingStatus ServingStatus `protobuf:"varint,15,opt,name=serving_status,json=servingStatus,enum=google.appengine.v1.ServingStatus" json:"serving_status,omitempty"`
+	ServingStatus ServingStatus `protobuf:"varint,15,opt,name=serving_status,json=servingStatus,proto3,enum=google.appengine.v1.ServingStatus" json:"serving_status,omitempty"`
 	// Email address of the user who created this version.
 	//
 	// @OutputOnly
-	CreatedBy string `protobuf:"bytes,16,opt,name=created_by,json=createdBy" json:"created_by,omitempty"`
+	CreatedBy string `protobuf:"bytes,16,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
 	// Time that this version was created.
 	//
 	// @OutputOnly
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,17,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,17,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Total size in bytes of all the files that are included in this version
 	// and curerntly hosted on the App Engine disk.
 	//
 	// @OutputOnly
-	DiskUsageBytes int64 `protobuf:"varint,18,opt,name=disk_usage_bytes,json=diskUsageBytes" json:"disk_usage_bytes,omitempty"`
+	DiskUsageBytes int64 `protobuf:"varint,18,opt,name=disk_usage_bytes,json=diskUsageBytes,proto3" json:"disk_usage_bytes,omitempty"`
 	// An ordered list of URL-matching patterns that should be applied to incoming
 	// requests. The first matching URL handles the request and other request
 	// handlers are not attempted.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	Handlers []*UrlMap `protobuf:"bytes,100,rep,name=handlers" json:"handlers,omitempty"`
+	Handlers []*UrlMap `protobuf:"bytes,100,rep,name=handlers,proto3" json:"handlers,omitempty"`
 	// Custom static error pages. Limited to 10KB per page.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	ErrorHandlers []*ErrorHandler `protobuf:"bytes,101,rep,name=error_handlers,json=errorHandlers" json:"error_handlers,omitempty"`
+	ErrorHandlers []*ErrorHandler `protobuf:"bytes,101,rep,name=error_handlers,json=errorHandlers,proto3" json:"error_handlers,omitempty"`
 	// Configuration for third-party Python runtime libraries that are required
 	// by the application.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	Libraries []*Library `protobuf:"bytes,102,rep,name=libraries" json:"libraries,omitempty"`
+	Libraries []*Library `protobuf:"bytes,102,rep,name=libraries,proto3" json:"libraries,omitempty"`
 	// Serving configuration for
 	// [Google Cloud Endpoints](https://cloud.google.com/appengine/docs/python/endpoints/).
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	ApiConfig *ApiConfigHandler `protobuf:"bytes,103,opt,name=api_config,json=apiConfig" json:"api_config,omitempty"`
+	ApiConfig *ApiConfigHandler `protobuf:"bytes,103,opt,name=api_config,json=apiConfig,proto3" json:"api_config,omitempty"`
 	// Environment variables available to the application.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	EnvVariables map[string]string `protobuf:"bytes,104,rep,name=env_variables,json=envVariables" json:"env_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	EnvVariables map[string]string `protobuf:"bytes,104,rep,name=env_variables,json=envVariables,proto3" json:"env_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Duration that static files should be cached by web proxies and browsers.
 	// Only applicable if the corresponding
 	// [StaticFilesHandler](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services.versions#staticfileshandler)
 	// does not specify its own expiration time.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	DefaultExpiration *google_protobuf1.Duration `protobuf:"bytes,105,opt,name=default_expiration,json=defaultExpiration" json:"default_expiration,omitempty"`
+	DefaultExpiration *duration.Duration `protobuf:"bytes,105,opt,name=default_expiration,json=defaultExpiration,proto3" json:"default_expiration,omitempty"`
 	// Configures health checking for VM instances. Unhealthy instances are
 	// stopped and replaced with new instances. Only applicable for VM
 	// runtimes.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	HealthCheck *HealthCheck `protobuf:"bytes,106,opt,name=health_check,json=healthCheck" json:"health_check,omitempty"`
+	HealthCheck *HealthCheck `protobuf:"bytes,106,opt,name=health_check,json=healthCheck,proto3" json:"health_check,omitempty"`
 	// Files that match this pattern will not be built into this version.
 	// Only applicable for Go runtimes.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	NobuildFilesRegex string `protobuf:"bytes,107,opt,name=nobuild_files_regex,json=nobuildFilesRegex" json:"nobuild_files_regex,omitempty"`
+	NobuildFilesRegex string `protobuf:"bytes,107,opt,name=nobuild_files_regex,json=nobuildFilesRegex,proto3" json:"nobuild_files_regex,omitempty"`
 	// Code and application artifacts that make up this version.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	Deployment *Deployment `protobuf:"bytes,108,opt,name=deployment" json:"deployment,omitempty"`
+	Deployment *Deployment `protobuf:"bytes,108,opt,name=deployment,proto3" json:"deployment,omitempty"`
 	// Serving URL for this version. Example:
 	// "https://myversion-dot-myservice-dot-myapp.appspot.com"
 	//
 	// @OutputOnly
-	VersionUrl string `protobuf:"bytes,109,opt,name=version_url,json=versionUrl" json:"version_url,omitempty"`
+	VersionUrl           string   `protobuf:"bytes,109,opt,name=version_url,json=versionUrl,proto3" json:"version_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Version) Reset()         { *m = Version{} }
+func (m *Version) String() string { return proto.CompactTextString(m) }
+func (*Version) ProtoMessage()    {}
+func (*Version) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{0}
+}
+func (m *Version) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Version.Unmarshal(m, b)
+}
+func (m *Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Version.Marshal(b, m, deterministic)
+}
+func (dst *Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Version.Merge(dst, src)
+}
+func (m *Version) XXX_Size() int {
+	return xxx_messageInfo_Version.Size(m)
+}
+func (m *Version) XXX_DiscardUnknown() {
+	xxx_messageInfo_Version.DiscardUnknown(m)
 }
 
-func (m *Version) Reset()                    { *m = Version{} }
-func (m *Version) String() string            { return proto.CompactTextString(m) }
-func (*Version) ProtoMessage()               {}
-func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0} }
+var xxx_messageInfo_Version proto.InternalMessageInfo
+
+func (m *Version) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Version) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
 
 type isVersion_Scaling interface {
 	isVersion_Scaling()
 }
 
 type Version_AutomaticScaling struct {
-	AutomaticScaling *AutomaticScaling `protobuf:"bytes,3,opt,name=automatic_scaling,json=automaticScaling,oneof"`
+	AutomaticScaling *AutomaticScaling `protobuf:"bytes,3,opt,name=automatic_scaling,json=automaticScaling,proto3,oneof"`
 }
+
 type Version_BasicScaling struct {
-	BasicScaling *BasicScaling `protobuf:"bytes,4,opt,name=basic_scaling,json=basicScaling,oneof"`
+	BasicScaling *BasicScaling `protobuf:"bytes,4,opt,name=basic_scaling,json=basicScaling,proto3,oneof"`
 }
+
 type Version_ManualScaling struct {
-	ManualScaling *ManualScaling `protobuf:"bytes,5,opt,name=manual_scaling,json=manualScaling,oneof"`
+	ManualScaling *ManualScaling `protobuf:"bytes,5,opt,name=manual_scaling,json=manualScaling,proto3,oneof"`
 }
 
 func (*Version_AutomaticScaling) isVersion_Scaling() {}
-func (*Version_BasicScaling) isVersion_Scaling()     {}
-func (*Version_ManualScaling) isVersion_Scaling()    {}
+
+func (*Version_BasicScaling) isVersion_Scaling() {}
+
+func (*Version_ManualScaling) isVersion_Scaling() {}
 
 func (m *Version) GetScaling() isVersion_Scaling {
 	if m != nil {
@@ -248,20 +298,6 @@ func (m *Version) GetScaling() isVersion_Scaling {
 	return nil
 }
 
-func (m *Version) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *Version) GetId() string {
-	if m != nil {
-		return m.Id
-	}
-	return ""
-}
-
 func (m *Version) GetAutomaticScaling() *AutomaticScaling {
 	if x, ok := m.GetScaling().(*Version_AutomaticScaling); ok {
 		return x.AutomaticScaling
@@ -360,7 +396,7 @@ func (m *Version) GetCreatedBy() string {
 	return ""
 }
 
-func (m *Version) GetCreateTime() *google_protobuf2.Timestamp {
+func (m *Version) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
@@ -409,7 +445,7 @@ func (m *Version) GetEnvVariables() map[string]string {
 	return nil
 }
 
-func (m *Version) GetDefaultExpiration() *google_protobuf1.Duration {
+func (m *Version) GetDefaultExpiration() *duration.Duration {
 	if m != nil {
 		return m.DefaultExpiration
 	}
@@ -517,17 +553,17 @@ func _Version_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Scaling.(type) {
 	case *Version_AutomaticScaling:
 		s := proto.Size(x.AutomaticScaling)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Version_BasicScaling:
 		s := proto.Size(x.BasicScaling)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Version_ManualScaling:
 		s := proto.Size(x.ManualScaling)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -544,44 +580,66 @@ type AutomaticScaling struct {
 	// [Autoscaler](https://cloud.google.com/compute/docs/autoscaler/)
 	// should wait between changes to the number of virtual machines.
 	// Only applicable for VM runtimes.
-	CoolDownPeriod *google_protobuf1.Duration `protobuf:"bytes,1,opt,name=cool_down_period,json=coolDownPeriod" json:"cool_down_period,omitempty"`
+	CoolDownPeriod *duration.Duration `protobuf:"bytes,1,opt,name=cool_down_period,json=coolDownPeriod,proto3" json:"cool_down_period,omitempty"`
 	// Target scaling by CPU usage.
-	CpuUtilization *CpuUtilization `protobuf:"bytes,2,opt,name=cpu_utilization,json=cpuUtilization" json:"cpu_utilization,omitempty"`
+	CpuUtilization *CpuUtilization `protobuf:"bytes,2,opt,name=cpu_utilization,json=cpuUtilization,proto3" json:"cpu_utilization,omitempty"`
 	// Number of concurrent requests an automatic scaling instance can accept
 	// before the scheduler spawns a new instance.
 	//
 	// Defaults to a runtime-specific value.
-	MaxConcurrentRequests int32 `protobuf:"varint,3,opt,name=max_concurrent_requests,json=maxConcurrentRequests" json:"max_concurrent_requests,omitempty"`
+	MaxConcurrentRequests int32 `protobuf:"varint,3,opt,name=max_concurrent_requests,json=maxConcurrentRequests,proto3" json:"max_concurrent_requests,omitempty"`
 	// Maximum number of idle instances that should be maintained for this
 	// version.
-	MaxIdleInstances int32 `protobuf:"varint,4,opt,name=max_idle_instances,json=maxIdleInstances" json:"max_idle_instances,omitempty"`
+	MaxIdleInstances int32 `protobuf:"varint,4,opt,name=max_idle_instances,json=maxIdleInstances,proto3" json:"max_idle_instances,omitempty"`
 	// Maximum number of instances that should be started to handle requests.
-	MaxTotalInstances int32 `protobuf:"varint,5,opt,name=max_total_instances,json=maxTotalInstances" json:"max_total_instances,omitempty"`
+	MaxTotalInstances int32 `protobuf:"varint,5,opt,name=max_total_instances,json=maxTotalInstances,proto3" json:"max_total_instances,omitempty"`
 	// Maximum amount of time that a request should wait in the pending queue
 	// before starting a new instance to handle it.
-	MaxPendingLatency *google_protobuf1.Duration `protobuf:"bytes,6,opt,name=max_pending_latency,json=maxPendingLatency" json:"max_pending_latency,omitempty"`
+	MaxPendingLatency *duration.Duration `protobuf:"bytes,6,opt,name=max_pending_latency,json=maxPendingLatency,proto3" json:"max_pending_latency,omitempty"`
 	// Minimum number of idle instances that should be maintained for
 	// this version. Only applicable for the default version of a service.
-	MinIdleInstances int32 `protobuf:"varint,7,opt,name=min_idle_instances,json=minIdleInstances" json:"min_idle_instances,omitempty"`
+	MinIdleInstances int32 `protobuf:"varint,7,opt,name=min_idle_instances,json=minIdleInstances,proto3" json:"min_idle_instances,omitempty"`
 	// Minimum number of instances that should be maintained for this version.
-	MinTotalInstances int32 `protobuf:"varint,8,opt,name=min_total_instances,json=minTotalInstances" json:"min_total_instances,omitempty"`
+	MinTotalInstances int32 `protobuf:"varint,8,opt,name=min_total_instances,json=minTotalInstances,proto3" json:"min_total_instances,omitempty"`
 	// Minimum amount of time a request should wait in the pending queue before
 	// starting a new instance to handle it.
-	MinPendingLatency *google_protobuf1.Duration `protobuf:"bytes,9,opt,name=min_pending_latency,json=minPendingLatency" json:"min_pending_latency,omitempty"`
+	MinPendingLatency *duration.Duration `protobuf:"bytes,9,opt,name=min_pending_latency,json=minPendingLatency,proto3" json:"min_pending_latency,omitempty"`
 	// Target scaling by request utilization.
-	RequestUtilization *RequestUtilization `protobuf:"bytes,10,opt,name=request_utilization,json=requestUtilization" json:"request_utilization,omitempty"`
+	RequestUtilization *RequestUtilization `protobuf:"bytes,10,opt,name=request_utilization,json=requestUtilization,proto3" json:"request_utilization,omitempty"`
 	// Target scaling by disk usage.
-	DiskUtilization *DiskUtilization `protobuf:"bytes,11,opt,name=disk_utilization,json=diskUtilization" json:"disk_utilization,omitempty"`
+	DiskUtilization *DiskUtilization `protobuf:"bytes,11,opt,name=disk_utilization,json=diskUtilization,proto3" json:"disk_utilization,omitempty"`
 	// Target scaling by network usage.
-	NetworkUtilization *NetworkUtilization `protobuf:"bytes,12,opt,name=network_utilization,json=networkUtilization" json:"network_utilization,omitempty"`
+	NetworkUtilization   *NetworkUtilization `protobuf:"bytes,12,opt,name=network_utilization,json=networkUtilization,proto3" json:"network_utilization,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *AutomaticScaling) Reset()                    { *m = AutomaticScaling{} }
-func (m *AutomaticScaling) String() string            { return proto.CompactTextString(m) }
-func (*AutomaticScaling) ProtoMessage()               {}
-func (*AutomaticScaling) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{1} }
+func (m *AutomaticScaling) Reset()         { *m = AutomaticScaling{} }
+func (m *AutomaticScaling) String() string { return proto.CompactTextString(m) }
+func (*AutomaticScaling) ProtoMessage()    {}
+func (*AutomaticScaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{1}
+}
+func (m *AutomaticScaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AutomaticScaling.Unmarshal(m, b)
+}
+func (m *AutomaticScaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AutomaticScaling.Marshal(b, m, deterministic)
+}
+func (dst *AutomaticScaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AutomaticScaling.Merge(dst, src)
+}
+func (m *AutomaticScaling) XXX_Size() int {
+	return xxx_messageInfo_AutomaticScaling.Size(m)
+}
+func (m *AutomaticScaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_AutomaticScaling.DiscardUnknown(m)
+}
 
-func (m *AutomaticScaling) GetCoolDownPeriod() *google_protobuf1.Duration {
+var xxx_messageInfo_AutomaticScaling proto.InternalMessageInfo
+
+func (m *AutomaticScaling) GetCoolDownPeriod() *duration.Duration {
 	if m != nil {
 		return m.CoolDownPeriod
 	}
@@ -616,7 +674,7 @@ func (m *AutomaticScaling) GetMaxTotalInstances() int32 {
 	return 0
 }
 
-func (m *AutomaticScaling) GetMaxPendingLatency() *google_protobuf1.Duration {
+func (m *AutomaticScaling) GetMaxPendingLatency() *duration.Duration {
 	if m != nil {
 		return m.MaxPendingLatency
 	}
@@ -637,7 +695,7 @@ func (m *AutomaticScaling) GetMinTotalInstances() int32 {
 	return 0
 }
 
-func (m *AutomaticScaling) GetMinPendingLatency() *google_protobuf1.Duration {
+func (m *AutomaticScaling) GetMinPendingLatency() *duration.Duration {
 	if m != nil {
 		return m.MinPendingLatency
 	}
@@ -672,17 +730,39 @@ func (m *AutomaticScaling) GetNetworkUtilization() *NetworkUtilization {
 type BasicScaling struct {
 	// Duration of time after the last request that an instance must wait before
 	// the instance is shut down.
-	IdleTimeout *google_protobuf1.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout" json:"idle_timeout,omitempty"`
+	IdleTimeout *duration.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"`
 	// Maximum number of instances to create for this version.
-	MaxInstances int32 `protobuf:"varint,2,opt,name=max_instances,json=maxInstances" json:"max_instances,omitempty"`
+	MaxInstances         int32    `protobuf:"varint,2,opt,name=max_instances,json=maxInstances,proto3" json:"max_instances,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BasicScaling) Reset()                    { *m = BasicScaling{} }
-func (m *BasicScaling) String() string            { return proto.CompactTextString(m) }
-func (*BasicScaling) ProtoMessage()               {}
-func (*BasicScaling) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{2} }
+func (m *BasicScaling) Reset()         { *m = BasicScaling{} }
+func (m *BasicScaling) String() string { return proto.CompactTextString(m) }
+func (*BasicScaling) ProtoMessage()    {}
+func (*BasicScaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{2}
+}
+func (m *BasicScaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BasicScaling.Unmarshal(m, b)
+}
+func (m *BasicScaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BasicScaling.Marshal(b, m, deterministic)
+}
+func (dst *BasicScaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BasicScaling.Merge(dst, src)
+}
+func (m *BasicScaling) XXX_Size() int {
+	return xxx_messageInfo_BasicScaling.Size(m)
+}
+func (m *BasicScaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_BasicScaling.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BasicScaling proto.InternalMessageInfo
 
-func (m *BasicScaling) GetIdleTimeout() *google_protobuf1.Duration {
+func (m *BasicScaling) GetIdleTimeout() *duration.Duration {
 	if m != nil {
 		return m.IdleTimeout
 	}
@@ -703,13 +783,35 @@ type ManualScaling struct {
 	// can later be altered by using the
 	// [Modules API](https://cloud.google.com/appengine/docs/python/modules/functions)
 	// `set_num_instances()` function.
-	Instances int32 `protobuf:"varint,1,opt,name=instances" json:"instances,omitempty"`
+	Instances            int32    `protobuf:"varint,1,opt,name=instances,proto3" json:"instances,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ManualScaling) Reset()         { *m = ManualScaling{} }
+func (m *ManualScaling) String() string { return proto.CompactTextString(m) }
+func (*ManualScaling) ProtoMessage()    {}
+func (*ManualScaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{3}
+}
+func (m *ManualScaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ManualScaling.Unmarshal(m, b)
+}
+func (m *ManualScaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ManualScaling.Marshal(b, m, deterministic)
+}
+func (dst *ManualScaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManualScaling.Merge(dst, src)
+}
+func (m *ManualScaling) XXX_Size() int {
+	return xxx_messageInfo_ManualScaling.Size(m)
+}
+func (m *ManualScaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_ManualScaling.DiscardUnknown(m)
 }
 
-func (m *ManualScaling) Reset()                    { *m = ManualScaling{} }
-func (m *ManualScaling) String() string            { return proto.CompactTextString(m) }
-func (*ManualScaling) ProtoMessage()               {}
-func (*ManualScaling) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{3} }
+var xxx_messageInfo_ManualScaling proto.InternalMessageInfo
 
 func (m *ManualScaling) GetInstances() int32 {
 	if m != nil {
@@ -721,18 +823,40 @@ func (m *ManualScaling) GetInstances() int32 {
 // Target scaling by CPU usage.
 type CpuUtilization struct {
 	// Period of time over which CPU utilization is calculated.
-	AggregationWindowLength *google_protobuf1.Duration `protobuf:"bytes,1,opt,name=aggregation_window_length,json=aggregationWindowLength" json:"aggregation_window_length,omitempty"`
+	AggregationWindowLength *duration.Duration `protobuf:"bytes,1,opt,name=aggregation_window_length,json=aggregationWindowLength,proto3" json:"aggregation_window_length,omitempty"`
 	// Target CPU utilization ratio to maintain when scaling. Must be between 0
 	// and 1.
-	TargetUtilization float64 `protobuf:"fixed64,2,opt,name=target_utilization,json=targetUtilization" json:"target_utilization,omitempty"`
+	TargetUtilization    float64  `protobuf:"fixed64,2,opt,name=target_utilization,json=targetUtilization,proto3" json:"target_utilization,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CpuUtilization) Reset()                    { *m = CpuUtilization{} }
-func (m *CpuUtilization) String() string            { return proto.CompactTextString(m) }
-func (*CpuUtilization) ProtoMessage()               {}
-func (*CpuUtilization) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{4} }
+func (m *CpuUtilization) Reset()         { *m = CpuUtilization{} }
+func (m *CpuUtilization) String() string { return proto.CompactTextString(m) }
+func (*CpuUtilization) ProtoMessage()    {}
+func (*CpuUtilization) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{4}
+}
+func (m *CpuUtilization) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CpuUtilization.Unmarshal(m, b)
+}
+func (m *CpuUtilization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CpuUtilization.Marshal(b, m, deterministic)
+}
+func (dst *CpuUtilization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CpuUtilization.Merge(dst, src)
+}
+func (m *CpuUtilization) XXX_Size() int {
+	return xxx_messageInfo_CpuUtilization.Size(m)
+}
+func (m *CpuUtilization) XXX_DiscardUnknown() {
+	xxx_messageInfo_CpuUtilization.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CpuUtilization proto.InternalMessageInfo
 
-func (m *CpuUtilization) GetAggregationWindowLength() *google_protobuf1.Duration {
+func (m *CpuUtilization) GetAggregationWindowLength() *duration.Duration {
 	if m != nil {
 		return m.AggregationWindowLength
 	}
@@ -749,15 +873,37 @@ func (m *CpuUtilization) GetTargetUtilization() float64 {
 // Target scaling by request utilization. Only applicable for VM runtimes.
 type RequestUtilization struct {
 	// Target requests per second.
-	TargetRequestCountPerSecond int32 `protobuf:"varint,1,opt,name=target_request_count_per_second,json=targetRequestCountPerSecond" json:"target_request_count_per_second,omitempty"`
+	TargetRequestCountPerSecond int32 `protobuf:"varint,1,opt,name=target_request_count_per_second,json=targetRequestCountPerSecond,proto3" json:"target_request_count_per_second,omitempty"`
 	// Target number of concurrent requests.
-	TargetConcurrentRequests int32 `protobuf:"varint,2,opt,name=target_concurrent_requests,json=targetConcurrentRequests" json:"target_concurrent_requests,omitempty"`
+	TargetConcurrentRequests int32    `protobuf:"varint,2,opt,name=target_concurrent_requests,json=targetConcurrentRequests,proto3" json:"target_concurrent_requests,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
 }
 
-func (m *RequestUtilization) Reset()                    { *m = RequestUtilization{} }
-func (m *RequestUtilization) String() string            { return proto.CompactTextString(m) }
-func (*RequestUtilization) ProtoMessage()               {}
-func (*RequestUtilization) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{5} }
+func (m *RequestUtilization) Reset()         { *m = RequestUtilization{} }
+func (m *RequestUtilization) String() string { return proto.CompactTextString(m) }
+func (*RequestUtilization) ProtoMessage()    {}
+func (*RequestUtilization) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{5}
+}
+func (m *RequestUtilization) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RequestUtilization.Unmarshal(m, b)
+}
+func (m *RequestUtilization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RequestUtilization.Marshal(b, m, deterministic)
+}
+func (dst *RequestUtilization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestUtilization.Merge(dst, src)
+}
+func (m *RequestUtilization) XXX_Size() int {
+	return xxx_messageInfo_RequestUtilization.Size(m)
+}
+func (m *RequestUtilization) XXX_DiscardUnknown() {
+	xxx_messageInfo_RequestUtilization.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RequestUtilization proto.InternalMessageInfo
 
 func (m *RequestUtilization) GetTargetRequestCountPerSecond() int32 {
 	if m != nil {
@@ -776,19 +922,41 @@ func (m *RequestUtilization) GetTargetConcurrentRequests() int32 {
 // Target scaling by disk usage. Only applicable for VM runtimes.
 type DiskUtilization struct {
 	// Target bytes written per second.
-	TargetWriteBytesPerSecond int32 `protobuf:"varint,14,opt,name=target_write_bytes_per_second,json=targetWriteBytesPerSecond" json:"target_write_bytes_per_second,omitempty"`
+	TargetWriteBytesPerSecond int32 `protobuf:"varint,14,opt,name=target_write_bytes_per_second,json=targetWriteBytesPerSecond,proto3" json:"target_write_bytes_per_second,omitempty"`
 	// Target ops written per second.
-	TargetWriteOpsPerSecond int32 `protobuf:"varint,15,opt,name=target_write_ops_per_second,json=targetWriteOpsPerSecond" json:"target_write_ops_per_second,omitempty"`
+	TargetWriteOpsPerSecond int32 `protobuf:"varint,15,opt,name=target_write_ops_per_second,json=targetWriteOpsPerSecond,proto3" json:"target_write_ops_per_second,omitempty"`
 	// Target bytes read per second.
-	TargetReadBytesPerSecond int32 `protobuf:"varint,16,opt,name=target_read_bytes_per_second,json=targetReadBytesPerSecond" json:"target_read_bytes_per_second,omitempty"`
+	TargetReadBytesPerSecond int32 `protobuf:"varint,16,opt,name=target_read_bytes_per_second,json=targetReadBytesPerSecond,proto3" json:"target_read_bytes_per_second,omitempty"`
 	// Target ops read per seconds.
-	TargetReadOpsPerSecond int32 `protobuf:"varint,17,opt,name=target_read_ops_per_second,json=targetReadOpsPerSecond" json:"target_read_ops_per_second,omitempty"`
+	TargetReadOpsPerSecond int32    `protobuf:"varint,17,opt,name=target_read_ops_per_second,json=targetReadOpsPerSecond,proto3" json:"target_read_ops_per_second,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
 }
 
-func (m *DiskUtilization) Reset()                    { *m = DiskUtilization{} }
-func (m *DiskUtilization) String() string            { return proto.CompactTextString(m) }
-func (*DiskUtilization) ProtoMessage()               {}
-func (*DiskUtilization) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{6} }
+func (m *DiskUtilization) Reset()         { *m = DiskUtilization{} }
+func (m *DiskUtilization) String() string { return proto.CompactTextString(m) }
+func (*DiskUtilization) ProtoMessage()    {}
+func (*DiskUtilization) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{6}
+}
+func (m *DiskUtilization) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DiskUtilization.Unmarshal(m, b)
+}
+func (m *DiskUtilization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DiskUtilization.Marshal(b, m, deterministic)
+}
+func (dst *DiskUtilization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiskUtilization.Merge(dst, src)
+}
+func (m *DiskUtilization) XXX_Size() int {
+	return xxx_messageInfo_DiskUtilization.Size(m)
+}
+func (m *DiskUtilization) XXX_DiscardUnknown() {
+	xxx_messageInfo_DiskUtilization.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DiskUtilization proto.InternalMessageInfo
 
 func (m *DiskUtilization) GetTargetWriteBytesPerSecond() int32 {
 	if m != nil {
@@ -821,19 +989,41 @@ func (m *DiskUtilization) GetTargetReadOpsPerSecond() int32 {
 // Target scaling by network usage. Only applicable for VM runtimes.
 type NetworkUtilization struct {
 	// Target bytes sent per second.
-	TargetSentBytesPerSecond int32 `protobuf:"varint,1,opt,name=target_sent_bytes_per_second,json=targetSentBytesPerSecond" json:"target_sent_bytes_per_second,omitempty"`
+	TargetSentBytesPerSecond int32 `protobuf:"varint,1,opt,name=target_sent_bytes_per_second,json=targetSentBytesPerSecond,proto3" json:"target_sent_bytes_per_second,omitempty"`
 	// Target packets sent per second.
-	TargetSentPacketsPerSecond int32 `protobuf:"varint,11,opt,name=target_sent_packets_per_second,json=targetSentPacketsPerSecond" json:"target_sent_packets_per_second,omitempty"`
+	TargetSentPacketsPerSecond int32 `protobuf:"varint,11,opt,name=target_sent_packets_per_second,json=targetSentPacketsPerSecond,proto3" json:"target_sent_packets_per_second,omitempty"`
 	// Target bytes received per second.
-	TargetReceivedBytesPerSecond int32 `protobuf:"varint,12,opt,name=target_received_bytes_per_second,json=targetReceivedBytesPerSecond" json:"target_received_bytes_per_second,omitempty"`
+	TargetReceivedBytesPerSecond int32 `protobuf:"varint,12,opt,name=target_received_bytes_per_second,json=targetReceivedBytesPerSecond,proto3" json:"target_received_bytes_per_second,omitempty"`
 	// Target packets received per second.
-	TargetReceivedPacketsPerSecond int32 `protobuf:"varint,13,opt,name=target_received_packets_per_second,json=targetReceivedPacketsPerSecond" json:"target_received_packets_per_second,omitempty"`
+	TargetReceivedPacketsPerSecond int32    `protobuf:"varint,13,opt,name=target_received_packets_per_second,json=targetReceivedPacketsPerSecond,proto3" json:"target_received_packets_per_second,omitempty"`
+	XXX_NoUnkeyedLiteral           struct{} `json:"-"`
+	XXX_unrecognized               []byte   `json:"-"`
+	XXX_sizecache                  int32    `json:"-"`
 }
 
-func (m *NetworkUtilization) Reset()                    { *m = NetworkUtilization{} }
-func (m *NetworkUtilization) String() string            { return proto.CompactTextString(m) }
-func (*NetworkUtilization) ProtoMessage()               {}
-func (*NetworkUtilization) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{7} }
+func (m *NetworkUtilization) Reset()         { *m = NetworkUtilization{} }
+func (m *NetworkUtilization) String() string { return proto.CompactTextString(m) }
+func (*NetworkUtilization) ProtoMessage()    {}
+func (*NetworkUtilization) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{7}
+}
+func (m *NetworkUtilization) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NetworkUtilization.Unmarshal(m, b)
+}
+func (m *NetworkUtilization) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NetworkUtilization.Marshal(b, m, deterministic)
+}
+func (dst *NetworkUtilization) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkUtilization.Merge(dst, src)
+}
+func (m *NetworkUtilization) XXX_Size() int {
+	return xxx_messageInfo_NetworkUtilization.Size(m)
+}
+func (m *NetworkUtilization) XXX_DiscardUnknown() {
+	xxx_messageInfo_NetworkUtilization.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NetworkUtilization proto.InternalMessageInfo
 
 func (m *NetworkUtilization) GetTargetSentBytesPerSecond() int32 {
 	if m != nil {
@@ -867,20 +1057,42 @@ func (m *NetworkUtilization) GetTargetReceivedPacketsPerSecond() int32 {
 type Network struct {
 	// List of ports, or port pairs, to forward from the virtual machine to the
 	// application container.
-	ForwardedPorts []string `protobuf:"bytes,1,rep,name=forwarded_ports,json=forwardedPorts" json:"forwarded_ports,omitempty"`
+	ForwardedPorts []string `protobuf:"bytes,1,rep,name=forwarded_ports,json=forwardedPorts,proto3" json:"forwarded_ports,omitempty"`
 	// Tag to apply to the VM instance during creation.
-	InstanceTag string `protobuf:"bytes,2,opt,name=instance_tag,json=instanceTag" json:"instance_tag,omitempty"`
+	InstanceTag string `protobuf:"bytes,2,opt,name=instance_tag,json=instanceTag,proto3" json:"instance_tag,omitempty"`
 	// Google Cloud Platform network where the virtual machines are created.
 	// Specify the short name, not the resource path.
 	//
 	// Defaults to `default`.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Network) Reset()         { *m = Network{} }
+func (m *Network) String() string { return proto.CompactTextString(m) }
+func (*Network) ProtoMessage()    {}
+func (*Network) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{8}
+}
+func (m *Network) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Network.Unmarshal(m, b)
+}
+func (m *Network) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Network.Marshal(b, m, deterministic)
+}
+func (dst *Network) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Network.Merge(dst, src)
+}
+func (m *Network) XXX_Size() int {
+	return xxx_messageInfo_Network.Size(m)
+}
+func (m *Network) XXX_DiscardUnknown() {
+	xxx_messageInfo_Network.DiscardUnknown(m)
 }
 
-func (m *Network) Reset()                    { *m = Network{} }
-func (m *Network) String() string            { return proto.CompactTextString(m) }
-func (*Network) ProtoMessage()               {}
-func (*Network) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{8} }
+var xxx_messageInfo_Network proto.InternalMessageInfo
 
 func (m *Network) GetForwardedPorts() []string {
 	if m != nil {
@@ -906,17 +1118,39 @@ func (m *Network) GetName() string {
 // Machine resources for a version.
 type Resources struct {
 	// Number of CPU cores needed.
-	Cpu float64 `protobuf:"fixed64,1,opt,name=cpu" json:"cpu,omitempty"`
+	Cpu float64 `protobuf:"fixed64,1,opt,name=cpu,proto3" json:"cpu,omitempty"`
 	// Disk size (GB) needed.
-	DiskGb float64 `protobuf:"fixed64,2,opt,name=disk_gb,json=diskGb" json:"disk_gb,omitempty"`
+	DiskGb float64 `protobuf:"fixed64,2,opt,name=disk_gb,json=diskGb,proto3" json:"disk_gb,omitempty"`
 	// Memory (GB) needed.
-	MemoryGb float64 `protobuf:"fixed64,3,opt,name=memory_gb,json=memoryGb" json:"memory_gb,omitempty"`
+	MemoryGb             float64  `protobuf:"fixed64,3,opt,name=memory_gb,json=memoryGb,proto3" json:"memory_gb,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Resources) Reset()                    { *m = Resources{} }
-func (m *Resources) String() string            { return proto.CompactTextString(m) }
-func (*Resources) ProtoMessage()               {}
-func (*Resources) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{9} }
+func (m *Resources) Reset()         { *m = Resources{} }
+func (m *Resources) String() string { return proto.CompactTextString(m) }
+func (*Resources) ProtoMessage()    {}
+func (*Resources) Descriptor() ([]byte, []int) {
+	return fileDescriptor_version_8b240e3827c1f1f0, []int{9}
+}
+func (m *Resources) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Resources.Unmarshal(m, b)
+}
+func (m *Resources) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Resources.Marshal(b, m, deterministic)
+}
+func (dst *Resources) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resources.Merge(dst, src)
+}
+func (m *Resources) XXX_Size() int {
+	return xxx_messageInfo_Resources.Size(m)
+}
+func (m *Resources) XXX_DiscardUnknown() {
+	xxx_messageInfo_Resources.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Resources proto.InternalMessageInfo
 
 func (m *Resources) GetCpu() float64 {
 	if m != nil {
@@ -941,6 +1175,8 @@ func (m *Resources) GetMemoryGb() float64 {
 
 func init() {
 	proto.RegisterType((*Version)(nil), "google.appengine.v1.Version")
+	proto.RegisterMapType((map[string]string)(nil), "google.appengine.v1.Version.BetaSettingsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.appengine.v1.Version.EnvVariablesEntry")
 	proto.RegisterType((*AutomaticScaling)(nil), "google.appengine.v1.AutomaticScaling")
 	proto.RegisterType((*BasicScaling)(nil), "google.appengine.v1.BasicScaling")
 	proto.RegisterType((*ManualScaling)(nil), "google.appengine.v1.ManualScaling")
@@ -954,9 +1190,11 @@ func init() {
 	proto.RegisterEnum("google.appengine.v1.ServingStatus", ServingStatus_name, ServingStatus_value)
 }
 
-func init() { proto.RegisterFile("google/appengine/v1/version.proto", fileDescriptor9) }
+func init() {
+	proto.RegisterFile("google/appengine/v1/version.proto", fileDescriptor_version_8b240e3827c1f1f0)
+}
 
-var fileDescriptor9 = []byte{
+var fileDescriptor_version_8b240e3827c1f1f0 = []byte{
 	// 1767 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x58, 0x5d, 0x73, 0xdb, 0xc6,
 	0x15, 0x0d, 0x29, 0x4b, 0x14, 0x2f, 0x3f, 0x04, 0xad, 0xd3, 0x08, 0x96, 0x64, 0x89, 0x66, 0x92,
diff --git a/vendor/google.golang.org/genproto/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go b/vendor/google.golang.org/genproto/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
index f3917faf..f659783b 100644
--- a/vendor/google.golang.org/genproto/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/assistant/embedded/v1alpha1/embedded_assistant.pb.go
@@ -1,29 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/assistant/embedded/v1alpha1/embedded_assistant.proto
 
-/*
-Package embedded is a generated protocol buffer package.
-
-It is generated from these files:
-	google/assistant/embedded/v1alpha1/embedded_assistant.proto
-
-It has these top-level messages:
-	ConverseConfig
-	AudioInConfig
-	AudioOutConfig
-	ConverseState
-	AudioOut
-	ConverseResult
-	ConverseRequest
-	ConverseResponse
-*/
-package embedded
+package embedded // import "google.golang.org/genproto/googleapis/assistant/embedded/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -75,7 +59,9 @@ var AudioInConfig_Encoding_value = map[string]int32{
 func (x AudioInConfig_Encoding) String() string {
 	return proto.EnumName(AudioInConfig_Encoding_name, int32(x))
 }
-func (AudioInConfig_Encoding) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (AudioInConfig_Encoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{1, 0}
+}
 
 // Audio encoding of the data returned in the audio message. All encodings are
 // raw audio bytes with no header, except as indicated below.
@@ -111,7 +97,9 @@ var AudioOutConfig_Encoding_value = map[string]int32{
 func (x AudioOutConfig_Encoding) String() string {
 	return proto.EnumName(AudioOutConfig_Encoding_name, int32(x))
 }
-func (AudioOutConfig_Encoding) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (AudioOutConfig_Encoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{2, 0}
+}
 
 // Possible states of the microphone after a `Converse` RPC completes.
 type ConverseResult_MicrophoneMode int32
@@ -143,7 +131,7 @@ func (x ConverseResult_MicrophoneMode) String() string {
 	return proto.EnumName(ConverseResult_MicrophoneMode_name, int32(x))
 }
 func (ConverseResult_MicrophoneMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 0}
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{5, 0}
 }
 
 // Indicates the type of event.
@@ -174,23 +162,45 @@ func (x ConverseResponse_EventType) String() string {
 	return proto.EnumName(ConverseResponse_EventType_name, int32(x))
 }
 func (ConverseResponse_EventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{7, 0}
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{7, 0}
 }
 
 // Specifies how to process the `ConverseRequest` messages.
 type ConverseConfig struct {
 	// *Required* Specifies how to process the subsequent incoming audio.
-	AudioInConfig *AudioInConfig `protobuf:"bytes,1,opt,name=audio_in_config,json=audioInConfig" json:"audio_in_config,omitempty"`
+	AudioInConfig *AudioInConfig `protobuf:"bytes,1,opt,name=audio_in_config,json=audioInConfig,proto3" json:"audio_in_config,omitempty"`
 	// *Required* Specifies how to format the audio that will be returned.
-	AudioOutConfig *AudioOutConfig `protobuf:"bytes,2,opt,name=audio_out_config,json=audioOutConfig" json:"audio_out_config,omitempty"`
+	AudioOutConfig *AudioOutConfig `protobuf:"bytes,2,opt,name=audio_out_config,json=audioOutConfig,proto3" json:"audio_out_config,omitempty"`
 	// *Required* Represents the current dialog state.
-	ConverseState *ConverseState `protobuf:"bytes,3,opt,name=converse_state,json=converseState" json:"converse_state,omitempty"`
+	ConverseState        *ConverseState `protobuf:"bytes,3,opt,name=converse_state,json=converseState,proto3" json:"converse_state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *ConverseConfig) Reset()         { *m = ConverseConfig{} }
+func (m *ConverseConfig) String() string { return proto.CompactTextString(m) }
+func (*ConverseConfig) ProtoMessage()    {}
+func (*ConverseConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{0}
+}
+func (m *ConverseConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConverseConfig.Unmarshal(m, b)
+}
+func (m *ConverseConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConverseConfig.Marshal(b, m, deterministic)
+}
+func (dst *ConverseConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseConfig.Merge(dst, src)
+}
+func (m *ConverseConfig) XXX_Size() int {
+	return xxx_messageInfo_ConverseConfig.Size(m)
+}
+func (m *ConverseConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConverseConfig.DiscardUnknown(m)
 }
 
-func (m *ConverseConfig) Reset()                    { *m = ConverseConfig{} }
-func (m *ConverseConfig) String() string            { return proto.CompactTextString(m) }
-func (*ConverseConfig) ProtoMessage()               {}
-func (*ConverseConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_ConverseConfig proto.InternalMessageInfo
 
 func (m *ConverseConfig) GetAudioInConfig() *AudioInConfig {
 	if m != nil {
@@ -218,19 +228,41 @@ func (m *ConverseConfig) GetConverseState() *ConverseState {
 // [best practices](https://developers.google.com/assistant/sdk/develop/grpc/best-practices/audio).
 type AudioInConfig struct {
 	// *Required* Encoding of audio data sent in all `audio_in` messages.
-	Encoding AudioInConfig_Encoding `protobuf:"varint,1,opt,name=encoding,enum=google.assistant.embedded.v1alpha1.AudioInConfig_Encoding" json:"encoding,omitempty"`
+	Encoding AudioInConfig_Encoding `protobuf:"varint,1,opt,name=encoding,proto3,enum=google.assistant.embedded.v1alpha1.AudioInConfig_Encoding" json:"encoding,omitempty"`
 	// *Required* Sample rate (in Hertz) of the audio data sent in all `audio_in`
 	// messages. Valid values are from 16000-24000, but 16000 is optimal.
 	// For best results, set the sampling rate of the audio source to 16000 Hz.
 	// If that's not possible, use the native sample rate of the audio source
 	// (instead of re-sampling).
-	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz" json:"sample_rate_hertz,omitempty"`
+	SampleRateHertz      int32    `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AudioInConfig) Reset()                    { *m = AudioInConfig{} }
-func (m *AudioInConfig) String() string            { return proto.CompactTextString(m) }
-func (*AudioInConfig) ProtoMessage()               {}
-func (*AudioInConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *AudioInConfig) Reset()         { *m = AudioInConfig{} }
+func (m *AudioInConfig) String() string { return proto.CompactTextString(m) }
+func (*AudioInConfig) ProtoMessage()    {}
+func (*AudioInConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{1}
+}
+func (m *AudioInConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AudioInConfig.Unmarshal(m, b)
+}
+func (m *AudioInConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AudioInConfig.Marshal(b, m, deterministic)
+}
+func (dst *AudioInConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioInConfig.Merge(dst, src)
+}
+func (m *AudioInConfig) XXX_Size() int {
+	return xxx_messageInfo_AudioInConfig.Size(m)
+}
+func (m *AudioInConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AudioInConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AudioInConfig proto.InternalMessageInfo
 
 func (m *AudioInConfig) GetEncoding() AudioInConfig_Encoding {
 	if m != nil {
@@ -251,19 +283,41 @@ func (m *AudioInConfig) GetSampleRateHertz() int32 {
 type AudioOutConfig struct {
 	// *Required* The encoding of audio data to be returned in all `audio_out`
 	// messages.
-	Encoding AudioOutConfig_Encoding `protobuf:"varint,1,opt,name=encoding,enum=google.assistant.embedded.v1alpha1.AudioOutConfig_Encoding" json:"encoding,omitempty"`
+	Encoding AudioOutConfig_Encoding `protobuf:"varint,1,opt,name=encoding,proto3,enum=google.assistant.embedded.v1alpha1.AudioOutConfig_Encoding" json:"encoding,omitempty"`
 	// *Required* The sample rate in Hertz of the audio data returned in
 	// `audio_out` messages. Valid values are: 16000-24000.
-	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz" json:"sample_rate_hertz,omitempty"`
+	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
 	// *Required* Current volume setting of the device's audio output.
 	// Valid values are 1 to 100 (corresponding to 1% to 100%).
-	VolumePercentage int32 `protobuf:"varint,3,opt,name=volume_percentage,json=volumePercentage" json:"volume_percentage,omitempty"`
+	VolumePercentage     int32    `protobuf:"varint,3,opt,name=volume_percentage,json=volumePercentage,proto3" json:"volume_percentage,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AudioOutConfig) Reset()         { *m = AudioOutConfig{} }
+func (m *AudioOutConfig) String() string { return proto.CompactTextString(m) }
+func (*AudioOutConfig) ProtoMessage()    {}
+func (*AudioOutConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{2}
+}
+func (m *AudioOutConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AudioOutConfig.Unmarshal(m, b)
+}
+func (m *AudioOutConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AudioOutConfig.Marshal(b, m, deterministic)
+}
+func (dst *AudioOutConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioOutConfig.Merge(dst, src)
+}
+func (m *AudioOutConfig) XXX_Size() int {
+	return xxx_messageInfo_AudioOutConfig.Size(m)
+}
+func (m *AudioOutConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AudioOutConfig.DiscardUnknown(m)
 }
 
-func (m *AudioOutConfig) Reset()                    { *m = AudioOutConfig{} }
-func (m *AudioOutConfig) String() string            { return proto.CompactTextString(m) }
-func (*AudioOutConfig) ProtoMessage()               {}
-func (*AudioOutConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_AudioOutConfig proto.InternalMessageInfo
 
 func (m *AudioOutConfig) GetEncoding() AudioOutConfig_Encoding {
 	if m != nil {
@@ -293,13 +347,35 @@ type ConverseState struct {
 	// `ConverseResponse`. If there was a prior `ConverseResponse`, do not omit
 	// this field; doing so will end that conversation (and this new request will
 	// start a new conversation).
-	ConversationState []byte `protobuf:"bytes,1,opt,name=conversation_state,json=conversationState,proto3" json:"conversation_state,omitempty"`
+	ConversationState    []byte   `protobuf:"bytes,1,opt,name=conversation_state,json=conversationState,proto3" json:"conversation_state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ConverseState) Reset()                    { *m = ConverseState{} }
-func (m *ConverseState) String() string            { return proto.CompactTextString(m) }
-func (*ConverseState) ProtoMessage()               {}
-func (*ConverseState) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ConverseState) Reset()         { *m = ConverseState{} }
+func (m *ConverseState) String() string { return proto.CompactTextString(m) }
+func (*ConverseState) ProtoMessage()    {}
+func (*ConverseState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{3}
+}
+func (m *ConverseState) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConverseState.Unmarshal(m, b)
+}
+func (m *ConverseState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConverseState.Marshal(b, m, deterministic)
+}
+func (dst *ConverseState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseState.Merge(dst, src)
+}
+func (m *ConverseState) XXX_Size() int {
+	return xxx_messageInfo_ConverseState.Size(m)
+}
+func (m *ConverseState) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConverseState.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConverseState proto.InternalMessageInfo
 
 func (m *ConverseState) GetConversationState() []byte {
 	if m != nil {
@@ -314,13 +390,35 @@ type AudioOut struct {
 	// *Output-only* The audio data containing the assistant's response to the
 	// query. Sequential chunks of audio data are received in sequential
 	// `ConverseResponse` messages.
-	AudioData []byte `protobuf:"bytes,1,opt,name=audio_data,json=audioData,proto3" json:"audio_data,omitempty"`
+	AudioData            []byte   `protobuf:"bytes,1,opt,name=audio_data,json=audioData,proto3" json:"audio_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AudioOut) Reset()         { *m = AudioOut{} }
+func (m *AudioOut) String() string { return proto.CompactTextString(m) }
+func (*AudioOut) ProtoMessage()    {}
+func (*AudioOut) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{4}
+}
+func (m *AudioOut) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AudioOut.Unmarshal(m, b)
+}
+func (m *AudioOut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AudioOut.Marshal(b, m, deterministic)
+}
+func (dst *AudioOut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioOut.Merge(dst, src)
+}
+func (m *AudioOut) XXX_Size() int {
+	return xxx_messageInfo_AudioOut.Size(m)
+}
+func (m *AudioOut) XXX_DiscardUnknown() {
+	xxx_messageInfo_AudioOut.DiscardUnknown(m)
 }
 
-func (m *AudioOut) Reset()                    { *m = AudioOut{} }
-func (m *AudioOut) String() string            { return proto.CompactTextString(m) }
-func (*AudioOut) ProtoMessage()               {}
-func (*AudioOut) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_AudioOut proto.InternalMessageInfo
 
 func (m *AudioOut) GetAudioData() []byte {
 	if m != nil {
@@ -332,10 +430,10 @@ func (m *AudioOut) GetAudioData() []byte {
 // The semantic result for the user's spoken query.
 type ConverseResult struct {
 	// *Output-only* The recognized transcript of what the user said.
-	SpokenRequestText string `protobuf:"bytes,1,opt,name=spoken_request_text,json=spokenRequestText" json:"spoken_request_text,omitempty"`
+	SpokenRequestText string `protobuf:"bytes,1,opt,name=spoken_request_text,json=spokenRequestText,proto3" json:"spoken_request_text,omitempty"`
 	// *Output-only* The text of the assistant's spoken response. This is only
 	// returned for an IFTTT action.
-	SpokenResponseText string `protobuf:"bytes,2,opt,name=spoken_response_text,json=spokenResponseText" json:"spoken_response_text,omitempty"`
+	SpokenResponseText string `protobuf:"bytes,2,opt,name=spoken_response_text,json=spokenResponseText,proto3" json:"spoken_response_text,omitempty"`
 	// *Output-only* State information for subsequent `ConverseRequest`. This
 	// value should be saved in the client and returned in the
 	// `conversation_state` with the next `ConverseRequest`. (The client does not
@@ -344,7 +442,7 @@ type ConverseResult struct {
 	ConversationState []byte `protobuf:"bytes,3,opt,name=conversation_state,json=conversationState,proto3" json:"conversation_state,omitempty"`
 	// *Output-only* Specifies the mode of the microphone after this `Converse`
 	// RPC is processed.
-	MicrophoneMode ConverseResult_MicrophoneMode `protobuf:"varint,4,opt,name=microphone_mode,json=microphoneMode,enum=google.assistant.embedded.v1alpha1.ConverseResult_MicrophoneMode" json:"microphone_mode,omitempty"`
+	MicrophoneMode ConverseResult_MicrophoneMode `protobuf:"varint,4,opt,name=microphone_mode,json=microphoneMode,proto3,enum=google.assistant.embedded.v1alpha1.ConverseResult_MicrophoneMode" json:"microphone_mode,omitempty"`
 	// *Output-only* Updated volume level. The value will be 0 or omitted
 	// (indicating no change) unless a voice command such as "Increase the volume"
 	// or "Set volume level 4" was recognized, in which case the value will be
@@ -354,13 +452,35 @@ type ConverseResult struct {
 	// supply it in the `AudioOutConfig` of the next `ConverseRequest`. (Some
 	// clients may also implement other ways to allow the current volume level to
 	// be changed, for example, by providing a knob that the user can turn.)
-	VolumePercentage int32 `protobuf:"varint,5,opt,name=volume_percentage,json=volumePercentage" json:"volume_percentage,omitempty"`
+	VolumePercentage     int32    `protobuf:"varint,5,opt,name=volume_percentage,json=volumePercentage,proto3" json:"volume_percentage,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ConverseResult) Reset()                    { *m = ConverseResult{} }
-func (m *ConverseResult) String() string            { return proto.CompactTextString(m) }
-func (*ConverseResult) ProtoMessage()               {}
-func (*ConverseResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ConverseResult) Reset()         { *m = ConverseResult{} }
+func (m *ConverseResult) String() string { return proto.CompactTextString(m) }
+func (*ConverseResult) ProtoMessage()    {}
+func (*ConverseResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{5}
+}
+func (m *ConverseResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConverseResult.Unmarshal(m, b)
+}
+func (m *ConverseResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConverseResult.Marshal(b, m, deterministic)
+}
+func (dst *ConverseResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseResult.Merge(dst, src)
+}
+func (m *ConverseResult) XXX_Size() int {
+	return xxx_messageInfo_ConverseResult.Size(m)
+}
+func (m *ConverseResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConverseResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConverseResult proto.InternalMessageInfo
 
 func (m *ConverseResult) GetSpokenRequestText() string {
 	if m != nil {
@@ -408,26 +528,50 @@ type ConverseRequest struct {
 	// Types that are valid to be assigned to ConverseRequest:
 	//	*ConverseRequest_Config
 	//	*ConverseRequest_AudioIn
-	ConverseRequest isConverseRequest_ConverseRequest `protobuf_oneof:"converse_request"`
+	ConverseRequest      isConverseRequest_ConverseRequest `protobuf_oneof:"converse_request"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *ConverseRequest) Reset()         { *m = ConverseRequest{} }
+func (m *ConverseRequest) String() string { return proto.CompactTextString(m) }
+func (*ConverseRequest) ProtoMessage()    {}
+func (*ConverseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{6}
+}
+func (m *ConverseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConverseRequest.Unmarshal(m, b)
+}
+func (m *ConverseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConverseRequest.Marshal(b, m, deterministic)
+}
+func (dst *ConverseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseRequest.Merge(dst, src)
+}
+func (m *ConverseRequest) XXX_Size() int {
+	return xxx_messageInfo_ConverseRequest.Size(m)
+}
+func (m *ConverseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConverseRequest.DiscardUnknown(m)
 }
 
-func (m *ConverseRequest) Reset()                    { *m = ConverseRequest{} }
-func (m *ConverseRequest) String() string            { return proto.CompactTextString(m) }
-func (*ConverseRequest) ProtoMessage()               {}
-func (*ConverseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ConverseRequest proto.InternalMessageInfo
 
 type isConverseRequest_ConverseRequest interface {
 	isConverseRequest_ConverseRequest()
 }
 
 type ConverseRequest_Config struct {
-	Config *ConverseConfig `protobuf:"bytes,1,opt,name=config,oneof"`
+	Config *ConverseConfig `protobuf:"bytes,1,opt,name=config,proto3,oneof"`
 }
+
 type ConverseRequest_AudioIn struct {
 	AudioIn []byte `protobuf:"bytes,2,opt,name=audio_in,json=audioIn,proto3,oneof"`
 }
 
-func (*ConverseRequest_Config) isConverseRequest_ConverseRequest()  {}
+func (*ConverseRequest_Config) isConverseRequest_ConverseRequest() {}
+
 func (*ConverseRequest_AudioIn) isConverseRequest_ConverseRequest() {}
 
 func (m *ConverseRequest) GetConverseRequest() isConverseRequest_ConverseRequest {
@@ -507,11 +651,11 @@ func _ConverseRequest_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.ConverseRequest.(type) {
 	case *ConverseRequest_Config:
 		s := proto.Size(x.Config)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ConverseRequest_AudioIn:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AudioIn)))
 		n += len(x.AudioIn)
 	case nil:
@@ -531,35 +675,63 @@ type ConverseResponse struct {
 	//	*ConverseResponse_EventType_
 	//	*ConverseResponse_AudioOut
 	//	*ConverseResponse_Result
-	ConverseResponse isConverseResponse_ConverseResponse `protobuf_oneof:"converse_response"`
+	ConverseResponse     isConverseResponse_ConverseResponse `protobuf_oneof:"converse_response"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
+}
+
+func (m *ConverseResponse) Reset()         { *m = ConverseResponse{} }
+func (m *ConverseResponse) String() string { return proto.CompactTextString(m) }
+func (*ConverseResponse) ProtoMessage()    {}
+func (*ConverseResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_1e1f50e651d7eaee, []int{7}
+}
+func (m *ConverseResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConverseResponse.Unmarshal(m, b)
+}
+func (m *ConverseResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConverseResponse.Marshal(b, m, deterministic)
+}
+func (dst *ConverseResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConverseResponse.Merge(dst, src)
+}
+func (m *ConverseResponse) XXX_Size() int {
+	return xxx_messageInfo_ConverseResponse.Size(m)
+}
+func (m *ConverseResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConverseResponse.DiscardUnknown(m)
 }
 
-func (m *ConverseResponse) Reset()                    { *m = ConverseResponse{} }
-func (m *ConverseResponse) String() string            { return proto.CompactTextString(m) }
-func (*ConverseResponse) ProtoMessage()               {}
-func (*ConverseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ConverseResponse proto.InternalMessageInfo
 
 type isConverseResponse_ConverseResponse interface {
 	isConverseResponse_ConverseResponse()
 }
 
 type ConverseResponse_Error struct {
-	Error *google_rpc.Status `protobuf:"bytes,1,opt,name=error,oneof"`
+	Error *status.Status `protobuf:"bytes,1,opt,name=error,proto3,oneof"`
 }
+
 type ConverseResponse_EventType_ struct {
-	EventType ConverseResponse_EventType `protobuf:"varint,2,opt,name=event_type,json=eventType,enum=google.assistant.embedded.v1alpha1.ConverseResponse_EventType,oneof"`
+	EventType ConverseResponse_EventType `protobuf:"varint,2,opt,name=event_type,json=eventType,proto3,enum=google.assistant.embedded.v1alpha1.ConverseResponse_EventType,oneof"`
 }
+
 type ConverseResponse_AudioOut struct {
-	AudioOut *AudioOut `protobuf:"bytes,3,opt,name=audio_out,json=audioOut,oneof"`
+	AudioOut *AudioOut `protobuf:"bytes,3,opt,name=audio_out,json=audioOut,proto3,oneof"`
 }
+
 type ConverseResponse_Result struct {
-	Result *ConverseResult `protobuf:"bytes,5,opt,name=result,oneof"`
+	Result *ConverseResult `protobuf:"bytes,5,opt,name=result,proto3,oneof"`
 }
 
-func (*ConverseResponse_Error) isConverseResponse_ConverseResponse()      {}
+func (*ConverseResponse_Error) isConverseResponse_ConverseResponse() {}
+
 func (*ConverseResponse_EventType_) isConverseResponse_ConverseResponse() {}
-func (*ConverseResponse_AudioOut) isConverseResponse_ConverseResponse()   {}
-func (*ConverseResponse_Result) isConverseResponse_ConverseResponse()     {}
+
+func (*ConverseResponse_AudioOut) isConverseResponse_ConverseResponse() {}
+
+func (*ConverseResponse_Result) isConverseResponse_ConverseResponse() {}
 
 func (m *ConverseResponse) GetConverseResponse() isConverseResponse_ConverseResponse {
 	if m != nil {
@@ -568,7 +740,7 @@ func (m *ConverseResponse) GetConverseResponse() isConverseResponse_ConverseResp
 	return nil
 }
 
-func (m *ConverseResponse) GetError() *google_rpc.Status {
+func (m *ConverseResponse) GetError() *status.Status {
 	if x, ok := m.GetConverseResponse().(*ConverseResponse_Error); ok {
 		return x.Error
 	}
@@ -642,7 +814,7 @@ func _ConverseResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *pro
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_rpc.Status)
+		msg := new(status.Status)
 		err := b.DecodeMessage(msg)
 		m.ConverseResponse = &ConverseResponse_Error{msg}
 		return true, err
@@ -680,20 +852,20 @@ func _ConverseResponse_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.ConverseResponse.(type) {
 	case *ConverseResponse_Error:
 		s := proto.Size(x.Error)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ConverseResponse_EventType_:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.EventType))
 	case *ConverseResponse_AudioOut:
 		s := proto.Size(x.AudioOut)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ConverseResponse_Result:
 		s := proto.Size(x.Result)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -726,8 +898,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for EmbeddedAssistant service
-
+// EmbeddedAssistantClient is the client API for EmbeddedAssistant service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type EmbeddedAssistantClient interface {
 	// Initiates or continues a conversation with the embedded assistant service.
 	// Each call performs one round-trip, sending an audio request to the service
@@ -782,7 +955,7 @@ func NewEmbeddedAssistantClient(cc *grpc.ClientConn) EmbeddedAssistantClient {
 }
 
 func (c *embeddedAssistantClient) Converse(ctx context.Context, opts ...grpc.CallOption) (EmbeddedAssistant_ConverseClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_EmbeddedAssistant_serviceDesc.Streams[0], c.cc, "/google.assistant.embedded.v1alpha1.EmbeddedAssistant/Converse", opts...)
+	stream, err := c.cc.NewStream(ctx, &_EmbeddedAssistant_serviceDesc.Streams[0], "/google.assistant.embedded.v1alpha1.EmbeddedAssistant/Converse", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -812,8 +985,7 @@ func (x *embeddedAssistantConverseClient) Recv() (*ConverseResponse, error) {
 	return m, nil
 }
 
-// Server API for EmbeddedAssistant service
-
+// EmbeddedAssistantServer is the server API for EmbeddedAssistant service.
 type EmbeddedAssistantServer interface {
 	// Initiates or continues a conversation with the embedded assistant service.
 	// Each call performs one round-trip, sending an audio request to the service
@@ -905,10 +1077,10 @@ var _EmbeddedAssistant_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/assistant/embedded/v1alpha1/embedded_assistant.proto", fileDescriptor0)
+	proto.RegisterFile("google/assistant/embedded/v1alpha1/embedded_assistant.proto", fileDescriptor_embedded_assistant_1e1f50e651d7eaee)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_embedded_assistant_1e1f50e651d7eaee = []byte{
 	// 892 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x51, 0x73, 0xdb, 0x44,
 	0x10, 0xb6, 0xec, 0xa6, 0xb5, 0xb7, 0x89, 0x2c, 0x5f, 0x33, 0x90, 0x49, 0x61, 0x60, 0xf4, 0xc0,
diff --git a/vendor/google.golang.org/genproto/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go b/vendor/google.golang.org/genproto/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
index b48a959a..a46dfa66 100644
--- a/vendor/google.golang.org/genproto/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/assistant/embedded/v1alpha2/embedded_assistant.pb.go
@@ -1,33 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/assistant/embedded/v1alpha2/embedded_assistant.proto
 
-/*
-Package embedded is a generated protocol buffer package.
-
-It is generated from these files:
-	google/assistant/embedded/v1alpha2/embedded_assistant.proto
-
-It has these top-level messages:
-	AssistConfig
-	AudioInConfig
-	AudioOutConfig
-	DialogStateIn
-	AudioOut
-	DialogStateOut
-	AssistRequest
-	AssistResponse
-	SpeechRecognitionResult
-	DeviceConfig
-	DeviceAction
-	DeviceLocation
-*/
-package embedded
+package embedded // import "google.golang.org/genproto/googleapis/assistant/embedded/v1alpha2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_type "google.golang.org/genproto/googleapis/type/latlng"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
 
 import (
 	context "golang.org/x/net/context"
@@ -45,8 +25,39 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
+// Indicates the type of event.
+type AssistResponse_EventType int32
+
+const (
+	// No event specified.
+	AssistResponse_EVENT_TYPE_UNSPECIFIED AssistResponse_EventType = 0
+	// This event indicates that the server has detected the end of the user's
+	// speech utterance and expects no additional speech. Therefore, the server
+	// will not process additional audio (although it may subsequently return
+	// additional results). The client should stop sending additional audio
+	// data, half-close the gRPC connection, and wait for any additional results
+	// until the server closes the gRPC connection.
+	AssistResponse_END_OF_UTTERANCE AssistResponse_EventType = 1
+)
+
+var AssistResponse_EventType_name = map[int32]string{
+	0: "EVENT_TYPE_UNSPECIFIED",
+	1: "END_OF_UTTERANCE",
+}
+var AssistResponse_EventType_value = map[string]int32{
+	"EVENT_TYPE_UNSPECIFIED": 0,
+	"END_OF_UTTERANCE":       1,
+}
+
+func (x AssistResponse_EventType) String() string {
+	return proto.EnumName(AssistResponse_EventType_name, int32(x))
+}
+func (AssistResponse_EventType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{1, 0}
+}
+
 // Audio encoding of the data sent in the audio message.
-// Audio must be one-channel (mono). The only language supported is "en-US".
+// Audio must be one-channel (mono).
 type AudioInConfig_Encoding int32
 
 const (
@@ -79,7 +90,9 @@ var AudioInConfig_Encoding_value = map[string]int32{
 func (x AudioInConfig_Encoding) String() string {
 	return proto.EnumName(AudioInConfig_Encoding_name, int32(x))
 }
-func (AudioInConfig_Encoding) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (AudioInConfig_Encoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{4, 0}
+}
 
 // Audio encoding of the data returned in the audio message. All encodings are
 // raw audio bytes with no header, except as indicated below.
@@ -115,7 +128,72 @@ var AudioOutConfig_Encoding_value = map[string]int32{
 func (x AudioOutConfig_Encoding) String() string {
 	return proto.EnumName(AudioOutConfig_Encoding_name, int32(x))
 }
-func (AudioOutConfig_Encoding) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (AudioOutConfig_Encoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{5, 0}
+}
+
+// Possible modes for visual screen-output on the device.
+type ScreenOutConfig_ScreenMode int32
+
+const (
+	// No video mode specified.
+	// The Assistant may respond as if in `OFF` mode.
+	ScreenOutConfig_SCREEN_MODE_UNSPECIFIED ScreenOutConfig_ScreenMode = 0
+	// Screen is off (or has brightness or other settings set so low it is
+	// not visible). The Assistant will typically not return a screen response
+	// in this mode.
+	ScreenOutConfig_OFF ScreenOutConfig_ScreenMode = 1
+	// The Assistant will typically return a partial-screen response in this
+	// mode.
+	ScreenOutConfig_PLAYING ScreenOutConfig_ScreenMode = 3
+)
+
+var ScreenOutConfig_ScreenMode_name = map[int32]string{
+	0: "SCREEN_MODE_UNSPECIFIED",
+	1: "OFF",
+	3: "PLAYING",
+}
+var ScreenOutConfig_ScreenMode_value = map[string]int32{
+	"SCREEN_MODE_UNSPECIFIED": 0,
+	"OFF":     1,
+	"PLAYING": 3,
+}
+
+func (x ScreenOutConfig_ScreenMode) String() string {
+	return proto.EnumName(ScreenOutConfig_ScreenMode_name, int32(x))
+}
+func (ScreenOutConfig_ScreenMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{6, 0}
+}
+
+// Possible formats of the screen data.
+type ScreenOut_Format int32
+
+const (
+	// No format specified.
+	ScreenOut_FORMAT_UNSPECIFIED ScreenOut_Format = 0
+	// Data will contain a fully-formed HTML5 layout encoded in UTF-8, e.g.
+	// `<html><body><div>...</div></body></html>`. It is intended to be rendered
+	// along with the audio response. Note that HTML5 doctype should be included
+	// in the actual HTML data.
+	ScreenOut_HTML ScreenOut_Format = 1
+)
+
+var ScreenOut_Format_name = map[int32]string{
+	0: "FORMAT_UNSPECIFIED",
+	1: "HTML",
+}
+var ScreenOut_Format_value = map[string]int32{
+	"FORMAT_UNSPECIFIED": 0,
+	"HTML":               1,
+}
+
+func (x ScreenOut_Format) String() string {
+	return proto.EnumName(ScreenOut_Format_name, int32(x))
+}
+func (ScreenOut_Format) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{10, 0}
+}
 
 // Possible states of the microphone after a `Assist` RPC completes.
 type DialogStateOut_MicrophoneMode int32
@@ -147,37 +225,304 @@ func (x DialogStateOut_MicrophoneMode) String() string {
 	return proto.EnumName(DialogStateOut_MicrophoneMode_name, int32(x))
 }
 func (DialogStateOut_MicrophoneMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 0}
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{13, 0}
 }
 
-// Indicates the type of event.
-type AssistResponse_EventType int32
+// The top-level message sent by the client. Clients must send at least two, and
+// typically numerous `AssistRequest` messages. The first message must
+// contain a `config` message and must not contain `audio_in` data. All
+// subsequent messages must contain `audio_in` data and must not contain a
+// `config` message.
+type AssistRequest struct {
+	// Exactly one of these fields must be specified in each `AssistRequest`.
+	//
+	// Types that are valid to be assigned to Type:
+	//	*AssistRequest_Config
+	//	*AssistRequest_AudioIn
+	Type                 isAssistRequest_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
 
-const (
-	// No event specified.
-	AssistResponse_EVENT_TYPE_UNSPECIFIED AssistResponse_EventType = 0
-	// This event indicates that the server has detected the end of the user's
-	// speech utterance and expects no additional speech. Therefore, the server
-	// will not process additional audio (although it may subsequently return
-	// additional results). The client should stop sending additional audio
-	// data, half-close the gRPC connection, and wait for any additional results
-	// until the server closes the gRPC connection.
-	AssistResponse_END_OF_UTTERANCE AssistResponse_EventType = 1
-)
+func (m *AssistRequest) Reset()         { *m = AssistRequest{} }
+func (m *AssistRequest) String() string { return proto.CompactTextString(m) }
+func (*AssistRequest) ProtoMessage()    {}
+func (*AssistRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{0}
+}
+func (m *AssistRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AssistRequest.Unmarshal(m, b)
+}
+func (m *AssistRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AssistRequest.Marshal(b, m, deterministic)
+}
+func (dst *AssistRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssistRequest.Merge(dst, src)
+}
+func (m *AssistRequest) XXX_Size() int {
+	return xxx_messageInfo_AssistRequest.Size(m)
+}
+func (m *AssistRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AssistRequest.DiscardUnknown(m)
+}
 
-var AssistResponse_EventType_name = map[int32]string{
-	0: "EVENT_TYPE_UNSPECIFIED",
-	1: "END_OF_UTTERANCE",
+var xxx_messageInfo_AssistRequest proto.InternalMessageInfo
+
+type isAssistRequest_Type interface {
+	isAssistRequest_Type()
 }
-var AssistResponse_EventType_value = map[string]int32{
-	"EVENT_TYPE_UNSPECIFIED": 0,
-	"END_OF_UTTERANCE":       1,
+
+type AssistRequest_Config struct {
+	Config *AssistConfig `protobuf:"bytes,1,opt,name=config,proto3,oneof"`
 }
 
-func (x AssistResponse_EventType) String() string {
-	return proto.EnumName(AssistResponse_EventType_name, int32(x))
+type AssistRequest_AudioIn struct {
+	AudioIn []byte `protobuf:"bytes,2,opt,name=audio_in,json=audioIn,proto3,oneof"`
+}
+
+func (*AssistRequest_Config) isAssistRequest_Type() {}
+
+func (*AssistRequest_AudioIn) isAssistRequest_Type() {}
+
+func (m *AssistRequest) GetType() isAssistRequest_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *AssistRequest) GetConfig() *AssistConfig {
+	if x, ok := m.GetType().(*AssistRequest_Config); ok {
+		return x.Config
+	}
+	return nil
+}
+
+func (m *AssistRequest) GetAudioIn() []byte {
+	if x, ok := m.GetType().(*AssistRequest_AudioIn); ok {
+		return x.AudioIn
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*AssistRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _AssistRequest_OneofMarshaler, _AssistRequest_OneofUnmarshaler, _AssistRequest_OneofSizer, []interface{}{
+		(*AssistRequest_Config)(nil),
+		(*AssistRequest_AudioIn)(nil),
+	}
+}
+
+func _AssistRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*AssistRequest)
+	// type
+	switch x := m.Type.(type) {
+	case *AssistRequest_Config:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Config); err != nil {
+			return err
+		}
+	case *AssistRequest_AudioIn:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.AudioIn)
+	case nil:
+	default:
+		return fmt.Errorf("AssistRequest.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _AssistRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*AssistRequest)
+	switch tag {
+	case 1: // type.config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AssistConfig)
+		err := b.DecodeMessage(msg)
+		m.Type = &AssistRequest_Config{msg}
+		return true, err
+	case 2: // type.audio_in
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.Type = &AssistRequest_AudioIn{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _AssistRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*AssistRequest)
+	// type
+	switch x := m.Type.(type) {
+	case *AssistRequest_Config:
+		s := proto.Size(x.Config)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *AssistRequest_AudioIn:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.AudioIn)))
+		n += len(x.AudioIn)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The top-level message received by the client. A series of one or more
+// `AssistResponse` messages are streamed back to the client.
+type AssistResponse struct {
+	// *Output-only* Indicates the type of event.
+	EventType AssistResponse_EventType `protobuf:"varint,1,opt,name=event_type,json=eventType,proto3,enum=google.assistant.embedded.v1alpha2.AssistResponse_EventType" json:"event_type,omitempty"`
+	// *Output-only* The audio containing the Assistant's response to the query.
+	AudioOut *AudioOut `protobuf:"bytes,3,opt,name=audio_out,json=audioOut,proto3" json:"audio_out,omitempty"`
+	// *Output-only* Contains the Assistant's visual response to the query.
+	ScreenOut *ScreenOut `protobuf:"bytes,4,opt,name=screen_out,json=screenOut,proto3" json:"screen_out,omitempty"`
+	// *Output-only* Contains the action triggered by the query with the
+	// appropriate payloads and semantic parsing.
+	DeviceAction *DeviceAction `protobuf:"bytes,6,opt,name=device_action,json=deviceAction,proto3" json:"device_action,omitempty"`
+	// *Output-only* This repeated list contains zero or more speech recognition
+	// results that correspond to consecutive portions of the audio currently
+	// being processed, starting with the portion corresponding to the earliest
+	// audio (and most stable portion) to the portion corresponding to the most
+	// recent audio. The strings can be concatenated to view the full
+	// in-progress response. When the speech recognition completes, this list
+	// will contain one item with `stability` of `1.0`.
+	SpeechResults []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=speech_results,json=speechResults,proto3" json:"speech_results,omitempty"`
+	// *Output-only* Contains output related to the user's query.
+	DialogStateOut *DialogStateOut `protobuf:"bytes,5,opt,name=dialog_state_out,json=dialogStateOut,proto3" json:"dialog_state_out,omitempty"`
+	// *Output-only* Debugging info for developer. Only returned if request set
+	// `return_debug_info` to true.
+	DebugInfo            *DebugInfo `protobuf:"bytes,8,opt,name=debug_info,json=debugInfo,proto3" json:"debug_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *AssistResponse) Reset()         { *m = AssistResponse{} }
+func (m *AssistResponse) String() string { return proto.CompactTextString(m) }
+func (*AssistResponse) ProtoMessage()    {}
+func (*AssistResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{1}
+}
+func (m *AssistResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AssistResponse.Unmarshal(m, b)
+}
+func (m *AssistResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AssistResponse.Marshal(b, m, deterministic)
+}
+func (dst *AssistResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssistResponse.Merge(dst, src)
+}
+func (m *AssistResponse) XXX_Size() int {
+	return xxx_messageInfo_AssistResponse.Size(m)
+}
+func (m *AssistResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AssistResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AssistResponse proto.InternalMessageInfo
+
+func (m *AssistResponse) GetEventType() AssistResponse_EventType {
+	if m != nil {
+		return m.EventType
+	}
+	return AssistResponse_EVENT_TYPE_UNSPECIFIED
+}
+
+func (m *AssistResponse) GetAudioOut() *AudioOut {
+	if m != nil {
+		return m.AudioOut
+	}
+	return nil
+}
+
+func (m *AssistResponse) GetScreenOut() *ScreenOut {
+	if m != nil {
+		return m.ScreenOut
+	}
+	return nil
+}
+
+func (m *AssistResponse) GetDeviceAction() *DeviceAction {
+	if m != nil {
+		return m.DeviceAction
+	}
+	return nil
+}
+
+func (m *AssistResponse) GetSpeechResults() []*SpeechRecognitionResult {
+	if m != nil {
+		return m.SpeechResults
+	}
+	return nil
+}
+
+func (m *AssistResponse) GetDialogStateOut() *DialogStateOut {
+	if m != nil {
+		return m.DialogStateOut
+	}
+	return nil
+}
+
+func (m *AssistResponse) GetDebugInfo() *DebugInfo {
+	if m != nil {
+		return m.DebugInfo
+	}
+	return nil
+}
+
+// Debug info for developer. Only returned if request set `return_debug_info`
+// to true.
+type DebugInfo struct {
+	// The original JSON response from an Action-on-Google agent to Google server.
+	// See
+	// https://developers.google.com/actions/reference/rest/Shared.Types/AppResponse.
+	// It will only be populated if the request maker owns the AoG project and the
+	// AoG project is in preview mode.
+	AogAgentToAssistantJson string   `protobuf:"bytes,1,opt,name=aog_agent_to_assistant_json,json=aogAgentToAssistantJson,proto3" json:"aog_agent_to_assistant_json,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
+	XXX_unrecognized        []byte   `json:"-"`
+	XXX_sizecache           int32    `json:"-"`
+}
+
+func (m *DebugInfo) Reset()         { *m = DebugInfo{} }
+func (m *DebugInfo) String() string { return proto.CompactTextString(m) }
+func (*DebugInfo) ProtoMessage()    {}
+func (*DebugInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{2}
+}
+func (m *DebugInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DebugInfo.Unmarshal(m, b)
+}
+func (m *DebugInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DebugInfo.Marshal(b, m, deterministic)
+}
+func (dst *DebugInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebugInfo.Merge(dst, src)
+}
+func (m *DebugInfo) XXX_Size() int {
+	return xxx_messageInfo_DebugInfo.Size(m)
+}
+func (m *DebugInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_DebugInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DebugInfo proto.InternalMessageInfo
+
+func (m *DebugInfo) GetAogAgentToAssistantJson() string {
+	if m != nil {
+		return m.AogAgentToAssistantJson
+	}
+	return ""
 }
-func (AssistResponse_EventType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
 
 // Specifies how to process the `AssistRequest` messages.
 type AssistConfig struct {
@@ -186,31 +531,60 @@ type AssistConfig struct {
 	//	*AssistConfig_TextQuery
 	Type isAssistConfig_Type `protobuf_oneof:"type"`
 	// *Required* Specifies how to format the audio that will be returned.
-	AudioOutConfig *AudioOutConfig `protobuf:"bytes,2,opt,name=audio_out_config,json=audioOutConfig" json:"audio_out_config,omitempty"`
+	AudioOutConfig *AudioOutConfig `protobuf:"bytes,2,opt,name=audio_out_config,json=audioOutConfig,proto3" json:"audio_out_config,omitempty"`
+	// *Optional* Specifies the desired format to use when server returns a
+	// visual screen response.
+	ScreenOutConfig *ScreenOutConfig `protobuf:"bytes,8,opt,name=screen_out_config,json=screenOutConfig,proto3" json:"screen_out_config,omitempty"`
 	// *Required* Represents the current dialog state.
-	DialogStateIn *DialogStateIn `protobuf:"bytes,3,opt,name=dialog_state_in,json=dialogStateIn" json:"dialog_state_in,omitempty"`
+	DialogStateIn *DialogStateIn `protobuf:"bytes,3,opt,name=dialog_state_in,json=dialogStateIn,proto3" json:"dialog_state_in,omitempty"`
 	// Device configuration that uniquely identifies a specific device.
-	DeviceConfig *DeviceConfig `protobuf:"bytes,4,opt,name=device_config,json=deviceConfig" json:"device_config,omitempty"`
+	DeviceConfig *DeviceConfig `protobuf:"bytes,4,opt,name=device_config,json=deviceConfig,proto3" json:"device_config,omitempty"`
+	// *Optional* Debugging parameters for the whole `Assist` RPC.
+	DebugConfig          *DebugConfig `protobuf:"bytes,5,opt,name=debug_config,json=debugConfig,proto3" json:"debug_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AssistConfig) Reset()         { *m = AssistConfig{} }
+func (m *AssistConfig) String() string { return proto.CompactTextString(m) }
+func (*AssistConfig) ProtoMessage()    {}
+func (*AssistConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{3}
+}
+func (m *AssistConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AssistConfig.Unmarshal(m, b)
+}
+func (m *AssistConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AssistConfig.Marshal(b, m, deterministic)
+}
+func (dst *AssistConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AssistConfig.Merge(dst, src)
+}
+func (m *AssistConfig) XXX_Size() int {
+	return xxx_messageInfo_AssistConfig.Size(m)
+}
+func (m *AssistConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AssistConfig.DiscardUnknown(m)
 }
 
-func (m *AssistConfig) Reset()                    { *m = AssistConfig{} }
-func (m *AssistConfig) String() string            { return proto.CompactTextString(m) }
-func (*AssistConfig) ProtoMessage()               {}
-func (*AssistConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_AssistConfig proto.InternalMessageInfo
 
 type isAssistConfig_Type interface {
 	isAssistConfig_Type()
 }
 
 type AssistConfig_AudioInConfig struct {
-	AudioInConfig *AudioInConfig `protobuf:"bytes,1,opt,name=audio_in_config,json=audioInConfig,oneof"`
+	AudioInConfig *AudioInConfig `protobuf:"bytes,1,opt,name=audio_in_config,json=audioInConfig,proto3,oneof"`
 }
+
 type AssistConfig_TextQuery struct {
-	TextQuery string `protobuf:"bytes,6,opt,name=text_query,json=textQuery,oneof"`
+	TextQuery string `protobuf:"bytes,6,opt,name=text_query,json=textQuery,proto3,oneof"`
 }
 
 func (*AssistConfig_AudioInConfig) isAssistConfig_Type() {}
-func (*AssistConfig_TextQuery) isAssistConfig_Type()     {}
+
+func (*AssistConfig_TextQuery) isAssistConfig_Type() {}
 
 func (m *AssistConfig) GetType() isAssistConfig_Type {
 	if m != nil {
@@ -240,6 +614,13 @@ func (m *AssistConfig) GetAudioOutConfig() *AudioOutConfig {
 	return nil
 }
 
+func (m *AssistConfig) GetScreenOutConfig() *ScreenOutConfig {
+	if m != nil {
+		return m.ScreenOutConfig
+	}
+	return nil
+}
+
 func (m *AssistConfig) GetDialogStateIn() *DialogStateIn {
 	if m != nil {
 		return m.DialogStateIn
@@ -254,6 +635,13 @@ func (m *AssistConfig) GetDeviceConfig() *DeviceConfig {
 	return nil
 }
 
+func (m *AssistConfig) GetDebugConfig() *DebugConfig {
+	if m != nil {
+		return m.DebugConfig
+	}
+	return nil
+}
+
 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*AssistConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _AssistConfig_OneofMarshaler, _AssistConfig_OneofUnmarshaler, _AssistConfig_OneofSizer, []interface{}{
@@ -310,11 +698,11 @@ func _AssistConfig_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Type.(type) {
 	case *AssistConfig_AudioInConfig:
 		s := proto.Size(x.AudioInConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AssistConfig_TextQuery:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.TextQuery)))
 		n += len(x.TextQuery)
 	case nil:
@@ -329,19 +717,41 @@ func _AssistConfig_OneofSizer(msg proto.Message) (n int) {
 // [best practices](https://developers.google.com/assistant/sdk/guides/service/python/best-practices/audio).
 type AudioInConfig struct {
 	// *Required* Encoding of audio data sent in all `audio_in` messages.
-	Encoding AudioInConfig_Encoding `protobuf:"varint,1,opt,name=encoding,enum=google.assistant.embedded.v1alpha2.AudioInConfig_Encoding" json:"encoding,omitempty"`
+	Encoding AudioInConfig_Encoding `protobuf:"varint,1,opt,name=encoding,proto3,enum=google.assistant.embedded.v1alpha2.AudioInConfig_Encoding" json:"encoding,omitempty"`
 	// *Required* Sample rate (in Hertz) of the audio data sent in all `audio_in`
 	// messages. Valid values are from 16000-24000, but 16000 is optimal.
 	// For best results, set the sampling rate of the audio source to 16000 Hz.
 	// If that's not possible, use the native sample rate of the audio source
 	// (instead of re-sampling).
-	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz" json:"sample_rate_hertz,omitempty"`
+	SampleRateHertz      int32    `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AudioInConfig) Reset()         { *m = AudioInConfig{} }
+func (m *AudioInConfig) String() string { return proto.CompactTextString(m) }
+func (*AudioInConfig) ProtoMessage()    {}
+func (*AudioInConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{4}
+}
+func (m *AudioInConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AudioInConfig.Unmarshal(m, b)
+}
+func (m *AudioInConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AudioInConfig.Marshal(b, m, deterministic)
+}
+func (dst *AudioInConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioInConfig.Merge(dst, src)
+}
+func (m *AudioInConfig) XXX_Size() int {
+	return xxx_messageInfo_AudioInConfig.Size(m)
+}
+func (m *AudioInConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AudioInConfig.DiscardUnknown(m)
 }
 
-func (m *AudioInConfig) Reset()                    { *m = AudioInConfig{} }
-func (m *AudioInConfig) String() string            { return proto.CompactTextString(m) }
-func (*AudioInConfig) ProtoMessage()               {}
-func (*AudioInConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_AudioInConfig proto.InternalMessageInfo
 
 func (m *AudioInConfig) GetEncoding() AudioInConfig_Encoding {
 	if m != nil {
@@ -362,19 +772,41 @@ func (m *AudioInConfig) GetSampleRateHertz() int32 {
 type AudioOutConfig struct {
 	// *Required* The encoding of audio data to be returned in all `audio_out`
 	// messages.
-	Encoding AudioOutConfig_Encoding `protobuf:"varint,1,opt,name=encoding,enum=google.assistant.embedded.v1alpha2.AudioOutConfig_Encoding" json:"encoding,omitempty"`
+	Encoding AudioOutConfig_Encoding `protobuf:"varint,1,opt,name=encoding,proto3,enum=google.assistant.embedded.v1alpha2.AudioOutConfig_Encoding" json:"encoding,omitempty"`
 	// *Required* The sample rate in Hertz of the audio data returned in
 	// `audio_out` messages. Valid values are: 16000-24000.
-	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz" json:"sample_rate_hertz,omitempty"`
+	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
 	// *Required* Current volume setting of the device's audio output.
 	// Valid values are 1 to 100 (corresponding to 1% to 100%).
-	VolumePercentage int32 `protobuf:"varint,3,opt,name=volume_percentage,json=volumePercentage" json:"volume_percentage,omitempty"`
+	VolumePercentage     int32    `protobuf:"varint,3,opt,name=volume_percentage,json=volumePercentage,proto3" json:"volume_percentage,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AudioOutConfig) Reset()         { *m = AudioOutConfig{} }
+func (m *AudioOutConfig) String() string { return proto.CompactTextString(m) }
+func (*AudioOutConfig) ProtoMessage()    {}
+func (*AudioOutConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{5}
+}
+func (m *AudioOutConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AudioOutConfig.Unmarshal(m, b)
+}
+func (m *AudioOutConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AudioOutConfig.Marshal(b, m, deterministic)
+}
+func (dst *AudioOutConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioOutConfig.Merge(dst, src)
+}
+func (m *AudioOutConfig) XXX_Size() int {
+	return xxx_messageInfo_AudioOutConfig.Size(m)
+}
+func (m *AudioOutConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AudioOutConfig.DiscardUnknown(m)
 }
 
-func (m *AudioOutConfig) Reset()                    { *m = AudioOutConfig{} }
-func (m *AudioOutConfig) String() string            { return proto.CompactTextString(m) }
-func (*AudioOutConfig) ProtoMessage()               {}
-func (*AudioOutConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_AudioOutConfig proto.InternalMessageInfo
 
 func (m *AudioOutConfig) GetEncoding() AudioOutConfig_Encoding {
 	if m != nil {
@@ -397,6 +829,47 @@ func (m *AudioOutConfig) GetVolumePercentage() int32 {
 	return 0
 }
 
+// Specifies the desired format for the server to use when it returns
+// `screen_out` response.
+type ScreenOutConfig struct {
+	// Current visual screen-mode for the device while issuing the query.
+	ScreenMode           ScreenOutConfig_ScreenMode `protobuf:"varint,1,opt,name=screen_mode,json=screenMode,proto3,enum=google.assistant.embedded.v1alpha2.ScreenOutConfig_ScreenMode" json:"screen_mode,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *ScreenOutConfig) Reset()         { *m = ScreenOutConfig{} }
+func (m *ScreenOutConfig) String() string { return proto.CompactTextString(m) }
+func (*ScreenOutConfig) ProtoMessage()    {}
+func (*ScreenOutConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{6}
+}
+func (m *ScreenOutConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScreenOutConfig.Unmarshal(m, b)
+}
+func (m *ScreenOutConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScreenOutConfig.Marshal(b, m, deterministic)
+}
+func (dst *ScreenOutConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScreenOutConfig.Merge(dst, src)
+}
+func (m *ScreenOutConfig) XXX_Size() int {
+	return xxx_messageInfo_ScreenOutConfig.Size(m)
+}
+func (m *ScreenOutConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScreenOutConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScreenOutConfig proto.InternalMessageInfo
+
+func (m *ScreenOutConfig) GetScreenMode() ScreenOutConfig_ScreenMode {
+	if m != nil {
+		return m.ScreenMode
+	}
+	return ScreenOutConfig_SCREEN_MODE_UNSPECIFIED
+}
+
 // Provides information about the current dialog state.
 type DialogStateIn struct {
 	// *Required* This field must always be set to the
@@ -406,20 +879,48 @@ type DialogStateIn struct {
 	// device after it was first setup and/or a factory-default reset.
 	ConversationState []byte `protobuf:"bytes,1,opt,name=conversation_state,json=conversationState,proto3" json:"conversation_state,omitempty"`
 	// *Required* Language of the request in
-	// [IETF BCP 47 syntax](https://tools.ietf.org/html/bcp47). For example:
-	// "en-US". If you have selected a language for this `device_id` using the
-	// [Settings](https://developers.google.com/assistant/sdk/guides/assistant-settings)
+	// [IETF BCP 47 syntax](https://tools.ietf.org/html/bcp47) (for example,
+	// "en-US"). See [Language Support](https://developers.google.com/assistant/sdk/reference/rpc/languages)
+	// for more information. If you have selected a language for this `device_id`
+	// using the [Settings](https://developers.google.com/assistant/sdk/reference/assistant-app/assistant-settings)
 	// menu in your phone's Google Assistant app, that selection will override
 	// this value.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// *Optional* Location of the device where the query originated.
-	DeviceLocation *DeviceLocation `protobuf:"bytes,5,opt,name=device_location,json=deviceLocation" json:"device_location,omitempty"`
+	DeviceLocation *DeviceLocation `protobuf:"bytes,5,opt,name=device_location,json=deviceLocation,proto3" json:"device_location,omitempty"`
+	// *Optional* If true, the server will treat the request as a new conversation
+	// and not use state from the prior request. Set this field to true when the
+	// conversation should be restarted, such as after a device reboot, or after a
+	// significant lapse of time since the prior query.
+	IsNewConversation    bool     `protobuf:"varint,7,opt,name=is_new_conversation,json=isNewConversation,proto3" json:"is_new_conversation,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DialogStateIn) Reset()                    { *m = DialogStateIn{} }
-func (m *DialogStateIn) String() string            { return proto.CompactTextString(m) }
-func (*DialogStateIn) ProtoMessage()               {}
-func (*DialogStateIn) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *DialogStateIn) Reset()         { *m = DialogStateIn{} }
+func (m *DialogStateIn) String() string { return proto.CompactTextString(m) }
+func (*DialogStateIn) ProtoMessage()    {}
+func (*DialogStateIn) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{7}
+}
+func (m *DialogStateIn) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DialogStateIn.Unmarshal(m, b)
+}
+func (m *DialogStateIn) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DialogStateIn.Marshal(b, m, deterministic)
+}
+func (dst *DialogStateIn) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DialogStateIn.Merge(dst, src)
+}
+func (m *DialogStateIn) XXX_Size() int {
+	return xxx_messageInfo_DialogStateIn.Size(m)
+}
+func (m *DialogStateIn) XXX_DiscardUnknown() {
+	xxx_messageInfo_DialogStateIn.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DialogStateIn proto.InternalMessageInfo
 
 func (m *DialogStateIn) GetConversationState() []byte {
 	if m != nil {
@@ -442,292 +943,257 @@ func (m *DialogStateIn) GetDeviceLocation() *DeviceLocation {
 	return nil
 }
 
-// The audio containing the Assistant's response to the query. Sequential chunks
-// of audio data are received in sequential `AssistResponse` messages.
-type AudioOut struct {
-	// *Output-only* The audio data containing the Assistant's response to the
-	// query. Sequential chunks of audio data are received in sequential
-	// `AssistResponse` messages.
-	AudioData []byte `protobuf:"bytes,1,opt,name=audio_data,json=audioData,proto3" json:"audio_data,omitempty"`
-}
-
-func (m *AudioOut) Reset()                    { *m = AudioOut{} }
-func (m *AudioOut) String() string            { return proto.CompactTextString(m) }
-func (*AudioOut) ProtoMessage()               {}
-func (*AudioOut) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *AudioOut) GetAudioData() []byte {
+func (m *DialogStateIn) GetIsNewConversation() bool {
 	if m != nil {
-		return m.AudioData
+		return m.IsNewConversation
 	}
-	return nil
+	return false
 }
 
-// The dialog state resulting from the user's query. Multiple of these messages
-// may be received.
-type DialogStateOut struct {
-	// *Output-only* Supplemental display text from the Assistant. This could be
-	// the same as the speech spoken in `AssistResponse.audio_out` or it could
-	// be some additional information which aids the user's understanding.
-	SupplementalDisplayText string `protobuf:"bytes,1,opt,name=supplemental_display_text,json=supplementalDisplayText" json:"supplemental_display_text,omitempty"`
-	// *Output-only* State information for the subsequent `Assist` RPC. This
-	// value should be saved in the client and returned in the
-	// [`DialogStateIn.conversation_state`](#dialogstatein) field with the next
-	// `Assist` RPC. (The client does not need to interpret or otherwise use this
-	// value.) This information should be saved across device reboots. However,
-	// this value should be cleared (not saved in the client) during a
-	// factory-default reset.
-	ConversationState []byte `protobuf:"bytes,2,opt,name=conversation_state,json=conversationState,proto3" json:"conversation_state,omitempty"`
-	// *Output-only* Specifies the mode of the microphone after this `Assist`
-	// RPC is processed.
-	MicrophoneMode DialogStateOut_MicrophoneMode `protobuf:"varint,3,opt,name=microphone_mode,json=microphoneMode,enum=google.assistant.embedded.v1alpha2.DialogStateOut_MicrophoneMode" json:"microphone_mode,omitempty"`
-	// *Output-only* Updated volume level. The value will be 0 or omitted
-	// (indicating no change) unless a voice command such as *Increase the volume*
-	// or *Set volume level 4* was recognized, in which case the value will be
-	// between 1 and 100 (corresponding to the new volume level of 1% to 100%).
-	// Typically, a client should use this volume level when playing the
-	// `audio_out` data, and retain this value as the current volume level and
-	// supply it in the `AudioOutConfig` of the next `AssistRequest`. (Some
-	// clients may also implement other ways to allow the current volume level to
-	// be changed, for example, by providing a knob that the user can turn.)
-	VolumePercentage int32 `protobuf:"varint,4,opt,name=volume_percentage,json=volumePercentage" json:"volume_percentage,omitempty"`
+// *Required* Fields that identify the device to the Assistant.
+//
+// See also:
+//
+// *   [Register a Device - REST
+// API](https://developers.google.com/assistant/sdk/reference/device-registration/register-device-manual)
+// *   [Device Model and Instance
+// Schemas](https://developers.google.com/assistant/sdk/reference/device-registration/model-and-instance-schemas)
+// *   [Device
+// Proto](https://developers.google.com/assistant/sdk/reference/rpc/google.assistant.devices.v1alpha2#device)
+type DeviceConfig struct {
+	// *Required* Unique identifier for the device. The id length must be 128
+	// characters or less. Example: DBCDW098234. This MUST match the device_id
+	// returned from device registration. This device_id is used to match against
+	// the user's registered devices to lookup the supported traits and
+	// capabilities of this device. This information should not change across
+	// device reboots. However, it should not be saved across
+	// factory-default resets.
+	DeviceId string `protobuf:"bytes,1,opt,name=device_id,json=deviceId,proto3" json:"device_id,omitempty"`
+	// *Required* Unique identifier for the device model. The combination of
+	// device_model_id and device_id must have been previously associated through
+	// device registration.
+	DeviceModelId        string   `protobuf:"bytes,3,opt,name=device_model_id,json=deviceModelId,proto3" json:"device_model_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DialogStateOut) Reset()                    { *m = DialogStateOut{} }
-func (m *DialogStateOut) String() string            { return proto.CompactTextString(m) }
-func (*DialogStateOut) ProtoMessage()               {}
-func (*DialogStateOut) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *DialogStateOut) GetSupplementalDisplayText() string {
-	if m != nil {
-		return m.SupplementalDisplayText
-	}
-	return ""
+func (m *DeviceConfig) Reset()         { *m = DeviceConfig{} }
+func (m *DeviceConfig) String() string { return proto.CompactTextString(m) }
+func (*DeviceConfig) ProtoMessage()    {}
+func (*DeviceConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{8}
 }
-
-func (m *DialogStateOut) GetConversationState() []byte {
-	if m != nil {
-		return m.ConversationState
-	}
-	return nil
+func (m *DeviceConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceConfig.Unmarshal(m, b)
+}
+func (m *DeviceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceConfig.Marshal(b, m, deterministic)
+}
+func (dst *DeviceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceConfig.Merge(dst, src)
+}
+func (m *DeviceConfig) XXX_Size() int {
+	return xxx_messageInfo_DeviceConfig.Size(m)
+}
+func (m *DeviceConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceConfig.DiscardUnknown(m)
 }
 
-func (m *DialogStateOut) GetMicrophoneMode() DialogStateOut_MicrophoneMode {
+var xxx_messageInfo_DeviceConfig proto.InternalMessageInfo
+
+func (m *DeviceConfig) GetDeviceId() string {
 	if m != nil {
-		return m.MicrophoneMode
+		return m.DeviceId
 	}
-	return DialogStateOut_MICROPHONE_MODE_UNSPECIFIED
+	return ""
 }
 
-func (m *DialogStateOut) GetVolumePercentage() int32 {
+func (m *DeviceConfig) GetDeviceModelId() string {
 	if m != nil {
-		return m.VolumePercentage
+		return m.DeviceModelId
 	}
-	return 0
+	return ""
 }
 
-// The top-level message sent by the client. Clients must send at least two, and
-// typically numerous `AssistRequest` messages. The first message must
-// contain a `config` message and must not contain `audio_in` data. All
-// subsequent messages must contain `audio_in` data and must not contain a
-// `config` message.
-type AssistRequest struct {
-	// Exactly one of these fields must be specified in each `AssistRequest`.
-	//
-	// Types that are valid to be assigned to Type:
-	//	*AssistRequest_Config
-	//	*AssistRequest_AudioIn
-	Type isAssistRequest_Type `protobuf_oneof:"type"`
+// The audio containing the Assistant's response to the query. Sequential chunks
+// of audio data are received in sequential `AssistResponse` messages.
+type AudioOut struct {
+	// *Output-only* The audio data containing the Assistant's response to the
+	// query. Sequential chunks of audio data are received in sequential
+	// `AssistResponse` messages.
+	AudioData            []byte   `protobuf:"bytes,1,opt,name=audio_data,json=audioData,proto3" json:"audio_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AssistRequest) Reset()                    { *m = AssistRequest{} }
-func (m *AssistRequest) String() string            { return proto.CompactTextString(m) }
-func (*AssistRequest) ProtoMessage()               {}
-func (*AssistRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-type isAssistRequest_Type interface {
-	isAssistRequest_Type()
+func (m *AudioOut) Reset()         { *m = AudioOut{} }
+func (m *AudioOut) String() string { return proto.CompactTextString(m) }
+func (*AudioOut) ProtoMessage()    {}
+func (*AudioOut) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{9}
+}
+func (m *AudioOut) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AudioOut.Unmarshal(m, b)
 }
-
-type AssistRequest_Config struct {
-	Config *AssistConfig `protobuf:"bytes,1,opt,name=config,oneof"`
+func (m *AudioOut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AudioOut.Marshal(b, m, deterministic)
 }
-type AssistRequest_AudioIn struct {
-	AudioIn []byte `protobuf:"bytes,2,opt,name=audio_in,json=audioIn,proto3,oneof"`
+func (dst *AudioOut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioOut.Merge(dst, src)
+}
+func (m *AudioOut) XXX_Size() int {
+	return xxx_messageInfo_AudioOut.Size(m)
+}
+func (m *AudioOut) XXX_DiscardUnknown() {
+	xxx_messageInfo_AudioOut.DiscardUnknown(m)
 }
 
-func (*AssistRequest_Config) isAssistRequest_Type()  {}
-func (*AssistRequest_AudioIn) isAssistRequest_Type() {}
+var xxx_messageInfo_AudioOut proto.InternalMessageInfo
 
-func (m *AssistRequest) GetType() isAssistRequest_Type {
+func (m *AudioOut) GetAudioData() []byte {
 	if m != nil {
-		return m.Type
+		return m.AudioData
 	}
 	return nil
 }
 
-func (m *AssistRequest) GetConfig() *AssistConfig {
-	if x, ok := m.GetType().(*AssistRequest_Config); ok {
-		return x.Config
-	}
-	return nil
+// The Assistant's visual output response to query. Enabled by
+// `screen_out_config`.
+type ScreenOut struct {
+	// *Output-only* The format of the provided screen data.
+	Format ScreenOut_Format `protobuf:"varint,1,opt,name=format,proto3,enum=google.assistant.embedded.v1alpha2.ScreenOut_Format" json:"format,omitempty"`
+	// *Output-only* The raw screen data to be displayed as the result of the
+	// Assistant query.
+	Data                 []byte   `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AssistRequest) GetAudioIn() []byte {
-	if x, ok := m.GetType().(*AssistRequest_AudioIn); ok {
-		return x.AudioIn
-	}
-	return nil
+func (m *ScreenOut) Reset()         { *m = ScreenOut{} }
+func (m *ScreenOut) String() string { return proto.CompactTextString(m) }
+func (*ScreenOut) ProtoMessage()    {}
+func (*ScreenOut) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{10}
 }
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AssistRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AssistRequest_OneofMarshaler, _AssistRequest_OneofUnmarshaler, _AssistRequest_OneofSizer, []interface{}{
-		(*AssistRequest_Config)(nil),
-		(*AssistRequest_AudioIn)(nil),
-	}
+func (m *ScreenOut) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScreenOut.Unmarshal(m, b)
 }
-
-func _AssistRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AssistRequest)
-	// type
-	switch x := m.Type.(type) {
-	case *AssistRequest_Config:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Config); err != nil {
-			return err
-		}
-	case *AssistRequest_AudioIn:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AudioIn)
-	case nil:
-	default:
-		return fmt.Errorf("AssistRequest.Type has unexpected type %T", x)
-	}
-	return nil
+func (m *ScreenOut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScreenOut.Marshal(b, m, deterministic)
 }
-
-func _AssistRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AssistRequest)
-	switch tag {
-	case 1: // type.config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AssistConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &AssistRequest_Config{msg}
-		return true, err
-	case 2: // type.audio_in
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Type = &AssistRequest_AudioIn{x}
-		return true, err
-	default:
-		return false, nil
-	}
+func (dst *ScreenOut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScreenOut.Merge(dst, src)
 }
-
-func _AssistRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AssistRequest)
-	// type
-	switch x := m.Type.(type) {
-	case *AssistRequest_Config:
-		s := proto.Size(x.Config)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AssistRequest_AudioIn:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.AudioIn)))
-		n += len(x.AudioIn)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
+func (m *ScreenOut) XXX_Size() int {
+	return xxx_messageInfo_ScreenOut.Size(m)
 }
-
-// The top-level message received by the client. A series of one or more
-// `AssistResponse` messages are streamed back to the client.
-type AssistResponse struct {
-	// *Output-only* Indicates the type of event.
-	EventType AssistResponse_EventType `protobuf:"varint,1,opt,name=event_type,json=eventType,enum=google.assistant.embedded.v1alpha2.AssistResponse_EventType" json:"event_type,omitempty"`
-	// *Output-only* The audio containing the Assistant's response to the query.
-	AudioOut *AudioOut `protobuf:"bytes,3,opt,name=audio_out,json=audioOut" json:"audio_out,omitempty"`
-	// *Output-only* Contains the action triggered by the query with the
-	// appropriate payloads and semantic parsing.
-	DeviceAction *DeviceAction `protobuf:"bytes,6,opt,name=device_action,json=deviceAction" json:"device_action,omitempty"`
-	// *Output-only* This repeated list contains zero or more speech recognition
-	// results that correspond to consecutive portions of the audio currently
-	// being processed, starting with the portion corresponding to the earliest
-	// audio (and most stable portion) to the portion corresponding to the most
-	// recent audio. The strings can be concatenated to view the full
-	// in-progress response. When the speech recognition completes, this list
-	// will contain one item with `stability` of `1.0`.
-	SpeechResults []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=speech_results,json=speechResults" json:"speech_results,omitempty"`
-	// *Output-only* Contains output related to the user's query.
-	DialogStateOut *DialogStateOut `protobuf:"bytes,5,opt,name=dialog_state_out,json=dialogStateOut" json:"dialog_state_out,omitempty"`
+func (m *ScreenOut) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScreenOut.DiscardUnknown(m)
 }
 
-func (m *AssistResponse) Reset()                    { *m = AssistResponse{} }
-func (m *AssistResponse) String() string            { return proto.CompactTextString(m) }
-func (*AssistResponse) ProtoMessage()               {}
-func (*AssistResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ScreenOut proto.InternalMessageInfo
 
-func (m *AssistResponse) GetEventType() AssistResponse_EventType {
+func (m *ScreenOut) GetFormat() ScreenOut_Format {
 	if m != nil {
-		return m.EventType
+		return m.Format
 	}
-	return AssistResponse_EVENT_TYPE_UNSPECIFIED
+	return ScreenOut_FORMAT_UNSPECIFIED
 }
 
-func (m *AssistResponse) GetAudioOut() *AudioOut {
+func (m *ScreenOut) GetData() []byte {
 	if m != nil {
-		return m.AudioOut
+		return m.Data
 	}
 	return nil
 }
 
-func (m *AssistResponse) GetDeviceAction() *DeviceAction {
-	if m != nil {
-		return m.DeviceAction
-	}
-	return nil
+// The response returned to the device if the user has triggered a Device
+// Action. For example, a device which supports the query *Turn on the light*
+// would receive a `DeviceAction` with a JSON payload containing the semantics
+// of the request.
+type DeviceAction struct {
+	// JSON containing the device command response generated from the triggered
+	// Device Action grammar. The format is given by the
+	// `action.devices.EXECUTE` intent for a given
+	// [trait](https://developers.google.com/assistant/sdk/reference/traits/).
+	DeviceRequestJson    string   `protobuf:"bytes,1,opt,name=device_request_json,json=deviceRequestJson,proto3" json:"device_request_json,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AssistResponse) GetSpeechResults() []*SpeechRecognitionResult {
-	if m != nil {
-		return m.SpeechResults
-	}
-	return nil
+func (m *DeviceAction) Reset()         { *m = DeviceAction{} }
+func (m *DeviceAction) String() string { return proto.CompactTextString(m) }
+func (*DeviceAction) ProtoMessage()    {}
+func (*DeviceAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{11}
+}
+func (m *DeviceAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceAction.Unmarshal(m, b)
+}
+func (m *DeviceAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceAction.Marshal(b, m, deterministic)
+}
+func (dst *DeviceAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceAction.Merge(dst, src)
+}
+func (m *DeviceAction) XXX_Size() int {
+	return xxx_messageInfo_DeviceAction.Size(m)
+}
+func (m *DeviceAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceAction.DiscardUnknown(m)
 }
 
-func (m *AssistResponse) GetDialogStateOut() *DialogStateOut {
+var xxx_messageInfo_DeviceAction proto.InternalMessageInfo
+
+func (m *DeviceAction) GetDeviceRequestJson() string {
 	if m != nil {
-		return m.DialogStateOut
+		return m.DeviceRequestJson
 	}
-	return nil
+	return ""
 }
 
 // The estimated transcription of a phrase the user has spoken. This could be
 // a single segment or the full guess of the user's spoken query.
 type SpeechRecognitionResult struct {
 	// *Output-only* Transcript text representing the words that the user spoke.
-	Transcript string `protobuf:"bytes,1,opt,name=transcript" json:"transcript,omitempty"`
+	Transcript string `protobuf:"bytes,1,opt,name=transcript,proto3" json:"transcript,omitempty"`
 	// *Output-only* An estimate of the likelihood that the Assistant will not
 	// change its guess about this result. Values range from 0.0 (completely
 	// unstable) to 1.0 (completely stable and final). The default of 0.0 is a
 	// sentinel value indicating `stability` was not set.
-	Stability float32 `protobuf:"fixed32,2,opt,name=stability" json:"stability,omitempty"`
+	Stability            float32  `protobuf:"fixed32,2,opt,name=stability,proto3" json:"stability,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SpeechRecognitionResult) Reset()         { *m = SpeechRecognitionResult{} }
+func (m *SpeechRecognitionResult) String() string { return proto.CompactTextString(m) }
+func (*SpeechRecognitionResult) ProtoMessage()    {}
+func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{12}
+}
+func (m *SpeechRecognitionResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechRecognitionResult.Unmarshal(m, b)
+}
+func (m *SpeechRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechRecognitionResult.Marshal(b, m, deterministic)
+}
+func (dst *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionResult.Merge(dst, src)
+}
+func (m *SpeechRecognitionResult) XXX_Size() int {
+	return xxx_messageInfo_SpeechRecognitionResult.Size(m)
+}
+func (m *SpeechRecognitionResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechRecognitionResult.DiscardUnknown(m)
 }
 
-func (m *SpeechRecognitionResult) Reset()                    { *m = SpeechRecognitionResult{} }
-func (m *SpeechRecognitionResult) String() string            { return proto.CompactTextString(m) }
-func (*SpeechRecognitionResult) ProtoMessage()               {}
-func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_SpeechRecognitionResult proto.InternalMessageInfo
 
 func (m *SpeechRecognitionResult) GetTranscript() string {
 	if m != nil {
@@ -743,69 +1209,131 @@ func (m *SpeechRecognitionResult) GetStability() float32 {
 	return 0
 }
 
-// *Required* Fields that identify the device to the Assistant.
-//
-// See also:
-//
-// *   [Register a Device - REST API](https://developers.google.com/assistant/sdk/reference/device-registration/register-device-manual)
-// *   [Device Model and Instance Schemas](https://developers.google.com/assistant/sdk/reference/device-registration/model-and-instance-schemas)
-// *   [Device Proto](https://developers.google.com/assistant/sdk/reference/rpc/google.assistant.devices.v1alpha2#device)
-type DeviceConfig struct {
-	// *Required* Unique identifier for the device. The id length must be 128
-	// characters or less. Example: DBCDW098234. This MUST match the device_id
-	// returned from device registration. This device_id is used to match against
-	// the user's registered devices to lookup the supported traits and
-	// capabilities of this device. This information should not change across
-	// device reboots. However, it should not be saved across
-	// factory-default resets.
-	DeviceId string `protobuf:"bytes,1,opt,name=device_id,json=deviceId" json:"device_id,omitempty"`
-	// *Required* Unique identifier for the device model. The combination of
-	// device_model_id and device_id must have been previously associated through
-	// device registration.
-	DeviceModelId string `protobuf:"bytes,3,opt,name=device_model_id,json=deviceModelId" json:"device_model_id,omitempty"`
+// The dialog state resulting from the user's query. Multiple of these messages
+// may be received.
+type DialogStateOut struct {
+	// *Output-only* Supplemental display text from the Assistant. This could be
+	// the same as the speech spoken in `AssistResponse.audio_out` or it could
+	// be some additional information which aids the user's understanding.
+	SupplementalDisplayText string `protobuf:"bytes,1,opt,name=supplemental_display_text,json=supplementalDisplayText,proto3" json:"supplemental_display_text,omitempty"`
+	// *Output-only* State information for the subsequent `Assist` RPC. This
+	// value should be saved in the client and returned in the
+	// [`DialogStateIn.conversation_state`](#dialogstatein) field with the next
+	// `Assist` RPC. (The client does not need to interpret or otherwise use this
+	// value.) This information should be saved across device reboots. However,
+	// this value should be cleared (not saved in the client) during a
+	// factory-default reset.
+	ConversationState []byte `protobuf:"bytes,2,opt,name=conversation_state,json=conversationState,proto3" json:"conversation_state,omitempty"`
+	// *Output-only* Specifies the mode of the microphone after this `Assist`
+	// RPC is processed.
+	MicrophoneMode DialogStateOut_MicrophoneMode `protobuf:"varint,3,opt,name=microphone_mode,json=microphoneMode,proto3,enum=google.assistant.embedded.v1alpha2.DialogStateOut_MicrophoneMode" json:"microphone_mode,omitempty"`
+	// *Output-only* Updated volume level. The value will be 0 or omitted
+	// (indicating no change) unless a voice command such as *Increase the volume*
+	// or *Set volume level 4* was recognized, in which case the value will be
+	// between 1 and 100 (corresponding to the new volume level of 1% to 100%).
+	// Typically, a client should use this volume level when playing the
+	// `audio_out` data, and retain this value as the current volume level and
+	// supply it in the `AudioOutConfig` of the next `AssistRequest`. (Some
+	// clients may also implement other ways to allow the current volume level to
+	// be changed, for example, by providing a knob that the user can turn.)
+	VolumePercentage     int32    `protobuf:"varint,4,opt,name=volume_percentage,json=volumePercentage,proto3" json:"volume_percentage,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeviceConfig) Reset()                    { *m = DeviceConfig{} }
-func (m *DeviceConfig) String() string            { return proto.CompactTextString(m) }
-func (*DeviceConfig) ProtoMessage()               {}
-func (*DeviceConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *DialogStateOut) Reset()         { *m = DialogStateOut{} }
+func (m *DialogStateOut) String() string { return proto.CompactTextString(m) }
+func (*DialogStateOut) ProtoMessage()    {}
+func (*DialogStateOut) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{13}
+}
+func (m *DialogStateOut) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DialogStateOut.Unmarshal(m, b)
+}
+func (m *DialogStateOut) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DialogStateOut.Marshal(b, m, deterministic)
+}
+func (dst *DialogStateOut) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DialogStateOut.Merge(dst, src)
+}
+func (m *DialogStateOut) XXX_Size() int {
+	return xxx_messageInfo_DialogStateOut.Size(m)
+}
+func (m *DialogStateOut) XXX_DiscardUnknown() {
+	xxx_messageInfo_DialogStateOut.DiscardUnknown(m)
+}
 
-func (m *DeviceConfig) GetDeviceId() string {
+var xxx_messageInfo_DialogStateOut proto.InternalMessageInfo
+
+func (m *DialogStateOut) GetSupplementalDisplayText() string {
 	if m != nil {
-		return m.DeviceId
+		return m.SupplementalDisplayText
 	}
 	return ""
 }
 
-func (m *DeviceConfig) GetDeviceModelId() string {
+func (m *DialogStateOut) GetConversationState() []byte {
 	if m != nil {
-		return m.DeviceModelId
+		return m.ConversationState
 	}
-	return ""
+	return nil
 }
 
-// The response returned to the device if the user has triggered a Device
-// Action. For example, a device which supports the query *Turn on the light*
-// would receive a `DeviceAction` with a JSON payload containing the semantics
-// of the request.
-type DeviceAction struct {
-	// JSON containing the device command response generated from the triggered
-	// Device Action grammar. The format is given by the
-	// `action.devices.EXECUTE` intent for a given
-	// [trait](https://developers.google.com/assistant/sdk/reference/traits/).
-	DeviceRequestJson string `protobuf:"bytes,1,opt,name=device_request_json,json=deviceRequestJson" json:"device_request_json,omitempty"`
+func (m *DialogStateOut) GetMicrophoneMode() DialogStateOut_MicrophoneMode {
+	if m != nil {
+		return m.MicrophoneMode
+	}
+	return DialogStateOut_MICROPHONE_MODE_UNSPECIFIED
+}
+
+func (m *DialogStateOut) GetVolumePercentage() int32 {
+	if m != nil {
+		return m.VolumePercentage
+	}
+	return 0
 }
 
-func (m *DeviceAction) Reset()                    { *m = DeviceAction{} }
-func (m *DeviceAction) String() string            { return proto.CompactTextString(m) }
-func (*DeviceAction) ProtoMessage()               {}
-func (*DeviceAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+// Debugging parameters for the current request.
+type DebugConfig struct {
+	// When this field is set to true, the `debug_info` field in `AssistResponse`
+	// may be populated. However it will significantly increase latency of
+	// responses. Do not set this field true in production code.
+	ReturnDebugInfo      bool     `protobuf:"varint,6,opt,name=return_debug_info,json=returnDebugInfo,proto3" json:"return_debug_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
 
-func (m *DeviceAction) GetDeviceRequestJson() string {
+func (m *DebugConfig) Reset()         { *m = DebugConfig{} }
+func (m *DebugConfig) String() string { return proto.CompactTextString(m) }
+func (*DebugConfig) ProtoMessage()    {}
+func (*DebugConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{14}
+}
+func (m *DebugConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DebugConfig.Unmarshal(m, b)
+}
+func (m *DebugConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DebugConfig.Marshal(b, m, deterministic)
+}
+func (dst *DebugConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebugConfig.Merge(dst, src)
+}
+func (m *DebugConfig) XXX_Size() int {
+	return xxx_messageInfo_DebugConfig.Size(m)
+}
+func (m *DebugConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_DebugConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DebugConfig proto.InternalMessageInfo
+
+func (m *DebugConfig) GetReturnDebugInfo() bool {
 	if m != nil {
-		return m.DeviceRequestJson
+		return m.ReturnDebugInfo
 	}
-	return ""
+	return false
 }
 
 // There are three sources of locations. They are used with this precedence:
@@ -819,20 +1347,42 @@ func (m *DeviceAction) GetDeviceRequestJson() string {
 type DeviceLocation struct {
 	// Types that are valid to be assigned to Type:
 	//	*DeviceLocation_Coordinates
-	Type isDeviceLocation_Type `protobuf_oneof:"type"`
+	Type                 isDeviceLocation_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *DeviceLocation) Reset()         { *m = DeviceLocation{} }
+func (m *DeviceLocation) String() string { return proto.CompactTextString(m) }
+func (*DeviceLocation) ProtoMessage()    {}
+func (*DeviceLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_embedded_assistant_ff6c99435b909ee5, []int{15}
+}
+func (m *DeviceLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceLocation.Unmarshal(m, b)
+}
+func (m *DeviceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceLocation.Marshal(b, m, deterministic)
+}
+func (dst *DeviceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceLocation.Merge(dst, src)
+}
+func (m *DeviceLocation) XXX_Size() int {
+	return xxx_messageInfo_DeviceLocation.Size(m)
+}
+func (m *DeviceLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceLocation.DiscardUnknown(m)
 }
 
-func (m *DeviceLocation) Reset()                    { *m = DeviceLocation{} }
-func (m *DeviceLocation) String() string            { return proto.CompactTextString(m) }
-func (*DeviceLocation) ProtoMessage()               {}
-func (*DeviceLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_DeviceLocation proto.InternalMessageInfo
 
 type isDeviceLocation_Type interface {
 	isDeviceLocation_Type()
 }
 
 type DeviceLocation_Coordinates struct {
-	Coordinates *google_type.LatLng `protobuf:"bytes,1,opt,name=coordinates,oneof"`
+	Coordinates *latlng.LatLng `protobuf:"bytes,1,opt,name=coordinates,proto3,oneof"`
 }
 
 func (*DeviceLocation_Coordinates) isDeviceLocation_Type() {}
@@ -844,7 +1394,7 @@ func (m *DeviceLocation) GetType() isDeviceLocation_Type {
 	return nil
 }
 
-func (m *DeviceLocation) GetCoordinates() *google_type.LatLng {
+func (m *DeviceLocation) GetCoordinates() *latlng.LatLng {
 	if x, ok := m.GetType().(*DeviceLocation_Coordinates); ok {
 		return x.Coordinates
 	}
@@ -881,7 +1431,7 @@ func _DeviceLocation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_type.LatLng)
+		msg := new(latlng.LatLng)
 		err := b.DecodeMessage(msg)
 		m.Type = &DeviceLocation_Coordinates{msg}
 		return true, err
@@ -896,7 +1446,7 @@ func _DeviceLocation_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Type.(type) {
 	case *DeviceLocation_Coordinates:
 		s := proto.Size(x.Coordinates)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -907,22 +1457,28 @@ func _DeviceLocation_OneofSizer(msg proto.Message) (n int) {
 }
 
 func init() {
+	proto.RegisterType((*AssistRequest)(nil), "google.assistant.embedded.v1alpha2.AssistRequest")
+	proto.RegisterType((*AssistResponse)(nil), "google.assistant.embedded.v1alpha2.AssistResponse")
+	proto.RegisterType((*DebugInfo)(nil), "google.assistant.embedded.v1alpha2.DebugInfo")
 	proto.RegisterType((*AssistConfig)(nil), "google.assistant.embedded.v1alpha2.AssistConfig")
 	proto.RegisterType((*AudioInConfig)(nil), "google.assistant.embedded.v1alpha2.AudioInConfig")
 	proto.RegisterType((*AudioOutConfig)(nil), "google.assistant.embedded.v1alpha2.AudioOutConfig")
+	proto.RegisterType((*ScreenOutConfig)(nil), "google.assistant.embedded.v1alpha2.ScreenOutConfig")
 	proto.RegisterType((*DialogStateIn)(nil), "google.assistant.embedded.v1alpha2.DialogStateIn")
-	proto.RegisterType((*AudioOut)(nil), "google.assistant.embedded.v1alpha2.AudioOut")
-	proto.RegisterType((*DialogStateOut)(nil), "google.assistant.embedded.v1alpha2.DialogStateOut")
-	proto.RegisterType((*AssistRequest)(nil), "google.assistant.embedded.v1alpha2.AssistRequest")
-	proto.RegisterType((*AssistResponse)(nil), "google.assistant.embedded.v1alpha2.AssistResponse")
-	proto.RegisterType((*SpeechRecognitionResult)(nil), "google.assistant.embedded.v1alpha2.SpeechRecognitionResult")
 	proto.RegisterType((*DeviceConfig)(nil), "google.assistant.embedded.v1alpha2.DeviceConfig")
+	proto.RegisterType((*AudioOut)(nil), "google.assistant.embedded.v1alpha2.AudioOut")
+	proto.RegisterType((*ScreenOut)(nil), "google.assistant.embedded.v1alpha2.ScreenOut")
 	proto.RegisterType((*DeviceAction)(nil), "google.assistant.embedded.v1alpha2.DeviceAction")
+	proto.RegisterType((*SpeechRecognitionResult)(nil), "google.assistant.embedded.v1alpha2.SpeechRecognitionResult")
+	proto.RegisterType((*DialogStateOut)(nil), "google.assistant.embedded.v1alpha2.DialogStateOut")
+	proto.RegisterType((*DebugConfig)(nil), "google.assistant.embedded.v1alpha2.DebugConfig")
 	proto.RegisterType((*DeviceLocation)(nil), "google.assistant.embedded.v1alpha2.DeviceLocation")
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AssistResponse_EventType", AssistResponse_EventType_name, AssistResponse_EventType_value)
 	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AudioInConfig_Encoding", AudioInConfig_Encoding_name, AudioInConfig_Encoding_value)
 	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AudioOutConfig_Encoding", AudioOutConfig_Encoding_name, AudioOutConfig_Encoding_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.ScreenOutConfig_ScreenMode", ScreenOutConfig_ScreenMode_name, ScreenOutConfig_ScreenMode_value)
+	proto.RegisterEnum("google.assistant.embedded.v1alpha2.ScreenOut_Format", ScreenOut_Format_name, ScreenOut_Format_value)
 	proto.RegisterEnum("google.assistant.embedded.v1alpha2.DialogStateOut_MicrophoneMode", DialogStateOut_MicrophoneMode_name, DialogStateOut_MicrophoneMode_value)
-	proto.RegisterEnum("google.assistant.embedded.v1alpha2.AssistResponse_EventType", AssistResponse_EventType_name, AssistResponse_EventType_value)
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -933,8 +1489,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for EmbeddedAssistant service
-
+// EmbeddedAssistantClient is the client API for EmbeddedAssistant service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type EmbeddedAssistantClient interface {
 	// Initiates or continues a conversation with the embedded Assistant Service.
 	// Each call performs one round-trip, sending an audio request to the service
@@ -991,7 +1548,7 @@ func NewEmbeddedAssistantClient(cc *grpc.ClientConn) EmbeddedAssistantClient {
 }
 
 func (c *embeddedAssistantClient) Assist(ctx context.Context, opts ...grpc.CallOption) (EmbeddedAssistant_AssistClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_EmbeddedAssistant_serviceDesc.Streams[0], c.cc, "/google.assistant.embedded.v1alpha2.EmbeddedAssistant/Assist", opts...)
+	stream, err := c.cc.NewStream(ctx, &_EmbeddedAssistant_serviceDesc.Streams[0], "/google.assistant.embedded.v1alpha2.EmbeddedAssistant/Assist", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1021,8 +1578,7 @@ func (x *embeddedAssistantAssistClient) Recv() (*AssistResponse, error) {
 	return m, nil
 }
 
-// Server API for EmbeddedAssistant service
-
+// EmbeddedAssistantServer is the server API for EmbeddedAssistant service.
 type EmbeddedAssistantServer interface {
 	// Initiates or continues a conversation with the embedded Assistant Service.
 	// Each call performs one round-trip, sending an audio request to the service
@@ -1116,81 +1672,100 @@ var _EmbeddedAssistant_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/assistant/embedded/v1alpha2/embedded_assistant.proto", fileDescriptor0)
-}
-
-var fileDescriptor0 = []byte{
-	// 1141 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0xdb, 0x36,
-	0x14, 0x8e, 0xec, 0x34, 0xb5, 0x4f, 0x62, 0xc5, 0x61, 0x8b, 0xd5, 0x4b, 0xbb, 0xb5, 0xd0, 0x80,
-	0x22, 0xfb, 0xb3, 0x9b, 0x14, 0xd8, 0x80, 0xb6, 0x1b, 0xe0, 0xda, 0x4a, 0xa2, 0xc2, 0xb1, 0x5c,
-	0xc6, 0x69, 0xd1, 0xfd, 0x80, 0x60, 0x24, 0x4e, 0x51, 0x21, 0x93, 0xaa, 0x44, 0x07, 0xcd, 0xae,
-	0x76, 0x35, 0xec, 0xb2, 0x0f, 0xb1, 0x07, 0xd9, 0x2b, 0xec, 0x59, 0xf6, 0x02, 0x03, 0x29, 0xc9,
-	0xb5, 0xb6, 0x66, 0xb3, 0xb7, 0x3b, 0xf1, 0x1c, 0x9e, 0x8f, 0xe4, 0x39, 0xe7, 0xfb, 0x8e, 0xe0,
-	0x61, 0x20, 0x44, 0x10, 0xb1, 0x0e, 0x4d, 0xd3, 0x30, 0x95, 0x94, 0xcb, 0x0e, 0x9b, 0x9c, 0x32,
-	0xdf, 0x67, 0x7e, 0xe7, 0x7c, 0x97, 0x46, 0xf1, 0x19, 0xdd, 0x9b, 0x59, 0xc8, 0x6c, 0x53, 0x3b,
-	0x4e, 0x84, 0x14, 0xc8, 0xca, 0x82, 0xdb, 0x6f, 0xed, 0xc5, 0xd6, 0x76, 0x11, 0xbc, 0x7d, 0xab,
-	0x38, 0x20, 0x0e, 0x3b, 0x94, 0x73, 0x21, 0xa9, 0x0c, 0x05, 0x4f, 0x33, 0x84, 0xed, 0x56, 0xee,
-	0x95, 0x17, 0x31, 0xeb, 0x44, 0x54, 0x46, 0x3c, 0xc8, 0x3c, 0xd6, 0xaf, 0x55, 0xd8, 0xe8, 0x6a,
-	0xdc, 0x9e, 0xe0, 0x3f, 0x84, 0x01, 0xfa, 0x16, 0x36, 0xe9, 0xd4, 0x0f, 0x05, 0x09, 0x39, 0xf1,
-	0xb4, 0xa9, 0x65, 0xdc, 0x31, 0x76, 0xd6, 0xf7, 0x76, 0xdb, 0xff, 0x7e, 0x8d, 0x76, 0x57, 0x85,
-	0x3a, 0x3c, 0xc3, 0x3a, 0x5c, 0xc1, 0x0d, 0x3a, 0x6f, 0x40, 0xb7, 0x01, 0x24, 0x7b, 0x2d, 0xc9,
-	0xab, 0x29, 0x4b, 0x2e, 0x5a, 0x6b, 0x77, 0x8c, 0x9d, 0xfa, 0xe1, 0x0a, 0xae, 0x2b, 0xdb, 0x53,
-	0x65, 0x42, 0xdf, 0x41, 0x33, 0x3b, 0x5d, 0x4c, 0x65, 0x71, 0x7c, 0x45, 0x1f, 0xbf, 0xb7, 0xf0,
-	0xf1, 0xee, 0x34, 0x7f, 0x0b, 0x36, 0x69, 0x69, 0x8d, 0x5e, 0xc0, 0xa6, 0x1f, 0xd2, 0x48, 0x04,
-	0x24, 0x95, 0x54, 0x32, 0x12, 0xf2, 0x56, 0x75, 0xf1, 0xb7, 0xf5, 0x75, 0xe8, 0xb1, 0x8a, 0x74,
-	0x38, 0x6e, 0xf8, 0xf3, 0x4b, 0x74, 0x02, 0x0d, 0x9f, 0x9d, 0x87, 0x1e, 0x2b, 0x6e, 0xbd, 0xaa,
-	0x81, 0xef, 0x2d, 0x04, 0xac, 0x03, 0xf3, 0x3b, 0x6f, 0xf8, 0x73, 0xab, 0xc7, 0x6b, 0xb0, 0xaa,
-	0x6a, 0x66, 0xfd, 0x6e, 0x40, 0xa3, 0x94, 0x5b, 0xf4, 0x0c, 0x6a, 0x8c, 0x7b, 0xc2, 0x0f, 0x79,
-	0x56, 0x20, 0x73, 0xef, 0xc1, 0xd2, 0x05, 0x6a, 0xdb, 0x39, 0x02, 0x9e, 0x61, 0xa1, 0x4f, 0x60,
-	0x2b, 0xa5, 0x93, 0x38, 0x62, 0x24, 0x51, 0x29, 0x3a, 0x63, 0x89, 0xfc, 0x51, 0x97, 0xe0, 0x0a,
-	0xde, 0xcc, 0x1c, 0x98, 0x4a, 0x76, 0xa8, 0xcc, 0xd6, 0x23, 0xa8, 0x15, 0x08, 0xa8, 0x05, 0xd7,
-	0xed, 0x61, 0xcf, 0xed, 0x3b, 0xc3, 0x03, 0x72, 0x32, 0x3c, 0x1e, 0xd9, 0x3d, 0x67, 0xdf, 0xb1,
-	0xfb, 0xcd, 0x15, 0xb4, 0x01, 0xb5, 0x81, 0x33, 0xb4, 0xbb, 0x78, 0xf7, 0x8b, 0xa6, 0x81, 0x6a,
-	0xb0, 0xba, 0x3f, 0xe8, 0xf6, 0x9a, 0x15, 0xeb, 0x4d, 0x05, 0xcc, 0x72, 0xc1, 0xd0, 0xf3, 0xbf,
-	0x3d, 0xea, 0xe1, 0xf2, 0x65, 0xff, 0x9f, 0xaf, 0x42, 0x9f, 0xc2, 0xd6, 0xb9, 0x88, 0xa6, 0x13,
-	0x46, 0x62, 0x96, 0x78, 0x8c, 0x4b, 0x1a, 0x30, 0xdd, 0x27, 0x57, 0x70, 0x33, 0x73, 0x8c, 0x66,
-	0x76, 0x6b, 0xf0, 0x1f, 0x52, 0x70, 0x15, 0xaa, 0x47, 0xa3, 0xfb, 0xcd, 0x0a, 0xda, 0x84, 0x75,
-	0x77, 0x74, 0x72, 0x4c, 0x9c, 0x21, 0x71, 0x0f, 0x0e, 0x9a, 0x55, 0xeb, 0x37, 0x03, 0x1a, 0xa5,
-	0x36, 0x43, 0x9f, 0x03, 0xf2, 0x04, 0x3f, 0x67, 0x49, 0xaa, 0x09, 0x9d, 0x35, 0xae, 0xce, 0xcd,
-	0x06, 0xde, 0x9a, 0xf7, 0xe8, 0x00, 0xf4, 0x11, 0x34, 0x22, 0xca, 0x83, 0x29, 0x0d, 0x54, 0x23,
-	0xfa, 0x4c, 0xbf, 0xb1, 0x8e, 0x37, 0x0a, 0x63, 0x4f, 0xf8, 0x4c, 0x51, 0x3c, 0xef, 0xd5, 0x48,
-	0x78, 0x3a, 0xb8, 0x75, 0x65, 0x71, 0x8e, 0x65, 0xdd, 0x3a, 0xc8, 0x23, 0xb1, 0xe9, 0x97, 0xd6,
-	0xd6, 0xc7, 0x50, 0x2b, 0xca, 0x81, 0x3e, 0x00, 0xc8, 0xd8, 0xec, 0x53, 0x49, 0xf3, 0x4b, 0xd7,
-	0xb5, 0xa5, 0x4f, 0x25, 0xb5, 0xfe, 0xa8, 0x80, 0x39, 0xf7, 0x5a, 0x15, 0xf1, 0x00, 0xde, 0x4f,
-	0xa7, 0x71, 0x1c, 0xb1, 0x89, 0xca, 0x6f, 0x44, 0xfc, 0x30, 0x8d, 0x23, 0x7a, 0x41, 0x94, 0x42,
-	0x68, 0x80, 0x3a, 0xbe, 0x31, 0xbf, 0xa1, 0x9f, 0xf9, 0xc7, 0xec, 0xb5, 0xbc, 0x24, 0x55, 0x95,
-	0xcb, 0x52, 0xf5, 0x12, 0x36, 0x27, 0xa1, 0x97, 0x88, 0xf8, 0x4c, 0x70, 0x46, 0x26, 0x2a, 0x59,
-	0x55, 0xdd, 0x72, 0xdd, 0x25, 0xc5, 0xc0, 0x9d, 0xca, 0xf6, 0xd1, 0x0c, 0xe9, 0x48, 0xf8, 0x0c,
-	0x9b, 0x93, 0xd2, 0xfa, 0xdd, 0x2d, 0xb5, 0x7a, 0x49, 0x4b, 0x7d, 0x0f, 0x66, 0x19, 0x0e, 0xdd,
-	0x86, 0x9b, 0x47, 0x4e, 0x0f, 0xbb, 0xa3, 0x43, 0x77, 0x68, 0x93, 0x23, 0xb7, 0x6f, 0xff, 0xa5,
-	0xbf, 0xae, 0x43, 0xb3, 0x37, 0x70, 0x8f, 0x6d, 0xf2, 0x76, 0x5b, 0xd3, 0x50, 0xd6, 0xbe, 0xd3,
-	0x1d, 0xb8, 0x07, 0x64, 0xdf, 0x1d, 0x0c, 0xdc, 0xe7, 0xc4, 0x1d, 0x36, 0x2b, 0xd6, 0x4f, 0x4a,
-	0x4a, 0xf4, 0xcb, 0x30, 0x7b, 0x35, 0x65, 0xa9, 0x44, 0x4f, 0x60, 0xad, 0xa4, 0xf4, 0x0b, 0x89,
-	0xd6, 0xfc, 0xd0, 0x38, 0x5c, 0xc1, 0x39, 0x02, 0xba, 0x09, 0xb5, 0x62, 0x7c, 0x64, 0xa9, 0x3f,
-	0x5c, 0xc1, 0x57, 0xf3, 0x21, 0x30, 0x53, 0xb3, 0x37, 0xab, 0x60, 0x16, 0x57, 0x48, 0x63, 0xc1,
-	0x53, 0xd5, 0x93, 0xc0, 0xce, 0x19, 0x97, 0x44, 0x6d, 0xc8, 0xb9, 0xff, 0x68, 0xf1, 0x7b, 0x14,
-	0x38, 0x6d, 0x5b, 0x81, 0x8c, 0x2f, 0x62, 0x86, 0xeb, 0xac, 0xf8, 0x44, 0x0e, 0xd4, 0x67, 0x53,
-	0x25, 0x57, 0xfc, 0xcf, 0x96, 0xd1, 0x15, 0x5c, 0x2b, 0x06, 0xc9, 0x9c, 0xce, 0x53, 0x4f, 0x33,
-	0x67, 0x6d, 0x59, 0x9d, 0xef, 0xea, 0xb8, 0x42, 0xe7, 0xb3, 0x15, 0x3a, 0x05, 0x33, 0x8d, 0x19,
-	0xf3, 0xce, 0x48, 0xc2, 0xd2, 0x69, 0x24, 0xd3, 0x56, 0xe5, 0x4e, 0x75, 0x67, 0x7d, 0x31, 0xf9,
-	0x3b, 0xd6, 0x91, 0x98, 0x79, 0x22, 0xe0, 0xa1, 0x06, 0xd7, 0x18, 0xb8, 0x91, 0xe6, 0x0e, 0x8d,
-	0xa8, 0x66, 0x6b, 0x69, 0xfa, 0xa9, 0x64, 0x2c, 0xc3, 0xfb, 0x52, 0xc7, 0x63, 0xd3, 0x2f, 0xad,
-	0xad, 0xaf, 0xa0, 0x3e, 0xcb, 0x3d, 0xda, 0x86, 0xf7, 0xec, 0x67, 0xf6, 0x70, 0x4c, 0xc6, 0x2f,
-	0x46, 0xef, 0xe8, 0x55, 0x7b, 0xd8, 0x27, 0xee, 0x3e, 0x39, 0x19, 0x8f, 0x6d, 0xdc, 0x1d, 0xf6,
-	0xec, 0xa6, 0x61, 0x3d, 0x87, 0x1b, 0x97, 0x3c, 0x03, 0x7d, 0x08, 0x20, 0x13, 0xca, 0x53, 0x2f,
-	0x09, 0xe3, 0x42, 0x04, 0xe6, 0x2c, 0xe8, 0x16, 0xd4, 0x53, 0x49, 0x4f, 0xc3, 0x28, 0x94, 0x17,
-	0xba, 0xe7, 0x2a, 0xf8, 0xad, 0xc1, 0x3a, 0x86, 0x8d, 0xf9, 0xf9, 0x8a, 0x6e, 0x42, 0x3d, 0x2f,
-	0x60, 0xe8, 0xe7, 0x60, 0xb5, 0xcc, 0xe0, 0xf8, 0xe8, 0xee, 0x4c, 0x19, 0x95, 0x1e, 0x44, 0x6a,
-	0x4b, 0x55, 0x6f, 0xc9, 0x8b, 0xae, 0xd8, 0x18, 0x39, 0xbe, 0xf5, 0x75, 0x01, 0x9a, 0x97, 0xaf,
-	0x0d, 0xd7, 0xf2, 0xb8, 0x24, 0xe3, 0x14, 0x79, 0x99, 0x0a, 0x9e, 0xc3, 0x6f, 0x65, 0xae, 0x9c,
-	0x6d, 0x4f, 0x52, 0xc1, 0xad, 0xa7, 0x60, 0x96, 0x65, 0x14, 0x7d, 0x09, 0xeb, 0x9e, 0x10, 0x89,
-	0x1f, 0x72, 0x2a, 0x59, 0x9a, 0x13, 0xf1, 0x5a, 0x51, 0x17, 0x45, 0x8a, 0xf6, 0x80, 0xca, 0x01,
-	0x57, 0x5c, 0x9b, 0xdf, 0x59, 0x70, 0x6a, 0xef, 0x17, 0x03, 0xb6, 0xec, 0xbc, 0x68, 0xdd, 0xa2,
-	0x8c, 0x28, 0x85, 0xb5, 0x6c, 0x81, 0x76, 0x97, 0x21, 0x93, 0xbe, 0xe9, 0xf6, 0xde, 0xf2, 0xfc,
-	0xdb, 0x31, 0xee, 0x19, 0x8f, 0x7f, 0x36, 0xe0, 0xae, 0x27, 0x26, 0x0b, 0x44, 0x3f, 0x36, 0x67,
-	0x57, 0x1d, 0xa9, 0xdf, 0xd1, 0x91, 0xf1, 0xcd, 0x93, 0x3c, 0x2a, 0x10, 0x6a, 0x66, 0xb5, 0x45,
-	0x12, 0x74, 0x02, 0xc6, 0xf5, 0xcf, 0x6a, 0x27, 0x73, 0xd1, 0x38, 0x4c, 0xff, 0xe9, 0x47, 0xfa,
-	0x61, 0x61, 0x39, 0x5d, 0xd3, 0x61, 0xf7, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x7a, 0x00,
-	0x97, 0x7e, 0x0b, 0x00, 0x00,
+	proto.RegisterFile("google/assistant/embedded/v1alpha2/embedded_assistant.proto", fileDescriptor_embedded_assistant_ff6c99435b909ee5)
+}
+
+var fileDescriptor_embedded_assistant_ff6c99435b909ee5 = []byte{
+	// 1449 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x41, 0x73, 0xdb, 0xc6,
+	0x15, 0x16, 0x28, 0x8a, 0x22, 0x1f, 0x29, 0x92, 0x5a, 0x7b, 0x6c, 0x56, 0x72, 0x6b, 0x0d, 0x3a,
+	0xe3, 0x51, 0xdd, 0x9a, 0xb4, 0xe8, 0x4e, 0x3b, 0xb5, 0x5c, 0x77, 0x68, 0x12, 0x94, 0xe0, 0x52,
+	0x04, 0x0d, 0x52, 0xf6, 0xb8, 0x6e, 0x07, 0xb3, 0x22, 0x56, 0x10, 0x3c, 0xe0, 0x2e, 0x0d, 0x2c,
+	0x65, 0xab, 0xa7, 0x1c, 0x73, 0x4b, 0xae, 0xb9, 0xe6, 0x9c, 0x5b, 0x7e, 0x49, 0x8e, 0xf9, 0x17,
+	0x99, 0xc9, 0x1f, 0xc8, 0xec, 0x62, 0x41, 0x91, 0x8a, 0x95, 0x90, 0xce, 0x0d, 0xfb, 0xde, 0xbe,
+	0x0f, 0x0f, 0xbb, 0xdf, 0xf7, 0xde, 0x03, 0xec, 0x7b, 0x8c, 0x79, 0x01, 0xa9, 0xe1, 0x28, 0xf2,
+	0x23, 0x8e, 0x29, 0xaf, 0x91, 0xd1, 0x09, 0x71, 0x5d, 0xe2, 0xd6, 0xce, 0xf7, 0x70, 0x30, 0x3e,
+	0xc3, 0xf5, 0xa9, 0xc5, 0x99, 0x6e, 0xaa, 0x8e, 0x43, 0xc6, 0x19, 0xd2, 0xe3, 0xe0, 0xea, 0xa5,
+	0x3d, 0xd9, 0x5a, 0x4d, 0x82, 0xb7, 0xee, 0x24, 0x2f, 0x18, 0xfb, 0x35, 0x4c, 0x29, 0xe3, 0x98,
+	0xfb, 0x8c, 0x46, 0x31, 0xc2, 0x56, 0x45, 0x79, 0xf9, 0xc5, 0x98, 0xd4, 0x02, 0xcc, 0x03, 0xea,
+	0xc5, 0x1e, 0xfd, 0x33, 0x0d, 0x36, 0x1a, 0x12, 0xd7, 0x26, 0xef, 0x26, 0x24, 0xe2, 0xe8, 0x39,
+	0x64, 0x86, 0x8c, 0x9e, 0xfa, 0x5e, 0x45, 0xdb, 0xd1, 0x76, 0xf3, 0xf5, 0x87, 0xd5, 0x5f, 0x7f,
+	0x7d, 0x35, 0x86, 0x68, 0xca, 0xb8, 0xc3, 0x15, 0x5b, 0x21, 0xa0, 0x6d, 0xc8, 0xe2, 0x89, 0xeb,
+	0x33, 0xc7, 0xa7, 0x95, 0xd4, 0x8e, 0xb6, 0x5b, 0x38, 0x5c, 0xb1, 0xd7, 0xa5, 0xc5, 0xa4, 0xcf,
+	0x32, 0x90, 0x16, 0xf9, 0xe8, 0xdf, 0xac, 0x41, 0x31, 0x49, 0x21, 0x1a, 0x33, 0x1a, 0x11, 0xf4,
+	0x06, 0x80, 0x9c, 0x13, 0xca, 0x1d, 0xb1, 0x41, 0xe6, 0x51, 0xac, 0x3f, 0x59, 0x3c, 0x8f, 0x04,
+	0xa7, 0x6a, 0x08, 0x90, 0xc1, 0xc5, 0x98, 0xd8, 0x39, 0x92, 0x3c, 0x22, 0x13, 0x72, 0x71, 0x52,
+	0x6c, 0xc2, 0x2b, 0xab, 0xf2, 0x1b, 0xff, 0xb2, 0x10, 0xb6, 0x08, 0xb2, 0x26, 0xdc, 0x8e, 0xbf,
+	0xc9, 0x9a, 0x70, 0xd4, 0x01, 0x88, 0x86, 0x21, 0x21, 0x54, 0x62, 0xa5, 0x25, 0xd6, 0x83, 0x45,
+	0xb0, 0xfa, 0x32, 0x4a, 0x80, 0xe5, 0xa2, 0xe4, 0x11, 0x1d, 0xc3, 0x86, 0x4b, 0xce, 0xfd, 0x21,
+	0x71, 0xf0, 0x50, 0xdc, 0x5e, 0x25, 0xb3, 0xf8, 0x05, 0xb4, 0x64, 0x60, 0x43, 0xc6, 0xd9, 0x05,
+	0x77, 0x66, 0x85, 0x4e, 0xa0, 0x18, 0x8d, 0x09, 0x19, 0x9e, 0x39, 0x21, 0x89, 0x26, 0x01, 0x8f,
+	0x2a, 0xa9, 0x9d, 0xd5, 0xdd, 0x7c, 0x7d, 0x7f, 0xa1, 0x44, 0x65, 0xa4, 0x4d, 0x86, 0xcc, 0xa3,
+	0xbe, 0x04, 0x97, 0x18, 0xf6, 0x46, 0xa4, 0x1c, 0x12, 0x11, 0xfd, 0x17, 0xca, 0xae, 0x8f, 0x03,
+	0xe6, 0x39, 0x11, 0xc7, 0x9c, 0xc8, 0xe3, 0x58, 0x93, 0xd9, 0xd7, 0x17, 0xca, 0x5e, 0xc6, 0xf6,
+	0x45, 0xa8, 0x38, 0x93, 0xa2, 0x3b, 0xb7, 0x16, 0xc7, 0xec, 0x92, 0x93, 0x89, 0xe7, 0xf8, 0xf4,
+	0x94, 0x55, 0xb2, 0x8b, 0x1f, 0x73, 0x4b, 0x44, 0x99, 0xf4, 0x94, 0xd9, 0x39, 0x37, 0x79, 0xd4,
+	0xff, 0x09, 0xb9, 0x29, 0x2f, 0xd0, 0x16, 0xdc, 0x32, 0x5e, 0x1a, 0xdd, 0x81, 0x33, 0x78, 0xdd,
+	0x33, 0x9c, 0xe3, 0x6e, 0xbf, 0x67, 0x34, 0xcd, 0xb6, 0x69, 0xb4, 0xca, 0x2b, 0xe8, 0x26, 0x94,
+	0x8d, 0x6e, 0xcb, 0xb1, 0xda, 0xce, 0xf1, 0x60, 0x60, 0xd8, 0x8d, 0x6e, 0xd3, 0x28, 0x6b, 0xba,
+	0x09, 0xb9, 0x29, 0x2c, 0x7a, 0x02, 0xdb, 0x98, 0x79, 0x0e, 0xf6, 0x24, 0x59, 0xd9, 0xa5, 0x74,
+	0x9d, 0xb7, 0x11, 0xa3, 0x92, 0xb9, 0x39, 0xfb, 0x36, 0x66, 0x5e, 0x43, 0xec, 0x18, 0xb0, 0x46,
+	0xe2, 0x7f, 0x1e, 0x31, 0xaa, 0x7f, 0x9f, 0x86, 0xc2, 0xac, 0x72, 0xd0, 0x1b, 0x28, 0x25, 0x7a,
+	0x71, 0xe6, 0x44, 0xb8, 0xb7, 0x30, 0x41, 0x4d, 0x3a, 0x55, 0xe1, 0x06, 0x9e, 0x35, 0xa0, 0xbb,
+	0x00, 0x9c, 0x7c, 0xe0, 0xce, 0xbb, 0x09, 0x09, 0x2f, 0x24, 0xb7, 0x72, 0x87, 0x2b, 0x76, 0x4e,
+	0xd8, 0x5e, 0x08, 0x93, 0xb8, 0xc4, 0xa9, 0x30, 0x92, 0xd7, 0xa7, 0x16, 0xbf, 0xc4, 0x44, 0x1f,
+	0xf1, 0xeb, 0xec, 0x22, 0x9e, 0x5b, 0x23, 0x07, 0x36, 0x2f, 0xb5, 0x92, 0xc0, 0xc7, 0x77, 0xf9,
+	0x68, 0x29, 0xc9, 0x28, 0xfc, 0x52, 0x34, 0x6f, 0x40, 0xaf, 0xa1, 0x34, 0xc7, 0x41, 0x9f, 0x2a,
+	0x75, 0xef, 0x2d, 0x49, 0x41, 0x93, 0xda, 0x1b, 0xee, 0xec, 0x72, 0x46, 0x99, 0x2a, 0xef, 0xf4,
+	0xb2, 0xca, 0x54, 0x49, 0x2b, 0x65, 0xaa, 0x8c, 0x6d, 0x28, 0xc4, 0xbc, 0x56, 0xa8, 0xb1, 0x62,
+	0x6a, 0x0b, 0x33, 0x5b, 0x81, 0xe6, 0xdd, 0xcb, 0xc5, 0xb4, 0xaa, 0x7e, 0x27, 0x0a, 0xfb, 0xdc,
+	0xfd, 0xbf, 0x84, 0x2c, 0xa1, 0x43, 0xe6, 0xfa, 0xd4, 0x53, 0x25, 0xf5, 0xf1, 0xd2, 0xac, 0xaa,
+	0x1a, 0x0a, 0xc1, 0x9e, 0x62, 0xa1, 0xfb, 0xb0, 0x19, 0xe1, 0xd1, 0x38, 0x20, 0x4e, 0x28, 0x8e,
+	0xfd, 0x8c, 0x84, 0xfc, 0xff, 0x92, 0x37, 0x6b, 0x76, 0x29, 0x76, 0xd8, 0x98, 0x93, 0x43, 0x61,
+	0xd6, 0x9f, 0x40, 0x36, 0x41, 0x40, 0x15, 0xb8, 0x69, 0x74, 0x9b, 0x56, 0xcb, 0xec, 0x1e, 0x5c,
+	0x11, 0x5e, 0x01, 0xb2, 0x1d, 0xb3, 0x6b, 0x34, 0xec, 0xbd, 0xbf, 0x95, 0x35, 0x94, 0x85, 0x74,
+	0xbb, 0xd3, 0x68, 0x96, 0x53, 0xfa, 0x97, 0x29, 0x28, 0xce, 0xb3, 0x0c, 0xbd, 0xfa, 0xd9, 0x47,
+	0xed, 0x2f, 0xcf, 0xd5, 0xdf, 0xf8, 0x55, 0xe8, 0xcf, 0xb0, 0x79, 0xce, 0x82, 0xc9, 0x88, 0x38,
+	0x63, 0x12, 0x0e, 0x09, 0xe5, 0xd8, 0x23, 0x92, 0x7b, 0x6b, 0x76, 0x39, 0x76, 0xf4, 0xa6, 0x76,
+	0xbd, 0xf3, 0x09, 0x47, 0xb0, 0x0e, 0xab, 0x47, 0xbd, 0x47, 0xe5, 0x14, 0x2a, 0x41, 0xde, 0xea,
+	0x1d, 0xf7, 0x1d, 0xb3, 0xeb, 0x58, 0x07, 0x07, 0xe5, 0x55, 0xfd, 0x5b, 0x0d, 0x4a, 0x57, 0x94,
+	0x81, 0x1c, 0xc8, 0x2b, 0xa5, 0x8d, 0x98, 0x9b, 0xb4, 0xcf, 0xa7, 0x9f, 0xa0, 0x31, 0xb5, 0x3e,
+	0x62, 0x2e, 0xb1, 0x55, 0xa3, 0x13, 0xcf, 0xfa, 0xbf, 0x00, 0x2e, 0x3d, 0x68, 0x1b, 0x6e, 0xf7,
+	0x9b, 0xb6, 0x61, 0x74, 0x9d, 0x23, 0xab, 0x75, 0xb5, 0x86, 0xae, 0xc3, 0xaa, 0xd5, 0x6e, 0x97,
+	0x35, 0x94, 0x87, 0xf5, 0x5e, 0xa7, 0xf1, 0xda, 0xec, 0x8a, 0xac, 0x7f, 0xd0, 0x60, 0x63, 0x4e,
+	0x70, 0xe8, 0x01, 0xa0, 0x21, 0xa3, 0xe7, 0x24, 0x8c, 0xe4, 0xe0, 0x12, 0x4b, 0x58, 0xa6, 0x5e,
+	0xb0, 0x37, 0x67, 0x3d, 0x32, 0x00, 0xfd, 0x11, 0x36, 0x02, 0x4c, 0xbd, 0x09, 0xf6, 0x84, 0x24,
+	0x5d, 0x22, 0x6f, 0x26, 0x67, 0x17, 0x12, 0x63, 0x53, 0x24, 0xf6, 0x06, 0x4a, 0x4a, 0xb5, 0x01,
+	0x1b, 0xca, 0xe0, 0xa5, 0x7a, 0x92, 0x0c, 0xed, 0xa8, 0x48, 0xbb, 0xe8, 0xce, 0xad, 0x51, 0x15,
+	0x6e, 0xf8, 0x91, 0x43, 0xc9, 0x7b, 0x67, 0x36, 0xbb, 0xca, 0xfa, 0x8e, 0xb6, 0x9b, 0xb5, 0x37,
+	0xfd, 0xa8, 0x4b, 0xde, 0x37, 0x67, 0x1c, 0x7a, 0x1f, 0x0a, 0xb3, 0x95, 0x00, 0x6d, 0x43, 0x4e,
+	0x25, 0xe7, 0xbb, 0xaa, 0x4f, 0x64, 0x63, 0x83, 0xe9, 0xa2, 0x7b, 0xd3, 0xcc, 0xc5, 0x0d, 0x06,
+	0x62, 0xcb, 0xaa, 0xdc, 0xa2, 0xca, 0x90, 0x38, 0xf7, 0xc0, 0x74, 0xf5, 0x3f, 0x41, 0x36, 0x61,
+	0x32, 0xfa, 0x3d, 0x40, 0x5c, 0xbd, 0x5d, 0xcc, 0xb1, 0x3a, 0xb9, 0x78, 0xd0, 0x69, 0x61, 0x8e,
+	0xf5, 0xaf, 0x34, 0xc8, 0x4d, 0xaf, 0x17, 0x75, 0x20, 0x73, 0xca, 0xc2, 0x11, 0xe6, 0x8a, 0x1d,
+	0x7f, 0x5d, 0x8a, 0x1d, 0xd5, 0xb6, 0x8c, 0xb5, 0x15, 0x06, 0x42, 0x90, 0x96, 0x2f, 0x95, 0x23,
+	0x9e, 0x2d, 0x9f, 0xf5, 0xfb, 0x90, 0x89, 0x77, 0xa1, 0x5b, 0x80, 0xda, 0x96, 0x7d, 0xd4, 0x18,
+	0x5c, 0xa1, 0x46, 0x16, 0xd2, 0x87, 0x83, 0xa3, 0x4e, 0x59, 0xd3, 0x9f, 0x26, 0x67, 0xa3, 0x26,
+	0x96, 0x2a, 0xdc, 0x50, 0x9f, 0x1f, 0xc6, 0x43, 0xe9, 0x6c, 0x37, 0xdd, 0x8c, 0x5d, 0x6a, 0x5c,
+	0x95, 0x7d, 0xf4, 0x15, 0xdc, 0xbe, 0x66, 0x4e, 0x41, 0x7f, 0x00, 0xe0, 0x21, 0xa6, 0xd1, 0x30,
+	0xf4, 0xc7, 0x5c, 0x21, 0xcc, 0x58, 0xd0, 0x1d, 0xc8, 0x45, 0x1c, 0x9f, 0xf8, 0x81, 0xcf, 0x2f,
+	0x64, 0xfe, 0x29, 0xfb, 0xd2, 0xa0, 0xff, 0x98, 0x82, 0xe2, 0xfc, 0x6c, 0x82, 0x1e, 0xc3, 0xef,
+	0xa2, 0xc9, 0x78, 0x1c, 0x90, 0x91, 0xd0, 0x73, 0xe0, 0xb8, 0x7e, 0x34, 0x0e, 0xf0, 0x85, 0x23,
+	0xda, 0x68, 0xd2, 0xef, 0x67, 0x37, 0xb4, 0x62, 0xff, 0x80, 0x7c, 0xe0, 0xd7, 0x90, 0x3c, 0x75,
+	0x1d, 0xc9, 0xdf, 0x42, 0x69, 0xe4, 0x0f, 0x43, 0x36, 0x3e, 0x63, 0x34, 0x66, 0x82, 0x64, 0x41,
+	0xb1, 0xde, 0x58, 0x7e, 0xa6, 0xaa, 0x1e, 0x4d, 0x91, 0xa4, 0x9c, 0x8b, 0xa3, 0xb9, 0xf5, 0xc7,
+	0x4b, 0x58, 0xfa, 0x9a, 0x12, 0xf6, 0x3f, 0x28, 0xce, 0xc3, 0xa1, 0xbb, 0xb0, 0x7d, 0x64, 0x36,
+	0x6d, 0xab, 0x77, 0x68, 0x75, 0x8d, 0x8f, 0xd5, 0x81, 0x9b, 0x50, 0x6e, 0x76, 0xac, 0xbe, 0xe1,
+	0x5c, 0x6e, 0x2b, 0x6b, 0xc2, 0xda, 0x32, 0x1b, 0x1d, 0xeb, 0xc0, 0x69, 0x5b, 0x9d, 0x8e, 0xf5,
+	0xca, 0xb1, 0xba, 0xe5, 0x94, 0xfe, 0x0f, 0xc8, 0xcf, 0xb4, 0x37, 0x51, 0x89, 0x43, 0xc2, 0x27,
+	0x21, 0x75, 0x66, 0x86, 0xc0, 0x8c, 0xd4, 0x59, 0x29, 0x76, 0x4c, 0xe7, 0x31, 0xfd, 0x05, 0x14,
+	0xe7, 0x75, 0x8b, 0xfe, 0x0e, 0xf9, 0x21, 0x63, 0xa1, 0xeb, 0x53, 0xcc, 0x49, 0xa4, 0xc6, 0xa9,
+	0x1b, 0xc9, 0x01, 0x8a, 0x56, 0x59, 0xed, 0x60, 0xde, 0xa1, 0x62, 0x60, 0x9a, 0xdd, 0x99, 0x34,
+	0xd2, 0xfa, 0xe7, 0x1a, 0x6c, 0x1a, 0xea, 0x74, 0xa7, 0xe3, 0x1b, 0x8a, 0x20, 0x13, 0x2f, 0xd0,
+	0xde, 0x32, 0xff, 0x25, 0x92, 0xb3, 0x5b, 0xf5, 0xe5, 0x7f, 0x65, 0x76, 0xb5, 0x87, 0xda, 0xb3,
+	0x2f, 0x34, 0xb8, 0x37, 0x64, 0xa3, 0x05, 0xa2, 0x9f, 0x15, 0xa7, 0xa9, 0xf6, 0xc4, 0x7f, 0x5e,
+	0x4f, 0xfb, 0xcf, 0x73, 0x15, 0xe5, 0x31, 0x51, 0x24, 0xab, 0x2c, 0xf4, 0x6a, 0x1e, 0xa1, 0xf2,
+	0x2f, 0xb0, 0x16, 0xbb, 0xf0, 0xd8, 0x8f, 0x7e, 0xe9, 0x0f, 0x75, 0x3f, 0xb1, 0x7c, 0x9d, 0xca,
+	0x34, 0xfa, 0x83, 0x7e, 0xeb, 0xdf, 0x27, 0x19, 0x19, 0xff, 0xe8, 0xa7, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xb9, 0x08, 0x29, 0x0f, 0xe0, 0x0e, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
index 90fbe302..8f65f8ac 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_data.pb.go
@@ -1,38 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto
 
-/*
-Package cluster is a generated protocol buffer package.
-
-It is generated from these files:
-	google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto
-	google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto
-	google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto
-
-It has these top-level messages:
-	Zone
-	Cluster
-	ListZonesRequest
-	ListZonesResponse
-	GetClusterRequest
-	ListClustersRequest
-	ListClustersResponse
-	CreateClusterRequest
-	CreateClusterMetadata
-	UpdateClusterMetadata
-	DeleteClusterRequest
-	UndeleteClusterRequest
-	UndeleteClusterMetadata
-	V2OperationMetadata
-*/
-package cluster
+package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
 import _ "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -71,7 +47,9 @@ var StorageType_value = map[string]int32{
 func (x StorageType) String() string {
 	return proto.EnumName(StorageType_name, int32(x))
 }
-func (StorageType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (StorageType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_data_5751b30eb8ec0701, []int{0}
+}
 
 // Possible states of a zone.
 type Zone_Status int32
@@ -103,24 +81,48 @@ var Zone_Status_value = map[string]int32{
 func (x Zone_Status) String() string {
 	return proto.EnumName(Zone_Status_name, int32(x))
 }
-func (Zone_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (Zone_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_data_5751b30eb8ec0701, []int{0, 0}
+}
 
 // A physical location in which a particular project can allocate Cloud BigTable
 // resources.
 type Zone struct {
 	// A permanent unique identifier for the zone.
 	// Values are of the form projects/<project>/zones/[a-z][-a-z0-9]*
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of this zone as it appears in UIs.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// The current state of this zone.
-	Status Zone_Status `protobuf:"varint,3,opt,name=status,enum=google.bigtable.admin.cluster.v1.Zone_Status" json:"status,omitempty"`
+	Status               Zone_Status `protobuf:"varint,3,opt,name=status,proto3,enum=google.bigtable.admin.cluster.v1.Zone_Status" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *Zone) Reset()         { *m = Zone{} }
+func (m *Zone) String() string { return proto.CompactTextString(m) }
+func (*Zone) ProtoMessage()    {}
+func (*Zone) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_data_5751b30eb8ec0701, []int{0}
+}
+func (m *Zone) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Zone.Unmarshal(m, b)
+}
+func (m *Zone) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Zone.Marshal(b, m, deterministic)
+}
+func (dst *Zone) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Zone.Merge(dst, src)
+}
+func (m *Zone) XXX_Size() int {
+	return xxx_messageInfo_Zone.Size(m)
+}
+func (m *Zone) XXX_DiscardUnknown() {
+	xxx_messageInfo_Zone.DiscardUnknown(m)
 }
 
-func (m *Zone) Reset()                    { *m = Zone{} }
-func (m *Zone) String() string            { return proto.CompactTextString(m) }
-func (*Zone) ProtoMessage()               {}
-func (*Zone) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Zone proto.InternalMessageInfo
 
 func (m *Zone) GetName() string {
 	if m != nil {
@@ -149,26 +151,48 @@ type Cluster struct {
 	// zone in which the cluster resides is included here.
 	// Values are of the form
 	// projects/<project>/zones/<zone>/clusters/[a-z][-a-z0-9]*
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The operation currently running on the cluster, if any.
 	// This cannot be set directly, only through CreateCluster, UpdateCluster,
 	// or UndeleteCluster. Calls to these methods will be rejected if
 	// "current_operation" is already set.
-	CurrentOperation *google_longrunning.Operation `protobuf:"bytes,3,opt,name=current_operation,json=currentOperation" json:"current_operation,omitempty"`
+	CurrentOperation *longrunning.Operation `protobuf:"bytes,3,opt,name=current_operation,json=currentOperation,proto3" json:"current_operation,omitempty"`
 	// The descriptive name for this cluster as it appears in UIs.
 	// Must be unique per zone.
-	DisplayName string `protobuf:"bytes,4,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,4,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// The number of serve nodes allocated to this cluster.
-	ServeNodes int32 `protobuf:"varint,5,opt,name=serve_nodes,json=serveNodes" json:"serve_nodes,omitempty"`
+	ServeNodes int32 `protobuf:"varint,5,opt,name=serve_nodes,json=serveNodes,proto3" json:"serve_nodes,omitempty"`
 	// What storage type to use for tables in this cluster. Only configurable at
 	// cluster creation time. If unspecified, STORAGE_SSD will be used.
-	DefaultStorageType StorageType `protobuf:"varint,8,opt,name=default_storage_type,json=defaultStorageType,enum=google.bigtable.admin.cluster.v1.StorageType" json:"default_storage_type,omitempty"`
+	DefaultStorageType   StorageType `protobuf:"varint,8,opt,name=default_storage_type,json=defaultStorageType,proto3,enum=google.bigtable.admin.cluster.v1.StorageType" json:"default_storage_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *Cluster) Reset()         { *m = Cluster{} }
+func (m *Cluster) String() string { return proto.CompactTextString(m) }
+func (*Cluster) ProtoMessage()    {}
+func (*Cluster) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_data_5751b30eb8ec0701, []int{1}
+}
+func (m *Cluster) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cluster.Unmarshal(m, b)
+}
+func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
+}
+func (dst *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(dst, src)
+}
+func (m *Cluster) XXX_Size() int {
+	return xxx_messageInfo_Cluster.Size(m)
+}
+func (m *Cluster) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cluster.DiscardUnknown(m)
 }
 
-func (m *Cluster) Reset()                    { *m = Cluster{} }
-func (m *Cluster) String() string            { return proto.CompactTextString(m) }
-func (*Cluster) ProtoMessage()               {}
-func (*Cluster) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Cluster proto.InternalMessageInfo
 
 func (m *Cluster) GetName() string {
 	if m != nil {
@@ -177,7 +201,7 @@ func (m *Cluster) GetName() string {
 	return ""
 }
 
-func (m *Cluster) GetCurrentOperation() *google_longrunning.Operation {
+func (m *Cluster) GetCurrentOperation() *longrunning.Operation {
 	if m != nil {
 		return m.CurrentOperation
 	}
@@ -213,10 +237,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto", fileDescriptor0)
+	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto", fileDescriptor_bigtable_cluster_data_5751b30eb8ec0701)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_bigtable_cluster_data_5751b30eb8ec0701 = []byte{
 	// 493 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xd1, 0x6e, 0xd3, 0x3c,
 	0x1c, 0xc5, 0x97, 0xae, 0xeb, 0xbe, 0xcf, 0x41, 0x10, 0xcc, 0x24, 0xa2, 0x09, 0xb4, 0x52, 0xb8,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
index bfc7f2fc..518d8afc 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto
 
-package cluster
+package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -20,6 +20,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -28,8 +34,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for BigtableClusterService service
-
+// BigtableClusterServiceClient is the client API for BigtableClusterService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type BigtableClusterServiceClient interface {
 	// Lists the supported zones for the given project.
 	ListZones(ctx context.Context, in *ListZonesRequest, opts ...grpc.CallOption) (*ListZonesResponse, error)
@@ -93,7 +100,7 @@ type BigtableClusterServiceClient interface {
 	// At the cluster's "delete_time":
 	//  * The cluster and *all of its tables* will immediately and irrevocably
 	//    disappear from the API, and their data will be permanently deleted.
-	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Cancels the scheduled deletion of an cluster and begins preparing it to
 	// resume serving. The returned operation will also be embedded as the
 	// cluster's "current_operation".
@@ -107,7 +114,7 @@ type BigtableClusterServiceClient interface {
 	//  * All tables within the cluster will be available.
 	// [UndeleteClusterMetadata][google.bigtable.admin.cluster.v1.UndeleteClusterMetadata] The embedded operation's "response" field type is
 	// [Cluster][google.bigtable.admin.cluster.v1.Cluster], if successful.
-	UndeleteCluster(ctx context.Context, in *UndeleteClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UndeleteCluster(ctx context.Context, in *UndeleteClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type bigtableClusterServiceClient struct {
@@ -120,7 +127,7 @@ func NewBigtableClusterServiceClient(cc *grpc.ClientConn) BigtableClusterService
 
 func (c *bigtableClusterServiceClient) ListZones(ctx context.Context, in *ListZonesRequest, opts ...grpc.CallOption) (*ListZonesResponse, error) {
 	out := new(ListZonesResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/ListZones", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/ListZones", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -129,7 +136,7 @@ func (c *bigtableClusterServiceClient) ListZones(ctx context.Context, in *ListZo
 
 func (c *bigtableClusterServiceClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/GetCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/GetCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -138,7 +145,7 @@ func (c *bigtableClusterServiceClient) GetCluster(ctx context.Context, in *GetCl
 
 func (c *bigtableClusterServiceClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
 	out := new(ListClustersResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/ListClusters", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/ListClusters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -147,7 +154,7 @@ func (c *bigtableClusterServiceClient) ListClusters(ctx context.Context, in *Lis
 
 func (c *bigtableClusterServiceClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/CreateCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/CreateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -156,33 +163,32 @@ func (c *bigtableClusterServiceClient) CreateCluster(ctx context.Context, in *Cr
 
 func (c *bigtableClusterServiceClient) UpdateCluster(ctx context.Context, in *Cluster, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/UpdateCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/UpdateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableClusterServiceClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/DeleteCluster", in, out, c.cc, opts...)
+func (c *bigtableClusterServiceClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/DeleteCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableClusterServiceClient) UndeleteCluster(ctx context.Context, in *UndeleteClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/UndeleteCluster", in, out, c.cc, opts...)
+func (c *bigtableClusterServiceClient) UndeleteCluster(ctx context.Context, in *UndeleteClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.cluster.v1.BigtableClusterService/UndeleteCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for BigtableClusterService service
-
+// BigtableClusterServiceServer is the server API for BigtableClusterService service.
 type BigtableClusterServiceServer interface {
 	// Lists the supported zones for the given project.
 	ListZones(context.Context, *ListZonesRequest) (*ListZonesResponse, error)
@@ -246,7 +252,7 @@ type BigtableClusterServiceServer interface {
 	// At the cluster's "delete_time":
 	//  * The cluster and *all of its tables* will immediately and irrevocably
 	//    disappear from the API, and their data will be permanently deleted.
-	DeleteCluster(context.Context, *DeleteClusterRequest) (*google_protobuf2.Empty, error)
+	DeleteCluster(context.Context, *DeleteClusterRequest) (*empty.Empty, error)
 	// Cancels the scheduled deletion of an cluster and begins preparing it to
 	// resume serving. The returned operation will also be embedded as the
 	// cluster's "current_operation".
@@ -260,7 +266,7 @@ type BigtableClusterServiceServer interface {
 	//  * All tables within the cluster will be available.
 	// [UndeleteClusterMetadata][google.bigtable.admin.cluster.v1.UndeleteClusterMetadata] The embedded operation's "response" field type is
 	// [Cluster][google.bigtable.admin.cluster.v1.Cluster], if successful.
-	UndeleteCluster(context.Context, *UndeleteClusterRequest) (*google_longrunning.Operation, error)
+	UndeleteCluster(context.Context, *UndeleteClusterRequest) (*longrunning.Operation, error)
 }
 
 func RegisterBigtableClusterServiceServer(s *grpc.Server, srv BigtableClusterServiceServer) {
@@ -431,10 +437,10 @@ var _BigtableClusterService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto", fileDescriptor1)
+	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto", fileDescriptor_bigtable_cluster_service_eb6b3340e63f14bc)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_bigtable_cluster_service_eb6b3340e63f14bc = []byte{
 	// 515 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4f, 0x6b, 0x14, 0x31,
 	0x18, 0xc6, 0x89, 0x07, 0xa1, 0xc1, 0x45, 0xc8, 0xa1, 0x87, 0x6d, 0x0b, 0x32, 0x15, 0xb1, 0x23,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
index 1f993aa2..79aaea16 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.pb.go
@@ -1,30 +1,58 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto
 
-package cluster
+package cluster // import "google.golang.org/genproto/googleapis/bigtable/admin/cluster/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Request message for BigtableClusterService.ListZones.
 type ListZonesRequest struct {
 	// The unique name of the project for which a list of supported zones is
 	// requested.
 	// Values are of the form projects/<project>
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListZonesRequest) Reset()                    { *m = ListZonesRequest{} }
-func (m *ListZonesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListZonesRequest) ProtoMessage()               {}
-func (*ListZonesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (m *ListZonesRequest) Reset()         { *m = ListZonesRequest{} }
+func (m *ListZonesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListZonesRequest) ProtoMessage()    {}
+func (*ListZonesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{0}
+}
+func (m *ListZonesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListZonesRequest.Unmarshal(m, b)
+}
+func (m *ListZonesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListZonesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListZonesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListZonesRequest.Merge(dst, src)
+}
+func (m *ListZonesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListZonesRequest.Size(m)
+}
+func (m *ListZonesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListZonesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListZonesRequest proto.InternalMessageInfo
 
 func (m *ListZonesRequest) GetName() string {
 	if m != nil {
@@ -36,13 +64,35 @@ func (m *ListZonesRequest) GetName() string {
 // Response message for BigtableClusterService.ListZones.
 type ListZonesResponse struct {
 	// The list of requested zones.
-	Zones []*Zone `protobuf:"bytes,1,rep,name=zones" json:"zones,omitempty"`
+	Zones                []*Zone  `protobuf:"bytes,1,rep,name=zones,proto3" json:"zones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListZonesResponse) Reset()         { *m = ListZonesResponse{} }
+func (m *ListZonesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListZonesResponse) ProtoMessage()    {}
+func (*ListZonesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{1}
+}
+func (m *ListZonesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListZonesResponse.Unmarshal(m, b)
+}
+func (m *ListZonesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListZonesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListZonesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListZonesResponse.Merge(dst, src)
+}
+func (m *ListZonesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListZonesResponse.Size(m)
+}
+func (m *ListZonesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListZonesResponse.DiscardUnknown(m)
 }
 
-func (m *ListZonesResponse) Reset()                    { *m = ListZonesResponse{} }
-func (m *ListZonesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListZonesResponse) ProtoMessage()               {}
-func (*ListZonesResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_ListZonesResponse proto.InternalMessageInfo
 
 func (m *ListZonesResponse) GetZones() []*Zone {
 	if m != nil {
@@ -55,13 +105,35 @@ func (m *ListZonesResponse) GetZones() []*Zone {
 type GetClusterRequest struct {
 	// The unique name of the requested cluster.
 	// Values are of the form projects/<project>/zones/<zone>/clusters/<cluster>
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
+func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*GetClusterRequest) ProtoMessage()    {}
+func (*GetClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{2}
+}
+func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
+}
+func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+}
+func (m *GetClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_GetClusterRequest.Size(m)
+}
+func (m *GetClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetClusterRequest.DiscardUnknown(m)
 }
 
-func (m *GetClusterRequest) Reset()                    { *m = GetClusterRequest{} }
-func (m *GetClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetClusterRequest) ProtoMessage()               {}
-func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_GetClusterRequest proto.InternalMessageInfo
 
 func (m *GetClusterRequest) GetName() string {
 	if m != nil {
@@ -74,13 +146,35 @@ func (m *GetClusterRequest) GetName() string {
 type ListClustersRequest struct {
 	// The unique name of the project for which a list of clusters is requested.
 	// Values are of the form projects/<project>
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListClustersRequest) Reset()                    { *m = ListClustersRequest{} }
-func (m *ListClustersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersRequest) ProtoMessage()               {}
-func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
+func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClustersRequest) ProtoMessage()    {}
+func (*ListClustersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{3}
+}
+func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
+}
+func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+}
+func (m *ListClustersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClustersRequest.Size(m)
+}
+func (m *ListClustersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClustersRequest proto.InternalMessageInfo
 
 func (m *ListClustersRequest) GetName() string {
 	if m != nil {
@@ -92,15 +186,37 @@ func (m *ListClustersRequest) GetName() string {
 // Response message for BigtableClusterService.ListClusters.
 type ListClustersResponse struct {
 	// The list of requested Clusters.
-	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters" json:"clusters,omitempty"`
+	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	// The zones for which clusters could not be retrieved.
-	FailedZones []*Zone `protobuf:"bytes,2,rep,name=failed_zones,json=failedZones" json:"failed_zones,omitempty"`
+	FailedZones          []*Zone  `protobuf:"bytes,2,rep,name=failed_zones,json=failedZones,proto3" json:"failed_zones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListClustersResponse) Reset()                    { *m = ListClustersResponse{} }
-func (m *ListClustersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersResponse) ProtoMessage()               {}
-func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
+func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClustersResponse) ProtoMessage()    {}
+func (*ListClustersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{4}
+}
+func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
+}
+func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+}
+func (m *ListClustersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClustersResponse.Size(m)
+}
+func (m *ListClustersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClustersResponse proto.InternalMessageInfo
 
 func (m *ListClustersResponse) GetClusters() []*Cluster {
 	if m != nil {
@@ -120,21 +236,43 @@ func (m *ListClustersResponse) GetFailedZones() []*Zone {
 type CreateClusterRequest struct {
 	// The unique name of the zone in which to create the cluster.
 	// Values are of the form projects/<project>/zones/<zone>
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The id to be used when referring to the new cluster within its zone,
 	// e.g. just the "test-cluster" section of the full name
 	// "projects/<project>/zones/<zone>/clusters/test-cluster".
-	ClusterId string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The cluster to create.
 	// The "name", "delete_time", and "current_operation" fields must be left
 	// blank.
-	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster              *Cluster `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
+func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterRequest) ProtoMessage()    {}
+func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{5}
+}
+func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
+}
+func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+}
+func (m *CreateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterRequest.Size(m)
+}
+func (m *CreateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterRequest.DiscardUnknown(m)
 }
 
-func (m *CreateClusterRequest) Reset()                    { *m = CreateClusterRequest{} }
-func (m *CreateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterRequest) ProtoMessage()               {}
-func (*CreateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_CreateClusterRequest proto.InternalMessageInfo
 
 func (m *CreateClusterRequest) GetName() string {
 	if m != nil {
@@ -161,17 +299,39 @@ func (m *CreateClusterRequest) GetCluster() *Cluster {
 // BigtableClusterService.CreateCluster.
 type CreateClusterMetadata struct {
 	// The request which prompted the creation of this operation.
-	OriginalRequest *CreateClusterRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
+	OriginalRequest *CreateClusterRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
 	// The time at which original_request was received.
-	RequestTime *google_protobuf3.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which this operation failed or was completed successfully.
-	FinishTime *google_protobuf3.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *CreateClusterMetadata) Reset()                    { *m = CreateClusterMetadata{} }
-func (m *CreateClusterMetadata) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterMetadata) ProtoMessage()               {}
-func (*CreateClusterMetadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+func (m *CreateClusterMetadata) Reset()         { *m = CreateClusterMetadata{} }
+func (m *CreateClusterMetadata) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterMetadata) ProtoMessage()    {}
+func (*CreateClusterMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{6}
+}
+func (m *CreateClusterMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterMetadata.Unmarshal(m, b)
+}
+func (m *CreateClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterMetadata.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterMetadata.Merge(dst, src)
+}
+func (m *CreateClusterMetadata) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterMetadata.Size(m)
+}
+func (m *CreateClusterMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateClusterMetadata proto.InternalMessageInfo
 
 func (m *CreateClusterMetadata) GetOriginalRequest() *CreateClusterRequest {
 	if m != nil {
@@ -180,14 +340,14 @@ func (m *CreateClusterMetadata) GetOriginalRequest() *CreateClusterRequest {
 	return nil
 }
 
-func (m *CreateClusterMetadata) GetRequestTime() *google_protobuf3.Timestamp {
+func (m *CreateClusterMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *CreateClusterMetadata) GetFinishTime() *google_protobuf3.Timestamp {
+func (m *CreateClusterMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
@@ -198,21 +358,43 @@ func (m *CreateClusterMetadata) GetFinishTime() *google_protobuf3.Timestamp {
 // BigtableClusterService.UpdateCluster.
 type UpdateClusterMetadata struct {
 	// The request which prompted the creation of this operation.
-	OriginalRequest *Cluster `protobuf:"bytes,1,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
+	OriginalRequest *Cluster `protobuf:"bytes,1,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
 	// The time at which original_request was received.
-	RequestTime *google_protobuf3.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which this operation was cancelled. If set, this operation is
 	// in the process of undoing itself (which is guaranteed to succeed) and
 	// cannot be cancelled again.
-	CancelTime *google_protobuf3.Timestamp `protobuf:"bytes,3,opt,name=cancel_time,json=cancelTime" json:"cancel_time,omitempty"`
+	CancelTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=cancel_time,json=cancelTime,proto3" json:"cancel_time,omitempty"`
 	// The time at which this operation failed or was completed successfully.
-	FinishTime *google_protobuf3.Timestamp `protobuf:"bytes,4,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *UpdateClusterMetadata) Reset()                    { *m = UpdateClusterMetadata{} }
-func (m *UpdateClusterMetadata) String() string            { return proto.CompactTextString(m) }
-func (*UpdateClusterMetadata) ProtoMessage()               {}
-func (*UpdateClusterMetadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+func (m *UpdateClusterMetadata) Reset()         { *m = UpdateClusterMetadata{} }
+func (m *UpdateClusterMetadata) String() string { return proto.CompactTextString(m) }
+func (*UpdateClusterMetadata) ProtoMessage()    {}
+func (*UpdateClusterMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{7}
+}
+func (m *UpdateClusterMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateClusterMetadata.Unmarshal(m, b)
+}
+func (m *UpdateClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateClusterMetadata.Marshal(b, m, deterministic)
+}
+func (dst *UpdateClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterMetadata.Merge(dst, src)
+}
+func (m *UpdateClusterMetadata) XXX_Size() int {
+	return xxx_messageInfo_UpdateClusterMetadata.Size(m)
+}
+func (m *UpdateClusterMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateClusterMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateClusterMetadata proto.InternalMessageInfo
 
 func (m *UpdateClusterMetadata) GetOriginalRequest() *Cluster {
 	if m != nil {
@@ -221,21 +403,21 @@ func (m *UpdateClusterMetadata) GetOriginalRequest() *Cluster {
 	return nil
 }
 
-func (m *UpdateClusterMetadata) GetRequestTime() *google_protobuf3.Timestamp {
+func (m *UpdateClusterMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *UpdateClusterMetadata) GetCancelTime() *google_protobuf3.Timestamp {
+func (m *UpdateClusterMetadata) GetCancelTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CancelTime
 	}
 	return nil
 }
 
-func (m *UpdateClusterMetadata) GetFinishTime() *google_protobuf3.Timestamp {
+func (m *UpdateClusterMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
@@ -246,13 +428,35 @@ func (m *UpdateClusterMetadata) GetFinishTime() *google_protobuf3.Timestamp {
 type DeleteClusterRequest struct {
 	// The unique name of the cluster to be deleted.
 	// Values are of the form projects/<project>/zones/<zone>/clusters/<cluster>
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
+func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteClusterRequest) ProtoMessage()    {}
+func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{8}
+}
+func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
+}
+func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+}
+func (m *DeleteClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteClusterRequest.Size(m)
+}
+func (m *DeleteClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteClusterRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteClusterRequest) Reset()                    { *m = DeleteClusterRequest{} }
-func (m *DeleteClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteClusterRequest) ProtoMessage()               {}
-func (*DeleteClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+var xxx_messageInfo_DeleteClusterRequest proto.InternalMessageInfo
 
 func (m *DeleteClusterRequest) GetName() string {
 	if m != nil {
@@ -265,13 +469,35 @@ func (m *DeleteClusterRequest) GetName() string {
 type UndeleteClusterRequest struct {
 	// The unique name of the cluster to be un-deleted.
 	// Values are of the form projects/<project>/zones/<zone>/clusters/<cluster>
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UndeleteClusterRequest) Reset()                    { *m = UndeleteClusterRequest{} }
-func (m *UndeleteClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*UndeleteClusterRequest) ProtoMessage()               {}
-func (*UndeleteClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+func (m *UndeleteClusterRequest) Reset()         { *m = UndeleteClusterRequest{} }
+func (m *UndeleteClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*UndeleteClusterRequest) ProtoMessage()    {}
+func (*UndeleteClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{9}
+}
+func (m *UndeleteClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UndeleteClusterRequest.Unmarshal(m, b)
+}
+func (m *UndeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UndeleteClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *UndeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteClusterRequest.Merge(dst, src)
+}
+func (m *UndeleteClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_UndeleteClusterRequest.Size(m)
+}
+func (m *UndeleteClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UndeleteClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UndeleteClusterRequest proto.InternalMessageInfo
 
 func (m *UndeleteClusterRequest) GetName() string {
 	if m != nil {
@@ -284,24 +510,46 @@ func (m *UndeleteClusterRequest) GetName() string {
 // BigtableClusterService.UndeleteCluster.
 type UndeleteClusterMetadata struct {
 	// The time at which the original request was received.
-	RequestTime *google_protobuf3.Timestamp `protobuf:"bytes,1,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which this operation failed or was completed successfully.
-	FinishTime *google_protobuf3.Timestamp `protobuf:"bytes,2,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,2,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *UndeleteClusterMetadata) Reset()                    { *m = UndeleteClusterMetadata{} }
-func (m *UndeleteClusterMetadata) String() string            { return proto.CompactTextString(m) }
-func (*UndeleteClusterMetadata) ProtoMessage()               {}
-func (*UndeleteClusterMetadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} }
+func (m *UndeleteClusterMetadata) Reset()         { *m = UndeleteClusterMetadata{} }
+func (m *UndeleteClusterMetadata) String() string { return proto.CompactTextString(m) }
+func (*UndeleteClusterMetadata) ProtoMessage()    {}
+func (*UndeleteClusterMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{10}
+}
+func (m *UndeleteClusterMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UndeleteClusterMetadata.Unmarshal(m, b)
+}
+func (m *UndeleteClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UndeleteClusterMetadata.Marshal(b, m, deterministic)
+}
+func (dst *UndeleteClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteClusterMetadata.Merge(dst, src)
+}
+func (m *UndeleteClusterMetadata) XXX_Size() int {
+	return xxx_messageInfo_UndeleteClusterMetadata.Size(m)
+}
+func (m *UndeleteClusterMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_UndeleteClusterMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UndeleteClusterMetadata proto.InternalMessageInfo
 
-func (m *UndeleteClusterMetadata) GetRequestTime() *google_protobuf3.Timestamp {
+func (m *UndeleteClusterMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *UndeleteClusterMetadata) GetFinishTime() *google_protobuf3.Timestamp {
+func (m *UndeleteClusterMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
@@ -311,12 +559,34 @@ func (m *UndeleteClusterMetadata) GetFinishTime() *google_protobuf3.Timestamp {
 // Metadata type for operations initiated by the V2 BigtableAdmin service.
 // More complete information for such operations is available via the V2 API.
 type V2OperationMetadata struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *V2OperationMetadata) Reset()         { *m = V2OperationMetadata{} }
+func (m *V2OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*V2OperationMetadata) ProtoMessage()    {}
+func (*V2OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3, []int{11}
+}
+func (m *V2OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_V2OperationMetadata.Unmarshal(m, b)
+}
+func (m *V2OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_V2OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *V2OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_V2OperationMetadata.Merge(dst, src)
+}
+func (m *V2OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_V2OperationMetadata.Size(m)
+}
+func (m *V2OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_V2OperationMetadata.DiscardUnknown(m)
 }
 
-func (m *V2OperationMetadata) Reset()                    { *m = V2OperationMetadata{} }
-func (m *V2OperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*V2OperationMetadata) ProtoMessage()               {}
-func (*V2OperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} }
+var xxx_messageInfo_V2OperationMetadata proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*ListZonesRequest)(nil), "google.bigtable.admin.cluster.v1.ListZonesRequest")
@@ -334,10 +604,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto", fileDescriptor2)
+	proto.RegisterFile("google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto", fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3)
 }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_bigtable_cluster_service_messages_964162c5e08631c3 = []byte{
 	// 541 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x40,
 	0x10, 0xd5, 0x26, 0xe5, 0xa3, 0xe3, 0x4a, 0xb4, 0x6e, 0x02, 0x51, 0x24, 0x44, 0x64, 0x50, 0x69,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
index 2c6183d8..55f1cfd2 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_data.pb.go
@@ -1,35 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_data.proto
 
-/*
-Package table is a generated protocol buffer package.
-
-It is generated from these files:
-	google/bigtable/admin/table/v1/bigtable_table_data.proto
-	google/bigtable/admin/table/v1/bigtable_table_service.proto
-	google/bigtable/admin/table/v1/bigtable_table_service_messages.proto
-
-It has these top-level messages:
-	Table
-	ColumnFamily
-	GcRule
-	CreateTableRequest
-	ListTablesRequest
-	ListTablesResponse
-	GetTableRequest
-	DeleteTableRequest
-	RenameTableRequest
-	CreateColumnFamilyRequest
-	DeleteColumnFamilyRequest
-	BulkDeleteRowsRequest
-*/
-package table
+package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -59,7 +37,7 @@ func (x Table_TimestampGranularity) String() string {
 	return proto.EnumName(Table_TimestampGranularity_name, int32(x))
 }
 func (Table_TimestampGranularity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 0}
+	return fileDescriptor_bigtable_table_data_021ea70d03a8dd36, []int{0, 0}
 }
 
 // A collection of user data indexed by row, column, and timestamp.
@@ -67,23 +45,45 @@ func (Table_TimestampGranularity) EnumDescriptor() ([]byte, []int) {
 type Table struct {
 	// A unique identifier of the form
 	// <cluster_name>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// If this Table is in the process of being created, the Operation used to
 	// track its progress. As long as this operation is present, the Table will
 	// not accept any Table Admin or Read/Write requests.
-	CurrentOperation *google_longrunning.Operation `protobuf:"bytes,2,opt,name=current_operation,json=currentOperation" json:"current_operation,omitempty"`
+	CurrentOperation *longrunning.Operation `protobuf:"bytes,2,opt,name=current_operation,json=currentOperation,proto3" json:"current_operation,omitempty"`
 	// The column families configured for this table, mapped by column family id.
-	ColumnFamilies map[string]*ColumnFamily `protobuf:"bytes,3,rep,name=column_families,json=columnFamilies" json:"column_families,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ColumnFamilies map[string]*ColumnFamily `protobuf:"bytes,3,rep,name=column_families,json=columnFamilies,proto3" json:"column_families,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The granularity (e.g. MILLIS, MICROS) at which timestamps are stored in
 	// this table. Timestamps not matching the granularity will be rejected.
 	// Cannot be changed once the table is created.
-	Granularity Table_TimestampGranularity `protobuf:"varint,4,opt,name=granularity,enum=google.bigtable.admin.table.v1.Table_TimestampGranularity" json:"granularity,omitempty"`
+	Granularity          Table_TimestampGranularity `protobuf:"varint,4,opt,name=granularity,proto3,enum=google.bigtable.admin.table.v1.Table_TimestampGranularity" json:"granularity,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *Table) Reset()                    { *m = Table{} }
-func (m *Table) String() string            { return proto.CompactTextString(m) }
-func (*Table) ProtoMessage()               {}
-func (*Table) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Table) Reset()         { *m = Table{} }
+func (m *Table) String() string { return proto.CompactTextString(m) }
+func (*Table) ProtoMessage()    {}
+func (*Table) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_data_021ea70d03a8dd36, []int{0}
+}
+func (m *Table) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Table.Unmarshal(m, b)
+}
+func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Table.Marshal(b, m, deterministic)
+}
+func (dst *Table) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table.Merge(dst, src)
+}
+func (m *Table) XXX_Size() int {
+	return xxx_messageInfo_Table.Size(m)
+}
+func (m *Table) XXX_DiscardUnknown() {
+	xxx_messageInfo_Table.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Table proto.InternalMessageInfo
 
 func (m *Table) GetName() string {
 	if m != nil {
@@ -92,7 +92,7 @@ func (m *Table) GetName() string {
 	return ""
 }
 
-func (m *Table) GetCurrentOperation() *google_longrunning.Operation {
+func (m *Table) GetCurrentOperation() *longrunning.Operation {
 	if m != nil {
 		return m.CurrentOperation
 	}
@@ -118,7 +118,7 @@ type ColumnFamily struct {
 	// A unique identifier of the form <table_name>/columnFamilies/[-_.a-zA-Z0-9]+
 	// The last segment is the same as the "name" field in
 	// google.bigtable.v1.Family.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Garbage collection expression specified by the following grammar:
 	//   GC = EXPR
 	//      | "" ;
@@ -144,7 +144,7 @@ type ColumnFamily struct {
 	// Garbage collection executes opportunistically in the background, and so
 	// it's possible for reads to return a cell even if it matches the active GC
 	// expression for its family.
-	GcExpression string `protobuf:"bytes,2,opt,name=gc_expression,json=gcExpression" json:"gc_expression,omitempty"`
+	GcExpression string `protobuf:"bytes,2,opt,name=gc_expression,json=gcExpression,proto3" json:"gc_expression,omitempty"`
 	// Garbage collection rule specified as a protobuf.
 	// Supersedes `gc_expression`.
 	// Must serialize to at most 500 bytes.
@@ -152,13 +152,35 @@ type ColumnFamily struct {
 	// NOTE: Garbage collection executes opportunistically in the background, and
 	// so it's possible for reads to return a cell even if it matches the active
 	// GC expression for its family.
-	GcRule *GcRule `protobuf:"bytes,3,opt,name=gc_rule,json=gcRule" json:"gc_rule,omitempty"`
+	GcRule               *GcRule  `protobuf:"bytes,3,opt,name=gc_rule,json=gcRule,proto3" json:"gc_rule,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ColumnFamily) Reset()                    { *m = ColumnFamily{} }
-func (m *ColumnFamily) String() string            { return proto.CompactTextString(m) }
-func (*ColumnFamily) ProtoMessage()               {}
-func (*ColumnFamily) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ColumnFamily) Reset()         { *m = ColumnFamily{} }
+func (m *ColumnFamily) String() string { return proto.CompactTextString(m) }
+func (*ColumnFamily) ProtoMessage()    {}
+func (*ColumnFamily) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_data_021ea70d03a8dd36, []int{1}
+}
+func (m *ColumnFamily) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColumnFamily.Unmarshal(m, b)
+}
+func (m *ColumnFamily) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColumnFamily.Marshal(b, m, deterministic)
+}
+func (dst *ColumnFamily) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnFamily.Merge(dst, src)
+}
+func (m *ColumnFamily) XXX_Size() int {
+	return xxx_messageInfo_ColumnFamily.Size(m)
+}
+func (m *ColumnFamily) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColumnFamily.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ColumnFamily proto.InternalMessageInfo
 
 func (m *ColumnFamily) GetName() string {
 	if m != nil {
@@ -188,35 +210,63 @@ type GcRule struct {
 	//	*GcRule_MaxAge
 	//	*GcRule_Intersection_
 	//	*GcRule_Union_
-	Rule isGcRule_Rule `protobuf_oneof:"rule"`
+	Rule                 isGcRule_Rule `protobuf_oneof:"rule"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *GcRule) Reset()         { *m = GcRule{} }
+func (m *GcRule) String() string { return proto.CompactTextString(m) }
+func (*GcRule) ProtoMessage()    {}
+func (*GcRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_data_021ea70d03a8dd36, []int{2}
+}
+func (m *GcRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcRule.Unmarshal(m, b)
+}
+func (m *GcRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcRule.Marshal(b, m, deterministic)
+}
+func (dst *GcRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule.Merge(dst, src)
+}
+func (m *GcRule) XXX_Size() int {
+	return xxx_messageInfo_GcRule.Size(m)
+}
+func (m *GcRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcRule.DiscardUnknown(m)
 }
 
-func (m *GcRule) Reset()                    { *m = GcRule{} }
-func (m *GcRule) String() string            { return proto.CompactTextString(m) }
-func (*GcRule) ProtoMessage()               {}
-func (*GcRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_GcRule proto.InternalMessageInfo
 
 type isGcRule_Rule interface {
 	isGcRule_Rule()
 }
 
 type GcRule_MaxNumVersions struct {
-	MaxNumVersions int32 `protobuf:"varint,1,opt,name=max_num_versions,json=maxNumVersions,oneof"`
+	MaxNumVersions int32 `protobuf:"varint,1,opt,name=max_num_versions,json=maxNumVersions,proto3,oneof"`
 }
+
 type GcRule_MaxAge struct {
-	MaxAge *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=max_age,json=maxAge,oneof"`
+	MaxAge *duration.Duration `protobuf:"bytes,2,opt,name=max_age,json=maxAge,proto3,oneof"`
 }
+
 type GcRule_Intersection_ struct {
-	Intersection *GcRule_Intersection `protobuf:"bytes,3,opt,name=intersection,oneof"`
+	Intersection *GcRule_Intersection `protobuf:"bytes,3,opt,name=intersection,proto3,oneof"`
 }
+
 type GcRule_Union_ struct {
-	Union *GcRule_Union `protobuf:"bytes,4,opt,name=union,oneof"`
+	Union *GcRule_Union `protobuf:"bytes,4,opt,name=union,proto3,oneof"`
 }
 
 func (*GcRule_MaxNumVersions) isGcRule_Rule() {}
-func (*GcRule_MaxAge) isGcRule_Rule()         {}
-func (*GcRule_Intersection_) isGcRule_Rule()  {}
-func (*GcRule_Union_) isGcRule_Rule()         {}
+
+func (*GcRule_MaxAge) isGcRule_Rule() {}
+
+func (*GcRule_Intersection_) isGcRule_Rule() {}
+
+func (*GcRule_Union_) isGcRule_Rule() {}
 
 func (m *GcRule) GetRule() isGcRule_Rule {
 	if m != nil {
@@ -232,7 +282,7 @@ func (m *GcRule) GetMaxNumVersions() int32 {
 	return 0
 }
 
-func (m *GcRule) GetMaxAge() *google_protobuf3.Duration {
+func (m *GcRule) GetMaxAge() *duration.Duration {
 	if x, ok := m.GetRule().(*GcRule_MaxAge); ok {
 		return x.MaxAge
 	}
@@ -306,7 +356,7 @@ func _GcRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf3.Duration)
+		msg := new(duration.Duration)
 		err := b.DecodeMessage(msg)
 		m.Rule = &GcRule_MaxAge{msg}
 		return true, err
@@ -336,21 +386,21 @@ func _GcRule_OneofSizer(msg proto.Message) (n int) {
 	// rule
 	switch x := m.Rule.(type) {
 	case *GcRule_MaxNumVersions:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.MaxNumVersions))
 	case *GcRule_MaxAge:
 		s := proto.Size(x.MaxAge)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GcRule_Intersection_:
 		s := proto.Size(x.Intersection)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GcRule_Union_:
 		s := proto.Size(x.Union)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -363,13 +413,35 @@ func _GcRule_OneofSizer(msg proto.Message) (n int) {
 // A GcRule which deletes cells matching all of the given rules.
 type GcRule_Intersection struct {
 	// Only delete cells which would be deleted by every element of `rules`.
-	Rules []*GcRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*GcRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *GcRule_Intersection) Reset()         { *m = GcRule_Intersection{} }
+func (m *GcRule_Intersection) String() string { return proto.CompactTextString(m) }
+func (*GcRule_Intersection) ProtoMessage()    {}
+func (*GcRule_Intersection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_data_021ea70d03a8dd36, []int{2, 0}
+}
+func (m *GcRule_Intersection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcRule_Intersection.Unmarshal(m, b)
+}
+func (m *GcRule_Intersection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcRule_Intersection.Marshal(b, m, deterministic)
+}
+func (dst *GcRule_Intersection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule_Intersection.Merge(dst, src)
+}
+func (m *GcRule_Intersection) XXX_Size() int {
+	return xxx_messageInfo_GcRule_Intersection.Size(m)
+}
+func (m *GcRule_Intersection) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcRule_Intersection.DiscardUnknown(m)
 }
 
-func (m *GcRule_Intersection) Reset()                    { *m = GcRule_Intersection{} }
-func (m *GcRule_Intersection) String() string            { return proto.CompactTextString(m) }
-func (*GcRule_Intersection) ProtoMessage()               {}
-func (*GcRule_Intersection) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+var xxx_messageInfo_GcRule_Intersection proto.InternalMessageInfo
 
 func (m *GcRule_Intersection) GetRules() []*GcRule {
 	if m != nil {
@@ -381,13 +453,35 @@ func (m *GcRule_Intersection) GetRules() []*GcRule {
 // A GcRule which deletes cells matching any of the given rules.
 type GcRule_Union struct {
 	// Delete cells which would be deleted by any element of `rules`.
-	Rules []*GcRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*GcRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *GcRule_Union) Reset()         { *m = GcRule_Union{} }
+func (m *GcRule_Union) String() string { return proto.CompactTextString(m) }
+func (*GcRule_Union) ProtoMessage()    {}
+func (*GcRule_Union) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_data_021ea70d03a8dd36, []int{2, 1}
+}
+func (m *GcRule_Union) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcRule_Union.Unmarshal(m, b)
+}
+func (m *GcRule_Union) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcRule_Union.Marshal(b, m, deterministic)
+}
+func (dst *GcRule_Union) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule_Union.Merge(dst, src)
+}
+func (m *GcRule_Union) XXX_Size() int {
+	return xxx_messageInfo_GcRule_Union.Size(m)
+}
+func (m *GcRule_Union) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcRule_Union.DiscardUnknown(m)
 }
 
-func (m *GcRule_Union) Reset()                    { *m = GcRule_Union{} }
-func (m *GcRule_Union) String() string            { return proto.CompactTextString(m) }
-func (*GcRule_Union) ProtoMessage()               {}
-func (*GcRule_Union) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
+var xxx_messageInfo_GcRule_Union proto.InternalMessageInfo
 
 func (m *GcRule_Union) GetRules() []*GcRule {
 	if m != nil {
@@ -398,6 +492,7 @@ func (m *GcRule_Union) GetRules() []*GcRule {
 
 func init() {
 	proto.RegisterType((*Table)(nil), "google.bigtable.admin.table.v1.Table")
+	proto.RegisterMapType((map[string]*ColumnFamily)(nil), "google.bigtable.admin.table.v1.Table.ColumnFamiliesEntry")
 	proto.RegisterType((*ColumnFamily)(nil), "google.bigtable.admin.table.v1.ColumnFamily")
 	proto.RegisterType((*GcRule)(nil), "google.bigtable.admin.table.v1.GcRule")
 	proto.RegisterType((*GcRule_Intersection)(nil), "google.bigtable.admin.table.v1.GcRule.Intersection")
@@ -406,10 +501,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_data.proto", fileDescriptor0)
+	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_data.proto", fileDescriptor_bigtable_table_data_021ea70d03a8dd36)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_bigtable_table_data_021ea70d03a8dd36 = []byte{
 	// 579 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x61, 0x6b, 0xd3, 0x40,
 	0x18, 0xc7, 0x9b, 0xa5, 0xed, 0xd8, 0xb3, 0x3a, 0xeb, 0x29, 0x52, 0x0b, 0x4a, 0xc9, 0x40, 0x8a,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
index 3d5049ab..dcbc7f4f 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_service.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_service.proto
 
-package table
+package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -19,6 +19,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -27,8 +33,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for BigtableTableService service
-
+// BigtableTableServiceClient is the client API for BigtableTableService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type BigtableTableServiceClient interface {
 	// Creates a new table, to be served from a specified cluster.
 	// The table can be created with a full set of initial column families,
@@ -39,18 +46,18 @@ type BigtableTableServiceClient interface {
 	// Gets the schema of the specified table, including its column families.
 	GetTable(ctx context.Context, in *GetTableRequest, opts ...grpc.CallOption) (*Table, error)
 	// Permanently deletes a specified table and all of its data.
-	DeleteTable(ctx context.Context, in *DeleteTableRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteTable(ctx context.Context, in *DeleteTableRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Changes the name of a specified table.
 	// Cannot be used to move tables between clusters, zones, or projects.
-	RenameTable(ctx context.Context, in *RenameTableRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	RenameTable(ctx context.Context, in *RenameTableRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Creates a new column family within a specified table.
 	CreateColumnFamily(ctx context.Context, in *CreateColumnFamilyRequest, opts ...grpc.CallOption) (*ColumnFamily, error)
 	// Changes the configuration of a specified column family.
 	UpdateColumnFamily(ctx context.Context, in *ColumnFamily, opts ...grpc.CallOption) (*ColumnFamily, error)
 	// Permanently deletes a specified column family and all of its data.
-	DeleteColumnFamily(ctx context.Context, in *DeleteColumnFamilyRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteColumnFamily(ctx context.Context, in *DeleteColumnFamilyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Delete all rows in a table corresponding to a particular prefix
-	BulkDeleteRows(ctx context.Context, in *BulkDeleteRowsRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	BulkDeleteRows(ctx context.Context, in *BulkDeleteRowsRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type bigtableTableServiceClient struct {
@@ -63,7 +70,7 @@ func NewBigtableTableServiceClient(cc *grpc.ClientConn) BigtableTableServiceClie
 
 func (c *bigtableTableServiceClient) CreateTable(ctx context.Context, in *CreateTableRequest, opts ...grpc.CallOption) (*Table, error) {
 	out := new(Table)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/CreateTable", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/CreateTable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -72,7 +79,7 @@ func (c *bigtableTableServiceClient) CreateTable(ctx context.Context, in *Create
 
 func (c *bigtableTableServiceClient) ListTables(ctx context.Context, in *ListTablesRequest, opts ...grpc.CallOption) (*ListTablesResponse, error) {
 	out := new(ListTablesResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/ListTables", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/ListTables", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -81,25 +88,25 @@ func (c *bigtableTableServiceClient) ListTables(ctx context.Context, in *ListTab
 
 func (c *bigtableTableServiceClient) GetTable(ctx context.Context, in *GetTableRequest, opts ...grpc.CallOption) (*Table, error) {
 	out := new(Table)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/GetTable", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/GetTable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableServiceClient) DeleteTable(ctx context.Context, in *DeleteTableRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/DeleteTable", in, out, c.cc, opts...)
+func (c *bigtableTableServiceClient) DeleteTable(ctx context.Context, in *DeleteTableRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/DeleteTable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableServiceClient) RenameTable(ctx context.Context, in *RenameTableRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/RenameTable", in, out, c.cc, opts...)
+func (c *bigtableTableServiceClient) RenameTable(ctx context.Context, in *RenameTableRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/RenameTable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -108,7 +115,7 @@ func (c *bigtableTableServiceClient) RenameTable(ctx context.Context, in *Rename
 
 func (c *bigtableTableServiceClient) CreateColumnFamily(ctx context.Context, in *CreateColumnFamilyRequest, opts ...grpc.CallOption) (*ColumnFamily, error) {
 	out := new(ColumnFamily)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/CreateColumnFamily", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/CreateColumnFamily", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -117,33 +124,32 @@ func (c *bigtableTableServiceClient) CreateColumnFamily(ctx context.Context, in
 
 func (c *bigtableTableServiceClient) UpdateColumnFamily(ctx context.Context, in *ColumnFamily, opts ...grpc.CallOption) (*ColumnFamily, error) {
 	out := new(ColumnFamily)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/UpdateColumnFamily", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/UpdateColumnFamily", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableServiceClient) DeleteColumnFamily(ctx context.Context, in *DeleteColumnFamilyRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/DeleteColumnFamily", in, out, c.cc, opts...)
+func (c *bigtableTableServiceClient) DeleteColumnFamily(ctx context.Context, in *DeleteColumnFamilyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/DeleteColumnFamily", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableServiceClient) BulkDeleteRows(ctx context.Context, in *BulkDeleteRowsRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/BulkDeleteRows", in, out, c.cc, opts...)
+func (c *bigtableTableServiceClient) BulkDeleteRows(ctx context.Context, in *BulkDeleteRowsRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.table.v1.BigtableTableService/BulkDeleteRows", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for BigtableTableService service
-
+// BigtableTableServiceServer is the server API for BigtableTableService service.
 type BigtableTableServiceServer interface {
 	// Creates a new table, to be served from a specified cluster.
 	// The table can be created with a full set of initial column families,
@@ -154,18 +160,18 @@ type BigtableTableServiceServer interface {
 	// Gets the schema of the specified table, including its column families.
 	GetTable(context.Context, *GetTableRequest) (*Table, error)
 	// Permanently deletes a specified table and all of its data.
-	DeleteTable(context.Context, *DeleteTableRequest) (*google_protobuf2.Empty, error)
+	DeleteTable(context.Context, *DeleteTableRequest) (*empty.Empty, error)
 	// Changes the name of a specified table.
 	// Cannot be used to move tables between clusters, zones, or projects.
-	RenameTable(context.Context, *RenameTableRequest) (*google_protobuf2.Empty, error)
+	RenameTable(context.Context, *RenameTableRequest) (*empty.Empty, error)
 	// Creates a new column family within a specified table.
 	CreateColumnFamily(context.Context, *CreateColumnFamilyRequest) (*ColumnFamily, error)
 	// Changes the configuration of a specified column family.
 	UpdateColumnFamily(context.Context, *ColumnFamily) (*ColumnFamily, error)
 	// Permanently deletes a specified column family and all of its data.
-	DeleteColumnFamily(context.Context, *DeleteColumnFamilyRequest) (*google_protobuf2.Empty, error)
+	DeleteColumnFamily(context.Context, *DeleteColumnFamilyRequest) (*empty.Empty, error)
 	// Delete all rows in a table corresponding to a particular prefix
-	BulkDeleteRows(context.Context, *BulkDeleteRowsRequest) (*google_protobuf2.Empty, error)
+	BulkDeleteRows(context.Context, *BulkDeleteRowsRequest) (*empty.Empty, error)
 }
 
 func RegisterBigtableTableServiceServer(s *grpc.Server, srv BigtableTableServiceServer) {
@@ -380,10 +386,10 @@ var _BigtableTableService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_service.proto", fileDescriptor1)
+	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_service.proto", fileDescriptor_bigtable_table_service_077fd6962a736aed)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_bigtable_table_service_077fd6962a736aed = []byte{
 	// 560 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xbf, 0x6f, 0xd4, 0x30,
 	0x14, 0xc7, 0x65, 0x06, 0x84, 0x7c, 0x88, 0xc1, 0x42, 0x0c, 0x07, 0x62, 0x88, 0xc4, 0x12, 0xa1,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
index 9d9ad71e..bff6399a 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/table/v1/bigtable_table_service_messages.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/table/v1/bigtable_table_service_messages.proto
 
-package table
+package table // import "google.golang.org/genproto/googleapis/bigtable/admin/table/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,15 +12,21 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type CreateTableRequest struct {
 	// The unique name of the cluster in which to create the new table.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name by which the new table should be referred to within the cluster,
 	// e.g. "foobar" rather than "<cluster_name>/tables/foobar".
-	TableId string `protobuf:"bytes,2,opt,name=table_id,json=tableId" json:"table_id,omitempty"`
+	TableId string `protobuf:"bytes,2,opt,name=table_id,json=tableId,proto3" json:"table_id,omitempty"`
 	// The Table to create. The `name` field of the Table and all of its
 	// ColumnFamilies must be left blank, and will be populated in the response.
-	Table *Table `protobuf:"bytes,3,opt,name=table" json:"table,omitempty"`
+	Table *Table `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
 	// The optional list of row keys that will be used to initially split the
 	// table into several tablets (Tablets are similar to HBase regions).
 	// Given two split keys, "s1" and "s2", three tablets will be created,
@@ -36,13 +42,35 @@ type CreateTableRequest struct {
 	//    - Tablet 3 [customer_1, customer_2) => {"customer_1"}.
 	//    - Tablet 4 [customer_2, other)      => {"customer_2"}.
 	//    - Tablet 5 [other, )                => {"other", "zz"}.
-	InitialSplitKeys []string `protobuf:"bytes,4,rep,name=initial_split_keys,json=initialSplitKeys" json:"initial_split_keys,omitempty"`
+	InitialSplitKeys     []string `protobuf:"bytes,4,rep,name=initial_split_keys,json=initialSplitKeys,proto3" json:"initial_split_keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateTableRequest) Reset()         { *m = CreateTableRequest{} }
+func (m *CreateTableRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateTableRequest) ProtoMessage()    {}
+func (*CreateTableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{0}
+}
+func (m *CreateTableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTableRequest.Unmarshal(m, b)
+}
+func (m *CreateTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTableRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableRequest.Merge(dst, src)
+}
+func (m *CreateTableRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateTableRequest.Size(m)
+}
+func (m *CreateTableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTableRequest.DiscardUnknown(m)
 }
 
-func (m *CreateTableRequest) Reset()                    { *m = CreateTableRequest{} }
-func (m *CreateTableRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateTableRequest) ProtoMessage()               {}
-func (*CreateTableRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_CreateTableRequest proto.InternalMessageInfo
 
 func (m *CreateTableRequest) GetName() string {
 	if m != nil {
@@ -74,13 +102,35 @@ func (m *CreateTableRequest) GetInitialSplitKeys() []string {
 
 type ListTablesRequest struct {
 	// The unique name of the cluster for which tables should be listed.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTablesRequest) Reset()         { *m = ListTablesRequest{} }
+func (m *ListTablesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTablesRequest) ProtoMessage()    {}
+func (*ListTablesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{1}
+}
+func (m *ListTablesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTablesRequest.Unmarshal(m, b)
+}
+func (m *ListTablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTablesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTablesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTablesRequest.Merge(dst, src)
+}
+func (m *ListTablesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTablesRequest.Size(m)
+}
+func (m *ListTablesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTablesRequest.DiscardUnknown(m)
 }
 
-func (m *ListTablesRequest) Reset()                    { *m = ListTablesRequest{} }
-func (m *ListTablesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTablesRequest) ProtoMessage()               {}
-func (*ListTablesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_ListTablesRequest proto.InternalMessageInfo
 
 func (m *ListTablesRequest) GetName() string {
 	if m != nil {
@@ -92,13 +142,35 @@ func (m *ListTablesRequest) GetName() string {
 type ListTablesResponse struct {
 	// The tables present in the requested cluster.
 	// At present, only the names of the tables are populated.
-	Tables []*Table `protobuf:"bytes,1,rep,name=tables" json:"tables,omitempty"`
+	Tables               []*Table `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTablesResponse) Reset()         { *m = ListTablesResponse{} }
+func (m *ListTablesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTablesResponse) ProtoMessage()    {}
+func (*ListTablesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{2}
+}
+func (m *ListTablesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTablesResponse.Unmarshal(m, b)
+}
+func (m *ListTablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTablesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTablesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTablesResponse.Merge(dst, src)
+}
+func (m *ListTablesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTablesResponse.Size(m)
+}
+func (m *ListTablesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTablesResponse.DiscardUnknown(m)
 }
 
-func (m *ListTablesResponse) Reset()                    { *m = ListTablesResponse{} }
-func (m *ListTablesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTablesResponse) ProtoMessage()               {}
-func (*ListTablesResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_ListTablesResponse proto.InternalMessageInfo
 
 func (m *ListTablesResponse) GetTables() []*Table {
 	if m != nil {
@@ -109,13 +181,35 @@ func (m *ListTablesResponse) GetTables() []*Table {
 
 type GetTableRequest struct {
 	// The unique name of the requested table.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTableRequest) Reset()         { *m = GetTableRequest{} }
+func (m *GetTableRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTableRequest) ProtoMessage()    {}
+func (*GetTableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{3}
+}
+func (m *GetTableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTableRequest.Unmarshal(m, b)
+}
+func (m *GetTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTableRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTableRequest.Merge(dst, src)
+}
+func (m *GetTableRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTableRequest.Size(m)
+}
+func (m *GetTableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTableRequest.DiscardUnknown(m)
 }
 
-func (m *GetTableRequest) Reset()                    { *m = GetTableRequest{} }
-func (m *GetTableRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTableRequest) ProtoMessage()               {}
-func (*GetTableRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_GetTableRequest proto.InternalMessageInfo
 
 func (m *GetTableRequest) GetName() string {
 	if m != nil {
@@ -126,13 +220,35 @@ func (m *GetTableRequest) GetName() string {
 
 type DeleteTableRequest struct {
 	// The unique name of the table to be deleted.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteTableRequest) Reset()         { *m = DeleteTableRequest{} }
+func (m *DeleteTableRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteTableRequest) ProtoMessage()    {}
+func (*DeleteTableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{4}
+}
+func (m *DeleteTableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteTableRequest.Unmarshal(m, b)
+}
+func (m *DeleteTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteTableRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTableRequest.Merge(dst, src)
+}
+func (m *DeleteTableRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteTableRequest.Size(m)
+}
+func (m *DeleteTableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteTableRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteTableRequest) Reset()                    { *m = DeleteTableRequest{} }
-func (m *DeleteTableRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteTableRequest) ProtoMessage()               {}
-func (*DeleteTableRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_DeleteTableRequest proto.InternalMessageInfo
 
 func (m *DeleteTableRequest) GetName() string {
 	if m != nil {
@@ -143,16 +259,38 @@ func (m *DeleteTableRequest) GetName() string {
 
 type RenameTableRequest struct {
 	// The current unique name of the table.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The new name by which the table should be referred to within its containing
 	// cluster, e.g. "foobar" rather than "<cluster_name>/tables/foobar".
-	NewId string `protobuf:"bytes,2,opt,name=new_id,json=newId" json:"new_id,omitempty"`
+	NewId                string   `protobuf:"bytes,2,opt,name=new_id,json=newId,proto3" json:"new_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RenameTableRequest) Reset()         { *m = RenameTableRequest{} }
+func (m *RenameTableRequest) String() string { return proto.CompactTextString(m) }
+func (*RenameTableRequest) ProtoMessage()    {}
+func (*RenameTableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{5}
+}
+func (m *RenameTableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RenameTableRequest.Unmarshal(m, b)
+}
+func (m *RenameTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RenameTableRequest.Marshal(b, m, deterministic)
+}
+func (dst *RenameTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RenameTableRequest.Merge(dst, src)
+}
+func (m *RenameTableRequest) XXX_Size() int {
+	return xxx_messageInfo_RenameTableRequest.Size(m)
+}
+func (m *RenameTableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RenameTableRequest.DiscardUnknown(m)
 }
 
-func (m *RenameTableRequest) Reset()                    { *m = RenameTableRequest{} }
-func (m *RenameTableRequest) String() string            { return proto.CompactTextString(m) }
-func (*RenameTableRequest) ProtoMessage()               {}
-func (*RenameTableRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_RenameTableRequest proto.InternalMessageInfo
 
 func (m *RenameTableRequest) GetName() string {
 	if m != nil {
@@ -170,18 +308,40 @@ func (m *RenameTableRequest) GetNewId() string {
 
 type CreateColumnFamilyRequest struct {
 	// The unique name of the table in which to create the new column family.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name by which the new column family should be referred to within the
 	// table, e.g. "foobar" rather than "<table_name>/columnFamilies/foobar".
-	ColumnFamilyId string `protobuf:"bytes,2,opt,name=column_family_id,json=columnFamilyId" json:"column_family_id,omitempty"`
+	ColumnFamilyId string `protobuf:"bytes,2,opt,name=column_family_id,json=columnFamilyId,proto3" json:"column_family_id,omitempty"`
 	// The column family to create. The `name` field must be left blank.
-	ColumnFamily *ColumnFamily `protobuf:"bytes,3,opt,name=column_family,json=columnFamily" json:"column_family,omitempty"`
+	ColumnFamily         *ColumnFamily `protobuf:"bytes,3,opt,name=column_family,json=columnFamily,proto3" json:"column_family,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *CreateColumnFamilyRequest) Reset()         { *m = CreateColumnFamilyRequest{} }
+func (m *CreateColumnFamilyRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateColumnFamilyRequest) ProtoMessage()    {}
+func (*CreateColumnFamilyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{6}
+}
+func (m *CreateColumnFamilyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateColumnFamilyRequest.Unmarshal(m, b)
+}
+func (m *CreateColumnFamilyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateColumnFamilyRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateColumnFamilyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateColumnFamilyRequest.Merge(dst, src)
+}
+func (m *CreateColumnFamilyRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateColumnFamilyRequest.Size(m)
+}
+func (m *CreateColumnFamilyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateColumnFamilyRequest.DiscardUnknown(m)
 }
 
-func (m *CreateColumnFamilyRequest) Reset()                    { *m = CreateColumnFamilyRequest{} }
-func (m *CreateColumnFamilyRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateColumnFamilyRequest) ProtoMessage()               {}
-func (*CreateColumnFamilyRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+var xxx_messageInfo_CreateColumnFamilyRequest proto.InternalMessageInfo
 
 func (m *CreateColumnFamilyRequest) GetName() string {
 	if m != nil {
@@ -206,13 +366,35 @@ func (m *CreateColumnFamilyRequest) GetColumnFamily() *ColumnFamily {
 
 type DeleteColumnFamilyRequest struct {
 	// The unique name of the column family to be deleted.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteColumnFamilyRequest) Reset()                    { *m = DeleteColumnFamilyRequest{} }
-func (m *DeleteColumnFamilyRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteColumnFamilyRequest) ProtoMessage()               {}
-func (*DeleteColumnFamilyRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+func (m *DeleteColumnFamilyRequest) Reset()         { *m = DeleteColumnFamilyRequest{} }
+func (m *DeleteColumnFamilyRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteColumnFamilyRequest) ProtoMessage()    {}
+func (*DeleteColumnFamilyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{7}
+}
+func (m *DeleteColumnFamilyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteColumnFamilyRequest.Unmarshal(m, b)
+}
+func (m *DeleteColumnFamilyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteColumnFamilyRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteColumnFamilyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteColumnFamilyRequest.Merge(dst, src)
+}
+func (m *DeleteColumnFamilyRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteColumnFamilyRequest.Size(m)
+}
+func (m *DeleteColumnFamilyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteColumnFamilyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteColumnFamilyRequest proto.InternalMessageInfo
 
 func (m *DeleteColumnFamilyRequest) GetName() string {
 	if m != nil {
@@ -223,17 +405,46 @@ func (m *DeleteColumnFamilyRequest) GetName() string {
 
 type BulkDeleteRowsRequest struct {
 	// The unique name of the table on which to perform the bulk delete
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// Types that are valid to be assigned to Target:
 	//	*BulkDeleteRowsRequest_RowKeyPrefix
 	//	*BulkDeleteRowsRequest_DeleteAllDataFromTable
-	Target isBulkDeleteRowsRequest_Target `protobuf_oneof:"target"`
+	Target               isBulkDeleteRowsRequest_Target `protobuf_oneof:"target"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *BulkDeleteRowsRequest) Reset()         { *m = BulkDeleteRowsRequest{} }
+func (m *BulkDeleteRowsRequest) String() string { return proto.CompactTextString(m) }
+func (*BulkDeleteRowsRequest) ProtoMessage()    {}
+func (*BulkDeleteRowsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_service_messages_db488db316a00db0, []int{8}
+}
+func (m *BulkDeleteRowsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BulkDeleteRowsRequest.Unmarshal(m, b)
 }
+func (m *BulkDeleteRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BulkDeleteRowsRequest.Marshal(b, m, deterministic)
+}
+func (dst *BulkDeleteRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BulkDeleteRowsRequest.Merge(dst, src)
+}
+func (m *BulkDeleteRowsRequest) XXX_Size() int {
+	return xxx_messageInfo_BulkDeleteRowsRequest.Size(m)
+}
+func (m *BulkDeleteRowsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BulkDeleteRowsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BulkDeleteRowsRequest proto.InternalMessageInfo
 
-func (m *BulkDeleteRowsRequest) Reset()                    { *m = BulkDeleteRowsRequest{} }
-func (m *BulkDeleteRowsRequest) String() string            { return proto.CompactTextString(m) }
-func (*BulkDeleteRowsRequest) ProtoMessage()               {}
-func (*BulkDeleteRowsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+func (m *BulkDeleteRowsRequest) GetTableName() string {
+	if m != nil {
+		return m.TableName
+	}
+	return ""
+}
 
 type isBulkDeleteRowsRequest_Target interface {
 	isBulkDeleteRowsRequest_Target()
@@ -242,11 +453,13 @@ type isBulkDeleteRowsRequest_Target interface {
 type BulkDeleteRowsRequest_RowKeyPrefix struct {
 	RowKeyPrefix []byte `protobuf:"bytes,2,opt,name=row_key_prefix,json=rowKeyPrefix,proto3,oneof"`
 }
+
 type BulkDeleteRowsRequest_DeleteAllDataFromTable struct {
-	DeleteAllDataFromTable bool `protobuf:"varint,3,opt,name=delete_all_data_from_table,json=deleteAllDataFromTable,oneof"`
+	DeleteAllDataFromTable bool `protobuf:"varint,3,opt,name=delete_all_data_from_table,json=deleteAllDataFromTable,proto3,oneof"`
 }
 
-func (*BulkDeleteRowsRequest_RowKeyPrefix) isBulkDeleteRowsRequest_Target()           {}
+func (*BulkDeleteRowsRequest_RowKeyPrefix) isBulkDeleteRowsRequest_Target() {}
+
 func (*BulkDeleteRowsRequest_DeleteAllDataFromTable) isBulkDeleteRowsRequest_Target() {}
 
 func (m *BulkDeleteRowsRequest) GetTarget() isBulkDeleteRowsRequest_Target {
@@ -256,13 +469,6 @@ func (m *BulkDeleteRowsRequest) GetTarget() isBulkDeleteRowsRequest_Target {
 	return nil
 }
 
-func (m *BulkDeleteRowsRequest) GetTableName() string {
-	if m != nil {
-		return m.TableName
-	}
-	return ""
-}
-
 func (m *BulkDeleteRowsRequest) GetRowKeyPrefix() []byte {
 	if x, ok := m.GetTarget().(*BulkDeleteRowsRequest_RowKeyPrefix); ok {
 		return x.RowKeyPrefix
@@ -333,11 +539,11 @@ func _BulkDeleteRowsRequest_OneofSizer(msg proto.Message) (n int) {
 	// target
 	switch x := m.Target.(type) {
 	case *BulkDeleteRowsRequest_RowKeyPrefix:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RowKeyPrefix)))
 		n += len(x.RowKeyPrefix)
 	case *BulkDeleteRowsRequest_DeleteAllDataFromTable:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case nil:
 	default:
@@ -359,10 +565,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_service_messages.proto", fileDescriptor2)
+	proto.RegisterFile("google/bigtable/admin/table/v1/bigtable_table_service_messages.proto", fileDescriptor_bigtable_table_service_messages_db488db316a00db0)
 }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_bigtable_table_service_messages_db488db316a00db0 = []byte{
 	// 514 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x6e, 0xd3, 0x40,
 	0x10, 0xad, 0x49, 0x1b, 0x92, 0x21, 0x94, 0xb2, 0x52, 0x51, 0x52, 0x09, 0x14, 0x56, 0x2a, 0xe4,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
index 2eba7f16..c12fe01a 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/bigtable_instance_admin.pb.go
@@ -1,77 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/bigtable_instance_admin.proto
 
-/*
-Package admin is a generated protocol buffer package.
-
-It is generated from these files:
-	google/bigtable/admin/v2/bigtable_instance_admin.proto
-	google/bigtable/admin/v2/bigtable_table_admin.proto
-	google/bigtable/admin/v2/common.proto
-	google/bigtable/admin/v2/instance.proto
-	google/bigtable/admin/v2/table.proto
-
-It has these top-level messages:
-	CreateInstanceRequest
-	GetInstanceRequest
-	ListInstancesRequest
-	ListInstancesResponse
-	PartialUpdateInstanceRequest
-	DeleteInstanceRequest
-	CreateClusterRequest
-	GetClusterRequest
-	ListClustersRequest
-	ListClustersResponse
-	DeleteClusterRequest
-	CreateInstanceMetadata
-	UpdateInstanceMetadata
-	CreateClusterMetadata
-	UpdateClusterMetadata
-	CreateAppProfileRequest
-	GetAppProfileRequest
-	ListAppProfilesRequest
-	ListAppProfilesResponse
-	UpdateAppProfileRequest
-	DeleteAppProfileRequest
-	CreateTableRequest
-	CreateTableFromSnapshotRequest
-	DropRowRangeRequest
-	ListTablesRequest
-	ListTablesResponse
-	GetTableRequest
-	DeleteTableRequest
-	ModifyColumnFamiliesRequest
-	GenerateConsistencyTokenRequest
-	GenerateConsistencyTokenResponse
-	CheckConsistencyRequest
-	CheckConsistencyResponse
-	SnapshotTableRequest
-	GetSnapshotRequest
-	ListSnapshotsRequest
-	ListSnapshotsResponse
-	DeleteSnapshotRequest
-	SnapshotTableMetadata
-	CreateTableFromSnapshotMetadata
-	Instance
-	Cluster
-	AppProfile
-	Table
-	ColumnFamily
-	GcRule
-	Snapshot
-*/
-package admin
+package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf4 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -93,26 +33,48 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type CreateInstanceRequest struct {
 	// The unique name of the project in which to create the new instance.
 	// Values are of the form `projects/<project>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The ID to be used when referring to the new instance within its project,
 	// e.g., just `myinstance` rather than
 	// `projects/myproject/instances/myinstance`.
-	InstanceId string `protobuf:"bytes,2,opt,name=instance_id,json=instanceId" json:"instance_id,omitempty"`
+	InstanceId string `protobuf:"bytes,2,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
 	// The instance to create.
 	// Fields marked `OutputOnly` must be left blank.
-	Instance *Instance `protobuf:"bytes,3,opt,name=instance" json:"instance,omitempty"`
+	Instance *Instance `protobuf:"bytes,3,opt,name=instance,proto3" json:"instance,omitempty"`
 	// The clusters to be created within the instance, mapped by desired
 	// cluster ID, e.g., just `mycluster` rather than
 	// `projects/myproject/instances/myinstance/clusters/mycluster`.
 	// Fields marked `OutputOnly` must be left blank.
 	// Currently exactly one cluster must be specified.
-	Clusters map[string]*Cluster `protobuf:"bytes,4,rep,name=clusters" json:"clusters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Clusters             map[string]*Cluster `protobuf:"bytes,4,rep,name=clusters,proto3" json:"clusters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *CreateInstanceRequest) Reset()                    { *m = CreateInstanceRequest{} }
-func (m *CreateInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateInstanceRequest) ProtoMessage()               {}
-func (*CreateInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *CreateInstanceRequest) Reset()         { *m = CreateInstanceRequest{} }
+func (m *CreateInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateInstanceRequest) ProtoMessage()    {}
+func (*CreateInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{0}
+}
+func (m *CreateInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateInstanceRequest.Unmarshal(m, b)
+}
+func (m *CreateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceRequest.Merge(dst, src)
+}
+func (m *CreateInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateInstanceRequest.Size(m)
+}
+func (m *CreateInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateInstanceRequest proto.InternalMessageInfo
 
 func (m *CreateInstanceRequest) GetParent() string {
 	if m != nil {
@@ -146,13 +108,35 @@ func (m *CreateInstanceRequest) GetClusters() map[string]*Cluster {
 type GetInstanceRequest struct {
 	// The unique name of the requested instance. Values are of the form
 	// `projects/<project>/instances/<instance>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetInstanceRequest) Reset()                    { *m = GetInstanceRequest{} }
-func (m *GetInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetInstanceRequest) ProtoMessage()               {}
-func (*GetInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
+func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetInstanceRequest) ProtoMessage()    {}
+func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{1}
+}
+func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
+}
+func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+}
+func (m *GetInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetInstanceRequest.Size(m)
+}
+func (m *GetInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetInstanceRequest proto.InternalMessageInfo
 
 func (m *GetInstanceRequest) GetName() string {
 	if m != nil {
@@ -165,15 +149,37 @@ func (m *GetInstanceRequest) GetName() string {
 type ListInstancesRequest struct {
 	// The unique name of the project for which a list of instances is requested.
 	// Values are of the form `projects/<project>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The value of `next_page_token` returned by a previous call.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
+func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListInstancesRequest) ProtoMessage()    {}
+func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{2}
+}
+func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
+}
+func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+}
+func (m *ListInstancesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListInstancesRequest.Size(m)
+}
+func (m *ListInstancesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstancesRequest.DiscardUnknown(m)
 }
 
-func (m *ListInstancesRequest) Reset()                    { *m = ListInstancesRequest{} }
-func (m *ListInstancesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListInstancesRequest) ProtoMessage()               {}
-func (*ListInstancesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_ListInstancesRequest proto.InternalMessageInfo
 
 func (m *ListInstancesRequest) GetParent() string {
 	if m != nil {
@@ -192,23 +198,45 @@ func (m *ListInstancesRequest) GetPageToken() string {
 // Response message for BigtableInstanceAdmin.ListInstances.
 type ListInstancesResponse struct {
 	// The list of requested instances.
-	Instances []*Instance `protobuf:"bytes,1,rep,name=instances" json:"instances,omitempty"`
+	Instances []*Instance `protobuf:"bytes,1,rep,name=instances,proto3" json:"instances,omitempty"`
 	// Locations from which Instance information could not be retrieved,
 	// due to an outage or some other transient condition.
 	// Instances whose Clusters are all in one of the failed locations
 	// may be missing from `instances`, and Instances with at least one
 	// Cluster in a failed location may only have partial information returned.
-	FailedLocations []string `protobuf:"bytes,2,rep,name=failed_locations,json=failedLocations" json:"failed_locations,omitempty"`
+	FailedLocations []string `protobuf:"bytes,2,rep,name=failed_locations,json=failedLocations,proto3" json:"failed_locations,omitempty"`
 	// Set if not all instances could be returned in a single response.
 	// Pass this value to `page_token` in another request to get the next
 	// page of results.
-	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListInstancesResponse) Reset()                    { *m = ListInstancesResponse{} }
-func (m *ListInstancesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListInstancesResponse) ProtoMessage()               {}
-func (*ListInstancesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
+func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListInstancesResponse) ProtoMessage()    {}
+func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{3}
+}
+func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
+}
+func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+}
+func (m *ListInstancesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListInstancesResponse.Size(m)
+}
+func (m *ListInstancesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstancesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInstancesResponse proto.InternalMessageInfo
 
 func (m *ListInstancesResponse) GetInstances() []*Instance {
 	if m != nil {
@@ -234,16 +262,38 @@ func (m *ListInstancesResponse) GetNextPageToken() string {
 // Request message for BigtableInstanceAdmin.PartialUpdateInstance.
 type PartialUpdateInstanceRequest struct {
 	// The Instance which will (partially) replace the current value.
-	Instance *Instance `protobuf:"bytes,1,opt,name=instance" json:"instance,omitempty"`
+	Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
 	// The subset of Instance fields which should be replaced.
 	// Must be explicitly set.
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *PartialUpdateInstanceRequest) Reset()                    { *m = PartialUpdateInstanceRequest{} }
-func (m *PartialUpdateInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*PartialUpdateInstanceRequest) ProtoMessage()               {}
-func (*PartialUpdateInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *PartialUpdateInstanceRequest) Reset()         { *m = PartialUpdateInstanceRequest{} }
+func (m *PartialUpdateInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*PartialUpdateInstanceRequest) ProtoMessage()    {}
+func (*PartialUpdateInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{4}
+}
+func (m *PartialUpdateInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartialUpdateInstanceRequest.Unmarshal(m, b)
+}
+func (m *PartialUpdateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartialUpdateInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *PartialUpdateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartialUpdateInstanceRequest.Merge(dst, src)
+}
+func (m *PartialUpdateInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_PartialUpdateInstanceRequest.Size(m)
+}
+func (m *PartialUpdateInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartialUpdateInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PartialUpdateInstanceRequest proto.InternalMessageInfo
 
 func (m *PartialUpdateInstanceRequest) GetInstance() *Instance {
 	if m != nil {
@@ -252,7 +302,7 @@ func (m *PartialUpdateInstanceRequest) GetInstance() *Instance {
 	return nil
 }
 
-func (m *PartialUpdateInstanceRequest) GetUpdateMask() *google_protobuf4.FieldMask {
+func (m *PartialUpdateInstanceRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -263,13 +313,35 @@ func (m *PartialUpdateInstanceRequest) GetUpdateMask() *google_protobuf4.FieldMa
 type DeleteInstanceRequest struct {
 	// The unique name of the instance to be deleted.
 	// Values are of the form `projects/<project>/instances/<instance>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
+func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteInstanceRequest) ProtoMessage()    {}
+func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{5}
+}
+func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
+}
+func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+}
+func (m *DeleteInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
+}
+func (m *DeleteInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteInstanceRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteInstanceRequest) Reset()                    { *m = DeleteInstanceRequest{} }
-func (m *DeleteInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteInstanceRequest) ProtoMessage()               {}
-func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_DeleteInstanceRequest proto.InternalMessageInfo
 
 func (m *DeleteInstanceRequest) GetName() string {
 	if m != nil {
@@ -283,20 +355,42 @@ type CreateClusterRequest struct {
 	// The unique name of the instance in which to create the new cluster.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The ID to be used when referring to the new cluster within its instance,
 	// e.g., just `mycluster` rather than
 	// `projects/myproject/instances/myinstance/clusters/mycluster`.
-	ClusterId string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The cluster to be created.
 	// Fields marked `OutputOnly` must be left blank.
-	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster              *Cluster `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateClusterRequest) Reset()                    { *m = CreateClusterRequest{} }
-func (m *CreateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterRequest) ProtoMessage()               {}
-func (*CreateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
+func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterRequest) ProtoMessage()    {}
+func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{6}
+}
+func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
+}
+func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+}
+func (m *CreateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterRequest.Size(m)
+}
+func (m *CreateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateClusterRequest proto.InternalMessageInfo
 
 func (m *CreateClusterRequest) GetParent() string {
 	if m != nil {
@@ -323,13 +417,35 @@ func (m *CreateClusterRequest) GetCluster() *Cluster {
 type GetClusterRequest struct {
 	// The unique name of the requested cluster. Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/<cluster>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetClusterRequest) Reset()                    { *m = GetClusterRequest{} }
-func (m *GetClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetClusterRequest) ProtoMessage()               {}
-func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
+func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*GetClusterRequest) ProtoMessage()    {}
+func (*GetClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{7}
+}
+func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
+}
+func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+}
+func (m *GetClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_GetClusterRequest.Size(m)
+}
+func (m *GetClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetClusterRequest proto.InternalMessageInfo
 
 func (m *GetClusterRequest) GetName() string {
 	if m != nil {
@@ -344,15 +460,37 @@ type ListClustersRequest struct {
 	// Values are of the form `projects/<project>/instances/<instance>`.
 	// Use `<instance> = '-'` to list Clusters for all Instances in a project,
 	// e.g., `projects/myproject/instances/-`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The value of `next_page_token` returned by a previous call.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
+func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClustersRequest) ProtoMessage()    {}
+func (*ListClustersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{8}
+}
+func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
+}
+func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+}
+func (m *ListClustersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClustersRequest.Size(m)
+}
+func (m *ListClustersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersRequest.DiscardUnknown(m)
 }
 
-func (m *ListClustersRequest) Reset()                    { *m = ListClustersRequest{} }
-func (m *ListClustersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersRequest) ProtoMessage()               {}
-func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_ListClustersRequest proto.InternalMessageInfo
 
 func (m *ListClustersRequest) GetParent() string {
 	if m != nil {
@@ -371,22 +509,44 @@ func (m *ListClustersRequest) GetPageToken() string {
 // Response message for BigtableInstanceAdmin.ListClusters.
 type ListClustersResponse struct {
 	// The list of requested clusters.
-	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters" json:"clusters,omitempty"`
+	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	// Locations from which Cluster information could not be retrieved,
 	// due to an outage or some other transient condition.
 	// Clusters from these locations may be missing from `clusters`,
 	// or may only have partial information returned.
-	FailedLocations []string `protobuf:"bytes,2,rep,name=failed_locations,json=failedLocations" json:"failed_locations,omitempty"`
+	FailedLocations []string `protobuf:"bytes,2,rep,name=failed_locations,json=failedLocations,proto3" json:"failed_locations,omitempty"`
 	// Set if not all clusters could be returned in a single response.
 	// Pass this value to `page_token` in another request to get the next
 	// page of results.
-	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListClustersResponse) Reset()                    { *m = ListClustersResponse{} }
-func (m *ListClustersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersResponse) ProtoMessage()               {}
-func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
+func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClustersResponse) ProtoMessage()    {}
+func (*ListClustersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{9}
+}
+func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
+}
+func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+}
+func (m *ListClustersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClustersResponse.Size(m)
+}
+func (m *ListClustersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClustersResponse proto.InternalMessageInfo
 
 func (m *ListClustersResponse) GetClusters() []*Cluster {
 	if m != nil {
@@ -413,13 +573,35 @@ func (m *ListClustersResponse) GetNextPageToken() string {
 type DeleteClusterRequest struct {
 	// The unique name of the cluster to be deleted. Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/<cluster>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
+func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteClusterRequest) ProtoMessage()    {}
+func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{10}
+}
+func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
+}
+func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+}
+func (m *DeleteClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteClusterRequest.Size(m)
+}
+func (m *DeleteClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteClusterRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteClusterRequest) Reset()                    { *m = DeleteClusterRequest{} }
-func (m *DeleteClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteClusterRequest) ProtoMessage()               {}
-func (*DeleteClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_DeleteClusterRequest proto.InternalMessageInfo
 
 func (m *DeleteClusterRequest) GetName() string {
 	if m != nil {
@@ -431,17 +613,39 @@ func (m *DeleteClusterRequest) GetName() string {
 // The metadata for the Operation returned by CreateInstance.
 type CreateInstanceMetadata struct {
 	// The request that prompted the initiation of this CreateInstance operation.
-	OriginalRequest *CreateInstanceRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
+	OriginalRequest *CreateInstanceRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
 	// The time at which the original request was received.
-	RequestTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which the operation failed or was completed successfully.
-	FinishTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *CreateInstanceMetadata) Reset()         { *m = CreateInstanceMetadata{} }
+func (m *CreateInstanceMetadata) String() string { return proto.CompactTextString(m) }
+func (*CreateInstanceMetadata) ProtoMessage()    {}
+func (*CreateInstanceMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{11}
+}
+func (m *CreateInstanceMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateInstanceMetadata.Unmarshal(m, b)
+}
+func (m *CreateInstanceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateInstanceMetadata.Marshal(b, m, deterministic)
+}
+func (dst *CreateInstanceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceMetadata.Merge(dst, src)
+}
+func (m *CreateInstanceMetadata) XXX_Size() int {
+	return xxx_messageInfo_CreateInstanceMetadata.Size(m)
+}
+func (m *CreateInstanceMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateInstanceMetadata.DiscardUnknown(m)
 }
 
-func (m *CreateInstanceMetadata) Reset()                    { *m = CreateInstanceMetadata{} }
-func (m *CreateInstanceMetadata) String() string            { return proto.CompactTextString(m) }
-func (*CreateInstanceMetadata) ProtoMessage()               {}
-func (*CreateInstanceMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_CreateInstanceMetadata proto.InternalMessageInfo
 
 func (m *CreateInstanceMetadata) GetOriginalRequest() *CreateInstanceRequest {
 	if m != nil {
@@ -450,14 +654,14 @@ func (m *CreateInstanceMetadata) GetOriginalRequest() *CreateInstanceRequest {
 	return nil
 }
 
-func (m *CreateInstanceMetadata) GetRequestTime() *google_protobuf1.Timestamp {
+func (m *CreateInstanceMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *CreateInstanceMetadata) GetFinishTime() *google_protobuf1.Timestamp {
+func (m *CreateInstanceMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
@@ -467,17 +671,39 @@ func (m *CreateInstanceMetadata) GetFinishTime() *google_protobuf1.Timestamp {
 // The metadata for the Operation returned by UpdateInstance.
 type UpdateInstanceMetadata struct {
 	// The request that prompted the initiation of this UpdateInstance operation.
-	OriginalRequest *PartialUpdateInstanceRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
+	OriginalRequest *PartialUpdateInstanceRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
 	// The time at which the original request was received.
-	RequestTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which the operation failed or was completed successfully.
-	FinishTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *UpdateInstanceMetadata) Reset()                    { *m = UpdateInstanceMetadata{} }
-func (m *UpdateInstanceMetadata) String() string            { return proto.CompactTextString(m) }
-func (*UpdateInstanceMetadata) ProtoMessage()               {}
-func (*UpdateInstanceMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *UpdateInstanceMetadata) Reset()         { *m = UpdateInstanceMetadata{} }
+func (m *UpdateInstanceMetadata) String() string { return proto.CompactTextString(m) }
+func (*UpdateInstanceMetadata) ProtoMessage()    {}
+func (*UpdateInstanceMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{12}
+}
+func (m *UpdateInstanceMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateInstanceMetadata.Unmarshal(m, b)
+}
+func (m *UpdateInstanceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateInstanceMetadata.Marshal(b, m, deterministic)
+}
+func (dst *UpdateInstanceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceMetadata.Merge(dst, src)
+}
+func (m *UpdateInstanceMetadata) XXX_Size() int {
+	return xxx_messageInfo_UpdateInstanceMetadata.Size(m)
+}
+func (m *UpdateInstanceMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateInstanceMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateInstanceMetadata proto.InternalMessageInfo
 
 func (m *UpdateInstanceMetadata) GetOriginalRequest() *PartialUpdateInstanceRequest {
 	if m != nil {
@@ -486,14 +712,14 @@ func (m *UpdateInstanceMetadata) GetOriginalRequest() *PartialUpdateInstanceRequ
 	return nil
 }
 
-func (m *UpdateInstanceMetadata) GetRequestTime() *google_protobuf1.Timestamp {
+func (m *UpdateInstanceMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *UpdateInstanceMetadata) GetFinishTime() *google_protobuf1.Timestamp {
+func (m *UpdateInstanceMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
@@ -503,17 +729,39 @@ func (m *UpdateInstanceMetadata) GetFinishTime() *google_protobuf1.Timestamp {
 // The metadata for the Operation returned by CreateCluster.
 type CreateClusterMetadata struct {
 	// The request that prompted the initiation of this CreateCluster operation.
-	OriginalRequest *CreateClusterRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
+	OriginalRequest *CreateClusterRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
 	// The time at which the original request was received.
-	RequestTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which the operation failed or was completed successfully.
-	FinishTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *CreateClusterMetadata) Reset()                    { *m = CreateClusterMetadata{} }
-func (m *CreateClusterMetadata) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterMetadata) ProtoMessage()               {}
-func (*CreateClusterMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *CreateClusterMetadata) Reset()         { *m = CreateClusterMetadata{} }
+func (m *CreateClusterMetadata) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterMetadata) ProtoMessage()    {}
+func (*CreateClusterMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{13}
+}
+func (m *CreateClusterMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterMetadata.Unmarshal(m, b)
+}
+func (m *CreateClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterMetadata.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterMetadata.Merge(dst, src)
+}
+func (m *CreateClusterMetadata) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterMetadata.Size(m)
+}
+func (m *CreateClusterMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateClusterMetadata proto.InternalMessageInfo
 
 func (m *CreateClusterMetadata) GetOriginalRequest() *CreateClusterRequest {
 	if m != nil {
@@ -522,14 +770,14 @@ func (m *CreateClusterMetadata) GetOriginalRequest() *CreateClusterRequest {
 	return nil
 }
 
-func (m *CreateClusterMetadata) GetRequestTime() *google_protobuf1.Timestamp {
+func (m *CreateClusterMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *CreateClusterMetadata) GetFinishTime() *google_protobuf1.Timestamp {
+func (m *CreateClusterMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
@@ -539,17 +787,39 @@ func (m *CreateClusterMetadata) GetFinishTime() *google_protobuf1.Timestamp {
 // The metadata for the Operation returned by UpdateCluster.
 type UpdateClusterMetadata struct {
 	// The request that prompted the initiation of this UpdateCluster operation.
-	OriginalRequest *Cluster `protobuf:"bytes,1,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
+	OriginalRequest *Cluster `protobuf:"bytes,1,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
 	// The time at which the original request was received.
-	RequestTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which the operation failed or was completed successfully.
-	FinishTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *UpdateClusterMetadata) Reset()         { *m = UpdateClusterMetadata{} }
+func (m *UpdateClusterMetadata) String() string { return proto.CompactTextString(m) }
+func (*UpdateClusterMetadata) ProtoMessage()    {}
+func (*UpdateClusterMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{14}
+}
+func (m *UpdateClusterMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateClusterMetadata.Unmarshal(m, b)
+}
+func (m *UpdateClusterMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateClusterMetadata.Marshal(b, m, deterministic)
+}
+func (dst *UpdateClusterMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterMetadata.Merge(dst, src)
+}
+func (m *UpdateClusterMetadata) XXX_Size() int {
+	return xxx_messageInfo_UpdateClusterMetadata.Size(m)
+}
+func (m *UpdateClusterMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateClusterMetadata.DiscardUnknown(m)
 }
 
-func (m *UpdateClusterMetadata) Reset()                    { *m = UpdateClusterMetadata{} }
-func (m *UpdateClusterMetadata) String() string            { return proto.CompactTextString(m) }
-func (*UpdateClusterMetadata) ProtoMessage()               {}
-func (*UpdateClusterMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_UpdateClusterMetadata proto.InternalMessageInfo
 
 func (m *UpdateClusterMetadata) GetOriginalRequest() *Cluster {
 	if m != nil {
@@ -558,46 +828,63 @@ func (m *UpdateClusterMetadata) GetOriginalRequest() *Cluster {
 	return nil
 }
 
-func (m *UpdateClusterMetadata) GetRequestTime() *google_protobuf1.Timestamp {
+func (m *UpdateClusterMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *UpdateClusterMetadata) GetFinishTime() *google_protobuf1.Timestamp {
+func (m *UpdateClusterMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
 	return nil
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for BigtableInstanceAdmin.CreateAppProfile.
 type CreateAppProfileRequest struct {
 	// The unique name of the instance in which to create the new app profile.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The ID to be used when referring to the new app profile within its
 	// instance, e.g., just `myprofile` rather than
 	// `projects/myproject/instances/myinstance/appProfiles/myprofile`.
-	AppProfileId string `protobuf:"bytes,2,opt,name=app_profile_id,json=appProfileId" json:"app_profile_id,omitempty"`
+	AppProfileId string `protobuf:"bytes,2,opt,name=app_profile_id,json=appProfileId,proto3" json:"app_profile_id,omitempty"`
 	// The app profile to be created.
 	// Fields marked `OutputOnly` will be ignored.
-	AppProfile *AppProfile `protobuf:"bytes,3,opt,name=app_profile,json=appProfile" json:"app_profile,omitempty"`
+	AppProfile *AppProfile `protobuf:"bytes,3,opt,name=app_profile,json=appProfile,proto3" json:"app_profile,omitempty"`
 	// If true, ignore safety checks when creating the app profile.
-	IgnoreWarnings bool `protobuf:"varint,4,opt,name=ignore_warnings,json=ignoreWarnings" json:"ignore_warnings,omitempty"`
+	IgnoreWarnings       bool     `protobuf:"varint,4,opt,name=ignore_warnings,json=ignoreWarnings,proto3" json:"ignore_warnings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateAppProfileRequest) Reset()                    { *m = CreateAppProfileRequest{} }
-func (m *CreateAppProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateAppProfileRequest) ProtoMessage()               {}
-func (*CreateAppProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *CreateAppProfileRequest) Reset()         { *m = CreateAppProfileRequest{} }
+func (m *CreateAppProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateAppProfileRequest) ProtoMessage()    {}
+func (*CreateAppProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{15}
+}
+func (m *CreateAppProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateAppProfileRequest.Unmarshal(m, b)
+}
+func (m *CreateAppProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateAppProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateAppProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAppProfileRequest.Merge(dst, src)
+}
+func (m *CreateAppProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateAppProfileRequest.Size(m)
+}
+func (m *CreateAppProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateAppProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateAppProfileRequest proto.InternalMessageInfo
 
 func (m *CreateAppProfileRequest) GetParent() string {
 	if m != nil {
@@ -627,22 +914,39 @@ func (m *CreateAppProfileRequest) GetIgnoreWarnings() bool {
 	return false
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for BigtableInstanceAdmin.GetAppProfile.
 type GetAppProfileRequest struct {
 	// The unique name of the requested app profile. Values are of the form
 	// `projects/<project>/instances/<instance>/appProfiles/<app_profile>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetAppProfileRequest) Reset()                    { *m = GetAppProfileRequest{} }
-func (m *GetAppProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetAppProfileRequest) ProtoMessage()               {}
-func (*GetAppProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *GetAppProfileRequest) Reset()         { *m = GetAppProfileRequest{} }
+func (m *GetAppProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*GetAppProfileRequest) ProtoMessage()    {}
+func (*GetAppProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{16}
+}
+func (m *GetAppProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetAppProfileRequest.Unmarshal(m, b)
+}
+func (m *GetAppProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetAppProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetAppProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAppProfileRequest.Merge(dst, src)
+}
+func (m *GetAppProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_GetAppProfileRequest.Size(m)
+}
+func (m *GetAppProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetAppProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetAppProfileRequest proto.InternalMessageInfo
 
 func (m *GetAppProfileRequest) GetName() string {
 	if m != nil {
@@ -651,25 +955,42 @@ func (m *GetAppProfileRequest) GetName() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for BigtableInstanceAdmin.ListAppProfiles.
 type ListAppProfilesRequest struct {
 	// The unique name of the instance for which a list of app profiles is
 	// requested. Values are of the form
 	// `projects/<project>/instances/<instance>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The value of `next_page_token` returned by a previous call.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListAppProfilesRequest) Reset()                    { *m = ListAppProfilesRequest{} }
-func (m *ListAppProfilesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListAppProfilesRequest) ProtoMessage()               {}
-func (*ListAppProfilesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *ListAppProfilesRequest) Reset()         { *m = ListAppProfilesRequest{} }
+func (m *ListAppProfilesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListAppProfilesRequest) ProtoMessage()    {}
+func (*ListAppProfilesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{17}
+}
+func (m *ListAppProfilesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListAppProfilesRequest.Unmarshal(m, b)
+}
+func (m *ListAppProfilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListAppProfilesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListAppProfilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAppProfilesRequest.Merge(dst, src)
+}
+func (m *ListAppProfilesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListAppProfilesRequest.Size(m)
+}
+func (m *ListAppProfilesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListAppProfilesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListAppProfilesRequest proto.InternalMessageInfo
 
 func (m *ListAppProfilesRequest) GetParent() string {
 	if m != nil {
@@ -685,25 +1006,42 @@ func (m *ListAppProfilesRequest) GetPageToken() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Response message for BigtableInstanceAdmin.ListAppProfiles.
 type ListAppProfilesResponse struct {
 	// The list of requested app profiles.
-	AppProfiles []*AppProfile `protobuf:"bytes,1,rep,name=app_profiles,json=appProfiles" json:"app_profiles,omitempty"`
+	AppProfiles []*AppProfile `protobuf:"bytes,1,rep,name=app_profiles,json=appProfiles,proto3" json:"app_profiles,omitempty"`
 	// Set if not all app profiles could be returned in a single response.
 	// Pass this value to `page_token` in another request to get the next
 	// page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListAppProfilesResponse) Reset()                    { *m = ListAppProfilesResponse{} }
-func (m *ListAppProfilesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListAppProfilesResponse) ProtoMessage()               {}
-func (*ListAppProfilesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *ListAppProfilesResponse) Reset()         { *m = ListAppProfilesResponse{} }
+func (m *ListAppProfilesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListAppProfilesResponse) ProtoMessage()    {}
+func (*ListAppProfilesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{18}
+}
+func (m *ListAppProfilesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListAppProfilesResponse.Unmarshal(m, b)
+}
+func (m *ListAppProfilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListAppProfilesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListAppProfilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAppProfilesResponse.Merge(dst, src)
+}
+func (m *ListAppProfilesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListAppProfilesResponse.Size(m)
+}
+func (m *ListAppProfilesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListAppProfilesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListAppProfilesResponse proto.InternalMessageInfo
 
 func (m *ListAppProfilesResponse) GetAppProfiles() []*AppProfile {
 	if m != nil {
@@ -719,26 +1057,43 @@ func (m *ListAppProfilesResponse) GetNextPageToken() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for BigtableInstanceAdmin.UpdateAppProfile.
 type UpdateAppProfileRequest struct {
 	// The app profile which will (partially) replace the current value.
-	AppProfile *AppProfile `protobuf:"bytes,1,opt,name=app_profile,json=appProfile" json:"app_profile,omitempty"`
+	AppProfile *AppProfile `protobuf:"bytes,1,opt,name=app_profile,json=appProfile,proto3" json:"app_profile,omitempty"`
 	// The subset of app profile fields which should be replaced.
 	// If unset, all fields will be replaced.
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// If true, ignore safety checks when updating the app profile.
-	IgnoreWarnings bool `protobuf:"varint,3,opt,name=ignore_warnings,json=ignoreWarnings" json:"ignore_warnings,omitempty"`
+	IgnoreWarnings       bool     `protobuf:"varint,3,opt,name=ignore_warnings,json=ignoreWarnings,proto3" json:"ignore_warnings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateAppProfileRequest) Reset()         { *m = UpdateAppProfileRequest{} }
+func (m *UpdateAppProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateAppProfileRequest) ProtoMessage()    {}
+func (*UpdateAppProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{19}
+}
+func (m *UpdateAppProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateAppProfileRequest.Unmarshal(m, b)
+}
+func (m *UpdateAppProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateAppProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateAppProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAppProfileRequest.Merge(dst, src)
+}
+func (m *UpdateAppProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateAppProfileRequest.Size(m)
+}
+func (m *UpdateAppProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateAppProfileRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateAppProfileRequest) Reset()                    { *m = UpdateAppProfileRequest{} }
-func (m *UpdateAppProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateAppProfileRequest) ProtoMessage()               {}
-func (*UpdateAppProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_UpdateAppProfileRequest proto.InternalMessageInfo
 
 func (m *UpdateAppProfileRequest) GetAppProfile() *AppProfile {
 	if m != nil {
@@ -747,7 +1102,7 @@ func (m *UpdateAppProfileRequest) GetAppProfile() *AppProfile {
 	return nil
 }
 
-func (m *UpdateAppProfileRequest) GetUpdateMask() *google_protobuf4.FieldMask {
+func (m *UpdateAppProfileRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -761,24 +1116,41 @@ func (m *UpdateAppProfileRequest) GetIgnoreWarnings() bool {
 	return false
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for BigtableInstanceAdmin.DeleteAppProfile.
 type DeleteAppProfileRequest struct {
 	// The unique name of the app profile to be deleted. Values are of the form
 	// `projects/<project>/instances/<instance>/appProfiles/<app_profile>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// If true, ignore safety checks when deleting the app profile.
-	IgnoreWarnings bool `protobuf:"varint,2,opt,name=ignore_warnings,json=ignoreWarnings" json:"ignore_warnings,omitempty"`
+	IgnoreWarnings       bool     `protobuf:"varint,2,opt,name=ignore_warnings,json=ignoreWarnings,proto3" json:"ignore_warnings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteAppProfileRequest) Reset()                    { *m = DeleteAppProfileRequest{} }
-func (m *DeleteAppProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteAppProfileRequest) ProtoMessage()               {}
-func (*DeleteAppProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *DeleteAppProfileRequest) Reset()         { *m = DeleteAppProfileRequest{} }
+func (m *DeleteAppProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteAppProfileRequest) ProtoMessage()    {}
+func (*DeleteAppProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{20}
+}
+func (m *DeleteAppProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteAppProfileRequest.Unmarshal(m, b)
+}
+func (m *DeleteAppProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteAppProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteAppProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAppProfileRequest.Merge(dst, src)
+}
+func (m *DeleteAppProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteAppProfileRequest.Size(m)
+}
+func (m *DeleteAppProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteAppProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteAppProfileRequest proto.InternalMessageInfo
 
 func (m *DeleteAppProfileRequest) GetName() string {
 	if m != nil {
@@ -794,8 +1166,40 @@ func (m *DeleteAppProfileRequest) GetIgnoreWarnings() bool {
 	return false
 }
 
+// The metadata for the Operation returned by UpdateAppProfile.
+type UpdateAppProfileMetadata struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateAppProfileMetadata) Reset()         { *m = UpdateAppProfileMetadata{} }
+func (m *UpdateAppProfileMetadata) String() string { return proto.CompactTextString(m) }
+func (*UpdateAppProfileMetadata) ProtoMessage()    {}
+func (*UpdateAppProfileMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_instance_admin_67df92d624517bbb, []int{21}
+}
+func (m *UpdateAppProfileMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateAppProfileMetadata.Unmarshal(m, b)
+}
+func (m *UpdateAppProfileMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateAppProfileMetadata.Marshal(b, m, deterministic)
+}
+func (dst *UpdateAppProfileMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAppProfileMetadata.Merge(dst, src)
+}
+func (m *UpdateAppProfileMetadata) XXX_Size() int {
+	return xxx_messageInfo_UpdateAppProfileMetadata.Size(m)
+}
+func (m *UpdateAppProfileMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateAppProfileMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateAppProfileMetadata proto.InternalMessageInfo
+
 func init() {
 	proto.RegisterType((*CreateInstanceRequest)(nil), "google.bigtable.admin.v2.CreateInstanceRequest")
+	proto.RegisterMapType((map[string]*Cluster)(nil), "google.bigtable.admin.v2.CreateInstanceRequest.ClustersEntry")
 	proto.RegisterType((*GetInstanceRequest)(nil), "google.bigtable.admin.v2.GetInstanceRequest")
 	proto.RegisterType((*ListInstancesRequest)(nil), "google.bigtable.admin.v2.ListInstancesRequest")
 	proto.RegisterType((*ListInstancesResponse)(nil), "google.bigtable.admin.v2.ListInstancesResponse")
@@ -816,6 +1220,7 @@ func init() {
 	proto.RegisterType((*ListAppProfilesResponse)(nil), "google.bigtable.admin.v2.ListAppProfilesResponse")
 	proto.RegisterType((*UpdateAppProfileRequest)(nil), "google.bigtable.admin.v2.UpdateAppProfileRequest")
 	proto.RegisterType((*DeleteAppProfileRequest)(nil), "google.bigtable.admin.v2.DeleteAppProfileRequest")
+	proto.RegisterType((*UpdateAppProfileMetadata)(nil), "google.bigtable.admin.v2.UpdateAppProfileMetadata")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -826,11 +1231,12 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for BigtableInstanceAdmin service
-
+// BigtableInstanceAdminClient is the client API for BigtableInstanceAdmin service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type BigtableInstanceAdminClient interface {
 	// Create an instance within a project.
-	CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Gets information about an instance.
 	GetInstance(ctx context.Context, in *GetInstanceRequest, opts ...grpc.CallOption) (*Instance, error)
 	// Lists information about instances in a project.
@@ -838,80 +1244,37 @@ type BigtableInstanceAdminClient interface {
 	// Updates an instance within a project.
 	UpdateInstance(ctx context.Context, in *Instance, opts ...grpc.CallOption) (*Instance, error)
 	// Partially updates an instance within a project.
-	PartialUpdateInstance(ctx context.Context, in *PartialUpdateInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	PartialUpdateInstance(ctx context.Context, in *PartialUpdateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Delete an instance from a project.
-	DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
+	DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Creates a cluster within an instance.
-	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Gets information about a cluster.
 	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
 	// Lists information about clusters in an instance.
 	ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error)
 	// Updates a cluster within an instance.
-	UpdateCluster(ctx context.Context, in *Cluster, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UpdateCluster(ctx context.Context, in *Cluster, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes a cluster from an instance.
-	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Creates an app profile within an instance.
 	CreateAppProfile(ctx context.Context, in *CreateAppProfileRequest, opts ...grpc.CallOption) (*AppProfile, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Gets information about an app profile.
 	GetAppProfile(ctx context.Context, in *GetAppProfileRequest, opts ...grpc.CallOption) (*AppProfile, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Lists information about app profiles in an instance.
 	ListAppProfiles(ctx context.Context, in *ListAppProfilesRequest, opts ...grpc.CallOption) (*ListAppProfilesResponse, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Updates an app profile within an instance.
-	UpdateAppProfile(ctx context.Context, in *UpdateAppProfileRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	UpdateAppProfile(ctx context.Context, in *UpdateAppProfileRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes an app profile from an instance.
-	DeleteAppProfile(ctx context.Context, in *DeleteAppProfileRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
-	// This is a private alpha release of Cloud Bigtable instance level
-	// permissions. This feature is not currently available to most Cloud Bigtable
-	// customers. This feature might be changed in backward-incompatible ways and
-	// is not recommended for production use. It is not subject to any SLA or
-	// deprecation policy.
-	//
+	DeleteAppProfile(ctx context.Context, in *DeleteAppProfileRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Gets the access control policy for an instance resource. Returns an empty
 	// policy if an instance exists but does not have a policy set.
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
-	// This is a private alpha release of Cloud Bigtable instance level
-	// permissions. This feature is not currently available to most Cloud Bigtable
-	// customers. This feature might be changed in backward-incompatible ways and
-	// is not recommended for production use. It is not subject to any SLA or
-	// deprecation policy.
-	//
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Sets the access control policy on an instance resource. Replaces any
 	// existing policy.
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
-	// This is a private alpha release of Cloud Bigtable instance level
-	// permissions. This feature is not currently available to most Cloud Bigtable
-	// customers. This feature might be changed in backward-incompatible ways and
-	// is not recommended for production use. It is not subject to any SLA or
-	// deprecation policy.
-	//
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Returns permissions that the caller has on the specified instance resource.
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
 }
 
 type bigtableInstanceAdminClient struct {
@@ -922,9 +1285,9 @@ func NewBigtableInstanceAdminClient(cc *grpc.ClientConn) BigtableInstanceAdminCl
 	return &bigtableInstanceAdminClient{cc}
 }
 
-func (c *bigtableInstanceAdminClient) CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/CreateInstance", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/CreateInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -933,7 +1296,7 @@ func (c *bigtableInstanceAdminClient) CreateInstance(ctx context.Context, in *Cr
 
 func (c *bigtableInstanceAdminClient) GetInstance(ctx context.Context, in *GetInstanceRequest, opts ...grpc.CallOption) (*Instance, error) {
 	out := new(Instance)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetInstance", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -942,7 +1305,7 @@ func (c *bigtableInstanceAdminClient) GetInstance(ctx context.Context, in *GetIn
 
 func (c *bigtableInstanceAdminClient) ListInstances(ctx context.Context, in *ListInstancesRequest, opts ...grpc.CallOption) (*ListInstancesResponse, error) {
 	out := new(ListInstancesResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/ListInstances", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/ListInstances", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -951,34 +1314,34 @@ func (c *bigtableInstanceAdminClient) ListInstances(ctx context.Context, in *Lis
 
 func (c *bigtableInstanceAdminClient) UpdateInstance(ctx context.Context, in *Instance, opts ...grpc.CallOption) (*Instance, error) {
 	out := new(Instance)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/UpdateInstance", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/UpdateInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) PartialUpdateInstance(ctx context.Context, in *PartialUpdateInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/PartialUpdateInstance", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) PartialUpdateInstance(ctx context.Context, in *PartialUpdateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/PartialUpdateInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteInstance", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/CreateCluster", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/CreateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -987,7 +1350,7 @@ func (c *bigtableInstanceAdminClient) CreateCluster(ctx context.Context, in *Cre
 
 func (c *bigtableInstanceAdminClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -996,25 +1359,25 @@ func (c *bigtableInstanceAdminClient) GetCluster(ctx context.Context, in *GetClu
 
 func (c *bigtableInstanceAdminClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
 	out := new(ListClustersResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/ListClusters", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/ListClusters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) UpdateCluster(ctx context.Context, in *Cluster, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/UpdateCluster", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) UpdateCluster(ctx context.Context, in *Cluster, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/UpdateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteCluster", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1023,7 +1386,7 @@ func (c *bigtableInstanceAdminClient) DeleteCluster(ctx context.Context, in *Del
 
 func (c *bigtableInstanceAdminClient) CreateAppProfile(ctx context.Context, in *CreateAppProfileRequest, opts ...grpc.CallOption) (*AppProfile, error) {
 	out := new(AppProfile)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/CreateAppProfile", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/CreateAppProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1032,7 +1395,7 @@ func (c *bigtableInstanceAdminClient) CreateAppProfile(ctx context.Context, in *
 
 func (c *bigtableInstanceAdminClient) GetAppProfile(ctx context.Context, in *GetAppProfileRequest, opts ...grpc.CallOption) (*AppProfile, error) {
 	out := new(AppProfile)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetAppProfile", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetAppProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1041,63 +1404,62 @@ func (c *bigtableInstanceAdminClient) GetAppProfile(ctx context.Context, in *Get
 
 func (c *bigtableInstanceAdminClient) ListAppProfiles(ctx context.Context, in *ListAppProfilesRequest, opts ...grpc.CallOption) (*ListAppProfilesResponse, error) {
 	out := new(ListAppProfilesResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/ListAppProfiles", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/ListAppProfiles", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) UpdateAppProfile(ctx context.Context, in *UpdateAppProfileRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/UpdateAppProfile", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) UpdateAppProfile(ctx context.Context, in *UpdateAppProfileRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/UpdateAppProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) DeleteAppProfile(ctx context.Context, in *DeleteAppProfileRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteAppProfile", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) DeleteAppProfile(ctx context.Context, in *DeleteAppProfileRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteAppProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetIamPolicy", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/SetIamPolicy", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableInstanceAdminClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/TestIamPermissions", in, out, c.cc, opts...)
+func (c *bigtableInstanceAdminClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableInstanceAdmin/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for BigtableInstanceAdmin service
-
+// BigtableInstanceAdminServer is the server API for BigtableInstanceAdmin service.
 type BigtableInstanceAdminServer interface {
 	// Create an instance within a project.
-	CreateInstance(context.Context, *CreateInstanceRequest) (*google_longrunning.Operation, error)
+	CreateInstance(context.Context, *CreateInstanceRequest) (*longrunning.Operation, error)
 	// Gets information about an instance.
 	GetInstance(context.Context, *GetInstanceRequest) (*Instance, error)
 	// Lists information about instances in a project.
@@ -1105,80 +1467,37 @@ type BigtableInstanceAdminServer interface {
 	// Updates an instance within a project.
 	UpdateInstance(context.Context, *Instance) (*Instance, error)
 	// Partially updates an instance within a project.
-	PartialUpdateInstance(context.Context, *PartialUpdateInstanceRequest) (*google_longrunning.Operation, error)
+	PartialUpdateInstance(context.Context, *PartialUpdateInstanceRequest) (*longrunning.Operation, error)
 	// Delete an instance from a project.
-	DeleteInstance(context.Context, *DeleteInstanceRequest) (*google_protobuf3.Empty, error)
+	DeleteInstance(context.Context, *DeleteInstanceRequest) (*empty.Empty, error)
 	// Creates a cluster within an instance.
-	CreateCluster(context.Context, *CreateClusterRequest) (*google_longrunning.Operation, error)
+	CreateCluster(context.Context, *CreateClusterRequest) (*longrunning.Operation, error)
 	// Gets information about a cluster.
 	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
 	// Lists information about clusters in an instance.
 	ListClusters(context.Context, *ListClustersRequest) (*ListClustersResponse, error)
 	// Updates a cluster within an instance.
-	UpdateCluster(context.Context, *Cluster) (*google_longrunning.Operation, error)
+	UpdateCluster(context.Context, *Cluster) (*longrunning.Operation, error)
 	// Deletes a cluster from an instance.
-	DeleteCluster(context.Context, *DeleteClusterRequest) (*google_protobuf3.Empty, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	DeleteCluster(context.Context, *DeleteClusterRequest) (*empty.Empty, error)
 	// Creates an app profile within an instance.
 	CreateAppProfile(context.Context, *CreateAppProfileRequest) (*AppProfile, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Gets information about an app profile.
 	GetAppProfile(context.Context, *GetAppProfileRequest) (*AppProfile, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Lists information about app profiles in an instance.
 	ListAppProfiles(context.Context, *ListAppProfilesRequest) (*ListAppProfilesResponse, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Updates an app profile within an instance.
-	UpdateAppProfile(context.Context, *UpdateAppProfileRequest) (*google_longrunning.Operation, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	UpdateAppProfile(context.Context, *UpdateAppProfileRequest) (*longrunning.Operation, error)
 	// Deletes an app profile from an instance.
-	DeleteAppProfile(context.Context, *DeleteAppProfileRequest) (*google_protobuf3.Empty, error)
-	// This is a private alpha release of Cloud Bigtable instance level
-	// permissions. This feature is not currently available to most Cloud Bigtable
-	// customers. This feature might be changed in backward-incompatible ways and
-	// is not recommended for production use. It is not subject to any SLA or
-	// deprecation policy.
-	//
+	DeleteAppProfile(context.Context, *DeleteAppProfileRequest) (*empty.Empty, error)
 	// Gets the access control policy for an instance resource. Returns an empty
 	// policy if an instance exists but does not have a policy set.
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
-	// This is a private alpha release of Cloud Bigtable instance level
-	// permissions. This feature is not currently available to most Cloud Bigtable
-	// customers. This feature might be changed in backward-incompatible ways and
-	// is not recommended for production use. It is not subject to any SLA or
-	// deprecation policy.
-	//
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Sets the access control policy on an instance resource. Replaces any
 	// existing policy.
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
-	// This is a private alpha release of Cloud Bigtable instance level
-	// permissions. This feature is not currently available to most Cloud Bigtable
-	// customers. This feature might be changed in backward-incompatible ways and
-	// is not recommended for production use. It is not subject to any SLA or
-	// deprecation policy.
-	//
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Returns permissions that the caller has on the specified instance resource.
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
 }
 
 func RegisterBigtableInstanceAdminServer(s *grpc.Server, srv BigtableInstanceAdminServer) {
@@ -1474,7 +1793,7 @@ func _BigtableInstanceAdmin_DeleteAppProfile_Handler(srv interface{}, ctx contex
 }
 
 func _BigtableInstanceAdmin_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1486,13 +1805,13 @@ func _BigtableInstanceAdmin_GetIamPolicy_Handler(srv interface{}, ctx context.Co
 		FullMethod: "/google.bigtable.admin.v2.BigtableInstanceAdmin/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BigtableInstanceAdminServer).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(BigtableInstanceAdminServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _BigtableInstanceAdmin_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1504,13 +1823,13 @@ func _BigtableInstanceAdmin_SetIamPolicy_Handler(srv interface{}, ctx context.Co
 		FullMethod: "/google.bigtable.admin.v2.BigtableInstanceAdmin/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BigtableInstanceAdminServer).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(BigtableInstanceAdminServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _BigtableInstanceAdmin_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1522,7 +1841,7 @@ func _BigtableInstanceAdmin_TestIamPermissions_Handler(srv interface{}, ctx cont
 		FullMethod: "/google.bigtable.admin.v2.BigtableInstanceAdmin/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BigtableInstanceAdminServer).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(BigtableInstanceAdminServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1613,107 +1932,107 @@ var _BigtableInstanceAdmin_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/v2/bigtable_instance_admin.proto", fileDescriptor0)
-}
-
-var fileDescriptor0 = []byte{
-	// 1559 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x6f, 0xdc, 0x44,
-	0x1b, 0xd7, 0x6c, 0xfa, 0xf6, 0x6d, 0x9e, 0xcd, 0xd7, 0x3b, 0x6f, 0xf3, 0x21, 0xd3, 0x8f, 0xd4,
-	0xad, 0xda, 0x74, 0x1b, 0x6c, 0xb2, 0xa0, 0xb6, 0x4a, 0x48, 0x45, 0x9b, 0x96, 0x28, 0x28, 0x55,
-	0xa3, 0x6d, 0x29, 0x6a, 0x15, 0xb1, 0x9a, 0x64, 0x27, 0x8b, 0x89, 0xd7, 0x36, 0xb6, 0x37, 0x50,
-	0xa1, 0x5e, 0x10, 0x42, 0xa8, 0x12, 0x1c, 0x40, 0xe2, 0x52, 0xc1, 0x85, 0x0b, 0xaa, 0x10, 0x88,
-	0x0b, 0x37, 0xae, 0x20, 0xc1, 0x91, 0xbf, 0x00, 0x89, 0x33, 0xe2, 0xc6, 0x15, 0xcd, 0x97, 0xd7,
-	0xf6, 0xda, 0x6b, 0xa7, 0x55, 0xa5, 0x9e, 0xba, 0x9e, 0x79, 0xe6, 0x99, 0xdf, 0xf3, 0x3c, 0xbf,
-	0x67, 0xe6, 0x37, 0x29, 0x9c, 0x6f, 0xbb, 0x6e, 0xdb, 0xa6, 0xe6, 0x96, 0xd5, 0x0e, 0xc9, 0x96,
-	0x4d, 0x4d, 0xd2, 0xea, 0x58, 0x8e, 0xb9, 0x57, 0x8f, 0x46, 0x9a, 0x96, 0x13, 0x84, 0xc4, 0xd9,
-	0xa6, 0x4d, 0x3e, 0x65, 0x78, 0xbe, 0x1b, 0xba, 0x78, 0x46, 0xac, 0x33, 0x94, 0x95, 0x21, 0x26,
-	0xf7, 0xea, 0xda, 0x11, 0xe9, 0x91, 0x78, 0x96, 0x49, 0x1c, 0xc7, 0x0d, 0x49, 0x68, 0xb9, 0x4e,
-	0x20, 0xd6, 0x69, 0x67, 0x72, 0xf7, 0x53, 0xdb, 0x48, 0xc3, 0x63, 0xd2, 0xd0, 0x22, 0x1d, 0x73,
-	0x6f, 0x81, 0xfd, 0xd3, 0xf4, 0x5c, 0xdb, 0xda, 0xbe, 0x27, 0xe7, 0xb5, 0xe4, 0x7c, 0x62, 0xee,
-	0xa4, 0x9c, 0xb3, 0x5d, 0xa7, 0xed, 0x77, 0x1d, 0xc7, 0x72, 0xda, 0xa6, 0xeb, 0x51, 0x3f, 0x81,
-	0xe4, 0x39, 0x69, 0xc4, 0xbf, 0xb6, 0xba, 0x3b, 0x26, 0xed, 0x78, 0xa1, 0xf2, 0x30, 0x9b, 0x9e,
-	0xdc, 0xb1, 0xa8, 0xdd, 0x6a, 0x76, 0x48, 0xb0, 0x2b, 0x2d, 0x8e, 0xa7, 0x2d, 0x42, 0xab, 0x43,
-	0x83, 0x90, 0x74, 0x3c, 0x61, 0xa0, 0xff, 0x56, 0x81, 0xc9, 0x15, 0x9f, 0x92, 0x90, 0xae, 0xc9,
-	0xc8, 0x1a, 0xf4, 0x9d, 0x2e, 0x0d, 0x42, 0x3c, 0x05, 0x07, 0x3d, 0xe2, 0x53, 0x27, 0x9c, 0x41,
-	0xb3, 0x68, 0x6e, 0xb8, 0x21, 0xbf, 0xf0, 0x71, 0xa8, 0x46, 0xb9, 0xb6, 0x5a, 0x33, 0x15, 0x3e,
-	0x09, 0x6a, 0x68, 0xad, 0x85, 0x2f, 0xc1, 0x21, 0xf5, 0x35, 0x33, 0x34, 0x8b, 0xe6, 0xaa, 0x75,
-	0xdd, 0xc8, 0xab, 0x83, 0x11, 0xed, 0x1a, 0xad, 0xc1, 0x77, 0xe0, 0xd0, 0xb6, 0xdd, 0x0d, 0x42,
-	0xea, 0x07, 0x33, 0x07, 0x66, 0x87, 0xe6, 0xaa, 0xf5, 0xe5, 0xfc, 0xf5, 0x99, 0xd8, 0x8d, 0x15,
-	0xb9, 0xfe, 0x9a, 0x13, 0xfa, 0xf7, 0x1a, 0x91, 0x3b, 0xed, 0x4d, 0x18, 0x4d, 0x4c, 0xe1, 0x09,
-	0x18, 0xda, 0xa5, 0xf7, 0x64, 0x84, 0xec, 0x27, 0xbe, 0x00, 0xff, 0xd9, 0x23, 0x76, 0x97, 0xf2,
-	0xc0, 0xaa, 0xf5, 0x13, 0x03, 0xb6, 0x16, 0x9e, 0x1a, 0xc2, 0x7e, 0xb1, 0x72, 0x11, 0xe9, 0x73,
-	0x80, 0x57, 0x69, 0x98, 0xce, 0x24, 0x86, 0x03, 0x0e, 0xe9, 0x50, 0xb9, 0x0b, 0xff, 0xad, 0x5f,
-	0x87, 0xc3, 0xeb, 0x56, 0x10, 0x99, 0x06, 0x45, 0x59, 0x3f, 0x0a, 0xe0, 0x91, 0x36, 0x6d, 0x86,
-	0xee, 0x2e, 0x75, 0x64, 0xd2, 0x87, 0xd9, 0xc8, 0x2d, 0x36, 0xa0, 0x7f, 0x8b, 0x60, 0x32, 0xe5,
-	0x2f, 0xf0, 0x5c, 0x27, 0xa0, 0xf8, 0x15, 0x18, 0x56, 0x99, 0x0d, 0x66, 0x10, 0x4f, 0x67, 0x99,
-	0x72, 0xf4, 0x16, 0xe1, 0xb3, 0x30, 0xb1, 0x43, 0x2c, 0x9b, 0xb6, 0x9a, 0xb6, 0xbb, 0x2d, 0xc8,
-	0x39, 0x53, 0x99, 0x1d, 0x9a, 0x1b, 0x6e, 0x8c, 0x8b, 0xf1, 0x75, 0x35, 0x8c, 0x4f, 0xc3, 0xb8,
-	0x43, 0xdf, 0x0b, 0x9b, 0x31, 0xa8, 0x43, 0x1c, 0xea, 0x28, 0x1b, 0xde, 0x88, 0xe0, 0x3e, 0x44,
-	0x70, 0x64, 0x83, 0xf8, 0xa1, 0x45, 0xec, 0xd7, 0xbd, 0x56, 0x06, 0xf9, 0xe2, 0x1c, 0x42, 0x8f,
-	0xc1, 0xa1, 0x25, 0xa8, 0x76, 0xb9, 0x63, 0xde, 0x0c, 0xb2, 0x96, 0x9a, 0x72, 0xa1, 0xba, 0xc1,
-	0x78, 0x95, 0xf5, 0xcb, 0x75, 0x12, 0xec, 0x36, 0x40, 0x98, 0xb3, 0xdf, 0xfa, 0x39, 0x98, 0xbc,
-	0x4a, 0x6d, 0xda, 0x8f, 0x2a, 0xab, 0x90, 0x0f, 0x10, 0x1c, 0x16, 0x24, 0x54, 0x7c, 0x28, 0xae,
-	0xa4, 0xe4, 0x63, 0xaf, 0x7d, 0x86, 0xe5, 0xc8, 0x5a, 0x0b, 0x2f, 0xc1, 0x7f, 0xe5, 0x87, 0x6c,
-	0x9e, 0x12, 0x0c, 0x54, 0x2b, 0xf4, 0x33, 0xf0, 0xbf, 0x55, 0x1a, 0xa6, 0x80, 0x64, 0xa1, 0x5e,
-	0x87, 0xff, 0x33, 0xba, 0xa8, 0x66, 0x78, 0x42, 0xf6, 0x7d, 0x83, 0x04, 0x9b, 0x7b, 0xee, 0x24,
-	0xf9, 0x96, 0x63, 0xad, 0x2c, 0xb8, 0x57, 0x22, 0x9a, 0x68, 0xc9, 0xd3, 0x60, 0x5e, 0x0d, 0x0e,
-	0x8b, 0xda, 0x96, 0x48, 0xd2, 0xdf, 0x08, 0xa6, 0x92, 0xe7, 0xcb, 0x75, 0x1a, 0x92, 0x16, 0x09,
-	0x09, 0xbe, 0x0b, 0x13, 0xae, 0x6f, 0xb5, 0x2d, 0x87, 0xd8, 0x4d, 0x5f, 0xb8, 0x90, 0x3c, 0x35,
-	0xf7, 0x79, 0x56, 0x35, 0xc6, 0x95, 0x23, 0x05, 0x65, 0x19, 0x46, 0xa4, 0xcb, 0x26, 0x3b, 0xad,
-	0x73, 0xc9, 0x7b, 0x4b, 0x1d, 0xe5, 0x8d, 0xaa, 0xb4, 0x67, 0x23, 0x8c, 0xfa, 0x3b, 0x96, 0x63,
-	0x05, 0x6f, 0x89, 0xd5, 0x43, 0x85, 0xab, 0x41, 0x98, 0xb3, 0x01, 0xfd, 0x1f, 0x04, 0x53, 0xc9,
-	0x8e, 0x8c, 0x42, 0x26, 0xb9, 0x21, 0x9f, 0xcf, 0x0f, 0x79, 0x50, 0x93, 0x3f, 0x5b, 0x91, 0xff,
-	0x85, 0xd4, 0x45, 0x28, 0x99, 0x11, 0x05, 0x7e, 0x27, 0x37, 0x70, 0xa3, 0xa8, 0xd6, 0x49, 0x92,
-	0x3d, 0x5b, 0x01, 0xff, 0x81, 0x60, 0x52, 0xd4, 0x25, 0x1d, 0xf0, 0x7a, 0x6e, 0xc0, 0x25, 0xba,
-	0xf7, 0x99, 0x8a, 0xf1, 0x17, 0x04, 0xd3, 0xa2, 0x12, 0x97, 0x3d, 0x6f, 0xc3, 0x77, 0x77, 0x2c,
-	0xbb, 0x50, 0xdf, 0x9c, 0x82, 0x31, 0xe2, 0x79, 0x4d, 0x4f, 0x58, 0xf7, 0xce, 0xe8, 0x11, 0x12,
-	0xb9, 0x58, 0x6b, 0xe1, 0x6b, 0x50, 0x8d, 0x59, 0x49, 0x58, 0xa7, 0xf2, 0xd3, 0x13, 0xdb, 0x1f,
-	0x7a, 0x8e, 0xf0, 0x19, 0x18, 0xb7, 0xda, 0x8e, 0xeb, 0xd3, 0xe6, 0xbb, 0xc4, 0x67, 0x0a, 0x90,
-	0x49, 0x1e, 0x34, 0x77, 0xa8, 0x31, 0x26, 0x86, 0xdf, 0x90, 0xa3, 0xec, 0xdc, 0x5a, 0xa5, 0x61,
-	0x7f, 0x14, 0x59, 0xe7, 0xd6, 0x0d, 0x98, 0x62, 0xa7, 0x71, 0xcf, 0xf8, 0x49, 0xcf, 0xf7, 0x07,
-	0x08, 0xa6, 0xfb, 0x3c, 0xca, 0x23, 0x7e, 0x15, 0x46, 0x62, 0x89, 0x50, 0xc7, 0x7c, 0xb9, 0x4c,
-	0x54, 0x7b, 0x99, 0xc8, 0x3c, 0xc1, 0x2b, 0x59, 0x27, 0xf8, 0xcf, 0x08, 0xa6, 0x05, 0x6f, 0xfb,
-	0xb3, 0x91, 0xaa, 0x0a, 0x7a, 0xcc, 0xaa, 0x3c, 0x89, 0x7a, 0xc8, 0x2a, 0xe9, 0x50, 0x66, 0x49,
-	0x6f, 0xc3, 0xb4, 0xb8, 0x8a, 0x4a, 0x55, 0x35, 0xcb, 0x6f, 0x25, 0xcb, 0x6f, 0xfd, 0xd1, 0x34,
-	0x4c, 0x5e, 0x91, 0xa1, 0xaa, 0x23, 0xf7, 0x32, 0x8b, 0x18, 0x7f, 0x8a, 0x60, 0x2c, 0x79, 0x09,
-	0xe1, 0xfd, 0x5e, 0x57, 0xda, 0x51, 0xb5, 0x20, 0xf6, 0x6c, 0x31, 0x6e, 0xa8, 0x67, 0x8b, 0x3e,
-	0xff, 0xc1, 0xef, 0x7f, 0x7e, 0x5e, 0x39, 0xad, 0x9f, 0x60, 0x8f, 0xa5, 0xf7, 0x05, 0xbd, 0x96,
-	0x3d, 0xdf, 0x7d, 0x9b, 0x6e, 0x87, 0x81, 0x59, 0xbb, 0x1f, 0x3d, 0xa0, 0x82, 0x45, 0x54, 0xc3,
-	0x0f, 0x10, 0x54, 0x63, 0x82, 0x19, 0xcf, 0xe7, 0xa3, 0xe9, 0xd7, 0xd5, 0x5a, 0x09, 0x49, 0xa8,
-	0x9f, 0xe5, 0x78, 0x4e, 0x62, 0x81, 0x87, 0x25, 0x32, 0x86, 0xa6, 0x07, 0xc6, 0xac, 0xdd, 0xc7,
-	0x0f, 0x11, 0x8c, 0x26, 0x34, 0x34, 0x1e, 0x70, 0xbe, 0x67, 0x89, 0x77, 0xcd, 0x2c, 0x6d, 0x2f,
-	0x9a, 0x27, 0x85, 0x6e, 0x50, 0xb6, 0xf0, 0x47, 0x08, 0xc6, 0x92, 0xd7, 0x28, 0x2e, 0x11, 0x7f,
-	0xa9, 0x1c, 0xc9, 0x9a, 0x69, 0xc5, 0x39, 0x62, 0x35, 0x63, 0x4f, 0x8d, 0xcc, 0x6b, 0x1d, 0x3f,
-	0xa6, 0x0e, 0x28, 0xa2, 0xd4, 0xcb, 0x1c, 0xde, 0xf9, 0x7a, 0x8d, 0xc3, 0x8b, 0x1e, 0xe0, 0x03,
-	0x71, 0xf6, 0x5e, 0x02, 0x1f, 0x22, 0x18, 0x4b, 0xaa, 0xf9, 0x41, 0x9c, 0xcf, 0xd4, 0xfd, 0xda,
-	0x54, 0x5f, 0xeb, 0x5f, 0x63, 0xaf, 0x70, 0x55, 0xbe, 0x5a, 0x09, 0x72, 0x7d, 0x89, 0x60, 0x34,
-	0xa1, 0x09, 0xf0, 0x3e, 0xc5, 0x43, 0x51, 0x96, 0x96, 0x39, 0x96, 0x0b, 0xfa, 0x7c, 0x36, 0x95,
-	0x12, 0x68, 0x4c, 0xa5, 0xb0, 0x17, 0xd5, 0xcb, 0x01, 0x7f, 0x86, 0x00, 0x7a, 0x4f, 0x07, 0x7c,
-	0x6e, 0x60, 0x23, 0xa6, 0x90, 0x15, 0xab, 0x02, 0xfd, 0x25, 0x8e, 0xce, 0xc0, 0xf3, 0x45, 0x99,
-	0x8a, 0xa0, 0xb1, 0xa4, 0x7d, 0x8d, 0x60, 0x24, 0xfe, 0xae, 0xc0, 0xcf, 0x0f, 0x6e, 0xb0, 0xd4,
-	0x73, 0x46, 0x33, 0xca, 0x9a, 0xcb, 0x76, 0x4c, 0xa2, 0x2c, 0x99, 0x43, 0x76, 0x88, 0x8d, 0x26,
-	0x84, 0x14, 0x2e, 0x4e, 0x48, 0x51, 0x35, 0x2f, 0x70, 0x24, 0x0b, 0xda, 0xbe, 0xf2, 0xc5, 0xba,
-	0xf3, 0x13, 0x04, 0xa3, 0x89, 0x07, 0xce, 0x20, 0x9e, 0x65, 0xbd, 0x84, 0x72, 0xc9, 0x2e, 0x93,
-	0x53, 0xdb, 0x5f, 0x09, 0x7f, 0x40, 0x30, 0x91, 0x56, 0x60, 0x78, 0xa1, 0x88, 0xfa, 0x7d, 0x37,
-	0xa2, 0x56, 0xea, 0x12, 0xd7, 0xaf, 0x72, 0x8c, 0x97, 0x74, 0xb3, 0x4c, 0x01, 0x63, 0xe2, 0x63,
-	0x31, 0x2e, 0x1b, 0xf0, 0x57, 0x08, 0x46, 0x13, 0x62, 0x6b, 0x50, 0x0e, 0xb3, 0x54, 0x59, 0x49,
-	0xb4, 0xb2, 0xc8, 0xd8, 0x2c, 0xcc, 0x68, 0x0c, 0x2a, 0x4b, 0xea, 0xf7, 0x08, 0xc6, 0x53, 0x7a,
-	0x0c, 0xbf, 0x30, 0x98, 0xeb, 0xfd, 0x62, 0x50, 0x5b, 0xd8, 0xc7, 0x0a, 0xd9, 0x20, 0x49, 0xc4,
-	0xe5, 0xf3, 0x8b, 0x7f, 0x44, 0x30, 0x91, 0x16, 0x6d, 0x83, 0x68, 0x90, 0x23, 0xf0, 0x8a, 0xda,
-	0x66, 0x83, 0xe3, 0x7b, 0xad, 0xbe, 0xc4, 0xf1, 0xc5, 0x6a, 0x6a, 0x94, 0xcf, 0x6e, 0x92, 0x0b,
-	0x5f, 0x20, 0x98, 0x48, 0xab, 0xb4, 0x41, 0xc0, 0x73, 0x14, 0x5d, 0x6e, 0x57, 0xc9, 0x8c, 0xd6,
-	0xf6, 0xcd, 0x81, 0x8f, 0x11, 0x8c, 0x30, 0x4d, 0x44, 0x3a, 0x1b, 0xfc, 0x8f, 0xca, 0x3d, 0x35,
-	0x60, 0x91, 0x8e, 0xb1, 0xb7, 0x60, 0xc4, 0x27, 0x15, 0x8a, 0xc9, 0x94, 0x8d, 0x98, 0x8d, 0xee,
-	0x8e, 0x3a, 0x07, 0xe1, 0xd3, 0xc0, 0xed, 0xfa, 0xdb, 0xf9, 0x97, 0x6b, 0x3b, 0xe6, 0x99, 0x9d,
-	0x39, 0x0c, 0xca, 0xcd, 0x41, 0x50, 0x6e, 0x3e, 0x35, 0x28, 0x41, 0x0a, 0xca, 0x77, 0x08, 0xf0,
-	0x2d, 0x1a, 0xf0, 0x41, 0xea, 0x77, 0xac, 0x20, 0xe0, 0x7f, 0x1d, 0x9a, 0x4b, 0x6d, 0xd6, 0x6f,
-	0xa2, 0x60, 0x9d, 0x2d, 0x61, 0x29, 0x9b, 0x61, 0x85, 0x43, 0x5d, 0xd6, 0x2f, 0x96, 0x83, 0x1a,
-	0xf6, 0x79, 0x5a, 0x44, 0xb5, 0x2b, 0x3f, 0x21, 0x38, 0xb2, 0xed, 0x76, 0x72, 0x09, 0x75, 0x45,
-	0xcb, 0x94, 0xf2, 0x1b, 0x8c, 0x45, 0x1b, 0xe8, 0xee, 0xb2, 0x5c, 0xd7, 0x76, 0x6d, 0xe2, 0xb4,
-	0x0d, 0xd7, 0x6f, 0x9b, 0x6d, 0xea, 0x70, 0x8e, 0x99, 0x62, 0x8a, 0x78, 0x56, 0xd0, 0xff, 0xff,
-	0x18, 0x4b, 0xfc, 0xc7, 0xa3, 0xca, 0xb1, 0x55, 0xb1, 0x7e, 0xc5, 0x76, 0xbb, 0x2d, 0x43, 0x6d,
-	0x65, 0xf0, 0x3d, 0x8c, 0xdb, 0xf5, 0x5f, 0x95, 0xc1, 0x26, 0x37, 0xd8, 0x54, 0x06, 0x9b, 0xdc,
-	0x60, 0xf3, 0x76, 0x7d, 0xeb, 0x20, 0xdf, 0xeb, 0xc5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2f,
-	0xdb, 0x53, 0xda, 0xa2, 0x19, 0x00, 0x00,
+	proto.RegisterFile("google/bigtable/admin/v2/bigtable_instance_admin.proto", fileDescriptor_bigtable_instance_admin_67df92d624517bbb)
+}
+
+var fileDescriptor_bigtable_instance_admin_67df92d624517bbb = []byte{
+	// 1566 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcf, 0x6f, 0xdc, 0xc4,
+	0x17, 0xd7, 0x6c, 0xfa, 0xed, 0xb7, 0x79, 0x9b, 0x5f, 0xdf, 0xf9, 0x36, 0xc9, 0xca, 0xf4, 0x47,
+	0xea, 0x56, 0x6d, 0xba, 0x0d, 0x36, 0x59, 0x50, 0x5b, 0x25, 0xa4, 0xa2, 0x4d, 0x4b, 0x14, 0x94,
+	0xaa, 0xd1, 0xb6, 0x14, 0xb5, 0x8a, 0x58, 0x4d, 0xb2, 0x93, 0xc5, 0xc4, 0x6b, 0x1b, 0xdb, 0x1b,
+	0xa8, 0x50, 0x2f, 0x08, 0x21, 0x54, 0x09, 0x0e, 0x20, 0x71, 0xa9, 0xe0, 0xc2, 0x05, 0x55, 0x08,
+	0xc4, 0x85, 0x1b, 0x57, 0x90, 0xe0, 0xc8, 0x5f, 0x80, 0xc4, 0x19, 0x71, 0xe3, 0x8a, 0x66, 0x3c,
+	0xe3, 0xb5, 0xbd, 0xfe, 0xb5, 0xad, 0x2a, 0xf5, 0xd4, 0xf5, 0xcc, 0x9b, 0x37, 0x9f, 0xf9, 0xbc,
+	0xcf, 0x7b, 0xf3, 0x26, 0x85, 0xf3, 0x1d, 0xdb, 0xee, 0x98, 0x54, 0xdf, 0x36, 0x3a, 0x3e, 0xd9,
+	0x36, 0xa9, 0x4e, 0xda, 0x5d, 0xc3, 0xd2, 0xf7, 0x1b, 0xe1, 0x48, 0xcb, 0xb0, 0x3c, 0x9f, 0x58,
+	0x3b, 0xb4, 0xc5, 0xa7, 0x34, 0xc7, 0xb5, 0x7d, 0x1b, 0xd7, 0x82, 0x75, 0x9a, 0xb4, 0xd2, 0x82,
+	0xc9, 0xfd, 0x86, 0x72, 0x44, 0x78, 0x24, 0x8e, 0xa1, 0x13, 0xcb, 0xb2, 0x7d, 0xe2, 0x1b, 0xb6,
+	0xe5, 0x05, 0xeb, 0x94, 0x33, 0x99, 0xfb, 0xc9, 0x6d, 0x84, 0xe1, 0x31, 0x61, 0x68, 0x90, 0xae,
+	0xbe, 0xbf, 0xc8, 0xfe, 0x69, 0x39, 0xb6, 0x69, 0xec, 0xdc, 0x13, 0xf3, 0x4a, 0x7c, 0x3e, 0x36,
+	0x77, 0x52, 0xcc, 0x99, 0xb6, 0xd5, 0x71, 0x7b, 0x96, 0x65, 0x58, 0x1d, 0xdd, 0x76, 0xa8, 0x1b,
+	0x43, 0xf2, 0x9c, 0x30, 0xe2, 0x5f, 0xdb, 0xbd, 0x5d, 0x9d, 0x76, 0x1d, 0x5f, 0x7a, 0x98, 0x4b,
+	0x4e, 0xee, 0x1a, 0xd4, 0x6c, 0xb7, 0xba, 0xc4, 0xdb, 0x13, 0x16, 0xc7, 0x93, 0x16, 0xbe, 0xd1,
+	0xa5, 0x9e, 0x4f, 0xba, 0x4e, 0x60, 0xa0, 0xfe, 0x56, 0x81, 0xe9, 0x55, 0x97, 0x12, 0x9f, 0xae,
+	0x8b, 0x93, 0x35, 0xe9, 0x3b, 0x3d, 0xea, 0xf9, 0x78, 0x06, 0x0e, 0x3a, 0xc4, 0xa5, 0x96, 0x5f,
+	0x43, 0x73, 0x68, 0x7e, 0xb4, 0x29, 0xbe, 0xf0, 0x71, 0xa8, 0x86, 0x5c, 0x1b, 0xed, 0x5a, 0x85,
+	0x4f, 0x82, 0x1c, 0x5a, 0x6f, 0xe3, 0x4b, 0x70, 0x48, 0x7e, 0xd5, 0x46, 0xe6, 0xd0, 0x7c, 0xb5,
+	0xa1, 0x6a, 0x59, 0x71, 0xd0, 0xc2, 0x5d, 0xc3, 0x35, 0xf8, 0x0e, 0x1c, 0xda, 0x31, 0x7b, 0x9e,
+	0x4f, 0x5d, 0xaf, 0x76, 0x60, 0x6e, 0x64, 0xbe, 0xda, 0x58, 0xc9, 0x5e, 0x9f, 0x8a, 0x5d, 0x5b,
+	0x15, 0xeb, 0xaf, 0x59, 0xbe, 0x7b, 0xaf, 0x19, 0xba, 0x53, 0xde, 0x84, 0xf1, 0xd8, 0x14, 0x9e,
+	0x82, 0x91, 0x3d, 0x7a, 0x4f, 0x9c, 0x90, 0xfd, 0xc4, 0x17, 0xe0, 0x3f, 0xfb, 0xc4, 0xec, 0x51,
+	0x7e, 0xb0, 0x6a, 0xe3, 0x44, 0xce, 0xd6, 0x81, 0xa7, 0x66, 0x60, 0xbf, 0x54, 0xb9, 0x88, 0xd4,
+	0x79, 0xc0, 0x6b, 0xd4, 0x4f, 0x32, 0x89, 0xe1, 0x80, 0x45, 0xba, 0x54, 0xec, 0xc2, 0x7f, 0xab,
+	0xd7, 0xe1, 0xf0, 0x86, 0xe1, 0x85, 0xa6, 0x5e, 0x11, 0xeb, 0x47, 0x01, 0x1c, 0xd2, 0xa1, 0x2d,
+	0xdf, 0xde, 0xa3, 0x96, 0x20, 0x7d, 0x94, 0x8d, 0xdc, 0x62, 0x03, 0xea, 0xb7, 0x08, 0xa6, 0x13,
+	0xfe, 0x3c, 0xc7, 0xb6, 0x3c, 0x8a, 0x5f, 0x81, 0x51, 0xc9, 0xac, 0x57, 0x43, 0x9c, 0xce, 0x32,
+	0xe1, 0xe8, 0x2f, 0xc2, 0x67, 0x61, 0x6a, 0x97, 0x18, 0x26, 0x6d, 0xb7, 0x4c, 0x7b, 0x27, 0x10,
+	0x67, 0xad, 0x32, 0x37, 0x32, 0x3f, 0xda, 0x9c, 0x0c, 0xc6, 0x37, 0xe4, 0x30, 0x3e, 0x0d, 0x93,
+	0x16, 0x7d, 0xcf, 0x6f, 0x45, 0xa0, 0x8e, 0x70, 0xa8, 0xe3, 0x6c, 0x78, 0x33, 0x84, 0xfb, 0x10,
+	0xc1, 0x91, 0x4d, 0xe2, 0xfa, 0x06, 0x31, 0x5f, 0x77, 0xda, 0x29, 0xe2, 0x8b, 0x6a, 0x08, 0x3d,
+	0x86, 0x86, 0x96, 0xa1, 0xda, 0xe3, 0x8e, 0x79, 0x32, 0x88, 0x58, 0x2a, 0xd2, 0x85, 0xcc, 0x06,
+	0xed, 0x55, 0x96, 0x2f, 0xd7, 0x89, 0xb7, 0xd7, 0x84, 0xc0, 0x9c, 0xfd, 0x56, 0xcf, 0xc1, 0xf4,
+	0x55, 0x6a, 0xd2, 0x41, 0x54, 0x69, 0x81, 0x7c, 0x80, 0xe0, 0x70, 0x20, 0x42, 0xa9, 0x87, 0xe2,
+	0x48, 0x0a, 0x3d, 0xf6, 0xd3, 0x67, 0x54, 0x8c, 0xac, 0xb7, 0xf1, 0x32, 0xfc, 0x57, 0x7c, 0x88,
+	0xe4, 0x29, 0xa1, 0x40, 0xb9, 0x42, 0x3d, 0x03, 0xff, 0x5b, 0xa3, 0x7e, 0x02, 0x48, 0x1a, 0xea,
+	0x0d, 0xf8, 0x3f, 0x93, 0x8b, 0x4c, 0x86, 0x27, 0x54, 0xdf, 0x37, 0x28, 0x50, 0x73, 0xdf, 0x9d,
+	0x10, 0xdf, 0x4a, 0x24, 0x95, 0x03, 0xed, 0x95, 0x38, 0x4d, 0xb8, 0xe4, 0x69, 0x28, 0xaf, 0x0e,
+	0x87, 0x83, 0xd8, 0x96, 0x20, 0xe9, 0x6f, 0x04, 0x33, 0xf1, 0xfa, 0x72, 0x9d, 0xfa, 0xa4, 0x4d,
+	0x7c, 0x82, 0xef, 0xc2, 0x94, 0xed, 0x1a, 0x1d, 0xc3, 0x22, 0x66, 0xcb, 0x0d, 0x5c, 0x08, 0x9d,
+	0xea, 0x43, 0xd6, 0xaa, 0xe6, 0xa4, 0x74, 0x24, 0xa1, 0xac, 0xc0, 0x98, 0x70, 0xd9, 0x62, 0xd5,
+	0x3a, 0x53, 0xbc, 0xb7, 0x64, 0x29, 0x6f, 0x56, 0x85, 0x3d, 0x1b, 0x61, 0xd2, 0xdf, 0x35, 0x2c,
+	0xc3, 0x7b, 0x2b, 0x58, 0x3d, 0x52, 0xb8, 0x1a, 0x02, 0x73, 0x36, 0xa0, 0xfe, 0x83, 0x60, 0x26,
+	0x9e, 0x91, 0xe1, 0x91, 0x49, 0xe6, 0x91, 0xcf, 0x67, 0x1f, 0x39, 0x2f, 0xc9, 0x9f, 0xad, 0x93,
+	0xff, 0x85, 0xe4, 0x45, 0x28, 0x94, 0x11, 0x1e, 0xfc, 0x4e, 0xe6, 0xc1, 0xb5, 0xa2, 0x58, 0xc7,
+	0x45, 0xf6, 0x6c, 0x1d, 0xf8, 0x0f, 0x04, 0xd3, 0x41, 0x5c, 0x92, 0x07, 0xde, 0xc8, 0x3c, 0x70,
+	0x89, 0xec, 0x7d, 0xa6, 0xce, 0xf8, 0x0b, 0x82, 0xd9, 0x20, 0x12, 0x97, 0x1d, 0x67, 0xd3, 0xb5,
+	0x77, 0x0d, 0xb3, 0xb0, 0xbf, 0x39, 0x05, 0x13, 0xc4, 0x71, 0x5a, 0x4e, 0x60, 0xdd, 0xaf, 0xd1,
+	0x63, 0x24, 0x74, 0xb1, 0xde, 0xc6, 0xd7, 0xa0, 0x1a, 0xb1, 0x12, 0xb0, 0x4e, 0x65, 0xd3, 0x13,
+	0xd9, 0x1f, 0xfa, 0x8e, 0xf0, 0x19, 0x98, 0x34, 0x3a, 0x96, 0xed, 0xd2, 0xd6, 0xbb, 0xc4, 0x65,
+	0x1d, 0x20, 0x6b, 0x79, 0xd0, 0xfc, 0xa1, 0xe6, 0x44, 0x30, 0xfc, 0x86, 0x18, 0x65, 0x75, 0x6b,
+	0x8d, 0xfa, 0x83, 0xa7, 0x48, 0xab, 0x5b, 0x37, 0x60, 0x86, 0x55, 0xe3, 0xbe, 0xf1, 0x93, 0xd6,
+	0xf7, 0x07, 0x08, 0x66, 0x07, 0x3c, 0x8a, 0x12, 0xbf, 0x06, 0x63, 0x11, 0x22, 0x64, 0x99, 0x2f,
+	0xc7, 0x44, 0xb5, 0xcf, 0x44, 0x6a, 0x05, 0xaf, 0xa4, 0x55, 0xf0, 0x9f, 0x11, 0xcc, 0x06, 0xba,
+	0x1d, 0x64, 0x23, 0x11, 0x15, 0xf4, 0x98, 0x51, 0x79, 0x92, 0xee, 0x21, 0x2d, 0xa4, 0x23, 0xa9,
+	0x21, 0xbd, 0x0d, 0xb3, 0xc1, 0x55, 0x54, 0x2a, 0xaa, 0x69, 0x7e, 0x2b, 0xa9, 0x7e, 0x15, 0xa8,
+	0x25, 0xf9, 0x91, 0xa9, 0xdd, 0x78, 0x34, 0x0b, 0xd3, 0x57, 0x04, 0x0d, 0xb2, 0x1c, 0x5f, 0x66,
+	0x6c, 0xe0, 0x4f, 0x11, 0x4c, 0xc4, 0x2f, 0x28, 0x3c, 0xec, 0x55, 0xa6, 0x1c, 0x95, 0x0b, 0x22,
+	0x4f, 0x1a, 0xed, 0x86, 0x7c, 0xd2, 0xa8, 0x0b, 0x1f, 0xfc, 0xfe, 0xe7, 0xe7, 0x95, 0xd3, 0xea,
+	0x09, 0xf6, 0x90, 0x7a, 0x3f, 0x90, 0xde, 0x8a, 0xe3, 0xda, 0x6f, 0xd3, 0x1d, 0xdf, 0xd3, 0xeb,
+	0xf7, 0xc3, 0xc7, 0x95, 0xb7, 0x84, 0xea, 0xf8, 0x01, 0x82, 0x6a, 0xa4, 0x99, 0xc6, 0x0b, 0xd9,
+	0x68, 0x06, 0x7b, 0x6e, 0xa5, 0x44, 0xbb, 0xa8, 0x9e, 0xe5, 0x78, 0x4e, 0xe2, 0x00, 0x0f, 0x23,
+	0x39, 0x82, 0xa6, 0x0f, 0x46, 0xaf, 0xdf, 0xc7, 0x0f, 0x11, 0x8c, 0xc7, 0xfa, 0x6b, 0x9c, 0x53,
+	0xfb, 0xd3, 0x1a, 0x7b, 0x45, 0x2f, 0x6d, 0x1f, 0x24, 0x56, 0x02, 0x5d, 0x1e, 0x5b, 0xf8, 0x23,
+	0x04, 0x13, 0xf1, 0x2b, 0x16, 0x97, 0x38, 0x7f, 0x29, 0x8e, 0x44, 0xcc, 0x94, 0x62, 0x8e, 0x58,
+	0xcc, 0xd8, 0x33, 0x24, 0xf5, 0xca, 0xc7, 0x8f, 0xd9, 0x23, 0x14, 0x49, 0xea, 0x65, 0x0e, 0xef,
+	0x7c, 0xa3, 0xce, 0xe1, 0x85, 0x8f, 0xf3, 0x5c, 0x9c, 0xfd, 0x57, 0xc2, 0x87, 0x08, 0x26, 0xe2,
+	0x9d, 0x7e, 0x9e, 0xe6, 0x53, 0xdf, 0x04, 0xca, 0xcc, 0x40, 0x59, 0xb8, 0xc6, 0x5e, 0xe8, 0x32,
+	0x7c, 0xf5, 0x12, 0xe2, 0xfa, 0x12, 0xc1, 0x78, 0xac, 0x5f, 0xc0, 0x43, 0x36, 0x16, 0x45, 0x2c,
+	0xad, 0x70, 0x2c, 0x17, 0xd4, 0x85, 0x74, 0x29, 0xc5, 0xd0, 0xe8, 0xb2, 0xfb, 0x5e, 0x92, 0xaf,
+	0x0a, 0xfc, 0x19, 0x02, 0xe8, 0x3f, 0x2b, 0xf0, 0xb9, 0xdc, 0x44, 0x4c, 0x20, 0x2b, 0xee, 0x18,
+	0xd4, 0x97, 0x38, 0x3a, 0x0d, 0x2f, 0x14, 0x31, 0x15, 0x42, 0x63, 0xa4, 0x7d, 0x8d, 0x60, 0x2c,
+	0xfa, 0xe6, 0xc0, 0xcf, 0xe7, 0x27, 0x58, 0xe2, 0xa9, 0xa3, 0x68, 0x65, 0xcd, 0x45, 0x3a, 0xc6,
+	0x51, 0x96, 0xe4, 0x90, 0x15, 0xb1, 0xf1, 0x58, 0x93, 0x85, 0x8b, 0x09, 0x29, 0x8a, 0xe6, 0x05,
+	0x8e, 0x64, 0x51, 0x19, 0x8a, 0x2f, 0x96, 0x9d, 0x9f, 0x20, 0x18, 0x8f, 0x3d, 0x7e, 0xf2, 0x74,
+	0x96, 0xf6, 0x4a, 0xca, 0x14, 0xbb, 0x20, 0xa7, 0x3e, 0x5c, 0x08, 0x7f, 0x40, 0x30, 0x95, 0xec,
+	0xce, 0xf0, 0x62, 0x91, 0xf4, 0x07, 0x6e, 0x4b, 0xa5, 0xd4, 0x05, 0xaf, 0x5e, 0xe5, 0x18, 0x2f,
+	0xa9, 0x7a, 0x99, 0x00, 0x46, 0x1a, 0x93, 0xa5, 0x68, 0x4b, 0x81, 0xbf, 0x42, 0x30, 0x1e, 0x6b,
+	0xc4, 0xf2, 0x38, 0x4c, 0xeb, 0xd8, 0x4a, 0xa2, 0x15, 0x41, 0xc6, 0x7a, 0x21, 0xa3, 0x11, 0xa8,
+	0x8c, 0xd4, 0xef, 0x11, 0x4c, 0x26, 0x7a, 0x35, 0xfc, 0x42, 0xbe, 0xd6, 0x07, 0x1b, 0x45, 0x65,
+	0x71, 0x88, 0x15, 0x22, 0x41, 0xe2, 0x88, 0xcb, 0xf3, 0x8b, 0x7f, 0x44, 0x30, 0x95, 0x6c, 0x58,
+	0xf2, 0x64, 0x90, 0xd1, 0xfc, 0x15, 0xa5, 0xcd, 0x26, 0xc7, 0xf7, 0x5a, 0x63, 0x99, 0xe3, 0x8b,
+	0xc4, 0x54, 0x2b, 0xcf, 0x6e, 0x5c, 0x0b, 0x5f, 0x20, 0x98, 0x4a, 0x76, 0x70, 0x79, 0xc0, 0x33,
+	0xba, 0xbd, 0xcc, 0xac, 0x12, 0x8c, 0xd6, 0x87, 0xd6, 0xc0, 0xc7, 0x08, 0xc6, 0x58, 0x4f, 0x44,
+	0xba, 0x9b, 0xfc, 0x0f, 0xce, 0xfd, 0x6e, 0xc0, 0x20, 0x5d, 0x6d, 0x7f, 0x51, 0x8b, 0x4e, 0x4a,
+	0x14, 0xd3, 0x09, 0x9b, 0x60, 0x36, 0xbc, 0x3b, 0x1a, 0x1c, 0x84, 0x4b, 0x3d, 0xbb, 0xe7, 0xee,
+	0x64, 0x5f, 0xae, 0x9d, 0x88, 0x67, 0x56, 0x73, 0x18, 0x94, 0x9b, 0x79, 0x50, 0x6e, 0x3e, 0x35,
+	0x28, 0x5e, 0x02, 0xca, 0x77, 0x08, 0xf0, 0x2d, 0xea, 0xf1, 0x41, 0xea, 0x76, 0x0d, 0xcf, 0xe3,
+	0x7f, 0x39, 0x9a, 0x4f, 0x6c, 0x36, 0x68, 0x22, 0x61, 0x9d, 0x2d, 0x61, 0x29, 0x92, 0x61, 0x95,
+	0x43, 0x5d, 0x51, 0x2f, 0x96, 0x83, 0xea, 0x0f, 0x78, 0x5a, 0x42, 0xf5, 0x2b, 0x3f, 0x21, 0x38,
+	0xb2, 0x63, 0x77, 0x33, 0x05, 0x75, 0x45, 0x49, 0x6d, 0xe5, 0x37, 0x99, 0x8a, 0x36, 0xd1, 0xdd,
+	0x15, 0xb1, 0xae, 0x63, 0x9b, 0xc4, 0xea, 0x68, 0xb6, 0xdb, 0xd1, 0x3b, 0xd4, 0xe2, 0x1a, 0xd3,
+	0x83, 0x29, 0xe2, 0x18, 0xde, 0xe0, 0xff, 0x71, 0x2c, 0xf3, 0x1f, 0x8f, 0x2a, 0xc7, 0xd6, 0x82,
+	0xf5, 0xab, 0xa6, 0xdd, 0x6b, 0x6b, 0x72, 0x2b, 0x8d, 0xef, 0xa1, 0xdd, 0x6e, 0xfc, 0x2a, 0x0d,
+	0xb6, 0xb8, 0xc1, 0x96, 0x34, 0xd8, 0xe2, 0x06, 0x5b, 0xb7, 0x1b, 0xdb, 0x07, 0xf9, 0x5e, 0x2f,
+	0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xa0, 0x3f, 0x27, 0xbe, 0x19, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
index 01ebaba6..76569b52 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/bigtable_table_admin.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/bigtable_table_admin.proto
 
-package admin
+package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -22,17 +22,23 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CreateTable][google.bigtable.admin.v2.BigtableTableAdmin.CreateTable]
 type CreateTableRequest struct {
 	// The unique name of the instance in which to create the table.
 	// Values are of the form `projects/<project>/instances/<instance>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The name by which the new table should be referred to within the parent
 	// instance, e.g., `foobar` rather than `<parent>/tables/foobar`.
-	TableId string `protobuf:"bytes,2,opt,name=table_id,json=tableId" json:"table_id,omitempty"`
+	TableId string `protobuf:"bytes,2,opt,name=table_id,json=tableId,proto3" json:"table_id,omitempty"`
 	// The Table to create.
-	Table *Table `protobuf:"bytes,3,opt,name=table" json:"table,omitempty"`
+	Table *Table `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
 	// The optional list of row keys that will be used to initially split the
 	// table into several tablets (tablets are similar to HBase regions).
 	// Given two split keys, `s1` and `s2`, three tablets will be created,
@@ -49,13 +55,35 @@ type CreateTableRequest struct {
 	//     - Tablet 3 `[customer_1, customer_2) => {"customer_1"}.`
 	//     - Tablet 4 `[customer_2, other)      => {"customer_2"}.`
 	//     - Tablet 5 `[other, )                => {"other", "zz"}.`
-	InitialSplits []*CreateTableRequest_Split `protobuf:"bytes,4,rep,name=initial_splits,json=initialSplits" json:"initial_splits,omitempty"`
+	InitialSplits        []*CreateTableRequest_Split `protobuf:"bytes,4,rep,name=initial_splits,json=initialSplits,proto3" json:"initial_splits,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *CreateTableRequest) Reset()         { *m = CreateTableRequest{} }
+func (m *CreateTableRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateTableRequest) ProtoMessage()    {}
+func (*CreateTableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{0}
+}
+func (m *CreateTableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTableRequest.Unmarshal(m, b)
+}
+func (m *CreateTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTableRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableRequest.Merge(dst, src)
+}
+func (m *CreateTableRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateTableRequest.Size(m)
+}
+func (m *CreateTableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTableRequest.DiscardUnknown(m)
 }
 
-func (m *CreateTableRequest) Reset()                    { *m = CreateTableRequest{} }
-func (m *CreateTableRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateTableRequest) ProtoMessage()               {}
-func (*CreateTableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_CreateTableRequest proto.InternalMessageInfo
 
 func (m *CreateTableRequest) GetParent() string {
 	if m != nil {
@@ -88,13 +116,35 @@ func (m *CreateTableRequest) GetInitialSplits() []*CreateTableRequest_Split {
 // An initial split point for a newly created table.
 type CreateTableRequest_Split struct {
 	// Row key to use as an initial tablet boundary.
-	Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	Key                  []byte   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateTableRequest_Split) Reset()         { *m = CreateTableRequest_Split{} }
+func (m *CreateTableRequest_Split) String() string { return proto.CompactTextString(m) }
+func (*CreateTableRequest_Split) ProtoMessage()    {}
+func (*CreateTableRequest_Split) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{0, 0}
+}
+func (m *CreateTableRequest_Split) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTableRequest_Split.Unmarshal(m, b)
+}
+func (m *CreateTableRequest_Split) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTableRequest_Split.Marshal(b, m, deterministic)
+}
+func (dst *CreateTableRequest_Split) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableRequest_Split.Merge(dst, src)
+}
+func (m *CreateTableRequest_Split) XXX_Size() int {
+	return xxx_messageInfo_CreateTableRequest_Split.Size(m)
+}
+func (m *CreateTableRequest_Split) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTableRequest_Split.DiscardUnknown(m)
 }
 
-func (m *CreateTableRequest_Split) Reset()                    { *m = CreateTableRequest_Split{} }
-func (m *CreateTableRequest_Split) String() string            { return proto.CompactTextString(m) }
-func (*CreateTableRequest_Split) ProtoMessage()               {}
-func (*CreateTableRequest_Split) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+var xxx_messageInfo_CreateTableRequest_Split proto.InternalMessageInfo
 
 func (m *CreateTableRequest_Split) GetKey() []byte {
 	if m != nil {
@@ -103,31 +153,53 @@ func (m *CreateTableRequest_Split) GetKey() []byte {
 	return nil
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CreateTableFromSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.CreateTableFromSnapshot]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type CreateTableFromSnapshotRequest struct {
 	// The unique name of the instance in which to create the table.
 	// Values are of the form `projects/<project>/instances/<instance>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The name by which the new table should be referred to within the parent
 	// instance, e.g., `foobar` rather than `<parent>/tables/foobar`.
-	TableId string `protobuf:"bytes,2,opt,name=table_id,json=tableId" json:"table_id,omitempty"`
+	TableId string `protobuf:"bytes,2,opt,name=table_id,json=tableId,proto3" json:"table_id,omitempty"`
 	// The unique name of the snapshot from which to restore the table. The
 	// snapshot and the table must be in the same instance.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/<cluster>/snapshots/<snapshot>`.
-	SourceSnapshot string `protobuf:"bytes,3,opt,name=source_snapshot,json=sourceSnapshot" json:"source_snapshot,omitempty"`
+	SourceSnapshot       string   `protobuf:"bytes,3,opt,name=source_snapshot,json=sourceSnapshot,proto3" json:"source_snapshot,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateTableFromSnapshotRequest) Reset()         { *m = CreateTableFromSnapshotRequest{} }
+func (m *CreateTableFromSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateTableFromSnapshotRequest) ProtoMessage()    {}
+func (*CreateTableFromSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{1}
+}
+func (m *CreateTableFromSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTableFromSnapshotRequest.Unmarshal(m, b)
+}
+func (m *CreateTableFromSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTableFromSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateTableFromSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableFromSnapshotRequest.Merge(dst, src)
+}
+func (m *CreateTableFromSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateTableFromSnapshotRequest.Size(m)
+}
+func (m *CreateTableFromSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTableFromSnapshotRequest.DiscardUnknown(m)
 }
 
-func (m *CreateTableFromSnapshotRequest) Reset()                    { *m = CreateTableFromSnapshotRequest{} }
-func (m *CreateTableFromSnapshotRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateTableFromSnapshotRequest) ProtoMessage()               {}
-func (*CreateTableFromSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_CreateTableFromSnapshotRequest proto.InternalMessageInfo
 
 func (m *CreateTableFromSnapshotRequest) GetParent() string {
 	if m != nil {
@@ -156,19 +228,48 @@ type DropRowRangeRequest struct {
 	// The unique name of the table on which to drop a range of rows.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Delete all rows or by prefix.
 	//
 	// Types that are valid to be assigned to Target:
 	//	*DropRowRangeRequest_RowKeyPrefix
 	//	*DropRowRangeRequest_DeleteAllDataFromTable
-	Target isDropRowRangeRequest_Target `protobuf_oneof:"target"`
+	Target               isDropRowRangeRequest_Target `protobuf_oneof:"target"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *DropRowRangeRequest) Reset()         { *m = DropRowRangeRequest{} }
+func (m *DropRowRangeRequest) String() string { return proto.CompactTextString(m) }
+func (*DropRowRangeRequest) ProtoMessage()    {}
+func (*DropRowRangeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{2}
+}
+func (m *DropRowRangeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DropRowRangeRequest.Unmarshal(m, b)
+}
+func (m *DropRowRangeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DropRowRangeRequest.Marshal(b, m, deterministic)
+}
+func (dst *DropRowRangeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DropRowRangeRequest.Merge(dst, src)
+}
+func (m *DropRowRangeRequest) XXX_Size() int {
+	return xxx_messageInfo_DropRowRangeRequest.Size(m)
+}
+func (m *DropRowRangeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DropRowRangeRequest.DiscardUnknown(m)
 }
 
-func (m *DropRowRangeRequest) Reset()                    { *m = DropRowRangeRequest{} }
-func (m *DropRowRangeRequest) String() string            { return proto.CompactTextString(m) }
-func (*DropRowRangeRequest) ProtoMessage()               {}
-func (*DropRowRangeRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_DropRowRangeRequest proto.InternalMessageInfo
+
+func (m *DropRowRangeRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
 
 type isDropRowRangeRequest_Target interface {
 	isDropRowRangeRequest_Target()
@@ -177,11 +278,13 @@ type isDropRowRangeRequest_Target interface {
 type DropRowRangeRequest_RowKeyPrefix struct {
 	RowKeyPrefix []byte `protobuf:"bytes,2,opt,name=row_key_prefix,json=rowKeyPrefix,proto3,oneof"`
 }
+
 type DropRowRangeRequest_DeleteAllDataFromTable struct {
-	DeleteAllDataFromTable bool `protobuf:"varint,3,opt,name=delete_all_data_from_table,json=deleteAllDataFromTable,oneof"`
+	DeleteAllDataFromTable bool `protobuf:"varint,3,opt,name=delete_all_data_from_table,json=deleteAllDataFromTable,proto3,oneof"`
 }
 
-func (*DropRowRangeRequest_RowKeyPrefix) isDropRowRangeRequest_Target()           {}
+func (*DropRowRangeRequest_RowKeyPrefix) isDropRowRangeRequest_Target() {}
+
 func (*DropRowRangeRequest_DeleteAllDataFromTable) isDropRowRangeRequest_Target() {}
 
 func (m *DropRowRangeRequest) GetTarget() isDropRowRangeRequest_Target {
@@ -191,13 +294,6 @@ func (m *DropRowRangeRequest) GetTarget() isDropRowRangeRequest_Target {
 	return nil
 }
 
-func (m *DropRowRangeRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
 func (m *DropRowRangeRequest) GetRowKeyPrefix() []byte {
 	if x, ok := m.GetTarget().(*DropRowRangeRequest_RowKeyPrefix); ok {
 		return x.RowKeyPrefix
@@ -268,11 +364,11 @@ func _DropRowRangeRequest_OneofSizer(msg proto.Message) (n int) {
 	// target
 	switch x := m.Target.(type) {
 	case *DropRowRangeRequest_RowKeyPrefix:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RowKeyPrefix)))
 		n += len(x.RowKeyPrefix)
 	case *DropRowRangeRequest_DeleteAllDataFromTable:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case nil:
 	default:
@@ -286,18 +382,40 @@ func _DropRowRangeRequest_OneofSizer(msg proto.Message) (n int) {
 type ListTablesRequest struct {
 	// The unique name of the instance for which tables should be listed.
 	// Values are of the form `projects/<project>/instances/<instance>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The view to be applied to the returned tables' fields.
 	// Defaults to `NAME_ONLY` if unspecified; no others are currently supported.
-	View Table_View `protobuf:"varint,2,opt,name=view,enum=google.bigtable.admin.v2.Table_View" json:"view,omitempty"`
+	View Table_View `protobuf:"varint,2,opt,name=view,proto3,enum=google.bigtable.admin.v2.Table_View" json:"view,omitempty"`
 	// The value of `next_page_token` returned by a previous call.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTablesRequest) Reset()         { *m = ListTablesRequest{} }
+func (m *ListTablesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTablesRequest) ProtoMessage()    {}
+func (*ListTablesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{3}
+}
+func (m *ListTablesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTablesRequest.Unmarshal(m, b)
+}
+func (m *ListTablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTablesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTablesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTablesRequest.Merge(dst, src)
+}
+func (m *ListTablesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTablesRequest.Size(m)
+}
+func (m *ListTablesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTablesRequest.DiscardUnknown(m)
 }
 
-func (m *ListTablesRequest) Reset()                    { *m = ListTablesRequest{} }
-func (m *ListTablesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTablesRequest) ProtoMessage()               {}
-func (*ListTablesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_ListTablesRequest proto.InternalMessageInfo
 
 func (m *ListTablesRequest) GetParent() string {
 	if m != nil {
@@ -324,17 +442,39 @@ func (m *ListTablesRequest) GetPageToken() string {
 // [google.bigtable.admin.v2.BigtableTableAdmin.ListTables][google.bigtable.admin.v2.BigtableTableAdmin.ListTables]
 type ListTablesResponse struct {
 	// The tables present in the requested instance.
-	Tables []*Table `protobuf:"bytes,1,rep,name=tables" json:"tables,omitempty"`
+	Tables []*Table `protobuf:"bytes,1,rep,name=tables,proto3" json:"tables,omitempty"`
 	// Set if not all tables could be returned in a single response.
 	// Pass this value to `page_token` in another request to get the next
 	// page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTablesResponse) Reset()         { *m = ListTablesResponse{} }
+func (m *ListTablesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTablesResponse) ProtoMessage()    {}
+func (*ListTablesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{4}
+}
+func (m *ListTablesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTablesResponse.Unmarshal(m, b)
+}
+func (m *ListTablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTablesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTablesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTablesResponse.Merge(dst, src)
+}
+func (m *ListTablesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTablesResponse.Size(m)
+}
+func (m *ListTablesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTablesResponse.DiscardUnknown(m)
 }
 
-func (m *ListTablesResponse) Reset()                    { *m = ListTablesResponse{} }
-func (m *ListTablesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTablesResponse) ProtoMessage()               {}
-func (*ListTablesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_ListTablesResponse proto.InternalMessageInfo
 
 func (m *ListTablesResponse) GetTables() []*Table {
 	if m != nil {
@@ -356,16 +496,38 @@ type GetTableRequest struct {
 	// The unique name of the requested table.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The view to be applied to the returned table's fields.
 	// Defaults to `SCHEMA_VIEW` if unspecified.
-	View Table_View `protobuf:"varint,2,opt,name=view,enum=google.bigtable.admin.v2.Table_View" json:"view,omitempty"`
+	View                 Table_View `protobuf:"varint,2,opt,name=view,proto3,enum=google.bigtable.admin.v2.Table_View" json:"view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *GetTableRequest) Reset()         { *m = GetTableRequest{} }
+func (m *GetTableRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTableRequest) ProtoMessage()    {}
+func (*GetTableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{5}
+}
+func (m *GetTableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTableRequest.Unmarshal(m, b)
+}
+func (m *GetTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTableRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTableRequest.Merge(dst, src)
+}
+func (m *GetTableRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTableRequest.Size(m)
+}
+func (m *GetTableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTableRequest.DiscardUnknown(m)
 }
 
-func (m *GetTableRequest) Reset()                    { *m = GetTableRequest{} }
-func (m *GetTableRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTableRequest) ProtoMessage()               {}
-func (*GetTableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_GetTableRequest proto.InternalMessageInfo
 
 func (m *GetTableRequest) GetName() string {
 	if m != nil {
@@ -387,13 +549,35 @@ type DeleteTableRequest struct {
 	// The unique name of the table to be deleted.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteTableRequest) Reset()         { *m = DeleteTableRequest{} }
+func (m *DeleteTableRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteTableRequest) ProtoMessage()    {}
+func (*DeleteTableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{6}
+}
+func (m *DeleteTableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteTableRequest.Unmarshal(m, b)
+}
+func (m *DeleteTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteTableRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTableRequest.Merge(dst, src)
+}
+func (m *DeleteTableRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteTableRequest.Size(m)
+}
+func (m *DeleteTableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteTableRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteTableRequest) Reset()                    { *m = DeleteTableRequest{} }
-func (m *DeleteTableRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteTableRequest) ProtoMessage()               {}
-func (*DeleteTableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_DeleteTableRequest proto.InternalMessageInfo
 
 func (m *DeleteTableRequest) GetName() string {
 	if m != nil {
@@ -408,18 +592,40 @@ type ModifyColumnFamiliesRequest struct {
 	// The unique name of the table whose families should be modified.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Modifications to be atomically applied to the specified table's families.
 	// Entries are applied in order, meaning that earlier modifications can be
 	// masked by later ones (in the case of repeated updates to the same family,
 	// for example).
-	Modifications []*ModifyColumnFamiliesRequest_Modification `protobuf:"bytes,2,rep,name=modifications" json:"modifications,omitempty"`
+	Modifications        []*ModifyColumnFamiliesRequest_Modification `protobuf:"bytes,2,rep,name=modifications,proto3" json:"modifications,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                    `json:"-"`
+	XXX_unrecognized     []byte                                      `json:"-"`
+	XXX_sizecache        int32                                       `json:"-"`
+}
+
+func (m *ModifyColumnFamiliesRequest) Reset()         { *m = ModifyColumnFamiliesRequest{} }
+func (m *ModifyColumnFamiliesRequest) String() string { return proto.CompactTextString(m) }
+func (*ModifyColumnFamiliesRequest) ProtoMessage()    {}
+func (*ModifyColumnFamiliesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{7}
+}
+func (m *ModifyColumnFamiliesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ModifyColumnFamiliesRequest.Unmarshal(m, b)
+}
+func (m *ModifyColumnFamiliesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ModifyColumnFamiliesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ModifyColumnFamiliesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyColumnFamiliesRequest.Merge(dst, src)
+}
+func (m *ModifyColumnFamiliesRequest) XXX_Size() int {
+	return xxx_messageInfo_ModifyColumnFamiliesRequest.Size(m)
+}
+func (m *ModifyColumnFamiliesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ModifyColumnFamiliesRequest.DiscardUnknown(m)
 }
 
-func (m *ModifyColumnFamiliesRequest) Reset()                    { *m = ModifyColumnFamiliesRequest{} }
-func (m *ModifyColumnFamiliesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ModifyColumnFamiliesRequest) ProtoMessage()               {}
-func (*ModifyColumnFamiliesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_ModifyColumnFamiliesRequest proto.InternalMessageInfo
 
 func (m *ModifyColumnFamiliesRequest) GetName() string {
 	if m != nil {
@@ -438,14 +644,17 @@ func (m *ModifyColumnFamiliesRequest) GetModifications() []*ModifyColumnFamilies
 // A create, update, or delete of a particular column family.
 type ModifyColumnFamiliesRequest_Modification struct {
 	// The ID of the column family to be modified.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// Column familiy modifications.
 	//
 	// Types that are valid to be assigned to Mod:
 	//	*ModifyColumnFamiliesRequest_Modification_Create
 	//	*ModifyColumnFamiliesRequest_Modification_Update
 	//	*ModifyColumnFamiliesRequest_Modification_Drop
-	Mod isModifyColumnFamiliesRequest_Modification_Mod `protobuf_oneof:"mod"`
+	Mod                  isModifyColumnFamiliesRequest_Modification_Mod `protobuf_oneof:"mod"`
+	XXX_NoUnkeyedLiteral struct{}                                       `json:"-"`
+	XXX_unrecognized     []byte                                         `json:"-"`
+	XXX_sizecache        int32                                          `json:"-"`
 }
 
 func (m *ModifyColumnFamiliesRequest_Modification) Reset() {
@@ -454,7 +663,31 @@ func (m *ModifyColumnFamiliesRequest_Modification) Reset() {
 func (m *ModifyColumnFamiliesRequest_Modification) String() string { return proto.CompactTextString(m) }
 func (*ModifyColumnFamiliesRequest_Modification) ProtoMessage()    {}
 func (*ModifyColumnFamiliesRequest_Modification) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{7, 0}
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{7, 0}
+}
+func (m *ModifyColumnFamiliesRequest_Modification) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Unmarshal(m, b)
+}
+func (m *ModifyColumnFamiliesRequest_Modification) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Marshal(b, m, deterministic)
+}
+func (dst *ModifyColumnFamiliesRequest_Modification) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Merge(dst, src)
+}
+func (m *ModifyColumnFamiliesRequest_Modification) XXX_Size() int {
+	return xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.Size(m)
+}
+func (m *ModifyColumnFamiliesRequest_Modification) XXX_DiscardUnknown() {
+	xxx_messageInfo_ModifyColumnFamiliesRequest_Modification.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ModifyColumnFamiliesRequest_Modification proto.InternalMessageInfo
+
+func (m *ModifyColumnFamiliesRequest_Modification) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
 }
 
 type isModifyColumnFamiliesRequest_Modification_Mod interface {
@@ -462,19 +695,23 @@ type isModifyColumnFamiliesRequest_Modification_Mod interface {
 }
 
 type ModifyColumnFamiliesRequest_Modification_Create struct {
-	Create *ColumnFamily `protobuf:"bytes,2,opt,name=create,oneof"`
+	Create *ColumnFamily `protobuf:"bytes,2,opt,name=create,proto3,oneof"`
 }
+
 type ModifyColumnFamiliesRequest_Modification_Update struct {
-	Update *ColumnFamily `protobuf:"bytes,3,opt,name=update,oneof"`
+	Update *ColumnFamily `protobuf:"bytes,3,opt,name=update,proto3,oneof"`
 }
+
 type ModifyColumnFamiliesRequest_Modification_Drop struct {
-	Drop bool `protobuf:"varint,4,opt,name=drop,oneof"`
+	Drop bool `protobuf:"varint,4,opt,name=drop,proto3,oneof"`
 }
 
 func (*ModifyColumnFamiliesRequest_Modification_Create) isModifyColumnFamiliesRequest_Modification_Mod() {
 }
+
 func (*ModifyColumnFamiliesRequest_Modification_Update) isModifyColumnFamiliesRequest_Modification_Mod() {
 }
+
 func (*ModifyColumnFamiliesRequest_Modification_Drop) isModifyColumnFamiliesRequest_Modification_Mod() {
 }
 
@@ -485,13 +722,6 @@ func (m *ModifyColumnFamiliesRequest_Modification) GetMod() isModifyColumnFamili
 	return nil
 }
 
-func (m *ModifyColumnFamiliesRequest_Modification) GetId() string {
-	if m != nil {
-		return m.Id
-	}
-	return ""
-}
-
 func (m *ModifyColumnFamiliesRequest_Modification) GetCreate() *ColumnFamily {
 	if x, ok := m.GetMod().(*ModifyColumnFamiliesRequest_Modification_Create); ok {
 		return x.Create
@@ -587,16 +817,16 @@ func _ModifyColumnFamiliesRequest_Modification_OneofSizer(msg proto.Message) (n
 	switch x := m.Mod.(type) {
 	case *ModifyColumnFamiliesRequest_Modification_Create:
 		s := proto.Size(x.Create)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ModifyColumnFamiliesRequest_Modification_Update:
 		s := proto.Size(x.Update)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ModifyColumnFamiliesRequest_Modification_Drop:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case nil:
 	default:
@@ -605,24 +835,41 @@ func _ModifyColumnFamiliesRequest_Modification_OneofSizer(msg proto.Message) (n
 	return n
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
 type GenerateConsistencyTokenRequest struct {
 	// The unique name of the Table for which to create a consistency token.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GenerateConsistencyTokenRequest) Reset()                    { *m = GenerateConsistencyTokenRequest{} }
-func (m *GenerateConsistencyTokenRequest) String() string            { return proto.CompactTextString(m) }
-func (*GenerateConsistencyTokenRequest) ProtoMessage()               {}
-func (*GenerateConsistencyTokenRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+func (m *GenerateConsistencyTokenRequest) Reset()         { *m = GenerateConsistencyTokenRequest{} }
+func (m *GenerateConsistencyTokenRequest) String() string { return proto.CompactTextString(m) }
+func (*GenerateConsistencyTokenRequest) ProtoMessage()    {}
+func (*GenerateConsistencyTokenRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{8}
+}
+func (m *GenerateConsistencyTokenRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GenerateConsistencyTokenRequest.Unmarshal(m, b)
+}
+func (m *GenerateConsistencyTokenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GenerateConsistencyTokenRequest.Marshal(b, m, deterministic)
+}
+func (dst *GenerateConsistencyTokenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateConsistencyTokenRequest.Merge(dst, src)
+}
+func (m *GenerateConsistencyTokenRequest) XXX_Size() int {
+	return xxx_messageInfo_GenerateConsistencyTokenRequest.Size(m)
+}
+func (m *GenerateConsistencyTokenRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GenerateConsistencyTokenRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GenerateConsistencyTokenRequest proto.InternalMessageInfo
 
 func (m *GenerateConsistencyTokenRequest) GetName() string {
 	if m != nil {
@@ -631,25 +878,40 @@ func (m *GenerateConsistencyTokenRequest) GetName() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Response message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
 type GenerateConsistencyTokenResponse struct {
 	// The generated consistency token.
-	ConsistencyToken string `protobuf:"bytes,1,opt,name=consistency_token,json=consistencyToken" json:"consistency_token,omitempty"`
+	ConsistencyToken     string   `protobuf:"bytes,1,opt,name=consistency_token,json=consistencyToken,proto3" json:"consistency_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *GenerateConsistencyTokenResponse) Reset()         { *m = GenerateConsistencyTokenResponse{} }
 func (m *GenerateConsistencyTokenResponse) String() string { return proto.CompactTextString(m) }
 func (*GenerateConsistencyTokenResponse) ProtoMessage()    {}
 func (*GenerateConsistencyTokenResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{9}
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{9}
+}
+func (m *GenerateConsistencyTokenResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GenerateConsistencyTokenResponse.Unmarshal(m, b)
+}
+func (m *GenerateConsistencyTokenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GenerateConsistencyTokenResponse.Marshal(b, m, deterministic)
+}
+func (dst *GenerateConsistencyTokenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenerateConsistencyTokenResponse.Merge(dst, src)
+}
+func (m *GenerateConsistencyTokenResponse) XXX_Size() int {
+	return xxx_messageInfo_GenerateConsistencyTokenResponse.Size(m)
+}
+func (m *GenerateConsistencyTokenResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GenerateConsistencyTokenResponse.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_GenerateConsistencyTokenResponse proto.InternalMessageInfo
+
 func (m *GenerateConsistencyTokenResponse) GetConsistencyToken() string {
 	if m != nil {
 		return m.ConsistencyToken
@@ -657,26 +919,43 @@ func (m *GenerateConsistencyTokenResponse) GetConsistencyToken() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
 type CheckConsistencyRequest struct {
 	// The unique name of the Table for which to check replication consistency.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The token created using GenerateConsistencyToken for the Table.
-	ConsistencyToken string `protobuf:"bytes,2,opt,name=consistency_token,json=consistencyToken" json:"consistency_token,omitempty"`
+	ConsistencyToken     string   `protobuf:"bytes,2,opt,name=consistency_token,json=consistencyToken,proto3" json:"consistency_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CheckConsistencyRequest) Reset()         { *m = CheckConsistencyRequest{} }
+func (m *CheckConsistencyRequest) String() string { return proto.CompactTextString(m) }
+func (*CheckConsistencyRequest) ProtoMessage()    {}
+func (*CheckConsistencyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{10}
+}
+func (m *CheckConsistencyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckConsistencyRequest.Unmarshal(m, b)
+}
+func (m *CheckConsistencyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckConsistencyRequest.Marshal(b, m, deterministic)
+}
+func (dst *CheckConsistencyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckConsistencyRequest.Merge(dst, src)
+}
+func (m *CheckConsistencyRequest) XXX_Size() int {
+	return xxx_messageInfo_CheckConsistencyRequest.Size(m)
+}
+func (m *CheckConsistencyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckConsistencyRequest.DiscardUnknown(m)
 }
 
-func (m *CheckConsistencyRequest) Reset()                    { *m = CheckConsistencyRequest{} }
-func (m *CheckConsistencyRequest) String() string            { return proto.CompactTextString(m) }
-func (*CheckConsistencyRequest) ProtoMessage()               {}
-func (*CheckConsistencyRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+var xxx_messageInfo_CheckConsistencyRequest proto.InternalMessageInfo
 
 func (m *CheckConsistencyRequest) GetName() string {
 	if m != nil {
@@ -692,23 +971,40 @@ func (m *CheckConsistencyRequest) GetConsistencyToken() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Response message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
 type CheckConsistencyResponse struct {
 	// True only if the token is consistent. A token is consistent if replication
 	// has caught up with the restrictions specified in the request.
-	Consistent bool `protobuf:"varint,1,opt,name=consistent" json:"consistent,omitempty"`
+	Consistent           bool     `protobuf:"varint,1,opt,name=consistent,proto3" json:"consistent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CheckConsistencyResponse) Reset()         { *m = CheckConsistencyResponse{} }
+func (m *CheckConsistencyResponse) String() string { return proto.CompactTextString(m) }
+func (*CheckConsistencyResponse) ProtoMessage()    {}
+func (*CheckConsistencyResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{11}
+}
+func (m *CheckConsistencyResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckConsistencyResponse.Unmarshal(m, b)
+}
+func (m *CheckConsistencyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckConsistencyResponse.Marshal(b, m, deterministic)
+}
+func (dst *CheckConsistencyResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckConsistencyResponse.Merge(dst, src)
+}
+func (m *CheckConsistencyResponse) XXX_Size() int {
+	return xxx_messageInfo_CheckConsistencyResponse.Size(m)
+}
+func (m *CheckConsistencyResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckConsistencyResponse.DiscardUnknown(m)
 }
 
-func (m *CheckConsistencyResponse) Reset()                    { *m = CheckConsistencyResponse{} }
-func (m *CheckConsistencyResponse) String() string            { return proto.CompactTextString(m) }
-func (*CheckConsistencyResponse) ProtoMessage()               {}
-func (*CheckConsistencyResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+var xxx_messageInfo_CheckConsistencyResponse proto.InternalMessageInfo
 
 func (m *CheckConsistencyResponse) GetConsistent() bool {
 	if m != nil {
@@ -717,40 +1013,62 @@ func (m *CheckConsistencyResponse) GetConsistent() bool {
 	return false
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.SnapshotTable][google.bigtable.admin.v2.BigtableTableAdmin.SnapshotTable]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type SnapshotTableRequest struct {
 	// The unique name of the table to have the snapshot taken.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the cluster where the snapshot will be created in.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/<cluster>`.
-	Cluster string `protobuf:"bytes,2,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	// The ID by which the new snapshot should be referred to within the parent
 	// cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
 	// rather than
 	// `projects/<project>/instances/<instance>/clusters/<cluster>/snapshots/mysnapshot`.
-	SnapshotId string `protobuf:"bytes,3,opt,name=snapshot_id,json=snapshotId" json:"snapshot_id,omitempty"`
+	SnapshotId string `protobuf:"bytes,3,opt,name=snapshot_id,json=snapshotId,proto3" json:"snapshot_id,omitempty"`
 	// The amount of time that the new snapshot can stay active after it is
 	// created. Once 'ttl' expires, the snapshot will get deleted. The maximum
 	// amount of time a snapshot can stay active is 7 days. If 'ttl' is not
 	// specified, the default value of 24 hours will be used.
-	Ttl *google_protobuf5.Duration `protobuf:"bytes,4,opt,name=ttl" json:"ttl,omitempty"`
+	Ttl *duration.Duration `protobuf:"bytes,4,opt,name=ttl,proto3" json:"ttl,omitempty"`
 	// Description of the snapshot.
-	Description string `protobuf:"bytes,5,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SnapshotTableRequest) Reset()                    { *m = SnapshotTableRequest{} }
-func (m *SnapshotTableRequest) String() string            { return proto.CompactTextString(m) }
-func (*SnapshotTableRequest) ProtoMessage()               {}
-func (*SnapshotTableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+func (m *SnapshotTableRequest) Reset()         { *m = SnapshotTableRequest{} }
+func (m *SnapshotTableRequest) String() string { return proto.CompactTextString(m) }
+func (*SnapshotTableRequest) ProtoMessage()    {}
+func (*SnapshotTableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{12}
+}
+func (m *SnapshotTableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SnapshotTableRequest.Unmarshal(m, b)
+}
+func (m *SnapshotTableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SnapshotTableRequest.Marshal(b, m, deterministic)
+}
+func (dst *SnapshotTableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SnapshotTableRequest.Merge(dst, src)
+}
+func (m *SnapshotTableRequest) XXX_Size() int {
+	return xxx_messageInfo_SnapshotTableRequest.Size(m)
+}
+func (m *SnapshotTableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SnapshotTableRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SnapshotTableRequest proto.InternalMessageInfo
 
 func (m *SnapshotTableRequest) GetName() string {
 	if m != nil {
@@ -773,7 +1091,7 @@ func (m *SnapshotTableRequest) GetSnapshotId() string {
 	return ""
 }
 
-func (m *SnapshotTableRequest) GetTtl() *google_protobuf5.Duration {
+func (m *SnapshotTableRequest) GetTtl() *duration.Duration {
 	if m != nil {
 		return m.Ttl
 	}
@@ -787,24 +1105,46 @@ func (m *SnapshotTableRequest) GetDescription() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.GetSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.GetSnapshot]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type GetSnapshotRequest struct {
 	// The unique name of the requested snapshot.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/<cluster>/snapshots/<snapshot>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSnapshotRequest) Reset()         { *m = GetSnapshotRequest{} }
+func (m *GetSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSnapshotRequest) ProtoMessage()    {}
+func (*GetSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{13}
+}
+func (m *GetSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSnapshotRequest.Unmarshal(m, b)
+}
+func (m *GetSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSnapshotRequest.Merge(dst, src)
+}
+func (m *GetSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSnapshotRequest.Size(m)
+}
+func (m *GetSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSnapshotRequest.DiscardUnknown(m)
 }
 
-func (m *GetSnapshotRequest) Reset()                    { *m = GetSnapshotRequest{} }
-func (m *GetSnapshotRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSnapshotRequest) ProtoMessage()               {}
-func (*GetSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+var xxx_messageInfo_GetSnapshotRequest proto.InternalMessageInfo
 
 func (m *GetSnapshotRequest) GetName() string {
 	if m != nil {
@@ -813,30 +1153,52 @@ func (m *GetSnapshotRequest) GetName() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots][google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type ListSnapshotsRequest struct {
 	// The unique name of the cluster for which snapshots should be listed.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/<cluster>`.
 	// Use `<cluster> = '-'` to list snapshots for all clusters in an instance,
 	// e.g., `projects/<project>/instances/<instance>/clusters/-`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The maximum number of snapshots to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value of `next_page_token` returned by a previous call.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSnapshotsRequest) Reset()         { *m = ListSnapshotsRequest{} }
+func (m *ListSnapshotsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSnapshotsRequest) ProtoMessage()    {}
+func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{14}
+}
+func (m *ListSnapshotsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSnapshotsRequest.Unmarshal(m, b)
+}
+func (m *ListSnapshotsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSnapshotsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSnapshotsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsRequest.Merge(dst, src)
+}
+func (m *ListSnapshotsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSnapshotsRequest.Size(m)
+}
+func (m *ListSnapshotsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSnapshotsRequest.DiscardUnknown(m)
 }
 
-func (m *ListSnapshotsRequest) Reset()                    { *m = ListSnapshotsRequest{} }
-func (m *ListSnapshotsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListSnapshotsRequest) ProtoMessage()               {}
-func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+var xxx_messageInfo_ListSnapshotsRequest proto.InternalMessageInfo
 
 func (m *ListSnapshotsRequest) GetParent() string {
 	if m != nil {
@@ -859,26 +1221,48 @@ func (m *ListSnapshotsRequest) GetPageToken() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Response message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots][google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type ListSnapshotsResponse struct {
 	// The snapshots present in the requested cluster.
-	Snapshots []*Snapshot `protobuf:"bytes,1,rep,name=snapshots" json:"snapshots,omitempty"`
+	Snapshots []*Snapshot `protobuf:"bytes,1,rep,name=snapshots,proto3" json:"snapshots,omitempty"`
 	// Set if not all snapshots could be returned in a single response.
 	// Pass this value to `page_token` in another request to get the next
 	// page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListSnapshotsResponse) Reset()                    { *m = ListSnapshotsResponse{} }
-func (m *ListSnapshotsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListSnapshotsResponse) ProtoMessage()               {}
-func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+func (m *ListSnapshotsResponse) Reset()         { *m = ListSnapshotsResponse{} }
+func (m *ListSnapshotsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSnapshotsResponse) ProtoMessage()    {}
+func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{15}
+}
+func (m *ListSnapshotsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSnapshotsResponse.Unmarshal(m, b)
+}
+func (m *ListSnapshotsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSnapshotsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSnapshotsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsResponse.Merge(dst, src)
+}
+func (m *ListSnapshotsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSnapshotsResponse.Size(m)
+}
+func (m *ListSnapshotsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSnapshotsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSnapshotsResponse proto.InternalMessageInfo
 
 func (m *ListSnapshotsResponse) GetSnapshots() []*Snapshot {
 	if m != nil {
@@ -894,24 +1278,46 @@ func (m *ListSnapshotsResponse) GetNextPageToken() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.DeleteSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.DeleteSnapshot]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type DeleteSnapshotRequest struct {
 	// The unique name of the snapshot to be deleted.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/<cluster>/snapshots/<snapshot>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSnapshotRequest) Reset()         { *m = DeleteSnapshotRequest{} }
+func (m *DeleteSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSnapshotRequest) ProtoMessage()    {}
+func (*DeleteSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{16}
+}
+func (m *DeleteSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSnapshotRequest.Unmarshal(m, b)
+}
+func (m *DeleteSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSnapshotRequest.Merge(dst, src)
+}
+func (m *DeleteSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSnapshotRequest.Size(m)
+}
+func (m *DeleteSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSnapshotRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteSnapshotRequest) Reset()                    { *m = DeleteSnapshotRequest{} }
-func (m *DeleteSnapshotRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSnapshotRequest) ProtoMessage()               {}
-func (*DeleteSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+var xxx_messageInfo_DeleteSnapshotRequest proto.InternalMessageInfo
 
 func (m *DeleteSnapshotRequest) GetName() string {
 	if m != nil {
@@ -920,25 +1326,47 @@ func (m *DeleteSnapshotRequest) GetName() string {
 	return ""
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // The metadata for the Operation returned by SnapshotTable.
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type SnapshotTableMetadata struct {
 	// The request that prompted the initiation of this SnapshotTable operation.
-	OriginalRequest *SnapshotTableRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
+	OriginalRequest *SnapshotTableRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
 	// The time at which the original request was received.
-	RequestTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which the operation failed or was completed successfully.
-	FinishTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *SnapshotTableMetadata) Reset()         { *m = SnapshotTableMetadata{} }
+func (m *SnapshotTableMetadata) String() string { return proto.CompactTextString(m) }
+func (*SnapshotTableMetadata) ProtoMessage()    {}
+func (*SnapshotTableMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{17}
+}
+func (m *SnapshotTableMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SnapshotTableMetadata.Unmarshal(m, b)
+}
+func (m *SnapshotTableMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SnapshotTableMetadata.Marshal(b, m, deterministic)
+}
+func (dst *SnapshotTableMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SnapshotTableMetadata.Merge(dst, src)
+}
+func (m *SnapshotTableMetadata) XXX_Size() int {
+	return xxx_messageInfo_SnapshotTableMetadata.Size(m)
+}
+func (m *SnapshotTableMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_SnapshotTableMetadata.DiscardUnknown(m)
 }
 
-func (m *SnapshotTableMetadata) Reset()                    { *m = SnapshotTableMetadata{} }
-func (m *SnapshotTableMetadata) String() string            { return proto.CompactTextString(m) }
-func (*SnapshotTableMetadata) ProtoMessage()               {}
-func (*SnapshotTableMetadata) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+var xxx_messageInfo_SnapshotTableMetadata proto.InternalMessageInfo
 
 func (m *SnapshotTableMetadata) GetOriginalRequest() *SnapshotTableRequest {
 	if m != nil {
@@ -947,42 +1375,62 @@ func (m *SnapshotTableMetadata) GetOriginalRequest() *SnapshotTableRequest {
 	return nil
 }
 
-func (m *SnapshotTableMetadata) GetRequestTime() *google_protobuf1.Timestamp {
+func (m *SnapshotTableMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *SnapshotTableMetadata) GetFinishTime() *google_protobuf1.Timestamp {
+func (m *SnapshotTableMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
 	return nil
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // The metadata for the Operation returned by CreateTableFromSnapshot.
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type CreateTableFromSnapshotMetadata struct {
 	// The request that prompted the initiation of this CreateTableFromSnapshot
 	// operation.
-	OriginalRequest *CreateTableFromSnapshotRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
+	OriginalRequest *CreateTableFromSnapshotRequest `protobuf:"bytes,1,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
 	// The time at which the original request was received.
-	RequestTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime" json:"request_time,omitempty"`
+	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The time at which the operation failed or was completed successfully.
-	FinishTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime           *timestamp.Timestamp `protobuf:"bytes,3,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
 func (m *CreateTableFromSnapshotMetadata) Reset()         { *m = CreateTableFromSnapshotMetadata{} }
 func (m *CreateTableFromSnapshotMetadata) String() string { return proto.CompactTextString(m) }
 func (*CreateTableFromSnapshotMetadata) ProtoMessage()    {}
 func (*CreateTableFromSnapshotMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{18}
+	return fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb, []int{18}
+}
+func (m *CreateTableFromSnapshotMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTableFromSnapshotMetadata.Unmarshal(m, b)
+}
+func (m *CreateTableFromSnapshotMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTableFromSnapshotMetadata.Marshal(b, m, deterministic)
 }
+func (dst *CreateTableFromSnapshotMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTableFromSnapshotMetadata.Merge(dst, src)
+}
+func (m *CreateTableFromSnapshotMetadata) XXX_Size() int {
+	return xxx_messageInfo_CreateTableFromSnapshotMetadata.Size(m)
+}
+func (m *CreateTableFromSnapshotMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTableFromSnapshotMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateTableFromSnapshotMetadata proto.InternalMessageInfo
 
 func (m *CreateTableFromSnapshotMetadata) GetOriginalRequest() *CreateTableFromSnapshotRequest {
 	if m != nil {
@@ -991,14 +1439,14 @@ func (m *CreateTableFromSnapshotMetadata) GetOriginalRequest() *CreateTableFromS
 	return nil
 }
 
-func (m *CreateTableFromSnapshotMetadata) GetRequestTime() *google_protobuf1.Timestamp {
+func (m *CreateTableFromSnapshotMetadata) GetRequestTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RequestTime
 	}
 	return nil
 }
 
-func (m *CreateTableFromSnapshotMetadata) GetFinishTime() *google_protobuf1.Timestamp {
+func (m *CreateTableFromSnapshotMetadata) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
@@ -1037,27 +1485,29 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for BigtableTableAdmin service
-
+// BigtableTableAdminClient is the client API for BigtableTableAdmin service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type BigtableTableAdminClient interface {
 	// Creates a new table in the specified instance.
 	// The table can be created with a full set of initial column families,
 	// specified in the request.
 	CreateTable(ctx context.Context, in *CreateTableRequest, opts ...grpc.CallOption) (*Table, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Creates a new table from the specified snapshot. The target table must
 	// not exist. The snapshot and the table must be in the same instance.
-	CreateTableFromSnapshot(ctx context.Context, in *CreateTableFromSnapshotRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	CreateTableFromSnapshot(ctx context.Context, in *CreateTableFromSnapshotRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Lists all tables served from a specified instance.
 	ListTables(ctx context.Context, in *ListTablesRequest, opts ...grpc.CallOption) (*ListTablesResponse, error)
 	// Gets metadata information about the specified table.
 	GetTable(ctx context.Context, in *GetTableRequest, opts ...grpc.CallOption) (*Table, error)
 	// Permanently deletes a specified table and all of its data.
-	DeleteTable(ctx context.Context, in *DeleteTableRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
+	DeleteTable(ctx context.Context, in *DeleteTableRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Performs a series of column family modifications on the specified table.
 	// Either all or none of the modifications will occur before this method
 	// returns, but data requests received prior to that point may see a table
@@ -1066,55 +1516,49 @@ type BigtableTableAdminClient interface {
 	// Permanently drop/delete a row range from a specified table. The request can
 	// specify whether to delete all rows in a table, or only those that match a
 	// particular prefix.
-	DropRowRange(ctx context.Context, in *DropRowRangeRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	DropRowRange(ctx context.Context, in *DropRowRangeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Generates a consistency token for a Table, which can be used in
 	// CheckConsistency to check whether mutations to the table that finished
 	// before this call started have been replicated. The tokens will be available
 	// for 90 days.
 	GenerateConsistencyToken(ctx context.Context, in *GenerateConsistencyTokenRequest, opts ...grpc.CallOption) (*GenerateConsistencyTokenResponse, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Checks replication consistency based on a consistency token, that is, if
 	// replication has caught up based on the conditions specified in the token
 	// and the check request.
 	CheckConsistency(ctx context.Context, in *CheckConsistencyRequest, opts ...grpc.CallOption) (*CheckConsistencyResponse, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Creates a new snapshot in the specified cluster from the specified
 	// source table. The cluster and the table must be in the same instance.
-	SnapshotTable(ctx context.Context, in *SnapshotTableRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
 	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	SnapshotTable(ctx context.Context, in *SnapshotTableRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Gets metadata information about the specified snapshot.
-	GetSnapshot(ctx context.Context, in *GetSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
 	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	GetSnapshot(ctx context.Context, in *GetSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error)
 	// Lists all snapshots associated with the specified cluster.
-	ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
 	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error)
 	// Permanently deletes the specified snapshot.
-	DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
+	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type bigtableTableAdminClient struct {
@@ -1127,16 +1571,16 @@ func NewBigtableTableAdminClient(cc *grpc.ClientConn) BigtableTableAdminClient {
 
 func (c *bigtableTableAdminClient) CreateTable(ctx context.Context, in *CreateTableRequest, opts ...grpc.CallOption) (*Table, error) {
 	out := new(Table)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/CreateTable", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/CreateTable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableAdminClient) CreateTableFromSnapshot(ctx context.Context, in *CreateTableFromSnapshotRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/CreateTableFromSnapshot", in, out, c.cc, opts...)
+func (c *bigtableTableAdminClient) CreateTableFromSnapshot(ctx context.Context, in *CreateTableFromSnapshotRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/CreateTableFromSnapshot", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1145,7 +1589,7 @@ func (c *bigtableTableAdminClient) CreateTableFromSnapshot(ctx context.Context,
 
 func (c *bigtableTableAdminClient) ListTables(ctx context.Context, in *ListTablesRequest, opts ...grpc.CallOption) (*ListTablesResponse, error) {
 	out := new(ListTablesResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/ListTables", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/ListTables", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1154,16 +1598,16 @@ func (c *bigtableTableAdminClient) ListTables(ctx context.Context, in *ListTable
 
 func (c *bigtableTableAdminClient) GetTable(ctx context.Context, in *GetTableRequest, opts ...grpc.CallOption) (*Table, error) {
 	out := new(Table)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/GetTable", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/GetTable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableAdminClient) DeleteTable(ctx context.Context, in *DeleteTableRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/DeleteTable", in, out, c.cc, opts...)
+func (c *bigtableTableAdminClient) DeleteTable(ctx context.Context, in *DeleteTableRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/DeleteTable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1172,16 +1616,16 @@ func (c *bigtableTableAdminClient) DeleteTable(ctx context.Context, in *DeleteTa
 
 func (c *bigtableTableAdminClient) ModifyColumnFamilies(ctx context.Context, in *ModifyColumnFamiliesRequest, opts ...grpc.CallOption) (*Table, error) {
 	out := new(Table)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/ModifyColumnFamilies", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/ModifyColumnFamilies", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableAdminClient) DropRowRange(ctx context.Context, in *DropRowRangeRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/DropRowRange", in, out, c.cc, opts...)
+func (c *bigtableTableAdminClient) DropRowRange(ctx context.Context, in *DropRowRangeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/DropRowRange", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1190,7 +1634,7 @@ func (c *bigtableTableAdminClient) DropRowRange(ctx context.Context, in *DropRow
 
 func (c *bigtableTableAdminClient) GenerateConsistencyToken(ctx context.Context, in *GenerateConsistencyTokenRequest, opts ...grpc.CallOption) (*GenerateConsistencyTokenResponse, error) {
 	out := new(GenerateConsistencyTokenResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/GenerateConsistencyToken", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/GenerateConsistencyToken", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1199,16 +1643,16 @@ func (c *bigtableTableAdminClient) GenerateConsistencyToken(ctx context.Context,
 
 func (c *bigtableTableAdminClient) CheckConsistency(ctx context.Context, in *CheckConsistencyRequest, opts ...grpc.CallOption) (*CheckConsistencyResponse, error) {
 	out := new(CheckConsistencyResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/CheckConsistency", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/CheckConsistency", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableAdminClient) SnapshotTable(ctx context.Context, in *SnapshotTableRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/SnapshotTable", in, out, c.cc, opts...)
+func (c *bigtableTableAdminClient) SnapshotTable(ctx context.Context, in *SnapshotTableRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/SnapshotTable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1217,7 +1661,7 @@ func (c *bigtableTableAdminClient) SnapshotTable(ctx context.Context, in *Snapsh
 
 func (c *bigtableTableAdminClient) GetSnapshot(ctx context.Context, in *GetSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error) {
 	out := new(Snapshot)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/GetSnapshot", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/GetSnapshot", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1226,43 +1670,43 @@ func (c *bigtableTableAdminClient) GetSnapshot(ctx context.Context, in *GetSnaps
 
 func (c *bigtableTableAdminClient) ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error) {
 	out := new(ListSnapshotsResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/ListSnapshots", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/ListSnapshots", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *bigtableTableAdminClient) DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/DeleteSnapshot", in, out, c.cc, opts...)
+func (c *bigtableTableAdminClient) DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.admin.v2.BigtableTableAdmin/DeleteSnapshot", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for BigtableTableAdmin service
-
+// BigtableTableAdminServer is the server API for BigtableTableAdmin service.
 type BigtableTableAdminServer interface {
 	// Creates a new table in the specified instance.
 	// The table can be created with a full set of initial column families,
 	// specified in the request.
 	CreateTable(context.Context, *CreateTableRequest) (*Table, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Creates a new table from the specified snapshot. The target table must
 	// not exist. The snapshot and the table must be in the same instance.
-	CreateTableFromSnapshot(context.Context, *CreateTableFromSnapshotRequest) (*google_longrunning.Operation, error)
+	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	CreateTableFromSnapshot(context.Context, *CreateTableFromSnapshotRequest) (*longrunning.Operation, error)
 	// Lists all tables served from a specified instance.
 	ListTables(context.Context, *ListTablesRequest) (*ListTablesResponse, error)
 	// Gets metadata information about the specified table.
 	GetTable(context.Context, *GetTableRequest) (*Table, error)
 	// Permanently deletes a specified table and all of its data.
-	DeleteTable(context.Context, *DeleteTableRequest) (*google_protobuf3.Empty, error)
+	DeleteTable(context.Context, *DeleteTableRequest) (*empty.Empty, error)
 	// Performs a series of column family modifications on the specified table.
 	// Either all or none of the modifications will occur before this method
 	// returns, but data requests received prior to that point may see a table
@@ -1271,55 +1715,49 @@ type BigtableTableAdminServer interface {
 	// Permanently drop/delete a row range from a specified table. The request can
 	// specify whether to delete all rows in a table, or only those that match a
 	// particular prefix.
-	DropRowRange(context.Context, *DropRowRangeRequest) (*google_protobuf3.Empty, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	DropRowRange(context.Context, *DropRowRangeRequest) (*empty.Empty, error)
 	// Generates a consistency token for a Table, which can be used in
 	// CheckConsistency to check whether mutations to the table that finished
 	// before this call started have been replicated. The tokens will be available
 	// for 90 days.
 	GenerateConsistencyToken(context.Context, *GenerateConsistencyTokenRequest) (*GenerateConsistencyTokenResponse, error)
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Checks replication consistency based on a consistency token, that is, if
 	// replication has caught up based on the conditions specified in the token
 	// and the check request.
 	CheckConsistency(context.Context, *CheckConsistencyRequest) (*CheckConsistencyResponse, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
 	// Creates a new snapshot in the specified cluster from the specified
 	// source table. The cluster and the table must be in the same instance.
-	SnapshotTable(context.Context, *SnapshotTableRequest) (*google_longrunning.Operation, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
 	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	SnapshotTable(context.Context, *SnapshotTableRequest) (*longrunning.Operation, error)
 	// Gets metadata information about the specified snapshot.
-	GetSnapshot(context.Context, *GetSnapshotRequest) (*Snapshot, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
 	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	GetSnapshot(context.Context, *GetSnapshotRequest) (*Snapshot, error)
 	// Lists all snapshots associated with the specified cluster.
-	ListSnapshots(context.Context, *ListSnapshotsRequest) (*ListSnapshotsResponse, error)
-	// This is a private alpha release of Cloud Bigtable snapshots. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
 	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	ListSnapshots(context.Context, *ListSnapshotsRequest) (*ListSnapshotsResponse, error)
 	// Permanently deletes the specified snapshot.
-	DeleteSnapshot(context.Context, *DeleteSnapshotRequest) (*google_protobuf3.Empty, error)
+	//
+	// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+	// feature is not currently available to most Cloud Bigtable customers. This
+	// feature might be changed in backward-incompatible ways and is not
+	// recommended for production use. It is not subject to any SLA or deprecation
+	// policy.
+	DeleteSnapshot(context.Context, *DeleteSnapshotRequest) (*empty.Empty, error)
 }
 
 func RegisterBigtableTableAdminServer(s *grpc.Server, srv BigtableTableAdminServer) {
@@ -1622,10 +2060,10 @@ var _BigtableTableAdmin_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/bigtable/admin/v2/bigtable_table_admin.proto", fileDescriptor1)
+	proto.RegisterFile("google/bigtable/admin/v2/bigtable_table_admin.proto", fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_bigtable_table_admin_ab6bfd213423f2bb = []byte{
 	// 1514 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcb, 0x6f, 0xdc, 0x54,
 	0x17, 0xaf, 0x27, 0x8f, 0x26, 0x67, 0xf2, 0xea, 0xfd, 0xd2, 0x76, 0x3a, 0x6d, 0x93, 0xc8, 0x5f,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/common.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/common.pb.go
index 8abf0f56..4ed69e34 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/common.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/common.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/common.proto
 
-package admin
+package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Storage media types for persisting Bigtable data.
 type StorageType int32
 
@@ -40,15 +46,19 @@ var StorageType_value = map[string]int32{
 func (x StorageType) String() string {
 	return proto.EnumName(StorageType_name, int32(x))
 }
-func (StorageType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (StorageType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_a7c806066773dffe, []int{0}
+}
 
 func init() {
 	proto.RegisterEnum("google.bigtable.admin.v2.StorageType", StorageType_name, StorageType_value)
 }
 
-func init() { proto.RegisterFile("google/bigtable/admin/v2/common.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/bigtable/admin/v2/common.proto", fileDescriptor_common_a7c806066773dffe)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_common_a7c806066773dffe = []byte{
 	// 270 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xd0, 0xcf, 0x4b, 0xc3, 0x30,
 	0x14, 0x07, 0x70, 0x3b, 0x41, 0x21, 0xbb, 0x94, 0x9e, 0xc6, 0x28, 0x7a, 0xf2, 0xe2, 0x21, 0x81,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/instance.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/instance.pb.go
index 42c78ce9..36fae311 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/instance.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/instance.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/instance.proto
 
-package admin
+package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Possible states of an instance.
 type Instance_State int32
 
@@ -41,7 +47,9 @@ var Instance_State_value = map[string]int32{
 func (x Instance_State) String() string {
 	return proto.EnumName(Instance_State_name, int32(x))
 }
-func (Instance_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+func (Instance_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_instance_49fafc75b31da0ad, []int{0, 0}
+}
 
 // The type of the instance.
 type Instance_Type int32
@@ -78,7 +86,9 @@ var Instance_Type_value = map[string]int32{
 func (x Instance_Type) String() string {
 	return proto.EnumName(Instance_Type_name, int32(x))
 }
-func (Instance_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 1} }
+func (Instance_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_instance_49fafc75b31da0ad, []int{0, 1}
+}
 
 // Possible states of a cluster.
 type Cluster_State int32
@@ -121,7 +131,9 @@ var Cluster_State_value = map[string]int32{
 func (x Cluster_State) String() string {
 	return proto.EnumName(Cluster_State_name, int32(x))
 }
-func (Cluster_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{1, 0} }
+func (Cluster_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_instance_49fafc75b31da0ad, []int{1, 0}
+}
 
 // A collection of Bigtable [Tables][google.bigtable.admin.v2.Table] and
 // the resources that serve them.
@@ -131,16 +143,16 @@ type Instance struct {
 	// (`OutputOnly`)
 	// The unique name of the instance. Values are of the form
 	// `projects/<project>/instances/[a-z][a-z0-9\\-]+[a-z0-9]`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The descriptive name for this instance as it appears in UIs.
 	// Can be changed at any time, but should be kept globally unique
 	// to avoid confusion.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// (`OutputOnly`)
 	// The current state of the instance.
-	State Instance_State `protobuf:"varint,3,opt,name=state,enum=google.bigtable.admin.v2.Instance_State" json:"state,omitempty"`
+	State Instance_State `protobuf:"varint,3,opt,name=state,proto3,enum=google.bigtable.admin.v2.Instance_State" json:"state,omitempty"`
 	// The type of the instance. Defaults to `PRODUCTION`.
-	Type Instance_Type `protobuf:"varint,4,opt,name=type,enum=google.bigtable.admin.v2.Instance_Type" json:"type,omitempty"`
+	Type Instance_Type `protobuf:"varint,4,opt,name=type,proto3,enum=google.bigtable.admin.v2.Instance_Type" json:"type,omitempty"`
 	// Labels are a flexible and lightweight mechanism for organizing cloud
 	// resources into groups that reflect a customer's organizational needs and
 	// deployment strategies. They can be used to filter resources and aggregate
@@ -152,13 +164,35 @@ type Instance struct {
 	//   the regular expression: `[\p{Ll}\p{Lo}\p{N}_-]{0,63}`.
 	// * No more than 64 labels can be associated with a given resource.
 	// * Keys and values must both be under 128 bytes.
-	Labels map[string]string `protobuf:"bytes,5,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Instance) Reset()         { *m = Instance{} }
+func (m *Instance) String() string { return proto.CompactTextString(m) }
+func (*Instance) ProtoMessage()    {}
+func (*Instance) Descriptor() ([]byte, []int) {
+	return fileDescriptor_instance_49fafc75b31da0ad, []int{0}
+}
+func (m *Instance) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Instance.Unmarshal(m, b)
+}
+func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
+}
+func (dst *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(dst, src)
+}
+func (m *Instance) XXX_Size() int {
+	return xxx_messageInfo_Instance.Size(m)
+}
+func (m *Instance) XXX_DiscardUnknown() {
+	xxx_messageInfo_Instance.DiscardUnknown(m)
 }
 
-func (m *Instance) Reset()                    { *m = Instance{} }
-func (m *Instance) String() string            { return proto.CompactTextString(m) }
-func (*Instance) ProtoMessage()               {}
-func (*Instance) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_Instance proto.InternalMessageInfo
 
 func (m *Instance) GetName() string {
 	if m != nil {
@@ -202,29 +236,51 @@ type Cluster struct {
 	// (`OutputOnly`)
 	// The unique name of the cluster. Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/[a-z][-a-z0-9]*`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// (`CreationOnly`)
 	// The location where this cluster's nodes and storage reside. For best
 	// performance, clients should be located as close as possible to this
 	// cluster. Currently only zones are supported, so values should be of the
 	// form `projects/<project>/locations/<zone>`.
-	Location string `protobuf:"bytes,2,opt,name=location" json:"location,omitempty"`
+	Location string `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"`
 	// (`OutputOnly`)
 	// The current state of the cluster.
-	State Cluster_State `protobuf:"varint,3,opt,name=state,enum=google.bigtable.admin.v2.Cluster_State" json:"state,omitempty"`
+	State Cluster_State `protobuf:"varint,3,opt,name=state,proto3,enum=google.bigtable.admin.v2.Cluster_State" json:"state,omitempty"`
 	// The number of nodes allocated to this cluster. More nodes enable higher
 	// throughput and more consistent performance.
-	ServeNodes int32 `protobuf:"varint,4,opt,name=serve_nodes,json=serveNodes" json:"serve_nodes,omitempty"`
+	ServeNodes int32 `protobuf:"varint,4,opt,name=serve_nodes,json=serveNodes,proto3" json:"serve_nodes,omitempty"`
 	// (`CreationOnly`)
 	// The type of storage used by this cluster to serve its
 	// parent instance's tables, unless explicitly overridden.
-	DefaultStorageType StorageType `protobuf:"varint,5,opt,name=default_storage_type,json=defaultStorageType,enum=google.bigtable.admin.v2.StorageType" json:"default_storage_type,omitempty"`
+	DefaultStorageType   StorageType `protobuf:"varint,5,opt,name=default_storage_type,json=defaultStorageType,proto3,enum=google.bigtable.admin.v2.StorageType" json:"default_storage_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *Cluster) Reset()         { *m = Cluster{} }
+func (m *Cluster) String() string { return proto.CompactTextString(m) }
+func (*Cluster) ProtoMessage()    {}
+func (*Cluster) Descriptor() ([]byte, []int) {
+	return fileDescriptor_instance_49fafc75b31da0ad, []int{1}
+}
+func (m *Cluster) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cluster.Unmarshal(m, b)
+}
+func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
+}
+func (dst *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(dst, src)
+}
+func (m *Cluster) XXX_Size() int {
+	return xxx_messageInfo_Cluster.Size(m)
+}
+func (m *Cluster) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cluster.DiscardUnknown(m)
 }
 
-func (m *Cluster) Reset()                    { *m = Cluster{} }
-func (m *Cluster) String() string            { return proto.CompactTextString(m) }
-func (*Cluster) ProtoMessage()               {}
-func (*Cluster) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+var xxx_messageInfo_Cluster proto.InternalMessageInfo
 
 func (m *Cluster) GetName() string {
 	if m != nil {
@@ -261,18 +317,13 @@ func (m *Cluster) GetDefaultStorageType() StorageType {
 	return StorageType_STORAGE_TYPE_UNSPECIFIED
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // A configuration object describing how Cloud Bigtable should treat traffic
 // from a particular end user application.
 type AppProfile struct {
 	// (`OutputOnly`)
 	// The unique name of the app profile. Values are of the form
 	// `projects/<project>/instances/<instance>/appProfiles/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Strongly validated etag for optimistic concurrency control. Preserve the
 	// value returned from `GetAppProfile` when calling `UpdateAppProfile` to
 	// fail the request if there has been a modification in the mean time. The
@@ -281,43 +332,44 @@ type AppProfile struct {
 	// See [Wikipedia](https://en.wikipedia.org/wiki/HTTP_ETag) and
 	// [RFC 7232](https://tools.ietf.org/html/rfc7232#section-2.3) for more
 	// details.
-	Etag string `protobuf:"bytes,2,opt,name=etag" json:"etag,omitempty"`
+	Etag string `protobuf:"bytes,2,opt,name=etag,proto3" json:"etag,omitempty"`
 	// Optional long form description of the use case for this AppProfile.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// The routing policy for all read/write requests which use this app profile.
 	// A value must be explicitly set.
 	//
 	// Types that are valid to be assigned to RoutingPolicy:
 	//	*AppProfile_MultiClusterRoutingUseAny_
 	//	*AppProfile_SingleClusterRouting_
-	RoutingPolicy isAppProfile_RoutingPolicy `protobuf_oneof:"routing_policy"`
+	RoutingPolicy        isAppProfile_RoutingPolicy `protobuf_oneof:"routing_policy"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *AppProfile) Reset()                    { *m = AppProfile{} }
-func (m *AppProfile) String() string            { return proto.CompactTextString(m) }
-func (*AppProfile) ProtoMessage()               {}
-func (*AppProfile) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
-
-type isAppProfile_RoutingPolicy interface {
-	isAppProfile_RoutingPolicy()
+func (m *AppProfile) Reset()         { *m = AppProfile{} }
+func (m *AppProfile) String() string { return proto.CompactTextString(m) }
+func (*AppProfile) ProtoMessage()    {}
+func (*AppProfile) Descriptor() ([]byte, []int) {
+	return fileDescriptor_instance_49fafc75b31da0ad, []int{2}
 }
-
-type AppProfile_MultiClusterRoutingUseAny_ struct {
-	MultiClusterRoutingUseAny *AppProfile_MultiClusterRoutingUseAny `protobuf:"bytes,5,opt,name=multi_cluster_routing_use_any,json=multiClusterRoutingUseAny,oneof"`
+func (m *AppProfile) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AppProfile.Unmarshal(m, b)
 }
-type AppProfile_SingleClusterRouting_ struct {
-	SingleClusterRouting *AppProfile_SingleClusterRouting `protobuf:"bytes,6,opt,name=single_cluster_routing,json=singleClusterRouting,oneof"`
+func (m *AppProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AppProfile.Marshal(b, m, deterministic)
 }
-
-func (*AppProfile_MultiClusterRoutingUseAny_) isAppProfile_RoutingPolicy() {}
-func (*AppProfile_SingleClusterRouting_) isAppProfile_RoutingPolicy()      {}
-
-func (m *AppProfile) GetRoutingPolicy() isAppProfile_RoutingPolicy {
-	if m != nil {
-		return m.RoutingPolicy
-	}
-	return nil
+func (dst *AppProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppProfile.Merge(dst, src)
+}
+func (m *AppProfile) XXX_Size() int {
+	return xxx_messageInfo_AppProfile.Size(m)
 }
+func (m *AppProfile) XXX_DiscardUnknown() {
+	xxx_messageInfo_AppProfile.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AppProfile proto.InternalMessageInfo
 
 func (m *AppProfile) GetName() string {
 	if m != nil {
@@ -340,6 +392,29 @@ func (m *AppProfile) GetDescription() string {
 	return ""
 }
 
+type isAppProfile_RoutingPolicy interface {
+	isAppProfile_RoutingPolicy()
+}
+
+type AppProfile_MultiClusterRoutingUseAny_ struct {
+	MultiClusterRoutingUseAny *AppProfile_MultiClusterRoutingUseAny `protobuf:"bytes,5,opt,name=multi_cluster_routing_use_any,json=multiClusterRoutingUseAny,proto3,oneof"`
+}
+
+type AppProfile_SingleClusterRouting_ struct {
+	SingleClusterRouting *AppProfile_SingleClusterRouting `protobuf:"bytes,6,opt,name=single_cluster_routing,json=singleClusterRouting,proto3,oneof"`
+}
+
+func (*AppProfile_MultiClusterRoutingUseAny_) isAppProfile_RoutingPolicy() {}
+
+func (*AppProfile_SingleClusterRouting_) isAppProfile_RoutingPolicy() {}
+
+func (m *AppProfile) GetRoutingPolicy() isAppProfile_RoutingPolicy {
+	if m != nil {
+		return m.RoutingPolicy
+	}
+	return nil
+}
+
 func (m *AppProfile) GetMultiClusterRoutingUseAny() *AppProfile_MultiClusterRoutingUseAny {
 	if x, ok := m.GetRoutingPolicy().(*AppProfile_MultiClusterRoutingUseAny_); ok {
 		return x.MultiClusterRoutingUseAny
@@ -413,12 +488,12 @@ func _AppProfile_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.RoutingPolicy.(type) {
 	case *AppProfile_MultiClusterRoutingUseAny_:
 		s := proto.Size(x.MultiClusterRoutingUseAny)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AppProfile_SingleClusterRouting_:
 		s := proto.Size(x.SingleClusterRouting)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -433,33 +508,73 @@ func _AppProfile_OneofSizer(msg proto.Message) (n int) {
 // Choosing this option sacrifices read-your-writes consistency to improve
 // availability.
 type AppProfile_MultiClusterRoutingUseAny struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *AppProfile_MultiClusterRoutingUseAny) Reset()         { *m = AppProfile_MultiClusterRoutingUseAny{} }
 func (m *AppProfile_MultiClusterRoutingUseAny) String() string { return proto.CompactTextString(m) }
 func (*AppProfile_MultiClusterRoutingUseAny) ProtoMessage()    {}
 func (*AppProfile_MultiClusterRoutingUseAny) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{2, 0}
+	return fileDescriptor_instance_49fafc75b31da0ad, []int{2, 0}
+}
+func (m *AppProfile_MultiClusterRoutingUseAny) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Unmarshal(m, b)
+}
+func (m *AppProfile_MultiClusterRoutingUseAny) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Marshal(b, m, deterministic)
 }
+func (dst *AppProfile_MultiClusterRoutingUseAny) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Merge(dst, src)
+}
+func (m *AppProfile_MultiClusterRoutingUseAny) XXX_Size() int {
+	return xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.Size(m)
+}
+func (m *AppProfile_MultiClusterRoutingUseAny) XXX_DiscardUnknown() {
+	xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AppProfile_MultiClusterRoutingUseAny proto.InternalMessageInfo
 
 // Unconditionally routes all read/write requests to a specific cluster.
 // This option preserves read-your-writes consistency, but does not improve
 // availability.
 type AppProfile_SingleClusterRouting struct {
 	// The cluster to which read/write requests should be routed.
-	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// Whether or not `CheckAndMutateRow` and `ReadModifyWriteRow` requests are
 	// allowed by this app profile. It is unsafe to send these requests to
 	// the same table/row/column in multiple clusters.
-	AllowTransactionalWrites bool `protobuf:"varint,2,opt,name=allow_transactional_writes,json=allowTransactionalWrites" json:"allow_transactional_writes,omitempty"`
+	AllowTransactionalWrites bool     `protobuf:"varint,2,opt,name=allow_transactional_writes,json=allowTransactionalWrites,proto3" json:"allow_transactional_writes,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
 }
 
 func (m *AppProfile_SingleClusterRouting) Reset()         { *m = AppProfile_SingleClusterRouting{} }
 func (m *AppProfile_SingleClusterRouting) String() string { return proto.CompactTextString(m) }
 func (*AppProfile_SingleClusterRouting) ProtoMessage()    {}
 func (*AppProfile_SingleClusterRouting) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{2, 1}
+	return fileDescriptor_instance_49fafc75b31da0ad, []int{2, 1}
 }
+func (m *AppProfile_SingleClusterRouting) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AppProfile_SingleClusterRouting.Unmarshal(m, b)
+}
+func (m *AppProfile_SingleClusterRouting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AppProfile_SingleClusterRouting.Marshal(b, m, deterministic)
+}
+func (dst *AppProfile_SingleClusterRouting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppProfile_SingleClusterRouting.Merge(dst, src)
+}
+func (m *AppProfile_SingleClusterRouting) XXX_Size() int {
+	return xxx_messageInfo_AppProfile_SingleClusterRouting.Size(m)
+}
+func (m *AppProfile_SingleClusterRouting) XXX_DiscardUnknown() {
+	xxx_messageInfo_AppProfile_SingleClusterRouting.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AppProfile_SingleClusterRouting proto.InternalMessageInfo
 
 func (m *AppProfile_SingleClusterRouting) GetClusterId() string {
 	if m != nil {
@@ -477,6 +592,7 @@ func (m *AppProfile_SingleClusterRouting) GetAllowTransactionalWrites() bool {
 
 func init() {
 	proto.RegisterType((*Instance)(nil), "google.bigtable.admin.v2.Instance")
+	proto.RegisterMapType((map[string]string)(nil), "google.bigtable.admin.v2.Instance.LabelsEntry")
 	proto.RegisterType((*Cluster)(nil), "google.bigtable.admin.v2.Cluster")
 	proto.RegisterType((*AppProfile)(nil), "google.bigtable.admin.v2.AppProfile")
 	proto.RegisterType((*AppProfile_MultiClusterRoutingUseAny)(nil), "google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny")
@@ -486,9 +602,11 @@ func init() {
 	proto.RegisterEnum("google.bigtable.admin.v2.Cluster_State", Cluster_State_name, Cluster_State_value)
 }
 
-func init() { proto.RegisterFile("google/bigtable/admin/v2/instance.proto", fileDescriptor3) }
+func init() {
+	proto.RegisterFile("google/bigtable/admin/v2/instance.proto", fileDescriptor_instance_49fafc75b31da0ad)
+}
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_instance_49fafc75b31da0ad = []byte{
 	// 765 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x8e, 0xdb, 0x44,
 	0x14, 0x8e, 0xf3, 0xb3, 0x64, 0x4f, 0xca, 0xd6, 0x1a, 0x22, 0x94, 0x86, 0x16, 0x42, 0xa4, 0xaa,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/table.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/table.pb.go
index 6ccb15d1..82005bfe 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/table.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/admin/v2/table.pb.go
@@ -1,20 +1,26 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/admin/v2/table.proto
 
-package admin
+package admin // import "google.golang.org/genproto/googleapis/bigtable/admin/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Possible timestamp granularities to use when keeping multiple versions
 // of data in a table.
 type Table_TimestampGranularity int32
@@ -40,7 +46,7 @@ func (x Table_TimestampGranularity) String() string {
 	return proto.EnumName(Table_TimestampGranularity_name, int32(x))
 }
 func (Table_TimestampGranularity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{0, 0}
+	return fileDescriptor_table_cd8df3d61350f137, []int{0, 0}
 }
 
 // Defines a view over a table's fields.
@@ -53,12 +59,6 @@ const (
 	Table_NAME_ONLY Table_View = 1
 	// Only populates `name` and fields related to the table's schema.
 	Table_SCHEMA_VIEW Table_View = 2
-	// This is a private alpha release of Cloud Bigtable replication. This
-	// feature is not currently available to most Cloud Bigtable customers. This
-	// feature might be changed in backward-incompatible ways and is not
-	// recommended for production use. It is not subject to any SLA or
-	// deprecation policy.
-	//
 	// Only populates `name` and fields related to the table's
 	// replication state.
 	Table_REPLICATION_VIEW Table_View = 3
@@ -84,7 +84,9 @@ var Table_View_value = map[string]int32{
 func (x Table_View) String() string {
 	return proto.EnumName(Table_View_name, int32(x))
 }
-func (Table_View) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{0, 1} }
+func (Table_View) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{0, 1}
+}
 
 // Table replication states.
 type Table_ClusterState_ReplicationState int32
@@ -94,21 +96,17 @@ const (
 	Table_ClusterState_STATE_NOT_KNOWN Table_ClusterState_ReplicationState = 0
 	// The cluster was recently created, and the table must finish copying
 	// over pre-existing data from other clusters before it can begin
-	// receiving live replication updates and serving
-	// [Data API][google.bigtable.v2.Bigtable] requests.
+	// receiving live replication updates and serving Data API requests.
 	Table_ClusterState_INITIALIZING Table_ClusterState_ReplicationState = 1
-	// The table is temporarily unable to serve
-	// [Data API][google.bigtable.v2.Bigtable] requests from this
+	// The table is temporarily unable to serve Data API requests from this
 	// cluster due to planned internal maintenance.
 	Table_ClusterState_PLANNED_MAINTENANCE Table_ClusterState_ReplicationState = 2
-	// The table is temporarily unable to serve
-	// [Data API][google.bigtable.v2.Bigtable] requests from this
+	// The table is temporarily unable to serve Data API requests from this
 	// cluster due to unplanned or emergency maintenance.
 	Table_ClusterState_UNPLANNED_MAINTENANCE Table_ClusterState_ReplicationState = 3
-	// The table can serve
-	// [Data API][google.bigtable.v2.Bigtable] requests from this
-	// cluster. Depending on replication delay, reads may not immediately
-	// reflect the state of the table in other clusters.
+	// The table can serve Data API requests from this cluster. Depending on
+	// replication delay, reads may not immediately reflect the state of the
+	// table in other clusters.
 	Table_ClusterState_READY Table_ClusterState_ReplicationState = 4
 )
 
@@ -131,7 +129,7 @@ func (x Table_ClusterState_ReplicationState) String() string {
 	return proto.EnumName(Table_ClusterState_ReplicationState_name, int32(x))
 }
 func (Table_ClusterState_ReplicationState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{0, 0, 0}
+	return fileDescriptor_table_cd8df3d61350f137, []int{0, 0, 0}
 }
 
 // Possible states of a snapshot.
@@ -162,7 +160,9 @@ var Snapshot_State_value = map[string]int32{
 func (x Snapshot_State) String() string {
 	return proto.EnumName(Snapshot_State_name, int32(x))
 }
-func (Snapshot_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{3, 0} }
+func (Snapshot_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{3, 0}
+}
 
 // A collection of user data indexed by row, column, and timestamp.
 // Each table is served using the resources of its parent cluster.
@@ -170,36 +170,53 @@ type Table struct {
 	// (`OutputOnly`)
 	// The unique name of the table. Values are of the form
 	// `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-	// Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	// Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// (`OutputOnly`)
 	// Map from cluster ID to per-cluster table state.
 	// If it could not be determined whether or not the table has data in a
 	// particular cluster (for example, if its zone is unavailable), then
 	// there will be an entry for the cluster with UNKNOWN `replication_status`.
-	// Views: `FULL`
-	ClusterStates map[string]*Table_ClusterState `protobuf:"bytes,2,rep,name=cluster_states,json=clusterStates" json:"cluster_states,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// Views: `REPLICATION_VIEW`, `FULL`
+	ClusterStates map[string]*Table_ClusterState `protobuf:"bytes,2,rep,name=cluster_states,json=clusterStates,proto3" json:"cluster_states,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// (`CreationOnly`)
 	// The column families configured for this table, mapped by column family ID.
 	// Views: `SCHEMA_VIEW`, `FULL`
-	ColumnFamilies map[string]*ColumnFamily `protobuf:"bytes,3,rep,name=column_families,json=columnFamilies" json:"column_families,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ColumnFamilies map[string]*ColumnFamily `protobuf:"bytes,3,rep,name=column_families,json=columnFamilies,proto3" json:"column_families,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// (`CreationOnly`)
-	// The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+	// The granularity (i.e. `MILLIS`) at which timestamps are stored in
 	// this table. Timestamps not matching the granularity will be rejected.
 	// If unspecified at creation time, the value will be set to `MILLIS`.
 	// Views: `SCHEMA_VIEW`, `FULL`
-	Granularity Table_TimestampGranularity `protobuf:"varint,4,opt,name=granularity,enum=google.bigtable.admin.v2.Table_TimestampGranularity" json:"granularity,omitempty"`
+	Granularity          Table_TimestampGranularity `protobuf:"varint,4,opt,name=granularity,proto3,enum=google.bigtable.admin.v2.Table_TimestampGranularity" json:"granularity,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *Table) Reset()                    { *m = Table{} }
-func (m *Table) String() string            { return proto.CompactTextString(m) }
-func (*Table) ProtoMessage()               {}
-func (*Table) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+func (m *Table) Reset()         { *m = Table{} }
+func (m *Table) String() string { return proto.CompactTextString(m) }
+func (*Table) ProtoMessage()    {}
+func (*Table) Descriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{0}
+}
+func (m *Table) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Table.Unmarshal(m, b)
+}
+func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Table.Marshal(b, m, deterministic)
+}
+func (dst *Table) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table.Merge(dst, src)
+}
+func (m *Table) XXX_Size() int {
+	return xxx_messageInfo_Table.Size(m)
+}
+func (m *Table) XXX_DiscardUnknown() {
+	xxx_messageInfo_Table.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Table proto.InternalMessageInfo
 
 func (m *Table) GetName() string {
 	if m != nil {
@@ -229,22 +246,39 @@ func (m *Table) GetGranularity() Table_TimestampGranularity {
 	return Table_TIMESTAMP_GRANULARITY_UNSPECIFIED
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // The state of a table's data in a particular cluster.
 type Table_ClusterState struct {
 	// (`OutputOnly`)
 	// The state of replication for the table in this cluster.
-	ReplicationState Table_ClusterState_ReplicationState `protobuf:"varint,1,opt,name=replication_state,json=replicationState,enum=google.bigtable.admin.v2.Table_ClusterState_ReplicationState" json:"replication_state,omitempty"`
+	ReplicationState     Table_ClusterState_ReplicationState `protobuf:"varint,1,opt,name=replication_state,json=replicationState,proto3,enum=google.bigtable.admin.v2.Table_ClusterState_ReplicationState" json:"replication_state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
 }
 
-func (m *Table_ClusterState) Reset()                    { *m = Table_ClusterState{} }
-func (m *Table_ClusterState) String() string            { return proto.CompactTextString(m) }
-func (*Table_ClusterState) ProtoMessage()               {}
-func (*Table_ClusterState) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0, 0} }
+func (m *Table_ClusterState) Reset()         { *m = Table_ClusterState{} }
+func (m *Table_ClusterState) String() string { return proto.CompactTextString(m) }
+func (*Table_ClusterState) ProtoMessage()    {}
+func (*Table_ClusterState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{0, 0}
+}
+func (m *Table_ClusterState) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Table_ClusterState.Unmarshal(m, b)
+}
+func (m *Table_ClusterState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Table_ClusterState.Marshal(b, m, deterministic)
+}
+func (dst *Table_ClusterState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table_ClusterState.Merge(dst, src)
+}
+func (m *Table_ClusterState) XXX_Size() int {
+	return xxx_messageInfo_Table_ClusterState.Size(m)
+}
+func (m *Table_ClusterState) XXX_DiscardUnknown() {
+	xxx_messageInfo_Table_ClusterState.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Table_ClusterState proto.InternalMessageInfo
 
 func (m *Table_ClusterState) GetReplicationState() Table_ClusterState_ReplicationState {
 	if m != nil {
@@ -261,13 +295,35 @@ type ColumnFamily struct {
 	// NOTE: Garbage collection executes opportunistically in the background, and
 	// so it's possible for reads to return a cell even if it matches the active
 	// GC expression for its family.
-	GcRule *GcRule `protobuf:"bytes,1,opt,name=gc_rule,json=gcRule" json:"gc_rule,omitempty"`
+	GcRule               *GcRule  `protobuf:"bytes,1,opt,name=gc_rule,json=gcRule,proto3" json:"gc_rule,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ColumnFamily) Reset()         { *m = ColumnFamily{} }
+func (m *ColumnFamily) String() string { return proto.CompactTextString(m) }
+func (*ColumnFamily) ProtoMessage()    {}
+func (*ColumnFamily) Descriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{1}
+}
+func (m *ColumnFamily) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColumnFamily.Unmarshal(m, b)
+}
+func (m *ColumnFamily) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColumnFamily.Marshal(b, m, deterministic)
+}
+func (dst *ColumnFamily) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnFamily.Merge(dst, src)
+}
+func (m *ColumnFamily) XXX_Size() int {
+	return xxx_messageInfo_ColumnFamily.Size(m)
+}
+func (m *ColumnFamily) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColumnFamily.DiscardUnknown(m)
 }
 
-func (m *ColumnFamily) Reset()                    { *m = ColumnFamily{} }
-func (m *ColumnFamily) String() string            { return proto.CompactTextString(m) }
-func (*ColumnFamily) ProtoMessage()               {}
-func (*ColumnFamily) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+var xxx_messageInfo_ColumnFamily proto.InternalMessageInfo
 
 func (m *ColumnFamily) GetGcRule() *GcRule {
 	if m != nil {
@@ -285,35 +341,63 @@ type GcRule struct {
 	//	*GcRule_MaxAge
 	//	*GcRule_Intersection_
 	//	*GcRule_Union_
-	Rule isGcRule_Rule `protobuf_oneof:"rule"`
+	Rule                 isGcRule_Rule `protobuf_oneof:"rule"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *GcRule) Reset()                    { *m = GcRule{} }
-func (m *GcRule) String() string            { return proto.CompactTextString(m) }
-func (*GcRule) ProtoMessage()               {}
-func (*GcRule) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
+func (m *GcRule) Reset()         { *m = GcRule{} }
+func (m *GcRule) String() string { return proto.CompactTextString(m) }
+func (*GcRule) ProtoMessage()    {}
+func (*GcRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{2}
+}
+func (m *GcRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcRule.Unmarshal(m, b)
+}
+func (m *GcRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcRule.Marshal(b, m, deterministic)
+}
+func (dst *GcRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule.Merge(dst, src)
+}
+func (m *GcRule) XXX_Size() int {
+	return xxx_messageInfo_GcRule.Size(m)
+}
+func (m *GcRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcRule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcRule proto.InternalMessageInfo
 
 type isGcRule_Rule interface {
 	isGcRule_Rule()
 }
 
 type GcRule_MaxNumVersions struct {
-	MaxNumVersions int32 `protobuf:"varint,1,opt,name=max_num_versions,json=maxNumVersions,oneof"`
+	MaxNumVersions int32 `protobuf:"varint,1,opt,name=max_num_versions,json=maxNumVersions,proto3,oneof"`
 }
+
 type GcRule_MaxAge struct {
-	MaxAge *google_protobuf5.Duration `protobuf:"bytes,2,opt,name=max_age,json=maxAge,oneof"`
+	MaxAge *duration.Duration `protobuf:"bytes,2,opt,name=max_age,json=maxAge,proto3,oneof"`
 }
+
 type GcRule_Intersection_ struct {
-	Intersection *GcRule_Intersection `protobuf:"bytes,3,opt,name=intersection,oneof"`
+	Intersection *GcRule_Intersection `protobuf:"bytes,3,opt,name=intersection,proto3,oneof"`
 }
+
 type GcRule_Union_ struct {
-	Union *GcRule_Union `protobuf:"bytes,4,opt,name=union,oneof"`
+	Union *GcRule_Union `protobuf:"bytes,4,opt,name=union,proto3,oneof"`
 }
 
 func (*GcRule_MaxNumVersions) isGcRule_Rule() {}
-func (*GcRule_MaxAge) isGcRule_Rule()         {}
-func (*GcRule_Intersection_) isGcRule_Rule()  {}
-func (*GcRule_Union_) isGcRule_Rule()         {}
+
+func (*GcRule_MaxAge) isGcRule_Rule() {}
+
+func (*GcRule_Intersection_) isGcRule_Rule() {}
+
+func (*GcRule_Union_) isGcRule_Rule() {}
 
 func (m *GcRule) GetRule() isGcRule_Rule {
 	if m != nil {
@@ -329,7 +413,7 @@ func (m *GcRule) GetMaxNumVersions() int32 {
 	return 0
 }
 
-func (m *GcRule) GetMaxAge() *google_protobuf5.Duration {
+func (m *GcRule) GetMaxAge() *duration.Duration {
 	if x, ok := m.GetRule().(*GcRule_MaxAge); ok {
 		return x.MaxAge
 	}
@@ -403,7 +487,7 @@ func _GcRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf5.Duration)
+		msg := new(duration.Duration)
 		err := b.DecodeMessage(msg)
 		m.Rule = &GcRule_MaxAge{msg}
 		return true, err
@@ -433,21 +517,21 @@ func _GcRule_OneofSizer(msg proto.Message) (n int) {
 	// rule
 	switch x := m.Rule.(type) {
 	case *GcRule_MaxNumVersions:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.MaxNumVersions))
 	case *GcRule_MaxAge:
 		s := proto.Size(x.MaxAge)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GcRule_Intersection_:
 		s := proto.Size(x.Intersection)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GcRule_Union_:
 		s := proto.Size(x.Union)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -460,13 +544,35 @@ func _GcRule_OneofSizer(msg proto.Message) (n int) {
 // A GcRule which deletes cells matching all of the given rules.
 type GcRule_Intersection struct {
 	// Only delete cells which would be deleted by every element of `rules`.
-	Rules []*GcRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*GcRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *GcRule_Intersection) Reset()         { *m = GcRule_Intersection{} }
+func (m *GcRule_Intersection) String() string { return proto.CompactTextString(m) }
+func (*GcRule_Intersection) ProtoMessage()    {}
+func (*GcRule_Intersection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{2, 0}
+}
+func (m *GcRule_Intersection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcRule_Intersection.Unmarshal(m, b)
+}
+func (m *GcRule_Intersection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcRule_Intersection.Marshal(b, m, deterministic)
+}
+func (dst *GcRule_Intersection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule_Intersection.Merge(dst, src)
+}
+func (m *GcRule_Intersection) XXX_Size() int {
+	return xxx_messageInfo_GcRule_Intersection.Size(m)
+}
+func (m *GcRule_Intersection) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcRule_Intersection.DiscardUnknown(m)
 }
 
-func (m *GcRule_Intersection) Reset()                    { *m = GcRule_Intersection{} }
-func (m *GcRule_Intersection) String() string            { return proto.CompactTextString(m) }
-func (*GcRule_Intersection) ProtoMessage()               {}
-func (*GcRule_Intersection) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2, 0} }
+var xxx_messageInfo_GcRule_Intersection proto.InternalMessageInfo
 
 func (m *GcRule_Intersection) GetRules() []*GcRule {
 	if m != nil {
@@ -478,13 +584,35 @@ func (m *GcRule_Intersection) GetRules() []*GcRule {
 // A GcRule which deletes cells matching any of the given rules.
 type GcRule_Union struct {
 	// Delete cells which would be deleted by any element of `rules`.
-	Rules []*GcRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*GcRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *GcRule_Union) Reset()         { *m = GcRule_Union{} }
+func (m *GcRule_Union) String() string { return proto.CompactTextString(m) }
+func (*GcRule_Union) ProtoMessage()    {}
+func (*GcRule_Union) Descriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{2, 1}
+}
+func (m *GcRule_Union) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcRule_Union.Unmarshal(m, b)
+}
+func (m *GcRule_Union) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcRule_Union.Marshal(b, m, deterministic)
+}
+func (dst *GcRule_Union) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcRule_Union.Merge(dst, src)
+}
+func (m *GcRule_Union) XXX_Size() int {
+	return xxx_messageInfo_GcRule_Union.Size(m)
+}
+func (m *GcRule_Union) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcRule_Union.DiscardUnknown(m)
 }
 
-func (m *GcRule_Union) Reset()                    { *m = GcRule_Union{} }
-func (m *GcRule_Union) String() string            { return proto.CompactTextString(m) }
-func (*GcRule_Union) ProtoMessage()               {}
-func (*GcRule_Union) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2, 1} }
+var xxx_messageInfo_GcRule_Union proto.InternalMessageInfo
 
 func (m *GcRule_Union) GetRules() []*GcRule {
 	if m != nil {
@@ -493,47 +621,69 @@ func (m *GcRule_Union) GetRules() []*GcRule {
 	return nil
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This feature
-// might be changed in backward-incompatible ways and is not recommended for
-// production use. It is not subject to any SLA or deprecation policy.
-//
 // A snapshot of a table at a particular time. A snapshot can be used as a
 // checkpoint for data restoration or a data source for a new table.
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// feature might be changed in backward-incompatible ways and is not recommended
+// for production use. It is not subject to any SLA or deprecation policy.
 type Snapshot struct {
 	// (`OutputOnly`)
 	// The unique name of the snapshot.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/clusters/<cluster>/snapshots/<snapshot>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// (`OutputOnly`)
 	// The source table at the time the snapshot was taken.
-	SourceTable *Table `protobuf:"bytes,2,opt,name=source_table,json=sourceTable" json:"source_table,omitempty"`
+	SourceTable *Table `protobuf:"bytes,2,opt,name=source_table,json=sourceTable,proto3" json:"source_table,omitempty"`
 	// (`OutputOnly`)
 	// The size of the data in the source table at the time the snapshot was
 	// taken. In some cases, this value may be computed asynchronously via a
 	// background process and a placeholder of 0 will be used in the meantime.
-	DataSizeBytes int64 `protobuf:"varint,3,opt,name=data_size_bytes,json=dataSizeBytes" json:"data_size_bytes,omitempty"`
+	DataSizeBytes int64 `protobuf:"varint,3,opt,name=data_size_bytes,json=dataSizeBytes,proto3" json:"data_size_bytes,omitempty"`
 	// (`OutputOnly`)
 	// The time when the snapshot is created.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// (`OutputOnly`)
 	// The time when the snapshot will be deleted. The maximum amount of time a
 	// snapshot can stay active is 365 days. If 'ttl' is not specified,
 	// the default maximum of 365 days will be used.
-	DeleteTime *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=delete_time,json=deleteTime" json:"delete_time,omitempty"`
+	DeleteTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
 	// (`OutputOnly`)
 	// The current state of the snapshot.
-	State Snapshot_State `protobuf:"varint,6,opt,name=state,enum=google.bigtable.admin.v2.Snapshot_State" json:"state,omitempty"`
+	State Snapshot_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.bigtable.admin.v2.Snapshot_State" json:"state,omitempty"`
 	// (`OutputOnly`)
 	// Description of the snapshot.
-	Description string `protobuf:"bytes,7,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,7,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Snapshot) Reset()         { *m = Snapshot{} }
+func (m *Snapshot) String() string { return proto.CompactTextString(m) }
+func (*Snapshot) ProtoMessage()    {}
+func (*Snapshot) Descriptor() ([]byte, []int) {
+	return fileDescriptor_table_cd8df3d61350f137, []int{3}
+}
+func (m *Snapshot) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Snapshot.Unmarshal(m, b)
+}
+func (m *Snapshot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Snapshot.Marshal(b, m, deterministic)
+}
+func (dst *Snapshot) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Snapshot.Merge(dst, src)
+}
+func (m *Snapshot) XXX_Size() int {
+	return xxx_messageInfo_Snapshot.Size(m)
+}
+func (m *Snapshot) XXX_DiscardUnknown() {
+	xxx_messageInfo_Snapshot.DiscardUnknown(m)
 }
 
-func (m *Snapshot) Reset()                    { *m = Snapshot{} }
-func (m *Snapshot) String() string            { return proto.CompactTextString(m) }
-func (*Snapshot) ProtoMessage()               {}
-func (*Snapshot) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+var xxx_messageInfo_Snapshot proto.InternalMessageInfo
 
 func (m *Snapshot) GetName() string {
 	if m != nil {
@@ -556,14 +706,14 @@ func (m *Snapshot) GetDataSizeBytes() int64 {
 	return 0
 }
 
-func (m *Snapshot) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *Snapshot) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Snapshot) GetDeleteTime() *google_protobuf1.Timestamp {
+func (m *Snapshot) GetDeleteTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.DeleteTime
 	}
@@ -586,6 +736,8 @@ func (m *Snapshot) GetDescription() string {
 
 func init() {
 	proto.RegisterType((*Table)(nil), "google.bigtable.admin.v2.Table")
+	proto.RegisterMapType((map[string]*Table_ClusterState)(nil), "google.bigtable.admin.v2.Table.ClusterStatesEntry")
+	proto.RegisterMapType((map[string]*ColumnFamily)(nil), "google.bigtable.admin.v2.Table.ColumnFamiliesEntry")
 	proto.RegisterType((*Table_ClusterState)(nil), "google.bigtable.admin.v2.Table.ClusterState")
 	proto.RegisterType((*ColumnFamily)(nil), "google.bigtable.admin.v2.ColumnFamily")
 	proto.RegisterType((*GcRule)(nil), "google.bigtable.admin.v2.GcRule")
@@ -598,9 +750,11 @@ func init() {
 	proto.RegisterEnum("google.bigtable.admin.v2.Snapshot_State", Snapshot_State_name, Snapshot_State_value)
 }
 
-func init() { proto.RegisterFile("google/bigtable/admin/v2/table.proto", fileDescriptor4) }
+func init() {
+	proto.RegisterFile("google/bigtable/admin/v2/table.proto", fileDescriptor_table_cd8df3d61350f137)
+}
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_table_cd8df3d61350f137 = []byte{
 	// 965 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xff, 0x6e, 0xdb, 0x54,
 	0x18, 0xad, 0xe3, 0x38, 0x6d, 0xbf, 0xa4, 0xad, 0xb9, 0x1d, 0x22, 0x8b, 0xa6, 0x2d, 0x44, 0x30,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_data.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_data.pb.go
index 51ece9f9..74084e8c 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_data.pb.go
@@ -1,39 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_data.proto
 
-/*
-Package bigtable is a generated protocol buffer package.
-
-It is generated from these files:
-	google/bigtable/v1/bigtable_data.proto
-	google/bigtable/v1/bigtable_service.proto
-	google/bigtable/v1/bigtable_service_messages.proto
-
-It has these top-level messages:
-	Row
-	Family
-	Column
-	Cell
-	RowRange
-	RowSet
-	ColumnRange
-	TimestampRange
-	ValueRange
-	RowFilter
-	Mutation
-	ReadModifyWriteRule
-	ReadRowsRequest
-	ReadRowsResponse
-	SampleRowKeysRequest
-	SampleRowKeysResponse
-	MutateRowRequest
-	MutateRowsRequest
-	MutateRowsResponse
-	CheckAndMutateRowRequest
-	CheckAndMutateRowResponse
-	ReadModifyWriteRowRequest
-*/
-package bigtable
+package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -59,13 +27,35 @@ type Row struct {
 	Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// May be empty, but only if the entire row is empty.
 	// The mutual ordering of column families is not specified.
-	Families []*Family `protobuf:"bytes,2,rep,name=families" json:"families,omitempty"`
+	Families             []*Family `protobuf:"bytes,2,rep,name=families,proto3" json:"families,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *Row) Reset()                    { *m = Row{} }
-func (m *Row) String() string            { return proto.CompactTextString(m) }
-func (*Row) ProtoMessage()               {}
-func (*Row) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Row) Reset()         { *m = Row{} }
+func (m *Row) String() string { return proto.CompactTextString(m) }
+func (*Row) ProtoMessage()    {}
+func (*Row) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{0}
+}
+func (m *Row) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Row.Unmarshal(m, b)
+}
+func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
+}
+func (dst *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(dst, src)
+}
+func (m *Row) XXX_Size() int {
+	return xxx_messageInfo_Row.Size(m)
+}
+func (m *Row) XXX_DiscardUnknown() {
+	xxx_messageInfo_Row.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Row proto.InternalMessageInfo
 
 func (m *Row) GetKey() []byte {
 	if m != nil {
@@ -89,15 +79,37 @@ type Family struct {
 	// Must match [-_.a-zA-Z0-9]+, except that AggregatingRowProcessors may
 	// produce cells in a sentinel family with an empty name.
 	// Must be no greater than 64 characters in length.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Must not be empty. Sorted in order of increasing "qualifier".
-	Columns []*Column `protobuf:"bytes,2,rep,name=columns" json:"columns,omitempty"`
+	Columns              []*Column `protobuf:"bytes,2,rep,name=columns,proto3" json:"columns,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *Family) Reset()                    { *m = Family{} }
-func (m *Family) String() string            { return proto.CompactTextString(m) }
-func (*Family) ProtoMessage()               {}
-func (*Family) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Family) Reset()         { *m = Family{} }
+func (m *Family) String() string { return proto.CompactTextString(m) }
+func (*Family) ProtoMessage()    {}
+func (*Family) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{1}
+}
+func (m *Family) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Family.Unmarshal(m, b)
+}
+func (m *Family) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Family.Marshal(b, m, deterministic)
+}
+func (dst *Family) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Family.Merge(dst, src)
+}
+func (m *Family) XXX_Size() int {
+	return xxx_messageInfo_Family.Size(m)
+}
+func (m *Family) XXX_DiscardUnknown() {
+	xxx_messageInfo_Family.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Family proto.InternalMessageInfo
 
 func (m *Family) GetName() string {
 	if m != nil {
@@ -122,13 +134,35 @@ type Column struct {
 	// length.
 	Qualifier []byte `protobuf:"bytes,1,opt,name=qualifier,proto3" json:"qualifier,omitempty"`
 	// Must not be empty. Sorted in order of decreasing "timestamp_micros".
-	Cells []*Cell `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"`
+	Cells                []*Cell  `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Column) Reset()         { *m = Column{} }
+func (m *Column) String() string { return proto.CompactTextString(m) }
+func (*Column) ProtoMessage()    {}
+func (*Column) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{2}
+}
+func (m *Column) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Column.Unmarshal(m, b)
+}
+func (m *Column) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Column.Marshal(b, m, deterministic)
+}
+func (dst *Column) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Column.Merge(dst, src)
+}
+func (m *Column) XXX_Size() int {
+	return xxx_messageInfo_Column.Size(m)
+}
+func (m *Column) XXX_DiscardUnknown() {
+	xxx_messageInfo_Column.DiscardUnknown(m)
 }
 
-func (m *Column) Reset()                    { *m = Column{} }
-func (m *Column) String() string            { return proto.CompactTextString(m) }
-func (*Column) ProtoMessage()               {}
-func (*Column) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_Column proto.InternalMessageInfo
 
 func (m *Column) GetQualifier() []byte {
 	if m != nil {
@@ -152,19 +186,41 @@ type Cell struct {
 	// a coarser "granularity" to further restrict the allowed values. For
 	// example, a table which specifies millisecond granularity will only allow
 	// values of "timestamp_micros" which are multiples of 1000.
-	TimestampMicros int64 `protobuf:"varint,1,opt,name=timestamp_micros,json=timestampMicros" json:"timestamp_micros,omitempty"`
+	TimestampMicros int64 `protobuf:"varint,1,opt,name=timestamp_micros,json=timestampMicros,proto3" json:"timestamp_micros,omitempty"`
 	// The value stored in the cell.
 	// May contain any byte string, including the empty string, up to 100MiB in
 	// length.
 	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Labels applied to the cell by a [RowFilter][google.bigtable.v1.RowFilter].
-	Labels []string `protobuf:"bytes,3,rep,name=labels" json:"labels,omitempty"`
+	Labels               []string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Cell) Reset()         { *m = Cell{} }
+func (m *Cell) String() string { return proto.CompactTextString(m) }
+func (*Cell) ProtoMessage()    {}
+func (*Cell) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{3}
+}
+func (m *Cell) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cell.Unmarshal(m, b)
+}
+func (m *Cell) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cell.Marshal(b, m, deterministic)
+}
+func (dst *Cell) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cell.Merge(dst, src)
+}
+func (m *Cell) XXX_Size() int {
+	return xxx_messageInfo_Cell.Size(m)
+}
+func (m *Cell) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cell.DiscardUnknown(m)
 }
 
-func (m *Cell) Reset()                    { *m = Cell{} }
-func (m *Cell) String() string            { return proto.CompactTextString(m) }
-func (*Cell) ProtoMessage()               {}
-func (*Cell) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_Cell proto.InternalMessageInfo
 
 func (m *Cell) GetTimestampMicros() int64 {
 	if m != nil {
@@ -192,13 +248,35 @@ type RowRange struct {
 	// Inclusive lower bound. If left empty, interpreted as the empty string.
 	StartKey []byte `protobuf:"bytes,2,opt,name=start_key,json=startKey,proto3" json:"start_key,omitempty"`
 	// Exclusive upper bound. If left empty, interpreted as infinity.
-	EndKey []byte `protobuf:"bytes,3,opt,name=end_key,json=endKey,proto3" json:"end_key,omitempty"`
+	EndKey               []byte   `protobuf:"bytes,3,opt,name=end_key,json=endKey,proto3" json:"end_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RowRange) Reset()                    { *m = RowRange{} }
-func (m *RowRange) String() string            { return proto.CompactTextString(m) }
-func (*RowRange) ProtoMessage()               {}
-func (*RowRange) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *RowRange) Reset()         { *m = RowRange{} }
+func (m *RowRange) String() string { return proto.CompactTextString(m) }
+func (*RowRange) ProtoMessage()    {}
+func (*RowRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{4}
+}
+func (m *RowRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowRange.Unmarshal(m, b)
+}
+func (m *RowRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowRange.Marshal(b, m, deterministic)
+}
+func (dst *RowRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowRange.Merge(dst, src)
+}
+func (m *RowRange) XXX_Size() int {
+	return xxx_messageInfo_RowRange.Size(m)
+}
+func (m *RowRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RowRange proto.InternalMessageInfo
 
 func (m *RowRange) GetStartKey() []byte {
 	if m != nil {
@@ -219,13 +297,35 @@ type RowSet struct {
 	// Single rows included in the set.
 	RowKeys [][]byte `protobuf:"bytes,1,rep,name=row_keys,json=rowKeys,proto3" json:"row_keys,omitempty"`
 	// Contiguous row ranges included in the set.
-	RowRanges []*RowRange `protobuf:"bytes,2,rep,name=row_ranges,json=rowRanges" json:"row_ranges,omitempty"`
+	RowRanges            []*RowRange `protobuf:"bytes,2,rep,name=row_ranges,json=rowRanges,proto3" json:"row_ranges,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *RowSet) Reset()                    { *m = RowSet{} }
-func (m *RowSet) String() string            { return proto.CompactTextString(m) }
-func (*RowSet) ProtoMessage()               {}
-func (*RowSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *RowSet) Reset()         { *m = RowSet{} }
+func (m *RowSet) String() string { return proto.CompactTextString(m) }
+func (*RowSet) ProtoMessage()    {}
+func (*RowSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{5}
+}
+func (m *RowSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowSet.Unmarshal(m, b)
+}
+func (m *RowSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowSet.Marshal(b, m, deterministic)
+}
+func (dst *RowSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowSet.Merge(dst, src)
+}
+func (m *RowSet) XXX_Size() int {
+	return xxx_messageInfo_RowSet.Size(m)
+}
+func (m *RowSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowSet.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RowSet proto.InternalMessageInfo
 
 func (m *RowSet) GetRowKeys() [][]byte {
 	if m != nil {
@@ -247,7 +347,7 @@ func (m *RowSet) GetRowRanges() []*RowRange {
 // exclusive.
 type ColumnRange struct {
 	// The name of the column family within which this range falls.
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The column qualifier at which to start the range (within 'column_family').
 	// If neither field is set, interpreted as the empty string, inclusive.
 	//
@@ -261,38 +361,58 @@ type ColumnRange struct {
 	// Types that are valid to be assigned to EndQualifier:
 	//	*ColumnRange_EndQualifierInclusive
 	//	*ColumnRange_EndQualifierExclusive
-	EndQualifier isColumnRange_EndQualifier `protobuf_oneof:"end_qualifier"`
+	EndQualifier         isColumnRange_EndQualifier `protobuf_oneof:"end_qualifier"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *ColumnRange) Reset()                    { *m = ColumnRange{} }
-func (m *ColumnRange) String() string            { return proto.CompactTextString(m) }
-func (*ColumnRange) ProtoMessage()               {}
-func (*ColumnRange) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *ColumnRange) Reset()         { *m = ColumnRange{} }
+func (m *ColumnRange) String() string { return proto.CompactTextString(m) }
+func (*ColumnRange) ProtoMessage()    {}
+func (*ColumnRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{6}
+}
+func (m *ColumnRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColumnRange.Unmarshal(m, b)
+}
+func (m *ColumnRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColumnRange.Marshal(b, m, deterministic)
+}
+func (dst *ColumnRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnRange.Merge(dst, src)
+}
+func (m *ColumnRange) XXX_Size() int {
+	return xxx_messageInfo_ColumnRange.Size(m)
+}
+func (m *ColumnRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColumnRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ColumnRange proto.InternalMessageInfo
+
+func (m *ColumnRange) GetFamilyName() string {
+	if m != nil {
+		return m.FamilyName
+	}
+	return ""
+}
 
 type isColumnRange_StartQualifier interface {
 	isColumnRange_StartQualifier()
 }
-type isColumnRange_EndQualifier interface {
-	isColumnRange_EndQualifier()
-}
 
 type ColumnRange_StartQualifierInclusive struct {
 	StartQualifierInclusive []byte `protobuf:"bytes,2,opt,name=start_qualifier_inclusive,json=startQualifierInclusive,proto3,oneof"`
 }
+
 type ColumnRange_StartQualifierExclusive struct {
 	StartQualifierExclusive []byte `protobuf:"bytes,3,opt,name=start_qualifier_exclusive,json=startQualifierExclusive,proto3,oneof"`
 }
-type ColumnRange_EndQualifierInclusive struct {
-	EndQualifierInclusive []byte `protobuf:"bytes,4,opt,name=end_qualifier_inclusive,json=endQualifierInclusive,proto3,oneof"`
-}
-type ColumnRange_EndQualifierExclusive struct {
-	EndQualifierExclusive []byte `protobuf:"bytes,5,opt,name=end_qualifier_exclusive,json=endQualifierExclusive,proto3,oneof"`
-}
 
 func (*ColumnRange_StartQualifierInclusive) isColumnRange_StartQualifier() {}
+
 func (*ColumnRange_StartQualifierExclusive) isColumnRange_StartQualifier() {}
-func (*ColumnRange_EndQualifierInclusive) isColumnRange_EndQualifier()     {}
-func (*ColumnRange_EndQualifierExclusive) isColumnRange_EndQualifier()     {}
 
 func (m *ColumnRange) GetStartQualifier() isColumnRange_StartQualifier {
 	if m != nil {
@@ -300,19 +420,6 @@ func (m *ColumnRange) GetStartQualifier() isColumnRange_StartQualifier {
 	}
 	return nil
 }
-func (m *ColumnRange) GetEndQualifier() isColumnRange_EndQualifier {
-	if m != nil {
-		return m.EndQualifier
-	}
-	return nil
-}
-
-func (m *ColumnRange) GetFamilyName() string {
-	if m != nil {
-		return m.FamilyName
-	}
-	return ""
-}
 
 func (m *ColumnRange) GetStartQualifierInclusive() []byte {
 	if x, ok := m.GetStartQualifier().(*ColumnRange_StartQualifierInclusive); ok {
@@ -328,6 +435,29 @@ func (m *ColumnRange) GetStartQualifierExclusive() []byte {
 	return nil
 }
 
+type isColumnRange_EndQualifier interface {
+	isColumnRange_EndQualifier()
+}
+
+type ColumnRange_EndQualifierInclusive struct {
+	EndQualifierInclusive []byte `protobuf:"bytes,4,opt,name=end_qualifier_inclusive,json=endQualifierInclusive,proto3,oneof"`
+}
+
+type ColumnRange_EndQualifierExclusive struct {
+	EndQualifierExclusive []byte `protobuf:"bytes,5,opt,name=end_qualifier_exclusive,json=endQualifierExclusive,proto3,oneof"`
+}
+
+func (*ColumnRange_EndQualifierInclusive) isColumnRange_EndQualifier() {}
+
+func (*ColumnRange_EndQualifierExclusive) isColumnRange_EndQualifier() {}
+
+func (m *ColumnRange) GetEndQualifier() isColumnRange_EndQualifier {
+	if m != nil {
+		return m.EndQualifier
+	}
+	return nil
+}
+
 func (m *ColumnRange) GetEndQualifierInclusive() []byte {
 	if x, ok := m.GetEndQualifier().(*ColumnRange_EndQualifierInclusive); ok {
 		return x.EndQualifierInclusive
@@ -422,11 +552,11 @@ func _ColumnRange_OneofSizer(msg proto.Message) (n int) {
 	// start_qualifier
 	switch x := m.StartQualifier.(type) {
 	case *ColumnRange_StartQualifierInclusive:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartQualifierInclusive)))
 		n += len(x.StartQualifierInclusive)
 	case *ColumnRange_StartQualifierExclusive:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartQualifierExclusive)))
 		n += len(x.StartQualifierExclusive)
 	case nil:
@@ -436,11 +566,11 @@ func _ColumnRange_OneofSizer(msg proto.Message) (n int) {
 	// end_qualifier
 	switch x := m.EndQualifier.(type) {
 	case *ColumnRange_EndQualifierInclusive:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndQualifierInclusive)))
 		n += len(x.EndQualifierInclusive)
 	case *ColumnRange_EndQualifierExclusive:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndQualifierExclusive)))
 		n += len(x.EndQualifierExclusive)
 	case nil:
@@ -453,15 +583,37 @@ func _ColumnRange_OneofSizer(msg proto.Message) (n int) {
 // Specified a contiguous range of microsecond timestamps.
 type TimestampRange struct {
 	// Inclusive lower bound. If left empty, interpreted as 0.
-	StartTimestampMicros int64 `protobuf:"varint,1,opt,name=start_timestamp_micros,json=startTimestampMicros" json:"start_timestamp_micros,omitempty"`
+	StartTimestampMicros int64 `protobuf:"varint,1,opt,name=start_timestamp_micros,json=startTimestampMicros,proto3" json:"start_timestamp_micros,omitempty"`
 	// Exclusive upper bound. If left empty, interpreted as infinity.
-	EndTimestampMicros int64 `protobuf:"varint,2,opt,name=end_timestamp_micros,json=endTimestampMicros" json:"end_timestamp_micros,omitempty"`
+	EndTimestampMicros   int64    `protobuf:"varint,2,opt,name=end_timestamp_micros,json=endTimestampMicros,proto3" json:"end_timestamp_micros,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TimestampRange) Reset()                    { *m = TimestampRange{} }
-func (m *TimestampRange) String() string            { return proto.CompactTextString(m) }
-func (*TimestampRange) ProtoMessage()               {}
-func (*TimestampRange) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *TimestampRange) Reset()         { *m = TimestampRange{} }
+func (m *TimestampRange) String() string { return proto.CompactTextString(m) }
+func (*TimestampRange) ProtoMessage()    {}
+func (*TimestampRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{7}
+}
+func (m *TimestampRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimestampRange.Unmarshal(m, b)
+}
+func (m *TimestampRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimestampRange.Marshal(b, m, deterministic)
+}
+func (dst *TimestampRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampRange.Merge(dst, src)
+}
+func (m *TimestampRange) XXX_Size() int {
+	return xxx_messageInfo_TimestampRange.Size(m)
+}
+func (m *TimestampRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimestampRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TimestampRange proto.InternalMessageInfo
 
 func (m *TimestampRange) GetStartTimestampMicros() int64 {
 	if m != nil {
@@ -492,38 +644,51 @@ type ValueRange struct {
 	// Types that are valid to be assigned to EndValue:
 	//	*ValueRange_EndValueInclusive
 	//	*ValueRange_EndValueExclusive
-	EndValue isValueRange_EndValue `protobuf_oneof:"end_value"`
+	EndValue             isValueRange_EndValue `protobuf_oneof:"end_value"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *ValueRange) Reset()                    { *m = ValueRange{} }
-func (m *ValueRange) String() string            { return proto.CompactTextString(m) }
-func (*ValueRange) ProtoMessage()               {}
-func (*ValueRange) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *ValueRange) Reset()         { *m = ValueRange{} }
+func (m *ValueRange) String() string { return proto.CompactTextString(m) }
+func (*ValueRange) ProtoMessage()    {}
+func (*ValueRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{8}
+}
+func (m *ValueRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ValueRange.Unmarshal(m, b)
+}
+func (m *ValueRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ValueRange.Marshal(b, m, deterministic)
+}
+func (dst *ValueRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValueRange.Merge(dst, src)
+}
+func (m *ValueRange) XXX_Size() int {
+	return xxx_messageInfo_ValueRange.Size(m)
+}
+func (m *ValueRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_ValueRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ValueRange proto.InternalMessageInfo
 
 type isValueRange_StartValue interface {
 	isValueRange_StartValue()
 }
-type isValueRange_EndValue interface {
-	isValueRange_EndValue()
-}
 
 type ValueRange_StartValueInclusive struct {
 	StartValueInclusive []byte `protobuf:"bytes,1,opt,name=start_value_inclusive,json=startValueInclusive,proto3,oneof"`
 }
+
 type ValueRange_StartValueExclusive struct {
 	StartValueExclusive []byte `protobuf:"bytes,2,opt,name=start_value_exclusive,json=startValueExclusive,proto3,oneof"`
 }
-type ValueRange_EndValueInclusive struct {
-	EndValueInclusive []byte `protobuf:"bytes,3,opt,name=end_value_inclusive,json=endValueInclusive,proto3,oneof"`
-}
-type ValueRange_EndValueExclusive struct {
-	EndValueExclusive []byte `protobuf:"bytes,4,opt,name=end_value_exclusive,json=endValueExclusive,proto3,oneof"`
-}
 
 func (*ValueRange_StartValueInclusive) isValueRange_StartValue() {}
+
 func (*ValueRange_StartValueExclusive) isValueRange_StartValue() {}
-func (*ValueRange_EndValueInclusive) isValueRange_EndValue()     {}
-func (*ValueRange_EndValueExclusive) isValueRange_EndValue()     {}
 
 func (m *ValueRange) GetStartValue() isValueRange_StartValue {
 	if m != nil {
@@ -531,12 +696,6 @@ func (m *ValueRange) GetStartValue() isValueRange_StartValue {
 	}
 	return nil
 }
-func (m *ValueRange) GetEndValue() isValueRange_EndValue {
-	if m != nil {
-		return m.EndValue
-	}
-	return nil
-}
 
 func (m *ValueRange) GetStartValueInclusive() []byte {
 	if x, ok := m.GetStartValue().(*ValueRange_StartValueInclusive); ok {
@@ -552,6 +711,29 @@ func (m *ValueRange) GetStartValueExclusive() []byte {
 	return nil
 }
 
+type isValueRange_EndValue interface {
+	isValueRange_EndValue()
+}
+
+type ValueRange_EndValueInclusive struct {
+	EndValueInclusive []byte `protobuf:"bytes,3,opt,name=end_value_inclusive,json=endValueInclusive,proto3,oneof"`
+}
+
+type ValueRange_EndValueExclusive struct {
+	EndValueExclusive []byte `protobuf:"bytes,4,opt,name=end_value_exclusive,json=endValueExclusive,proto3,oneof"`
+}
+
+func (*ValueRange_EndValueInclusive) isValueRange_EndValue() {}
+
+func (*ValueRange_EndValueExclusive) isValueRange_EndValue() {}
+
+func (m *ValueRange) GetEndValue() isValueRange_EndValue {
+	if m != nil {
+		return m.EndValue
+	}
+	return nil
+}
+
 func (m *ValueRange) GetEndValueInclusive() []byte {
 	if x, ok := m.GetEndValue().(*ValueRange_EndValueInclusive); ok {
 		return x.EndValueInclusive
@@ -646,11 +828,11 @@ func _ValueRange_OneofSizer(msg proto.Message) (n int) {
 	// start_value
 	switch x := m.StartValue.(type) {
 	case *ValueRange_StartValueInclusive:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartValueInclusive)))
 		n += len(x.StartValueInclusive)
 	case *ValueRange_StartValueExclusive:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartValueExclusive)))
 		n += len(x.StartValueExclusive)
 	case nil:
@@ -660,11 +842,11 @@ func _ValueRange_OneofSizer(msg proto.Message) (n int) {
 	// end_value
 	switch x := m.EndValue.(type) {
 	case *ValueRange_EndValueInclusive:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndValueInclusive)))
 		n += len(x.EndValueInclusive)
 	case *ValueRange_EndValueExclusive:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndValueExclusive)))
 		n += len(x.EndValueExclusive)
 	case nil:
@@ -731,95 +913,153 @@ type RowFilter struct {
 	//	*RowFilter_CellsPerColumnLimitFilter
 	//	*RowFilter_StripValueTransformer
 	//	*RowFilter_ApplyLabelTransformer
-	Filter isRowFilter_Filter `protobuf_oneof:"filter"`
+	Filter               isRowFilter_Filter `protobuf_oneof:"filter"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *RowFilter) Reset()         { *m = RowFilter{} }
+func (m *RowFilter) String() string { return proto.CompactTextString(m) }
+func (*RowFilter) ProtoMessage()    {}
+func (*RowFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{9}
+}
+func (m *RowFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowFilter.Unmarshal(m, b)
+}
+func (m *RowFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowFilter.Marshal(b, m, deterministic)
+}
+func (dst *RowFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter.Merge(dst, src)
+}
+func (m *RowFilter) XXX_Size() int {
+	return xxx_messageInfo_RowFilter.Size(m)
+}
+func (m *RowFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowFilter.DiscardUnknown(m)
 }
 
-func (m *RowFilter) Reset()                    { *m = RowFilter{} }
-func (m *RowFilter) String() string            { return proto.CompactTextString(m) }
-func (*RowFilter) ProtoMessage()               {}
-func (*RowFilter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_RowFilter proto.InternalMessageInfo
 
 type isRowFilter_Filter interface {
 	isRowFilter_Filter()
 }
 
 type RowFilter_Chain_ struct {
-	Chain *RowFilter_Chain `protobuf:"bytes,1,opt,name=chain,oneof"`
+	Chain *RowFilter_Chain `protobuf:"bytes,1,opt,name=chain,proto3,oneof"`
 }
+
 type RowFilter_Interleave_ struct {
-	Interleave *RowFilter_Interleave `protobuf:"bytes,2,opt,name=interleave,oneof"`
+	Interleave *RowFilter_Interleave `protobuf:"bytes,2,opt,name=interleave,proto3,oneof"`
 }
+
 type RowFilter_Condition_ struct {
-	Condition *RowFilter_Condition `protobuf:"bytes,3,opt,name=condition,oneof"`
+	Condition *RowFilter_Condition `protobuf:"bytes,3,opt,name=condition,proto3,oneof"`
 }
+
 type RowFilter_Sink struct {
-	Sink bool `protobuf:"varint,16,opt,name=sink,oneof"`
+	Sink bool `protobuf:"varint,16,opt,name=sink,proto3,oneof"`
 }
+
 type RowFilter_PassAllFilter struct {
-	PassAllFilter bool `protobuf:"varint,17,opt,name=pass_all_filter,json=passAllFilter,oneof"`
+	PassAllFilter bool `protobuf:"varint,17,opt,name=pass_all_filter,json=passAllFilter,proto3,oneof"`
 }
+
 type RowFilter_BlockAllFilter struct {
-	BlockAllFilter bool `protobuf:"varint,18,opt,name=block_all_filter,json=blockAllFilter,oneof"`
+	BlockAllFilter bool `protobuf:"varint,18,opt,name=block_all_filter,json=blockAllFilter,proto3,oneof"`
 }
+
 type RowFilter_RowKeyRegexFilter struct {
 	RowKeyRegexFilter []byte `protobuf:"bytes,4,opt,name=row_key_regex_filter,json=rowKeyRegexFilter,proto3,oneof"`
 }
+
 type RowFilter_RowSampleFilter struct {
-	RowSampleFilter float64 `protobuf:"fixed64,14,opt,name=row_sample_filter,json=rowSampleFilter,oneof"`
+	RowSampleFilter float64 `protobuf:"fixed64,14,opt,name=row_sample_filter,json=rowSampleFilter,proto3,oneof"`
 }
+
 type RowFilter_FamilyNameRegexFilter struct {
-	FamilyNameRegexFilter string `protobuf:"bytes,5,opt,name=family_name_regex_filter,json=familyNameRegexFilter,oneof"`
+	FamilyNameRegexFilter string `protobuf:"bytes,5,opt,name=family_name_regex_filter,json=familyNameRegexFilter,proto3,oneof"`
 }
+
 type RowFilter_ColumnQualifierRegexFilter struct {
 	ColumnQualifierRegexFilter []byte `protobuf:"bytes,6,opt,name=column_qualifier_regex_filter,json=columnQualifierRegexFilter,proto3,oneof"`
 }
+
 type RowFilter_ColumnRangeFilter struct {
-	ColumnRangeFilter *ColumnRange `protobuf:"bytes,7,opt,name=column_range_filter,json=columnRangeFilter,oneof"`
+	ColumnRangeFilter *ColumnRange `protobuf:"bytes,7,opt,name=column_range_filter,json=columnRangeFilter,proto3,oneof"`
 }
+
 type RowFilter_TimestampRangeFilter struct {
-	TimestampRangeFilter *TimestampRange `protobuf:"bytes,8,opt,name=timestamp_range_filter,json=timestampRangeFilter,oneof"`
+	TimestampRangeFilter *TimestampRange `protobuf:"bytes,8,opt,name=timestamp_range_filter,json=timestampRangeFilter,proto3,oneof"`
 }
+
 type RowFilter_ValueRegexFilter struct {
 	ValueRegexFilter []byte `protobuf:"bytes,9,opt,name=value_regex_filter,json=valueRegexFilter,proto3,oneof"`
 }
+
 type RowFilter_ValueRangeFilter struct {
-	ValueRangeFilter *ValueRange `protobuf:"bytes,15,opt,name=value_range_filter,json=valueRangeFilter,oneof"`
+	ValueRangeFilter *ValueRange `protobuf:"bytes,15,opt,name=value_range_filter,json=valueRangeFilter,proto3,oneof"`
 }
+
 type RowFilter_CellsPerRowOffsetFilter struct {
-	CellsPerRowOffsetFilter int32 `protobuf:"varint,10,opt,name=cells_per_row_offset_filter,json=cellsPerRowOffsetFilter,oneof"`
+	CellsPerRowOffsetFilter int32 `protobuf:"varint,10,opt,name=cells_per_row_offset_filter,json=cellsPerRowOffsetFilter,proto3,oneof"`
 }
+
 type RowFilter_CellsPerRowLimitFilter struct {
-	CellsPerRowLimitFilter int32 `protobuf:"varint,11,opt,name=cells_per_row_limit_filter,json=cellsPerRowLimitFilter,oneof"`
+	CellsPerRowLimitFilter int32 `protobuf:"varint,11,opt,name=cells_per_row_limit_filter,json=cellsPerRowLimitFilter,proto3,oneof"`
 }
+
 type RowFilter_CellsPerColumnLimitFilter struct {
-	CellsPerColumnLimitFilter int32 `protobuf:"varint,12,opt,name=cells_per_column_limit_filter,json=cellsPerColumnLimitFilter,oneof"`
+	CellsPerColumnLimitFilter int32 `protobuf:"varint,12,opt,name=cells_per_column_limit_filter,json=cellsPerColumnLimitFilter,proto3,oneof"`
 }
+
 type RowFilter_StripValueTransformer struct {
-	StripValueTransformer bool `protobuf:"varint,13,opt,name=strip_value_transformer,json=stripValueTransformer,oneof"`
+	StripValueTransformer bool `protobuf:"varint,13,opt,name=strip_value_transformer,json=stripValueTransformer,proto3,oneof"`
 }
+
 type RowFilter_ApplyLabelTransformer struct {
-	ApplyLabelTransformer string `protobuf:"bytes,19,opt,name=apply_label_transformer,json=applyLabelTransformer,oneof"`
-}
-
-func (*RowFilter_Chain_) isRowFilter_Filter()                     {}
-func (*RowFilter_Interleave_) isRowFilter_Filter()                {}
-func (*RowFilter_Condition_) isRowFilter_Filter()                 {}
-func (*RowFilter_Sink) isRowFilter_Filter()                       {}
-func (*RowFilter_PassAllFilter) isRowFilter_Filter()              {}
-func (*RowFilter_BlockAllFilter) isRowFilter_Filter()             {}
-func (*RowFilter_RowKeyRegexFilter) isRowFilter_Filter()          {}
-func (*RowFilter_RowSampleFilter) isRowFilter_Filter()            {}
-func (*RowFilter_FamilyNameRegexFilter) isRowFilter_Filter()      {}
+	ApplyLabelTransformer string `protobuf:"bytes,19,opt,name=apply_label_transformer,json=applyLabelTransformer,proto3,oneof"`
+}
+
+func (*RowFilter_Chain_) isRowFilter_Filter() {}
+
+func (*RowFilter_Interleave_) isRowFilter_Filter() {}
+
+func (*RowFilter_Condition_) isRowFilter_Filter() {}
+
+func (*RowFilter_Sink) isRowFilter_Filter() {}
+
+func (*RowFilter_PassAllFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_BlockAllFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_RowKeyRegexFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_RowSampleFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_FamilyNameRegexFilter) isRowFilter_Filter() {}
+
 func (*RowFilter_ColumnQualifierRegexFilter) isRowFilter_Filter() {}
-func (*RowFilter_ColumnRangeFilter) isRowFilter_Filter()          {}
-func (*RowFilter_TimestampRangeFilter) isRowFilter_Filter()       {}
-func (*RowFilter_ValueRegexFilter) isRowFilter_Filter()           {}
-func (*RowFilter_ValueRangeFilter) isRowFilter_Filter()           {}
-func (*RowFilter_CellsPerRowOffsetFilter) isRowFilter_Filter()    {}
-func (*RowFilter_CellsPerRowLimitFilter) isRowFilter_Filter()     {}
-func (*RowFilter_CellsPerColumnLimitFilter) isRowFilter_Filter()  {}
-func (*RowFilter_StripValueTransformer) isRowFilter_Filter()      {}
-func (*RowFilter_ApplyLabelTransformer) isRowFilter_Filter()      {}
+
+func (*RowFilter_ColumnRangeFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_TimestampRangeFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_ValueRegexFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_ValueRangeFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_CellsPerRowOffsetFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_CellsPerRowLimitFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_CellsPerColumnLimitFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_StripValueTransformer) isRowFilter_Filter() {}
+
+func (*RowFilter_ApplyLabelTransformer) isRowFilter_Filter() {}
 
 func (m *RowFilter) GetFilter() isRowFilter_Filter {
 	if m != nil {
@@ -1235,76 +1475,76 @@ func _RowFilter_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Filter.(type) {
 	case *RowFilter_Chain_:
 		s := proto.Size(x.Chain)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_Interleave_:
 		s := proto.Size(x.Interleave)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_Condition_:
 		s := proto.Size(x.Condition)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_Sink:
-		n += proto.SizeVarint(16<<3 | proto.WireVarint)
+		n += 2 // tag and wire
 		n += 1
 	case *RowFilter_PassAllFilter:
-		n += proto.SizeVarint(17<<3 | proto.WireVarint)
+		n += 2 // tag and wire
 		n += 1
 	case *RowFilter_BlockAllFilter:
-		n += proto.SizeVarint(18<<3 | proto.WireVarint)
+		n += 2 // tag and wire
 		n += 1
 	case *RowFilter_RowKeyRegexFilter:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RowKeyRegexFilter)))
 		n += len(x.RowKeyRegexFilter)
 	case *RowFilter_RowSampleFilter:
-		n += proto.SizeVarint(14<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *RowFilter_FamilyNameRegexFilter:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.FamilyNameRegexFilter)))
 		n += len(x.FamilyNameRegexFilter)
 	case *RowFilter_ColumnQualifierRegexFilter:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ColumnQualifierRegexFilter)))
 		n += len(x.ColumnQualifierRegexFilter)
 	case *RowFilter_ColumnRangeFilter:
 		s := proto.Size(x.ColumnRangeFilter)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_TimestampRangeFilter:
 		s := proto.Size(x.TimestampRangeFilter)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_ValueRegexFilter:
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ValueRegexFilter)))
 		n += len(x.ValueRegexFilter)
 	case *RowFilter_ValueRangeFilter:
 		s := proto.Size(x.ValueRangeFilter)
-		n += proto.SizeVarint(15<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_CellsPerRowOffsetFilter:
-		n += proto.SizeVarint(10<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.CellsPerRowOffsetFilter))
 	case *RowFilter_CellsPerRowLimitFilter:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.CellsPerRowLimitFilter))
 	case *RowFilter_CellsPerColumnLimitFilter:
-		n += proto.SizeVarint(12<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.CellsPerColumnLimitFilter))
 	case *RowFilter_StripValueTransformer:
-		n += proto.SizeVarint(13<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *RowFilter_ApplyLabelTransformer:
-		n += proto.SizeVarint(19<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ApplyLabelTransformer)))
 		n += len(x.ApplyLabelTransformer)
 	case nil:
@@ -1319,13 +1559,35 @@ type RowFilter_Chain struct {
 	// The elements of "filters" are chained together to process the input row:
 	// in row -> f(0) -> intermediate row -> f(1) -> ... -> f(N) -> out row
 	// The full chain is executed atomically.
-	Filters []*RowFilter `protobuf:"bytes,1,rep,name=filters" json:"filters,omitempty"`
+	Filters              []*RowFilter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *RowFilter_Chain) Reset()                    { *m = RowFilter_Chain{} }
-func (m *RowFilter_Chain) String() string            { return proto.CompactTextString(m) }
-func (*RowFilter_Chain) ProtoMessage()               {}
-func (*RowFilter_Chain) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
+func (m *RowFilter_Chain) Reset()         { *m = RowFilter_Chain{} }
+func (m *RowFilter_Chain) String() string { return proto.CompactTextString(m) }
+func (*RowFilter_Chain) ProtoMessage()    {}
+func (*RowFilter_Chain) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{9, 0}
+}
+func (m *RowFilter_Chain) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowFilter_Chain.Unmarshal(m, b)
+}
+func (m *RowFilter_Chain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowFilter_Chain.Marshal(b, m, deterministic)
+}
+func (dst *RowFilter_Chain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Chain.Merge(dst, src)
+}
+func (m *RowFilter_Chain) XXX_Size() int {
+	return xxx_messageInfo_RowFilter_Chain.Size(m)
+}
+func (m *RowFilter_Chain) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowFilter_Chain.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RowFilter_Chain proto.InternalMessageInfo
 
 func (m *RowFilter_Chain) GetFilters() []*RowFilter {
 	if m != nil {
@@ -1361,13 +1623,35 @@ type RowFilter_Interleave struct {
 	// 5:                        far,blah,5,x     // identical to #6
 	// 6:                        far,blah,5,x     // identical to #5
 	// All interleaved filters are executed atomically.
-	Filters []*RowFilter `protobuf:"bytes,1,rep,name=filters" json:"filters,omitempty"`
+	Filters              []*RowFilter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *RowFilter_Interleave) Reset()                    { *m = RowFilter_Interleave{} }
-func (m *RowFilter_Interleave) String() string            { return proto.CompactTextString(m) }
-func (*RowFilter_Interleave) ProtoMessage()               {}
-func (*RowFilter_Interleave) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 1} }
+func (m *RowFilter_Interleave) Reset()         { *m = RowFilter_Interleave{} }
+func (m *RowFilter_Interleave) String() string { return proto.CompactTextString(m) }
+func (*RowFilter_Interleave) ProtoMessage()    {}
+func (*RowFilter_Interleave) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{9, 1}
+}
+func (m *RowFilter_Interleave) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowFilter_Interleave.Unmarshal(m, b)
+}
+func (m *RowFilter_Interleave) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowFilter_Interleave.Marshal(b, m, deterministic)
+}
+func (dst *RowFilter_Interleave) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Interleave.Merge(dst, src)
+}
+func (m *RowFilter_Interleave) XXX_Size() int {
+	return xxx_messageInfo_RowFilter_Interleave.Size(m)
+}
+func (m *RowFilter_Interleave) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowFilter_Interleave.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RowFilter_Interleave proto.InternalMessageInfo
 
 func (m *RowFilter_Interleave) GetFilters() []*RowFilter {
 	if m != nil {
@@ -1386,20 +1670,42 @@ func (m *RowFilter_Interleave) GetFilters() []*RowFilter {
 type RowFilter_Condition struct {
 	// If "predicate_filter" outputs any cells, then "true_filter" will be
 	// evaluated on the input row. Otherwise, "false_filter" will be evaluated.
-	PredicateFilter *RowFilter `protobuf:"bytes,1,opt,name=predicate_filter,json=predicateFilter" json:"predicate_filter,omitempty"`
+	PredicateFilter *RowFilter `protobuf:"bytes,1,opt,name=predicate_filter,json=predicateFilter,proto3" json:"predicate_filter,omitempty"`
 	// The filter to apply to the input row if "predicate_filter" returns any
 	// results. If not provided, no results will be returned in the true case.
-	TrueFilter *RowFilter `protobuf:"bytes,2,opt,name=true_filter,json=trueFilter" json:"true_filter,omitempty"`
+	TrueFilter *RowFilter `protobuf:"bytes,2,opt,name=true_filter,json=trueFilter,proto3" json:"true_filter,omitempty"`
 	// The filter to apply to the input row if "predicate_filter" does not
 	// return any results. If not provided, no results will be returned in the
 	// false case.
-	FalseFilter *RowFilter `protobuf:"bytes,3,opt,name=false_filter,json=falseFilter" json:"false_filter,omitempty"`
+	FalseFilter          *RowFilter `protobuf:"bytes,3,opt,name=false_filter,json=falseFilter,proto3" json:"false_filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *RowFilter_Condition) Reset()         { *m = RowFilter_Condition{} }
+func (m *RowFilter_Condition) String() string { return proto.CompactTextString(m) }
+func (*RowFilter_Condition) ProtoMessage()    {}
+func (*RowFilter_Condition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{9, 2}
+}
+func (m *RowFilter_Condition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowFilter_Condition.Unmarshal(m, b)
+}
+func (m *RowFilter_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowFilter_Condition.Marshal(b, m, deterministic)
+}
+func (dst *RowFilter_Condition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Condition.Merge(dst, src)
+}
+func (m *RowFilter_Condition) XXX_Size() int {
+	return xxx_messageInfo_RowFilter_Condition.Size(m)
+}
+func (m *RowFilter_Condition) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowFilter_Condition.DiscardUnknown(m)
 }
 
-func (m *RowFilter_Condition) Reset()                    { *m = RowFilter_Condition{} }
-func (m *RowFilter_Condition) String() string            { return proto.CompactTextString(m) }
-func (*RowFilter_Condition) ProtoMessage()               {}
-func (*RowFilter_Condition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 2} }
+var xxx_messageInfo_RowFilter_Condition proto.InternalMessageInfo
 
 func (m *RowFilter_Condition) GetPredicateFilter() *RowFilter {
 	if m != nil {
@@ -1431,35 +1737,63 @@ type Mutation struct {
 	//	*Mutation_DeleteFromColumn_
 	//	*Mutation_DeleteFromFamily_
 	//	*Mutation_DeleteFromRow_
-	Mutation isMutation_Mutation `protobuf_oneof:"mutation"`
+	Mutation             isMutation_Mutation `protobuf_oneof:"mutation"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *Mutation) Reset()                    { *m = Mutation{} }
-func (m *Mutation) String() string            { return proto.CompactTextString(m) }
-func (*Mutation) ProtoMessage()               {}
-func (*Mutation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *Mutation) Reset()         { *m = Mutation{} }
+func (m *Mutation) String() string { return proto.CompactTextString(m) }
+func (*Mutation) ProtoMessage()    {}
+func (*Mutation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{10}
+}
+func (m *Mutation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation.Unmarshal(m, b)
+}
+func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
+}
+func (dst *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(dst, src)
+}
+func (m *Mutation) XXX_Size() int {
+	return xxx_messageInfo_Mutation.Size(m)
+}
+func (m *Mutation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation proto.InternalMessageInfo
 
 type isMutation_Mutation interface {
 	isMutation_Mutation()
 }
 
 type Mutation_SetCell_ struct {
-	SetCell *Mutation_SetCell `protobuf:"bytes,1,opt,name=set_cell,json=setCell,oneof"`
+	SetCell *Mutation_SetCell `protobuf:"bytes,1,opt,name=set_cell,json=setCell,proto3,oneof"`
 }
+
 type Mutation_DeleteFromColumn_ struct {
-	DeleteFromColumn *Mutation_DeleteFromColumn `protobuf:"bytes,2,opt,name=delete_from_column,json=deleteFromColumn,oneof"`
+	DeleteFromColumn *Mutation_DeleteFromColumn `protobuf:"bytes,2,opt,name=delete_from_column,json=deleteFromColumn,proto3,oneof"`
 }
+
 type Mutation_DeleteFromFamily_ struct {
-	DeleteFromFamily *Mutation_DeleteFromFamily `protobuf:"bytes,3,opt,name=delete_from_family,json=deleteFromFamily,oneof"`
+	DeleteFromFamily *Mutation_DeleteFromFamily `protobuf:"bytes,3,opt,name=delete_from_family,json=deleteFromFamily,proto3,oneof"`
 }
+
 type Mutation_DeleteFromRow_ struct {
-	DeleteFromRow *Mutation_DeleteFromRow `protobuf:"bytes,4,opt,name=delete_from_row,json=deleteFromRow,oneof"`
+	DeleteFromRow *Mutation_DeleteFromRow `protobuf:"bytes,4,opt,name=delete_from_row,json=deleteFromRow,proto3,oneof"`
 }
 
-func (*Mutation_SetCell_) isMutation_Mutation()          {}
+func (*Mutation_SetCell_) isMutation_Mutation() {}
+
 func (*Mutation_DeleteFromColumn_) isMutation_Mutation() {}
+
 func (*Mutation_DeleteFromFamily_) isMutation_Mutation() {}
-func (*Mutation_DeleteFromRow_) isMutation_Mutation()    {}
+
+func (*Mutation_DeleteFromRow_) isMutation_Mutation() {}
 
 func (m *Mutation) GetMutation() isMutation_Mutation {
 	if m != nil {
@@ -1583,22 +1917,22 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Mutation.(type) {
 	case *Mutation_SetCell_:
 		s := proto.Size(x.SetCell)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_DeleteFromColumn_:
 		s := proto.Size(x.DeleteFromColumn)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_DeleteFromFamily_:
 		s := proto.Size(x.DeleteFromFamily)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_DeleteFromRow_:
 		s := proto.Size(x.DeleteFromRow)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1612,7 +1946,7 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 type Mutation_SetCell struct {
 	// The name of the family into which new data should be written.
 	// Must match [-_.a-zA-Z0-9]+
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The qualifier of the column into which new data should be written.
 	// Can be any byte string, including the empty string.
 	ColumnQualifier []byte `protobuf:"bytes,2,opt,name=column_qualifier,json=columnQualifier,proto3" json:"column_qualifier,omitempty"`
@@ -1621,15 +1955,37 @@ type Mutation_SetCell struct {
 	// Otherwise, the client should set this value itself, noting that the
 	// default value is a timestamp of zero if the field is left unspecified.
 	// Values must match the "granularity" of the table (e.g. micros, millis).
-	TimestampMicros int64 `protobuf:"varint,3,opt,name=timestamp_micros,json=timestampMicros" json:"timestamp_micros,omitempty"`
+	TimestampMicros int64 `protobuf:"varint,3,opt,name=timestamp_micros,json=timestampMicros,proto3" json:"timestamp_micros,omitempty"`
 	// The value to be written into the specified cell.
-	Value []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
+	Value                []byte   `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Mutation_SetCell) Reset()                    { *m = Mutation_SetCell{} }
-func (m *Mutation_SetCell) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_SetCell) ProtoMessage()               {}
-func (*Mutation_SetCell) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 0} }
+func (m *Mutation_SetCell) Reset()         { *m = Mutation_SetCell{} }
+func (m *Mutation_SetCell) String() string { return proto.CompactTextString(m) }
+func (*Mutation_SetCell) ProtoMessage()    {}
+func (*Mutation_SetCell) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{10, 0}
+}
+func (m *Mutation_SetCell) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_SetCell.Unmarshal(m, b)
+}
+func (m *Mutation_SetCell) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_SetCell.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_SetCell) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_SetCell.Merge(dst, src)
+}
+func (m *Mutation_SetCell) XXX_Size() int {
+	return xxx_messageInfo_Mutation_SetCell.Size(m)
+}
+func (m *Mutation_SetCell) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_SetCell.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation_SetCell proto.InternalMessageInfo
 
 func (m *Mutation_SetCell) GetFamilyName() string {
 	if m != nil {
@@ -1664,18 +2020,40 @@ func (m *Mutation_SetCell) GetValue() []byte {
 type Mutation_DeleteFromColumn struct {
 	// The name of the family from which cells should be deleted.
 	// Must match [-_.a-zA-Z0-9]+
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The qualifier of the column from which cells should be deleted.
 	// Can be any byte string, including the empty string.
 	ColumnQualifier []byte `protobuf:"bytes,2,opt,name=column_qualifier,json=columnQualifier,proto3" json:"column_qualifier,omitempty"`
 	// The range of timestamps within which cells should be deleted.
-	TimeRange *TimestampRange `protobuf:"bytes,3,opt,name=time_range,json=timeRange" json:"time_range,omitempty"`
+	TimeRange            *TimestampRange `protobuf:"bytes,3,opt,name=time_range,json=timeRange,proto3" json:"time_range,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *Mutation_DeleteFromColumn) Reset()                    { *m = Mutation_DeleteFromColumn{} }
-func (m *Mutation_DeleteFromColumn) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_DeleteFromColumn) ProtoMessage()               {}
-func (*Mutation_DeleteFromColumn) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 1} }
+func (m *Mutation_DeleteFromColumn) Reset()         { *m = Mutation_DeleteFromColumn{} }
+func (m *Mutation_DeleteFromColumn) String() string { return proto.CompactTextString(m) }
+func (*Mutation_DeleteFromColumn) ProtoMessage()    {}
+func (*Mutation_DeleteFromColumn) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{10, 1}
+}
+func (m *Mutation_DeleteFromColumn) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_DeleteFromColumn.Unmarshal(m, b)
+}
+func (m *Mutation_DeleteFromColumn) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_DeleteFromColumn.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_DeleteFromColumn) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromColumn.Merge(dst, src)
+}
+func (m *Mutation_DeleteFromColumn) XXX_Size() int {
+	return xxx_messageInfo_Mutation_DeleteFromColumn.Size(m)
+}
+func (m *Mutation_DeleteFromColumn) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_DeleteFromColumn.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation_DeleteFromColumn proto.InternalMessageInfo
 
 func (m *Mutation_DeleteFromColumn) GetFamilyName() string {
 	if m != nil {
@@ -1702,13 +2080,35 @@ func (m *Mutation_DeleteFromColumn) GetTimeRange() *TimestampRange {
 type Mutation_DeleteFromFamily struct {
 	// The name of the family from which cells should be deleted.
 	// Must match [-_.a-zA-Z0-9]+
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName           string   `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Mutation_DeleteFromFamily) Reset()         { *m = Mutation_DeleteFromFamily{} }
+func (m *Mutation_DeleteFromFamily) String() string { return proto.CompactTextString(m) }
+func (*Mutation_DeleteFromFamily) ProtoMessage()    {}
+func (*Mutation_DeleteFromFamily) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{10, 2}
+}
+func (m *Mutation_DeleteFromFamily) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_DeleteFromFamily.Unmarshal(m, b)
+}
+func (m *Mutation_DeleteFromFamily) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_DeleteFromFamily.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_DeleteFromFamily) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromFamily.Merge(dst, src)
+}
+func (m *Mutation_DeleteFromFamily) XXX_Size() int {
+	return xxx_messageInfo_Mutation_DeleteFromFamily.Size(m)
+}
+func (m *Mutation_DeleteFromFamily) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_DeleteFromFamily.DiscardUnknown(m)
 }
 
-func (m *Mutation_DeleteFromFamily) Reset()                    { *m = Mutation_DeleteFromFamily{} }
-func (m *Mutation_DeleteFromFamily) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_DeleteFromFamily) ProtoMessage()               {}
-func (*Mutation_DeleteFromFamily) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 2} }
+var xxx_messageInfo_Mutation_DeleteFromFamily proto.InternalMessageInfo
 
 func (m *Mutation_DeleteFromFamily) GetFamilyName() string {
 	if m != nil {
@@ -1719,19 +2119,41 @@ func (m *Mutation_DeleteFromFamily) GetFamilyName() string {
 
 // A Mutation which deletes all cells from the containing row.
 type Mutation_DeleteFromRow struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Mutation_DeleteFromRow) Reset()                    { *m = Mutation_DeleteFromRow{} }
-func (m *Mutation_DeleteFromRow) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_DeleteFromRow) ProtoMessage()               {}
-func (*Mutation_DeleteFromRow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 3} }
+func (m *Mutation_DeleteFromRow) Reset()         { *m = Mutation_DeleteFromRow{} }
+func (m *Mutation_DeleteFromRow) String() string { return proto.CompactTextString(m) }
+func (*Mutation_DeleteFromRow) ProtoMessage()    {}
+func (*Mutation_DeleteFromRow) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{10, 3}
+}
+func (m *Mutation_DeleteFromRow) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_DeleteFromRow.Unmarshal(m, b)
+}
+func (m *Mutation_DeleteFromRow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_DeleteFromRow.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_DeleteFromRow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromRow.Merge(dst, src)
+}
+func (m *Mutation_DeleteFromRow) XXX_Size() int {
+	return xxx_messageInfo_Mutation_DeleteFromRow.Size(m)
+}
+func (m *Mutation_DeleteFromRow) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_DeleteFromRow.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation_DeleteFromRow proto.InternalMessageInfo
 
 // Specifies an atomic read/modify/write operation on the latest value of the
 // specified column.
 type ReadModifyWriteRule struct {
 	// The name of the family to which the read/modify/write should be applied.
 	// Must match [-_.a-zA-Z0-9]+
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The qualifier of the column to which the read/modify/write should be
 	// applied.
 	// Can be any byte string, including the empty string.
@@ -1742,13 +2164,49 @@ type ReadModifyWriteRule struct {
 	// Types that are valid to be assigned to Rule:
 	//	*ReadModifyWriteRule_AppendValue
 	//	*ReadModifyWriteRule_IncrementAmount
-	Rule isReadModifyWriteRule_Rule `protobuf_oneof:"rule"`
+	Rule                 isReadModifyWriteRule_Rule `protobuf_oneof:"rule"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *ReadModifyWriteRule) Reset()         { *m = ReadModifyWriteRule{} }
+func (m *ReadModifyWriteRule) String() string { return proto.CompactTextString(m) }
+func (*ReadModifyWriteRule) ProtoMessage()    {}
+func (*ReadModifyWriteRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_data_97ae07dac133c199, []int{11}
+}
+func (m *ReadModifyWriteRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadModifyWriteRule.Unmarshal(m, b)
+}
+func (m *ReadModifyWriteRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadModifyWriteRule.Marshal(b, m, deterministic)
+}
+func (dst *ReadModifyWriteRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRule.Merge(dst, src)
+}
+func (m *ReadModifyWriteRule) XXX_Size() int {
+	return xxx_messageInfo_ReadModifyWriteRule.Size(m)
+}
+func (m *ReadModifyWriteRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadModifyWriteRule.DiscardUnknown(m)
 }
 
-func (m *ReadModifyWriteRule) Reset()                    { *m = ReadModifyWriteRule{} }
-func (m *ReadModifyWriteRule) String() string            { return proto.CompactTextString(m) }
-func (*ReadModifyWriteRule) ProtoMessage()               {}
-func (*ReadModifyWriteRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_ReadModifyWriteRule proto.InternalMessageInfo
+
+func (m *ReadModifyWriteRule) GetFamilyName() string {
+	if m != nil {
+		return m.FamilyName
+	}
+	return ""
+}
+
+func (m *ReadModifyWriteRule) GetColumnQualifier() []byte {
+	if m != nil {
+		return m.ColumnQualifier
+	}
+	return nil
+}
 
 type isReadModifyWriteRule_Rule interface {
 	isReadModifyWriteRule_Rule()
@@ -1757,11 +2215,13 @@ type isReadModifyWriteRule_Rule interface {
 type ReadModifyWriteRule_AppendValue struct {
 	AppendValue []byte `protobuf:"bytes,3,opt,name=append_value,json=appendValue,proto3,oneof"`
 }
+
 type ReadModifyWriteRule_IncrementAmount struct {
-	IncrementAmount int64 `protobuf:"varint,4,opt,name=increment_amount,json=incrementAmount,oneof"`
+	IncrementAmount int64 `protobuf:"varint,4,opt,name=increment_amount,json=incrementAmount,proto3,oneof"`
 }
 
-func (*ReadModifyWriteRule_AppendValue) isReadModifyWriteRule_Rule()     {}
+func (*ReadModifyWriteRule_AppendValue) isReadModifyWriteRule_Rule() {}
+
 func (*ReadModifyWriteRule_IncrementAmount) isReadModifyWriteRule_Rule() {}
 
 func (m *ReadModifyWriteRule) GetRule() isReadModifyWriteRule_Rule {
@@ -1771,20 +2231,6 @@ func (m *ReadModifyWriteRule) GetRule() isReadModifyWriteRule_Rule {
 	return nil
 }
 
-func (m *ReadModifyWriteRule) GetFamilyName() string {
-	if m != nil {
-		return m.FamilyName
-	}
-	return ""
-}
-
-func (m *ReadModifyWriteRule) GetColumnQualifier() []byte {
-	if m != nil {
-		return m.ColumnQualifier
-	}
-	return nil
-}
-
 func (m *ReadModifyWriteRule) GetAppendValue() []byte {
 	if x, ok := m.GetRule().(*ReadModifyWriteRule_AppendValue); ok {
 		return x.AppendValue
@@ -1851,11 +2297,11 @@ func _ReadModifyWriteRule_OneofSizer(msg proto.Message) (n int) {
 	// rule
 	switch x := m.Rule.(type) {
 	case *ReadModifyWriteRule_AppendValue:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AppendValue)))
 		n += len(x.AppendValue)
 	case *ReadModifyWriteRule_IncrementAmount:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.IncrementAmount))
 	case nil:
 	default:
@@ -1886,9 +2332,11 @@ func init() {
 	proto.RegisterType((*ReadModifyWriteRule)(nil), "google.bigtable.v1.ReadModifyWriteRule")
 }
 
-func init() { proto.RegisterFile("google/bigtable/v1/bigtable_data.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/bigtable/v1/bigtable_data.proto", fileDescriptor_bigtable_data_97ae07dac133c199)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_bigtable_data_97ae07dac133c199 = []byte{
 	// 1378 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdb, 0x6e, 0x1b, 0x37,
 	0x13, 0xd6, 0x5a, 0xb2, 0x0e, 0xb3, 0x76, 0x24, 0xd3, 0x27, 0x45, 0x49, 0xfe, 0x18, 0xca, 0x8f,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_service.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_service.pb.go
index bf22713c..91b5ed41 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_service.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_service.proto
 
-package bigtable
+package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -19,6 +19,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -27,8 +33,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for BigtableService service
-
+// BigtableServiceClient is the client API for BigtableService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type BigtableServiceClient interface {
 	// Streams back the contents of all requested rows, optionally applying
 	// the same Reader filter to each. Depending on their size, rows may be
@@ -42,7 +49,7 @@ type BigtableServiceClient interface {
 	SampleRowKeys(ctx context.Context, in *SampleRowKeysRequest, opts ...grpc.CallOption) (BigtableService_SampleRowKeysClient, error)
 	// Mutates a row atomically. Cells already present in the row are left
 	// unchanged unless explicitly changed by 'mutation'.
-	MutateRow(ctx context.Context, in *MutateRowRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	MutateRow(ctx context.Context, in *MutateRowRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Mutates multiple rows in a batch. Each individual row is mutated
 	// atomically as in MutateRow, but the entire batch is not executed
 	// atomically.
@@ -65,7 +72,7 @@ func NewBigtableServiceClient(cc *grpc.ClientConn) BigtableServiceClient {
 }
 
 func (c *bigtableServiceClient) ReadRows(ctx context.Context, in *ReadRowsRequest, opts ...grpc.CallOption) (BigtableService_ReadRowsClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_BigtableService_serviceDesc.Streams[0], c.cc, "/google.bigtable.v1.BigtableService/ReadRows", opts...)
+	stream, err := c.cc.NewStream(ctx, &_BigtableService_serviceDesc.Streams[0], "/google.bigtable.v1.BigtableService/ReadRows", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -97,7 +104,7 @@ func (x *bigtableServiceReadRowsClient) Recv() (*ReadRowsResponse, error) {
 }
 
 func (c *bigtableServiceClient) SampleRowKeys(ctx context.Context, in *SampleRowKeysRequest, opts ...grpc.CallOption) (BigtableService_SampleRowKeysClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_BigtableService_serviceDesc.Streams[1], c.cc, "/google.bigtable.v1.BigtableService/SampleRowKeys", opts...)
+	stream, err := c.cc.NewStream(ctx, &_BigtableService_serviceDesc.Streams[1], "/google.bigtable.v1.BigtableService/SampleRowKeys", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -128,9 +135,9 @@ func (x *bigtableServiceSampleRowKeysClient) Recv() (*SampleRowKeysResponse, err
 	return m, nil
 }
 
-func (c *bigtableServiceClient) MutateRow(ctx context.Context, in *MutateRowRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.bigtable.v1.BigtableService/MutateRow", in, out, c.cc, opts...)
+func (c *bigtableServiceClient) MutateRow(ctx context.Context, in *MutateRowRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.bigtable.v1.BigtableService/MutateRow", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -139,7 +146,7 @@ func (c *bigtableServiceClient) MutateRow(ctx context.Context, in *MutateRowRequ
 
 func (c *bigtableServiceClient) MutateRows(ctx context.Context, in *MutateRowsRequest, opts ...grpc.CallOption) (*MutateRowsResponse, error) {
 	out := new(MutateRowsResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.v1.BigtableService/MutateRows", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.v1.BigtableService/MutateRows", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -148,7 +155,7 @@ func (c *bigtableServiceClient) MutateRows(ctx context.Context, in *MutateRowsRe
 
 func (c *bigtableServiceClient) CheckAndMutateRow(ctx context.Context, in *CheckAndMutateRowRequest, opts ...grpc.CallOption) (*CheckAndMutateRowResponse, error) {
 	out := new(CheckAndMutateRowResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.v1.BigtableService/CheckAndMutateRow", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.v1.BigtableService/CheckAndMutateRow", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -157,15 +164,14 @@ func (c *bigtableServiceClient) CheckAndMutateRow(ctx context.Context, in *Check
 
 func (c *bigtableServiceClient) ReadModifyWriteRow(ctx context.Context, in *ReadModifyWriteRowRequest, opts ...grpc.CallOption) (*Row, error) {
 	out := new(Row)
-	err := grpc.Invoke(ctx, "/google.bigtable.v1.BigtableService/ReadModifyWriteRow", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.v1.BigtableService/ReadModifyWriteRow", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for BigtableService service
-
+// BigtableServiceServer is the server API for BigtableService service.
 type BigtableServiceServer interface {
 	// Streams back the contents of all requested rows, optionally applying
 	// the same Reader filter to each. Depending on their size, rows may be
@@ -179,7 +185,7 @@ type BigtableServiceServer interface {
 	SampleRowKeys(*SampleRowKeysRequest, BigtableService_SampleRowKeysServer) error
 	// Mutates a row atomically. Cells already present in the row are left
 	// unchanged unless explicitly changed by 'mutation'.
-	MutateRow(context.Context, *MutateRowRequest) (*google_protobuf2.Empty, error)
+	MutateRow(context.Context, *MutateRowRequest) (*empty.Empty, error)
 	// Mutates multiple rows in a batch. Each individual row is mutated
 	// atomically as in MutateRow, but the entire batch is not executed
 	// atomically.
@@ -347,9 +353,11 @@ var _BigtableService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/bigtable/v1/bigtable_service.proto",
 }
 
-func init() { proto.RegisterFile("google/bigtable/v1/bigtable_service.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/bigtable/v1/bigtable_service.proto", fileDescriptor_bigtable_service_ae822d62962d408a)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_bigtable_service_ae822d62962d408a = []byte{
 	// 521 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcd, 0x6e, 0xd4, 0x30,
 	0x10, 0xc7, 0x65, 0x0e, 0xa8, 0x58, 0x42, 0x08, 0x4b, 0x14, 0x69, 0xe1, 0x14, 0xa0, 0xa2, 0x11,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_service_messages.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_service_messages.pb.go
index 763b83c2..1e78b23c 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_service_messages.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/v1/bigtable_service_messages.pb.go
@@ -1,22 +1,28 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v1/bigtable_service_messages.proto
 
-package bigtable
+package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Request message for BigtableServer.ReadRows.
 type ReadRowsRequest struct {
 	// The unique name of the table from which to read.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// If neither row_key nor row_range is set, reads from all rows.
 	//
 	// Types that are valid to be assigned to Target:
@@ -26,24 +32,53 @@ type ReadRowsRequest struct {
 	Target isReadRowsRequest_Target `protobuf_oneof:"target"`
 	// The filter to apply to the contents of the specified row(s). If unset,
 	// reads the entire table.
-	Filter *RowFilter `protobuf:"bytes,5,opt,name=filter" json:"filter,omitempty"`
+	Filter *RowFilter `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
 	// By default, rows are read sequentially, producing results which are
 	// guaranteed to arrive in increasing row order. Setting
 	// "allow_row_interleaving" to true allows multiple rows to be interleaved in
 	// the response stream, which increases throughput but breaks this guarantee,
 	// and may force the client to use more memory to buffer partially-received
 	// rows. Cannot be set to true when specifying "num_rows_limit".
-	AllowRowInterleaving bool `protobuf:"varint,6,opt,name=allow_row_interleaving,json=allowRowInterleaving" json:"allow_row_interleaving,omitempty"`
+	AllowRowInterleaving bool `protobuf:"varint,6,opt,name=allow_row_interleaving,json=allowRowInterleaving,proto3" json:"allow_row_interleaving,omitempty"`
 	// The read will terminate after committing to N rows' worth of results. The
 	// default (zero) is to return all results.
 	// Note that "allow_row_interleaving" cannot be set to true when this is set.
-	NumRowsLimit int64 `protobuf:"varint,7,opt,name=num_rows_limit,json=numRowsLimit" json:"num_rows_limit,omitempty"`
+	NumRowsLimit         int64    `protobuf:"varint,7,opt,name=num_rows_limit,json=numRowsLimit,proto3" json:"num_rows_limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReadRowsRequest) Reset()         { *m = ReadRowsRequest{} }
+func (m *ReadRowsRequest) String() string { return proto.CompactTextString(m) }
+func (*ReadRowsRequest) ProtoMessage()    {}
+func (*ReadRowsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{0}
+}
+func (m *ReadRowsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadRowsRequest.Unmarshal(m, b)
+}
+func (m *ReadRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadRowsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReadRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsRequest.Merge(dst, src)
+}
+func (m *ReadRowsRequest) XXX_Size() int {
+	return xxx_messageInfo_ReadRowsRequest.Size(m)
 }
+func (m *ReadRowsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadRowsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReadRowsRequest proto.InternalMessageInfo
 
-func (m *ReadRowsRequest) Reset()                    { *m = ReadRowsRequest{} }
-func (m *ReadRowsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReadRowsRequest) ProtoMessage()               {}
-func (*ReadRowsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (m *ReadRowsRequest) GetTableName() string {
+	if m != nil {
+		return m.TableName
+	}
+	return ""
+}
 
 type isReadRowsRequest_Target interface {
 	isReadRowsRequest_Target()
@@ -52,16 +87,20 @@ type isReadRowsRequest_Target interface {
 type ReadRowsRequest_RowKey struct {
 	RowKey []byte `protobuf:"bytes,2,opt,name=row_key,json=rowKey,proto3,oneof"`
 }
+
 type ReadRowsRequest_RowRange struct {
-	RowRange *RowRange `protobuf:"bytes,3,opt,name=row_range,json=rowRange,oneof"`
+	RowRange *RowRange `protobuf:"bytes,3,opt,name=row_range,json=rowRange,proto3,oneof"`
 }
+
 type ReadRowsRequest_RowSet struct {
-	RowSet *RowSet `protobuf:"bytes,8,opt,name=row_set,json=rowSet,oneof"`
+	RowSet *RowSet `protobuf:"bytes,8,opt,name=row_set,json=rowSet,proto3,oneof"`
 }
 
-func (*ReadRowsRequest_RowKey) isReadRowsRequest_Target()   {}
+func (*ReadRowsRequest_RowKey) isReadRowsRequest_Target() {}
+
 func (*ReadRowsRequest_RowRange) isReadRowsRequest_Target() {}
-func (*ReadRowsRequest_RowSet) isReadRowsRequest_Target()   {}
+
+func (*ReadRowsRequest_RowSet) isReadRowsRequest_Target() {}
 
 func (m *ReadRowsRequest) GetTarget() isReadRowsRequest_Target {
 	if m != nil {
@@ -70,13 +109,6 @@ func (m *ReadRowsRequest) GetTarget() isReadRowsRequest_Target {
 	return nil
 }
 
-func (m *ReadRowsRequest) GetTableName() string {
-	if m != nil {
-		return m.TableName
-	}
-	return ""
-}
-
 func (m *ReadRowsRequest) GetRowKey() []byte {
 	if x, ok := m.GetTarget().(*ReadRowsRequest_RowKey); ok {
 		return x.RowKey
@@ -188,17 +220,17 @@ func _ReadRowsRequest_OneofSizer(msg proto.Message) (n int) {
 	// target
 	switch x := m.Target.(type) {
 	case *ReadRowsRequest_RowKey:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RowKey)))
 		n += len(x.RowKey)
 	case *ReadRowsRequest_RowRange:
 		s := proto.Size(x.RowRange)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ReadRowsRequest_RowSet:
 		s := proto.Size(x.RowSet)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -215,13 +247,35 @@ type ReadRowsResponse struct {
 	// "allow_row_interleaving" was specified in the request.
 	RowKey []byte `protobuf:"bytes,1,opt,name=row_key,json=rowKey,proto3" json:"row_key,omitempty"`
 	// One or more chunks of the row specified by "row_key".
-	Chunks []*ReadRowsResponse_Chunk `protobuf:"bytes,2,rep,name=chunks" json:"chunks,omitempty"`
+	Chunks               []*ReadRowsResponse_Chunk `protobuf:"bytes,2,rep,name=chunks,proto3" json:"chunks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *ReadRowsResponse) Reset()                    { *m = ReadRowsResponse{} }
-func (m *ReadRowsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReadRowsResponse) ProtoMessage()               {}
-func (*ReadRowsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (m *ReadRowsResponse) Reset()         { *m = ReadRowsResponse{} }
+func (m *ReadRowsResponse) String() string { return proto.CompactTextString(m) }
+func (*ReadRowsResponse) ProtoMessage()    {}
+func (*ReadRowsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{1}
+}
+func (m *ReadRowsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadRowsResponse.Unmarshal(m, b)
+}
+func (m *ReadRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadRowsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReadRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse.Merge(dst, src)
+}
+func (m *ReadRowsResponse) XXX_Size() int {
+	return xxx_messageInfo_ReadRowsResponse.Size(m)
+}
+func (m *ReadRowsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadRowsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReadRowsResponse proto.InternalMessageInfo
 
 func (m *ReadRowsResponse) GetRowKey() []byte {
 	if m != nil {
@@ -244,31 +298,57 @@ type ReadRowsResponse_Chunk struct {
 	//	*ReadRowsResponse_Chunk_RowContents
 	//	*ReadRowsResponse_Chunk_ResetRow
 	//	*ReadRowsResponse_Chunk_CommitRow
-	Chunk isReadRowsResponse_Chunk_Chunk `protobuf_oneof:"chunk"`
+	Chunk                isReadRowsResponse_Chunk_Chunk `protobuf_oneof:"chunk"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *ReadRowsResponse_Chunk) Reset()         { *m = ReadRowsResponse_Chunk{} }
+func (m *ReadRowsResponse_Chunk) String() string { return proto.CompactTextString(m) }
+func (*ReadRowsResponse_Chunk) ProtoMessage()    {}
+func (*ReadRowsResponse_Chunk) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{1, 0}
+}
+func (m *ReadRowsResponse_Chunk) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadRowsResponse_Chunk.Unmarshal(m, b)
+}
+func (m *ReadRowsResponse_Chunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadRowsResponse_Chunk.Marshal(b, m, deterministic)
+}
+func (dst *ReadRowsResponse_Chunk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse_Chunk.Merge(dst, src)
+}
+func (m *ReadRowsResponse_Chunk) XXX_Size() int {
+	return xxx_messageInfo_ReadRowsResponse_Chunk.Size(m)
+}
+func (m *ReadRowsResponse_Chunk) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadRowsResponse_Chunk.DiscardUnknown(m)
 }
 
-func (m *ReadRowsResponse_Chunk) Reset()                    { *m = ReadRowsResponse_Chunk{} }
-func (m *ReadRowsResponse_Chunk) String() string            { return proto.CompactTextString(m) }
-func (*ReadRowsResponse_Chunk) ProtoMessage()               {}
-func (*ReadRowsResponse_Chunk) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1, 0} }
+var xxx_messageInfo_ReadRowsResponse_Chunk proto.InternalMessageInfo
 
 type isReadRowsResponse_Chunk_Chunk interface {
 	isReadRowsResponse_Chunk_Chunk()
 }
 
 type ReadRowsResponse_Chunk_RowContents struct {
-	RowContents *Family `protobuf:"bytes,1,opt,name=row_contents,json=rowContents,oneof"`
+	RowContents *Family `protobuf:"bytes,1,opt,name=row_contents,json=rowContents,proto3,oneof"`
 }
+
 type ReadRowsResponse_Chunk_ResetRow struct {
-	ResetRow bool `protobuf:"varint,2,opt,name=reset_row,json=resetRow,oneof"`
+	ResetRow bool `protobuf:"varint,2,opt,name=reset_row,json=resetRow,proto3,oneof"`
 }
+
 type ReadRowsResponse_Chunk_CommitRow struct {
-	CommitRow bool `protobuf:"varint,3,opt,name=commit_row,json=commitRow,oneof"`
+	CommitRow bool `protobuf:"varint,3,opt,name=commit_row,json=commitRow,proto3,oneof"`
 }
 
 func (*ReadRowsResponse_Chunk_RowContents) isReadRowsResponse_Chunk_Chunk() {}
-func (*ReadRowsResponse_Chunk_ResetRow) isReadRowsResponse_Chunk_Chunk()    {}
-func (*ReadRowsResponse_Chunk_CommitRow) isReadRowsResponse_Chunk_Chunk()   {}
+
+func (*ReadRowsResponse_Chunk_ResetRow) isReadRowsResponse_Chunk_Chunk() {}
+
+func (*ReadRowsResponse_Chunk_CommitRow) isReadRowsResponse_Chunk_Chunk() {}
 
 func (m *ReadRowsResponse_Chunk) GetChunk() isReadRowsResponse_Chunk_Chunk {
 	if m != nil {
@@ -373,14 +453,14 @@ func _ReadRowsResponse_Chunk_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Chunk.(type) {
 	case *ReadRowsResponse_Chunk_RowContents:
 		s := proto.Size(x.RowContents)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ReadRowsResponse_Chunk_ResetRow:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *ReadRowsResponse_Chunk_CommitRow:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case nil:
 	default:
@@ -392,13 +472,35 @@ func _ReadRowsResponse_Chunk_OneofSizer(msg proto.Message) (n int) {
 // Request message for BigtableService.SampleRowKeys.
 type SampleRowKeysRequest struct {
 	// The unique name of the table from which to sample row keys.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
+	TableName            string   `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SampleRowKeysRequest) Reset()                    { *m = SampleRowKeysRequest{} }
-func (m *SampleRowKeysRequest) String() string            { return proto.CompactTextString(m) }
-func (*SampleRowKeysRequest) ProtoMessage()               {}
-func (*SampleRowKeysRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+func (m *SampleRowKeysRequest) Reset()         { *m = SampleRowKeysRequest{} }
+func (m *SampleRowKeysRequest) String() string { return proto.CompactTextString(m) }
+func (*SampleRowKeysRequest) ProtoMessage()    {}
+func (*SampleRowKeysRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{2}
+}
+func (m *SampleRowKeysRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SampleRowKeysRequest.Unmarshal(m, b)
+}
+func (m *SampleRowKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SampleRowKeysRequest.Marshal(b, m, deterministic)
+}
+func (dst *SampleRowKeysRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SampleRowKeysRequest.Merge(dst, src)
+}
+func (m *SampleRowKeysRequest) XXX_Size() int {
+	return xxx_messageInfo_SampleRowKeysRequest.Size(m)
+}
+func (m *SampleRowKeysRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SampleRowKeysRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SampleRowKeysRequest proto.InternalMessageInfo
 
 func (m *SampleRowKeysRequest) GetTableName() string {
 	if m != nil {
@@ -421,13 +523,35 @@ type SampleRowKeysResponse struct {
 	// "row_key". Buffering the contents of all rows between two subsequent
 	// samples would require space roughly equal to the difference in their
 	// "offset_bytes" fields.
-	OffsetBytes int64 `protobuf:"varint,2,opt,name=offset_bytes,json=offsetBytes" json:"offset_bytes,omitempty"`
+	OffsetBytes          int64    `protobuf:"varint,2,opt,name=offset_bytes,json=offsetBytes,proto3" json:"offset_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SampleRowKeysResponse) Reset()                    { *m = SampleRowKeysResponse{} }
-func (m *SampleRowKeysResponse) String() string            { return proto.CompactTextString(m) }
-func (*SampleRowKeysResponse) ProtoMessage()               {}
-func (*SampleRowKeysResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+func (m *SampleRowKeysResponse) Reset()         { *m = SampleRowKeysResponse{} }
+func (m *SampleRowKeysResponse) String() string { return proto.CompactTextString(m) }
+func (*SampleRowKeysResponse) ProtoMessage()    {}
+func (*SampleRowKeysResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{3}
+}
+func (m *SampleRowKeysResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SampleRowKeysResponse.Unmarshal(m, b)
+}
+func (m *SampleRowKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SampleRowKeysResponse.Marshal(b, m, deterministic)
+}
+func (dst *SampleRowKeysResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SampleRowKeysResponse.Merge(dst, src)
+}
+func (m *SampleRowKeysResponse) XXX_Size() int {
+	return xxx_messageInfo_SampleRowKeysResponse.Size(m)
+}
+func (m *SampleRowKeysResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SampleRowKeysResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SampleRowKeysResponse proto.InternalMessageInfo
 
 func (m *SampleRowKeysResponse) GetRowKey() []byte {
 	if m != nil {
@@ -446,19 +570,41 @@ func (m *SampleRowKeysResponse) GetOffsetBytes() int64 {
 // Request message for BigtableService.MutateRow.
 type MutateRowRequest struct {
 	// The unique name of the table to which the mutation should be applied.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// The key of the row to which the mutation should be applied.
 	RowKey []byte `protobuf:"bytes,2,opt,name=row_key,json=rowKey,proto3" json:"row_key,omitempty"`
 	// Changes to be atomically applied to the specified row. Entries are applied
 	// in order, meaning that earlier mutations can be masked by later ones.
 	// Must contain at least one entry and at most 100000.
-	Mutations []*Mutation `protobuf:"bytes,3,rep,name=mutations" json:"mutations,omitempty"`
+	Mutations            []*Mutation `protobuf:"bytes,3,rep,name=mutations,proto3" json:"mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *MutateRowRequest) Reset()         { *m = MutateRowRequest{} }
+func (m *MutateRowRequest) String() string { return proto.CompactTextString(m) }
+func (*MutateRowRequest) ProtoMessage()    {}
+func (*MutateRowRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{4}
+}
+func (m *MutateRowRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowRequest.Unmarshal(m, b)
+}
+func (m *MutateRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowRequest.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowRequest.Merge(dst, src)
+}
+func (m *MutateRowRequest) XXX_Size() int {
+	return xxx_messageInfo_MutateRowRequest.Size(m)
+}
+func (m *MutateRowRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowRequest.DiscardUnknown(m)
 }
 
-func (m *MutateRowRequest) Reset()                    { *m = MutateRowRequest{} }
-func (m *MutateRowRequest) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowRequest) ProtoMessage()               {}
-func (*MutateRowRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_MutateRowRequest proto.InternalMessageInfo
 
 func (m *MutateRowRequest) GetTableName() string {
 	if m != nil {
@@ -484,19 +630,41 @@ func (m *MutateRowRequest) GetMutations() []*Mutation {
 // Request message for BigtableService.MutateRows.
 type MutateRowsRequest struct {
 	// The unique name of the table to which the mutations should be applied.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// The row keys/mutations to be applied in bulk.
 	// Each entry is applied as an atomic mutation, but the entries may be
 	// applied in arbitrary order (even between entries for the same row).
 	// At least one entry must be specified, and in total the entries may
 	// contain at most 100000 mutations.
-	Entries []*MutateRowsRequest_Entry `protobuf:"bytes,2,rep,name=entries" json:"entries,omitempty"`
+	Entries              []*MutateRowsRequest_Entry `protobuf:"bytes,2,rep,name=entries,proto3" json:"entries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *MutateRowsRequest) Reset()                    { *m = MutateRowsRequest{} }
-func (m *MutateRowsRequest) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowsRequest) ProtoMessage()               {}
-func (*MutateRowsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+func (m *MutateRowsRequest) Reset()         { *m = MutateRowsRequest{} }
+func (m *MutateRowsRequest) String() string { return proto.CompactTextString(m) }
+func (*MutateRowsRequest) ProtoMessage()    {}
+func (*MutateRowsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{5}
+}
+func (m *MutateRowsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowsRequest.Unmarshal(m, b)
+}
+func (m *MutateRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowsRequest.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsRequest.Merge(dst, src)
+}
+func (m *MutateRowsRequest) XXX_Size() int {
+	return xxx_messageInfo_MutateRowsRequest.Size(m)
+}
+func (m *MutateRowsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutateRowsRequest proto.InternalMessageInfo
 
 func (m *MutateRowsRequest) GetTableName() string {
 	if m != nil {
@@ -519,13 +687,35 @@ type MutateRowsRequest_Entry struct {
 	// applied in order, meaning that earlier mutations can be masked by
 	// later ones.
 	// At least one mutation must be specified.
-	Mutations []*Mutation `protobuf:"bytes,2,rep,name=mutations" json:"mutations,omitempty"`
+	Mutations            []*Mutation `protobuf:"bytes,2,rep,name=mutations,proto3" json:"mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *MutateRowsRequest_Entry) Reset()                    { *m = MutateRowsRequest_Entry{} }
-func (m *MutateRowsRequest_Entry) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowsRequest_Entry) ProtoMessage()               {}
-func (*MutateRowsRequest_Entry) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5, 0} }
+func (m *MutateRowsRequest_Entry) Reset()         { *m = MutateRowsRequest_Entry{} }
+func (m *MutateRowsRequest_Entry) String() string { return proto.CompactTextString(m) }
+func (*MutateRowsRequest_Entry) ProtoMessage()    {}
+func (*MutateRowsRequest_Entry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{5, 0}
+}
+func (m *MutateRowsRequest_Entry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowsRequest_Entry.Unmarshal(m, b)
+}
+func (m *MutateRowsRequest_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowsRequest_Entry.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowsRequest_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsRequest_Entry.Merge(dst, src)
+}
+func (m *MutateRowsRequest_Entry) XXX_Size() int {
+	return xxx_messageInfo_MutateRowsRequest_Entry.Size(m)
+}
+func (m *MutateRowsRequest_Entry) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowsRequest_Entry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutateRowsRequest_Entry proto.InternalMessageInfo
 
 func (m *MutateRowsRequest_Entry) GetRowKey() []byte {
 	if m != nil {
@@ -548,15 +738,37 @@ type MutateRowsResponse struct {
 	// Depending on how requests are batched during execution, it is possible
 	// for one Entry to fail due to an error with another Entry. In the event
 	// that this occurs, the same error will be reported for both entries.
-	Statuses []*google_rpc.Status `protobuf:"bytes,1,rep,name=statuses" json:"statuses,omitempty"`
+	Statuses             []*status.Status `protobuf:"bytes,1,rep,name=statuses,proto3" json:"statuses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *MutateRowsResponse) Reset()         { *m = MutateRowsResponse{} }
+func (m *MutateRowsResponse) String() string { return proto.CompactTextString(m) }
+func (*MutateRowsResponse) ProtoMessage()    {}
+func (*MutateRowsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{6}
+}
+func (m *MutateRowsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowsResponse.Unmarshal(m, b)
+}
+func (m *MutateRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowsResponse.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsResponse.Merge(dst, src)
+}
+func (m *MutateRowsResponse) XXX_Size() int {
+	return xxx_messageInfo_MutateRowsResponse.Size(m)
+}
+func (m *MutateRowsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowsResponse.DiscardUnknown(m)
 }
 
-func (m *MutateRowsResponse) Reset()                    { *m = MutateRowsResponse{} }
-func (m *MutateRowsResponse) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowsResponse) ProtoMessage()               {}
-func (*MutateRowsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+var xxx_messageInfo_MutateRowsResponse proto.InternalMessageInfo
 
-func (m *MutateRowsResponse) GetStatuses() []*google_rpc.Status {
+func (m *MutateRowsResponse) GetStatuses() []*status.Status {
 	if m != nil {
 		return m.Statuses
 	}
@@ -567,32 +779,54 @@ func (m *MutateRowsResponse) GetStatuses() []*google_rpc.Status {
 type CheckAndMutateRowRequest struct {
 	// The unique name of the table to which the conditional mutation should be
 	// applied.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// The key of the row to which the conditional mutation should be applied.
 	RowKey []byte `protobuf:"bytes,2,opt,name=row_key,json=rowKey,proto3" json:"row_key,omitempty"`
 	// The filter to be applied to the contents of the specified row. Depending
 	// on whether or not any results are yielded, either "true_mutations" or
 	// "false_mutations" will be executed. If unset, checks that the row contains
 	// any values at all.
-	PredicateFilter *RowFilter `protobuf:"bytes,6,opt,name=predicate_filter,json=predicateFilter" json:"predicate_filter,omitempty"`
+	PredicateFilter *RowFilter `protobuf:"bytes,6,opt,name=predicate_filter,json=predicateFilter,proto3" json:"predicate_filter,omitempty"`
 	// Changes to be atomically applied to the specified row if "predicate_filter"
 	// yields at least one cell when applied to "row_key". Entries are applied in
 	// order, meaning that earlier mutations can be masked by later ones.
 	// Must contain at least one entry if "false_mutations" is empty, and at most
 	// 100000.
-	TrueMutations []*Mutation `protobuf:"bytes,4,rep,name=true_mutations,json=trueMutations" json:"true_mutations,omitempty"`
+	TrueMutations []*Mutation `protobuf:"bytes,4,rep,name=true_mutations,json=trueMutations,proto3" json:"true_mutations,omitempty"`
 	// Changes to be atomically applied to the specified row if "predicate_filter"
 	// does not yield any cells when applied to "row_key". Entries are applied in
 	// order, meaning that earlier mutations can be masked by later ones.
 	// Must contain at least one entry if "true_mutations" is empty, and at most
 	// 100000.
-	FalseMutations []*Mutation `protobuf:"bytes,5,rep,name=false_mutations,json=falseMutations" json:"false_mutations,omitempty"`
+	FalseMutations       []*Mutation `protobuf:"bytes,5,rep,name=false_mutations,json=falseMutations,proto3" json:"false_mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *CheckAndMutateRowRequest) Reset()         { *m = CheckAndMutateRowRequest{} }
+func (m *CheckAndMutateRowRequest) String() string { return proto.CompactTextString(m) }
+func (*CheckAndMutateRowRequest) ProtoMessage()    {}
+func (*CheckAndMutateRowRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{7}
+}
+func (m *CheckAndMutateRowRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckAndMutateRowRequest.Unmarshal(m, b)
+}
+func (m *CheckAndMutateRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckAndMutateRowRequest.Marshal(b, m, deterministic)
+}
+func (dst *CheckAndMutateRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckAndMutateRowRequest.Merge(dst, src)
+}
+func (m *CheckAndMutateRowRequest) XXX_Size() int {
+	return xxx_messageInfo_CheckAndMutateRowRequest.Size(m)
+}
+func (m *CheckAndMutateRowRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckAndMutateRowRequest.DiscardUnknown(m)
 }
 
-func (m *CheckAndMutateRowRequest) Reset()                    { *m = CheckAndMutateRowRequest{} }
-func (m *CheckAndMutateRowRequest) String() string            { return proto.CompactTextString(m) }
-func (*CheckAndMutateRowRequest) ProtoMessage()               {}
-func (*CheckAndMutateRowRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+var xxx_messageInfo_CheckAndMutateRowRequest proto.InternalMessageInfo
 
 func (m *CheckAndMutateRowRequest) GetTableName() string {
 	if m != nil {
@@ -633,13 +867,35 @@ func (m *CheckAndMutateRowRequest) GetFalseMutations() []*Mutation {
 type CheckAndMutateRowResponse struct {
 	// Whether or not the request's "predicate_filter" yielded any results for
 	// the specified row.
-	PredicateMatched bool `protobuf:"varint,1,opt,name=predicate_matched,json=predicateMatched" json:"predicate_matched,omitempty"`
+	PredicateMatched     bool     `protobuf:"varint,1,opt,name=predicate_matched,json=predicateMatched,proto3" json:"predicate_matched,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CheckAndMutateRowResponse) Reset()                    { *m = CheckAndMutateRowResponse{} }
-func (m *CheckAndMutateRowResponse) String() string            { return proto.CompactTextString(m) }
-func (*CheckAndMutateRowResponse) ProtoMessage()               {}
-func (*CheckAndMutateRowResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+func (m *CheckAndMutateRowResponse) Reset()         { *m = CheckAndMutateRowResponse{} }
+func (m *CheckAndMutateRowResponse) String() string { return proto.CompactTextString(m) }
+func (*CheckAndMutateRowResponse) ProtoMessage()    {}
+func (*CheckAndMutateRowResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{8}
+}
+func (m *CheckAndMutateRowResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckAndMutateRowResponse.Unmarshal(m, b)
+}
+func (m *CheckAndMutateRowResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckAndMutateRowResponse.Marshal(b, m, deterministic)
+}
+func (dst *CheckAndMutateRowResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckAndMutateRowResponse.Merge(dst, src)
+}
+func (m *CheckAndMutateRowResponse) XXX_Size() int {
+	return xxx_messageInfo_CheckAndMutateRowResponse.Size(m)
+}
+func (m *CheckAndMutateRowResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckAndMutateRowResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckAndMutateRowResponse proto.InternalMessageInfo
 
 func (m *CheckAndMutateRowResponse) GetPredicateMatched() bool {
 	if m != nil {
@@ -652,19 +908,41 @@ func (m *CheckAndMutateRowResponse) GetPredicateMatched() bool {
 type ReadModifyWriteRowRequest struct {
 	// The unique name of the table to which the read/modify/write rules should be
 	// applied.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// The key of the row to which the read/modify/write rules should be applied.
 	RowKey []byte `protobuf:"bytes,2,opt,name=row_key,json=rowKey,proto3" json:"row_key,omitempty"`
 	// Rules specifying how the specified row's contents are to be transformed
 	// into writes. Entries are applied in order, meaning that earlier rules will
 	// affect the results of later ones.
-	Rules []*ReadModifyWriteRule `protobuf:"bytes,3,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*ReadModifyWriteRule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
-func (m *ReadModifyWriteRowRequest) Reset()                    { *m = ReadModifyWriteRowRequest{} }
-func (m *ReadModifyWriteRowRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReadModifyWriteRowRequest) ProtoMessage()               {}
-func (*ReadModifyWriteRowRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+func (m *ReadModifyWriteRowRequest) Reset()         { *m = ReadModifyWriteRowRequest{} }
+func (m *ReadModifyWriteRowRequest) String() string { return proto.CompactTextString(m) }
+func (*ReadModifyWriteRowRequest) ProtoMessage()    {}
+func (*ReadModifyWriteRowRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_service_messages_e7f32c735e59c16c, []int{9}
+}
+func (m *ReadModifyWriteRowRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadModifyWriteRowRequest.Unmarshal(m, b)
+}
+func (m *ReadModifyWriteRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadModifyWriteRowRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReadModifyWriteRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRowRequest.Merge(dst, src)
+}
+func (m *ReadModifyWriteRowRequest) XXX_Size() int {
+	return xxx_messageInfo_ReadModifyWriteRowRequest.Size(m)
+}
+func (m *ReadModifyWriteRowRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadModifyWriteRowRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReadModifyWriteRowRequest proto.InternalMessageInfo
 
 func (m *ReadModifyWriteRowRequest) GetTableName() string {
 	if m != nil {
@@ -702,9 +980,11 @@ func init() {
 	proto.RegisterType((*ReadModifyWriteRowRequest)(nil), "google.bigtable.v1.ReadModifyWriteRowRequest")
 }
 
-func init() { proto.RegisterFile("google/bigtable/v1/bigtable_service_messages.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/bigtable/v1/bigtable_service_messages.proto", fileDescriptor_bigtable_service_messages_e7f32c735e59c16c)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_bigtable_service_messages_e7f32c735e59c16c = []byte{
 	// 788 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5f, 0x8b, 0x23, 0x45,
 	0x10, 0xdf, 0x49, 0xcc, 0xbf, 0x4a, 0xdc, 0xdd, 0x6b, 0xce, 0xdb, 0xd9, 0x70, 0x8b, 0x71, 0x10,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/v2/bigtable.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/v2/bigtable.pb.go
index 5db579f7..5b2387ca 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/v2/bigtable.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/v2/bigtable.pb.go
@@ -1,47 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v2/bigtable.proto
 
-/*
-Package bigtable is a generated protocol buffer package.
-
-It is generated from these files:
-	google/bigtable/v2/bigtable.proto
-	google/bigtable/v2/data.proto
-
-It has these top-level messages:
-	ReadRowsRequest
-	ReadRowsResponse
-	SampleRowKeysRequest
-	SampleRowKeysResponse
-	MutateRowRequest
-	MutateRowResponse
-	MutateRowsRequest
-	MutateRowsResponse
-	CheckAndMutateRowRequest
-	CheckAndMutateRowResponse
-	ReadModifyWriteRowRequest
-	ReadModifyWriteRowResponse
-	Row
-	Family
-	Column
-	Cell
-	RowRange
-	RowSet
-	ColumnRange
-	TimestampRange
-	ValueRange
-	RowFilter
-	Mutation
-	ReadModifyWriteRule
-*/
-package bigtable
+package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/wrappers"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -64,29 +31,46 @@ type ReadRowsRequest struct {
 	// The unique name of the table from which to read.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// This value specifies routing for replication. If not specified, the
 	// "default" application profile will be used.
-	AppProfileId string `protobuf:"bytes,5,opt,name=app_profile_id,json=appProfileId" json:"app_profile_id,omitempty"`
+	AppProfileId string `protobuf:"bytes,5,opt,name=app_profile_id,json=appProfileId,proto3" json:"app_profile_id,omitempty"`
 	// The row keys and/or ranges to read. If not specified, reads from all rows.
-	Rows *RowSet `protobuf:"bytes,2,opt,name=rows" json:"rows,omitempty"`
+	Rows *RowSet `protobuf:"bytes,2,opt,name=rows,proto3" json:"rows,omitempty"`
 	// The filter to apply to the contents of the specified row(s). If unset,
 	// reads the entirety of each row.
-	Filter *RowFilter `protobuf:"bytes,3,opt,name=filter" json:"filter,omitempty"`
+	Filter *RowFilter `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The read will terminate after committing to N rows' worth of results. The
 	// default (zero) is to return all results.
-	RowsLimit int64 `protobuf:"varint,4,opt,name=rows_limit,json=rowsLimit" json:"rows_limit,omitempty"`
+	RowsLimit            int64    `protobuf:"varint,4,opt,name=rows_limit,json=rowsLimit,proto3" json:"rows_limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ReadRowsRequest) Reset()                    { *m = ReadRowsRequest{} }
-func (m *ReadRowsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReadRowsRequest) ProtoMessage()               {}
-func (*ReadRowsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *ReadRowsRequest) Reset()         { *m = ReadRowsRequest{} }
+func (m *ReadRowsRequest) String() string { return proto.CompactTextString(m) }
+func (*ReadRowsRequest) ProtoMessage()    {}
+func (*ReadRowsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{0}
+}
+func (m *ReadRowsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadRowsRequest.Unmarshal(m, b)
+}
+func (m *ReadRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadRowsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReadRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsRequest.Merge(dst, src)
+}
+func (m *ReadRowsRequest) XXX_Size() int {
+	return xxx_messageInfo_ReadRowsRequest.Size(m)
+}
+func (m *ReadRowsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadRowsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReadRowsRequest proto.InternalMessageInfo
 
 func (m *ReadRowsRequest) GetTableName() string {
 	if m != nil {
@@ -125,7 +109,7 @@ func (m *ReadRowsRequest) GetRowsLimit() int64 {
 
 // Response message for Bigtable.ReadRows.
 type ReadRowsResponse struct {
-	Chunks []*ReadRowsResponse_CellChunk `protobuf:"bytes,1,rep,name=chunks" json:"chunks,omitempty"`
+	Chunks []*ReadRowsResponse_CellChunk `protobuf:"bytes,1,rep,name=chunks,proto3" json:"chunks,omitempty"`
 	// Optionally the server might return the row key of the last row it
 	// has scanned.  The client can use this to construct a more
 	// efficient retry request if needed: any row keys or portions of
@@ -133,13 +117,35 @@ type ReadRowsResponse struct {
 	// This is primarily useful for cases where the server has read a
 	// lot of data that was filtered out since the last committed row
 	// key, allowing the client to skip that work on a retry.
-	LastScannedRowKey []byte `protobuf:"bytes,2,opt,name=last_scanned_row_key,json=lastScannedRowKey,proto3" json:"last_scanned_row_key,omitempty"`
+	LastScannedRowKey    []byte   `protobuf:"bytes,2,opt,name=last_scanned_row_key,json=lastScannedRowKey,proto3" json:"last_scanned_row_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReadRowsResponse) Reset()         { *m = ReadRowsResponse{} }
+func (m *ReadRowsResponse) String() string { return proto.CompactTextString(m) }
+func (*ReadRowsResponse) ProtoMessage()    {}
+func (*ReadRowsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{1}
+}
+func (m *ReadRowsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadRowsResponse.Unmarshal(m, b)
+}
+func (m *ReadRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadRowsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReadRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse.Merge(dst, src)
+}
+func (m *ReadRowsResponse) XXX_Size() int {
+	return xxx_messageInfo_ReadRowsResponse.Size(m)
+}
+func (m *ReadRowsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadRowsResponse.DiscardUnknown(m)
 }
 
-func (m *ReadRowsResponse) Reset()                    { *m = ReadRowsResponse{} }
-func (m *ReadRowsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReadRowsResponse) ProtoMessage()               {}
-func (*ReadRowsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_ReadRowsResponse proto.InternalMessageInfo
 
 func (m *ReadRowsResponse) GetChunks() []*ReadRowsResponse_CellChunk {
 	if m != nil {
@@ -169,13 +175,13 @@ type ReadRowsResponse_CellChunk struct {
 	// column family name in a response so clients must check
 	// explicitly for the presence of this message, not just for
 	// `family_name.value` being non-empty.
-	FamilyName *google_protobuf1.StringValue `protobuf:"bytes,2,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName *wrappers.StringValue `protobuf:"bytes,2,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The column qualifier for this chunk of data.  If this message
 	// is not present, this CellChunk is a continuation of the same column
 	// as the previous CellChunk.  Column qualifiers may be empty so
 	// clients must check for the presence of this message, not just
 	// for `qualifier.value` being non-empty.
-	Qualifier *google_protobuf1.BytesValue `protobuf:"bytes,3,opt,name=qualifier" json:"qualifier,omitempty"`
+	Qualifier *wrappers.BytesValue `protobuf:"bytes,3,opt,name=qualifier,proto3" json:"qualifier,omitempty"`
 	// The cell's stored timestamp, which also uniquely identifies it
 	// within its column.  Values are always expressed in
 	// microseconds, but individual tables may set a coarser
@@ -184,11 +190,11 @@ type ReadRowsResponse_CellChunk struct {
 	// only allow values of `timestamp_micros` which are multiples of
 	// 1000.  Timestamps are only set in the first CellChunk per cell
 	// (for cells split into multiple chunks).
-	TimestampMicros int64 `protobuf:"varint,4,opt,name=timestamp_micros,json=timestampMicros" json:"timestamp_micros,omitempty"`
+	TimestampMicros int64 `protobuf:"varint,4,opt,name=timestamp_micros,json=timestampMicros,proto3" json:"timestamp_micros,omitempty"`
 	// Labels applied to the cell by a
 	// [RowFilter][google.bigtable.v2.RowFilter].  Labels are only set
 	// on the first CellChunk per cell.
-	Labels []string `protobuf:"bytes,5,rep,name=labels" json:"labels,omitempty"`
+	Labels []string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty"`
 	// The value stored in the cell.  Cell values can be split across
 	// multiple CellChunks.  In that case only the value field will be
 	// set in CellChunks after the first: the timestamp and labels
@@ -199,38 +205,39 @@ type ReadRowsResponse_CellChunk struct {
 	// not the final chunk of that cell, value_size will be set to the
 	// total length of the cell value.  The client can use this size
 	// to pre-allocate memory to hold the full cell value.
-	ValueSize int32 `protobuf:"varint,7,opt,name=value_size,json=valueSize" json:"value_size,omitempty"`
+	ValueSize int32 `protobuf:"varint,7,opt,name=value_size,json=valueSize,proto3" json:"value_size,omitempty"`
 	// Types that are valid to be assigned to RowStatus:
 	//	*ReadRowsResponse_CellChunk_ResetRow
 	//	*ReadRowsResponse_CellChunk_CommitRow
-	RowStatus isReadRowsResponse_CellChunk_RowStatus `protobuf_oneof:"row_status"`
+	RowStatus            isReadRowsResponse_CellChunk_RowStatus `protobuf_oneof:"row_status"`
+	XXX_NoUnkeyedLiteral struct{}                               `json:"-"`
+	XXX_unrecognized     []byte                                 `json:"-"`
+	XXX_sizecache        int32                                  `json:"-"`
 }
 
-func (m *ReadRowsResponse_CellChunk) Reset()                    { *m = ReadRowsResponse_CellChunk{} }
-func (m *ReadRowsResponse_CellChunk) String() string            { return proto.CompactTextString(m) }
-func (*ReadRowsResponse_CellChunk) ProtoMessage()               {}
-func (*ReadRowsResponse_CellChunk) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-type isReadRowsResponse_CellChunk_RowStatus interface {
-	isReadRowsResponse_CellChunk_RowStatus()
+func (m *ReadRowsResponse_CellChunk) Reset()         { *m = ReadRowsResponse_CellChunk{} }
+func (m *ReadRowsResponse_CellChunk) String() string { return proto.CompactTextString(m) }
+func (*ReadRowsResponse_CellChunk) ProtoMessage()    {}
+func (*ReadRowsResponse_CellChunk) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{1, 0}
 }
-
-type ReadRowsResponse_CellChunk_ResetRow struct {
-	ResetRow bool `protobuf:"varint,8,opt,name=reset_row,json=resetRow,oneof"`
+func (m *ReadRowsResponse_CellChunk) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadRowsResponse_CellChunk.Unmarshal(m, b)
 }
-type ReadRowsResponse_CellChunk_CommitRow struct {
-	CommitRow bool `protobuf:"varint,9,opt,name=commit_row,json=commitRow,oneof"`
+func (m *ReadRowsResponse_CellChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadRowsResponse_CellChunk.Marshal(b, m, deterministic)
 }
-
-func (*ReadRowsResponse_CellChunk_ResetRow) isReadRowsResponse_CellChunk_RowStatus()  {}
-func (*ReadRowsResponse_CellChunk_CommitRow) isReadRowsResponse_CellChunk_RowStatus() {}
-
-func (m *ReadRowsResponse_CellChunk) GetRowStatus() isReadRowsResponse_CellChunk_RowStatus {
-	if m != nil {
-		return m.RowStatus
-	}
-	return nil
+func (dst *ReadRowsResponse_CellChunk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRowsResponse_CellChunk.Merge(dst, src)
+}
+func (m *ReadRowsResponse_CellChunk) XXX_Size() int {
+	return xxx_messageInfo_ReadRowsResponse_CellChunk.Size(m)
 }
+func (m *ReadRowsResponse_CellChunk) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadRowsResponse_CellChunk.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReadRowsResponse_CellChunk proto.InternalMessageInfo
 
 func (m *ReadRowsResponse_CellChunk) GetRowKey() []byte {
 	if m != nil {
@@ -239,14 +246,14 @@ func (m *ReadRowsResponse_CellChunk) GetRowKey() []byte {
 	return nil
 }
 
-func (m *ReadRowsResponse_CellChunk) GetFamilyName() *google_protobuf1.StringValue {
+func (m *ReadRowsResponse_CellChunk) GetFamilyName() *wrappers.StringValue {
 	if m != nil {
 		return m.FamilyName
 	}
 	return nil
 }
 
-func (m *ReadRowsResponse_CellChunk) GetQualifier() *google_protobuf1.BytesValue {
+func (m *ReadRowsResponse_CellChunk) GetQualifier() *wrappers.BytesValue {
 	if m != nil {
 		return m.Qualifier
 	}
@@ -281,6 +288,29 @@ func (m *ReadRowsResponse_CellChunk) GetValueSize() int32 {
 	return 0
 }
 
+type isReadRowsResponse_CellChunk_RowStatus interface {
+	isReadRowsResponse_CellChunk_RowStatus()
+}
+
+type ReadRowsResponse_CellChunk_ResetRow struct {
+	ResetRow bool `protobuf:"varint,8,opt,name=reset_row,json=resetRow,proto3,oneof"`
+}
+
+type ReadRowsResponse_CellChunk_CommitRow struct {
+	CommitRow bool `protobuf:"varint,9,opt,name=commit_row,json=commitRow,proto3,oneof"`
+}
+
+func (*ReadRowsResponse_CellChunk_ResetRow) isReadRowsResponse_CellChunk_RowStatus() {}
+
+func (*ReadRowsResponse_CellChunk_CommitRow) isReadRowsResponse_CellChunk_RowStatus() {}
+
+func (m *ReadRowsResponse_CellChunk) GetRowStatus() isReadRowsResponse_CellChunk_RowStatus {
+	if m != nil {
+		return m.RowStatus
+	}
+	return nil
+}
+
 func (m *ReadRowsResponse_CellChunk) GetResetRow() bool {
 	if x, ok := m.GetRowStatus().(*ReadRowsResponse_CellChunk_ResetRow); ok {
 		return x.ResetRow
@@ -355,10 +385,10 @@ func _ReadRowsResponse_CellChunk_OneofSizer(msg proto.Message) (n int) {
 	// row_status
 	switch x := m.RowStatus.(type) {
 	case *ReadRowsResponse_CellChunk_ResetRow:
-		n += proto.SizeVarint(8<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *ReadRowsResponse_CellChunk_CommitRow:
-		n += proto.SizeVarint(9<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case nil:
 	default:
@@ -372,21 +402,38 @@ type SampleRowKeysRequest struct {
 	// The unique name of the table from which to sample row keys.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// This value specifies routing for replication. If not specified, the
 	// "default" application profile will be used.
-	AppProfileId string `protobuf:"bytes,2,opt,name=app_profile_id,json=appProfileId" json:"app_profile_id,omitempty"`
+	AppProfileId         string   `protobuf:"bytes,2,opt,name=app_profile_id,json=appProfileId,proto3" json:"app_profile_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SampleRowKeysRequest) Reset()                    { *m = SampleRowKeysRequest{} }
-func (m *SampleRowKeysRequest) String() string            { return proto.CompactTextString(m) }
-func (*SampleRowKeysRequest) ProtoMessage()               {}
-func (*SampleRowKeysRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *SampleRowKeysRequest) Reset()         { *m = SampleRowKeysRequest{} }
+func (m *SampleRowKeysRequest) String() string { return proto.CompactTextString(m) }
+func (*SampleRowKeysRequest) ProtoMessage()    {}
+func (*SampleRowKeysRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{2}
+}
+func (m *SampleRowKeysRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SampleRowKeysRequest.Unmarshal(m, b)
+}
+func (m *SampleRowKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SampleRowKeysRequest.Marshal(b, m, deterministic)
+}
+func (dst *SampleRowKeysRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SampleRowKeysRequest.Merge(dst, src)
+}
+func (m *SampleRowKeysRequest) XXX_Size() int {
+	return xxx_messageInfo_SampleRowKeysRequest.Size(m)
+}
+func (m *SampleRowKeysRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SampleRowKeysRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SampleRowKeysRequest proto.InternalMessageInfo
 
 func (m *SampleRowKeysRequest) GetTableName() string {
 	if m != nil {
@@ -416,13 +463,35 @@ type SampleRowKeysResponse struct {
 	// `row_key`. Buffering the contents of all rows between two subsequent
 	// samples would require space roughly equal to the difference in their
 	// `offset_bytes` fields.
-	OffsetBytes int64 `protobuf:"varint,2,opt,name=offset_bytes,json=offsetBytes" json:"offset_bytes,omitempty"`
+	OffsetBytes          int64    `protobuf:"varint,2,opt,name=offset_bytes,json=offsetBytes,proto3" json:"offset_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SampleRowKeysResponse) Reset()                    { *m = SampleRowKeysResponse{} }
-func (m *SampleRowKeysResponse) String() string            { return proto.CompactTextString(m) }
-func (*SampleRowKeysResponse) ProtoMessage()               {}
-func (*SampleRowKeysResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *SampleRowKeysResponse) Reset()         { *m = SampleRowKeysResponse{} }
+func (m *SampleRowKeysResponse) String() string { return proto.CompactTextString(m) }
+func (*SampleRowKeysResponse) ProtoMessage()    {}
+func (*SampleRowKeysResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{3}
+}
+func (m *SampleRowKeysResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SampleRowKeysResponse.Unmarshal(m, b)
+}
+func (m *SampleRowKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SampleRowKeysResponse.Marshal(b, m, deterministic)
+}
+func (dst *SampleRowKeysResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SampleRowKeysResponse.Merge(dst, src)
+}
+func (m *SampleRowKeysResponse) XXX_Size() int {
+	return xxx_messageInfo_SampleRowKeysResponse.Size(m)
+}
+func (m *SampleRowKeysResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SampleRowKeysResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SampleRowKeysResponse proto.InternalMessageInfo
 
 func (m *SampleRowKeysResponse) GetRowKey() []byte {
 	if m != nil {
@@ -443,27 +512,44 @@ type MutateRowRequest struct {
 	// The unique name of the table to which the mutation should be applied.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// This value specifies routing for replication. If not specified, the
 	// "default" application profile will be used.
-	AppProfileId string `protobuf:"bytes,4,opt,name=app_profile_id,json=appProfileId" json:"app_profile_id,omitempty"`
+	AppProfileId string `protobuf:"bytes,4,opt,name=app_profile_id,json=appProfileId,proto3" json:"app_profile_id,omitempty"`
 	// The key of the row to which the mutation should be applied.
 	RowKey []byte `protobuf:"bytes,2,opt,name=row_key,json=rowKey,proto3" json:"row_key,omitempty"`
 	// Changes to be atomically applied to the specified row. Entries are applied
 	// in order, meaning that earlier mutations can be masked by later ones.
 	// Must contain at least one entry and at most 100000.
-	Mutations []*Mutation `protobuf:"bytes,3,rep,name=mutations" json:"mutations,omitempty"`
+	Mutations            []*Mutation `protobuf:"bytes,3,rep,name=mutations,proto3" json:"mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *MutateRowRequest) Reset()                    { *m = MutateRowRequest{} }
-func (m *MutateRowRequest) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowRequest) ProtoMessage()               {}
-func (*MutateRowRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *MutateRowRequest) Reset()         { *m = MutateRowRequest{} }
+func (m *MutateRowRequest) String() string { return proto.CompactTextString(m) }
+func (*MutateRowRequest) ProtoMessage()    {}
+func (*MutateRowRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{4}
+}
+func (m *MutateRowRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowRequest.Unmarshal(m, b)
+}
+func (m *MutateRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowRequest.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowRequest.Merge(dst, src)
+}
+func (m *MutateRowRequest) XXX_Size() int {
+	return xxx_messageInfo_MutateRowRequest.Size(m)
+}
+func (m *MutateRowRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutateRowRequest proto.InternalMessageInfo
 
 func (m *MutateRowRequest) GetTableName() string {
 	if m != nil {
@@ -495,37 +581,76 @@ func (m *MutateRowRequest) GetMutations() []*Mutation {
 
 // Response message for Bigtable.MutateRow.
 type MutateRowResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MutateRowResponse) Reset()         { *m = MutateRowResponse{} }
+func (m *MutateRowResponse) String() string { return proto.CompactTextString(m) }
+func (*MutateRowResponse) ProtoMessage()    {}
+func (*MutateRowResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{5}
+}
+func (m *MutateRowResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowResponse.Unmarshal(m, b)
+}
+func (m *MutateRowResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowResponse.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowResponse.Merge(dst, src)
+}
+func (m *MutateRowResponse) XXX_Size() int {
+	return xxx_messageInfo_MutateRowResponse.Size(m)
+}
+func (m *MutateRowResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowResponse.DiscardUnknown(m)
 }
 
-func (m *MutateRowResponse) Reset()                    { *m = MutateRowResponse{} }
-func (m *MutateRowResponse) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowResponse) ProtoMessage()               {}
-func (*MutateRowResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_MutateRowResponse proto.InternalMessageInfo
 
 // Request message for BigtableService.MutateRows.
 type MutateRowsRequest struct {
 	// The unique name of the table to which the mutations should be applied.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// This value specifies routing for replication. If not specified, the
 	// "default" application profile will be used.
-	AppProfileId string `protobuf:"bytes,3,opt,name=app_profile_id,json=appProfileId" json:"app_profile_id,omitempty"`
+	AppProfileId string `protobuf:"bytes,3,opt,name=app_profile_id,json=appProfileId,proto3" json:"app_profile_id,omitempty"`
 	// The row keys and corresponding mutations to be applied in bulk.
 	// Each entry is applied as an atomic mutation, but the entries may be
 	// applied in arbitrary order (even between entries for the same row).
 	// At least one entry must be specified, and in total the entries can
 	// contain at most 100000 mutations.
-	Entries []*MutateRowsRequest_Entry `protobuf:"bytes,2,rep,name=entries" json:"entries,omitempty"`
+	Entries              []*MutateRowsRequest_Entry `protobuf:"bytes,2,rep,name=entries,proto3" json:"entries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *MutateRowsRequest) Reset()                    { *m = MutateRowsRequest{} }
-func (m *MutateRowsRequest) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowsRequest) ProtoMessage()               {}
-func (*MutateRowsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *MutateRowsRequest) Reset()         { *m = MutateRowsRequest{} }
+func (m *MutateRowsRequest) String() string { return proto.CompactTextString(m) }
+func (*MutateRowsRequest) ProtoMessage()    {}
+func (*MutateRowsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{6}
+}
+func (m *MutateRowsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowsRequest.Unmarshal(m, b)
+}
+func (m *MutateRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowsRequest.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsRequest.Merge(dst, src)
+}
+func (m *MutateRowsRequest) XXX_Size() int {
+	return xxx_messageInfo_MutateRowsRequest.Size(m)
+}
+func (m *MutateRowsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutateRowsRequest proto.InternalMessageInfo
 
 func (m *MutateRowsRequest) GetTableName() string {
 	if m != nil {
@@ -555,13 +680,35 @@ type MutateRowsRequest_Entry struct {
 	// applied in order, meaning that earlier mutations can be masked by
 	// later ones.
 	// You must specify at least one mutation.
-	Mutations []*Mutation `protobuf:"bytes,2,rep,name=mutations" json:"mutations,omitempty"`
+	Mutations            []*Mutation `protobuf:"bytes,2,rep,name=mutations,proto3" json:"mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *MutateRowsRequest_Entry) Reset()                    { *m = MutateRowsRequest_Entry{} }
-func (m *MutateRowsRequest_Entry) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowsRequest_Entry) ProtoMessage()               {}
-func (*MutateRowsRequest_Entry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6, 0} }
+func (m *MutateRowsRequest_Entry) Reset()         { *m = MutateRowsRequest_Entry{} }
+func (m *MutateRowsRequest_Entry) String() string { return proto.CompactTextString(m) }
+func (*MutateRowsRequest_Entry) ProtoMessage()    {}
+func (*MutateRowsRequest_Entry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{6, 0}
+}
+func (m *MutateRowsRequest_Entry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowsRequest_Entry.Unmarshal(m, b)
+}
+func (m *MutateRowsRequest_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowsRequest_Entry.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowsRequest_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsRequest_Entry.Merge(dst, src)
+}
+func (m *MutateRowsRequest_Entry) XXX_Size() int {
+	return xxx_messageInfo_MutateRowsRequest_Entry.Size(m)
+}
+func (m *MutateRowsRequest_Entry) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowsRequest_Entry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutateRowsRequest_Entry proto.InternalMessageInfo
 
 func (m *MutateRowsRequest_Entry) GetRowKey() []byte {
 	if m != nil {
@@ -580,13 +727,35 @@ func (m *MutateRowsRequest_Entry) GetMutations() []*Mutation {
 // Response message for BigtableService.MutateRows.
 type MutateRowsResponse struct {
 	// One or more results for Entries from the batch request.
-	Entries []*MutateRowsResponse_Entry `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty"`
+	Entries              []*MutateRowsResponse_Entry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
-func (m *MutateRowsResponse) Reset()                    { *m = MutateRowsResponse{} }
-func (m *MutateRowsResponse) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowsResponse) ProtoMessage()               {}
-func (*MutateRowsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *MutateRowsResponse) Reset()         { *m = MutateRowsResponse{} }
+func (m *MutateRowsResponse) String() string { return proto.CompactTextString(m) }
+func (*MutateRowsResponse) ProtoMessage()    {}
+func (*MutateRowsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{7}
+}
+func (m *MutateRowsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowsResponse.Unmarshal(m, b)
+}
+func (m *MutateRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowsResponse.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsResponse.Merge(dst, src)
+}
+func (m *MutateRowsResponse) XXX_Size() int {
+	return xxx_messageInfo_MutateRowsResponse.Size(m)
+}
+func (m *MutateRowsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutateRowsResponse proto.InternalMessageInfo
 
 func (m *MutateRowsResponse) GetEntries() []*MutateRowsResponse_Entry {
 	if m != nil {
@@ -598,18 +767,40 @@ func (m *MutateRowsResponse) GetEntries() []*MutateRowsResponse_Entry {
 type MutateRowsResponse_Entry struct {
 	// The index into the original request's `entries` list of the Entry
 	// for which a result is being reported.
-	Index int64 `protobuf:"varint,1,opt,name=index" json:"index,omitempty"`
+	Index int64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"`
 	// The result of the request Entry identified by `index`.
 	// Depending on how requests are batched during execution, it is possible
 	// for one Entry to fail due to an error with another Entry. In the event
 	// that this occurs, the same error will be reported for both entries.
-	Status *google_rpc.Status `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"`
+	Status               *status.Status `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *MutateRowsResponse_Entry) Reset()                    { *m = MutateRowsResponse_Entry{} }
-func (m *MutateRowsResponse_Entry) String() string            { return proto.CompactTextString(m) }
-func (*MutateRowsResponse_Entry) ProtoMessage()               {}
-func (*MutateRowsResponse_Entry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
+func (m *MutateRowsResponse_Entry) Reset()         { *m = MutateRowsResponse_Entry{} }
+func (m *MutateRowsResponse_Entry) String() string { return proto.CompactTextString(m) }
+func (*MutateRowsResponse_Entry) ProtoMessage()    {}
+func (*MutateRowsResponse_Entry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{7, 0}
+}
+func (m *MutateRowsResponse_Entry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutateRowsResponse_Entry.Unmarshal(m, b)
+}
+func (m *MutateRowsResponse_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutateRowsResponse_Entry.Marshal(b, m, deterministic)
+}
+func (dst *MutateRowsResponse_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutateRowsResponse_Entry.Merge(dst, src)
+}
+func (m *MutateRowsResponse_Entry) XXX_Size() int {
+	return xxx_messageInfo_MutateRowsResponse_Entry.Size(m)
+}
+func (m *MutateRowsResponse_Entry) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutateRowsResponse_Entry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutateRowsResponse_Entry proto.InternalMessageInfo
 
 func (m *MutateRowsResponse_Entry) GetIndex() int64 {
 	if m != nil {
@@ -618,7 +809,7 @@ func (m *MutateRowsResponse_Entry) GetIndex() int64 {
 	return 0
 }
 
-func (m *MutateRowsResponse_Entry) GetStatus() *google_rpc.Status {
+func (m *MutateRowsResponse_Entry) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -631,40 +822,57 @@ type CheckAndMutateRowRequest struct {
 	// applied.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// This value specifies routing for replication. If not specified, the
 	// "default" application profile will be used.
-	AppProfileId string `protobuf:"bytes,7,opt,name=app_profile_id,json=appProfileId" json:"app_profile_id,omitempty"`
+	AppProfileId string `protobuf:"bytes,7,opt,name=app_profile_id,json=appProfileId,proto3" json:"app_profile_id,omitempty"`
 	// The key of the row to which the conditional mutation should be applied.
 	RowKey []byte `protobuf:"bytes,2,opt,name=row_key,json=rowKey,proto3" json:"row_key,omitempty"`
 	// The filter to be applied to the contents of the specified row. Depending
 	// on whether or not any results are yielded, either `true_mutations` or
 	// `false_mutations` will be executed. If unset, checks that the row contains
 	// any values at all.
-	PredicateFilter *RowFilter `protobuf:"bytes,6,opt,name=predicate_filter,json=predicateFilter" json:"predicate_filter,omitempty"`
+	PredicateFilter *RowFilter `protobuf:"bytes,6,opt,name=predicate_filter,json=predicateFilter,proto3" json:"predicate_filter,omitempty"`
 	// Changes to be atomically applied to the specified row if `predicate_filter`
 	// yields at least one cell when applied to `row_key`. Entries are applied in
 	// order, meaning that earlier mutations can be masked by later ones.
 	// Must contain at least one entry if `false_mutations` is empty, and at most
 	// 100000.
-	TrueMutations []*Mutation `protobuf:"bytes,4,rep,name=true_mutations,json=trueMutations" json:"true_mutations,omitempty"`
+	TrueMutations []*Mutation `protobuf:"bytes,4,rep,name=true_mutations,json=trueMutations,proto3" json:"true_mutations,omitempty"`
 	// Changes to be atomically applied to the specified row if `predicate_filter`
 	// does not yield any cells when applied to `row_key`. Entries are applied in
 	// order, meaning that earlier mutations can be masked by later ones.
 	// Must contain at least one entry if `true_mutations` is empty, and at most
 	// 100000.
-	FalseMutations []*Mutation `protobuf:"bytes,5,rep,name=false_mutations,json=falseMutations" json:"false_mutations,omitempty"`
+	FalseMutations       []*Mutation `protobuf:"bytes,5,rep,name=false_mutations,json=falseMutations,proto3" json:"false_mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *CheckAndMutateRowRequest) Reset()         { *m = CheckAndMutateRowRequest{} }
+func (m *CheckAndMutateRowRequest) String() string { return proto.CompactTextString(m) }
+func (*CheckAndMutateRowRequest) ProtoMessage()    {}
+func (*CheckAndMutateRowRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{8}
+}
+func (m *CheckAndMutateRowRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckAndMutateRowRequest.Unmarshal(m, b)
+}
+func (m *CheckAndMutateRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckAndMutateRowRequest.Marshal(b, m, deterministic)
+}
+func (dst *CheckAndMutateRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckAndMutateRowRequest.Merge(dst, src)
+}
+func (m *CheckAndMutateRowRequest) XXX_Size() int {
+	return xxx_messageInfo_CheckAndMutateRowRequest.Size(m)
+}
+func (m *CheckAndMutateRowRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckAndMutateRowRequest.DiscardUnknown(m)
 }
 
-func (m *CheckAndMutateRowRequest) Reset()                    { *m = CheckAndMutateRowRequest{} }
-func (m *CheckAndMutateRowRequest) String() string            { return proto.CompactTextString(m) }
-func (*CheckAndMutateRowRequest) ProtoMessage()               {}
-func (*CheckAndMutateRowRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_CheckAndMutateRowRequest proto.InternalMessageInfo
 
 func (m *CheckAndMutateRowRequest) GetTableName() string {
 	if m != nil {
@@ -712,13 +920,35 @@ func (m *CheckAndMutateRowRequest) GetFalseMutations() []*Mutation {
 type CheckAndMutateRowResponse struct {
 	// Whether or not the request's `predicate_filter` yielded any results for
 	// the specified row.
-	PredicateMatched bool `protobuf:"varint,1,opt,name=predicate_matched,json=predicateMatched" json:"predicate_matched,omitempty"`
+	PredicateMatched     bool     `protobuf:"varint,1,opt,name=predicate_matched,json=predicateMatched,proto3" json:"predicate_matched,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CheckAndMutateRowResponse) Reset()                    { *m = CheckAndMutateRowResponse{} }
-func (m *CheckAndMutateRowResponse) String() string            { return proto.CompactTextString(m) }
-func (*CheckAndMutateRowResponse) ProtoMessage()               {}
-func (*CheckAndMutateRowResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *CheckAndMutateRowResponse) Reset()         { *m = CheckAndMutateRowResponse{} }
+func (m *CheckAndMutateRowResponse) String() string { return proto.CompactTextString(m) }
+func (*CheckAndMutateRowResponse) ProtoMessage()    {}
+func (*CheckAndMutateRowResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{9}
+}
+func (m *CheckAndMutateRowResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckAndMutateRowResponse.Unmarshal(m, b)
+}
+func (m *CheckAndMutateRowResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckAndMutateRowResponse.Marshal(b, m, deterministic)
+}
+func (dst *CheckAndMutateRowResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckAndMutateRowResponse.Merge(dst, src)
+}
+func (m *CheckAndMutateRowResponse) XXX_Size() int {
+	return xxx_messageInfo_CheckAndMutateRowResponse.Size(m)
+}
+func (m *CheckAndMutateRowResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckAndMutateRowResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckAndMutateRowResponse proto.InternalMessageInfo
 
 func (m *CheckAndMutateRowResponse) GetPredicateMatched() bool {
 	if m != nil {
@@ -733,27 +963,44 @@ type ReadModifyWriteRowRequest struct {
 	// applied.
 	// Values are of the form
 	// `projects/<project>/instances/<instance>/tables/<table>`.
-	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
-	// This is a private alpha release of Cloud Bigtable replication. This feature
-	// is not currently available to most Cloud Bigtable customers. This feature
-	// might be changed in backward-incompatible ways and is not recommended for
-	// production use. It is not subject to any SLA or deprecation policy.
-	//
+	TableName string `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// This value specifies routing for replication. If not specified, the
 	// "default" application profile will be used.
-	AppProfileId string `protobuf:"bytes,4,opt,name=app_profile_id,json=appProfileId" json:"app_profile_id,omitempty"`
+	AppProfileId string `protobuf:"bytes,4,opt,name=app_profile_id,json=appProfileId,proto3" json:"app_profile_id,omitempty"`
 	// The key of the row to which the read/modify/write rules should be applied.
 	RowKey []byte `protobuf:"bytes,2,opt,name=row_key,json=rowKey,proto3" json:"row_key,omitempty"`
 	// Rules specifying how the specified row's contents are to be transformed
 	// into writes. Entries are applied in order, meaning that earlier rules will
 	// affect the results of later ones.
-	Rules []*ReadModifyWriteRule `protobuf:"bytes,3,rep,name=rules" json:"rules,omitempty"`
+	Rules                []*ReadModifyWriteRule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *ReadModifyWriteRowRequest) Reset()         { *m = ReadModifyWriteRowRequest{} }
+func (m *ReadModifyWriteRowRequest) String() string { return proto.CompactTextString(m) }
+func (*ReadModifyWriteRowRequest) ProtoMessage()    {}
+func (*ReadModifyWriteRowRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{10}
+}
+func (m *ReadModifyWriteRowRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadModifyWriteRowRequest.Unmarshal(m, b)
+}
+func (m *ReadModifyWriteRowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadModifyWriteRowRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReadModifyWriteRowRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRowRequest.Merge(dst, src)
+}
+func (m *ReadModifyWriteRowRequest) XXX_Size() int {
+	return xxx_messageInfo_ReadModifyWriteRowRequest.Size(m)
+}
+func (m *ReadModifyWriteRowRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadModifyWriteRowRequest.DiscardUnknown(m)
 }
 
-func (m *ReadModifyWriteRowRequest) Reset()                    { *m = ReadModifyWriteRowRequest{} }
-func (m *ReadModifyWriteRowRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReadModifyWriteRowRequest) ProtoMessage()               {}
-func (*ReadModifyWriteRowRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_ReadModifyWriteRowRequest proto.InternalMessageInfo
 
 func (m *ReadModifyWriteRowRequest) GetTableName() string {
 	if m != nil {
@@ -786,13 +1033,35 @@ func (m *ReadModifyWriteRowRequest) GetRules() []*ReadModifyWriteRule {
 // Response message for Bigtable.ReadModifyWriteRow.
 type ReadModifyWriteRowResponse struct {
 	// A Row containing the new contents of all cells modified by the request.
-	Row *Row `protobuf:"bytes,1,opt,name=row" json:"row,omitempty"`
+	Row                  *Row     `protobuf:"bytes,1,opt,name=row,proto3" json:"row,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ReadModifyWriteRowResponse) Reset()                    { *m = ReadModifyWriteRowResponse{} }
-func (m *ReadModifyWriteRowResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReadModifyWriteRowResponse) ProtoMessage()               {}
-func (*ReadModifyWriteRowResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *ReadModifyWriteRowResponse) Reset()         { *m = ReadModifyWriteRowResponse{} }
+func (m *ReadModifyWriteRowResponse) String() string { return proto.CompactTextString(m) }
+func (*ReadModifyWriteRowResponse) ProtoMessage()    {}
+func (*ReadModifyWriteRowResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bigtable_3e4f9d0dda27200f, []int{11}
+}
+func (m *ReadModifyWriteRowResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadModifyWriteRowResponse.Unmarshal(m, b)
+}
+func (m *ReadModifyWriteRowResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadModifyWriteRowResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReadModifyWriteRowResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRowResponse.Merge(dst, src)
+}
+func (m *ReadModifyWriteRowResponse) XXX_Size() int {
+	return xxx_messageInfo_ReadModifyWriteRowResponse.Size(m)
+}
+func (m *ReadModifyWriteRowResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadModifyWriteRowResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReadModifyWriteRowResponse proto.InternalMessageInfo
 
 func (m *ReadModifyWriteRowResponse) GetRow() *Row {
 	if m != nil {
@@ -827,8 +1096,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Bigtable service
-
+// BigtableClient is the client API for Bigtable service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type BigtableClient interface {
 	// Streams back the contents of all requested rows in key order, optionally
 	// applying the same Reader filter to each. Depending on their size,
@@ -867,7 +1137,7 @@ func NewBigtableClient(cc *grpc.ClientConn) BigtableClient {
 }
 
 func (c *bigtableClient) ReadRows(ctx context.Context, in *ReadRowsRequest, opts ...grpc.CallOption) (Bigtable_ReadRowsClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Bigtable_serviceDesc.Streams[0], c.cc, "/google.bigtable.v2.Bigtable/ReadRows", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Bigtable_serviceDesc.Streams[0], "/google.bigtable.v2.Bigtable/ReadRows", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -899,7 +1169,7 @@ func (x *bigtableReadRowsClient) Recv() (*ReadRowsResponse, error) {
 }
 
 func (c *bigtableClient) SampleRowKeys(ctx context.Context, in *SampleRowKeysRequest, opts ...grpc.CallOption) (Bigtable_SampleRowKeysClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Bigtable_serviceDesc.Streams[1], c.cc, "/google.bigtable.v2.Bigtable/SampleRowKeys", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Bigtable_serviceDesc.Streams[1], "/google.bigtable.v2.Bigtable/SampleRowKeys", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -932,7 +1202,7 @@ func (x *bigtableSampleRowKeysClient) Recv() (*SampleRowKeysResponse, error) {
 
 func (c *bigtableClient) MutateRow(ctx context.Context, in *MutateRowRequest, opts ...grpc.CallOption) (*MutateRowResponse, error) {
 	out := new(MutateRowResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.v2.Bigtable/MutateRow", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.v2.Bigtable/MutateRow", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -940,7 +1210,7 @@ func (c *bigtableClient) MutateRow(ctx context.Context, in *MutateRowRequest, op
 }
 
 func (c *bigtableClient) MutateRows(ctx context.Context, in *MutateRowsRequest, opts ...grpc.CallOption) (Bigtable_MutateRowsClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Bigtable_serviceDesc.Streams[2], c.cc, "/google.bigtable.v2.Bigtable/MutateRows", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Bigtable_serviceDesc.Streams[2], "/google.bigtable.v2.Bigtable/MutateRows", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -973,7 +1243,7 @@ func (x *bigtableMutateRowsClient) Recv() (*MutateRowsResponse, error) {
 
 func (c *bigtableClient) CheckAndMutateRow(ctx context.Context, in *CheckAndMutateRowRequest, opts ...grpc.CallOption) (*CheckAndMutateRowResponse, error) {
 	out := new(CheckAndMutateRowResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.v2.Bigtable/CheckAndMutateRow", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.v2.Bigtable/CheckAndMutateRow", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -982,15 +1252,14 @@ func (c *bigtableClient) CheckAndMutateRow(ctx context.Context, in *CheckAndMuta
 
 func (c *bigtableClient) ReadModifyWriteRow(ctx context.Context, in *ReadModifyWriteRowRequest, opts ...grpc.CallOption) (*ReadModifyWriteRowResponse, error) {
 	out := new(ReadModifyWriteRowResponse)
-	err := grpc.Invoke(ctx, "/google.bigtable.v2.Bigtable/ReadModifyWriteRow", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bigtable.v2.Bigtable/ReadModifyWriteRow", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Bigtable service
-
+// BigtableServer is the server API for Bigtable service.
 type BigtableServer interface {
 	// Streams back the contents of all requested rows in key order, optionally
 	// applying the same Reader filter to each. Depending on their size,
@@ -1178,9 +1447,11 @@ var _Bigtable_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/bigtable/v2/bigtable.proto",
 }
 
-func init() { proto.RegisterFile("google/bigtable/v2/bigtable.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/bigtable/v2/bigtable.proto", fileDescriptor_bigtable_3e4f9d0dda27200f)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_bigtable_3e4f9d0dda27200f = []byte{
 	// 1210 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x41, 0x6f, 0x1b, 0x45,
 	0x14, 0x66, 0xec, 0xd8, 0xf1, 0xbe, 0xa4, 0x4d, 0x32, 0x84, 0x76, 0x6b, 0x5a, 0x70, 0x97, 0x16,
diff --git a/vendor/google.golang.org/genproto/googleapis/bigtable/v2/data.pb.go b/vendor/google.golang.org/genproto/googleapis/bigtable/v2/data.pb.go
index a24ba5af..71b56ba3 100644
--- a/vendor/google.golang.org/genproto/googleapis/bigtable/v2/data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bigtable/v2/data.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bigtable/v2/data.proto
 
-package bigtable
+package bigtable // import "google.golang.org/genproto/googleapis/bigtable/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Specifies the complete (requested) contents of a single row of a table.
 // Rows which exceed 256MiB in size cannot be read in full.
 type Row struct {
@@ -21,13 +27,35 @@ type Row struct {
 	Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// May be empty, but only if the entire row is empty.
 	// The mutual ordering of column families is not specified.
-	Families []*Family `protobuf:"bytes,2,rep,name=families" json:"families,omitempty"`
+	Families             []*Family `protobuf:"bytes,2,rep,name=families,proto3" json:"families,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *Row) Reset()                    { *m = Row{} }
-func (m *Row) String() string            { return proto.CompactTextString(m) }
-func (*Row) ProtoMessage()               {}
-func (*Row) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *Row) Reset()         { *m = Row{} }
+func (m *Row) String() string { return proto.CompactTextString(m) }
+func (*Row) ProtoMessage()    {}
+func (*Row) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{0}
+}
+func (m *Row) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Row.Unmarshal(m, b)
+}
+func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
+}
+func (dst *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(dst, src)
+}
+func (m *Row) XXX_Size() int {
+	return xxx_messageInfo_Row.Size(m)
+}
+func (m *Row) XXX_DiscardUnknown() {
+	xxx_messageInfo_Row.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Row proto.InternalMessageInfo
 
 func (m *Row) GetKey() []byte {
 	if m != nil {
@@ -52,15 +80,37 @@ type Family struct {
 	// Must match `[-_.a-zA-Z0-9]+`, except that AggregatingRowProcessors may
 	// produce cells in a sentinel family with an empty name.
 	// Must be no greater than 64 characters in length.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Must not be empty. Sorted in order of increasing "qualifier".
-	Columns []*Column `protobuf:"bytes,2,rep,name=columns" json:"columns,omitempty"`
+	Columns              []*Column `protobuf:"bytes,2,rep,name=columns,proto3" json:"columns,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *Family) Reset()                    { *m = Family{} }
-func (m *Family) String() string            { return proto.CompactTextString(m) }
-func (*Family) ProtoMessage()               {}
-func (*Family) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *Family) Reset()         { *m = Family{} }
+func (m *Family) String() string { return proto.CompactTextString(m) }
+func (*Family) ProtoMessage()    {}
+func (*Family) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{1}
+}
+func (m *Family) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Family.Unmarshal(m, b)
+}
+func (m *Family) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Family.Marshal(b, m, deterministic)
+}
+func (dst *Family) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Family.Merge(dst, src)
+}
+func (m *Family) XXX_Size() int {
+	return xxx_messageInfo_Family.Size(m)
+}
+func (m *Family) XXX_DiscardUnknown() {
+	xxx_messageInfo_Family.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Family proto.InternalMessageInfo
 
 func (m *Family) GetName() string {
 	if m != nil {
@@ -86,13 +136,35 @@ type Column struct {
 	// length.
 	Qualifier []byte `protobuf:"bytes,1,opt,name=qualifier,proto3" json:"qualifier,omitempty"`
 	// Must not be empty. Sorted in order of decreasing "timestamp_micros".
-	Cells []*Cell `protobuf:"bytes,2,rep,name=cells" json:"cells,omitempty"`
+	Cells                []*Cell  `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Column) Reset()         { *m = Column{} }
+func (m *Column) String() string { return proto.CompactTextString(m) }
+func (*Column) ProtoMessage()    {}
+func (*Column) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{2}
+}
+func (m *Column) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Column.Unmarshal(m, b)
+}
+func (m *Column) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Column.Marshal(b, m, deterministic)
+}
+func (dst *Column) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Column.Merge(dst, src)
+}
+func (m *Column) XXX_Size() int {
+	return xxx_messageInfo_Column.Size(m)
+}
+func (m *Column) XXX_DiscardUnknown() {
+	xxx_messageInfo_Column.DiscardUnknown(m)
 }
 
-func (m *Column) Reset()                    { *m = Column{} }
-func (m *Column) String() string            { return proto.CompactTextString(m) }
-func (*Column) ProtoMessage()               {}
-func (*Column) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_Column proto.InternalMessageInfo
 
 func (m *Column) GetQualifier() []byte {
 	if m != nil {
@@ -116,19 +188,41 @@ type Cell struct {
 	// a coarser granularity to further restrict the allowed values. For
 	// example, a table which specifies millisecond granularity will only allow
 	// values of `timestamp_micros` which are multiples of 1000.
-	TimestampMicros int64 `protobuf:"varint,1,opt,name=timestamp_micros,json=timestampMicros" json:"timestamp_micros,omitempty"`
+	TimestampMicros int64 `protobuf:"varint,1,opt,name=timestamp_micros,json=timestampMicros,proto3" json:"timestamp_micros,omitempty"`
 	// The value stored in the cell.
 	// May contain any byte string, including the empty string, up to 100MiB in
 	// length.
 	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Labels applied to the cell by a [RowFilter][google.bigtable.v2.RowFilter].
-	Labels []string `protobuf:"bytes,3,rep,name=labels" json:"labels,omitempty"`
+	Labels               []string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Cell) Reset()                    { *m = Cell{} }
-func (m *Cell) String() string            { return proto.CompactTextString(m) }
-func (*Cell) ProtoMessage()               {}
-func (*Cell) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *Cell) Reset()         { *m = Cell{} }
+func (m *Cell) String() string { return proto.CompactTextString(m) }
+func (*Cell) ProtoMessage()    {}
+func (*Cell) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{3}
+}
+func (m *Cell) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cell.Unmarshal(m, b)
+}
+func (m *Cell) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cell.Marshal(b, m, deterministic)
+}
+func (dst *Cell) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cell.Merge(dst, src)
+}
+func (m *Cell) XXX_Size() int {
+	return xxx_messageInfo_Cell.Size(m)
+}
+func (m *Cell) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cell.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Cell proto.InternalMessageInfo
 
 func (m *Cell) GetTimestampMicros() int64 {
 	if m != nil {
@@ -166,38 +260,51 @@ type RowRange struct {
 	// Types that are valid to be assigned to EndKey:
 	//	*RowRange_EndKeyOpen
 	//	*RowRange_EndKeyClosed
-	EndKey isRowRange_EndKey `protobuf_oneof:"end_key"`
+	EndKey               isRowRange_EndKey `protobuf_oneof:"end_key"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *RowRange) Reset()                    { *m = RowRange{} }
-func (m *RowRange) String() string            { return proto.CompactTextString(m) }
-func (*RowRange) ProtoMessage()               {}
-func (*RowRange) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (m *RowRange) Reset()         { *m = RowRange{} }
+func (m *RowRange) String() string { return proto.CompactTextString(m) }
+func (*RowRange) ProtoMessage()    {}
+func (*RowRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{4}
+}
+func (m *RowRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowRange.Unmarshal(m, b)
+}
+func (m *RowRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowRange.Marshal(b, m, deterministic)
+}
+func (dst *RowRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowRange.Merge(dst, src)
+}
+func (m *RowRange) XXX_Size() int {
+	return xxx_messageInfo_RowRange.Size(m)
+}
+func (m *RowRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RowRange proto.InternalMessageInfo
 
 type isRowRange_StartKey interface {
 	isRowRange_StartKey()
 }
-type isRowRange_EndKey interface {
-	isRowRange_EndKey()
-}
 
 type RowRange_StartKeyClosed struct {
 	StartKeyClosed []byte `protobuf:"bytes,1,opt,name=start_key_closed,json=startKeyClosed,proto3,oneof"`
 }
+
 type RowRange_StartKeyOpen struct {
 	StartKeyOpen []byte `protobuf:"bytes,2,opt,name=start_key_open,json=startKeyOpen,proto3,oneof"`
 }
-type RowRange_EndKeyOpen struct {
-	EndKeyOpen []byte `protobuf:"bytes,3,opt,name=end_key_open,json=endKeyOpen,proto3,oneof"`
-}
-type RowRange_EndKeyClosed struct {
-	EndKeyClosed []byte `protobuf:"bytes,4,opt,name=end_key_closed,json=endKeyClosed,proto3,oneof"`
-}
 
 func (*RowRange_StartKeyClosed) isRowRange_StartKey() {}
-func (*RowRange_StartKeyOpen) isRowRange_StartKey()   {}
-func (*RowRange_EndKeyOpen) isRowRange_EndKey()       {}
-func (*RowRange_EndKeyClosed) isRowRange_EndKey()     {}
+
+func (*RowRange_StartKeyOpen) isRowRange_StartKey() {}
 
 func (m *RowRange) GetStartKey() isRowRange_StartKey {
 	if m != nil {
@@ -205,12 +312,6 @@ func (m *RowRange) GetStartKey() isRowRange_StartKey {
 	}
 	return nil
 }
-func (m *RowRange) GetEndKey() isRowRange_EndKey {
-	if m != nil {
-		return m.EndKey
-	}
-	return nil
-}
 
 func (m *RowRange) GetStartKeyClosed() []byte {
 	if x, ok := m.GetStartKey().(*RowRange_StartKeyClosed); ok {
@@ -226,6 +327,29 @@ func (m *RowRange) GetStartKeyOpen() []byte {
 	return nil
 }
 
+type isRowRange_EndKey interface {
+	isRowRange_EndKey()
+}
+
+type RowRange_EndKeyOpen struct {
+	EndKeyOpen []byte `protobuf:"bytes,3,opt,name=end_key_open,json=endKeyOpen,proto3,oneof"`
+}
+
+type RowRange_EndKeyClosed struct {
+	EndKeyClosed []byte `protobuf:"bytes,4,opt,name=end_key_closed,json=endKeyClosed,proto3,oneof"`
+}
+
+func (*RowRange_EndKeyOpen) isRowRange_EndKey() {}
+
+func (*RowRange_EndKeyClosed) isRowRange_EndKey() {}
+
+func (m *RowRange) GetEndKey() isRowRange_EndKey {
+	if m != nil {
+		return m.EndKey
+	}
+	return nil
+}
+
 func (m *RowRange) GetEndKeyOpen() []byte {
 	if x, ok := m.GetEndKey().(*RowRange_EndKeyOpen); ok {
 		return x.EndKeyOpen
@@ -320,11 +444,11 @@ func _RowRange_OneofSizer(msg proto.Message) (n int) {
 	// start_key
 	switch x := m.StartKey.(type) {
 	case *RowRange_StartKeyClosed:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartKeyClosed)))
 		n += len(x.StartKeyClosed)
 	case *RowRange_StartKeyOpen:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartKeyOpen)))
 		n += len(x.StartKeyOpen)
 	case nil:
@@ -334,11 +458,11 @@ func _RowRange_OneofSizer(msg proto.Message) (n int) {
 	// end_key
 	switch x := m.EndKey.(type) {
 	case *RowRange_EndKeyOpen:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndKeyOpen)))
 		n += len(x.EndKeyOpen)
 	case *RowRange_EndKeyClosed:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndKeyClosed)))
 		n += len(x.EndKeyClosed)
 	case nil:
@@ -353,13 +477,35 @@ type RowSet struct {
 	// Single rows included in the set.
 	RowKeys [][]byte `protobuf:"bytes,1,rep,name=row_keys,json=rowKeys,proto3" json:"row_keys,omitempty"`
 	// Contiguous row ranges included in the set.
-	RowRanges []*RowRange `protobuf:"bytes,2,rep,name=row_ranges,json=rowRanges" json:"row_ranges,omitempty"`
+	RowRanges            []*RowRange `protobuf:"bytes,2,rep,name=row_ranges,json=rowRanges,proto3" json:"row_ranges,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *RowSet) Reset()                    { *m = RowSet{} }
-func (m *RowSet) String() string            { return proto.CompactTextString(m) }
-func (*RowSet) ProtoMessage()               {}
-func (*RowSet) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *RowSet) Reset()         { *m = RowSet{} }
+func (m *RowSet) String() string { return proto.CompactTextString(m) }
+func (*RowSet) ProtoMessage()    {}
+func (*RowSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{5}
+}
+func (m *RowSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowSet.Unmarshal(m, b)
+}
+func (m *RowSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowSet.Marshal(b, m, deterministic)
+}
+func (dst *RowSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowSet.Merge(dst, src)
+}
+func (m *RowSet) XXX_Size() int {
+	return xxx_messageInfo_RowSet.Size(m)
+}
+func (m *RowSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowSet.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RowSet proto.InternalMessageInfo
 
 func (m *RowSet) GetRowKeys() [][]byte {
 	if m != nil {
@@ -381,7 +527,7 @@ func (m *RowSet) GetRowRanges() []*RowRange {
 // inclusive or exclusive.
 type ColumnRange struct {
 	// The name of the column family within which this range falls.
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The column qualifier at which to start the range (within `column_family`).
 	// If neither field is set, interpreted as the empty string, inclusive.
 	//
@@ -395,38 +541,58 @@ type ColumnRange struct {
 	// Types that are valid to be assigned to EndQualifier:
 	//	*ColumnRange_EndQualifierClosed
 	//	*ColumnRange_EndQualifierOpen
-	EndQualifier isColumnRange_EndQualifier `protobuf_oneof:"end_qualifier"`
+	EndQualifier         isColumnRange_EndQualifier `protobuf_oneof:"end_qualifier"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *ColumnRange) Reset()         { *m = ColumnRange{} }
+func (m *ColumnRange) String() string { return proto.CompactTextString(m) }
+func (*ColumnRange) ProtoMessage()    {}
+func (*ColumnRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{6}
+}
+func (m *ColumnRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColumnRange.Unmarshal(m, b)
 }
+func (m *ColumnRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColumnRange.Marshal(b, m, deterministic)
+}
+func (dst *ColumnRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnRange.Merge(dst, src)
+}
+func (m *ColumnRange) XXX_Size() int {
+	return xxx_messageInfo_ColumnRange.Size(m)
+}
+func (m *ColumnRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColumnRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ColumnRange proto.InternalMessageInfo
 
-func (m *ColumnRange) Reset()                    { *m = ColumnRange{} }
-func (m *ColumnRange) String() string            { return proto.CompactTextString(m) }
-func (*ColumnRange) ProtoMessage()               {}
-func (*ColumnRange) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *ColumnRange) GetFamilyName() string {
+	if m != nil {
+		return m.FamilyName
+	}
+	return ""
+}
 
 type isColumnRange_StartQualifier interface {
 	isColumnRange_StartQualifier()
 }
-type isColumnRange_EndQualifier interface {
-	isColumnRange_EndQualifier()
-}
 
 type ColumnRange_StartQualifierClosed struct {
 	StartQualifierClosed []byte `protobuf:"bytes,2,opt,name=start_qualifier_closed,json=startQualifierClosed,proto3,oneof"`
 }
+
 type ColumnRange_StartQualifierOpen struct {
 	StartQualifierOpen []byte `protobuf:"bytes,3,opt,name=start_qualifier_open,json=startQualifierOpen,proto3,oneof"`
 }
-type ColumnRange_EndQualifierClosed struct {
-	EndQualifierClosed []byte `protobuf:"bytes,4,opt,name=end_qualifier_closed,json=endQualifierClosed,proto3,oneof"`
-}
-type ColumnRange_EndQualifierOpen struct {
-	EndQualifierOpen []byte `protobuf:"bytes,5,opt,name=end_qualifier_open,json=endQualifierOpen,proto3,oneof"`
-}
 
 func (*ColumnRange_StartQualifierClosed) isColumnRange_StartQualifier() {}
-func (*ColumnRange_StartQualifierOpen) isColumnRange_StartQualifier()   {}
-func (*ColumnRange_EndQualifierClosed) isColumnRange_EndQualifier()     {}
-func (*ColumnRange_EndQualifierOpen) isColumnRange_EndQualifier()       {}
+
+func (*ColumnRange_StartQualifierOpen) isColumnRange_StartQualifier() {}
 
 func (m *ColumnRange) GetStartQualifier() isColumnRange_StartQualifier {
 	if m != nil {
@@ -434,19 +600,6 @@ func (m *ColumnRange) GetStartQualifier() isColumnRange_StartQualifier {
 	}
 	return nil
 }
-func (m *ColumnRange) GetEndQualifier() isColumnRange_EndQualifier {
-	if m != nil {
-		return m.EndQualifier
-	}
-	return nil
-}
-
-func (m *ColumnRange) GetFamilyName() string {
-	if m != nil {
-		return m.FamilyName
-	}
-	return ""
-}
 
 func (m *ColumnRange) GetStartQualifierClosed() []byte {
 	if x, ok := m.GetStartQualifier().(*ColumnRange_StartQualifierClosed); ok {
@@ -462,6 +615,29 @@ func (m *ColumnRange) GetStartQualifierOpen() []byte {
 	return nil
 }
 
+type isColumnRange_EndQualifier interface {
+	isColumnRange_EndQualifier()
+}
+
+type ColumnRange_EndQualifierClosed struct {
+	EndQualifierClosed []byte `protobuf:"bytes,4,opt,name=end_qualifier_closed,json=endQualifierClosed,proto3,oneof"`
+}
+
+type ColumnRange_EndQualifierOpen struct {
+	EndQualifierOpen []byte `protobuf:"bytes,5,opt,name=end_qualifier_open,json=endQualifierOpen,proto3,oneof"`
+}
+
+func (*ColumnRange_EndQualifierClosed) isColumnRange_EndQualifier() {}
+
+func (*ColumnRange_EndQualifierOpen) isColumnRange_EndQualifier() {}
+
+func (m *ColumnRange) GetEndQualifier() isColumnRange_EndQualifier {
+	if m != nil {
+		return m.EndQualifier
+	}
+	return nil
+}
+
 func (m *ColumnRange) GetEndQualifierClosed() []byte {
 	if x, ok := m.GetEndQualifier().(*ColumnRange_EndQualifierClosed); ok {
 		return x.EndQualifierClosed
@@ -556,11 +732,11 @@ func _ColumnRange_OneofSizer(msg proto.Message) (n int) {
 	// start_qualifier
 	switch x := m.StartQualifier.(type) {
 	case *ColumnRange_StartQualifierClosed:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartQualifierClosed)))
 		n += len(x.StartQualifierClosed)
 	case *ColumnRange_StartQualifierOpen:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartQualifierOpen)))
 		n += len(x.StartQualifierOpen)
 	case nil:
@@ -570,11 +746,11 @@ func _ColumnRange_OneofSizer(msg proto.Message) (n int) {
 	// end_qualifier
 	switch x := m.EndQualifier.(type) {
 	case *ColumnRange_EndQualifierClosed:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndQualifierClosed)))
 		n += len(x.EndQualifierClosed)
 	case *ColumnRange_EndQualifierOpen:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndQualifierOpen)))
 		n += len(x.EndQualifierOpen)
 	case nil:
@@ -587,15 +763,37 @@ func _ColumnRange_OneofSizer(msg proto.Message) (n int) {
 // Specified a contiguous range of microsecond timestamps.
 type TimestampRange struct {
 	// Inclusive lower bound. If left empty, interpreted as 0.
-	StartTimestampMicros int64 `protobuf:"varint,1,opt,name=start_timestamp_micros,json=startTimestampMicros" json:"start_timestamp_micros,omitempty"`
+	StartTimestampMicros int64 `protobuf:"varint,1,opt,name=start_timestamp_micros,json=startTimestampMicros,proto3" json:"start_timestamp_micros,omitempty"`
 	// Exclusive upper bound. If left empty, interpreted as infinity.
-	EndTimestampMicros int64 `protobuf:"varint,2,opt,name=end_timestamp_micros,json=endTimestampMicros" json:"end_timestamp_micros,omitempty"`
+	EndTimestampMicros   int64    `protobuf:"varint,2,opt,name=end_timestamp_micros,json=endTimestampMicros,proto3" json:"end_timestamp_micros,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TimestampRange) Reset()         { *m = TimestampRange{} }
+func (m *TimestampRange) String() string { return proto.CompactTextString(m) }
+func (*TimestampRange) ProtoMessage()    {}
+func (*TimestampRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{7}
+}
+func (m *TimestampRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimestampRange.Unmarshal(m, b)
+}
+func (m *TimestampRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimestampRange.Marshal(b, m, deterministic)
+}
+func (dst *TimestampRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampRange.Merge(dst, src)
+}
+func (m *TimestampRange) XXX_Size() int {
+	return xxx_messageInfo_TimestampRange.Size(m)
+}
+func (m *TimestampRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimestampRange.DiscardUnknown(m)
 }
 
-func (m *TimestampRange) Reset()                    { *m = TimestampRange{} }
-func (m *TimestampRange) String() string            { return proto.CompactTextString(m) }
-func (*TimestampRange) ProtoMessage()               {}
-func (*TimestampRange) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_TimestampRange proto.InternalMessageInfo
 
 func (m *TimestampRange) GetStartTimestampMicros() int64 {
 	if m != nil {
@@ -626,38 +824,51 @@ type ValueRange struct {
 	// Types that are valid to be assigned to EndValue:
 	//	*ValueRange_EndValueClosed
 	//	*ValueRange_EndValueOpen
-	EndValue isValueRange_EndValue `protobuf_oneof:"end_value"`
+	EndValue             isValueRange_EndValue `protobuf_oneof:"end_value"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *ValueRange) Reset()                    { *m = ValueRange{} }
-func (m *ValueRange) String() string            { return proto.CompactTextString(m) }
-func (*ValueRange) ProtoMessage()               {}
-func (*ValueRange) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+func (m *ValueRange) Reset()         { *m = ValueRange{} }
+func (m *ValueRange) String() string { return proto.CompactTextString(m) }
+func (*ValueRange) ProtoMessage()    {}
+func (*ValueRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{8}
+}
+func (m *ValueRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ValueRange.Unmarshal(m, b)
+}
+func (m *ValueRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ValueRange.Marshal(b, m, deterministic)
+}
+func (dst *ValueRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValueRange.Merge(dst, src)
+}
+func (m *ValueRange) XXX_Size() int {
+	return xxx_messageInfo_ValueRange.Size(m)
+}
+func (m *ValueRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_ValueRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ValueRange proto.InternalMessageInfo
 
 type isValueRange_StartValue interface {
 	isValueRange_StartValue()
 }
-type isValueRange_EndValue interface {
-	isValueRange_EndValue()
-}
 
 type ValueRange_StartValueClosed struct {
 	StartValueClosed []byte `protobuf:"bytes,1,opt,name=start_value_closed,json=startValueClosed,proto3,oneof"`
 }
+
 type ValueRange_StartValueOpen struct {
 	StartValueOpen []byte `protobuf:"bytes,2,opt,name=start_value_open,json=startValueOpen,proto3,oneof"`
 }
-type ValueRange_EndValueClosed struct {
-	EndValueClosed []byte `protobuf:"bytes,3,opt,name=end_value_closed,json=endValueClosed,proto3,oneof"`
-}
-type ValueRange_EndValueOpen struct {
-	EndValueOpen []byte `protobuf:"bytes,4,opt,name=end_value_open,json=endValueOpen,proto3,oneof"`
-}
 
 func (*ValueRange_StartValueClosed) isValueRange_StartValue() {}
-func (*ValueRange_StartValueOpen) isValueRange_StartValue()   {}
-func (*ValueRange_EndValueClosed) isValueRange_EndValue()     {}
-func (*ValueRange_EndValueOpen) isValueRange_EndValue()       {}
+
+func (*ValueRange_StartValueOpen) isValueRange_StartValue() {}
 
 func (m *ValueRange) GetStartValue() isValueRange_StartValue {
 	if m != nil {
@@ -665,12 +876,6 @@ func (m *ValueRange) GetStartValue() isValueRange_StartValue {
 	}
 	return nil
 }
-func (m *ValueRange) GetEndValue() isValueRange_EndValue {
-	if m != nil {
-		return m.EndValue
-	}
-	return nil
-}
 
 func (m *ValueRange) GetStartValueClosed() []byte {
 	if x, ok := m.GetStartValue().(*ValueRange_StartValueClosed); ok {
@@ -686,6 +891,29 @@ func (m *ValueRange) GetStartValueOpen() []byte {
 	return nil
 }
 
+type isValueRange_EndValue interface {
+	isValueRange_EndValue()
+}
+
+type ValueRange_EndValueClosed struct {
+	EndValueClosed []byte `protobuf:"bytes,3,opt,name=end_value_closed,json=endValueClosed,proto3,oneof"`
+}
+
+type ValueRange_EndValueOpen struct {
+	EndValueOpen []byte `protobuf:"bytes,4,opt,name=end_value_open,json=endValueOpen,proto3,oneof"`
+}
+
+func (*ValueRange_EndValueClosed) isValueRange_EndValue() {}
+
+func (*ValueRange_EndValueOpen) isValueRange_EndValue() {}
+
+func (m *ValueRange) GetEndValue() isValueRange_EndValue {
+	if m != nil {
+		return m.EndValue
+	}
+	return nil
+}
+
 func (m *ValueRange) GetEndValueClosed() []byte {
 	if x, ok := m.GetEndValue().(*ValueRange_EndValueClosed); ok {
 		return x.EndValueClosed
@@ -780,11 +1008,11 @@ func _ValueRange_OneofSizer(msg proto.Message) (n int) {
 	// start_value
 	switch x := m.StartValue.(type) {
 	case *ValueRange_StartValueClosed:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartValueClosed)))
 		n += len(x.StartValueClosed)
 	case *ValueRange_StartValueOpen:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StartValueOpen)))
 		n += len(x.StartValueOpen)
 	case nil:
@@ -794,11 +1022,11 @@ func _ValueRange_OneofSizer(msg proto.Message) (n int) {
 	// end_value
 	switch x := m.EndValue.(type) {
 	case *ValueRange_EndValueClosed:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndValueClosed)))
 		n += len(x.EndValueClosed)
 	case *ValueRange_EndValueOpen:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EndValueOpen)))
 		n += len(x.EndValueOpen)
 	case nil:
@@ -865,95 +1093,153 @@ type RowFilter struct {
 	//	*RowFilter_CellsPerColumnLimitFilter
 	//	*RowFilter_StripValueTransformer
 	//	*RowFilter_ApplyLabelTransformer
-	Filter isRowFilter_Filter `protobuf_oneof:"filter"`
+	Filter               isRowFilter_Filter `protobuf_oneof:"filter"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *RowFilter) Reset()                    { *m = RowFilter{} }
-func (m *RowFilter) String() string            { return proto.CompactTextString(m) }
-func (*RowFilter) ProtoMessage()               {}
-func (*RowFilter) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+func (m *RowFilter) Reset()         { *m = RowFilter{} }
+func (m *RowFilter) String() string { return proto.CompactTextString(m) }
+func (*RowFilter) ProtoMessage()    {}
+func (*RowFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{9}
+}
+func (m *RowFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowFilter.Unmarshal(m, b)
+}
+func (m *RowFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowFilter.Marshal(b, m, deterministic)
+}
+func (dst *RowFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter.Merge(dst, src)
+}
+func (m *RowFilter) XXX_Size() int {
+	return xxx_messageInfo_RowFilter.Size(m)
+}
+func (m *RowFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowFilter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RowFilter proto.InternalMessageInfo
 
 type isRowFilter_Filter interface {
 	isRowFilter_Filter()
 }
 
 type RowFilter_Chain_ struct {
-	Chain *RowFilter_Chain `protobuf:"bytes,1,opt,name=chain,oneof"`
+	Chain *RowFilter_Chain `protobuf:"bytes,1,opt,name=chain,proto3,oneof"`
 }
+
 type RowFilter_Interleave_ struct {
-	Interleave *RowFilter_Interleave `protobuf:"bytes,2,opt,name=interleave,oneof"`
+	Interleave *RowFilter_Interleave `protobuf:"bytes,2,opt,name=interleave,proto3,oneof"`
 }
+
 type RowFilter_Condition_ struct {
-	Condition *RowFilter_Condition `protobuf:"bytes,3,opt,name=condition,oneof"`
+	Condition *RowFilter_Condition `protobuf:"bytes,3,opt,name=condition,proto3,oneof"`
 }
+
 type RowFilter_Sink struct {
-	Sink bool `protobuf:"varint,16,opt,name=sink,oneof"`
+	Sink bool `protobuf:"varint,16,opt,name=sink,proto3,oneof"`
 }
+
 type RowFilter_PassAllFilter struct {
-	PassAllFilter bool `protobuf:"varint,17,opt,name=pass_all_filter,json=passAllFilter,oneof"`
+	PassAllFilter bool `protobuf:"varint,17,opt,name=pass_all_filter,json=passAllFilter,proto3,oneof"`
 }
+
 type RowFilter_BlockAllFilter struct {
-	BlockAllFilter bool `protobuf:"varint,18,opt,name=block_all_filter,json=blockAllFilter,oneof"`
+	BlockAllFilter bool `protobuf:"varint,18,opt,name=block_all_filter,json=blockAllFilter,proto3,oneof"`
 }
+
 type RowFilter_RowKeyRegexFilter struct {
 	RowKeyRegexFilter []byte `protobuf:"bytes,4,opt,name=row_key_regex_filter,json=rowKeyRegexFilter,proto3,oneof"`
 }
+
 type RowFilter_RowSampleFilter struct {
-	RowSampleFilter float64 `protobuf:"fixed64,14,opt,name=row_sample_filter,json=rowSampleFilter,oneof"`
+	RowSampleFilter float64 `protobuf:"fixed64,14,opt,name=row_sample_filter,json=rowSampleFilter,proto3,oneof"`
 }
+
 type RowFilter_FamilyNameRegexFilter struct {
-	FamilyNameRegexFilter string `protobuf:"bytes,5,opt,name=family_name_regex_filter,json=familyNameRegexFilter,oneof"`
+	FamilyNameRegexFilter string `protobuf:"bytes,5,opt,name=family_name_regex_filter,json=familyNameRegexFilter,proto3,oneof"`
 }
+
 type RowFilter_ColumnQualifierRegexFilter struct {
 	ColumnQualifierRegexFilter []byte `protobuf:"bytes,6,opt,name=column_qualifier_regex_filter,json=columnQualifierRegexFilter,proto3,oneof"`
 }
+
 type RowFilter_ColumnRangeFilter struct {
-	ColumnRangeFilter *ColumnRange `protobuf:"bytes,7,opt,name=column_range_filter,json=columnRangeFilter,oneof"`
+	ColumnRangeFilter *ColumnRange `protobuf:"bytes,7,opt,name=column_range_filter,json=columnRangeFilter,proto3,oneof"`
 }
+
 type RowFilter_TimestampRangeFilter struct {
-	TimestampRangeFilter *TimestampRange `protobuf:"bytes,8,opt,name=timestamp_range_filter,json=timestampRangeFilter,oneof"`
+	TimestampRangeFilter *TimestampRange `protobuf:"bytes,8,opt,name=timestamp_range_filter,json=timestampRangeFilter,proto3,oneof"`
 }
+
 type RowFilter_ValueRegexFilter struct {
 	ValueRegexFilter []byte `protobuf:"bytes,9,opt,name=value_regex_filter,json=valueRegexFilter,proto3,oneof"`
 }
+
 type RowFilter_ValueRangeFilter struct {
-	ValueRangeFilter *ValueRange `protobuf:"bytes,15,opt,name=value_range_filter,json=valueRangeFilter,oneof"`
+	ValueRangeFilter *ValueRange `protobuf:"bytes,15,opt,name=value_range_filter,json=valueRangeFilter,proto3,oneof"`
 }
+
 type RowFilter_CellsPerRowOffsetFilter struct {
-	CellsPerRowOffsetFilter int32 `protobuf:"varint,10,opt,name=cells_per_row_offset_filter,json=cellsPerRowOffsetFilter,oneof"`
+	CellsPerRowOffsetFilter int32 `protobuf:"varint,10,opt,name=cells_per_row_offset_filter,json=cellsPerRowOffsetFilter,proto3,oneof"`
 }
+
 type RowFilter_CellsPerRowLimitFilter struct {
-	CellsPerRowLimitFilter int32 `protobuf:"varint,11,opt,name=cells_per_row_limit_filter,json=cellsPerRowLimitFilter,oneof"`
+	CellsPerRowLimitFilter int32 `protobuf:"varint,11,opt,name=cells_per_row_limit_filter,json=cellsPerRowLimitFilter,proto3,oneof"`
 }
+
 type RowFilter_CellsPerColumnLimitFilter struct {
-	CellsPerColumnLimitFilter int32 `protobuf:"varint,12,opt,name=cells_per_column_limit_filter,json=cellsPerColumnLimitFilter,oneof"`
+	CellsPerColumnLimitFilter int32 `protobuf:"varint,12,opt,name=cells_per_column_limit_filter,json=cellsPerColumnLimitFilter,proto3,oneof"`
 }
+
 type RowFilter_StripValueTransformer struct {
-	StripValueTransformer bool `protobuf:"varint,13,opt,name=strip_value_transformer,json=stripValueTransformer,oneof"`
+	StripValueTransformer bool `protobuf:"varint,13,opt,name=strip_value_transformer,json=stripValueTransformer,proto3,oneof"`
 }
+
 type RowFilter_ApplyLabelTransformer struct {
-	ApplyLabelTransformer string `protobuf:"bytes,19,opt,name=apply_label_transformer,json=applyLabelTransformer,oneof"`
-}
-
-func (*RowFilter_Chain_) isRowFilter_Filter()                     {}
-func (*RowFilter_Interleave_) isRowFilter_Filter()                {}
-func (*RowFilter_Condition_) isRowFilter_Filter()                 {}
-func (*RowFilter_Sink) isRowFilter_Filter()                       {}
-func (*RowFilter_PassAllFilter) isRowFilter_Filter()              {}
-func (*RowFilter_BlockAllFilter) isRowFilter_Filter()             {}
-func (*RowFilter_RowKeyRegexFilter) isRowFilter_Filter()          {}
-func (*RowFilter_RowSampleFilter) isRowFilter_Filter()            {}
-func (*RowFilter_FamilyNameRegexFilter) isRowFilter_Filter()      {}
+	ApplyLabelTransformer string `protobuf:"bytes,19,opt,name=apply_label_transformer,json=applyLabelTransformer,proto3,oneof"`
+}
+
+func (*RowFilter_Chain_) isRowFilter_Filter() {}
+
+func (*RowFilter_Interleave_) isRowFilter_Filter() {}
+
+func (*RowFilter_Condition_) isRowFilter_Filter() {}
+
+func (*RowFilter_Sink) isRowFilter_Filter() {}
+
+func (*RowFilter_PassAllFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_BlockAllFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_RowKeyRegexFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_RowSampleFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_FamilyNameRegexFilter) isRowFilter_Filter() {}
+
 func (*RowFilter_ColumnQualifierRegexFilter) isRowFilter_Filter() {}
-func (*RowFilter_ColumnRangeFilter) isRowFilter_Filter()          {}
-func (*RowFilter_TimestampRangeFilter) isRowFilter_Filter()       {}
-func (*RowFilter_ValueRegexFilter) isRowFilter_Filter()           {}
-func (*RowFilter_ValueRangeFilter) isRowFilter_Filter()           {}
-func (*RowFilter_CellsPerRowOffsetFilter) isRowFilter_Filter()    {}
-func (*RowFilter_CellsPerRowLimitFilter) isRowFilter_Filter()     {}
-func (*RowFilter_CellsPerColumnLimitFilter) isRowFilter_Filter()  {}
-func (*RowFilter_StripValueTransformer) isRowFilter_Filter()      {}
-func (*RowFilter_ApplyLabelTransformer) isRowFilter_Filter()      {}
+
+func (*RowFilter_ColumnRangeFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_TimestampRangeFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_ValueRegexFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_ValueRangeFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_CellsPerRowOffsetFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_CellsPerRowLimitFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_CellsPerColumnLimitFilter) isRowFilter_Filter() {}
+
+func (*RowFilter_StripValueTransformer) isRowFilter_Filter() {}
+
+func (*RowFilter_ApplyLabelTransformer) isRowFilter_Filter() {}
 
 func (m *RowFilter) GetFilter() isRowFilter_Filter {
 	if m != nil {
@@ -1369,76 +1655,76 @@ func _RowFilter_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Filter.(type) {
 	case *RowFilter_Chain_:
 		s := proto.Size(x.Chain)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_Interleave_:
 		s := proto.Size(x.Interleave)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_Condition_:
 		s := proto.Size(x.Condition)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_Sink:
-		n += proto.SizeVarint(16<<3 | proto.WireVarint)
+		n += 2 // tag and wire
 		n += 1
 	case *RowFilter_PassAllFilter:
-		n += proto.SizeVarint(17<<3 | proto.WireVarint)
+		n += 2 // tag and wire
 		n += 1
 	case *RowFilter_BlockAllFilter:
-		n += proto.SizeVarint(18<<3 | proto.WireVarint)
+		n += 2 // tag and wire
 		n += 1
 	case *RowFilter_RowKeyRegexFilter:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RowKeyRegexFilter)))
 		n += len(x.RowKeyRegexFilter)
 	case *RowFilter_RowSampleFilter:
-		n += proto.SizeVarint(14<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *RowFilter_FamilyNameRegexFilter:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.FamilyNameRegexFilter)))
 		n += len(x.FamilyNameRegexFilter)
 	case *RowFilter_ColumnQualifierRegexFilter:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ColumnQualifierRegexFilter)))
 		n += len(x.ColumnQualifierRegexFilter)
 	case *RowFilter_ColumnRangeFilter:
 		s := proto.Size(x.ColumnRangeFilter)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_TimestampRangeFilter:
 		s := proto.Size(x.TimestampRangeFilter)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_ValueRegexFilter:
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ValueRegexFilter)))
 		n += len(x.ValueRegexFilter)
 	case *RowFilter_ValueRangeFilter:
 		s := proto.Size(x.ValueRangeFilter)
-		n += proto.SizeVarint(15<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RowFilter_CellsPerRowOffsetFilter:
-		n += proto.SizeVarint(10<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.CellsPerRowOffsetFilter))
 	case *RowFilter_CellsPerRowLimitFilter:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.CellsPerRowLimitFilter))
 	case *RowFilter_CellsPerColumnLimitFilter:
-		n += proto.SizeVarint(12<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.CellsPerColumnLimitFilter))
 	case *RowFilter_StripValueTransformer:
-		n += proto.SizeVarint(13<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *RowFilter_ApplyLabelTransformer:
-		n += proto.SizeVarint(19<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ApplyLabelTransformer)))
 		n += len(x.ApplyLabelTransformer)
 	case nil:
@@ -1453,13 +1739,35 @@ type RowFilter_Chain struct {
 	// The elements of "filters" are chained together to process the input row:
 	// in row -> f(0) -> intermediate row -> f(1) -> ... -> f(N) -> out row
 	// The full chain is executed atomically.
-	Filters []*RowFilter `protobuf:"bytes,1,rep,name=filters" json:"filters,omitempty"`
+	Filters              []*RowFilter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *RowFilter_Chain) Reset()                    { *m = RowFilter_Chain{} }
-func (m *RowFilter_Chain) String() string            { return proto.CompactTextString(m) }
-func (*RowFilter_Chain) ProtoMessage()               {}
-func (*RowFilter_Chain) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9, 0} }
+func (m *RowFilter_Chain) Reset()         { *m = RowFilter_Chain{} }
+func (m *RowFilter_Chain) String() string { return proto.CompactTextString(m) }
+func (*RowFilter_Chain) ProtoMessage()    {}
+func (*RowFilter_Chain) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{9, 0}
+}
+func (m *RowFilter_Chain) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowFilter_Chain.Unmarshal(m, b)
+}
+func (m *RowFilter_Chain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowFilter_Chain.Marshal(b, m, deterministic)
+}
+func (dst *RowFilter_Chain) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Chain.Merge(dst, src)
+}
+func (m *RowFilter_Chain) XXX_Size() int {
+	return xxx_messageInfo_RowFilter_Chain.Size(m)
+}
+func (m *RowFilter_Chain) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowFilter_Chain.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RowFilter_Chain proto.InternalMessageInfo
 
 func (m *RowFilter_Chain) GetFilters() []*RowFilter {
 	if m != nil {
@@ -1496,13 +1804,35 @@ type RowFilter_Interleave struct {
 	//     6:                      far,blah,5,x   // identical to #5
 	//
 	// All interleaved filters are executed atomically.
-	Filters []*RowFilter `protobuf:"bytes,1,rep,name=filters" json:"filters,omitempty"`
+	Filters              []*RowFilter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *RowFilter_Interleave) Reset()         { *m = RowFilter_Interleave{} }
+func (m *RowFilter_Interleave) String() string { return proto.CompactTextString(m) }
+func (*RowFilter_Interleave) ProtoMessage()    {}
+func (*RowFilter_Interleave) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{9, 1}
+}
+func (m *RowFilter_Interleave) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowFilter_Interleave.Unmarshal(m, b)
+}
+func (m *RowFilter_Interleave) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowFilter_Interleave.Marshal(b, m, deterministic)
+}
+func (dst *RowFilter_Interleave) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Interleave.Merge(dst, src)
+}
+func (m *RowFilter_Interleave) XXX_Size() int {
+	return xxx_messageInfo_RowFilter_Interleave.Size(m)
+}
+func (m *RowFilter_Interleave) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowFilter_Interleave.DiscardUnknown(m)
 }
 
-func (m *RowFilter_Interleave) Reset()                    { *m = RowFilter_Interleave{} }
-func (m *RowFilter_Interleave) String() string            { return proto.CompactTextString(m) }
-func (*RowFilter_Interleave) ProtoMessage()               {}
-func (*RowFilter_Interleave) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9, 1} }
+var xxx_messageInfo_RowFilter_Interleave proto.InternalMessageInfo
 
 func (m *RowFilter_Interleave) GetFilters() []*RowFilter {
 	if m != nil {
@@ -1521,20 +1851,42 @@ func (m *RowFilter_Interleave) GetFilters() []*RowFilter {
 type RowFilter_Condition struct {
 	// If `predicate_filter` outputs any cells, then `true_filter` will be
 	// evaluated on the input row. Otherwise, `false_filter` will be evaluated.
-	PredicateFilter *RowFilter `protobuf:"bytes,1,opt,name=predicate_filter,json=predicateFilter" json:"predicate_filter,omitempty"`
+	PredicateFilter *RowFilter `protobuf:"bytes,1,opt,name=predicate_filter,json=predicateFilter,proto3" json:"predicate_filter,omitempty"`
 	// The filter to apply to the input row if `predicate_filter` returns any
 	// results. If not provided, no results will be returned in the true case.
-	TrueFilter *RowFilter `protobuf:"bytes,2,opt,name=true_filter,json=trueFilter" json:"true_filter,omitempty"`
+	TrueFilter *RowFilter `protobuf:"bytes,2,opt,name=true_filter,json=trueFilter,proto3" json:"true_filter,omitempty"`
 	// The filter to apply to the input row if `predicate_filter` does not
 	// return any results. If not provided, no results will be returned in the
 	// false case.
-	FalseFilter *RowFilter `protobuf:"bytes,3,opt,name=false_filter,json=falseFilter" json:"false_filter,omitempty"`
+	FalseFilter          *RowFilter `protobuf:"bytes,3,opt,name=false_filter,json=falseFilter,proto3" json:"false_filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *RowFilter_Condition) Reset()         { *m = RowFilter_Condition{} }
+func (m *RowFilter_Condition) String() string { return proto.CompactTextString(m) }
+func (*RowFilter_Condition) ProtoMessage()    {}
+func (*RowFilter_Condition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{9, 2}
+}
+func (m *RowFilter_Condition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RowFilter_Condition.Unmarshal(m, b)
+}
+func (m *RowFilter_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RowFilter_Condition.Marshal(b, m, deterministic)
+}
+func (dst *RowFilter_Condition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RowFilter_Condition.Merge(dst, src)
+}
+func (m *RowFilter_Condition) XXX_Size() int {
+	return xxx_messageInfo_RowFilter_Condition.Size(m)
+}
+func (m *RowFilter_Condition) XXX_DiscardUnknown() {
+	xxx_messageInfo_RowFilter_Condition.DiscardUnknown(m)
 }
 
-func (m *RowFilter_Condition) Reset()                    { *m = RowFilter_Condition{} }
-func (m *RowFilter_Condition) String() string            { return proto.CompactTextString(m) }
-func (*RowFilter_Condition) ProtoMessage()               {}
-func (*RowFilter_Condition) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9, 2} }
+var xxx_messageInfo_RowFilter_Condition proto.InternalMessageInfo
 
 func (m *RowFilter_Condition) GetPredicateFilter() *RowFilter {
 	if m != nil {
@@ -1566,35 +1918,63 @@ type Mutation struct {
 	//	*Mutation_DeleteFromColumn_
 	//	*Mutation_DeleteFromFamily_
 	//	*Mutation_DeleteFromRow_
-	Mutation isMutation_Mutation `protobuf_oneof:"mutation"`
+	Mutation             isMutation_Mutation `protobuf_oneof:"mutation"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *Mutation) Reset()                    { *m = Mutation{} }
-func (m *Mutation) String() string            { return proto.CompactTextString(m) }
-func (*Mutation) ProtoMessage()               {}
-func (*Mutation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *Mutation) Reset()         { *m = Mutation{} }
+func (m *Mutation) String() string { return proto.CompactTextString(m) }
+func (*Mutation) ProtoMessage()    {}
+func (*Mutation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{10}
+}
+func (m *Mutation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation.Unmarshal(m, b)
+}
+func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
+}
+func (dst *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(dst, src)
+}
+func (m *Mutation) XXX_Size() int {
+	return xxx_messageInfo_Mutation.Size(m)
+}
+func (m *Mutation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation proto.InternalMessageInfo
 
 type isMutation_Mutation interface {
 	isMutation_Mutation()
 }
 
 type Mutation_SetCell_ struct {
-	SetCell *Mutation_SetCell `protobuf:"bytes,1,opt,name=set_cell,json=setCell,oneof"`
+	SetCell *Mutation_SetCell `protobuf:"bytes,1,opt,name=set_cell,json=setCell,proto3,oneof"`
 }
+
 type Mutation_DeleteFromColumn_ struct {
-	DeleteFromColumn *Mutation_DeleteFromColumn `protobuf:"bytes,2,opt,name=delete_from_column,json=deleteFromColumn,oneof"`
+	DeleteFromColumn *Mutation_DeleteFromColumn `protobuf:"bytes,2,opt,name=delete_from_column,json=deleteFromColumn,proto3,oneof"`
 }
+
 type Mutation_DeleteFromFamily_ struct {
-	DeleteFromFamily *Mutation_DeleteFromFamily `protobuf:"bytes,3,opt,name=delete_from_family,json=deleteFromFamily,oneof"`
+	DeleteFromFamily *Mutation_DeleteFromFamily `protobuf:"bytes,3,opt,name=delete_from_family,json=deleteFromFamily,proto3,oneof"`
 }
+
 type Mutation_DeleteFromRow_ struct {
-	DeleteFromRow *Mutation_DeleteFromRow `protobuf:"bytes,4,opt,name=delete_from_row,json=deleteFromRow,oneof"`
+	DeleteFromRow *Mutation_DeleteFromRow `protobuf:"bytes,4,opt,name=delete_from_row,json=deleteFromRow,proto3,oneof"`
 }
 
-func (*Mutation_SetCell_) isMutation_Mutation()          {}
+func (*Mutation_SetCell_) isMutation_Mutation() {}
+
 func (*Mutation_DeleteFromColumn_) isMutation_Mutation() {}
+
 func (*Mutation_DeleteFromFamily_) isMutation_Mutation() {}
-func (*Mutation_DeleteFromRow_) isMutation_Mutation()    {}
+
+func (*Mutation_DeleteFromRow_) isMutation_Mutation() {}
 
 func (m *Mutation) GetMutation() isMutation_Mutation {
 	if m != nil {
@@ -1718,22 +2098,22 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Mutation.(type) {
 	case *Mutation_SetCell_:
 		s := proto.Size(x.SetCell)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_DeleteFromColumn_:
 		s := proto.Size(x.DeleteFromColumn)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_DeleteFromFamily_:
 		s := proto.Size(x.DeleteFromFamily)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_DeleteFromRow_:
 		s := proto.Size(x.DeleteFromRow)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1747,7 +2127,7 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 type Mutation_SetCell struct {
 	// The name of the family into which new data should be written.
 	// Must match `[-_.a-zA-Z0-9]+`
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The qualifier of the column into which new data should be written.
 	// Can be any byte string, including the empty string.
 	ColumnQualifier []byte `protobuf:"bytes,2,opt,name=column_qualifier,json=columnQualifier,proto3" json:"column_qualifier,omitempty"`
@@ -1756,15 +2136,37 @@ type Mutation_SetCell struct {
 	// Otherwise, the client should set this value itself, noting that the
 	// default value is a timestamp of zero if the field is left unspecified.
 	// Values must match the granularity of the table (e.g. micros, millis).
-	TimestampMicros int64 `protobuf:"varint,3,opt,name=timestamp_micros,json=timestampMicros" json:"timestamp_micros,omitempty"`
+	TimestampMicros int64 `protobuf:"varint,3,opt,name=timestamp_micros,json=timestampMicros,proto3" json:"timestamp_micros,omitempty"`
 	// The value to be written into the specified cell.
-	Value []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
+	Value                []byte   `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Mutation_SetCell) Reset()         { *m = Mutation_SetCell{} }
+func (m *Mutation_SetCell) String() string { return proto.CompactTextString(m) }
+func (*Mutation_SetCell) ProtoMessage()    {}
+func (*Mutation_SetCell) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{10, 0}
+}
+func (m *Mutation_SetCell) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_SetCell.Unmarshal(m, b)
+}
+func (m *Mutation_SetCell) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_SetCell.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_SetCell) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_SetCell.Merge(dst, src)
+}
+func (m *Mutation_SetCell) XXX_Size() int {
+	return xxx_messageInfo_Mutation_SetCell.Size(m)
+}
+func (m *Mutation_SetCell) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_SetCell.DiscardUnknown(m)
 }
 
-func (m *Mutation_SetCell) Reset()                    { *m = Mutation_SetCell{} }
-func (m *Mutation_SetCell) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_SetCell) ProtoMessage()               {}
-func (*Mutation_SetCell) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10, 0} }
+var xxx_messageInfo_Mutation_SetCell proto.InternalMessageInfo
 
 func (m *Mutation_SetCell) GetFamilyName() string {
 	if m != nil {
@@ -1799,18 +2201,40 @@ func (m *Mutation_SetCell) GetValue() []byte {
 type Mutation_DeleteFromColumn struct {
 	// The name of the family from which cells should be deleted.
 	// Must match `[-_.a-zA-Z0-9]+`
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The qualifier of the column from which cells should be deleted.
 	// Can be any byte string, including the empty string.
 	ColumnQualifier []byte `protobuf:"bytes,2,opt,name=column_qualifier,json=columnQualifier,proto3" json:"column_qualifier,omitempty"`
 	// The range of timestamps within which cells should be deleted.
-	TimeRange *TimestampRange `protobuf:"bytes,3,opt,name=time_range,json=timeRange" json:"time_range,omitempty"`
+	TimeRange            *TimestampRange `protobuf:"bytes,3,opt,name=time_range,json=timeRange,proto3" json:"time_range,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *Mutation_DeleteFromColumn) Reset()                    { *m = Mutation_DeleteFromColumn{} }
-func (m *Mutation_DeleteFromColumn) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_DeleteFromColumn) ProtoMessage()               {}
-func (*Mutation_DeleteFromColumn) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10, 1} }
+func (m *Mutation_DeleteFromColumn) Reset()         { *m = Mutation_DeleteFromColumn{} }
+func (m *Mutation_DeleteFromColumn) String() string { return proto.CompactTextString(m) }
+func (*Mutation_DeleteFromColumn) ProtoMessage()    {}
+func (*Mutation_DeleteFromColumn) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{10, 1}
+}
+func (m *Mutation_DeleteFromColumn) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_DeleteFromColumn.Unmarshal(m, b)
+}
+func (m *Mutation_DeleteFromColumn) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_DeleteFromColumn.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_DeleteFromColumn) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromColumn.Merge(dst, src)
+}
+func (m *Mutation_DeleteFromColumn) XXX_Size() int {
+	return xxx_messageInfo_Mutation_DeleteFromColumn.Size(m)
+}
+func (m *Mutation_DeleteFromColumn) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_DeleteFromColumn.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation_DeleteFromColumn proto.InternalMessageInfo
 
 func (m *Mutation_DeleteFromColumn) GetFamilyName() string {
 	if m != nil {
@@ -1837,13 +2261,35 @@ func (m *Mutation_DeleteFromColumn) GetTimeRange() *TimestampRange {
 type Mutation_DeleteFromFamily struct {
 	// The name of the family from which cells should be deleted.
 	// Must match `[-_.a-zA-Z0-9]+`
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName           string   `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Mutation_DeleteFromFamily) Reset()         { *m = Mutation_DeleteFromFamily{} }
+func (m *Mutation_DeleteFromFamily) String() string { return proto.CompactTextString(m) }
+func (*Mutation_DeleteFromFamily) ProtoMessage()    {}
+func (*Mutation_DeleteFromFamily) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{10, 2}
+}
+func (m *Mutation_DeleteFromFamily) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_DeleteFromFamily.Unmarshal(m, b)
+}
+func (m *Mutation_DeleteFromFamily) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_DeleteFromFamily.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_DeleteFromFamily) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromFamily.Merge(dst, src)
+}
+func (m *Mutation_DeleteFromFamily) XXX_Size() int {
+	return xxx_messageInfo_Mutation_DeleteFromFamily.Size(m)
+}
+func (m *Mutation_DeleteFromFamily) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_DeleteFromFamily.DiscardUnknown(m)
 }
 
-func (m *Mutation_DeleteFromFamily) Reset()                    { *m = Mutation_DeleteFromFamily{} }
-func (m *Mutation_DeleteFromFamily) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_DeleteFromFamily) ProtoMessage()               {}
-func (*Mutation_DeleteFromFamily) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10, 2} }
+var xxx_messageInfo_Mutation_DeleteFromFamily proto.InternalMessageInfo
 
 func (m *Mutation_DeleteFromFamily) GetFamilyName() string {
 	if m != nil {
@@ -1854,19 +2300,41 @@ func (m *Mutation_DeleteFromFamily) GetFamilyName() string {
 
 // A Mutation which deletes all cells from the containing row.
 type Mutation_DeleteFromRow struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Mutation_DeleteFromRow) Reset()         { *m = Mutation_DeleteFromRow{} }
+func (m *Mutation_DeleteFromRow) String() string { return proto.CompactTextString(m) }
+func (*Mutation_DeleteFromRow) ProtoMessage()    {}
+func (*Mutation_DeleteFromRow) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{10, 3}
+}
+func (m *Mutation_DeleteFromRow) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_DeleteFromRow.Unmarshal(m, b)
+}
+func (m *Mutation_DeleteFromRow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_DeleteFromRow.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_DeleteFromRow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_DeleteFromRow.Merge(dst, src)
+}
+func (m *Mutation_DeleteFromRow) XXX_Size() int {
+	return xxx_messageInfo_Mutation_DeleteFromRow.Size(m)
+}
+func (m *Mutation_DeleteFromRow) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_DeleteFromRow.DiscardUnknown(m)
 }
 
-func (m *Mutation_DeleteFromRow) Reset()                    { *m = Mutation_DeleteFromRow{} }
-func (m *Mutation_DeleteFromRow) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_DeleteFromRow) ProtoMessage()               {}
-func (*Mutation_DeleteFromRow) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10, 3} }
+var xxx_messageInfo_Mutation_DeleteFromRow proto.InternalMessageInfo
 
 // Specifies an atomic read/modify/write operation on the latest value of the
 // specified column.
 type ReadModifyWriteRule struct {
 	// The name of the family to which the read/modify/write should be applied.
 	// Must match `[-_.a-zA-Z0-9]+`
-	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName" json:"family_name,omitempty"`
+	FamilyName string `protobuf:"bytes,1,opt,name=family_name,json=familyName,proto3" json:"family_name,omitempty"`
 	// The qualifier of the column to which the read/modify/write should be
 	// applied.
 	// Can be any byte string, including the empty string.
@@ -1877,13 +2345,49 @@ type ReadModifyWriteRule struct {
 	// Types that are valid to be assigned to Rule:
 	//	*ReadModifyWriteRule_AppendValue
 	//	*ReadModifyWriteRule_IncrementAmount
-	Rule isReadModifyWriteRule_Rule `protobuf_oneof:"rule"`
+	Rule                 isReadModifyWriteRule_Rule `protobuf_oneof:"rule"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *ReadModifyWriteRule) Reset()                    { *m = ReadModifyWriteRule{} }
-func (m *ReadModifyWriteRule) String() string            { return proto.CompactTextString(m) }
-func (*ReadModifyWriteRule) ProtoMessage()               {}
-func (*ReadModifyWriteRule) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+func (m *ReadModifyWriteRule) Reset()         { *m = ReadModifyWriteRule{} }
+func (m *ReadModifyWriteRule) String() string { return proto.CompactTextString(m) }
+func (*ReadModifyWriteRule) ProtoMessage()    {}
+func (*ReadModifyWriteRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_4a4437069b4d43ba, []int{11}
+}
+func (m *ReadModifyWriteRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadModifyWriteRule.Unmarshal(m, b)
+}
+func (m *ReadModifyWriteRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadModifyWriteRule.Marshal(b, m, deterministic)
+}
+func (dst *ReadModifyWriteRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadModifyWriteRule.Merge(dst, src)
+}
+func (m *ReadModifyWriteRule) XXX_Size() int {
+	return xxx_messageInfo_ReadModifyWriteRule.Size(m)
+}
+func (m *ReadModifyWriteRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadModifyWriteRule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReadModifyWriteRule proto.InternalMessageInfo
+
+func (m *ReadModifyWriteRule) GetFamilyName() string {
+	if m != nil {
+		return m.FamilyName
+	}
+	return ""
+}
+
+func (m *ReadModifyWriteRule) GetColumnQualifier() []byte {
+	if m != nil {
+		return m.ColumnQualifier
+	}
+	return nil
+}
 
 type isReadModifyWriteRule_Rule interface {
 	isReadModifyWriteRule_Rule()
@@ -1892,11 +2396,13 @@ type isReadModifyWriteRule_Rule interface {
 type ReadModifyWriteRule_AppendValue struct {
 	AppendValue []byte `protobuf:"bytes,3,opt,name=append_value,json=appendValue,proto3,oneof"`
 }
+
 type ReadModifyWriteRule_IncrementAmount struct {
-	IncrementAmount int64 `protobuf:"varint,4,opt,name=increment_amount,json=incrementAmount,oneof"`
+	IncrementAmount int64 `protobuf:"varint,4,opt,name=increment_amount,json=incrementAmount,proto3,oneof"`
 }
 
-func (*ReadModifyWriteRule_AppendValue) isReadModifyWriteRule_Rule()     {}
+func (*ReadModifyWriteRule_AppendValue) isReadModifyWriteRule_Rule() {}
+
 func (*ReadModifyWriteRule_IncrementAmount) isReadModifyWriteRule_Rule() {}
 
 func (m *ReadModifyWriteRule) GetRule() isReadModifyWriteRule_Rule {
@@ -1906,20 +2412,6 @@ func (m *ReadModifyWriteRule) GetRule() isReadModifyWriteRule_Rule {
 	return nil
 }
 
-func (m *ReadModifyWriteRule) GetFamilyName() string {
-	if m != nil {
-		return m.FamilyName
-	}
-	return ""
-}
-
-func (m *ReadModifyWriteRule) GetColumnQualifier() []byte {
-	if m != nil {
-		return m.ColumnQualifier
-	}
-	return nil
-}
-
 func (m *ReadModifyWriteRule) GetAppendValue() []byte {
 	if x, ok := m.GetRule().(*ReadModifyWriteRule_AppendValue); ok {
 		return x.AppendValue
@@ -1986,11 +2478,11 @@ func _ReadModifyWriteRule_OneofSizer(msg proto.Message) (n int) {
 	// rule
 	switch x := m.Rule.(type) {
 	case *ReadModifyWriteRule_AppendValue:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AppendValue)))
 		n += len(x.AppendValue)
 	case *ReadModifyWriteRule_IncrementAmount:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.IncrementAmount))
 	case nil:
 	default:
@@ -2021,9 +2513,9 @@ func init() {
 	proto.RegisterType((*ReadModifyWriteRule)(nil), "google.bigtable.v2.ReadModifyWriteRule")
 }
 
-func init() { proto.RegisterFile("google/bigtable/v2/data.proto", fileDescriptor1) }
+func init() { proto.RegisterFile("google/bigtable/v2/data.proto", fileDescriptor_data_4a4437069b4d43ba) }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_data_4a4437069b4d43ba = []byte{
 	// 1444 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdb, 0x72, 0x1b, 0x45,
 	0x13, 0xd6, 0x5a, 0xb6, 0x2c, 0xf5, 0xca, 0x96, 0x32, 0x71, 0x1c, 0x45, 0x7f, 0xfc, 0xc7, 0xa5,
diff --git a/vendor/google.golang.org/genproto/googleapis/bytestream/bytestream.pb.go b/vendor/google.golang.org/genproto/googleapis/bytestream/bytestream.pb.go
index 80149480..8abd4fa1 100644
--- a/vendor/google.golang.org/genproto/googleapis/bytestream/bytestream.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/bytestream/bytestream.pb.go
@@ -1,27 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/bytestream/bytestream.proto
 
-/*
-Package bytestream is a generated protocol buffer package.
-
-It is generated from these files:
-	google/bytestream/bytestream.proto
-
-It has these top-level messages:
-	ReadRequest
-	ReadResponse
-	WriteRequest
-	WriteResponse
-	QueryWriteStatusRequest
-	QueryWriteStatusResponse
-*/
-package bytestream
+package bytestream // import "google.golang.org/genproto/googleapis/bytestream"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "github.com/golang/protobuf/ptypes/wrappers"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
 
 import (
 	context "golang.org/x/net/context"
@@ -42,13 +28,13 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Request object for ByteStream.Read.
 type ReadRequest struct {
 	// The name of the resource to read.
-	ResourceName string `protobuf:"bytes,1,opt,name=resource_name,json=resourceName" json:"resource_name,omitempty"`
+	ResourceName string `protobuf:"bytes,1,opt,name=resource_name,json=resourceName,proto3" json:"resource_name,omitempty"`
 	// The offset for the first byte to return in the read, relative to the start
 	// of the resource.
 	//
 	// A `read_offset` that is negative or greater than the size of the resource
 	// will cause an `OUT_OF_RANGE` error.
-	ReadOffset int64 `protobuf:"varint,2,opt,name=read_offset,json=readOffset" json:"read_offset,omitempty"`
+	ReadOffset int64 `protobuf:"varint,2,opt,name=read_offset,json=readOffset,proto3" json:"read_offset,omitempty"`
 	// The maximum number of `data` bytes the server is allowed to return in the
 	// sum of all `ReadResponse` messages. A `read_limit` of zero indicates that
 	// there is no limit, and a negative `read_limit` will cause an error.
@@ -56,13 +42,35 @@ type ReadRequest struct {
 	// If the stream returns fewer bytes than allowed by the `read_limit` and no
 	// error occurred, the stream includes all data from the `read_offset` to the
 	// end of the resource.
-	ReadLimit int64 `protobuf:"varint,3,opt,name=read_limit,json=readLimit" json:"read_limit,omitempty"`
+	ReadLimit            int64    `protobuf:"varint,3,opt,name=read_limit,json=readLimit,proto3" json:"read_limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReadRequest) Reset()         { *m = ReadRequest{} }
+func (m *ReadRequest) String() string { return proto.CompactTextString(m) }
+func (*ReadRequest) ProtoMessage()    {}
+func (*ReadRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bytestream_414b76681ba3f568, []int{0}
+}
+func (m *ReadRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadRequest.Unmarshal(m, b)
+}
+func (m *ReadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReadRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRequest.Merge(dst, src)
+}
+func (m *ReadRequest) XXX_Size() int {
+	return xxx_messageInfo_ReadRequest.Size(m)
+}
+func (m *ReadRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadRequest.DiscardUnknown(m)
 }
 
-func (m *ReadRequest) Reset()                    { *m = ReadRequest{} }
-func (m *ReadRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReadRequest) ProtoMessage()               {}
-func (*ReadRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_ReadRequest proto.InternalMessageInfo
 
 func (m *ReadRequest) GetResourceName() string {
 	if m != nil {
@@ -91,13 +99,35 @@ type ReadResponse struct {
 	// empty for any given `ReadResponse`. This enables the service to inform the
 	// client that the request is still live while it is running an operation to
 	// generate more data.
-	Data []byte `protobuf:"bytes,10,opt,name=data,proto3" json:"data,omitempty"`
+	Data                 []byte   `protobuf:"bytes,10,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReadResponse) Reset()         { *m = ReadResponse{} }
+func (m *ReadResponse) String() string { return proto.CompactTextString(m) }
+func (*ReadResponse) ProtoMessage()    {}
+func (*ReadResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bytestream_414b76681ba3f568, []int{1}
+}
+func (m *ReadResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadResponse.Unmarshal(m, b)
+}
+func (m *ReadResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReadResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadResponse.Merge(dst, src)
+}
+func (m *ReadResponse) XXX_Size() int {
+	return xxx_messageInfo_ReadResponse.Size(m)
+}
+func (m *ReadResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadResponse.DiscardUnknown(m)
 }
 
-func (m *ReadResponse) Reset()                    { *m = ReadResponse{} }
-func (m *ReadResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReadResponse) ProtoMessage()               {}
-func (*ReadResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_ReadResponse proto.InternalMessageInfo
 
 func (m *ReadResponse) GetData() []byte {
 	if m != nil {
@@ -111,7 +141,7 @@ type WriteRequest struct {
 	// The name of the resource to write. This **must** be set on the first
 	// `WriteRequest` of each `Write()` action. If it is set on subsequent calls,
 	// it **must** match the value of the first request.
-	ResourceName string `protobuf:"bytes,1,opt,name=resource_name,json=resourceName" json:"resource_name,omitempty"`
+	ResourceName string `protobuf:"bytes,1,opt,name=resource_name,json=resourceName,proto3" json:"resource_name,omitempty"`
 	// The offset from the beginning of the resource at which the data should be
 	// written. It is required on all `WriteRequest`s.
 	//
@@ -124,22 +154,44 @@ type WriteRequest struct {
 	// sent previously on this stream.
 	//
 	// An incorrect value will cause an error.
-	WriteOffset int64 `protobuf:"varint,2,opt,name=write_offset,json=writeOffset" json:"write_offset,omitempty"`
+	WriteOffset int64 `protobuf:"varint,2,opt,name=write_offset,json=writeOffset,proto3" json:"write_offset,omitempty"`
 	// If `true`, this indicates that the write is complete. Sending any
 	// `WriteRequest`s subsequent to one in which `finish_write` is `true` will
 	// cause an error.
-	FinishWrite bool `protobuf:"varint,3,opt,name=finish_write,json=finishWrite" json:"finish_write,omitempty"`
+	FinishWrite bool `protobuf:"varint,3,opt,name=finish_write,json=finishWrite,proto3" json:"finish_write,omitempty"`
 	// A portion of the data for the resource. The client **may** leave `data`
 	// empty for any given `WriteRequest`. This enables the client to inform the
 	// service that the request is still live while it is running an operation to
 	// generate more data.
-	Data []byte `protobuf:"bytes,10,opt,name=data,proto3" json:"data,omitempty"`
+	Data                 []byte   `protobuf:"bytes,10,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WriteRequest) Reset()         { *m = WriteRequest{} }
+func (m *WriteRequest) String() string { return proto.CompactTextString(m) }
+func (*WriteRequest) ProtoMessage()    {}
+func (*WriteRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bytestream_414b76681ba3f568, []int{2}
+}
+func (m *WriteRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteRequest.Unmarshal(m, b)
+}
+func (m *WriteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteRequest.Marshal(b, m, deterministic)
+}
+func (dst *WriteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteRequest.Merge(dst, src)
+}
+func (m *WriteRequest) XXX_Size() int {
+	return xxx_messageInfo_WriteRequest.Size(m)
+}
+func (m *WriteRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteRequest.DiscardUnknown(m)
 }
 
-func (m *WriteRequest) Reset()                    { *m = WriteRequest{} }
-func (m *WriteRequest) String() string            { return proto.CompactTextString(m) }
-func (*WriteRequest) ProtoMessage()               {}
-func (*WriteRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_WriteRequest proto.InternalMessageInfo
 
 func (m *WriteRequest) GetResourceName() string {
 	if m != nil {
@@ -172,13 +224,35 @@ func (m *WriteRequest) GetData() []byte {
 // Response object for ByteStream.Write.
 type WriteResponse struct {
 	// The number of bytes that have been processed for the given resource.
-	CommittedSize int64 `protobuf:"varint,1,opt,name=committed_size,json=committedSize" json:"committed_size,omitempty"`
+	CommittedSize        int64    `protobuf:"varint,1,opt,name=committed_size,json=committedSize,proto3" json:"committed_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WriteResponse) Reset()         { *m = WriteResponse{} }
+func (m *WriteResponse) String() string { return proto.CompactTextString(m) }
+func (*WriteResponse) ProtoMessage()    {}
+func (*WriteResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bytestream_414b76681ba3f568, []int{3}
+}
+func (m *WriteResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteResponse.Unmarshal(m, b)
+}
+func (m *WriteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteResponse.Marshal(b, m, deterministic)
+}
+func (dst *WriteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteResponse.Merge(dst, src)
+}
+func (m *WriteResponse) XXX_Size() int {
+	return xxx_messageInfo_WriteResponse.Size(m)
+}
+func (m *WriteResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteResponse.DiscardUnknown(m)
 }
 
-func (m *WriteResponse) Reset()                    { *m = WriteResponse{} }
-func (m *WriteResponse) String() string            { return proto.CompactTextString(m) }
-func (*WriteResponse) ProtoMessage()               {}
-func (*WriteResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_WriteResponse proto.InternalMessageInfo
 
 func (m *WriteResponse) GetCommittedSize() int64 {
 	if m != nil {
@@ -190,13 +264,35 @@ func (m *WriteResponse) GetCommittedSize() int64 {
 // Request object for ByteStream.QueryWriteStatus.
 type QueryWriteStatusRequest struct {
 	// The name of the resource whose write status is being requested.
-	ResourceName string `protobuf:"bytes,1,opt,name=resource_name,json=resourceName" json:"resource_name,omitempty"`
+	ResourceName         string   `protobuf:"bytes,1,opt,name=resource_name,json=resourceName,proto3" json:"resource_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *QueryWriteStatusRequest) Reset()         { *m = QueryWriteStatusRequest{} }
+func (m *QueryWriteStatusRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryWriteStatusRequest) ProtoMessage()    {}
+func (*QueryWriteStatusRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bytestream_414b76681ba3f568, []int{4}
+}
+func (m *QueryWriteStatusRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryWriteStatusRequest.Unmarshal(m, b)
+}
+func (m *QueryWriteStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryWriteStatusRequest.Marshal(b, m, deterministic)
+}
+func (dst *QueryWriteStatusRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryWriteStatusRequest.Merge(dst, src)
+}
+func (m *QueryWriteStatusRequest) XXX_Size() int {
+	return xxx_messageInfo_QueryWriteStatusRequest.Size(m)
+}
+func (m *QueryWriteStatusRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryWriteStatusRequest.DiscardUnknown(m)
 }
 
-func (m *QueryWriteStatusRequest) Reset()                    { *m = QueryWriteStatusRequest{} }
-func (m *QueryWriteStatusRequest) String() string            { return proto.CompactTextString(m) }
-func (*QueryWriteStatusRequest) ProtoMessage()               {}
-func (*QueryWriteStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_QueryWriteStatusRequest proto.InternalMessageInfo
 
 func (m *QueryWriteStatusRequest) GetResourceName() string {
 	if m != nil {
@@ -208,16 +304,38 @@ func (m *QueryWriteStatusRequest) GetResourceName() string {
 // Response object for ByteStream.QueryWriteStatus.
 type QueryWriteStatusResponse struct {
 	// The number of bytes that have been processed for the given resource.
-	CommittedSize int64 `protobuf:"varint,1,opt,name=committed_size,json=committedSize" json:"committed_size,omitempty"`
+	CommittedSize int64 `protobuf:"varint,1,opt,name=committed_size,json=committedSize,proto3" json:"committed_size,omitempty"`
 	// `complete` is `true` only if the client has sent a `WriteRequest` with
 	// `finish_write` set to true, and the server has processed that request.
-	Complete bool `protobuf:"varint,2,opt,name=complete" json:"complete,omitempty"`
+	Complete             bool     `protobuf:"varint,2,opt,name=complete,proto3" json:"complete,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *QueryWriteStatusResponse) Reset()         { *m = QueryWriteStatusResponse{} }
+func (m *QueryWriteStatusResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryWriteStatusResponse) ProtoMessage()    {}
+func (*QueryWriteStatusResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bytestream_414b76681ba3f568, []int{5}
+}
+func (m *QueryWriteStatusResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryWriteStatusResponse.Unmarshal(m, b)
+}
+func (m *QueryWriteStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryWriteStatusResponse.Marshal(b, m, deterministic)
+}
+func (dst *QueryWriteStatusResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryWriteStatusResponse.Merge(dst, src)
+}
+func (m *QueryWriteStatusResponse) XXX_Size() int {
+	return xxx_messageInfo_QueryWriteStatusResponse.Size(m)
+}
+func (m *QueryWriteStatusResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryWriteStatusResponse.DiscardUnknown(m)
 }
 
-func (m *QueryWriteStatusResponse) Reset()                    { *m = QueryWriteStatusResponse{} }
-func (m *QueryWriteStatusResponse) String() string            { return proto.CompactTextString(m) }
-func (*QueryWriteStatusResponse) ProtoMessage()               {}
-func (*QueryWriteStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_QueryWriteStatusResponse proto.InternalMessageInfo
 
 func (m *QueryWriteStatusResponse) GetCommittedSize() int64 {
 	if m != nil {
@@ -250,8 +368,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ByteStream service
-
+// ByteStreamClient is the client API for ByteStream service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ByteStreamClient interface {
 	// `Read()` is used to retrieve the contents of a resource as a sequence
 	// of bytes. The bytes are returned in a sequence of responses, and the
@@ -306,7 +425,7 @@ func NewByteStreamClient(cc *grpc.ClientConn) ByteStreamClient {
 }
 
 func (c *byteStreamClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (ByteStream_ReadClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_ByteStream_serviceDesc.Streams[0], c.cc, "/google.bytestream.ByteStream/Read", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ByteStream_serviceDesc.Streams[0], "/google.bytestream.ByteStream/Read", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -338,7 +457,7 @@ func (x *byteStreamReadClient) Recv() (*ReadResponse, error) {
 }
 
 func (c *byteStreamClient) Write(ctx context.Context, opts ...grpc.CallOption) (ByteStream_WriteClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_ByteStream_serviceDesc.Streams[1], c.cc, "/google.bytestream.ByteStream/Write", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ByteStream_serviceDesc.Streams[1], "/google.bytestream.ByteStream/Write", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -373,15 +492,14 @@ func (x *byteStreamWriteClient) CloseAndRecv() (*WriteResponse, error) {
 
 func (c *byteStreamClient) QueryWriteStatus(ctx context.Context, in *QueryWriteStatusRequest, opts ...grpc.CallOption) (*QueryWriteStatusResponse, error) {
 	out := new(QueryWriteStatusResponse)
-	err := grpc.Invoke(ctx, "/google.bytestream.ByteStream/QueryWriteStatus", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.bytestream.ByteStream/QueryWriteStatus", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ByteStream service
-
+// ByteStreamServer is the server API for ByteStream service.
 type ByteStreamServer interface {
 	// `Read()` is used to retrieve the contents of a resource as a sequence
 	// of bytes. The bytes are returned in a sequence of responses, and the
@@ -520,9 +638,11 @@ var _ByteStream_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/bytestream/bytestream.proto",
 }
 
-func init() { proto.RegisterFile("google/bytestream/bytestream.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/bytestream/bytestream.proto", fileDescriptor_bytestream_414b76681ba3f568)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_bytestream_414b76681ba3f568 = []byte{
 	// 446 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x5b, 0x8b, 0x13, 0x31,
 	0x14, 0x66, 0xb6, 0xab, 0x74, 0x4f, 0xa7, 0x5e, 0x02, 0xe2, 0x30, 0xe8, 0x6e, 0x77, 0x44, 0x28,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/audit/audit_log.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/audit/audit_log.pb.go
index 33c48ea6..2abd02de 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/audit/audit_log.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/audit/audit_log.pb.go
@@ -1,27 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/audit/audit_log.proto
 
-/*
-Package audit is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/audit/audit_log.proto
-
-It has these top-level messages:
-	AuditLog
-	AuthenticationInfo
-	AuthorizationInfo
-	RequestMetadata
-*/
-package audit
+package audit // import "google.golang.org/genproto/googleapis/cloud/audit"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/struct"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -38,57 +26,79 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type AuditLog struct {
 	// The name of the API service performing the operation. For example,
 	// `"datastore.googleapis.com"`.
-	ServiceName string `protobuf:"bytes,7,opt,name=service_name,json=serviceName" json:"service_name,omitempty"`
+	ServiceName string `protobuf:"bytes,7,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// The name of the service method or operation.
 	// For API calls, this should be the name of the API method.
 	// For example,
 	//
 	//     "google.datastore.v1.Datastore.RunQuery"
 	//     "google.logging.v1.LoggingService.DeleteLog"
-	MethodName string `protobuf:"bytes,8,opt,name=method_name,json=methodName" json:"method_name,omitempty"`
+	MethodName string `protobuf:"bytes,8,opt,name=method_name,json=methodName,proto3" json:"method_name,omitempty"`
 	// The resource or collection that is the target of the operation.
 	// The name is a scheme-less URI, not including the API service name.
 	// For example:
 	//
 	//     "shelves/SHELF_ID/books"
 	//     "shelves/SHELF_ID/books/BOOK_ID"
-	ResourceName string `protobuf:"bytes,11,opt,name=resource_name,json=resourceName" json:"resource_name,omitempty"`
+	ResourceName string `protobuf:"bytes,11,opt,name=resource_name,json=resourceName,proto3" json:"resource_name,omitempty"`
 	// The number of items returned from a List or Query API method,
 	// if applicable.
-	NumResponseItems int64 `protobuf:"varint,12,opt,name=num_response_items,json=numResponseItems" json:"num_response_items,omitempty"`
+	NumResponseItems int64 `protobuf:"varint,12,opt,name=num_response_items,json=numResponseItems,proto3" json:"num_response_items,omitempty"`
 	// The status of the overall operation.
-	Status *google_rpc.Status `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"`
+	Status *status.Status `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
 	// Authentication information.
-	AuthenticationInfo *AuthenticationInfo `protobuf:"bytes,3,opt,name=authentication_info,json=authenticationInfo" json:"authentication_info,omitempty"`
+	AuthenticationInfo *AuthenticationInfo `protobuf:"bytes,3,opt,name=authentication_info,json=authenticationInfo,proto3" json:"authentication_info,omitempty"`
 	// Authorization information. If there are multiple
 	// resources or permissions involved, then there is
 	// one AuthorizationInfo element for each {resource, permission} tuple.
-	AuthorizationInfo []*AuthorizationInfo `protobuf:"bytes,9,rep,name=authorization_info,json=authorizationInfo" json:"authorization_info,omitempty"`
+	AuthorizationInfo []*AuthorizationInfo `protobuf:"bytes,9,rep,name=authorization_info,json=authorizationInfo,proto3" json:"authorization_info,omitempty"`
 	// Metadata about the operation.
-	RequestMetadata *RequestMetadata `protobuf:"bytes,4,opt,name=request_metadata,json=requestMetadata" json:"request_metadata,omitempty"`
+	RequestMetadata *RequestMetadata `protobuf:"bytes,4,opt,name=request_metadata,json=requestMetadata,proto3" json:"request_metadata,omitempty"`
 	// The operation request. This may not include all request parameters,
 	// such as those that are too large, privacy-sensitive, or duplicated
 	// elsewhere in the log record.
 	// It should never include user-generated data, such as file contents.
 	// When the JSON object represented here has a proto equivalent, the proto
 	// name will be indicated in the `@type` property.
-	Request *google_protobuf2.Struct `protobuf:"bytes,16,opt,name=request" json:"request,omitempty"`
+	Request *_struct.Struct `protobuf:"bytes,16,opt,name=request,proto3" json:"request,omitempty"`
 	// The operation response. This may not include all response elements,
 	// such as those that are too large, privacy-sensitive, or duplicated
 	// elsewhere in the log record.
 	// It should never include user-generated data, such as file contents.
 	// When the JSON object represented here has a proto equivalent, the proto
 	// name will be indicated in the `@type` property.
-	Response *google_protobuf2.Struct `protobuf:"bytes,17,opt,name=response" json:"response,omitempty"`
+	Response *_struct.Struct `protobuf:"bytes,17,opt,name=response,proto3" json:"response,omitempty"`
 	// Other service-specific data about the request, response, and other
 	// activities.
-	ServiceData *google_protobuf1.Any `protobuf:"bytes,15,opt,name=service_data,json=serviceData" json:"service_data,omitempty"`
+	ServiceData          *any.Any `protobuf:"bytes,15,opt,name=service_data,json=serviceData,proto3" json:"service_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AuditLog) Reset()         { *m = AuditLog{} }
+func (m *AuditLog) String() string { return proto.CompactTextString(m) }
+func (*AuditLog) ProtoMessage()    {}
+func (*AuditLog) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_log_394f9970a41d2fd2, []int{0}
+}
+func (m *AuditLog) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuditLog.Unmarshal(m, b)
+}
+func (m *AuditLog) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuditLog.Marshal(b, m, deterministic)
+}
+func (dst *AuditLog) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditLog.Merge(dst, src)
+}
+func (m *AuditLog) XXX_Size() int {
+	return xxx_messageInfo_AuditLog.Size(m)
+}
+func (m *AuditLog) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuditLog.DiscardUnknown(m)
 }
 
-func (m *AuditLog) Reset()                    { *m = AuditLog{} }
-func (m *AuditLog) String() string            { return proto.CompactTextString(m) }
-func (*AuditLog) ProtoMessage()               {}
-func (*AuditLog) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_AuditLog proto.InternalMessageInfo
 
 func (m *AuditLog) GetServiceName() string {
 	if m != nil {
@@ -118,7 +128,7 @@ func (m *AuditLog) GetNumResponseItems() int64 {
 	return 0
 }
 
-func (m *AuditLog) GetStatus() *google_rpc.Status {
+func (m *AuditLog) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -146,21 +156,21 @@ func (m *AuditLog) GetRequestMetadata() *RequestMetadata {
 	return nil
 }
 
-func (m *AuditLog) GetRequest() *google_protobuf2.Struct {
+func (m *AuditLog) GetRequest() *_struct.Struct {
 	if m != nil {
 		return m.Request
 	}
 	return nil
 }
 
-func (m *AuditLog) GetResponse() *google_protobuf2.Struct {
+func (m *AuditLog) GetResponse() *_struct.Struct {
 	if m != nil {
 		return m.Response
 	}
 	return nil
 }
 
-func (m *AuditLog) GetServiceData() *google_protobuf1.Any {
+func (m *AuditLog) GetServiceData() *any.Any {
 	if m != nil {
 		return m.ServiceData
 	}
@@ -170,13 +180,35 @@ func (m *AuditLog) GetServiceData() *google_protobuf1.Any {
 // Authentication information for the operation.
 type AuthenticationInfo struct {
 	// The email address of the authenticated user making the request.
-	PrincipalEmail string `protobuf:"bytes,1,opt,name=principal_email,json=principalEmail" json:"principal_email,omitempty"`
+	PrincipalEmail       string   `protobuf:"bytes,1,opt,name=principal_email,json=principalEmail,proto3" json:"principal_email,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AuthenticationInfo) Reset()         { *m = AuthenticationInfo{} }
+func (m *AuthenticationInfo) String() string { return proto.CompactTextString(m) }
+func (*AuthenticationInfo) ProtoMessage()    {}
+func (*AuthenticationInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_log_394f9970a41d2fd2, []int{1}
+}
+func (m *AuthenticationInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuthenticationInfo.Unmarshal(m, b)
+}
+func (m *AuthenticationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuthenticationInfo.Marshal(b, m, deterministic)
+}
+func (dst *AuthenticationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthenticationInfo.Merge(dst, src)
+}
+func (m *AuthenticationInfo) XXX_Size() int {
+	return xxx_messageInfo_AuthenticationInfo.Size(m)
+}
+func (m *AuthenticationInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuthenticationInfo.DiscardUnknown(m)
 }
 
-func (m *AuthenticationInfo) Reset()                    { *m = AuthenticationInfo{} }
-func (m *AuthenticationInfo) String() string            { return proto.CompactTextString(m) }
-func (*AuthenticationInfo) ProtoMessage()               {}
-func (*AuthenticationInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_AuthenticationInfo proto.InternalMessageInfo
 
 func (m *AuthenticationInfo) GetPrincipalEmail() string {
 	if m != nil {
@@ -190,18 +222,40 @@ type AuthorizationInfo struct {
 	// The resource being accessed, as a REST-style string. For example:
 	//
 	//     bigquery.googlapis.com/projects/PROJECTID/datasets/DATASETID
-	Resource string `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource string `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
 	// The required IAM permission.
-	Permission string `protobuf:"bytes,2,opt,name=permission" json:"permission,omitempty"`
+	Permission string `protobuf:"bytes,2,opt,name=permission,proto3" json:"permission,omitempty"`
 	// Whether or not authorization for `resource` and `permission`
 	// was granted.
-	Granted bool `protobuf:"varint,3,opt,name=granted" json:"granted,omitempty"`
+	Granted              bool     `protobuf:"varint,3,opt,name=granted,proto3" json:"granted,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AuthorizationInfo) Reset()                    { *m = AuthorizationInfo{} }
-func (m *AuthorizationInfo) String() string            { return proto.CompactTextString(m) }
-func (*AuthorizationInfo) ProtoMessage()               {}
-func (*AuthorizationInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *AuthorizationInfo) Reset()         { *m = AuthorizationInfo{} }
+func (m *AuthorizationInfo) String() string { return proto.CompactTextString(m) }
+func (*AuthorizationInfo) ProtoMessage()    {}
+func (*AuthorizationInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_log_394f9970a41d2fd2, []int{2}
+}
+func (m *AuthorizationInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuthorizationInfo.Unmarshal(m, b)
+}
+func (m *AuthorizationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuthorizationInfo.Marshal(b, m, deterministic)
+}
+func (dst *AuthorizationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuthorizationInfo.Merge(dst, src)
+}
+func (m *AuthorizationInfo) XXX_Size() int {
+	return xxx_messageInfo_AuthorizationInfo.Size(m)
+}
+func (m *AuthorizationInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuthorizationInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AuthorizationInfo proto.InternalMessageInfo
 
 func (m *AuthorizationInfo) GetResource() string {
 	if m != nil {
@@ -227,7 +281,7 @@ func (m *AuthorizationInfo) GetGranted() bool {
 // Metadata about the request.
 type RequestMetadata struct {
 	// The IP address of the caller.
-	CallerIp string `protobuf:"bytes,1,opt,name=caller_ip,json=callerIp" json:"caller_ip,omitempty"`
+	CallerIp string `protobuf:"bytes,1,opt,name=caller_ip,json=callerIp,proto3" json:"caller_ip,omitempty"`
 	// The user agent of the caller.
 	// This information is not authenticated and should be treated accordingly.
 	// For example:
@@ -238,13 +292,35 @@ type RequestMetadata struct {
 	//     The request was made by the Google Cloud SDK CLI (gcloud).
 	// +   `AppEngine-Google; (+http://code.google.com/appengine; appid: s~my-project`:
 	//     The request was made from the `my-project` App Engine app.
-	CallerSuppliedUserAgent string `protobuf:"bytes,2,opt,name=caller_supplied_user_agent,json=callerSuppliedUserAgent" json:"caller_supplied_user_agent,omitempty"`
+	CallerSuppliedUserAgent string   `protobuf:"bytes,2,opt,name=caller_supplied_user_agent,json=callerSuppliedUserAgent,proto3" json:"caller_supplied_user_agent,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
+	XXX_unrecognized        []byte   `json:"-"`
+	XXX_sizecache           int32    `json:"-"`
+}
+
+func (m *RequestMetadata) Reset()         { *m = RequestMetadata{} }
+func (m *RequestMetadata) String() string { return proto.CompactTextString(m) }
+func (*RequestMetadata) ProtoMessage()    {}
+func (*RequestMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_log_394f9970a41d2fd2, []int{3}
+}
+func (m *RequestMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RequestMetadata.Unmarshal(m, b)
+}
+func (m *RequestMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RequestMetadata.Marshal(b, m, deterministic)
+}
+func (dst *RequestMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestMetadata.Merge(dst, src)
+}
+func (m *RequestMetadata) XXX_Size() int {
+	return xxx_messageInfo_RequestMetadata.Size(m)
+}
+func (m *RequestMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_RequestMetadata.DiscardUnknown(m)
 }
 
-func (m *RequestMetadata) Reset()                    { *m = RequestMetadata{} }
-func (m *RequestMetadata) String() string            { return proto.CompactTextString(m) }
-func (*RequestMetadata) ProtoMessage()               {}
-func (*RequestMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_RequestMetadata proto.InternalMessageInfo
 
 func (m *RequestMetadata) GetCallerIp() string {
 	if m != nil {
@@ -267,9 +343,11 @@ func init() {
 	proto.RegisterType((*RequestMetadata)(nil), "google.cloud.audit.RequestMetadata")
 }
 
-func init() { proto.RegisterFile("google/cloud/audit/audit_log.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/audit/audit_log.proto", fileDescriptor_audit_log_394f9970a41d2fd2)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_audit_log_394f9970a41d2fd2 = []byte{
 	// 576 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0x5f, 0x6f, 0xd3, 0x30,
 	0x14, 0xc5, 0x55, 0x36, 0x6d, 0xad, 0xbb, 0xd1, 0xd6, 0x20, 0x1a, 0xca, 0x04, 0xa5, 0x13, 0x50,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go
new file mode 100644
index 00000000..e77aa296
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/annotation_payload.pb.go
@@ -0,0 +1,224 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/annotation_payload.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Contains annotation information that is relevant to AutoML.
+type AnnotationPayload struct {
+	// Output only . Additional information about the annotation
+	// specific to the AutoML solution.
+	//
+	// Types that are valid to be assigned to Detail:
+	//	*AnnotationPayload_Translation
+	//	*AnnotationPayload_Classification
+	Detail isAnnotationPayload_Detail `protobuf_oneof:"detail"`
+	// Output only . The resource ID of the annotation spec that
+	// this annotation pertains to. The annotation spec comes from either an
+	// ancestor dataset, or the dataset that was used to train the model in use.
+	AnnotationSpecId string `protobuf:"bytes,1,opt,name=annotation_spec_id,json=annotationSpecId,proto3" json:"annotation_spec_id,omitempty"`
+	// Output only. The value of [AnnotationSpec.display_name][google.cloud.automl.v1beta1.AnnotationSpec.display_name] when the model
+	// was trained. Because this field returns a value at model training time,
+	// for different models trained using the same dataset, the returned value
+	// could be different as model owner could update the display_name between
+	// any two model training.
+	DisplayName          string   `protobuf:"bytes,5,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnnotationPayload) Reset()         { *m = AnnotationPayload{} }
+func (m *AnnotationPayload) String() string { return proto.CompactTextString(m) }
+func (*AnnotationPayload) ProtoMessage()    {}
+func (*AnnotationPayload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotation_payload_ce47679ba5fa3ec6, []int{0}
+}
+func (m *AnnotationPayload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotationPayload.Unmarshal(m, b)
+}
+func (m *AnnotationPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotationPayload.Marshal(b, m, deterministic)
+}
+func (dst *AnnotationPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationPayload.Merge(dst, src)
+}
+func (m *AnnotationPayload) XXX_Size() int {
+	return xxx_messageInfo_AnnotationPayload.Size(m)
+}
+func (m *AnnotationPayload) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotationPayload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotationPayload proto.InternalMessageInfo
+
+type isAnnotationPayload_Detail interface {
+	isAnnotationPayload_Detail()
+}
+
+type AnnotationPayload_Translation struct {
+	Translation *TranslationAnnotation `protobuf:"bytes,2,opt,name=translation,proto3,oneof"`
+}
+
+type AnnotationPayload_Classification struct {
+	Classification *ClassificationAnnotation `protobuf:"bytes,3,opt,name=classification,proto3,oneof"`
+}
+
+func (*AnnotationPayload_Translation) isAnnotationPayload_Detail() {}
+
+func (*AnnotationPayload_Classification) isAnnotationPayload_Detail() {}
+
+func (m *AnnotationPayload) GetDetail() isAnnotationPayload_Detail {
+	if m != nil {
+		return m.Detail
+	}
+	return nil
+}
+
+func (m *AnnotationPayload) GetTranslation() *TranslationAnnotation {
+	if x, ok := m.GetDetail().(*AnnotationPayload_Translation); ok {
+		return x.Translation
+	}
+	return nil
+}
+
+func (m *AnnotationPayload) GetClassification() *ClassificationAnnotation {
+	if x, ok := m.GetDetail().(*AnnotationPayload_Classification); ok {
+		return x.Classification
+	}
+	return nil
+}
+
+func (m *AnnotationPayload) GetAnnotationSpecId() string {
+	if m != nil {
+		return m.AnnotationSpecId
+	}
+	return ""
+}
+
+func (m *AnnotationPayload) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*AnnotationPayload) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _AnnotationPayload_OneofMarshaler, _AnnotationPayload_OneofUnmarshaler, _AnnotationPayload_OneofSizer, []interface{}{
+		(*AnnotationPayload_Translation)(nil),
+		(*AnnotationPayload_Classification)(nil),
+	}
+}
+
+func _AnnotationPayload_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*AnnotationPayload)
+	// detail
+	switch x := m.Detail.(type) {
+	case *AnnotationPayload_Translation:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Translation); err != nil {
+			return err
+		}
+	case *AnnotationPayload_Classification:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Classification); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("AnnotationPayload.Detail has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _AnnotationPayload_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*AnnotationPayload)
+	switch tag {
+	case 2: // detail.translation
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TranslationAnnotation)
+		err := b.DecodeMessage(msg)
+		m.Detail = &AnnotationPayload_Translation{msg}
+		return true, err
+	case 3: // detail.classification
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ClassificationAnnotation)
+		err := b.DecodeMessage(msg)
+		m.Detail = &AnnotationPayload_Classification{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _AnnotationPayload_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*AnnotationPayload)
+	// detail
+	switch x := m.Detail.(type) {
+	case *AnnotationPayload_Translation:
+		s := proto.Size(x.Translation)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *AnnotationPayload_Classification:
+		s := proto.Size(x.Classification)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+func init() {
+	proto.RegisterType((*AnnotationPayload)(nil), "google.cloud.automl.v1beta1.AnnotationPayload")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/annotation_payload.proto", fileDescriptor_annotation_payload_ce47679ba5fa3ec6)
+}
+
+var fileDescriptor_annotation_payload_ce47679ba5fa3ec6 = []byte{
+	// 297 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4b, 0x33, 0x31,
+	0x10, 0x86, 0xbf, 0xed, 0x87, 0x45, 0x53, 0x11, 0xdd, 0xd3, 0x52, 0x05, 0xab, 0xa7, 0x1e, 0x34,
+	0xb1, 0x55, 0x4f, 0x9e, 0x5a, 0x2f, 0x7a, 0x91, 0x52, 0xc5, 0x83, 0x97, 0x65, 0x9a, 0xa4, 0x21,
+	0x90, 0xcd, 0x84, 0x26, 0x15, 0xfa, 0x8b, 0xfc, 0x9b, 0x42, 0xb2, 0xd8, 0xad, 0xc8, 0x1e, 0x93,
+	0x79, 0x9f, 0x67, 0x26, 0x19, 0x72, 0xa7, 0x10, 0x95, 0x91, 0x8c, 0x1b, 0x5c, 0x0b, 0x06, 0xeb,
+	0x80, 0x95, 0x61, 0x9f, 0xa3, 0x85, 0x0c, 0x30, 0x62, 0x60, 0x2d, 0x06, 0x08, 0x1a, 0x6d, 0xe9,
+	0x60, 0x63, 0x10, 0x04, 0x75, 0x2b, 0x0c, 0x98, 0x9f, 0x26, 0x8a, 0x46, 0x8a, 0x26, 0x8a, 0xd6,
+	0x54, 0xff, 0xac, 0x56, 0x82, 0xd3, 0x0d, 0x83, 0x4f, 0x68, 0xff, 0xa6, 0xad, 0x21, 0x37, 0xe0,
+	0xbd, 0x5e, 0x6a, 0x1e, 0x91, 0x9a, 0xb8, 0x6e, 0x23, 0xc2, 0x0a, 0xac, 0x37, 0x8d, 0xf8, 0xe5,
+	0x57, 0x87, 0x9c, 0x4c, 0x7e, 0xda, 0xce, 0xd2, 0xdc, 0xf9, 0x3b, 0xe9, 0x35, 0xa2, 0x45, 0x67,
+	0x90, 0x0d, 0x7b, 0xe3, 0x31, 0x6d, 0x79, 0x07, 0x7d, 0xdb, 0xe6, 0xb7, 0xbe, 0xa7, 0x7f, 0xf3,
+	0xa6, 0x28, 0x2f, 0xc9, 0xd1, 0xee, 0xd0, 0xc5, 0xff, 0xa8, 0xbe, 0x6f, 0x55, 0x3f, 0xee, 0x20,
+	0x3b, 0xf6, 0x5f, 0xba, 0xfc, 0x8a, 0xe4, 0x8d, 0x35, 0x78, 0x27, 0x79, 0xa9, 0x45, 0x91, 0x0d,
+	0xb2, 0xe1, 0xc1, 0xfc, 0x78, 0x5b, 0x79, 0x75, 0x92, 0x3f, 0x8b, 0xfc, 0x82, 0x1c, 0x0a, 0xed,
+	0x9d, 0x81, 0x4d, 0x69, 0xa1, 0x92, 0xc5, 0x5e, 0xcc, 0xf5, 0xea, 0xbb, 0x17, 0xa8, 0xe4, 0x74,
+	0x9f, 0x74, 0x85, 0x0c, 0xa0, 0xcd, 0x74, 0x49, 0xce, 0x39, 0x56, 0x6d, 0x83, 0xce, 0xb2, 0x8f,
+	0x49, 0x5d, 0x56, 0x68, 0xc0, 0x2a, 0x8a, 0x2b, 0xc5, 0x94, 0xb4, 0xf1, 0xab, 0x59, 0x2a, 0x81,
+	0xd3, 0xfe, 0xcf, 0xe5, 0x3c, 0xa4, 0xe3, 0xa2, 0x1b, 0xd3, 0xb7, 0xdf, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0x44, 0x63, 0x2f, 0x26, 0x6c, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/classification.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/classification.pb.go
new file mode 100644
index 00000000..43f67586
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/classification.pb.go
@@ -0,0 +1,434 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/classification.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Type of the classification problem.
+type ClassificationType int32
+
+const (
+	// Should not be used, an un-set enum has this value by default.
+	ClassificationType_CLASSIFICATION_TYPE_UNSPECIFIED ClassificationType = 0
+	// At most one label is allowed per example.
+	ClassificationType_MULTICLASS ClassificationType = 1
+	// Multiple labels are allowed for one example.
+	ClassificationType_MULTILABEL ClassificationType = 2
+)
+
+var ClassificationType_name = map[int32]string{
+	0: "CLASSIFICATION_TYPE_UNSPECIFIED",
+	1: "MULTICLASS",
+	2: "MULTILABEL",
+}
+var ClassificationType_value = map[string]int32{
+	"CLASSIFICATION_TYPE_UNSPECIFIED": 0,
+	"MULTICLASS":                      1,
+	"MULTILABEL":                      2,
+}
+
+func (x ClassificationType) String() string {
+	return proto.EnumName(ClassificationType_name, int32(x))
+}
+func (ClassificationType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_classification_e3eb78fdd10472f9, []int{0}
+}
+
+// Contains annotation details specific to classification.
+type ClassificationAnnotation struct {
+	// Output only. A confidence estimate between 0.0 and 1.0. A higher value
+	// means greater confidence that the annotation is positive. If a user
+	// approves an annotation as negative or positive, the score value remains
+	// unchanged. If a user creates an annotation, the score is 0 for negative or
+	// 1 for positive.
+	Score                float32  `protobuf:"fixed32,1,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClassificationAnnotation) Reset()         { *m = ClassificationAnnotation{} }
+func (m *ClassificationAnnotation) String() string { return proto.CompactTextString(m) }
+func (*ClassificationAnnotation) ProtoMessage()    {}
+func (*ClassificationAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_classification_e3eb78fdd10472f9, []int{0}
+}
+func (m *ClassificationAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassificationAnnotation.Unmarshal(m, b)
+}
+func (m *ClassificationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassificationAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *ClassificationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationAnnotation.Merge(dst, src)
+}
+func (m *ClassificationAnnotation) XXX_Size() int {
+	return xxx_messageInfo_ClassificationAnnotation.Size(m)
+}
+func (m *ClassificationAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassificationAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClassificationAnnotation proto.InternalMessageInfo
+
+func (m *ClassificationAnnotation) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+// Model evaluation metrics for classification problems.
+// Visible only to v1beta1
+type ClassificationEvaluationMetrics struct {
+	// Output only. The Area under precision recall curve metric.
+	AuPrc float32 `protobuf:"fixed32,1,opt,name=au_prc,json=auPrc,proto3" json:"au_prc,omitempty"`
+	// Output only. The Area under precision recall curve metric based on priors.
+	BaseAuPrc float32 `protobuf:"fixed32,2,opt,name=base_au_prc,json=baseAuPrc,proto3" json:"base_au_prc,omitempty"`
+	// Output only. Metrics that have confidence thresholds.
+	// Precision-recall curve can be derived from it.
+	ConfidenceMetricsEntry []*ClassificationEvaluationMetrics_ConfidenceMetricsEntry `protobuf:"bytes,3,rep,name=confidence_metrics_entry,json=confidenceMetricsEntry,proto3" json:"confidence_metrics_entry,omitempty"`
+	// Output only. Confusion matrix of the evaluation.
+	// Only set for MULTICLASS classification problems where number
+	// of labels is no more than 10.
+	// Only set for model level evaluation, not for evaluation per label.
+	ConfusionMatrix *ClassificationEvaluationMetrics_ConfusionMatrix `protobuf:"bytes,4,opt,name=confusion_matrix,json=confusionMatrix,proto3" json:"confusion_matrix,omitempty"`
+	// Output only. The annotation spec ids used for this evaluation.
+	AnnotationSpecId     []string `protobuf:"bytes,5,rep,name=annotation_spec_id,json=annotationSpecId,proto3" json:"annotation_spec_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClassificationEvaluationMetrics) Reset()         { *m = ClassificationEvaluationMetrics{} }
+func (m *ClassificationEvaluationMetrics) String() string { return proto.CompactTextString(m) }
+func (*ClassificationEvaluationMetrics) ProtoMessage()    {}
+func (*ClassificationEvaluationMetrics) Descriptor() ([]byte, []int) {
+	return fileDescriptor_classification_e3eb78fdd10472f9, []int{1}
+}
+func (m *ClassificationEvaluationMetrics) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassificationEvaluationMetrics.Unmarshal(m, b)
+}
+func (m *ClassificationEvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassificationEvaluationMetrics.Marshal(b, m, deterministic)
+}
+func (dst *ClassificationEvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationEvaluationMetrics.Merge(dst, src)
+}
+func (m *ClassificationEvaluationMetrics) XXX_Size() int {
+	return xxx_messageInfo_ClassificationEvaluationMetrics.Size(m)
+}
+func (m *ClassificationEvaluationMetrics) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassificationEvaluationMetrics.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClassificationEvaluationMetrics proto.InternalMessageInfo
+
+func (m *ClassificationEvaluationMetrics) GetAuPrc() float32 {
+	if m != nil {
+		return m.AuPrc
+	}
+	return 0
+}
+
+func (m *ClassificationEvaluationMetrics) GetBaseAuPrc() float32 {
+	if m != nil {
+		return m.BaseAuPrc
+	}
+	return 0
+}
+
+func (m *ClassificationEvaluationMetrics) GetConfidenceMetricsEntry() []*ClassificationEvaluationMetrics_ConfidenceMetricsEntry {
+	if m != nil {
+		return m.ConfidenceMetricsEntry
+	}
+	return nil
+}
+
+func (m *ClassificationEvaluationMetrics) GetConfusionMatrix() *ClassificationEvaluationMetrics_ConfusionMatrix {
+	if m != nil {
+		return m.ConfusionMatrix
+	}
+	return nil
+}
+
+func (m *ClassificationEvaluationMetrics) GetAnnotationSpecId() []string {
+	if m != nil {
+		return m.AnnotationSpecId
+	}
+	return nil
+}
+
+// Metrics for a single confidence threshold.
+type ClassificationEvaluationMetrics_ConfidenceMetricsEntry struct {
+	// Output only. The confidence threshold value used to compute the metrics.
+	ConfidenceThreshold float32 `protobuf:"fixed32,1,opt,name=confidence_threshold,json=confidenceThreshold,proto3" json:"confidence_threshold,omitempty"`
+	// Output only. Recall under the given confidence threshold.
+	Recall float32 `protobuf:"fixed32,2,opt,name=recall,proto3" json:"recall,omitempty"`
+	// Output only. Precision under the given confidence threshold.
+	Precision float32 `protobuf:"fixed32,3,opt,name=precision,proto3" json:"precision,omitempty"`
+	// Output only. The harmonic mean of recall and precision.
+	F1Score float32 `protobuf:"fixed32,4,opt,name=f1_score,json=f1Score,proto3" json:"f1_score,omitempty"`
+	// Output only. The recall when only considering the label that has the
+	// highest prediction score and not below the confidence threshold for each
+	// example.
+	RecallAt1 float32 `protobuf:"fixed32,5,opt,name=recall_at1,json=recallAt1,proto3" json:"recall_at1,omitempty"`
+	// Output only. The precision when only considering the label that has the
+	// highest predictionscore and not below the confidence threshold for each
+	// example.
+	PrecisionAt1 float32 `protobuf:"fixed32,6,opt,name=precision_at1,json=precisionAt1,proto3" json:"precision_at1,omitempty"`
+	// Output only. The harmonic mean of [recall_at1][google.cloud.automl.v1beta1.ClassificationEvaluationMetrics.ConfidenceMetricsEntry.recall_at1] and [precision_at1][google.cloud.automl.v1beta1.ClassificationEvaluationMetrics.ConfidenceMetricsEntry.precision_at1].
+	F1ScoreAt1           float32  `protobuf:"fixed32,7,opt,name=f1_score_at1,json=f1ScoreAt1,proto3" json:"f1_score_at1,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) Reset() {
+	*m = ClassificationEvaluationMetrics_ConfidenceMetricsEntry{}
+}
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) String() string {
+	return proto.CompactTextString(m)
+}
+func (*ClassificationEvaluationMetrics_ConfidenceMetricsEntry) ProtoMessage() {}
+func (*ClassificationEvaluationMetrics_ConfidenceMetricsEntry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_classification_e3eb78fdd10472f9, []int{1, 0}
+}
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Unmarshal(m, b)
+}
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Marshal(b, m, deterministic)
+}
+func (dst *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Merge(dst, src)
+}
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_Size() int {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.Size(m)
+}
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClassificationEvaluationMetrics_ConfidenceMetricsEntry proto.InternalMessageInfo
+
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) GetConfidenceThreshold() float32 {
+	if m != nil {
+		return m.ConfidenceThreshold
+	}
+	return 0
+}
+
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) GetRecall() float32 {
+	if m != nil {
+		return m.Recall
+	}
+	return 0
+}
+
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) GetPrecision() float32 {
+	if m != nil {
+		return m.Precision
+	}
+	return 0
+}
+
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) GetF1Score() float32 {
+	if m != nil {
+		return m.F1Score
+	}
+	return 0
+}
+
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) GetRecallAt1() float32 {
+	if m != nil {
+		return m.RecallAt1
+	}
+	return 0
+}
+
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) GetPrecisionAt1() float32 {
+	if m != nil {
+		return m.PrecisionAt1
+	}
+	return 0
+}
+
+func (m *ClassificationEvaluationMetrics_ConfidenceMetricsEntry) GetF1ScoreAt1() float32 {
+	if m != nil {
+		return m.F1ScoreAt1
+	}
+	return 0
+}
+
+// Confusion matrix of the model running the classification.
+type ClassificationEvaluationMetrics_ConfusionMatrix struct {
+	// Output only. IDs of the annotation specs used in the confusion matrix.
+	AnnotationSpecId []string `protobuf:"bytes,1,rep,name=annotation_spec_id,json=annotationSpecId,proto3" json:"annotation_spec_id,omitempty"`
+	// Output only. Rows in the confusion matrix. The number of rows is equal to
+	// the size of `annotation_spec_id`.
+	// `row[i].value[j]` is the number of examples that have ground truth of the
+	// `annotation_spec_id[i]` and are predicted as `annotation_spec_id[j]` by
+	// the model being evaluated.
+	Row                  []*ClassificationEvaluationMetrics_ConfusionMatrix_Row `protobuf:"bytes,2,rep,name=row,proto3" json:"row,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                               `json:"-"`
+	XXX_unrecognized     []byte                                                 `json:"-"`
+	XXX_sizecache        int32                                                  `json:"-"`
+}
+
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) Reset() {
+	*m = ClassificationEvaluationMetrics_ConfusionMatrix{}
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) String() string {
+	return proto.CompactTextString(m)
+}
+func (*ClassificationEvaluationMetrics_ConfusionMatrix) ProtoMessage() {}
+func (*ClassificationEvaluationMetrics_ConfusionMatrix) Descriptor() ([]byte, []int) {
+	return fileDescriptor_classification_e3eb78fdd10472f9, []int{1, 1}
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Unmarshal(m, b)
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Marshal(b, m, deterministic)
+}
+func (dst *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Merge(dst, src)
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_Size() int {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.Size(m)
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix proto.InternalMessageInfo
+
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) GetAnnotationSpecId() []string {
+	if m != nil {
+		return m.AnnotationSpecId
+	}
+	return nil
+}
+
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix) GetRow() []*ClassificationEvaluationMetrics_ConfusionMatrix_Row {
+	if m != nil {
+		return m.Row
+	}
+	return nil
+}
+
+// Output only. A row in the confusion matrix.
+type ClassificationEvaluationMetrics_ConfusionMatrix_Row struct {
+	// Output only. Value of the specific cell in the confusion matrix.
+	// The number of values each row is equal to the size of
+	// annotatin_spec_id.
+	ExampleCount         []int32  `protobuf:"varint,1,rep,packed,name=example_count,json=exampleCount,proto3" json:"example_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) Reset() {
+	*m = ClassificationEvaluationMetrics_ConfusionMatrix_Row{}
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) String() string {
+	return proto.CompactTextString(m)
+}
+func (*ClassificationEvaluationMetrics_ConfusionMatrix_Row) ProtoMessage() {}
+func (*ClassificationEvaluationMetrics_ConfusionMatrix_Row) Descriptor() ([]byte, []int) {
+	return fileDescriptor_classification_e3eb78fdd10472f9, []int{1, 1, 0}
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Unmarshal(m, b)
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Marshal(b, m, deterministic)
+}
+func (dst *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Merge(dst, src)
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_Size() int {
+	return xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.Size(m)
+}
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClassificationEvaluationMetrics_ConfusionMatrix_Row proto.InternalMessageInfo
+
+func (m *ClassificationEvaluationMetrics_ConfusionMatrix_Row) GetExampleCount() []int32 {
+	if m != nil {
+		return m.ExampleCount
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*ClassificationAnnotation)(nil), "google.cloud.automl.v1beta1.ClassificationAnnotation")
+	proto.RegisterType((*ClassificationEvaluationMetrics)(nil), "google.cloud.automl.v1beta1.ClassificationEvaluationMetrics")
+	proto.RegisterType((*ClassificationEvaluationMetrics_ConfidenceMetricsEntry)(nil), "google.cloud.automl.v1beta1.ClassificationEvaluationMetrics.ConfidenceMetricsEntry")
+	proto.RegisterType((*ClassificationEvaluationMetrics_ConfusionMatrix)(nil), "google.cloud.automl.v1beta1.ClassificationEvaluationMetrics.ConfusionMatrix")
+	proto.RegisterType((*ClassificationEvaluationMetrics_ConfusionMatrix_Row)(nil), "google.cloud.automl.v1beta1.ClassificationEvaluationMetrics.ConfusionMatrix.Row")
+	proto.RegisterEnum("google.cloud.automl.v1beta1.ClassificationType", ClassificationType_name, ClassificationType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/classification.proto", fileDescriptor_classification_e3eb78fdd10472f9)
+}
+
+var fileDescriptor_classification_e3eb78fdd10472f9 = []byte{
+	// 583 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x4f, 0xdb, 0x3e,
+	0x14, 0xff, 0xa6, 0xa5, 0xe5, 0xcb, 0x83, 0x8d, 0xca, 0x30, 0x94, 0x75, 0x6c, 0x54, 0x70, 0xa9,
+	0xd0, 0x94, 0x10, 0x76, 0xdc, 0x29, 0x64, 0x45, 0x8a, 0x54, 0x58, 0x95, 0x94, 0x03, 0xbb, 0x58,
+	0xae, 0xeb, 0x86, 0x48, 0x69, 0x1c, 0x39, 0x0e, 0x85, 0xeb, 0xee, 0xfb, 0xdb, 0xf6, 0x5f, 0xec,
+	0xef, 0x98, 0x62, 0x87, 0x74, 0x95, 0x2a, 0x36, 0x69, 0xbb, 0xe5, 0x7d, 0x7e, 0xf9, 0x3d, 0xbf,
+	0xc8, 0x70, 0x16, 0x71, 0x1e, 0x25, 0xcc, 0xa6, 0x09, 0x2f, 0xa6, 0x36, 0x29, 0x24, 0x9f, 0x27,
+	0xf6, 0xbd, 0x33, 0x61, 0x92, 0x38, 0x36, 0x4d, 0x48, 0x9e, 0xc7, 0xb3, 0x98, 0x12, 0x19, 0xf3,
+	0xd4, 0xca, 0x04, 0x97, 0x1c, 0xbd, 0xd1, 0x0e, 0x4b, 0x39, 0x2c, 0xed, 0xb0, 0x2a, 0x47, 0xf7,
+	0xb0, 0x8a, 0x23, 0x59, 0x6c, 0x93, 0x34, 0xe5, 0x52, 0x39, 0x73, 0x6d, 0x3d, 0x3e, 0x03, 0xd3,
+	0x5b, 0x89, 0x74, 0x6b, 0x09, 0xda, 0x87, 0x56, 0x4e, 0xb9, 0x60, 0xa6, 0xd1, 0x33, 0xfa, 0x8d,
+	0x40, 0x17, 0xc7, 0x3f, 0xda, 0x70, 0xb4, 0x6a, 0x19, 0xdc, 0x93, 0xa4, 0x50, 0x5f, 0x57, 0x4c,
+	0x8a, 0x98, 0xe6, 0xe8, 0x15, 0xb4, 0x49, 0x81, 0x33, 0x41, 0x9f, 0xac, 0xa4, 0x18, 0x09, 0x8a,
+	0xde, 0xc1, 0xf6, 0x84, 0xe4, 0x0c, 0x57, 0x5c, 0x43, 0x71, 0x5b, 0x25, 0xe4, 0x2a, 0xfe, 0x9b,
+	0x01, 0x26, 0xe5, 0xe9, 0x2c, 0x9e, 0xb2, 0x94, 0x32, 0x3c, 0xd7, 0x69, 0x98, 0xa5, 0x52, 0x3c,
+	0x9a, 0xcd, 0x5e, 0xb3, 0xbf, 0x7d, 0x1e, 0x5a, 0xcf, 0xcc, 0x6a, 0xfd, 0xa6, 0x2f, 0xcb, 0xab,
+	0xc3, 0x2b, 0x64, 0x50, 0x46, 0x07, 0x07, 0x74, 0x2d, 0x8e, 0x16, 0xd0, 0x29, 0x99, 0x22, 0x8f,
+	0x79, 0x8a, 0xe7, 0x44, 0x8a, 0xf8, 0xc1, 0xdc, 0xe8, 0x19, 0xfd, 0xed, 0xf3, 0xe1, 0x5f, 0xb7,
+	0xa1, 0x42, 0xaf, 0x54, 0x66, 0xb0, 0x4b, 0x57, 0x01, 0xf4, 0x1e, 0xd0, 0x72, 0x55, 0x38, 0xcf,
+	0x18, 0xc5, 0xf1, 0xd4, 0x6c, 0xf5, 0x9a, 0xfd, 0xad, 0xa0, 0xb3, 0x64, 0xc2, 0x8c, 0x51, 0x7f,
+	0xda, 0xfd, 0xda, 0x80, 0x83, 0xf5, 0x93, 0x21, 0x07, 0xf6, 0x7f, 0xb9, 0x50, 0x79, 0x27, 0x58,
+	0x7e, 0xc7, 0x93, 0x69, 0xb5, 0x96, 0xbd, 0x25, 0x37, 0x7e, 0xa2, 0xd0, 0x01, 0xb4, 0x05, 0xa3,
+	0x24, 0x49, 0xaa, 0xfd, 0x54, 0x15, 0x3a, 0x84, 0xad, 0x4c, 0x30, 0x1a, 0x97, 0x6d, 0x9a, 0x4d,
+	0xbd, 0xba, 0x1a, 0x40, 0xaf, 0xe1, 0xff, 0x99, 0x83, 0xf5, 0xef, 0xb2, 0xa1, 0xc8, 0xcd, 0x99,
+	0x13, 0x96, 0x25, 0x7a, 0x0b, 0xa0, 0x23, 0x30, 0x91, 0x8e, 0xd9, 0xd2, 0x4e, 0x8d, 0xb8, 0xd2,
+	0x41, 0x27, 0xf0, 0xa2, 0x8e, 0x51, 0x8a, 0xb6, 0x52, 0xec, 0xd4, 0x60, 0x29, 0xea, 0xc1, 0xce,
+	0x53, 0xbc, 0xd2, 0x6c, 0x2a, 0x0d, 0x54, 0x47, 0xb8, 0xd2, 0xe9, 0x7e, 0x37, 0x60, 0xd7, 0xfb,
+	0xa3, 0x6b, 0x34, 0xd6, 0x5f, 0x23, 0x9a, 0x40, 0x53, 0xf0, 0x85, 0xd9, 0x50, 0xff, 0xd9, 0xe8,
+	0x5f, 0x2e, 0xd8, 0x0a, 0xf8, 0x22, 0x28, 0xc3, 0xbb, 0xa7, 0xd0, 0x0c, 0xf8, 0xa2, 0x9c, 0x99,
+	0x3d, 0x90, 0x79, 0x96, 0x30, 0x4c, 0x79, 0x91, 0x4a, 0xd5, 0x53, 0x2b, 0xd8, 0xa9, 0x40, 0xaf,
+	0xc4, 0x4e, 0x6f, 0x01, 0xad, 0x9e, 0x33, 0x7e, 0xcc, 0x18, 0x3a, 0x81, 0x23, 0x6f, 0xe8, 0x86,
+	0xa1, 0x7f, 0xe9, 0x7b, 0xee, 0xd8, 0xff, 0x7c, 0x8d, 0xc7, 0xb7, 0xa3, 0x01, 0xbe, 0xb9, 0x0e,
+	0x47, 0x03, 0xcf, 0xbf, 0xf4, 0x07, 0x9f, 0x3a, 0xff, 0xa1, 0x97, 0x00, 0x57, 0x37, 0xc3, 0xb1,
+	0xaf, 0x94, 0x1d, 0xa3, 0xae, 0x87, 0xee, 0xc5, 0x60, 0xd8, 0x69, 0x5c, 0x3c, 0xc2, 0x11, 0xe5,
+	0xf3, 0xe7, 0x46, 0xbc, 0xd8, 0x5b, 0x3d, 0x7b, 0x54, 0xbe, 0x16, 0x5f, 0xdc, 0xca, 0x11, 0xf1,
+	0x84, 0xa4, 0x91, 0xc5, 0x45, 0x64, 0x47, 0x2c, 0x55, 0x2f, 0x89, 0xad, 0x29, 0x92, 0xc5, 0xf9,
+	0xda, 0x97, 0xeb, 0xa3, 0x2e, 0x27, 0x6d, 0xa5, 0xfe, 0xf0, 0x33, 0x00, 0x00, 0xff, 0xff, 0x22,
+	0xd4, 0x8f, 0x68, 0xe6, 0x04, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/data_items.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/data_items.pb.go
new file mode 100644
index 00000000..e2b406ea
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/data_items.pb.go
@@ -0,0 +1,424 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/data_items.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A representation of an image.
+type Image struct {
+	// Input only. The data representing the image.
+	// For Predict calls [image_bytes][] must be set, as other options are not
+	// currently supported by prediction API. You can read the contents of an
+	// uploaded image by using the [content_uri][] field.
+	//
+	// Types that are valid to be assigned to Data:
+	//	*Image_ImageBytes
+	//	*Image_InputConfig
+	Data isImage_Data `protobuf_oneof:"data"`
+	// Output only. HTTP URI to the thumbnail image.
+	ThumbnailUri         string   `protobuf:"bytes,4,opt,name=thumbnail_uri,json=thumbnailUri,proto3" json:"thumbnail_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Image) Reset()         { *m = Image{} }
+func (m *Image) String() string { return proto.CompactTextString(m) }
+func (*Image) ProtoMessage()    {}
+func (*Image) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_items_6a949c451484ad28, []int{0}
+}
+func (m *Image) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Image.Unmarshal(m, b)
+}
+func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
+}
+func (dst *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(dst, src)
+}
+func (m *Image) XXX_Size() int {
+	return xxx_messageInfo_Image.Size(m)
+}
+func (m *Image) XXX_DiscardUnknown() {
+	xxx_messageInfo_Image.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Image proto.InternalMessageInfo
+
+type isImage_Data interface {
+	isImage_Data()
+}
+
+type Image_ImageBytes struct {
+	ImageBytes []byte `protobuf:"bytes,1,opt,name=image_bytes,json=imageBytes,proto3,oneof"`
+}
+
+type Image_InputConfig struct {
+	InputConfig *InputConfig `protobuf:"bytes,6,opt,name=input_config,json=inputConfig,proto3,oneof"`
+}
+
+func (*Image_ImageBytes) isImage_Data() {}
+
+func (*Image_InputConfig) isImage_Data() {}
+
+func (m *Image) GetData() isImage_Data {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *Image) GetImageBytes() []byte {
+	if x, ok := m.GetData().(*Image_ImageBytes); ok {
+		return x.ImageBytes
+	}
+	return nil
+}
+
+func (m *Image) GetInputConfig() *InputConfig {
+	if x, ok := m.GetData().(*Image_InputConfig); ok {
+		return x.InputConfig
+	}
+	return nil
+}
+
+func (m *Image) GetThumbnailUri() string {
+	if m != nil {
+		return m.ThumbnailUri
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Image) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Image_OneofMarshaler, _Image_OneofUnmarshaler, _Image_OneofSizer, []interface{}{
+		(*Image_ImageBytes)(nil),
+		(*Image_InputConfig)(nil),
+	}
+}
+
+func _Image_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Image)
+	// data
+	switch x := m.Data.(type) {
+	case *Image_ImageBytes:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.ImageBytes)
+	case *Image_InputConfig:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InputConfig); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Image.Data has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Image_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Image)
+	switch tag {
+	case 1: // data.image_bytes
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.Data = &Image_ImageBytes{x}
+		return true, err
+	case 6: // data.input_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InputConfig)
+		err := b.DecodeMessage(msg)
+		m.Data = &Image_InputConfig{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Image_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Image)
+	// data
+	switch x := m.Data.(type) {
+	case *Image_ImageBytes:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.ImageBytes)))
+		n += len(x.ImageBytes)
+	case *Image_InputConfig:
+		s := proto.Size(x.InputConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// A representation of a text snippet.
+type TextSnippet struct {
+	// Required. The content of the text snippet as a string. Up to 250000
+	// characters long.
+	Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
+	// The format of the source text. For example, "text/html" or
+	// "text/plain". If left blank the format is automatically determined from
+	// the type of the uploaded content. The default is "text/html". Up to 25000
+	// characters long.
+	MimeType string `protobuf:"bytes,2,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
+	// Output only. HTTP URI where you can download the content.
+	ContentUri           string   `protobuf:"bytes,4,opt,name=content_uri,json=contentUri,proto3" json:"content_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextSnippet) Reset()         { *m = TextSnippet{} }
+func (m *TextSnippet) String() string { return proto.CompactTextString(m) }
+func (*TextSnippet) ProtoMessage()    {}
+func (*TextSnippet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_items_6a949c451484ad28, []int{1}
+}
+func (m *TextSnippet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextSnippet.Unmarshal(m, b)
+}
+func (m *TextSnippet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextSnippet.Marshal(b, m, deterministic)
+}
+func (dst *TextSnippet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSnippet.Merge(dst, src)
+}
+func (m *TextSnippet) XXX_Size() int {
+	return xxx_messageInfo_TextSnippet.Size(m)
+}
+func (m *TextSnippet) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextSnippet.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextSnippet proto.InternalMessageInfo
+
+func (m *TextSnippet) GetContent() string {
+	if m != nil {
+		return m.Content
+	}
+	return ""
+}
+
+func (m *TextSnippet) GetMimeType() string {
+	if m != nil {
+		return m.MimeType
+	}
+	return ""
+}
+
+func (m *TextSnippet) GetContentUri() string {
+	if m != nil {
+		return m.ContentUri
+	}
+	return ""
+}
+
+// Example data used for training or prediction.
+type ExamplePayload struct {
+	// Required. Input only. The example data.
+	//
+	// Types that are valid to be assigned to Payload:
+	//	*ExamplePayload_Image
+	//	*ExamplePayload_TextSnippet
+	Payload              isExamplePayload_Payload `protobuf_oneof:"payload"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *ExamplePayload) Reset()         { *m = ExamplePayload{} }
+func (m *ExamplePayload) String() string { return proto.CompactTextString(m) }
+func (*ExamplePayload) ProtoMessage()    {}
+func (*ExamplePayload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_items_6a949c451484ad28, []int{2}
+}
+func (m *ExamplePayload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExamplePayload.Unmarshal(m, b)
+}
+func (m *ExamplePayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExamplePayload.Marshal(b, m, deterministic)
+}
+func (dst *ExamplePayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExamplePayload.Merge(dst, src)
+}
+func (m *ExamplePayload) XXX_Size() int {
+	return xxx_messageInfo_ExamplePayload.Size(m)
+}
+func (m *ExamplePayload) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExamplePayload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExamplePayload proto.InternalMessageInfo
+
+type isExamplePayload_Payload interface {
+	isExamplePayload_Payload()
+}
+
+type ExamplePayload_Image struct {
+	Image *Image `protobuf:"bytes,1,opt,name=image,proto3,oneof"`
+}
+
+type ExamplePayload_TextSnippet struct {
+	TextSnippet *TextSnippet `protobuf:"bytes,2,opt,name=text_snippet,json=textSnippet,proto3,oneof"`
+}
+
+func (*ExamplePayload_Image) isExamplePayload_Payload() {}
+
+func (*ExamplePayload_TextSnippet) isExamplePayload_Payload() {}
+
+func (m *ExamplePayload) GetPayload() isExamplePayload_Payload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (m *ExamplePayload) GetImage() *Image {
+	if x, ok := m.GetPayload().(*ExamplePayload_Image); ok {
+		return x.Image
+	}
+	return nil
+}
+
+func (m *ExamplePayload) GetTextSnippet() *TextSnippet {
+	if x, ok := m.GetPayload().(*ExamplePayload_TextSnippet); ok {
+		return x.TextSnippet
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ExamplePayload) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ExamplePayload_OneofMarshaler, _ExamplePayload_OneofUnmarshaler, _ExamplePayload_OneofSizer, []interface{}{
+		(*ExamplePayload_Image)(nil),
+		(*ExamplePayload_TextSnippet)(nil),
+	}
+}
+
+func _ExamplePayload_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ExamplePayload)
+	// payload
+	switch x := m.Payload.(type) {
+	case *ExamplePayload_Image:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Image); err != nil {
+			return err
+		}
+	case *ExamplePayload_TextSnippet:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TextSnippet); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("ExamplePayload.Payload has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ExamplePayload_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ExamplePayload)
+	switch tag {
+	case 1: // payload.image
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Image)
+		err := b.DecodeMessage(msg)
+		m.Payload = &ExamplePayload_Image{msg}
+		return true, err
+	case 2: // payload.text_snippet
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TextSnippet)
+		err := b.DecodeMessage(msg)
+		m.Payload = &ExamplePayload_TextSnippet{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ExamplePayload_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ExamplePayload)
+	// payload
+	switch x := m.Payload.(type) {
+	case *ExamplePayload_Image:
+		s := proto.Size(x.Image)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ExamplePayload_TextSnippet:
+		s := proto.Size(x.TextSnippet)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+func init() {
+	proto.RegisterType((*Image)(nil), "google.cloud.automl.v1beta1.Image")
+	proto.RegisterType((*TextSnippet)(nil), "google.cloud.automl.v1beta1.TextSnippet")
+	proto.RegisterType((*ExamplePayload)(nil), "google.cloud.automl.v1beta1.ExamplePayload")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/data_items.proto", fileDescriptor_data_items_6a949c451484ad28)
+}
+
+var fileDescriptor_data_items_6a949c451484ad28 = []byte{
+	// 381 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x3d, 0xcf, 0xd3, 0x30,
+	0x14, 0x85, 0x1b, 0xd4, 0x0f, 0xe2, 0x14, 0x06, 0x4f, 0x51, 0x8b, 0xd4, 0x52, 0x18, 0x32, 0xa0,
+	0x44, 0x2d, 0x1b, 0x4c, 0x04, 0x21, 0xb5, 0x03, 0x52, 0x15, 0xda, 0x85, 0x25, 0x72, 0x52, 0xd7,
+	0x58, 0x8a, 0x3f, 0x94, 0xdc, 0xa0, 0xe6, 0x0f, 0xf1, 0x3b, 0x91, 0xed, 0x40, 0x3b, 0xbc, 0xca,
+	0xbb, 0xe5, 0x9e, 0xfb, 0x5c, 0xdf, 0xe3, 0x13, 0xa3, 0x0f, 0x4c, 0x29, 0x56, 0xd1, 0xa4, 0xac,
+	0x54, 0x7b, 0x49, 0x48, 0x0b, 0x4a, 0x54, 0xc9, 0xef, 0x6d, 0x41, 0x81, 0x6c, 0x93, 0x0b, 0x01,
+	0x92, 0x73, 0xa0, 0xa2, 0x89, 0x75, 0xad, 0x40, 0xe1, 0xa5, 0xa3, 0x63, 0x4b, 0xc7, 0x8e, 0x8e,
+	0x7b, 0x7a, 0xf1, 0xa6, 0x3f, 0x8a, 0x68, 0x9e, 0x10, 0x29, 0x15, 0x10, 0xe0, 0x4a, 0xf6, 0xa3,
+	0x8b, 0xf7, 0x43, 0x8b, 0xb8, 0x72, 0xd4, 0xe6, 0x8f, 0x87, 0x26, 0x07, 0x41, 0x18, 0xc5, 0x6f,
+	0x51, 0xc0, 0xcd, 0x47, 0x5e, 0x74, 0x40, 0x9b, 0xd0, 0x5b, 0x7b, 0xd1, 0x7c, 0x3f, 0xca, 0x90,
+	0x15, 0x53, 0xa3, 0xe1, 0xef, 0x68, 0xce, 0xa5, 0x6e, 0x21, 0x2f, 0x95, 0xbc, 0x72, 0x16, 0x4e,
+	0xd7, 0x5e, 0x14, 0xec, 0xa2, 0x78, 0xc0, 0x64, 0x7c, 0x30, 0x03, 0x5f, 0x2d, 0xbf, 0x1f, 0x65,
+	0x01, 0xbf, 0x97, 0xf8, 0x1d, 0x7a, 0x05, 0xbf, 0x5a, 0x51, 0x48, 0xc2, 0xab, 0xbc, 0xad, 0x79,
+	0x38, 0x5e, 0x7b, 0x91, 0x9f, 0xcd, 0xff, 0x8b, 0xe7, 0x9a, 0xa7, 0x53, 0x34, 0x36, 0xa9, 0x6c,
+	0x28, 0x0a, 0x4e, 0xf4, 0x06, 0x3f, 0x24, 0xd7, 0x9a, 0x02, 0x0e, 0xd1, 0xac, 0x54, 0x12, 0xa8,
+	0x04, 0xeb, 0xd4, 0xcf, 0xfe, 0x95, 0x78, 0x89, 0x7c, 0xc1, 0x05, 0xcd, 0xa1, 0xd3, 0x34, 0x7c,
+	0x61, 0x7b, 0x2f, 0x8d, 0x70, 0xea, 0x34, 0xc5, 0x2b, 0x14, 0xf4, 0xdc, 0xc3, 0x42, 0xd4, 0x4b,
+	0xe7, 0x9a, 0x9b, 0x3c, 0x5e, 0x7f, 0xbb, 0x11, 0xa1, 0x2b, 0x7a, 0x24, 0x5d, 0xa5, 0xc8, 0x05,
+	0x7f, 0x42, 0x13, 0x9b, 0x81, 0x5d, 0x14, 0xec, 0x36, 0xc3, 0xd7, 0x35, 0xe4, 0x7e, 0x94, 0xb9,
+	0x11, 0x93, 0x18, 0xd0, 0x1b, 0xe4, 0x8d, 0xb3, 0x6d, 0xfd, 0x3c, 0x97, 0xd8, 0xc3, 0x35, 0x4d,
+	0x62, 0x70, 0x2f, 0x53, 0x1f, 0xcd, 0xb4, 0x73, 0x95, 0x5e, 0xd1, 0xaa, 0x54, 0x62, 0xe8, 0xa0,
+	0xa3, 0xf7, 0xf3, 0x4b, 0xdf, 0x66, 0xaa, 0x22, 0x92, 0xc5, 0xaa, 0x66, 0x09, 0xa3, 0xd2, 0xfe,
+	0xf9, 0xc4, 0xb5, 0x88, 0xe6, 0xcd, 0x93, 0x4f, 0xe4, 0xb3, 0x2b, 0x8b, 0xa9, 0xa5, 0x3f, 0xfe,
+	0x0d, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xa5, 0xac, 0xba, 0xb8, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/dataset.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/dataset.pb.go
new file mode 100644
index 00000000..6ff1b908
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/dataset.pb.go
@@ -0,0 +1,283 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/dataset.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A workspace for solving a single, particular machine learning (ML) problem.
+// A workspace contains examples that may be annotated.
+type Dataset struct {
+	// Required.
+	// The dataset metadata that is specific to the problem type.
+	//
+	// Types that are valid to be assigned to DatasetMetadata:
+	//	*Dataset_TranslationDatasetMetadata
+	//	*Dataset_ImageClassificationDatasetMetadata
+	//	*Dataset_TextClassificationDatasetMetadata
+	DatasetMetadata isDataset_DatasetMetadata `protobuf_oneof:"dataset_metadata"`
+	// Output only. The resource name of the dataset.
+	// Form: `projects/{project_id}/locations/{location_id}/datasets/{dataset_id}`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The name of the dataset to show in the interface. The name can be
+	// up to 32 characters
+	// long and can consist only of ASCII Latin letters A-Z and a-z, underscores
+	// (_), and ASCII digits 0-9.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Output only. The number of examples in the dataset.
+	ExampleCount int32 `protobuf:"varint,21,opt,name=example_count,json=exampleCount,proto3" json:"example_count,omitempty"`
+	// Output only. Timestamp when this dataset was created.
+	CreateTime           *timestamp.Timestamp `protobuf:"bytes,14,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Dataset) Reset()         { *m = Dataset{} }
+func (m *Dataset) String() string { return proto.CompactTextString(m) }
+func (*Dataset) ProtoMessage()    {}
+func (*Dataset) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dataset_a8678ffeb33098d6, []int{0}
+}
+func (m *Dataset) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Dataset.Unmarshal(m, b)
+}
+func (m *Dataset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Dataset.Marshal(b, m, deterministic)
+}
+func (dst *Dataset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dataset.Merge(dst, src)
+}
+func (m *Dataset) XXX_Size() int {
+	return xxx_messageInfo_Dataset.Size(m)
+}
+func (m *Dataset) XXX_DiscardUnknown() {
+	xxx_messageInfo_Dataset.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Dataset proto.InternalMessageInfo
+
+type isDataset_DatasetMetadata interface {
+	isDataset_DatasetMetadata()
+}
+
+type Dataset_TranslationDatasetMetadata struct {
+	TranslationDatasetMetadata *TranslationDatasetMetadata `protobuf:"bytes,23,opt,name=translation_dataset_metadata,json=translationDatasetMetadata,proto3,oneof"`
+}
+
+type Dataset_ImageClassificationDatasetMetadata struct {
+	ImageClassificationDatasetMetadata *ImageClassificationDatasetMetadata `protobuf:"bytes,24,opt,name=image_classification_dataset_metadata,json=imageClassificationDatasetMetadata,proto3,oneof"`
+}
+
+type Dataset_TextClassificationDatasetMetadata struct {
+	TextClassificationDatasetMetadata *TextClassificationDatasetMetadata `protobuf:"bytes,25,opt,name=text_classification_dataset_metadata,json=textClassificationDatasetMetadata,proto3,oneof"`
+}
+
+func (*Dataset_TranslationDatasetMetadata) isDataset_DatasetMetadata() {}
+
+func (*Dataset_ImageClassificationDatasetMetadata) isDataset_DatasetMetadata() {}
+
+func (*Dataset_TextClassificationDatasetMetadata) isDataset_DatasetMetadata() {}
+
+func (m *Dataset) GetDatasetMetadata() isDataset_DatasetMetadata {
+	if m != nil {
+		return m.DatasetMetadata
+	}
+	return nil
+}
+
+func (m *Dataset) GetTranslationDatasetMetadata() *TranslationDatasetMetadata {
+	if x, ok := m.GetDatasetMetadata().(*Dataset_TranslationDatasetMetadata); ok {
+		return x.TranslationDatasetMetadata
+	}
+	return nil
+}
+
+func (m *Dataset) GetImageClassificationDatasetMetadata() *ImageClassificationDatasetMetadata {
+	if x, ok := m.GetDatasetMetadata().(*Dataset_ImageClassificationDatasetMetadata); ok {
+		return x.ImageClassificationDatasetMetadata
+	}
+	return nil
+}
+
+func (m *Dataset) GetTextClassificationDatasetMetadata() *TextClassificationDatasetMetadata {
+	if x, ok := m.GetDatasetMetadata().(*Dataset_TextClassificationDatasetMetadata); ok {
+		return x.TextClassificationDatasetMetadata
+	}
+	return nil
+}
+
+func (m *Dataset) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Dataset) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *Dataset) GetExampleCount() int32 {
+	if m != nil {
+		return m.ExampleCount
+	}
+	return 0
+}
+
+func (m *Dataset) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Dataset) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Dataset_OneofMarshaler, _Dataset_OneofUnmarshaler, _Dataset_OneofSizer, []interface{}{
+		(*Dataset_TranslationDatasetMetadata)(nil),
+		(*Dataset_ImageClassificationDatasetMetadata)(nil),
+		(*Dataset_TextClassificationDatasetMetadata)(nil),
+	}
+}
+
+func _Dataset_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Dataset)
+	// dataset_metadata
+	switch x := m.DatasetMetadata.(type) {
+	case *Dataset_TranslationDatasetMetadata:
+		b.EncodeVarint(23<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TranslationDatasetMetadata); err != nil {
+			return err
+		}
+	case *Dataset_ImageClassificationDatasetMetadata:
+		b.EncodeVarint(24<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ImageClassificationDatasetMetadata); err != nil {
+			return err
+		}
+	case *Dataset_TextClassificationDatasetMetadata:
+		b.EncodeVarint(25<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TextClassificationDatasetMetadata); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Dataset.DatasetMetadata has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Dataset_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Dataset)
+	switch tag {
+	case 23: // dataset_metadata.translation_dataset_metadata
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TranslationDatasetMetadata)
+		err := b.DecodeMessage(msg)
+		m.DatasetMetadata = &Dataset_TranslationDatasetMetadata{msg}
+		return true, err
+	case 24: // dataset_metadata.image_classification_dataset_metadata
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ImageClassificationDatasetMetadata)
+		err := b.DecodeMessage(msg)
+		m.DatasetMetadata = &Dataset_ImageClassificationDatasetMetadata{msg}
+		return true, err
+	case 25: // dataset_metadata.text_classification_dataset_metadata
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TextClassificationDatasetMetadata)
+		err := b.DecodeMessage(msg)
+		m.DatasetMetadata = &Dataset_TextClassificationDatasetMetadata{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Dataset_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Dataset)
+	// dataset_metadata
+	switch x := m.DatasetMetadata.(type) {
+	case *Dataset_TranslationDatasetMetadata:
+		s := proto.Size(x.TranslationDatasetMetadata)
+		n += 2 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Dataset_ImageClassificationDatasetMetadata:
+		s := proto.Size(x.ImageClassificationDatasetMetadata)
+		n += 2 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Dataset_TextClassificationDatasetMetadata:
+		s := proto.Size(x.TextClassificationDatasetMetadata)
+		n += 2 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+func init() {
+	proto.RegisterType((*Dataset)(nil), "google.cloud.automl.v1beta1.Dataset")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/dataset.proto", fileDescriptor_dataset_a8678ffeb33098d6)
+}
+
+var fileDescriptor_dataset_a8678ffeb33098d6 = []byte{
+	// 428 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x5d, 0x6b, 0x14, 0x31,
+	0x14, 0x86, 0x1d, 0xa9, 0x8a, 0xd9, 0x2a, 0x12, 0x10, 0xc7, 0xb1, 0xd0, 0x6d, 0xfd, 0x5a, 0x41,
+	0x13, 0xaa, 0x82, 0x17, 0x05, 0xc5, 0xd6, 0x0b, 0xbd, 0x50, 0x64, 0xe9, 0x95, 0x37, 0xe1, 0xec,
+	0x6c, 0x76, 0x08, 0xe4, 0x63, 0xd8, 0x9c, 0x91, 0x2d, 0xfe, 0x0a, 0xc1, 0xdf, 0xe7, 0x6f, 0x91,
+	0x49, 0x32, 0xd4, 0xaf, 0xcd, 0xdc, 0x25, 0xe7, 0x3c, 0x79, 0xf3, 0x9e, 0x97, 0x43, 0x9e, 0x34,
+	0xce, 0x35, 0x5a, 0xf2, 0x5a, 0xbb, 0x6e, 0xc9, 0xa1, 0x43, 0x67, 0x34, 0xff, 0x7a, 0xb4, 0x90,
+	0x08, 0x47, 0x7c, 0x09, 0x08, 0x5e, 0x22, 0x6b, 0xd7, 0x0e, 0x1d, 0xbd, 0x17, 0x51, 0x16, 0x50,
+	0x16, 0x51, 0x96, 0xd0, 0x6a, 0x2f, 0xe9, 0x40, 0xab, 0x38, 0x58, 0xeb, 0x10, 0x50, 0x39, 0xeb,
+	0xe3, 0xd3, 0xea, 0x65, 0xee, 0x97, 0x0b, 0x5c, 0xb4, 0x70, 0xae, 0x1d, 0x2c, 0xd3, 0xab, 0xa7,
+	0x63, 0xde, 0x84, 0x42, 0x69, 0x86, 0x3f, 0x1e, 0xe7, 0x68, 0x65, 0xa0, 0x91, 0x09, 0x7c, 0x94,
+	0x03, 0x51, 0x6e, 0xd2, 0xbc, 0xd5, 0xb3, 0x2c, 0xb7, 0x06, 0xeb, 0x75, 0x70, 0x9d, 0xf0, 0xfd,
+	0x84, 0x87, 0xdb, 0xa2, 0x5b, 0x71, 0x54, 0x46, 0x7a, 0x04, 0xd3, 0x46, 0xe0, 0xf0, 0xe7, 0x0e,
+	0xb9, 0xf6, 0x2e, 0x26, 0x4a, 0xbf, 0x91, 0xbd, 0xdf, 0x14, 0x44, 0x0a, 0x5a, 0x18, 0x89, 0xd0,
+	0x9f, 0xcb, 0x3b, 0xd3, 0x62, 0x36, 0x79, 0xfe, 0x8a, 0x65, 0x22, 0x67, 0x67, 0x17, 0x02, 0x49,
+	0xf6, 0x63, 0x7a, 0xfe, 0xfe, 0xd2, 0xbc, 0xc2, 0xad, 0x5d, 0xfa, 0xa3, 0x20, 0x0f, 0x43, 0x20,
+	0xa2, 0xd6, 0xe0, 0xbd, 0x5a, 0xa9, 0x7a, 0x8b, 0x8d, 0x32, 0xd8, 0x78, 0x93, 0xb5, 0xf1, 0xa1,
+	0x57, 0x3a, 0xfd, 0x43, 0xe8, 0x5f, 0x3b, 0x87, 0x6a, 0x94, 0xa2, 0xdf, 0x0b, 0xf2, 0xa0, 0x8f,
+	0x7f, 0xd4, 0xd5, 0xdd, 0xe0, 0xea, 0x75, 0x3e, 0x1c, 0xb9, 0xc1, 0x31, 0x53, 0x07, 0x38, 0x06,
+	0x51, 0x4a, 0x76, 0x2c, 0x18, 0x59, 0x16, 0xd3, 0x62, 0x76, 0x7d, 0x1e, 0xce, 0xf4, 0x80, 0xec,
+	0x2e, 0x95, 0x6f, 0x35, 0x9c, 0x8b, 0xd0, 0xbb, 0x1c, 0x7a, 0x93, 0x54, 0xfb, 0xd4, 0x23, 0xf7,
+	0xc9, 0x0d, 0xb9, 0x01, 0xd3, 0x6a, 0x29, 0x6a, 0xd7, 0x59, 0x2c, 0x6f, 0x4f, 0x8b, 0xd9, 0x95,
+	0xf9, 0x6e, 0x2a, 0x9e, 0xf6, 0x35, 0x7a, 0x4c, 0x26, 0xf5, 0x5a, 0x02, 0x4a, 0xd1, 0x6f, 0x4a,
+	0x79, 0x33, 0x4c, 0x55, 0x0d, 0x53, 0x0d, 0x6b, 0xc4, 0xce, 0x86, 0x35, 0x9a, 0x93, 0x88, 0xf7,
+	0x85, 0x13, 0x4a, 0x6e, 0xfd, 0x9d, 0xcb, 0xc9, 0x8a, 0xec, 0xd7, 0xce, 0xe4, 0x62, 0xf9, 0x5c,
+	0x7c, 0x79, 0x9b, 0xda, 0x8d, 0xd3, 0x60, 0x1b, 0xe6, 0xd6, 0x0d, 0x6f, 0xa4, 0x0d, 0xbf, 0xf1,
+	0xd8, 0x82, 0x56, 0xf9, 0xff, 0x2e, 0xfd, 0x71, 0xbc, 0x2e, 0xae, 0x06, 0xfa, 0xc5, 0xaf, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x84, 0x83, 0x13, 0xa3, 0x3c, 0x04, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/image.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/image.pb.go
new file mode 100644
index 00000000..8c0c2c9b
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/image.pb.go
@@ -0,0 +1,171 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/image.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Dataset metadata that is specific to image classification.
+type ImageClassificationDatasetMetadata struct {
+	// Required.
+	// Type of the classification problem.
+	ClassificationType   ClassificationType `protobuf:"varint,1,opt,name=classification_type,json=classificationType,proto3,enum=google.cloud.automl.v1beta1.ClassificationType" json:"classification_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *ImageClassificationDatasetMetadata) Reset()         { *m = ImageClassificationDatasetMetadata{} }
+func (m *ImageClassificationDatasetMetadata) String() string { return proto.CompactTextString(m) }
+func (*ImageClassificationDatasetMetadata) ProtoMessage()    {}
+func (*ImageClassificationDatasetMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_154474385dd5e971, []int{0}
+}
+func (m *ImageClassificationDatasetMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageClassificationDatasetMetadata.Unmarshal(m, b)
+}
+func (m *ImageClassificationDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageClassificationDatasetMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ImageClassificationDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageClassificationDatasetMetadata.Merge(dst, src)
+}
+func (m *ImageClassificationDatasetMetadata) XXX_Size() int {
+	return xxx_messageInfo_ImageClassificationDatasetMetadata.Size(m)
+}
+func (m *ImageClassificationDatasetMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageClassificationDatasetMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageClassificationDatasetMetadata proto.InternalMessageInfo
+
+func (m *ImageClassificationDatasetMetadata) GetClassificationType() ClassificationType {
+	if m != nil {
+		return m.ClassificationType
+	}
+	return ClassificationType_CLASSIFICATION_TYPE_UNSPECIFIED
+}
+
+// Model metadata for image classification.
+type ImageClassificationModelMetadata struct {
+	// Optional. The ID of the `base` model. If it is specified, the new model
+	// will be created based on the `base` model. Otherwise, the new model will be
+	// created from scratch. The `base` model is expected to be in the same
+	// `project` and `location` as the new model to create.
+	BaseModelId string `protobuf:"bytes,1,opt,name=base_model_id,json=baseModelId,proto3" json:"base_model_id,omitempty"`
+	// Required. The train budget of creating this model. The actual
+	// `train_cost` will be equal or less than this value.
+	TrainBudget int64 `protobuf:"varint,2,opt,name=train_budget,json=trainBudget,proto3" json:"train_budget,omitempty"`
+	// Output only. The actual train cost of creating this model. If this
+	// model is created from a `base` model, the train cost used to create the
+	// `base` model are not included.
+	TrainCost int64 `protobuf:"varint,3,opt,name=train_cost,json=trainCost,proto3" json:"train_cost,omitempty"`
+	// Output only. The reason that this create model operation stopped,
+	// e.g. BUDGET_REACHED, CONVERGED.
+	StopReason           string   `protobuf:"bytes,5,opt,name=stop_reason,json=stopReason,proto3" json:"stop_reason,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImageClassificationModelMetadata) Reset()         { *m = ImageClassificationModelMetadata{} }
+func (m *ImageClassificationModelMetadata) String() string { return proto.CompactTextString(m) }
+func (*ImageClassificationModelMetadata) ProtoMessage()    {}
+func (*ImageClassificationModelMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_154474385dd5e971, []int{1}
+}
+func (m *ImageClassificationModelMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageClassificationModelMetadata.Unmarshal(m, b)
+}
+func (m *ImageClassificationModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageClassificationModelMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ImageClassificationModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageClassificationModelMetadata.Merge(dst, src)
+}
+func (m *ImageClassificationModelMetadata) XXX_Size() int {
+	return xxx_messageInfo_ImageClassificationModelMetadata.Size(m)
+}
+func (m *ImageClassificationModelMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageClassificationModelMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageClassificationModelMetadata proto.InternalMessageInfo
+
+func (m *ImageClassificationModelMetadata) GetBaseModelId() string {
+	if m != nil {
+		return m.BaseModelId
+	}
+	return ""
+}
+
+func (m *ImageClassificationModelMetadata) GetTrainBudget() int64 {
+	if m != nil {
+		return m.TrainBudget
+	}
+	return 0
+}
+
+func (m *ImageClassificationModelMetadata) GetTrainCost() int64 {
+	if m != nil {
+		return m.TrainCost
+	}
+	return 0
+}
+
+func (m *ImageClassificationModelMetadata) GetStopReason() string {
+	if m != nil {
+		return m.StopReason
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*ImageClassificationDatasetMetadata)(nil), "google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata")
+	proto.RegisterType((*ImageClassificationModelMetadata)(nil), "google.cloud.automl.v1beta1.ImageClassificationModelMetadata")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/image.proto", fileDescriptor_image_154474385dd5e971)
+}
+
+var fileDescriptor_image_154474385dd5e971 = []byte{
+	// 338 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x6a, 0xe3, 0x40,
+	0x10, 0x86, 0xd1, 0x99, 0x3b, 0xf0, 0xfa, 0xee, 0x0a, 0xa5, 0x11, 0x4e, 0x82, 0x1d, 0x35, 0x71,
+	0xa5, 0x8d, 0x93, 0x32, 0x55, 0xec, 0x34, 0x2e, 0x0c, 0x46, 0xa4, 0x4a, 0xa3, 0x8c, 0xa4, 0xf5,
+	0xb2, 0x20, 0x69, 0x16, 0xed, 0x28, 0xe0, 0x17, 0xc8, 0xbb, 0xe4, 0x2d, 0x83, 0x66, 0x45, 0xc0,
+	0xc4, 0xb8, 0xdc, 0x4f, 0xdf, 0x3f, 0xfb, 0x8f, 0x56, 0xdc, 0x6a, 0x44, 0x5d, 0x29, 0x59, 0x54,
+	0xd8, 0x95, 0x12, 0x3a, 0xc2, 0xba, 0x92, 0xef, 0xcb, 0x5c, 0x11, 0x2c, 0xa5, 0xa9, 0x41, 0xab,
+	0xc4, 0xb6, 0x48, 0x18, 0x5e, 0x7a, 0x31, 0x61, 0x31, 0xf1, 0x62, 0x32, 0x88, 0xd3, 0xab, 0x61,
+	0x0a, 0x58, 0x23, 0xa1, 0x69, 0x90, 0x80, 0x0c, 0x36, 0xce, 0x47, 0xa7, 0x77, 0xe7, 0xee, 0x28,
+	0x2a, 0x70, 0xce, 0xec, 0x4d, 0xc1, 0x91, 0x21, 0x31, 0x1b, 0x12, 0x7c, 0xca, 0xbb, 0xbd, 0x24,
+	0x53, 0x2b, 0x47, 0x50, 0x5b, 0x2f, 0xc4, 0x1f, 0x81, 0x88, 0x37, 0x7d, 0xbb, 0xf5, 0x51, 0xfc,
+	0x19, 0x08, 0x9c, 0xa2, 0xad, 0x22, 0x28, 0x81, 0x20, 0x7c, 0x13, 0x17, 0xc7, 0xf3, 0x33, 0x3a,
+	0x58, 0x15, 0x05, 0xf3, 0x60, 0xf1, 0xff, 0x5e, 0x26, 0x67, 0x56, 0x4a, 0x8e, 0x07, 0xbf, 0x1c,
+	0xac, 0x4a, 0xc3, 0xe2, 0x07, 0x8b, 0x3f, 0x03, 0x31, 0x3f, 0x51, 0x64, 0x8b, 0xa5, 0xaa, 0xbe,
+	0x6b, 0xc4, 0xe2, 0x5f, 0x0e, 0x4e, 0x65, 0x75, 0x4f, 0x33, 0x53, 0x72, 0x81, 0x71, 0x3a, 0xe9,
+	0x21, 0x9b, 0x9b, 0x32, 0xbc, 0x11, 0x7f, 0xa9, 0x05, 0xd3, 0x64, 0x79, 0x57, 0x6a, 0x45, 0xd1,
+	0xaf, 0x79, 0xb0, 0x18, 0xa5, 0x13, 0x66, 0x2b, 0x46, 0xe1, 0xb5, 0x10, 0x5e, 0x29, 0xd0, 0x51,
+	0x34, 0x62, 0x61, 0xcc, 0x64, 0x8d, 0x8e, 0xc2, 0x99, 0x98, 0x38, 0x42, 0x9b, 0xb5, 0x0a, 0x1c,
+	0x36, 0xd1, 0x6f, 0xbe, 0x43, 0xf4, 0x28, 0x65, 0xb2, 0x6a, 0xc5, 0xac, 0xc0, 0xfa, 0xdc, 0xd6,
+	0x2b, 0xc1, 0xbb, 0xec, 0xfa, 0x7f, 0xbc, 0x0b, 0x5e, 0x9f, 0x06, 0x55, 0x63, 0x05, 0x8d, 0x4e,
+	0xb0, 0xd5, 0x52, 0xab, 0x86, 0x5f, 0x40, 0xfa, 0x4f, 0x60, 0x8d, 0x3b, 0xf9, 0xae, 0x8f, 0xfe,
+	0x98, 0xff, 0x61, 0xfb, 0xe1, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xde, 0x9b, 0x5b, 0x1e, 0x68, 0x02,
+	0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/io.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/io.pb.go
new file mode 100644
index 00000000..56f068f4
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/io.pb.go
@@ -0,0 +1,371 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/io.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Input configuration.
+type InputConfig struct {
+	// Required. The source of the input.
+	//
+	// Types that are valid to be assigned to Source:
+	//	*InputConfig_GcsSource
+	Source               isInputConfig_Source `protobuf_oneof:"source"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *InputConfig) Reset()         { *m = InputConfig{} }
+func (m *InputConfig) String() string { return proto.CompactTextString(m) }
+func (*InputConfig) ProtoMessage()    {}
+func (*InputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_io_30049c92fb799bce, []int{0}
+}
+func (m *InputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
+}
+func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
+}
+func (dst *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(dst, src)
+}
+func (m *InputConfig) XXX_Size() int {
+	return xxx_messageInfo_InputConfig.Size(m)
+}
+func (m *InputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InputConfig proto.InternalMessageInfo
+
+type isInputConfig_Source interface {
+	isInputConfig_Source()
+}
+
+type InputConfig_GcsSource struct {
+	GcsSource *GcsSource `protobuf:"bytes,1,opt,name=gcs_source,json=gcsSource,proto3,oneof"`
+}
+
+func (*InputConfig_GcsSource) isInputConfig_Source() {}
+
+func (m *InputConfig) GetSource() isInputConfig_Source {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+func (m *InputConfig) GetGcsSource() *GcsSource {
+	if x, ok := m.GetSource().(*InputConfig_GcsSource); ok {
+		return x.GcsSource
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*InputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _InputConfig_OneofMarshaler, _InputConfig_OneofUnmarshaler, _InputConfig_OneofSizer, []interface{}{
+		(*InputConfig_GcsSource)(nil),
+	}
+}
+
+func _InputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*InputConfig)
+	// source
+	switch x := m.Source.(type) {
+	case *InputConfig_GcsSource:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.GcsSource); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("InputConfig.Source has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _InputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*InputConfig)
+	switch tag {
+	case 1: // source.gcs_source
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(GcsSource)
+		err := b.DecodeMessage(msg)
+		m.Source = &InputConfig_GcsSource{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _InputConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*InputConfig)
+	// source
+	switch x := m.Source.(type) {
+	case *InputConfig_GcsSource:
+		s := proto.Size(x.GcsSource)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Output configuration.
+type OutputConfig struct {
+	// Required. The destination of the output.
+	//
+	// Types that are valid to be assigned to Destination:
+	//	*OutputConfig_GcsDestination
+	Destination          isOutputConfig_Destination `protobuf_oneof:"destination"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
+func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
+func (*OutputConfig) ProtoMessage()    {}
+func (*OutputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_io_30049c92fb799bce, []int{1}
+}
+func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
+}
+func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
+}
+func (dst *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(dst, src)
+}
+func (m *OutputConfig) XXX_Size() int {
+	return xxx_messageInfo_OutputConfig.Size(m)
+}
+func (m *OutputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutputConfig proto.InternalMessageInfo
+
+type isOutputConfig_Destination interface {
+	isOutputConfig_Destination()
+}
+
+type OutputConfig_GcsDestination struct {
+	GcsDestination *GcsDestination `protobuf:"bytes,1,opt,name=gcs_destination,json=gcsDestination,proto3,oneof"`
+}
+
+func (*OutputConfig_GcsDestination) isOutputConfig_Destination() {}
+
+func (m *OutputConfig) GetDestination() isOutputConfig_Destination {
+	if m != nil {
+		return m.Destination
+	}
+	return nil
+}
+
+func (m *OutputConfig) GetGcsDestination() *GcsDestination {
+	if x, ok := m.GetDestination().(*OutputConfig_GcsDestination); ok {
+		return x.GcsDestination
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*OutputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _OutputConfig_OneofMarshaler, _OutputConfig_OneofUnmarshaler, _OutputConfig_OneofSizer, []interface{}{
+		(*OutputConfig_GcsDestination)(nil),
+	}
+}
+
+func _OutputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*OutputConfig)
+	// destination
+	switch x := m.Destination.(type) {
+	case *OutputConfig_GcsDestination:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.GcsDestination); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("OutputConfig.Destination has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _OutputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*OutputConfig)
+	switch tag {
+	case 1: // destination.gcs_destination
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(GcsDestination)
+		err := b.DecodeMessage(msg)
+		m.Destination = &OutputConfig_GcsDestination{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _OutputConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*OutputConfig)
+	// destination
+	switch x := m.Destination.(type) {
+	case *OutputConfig_GcsDestination:
+		s := proto.Size(x.GcsDestination)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The GCS location for the input content.
+type GcsSource struct {
+	// Required. Google Cloud Storage URIs to input files, up to 2000 characters
+	// long. Accepted forms:
+	// * Full object path: gs://bucket/directory/object.csv
+	InputUris            []string `protobuf:"bytes,1,rep,name=input_uris,json=inputUris,proto3" json:"input_uris,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GcsSource) Reset()         { *m = GcsSource{} }
+func (m *GcsSource) String() string { return proto.CompactTextString(m) }
+func (*GcsSource) ProtoMessage()    {}
+func (*GcsSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_io_30049c92fb799bce, []int{2}
+}
+func (m *GcsSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
+}
+func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
+}
+func (dst *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(dst, src)
+}
+func (m *GcsSource) XXX_Size() int {
+	return xxx_messageInfo_GcsSource.Size(m)
+}
+func (m *GcsSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsSource proto.InternalMessageInfo
+
+func (m *GcsSource) GetInputUris() []string {
+	if m != nil {
+		return m.InputUris
+	}
+	return nil
+}
+
+// The GCS location where the output must be written to
+type GcsDestination struct {
+	// Required. Google Cloud Storage URI to output directory, up to 2000
+	// characters long.
+	// Accepted forms:
+	// * Prefix path: gs://bucket/directory
+	// The requesting user must have write permission to the bucket.
+	// The directory is created if it doesn't exist.
+	OutputUriPrefix      string   `protobuf:"bytes,1,opt,name=output_uri_prefix,json=outputUriPrefix,proto3" json:"output_uri_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
+func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
+func (*GcsDestination) ProtoMessage()    {}
+func (*GcsDestination) Descriptor() ([]byte, []int) {
+	return fileDescriptor_io_30049c92fb799bce, []int{3}
+}
+func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
+}
+func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
+}
+func (dst *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(dst, src)
+}
+func (m *GcsDestination) XXX_Size() int {
+	return xxx_messageInfo_GcsDestination.Size(m)
+}
+func (m *GcsDestination) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsDestination.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsDestination proto.InternalMessageInfo
+
+func (m *GcsDestination) GetOutputUriPrefix() string {
+	if m != nil {
+		return m.OutputUriPrefix
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*InputConfig)(nil), "google.cloud.automl.v1beta1.InputConfig")
+	proto.RegisterType((*OutputConfig)(nil), "google.cloud.automl.v1beta1.OutputConfig")
+	proto.RegisterType((*GcsSource)(nil), "google.cloud.automl.v1beta1.GcsSource")
+	proto.RegisterType((*GcsDestination)(nil), "google.cloud.automl.v1beta1.GcsDestination")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/io.proto", fileDescriptor_io_30049c92fb799bce)
+}
+
+var fileDescriptor_io_30049c92fb799bce = []byte{
+	// 300 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x4b, 0x4b, 0x03, 0x31,
+	0x10, 0xc7, 0xbb, 0x08, 0xc5, 0x9d, 0x6a, 0x8b, 0x7b, 0x2a, 0x3e, 0xb0, 0x2c, 0x22, 0xa5, 0x42,
+	0x42, 0xf5, 0xa8, 0x17, 0xab, 0xd0, 0x7a, 0xb2, 0xac, 0xd4, 0x83, 0x97, 0x9a, 0x6e, 0xd3, 0x10,
+	0xd8, 0x66, 0x96, 0x3c, 0xc4, 0x8f, 0x2f, 0x9b, 0xac, 0xd6, 0x82, 0xd4, 0x63, 0x66, 0x7e, 0xff,
+	0x47, 0x18, 0xb8, 0x10, 0x88, 0xa2, 0xe0, 0x34, 0x2f, 0xd0, 0x2d, 0x29, 0x73, 0x16, 0xd7, 0x05,
+	0xfd, 0x18, 0x2e, 0xb8, 0x65, 0x43, 0x2a, 0x91, 0x94, 0x1a, 0x2d, 0x26, 0x27, 0x81, 0x22, 0x9e,
+	0x22, 0x81, 0x22, 0x35, 0x75, 0x7c, 0x5a, 0x5b, 0xb0, 0x52, 0x52, 0xa6, 0x14, 0x5a, 0x66, 0x25,
+	0x2a, 0x13, 0xa4, 0xe9, 0x3b, 0xb4, 0x9e, 0x54, 0xe9, 0xec, 0x03, 0xaa, 0x95, 0x14, 0xc9, 0x18,
+	0x40, 0xe4, 0x66, 0x6e, 0xd0, 0xe9, 0x9c, 0x77, 0xa3, 0x5e, 0xd4, 0x6f, 0x5d, 0x5f, 0x92, 0x1d,
+	0xf6, 0x64, 0x9c, 0x9b, 0x17, 0x4f, 0x4f, 0x1a, 0x59, 0x2c, 0xbe, 0x1f, 0xa3, 0x7d, 0x68, 0x06,
+	0x93, 0xd4, 0xc1, 0xc1, 0xb3, 0xb3, 0x9b, 0x88, 0x57, 0xe8, 0x54, 0x11, 0x4b, 0x6e, 0xac, 0x54,
+	0xbe, 0x4b, 0x9d, 0x73, 0xf5, 0x5f, 0xce, 0xe3, 0x46, 0x32, 0x69, 0x64, 0x6d, 0xb1, 0x35, 0x19,
+	0x1d, 0x42, 0xeb, 0x97, 0x67, 0x3a, 0x80, 0xf8, 0xa7, 0x5a, 0x72, 0x06, 0x20, 0xab, 0x5f, 0xce,
+	0x9d, 0x96, 0xa6, 0x1b, 0xf5, 0xf6, 0xfa, 0x71, 0x16, 0xfb, 0xc9, 0x4c, 0x4b, 0x93, 0xde, 0x41,
+	0x7b, 0xdb, 0x3e, 0x19, 0xc0, 0x11, 0xfa, 0xd2, 0x95, 0x62, 0x5e, 0x6a, 0xbe, 0x92, 0x9f, 0xbe,
+	0x66, 0x9c, 0x75, 0xc2, 0x62, 0xa6, 0xe5, 0xd4, 0x8f, 0x47, 0x2b, 0x38, 0xcf, 0x71, 0xbd, 0xab,
+	0xfc, 0x34, 0x7a, 0xbb, 0xaf, 0xd7, 0x02, 0x0b, 0xa6, 0x04, 0x41, 0x2d, 0xa8, 0xe0, 0xca, 0xdf,
+	0x80, 0x86, 0x15, 0x2b, 0xa5, 0xf9, 0xf3, 0xce, 0xb7, 0xe1, 0xb9, 0x68, 0x7a, 0xfa, 0xe6, 0x2b,
+	0x00, 0x00, 0xff, 0xff, 0xe3, 0x87, 0x4d, 0x64, 0x14, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/model.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/model.pb.go
new file mode 100644
index 00000000..ce5389e9
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/model.pb.go
@@ -0,0 +1,343 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/model.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Deployment state of the model.
+type Model_DeploymentState int32
+
+const (
+	// Should not be used, an un-set enum has this value by default.
+	Model_DEPLOYMENT_STATE_UNSPECIFIED Model_DeploymentState = 0
+	// Model is deployed.
+	Model_DEPLOYED Model_DeploymentState = 1
+	// Model is not deployed.
+	Model_UNDEPLOYED Model_DeploymentState = 2
+)
+
+var Model_DeploymentState_name = map[int32]string{
+	0: "DEPLOYMENT_STATE_UNSPECIFIED",
+	1: "DEPLOYED",
+	2: "UNDEPLOYED",
+}
+var Model_DeploymentState_value = map[string]int32{
+	"DEPLOYMENT_STATE_UNSPECIFIED": 0,
+	"DEPLOYED":                     1,
+	"UNDEPLOYED":                   2,
+}
+
+func (x Model_DeploymentState) String() string {
+	return proto.EnumName(Model_DeploymentState_name, int32(x))
+}
+func (Model_DeploymentState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_model_2836c0ea5c1ddbd5, []int{0, 0}
+}
+
+// API proto representing a trained machine learning model.
+type Model struct {
+	// Required.
+	// The model metadata that is specific to the problem type.
+	// Must match the metadata type of the dataset used to train the model.
+	//
+	// Types that are valid to be assigned to ModelMetadata:
+	//	*Model_ImageClassificationModelMetadata
+	//	*Model_TextClassificationModelMetadata
+	//	*Model_TranslationModelMetadata
+	ModelMetadata isModel_ModelMetadata `protobuf_oneof:"model_metadata"`
+	// Output only.
+	// Resource name of the model.
+	// Format: `projects/{project_id}/locations/{location_id}/models/{model_id}`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The name of the model to show in the interface. The name can be
+	// up to 32 characters
+	// long and can consist only of ASCII Latin letters A-Z and a-z, underscores
+	// (_), and ASCII digits 0-9.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Required.
+	// The resource ID of the dataset used to create the model. The dataset must
+	// come from the
+	// same ancestor project and location.
+	DatasetId string `protobuf:"bytes,3,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
+	// Output only.
+	// Timestamp when this model was created.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Output only.
+	// Timestamp when this model was last updated.
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	// Output only. Deployment state of the model.
+	DeploymentState      Model_DeploymentState `protobuf:"varint,8,opt,name=deployment_state,json=deploymentState,proto3,enum=google.cloud.automl.v1beta1.Model_DeploymentState" json:"deployment_state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *Model) Reset()         { *m = Model{} }
+func (m *Model) String() string { return proto.CompactTextString(m) }
+func (*Model) ProtoMessage()    {}
+func (*Model) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_2836c0ea5c1ddbd5, []int{0}
+}
+func (m *Model) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Model.Unmarshal(m, b)
+}
+func (m *Model) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Model.Marshal(b, m, deterministic)
+}
+func (dst *Model) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model.Merge(dst, src)
+}
+func (m *Model) XXX_Size() int {
+	return xxx_messageInfo_Model.Size(m)
+}
+func (m *Model) XXX_DiscardUnknown() {
+	xxx_messageInfo_Model.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Model proto.InternalMessageInfo
+
+type isModel_ModelMetadata interface {
+	isModel_ModelMetadata()
+}
+
+type Model_ImageClassificationModelMetadata struct {
+	ImageClassificationModelMetadata *ImageClassificationModelMetadata `protobuf:"bytes,13,opt,name=image_classification_model_metadata,json=imageClassificationModelMetadata,proto3,oneof"`
+}
+
+type Model_TextClassificationModelMetadata struct {
+	TextClassificationModelMetadata *TextClassificationModelMetadata `protobuf:"bytes,14,opt,name=text_classification_model_metadata,json=textClassificationModelMetadata,proto3,oneof"`
+}
+
+type Model_TranslationModelMetadata struct {
+	TranslationModelMetadata *TranslationModelMetadata `protobuf:"bytes,15,opt,name=translation_model_metadata,json=translationModelMetadata,proto3,oneof"`
+}
+
+func (*Model_ImageClassificationModelMetadata) isModel_ModelMetadata() {}
+
+func (*Model_TextClassificationModelMetadata) isModel_ModelMetadata() {}
+
+func (*Model_TranslationModelMetadata) isModel_ModelMetadata() {}
+
+func (m *Model) GetModelMetadata() isModel_ModelMetadata {
+	if m != nil {
+		return m.ModelMetadata
+	}
+	return nil
+}
+
+func (m *Model) GetImageClassificationModelMetadata() *ImageClassificationModelMetadata {
+	if x, ok := m.GetModelMetadata().(*Model_ImageClassificationModelMetadata); ok {
+		return x.ImageClassificationModelMetadata
+	}
+	return nil
+}
+
+func (m *Model) GetTextClassificationModelMetadata() *TextClassificationModelMetadata {
+	if x, ok := m.GetModelMetadata().(*Model_TextClassificationModelMetadata); ok {
+		return x.TextClassificationModelMetadata
+	}
+	return nil
+}
+
+func (m *Model) GetTranslationModelMetadata() *TranslationModelMetadata {
+	if x, ok := m.GetModelMetadata().(*Model_TranslationModelMetadata); ok {
+		return x.TranslationModelMetadata
+	}
+	return nil
+}
+
+func (m *Model) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Model) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *Model) GetDatasetId() string {
+	if m != nil {
+		return m.DatasetId
+	}
+	return ""
+}
+
+func (m *Model) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *Model) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
+func (m *Model) GetDeploymentState() Model_DeploymentState {
+	if m != nil {
+		return m.DeploymentState
+	}
+	return Model_DEPLOYMENT_STATE_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Model) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Model_OneofMarshaler, _Model_OneofUnmarshaler, _Model_OneofSizer, []interface{}{
+		(*Model_ImageClassificationModelMetadata)(nil),
+		(*Model_TextClassificationModelMetadata)(nil),
+		(*Model_TranslationModelMetadata)(nil),
+	}
+}
+
+func _Model_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Model)
+	// model_metadata
+	switch x := m.ModelMetadata.(type) {
+	case *Model_ImageClassificationModelMetadata:
+		b.EncodeVarint(13<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ImageClassificationModelMetadata); err != nil {
+			return err
+		}
+	case *Model_TextClassificationModelMetadata:
+		b.EncodeVarint(14<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TextClassificationModelMetadata); err != nil {
+			return err
+		}
+	case *Model_TranslationModelMetadata:
+		b.EncodeVarint(15<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TranslationModelMetadata); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Model.ModelMetadata has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Model_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Model)
+	switch tag {
+	case 13: // model_metadata.image_classification_model_metadata
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ImageClassificationModelMetadata)
+		err := b.DecodeMessage(msg)
+		m.ModelMetadata = &Model_ImageClassificationModelMetadata{msg}
+		return true, err
+	case 14: // model_metadata.text_classification_model_metadata
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TextClassificationModelMetadata)
+		err := b.DecodeMessage(msg)
+		m.ModelMetadata = &Model_TextClassificationModelMetadata{msg}
+		return true, err
+	case 15: // model_metadata.translation_model_metadata
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TranslationModelMetadata)
+		err := b.DecodeMessage(msg)
+		m.ModelMetadata = &Model_TranslationModelMetadata{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Model_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Model)
+	// model_metadata
+	switch x := m.ModelMetadata.(type) {
+	case *Model_ImageClassificationModelMetadata:
+		s := proto.Size(x.ImageClassificationModelMetadata)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Model_TextClassificationModelMetadata:
+		s := proto.Size(x.TextClassificationModelMetadata)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Model_TranslationModelMetadata:
+		s := proto.Size(x.TranslationModelMetadata)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+func init() {
+	proto.RegisterType((*Model)(nil), "google.cloud.automl.v1beta1.Model")
+	proto.RegisterEnum("google.cloud.automl.v1beta1.Model_DeploymentState", Model_DeploymentState_name, Model_DeploymentState_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/model.proto", fileDescriptor_model_2836c0ea5c1ddbd5)
+}
+
+var fileDescriptor_model_2836c0ea5c1ddbd5 = []byte{
+	// 501 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xd1, 0x6e, 0xd3, 0x30,
+	0x14, 0x86, 0x97, 0x01, 0x63, 0x3b, 0x1d, 0x6d, 0xe5, 0xab, 0xa8, 0x0c, 0x35, 0x14, 0x09, 0x7a,
+	0x43, 0xa2, 0x15, 0x71, 0x35, 0xb8, 0xd8, 0xd6, 0x20, 0x2a, 0xd1, 0x52, 0xda, 0xec, 0x02, 0x24,
+	0x14, 0xb9, 0x89, 0x1b, 0x59, 0x4a, 0xe2, 0xa8, 0x39, 0x41, 0xdb, 0x33, 0x20, 0xf1, 0x2e, 0xbc,
+	0x21, 0x8a, 0xed, 0x16, 0x5a, 0x31, 0xf7, 0xae, 0x3e, 0xe7, 0xfb, 0x8f, 0x7f, 0xff, 0x3d, 0x81,
+	0x57, 0x89, 0x10, 0x49, 0xca, 0xbc, 0x28, 0x15, 0x55, 0xec, 0xd1, 0x0a, 0x45, 0x96, 0x7a, 0x3f,
+	0xce, 0x17, 0x0c, 0xe9, 0xb9, 0x97, 0x89, 0x98, 0xa5, 0x6e, 0xb1, 0x12, 0x28, 0xc8, 0x53, 0x05,
+	0xba, 0x12, 0x74, 0x15, 0xe8, 0x6a, 0xb0, 0x73, 0xa6, 0xa7, 0xd0, 0x82, 0x7b, 0x34, 0xcf, 0x05,
+	0x52, 0xe4, 0x22, 0x2f, 0x95, 0xb4, 0x63, 0xbc, 0x83, 0x67, 0x34, 0x61, 0x1a, 0x7c, 0x69, 0x02,
+	0x91, 0xdd, 0xa2, 0xe6, 0x5e, 0x1b, 0xb9, 0x15, 0xcd, 0xcb, 0x54, 0x1a, 0xd0, 0x78, 0x57, 0xe3,
+	0xf2, 0xb4, 0xa8, 0x96, 0x1e, 0xf2, 0x8c, 0x95, 0x48, 0xb3, 0x42, 0x01, 0xbd, 0xdf, 0x47, 0xf0,
+	0x68, 0x5c, 0xbf, 0x95, 0xfc, 0xb2, 0xe0, 0x85, 0x74, 0x14, 0x46, 0x29, 0x2d, 0x4b, 0xbe, 0xe4,
+	0x91, 0x9c, 0x14, 0xca, 0x28, 0xc2, 0x8c, 0x21, 0x8d, 0x29, 0x52, 0xfb, 0x89, 0x63, 0xf5, 0x1b,
+	0x83, 0xf7, 0xae, 0x21, 0x14, 0x77, 0x54, 0xcf, 0xb9, 0xde, 0x1a, 0x23, 0x2f, 0x19, 0xeb, 0x21,
+	0x1f, 0x0f, 0x66, 0x0e, 0xdf, 0xc3, 0x90, 0x9f, 0x16, 0xf4, 0xea, 0x97, 0xef, 0xf1, 0xd3, 0x94,
+	0x7e, 0xde, 0x19, 0xfd, 0x04, 0xec, 0x16, 0xcd, 0x76, 0xba, 0x68, 0x46, 0x48, 0x05, 0x9d, 0x7f,
+	0xe2, 0xdd, 0x35, 0xd1, 0x92, 0x26, 0xde, 0x9a, 0x4d, 0xfc, 0x95, 0xef, 0xde, 0x6e, 0xe3, 0x3d,
+	0x3d, 0x42, 0xe0, 0x61, 0x4e, 0x33, 0x66, 0x5b, 0x8e, 0xd5, 0x3f, 0x99, 0xc9, 0xdf, 0xe4, 0x39,
+	0x9c, 0xc6, 0xbc, 0x2c, 0x52, 0x7a, 0x17, 0xca, 0xde, 0xa1, 0xec, 0x35, 0x74, 0x6d, 0x52, 0x23,
+	0xcf, 0x00, 0x6a, 0x79, 0xc9, 0x30, 0xe4, 0xb1, 0xfd, 0x40, 0x02, 0x27, 0xba, 0x32, 0x8a, 0xc9,
+	0x05, 0x34, 0xa2, 0x15, 0xa3, 0xc8, 0xc2, 0x7a, 0x1f, 0xec, 0xc7, 0xd2, 0x7d, 0x67, 0xed, 0x7e,
+	0xbd, 0x2c, 0x6e, 0xb0, 0x5e, 0x96, 0x19, 0x28, 0xbc, 0x2e, 0xd4, 0xe2, 0xaa, 0x88, 0x37, 0xe2,
+	0xc6, 0x7e, 0xb1, 0xc2, 0xa5, 0xf8, 0x3b, 0xb4, 0x63, 0x56, 0xa4, 0xe2, 0x2e, 0x63, 0x39, 0x86,
+	0x25, 0x52, 0x64, 0xf6, 0xb1, 0x63, 0xf5, 0x9b, 0x83, 0x81, 0x31, 0x3c, 0x99, 0x8a, 0x3b, 0xdc,
+	0x48, 0xe7, 0xb5, 0x72, 0xd6, 0x8a, 0xb7, 0x0b, 0xbd, 0x2f, 0xd0, 0xda, 0x61, 0x88, 0x03, 0x67,
+	0x43, 0x7f, 0xfa, 0xe9, 0xf3, 0xd7, 0xb1, 0x3f, 0x09, 0xc2, 0x79, 0x70, 0x19, 0xf8, 0xe1, 0xcd,
+	0x64, 0x3e, 0xf5, 0xaf, 0x47, 0x1f, 0x46, 0xfe, 0xb0, 0x7d, 0x40, 0x4e, 0xe1, 0x58, 0x11, 0xfe,
+	0xb0, 0x6d, 0x91, 0x26, 0xc0, 0xcd, 0x64, 0x73, 0x3e, 0xbc, 0x6a, 0x43, 0x73, 0xfb, 0xcf, 0xbe,
+	0x5a, 0x42, 0x37, 0x12, 0x99, 0xc9, 0xee, 0xd4, 0xfa, 0x76, 0xa9, 0xdb, 0x89, 0x48, 0x69, 0x9e,
+	0xb8, 0x62, 0x95, 0x78, 0x09, 0xcb, 0x65, 0x3a, 0x9e, 0x6a, 0xd1, 0x82, 0x97, 0xff, 0xfd, 0x8e,
+	0x2f, 0xd4, 0x71, 0x71, 0x24, 0xe9, 0x37, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x10, 0xe2,
+	0xaa, 0xa9, 0x04, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go
new file mode 100644
index 00000000..503277d0
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/model_evaluation.pb.go
@@ -0,0 +1,252 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/model_evaluation.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Evaluation results of a model.
+type ModelEvaluation struct {
+	// Output only. Problem type specific evaluation metrics.
+	//
+	// Types that are valid to be assigned to Metrics:
+	//	*ModelEvaluation_ClassificationEvaluationMetrics
+	//	*ModelEvaluation_TranslationEvaluationMetrics
+	Metrics isModelEvaluation_Metrics `protobuf_oneof:"metrics"`
+	// Output only.
+	// Resource name of the model evaluation.
+	// Format:
+	//
+	// `projects/{project_id}/locations/{location_id}/models/{model_id}/modelEvaluations/{model_evaluation_id}`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Output only.
+	// The ID of the annotation spec that the model evaluation applies to. The
+	// ID is empty for overall model evaluation.
+	// NOTE: Currently there is no way to obtain the display_name of the
+	// annotation spec from its ID. To see the display_names, review the model
+	// evaluations in the UI.
+	AnnotationSpecId string `protobuf:"bytes,2,opt,name=annotation_spec_id,json=annotationSpecId,proto3" json:"annotation_spec_id,omitempty"`
+	// Output only.
+	// Timestamp when this model evaluation was created.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Output only. The number of examples used for model evaluation.
+	EvaluatedExampleCount int32    `protobuf:"varint,6,opt,name=evaluated_example_count,json=evaluatedExampleCount,proto3" json:"evaluated_example_count,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *ModelEvaluation) Reset()         { *m = ModelEvaluation{} }
+func (m *ModelEvaluation) String() string { return proto.CompactTextString(m) }
+func (*ModelEvaluation) ProtoMessage()    {}
+func (*ModelEvaluation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_evaluation_77eb85cbfb723c98, []int{0}
+}
+func (m *ModelEvaluation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ModelEvaluation.Unmarshal(m, b)
+}
+func (m *ModelEvaluation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ModelEvaluation.Marshal(b, m, deterministic)
+}
+func (dst *ModelEvaluation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModelEvaluation.Merge(dst, src)
+}
+func (m *ModelEvaluation) XXX_Size() int {
+	return xxx_messageInfo_ModelEvaluation.Size(m)
+}
+func (m *ModelEvaluation) XXX_DiscardUnknown() {
+	xxx_messageInfo_ModelEvaluation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ModelEvaluation proto.InternalMessageInfo
+
+type isModelEvaluation_Metrics interface {
+	isModelEvaluation_Metrics()
+}
+
+type ModelEvaluation_ClassificationEvaluationMetrics struct {
+	ClassificationEvaluationMetrics *ClassificationEvaluationMetrics `protobuf:"bytes,8,opt,name=classification_evaluation_metrics,json=classificationEvaluationMetrics,proto3,oneof"`
+}
+
+type ModelEvaluation_TranslationEvaluationMetrics struct {
+	TranslationEvaluationMetrics *TranslationEvaluationMetrics `protobuf:"bytes,9,opt,name=translation_evaluation_metrics,json=translationEvaluationMetrics,proto3,oneof"`
+}
+
+func (*ModelEvaluation_ClassificationEvaluationMetrics) isModelEvaluation_Metrics() {}
+
+func (*ModelEvaluation_TranslationEvaluationMetrics) isModelEvaluation_Metrics() {}
+
+func (m *ModelEvaluation) GetMetrics() isModelEvaluation_Metrics {
+	if m != nil {
+		return m.Metrics
+	}
+	return nil
+}
+
+func (m *ModelEvaluation) GetClassificationEvaluationMetrics() *ClassificationEvaluationMetrics {
+	if x, ok := m.GetMetrics().(*ModelEvaluation_ClassificationEvaluationMetrics); ok {
+		return x.ClassificationEvaluationMetrics
+	}
+	return nil
+}
+
+func (m *ModelEvaluation) GetTranslationEvaluationMetrics() *TranslationEvaluationMetrics {
+	if x, ok := m.GetMetrics().(*ModelEvaluation_TranslationEvaluationMetrics); ok {
+		return x.TranslationEvaluationMetrics
+	}
+	return nil
+}
+
+func (m *ModelEvaluation) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ModelEvaluation) GetAnnotationSpecId() string {
+	if m != nil {
+		return m.AnnotationSpecId
+	}
+	return ""
+}
+
+func (m *ModelEvaluation) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *ModelEvaluation) GetEvaluatedExampleCount() int32 {
+	if m != nil {
+		return m.EvaluatedExampleCount
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ModelEvaluation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ModelEvaluation_OneofMarshaler, _ModelEvaluation_OneofUnmarshaler, _ModelEvaluation_OneofSizer, []interface{}{
+		(*ModelEvaluation_ClassificationEvaluationMetrics)(nil),
+		(*ModelEvaluation_TranslationEvaluationMetrics)(nil),
+	}
+}
+
+func _ModelEvaluation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ModelEvaluation)
+	// metrics
+	switch x := m.Metrics.(type) {
+	case *ModelEvaluation_ClassificationEvaluationMetrics:
+		b.EncodeVarint(8<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ClassificationEvaluationMetrics); err != nil {
+			return err
+		}
+	case *ModelEvaluation_TranslationEvaluationMetrics:
+		b.EncodeVarint(9<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TranslationEvaluationMetrics); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("ModelEvaluation.Metrics has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ModelEvaluation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ModelEvaluation)
+	switch tag {
+	case 8: // metrics.classification_evaluation_metrics
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ClassificationEvaluationMetrics)
+		err := b.DecodeMessage(msg)
+		m.Metrics = &ModelEvaluation_ClassificationEvaluationMetrics{msg}
+		return true, err
+	case 9: // metrics.translation_evaluation_metrics
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TranslationEvaluationMetrics)
+		err := b.DecodeMessage(msg)
+		m.Metrics = &ModelEvaluation_TranslationEvaluationMetrics{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ModelEvaluation_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ModelEvaluation)
+	// metrics
+	switch x := m.Metrics.(type) {
+	case *ModelEvaluation_ClassificationEvaluationMetrics:
+		s := proto.Size(x.ClassificationEvaluationMetrics)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ModelEvaluation_TranslationEvaluationMetrics:
+		s := proto.Size(x.TranslationEvaluationMetrics)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+func init() {
+	proto.RegisterType((*ModelEvaluation)(nil), "google.cloud.automl.v1beta1.ModelEvaluation")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/model_evaluation.proto", fileDescriptor_model_evaluation_77eb85cbfb723c98)
+}
+
+var fileDescriptor_model_evaluation_77eb85cbfb723c98 = []byte{
+	// 388 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x4f, 0x6b, 0xdb, 0x30,
+	0x1c, 0x9d, 0xb7, 0x25, 0x5b, 0x94, 0xc3, 0x86, 0x60, 0xcc, 0x78, 0x61, 0xc9, 0x76, 0xca, 0x61,
+	0x93, 0x96, 0x0c, 0x06, 0x23, 0xbd, 0x34, 0x21, 0xd0, 0x1e, 0x02, 0xc5, 0xcd, 0xa9, 0x17, 0xa3,
+	0xc8, 0x8a, 0x11, 0xe8, 0x8f, 0xb1, 0xe4, 0xd0, 0x6b, 0xaf, 0xfd, 0x9c, 0xfd, 0x20, 0xc5, 0x92,
+	0x13, 0x3b, 0x10, 0x7c, 0xb3, 0xfc, 0xde, 0xfb, 0xfd, 0xde, 0xd3, 0x13, 0x98, 0x67, 0x5a, 0x67,
+	0x82, 0x61, 0x2a, 0x74, 0x99, 0x62, 0x52, 0x5a, 0x2d, 0x05, 0x3e, 0xcc, 0x76, 0xcc, 0x92, 0x19,
+	0x96, 0x3a, 0x65, 0x22, 0x61, 0x07, 0x22, 0x4a, 0x62, 0xb9, 0x56, 0x28, 0x2f, 0xb4, 0xd5, 0xf0,
+	0x9b, 0xd7, 0x20, 0xa7, 0x41, 0x5e, 0x83, 0x6a, 0x4d, 0x34, 0xaa, 0x07, 0x92, 0x9c, 0x63, 0xa2,
+	0x94, 0xb6, 0x4e, 0x69, 0xbc, 0x34, 0xfa, 0xd3, 0xb5, 0x8e, 0x0a, 0x62, 0x0c, 0xdf, 0x73, 0xda,
+	0x5a, 0x16, 0xfd, 0xee, 0x52, 0xd8, 0x82, 0x28, 0x23, 0xda, 0xf4, 0x71, 0x4d, 0x77, 0xa7, 0x5d,
+	0xb9, 0xc7, 0x96, 0x4b, 0x66, 0x2c, 0x91, 0xb9, 0x27, 0xfc, 0x7c, 0x79, 0x07, 0x3e, 0x6d, 0xaa,
+	0x5c, 0xeb, 0x53, 0x2c, 0xf8, 0x1c, 0x80, 0x1f, 0xe7, 0xcb, 0x5b, 0xa1, 0x13, 0xc9, 0x6c, 0xc1,
+	0xa9, 0x09, 0x3f, 0x4e, 0x82, 0xe9, 0x70, 0x7e, 0x85, 0x3a, 0xd2, 0xa3, 0xd5, 0xd9, 0x94, 0x66,
+	0xc5, 0xc6, 0xcf, 0xb8, 0x79, 0x13, 0x8f, 0x69, 0x37, 0x05, 0x3e, 0x05, 0xe0, 0x7b, 0x2b, 0xd7,
+	0x25, 0x27, 0x03, 0xe7, 0xe4, 0x7f, 0xa7, 0x93, 0x6d, 0x33, 0xe2, 0x92, 0x8d, 0x91, 0xed, 0xc0,
+	0x21, 0x04, 0xef, 0x15, 0x91, 0x2c, 0x0c, 0x26, 0xc1, 0x74, 0x10, 0xbb, 0x6f, 0xf8, 0x0b, 0xc0,
+	0xa6, 0xcf, 0xc4, 0xe4, 0x8c, 0x26, 0x3c, 0x0d, 0xdf, 0x3a, 0xc6, 0xe7, 0x06, 0xb9, 0xcf, 0x19,
+	0xbd, 0x4d, 0xe1, 0x02, 0x0c, 0x69, 0xc1, 0x88, 0x65, 0x49, 0x55, 0x40, 0xd8, 0x73, 0x8e, 0xa3,
+	0xa3, 0xe3, 0x63, 0x3b, 0x68, 0x7b, 0x6c, 0x27, 0x06, 0x9e, 0x5e, 0xfd, 0x80, 0xff, 0xc0, 0xd7,
+	0x3a, 0x35, 0x4b, 0x13, 0xf6, 0x48, 0x64, 0x2e, 0x58, 0x42, 0x75, 0xa9, 0x6c, 0xd8, 0x9f, 0x04,
+	0xd3, 0x5e, 0xfc, 0xe5, 0x04, 0xaf, 0x3d, 0xba, 0xaa, 0xc0, 0xe5, 0x00, 0x7c, 0xa8, 0xaf, 0x68,
+	0xb9, 0x07, 0x63, 0xaa, 0x65, 0xd7, 0x0d, 0xdd, 0x05, 0x0f, 0xd7, 0x35, 0x9c, 0x69, 0x41, 0x54,
+	0x86, 0x74, 0x91, 0xe1, 0x8c, 0x29, 0x67, 0x0e, 0x7b, 0x88, 0xe4, 0xdc, 0x5c, 0x7c, 0x7a, 0x0b,
+	0x7f, 0xdc, 0xf5, 0x1d, 0xfb, 0xef, 0x6b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x78, 0x76, 0xc2,
+	0x48, 0x03, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/operations.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/operations.pb.go
new file mode 100644
index 00000000..69a8f895
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/operations.pb.go
@@ -0,0 +1,246 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/operations.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Metadata used across all long running operations returned by AutoML API.
+type OperationMetadata struct {
+	// Ouptut only. Details of specific operation. Even if this field is empty,
+	// the presence allows to distinguish different types of operations.
+	//
+	// Types that are valid to be assigned to Details:
+	//	*OperationMetadata_CreateModelDetails
+	Details isOperationMetadata_Details `protobuf_oneof:"details"`
+	// Output only. Progress of operation. Range: [0, 100].
+	ProgressPercent int32 `protobuf:"varint,13,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
+	// Output only. Partial failures encountered.
+	// E.g. single files that couldn't be read.
+	// This field should never exceed 20 entries.
+	// Status details field will contain standard GCP error details.
+	PartialFailures []*status.Status `protobuf:"bytes,2,rep,name=partial_failures,json=partialFailures,proto3" json:"partial_failures,omitempty"`
+	// Output only. Time when the operation was created.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Output only. Time when the operation was updated for the last time.
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
+func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata) ProtoMessage()    {}
+func (*OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_8f7a4667c678e484, []int{0}
+}
+func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
+}
+func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+}
+func (m *OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata.Size(m)
+}
+func (m *OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationMetadata proto.InternalMessageInfo
+
+type isOperationMetadata_Details interface {
+	isOperationMetadata_Details()
+}
+
+type OperationMetadata_CreateModelDetails struct {
+	CreateModelDetails *CreateModelOperationMetadata `protobuf:"bytes,10,opt,name=create_model_details,json=createModelDetails,proto3,oneof"`
+}
+
+func (*OperationMetadata_CreateModelDetails) isOperationMetadata_Details() {}
+
+func (m *OperationMetadata) GetDetails() isOperationMetadata_Details {
+	if m != nil {
+		return m.Details
+	}
+	return nil
+}
+
+func (m *OperationMetadata) GetCreateModelDetails() *CreateModelOperationMetadata {
+	if x, ok := m.GetDetails().(*OperationMetadata_CreateModelDetails); ok {
+		return x.CreateModelDetails
+	}
+	return nil
+}
+
+func (m *OperationMetadata) GetProgressPercent() int32 {
+	if m != nil {
+		return m.ProgressPercent
+	}
+	return 0
+}
+
+func (m *OperationMetadata) GetPartialFailures() []*status.Status {
+	if m != nil {
+		return m.PartialFailures
+	}
+	return nil
+}
+
+func (m *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*OperationMetadata) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _OperationMetadata_OneofMarshaler, _OperationMetadata_OneofUnmarshaler, _OperationMetadata_OneofSizer, []interface{}{
+		(*OperationMetadata_CreateModelDetails)(nil),
+	}
+}
+
+func _OperationMetadata_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*OperationMetadata)
+	// details
+	switch x := m.Details.(type) {
+	case *OperationMetadata_CreateModelDetails:
+		b.EncodeVarint(10<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CreateModelDetails); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("OperationMetadata.Details has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _OperationMetadata_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*OperationMetadata)
+	switch tag {
+	case 10: // details.create_model_details
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CreateModelOperationMetadata)
+		err := b.DecodeMessage(msg)
+		m.Details = &OperationMetadata_CreateModelDetails{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _OperationMetadata_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*OperationMetadata)
+	// details
+	switch x := m.Details.(type) {
+	case *OperationMetadata_CreateModelDetails:
+		s := proto.Size(x.CreateModelDetails)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Details of CreateModel operation.
+type CreateModelOperationMetadata struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateModelOperationMetadata) Reset()         { *m = CreateModelOperationMetadata{} }
+func (m *CreateModelOperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*CreateModelOperationMetadata) ProtoMessage()    {}
+func (*CreateModelOperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_8f7a4667c678e484, []int{1}
+}
+func (m *CreateModelOperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateModelOperationMetadata.Unmarshal(m, b)
+}
+func (m *CreateModelOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateModelOperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *CreateModelOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateModelOperationMetadata.Merge(dst, src)
+}
+func (m *CreateModelOperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_CreateModelOperationMetadata.Size(m)
+}
+func (m *CreateModelOperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateModelOperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateModelOperationMetadata proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.automl.v1beta1.OperationMetadata")
+	proto.RegisterType((*CreateModelOperationMetadata)(nil), "google.cloud.automl.v1beta1.CreateModelOperationMetadata")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/operations.proto", fileDescriptor_operations_8f7a4667c678e484)
+}
+
+var fileDescriptor_operations_8f7a4667c678e484 = []byte{
+	// 383 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0xab, 0xd3, 0x40,
+	0x14, 0xc5, 0x6d, 0xeb, 0x1f, 0x9c, 0x22, 0xad, 0x41, 0x30, 0xd4, 0x62, 0x4b, 0x37, 0x56, 0x90,
+	0x19, 0x5a, 0x57, 0x52, 0x5c, 0x58, 0x45, 0xdc, 0x14, 0x4b, 0x74, 0xe5, 0x26, 0xdc, 0x26, 0xb7,
+	0x21, 0x30, 0xc9, 0x0c, 0x33, 0x37, 0x05, 0x3f, 0xb6, 0xdf, 0x40, 0x32, 0x33, 0xd1, 0xc7, 0x7b,
+	0x8f, 0x74, 0x39, 0xf7, 0xfc, 0xce, 0xcd, 0xb9, 0x87, 0xb0, 0x77, 0x85, 0x52, 0x85, 0x44, 0x91,
+	0x49, 0xd5, 0xe4, 0x02, 0x1a, 0x52, 0x95, 0x14, 0x97, 0xcd, 0x09, 0x09, 0x36, 0x42, 0x69, 0x34,
+	0x40, 0xa5, 0xaa, 0x2d, 0xd7, 0x46, 0x91, 0x8a, 0x5e, 0x79, 0x9a, 0x3b, 0x9a, 0x7b, 0x9a, 0x07,
+	0x7a, 0x36, 0x0f, 0xab, 0x40, 0x97, 0x02, 0xea, 0x5a, 0xd1, 0x4d, 0xeb, 0xec, 0x4d, 0xdf, 0x87,
+	0x2a, 0x95, 0xa3, 0x0c, 0xe0, 0xf6, 0x2a, 0x98, 0xe2, 0x05, 0x64, 0xe3, 0xb6, 0x07, 0x4f, 0xc8,
+	0x25, 0xdc, 0xeb, 0xd4, 0x9c, 0x05, 0x56, 0x9a, 0x7e, 0x07, 0x71, 0x71, 0x5b, 0xa4, 0xb2, 0x42,
+	0x4b, 0x50, 0xe9, 0x00, 0xbc, 0x0c, 0x80, 0xd1, 0x99, 0xb0, 0x04, 0xd4, 0x84, 0xcc, 0xab, 0x3f,
+	0x43, 0xf6, 0xfc, 0x7b, 0xd7, 0xc1, 0x01, 0x09, 0x72, 0x20, 0x88, 0x2a, 0xf6, 0x22, 0x33, 0x08,
+	0x84, 0xa9, 0x4f, 0x93, 0x23, 0x41, 0x29, 0x6d, 0xcc, 0x96, 0x83, 0xf5, 0x78, 0xfb, 0x81, 0xf7,
+	0x74, 0xc4, 0x3f, 0x3b, 0xe3, 0xa1, 0xf5, 0xdd, 0x59, 0xfc, 0xed, 0x41, 0x12, 0x65, 0xff, 0xf5,
+	0x2f, 0x7e, 0x6d, 0xf4, 0x96, 0x4d, 0xb5, 0x51, 0x85, 0x41, 0x6b, 0x53, 0x8d, 0x26, 0xc3, 0x9a,
+	0xe2, 0x67, 0xcb, 0xc1, 0xfa, 0x51, 0x32, 0xe9, 0xe6, 0x47, 0x3f, 0x8e, 0x3e, 0xb2, 0xa9, 0x06,
+	0x43, 0x25, 0xc8, 0xf4, 0x0c, 0xa5, 0x6c, 0x0c, 0xda, 0x78, 0xb8, 0x1c, 0xad, 0xc7, 0xdb, 0xa8,
+	0x4b, 0x65, 0x74, 0xc6, 0x7f, 0xb8, 0x1b, 0x93, 0x49, 0x60, 0xbf, 0x06, 0x34, 0xda, 0xb1, 0x71,
+	0x38, 0xac, 0x6d, 0x28, 0x1e, 0xb9, 0x7b, 0x66, 0x9d, 0xb3, 0xab, 0x8f, 0xff, 0xec, 0xea, 0x4b,
+	0x98, 0xc7, 0xdb, 0x41, 0x6b, 0x6e, 0x74, 0xfe, 0xcf, 0xfc, 0xf0, 0xba, 0xd9, 0xe3, 0xed, 0x60,
+	0xff, 0x94, 0x3d, 0x09, 0x2d, 0xae, 0x5e, 0xb3, 0x79, 0x5f, 0x49, 0xfb, 0x33, 0x5b, 0x64, 0xaa,
+	0xea, 0x2b, 0xf9, 0x38, 0xf8, 0xf5, 0x29, 0xc8, 0x85, 0x92, 0x50, 0x17, 0x5c, 0x99, 0x42, 0x14,
+	0x58, 0xbb, 0x10, 0xc2, 0x4b, 0xa0, 0x4b, 0x7b, 0xef, 0x2f, 0xb6, 0xf3, 0xcf, 0xd3, 0x63, 0x47,
+	0xbf, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x7b, 0xa7, 0x51, 0x21, 0x03, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/prediction_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/prediction_service.pb.go
new file mode 100644
index 00000000..9a9084e6
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/prediction_service.pb.go
@@ -0,0 +1,264 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/prediction_service.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Request message for [PredictionService.Predict][google.cloud.automl.v1beta1.PredictionService.Predict].
+type PredictRequest struct {
+	// Name of the model requested to serve the prediction.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required.
+	// Payload to perform a prediction on. The payload must match the
+	// problem type that the model was trained to solve.
+	Payload *ExamplePayload `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"`
+	// Additional domain-specific parameters, any string must be up to 25000
+	// characters long.
+	//
+	// *  For Image Classification:
+	//
+	//    `score_threshold` - (float) A value from 0.0 to 1.0. When the model
+	//     makes predictions for an
+	//     image, it will only produce results that have at least this confidence
+	//     score threshold. The default is 0.5.
+	Params               map[string]string `protobuf:"bytes,3,rep,name=params,proto3" json:"params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *PredictRequest) Reset()         { *m = PredictRequest{} }
+func (m *PredictRequest) String() string { return proto.CompactTextString(m) }
+func (*PredictRequest) ProtoMessage()    {}
+func (*PredictRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_prediction_service_1b71b7f556fd7159, []int{0}
+}
+func (m *PredictRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PredictRequest.Unmarshal(m, b)
+}
+func (m *PredictRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PredictRequest.Marshal(b, m, deterministic)
+}
+func (dst *PredictRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictRequest.Merge(dst, src)
+}
+func (m *PredictRequest) XXX_Size() int {
+	return xxx_messageInfo_PredictRequest.Size(m)
+}
+func (m *PredictRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PredictRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PredictRequest proto.InternalMessageInfo
+
+func (m *PredictRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *PredictRequest) GetPayload() *ExamplePayload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (m *PredictRequest) GetParams() map[string]string {
+	if m != nil {
+		return m.Params
+	}
+	return nil
+}
+
+// Response message for [PredictionService.Predict][google.cloud.automl.v1beta1.PredictionService.Predict].
+//
+// Currently, this is only
+// used to return an image recognition prediction result. More prediction
+// output metadata might be introduced in the future.
+type PredictResponse struct {
+	// Prediction result.
+	Payload []*AnnotationPayload `protobuf:"bytes,1,rep,name=payload,proto3" json:"payload,omitempty"`
+	// Additional domain-specific prediction response metadata.
+	Metadata             map[string]string `protobuf:"bytes,2,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *PredictResponse) Reset()         { *m = PredictResponse{} }
+func (m *PredictResponse) String() string { return proto.CompactTextString(m) }
+func (*PredictResponse) ProtoMessage()    {}
+func (*PredictResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_prediction_service_1b71b7f556fd7159, []int{1}
+}
+func (m *PredictResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PredictResponse.Unmarshal(m, b)
+}
+func (m *PredictResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PredictResponse.Marshal(b, m, deterministic)
+}
+func (dst *PredictResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictResponse.Merge(dst, src)
+}
+func (m *PredictResponse) XXX_Size() int {
+	return xxx_messageInfo_PredictResponse.Size(m)
+}
+func (m *PredictResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_PredictResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PredictResponse proto.InternalMessageInfo
+
+func (m *PredictResponse) GetPayload() []*AnnotationPayload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (m *PredictResponse) GetMetadata() map[string]string {
+	if m != nil {
+		return m.Metadata
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*PredictRequest)(nil), "google.cloud.automl.v1beta1.PredictRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.automl.v1beta1.PredictRequest.ParamsEntry")
+	proto.RegisterType((*PredictResponse)(nil), "google.cloud.automl.v1beta1.PredictResponse")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.automl.v1beta1.PredictResponse.MetadataEntry")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// PredictionServiceClient is the client API for PredictionService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type PredictionServiceClient interface {
+	// Perform a prediction.
+	Predict(ctx context.Context, in *PredictRequest, opts ...grpc.CallOption) (*PredictResponse, error)
+}
+
+type predictionServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewPredictionServiceClient(cc *grpc.ClientConn) PredictionServiceClient {
+	return &predictionServiceClient{cc}
+}
+
+func (c *predictionServiceClient) Predict(ctx context.Context, in *PredictRequest, opts ...grpc.CallOption) (*PredictResponse, error) {
+	out := new(PredictResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.PredictionService/Predict", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// PredictionServiceServer is the server API for PredictionService service.
+type PredictionServiceServer interface {
+	// Perform a prediction.
+	Predict(context.Context, *PredictRequest) (*PredictResponse, error)
+}
+
+func RegisterPredictionServiceServer(s *grpc.Server, srv PredictionServiceServer) {
+	s.RegisterService(&_PredictionService_serviceDesc, srv)
+}
+
+func _PredictionService_Predict_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PredictRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PredictionServiceServer).Predict(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.PredictionService/Predict",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PredictionServiceServer).Predict(ctx, req.(*PredictRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _PredictionService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.automl.v1beta1.PredictionService",
+	HandlerType: (*PredictionServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Predict",
+			Handler:    _PredictionService_Predict_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/automl/v1beta1/prediction_service.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/prediction_service.proto", fileDescriptor_prediction_service_1b71b7f556fd7159)
+}
+
+var fileDescriptor_prediction_service_1b71b7f556fd7159 = []byte{
+	// 462 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xdf, 0x8a, 0xd3, 0x40,
+	0x14, 0xc6, 0x99, 0x56, 0x77, 0xdd, 0x29, 0xfe, 0x1b, 0x44, 0x4a, 0x14, 0x2c, 0xbd, 0x2a, 0xdd,
+	0x65, 0x86, 0xad, 0xc2, 0x6a, 0x57, 0x2f, 0xb6, 0x50, 0xf0, 0x46, 0x0c, 0x11, 0xbc, 0xf0, 0xa6,
+	0x9c, 0x4d, 0x0e, 0x21, 0x3a, 0xc9, 0x8c, 0x99, 0x49, 0xb1, 0x88, 0x5e, 0xf8, 0x0a, 0xbe, 0x84,
+	0x4f, 0xe1, 0x4b, 0xf8, 0x0a, 0x3e, 0x80, 0x77, 0xde, 0x4a, 0x32, 0x63, 0xd6, 0x65, 0x25, 0x6c,
+	0xef, 0x32, 0x7f, 0x7e, 0xdf, 0xf9, 0xbe, 0xcc, 0x39, 0xf4, 0x51, 0xaa, 0x54, 0x2a, 0x51, 0xc4,
+	0x52, 0x55, 0x89, 0x80, 0xca, 0xaa, 0x5c, 0x8a, 0xf5, 0xe1, 0x29, 0x5a, 0x38, 0x14, 0xba, 0xc4,
+	0x24, 0x8b, 0x6d, 0xa6, 0x8a, 0x95, 0xc1, 0x72, 0x9d, 0xc5, 0xc8, 0x75, 0xa9, 0xac, 0x62, 0xf7,
+	0x1c, 0xc5, 0x1b, 0x8a, 0x3b, 0x8a, 0x7b, 0x2a, 0xb8, 0xef, 0x25, 0x41, 0x67, 0x02, 0x8a, 0x42,
+	0x59, 0xa8, 0x15, 0x8c, 0x43, 0x83, 0xce, 0x82, 0x67, 0xd7, 0x57, 0x1a, 0x36, 0x52, 0x41, 0xe2,
+	0xa9, 0x83, 0x2e, 0x2a, 0x01, 0x0b, 0xab, 0xcc, 0x62, 0xee, 0x6b, 0x8c, 0x7f, 0x13, 0x7a, 0x23,
+	0x74, 0xde, 0x23, 0x7c, 0x5f, 0xa1, 0xb1, 0x8c, 0xd1, 0x2b, 0x05, 0xe4, 0x38, 0x24, 0x23, 0x32,
+	0xd9, 0x8b, 0x9a, 0x6f, 0xb6, 0xa4, 0xbb, 0xbe, 0xca, 0xb0, 0x37, 0x22, 0x93, 0xc1, 0x6c, 0x9f,
+	0x77, 0xe4, 0xe2, 0xcb, 0x0f, 0x90, 0x6b, 0x89, 0xa1, 0x43, 0xa2, 0xbf, 0x2c, 0x7b, 0x49, 0x77,
+	0x34, 0x94, 0x90, 0x9b, 0x61, 0x7f, 0xd4, 0x9f, 0x0c, 0x66, 0x47, 0x9d, 0x2a, 0xe7, 0x7d, 0xf1,
+	0xb0, 0x21, 0x97, 0x85, 0x2d, 0x37, 0x91, 0x97, 0x09, 0x9e, 0xd0, 0xc1, 0x3f, 0xdb, 0xec, 0x16,
+	0xed, 0xbf, 0xc3, 0x8d, 0x77, 0x5e, 0x7f, 0xb2, 0x3b, 0xf4, 0xea, 0x1a, 0x64, 0x85, 0x8d, 0xed,
+	0xbd, 0xc8, 0x2d, 0xe6, 0xbd, 0xc7, 0x64, 0xfc, 0x8b, 0xd0, 0x9b, 0x6d, 0x05, 0xa3, 0x55, 0x61,
+	0x90, 0x3d, 0x3f, 0x8b, 0x49, 0x1a, 0x83, 0xbc, 0xd3, 0xe0, 0x49, 0xfb, 0x06, 0x17, 0x92, 0xbe,
+	0xa6, 0xd7, 0x72, 0xb4, 0x50, 0xff, 0xef, 0x61, 0xaf, 0x91, 0x9a, 0x5f, 0x2e, 0xab, 0x73, 0xc2,
+	0x5f, 0x78, 0xd8, 0xc5, 0x6d, 0xb5, 0x82, 0x63, 0x7a, 0xfd, 0xdc, 0xd1, 0x36, 0x91, 0x67, 0xdf,
+	0x09, 0xbd, 0x1d, 0xb6, 0x8d, 0xfa, 0xca, 0xf5, 0x29, 0xfb, 0x46, 0xe8, 0xae, 0xdf, 0x65, 0xfb,
+	0x5b, 0x3c, 0x48, 0x70, 0xb0, 0x4d, 0xa2, 0xf1, 0xe2, 0xcb, 0x8f, 0x9f, 0x5f, 0x7b, 0x4f, 0xc7,
+	0x47, 0x6d, 0x33, 0x7e, 0xac, 0x5b, 0xeb, 0x99, 0x2e, 0xd5, 0x5b, 0x8c, 0xad, 0x11, 0x53, 0x21,
+	0x55, 0xec, 0x06, 0x40, 0x4c, 0x45, 0xae, 0x12, 0x94, 0x46, 0x4c, 0x3f, 0xcd, 0xfd, 0x68, 0xcd,
+	0xc9, 0x74, 0xf1, 0x99, 0x3e, 0x88, 0x55, 0xde, 0x55, 0x76, 0x71, 0xf7, 0x42, 0xc0, 0xb0, 0x6e,
+	0xf4, 0x90, 0xbc, 0x39, 0xf1, 0x58, 0xaa, 0x24, 0x14, 0x29, 0x57, 0x65, 0x2a, 0x52, 0x2c, 0x9a,
+	0x31, 0x10, 0xee, 0x08, 0x74, 0x66, 0xfe, 0x3b, 0x37, 0xc7, 0x6e, 0x79, 0xba, 0xd3, 0xdc, 0x7e,
+	0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xb3, 0x24, 0x52, 0x0b, 0x04, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/service.pb.go
new file mode 100644
index 00000000..291c5f98
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/service.pb.go
@@ -0,0 +1,1565 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/service.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import _ "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Request message for [AutoMl.CreateDataset][google.cloud.automl.v1beta1.AutoMl.CreateDataset].
+type CreateDatasetRequest struct {
+	// The resource name of the project to create the dataset for.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The dataset to create.
+	Dataset              *Dataset `protobuf:"bytes,2,opt,name=dataset,proto3" json:"dataset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateDatasetRequest) Reset()         { *m = CreateDatasetRequest{} }
+func (m *CreateDatasetRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDatasetRequest) ProtoMessage()    {}
+func (*CreateDatasetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{0}
+}
+func (m *CreateDatasetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDatasetRequest.Unmarshal(m, b)
+}
+func (m *CreateDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDatasetRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatasetRequest.Merge(dst, src)
+}
+func (m *CreateDatasetRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDatasetRequest.Size(m)
+}
+func (m *CreateDatasetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDatasetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateDatasetRequest proto.InternalMessageInfo
+
+func (m *CreateDatasetRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateDatasetRequest) GetDataset() *Dataset {
+	if m != nil {
+		return m.Dataset
+	}
+	return nil
+}
+
+// Request message for [AutoMl.GetDataset][google.cloud.automl.v1beta1.AutoMl.GetDataset].
+type GetDatasetRequest struct {
+	// The resource name of the dataset to retrieve.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetDatasetRequest) Reset()         { *m = GetDatasetRequest{} }
+func (m *GetDatasetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDatasetRequest) ProtoMessage()    {}
+func (*GetDatasetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{1}
+}
+func (m *GetDatasetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDatasetRequest.Unmarshal(m, b)
+}
+func (m *GetDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDatasetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatasetRequest.Merge(dst, src)
+}
+func (m *GetDatasetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDatasetRequest.Size(m)
+}
+func (m *GetDatasetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDatasetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDatasetRequest proto.InternalMessageInfo
+
+func (m *GetDatasetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [AutoMl.ListDatasets][google.cloud.automl.v1beta1.AutoMl.ListDatasets].
+type ListDatasetsRequest struct {
+	// The resource name of the project from which to list datasets.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// An expression for filtering the results of the request.
+	//
+	//   * `dataset_metadata` - for existence of the case.
+	//
+	// An example of using the filter is:
+	//
+	//   * `translation_dataset_metadata:*` --> The dataset has
+	//                                          translation_dataset_metadata.
+	Filter string `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"`
+	// Requested page size. Server may return fewer results than requested.
+	// If unspecified, server will pick a default size.
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// A token identifying a page of results for the server to return
+	// Typically obtained via
+	// [ListDatasetsResponse.next_page_token][google.cloud.automl.v1beta1.ListDatasetsResponse.next_page_token] of the previous
+	// [AutoMl.ListDatasets][google.cloud.automl.v1beta1.AutoMl.ListDatasets] call.
+	PageToken            string   `protobuf:"bytes,6,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDatasetsRequest) Reset()         { *m = ListDatasetsRequest{} }
+func (m *ListDatasetsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDatasetsRequest) ProtoMessage()    {}
+func (*ListDatasetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{2}
+}
+func (m *ListDatasetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDatasetsRequest.Unmarshal(m, b)
+}
+func (m *ListDatasetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDatasetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDatasetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsRequest.Merge(dst, src)
+}
+func (m *ListDatasetsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDatasetsRequest.Size(m)
+}
+func (m *ListDatasetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDatasetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDatasetsRequest proto.InternalMessageInfo
+
+func (m *ListDatasetsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListDatasetsRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListDatasetsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListDatasetsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for [AutoMl.ListDatasets][google.cloud.automl.v1beta1.AutoMl.ListDatasets].
+type ListDatasetsResponse struct {
+	// The datasets read.
+	Datasets []*Dataset `protobuf:"bytes,1,rep,name=datasets,proto3" json:"datasets,omitempty"`
+	// A token to retrieve next page of results.
+	// Pass to [ListDatasetsRequest.page_token][google.cloud.automl.v1beta1.ListDatasetsRequest.page_token] to obtain that page.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDatasetsResponse) Reset()         { *m = ListDatasetsResponse{} }
+func (m *ListDatasetsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDatasetsResponse) ProtoMessage()    {}
+func (*ListDatasetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{3}
+}
+func (m *ListDatasetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDatasetsResponse.Unmarshal(m, b)
+}
+func (m *ListDatasetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDatasetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDatasetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsResponse.Merge(dst, src)
+}
+func (m *ListDatasetsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDatasetsResponse.Size(m)
+}
+func (m *ListDatasetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDatasetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDatasetsResponse proto.InternalMessageInfo
+
+func (m *ListDatasetsResponse) GetDatasets() []*Dataset {
+	if m != nil {
+		return m.Datasets
+	}
+	return nil
+}
+
+func (m *ListDatasetsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for [AutoMl.DeleteDataset][google.cloud.automl.v1beta1.AutoMl.DeleteDataset].
+type DeleteDatasetRequest struct {
+	// The resource name of the dataset to delete.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteDatasetRequest) Reset()         { *m = DeleteDatasetRequest{} }
+func (m *DeleteDatasetRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteDatasetRequest) ProtoMessage()    {}
+func (*DeleteDatasetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{4}
+}
+func (m *DeleteDatasetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteDatasetRequest.Unmarshal(m, b)
+}
+func (m *DeleteDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteDatasetRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDatasetRequest.Merge(dst, src)
+}
+func (m *DeleteDatasetRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteDatasetRequest.Size(m)
+}
+func (m *DeleteDatasetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteDatasetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteDatasetRequest proto.InternalMessageInfo
+
+func (m *DeleteDatasetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [AutoMl.ImportData][google.cloud.automl.v1beta1.AutoMl.ImportData].
+type ImportDataRequest struct {
+	// Required. Dataset name. Dataset must already exist. All imported
+	// annotations and examples will be added.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The desired input location.
+	InputConfig          *InputConfig `protobuf:"bytes,3,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *ImportDataRequest) Reset()         { *m = ImportDataRequest{} }
+func (m *ImportDataRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportDataRequest) ProtoMessage()    {}
+func (*ImportDataRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{5}
+}
+func (m *ImportDataRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportDataRequest.Unmarshal(m, b)
+}
+func (m *ImportDataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportDataRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportDataRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportDataRequest.Merge(dst, src)
+}
+func (m *ImportDataRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportDataRequest.Size(m)
+}
+func (m *ImportDataRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportDataRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportDataRequest proto.InternalMessageInfo
+
+func (m *ImportDataRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ImportDataRequest) GetInputConfig() *InputConfig {
+	if m != nil {
+		return m.InputConfig
+	}
+	return nil
+}
+
+// Request message for [AutoMl.ExportData][google.cloud.automl.v1beta1.AutoMl.ExportData].
+type ExportDataRequest struct {
+	// Required. The resource name of the dataset.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The desired output location.
+	OutputConfig         *OutputConfig `protobuf:"bytes,3,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ExportDataRequest) Reset()         { *m = ExportDataRequest{} }
+func (m *ExportDataRequest) String() string { return proto.CompactTextString(m) }
+func (*ExportDataRequest) ProtoMessage()    {}
+func (*ExportDataRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{6}
+}
+func (m *ExportDataRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportDataRequest.Unmarshal(m, b)
+}
+func (m *ExportDataRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportDataRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExportDataRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportDataRequest.Merge(dst, src)
+}
+func (m *ExportDataRequest) XXX_Size() int {
+	return xxx_messageInfo_ExportDataRequest.Size(m)
+}
+func (m *ExportDataRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportDataRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportDataRequest proto.InternalMessageInfo
+
+func (m *ExportDataRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ExportDataRequest) GetOutputConfig() *OutputConfig {
+	if m != nil {
+		return m.OutputConfig
+	}
+	return nil
+}
+
+// Request message for [AutoMl.CreateModel][google.cloud.automl.v1beta1.AutoMl.CreateModel].
+type CreateModelRequest struct {
+	// Resource name of the parent project where the model is being created.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The model to create.
+	Model                *Model   `protobuf:"bytes,4,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateModelRequest) Reset()         { *m = CreateModelRequest{} }
+func (m *CreateModelRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateModelRequest) ProtoMessage()    {}
+func (*CreateModelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{7}
+}
+func (m *CreateModelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateModelRequest.Unmarshal(m, b)
+}
+func (m *CreateModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateModelRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateModelRequest.Merge(dst, src)
+}
+func (m *CreateModelRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateModelRequest.Size(m)
+}
+func (m *CreateModelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateModelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateModelRequest proto.InternalMessageInfo
+
+func (m *CreateModelRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateModelRequest) GetModel() *Model {
+	if m != nil {
+		return m.Model
+	}
+	return nil
+}
+
+// Request message for [AutoMl.GetModel][google.cloud.automl.v1beta1.AutoMl.GetModel].
+type GetModelRequest struct {
+	// Resource name of the model.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetModelRequest) Reset()         { *m = GetModelRequest{} }
+func (m *GetModelRequest) String() string { return proto.CompactTextString(m) }
+func (*GetModelRequest) ProtoMessage()    {}
+func (*GetModelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{8}
+}
+func (m *GetModelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetModelRequest.Unmarshal(m, b)
+}
+func (m *GetModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetModelRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetModelRequest.Merge(dst, src)
+}
+func (m *GetModelRequest) XXX_Size() int {
+	return xxx_messageInfo_GetModelRequest.Size(m)
+}
+func (m *GetModelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetModelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetModelRequest proto.InternalMessageInfo
+
+func (m *GetModelRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [AutoMl.ListModels][google.cloud.automl.v1beta1.AutoMl.ListModels].
+type ListModelsRequest struct {
+	// Resource name of the project, from which to list the models.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// An expression for filtering the results of the request.
+	//
+	//   * `model_metadata` - for existence of the case.
+	//   * `dataset_id` - for = or !=.
+	//
+	// Some examples of using the filter are:
+	//
+	//   * `image_classification_model_metadata:*` --> The model has
+	//                                        image_classification_model_metadata.
+	//   * `dataset_id=5` --> The model was created from a sibling dataset with
+	//                    ID 5.
+	Filter string `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"`
+	// Requested page size.
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// A token identifying a page of results for the server to return
+	// Typically obtained via
+	// [ListModelsResponse.next_page_token][google.cloud.automl.v1beta1.ListModelsResponse.next_page_token] of the previous
+	// [AutoMl.ListModels][google.cloud.automl.v1beta1.AutoMl.ListModels] call.
+	PageToken            string   `protobuf:"bytes,6,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListModelsRequest) Reset()         { *m = ListModelsRequest{} }
+func (m *ListModelsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListModelsRequest) ProtoMessage()    {}
+func (*ListModelsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{9}
+}
+func (m *ListModelsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListModelsRequest.Unmarshal(m, b)
+}
+func (m *ListModelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListModelsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListModelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsRequest.Merge(dst, src)
+}
+func (m *ListModelsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListModelsRequest.Size(m)
+}
+func (m *ListModelsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListModelsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListModelsRequest proto.InternalMessageInfo
+
+func (m *ListModelsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListModelsRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListModelsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListModelsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for [AutoMl.ListModels][google.cloud.automl.v1beta1.AutoMl.ListModels].
+type ListModelsResponse struct {
+	// List of models in the requested page.
+	Model []*Model `protobuf:"bytes,1,rep,name=model,proto3" json:"model,omitempty"`
+	// A token to retrieve next page of results.
+	// Pass to [ListModels.page_token][] to obtain that page.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListModelsResponse) Reset()         { *m = ListModelsResponse{} }
+func (m *ListModelsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListModelsResponse) ProtoMessage()    {}
+func (*ListModelsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{10}
+}
+func (m *ListModelsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListModelsResponse.Unmarshal(m, b)
+}
+func (m *ListModelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListModelsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListModelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsResponse.Merge(dst, src)
+}
+func (m *ListModelsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListModelsResponse.Size(m)
+}
+func (m *ListModelsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListModelsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListModelsResponse proto.InternalMessageInfo
+
+func (m *ListModelsResponse) GetModel() []*Model {
+	if m != nil {
+		return m.Model
+	}
+	return nil
+}
+
+func (m *ListModelsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for [AutoMl.DeleteModel][google.cloud.automl.v1beta1.AutoMl.DeleteModel].
+type DeleteModelRequest struct {
+	// Resource name of the model being deleted.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteModelRequest) Reset()         { *m = DeleteModelRequest{} }
+func (m *DeleteModelRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteModelRequest) ProtoMessage()    {}
+func (*DeleteModelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{11}
+}
+func (m *DeleteModelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteModelRequest.Unmarshal(m, b)
+}
+func (m *DeleteModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteModelRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteModelRequest.Merge(dst, src)
+}
+func (m *DeleteModelRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteModelRequest.Size(m)
+}
+func (m *DeleteModelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteModelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteModelRequest proto.InternalMessageInfo
+
+func (m *DeleteModelRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [AutoMl.DeployModel][google.cloud.automl.v1beta1.AutoMl.DeployModel].
+type DeployModelRequest struct {
+	// Resource name of the model to deploy.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeployModelRequest) Reset()         { *m = DeployModelRequest{} }
+func (m *DeployModelRequest) String() string { return proto.CompactTextString(m) }
+func (*DeployModelRequest) ProtoMessage()    {}
+func (*DeployModelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{12}
+}
+func (m *DeployModelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeployModelRequest.Unmarshal(m, b)
+}
+func (m *DeployModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeployModelRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeployModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeployModelRequest.Merge(dst, src)
+}
+func (m *DeployModelRequest) XXX_Size() int {
+	return xxx_messageInfo_DeployModelRequest.Size(m)
+}
+func (m *DeployModelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeployModelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeployModelRequest proto.InternalMessageInfo
+
+func (m *DeployModelRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [AutoMl.UndeployModel][google.cloud.automl.v1beta1.AutoMl.UndeployModel].
+type UndeployModelRequest struct {
+	// Resource name of the model to undeploy.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UndeployModelRequest) Reset()         { *m = UndeployModelRequest{} }
+func (m *UndeployModelRequest) String() string { return proto.CompactTextString(m) }
+func (*UndeployModelRequest) ProtoMessage()    {}
+func (*UndeployModelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{13}
+}
+func (m *UndeployModelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UndeployModelRequest.Unmarshal(m, b)
+}
+func (m *UndeployModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UndeployModelRequest.Marshal(b, m, deterministic)
+}
+func (dst *UndeployModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeployModelRequest.Merge(dst, src)
+}
+func (m *UndeployModelRequest) XXX_Size() int {
+	return xxx_messageInfo_UndeployModelRequest.Size(m)
+}
+func (m *UndeployModelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UndeployModelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UndeployModelRequest proto.InternalMessageInfo
+
+func (m *UndeployModelRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [AutoMl.GetModelEvaluation][google.cloud.automl.v1beta1.AutoMl.GetModelEvaluation].
+type GetModelEvaluationRequest struct {
+	// Resource name for the model evaluation.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetModelEvaluationRequest) Reset()         { *m = GetModelEvaluationRequest{} }
+func (m *GetModelEvaluationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetModelEvaluationRequest) ProtoMessage()    {}
+func (*GetModelEvaluationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{14}
+}
+func (m *GetModelEvaluationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetModelEvaluationRequest.Unmarshal(m, b)
+}
+func (m *GetModelEvaluationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetModelEvaluationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetModelEvaluationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetModelEvaluationRequest.Merge(dst, src)
+}
+func (m *GetModelEvaluationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetModelEvaluationRequest.Size(m)
+}
+func (m *GetModelEvaluationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetModelEvaluationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetModelEvaluationRequest proto.InternalMessageInfo
+
+func (m *GetModelEvaluationRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [AutoMl.ListModelEvaluations][google.cloud.automl.v1beta1.AutoMl.ListModelEvaluations].
+type ListModelEvaluationsRequest struct {
+	// Resource name of the model to list the model evaluations for.
+	// If modelId is set as "-", this will list model evaluations from across all
+	// models of the parent location.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// An expression for filtering the results of the request.
+	//
+	//   * `annotation_spec_id` - for =, !=  or existence. See example below for
+	//                          the last.
+	//
+	// Some examples of using the filter are:
+	//
+	//   * `annotation_spec_id!=4` --> The model evaluation was done for
+	//                             annotation spec with ID different than 4.
+	//   * `NOT annotation_spec_id:*` --> The model evaluation was done for
+	//                                aggregate of all annotation specs.
+	Filter string `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"`
+	// Requested page size.
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// A token identifying a page of results for the server to return.
+	// Typically obtained via
+	// `ListModelEvaluationsResponse.next_page_token` of the previous
+	// [AutoMl.ListModelEvaluations][google.cloud.automl.v1beta1.AutoMl.ListModelEvaluations] call.
+	PageToken            string   `protobuf:"bytes,6,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListModelEvaluationsRequest) Reset()         { *m = ListModelEvaluationsRequest{} }
+func (m *ListModelEvaluationsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListModelEvaluationsRequest) ProtoMessage()    {}
+func (*ListModelEvaluationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{15}
+}
+func (m *ListModelEvaluationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListModelEvaluationsRequest.Unmarshal(m, b)
+}
+func (m *ListModelEvaluationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListModelEvaluationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListModelEvaluationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelEvaluationsRequest.Merge(dst, src)
+}
+func (m *ListModelEvaluationsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListModelEvaluationsRequest.Size(m)
+}
+func (m *ListModelEvaluationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListModelEvaluationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListModelEvaluationsRequest proto.InternalMessageInfo
+
+func (m *ListModelEvaluationsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListModelEvaluationsRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListModelEvaluationsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListModelEvaluationsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for [AutoMl.ListModelEvaluations][google.cloud.automl.v1beta1.AutoMl.ListModelEvaluations].
+type ListModelEvaluationsResponse struct {
+	// List of model evaluations in the requested page.
+	ModelEvaluation []*ModelEvaluation `protobuf:"bytes,1,rep,name=model_evaluation,json=modelEvaluation,proto3" json:"model_evaluation,omitempty"`
+	// A token to retrieve next page of results.
+	// Pass to [ListModelEvaluations.page_token][] to obtain that page.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListModelEvaluationsResponse) Reset()         { *m = ListModelEvaluationsResponse{} }
+func (m *ListModelEvaluationsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListModelEvaluationsResponse) ProtoMessage()    {}
+func (*ListModelEvaluationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_13046020da32bacb, []int{16}
+}
+func (m *ListModelEvaluationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListModelEvaluationsResponse.Unmarshal(m, b)
+}
+func (m *ListModelEvaluationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListModelEvaluationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListModelEvaluationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelEvaluationsResponse.Merge(dst, src)
+}
+func (m *ListModelEvaluationsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListModelEvaluationsResponse.Size(m)
+}
+func (m *ListModelEvaluationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListModelEvaluationsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListModelEvaluationsResponse proto.InternalMessageInfo
+
+func (m *ListModelEvaluationsResponse) GetModelEvaluation() []*ModelEvaluation {
+	if m != nil {
+		return m.ModelEvaluation
+	}
+	return nil
+}
+
+func (m *ListModelEvaluationsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*CreateDatasetRequest)(nil), "google.cloud.automl.v1beta1.CreateDatasetRequest")
+	proto.RegisterType((*GetDatasetRequest)(nil), "google.cloud.automl.v1beta1.GetDatasetRequest")
+	proto.RegisterType((*ListDatasetsRequest)(nil), "google.cloud.automl.v1beta1.ListDatasetsRequest")
+	proto.RegisterType((*ListDatasetsResponse)(nil), "google.cloud.automl.v1beta1.ListDatasetsResponse")
+	proto.RegisterType((*DeleteDatasetRequest)(nil), "google.cloud.automl.v1beta1.DeleteDatasetRequest")
+	proto.RegisterType((*ImportDataRequest)(nil), "google.cloud.automl.v1beta1.ImportDataRequest")
+	proto.RegisterType((*ExportDataRequest)(nil), "google.cloud.automl.v1beta1.ExportDataRequest")
+	proto.RegisterType((*CreateModelRequest)(nil), "google.cloud.automl.v1beta1.CreateModelRequest")
+	proto.RegisterType((*GetModelRequest)(nil), "google.cloud.automl.v1beta1.GetModelRequest")
+	proto.RegisterType((*ListModelsRequest)(nil), "google.cloud.automl.v1beta1.ListModelsRequest")
+	proto.RegisterType((*ListModelsResponse)(nil), "google.cloud.automl.v1beta1.ListModelsResponse")
+	proto.RegisterType((*DeleteModelRequest)(nil), "google.cloud.automl.v1beta1.DeleteModelRequest")
+	proto.RegisterType((*DeployModelRequest)(nil), "google.cloud.automl.v1beta1.DeployModelRequest")
+	proto.RegisterType((*UndeployModelRequest)(nil), "google.cloud.automl.v1beta1.UndeployModelRequest")
+	proto.RegisterType((*GetModelEvaluationRequest)(nil), "google.cloud.automl.v1beta1.GetModelEvaluationRequest")
+	proto.RegisterType((*ListModelEvaluationsRequest)(nil), "google.cloud.automl.v1beta1.ListModelEvaluationsRequest")
+	proto.RegisterType((*ListModelEvaluationsResponse)(nil), "google.cloud.automl.v1beta1.ListModelEvaluationsResponse")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// AutoMlClient is the client API for AutoMl service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type AutoMlClient interface {
+	// Creates a dataset.
+	CreateDataset(ctx context.Context, in *CreateDatasetRequest, opts ...grpc.CallOption) (*Dataset, error)
+	// Gets a dataset.
+	GetDataset(ctx context.Context, in *GetDatasetRequest, opts ...grpc.CallOption) (*Dataset, error)
+	// Lists datasets in a project.
+	ListDatasets(ctx context.Context, in *ListDatasetsRequest, opts ...grpc.CallOption) (*ListDatasetsResponse, error)
+	// Deletes a dataset and all of its contents.
+	// Returns empty response in the
+	// [response][google.longrunning.Operation.response] field when it completes,
+	// and `delete_details` in the
+	// [metadata][google.longrunning.Operation.metadata] field.
+	DeleteDataset(ctx context.Context, in *DeleteDatasetRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Imports data into a dataset.
+	// Returns an empty response in the
+	// [response][google.longrunning.Operation.response] field when it completes.
+	ImportData(ctx context.Context, in *ImportDataRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Exports dataset's data to a Google Cloud Storage bucket.
+	// Returns an empty response in the
+	// [response][google.longrunning.Operation.response] field when it completes.
+	ExportData(ctx context.Context, in *ExportDataRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Creates a model.
+	// Returns a Model in the [response][google.longrunning.Operation.response]
+	// field when it completes.
+	// When you create a model, several model evaluations are created for it:
+	// a global evaluation, and one evaluation for each annotation spec.
+	CreateModel(ctx context.Context, in *CreateModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Gets a model.
+	GetModel(ctx context.Context, in *GetModelRequest, opts ...grpc.CallOption) (*Model, error)
+	// Lists models.
+	ListModels(ctx context.Context, in *ListModelsRequest, opts ...grpc.CallOption) (*ListModelsResponse, error)
+	// Deletes a model.
+	// If a model is already deployed, this only deletes the model in AutoML BE,
+	// and does not change the status of the deployed model in the production
+	// environment.
+	// Returns `google.protobuf.Empty` in the
+	// [response][google.longrunning.Operation.response] field when it completes,
+	// and `delete_details` in the
+	// [metadata][google.longrunning.Operation.metadata] field.
+	DeleteModel(ctx context.Context, in *DeleteModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Deploys model.
+	// Returns a [DeployModelResponse][] in the
+	// [response][google.longrunning.Operation.response] field when it completes.
+	DeployModel(ctx context.Context, in *DeployModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Undeploys model.
+	// Returns an `UndeployModelResponse` in the
+	// [response][google.longrunning.Operation.response] field when it completes.
+	UndeployModel(ctx context.Context, in *UndeployModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Gets a model evaluation.
+	GetModelEvaluation(ctx context.Context, in *GetModelEvaluationRequest, opts ...grpc.CallOption) (*ModelEvaluation, error)
+	// Lists model evaluations.
+	ListModelEvaluations(ctx context.Context, in *ListModelEvaluationsRequest, opts ...grpc.CallOption) (*ListModelEvaluationsResponse, error)
+}
+
+type autoMlClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewAutoMlClient(cc *grpc.ClientConn) AutoMlClient {
+	return &autoMlClient{cc}
+}
+
+func (c *autoMlClient) CreateDataset(ctx context.Context, in *CreateDatasetRequest, opts ...grpc.CallOption) (*Dataset, error) {
+	out := new(Dataset)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/CreateDataset", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) GetDataset(ctx context.Context, in *GetDatasetRequest, opts ...grpc.CallOption) (*Dataset, error) {
+	out := new(Dataset)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/GetDataset", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) ListDatasets(ctx context.Context, in *ListDatasetsRequest, opts ...grpc.CallOption) (*ListDatasetsResponse, error) {
+	out := new(ListDatasetsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/ListDatasets", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) DeleteDataset(ctx context.Context, in *DeleteDatasetRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/DeleteDataset", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) ImportData(ctx context.Context, in *ImportDataRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/ImportData", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) ExportData(ctx context.Context, in *ExportDataRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/ExportData", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) CreateModel(ctx context.Context, in *CreateModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/CreateModel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) GetModel(ctx context.Context, in *GetModelRequest, opts ...grpc.CallOption) (*Model, error) {
+	out := new(Model)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/GetModel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) ListModels(ctx context.Context, in *ListModelsRequest, opts ...grpc.CallOption) (*ListModelsResponse, error) {
+	out := new(ListModelsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/ListModels", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) DeleteModel(ctx context.Context, in *DeleteModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/DeleteModel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) DeployModel(ctx context.Context, in *DeployModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/DeployModel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) UndeployModel(ctx context.Context, in *UndeployModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/UndeployModel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) GetModelEvaluation(ctx context.Context, in *GetModelEvaluationRequest, opts ...grpc.CallOption) (*ModelEvaluation, error) {
+	out := new(ModelEvaluation)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/GetModelEvaluation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *autoMlClient) ListModelEvaluations(ctx context.Context, in *ListModelEvaluationsRequest, opts ...grpc.CallOption) (*ListModelEvaluationsResponse, error) {
+	out := new(ListModelEvaluationsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.automl.v1beta1.AutoMl/ListModelEvaluations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// AutoMlServer is the server API for AutoMl service.
+type AutoMlServer interface {
+	// Creates a dataset.
+	CreateDataset(context.Context, *CreateDatasetRequest) (*Dataset, error)
+	// Gets a dataset.
+	GetDataset(context.Context, *GetDatasetRequest) (*Dataset, error)
+	// Lists datasets in a project.
+	ListDatasets(context.Context, *ListDatasetsRequest) (*ListDatasetsResponse, error)
+	// Deletes a dataset and all of its contents.
+	// Returns empty response in the
+	// [response][google.longrunning.Operation.response] field when it completes,
+	// and `delete_details` in the
+	// [metadata][google.longrunning.Operation.metadata] field.
+	DeleteDataset(context.Context, *DeleteDatasetRequest) (*longrunning.Operation, error)
+	// Imports data into a dataset.
+	// Returns an empty response in the
+	// [response][google.longrunning.Operation.response] field when it completes.
+	ImportData(context.Context, *ImportDataRequest) (*longrunning.Operation, error)
+	// Exports dataset's data to a Google Cloud Storage bucket.
+	// Returns an empty response in the
+	// [response][google.longrunning.Operation.response] field when it completes.
+	ExportData(context.Context, *ExportDataRequest) (*longrunning.Operation, error)
+	// Creates a model.
+	// Returns a Model in the [response][google.longrunning.Operation.response]
+	// field when it completes.
+	// When you create a model, several model evaluations are created for it:
+	// a global evaluation, and one evaluation for each annotation spec.
+	CreateModel(context.Context, *CreateModelRequest) (*longrunning.Operation, error)
+	// Gets a model.
+	GetModel(context.Context, *GetModelRequest) (*Model, error)
+	// Lists models.
+	ListModels(context.Context, *ListModelsRequest) (*ListModelsResponse, error)
+	// Deletes a model.
+	// If a model is already deployed, this only deletes the model in AutoML BE,
+	// and does not change the status of the deployed model in the production
+	// environment.
+	// Returns `google.protobuf.Empty` in the
+	// [response][google.longrunning.Operation.response] field when it completes,
+	// and `delete_details` in the
+	// [metadata][google.longrunning.Operation.metadata] field.
+	DeleteModel(context.Context, *DeleteModelRequest) (*longrunning.Operation, error)
+	// Deploys model.
+	// Returns a [DeployModelResponse][] in the
+	// [response][google.longrunning.Operation.response] field when it completes.
+	DeployModel(context.Context, *DeployModelRequest) (*longrunning.Operation, error)
+	// Undeploys model.
+	// Returns an `UndeployModelResponse` in the
+	// [response][google.longrunning.Operation.response] field when it completes.
+	UndeployModel(context.Context, *UndeployModelRequest) (*longrunning.Operation, error)
+	// Gets a model evaluation.
+	GetModelEvaluation(context.Context, *GetModelEvaluationRequest) (*ModelEvaluation, error)
+	// Lists model evaluations.
+	ListModelEvaluations(context.Context, *ListModelEvaluationsRequest) (*ListModelEvaluationsResponse, error)
+}
+
+func RegisterAutoMlServer(s *grpc.Server, srv AutoMlServer) {
+	s.RegisterService(&_AutoMl_serviceDesc, srv)
+}
+
+func _AutoMl_CreateDataset_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateDatasetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).CreateDataset(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/CreateDataset",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).CreateDataset(ctx, req.(*CreateDatasetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_GetDataset_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDatasetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).GetDataset(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/GetDataset",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).GetDataset(ctx, req.(*GetDatasetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_ListDatasets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListDatasetsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).ListDatasets(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/ListDatasets",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).ListDatasets(ctx, req.(*ListDatasetsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_DeleteDataset_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteDatasetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).DeleteDataset(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/DeleteDataset",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).DeleteDataset(ctx, req.(*DeleteDatasetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_ImportData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ImportDataRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).ImportData(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/ImportData",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).ImportData(ctx, req.(*ImportDataRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_ExportData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ExportDataRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).ExportData(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/ExportData",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).ExportData(ctx, req.(*ExportDataRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_CreateModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateModelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).CreateModel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/CreateModel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).CreateModel(ctx, req.(*CreateModelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_GetModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetModelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).GetModel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/GetModel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).GetModel(ctx, req.(*GetModelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_ListModels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListModelsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).ListModels(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/ListModels",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).ListModels(ctx, req.(*ListModelsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_DeleteModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteModelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).DeleteModel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/DeleteModel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).DeleteModel(ctx, req.(*DeleteModelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_DeployModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeployModelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).DeployModel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/DeployModel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).DeployModel(ctx, req.(*DeployModelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_UndeployModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UndeployModelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).UndeployModel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/UndeployModel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).UndeployModel(ctx, req.(*UndeployModelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_GetModelEvaluation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetModelEvaluationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).GetModelEvaluation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/GetModelEvaluation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).GetModelEvaluation(ctx, req.(*GetModelEvaluationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AutoMl_ListModelEvaluations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListModelEvaluationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AutoMlServer).ListModelEvaluations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.automl.v1beta1.AutoMl/ListModelEvaluations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AutoMlServer).ListModelEvaluations(ctx, req.(*ListModelEvaluationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _AutoMl_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.automl.v1beta1.AutoMl",
+	HandlerType: (*AutoMlServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "CreateDataset",
+			Handler:    _AutoMl_CreateDataset_Handler,
+		},
+		{
+			MethodName: "GetDataset",
+			Handler:    _AutoMl_GetDataset_Handler,
+		},
+		{
+			MethodName: "ListDatasets",
+			Handler:    _AutoMl_ListDatasets_Handler,
+		},
+		{
+			MethodName: "DeleteDataset",
+			Handler:    _AutoMl_DeleteDataset_Handler,
+		},
+		{
+			MethodName: "ImportData",
+			Handler:    _AutoMl_ImportData_Handler,
+		},
+		{
+			MethodName: "ExportData",
+			Handler:    _AutoMl_ExportData_Handler,
+		},
+		{
+			MethodName: "CreateModel",
+			Handler:    _AutoMl_CreateModel_Handler,
+		},
+		{
+			MethodName: "GetModel",
+			Handler:    _AutoMl_GetModel_Handler,
+		},
+		{
+			MethodName: "ListModels",
+			Handler:    _AutoMl_ListModels_Handler,
+		},
+		{
+			MethodName: "DeleteModel",
+			Handler:    _AutoMl_DeleteModel_Handler,
+		},
+		{
+			MethodName: "DeployModel",
+			Handler:    _AutoMl_DeployModel_Handler,
+		},
+		{
+			MethodName: "UndeployModel",
+			Handler:    _AutoMl_UndeployModel_Handler,
+		},
+		{
+			MethodName: "GetModelEvaluation",
+			Handler:    _AutoMl_GetModelEvaluation_Handler,
+		},
+		{
+			MethodName: "ListModelEvaluations",
+			Handler:    _AutoMl_ListModelEvaluations_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/automl/v1beta1/service.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/service.proto", fileDescriptor_service_13046020da32bacb)
+}
+
+var fileDescriptor_service_13046020da32bacb = []byte{
+	// 1078 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4d, 0x8f, 0xdb, 0x44,
+	0x18, 0xd6, 0x6c, 0xdb, 0xb0, 0x7d, 0xb3, 0xd1, 0xb2, 0xc3, 0xaa, 0x0a, 0xd9, 0x56, 0x44, 0xa6,
+	0xd0, 0x34, 0x5a, 0xc5, 0x24, 0x45, 0x65, 0x9b, 0x7e, 0x88, 0xfd, 0xa8, 0x56, 0x05, 0x4a, 0x57,
+	0x0b, 0x08, 0x89, 0x4b, 0xe4, 0x4d, 0x26, 0x96, 0xa9, 0x33, 0x63, 0xec, 0xf1, 0xb2, 0x2d, 0xaa,
+	0xf8, 0xb8, 0x71, 0x46, 0x70, 0xa2, 0x82, 0x03, 0xea, 0x09, 0xf1, 0x33, 0xf8, 0x03, 0x1c, 0xb8,
+	0x71, 0xe2, 0x87, 0x20, 0xcf, 0x8c, 0x63, 0x27, 0x36, 0x1e, 0xa7, 0x52, 0xb5, 0xb7, 0xcc, 0xf8,
+	0x79, 0xfd, 0x3e, 0xf3, 0x7e, 0xcc, 0xf3, 0x3a, 0x70, 0xd5, 0x66, 0xcc, 0x76, 0x89, 0x39, 0x74,
+	0x59, 0x38, 0x32, 0xad, 0x90, 0xb3, 0x89, 0x6b, 0x1e, 0x77, 0x8f, 0x08, 0xb7, 0xba, 0x66, 0x40,
+	0xfc, 0x63, 0x67, 0x48, 0x3a, 0x9e, 0xcf, 0x38, 0xc3, 0x1b, 0x12, 0xda, 0x11, 0xd0, 0x8e, 0x84,
+	0x76, 0x14, 0xb4, 0x71, 0x51, 0xbd, 0xc7, 0xf2, 0x1c, 0xd3, 0xa2, 0x94, 0x71, 0x8b, 0x3b, 0x8c,
+	0x06, 0xd2, 0xb4, 0xf1, 0x76, 0x91, 0x97, 0x04, 0x3e, 0xf0, 0xac, 0x47, 0x2e, 0xb3, 0x46, 0xca,
+	0xaa, 0x90, 0xdb, 0xc8, 0xe2, 0x56, 0x40, 0xb8, 0x82, 0x5e, 0x2e, 0x82, 0x3a, 0x4c, 0xa1, 0xae,
+	0x14, 0xa1, 0x26, 0x6c, 0x44, 0x5c, 0x05, 0xec, 0x69, 0x81, 0x03, 0x72, 0x6c, 0xb9, 0xa1, 0x60,
+	0xad, 0x6c, 0x36, 0x8b, 0x6c, 0x98, 0x47, 0xfc, 0x99, 0x88, 0xbc, 0xae, 0xd0, 0x2e, 0xa3, 0xb6,
+	0x1f, 0x52, 0xea, 0x50, 0x3b, 0x0b, 0x6a, 0x2a, 0x90, 0x58, 0x1d, 0x85, 0x63, 0x73, 0xec, 0x10,
+	0x77, 0x34, 0x98, 0x58, 0xc1, 0x43, 0x89, 0x30, 0x28, 0xac, 0xef, 0xfa, 0xc4, 0xe2, 0x64, 0x4f,
+	0x86, 0xe3, 0x90, 0x7c, 0x11, 0x92, 0x80, 0xe3, 0x0b, 0x50, 0xf1, 0x2c, 0x9f, 0x50, 0x5e, 0x47,
+	0x4d, 0xd4, 0x3a, 0x7f, 0xa8, 0x56, 0xf8, 0x0e, 0xbc, 0xa4, 0x02, 0x57, 0x5f, 0x6a, 0xa2, 0x56,
+	0xb5, 0x77, 0xb9, 0x53, 0x90, 0xd5, 0x4e, 0xfc, 0xd6, 0xd8, 0xc8, 0xb8, 0x02, 0x6b, 0xfb, 0x84,
+	0xcf, 0x39, 0xc3, 0x70, 0x96, 0x5a, 0x13, 0xa2, 0x5c, 0x89, 0xdf, 0xc6, 0xb7, 0x08, 0x5e, 0xf9,
+	0xc0, 0x09, 0x62, 0x68, 0xa0, 0x23, 0x76, 0x01, 0x2a, 0x63, 0xc7, 0xe5, 0xc4, 0xaf, 0x9f, 0x91,
+	0xfb, 0x72, 0x85, 0x37, 0xe0, 0xbc, 0x67, 0xd9, 0x64, 0x10, 0x38, 0x8f, 0x49, 0xfd, 0x6c, 0x13,
+	0xb5, 0xce, 0x1d, 0x2e, 0x47, 0x1b, 0x1f, 0x39, 0x8f, 0x09, 0xbe, 0x04, 0x20, 0x1e, 0x72, 0xf6,
+	0x90, 0xd0, 0x7a, 0x45, 0x18, 0x0a, 0xf8, 0xc7, 0xd1, 0x86, 0xf1, 0x0d, 0x82, 0xf5, 0x59, 0x0e,
+	0x81, 0xc7, 0x68, 0x40, 0xf0, 0xbb, 0xb0, 0xac, 0x0e, 0x14, 0xd4, 0x51, 0xf3, 0x4c, 0xe9, 0x30,
+	0x4c, 0xad, 0xf0, 0x9b, 0xb0, 0x4a, 0xc9, 0x09, 0x1f, 0xa4, 0xdc, 0x2f, 0x09, 0xf7, 0xb5, 0x68,
+	0xfb, 0x60, 0x4a, 0xa1, 0x0d, 0xeb, 0x7b, 0xc4, 0x25, 0x99, 0xfc, 0xe4, 0x85, 0x8c, 0xc3, 0xda,
+	0xbd, 0x89, 0xc7, 0x7c, 0xc1, 0xb7, 0x00, 0x88, 0xdf, 0x87, 0x15, 0x87, 0x7a, 0x21, 0x1f, 0x0c,
+	0x19, 0x1d, 0x3b, 0xb6, 0x88, 0x58, 0xb5, 0xd7, 0x2a, 0x3c, 0xc2, 0xbd, 0xc8, 0x60, 0x57, 0xe0,
+	0x0f, 0xab, 0x4e, 0xb2, 0x30, 0xbe, 0x84, 0xb5, 0xbb, 0x27, 0x65, 0xbc, 0x7e, 0x08, 0x35, 0x16,
+	0xf2, 0x8c, 0xdb, 0xab, 0x85, 0x6e, 0x1f, 0x08, 0x0b, 0xe5, 0x77, 0x85, 0xa5, 0x56, 0xc6, 0x18,
+	0xb0, 0x2c, 0xdd, 0xfb, 0x51, 0x3f, 0xe9, 0xea, 0x63, 0x0b, 0xce, 0x89, 0xbe, 0x13, 0x35, 0x50,
+	0xed, 0x19, 0x85, 0x5e, 0xe5, 0x1b, 0xa5, 0x81, 0xf1, 0x06, 0xac, 0xee, 0x13, 0x3e, 0xe3, 0x24,
+	0x2f, 0xfa, 0x5f, 0xc3, 0x5a, 0x54, 0x2b, 0x02, 0x77, 0x2a, 0xd5, 0x7a, 0x0c, 0x38, 0x4d, 0x40,
+	0x95, 0xea, 0xf4, 0xdc, 0xb2, 0x4e, 0xcb, 0x9f, 0xbb, 0x74, 0x89, 0xb6, 0x00, 0xcb, 0x12, 0xd5,
+	0x86, 0x48, 0x20, 0x3d, 0x97, 0x3d, 0xd2, 0x22, 0xdb, 0xb0, 0xfe, 0x09, 0x1d, 0x95, 0xc3, 0x9a,
+	0xf0, 0x6a, 0x9c, 0x9f, 0xbb, 0xd3, 0x3b, 0xb5, 0xc8, 0xe0, 0x7b, 0x04, 0x1b, 0xd3, 0x48, 0x25,
+	0x26, 0xa7, 0x92, 0xb4, 0x5f, 0x10, 0x5c, 0xcc, 0xe7, 0xa2, 0xf2, 0xf7, 0x29, 0xbc, 0x3c, 0xaf,
+	0x17, 0x2a, 0x95, 0x9b, 0xfa, 0x54, 0xa6, 0xe2, 0xb1, 0x3a, 0x99, 0xdd, 0x28, 0x9b, 0xde, 0xde,
+	0x3f, 0x18, 0x2a, 0xdb, 0x21, 0x67, 0xf7, 0x5d, 0xfc, 0x3b, 0x82, 0xda, 0x8c, 0x5a, 0xe0, 0x6e,
+	0x21, 0x87, 0x3c, 0x65, 0x69, 0x94, 0xba, 0x29, 0x8d, 0x9d, 0xef, 0xfe, 0xfa, 0xf7, 0x87, 0xa5,
+	0x5b, 0x46, 0x77, 0xaa, 0x80, 0x5f, 0xc9, 0x2c, 0xdc, 0xf6, 0x7c, 0xf6, 0x39, 0x19, 0xf2, 0xc0,
+	0x6c, 0x9b, 0x2e, 0x1b, 0xca, 0x68, 0x99, 0xed, 0x27, 0xb1, 0x9e, 0x07, 0xfd, 0x58, 0x6b, 0xf0,
+	0x53, 0x04, 0x90, 0x88, 0x0d, 0xee, 0x14, 0x3a, 0xce, 0xa8, 0x52, 0x49, 0xa2, 0x37, 0x04, 0xd1,
+	0x6b, 0x38, 0x45, 0x34, 0x2a, 0xb2, 0xff, 0xa1, 0x39, 0x65, 0x69, 0xb6, 0x9f, 0xe0, 0x3f, 0x10,
+	0xac, 0xa4, 0xe5, 0x05, 0xbf, 0x55, 0xe8, 0x31, 0x47, 0x0d, 0x1b, 0xdd, 0x05, 0x2c, 0x64, 0x41,
+	0xe5, 0x11, 0x2e, 0x19, 0x59, 0xfc, 0x33, 0x82, 0xda, 0x8c, 0x1a, 0x69, 0xf2, 0x9f, 0xa7, 0x5c,
+	0x8d, 0x4b, 0xb1, 0x49, 0x6a, 0x72, 0xe9, 0x3c, 0x88, 0x27, 0x97, 0x98, 0x5e, 0xfb, 0x39, 0xe2,
+	0xf9, 0x1b, 0x02, 0x48, 0x04, 0x50, 0x93, 0xef, 0x8c, 0x52, 0xea, 0x88, 0xed, 0x0b, 0x62, 0xdb,
+	0xc6, 0xad, 0x85, 0x89, 0xf5, 0x9d, 0xa9, 0xaf, 0x3e, 0x6a, 0x0b, 0x9a, 0x89, 0x62, 0x6a, 0x68,
+	0x66, 0xa4, 0xf5, 0x05, 0xd2, 0x24, 0x27, 0x69, 0x9a, 0x4f, 0x11, 0x54, 0x53, 0xfa, 0x8a, 0xcd,
+	0x12, 0xad, 0x9e, 0xbe, 0xab, 0x75, 0x44, 0xef, 0x08, 0xa2, 0x5b, 0x86, 0x59, 0xba, 0x0e, 0xc5,
+	0x0d, 0x16, 0xf4, 0x95, 0x3c, 0xfd, 0x88, 0x60, 0x39, 0xbe, 0xf7, 0xf1, 0xa6, 0xae, 0xb7, 0x67,
+	0x98, 0x95, 0x10, 0x41, 0xe3, 0x1d, 0x41, 0xaf, 0x8b, 0xcd, 0x72, 0x71, 0x94, 0xdc, 0xa2, 0x2a,
+	0x7c, 0x86, 0x00, 0x12, 0x1d, 0xd6, 0xa4, 0x37, 0x33, 0x31, 0x34, 0xcc, 0xd2, 0x78, 0xd5, 0xcf,
+	0x39, 0x44, 0x4b, 0xc5, 0x11, 0xff, 0x84, 0xa0, 0x9a, 0x12, 0x6e, 0x4d, 0x82, 0xb3, 0x12, 0xaf,
+	0x4b, 0xb0, 0x22, 0xd6, 0x5e, 0x38, 0x82, 0xbf, 0x0a, 0x62, 0x53, 0xed, 0xd7, 0x12, 0x9b, 0x9f,
+	0x12, 0x74, 0xc4, 0xb6, 0x05, 0xb1, 0x9b, 0xc6, 0xf5, 0x05, 0x89, 0xf5, 0xe5, 0x40, 0x12, 0x35,
+	0xc7, 0x33, 0x04, 0xb5, 0x99, 0x01, 0x45, 0x73, 0x13, 0xe6, 0x0d, 0x33, 0x3a, 0x9a, 0xbb, 0x82,
+	0xe6, 0x6d, 0x63, 0x6b, 0x51, 0x9a, 0x21, 0x4d, 0x88, 0xfe, 0x89, 0x00, 0x67, 0xa7, 0x23, 0x7c,
+	0xbd, 0x54, 0xbf, 0x64, 0xc6, 0xa9, 0xc6, 0x42, 0x33, 0x87, 0xf1, 0x9e, 0x38, 0xc1, 0x1e, 0xde,
+	0x59, 0xec, 0x04, 0xe6, 0xdc, 0xa8, 0x22, 0x8a, 0xe2, 0x6f, 0xf5, 0x2d, 0x36, 0x3f, 0x28, 0xe1,
+	0xad, 0x72, 0x0d, 0x93, 0x9d, 0xf3, 0x1a, 0x37, 0x9e, 0xc3, 0x52, 0x35, 0x5d, 0xce, 0xc9, 0x0a,
+	0x9b, 0x2e, 0xc9, 0x4e, 0xe6, 0x70, 0x3b, 0x01, 0xbc, 0x36, 0x64, 0x93, 0x22, 0x2e, 0x3b, 0x55,
+	0x39, 0x80, 0x1d, 0x44, 0x9f, 0xec, 0x07, 0xe8, 0xb3, 0x6d, 0x85, 0xb5, 0x99, 0x6b, 0x51, 0xbb,
+	0xc3, 0x7c, 0xdb, 0xb4, 0x09, 0x15, 0x1f, 0xf4, 0xa6, 0x7c, 0x64, 0x79, 0x4e, 0x90, 0xfb, 0x47,
+	0xc2, 0x4d, 0xb9, 0x3c, 0xaa, 0x08, 0xf4, 0xb5, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x61, 0x0b,
+	0x95, 0xdd, 0xbf, 0x11, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/text.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/text.pb.go
new file mode 100644
index 00000000..50cabbc8
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/text.pb.go
@@ -0,0 +1,120 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/text.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Dataset metadata for classification.
+type TextClassificationDatasetMetadata struct {
+	// Required.
+	// Type of the classification problem.
+	ClassificationType   ClassificationType `protobuf:"varint,1,opt,name=classification_type,json=classificationType,proto3,enum=google.cloud.automl.v1beta1.ClassificationType" json:"classification_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *TextClassificationDatasetMetadata) Reset()         { *m = TextClassificationDatasetMetadata{} }
+func (m *TextClassificationDatasetMetadata) String() string { return proto.CompactTextString(m) }
+func (*TextClassificationDatasetMetadata) ProtoMessage()    {}
+func (*TextClassificationDatasetMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_1fb9d74955be1951, []int{0}
+}
+func (m *TextClassificationDatasetMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextClassificationDatasetMetadata.Unmarshal(m, b)
+}
+func (m *TextClassificationDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextClassificationDatasetMetadata.Marshal(b, m, deterministic)
+}
+func (dst *TextClassificationDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextClassificationDatasetMetadata.Merge(dst, src)
+}
+func (m *TextClassificationDatasetMetadata) XXX_Size() int {
+	return xxx_messageInfo_TextClassificationDatasetMetadata.Size(m)
+}
+func (m *TextClassificationDatasetMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextClassificationDatasetMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextClassificationDatasetMetadata proto.InternalMessageInfo
+
+func (m *TextClassificationDatasetMetadata) GetClassificationType() ClassificationType {
+	if m != nil {
+		return m.ClassificationType
+	}
+	return ClassificationType_CLASSIFICATION_TYPE_UNSPECIFIED
+}
+
+// Model metadata that is specific to text classification.
+type TextClassificationModelMetadata struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextClassificationModelMetadata) Reset()         { *m = TextClassificationModelMetadata{} }
+func (m *TextClassificationModelMetadata) String() string { return proto.CompactTextString(m) }
+func (*TextClassificationModelMetadata) ProtoMessage()    {}
+func (*TextClassificationModelMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_1fb9d74955be1951, []int{1}
+}
+func (m *TextClassificationModelMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextClassificationModelMetadata.Unmarshal(m, b)
+}
+func (m *TextClassificationModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextClassificationModelMetadata.Marshal(b, m, deterministic)
+}
+func (dst *TextClassificationModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextClassificationModelMetadata.Merge(dst, src)
+}
+func (m *TextClassificationModelMetadata) XXX_Size() int {
+	return xxx_messageInfo_TextClassificationModelMetadata.Size(m)
+}
+func (m *TextClassificationModelMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextClassificationModelMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextClassificationModelMetadata proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*TextClassificationDatasetMetadata)(nil), "google.cloud.automl.v1beta1.TextClassificationDatasetMetadata")
+	proto.RegisterType((*TextClassificationModelMetadata)(nil), "google.cloud.automl.v1beta1.TextClassificationModelMetadata")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/text.proto", fileDescriptor_text_1fb9d74955be1951)
+}
+
+var fileDescriptor_text_1fb9d74955be1951 = []byte{
+	// 240 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x31, 0x4f, 0x03, 0x31,
+	0x0c, 0x85, 0x75, 0x0b, 0x12, 0x19, 0x18, 0x8e, 0x05, 0x15, 0xa4, 0xd2, 0x0e, 0x88, 0x29, 0xa6,
+	0x30, 0x32, 0x51, 0x58, 0x2b, 0x55, 0xa8, 0x13, 0x0b, 0xb8, 0x39, 0x13, 0x45, 0x4a, 0xe3, 0xd0,
+	0xb8, 0xa8, 0xfd, 0x01, 0xfc, 0x6f, 0xd4, 0xe4, 0x18, 0x4e, 0x87, 0x6e, 0x4c, 0xfc, 0xbd, 0xe7,
+	0xf7, 0xac, 0x6e, 0x2c, 0xb3, 0xf5, 0x04, 0xc6, 0xf3, 0xae, 0x01, 0xdc, 0x09, 0x6f, 0x3c, 0x7c,
+	0xcf, 0xd6, 0x24, 0x38, 0x03, 0xa1, 0xbd, 0xe8, 0xb8, 0x65, 0xe1, 0xfa, 0xb2, 0x70, 0x3a, 0x73,
+	0xba, 0x70, 0xba, 0xe5, 0x46, 0x57, 0xad, 0x09, 0x46, 0x07, 0x18, 0x02, 0x0b, 0x8a, 0xe3, 0x90,
+	0x8a, 0x74, 0x74, 0x37, 0xb4, 0xc2, 0x78, 0x4c, 0xc9, 0x7d, 0x3a, 0x93, 0x25, 0x45, 0x31, 0xfd,
+	0xa9, 0xd4, 0x64, 0x45, 0x7b, 0x79, 0xee, 0x0c, 0x5f, 0x50, 0x30, 0x91, 0x2c, 0x48, 0xb0, 0x41,
+	0xc1, 0xfa, 0x43, 0x9d, 0x77, 0xd5, 0xef, 0x72, 0x88, 0x74, 0x51, 0x5d, 0x57, 0xb7, 0x67, 0xf7,
+	0xa0, 0x07, 0x02, 0xeb, 0xae, 0xf1, 0xea, 0x10, 0xe9, 0xb5, 0x36, 0xbd, 0xbf, 0xe9, 0x44, 0x8d,
+	0xfb, 0x31, 0x16, 0xdc, 0x90, 0xff, 0x0b, 0x31, 0xff, 0x52, 0x63, 0xc3, 0x9b, 0xa1, 0x65, 0xf3,
+	0xd3, 0xa3, 0xc7, 0xf2, 0x58, 0x6c, 0x59, 0xbd, 0x3d, 0xb5, 0xa4, 0x65, 0x8f, 0xc1, 0x6a, 0xde,
+	0x5a, 0xb0, 0x14, 0x72, 0x6d, 0x28, 0x23, 0x8c, 0x2e, 0xfd, 0x7b, 0xab, 0xc7, 0xf2, 0x5c, 0x9f,
+	0x64, 0xfa, 0xe1, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x8d, 0x0f, 0x20, 0xbb, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/translation.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/translation.pb.go
new file mode 100644
index 00000000..0f4ec903
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/automl/v1beta1/translation.pb.go
@@ -0,0 +1,260 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/automl/v1beta1/translation.proto
+
+package automl // import "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Dataset metadata that is specific to translation.
+type TranslationDatasetMetadata struct {
+	// Required. The BCP-47 language code of the source language.
+	SourceLanguageCode string `protobuf:"bytes,1,opt,name=source_language_code,json=sourceLanguageCode,proto3" json:"source_language_code,omitempty"`
+	// Required. The BCP-47 language code of the target language.
+	TargetLanguageCode   string   `protobuf:"bytes,2,opt,name=target_language_code,json=targetLanguageCode,proto3" json:"target_language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TranslationDatasetMetadata) Reset()         { *m = TranslationDatasetMetadata{} }
+func (m *TranslationDatasetMetadata) String() string { return proto.CompactTextString(m) }
+func (*TranslationDatasetMetadata) ProtoMessage()    {}
+func (*TranslationDatasetMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_translation_23667d09236b8210, []int{0}
+}
+func (m *TranslationDatasetMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TranslationDatasetMetadata.Unmarshal(m, b)
+}
+func (m *TranslationDatasetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TranslationDatasetMetadata.Marshal(b, m, deterministic)
+}
+func (dst *TranslationDatasetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslationDatasetMetadata.Merge(dst, src)
+}
+func (m *TranslationDatasetMetadata) XXX_Size() int {
+	return xxx_messageInfo_TranslationDatasetMetadata.Size(m)
+}
+func (m *TranslationDatasetMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_TranslationDatasetMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TranslationDatasetMetadata proto.InternalMessageInfo
+
+func (m *TranslationDatasetMetadata) GetSourceLanguageCode() string {
+	if m != nil {
+		return m.SourceLanguageCode
+	}
+	return ""
+}
+
+func (m *TranslationDatasetMetadata) GetTargetLanguageCode() string {
+	if m != nil {
+		return m.TargetLanguageCode
+	}
+	return ""
+}
+
+// Evaluation metrics for the dataset.
+type TranslationEvaluationMetrics struct {
+	// Output only. BLEU score.
+	BleuScore float64 `protobuf:"fixed64,1,opt,name=bleu_score,json=bleuScore,proto3" json:"bleu_score,omitempty"`
+	// Output only. BLEU score for base model.
+	BaseBleuScore        float64  `protobuf:"fixed64,2,opt,name=base_bleu_score,json=baseBleuScore,proto3" json:"base_bleu_score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TranslationEvaluationMetrics) Reset()         { *m = TranslationEvaluationMetrics{} }
+func (m *TranslationEvaluationMetrics) String() string { return proto.CompactTextString(m) }
+func (*TranslationEvaluationMetrics) ProtoMessage()    {}
+func (*TranslationEvaluationMetrics) Descriptor() ([]byte, []int) {
+	return fileDescriptor_translation_23667d09236b8210, []int{1}
+}
+func (m *TranslationEvaluationMetrics) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TranslationEvaluationMetrics.Unmarshal(m, b)
+}
+func (m *TranslationEvaluationMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TranslationEvaluationMetrics.Marshal(b, m, deterministic)
+}
+func (dst *TranslationEvaluationMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslationEvaluationMetrics.Merge(dst, src)
+}
+func (m *TranslationEvaluationMetrics) XXX_Size() int {
+	return xxx_messageInfo_TranslationEvaluationMetrics.Size(m)
+}
+func (m *TranslationEvaluationMetrics) XXX_DiscardUnknown() {
+	xxx_messageInfo_TranslationEvaluationMetrics.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TranslationEvaluationMetrics proto.InternalMessageInfo
+
+func (m *TranslationEvaluationMetrics) GetBleuScore() float64 {
+	if m != nil {
+		return m.BleuScore
+	}
+	return 0
+}
+
+func (m *TranslationEvaluationMetrics) GetBaseBleuScore() float64 {
+	if m != nil {
+		return m.BaseBleuScore
+	}
+	return 0
+}
+
+// Model metadata that is specific to translation.
+type TranslationModelMetadata struct {
+	// The resource name of the model to use as a baseline to train the custom
+	// model. If unset, we use the default base model provided by Google
+	// Translate. Format:
+	// `projects/{project_id}/locations/{location_id}/models/{model_id}`
+	BaseModel string `protobuf:"bytes,1,opt,name=base_model,json=baseModel,proto3" json:"base_model,omitempty"`
+	// Output only. Inferred from the dataset.
+	// The source languge (The BCP-47 language code) that is used for training.
+	SourceLanguageCode string `protobuf:"bytes,2,opt,name=source_language_code,json=sourceLanguageCode,proto3" json:"source_language_code,omitempty"`
+	// Output only. The target languge (The BCP-47 language code) that is used for
+	// training.
+	TargetLanguageCode   string   `protobuf:"bytes,3,opt,name=target_language_code,json=targetLanguageCode,proto3" json:"target_language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TranslationModelMetadata) Reset()         { *m = TranslationModelMetadata{} }
+func (m *TranslationModelMetadata) String() string { return proto.CompactTextString(m) }
+func (*TranslationModelMetadata) ProtoMessage()    {}
+func (*TranslationModelMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_translation_23667d09236b8210, []int{2}
+}
+func (m *TranslationModelMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TranslationModelMetadata.Unmarshal(m, b)
+}
+func (m *TranslationModelMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TranslationModelMetadata.Marshal(b, m, deterministic)
+}
+func (dst *TranslationModelMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslationModelMetadata.Merge(dst, src)
+}
+func (m *TranslationModelMetadata) XXX_Size() int {
+	return xxx_messageInfo_TranslationModelMetadata.Size(m)
+}
+func (m *TranslationModelMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_TranslationModelMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TranslationModelMetadata proto.InternalMessageInfo
+
+func (m *TranslationModelMetadata) GetBaseModel() string {
+	if m != nil {
+		return m.BaseModel
+	}
+	return ""
+}
+
+func (m *TranslationModelMetadata) GetSourceLanguageCode() string {
+	if m != nil {
+		return m.SourceLanguageCode
+	}
+	return ""
+}
+
+func (m *TranslationModelMetadata) GetTargetLanguageCode() string {
+	if m != nil {
+		return m.TargetLanguageCode
+	}
+	return ""
+}
+
+// Annotation details specific to translation.
+type TranslationAnnotation struct {
+	// Output only . The translated content.
+	TranslatedContent    *TextSnippet `protobuf:"bytes,1,opt,name=translated_content,json=translatedContent,proto3" json:"translated_content,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *TranslationAnnotation) Reset()         { *m = TranslationAnnotation{} }
+func (m *TranslationAnnotation) String() string { return proto.CompactTextString(m) }
+func (*TranslationAnnotation) ProtoMessage()    {}
+func (*TranslationAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_translation_23667d09236b8210, []int{3}
+}
+func (m *TranslationAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TranslationAnnotation.Unmarshal(m, b)
+}
+func (m *TranslationAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TranslationAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *TranslationAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TranslationAnnotation.Merge(dst, src)
+}
+func (m *TranslationAnnotation) XXX_Size() int {
+	return xxx_messageInfo_TranslationAnnotation.Size(m)
+}
+func (m *TranslationAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_TranslationAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TranslationAnnotation proto.InternalMessageInfo
+
+func (m *TranslationAnnotation) GetTranslatedContent() *TextSnippet {
+	if m != nil {
+		return m.TranslatedContent
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*TranslationDatasetMetadata)(nil), "google.cloud.automl.v1beta1.TranslationDatasetMetadata")
+	proto.RegisterType((*TranslationEvaluationMetrics)(nil), "google.cloud.automl.v1beta1.TranslationEvaluationMetrics")
+	proto.RegisterType((*TranslationModelMetadata)(nil), "google.cloud.automl.v1beta1.TranslationModelMetadata")
+	proto.RegisterType((*TranslationAnnotation)(nil), "google.cloud.automl.v1beta1.TranslationAnnotation")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/automl/v1beta1/translation.proto", fileDescriptor_translation_23667d09236b8210)
+}
+
+var fileDescriptor_translation_23667d09236b8210 = []byte{
+	// 377 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0x6a, 0xdb, 0x40,
+	0x10, 0xc6, 0x91, 0x0b, 0x05, 0x6f, 0x29, 0x6d, 0x45, 0x0b, 0xc6, 0x75, 0x69, 0xf1, 0xa1, 0xf8,
+	0xd0, 0x4a, 0x75, 0x73, 0xcc, 0xc9, 0x76, 0x72, 0x8b, 0xc1, 0xd8, 0x86, 0x40, 0x2e, 0x62, 0x24,
+	0x0d, 0x8b, 0x60, 0xb5, 0x23, 0xb4, 0x23, 0xe3, 0x63, 0x5e, 0x24, 0xef, 0x1a, 0x76, 0x57, 0xb6,
+	0x45, 0x88, 0x0d, 0xb9, 0x49, 0x33, 0xbf, 0x6f, 0xfe, 0xed, 0x27, 0xfe, 0x4a, 0x22, 0xa9, 0x30,
+	0xce, 0x14, 0x35, 0x79, 0x0c, 0x0d, 0x53, 0xa9, 0xe2, 0xdd, 0x34, 0x45, 0x86, 0x69, 0xcc, 0x35,
+	0x68, 0xa3, 0x80, 0x0b, 0xd2, 0x51, 0x55, 0x13, 0x53, 0xf8, 0xdd, 0xe3, 0x91, 0xc3, 0x23, 0x8f,
+	0x47, 0x2d, 0x3e, 0x1c, 0xb5, 0xb5, 0xa0, 0x2a, 0x62, 0xd0, 0x9a, 0xd8, 0x29, 0x8d, 0x97, 0x0e,
+	0xff, 0x5c, 0xea, 0x94, 0x03, 0x43, 0x52, 0x30, 0x96, 0x2d, 0x3d, 0x7e, 0x0c, 0xc4, 0x70, 0x7b,
+	0x6a, 0x7f, 0x03, 0x0c, 0x06, 0x79, 0x89, 0x0c, 0x16, 0x0d, 0xff, 0x89, 0xaf, 0x86, 0x9a, 0x3a,
+	0xc3, 0x44, 0x81, 0x96, 0x0d, 0x48, 0x4c, 0x32, 0xca, 0x71, 0x10, 0xfc, 0x0a, 0x26, 0xfd, 0x75,
+	0xe8, 0x73, 0x77, 0x6d, 0x6a, 0x41, 0x39, 0x5a, 0x05, 0x43, 0x2d, 0x91, 0x5f, 0x28, 0x7a, 0x5e,
+	0xe1, 0x73, 0x5d, 0xc5, 0x18, 0xc5, 0xa8, 0x33, 0xc1, 0xed, 0x0e, 0x54, 0xe3, 0xbe, 0x96, 0xc8,
+	0x75, 0x91, 0x99, 0xf0, 0x87, 0x10, 0xa9, 0xc2, 0x26, 0x31, 0x19, 0xd5, 0xbe, 0x73, 0xb0, 0xee,
+	0xdb, 0xc8, 0xc6, 0x06, 0xc2, 0xdf, 0xe2, 0x53, 0x0a, 0x06, 0x93, 0x0e, 0xd3, 0x73, 0xcc, 0x47,
+	0x1b, 0x9e, 0x1f, 0xb8, 0xf1, 0x53, 0x20, 0x06, 0x9d, 0x3e, 0x4b, 0xca, 0x51, 0x1d, 0xf7, 0xb4,
+	0x3d, 0x6c, 0x91, 0xd2, 0x46, 0xdb, 0xed, 0xfa, 0x36, 0xe2, 0xb0, 0xb3, 0x67, 0xe8, 0xbd, 0xf9,
+	0x0c, 0xef, 0xce, 0x9e, 0xa1, 0x12, 0xdf, 0x3a, 0xe3, 0xcd, 0x8e, 0xef, 0x1a, 0xde, 0x8b, 0xf0,
+	0x60, 0x10, 0xcc, 0x93, 0x8c, 0x34, 0xa3, 0x66, 0x37, 0xe3, 0x87, 0xff, 0x93, 0xe8, 0x82, 0x51,
+	0xa2, 0x2d, 0xee, 0x79, 0xa3, 0x8b, 0xaa, 0x42, 0x5e, 0x7f, 0x39, 0xd5, 0x58, 0xf8, 0x12, 0xf3,
+	0xbd, 0xf8, 0x99, 0x51, 0x79, 0xa9, 0xc2, 0xfc, 0x73, 0x67, 0xa4, 0x95, 0x35, 0xcc, 0x2a, 0x78,
+	0x98, 0xb5, 0x02, 0x49, 0x76, 0xb5, 0x88, 0x6a, 0x19, 0x4b, 0xd4, 0xce, 0x4e, 0xb1, 0x4f, 0x41,
+	0x55, 0x98, 0x57, 0xfd, 0x77, 0xed, 0x7f, 0xd3, 0xf7, 0x8e, 0xbe, 0x7a, 0x0e, 0x00, 0x00, 0xff,
+	0xff, 0xfb, 0xc7, 0xb3, 0x37, 0x16, 0x03, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
index 2afc5724..cbbded26 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1/datatransfer.pb.go
@@ -1,50 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
-/*
-Package datatransfer is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/bigquery/datatransfer/v1/datatransfer.proto
-	google/cloud/bigquery/datatransfer/v1/transfer.proto
-
-It has these top-level messages:
-	DataSourceParameter
-	DataSource
-	GetDataSourceRequest
-	ListDataSourcesRequest
-	ListDataSourcesResponse
-	CreateTransferConfigRequest
-	UpdateTransferConfigRequest
-	GetTransferConfigRequest
-	DeleteTransferConfigRequest
-	GetTransferRunRequest
-	DeleteTransferRunRequest
-	ListTransferConfigsRequest
-	ListTransferConfigsResponse
-	ListTransferRunsRequest
-	ListTransferRunsResponse
-	ListTransferLogsRequest
-	ListTransferLogsResponse
-	CheckValidCredsRequest
-	CheckValidCredsResponse
-	ScheduleTransferRunsRequest
-	ScheduleTransferRunsResponse
-	TransferConfig
-	TransferRun
-	TransferMessage
-*/
-package datatransfer
+package datatransfer // import "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf6 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-import google_protobuf7 "github.com/golang/protobuf/ptypes/wrappers"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -105,7 +72,9 @@ var DataSourceParameter_Type_value = map[string]int32{
 func (x DataSourceParameter_Type) String() string {
 	return proto.EnumName(DataSourceParameter_Type_name, int32(x))
 }
-func (DataSourceParameter_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (DataSourceParameter_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{0, 0}
+}
 
 // The type of authorization needed for this data source.
 type DataSource_AuthorizationType int32
@@ -136,7 +105,7 @@ func (x DataSource_AuthorizationType) String() string {
 	return proto.EnumName(DataSource_AuthorizationType_name, int32(x))
 }
 func (DataSource_AuthorizationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 0}
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{1, 0}
 }
 
 // Represents how the data source supports data auto refresh.
@@ -170,7 +139,7 @@ func (x DataSource_DataRefreshType) String() string {
 	return proto.EnumName(DataSource_DataRefreshType_name, int32(x))
 }
 func (DataSource_DataRefreshType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 1}
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{1, 1}
 }
 
 // Represents which runs should be pulled.
@@ -196,7 +165,7 @@ func (x ListTransferRunsRequest_RunAttempt) String() string {
 	return proto.EnumName(ListTransferRunsRequest_RunAttempt_name, int32(x))
 }
 func (ListTransferRunsRequest_RunAttempt) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{13, 0}
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{13, 0}
 }
 
 // Represents a data source parameter with validation rules, so that
@@ -207,43 +176,65 @@ func (ListTransferRunsRequest_RunAttempt) EnumDescriptor() ([]byte, []int) {
 // or custom data source specific forms.
 type DataSourceParameter struct {
 	// Parameter identifier.
-	ParamId string `protobuf:"bytes,1,opt,name=param_id,json=paramId" json:"param_id,omitempty"`
+	ParamId string `protobuf:"bytes,1,opt,name=param_id,json=paramId,proto3" json:"param_id,omitempty"`
 	// Parameter display name in the user interface.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Parameter description.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Parameter type.
-	Type DataSourceParameter_Type `protobuf:"varint,4,opt,name=type,enum=google.cloud.bigquery.datatransfer.v1.DataSourceParameter_Type" json:"type,omitempty"`
+	Type DataSourceParameter_Type `protobuf:"varint,4,opt,name=type,proto3,enum=google.cloud.bigquery.datatransfer.v1.DataSourceParameter_Type" json:"type,omitempty"`
 	// Is parameter required.
-	Required bool `protobuf:"varint,5,opt,name=required" json:"required,omitempty"`
+	Required bool `protobuf:"varint,5,opt,name=required,proto3" json:"required,omitempty"`
 	// Can parameter have multiple values.
-	Repeated bool `protobuf:"varint,6,opt,name=repeated" json:"repeated,omitempty"`
+	Repeated bool `protobuf:"varint,6,opt,name=repeated,proto3" json:"repeated,omitempty"`
 	// Regular expression which can be used for parameter validation.
-	ValidationRegex string `protobuf:"bytes,7,opt,name=validation_regex,json=validationRegex" json:"validation_regex,omitempty"`
+	ValidationRegex string `protobuf:"bytes,7,opt,name=validation_regex,json=validationRegex,proto3" json:"validation_regex,omitempty"`
 	// All possible values for the parameter.
-	AllowedValues []string `protobuf:"bytes,8,rep,name=allowed_values,json=allowedValues" json:"allowed_values,omitempty"`
+	AllowedValues []string `protobuf:"bytes,8,rep,name=allowed_values,json=allowedValues,proto3" json:"allowed_values,omitempty"`
 	// For integer and double values specifies minimum allowed value.
-	MinValue *google_protobuf7.DoubleValue `protobuf:"bytes,9,opt,name=min_value,json=minValue" json:"min_value,omitempty"`
+	MinValue *wrappers.DoubleValue `protobuf:"bytes,9,opt,name=min_value,json=minValue,proto3" json:"min_value,omitempty"`
 	// For integer and double values specifies maxminum allowed value.
-	MaxValue *google_protobuf7.DoubleValue `protobuf:"bytes,10,opt,name=max_value,json=maxValue" json:"max_value,omitempty"`
+	MaxValue *wrappers.DoubleValue `protobuf:"bytes,10,opt,name=max_value,json=maxValue,proto3" json:"max_value,omitempty"`
 	// When parameter is a record, describes child fields.
-	Fields []*DataSourceParameter `protobuf:"bytes,11,rep,name=fields" json:"fields,omitempty"`
+	Fields []*DataSourceParameter `protobuf:"bytes,11,rep,name=fields,proto3" json:"fields,omitempty"`
 	// Description of the requirements for this field, in case the user input does
 	// not fulfill the regex pattern or min/max values.
-	ValidationDescription string `protobuf:"bytes,12,opt,name=validation_description,json=validationDescription" json:"validation_description,omitempty"`
+	ValidationDescription string `protobuf:"bytes,12,opt,name=validation_description,json=validationDescription,proto3" json:"validation_description,omitempty"`
 	// URL to a help document to further explain the naming requirements.
-	ValidationHelpUrl string `protobuf:"bytes,13,opt,name=validation_help_url,json=validationHelpUrl" json:"validation_help_url,omitempty"`
+	ValidationHelpUrl string `protobuf:"bytes,13,opt,name=validation_help_url,json=validationHelpUrl,proto3" json:"validation_help_url,omitempty"`
 	// Cannot be changed after initial creation.
-	Immutable bool `protobuf:"varint,14,opt,name=immutable" json:"immutable,omitempty"`
+	Immutable bool `protobuf:"varint,14,opt,name=immutable,proto3" json:"immutable,omitempty"`
 	// If set to true, schema should be taken from the parent with the same
 	// parameter_id. Only applicable when parameter type is RECORD.
-	Recurse bool `protobuf:"varint,15,opt,name=recurse" json:"recurse,omitempty"`
+	Recurse              bool     `protobuf:"varint,15,opt,name=recurse,proto3" json:"recurse,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DataSourceParameter) Reset()         { *m = DataSourceParameter{} }
+func (m *DataSourceParameter) String() string { return proto.CompactTextString(m) }
+func (*DataSourceParameter) ProtoMessage()    {}
+func (*DataSourceParameter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{0}
+}
+func (m *DataSourceParameter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DataSourceParameter.Unmarshal(m, b)
+}
+func (m *DataSourceParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DataSourceParameter.Marshal(b, m, deterministic)
+}
+func (dst *DataSourceParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DataSourceParameter.Merge(dst, src)
+}
+func (m *DataSourceParameter) XXX_Size() int {
+	return xxx_messageInfo_DataSourceParameter.Size(m)
+}
+func (m *DataSourceParameter) XXX_DiscardUnknown() {
+	xxx_messageInfo_DataSourceParameter.DiscardUnknown(m)
 }
 
-func (m *DataSourceParameter) Reset()                    { *m = DataSourceParameter{} }
-func (m *DataSourceParameter) String() string            { return proto.CompactTextString(m) }
-func (*DataSourceParameter) ProtoMessage()               {}
-func (*DataSourceParameter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_DataSourceParameter proto.InternalMessageInfo
 
 func (m *DataSourceParameter) GetParamId() string {
 	if m != nil {
@@ -301,14 +292,14 @@ func (m *DataSourceParameter) GetAllowedValues() []string {
 	return nil
 }
 
-func (m *DataSourceParameter) GetMinValue() *google_protobuf7.DoubleValue {
+func (m *DataSourceParameter) GetMinValue() *wrappers.DoubleValue {
 	if m != nil {
 		return m.MinValue
 	}
 	return nil
 }
 
-func (m *DataSourceParameter) GetMaxValue() *google_protobuf7.DoubleValue {
+func (m *DataSourceParameter) GetMaxValue() *wrappers.DoubleValue {
 	if m != nil {
 		return m.MaxValue
 	}
@@ -353,67 +344,87 @@ func (m *DataSourceParameter) GetRecurse() bool {
 // Represents data source metadata. Metadata is sufficient to
 // render UI and request proper OAuth tokens.
 type DataSource struct {
-	// Data source resource name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// Output only. Data source resource name.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Data source id.
-	DataSourceId string `protobuf:"bytes,2,opt,name=data_source_id,json=dataSourceId" json:"data_source_id,omitempty"`
+	DataSourceId string `protobuf:"bytes,2,opt,name=data_source_id,json=dataSourceId,proto3" json:"data_source_id,omitempty"`
 	// User friendly data source name.
-	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// User friendly data source description string.
-	Description string `protobuf:"bytes,4,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
 	// Data source client id which should be used to receive refresh token.
 	// When not supplied, no offline credentials are populated for data transfer.
-	ClientId string `protobuf:"bytes,5,opt,name=client_id,json=clientId" json:"client_id,omitempty"`
+	ClientId string `protobuf:"bytes,5,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// Api auth scopes for which refresh token needs to be obtained. Only valid
 	// when `client_id` is specified. Ignored otherwise. These are scopes needed
 	// by a data source to prepare data and ingest them into BigQuery,
 	// e.g., https://www.googleapis.com/auth/bigquery
-	Scopes []string `protobuf:"bytes,6,rep,name=scopes" json:"scopes,omitempty"`
-	// Transfer type. Currently supports only batch transfers,
-	// which are transfers that use the BigQuery batch APIs (load or
-	// query) to ingest the data.
-	TransferType TransferType `protobuf:"varint,7,opt,name=transfer_type,json=transferType,enum=google.cloud.bigquery.datatransfer.v1.TransferType" json:"transfer_type,omitempty"`
+	Scopes []string `protobuf:"bytes,6,rep,name=scopes,proto3" json:"scopes,omitempty"`
+	// Deprecated. This field has no effect.
+	TransferType TransferType `protobuf:"varint,7,opt,name=transfer_type,json=transferType,proto3,enum=google.cloud.bigquery.datatransfer.v1.TransferType" json:"transfer_type,omitempty"`
 	// Indicates whether the data source supports multiple transfers
 	// to different BigQuery targets.
-	SupportsMultipleTransfers bool `protobuf:"varint,8,opt,name=supports_multiple_transfers,json=supportsMultipleTransfers" json:"supports_multiple_transfers,omitempty"`
+	SupportsMultipleTransfers bool `protobuf:"varint,8,opt,name=supports_multiple_transfers,json=supportsMultipleTransfers,proto3" json:"supports_multiple_transfers,omitempty"`
 	// The number of seconds to wait for an update from the data source
 	// before BigQuery marks the transfer as failed.
-	UpdateDeadlineSeconds int32 `protobuf:"varint,9,opt,name=update_deadline_seconds,json=updateDeadlineSeconds" json:"update_deadline_seconds,omitempty"`
+	UpdateDeadlineSeconds int32 `protobuf:"varint,9,opt,name=update_deadline_seconds,json=updateDeadlineSeconds,proto3" json:"update_deadline_seconds,omitempty"`
 	// Default data transfer schedule.
 	// Examples of valid schedules include:
 	// `1st,3rd monday of month 15:30`,
 	// `every wed,fri of jan,jun 13:15`, and
 	// `first sunday of quarter 00:00`.
-	DefaultSchedule string `protobuf:"bytes,10,opt,name=default_schedule,json=defaultSchedule" json:"default_schedule,omitempty"`
+	DefaultSchedule string `protobuf:"bytes,10,opt,name=default_schedule,json=defaultSchedule,proto3" json:"default_schedule,omitempty"`
 	// Specifies whether the data source supports a user defined schedule, or
 	// operates on the default schedule.
 	// When set to `true`, user can override default schedule.
-	SupportsCustomSchedule bool `protobuf:"varint,11,opt,name=supports_custom_schedule,json=supportsCustomSchedule" json:"supports_custom_schedule,omitempty"`
+	SupportsCustomSchedule bool `protobuf:"varint,11,opt,name=supports_custom_schedule,json=supportsCustomSchedule,proto3" json:"supports_custom_schedule,omitempty"`
 	// Data source parameters.
-	Parameters []*DataSourceParameter `protobuf:"bytes,12,rep,name=parameters" json:"parameters,omitempty"`
+	Parameters []*DataSourceParameter `protobuf:"bytes,12,rep,name=parameters,proto3" json:"parameters,omitempty"`
 	// Url for the help document for this data source.
-	HelpUrl string `protobuf:"bytes,13,opt,name=help_url,json=helpUrl" json:"help_url,omitempty"`
+	HelpUrl string `protobuf:"bytes,13,opt,name=help_url,json=helpUrl,proto3" json:"help_url,omitempty"`
 	// Indicates the type of authorization.
-	AuthorizationType DataSource_AuthorizationType `protobuf:"varint,14,opt,name=authorization_type,json=authorizationType,enum=google.cloud.bigquery.datatransfer.v1.DataSource_AuthorizationType" json:"authorization_type,omitempty"`
+	AuthorizationType DataSource_AuthorizationType `protobuf:"varint,14,opt,name=authorization_type,json=authorizationType,proto3,enum=google.cloud.bigquery.datatransfer.v1.DataSource_AuthorizationType" json:"authorization_type,omitempty"`
 	// Specifies whether the data source supports automatic data refresh for the
 	// past few days, and how it's supported.
 	// For some data sources, data might not be complete until a few days later,
 	// so it's useful to refresh data automatically.
-	DataRefreshType DataSource_DataRefreshType `protobuf:"varint,15,opt,name=data_refresh_type,json=dataRefreshType,enum=google.cloud.bigquery.datatransfer.v1.DataSource_DataRefreshType" json:"data_refresh_type,omitempty"`
+	DataRefreshType DataSource_DataRefreshType `protobuf:"varint,15,opt,name=data_refresh_type,json=dataRefreshType,proto3,enum=google.cloud.bigquery.datatransfer.v1.DataSource_DataRefreshType" json:"data_refresh_type,omitempty"`
 	// Default data refresh window on days.
 	// Only meaningful when `data_refresh_type` = `SLIDING_WINDOW`.
-	DefaultDataRefreshWindowDays int32 `protobuf:"varint,16,opt,name=default_data_refresh_window_days,json=defaultDataRefreshWindowDays" json:"default_data_refresh_window_days,omitempty"`
+	DefaultDataRefreshWindowDays int32 `protobuf:"varint,16,opt,name=default_data_refresh_window_days,json=defaultDataRefreshWindowDays,proto3" json:"default_data_refresh_window_days,omitempty"`
 	// Disables backfilling and manual run scheduling
 	// for the data source.
-	ManualRunsDisabled bool `protobuf:"varint,17,opt,name=manual_runs_disabled,json=manualRunsDisabled" json:"manual_runs_disabled,omitempty"`
+	ManualRunsDisabled bool `protobuf:"varint,17,opt,name=manual_runs_disabled,json=manualRunsDisabled,proto3" json:"manual_runs_disabled,omitempty"`
 	// The minimum interval for scheduler to schedule runs.
-	MinimumScheduleInterval *google_protobuf4.Duration `protobuf:"bytes,18,opt,name=minimum_schedule_interval,json=minimumScheduleInterval" json:"minimum_schedule_interval,omitempty"`
+	MinimumScheduleInterval *duration.Duration `protobuf:"bytes,18,opt,name=minimum_schedule_interval,json=minimumScheduleInterval,proto3" json:"minimum_schedule_interval,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}           `json:"-"`
+	XXX_unrecognized        []byte             `json:"-"`
+	XXX_sizecache           int32              `json:"-"`
 }
 
-func (m *DataSource) Reset()                    { *m = DataSource{} }
-func (m *DataSource) String() string            { return proto.CompactTextString(m) }
-func (*DataSource) ProtoMessage()               {}
-func (*DataSource) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *DataSource) Reset()         { *m = DataSource{} }
+func (m *DataSource) String() string { return proto.CompactTextString(m) }
+func (*DataSource) ProtoMessage()    {}
+func (*DataSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{1}
+}
+func (m *DataSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DataSource.Unmarshal(m, b)
+}
+func (m *DataSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DataSource.Marshal(b, m, deterministic)
+}
+func (dst *DataSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DataSource.Merge(dst, src)
+}
+func (m *DataSource) XXX_Size() int {
+	return xxx_messageInfo_DataSource.Size(m)
+}
+func (m *DataSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_DataSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DataSource proto.InternalMessageInfo
 
 func (m *DataSource) GetName() string {
 	if m != nil {
@@ -534,7 +545,7 @@ func (m *DataSource) GetManualRunsDisabled() bool {
 	return false
 }
 
-func (m *DataSource) GetMinimumScheduleInterval() *google_protobuf4.Duration {
+func (m *DataSource) GetMinimumScheduleInterval() *duration.Duration {
 	if m != nil {
 		return m.MinimumScheduleInterval
 	}
@@ -545,13 +556,35 @@ func (m *DataSource) GetMinimumScheduleInterval() *google_protobuf4.Duration {
 type GetDataSourceRequest struct {
 	// The field will contain name of the resource requested, for example:
 	// `projects/{project_id}/dataSources/{data_source_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetDataSourceRequest) Reset()         { *m = GetDataSourceRequest{} }
+func (m *GetDataSourceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDataSourceRequest) ProtoMessage()    {}
+func (*GetDataSourceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{2}
+}
+func (m *GetDataSourceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDataSourceRequest.Unmarshal(m, b)
+}
+func (m *GetDataSourceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDataSourceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDataSourceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDataSourceRequest.Merge(dst, src)
+}
+func (m *GetDataSourceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDataSourceRequest.Size(m)
+}
+func (m *GetDataSourceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDataSourceRequest.DiscardUnknown(m)
 }
 
-func (m *GetDataSourceRequest) Reset()                    { *m = GetDataSourceRequest{} }
-func (m *GetDataSourceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDataSourceRequest) ProtoMessage()               {}
-func (*GetDataSourceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_GetDataSourceRequest proto.InternalMessageInfo
 
 func (m *GetDataSourceRequest) GetName() string {
 	if m != nil {
@@ -564,21 +597,43 @@ func (m *GetDataSourceRequest) GetName() string {
 type ListDataSourcesRequest struct {
 	// The BigQuery project id for which data sources should be returned.
 	// Must be in the form: `projects/{project_id}`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Pagination token, which can be used to request a specific page
 	// of `ListDataSourcesRequest` list results. For multiple-page
 	// results, `ListDataSourcesResponse` outputs
 	// a `next_page` token, which can be used as the
 	// `page_token` value to request the next page of list results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Page size. The default page size is the maximum value of 1000 results.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDataSourcesRequest) Reset()         { *m = ListDataSourcesRequest{} }
+func (m *ListDataSourcesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDataSourcesRequest) ProtoMessage()    {}
+func (*ListDataSourcesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{3}
+}
+func (m *ListDataSourcesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDataSourcesRequest.Unmarshal(m, b)
+}
+func (m *ListDataSourcesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDataSourcesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDataSourcesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDataSourcesRequest.Merge(dst, src)
+}
+func (m *ListDataSourcesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDataSourcesRequest.Size(m)
+}
+func (m *ListDataSourcesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDataSourcesRequest.DiscardUnknown(m)
 }
 
-func (m *ListDataSourcesRequest) Reset()                    { *m = ListDataSourcesRequest{} }
-func (m *ListDataSourcesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDataSourcesRequest) ProtoMessage()               {}
-func (*ListDataSourcesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_ListDataSourcesRequest proto.InternalMessageInfo
 
 func (m *ListDataSourcesRequest) GetParent() string {
 	if m != nil {
@@ -604,18 +659,40 @@ func (m *ListDataSourcesRequest) GetPageSize() int32 {
 // Returns list of supported data sources and their metadata.
 type ListDataSourcesResponse struct {
 	// List of supported data sources and their transfer settings.
-	DataSources []*DataSource `protobuf:"bytes,1,rep,name=data_sources,json=dataSources" json:"data_sources,omitempty"`
+	DataSources []*DataSource `protobuf:"bytes,1,rep,name=data_sources,json=dataSources,proto3" json:"data_sources,omitempty"`
 	// Output only. The next-pagination token. For multiple-page list results,
 	// this token can be used as the
 	// `ListDataSourcesRequest.page_token`
 	// to request the next page of list results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDataSourcesResponse) Reset()                    { *m = ListDataSourcesResponse{} }
-func (m *ListDataSourcesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDataSourcesResponse) ProtoMessage()               {}
-func (*ListDataSourcesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ListDataSourcesResponse) Reset()         { *m = ListDataSourcesResponse{} }
+func (m *ListDataSourcesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDataSourcesResponse) ProtoMessage()    {}
+func (*ListDataSourcesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{4}
+}
+func (m *ListDataSourcesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDataSourcesResponse.Unmarshal(m, b)
+}
+func (m *ListDataSourcesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDataSourcesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDataSourcesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDataSourcesResponse.Merge(dst, src)
+}
+func (m *ListDataSourcesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDataSourcesResponse.Size(m)
+}
+func (m *ListDataSourcesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDataSourcesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDataSourcesResponse proto.InternalMessageInfo
 
 func (m *ListDataSourcesResponse) GetDataSources() []*DataSource {
 	if m != nil {
@@ -642,9 +719,9 @@ type CreateTransferConfigRequest struct {
 	// Must be in the format /projects/{project_id}/locations/{location_id}
 	// If specified location and location of the destination bigquery dataset
 	// do not match - the request will fail.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Data transfer configuration to create.
-	TransferConfig *TransferConfig `protobuf:"bytes,2,opt,name=transfer_config,json=transferConfig" json:"transfer_config,omitempty"`
+	TransferConfig *TransferConfig `protobuf:"bytes,2,opt,name=transfer_config,json=transferConfig,proto3" json:"transfer_config,omitempty"`
 	// Optional OAuth2 authorization code to use with this transfer configuration.
 	// This is required if new credentials are needed, as indicated by
 	// `CheckValidCreds`.
@@ -661,13 +738,35 @@ type CreateTransferConfigRequest struct {
 	//   urn:ietf:wg:oauth:2.0:oob means that authorization code should be
 	//   returned in the title bar of the browser, with the page text prompting
 	//   the user to copy the code and paste it in the application.
-	AuthorizationCode string `protobuf:"bytes,3,opt,name=authorization_code,json=authorizationCode" json:"authorization_code,omitempty"`
+	AuthorizationCode    string   `protobuf:"bytes,3,opt,name=authorization_code,json=authorizationCode,proto3" json:"authorization_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateTransferConfigRequest) Reset()                    { *m = CreateTransferConfigRequest{} }
-func (m *CreateTransferConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateTransferConfigRequest) ProtoMessage()               {}
-func (*CreateTransferConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *CreateTransferConfigRequest) Reset()         { *m = CreateTransferConfigRequest{} }
+func (m *CreateTransferConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateTransferConfigRequest) ProtoMessage()    {}
+func (*CreateTransferConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{5}
+}
+func (m *CreateTransferConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTransferConfigRequest.Unmarshal(m, b)
+}
+func (m *CreateTransferConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTransferConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateTransferConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTransferConfigRequest.Merge(dst, src)
+}
+func (m *CreateTransferConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateTransferConfigRequest.Size(m)
+}
+func (m *CreateTransferConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTransferConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateTransferConfigRequest proto.InternalMessageInfo
 
 func (m *CreateTransferConfigRequest) GetParent() string {
 	if m != nil {
@@ -694,7 +793,7 @@ func (m *CreateTransferConfigRequest) GetAuthorizationCode() string {
 // transfer configuration, an authorization code needs to be provided.
 type UpdateTransferConfigRequest struct {
 	// Data transfer configuration to create.
-	TransferConfig *TransferConfig `protobuf:"bytes,1,opt,name=transfer_config,json=transferConfig" json:"transfer_config,omitempty"`
+	TransferConfig *TransferConfig `protobuf:"bytes,1,opt,name=transfer_config,json=transferConfig,proto3" json:"transfer_config,omitempty"`
 	// Optional OAuth2 authorization code to use with this transfer configuration.
 	// If it is provided, the transfer configuration will be associated with the
 	// authorizing user.
@@ -711,15 +810,37 @@ type UpdateTransferConfigRequest struct {
 	//   urn:ietf:wg:oauth:2.0:oob means that authorization code should be
 	//   returned in the title bar of the browser, with the page text prompting
 	//   the user to copy the code and paste it in the application.
-	AuthorizationCode string `protobuf:"bytes,3,opt,name=authorization_code,json=authorizationCode" json:"authorization_code,omitempty"`
+	AuthorizationCode string `protobuf:"bytes,3,opt,name=authorization_code,json=authorizationCode,proto3" json:"authorization_code,omitempty"`
 	// Required list of fields to be updated in this request.
-	UpdateMask *google_protobuf6.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateTransferConfigRequest) Reset()                    { *m = UpdateTransferConfigRequest{} }
-func (m *UpdateTransferConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateTransferConfigRequest) ProtoMessage()               {}
-func (*UpdateTransferConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *UpdateTransferConfigRequest) Reset()         { *m = UpdateTransferConfigRequest{} }
+func (m *UpdateTransferConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateTransferConfigRequest) ProtoMessage()    {}
+func (*UpdateTransferConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{6}
+}
+func (m *UpdateTransferConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateTransferConfigRequest.Unmarshal(m, b)
+}
+func (m *UpdateTransferConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateTransferConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateTransferConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTransferConfigRequest.Merge(dst, src)
+}
+func (m *UpdateTransferConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateTransferConfigRequest.Size(m)
+}
+func (m *UpdateTransferConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateTransferConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateTransferConfigRequest proto.InternalMessageInfo
 
 func (m *UpdateTransferConfigRequest) GetTransferConfig() *TransferConfig {
 	if m != nil {
@@ -735,7 +856,7 @@ func (m *UpdateTransferConfigRequest) GetAuthorizationCode() string {
 	return ""
 }
 
-func (m *UpdateTransferConfigRequest) GetUpdateMask() *google_protobuf6.FieldMask {
+func (m *UpdateTransferConfigRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -746,13 +867,35 @@ func (m *UpdateTransferConfigRequest) GetUpdateMask() *google_protobuf6.FieldMas
 type GetTransferConfigRequest struct {
 	// The field will contain name of the resource requested, for example:
 	// `projects/{project_id}/transferConfigs/{config_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTransferConfigRequest) Reset()         { *m = GetTransferConfigRequest{} }
+func (m *GetTransferConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTransferConfigRequest) ProtoMessage()    {}
+func (*GetTransferConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{7}
+}
+func (m *GetTransferConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTransferConfigRequest.Unmarshal(m, b)
+}
+func (m *GetTransferConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTransferConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTransferConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTransferConfigRequest.Merge(dst, src)
+}
+func (m *GetTransferConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTransferConfigRequest.Size(m)
+}
+func (m *GetTransferConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTransferConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetTransferConfigRequest) Reset()                    { *m = GetTransferConfigRequest{} }
-func (m *GetTransferConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTransferConfigRequest) ProtoMessage()               {}
-func (*GetTransferConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_GetTransferConfigRequest proto.InternalMessageInfo
 
 func (m *GetTransferConfigRequest) GetName() string {
 	if m != nil {
@@ -766,13 +909,35 @@ func (m *GetTransferConfigRequest) GetName() string {
 type DeleteTransferConfigRequest struct {
 	// The field will contain name of the resource requested, for example:
 	// `projects/{project_id}/transferConfigs/{config_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteTransferConfigRequest) Reset()                    { *m = DeleteTransferConfigRequest{} }
-func (m *DeleteTransferConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteTransferConfigRequest) ProtoMessage()               {}
-func (*DeleteTransferConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *DeleteTransferConfigRequest) Reset()         { *m = DeleteTransferConfigRequest{} }
+func (m *DeleteTransferConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteTransferConfigRequest) ProtoMessage()    {}
+func (*DeleteTransferConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{8}
+}
+func (m *DeleteTransferConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteTransferConfigRequest.Unmarshal(m, b)
+}
+func (m *DeleteTransferConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteTransferConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteTransferConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTransferConfigRequest.Merge(dst, src)
+}
+func (m *DeleteTransferConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteTransferConfigRequest.Size(m)
+}
+func (m *DeleteTransferConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteTransferConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteTransferConfigRequest proto.InternalMessageInfo
 
 func (m *DeleteTransferConfigRequest) GetName() string {
 	if m != nil {
@@ -785,13 +950,35 @@ func (m *DeleteTransferConfigRequest) GetName() string {
 type GetTransferRunRequest struct {
 	// The field will contain name of the resource requested, for example:
 	// `projects/{project_id}/transferConfigs/{config_id}/runs/{run_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTransferRunRequest) Reset()         { *m = GetTransferRunRequest{} }
+func (m *GetTransferRunRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTransferRunRequest) ProtoMessage()    {}
+func (*GetTransferRunRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{9}
+}
+func (m *GetTransferRunRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTransferRunRequest.Unmarshal(m, b)
+}
+func (m *GetTransferRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTransferRunRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTransferRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTransferRunRequest.Merge(dst, src)
+}
+func (m *GetTransferRunRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTransferRunRequest.Size(m)
+}
+func (m *GetTransferRunRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTransferRunRequest.DiscardUnknown(m)
 }
 
-func (m *GetTransferRunRequest) Reset()                    { *m = GetTransferRunRequest{} }
-func (m *GetTransferRunRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTransferRunRequest) ProtoMessage()               {}
-func (*GetTransferRunRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_GetTransferRunRequest proto.InternalMessageInfo
 
 func (m *GetTransferRunRequest) GetName() string {
 	if m != nil {
@@ -804,13 +991,35 @@ func (m *GetTransferRunRequest) GetName() string {
 type DeleteTransferRunRequest struct {
 	// The field will contain name of the resource requested, for example:
 	// `projects/{project_id}/transferConfigs/{config_id}/runs/{run_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteTransferRunRequest) Reset()         { *m = DeleteTransferRunRequest{} }
+func (m *DeleteTransferRunRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteTransferRunRequest) ProtoMessage()    {}
+func (*DeleteTransferRunRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{10}
+}
+func (m *DeleteTransferRunRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteTransferRunRequest.Unmarshal(m, b)
+}
+func (m *DeleteTransferRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteTransferRunRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteTransferRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTransferRunRequest.Merge(dst, src)
+}
+func (m *DeleteTransferRunRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteTransferRunRequest.Size(m)
+}
+func (m *DeleteTransferRunRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteTransferRunRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteTransferRunRequest) Reset()                    { *m = DeleteTransferRunRequest{} }
-func (m *DeleteTransferRunRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteTransferRunRequest) ProtoMessage()               {}
-func (*DeleteTransferRunRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_DeleteTransferRunRequest proto.InternalMessageInfo
 
 func (m *DeleteTransferRunRequest) GetName() string {
 	if m != nil {
@@ -823,23 +1032,45 @@ func (m *DeleteTransferRunRequest) GetName() string {
 type ListTransferConfigsRequest struct {
 	// The BigQuery project id for which data sources
 	// should be returned: `projects/{project_id}`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// When specified, only configurations of requested data sources are returned.
-	DataSourceIds []string `protobuf:"bytes,2,rep,name=data_source_ids,json=dataSourceIds" json:"data_source_ids,omitempty"`
+	DataSourceIds []string `protobuf:"bytes,2,rep,name=data_source_ids,json=dataSourceIds,proto3" json:"data_source_ids,omitempty"`
 	// Pagination token, which can be used to request a specific page
 	// of `ListTransfersRequest` list results. For multiple-page
 	// results, `ListTransfersResponse` outputs
 	// a `next_page` token, which can be used as the
 	// `page_token` value to request the next page of list results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Page size. The default page size is the maximum value of 1000 results.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTransferConfigsRequest) Reset()         { *m = ListTransferConfigsRequest{} }
+func (m *ListTransferConfigsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTransferConfigsRequest) ProtoMessage()    {}
+func (*ListTransferConfigsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{11}
+}
+func (m *ListTransferConfigsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTransferConfigsRequest.Unmarshal(m, b)
+}
+func (m *ListTransferConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTransferConfigsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTransferConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferConfigsRequest.Merge(dst, src)
+}
+func (m *ListTransferConfigsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTransferConfigsRequest.Size(m)
+}
+func (m *ListTransferConfigsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTransferConfigsRequest.DiscardUnknown(m)
 }
 
-func (m *ListTransferConfigsRequest) Reset()                    { *m = ListTransferConfigsRequest{} }
-func (m *ListTransferConfigsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTransferConfigsRequest) ProtoMessage()               {}
-func (*ListTransferConfigsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_ListTransferConfigsRequest proto.InternalMessageInfo
 
 func (m *ListTransferConfigsRequest) GetParent() string {
 	if m != nil {
@@ -872,18 +1103,40 @@ func (m *ListTransferConfigsRequest) GetPageSize() int32 {
 // The returned list of pipelines in the project.
 type ListTransferConfigsResponse struct {
 	// Output only. The stored pipeline transfer configurations.
-	TransferConfigs []*TransferConfig `protobuf:"bytes,1,rep,name=transfer_configs,json=transferConfigs" json:"transfer_configs,omitempty"`
+	TransferConfigs []*TransferConfig `protobuf:"bytes,1,rep,name=transfer_configs,json=transferConfigs,proto3" json:"transfer_configs,omitempty"`
 	// Output only. The next-pagination token. For multiple-page list results,
 	// this token can be used as the
 	// `ListTransferConfigsRequest.page_token`
 	// to request the next page of list results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListTransferConfigsResponse) Reset()                    { *m = ListTransferConfigsResponse{} }
-func (m *ListTransferConfigsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTransferConfigsResponse) ProtoMessage()               {}
-func (*ListTransferConfigsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *ListTransferConfigsResponse) Reset()         { *m = ListTransferConfigsResponse{} }
+func (m *ListTransferConfigsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTransferConfigsResponse) ProtoMessage()    {}
+func (*ListTransferConfigsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{12}
+}
+func (m *ListTransferConfigsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTransferConfigsResponse.Unmarshal(m, b)
+}
+func (m *ListTransferConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTransferConfigsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTransferConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferConfigsResponse.Merge(dst, src)
+}
+func (m *ListTransferConfigsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTransferConfigsResponse.Size(m)
+}
+func (m *ListTransferConfigsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTransferConfigsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTransferConfigsResponse proto.InternalMessageInfo
 
 func (m *ListTransferConfigsResponse) GetTransferConfigs() []*TransferConfig {
 	if m != nil {
@@ -906,25 +1159,47 @@ type ListTransferRunsRequest struct {
 	// Name of transfer configuration for which transfer runs should be retrieved.
 	// Format of transfer configuration resource name is:
 	// `projects/{project_id}/transferConfigs/{config_id}`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// When specified, only transfer runs with requested states are returned.
-	States []TransferState `protobuf:"varint,2,rep,packed,name=states,enum=google.cloud.bigquery.datatransfer.v1.TransferState" json:"states,omitempty"`
+	States []TransferState `protobuf:"varint,2,rep,packed,name=states,proto3,enum=google.cloud.bigquery.datatransfer.v1.TransferState" json:"states,omitempty"`
 	// Pagination token, which can be used to request a specific page
 	// of `ListTransferRunsRequest` list results. For multiple-page
 	// results, `ListTransferRunsResponse` outputs
 	// a `next_page` token, which can be used as the
 	// `page_token` value to request the next page of list results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Page size. The default page size is the maximum value of 1000 results.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Indicates how run attempts are to be pulled.
-	RunAttempt ListTransferRunsRequest_RunAttempt `protobuf:"varint,5,opt,name=run_attempt,json=runAttempt,enum=google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest_RunAttempt" json:"run_attempt,omitempty"`
+	RunAttempt           ListTransferRunsRequest_RunAttempt `protobuf:"varint,5,opt,name=run_attempt,json=runAttempt,proto3,enum=google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest_RunAttempt" json:"run_attempt,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
+}
+
+func (m *ListTransferRunsRequest) Reset()         { *m = ListTransferRunsRequest{} }
+func (m *ListTransferRunsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTransferRunsRequest) ProtoMessage()    {}
+func (*ListTransferRunsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{13}
+}
+func (m *ListTransferRunsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTransferRunsRequest.Unmarshal(m, b)
+}
+func (m *ListTransferRunsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTransferRunsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTransferRunsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferRunsRequest.Merge(dst, src)
+}
+func (m *ListTransferRunsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTransferRunsRequest.Size(m)
+}
+func (m *ListTransferRunsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTransferRunsRequest.DiscardUnknown(m)
 }
 
-func (m *ListTransferRunsRequest) Reset()                    { *m = ListTransferRunsRequest{} }
-func (m *ListTransferRunsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTransferRunsRequest) ProtoMessage()               {}
-func (*ListTransferRunsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_ListTransferRunsRequest proto.InternalMessageInfo
 
 func (m *ListTransferRunsRequest) GetParent() string {
 	if m != nil {
@@ -964,18 +1239,40 @@ func (m *ListTransferRunsRequest) GetRunAttempt() ListTransferRunsRequest_RunAtt
 // The returned list of pipelines in the project.
 type ListTransferRunsResponse struct {
 	// Output only. The stored pipeline transfer runs.
-	TransferRuns []*TransferRun `protobuf:"bytes,1,rep,name=transfer_runs,json=transferRuns" json:"transfer_runs,omitempty"`
+	TransferRuns []*TransferRun `protobuf:"bytes,1,rep,name=transfer_runs,json=transferRuns,proto3" json:"transfer_runs,omitempty"`
 	// Output only. The next-pagination token. For multiple-page list results,
 	// this token can be used as the
 	// `ListTransferRunsRequest.page_token`
 	// to request the next page of list results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListTransferRunsResponse) Reset()                    { *m = ListTransferRunsResponse{} }
-func (m *ListTransferRunsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTransferRunsResponse) ProtoMessage()               {}
-func (*ListTransferRunsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *ListTransferRunsResponse) Reset()         { *m = ListTransferRunsResponse{} }
+func (m *ListTransferRunsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTransferRunsResponse) ProtoMessage()    {}
+func (*ListTransferRunsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{14}
+}
+func (m *ListTransferRunsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTransferRunsResponse.Unmarshal(m, b)
+}
+func (m *ListTransferRunsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTransferRunsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTransferRunsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferRunsResponse.Merge(dst, src)
+}
+func (m *ListTransferRunsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTransferRunsResponse.Size(m)
+}
+func (m *ListTransferRunsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTransferRunsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTransferRunsResponse proto.InternalMessageInfo
 
 func (m *ListTransferRunsResponse) GetTransferRuns() []*TransferRun {
 	if m != nil {
@@ -995,24 +1292,46 @@ func (m *ListTransferRunsResponse) GetNextPageToken() string {
 type ListTransferLogsRequest struct {
 	// Transfer run name in the form:
 	// `projects/{project_id}/transferConfigs/{config_Id}/runs/{run_id}`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Pagination token, which can be used to request a specific page
 	// of `ListTransferLogsRequest` list results. For multiple-page
 	// results, `ListTransferLogsResponse` outputs
 	// a `next_page` token, which can be used as the
 	// `page_token` value to request the next page of list results.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Page size. The default page size is the maximum value of 1000 results.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Message types to return. If not populated - INFO, WARNING and ERROR
 	// messages are returned.
-	MessageTypes []TransferMessage_MessageSeverity `protobuf:"varint,6,rep,packed,name=message_types,json=messageTypes,enum=google.cloud.bigquery.datatransfer.v1.TransferMessage_MessageSeverity" json:"message_types,omitempty"`
+	MessageTypes         []TransferMessage_MessageSeverity `protobuf:"varint,6,rep,packed,name=message_types,json=messageTypes,proto3,enum=google.cloud.bigquery.datatransfer.v1.TransferMessage_MessageSeverity" json:"message_types,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *ListTransferLogsRequest) Reset()         { *m = ListTransferLogsRequest{} }
+func (m *ListTransferLogsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTransferLogsRequest) ProtoMessage()    {}
+func (*ListTransferLogsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{15}
+}
+func (m *ListTransferLogsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTransferLogsRequest.Unmarshal(m, b)
+}
+func (m *ListTransferLogsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTransferLogsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTransferLogsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferLogsRequest.Merge(dst, src)
+}
+func (m *ListTransferLogsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTransferLogsRequest.Size(m)
+}
+func (m *ListTransferLogsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTransferLogsRequest.DiscardUnknown(m)
 }
 
-func (m *ListTransferLogsRequest) Reset()                    { *m = ListTransferLogsRequest{} }
-func (m *ListTransferLogsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTransferLogsRequest) ProtoMessage()               {}
-func (*ListTransferLogsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_ListTransferLogsRequest proto.InternalMessageInfo
 
 func (m *ListTransferLogsRequest) GetParent() string {
 	if m != nil {
@@ -1045,18 +1364,40 @@ func (m *ListTransferLogsRequest) GetMessageTypes() []TransferMessage_MessageSev
 // The returned list transfer run messages.
 type ListTransferLogsResponse struct {
 	// Output only. The stored pipeline transfer messages.
-	TransferMessages []*TransferMessage `protobuf:"bytes,1,rep,name=transfer_messages,json=transferMessages" json:"transfer_messages,omitempty"`
+	TransferMessages []*TransferMessage `protobuf:"bytes,1,rep,name=transfer_messages,json=transferMessages,proto3" json:"transfer_messages,omitempty"`
 	// Output only. The next-pagination token. For multiple-page list results,
 	// this token can be used as the
 	// `GetTransferRunLogRequest.page_token`
 	// to request the next page of list results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListTransferLogsResponse) Reset()                    { *m = ListTransferLogsResponse{} }
-func (m *ListTransferLogsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTransferLogsResponse) ProtoMessage()               {}
-func (*ListTransferLogsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *ListTransferLogsResponse) Reset()         { *m = ListTransferLogsResponse{} }
+func (m *ListTransferLogsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTransferLogsResponse) ProtoMessage()    {}
+func (*ListTransferLogsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{16}
+}
+func (m *ListTransferLogsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTransferLogsResponse.Unmarshal(m, b)
+}
+func (m *ListTransferLogsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTransferLogsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTransferLogsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferLogsResponse.Merge(dst, src)
+}
+func (m *ListTransferLogsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTransferLogsResponse.Size(m)
+}
+func (m *ListTransferLogsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTransferLogsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTransferLogsResponse proto.InternalMessageInfo
 
 func (m *ListTransferLogsResponse) GetTransferMessages() []*TransferMessage {
 	if m != nil {
@@ -1081,13 +1422,35 @@ func (m *ListTransferLogsResponse) GetNextPageToken() string {
 type CheckValidCredsRequest struct {
 	// The data source in the form:
 	// `projects/{project_id}/dataSources/{data_source_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CheckValidCredsRequest) Reset()                    { *m = CheckValidCredsRequest{} }
-func (m *CheckValidCredsRequest) String() string            { return proto.CompactTextString(m) }
-func (*CheckValidCredsRequest) ProtoMessage()               {}
-func (*CheckValidCredsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *CheckValidCredsRequest) Reset()         { *m = CheckValidCredsRequest{} }
+func (m *CheckValidCredsRequest) String() string { return proto.CompactTextString(m) }
+func (*CheckValidCredsRequest) ProtoMessage()    {}
+func (*CheckValidCredsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{17}
+}
+func (m *CheckValidCredsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckValidCredsRequest.Unmarshal(m, b)
+}
+func (m *CheckValidCredsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckValidCredsRequest.Marshal(b, m, deterministic)
+}
+func (dst *CheckValidCredsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckValidCredsRequest.Merge(dst, src)
+}
+func (m *CheckValidCredsRequest) XXX_Size() int {
+	return xxx_messageInfo_CheckValidCredsRequest.Size(m)
+}
+func (m *CheckValidCredsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckValidCredsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckValidCredsRequest proto.InternalMessageInfo
 
 func (m *CheckValidCredsRequest) GetName() string {
 	if m != nil {
@@ -1099,13 +1462,35 @@ func (m *CheckValidCredsRequest) GetName() string {
 // A response indicating whether the credentials exist and are valid.
 type CheckValidCredsResponse struct {
 	// If set to `true`, the credentials exist and are valid.
-	HasValidCreds bool `protobuf:"varint,1,opt,name=has_valid_creds,json=hasValidCreds" json:"has_valid_creds,omitempty"`
+	HasValidCreds        bool     `protobuf:"varint,1,opt,name=has_valid_creds,json=hasValidCreds,proto3" json:"has_valid_creds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CheckValidCredsResponse) Reset()                    { *m = CheckValidCredsResponse{} }
-func (m *CheckValidCredsResponse) String() string            { return proto.CompactTextString(m) }
-func (*CheckValidCredsResponse) ProtoMessage()               {}
-func (*CheckValidCredsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *CheckValidCredsResponse) Reset()         { *m = CheckValidCredsResponse{} }
+func (m *CheckValidCredsResponse) String() string { return proto.CompactTextString(m) }
+func (*CheckValidCredsResponse) ProtoMessage()    {}
+func (*CheckValidCredsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{18}
+}
+func (m *CheckValidCredsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CheckValidCredsResponse.Unmarshal(m, b)
+}
+func (m *CheckValidCredsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CheckValidCredsResponse.Marshal(b, m, deterministic)
+}
+func (dst *CheckValidCredsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CheckValidCredsResponse.Merge(dst, src)
+}
+func (m *CheckValidCredsResponse) XXX_Size() int {
+	return xxx_messageInfo_CheckValidCredsResponse.Size(m)
+}
+func (m *CheckValidCredsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CheckValidCredsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CheckValidCredsResponse proto.InternalMessageInfo
 
 func (m *CheckValidCredsResponse) GetHasValidCreds() bool {
 	if m != nil {
@@ -1118,19 +1503,41 @@ func (m *CheckValidCredsResponse) GetHasValidCreds() bool {
 type ScheduleTransferRunsRequest struct {
 	// Transfer configuration name in the form:
 	// `projects/{project_id}/transferConfigs/{config_id}`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Start time of the range of transfer runs. For example,
 	// `"2017-05-25T00:00:00+00:00"`.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of the range of transfer runs. For example,
 	// `"2017-05-30T00:00:00+00:00"`.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *ScheduleTransferRunsRequest) Reset()         { *m = ScheduleTransferRunsRequest{} }
+func (m *ScheduleTransferRunsRequest) String() string { return proto.CompactTextString(m) }
+func (*ScheduleTransferRunsRequest) ProtoMessage()    {}
+func (*ScheduleTransferRunsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{19}
+}
+func (m *ScheduleTransferRunsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScheduleTransferRunsRequest.Unmarshal(m, b)
+}
+func (m *ScheduleTransferRunsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScheduleTransferRunsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ScheduleTransferRunsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScheduleTransferRunsRequest.Merge(dst, src)
+}
+func (m *ScheduleTransferRunsRequest) XXX_Size() int {
+	return xxx_messageInfo_ScheduleTransferRunsRequest.Size(m)
+}
+func (m *ScheduleTransferRunsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScheduleTransferRunsRequest.DiscardUnknown(m)
 }
 
-func (m *ScheduleTransferRunsRequest) Reset()                    { *m = ScheduleTransferRunsRequest{} }
-func (m *ScheduleTransferRunsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ScheduleTransferRunsRequest) ProtoMessage()               {}
-func (*ScheduleTransferRunsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_ScheduleTransferRunsRequest proto.InternalMessageInfo
 
 func (m *ScheduleTransferRunsRequest) GetParent() string {
 	if m != nil {
@@ -1139,14 +1546,14 @@ func (m *ScheduleTransferRunsRequest) GetParent() string {
 	return ""
 }
 
-func (m *ScheduleTransferRunsRequest) GetStartTime() *google_protobuf2.Timestamp {
+func (m *ScheduleTransferRunsRequest) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *ScheduleTransferRunsRequest) GetEndTime() *google_protobuf2.Timestamp {
+func (m *ScheduleTransferRunsRequest) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -1156,13 +1563,35 @@ func (m *ScheduleTransferRunsRequest) GetEndTime() *google_protobuf2.Timestamp {
 // A response to schedule transfer runs for a time range.
 type ScheduleTransferRunsResponse struct {
 	// The transfer runs that were scheduled.
-	Runs []*TransferRun `protobuf:"bytes,1,rep,name=runs" json:"runs,omitempty"`
+	Runs                 []*TransferRun `protobuf:"bytes,1,rep,name=runs,proto3" json:"runs,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *ScheduleTransferRunsResponse) Reset()                    { *m = ScheduleTransferRunsResponse{} }
-func (m *ScheduleTransferRunsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ScheduleTransferRunsResponse) ProtoMessage()               {}
-func (*ScheduleTransferRunsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *ScheduleTransferRunsResponse) Reset()         { *m = ScheduleTransferRunsResponse{} }
+func (m *ScheduleTransferRunsResponse) String() string { return proto.CompactTextString(m) }
+func (*ScheduleTransferRunsResponse) ProtoMessage()    {}
+func (*ScheduleTransferRunsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datatransfer_a28d1a06a3af9867, []int{20}
+}
+func (m *ScheduleTransferRunsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScheduleTransferRunsResponse.Unmarshal(m, b)
+}
+func (m *ScheduleTransferRunsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScheduleTransferRunsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ScheduleTransferRunsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScheduleTransferRunsResponse.Merge(dst, src)
+}
+func (m *ScheduleTransferRunsResponse) XXX_Size() int {
+	return xxx_messageInfo_ScheduleTransferRunsResponse.Size(m)
+}
+func (m *ScheduleTransferRunsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScheduleTransferRunsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScheduleTransferRunsResponse proto.InternalMessageInfo
 
 func (m *ScheduleTransferRunsResponse) GetRuns() []*TransferRun {
 	if m != nil {
@@ -1207,8 +1636,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for DataTransferService service
-
+// DataTransferServiceClient is the client API for DataTransferService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DataTransferServiceClient interface {
 	// Retrieves a supported data source and returns its settings,
 	// which can be used for UI rendering.
@@ -1223,7 +1653,7 @@ type DataTransferServiceClient interface {
 	UpdateTransferConfig(ctx context.Context, in *UpdateTransferConfigRequest, opts ...grpc.CallOption) (*TransferConfig, error)
 	// Deletes a data transfer configuration,
 	// including any associated transfer runs and logs.
-	DeleteTransferConfig(ctx context.Context, in *DeleteTransferConfigRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error)
+	DeleteTransferConfig(ctx context.Context, in *DeleteTransferConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Returns information about a data transfer config.
 	GetTransferConfig(ctx context.Context, in *GetTransferConfigRequest, opts ...grpc.CallOption) (*TransferConfig, error)
 	// Returns information about all data transfers in the project.
@@ -1236,7 +1666,7 @@ type DataTransferServiceClient interface {
 	// Returns information about the particular transfer run.
 	GetTransferRun(ctx context.Context, in *GetTransferRunRequest, opts ...grpc.CallOption) (*TransferRun, error)
 	// Deletes the specified transfer run.
-	DeleteTransferRun(ctx context.Context, in *DeleteTransferRunRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error)
+	DeleteTransferRun(ctx context.Context, in *DeleteTransferRunRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Returns information about running and completed jobs.
 	ListTransferRuns(ctx context.Context, in *ListTransferRunsRequest, opts ...grpc.CallOption) (*ListTransferRunsResponse, error)
 	// Returns user facing log messages for the data transfer run.
@@ -1260,7 +1690,7 @@ func NewDataTransferServiceClient(cc *grpc.ClientConn) DataTransferServiceClient
 
 func (c *dataTransferServiceClient) GetDataSource(ctx context.Context, in *GetDataSourceRequest, opts ...grpc.CallOption) (*DataSource, error) {
 	out := new(DataSource)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/GetDataSource", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/GetDataSource", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1269,7 +1699,7 @@ func (c *dataTransferServiceClient) GetDataSource(ctx context.Context, in *GetDa
 
 func (c *dataTransferServiceClient) ListDataSources(ctx context.Context, in *ListDataSourcesRequest, opts ...grpc.CallOption) (*ListDataSourcesResponse, error) {
 	out := new(ListDataSourcesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ListDataSources", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ListDataSources", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1278,7 +1708,7 @@ func (c *dataTransferServiceClient) ListDataSources(ctx context.Context, in *Lis
 
 func (c *dataTransferServiceClient) CreateTransferConfig(ctx context.Context, in *CreateTransferConfigRequest, opts ...grpc.CallOption) (*TransferConfig, error) {
 	out := new(TransferConfig)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/CreateTransferConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/CreateTransferConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1287,16 +1717,16 @@ func (c *dataTransferServiceClient) CreateTransferConfig(ctx context.Context, in
 
 func (c *dataTransferServiceClient) UpdateTransferConfig(ctx context.Context, in *UpdateTransferConfigRequest, opts ...grpc.CallOption) (*TransferConfig, error) {
 	out := new(TransferConfig)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/UpdateTransferConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/UpdateTransferConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *dataTransferServiceClient) DeleteTransferConfig(ctx context.Context, in *DeleteTransferConfigRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error) {
-	out := new(google_protobuf5.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/DeleteTransferConfig", in, out, c.cc, opts...)
+func (c *dataTransferServiceClient) DeleteTransferConfig(ctx context.Context, in *DeleteTransferConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/DeleteTransferConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1305,7 +1735,7 @@ func (c *dataTransferServiceClient) DeleteTransferConfig(ctx context.Context, in
 
 func (c *dataTransferServiceClient) GetTransferConfig(ctx context.Context, in *GetTransferConfigRequest, opts ...grpc.CallOption) (*TransferConfig, error) {
 	out := new(TransferConfig)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/GetTransferConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/GetTransferConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1314,7 +1744,7 @@ func (c *dataTransferServiceClient) GetTransferConfig(ctx context.Context, in *G
 
 func (c *dataTransferServiceClient) ListTransferConfigs(ctx context.Context, in *ListTransferConfigsRequest, opts ...grpc.CallOption) (*ListTransferConfigsResponse, error) {
 	out := new(ListTransferConfigsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ListTransferConfigs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ListTransferConfigs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1323,7 +1753,7 @@ func (c *dataTransferServiceClient) ListTransferConfigs(ctx context.Context, in
 
 func (c *dataTransferServiceClient) ScheduleTransferRuns(ctx context.Context, in *ScheduleTransferRunsRequest, opts ...grpc.CallOption) (*ScheduleTransferRunsResponse, error) {
 	out := new(ScheduleTransferRunsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ScheduleTransferRuns", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ScheduleTransferRuns", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1332,16 +1762,16 @@ func (c *dataTransferServiceClient) ScheduleTransferRuns(ctx context.Context, in
 
 func (c *dataTransferServiceClient) GetTransferRun(ctx context.Context, in *GetTransferRunRequest, opts ...grpc.CallOption) (*TransferRun, error) {
 	out := new(TransferRun)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/GetTransferRun", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/GetTransferRun", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *dataTransferServiceClient) DeleteTransferRun(ctx context.Context, in *DeleteTransferRunRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error) {
-	out := new(google_protobuf5.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/DeleteTransferRun", in, out, c.cc, opts...)
+func (c *dataTransferServiceClient) DeleteTransferRun(ctx context.Context, in *DeleteTransferRunRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/DeleteTransferRun", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1350,7 +1780,7 @@ func (c *dataTransferServiceClient) DeleteTransferRun(ctx context.Context, in *D
 
 func (c *dataTransferServiceClient) ListTransferRuns(ctx context.Context, in *ListTransferRunsRequest, opts ...grpc.CallOption) (*ListTransferRunsResponse, error) {
 	out := new(ListTransferRunsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ListTransferRuns", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ListTransferRuns", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1359,7 +1789,7 @@ func (c *dataTransferServiceClient) ListTransferRuns(ctx context.Context, in *Li
 
 func (c *dataTransferServiceClient) ListTransferLogs(ctx context.Context, in *ListTransferLogsRequest, opts ...grpc.CallOption) (*ListTransferLogsResponse, error) {
 	out := new(ListTransferLogsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ListTransferLogs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/ListTransferLogs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1368,15 +1798,14 @@ func (c *dataTransferServiceClient) ListTransferLogs(ctx context.Context, in *Li
 
 func (c *dataTransferServiceClient) CheckValidCreds(ctx context.Context, in *CheckValidCredsRequest, opts ...grpc.CallOption) (*CheckValidCredsResponse, error) {
 	out := new(CheckValidCredsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/CheckValidCreds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.bigquery.datatransfer.v1.DataTransferService/CheckValidCreds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for DataTransferService service
-
+// DataTransferServiceServer is the server API for DataTransferService service.
 type DataTransferServiceServer interface {
 	// Retrieves a supported data source and returns its settings,
 	// which can be used for UI rendering.
@@ -1391,7 +1820,7 @@ type DataTransferServiceServer interface {
 	UpdateTransferConfig(context.Context, *UpdateTransferConfigRequest) (*TransferConfig, error)
 	// Deletes a data transfer configuration,
 	// including any associated transfer runs and logs.
-	DeleteTransferConfig(context.Context, *DeleteTransferConfigRequest) (*google_protobuf5.Empty, error)
+	DeleteTransferConfig(context.Context, *DeleteTransferConfigRequest) (*empty.Empty, error)
 	// Returns information about a data transfer config.
 	GetTransferConfig(context.Context, *GetTransferConfigRequest) (*TransferConfig, error)
 	// Returns information about all data transfers in the project.
@@ -1404,7 +1833,7 @@ type DataTransferServiceServer interface {
 	// Returns information about the particular transfer run.
 	GetTransferRun(context.Context, *GetTransferRunRequest) (*TransferRun, error)
 	// Deletes the specified transfer run.
-	DeleteTransferRun(context.Context, *DeleteTransferRunRequest) (*google_protobuf5.Empty, error)
+	DeleteTransferRun(context.Context, *DeleteTransferRunRequest) (*empty.Empty, error)
 	// Returns information about running and completed jobs.
 	ListTransferRuns(context.Context, *ListTransferRunsRequest) (*ListTransferRunsResponse, error)
 	// Returns user facing log messages for the data transfer run.
@@ -1718,149 +2147,156 @@ var _DataTransferService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/datatransfer/v1/datatransfer.proto", fileDescriptor0)
-}
-
-var fileDescriptor0 = []byte{
-	// 2233 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x73, 0x1b, 0x49,
-	0x15, 0x67, 0xfc, 0x5f, 0x4f, 0xb6, 0x24, 0x77, 0x1c, 0x67, 0x22, 0x67, 0x17, 0xef, 0x14, 0x49,
-	0x79, 0x0d, 0x48, 0x58, 0xd9, 0x2c, 0xbb, 0xce, 0x6e, 0x52, 0xb2, 0x24, 0x3b, 0x02, 0xdb, 0x72,
-	0x46, 0x72, 0x02, 0xa9, 0x14, 0x43, 0x47, 0xd3, 0x96, 0x67, 0x3d, 0x9a, 0x99, 0x4c, 0xcf, 0x38,
-	0x71, 0xa8, 0x5c, 0xf8, 0x0a, 0x1c, 0xa0, 0x8a, 0x0f, 0x00, 0xc5, 0x05, 0x8e, 0x7c, 0x00, 0x8a,
-	0x02, 0xae, 0x1c, 0xf8, 0x53, 0x14, 0x1c, 0xa0, 0xa8, 0xe2, 0x02, 0x5f, 0x80, 0x03, 0xd5, 0x3d,
-	0x3d, 0xd2, 0x48, 0x1a, 0xdb, 0x92, 0x4c, 0xd5, 0x9e, 0x3c, 0xdd, 0xef, 0xbd, 0xee, 0xf7, 0xeb,
-	0xf7, 0xa7, 0x7f, 0x2d, 0xc3, 0x47, 0x2d, 0xdb, 0x6e, 0x99, 0x24, 0xdf, 0x34, 0x6d, 0x5f, 0xcf,
-	0xbf, 0x30, 0x5a, 0x2f, 0x7d, 0xe2, 0x9e, 0xe5, 0x75, 0xec, 0x61, 0xcf, 0xc5, 0x16, 0x3d, 0x22,
-	0x6e, 0xfe, 0x74, 0xa3, 0x67, 0x9c, 0x73, 0x5c, 0xdb, 0xb3, 0xd1, 0xed, 0xc0, 0x32, 0xc7, 0x2d,
-	0x73, 0xa1, 0x65, 0xae, 0x47, 0xf3, 0x74, 0x23, 0x7b, 0x4b, 0x6c, 0x80, 0x1d, 0x23, 0x8f, 0x2d,
-	0xcb, 0xf6, 0xb0, 0x67, 0xd8, 0x16, 0x0d, 0x16, 0xc9, 0x7e, 0x30, 0xdc, 0xf6, 0xbd, 0x5b, 0x67,
-	0xdf, 0x15, 0x56, 0x7c, 0xf4, 0xc2, 0x3f, 0xca, 0xeb, 0xbe, 0xcb, 0x97, 0x15, 0xf2, 0x95, 0x7e,
-	0x39, 0x69, 0x3b, 0xde, 0x99, 0x10, 0xae, 0xf6, 0x0b, 0x8f, 0x0c, 0x62, 0xea, 0x5a, 0x1b, 0xd3,
-	0x13, 0xa1, 0xf1, 0xc5, 0x7e, 0x0d, 0xcf, 0x68, 0x13, 0xea, 0xe1, 0xb6, 0x73, 0xde, 0xfe, 0xaf,
-	0x5c, 0xec, 0x38, 0xc4, 0x15, 0xa8, 0x94, 0x9f, 0xce, 0xc0, 0xb5, 0x32, 0xf6, 0x70, 0xdd, 0xf6,
-	0xdd, 0x26, 0x39, 0xc0, 0x2e, 0x6e, 0x13, 0x8f, 0xb8, 0xe8, 0x26, 0xcc, 0x39, 0x6c, 0xa0, 0x19,
-	0xba, 0x2c, 0xad, 0x4a, 0x6b, 0x09, 0x75, 0x96, 0x8f, 0xab, 0x3a, 0x7a, 0x0f, 0xe6, 0x75, 0x83,
-	0x3a, 0x26, 0x3e, 0xd3, 0x2c, 0xdc, 0x26, 0xf2, 0x04, 0x17, 0x27, 0xc5, 0xdc, 0x3e, 0x6e, 0x13,
-	0xb4, 0x0a, 0x49, 0x9d, 0xd0, 0xa6, 0x6b, 0x38, 0x0c, 0xaa, 0x3c, 0x29, 0x34, 0xba, 0x53, 0xa8,
-	0x0e, 0x53, 0xde, 0x99, 0x43, 0xe4, 0xa9, 0x55, 0x69, 0x2d, 0x55, 0x78, 0x98, 0x1b, 0x2a, 0x42,
-	0xb9, 0x18, 0x4f, 0x73, 0x8d, 0x33, 0x87, 0xa8, 0x7c, 0x31, 0x94, 0x85, 0x39, 0x97, 0xbc, 0xf4,
-	0x0d, 0x97, 0xe8, 0xf2, 0xf4, 0xaa, 0xb4, 0x36, 0xa7, 0x76, 0xc6, 0x81, 0xcc, 0x21, 0xd8, 0x23,
-	0xba, 0x3c, 0x13, 0xca, 0x82, 0x31, 0x7a, 0x1f, 0x32, 0xa7, 0xd8, 0x34, 0x74, 0x1e, 0x18, 0xcd,
-	0x25, 0x2d, 0xf2, 0x5a, 0x9e, 0xe5, 0x3e, 0xa7, 0xbb, 0xf3, 0x2a, 0x9b, 0x46, 0xb7, 0x21, 0x85,
-	0x4d, 0xd3, 0x7e, 0x45, 0x74, 0xed, 0x14, 0x9b, 0x3e, 0xa1, 0xf2, 0xdc, 0xea, 0xe4, 0x5a, 0x42,
-	0x5d, 0x10, 0xb3, 0x4f, 0xf8, 0x24, 0xfa, 0x18, 0x12, 0x6d, 0xc3, 0x0a, 0x54, 0xe4, 0xc4, 0xaa,
-	0xb4, 0x96, 0x2c, 0xdc, 0x0a, 0x31, 0x86, 0xa1, 0xc8, 0x95, 0x6d, 0xff, 0x85, 0x49, 0xb8, 0x85,
-	0x3a, 0xd7, 0x36, 0x2c, 0xfe, 0xc5, 0x4d, 0xf1, 0x6b, 0x61, 0x0a, 0x43, 0x99, 0xe2, 0xd7, 0x81,
-	0xa9, 0x0a, 0x33, 0x3c, 0x43, 0xa8, 0x9c, 0x5c, 0x9d, 0x5c, 0x4b, 0x16, 0x36, 0xc7, 0x3f, 0x56,
-	0x55, 0xac, 0x84, 0xee, 0xc1, 0x72, 0xe4, 0x6c, 0xa2, 0x51, 0x9d, 0xe7, 0x27, 0x74, 0xbd, 0x2b,
-	0x2d, 0x47, 0xe2, 0x9b, 0x83, 0x6b, 0x11, 0xb3, 0x63, 0x62, 0x3a, 0x9a, 0xef, 0x9a, 0xf2, 0x02,
-	0xb7, 0x59, 0xec, 0x8a, 0x1e, 0x11, 0xd3, 0x39, 0x74, 0x4d, 0x74, 0x0b, 0x12, 0x46, 0xbb, 0xed,
-	0x7b, 0xf8, 0x85, 0x49, 0xe4, 0x14, 0x8f, 0x4f, 0x77, 0x02, 0xc9, 0x30, 0xeb, 0x92, 0xa6, 0xef,
-	0x52, 0x22, 0xa7, 0xb9, 0x2c, 0x1c, 0x2a, 0x06, 0x4c, 0xb1, 0x04, 0x40, 0x4b, 0x90, 0x69, 0x7c,
-	0xfb, 0xa0, 0xa2, 0x1d, 0xee, 0xd7, 0x0f, 0x2a, 0xa5, 0xea, 0x76, 0xb5, 0x52, 0xce, 0x7c, 0x01,
-	0x01, 0xcc, 0xd4, 0x1b, 0x6a, 0x75, 0x7f, 0x27, 0x23, 0xa1, 0x24, 0xcc, 0x56, 0xf7, 0x1b, 0x95,
-	0x9d, 0x8a, 0x9a, 0x99, 0x60, 0x82, 0x72, 0xed, 0x70, 0x6b, 0xb7, 0x92, 0x99, 0x64, 0x82, 0xad,
-	0x5a, 0x6d, 0xb7, 0x52, 0xdc, 0xcf, 0x4c, 0x31, 0x81, 0x5a, 0x29, 0xd5, 0xd4, 0x72, 0x66, 0x1a,
-	0x2d, 0x40, 0xe2, 0x60, 0xf7, 0xb0, 0xae, 0x1d, 0x14, 0x77, 0x2a, 0x99, 0x19, 0xe5, 0xbf, 0x09,
-	0x80, 0xee, 0x49, 0x21, 0x04, 0x53, 0x3c, 0xfd, 0x83, 0xea, 0xe0, 0xdf, 0xe8, 0x4b, 0x90, 0x62,
-	0x67, 0xab, 0x51, 0xae, 0xc2, 0x6a, 0x27, 0x28, 0x8e, 0x79, 0xbd, 0x63, 0x17, 0x53, 0x40, 0x93,
-	0x97, 0x16, 0xd0, 0xd4, 0x60, 0x01, 0xad, 0x40, 0xa2, 0x69, 0x1a, 0xc4, 0xf2, 0xd8, 0x2e, 0xd3,
-	0x5c, 0x3e, 0x17, 0x4c, 0x54, 0x75, 0xb4, 0x0c, 0x33, 0xb4, 0x69, 0x3b, 0x84, 0xca, 0x33, 0x3c,
-	0x3b, 0xc5, 0x08, 0x7d, 0x0b, 0x16, 0xc2, 0xb8, 0x6b, 0xbc, 0xfc, 0x66, 0x79, 0xf9, 0xdd, 0x1d,
-	0x32, 0x4f, 0x1a, 0xe2, 0x9b, 0x97, 0xdc, 0xbc, 0x17, 0x19, 0xa1, 0x07, 0xb0, 0x42, 0x7d, 0xc7,
-	0xb1, 0x5d, 0x8f, 0x6a, 0x6d, 0xdf, 0xf4, 0x0c, 0xc7, 0x24, 0x5a, 0xa8, 0xc1, 0x8a, 0x84, 0x45,
-	0xed, 0x66, 0xa8, 0xb2, 0x27, 0x34, 0xc2, 0x05, 0x29, 0xfa, 0x10, 0x6e, 0xf8, 0x8e, 0x8e, 0x3d,
-	0xa2, 0xe9, 0x04, 0xeb, 0xa6, 0x61, 0x11, 0x8d, 0x92, 0xa6, 0x6d, 0xe9, 0x94, 0x97, 0xcf, 0xb4,
-	0x7a, 0x3d, 0x10, 0x97, 0x85, 0xb4, 0x1e, 0x08, 0x59, 0xe9, 0xea, 0xe4, 0x08, 0xfb, 0xa6, 0xa7,
-	0xd1, 0xe6, 0x31, 0xd1, 0x7d, 0x33, 0x28, 0x9a, 0x84, 0x9a, 0x16, 0xf3, 0x75, 0x31, 0x8d, 0x3e,
-	0x02, 0xb9, 0xe3, 0x62, 0xd3, 0xa7, 0x9e, 0xdd, 0xee, 0x9a, 0x24, 0xb9, 0x7f, 0xcb, 0xa1, 0xbc,
-	0xc4, 0xc5, 0x1d, 0xcb, 0x67, 0x00, 0x4e, 0x58, 0x18, 0x54, 0x9e, 0xbf, 0x72, 0x6d, 0x45, 0x56,
-	0x63, 0x8d, 0xb6, 0xaf, 0x3a, 0x66, 0x8f, 0x45, 0x4d, 0xb8, 0x80, 0xb0, 0xef, 0x1d, 0xdb, 0xae,
-	0xf1, 0x26, 0x28, 0x23, 0x1e, 0xb2, 0x14, 0x0f, 0x59, 0x69, 0xe4, 0xed, 0x73, 0xc5, 0xe8, 0x5a,
-	0x3c, 0x84, 0x8b, 0xb8, 0x7f, 0x0a, 0xb5, 0x61, 0x91, 0x67, 0xb0, 0x4b, 0x8e, 0x5c, 0x42, 0x8f,
-	0x83, 0x2d, 0xd3, 0x7c, 0xcb, 0xe2, 0xe8, 0x5b, 0xb2, 0x4f, 0x35, 0x58, 0x89, 0x6f, 0x98, 0xd6,
-	0x7b, 0x27, 0xd0, 0x36, 0xac, 0x86, 0xe1, 0xeb, 0xd9, 0xf6, 0x95, 0x61, 0xe9, 0xf6, 0x2b, 0x4d,
-	0xc7, 0x67, 0x54, 0xce, 0xf0, 0xf8, 0xdf, 0x12, 0x7a, 0x91, 0x25, 0x9f, 0x72, 0xa5, 0x32, 0x3e,
-	0xa3, 0xe8, 0x6b, 0xb0, 0xd4, 0xc6, 0x96, 0x8f, 0x4d, 0xcd, 0xf5, 0x2d, 0xaa, 0xe9, 0x06, 0x65,
-	0x7d, 0x43, 0x97, 0x17, 0x79, 0x5c, 0x51, 0x20, 0x53, 0x7d, 0x8b, 0x96, 0x85, 0x04, 0x1d, 0xc2,
-	0xcd, 0xb6, 0x61, 0x19, 0x6d, 0xbf, 0x9b, 0x05, 0x9a, 0x61, 0x79, 0xc4, 0x3d, 0xc5, 0xa6, 0x8c,
-	0x78, 0xdb, 0xbd, 0x39, 0xd8, 0x76, 0xc5, 0xe5, 0xad, 0xde, 0x10, 0xb6, 0x61, 0x8a, 0x54, 0x85,
-	0xa5, 0x42, 0x61, 0x71, 0xe0, 0x9c, 0x91, 0x02, 0xef, 0x16, 0x0f, 0x1b, 0x8f, 0x6a, 0x6a, 0xf5,
-	0x59, 0xb1, 0x51, 0xad, 0xed, 0x6b, 0x31, 0xad, 0x6a, 0x19, 0x50, 0xaf, 0x4e, 0xa9, 0x56, 0xae,
-	0x64, 0x24, 0x66, 0xbb, 0x53, 0xab, 0xed, 0xec, 0x56, 0x34, 0xde, 0x8b, 0x62, 0x74, 0x26, 0x94,
-	0x26, 0xa4, 0xfb, 0x4e, 0x1a, 0xbd, 0x07, 0xef, 0x94, 0x8b, 0x8d, 0xa2, 0xa6, 0x56, 0xb6, 0xd5,
-	0x4a, 0xfd, 0x51, 0xdc, 0x8e, 0x08, 0x52, 0xf5, 0xdd, 0x6a, 0xb9, 0xba, 0xbf, 0xa3, 0x3d, 0xad,
-	0xee, 0x97, 0x6b, 0x4f, 0x33, 0x12, 0xba, 0x09, 0xd7, 0x4b, 0x87, 0xf5, 0x46, 0x6d, 0x4f, 0xeb,
-	0x13, 0x4d, 0x28, 0xeb, 0xb0, 0xb4, 0x43, 0xbc, 0x6e, 0x70, 0x55, 0xf2, 0xd2, 0x27, 0xd4, 0x8b,
-	0xeb, 0x83, 0x8a, 0x09, 0xcb, 0xbb, 0x06, 0x8d, 0x28, 0xd3, 0x50, 0x7b, 0x19, 0x66, 0x1c, 0xec,
-	0x12, 0xcb, 0x13, 0xfa, 0x62, 0x84, 0xde, 0x61, 0x25, 0xd6, 0x22, 0x9a, 0x67, 0x9f, 0x90, 0x90,
-	0x30, 0x24, 0xd8, 0x4c, 0x83, 0x4d, 0xb0, 0x6e, 0xc7, 0xc5, 0xd4, 0x78, 0x13, 0x70, 0x86, 0x69,
-	0x75, 0x8e, 0x4d, 0xd4, 0x8d, 0x37, 0x44, 0xf9, 0xa1, 0x04, 0x37, 0x06, 0xb6, 0xa3, 0x8e, 0x6d,
-	0x51, 0x82, 0x1a, 0x30, 0x1f, 0xe9, 0xc8, 0x54, 0x96, 0x78, 0xf1, 0x6e, 0x8c, 0x9c, 0xca, 0x6a,
-	0xb2, 0xdb, 0xc2, 0x29, 0xba, 0x03, 0x69, 0x8b, 0xbc, 0xf6, 0xb4, 0x88, 0xcb, 0x41, 0xa3, 0x5f,
-	0x60, 0xd3, 0x07, 0xa1, 0xdb, 0xca, 0xaf, 0x24, 0x58, 0x29, 0xb9, 0x8c, 0x64, 0x84, 0x9d, 0xae,
-	0x64, 0x5b, 0x47, 0x46, 0xeb, 0xb2, 0xd3, 0xf8, 0x0e, 0xa4, 0x3b, 0x7d, 0xba, 0xc9, 0x2d, 0xf8,
-	0xfa, 0xc9, 0xc2, 0xbd, 0x11, 0x3b, 0xb5, 0xd8, 0x2e, 0xe5, 0xf5, 0x8c, 0xd1, 0x57, 0xfb, 0x3b,
-	0x4b, 0xd3, 0xd6, 0xc3, 0x7b, 0xa8, 0xb7, 0x29, 0x94, 0x6c, 0x9d, 0x28, 0xff, 0x92, 0x60, 0xe5,
-	0x90, 0xb7, 0xdf, 0x78, 0x18, 0x31, 0xee, 0x4a, 0x9f, 0x9f, 0xbb, 0xe8, 0x3e, 0x24, 0xc5, 0x5d,
-	0xc2, 0x98, 0x32, 0x4f, 0x97, 0x64, 0x21, 0x3b, 0x50, 0xcc, 0xdb, 0x8c, 0xe0, 0xec, 0x61, 0x7a,
-	0xa2, 0x42, 0xa0, 0xce, 0xbe, 0x95, 0x1c, 0xc8, 0x3b, 0xc4, 0x8b, 0xc7, 0x19, 0x97, 0xea, 0x1b,
-	0xb0, 0x52, 0x26, 0x26, 0x39, 0xef, 0x68, 0xe2, 0x4c, 0xbe, 0x0c, 0xd7, 0x23, 0x5b, 0xa8, 0xbe,
-	0x75, 0x91, 0x72, 0x0e, 0xe4, 0xde, 0xf5, 0x2f, 0xd1, 0xff, 0x91, 0x04, 0x59, 0x56, 0x0c, 0xbd,
-	0xee, 0x5c, 0x5a, 0x7f, 0x77, 0x20, 0xdd, 0xcb, 0x5c, 0xa8, 0x3c, 0x11, 0x10, 0xdb, 0x28, 0x75,
-	0xa1, 0x57, 0xaa, 0xd3, 0x9f, 0x48, 0xb0, 0x12, 0xeb, 0x9a, 0xa8, 0xd5, 0xef, 0x42, 0xa6, 0x2f,
-	0x8d, 0xc2, 0x7a, 0x1d, 0x33, 0x8f, 0xd2, 0xbd, 0x79, 0x34, 0x7c, 0xdd, 0xfe, 0x75, 0x22, 0xe8,
-	0x28, 0x91, 0x33, 0xbf, 0xf4, 0x04, 0x77, 0x61, 0x86, 0x7a, 0xd8, 0x23, 0xc1, 0xc1, 0xa5, 0x0a,
-	0x1f, 0x8c, 0xe8, 0x73, 0x9d, 0x19, 0xab, 0x62, 0x8d, 0xab, 0x9c, 0x33, 0xfa, 0x0c, 0x92, 0xae,
-	0x6f, 0x69, 0xd8, 0xf3, 0xd8, 0x63, 0x92, 0x93, 0xc3, 0x54, 0xa1, 0x3a, 0xa4, 0x3b, 0xe7, 0xc0,
-	0xce, 0xa9, 0xbe, 0x55, 0x0c, 0x16, 0x54, 0xc1, 0xed, 0x7c, 0x2b, 0xf7, 0x00, 0xba, 0x12, 0xb4,
-	0x02, 0x37, 0xd4, 0xc3, 0x7d, 0xad, 0xd8, 0x68, 0x54, 0xf6, 0x0e, 0x1a, 0x83, 0x64, 0x7c, 0xb7,
-	0xd8, 0xa8, 0xd4, 0x1b, 0x19, 0x49, 0xf9, 0xb1, 0x04, 0xf2, 0xe0, 0x4e, 0x22, 0x0f, 0x9e, 0x46,
-	0x58, 0x2a, 0xbb, 0xce, 0x45, 0x12, 0x14, 0x46, 0x3c, 0x50, 0x56, 0x28, 0x1d, 0x92, 0xca, 0x36,
-	0x18, 0x3a, 0xfc, 0x7f, 0x96, 0x7a, 0xc3, 0xbf, 0x6b, 0xb7, 0x46, 0xbc, 0xc0, 0xa6, 0x2e, 0x0c,
-	0xd8, 0x74, 0x5f, 0xc0, 0x4e, 0x60, 0xa1, 0x4d, 0x28, 0xe5, 0xe6, 0x67, 0x21, 0x6b, 0x4f, 0x15,
-	0xb6, 0x47, 0x04, 0xbc, 0x17, 0xac, 0x91, 0x13, 0x7f, 0xeb, 0xe4, 0x94, 0xb8, 0x86, 0x77, 0xa6,
-	0xce, 0x8b, 0xc5, 0x19, 0x31, 0xa0, 0xac, 0x0a, 0xe5, 0x41, 0x70, 0xe2, 0xe8, 0x9b, 0xb0, 0xd8,
-	0x39, 0x7a, 0x61, 0x15, 0x1e, 0xff, 0x87, 0xe3, 0x79, 0xa3, 0x76, 0x6a, 0x5a, 0x4c, 0x0c, 0x1f,
-	0x86, 0xaf, 0xc0, 0x72, 0xe9, 0x98, 0x34, 0x4f, 0x9e, 0xb0, 0xd7, 0x62, 0xc9, 0x25, 0x3a, 0xbd,
-	0xa8, 0xf1, 0x15, 0xe1, 0xc6, 0x80, 0xb6, 0x40, 0x75, 0x07, 0xd2, 0xc7, 0x98, 0x6a, 0xfc, 0xd5,
-	0xa9, 0x35, 0x99, 0x88, 0x5b, 0xce, 0xa9, 0x0b, 0xc7, 0x98, 0x76, 0xf5, 0x79, 0x83, 0x0a, 0x19,
-	0xdd, 0x28, 0xa5, 0xff, 0x31, 0x00, 0xf5, 0xb0, 0xeb, 0x69, 0x9e, 0x21, 0x7e, 0x0f, 0x89, 0xbb,
-	0x6f, 0x1a, 0xe1, 0x4f, 0x33, 0x6a, 0x82, 0x6b, 0xb3, 0x31, 0xba, 0x07, 0x73, 0xc4, 0xd2, 0x03,
-	0xc3, 0xc9, 0x4b, 0x0d, 0x67, 0x89, 0xa5, 0xb3, 0x91, 0x72, 0x04, 0xb7, 0xe2, 0x1d, 0x15, 0x88,
-	0xb7, 0x61, 0xea, 0x8a, 0x95, 0xc3, 0xed, 0x0b, 0x7f, 0xbc, 0x1e, 0xfc, 0x3c, 0xd4, 0x69, 0x52,
-	0xc4, 0x3d, 0x35, 0x9a, 0x04, 0xfd, 0x52, 0x82, 0x85, 0x1e, 0x36, 0x88, 0xee, 0x0f, 0xb9, 0x47,
-	0x1c, 0x87, 0xcc, 0x8e, 0xce, 0xc7, 0x94, 0xaf, 0x7f, 0xff, 0xf7, 0xff, 0xf8, 0xc1, 0xc4, 0x06,
-	0xca, 0xe7, 0x4f, 0x37, 0xf2, 0xdf, 0x63, 0x19, 0xf0, 0xa9, 0xe3, 0xda, 0x9f, 0x91, 0xa6, 0x47,
-	0xf3, 0xeb, 0x79, 0xd3, 0x6e, 0x06, 0x3f, 0xde, 0xe5, 0xd7, 0xf3, 0x11, 0xe2, 0x96, 0x5f, 0x7f,
-	0x8b, 0x7e, 0x2b, 0x41, 0xba, 0x8f, 0x2d, 0xa2, 0x4f, 0x47, 0x68, 0x8e, 0x83, 0xa4, 0x36, 0xfb,
-	0x60, 0x5c, 0xf3, 0x20, 0x5a, 0x7d, 0x58, 0x82, 0xa4, 0x3a, 0x07, 0xcd, 0xdb, 0x28, 0x1c, 0xf4,
-	0x37, 0x09, 0x96, 0xe2, 0xf8, 0x25, 0xda, 0x1a, 0xd2, 0xa3, 0x0b, 0xc8, 0x69, 0x76, 0xbc, 0x4b,
-	0x57, 0xd9, 0xe5, 0x60, 0xb6, 0x95, 0xbb, 0xc3, 0x80, 0xe9, 0xbb, 0xa0, 0x37, 0xfb, 0x79, 0x24,
-	0xfa, 0x8f, 0x04, 0x4b, 0x71, 0xd4, 0x73, 0x68, 0x84, 0x17, 0xf0, 0xd6, 0x71, 0x11, 0x3e, 0xe7,
-	0x08, 0x9f, 0x14, 0x4a, 0x1c, 0x61, 0x9f, 0xc7, 0xb9, 0x8b, 0x52, 0xb1, 0x0f, 0x6e, 0x7e, 0xfd,
-	0xed, 0x20, 0xe2, 0x9f, 0x4b, 0xb0, 0x14, 0xc7, 0x28, 0x87, 0x46, 0x7c, 0x01, 0x1d, 0xcd, 0x2e,
-	0x0f, 0x34, 0x97, 0x4a, 0xdb, 0xf1, 0xce, 0x94, 0xfb, 0x1c, 0xd2, 0xbd, 0xf5, 0xbb, 0x97, 0x56,
-	0xd3, 0x20, 0x04, 0xf4, 0x1b, 0x09, 0x16, 0x07, 0x38, 0x33, 0x7a, 0x38, 0x7c, 0x43, 0xf8, 0xbf,
-	0x46, 0x47, 0x40, 0x41, 0x63, 0x41, 0xf9, 0x93, 0x04, 0xd7, 0x62, 0x28, 0x2a, 0x2a, 0x8e, 0xc1,
-	0x9e, 0x7a, 0x99, 0x77, 0x76, 0xeb, 0x2a, 0x4b, 0x88, 0x46, 0xd1, 0x8b, 0x6d, 0xb4, 0xda, 0x42,
-	0xff, 0x96, 0x60, 0x29, 0xee, 0xd2, 0x18, 0x3a, 0xb1, 0x2e, 0xb8, 0x1a, 0xb3, 0xa5, 0x2b, 0xad,
-	0x21, 0xe0, 0xed, 0x71, 0x78, 0x3b, 0xca, 0xd6, 0xe5, 0xf0, 0xe2, 0x4a, 0x29, 0xfc, 0x1d, 0x87,
-	0xad, 0xb9, 0x29, 0xad, 0xa3, 0x5f, 0x4b, 0x90, 0xea, 0x7d, 0x68, 0xa1, 0x4f, 0x46, 0x4f, 0xca,
-	0xee, 0x7b, 0x2b, 0x3b, 0xc6, 0x3d, 0xaa, 0x6c, 0x71, 0x4c, 0x9f, 0xa0, 0xcd, 0xd1, 0xd3, 0x31,
-	0xcf, 0xae, 0x60, 0x96, 0x95, 0xbf, 0x90, 0x60, 0x71, 0xe0, 0x11, 0x38, 0x74, 0x81, 0x9d, 0xf7,
-	0x7c, 0x3c, 0xb7, 0x19, 0x08, 0x97, 0xd7, 0xaf, 0xe2, 0xf2, 0x1f, 0x24, 0xc8, 0xf4, 0x13, 0x7c,
-	0xf4, 0xe0, 0x6a, 0x6f, 0x90, 0xec, 0xc3, 0xb1, 0xed, 0x45, 0x82, 0xf5, 0x06, 0x63, 0xd4, 0x04,
-	0xe3, 0xe0, 0xd0, 0x3f, 0xfb, 0x90, 0x31, 0xfe, 0x3c, 0x16, 0xb2, 0xc8, 0xab, 0x62, 0x2c, 0x64,
-	0x51, 0xe2, 0xae, 0x3c, 0xe6, 0xc8, 0xbe, 0x89, 0xaa, 0xe3, 0x20, 0x0b, 0xa3, 0xd6, 0x91, 0x70,
-	0x4c, 0x7f, 0x91, 0x20, 0xdd, 0xc7, 0xa8, 0x87, 0x26, 0x4a, 0xf1, 0xbc, 0x7d, 0x68, 0xa2, 0x74,
-	0x0e, 0x91, 0x57, 0xbe, 0xc1, 0x51, 0x96, 0x95, 0x87, 0x23, 0x92, 0xbe, 0xcd, 0x66, 0xef, 0x82,
-	0x9b, 0xd2, 0xfa, 0xd6, 0xdf, 0x25, 0x78, 0xbf, 0x69, 0xb7, 0x87, 0xf3, 0x68, 0x6b, 0x31, 0xca,
-	0x82, 0x0f, 0x58, 0xbd, 0x1c, 0x48, 0xcf, 0x1e, 0x0b, 0xdb, 0x96, 0x6d, 0x62, 0xab, 0x95, 0xb3,
-	0xdd, 0x56, 0xbe, 0x45, 0x2c, 0x5e, 0x4d, 0xf9, 0x40, 0x84, 0x1d, 0x83, 0x5e, 0xf2, 0x1f, 0xe3,
-	0xfb, 0xd1, 0xf1, 0xcf, 0x26, 0x6e, 0xef, 0x04, 0x6b, 0x96, 0xb8, 0x3f, 0x5b, 0x46, 0xeb, 0x31,
-	0xf7, 0x27, 0xba, 0x7d, 0xee, 0xc9, 0xc6, 0xef, 0x42, 0xbd, 0xe7, 0x5c, 0xef, 0x79, 0xa8, 0xf7,
-	0x3c, 0xaa, 0xf7, 0xfc, 0xc9, 0xc6, 0x8b, 0x19, 0xee, 0xcd, 0xdd, 0xff, 0x05, 0x00, 0x00, 0xff,
-	0xff, 0xa8, 0x04, 0x35, 0x66, 0x3d, 0x1f, 0x00, 0x00,
+	proto.RegisterFile("google/cloud/bigquery/datatransfer/v1/datatransfer.proto", fileDescriptor_datatransfer_a28d1a06a3af9867)
+}
+
+var fileDescriptor_datatransfer_a28d1a06a3af9867 = []byte{
+	// 2343 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcf, 0x6f, 0xdb, 0xc8,
+	0xf5, 0xff, 0x52, 0xfe, 0xfd, 0x64, 0x5b, 0xf2, 0xc4, 0x71, 0x18, 0x39, 0xbb, 0x5f, 0x2f, 0xdb,
+	0x64, 0x1d, 0xb7, 0x95, 0xd6, 0xca, 0x26, 0xcd, 0x3a, 0x4d, 0x02, 0x59, 0x92, 0x1d, 0x15, 0x8e,
+	0xe5, 0xa5, 0xe4, 0x64, 0x6b, 0x04, 0xcb, 0x65, 0xc4, 0xb1, 0xcc, 0x0d, 0x45, 0x32, 0x1c, 0xd2,
+	0x89, 0x53, 0xa4, 0x87, 0x45, 0x50, 0x60, 0xd1, 0xde, 0xf6, 0xb0, 0x05, 0x8a, 0x5e, 0x7a, 0x69,
+	0xb7, 0x40, 0xff, 0x84, 0xde, 0x7a, 0xea, 0xb5, 0xb7, 0x3d, 0xb4, 0x40, 0xdb, 0x4b, 0x6f, 0x05,
+	0x7a, 0xe9, 0xa1, 0x87, 0x62, 0x86, 0x43, 0x89, 0x92, 0x68, 0x8b, 0x92, 0x0b, 0xf4, 0x64, 0xcd,
+	0xbc, 0x1f, 0x33, 0xef, 0xc7, 0xe7, 0xcd, 0x7b, 0x84, 0xe1, 0x76, 0xd3, 0xb2, 0x9a, 0x06, 0xce,
+	0x35, 0x0c, 0xcb, 0xd3, 0x72, 0x4f, 0xf5, 0xe6, 0x73, 0x0f, 0x3b, 0x27, 0x39, 0x4d, 0x75, 0x55,
+	0xd7, 0x51, 0x4d, 0x72, 0x88, 0x9d, 0xdc, 0xf1, 0x7a, 0xd7, 0x3a, 0x6b, 0x3b, 0x96, 0x6b, 0xa1,
+	0xab, 0xbe, 0x64, 0x96, 0x49, 0x66, 0x03, 0xc9, 0x6c, 0x17, 0xe7, 0xf1, 0x7a, 0xe6, 0x0a, 0x3f,
+	0x40, 0xb5, 0xf5, 0x9c, 0x6a, 0x9a, 0x96, 0xab, 0xba, 0xba, 0x65, 0x12, 0x5f, 0x49, 0xe6, 0xfd,
+	0x78, 0xc7, 0x77, 0x1f, 0x9d, 0x79, 0x9b, 0x4b, 0xb1, 0xd5, 0x53, 0xef, 0x30, 0xa7, 0x79, 0x0e,
+	0x53, 0xcb, 0xe9, 0xcb, 0xbd, 0x74, 0xdc, 0xb2, 0xdd, 0x13, 0x4e, 0x5c, 0xe9, 0x25, 0x1e, 0xea,
+	0xd8, 0xd0, 0x94, 0x96, 0x4a, 0x9e, 0x71, 0x8e, 0xff, 0xef, 0xe5, 0x70, 0xf5, 0x16, 0x26, 0xae,
+	0xda, 0xb2, 0x4f, 0x3b, 0xff, 0x85, 0xa3, 0xda, 0x36, 0x76, 0xb8, 0x55, 0xd2, 0xaf, 0x27, 0xe1,
+	0x42, 0x49, 0x75, 0xd5, 0x9a, 0xe5, 0x39, 0x0d, 0xbc, 0xa7, 0x3a, 0x6a, 0x0b, 0xbb, 0xd8, 0x41,
+	0x97, 0x61, 0xda, 0xa6, 0x0b, 0x45, 0xd7, 0x44, 0x61, 0x45, 0x58, 0x9d, 0x91, 0xa7, 0xd8, 0xba,
+	0xa2, 0xa1, 0x77, 0x60, 0x56, 0xd3, 0x89, 0x6d, 0xa8, 0x27, 0x8a, 0xa9, 0xb6, 0xb0, 0x98, 0x60,
+	0xe4, 0x24, 0xdf, 0xdb, 0x55, 0x5b, 0x18, 0xad, 0x40, 0x52, 0xc3, 0xa4, 0xe1, 0xe8, 0x36, 0x35,
+	0x55, 0x1c, 0xe3, 0x1c, 0x9d, 0x2d, 0x54, 0x83, 0x71, 0xf7, 0xc4, 0xc6, 0xe2, 0xf8, 0x8a, 0xb0,
+	0x3a, 0x9f, 0xbf, 0x9f, 0x8d, 0x15, 0xa1, 0x6c, 0xc4, 0x4d, 0xb3, 0xf5, 0x13, 0x1b, 0xcb, 0x4c,
+	0x19, 0xca, 0xc0, 0xb4, 0x83, 0x9f, 0x7b, 0xba, 0x83, 0x35, 0x71, 0x62, 0x45, 0x58, 0x9d, 0x96,
+	0xdb, 0x6b, 0x9f, 0x66, 0x63, 0xd5, 0xc5, 0x9a, 0x38, 0x19, 0xd0, 0xfc, 0x35, 0xba, 0x0e, 0xe9,
+	0x63, 0xd5, 0xd0, 0x35, 0x16, 0x18, 0xc5, 0xc1, 0x4d, 0xfc, 0x52, 0x9c, 0x62, 0x77, 0x4e, 0x75,
+	0xf6, 0x65, 0xba, 0x8d, 0xae, 0xc2, 0xbc, 0x6a, 0x18, 0xd6, 0x0b, 0xac, 0x29, 0xc7, 0xaa, 0xe1,
+	0x61, 0x22, 0x4e, 0xaf, 0x8c, 0xad, 0xce, 0xc8, 0x73, 0x7c, 0xf7, 0x11, 0xdb, 0x44, 0x1f, 0xc0,
+	0x4c, 0x4b, 0x37, 0x7d, 0x16, 0x71, 0x66, 0x45, 0x58, 0x4d, 0xe6, 0xaf, 0x04, 0x36, 0x06, 0xa1,
+	0xc8, 0x96, 0x2c, 0xef, 0xa9, 0x81, 0x99, 0x84, 0x3c, 0xdd, 0xd2, 0x4d, 0xf6, 0x8b, 0x89, 0xaa,
+	0x2f, 0xb9, 0x28, 0xc4, 0x12, 0x55, 0x5f, 0xfa, 0xa2, 0x32, 0x4c, 0xb2, 0x0c, 0x21, 0x62, 0x72,
+	0x65, 0x6c, 0x35, 0x99, 0xdf, 0x18, 0xdd, 0xad, 0x32, 0xd7, 0x84, 0x6e, 0xc2, 0x52, 0xc8, 0x37,
+	0xe1, 0xa8, 0xce, 0x32, 0x0f, 0x5d, 0xec, 0x50, 0x4b, 0xa1, 0xf8, 0x66, 0xe1, 0x42, 0x48, 0xec,
+	0x08, 0x1b, 0xb6, 0xe2, 0x39, 0x86, 0x38, 0xc7, 0x64, 0x16, 0x3a, 0xa4, 0x07, 0xd8, 0xb0, 0xf7,
+	0x1d, 0x03, 0x5d, 0x81, 0x19, 0xbd, 0xd5, 0xf2, 0x5c, 0xf5, 0xa9, 0x81, 0xc5, 0x79, 0x16, 0x9f,
+	0xce, 0x06, 0x12, 0x61, 0xca, 0xc1, 0x0d, 0xcf, 0x21, 0x58, 0x4c, 0x31, 0x5a, 0xb0, 0x94, 0x74,
+	0x18, 0xa7, 0x09, 0x80, 0x16, 0x21, 0x5d, 0xff, 0xc1, 0x5e, 0x59, 0xd9, 0xdf, 0xad, 0xed, 0x95,
+	0x8b, 0x95, 0xad, 0x4a, 0xb9, 0x94, 0xfe, 0x3f, 0x04, 0x30, 0x59, 0xab, 0xcb, 0x95, 0xdd, 0xed,
+	0xb4, 0x80, 0x92, 0x30, 0x55, 0xd9, 0xad, 0x97, 0xb7, 0xcb, 0x72, 0x3a, 0x41, 0x09, 0xa5, 0xea,
+	0xfe, 0xe6, 0x4e, 0x39, 0x3d, 0x46, 0x09, 0x9b, 0xd5, 0xea, 0x4e, 0xb9, 0xb0, 0x9b, 0x1e, 0xa7,
+	0x04, 0xb9, 0x5c, 0xac, 0xca, 0xa5, 0xf4, 0x04, 0x9a, 0x83, 0x99, 0xbd, 0x9d, 0xfd, 0x9a, 0xb2,
+	0x57, 0xd8, 0x2e, 0xa7, 0x27, 0xa5, 0x7f, 0xcf, 0x00, 0x74, 0x3c, 0x85, 0x10, 0x8c, 0xb3, 0xf4,
+	0xf7, 0xd1, 0xc1, 0x7e, 0xa3, 0x6f, 0xc2, 0x3c, 0xf5, 0xad, 0x42, 0x18, 0x0b, 0xc5, 0x8e, 0x0f,
+	0x8e, 0x59, 0xad, 0x2d, 0x17, 0x01, 0xa0, 0xb1, 0x81, 0x00, 0x1a, 0xef, 0x07, 0xd0, 0x32, 0xcc,
+	0x34, 0x0c, 0x1d, 0x9b, 0x2e, 0x3d, 0x65, 0x82, 0xd1, 0xa7, 0xfd, 0x8d, 0x8a, 0x86, 0x96, 0x60,
+	0x92, 0x34, 0x2c, 0x1b, 0x13, 0x71, 0x92, 0x65, 0x27, 0x5f, 0xa1, 0x8f, 0x60, 0x2e, 0x88, 0xbb,
+	0xc2, 0xe0, 0x37, 0xc5, 0xe0, 0x77, 0x23, 0x66, 0x9e, 0xd4, 0xf9, 0x6f, 0x06, 0xb9, 0x59, 0x37,
+	0xb4, 0x42, 0xf7, 0x60, 0x99, 0x78, 0xb6, 0x6d, 0x39, 0x2e, 0x51, 0x5a, 0x9e, 0xe1, 0xea, 0xb6,
+	0x81, 0x95, 0x80, 0x83, 0x82, 0x84, 0x46, 0xed, 0x72, 0xc0, 0xf2, 0x90, 0x73, 0x04, 0x0a, 0x09,
+	0xba, 0x05, 0x97, 0x3c, 0x5b, 0x53, 0x5d, 0xac, 0x68, 0x58, 0xd5, 0x0c, 0xdd, 0xc4, 0x0a, 0xc1,
+	0x0d, 0xcb, 0xd4, 0x08, 0x83, 0xcf, 0x84, 0x7c, 0xd1, 0x27, 0x97, 0x38, 0xb5, 0xe6, 0x13, 0x29,
+	0x74, 0x35, 0x7c, 0xa8, 0x7a, 0x86, 0xab, 0x90, 0xc6, 0x11, 0xd6, 0x3c, 0xc3, 0x07, 0xcd, 0x8c,
+	0x9c, 0xe2, 0xfb, 0x35, 0xbe, 0x8d, 0x6e, 0x83, 0xd8, 0xbe, 0x62, 0xc3, 0x23, 0xae, 0xd5, 0xea,
+	0x88, 0x24, 0xd9, 0xfd, 0x96, 0x02, 0x7a, 0x91, 0x91, 0xdb, 0x92, 0x07, 0x00, 0x76, 0x00, 0x0c,
+	0x22, 0xce, 0x9e, 0x1b, 0x5b, 0x21, 0x6d, 0xb4, 0xd0, 0xf6, 0xa0, 0x63, 0xea, 0x88, 0x63, 0xc2,
+	0x01, 0xa4, 0x7a, 0xee, 0x91, 0xe5, 0xe8, 0xaf, 0x7c, 0x18, 0xb1, 0x90, 0xcd, 0xb3, 0x90, 0x15,
+	0x87, 0x3e, 0x3e, 0x5b, 0x08, 0xeb, 0x62, 0x21, 0x5c, 0x50, 0x7b, 0xb7, 0x50, 0x0b, 0x16, 0x58,
+	0x06, 0x3b, 0xf8, 0xd0, 0xc1, 0xe4, 0xc8, 0x3f, 0x32, 0xc5, 0x8e, 0x2c, 0x0c, 0x7f, 0x24, 0xfd,
+	0x29, 0xfb, 0x9a, 0xd8, 0x81, 0x29, 0xad, 0x7b, 0x03, 0x6d, 0xc1, 0x4a, 0x10, 0xbe, 0xae, 0x63,
+	0x5f, 0xe8, 0xa6, 0x66, 0xbd, 0x50, 0x34, 0xf5, 0x84, 0x88, 0x69, 0x16, 0xff, 0x2b, 0x9c, 0x2f,
+	0xa4, 0xf2, 0x31, 0x63, 0x2a, 0xa9, 0x27, 0x04, 0xbd, 0x07, 0x8b, 0x2d, 0xd5, 0xf4, 0x54, 0x43,
+	0x71, 0x3c, 0x93, 0x28, 0x9a, 0x4e, 0x68, 0xdd, 0xd0, 0xc4, 0x05, 0x16, 0x57, 0xe4, 0xd3, 0x64,
+	0xcf, 0x24, 0x25, 0x4e, 0x41, 0xfb, 0x70, 0xb9, 0xa5, 0x9b, 0x7a, 0xcb, 0xeb, 0x64, 0x81, 0xa2,
+	0x9b, 0x2e, 0x76, 0x8e, 0x55, 0x43, 0x44, 0xac, 0xec, 0x5e, 0xee, 0x2f, 0xbb, 0xfc, 0xf1, 0x96,
+	0x2f, 0x71, 0xd9, 0x20, 0x45, 0x2a, 0x5c, 0x52, 0x22, 0xb0, 0xd0, 0xe7, 0x67, 0x24, 0xc1, 0xdb,
+	0x85, 0xfd, 0xfa, 0x83, 0xaa, 0x5c, 0x39, 0x28, 0xd4, 0x2b, 0xd5, 0x5d, 0x25, 0xa2, 0x54, 0x2d,
+	0x01, 0xea, 0xe6, 0x29, 0x56, 0x4b, 0xe5, 0xb4, 0x40, 0x65, 0xb7, 0xab, 0xd5, 0xed, 0x9d, 0xb2,
+	0xc2, 0x6a, 0x51, 0x04, 0x4f, 0x42, 0x6a, 0x40, 0xaa, 0xc7, 0xd3, 0xe8, 0x1d, 0x78, 0xab, 0x54,
+	0xa8, 0x17, 0x14, 0xb9, 0xbc, 0x25, 0x97, 0x6b, 0x0f, 0xa2, 0x4e, 0x44, 0x30, 0x5f, 0xdb, 0xa9,
+	0x94, 0x2a, 0xbb, 0xdb, 0xca, 0xe3, 0xca, 0x6e, 0xa9, 0xfa, 0x38, 0x2d, 0xa0, 0xcb, 0x70, 0xb1,
+	0xb8, 0x5f, 0xab, 0x57, 0x1f, 0x2a, 0x3d, 0xa4, 0x84, 0xb4, 0x06, 0x8b, 0xdb, 0xd8, 0xed, 0x04,
+	0x57, 0xc6, 0xcf, 0x3d, 0x4c, 0xdc, 0xa8, 0x3a, 0x28, 0x19, 0xb0, 0xb4, 0xa3, 0x93, 0x10, 0x33,
+	0x09, 0xb8, 0x97, 0x60, 0xd2, 0x56, 0x1d, 0x6c, 0xba, 0x9c, 0x9f, 0xaf, 0xd0, 0x5b, 0x14, 0x62,
+	0x4d, 0xac, 0xb8, 0xd6, 0x33, 0x1c, 0x34, 0x0c, 0x33, 0x74, 0xa7, 0x4e, 0x37, 0x68, 0xb5, 0x63,
+	0x64, 0xa2, 0xbf, 0xf2, 0x7b, 0x86, 0x09, 0x79, 0x9a, 0x6e, 0xd4, 0xf4, 0x57, 0x58, 0xfa, 0x52,
+	0x80, 0x4b, 0x7d, 0xc7, 0x11, 0xdb, 0x32, 0x09, 0x46, 0x75, 0x98, 0x0d, 0x55, 0x64, 0x22, 0x0a,
+	0x0c, 0xbc, 0xeb, 0x43, 0xa7, 0xb2, 0x9c, 0xec, 0x94, 0x70, 0x82, 0xae, 0x41, 0xca, 0xc4, 0x2f,
+	0x5d, 0x25, 0x74, 0x65, 0xbf, 0xd0, 0xcf, 0xd1, 0xed, 0xbd, 0xe0, 0xda, 0xd2, 0xef, 0x05, 0x58,
+	0x2e, 0x3a, 0xb4, 0xc9, 0x08, 0x2a, 0x5d, 0xd1, 0x32, 0x0f, 0xf5, 0xe6, 0x20, 0x6f, 0x7c, 0x0c,
+	0xa9, 0x76, 0x9d, 0x6e, 0x30, 0x09, 0xa6, 0x3f, 0x99, 0xbf, 0x39, 0x64, 0xa5, 0xe6, 0xc7, 0xcd,
+	0xbb, 0x5d, 0x6b, 0xf4, 0x9d, 0xde, 0xca, 0xd2, 0xb0, 0xb4, 0xe0, 0x1d, 0xea, 0x2e, 0x0a, 0x45,
+	0x4b, 0xc3, 0xd2, 0xdf, 0x05, 0x58, 0xde, 0x67, 0xe5, 0x37, 0xda, 0x8c, 0x88, 0xeb, 0x0a, 0xff,
+	0xbb, 0xeb, 0xa2, 0x3b, 0x90, 0xe4, 0x6f, 0x09, 0xed, 0x94, 0x59, 0xba, 0x24, 0xf3, 0x99, 0x3e,
+	0x30, 0x6f, 0xd1, 0x06, 0xe7, 0xa1, 0x4a, 0x9e, 0xc9, 0xe0, 0xb3, 0xd3, 0xdf, 0x52, 0x16, 0xc4,
+	0x6d, 0xec, 0x46, 0xdb, 0x19, 0x95, 0xea, 0xeb, 0xb0, 0x5c, 0xc2, 0x06, 0x3e, 0xcd, 0x35, 0x51,
+	0x22, 0xdf, 0x82, 0x8b, 0xa1, 0x23, 0x64, 0xcf, 0x3c, 0x8b, 0x39, 0x0b, 0x62, 0xb7, 0xfe, 0x01,
+	0xfc, 0x3f, 0x13, 0x20, 0x43, 0xc1, 0xd0, 0x7d, 0x9d, 0x81, 0xf8, 0xbb, 0x06, 0xa9, 0xee, 0xce,
+	0x85, 0x88, 0x09, 0xbf, 0xb1, 0x0d, 0xb7, 0x2e, 0xe4, 0x5c, 0x38, 0xfd, 0x95, 0x00, 0xcb, 0x91,
+	0x57, 0xe3, 0x58, 0xfd, 0x04, 0xd2, 0x3d, 0x69, 0x14, 0xe0, 0x75, 0xc4, 0x3c, 0x4a, 0x75, 0xe7,
+	0x51, 0x7c, 0xdc, 0xfe, 0x29, 0xe1, 0x57, 0x94, 0x90, 0xcf, 0x07, 0x7a, 0x70, 0x07, 0x26, 0x89,
+	0xab, 0xba, 0xd8, 0x77, 0xdc, 0x7c, 0xfe, 0xfd, 0x21, 0xef, 0x5c, 0xa3, 0xc2, 0x32, 0xd7, 0x71,
+	0x1e, 0x3f, 0xa3, 0x4f, 0x21, 0xe9, 0x78, 0xa6, 0xa2, 0xba, 0x2e, 0x1d, 0x26, 0x59, 0x73, 0x38,
+	0x9f, 0xaf, 0xc4, 0xbc, 0xce, 0x29, 0x66, 0x67, 0x65, 0xcf, 0x2c, 0xf8, 0x0a, 0x65, 0x70, 0xda,
+	0xbf, 0xa5, 0x9b, 0x00, 0x1d, 0x0a, 0x5a, 0x86, 0x4b, 0xf2, 0xfe, 0xae, 0x52, 0xa8, 0xd7, 0xcb,
+	0x0f, 0xf7, 0xea, 0xfd, 0xcd, 0xf8, 0x4e, 0xa1, 0x5e, 0xae, 0xd5, 0xd3, 0x82, 0xf4, 0x73, 0x01,
+	0xc4, 0xfe, 0x93, 0x78, 0x1e, 0x3c, 0x0e, 0x75, 0xa9, 0xf4, 0x39, 0xe7, 0x49, 0x90, 0x1f, 0xd2,
+	0xa1, 0x14, 0x28, 0xed, 0x26, 0x95, 0x1e, 0x10, 0x3b, 0xfc, 0x5f, 0x0b, 0xdd, 0xe1, 0xdf, 0xb1,
+	0x9a, 0x43, 0x3e, 0x60, 0xe3, 0x67, 0x06, 0x6c, 0xa2, 0x27, 0x60, 0xcf, 0x60, 0xae, 0x85, 0x09,
+	0x61, 0xe2, 0x27, 0x41, 0xd7, 0x3e, 0x9f, 0xdf, 0x1a, 0xd2, 0xe0, 0x87, 0xbe, 0x8e, 0x2c, 0xff,
+	0x5b, 0xc3, 0xc7, 0xd8, 0xd1, 0xdd, 0x13, 0x79, 0x96, 0x2b, 0xa7, 0x8d, 0x01, 0xa1, 0x28, 0x14,
+	0xfb, 0x8d, 0xe3, 0xae, 0x6f, 0xc0, 0x42, 0xdb, 0xf5, 0x5c, 0x2a, 0x70, 0xff, 0xad, 0xd1, 0x6e,
+	0x23, 0xb7, 0x31, 0xcd, 0x37, 0xe2, 0x87, 0xe1, 0xdb, 0xb0, 0x54, 0x3c, 0xc2, 0x8d, 0x67, 0x8f,
+	0xe8, 0xb4, 0x58, 0x74, 0xb0, 0x46, 0xce, 0x2a, 0x7c, 0x05, 0xb8, 0xd4, 0xc7, 0xcd, 0xad, 0xba,
+	0x06, 0xa9, 0x23, 0x95, 0x28, 0x6c, 0xea, 0x54, 0x1a, 0x94, 0xc4, 0x24, 0xa7, 0xe5, 0xb9, 0x23,
+	0x95, 0x74, 0xf8, 0x59, 0x81, 0x0a, 0x3a, 0xba, 0x61, 0xa0, 0xff, 0x01, 0x00, 0x71, 0x55, 0xc7,
+	0x55, 0x5c, 0x9d, 0x7f, 0x0f, 0x89, 0x7a, 0x6f, 0xea, 0xc1, 0xa7, 0x19, 0x79, 0x86, 0x71, 0xd3,
+	0x35, 0xba, 0x09, 0xd3, 0xd8, 0xd4, 0x7c, 0xc1, 0xb1, 0x81, 0x82, 0x53, 0xd8, 0xd4, 0xe8, 0x4a,
+	0x3a, 0x84, 0x2b, 0xd1, 0x17, 0xe5, 0x16, 0x6f, 0xc1, 0xf8, 0x39, 0x91, 0xc3, 0xe4, 0xf3, 0x3f,
+	0x5e, 0xf6, 0x3f, 0x0f, 0xb5, 0x8b, 0x14, 0x76, 0x8e, 0xf5, 0x06, 0x46, 0x7f, 0x16, 0x60, 0xae,
+	0xab, 0x1b, 0x44, 0x77, 0x62, 0x9e, 0x11, 0xd5, 0x43, 0x66, 0x86, 0xef, 0xc7, 0xa4, 0x8f, 0x3f,
+	0xfb, 0xe3, 0xdf, 0xbe, 0x48, 0x7c, 0x84, 0x72, 0xb9, 0xe3, 0xf5, 0xdc, 0x0f, 0x69, 0x06, 0xdc,
+	0xb5, 0x1d, 0xeb, 0x53, 0xdc, 0x70, 0x49, 0x6e, 0x2d, 0x67, 0x58, 0x0d, 0xff, 0xe3, 0x5d, 0x6e,
+	0x2d, 0x17, 0x6a, 0xdc, 0x72, 0x6b, 0xaf, 0x0f, 0xae, 0xa2, 0x6f, 0x44, 0x8a, 0x74, 0xb3, 0xa1,
+	0x7f, 0x08, 0x90, 0xea, 0x69, 0x2a, 0xd1, 0xdd, 0x21, 0x6a, 0x68, 0x7f, 0xef, 0x9b, 0xb9, 0x37,
+	0xaa, 0xb8, 0x1f, 0xd4, 0x1e, 0x93, 0xfd, 0xdc, 0x3b, 0xc5, 0xe8, 0xd7, 0x61, 0x73, 0xda, 0x26,
+	0xf7, 0x89, 0x74, 0xb1, 0xa1, 0x5f, 0x24, 0x60, 0x31, 0xaa, 0x5b, 0x45, 0x9b, 0x31, 0x2f, 0x7e,
+	0x46, 0xab, 0x9b, 0x19, 0xed, 0x09, 0x97, 0x3e, 0x17, 0x98, 0xd1, 0x9f, 0x09, 0xd2, 0x8d, 0x38,
+	0x56, 0xf7, 0x3c, 0xf8, 0x1b, 0xbd, 0x7d, 0xe9, 0xc1, 0x86, 0xf4, 0xee, 0x69, 0xae, 0x18, 0x24,
+	0x8b, 0x7e, 0x97, 0x80, 0xc5, 0xa8, 0x36, 0x38, 0xb6, 0x7f, 0xce, 0xe8, 0xa1, 0x47, 0xf5, 0xcf,
+	0x57, 0xbe, 0x7f, 0x7e, 0x29, 0xe4, 0x8b, 0xcc, 0xae, 0x9e, 0x3b, 0x67, 0xcf, 0x02, 0x46, 0x8f,
+	0xc1, 0xb9, 0xb5, 0xd7, 0xfd, 0xfe, 0xfa, 0x7e, 0xfe, 0xbb, 0xb1, 0xf4, 0xc6, 0xd0, 0x85, 0xbe,
+	0x16, 0x60, 0x31, 0xaa, 0x57, 0x8e, 0xed, 0xbf, 0x33, 0x1a, 0xed, 0xcc, 0x52, 0x5f, 0xd9, 0x2c,
+	0xb7, 0x6c, 0xf7, 0x44, 0x3a, 0x64, 0xfe, 0xf9, 0x64, 0xed, 0xc6, 0xc0, 0x3a, 0xd1, 0x6f, 0xc2,
+	0xc1, 0xf5, 0xb5, 0x77, 0x23, 0xc5, 0xfa, 0x59, 0xd1, 0x3f, 0x05, 0x58, 0xe8, 0x1b, 0x1c, 0xd0,
+	0xfd, 0xf8, 0x55, 0xf1, 0xbf, 0x9a, 0x16, 0xdc, 0x6a, 0x34, 0x9a, 0xd5, 0x28, 0xb6, 0xd5, 0x6f,
+	0x12, 0x70, 0x21, 0xa2, 0xa5, 0x47, 0x85, 0x11, 0xba, 0xcd, 0xee, 0x49, 0x25, 0xb3, 0x79, 0x1e,
+	0x15, 0xbc, 0x62, 0x76, 0xbb, 0x61, 0xb8, 0xda, 0xd1, 0x76, 0xc3, 0xe0, 0x52, 0x81, 0x7e, 0x9b,
+	0x80, 0xc5, 0xa8, 0xf7, 0x38, 0x76, 0x66, 0x9f, 0xd1, 0x75, 0x64, 0x8a, 0xe7, 0xd2, 0xc1, 0x3d,
+	0xf1, 0x13, 0xbf, 0x4e, 0xbc, 0x11, 0xa4, 0xcd, 0xc1, 0xbe, 0x88, 0x42, 0x73, 0xf0, 0x91, 0x8c,
+	0x6a, 0xdd, 0x10, 0xd6, 0x0e, 0xee, 0x48, 0xb7, 0x4e, 0x51, 0x34, 0x58, 0x18, 0xfd, 0x4b, 0x80,
+	0xf9, 0xee, 0x11, 0x18, 0x7d, 0x6f, 0x78, 0xa4, 0x74, 0x26, 0xe1, 0xcc, 0x08, 0x1d, 0x8e, 0xe4,
+	0x32, 0x8f, 0x98, 0x68, 0x63, 0x78, 0x8c, 0xe4, 0x68, 0x73, 0x44, 0xa1, 0xf2, 0x1e, 0xca, 0xc6,
+	0x83, 0x4a, 0x20, 0x81, 0xfe, 0x22, 0xc0, 0x42, 0xdf, 0x40, 0x1f, 0xbb, 0x4e, 0x9c, 0xf6, 0x29,
+	0xe0, 0xd4, 0xf2, 0xc7, 0x8d, 0x5c, 0x3b, 0x97, 0x91, 0x6b, 0xc3, 0x1a, 0xf9, 0x79, 0x02, 0xd2,
+	0xbd, 0xe3, 0x1d, 0xba, 0x77, 0xbe, 0x09, 0x34, 0x73, 0x7f, 0x64, 0x79, 0x8e, 0x81, 0xee, 0x80,
+	0x0f, 0x8b, 0x00, 0x66, 0x5c, 0x3b, 0xe0, 0x71, 0xd2, 0x9e, 0x49, 0xa0, 0xaf, 0x7a, 0x7c, 0x41,
+	0xe7, 0xad, 0x91, 0x7c, 0x11, 0x9a, 0x42, 0x47, 0xf2, 0x45, 0x78, 0xd0, 0x93, 0xbe, 0xf0, 0xeb,
+	0xc1, 0x4f, 0x05, 0x54, 0x19, 0xc5, 0x1b, 0x41, 0xa4, 0xdb, 0x14, 0xaa, 0xfc, 0xe0, 0x3e, 0xba,
+	0x1b, 0xd7, 0x39, 0x91, 0x0a, 0xd0, 0x97, 0x09, 0x48, 0xf5, 0x0c, 0x71, 0xb1, 0x9b, 0xee, 0xe8,
+	0x51, 0x31, 0x76, 0xd3, 0x7d, 0xca, 0xec, 0x28, 0xbd, 0xf1, 0x1d, 0xf5, 0x23, 0xe9, 0xfe, 0x90,
+	0x83, 0xc6, 0x46, 0xa3, 0x5b, 0x23, 0x2d, 0x9a, 0xb7, 0xa5, 0x1b, 0x31, 0x66, 0x8f, 0x08, 0xc9,
+	0xcd, 0xbf, 0x0a, 0x70, 0xbd, 0x61, 0xb5, 0xe2, 0x19, 0xb3, 0xb9, 0x10, 0x9e, 0xd9, 0xf6, 0x68,
+	0x45, 0xd8, 0x13, 0x0e, 0x3e, 0xe4, 0xb2, 0x4d, 0xcb, 0x50, 0xcd, 0x66, 0xd6, 0x72, 0x9a, 0xb9,
+	0x26, 0x36, 0x59, 0xbd, 0xc8, 0xf9, 0x24, 0xd5, 0xd6, 0xc9, 0x80, 0xff, 0x6f, 0xb8, 0x13, 0x5e,
+	0xff, 0x26, 0x71, 0x75, 0xdb, 0xd7, 0x59, 0x64, 0xf7, 0xd9, 0xd4, 0x9b, 0x1f, 0xb2, 0xfb, 0x84,
+	0x8f, 0xcf, 0x3e, 0x5a, 0xff, 0x43, 0xc0, 0xf7, 0x84, 0xf1, 0x3d, 0x09, 0xf8, 0x9e, 0x84, 0xf9,
+	0x9e, 0x3c, 0x5a, 0x7f, 0x3a, 0xc9, 0x6e, 0x73, 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x48,
+	0xcd, 0xb8, 0x10, 0xeb, 0x21, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
index 7d51fe9d..a2b58459 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1/transfer.pb.go
@@ -1,22 +1,28 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/datatransfer/v1/transfer.proto
 
-package datatransfer
+package datatransfer // import "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
-// Represents data transfer type.
+// 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
+
+// DEPRECATED. Represents data transfer type.
 type TransferType int32
 
 const (
@@ -43,7 +49,9 @@ var TransferType_value = map[string]int32{
 func (x TransferType) String() string {
 	return proto.EnumName(TransferType_name, int32(x))
 }
-func (TransferType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (TransferType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_b655bdd8f06d7255, []int{0}
+}
 
 // Represents data transfer run state.
 type TransferState int32
@@ -84,7 +92,9 @@ var TransferState_value = map[string]int32{
 func (x TransferState) String() string {
 	return proto.EnumName(TransferState_name, int32(x))
 }
-func (TransferState) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (TransferState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_b655bdd8f06d7255, []int{1}
+}
 
 // Represents data transfer user facing message severity.
 type TransferMessage_MessageSeverity int32
@@ -117,7 +127,7 @@ func (x TransferMessage_MessageSeverity) String() string {
 	return proto.EnumName(TransferMessage_MessageSeverity_name, int32(x))
 }
 func (TransferMessage_MessageSeverity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{2, 0}
+	return fileDescriptor_transfer_b655bdd8f06d7255, []int{2, 0}
 }
 
 // Represents a data transfer configuration. A transfer configuration
@@ -126,7 +136,6 @@ func (TransferMessage_MessageSeverity) EnumDescriptor() ([]byte, []int) {
 // When a new transfer configuration is created, the specified
 // `destination_dataset_id` is created when needed and shared with the
 // appropriate data source service account.
-// Next id: 20
 type TransferConfig struct {
 	// The resource name of the transfer config.
 	// Transfer config names have the form
@@ -134,15 +143,15 @@ type TransferConfig struct {
 	// Where `config_id` is usually a uuid, even though it is not
 	// guaranteed or required. The name is ignored when creating a transfer
 	// config.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The BigQuery target dataset id.
-	DestinationDatasetId string `protobuf:"bytes,2,opt,name=destination_dataset_id,json=destinationDatasetId" json:"destination_dataset_id,omitempty"`
+	DestinationDatasetId string `protobuf:"bytes,2,opt,name=destination_dataset_id,json=destinationDatasetId,proto3" json:"destination_dataset_id,omitempty"`
 	// User specified display name for the data transfer.
-	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Data source id. Cannot be changed once data transfer is created.
-	DataSourceId string `protobuf:"bytes,5,opt,name=data_source_id,json=dataSourceId" json:"data_source_id,omitempty"`
+	DataSourceId string `protobuf:"bytes,5,opt,name=data_source_id,json=dataSourceId,proto3" json:"data_source_id,omitempty"`
 	// Data transfer specific parameters.
-	Params *google_protobuf1.Struct `protobuf:"bytes,9,opt,name=params" json:"params,omitempty"`
+	Params *_struct.Struct `protobuf:"bytes,9,opt,name=params,proto3" json:"params,omitempty"`
 	// Data transfer schedule.
 	// If the data source does not support a custom schedule, this should be
 	// empty. If it is empty, the default value for the data source will be
@@ -155,37 +164,59 @@ type TransferConfig struct {
 	// See more explanation about the format here:
 	// https://cloud.google.com/appengine/docs/flexible/python/scheduling-jobs-with-cron-yaml#the_schedule_format
 	// NOTE: the granularity should be at least 8 hours, or less frequent.
-	Schedule string `protobuf:"bytes,7,opt,name=schedule" json:"schedule,omitempty"`
+	Schedule string `protobuf:"bytes,7,opt,name=schedule,proto3" json:"schedule,omitempty"`
 	// The number of days to look back to automatically refresh the data.
 	// For example, if `data_refresh_window_days = 10`, then every day
 	// BigQuery reingests data for [today-10, today-1], rather than ingesting data
 	// for just [today-1].
 	// Only valid if the data source supports the feature. Set the value to  0
 	// to use the default value.
-	DataRefreshWindowDays int32 `protobuf:"varint,12,opt,name=data_refresh_window_days,json=dataRefreshWindowDays" json:"data_refresh_window_days,omitempty"`
+	DataRefreshWindowDays int32 `protobuf:"varint,12,opt,name=data_refresh_window_days,json=dataRefreshWindowDays,proto3" json:"data_refresh_window_days,omitempty"`
 	// Is this config disabled. When set to true, no runs are scheduled
 	// for a given transfer.
-	Disabled bool `protobuf:"varint,13,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled bool `protobuf:"varint,13,opt,name=disabled,proto3" json:"disabled,omitempty"`
 	// Output only. Data transfer modification time. Ignored by server on input.
-	UpdateTime *google_protobuf2.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Next time when data transfer will run.
-	NextRunTime *google_protobuf2.Timestamp `protobuf:"bytes,8,opt,name=next_run_time,json=nextRunTime" json:"next_run_time,omitempty"`
+	NextRunTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=next_run_time,json=nextRunTime,proto3" json:"next_run_time,omitempty"`
 	// Output only. State of the most recently updated transfer run.
-	State TransferState `protobuf:"varint,10,opt,name=state,enum=google.cloud.bigquery.datatransfer.v1.TransferState" json:"state,omitempty"`
+	State TransferState `protobuf:"varint,10,opt,name=state,proto3,enum=google.cloud.bigquery.datatransfer.v1.TransferState" json:"state,omitempty"`
 	// Output only. Unique ID of the user on whose behalf transfer is done.
 	// Applicable only to data sources that do not support service accounts.
 	// When set to 0, the data source service account credentials are used.
 	// May be negative. Note, that this identifier is not stable.
 	// It may change over time even for the same user.
-	UserId int64 `protobuf:"varint,11,opt,name=user_id,json=userId" json:"user_id,omitempty"`
+	UserId int64 `protobuf:"varint,11,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
 	// Output only. Region in which BigQuery dataset is located.
-	DatasetRegion string `protobuf:"bytes,14,opt,name=dataset_region,json=datasetRegion" json:"dataset_region,omitempty"`
+	DatasetRegion        string   `protobuf:"bytes,14,opt,name=dataset_region,json=datasetRegion,proto3" json:"dataset_region,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransferConfig) Reset()         { *m = TransferConfig{} }
+func (m *TransferConfig) String() string { return proto.CompactTextString(m) }
+func (*TransferConfig) ProtoMessage()    {}
+func (*TransferConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_b655bdd8f06d7255, []int{0}
+}
+func (m *TransferConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferConfig.Unmarshal(m, b)
+}
+func (m *TransferConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferConfig.Marshal(b, m, deterministic)
+}
+func (dst *TransferConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferConfig.Merge(dst, src)
+}
+func (m *TransferConfig) XXX_Size() int {
+	return xxx_messageInfo_TransferConfig.Size(m)
+}
+func (m *TransferConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferConfig.DiscardUnknown(m)
 }
 
-func (m *TransferConfig) Reset()                    { *m = TransferConfig{} }
-func (m *TransferConfig) String() string            { return proto.CompactTextString(m) }
-func (*TransferConfig) ProtoMessage()               {}
-func (*TransferConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_TransferConfig proto.InternalMessageInfo
 
 func (m *TransferConfig) GetName() string {
 	if m != nil {
@@ -215,7 +246,7 @@ func (m *TransferConfig) GetDataSourceId() string {
 	return ""
 }
 
-func (m *TransferConfig) GetParams() *google_protobuf1.Struct {
+func (m *TransferConfig) GetParams() *_struct.Struct {
 	if m != nil {
 		return m.Params
 	}
@@ -243,14 +274,14 @@ func (m *TransferConfig) GetDisabled() bool {
 	return false
 }
 
-func (m *TransferConfig) GetUpdateTime() *google_protobuf2.Timestamp {
+func (m *TransferConfig) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
 	return nil
 }
 
-func (m *TransferConfig) GetNextRunTime() *google_protobuf2.Timestamp {
+func (m *TransferConfig) GetNextRunTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.NextRunTime
 	}
@@ -279,54 +310,75 @@ func (m *TransferConfig) GetDatasetRegion() string {
 }
 
 // Represents a data transfer run.
-// Next id: 27
 type TransferRun struct {
 	// The resource name of the transfer run.
 	// Transfer run names have the form
 	// `projects/{project_id}/locations/{location}/transferConfigs/{config_id}/runs/{run_id}`.
 	// The name is ignored when creating a transfer run.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Minimum time after which a transfer run can be started.
-	ScheduleTime *google_protobuf2.Timestamp `protobuf:"bytes,3,opt,name=schedule_time,json=scheduleTime" json:"schedule_time,omitempty"`
+	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
 	// For batch transfer runs, specifies the date and time that
 	// data should be ingested.
-	RunTime *google_protobuf2.Timestamp `protobuf:"bytes,10,opt,name=run_time,json=runTime" json:"run_time,omitempty"`
+	RunTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=run_time,json=runTime,proto3" json:"run_time,omitempty"`
 	// Status of the transfer run.
-	ErrorStatus *google_rpc.Status `protobuf:"bytes,21,opt,name=error_status,json=errorStatus" json:"error_status,omitempty"`
+	ErrorStatus *status.Status `protobuf:"bytes,21,opt,name=error_status,json=errorStatus,proto3" json:"error_status,omitempty"`
 	// Output only. Time when transfer run was started.
 	// Parameter ignored by server for input requests.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. Time when transfer run ended.
 	// Parameter ignored by server for input requests.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Last time the data transfer run state was updated.
-	UpdateTime *google_protobuf2.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Data transfer specific parameters.
-	Params *google_protobuf1.Struct `protobuf:"bytes,9,opt,name=params" json:"params,omitempty"`
+	Params *_struct.Struct `protobuf:"bytes,9,opt,name=params,proto3" json:"params,omitempty"`
 	// Output only. The BigQuery target dataset id.
-	DestinationDatasetId string `protobuf:"bytes,2,opt,name=destination_dataset_id,json=destinationDatasetId" json:"destination_dataset_id,omitempty"`
+	DestinationDatasetId string `protobuf:"bytes,2,opt,name=destination_dataset_id,json=destinationDatasetId,proto3" json:"destination_dataset_id,omitempty"`
 	// Output only. Data source id.
-	DataSourceId string `protobuf:"bytes,7,opt,name=data_source_id,json=dataSourceId" json:"data_source_id,omitempty"`
+	DataSourceId string `protobuf:"bytes,7,opt,name=data_source_id,json=dataSourceId,proto3" json:"data_source_id,omitempty"`
 	// Data transfer run state. Ignored for input requests.
-	State TransferState `protobuf:"varint,8,opt,name=state,enum=google.cloud.bigquery.datatransfer.v1.TransferState" json:"state,omitempty"`
+	State TransferState `protobuf:"varint,8,opt,name=state,proto3,enum=google.cloud.bigquery.datatransfer.v1.TransferState" json:"state,omitempty"`
 	// Output only. Unique ID of the user on whose behalf transfer is done.
 	// Applicable only to data sources that do not support service accounts.
 	// When set to 0, the data source service account credentials are used.
 	// May be negative. Note, that this identifier is not stable.
 	// It may change over time even for the same user.
-	UserId int64 `protobuf:"varint,11,opt,name=user_id,json=userId" json:"user_id,omitempty"`
+	UserId int64 `protobuf:"varint,11,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
 	// Output only. Describes the schedule of this transfer run if it was
 	// created as part of a regular schedule. For batch transfer runs that are
 	// scheduled manually, this is empty.
 	// NOTE: the system might choose to delay the schedule depending on the
 	// current load, so `schedule_time` doesn't always matches this.
-	Schedule string `protobuf:"bytes,12,opt,name=schedule" json:"schedule,omitempty"`
+	Schedule             string   `protobuf:"bytes,12,opt,name=schedule,proto3" json:"schedule,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransferRun) Reset()         { *m = TransferRun{} }
+func (m *TransferRun) String() string { return proto.CompactTextString(m) }
+func (*TransferRun) ProtoMessage()    {}
+func (*TransferRun) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_b655bdd8f06d7255, []int{1}
+}
+func (m *TransferRun) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferRun.Unmarshal(m, b)
+}
+func (m *TransferRun) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferRun.Marshal(b, m, deterministic)
+}
+func (dst *TransferRun) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferRun.Merge(dst, src)
+}
+func (m *TransferRun) XXX_Size() int {
+	return xxx_messageInfo_TransferRun.Size(m)
+}
+func (m *TransferRun) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferRun.DiscardUnknown(m)
 }
 
-func (m *TransferRun) Reset()                    { *m = TransferRun{} }
-func (m *TransferRun) String() string            { return proto.CompactTextString(m) }
-func (*TransferRun) ProtoMessage()               {}
-func (*TransferRun) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_TransferRun proto.InternalMessageInfo
 
 func (m *TransferRun) GetName() string {
 	if m != nil {
@@ -335,49 +387,49 @@ func (m *TransferRun) GetName() string {
 	return ""
 }
 
-func (m *TransferRun) GetScheduleTime() *google_protobuf2.Timestamp {
+func (m *TransferRun) GetScheduleTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ScheduleTime
 	}
 	return nil
 }
 
-func (m *TransferRun) GetRunTime() *google_protobuf2.Timestamp {
+func (m *TransferRun) GetRunTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.RunTime
 	}
 	return nil
 }
 
-func (m *TransferRun) GetErrorStatus() *google_rpc.Status {
+func (m *TransferRun) GetErrorStatus() *status.Status {
 	if m != nil {
 		return m.ErrorStatus
 	}
 	return nil
 }
 
-func (m *TransferRun) GetStartTime() *google_protobuf2.Timestamp {
+func (m *TransferRun) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *TransferRun) GetEndTime() *google_protobuf2.Timestamp {
+func (m *TransferRun) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
 	return nil
 }
 
-func (m *TransferRun) GetUpdateTime() *google_protobuf2.Timestamp {
+func (m *TransferRun) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
 	return nil
 }
 
-func (m *TransferRun) GetParams() *google_protobuf1.Struct {
+func (m *TransferRun) GetParams() *_struct.Struct {
 	if m != nil {
 		return m.Params
 	}
@@ -422,19 +474,41 @@ func (m *TransferRun) GetSchedule() string {
 // Represents a user facing message for a particular data transfer run.
 type TransferMessage struct {
 	// Time when message was logged.
-	MessageTime *google_protobuf2.Timestamp `protobuf:"bytes,1,opt,name=message_time,json=messageTime" json:"message_time,omitempty"`
+	MessageTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=message_time,json=messageTime,proto3" json:"message_time,omitempty"`
 	// Message severity.
-	Severity TransferMessage_MessageSeverity `protobuf:"varint,2,opt,name=severity,enum=google.cloud.bigquery.datatransfer.v1.TransferMessage_MessageSeverity" json:"severity,omitempty"`
+	Severity TransferMessage_MessageSeverity `protobuf:"varint,2,opt,name=severity,proto3,enum=google.cloud.bigquery.datatransfer.v1.TransferMessage_MessageSeverity" json:"severity,omitempty"`
 	// Message text.
-	MessageText string `protobuf:"bytes,3,opt,name=message_text,json=messageText" json:"message_text,omitempty"`
+	MessageText          string   `protobuf:"bytes,3,opt,name=message_text,json=messageText,proto3" json:"message_text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransferMessage) Reset()         { *m = TransferMessage{} }
+func (m *TransferMessage) String() string { return proto.CompactTextString(m) }
+func (*TransferMessage) ProtoMessage()    {}
+func (*TransferMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_b655bdd8f06d7255, []int{2}
+}
+func (m *TransferMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferMessage.Unmarshal(m, b)
+}
+func (m *TransferMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferMessage.Marshal(b, m, deterministic)
+}
+func (dst *TransferMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferMessage.Merge(dst, src)
+}
+func (m *TransferMessage) XXX_Size() int {
+	return xxx_messageInfo_TransferMessage.Size(m)
+}
+func (m *TransferMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferMessage.DiscardUnknown(m)
 }
 
-func (m *TransferMessage) Reset()                    { *m = TransferMessage{} }
-func (m *TransferMessage) String() string            { return proto.CompactTextString(m) }
-func (*TransferMessage) ProtoMessage()               {}
-func (*TransferMessage) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_TransferMessage proto.InternalMessageInfo
 
-func (m *TransferMessage) GetMessageTime() *google_protobuf2.Timestamp {
+func (m *TransferMessage) GetMessageTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.MessageTime
 	}
@@ -465,10 +539,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/bigquery/datatransfer/v1/transfer.proto", fileDescriptor1)
+	proto.RegisterFile("google/cloud/bigquery/datatransfer/v1/transfer.proto", fileDescriptor_transfer_b655bdd8f06d7255)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_transfer_b655bdd8f06d7255 = []byte{
 	// 922 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0xc6, 0xf9, 0xcf, 0x71, 0x92, 0x8d, 0x46, 0x2c, 0x35, 0xd5, 0x02, 0xa1, 0xa2, 0x52, 0xd8,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
index 84044ac8..d87ae070 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/bigquery/logging/v1/audit_data.pb.go
@@ -1,56 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/bigquery/logging/v1/audit_data.proto
 
-/*
-Package logging is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/bigquery/logging/v1/audit_data.proto
-
-It has these top-level messages:
-	AuditData
-	TableInsertRequest
-	TableUpdateRequest
-	TableInsertResponse
-	TableUpdateResponse
-	DatasetListRequest
-	DatasetInsertRequest
-	DatasetInsertResponse
-	DatasetUpdateRequest
-	DatasetUpdateResponse
-	JobInsertRequest
-	JobInsertResponse
-	JobQueryRequest
-	JobQueryResponse
-	JobGetQueryResultsRequest
-	JobGetQueryResultsResponse
-	JobQueryDoneResponse
-	JobCompletedEvent
-	TableDataListRequest
-	Table
-	TableInfo
-	TableViewDefinition
-	Dataset
-	DatasetInfo
-	BigQueryAcl
-	Job
-	JobConfiguration
-	TableDefinition
-	JobStatus
-	JobStatistics
-	DatasetName
-	TableName
-	JobName
-*/
-package logging
+package logging // import "google.golang.org/genproto/googleapis/cloud/bigquery/logging/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -94,90 +53,93 @@ type AuditData struct {
 	//	*AuditData_JobQueryDoneResponse
 	Response isAuditData_Response `protobuf_oneof:"response"`
 	// A job completion event.
-	JobCompletedEvent *JobCompletedEvent `protobuf:"bytes,17,opt,name=job_completed_event,json=jobCompletedEvent" json:"job_completed_event,omitempty"`
+	JobCompletedEvent    *JobCompletedEvent `protobuf:"bytes,17,opt,name=job_completed_event,json=jobCompletedEvent,proto3" json:"job_completed_event,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *AuditData) Reset()                    { *m = AuditData{} }
-func (m *AuditData) String() string            { return proto.CompactTextString(m) }
-func (*AuditData) ProtoMessage()               {}
-func (*AuditData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *AuditData) Reset()         { *m = AuditData{} }
+func (m *AuditData) String() string { return proto.CompactTextString(m) }
+func (*AuditData) ProtoMessage()    {}
+func (*AuditData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{0}
+}
+func (m *AuditData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuditData.Unmarshal(m, b)
+}
+func (m *AuditData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuditData.Marshal(b, m, deterministic)
+}
+func (dst *AuditData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditData.Merge(dst, src)
+}
+func (m *AuditData) XXX_Size() int {
+	return xxx_messageInfo_AuditData.Size(m)
+}
+func (m *AuditData) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuditData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AuditData proto.InternalMessageInfo
 
 type isAuditData_Request interface {
 	isAuditData_Request()
 }
-type isAuditData_Response interface {
-	isAuditData_Response()
-}
 
 type AuditData_TableInsertRequest struct {
-	TableInsertRequest *TableInsertRequest `protobuf:"bytes,1,opt,name=table_insert_request,json=tableInsertRequest,oneof"`
+	TableInsertRequest *TableInsertRequest `protobuf:"bytes,1,opt,name=table_insert_request,json=tableInsertRequest,proto3,oneof"`
 }
+
 type AuditData_TableUpdateRequest struct {
-	TableUpdateRequest *TableUpdateRequest `protobuf:"bytes,16,opt,name=table_update_request,json=tableUpdateRequest,oneof"`
+	TableUpdateRequest *TableUpdateRequest `protobuf:"bytes,16,opt,name=table_update_request,json=tableUpdateRequest,proto3,oneof"`
 }
+
 type AuditData_DatasetListRequest struct {
-	DatasetListRequest *DatasetListRequest `protobuf:"bytes,2,opt,name=dataset_list_request,json=datasetListRequest,oneof"`
+	DatasetListRequest *DatasetListRequest `protobuf:"bytes,2,opt,name=dataset_list_request,json=datasetListRequest,proto3,oneof"`
 }
+
 type AuditData_DatasetInsertRequest struct {
-	DatasetInsertRequest *DatasetInsertRequest `protobuf:"bytes,3,opt,name=dataset_insert_request,json=datasetInsertRequest,oneof"`
+	DatasetInsertRequest *DatasetInsertRequest `protobuf:"bytes,3,opt,name=dataset_insert_request,json=datasetInsertRequest,proto3,oneof"`
 }
+
 type AuditData_DatasetUpdateRequest struct {
-	DatasetUpdateRequest *DatasetUpdateRequest `protobuf:"bytes,4,opt,name=dataset_update_request,json=datasetUpdateRequest,oneof"`
+	DatasetUpdateRequest *DatasetUpdateRequest `protobuf:"bytes,4,opt,name=dataset_update_request,json=datasetUpdateRequest,proto3,oneof"`
 }
+
 type AuditData_JobInsertRequest struct {
-	JobInsertRequest *JobInsertRequest `protobuf:"bytes,5,opt,name=job_insert_request,json=jobInsertRequest,oneof"`
+	JobInsertRequest *JobInsertRequest `protobuf:"bytes,5,opt,name=job_insert_request,json=jobInsertRequest,proto3,oneof"`
 }
+
 type AuditData_JobQueryRequest struct {
-	JobQueryRequest *JobQueryRequest `protobuf:"bytes,6,opt,name=job_query_request,json=jobQueryRequest,oneof"`
+	JobQueryRequest *JobQueryRequest `protobuf:"bytes,6,opt,name=job_query_request,json=jobQueryRequest,proto3,oneof"`
 }
+
 type AuditData_JobGetQueryResultsRequest struct {
-	JobGetQueryResultsRequest *JobGetQueryResultsRequest `protobuf:"bytes,7,opt,name=job_get_query_results_request,json=jobGetQueryResultsRequest,oneof"`
+	JobGetQueryResultsRequest *JobGetQueryResultsRequest `protobuf:"bytes,7,opt,name=job_get_query_results_request,json=jobGetQueryResultsRequest,proto3,oneof"`
 }
+
 type AuditData_TableDataListRequest struct {
-	TableDataListRequest *TableDataListRequest `protobuf:"bytes,8,opt,name=table_data_list_request,json=tableDataListRequest,oneof"`
+	TableDataListRequest *TableDataListRequest `protobuf:"bytes,8,opt,name=table_data_list_request,json=tableDataListRequest,proto3,oneof"`
 }
-type AuditData_TableInsertResponse struct {
-	TableInsertResponse *TableInsertResponse `protobuf:"bytes,9,opt,name=table_insert_response,json=tableInsertResponse,oneof"`
-}
-type AuditData_TableUpdateResponse struct {
-	TableUpdateResponse *TableUpdateResponse `protobuf:"bytes,10,opt,name=table_update_response,json=tableUpdateResponse,oneof"`
-}
-type AuditData_DatasetInsertResponse struct {
-	DatasetInsertResponse *DatasetInsertResponse `protobuf:"bytes,11,opt,name=dataset_insert_response,json=datasetInsertResponse,oneof"`
-}
-type AuditData_DatasetUpdateResponse struct {
-	DatasetUpdateResponse *DatasetUpdateResponse `protobuf:"bytes,12,opt,name=dataset_update_response,json=datasetUpdateResponse,oneof"`
-}
-type AuditData_JobInsertResponse struct {
-	JobInsertResponse *JobInsertResponse `protobuf:"bytes,18,opt,name=job_insert_response,json=jobInsertResponse,oneof"`
-}
-type AuditData_JobQueryResponse struct {
-	JobQueryResponse *JobQueryResponse `protobuf:"bytes,13,opt,name=job_query_response,json=jobQueryResponse,oneof"`
-}
-type AuditData_JobGetQueryResultsResponse struct {
-	JobGetQueryResultsResponse *JobGetQueryResultsResponse `protobuf:"bytes,14,opt,name=job_get_query_results_response,json=jobGetQueryResultsResponse,oneof"`
-}
-type AuditData_JobQueryDoneResponse struct {
-	JobQueryDoneResponse *JobQueryDoneResponse `protobuf:"bytes,15,opt,name=job_query_done_response,json=jobQueryDoneResponse,oneof"`
-}
-
-func (*AuditData_TableInsertRequest) isAuditData_Request()          {}
-func (*AuditData_TableUpdateRequest) isAuditData_Request()          {}
-func (*AuditData_DatasetListRequest) isAuditData_Request()          {}
-func (*AuditData_DatasetInsertRequest) isAuditData_Request()        {}
-func (*AuditData_DatasetUpdateRequest) isAuditData_Request()        {}
-func (*AuditData_JobInsertRequest) isAuditData_Request()            {}
-func (*AuditData_JobQueryRequest) isAuditData_Request()             {}
-func (*AuditData_JobGetQueryResultsRequest) isAuditData_Request()   {}
-func (*AuditData_TableDataListRequest) isAuditData_Request()        {}
-func (*AuditData_TableInsertResponse) isAuditData_Response()        {}
-func (*AuditData_TableUpdateResponse) isAuditData_Response()        {}
-func (*AuditData_DatasetInsertResponse) isAuditData_Response()      {}
-func (*AuditData_DatasetUpdateResponse) isAuditData_Response()      {}
-func (*AuditData_JobInsertResponse) isAuditData_Response()          {}
-func (*AuditData_JobQueryResponse) isAuditData_Response()           {}
-func (*AuditData_JobGetQueryResultsResponse) isAuditData_Response() {}
-func (*AuditData_JobQueryDoneResponse) isAuditData_Response()       {}
+
+func (*AuditData_TableInsertRequest) isAuditData_Request() {}
+
+func (*AuditData_TableUpdateRequest) isAuditData_Request() {}
+
+func (*AuditData_DatasetListRequest) isAuditData_Request() {}
+
+func (*AuditData_DatasetInsertRequest) isAuditData_Request() {}
+
+func (*AuditData_DatasetUpdateRequest) isAuditData_Request() {}
+
+func (*AuditData_JobInsertRequest) isAuditData_Request() {}
+
+func (*AuditData_JobQueryRequest) isAuditData_Request() {}
+
+func (*AuditData_JobGetQueryResultsRequest) isAuditData_Request() {}
+
+func (*AuditData_TableDataListRequest) isAuditData_Request() {}
 
 func (m *AuditData) GetRequest() isAuditData_Request {
 	if m != nil {
@@ -185,12 +147,6 @@ func (m *AuditData) GetRequest() isAuditData_Request {
 	}
 	return nil
 }
-func (m *AuditData) GetResponse() isAuditData_Response {
-	if m != nil {
-		return m.Response
-	}
-	return nil
-}
 
 func (m *AuditData) GetTableInsertRequest() *TableInsertRequest {
 	if x, ok := m.GetRequest().(*AuditData_TableInsertRequest); ok {
@@ -255,6 +211,65 @@ func (m *AuditData) GetTableDataListRequest() *TableDataListRequest {
 	return nil
 }
 
+type isAuditData_Response interface {
+	isAuditData_Response()
+}
+
+type AuditData_TableInsertResponse struct {
+	TableInsertResponse *TableInsertResponse `protobuf:"bytes,9,opt,name=table_insert_response,json=tableInsertResponse,proto3,oneof"`
+}
+
+type AuditData_TableUpdateResponse struct {
+	TableUpdateResponse *TableUpdateResponse `protobuf:"bytes,10,opt,name=table_update_response,json=tableUpdateResponse,proto3,oneof"`
+}
+
+type AuditData_DatasetInsertResponse struct {
+	DatasetInsertResponse *DatasetInsertResponse `protobuf:"bytes,11,opt,name=dataset_insert_response,json=datasetInsertResponse,proto3,oneof"`
+}
+
+type AuditData_DatasetUpdateResponse struct {
+	DatasetUpdateResponse *DatasetUpdateResponse `protobuf:"bytes,12,opt,name=dataset_update_response,json=datasetUpdateResponse,proto3,oneof"`
+}
+
+type AuditData_JobInsertResponse struct {
+	JobInsertResponse *JobInsertResponse `protobuf:"bytes,18,opt,name=job_insert_response,json=jobInsertResponse,proto3,oneof"`
+}
+
+type AuditData_JobQueryResponse struct {
+	JobQueryResponse *JobQueryResponse `protobuf:"bytes,13,opt,name=job_query_response,json=jobQueryResponse,proto3,oneof"`
+}
+
+type AuditData_JobGetQueryResultsResponse struct {
+	JobGetQueryResultsResponse *JobGetQueryResultsResponse `protobuf:"bytes,14,opt,name=job_get_query_results_response,json=jobGetQueryResultsResponse,proto3,oneof"`
+}
+
+type AuditData_JobQueryDoneResponse struct {
+	JobQueryDoneResponse *JobQueryDoneResponse `protobuf:"bytes,15,opt,name=job_query_done_response,json=jobQueryDoneResponse,proto3,oneof"`
+}
+
+func (*AuditData_TableInsertResponse) isAuditData_Response() {}
+
+func (*AuditData_TableUpdateResponse) isAuditData_Response() {}
+
+func (*AuditData_DatasetInsertResponse) isAuditData_Response() {}
+
+func (*AuditData_DatasetUpdateResponse) isAuditData_Response() {}
+
+func (*AuditData_JobInsertResponse) isAuditData_Response() {}
+
+func (*AuditData_JobQueryResponse) isAuditData_Response() {}
+
+func (*AuditData_JobGetQueryResultsResponse) isAuditData_Response() {}
+
+func (*AuditData_JobQueryDoneResponse) isAuditData_Response() {}
+
+func (m *AuditData) GetResponse() isAuditData_Response {
+	if m != nil {
+		return m.Response
+	}
+	return nil
+}
+
 func (m *AuditData) GetTableInsertResponse() *TableInsertResponse {
 	if x, ok := m.GetResponse().(*AuditData_TableInsertResponse); ok {
 		return x.TableInsertResponse
@@ -593,47 +608,47 @@ func _AuditData_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Request.(type) {
 	case *AuditData_TableInsertRequest:
 		s := proto.Size(x.TableInsertRequest)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_TableUpdateRequest:
 		s := proto.Size(x.TableUpdateRequest)
-		n += proto.SizeVarint(16<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_DatasetListRequest:
 		s := proto.Size(x.DatasetListRequest)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_DatasetInsertRequest:
 		s := proto.Size(x.DatasetInsertRequest)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_DatasetUpdateRequest:
 		s := proto.Size(x.DatasetUpdateRequest)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_JobInsertRequest:
 		s := proto.Size(x.JobInsertRequest)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_JobQueryRequest:
 		s := proto.Size(x.JobQueryRequest)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_JobGetQueryResultsRequest:
 		s := proto.Size(x.JobGetQueryResultsRequest)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_TableDataListRequest:
 		s := proto.Size(x.TableDataListRequest)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -644,42 +659,42 @@ func _AuditData_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Response.(type) {
 	case *AuditData_TableInsertResponse:
 		s := proto.Size(x.TableInsertResponse)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_TableUpdateResponse:
 		s := proto.Size(x.TableUpdateResponse)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_DatasetInsertResponse:
 		s := proto.Size(x.DatasetInsertResponse)
-		n += proto.SizeVarint(11<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_DatasetUpdateResponse:
 		s := proto.Size(x.DatasetUpdateResponse)
-		n += proto.SizeVarint(12<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_JobInsertResponse:
 		s := proto.Size(x.JobInsertResponse)
-		n += proto.SizeVarint(18<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_JobQueryResponse:
 		s := proto.Size(x.JobQueryResponse)
-		n += proto.SizeVarint(13<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_JobGetQueryResultsResponse:
 		s := proto.Size(x.JobGetQueryResultsResponse)
-		n += proto.SizeVarint(14<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AuditData_JobQueryDoneResponse:
 		s := proto.Size(x.JobQueryDoneResponse)
-		n += proto.SizeVarint(15<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -692,13 +707,35 @@ func _AuditData_OneofSizer(msg proto.Message) (n int) {
 // Table insert request.
 type TableInsertRequest struct {
 	// The new table.
-	Resource *Table `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Table   `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TableInsertRequest) Reset()         { *m = TableInsertRequest{} }
+func (m *TableInsertRequest) String() string { return proto.CompactTextString(m) }
+func (*TableInsertRequest) ProtoMessage()    {}
+func (*TableInsertRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{1}
+}
+func (m *TableInsertRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableInsertRequest.Unmarshal(m, b)
+}
+func (m *TableInsertRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableInsertRequest.Marshal(b, m, deterministic)
+}
+func (dst *TableInsertRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableInsertRequest.Merge(dst, src)
+}
+func (m *TableInsertRequest) XXX_Size() int {
+	return xxx_messageInfo_TableInsertRequest.Size(m)
+}
+func (m *TableInsertRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableInsertRequest.DiscardUnknown(m)
 }
 
-func (m *TableInsertRequest) Reset()                    { *m = TableInsertRequest{} }
-func (m *TableInsertRequest) String() string            { return proto.CompactTextString(m) }
-func (*TableInsertRequest) ProtoMessage()               {}
-func (*TableInsertRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_TableInsertRequest proto.InternalMessageInfo
 
 func (m *TableInsertRequest) GetResource() *Table {
 	if m != nil {
@@ -710,13 +747,35 @@ func (m *TableInsertRequest) GetResource() *Table {
 // Table update request.
 type TableUpdateRequest struct {
 	// The table to be updated.
-	Resource *Table `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Table   `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TableUpdateRequest) Reset()                    { *m = TableUpdateRequest{} }
-func (m *TableUpdateRequest) String() string            { return proto.CompactTextString(m) }
-func (*TableUpdateRequest) ProtoMessage()               {}
-func (*TableUpdateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *TableUpdateRequest) Reset()         { *m = TableUpdateRequest{} }
+func (m *TableUpdateRequest) String() string { return proto.CompactTextString(m) }
+func (*TableUpdateRequest) ProtoMessage()    {}
+func (*TableUpdateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{2}
+}
+func (m *TableUpdateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableUpdateRequest.Unmarshal(m, b)
+}
+func (m *TableUpdateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableUpdateRequest.Marshal(b, m, deterministic)
+}
+func (dst *TableUpdateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableUpdateRequest.Merge(dst, src)
+}
+func (m *TableUpdateRequest) XXX_Size() int {
+	return xxx_messageInfo_TableUpdateRequest.Size(m)
+}
+func (m *TableUpdateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableUpdateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TableUpdateRequest proto.InternalMessageInfo
 
 func (m *TableUpdateRequest) GetResource() *Table {
 	if m != nil {
@@ -728,13 +787,35 @@ func (m *TableUpdateRequest) GetResource() *Table {
 // Table insert response.
 type TableInsertResponse struct {
 	// Final state of the inserted table.
-	Resource *Table `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Table   `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TableInsertResponse) Reset()                    { *m = TableInsertResponse{} }
-func (m *TableInsertResponse) String() string            { return proto.CompactTextString(m) }
-func (*TableInsertResponse) ProtoMessage()               {}
-func (*TableInsertResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *TableInsertResponse) Reset()         { *m = TableInsertResponse{} }
+func (m *TableInsertResponse) String() string { return proto.CompactTextString(m) }
+func (*TableInsertResponse) ProtoMessage()    {}
+func (*TableInsertResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{3}
+}
+func (m *TableInsertResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableInsertResponse.Unmarshal(m, b)
+}
+func (m *TableInsertResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableInsertResponse.Marshal(b, m, deterministic)
+}
+func (dst *TableInsertResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableInsertResponse.Merge(dst, src)
+}
+func (m *TableInsertResponse) XXX_Size() int {
+	return xxx_messageInfo_TableInsertResponse.Size(m)
+}
+func (m *TableInsertResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableInsertResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TableInsertResponse proto.InternalMessageInfo
 
 func (m *TableInsertResponse) GetResource() *Table {
 	if m != nil {
@@ -746,13 +827,35 @@ func (m *TableInsertResponse) GetResource() *Table {
 // Table update response.
 type TableUpdateResponse struct {
 	// Final state of the updated table.
-	Resource *Table `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Table   `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TableUpdateResponse) Reset()                    { *m = TableUpdateResponse{} }
-func (m *TableUpdateResponse) String() string            { return proto.CompactTextString(m) }
-func (*TableUpdateResponse) ProtoMessage()               {}
-func (*TableUpdateResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *TableUpdateResponse) Reset()         { *m = TableUpdateResponse{} }
+func (m *TableUpdateResponse) String() string { return proto.CompactTextString(m) }
+func (*TableUpdateResponse) ProtoMessage()    {}
+func (*TableUpdateResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{4}
+}
+func (m *TableUpdateResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableUpdateResponse.Unmarshal(m, b)
+}
+func (m *TableUpdateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableUpdateResponse.Marshal(b, m, deterministic)
+}
+func (dst *TableUpdateResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableUpdateResponse.Merge(dst, src)
+}
+func (m *TableUpdateResponse) XXX_Size() int {
+	return xxx_messageInfo_TableUpdateResponse.Size(m)
+}
+func (m *TableUpdateResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableUpdateResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TableUpdateResponse proto.InternalMessageInfo
 
 func (m *TableUpdateResponse) GetResource() *Table {
 	if m != nil {
@@ -764,13 +867,35 @@ func (m *TableUpdateResponse) GetResource() *Table {
 // Dataset list request.
 type DatasetListRequest struct {
 	// Whether to list all datasets, including hidden ones.
-	ListAll bool `protobuf:"varint,1,opt,name=list_all,json=listAll" json:"list_all,omitempty"`
+	ListAll              bool     `protobuf:"varint,1,opt,name=list_all,json=listAll,proto3" json:"list_all,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DatasetListRequest) Reset()         { *m = DatasetListRequest{} }
+func (m *DatasetListRequest) String() string { return proto.CompactTextString(m) }
+func (*DatasetListRequest) ProtoMessage()    {}
+func (*DatasetListRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{5}
+}
+func (m *DatasetListRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatasetListRequest.Unmarshal(m, b)
+}
+func (m *DatasetListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatasetListRequest.Marshal(b, m, deterministic)
+}
+func (dst *DatasetListRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetListRequest.Merge(dst, src)
+}
+func (m *DatasetListRequest) XXX_Size() int {
+	return xxx_messageInfo_DatasetListRequest.Size(m)
+}
+func (m *DatasetListRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatasetListRequest.DiscardUnknown(m)
 }
 
-func (m *DatasetListRequest) Reset()                    { *m = DatasetListRequest{} }
-func (m *DatasetListRequest) String() string            { return proto.CompactTextString(m) }
-func (*DatasetListRequest) ProtoMessage()               {}
-func (*DatasetListRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_DatasetListRequest proto.InternalMessageInfo
 
 func (m *DatasetListRequest) GetListAll() bool {
 	if m != nil {
@@ -782,13 +907,35 @@ func (m *DatasetListRequest) GetListAll() bool {
 // Dataset insert request.
 type DatasetInsertRequest struct {
 	// The dataset to be inserted.
-	Resource *Dataset `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Dataset `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DatasetInsertRequest) Reset()         { *m = DatasetInsertRequest{} }
+func (m *DatasetInsertRequest) String() string { return proto.CompactTextString(m) }
+func (*DatasetInsertRequest) ProtoMessage()    {}
+func (*DatasetInsertRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{6}
+}
+func (m *DatasetInsertRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatasetInsertRequest.Unmarshal(m, b)
+}
+func (m *DatasetInsertRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatasetInsertRequest.Marshal(b, m, deterministic)
+}
+func (dst *DatasetInsertRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetInsertRequest.Merge(dst, src)
+}
+func (m *DatasetInsertRequest) XXX_Size() int {
+	return xxx_messageInfo_DatasetInsertRequest.Size(m)
+}
+func (m *DatasetInsertRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatasetInsertRequest.DiscardUnknown(m)
 }
 
-func (m *DatasetInsertRequest) Reset()                    { *m = DatasetInsertRequest{} }
-func (m *DatasetInsertRequest) String() string            { return proto.CompactTextString(m) }
-func (*DatasetInsertRequest) ProtoMessage()               {}
-func (*DatasetInsertRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_DatasetInsertRequest proto.InternalMessageInfo
 
 func (m *DatasetInsertRequest) GetResource() *Dataset {
 	if m != nil {
@@ -800,13 +947,35 @@ func (m *DatasetInsertRequest) GetResource() *Dataset {
 // Dataset insert response.
 type DatasetInsertResponse struct {
 	// Final state of the inserted dataset.
-	Resource *Dataset `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Dataset `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DatasetInsertResponse) Reset()                    { *m = DatasetInsertResponse{} }
-func (m *DatasetInsertResponse) String() string            { return proto.CompactTextString(m) }
-func (*DatasetInsertResponse) ProtoMessage()               {}
-func (*DatasetInsertResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *DatasetInsertResponse) Reset()         { *m = DatasetInsertResponse{} }
+func (m *DatasetInsertResponse) String() string { return proto.CompactTextString(m) }
+func (*DatasetInsertResponse) ProtoMessage()    {}
+func (*DatasetInsertResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{7}
+}
+func (m *DatasetInsertResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatasetInsertResponse.Unmarshal(m, b)
+}
+func (m *DatasetInsertResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatasetInsertResponse.Marshal(b, m, deterministic)
+}
+func (dst *DatasetInsertResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetInsertResponse.Merge(dst, src)
+}
+func (m *DatasetInsertResponse) XXX_Size() int {
+	return xxx_messageInfo_DatasetInsertResponse.Size(m)
+}
+func (m *DatasetInsertResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatasetInsertResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DatasetInsertResponse proto.InternalMessageInfo
 
 func (m *DatasetInsertResponse) GetResource() *Dataset {
 	if m != nil {
@@ -818,13 +987,35 @@ func (m *DatasetInsertResponse) GetResource() *Dataset {
 // Dataset update request.
 type DatasetUpdateRequest struct {
 	// The dataset to be updated.
-	Resource *Dataset `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Dataset `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DatasetUpdateRequest) Reset()                    { *m = DatasetUpdateRequest{} }
-func (m *DatasetUpdateRequest) String() string            { return proto.CompactTextString(m) }
-func (*DatasetUpdateRequest) ProtoMessage()               {}
-func (*DatasetUpdateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *DatasetUpdateRequest) Reset()         { *m = DatasetUpdateRequest{} }
+func (m *DatasetUpdateRequest) String() string { return proto.CompactTextString(m) }
+func (*DatasetUpdateRequest) ProtoMessage()    {}
+func (*DatasetUpdateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{8}
+}
+func (m *DatasetUpdateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatasetUpdateRequest.Unmarshal(m, b)
+}
+func (m *DatasetUpdateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatasetUpdateRequest.Marshal(b, m, deterministic)
+}
+func (dst *DatasetUpdateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetUpdateRequest.Merge(dst, src)
+}
+func (m *DatasetUpdateRequest) XXX_Size() int {
+	return xxx_messageInfo_DatasetUpdateRequest.Size(m)
+}
+func (m *DatasetUpdateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatasetUpdateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DatasetUpdateRequest proto.InternalMessageInfo
 
 func (m *DatasetUpdateRequest) GetResource() *Dataset {
 	if m != nil {
@@ -836,13 +1027,35 @@ func (m *DatasetUpdateRequest) GetResource() *Dataset {
 // Dataset update response.
 type DatasetUpdateResponse struct {
 	// Final state of the updated dataset.
-	Resource *Dataset `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Dataset `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DatasetUpdateResponse) Reset()                    { *m = DatasetUpdateResponse{} }
-func (m *DatasetUpdateResponse) String() string            { return proto.CompactTextString(m) }
-func (*DatasetUpdateResponse) ProtoMessage()               {}
-func (*DatasetUpdateResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *DatasetUpdateResponse) Reset()         { *m = DatasetUpdateResponse{} }
+func (m *DatasetUpdateResponse) String() string { return proto.CompactTextString(m) }
+func (*DatasetUpdateResponse) ProtoMessage()    {}
+func (*DatasetUpdateResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{9}
+}
+func (m *DatasetUpdateResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatasetUpdateResponse.Unmarshal(m, b)
+}
+func (m *DatasetUpdateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatasetUpdateResponse.Marshal(b, m, deterministic)
+}
+func (dst *DatasetUpdateResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetUpdateResponse.Merge(dst, src)
+}
+func (m *DatasetUpdateResponse) XXX_Size() int {
+	return xxx_messageInfo_DatasetUpdateResponse.Size(m)
+}
+func (m *DatasetUpdateResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatasetUpdateResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DatasetUpdateResponse proto.InternalMessageInfo
 
 func (m *DatasetUpdateResponse) GetResource() *Dataset {
 	if m != nil {
@@ -854,13 +1067,35 @@ func (m *DatasetUpdateResponse) GetResource() *Dataset {
 // Job insert request.
 type JobInsertRequest struct {
 	// Job insert request.
-	Resource *Job `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Job     `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobInsertRequest) Reset()                    { *m = JobInsertRequest{} }
-func (m *JobInsertRequest) String() string            { return proto.CompactTextString(m) }
-func (*JobInsertRequest) ProtoMessage()               {}
-func (*JobInsertRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *JobInsertRequest) Reset()         { *m = JobInsertRequest{} }
+func (m *JobInsertRequest) String() string { return proto.CompactTextString(m) }
+func (*JobInsertRequest) ProtoMessage()    {}
+func (*JobInsertRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{10}
+}
+func (m *JobInsertRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobInsertRequest.Unmarshal(m, b)
+}
+func (m *JobInsertRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobInsertRequest.Marshal(b, m, deterministic)
+}
+func (dst *JobInsertRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobInsertRequest.Merge(dst, src)
+}
+func (m *JobInsertRequest) XXX_Size() int {
+	return xxx_messageInfo_JobInsertRequest.Size(m)
+}
+func (m *JobInsertRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobInsertRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobInsertRequest proto.InternalMessageInfo
 
 func (m *JobInsertRequest) GetResource() *Job {
 	if m != nil {
@@ -872,13 +1107,35 @@ func (m *JobInsertRequest) GetResource() *Job {
 // Job insert response.
 type JobInsertResponse struct {
 	// Job insert response.
-	Resource *Job `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             *Job     `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *JobInsertResponse) Reset()         { *m = JobInsertResponse{} }
+func (m *JobInsertResponse) String() string { return proto.CompactTextString(m) }
+func (*JobInsertResponse) ProtoMessage()    {}
+func (*JobInsertResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{11}
+}
+func (m *JobInsertResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobInsertResponse.Unmarshal(m, b)
+}
+func (m *JobInsertResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobInsertResponse.Marshal(b, m, deterministic)
+}
+func (dst *JobInsertResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobInsertResponse.Merge(dst, src)
+}
+func (m *JobInsertResponse) XXX_Size() int {
+	return xxx_messageInfo_JobInsertResponse.Size(m)
+}
+func (m *JobInsertResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobInsertResponse.DiscardUnknown(m)
 }
 
-func (m *JobInsertResponse) Reset()                    { *m = JobInsertResponse{} }
-func (m *JobInsertResponse) String() string            { return proto.CompactTextString(m) }
-func (*JobInsertResponse) ProtoMessage()               {}
-func (*JobInsertResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_JobInsertResponse proto.InternalMessageInfo
 
 func (m *JobInsertResponse) GetResource() *Job {
 	if m != nil {
@@ -890,21 +1147,43 @@ func (m *JobInsertResponse) GetResource() *Job {
 // Job query request.
 type JobQueryRequest struct {
 	// The query.
-	Query string `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
+	Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
 	// The maximum number of results.
-	MaxResults uint32 `protobuf:"varint,2,opt,name=max_results,json=maxResults" json:"max_results,omitempty"`
+	MaxResults uint32 `protobuf:"varint,2,opt,name=max_results,json=maxResults,proto3" json:"max_results,omitempty"`
 	// The default dataset for tables that do not have a dataset specified.
-	DefaultDataset *DatasetName `protobuf:"bytes,3,opt,name=default_dataset,json=defaultDataset" json:"default_dataset,omitempty"`
+	DefaultDataset *DatasetName `protobuf:"bytes,3,opt,name=default_dataset,json=defaultDataset,proto3" json:"default_dataset,omitempty"`
 	// Project that the query should be charged to.
-	ProjectId string `protobuf:"bytes,4,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,4,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// If true, don't actually run the job. Just check that it would run.
-	DryRun bool `protobuf:"varint,5,opt,name=dry_run,json=dryRun" json:"dry_run,omitempty"`
+	DryRun               bool     `protobuf:"varint,5,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobQueryRequest) Reset()                    { *m = JobQueryRequest{} }
-func (m *JobQueryRequest) String() string            { return proto.CompactTextString(m) }
-func (*JobQueryRequest) ProtoMessage()               {}
-func (*JobQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *JobQueryRequest) Reset()         { *m = JobQueryRequest{} }
+func (m *JobQueryRequest) String() string { return proto.CompactTextString(m) }
+func (*JobQueryRequest) ProtoMessage()    {}
+func (*JobQueryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{12}
+}
+func (m *JobQueryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobQueryRequest.Unmarshal(m, b)
+}
+func (m *JobQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobQueryRequest.Marshal(b, m, deterministic)
+}
+func (dst *JobQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobQueryRequest.Merge(dst, src)
+}
+func (m *JobQueryRequest) XXX_Size() int {
+	return xxx_messageInfo_JobQueryRequest.Size(m)
+}
+func (m *JobQueryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobQueryRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobQueryRequest proto.InternalMessageInfo
 
 func (m *JobQueryRequest) GetQuery() string {
 	if m != nil {
@@ -944,15 +1223,37 @@ func (m *JobQueryRequest) GetDryRun() bool {
 // Job query response.
 type JobQueryResponse struct {
 	// The total number of rows in the full query result set.
-	TotalResults uint64 `protobuf:"varint,1,opt,name=total_results,json=totalResults" json:"total_results,omitempty"`
+	TotalResults uint64 `protobuf:"varint,1,opt,name=total_results,json=totalResults,proto3" json:"total_results,omitempty"`
 	// Information about the queried job.
-	Job *Job `protobuf:"bytes,2,opt,name=job" json:"job,omitempty"`
+	Job                  *Job     `protobuf:"bytes,2,opt,name=job,proto3" json:"job,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *JobQueryResponse) Reset()         { *m = JobQueryResponse{} }
+func (m *JobQueryResponse) String() string { return proto.CompactTextString(m) }
+func (*JobQueryResponse) ProtoMessage()    {}
+func (*JobQueryResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{13}
+}
+func (m *JobQueryResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobQueryResponse.Unmarshal(m, b)
+}
+func (m *JobQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobQueryResponse.Marshal(b, m, deterministic)
+}
+func (dst *JobQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobQueryResponse.Merge(dst, src)
+}
+func (m *JobQueryResponse) XXX_Size() int {
+	return xxx_messageInfo_JobQueryResponse.Size(m)
+}
+func (m *JobQueryResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobQueryResponse.DiscardUnknown(m)
 }
 
-func (m *JobQueryResponse) Reset()                    { *m = JobQueryResponse{} }
-func (m *JobQueryResponse) String() string            { return proto.CompactTextString(m) }
-func (*JobQueryResponse) ProtoMessage()               {}
-func (*JobQueryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_JobQueryResponse proto.InternalMessageInfo
 
 func (m *JobQueryResponse) GetTotalResults() uint64 {
 	if m != nil {
@@ -971,15 +1272,37 @@ func (m *JobQueryResponse) GetJob() *Job {
 // Job getQueryResults request.
 type JobGetQueryResultsRequest struct {
 	// Maximum number of results to return.
-	MaxResults uint32 `protobuf:"varint,1,opt,name=max_results,json=maxResults" json:"max_results,omitempty"`
+	MaxResults uint32 `protobuf:"varint,1,opt,name=max_results,json=maxResults,proto3" json:"max_results,omitempty"`
 	// Zero-based row number at which to start.
-	StartRow uint64 `protobuf:"varint,2,opt,name=start_row,json=startRow" json:"start_row,omitempty"`
+	StartRow             uint64   `protobuf:"varint,2,opt,name=start_row,json=startRow,proto3" json:"start_row,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *JobGetQueryResultsRequest) Reset()         { *m = JobGetQueryResultsRequest{} }
+func (m *JobGetQueryResultsRequest) String() string { return proto.CompactTextString(m) }
+func (*JobGetQueryResultsRequest) ProtoMessage()    {}
+func (*JobGetQueryResultsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{14}
+}
+func (m *JobGetQueryResultsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobGetQueryResultsRequest.Unmarshal(m, b)
+}
+func (m *JobGetQueryResultsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobGetQueryResultsRequest.Marshal(b, m, deterministic)
+}
+func (dst *JobGetQueryResultsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobGetQueryResultsRequest.Merge(dst, src)
+}
+func (m *JobGetQueryResultsRequest) XXX_Size() int {
+	return xxx_messageInfo_JobGetQueryResultsRequest.Size(m)
+}
+func (m *JobGetQueryResultsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobGetQueryResultsRequest.DiscardUnknown(m)
 }
 
-func (m *JobGetQueryResultsRequest) Reset()                    { *m = JobGetQueryResultsRequest{} }
-func (m *JobGetQueryResultsRequest) String() string            { return proto.CompactTextString(m) }
-func (*JobGetQueryResultsRequest) ProtoMessage()               {}
-func (*JobGetQueryResultsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_JobGetQueryResultsRequest proto.InternalMessageInfo
 
 func (m *JobGetQueryResultsRequest) GetMaxResults() uint32 {
 	if m != nil {
@@ -998,17 +1321,39 @@ func (m *JobGetQueryResultsRequest) GetStartRow() uint64 {
 // Job getQueryResults response.
 type JobGetQueryResultsResponse struct {
 	// Total number of results in query results.
-	TotalResults uint64 `protobuf:"varint,1,opt,name=total_results,json=totalResults" json:"total_results,omitempty"`
+	TotalResults uint64 `protobuf:"varint,1,opt,name=total_results,json=totalResults,proto3" json:"total_results,omitempty"`
 	// The job that was created to run the query.
 	// It completed if `job.status.state` is `DONE`.
 	// It failed if `job.status.errorResult` is also present.
-	Job *Job `protobuf:"bytes,2,opt,name=job" json:"job,omitempty"`
+	Job                  *Job     `protobuf:"bytes,2,opt,name=job,proto3" json:"job,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobGetQueryResultsResponse) Reset()                    { *m = JobGetQueryResultsResponse{} }
-func (m *JobGetQueryResultsResponse) String() string            { return proto.CompactTextString(m) }
-func (*JobGetQueryResultsResponse) ProtoMessage()               {}
-func (*JobGetQueryResultsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *JobGetQueryResultsResponse) Reset()         { *m = JobGetQueryResultsResponse{} }
+func (m *JobGetQueryResultsResponse) String() string { return proto.CompactTextString(m) }
+func (*JobGetQueryResultsResponse) ProtoMessage()    {}
+func (*JobGetQueryResultsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{15}
+}
+func (m *JobGetQueryResultsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobGetQueryResultsResponse.Unmarshal(m, b)
+}
+func (m *JobGetQueryResultsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobGetQueryResultsResponse.Marshal(b, m, deterministic)
+}
+func (dst *JobGetQueryResultsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobGetQueryResultsResponse.Merge(dst, src)
+}
+func (m *JobGetQueryResultsResponse) XXX_Size() int {
+	return xxx_messageInfo_JobGetQueryResultsResponse.Size(m)
+}
+func (m *JobGetQueryResultsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobGetQueryResultsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobGetQueryResultsResponse proto.InternalMessageInfo
 
 func (m *JobGetQueryResultsResponse) GetTotalResults() uint64 {
 	if m != nil {
@@ -1028,13 +1373,35 @@ func (m *JobGetQueryResultsResponse) GetJob() *Job {
 type JobQueryDoneResponse struct {
 	// The job and status information.
 	// The job completed if `job.status.state` is `DONE`.
-	Job *Job `protobuf:"bytes,1,opt,name=job" json:"job,omitempty"`
+	Job                  *Job     `protobuf:"bytes,1,opt,name=job,proto3" json:"job,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobQueryDoneResponse) Reset()                    { *m = JobQueryDoneResponse{} }
-func (m *JobQueryDoneResponse) String() string            { return proto.CompactTextString(m) }
-func (*JobQueryDoneResponse) ProtoMessage()               {}
-func (*JobQueryDoneResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *JobQueryDoneResponse) Reset()         { *m = JobQueryDoneResponse{} }
+func (m *JobQueryDoneResponse) String() string { return proto.CompactTextString(m) }
+func (*JobQueryDoneResponse) ProtoMessage()    {}
+func (*JobQueryDoneResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{16}
+}
+func (m *JobQueryDoneResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobQueryDoneResponse.Unmarshal(m, b)
+}
+func (m *JobQueryDoneResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobQueryDoneResponse.Marshal(b, m, deterministic)
+}
+func (dst *JobQueryDoneResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobQueryDoneResponse.Merge(dst, src)
+}
+func (m *JobQueryDoneResponse) XXX_Size() int {
+	return xxx_messageInfo_JobQueryDoneResponse.Size(m)
+}
+func (m *JobQueryDoneResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobQueryDoneResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobQueryDoneResponse proto.InternalMessageInfo
 
 func (m *JobQueryDoneResponse) GetJob() *Job {
 	if m != nil {
@@ -1046,15 +1413,37 @@ func (m *JobQueryDoneResponse) GetJob() *Job {
 // Query job completed event.
 type JobCompletedEvent struct {
 	// Name of the event.
-	EventName string `protobuf:"bytes,1,opt,name=event_name,json=eventName" json:"event_name,omitempty"`
+	EventName string `protobuf:"bytes,1,opt,name=event_name,json=eventName,proto3" json:"event_name,omitempty"`
 	// Job information.
-	Job *Job `protobuf:"bytes,2,opt,name=job" json:"job,omitempty"`
+	Job                  *Job     `protobuf:"bytes,2,opt,name=job,proto3" json:"job,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobCompletedEvent) Reset()                    { *m = JobCompletedEvent{} }
-func (m *JobCompletedEvent) String() string            { return proto.CompactTextString(m) }
-func (*JobCompletedEvent) ProtoMessage()               {}
-func (*JobCompletedEvent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *JobCompletedEvent) Reset()         { *m = JobCompletedEvent{} }
+func (m *JobCompletedEvent) String() string { return proto.CompactTextString(m) }
+func (*JobCompletedEvent) ProtoMessage()    {}
+func (*JobCompletedEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{17}
+}
+func (m *JobCompletedEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobCompletedEvent.Unmarshal(m, b)
+}
+func (m *JobCompletedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobCompletedEvent.Marshal(b, m, deterministic)
+}
+func (dst *JobCompletedEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobCompletedEvent.Merge(dst, src)
+}
+func (m *JobCompletedEvent) XXX_Size() int {
+	return xxx_messageInfo_JobCompletedEvent.Size(m)
+}
+func (m *JobCompletedEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobCompletedEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobCompletedEvent proto.InternalMessageInfo
 
 func (m *JobCompletedEvent) GetEventName() string {
 	if m != nil {
@@ -1073,15 +1462,37 @@ func (m *JobCompletedEvent) GetJob() *Job {
 // Table data-list request.
 type TableDataListRequest struct {
 	// Starting row offset.
-	StartRow uint64 `protobuf:"varint,1,opt,name=start_row,json=startRow" json:"start_row,omitempty"`
+	StartRow uint64 `protobuf:"varint,1,opt,name=start_row,json=startRow,proto3" json:"start_row,omitempty"`
 	// Maximum number of results to return.
-	MaxResults uint32 `protobuf:"varint,2,opt,name=max_results,json=maxResults" json:"max_results,omitempty"`
+	MaxResults           uint32   `protobuf:"varint,2,opt,name=max_results,json=maxResults,proto3" json:"max_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TableDataListRequest) Reset()         { *m = TableDataListRequest{} }
+func (m *TableDataListRequest) String() string { return proto.CompactTextString(m) }
+func (*TableDataListRequest) ProtoMessage()    {}
+func (*TableDataListRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{18}
+}
+func (m *TableDataListRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableDataListRequest.Unmarshal(m, b)
+}
+func (m *TableDataListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableDataListRequest.Marshal(b, m, deterministic)
+}
+func (dst *TableDataListRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableDataListRequest.Merge(dst, src)
+}
+func (m *TableDataListRequest) XXX_Size() int {
+	return xxx_messageInfo_TableDataListRequest.Size(m)
+}
+func (m *TableDataListRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableDataListRequest.DiscardUnknown(m)
 }
 
-func (m *TableDataListRequest) Reset()                    { *m = TableDataListRequest{} }
-func (m *TableDataListRequest) String() string            { return proto.CompactTextString(m) }
-func (*TableDataListRequest) ProtoMessage()               {}
-func (*TableDataListRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_TableDataListRequest proto.InternalMessageInfo
 
 func (m *TableDataListRequest) GetStartRow() uint64 {
 	if m != nil {
@@ -1105,28 +1516,50 @@ func (m *TableDataListRequest) GetMaxResults() uint32 {
 // transition.
 type Table struct {
 	// The name of the table.
-	TableName *TableName `protobuf:"bytes,1,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
+	TableName *TableName `protobuf:"bytes,1,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
 	// User-provided metadata for the table.
-	Info *TableInfo `protobuf:"bytes,2,opt,name=info" json:"info,omitempty"`
+	Info *TableInfo `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"`
 	// A JSON representation of the table's schema.
-	SchemaJson string `protobuf:"bytes,8,opt,name=schema_json,json=schemaJson" json:"schema_json,omitempty"`
+	SchemaJson string `protobuf:"bytes,8,opt,name=schema_json,json=schemaJson,proto3" json:"schema_json,omitempty"`
 	// If present, this is a virtual table defined by a SQL query.
-	View *TableViewDefinition `protobuf:"bytes,4,opt,name=view" json:"view,omitempty"`
+	View *TableViewDefinition `protobuf:"bytes,4,opt,name=view,proto3" json:"view,omitempty"`
 	// The expiration date for the table, after which the table
 	// is deleted and the storage reclaimed.
 	// If not present, the table persists indefinitely.
-	ExpireTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=expire_time,json=expireTime" json:"expire_time,omitempty"`
+	ExpireTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// The time the table was created.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the table was last truncated
 	// by an operation with a `writeDisposition` of `WRITE_TRUNCATE`.
-	TruncateTime *google_protobuf2.Timestamp `protobuf:"bytes,7,opt,name=truncate_time,json=truncateTime" json:"truncate_time,omitempty"`
+	TruncateTime         *timestamp.Timestamp `protobuf:"bytes,7,opt,name=truncate_time,json=truncateTime,proto3" json:"truncate_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Table) Reset()         { *m = Table{} }
+func (m *Table) String() string { return proto.CompactTextString(m) }
+func (*Table) ProtoMessage()    {}
+func (*Table) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{19}
+}
+func (m *Table) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Table.Unmarshal(m, b)
+}
+func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Table.Marshal(b, m, deterministic)
+}
+func (dst *Table) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table.Merge(dst, src)
+}
+func (m *Table) XXX_Size() int {
+	return xxx_messageInfo_Table.Size(m)
+}
+func (m *Table) XXX_DiscardUnknown() {
+	xxx_messageInfo_Table.DiscardUnknown(m)
 }
 
-func (m *Table) Reset()                    { *m = Table{} }
-func (m *Table) String() string            { return proto.CompactTextString(m) }
-func (*Table) ProtoMessage()               {}
-func (*Table) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_Table proto.InternalMessageInfo
 
 func (m *Table) GetTableName() *TableName {
 	if m != nil {
@@ -1156,21 +1589,21 @@ func (m *Table) GetView() *TableViewDefinition {
 	return nil
 }
 
-func (m *Table) GetExpireTime() *google_protobuf2.Timestamp {
+func (m *Table) GetExpireTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ExpireTime
 	}
 	return nil
 }
 
-func (m *Table) GetCreateTime() *google_protobuf2.Timestamp {
+func (m *Table) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Table) GetTruncateTime() *google_protobuf2.Timestamp {
+func (m *Table) GetTruncateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.TruncateTime
 	}
@@ -1180,16 +1613,38 @@ func (m *Table) GetTruncateTime() *google_protobuf2.Timestamp {
 // User-provided metadata for a table.
 type TableInfo struct {
 	// A short name for the table, such as`"Analytics Data - Jan 2011"`.
-	FriendlyName string `protobuf:"bytes,1,opt,name=friendly_name,json=friendlyName" json:"friendly_name,omitempty"`
+	FriendlyName string `protobuf:"bytes,1,opt,name=friendly_name,json=friendlyName,proto3" json:"friendly_name,omitempty"`
 	// A long description, perhaps several paragraphs,
 	// describing the table contents in detail.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TableInfo) Reset()         { *m = TableInfo{} }
+func (m *TableInfo) String() string { return proto.CompactTextString(m) }
+func (*TableInfo) ProtoMessage()    {}
+func (*TableInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{20}
+}
+func (m *TableInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableInfo.Unmarshal(m, b)
+}
+func (m *TableInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableInfo.Marshal(b, m, deterministic)
+}
+func (dst *TableInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableInfo.Merge(dst, src)
+}
+func (m *TableInfo) XXX_Size() int {
+	return xxx_messageInfo_TableInfo.Size(m)
+}
+func (m *TableInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableInfo.DiscardUnknown(m)
 }
 
-func (m *TableInfo) Reset()                    { *m = TableInfo{} }
-func (m *TableInfo) String() string            { return proto.CompactTextString(m) }
-func (*TableInfo) ProtoMessage()               {}
-func (*TableInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+var xxx_messageInfo_TableInfo proto.InternalMessageInfo
 
 func (m *TableInfo) GetFriendlyName() string {
 	if m != nil {
@@ -1208,13 +1663,35 @@ func (m *TableInfo) GetDescription() string {
 // Describes a virtual table defined by a SQL query.
 type TableViewDefinition struct {
 	// SQL query defining the view.
-	Query string `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
+	Query                string   `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TableViewDefinition) Reset()                    { *m = TableViewDefinition{} }
-func (m *TableViewDefinition) String() string            { return proto.CompactTextString(m) }
-func (*TableViewDefinition) ProtoMessage()               {}
-func (*TableViewDefinition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+func (m *TableViewDefinition) Reset()         { *m = TableViewDefinition{} }
+func (m *TableViewDefinition) String() string { return proto.CompactTextString(m) }
+func (*TableViewDefinition) ProtoMessage()    {}
+func (*TableViewDefinition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{21}
+}
+func (m *TableViewDefinition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableViewDefinition.Unmarshal(m, b)
+}
+func (m *TableViewDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableViewDefinition.Marshal(b, m, deterministic)
+}
+func (dst *TableViewDefinition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableViewDefinition.Merge(dst, src)
+}
+func (m *TableViewDefinition) XXX_Size() int {
+	return xxx_messageInfo_TableViewDefinition.Size(m)
+}
+func (m *TableViewDefinition) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableViewDefinition.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TableViewDefinition proto.InternalMessageInfo
 
 func (m *TableViewDefinition) GetQuery() string {
 	if m != nil {
@@ -1228,26 +1705,48 @@ func (m *TableViewDefinition) GetQuery() string {
 // for more details on individual fields.
 type Dataset struct {
 	// The name of the dataset.
-	DatasetName *DatasetName `protobuf:"bytes,1,opt,name=dataset_name,json=datasetName" json:"dataset_name,omitempty"`
+	DatasetName *DatasetName `protobuf:"bytes,1,opt,name=dataset_name,json=datasetName,proto3" json:"dataset_name,omitempty"`
 	// User-provided metadata for the dataset.
-	Info *DatasetInfo `protobuf:"bytes,2,opt,name=info" json:"info,omitempty"`
+	Info *DatasetInfo `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"`
 	// The time the dataset was created.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the dataset was last modified.
-	UpdateTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The access control list for the dataset.
-	Acl *BigQueryAcl `protobuf:"bytes,6,opt,name=acl" json:"acl,omitempty"`
+	Acl *BigQueryAcl `protobuf:"bytes,6,opt,name=acl,proto3" json:"acl,omitempty"`
 	// If this field is present, each table that does not specify an
 	// expiration time is assigned an expiration time by adding this
 	// duration to the table's `createTime`.  If this field is empty,
 	// there is no default table expiration time.
-	DefaultTableExpireDuration *google_protobuf1.Duration `protobuf:"bytes,8,opt,name=default_table_expire_duration,json=defaultTableExpireDuration" json:"default_table_expire_duration,omitempty"`
+	DefaultTableExpireDuration *duration.Duration `protobuf:"bytes,8,opt,name=default_table_expire_duration,json=defaultTableExpireDuration,proto3" json:"default_table_expire_duration,omitempty"`
+	XXX_NoUnkeyedLiteral       struct{}           `json:"-"`
+	XXX_unrecognized           []byte             `json:"-"`
+	XXX_sizecache              int32              `json:"-"`
 }
 
-func (m *Dataset) Reset()                    { *m = Dataset{} }
-func (m *Dataset) String() string            { return proto.CompactTextString(m) }
-func (*Dataset) ProtoMessage()               {}
-func (*Dataset) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+func (m *Dataset) Reset()         { *m = Dataset{} }
+func (m *Dataset) String() string { return proto.CompactTextString(m) }
+func (*Dataset) ProtoMessage()    {}
+func (*Dataset) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{22}
+}
+func (m *Dataset) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Dataset.Unmarshal(m, b)
+}
+func (m *Dataset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Dataset.Marshal(b, m, deterministic)
+}
+func (dst *Dataset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dataset.Merge(dst, src)
+}
+func (m *Dataset) XXX_Size() int {
+	return xxx_messageInfo_Dataset.Size(m)
+}
+func (m *Dataset) XXX_DiscardUnknown() {
+	xxx_messageInfo_Dataset.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Dataset proto.InternalMessageInfo
 
 func (m *Dataset) GetDatasetName() *DatasetName {
 	if m != nil {
@@ -1263,14 +1762,14 @@ func (m *Dataset) GetInfo() *DatasetInfo {
 	return nil
 }
 
-func (m *Dataset) GetCreateTime() *google_protobuf2.Timestamp {
+func (m *Dataset) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Dataset) GetUpdateTime() *google_protobuf2.Timestamp {
+func (m *Dataset) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -1284,7 +1783,7 @@ func (m *Dataset) GetAcl() *BigQueryAcl {
 	return nil
 }
 
-func (m *Dataset) GetDefaultTableExpireDuration() *google_protobuf1.Duration {
+func (m *Dataset) GetDefaultTableExpireDuration() *duration.Duration {
 	if m != nil {
 		return m.DefaultTableExpireDuration
 	}
@@ -1294,16 +1793,38 @@ func (m *Dataset) GetDefaultTableExpireDuration() *google_protobuf1.Duration {
 // User-provided metadata for a dataset.
 type DatasetInfo struct {
 	// A short name for the dataset, such as`"Analytics Data 2011"`.
-	FriendlyName string `protobuf:"bytes,1,opt,name=friendly_name,json=friendlyName" json:"friendly_name,omitempty"`
+	FriendlyName string `protobuf:"bytes,1,opt,name=friendly_name,json=friendlyName,proto3" json:"friendly_name,omitempty"`
 	// A long description, perhaps several paragraphs,
 	// describing the dataset contents in detail.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DatasetInfo) Reset()                    { *m = DatasetInfo{} }
-func (m *DatasetInfo) String() string            { return proto.CompactTextString(m) }
-func (*DatasetInfo) ProtoMessage()               {}
-func (*DatasetInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+func (m *DatasetInfo) Reset()         { *m = DatasetInfo{} }
+func (m *DatasetInfo) String() string { return proto.CompactTextString(m) }
+func (*DatasetInfo) ProtoMessage()    {}
+func (*DatasetInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{23}
+}
+func (m *DatasetInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatasetInfo.Unmarshal(m, b)
+}
+func (m *DatasetInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatasetInfo.Marshal(b, m, deterministic)
+}
+func (dst *DatasetInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetInfo.Merge(dst, src)
+}
+func (m *DatasetInfo) XXX_Size() int {
+	return xxx_messageInfo_DatasetInfo.Size(m)
+}
+func (m *DatasetInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatasetInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DatasetInfo proto.InternalMessageInfo
 
 func (m *DatasetInfo) GetFriendlyName() string {
 	if m != nil {
@@ -1322,13 +1843,35 @@ func (m *DatasetInfo) GetDescription() string {
 // An access control list.
 type BigQueryAcl struct {
 	// Access control entry list.
-	Entries []*BigQueryAcl_Entry `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty"`
+	Entries              []*BigQueryAcl_Entry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *BigQueryAcl) Reset()         { *m = BigQueryAcl{} }
+func (m *BigQueryAcl) String() string { return proto.CompactTextString(m) }
+func (*BigQueryAcl) ProtoMessage()    {}
+func (*BigQueryAcl) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{24}
+}
+func (m *BigQueryAcl) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BigQueryAcl.Unmarshal(m, b)
+}
+func (m *BigQueryAcl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BigQueryAcl.Marshal(b, m, deterministic)
+}
+func (dst *BigQueryAcl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryAcl.Merge(dst, src)
+}
+func (m *BigQueryAcl) XXX_Size() int {
+	return xxx_messageInfo_BigQueryAcl.Size(m)
+}
+func (m *BigQueryAcl) XXX_DiscardUnknown() {
+	xxx_messageInfo_BigQueryAcl.DiscardUnknown(m)
 }
 
-func (m *BigQueryAcl) Reset()                    { *m = BigQueryAcl{} }
-func (m *BigQueryAcl) String() string            { return proto.CompactTextString(m) }
-func (*BigQueryAcl) ProtoMessage()               {}
-func (*BigQueryAcl) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
+var xxx_messageInfo_BigQueryAcl proto.InternalMessageInfo
 
 func (m *BigQueryAcl) GetEntries() []*BigQueryAcl_Entry {
 	if m != nil {
@@ -1340,24 +1883,46 @@ func (m *BigQueryAcl) GetEntries() []*BigQueryAcl_Entry {
 // Access control entry.
 type BigQueryAcl_Entry struct {
 	// The granted role, which can be `READER`, `WRITER`, or `OWNER`.
-	Role string `protobuf:"bytes,1,opt,name=role" json:"role,omitempty"`
+	Role string `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
 	// Grants access to a group identified by an email address.
-	GroupEmail string `protobuf:"bytes,2,opt,name=group_email,json=groupEmail" json:"group_email,omitempty"`
+	GroupEmail string `protobuf:"bytes,2,opt,name=group_email,json=groupEmail,proto3" json:"group_email,omitempty"`
 	// Grants access to a user identified by an email address.
-	UserEmail string `protobuf:"bytes,3,opt,name=user_email,json=userEmail" json:"user_email,omitempty"`
+	UserEmail string `protobuf:"bytes,3,opt,name=user_email,json=userEmail,proto3" json:"user_email,omitempty"`
 	// Grants access to all members of a domain.
-	Domain string `protobuf:"bytes,4,opt,name=domain" json:"domain,omitempty"`
+	Domain string `protobuf:"bytes,4,opt,name=domain,proto3" json:"domain,omitempty"`
 	// Grants access to special groups. Valid groups are `PROJECT_OWNERS`,
 	// `PROJECT_READERS`, `PROJECT_WRITERS` and `ALL_AUTHENTICATED_USERS`.
-	SpecialGroup string `protobuf:"bytes,5,opt,name=special_group,json=specialGroup" json:"special_group,omitempty"`
+	SpecialGroup string `protobuf:"bytes,5,opt,name=special_group,json=specialGroup,proto3" json:"special_group,omitempty"`
 	// Grants access to a BigQuery View.
-	ViewName *TableName `protobuf:"bytes,6,opt,name=view_name,json=viewName" json:"view_name,omitempty"`
+	ViewName             *TableName `protobuf:"bytes,6,opt,name=view_name,json=viewName,proto3" json:"view_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *BigQueryAcl_Entry) Reset()                    { *m = BigQueryAcl_Entry{} }
-func (m *BigQueryAcl_Entry) String() string            { return proto.CompactTextString(m) }
-func (*BigQueryAcl_Entry) ProtoMessage()               {}
-func (*BigQueryAcl_Entry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24, 0} }
+func (m *BigQueryAcl_Entry) Reset()         { *m = BigQueryAcl_Entry{} }
+func (m *BigQueryAcl_Entry) String() string { return proto.CompactTextString(m) }
+func (*BigQueryAcl_Entry) ProtoMessage()    {}
+func (*BigQueryAcl_Entry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{24, 0}
+}
+func (m *BigQueryAcl_Entry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BigQueryAcl_Entry.Unmarshal(m, b)
+}
+func (m *BigQueryAcl_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BigQueryAcl_Entry.Marshal(b, m, deterministic)
+}
+func (dst *BigQueryAcl_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryAcl_Entry.Merge(dst, src)
+}
+func (m *BigQueryAcl_Entry) XXX_Size() int {
+	return xxx_messageInfo_BigQueryAcl_Entry.Size(m)
+}
+func (m *BigQueryAcl_Entry) XXX_DiscardUnknown() {
+	xxx_messageInfo_BigQueryAcl_Entry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BigQueryAcl_Entry proto.InternalMessageInfo
 
 func (m *BigQueryAcl_Entry) GetRole() string {
 	if m != nil {
@@ -1404,19 +1969,41 @@ func (m *BigQueryAcl_Entry) GetViewName() *TableName {
 // Describes a job.
 type Job struct {
 	// Job name.
-	JobName *JobName `protobuf:"bytes,1,opt,name=job_name,json=jobName" json:"job_name,omitempty"`
+	JobName *JobName `protobuf:"bytes,1,opt,name=job_name,json=jobName,proto3" json:"job_name,omitempty"`
 	// Job configuration.
-	JobConfiguration *JobConfiguration `protobuf:"bytes,2,opt,name=job_configuration,json=jobConfiguration" json:"job_configuration,omitempty"`
+	JobConfiguration *JobConfiguration `protobuf:"bytes,2,opt,name=job_configuration,json=jobConfiguration,proto3" json:"job_configuration,omitempty"`
 	// Job status.
-	JobStatus *JobStatus `protobuf:"bytes,3,opt,name=job_status,json=jobStatus" json:"job_status,omitempty"`
+	JobStatus *JobStatus `protobuf:"bytes,3,opt,name=job_status,json=jobStatus,proto3" json:"job_status,omitempty"`
 	// Job statistics.
-	JobStatistics *JobStatistics `protobuf:"bytes,4,opt,name=job_statistics,json=jobStatistics" json:"job_statistics,omitempty"`
+	JobStatistics        *JobStatistics `protobuf:"bytes,4,opt,name=job_statistics,json=jobStatistics,proto3" json:"job_statistics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *Job) Reset()         { *m = Job{} }
+func (m *Job) String() string { return proto.CompactTextString(m) }
+func (*Job) ProtoMessage()    {}
+func (*Job) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{25}
+}
+func (m *Job) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Job.Unmarshal(m, b)
+}
+func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
+}
+func (dst *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(dst, src)
+}
+func (m *Job) XXX_Size() int {
+	return xxx_messageInfo_Job.Size(m)
+}
+func (m *Job) XXX_DiscardUnknown() {
+	xxx_messageInfo_Job.DiscardUnknown(m)
 }
 
-func (m *Job) Reset()                    { *m = Job{} }
-func (m *Job) String() string            { return proto.CompactTextString(m) }
-func (*Job) ProtoMessage()               {}
-func (*Job) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
+var xxx_messageInfo_Job proto.InternalMessageInfo
 
 func (m *Job) GetJobName() *JobName {
 	if m != nil {
@@ -1459,34 +2046,62 @@ type JobConfiguration struct {
 	//	*JobConfiguration_TableCopy_
 	Configuration isJobConfiguration_Configuration `protobuf_oneof:"configuration"`
 	// If true, don't actually run the job. Just check that it would run.
-	DryRun bool `protobuf:"varint,9,opt,name=dry_run,json=dryRun" json:"dry_run,omitempty"`
+	DryRun               bool     `protobuf:"varint,9,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *JobConfiguration) Reset()         { *m = JobConfiguration{} }
+func (m *JobConfiguration) String() string { return proto.CompactTextString(m) }
+func (*JobConfiguration) ProtoMessage()    {}
+func (*JobConfiguration) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{26}
+}
+func (m *JobConfiguration) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobConfiguration.Unmarshal(m, b)
+}
+func (m *JobConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobConfiguration.Marshal(b, m, deterministic)
+}
+func (dst *JobConfiguration) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration.Merge(dst, src)
+}
+func (m *JobConfiguration) XXX_Size() int {
+	return xxx_messageInfo_JobConfiguration.Size(m)
+}
+func (m *JobConfiguration) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobConfiguration.DiscardUnknown(m)
 }
 
-func (m *JobConfiguration) Reset()                    { *m = JobConfiguration{} }
-func (m *JobConfiguration) String() string            { return proto.CompactTextString(m) }
-func (*JobConfiguration) ProtoMessage()               {}
-func (*JobConfiguration) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
+var xxx_messageInfo_JobConfiguration proto.InternalMessageInfo
 
 type isJobConfiguration_Configuration interface {
 	isJobConfiguration_Configuration()
 }
 
 type JobConfiguration_Query_ struct {
-	Query *JobConfiguration_Query `protobuf:"bytes,5,opt,name=query,oneof"`
+	Query *JobConfiguration_Query `protobuf:"bytes,5,opt,name=query,proto3,oneof"`
 }
+
 type JobConfiguration_Load_ struct {
-	Load *JobConfiguration_Load `protobuf:"bytes,6,opt,name=load,oneof"`
+	Load *JobConfiguration_Load `protobuf:"bytes,6,opt,name=load,proto3,oneof"`
 }
+
 type JobConfiguration_Extract_ struct {
-	Extract *JobConfiguration_Extract `protobuf:"bytes,7,opt,name=extract,oneof"`
+	Extract *JobConfiguration_Extract `protobuf:"bytes,7,opt,name=extract,proto3,oneof"`
 }
+
 type JobConfiguration_TableCopy_ struct {
-	TableCopy *JobConfiguration_TableCopy `protobuf:"bytes,8,opt,name=table_copy,json=tableCopy,oneof"`
+	TableCopy *JobConfiguration_TableCopy `protobuf:"bytes,8,opt,name=table_copy,json=tableCopy,proto3,oneof"`
 }
 
-func (*JobConfiguration_Query_) isJobConfiguration_Configuration()     {}
-func (*JobConfiguration_Load_) isJobConfiguration_Configuration()      {}
-func (*JobConfiguration_Extract_) isJobConfiguration_Configuration()   {}
+func (*JobConfiguration_Query_) isJobConfiguration_Configuration() {}
+
+func (*JobConfiguration_Load_) isJobConfiguration_Configuration() {}
+
+func (*JobConfiguration_Extract_) isJobConfiguration_Configuration() {}
+
 func (*JobConfiguration_TableCopy_) isJobConfiguration_Configuration() {}
 
 func (m *JobConfiguration) GetConfiguration() isJobConfiguration_Configuration {
@@ -1618,22 +2233,22 @@ func _JobConfiguration_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Configuration.(type) {
 	case *JobConfiguration_Query_:
 		s := proto.Size(x.Query)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *JobConfiguration_Load_:
 		s := proto.Size(x.Load)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *JobConfiguration_Extract_:
 		s := proto.Size(x.Extract)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *JobConfiguration_TableCopy_:
 		s := proto.Size(x.TableCopy)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1646,26 +2261,48 @@ func _JobConfiguration_OneofSizer(msg proto.Message) (n int) {
 // Describes a query job, which executes a SQL-like query.
 type JobConfiguration_Query struct {
 	// The SQL query to run.
-	Query string `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
+	Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
 	// The table where results are written.
-	DestinationTable *TableName `protobuf:"bytes,2,opt,name=destination_table,json=destinationTable" json:"destination_table,omitempty"`
+	DestinationTable *TableName `protobuf:"bytes,2,opt,name=destination_table,json=destinationTable,proto3" json:"destination_table,omitempty"`
 	// Describes when a job is allowed to create a table:
 	// `CREATE_IF_NEEDED`, `CREATE_NEVER`.
-	CreateDisposition string `protobuf:"bytes,3,opt,name=create_disposition,json=createDisposition" json:"create_disposition,omitempty"`
+	CreateDisposition string `protobuf:"bytes,3,opt,name=create_disposition,json=createDisposition,proto3" json:"create_disposition,omitempty"`
 	// Describes how writes affect existing tables:
 	// `WRITE_TRUNCATE`, `WRITE_APPEND`, `WRITE_EMPTY`.
-	WriteDisposition string `protobuf:"bytes,4,opt,name=write_disposition,json=writeDisposition" json:"write_disposition,omitempty"`
+	WriteDisposition string `protobuf:"bytes,4,opt,name=write_disposition,json=writeDisposition,proto3" json:"write_disposition,omitempty"`
 	// If a table name is specified without a dataset in a query,
 	// this dataset will be added to table name.
-	DefaultDataset *DatasetName `protobuf:"bytes,5,opt,name=default_dataset,json=defaultDataset" json:"default_dataset,omitempty"`
+	DefaultDataset *DatasetName `protobuf:"bytes,5,opt,name=default_dataset,json=defaultDataset,proto3" json:"default_dataset,omitempty"`
 	// Describes data sources outside BigQuery, if needed.
-	TableDefinitions []*TableDefinition `protobuf:"bytes,6,rep,name=table_definitions,json=tableDefinitions" json:"table_definitions,omitempty"`
+	TableDefinitions     []*TableDefinition `protobuf:"bytes,6,rep,name=table_definitions,json=tableDefinitions,proto3" json:"table_definitions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *JobConfiguration_Query) Reset()                    { *m = JobConfiguration_Query{} }
-func (m *JobConfiguration_Query) String() string            { return proto.CompactTextString(m) }
-func (*JobConfiguration_Query) ProtoMessage()               {}
-func (*JobConfiguration_Query) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26, 0} }
+func (m *JobConfiguration_Query) Reset()         { *m = JobConfiguration_Query{} }
+func (m *JobConfiguration_Query) String() string { return proto.CompactTextString(m) }
+func (*JobConfiguration_Query) ProtoMessage()    {}
+func (*JobConfiguration_Query) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{26, 0}
+}
+func (m *JobConfiguration_Query) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobConfiguration_Query.Unmarshal(m, b)
+}
+func (m *JobConfiguration_Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobConfiguration_Query.Marshal(b, m, deterministic)
+}
+func (dst *JobConfiguration_Query) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration_Query.Merge(dst, src)
+}
+func (m *JobConfiguration_Query) XXX_Size() int {
+	return xxx_messageInfo_JobConfiguration_Query.Size(m)
+}
+func (m *JobConfiguration_Query) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobConfiguration_Query.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobConfiguration_Query proto.InternalMessageInfo
 
 func (m *JobConfiguration_Query) GetQuery() string {
 	if m != nil {
@@ -1714,23 +2351,45 @@ func (m *JobConfiguration_Query) GetTableDefinitions() []*TableDefinition {
 type JobConfiguration_Load struct {
 	// URIs for the data to be imported. Only Google Cloud Storage URIs are
 	// supported.
-	SourceUris []string `protobuf:"bytes,1,rep,name=source_uris,json=sourceUris" json:"source_uris,omitempty"`
+	SourceUris []string `protobuf:"bytes,1,rep,name=source_uris,json=sourceUris,proto3" json:"source_uris,omitempty"`
 	// The table schema in JSON format representation of a TableSchema.
-	SchemaJson string `protobuf:"bytes,6,opt,name=schema_json,json=schemaJson" json:"schema_json,omitempty"`
+	SchemaJson string `protobuf:"bytes,6,opt,name=schema_json,json=schemaJson,proto3" json:"schema_json,omitempty"`
 	// The table where the imported data is written.
-	DestinationTable *TableName `protobuf:"bytes,3,opt,name=destination_table,json=destinationTable" json:"destination_table,omitempty"`
+	DestinationTable *TableName `protobuf:"bytes,3,opt,name=destination_table,json=destinationTable,proto3" json:"destination_table,omitempty"`
 	// Describes when a job is allowed to create a table:
 	// `CREATE_IF_NEEDED`, `CREATE_NEVER`.
-	CreateDisposition string `protobuf:"bytes,4,opt,name=create_disposition,json=createDisposition" json:"create_disposition,omitempty"`
+	CreateDisposition string `protobuf:"bytes,4,opt,name=create_disposition,json=createDisposition,proto3" json:"create_disposition,omitempty"`
 	// Describes how writes affect existing tables:
 	// `WRITE_TRUNCATE`, `WRITE_APPEND`, `WRITE_EMPTY`.
-	WriteDisposition string `protobuf:"bytes,5,opt,name=write_disposition,json=writeDisposition" json:"write_disposition,omitempty"`
+	WriteDisposition     string   `protobuf:"bytes,5,opt,name=write_disposition,json=writeDisposition,proto3" json:"write_disposition,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobConfiguration_Load) Reset()                    { *m = JobConfiguration_Load{} }
-func (m *JobConfiguration_Load) String() string            { return proto.CompactTextString(m) }
-func (*JobConfiguration_Load) ProtoMessage()               {}
-func (*JobConfiguration_Load) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26, 1} }
+func (m *JobConfiguration_Load) Reset()         { *m = JobConfiguration_Load{} }
+func (m *JobConfiguration_Load) String() string { return proto.CompactTextString(m) }
+func (*JobConfiguration_Load) ProtoMessage()    {}
+func (*JobConfiguration_Load) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{26, 1}
+}
+func (m *JobConfiguration_Load) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobConfiguration_Load.Unmarshal(m, b)
+}
+func (m *JobConfiguration_Load) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobConfiguration_Load.Marshal(b, m, deterministic)
+}
+func (dst *JobConfiguration_Load) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration_Load.Merge(dst, src)
+}
+func (m *JobConfiguration_Load) XXX_Size() int {
+	return xxx_messageInfo_JobConfiguration_Load.Size(m)
+}
+func (m *JobConfiguration_Load) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobConfiguration_Load.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobConfiguration_Load proto.InternalMessageInfo
 
 func (m *JobConfiguration_Load) GetSourceUris() []string {
 	if m != nil {
@@ -1771,15 +2430,37 @@ func (m *JobConfiguration_Load) GetWriteDisposition() string {
 // via the  export pipeline.
 type JobConfiguration_Extract struct {
 	// Google Cloud Storage URIs where extracted data should be written.
-	DestinationUris []string `protobuf:"bytes,1,rep,name=destination_uris,json=destinationUris" json:"destination_uris,omitempty"`
+	DestinationUris []string `protobuf:"bytes,1,rep,name=destination_uris,json=destinationUris,proto3" json:"destination_uris,omitempty"`
 	// The source table.
-	SourceTable *TableName `protobuf:"bytes,2,opt,name=source_table,json=sourceTable" json:"source_table,omitempty"`
+	SourceTable          *TableName `protobuf:"bytes,2,opt,name=source_table,json=sourceTable,proto3" json:"source_table,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *JobConfiguration_Extract) Reset()         { *m = JobConfiguration_Extract{} }
+func (m *JobConfiguration_Extract) String() string { return proto.CompactTextString(m) }
+func (*JobConfiguration_Extract) ProtoMessage()    {}
+func (*JobConfiguration_Extract) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{26, 2}
+}
+func (m *JobConfiguration_Extract) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobConfiguration_Extract.Unmarshal(m, b)
+}
+func (m *JobConfiguration_Extract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobConfiguration_Extract.Marshal(b, m, deterministic)
+}
+func (dst *JobConfiguration_Extract) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration_Extract.Merge(dst, src)
+}
+func (m *JobConfiguration_Extract) XXX_Size() int {
+	return xxx_messageInfo_JobConfiguration_Extract.Size(m)
+}
+func (m *JobConfiguration_Extract) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobConfiguration_Extract.DiscardUnknown(m)
 }
 
-func (m *JobConfiguration_Extract) Reset()                    { *m = JobConfiguration_Extract{} }
-func (m *JobConfiguration_Extract) String() string            { return proto.CompactTextString(m) }
-func (*JobConfiguration_Extract) ProtoMessage()               {}
-func (*JobConfiguration_Extract) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26, 2} }
+var xxx_messageInfo_JobConfiguration_Extract proto.InternalMessageInfo
 
 func (m *JobConfiguration_Extract) GetDestinationUris() []string {
 	if m != nil {
@@ -1798,21 +2479,43 @@ func (m *JobConfiguration_Extract) GetSourceTable() *TableName {
 // Describes a copy job, which copies an existing table to another table.
 type JobConfiguration_TableCopy struct {
 	// Source tables.
-	SourceTables []*TableName `protobuf:"bytes,1,rep,name=source_tables,json=sourceTables" json:"source_tables,omitempty"`
+	SourceTables []*TableName `protobuf:"bytes,1,rep,name=source_tables,json=sourceTables,proto3" json:"source_tables,omitempty"`
 	// Destination table.
-	DestinationTable *TableName `protobuf:"bytes,2,opt,name=destination_table,json=destinationTable" json:"destination_table,omitempty"`
+	DestinationTable *TableName `protobuf:"bytes,2,opt,name=destination_table,json=destinationTable,proto3" json:"destination_table,omitempty"`
 	// Describes when a job is allowed to create a table:
 	// `CREATE_IF_NEEDED`, `CREATE_NEVER`.
-	CreateDisposition string `protobuf:"bytes,3,opt,name=create_disposition,json=createDisposition" json:"create_disposition,omitempty"`
+	CreateDisposition string `protobuf:"bytes,3,opt,name=create_disposition,json=createDisposition,proto3" json:"create_disposition,omitempty"`
 	// Describes how writes affect existing tables:
 	// `WRITE_TRUNCATE`, `WRITE_APPEND`, `WRITE_EMPTY`.
-	WriteDisposition string `protobuf:"bytes,4,opt,name=write_disposition,json=writeDisposition" json:"write_disposition,omitempty"`
+	WriteDisposition     string   `protobuf:"bytes,4,opt,name=write_disposition,json=writeDisposition,proto3" json:"write_disposition,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *JobConfiguration_TableCopy) Reset()         { *m = JobConfiguration_TableCopy{} }
+func (m *JobConfiguration_TableCopy) String() string { return proto.CompactTextString(m) }
+func (*JobConfiguration_TableCopy) ProtoMessage()    {}
+func (*JobConfiguration_TableCopy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{26, 3}
+}
+func (m *JobConfiguration_TableCopy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobConfiguration_TableCopy.Unmarshal(m, b)
+}
+func (m *JobConfiguration_TableCopy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobConfiguration_TableCopy.Marshal(b, m, deterministic)
+}
+func (dst *JobConfiguration_TableCopy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobConfiguration_TableCopy.Merge(dst, src)
+}
+func (m *JobConfiguration_TableCopy) XXX_Size() int {
+	return xxx_messageInfo_JobConfiguration_TableCopy.Size(m)
+}
+func (m *JobConfiguration_TableCopy) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobConfiguration_TableCopy.DiscardUnknown(m)
 }
 
-func (m *JobConfiguration_TableCopy) Reset()                    { *m = JobConfiguration_TableCopy{} }
-func (m *JobConfiguration_TableCopy) String() string            { return proto.CompactTextString(m) }
-func (*JobConfiguration_TableCopy) ProtoMessage()               {}
-func (*JobConfiguration_TableCopy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26, 3} }
+var xxx_messageInfo_JobConfiguration_TableCopy proto.InternalMessageInfo
 
 func (m *JobConfiguration_TableCopy) GetSourceTables() []*TableName {
 	if m != nil {
@@ -1845,15 +2548,37 @@ func (m *JobConfiguration_TableCopy) GetWriteDisposition() string {
 // Describes an external data source used in a query.
 type TableDefinition struct {
 	// Name of the table, used in queries.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Google Cloud Storage URIs for the data to be imported.
-	SourceUris []string `protobuf:"bytes,2,rep,name=source_uris,json=sourceUris" json:"source_uris,omitempty"`
+	SourceUris           []string `protobuf:"bytes,2,rep,name=source_uris,json=sourceUris,proto3" json:"source_uris,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TableDefinition) Reset()         { *m = TableDefinition{} }
+func (m *TableDefinition) String() string { return proto.CompactTextString(m) }
+func (*TableDefinition) ProtoMessage()    {}
+func (*TableDefinition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{27}
+}
+func (m *TableDefinition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableDefinition.Unmarshal(m, b)
+}
+func (m *TableDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableDefinition.Marshal(b, m, deterministic)
+}
+func (dst *TableDefinition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableDefinition.Merge(dst, src)
+}
+func (m *TableDefinition) XXX_Size() int {
+	return xxx_messageInfo_TableDefinition.Size(m)
+}
+func (m *TableDefinition) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableDefinition.DiscardUnknown(m)
 }
 
-func (m *TableDefinition) Reset()                    { *m = TableDefinition{} }
-func (m *TableDefinition) String() string            { return proto.CompactTextString(m) }
-func (*TableDefinition) ProtoMessage()               {}
-func (*TableDefinition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
+var xxx_messageInfo_TableDefinition proto.InternalMessageInfo
 
 func (m *TableDefinition) GetName() string {
 	if m != nil {
@@ -1872,15 +2597,37 @@ func (m *TableDefinition) GetSourceUris() []string {
 // Running state of a job.
 type JobStatus struct {
 	// State of a job: `PENDING`, `RUNNING`, or `DONE`.
-	State string `protobuf:"bytes,1,opt,name=state" json:"state,omitempty"`
+	State string `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"`
 	// If the job did not complete successfully, this field describes why.
-	Error *google_rpc.Status `protobuf:"bytes,2,opt,name=error" json:"error,omitempty"`
+	Error                *status.Status `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *JobStatus) Reset()                    { *m = JobStatus{} }
-func (m *JobStatus) String() string            { return proto.CompactTextString(m) }
-func (*JobStatus) ProtoMessage()               {}
-func (*JobStatus) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
+func (m *JobStatus) Reset()         { *m = JobStatus{} }
+func (m *JobStatus) String() string { return proto.CompactTextString(m) }
+func (*JobStatus) ProtoMessage()    {}
+func (*JobStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{28}
+}
+func (m *JobStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobStatus.Unmarshal(m, b)
+}
+func (m *JobStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobStatus.Marshal(b, m, deterministic)
+}
+func (dst *JobStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobStatus.Merge(dst, src)
+}
+func (m *JobStatus) XXX_Size() int {
+	return xxx_messageInfo_JobStatus.Size(m)
+}
+func (m *JobStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobStatus proto.InternalMessageInfo
 
 func (m *JobStatus) GetState() string {
 	if m != nil {
@@ -1889,7 +2636,7 @@ func (m *JobStatus) GetState() string {
 	return ""
 }
 
-func (m *JobStatus) GetError() *google_rpc.Status {
+func (m *JobStatus) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
@@ -1899,39 +2646,61 @@ func (m *JobStatus) GetError() *google_rpc.Status {
 // Job statistics that may change after a job starts.
 type JobStatistics struct {
 	// Time when the job was created.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time when the job started.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time when the job ended.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Total bytes processed for a job.
-	TotalProcessedBytes int64 `protobuf:"varint,4,opt,name=total_processed_bytes,json=totalProcessedBytes" json:"total_processed_bytes,omitempty"`
+	TotalProcessedBytes int64 `protobuf:"varint,4,opt,name=total_processed_bytes,json=totalProcessedBytes,proto3" json:"total_processed_bytes,omitempty"`
 	// Processed bytes, adjusted by the job's CPU usage.
-	TotalBilledBytes int64 `protobuf:"varint,5,opt,name=total_billed_bytes,json=totalBilledBytes" json:"total_billed_bytes,omitempty"`
+	TotalBilledBytes int64 `protobuf:"varint,5,opt,name=total_billed_bytes,json=totalBilledBytes,proto3" json:"total_billed_bytes,omitempty"`
 	// The tier assigned by CPU-based billing.
-	BillingTier int32 `protobuf:"varint,7,opt,name=billing_tier,json=billingTier" json:"billing_tier,omitempty"`
+	BillingTier          int32    `protobuf:"varint,7,opt,name=billing_tier,json=billingTier,proto3" json:"billing_tier,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobStatistics) Reset()                    { *m = JobStatistics{} }
-func (m *JobStatistics) String() string            { return proto.CompactTextString(m) }
-func (*JobStatistics) ProtoMessage()               {}
-func (*JobStatistics) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
+func (m *JobStatistics) Reset()         { *m = JobStatistics{} }
+func (m *JobStatistics) String() string { return proto.CompactTextString(m) }
+func (*JobStatistics) ProtoMessage()    {}
+func (*JobStatistics) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{29}
+}
+func (m *JobStatistics) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobStatistics.Unmarshal(m, b)
+}
+func (m *JobStatistics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobStatistics.Marshal(b, m, deterministic)
+}
+func (dst *JobStatistics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobStatistics.Merge(dst, src)
+}
+func (m *JobStatistics) XXX_Size() int {
+	return xxx_messageInfo_JobStatistics.Size(m)
+}
+func (m *JobStatistics) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobStatistics.DiscardUnknown(m)
+}
 
-func (m *JobStatistics) GetCreateTime() *google_protobuf2.Timestamp {
+var xxx_messageInfo_JobStatistics proto.InternalMessageInfo
+
+func (m *JobStatistics) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *JobStatistics) GetStartTime() *google_protobuf2.Timestamp {
+func (m *JobStatistics) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *JobStatistics) GetEndTime() *google_protobuf2.Timestamp {
+func (m *JobStatistics) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -1962,15 +2731,37 @@ func (m *JobStatistics) GetBillingTier() int32 {
 // The fully-qualified name for a dataset.
 type DatasetName struct {
 	// The project ID.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The dataset ID within the project.
-	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId            string   `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DatasetName) Reset()                    { *m = DatasetName{} }
-func (m *DatasetName) String() string            { return proto.CompactTextString(m) }
-func (*DatasetName) ProtoMessage()               {}
-func (*DatasetName) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
+func (m *DatasetName) Reset()         { *m = DatasetName{} }
+func (m *DatasetName) String() string { return proto.CompactTextString(m) }
+func (*DatasetName) ProtoMessage()    {}
+func (*DatasetName) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{30}
+}
+func (m *DatasetName) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatasetName.Unmarshal(m, b)
+}
+func (m *DatasetName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatasetName.Marshal(b, m, deterministic)
+}
+func (dst *DatasetName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatasetName.Merge(dst, src)
+}
+func (m *DatasetName) XXX_Size() int {
+	return xxx_messageInfo_DatasetName.Size(m)
+}
+func (m *DatasetName) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatasetName.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DatasetName proto.InternalMessageInfo
 
 func (m *DatasetName) GetProjectId() string {
 	if m != nil {
@@ -1989,17 +2780,39 @@ func (m *DatasetName) GetDatasetId() string {
 // The fully-qualified name for a table.
 type TableName struct {
 	// The project ID.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The dataset ID within the project.
-	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	// The table ID of the table within the dataset.
-	TableId string `protobuf:"bytes,3,opt,name=table_id,json=tableId" json:"table_id,omitempty"`
+	TableId              string   `protobuf:"bytes,3,opt,name=table_id,json=tableId,proto3" json:"table_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TableName) Reset()         { *m = TableName{} }
+func (m *TableName) String() string { return proto.CompactTextString(m) }
+func (*TableName) ProtoMessage()    {}
+func (*TableName) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{31}
+}
+func (m *TableName) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableName.Unmarshal(m, b)
+}
+func (m *TableName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableName.Marshal(b, m, deterministic)
+}
+func (dst *TableName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableName.Merge(dst, src)
+}
+func (m *TableName) XXX_Size() int {
+	return xxx_messageInfo_TableName.Size(m)
+}
+func (m *TableName) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableName.DiscardUnknown(m)
 }
 
-func (m *TableName) Reset()                    { *m = TableName{} }
-func (m *TableName) String() string            { return proto.CompactTextString(m) }
-func (*TableName) ProtoMessage()               {}
-func (*TableName) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
+var xxx_messageInfo_TableName proto.InternalMessageInfo
 
 func (m *TableName) GetProjectId() string {
 	if m != nil {
@@ -2025,15 +2838,37 @@ func (m *TableName) GetTableId() string {
 // The fully-qualified name for a job.
 type JobName struct {
 	// The project ID.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The job ID within the project.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobName) Reset()                    { *m = JobName{} }
-func (m *JobName) String() string            { return proto.CompactTextString(m) }
-func (*JobName) ProtoMessage()               {}
-func (*JobName) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
+func (m *JobName) Reset()         { *m = JobName{} }
+func (m *JobName) String() string { return proto.CompactTextString(m) }
+func (*JobName) ProtoMessage()    {}
+func (*JobName) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_c8c983cfffeff6d8, []int{32}
+}
+func (m *JobName) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobName.Unmarshal(m, b)
+}
+func (m *JobName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobName.Marshal(b, m, deterministic)
+}
+func (dst *JobName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobName.Merge(dst, src)
+}
+func (m *JobName) XXX_Size() int {
+	return xxx_messageInfo_JobName.Size(m)
+}
+func (m *JobName) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobName.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobName proto.InternalMessageInfo
 
 func (m *JobName) GetProjectId() string {
 	if m != nil {
@@ -2090,9 +2925,11 @@ func init() {
 	proto.RegisterType((*JobName)(nil), "google.cloud.bigquery.logging.v1.JobName")
 }
 
-func init() { proto.RegisterFile("google/cloud/bigquery/logging/v1/audit_data.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/bigquery/logging/v1/audit_data.proto", fileDescriptor_audit_data_c8c983cfffeff6d8)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_audit_data_c8c983cfffeff6d8 = []byte{
 	// 2036 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4f, 0x73, 0x1b, 0x49,
 	0x15, 0x8f, 0x2c, 0xc9, 0x92, 0x9e, 0xec, 0xd8, 0xee, 0xd8, 0x9b, 0x58, 0x90, 0xdd, 0x30, 0x40,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/billing/v1/cloud_billing.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/billing/v1/cloud_billing.pb.go
index 238193b8..9c691ef1 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/billing/v1/cloud_billing.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/billing/v1/cloud_billing.pb.go
@@ -1,24 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/billing/v1/cloud_billing.proto
 
-/*
-Package billing is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/billing/v1/cloud_billing.proto
-
-It has these top-level messages:
-	BillingAccount
-	ProjectBillingInfo
-	GetBillingAccountRequest
-	ListBillingAccountsRequest
-	ListBillingAccountsResponse
-	ListProjectBillingInfoRequest
-	ListProjectBillingInfoResponse
-	GetProjectBillingInfoRequest
-	UpdateProjectBillingInfoRequest
-*/
-package billing
+package billing // import "google.golang.org/genproto/googleapis/cloud/billing/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -49,20 +32,42 @@ type BillingAccount struct {
 	// `billingAccounts/{billing_account_id}`. For example,
 	// `billingAccounts/012345-567890-ABCDEF` would be the resource name for
 	// billing account `012345-567890-ABCDEF`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// True if the billing account is open, and will therefore be charged for any
 	// usage on associated projects. False if the billing account is closed, and
 	// therefore projects associated with it will be unable to use paid services.
-	Open bool `protobuf:"varint,2,opt,name=open" json:"open,omitempty"`
+	Open bool `protobuf:"varint,2,opt,name=open,proto3" json:"open,omitempty"`
 	// The display name given to the billing account, such as `My Billing
 	// Account`. This name is displayed in the Google Cloud Console.
-	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName          string   `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BillingAccount) Reset()                    { *m = BillingAccount{} }
-func (m *BillingAccount) String() string            { return proto.CompactTextString(m) }
-func (*BillingAccount) ProtoMessage()               {}
-func (*BillingAccount) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *BillingAccount) Reset()         { *m = BillingAccount{} }
+func (m *BillingAccount) String() string { return proto.CompactTextString(m) }
+func (*BillingAccount) ProtoMessage()    {}
+func (*BillingAccount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{0}
+}
+func (m *BillingAccount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BillingAccount.Unmarshal(m, b)
+}
+func (m *BillingAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BillingAccount.Marshal(b, m, deterministic)
+}
+func (dst *BillingAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BillingAccount.Merge(dst, src)
+}
+func (m *BillingAccount) XXX_Size() int {
+	return xxx_messageInfo_BillingAccount.Size(m)
+}
+func (m *BillingAccount) XXX_DiscardUnknown() {
+	xxx_messageInfo_BillingAccount.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BillingAccount proto.InternalMessageInfo
 
 func (m *BillingAccount) GetName() string {
 	if m != nil {
@@ -93,25 +98,47 @@ type ProjectBillingInfo struct {
 	// `projects/{project_id}/billingInfo`. For example, the resource name for the
 	// billing information for project `tokyo-rain-123` would be
 	// `projects/tokyo-rain-123/billingInfo`. This field is read-only.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The ID of the project that this `ProjectBillingInfo` represents, such as
 	// `tokyo-rain-123`. This is a convenience field so that you don't need to
 	// parse the `name` field to obtain a project ID. This field is read-only.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The resource name of the billing account associated with the project, if
 	// any. For example, `billingAccounts/012345-567890-ABCDEF`.
-	BillingAccountName string `protobuf:"bytes,3,opt,name=billing_account_name,json=billingAccountName" json:"billing_account_name,omitempty"`
+	BillingAccountName string `protobuf:"bytes,3,opt,name=billing_account_name,json=billingAccountName,proto3" json:"billing_account_name,omitempty"`
 	// True if the project is associated with an open billing account, to which
 	// usage on the project is charged. False if the project is associated with a
 	// closed billing account, or no billing account at all, and therefore cannot
 	// use paid services. This field is read-only.
-	BillingEnabled bool `protobuf:"varint,4,opt,name=billing_enabled,json=billingEnabled" json:"billing_enabled,omitempty"`
+	BillingEnabled       bool     `protobuf:"varint,4,opt,name=billing_enabled,json=billingEnabled,proto3" json:"billing_enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ProjectBillingInfo) Reset()                    { *m = ProjectBillingInfo{} }
-func (m *ProjectBillingInfo) String() string            { return proto.CompactTextString(m) }
-func (*ProjectBillingInfo) ProtoMessage()               {}
-func (*ProjectBillingInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ProjectBillingInfo) Reset()         { *m = ProjectBillingInfo{} }
+func (m *ProjectBillingInfo) String() string { return proto.CompactTextString(m) }
+func (*ProjectBillingInfo) ProtoMessage()    {}
+func (*ProjectBillingInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{1}
+}
+func (m *ProjectBillingInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProjectBillingInfo.Unmarshal(m, b)
+}
+func (m *ProjectBillingInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProjectBillingInfo.Marshal(b, m, deterministic)
+}
+func (dst *ProjectBillingInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectBillingInfo.Merge(dst, src)
+}
+func (m *ProjectBillingInfo) XXX_Size() int {
+	return xxx_messageInfo_ProjectBillingInfo.Size(m)
+}
+func (m *ProjectBillingInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProjectBillingInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ProjectBillingInfo proto.InternalMessageInfo
 
 func (m *ProjectBillingInfo) GetName() string {
 	if m != nil {
@@ -145,13 +172,35 @@ func (m *ProjectBillingInfo) GetBillingEnabled() bool {
 type GetBillingAccountRequest struct {
 	// The resource name of the billing account to retrieve. For example,
 	// `billingAccounts/012345-567890-ABCDEF`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetBillingAccountRequest) Reset()         { *m = GetBillingAccountRequest{} }
+func (m *GetBillingAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*GetBillingAccountRequest) ProtoMessage()    {}
+func (*GetBillingAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{2}
+}
+func (m *GetBillingAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetBillingAccountRequest.Unmarshal(m, b)
+}
+func (m *GetBillingAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetBillingAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetBillingAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBillingAccountRequest.Merge(dst, src)
+}
+func (m *GetBillingAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_GetBillingAccountRequest.Size(m)
+}
+func (m *GetBillingAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetBillingAccountRequest.DiscardUnknown(m)
 }
 
-func (m *GetBillingAccountRequest) Reset()                    { *m = GetBillingAccountRequest{} }
-func (m *GetBillingAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetBillingAccountRequest) ProtoMessage()               {}
-func (*GetBillingAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_GetBillingAccountRequest proto.InternalMessageInfo
 
 func (m *GetBillingAccountRequest) GetName() string {
 	if m != nil {
@@ -164,17 +213,39 @@ func (m *GetBillingAccountRequest) GetName() string {
 type ListBillingAccountsRequest struct {
 	// Requested page size. The maximum page size is 100; this is also the
 	// default.
-	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A token identifying a page of results to return. This should be a
 	// `next_page_token` value returned from a previous `ListBillingAccounts`
 	// call. If unspecified, the first page of results is returned.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListBillingAccountsRequest) Reset()                    { *m = ListBillingAccountsRequest{} }
-func (m *ListBillingAccountsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListBillingAccountsRequest) ProtoMessage()               {}
-func (*ListBillingAccountsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ListBillingAccountsRequest) Reset()         { *m = ListBillingAccountsRequest{} }
+func (m *ListBillingAccountsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListBillingAccountsRequest) ProtoMessage()    {}
+func (*ListBillingAccountsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{3}
+}
+func (m *ListBillingAccountsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBillingAccountsRequest.Unmarshal(m, b)
+}
+func (m *ListBillingAccountsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBillingAccountsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListBillingAccountsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBillingAccountsRequest.Merge(dst, src)
+}
+func (m *ListBillingAccountsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListBillingAccountsRequest.Size(m)
+}
+func (m *ListBillingAccountsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBillingAccountsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListBillingAccountsRequest proto.InternalMessageInfo
 
 func (m *ListBillingAccountsRequest) GetPageSize() int32 {
 	if m != nil {
@@ -193,17 +264,39 @@ func (m *ListBillingAccountsRequest) GetPageToken() string {
 // Response message for `ListBillingAccounts`.
 type ListBillingAccountsResponse struct {
 	// A list of billing accounts.
-	BillingAccounts []*BillingAccount `protobuf:"bytes,1,rep,name=billing_accounts,json=billingAccounts" json:"billing_accounts,omitempty"`
+	BillingAccounts []*BillingAccount `protobuf:"bytes,1,rep,name=billing_accounts,json=billingAccounts,proto3" json:"billing_accounts,omitempty"`
 	// A token to retrieve the next page of results. To retrieve the next page,
 	// call `ListBillingAccounts` again with the `page_token` field set to this
 	// value. This field is empty if there are no more results to retrieve.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListBillingAccountsResponse) Reset()                    { *m = ListBillingAccountsResponse{} }
-func (m *ListBillingAccountsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListBillingAccountsResponse) ProtoMessage()               {}
-func (*ListBillingAccountsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ListBillingAccountsResponse) Reset()         { *m = ListBillingAccountsResponse{} }
+func (m *ListBillingAccountsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListBillingAccountsResponse) ProtoMessage()    {}
+func (*ListBillingAccountsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{4}
+}
+func (m *ListBillingAccountsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBillingAccountsResponse.Unmarshal(m, b)
+}
+func (m *ListBillingAccountsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBillingAccountsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListBillingAccountsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBillingAccountsResponse.Merge(dst, src)
+}
+func (m *ListBillingAccountsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListBillingAccountsResponse.Size(m)
+}
+func (m *ListBillingAccountsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBillingAccountsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListBillingAccountsResponse proto.InternalMessageInfo
 
 func (m *ListBillingAccountsResponse) GetBillingAccounts() []*BillingAccount {
 	if m != nil {
@@ -223,20 +316,42 @@ func (m *ListBillingAccountsResponse) GetNextPageToken() string {
 type ListProjectBillingInfoRequest struct {
 	// The resource name of the billing account associated with the projects that
 	// you want to list. For example, `billingAccounts/012345-567890-ABCDEF`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Requested page size. The maximum page size is 100; this is also the
 	// default.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A token identifying a page of results to be returned. This should be a
 	// `next_page_token` value returned from a previous `ListProjectBillingInfo`
 	// call. If unspecified, the first page of results is returned.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListProjectBillingInfoRequest) Reset()                    { *m = ListProjectBillingInfoRequest{} }
-func (m *ListProjectBillingInfoRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListProjectBillingInfoRequest) ProtoMessage()               {}
-func (*ListProjectBillingInfoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ListProjectBillingInfoRequest) Reset()         { *m = ListProjectBillingInfoRequest{} }
+func (m *ListProjectBillingInfoRequest) String() string { return proto.CompactTextString(m) }
+func (*ListProjectBillingInfoRequest) ProtoMessage()    {}
+func (*ListProjectBillingInfoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{5}
+}
+func (m *ListProjectBillingInfoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListProjectBillingInfoRequest.Unmarshal(m, b)
+}
+func (m *ListProjectBillingInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListProjectBillingInfoRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProjectBillingInfoRequest.Merge(dst, src)
+}
+func (m *ListProjectBillingInfoRequest) XXX_Size() int {
+	return xxx_messageInfo_ListProjectBillingInfoRequest.Size(m)
+}
+func (m *ListProjectBillingInfoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListProjectBillingInfoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListProjectBillingInfoRequest proto.InternalMessageInfo
 
 func (m *ListProjectBillingInfoRequest) GetName() string {
 	if m != nil {
@@ -263,17 +378,39 @@ func (m *ListProjectBillingInfoRequest) GetPageToken() string {
 type ListProjectBillingInfoResponse struct {
 	// A list of `ProjectBillingInfo` resources representing the projects
 	// associated with the billing account.
-	ProjectBillingInfo []*ProjectBillingInfo `protobuf:"bytes,1,rep,name=project_billing_info,json=projectBillingInfo" json:"project_billing_info,omitempty"`
+	ProjectBillingInfo []*ProjectBillingInfo `protobuf:"bytes,1,rep,name=project_billing_info,json=projectBillingInfo,proto3" json:"project_billing_info,omitempty"`
 	// A token to retrieve the next page of results. To retrieve the next page,
 	// call `ListProjectBillingInfo` again with the `page_token` field set to this
 	// value. This field is empty if there are no more results to retrieve.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListProjectBillingInfoResponse) Reset()                    { *m = ListProjectBillingInfoResponse{} }
-func (m *ListProjectBillingInfoResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListProjectBillingInfoResponse) ProtoMessage()               {}
-func (*ListProjectBillingInfoResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *ListProjectBillingInfoResponse) Reset()         { *m = ListProjectBillingInfoResponse{} }
+func (m *ListProjectBillingInfoResponse) String() string { return proto.CompactTextString(m) }
+func (*ListProjectBillingInfoResponse) ProtoMessage()    {}
+func (*ListProjectBillingInfoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{6}
+}
+func (m *ListProjectBillingInfoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListProjectBillingInfoResponse.Unmarshal(m, b)
+}
+func (m *ListProjectBillingInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListProjectBillingInfoResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListProjectBillingInfoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProjectBillingInfoResponse.Merge(dst, src)
+}
+func (m *ListProjectBillingInfoResponse) XXX_Size() int {
+	return xxx_messageInfo_ListProjectBillingInfoResponse.Size(m)
+}
+func (m *ListProjectBillingInfoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListProjectBillingInfoResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListProjectBillingInfoResponse proto.InternalMessageInfo
 
 func (m *ListProjectBillingInfoResponse) GetProjectBillingInfo() []*ProjectBillingInfo {
 	if m != nil {
@@ -293,13 +430,35 @@ func (m *ListProjectBillingInfoResponse) GetNextPageToken() string {
 type GetProjectBillingInfoRequest struct {
 	// The resource name of the project for which billing information is
 	// retrieved. For example, `projects/tokyo-rain-123`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetProjectBillingInfoRequest) Reset()                    { *m = GetProjectBillingInfoRequest{} }
-func (m *GetProjectBillingInfoRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetProjectBillingInfoRequest) ProtoMessage()               {}
-func (*GetProjectBillingInfoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *GetProjectBillingInfoRequest) Reset()         { *m = GetProjectBillingInfoRequest{} }
+func (m *GetProjectBillingInfoRequest) String() string { return proto.CompactTextString(m) }
+func (*GetProjectBillingInfoRequest) ProtoMessage()    {}
+func (*GetProjectBillingInfoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{7}
+}
+func (m *GetProjectBillingInfoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetProjectBillingInfoRequest.Unmarshal(m, b)
+}
+func (m *GetProjectBillingInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetProjectBillingInfoRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProjectBillingInfoRequest.Merge(dst, src)
+}
+func (m *GetProjectBillingInfoRequest) XXX_Size() int {
+	return xxx_messageInfo_GetProjectBillingInfoRequest.Size(m)
+}
+func (m *GetProjectBillingInfoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetProjectBillingInfoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetProjectBillingInfoRequest proto.InternalMessageInfo
 
 func (m *GetProjectBillingInfoRequest) GetName() string {
 	if m != nil {
@@ -312,16 +471,38 @@ func (m *GetProjectBillingInfoRequest) GetName() string {
 type UpdateProjectBillingInfoRequest struct {
 	// The resource name of the project associated with the billing information
 	// that you want to update. For example, `projects/tokyo-rain-123`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The new billing information for the project. Read-only fields are ignored;
 	// thus, you may leave empty all fields except `billing_account_name`.
-	ProjectBillingInfo *ProjectBillingInfo `protobuf:"bytes,2,opt,name=project_billing_info,json=projectBillingInfo" json:"project_billing_info,omitempty"`
+	ProjectBillingInfo   *ProjectBillingInfo `protobuf:"bytes,2,opt,name=project_billing_info,json=projectBillingInfo,proto3" json:"project_billing_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *UpdateProjectBillingInfoRequest) Reset()         { *m = UpdateProjectBillingInfoRequest{} }
+func (m *UpdateProjectBillingInfoRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateProjectBillingInfoRequest) ProtoMessage()    {}
+func (*UpdateProjectBillingInfoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_billing_868724f2532f6f7f, []int{8}
+}
+func (m *UpdateProjectBillingInfoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateProjectBillingInfoRequest.Unmarshal(m, b)
+}
+func (m *UpdateProjectBillingInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateProjectBillingInfoRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateProjectBillingInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProjectBillingInfoRequest.Merge(dst, src)
+}
+func (m *UpdateProjectBillingInfoRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateProjectBillingInfoRequest.Size(m)
+}
+func (m *UpdateProjectBillingInfoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateProjectBillingInfoRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateProjectBillingInfoRequest) Reset()                    { *m = UpdateProjectBillingInfoRequest{} }
-func (m *UpdateProjectBillingInfoRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateProjectBillingInfoRequest) ProtoMessage()               {}
-func (*UpdateProjectBillingInfoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_UpdateProjectBillingInfoRequest proto.InternalMessageInfo
 
 func (m *UpdateProjectBillingInfoRequest) GetName() string {
 	if m != nil {
@@ -357,8 +538,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for CloudBilling service
-
+// CloudBillingClient is the client API for CloudBilling service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type CloudBillingClient interface {
 	// Gets information about a billing account. The current authenticated user
 	// must be an [owner of the billing
@@ -420,7 +602,7 @@ func NewCloudBillingClient(cc *grpc.ClientConn) CloudBillingClient {
 
 func (c *cloudBillingClient) GetBillingAccount(ctx context.Context, in *GetBillingAccountRequest, opts ...grpc.CallOption) (*BillingAccount, error) {
 	out := new(BillingAccount)
-	err := grpc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/GetBillingAccount", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/GetBillingAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -429,7 +611,7 @@ func (c *cloudBillingClient) GetBillingAccount(ctx context.Context, in *GetBilli
 
 func (c *cloudBillingClient) ListBillingAccounts(ctx context.Context, in *ListBillingAccountsRequest, opts ...grpc.CallOption) (*ListBillingAccountsResponse, error) {
 	out := new(ListBillingAccountsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/ListBillingAccounts", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/ListBillingAccounts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -438,7 +620,7 @@ func (c *cloudBillingClient) ListBillingAccounts(ctx context.Context, in *ListBi
 
 func (c *cloudBillingClient) ListProjectBillingInfo(ctx context.Context, in *ListProjectBillingInfoRequest, opts ...grpc.CallOption) (*ListProjectBillingInfoResponse, error) {
 	out := new(ListProjectBillingInfoResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/ListProjectBillingInfo", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/ListProjectBillingInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -447,7 +629,7 @@ func (c *cloudBillingClient) ListProjectBillingInfo(ctx context.Context, in *Lis
 
 func (c *cloudBillingClient) GetProjectBillingInfo(ctx context.Context, in *GetProjectBillingInfoRequest, opts ...grpc.CallOption) (*ProjectBillingInfo, error) {
 	out := new(ProjectBillingInfo)
-	err := grpc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/GetProjectBillingInfo", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/GetProjectBillingInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -456,15 +638,14 @@ func (c *cloudBillingClient) GetProjectBillingInfo(ctx context.Context, in *GetP
 
 func (c *cloudBillingClient) UpdateProjectBillingInfo(ctx context.Context, in *UpdateProjectBillingInfoRequest, opts ...grpc.CallOption) (*ProjectBillingInfo, error) {
 	out := new(ProjectBillingInfo)
-	err := grpc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for CloudBilling service
-
+// CloudBillingServer is the server API for CloudBilling service.
 type CloudBillingServer interface {
 	// Gets information about a billing account. The current authenticated user
 	// must be an [owner of the billing
@@ -639,9 +820,11 @@ var _CloudBilling_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/billing/v1/cloud_billing.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/billing/v1/cloud_billing.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/billing/v1/cloud_billing.proto", fileDescriptor_cloud_billing_868724f2532f6f7f)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_cloud_billing_868724f2532f6f7f = []byte{
 	// 667 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x4e, 0xd4, 0x40,
 	0x14, 0xce, 0x00, 0x12, 0xf6, 0x80, 0x20, 0x03, 0xe8, 0x66, 0x17, 0x10, 0xea, 0x0f, 0x28, 0xb1,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/clusters.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/clusters.pb.go
index c3ef596c..ef342474 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/clusters.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/clusters.pb.go
@@ -1,68 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/clusters.proto
 
-/*
-Package dataproc is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/dataproc/v1/clusters.proto
-	google/cloud/dataproc/v1/jobs.proto
-	google/cloud/dataproc/v1/operations.proto
-
-It has these top-level messages:
-	Cluster
-	ClusterConfig
-	GceClusterConfig
-	InstanceGroupConfig
-	ManagedGroupConfig
-	AcceleratorConfig
-	DiskConfig
-	NodeInitializationAction
-	ClusterStatus
-	SoftwareConfig
-	ClusterMetrics
-	CreateClusterRequest
-	UpdateClusterRequest
-	DeleteClusterRequest
-	GetClusterRequest
-	ListClustersRequest
-	ListClustersResponse
-	DiagnoseClusterRequest
-	DiagnoseClusterResults
-	LoggingConfig
-	HadoopJob
-	SparkJob
-	PySparkJob
-	QueryList
-	HiveJob
-	SparkSqlJob
-	PigJob
-	JobPlacement
-	JobStatus
-	JobReference
-	YarnApplication
-	Job
-	JobScheduling
-	SubmitJobRequest
-	GetJobRequest
-	ListJobsRequest
-	UpdateJobRequest
-	ListJobsResponse
-	CancelJobRequest
-	DeleteJobRequest
-	ClusterOperationStatus
-	ClusterOperationMetadata
-*/
-package dataproc
+package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf5 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -118,7 +66,9 @@ var ClusterStatus_State_value = map[string]int32{
 func (x ClusterStatus_State) String() string {
 	return proto.EnumName(ClusterStatus_State_name, int32(x))
 }
-func (ClusterStatus_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{8, 0} }
+func (ClusterStatus_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{8, 0}
+}
 
 type ClusterStatus_Substate int32
 
@@ -151,44 +101,68 @@ var ClusterStatus_Substate_value = map[string]int32{
 func (x ClusterStatus_Substate) String() string {
 	return proto.EnumName(ClusterStatus_Substate_name, int32(x))
 }
-func (ClusterStatus_Substate) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{8, 1} }
+func (ClusterStatus_Substate) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{8, 1}
+}
 
 // Describes the identifying information, config, and status of
 // a cluster of Google Compute Engine instances.
 type Cluster struct {
 	// Required. The Google Cloud Platform project ID that the cluster belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The cluster name. Cluster names within a project must be
 	// unique. Names of deleted clusters can be reused.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Required. The cluster config. Note that Cloud Dataproc may set
 	// default values, and values may change when clusters are updated.
-	Config *ClusterConfig `protobuf:"bytes,3,opt,name=config" json:"config,omitempty"`
+	Config *ClusterConfig `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"`
 	// Optional. The labels to associate with this cluster.
 	// Label **keys** must contain 1 to 63 characters, and must conform to
 	// [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	// Label **values** may be empty, but, if present, must contain 1 to 63
 	// characters, and must conform to [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	// No more than 32 labels can be associated with a cluster.
-	Labels map[string]string `protobuf:"bytes,8,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,8,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output-only. Cluster status.
-	Status *ClusterStatus `protobuf:"bytes,4,opt,name=status" json:"status,omitempty"`
+	Status *ClusterStatus `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"`
 	// Output-only. The previous cluster status.
-	StatusHistory []*ClusterStatus `protobuf:"bytes,7,rep,name=status_history,json=statusHistory" json:"status_history,omitempty"`
+	StatusHistory []*ClusterStatus `protobuf:"bytes,7,rep,name=status_history,json=statusHistory,proto3" json:"status_history,omitempty"`
 	// Output-only. A cluster UUID (Unique Universal Identifier). Cloud Dataproc
 	// generates this value when it creates the cluster.
-	ClusterUuid string `protobuf:"bytes,6,opt,name=cluster_uuid,json=clusterUuid" json:"cluster_uuid,omitempty"`
+	ClusterUuid string `protobuf:"bytes,6,opt,name=cluster_uuid,json=clusterUuid,proto3" json:"cluster_uuid,omitempty"`
 	// Contains cluster daemon metrics such as HDFS and YARN stats.
 	//
 	// **Beta Feature**: This report is available for testing purposes only. It may
 	// be changed before final release.
-	Metrics *ClusterMetrics `protobuf:"bytes,9,opt,name=metrics" json:"metrics,omitempty"`
+	Metrics              *ClusterMetrics `protobuf:"bytes,9,opt,name=metrics,proto3" json:"metrics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Cluster) Reset()         { *m = Cluster{} }
+func (m *Cluster) String() string { return proto.CompactTextString(m) }
+func (*Cluster) ProtoMessage()    {}
+func (*Cluster) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{0}
+}
+func (m *Cluster) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cluster.Unmarshal(m, b)
+}
+func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
+}
+func (dst *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(dst, src)
+}
+func (m *Cluster) XXX_Size() int {
+	return xxx_messageInfo_Cluster.Size(m)
+}
+func (m *Cluster) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cluster.DiscardUnknown(m)
 }
 
-func (m *Cluster) Reset()                    { *m = Cluster{} }
-func (m *Cluster) String() string            { return proto.CompactTextString(m) }
-func (*Cluster) ProtoMessage()               {}
-func (*Cluster) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Cluster proto.InternalMessageInfo
 
 func (m *Cluster) GetProjectId() string {
 	if m != nil {
@@ -254,21 +228,21 @@ type ClusterConfig struct {
 	// ASIA, or EU) for your cluster's staging bucket according to the Google
 	// Compute Engine zone where your cluster is deployed, and then it will create
 	// and manage this project-level, per-location bucket for you.
-	ConfigBucket string `protobuf:"bytes,1,opt,name=config_bucket,json=configBucket" json:"config_bucket,omitempty"`
+	ConfigBucket string `protobuf:"bytes,1,opt,name=config_bucket,json=configBucket,proto3" json:"config_bucket,omitempty"`
 	// Required. The shared Google Compute Engine config settings for
 	// all instances in a cluster.
-	GceClusterConfig *GceClusterConfig `protobuf:"bytes,8,opt,name=gce_cluster_config,json=gceClusterConfig" json:"gce_cluster_config,omitempty"`
+	GceClusterConfig *GceClusterConfig `protobuf:"bytes,8,opt,name=gce_cluster_config,json=gceClusterConfig,proto3" json:"gce_cluster_config,omitempty"`
 	// Optional. The Google Compute Engine config settings for
 	// the master instance in a cluster.
-	MasterConfig *InstanceGroupConfig `protobuf:"bytes,9,opt,name=master_config,json=masterConfig" json:"master_config,omitempty"`
+	MasterConfig *InstanceGroupConfig `protobuf:"bytes,9,opt,name=master_config,json=masterConfig,proto3" json:"master_config,omitempty"`
 	// Optional. The Google Compute Engine config settings for
 	// worker instances in a cluster.
-	WorkerConfig *InstanceGroupConfig `protobuf:"bytes,10,opt,name=worker_config,json=workerConfig" json:"worker_config,omitempty"`
+	WorkerConfig *InstanceGroupConfig `protobuf:"bytes,10,opt,name=worker_config,json=workerConfig,proto3" json:"worker_config,omitempty"`
 	// Optional. The Google Compute Engine config settings for
 	// additional worker instances in a cluster.
-	SecondaryWorkerConfig *InstanceGroupConfig `protobuf:"bytes,12,opt,name=secondary_worker_config,json=secondaryWorkerConfig" json:"secondary_worker_config,omitempty"`
+	SecondaryWorkerConfig *InstanceGroupConfig `protobuf:"bytes,12,opt,name=secondary_worker_config,json=secondaryWorkerConfig,proto3" json:"secondary_worker_config,omitempty"`
 	// Optional. The config settings for software inside the cluster.
-	SoftwareConfig *SoftwareConfig `protobuf:"bytes,13,opt,name=software_config,json=softwareConfig" json:"software_config,omitempty"`
+	SoftwareConfig *SoftwareConfig `protobuf:"bytes,13,opt,name=software_config,json=softwareConfig,proto3" json:"software_config,omitempty"`
 	// Optional. Commands to execute on each node after config is
 	// completed. By default, executables are run on master and all worker nodes.
 	// You can test a node's `role` metadata to run an executable on
@@ -280,13 +254,35 @@ type ClusterConfig struct {
 	//     else
 	//       ... worker specific actions ...
 	//     fi
-	InitializationActions []*NodeInitializationAction `protobuf:"bytes,11,rep,name=initialization_actions,json=initializationActions" json:"initialization_actions,omitempty"`
+	InitializationActions []*NodeInitializationAction `protobuf:"bytes,11,rep,name=initialization_actions,json=initializationActions,proto3" json:"initialization_actions,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}                    `json:"-"`
+	XXX_unrecognized      []byte                      `json:"-"`
+	XXX_sizecache         int32                       `json:"-"`
 }
 
-func (m *ClusterConfig) Reset()                    { *m = ClusterConfig{} }
-func (m *ClusterConfig) String() string            { return proto.CompactTextString(m) }
-func (*ClusterConfig) ProtoMessage()               {}
-func (*ClusterConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ClusterConfig) Reset()         { *m = ClusterConfig{} }
+func (m *ClusterConfig) String() string { return proto.CompactTextString(m) }
+func (*ClusterConfig) ProtoMessage()    {}
+func (*ClusterConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{1}
+}
+func (m *ClusterConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterConfig.Unmarshal(m, b)
+}
+func (m *ClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterConfig.Marshal(b, m, deterministic)
+}
+func (dst *ClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterConfig.Merge(dst, src)
+}
+func (m *ClusterConfig) XXX_Size() int {
+	return xxx_messageInfo_ClusterConfig.Size(m)
+}
+func (m *ClusterConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterConfig proto.InternalMessageInfo
 
 func (m *ClusterConfig) GetConfigBucket() string {
 	if m != nil {
@@ -351,7 +347,7 @@ type GceClusterConfig struct {
 	// * `https://www.googleapis.com/compute/v1/projects/[project_id]/zones/[zone]`
 	// * `projects/[project_id]/zones/[zone]`
 	// * `us-central1-f`
-	ZoneUri string `protobuf:"bytes,1,opt,name=zone_uri,json=zoneUri" json:"zone_uri,omitempty"`
+	ZoneUri string `protobuf:"bytes,1,opt,name=zone_uri,json=zoneUri,proto3" json:"zone_uri,omitempty"`
 	// Optional. The Google Compute Engine network to be used for machine
 	// communications. Cannot be specified with subnetwork_uri. If neither
 	// `network_uri` nor `subnetwork_uri` is specified, the "default" network of
@@ -363,7 +359,7 @@ type GceClusterConfig struct {
 	// * `https://www.googleapis.com/compute/v1/projects/[project_id]/regions/global/default`
 	// * `projects/[project_id]/regions/global/default`
 	// * `default`
-	NetworkUri string `protobuf:"bytes,2,opt,name=network_uri,json=networkUri" json:"network_uri,omitempty"`
+	NetworkUri string `protobuf:"bytes,2,opt,name=network_uri,json=networkUri,proto3" json:"network_uri,omitempty"`
 	// Optional. The Google Compute Engine subnetwork to be used for machine
 	// communications. Cannot be specified with network_uri.
 	//
@@ -372,14 +368,14 @@ type GceClusterConfig struct {
 	// * `https://www.googleapis.com/compute/v1/projects/[project_id]/regions/us-east1/sub0`
 	// * `projects/[project_id]/regions/us-east1/sub0`
 	// * `sub0`
-	SubnetworkUri string `protobuf:"bytes,6,opt,name=subnetwork_uri,json=subnetworkUri" json:"subnetwork_uri,omitempty"`
+	SubnetworkUri string `protobuf:"bytes,6,opt,name=subnetwork_uri,json=subnetworkUri,proto3" json:"subnetwork_uri,omitempty"`
 	// Optional. If true, all instances in the cluster will only have internal IP
 	// addresses. By default, clusters are not restricted to internal IP addresses,
 	// and will have ephemeral external IP addresses assigned to each instance.
 	// This `internal_ip_only` restriction can only be enabled for subnetwork
 	// enabled networks, and all off-cluster dependencies must be configured to be
 	// accessible without external IP addresses.
-	InternalIpOnly bool `protobuf:"varint,7,opt,name=internal_ip_only,json=internalIpOnly" json:"internal_ip_only,omitempty"`
+	InternalIpOnly bool `protobuf:"varint,7,opt,name=internal_ip_only,json=internalIpOnly,proto3" json:"internal_ip_only,omitempty"`
 	// Optional. The service account of the instances. Defaults to the default
 	// Google Compute Engine service account. Custom service accounts need
 	// permissions equivalent to the folloing IAM roles:
@@ -390,7 +386,7 @@ type GceClusterConfig struct {
 	// (see https://cloud.google.com/compute/docs/access/service-accounts#custom_service_accounts
 	// for more information).
 	// Example: `[account_id]@[project_id].iam.gserviceaccount.com`
-	ServiceAccount string `protobuf:"bytes,8,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
+	ServiceAccount string `protobuf:"bytes,8,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
 	// Optional. The URIs of service account scopes to be included in Google
 	// Compute Engine instances. The following base set of scopes is always
 	// included:
@@ -405,19 +401,41 @@ type GceClusterConfig struct {
 	// * https://www.googleapis.com/auth/bigtable.admin.table
 	// * https://www.googleapis.com/auth/bigtable.data
 	// * https://www.googleapis.com/auth/devstorage.full_control
-	ServiceAccountScopes []string `protobuf:"bytes,3,rep,name=service_account_scopes,json=serviceAccountScopes" json:"service_account_scopes,omitempty"`
+	ServiceAccountScopes []string `protobuf:"bytes,3,rep,name=service_account_scopes,json=serviceAccountScopes,proto3" json:"service_account_scopes,omitempty"`
 	// The Google Compute Engine tags to add to all instances (see
 	// [Tagging instances](/compute/docs/label-or-tag-resources#tags)).
-	Tags []string `protobuf:"bytes,4,rep,name=tags" json:"tags,omitempty"`
+	Tags []string `protobuf:"bytes,4,rep,name=tags,proto3" json:"tags,omitempty"`
 	// The Google Compute Engine metadata entries to add to all instances (see
 	// [Project and instance metadata](https://cloud.google.com/compute/docs/storing-retrieving-metadata#project_and_instance_metadata)).
-	Metadata map[string]string `protobuf:"bytes,5,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata             map[string]string `protobuf:"bytes,5,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *GceClusterConfig) Reset()                    { *m = GceClusterConfig{} }
-func (m *GceClusterConfig) String() string            { return proto.CompactTextString(m) }
-func (*GceClusterConfig) ProtoMessage()               {}
-func (*GceClusterConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *GceClusterConfig) Reset()         { *m = GceClusterConfig{} }
+func (m *GceClusterConfig) String() string { return proto.CompactTextString(m) }
+func (*GceClusterConfig) ProtoMessage()    {}
+func (*GceClusterConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{2}
+}
+func (m *GceClusterConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GceClusterConfig.Unmarshal(m, b)
+}
+func (m *GceClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GceClusterConfig.Marshal(b, m, deterministic)
+}
+func (dst *GceClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GceClusterConfig.Merge(dst, src)
+}
+func (m *GceClusterConfig) XXX_Size() int {
+	return xxx_messageInfo_GceClusterConfig.Size(m)
+}
+func (m *GceClusterConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_GceClusterConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GceClusterConfig proto.InternalMessageInfo
 
 func (m *GceClusterConfig) GetZoneUri() string {
 	if m != nil {
@@ -480,14 +498,14 @@ func (m *GceClusterConfig) GetMetadata() map[string]string {
 type InstanceGroupConfig struct {
 	// Optional. The number of VM instances in the instance group.
 	// For master instance groups, must be set to 1.
-	NumInstances int32 `protobuf:"varint,1,opt,name=num_instances,json=numInstances" json:"num_instances,omitempty"`
+	NumInstances int32 `protobuf:"varint,1,opt,name=num_instances,json=numInstances,proto3" json:"num_instances,omitempty"`
 	// Optional. The list of instance names. Cloud Dataproc derives the names from
 	// `cluster_name`, `num_instances`, and the instance group if not set by user
 	// (recommended practice is to let Cloud Dataproc derive the name).
-	InstanceNames []string `protobuf:"bytes,2,rep,name=instance_names,json=instanceNames" json:"instance_names,omitempty"`
+	InstanceNames []string `protobuf:"bytes,2,rep,name=instance_names,json=instanceNames,proto3" json:"instance_names,omitempty"`
 	// Output-only. The Google Compute Engine image resource used for cluster
 	// instances. Inferred from `SoftwareConfig.image_version`.
-	ImageUri string `protobuf:"bytes,3,opt,name=image_uri,json=imageUri" json:"image_uri,omitempty"`
+	ImageUri string `protobuf:"bytes,3,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
 	// Optional. The Google Compute Engine machine type used for cluster instances.
 	//
 	// A full URL, partial URI, or short name are valid. Examples:
@@ -495,27 +513,49 @@ type InstanceGroupConfig struct {
 	// * `https://www.googleapis.com/compute/v1/projects/[project_id]/zones/us-east1-a/machineTypes/n1-standard-2`
 	// * `projects/[project_id]/zones/us-east1-a/machineTypes/n1-standard-2`
 	// * `n1-standard-2`
-	MachineTypeUri string `protobuf:"bytes,4,opt,name=machine_type_uri,json=machineTypeUri" json:"machine_type_uri,omitempty"`
+	MachineTypeUri string `protobuf:"bytes,4,opt,name=machine_type_uri,json=machineTypeUri,proto3" json:"machine_type_uri,omitempty"`
 	// Optional. Disk option config settings.
-	DiskConfig *DiskConfig `protobuf:"bytes,5,opt,name=disk_config,json=diskConfig" json:"disk_config,omitempty"`
+	DiskConfig *DiskConfig `protobuf:"bytes,5,opt,name=disk_config,json=diskConfig,proto3" json:"disk_config,omitempty"`
 	// Optional. Specifies that this instance group contains preemptible instances.
-	IsPreemptible bool `protobuf:"varint,6,opt,name=is_preemptible,json=isPreemptible" json:"is_preemptible,omitempty"`
+	IsPreemptible bool `protobuf:"varint,6,opt,name=is_preemptible,json=isPreemptible,proto3" json:"is_preemptible,omitempty"`
 	// Output-only. The config for Google Compute Engine Instance Group
 	// Manager that manages this group.
 	// This is only used for preemptible instance groups.
-	ManagedGroupConfig *ManagedGroupConfig `protobuf:"bytes,7,opt,name=managed_group_config,json=managedGroupConfig" json:"managed_group_config,omitempty"`
+	ManagedGroupConfig *ManagedGroupConfig `protobuf:"bytes,7,opt,name=managed_group_config,json=managedGroupConfig,proto3" json:"managed_group_config,omitempty"`
 	// Optional. The Google Compute Engine accelerator configuration for these
 	// instances.
 	//
 	// **Beta Feature**: This feature is still under development. It may be
 	// changed before final release.
-	Accelerators []*AcceleratorConfig `protobuf:"bytes,8,rep,name=accelerators" json:"accelerators,omitempty"`
+	Accelerators         []*AcceleratorConfig `protobuf:"bytes,8,rep,name=accelerators,proto3" json:"accelerators,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *InstanceGroupConfig) Reset()                    { *m = InstanceGroupConfig{} }
-func (m *InstanceGroupConfig) String() string            { return proto.CompactTextString(m) }
-func (*InstanceGroupConfig) ProtoMessage()               {}
-func (*InstanceGroupConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *InstanceGroupConfig) Reset()         { *m = InstanceGroupConfig{} }
+func (m *InstanceGroupConfig) String() string { return proto.CompactTextString(m) }
+func (*InstanceGroupConfig) ProtoMessage()    {}
+func (*InstanceGroupConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{3}
+}
+func (m *InstanceGroupConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InstanceGroupConfig.Unmarshal(m, b)
+}
+func (m *InstanceGroupConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InstanceGroupConfig.Marshal(b, m, deterministic)
+}
+func (dst *InstanceGroupConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstanceGroupConfig.Merge(dst, src)
+}
+func (m *InstanceGroupConfig) XXX_Size() int {
+	return xxx_messageInfo_InstanceGroupConfig.Size(m)
+}
+func (m *InstanceGroupConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InstanceGroupConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InstanceGroupConfig proto.InternalMessageInfo
 
 func (m *InstanceGroupConfig) GetNumInstances() int32 {
 	if m != nil {
@@ -577,15 +617,37 @@ func (m *InstanceGroupConfig) GetAccelerators() []*AcceleratorConfig {
 type ManagedGroupConfig struct {
 	// Output-only. The name of the Instance Template used for the Managed
 	// Instance Group.
-	InstanceTemplateName string `protobuf:"bytes,1,opt,name=instance_template_name,json=instanceTemplateName" json:"instance_template_name,omitempty"`
+	InstanceTemplateName string `protobuf:"bytes,1,opt,name=instance_template_name,json=instanceTemplateName,proto3" json:"instance_template_name,omitempty"`
 	// Output-only. The name of the Instance Group Manager for this group.
-	InstanceGroupManagerName string `protobuf:"bytes,2,opt,name=instance_group_manager_name,json=instanceGroupManagerName" json:"instance_group_manager_name,omitempty"`
+	InstanceGroupManagerName string   `protobuf:"bytes,2,opt,name=instance_group_manager_name,json=instanceGroupManagerName,proto3" json:"instance_group_manager_name,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
+}
+
+func (m *ManagedGroupConfig) Reset()         { *m = ManagedGroupConfig{} }
+func (m *ManagedGroupConfig) String() string { return proto.CompactTextString(m) }
+func (*ManagedGroupConfig) ProtoMessage()    {}
+func (*ManagedGroupConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{4}
+}
+func (m *ManagedGroupConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ManagedGroupConfig.Unmarshal(m, b)
+}
+func (m *ManagedGroupConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ManagedGroupConfig.Marshal(b, m, deterministic)
+}
+func (dst *ManagedGroupConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedGroupConfig.Merge(dst, src)
+}
+func (m *ManagedGroupConfig) XXX_Size() int {
+	return xxx_messageInfo_ManagedGroupConfig.Size(m)
+}
+func (m *ManagedGroupConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ManagedGroupConfig.DiscardUnknown(m)
 }
 
-func (m *ManagedGroupConfig) Reset()                    { *m = ManagedGroupConfig{} }
-func (m *ManagedGroupConfig) String() string            { return proto.CompactTextString(m) }
-func (*ManagedGroupConfig) ProtoMessage()               {}
-func (*ManagedGroupConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ManagedGroupConfig proto.InternalMessageInfo
 
 func (m *ManagedGroupConfig) GetInstanceTemplateName() string {
 	if m != nil {
@@ -612,15 +674,37 @@ type AcceleratorConfig struct {
 	// * `https://www.googleapis.com/compute/beta/projects/[project_id]/zones/us-east1-a/acceleratorTypes/nvidia-tesla-k80`
 	// * `projects/[project_id]/zones/us-east1-a/acceleratorTypes/nvidia-tesla-k80`
 	// * `nvidia-tesla-k80`
-	AcceleratorTypeUri string `protobuf:"bytes,1,opt,name=accelerator_type_uri,json=acceleratorTypeUri" json:"accelerator_type_uri,omitempty"`
+	AcceleratorTypeUri string `protobuf:"bytes,1,opt,name=accelerator_type_uri,json=acceleratorTypeUri,proto3" json:"accelerator_type_uri,omitempty"`
 	// The number of the accelerator cards of this type exposed to this instance.
-	AcceleratorCount int32 `protobuf:"varint,2,opt,name=accelerator_count,json=acceleratorCount" json:"accelerator_count,omitempty"`
+	AcceleratorCount     int32    `protobuf:"varint,2,opt,name=accelerator_count,json=acceleratorCount,proto3" json:"accelerator_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
+func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
+func (*AcceleratorConfig) ProtoMessage()    {}
+func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{5}
+}
+func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
+}
+func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
+}
+func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+}
+func (m *AcceleratorConfig) XXX_Size() int {
+	return xxx_messageInfo_AcceleratorConfig.Size(m)
+}
+func (m *AcceleratorConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AcceleratorConfig.DiscardUnknown(m)
 }
 
-func (m *AcceleratorConfig) Reset()                    { *m = AcceleratorConfig{} }
-func (m *AcceleratorConfig) String() string            { return proto.CompactTextString(m) }
-func (*AcceleratorConfig) ProtoMessage()               {}
-func (*AcceleratorConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_AcceleratorConfig proto.InternalMessageInfo
 
 func (m *AcceleratorConfig) GetAcceleratorTypeUri() string {
 	if m != nil {
@@ -639,20 +723,42 @@ func (m *AcceleratorConfig) GetAcceleratorCount() int32 {
 // Specifies the config of disk options for a group of VM instances.
 type DiskConfig struct {
 	// Optional. Size in GB of the boot disk (default is 500GB).
-	BootDiskSizeGb int32 `protobuf:"varint,1,opt,name=boot_disk_size_gb,json=bootDiskSizeGb" json:"boot_disk_size_gb,omitempty"`
+	BootDiskSizeGb int32 `protobuf:"varint,1,opt,name=boot_disk_size_gb,json=bootDiskSizeGb,proto3" json:"boot_disk_size_gb,omitempty"`
 	// Optional. Number of attached SSDs, from 0 to 4 (default is 0).
 	// If SSDs are not attached, the boot disk is used to store runtime logs and
 	// [HDFS](https://hadoop.apache.org/docs/r1.2.1/hdfs_user_guide.html) data.
 	// If one or more SSDs are attached, this runtime bulk
 	// data is spread across them, and the boot disk contains only basic
 	// config and installed binaries.
-	NumLocalSsds int32 `protobuf:"varint,2,opt,name=num_local_ssds,json=numLocalSsds" json:"num_local_ssds,omitempty"`
+	NumLocalSsds         int32    `protobuf:"varint,2,opt,name=num_local_ssds,json=numLocalSsds,proto3" json:"num_local_ssds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DiskConfig) Reset()                    { *m = DiskConfig{} }
-func (m *DiskConfig) String() string            { return proto.CompactTextString(m) }
-func (*DiskConfig) ProtoMessage()               {}
-func (*DiskConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *DiskConfig) Reset()         { *m = DiskConfig{} }
+func (m *DiskConfig) String() string { return proto.CompactTextString(m) }
+func (*DiskConfig) ProtoMessage()    {}
+func (*DiskConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{6}
+}
+func (m *DiskConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DiskConfig.Unmarshal(m, b)
+}
+func (m *DiskConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DiskConfig.Marshal(b, m, deterministic)
+}
+func (dst *DiskConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiskConfig.Merge(dst, src)
+}
+func (m *DiskConfig) XXX_Size() int {
+	return xxx_messageInfo_DiskConfig.Size(m)
+}
+func (m *DiskConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_DiskConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DiskConfig proto.InternalMessageInfo
 
 func (m *DiskConfig) GetBootDiskSizeGb() int32 {
 	if m != nil {
@@ -672,18 +778,40 @@ func (m *DiskConfig) GetNumLocalSsds() int32 {
 // timeout period for executable completion.
 type NodeInitializationAction struct {
 	// Required. Google Cloud Storage URI of executable file.
-	ExecutableFile string `protobuf:"bytes,1,opt,name=executable_file,json=executableFile" json:"executable_file,omitempty"`
+	ExecutableFile string `protobuf:"bytes,1,opt,name=executable_file,json=executableFile,proto3" json:"executable_file,omitempty"`
 	// Optional. Amount of time executable has to complete. Default is
 	// 10 minutes. Cluster creation fails with an explanatory error message (the
 	// name of the executable that caused the error and the exceeded timeout
 	// period) if the executable is not completed at end of the timeout period.
-	ExecutionTimeout *google_protobuf4.Duration `protobuf:"bytes,2,opt,name=execution_timeout,json=executionTimeout" json:"execution_timeout,omitempty"`
+	ExecutionTimeout     *duration.Duration `protobuf:"bytes,2,opt,name=execution_timeout,json=executionTimeout,proto3" json:"execution_timeout,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *NodeInitializationAction) Reset()                    { *m = NodeInitializationAction{} }
-func (m *NodeInitializationAction) String() string            { return proto.CompactTextString(m) }
-func (*NodeInitializationAction) ProtoMessage()               {}
-func (*NodeInitializationAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *NodeInitializationAction) Reset()         { *m = NodeInitializationAction{} }
+func (m *NodeInitializationAction) String() string { return proto.CompactTextString(m) }
+func (*NodeInitializationAction) ProtoMessage()    {}
+func (*NodeInitializationAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{7}
+}
+func (m *NodeInitializationAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeInitializationAction.Unmarshal(m, b)
+}
+func (m *NodeInitializationAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeInitializationAction.Marshal(b, m, deterministic)
+}
+func (dst *NodeInitializationAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeInitializationAction.Merge(dst, src)
+}
+func (m *NodeInitializationAction) XXX_Size() int {
+	return xxx_messageInfo_NodeInitializationAction.Size(m)
+}
+func (m *NodeInitializationAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeInitializationAction.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeInitializationAction proto.InternalMessageInfo
 
 func (m *NodeInitializationAction) GetExecutableFile() string {
 	if m != nil {
@@ -692,7 +820,7 @@ func (m *NodeInitializationAction) GetExecutableFile() string {
 	return ""
 }
 
-func (m *NodeInitializationAction) GetExecutionTimeout() *google_protobuf4.Duration {
+func (m *NodeInitializationAction) GetExecutionTimeout() *duration.Duration {
 	if m != nil {
 		return m.ExecutionTimeout
 	}
@@ -702,20 +830,42 @@ func (m *NodeInitializationAction) GetExecutionTimeout() *google_protobuf4.Durat
 // The status of a cluster and its instances.
 type ClusterStatus struct {
 	// Output-only. The cluster's state.
-	State ClusterStatus_State `protobuf:"varint,1,opt,name=state,enum=google.cloud.dataproc.v1.ClusterStatus_State" json:"state,omitempty"`
+	State ClusterStatus_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.dataproc.v1.ClusterStatus_State" json:"state,omitempty"`
 	// Output-only. Optional details of cluster's state.
-	Detail string `protobuf:"bytes,2,opt,name=detail" json:"detail,omitempty"`
+	Detail string `protobuf:"bytes,2,opt,name=detail,proto3" json:"detail,omitempty"`
 	// Output-only. Time when this state was entered.
-	StateStartTime *google_protobuf3.Timestamp `protobuf:"bytes,3,opt,name=state_start_time,json=stateStartTime" json:"state_start_time,omitempty"`
+	StateStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
 	// Output-only. Additional state information that includes
 	// status reported by the agent.
-	Substate ClusterStatus_Substate `protobuf:"varint,4,opt,name=substate,enum=google.cloud.dataproc.v1.ClusterStatus_Substate" json:"substate,omitempty"`
+	Substate             ClusterStatus_Substate `protobuf:"varint,4,opt,name=substate,proto3,enum=google.cloud.dataproc.v1.ClusterStatus_Substate" json:"substate,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
-func (m *ClusterStatus) Reset()                    { *m = ClusterStatus{} }
-func (m *ClusterStatus) String() string            { return proto.CompactTextString(m) }
-func (*ClusterStatus) ProtoMessage()               {}
-func (*ClusterStatus) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *ClusterStatus) Reset()         { *m = ClusterStatus{} }
+func (m *ClusterStatus) String() string { return proto.CompactTextString(m) }
+func (*ClusterStatus) ProtoMessage()    {}
+func (*ClusterStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{8}
+}
+func (m *ClusterStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterStatus.Unmarshal(m, b)
+}
+func (m *ClusterStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterStatus.Marshal(b, m, deterministic)
+}
+func (dst *ClusterStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterStatus.Merge(dst, src)
+}
+func (m *ClusterStatus) XXX_Size() int {
+	return xxx_messageInfo_ClusterStatus.Size(m)
+}
+func (m *ClusterStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterStatus proto.InternalMessageInfo
 
 func (m *ClusterStatus) GetState() ClusterStatus_State {
 	if m != nil {
@@ -731,7 +881,7 @@ func (m *ClusterStatus) GetDetail() string {
 	return ""
 }
 
-func (m *ClusterStatus) GetStateStartTime() *google_protobuf3.Timestamp {
+func (m *ClusterStatus) GetStateStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StateStartTime
 	}
@@ -750,7 +900,7 @@ type SoftwareConfig struct {
 	// Optional. The version of software inside the cluster. It must match the
 	// regular expression `[0-9]+\.[0-9]+`. If unspecified, it defaults to the
 	// latest version (see [Cloud Dataproc Versioning](/dataproc/versioning)).
-	ImageVersion string `protobuf:"bytes,1,opt,name=image_version,json=imageVersion" json:"image_version,omitempty"`
+	ImageVersion string `protobuf:"bytes,1,opt,name=image_version,json=imageVersion,proto3" json:"image_version,omitempty"`
 	// Optional. The properties to set on daemon config files.
 	//
 	// Property keys are specified in `prefix:property` format, such as
@@ -769,13 +919,35 @@ type SoftwareConfig struct {
 	//
 	// For more information, see
 	// [Cluster properties](/dataproc/docs/concepts/cluster-properties).
-	Properties map[string]string `protobuf:"bytes,2,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties           map[string]string `protobuf:"bytes,2,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *SoftwareConfig) Reset()         { *m = SoftwareConfig{} }
+func (m *SoftwareConfig) String() string { return proto.CompactTextString(m) }
+func (*SoftwareConfig) ProtoMessage()    {}
+func (*SoftwareConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{9}
+}
+func (m *SoftwareConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SoftwareConfig.Unmarshal(m, b)
+}
+func (m *SoftwareConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SoftwareConfig.Marshal(b, m, deterministic)
+}
+func (dst *SoftwareConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SoftwareConfig.Merge(dst, src)
+}
+func (m *SoftwareConfig) XXX_Size() int {
+	return xxx_messageInfo_SoftwareConfig.Size(m)
+}
+func (m *SoftwareConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_SoftwareConfig.DiscardUnknown(m)
 }
 
-func (m *SoftwareConfig) Reset()                    { *m = SoftwareConfig{} }
-func (m *SoftwareConfig) String() string            { return proto.CompactTextString(m) }
-func (*SoftwareConfig) ProtoMessage()               {}
-func (*SoftwareConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_SoftwareConfig proto.InternalMessageInfo
 
 func (m *SoftwareConfig) GetImageVersion() string {
 	if m != nil {
@@ -797,15 +969,37 @@ func (m *SoftwareConfig) GetProperties() map[string]string {
 // be changed before final release.
 type ClusterMetrics struct {
 	// The HDFS metrics.
-	HdfsMetrics map[string]int64 `protobuf:"bytes,1,rep,name=hdfs_metrics,json=hdfsMetrics" json:"hdfs_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	HdfsMetrics map[string]int64 `protobuf:"bytes,1,rep,name=hdfs_metrics,json=hdfsMetrics,proto3" json:"hdfs_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 	// The YARN metrics.
-	YarnMetrics map[string]int64 `protobuf:"bytes,2,rep,name=yarn_metrics,json=yarnMetrics" json:"yarn_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	YarnMetrics          map[string]int64 `protobuf:"bytes,2,rep,name=yarn_metrics,json=yarnMetrics,proto3" json:"yarn_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *ClusterMetrics) Reset()         { *m = ClusterMetrics{} }
+func (m *ClusterMetrics) String() string { return proto.CompactTextString(m) }
+func (*ClusterMetrics) ProtoMessage()    {}
+func (*ClusterMetrics) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{10}
+}
+func (m *ClusterMetrics) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterMetrics.Unmarshal(m, b)
+}
+func (m *ClusterMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterMetrics.Marshal(b, m, deterministic)
+}
+func (dst *ClusterMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterMetrics.Merge(dst, src)
+}
+func (m *ClusterMetrics) XXX_Size() int {
+	return xxx_messageInfo_ClusterMetrics.Size(m)
+}
+func (m *ClusterMetrics) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterMetrics.DiscardUnknown(m)
 }
 
-func (m *ClusterMetrics) Reset()                    { *m = ClusterMetrics{} }
-func (m *ClusterMetrics) String() string            { return proto.CompactTextString(m) }
-func (*ClusterMetrics) ProtoMessage()               {}
-func (*ClusterMetrics) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_ClusterMetrics proto.InternalMessageInfo
 
 func (m *ClusterMetrics) GetHdfsMetrics() map[string]int64 {
 	if m != nil {
@@ -825,17 +1019,39 @@ func (m *ClusterMetrics) GetYarnMetrics() map[string]int64 {
 type CreateClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster to create.
-	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster              *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateClusterRequest) Reset()                    { *m = CreateClusterRequest{} }
-func (m *CreateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterRequest) ProtoMessage()               {}
-func (*CreateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
+func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterRequest) ProtoMessage()    {}
+func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{11}
+}
+func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
+}
+func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+}
+func (m *CreateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterRequest.Size(m)
+}
+func (m *CreateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateClusterRequest proto.InternalMessageInfo
 
 func (m *CreateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -862,13 +1078,13 @@ func (m *CreateClusterRequest) GetCluster() *Cluster {
 type UpdateClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project the
 	// cluster belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,5,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,5,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster name.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Required. The changes to the cluster.
-	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	// Required. Specifies the path, relative to `Cluster`, of
 	// the field to update. For example, to change the number of workers
 	// in a cluster to 5, the `update_mask` parameter would be
@@ -916,13 +1132,35 @@ type UpdateClusterRequest struct {
 	//  </tr>
 	//  </tbody>
 	//  </table>
-	UpdateMask *google_protobuf5.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateClusterRequest) Reset()                    { *m = UpdateClusterRequest{} }
-func (m *UpdateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateClusterRequest) ProtoMessage()               {}
-func (*UpdateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
+func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateClusterRequest) ProtoMessage()    {}
+func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{12}
+}
+func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
+}
+func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+}
+func (m *UpdateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateClusterRequest.Size(m)
+}
+func (m *UpdateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateClusterRequest proto.InternalMessageInfo
 
 func (m *UpdateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -952,7 +1190,7 @@ func (m *UpdateClusterRequest) GetCluster() *Cluster {
 	return nil
 }
 
-func (m *UpdateClusterRequest) GetUpdateMask() *google_protobuf5.FieldMask {
+func (m *UpdateClusterRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -963,17 +1201,39 @@ func (m *UpdateClusterRequest) GetUpdateMask() *google_protobuf5.FieldMask {
 type DeleteClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster name.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName          string   `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteClusterRequest) Reset()                    { *m = DeleteClusterRequest{} }
-func (m *DeleteClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteClusterRequest) ProtoMessage()               {}
-func (*DeleteClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
+func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteClusterRequest) ProtoMessage()    {}
+func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{13}
+}
+func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
+}
+func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+}
+func (m *DeleteClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteClusterRequest.Size(m)
+}
+func (m *DeleteClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteClusterRequest proto.InternalMessageInfo
 
 func (m *DeleteClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1000,17 +1260,39 @@ func (m *DeleteClusterRequest) GetClusterName() string {
 type GetClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster name.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName          string   `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
+func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*GetClusterRequest) ProtoMessage()    {}
+func (*GetClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{14}
+}
+func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
+}
+func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+}
+func (m *GetClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_GetClusterRequest.Size(m)
+}
+func (m *GetClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetClusterRequest.DiscardUnknown(m)
 }
 
-func (m *GetClusterRequest) Reset()                    { *m = GetClusterRequest{} }
-func (m *GetClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetClusterRequest) ProtoMessage()               {}
-func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_GetClusterRequest proto.InternalMessageInfo
 
 func (m *GetClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1037,9 +1319,9 @@ func (m *GetClusterRequest) GetClusterName() string {
 type ListClustersRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,4,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,4,opt,name=region,proto3" json:"region,omitempty"`
 	// Optional. A filter constraining the clusters to list. Filters are
 	// case-sensitive and have the following syntax:
 	//
@@ -1059,17 +1341,39 @@ type ListClustersRequest struct {
 	//
 	// status.state = ACTIVE AND clusterName = mycluster
 	// AND labels.env = staging AND labels.starred = *
-	Filter string `protobuf:"bytes,5,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Optional. The standard List page size.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The standard List page token.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
+func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClustersRequest) ProtoMessage()    {}
+func (*ListClustersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{15}
+}
+func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
+}
+func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+}
+func (m *ListClustersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClustersRequest.Size(m)
+}
+func (m *ListClustersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersRequest.DiscardUnknown(m)
 }
 
-func (m *ListClustersRequest) Reset()                    { *m = ListClustersRequest{} }
-func (m *ListClustersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersRequest) ProtoMessage()               {}
-func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_ListClustersRequest proto.InternalMessageInfo
 
 func (m *ListClustersRequest) GetProjectId() string {
 	if m != nil {
@@ -1109,17 +1413,39 @@ func (m *ListClustersRequest) GetPageToken() string {
 // The list of all clusters in a project.
 type ListClustersResponse struct {
 	// Output-only. The clusters in the project.
-	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters" json:"clusters,omitempty"`
+	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	// Output-only. This token is included in the response if there are more
 	// results to fetch. To fetch additional results, provide this value as the
 	// `page_token` in a subsequent `ListClustersRequest`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListClustersResponse) Reset()                    { *m = ListClustersResponse{} }
-func (m *ListClustersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersResponse) ProtoMessage()               {}
-func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
+func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClustersResponse) ProtoMessage()    {}
+func (*ListClustersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{16}
+}
+func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
+}
+func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+}
+func (m *ListClustersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClustersResponse.Size(m)
+}
+func (m *ListClustersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClustersResponse proto.InternalMessageInfo
 
 func (m *ListClustersResponse) GetClusters() []*Cluster {
 	if m != nil {
@@ -1139,17 +1465,39 @@ func (m *ListClustersResponse) GetNextPageToken() string {
 type DiagnoseClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster name.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName          string   `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DiagnoseClusterRequest) Reset()                    { *m = DiagnoseClusterRequest{} }
-func (m *DiagnoseClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DiagnoseClusterRequest) ProtoMessage()               {}
-func (*DiagnoseClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *DiagnoseClusterRequest) Reset()         { *m = DiagnoseClusterRequest{} }
+func (m *DiagnoseClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DiagnoseClusterRequest) ProtoMessage()    {}
+func (*DiagnoseClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{17}
+}
+func (m *DiagnoseClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DiagnoseClusterRequest.Unmarshal(m, b)
+}
+func (m *DiagnoseClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DiagnoseClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DiagnoseClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiagnoseClusterRequest.Merge(dst, src)
+}
+func (m *DiagnoseClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DiagnoseClusterRequest.Size(m)
+}
+func (m *DiagnoseClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DiagnoseClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DiagnoseClusterRequest proto.InternalMessageInfo
 
 func (m *DiagnoseClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1177,13 +1525,35 @@ type DiagnoseClusterResults struct {
 	// Output-only. The Google Cloud Storage URI of the diagnostic output.
 	// The output report is a plain text file with a summary of collected
 	// diagnostics.
-	OutputUri string `protobuf:"bytes,1,opt,name=output_uri,json=outputUri" json:"output_uri,omitempty"`
+	OutputUri            string   `protobuf:"bytes,1,opt,name=output_uri,json=outputUri,proto3" json:"output_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DiagnoseClusterResults) Reset()                    { *m = DiagnoseClusterResults{} }
-func (m *DiagnoseClusterResults) String() string            { return proto.CompactTextString(m) }
-func (*DiagnoseClusterResults) ProtoMessage()               {}
-func (*DiagnoseClusterResults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *DiagnoseClusterResults) Reset()         { *m = DiagnoseClusterResults{} }
+func (m *DiagnoseClusterResults) String() string { return proto.CompactTextString(m) }
+func (*DiagnoseClusterResults) ProtoMessage()    {}
+func (*DiagnoseClusterResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_beb75bdb730324e4, []int{18}
+}
+func (m *DiagnoseClusterResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DiagnoseClusterResults.Unmarshal(m, b)
+}
+func (m *DiagnoseClusterResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DiagnoseClusterResults.Marshal(b, m, deterministic)
+}
+func (dst *DiagnoseClusterResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiagnoseClusterResults.Merge(dst, src)
+}
+func (m *DiagnoseClusterResults) XXX_Size() int {
+	return xxx_messageInfo_DiagnoseClusterResults.Size(m)
+}
+func (m *DiagnoseClusterResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_DiagnoseClusterResults.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DiagnoseClusterResults proto.InternalMessageInfo
 
 func (m *DiagnoseClusterResults) GetOutputUri() string {
 	if m != nil {
@@ -1194,8 +1564,10 @@ func (m *DiagnoseClusterResults) GetOutputUri() string {
 
 func init() {
 	proto.RegisterType((*Cluster)(nil), "google.cloud.dataproc.v1.Cluster")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.Cluster.LabelsEntry")
 	proto.RegisterType((*ClusterConfig)(nil), "google.cloud.dataproc.v1.ClusterConfig")
 	proto.RegisterType((*GceClusterConfig)(nil), "google.cloud.dataproc.v1.GceClusterConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.GceClusterConfig.MetadataEntry")
 	proto.RegisterType((*InstanceGroupConfig)(nil), "google.cloud.dataproc.v1.InstanceGroupConfig")
 	proto.RegisterType((*ManagedGroupConfig)(nil), "google.cloud.dataproc.v1.ManagedGroupConfig")
 	proto.RegisterType((*AcceleratorConfig)(nil), "google.cloud.dataproc.v1.AcceleratorConfig")
@@ -1203,7 +1575,10 @@ func init() {
 	proto.RegisterType((*NodeInitializationAction)(nil), "google.cloud.dataproc.v1.NodeInitializationAction")
 	proto.RegisterType((*ClusterStatus)(nil), "google.cloud.dataproc.v1.ClusterStatus")
 	proto.RegisterType((*SoftwareConfig)(nil), "google.cloud.dataproc.v1.SoftwareConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.SoftwareConfig.PropertiesEntry")
 	proto.RegisterType((*ClusterMetrics)(nil), "google.cloud.dataproc.v1.ClusterMetrics")
+	proto.RegisterMapType((map[string]int64)(nil), "google.cloud.dataproc.v1.ClusterMetrics.HdfsMetricsEntry")
+	proto.RegisterMapType((map[string]int64)(nil), "google.cloud.dataproc.v1.ClusterMetrics.YarnMetricsEntry")
 	proto.RegisterType((*CreateClusterRequest)(nil), "google.cloud.dataproc.v1.CreateClusterRequest")
 	proto.RegisterType((*UpdateClusterRequest)(nil), "google.cloud.dataproc.v1.UpdateClusterRequest")
 	proto.RegisterType((*DeleteClusterRequest)(nil), "google.cloud.dataproc.v1.DeleteClusterRequest")
@@ -1224,15 +1599,16 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ClusterController service
-
+// ClusterControllerClient is the client API for ClusterController service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ClusterControllerClient interface {
 	// Creates a cluster in a project.
-	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Updates a cluster in a project.
-	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes a cluster in a project.
-	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Gets the resource representation for a cluster in a project.
 	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
 	// Lists all regions/{region}/clusters in a project.
@@ -1240,7 +1616,7 @@ type ClusterControllerClient interface {
 	// Gets cluster diagnostic information.
 	// After the operation completes, the Operation.response field
 	// contains `DiagnoseClusterOutputLocation`.
-	DiagnoseCluster(ctx context.Context, in *DiagnoseClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DiagnoseCluster(ctx context.Context, in *DiagnoseClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type clusterControllerClient struct {
@@ -1251,27 +1627,27 @@ func NewClusterControllerClient(cc *grpc.ClientConn) ClusterControllerClient {
 	return &clusterControllerClient{cc}
 }
 
-func (c *clusterControllerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/CreateCluster", in, out, c.cc, opts...)
+func (c *clusterControllerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/CreateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterControllerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/UpdateCluster", in, out, c.cc, opts...)
+func (c *clusterControllerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/UpdateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterControllerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/DeleteCluster", in, out, c.cc, opts...)
+func (c *clusterControllerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/DeleteCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1280,7 +1656,7 @@ func (c *clusterControllerClient) DeleteCluster(ctx context.Context, in *DeleteC
 
 func (c *clusterControllerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/GetCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/GetCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1289,31 +1665,30 @@ func (c *clusterControllerClient) GetCluster(ctx context.Context, in *GetCluster
 
 func (c *clusterControllerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
 	out := new(ListClustersResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/ListClusters", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/ListClusters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterControllerClient) DiagnoseCluster(ctx context.Context, in *DiagnoseClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/DiagnoseCluster", in, out, c.cc, opts...)
+func (c *clusterControllerClient) DiagnoseCluster(ctx context.Context, in *DiagnoseClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.ClusterController/DiagnoseCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ClusterController service
-
+// ClusterControllerServer is the server API for ClusterController service.
 type ClusterControllerServer interface {
 	// Creates a cluster in a project.
-	CreateCluster(context.Context, *CreateClusterRequest) (*google_longrunning.Operation, error)
+	CreateCluster(context.Context, *CreateClusterRequest) (*longrunning.Operation, error)
 	// Updates a cluster in a project.
-	UpdateCluster(context.Context, *UpdateClusterRequest) (*google_longrunning.Operation, error)
+	UpdateCluster(context.Context, *UpdateClusterRequest) (*longrunning.Operation, error)
 	// Deletes a cluster in a project.
-	DeleteCluster(context.Context, *DeleteClusterRequest) (*google_longrunning.Operation, error)
+	DeleteCluster(context.Context, *DeleteClusterRequest) (*longrunning.Operation, error)
 	// Gets the resource representation for a cluster in a project.
 	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
 	// Lists all regions/{region}/clusters in a project.
@@ -1321,7 +1696,7 @@ type ClusterControllerServer interface {
 	// Gets cluster diagnostic information.
 	// After the operation completes, the Operation.response field
 	// contains `DiagnoseClusterOutputLocation`.
-	DiagnoseCluster(context.Context, *DiagnoseClusterRequest) (*google_longrunning.Operation, error)
+	DiagnoseCluster(context.Context, *DiagnoseClusterRequest) (*longrunning.Operation, error)
 }
 
 func RegisterClusterControllerServer(s *grpc.Server, srv ClusterControllerServer) {
@@ -1469,9 +1844,11 @@ var _ClusterController_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dataproc/v1/clusters.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dataproc/v1/clusters.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1/clusters.proto", fileDescriptor_clusters_beb75bdb730324e4)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_clusters_beb75bdb730324e4 = []byte{
 	// 1944 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x73, 0x23, 0x47,
 	0x15, 0xcf, 0x58, 0xfe, 0x90, 0x9f, 0x3e, 0x2c, 0x77, 0x1c, 0xa3, 0x28, 0x09, 0x71, 0x26, 0x81,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/jobs.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/jobs.pb.go
index 1b85f0d2..6cd988df 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/jobs.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/jobs.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/jobs.proto
 
-package dataproc
+package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf5 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The Log4j level for job execution. When running an
 // [Apache Hive](http://hive.apache.org/) job, Cloud
 // Dataproc configures the Hive client to an equivalent verbosity level.
@@ -73,7 +79,9 @@ var LoggingConfig_Level_value = map[string]int32{
 func (x LoggingConfig_Level) String() string {
 	return proto.EnumName(LoggingConfig_Level_name, int32(x))
 }
-func (LoggingConfig_Level) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (LoggingConfig_Level) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{0, 0}
+}
 
 // The job state.
 type JobStatus_State int32
@@ -134,7 +142,9 @@ var JobStatus_State_value = map[string]int32{
 func (x JobStatus_State) String() string {
 	return proto.EnumName(JobStatus_State_name, int32(x))
 }
-func (JobStatus_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{9, 0} }
+func (JobStatus_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{9, 0}
+}
 
 type JobStatus_Substate int32
 
@@ -174,7 +184,9 @@ var JobStatus_Substate_value = map[string]int32{
 func (x JobStatus_Substate) String() string {
 	return proto.EnumName(JobStatus_Substate_name, int32(x))
 }
-func (JobStatus_Substate) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{9, 1} }
+func (JobStatus_Substate) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{9, 1}
+}
 
 // The application state, corresponding to
 // <code>YarnProtos.YarnApplicationStateProto</code>.
@@ -227,7 +239,9 @@ var YarnApplication_State_value = map[string]int32{
 func (x YarnApplication_State) String() string {
 	return proto.EnumName(YarnApplication_State_name, int32(x))
 }
-func (YarnApplication_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{11, 0} }
+func (YarnApplication_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{11, 0}
+}
 
 // A matcher that specifies categories of job states.
 type ListJobsRequest_JobStateMatcher int32
@@ -257,7 +271,7 @@ func (x ListJobsRequest_JobStateMatcher) String() string {
 	return proto.EnumName(ListJobsRequest_JobStateMatcher_name, int32(x))
 }
 func (ListJobsRequest_JobStateMatcher) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{16, 0}
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{16, 0}
 }
 
 // The runtime logging config of the job.
@@ -266,13 +280,35 @@ type LoggingConfig struct {
 	// "root" package name to configure rootLogger.
 	// Examples:
 	//   'com.google = FATAL', 'root = INFO', 'org.apache = DEBUG'
-	DriverLogLevels map[string]LoggingConfig_Level `protobuf:"bytes,2,rep,name=driver_log_levels,json=driverLogLevels" json:"driver_log_levels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.cloud.dataproc.v1.LoggingConfig_Level"`
+	DriverLogLevels      map[string]LoggingConfig_Level `protobuf:"bytes,2,rep,name=driver_log_levels,json=driverLogLevels,proto3" json:"driver_log_levels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=google.cloud.dataproc.v1.LoggingConfig_Level"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *LoggingConfig) Reset()         { *m = LoggingConfig{} }
+func (m *LoggingConfig) String() string { return proto.CompactTextString(m) }
+func (*LoggingConfig) ProtoMessage()    {}
+func (*LoggingConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{0}
+}
+func (m *LoggingConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoggingConfig.Unmarshal(m, b)
+}
+func (m *LoggingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoggingConfig.Marshal(b, m, deterministic)
+}
+func (dst *LoggingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoggingConfig.Merge(dst, src)
+}
+func (m *LoggingConfig) XXX_Size() int {
+	return xxx_messageInfo_LoggingConfig.Size(m)
+}
+func (m *LoggingConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoggingConfig.DiscardUnknown(m)
 }
 
-func (m *LoggingConfig) Reset()                    { *m = LoggingConfig{} }
-func (m *LoggingConfig) String() string            { return proto.CompactTextString(m) }
-func (*LoggingConfig) ProtoMessage()               {}
-func (*LoggingConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_LoggingConfig proto.InternalMessageInfo
 
 func (m *LoggingConfig) GetDriverLogLevels() map[string]LoggingConfig_Level {
 	if m != nil {
@@ -298,45 +334,69 @@ type HadoopJob struct {
 	// include arguments, such as `-libjars` or `-Dfoo=bar`, that can be set as job
 	// properties, since a collision may occur that causes an incorrect job
 	// submission.
-	Args []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
+	Args []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
 	// Optional. Jar file URIs to add to the CLASSPATHs of the
 	// Hadoop driver and tasks.
-	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. HCFS (Hadoop Compatible Filesystem) URIs of files to be copied
 	// to the working directory of Hadoop drivers and distributed tasks. Useful
 	// for naively parallel tasks.
-	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris" json:"file_uris,omitempty"`
+	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris,proto3" json:"file_uris,omitempty"`
 	// Optional. HCFS URIs of archives to be extracted in the working directory of
 	// Hadoop drivers and tasks. Supported file types:
 	// .jar, .tar, .tar.gz, .tgz, or .zip.
-	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris" json:"archive_uris,omitempty"`
+	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris,proto3" json:"archive_uris,omitempty"`
 	// Optional. A mapping of property names to values, used to configure Hadoop.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in /etc/hadoop/conf/*-site and
 	// classes in user code.
-	Properties map[string]string `protobuf:"bytes,7,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *HadoopJob) Reset()                    { *m = HadoopJob{} }
-func (m *HadoopJob) String() string            { return proto.CompactTextString(m) }
-func (*HadoopJob) ProtoMessage()               {}
-func (*HadoopJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *HadoopJob) Reset()         { *m = HadoopJob{} }
+func (m *HadoopJob) String() string { return proto.CompactTextString(m) }
+func (*HadoopJob) ProtoMessage()    {}
+func (*HadoopJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{1}
+}
+func (m *HadoopJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HadoopJob.Unmarshal(m, b)
+}
+func (m *HadoopJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HadoopJob.Marshal(b, m, deterministic)
+}
+func (dst *HadoopJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HadoopJob.Merge(dst, src)
+}
+func (m *HadoopJob) XXX_Size() int {
+	return xxx_messageInfo_HadoopJob.Size(m)
+}
+func (m *HadoopJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_HadoopJob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HadoopJob proto.InternalMessageInfo
 
 type isHadoopJob_Driver interface {
 	isHadoopJob_Driver()
 }
 
 type HadoopJob_MainJarFileUri struct {
-	MainJarFileUri string `protobuf:"bytes,1,opt,name=main_jar_file_uri,json=mainJarFileUri,oneof"`
+	MainJarFileUri string `protobuf:"bytes,1,opt,name=main_jar_file_uri,json=mainJarFileUri,proto3,oneof"`
 }
+
 type HadoopJob_MainClass struct {
-	MainClass string `protobuf:"bytes,2,opt,name=main_class,json=mainClass,oneof"`
+	MainClass string `protobuf:"bytes,2,opt,name=main_class,json=mainClass,proto3,oneof"`
 }
 
 func (*HadoopJob_MainJarFileUri) isHadoopJob_Driver() {}
-func (*HadoopJob_MainClass) isHadoopJob_Driver()      {}
+
+func (*HadoopJob_MainClass) isHadoopJob_Driver() {}
 
 func (m *HadoopJob) GetDriver() isHadoopJob_Driver {
 	if m != nil {
@@ -453,11 +513,11 @@ func _HadoopJob_OneofSizer(msg proto.Message) (n int) {
 	// driver
 	switch x := m.Driver.(type) {
 	case *HadoopJob_MainJarFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.MainJarFileUri)))
 		n += len(x.MainJarFileUri)
 	case *HadoopJob_MainClass:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.MainClass)))
 		n += len(x.MainClass)
 	case nil:
@@ -482,44 +542,68 @@ type SparkJob struct {
 	// Optional. The arguments to pass to the driver. Do not include arguments,
 	// such as `--conf`, that can be set as job properties, since a collision may
 	// occur that causes an incorrect job submission.
-	Args []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
+	Args []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
 	// Optional. HCFS URIs of jar files to add to the CLASSPATHs of the
 	// Spark driver and tasks.
-	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. HCFS URIs of files to be copied to the working directory of
 	// Spark drivers and distributed tasks. Useful for naively parallel tasks.
-	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris" json:"file_uris,omitempty"`
+	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris,proto3" json:"file_uris,omitempty"`
 	// Optional. HCFS URIs of archives to be extracted in the working directory
 	// of Spark drivers and tasks. Supported file types:
 	// .jar, .tar, .tar.gz, .tgz, and .zip.
-	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris" json:"archive_uris,omitempty"`
+	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris,proto3" json:"archive_uris,omitempty"`
 	// Optional. A mapping of property names to values, used to configure Spark.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in
 	// /etc/spark/conf/spark-defaults.conf and classes in user code.
-	Properties map[string]string `protobuf:"bytes,7,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *SparkJob) Reset()         { *m = SparkJob{} }
+func (m *SparkJob) String() string { return proto.CompactTextString(m) }
+func (*SparkJob) ProtoMessage()    {}
+func (*SparkJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{2}
+}
+func (m *SparkJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SparkJob.Unmarshal(m, b)
+}
+func (m *SparkJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SparkJob.Marshal(b, m, deterministic)
+}
+func (dst *SparkJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SparkJob.Merge(dst, src)
+}
+func (m *SparkJob) XXX_Size() int {
+	return xxx_messageInfo_SparkJob.Size(m)
+}
+func (m *SparkJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_SparkJob.DiscardUnknown(m)
 }
 
-func (m *SparkJob) Reset()                    { *m = SparkJob{} }
-func (m *SparkJob) String() string            { return proto.CompactTextString(m) }
-func (*SparkJob) ProtoMessage()               {}
-func (*SparkJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_SparkJob proto.InternalMessageInfo
 
 type isSparkJob_Driver interface {
 	isSparkJob_Driver()
 }
 
 type SparkJob_MainJarFileUri struct {
-	MainJarFileUri string `protobuf:"bytes,1,opt,name=main_jar_file_uri,json=mainJarFileUri,oneof"`
+	MainJarFileUri string `protobuf:"bytes,1,opt,name=main_jar_file_uri,json=mainJarFileUri,proto3,oneof"`
 }
+
 type SparkJob_MainClass struct {
-	MainClass string `protobuf:"bytes,2,opt,name=main_class,json=mainClass,oneof"`
+	MainClass string `protobuf:"bytes,2,opt,name=main_class,json=mainClass,proto3,oneof"`
 }
 
 func (*SparkJob_MainJarFileUri) isSparkJob_Driver() {}
-func (*SparkJob_MainClass) isSparkJob_Driver()      {}
+
+func (*SparkJob_MainClass) isSparkJob_Driver() {}
 
 func (m *SparkJob) GetDriver() isSparkJob_Driver {
 	if m != nil {
@@ -636,11 +720,11 @@ func _SparkJob_OneofSizer(msg proto.Message) (n int) {
 	// driver
 	switch x := m.Driver.(type) {
 	case *SparkJob_MainJarFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.MainJarFileUri)))
 		n += len(x.MainJarFileUri)
 	case *SparkJob_MainClass:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.MainClass)))
 		n += len(x.MainClass)
 	case nil:
@@ -656,36 +740,58 @@ func _SparkJob_OneofSizer(msg proto.Message) (n int) {
 type PySparkJob struct {
 	// Required. The HCFS URI of the main Python file to use as the driver. Must
 	// be a .py file.
-	MainPythonFileUri string `protobuf:"bytes,1,opt,name=main_python_file_uri,json=mainPythonFileUri" json:"main_python_file_uri,omitempty"`
+	MainPythonFileUri string `protobuf:"bytes,1,opt,name=main_python_file_uri,json=mainPythonFileUri,proto3" json:"main_python_file_uri,omitempty"`
 	// Optional. The arguments to pass to the driver.  Do not include arguments,
 	// such as `--conf`, that can be set as job properties, since a collision may
 	// occur that causes an incorrect job submission.
-	Args []string `protobuf:"bytes,2,rep,name=args" json:"args,omitempty"`
+	Args []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"`
 	// Optional. HCFS file URIs of Python files to pass to the PySpark
 	// framework. Supported file types: .py, .egg, and .zip.
-	PythonFileUris []string `protobuf:"bytes,3,rep,name=python_file_uris,json=pythonFileUris" json:"python_file_uris,omitempty"`
+	PythonFileUris []string `protobuf:"bytes,3,rep,name=python_file_uris,json=pythonFileUris,proto3" json:"python_file_uris,omitempty"`
 	// Optional. HCFS URIs of jar files to add to the CLASSPATHs of the
 	// Python driver and tasks.
-	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. HCFS URIs of files to be copied to the working directory of
 	// Python drivers and distributed tasks. Useful for naively parallel tasks.
-	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris" json:"file_uris,omitempty"`
+	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris,proto3" json:"file_uris,omitempty"`
 	// Optional. HCFS URIs of archives to be extracted in the working directory of
 	// .jar, .tar, .tar.gz, .tgz, and .zip.
-	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris" json:"archive_uris,omitempty"`
+	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris,proto3" json:"archive_uris,omitempty"`
 	// Optional. A mapping of property names to values, used to configure PySpark.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in
 	// /etc/spark/conf/spark-defaults.conf and classes in user code.
-	Properties map[string]string `protobuf:"bytes,7,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *PySparkJob) Reset()                    { *m = PySparkJob{} }
-func (m *PySparkJob) String() string            { return proto.CompactTextString(m) }
-func (*PySparkJob) ProtoMessage()               {}
-func (*PySparkJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *PySparkJob) Reset()         { *m = PySparkJob{} }
+func (m *PySparkJob) String() string { return proto.CompactTextString(m) }
+func (*PySparkJob) ProtoMessage()    {}
+func (*PySparkJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{3}
+}
+func (m *PySparkJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PySparkJob.Unmarshal(m, b)
+}
+func (m *PySparkJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PySparkJob.Marshal(b, m, deterministic)
+}
+func (dst *PySparkJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PySparkJob.Merge(dst, src)
+}
+func (m *PySparkJob) XXX_Size() int {
+	return xxx_messageInfo_PySparkJob.Size(m)
+}
+func (m *PySparkJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_PySparkJob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PySparkJob proto.InternalMessageInfo
 
 func (m *PySparkJob) GetMainPythonFileUri() string {
 	if m != nil {
@@ -759,13 +865,35 @@ type QueryList struct {
 	//         ]
 	//       }
 	//     }
-	Queries []string `protobuf:"bytes,1,rep,name=queries" json:"queries,omitempty"`
+	Queries              []string `protobuf:"bytes,1,rep,name=queries,proto3" json:"queries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *QueryList) Reset()         { *m = QueryList{} }
+func (m *QueryList) String() string { return proto.CompactTextString(m) }
+func (*QueryList) ProtoMessage()    {}
+func (*QueryList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{4}
+}
+func (m *QueryList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryList.Unmarshal(m, b)
+}
+func (m *QueryList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryList.Marshal(b, m, deterministic)
+}
+func (dst *QueryList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryList.Merge(dst, src)
+}
+func (m *QueryList) XXX_Size() int {
+	return xxx_messageInfo_QueryList.Size(m)
+}
+func (m *QueryList) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryList.DiscardUnknown(m)
 }
 
-func (m *QueryList) Reset()                    { *m = QueryList{} }
-func (m *QueryList) String() string            { return proto.CompactTextString(m) }
-func (*QueryList) ProtoMessage()               {}
-func (*QueryList) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_QueryList proto.InternalMessageInfo
 
 func (m *QueryList) GetQueries() []string {
 	if m != nil {
@@ -787,39 +915,63 @@ type HiveJob struct {
 	// Optional. Whether to continue executing queries if a query fails.
 	// The default value is `false`. Setting to `true` can be useful when executing
 	// independent parallel queries.
-	ContinueOnFailure bool `protobuf:"varint,3,opt,name=continue_on_failure,json=continueOnFailure" json:"continue_on_failure,omitempty"`
+	ContinueOnFailure bool `protobuf:"varint,3,opt,name=continue_on_failure,json=continueOnFailure,proto3" json:"continue_on_failure,omitempty"`
 	// Optional. Mapping of query variable names to values (equivalent to the
 	// Hive command: `SET name="value";`).
-	ScriptVariables map[string]string `protobuf:"bytes,4,rep,name=script_variables,json=scriptVariables" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ScriptVariables map[string]string `protobuf:"bytes,4,rep,name=script_variables,json=scriptVariables,proto3" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. A mapping of property names and values, used to configure Hive.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in /etc/hadoop/conf/*-site.xml,
 	// /etc/hive/conf/hive-site.xml, and classes in user code.
-	Properties map[string]string `protobuf:"bytes,5,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,5,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. HCFS URIs of jar files to add to the CLASSPATH of the
 	// Hive server and Hadoop MapReduce (MR) tasks. Can contain Hive SerDes
 	// and UDFs.
-	JarFileUris []string `protobuf:"bytes,6,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris          []string `protobuf:"bytes,6,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HiveJob) Reset()         { *m = HiveJob{} }
+func (m *HiveJob) String() string { return proto.CompactTextString(m) }
+func (*HiveJob) ProtoMessage()    {}
+func (*HiveJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{5}
+}
+func (m *HiveJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HiveJob.Unmarshal(m, b)
+}
+func (m *HiveJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HiveJob.Marshal(b, m, deterministic)
+}
+func (dst *HiveJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HiveJob.Merge(dst, src)
+}
+func (m *HiveJob) XXX_Size() int {
+	return xxx_messageInfo_HiveJob.Size(m)
+}
+func (m *HiveJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_HiveJob.DiscardUnknown(m)
 }
 
-func (m *HiveJob) Reset()                    { *m = HiveJob{} }
-func (m *HiveJob) String() string            { return proto.CompactTextString(m) }
-func (*HiveJob) ProtoMessage()               {}
-func (*HiveJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_HiveJob proto.InternalMessageInfo
 
 type isHiveJob_Queries interface {
 	isHiveJob_Queries()
 }
 
 type HiveJob_QueryFileUri struct {
-	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,oneof"`
+	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,proto3,oneof"`
 }
+
 type HiveJob_QueryList struct {
-	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,oneof"`
+	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,proto3,oneof"`
 }
 
 func (*HiveJob_QueryFileUri) isHiveJob_Queries() {}
-func (*HiveJob_QueryList) isHiveJob_Queries()    {}
+
+func (*HiveJob_QueryList) isHiveJob_Queries() {}
 
 func (m *HiveJob) GetQueries() isHiveJob_Queries {
 	if m != nil {
@@ -925,12 +1077,12 @@ func _HiveJob_OneofSizer(msg proto.Message) (n int) {
 	// queries
 	switch x := m.Queries.(type) {
 	case *HiveJob_QueryFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
 		n += len(x.QueryFileUri)
 	case *HiveJob_QueryList:
 		s := proto.Size(x.QueryList)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -952,35 +1104,59 @@ type SparkSqlJob struct {
 	Queries isSparkSqlJob_Queries `protobuf_oneof:"queries"`
 	// Optional. Mapping of query variable names to values (equivalent to the
 	// Spark SQL command: SET `name="value";`).
-	ScriptVariables map[string]string `protobuf:"bytes,3,rep,name=script_variables,json=scriptVariables" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ScriptVariables map[string]string `protobuf:"bytes,3,rep,name=script_variables,json=scriptVariables,proto3" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. A mapping of property names to values, used to configure
 	// Spark SQL's SparkConf. Properties that conflict with values set by the
 	// Cloud Dataproc API may be overwritten.
-	Properties map[string]string `protobuf:"bytes,4,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,4,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. HCFS URIs of jar files to be added to the Spark CLASSPATH.
-	JarFileUris []string `protobuf:"bytes,56,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,56,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,6,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,6,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *SparkSqlJob) Reset()                    { *m = SparkSqlJob{} }
-func (m *SparkSqlJob) String() string            { return proto.CompactTextString(m) }
-func (*SparkSqlJob) ProtoMessage()               {}
-func (*SparkSqlJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *SparkSqlJob) Reset()         { *m = SparkSqlJob{} }
+func (m *SparkSqlJob) String() string { return proto.CompactTextString(m) }
+func (*SparkSqlJob) ProtoMessage()    {}
+func (*SparkSqlJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{6}
+}
+func (m *SparkSqlJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SparkSqlJob.Unmarshal(m, b)
+}
+func (m *SparkSqlJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SparkSqlJob.Marshal(b, m, deterministic)
+}
+func (dst *SparkSqlJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SparkSqlJob.Merge(dst, src)
+}
+func (m *SparkSqlJob) XXX_Size() int {
+	return xxx_messageInfo_SparkSqlJob.Size(m)
+}
+func (m *SparkSqlJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_SparkSqlJob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SparkSqlJob proto.InternalMessageInfo
 
 type isSparkSqlJob_Queries interface {
 	isSparkSqlJob_Queries()
 }
 
 type SparkSqlJob_QueryFileUri struct {
-	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,oneof"`
+	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,proto3,oneof"`
 }
+
 type SparkSqlJob_QueryList struct {
-	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,oneof"`
+	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,proto3,oneof"`
 }
 
 func (*SparkSqlJob_QueryFileUri) isSparkSqlJob_Queries() {}
-func (*SparkSqlJob_QueryList) isSparkSqlJob_Queries()    {}
+
+func (*SparkSqlJob_QueryList) isSparkSqlJob_Queries() {}
 
 func (m *SparkSqlJob) GetQueries() isSparkSqlJob_Queries {
 	if m != nil {
@@ -1086,12 +1262,12 @@ func _SparkSqlJob_OneofSizer(msg proto.Message) (n int) {
 	// queries
 	switch x := m.Queries.(type) {
 	case *SparkSqlJob_QueryFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
 		n += len(x.QueryFileUri)
 	case *SparkSqlJob_QueryList:
 		s := proto.Size(x.QueryList)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1114,40 +1290,64 @@ type PigJob struct {
 	// Optional. Whether to continue executing queries if a query fails.
 	// The default value is `false`. Setting to `true` can be useful when executing
 	// independent parallel queries.
-	ContinueOnFailure bool `protobuf:"varint,3,opt,name=continue_on_failure,json=continueOnFailure" json:"continue_on_failure,omitempty"`
+	ContinueOnFailure bool `protobuf:"varint,3,opt,name=continue_on_failure,json=continueOnFailure,proto3" json:"continue_on_failure,omitempty"`
 	// Optional. Mapping of query variable names to values (equivalent to the Pig
 	// command: `name=[value]`).
-	ScriptVariables map[string]string `protobuf:"bytes,4,rep,name=script_variables,json=scriptVariables" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ScriptVariables map[string]string `protobuf:"bytes,4,rep,name=script_variables,json=scriptVariables,proto3" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. A mapping of property names to values, used to configure Pig.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in /etc/hadoop/conf/*-site.xml,
 	// /etc/pig/conf/pig.properties, and classes in user code.
-	Properties map[string]string `protobuf:"bytes,5,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,5,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. HCFS URIs of jar files to add to the CLASSPATH of
 	// the Pig Client and Hadoop MapReduce (MR) tasks. Can contain Pig UDFs.
-	JarFileUris []string `protobuf:"bytes,6,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,6,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,7,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,7,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *PigJob) Reset()         { *m = PigJob{} }
+func (m *PigJob) String() string { return proto.CompactTextString(m) }
+func (*PigJob) ProtoMessage()    {}
+func (*PigJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{7}
+}
+func (m *PigJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PigJob.Unmarshal(m, b)
+}
+func (m *PigJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PigJob.Marshal(b, m, deterministic)
+}
+func (dst *PigJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PigJob.Merge(dst, src)
+}
+func (m *PigJob) XXX_Size() int {
+	return xxx_messageInfo_PigJob.Size(m)
+}
+func (m *PigJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_PigJob.DiscardUnknown(m)
 }
 
-func (m *PigJob) Reset()                    { *m = PigJob{} }
-func (m *PigJob) String() string            { return proto.CompactTextString(m) }
-func (*PigJob) ProtoMessage()               {}
-func (*PigJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_PigJob proto.InternalMessageInfo
 
 type isPigJob_Queries interface {
 	isPigJob_Queries()
 }
 
 type PigJob_QueryFileUri struct {
-	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,oneof"`
+	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,proto3,oneof"`
 }
+
 type PigJob_QueryList struct {
-	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,oneof"`
+	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,proto3,oneof"`
 }
 
 func (*PigJob_QueryFileUri) isPigJob_Queries() {}
-func (*PigJob_QueryList) isPigJob_Queries()    {}
+
+func (*PigJob_QueryList) isPigJob_Queries() {}
 
 func (m *PigJob) GetQueries() isPigJob_Queries {
 	if m != nil {
@@ -1260,12 +1460,12 @@ func _PigJob_OneofSizer(msg proto.Message) (n int) {
 	// queries
 	switch x := m.Queries.(type) {
 	case *PigJob_QueryFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
 		n += len(x.QueryFileUri)
 	case *PigJob_QueryList:
 		s := proto.Size(x.QueryList)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1278,16 +1478,38 @@ func _PigJob_OneofSizer(msg proto.Message) (n int) {
 // Cloud Dataproc job config.
 type JobPlacement struct {
 	// Required. The name of the cluster where the job will be submitted.
-	ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Output-only. A cluster UUID generated by the Cloud Dataproc service when
 	// the job is submitted.
-	ClusterUuid string `protobuf:"bytes,2,opt,name=cluster_uuid,json=clusterUuid" json:"cluster_uuid,omitempty"`
+	ClusterUuid          string   `protobuf:"bytes,2,opt,name=cluster_uuid,json=clusterUuid,proto3" json:"cluster_uuid,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobPlacement) Reset()                    { *m = JobPlacement{} }
-func (m *JobPlacement) String() string            { return proto.CompactTextString(m) }
-func (*JobPlacement) ProtoMessage()               {}
-func (*JobPlacement) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+func (m *JobPlacement) Reset()         { *m = JobPlacement{} }
+func (m *JobPlacement) String() string { return proto.CompactTextString(m) }
+func (*JobPlacement) ProtoMessage()    {}
+func (*JobPlacement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{8}
+}
+func (m *JobPlacement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobPlacement.Unmarshal(m, b)
+}
+func (m *JobPlacement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobPlacement.Marshal(b, m, deterministic)
+}
+func (dst *JobPlacement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobPlacement.Merge(dst, src)
+}
+func (m *JobPlacement) XXX_Size() int {
+	return xxx_messageInfo_JobPlacement.Size(m)
+}
+func (m *JobPlacement) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobPlacement.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobPlacement proto.InternalMessageInfo
 
 func (m *JobPlacement) GetClusterName() string {
 	if m != nil {
@@ -1306,21 +1528,43 @@ func (m *JobPlacement) GetClusterUuid() string {
 // Cloud Dataproc job status.
 type JobStatus struct {
 	// Output-only. A state message specifying the overall job state.
-	State JobStatus_State `protobuf:"varint,1,opt,name=state,enum=google.cloud.dataproc.v1.JobStatus_State" json:"state,omitempty"`
+	State JobStatus_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.dataproc.v1.JobStatus_State" json:"state,omitempty"`
 	// Output-only. Optional job state details, such as an error
 	// description if the state is <code>ERROR</code>.
-	Details string `protobuf:"bytes,2,opt,name=details" json:"details,omitempty"`
+	Details string `protobuf:"bytes,2,opt,name=details,proto3" json:"details,omitempty"`
 	// Output-only. The time when this state was entered.
-	StateStartTime *google_protobuf3.Timestamp `protobuf:"bytes,6,opt,name=state_start_time,json=stateStartTime" json:"state_start_time,omitempty"`
+	StateStartTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
 	// Output-only. Additional state information, which includes
 	// status reported by the agent.
-	Substate JobStatus_Substate `protobuf:"varint,7,opt,name=substate,enum=google.cloud.dataproc.v1.JobStatus_Substate" json:"substate,omitempty"`
+	Substate             JobStatus_Substate `protobuf:"varint,7,opt,name=substate,proto3,enum=google.cloud.dataproc.v1.JobStatus_Substate" json:"substate,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *JobStatus) Reset()                    { *m = JobStatus{} }
-func (m *JobStatus) String() string            { return proto.CompactTextString(m) }
-func (*JobStatus) ProtoMessage()               {}
-func (*JobStatus) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+func (m *JobStatus) Reset()         { *m = JobStatus{} }
+func (m *JobStatus) String() string { return proto.CompactTextString(m) }
+func (*JobStatus) ProtoMessage()    {}
+func (*JobStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{9}
+}
+func (m *JobStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobStatus.Unmarshal(m, b)
+}
+func (m *JobStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobStatus.Marshal(b, m, deterministic)
+}
+func (dst *JobStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobStatus.Merge(dst, src)
+}
+func (m *JobStatus) XXX_Size() int {
+	return xxx_messageInfo_JobStatus.Size(m)
+}
+func (m *JobStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobStatus proto.InternalMessageInfo
 
 func (m *JobStatus) GetState() JobStatus_State {
 	if m != nil {
@@ -1336,7 +1580,7 @@ func (m *JobStatus) GetDetails() string {
 	return ""
 }
 
-func (m *JobStatus) GetStateStartTime() *google_protobuf3.Timestamp {
+func (m *JobStatus) GetStateStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StateStartTime
 	}
@@ -1354,19 +1598,41 @@ func (m *JobStatus) GetSubstate() JobStatus_Substate {
 type JobReference struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Optional. The job ID, which must be unique within the project. The job ID
 	// is generated by the server upon job submission or provided by the user as a
 	// means to perform retries without creating duplicate jobs. The ID must
 	// contain only letters (a-z, A-Z), numbers (0-9), underscores (_), or
 	// hyphens (-). The maximum length is 100 characters.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobReference) Reset()                    { *m = JobReference{} }
-func (m *JobReference) String() string            { return proto.CompactTextString(m) }
-func (*JobReference) ProtoMessage()               {}
-func (*JobReference) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *JobReference) Reset()         { *m = JobReference{} }
+func (m *JobReference) String() string { return proto.CompactTextString(m) }
+func (*JobReference) ProtoMessage()    {}
+func (*JobReference) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{10}
+}
+func (m *JobReference) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobReference.Unmarshal(m, b)
+}
+func (m *JobReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobReference.Marshal(b, m, deterministic)
+}
+func (dst *JobReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobReference.Merge(dst, src)
+}
+func (m *JobReference) XXX_Size() int {
+	return xxx_messageInfo_JobReference.Size(m)
+}
+func (m *JobReference) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobReference.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobReference proto.InternalMessageInfo
 
 func (m *JobReference) GetProjectId() string {
 	if m != nil {
@@ -1389,22 +1655,44 @@ func (m *JobReference) GetJobId() string {
 // be changed before final release.
 type YarnApplication struct {
 	// Required. The application name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The application state.
-	State YarnApplication_State `protobuf:"varint,2,opt,name=state,enum=google.cloud.dataproc.v1.YarnApplication_State" json:"state,omitempty"`
+	State YarnApplication_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.cloud.dataproc.v1.YarnApplication_State" json:"state,omitempty"`
 	// Required. The numerical progress of the application, from 1 to 100.
-	Progress float32 `protobuf:"fixed32,3,opt,name=progress" json:"progress,omitempty"`
+	Progress float32 `protobuf:"fixed32,3,opt,name=progress,proto3" json:"progress,omitempty"`
 	// Optional. The HTTP URL of the ApplicationMaster, HistoryServer, or
 	// TimelineServer that provides application-specific information. The URL uses
 	// the internal hostname, and requires a proxy server for resolution and,
 	// possibly, access.
-	TrackingUrl string `protobuf:"bytes,4,opt,name=tracking_url,json=trackingUrl" json:"tracking_url,omitempty"`
+	TrackingUrl          string   `protobuf:"bytes,4,opt,name=tracking_url,json=trackingUrl,proto3" json:"tracking_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *YarnApplication) Reset()         { *m = YarnApplication{} }
+func (m *YarnApplication) String() string { return proto.CompactTextString(m) }
+func (*YarnApplication) ProtoMessage()    {}
+func (*YarnApplication) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{11}
+}
+func (m *YarnApplication) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_YarnApplication.Unmarshal(m, b)
+}
+func (m *YarnApplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_YarnApplication.Marshal(b, m, deterministic)
+}
+func (dst *YarnApplication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_YarnApplication.Merge(dst, src)
+}
+func (m *YarnApplication) XXX_Size() int {
+	return xxx_messageInfo_YarnApplication.Size(m)
+}
+func (m *YarnApplication) XXX_DiscardUnknown() {
+	xxx_messageInfo_YarnApplication.DiscardUnknown(m)
 }
 
-func (m *YarnApplication) Reset()                    { *m = YarnApplication{} }
-func (m *YarnApplication) String() string            { return proto.CompactTextString(m) }
-func (*YarnApplication) ProtoMessage()               {}
-func (*YarnApplication) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+var xxx_messageInfo_YarnApplication proto.InternalMessageInfo
 
 func (m *YarnApplication) GetName() string {
 	if m != nil {
@@ -1440,10 +1728,10 @@ type Job struct {
 	// obtain the equivalent REST path of the job resource. If this property
 	// is not specified when a job is created, the server generates a
 	// <code>job_id</code>.
-	Reference *JobReference `protobuf:"bytes,1,opt,name=reference" json:"reference,omitempty"`
+	Reference *JobReference `protobuf:"bytes,1,opt,name=reference,proto3" json:"reference,omitempty"`
 	// Required. Job information, including how, when, and where to
 	// run the job.
-	Placement *JobPlacement `protobuf:"bytes,2,opt,name=placement" json:"placement,omitempty"`
+	Placement *JobPlacement `protobuf:"bytes,2,opt,name=placement,proto3" json:"placement,omitempty"`
 	// Required. The application/framework-specific portion of the job.
 	//
 	// Types that are valid to be assigned to TypeJob:
@@ -1457,65 +1745,111 @@ type Job struct {
 	// Output-only. The job status. Additional application-specific
 	// status information may be contained in the <code>type_job</code>
 	// and <code>yarn_applications</code> fields.
-	Status *JobStatus `protobuf:"bytes,8,opt,name=status" json:"status,omitempty"`
+	Status *JobStatus `protobuf:"bytes,8,opt,name=status,proto3" json:"status,omitempty"`
 	// Output-only. The previous job status.
-	StatusHistory []*JobStatus `protobuf:"bytes,13,rep,name=status_history,json=statusHistory" json:"status_history,omitempty"`
+	StatusHistory []*JobStatus `protobuf:"bytes,13,rep,name=status_history,json=statusHistory,proto3" json:"status_history,omitempty"`
 	// Output-only. The collection of YARN applications spun up by this job.
 	//
 	// **Beta** Feature: This report is available for testing purposes only. It may
 	// be changed before final release.
-	YarnApplications []*YarnApplication `protobuf:"bytes,9,rep,name=yarn_applications,json=yarnApplications" json:"yarn_applications,omitempty"`
+	YarnApplications []*YarnApplication `protobuf:"bytes,9,rep,name=yarn_applications,json=yarnApplications,proto3" json:"yarn_applications,omitempty"`
 	// Output-only. A URI pointing to the location of the stdout of the job's
 	// driver program.
-	DriverOutputResourceUri string `protobuf:"bytes,17,opt,name=driver_output_resource_uri,json=driverOutputResourceUri" json:"driver_output_resource_uri,omitempty"`
+	DriverOutputResourceUri string `protobuf:"bytes,17,opt,name=driver_output_resource_uri,json=driverOutputResourceUri,proto3" json:"driver_output_resource_uri,omitempty"`
 	// Output-only. If present, the location of miscellaneous control files
 	// which may be used as part of job setup and handling. If not present,
 	// control files may be placed in the same location as `driver_output_uri`.
-	DriverControlFilesUri string `protobuf:"bytes,15,opt,name=driver_control_files_uri,json=driverControlFilesUri" json:"driver_control_files_uri,omitempty"`
+	DriverControlFilesUri string `protobuf:"bytes,15,opt,name=driver_control_files_uri,json=driverControlFilesUri,proto3" json:"driver_control_files_uri,omitempty"`
 	// Optional. The labels to associate with this job.
 	// Label **keys** must contain 1 to 63 characters, and must conform to
 	// [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	// Label **values** may be empty, but, if present, must contain 1 to 63
 	// characters, and must conform to [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	// No more than 32 labels can be associated with a job.
-	Labels map[string]string `protobuf:"bytes,18,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,18,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. Job scheduling configuration.
-	Scheduling *JobScheduling `protobuf:"bytes,20,opt,name=scheduling" json:"scheduling,omitempty"`
+	Scheduling           *JobScheduling `protobuf:"bytes,20,opt,name=scheduling,proto3" json:"scheduling,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *Job) Reset()         { *m = Job{} }
+func (m *Job) String() string { return proto.CompactTextString(m) }
+func (*Job) ProtoMessage()    {}
+func (*Job) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{12}
+}
+func (m *Job) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Job.Unmarshal(m, b)
+}
+func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
+}
+func (dst *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(dst, src)
+}
+func (m *Job) XXX_Size() int {
+	return xxx_messageInfo_Job.Size(m)
+}
+func (m *Job) XXX_DiscardUnknown() {
+	xxx_messageInfo_Job.DiscardUnknown(m)
 }
 
-func (m *Job) Reset()                    { *m = Job{} }
-func (m *Job) String() string            { return proto.CompactTextString(m) }
-func (*Job) ProtoMessage()               {}
-func (*Job) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+var xxx_messageInfo_Job proto.InternalMessageInfo
+
+func (m *Job) GetReference() *JobReference {
+	if m != nil {
+		return m.Reference
+	}
+	return nil
+}
+
+func (m *Job) GetPlacement() *JobPlacement {
+	if m != nil {
+		return m.Placement
+	}
+	return nil
+}
 
 type isJob_TypeJob interface {
 	isJob_TypeJob()
 }
 
 type Job_HadoopJob struct {
-	HadoopJob *HadoopJob `protobuf:"bytes,3,opt,name=hadoop_job,json=hadoopJob,oneof"`
+	HadoopJob *HadoopJob `protobuf:"bytes,3,opt,name=hadoop_job,json=hadoopJob,proto3,oneof"`
 }
+
 type Job_SparkJob struct {
-	SparkJob *SparkJob `protobuf:"bytes,4,opt,name=spark_job,json=sparkJob,oneof"`
+	SparkJob *SparkJob `protobuf:"bytes,4,opt,name=spark_job,json=sparkJob,proto3,oneof"`
 }
+
 type Job_PysparkJob struct {
-	PysparkJob *PySparkJob `protobuf:"bytes,5,opt,name=pyspark_job,json=pysparkJob,oneof"`
+	PysparkJob *PySparkJob `protobuf:"bytes,5,opt,name=pyspark_job,json=pysparkJob,proto3,oneof"`
 }
+
 type Job_HiveJob struct {
-	HiveJob *HiveJob `protobuf:"bytes,6,opt,name=hive_job,json=hiveJob,oneof"`
+	HiveJob *HiveJob `protobuf:"bytes,6,opt,name=hive_job,json=hiveJob,proto3,oneof"`
 }
+
 type Job_PigJob struct {
-	PigJob *PigJob `protobuf:"bytes,7,opt,name=pig_job,json=pigJob,oneof"`
+	PigJob *PigJob `protobuf:"bytes,7,opt,name=pig_job,json=pigJob,proto3,oneof"`
 }
+
 type Job_SparkSqlJob struct {
-	SparkSqlJob *SparkSqlJob `protobuf:"bytes,12,opt,name=spark_sql_job,json=sparkSqlJob,oneof"`
+	SparkSqlJob *SparkSqlJob `protobuf:"bytes,12,opt,name=spark_sql_job,json=sparkSqlJob,proto3,oneof"`
 }
 
-func (*Job_HadoopJob) isJob_TypeJob()   {}
-func (*Job_SparkJob) isJob_TypeJob()    {}
-func (*Job_PysparkJob) isJob_TypeJob()  {}
-func (*Job_HiveJob) isJob_TypeJob()     {}
-func (*Job_PigJob) isJob_TypeJob()      {}
+func (*Job_HadoopJob) isJob_TypeJob() {}
+
+func (*Job_SparkJob) isJob_TypeJob() {}
+
+func (*Job_PysparkJob) isJob_TypeJob() {}
+
+func (*Job_HiveJob) isJob_TypeJob() {}
+
+func (*Job_PigJob) isJob_TypeJob() {}
+
 func (*Job_SparkSqlJob) isJob_TypeJob() {}
 
 func (m *Job) GetTypeJob() isJob_TypeJob {
@@ -1525,20 +1859,6 @@ func (m *Job) GetTypeJob() isJob_TypeJob {
 	return nil
 }
 
-func (m *Job) GetReference() *JobReference {
-	if m != nil {
-		return m.Reference
-	}
-	return nil
-}
-
-func (m *Job) GetPlacement() *JobPlacement {
-	if m != nil {
-		return m.Placement
-	}
-	return nil
-}
-
 func (m *Job) GetHadoopJob() *HadoopJob {
 	if x, ok := m.GetTypeJob().(*Job_HadoopJob); ok {
 		return x.HadoopJob
@@ -1745,32 +2065,32 @@ func _Job_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.TypeJob.(type) {
 	case *Job_HadoopJob:
 		s := proto.Size(x.HadoopJob)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_SparkJob:
 		s := proto.Size(x.SparkJob)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_PysparkJob:
 		s := proto.Size(x.PysparkJob)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_HiveJob:
 		s := proto.Size(x.HiveJob)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_PigJob:
 		s := proto.Size(x.PigJob)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_SparkSqlJob:
 		s := proto.Size(x.SparkSqlJob)
-		n += proto.SizeVarint(12<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1793,13 +2113,35 @@ type JobScheduling struct {
 	// 4 times within 10 minute window.
 	//
 	// Maximum value is 10.
-	MaxFailuresPerHour int32 `protobuf:"varint,1,opt,name=max_failures_per_hour,json=maxFailuresPerHour" json:"max_failures_per_hour,omitempty"`
+	MaxFailuresPerHour   int32    `protobuf:"varint,1,opt,name=max_failures_per_hour,json=maxFailuresPerHour,proto3" json:"max_failures_per_hour,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobScheduling) Reset()                    { *m = JobScheduling{} }
-func (m *JobScheduling) String() string            { return proto.CompactTextString(m) }
-func (*JobScheduling) ProtoMessage()               {}
-func (*JobScheduling) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+func (m *JobScheduling) Reset()         { *m = JobScheduling{} }
+func (m *JobScheduling) String() string { return proto.CompactTextString(m) }
+func (*JobScheduling) ProtoMessage()    {}
+func (*JobScheduling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{13}
+}
+func (m *JobScheduling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobScheduling.Unmarshal(m, b)
+}
+func (m *JobScheduling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobScheduling.Marshal(b, m, deterministic)
+}
+func (dst *JobScheduling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobScheduling.Merge(dst, src)
+}
+func (m *JobScheduling) XXX_Size() int {
+	return xxx_messageInfo_JobScheduling.Size(m)
+}
+func (m *JobScheduling) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobScheduling.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobScheduling proto.InternalMessageInfo
 
 func (m *JobScheduling) GetMaxFailuresPerHour() int32 {
 	if m != nil {
@@ -1812,17 +2154,39 @@ func (m *JobScheduling) GetMaxFailuresPerHour() int32 {
 type SubmitJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job resource.
-	Job *Job `protobuf:"bytes,2,opt,name=job" json:"job,omitempty"`
+	Job                  *Job     `protobuf:"bytes,2,opt,name=job,proto3" json:"job,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SubmitJobRequest) Reset()                    { *m = SubmitJobRequest{} }
-func (m *SubmitJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*SubmitJobRequest) ProtoMessage()               {}
-func (*SubmitJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+func (m *SubmitJobRequest) Reset()         { *m = SubmitJobRequest{} }
+func (m *SubmitJobRequest) String() string { return proto.CompactTextString(m) }
+func (*SubmitJobRequest) ProtoMessage()    {}
+func (*SubmitJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{14}
+}
+func (m *SubmitJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SubmitJobRequest.Unmarshal(m, b)
+}
+func (m *SubmitJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SubmitJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *SubmitJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubmitJobRequest.Merge(dst, src)
+}
+func (m *SubmitJobRequest) XXX_Size() int {
+	return xxx_messageInfo_SubmitJobRequest.Size(m)
+}
+func (m *SubmitJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SubmitJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SubmitJobRequest proto.InternalMessageInfo
 
 func (m *SubmitJobRequest) GetProjectId() string {
 	if m != nil {
@@ -1849,17 +2213,39 @@ func (m *SubmitJobRequest) GetJob() *Job {
 type GetJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job ID.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetJobRequest) Reset()                    { *m = GetJobRequest{} }
-func (m *GetJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetJobRequest) ProtoMessage()               {}
-func (*GetJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
+func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
+func (*GetJobRequest) ProtoMessage()    {}
+func (*GetJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{15}
+}
+func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
+}
+func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+}
+func (m *GetJobRequest) XXX_Size() int {
+	return xxx_messageInfo_GetJobRequest.Size(m)
+}
+func (m *GetJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetJobRequest proto.InternalMessageInfo
 
 func (m *GetJobRequest) GetProjectId() string {
 	if m != nil {
@@ -1886,22 +2272,22 @@ func (m *GetJobRequest) GetJobId() string {
 type ListJobsRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,6,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,6,opt,name=region,proto3" json:"region,omitempty"`
 	// Optional. The number of results to return in each response.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The page token, returned by a previous call, to request the
 	// next page of results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional. If set, the returned jobs list includes only jobs that were
 	// submitted to the named cluster.
-	ClusterName string `protobuf:"bytes,4,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,4,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Optional. Specifies enumerated categories of jobs to list.
 	// (default = match ALL jobs).
 	//
 	// If `filter` is provided, `jobStateMatcher` will be ignored.
-	JobStateMatcher ListJobsRequest_JobStateMatcher `protobuf:"varint,5,opt,name=job_state_matcher,json=jobStateMatcher,enum=google.cloud.dataproc.v1.ListJobsRequest_JobStateMatcher" json:"job_state_matcher,omitempty"`
+	JobStateMatcher ListJobsRequest_JobStateMatcher `protobuf:"varint,5,opt,name=job_state_matcher,json=jobStateMatcher,proto3,enum=google.cloud.dataproc.v1.ListJobsRequest_JobStateMatcher" json:"job_state_matcher,omitempty"`
 	// Optional. A filter constraining the jobs to list. Filters are
 	// case-sensitive and have the following syntax:
 	//
@@ -1916,13 +2302,35 @@ type ListJobsRequest struct {
 	// Example filter:
 	//
 	// status.state = ACTIVE AND labels.env = staging AND labels.starred = *
-	Filter string `protobuf:"bytes,7,opt,name=filter" json:"filter,omitempty"`
+	Filter               string   `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
+func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListJobsRequest) ProtoMessage()    {}
+func (*ListJobsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{16}
+}
+func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
+}
+func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+}
+func (m *ListJobsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListJobsRequest.Size(m)
+}
+func (m *ListJobsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListJobsRequest.DiscardUnknown(m)
 }
 
-func (m *ListJobsRequest) Reset()                    { *m = ListJobsRequest{} }
-func (m *ListJobsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListJobsRequest) ProtoMessage()               {}
-func (*ListJobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+var xxx_messageInfo_ListJobsRequest proto.InternalMessageInfo
 
 func (m *ListJobsRequest) GetProjectId() string {
 	if m != nil {
@@ -1977,26 +2385,48 @@ func (m *ListJobsRequest) GetFilter() string {
 type UpdateJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,2,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,2,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job ID.
-	JobId string `protobuf:"bytes,3,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId string `protobuf:"bytes,3,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
 	// Required. The changes to the job.
-	Job *Job `protobuf:"bytes,4,opt,name=job" json:"job,omitempty"`
+	Job *Job `protobuf:"bytes,4,opt,name=job,proto3" json:"job,omitempty"`
 	// Required. Specifies the path, relative to <code>Job</code>, of
 	// the field to update. For example, to update the labels of a Job the
 	// <code>update_mask</code> parameter would be specified as
 	// <code>labels</code>, and the `PATCH` request body would specify the new
 	// value. <strong>Note:</strong> Currently, <code>labels</code> is the only
 	// field that can be updated.
-	UpdateMask *google_protobuf5.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateJobRequest) Reset()                    { *m = UpdateJobRequest{} }
-func (m *UpdateJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateJobRequest) ProtoMessage()               {}
-func (*UpdateJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+func (m *UpdateJobRequest) Reset()         { *m = UpdateJobRequest{} }
+func (m *UpdateJobRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateJobRequest) ProtoMessage()    {}
+func (*UpdateJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{17}
+}
+func (m *UpdateJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateJobRequest.Unmarshal(m, b)
+}
+func (m *UpdateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobRequest.Merge(dst, src)
+}
+func (m *UpdateJobRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateJobRequest.Size(m)
+}
+func (m *UpdateJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateJobRequest proto.InternalMessageInfo
 
 func (m *UpdateJobRequest) GetProjectId() string {
 	if m != nil {
@@ -2026,7 +2456,7 @@ func (m *UpdateJobRequest) GetJob() *Job {
 	return nil
 }
 
-func (m *UpdateJobRequest) GetUpdateMask() *google_protobuf5.FieldMask {
+func (m *UpdateJobRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -2036,17 +2466,39 @@ func (m *UpdateJobRequest) GetUpdateMask() *google_protobuf5.FieldMask {
 // A list of jobs in a project.
 type ListJobsResponse struct {
 	// Output-only. Jobs list.
-	Jobs []*Job `protobuf:"bytes,1,rep,name=jobs" json:"jobs,omitempty"`
+	Jobs []*Job `protobuf:"bytes,1,rep,name=jobs,proto3" json:"jobs,omitempty"`
 	// Optional. This token is included in the response if there are more results
 	// to fetch. To fetch additional results, provide this value as the
 	// `page_token` in a subsequent <code>ListJobsRequest</code>.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListJobsResponse) Reset()                    { *m = ListJobsResponse{} }
-func (m *ListJobsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListJobsResponse) ProtoMessage()               {}
-func (*ListJobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{18} }
+func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
+func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListJobsResponse) ProtoMessage()    {}
+func (*ListJobsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{18}
+}
+func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
+}
+func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+}
+func (m *ListJobsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListJobsResponse.Size(m)
+}
+func (m *ListJobsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListJobsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListJobsResponse proto.InternalMessageInfo
 
 func (m *ListJobsResponse) GetJobs() []*Job {
 	if m != nil {
@@ -2066,17 +2518,39 @@ func (m *ListJobsResponse) GetNextPageToken() string {
 type CancelJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job ID.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CancelJobRequest) Reset()         { *m = CancelJobRequest{} }
+func (m *CancelJobRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelJobRequest) ProtoMessage()    {}
+func (*CancelJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{19}
+}
+func (m *CancelJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelJobRequest.Unmarshal(m, b)
+}
+func (m *CancelJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelJobRequest.Merge(dst, src)
+}
+func (m *CancelJobRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelJobRequest.Size(m)
+}
+func (m *CancelJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelJobRequest.DiscardUnknown(m)
 }
 
-func (m *CancelJobRequest) Reset()                    { *m = CancelJobRequest{} }
-func (m *CancelJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelJobRequest) ProtoMessage()               {}
-func (*CancelJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{19} }
+var xxx_messageInfo_CancelJobRequest proto.InternalMessageInfo
 
 func (m *CancelJobRequest) GetProjectId() string {
 	if m != nil {
@@ -2103,17 +2577,39 @@ func (m *CancelJobRequest) GetJobId() string {
 type DeleteJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job ID.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteJobRequest) Reset()                    { *m = DeleteJobRequest{} }
-func (m *DeleteJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteJobRequest) ProtoMessage()               {}
-func (*DeleteJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{20} }
+func (m *DeleteJobRequest) Reset()         { *m = DeleteJobRequest{} }
+func (m *DeleteJobRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteJobRequest) ProtoMessage()    {}
+func (*DeleteJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_db8ea7aa6248c82a, []int{20}
+}
+func (m *DeleteJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteJobRequest.Unmarshal(m, b)
+}
+func (m *DeleteJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobRequest.Merge(dst, src)
+}
+func (m *DeleteJobRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteJobRequest.Size(m)
+}
+func (m *DeleteJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteJobRequest proto.InternalMessageInfo
 
 func (m *DeleteJobRequest) GetProjectId() string {
 	if m != nil {
@@ -2138,18 +2634,29 @@ func (m *DeleteJobRequest) GetJobId() string {
 
 func init() {
 	proto.RegisterType((*LoggingConfig)(nil), "google.cloud.dataproc.v1.LoggingConfig")
+	proto.RegisterMapType((map[string]LoggingConfig_Level)(nil), "google.cloud.dataproc.v1.LoggingConfig.DriverLogLevelsEntry")
 	proto.RegisterType((*HadoopJob)(nil), "google.cloud.dataproc.v1.HadoopJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.HadoopJob.PropertiesEntry")
 	proto.RegisterType((*SparkJob)(nil), "google.cloud.dataproc.v1.SparkJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.SparkJob.PropertiesEntry")
 	proto.RegisterType((*PySparkJob)(nil), "google.cloud.dataproc.v1.PySparkJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.PySparkJob.PropertiesEntry")
 	proto.RegisterType((*QueryList)(nil), "google.cloud.dataproc.v1.QueryList")
 	proto.RegisterType((*HiveJob)(nil), "google.cloud.dataproc.v1.HiveJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.HiveJob.PropertiesEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.HiveJob.ScriptVariablesEntry")
 	proto.RegisterType((*SparkSqlJob)(nil), "google.cloud.dataproc.v1.SparkSqlJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.SparkSqlJob.PropertiesEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.SparkSqlJob.ScriptVariablesEntry")
 	proto.RegisterType((*PigJob)(nil), "google.cloud.dataproc.v1.PigJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.PigJob.PropertiesEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.PigJob.ScriptVariablesEntry")
 	proto.RegisterType((*JobPlacement)(nil), "google.cloud.dataproc.v1.JobPlacement")
 	proto.RegisterType((*JobStatus)(nil), "google.cloud.dataproc.v1.JobStatus")
 	proto.RegisterType((*JobReference)(nil), "google.cloud.dataproc.v1.JobReference")
 	proto.RegisterType((*YarnApplication)(nil), "google.cloud.dataproc.v1.YarnApplication")
 	proto.RegisterType((*Job)(nil), "google.cloud.dataproc.v1.Job")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.Job.LabelsEntry")
 	proto.RegisterType((*JobScheduling)(nil), "google.cloud.dataproc.v1.JobScheduling")
 	proto.RegisterType((*SubmitJobRequest)(nil), "google.cloud.dataproc.v1.SubmitJobRequest")
 	proto.RegisterType((*GetJobRequest)(nil), "google.cloud.dataproc.v1.GetJobRequest")
@@ -2173,8 +2680,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for JobController service
-
+// JobControllerClient is the client API for JobController service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type JobControllerClient interface {
 	// Submits a job to a cluster.
 	SubmitJob(ctx context.Context, in *SubmitJobRequest, opts ...grpc.CallOption) (*Job, error)
@@ -2191,7 +2699,7 @@ type JobControllerClient interface {
 	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*Job, error)
 	// Deletes the job from the project. If the job is active, the delete fails,
 	// and the response returns `FAILED_PRECONDITION`.
-	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type jobControllerClient struct {
@@ -2204,7 +2712,7 @@ func NewJobControllerClient(cc *grpc.ClientConn) JobControllerClient {
 
 func (c *jobControllerClient) SubmitJob(ctx context.Context, in *SubmitJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/SubmitJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/SubmitJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2213,7 +2721,7 @@ func (c *jobControllerClient) SubmitJob(ctx context.Context, in *SubmitJobReques
 
 func (c *jobControllerClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/GetJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/GetJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2222,7 +2730,7 @@ func (c *jobControllerClient) GetJob(ctx context.Context, in *GetJobRequest, opt
 
 func (c *jobControllerClient) ListJobs(ctx context.Context, in *ListJobsRequest, opts ...grpc.CallOption) (*ListJobsResponse, error) {
 	out := new(ListJobsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/ListJobs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/ListJobs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2231,7 +2739,7 @@ func (c *jobControllerClient) ListJobs(ctx context.Context, in *ListJobsRequest,
 
 func (c *jobControllerClient) UpdateJob(ctx context.Context, in *UpdateJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/UpdateJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/UpdateJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2240,24 +2748,23 @@ func (c *jobControllerClient) UpdateJob(ctx context.Context, in *UpdateJobReques
 
 func (c *jobControllerClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/CancelJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/CancelJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *jobControllerClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/DeleteJob", in, out, c.cc, opts...)
+func (c *jobControllerClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/DeleteJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for JobController service
-
+// JobControllerServer is the server API for JobController service.
 type JobControllerServer interface {
 	// Submits a job to a cluster.
 	SubmitJob(context.Context, *SubmitJobRequest) (*Job, error)
@@ -2274,7 +2781,7 @@ type JobControllerServer interface {
 	CancelJob(context.Context, *CancelJobRequest) (*Job, error)
 	// Deletes the job from the project. If the job is active, the delete fails,
 	// and the response returns `FAILED_PRECONDITION`.
-	DeleteJob(context.Context, *DeleteJobRequest) (*google_protobuf2.Empty, error)
+	DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error)
 }
 
 func RegisterJobControllerServer(s *grpc.Server, srv JobControllerServer) {
@@ -2422,9 +2929,11 @@ var _JobController_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dataproc/v1/jobs.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dataproc/v1/jobs.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1/jobs.proto", fileDescriptor_jobs_db8ea7aa6248c82a)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_jobs_db8ea7aa6248c82a = []byte{
 	// 2290 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcf, 0x73, 0x1b, 0x49,
 	0xf5, 0xb7, 0x7e, 0x6b, 0x9e, 0x6c, 0x79, 0xdc, 0x9b, 0xec, 0x57, 0xa5, 0xdd, 0xad, 0xf5, 0x4e,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/operations.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/operations.pb.go
index ecdbdebc..26f83ae3 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/operations.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1/operations.pb.go
@@ -1,21 +1,27 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1/operations.proto
 
-package dataproc
+package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _ "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "google.golang.org/genproto/googleapis/longrunning"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The operation state.
 type ClusterOperationStatus_State int32
 
@@ -47,25 +53,47 @@ func (x ClusterOperationStatus_State) String() string {
 	return proto.EnumName(ClusterOperationStatus_State_name, int32(x))
 }
 func (ClusterOperationStatus_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 0}
+	return fileDescriptor_operations_7be03f6a43d7bf8b, []int{0, 0}
 }
 
 // The status of the operation.
 type ClusterOperationStatus struct {
 	// Output-only. A message containing the operation state.
-	State ClusterOperationStatus_State `protobuf:"varint,1,opt,name=state,enum=google.cloud.dataproc.v1.ClusterOperationStatus_State" json:"state,omitempty"`
+	State ClusterOperationStatus_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.dataproc.v1.ClusterOperationStatus_State" json:"state,omitempty"`
 	// Output-only. A message containing the detailed operation state.
-	InnerState string `protobuf:"bytes,2,opt,name=inner_state,json=innerState" json:"inner_state,omitempty"`
+	InnerState string `protobuf:"bytes,2,opt,name=inner_state,json=innerState,proto3" json:"inner_state,omitempty"`
 	// Output-only.A message containing any operation metadata details.
-	Details string `protobuf:"bytes,3,opt,name=details" json:"details,omitempty"`
+	Details string `protobuf:"bytes,3,opt,name=details,proto3" json:"details,omitempty"`
 	// Output-only. The time this state was entered.
-	StateStartTime *google_protobuf3.Timestamp `protobuf:"bytes,4,opt,name=state_start_time,json=stateStartTime" json:"state_start_time,omitempty"`
+	StateStartTime       *timestamp.Timestamp `protobuf:"bytes,4,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *ClusterOperationStatus) Reset()         { *m = ClusterOperationStatus{} }
+func (m *ClusterOperationStatus) String() string { return proto.CompactTextString(m) }
+func (*ClusterOperationStatus) ProtoMessage()    {}
+func (*ClusterOperationStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_7be03f6a43d7bf8b, []int{0}
+}
+func (m *ClusterOperationStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterOperationStatus.Unmarshal(m, b)
+}
+func (m *ClusterOperationStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterOperationStatus.Marshal(b, m, deterministic)
+}
+func (dst *ClusterOperationStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperationStatus.Merge(dst, src)
+}
+func (m *ClusterOperationStatus) XXX_Size() int {
+	return xxx_messageInfo_ClusterOperationStatus.Size(m)
+}
+func (m *ClusterOperationStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterOperationStatus.DiscardUnknown(m)
 }
 
-func (m *ClusterOperationStatus) Reset()                    { *m = ClusterOperationStatus{} }
-func (m *ClusterOperationStatus) String() string            { return proto.CompactTextString(m) }
-func (*ClusterOperationStatus) ProtoMessage()               {}
-func (*ClusterOperationStatus) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_ClusterOperationStatus proto.InternalMessageInfo
 
 func (m *ClusterOperationStatus) GetState() ClusterOperationStatus_State {
 	if m != nil {
@@ -88,7 +116,7 @@ func (m *ClusterOperationStatus) GetDetails() string {
 	return ""
 }
 
-func (m *ClusterOperationStatus) GetStateStartTime() *google_protobuf3.Timestamp {
+func (m *ClusterOperationStatus) GetStateStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StateStartTime
 	}
@@ -98,27 +126,49 @@ func (m *ClusterOperationStatus) GetStateStartTime() *google_protobuf3.Timestamp
 // Metadata describing the operation.
 type ClusterOperationMetadata struct {
 	// Output-only. Name of the cluster for the operation.
-	ClusterName string `protobuf:"bytes,7,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,7,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Output-only. Cluster UUID for the operation.
-	ClusterUuid string `protobuf:"bytes,8,opt,name=cluster_uuid,json=clusterUuid" json:"cluster_uuid,omitempty"`
+	ClusterUuid string `protobuf:"bytes,8,opt,name=cluster_uuid,json=clusterUuid,proto3" json:"cluster_uuid,omitempty"`
 	// Output-only. Current operation status.
-	Status *ClusterOperationStatus `protobuf:"bytes,9,opt,name=status" json:"status,omitempty"`
+	Status *ClusterOperationStatus `protobuf:"bytes,9,opt,name=status,proto3" json:"status,omitempty"`
 	// Output-only. The previous operation status.
-	StatusHistory []*ClusterOperationStatus `protobuf:"bytes,10,rep,name=status_history,json=statusHistory" json:"status_history,omitempty"`
+	StatusHistory []*ClusterOperationStatus `protobuf:"bytes,10,rep,name=status_history,json=statusHistory,proto3" json:"status_history,omitempty"`
 	// Output-only. The operation type.
-	OperationType string `protobuf:"bytes,11,opt,name=operation_type,json=operationType" json:"operation_type,omitempty"`
+	OperationType string `protobuf:"bytes,11,opt,name=operation_type,json=operationType,proto3" json:"operation_type,omitempty"`
 	// Output-only. Short description of operation.
-	Description string `protobuf:"bytes,12,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,12,opt,name=description,proto3" json:"description,omitempty"`
 	// Output-only. Labels associated with the operation
-	Labels map[string]string `protobuf:"bytes,13,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,13,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output-only. Errors encountered during operation execution.
-	Warnings []string `protobuf:"bytes,14,rep,name=warnings" json:"warnings,omitempty"`
+	Warnings             []string `protobuf:"bytes,14,rep,name=warnings,proto3" json:"warnings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ClusterOperationMetadata) Reset()                    { *m = ClusterOperationMetadata{} }
-func (m *ClusterOperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*ClusterOperationMetadata) ProtoMessage()               {}
-func (*ClusterOperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (m *ClusterOperationMetadata) Reset()         { *m = ClusterOperationMetadata{} }
+func (m *ClusterOperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*ClusterOperationMetadata) ProtoMessage()    {}
+func (*ClusterOperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_7be03f6a43d7bf8b, []int{1}
+}
+func (m *ClusterOperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterOperationMetadata.Unmarshal(m, b)
+}
+func (m *ClusterOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterOperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ClusterOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperationMetadata.Merge(dst, src)
+}
+func (m *ClusterOperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_ClusterOperationMetadata.Size(m)
+}
+func (m *ClusterOperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterOperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterOperationMetadata proto.InternalMessageInfo
 
 func (m *ClusterOperationMetadata) GetClusterName() string {
 	if m != nil {
@@ -179,12 +229,15 @@ func (m *ClusterOperationMetadata) GetWarnings() []string {
 func init() {
 	proto.RegisterType((*ClusterOperationStatus)(nil), "google.cloud.dataproc.v1.ClusterOperationStatus")
 	proto.RegisterType((*ClusterOperationMetadata)(nil), "google.cloud.dataproc.v1.ClusterOperationMetadata")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1.ClusterOperationMetadata.LabelsEntry")
 	proto.RegisterEnum("google.cloud.dataproc.v1.ClusterOperationStatus_State", ClusterOperationStatus_State_name, ClusterOperationStatus_State_value)
 }
 
-func init() { proto.RegisterFile("google/cloud/dataproc/v1/operations.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1/operations.proto", fileDescriptor_operations_7be03f6a43d7bf8b)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_operations_7be03f6a43d7bf8b = []byte{
 	// 553 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x61, 0x6b, 0xd3, 0x40,
 	0x18, 0x36, 0xcd, 0xb6, 0xb6, 0x97, 0xb5, 0x96, 0x43, 0xe4, 0x88, 0x83, 0xc5, 0x8a, 0x50, 0xbf,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/clusters.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
index 0ba92da1..8daaf16b 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/clusters.pb.go
@@ -1,86 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/clusters.proto
 
-/*
-Package dataproc is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/dataproc/v1beta2/clusters.proto
-	google/cloud/dataproc/v1beta2/jobs.proto
-	google/cloud/dataproc/v1beta2/operations.proto
-	google/cloud/dataproc/v1beta2/workflow_templates.proto
-
-It has these top-level messages:
-	Cluster
-	ClusterConfig
-	GceClusterConfig
-	InstanceGroupConfig
-	ManagedGroupConfig
-	AcceleratorConfig
-	DiskConfig
-	LifecycleConfig
-	NodeInitializationAction
-	ClusterStatus
-	SoftwareConfig
-	ClusterMetrics
-	CreateClusterRequest
-	UpdateClusterRequest
-	DeleteClusterRequest
-	GetClusterRequest
-	ListClustersRequest
-	ListClustersResponse
-	DiagnoseClusterRequest
-	DiagnoseClusterResults
-	LoggingConfig
-	HadoopJob
-	SparkJob
-	PySparkJob
-	QueryList
-	HiveJob
-	SparkSqlJob
-	PigJob
-	JobPlacement
-	JobStatus
-	JobReference
-	YarnApplication
-	Job
-	JobScheduling
-	SubmitJobRequest
-	GetJobRequest
-	ListJobsRequest
-	UpdateJobRequest
-	ListJobsResponse
-	CancelJobRequest
-	DeleteJobRequest
-	ClusterOperationStatus
-	ClusterOperationMetadata
-	WorkflowTemplate
-	WorkflowTemplatePlacement
-	ManagedCluster
-	ClusterSelector
-	OrderedJob
-	WorkflowMetadata
-	ClusterOperation
-	WorkflowGraph
-	WorkflowNode
-	CreateWorkflowTemplateRequest
-	GetWorkflowTemplateRequest
-	InstantiateWorkflowTemplateRequest
-	UpdateWorkflowTemplateRequest
-	ListWorkflowTemplatesRequest
-	ListWorkflowTemplatesResponse
-	DeleteWorkflowTemplateRequest
-*/
-package dataproc
+package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf4 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -136,11 +66,15 @@ var ClusterStatus_State_value = map[string]int32{
 func (x ClusterStatus_State) String() string {
 	return proto.EnumName(ClusterStatus_State_name, int32(x))
 }
-func (ClusterStatus_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
+func (ClusterStatus_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{9, 0}
+}
 
+// The cluster substate.
 type ClusterStatus_Substate int32
 
 const (
+	// The cluster substate is unknown.
 	ClusterStatus_UNSPECIFIED ClusterStatus_Substate = 0
 	// The cluster is known to be in an unhealthy state
 	// (for example, critical daemons are not running or HDFS capacity is
@@ -169,44 +103,68 @@ var ClusterStatus_Substate_value = map[string]int32{
 func (x ClusterStatus_Substate) String() string {
 	return proto.EnumName(ClusterStatus_Substate_name, int32(x))
 }
-func (ClusterStatus_Substate) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 1} }
+func (ClusterStatus_Substate) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{9, 1}
+}
 
 // Describes the identifying information, config, and status of
-// a cluster of Google Compute Engine instances.
+// a cluster of Compute Engine instances.
 type Cluster struct {
 	// Required. The Google Cloud Platform project ID that the cluster belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The cluster name. Cluster names within a project must be
 	// unique. Names of deleted clusters can be reused.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Required. The cluster config. Note that Cloud Dataproc may set
 	// default values, and values may change when clusters are updated.
-	Config *ClusterConfig `protobuf:"bytes,3,opt,name=config" json:"config,omitempty"`
+	Config *ClusterConfig `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"`
 	// Optional. The labels to associate with this cluster.
 	// Label **keys** must contain 1 to 63 characters, and must conform to
 	// [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	// Label **values** may be empty, but, if present, must contain 1 to 63
 	// characters, and must conform to [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	// No more than 32 labels can be associated with a cluster.
-	Labels map[string]string `protobuf:"bytes,8,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Output-only. Cluster status.
-	Status *ClusterStatus `protobuf:"bytes,4,opt,name=status" json:"status,omitempty"`
-	// Output-only. The previous cluster status.
-	StatusHistory []*ClusterStatus `protobuf:"bytes,7,rep,name=status_history,json=statusHistory" json:"status_history,omitempty"`
-	// Output-only. A cluster UUID (Unique Universal Identifier). Cloud Dataproc
+	Labels map[string]string `protobuf:"bytes,8,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Output only. Cluster status.
+	Status *ClusterStatus `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"`
+	// Output only. The previous cluster status.
+	StatusHistory []*ClusterStatus `protobuf:"bytes,7,rep,name=status_history,json=statusHistory,proto3" json:"status_history,omitempty"`
+	// Output only. A cluster UUID (Unique Universal Identifier). Cloud Dataproc
 	// generates this value when it creates the cluster.
-	ClusterUuid string `protobuf:"bytes,6,opt,name=cluster_uuid,json=clusterUuid" json:"cluster_uuid,omitempty"`
+	ClusterUuid string `protobuf:"bytes,6,opt,name=cluster_uuid,json=clusterUuid,proto3" json:"cluster_uuid,omitempty"`
 	// Contains cluster daemon metrics such as HDFS and YARN stats.
 	//
 	// **Beta Feature**: This report is available for testing purposes only. It may
 	// be changed before final release.
-	Metrics *ClusterMetrics `protobuf:"bytes,9,opt,name=metrics" json:"metrics,omitempty"`
+	Metrics              *ClusterMetrics `protobuf:"bytes,9,opt,name=metrics,proto3" json:"metrics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *Cluster) Reset()                    { *m = Cluster{} }
-func (m *Cluster) String() string            { return proto.CompactTextString(m) }
-func (*Cluster) ProtoMessage()               {}
-func (*Cluster) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Cluster) Reset()         { *m = Cluster{} }
+func (m *Cluster) String() string { return proto.CompactTextString(m) }
+func (*Cluster) ProtoMessage()    {}
+func (*Cluster) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{0}
+}
+func (m *Cluster) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cluster.Unmarshal(m, b)
+}
+func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
+}
+func (dst *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(dst, src)
+}
+func (m *Cluster) XXX_Size() int {
+	return xxx_messageInfo_Cluster.Size(m)
+}
+func (m *Cluster) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cluster.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Cluster proto.InternalMessageInfo
 
 func (m *Cluster) GetProjectId() string {
 	if m != nil {
@@ -266,29 +224,29 @@ func (m *Cluster) GetMetrics() *ClusterMetrics {
 
 // The cluster config.
 type ClusterConfig struct {
-	// Optional. A Google Cloud Storage staging bucket used for sharing generated
+	// Optional. A Cloud Storage staging bucket used for sharing generated
 	// SSH keys and config. If you do not specify a staging bucket, Cloud
 	// Dataproc will determine an appropriate Cloud Storage location (US,
 	// ASIA, or EU) for your cluster's staging bucket according to the Google
 	// Compute Engine zone where your cluster is deployed, and then it will create
 	// and manage this project-level, per-location bucket for you.
-	ConfigBucket string `protobuf:"bytes,1,opt,name=config_bucket,json=configBucket" json:"config_bucket,omitempty"`
-	// Required. The shared Google Compute Engine config settings for
+	ConfigBucket string `protobuf:"bytes,1,opt,name=config_bucket,json=configBucket,proto3" json:"config_bucket,omitempty"`
+	// Required. The shared Compute Engine config settings for
 	// all instances in a cluster.
-	GceClusterConfig *GceClusterConfig `protobuf:"bytes,8,opt,name=gce_cluster_config,json=gceClusterConfig" json:"gce_cluster_config,omitempty"`
-	// Optional. The Google Compute Engine config settings for
+	GceClusterConfig *GceClusterConfig `protobuf:"bytes,8,opt,name=gce_cluster_config,json=gceClusterConfig,proto3" json:"gce_cluster_config,omitempty"`
+	// Optional. The Compute Engine config settings for
 	// the master instance in a cluster.
-	MasterConfig *InstanceGroupConfig `protobuf:"bytes,9,opt,name=master_config,json=masterConfig" json:"master_config,omitempty"`
-	// Optional. The Google Compute Engine config settings for
+	MasterConfig *InstanceGroupConfig `protobuf:"bytes,9,opt,name=master_config,json=masterConfig,proto3" json:"master_config,omitempty"`
+	// Optional. The Compute Engine config settings for
 	// worker instances in a cluster.
-	WorkerConfig *InstanceGroupConfig `protobuf:"bytes,10,opt,name=worker_config,json=workerConfig" json:"worker_config,omitempty"`
-	// Optional. The Google Compute Engine config settings for
+	WorkerConfig *InstanceGroupConfig `protobuf:"bytes,10,opt,name=worker_config,json=workerConfig,proto3" json:"worker_config,omitempty"`
+	// Optional. The Compute Engine config settings for
 	// additional worker instances in a cluster.
-	SecondaryWorkerConfig *InstanceGroupConfig `protobuf:"bytes,12,opt,name=secondary_worker_config,json=secondaryWorkerConfig" json:"secondary_worker_config,omitempty"`
+	SecondaryWorkerConfig *InstanceGroupConfig `protobuf:"bytes,12,opt,name=secondary_worker_config,json=secondaryWorkerConfig,proto3" json:"secondary_worker_config,omitempty"`
 	// Optional. The config settings for software inside the cluster.
-	SoftwareConfig *SoftwareConfig `protobuf:"bytes,13,opt,name=software_config,json=softwareConfig" json:"software_config,omitempty"`
+	SoftwareConfig *SoftwareConfig `protobuf:"bytes,13,opt,name=software_config,json=softwareConfig,proto3" json:"software_config,omitempty"`
 	// Optional. The config setting for auto delete cluster schedule.
-	LifecycleConfig *LifecycleConfig `protobuf:"bytes,14,opt,name=lifecycle_config,json=lifecycleConfig" json:"lifecycle_config,omitempty"`
+	LifecycleConfig *LifecycleConfig `protobuf:"bytes,14,opt,name=lifecycle_config,json=lifecycleConfig,proto3" json:"lifecycle_config,omitempty"`
 	// Optional. Commands to execute on each node after config is
 	// completed. By default, executables are run on master and all worker nodes.
 	// You can test a node's <code>role</code> metadata to run an executable on
@@ -300,13 +258,35 @@ type ClusterConfig struct {
 	//     else
 	//       ... worker specific actions ...
 	//     fi
-	InitializationActions []*NodeInitializationAction `protobuf:"bytes,11,rep,name=initialization_actions,json=initializationActions" json:"initialization_actions,omitempty"`
+	InitializationActions []*NodeInitializationAction `protobuf:"bytes,11,rep,name=initialization_actions,json=initializationActions,proto3" json:"initialization_actions,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}                    `json:"-"`
+	XXX_unrecognized      []byte                      `json:"-"`
+	XXX_sizecache         int32                       `json:"-"`
 }
 
-func (m *ClusterConfig) Reset()                    { *m = ClusterConfig{} }
-func (m *ClusterConfig) String() string            { return proto.CompactTextString(m) }
-func (*ClusterConfig) ProtoMessage()               {}
-func (*ClusterConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ClusterConfig) Reset()         { *m = ClusterConfig{} }
+func (m *ClusterConfig) String() string { return proto.CompactTextString(m) }
+func (*ClusterConfig) ProtoMessage()    {}
+func (*ClusterConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{1}
+}
+func (m *ClusterConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterConfig.Unmarshal(m, b)
+}
+func (m *ClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterConfig.Marshal(b, m, deterministic)
+}
+func (dst *ClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterConfig.Merge(dst, src)
+}
+func (m *ClusterConfig) XXX_Size() int {
+	return xxx_messageInfo_ClusterConfig.Size(m)
+}
+func (m *ClusterConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterConfig proto.InternalMessageInfo
 
 func (m *ClusterConfig) GetConfigBucket() string {
 	if m != nil {
@@ -364,10 +344,10 @@ func (m *ClusterConfig) GetInitializationActions() []*NodeInitializationAction {
 	return nil
 }
 
-// Common config settings for resources of Google Compute Engine cluster
+// Common config settings for resources of Compute Engine cluster
 // instances, applicable to all instances in the cluster.
 type GceClusterConfig struct {
-	// Optional. The zone where the Google Compute Engine cluster will be located.
+	// Optional. The zone where the Compute Engine cluster will be located.
 	// On a create request, it is required in the "global" region. If omitted
 	// in a non-global Cloud Dataproc region, the service will pick a zone in the
 	// corresponding Compute Engine region. On a get request, zone will always be
@@ -378,8 +358,8 @@ type GceClusterConfig struct {
 	// * `https://www.googleapis.com/compute/v1/projects/[project_id]/zones/[zone]`
 	// * `projects/[project_id]/zones/[zone]`
 	// * `us-central1-f`
-	ZoneUri string `protobuf:"bytes,1,opt,name=zone_uri,json=zoneUri" json:"zone_uri,omitempty"`
-	// Optional. The Google Compute Engine network to be used for machine
+	ZoneUri string `protobuf:"bytes,1,opt,name=zone_uri,json=zoneUri,proto3" json:"zone_uri,omitempty"`
+	// Optional. The Compute Engine network to be used for machine
 	// communications. Cannot be specified with subnetwork_uri. If neither
 	// `network_uri` nor `subnetwork_uri` is specified, the "default" network of
 	// the project is used, if it exists. Cannot be a "Custom Subnet Network" (see
@@ -390,8 +370,8 @@ type GceClusterConfig struct {
 	// * `https://www.googleapis.com/compute/v1/projects/[project_id]/regions/global/default`
 	// * `projects/[project_id]/regions/global/default`
 	// * `default`
-	NetworkUri string `protobuf:"bytes,2,opt,name=network_uri,json=networkUri" json:"network_uri,omitempty"`
-	// Optional. The Google Compute Engine subnetwork to be used for machine
+	NetworkUri string `protobuf:"bytes,2,opt,name=network_uri,json=networkUri,proto3" json:"network_uri,omitempty"`
+	// Optional. The Compute Engine subnetwork to be used for machine
 	// communications. Cannot be specified with network_uri.
 	//
 	// A full URL, partial URI, or short name are valid. Examples:
@@ -399,17 +379,17 @@ type GceClusterConfig struct {
 	// * `https://www.googleapis.com/compute/v1/projects/[project_id]/regions/us-east1/sub0`
 	// * `projects/[project_id]/regions/us-east1/sub0`
 	// * `sub0`
-	SubnetworkUri string `protobuf:"bytes,6,opt,name=subnetwork_uri,json=subnetworkUri" json:"subnetwork_uri,omitempty"`
+	SubnetworkUri string `protobuf:"bytes,6,opt,name=subnetwork_uri,json=subnetworkUri,proto3" json:"subnetwork_uri,omitempty"`
 	// Optional. If true, all instances in the cluster will only have internal IP
 	// addresses. By default, clusters are not restricted to internal IP addresses,
 	// and will have ephemeral external IP addresses assigned to each instance.
 	// This `internal_ip_only` restriction can only be enabled for subnetwork
 	// enabled networks, and all off-cluster dependencies must be configured to be
 	// accessible without external IP addresses.
-	InternalIpOnly bool `protobuf:"varint,7,opt,name=internal_ip_only,json=internalIpOnly" json:"internal_ip_only,omitempty"`
+	InternalIpOnly bool `protobuf:"varint,7,opt,name=internal_ip_only,json=internalIpOnly,proto3" json:"internal_ip_only,omitempty"`
 	// Optional. The service account of the instances. Defaults to the default
-	// Google Compute Engine service account. Custom service accounts need
-	// permissions equivalent to the folloing IAM roles:
+	// Compute Engine service account. Custom service accounts need
+	// permissions equivalent to the following IAM roles:
 	//
 	// * roles/logging.logWriter
 	// * roles/storage.objectAdmin
@@ -417,8 +397,8 @@ type GceClusterConfig struct {
 	// (see https://cloud.google.com/compute/docs/access/service-accounts#custom_service_accounts
 	// for more information).
 	// Example: `[account_id]@[project_id].iam.gserviceaccount.com`
-	ServiceAccount string `protobuf:"bytes,8,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
-	// Optional. The URIs of service account scopes to be included in Google
+	ServiceAccount string `protobuf:"bytes,8,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
+	// Optional. The URIs of service account scopes to be included in
 	// Compute Engine instances. The following base set of scopes is always
 	// included:
 	//
@@ -432,19 +412,41 @@ type GceClusterConfig struct {
 	// * https://www.googleapis.com/auth/bigtable.admin.table
 	// * https://www.googleapis.com/auth/bigtable.data
 	// * https://www.googleapis.com/auth/devstorage.full_control
-	ServiceAccountScopes []string `protobuf:"bytes,3,rep,name=service_account_scopes,json=serviceAccountScopes" json:"service_account_scopes,omitempty"`
-	// The Google Compute Engine tags to add to all instances (see
+	ServiceAccountScopes []string `protobuf:"bytes,3,rep,name=service_account_scopes,json=serviceAccountScopes,proto3" json:"service_account_scopes,omitempty"`
+	// The Compute Engine tags to add to all instances (see
 	// [Tagging instances](/compute/docs/label-or-tag-resources#tags)).
-	Tags []string `protobuf:"bytes,4,rep,name=tags" json:"tags,omitempty"`
-	// The Google Compute Engine metadata entries to add to all instances (see
+	Tags []string `protobuf:"bytes,4,rep,name=tags,proto3" json:"tags,omitempty"`
+	// The Compute Engine metadata entries to add to all instances (see
 	// [Project and instance metadata](https://cloud.google.com/compute/docs/storing-retrieving-metadata#project_and_instance_metadata)).
-	Metadata map[string]string `protobuf:"bytes,5,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata             map[string]string `protobuf:"bytes,5,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *GceClusterConfig) Reset()         { *m = GceClusterConfig{} }
+func (m *GceClusterConfig) String() string { return proto.CompactTextString(m) }
+func (*GceClusterConfig) ProtoMessage()    {}
+func (*GceClusterConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{2}
+}
+func (m *GceClusterConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GceClusterConfig.Unmarshal(m, b)
+}
+func (m *GceClusterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GceClusterConfig.Marshal(b, m, deterministic)
+}
+func (dst *GceClusterConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GceClusterConfig.Merge(dst, src)
+}
+func (m *GceClusterConfig) XXX_Size() int {
+	return xxx_messageInfo_GceClusterConfig.Size(m)
+}
+func (m *GceClusterConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_GceClusterConfig.DiscardUnknown(m)
 }
 
-func (m *GceClusterConfig) Reset()                    { *m = GceClusterConfig{} }
-func (m *GceClusterConfig) String() string            { return proto.CompactTextString(m) }
-func (*GceClusterConfig) ProtoMessage()               {}
-func (*GceClusterConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_GceClusterConfig proto.InternalMessageInfo
 
 func (m *GceClusterConfig) GetZoneUri() string {
 	if m != nil {
@@ -502,47 +504,77 @@ func (m *GceClusterConfig) GetMetadata() map[string]string {
 	return nil
 }
 
-// Optional. The config settings for Google Compute Engine resources in
+// Optional. The config settings for Compute Engine resources in
 // an instance group, such as a master or worker group.
 type InstanceGroupConfig struct {
 	// Optional. The number of VM instances in the instance group.
 	// For master instance groups, must be set to 1.
-	NumInstances int32 `protobuf:"varint,1,opt,name=num_instances,json=numInstances" json:"num_instances,omitempty"`
-	// Optional. The list of instance names. Cloud Dataproc derives the names from
-	// `cluster_name`, `num_instances`, and the instance group if not set by user
-	// (recommended practice is to let Cloud Dataproc derive the name).
-	InstanceNames []string `protobuf:"bytes,2,rep,name=instance_names,json=instanceNames" json:"instance_names,omitempty"`
-	// Output-only. The Google Compute Engine image resource used for cluster
+	NumInstances int32 `protobuf:"varint,1,opt,name=num_instances,json=numInstances,proto3" json:"num_instances,omitempty"`
+	// Output only. The list of instance names. Cloud Dataproc derives the names
+	// from `cluster_name`, `num_instances`, and the instance group.
+	InstanceNames []string `protobuf:"bytes,2,rep,name=instance_names,json=instanceNames,proto3" json:"instance_names,omitempty"`
+	// Output only. The Compute Engine image resource used for cluster
 	// instances. Inferred from `SoftwareConfig.image_version`.
-	ImageUri string `protobuf:"bytes,3,opt,name=image_uri,json=imageUri" json:"image_uri,omitempty"`
-	// Optional. The Google Compute Engine machine type used for cluster instances.
+	ImageUri string `protobuf:"bytes,3,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	// Optional. The Compute Engine machine type used for cluster instances.
 	//
 	// A full URL, partial URI, or short name are valid. Examples:
 	//
 	// * `https://www.googleapis.com/compute/v1/projects/[project_id]/zones/us-east1-a/machineTypes/n1-standard-2`
 	// * `projects/[project_id]/zones/us-east1-a/machineTypes/n1-standard-2`
 	// * `n1-standard-2`
-	MachineTypeUri string `protobuf:"bytes,4,opt,name=machine_type_uri,json=machineTypeUri" json:"machine_type_uri,omitempty"`
+	//
+	// **Auto Zone Exception**: If you are using the Cloud Dataproc
+	// [Auto Zone Placement](/dataproc/docs/concepts/configuring-clusters/auto-zone#using_auto_zone_placement)
+	// feature, you must use the short name of the machine type
+	// resource, for example, `n1-standard-2`.
+	MachineTypeUri string `protobuf:"bytes,4,opt,name=machine_type_uri,json=machineTypeUri,proto3" json:"machine_type_uri,omitempty"`
 	// Optional. Disk option config settings.
-	DiskConfig *DiskConfig `protobuf:"bytes,5,opt,name=disk_config,json=diskConfig" json:"disk_config,omitempty"`
+	DiskConfig *DiskConfig `protobuf:"bytes,5,opt,name=disk_config,json=diskConfig,proto3" json:"disk_config,omitempty"`
 	// Optional. Specifies that this instance group contains preemptible instances.
-	IsPreemptible bool `protobuf:"varint,6,opt,name=is_preemptible,json=isPreemptible" json:"is_preemptible,omitempty"`
-	// Output-only. The config for Google Compute Engine Instance Group
+	IsPreemptible bool `protobuf:"varint,6,opt,name=is_preemptible,json=isPreemptible,proto3" json:"is_preemptible,omitempty"`
+	// Output only. The config for Compute Engine Instance Group
 	// Manager that manages this group.
 	// This is only used for preemptible instance groups.
-	ManagedGroupConfig *ManagedGroupConfig `protobuf:"bytes,7,opt,name=managed_group_config,json=managedGroupConfig" json:"managed_group_config,omitempty"`
-	// Optional. The Google Compute Engine accelerator configuration for these
+	ManagedGroupConfig *ManagedGroupConfig `protobuf:"bytes,7,opt,name=managed_group_config,json=managedGroupConfig,proto3" json:"managed_group_config,omitempty"`
+	// Optional. The Compute Engine accelerator configuration for these
 	// instances.
 	//
 	// **Beta Feature**: This feature is still under development. It may be
 	// changed before final release.
-	Accelerators []*AcceleratorConfig `protobuf:"bytes,8,rep,name=accelerators" json:"accelerators,omitempty"`
+	Accelerators []*AcceleratorConfig `protobuf:"bytes,8,rep,name=accelerators,proto3" json:"accelerators,omitempty"`
+	// Optional. Specifies the minimum cpu platform for the Instance Group.
+	// See [Cloud Dataproc&rarr;Minimum CPU Platform]
+	// (/dataproc/docs/concepts/compute/dataproc-min-cpu).
+	MinCpuPlatform       string   `protobuf:"bytes,9,opt,name=min_cpu_platform,json=minCpuPlatform,proto3" json:"min_cpu_platform,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *InstanceGroupConfig) Reset()                    { *m = InstanceGroupConfig{} }
-func (m *InstanceGroupConfig) String() string            { return proto.CompactTextString(m) }
-func (*InstanceGroupConfig) ProtoMessage()               {}
-func (*InstanceGroupConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *InstanceGroupConfig) Reset()         { *m = InstanceGroupConfig{} }
+func (m *InstanceGroupConfig) String() string { return proto.CompactTextString(m) }
+func (*InstanceGroupConfig) ProtoMessage()    {}
+func (*InstanceGroupConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{3}
+}
+func (m *InstanceGroupConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InstanceGroupConfig.Unmarshal(m, b)
+}
+func (m *InstanceGroupConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InstanceGroupConfig.Marshal(b, m, deterministic)
+}
+func (dst *InstanceGroupConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstanceGroupConfig.Merge(dst, src)
+}
+func (m *InstanceGroupConfig) XXX_Size() int {
+	return xxx_messageInfo_InstanceGroupConfig.Size(m)
+}
+func (m *InstanceGroupConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InstanceGroupConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InstanceGroupConfig proto.InternalMessageInfo
 
 func (m *InstanceGroupConfig) GetNumInstances() int32 {
 	if m != nil {
@@ -600,19 +632,48 @@ func (m *InstanceGroupConfig) GetAccelerators() []*AcceleratorConfig {
 	return nil
 }
 
+func (m *InstanceGroupConfig) GetMinCpuPlatform() string {
+	if m != nil {
+		return m.MinCpuPlatform
+	}
+	return ""
+}
+
 // Specifies the resources used to actively manage an instance group.
 type ManagedGroupConfig struct {
-	// Output-only. The name of the Instance Template used for the Managed
+	// Output only. The name of the Instance Template used for the Managed
 	// Instance Group.
-	InstanceTemplateName string `protobuf:"bytes,1,opt,name=instance_template_name,json=instanceTemplateName" json:"instance_template_name,omitempty"`
-	// Output-only. The name of the Instance Group Manager for this group.
-	InstanceGroupManagerName string `protobuf:"bytes,2,opt,name=instance_group_manager_name,json=instanceGroupManagerName" json:"instance_group_manager_name,omitempty"`
+	InstanceTemplateName string `protobuf:"bytes,1,opt,name=instance_template_name,json=instanceTemplateName,proto3" json:"instance_template_name,omitempty"`
+	// Output only. The name of the Instance Group Manager for this group.
+	InstanceGroupManagerName string   `protobuf:"bytes,2,opt,name=instance_group_manager_name,json=instanceGroupManagerName,proto3" json:"instance_group_manager_name,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
+}
+
+func (m *ManagedGroupConfig) Reset()         { *m = ManagedGroupConfig{} }
+func (m *ManagedGroupConfig) String() string { return proto.CompactTextString(m) }
+func (*ManagedGroupConfig) ProtoMessage()    {}
+func (*ManagedGroupConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{4}
+}
+func (m *ManagedGroupConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ManagedGroupConfig.Unmarshal(m, b)
+}
+func (m *ManagedGroupConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ManagedGroupConfig.Marshal(b, m, deterministic)
+}
+func (dst *ManagedGroupConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedGroupConfig.Merge(dst, src)
+}
+func (m *ManagedGroupConfig) XXX_Size() int {
+	return xxx_messageInfo_ManagedGroupConfig.Size(m)
+}
+func (m *ManagedGroupConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ManagedGroupConfig.DiscardUnknown(m)
 }
 
-func (m *ManagedGroupConfig) Reset()                    { *m = ManagedGroupConfig{} }
-func (m *ManagedGroupConfig) String() string            { return proto.CompactTextString(m) }
-func (*ManagedGroupConfig) ProtoMessage()               {}
-func (*ManagedGroupConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ManagedGroupConfig proto.InternalMessageInfo
 
 func (m *ManagedGroupConfig) GetInstanceTemplateName() string {
 	if m != nil {
@@ -632,22 +693,49 @@ func (m *ManagedGroupConfig) GetInstanceGroupManagerName() string {
 // of an instance group (see [GPUs on Compute Engine](/compute/docs/gpus/)).
 type AcceleratorConfig struct {
 	// Full URL, partial URI, or short name of the accelerator type resource to
-	// expose to this instance. See [Google Compute Engine AcceleratorTypes](
+	// expose to this instance. See [Compute Engine AcceleratorTypes](
 	// /compute/docs/reference/beta/acceleratorTypes)
 	//
 	// Examples
 	// * `https://www.googleapis.com/compute/beta/projects/[project_id]/zones/us-east1-a/acceleratorTypes/nvidia-tesla-k80`
 	// * `projects/[project_id]/zones/us-east1-a/acceleratorTypes/nvidia-tesla-k80`
 	// * `nvidia-tesla-k80`
-	AcceleratorTypeUri string `protobuf:"bytes,1,opt,name=accelerator_type_uri,json=acceleratorTypeUri" json:"accelerator_type_uri,omitempty"`
+	//
+	// **Auto Zone Exception**: If you are using the Cloud Dataproc
+	// [Auto Zone Placement](/dataproc/docs/concepts/configuring-clusters/auto-zone#using_auto_zone_placement)
+	// feature, you must use the short name of the accelerator type
+	// resource, for example, `nvidia-tesla-k80`.
+	AcceleratorTypeUri string `protobuf:"bytes,1,opt,name=accelerator_type_uri,json=acceleratorTypeUri,proto3" json:"accelerator_type_uri,omitempty"`
 	// The number of the accelerator cards of this type exposed to this instance.
-	AcceleratorCount int32 `protobuf:"varint,2,opt,name=accelerator_count,json=acceleratorCount" json:"accelerator_count,omitempty"`
+	AcceleratorCount     int32    `protobuf:"varint,2,opt,name=accelerator_count,json=acceleratorCount,proto3" json:"accelerator_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
+func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
+func (*AcceleratorConfig) ProtoMessage()    {}
+func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{5}
+}
+func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
+}
+func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
+}
+func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+}
+func (m *AcceleratorConfig) XXX_Size() int {
+	return xxx_messageInfo_AcceleratorConfig.Size(m)
+}
+func (m *AcceleratorConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AcceleratorConfig.DiscardUnknown(m)
 }
 
-func (m *AcceleratorConfig) Reset()                    { *m = AcceleratorConfig{} }
-func (m *AcceleratorConfig) String() string            { return proto.CompactTextString(m) }
-func (*AcceleratorConfig) ProtoMessage()               {}
-func (*AcceleratorConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_AcceleratorConfig proto.InternalMessageInfo
 
 func (m *AcceleratorConfig) GetAcceleratorTypeUri() string {
 	if m != nil {
@@ -665,21 +753,54 @@ func (m *AcceleratorConfig) GetAcceleratorCount() int32 {
 
 // Specifies the config of disk options for a group of VM instances.
 type DiskConfig struct {
+	// Optional. Type of the boot disk (default is "pd-standard").
+	// Valid values: "pd-ssd" (Persistent Disk Solid State Drive) or
+	// "pd-standard" (Persistent Disk Hard Disk Drive).
+	BootDiskType string `protobuf:"bytes,3,opt,name=boot_disk_type,json=bootDiskType,proto3" json:"boot_disk_type,omitempty"`
 	// Optional. Size in GB of the boot disk (default is 500GB).
-	BootDiskSizeGb int32 `protobuf:"varint,1,opt,name=boot_disk_size_gb,json=bootDiskSizeGb" json:"boot_disk_size_gb,omitempty"`
+	BootDiskSizeGb int32 `protobuf:"varint,1,opt,name=boot_disk_size_gb,json=bootDiskSizeGb,proto3" json:"boot_disk_size_gb,omitempty"`
 	// Optional. Number of attached SSDs, from 0 to 4 (default is 0).
 	// If SSDs are not attached, the boot disk is used to store runtime logs and
 	// [HDFS](https://hadoop.apache.org/docs/r1.2.1/hdfs_user_guide.html) data.
 	// If one or more SSDs are attached, this runtime bulk
 	// data is spread across them, and the boot disk contains only basic
 	// config and installed binaries.
-	NumLocalSsds int32 `protobuf:"varint,2,opt,name=num_local_ssds,json=numLocalSsds" json:"num_local_ssds,omitempty"`
+	NumLocalSsds         int32    `protobuf:"varint,2,opt,name=num_local_ssds,json=numLocalSsds,proto3" json:"num_local_ssds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DiskConfig) Reset()                    { *m = DiskConfig{} }
-func (m *DiskConfig) String() string            { return proto.CompactTextString(m) }
-func (*DiskConfig) ProtoMessage()               {}
-func (*DiskConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *DiskConfig) Reset()         { *m = DiskConfig{} }
+func (m *DiskConfig) String() string { return proto.CompactTextString(m) }
+func (*DiskConfig) ProtoMessage()    {}
+func (*DiskConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{6}
+}
+func (m *DiskConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DiskConfig.Unmarshal(m, b)
+}
+func (m *DiskConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DiskConfig.Marshal(b, m, deterministic)
+}
+func (dst *DiskConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiskConfig.Merge(dst, src)
+}
+func (m *DiskConfig) XXX_Size() int {
+	return xxx_messageInfo_DiskConfig.Size(m)
+}
+func (m *DiskConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_DiskConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DiskConfig proto.InternalMessageInfo
+
+func (m *DiskConfig) GetBootDiskType() string {
+	if m != nil {
+		return m.BootDiskType
+	}
+	return ""
+}
 
 func (m *DiskConfig) GetBootDiskSizeGb() int32 {
 	if m != nil {
@@ -699,31 +820,65 @@ func (m *DiskConfig) GetNumLocalSsds() int32 {
 type LifecycleConfig struct {
 	// Optional. The longest duration that cluster would keep alive while staying
 	//  idle; passing this threshold will cause cluster to be auto-deleted.
-	IdleDeleteTtl *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=idle_delete_ttl,json=idleDeleteTtl" json:"idle_delete_ttl,omitempty"`
+	IdleDeleteTtl *duration.Duration `protobuf:"bytes,1,opt,name=idle_delete_ttl,json=idleDeleteTtl,proto3" json:"idle_delete_ttl,omitempty"`
+	// Optional. Either the exact time the cluster should be deleted at or
+	// the cluster maximum age.
+	//
 	// Types that are valid to be assigned to Ttl:
 	//	*LifecycleConfig_AutoDeleteTime
 	//	*LifecycleConfig_AutoDeleteTtl
-	Ttl isLifecycleConfig_Ttl `protobuf_oneof:"ttl"`
+	Ttl                  isLifecycleConfig_Ttl `protobuf_oneof:"ttl"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *LifecycleConfig) Reset()         { *m = LifecycleConfig{} }
+func (m *LifecycleConfig) String() string { return proto.CompactTextString(m) }
+func (*LifecycleConfig) ProtoMessage()    {}
+func (*LifecycleConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{7}
+}
+func (m *LifecycleConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LifecycleConfig.Unmarshal(m, b)
+}
+func (m *LifecycleConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LifecycleConfig.Marshal(b, m, deterministic)
+}
+func (dst *LifecycleConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LifecycleConfig.Merge(dst, src)
+}
+func (m *LifecycleConfig) XXX_Size() int {
+	return xxx_messageInfo_LifecycleConfig.Size(m)
+}
+func (m *LifecycleConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_LifecycleConfig.DiscardUnknown(m)
 }
 
-func (m *LifecycleConfig) Reset()                    { *m = LifecycleConfig{} }
-func (m *LifecycleConfig) String() string            { return proto.CompactTextString(m) }
-func (*LifecycleConfig) ProtoMessage()               {}
-func (*LifecycleConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_LifecycleConfig proto.InternalMessageInfo
+
+func (m *LifecycleConfig) GetIdleDeleteTtl() *duration.Duration {
+	if m != nil {
+		return m.IdleDeleteTtl
+	}
+	return nil
+}
 
 type isLifecycleConfig_Ttl interface {
 	isLifecycleConfig_Ttl()
 }
 
 type LifecycleConfig_AutoDeleteTime struct {
-	AutoDeleteTime *google_protobuf5.Timestamp `protobuf:"bytes,2,opt,name=auto_delete_time,json=autoDeleteTime,oneof"`
+	AutoDeleteTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=auto_delete_time,json=autoDeleteTime,proto3,oneof"`
 }
+
 type LifecycleConfig_AutoDeleteTtl struct {
-	AutoDeleteTtl *google_protobuf3.Duration `protobuf:"bytes,3,opt,name=auto_delete_ttl,json=autoDeleteTtl,oneof"`
+	AutoDeleteTtl *duration.Duration `protobuf:"bytes,3,opt,name=auto_delete_ttl,json=autoDeleteTtl,proto3,oneof"`
 }
 
 func (*LifecycleConfig_AutoDeleteTime) isLifecycleConfig_Ttl() {}
-func (*LifecycleConfig_AutoDeleteTtl) isLifecycleConfig_Ttl()  {}
+
+func (*LifecycleConfig_AutoDeleteTtl) isLifecycleConfig_Ttl() {}
 
 func (m *LifecycleConfig) GetTtl() isLifecycleConfig_Ttl {
 	if m != nil {
@@ -732,21 +887,14 @@ func (m *LifecycleConfig) GetTtl() isLifecycleConfig_Ttl {
 	return nil
 }
 
-func (m *LifecycleConfig) GetIdleDeleteTtl() *google_protobuf3.Duration {
-	if m != nil {
-		return m.IdleDeleteTtl
-	}
-	return nil
-}
-
-func (m *LifecycleConfig) GetAutoDeleteTime() *google_protobuf5.Timestamp {
+func (m *LifecycleConfig) GetAutoDeleteTime() *timestamp.Timestamp {
 	if x, ok := m.GetTtl().(*LifecycleConfig_AutoDeleteTime); ok {
 		return x.AutoDeleteTime
 	}
 	return nil
 }
 
-func (m *LifecycleConfig) GetAutoDeleteTtl() *google_protobuf3.Duration {
+func (m *LifecycleConfig) GetAutoDeleteTtl() *duration.Duration {
 	if x, ok := m.GetTtl().(*LifecycleConfig_AutoDeleteTtl); ok {
 		return x.AutoDeleteTtl
 	}
@@ -789,7 +937,7 @@ func _LifecycleConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *prot
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf5.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.Ttl = &LifecycleConfig_AutoDeleteTime{msg}
 		return true, err
@@ -797,7 +945,7 @@ func _LifecycleConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *prot
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf3.Duration)
+		msg := new(duration.Duration)
 		err := b.DecodeMessage(msg)
 		m.Ttl = &LifecycleConfig_AutoDeleteTtl{msg}
 		return true, err
@@ -812,12 +960,12 @@ func _LifecycleConfig_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Ttl.(type) {
 	case *LifecycleConfig_AutoDeleteTime:
 		s := proto.Size(x.AutoDeleteTime)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *LifecycleConfig_AutoDeleteTtl:
 		s := proto.Size(x.AutoDeleteTtl)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -830,19 +978,41 @@ func _LifecycleConfig_OneofSizer(msg proto.Message) (n int) {
 // Specifies an executable to run on a fully configured node and a
 // timeout period for executable completion.
 type NodeInitializationAction struct {
-	// Required. Google Cloud Storage URI of executable file.
-	ExecutableFile string `protobuf:"bytes,1,opt,name=executable_file,json=executableFile" json:"executable_file,omitempty"`
+	// Required. Cloud Storage URI of executable file.
+	ExecutableFile string `protobuf:"bytes,1,opt,name=executable_file,json=executableFile,proto3" json:"executable_file,omitempty"`
 	// Optional. Amount of time executable has to complete. Default is
 	// 10 minutes. Cluster creation fails with an explanatory error message (the
 	// name of the executable that caused the error and the exceeded timeout
 	// period) if the executable is not completed at end of the timeout period.
-	ExecutionTimeout *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=execution_timeout,json=executionTimeout" json:"execution_timeout,omitempty"`
+	ExecutionTimeout     *duration.Duration `protobuf:"bytes,2,opt,name=execution_timeout,json=executionTimeout,proto3" json:"execution_timeout,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *NodeInitializationAction) Reset()         { *m = NodeInitializationAction{} }
+func (m *NodeInitializationAction) String() string { return proto.CompactTextString(m) }
+func (*NodeInitializationAction) ProtoMessage()    {}
+func (*NodeInitializationAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{8}
+}
+func (m *NodeInitializationAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeInitializationAction.Unmarshal(m, b)
+}
+func (m *NodeInitializationAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeInitializationAction.Marshal(b, m, deterministic)
+}
+func (dst *NodeInitializationAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeInitializationAction.Merge(dst, src)
+}
+func (m *NodeInitializationAction) XXX_Size() int {
+	return xxx_messageInfo_NodeInitializationAction.Size(m)
+}
+func (m *NodeInitializationAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeInitializationAction.DiscardUnknown(m)
 }
 
-func (m *NodeInitializationAction) Reset()                    { *m = NodeInitializationAction{} }
-func (m *NodeInitializationAction) String() string            { return proto.CompactTextString(m) }
-func (*NodeInitializationAction) ProtoMessage()               {}
-func (*NodeInitializationAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_NodeInitializationAction proto.InternalMessageInfo
 
 func (m *NodeInitializationAction) GetExecutableFile() string {
 	if m != nil {
@@ -851,7 +1021,7 @@ func (m *NodeInitializationAction) GetExecutableFile() string {
 	return ""
 }
 
-func (m *NodeInitializationAction) GetExecutionTimeout() *google_protobuf3.Duration {
+func (m *NodeInitializationAction) GetExecutionTimeout() *duration.Duration {
 	if m != nil {
 		return m.ExecutionTimeout
 	}
@@ -860,21 +1030,43 @@ func (m *NodeInitializationAction) GetExecutionTimeout() *google_protobuf3.Durat
 
 // The status of a cluster and its instances.
 type ClusterStatus struct {
-	// Output-only. The cluster's state.
-	State ClusterStatus_State `protobuf:"varint,1,opt,name=state,enum=google.cloud.dataproc.v1beta2.ClusterStatus_State" json:"state,omitempty"`
-	// Output-only. Optional details of cluster's state.
-	Detail string `protobuf:"bytes,2,opt,name=detail" json:"detail,omitempty"`
-	// Output-only. Time when this state was entered.
-	StateStartTime *google_protobuf5.Timestamp `protobuf:"bytes,3,opt,name=state_start_time,json=stateStartTime" json:"state_start_time,omitempty"`
-	// Output-only. Additional state information that includes
+	// Output only. The cluster's state.
+	State ClusterStatus_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.dataproc.v1beta2.ClusterStatus_State" json:"state,omitempty"`
+	// Output only. Optional details of cluster's state.
+	Detail string `protobuf:"bytes,2,opt,name=detail,proto3" json:"detail,omitempty"`
+	// Output only. Time when this state was entered.
+	StateStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
+	// Output only. Additional state information that includes
 	// status reported by the agent.
-	Substate ClusterStatus_Substate `protobuf:"varint,4,opt,name=substate,enum=google.cloud.dataproc.v1beta2.ClusterStatus_Substate" json:"substate,omitempty"`
+	Substate             ClusterStatus_Substate `protobuf:"varint,4,opt,name=substate,proto3,enum=google.cloud.dataproc.v1beta2.ClusterStatus_Substate" json:"substate,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *ClusterStatus) Reset()         { *m = ClusterStatus{} }
+func (m *ClusterStatus) String() string { return proto.CompactTextString(m) }
+func (*ClusterStatus) ProtoMessage()    {}
+func (*ClusterStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{9}
+}
+func (m *ClusterStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterStatus.Unmarshal(m, b)
+}
+func (m *ClusterStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterStatus.Marshal(b, m, deterministic)
+}
+func (dst *ClusterStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterStatus.Merge(dst, src)
+}
+func (m *ClusterStatus) XXX_Size() int {
+	return xxx_messageInfo_ClusterStatus.Size(m)
+}
+func (m *ClusterStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterStatus.DiscardUnknown(m)
 }
 
-func (m *ClusterStatus) Reset()                    { *m = ClusterStatus{} }
-func (m *ClusterStatus) String() string            { return proto.CompactTextString(m) }
-func (*ClusterStatus) ProtoMessage()               {}
-func (*ClusterStatus) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_ClusterStatus proto.InternalMessageInfo
 
 func (m *ClusterStatus) GetState() ClusterStatus_State {
 	if m != nil {
@@ -890,7 +1082,7 @@ func (m *ClusterStatus) GetDetail() string {
 	return ""
 }
 
-func (m *ClusterStatus) GetStateStartTime() *google_protobuf5.Timestamp {
+func (m *ClusterStatus) GetStateStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StateStartTime
 	}
@@ -906,10 +1098,12 @@ func (m *ClusterStatus) GetSubstate() ClusterStatus_Substate {
 
 // Specifies the selection and config of software inside the cluster.
 type SoftwareConfig struct {
-	// Optional. The version of software inside the cluster. It must match the
-	// regular expression `[0-9]+\.[0-9]+`. If unspecified, it defaults to the
-	// latest version (see [Cloud Dataproc Versioning](/dataproc/versioning)).
-	ImageVersion string `protobuf:"bytes,1,opt,name=image_version,json=imageVersion" json:"image_version,omitempty"`
+	// Optional. The version of software inside the cluster. It must be one of the supported
+	// [Cloud Dataproc Versions](/dataproc/docs/concepts/versioning/dataproc-versions#supported_cloud_dataproc_versions),
+	// such as "1.2" (including a subminor version, such as "1.2.29"), or the
+	// ["preview" version](/dataproc/docs/concepts/versioning/dataproc-versions#other_versions).
+	// If unspecified, it defaults to the latest version.
+	ImageVersion string `protobuf:"bytes,1,opt,name=image_version,json=imageVersion,proto3" json:"image_version,omitempty"`
 	// Optional. The properties to set on daemon config files.
 	//
 	// Property keys are specified in `prefix:property` format, such as
@@ -928,13 +1122,35 @@ type SoftwareConfig struct {
 	//
 	// For more information, see
 	// [Cluster properties](/dataproc/docs/concepts/cluster-properties).
-	Properties map[string]string `protobuf:"bytes,2,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties           map[string]string `protobuf:"bytes,2,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *SoftwareConfig) Reset()                    { *m = SoftwareConfig{} }
-func (m *SoftwareConfig) String() string            { return proto.CompactTextString(m) }
-func (*SoftwareConfig) ProtoMessage()               {}
-func (*SoftwareConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *SoftwareConfig) Reset()         { *m = SoftwareConfig{} }
+func (m *SoftwareConfig) String() string { return proto.CompactTextString(m) }
+func (*SoftwareConfig) ProtoMessage()    {}
+func (*SoftwareConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{10}
+}
+func (m *SoftwareConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SoftwareConfig.Unmarshal(m, b)
+}
+func (m *SoftwareConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SoftwareConfig.Marshal(b, m, deterministic)
+}
+func (dst *SoftwareConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SoftwareConfig.Merge(dst, src)
+}
+func (m *SoftwareConfig) XXX_Size() int {
+	return xxx_messageInfo_SoftwareConfig.Size(m)
+}
+func (m *SoftwareConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_SoftwareConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SoftwareConfig proto.InternalMessageInfo
 
 func (m *SoftwareConfig) GetImageVersion() string {
 	if m != nil {
@@ -956,15 +1172,37 @@ func (m *SoftwareConfig) GetProperties() map[string]string {
 // be changed before final release.
 type ClusterMetrics struct {
 	// The HDFS metrics.
-	HdfsMetrics map[string]int64 `protobuf:"bytes,1,rep,name=hdfs_metrics,json=hdfsMetrics" json:"hdfs_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	HdfsMetrics map[string]int64 `protobuf:"bytes,1,rep,name=hdfs_metrics,json=hdfsMetrics,proto3" json:"hdfs_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 	// The YARN metrics.
-	YarnMetrics map[string]int64 `protobuf:"bytes,2,rep,name=yarn_metrics,json=yarnMetrics" json:"yarn_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	YarnMetrics          map[string]int64 `protobuf:"bytes,2,rep,name=yarn_metrics,json=yarnMetrics,proto3" json:"yarn_metrics,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *ClusterMetrics) Reset()                    { *m = ClusterMetrics{} }
-func (m *ClusterMetrics) String() string            { return proto.CompactTextString(m) }
-func (*ClusterMetrics) ProtoMessage()               {}
-func (*ClusterMetrics) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *ClusterMetrics) Reset()         { *m = ClusterMetrics{} }
+func (m *ClusterMetrics) String() string { return proto.CompactTextString(m) }
+func (*ClusterMetrics) ProtoMessage()    {}
+func (*ClusterMetrics) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{11}
+}
+func (m *ClusterMetrics) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterMetrics.Unmarshal(m, b)
+}
+func (m *ClusterMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterMetrics.Marshal(b, m, deterministic)
+}
+func (dst *ClusterMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterMetrics.Merge(dst, src)
+}
+func (m *ClusterMetrics) XXX_Size() int {
+	return xxx_messageInfo_ClusterMetrics.Size(m)
+}
+func (m *ClusterMetrics) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterMetrics.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterMetrics proto.InternalMessageInfo
 
 func (m *ClusterMetrics) GetHdfsMetrics() map[string]int64 {
 	if m != nil {
@@ -984,17 +1222,51 @@ func (m *ClusterMetrics) GetYarnMetrics() map[string]int64 {
 type CreateClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster to create.
-	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster *Cluster `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	// Optional. A unique id used to identify the request. If the server
+	// receives two [CreateClusterRequest][google.cloud.dataproc.v1beta2.CreateClusterRequest] requests  with the same
+	// id, then the second request will be ignored and the
+	// first [google.longrunning.Operation][google.longrunning.Operation] created and stored in the backend
+	// is returned.
+	//
+	// It is recommended to always set this value to a
+	// [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
+	//
+	// The id must contain only letters (a-z, A-Z), numbers (0-9),
+	// underscores (_), and hyphens (-). The maximum length is 40 characters.
+	RequestId            string   `protobuf:"bytes,4,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
+func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterRequest) ProtoMessage()    {}
+func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{12}
+}
+func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
+}
+func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+}
+func (m *CreateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterRequest.Size(m)
+}
+func (m *CreateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterRequest.DiscardUnknown(m)
 }
 
-func (m *CreateClusterRequest) Reset()                    { *m = CreateClusterRequest{} }
-func (m *CreateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterRequest) ProtoMessage()               {}
-func (*CreateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_CreateClusterRequest proto.InternalMessageInfo
 
 func (m *CreateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1017,17 +1289,24 @@ func (m *CreateClusterRequest) GetCluster() *Cluster {
 	return nil
 }
 
+func (m *CreateClusterRequest) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
 // A request to update a cluster.
 type UpdateClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project the
 	// cluster belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,5,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,5,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster name.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Required. The changes to the cluster.
-	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	// Optional. Timeout for graceful YARN decomissioning. Graceful
 	// decommissioning allows removing nodes from the cluster without
 	// interrupting jobs in progress. Timeout specifies how long to wait for jobs
@@ -1036,11 +1315,11 @@ type UpdateClusterRequest struct {
 	// the maximum allowed timeout is 1 day.
 	//
 	// Only supported on Dataproc image versions 1.2 and higher.
-	GracefulDecommissionTimeout *google_protobuf3.Duration `protobuf:"bytes,6,opt,name=graceful_decommission_timeout,json=gracefulDecommissionTimeout" json:"graceful_decommission_timeout,omitempty"`
-	// Required. Specifies the path, relative to <code>Cluster</code>, of
+	GracefulDecommissionTimeout *duration.Duration `protobuf:"bytes,6,opt,name=graceful_decommission_timeout,json=gracefulDecommissionTimeout,proto3" json:"graceful_decommission_timeout,omitempty"`
+	// Required. Specifies the path, relative to `Cluster`, of
 	// the field to update. For example, to change the number of workers
-	// in a cluster to 5, the <code>update_mask</code> parameter would be
-	// specified as <code>config.worker_config.num_instances</code>,
+	// in a cluster to 5, the `update_mask` parameter would be
+	// specified as `config.worker_config.num_instances`,
 	// and the `PATCH` request body would specify the new value, as follows:
 	//
 	//     {
@@ -1050,8 +1329,9 @@ type UpdateClusterRequest struct {
 	//         }
 	//       }
 	//     }
+	//
 	// Similarly, to change the number of preemptible workers in a cluster to 5, the
-	// <code>update_mask</code> parameter would be <code>config.secondary_worker_config.num_instances</code>,
+	// `update_mask` parameter would be `config.secondary_worker_config.num_instances`,
 	// and the `PATCH` request body would be set as follows:
 	//
 	//     {
@@ -1061,18 +1341,72 @@ type UpdateClusterRequest struct {
 	//         }
 	//       }
 	//     }
-	// <strong>Note:</strong> currently only some fields can be updated:
-	// |Mask|Purpose|
-	// |`labels`|Updates labels|
-	// |`config.worker_config.num_instances`|Resize primary worker group|
-	// |`config.secondary_worker_config.num_instances`|Resize secondary worker group|
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	// <strong>Note:</strong> currently only the following fields can be updated:
+	//
+	// <table>
+	// <tr>
+	// <td><strong>Mask</strong></td><td><strong>Purpose</strong></td>
+	// </tr>
+	// <tr>
+	// <td>labels</td><td>Updates labels</td>
+	// </tr>
+	// <tr>
+	// <td>config.worker_config.num_instances</td><td>Resize primary worker group</td>
+	// </tr>
+	// <tr>
+	// <td>config.secondary_worker_config.num_instances</td><td>Resize secondary worker group</td>
+	// </tr>
+	// <tr>
+	// <td>config.lifecycle_config.auto_delete_ttl</td><td>Reset MAX TTL duration</td>
+	// </tr>
+	// <tr>
+	// <td>config.lifecycle_config.auto_delete_time</td><td>Update MAX TTL deletion timestamp</td>
+	// </tr>
+	// <tr>
+	// <td>config.lifecycle_config.idle_delete_ttl</td><td>Update Idle TTL duration</td>
+	// </tr>
+	// </table>
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	// Optional. A unique id used to identify the request. If the server
+	// receives two [UpdateClusterRequest][google.cloud.dataproc.v1beta2.UpdateClusterRequest] requests  with the same
+	// id, then the second request will be ignored and the
+	// first [google.longrunning.Operation][google.longrunning.Operation] created and stored in the
+	// backend is returned.
+	//
+	// It is recommended to always set this value to a
+	// [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
+	//
+	// The id must contain only letters (a-z, A-Z), numbers (0-9),
+	// underscores (_), and hyphens (-). The maximum length is 40 characters.
+	RequestId            string   `protobuf:"bytes,7,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
+func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateClusterRequest) ProtoMessage()    {}
+func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{13}
+}
+func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
+}
+func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+}
+func (m *UpdateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateClusterRequest.Size(m)
+}
+func (m *UpdateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateClusterRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateClusterRequest) Reset()                    { *m = UpdateClusterRequest{} }
-func (m *UpdateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateClusterRequest) ProtoMessage()               {}
-func (*UpdateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_UpdateClusterRequest proto.InternalMessageInfo
 
 func (m *UpdateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1102,38 +1436,79 @@ func (m *UpdateClusterRequest) GetCluster() *Cluster {
 	return nil
 }
 
-func (m *UpdateClusterRequest) GetGracefulDecommissionTimeout() *google_protobuf3.Duration {
+func (m *UpdateClusterRequest) GetGracefulDecommissionTimeout() *duration.Duration {
 	if m != nil {
 		return m.GracefulDecommissionTimeout
 	}
 	return nil
 }
 
-func (m *UpdateClusterRequest) GetUpdateMask() *google_protobuf4.FieldMask {
+func (m *UpdateClusterRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
 	return nil
 }
 
+func (m *UpdateClusterRequest) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
 // A request to delete a cluster.
 type DeleteClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster name.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Optional. Specifying the `cluster_uuid` means the RPC should fail
 	// (with error NOT_FOUND) if cluster with specified UUID does not exist.
-	ClusterUuid string `protobuf:"bytes,4,opt,name=cluster_uuid,json=clusterUuid" json:"cluster_uuid,omitempty"`
+	ClusterUuid string `protobuf:"bytes,4,opt,name=cluster_uuid,json=clusterUuid,proto3" json:"cluster_uuid,omitempty"`
+	// Optional. A unique id used to identify the request. If the server
+	// receives two [DeleteClusterRequest][google.cloud.dataproc.v1beta2.DeleteClusterRequest] requests  with the same
+	// id, then the second request will be ignored and the
+	// first [google.longrunning.Operation][google.longrunning.Operation] created and stored in the
+	// backend is returned.
+	//
+	// It is recommended to always set this value to a
+	// [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
+	//
+	// The id must contain only letters (a-z, A-Z), numbers (0-9),
+	// underscores (_), and hyphens (-). The maximum length is 40 characters.
+	RequestId            string   `protobuf:"bytes,5,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
+func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteClusterRequest) ProtoMessage()    {}
+func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{14}
+}
+func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
+}
+func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+}
+func (m *DeleteClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteClusterRequest.Size(m)
+}
+func (m *DeleteClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteClusterRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteClusterRequest) Reset()                    { *m = DeleteClusterRequest{} }
-func (m *DeleteClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteClusterRequest) ProtoMessage()               {}
-func (*DeleteClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_DeleteClusterRequest proto.InternalMessageInfo
 
 func (m *DeleteClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1163,21 +1538,50 @@ func (m *DeleteClusterRequest) GetClusterUuid() string {
 	return ""
 }
 
+func (m *DeleteClusterRequest) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
 // Request to get the resource representation for a cluster in a project.
 type GetClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster name.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName          string   `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetClusterRequest) Reset()                    { *m = GetClusterRequest{} }
-func (m *GetClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetClusterRequest) ProtoMessage()               {}
-func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
+func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*GetClusterRequest) ProtoMessage()    {}
+func (*GetClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{15}
+}
+func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
+}
+func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+}
+func (m *GetClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_GetClusterRequest.Size(m)
+}
+func (m *GetClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetClusterRequest proto.InternalMessageInfo
 
 func (m *GetClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1204,9 +1608,9 @@ func (m *GetClusterRequest) GetClusterName() string {
 type ListClustersRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,4,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,4,opt,name=region,proto3" json:"region,omitempty"`
 	// Optional. A filter constraining the clusters to list. Filters are
 	// case-sensitive and have the following syntax:
 	//
@@ -1226,17 +1630,39 @@ type ListClustersRequest struct {
 	//
 	// status.state = ACTIVE AND clusterName = mycluster
 	// AND labels.env = staging AND labels.starred = *
-	Filter string `protobuf:"bytes,5,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Optional. The standard List page size.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The standard List page token.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
+func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClustersRequest) ProtoMessage()    {}
+func (*ListClustersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{16}
+}
+func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
+}
+func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+}
+func (m *ListClustersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClustersRequest.Size(m)
+}
+func (m *ListClustersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersRequest.DiscardUnknown(m)
 }
 
-func (m *ListClustersRequest) Reset()                    { *m = ListClustersRequest{} }
-func (m *ListClustersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersRequest) ProtoMessage()               {}
-func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_ListClustersRequest proto.InternalMessageInfo
 
 func (m *ListClustersRequest) GetProjectId() string {
 	if m != nil {
@@ -1275,18 +1701,40 @@ func (m *ListClustersRequest) GetPageToken() string {
 
 // The list of all clusters in a project.
 type ListClustersResponse struct {
-	// Output-only. The clusters in the project.
-	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters" json:"clusters,omitempty"`
-	// Output-only. This token is included in the response if there are more
+	// Output only. The clusters in the project.
+	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
+	// Output only. This token is included in the response if there are more
 	// results to fetch. To fetch additional results, provide this value as the
 	// `page_token` in a subsequent <code>ListClustersRequest</code>.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListClustersResponse) Reset()                    { *m = ListClustersResponse{} }
-func (m *ListClustersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersResponse) ProtoMessage()               {}
-func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
+func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClustersResponse) ProtoMessage()    {}
+func (*ListClustersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{17}
+}
+func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
+}
+func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+}
+func (m *ListClustersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClustersResponse.Size(m)
+}
+func (m *ListClustersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClustersResponse proto.InternalMessageInfo
 
 func (m *ListClustersResponse) GetClusters() []*Cluster {
 	if m != nil {
@@ -1306,17 +1754,39 @@ func (m *ListClustersResponse) GetNextPageToken() string {
 type DiagnoseClusterRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the cluster
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The cluster name.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName          string   `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DiagnoseClusterRequest) Reset()         { *m = DiagnoseClusterRequest{} }
+func (m *DiagnoseClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DiagnoseClusterRequest) ProtoMessage()    {}
+func (*DiagnoseClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{18}
+}
+func (m *DiagnoseClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DiagnoseClusterRequest.Unmarshal(m, b)
+}
+func (m *DiagnoseClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DiagnoseClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DiagnoseClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiagnoseClusterRequest.Merge(dst, src)
+}
+func (m *DiagnoseClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DiagnoseClusterRequest.Size(m)
+}
+func (m *DiagnoseClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DiagnoseClusterRequest.DiscardUnknown(m)
 }
 
-func (m *DiagnoseClusterRequest) Reset()                    { *m = DiagnoseClusterRequest{} }
-func (m *DiagnoseClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DiagnoseClusterRequest) ProtoMessage()               {}
-func (*DiagnoseClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_DiagnoseClusterRequest proto.InternalMessageInfo
 
 func (m *DiagnoseClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1341,16 +1811,38 @@ func (m *DiagnoseClusterRequest) GetClusterName() string {
 
 // The location of diagnostic output.
 type DiagnoseClusterResults struct {
-	// Output-only. The Google Cloud Storage URI of the diagnostic output.
+	// Output only. The Cloud Storage URI of the diagnostic output.
 	// The output report is a plain text file with a summary of collected
 	// diagnostics.
-	OutputUri string `protobuf:"bytes,1,opt,name=output_uri,json=outputUri" json:"output_uri,omitempty"`
+	OutputUri            string   `protobuf:"bytes,1,opt,name=output_uri,json=outputUri,proto3" json:"output_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DiagnoseClusterResults) Reset()         { *m = DiagnoseClusterResults{} }
+func (m *DiagnoseClusterResults) String() string { return proto.CompactTextString(m) }
+func (*DiagnoseClusterResults) ProtoMessage()    {}
+func (*DiagnoseClusterResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_clusters_4a7d1f005a919fa7, []int{19}
+}
+func (m *DiagnoseClusterResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DiagnoseClusterResults.Unmarshal(m, b)
+}
+func (m *DiagnoseClusterResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DiagnoseClusterResults.Marshal(b, m, deterministic)
+}
+func (dst *DiagnoseClusterResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DiagnoseClusterResults.Merge(dst, src)
+}
+func (m *DiagnoseClusterResults) XXX_Size() int {
+	return xxx_messageInfo_DiagnoseClusterResults.Size(m)
+}
+func (m *DiagnoseClusterResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_DiagnoseClusterResults.DiscardUnknown(m)
 }
 
-func (m *DiagnoseClusterResults) Reset()                    { *m = DiagnoseClusterResults{} }
-func (m *DiagnoseClusterResults) String() string            { return proto.CompactTextString(m) }
-func (*DiagnoseClusterResults) ProtoMessage()               {}
-func (*DiagnoseClusterResults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_DiagnoseClusterResults proto.InternalMessageInfo
 
 func (m *DiagnoseClusterResults) GetOutputUri() string {
 	if m != nil {
@@ -1361,8 +1853,10 @@ func (m *DiagnoseClusterResults) GetOutputUri() string {
 
 func init() {
 	proto.RegisterType((*Cluster)(nil), "google.cloud.dataproc.v1beta2.Cluster")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.Cluster.LabelsEntry")
 	proto.RegisterType((*ClusterConfig)(nil), "google.cloud.dataproc.v1beta2.ClusterConfig")
 	proto.RegisterType((*GceClusterConfig)(nil), "google.cloud.dataproc.v1beta2.GceClusterConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.GceClusterConfig.MetadataEntry")
 	proto.RegisterType((*InstanceGroupConfig)(nil), "google.cloud.dataproc.v1beta2.InstanceGroupConfig")
 	proto.RegisterType((*ManagedGroupConfig)(nil), "google.cloud.dataproc.v1beta2.ManagedGroupConfig")
 	proto.RegisterType((*AcceleratorConfig)(nil), "google.cloud.dataproc.v1beta2.AcceleratorConfig")
@@ -1371,7 +1865,10 @@ func init() {
 	proto.RegisterType((*NodeInitializationAction)(nil), "google.cloud.dataproc.v1beta2.NodeInitializationAction")
 	proto.RegisterType((*ClusterStatus)(nil), "google.cloud.dataproc.v1beta2.ClusterStatus")
 	proto.RegisterType((*SoftwareConfig)(nil), "google.cloud.dataproc.v1beta2.SoftwareConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.SoftwareConfig.PropertiesEntry")
 	proto.RegisterType((*ClusterMetrics)(nil), "google.cloud.dataproc.v1beta2.ClusterMetrics")
+	proto.RegisterMapType((map[string]int64)(nil), "google.cloud.dataproc.v1beta2.ClusterMetrics.HdfsMetricsEntry")
+	proto.RegisterMapType((map[string]int64)(nil), "google.cloud.dataproc.v1beta2.ClusterMetrics.YarnMetricsEntry")
 	proto.RegisterType((*CreateClusterRequest)(nil), "google.cloud.dataproc.v1beta2.CreateClusterRequest")
 	proto.RegisterType((*UpdateClusterRequest)(nil), "google.cloud.dataproc.v1beta2.UpdateClusterRequest")
 	proto.RegisterType((*DeleteClusterRequest)(nil), "google.cloud.dataproc.v1beta2.DeleteClusterRequest")
@@ -1392,15 +1889,16 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ClusterController service
-
+// ClusterControllerClient is the client API for ClusterController service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ClusterControllerClient interface {
 	// Creates a cluster in a project.
-	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Updates a cluster in a project.
-	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes a cluster in a project.
-	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Gets the resource representation for a cluster in a project.
 	GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error)
 	// Lists all regions/{region}/clusters in a project.
@@ -1408,7 +1906,7 @@ type ClusterControllerClient interface {
 	// Gets cluster diagnostic information.
 	// After the operation completes, the Operation.response field
 	// contains `DiagnoseClusterOutputLocation`.
-	DiagnoseCluster(ctx context.Context, in *DiagnoseClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DiagnoseCluster(ctx context.Context, in *DiagnoseClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type clusterControllerClient struct {
@@ -1419,27 +1917,27 @@ func NewClusterControllerClient(cc *grpc.ClientConn) ClusterControllerClient {
 	return &clusterControllerClient{cc}
 }
 
-func (c *clusterControllerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/CreateCluster", in, out, c.cc, opts...)
+func (c *clusterControllerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/CreateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterControllerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/UpdateCluster", in, out, c.cc, opts...)
+func (c *clusterControllerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/UpdateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterControllerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/DeleteCluster", in, out, c.cc, opts...)
+func (c *clusterControllerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/DeleteCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1448,7 +1946,7 @@ func (c *clusterControllerClient) DeleteCluster(ctx context.Context, in *DeleteC
 
 func (c *clusterControllerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/GetCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/GetCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1457,31 +1955,30 @@ func (c *clusterControllerClient) GetCluster(ctx context.Context, in *GetCluster
 
 func (c *clusterControllerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
 	out := new(ListClustersResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/ListClusters", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/ListClusters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterControllerClient) DiagnoseCluster(ctx context.Context, in *DiagnoseClusterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/DiagnoseCluster", in, out, c.cc, opts...)
+func (c *clusterControllerClient) DiagnoseCluster(ctx context.Context, in *DiagnoseClusterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.ClusterController/DiagnoseCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ClusterController service
-
+// ClusterControllerServer is the server API for ClusterController service.
 type ClusterControllerServer interface {
 	// Creates a cluster in a project.
-	CreateCluster(context.Context, *CreateClusterRequest) (*google_longrunning.Operation, error)
+	CreateCluster(context.Context, *CreateClusterRequest) (*longrunning.Operation, error)
 	// Updates a cluster in a project.
-	UpdateCluster(context.Context, *UpdateClusterRequest) (*google_longrunning.Operation, error)
+	UpdateCluster(context.Context, *UpdateClusterRequest) (*longrunning.Operation, error)
 	// Deletes a cluster in a project.
-	DeleteCluster(context.Context, *DeleteClusterRequest) (*google_longrunning.Operation, error)
+	DeleteCluster(context.Context, *DeleteClusterRequest) (*longrunning.Operation, error)
 	// Gets the resource representation for a cluster in a project.
 	GetCluster(context.Context, *GetClusterRequest) (*Cluster, error)
 	// Lists all regions/{region}/clusters in a project.
@@ -1489,7 +1986,7 @@ type ClusterControllerServer interface {
 	// Gets cluster diagnostic information.
 	// After the operation completes, the Operation.response field
 	// contains `DiagnoseClusterOutputLocation`.
-	DiagnoseCluster(context.Context, *DiagnoseClusterRequest) (*google_longrunning.Operation, error)
+	DiagnoseCluster(context.Context, *DiagnoseClusterRequest) (*longrunning.Operation, error)
 }
 
 func RegisterClusterControllerServer(s *grpc.Server, srv ClusterControllerServer) {
@@ -1637,139 +2134,146 @@ var _ClusterController_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dataproc/v1beta2/clusters.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dataproc/v1beta2/clusters.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 2093 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x72, 0x1b, 0xc7,
-	0x11, 0xd6, 0x12, 0x04, 0x09, 0x36, 0x08, 0x10, 0x1c, 0xd3, 0x0c, 0x4c, 0x45, 0xb1, 0xbc, 0x4e,
-	0x1c, 0xda, 0x71, 0x00, 0x9b, 0x8a, 0xcb, 0x8e, 0x14, 0xb9, 0x4c, 0x91, 0x14, 0x49, 0x87, 0xa2,
-	0x98, 0x05, 0x20, 0x45, 0x49, 0xa9, 0xb6, 0x06, 0xbb, 0x43, 0x68, 0xcc, 0xfd, 0xcb, 0xce, 0xac,
-	0x6c, 0x48, 0xa5, 0x8b, 0x6f, 0xa9, 0x1c, 0x72, 0xf0, 0x03, 0xc4, 0xe7, 0x1c, 0x72, 0x4a, 0x55,
-	0x2a, 0x87, 0xdc, 0x72, 0xce, 0xc5, 0xa9, 0x3c, 0x41, 0x0e, 0x79, 0x84, 0x1c, 0x53, 0xf3, 0xb3,
-	0xc0, 0x2e, 0x48, 0x69, 0x09, 0x46, 0xe5, 0x13, 0x76, 0x7a, 0xfa, 0xe7, 0x9b, 0xee, 0x9e, 0x9e,
-	0x9e, 0x01, 0xbc, 0x3b, 0x08, 0xc3, 0x81, 0x47, 0xda, 0x8e, 0x17, 0x26, 0x6e, 0xdb, 0xc5, 0x1c,
-	0x47, 0x71, 0xe8, 0xb4, 0x1f, 0xbf, 0xdf, 0x27, 0x1c, 0x6f, 0xb4, 0x1d, 0x2f, 0x61, 0x9c, 0xc4,
-	0xac, 0x15, 0xc5, 0x21, 0x0f, 0xd1, 0x15, 0xc5, 0xdd, 0x92, 0xdc, 0xad, 0x94, 0xbb, 0xa5, 0xb9,
-	0xd7, 0xbe, 0xab, 0x95, 0xe1, 0x88, 0xb6, 0x71, 0x10, 0x84, 0x1c, 0x73, 0x1a, 0x06, 0x5a, 0x78,
-	0xed, 0x4d, 0x3d, 0xeb, 0x85, 0xc1, 0x20, 0x4e, 0x82, 0x80, 0x06, 0x83, 0x76, 0x18, 0x91, 0x38,
-	0xc7, 0xf4, 0x3d, 0xcd, 0x24, 0x47, 0xfd, 0xe4, 0xb8, 0xed, 0x26, 0x8a, 0x41, 0xcf, 0x5f, 0x9d,
-	0x9c, 0x3f, 0xa6, 0xc4, 0x73, 0x6d, 0x1f, 0xb3, 0x13, 0xcd, 0xf1, 0xfa, 0x24, 0x07, 0xa7, 0x3e,
-	0x61, 0x1c, 0xfb, 0x91, 0x62, 0x30, 0xff, 0x30, 0x0b, 0xf3, 0x5b, 0x6a, 0x5d, 0xe8, 0x0a, 0x40,
-	0x14, 0x87, 0x9f, 0x11, 0x87, 0xdb, 0xd4, 0x6d, 0x1a, 0x57, 0x8d, 0xf5, 0x05, 0x6b, 0x41, 0x53,
-	0xf6, 0x5d, 0xf4, 0x06, 0x2c, 0x6a, 0x0f, 0xd8, 0x01, 0xf6, 0x49, 0x73, 0x46, 0x32, 0x54, 0x35,
-	0xed, 0x10, 0xfb, 0x04, 0x6d, 0xc3, 0x9c, 0x13, 0x06, 0xc7, 0x74, 0xd0, 0x2c, 0x5d, 0x35, 0xd6,
-	0xab, 0x1b, 0xef, 0xb6, 0x5e, 0xe8, 0xa3, 0x96, 0xb6, 0xbc, 0x25, 0x65, 0x2c, 0x2d, 0x8b, 0x3e,
-	0x85, 0x39, 0x0f, 0xf7, 0x89, 0xc7, 0x9a, 0x95, 0xab, 0xa5, 0xf5, 0xea, 0xc6, 0xc6, 0xf9, 0xb4,
-	0xb4, 0x0e, 0xa4, 0xd0, 0x4e, 0xc0, 0xe3, 0xa1, 0xa5, 0x35, 0x08, 0x44, 0x8c, 0x63, 0x9e, 0xb0,
-	0xe6, 0xec, 0x34, 0x88, 0x3a, 0x52, 0xc6, 0xd2, 0xb2, 0xa8, 0x03, 0x75, 0xf5, 0x65, 0x3f, 0xa2,
-	0x8c, 0x87, 0xf1, 0xb0, 0x39, 0x2f, 0x91, 0x4d, 0xa7, 0xad, 0xa6, 0x74, 0xec, 0x29, 0x15, 0x59,
-	0x7f, 0x26, 0x09, 0x75, 0x9b, 0x73, 0x39, 0x7f, 0xf6, 0x12, 0xea, 0xa2, 0x5d, 0x98, 0xf7, 0x09,
-	0x8f, 0xa9, 0xc3, 0x9a, 0x0b, 0x12, 0xfe, 0x8f, 0xcf, 0x67, 0xf0, 0x8e, 0x12, 0xb2, 0x52, 0xe9,
-	0xb5, 0x9f, 0x42, 0x35, 0xe3, 0x1d, 0xd4, 0x80, 0xd2, 0x09, 0x19, 0xea, 0x10, 0x8b, 0x4f, 0xb4,
-	0x02, 0xe5, 0xc7, 0xd8, 0x4b, 0xd2, 0xa8, 0xaa, 0xc1, 0xf5, 0x99, 0x8f, 0x0c, 0xf3, 0x9f, 0x65,
-	0xa8, 0xe5, 0xe2, 0x84, 0xde, 0x84, 0x9a, 0x8a, 0x94, 0xdd, 0x4f, 0x9c, 0x13, 0xc2, 0xb5, 0x9e,
-	0x45, 0x45, 0xbc, 0x25, 0x69, 0xe8, 0x21, 0xa0, 0x81, 0x43, 0xec, 0x74, 0x85, 0x3a, 0x2d, 0x2a,
-	0x72, 0x15, 0xed, 0x82, 0x55, 0xec, 0x3a, 0x24, 0x9f, 0x19, 0x8d, 0xc1, 0x04, 0x05, 0xdd, 0x87,
-	0x9a, 0x8f, 0xb3, 0x9a, 0x95, 0x7f, 0x8a, 0x52, 0x65, 0x3f, 0x60, 0x1c, 0x07, 0x0e, 0xd9, 0x8d,
-	0xc3, 0x24, 0xd2, 0xca, 0x17, 0x95, 0xa2, 0xb1, 0xe2, 0xcf, 0xc3, 0xf8, 0x64, 0xac, 0x18, 0x2e,
-	0xae, 0x58, 0x29, 0xd2, 0x8a, 0x3f, 0x83, 0xef, 0x30, 0xe2, 0x84, 0x81, 0x8b, 0xe3, 0xa1, 0x9d,
-	0x37, 0xb1, 0x78, 0x61, 0x13, 0xaf, 0x8e, 0x54, 0xde, 0xcf, 0xda, 0xba, 0x07, 0x4b, 0x2c, 0x3c,
-	0xe6, 0x9f, 0xe3, 0x98, 0xa4, 0x36, 0x6a, 0xe7, 0xca, 0x9f, 0x8e, 0x96, 0xd2, 0xea, 0xeb, 0x2c,
-	0x37, 0x46, 0x0f, 0xa0, 0xe1, 0xd1, 0x63, 0xe2, 0x0c, 0x1d, 0x6f, 0xa4, 0xb8, 0x2e, 0x15, 0xb7,
-	0x0a, 0x14, 0x1f, 0xa4, 0x62, 0x5a, 0xf3, 0x92, 0x97, 0x27, 0xa0, 0x00, 0x56, 0x69, 0x40, 0x39,
-	0xc5, 0x1e, 0x7d, 0x22, 0x6b, 0x9c, 0x8d, 0x1d, 0x59, 0x0b, 0x9b, 0x55, 0xb9, 0xd5, 0x3e, 0x2c,
-	0x30, 0x70, 0x18, 0xba, 0x64, 0x3f, 0xa7, 0x60, 0x53, 0xca, 0x5b, 0xaf, 0xd2, 0x33, 0xa8, 0xcc,
-	0xfc, 0x63, 0x09, 0x1a, 0x93, 0x79, 0x86, 0x5e, 0x83, 0xca, 0x93, 0x30, 0x20, 0x76, 0x12, 0x53,
-	0x9d, 0xd4, 0xf3, 0x62, 0xdc, 0x8b, 0x29, 0x7a, 0x1d, 0xaa, 0x01, 0xe1, 0x22, 0x6e, 0x72, 0x56,
-	0x6d, 0x13, 0xd0, 0x24, 0xc1, 0xf0, 0x03, 0xa8, 0xb3, 0xa4, 0x9f, 0xe5, 0x51, 0x1b, 0xba, 0x36,
-	0xa6, 0x0a, 0xb6, 0x75, 0x68, 0xd0, 0x80, 0x93, 0x38, 0xc0, 0x9e, 0x4d, 0x23, 0x3b, 0x0c, 0x3c,
-	0x51, 0x4c, 0x8c, 0xf5, 0x8a, 0x55, 0x4f, 0xe9, 0xfb, 0xd1, 0xdd, 0xc0, 0x1b, 0xa2, 0x1f, 0xc2,
-	0x12, 0x23, 0xf1, 0x63, 0xea, 0x10, 0x1b, 0x3b, 0x4e, 0x98, 0x04, 0x5c, 0x6e, 0x9f, 0x05, 0xab,
-	0xae, 0xc9, 0x9b, 0x8a, 0x8a, 0x7e, 0x02, 0xab, 0x13, 0x8c, 0x36, 0x73, 0xc2, 0x88, 0xb0, 0x66,
-	0xe9, 0x6a, 0x69, 0x7d, 0xc1, 0x5a, 0xc9, 0xf3, 0x77, 0xe4, 0x1c, 0x42, 0x30, 0xcb, 0xf1, 0x40,
-	0xd4, 0x45, 0xc1, 0x23, 0xbf, 0xd1, 0x03, 0xa8, 0xf8, 0x84, 0x63, 0xe1, 0xdc, 0x66, 0x59, 0xba,
-	0xfd, 0xe6, 0x94, 0x5b, 0xb5, 0x75, 0x47, 0xcb, 0xab, 0x32, 0x3c, 0x52, 0xb7, 0x76, 0x03, 0x6a,
-	0xb9, 0xa9, 0xa9, 0x6a, 0xd0, 0xbf, 0x4a, 0xf0, 0xca, 0x19, 0xe9, 0x2f, 0x2a, 0x51, 0x90, 0xf8,
-	0x36, 0xd5, 0x53, 0x4c, 0x6a, 0x2b, 0x5b, 0x8b, 0x41, 0xe2, 0xa7, 0xec, 0x4c, 0x04, 0x26, 0x65,
-	0x90, 0x07, 0x17, 0x6b, 0xce, 0xc8, 0x25, 0xd7, 0x52, 0xaa, 0x38, 0xba, 0x18, 0xba, 0x0c, 0x0b,
-	0xd4, 0xc7, 0x03, 0x15, 0xfc, 0x92, 0x44, 0x50, 0x91, 0x04, 0x1d, 0x35, 0x1f, 0x3b, 0x8f, 0x68,
-	0x40, 0x6c, 0x3e, 0x8c, 0x14, 0xcf, 0xac, 0x0a, 0x86, 0xa6, 0x77, 0x87, 0x91, 0xe4, 0xfc, 0x14,
-	0xaa, 0x2e, 0x65, 0x27, 0xe9, 0xee, 0x28, 0xcb, 0xdd, 0xf1, 0x76, 0x81, 0x17, 0xb7, 0x29, 0x3b,
-	0xd1, 0x1b, 0x03, 0xdc, 0xd1, 0xb7, 0x44, 0xce, 0xec, 0x28, 0x26, 0xc4, 0x8f, 0x38, 0xed, 0x7b,
-	0x44, 0xa6, 0x54, 0xc5, 0xaa, 0x51, 0x76, 0x34, 0x26, 0x22, 0x07, 0x56, 0x7c, 0x1c, 0xe0, 0x01,
-	0x71, 0xed, 0x81, 0x70, 0x4e, 0x6a, 0x7b, 0x5e, 0xda, 0x7e, 0xbf, 0xc0, 0xf6, 0x1d, 0x25, 0x9a,
-	0xad, 0x2a, 0xc8, 0x3f, 0x45, 0x43, 0x5d, 0x58, 0xc4, 0x8e, 0x43, 0x3c, 0xd1, 0xa2, 0x84, 0x71,
-	0x7a, 0x34, 0xbf, 0x57, 0xa0, 0x7c, 0x73, 0x2c, 0x92, 0x16, 0xc5, 0xac, 0x16, 0xf3, 0xb7, 0x06,
-	0xa0, 0xd3, 0x00, 0x44, 0x46, 0x8f, 0x42, 0xc6, 0x89, 0x1f, 0x79, 0x98, 0xab, 0xd8, 0xe9, 0x74,
-	0x59, 0x49, 0x67, 0xbb, 0x7a, 0x52, 0x76, 0x1f, 0x37, 0xe1, 0xf2, 0x48, 0x4a, 0x39, 0x42, 0xad,
-	0x23, 0xd7, 0xaf, 0x34, 0x69, 0x36, 0x8f, 0x94, 0x6d, 0xd9, 0xbc, 0x98, 0x31, 0x2c, 0x9f, 0x82,
-	0x8b, 0xde, 0x83, 0x95, 0x0c, 0xe0, 0x71, 0xf0, 0x15, 0x0e, 0x94, 0x99, 0x4b, 0x13, 0xe0, 0x47,
-	0xb0, 0x9c, 0x95, 0x50, 0x1b, 0x77, 0x46, 0xe6, 0x65, 0x03, 0x67, 0xf5, 0x27, 0x01, 0x37, 0x1f,
-	0x02, 0x8c, 0x63, 0x8f, 0xde, 0x86, 0xe5, 0x7e, 0x18, 0x72, 0x5b, 0x26, 0x10, 0xa3, 0x4f, 0x88,
-	0x3d, 0xe8, 0xeb, 0x94, 0xae, 0x8b, 0x09, 0xc1, 0xda, 0xa1, 0x4f, 0xc8, 0x6e, 0x1f, 0x7d, 0x1f,
-	0xea, 0x22, 0xf3, 0xbd, 0xd0, 0xc1, 0x9e, 0xcd, 0x98, 0xcb, 0xb4, 0x09, 0x91, 0xfa, 0x07, 0x82,
-	0xd8, 0x61, 0x2e, 0x33, 0xff, 0x63, 0xc0, 0xd2, 0x44, 0xe5, 0x45, 0x9b, 0xb0, 0x44, 0x5d, 0x8f,
-	0xd8, 0x2e, 0xf1, 0x08, 0x27, 0x36, 0xe7, 0x9e, 0x34, 0x51, 0xdd, 0x78, 0x2d, 0x8d, 0x65, 0xda,
-	0x2c, 0xb6, 0xb6, 0x75, 0xbb, 0x69, 0xd5, 0x84, 0xc4, 0xb6, 0x14, 0xe8, 0x72, 0x0f, 0xdd, 0x86,
-	0x06, 0x4e, 0x78, 0x38, 0x52, 0x41, 0xb5, 0x77, 0xab, 0x1b, 0x6b, 0xa7, 0x74, 0x74, 0xd3, 0x86,
-	0x73, 0xef, 0x92, 0x55, 0x17, 0x52, 0x5a, 0x0d, 0xf5, 0x09, 0xda, 0x82, 0xa5, 0x9c, 0x1e, 0xee,
-	0xe9, 0xbe, 0xf1, 0xf9, 0x50, 0xf6, 0x2e, 0x59, 0xb5, 0x8c, 0x16, 0xee, 0xdd, 0x2a, 0x43, 0x89,
-	0x73, 0xcf, 0xfc, 0x9d, 0x01, 0xcd, 0xe7, 0x9d, 0x01, 0xa2, 0x94, 0x92, 0x2f, 0x88, 0x93, 0x70,
-	0xdc, 0xf7, 0x88, 0x7d, 0x4c, 0xbd, 0x34, 0x91, 0xea, 0x63, 0xf2, 0x6d, 0xea, 0x11, 0x74, 0x1b,
-	0x96, 0x15, 0x45, 0x1c, 0x40, 0x62, 0x5d, 0x61, 0xc2, 0xf5, 0xd2, 0x5e, 0xe0, 0x9e, 0xc6, 0x48,
-	0xa6, 0xab, 0x44, 0xcc, 0xaf, 0x4b, 0xa3, 0xa6, 0x49, 0x35, 0x7f, 0x68, 0x0f, 0xca, 0xa2, 0xfd,
-	0x53, 0x86, 0xeb, 0xe7, 0xed, 0x69, 0x95, 0x70, 0x4b, 0xfc, 0x10, 0x4b, 0x29, 0x40, 0xab, 0x30,
-	0xe7, 0x12, 0x8e, 0xa9, 0xa7, 0x33, 0x5a, 0x8f, 0xd0, 0x36, 0x34, 0x24, 0x83, 0xcd, 0x38, 0x8e,
-	0xb9, 0x8a, 0x4a, 0xa9, 0x28, 0x2a, 0x96, 0x6c, 0x6c, 0x49, 0x47, 0x88, 0xc8, 0x98, 0xfc, 0x02,
-	0x2a, 0x2c, 0xe9, 0x2b, 0xa8, 0xb3, 0x12, 0xea, 0x07, 0xd3, 0x41, 0xd5, 0xc2, 0xd6, 0x48, 0x8d,
-	0x79, 0x0f, 0xca, 0x72, 0x01, 0xa8, 0x0a, 0xf3, 0xbd, 0xc3, 0x9f, 0x1f, 0xde, 0xbd, 0x7f, 0xd8,
-	0xb8, 0x84, 0x16, 0xa1, 0xb2, 0x65, 0xed, 0x6c, 0x76, 0xf7, 0x0f, 0x77, 0x1b, 0x86, 0x98, 0xb2,
-	0x7a, 0x87, 0x87, 0x62, 0x30, 0x83, 0x16, 0xa0, 0xbc, 0x63, 0x59, 0x77, 0xad, 0x46, 0x49, 0x70,
-	0x6d, 0xef, 0x1c, 0xec, 0x48, 0xae, 0x59, 0x31, 0xea, 0x1d, 0x6d, 0x2b, 0x99, 0xb2, 0xf9, 0x33,
-	0xa8, 0xa4, 0xd6, 0xd0, 0x12, 0x54, 0x7b, 0x87, 0x9d, 0xa3, 0x9d, 0xad, 0xfd, 0xdb, 0xfb, 0x3b,
-	0xdb, 0x8d, 0x4b, 0xa8, 0x06, 0x0b, 0xbd, 0xc3, 0xbd, 0x9d, 0xcd, 0x83, 0xee, 0xde, 0x83, 0x86,
-	0x81, 0x1a, 0xb0, 0xd8, 0xe9, 0x6e, 0x1e, 0xec, 0xd8, 0x9d, 0xee, 0x66, 0xb7, 0xd7, 0x69, 0xcc,
-	0x98, 0xdf, 0x18, 0x50, 0xcf, 0xb7, 0x3b, 0xe2, 0x38, 0x51, 0x47, 0xc0, 0x63, 0x12, 0x33, 0x1a,
-	0x06, 0x69, 0x63, 0x2b, 0x89, 0xf7, 0x14, 0x0d, 0x3d, 0x94, 0xb7, 0xa4, 0x88, 0xc4, 0x9c, 0xea,
-	0xa3, 0xa4, 0xf8, 0x94, 0xcc, 0xdb, 0x69, 0x1d, 0x8d, 0xe4, 0xd5, 0x29, 0x99, 0x51, 0xb8, 0x76,
-	0x13, 0x96, 0x26, 0xa6, 0xa7, 0x3b, 0x29, 0x67, 0xa0, 0x9e, 0xbf, 0x04, 0x20, 0x0c, 0x8b, 0x8f,
-	0xdc, 0x63, 0x66, 0xa7, 0x37, 0x09, 0x43, 0x42, 0xfe, 0x78, 0xaa, 0x9b, 0x44, 0x6b, 0xcf, 0x3d,
-	0x66, 0xfa, 0x5b, 0x61, 0xae, 0x3e, 0x1a, 0x53, 0x84, 0x89, 0x21, 0x8e, 0x83, 0x91, 0x89, 0x99,
-	0x8b, 0x98, 0x78, 0x80, 0xe3, 0x20, 0x6f, 0x62, 0x38, 0xa6, 0xac, 0x7d, 0x0c, 0x8d, 0x49, 0x0c,
-	0x45, 0x8e, 0x29, 0x65, 0x1c, 0x23, 0xe4, 0x27, 0x0d, 0x4c, 0x23, 0x6f, 0xfe, 0xde, 0x80, 0x95,
-	0xad, 0x98, 0x60, 0x9e, 0xf6, 0x3b, 0x16, 0xf9, 0x4d, 0x42, 0x18, 0x2f, 0xba, 0x35, 0xaf, 0xc2,
-	0x5c, 0x4c, 0x06, 0x22, 0x99, 0x54, 0x4f, 0xa1, 0x47, 0xe8, 0x13, 0x98, 0xd7, 0x77, 0x23, 0x5d,
-	0x5f, 0xde, 0x3a, 0x9f, 0xb7, 0xac, 0x54, 0xcc, 0xfc, 0xc7, 0x0c, 0xac, 0xf4, 0x22, 0xf7, 0xff,
-	0x40, 0x54, 0xce, 0x21, 0x3a, 0xc7, 0xfd, 0x3e, 0x03, 0xba, 0x74, 0x21, 0xd0, 0xe8, 0x21, 0x5c,
-	0x19, 0xc4, 0xd8, 0x21, 0xc7, 0x89, 0x67, 0xbb, 0xc4, 0x09, 0x7d, 0x9f, 0x32, 0x96, 0x2d, 0xb6,
-	0x73, 0x45, 0xc5, 0xf6, 0x72, 0x2a, 0xbf, 0x9d, 0x11, 0xd7, 0x75, 0x17, 0xdd, 0x80, 0x6a, 0x22,
-	0x5d, 0x22, 0x1f, 0x41, 0xf4, 0x9d, 0xff, 0x74, 0xf9, 0xbb, 0x4d, 0x89, 0xe7, 0xde, 0xc1, 0xec,
-	0xc4, 0x02, 0xc5, 0x2e, 0xbe, 0xcd, 0xaf, 0x0c, 0x58, 0x51, 0xe7, 0xca, 0xcb, 0x09, 0xf1, 0x39,
-	0x1c, 0x3a, 0xf9, 0x06, 0x30, 0x7b, 0xea, 0x0d, 0xc0, 0xf4, 0x61, 0x79, 0x97, 0xf0, 0x6f, 0x0b,
-	0x91, 0xf9, 0xb5, 0x01, 0xaf, 0x1c, 0x50, 0x96, 0x1a, 0x64, 0x53, 0x5b, 0x9c, 0xcd, 0x59, 0x5c,
-	0x85, 0xb9, 0x63, 0xea, 0x89, 0x84, 0xd1, 0xc9, 0xa6, 0x46, 0xa2, 0xdb, 0x8e, 0x44, 0xa5, 0x15,
-	0x5d, 0x8e, 0x6e, 0x5d, 0x2a, 0x82, 0x20, 0xda, 0x1b, 0x69, 0x4b, 0x4c, 0xf2, 0xf0, 0x84, 0xa4,
-	0x4b, 0x90, 0xec, 0x5d, 0x41, 0x30, 0xbf, 0x34, 0x60, 0x25, 0x0f, 0x91, 0x45, 0x61, 0xc0, 0x08,
-	0xba, 0x05, 0x95, 0xf4, 0x8d, 0x4e, 0x57, 0xb9, 0xf3, 0xe6, 0xe7, 0x48, 0x0e, 0xbd, 0x05, 0x4b,
-	0x01, 0xf9, 0x82, 0xdb, 0x19, 0x00, 0xca, 0x4b, 0x35, 0x41, 0x3e, 0x1a, 0x81, 0x88, 0x61, 0x75,
-	0x9b, 0xe2, 0x41, 0x10, 0xb2, 0x6f, 0x2d, 0x5b, 0xcc, 0x0f, 0xcf, 0xb0, 0xc9, 0x12, 0x8f, 0x33,
-	0x61, 0x33, 0x4c, 0x78, 0x94, 0xf0, 0x4c, 0x73, 0xba, 0xa0, 0x28, 0xbd, 0x98, 0x6e, 0xfc, 0xb7,
-	0x02, 0xcb, 0xe3, 0x6b, 0x1a, 0x8f, 0x43, 0xcf, 0x23, 0x31, 0xfa, 0x93, 0x01, 0xb5, 0x5c, 0x49,
-	0x43, 0xd7, 0x8a, 0xdc, 0x75, 0x46, 0x01, 0x5c, 0xbb, 0x92, 0x0a, 0x65, 0xde, 0x32, 0x5b, 0x77,
-	0xd3, 0xb7, 0x4c, 0x73, 0xff, 0xcb, 0x6f, 0xfe, 0xfd, 0xd5, 0xcc, 0x96, 0xf9, 0xd1, 0xe8, 0x1d,
-	0x55, 0xfb, 0x82, 0xb5, 0x9f, 0x8e, 0xfd, 0xf4, 0xac, 0xad, 0xdc, 0xc0, 0xda, 0x4f, 0xd5, 0xc7,
-	0xb3, 0xd1, 0x73, 0xeb, 0xf5, 0x51, 0xf1, 0xf8, 0x9b, 0x01, 0xb5, 0x5c, 0xc5, 0x2b, 0x04, 0x7c,
-	0x56, 0x7d, 0x2c, 0x02, 0xfc, 0x4b, 0x09, 0xd8, 0xda, 0xd8, 0xbd, 0x28, 0xe0, 0xf6, 0xd3, 0x6c,
-	0x20, 0x9f, 0x8d, 0xf1, 0xff, 0xd9, 0x80, 0x5a, 0xae, 0xc0, 0x14, 0xe2, 0x3f, 0xab, 0x1c, 0x15,
-	0xe1, 0xbf, 0x2b, 0xf1, 0xef, 0xbf, 0xf3, 0xb2, 0xf0, 0xa3, 0xbf, 0x18, 0x00, 0xe3, 0x12, 0x84,
-	0x8a, 0xee, 0x7c, 0xa7, 0xaa, 0xd5, 0xda, 0x39, 0x77, 0x61, 0x8a, 0x1c, 0xbd, 0x34, 0xe4, 0x7f,
-	0x35, 0x60, 0x31, 0x5b, 0x29, 0xd0, 0x46, 0xe1, 0x33, 0xd5, 0xa9, 0xca, 0xb7, 0x76, 0x6d, 0x2a,
-	0x19, 0x55, 0x8a, 0xcc, 0x4f, 0xe4, 0x52, 0xae, 0xa3, 0x0b, 0x67, 0x3d, 0xfa, 0xbb, 0x01, 0x4b,
-	0x13, 0xbb, 0x1d, 0x7d, 0x50, 0xf8, 0x8e, 0x70, 0x56, 0x45, 0x2a, 0x4a, 0x98, 0x5f, 0x4b, 0xac,
-	0x3d, 0xf3, 0xe8, 0x65, 0x25, 0xbc, 0xab, 0x61, 0x5c, 0x37, 0xde, 0xb9, 0xf5, 0x14, 0xde, 0x70,
-	0x42, 0xff, 0xc5, 0xb8, 0x6f, 0xa5, 0x77, 0x25, 0x76, 0x24, 0x4e, 0xe8, 0x23, 0xe3, 0x57, 0x3b,
-	0x9a, 0x7f, 0x10, 0x7a, 0x38, 0x18, 0xb4, 0xc2, 0x78, 0xd0, 0x1e, 0x90, 0x40, 0x9e, 0xdf, 0x6d,
-	0x35, 0x85, 0x23, 0xca, 0x9e, 0xf3, 0x47, 0xcd, 0x8d, 0x94, 0xd0, 0x9f, 0x93, 0x12, 0xd7, 0xfe,
-	0x17, 0x00, 0x00, 0xff, 0xff, 0x82, 0x2f, 0x0d, 0xbd, 0xd9, 0x19, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/clusters.proto", fileDescriptor_clusters_4a7d1f005a919fa7)
+}
+
+var fileDescriptor_clusters_4a7d1f005a919fa7 = []byte{
+	// 2165 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4f, 0x73, 0x1c, 0x47,
+	0x15, 0xf7, 0x68, 0xb5, 0xd2, 0xea, 0xed, 0x1f, 0xad, 0x3a, 0x8a, 0xd8, 0x28, 0x98, 0x38, 0x13,
+	0x08, 0x4a, 0x08, 0xbb, 0x89, 0x4c, 0x2a, 0xc1, 0xc6, 0xa9, 0xc8, 0x92, 0x2c, 0x29, 0xc8, 0xb2,
+	0x98, 0xdd, 0xb5, 0x31, 0x94, 0x6b, 0xaa, 0x77, 0xa6, 0x77, 0xdd, 0xd1, 0xfc, 0x63, 0xba, 0xc7,
+	0x89, 0xec, 0x72, 0x15, 0x15, 0x4e, 0x14, 0x47, 0x3e, 0x00, 0x39, 0x73, 0xc8, 0x81, 0xa2, 0x8a,
+	0xe2, 0xc0, 0x8d, 0x6f, 0x10, 0x8a, 0x4f, 0xc0, 0x81, 0x0b, 0x77, 0x8e, 0x54, 0xff, 0x99, 0xdd,
+	0x99, 0x95, 0xec, 0x91, 0x84, 0x2b, 0x27, 0xed, 0xbc, 0x7e, 0xef, 0xf7, 0x7e, 0xfd, 0xfa, 0xf5,
+	0xeb, 0xd7, 0x2d, 0x78, 0x67, 0x14, 0x86, 0x23, 0x8f, 0x74, 0x1c, 0x2f, 0x4c, 0xdc, 0x8e, 0x8b,
+	0x39, 0x8e, 0xe2, 0xd0, 0xe9, 0x3c, 0x7a, 0x6f, 0x40, 0x38, 0x5e, 0xef, 0x38, 0x5e, 0xc2, 0x38,
+	0x89, 0x59, 0x3b, 0x8a, 0x43, 0x1e, 0xa2, 0xcb, 0x4a, 0xbb, 0x2d, 0xb5, 0xdb, 0xa9, 0x76, 0x5b,
+	0x6b, 0xaf, 0x7e, 0x5b, 0x83, 0xe1, 0x88, 0x76, 0x70, 0x10, 0x84, 0x1c, 0x73, 0x1a, 0x06, 0xda,
+	0x78, 0xf5, 0xed, 0xe7, 0xbb, 0x62, 0x0f, 0x71, 0x4c, 0x5c, 0xad, 0xfb, 0x86, 0xd6, 0xf5, 0xc2,
+	0x60, 0x14, 0x27, 0x41, 0x40, 0x83, 0x51, 0x27, 0x8c, 0x48, 0x9c, 0x03, 0xfc, 0x8e, 0x56, 0x92,
+	0x5f, 0x83, 0x64, 0xd8, 0x71, 0x13, 0xa5, 0xa0, 0xc7, 0xaf, 0x4c, 0x8f, 0x0f, 0x29, 0xf1, 0x5c,
+	0xdb, 0xc7, 0xec, 0x48, 0x6b, 0xbc, 0x36, 0xad, 0xc1, 0xa9, 0x4f, 0x18, 0xc7, 0x7e, 0xa4, 0x14,
+	0xcc, 0x3f, 0xcc, 0xc2, 0xfc, 0xa6, 0x8a, 0x01, 0xba, 0x0c, 0x10, 0xc5, 0xe1, 0xa7, 0xc4, 0xe1,
+	0x36, 0x75, 0x5b, 0xc6, 0x15, 0x63, 0x6d, 0xc1, 0x5a, 0xd0, 0x92, 0x3d, 0x17, 0xbd, 0x0e, 0x35,
+	0x1d, 0x2d, 0x3b, 0xc0, 0x3e, 0x69, 0xcd, 0x48, 0x85, 0xaa, 0x96, 0x1d, 0x60, 0x9f, 0xa0, 0x2d,
+	0x98, 0x73, 0xc2, 0x60, 0x48, 0x47, 0xad, 0xd2, 0x15, 0x63, 0xad, 0xba, 0xfe, 0x4e, 0xfb, 0xb9,
+	0xf1, 0x6c, 0x6b, 0xcf, 0x9b, 0xd2, 0xc6, 0xd2, 0xb6, 0xe8, 0x13, 0x98, 0xf3, 0xf0, 0x80, 0x78,
+	0xac, 0x55, 0xb9, 0x52, 0x5a, 0xab, 0xae, 0xaf, 0x9f, 0x0d, 0xa5, 0xbd, 0x2f, 0x8d, 0xb6, 0x03,
+	0x1e, 0x1f, 0x5b, 0x1a, 0x41, 0x30, 0x62, 0x1c, 0xf3, 0x84, 0xb5, 0x66, 0xcf, 0xc3, 0xa8, 0x2b,
+	0x6d, 0x2c, 0x6d, 0x8b, 0xba, 0xd0, 0x50, 0xbf, 0xec, 0x87, 0x94, 0xf1, 0x30, 0x3e, 0x6e, 0xcd,
+	0x4b, 0x66, 0xe7, 0x43, 0xab, 0x2b, 0x8c, 0x5d, 0x05, 0x91, 0x8d, 0x67, 0x92, 0x50, 0xb7, 0x35,
+	0x97, 0x8b, 0x67, 0x3f, 0xa1, 0x2e, 0xda, 0x81, 0x79, 0x9f, 0xf0, 0x98, 0x3a, 0xac, 0xb5, 0x20,
+	0xe9, 0xff, 0xf0, 0x6c, 0x0e, 0x6f, 0x2b, 0x23, 0x2b, 0xb5, 0x5e, 0xfd, 0x31, 0x54, 0x33, 0xd1,
+	0x41, 0x4d, 0x28, 0x1d, 0x91, 0x63, 0xbd, 0xc4, 0xe2, 0x27, 0x5a, 0x86, 0xf2, 0x23, 0xec, 0x25,
+	0xe9, 0xaa, 0xaa, 0x8f, 0x6b, 0x33, 0x1f, 0x1a, 0xe6, 0x3f, 0xca, 0x50, 0xcf, 0xad, 0x13, 0x7a,
+	0x03, 0xea, 0x6a, 0xa5, 0xec, 0x41, 0xe2, 0x1c, 0x11, 0xae, 0x71, 0x6a, 0x4a, 0x78, 0x53, 0xca,
+	0xd0, 0x03, 0x40, 0x23, 0x87, 0xd8, 0xe9, 0x0c, 0x75, 0x5a, 0x54, 0xe4, 0x2c, 0x3a, 0x05, 0xb3,
+	0xd8, 0x71, 0x48, 0x3e, 0x33, 0x9a, 0xa3, 0x29, 0x09, 0xba, 0x07, 0x75, 0x1f, 0x67, 0x91, 0x55,
+	0x7c, 0x8a, 0x52, 0x65, 0x2f, 0x60, 0x1c, 0x07, 0x0e, 0xd9, 0x89, 0xc3, 0x24, 0xd2, 0xe0, 0x35,
+	0x05, 0x34, 0x01, 0xfe, 0x2c, 0x8c, 0x8f, 0x26, 0xc0, 0x70, 0x71, 0x60, 0x05, 0xa4, 0x81, 0x3f,
+	0x85, 0x6f, 0x31, 0xe2, 0x84, 0x81, 0x8b, 0xe3, 0x63, 0x3b, 0xef, 0xa2, 0x76, 0x61, 0x17, 0x2f,
+	0x8f, 0x21, 0xef, 0x65, 0x7d, 0xdd, 0x85, 0x45, 0x16, 0x0e, 0xf9, 0x67, 0x38, 0x26, 0xa9, 0x8f,
+	0xfa, 0x99, 0xf2, 0xa7, 0xab, 0xad, 0x34, 0x7c, 0x83, 0xe5, 0xbe, 0xd1, 0x7d, 0x68, 0x7a, 0x74,
+	0x48, 0x9c, 0x63, 0xc7, 0x1b, 0x03, 0x37, 0x24, 0x70, 0xbb, 0x00, 0x78, 0x3f, 0x35, 0xd3, 0xc8,
+	0x8b, 0x5e, 0x5e, 0x80, 0x02, 0x58, 0xa1, 0x01, 0xe5, 0x14, 0x7b, 0xf4, 0xb1, 0xac, 0x71, 0x36,
+	0x76, 0x64, 0x2d, 0x6c, 0x55, 0xe5, 0x56, 0xfb, 0xa0, 0xc0, 0xc1, 0x41, 0xe8, 0x92, 0xbd, 0x1c,
+	0xc0, 0x86, 0xb4, 0xb7, 0x5e, 0xa6, 0xa7, 0x48, 0x99, 0xf9, 0xc7, 0x12, 0x34, 0xa7, 0xf3, 0x0c,
+	0xbd, 0x02, 0x95, 0xc7, 0x61, 0x40, 0xec, 0x24, 0xa6, 0x3a, 0xa9, 0xe7, 0xc5, 0x77, 0x3f, 0xa6,
+	0xe8, 0x35, 0xa8, 0x06, 0x84, 0x8b, 0x75, 0x93, 0xa3, 0x6a, 0x9b, 0x80, 0x16, 0x09, 0x85, 0xef,
+	0x41, 0x83, 0x25, 0x83, 0xac, 0x8e, 0xda, 0xd0, 0xf5, 0x89, 0x54, 0xa8, 0xad, 0x41, 0x93, 0x06,
+	0x9c, 0xc4, 0x01, 0xf6, 0x6c, 0x1a, 0xd9, 0x61, 0xe0, 0x89, 0x62, 0x62, 0xac, 0x55, 0xac, 0x46,
+	0x2a, 0xdf, 0x8b, 0xee, 0x04, 0xde, 0x31, 0xfa, 0x3e, 0x2c, 0x32, 0x12, 0x3f, 0xa2, 0x0e, 0xb1,
+	0xb1, 0xe3, 0x84, 0x49, 0xc0, 0xe5, 0xf6, 0x59, 0xb0, 0x1a, 0x5a, 0xbc, 0xa1, 0xa4, 0xe8, 0x47,
+	0xb0, 0x32, 0xa5, 0x68, 0x33, 0x27, 0x8c, 0x08, 0x6b, 0x95, 0xae, 0x94, 0xd6, 0x16, 0xac, 0xe5,
+	0xbc, 0x7e, 0x57, 0x8e, 0x21, 0x04, 0xb3, 0x1c, 0x8f, 0x44, 0x5d, 0x14, 0x3a, 0xf2, 0x37, 0xba,
+	0x0f, 0x15, 0x9f, 0x70, 0x2c, 0x82, 0xdb, 0x2a, 0xcb, 0xb0, 0xdf, 0x38, 0xe7, 0x56, 0x6d, 0xdf,
+	0xd6, 0xf6, 0xaa, 0x0c, 0x8f, 0xe1, 0x56, 0xaf, 0x43, 0x3d, 0x37, 0x74, 0xae, 0x1a, 0xf4, 0xeb,
+	0x59, 0x78, 0xe9, 0x94, 0xf4, 0x17, 0x95, 0x28, 0x48, 0x7c, 0x9b, 0xea, 0x21, 0x26, 0xd1, 0xca,
+	0x56, 0x2d, 0x48, 0xfc, 0x54, 0x9d, 0x89, 0x85, 0x49, 0x15, 0xe4, 0xc1, 0xc5, 0x5a, 0x33, 0x72,
+	0xca, 0xf5, 0x54, 0x2a, 0x8e, 0x2e, 0x86, 0x5e, 0x85, 0x05, 0xea, 0xe3, 0x91, 0x5a, 0xfc, 0x92,
+	0x64, 0x50, 0x91, 0x02, 0xbd, 0x6a, 0x3e, 0x76, 0x1e, 0xd2, 0x80, 0xd8, 0xfc, 0x38, 0x52, 0x3a,
+	0xb3, 0x6a, 0x31, 0xb4, 0xbc, 0x77, 0x1c, 0x49, 0xcd, 0x4f, 0xa0, 0xea, 0x52, 0x76, 0x94, 0xee,
+	0x8e, 0xb2, 0xdc, 0x1d, 0x6f, 0x15, 0x44, 0x71, 0x8b, 0xb2, 0x23, 0xbd, 0x31, 0xc0, 0x1d, 0xff,
+	0x96, 0xcc, 0x99, 0x1d, 0xc5, 0x84, 0xf8, 0x11, 0xa7, 0x03, 0x8f, 0xc8, 0x94, 0xaa, 0x58, 0x75,
+	0xca, 0x0e, 0x27, 0x42, 0xe4, 0xc0, 0xb2, 0x8f, 0x03, 0x3c, 0x22, 0xae, 0x3d, 0x12, 0xc1, 0x49,
+	0x7d, 0xcf, 0x4b, 0xdf, 0xef, 0x15, 0xf8, 0xbe, 0xad, 0x4c, 0xb3, 0x55, 0x05, 0xf9, 0x27, 0x64,
+	0xa8, 0x07, 0x35, 0xec, 0x38, 0xc4, 0x13, 0x2d, 0x4a, 0x18, 0xa7, 0x47, 0xf3, 0xbb, 0x05, 0xe0,
+	0x1b, 0x13, 0x93, 0xb4, 0x28, 0x66, 0x51, 0x64, 0x5c, 0x69, 0x60, 0x3b, 0x51, 0x62, 0x47, 0x1e,
+	0xe6, 0xc3, 0x30, 0xf6, 0x65, 0x25, 0x17, 0x71, 0xa5, 0xc1, 0x66, 0x94, 0x1c, 0x6a, 0xa9, 0xf9,
+	0x5b, 0x03, 0xd0, 0x49, 0xaa, 0x22, 0xf7, 0xc7, 0x8b, 0xcb, 0x89, 0x2f, 0x40, 0xd4, 0x2a, 0xeb,
+	0xc4, 0x5a, 0x4e, 0x47, 0x7b, 0x7a, 0x50, 0xf6, 0x29, 0x37, 0xe0, 0xd5, 0xb1, 0x95, 0x0a, 0x99,
+	0x9a, 0x71, 0xae, 0xb3, 0x69, 0xd1, 0x6c, 0xc6, 0x29, 0xdf, 0xb2, 0xcd, 0x31, 0x63, 0x58, 0x3a,
+	0x31, 0x31, 0xf4, 0x2e, 0x2c, 0x67, 0xa6, 0x36, 0x49, 0x13, 0xc5, 0x03, 0x65, 0xc6, 0xd2, 0x54,
+	0xf9, 0x01, 0x2c, 0x65, 0x2d, 0xd4, 0x16, 0x9f, 0x91, 0x19, 0xdc, 0xc4, 0x59, 0xfc, 0x24, 0xe0,
+	0xe6, 0x6f, 0x0c, 0x80, 0x49, 0x9a, 0xa0, 0xef, 0x42, 0x63, 0x10, 0x86, 0xdc, 0x96, 0xb9, 0x26,
+	0x7c, 0xe9, 0x94, 0xad, 0x09, 0xa9, 0xd0, 0x13, 0x4e, 0xd0, 0x5b, 0xb0, 0x34, 0xd1, 0x62, 0xf4,
+	0x31, 0xb1, 0x47, 0x03, 0xbd, 0x47, 0x1a, 0xa9, 0x62, 0x97, 0x3e, 0x26, 0x3b, 0x03, 0x01, 0x28,
+	0xb6, 0x92, 0x17, 0x3a, 0xd8, 0xb3, 0x19, 0x73, 0x99, 0x66, 0x22, 0xf6, 0xd2, 0xbe, 0x10, 0x76,
+	0x99, 0xcb, 0xcc, 0x7f, 0x1b, 0xb0, 0x38, 0x55, 0xca, 0xd1, 0x06, 0x2c, 0x52, 0xd7, 0x23, 0xb6,
+	0x4b, 0x3c, 0xc2, 0x89, 0xcd, 0xb9, 0x27, 0x5d, 0x54, 0xd7, 0x5f, 0x49, 0x93, 0x23, 0xed, 0x3e,
+	0xdb, 0x5b, 0xba, 0x7f, 0xb5, 0xea, 0xc2, 0x62, 0x4b, 0x1a, 0xf4, 0xb8, 0x87, 0x6e, 0x41, 0x13,
+	0x27, 0x3c, 0x1c, 0x43, 0x50, 0xbd, 0x08, 0xd5, 0xf5, 0xd5, 0x13, 0x18, 0xbd, 0xb4, 0x83, 0xdd,
+	0xbd, 0x64, 0x35, 0x84, 0x95, 0x86, 0xa1, 0x3e, 0x41, 0x9b, 0xb0, 0x98, 0xc3, 0xe1, 0x9e, 0x6e,
+	0x44, 0x9f, 0x4d, 0x65, 0xf7, 0x92, 0x55, 0xcf, 0xa0, 0x70, 0xef, 0x66, 0x19, 0x4a, 0x9c, 0x7b,
+	0xe6, 0xef, 0x0c, 0x68, 0x3d, 0xeb, 0x50, 0x11, 0xb5, 0x99, 0x7c, 0x4e, 0x9c, 0x84, 0xe3, 0x81,
+	0x47, 0xec, 0x21, 0xf5, 0xd2, 0x7c, 0x6b, 0x4c, 0xc4, 0xb7, 0xa8, 0x47, 0xd0, 0x2d, 0x58, 0x52,
+	0x12, 0x71, 0xa2, 0x89, 0x79, 0x85, 0x09, 0xd7, 0x53, 0x7b, 0x4e, 0x78, 0x9a, 0x63, 0x9b, 0x9e,
+	0x32, 0x31, 0xbf, 0x2c, 0x8d, 0xbb, 0x30, 0xd5, 0x4d, 0xa2, 0x5d, 0x28, 0x8b, 0x7e, 0x52, 0x39,
+	0x6e, 0x9c, 0xb5, 0x49, 0x56, 0xc6, 0x6d, 0xf1, 0x87, 0x58, 0x0a, 0x00, 0xad, 0xc0, 0x9c, 0x4b,
+	0x38, 0xa6, 0x9e, 0x4e, 0x7c, 0xfd, 0x85, 0xb6, 0xa0, 0x29, 0x15, 0x6c, 0xc6, 0x71, 0xcc, 0xd5,
+	0xaa, 0x94, 0x8a, 0x56, 0xc5, 0x92, 0x9d, 0x32, 0xe9, 0x0a, 0x13, 0xb9, 0x26, 0x3f, 0x83, 0x0a,
+	0x4b, 0x06, 0x8a, 0xea, 0xac, 0xa4, 0xfa, 0xfe, 0xf9, 0xa8, 0x6a, 0x63, 0x6b, 0x0c, 0x63, 0xde,
+	0x85, 0xb2, 0x9c, 0x00, 0xaa, 0xc2, 0x7c, 0xff, 0xe0, 0xa7, 0x07, 0x77, 0xee, 0x1d, 0x34, 0x2f,
+	0xa1, 0x1a, 0x54, 0x36, 0xad, 0xed, 0x8d, 0xde, 0xde, 0xc1, 0x4e, 0xd3, 0x10, 0x43, 0x56, 0xff,
+	0xe0, 0x40, 0x7c, 0xcc, 0xa0, 0x05, 0x28, 0x6f, 0x5b, 0xd6, 0x1d, 0xab, 0x59, 0x12, 0x5a, 0x5b,
+	0xdb, 0xfb, 0xdb, 0x52, 0x6b, 0x56, 0x7c, 0xf5, 0x0f, 0xb7, 0x94, 0x4d, 0xd9, 0xfc, 0x09, 0x54,
+	0x52, 0x6f, 0x68, 0x11, 0xaa, 0xfd, 0x83, 0xee, 0xe1, 0xf6, 0xe6, 0xde, 0xad, 0xbd, 0xed, 0xad,
+	0xe6, 0x25, 0x54, 0x87, 0x85, 0xfe, 0xc1, 0xee, 0xf6, 0xc6, 0x7e, 0x6f, 0xf7, 0x7e, 0xd3, 0x40,
+	0x4d, 0xa8, 0x75, 0x7b, 0x1b, 0xfb, 0xdb, 0x76, 0xb7, 0xb7, 0xd1, 0xeb, 0x77, 0x9b, 0x33, 0xe6,
+	0xd7, 0x06, 0x34, 0xf2, 0xfd, 0x93, 0x38, 0x9f, 0xd4, 0x99, 0xf2, 0x88, 0xc4, 0x8c, 0x86, 0x41,
+	0xda, 0x29, 0x4b, 0xe1, 0x5d, 0x25, 0x43, 0x0f, 0xe4, 0xb5, 0x2b, 0x22, 0x31, 0xa7, 0xfa, 0x6c,
+	0x2a, 0x3e, 0x76, 0xf3, 0x7e, 0xda, 0x87, 0x63, 0x7b, 0x75, 0xec, 0x66, 0x00, 0x57, 0x6f, 0xc0,
+	0xe2, 0xd4, 0xf0, 0xb9, 0x8e, 0xde, 0x7f, 0xce, 0x40, 0x23, 0x7f, 0xab, 0x40, 0x18, 0x6a, 0x0f,
+	0xdd, 0x21, 0xb3, 0xd3, 0xab, 0x89, 0x21, 0x29, 0x7f, 0x74, 0xae, 0xab, 0x49, 0x7b, 0xd7, 0x1d,
+	0x32, 0xfd, 0x5b, 0x71, 0xae, 0x3e, 0x9c, 0x48, 0x84, 0x8b, 0x63, 0x1c, 0x07, 0x63, 0x17, 0x33,
+	0x17, 0x71, 0x71, 0x1f, 0xc7, 0x41, 0xde, 0xc5, 0xf1, 0x44, 0xb2, 0xfa, 0x11, 0x34, 0xa7, 0x39,
+	0x14, 0x05, 0xa6, 0x94, 0x09, 0x8c, 0xb0, 0x9f, 0x76, 0x70, 0x1e, 0x7b, 0xf3, 0x2b, 0x03, 0x96,
+	0x37, 0x63, 0x82, 0x79, 0xda, 0x40, 0x59, 0xe4, 0x57, 0x09, 0x61, 0xbc, 0xe8, 0x1a, 0xbe, 0x02,
+	0x73, 0x31, 0x19, 0x89, 0x64, 0x52, 0x15, 0x5f, 0x7f, 0xa1, 0x8f, 0x61, 0x5e, 0x5f, 0xb6, 0x74,
+	0x7d, 0x79, 0xf3, 0x6c, 0xd1, 0xb2, 0x52, 0x33, 0xe1, 0x38, 0x56, 0x1c, 0x84, 0x63, 0xd5, 0xde,
+	0x2c, 0x68, 0xc9, 0x9e, 0x6b, 0xfe, 0x67, 0x06, 0x96, 0xfb, 0x91, 0xfb, 0x7f, 0x10, 0x2e, 0xe7,
+	0x08, 0x9f, 0xe1, 0x3d, 0x21, 0x33, 0xa7, 0xd2, 0xc5, 0xe6, 0xf4, 0x00, 0x2e, 0x8f, 0x62, 0xec,
+	0x90, 0x61, 0xe2, 0xd9, 0x2e, 0x71, 0x42, 0xdf, 0xa7, 0x8c, 0x65, 0x6b, 0xf1, 0x5c, 0x51, 0x2d,
+	0x7e, 0x35, 0xb5, 0xdf, 0xca, 0x98, 0xeb, 0xb2, 0x8c, 0xae, 0x43, 0x35, 0x91, 0x21, 0x91, 0x8f,
+	0x2e, 0xfa, 0x8d, 0xe1, 0x64, 0x75, 0xbc, 0x45, 0x89, 0xe7, 0xde, 0xc6, 0xec, 0xc8, 0x02, 0xa5,
+	0x2e, 0x7e, 0x4f, 0xc5, 0x7b, 0x7e, 0x3a, 0xde, 0x7f, 0x32, 0x60, 0x59, 0x9d, 0x4a, 0x2f, 0x26,
+	0x41, 0xce, 0x10, 0xef, 0xe9, 0x27, 0x89, 0xd9, 0x93, 0x4f, 0x12, 0x79, 0xd2, 0xe5, 0x69, 0xd2,
+	0x3e, 0x2c, 0xed, 0x10, 0xfe, 0x4d, 0x11, 0x36, 0xbf, 0x34, 0xe0, 0xa5, 0x7d, 0xca, 0x52, 0x87,
+	0xec, 0xdc, 0x1e, 0x67, 0x73, 0x1e, 0x57, 0x60, 0x6e, 0x48, 0x3d, 0x91, 0x6e, 0x3a, 0x55, 0xd5,
+	0x97, 0xb8, 0x1b, 0x44, 0xa2, 0x8c, 0x8b, 0x16, 0x4a, 0xf7, 0x45, 0x15, 0x21, 0x10, 0xbd, 0x93,
+	0xf4, 0x25, 0x06, 0x79, 0x78, 0x44, 0xd2, 0x29, 0x48, 0xf5, 0x9e, 0x10, 0x98, 0x5f, 0x18, 0xb0,
+	0x9c, 0xa7, 0xc8, 0xa2, 0x30, 0x60, 0x04, 0xdd, 0x84, 0x4a, 0xfa, 0xfa, 0xa8, 0x4b, 0xe8, 0x59,
+	0xb3, 0x7b, 0x6c, 0x87, 0xde, 0x84, 0xc5, 0x80, 0x7c, 0xce, 0xed, 0x0c, 0x01, 0x15, 0xa5, 0xba,
+	0x10, 0x1f, 0x8e, 0x49, 0xc4, 0xb0, 0xb2, 0x45, 0xf1, 0x28, 0x08, 0xd9, 0x37, 0x96, 0x4c, 0xe6,
+	0x07, 0xa7, 0xf8, 0x64, 0x89, 0xc7, 0x99, 0xf0, 0x19, 0x26, 0x3c, 0x4a, 0x78, 0xa6, 0x41, 0x5e,
+	0x50, 0x92, 0x7e, 0x4c, 0xd7, 0xff, 0x5b, 0x81, 0xa5, 0xc9, 0xa5, 0x92, 0xc7, 0xa1, 0xe7, 0x91,
+	0x18, 0x7d, 0x65, 0x40, 0x3d, 0x57, 0x2f, 0xd1, 0xd5, 0xa2, 0x70, 0x9d, 0x52, 0x5d, 0x57, 0x2f,
+	0xa7, 0x46, 0x99, 0x97, 0xd7, 0xf6, 0x9d, 0xf4, 0xe5, 0xd5, 0xdc, 0xfb, 0xe2, 0xeb, 0x7f, 0xfd,
+	0x7e, 0x66, 0xd3, 0xfc, 0x70, 0xfc, 0x6c, 0xab, 0x63, 0xc1, 0x3a, 0x4f, 0x26, 0x71, 0x7a, 0xda,
+	0x51, 0x61, 0x60, 0x9d, 0x27, 0xea, 0xc7, 0xd3, 0xf1, 0x43, 0xf2, 0xb5, 0x71, 0xe9, 0xf9, 0x9b,
+	0x01, 0xf5, 0x5c, 0xbd, 0x2c, 0x24, 0x7c, 0x5a, 0x75, 0x2d, 0x22, 0xfc, 0x73, 0x49, 0xd8, 0x5a,
+	0xdf, 0xb9, 0x28, 0xe1, 0xce, 0x93, 0xec, 0x42, 0x3e, 0x9d, 0xf0, 0xff, 0xb3, 0x01, 0xf5, 0x5c,
+	0xfd, 0x29, 0xe4, 0x7f, 0x5a, 0xb5, 0x2a, 0xe2, 0x7f, 0x47, 0xf2, 0xdf, 0x7b, 0xfb, 0x45, 0xf1,
+	0x47, 0x7f, 0x31, 0x00, 0x26, 0x25, 0x08, 0x15, 0xdd, 0x50, 0x4f, 0x54, 0xab, 0xd5, 0x33, 0xee,
+	0xc2, 0x94, 0x39, 0x7a, 0x61, 0xcc, 0xff, 0x6a, 0x40, 0x2d, 0x5b, 0x29, 0xd0, 0x7a, 0xe1, 0xa3,
+	0xda, 0x89, 0xca, 0xb7, 0x7a, 0xf5, 0x5c, 0x36, 0xaa, 0x14, 0x99, 0x1f, 0xcb, 0xa9, 0x5c, 0x43,
+	0x17, 0xce, 0x7a, 0xf4, 0x77, 0x03, 0x16, 0xa7, 0x76, 0x3b, 0x7a, 0xbf, 0xf0, 0xd5, 0xe3, 0xb4,
+	0x8a, 0x54, 0x94, 0x30, 0xbf, 0x94, 0x5c, 0xfb, 0xe6, 0xe1, 0x8b, 0x4a, 0x78, 0x57, 0xd3, 0xb8,
+	0x66, 0xbc, 0x7d, 0xf3, 0x09, 0xbc, 0xee, 0x84, 0xfe, 0xf3, 0x79, 0xdf, 0x4c, 0x2f, 0x62, 0xec,
+	0x50, 0x9c, 0xef, 0x87, 0xc6, 0x2f, 0xb6, 0xb5, 0xfe, 0x28, 0xf4, 0x70, 0x30, 0x6a, 0x87, 0xf1,
+	0xa8, 0x33, 0x22, 0x81, 0x3c, 0xfd, 0x3b, 0x6a, 0x08, 0x47, 0x94, 0x3d, 0xe3, 0xff, 0x42, 0xd7,
+	0x53, 0xc1, 0x60, 0x4e, 0x5a, 0x5c, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xea, 0xcc,
+	0x54, 0xb3, 0x1a, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/jobs.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
index 2a2e2945..d90aac85 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/jobs.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/jobs.proto
 
-package dataproc
+package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf4 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/timestamp"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The Log4j level for job execution. When running an
 // [Apache Hive](http://hive.apache.org/) job, Cloud
 // Dataproc configures the Hive client to an equivalent verbosity level.
@@ -73,7 +79,9 @@ var LoggingConfig_Level_value = map[string]int32{
 func (x LoggingConfig_Level) String() string {
 	return proto.EnumName(LoggingConfig_Level_name, int32(x))
 }
-func (LoggingConfig_Level) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (LoggingConfig_Level) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{0, 0}
+}
 
 // The job state.
 type JobStatus_State int32
@@ -134,11 +142,15 @@ var JobStatus_State_value = map[string]int32{
 func (x JobStatus_State) String() string {
 	return proto.EnumName(JobStatus_State_name, int32(x))
 }
-func (JobStatus_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{9, 0} }
+func (JobStatus_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{9, 0}
+}
 
+// The job substate.
 type JobStatus_Substate int32
 
 const (
+	// The job substate is unknown.
 	JobStatus_UNSPECIFIED JobStatus_Substate = 0
 	// The Job is submitted to the agent.
 	//
@@ -174,7 +186,9 @@ var JobStatus_Substate_value = map[string]int32{
 func (x JobStatus_Substate) String() string {
 	return proto.EnumName(JobStatus_Substate_name, int32(x))
 }
-func (JobStatus_Substate) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{9, 1} }
+func (JobStatus_Substate) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{9, 1}
+}
 
 // The application state, corresponding to
 // <code>YarnProtos.YarnApplicationStateProto</code>.
@@ -227,7 +241,9 @@ var YarnApplication_State_value = map[string]int32{
 func (x YarnApplication_State) String() string {
 	return proto.EnumName(YarnApplication_State_name, int32(x))
 }
-func (YarnApplication_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{11, 0} }
+func (YarnApplication_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{11, 0}
+}
 
 // A matcher that specifies categories of job states.
 type ListJobsRequest_JobStateMatcher int32
@@ -257,7 +273,7 @@ func (x ListJobsRequest_JobStateMatcher) String() string {
 	return proto.EnumName(ListJobsRequest_JobStateMatcher_name, int32(x))
 }
 func (ListJobsRequest_JobStateMatcher) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{16, 0}
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{16, 0}
 }
 
 // The runtime logging config of the job.
@@ -266,13 +282,35 @@ type LoggingConfig struct {
 	// "root" package name to configure rootLogger.
 	// Examples:
 	//   'com.google = FATAL', 'root = INFO', 'org.apache = DEBUG'
-	DriverLogLevels map[string]LoggingConfig_Level `protobuf:"bytes,2,rep,name=driver_log_levels,json=driverLogLevels" json:"driver_log_levels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.cloud.dataproc.v1beta2.LoggingConfig_Level"`
+	DriverLogLevels      map[string]LoggingConfig_Level `protobuf:"bytes,2,rep,name=driver_log_levels,json=driverLogLevels,proto3" json:"driver_log_levels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=google.cloud.dataproc.v1beta2.LoggingConfig_Level"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *LoggingConfig) Reset()         { *m = LoggingConfig{} }
+func (m *LoggingConfig) String() string { return proto.CompactTextString(m) }
+func (*LoggingConfig) ProtoMessage()    {}
+func (*LoggingConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{0}
+}
+func (m *LoggingConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoggingConfig.Unmarshal(m, b)
+}
+func (m *LoggingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoggingConfig.Marshal(b, m, deterministic)
+}
+func (dst *LoggingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoggingConfig.Merge(dst, src)
+}
+func (m *LoggingConfig) XXX_Size() int {
+	return xxx_messageInfo_LoggingConfig.Size(m)
+}
+func (m *LoggingConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoggingConfig.DiscardUnknown(m)
 }
 
-func (m *LoggingConfig) Reset()                    { *m = LoggingConfig{} }
-func (m *LoggingConfig) String() string            { return proto.CompactTextString(m) }
-func (*LoggingConfig) ProtoMessage()               {}
-func (*LoggingConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_LoggingConfig proto.InternalMessageInfo
 
 func (m *LoggingConfig) GetDriverLogLevels() map[string]LoggingConfig_Level {
 	if m != nil {
@@ -298,45 +336,69 @@ type HadoopJob struct {
 	// include arguments, such as `-libjars` or `-Dfoo=bar`, that can be set as job
 	// properties, since a collision may occur that causes an incorrect job
 	// submission.
-	Args []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
+	Args []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
 	// Optional. Jar file URIs to add to the CLASSPATHs of the
 	// Hadoop driver and tasks.
-	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. HCFS (Hadoop Compatible Filesystem) URIs of files to be copied
 	// to the working directory of Hadoop drivers and distributed tasks. Useful
 	// for naively parallel tasks.
-	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris" json:"file_uris,omitempty"`
+	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris,proto3" json:"file_uris,omitempty"`
 	// Optional. HCFS URIs of archives to be extracted in the working directory of
 	// Hadoop drivers and tasks. Supported file types:
 	// .jar, .tar, .tar.gz, .tgz, or .zip.
-	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris" json:"archive_uris,omitempty"`
+	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris,proto3" json:"archive_uris,omitempty"`
 	// Optional. A mapping of property names to values, used to configure Hadoop.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in /etc/hadoop/conf/*-site and
 	// classes in user code.
-	Properties map[string]string `protobuf:"bytes,7,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *HadoopJob) Reset()                    { *m = HadoopJob{} }
-func (m *HadoopJob) String() string            { return proto.CompactTextString(m) }
-func (*HadoopJob) ProtoMessage()               {}
-func (*HadoopJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *HadoopJob) Reset()         { *m = HadoopJob{} }
+func (m *HadoopJob) String() string { return proto.CompactTextString(m) }
+func (*HadoopJob) ProtoMessage()    {}
+func (*HadoopJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{1}
+}
+func (m *HadoopJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HadoopJob.Unmarshal(m, b)
+}
+func (m *HadoopJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HadoopJob.Marshal(b, m, deterministic)
+}
+func (dst *HadoopJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HadoopJob.Merge(dst, src)
+}
+func (m *HadoopJob) XXX_Size() int {
+	return xxx_messageInfo_HadoopJob.Size(m)
+}
+func (m *HadoopJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_HadoopJob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HadoopJob proto.InternalMessageInfo
 
 type isHadoopJob_Driver interface {
 	isHadoopJob_Driver()
 }
 
 type HadoopJob_MainJarFileUri struct {
-	MainJarFileUri string `protobuf:"bytes,1,opt,name=main_jar_file_uri,json=mainJarFileUri,oneof"`
+	MainJarFileUri string `protobuf:"bytes,1,opt,name=main_jar_file_uri,json=mainJarFileUri,proto3,oneof"`
 }
+
 type HadoopJob_MainClass struct {
-	MainClass string `protobuf:"bytes,2,opt,name=main_class,json=mainClass,oneof"`
+	MainClass string `protobuf:"bytes,2,opt,name=main_class,json=mainClass,proto3,oneof"`
 }
 
 func (*HadoopJob_MainJarFileUri) isHadoopJob_Driver() {}
-func (*HadoopJob_MainClass) isHadoopJob_Driver()      {}
+
+func (*HadoopJob_MainClass) isHadoopJob_Driver() {}
 
 func (m *HadoopJob) GetDriver() isHadoopJob_Driver {
 	if m != nil {
@@ -453,11 +515,11 @@ func _HadoopJob_OneofSizer(msg proto.Message) (n int) {
 	// driver
 	switch x := m.Driver.(type) {
 	case *HadoopJob_MainJarFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.MainJarFileUri)))
 		n += len(x.MainJarFileUri)
 	case *HadoopJob_MainClass:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.MainClass)))
 		n += len(x.MainClass)
 	case nil:
@@ -482,44 +544,68 @@ type SparkJob struct {
 	// Optional. The arguments to pass to the driver. Do not include arguments,
 	// such as `--conf`, that can be set as job properties, since a collision may
 	// occur that causes an incorrect job submission.
-	Args []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
+	Args []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
 	// Optional. HCFS URIs of jar files to add to the CLASSPATHs of the
 	// Spark driver and tasks.
-	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. HCFS URIs of files to be copied to the working directory of
 	// Spark drivers and distributed tasks. Useful for naively parallel tasks.
-	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris" json:"file_uris,omitempty"`
+	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris,proto3" json:"file_uris,omitempty"`
 	// Optional. HCFS URIs of archives to be extracted in the working directory
 	// of Spark drivers and tasks. Supported file types:
 	// .jar, .tar, .tar.gz, .tgz, and .zip.
-	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris" json:"archive_uris,omitempty"`
+	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris,proto3" json:"archive_uris,omitempty"`
 	// Optional. A mapping of property names to values, used to configure Spark.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in
 	// /etc/spark/conf/spark-defaults.conf and classes in user code.
-	Properties map[string]string `protobuf:"bytes,7,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *SparkJob) Reset()         { *m = SparkJob{} }
+func (m *SparkJob) String() string { return proto.CompactTextString(m) }
+func (*SparkJob) ProtoMessage()    {}
+func (*SparkJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{2}
+}
+func (m *SparkJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SparkJob.Unmarshal(m, b)
+}
+func (m *SparkJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SparkJob.Marshal(b, m, deterministic)
+}
+func (dst *SparkJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SparkJob.Merge(dst, src)
+}
+func (m *SparkJob) XXX_Size() int {
+	return xxx_messageInfo_SparkJob.Size(m)
+}
+func (m *SparkJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_SparkJob.DiscardUnknown(m)
 }
 
-func (m *SparkJob) Reset()                    { *m = SparkJob{} }
-func (m *SparkJob) String() string            { return proto.CompactTextString(m) }
-func (*SparkJob) ProtoMessage()               {}
-func (*SparkJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_SparkJob proto.InternalMessageInfo
 
 type isSparkJob_Driver interface {
 	isSparkJob_Driver()
 }
 
 type SparkJob_MainJarFileUri struct {
-	MainJarFileUri string `protobuf:"bytes,1,opt,name=main_jar_file_uri,json=mainJarFileUri,oneof"`
+	MainJarFileUri string `protobuf:"bytes,1,opt,name=main_jar_file_uri,json=mainJarFileUri,proto3,oneof"`
 }
+
 type SparkJob_MainClass struct {
-	MainClass string `protobuf:"bytes,2,opt,name=main_class,json=mainClass,oneof"`
+	MainClass string `protobuf:"bytes,2,opt,name=main_class,json=mainClass,proto3,oneof"`
 }
 
 func (*SparkJob_MainJarFileUri) isSparkJob_Driver() {}
-func (*SparkJob_MainClass) isSparkJob_Driver()      {}
+
+func (*SparkJob_MainClass) isSparkJob_Driver() {}
 
 func (m *SparkJob) GetDriver() isSparkJob_Driver {
 	if m != nil {
@@ -636,11 +722,11 @@ func _SparkJob_OneofSizer(msg proto.Message) (n int) {
 	// driver
 	switch x := m.Driver.(type) {
 	case *SparkJob_MainJarFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.MainJarFileUri)))
 		n += len(x.MainJarFileUri)
 	case *SparkJob_MainClass:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.MainClass)))
 		n += len(x.MainClass)
 	case nil:
@@ -656,36 +742,58 @@ func _SparkJob_OneofSizer(msg proto.Message) (n int) {
 type PySparkJob struct {
 	// Required. The HCFS URI of the main Python file to use as the driver. Must
 	// be a .py file.
-	MainPythonFileUri string `protobuf:"bytes,1,opt,name=main_python_file_uri,json=mainPythonFileUri" json:"main_python_file_uri,omitempty"`
+	MainPythonFileUri string `protobuf:"bytes,1,opt,name=main_python_file_uri,json=mainPythonFileUri,proto3" json:"main_python_file_uri,omitempty"`
 	// Optional. The arguments to pass to the driver.  Do not include arguments,
 	// such as `--conf`, that can be set as job properties, since a collision may
 	// occur that causes an incorrect job submission.
-	Args []string `protobuf:"bytes,2,rep,name=args" json:"args,omitempty"`
+	Args []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"`
 	// Optional. HCFS file URIs of Python files to pass to the PySpark
 	// framework. Supported file types: .py, .egg, and .zip.
-	PythonFileUris []string `protobuf:"bytes,3,rep,name=python_file_uris,json=pythonFileUris" json:"python_file_uris,omitempty"`
+	PythonFileUris []string `protobuf:"bytes,3,rep,name=python_file_uris,json=pythonFileUris,proto3" json:"python_file_uris,omitempty"`
 	// Optional. HCFS URIs of jar files to add to the CLASSPATHs of the
 	// Python driver and tasks.
-	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,4,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. HCFS URIs of files to be copied to the working directory of
 	// Python drivers and distributed tasks. Useful for naively parallel tasks.
-	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris" json:"file_uris,omitempty"`
+	FileUris []string `protobuf:"bytes,5,rep,name=file_uris,json=fileUris,proto3" json:"file_uris,omitempty"`
 	// Optional. HCFS URIs of archives to be extracted in the working directory of
 	// .jar, .tar, .tar.gz, .tgz, and .zip.
-	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris" json:"archive_uris,omitempty"`
+	ArchiveUris []string `protobuf:"bytes,6,rep,name=archive_uris,json=archiveUris,proto3" json:"archive_uris,omitempty"`
 	// Optional. A mapping of property names to values, used to configure PySpark.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in
 	// /etc/spark/conf/spark-defaults.conf and classes in user code.
-	Properties map[string]string `protobuf:"bytes,7,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,8,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *PySparkJob) Reset()         { *m = PySparkJob{} }
+func (m *PySparkJob) String() string { return proto.CompactTextString(m) }
+func (*PySparkJob) ProtoMessage()    {}
+func (*PySparkJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{3}
+}
+func (m *PySparkJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PySparkJob.Unmarshal(m, b)
+}
+func (m *PySparkJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PySparkJob.Marshal(b, m, deterministic)
+}
+func (dst *PySparkJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PySparkJob.Merge(dst, src)
+}
+func (m *PySparkJob) XXX_Size() int {
+	return xxx_messageInfo_PySparkJob.Size(m)
+}
+func (m *PySparkJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_PySparkJob.DiscardUnknown(m)
 }
 
-func (m *PySparkJob) Reset()                    { *m = PySparkJob{} }
-func (m *PySparkJob) String() string            { return proto.CompactTextString(m) }
-func (*PySparkJob) ProtoMessage()               {}
-func (*PySparkJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_PySparkJob proto.InternalMessageInfo
 
 func (m *PySparkJob) GetMainPythonFileUri() string {
 	if m != nil {
@@ -759,13 +867,35 @@ type QueryList struct {
 	//         ]
 	//       }
 	//     }
-	Queries []string `protobuf:"bytes,1,rep,name=queries" json:"queries,omitempty"`
+	Queries              []string `protobuf:"bytes,1,rep,name=queries,proto3" json:"queries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *QueryList) Reset()                    { *m = QueryList{} }
-func (m *QueryList) String() string            { return proto.CompactTextString(m) }
-func (*QueryList) ProtoMessage()               {}
-func (*QueryList) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (m *QueryList) Reset()         { *m = QueryList{} }
+func (m *QueryList) String() string { return proto.CompactTextString(m) }
+func (*QueryList) ProtoMessage()    {}
+func (*QueryList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{4}
+}
+func (m *QueryList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryList.Unmarshal(m, b)
+}
+func (m *QueryList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryList.Marshal(b, m, deterministic)
+}
+func (dst *QueryList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryList.Merge(dst, src)
+}
+func (m *QueryList) XXX_Size() int {
+	return xxx_messageInfo_QueryList.Size(m)
+}
+func (m *QueryList) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryList proto.InternalMessageInfo
 
 func (m *QueryList) GetQueries() []string {
 	if m != nil {
@@ -787,39 +917,63 @@ type HiveJob struct {
 	// Optional. Whether to continue executing queries if a query fails.
 	// The default value is `false`. Setting to `true` can be useful when executing
 	// independent parallel queries.
-	ContinueOnFailure bool `protobuf:"varint,3,opt,name=continue_on_failure,json=continueOnFailure" json:"continue_on_failure,omitempty"`
+	ContinueOnFailure bool `protobuf:"varint,3,opt,name=continue_on_failure,json=continueOnFailure,proto3" json:"continue_on_failure,omitempty"`
 	// Optional. Mapping of query variable names to values (equivalent to the
 	// Hive command: `SET name="value";`).
-	ScriptVariables map[string]string `protobuf:"bytes,4,rep,name=script_variables,json=scriptVariables" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ScriptVariables map[string]string `protobuf:"bytes,4,rep,name=script_variables,json=scriptVariables,proto3" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. A mapping of property names and values, used to configure Hive.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in /etc/hadoop/conf/*-site.xml,
 	// /etc/hive/conf/hive-site.xml, and classes in user code.
-	Properties map[string]string `protobuf:"bytes,5,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,5,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. HCFS URIs of jar files to add to the CLASSPATH of the
 	// Hive server and Hadoop MapReduce (MR) tasks. Can contain Hive SerDes
 	// and UDFs.
-	JarFileUris []string `protobuf:"bytes,6,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris          []string `protobuf:"bytes,6,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *HiveJob) Reset()                    { *m = HiveJob{} }
-func (m *HiveJob) String() string            { return proto.CompactTextString(m) }
-func (*HiveJob) ProtoMessage()               {}
-func (*HiveJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *HiveJob) Reset()         { *m = HiveJob{} }
+func (m *HiveJob) String() string { return proto.CompactTextString(m) }
+func (*HiveJob) ProtoMessage()    {}
+func (*HiveJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{5}
+}
+func (m *HiveJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HiveJob.Unmarshal(m, b)
+}
+func (m *HiveJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HiveJob.Marshal(b, m, deterministic)
+}
+func (dst *HiveJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HiveJob.Merge(dst, src)
+}
+func (m *HiveJob) XXX_Size() int {
+	return xxx_messageInfo_HiveJob.Size(m)
+}
+func (m *HiveJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_HiveJob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HiveJob proto.InternalMessageInfo
 
 type isHiveJob_Queries interface {
 	isHiveJob_Queries()
 }
 
 type HiveJob_QueryFileUri struct {
-	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,oneof"`
+	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,proto3,oneof"`
 }
+
 type HiveJob_QueryList struct {
-	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,oneof"`
+	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,proto3,oneof"`
 }
 
 func (*HiveJob_QueryFileUri) isHiveJob_Queries() {}
-func (*HiveJob_QueryList) isHiveJob_Queries()    {}
+
+func (*HiveJob_QueryList) isHiveJob_Queries() {}
 
 func (m *HiveJob) GetQueries() isHiveJob_Queries {
 	if m != nil {
@@ -925,12 +1079,12 @@ func _HiveJob_OneofSizer(msg proto.Message) (n int) {
 	// queries
 	switch x := m.Queries.(type) {
 	case *HiveJob_QueryFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
 		n += len(x.QueryFileUri)
 	case *HiveJob_QueryList:
 		s := proto.Size(x.QueryList)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -952,35 +1106,59 @@ type SparkSqlJob struct {
 	Queries isSparkSqlJob_Queries `protobuf_oneof:"queries"`
 	// Optional. Mapping of query variable names to values (equivalent to the
 	// Spark SQL command: SET `name="value";`).
-	ScriptVariables map[string]string `protobuf:"bytes,3,rep,name=script_variables,json=scriptVariables" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ScriptVariables map[string]string `protobuf:"bytes,3,rep,name=script_variables,json=scriptVariables,proto3" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. A mapping of property names to values, used to configure
 	// Spark SQL's SparkConf. Properties that conflict with values set by the
 	// Cloud Dataproc API may be overwritten.
-	Properties map[string]string `protobuf:"bytes,4,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,4,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. HCFS URIs of jar files to be added to the Spark CLASSPATH.
-	JarFileUris []string `protobuf:"bytes,56,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,56,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,6,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,6,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *SparkSqlJob) Reset()                    { *m = SparkSqlJob{} }
-func (m *SparkSqlJob) String() string            { return proto.CompactTextString(m) }
-func (*SparkSqlJob) ProtoMessage()               {}
-func (*SparkSqlJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *SparkSqlJob) Reset()         { *m = SparkSqlJob{} }
+func (m *SparkSqlJob) String() string { return proto.CompactTextString(m) }
+func (*SparkSqlJob) ProtoMessage()    {}
+func (*SparkSqlJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{6}
+}
+func (m *SparkSqlJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SparkSqlJob.Unmarshal(m, b)
+}
+func (m *SparkSqlJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SparkSqlJob.Marshal(b, m, deterministic)
+}
+func (dst *SparkSqlJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SparkSqlJob.Merge(dst, src)
+}
+func (m *SparkSqlJob) XXX_Size() int {
+	return xxx_messageInfo_SparkSqlJob.Size(m)
+}
+func (m *SparkSqlJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_SparkSqlJob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SparkSqlJob proto.InternalMessageInfo
 
 type isSparkSqlJob_Queries interface {
 	isSparkSqlJob_Queries()
 }
 
 type SparkSqlJob_QueryFileUri struct {
-	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,oneof"`
+	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,proto3,oneof"`
 }
+
 type SparkSqlJob_QueryList struct {
-	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,oneof"`
+	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,proto3,oneof"`
 }
 
 func (*SparkSqlJob_QueryFileUri) isSparkSqlJob_Queries() {}
-func (*SparkSqlJob_QueryList) isSparkSqlJob_Queries()    {}
+
+func (*SparkSqlJob_QueryList) isSparkSqlJob_Queries() {}
 
 func (m *SparkSqlJob) GetQueries() isSparkSqlJob_Queries {
 	if m != nil {
@@ -1086,12 +1264,12 @@ func _SparkSqlJob_OneofSizer(msg proto.Message) (n int) {
 	// queries
 	switch x := m.Queries.(type) {
 	case *SparkSqlJob_QueryFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
 		n += len(x.QueryFileUri)
 	case *SparkSqlJob_QueryList:
 		s := proto.Size(x.QueryList)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1114,40 +1292,64 @@ type PigJob struct {
 	// Optional. Whether to continue executing queries if a query fails.
 	// The default value is `false`. Setting to `true` can be useful when executing
 	// independent parallel queries.
-	ContinueOnFailure bool `protobuf:"varint,3,opt,name=continue_on_failure,json=continueOnFailure" json:"continue_on_failure,omitempty"`
+	ContinueOnFailure bool `protobuf:"varint,3,opt,name=continue_on_failure,json=continueOnFailure,proto3" json:"continue_on_failure,omitempty"`
 	// Optional. Mapping of query variable names to values (equivalent to the Pig
 	// command: `name=[value]`).
-	ScriptVariables map[string]string `protobuf:"bytes,4,rep,name=script_variables,json=scriptVariables" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ScriptVariables map[string]string `protobuf:"bytes,4,rep,name=script_variables,json=scriptVariables,proto3" json:"script_variables,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. A mapping of property names to values, used to configure Pig.
 	// Properties that conflict with values set by the Cloud Dataproc API may be
 	// overwritten. Can include properties set in /etc/hadoop/conf/*-site.xml,
 	// /etc/pig/conf/pig.properties, and classes in user code.
-	Properties map[string]string `protobuf:"bytes,5,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties map[string]string `protobuf:"bytes,5,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. HCFS URIs of jar files to add to the CLASSPATH of
 	// the Pig Client and Hadoop MapReduce (MR) tasks. Can contain Pig UDFs.
-	JarFileUris []string `protobuf:"bytes,6,rep,name=jar_file_uris,json=jarFileUris" json:"jar_file_uris,omitempty"`
+	JarFileUris []string `protobuf:"bytes,6,rep,name=jar_file_uris,json=jarFileUris,proto3" json:"jar_file_uris,omitempty"`
 	// Optional. The runtime log config for job execution.
-	LoggingConfig *LoggingConfig `protobuf:"bytes,7,opt,name=logging_config,json=loggingConfig" json:"logging_config,omitempty"`
+	LoggingConfig        *LoggingConfig `protobuf:"bytes,7,opt,name=logging_config,json=loggingConfig,proto3" json:"logging_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *PigJob) Reset()                    { *m = PigJob{} }
-func (m *PigJob) String() string            { return proto.CompactTextString(m) }
-func (*PigJob) ProtoMessage()               {}
-func (*PigJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+func (m *PigJob) Reset()         { *m = PigJob{} }
+func (m *PigJob) String() string { return proto.CompactTextString(m) }
+func (*PigJob) ProtoMessage()    {}
+func (*PigJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{7}
+}
+func (m *PigJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PigJob.Unmarshal(m, b)
+}
+func (m *PigJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PigJob.Marshal(b, m, deterministic)
+}
+func (dst *PigJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PigJob.Merge(dst, src)
+}
+func (m *PigJob) XXX_Size() int {
+	return xxx_messageInfo_PigJob.Size(m)
+}
+func (m *PigJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_PigJob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PigJob proto.InternalMessageInfo
 
 type isPigJob_Queries interface {
 	isPigJob_Queries()
 }
 
 type PigJob_QueryFileUri struct {
-	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,oneof"`
+	QueryFileUri string `protobuf:"bytes,1,opt,name=query_file_uri,json=queryFileUri,proto3,oneof"`
 }
+
 type PigJob_QueryList struct {
-	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,oneof"`
+	QueryList *QueryList `protobuf:"bytes,2,opt,name=query_list,json=queryList,proto3,oneof"`
 }
 
 func (*PigJob_QueryFileUri) isPigJob_Queries() {}
-func (*PigJob_QueryList) isPigJob_Queries()    {}
+
+func (*PigJob_QueryList) isPigJob_Queries() {}
 
 func (m *PigJob) GetQueries() isPigJob_Queries {
 	if m != nil {
@@ -1260,12 +1462,12 @@ func _PigJob_OneofSizer(msg proto.Message) (n int) {
 	// queries
 	switch x := m.Queries.(type) {
 	case *PigJob_QueryFileUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.QueryFileUri)))
 		n += len(x.QueryFileUri)
 	case *PigJob_QueryList:
 		s := proto.Size(x.QueryList)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1278,16 +1480,38 @@ func _PigJob_OneofSizer(msg proto.Message) (n int) {
 // Cloud Dataproc job config.
 type JobPlacement struct {
 	// Required. The name of the cluster where the job will be submitted.
-	ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
-	// Output-only. A cluster UUID generated by the Cloud Dataproc service when
+	ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+	// Output only. A cluster UUID generated by the Cloud Dataproc service when
 	// the job is submitted.
-	ClusterUuid string `protobuf:"bytes,2,opt,name=cluster_uuid,json=clusterUuid" json:"cluster_uuid,omitempty"`
+	ClusterUuid          string   `protobuf:"bytes,2,opt,name=cluster_uuid,json=clusterUuid,proto3" json:"cluster_uuid,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobPlacement) Reset()                    { *m = JobPlacement{} }
-func (m *JobPlacement) String() string            { return proto.CompactTextString(m) }
-func (*JobPlacement) ProtoMessage()               {}
-func (*JobPlacement) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+func (m *JobPlacement) Reset()         { *m = JobPlacement{} }
+func (m *JobPlacement) String() string { return proto.CompactTextString(m) }
+func (*JobPlacement) ProtoMessage()    {}
+func (*JobPlacement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{8}
+}
+func (m *JobPlacement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobPlacement.Unmarshal(m, b)
+}
+func (m *JobPlacement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobPlacement.Marshal(b, m, deterministic)
+}
+func (dst *JobPlacement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobPlacement.Merge(dst, src)
+}
+func (m *JobPlacement) XXX_Size() int {
+	return xxx_messageInfo_JobPlacement.Size(m)
+}
+func (m *JobPlacement) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobPlacement.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobPlacement proto.InternalMessageInfo
 
 func (m *JobPlacement) GetClusterName() string {
 	if m != nil {
@@ -1305,22 +1529,44 @@ func (m *JobPlacement) GetClusterUuid() string {
 
 // Cloud Dataproc job status.
 type JobStatus struct {
-	// Output-only. A state message specifying the overall job state.
-	State JobStatus_State `protobuf:"varint,1,opt,name=state,enum=google.cloud.dataproc.v1beta2.JobStatus_State" json:"state,omitempty"`
-	// Output-only. Optional job state details, such as an error
+	// Output only. A state message specifying the overall job state.
+	State JobStatus_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.dataproc.v1beta2.JobStatus_State" json:"state,omitempty"`
+	// Output only. Optional job state details, such as an error
 	// description if the state is <code>ERROR</code>.
-	Details string `protobuf:"bytes,2,opt,name=details" json:"details,omitempty"`
-	// Output-only. The time when this state was entered.
-	StateStartTime *google_protobuf5.Timestamp `protobuf:"bytes,6,opt,name=state_start_time,json=stateStartTime" json:"state_start_time,omitempty"`
-	// Output-only. Additional state information, which includes
+	Details string `protobuf:"bytes,2,opt,name=details,proto3" json:"details,omitempty"`
+	// Output only. The time when this state was entered.
+	StateStartTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
+	// Output only. Additional state information, which includes
 	// status reported by the agent.
-	Substate JobStatus_Substate `protobuf:"varint,7,opt,name=substate,enum=google.cloud.dataproc.v1beta2.JobStatus_Substate" json:"substate,omitempty"`
+	Substate             JobStatus_Substate `protobuf:"varint,7,opt,name=substate,proto3,enum=google.cloud.dataproc.v1beta2.JobStatus_Substate" json:"substate,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *JobStatus) Reset()                    { *m = JobStatus{} }
-func (m *JobStatus) String() string            { return proto.CompactTextString(m) }
-func (*JobStatus) ProtoMessage()               {}
-func (*JobStatus) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+func (m *JobStatus) Reset()         { *m = JobStatus{} }
+func (m *JobStatus) String() string { return proto.CompactTextString(m) }
+func (*JobStatus) ProtoMessage()    {}
+func (*JobStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{9}
+}
+func (m *JobStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobStatus.Unmarshal(m, b)
+}
+func (m *JobStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobStatus.Marshal(b, m, deterministic)
+}
+func (dst *JobStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobStatus.Merge(dst, src)
+}
+func (m *JobStatus) XXX_Size() int {
+	return xxx_messageInfo_JobStatus.Size(m)
+}
+func (m *JobStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobStatus proto.InternalMessageInfo
 
 func (m *JobStatus) GetState() JobStatus_State {
 	if m != nil {
@@ -1336,7 +1582,7 @@ func (m *JobStatus) GetDetails() string {
 	return ""
 }
 
-func (m *JobStatus) GetStateStartTime() *google_protobuf5.Timestamp {
+func (m *JobStatus) GetStateStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StateStartTime
 	}
@@ -1354,19 +1600,41 @@ func (m *JobStatus) GetSubstate() JobStatus_Substate {
 type JobReference struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Optional. The job ID, which must be unique within the project. The job ID
 	// is generated by the server upon job submission or provided by the user as a
 	// means to perform retries without creating duplicate jobs. The ID must
 	// contain only letters (a-z, A-Z), numbers (0-9), underscores (_), or
 	// hyphens (-). The maximum length is 100 characters.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *JobReference) Reset()                    { *m = JobReference{} }
-func (m *JobReference) String() string            { return proto.CompactTextString(m) }
-func (*JobReference) ProtoMessage()               {}
-func (*JobReference) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *JobReference) Reset()         { *m = JobReference{} }
+func (m *JobReference) String() string { return proto.CompactTextString(m) }
+func (*JobReference) ProtoMessage()    {}
+func (*JobReference) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{10}
+}
+func (m *JobReference) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobReference.Unmarshal(m, b)
+}
+func (m *JobReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobReference.Marshal(b, m, deterministic)
+}
+func (dst *JobReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobReference.Merge(dst, src)
+}
+func (m *JobReference) XXX_Size() int {
+	return xxx_messageInfo_JobReference.Size(m)
+}
+func (m *JobReference) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobReference.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobReference proto.InternalMessageInfo
 
 func (m *JobReference) GetProjectId() string {
 	if m != nil {
@@ -1389,22 +1657,44 @@ func (m *JobReference) GetJobId() string {
 // be changed before final release.
 type YarnApplication struct {
 	// Required. The application name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The application state.
-	State YarnApplication_State `protobuf:"varint,2,opt,name=state,enum=google.cloud.dataproc.v1beta2.YarnApplication_State" json:"state,omitempty"`
+	State YarnApplication_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.cloud.dataproc.v1beta2.YarnApplication_State" json:"state,omitempty"`
 	// Required. The numerical progress of the application, from 1 to 100.
-	Progress float32 `protobuf:"fixed32,3,opt,name=progress" json:"progress,omitempty"`
+	Progress float32 `protobuf:"fixed32,3,opt,name=progress,proto3" json:"progress,omitempty"`
 	// Optional. The HTTP URL of the ApplicationMaster, HistoryServer, or
 	// TimelineServer that provides application-specific information. The URL uses
 	// the internal hostname, and requires a proxy server for resolution and,
 	// possibly, access.
-	TrackingUrl string `protobuf:"bytes,4,opt,name=tracking_url,json=trackingUrl" json:"tracking_url,omitempty"`
+	TrackingUrl          string   `protobuf:"bytes,4,opt,name=tracking_url,json=trackingUrl,proto3" json:"tracking_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *YarnApplication) Reset()         { *m = YarnApplication{} }
+func (m *YarnApplication) String() string { return proto.CompactTextString(m) }
+func (*YarnApplication) ProtoMessage()    {}
+func (*YarnApplication) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{11}
+}
+func (m *YarnApplication) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_YarnApplication.Unmarshal(m, b)
+}
+func (m *YarnApplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_YarnApplication.Marshal(b, m, deterministic)
+}
+func (dst *YarnApplication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_YarnApplication.Merge(dst, src)
+}
+func (m *YarnApplication) XXX_Size() int {
+	return xxx_messageInfo_YarnApplication.Size(m)
+}
+func (m *YarnApplication) XXX_DiscardUnknown() {
+	xxx_messageInfo_YarnApplication.DiscardUnknown(m)
 }
 
-func (m *YarnApplication) Reset()                    { *m = YarnApplication{} }
-func (m *YarnApplication) String() string            { return proto.CompactTextString(m) }
-func (*YarnApplication) ProtoMessage()               {}
-func (*YarnApplication) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+var xxx_messageInfo_YarnApplication proto.InternalMessageInfo
 
 func (m *YarnApplication) GetName() string {
 	if m != nil {
@@ -1440,10 +1730,10 @@ type Job struct {
 	// obtain the equivalent REST path of the job resource. If this property
 	// is not specified when a job is created, the server generates a
 	// <code>job_id</code>.
-	Reference *JobReference `protobuf:"bytes,1,opt,name=reference" json:"reference,omitempty"`
+	Reference *JobReference `protobuf:"bytes,1,opt,name=reference,proto3" json:"reference,omitempty"`
 	// Required. Job information, including how, when, and where to
 	// run the job.
-	Placement *JobPlacement `protobuf:"bytes,2,opt,name=placement" json:"placement,omitempty"`
+	Placement *JobPlacement `protobuf:"bytes,2,opt,name=placement,proto3" json:"placement,omitempty"`
 	// Required. The application/framework-specific portion of the job.
 	//
 	// Types that are valid to be assigned to TypeJob:
@@ -1454,68 +1744,114 @@ type Job struct {
 	//	*Job_PigJob
 	//	*Job_SparkSqlJob
 	TypeJob isJob_TypeJob `protobuf_oneof:"type_job"`
-	// Output-only. The job status. Additional application-specific
+	// Output only. The job status. Additional application-specific
 	// status information may be contained in the <code>type_job</code>
 	// and <code>yarn_applications</code> fields.
-	Status *JobStatus `protobuf:"bytes,8,opt,name=status" json:"status,omitempty"`
-	// Output-only. The previous job status.
-	StatusHistory []*JobStatus `protobuf:"bytes,13,rep,name=status_history,json=statusHistory" json:"status_history,omitempty"`
-	// Output-only. The collection of YARN applications spun up by this job.
+	Status *JobStatus `protobuf:"bytes,8,opt,name=status,proto3" json:"status,omitempty"`
+	// Output only. The previous job status.
+	StatusHistory []*JobStatus `protobuf:"bytes,13,rep,name=status_history,json=statusHistory,proto3" json:"status_history,omitempty"`
+	// Output only. The collection of YARN applications spun up by this job.
 	//
 	// **Beta** Feature: This report is available for testing purposes only. It may
 	// be changed before final release.
-	YarnApplications []*YarnApplication `protobuf:"bytes,9,rep,name=yarn_applications,json=yarnApplications" json:"yarn_applications,omitempty"`
-	// Output-only. A URI pointing to the location of the stdout of the job's
+	YarnApplications []*YarnApplication `protobuf:"bytes,9,rep,name=yarn_applications,json=yarnApplications,proto3" json:"yarn_applications,omitempty"`
+	// Output only. A URI pointing to the location of the stdout of the job's
 	// driver program.
-	DriverOutputResourceUri string `protobuf:"bytes,17,opt,name=driver_output_resource_uri,json=driverOutputResourceUri" json:"driver_output_resource_uri,omitempty"`
-	// Output-only. If present, the location of miscellaneous control files
+	DriverOutputResourceUri string `protobuf:"bytes,17,opt,name=driver_output_resource_uri,json=driverOutputResourceUri,proto3" json:"driver_output_resource_uri,omitempty"`
+	// Output only. If present, the location of miscellaneous control files
 	// which may be used as part of job setup and handling. If not present,
 	// control files may be placed in the same location as `driver_output_uri`.
-	DriverControlFilesUri string `protobuf:"bytes,15,opt,name=driver_control_files_uri,json=driverControlFilesUri" json:"driver_control_files_uri,omitempty"`
+	DriverControlFilesUri string `protobuf:"bytes,15,opt,name=driver_control_files_uri,json=driverControlFilesUri,proto3" json:"driver_control_files_uri,omitempty"`
 	// Optional. The labels to associate with this job.
 	// Label **keys** must contain 1 to 63 characters, and must conform to
 	// [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	// Label **values** may be empty, but, if present, must contain 1 to 63
 	// characters, and must conform to [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	// No more than 32 labels can be associated with a job.
-	Labels map[string]string `protobuf:"bytes,18,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,18,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. Job scheduling configuration.
-	Scheduling *JobScheduling `protobuf:"bytes,20,opt,name=scheduling" json:"scheduling,omitempty"`
+	Scheduling           *JobScheduling `protobuf:"bytes,20,opt,name=scheduling,proto3" json:"scheduling,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *Job) Reset()         { *m = Job{} }
+func (m *Job) String() string { return proto.CompactTextString(m) }
+func (*Job) ProtoMessage()    {}
+func (*Job) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{12}
+}
+func (m *Job) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Job.Unmarshal(m, b)
+}
+func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
+}
+func (dst *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(dst, src)
+}
+func (m *Job) XXX_Size() int {
+	return xxx_messageInfo_Job.Size(m)
+}
+func (m *Job) XXX_DiscardUnknown() {
+	xxx_messageInfo_Job.DiscardUnknown(m)
 }
 
-func (m *Job) Reset()                    { *m = Job{} }
-func (m *Job) String() string            { return proto.CompactTextString(m) }
-func (*Job) ProtoMessage()               {}
-func (*Job) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+var xxx_messageInfo_Job proto.InternalMessageInfo
+
+func (m *Job) GetReference() *JobReference {
+	if m != nil {
+		return m.Reference
+	}
+	return nil
+}
+
+func (m *Job) GetPlacement() *JobPlacement {
+	if m != nil {
+		return m.Placement
+	}
+	return nil
+}
 
 type isJob_TypeJob interface {
 	isJob_TypeJob()
 }
 
 type Job_HadoopJob struct {
-	HadoopJob *HadoopJob `protobuf:"bytes,3,opt,name=hadoop_job,json=hadoopJob,oneof"`
+	HadoopJob *HadoopJob `protobuf:"bytes,3,opt,name=hadoop_job,json=hadoopJob,proto3,oneof"`
 }
+
 type Job_SparkJob struct {
-	SparkJob *SparkJob `protobuf:"bytes,4,opt,name=spark_job,json=sparkJob,oneof"`
+	SparkJob *SparkJob `protobuf:"bytes,4,opt,name=spark_job,json=sparkJob,proto3,oneof"`
 }
+
 type Job_PysparkJob struct {
-	PysparkJob *PySparkJob `protobuf:"bytes,5,opt,name=pyspark_job,json=pysparkJob,oneof"`
+	PysparkJob *PySparkJob `protobuf:"bytes,5,opt,name=pyspark_job,json=pysparkJob,proto3,oneof"`
 }
+
 type Job_HiveJob struct {
-	HiveJob *HiveJob `protobuf:"bytes,6,opt,name=hive_job,json=hiveJob,oneof"`
+	HiveJob *HiveJob `protobuf:"bytes,6,opt,name=hive_job,json=hiveJob,proto3,oneof"`
 }
+
 type Job_PigJob struct {
-	PigJob *PigJob `protobuf:"bytes,7,opt,name=pig_job,json=pigJob,oneof"`
+	PigJob *PigJob `protobuf:"bytes,7,opt,name=pig_job,json=pigJob,proto3,oneof"`
 }
+
 type Job_SparkSqlJob struct {
-	SparkSqlJob *SparkSqlJob `protobuf:"bytes,12,opt,name=spark_sql_job,json=sparkSqlJob,oneof"`
+	SparkSqlJob *SparkSqlJob `protobuf:"bytes,12,opt,name=spark_sql_job,json=sparkSqlJob,proto3,oneof"`
 }
 
-func (*Job_HadoopJob) isJob_TypeJob()   {}
-func (*Job_SparkJob) isJob_TypeJob()    {}
-func (*Job_PysparkJob) isJob_TypeJob()  {}
-func (*Job_HiveJob) isJob_TypeJob()     {}
-func (*Job_PigJob) isJob_TypeJob()      {}
+func (*Job_HadoopJob) isJob_TypeJob() {}
+
+func (*Job_SparkJob) isJob_TypeJob() {}
+
+func (*Job_PysparkJob) isJob_TypeJob() {}
+
+func (*Job_HiveJob) isJob_TypeJob() {}
+
+func (*Job_PigJob) isJob_TypeJob() {}
+
 func (*Job_SparkSqlJob) isJob_TypeJob() {}
 
 func (m *Job) GetTypeJob() isJob_TypeJob {
@@ -1525,20 +1861,6 @@ func (m *Job) GetTypeJob() isJob_TypeJob {
 	return nil
 }
 
-func (m *Job) GetReference() *JobReference {
-	if m != nil {
-		return m.Reference
-	}
-	return nil
-}
-
-func (m *Job) GetPlacement() *JobPlacement {
-	if m != nil {
-		return m.Placement
-	}
-	return nil
-}
-
 func (m *Job) GetHadoopJob() *HadoopJob {
 	if x, ok := m.GetTypeJob().(*Job_HadoopJob); ok {
 		return x.HadoopJob
@@ -1745,32 +2067,32 @@ func _Job_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.TypeJob.(type) {
 	case *Job_HadoopJob:
 		s := proto.Size(x.HadoopJob)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_SparkJob:
 		s := proto.Size(x.SparkJob)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_PysparkJob:
 		s := proto.Size(x.PysparkJob)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_HiveJob:
 		s := proto.Size(x.HiveJob)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_PigJob:
 		s := proto.Size(x.PigJob)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_SparkSqlJob:
 		s := proto.Size(x.SparkSqlJob)
-		n += proto.SizeVarint(12<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1781,9 +2103,6 @@ func _Job_OneofSizer(msg proto.Message) (n int) {
 }
 
 // Job scheduling options.
-//
-// **Beta Feature**: These options are available for testing purposes only.
-// They may be changed before final release.
 type JobScheduling struct {
 	// Optional. Maximum number of times per hour a driver may be restarted as
 	// a result of driver terminating with non-zero code before job is
@@ -1793,13 +2112,35 @@ type JobScheduling struct {
 	// 4 times within 10 minute window.
 	//
 	// Maximum value is 10.
-	MaxFailuresPerHour int32 `protobuf:"varint,1,opt,name=max_failures_per_hour,json=maxFailuresPerHour" json:"max_failures_per_hour,omitempty"`
+	MaxFailuresPerHour   int32    `protobuf:"varint,1,opt,name=max_failures_per_hour,json=maxFailuresPerHour,proto3" json:"max_failures_per_hour,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *JobScheduling) Reset()         { *m = JobScheduling{} }
+func (m *JobScheduling) String() string { return proto.CompactTextString(m) }
+func (*JobScheduling) ProtoMessage()    {}
+func (*JobScheduling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{13}
+}
+func (m *JobScheduling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobScheduling.Unmarshal(m, b)
+}
+func (m *JobScheduling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobScheduling.Marshal(b, m, deterministic)
+}
+func (dst *JobScheduling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobScheduling.Merge(dst, src)
+}
+func (m *JobScheduling) XXX_Size() int {
+	return xxx_messageInfo_JobScheduling.Size(m)
+}
+func (m *JobScheduling) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobScheduling.DiscardUnknown(m)
 }
 
-func (m *JobScheduling) Reset()                    { *m = JobScheduling{} }
-func (m *JobScheduling) String() string            { return proto.CompactTextString(m) }
-func (*JobScheduling) ProtoMessage()               {}
-func (*JobScheduling) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+var xxx_messageInfo_JobScheduling proto.InternalMessageInfo
 
 func (m *JobScheduling) GetMaxFailuresPerHour() int32 {
 	if m != nil {
@@ -1812,17 +2153,51 @@ func (m *JobScheduling) GetMaxFailuresPerHour() int32 {
 type SubmitJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job resource.
-	Job *Job `protobuf:"bytes,2,opt,name=job" json:"job,omitempty"`
+	Job *Job `protobuf:"bytes,2,opt,name=job,proto3" json:"job,omitempty"`
+	// Optional. A unique id used to identify the request. If the server
+	// receives two [SubmitJobRequest][google.cloud.dataproc.v1beta2.SubmitJobRequest] requests  with the same
+	// id, then the second request will be ignored and the
+	// first [Job][google.cloud.dataproc.v1beta2.Job] created and stored in the backend
+	// is returned.
+	//
+	// It is recommended to always set this value to a
+	// [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
+	//
+	// The id must contain only letters (a-z, A-Z), numbers (0-9),
+	// underscores (_), and hyphens (-). The maximum length is 40 characters.
+	RequestId            string   `protobuf:"bytes,4,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SubmitJobRequest) Reset()         { *m = SubmitJobRequest{} }
+func (m *SubmitJobRequest) String() string { return proto.CompactTextString(m) }
+func (*SubmitJobRequest) ProtoMessage()    {}
+func (*SubmitJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{14}
+}
+func (m *SubmitJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SubmitJobRequest.Unmarshal(m, b)
+}
+func (m *SubmitJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SubmitJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *SubmitJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubmitJobRequest.Merge(dst, src)
+}
+func (m *SubmitJobRequest) XXX_Size() int {
+	return xxx_messageInfo_SubmitJobRequest.Size(m)
+}
+func (m *SubmitJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SubmitJobRequest.DiscardUnknown(m)
 }
 
-func (m *SubmitJobRequest) Reset()                    { *m = SubmitJobRequest{} }
-func (m *SubmitJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*SubmitJobRequest) ProtoMessage()               {}
-func (*SubmitJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+var xxx_messageInfo_SubmitJobRequest proto.InternalMessageInfo
 
 func (m *SubmitJobRequest) GetProjectId() string {
 	if m != nil {
@@ -1845,21 +2220,50 @@ func (m *SubmitJobRequest) GetJob() *Job {
 	return nil
 }
 
+func (m *SubmitJobRequest) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
 // A request to get the resource representation for a job in a project.
 type GetJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job ID.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
+func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
+func (*GetJobRequest) ProtoMessage()    {}
+func (*GetJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{15}
+}
+func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
+}
+func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+}
+func (m *GetJobRequest) XXX_Size() int {
+	return xxx_messageInfo_GetJobRequest.Size(m)
+}
+func (m *GetJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetJobRequest.DiscardUnknown(m)
 }
 
-func (m *GetJobRequest) Reset()                    { *m = GetJobRequest{} }
-func (m *GetJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetJobRequest) ProtoMessage()               {}
-func (*GetJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+var xxx_messageInfo_GetJobRequest proto.InternalMessageInfo
 
 func (m *GetJobRequest) GetProjectId() string {
 	if m != nil {
@@ -1886,22 +2290,22 @@ func (m *GetJobRequest) GetJobId() string {
 type ListJobsRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,6,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,6,opt,name=region,proto3" json:"region,omitempty"`
 	// Optional. The number of results to return in each response.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The page token, returned by a previous call, to request the
 	// next page of results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional. If set, the returned jobs list includes only jobs that were
 	// submitted to the named cluster.
-	ClusterName string `protobuf:"bytes,4,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,4,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Optional. Specifies enumerated categories of jobs to list.
 	// (default = match ALL jobs).
 	//
 	// If `filter` is provided, `jobStateMatcher` will be ignored.
-	JobStateMatcher ListJobsRequest_JobStateMatcher `protobuf:"varint,5,opt,name=job_state_matcher,json=jobStateMatcher,enum=google.cloud.dataproc.v1beta2.ListJobsRequest_JobStateMatcher" json:"job_state_matcher,omitempty"`
+	JobStateMatcher ListJobsRequest_JobStateMatcher `protobuf:"varint,5,opt,name=job_state_matcher,json=jobStateMatcher,proto3,enum=google.cloud.dataproc.v1beta2.ListJobsRequest_JobStateMatcher" json:"job_state_matcher,omitempty"`
 	// Optional. A filter constraining the jobs to list. Filters are
 	// case-sensitive and have the following syntax:
 	//
@@ -1916,13 +2320,35 @@ type ListJobsRequest struct {
 	// Example filter:
 	//
 	// status.state = ACTIVE AND labels.env = staging AND labels.starred = *
-	Filter string `protobuf:"bytes,7,opt,name=filter" json:"filter,omitempty"`
+	Filter               string   `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListJobsRequest) Reset()                    { *m = ListJobsRequest{} }
-func (m *ListJobsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListJobsRequest) ProtoMessage()               {}
-func (*ListJobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
+func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListJobsRequest) ProtoMessage()    {}
+func (*ListJobsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{16}
+}
+func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
+}
+func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+}
+func (m *ListJobsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListJobsRequest.Size(m)
+}
+func (m *ListJobsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListJobsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListJobsRequest proto.InternalMessageInfo
 
 func (m *ListJobsRequest) GetProjectId() string {
 	if m != nil {
@@ -1977,26 +2403,48 @@ func (m *ListJobsRequest) GetFilter() string {
 type UpdateJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,2,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,2,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job ID.
-	JobId string `protobuf:"bytes,3,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId string `protobuf:"bytes,3,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
 	// Required. The changes to the job.
-	Job *Job `protobuf:"bytes,4,opt,name=job" json:"job,omitempty"`
+	Job *Job `protobuf:"bytes,4,opt,name=job,proto3" json:"job,omitempty"`
 	// Required. Specifies the path, relative to <code>Job</code>, of
 	// the field to update. For example, to update the labels of a Job the
 	// <code>update_mask</code> parameter would be specified as
 	// <code>labels</code>, and the `PATCH` request body would specify the new
 	// value. <strong>Note:</strong> Currently, <code>labels</code> is the only
 	// field that can be updated.
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateJobRequest) Reset()                    { *m = UpdateJobRequest{} }
-func (m *UpdateJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateJobRequest) ProtoMessage()               {}
-func (*UpdateJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+func (m *UpdateJobRequest) Reset()         { *m = UpdateJobRequest{} }
+func (m *UpdateJobRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateJobRequest) ProtoMessage()    {}
+func (*UpdateJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{17}
+}
+func (m *UpdateJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateJobRequest.Unmarshal(m, b)
+}
+func (m *UpdateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobRequest.Merge(dst, src)
+}
+func (m *UpdateJobRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateJobRequest.Size(m)
+}
+func (m *UpdateJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateJobRequest proto.InternalMessageInfo
 
 func (m *UpdateJobRequest) GetProjectId() string {
 	if m != nil {
@@ -2026,7 +2474,7 @@ func (m *UpdateJobRequest) GetJob() *Job {
 	return nil
 }
 
-func (m *UpdateJobRequest) GetUpdateMask() *google_protobuf4.FieldMask {
+func (m *UpdateJobRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -2035,18 +2483,40 @@ func (m *UpdateJobRequest) GetUpdateMask() *google_protobuf4.FieldMask {
 
 // A list of jobs in a project.
 type ListJobsResponse struct {
-	// Output-only. Jobs list.
-	Jobs []*Job `protobuf:"bytes,1,rep,name=jobs" json:"jobs,omitempty"`
+	// Output only. Jobs list.
+	Jobs []*Job `protobuf:"bytes,1,rep,name=jobs,proto3" json:"jobs,omitempty"`
 	// Optional. This token is included in the response if there are more results
 	// to fetch. To fetch additional results, provide this value as the
 	// `page_token` in a subsequent <code>ListJobsRequest</code>.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListJobsResponse) Reset()                    { *m = ListJobsResponse{} }
-func (m *ListJobsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListJobsResponse) ProtoMessage()               {}
-func (*ListJobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{18} }
+func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
+func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListJobsResponse) ProtoMessage()    {}
+func (*ListJobsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{18}
+}
+func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
+}
+func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+}
+func (m *ListJobsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListJobsResponse.Size(m)
+}
+func (m *ListJobsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListJobsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListJobsResponse proto.InternalMessageInfo
 
 func (m *ListJobsResponse) GetJobs() []*Job {
 	if m != nil {
@@ -2066,17 +2536,39 @@ func (m *ListJobsResponse) GetNextPageToken() string {
 type CancelJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job ID.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CancelJobRequest) Reset()         { *m = CancelJobRequest{} }
+func (m *CancelJobRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelJobRequest) ProtoMessage()    {}
+func (*CancelJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{19}
+}
+func (m *CancelJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelJobRequest.Unmarshal(m, b)
+}
+func (m *CancelJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelJobRequest.Merge(dst, src)
+}
+func (m *CancelJobRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelJobRequest.Size(m)
+}
+func (m *CancelJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelJobRequest.DiscardUnknown(m)
 }
 
-func (m *CancelJobRequest) Reset()                    { *m = CancelJobRequest{} }
-func (m *CancelJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelJobRequest) ProtoMessage()               {}
-func (*CancelJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{19} }
+var xxx_messageInfo_CancelJobRequest proto.InternalMessageInfo
 
 func (m *CancelJobRequest) GetProjectId() string {
 	if m != nil {
@@ -2103,17 +2595,39 @@ func (m *CancelJobRequest) GetJobId() string {
 type DeleteJobRequest struct {
 	// Required. The ID of the Google Cloud Platform project that the job
 	// belongs to.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. The Cloud Dataproc region in which to handle the request.
-	Region string `protobuf:"bytes,3,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,3,opt,name=region,proto3" json:"region,omitempty"`
 	// Required. The job ID.
-	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId                string   `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteJobRequest) Reset()                    { *m = DeleteJobRequest{} }
-func (m *DeleteJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteJobRequest) ProtoMessage()               {}
-func (*DeleteJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{20} }
+func (m *DeleteJobRequest) Reset()         { *m = DeleteJobRequest{} }
+func (m *DeleteJobRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteJobRequest) ProtoMessage()    {}
+func (*DeleteJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_jobs_2b4f6e28c2cc705f, []int{20}
+}
+func (m *DeleteJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteJobRequest.Unmarshal(m, b)
+}
+func (m *DeleteJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobRequest.Merge(dst, src)
+}
+func (m *DeleteJobRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteJobRequest.Size(m)
+}
+func (m *DeleteJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteJobRequest proto.InternalMessageInfo
 
 func (m *DeleteJobRequest) GetProjectId() string {
 	if m != nil {
@@ -2138,18 +2652,29 @@ func (m *DeleteJobRequest) GetJobId() string {
 
 func init() {
 	proto.RegisterType((*LoggingConfig)(nil), "google.cloud.dataproc.v1beta2.LoggingConfig")
+	proto.RegisterMapType((map[string]LoggingConfig_Level)(nil), "google.cloud.dataproc.v1beta2.LoggingConfig.DriverLogLevelsEntry")
 	proto.RegisterType((*HadoopJob)(nil), "google.cloud.dataproc.v1beta2.HadoopJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.HadoopJob.PropertiesEntry")
 	proto.RegisterType((*SparkJob)(nil), "google.cloud.dataproc.v1beta2.SparkJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.SparkJob.PropertiesEntry")
 	proto.RegisterType((*PySparkJob)(nil), "google.cloud.dataproc.v1beta2.PySparkJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.PySparkJob.PropertiesEntry")
 	proto.RegisterType((*QueryList)(nil), "google.cloud.dataproc.v1beta2.QueryList")
 	proto.RegisterType((*HiveJob)(nil), "google.cloud.dataproc.v1beta2.HiveJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.HiveJob.PropertiesEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.HiveJob.ScriptVariablesEntry")
 	proto.RegisterType((*SparkSqlJob)(nil), "google.cloud.dataproc.v1beta2.SparkSqlJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.SparkSqlJob.PropertiesEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.SparkSqlJob.ScriptVariablesEntry")
 	proto.RegisterType((*PigJob)(nil), "google.cloud.dataproc.v1beta2.PigJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.PigJob.PropertiesEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.PigJob.ScriptVariablesEntry")
 	proto.RegisterType((*JobPlacement)(nil), "google.cloud.dataproc.v1beta2.JobPlacement")
 	proto.RegisterType((*JobStatus)(nil), "google.cloud.dataproc.v1beta2.JobStatus")
 	proto.RegisterType((*JobReference)(nil), "google.cloud.dataproc.v1beta2.JobReference")
 	proto.RegisterType((*YarnApplication)(nil), "google.cloud.dataproc.v1beta2.YarnApplication")
 	proto.RegisterType((*Job)(nil), "google.cloud.dataproc.v1beta2.Job")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.Job.LabelsEntry")
 	proto.RegisterType((*JobScheduling)(nil), "google.cloud.dataproc.v1beta2.JobScheduling")
 	proto.RegisterType((*SubmitJobRequest)(nil), "google.cloud.dataproc.v1beta2.SubmitJobRequest")
 	proto.RegisterType((*GetJobRequest)(nil), "google.cloud.dataproc.v1beta2.GetJobRequest")
@@ -2173,8 +2698,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for JobController service
-
+// JobControllerClient is the client API for JobController service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type JobControllerClient interface {
 	// Submits a job to a cluster.
 	SubmitJob(ctx context.Context, in *SubmitJobRequest, opts ...grpc.CallOption) (*Job, error)
@@ -2191,7 +2717,7 @@ type JobControllerClient interface {
 	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*Job, error)
 	// Deletes the job from the project. If the job is active, the delete fails,
 	// and the response returns `FAILED_PRECONDITION`.
-	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type jobControllerClient struct {
@@ -2204,7 +2730,7 @@ func NewJobControllerClient(cc *grpc.ClientConn) JobControllerClient {
 
 func (c *jobControllerClient) SubmitJob(ctx context.Context, in *SubmitJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/SubmitJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/SubmitJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2213,7 +2739,7 @@ func (c *jobControllerClient) SubmitJob(ctx context.Context, in *SubmitJobReques
 
 func (c *jobControllerClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/GetJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/GetJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2222,7 +2748,7 @@ func (c *jobControllerClient) GetJob(ctx context.Context, in *GetJobRequest, opt
 
 func (c *jobControllerClient) ListJobs(ctx context.Context, in *ListJobsRequest, opts ...grpc.CallOption) (*ListJobsResponse, error) {
 	out := new(ListJobsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/ListJobs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/ListJobs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2231,7 +2757,7 @@ func (c *jobControllerClient) ListJobs(ctx context.Context, in *ListJobsRequest,
 
 func (c *jobControllerClient) UpdateJob(ctx context.Context, in *UpdateJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/UpdateJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/UpdateJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2240,24 +2766,23 @@ func (c *jobControllerClient) UpdateJob(ctx context.Context, in *UpdateJobReques
 
 func (c *jobControllerClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/CancelJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/CancelJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *jobControllerClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/DeleteJob", in, out, c.cc, opts...)
+func (c *jobControllerClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.JobController/DeleteJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for JobController service
-
+// JobControllerServer is the server API for JobController service.
 type JobControllerServer interface {
 	// Submits a job to a cluster.
 	SubmitJob(context.Context, *SubmitJobRequest) (*Job, error)
@@ -2274,7 +2799,7 @@ type JobControllerServer interface {
 	CancelJob(context.Context, *CancelJobRequest) (*Job, error)
 	// Deletes the job from the project. If the job is active, the delete fails,
 	// and the response returns `FAILED_PRECONDITION`.
-	DeleteJob(context.Context, *DeleteJobRequest) (*google_protobuf2.Empty, error)
+	DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error)
 }
 
 func RegisterJobControllerServer(s *grpc.Server, srv JobControllerServer) {
@@ -2422,152 +2947,155 @@ var _JobController_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dataproc/v1beta2/jobs.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dataproc/v1beta2/jobs.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 2294 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcd, 0x6f, 0xdb, 0xc8,
-	0x15, 0xb7, 0xbe, 0xc5, 0x27, 0x4b, 0xa6, 0x67, 0x93, 0xad, 0xa0, 0x74, 0xb1, 0x5e, 0x02, 0x9b,
-	0xba, 0xd9, 0x42, 0x42, 0xd4, 0x34, 0x9b, 0x4d, 0xba, 0xdd, 0xc8, 0x12, 0x15, 0xc9, 0x55, 0x64,
-	0x2d, 0x25, 0x25, 0xdd, 0x2d, 0x0a, 0x2e, 0x25, 0x8d, 0x65, 0xca, 0x14, 0xc9, 0x70, 0x48, 0x37,
-	0xda, 0x20, 0x28, 0xd0, 0x4b, 0x0f, 0x3d, 0xf6, 0x52, 0xa0, 0x40, 0x81, 0xde, 0xba, 0x40, 0x2f,
-	0xbd, 0xf6, 0x1f, 0x28, 0x7a, 0x69, 0x0f, 0xfb, 0x27, 0xb4, 0x87, 0x1e, 0x7b, 0xea, 0xb9, 0x98,
-	0x19, 0x52, 0x96, 0x64, 0x27, 0xa2, 0xe3, 0x7e, 0x65, 0x4f, 0x26, 0xdf, 0xd7, 0xbc, 0x99, 0xdf,
-	0x6f, 0xde, 0xbc, 0xa1, 0x0c, 0xbb, 0x63, 0xcb, 0x1a, 0x1b, 0xb8, 0x34, 0x34, 0x2c, 0x6f, 0x54,
-	0x1a, 0x69, 0xae, 0x66, 0x3b, 0xd6, 0xb0, 0x74, 0x72, 0x73, 0x80, 0x5d, 0xad, 0x5c, 0x9a, 0x58,
-	0x03, 0x52, 0xb4, 0x1d, 0xcb, 0xb5, 0xd0, 0x5b, 0xdc, 0xb2, 0xc8, 0x2c, 0x8b, 0x81, 0x65, 0xd1,
-	0xb7, 0x2c, 0x7c, 0xdd, 0x0f, 0xa4, 0xd9, 0x7a, 0x49, 0x33, 0x4d, 0xcb, 0xd5, 0x5c, 0xdd, 0x32,
-	0x7d, 0xe7, 0xc2, 0x35, 0x5f, 0xcb, 0xde, 0x06, 0xde, 0x61, 0x09, 0x4f, 0x6d, 0x77, 0xe6, 0x2b,
-	0x77, 0x56, 0x95, 0x87, 0x3a, 0x36, 0x46, 0xea, 0x54, 0x23, 0xc7, 0xbe, 0xc5, 0xdb, 0xab, 0x16,
-	0xae, 0x3e, 0xc5, 0xc4, 0xd5, 0xa6, 0x36, 0x37, 0x90, 0xfe, 0x1e, 0x85, 0x6c, 0xcb, 0x1a, 0x8f,
-	0x75, 0x73, 0x5c, 0xb5, 0xcc, 0x43, 0x7d, 0x8c, 0xa6, 0xb0, 0x3d, 0x72, 0xf4, 0x13, 0xec, 0xa8,
-	0x86, 0x35, 0x56, 0x0d, 0x7c, 0x82, 0x0d, 0x92, 0x8f, 0xee, 0xc4, 0x76, 0x33, 0xe5, 0x4a, 0xf1,
-	0xa5, 0x53, 0x29, 0x2e, 0x05, 0x2a, 0xd6, 0x58, 0x94, 0x96, 0x35, 0x6e, 0xb1, 0x18, 0xb2, 0xe9,
-	0x3a, 0x33, 0x65, 0x6b, 0xb4, 0x2c, 0x2d, 0x9c, 0xc0, 0x95, 0xf3, 0x0c, 0x91, 0x08, 0xb1, 0x63,
-	0x3c, 0xcb, 0x47, 0x76, 0x22, 0xbb, 0x82, 0x42, 0x1f, 0x51, 0x03, 0x12, 0x27, 0x9a, 0xe1, 0xe1,
-	0x7c, 0x74, 0x27, 0xb2, 0x9b, 0x2b, 0x97, 0x2f, 0x94, 0x0c, 0x0b, 0xad, 0xf0, 0x00, 0x77, 0xa3,
-	0x77, 0x22, 0x92, 0x0d, 0x09, 0x26, 0x43, 0x57, 0x61, 0xbb, 0x25, 0x3f, 0x92, 0x5b, 0x6a, 0xbf,
-	0xdd, 0xed, 0xc8, 0xd5, 0x66, 0xbd, 0x29, 0xd7, 0xc4, 0x0d, 0x94, 0x82, 0x58, 0xa5, 0xd5, 0x12,
-	0x23, 0x48, 0x80, 0x44, 0x4f, 0xa9, 0x54, 0x65, 0x31, 0x4a, 0x1f, 0x6b, 0xf2, 0x5e, 0xff, 0x81,
-	0x18, 0x43, 0x69, 0x88, 0x37, 0xdb, 0xf5, 0x03, 0x31, 0x4e, 0x9f, 0x1e, 0x57, 0x94, 0xb6, 0x98,
-	0xa0, 0x6a, 0x59, 0x51, 0x0e, 0x14, 0x31, 0x49, 0x1f, 0xeb, 0x95, 0x5e, 0xa5, 0x25, 0xa6, 0x68,
-	0xa0, 0x83, 0x7a, 0x5d, 0x4c, 0x4b, 0x7f, 0x8a, 0x81, 0xd0, 0xd0, 0x46, 0x96, 0x65, 0xef, 0x5b,
-	0x03, 0xf4, 0x1e, 0x6c, 0x4f, 0x35, 0xdd, 0x54, 0x27, 0x9a, 0xa3, 0x1e, 0xea, 0x06, 0x56, 0x3d,
-	0x47, 0xe7, 0xb3, 0x6d, 0x6c, 0x28, 0x39, 0xaa, 0xda, 0xd7, 0x9c, 0xba, 0x6e, 0xe0, 0xbe, 0xa3,
-	0xa3, 0xb7, 0x01, 0x98, 0xf1, 0xd0, 0xd0, 0x08, 0x61, 0xf3, 0xa7, 0x56, 0x02, 0x95, 0x55, 0xa9,
-	0x08, 0x21, 0x88, 0x6b, 0xce, 0x98, 0xe4, 0x63, 0x3b, 0xb1, 0x5d, 0x41, 0x61, 0xcf, 0x48, 0x82,
-	0xec, 0x62, 0x70, 0x92, 0x8f, 0x33, 0x65, 0x66, 0x32, 0x8f, 0x4b, 0xd0, 0x35, 0x10, 0x4e, 0xf5,
-	0x09, 0xa6, 0x4f, 0x1f, 0x06, 0xca, 0x77, 0x60, 0x53, 0x73, 0x86, 0x47, 0xfa, 0x89, 0xaf, 0x4f,
-	0x72, 0x7f, 0x5f, 0xc6, 0x4c, 0x7e, 0x00, 0x60, 0x3b, 0x96, 0x8d, 0x1d, 0x57, 0xc7, 0x24, 0x9f,
-	0x62, 0x2c, 0xb9, 0xb3, 0x06, 0x98, 0xf9, 0x1a, 0x14, 0x3b, 0x73, 0x57, 0x4e, 0x8e, 0x85, 0x58,
-	0xa8, 0x0b, 0x39, 0x83, 0x23, 0xa8, 0x0e, 0x19, 0x84, 0xf9, 0xf4, 0x4e, 0x64, 0x37, 0x53, 0xfe,
-	0xd6, 0x45, 0x60, 0x57, 0xb2, 0xc6, 0xe2, 0x6b, 0xe1, 0x43, 0xd8, 0x5a, 0x19, 0xf3, 0x1c, 0x9e,
-	0x5d, 0x59, 0xe4, 0x99, 0xb0, 0xc0, 0x99, 0xbd, 0x34, 0x24, 0x39, 0x7d, 0xa5, 0x3f, 0xc6, 0x20,
-	0xdd, 0xb5, 0x35, 0xe7, 0xf8, 0xab, 0x03, 0xe5, 0xe3, 0x73, 0xa0, 0x7c, 0x7f, 0xcd, 0x62, 0x07,
-	0x4b, 0xf0, 0x1a, 0x23, 0xf9, 0xe7, 0x18, 0x40, 0x67, 0x36, 0xc7, 0xb2, 0x04, 0x57, 0x18, 0x3c,
-	0xf6, 0xcc, 0x3d, 0xb2, 0xcc, 0x15, 0x38, 0x15, 0x86, 0x73, 0x87, 0xa9, 0x02, 0x3c, 0x03, 0xb8,
-	0xa2, 0x0b, 0x70, 0xed, 0x82, 0xb8, 0xe2, 0x1f, 0xc0, 0x99, 0xb3, 0x17, 0x9d, 0xff, 0x3b, 0xc0,
-	0x7e, 0x72, 0x0e, 0xb0, 0x1f, 0xac, 0x59, 0xfb, 0xd3, 0x15, 0x79, 0xdd, 0xa0, 0x95, 0xde, 0x05,
-	0xe1, 0x63, 0x0f, 0x3b, 0xb3, 0x96, 0x4e, 0x5c, 0x94, 0x87, 0xd4, 0x13, 0x0f, 0x3b, 0x74, 0xe2,
-	0x11, 0xb6, 0x32, 0xc1, 0xab, 0xf4, 0xeb, 0x38, 0xa4, 0x1a, 0xfa, 0x09, 0xa6, 0xa0, 0x5f, 0x87,
-	0x1c, 0x15, 0xcf, 0xce, 0xee, 0xde, 0x4d, 0x26, 0x0f, 0xb0, 0x6e, 0x02, 0x70, 0x3b, 0x43, 0x27,
-	0x2e, 0x1b, 0x39, 0x53, 0xde, 0x5d, 0x33, 0xd5, 0x79, 0x2e, 0x74, 0x97, 0x3f, 0x99, 0x27, 0x56,
-	0x84, 0x37, 0x86, 0x96, 0xe9, 0xea, 0xa6, 0x87, 0x55, 0xca, 0x13, 0x4d, 0x37, 0x3c, 0x07, 0xe7,
-	0x63, 0x3b, 0x91, 0xdd, 0xb4, 0xb2, 0x1d, 0xa8, 0x0e, 0xcc, 0x3a, 0x57, 0xa0, 0x43, 0x10, 0xc9,
-	0xd0, 0xd1, 0x6d, 0x57, 0x3d, 0xd1, 0x1c, 0x5d, 0x1b, 0x18, 0x98, 0x73, 0x25, 0x53, 0xbe, 0xb7,
-	0xae, 0xdc, 0xf2, 0x49, 0x16, 0xbb, 0xcc, 0xfd, 0x51, 0xe0, 0xed, 0x1f, 0xc7, 0x64, 0x59, 0x8a,
-	0x1e, 0x2d, 0x91, 0x25, 0xc1, 0x46, 0xb8, 0x1d, 0x72, 0x84, 0x97, 0x31, 0xe5, 0x0c, 0xd1, 0x93,
-	0x67, 0x88, 0x5e, 0xd8, 0x83, 0x2b, 0xe7, 0x25, 0x79, 0x11, 0xf4, 0x2f, 0x5b, 0x17, 0x84, 0x39,
-	0x5f, 0xa4, 0xbf, 0xc4, 0x21, 0xc3, 0x36, 0x41, 0xf7, 0x89, 0xf1, 0x3f, 0x22, 0xc9, 0xe4, 0x1c,
-	0xd0, 0x63, 0x0c, 0x92, 0x8f, 0xc2, 0x14, 0x66, 0x9e, 0x78, 0x48, 0xe0, 0x3f, 0x5d, 0x02, 0x9e,
-	0x53, 0xeb, 0xee, 0x05, 0x46, 0xb9, 0x10, 0xf8, 0x77, 0xce, 0x56, 0xb9, 0xb3, 0xa5, 0x24, 0x79,
-	0xf9, 0x52, 0xf2, 0xff, 0xc5, 0xa8, 0x7f, 0xc4, 0x21, 0xd9, 0xd1, 0xc7, 0xaf, 0x49, 0xc5, 0xc1,
-	0x2f, 0xac, 0x38, 0xeb, 0x68, 0xc1, 0xe7, 0x18, 0x92, 0x77, 0xfd, 0x73, 0x0a, 0xce, 0x77, 0xc2,
-	0x0d, 0x70, 0xc9, 0x7a, 0x73, 0x0e, 0xe5, 0x52, 0x5f, 0x35, 0xca, 0xf5, 0x60, 0x73, 0xdf, 0x1a,
-	0x74, 0x0c, 0x6d, 0x88, 0xa7, 0xd8, 0x74, 0x69, 0xbb, 0x30, 0x34, 0x3c, 0xe2, 0x62, 0x47, 0x35,
-	0xb5, 0x29, 0xf6, 0xe3, 0x65, 0x7c, 0x59, 0x5b, 0x9b, 0xe2, 0x45, 0x13, 0xcf, 0xd3, 0x47, 0x7e,
-	0xf8, 0xc0, 0xa4, 0xef, 0xe9, 0x23, 0xe9, 0x9f, 0x31, 0x10, 0xf6, 0xad, 0x41, 0xd7, 0xd5, 0x5c,
-	0x8f, 0xa0, 0x1a, 0x24, 0x88, 0xab, 0xb9, 0x3c, 0x58, 0xae, 0x5c, 0x5c, 0xb3, 0x7a, 0x73, 0xc7,
-	0x22, 0xfd, 0x83, 0x15, 0xee, 0x4c, 0x4f, 0xea, 0x11, 0x76, 0x35, 0xdd, 0xf0, 0x9b, 0x62, 0x25,
-	0x78, 0x45, 0x35, 0x10, 0x99, 0x89, 0x4a, 0x5c, 0xcd, 0x71, 0x55, 0x7a, 0x83, 0xf5, 0x6b, 0x43,
-	0x21, 0x18, 0x2a, 0xb8, 0xde, 0x16, 0x7b, 0xc1, 0xf5, 0x56, 0xc9, 0x31, 0x9f, 0x2e, 0x75, 0xa1,
-	0x42, 0xf4, 0x10, 0xd2, 0xc4, 0x1b, 0xf0, 0x44, 0x53, 0x2c, 0xd1, 0x9b, 0xe1, 0x13, 0xf5, 0x1d,
-	0x95, 0x79, 0x08, 0xe9, 0x8b, 0x08, 0x24, 0x58, 0xfe, 0xf4, 0xfe, 0xd8, 0xed, 0x55, 0x7a, 0xf2,
-	0xca, 0xfd, 0x31, 0x03, 0xa9, 0x8e, 0xdc, 0xae, 0x35, 0xdb, 0x0f, 0xc4, 0x08, 0xca, 0x01, 0x74,
-	0xe5, 0x5e, 0xbf, 0xa3, 0xd6, 0x0e, 0xda, 0xb2, 0x98, 0xa6, 0x4a, 0xa5, 0xdf, 0x6e, 0x53, 0x65,
-	0x14, 0x21, 0xc8, 0x55, 0x2b, 0xed, 0xaa, 0xdc, 0x52, 0x03, 0x87, 0xd8, 0x82, 0xac, 0xdb, 0xab,
-	0x28, 0x3d, 0xb9, 0x26, 0xa6, 0x50, 0x16, 0x04, 0x2e, 0x6b, 0xc9, 0x35, 0x7e, 0xef, 0x64, 0xd1,
-	0x96, 0xee, 0x9d, 0x6f, 0xc0, 0x56, 0xa5, 0xd7, 0x93, 0x1f, 0x76, 0x7a, 0x6a, 0xbd, 0xd2, 0x6c,
-	0xf5, 0x15, 0x59, 0x14, 0xa4, 0x06, 0xa4, 0x83, 0x19, 0xa0, 0x2d, 0xc8, 0x2c, 0xe7, 0x99, 0x05,
-	0xa1, 0xdb, 0xdf, 0x7b, 0xd8, 0xec, 0xd1, 0x41, 0x22, 0x08, 0x20, 0xf9, 0x71, 0x5f, 0xee, 0xcb,
-	0x35, 0x31, 0x8a, 0x44, 0xd8, 0xec, 0xf6, 0x2a, 0x2d, 0x99, 0xe6, 0xd0, 0xeb, 0x77, 0xc5, 0x98,
-	0x54, 0x63, 0x74, 0x52, 0xf0, 0x21, 0x76, 0xb0, 0x39, 0xc4, 0xe8, 0x2d, 0xb6, 0x79, 0x27, 0x78,
-	0xe8, 0xaa, 0xfa, 0xc8, 0x27, 0x93, 0xe0, 0x4b, 0x9a, 0x23, 0x74, 0x15, 0x92, 0x13, 0x6b, 0xa0,
-	0xce, 0x49, 0x94, 0x98, 0x58, 0x83, 0xe6, 0x48, 0xfa, 0x43, 0x14, 0xb6, 0x3e, 0xd1, 0x1c, 0xb3,
-	0x62, 0xdb, 0x86, 0x3e, 0x64, 0x9f, 0x3b, 0x68, 0x1b, 0xbd, 0x40, 0x48, 0xf6, 0x8c, 0xf6, 0x03,
-	0x62, 0xf1, 0x0b, 0xff, 0xad, 0x35, 0x78, 0xad, 0x84, 0x5c, 0xa6, 0x57, 0x01, 0xd2, 0xb6, 0x63,
-	0x8d, 0x1d, 0x4c, 0x08, 0x2b, 0x79, 0x51, 0x65, 0xfe, 0x4e, 0x19, 0xef, 0x3a, 0xda, 0xf0, 0x98,
-	0x16, 0x02, 0xcf, 0x31, 0xf2, 0x71, 0xce, 0xf8, 0x40, 0xd6, 0x77, 0x0c, 0xe9, 0x67, 0xeb, 0xe0,
-	0x4e, 0x41, 0xac, 0x2d, 0x3f, 0xe6, 0x50, 0xb7, 0xe5, 0xc7, 0x6a, 0xb7, 0xf2, 0x88, 0xa3, 0xbb,
-	0xb4, 0xbe, 0x31, 0xb4, 0x09, 0xe9, 0x4a, 0xb5, 0x2a, 0x77, 0x7a, 0x0c, 0xc3, 0x05, 0x1e, 0x24,
-	0xa8, 0xaa, 0xde, 0x6c, 0x37, 0xbb, 0x0d, 0xb9, 0x26, 0x26, 0x29, 0x10, 0x14, 0x41, 0x86, 0x3c,
-	0x40, 0xf2, 0xfb, 0x4d, 0x06, 0x7b, 0x5a, 0xfa, 0xa5, 0x00, 0x31, 0x7a, 0x82, 0x34, 0x41, 0x70,
-	0x02, 0x1c, 0xd8, 0xaa, 0x65, 0xca, 0xef, 0xad, 0x27, 0xf4, 0x1c, 0x3a, 0xe5, 0xd4, 0x9b, 0x86,
-	0xb2, 0x83, 0x0a, 0xe1, 0x9f, 0x31, 0x21, 0x42, 0xcd, 0x8b, 0x8a, 0x72, 0xea, 0x4d, 0xcf, 0xab,
-	0x23, 0x76, 0xbd, 0x57, 0x27, 0xd6, 0x80, 0x2d, 0xf4, 0xfa, 0xf3, 0x6a, 0xfe, 0x3d, 0x80, 0x9e,
-	0x57, 0x47, 0xf3, 0x0f, 0x24, 0x75, 0x10, 0x08, 0xed, 0x2f, 0x58, 0xa4, 0x38, 0x8b, 0xf4, 0x8d,
-	0x90, 0xd7, 0xd1, 0xc6, 0x86, 0x92, 0x26, 0xc1, 0x8d, 0xae, 0x05, 0x19, 0x7b, 0x76, 0x1a, 0x29,
-	0xc1, 0x22, 0x7d, 0x33, 0xf4, 0xfd, 0xa7, 0xb1, 0xa1, 0x80, 0xef, 0x4f, 0xa3, 0x55, 0x21, 0xcd,
-	0x2e, 0x5b, 0x34, 0x14, 0x2f, 0x42, 0xd7, 0xc3, 0x75, 0xc7, 0x8d, 0x0d, 0x25, 0x75, 0xe4, 0xdf,
-	0x37, 0xee, 0x43, 0xca, 0xd6, 0xc7, 0x2c, 0x06, 0x3f, 0x71, 0xde, 0x0d, 0x75, 0xe0, 0x35, 0x36,
-	0x94, 0xa4, 0xcd, 0xfb, 0x87, 0x0e, 0x64, 0xf9, 0x94, 0xc8, 0x13, 0x83, 0xc5, 0xd9, 0x64, 0x71,
-	0x6e, 0x84, 0x6f, 0xd8, 0x1a, 0x1b, 0x4a, 0x86, 0x2c, 0xb4, 0xb7, 0xf7, 0x21, 0x49, 0x58, 0xb5,
-	0xf3, 0xaf, 0x70, 0xbb, 0x61, 0xab, 0xa3, 0xe2, 0xfb, 0xa1, 0x03, 0xc8, 0xf1, 0x27, 0xf5, 0x48,
-	0x27, 0xae, 0xe5, 0xcc, 0xf2, 0x59, 0x76, 0x9a, 0x87, 0x8f, 0x94, 0xe5, 0xfe, 0x0d, 0xee, 0x8e,
-	0x7e, 0x08, 0xdb, 0x33, 0xcd, 0x31, 0x55, 0xed, 0x74, 0x53, 0x93, 0xbc, 0xc0, 0x62, 0x16, 0x2f,
-	0x56, 0x0b, 0x14, 0x71, 0xb6, 0x2c, 0x20, 0xe8, 0x1e, 0x14, 0xfc, 0xcf, 0x9c, 0x96, 0xe7, 0xda,
-	0x9e, 0xab, 0x3a, 0x98, 0x58, 0x9e, 0x33, 0xe4, 0xdd, 0xd8, 0x36, 0x2b, 0x01, 0x5f, 0xe3, 0x16,
-	0x07, 0xcc, 0x40, 0xf1, 0xf5, 0xb4, 0x2d, 0x7b, 0x1f, 0xf2, 0xbe, 0x33, 0xed, 0x9b, 0x1c, 0xcb,
-	0x60, 0x8d, 0x06, 0x61, 0xae, 0x5b, 0xcc, 0xf5, 0x2a, 0xd7, 0x57, 0xb9, 0x9a, 0xb6, 0x1c, 0x84,
-	0x3a, 0xd6, 0x21, 0x69, 0x68, 0x03, 0x6c, 0x90, 0x3c, 0x0a, 0x35, 0x0f, 0xda, 0xe6, 0xb4, 0x98,
-	0x03, 0x6f, 0x71, 0x7c, 0x6f, 0xd4, 0x02, 0x20, 0xc3, 0x23, 0x3c, 0xf2, 0x0c, 0xdd, 0x1c, 0xe7,
-	0xaf, 0x84, 0x6a, 0x5b, 0xe8, 0x3a, 0xcf, 0x7d, 0x94, 0x05, 0xff, 0xc2, 0x07, 0x90, 0x59, 0x18,
-	0xe4, 0x42, 0xbd, 0x06, 0x40, 0xda, 0x9d, 0xd9, 0x6c, 0x3f, 0x48, 0x7b, 0x90, 0x5d, 0x1a, 0x03,
-	0xdd, 0x84, 0xab, 0x53, 0xed, 0x69, 0xd0, 0x6a, 0x12, 0xd5, 0xc6, 0x8e, 0x7a, 0x64, 0x79, 0x0e,
-	0x0b, 0x9d, 0x50, 0xd0, 0x54, 0x7b, 0xea, 0x77, 0x9b, 0xa4, 0x83, 0x9d, 0x86, 0xe5, 0x39, 0xd2,
-	0x4f, 0x40, 0xec, 0x7a, 0x83, 0xa9, 0xee, 0xb2, 0x62, 0xf5, 0xc4, 0xc3, 0xc4, 0x5d, 0x77, 0xca,
-	0xbc, 0x09, 0x49, 0x07, 0x8f, 0x75, 0xcb, 0x64, 0xf5, 0x46, 0x50, 0xfc, 0x37, 0x74, 0x0b, 0x62,
-	0x74, 0x67, 0xf0, 0x82, 0x26, 0x85, 0xa8, 0x8d, 0xd4, 0x5c, 0xfa, 0x11, 0x64, 0x1f, 0xe0, 0x7f,
-	0xc3, 0xe8, 0x2f, 0x38, 0xfb, 0xfe, 0x1a, 0x85, 0x2d, 0xda, 0x8e, 0xef, 0x5b, 0x03, 0x72, 0xe1,
-	0x11, 0x92, 0x4b, 0x23, 0x5c, 0x03, 0xc1, 0xd6, 0xc6, 0x58, 0x25, 0xfa, 0xe7, 0x1c, 0x98, 0x84,
-	0x92, 0xa6, 0x82, 0xae, 0xfe, 0x39, 0x3f, 0x99, 0xa9, 0xd2, 0xb5, 0x8e, 0x71, 0x90, 0x1a, 0x33,
-	0xef, 0x51, 0xc1, 0x99, 0x3e, 0x30, 0x7e, 0xb6, 0x0f, 0x9c, 0xc0, 0x36, 0x9d, 0x00, 0x6f, 0xbd,
-	0xa6, 0x9a, 0x3b, 0x3c, 0xc2, 0x0e, 0xab, 0x9e, 0xb9, 0xf2, 0xf7, 0xd6, 0x35, 0xc8, 0xcb, 0x13,
-	0x0c, 0x76, 0x38, 0x7e, 0xc8, 0xa3, 0x28, 0x5b, 0x93, 0x65, 0x01, 0x9d, 0xe2, 0xa1, 0x6e, 0xb8,
-	0xd8, 0x61, 0xf5, 0x50, 0x50, 0xfc, 0x37, 0xe9, 0x36, 0x6c, 0xad, 0xf8, 0x06, 0xdf, 0xe5, 0x37,
-	0xe8, 0xa1, 0x58, 0xa9, 0xf6, 0x9a, 0x8f, 0x64, 0xff, 0xd0, 0x3d, 0x68, 0xab, 0xfe, 0x7b, 0x54,
-	0xfa, 0x32, 0x02, 0x62, 0xdf, 0x1e, 0x69, 0x2e, 0x7e, 0x15, 0x20, 0xa3, 0x2f, 0x00, 0x32, 0xb6,
-	0x00, 0x64, 0xc0, 0xae, 0xf8, 0x85, 0xd8, 0x85, 0xee, 0x41, 0xc6, 0x63, 0x79, 0xb1, 0x1f, 0x69,
-	0xfc, 0xc3, 0xe8, 0x6c, 0x1b, 0x5b, 0xd7, 0xb1, 0x31, 0x7a, 0xa8, 0x91, 0x63, 0x05, 0xb8, 0x39,
-	0x7d, 0x96, 0x1c, 0x10, 0x4f, 0x57, 0x96, 0xd8, 0x96, 0x49, 0x30, 0xba, 0x0d, 0xf1, 0x89, 0x35,
-	0xe0, 0x5f, 0xb7, 0xc2, 0xe5, 0xc1, 0xec, 0xd1, 0x75, 0xd8, 0x32, 0xf1, 0x53, 0x57, 0x5d, 0x20,
-	0x09, 0x9f, 0x76, 0x96, 0x8a, 0x3b, 0x01, 0x51, 0xa4, 0xcf, 0x40, 0xac, 0x6a, 0xe6, 0x10, 0x1b,
-	0xff, 0xb1, 0x1d, 0xf1, 0x19, 0x88, 0x35, 0x6c, 0xe0, 0x57, 0x83, 0x2a, 0xcc, 0x08, 0xe5, 0x9f,
-	0xa7, 0x59, 0x61, 0xf2, 0x6b, 0xb1, 0x81, 0x1d, 0xf4, 0xdb, 0x08, 0x08, 0xf3, 0x32, 0x83, 0x4a,
-	0xeb, 0x4e, 0xcd, 0x95, 0x82, 0x54, 0x08, 0xb1, 0xcc, 0x52, 0xfd, 0xa7, 0x5f, 0xfe, 0xed, 0x17,
-	0xd1, 0xfb, 0xd2, 0xbd, 0xf9, 0x4f, 0x82, 0x7e, 0xfe, 0xa4, 0xf4, 0xec, 0x74, 0x6e, 0xcf, 0x4b,
-	0x3c, 0x75, 0x52, 0x7a, 0xc6, 0x1f, 0x9e, 0xb3, 0x5f, 0x0e, 0xef, 0x12, 0x36, 0xe4, 0xdd, 0xc8,
-	0x0d, 0xf4, 0x9b, 0x08, 0x24, 0x79, 0x41, 0x42, 0xeb, 0x0a, 0xfc, 0x52, 0xdd, 0x0a, 0x95, 0xa4,
-	0xcc, 0x92, 0xfc, 0x08, 0x7d, 0xf8, 0x2a, 0x49, 0x96, 0x9e, 0xf1, 0xc5, 0x7e, 0x8e, 0xbe, 0x88,
-	0x40, 0x3a, 0x60, 0x26, 0x2a, 0x5e, 0xac, 0x38, 0x14, 0x4a, 0xa1, 0xed, 0x39, 0xe5, 0xa5, 0xef,
-	0xb2, 0xa4, 0x6f, 0xa3, 0x5b, 0xaf, 0x92, 0x34, 0xfa, 0x5d, 0x04, 0x84, 0x79, 0x69, 0x58, 0x0b,
-	0xfd, 0x6a, 0x11, 0x09, 0xb5, 0xaa, 0xfb, 0x2c, 0xc1, 0x5a, 0xf9, 0x72, 0xab, 0x7a, 0x97, 0x15,
-	0x8c, 0xdf, 0x47, 0x40, 0x98, 0x6f, 0xc0, 0xb5, 0xe9, 0xae, 0x6e, 0xd5, 0x50, 0xe9, 0x1e, 0xb0,
-	0x74, 0x9b, 0x52, 0xed, 0x72, 0xe9, 0x0e, 0xd9, 0xd8, 0x94, 0xb2, 0xbf, 0x8a, 0x80, 0x30, 0xdf,
-	0xd2, 0x6b, 0x73, 0x5e, 0xdd, 0xfc, 0x85, 0x37, 0xcf, 0x94, 0x43, 0x79, 0x6a, 0xbb, 0xb3, 0x80,
-	0xac, 0x37, 0x2e, 0xb7, 0xac, 0x7b, 0x3f, 0x86, 0x77, 0x86, 0xd6, 0xf4, 0xe5, 0x49, 0xed, 0x09,
-	0x94, 0x71, 0x1d, 0x3a, 0x7e, 0x27, 0xf2, 0xa9, 0xec, 0xdb, 0x8e, 0x2d, 0x43, 0x33, 0xc7, 0x45,
-	0xcb, 0x19, 0x97, 0xc6, 0xd8, 0x64, 0xd9, 0x95, 0xb8, 0x4a, 0xb3, 0x75, 0xf2, 0x82, 0xff, 0x04,
-	0xb8, 0x17, 0x08, 0x06, 0x49, 0xe6, 0xf1, 0xed, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x83,
-	0x17, 0x31, 0x3a, 0x20, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/jobs.proto", fileDescriptor_jobs_2b4f6e28c2cc705f)
+}
+
+var fileDescriptor_jobs_2b4f6e28c2cc705f = []byte{
+	// 2306 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcd, 0x73, 0xdb, 0xc6,
+	0x15, 0x17, 0xbf, 0x89, 0x47, 0x7d, 0x40, 0x1b, 0x3b, 0xe5, 0x30, 0xcd, 0x44, 0xc1, 0x4c, 0x52,
+	0x35, 0xe9, 0x90, 0x13, 0xd6, 0x75, 0x1c, 0xbb, 0x69, 0x4c, 0x91, 0xa0, 0x49, 0x95, 0xa6, 0x18,
+	0x90, 0xb4, 0x9b, 0x74, 0x3a, 0x08, 0x48, 0xae, 0x28, 0x48, 0x20, 0x00, 0xef, 0x02, 0xaa, 0x19,
+	0x8f, 0x2f, 0xbd, 0xf4, 0xd0, 0x63, 0x2f, 0x9d, 0xe9, 0x4c, 0x66, 0x7a, 0x6b, 0x66, 0x7a, 0xe9,
+	0xb5, 0xff, 0x40, 0xa7, 0x97, 0xf6, 0x90, 0x3f, 0xa1, 0x3d, 0xf4, 0xd8, 0x53, 0xcf, 0x9d, 0xdd,
+	0x05, 0x28, 0x92, 0x92, 0x4d, 0xc8, 0xea, 0x97, 0x73, 0x12, 0xf0, 0xbe, 0xf6, 0xed, 0xfe, 0x7e,
+	0xfb, 0xf6, 0x2d, 0x28, 0xd8, 0x1d, 0x3b, 0xce, 0xd8, 0xc2, 0xa5, 0xa1, 0xe5, 0xf8, 0xa3, 0xd2,
+	0xc8, 0xf0, 0x0c, 0x97, 0x38, 0xc3, 0xd2, 0xe9, 0x7b, 0x03, 0xec, 0x19, 0xe5, 0xd2, 0xb1, 0x33,
+	0xa0, 0x45, 0x97, 0x38, 0x9e, 0x83, 0x5e, 0x17, 0x96, 0x45, 0x6e, 0x59, 0x0c, 0x2d, 0x8b, 0x81,
+	0x65, 0xe1, 0x9b, 0x41, 0x20, 0xc3, 0x35, 0x4b, 0x86, 0x6d, 0x3b, 0x9e, 0xe1, 0x99, 0x8e, 0x1d,
+	0x38, 0x17, 0x5e, 0x0b, 0xb4, 0xfc, 0x6d, 0xe0, 0x1f, 0x96, 0xf0, 0xc4, 0xf5, 0xa6, 0x81, 0x72,
+	0x67, 0x59, 0x79, 0x68, 0x62, 0x6b, 0xa4, 0x4f, 0x0c, 0x7a, 0x12, 0x58, 0xbc, 0xb1, 0x6c, 0xe1,
+	0x99, 0x13, 0x4c, 0x3d, 0x63, 0xe2, 0x0a, 0x03, 0xe5, 0xef, 0x71, 0xd8, 0x68, 0x39, 0xe3, 0xb1,
+	0x69, 0x8f, 0xab, 0x8e, 0x7d, 0x68, 0x8e, 0xd1, 0x04, 0xb6, 0x47, 0xc4, 0x3c, 0xc5, 0x44, 0xb7,
+	0x9c, 0xb1, 0x6e, 0xe1, 0x53, 0x6c, 0xd1, 0x7c, 0x7c, 0x27, 0xb1, 0x9b, 0x2b, 0x57, 0x8a, 0xcf,
+	0x9d, 0x4a, 0x71, 0x21, 0x50, 0xb1, 0xc6, 0xa3, 0xb4, 0x9c, 0x71, 0x8b, 0xc7, 0x50, 0x6d, 0x8f,
+	0x4c, 0xb5, 0xad, 0xd1, 0xa2, 0xb4, 0x70, 0x0a, 0xd7, 0x2e, 0x32, 0x44, 0x32, 0x24, 0x4e, 0xf0,
+	0x34, 0x1f, 0xdb, 0x89, 0xed, 0x4a, 0x1a, 0x7b, 0x44, 0x0d, 0x48, 0x9d, 0x1a, 0x96, 0x8f, 0xf3,
+	0xf1, 0x9d, 0xd8, 0xee, 0x66, 0xb9, 0x7c, 0xa9, 0x64, 0x78, 0x68, 0x4d, 0x04, 0xb8, 0x1d, 0xbf,
+	0x15, 0x53, 0x5c, 0x48, 0x71, 0x19, 0xba, 0x0e, 0xdb, 0x2d, 0xf5, 0x81, 0xda, 0xd2, 0xfb, 0xed,
+	0x6e, 0x47, 0xad, 0x36, 0xeb, 0x4d, 0xb5, 0x26, 0xaf, 0xa1, 0x0c, 0x24, 0x2a, 0xad, 0x96, 0x1c,
+	0x43, 0x12, 0xa4, 0x7a, 0x5a, 0xa5, 0xaa, 0xca, 0x71, 0xf6, 0x58, 0x53, 0xf7, 0xfa, 0xf7, 0xe4,
+	0x04, 0xca, 0x42, 0xb2, 0xd9, 0xae, 0x1f, 0xc8, 0x49, 0xf6, 0xf4, 0xb0, 0xa2, 0xb5, 0xe5, 0x14,
+	0x53, 0xab, 0x9a, 0x76, 0xa0, 0xc9, 0x69, 0xf6, 0x58, 0xaf, 0xf4, 0x2a, 0x2d, 0x39, 0xc3, 0x02,
+	0x1d, 0xd4, 0xeb, 0x72, 0x56, 0xf9, 0x53, 0x02, 0xa4, 0x86, 0x31, 0x72, 0x1c, 0x77, 0xdf, 0x19,
+	0xa0, 0x77, 0x61, 0x7b, 0x62, 0x98, 0xb6, 0x7e, 0x6c, 0x10, 0xfd, 0xd0, 0xb4, 0xb0, 0xee, 0x13,
+	0x53, 0xcc, 0xb6, 0xb1, 0xa6, 0x6d, 0x32, 0xd5, 0xbe, 0x41, 0xea, 0xa6, 0x85, 0xfb, 0xc4, 0x44,
+	0x6f, 0x00, 0x70, 0xe3, 0xa1, 0x65, 0x50, 0xca, 0xe7, 0xcf, 0xac, 0x24, 0x26, 0xab, 0x32, 0x11,
+	0x42, 0x90, 0x34, 0xc8, 0x98, 0xe6, 0x13, 0x3b, 0x89, 0x5d, 0x49, 0xe3, 0xcf, 0x48, 0x81, 0x8d,
+	0xf9, 0xe0, 0x34, 0x9f, 0xe4, 0xca, 0xdc, 0xf1, 0x2c, 0x2e, 0x45, 0xaf, 0x81, 0x74, 0xa6, 0x4f,
+	0x71, 0x7d, 0xf6, 0x30, 0x54, 0xbe, 0x09, 0xeb, 0x06, 0x19, 0x1e, 0x99, 0xa7, 0x81, 0x3e, 0x2d,
+	0xfc, 0x03, 0x19, 0x37, 0xf9, 0x11, 0x80, 0x4b, 0x1c, 0x17, 0x13, 0xcf, 0xc4, 0x34, 0x9f, 0xe1,
+	0x2c, 0xb9, 0xb5, 0x02, 0x98, 0xd9, 0x1a, 0x14, 0x3b, 0x33, 0x57, 0x41, 0x8e, 0xb9, 0x58, 0xa8,
+	0x0b, 0x9b, 0x96, 0x40, 0x50, 0x1f, 0x72, 0x08, 0xf3, 0xd9, 0x9d, 0xd8, 0x6e, 0xae, 0xfc, 0x9d,
+	0xcb, 0xc0, 0xae, 0x6d, 0x58, 0xf3, 0xaf, 0x85, 0x0f, 0x61, 0x6b, 0x69, 0xcc, 0x0b, 0x78, 0x76,
+	0x6d, 0x9e, 0x67, 0xd2, 0x1c, 0x67, 0xf6, 0xb2, 0x90, 0x16, 0xf4, 0x55, 0xfe, 0x98, 0x80, 0x6c,
+	0xd7, 0x35, 0xc8, 0xc9, 0xd7, 0x07, 0xca, 0x87, 0x17, 0x40, 0xf9, 0xfe, 0x8a, 0xc5, 0x0e, 0x97,
+	0xe0, 0x25, 0x46, 0xf2, 0xcf, 0x09, 0x80, 0xce, 0x74, 0x86, 0x65, 0x09, 0xae, 0x71, 0x78, 0xdc,
+	0xa9, 0x77, 0xe4, 0xd8, 0x4b, 0x70, 0x6a, 0x1c, 0xe7, 0x0e, 0x57, 0x85, 0x78, 0x86, 0x70, 0xc5,
+	0xe7, 0xe0, 0xda, 0x05, 0x79, 0xc9, 0x3f, 0x84, 0x73, 0xd3, 0x9d, 0x77, 0xfe, 0xef, 0x00, 0xfb,
+	0xc9, 0x05, 0xc0, 0x7e, 0xb0, 0x62, 0xed, 0xcf, 0x56, 0xe4, 0x65, 0x83, 0x56, 0x79, 0x0b, 0xa4,
+	0x8f, 0x7d, 0x4c, 0xa6, 0x2d, 0x93, 0x7a, 0x28, 0x0f, 0x99, 0x47, 0x3e, 0x26, 0x6c, 0xe2, 0x31,
+	0xbe, 0x32, 0xe1, 0xab, 0xf2, 0x45, 0x12, 0x32, 0x0d, 0xf3, 0x14, 0x33, 0xd0, 0xdf, 0x86, 0x4d,
+	0x26, 0x9e, 0x9e, 0xdf, 0xbd, 0xeb, 0x5c, 0x1e, 0x62, 0xdd, 0x04, 0x10, 0x76, 0x96, 0x49, 0x3d,
+	0x3e, 0x72, 0xae, 0xbc, 0xbb, 0x62, 0xaa, 0xb3, 0x5c, 0xd8, 0x2e, 0x7f, 0x34, 0x4b, 0xac, 0x08,
+	0xaf, 0x0c, 0x1d, 0xdb, 0x33, 0x6d, 0x1f, 0xeb, 0x8c, 0x27, 0x86, 0x69, 0xf9, 0x04, 0xe7, 0x13,
+	0x3b, 0xb1, 0xdd, 0xac, 0xb6, 0x1d, 0xaa, 0x0e, 0xec, 0xba, 0x50, 0xa0, 0x43, 0x90, 0xe9, 0x90,
+	0x98, 0xae, 0xa7, 0x9f, 0x1a, 0xc4, 0x34, 0x06, 0x16, 0x16, 0x5c, 0xc9, 0x95, 0xef, 0xac, 0x2a,
+	0xb7, 0x62, 0x92, 0xc5, 0x2e, 0x77, 0x7f, 0x10, 0x7a, 0x07, 0xc7, 0x31, 0x5d, 0x94, 0xa2, 0x07,
+	0x0b, 0x64, 0x49, 0xf1, 0x11, 0x6e, 0x46, 0x1c, 0xe1, 0x79, 0x4c, 0x39, 0x47, 0xf4, 0xf4, 0x39,
+	0xa2, 0x17, 0xf6, 0xe0, 0xda, 0x45, 0x49, 0x5e, 0x06, 0xfd, 0xab, 0xd6, 0x05, 0x69, 0xc6, 0x17,
+	0xe5, 0x2f, 0x49, 0xc8, 0xf1, 0x4d, 0xd0, 0x7d, 0x64, 0xfd, 0x8f, 0x48, 0x72, 0x7c, 0x01, 0xe8,
+	0x09, 0x0e, 0xc9, 0x47, 0x51, 0x0a, 0xb3, 0x48, 0x3c, 0x22, 0xf0, 0x9f, 0x2e, 0x00, 0x2f, 0xa8,
+	0x75, 0xfb, 0x12, 0xa3, 0x5c, 0x0a, 0xfc, 0x5b, 0xe7, 0xab, 0xdc, 0xf9, 0x52, 0x92, 0xbe, 0x7a,
+	0x29, 0xf9, 0xff, 0x62, 0xd4, 0x3f, 0x92, 0x90, 0xee, 0x98, 0xe3, 0x97, 0xa4, 0xe2, 0xe0, 0x67,
+	0x56, 0x9c, 0x55, 0xb4, 0x10, 0x73, 0x8c, 0xc8, 0xbb, 0xfe, 0x05, 0x05, 0xe7, 0x7b, 0xd1, 0x06,
+	0xb8, 0x62, 0xbd, 0xb9, 0x80, 0x72, 0x99, 0xaf, 0x1b, 0xe5, 0x7a, 0xb0, 0xbe, 0xef, 0x0c, 0x3a,
+	0x96, 0x31, 0xc4, 0x13, 0x6c, 0x7b, 0xac, 0x5d, 0x18, 0x5a, 0x3e, 0xf5, 0x30, 0xd1, 0x6d, 0x63,
+	0x82, 0x83, 0x78, 0xb9, 0x40, 0xd6, 0x36, 0x26, 0x78, 0xde, 0xc4, 0xf7, 0xcd, 0x51, 0x10, 0x3e,
+	0x34, 0xe9, 0xfb, 0xe6, 0x48, 0xf9, 0x67, 0x02, 0xa4, 0x7d, 0x67, 0xd0, 0xf5, 0x0c, 0xcf, 0xa7,
+	0xa8, 0x06, 0x29, 0xea, 0x19, 0x9e, 0x08, 0xb6, 0x59, 0x2e, 0xae, 0x58, 0xbd, 0x99, 0x63, 0x91,
+	0xfd, 0xc1, 0x9a, 0x70, 0x66, 0x27, 0xf5, 0x08, 0x7b, 0x86, 0x69, 0x05, 0x4d, 0xb1, 0x16, 0xbe,
+	0xa2, 0x1a, 0xc8, 0xdc, 0x44, 0xa7, 0x9e, 0x41, 0x3c, 0x9d, 0xdd, 0x60, 0x83, 0xda, 0x50, 0x08,
+	0x87, 0x0a, 0xaf, 0xb7, 0xc5, 0x5e, 0x78, 0xbd, 0xd5, 0x36, 0xb9, 0x4f, 0x97, 0xb9, 0x30, 0x21,
+	0xba, 0x0f, 0x59, 0xea, 0x0f, 0x44, 0xa2, 0x19, 0x9e, 0xe8, 0x7b, 0xd1, 0x13, 0x0d, 0x1c, 0xb5,
+	0x59, 0x08, 0xe5, 0xcb, 0x18, 0xa4, 0x78, 0xfe, 0xec, 0xfe, 0xd8, 0xed, 0x55, 0x7a, 0xea, 0xd2,
+	0xfd, 0x31, 0x07, 0x99, 0x8e, 0xda, 0xae, 0x35, 0xdb, 0xf7, 0xe4, 0x18, 0xda, 0x04, 0xe8, 0xaa,
+	0xbd, 0x7e, 0x47, 0xaf, 0x1d, 0xb4, 0x55, 0x39, 0xcb, 0x94, 0x5a, 0xbf, 0xdd, 0x66, 0xca, 0x38,
+	0x42, 0xb0, 0x59, 0xad, 0xb4, 0xab, 0x6a, 0x4b, 0x0f, 0x1d, 0x12, 0x73, 0xb2, 0x6e, 0xaf, 0xa2,
+	0xf5, 0xd4, 0x9a, 0x9c, 0x41, 0x1b, 0x20, 0x09, 0x59, 0x4b, 0xad, 0x89, 0x7b, 0x27, 0x8f, 0xb6,
+	0x70, 0xef, 0x7c, 0x05, 0xb6, 0x2a, 0xbd, 0x9e, 0x7a, 0xbf, 0xd3, 0xd3, 0xeb, 0x95, 0x66, 0xab,
+	0xaf, 0xa9, 0xb2, 0xa4, 0x34, 0x20, 0x1b, 0xce, 0x00, 0x6d, 0x41, 0x6e, 0x31, 0xcf, 0x0d, 0x90,
+	0xba, 0xfd, 0xbd, 0xfb, 0xcd, 0x1e, 0x1b, 0x24, 0x86, 0x00, 0xd2, 0x1f, 0xf7, 0xd5, 0xbe, 0x5a,
+	0x93, 0xe3, 0x48, 0x86, 0xf5, 0x6e, 0xaf, 0xd2, 0x52, 0x59, 0x0e, 0xbd, 0x7e, 0x57, 0x4e, 0x28,
+	0x35, 0x4e, 0x27, 0x0d, 0x1f, 0x62, 0x82, 0xed, 0x21, 0x46, 0xaf, 0xf3, 0xcd, 0x7b, 0x8c, 0x87,
+	0x9e, 0x6e, 0x8e, 0x02, 0x32, 0x49, 0x81, 0xa4, 0x39, 0x42, 0xd7, 0x21, 0x7d, 0xec, 0x0c, 0xf4,
+	0x19, 0x89, 0x52, 0xc7, 0xce, 0xa0, 0x39, 0x52, 0xfe, 0x10, 0x87, 0xad, 0x4f, 0x0c, 0x62, 0x57,
+	0x5c, 0xd7, 0x32, 0x87, 0xfc, 0x73, 0x07, 0x6b, 0xa3, 0xe7, 0x08, 0xc9, 0x9f, 0xd1, 0x7e, 0x48,
+	0x2c, 0x71, 0xe1, 0xbf, 0xb1, 0x02, 0xaf, 0xa5, 0x90, 0x8b, 0xf4, 0x2a, 0x40, 0xd6, 0x25, 0xce,
+	0x98, 0x60, 0x4a, 0x79, 0xc9, 0x8b, 0x6b, 0xb3, 0x77, 0xc6, 0x78, 0x8f, 0x18, 0xc3, 0x13, 0x56,
+	0x08, 0x7c, 0x62, 0xe5, 0x93, 0x82, 0xf1, 0xa1, 0xac, 0x4f, 0x2c, 0xe5, 0xe7, 0xab, 0xe0, 0xce,
+	0x40, 0xa2, 0xad, 0x3e, 0x14, 0x50, 0xb7, 0xd5, 0x87, 0x7a, 0xb7, 0xf2, 0x40, 0xa0, 0xbb, 0xb0,
+	0xbe, 0x09, 0xb4, 0x0e, 0xd9, 0x4a, 0xb5, 0xaa, 0x76, 0x7a, 0x1c, 0xc3, 0x39, 0x1e, 0xa4, 0x98,
+	0xaa, 0xde, 0x6c, 0x37, 0xbb, 0x0d, 0xb5, 0x26, 0xa7, 0x19, 0x10, 0x0c, 0x41, 0x8e, 0x3c, 0x40,
+	0xfa, 0x87, 0x4d, 0x0e, 0x7b, 0x56, 0xf9, 0x95, 0x04, 0x09, 0x76, 0x82, 0x34, 0x41, 0x22, 0x21,
+	0x0e, 0x7c, 0xd5, 0x72, 0xe5, 0x77, 0x57, 0x13, 0x7a, 0x06, 0x9d, 0x76, 0xe6, 0xcd, 0x42, 0xb9,
+	0x61, 0x85, 0x08, 0xce, 0x98, 0x08, 0xa1, 0x66, 0x45, 0x45, 0x3b, 0xf3, 0x66, 0xe7, 0xd5, 0x11,
+	0xbf, 0xde, 0xeb, 0xc7, 0xce, 0x80, 0x2f, 0xf4, 0xea, 0xf3, 0x6a, 0xf6, 0x3d, 0x80, 0x9d, 0x57,
+	0x47, 0xb3, 0x0f, 0x24, 0x75, 0x90, 0x28, 0xeb, 0x2f, 0x78, 0xa4, 0x24, 0x8f, 0xf4, 0xad, 0x88,
+	0xd7, 0xd1, 0xc6, 0x9a, 0x96, 0xa5, 0xe1, 0x8d, 0xae, 0x05, 0x39, 0x77, 0x7a, 0x16, 0x29, 0xc5,
+	0x23, 0x7d, 0x3b, 0xf2, 0xfd, 0xa7, 0xb1, 0xa6, 0x41, 0xe0, 0xcf, 0xa2, 0x55, 0x21, 0xcb, 0x2f,
+	0x5b, 0x2c, 0x94, 0x28, 0x42, 0x6f, 0x47, 0xeb, 0x8e, 0x1b, 0x6b, 0x5a, 0xe6, 0x28, 0xb8, 0x6f,
+	0xdc, 0x85, 0x8c, 0x6b, 0x8e, 0x79, 0x0c, 0x71, 0xe2, 0xbc, 0x15, 0xe9, 0xc0, 0x6b, 0xac, 0x69,
+	0x69, 0x57, 0xf4, 0x0f, 0x1d, 0xd8, 0x10, 0x53, 0xa2, 0x8f, 0x2c, 0x1e, 0x67, 0x9d, 0xc7, 0x79,
+	0x27, 0x7a, 0xc3, 0xd6, 0x58, 0xd3, 0x72, 0x74, 0xae, 0xbd, 0xbd, 0x0b, 0x69, 0xca, 0xab, 0x5d,
+	0x70, 0x85, 0xdb, 0x8d, 0x5a, 0x1d, 0xb5, 0xc0, 0x0f, 0x1d, 0xc0, 0xa6, 0x78, 0xd2, 0x8f, 0x4c,
+	0xea, 0x39, 0x64, 0x9a, 0xdf, 0xe0, 0xa7, 0x79, 0xf4, 0x48, 0x1b, 0xc2, 0xbf, 0x21, 0xdc, 0xd1,
+	0x8f, 0x61, 0x7b, 0x6a, 0x10, 0x5b, 0x37, 0xce, 0x36, 0x35, 0xcd, 0x4b, 0x3c, 0x66, 0xf1, 0x72,
+	0xb5, 0x40, 0x93, 0xa7, 0x8b, 0x02, 0x8a, 0xee, 0x40, 0x21, 0xf8, 0xcc, 0xe9, 0xf8, 0x9e, 0xeb,
+	0x7b, 0x3a, 0xc1, 0xd4, 0xf1, 0xc9, 0x50, 0x74, 0x63, 0xdb, 0xbc, 0x04, 0x7c, 0x43, 0x58, 0x1c,
+	0x70, 0x03, 0x2d, 0xd0, 0xb3, 0xb6, 0xec, 0x7d, 0xc8, 0x07, 0xce, 0xac, 0x6f, 0x22, 0x8e, 0xc5,
+	0x1b, 0x0d, 0xca, 0x5d, 0xb7, 0xb8, 0xeb, 0x75, 0xa1, 0xaf, 0x0a, 0x35, 0x6b, 0x39, 0x28, 0x73,
+	0xac, 0x43, 0xda, 0x32, 0x06, 0xd8, 0xa2, 0x79, 0x14, 0x69, 0x1e, 0xac, 0xcd, 0x69, 0x71, 0x07,
+	0xd1, 0xe2, 0x04, 0xde, 0xa8, 0x05, 0x40, 0x87, 0x47, 0x78, 0xe4, 0x5b, 0xa6, 0x3d, 0xce, 0x5f,
+	0x8b, 0xd4, 0xb6, 0xb0, 0x75, 0x9e, 0xf9, 0x68, 0x73, 0xfe, 0x85, 0x0f, 0x20, 0x37, 0x37, 0xc8,
+	0xa5, 0x7a, 0x0d, 0x80, 0xac, 0x37, 0x75, 0xf9, 0x7e, 0x50, 0xf6, 0x60, 0x63, 0x61, 0x0c, 0xf4,
+	0x1e, 0x5c, 0x9f, 0x18, 0x8f, 0xc3, 0x56, 0x93, 0xea, 0x2e, 0x26, 0xfa, 0x91, 0xe3, 0x13, 0x1e,
+	0x3a, 0xa5, 0xa1, 0x89, 0xf1, 0x38, 0xe8, 0x36, 0x69, 0x07, 0x93, 0x86, 0xe3, 0x13, 0xe5, 0x8b,
+	0x18, 0xc8, 0x5d, 0x7f, 0x30, 0x31, 0x3d, 0x5e, 0xad, 0x1e, 0xf9, 0x98, 0x7a, 0xab, 0x8e, 0x99,
+	0x57, 0x21, 0x4d, 0xf0, 0xd8, 0x74, 0x6c, 0x5e, 0x70, 0x24, 0x2d, 0x78, 0x43, 0x37, 0x20, 0xc1,
+	0xb6, 0x86, 0xa8, 0x68, 0x4a, 0x84, 0xe2, 0xc8, 0xcc, 0xd9, 0x60, 0x44, 0x8c, 0xcb, 0x06, 0x13,
+	0x67, 0x81, 0x14, 0x48, 0x9a, 0x23, 0xe5, 0x27, 0xb0, 0x71, 0x0f, 0xff, 0x1b, 0x92, 0x7b, 0xc6,
+	0xd9, 0xf8, 0xd7, 0x38, 0x6c, 0xb1, 0x76, 0x7d, 0xdf, 0x19, 0xd0, 0x4b, 0x8f, 0x90, 0x5e, 0x18,
+	0xe1, 0x35, 0x90, 0x5c, 0x63, 0x8c, 0x75, 0x6a, 0x7e, 0x2e, 0x80, 0x4b, 0x69, 0x59, 0x26, 0xe8,
+	0x9a, 0x9f, 0x8b, 0x93, 0x9b, 0x29, 0x3d, 0xe7, 0x04, 0x87, 0xa9, 0x71, 0xf3, 0x1e, 0x13, 0x9c,
+	0xeb, 0x13, 0x93, 0xe7, 0xfb, 0xc4, 0x63, 0xd8, 0x66, 0x13, 0x10, 0xad, 0xd9, 0xc4, 0xf0, 0x86,
+	0x47, 0x98, 0xf0, 0xea, 0xba, 0x59, 0xfe, 0xc1, 0xaa, 0x06, 0x7a, 0x71, 0x82, 0x61, 0x05, 0xc0,
+	0xf7, 0x45, 0x14, 0x6d, 0xeb, 0x78, 0x51, 0xc0, 0xa6, 0x78, 0x68, 0x5a, 0x1e, 0x26, 0xbc, 0x5e,
+	0x4a, 0x5a, 0xf0, 0xa6, 0xdc, 0x84, 0xad, 0x25, 0xdf, 0xf0, 0xbb, 0xfd, 0x1a, 0x3b, 0x34, 0x2b,
+	0xd5, 0x5e, 0xf3, 0x81, 0x1a, 0x1c, 0xca, 0x07, 0x6d, 0x3d, 0x78, 0x8f, 0x2b, 0x5f, 0xc5, 0x40,
+	0xee, 0xbb, 0x23, 0xc3, 0xc3, 0x2f, 0x02, 0x64, 0xfc, 0x19, 0x40, 0x26, 0xe6, 0x80, 0x0c, 0xc9,
+	0x97, 0xbc, 0x1c, 0xf9, 0xee, 0x40, 0xce, 0xe7, 0x79, 0xf1, 0x1f, 0x71, 0x82, 0xc3, 0xea, 0x7c,
+	0x9b, 0x5b, 0x37, 0xb1, 0x35, 0xba, 0x6f, 0xd0, 0x13, 0x0d, 0x84, 0x39, 0x7b, 0x56, 0x08, 0xc8,
+	0x67, 0x2b, 0x4b, 0x5d, 0xc7, 0xa6, 0x18, 0xdd, 0x84, 0xe4, 0xb1, 0x33, 0x10, 0x5f, 0xbf, 0xa2,
+	0xe5, 0xc1, 0xed, 0xd1, 0xdb, 0xb0, 0x65, 0xe3, 0xc7, 0x9e, 0x3e, 0x47, 0x12, 0x31, 0xed, 0x0d,
+	0x26, 0xee, 0x84, 0x44, 0x51, 0x3e, 0x03, 0xb9, 0x6a, 0xd8, 0x43, 0x6c, 0xfd, 0xc7, 0x76, 0xc4,
+	0x67, 0x20, 0xd7, 0xb0, 0x85, 0x5f, 0x0c, 0xaa, 0x28, 0x23, 0x94, 0x7f, 0x91, 0xe5, 0x85, 0x2b,
+	0xa8, 0xd5, 0x16, 0x26, 0xe8, 0xb7, 0x31, 0x90, 0x66, 0x55, 0x08, 0x95, 0x56, 0x9d, 0xaa, 0x4b,
+	0xf5, 0xaa, 0x10, 0x61, 0x99, 0x95, 0xfa, 0xcf, 0xbe, 0xfa, 0xdb, 0x2f, 0xe3, 0x77, 0x95, 0x3b,
+	0xb3, 0x9f, 0x0c, 0x83, 0xfc, 0x69, 0xe9, 0xc9, 0xd9, 0xdc, 0x9e, 0x96, 0x44, 0xea, 0xb4, 0xf4,
+	0x44, 0x3c, 0x3c, 0xe5, 0xbf, 0x2c, 0xde, 0xa6, 0x7c, 0xc8, 0xdb, 0xb1, 0x77, 0xd0, 0x6f, 0x62,
+	0x90, 0x16, 0x05, 0x09, 0xad, 0x3a, 0x00, 0x16, 0xea, 0x56, 0xa4, 0x24, 0x55, 0x9e, 0xe4, 0x47,
+	0xe8, 0xc3, 0x17, 0x49, 0xb2, 0xf4, 0x44, 0x2c, 0xf6, 0x53, 0xf4, 0x65, 0x0c, 0xb2, 0x21, 0x33,
+	0x51, 0xf1, 0x72, 0xc5, 0xa1, 0x50, 0x8a, 0x6c, 0x2f, 0x28, 0xaf, 0x7c, 0x9f, 0x27, 0x7d, 0x13,
+	0xdd, 0x78, 0x91, 0xa4, 0xd1, 0xef, 0x62, 0x20, 0xcd, 0x4a, 0xc3, 0x4a, 0xe8, 0x97, 0x8b, 0x48,
+	0xa4, 0x55, 0xdd, 0xe7, 0x09, 0xd6, 0xca, 0x57, 0x5b, 0xd5, 0xdb, 0xbc, 0x60, 0xfc, 0x3e, 0x06,
+	0xd2, 0x6c, 0x03, 0xae, 0x4c, 0x77, 0x79, 0xab, 0x46, 0x4a, 0xf7, 0x80, 0xa7, 0xdb, 0x54, 0x6a,
+	0x57, 0x4b, 0x77, 0xc8, 0xc7, 0x66, 0x94, 0xfd, 0x75, 0x0c, 0xa4, 0xd9, 0x96, 0x5e, 0x99, 0xf3,
+	0xf2, 0xe6, 0x2f, 0xbc, 0x7a, 0xae, 0x1c, 0xaa, 0x13, 0xd7, 0x9b, 0x86, 0x64, 0x7d, 0xe7, 0x6a,
+	0xcb, 0xba, 0xf7, 0x53, 0x78, 0x73, 0xe8, 0x4c, 0x9e, 0x9f, 0xd4, 0x9e, 0xc4, 0x18, 0xd7, 0x61,
+	0xe3, 0x77, 0x62, 0x9f, 0xaa, 0x81, 0xed, 0xd8, 0xb1, 0x0c, 0x7b, 0x5c, 0x74, 0xc8, 0xb8, 0x34,
+	0xc6, 0x36, 0xcf, 0xae, 0x24, 0x54, 0x86, 0x6b, 0xd2, 0x67, 0xfc, 0xa7, 0xc0, 0x9d, 0x50, 0x30,
+	0x48, 0x73, 0x8f, 0xef, 0xfe, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x78, 0x17, 0x92, 0x5a, 0x20,
+	0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/operations.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/operations.pb.go
index 55d5a6fa..407c6632 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/operations.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/operations.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/operations.proto
 
-package dataproc
+package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The operation state.
 type ClusterOperationStatus_State int32
 
@@ -45,25 +51,47 @@ func (x ClusterOperationStatus_State) String() string {
 	return proto.EnumName(ClusterOperationStatus_State_name, int32(x))
 }
 func (ClusterOperationStatus_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 0}
+	return fileDescriptor_operations_c7679a03af3a5604, []int{0, 0}
 }
 
 // The status of the operation.
 type ClusterOperationStatus struct {
-	// Output-only. A message containing the operation state.
-	State ClusterOperationStatus_State `protobuf:"varint,1,opt,name=state,enum=google.cloud.dataproc.v1beta2.ClusterOperationStatus_State" json:"state,omitempty"`
-	// Output-only. A message containing the detailed operation state.
-	InnerState string `protobuf:"bytes,2,opt,name=inner_state,json=innerState" json:"inner_state,omitempty"`
-	// Output-only.A message containing any operation metadata details.
-	Details string `protobuf:"bytes,3,opt,name=details" json:"details,omitempty"`
-	// Output-only. The time this state was entered.
-	StateStartTime *google_protobuf5.Timestamp `protobuf:"bytes,4,opt,name=state_start_time,json=stateStartTime" json:"state_start_time,omitempty"`
+	// Output only. A message containing the operation state.
+	State ClusterOperationStatus_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.dataproc.v1beta2.ClusterOperationStatus_State" json:"state,omitempty"`
+	// Output only. A message containing the detailed operation state.
+	InnerState string `protobuf:"bytes,2,opt,name=inner_state,json=innerState,proto3" json:"inner_state,omitempty"`
+	// Output only. A message containing any operation metadata details.
+	Details string `protobuf:"bytes,3,opt,name=details,proto3" json:"details,omitempty"`
+	// Output only. The time this state was entered.
+	StateStartTime       *timestamp.Timestamp `protobuf:"bytes,4,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *ClusterOperationStatus) Reset()         { *m = ClusterOperationStatus{} }
+func (m *ClusterOperationStatus) String() string { return proto.CompactTextString(m) }
+func (*ClusterOperationStatus) ProtoMessage()    {}
+func (*ClusterOperationStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_c7679a03af3a5604, []int{0}
+}
+func (m *ClusterOperationStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterOperationStatus.Unmarshal(m, b)
+}
+func (m *ClusterOperationStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterOperationStatus.Marshal(b, m, deterministic)
+}
+func (dst *ClusterOperationStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperationStatus.Merge(dst, src)
+}
+func (m *ClusterOperationStatus) XXX_Size() int {
+	return xxx_messageInfo_ClusterOperationStatus.Size(m)
+}
+func (m *ClusterOperationStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterOperationStatus.DiscardUnknown(m)
 }
 
-func (m *ClusterOperationStatus) Reset()                    { *m = ClusterOperationStatus{} }
-func (m *ClusterOperationStatus) String() string            { return proto.CompactTextString(m) }
-func (*ClusterOperationStatus) ProtoMessage()               {}
-func (*ClusterOperationStatus) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_ClusterOperationStatus proto.InternalMessageInfo
 
 func (m *ClusterOperationStatus) GetState() ClusterOperationStatus_State {
 	if m != nil {
@@ -86,7 +114,7 @@ func (m *ClusterOperationStatus) GetDetails() string {
 	return ""
 }
 
-func (m *ClusterOperationStatus) GetStateStartTime() *google_protobuf5.Timestamp {
+func (m *ClusterOperationStatus) GetStateStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StateStartTime
 	}
@@ -95,28 +123,50 @@ func (m *ClusterOperationStatus) GetStateStartTime() *google_protobuf5.Timestamp
 
 // Metadata describing the operation.
 type ClusterOperationMetadata struct {
-	// Output-only. Name of the cluster for the operation.
-	ClusterName string `protobuf:"bytes,7,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
-	// Output-only. Cluster UUID for the operation.
-	ClusterUuid string `protobuf:"bytes,8,opt,name=cluster_uuid,json=clusterUuid" json:"cluster_uuid,omitempty"`
-	// Output-only. Current operation status.
-	Status *ClusterOperationStatus `protobuf:"bytes,9,opt,name=status" json:"status,omitempty"`
-	// Output-only. The previous operation status.
-	StatusHistory []*ClusterOperationStatus `protobuf:"bytes,10,rep,name=status_history,json=statusHistory" json:"status_history,omitempty"`
-	// Output-only. The operation type.
-	OperationType string `protobuf:"bytes,11,opt,name=operation_type,json=operationType" json:"operation_type,omitempty"`
-	// Output-only. Short description of operation.
-	Description string `protobuf:"bytes,12,opt,name=description" json:"description,omitempty"`
-	// Output-only. Labels associated with the operation
-	Labels map[string]string `protobuf:"bytes,13,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Output-only. Errors encountered during operation execution.
-	Warnings []string `protobuf:"bytes,14,rep,name=warnings" json:"warnings,omitempty"`
-}
-
-func (m *ClusterOperationMetadata) Reset()                    { *m = ClusterOperationMetadata{} }
-func (m *ClusterOperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*ClusterOperationMetadata) ProtoMessage()               {}
-func (*ClusterOperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+	// Output only. Name of the cluster for the operation.
+	ClusterName string `protobuf:"bytes,7,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+	// Output only. Cluster UUID for the operation.
+	ClusterUuid string `protobuf:"bytes,8,opt,name=cluster_uuid,json=clusterUuid,proto3" json:"cluster_uuid,omitempty"`
+	// Output only. Current operation status.
+	Status *ClusterOperationStatus `protobuf:"bytes,9,opt,name=status,proto3" json:"status,omitempty"`
+	// Output only. The previous operation status.
+	StatusHistory []*ClusterOperationStatus `protobuf:"bytes,10,rep,name=status_history,json=statusHistory,proto3" json:"status_history,omitempty"`
+	// Output only. The operation type.
+	OperationType string `protobuf:"bytes,11,opt,name=operation_type,json=operationType,proto3" json:"operation_type,omitempty"`
+	// Output only. Short description of operation.
+	Description string `protobuf:"bytes,12,opt,name=description,proto3" json:"description,omitempty"`
+	// Output only. Labels associated with the operation
+	Labels map[string]string `protobuf:"bytes,13,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Output only. Errors encountered during operation execution.
+	Warnings             []string `protobuf:"bytes,14,rep,name=warnings,proto3" json:"warnings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClusterOperationMetadata) Reset()         { *m = ClusterOperationMetadata{} }
+func (m *ClusterOperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*ClusterOperationMetadata) ProtoMessage()    {}
+func (*ClusterOperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_c7679a03af3a5604, []int{1}
+}
+func (m *ClusterOperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterOperationMetadata.Unmarshal(m, b)
+}
+func (m *ClusterOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterOperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ClusterOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperationMetadata.Merge(dst, src)
+}
+func (m *ClusterOperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_ClusterOperationMetadata.Size(m)
+}
+func (m *ClusterOperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterOperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterOperationMetadata proto.InternalMessageInfo
 
 func (m *ClusterOperationMetadata) GetClusterName() string {
 	if m != nil {
@@ -177,12 +227,15 @@ func (m *ClusterOperationMetadata) GetWarnings() []string {
 func init() {
 	proto.RegisterType((*ClusterOperationStatus)(nil), "google.cloud.dataproc.v1beta2.ClusterOperationStatus")
 	proto.RegisterType((*ClusterOperationMetadata)(nil), "google.cloud.dataproc.v1beta2.ClusterOperationMetadata")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.ClusterOperationMetadata.LabelsEntry")
 	proto.RegisterEnum("google.cloud.dataproc.v1beta2.ClusterOperationStatus_State", ClusterOperationStatus_State_name, ClusterOperationStatus_State_value)
 }
 
-func init() { proto.RegisterFile("google/cloud/dataproc/v1beta2/operations.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/operations.proto", fileDescriptor_operations_c7679a03af3a5604)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_operations_c7679a03af3a5604 = []byte{
 	// 537 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5f, 0x8b, 0xd3, 0x4e,
 	0x14, 0xfd, 0xa5, 0xff, 0x7b, 0xb3, 0xed, 0xaf, 0x0c, 0x22, 0x43, 0x51, 0x36, 0x5b, 0x10, 0xfa,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/shared.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/shared.pb.go
new file mode 100644
index 00000000..cfbcc9be
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/shared.pb.go
@@ -0,0 +1,38 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dataproc/v1beta2/shared.proto
+
+package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+func init() {
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/shared.proto", fileDescriptor_shared_1a90796f4cca9aae)
+}
+
+var fileDescriptor_shared_1a90796f4cca9aae = []byte{
+	// 157 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x8e, 0xa1, 0x0e, 0x02, 0x31,
+	0x0c, 0x40, 0x83, 0x41, 0x1c, 0x0e, 0x49, 0x40, 0x60, 0x11, 0x6d, 0x00, 0x89, 0xbb, 0x04, 0x7f,
+	0x09, 0x0e, 0xd7, 0xdb, 0x96, 0xb2, 0x64, 0xac, 0xcb, 0x36, 0x48, 0xf8, 0x7b, 0xc2, 0xb6, 0x93,
+	0x9c, 0x6d, 0xdf, 0x7b, 0x6d, 0x77, 0x60, 0x11, 0x76, 0x06, 0x95, 0x93, 0x97, 0x46, 0x4d, 0x99,
+	0x42, 0x14, 0x85, 0xef, 0xe3, 0x68, 0x32, 0x9d, 0x30, 0x3d, 0x28, 0x1a, 0x0d, 0x21, 0x4a, 0x96,
+	0xf5, 0xae, 0xb2, 0x50, 0x58, 0x98, 0x58, 0x68, 0xec, 0x66, 0xdb, 0x52, 0x14, 0x2c, 0x92, 0xf7,
+	0x92, 0x29, 0x5b, 0xf1, 0xa9, 0xca, 0xfd, 0xa7, 0xdb, 0x2b, 0x79, 0xc2, 0x6c, 0xa2, 0x5f, 0xdd,
+	0xca, 0xbd, 0xe1, 0x67, 0x0c, 0x8b, 0xfb, 0xb5, 0xd1, 0x2c, 0x8e, 0x3c, 0x83, 0x44, 0x46, 0x36,
+	0xbe, 0xf4, 0xb0, 0xae, 0x28, 0xd8, 0xf4, 0xe7, 0xf7, 0xcb, 0x34, 0x18, 0x97, 0xc5, 0x38, 0x7f,
+	0x03, 0x00, 0x00, 0xff, 0xff, 0x63, 0xea, 0xb3, 0xa5, 0xec, 0x00, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
index 0ed6987a..2f826eee 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2/workflow_templates.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dataproc/v1beta2/workflow_templates.proto
 
-package dataproc
+package dataproc // import "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The operation state.
 type WorkflowMetadata_State int32
 
@@ -51,11 +57,15 @@ var WorkflowMetadata_State_value = map[string]int32{
 func (x WorkflowMetadata_State) String() string {
 	return proto.EnumName(WorkflowMetadata_State_name, int32(x))
 }
-func (WorkflowMetadata_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{5, 0} }
+func (WorkflowMetadata_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{5, 0}
+}
 
+// The workflow node state.
 type WorkflowNode_NodeState int32
 
 const (
+	// State is unspecified.
 	WorkflowNode_NODE_STATUS_UNSPECIFIED WorkflowNode_NodeState = 0
 	// The node is awaiting prerequisite node to finish.
 	WorkflowNode_BLOCKED WorkflowNode_NodeState = 1
@@ -90,16 +100,22 @@ var WorkflowNode_NodeState_value = map[string]int32{
 func (x WorkflowNode_NodeState) String() string {
 	return proto.EnumName(WorkflowNode_NodeState_name, int32(x))
 }
-func (WorkflowNode_NodeState) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{8, 0} }
+func (WorkflowNode_NodeState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{8, 0}
+}
 
 // A Cloud Dataproc workflow template resource.
 type WorkflowTemplate struct {
 	// Required. The template id.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	//
+	// The id must contain only letters (a-z, A-Z), numbers (0-9),
+	// underscores (_), and hyphens (-). Cannot begin or end with underscore
+	// or hyphen. Must consist of between 3 and 50 characters.
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// Output only. The "resource name" of the template, as described
 	// in https://cloud.google.com/apis/design/resource_names of the form
 	// `projects/{project_id}/regions/{region}/workflowTemplates/{template_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. Used to perform a consistent read-modify-write.
 	//
 	// This field should be left blank for a `CreateWorkflowTemplate` request. It
@@ -109,11 +125,11 @@ type WorkflowTemplate struct {
 	// the current template with the `version` field filled in with the
 	// current server version. The user updates other fields in the template,
 	// then returns it as part of the `UpdateWorkflowTemplate` request.
-	Version int32 `protobuf:"varint,3,opt,name=version" json:"version,omitempty"`
+	Version int32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
 	// Output only. The time template was created.
-	CreateTime *google_protobuf5.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time template was last updated.
-	UpdateTime *google_protobuf5.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. The labels to associate with this template. These labels
 	// will be propagated to all jobs and clusters created by the workflow
 	// instance.
@@ -126,17 +142,39 @@ type WorkflowTemplate struct {
 	// [RFC 1035](https://www.ietf.org/rfc/rfc1035.txt).
 	//
 	// No more than 32 labels can be associated with a template.
-	Labels map[string]string `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. WorkflowTemplate scheduling information.
-	Placement *WorkflowTemplatePlacement `protobuf:"bytes,7,opt,name=placement" json:"placement,omitempty"`
+	Placement *WorkflowTemplatePlacement `protobuf:"bytes,7,opt,name=placement,proto3" json:"placement,omitempty"`
 	// Required. The Directed Acyclic Graph of Jobs to submit.
-	Jobs []*OrderedJob `protobuf:"bytes,8,rep,name=jobs" json:"jobs,omitempty"`
+	Jobs                 []*OrderedJob `protobuf:"bytes,8,rep,name=jobs,proto3" json:"jobs,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *WorkflowTemplate) Reset()                    { *m = WorkflowTemplate{} }
-func (m *WorkflowTemplate) String() string            { return proto.CompactTextString(m) }
-func (*WorkflowTemplate) ProtoMessage()               {}
-func (*WorkflowTemplate) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (m *WorkflowTemplate) Reset()         { *m = WorkflowTemplate{} }
+func (m *WorkflowTemplate) String() string { return proto.CompactTextString(m) }
+func (*WorkflowTemplate) ProtoMessage()    {}
+func (*WorkflowTemplate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{0}
+}
+func (m *WorkflowTemplate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WorkflowTemplate.Unmarshal(m, b)
+}
+func (m *WorkflowTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WorkflowTemplate.Marshal(b, m, deterministic)
+}
+func (dst *WorkflowTemplate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowTemplate.Merge(dst, src)
+}
+func (m *WorkflowTemplate) XXX_Size() int {
+	return xxx_messageInfo_WorkflowTemplate.Size(m)
+}
+func (m *WorkflowTemplate) XXX_DiscardUnknown() {
+	xxx_messageInfo_WorkflowTemplate.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WorkflowTemplate proto.InternalMessageInfo
 
 func (m *WorkflowTemplate) GetId() string {
 	if m != nil {
@@ -159,14 +197,14 @@ func (m *WorkflowTemplate) GetVersion() int32 {
 	return 0
 }
 
-func (m *WorkflowTemplate) GetCreateTime() *google_protobuf5.Timestamp {
+func (m *WorkflowTemplate) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *WorkflowTemplate) GetUpdateTime() *google_protobuf5.Timestamp {
+func (m *WorkflowTemplate) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -198,29 +236,56 @@ func (m *WorkflowTemplate) GetJobs() []*OrderedJob {
 //
 // Either `managed_cluster` or `cluster_selector` is required.
 type WorkflowTemplatePlacement struct {
+	// Required. Specifies where workflow executes; either on a managed
+	// cluster or an existing cluster chosen by labels.
+	//
 	// Types that are valid to be assigned to Placement:
 	//	*WorkflowTemplatePlacement_ManagedCluster
 	//	*WorkflowTemplatePlacement_ClusterSelector
-	Placement isWorkflowTemplatePlacement_Placement `protobuf_oneof:"placement"`
+	Placement            isWorkflowTemplatePlacement_Placement `protobuf_oneof:"placement"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
+}
+
+func (m *WorkflowTemplatePlacement) Reset()         { *m = WorkflowTemplatePlacement{} }
+func (m *WorkflowTemplatePlacement) String() string { return proto.CompactTextString(m) }
+func (*WorkflowTemplatePlacement) ProtoMessage()    {}
+func (*WorkflowTemplatePlacement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{1}
+}
+func (m *WorkflowTemplatePlacement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WorkflowTemplatePlacement.Unmarshal(m, b)
+}
+func (m *WorkflowTemplatePlacement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WorkflowTemplatePlacement.Marshal(b, m, deterministic)
+}
+func (dst *WorkflowTemplatePlacement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowTemplatePlacement.Merge(dst, src)
+}
+func (m *WorkflowTemplatePlacement) XXX_Size() int {
+	return xxx_messageInfo_WorkflowTemplatePlacement.Size(m)
+}
+func (m *WorkflowTemplatePlacement) XXX_DiscardUnknown() {
+	xxx_messageInfo_WorkflowTemplatePlacement.DiscardUnknown(m)
 }
 
-func (m *WorkflowTemplatePlacement) Reset()                    { *m = WorkflowTemplatePlacement{} }
-func (m *WorkflowTemplatePlacement) String() string            { return proto.CompactTextString(m) }
-func (*WorkflowTemplatePlacement) ProtoMessage()               {}
-func (*WorkflowTemplatePlacement) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+var xxx_messageInfo_WorkflowTemplatePlacement proto.InternalMessageInfo
 
 type isWorkflowTemplatePlacement_Placement interface {
 	isWorkflowTemplatePlacement_Placement()
 }
 
 type WorkflowTemplatePlacement_ManagedCluster struct {
-	ManagedCluster *ManagedCluster `protobuf:"bytes,1,opt,name=managed_cluster,json=managedCluster,oneof"`
+	ManagedCluster *ManagedCluster `protobuf:"bytes,1,opt,name=managed_cluster,json=managedCluster,proto3,oneof"`
 }
+
 type WorkflowTemplatePlacement_ClusterSelector struct {
-	ClusterSelector *ClusterSelector `protobuf:"bytes,2,opt,name=cluster_selector,json=clusterSelector,oneof"`
+	ClusterSelector *ClusterSelector `protobuf:"bytes,2,opt,name=cluster_selector,json=clusterSelector,proto3,oneof"`
 }
 
-func (*WorkflowTemplatePlacement_ManagedCluster) isWorkflowTemplatePlacement_Placement()  {}
+func (*WorkflowTemplatePlacement_ManagedCluster) isWorkflowTemplatePlacement_Placement() {}
+
 func (*WorkflowTemplatePlacement_ClusterSelector) isWorkflowTemplatePlacement_Placement() {}
 
 func (m *WorkflowTemplatePlacement) GetPlacement() isWorkflowTemplatePlacement_Placement {
@@ -303,12 +368,12 @@ func _WorkflowTemplatePlacement_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Placement.(type) {
 	case *WorkflowTemplatePlacement_ManagedCluster:
 		s := proto.Size(x.ManagedCluster)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *WorkflowTemplatePlacement_ClusterSelector:
 		s := proto.Size(x.ClusterSelector)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -320,11 +385,15 @@ func _WorkflowTemplatePlacement_OneofSizer(msg proto.Message) (n int) {
 
 // Cluster that is managed by the workflow.
 type ManagedCluster struct {
-	// Required. The cluster name. Cluster names within a project must be
-	// unique. Names from deleted clusters can be reused.
-	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	// Required. The cluster name prefix. A unique cluster name will be formed by
+	// appending a random suffix.
+	//
+	// The name must contain only lower-case letters (a-z), numbers (0-9),
+	// and hyphens (-). Must begin with a letter. Cannot begin or end with
+	// hyphen. Must consist of between 2 and 35 characters.
+	ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
 	// Required. The cluster configuration.
-	Config *ClusterConfig `protobuf:"bytes,3,opt,name=config" json:"config,omitempty"`
+	Config *ClusterConfig `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"`
 	// Optional. The labels to associate with this cluster.
 	//
 	// Label keys must be between 1 and 63 characters long, and must conform to
@@ -334,14 +403,36 @@ type ManagedCluster struct {
 	// Label values must be between 1 and 63 characters long, and must conform to
 	// the following PCRE regular expression: [\p{Ll}\p{Lo}\p{N}_-]{0,63}
 	//
-	// No more than 64 labels can be associated with a given cluster.
-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// No more than 32 labels can be associated with a given cluster.
+	Labels               map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *ManagedCluster) Reset()         { *m = ManagedCluster{} }
+func (m *ManagedCluster) String() string { return proto.CompactTextString(m) }
+func (*ManagedCluster) ProtoMessage()    {}
+func (*ManagedCluster) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{2}
+}
+func (m *ManagedCluster) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ManagedCluster.Unmarshal(m, b)
+}
+func (m *ManagedCluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ManagedCluster.Marshal(b, m, deterministic)
+}
+func (dst *ManagedCluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManagedCluster.Merge(dst, src)
+}
+func (m *ManagedCluster) XXX_Size() int {
+	return xxx_messageInfo_ManagedCluster.Size(m)
+}
+func (m *ManagedCluster) XXX_DiscardUnknown() {
+	xxx_messageInfo_ManagedCluster.DiscardUnknown(m)
 }
 
-func (m *ManagedCluster) Reset()                    { *m = ManagedCluster{} }
-func (m *ManagedCluster) String() string            { return proto.CompactTextString(m) }
-func (*ManagedCluster) ProtoMessage()               {}
-func (*ManagedCluster) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
+var xxx_messageInfo_ManagedCluster proto.InternalMessageInfo
 
 func (m *ManagedCluster) GetClusterName() string {
 	if m != nil {
@@ -371,16 +462,38 @@ type ClusterSelector struct {
 	//
 	// If unspecified, the zone of the first cluster matching the selector
 	// is used.
-	Zone string `protobuf:"bytes,1,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,1,opt,name=zone,proto3" json:"zone,omitempty"`
 	// Required. The cluster labels. Cluster must have all labels
 	// to match.
-	ClusterLabels map[string]string `protobuf:"bytes,2,rep,name=cluster_labels,json=clusterLabels" json:"cluster_labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ClusterLabels        map[string]string `protobuf:"bytes,2,rep,name=cluster_labels,json=clusterLabels,proto3" json:"cluster_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *ClusterSelector) Reset()                    { *m = ClusterSelector{} }
-func (m *ClusterSelector) String() string            { return proto.CompactTextString(m) }
-func (*ClusterSelector) ProtoMessage()               {}
-func (*ClusterSelector) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{3} }
+func (m *ClusterSelector) Reset()         { *m = ClusterSelector{} }
+func (m *ClusterSelector) String() string { return proto.CompactTextString(m) }
+func (*ClusterSelector) ProtoMessage()    {}
+func (*ClusterSelector) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{3}
+}
+func (m *ClusterSelector) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterSelector.Unmarshal(m, b)
+}
+func (m *ClusterSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterSelector.Marshal(b, m, deterministic)
+}
+func (dst *ClusterSelector) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterSelector.Merge(dst, src)
+}
+func (m *ClusterSelector) XXX_Size() int {
+	return xxx_messageInfo_ClusterSelector.Size(m)
+}
+func (m *ClusterSelector) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterSelector.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterSelector proto.InternalMessageInfo
 
 func (m *ClusterSelector) GetZone() string {
 	if m != nil {
@@ -396,13 +509,20 @@ func (m *ClusterSelector) GetClusterLabels() map[string]string {
 	return nil
 }
 
+// A job executed by the workflow.
 type OrderedJob struct {
 	// Required. The step id. The id must be unique among all jobs
 	// within the template.
 	//
-	// The step id is used as prefix for job id, as job `workflow-step-id` label,
-	// and in prerequisite_step_ids field from other steps.
-	StepId string `protobuf:"bytes,1,opt,name=step_id,json=stepId" json:"step_id,omitempty"`
+	// The step id is used as prefix for job id, as job
+	// `goog-dataproc-workflow-step-id` label, and in
+	// [prerequisiteStepIds][google.cloud.dataproc.v1beta2.OrderedJob.prerequisite_step_ids] field from other
+	// steps.
+	//
+	// The id must contain only letters (a-z, A-Z), numbers (0-9),
+	// underscores (_), and hyphens (-). Cannot begin or end with underscore
+	// or hyphen. Must consist of between 3 and 50 characters.
+	StepId string `protobuf:"bytes,1,opt,name=step_id,json=stepId,proto3" json:"step_id,omitempty"`
 	// Required. The job definition.
 	//
 	// Types that are valid to be assigned to JobType:
@@ -422,48 +542,87 @@ type OrderedJob struct {
 	// Label values must be between 1 and 63 characters long, and must conform to
 	// the following regular expression: [\p{Ll}\p{Lo}\p{N}_-]{0,63}
 	//
-	// No more than 64 labels can be associated with a given job.
-	Labels map[string]string `protobuf:"bytes,8,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// No more than 32 labels can be associated with a given job.
+	Labels map[string]string `protobuf:"bytes,8,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. Job scheduling configuration.
-	Scheduling *JobScheduling `protobuf:"bytes,9,opt,name=scheduling" json:"scheduling,omitempty"`
+	Scheduling *JobScheduling `protobuf:"bytes,9,opt,name=scheduling,proto3" json:"scheduling,omitempty"`
 	// Optional. The optional list of prerequisite job step_ids.
 	// If not specified, the job will start at the beginning of workflow.
-	PrerequisiteStepIds []string `protobuf:"bytes,10,rep,name=prerequisite_step_ids,json=prerequisiteStepIds" json:"prerequisite_step_ids,omitempty"`
+	PrerequisiteStepIds  []string `protobuf:"bytes,10,rep,name=prerequisite_step_ids,json=prerequisiteStepIds,proto3" json:"prerequisite_step_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OrderedJob) Reset()         { *m = OrderedJob{} }
+func (m *OrderedJob) String() string { return proto.CompactTextString(m) }
+func (*OrderedJob) ProtoMessage()    {}
+func (*OrderedJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{4}
+}
+func (m *OrderedJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OrderedJob.Unmarshal(m, b)
+}
+func (m *OrderedJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OrderedJob.Marshal(b, m, deterministic)
+}
+func (dst *OrderedJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrderedJob.Merge(dst, src)
+}
+func (m *OrderedJob) XXX_Size() int {
+	return xxx_messageInfo_OrderedJob.Size(m)
+}
+func (m *OrderedJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_OrderedJob.DiscardUnknown(m)
 }
 
-func (m *OrderedJob) Reset()                    { *m = OrderedJob{} }
-func (m *OrderedJob) String() string            { return proto.CompactTextString(m) }
-func (*OrderedJob) ProtoMessage()               {}
-func (*OrderedJob) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{4} }
+var xxx_messageInfo_OrderedJob proto.InternalMessageInfo
+
+func (m *OrderedJob) GetStepId() string {
+	if m != nil {
+		return m.StepId
+	}
+	return ""
+}
 
 type isOrderedJob_JobType interface {
 	isOrderedJob_JobType()
 }
 
 type OrderedJob_HadoopJob struct {
-	HadoopJob *HadoopJob `protobuf:"bytes,2,opt,name=hadoop_job,json=hadoopJob,oneof"`
+	HadoopJob *HadoopJob `protobuf:"bytes,2,opt,name=hadoop_job,json=hadoopJob,proto3,oneof"`
 }
+
 type OrderedJob_SparkJob struct {
-	SparkJob *SparkJob `protobuf:"bytes,3,opt,name=spark_job,json=sparkJob,oneof"`
+	SparkJob *SparkJob `protobuf:"bytes,3,opt,name=spark_job,json=sparkJob,proto3,oneof"`
 }
+
 type OrderedJob_PysparkJob struct {
-	PysparkJob *PySparkJob `protobuf:"bytes,4,opt,name=pyspark_job,json=pysparkJob,oneof"`
+	PysparkJob *PySparkJob `protobuf:"bytes,4,opt,name=pyspark_job,json=pysparkJob,proto3,oneof"`
 }
+
 type OrderedJob_HiveJob struct {
-	HiveJob *HiveJob `protobuf:"bytes,5,opt,name=hive_job,json=hiveJob,oneof"`
+	HiveJob *HiveJob `protobuf:"bytes,5,opt,name=hive_job,json=hiveJob,proto3,oneof"`
 }
+
 type OrderedJob_PigJob struct {
-	PigJob *PigJob `protobuf:"bytes,6,opt,name=pig_job,json=pigJob,oneof"`
+	PigJob *PigJob `protobuf:"bytes,6,opt,name=pig_job,json=pigJob,proto3,oneof"`
 }
+
 type OrderedJob_SparkSqlJob struct {
-	SparkSqlJob *SparkSqlJob `protobuf:"bytes,7,opt,name=spark_sql_job,json=sparkSqlJob,oneof"`
+	SparkSqlJob *SparkSqlJob `protobuf:"bytes,7,opt,name=spark_sql_job,json=sparkSqlJob,proto3,oneof"`
 }
 
-func (*OrderedJob_HadoopJob) isOrderedJob_JobType()   {}
-func (*OrderedJob_SparkJob) isOrderedJob_JobType()    {}
-func (*OrderedJob_PysparkJob) isOrderedJob_JobType()  {}
-func (*OrderedJob_HiveJob) isOrderedJob_JobType()     {}
-func (*OrderedJob_PigJob) isOrderedJob_JobType()      {}
+func (*OrderedJob_HadoopJob) isOrderedJob_JobType() {}
+
+func (*OrderedJob_SparkJob) isOrderedJob_JobType() {}
+
+func (*OrderedJob_PysparkJob) isOrderedJob_JobType() {}
+
+func (*OrderedJob_HiveJob) isOrderedJob_JobType() {}
+
+func (*OrderedJob_PigJob) isOrderedJob_JobType() {}
+
 func (*OrderedJob_SparkSqlJob) isOrderedJob_JobType() {}
 
 func (m *OrderedJob) GetJobType() isOrderedJob_JobType {
@@ -473,13 +632,6 @@ func (m *OrderedJob) GetJobType() isOrderedJob_JobType {
 	return nil
 }
 
-func (m *OrderedJob) GetStepId() string {
-	if m != nil {
-		return m.StepId
-	}
-	return ""
-}
-
 func (m *OrderedJob) GetHadoopJob() *HadoopJob {
 	if x, ok := m.GetJobType().(*OrderedJob_HadoopJob); ok {
 		return x.HadoopJob
@@ -658,32 +810,32 @@ func _OrderedJob_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.JobType.(type) {
 	case *OrderedJob_HadoopJob:
 		s := proto.Size(x.HadoopJob)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *OrderedJob_SparkJob:
 		s := proto.Size(x.SparkJob)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *OrderedJob_PysparkJob:
 		s := proto.Size(x.PysparkJob)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *OrderedJob_HiveJob:
 		s := proto.Size(x.HiveJob)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *OrderedJob_PigJob:
 		s := proto.Size(x.PigJob)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *OrderedJob_SparkSqlJob:
 		s := proto.Size(x.SparkSqlJob)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -696,26 +848,50 @@ func _OrderedJob_OneofSizer(msg proto.Message) (n int) {
 // A Cloud Dataproc workflow template resource.
 type WorkflowMetadata struct {
 	// Output only. The "resource name" of the template.
-	Template string `protobuf:"bytes,1,opt,name=template" json:"template,omitempty"`
+	Template string `protobuf:"bytes,1,opt,name=template,proto3" json:"template,omitempty"`
 	// Output only. The version of template at the time of
 	// workflow instantiation.
-	Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"`
+	Version int32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`
 	// Output only. The create cluster operation metadata.
-	CreateCluster *ClusterOperation `protobuf:"bytes,3,opt,name=create_cluster,json=createCluster" json:"create_cluster,omitempty"`
+	CreateCluster *ClusterOperation `protobuf:"bytes,3,opt,name=create_cluster,json=createCluster,proto3" json:"create_cluster,omitempty"`
 	// Output only. The workflow graph.
-	Graph *WorkflowGraph `protobuf:"bytes,4,opt,name=graph" json:"graph,omitempty"`
+	Graph *WorkflowGraph `protobuf:"bytes,4,opt,name=graph,proto3" json:"graph,omitempty"`
 	// Output only. The delete cluster operation metadata.
-	DeleteCluster *ClusterOperation `protobuf:"bytes,5,opt,name=delete_cluster,json=deleteCluster" json:"delete_cluster,omitempty"`
+	DeleteCluster *ClusterOperation `protobuf:"bytes,5,opt,name=delete_cluster,json=deleteCluster,proto3" json:"delete_cluster,omitempty"`
 	// Output only. The workflow state.
-	State WorkflowMetadata_State `protobuf:"varint,6,opt,name=state,enum=google.cloud.dataproc.v1beta2.WorkflowMetadata_State" json:"state,omitempty"`
+	State WorkflowMetadata_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.cloud.dataproc.v1beta2.WorkflowMetadata_State" json:"state,omitempty"`
 	// Output only. The name of the managed cluster.
-	ClusterName string `protobuf:"bytes,7,opt,name=cluster_name,json=clusterName" json:"cluster_name,omitempty"`
+	ClusterName string `protobuf:"bytes,7,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+	// Map from parameter names to values that were used for those parameters.
+	Parameters           map[string]string `protobuf:"bytes,8,rep,name=parameters,proto3" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *WorkflowMetadata) Reset()                    { *m = WorkflowMetadata{} }
-func (m *WorkflowMetadata) String() string            { return proto.CompactTextString(m) }
-func (*WorkflowMetadata) ProtoMessage()               {}
-func (*WorkflowMetadata) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{5} }
+func (m *WorkflowMetadata) Reset()         { *m = WorkflowMetadata{} }
+func (m *WorkflowMetadata) String() string { return proto.CompactTextString(m) }
+func (*WorkflowMetadata) ProtoMessage()    {}
+func (*WorkflowMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{5}
+}
+func (m *WorkflowMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WorkflowMetadata.Unmarshal(m, b)
+}
+func (m *WorkflowMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WorkflowMetadata.Marshal(b, m, deterministic)
+}
+func (dst *WorkflowMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowMetadata.Merge(dst, src)
+}
+func (m *WorkflowMetadata) XXX_Size() int {
+	return xxx_messageInfo_WorkflowMetadata.Size(m)
+}
+func (m *WorkflowMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_WorkflowMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WorkflowMetadata proto.InternalMessageInfo
 
 func (m *WorkflowMetadata) GetTemplate() string {
 	if m != nil {
@@ -766,19 +942,49 @@ func (m *WorkflowMetadata) GetClusterName() string {
 	return ""
 }
 
+func (m *WorkflowMetadata) GetParameters() map[string]string {
+	if m != nil {
+		return m.Parameters
+	}
+	return nil
+}
+
+// The cluster operation triggered by a workflow.
 type ClusterOperation struct {
 	// Output only. The id of the cluster operation.
-	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,1,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// Output only. Error, if operation failed.
-	Error string `protobuf:"bytes,2,opt,name=error" json:"error,omitempty"`
+	Error string `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"`
 	// Output only. Indicates the operation is done.
-	Done bool `protobuf:"varint,3,opt,name=done" json:"done,omitempty"`
+	Done                 bool     `protobuf:"varint,3,opt,name=done,proto3" json:"done,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClusterOperation) Reset()         { *m = ClusterOperation{} }
+func (m *ClusterOperation) String() string { return proto.CompactTextString(m) }
+func (*ClusterOperation) ProtoMessage()    {}
+func (*ClusterOperation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{6}
+}
+func (m *ClusterOperation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterOperation.Unmarshal(m, b)
+}
+func (m *ClusterOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterOperation.Marshal(b, m, deterministic)
+}
+func (dst *ClusterOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterOperation.Merge(dst, src)
+}
+func (m *ClusterOperation) XXX_Size() int {
+	return xxx_messageInfo_ClusterOperation.Size(m)
+}
+func (m *ClusterOperation) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterOperation.DiscardUnknown(m)
 }
 
-func (m *ClusterOperation) Reset()                    { *m = ClusterOperation{} }
-func (m *ClusterOperation) String() string            { return proto.CompactTextString(m) }
-func (*ClusterOperation) ProtoMessage()               {}
-func (*ClusterOperation) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{6} }
+var xxx_messageInfo_ClusterOperation proto.InternalMessageInfo
 
 func (m *ClusterOperation) GetOperationId() string {
 	if m != nil {
@@ -804,13 +1010,35 @@ func (m *ClusterOperation) GetDone() bool {
 // The workflow graph.
 type WorkflowGraph struct {
 	// Output only. The workflow nodes.
-	Nodes []*WorkflowNode `protobuf:"bytes,1,rep,name=nodes" json:"nodes,omitempty"`
+	Nodes                []*WorkflowNode `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *WorkflowGraph) Reset()                    { *m = WorkflowGraph{} }
-func (m *WorkflowGraph) String() string            { return proto.CompactTextString(m) }
-func (*WorkflowGraph) ProtoMessage()               {}
-func (*WorkflowGraph) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{7} }
+func (m *WorkflowGraph) Reset()         { *m = WorkflowGraph{} }
+func (m *WorkflowGraph) String() string { return proto.CompactTextString(m) }
+func (*WorkflowGraph) ProtoMessage()    {}
+func (*WorkflowGraph) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{7}
+}
+func (m *WorkflowGraph) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WorkflowGraph.Unmarshal(m, b)
+}
+func (m *WorkflowGraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WorkflowGraph.Marshal(b, m, deterministic)
+}
+func (dst *WorkflowGraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowGraph.Merge(dst, src)
+}
+func (m *WorkflowGraph) XXX_Size() int {
+	return xxx_messageInfo_WorkflowGraph.Size(m)
+}
+func (m *WorkflowGraph) XXX_DiscardUnknown() {
+	xxx_messageInfo_WorkflowGraph.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WorkflowGraph proto.InternalMessageInfo
 
 func (m *WorkflowGraph) GetNodes() []*WorkflowNode {
 	if m != nil {
@@ -822,21 +1050,43 @@ func (m *WorkflowGraph) GetNodes() []*WorkflowNode {
 // The workflow node.
 type WorkflowNode struct {
 	// Output only. The name of the node.
-	StepId string `protobuf:"bytes,1,opt,name=step_id,json=stepId" json:"step_id,omitempty"`
+	StepId string `protobuf:"bytes,1,opt,name=step_id,json=stepId,proto3" json:"step_id,omitempty"`
 	// Output only. Node's prerequisite nodes.
-	PrerequisiteStepIds []string `protobuf:"bytes,2,rep,name=prerequisite_step_ids,json=prerequisiteStepIds" json:"prerequisite_step_ids,omitempty"`
+	PrerequisiteStepIds []string `protobuf:"bytes,2,rep,name=prerequisite_step_ids,json=prerequisiteStepIds,proto3" json:"prerequisite_step_ids,omitempty"`
 	// Output only. The job id; populated after the node enters RUNNING state.
-	JobId string `protobuf:"bytes,3,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId string `protobuf:"bytes,3,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
 	// Output only. The node state.
-	State WorkflowNode_NodeState `protobuf:"varint,5,opt,name=state,enum=google.cloud.dataproc.v1beta2.WorkflowNode_NodeState" json:"state,omitempty"`
+	State WorkflowNode_NodeState `protobuf:"varint,5,opt,name=state,proto3,enum=google.cloud.dataproc.v1beta2.WorkflowNode_NodeState" json:"state,omitempty"`
 	// Output only. The error detail.
-	Error string `protobuf:"bytes,6,opt,name=error" json:"error,omitempty"`
+	Error                string   `protobuf:"bytes,6,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *WorkflowNode) Reset()                    { *m = WorkflowNode{} }
-func (m *WorkflowNode) String() string            { return proto.CompactTextString(m) }
-func (*WorkflowNode) ProtoMessage()               {}
-func (*WorkflowNode) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{8} }
+func (m *WorkflowNode) Reset()         { *m = WorkflowNode{} }
+func (m *WorkflowNode) String() string { return proto.CompactTextString(m) }
+func (*WorkflowNode) ProtoMessage()    {}
+func (*WorkflowNode) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{8}
+}
+func (m *WorkflowNode) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WorkflowNode.Unmarshal(m, b)
+}
+func (m *WorkflowNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WorkflowNode.Marshal(b, m, deterministic)
+}
+func (dst *WorkflowNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkflowNode.Merge(dst, src)
+}
+func (m *WorkflowNode) XXX_Size() int {
+	return xxx_messageInfo_WorkflowNode.Size(m)
+}
+func (m *WorkflowNode) XXX_DiscardUnknown() {
+	xxx_messageInfo_WorkflowNode.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WorkflowNode proto.InternalMessageInfo
 
 func (m *WorkflowNode) GetStepId() string {
 	if m != nil {
@@ -878,15 +1128,37 @@ type CreateWorkflowTemplateRequest struct {
 	// Required. The "resource name" of the region, as described
 	// in https://cloud.google.com/apis/design/resource_names of the form
 	// `projects/{project_id}/regions/{region}`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The Dataproc workflow template to create.
-	Template *WorkflowTemplate `protobuf:"bytes,2,opt,name=template" json:"template,omitempty"`
+	Template             *WorkflowTemplate `protobuf:"bytes,2,opt,name=template,proto3" json:"template,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *CreateWorkflowTemplateRequest) Reset()                    { *m = CreateWorkflowTemplateRequest{} }
-func (m *CreateWorkflowTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateWorkflowTemplateRequest) ProtoMessage()               {}
-func (*CreateWorkflowTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{9} }
+func (m *CreateWorkflowTemplateRequest) Reset()         { *m = CreateWorkflowTemplateRequest{} }
+func (m *CreateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateWorkflowTemplateRequest) ProtoMessage()    {}
+func (*CreateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{9}
+}
+func (m *CreateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateWorkflowTemplateRequest.Unmarshal(m, b)
+}
+func (m *CreateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateWorkflowTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateWorkflowTemplateRequest.Merge(dst, src)
+}
+func (m *CreateWorkflowTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateWorkflowTemplateRequest.Size(m)
+}
+func (m *CreateWorkflowTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateWorkflowTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateWorkflowTemplateRequest proto.InternalMessageInfo
 
 func (m *CreateWorkflowTemplateRequest) GetParent() string {
 	if m != nil {
@@ -907,18 +1179,40 @@ type GetWorkflowTemplateRequest struct {
 	// Required. The "resource name" of the workflow template, as described
 	// in https://cloud.google.com/apis/design/resource_names of the form
 	// `projects/{project_id}/regions/{region}/workflowTemplates/{template_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The version of workflow template to retrieve. Only previously
 	// instatiated versions can be retrieved.
 	//
 	// If unspecified, retrieves the current version.
-	Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"`
+	Version              int32    `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetWorkflowTemplateRequest) Reset()         { *m = GetWorkflowTemplateRequest{} }
+func (m *GetWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*GetWorkflowTemplateRequest) ProtoMessage()    {}
+func (*GetWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{10}
+}
+func (m *GetWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetWorkflowTemplateRequest.Unmarshal(m, b)
+}
+func (m *GetWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetWorkflowTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetWorkflowTemplateRequest.Merge(dst, src)
+}
+func (m *GetWorkflowTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_GetWorkflowTemplateRequest.Size(m)
+}
+func (m *GetWorkflowTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetWorkflowTemplateRequest.DiscardUnknown(m)
 }
 
-func (m *GetWorkflowTemplateRequest) Reset()                    { *m = GetWorkflowTemplateRequest{} }
-func (m *GetWorkflowTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetWorkflowTemplateRequest) ProtoMessage()               {}
-func (*GetWorkflowTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{10} }
+var xxx_messageInfo_GetWorkflowTemplateRequest proto.InternalMessageInfo
 
 func (m *GetWorkflowTemplateRequest) GetName() string {
 	if m != nil {
@@ -939,14 +1233,14 @@ type InstantiateWorkflowTemplateRequest struct {
 	// Required. The "resource name" of the workflow template, as described
 	// in https://cloud.google.com/apis/design/resource_names of the form
 	// `projects/{project_id}/regions/{region}/workflowTemplates/{template_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The version of workflow template to instantiate. If specified,
 	// the workflow will be instantiated only if the current version of
 	// the workflow template has the supplied version.
 	//
 	// This option cannot be used to instantiate a previous version of
 	// workflow template.
-	Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"`
+	Version int32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`
 	// Optional. A tag that prevents multiple concurrent workflow
 	// instances with the same tag from running. This mitigates risk of
 	// concurrent instances started due to retries.
@@ -956,16 +1250,36 @@ type InstantiateWorkflowTemplateRequest struct {
 	//
 	// The tag must contain only letters (a-z, A-Z), numbers (0-9),
 	// underscores (_), and hyphens (-). The maximum length is 40 characters.
-	InstanceId string `protobuf:"bytes,3,opt,name=instance_id,json=instanceId" json:"instance_id,omitempty"`
+	InstanceId           string   `protobuf:"bytes,3,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *InstantiateWorkflowTemplateRequest) Reset()         { *m = InstantiateWorkflowTemplateRequest{} }
 func (m *InstantiateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
 func (*InstantiateWorkflowTemplateRequest) ProtoMessage()    {}
 func (*InstantiateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{11}
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{11}
+}
+func (m *InstantiateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Unmarshal(m, b)
+}
+func (m *InstantiateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *InstantiateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstantiateWorkflowTemplateRequest.Merge(dst, src)
+}
+func (m *InstantiateWorkflowTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_InstantiateWorkflowTemplateRequest.Size(m)
+}
+func (m *InstantiateWorkflowTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_InstantiateWorkflowTemplateRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_InstantiateWorkflowTemplateRequest proto.InternalMessageInfo
+
 func (m *InstantiateWorkflowTemplateRequest) GetName() string {
 	if m != nil {
 		return m.Name
@@ -987,18 +1301,110 @@ func (m *InstantiateWorkflowTemplateRequest) GetInstanceId() string {
 	return ""
 }
 
+// A request to instantiate an inline workflow template.
+type InstantiateInlineWorkflowTemplateRequest struct {
+	// Required. The "resource name" of the workflow template region, as described
+	// in https://cloud.google.com/apis/design/resource_names of the form
+	// `projects/{project_id}/regions/{region}`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The workflow template to instantiate.
+	Template *WorkflowTemplate `protobuf:"bytes,2,opt,name=template,proto3" json:"template,omitempty"`
+	// Optional. A tag that prevents multiple concurrent workflow
+	// instances with the same tag from running. This mitigates risk of
+	// concurrent instances started due to retries.
+	//
+	// It is recommended to always set this value to a
+	// [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
+	//
+	// The tag must contain only letters (a-z, A-Z), numbers (0-9),
+	// underscores (_), and hyphens (-). The maximum length is 40 characters.
+	InstanceId           string   `protobuf:"bytes,3,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InstantiateInlineWorkflowTemplateRequest) Reset() {
+	*m = InstantiateInlineWorkflowTemplateRequest{}
+}
+func (m *InstantiateInlineWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*InstantiateInlineWorkflowTemplateRequest) ProtoMessage()    {}
+func (*InstantiateInlineWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{12}
+}
+func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Unmarshal(m, b)
+}
+func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *InstantiateInlineWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Merge(dst, src)
+}
+func (m *InstantiateInlineWorkflowTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.Size(m)
+}
+func (m *InstantiateInlineWorkflowTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InstantiateInlineWorkflowTemplateRequest proto.InternalMessageInfo
+
+func (m *InstantiateInlineWorkflowTemplateRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *InstantiateInlineWorkflowTemplateRequest) GetTemplate() *WorkflowTemplate {
+	if m != nil {
+		return m.Template
+	}
+	return nil
+}
+
+func (m *InstantiateInlineWorkflowTemplateRequest) GetInstanceId() string {
+	if m != nil {
+		return m.InstanceId
+	}
+	return ""
+}
+
 // A request to update a workflow template.
 type UpdateWorkflowTemplateRequest struct {
 	// Required. The updated workflow template.
 	//
 	// The `template.version` field must match the current version.
-	Template *WorkflowTemplate `protobuf:"bytes,1,opt,name=template" json:"template,omitempty"`
+	Template             *WorkflowTemplate `protobuf:"bytes,1,opt,name=template,proto3" json:"template,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *UpdateWorkflowTemplateRequest) Reset()                    { *m = UpdateWorkflowTemplateRequest{} }
-func (m *UpdateWorkflowTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateWorkflowTemplateRequest) ProtoMessage()               {}
-func (*UpdateWorkflowTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{12} }
+func (m *UpdateWorkflowTemplateRequest) Reset()         { *m = UpdateWorkflowTemplateRequest{} }
+func (m *UpdateWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateWorkflowTemplateRequest) ProtoMessage()    {}
+func (*UpdateWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{13}
+}
+func (m *UpdateWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Unmarshal(m, b)
+}
+func (m *UpdateWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateWorkflowTemplateRequest.Merge(dst, src)
+}
+func (m *UpdateWorkflowTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateWorkflowTemplateRequest.Size(m)
+}
+func (m *UpdateWorkflowTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateWorkflowTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateWorkflowTemplateRequest proto.InternalMessageInfo
 
 func (m *UpdateWorkflowTemplateRequest) GetTemplate() *WorkflowTemplate {
 	if m != nil {
@@ -1012,18 +1418,40 @@ type ListWorkflowTemplatesRequest struct {
 	// Required. The "resource name" of the region, as described
 	// in https://cloud.google.com/apis/design/resource_names of the form
 	// `projects/{project_id}/regions/{region}`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. The maximum number of results to return in each response.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The page token, returned by a previous call, to request the
 	// next page of results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListWorkflowTemplatesRequest) Reset()         { *m = ListWorkflowTemplatesRequest{} }
+func (m *ListWorkflowTemplatesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListWorkflowTemplatesRequest) ProtoMessage()    {}
+func (*ListWorkflowTemplatesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{14}
+}
+func (m *ListWorkflowTemplatesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListWorkflowTemplatesRequest.Unmarshal(m, b)
+}
+func (m *ListWorkflowTemplatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListWorkflowTemplatesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListWorkflowTemplatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWorkflowTemplatesRequest.Merge(dst, src)
+}
+func (m *ListWorkflowTemplatesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListWorkflowTemplatesRequest.Size(m)
+}
+func (m *ListWorkflowTemplatesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListWorkflowTemplatesRequest.DiscardUnknown(m)
 }
 
-func (m *ListWorkflowTemplatesRequest) Reset()                    { *m = ListWorkflowTemplatesRequest{} }
-func (m *ListWorkflowTemplatesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListWorkflowTemplatesRequest) ProtoMessage()               {}
-func (*ListWorkflowTemplatesRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{13} }
+var xxx_messageInfo_ListWorkflowTemplatesRequest proto.InternalMessageInfo
 
 func (m *ListWorkflowTemplatesRequest) GetParent() string {
 	if m != nil {
@@ -1049,17 +1477,39 @@ func (m *ListWorkflowTemplatesRequest) GetPageToken() string {
 // A response to a request to list workflow templates in a project.
 type ListWorkflowTemplatesResponse struct {
 	// Output only. WorkflowTemplates list.
-	Templates []*WorkflowTemplate `protobuf:"bytes,1,rep,name=templates" json:"templates,omitempty"`
+	Templates []*WorkflowTemplate `protobuf:"bytes,1,rep,name=templates,proto3" json:"templates,omitempty"`
 	// Output only. This token is included in the response if there are more results
 	// to fetch. To fetch additional results, provide this value as the
 	// page_token in a subsequent <code>ListWorkflowTemplatesRequest</code>.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListWorkflowTemplatesResponse) Reset()                    { *m = ListWorkflowTemplatesResponse{} }
-func (m *ListWorkflowTemplatesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListWorkflowTemplatesResponse) ProtoMessage()               {}
-func (*ListWorkflowTemplatesResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{14} }
+func (m *ListWorkflowTemplatesResponse) Reset()         { *m = ListWorkflowTemplatesResponse{} }
+func (m *ListWorkflowTemplatesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListWorkflowTemplatesResponse) ProtoMessage()    {}
+func (*ListWorkflowTemplatesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{15}
+}
+func (m *ListWorkflowTemplatesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListWorkflowTemplatesResponse.Unmarshal(m, b)
+}
+func (m *ListWorkflowTemplatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListWorkflowTemplatesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListWorkflowTemplatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWorkflowTemplatesResponse.Merge(dst, src)
+}
+func (m *ListWorkflowTemplatesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListWorkflowTemplatesResponse.Size(m)
+}
+func (m *ListWorkflowTemplatesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListWorkflowTemplatesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListWorkflowTemplatesResponse proto.InternalMessageInfo
 
 func (m *ListWorkflowTemplatesResponse) GetTemplates() []*WorkflowTemplate {
 	if m != nil {
@@ -1082,17 +1532,39 @@ type DeleteWorkflowTemplateRequest struct {
 	// Required. The "resource name" of the workflow template, as described
 	// in https://cloud.google.com/apis/design/resource_names of the form
 	// `projects/{project_id}/regions/{region}/workflowTemplates/{template_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The version of workflow template to delete. If specified,
 	// will only delete the template if the current server version matches
 	// specified version.
-	Version int32 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"`
+	Version              int32    `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteWorkflowTemplateRequest) Reset()                    { *m = DeleteWorkflowTemplateRequest{} }
-func (m *DeleteWorkflowTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteWorkflowTemplateRequest) ProtoMessage()               {}
-func (*DeleteWorkflowTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{15} }
+func (m *DeleteWorkflowTemplateRequest) Reset()         { *m = DeleteWorkflowTemplateRequest{} }
+func (m *DeleteWorkflowTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteWorkflowTemplateRequest) ProtoMessage()    {}
+func (*DeleteWorkflowTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_workflow_templates_592be9b1ef908c67, []int{16}
+}
+func (m *DeleteWorkflowTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Unmarshal(m, b)
+}
+func (m *DeleteWorkflowTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteWorkflowTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteWorkflowTemplateRequest.Merge(dst, src)
+}
+func (m *DeleteWorkflowTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteWorkflowTemplateRequest.Size(m)
+}
+func (m *DeleteWorkflowTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteWorkflowTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteWorkflowTemplateRequest proto.InternalMessageInfo
 
 func (m *DeleteWorkflowTemplateRequest) GetName() string {
 	if m != nil {
@@ -1110,17 +1582,23 @@ func (m *DeleteWorkflowTemplateRequest) GetVersion() int32 {
 
 func init() {
 	proto.RegisterType((*WorkflowTemplate)(nil), "google.cloud.dataproc.v1beta2.WorkflowTemplate")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.WorkflowTemplate.LabelsEntry")
 	proto.RegisterType((*WorkflowTemplatePlacement)(nil), "google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement")
 	proto.RegisterType((*ManagedCluster)(nil), "google.cloud.dataproc.v1beta2.ManagedCluster")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.ManagedCluster.LabelsEntry")
 	proto.RegisterType((*ClusterSelector)(nil), "google.cloud.dataproc.v1beta2.ClusterSelector")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.ClusterSelector.ClusterLabelsEntry")
 	proto.RegisterType((*OrderedJob)(nil), "google.cloud.dataproc.v1beta2.OrderedJob")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.OrderedJob.LabelsEntry")
 	proto.RegisterType((*WorkflowMetadata)(nil), "google.cloud.dataproc.v1beta2.WorkflowMetadata")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.dataproc.v1beta2.WorkflowMetadata.ParametersEntry")
 	proto.RegisterType((*ClusterOperation)(nil), "google.cloud.dataproc.v1beta2.ClusterOperation")
 	proto.RegisterType((*WorkflowGraph)(nil), "google.cloud.dataproc.v1beta2.WorkflowGraph")
 	proto.RegisterType((*WorkflowNode)(nil), "google.cloud.dataproc.v1beta2.WorkflowNode")
 	proto.RegisterType((*CreateWorkflowTemplateRequest)(nil), "google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest")
 	proto.RegisterType((*GetWorkflowTemplateRequest)(nil), "google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest")
 	proto.RegisterType((*InstantiateWorkflowTemplateRequest)(nil), "google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest")
+	proto.RegisterType((*InstantiateInlineWorkflowTemplateRequest)(nil), "google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest")
 	proto.RegisterType((*UpdateWorkflowTemplateRequest)(nil), "google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest")
 	proto.RegisterType((*ListWorkflowTemplatesRequest)(nil), "google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest")
 	proto.RegisterType((*ListWorkflowTemplatesResponse)(nil), "google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse")
@@ -1137,8 +1615,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for WorkflowTemplateService service
-
+// WorkflowTemplateServiceClient is the client API for WorkflowTemplateService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type WorkflowTemplateServiceClient interface {
 	// Creates new workflow template.
 	CreateWorkflowTemplate(ctx context.Context, in *CreateWorkflowTemplateRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error)
@@ -1151,25 +1630,51 @@ type WorkflowTemplateServiceClient interface {
 	//
 	// The returned Operation can be used to track execution of
 	// workflow by polling
-	// [google.cloud.dataproc.v1beta2.OperationService.GetOperation][].
+	// [operations.get][google.longrunning.Operations.GetOperation].
+	// The Operation will complete when entire workflow is finished.
+	//
+	// The running workflow can be aborted via
+	// [operations.cancel][google.longrunning.Operations.CancelOperation].
+	// This will cause any inflight jobs to be cancelled and workflow-owned
+	// clusters to be deleted.
+	//
+	// The [Operation.metadata][google.longrunning.Operation.metadata] will be
+	// [WorkflowMetadata][google.cloud.dataproc.v1beta2.WorkflowMetadata].
+	//
+	// On successful completion,
+	// [Operation.response][google.longrunning.Operation.response] will be
+	// [Empty][google.protobuf.Empty].
+	InstantiateWorkflowTemplate(ctx context.Context, in *InstantiateWorkflowTemplateRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Instantiates a template and begins execution.
+	//
+	// This method is equivalent to executing the sequence
+	// [CreateWorkflowTemplate][google.cloud.dataproc.v1beta2.WorkflowTemplateService.CreateWorkflowTemplate], [InstantiateWorkflowTemplate][google.cloud.dataproc.v1beta2.WorkflowTemplateService.InstantiateWorkflowTemplate],
+	// [DeleteWorkflowTemplate][google.cloud.dataproc.v1beta2.WorkflowTemplateService.DeleteWorkflowTemplate].
+	//
+	// The returned Operation can be used to track execution of
+	// workflow by polling
+	// [operations.get][google.longrunning.Operations.GetOperation].
 	// The Operation will complete when entire workflow is finished.
 	//
 	// The running workflow can be aborted via
-	// [google.cloud.dataproc.v1beta2.OperationService.CancelOperation][].
+	// [operations.cancel][google.longrunning.Operations.CancelOperation].
+	// This will cause any inflight jobs to be cancelled and workflow-owned
+	// clusters to be deleted.
 	//
-	// The [google.cloud.dataproc.v1beta2.Operation.metadata][] will always be
-	// [google.cloud.dataproc.v1beta2.WorkflowMetadata][google.cloud.dataproc.v1beta2.WorkflowMetadata].
+	// The [Operation.metadata][google.longrunning.Operation.metadata] will be
+	// [WorkflowMetadata][google.cloud.dataproc.v1beta2.WorkflowMetadata].
 	//
-	// The [google.cloud.dataproc.v1beta2.Operation.result][] will always be
-	// [google.protobuf.Empty][google.protobuf.Empty].
-	InstantiateWorkflowTemplate(ctx context.Context, in *InstantiateWorkflowTemplateRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	// On successful completion,
+	// [Operation.response][google.longrunning.Operation.response] will be
+	// [Empty][google.protobuf.Empty].
+	InstantiateInlineWorkflowTemplate(ctx context.Context, in *InstantiateInlineWorkflowTemplateRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Updates (replaces) workflow template. The updated template
 	// must contain version that matches the current server version.
 	UpdateWorkflowTemplate(ctx context.Context, in *UpdateWorkflowTemplateRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error)
 	// Lists workflows that match the specified filter in the request.
 	ListWorkflowTemplates(ctx context.Context, in *ListWorkflowTemplatesRequest, opts ...grpc.CallOption) (*ListWorkflowTemplatesResponse, error)
 	// Deletes a workflow template. It does not cancel in-progress workflows.
-	DeleteWorkflowTemplate(ctx context.Context, in *DeleteWorkflowTemplateRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteWorkflowTemplate(ctx context.Context, in *DeleteWorkflowTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type workflowTemplateServiceClient struct {
@@ -1182,7 +1687,7 @@ func NewWorkflowTemplateServiceClient(cc *grpc.ClientConn) WorkflowTemplateServi
 
 func (c *workflowTemplateServiceClient) CreateWorkflowTemplate(ctx context.Context, in *CreateWorkflowTemplateRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) {
 	out := new(WorkflowTemplate)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/CreateWorkflowTemplate", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/CreateWorkflowTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1191,16 +1696,25 @@ func (c *workflowTemplateServiceClient) CreateWorkflowTemplate(ctx context.Conte
 
 func (c *workflowTemplateServiceClient) GetWorkflowTemplate(ctx context.Context, in *GetWorkflowTemplateRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) {
 	out := new(WorkflowTemplate)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/GetWorkflowTemplate", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/GetWorkflowTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *workflowTemplateServiceClient) InstantiateWorkflowTemplate(ctx context.Context, in *InstantiateWorkflowTemplateRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/InstantiateWorkflowTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *workflowTemplateServiceClient) InstantiateWorkflowTemplate(ctx context.Context, in *InstantiateWorkflowTemplateRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/InstantiateWorkflowTemplate", in, out, c.cc, opts...)
+func (c *workflowTemplateServiceClient) InstantiateInlineWorkflowTemplate(ctx context.Context, in *InstantiateInlineWorkflowTemplateRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1209,7 +1723,7 @@ func (c *workflowTemplateServiceClient) InstantiateWorkflowTemplate(ctx context.
 
 func (c *workflowTemplateServiceClient) UpdateWorkflowTemplate(ctx context.Context, in *UpdateWorkflowTemplateRequest, opts ...grpc.CallOption) (*WorkflowTemplate, error) {
 	out := new(WorkflowTemplate)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/UpdateWorkflowTemplate", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/UpdateWorkflowTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1218,24 +1732,23 @@ func (c *workflowTemplateServiceClient) UpdateWorkflowTemplate(ctx context.Conte
 
 func (c *workflowTemplateServiceClient) ListWorkflowTemplates(ctx context.Context, in *ListWorkflowTemplatesRequest, opts ...grpc.CallOption) (*ListWorkflowTemplatesResponse, error) {
 	out := new(ListWorkflowTemplatesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/ListWorkflowTemplates", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/ListWorkflowTemplates", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *workflowTemplateServiceClient) DeleteWorkflowTemplate(ctx context.Context, in *DeleteWorkflowTemplateRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/DeleteWorkflowTemplate", in, out, c.cc, opts...)
+func (c *workflowTemplateServiceClient) DeleteWorkflowTemplate(ctx context.Context, in *DeleteWorkflowTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/DeleteWorkflowTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for WorkflowTemplateService service
-
+// WorkflowTemplateServiceServer is the server API for WorkflowTemplateService service.
 type WorkflowTemplateServiceServer interface {
 	// Creates new workflow template.
 	CreateWorkflowTemplate(context.Context, *CreateWorkflowTemplateRequest) (*WorkflowTemplate, error)
@@ -1248,25 +1761,51 @@ type WorkflowTemplateServiceServer interface {
 	//
 	// The returned Operation can be used to track execution of
 	// workflow by polling
-	// [google.cloud.dataproc.v1beta2.OperationService.GetOperation][].
+	// [operations.get][google.longrunning.Operations.GetOperation].
 	// The Operation will complete when entire workflow is finished.
 	//
 	// The running workflow can be aborted via
-	// [google.cloud.dataproc.v1beta2.OperationService.CancelOperation][].
+	// [operations.cancel][google.longrunning.Operations.CancelOperation].
+	// This will cause any inflight jobs to be cancelled and workflow-owned
+	// clusters to be deleted.
 	//
-	// The [google.cloud.dataproc.v1beta2.Operation.metadata][] will always be
-	// [google.cloud.dataproc.v1beta2.WorkflowMetadata][google.cloud.dataproc.v1beta2.WorkflowMetadata].
+	// The [Operation.metadata][google.longrunning.Operation.metadata] will be
+	// [WorkflowMetadata][google.cloud.dataproc.v1beta2.WorkflowMetadata].
 	//
-	// The [google.cloud.dataproc.v1beta2.Operation.result][] will always be
-	// [google.protobuf.Empty][google.protobuf.Empty].
-	InstantiateWorkflowTemplate(context.Context, *InstantiateWorkflowTemplateRequest) (*google_longrunning.Operation, error)
+	// On successful completion,
+	// [Operation.response][google.longrunning.Operation.response] will be
+	// [Empty][google.protobuf.Empty].
+	InstantiateWorkflowTemplate(context.Context, *InstantiateWorkflowTemplateRequest) (*longrunning.Operation, error)
+	// Instantiates a template and begins execution.
+	//
+	// This method is equivalent to executing the sequence
+	// [CreateWorkflowTemplate][google.cloud.dataproc.v1beta2.WorkflowTemplateService.CreateWorkflowTemplate], [InstantiateWorkflowTemplate][google.cloud.dataproc.v1beta2.WorkflowTemplateService.InstantiateWorkflowTemplate],
+	// [DeleteWorkflowTemplate][google.cloud.dataproc.v1beta2.WorkflowTemplateService.DeleteWorkflowTemplate].
+	//
+	// The returned Operation can be used to track execution of
+	// workflow by polling
+	// [operations.get][google.longrunning.Operations.GetOperation].
+	// The Operation will complete when entire workflow is finished.
+	//
+	// The running workflow can be aborted via
+	// [operations.cancel][google.longrunning.Operations.CancelOperation].
+	// This will cause any inflight jobs to be cancelled and workflow-owned
+	// clusters to be deleted.
+	//
+	// The [Operation.metadata][google.longrunning.Operation.metadata] will be
+	// [WorkflowMetadata][google.cloud.dataproc.v1beta2.WorkflowMetadata].
+	//
+	// On successful completion,
+	// [Operation.response][google.longrunning.Operation.response] will be
+	// [Empty][google.protobuf.Empty].
+	InstantiateInlineWorkflowTemplate(context.Context, *InstantiateInlineWorkflowTemplateRequest) (*longrunning.Operation, error)
 	// Updates (replaces) workflow template. The updated template
 	// must contain version that matches the current server version.
 	UpdateWorkflowTemplate(context.Context, *UpdateWorkflowTemplateRequest) (*WorkflowTemplate, error)
 	// Lists workflows that match the specified filter in the request.
 	ListWorkflowTemplates(context.Context, *ListWorkflowTemplatesRequest) (*ListWorkflowTemplatesResponse, error)
 	// Deletes a workflow template. It does not cancel in-progress workflows.
-	DeleteWorkflowTemplate(context.Context, *DeleteWorkflowTemplateRequest) (*google_protobuf2.Empty, error)
+	DeleteWorkflowTemplate(context.Context, *DeleteWorkflowTemplateRequest) (*empty.Empty, error)
 }
 
 func RegisterWorkflowTemplateServiceServer(s *grpc.Server, srv WorkflowTemplateServiceServer) {
@@ -1327,6 +1866,24 @@ func _WorkflowTemplateService_InstantiateWorkflowTemplate_Handler(srv interface{
 	return interceptor(ctx, in, info, handler)
 }
 
+func _WorkflowTemplateService_InstantiateInlineWorkflowTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(InstantiateInlineWorkflowTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WorkflowTemplateServiceServer).InstantiateInlineWorkflowTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dataproc.v1beta2.WorkflowTemplateService/InstantiateInlineWorkflowTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WorkflowTemplateServiceServer).InstantiateInlineWorkflowTemplate(ctx, req.(*InstantiateInlineWorkflowTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _WorkflowTemplateService_UpdateWorkflowTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(UpdateWorkflowTemplateRequest)
 	if err := dec(in); err != nil {
@@ -1397,6 +1954,10 @@ var _WorkflowTemplateService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "InstantiateWorkflowTemplate",
 			Handler:    _WorkflowTemplateService_InstantiateWorkflowTemplate_Handler,
 		},
+		{
+			MethodName: "InstantiateInlineWorkflowTemplate",
+			Handler:    _WorkflowTemplateService_InstantiateInlineWorkflowTemplate_Handler,
+		},
 		{
 			MethodName: "UpdateWorkflowTemplate",
 			Handler:    _WorkflowTemplateService_UpdateWorkflowTemplate_Handler,
@@ -1415,112 +1976,122 @@ var _WorkflowTemplateService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/dataproc/v1beta2/workflow_templates.proto", fileDescriptor3)
-}
-
-var fileDescriptor3 = []byte{
-	// 1634 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x5d, 0x6f, 0xdb, 0x5c,
-	0x1d, 0xaf, 0xd3, 0x26, 0x4d, 0xfe, 0x59, 0xdb, 0xe8, 0x3c, 0xac, 0x0b, 0xe9, 0x53, 0xad, 0x33,
-	0x62, 0x94, 0x32, 0x12, 0x11, 0x04, 0xea, 0xba, 0x4d, 0x5a, 0xdb, 0x64, 0x6b, 0xda, 0x34, 0x09,
-	0x4e, 0xbb, 0x21, 0xb8, 0x88, 0x9c, 0xf8, 0xcc, 0x75, 0xeb, 0xf8, 0xb8, 0xb6, 0xd3, 0xd1, 0xa1,
-	0xdd, 0xa0, 0x49, 0x7c, 0x00, 0x24, 0x3e, 0x07, 0x9f, 0x01, 0xbe, 0x00, 0x68, 0x5c, 0x22, 0x71,
-	0x83, 0xb8, 0xdf, 0x15, 0xb7, 0xe8, 0xbc, 0xd8, 0x71, 0x5e, 0x9d, 0x74, 0xcf, 0x4d, 0xe4, 0x73,
-	0x72, 0x7e, 0xbf, 0xf3, 0xfb, 0xbf, 0x1e, 0x1f, 0xc3, 0x2f, 0x75, 0x42, 0x74, 0x13, 0x17, 0x3a,
-	0x26, 0xe9, 0x69, 0x05, 0x4d, 0xf5, 0x54, 0xdb, 0x21, 0x9d, 0xc2, 0xcd, 0xcf, 0xda, 0xd8, 0x53,
-	0x8b, 0x85, 0xf7, 0xc4, 0xb9, 0x7a, 0x67, 0x92, 0xf7, 0x2d, 0x0f, 0x77, 0x6d, 0x53, 0xf5, 0xb0,
-	0x9b, 0xb7, 0x1d, 0xe2, 0x11, 0xb4, 0xc9, 0x71, 0x79, 0x86, 0xcb, 0xfb, 0xb8, 0xbc, 0xc0, 0xe5,
-	0xbe, 0x15, 0xb4, 0xaa, 0x6d, 0x14, 0x54, 0xcb, 0x22, 0x9e, 0xea, 0x19, 0xc4, 0x12, 0xe0, 0xdc,
-	0x93, 0xe9, 0x9b, 0x76, 0xcc, 0x9e, 0xeb, 0x61, 0xc7, 0x5f, 0xbd, 0x3d, 0x7d, 0xf5, 0x25, 0x69,
-	0xfb, 0x2b, 0x7f, 0x20, 0x56, 0x9a, 0xc4, 0xd2, 0x9d, 0x9e, 0x65, 0x19, 0x96, 0x5e, 0x20, 0x36,
-	0x76, 0x06, 0x36, 0xdf, 0x10, 0x8b, 0xd8, 0xa8, 0xdd, 0x7b, 0x57, 0xc0, 0x5d, 0xdb, 0xbb, 0x15,
-	0x7f, 0x3e, 0x1c, 0xfe, 0xd3, 0x33, 0xba, 0xd8, 0xf5, 0xd4, 0xae, 0xcd, 0x17, 0xc8, 0x5f, 0x16,
-	0x21, 0xf3, 0x56, 0x38, 0xe5, 0x4c, 0xf8, 0x04, 0xad, 0x42, 0xcc, 0xd0, 0xb2, 0xb1, 0x2d, 0x69,
-	0x3b, 0xa5, 0xc4, 0x0c, 0x0d, 0x21, 0x58, 0xb2, 0xd4, 0x2e, 0xce, 0x4a, 0x6c, 0x86, 0x3d, 0xa3,
-	0x2c, 0x2c, 0xdf, 0x60, 0xc7, 0x35, 0x88, 0x95, 0x5d, 0xdc, 0x92, 0xb6, 0xe3, 0x8a, 0x3f, 0x44,
-	0xcf, 0x20, 0xdd, 0x71, 0xb0, 0xea, 0xe1, 0x16, 0xdd, 0x2c, 0xbb, 0xb4, 0x25, 0x6d, 0xa7, 0x8b,
-	0xb9, 0xbc, 0x70, 0xb0, 0xaf, 0x24, 0x7f, 0xe6, 0x2b, 0x51, 0x80, 0x2f, 0xa7, 0x13, 0x14, 0xdc,
-	0xb3, 0xb5, 0x00, 0x1c, 0x8f, 0x06, 0xf3, 0xe5, 0x0c, 0xdc, 0x84, 0x84, 0xa9, 0xb6, 0xb1, 0xe9,
-	0x66, 0x13, 0x5b, 0x8b, 0xdb, 0xe9, 0xe2, 0xb3, 0xfc, 0xd4, 0xa8, 0xe6, 0x87, 0x0d, 0xcf, 0x57,
-	0x19, 0xba, 0x6c, 0x79, 0xce, 0xad, 0x22, 0xa8, 0xd0, 0x1b, 0x48, 0xd9, 0xa6, 0xda, 0xc1, 0x5d,
-	0x6c, 0x79, 0xd9, 0x65, 0xa6, 0x67, 0x77, 0x4e, 0xde, 0x86, 0x8f, 0x57, 0xfa, 0x54, 0xe8, 0x05,
-	0x2c, 0xd1, 0x50, 0x67, 0x93, 0x4c, 0xea, 0x8f, 0x23, 0x28, 0xeb, 0x8e, 0x86, 0x1d, 0xac, 0x1d,
-	0x93, 0xb6, 0xc2, 0x60, 0xb9, 0xa7, 0x90, 0x0e, 0xa9, 0x45, 0x19, 0x58, 0xbc, 0xc2, 0xb7, 0x22,
-	0x42, 0xf4, 0x11, 0x7d, 0x0f, 0xe2, 0x37, 0xaa, 0xd9, 0xc3, 0x22, 0x8e, 0x7c, 0xb0, 0x17, 0xdb,
-	0x95, 0xe4, 0x7f, 0x4b, 0xf0, 0xfd, 0x89, 0x12, 0xd1, 0xaf, 0x61, 0xad, 0xab, 0x5a, 0xaa, 0x8e,
-	0xb5, 0x96, 0x48, 0x5c, 0xc6, 0x9a, 0x2e, 0xfe, 0x34, 0x42, 0xe2, 0x29, 0x47, 0x1d, 0x72, 0xd0,
-	0xd1, 0x82, 0xb2, 0xda, 0x1d, 0x98, 0x41, 0xbf, 0x85, 0x8c, 0x60, 0x6c, 0xb9, 0xd8, 0xc4, 0x1d,
-	0x8f, 0x38, 0x4c, 0x5c, 0xba, 0x98, 0x8f, 0xa0, 0x16, 0x0c, 0x4d, 0x81, 0x3a, 0x5a, 0x50, 0xd6,
-	0x3a, 0x83, 0x53, 0x07, 0xe9, 0x50, 0x98, 0xe4, 0x3f, 0xc6, 0x60, 0x75, 0x50, 0x0e, 0x7a, 0x04,
-	0xf7, 0xfc, 0xcd, 0x59, 0x2e, 0x73, 0xaf, 0xa4, 0xc5, 0x5c, 0x8d, 0xa6, 0x74, 0x09, 0x12, 0x1d,
-	0x62, 0xbd, 0x33, 0x74, 0x96, 0xd1, 0xe9, 0xe2, 0x93, 0xd9, 0x54, 0x1d, 0x32, 0x8c, 0x22, 0xb0,
-	0xe8, 0x57, 0x41, 0x12, 0x2e, 0xb1, 0xc8, 0x3e, 0x9d, 0xcb, 0x6d, 0xe3, 0x52, 0xf0, 0x6b, 0x62,
-	0xfd, 0x0f, 0x09, 0xd6, 0x86, 0xbc, 0x47, 0xcb, 0xf9, 0x03, 0xb1, 0x82, 0x72, 0xa6, 0xcf, 0xe8,
-	0x02, 0x56, 0x7d, 0xf7, 0x08, 0xf5, 0x31, 0xa6, 0x7e, 0x7f, 0xbe, 0xc8, 0xf8, 0xe3, 0xb0, 0x15,
-	0x2b, 0x9d, 0xf0, 0x5c, 0xee, 0x25, 0xa0, 0xd1, 0x45, 0x73, 0xd9, 0xf4, 0xbf, 0x38, 0x40, 0xbf,
-	0x1e, 0xd0, 0x03, 0x58, 0x76, 0x3d, 0x6c, 0xb7, 0x0c, 0x4d, 0xc0, 0x13, 0x74, 0x58, 0xd1, 0x50,
-	0x05, 0xe0, 0x42, 0xd5, 0x08, 0xb1, 0x5b, 0x97, 0xa4, 0x2d, 0x32, 0x6d, 0x3b, 0xc2, 0x9e, 0x23,
-	0x06, 0x38, 0x26, 0xed, 0xa3, 0x05, 0x25, 0x75, 0xe1, 0x0f, 0xd0, 0x2b, 0x48, 0xb9, 0xb6, 0xea,
-	0x5c, 0x31, 0x26, 0x9e, 0x1d, 0x3f, 0x8a, 0x60, 0x6a, 0xd2, 0xf5, 0x9c, 0x28, 0xe9, 0x8a, 0x67,
-	0x54, 0x85, 0xb4, 0x7d, 0xdb, 0x67, 0xe2, 0xbd, 0x31, 0xaa, 0xf6, 0x1b, 0xb7, 0x21, 0x2e, 0x10,
-	0x78, 0xca, 0x76, 0x08, 0xc9, 0x0b, 0xe3, 0x06, 0x33, 0x2a, 0xde, 0x29, 0x1f, 0x47, 0x99, 0x67,
-	0xdc, 0x60, 0xce, 0xb3, 0x7c, 0xc1, 0x1f, 0xd1, 0x4b, 0x58, 0xb6, 0x0d, 0x9d, 0x71, 0x24, 0x18,
-	0xc7, 0x0f, 0xa3, 0xe4, 0x18, 0x3a, 0xa7, 0x48, 0xd8, 0xec, 0x09, 0x35, 0x60, 0x85, 0x9b, 0xe4,
-	0x5e, 0x9b, 0x8c, 0x87, 0x77, 0xc9, 0x9d, 0x59, 0x1c, 0xd4, 0xbc, 0x36, 0x39, 0x59, 0xda, 0xed,
-	0x0f, 0xd1, 0x69, 0x50, 0x43, 0xbc, 0x3b, 0xfe, 0x62, 0xe6, 0xee, 0x38, 0xb6, 0x85, 0x57, 0x01,
-	0xdc, 0xce, 0x05, 0xd6, 0x7a, 0xa6, 0x61, 0xe9, 0xd9, 0xd4, 0x4c, 0xc5, 0x7d, 0x4c, 0xda, 0xcd,
-	0x00, 0xa3, 0x84, 0xf0, 0xa8, 0x08, 0xf7, 0x6d, 0x07, 0x3b, 0xf8, 0xba, 0x67, 0xb8, 0x86, 0x87,
-	0x5b, 0x22, 0xf9, 0xdc, 0x2c, 0x6c, 0x2d, 0x6e, 0xa7, 0x94, 0x6f, 0xc2, 0x7f, 0x36, 0x59, 0x26,
-	0x7e, 0x4d, 0x05, 0x1f, 0x00, 0x24, 0x2f, 0x49, 0xbb, 0xe5, 0xdd, 0xda, 0x58, 0xfe, 0x6f, 0xe8,
-	0xb4, 0x3e, 0xc5, 0x9e, 0x4a, 0x55, 0xa3, 0x1c, 0x24, 0xfd, 0xb7, 0x19, 0xc1, 0x18, 0x8c, 0xc3,
-	0xa7, 0x74, 0x6c, 0xf0, 0x94, 0x7e, 0x03, 0xab, 0xe2, 0x94, 0xf6, 0xbb, 0x3c, 0x4f, 0xeb, 0xc2,
-	0x6c, 0x05, 0x5f, 0xf7, 0x5f, 0x43, 0x94, 0x15, 0x4e, 0xe3, 0xf7, 0xd9, 0x03, 0x88, 0xeb, 0x8e,
-	0x6a, 0x5f, 0x88, 0xdc, 0x7e, 0x32, 0xe3, 0x51, 0xf9, 0x9a, 0x62, 0x14, 0x0e, 0xa5, 0xda, 0x34,
-	0x6c, 0xe2, 0x90, 0xb6, 0xf8, 0x1d, 0xb5, 0x71, 0x1a, 0x5f, 0xdb, 0x09, 0xc4, 0x5d, 0x8f, 0xba,
-	0x89, 0x26, 0xfa, 0x6a, 0x64, 0x56, 0x0d, 0x7b, 0x3a, 0xdf, 0xa4, 0x60, 0x85, 0x73, 0x8c, 0x1c,
-	0x28, 0xcb, 0x23, 0x07, 0x8a, 0xbc, 0x0b, 0x71, 0x06, 0x41, 0x69, 0x58, 0x3e, 0xaf, 0x9d, 0xd4,
-	0xea, 0x6f, 0x6b, 0x99, 0x05, 0x3a, 0x68, 0x94, 0x6b, 0xa5, 0x4a, 0xed, 0x75, 0x46, 0xa2, 0x03,
-	0xe5, 0xbc, 0x56, 0xa3, 0x83, 0x18, 0x4a, 0xc2, 0x52, 0xa9, 0x5e, 0x2b, 0x67, 0x16, 0xe5, 0x16,
-	0x64, 0x86, 0x8d, 0xa1, 0x1b, 0x06, 0x2f, 0x7f, 0xfd, 0x66, 0x97, 0x0e, 0xe6, 0x2a, 0x1a, 0xcd,
-	0x22, 0xec, 0x38, 0xe2, 0x58, 0x4d, 0x29, 0x7c, 0x40, 0xfb, 0xbd, 0x46, 0xfb, 0x3d, 0x0d, 0x70,
-	0x52, 0x61, 0xcf, 0xb2, 0x02, 0x2b, 0x03, 0xae, 0x47, 0xfb, 0x10, 0xb7, 0x88, 0x86, 0xdd, 0xac,
-	0xc4, 0x2a, 0xee, 0x27, 0x33, 0xfa, 0xa6, 0x46, 0x34, 0xac, 0x70, 0xa4, 0xfc, 0xd7, 0x18, 0xdc,
-	0x0b, 0xcf, 0x4f, 0xee, 0xcc, 0x13, 0x4b, 0x28, 0x36, 0xb1, 0x84, 0xd0, 0x7d, 0x48, 0xd0, 0x3a,
-	0x30, 0x34, 0x66, 0x47, 0x4a, 0x89, 0x5f, 0x92, 0x76, 0x45, 0xeb, 0xc7, 0x34, 0x3e, 0x57, 0x4c,
-	0xa9, 0xbe, 0x3c, 0xfd, 0x19, 0x88, 0x69, 0xe0, 0xbf, 0x44, 0xc8, 0x7f, 0xf2, 0x15, 0xa4, 0x82,
-	0x95, 0x68, 0x03, 0x1e, 0xd4, 0xea, 0xa5, 0x72, 0xab, 0x79, 0xb6, 0x7f, 0x76, 0xde, 0x6c, 0x9d,
-	0xd7, 0x9a, 0x8d, 0xf2, 0x61, 0xe5, 0x55, 0xa5, 0x5c, 0xe2, 0xa1, 0x3d, 0xa8, 0xd6, 0x0f, 0x4f,
-	0xca, 0xa5, 0x8c, 0x84, 0xee, 0x41, 0x92, 0x86, 0x76, 0xff, 0xa0, 0x5a, 0xce, 0xc4, 0xc2, 0x81,
-	0x5e, 0x44, 0x2b, 0x90, 0x3a, 0xac, 0x9f, 0x36, 0xaa, 0xe5, 0xb3, 0x72, 0x29, 0xb3, 0x84, 0x00,
-	0x12, 0xaf, 0xf6, 0x2b, 0xd5, 0x72, 0x29, 0x13, 0x97, 0x3f, 0x49, 0xb0, 0x79, 0xc8, 0x2a, 0x6a,
-	0xf8, 0x15, 0x4d, 0xc1, 0xd7, 0x3d, 0xec, 0x7a, 0x68, 0x1d, 0x12, 0xb6, 0xea, 0xd0, 0xb7, 0x51,
-	0xe1, 0x54, 0x3e, 0x42, 0x27, 0xa1, 0x3e, 0x10, 0x9b, 0xa9, 0x5e, 0x46, 0x76, 0x08, 0x08, 0xe4,
-	0x63, 0xc8, 0xbd, 0xc6, 0xde, 0x24, 0x09, 0x11, 0x17, 0x82, 0xc1, 0x56, 0x23, 0xbb, 0x20, 0x57,
-	0x2c, 0xd7, 0x53, 0x2d, 0xcf, 0x98, 0x62, 0xd6, 0x5c, 0x9c, 0xe8, 0x21, 0xa4, 0x0d, 0xc6, 0xd9,
-	0xc1, 0xfd, 0x94, 0x00, 0x7f, 0xaa, 0xa2, 0xc9, 0x26, 0x6c, 0x9e, 0xb3, 0x9b, 0xc1, 0xa4, 0xfd,
-	0x4e, 0x86, 0xda, 0xe6, 0x57, 0xb9, 0xcb, 0x81, 0x6f, 0xab, 0x86, 0x3b, 0xe2, 0x2f, 0x37, 0x2a,
-	0x66, 0x1b, 0x90, 0xb2, 0x55, 0x1d, 0xb7, 0x5c, 0xe3, 0x03, 0x16, 0x26, 0x26, 0xe9, 0x44, 0xd3,
-	0xf8, 0x80, 0xd1, 0x26, 0x00, 0xfb, 0xd3, 0x23, 0x57, 0xd8, 0x12, 0x26, 0xb2, 0xe5, 0x67, 0x74,
-	0x42, 0xfe, 0xb3, 0x04, 0x9b, 0x13, 0x36, 0x75, 0x6d, 0x62, 0xb9, 0x18, 0x9d, 0x42, 0x2a, 0xb8,
-	0xe7, 0x8a, 0xba, 0x9e, 0xdb, 0xc6, 0x3e, 0x03, 0x7a, 0x0c, 0x6b, 0x16, 0xfe, 0x9d, 0xd7, 0x0a,
-	0x89, 0xe2, 0x7d, 0x66, 0x85, 0x4e, 0x37, 0x02, 0x61, 0xa7, 0xb0, 0x59, 0x62, 0x7d, 0xf7, 0x3b,
-	0x09, 0x75, 0xf1, 0x4b, 0x0a, 0x1e, 0x0c, 0x33, 0x35, 0xb1, 0x73, 0x63, 0x74, 0x30, 0xfa, 0x2c,
-	0xc1, 0xfa, 0xf8, 0x6a, 0x41, 0xcf, 0xa3, 0x0e, 0x8b, 0x69, 0x45, 0x96, 0x9b, 0xd7, 0x4f, 0xf2,
-	0xf1, 0x1f, 0x3e, 0xff, 0xe7, 0x4f, 0xb1, 0x92, 0xbc, 0x1b, 0x5c, 0xe4, 0x7f, 0xcf, 0x63, 0xfc,
-	0xc2, 0x76, 0xc8, 0x25, 0xee, 0x78, 0x6e, 0x61, 0xa7, 0xe0, 0x60, 0x9d, 0xde, 0xdc, 0x0b, 0x3b,
-	0x1f, 0x83, 0x2f, 0x11, 0x41, 0xd4, 0xf6, 0xfa, 0xa7, 0xf6, 0xdf, 0x24, 0xf8, 0x66, 0x4c, 0xf5,
-	0xa1, 0xa8, 0xab, 0xc4, 0xe4, 0x8a, 0x9d, 0xdf, 0x9e, 0x97, 0xcc, 0x9e, 0x3d, 0x14, 0xb2, 0x87,
-	0xc6, 0x69, 0xac, 0x35, 0xa3, 0xc6, 0x14, 0x76, 0x3e, 0xa2, 0xbf, 0x4b, 0xb0, 0x31, 0xa5, 0xee,
-	0x51, 0xd4, 0xd5, 0x22, 0xba, 0x67, 0xe4, 0x36, 0x7d, 0x8a, 0xd0, 0x17, 0x92, 0x7c, 0x70, 0x62,
-	0xca, 0x75, 0x66, 0x43, 0x45, 0x2e, 0xdd, 0xd5, 0x86, 0x3d, 0xa3, 0xaf, 0x61, 0x4f, 0xda, 0x41,
-	0xff, 0x92, 0x60, 0x7d, 0x7c, 0x57, 0x89, 0x4c, 0xb7, 0xa9, 0xcd, 0x68, 0xfe, 0xf0, 0x34, 0x99,
-	0x69, 0xa7, 0xb9, 0xfd, 0xbe, 0x69, 0x7e, 0xfa, 0xe4, 0xe7, 0xb4, 0xb1, 0x9f, 0x77, 0xff, 0x94,
-	0xe0, 0xfe, 0xd8, 0x8e, 0x82, 0xa2, 0xbe, 0xa4, 0x4c, 0x6b, 0x7e, 0xb9, 0xe7, 0x77, 0x03, 0xf3,
-	0x26, 0x36, 0x2e, 0x11, 0xe7, 0x2b, 0x2c, 0xf4, 0x17, 0x09, 0xd6, 0xc7, 0x37, 0xa4, 0xc8, 0xa8,
-	0x4d, 0xed, 0x63, 0xb9, 0xf5, 0x91, 0xef, 0x52, 0xe5, 0xae, 0xed, 0xdd, 0xfa, 0x92, 0x77, 0xee,
-	0x5c, 0x3b, 0x07, 0x9f, 0x24, 0x78, 0xd4, 0x21, 0xdd, 0xe9, 0xea, 0x0e, 0xd6, 0x47, 0xbc, 0xd6,
-	0xa0, 0x42, 0x1a, 0xd2, 0x6f, 0xca, 0x02, 0xa8, 0x13, 0x53, 0xb5, 0xf4, 0x3c, 0x71, 0xf4, 0x82,
-	0x8e, 0x2d, 0x26, 0xb3, 0xc0, 0xff, 0x52, 0x6d, 0xc3, 0x9d, 0xf0, 0x09, 0xf2, 0x99, 0x3f, 0xd1,
-	0x4e, 0x30, 0xc4, 0xcf, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x21, 0xc2, 0x3b, 0x56, 0x15,
+	proto.RegisterFile("google/cloud/dataproc/v1beta2/workflow_templates.proto", fileDescriptor_workflow_templates_592be9b1ef908c67)
+}
+
+var fileDescriptor_workflow_templates_592be9b1ef908c67 = []byte{
+	// 1794 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0xe3, 0x58,
+	0x1d, 0x1f, 0xbb, 0x4d, 0x9a, 0x7c, 0x33, 0x6d, 0xa3, 0xb7, 0x4c, 0x27, 0x64, 0xb6, 0xda, 0x8e,
+	0x11, 0x4b, 0x29, 0x43, 0x22, 0x8a, 0x40, 0xb3, 0x9d, 0x19, 0xb1, 0x6d, 0x92, 0xce, 0xa4, 0x4d,
+	0x93, 0xe0, 0xb4, 0xbb, 0xab, 0xe1, 0x10, 0x39, 0xf1, 0x1b, 0xd7, 0xad, 0xe3, 0xe7, 0xb1, 0x9d,
+	0xee, 0x76, 0xd0, 0x22, 0x81, 0x56, 0x70, 0xe1, 0xc4, 0x4a, 0x7b, 0x5b, 0x38, 0x71, 0x66, 0x6f,
+	0xdc, 0x91, 0xf8, 0x03, 0x10, 0x7f, 0xc0, 0x5e, 0x38, 0x23, 0x71, 0xe2, 0x8a, 0xde, 0x0f, 0x3b,
+	0xce, 0x4f, 0x27, 0x2d, 0xd2, 0x5e, 0x2a, 0xbf, 0xe7, 0xf7, 0xf9, 0xf8, 0xfb, 0xfd, 0x7c, 0x7f,
+	0x39, 0x2e, 0xfc, 0xd4, 0x20, 0xc4, 0xb0, 0x70, 0xb1, 0x6b, 0x91, 0xbe, 0x5e, 0xd4, 0x35, 0x5f,
+	0x73, 0x5c, 0xd2, 0x2d, 0x5e, 0xfd, 0xa8, 0x83, 0x7d, 0x6d, 0xb7, 0xf8, 0x31, 0x71, 0x2f, 0x5f,
+	0x59, 0xe4, 0xe3, 0xb6, 0x8f, 0x7b, 0x8e, 0xa5, 0xf9, 0xd8, 0x2b, 0x38, 0x2e, 0xf1, 0x09, 0xda,
+	0xe4, 0xb8, 0x02, 0xc3, 0x15, 0x02, 0x5c, 0x41, 0xe0, 0xf2, 0x6f, 0x0b, 0x5a, 0xcd, 0x31, 0x8b,
+	0x9a, 0x6d, 0x13, 0x5f, 0xf3, 0x4d, 0x62, 0x0b, 0x70, 0xfe, 0xd1, 0xec, 0x87, 0x76, 0xad, 0xbe,
+	0xe7, 0x63, 0x37, 0x38, 0xbd, 0x3d, 0xfb, 0xf4, 0x05, 0xe9, 0x04, 0x27, 0xbf, 0x23, 0x4e, 0x5a,
+	0xc4, 0x36, 0xdc, 0xbe, 0x6d, 0x9b, 0xb6, 0x51, 0x24, 0x0e, 0x76, 0x87, 0x1e, 0xfe, 0x40, 0x1c,
+	0x62, 0xab, 0x4e, 0xff, 0x55, 0x11, 0xf7, 0x1c, 0xff, 0x5a, 0xdc, 0x7c, 0x67, 0xf4, 0xa6, 0x6f,
+	0xf6, 0xb0, 0xe7, 0x6b, 0x3d, 0x87, 0x1f, 0x50, 0xfe, 0xb3, 0x04, 0xd9, 0x0f, 0x85, 0x28, 0xa7,
+	0x42, 0x13, 0xb4, 0x06, 0xb2, 0xa9, 0xe7, 0xe4, 0x2d, 0x69, 0x3b, 0xad, 0xca, 0xa6, 0x8e, 0x10,
+	0x2c, 0xdb, 0x5a, 0x0f, 0xe7, 0x24, 0xb6, 0xc3, 0xae, 0x51, 0x0e, 0x56, 0xae, 0xb0, 0xeb, 0x99,
+	0xc4, 0xce, 0x2d, 0x6d, 0x49, 0xdb, 0x09, 0x35, 0x58, 0xa2, 0x27, 0x90, 0xe9, 0xba, 0x58, 0xf3,
+	0x71, 0x9b, 0x3e, 0x2c, 0xb7, 0xbc, 0x25, 0x6d, 0x67, 0x76, 0xf3, 0x05, 0x21, 0x70, 0x60, 0x49,
+	0xe1, 0x34, 0xb0, 0x44, 0x05, 0x7e, 0x9c, 0x6e, 0x50, 0x70, 0xdf, 0xd1, 0x43, 0x70, 0x22, 0x1e,
+	0xcc, 0x8f, 0x33, 0x70, 0x0b, 0x92, 0x96, 0xd6, 0xc1, 0x96, 0x97, 0x4b, 0x6e, 0x2d, 0x6d, 0x67,
+	0x76, 0x9f, 0x14, 0x66, 0x46, 0xb5, 0x30, 0xea, 0x78, 0xa1, 0xc6, 0xd0, 0x15, 0xdb, 0x77, 0xaf,
+	0x55, 0x41, 0x85, 0x3e, 0x80, 0xb4, 0x63, 0x69, 0x5d, 0xdc, 0xc3, 0xb6, 0x9f, 0x5b, 0x61, 0xf6,
+	0x3c, 0x5e, 0x90, 0xb7, 0x19, 0xe0, 0xd5, 0x01, 0x15, 0x7a, 0x06, 0xcb, 0x34, 0xd4, 0xb9, 0x14,
+	0x33, 0xf5, 0xfb, 0x31, 0x94, 0x0d, 0x57, 0xc7, 0x2e, 0xd6, 0x8f, 0x48, 0x47, 0x65, 0xb0, 0xfc,
+	0x7b, 0x90, 0x89, 0x58, 0x8b, 0xb2, 0xb0, 0x74, 0x89, 0xaf, 0x45, 0x84, 0xe8, 0x25, 0xfa, 0x16,
+	0x24, 0xae, 0x34, 0xab, 0x8f, 0x45, 0x1c, 0xf9, 0x62, 0x4f, 0x7e, 0x2c, 0x29, 0x5f, 0x4b, 0xf0,
+	0xed, 0xa9, 0x26, 0xa2, 0x8f, 0x60, 0xbd, 0xa7, 0xd9, 0x9a, 0x81, 0xf5, 0xb6, 0x48, 0x5c, 0xc6,
+	0x9a, 0xd9, 0xfd, 0x61, 0x8c, 0x89, 0x27, 0x1c, 0x55, 0xe2, 0xa0, 0x17, 0x77, 0xd4, 0xb5, 0xde,
+	0xd0, 0x0e, 0xfa, 0x05, 0x64, 0x05, 0x63, 0xdb, 0xc3, 0x16, 0xee, 0xfa, 0xc4, 0x65, 0xc6, 0x65,
+	0x76, 0x0b, 0x31, 0xd4, 0x82, 0xa1, 0x25, 0x50, 0x2f, 0xee, 0xa8, 0xeb, 0xdd, 0xe1, 0xad, 0x83,
+	0x4c, 0x24, 0x4c, 0xca, 0xef, 0x64, 0x58, 0x1b, 0x36, 0x07, 0x3d, 0x84, 0xbb, 0xc1, 0xc3, 0x59,
+	0x2e, 0x73, 0x55, 0x32, 0x62, 0xaf, 0x4e, 0x53, 0xba, 0x0c, 0xc9, 0x2e, 0xb1, 0x5f, 0x99, 0x06,
+	0xcb, 0xe8, 0xcc, 0xee, 0xa3, 0xf9, 0xac, 0x2a, 0x31, 0x8c, 0x2a, 0xb0, 0xe8, 0xe7, 0x61, 0x12,
+	0x2e, 0xb3, 0xc8, 0xbe, 0xb7, 0x90, 0x6c, 0x93, 0x52, 0xf0, 0x36, 0xb1, 0xfe, 0x87, 0x04, 0xeb,
+	0x23, 0xea, 0xd1, 0x72, 0x7e, 0x43, 0xec, 0xb0, 0x9c, 0xe9, 0x35, 0x3a, 0x87, 0xb5, 0x40, 0x1e,
+	0x61, 0xbd, 0xcc, 0xac, 0xdf, 0x5f, 0x2c, 0x32, 0xc1, 0x3a, 0xea, 0xc5, 0x6a, 0x37, 0xba, 0x97,
+	0x7f, 0x1f, 0xd0, 0xf8, 0xa1, 0x85, 0x7c, 0xfa, 0x6f, 0x02, 0x60, 0x50, 0x0f, 0xe8, 0x3e, 0xac,
+	0x78, 0x3e, 0x76, 0xda, 0xa6, 0x2e, 0xe0, 0x49, 0xba, 0xac, 0xea, 0xa8, 0x0a, 0x70, 0xae, 0xe9,
+	0x84, 0x38, 0xed, 0x0b, 0xd2, 0x11, 0x99, 0xb6, 0x1d, 0xe3, 0xcf, 0x0b, 0x06, 0x38, 0x22, 0x9d,
+	0x17, 0x77, 0xd4, 0xf4, 0x79, 0xb0, 0x40, 0x87, 0x90, 0xf6, 0x1c, 0xcd, 0xbd, 0x64, 0x4c, 0x3c,
+	0x3b, 0xbe, 0x17, 0xc3, 0xd4, 0xa2, 0xe7, 0x39, 0x51, 0xca, 0x13, 0xd7, 0xa8, 0x06, 0x19, 0xe7,
+	0x7a, 0xc0, 0xc4, 0x7b, 0x63, 0x5c, 0xed, 0x37, 0xaf, 0x23, 0x5c, 0x20, 0xf0, 0x94, 0xad, 0x04,
+	0xa9, 0x73, 0xf3, 0x0a, 0x33, 0x2a, 0xde, 0x29, 0xdf, 0x8d, 0x73, 0xcf, 0xbc, 0xc2, 0x9c, 0x67,
+	0xe5, 0x9c, 0x5f, 0xa2, 0xf7, 0x61, 0xc5, 0x31, 0x0d, 0xc6, 0x91, 0x64, 0x1c, 0xdf, 0x8d, 0x33,
+	0xc7, 0x34, 0x38, 0x45, 0xd2, 0x61, 0x57, 0xa8, 0x09, 0xab, 0xdc, 0x25, 0xef, 0xb5, 0xc5, 0x78,
+	0x78, 0x97, 0xdc, 0x99, 0x47, 0xa0, 0xd6, 0x6b, 0x8b, 0x93, 0x65, 0xbc, 0xc1, 0x12, 0x9d, 0x84,
+	0x35, 0xc4, 0xbb, 0xe3, 0x4f, 0xe6, 0xee, 0x8e, 0x13, 0x5b, 0x78, 0x0d, 0xc0, 0xeb, 0x9e, 0x63,
+	0xbd, 0x6f, 0x99, 0xb6, 0x91, 0x4b, 0xcf, 0x55, 0xdc, 0x47, 0xa4, 0xd3, 0x0a, 0x31, 0x6a, 0x04,
+	0x8f, 0x76, 0xe1, 0x9e, 0xe3, 0x62, 0x17, 0xbf, 0xee, 0x9b, 0x9e, 0xe9, 0xe3, 0xb6, 0x48, 0x3e,
+	0x2f, 0x07, 0x5b, 0x4b, 0xdb, 0x69, 0xf5, 0xad, 0xe8, 0xcd, 0x16, 0xcb, 0xc4, 0xdb, 0x54, 0xf0,
+	0x01, 0x40, 0xea, 0x82, 0x74, 0xda, 0xfe, 0xb5, 0x83, 0x95, 0xdf, 0x26, 0x06, 0xd3, 0xfa, 0x04,
+	0xfb, 0x1a, 0xb5, 0x1a, 0xe5, 0x21, 0x15, 0xbc, 0xcd, 0x08, 0xc6, 0x70, 0x1d, 0x9d, 0xd2, 0xf2,
+	0xf0, 0x94, 0xfe, 0x00, 0xd6, 0xc4, 0x94, 0x0e, 0xba, 0x3c, 0x4f, 0xeb, 0xe2, 0x7c, 0x05, 0xdf,
+	0x08, 0x5e, 0x43, 0xd4, 0x55, 0x4e, 0x13, 0xf4, 0xd9, 0x03, 0x48, 0x18, 0xae, 0xe6, 0x9c, 0x8b,
+	0xdc, 0x7e, 0x34, 0xe7, 0xa8, 0x7c, 0x4e, 0x31, 0x2a, 0x87, 0x52, 0xdb, 0x74, 0x6c, 0xe1, 0x88,
+	0x6d, 0x89, 0x1b, 0xda, 0xc6, 0x69, 0x02, 0xdb, 0x8e, 0x21, 0xe1, 0xf9, 0x54, 0x26, 0x9a, 0xe8,
+	0x6b, 0xb1, 0x59, 0x35, 0xaa, 0x74, 0xa1, 0x45, 0xc1, 0x2a, 0xe7, 0x18, 0x1b, 0x28, 0x2b, 0xe3,
+	0x03, 0xa5, 0x0d, 0xe0, 0x68, 0xae, 0xd6, 0xc3, 0xf4, 0xed, 0x4f, 0xa4, 0xf2, 0xcf, 0x16, 0x7d,
+	0x68, 0x33, 0x64, 0xe0, 0x49, 0x1d, 0xa1, 0xcc, 0x3f, 0x83, 0xf5, 0x91, 0xdb, 0x0b, 0x35, 0xd2,
+	0xc7, 0x90, 0x60, 0x2e, 0xa1, 0x0c, 0xac, 0x9c, 0xd5, 0x8f, 0xeb, 0x8d, 0x0f, 0xeb, 0xd9, 0x3b,
+	0x74, 0xd1, 0xac, 0xd4, 0xcb, 0xd5, 0xfa, 0xf3, 0xac, 0x44, 0x17, 0xea, 0x59, 0xbd, 0x4e, 0x17,
+	0x32, 0x4a, 0xc1, 0x72, 0xb9, 0x51, 0xaf, 0x64, 0x97, 0x94, 0x36, 0x64, 0x47, 0xc5, 0xa6, 0x82,
+	0x84, 0x2f, 0xa7, 0x83, 0x66, 0x9c, 0x09, 0xf7, 0xaa, 0x3a, 0x35, 0x05, 0xbb, 0xae, 0x18, 0xfb,
+	0x69, 0x95, 0x2f, 0xe8, 0x3c, 0xd2, 0xe9, 0x3c, 0xa2, 0x09, 0x98, 0x52, 0xd9, 0xb5, 0xa2, 0xc2,
+	0xea, 0x50, 0x6a, 0xa0, 0x7d, 0x48, 0xd8, 0x44, 0xc7, 0x5e, 0x4e, 0x62, 0x32, 0xfe, 0x60, 0x4e,
+	0x19, 0xeb, 0x44, 0xc7, 0x2a, 0x47, 0x2a, 0x7f, 0x93, 0xe1, 0x6e, 0x74, 0x7f, 0xfa, 0xe4, 0x98,
+	0x5a, 0xe2, 0xf2, 0xd4, 0x12, 0x47, 0xf7, 0x20, 0x49, 0xeb, 0xd4, 0xd4, 0x99, 0x1f, 0x69, 0x35,
+	0x71, 0x41, 0x3a, 0x55, 0x7d, 0x90, 0x73, 0x89, 0x85, 0x72, 0x8e, 0xda, 0x57, 0xa0, 0x7f, 0x86,
+	0x72, 0x2e, 0xd4, 0x2f, 0x19, 0xd1, 0x4f, 0xb9, 0x84, 0x74, 0x78, 0x12, 0x3d, 0x80, 0xfb, 0xf5,
+	0x46, 0xb9, 0xd2, 0x6e, 0x9d, 0xee, 0x9f, 0x9e, 0xb5, 0xda, 0x67, 0xf5, 0x56, 0xb3, 0x52, 0xaa,
+	0x1e, 0x56, 0x2b, 0x65, 0x1e, 0xda, 0x83, 0x5a, 0xa3, 0x74, 0x5c, 0x29, 0x67, 0x25, 0x74, 0x17,
+	0x52, 0x34, 0xb4, 0xfb, 0x07, 0xb5, 0x4a, 0x56, 0x8e, 0x06, 0x7a, 0x09, 0xad, 0x42, 0xba, 0xd4,
+	0x38, 0x69, 0xd6, 0x2a, 0xa7, 0x95, 0x72, 0x76, 0x19, 0x01, 0x24, 0x0f, 0xf7, 0xab, 0xb5, 0x4a,
+	0x39, 0x9b, 0x50, 0x3e, 0x93, 0x60, 0xb3, 0xc4, 0x2a, 0x7e, 0xf4, 0x15, 0x52, 0xc5, 0xaf, 0xfb,
+	0xd8, 0xf3, 0xd1, 0x06, 0x24, 0x1d, 0xcd, 0xa5, 0x6f, 0xcb, 0x42, 0x54, 0xbe, 0x42, 0xc7, 0x91,
+	0x3e, 0x25, 0xcf, 0x55, 0xcf, 0x63, 0x4f, 0x08, 0x09, 0x94, 0x23, 0xc8, 0x3f, 0xc7, 0xfe, 0x34,
+	0x13, 0x62, 0x7e, 0xb0, 0x0c, 0xb7, 0x42, 0xc5, 0x03, 0xa5, 0x6a, 0x7b, 0xbe, 0x66, 0xfb, 0xe6,
+	0x0c, 0xb7, 0x16, 0xe2, 0x44, 0xef, 0x40, 0xc6, 0x64, 0x9c, 0x5d, 0x3c, 0x48, 0x09, 0x08, 0xb6,
+	0xaa, 0xba, 0xf2, 0x95, 0x04, 0xdb, 0x91, 0xa7, 0x56, 0x6d, 0xcb, 0xb4, 0xbf, 0x51, 0x49, 0xe3,
+	0x4d, 0xb6, 0x60, 0xf3, 0x8c, 0xfd, 0xd8, 0x9a, 0x66, 0xe6, 0xf1, 0xc8, 0x24, 0xba, 0x55, 0x84,
+	0x5d, 0x78, 0xbb, 0x66, 0x7a, 0x63, 0x21, 0xf6, 0xe2, 0x34, 0x79, 0x00, 0x69, 0x47, 0x33, 0x70,
+	0xdb, 0x33, 0xdf, 0x60, 0x11, 0x95, 0x14, 0xdd, 0x68, 0x99, 0x6f, 0x30, 0xda, 0xa4, 0x1d, 0xd9,
+	0xc0, 0x6d, 0x9f, 0x5c, 0x62, 0x5b, 0xb8, 0xc8, 0x8e, 0x9f, 0xd2, 0x0d, 0xe5, 0x0b, 0x09, 0x36,
+	0xa7, 0x3c, 0xd4, 0x73, 0x88, 0xed, 0x61, 0x74, 0x02, 0xe9, 0xf0, 0xd3, 0x81, 0x68, 0x45, 0x0b,
+	0xfb, 0x38, 0x60, 0x40, 0xef, 0xc2, 0xba, 0x8d, 0x3f, 0xf1, 0xdb, 0x11, 0xa3, 0x78, 0x6b, 0x5c,
+	0xa5, 0xdb, 0xcd, 0xd0, 0xb0, 0x13, 0xd8, 0x2c, 0xb3, 0x51, 0xf6, 0x7f, 0xc9, 0xce, 0xdd, 0xaf,
+	0xd7, 0xe1, 0xfe, 0x28, 0x53, 0x0b, 0xbb, 0x57, 0x66, 0x17, 0xa3, 0x2f, 0x65, 0xd8, 0x98, 0x5c,
+	0xe0, 0xe8, 0x69, 0xdc, 0xfc, 0x9d, 0xd5, 0x17, 0xf2, 0x8b, 0xea, 0xa4, 0x7c, 0x2e, 0xfd, 0xe6,
+	0x9f, 0xff, 0xfa, 0x5c, 0xfe, 0xbd, 0xa4, 0x3c, 0x0e, 0xbf, 0x8e, 0xfc, 0x92, 0x47, 0xf9, 0x99,
+	0xe3, 0x92, 0x0b, 0xdc, 0xf5, 0xbd, 0xe2, 0x4e, 0xd1, 0xc5, 0x86, 0x49, 0x6c, 0xaf, 0xb8, 0xf3,
+	0x69, 0xf8, 0x79, 0x27, 0x8c, 0xdb, 0x5e, 0x98, 0x4f, 0x2f, 0x0f, 0x95, 0xbd, 0x59, 0x2c, 0x16,
+	0xe9, 0xf2, 0xcf, 0x2a, 0x31, 0x3c, 0xe8, 0xd7, 0x32, 0xbc, 0x35, 0xa1, 0xf5, 0xa0, 0xb8, 0xdf,
+	0x79, 0xd3, 0xdb, 0xd5, 0xe2, 0xca, 0xfc, 0x8a, 0x09, 0xf3, 0x09, 0x8a, 0xe8, 0x42, 0x23, 0x3e,
+	0x51, 0x95, 0x71, 0x67, 0x8a, 0x3b, 0x9f, 0xbe, 0x7c, 0x8a, 0xf6, 0xa6, 0x63, 0x23, 0x5a, 0x4c,
+	0x44, 0xa3, 0x3f, 0xc9, 0xf0, 0x60, 0x46, 0xcb, 0x44, 0x71, 0xbf, 0x1a, 0xe3, 0xdb, 0x6d, 0x7e,
+	0x33, 0xa0, 0x88, 0x7c, 0xfc, 0x2a, 0x84, 0x2f, 0x1b, 0xca, 0x97, 0x3c, 0x37, 0xbe, 0x90, 0x94,
+	0xf2, 0x4d, 0x35, 0xd8, 0x33, 0x07, 0x56, 0xec, 0x49, 0x3b, 0x2f, 0x8f, 0x95, 0xc3, 0x9b, 0x4b,
+	0x32, 0x42, 0x86, 0xfe, 0x2e, 0xc3, 0xc3, 0xd8, 0xf6, 0x8e, 0x9e, 0xcf, 0xaf, 0xd3, 0xcc, 0x01,
+	0x11, 0xa7, 0xd6, 0x5f, 0xb9, 0x5a, 0x5f, 0x49, 0xca, 0xd1, 0x8d, 0x2b, 0xc9, 0x1c, 0xb5, 0x25,
+	0x52, 0x5b, 0x1f, 0x29, 0xb5, 0x5b, 0xd4, 0xd6, 0x0c, 0x66, 0xf4, 0x17, 0x19, 0x36, 0x26, 0x0f,
+	0x9d, 0xd8, 0x6e, 0x34, 0x73, 0x56, 0x2d, 0x5e, 0x73, 0x7f, 0xe6, 0x1a, 0xfe, 0x51, 0xca, 0xef,
+	0x0f, 0x7c, 0x0d, 0xec, 0x2c, 0x2c, 0x98, 0x7a, 0x03, 0xe9, 0x1a, 0xf9, 0xd2, 0x1c, 0x74, 0xb1,
+	0xe9, 0x37, 0x50, 0xec, 0x0f, 0x32, 0xdc, 0x9b, 0x38, 0xc3, 0x50, 0xdc, 0xe7, 0xd0, 0x59, 0xe3,
+	0x36, 0xff, 0xf4, 0x66, 0x60, 0x3e, 0x36, 0x27, 0x35, 0xac, 0xc5, 0xd2, 0x6f, 0xb8, 0x61, 0x2d,
+	0x9a, 0x62, 0xe8, 0xdf, 0x12, 0x6c, 0x4c, 0x1e, 0xa0, 0xb1, 0x69, 0x34, 0x73, 0xee, 0xe6, 0x37,
+	0xc6, 0x3e, 0x4d, 0x57, 0x7a, 0x8e, 0x7f, 0x1d, 0x38, 0xbc, 0x73, 0x8b, 0x0e, 0xbd, 0x73, 0x8b,
+	0x0e, 0x7d, 0xf0, 0x99, 0x04, 0x0f, 0xbb, 0xa4, 0x37, 0xdb, 0xb7, 0x83, 0x8d, 0xb1, 0x88, 0x35,
+	0xa9, 0x1b, 0x4d, 0xe9, 0x65, 0x45, 0x00, 0x0d, 0x62, 0x69, 0xb6, 0x51, 0x20, 0xae, 0x51, 0x34,
+	0xb0, 0xcd, 0x9c, 0x2c, 0xf2, 0x5b, 0x9a, 0x63, 0x7a, 0x53, 0xfe, 0x87, 0xf1, 0x24, 0xd8, 0xe8,
+	0x24, 0x19, 0xe2, 0xc7, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x10, 0x10, 0x40, 0xc7, 0x97, 0x19,
 	0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/agent.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/agent.pb.go
new file mode 100644
index 00000000..4cf255f7
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/agent.pb.go
@@ -0,0 +1,1264 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2/agent.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "github.com/golang/protobuf/ptypes/empty"
+import _ "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import _ "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Match mode determines how intents are detected from user queries.
+type Agent_MatchMode int32
+
+const (
+	// Not specified.
+	Agent_MATCH_MODE_UNSPECIFIED Agent_MatchMode = 0
+	// Best for agents with a small number of examples in intents and/or wide
+	// use of templates syntax and composite entities.
+	Agent_MATCH_MODE_HYBRID Agent_MatchMode = 1
+	// Can be used for agents with a large number of examples in intents,
+	// especially the ones using @sys.any or very large developer entities.
+	Agent_MATCH_MODE_ML_ONLY Agent_MatchMode = 2
+)
+
+var Agent_MatchMode_name = map[int32]string{
+	0: "MATCH_MODE_UNSPECIFIED",
+	1: "MATCH_MODE_HYBRID",
+	2: "MATCH_MODE_ML_ONLY",
+}
+var Agent_MatchMode_value = map[string]int32{
+	"MATCH_MODE_UNSPECIFIED": 0,
+	"MATCH_MODE_HYBRID":      1,
+	"MATCH_MODE_ML_ONLY":     2,
+}
+
+func (x Agent_MatchMode) String() string {
+	return proto.EnumName(Agent_MatchMode_name, int32(x))
+}
+func (Agent_MatchMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{0, 0}
+}
+
+// Represents a conversational agent.
+type Agent struct {
+	// Required. The project of this agent.
+	// Format: `projects/<Project ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The name of this agent.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Required. The default language of the agent as a language tag. See
+	// [Language Support](https://dialogflow.com/docs/reference/language) for a
+	// list of the currently supported language codes.
+	// This field cannot be set by the `Update` method.
+	DefaultLanguageCode string `protobuf:"bytes,3,opt,name=default_language_code,json=defaultLanguageCode,proto3" json:"default_language_code,omitempty"`
+	// Optional. The list of all languages supported by this agent (except for the
+	// `default_language_code`).
+	SupportedLanguageCodes []string `protobuf:"bytes,4,rep,name=supported_language_codes,json=supportedLanguageCodes,proto3" json:"supported_language_codes,omitempty"`
+	// Required. The time zone of this agent from the
+	// [time zone database](https://www.iana.org/time-zones), e.g.,
+	// America/New_York, Europe/Paris.
+	TimeZone string `protobuf:"bytes,5,opt,name=time_zone,json=timeZone,proto3" json:"time_zone,omitempty"`
+	// Optional. The description of this agent.
+	// The maximum length is 500 characters. If exceeded, the request is rejected.
+	Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"`
+	// Optional. The URI of the agent's avatar.
+	// Avatars are used throughout the Dialogflow console and in the self-hosted
+	// [Web Demo](https://dialogflow.com/docs/integrations/web-demo) integration.
+	AvatarUri string `protobuf:"bytes,7,opt,name=avatar_uri,json=avatarUri,proto3" json:"avatar_uri,omitempty"`
+	// Optional. Determines whether this agent should log conversation queries.
+	EnableLogging bool `protobuf:"varint,8,opt,name=enable_logging,json=enableLogging,proto3" json:"enable_logging,omitempty"`
+	// Optional. Determines how intents are detected from user queries.
+	MatchMode Agent_MatchMode `protobuf:"varint,9,opt,name=match_mode,json=matchMode,proto3,enum=google.cloud.dialogflow.v2.Agent_MatchMode" json:"match_mode,omitempty"`
+	// Optional. To filter out false positive results and still get variety in
+	// matched natural language inputs for your agent, you can tune the machine
+	// learning classification threshold. If the returned score value is less than
+	// the threshold value, then a fallback intent is be triggered or, if there
+	// are no fallback intents defined, no intent will be triggered. The score
+	// values range from 0.0 (completely uncertain) to 1.0 (completely certain).
+	// If set to 0.0, the default of 0.3 is used.
+	ClassificationThreshold float32  `protobuf:"fixed32,10,opt,name=classification_threshold,json=classificationThreshold,proto3" json:"classification_threshold,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
+	XXX_unrecognized        []byte   `json:"-"`
+	XXX_sizecache           int32    `json:"-"`
+}
+
+func (m *Agent) Reset()         { *m = Agent{} }
+func (m *Agent) String() string { return proto.CompactTextString(m) }
+func (*Agent) ProtoMessage()    {}
+func (*Agent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{0}
+}
+func (m *Agent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Agent.Unmarshal(m, b)
+}
+func (m *Agent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Agent.Marshal(b, m, deterministic)
+}
+func (dst *Agent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Agent.Merge(dst, src)
+}
+func (m *Agent) XXX_Size() int {
+	return xxx_messageInfo_Agent.Size(m)
+}
+func (m *Agent) XXX_DiscardUnknown() {
+	xxx_messageInfo_Agent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Agent proto.InternalMessageInfo
+
+func (m *Agent) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *Agent) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *Agent) GetDefaultLanguageCode() string {
+	if m != nil {
+		return m.DefaultLanguageCode
+	}
+	return ""
+}
+
+func (m *Agent) GetSupportedLanguageCodes() []string {
+	if m != nil {
+		return m.SupportedLanguageCodes
+	}
+	return nil
+}
+
+func (m *Agent) GetTimeZone() string {
+	if m != nil {
+		return m.TimeZone
+	}
+	return ""
+}
+
+func (m *Agent) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *Agent) GetAvatarUri() string {
+	if m != nil {
+		return m.AvatarUri
+	}
+	return ""
+}
+
+func (m *Agent) GetEnableLogging() bool {
+	if m != nil {
+		return m.EnableLogging
+	}
+	return false
+}
+
+func (m *Agent) GetMatchMode() Agent_MatchMode {
+	if m != nil {
+		return m.MatchMode
+	}
+	return Agent_MATCH_MODE_UNSPECIFIED
+}
+
+func (m *Agent) GetClassificationThreshold() float32 {
+	if m != nil {
+		return m.ClassificationThreshold
+	}
+	return 0
+}
+
+// The request message for [Agents.GetAgent][google.cloud.dialogflow.v2.Agents.GetAgent].
+type GetAgentRequest struct {
+	// Required. The project that the agent to fetch is associated with.
+	// Format: `projects/<Project ID>`.
+	Parent               string   `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetAgentRequest) Reset()         { *m = GetAgentRequest{} }
+func (m *GetAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*GetAgentRequest) ProtoMessage()    {}
+func (*GetAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{1}
+}
+func (m *GetAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetAgentRequest.Unmarshal(m, b)
+}
+func (m *GetAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAgentRequest.Merge(dst, src)
+}
+func (m *GetAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_GetAgentRequest.Size(m)
+}
+func (m *GetAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetAgentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetAgentRequest proto.InternalMessageInfo
+
+func (m *GetAgentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+// The request message for [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
+type SearchAgentsRequest struct {
+	// Required. The project to list agents from.
+	// Format: `projects/<Project ID or '-'>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The maximum number of items to return in a single page. By
+	// default 100 and at most 1000.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional. The next_page_token value returned from a previous list request.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchAgentsRequest) Reset()         { *m = SearchAgentsRequest{} }
+func (m *SearchAgentsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchAgentsRequest) ProtoMessage()    {}
+func (*SearchAgentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{2}
+}
+func (m *SearchAgentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchAgentsRequest.Unmarshal(m, b)
+}
+func (m *SearchAgentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchAgentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchAgentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAgentsRequest.Merge(dst, src)
+}
+func (m *SearchAgentsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchAgentsRequest.Size(m)
+}
+func (m *SearchAgentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchAgentsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchAgentsRequest proto.InternalMessageInfo
+
+func (m *SearchAgentsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *SearchAgentsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *SearchAgentsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// The response message for [Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
+type SearchAgentsResponse struct {
+	// The list of agents. There will be a maximum number of items returned based
+	// on the page_size field in the request.
+	Agents []*Agent `protobuf:"bytes,1,rep,name=agents,proto3" json:"agents,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchAgentsResponse) Reset()         { *m = SearchAgentsResponse{} }
+func (m *SearchAgentsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchAgentsResponse) ProtoMessage()    {}
+func (*SearchAgentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{3}
+}
+func (m *SearchAgentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchAgentsResponse.Unmarshal(m, b)
+}
+func (m *SearchAgentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchAgentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchAgentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAgentsResponse.Merge(dst, src)
+}
+func (m *SearchAgentsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchAgentsResponse.Size(m)
+}
+func (m *SearchAgentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchAgentsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchAgentsResponse proto.InternalMessageInfo
+
+func (m *SearchAgentsResponse) GetAgents() []*Agent {
+	if m != nil {
+		return m.Agents
+	}
+	return nil
+}
+
+func (m *SearchAgentsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The request message for [Agents.TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent].
+type TrainAgentRequest struct {
+	// Required. The project that the agent to train is associated with.
+	// Format: `projects/<Project ID>`.
+	Parent               string   `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TrainAgentRequest) Reset()         { *m = TrainAgentRequest{} }
+func (m *TrainAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*TrainAgentRequest) ProtoMessage()    {}
+func (*TrainAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{4}
+}
+func (m *TrainAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TrainAgentRequest.Unmarshal(m, b)
+}
+func (m *TrainAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TrainAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *TrainAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrainAgentRequest.Merge(dst, src)
+}
+func (m *TrainAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_TrainAgentRequest.Size(m)
+}
+func (m *TrainAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_TrainAgentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TrainAgentRequest proto.InternalMessageInfo
+
+func (m *TrainAgentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+// The request message for [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
+type ExportAgentRequest struct {
+	// Required. The project that the agent to export is associated with.
+	// Format: `projects/<Project ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The Google Cloud Storage URI to export the agent to.
+	// Note: The URI must start with
+	// "gs://". If left unspecified, the serialized agent is returned inline.
+	AgentUri             string   `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri,proto3" json:"agent_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExportAgentRequest) Reset()         { *m = ExportAgentRequest{} }
+func (m *ExportAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*ExportAgentRequest) ProtoMessage()    {}
+func (*ExportAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{5}
+}
+func (m *ExportAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportAgentRequest.Unmarshal(m, b)
+}
+func (m *ExportAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExportAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAgentRequest.Merge(dst, src)
+}
+func (m *ExportAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_ExportAgentRequest.Size(m)
+}
+func (m *ExportAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportAgentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportAgentRequest proto.InternalMessageInfo
+
+func (m *ExportAgentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ExportAgentRequest) GetAgentUri() string {
+	if m != nil {
+		return m.AgentUri
+	}
+	return ""
+}
+
+// The response message for [Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
+type ExportAgentResponse struct {
+	// Required. The exported agent.
+	//
+	// Types that are valid to be assigned to Agent:
+	//	*ExportAgentResponse_AgentUri
+	//	*ExportAgentResponse_AgentContent
+	Agent                isExportAgentResponse_Agent `protobuf_oneof:"agent"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *ExportAgentResponse) Reset()         { *m = ExportAgentResponse{} }
+func (m *ExportAgentResponse) String() string { return proto.CompactTextString(m) }
+func (*ExportAgentResponse) ProtoMessage()    {}
+func (*ExportAgentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{6}
+}
+func (m *ExportAgentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportAgentResponse.Unmarshal(m, b)
+}
+func (m *ExportAgentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportAgentResponse.Marshal(b, m, deterministic)
+}
+func (dst *ExportAgentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAgentResponse.Merge(dst, src)
+}
+func (m *ExportAgentResponse) XXX_Size() int {
+	return xxx_messageInfo_ExportAgentResponse.Size(m)
+}
+func (m *ExportAgentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportAgentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportAgentResponse proto.InternalMessageInfo
+
+type isExportAgentResponse_Agent interface {
+	isExportAgentResponse_Agent()
+}
+
+type ExportAgentResponse_AgentUri struct {
+	AgentUri string `protobuf:"bytes,1,opt,name=agent_uri,json=agentUri,proto3,oneof"`
+}
+
+type ExportAgentResponse_AgentContent struct {
+	AgentContent []byte `protobuf:"bytes,2,opt,name=agent_content,json=agentContent,proto3,oneof"`
+}
+
+func (*ExportAgentResponse_AgentUri) isExportAgentResponse_Agent() {}
+
+func (*ExportAgentResponse_AgentContent) isExportAgentResponse_Agent() {}
+
+func (m *ExportAgentResponse) GetAgent() isExportAgentResponse_Agent {
+	if m != nil {
+		return m.Agent
+	}
+	return nil
+}
+
+func (m *ExportAgentResponse) GetAgentUri() string {
+	if x, ok := m.GetAgent().(*ExportAgentResponse_AgentUri); ok {
+		return x.AgentUri
+	}
+	return ""
+}
+
+func (m *ExportAgentResponse) GetAgentContent() []byte {
+	if x, ok := m.GetAgent().(*ExportAgentResponse_AgentContent); ok {
+		return x.AgentContent
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ExportAgentResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ExportAgentResponse_OneofMarshaler, _ExportAgentResponse_OneofUnmarshaler, _ExportAgentResponse_OneofSizer, []interface{}{
+		(*ExportAgentResponse_AgentUri)(nil),
+		(*ExportAgentResponse_AgentContent)(nil),
+	}
+}
+
+func _ExportAgentResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ExportAgentResponse)
+	// agent
+	switch x := m.Agent.(type) {
+	case *ExportAgentResponse_AgentUri:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.AgentUri)
+	case *ExportAgentResponse_AgentContent:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.AgentContent)
+	case nil:
+	default:
+		return fmt.Errorf("ExportAgentResponse.Agent has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ExportAgentResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ExportAgentResponse)
+	switch tag {
+	case 1: // agent.agent_uri
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Agent = &ExportAgentResponse_AgentUri{x}
+		return true, err
+	case 2: // agent.agent_content
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.Agent = &ExportAgentResponse_AgentContent{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ExportAgentResponse_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ExportAgentResponse)
+	// agent
+	switch x := m.Agent.(type) {
+	case *ExportAgentResponse_AgentUri:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.AgentUri)))
+		n += len(x.AgentUri)
+	case *ExportAgentResponse_AgentContent:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.AgentContent)))
+		n += len(x.AgentContent)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The request message for [Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
+type ImportAgentRequest struct {
+	// Required. The project that the agent to import is associated with.
+	// Format: `projects/<Project ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The agent to import.
+	//
+	// Types that are valid to be assigned to Agent:
+	//	*ImportAgentRequest_AgentUri
+	//	*ImportAgentRequest_AgentContent
+	Agent                isImportAgentRequest_Agent `protobuf_oneof:"agent"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *ImportAgentRequest) Reset()         { *m = ImportAgentRequest{} }
+func (m *ImportAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportAgentRequest) ProtoMessage()    {}
+func (*ImportAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{7}
+}
+func (m *ImportAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportAgentRequest.Unmarshal(m, b)
+}
+func (m *ImportAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportAgentRequest.Merge(dst, src)
+}
+func (m *ImportAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportAgentRequest.Size(m)
+}
+func (m *ImportAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportAgentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportAgentRequest proto.InternalMessageInfo
+
+func (m *ImportAgentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+type isImportAgentRequest_Agent interface {
+	isImportAgentRequest_Agent()
+}
+
+type ImportAgentRequest_AgentUri struct {
+	AgentUri string `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri,proto3,oneof"`
+}
+
+type ImportAgentRequest_AgentContent struct {
+	AgentContent []byte `protobuf:"bytes,3,opt,name=agent_content,json=agentContent,proto3,oneof"`
+}
+
+func (*ImportAgentRequest_AgentUri) isImportAgentRequest_Agent() {}
+
+func (*ImportAgentRequest_AgentContent) isImportAgentRequest_Agent() {}
+
+func (m *ImportAgentRequest) GetAgent() isImportAgentRequest_Agent {
+	if m != nil {
+		return m.Agent
+	}
+	return nil
+}
+
+func (m *ImportAgentRequest) GetAgentUri() string {
+	if x, ok := m.GetAgent().(*ImportAgentRequest_AgentUri); ok {
+		return x.AgentUri
+	}
+	return ""
+}
+
+func (m *ImportAgentRequest) GetAgentContent() []byte {
+	if x, ok := m.GetAgent().(*ImportAgentRequest_AgentContent); ok {
+		return x.AgentContent
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ImportAgentRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ImportAgentRequest_OneofMarshaler, _ImportAgentRequest_OneofUnmarshaler, _ImportAgentRequest_OneofSizer, []interface{}{
+		(*ImportAgentRequest_AgentUri)(nil),
+		(*ImportAgentRequest_AgentContent)(nil),
+	}
+}
+
+func _ImportAgentRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ImportAgentRequest)
+	// agent
+	switch x := m.Agent.(type) {
+	case *ImportAgentRequest_AgentUri:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.AgentUri)
+	case *ImportAgentRequest_AgentContent:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.AgentContent)
+	case nil:
+	default:
+		return fmt.Errorf("ImportAgentRequest.Agent has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ImportAgentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ImportAgentRequest)
+	switch tag {
+	case 2: // agent.agent_uri
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Agent = &ImportAgentRequest_AgentUri{x}
+		return true, err
+	case 3: // agent.agent_content
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.Agent = &ImportAgentRequest_AgentContent{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ImportAgentRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ImportAgentRequest)
+	// agent
+	switch x := m.Agent.(type) {
+	case *ImportAgentRequest_AgentUri:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.AgentUri)))
+		n += len(x.AgentUri)
+	case *ImportAgentRequest_AgentContent:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.AgentContent)))
+		n += len(x.AgentContent)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The request message for [Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
+type RestoreAgentRequest struct {
+	// Required. The project that the agent to restore is associated with.
+	// Format: `projects/<Project ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The agent to restore.
+	//
+	// Types that are valid to be assigned to Agent:
+	//	*RestoreAgentRequest_AgentUri
+	//	*RestoreAgentRequest_AgentContent
+	Agent                isRestoreAgentRequest_Agent `protobuf_oneof:"agent"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *RestoreAgentRequest) Reset()         { *m = RestoreAgentRequest{} }
+func (m *RestoreAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*RestoreAgentRequest) ProtoMessage()    {}
+func (*RestoreAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_6cbd45e0738ac4ce, []int{8}
+}
+func (m *RestoreAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RestoreAgentRequest.Unmarshal(m, b)
+}
+func (m *RestoreAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RestoreAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *RestoreAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestoreAgentRequest.Merge(dst, src)
+}
+func (m *RestoreAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_RestoreAgentRequest.Size(m)
+}
+func (m *RestoreAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RestoreAgentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RestoreAgentRequest proto.InternalMessageInfo
+
+func (m *RestoreAgentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+type isRestoreAgentRequest_Agent interface {
+	isRestoreAgentRequest_Agent()
+}
+
+type RestoreAgentRequest_AgentUri struct {
+	AgentUri string `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri,proto3,oneof"`
+}
+
+type RestoreAgentRequest_AgentContent struct {
+	AgentContent []byte `protobuf:"bytes,3,opt,name=agent_content,json=agentContent,proto3,oneof"`
+}
+
+func (*RestoreAgentRequest_AgentUri) isRestoreAgentRequest_Agent() {}
+
+func (*RestoreAgentRequest_AgentContent) isRestoreAgentRequest_Agent() {}
+
+func (m *RestoreAgentRequest) GetAgent() isRestoreAgentRequest_Agent {
+	if m != nil {
+		return m.Agent
+	}
+	return nil
+}
+
+func (m *RestoreAgentRequest) GetAgentUri() string {
+	if x, ok := m.GetAgent().(*RestoreAgentRequest_AgentUri); ok {
+		return x.AgentUri
+	}
+	return ""
+}
+
+func (m *RestoreAgentRequest) GetAgentContent() []byte {
+	if x, ok := m.GetAgent().(*RestoreAgentRequest_AgentContent); ok {
+		return x.AgentContent
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*RestoreAgentRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _RestoreAgentRequest_OneofMarshaler, _RestoreAgentRequest_OneofUnmarshaler, _RestoreAgentRequest_OneofSizer, []interface{}{
+		(*RestoreAgentRequest_AgentUri)(nil),
+		(*RestoreAgentRequest_AgentContent)(nil),
+	}
+}
+
+func _RestoreAgentRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*RestoreAgentRequest)
+	// agent
+	switch x := m.Agent.(type) {
+	case *RestoreAgentRequest_AgentUri:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.AgentUri)
+	case *RestoreAgentRequest_AgentContent:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.AgentContent)
+	case nil:
+	default:
+		return fmt.Errorf("RestoreAgentRequest.Agent has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _RestoreAgentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*RestoreAgentRequest)
+	switch tag {
+	case 2: // agent.agent_uri
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Agent = &RestoreAgentRequest_AgentUri{x}
+		return true, err
+	case 3: // agent.agent_content
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.Agent = &RestoreAgentRequest_AgentContent{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _RestoreAgentRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*RestoreAgentRequest)
+	// agent
+	switch x := m.Agent.(type) {
+	case *RestoreAgentRequest_AgentUri:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.AgentUri)))
+		n += len(x.AgentUri)
+	case *RestoreAgentRequest_AgentContent:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.AgentContent)))
+		n += len(x.AgentContent)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+func init() {
+	proto.RegisterType((*Agent)(nil), "google.cloud.dialogflow.v2.Agent")
+	proto.RegisterType((*GetAgentRequest)(nil), "google.cloud.dialogflow.v2.GetAgentRequest")
+	proto.RegisterType((*SearchAgentsRequest)(nil), "google.cloud.dialogflow.v2.SearchAgentsRequest")
+	proto.RegisterType((*SearchAgentsResponse)(nil), "google.cloud.dialogflow.v2.SearchAgentsResponse")
+	proto.RegisterType((*TrainAgentRequest)(nil), "google.cloud.dialogflow.v2.TrainAgentRequest")
+	proto.RegisterType((*ExportAgentRequest)(nil), "google.cloud.dialogflow.v2.ExportAgentRequest")
+	proto.RegisterType((*ExportAgentResponse)(nil), "google.cloud.dialogflow.v2.ExportAgentResponse")
+	proto.RegisterType((*ImportAgentRequest)(nil), "google.cloud.dialogflow.v2.ImportAgentRequest")
+	proto.RegisterType((*RestoreAgentRequest)(nil), "google.cloud.dialogflow.v2.RestoreAgentRequest")
+	proto.RegisterEnum("google.cloud.dialogflow.v2.Agent_MatchMode", Agent_MatchMode_name, Agent_MatchMode_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// AgentsClient is the client API for Agents service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type AgentsClient interface {
+	// Retrieves the specified agent.
+	GetAgent(ctx context.Context, in *GetAgentRequest, opts ...grpc.CallOption) (*Agent, error)
+	// Returns the list of agents.
+	//
+	// Since there is at most one conversational agent per project, this method is
+	// useful primarily for listing all agents across projects the caller has
+	// access to. One can achieve that with a wildcard project collection id "-".
+	// Refer to [List
+	// Sub-Collections](https://cloud.google.com/apis/design/design_patterns#list_sub-collections).
+	SearchAgents(ctx context.Context, in *SearchAgentsRequest, opts ...grpc.CallOption) (*SearchAgentsResponse, error)
+	// Trains the specified agent.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	TrainAgent(ctx context.Context, in *TrainAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Exports the specified agent to a ZIP file.
+	//
+	// Operation <response: [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	ExportAgent(ctx context.Context, in *ExportAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Imports the specified agent from a ZIP file.
+	//
+	// Uploads new intents and entity types without deleting the existing ones.
+	// Intents and entity types with the same name are replaced with the new
+	// versions from ImportAgentRequest.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	ImportAgent(ctx context.Context, in *ImportAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Restores the specified agent from a ZIP file.
+	//
+	// Replaces the current agent version with a new one. All the intents and
+	// entity types in the older version are deleted.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	RestoreAgent(ctx context.Context, in *RestoreAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type agentsClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewAgentsClient(cc *grpc.ClientConn) AgentsClient {
+	return &agentsClient{cc}
+}
+
+func (c *agentsClient) GetAgent(ctx context.Context, in *GetAgentRequest, opts ...grpc.CallOption) (*Agent, error) {
+	out := new(Agent)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Agents/GetAgent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *agentsClient) SearchAgents(ctx context.Context, in *SearchAgentsRequest, opts ...grpc.CallOption) (*SearchAgentsResponse, error) {
+	out := new(SearchAgentsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Agents/SearchAgents", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *agentsClient) TrainAgent(ctx context.Context, in *TrainAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Agents/TrainAgent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *agentsClient) ExportAgent(ctx context.Context, in *ExportAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Agents/ExportAgent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *agentsClient) ImportAgent(ctx context.Context, in *ImportAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Agents/ImportAgent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *agentsClient) RestoreAgent(ctx context.Context, in *RestoreAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Agents/RestoreAgent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// AgentsServer is the server API for Agents service.
+type AgentsServer interface {
+	// Retrieves the specified agent.
+	GetAgent(context.Context, *GetAgentRequest) (*Agent, error)
+	// Returns the list of agents.
+	//
+	// Since there is at most one conversational agent per project, this method is
+	// useful primarily for listing all agents across projects the caller has
+	// access to. One can achieve that with a wildcard project collection id "-".
+	// Refer to [List
+	// Sub-Collections](https://cloud.google.com/apis/design/design_patterns#list_sub-collections).
+	SearchAgents(context.Context, *SearchAgentsRequest) (*SearchAgentsResponse, error)
+	// Trains the specified agent.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	TrainAgent(context.Context, *TrainAgentRequest) (*longrunning.Operation, error)
+	// Exports the specified agent to a ZIP file.
+	//
+	// Operation <response: [ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	ExportAgent(context.Context, *ExportAgentRequest) (*longrunning.Operation, error)
+	// Imports the specified agent from a ZIP file.
+	//
+	// Uploads new intents and entity types without deleting the existing ones.
+	// Intents and entity types with the same name are replaced with the new
+	// versions from ImportAgentRequest.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	ImportAgent(context.Context, *ImportAgentRequest) (*longrunning.Operation, error)
+	// Restores the specified agent from a ZIP file.
+	//
+	// Replaces the current agent version with a new one. All the intents and
+	// entity types in the older version are deleted.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	RestoreAgent(context.Context, *RestoreAgentRequest) (*longrunning.Operation, error)
+}
+
+func RegisterAgentsServer(s *grpc.Server, srv AgentsServer) {
+	s.RegisterService(&_Agents_serviceDesc, srv)
+}
+
+func _Agents_GetAgent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetAgentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AgentsServer).GetAgent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Agents/GetAgent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AgentsServer).GetAgent(ctx, req.(*GetAgentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Agents_SearchAgents_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SearchAgentsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AgentsServer).SearchAgents(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Agents/SearchAgents",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AgentsServer).SearchAgents(ctx, req.(*SearchAgentsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Agents_TrainAgent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TrainAgentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AgentsServer).TrainAgent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Agents/TrainAgent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AgentsServer).TrainAgent(ctx, req.(*TrainAgentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Agents_ExportAgent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ExportAgentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AgentsServer).ExportAgent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Agents/ExportAgent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AgentsServer).ExportAgent(ctx, req.(*ExportAgentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Agents_ImportAgent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ImportAgentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AgentsServer).ImportAgent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Agents/ImportAgent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AgentsServer).ImportAgent(ctx, req.(*ImportAgentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Agents_RestoreAgent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RestoreAgentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AgentsServer).RestoreAgent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Agents/RestoreAgent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AgentsServer).RestoreAgent(ctx, req.(*RestoreAgentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Agents_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.dialogflow.v2.Agents",
+	HandlerType: (*AgentsServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "GetAgent",
+			Handler:    _Agents_GetAgent_Handler,
+		},
+		{
+			MethodName: "SearchAgents",
+			Handler:    _Agents_SearchAgents_Handler,
+		},
+		{
+			MethodName: "TrainAgent",
+			Handler:    _Agents_TrainAgent_Handler,
+		},
+		{
+			MethodName: "ExportAgent",
+			Handler:    _Agents_ExportAgent_Handler,
+		},
+		{
+			MethodName: "ImportAgent",
+			Handler:    _Agents_ImportAgent_Handler,
+		},
+		{
+			MethodName: "RestoreAgent",
+			Handler:    _Agents_RestoreAgent_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/dialogflow/v2/agent.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/agent.proto", fileDescriptor_agent_6cbd45e0738ac4ce)
+}
+
+var fileDescriptor_agent_6cbd45e0738ac4ce = []byte{
+	// 965 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x41, 0x6f, 0xdc, 0x44,
+	0x14, 0xae, 0x37, 0xcd, 0x76, 0xf7, 0x25, 0x69, 0xd3, 0x09, 0x0d, 0xd6, 0xb6, 0x81, 0xad, 0x4b,
+	0xa2, 0x6d, 0x0a, 0x76, 0xb5, 0x5c, 0x20, 0x88, 0x43, 0x93, 0x4d, 0x9b, 0xa0, 0x6c, 0x12, 0x39,
+	0x49, 0xa5, 0xf6, 0x62, 0x4d, 0xec, 0x59, 0x67, 0xa8, 0x3d, 0x63, 0x3c, 0xb3, 0xa1, 0x49, 0xe1,
+	0x00, 0x47, 0x24, 0x24, 0x24, 0xb8, 0x70, 0x42, 0xe2, 0xc8, 0xdf, 0xe1, 0x2f, 0x70, 0xe6, 0xcc,
+	0x11, 0xcd, 0xd8, 0x9b, 0xf5, 0x26, 0xa9, 0x37, 0x07, 0x24, 0x6e, 0xf6, 0xfb, 0xbe, 0xf7, 0xde,
+	0x37, 0x33, 0xdf, 0xd3, 0x0c, 0x2c, 0x85, 0x9c, 0x87, 0x11, 0x71, 0xfc, 0x88, 0xf7, 0x03, 0x27,
+	0xa0, 0x38, 0xe2, 0x61, 0x2f, 0xe2, 0x5f, 0x3b, 0xc7, 0x6d, 0x07, 0x87, 0x84, 0x49, 0x3b, 0x49,
+	0xb9, 0xe4, 0xa8, 0x91, 0xf1, 0x6c, 0xcd, 0xb3, 0x87, 0x3c, 0xfb, 0xb8, 0xdd, 0xb8, 0x97, 0xd7,
+	0xc0, 0x09, 0x75, 0x30, 0x63, 0x5c, 0x62, 0x49, 0x39, 0x13, 0x59, 0x66, 0xe3, 0x41, 0x8e, 0x46,
+	0x9c, 0x85, 0x69, 0x9f, 0x31, 0xca, 0x42, 0x87, 0x27, 0x24, 0x1d, 0x21, 0xdd, 0xcd, 0x49, 0xfa,
+	0xef, 0xb0, 0xdf, 0x73, 0x48, 0x9c, 0xc8, 0x93, 0x1c, 0x6c, 0x9e, 0x07, 0x7b, 0x94, 0x44, 0x81,
+	0x17, 0x63, 0xf1, 0x2a, 0x67, 0xdc, 0x3b, 0xcf, 0x10, 0x32, 0xed, 0xfb, 0xb9, 0x76, 0xeb, 0x97,
+	0xeb, 0x30, 0xf9, 0x44, 0xad, 0x05, 0xcd, 0x43, 0x35, 0xc1, 0x29, 0x61, 0xd2, 0x34, 0x9a, 0x46,
+	0xab, 0xee, 0xe6, 0x7f, 0xe8, 0x3e, 0x4c, 0x07, 0x54, 0x24, 0x11, 0x3e, 0xf1, 0x18, 0x8e, 0x89,
+	0x59, 0xd1, 0xe8, 0x54, 0x1e, 0xdb, 0xc6, 0x31, 0x41, 0x6d, 0xb8, 0x13, 0x90, 0x1e, 0xee, 0x47,
+	0xd2, 0x8b, 0x30, 0x0b, 0xfb, 0x38, 0x24, 0x9e, 0xcf, 0x03, 0x62, 0x4e, 0x68, 0xee, 0x5c, 0x0e,
+	0x6e, 0xe5, 0xd8, 0x1a, 0x0f, 0x08, 0xfa, 0x04, 0x4c, 0xd1, 0x4f, 0x12, 0x9e, 0x4a, 0x12, 0x8c,
+	0x66, 0x09, 0xf3, 0x7a, 0x73, 0xa2, 0x55, 0x77, 0xe7, 0xcf, 0xf0, 0x62, 0xa2, 0x40, 0x77, 0xa1,
+	0x2e, 0x69, 0x4c, 0xbc, 0x53, 0xce, 0x88, 0x39, 0xa9, 0x3b, 0xd4, 0x54, 0xe0, 0x25, 0x67, 0x04,
+	0x35, 0x61, 0x2a, 0x20, 0xc2, 0x4f, 0x69, 0xa2, 0xb6, 0xd0, 0xac, 0xe6, 0x62, 0x87, 0x21, 0xb4,
+	0x00, 0x80, 0x8f, 0xb1, 0xc4, 0xa9, 0xd7, 0x4f, 0xa9, 0x79, 0x43, 0x13, 0xea, 0x59, 0xe4, 0x20,
+	0xa5, 0x68, 0x11, 0x6e, 0x12, 0x86, 0x0f, 0x23, 0xe2, 0x45, 0x3c, 0x0c, 0x29, 0x0b, 0xcd, 0x5a,
+	0xd3, 0x68, 0xd5, 0xdc, 0x99, 0x2c, 0xba, 0x95, 0x05, 0xd1, 0x17, 0x00, 0x31, 0x96, 0xfe, 0x91,
+	0x17, 0xab, 0x75, 0xd6, 0x9b, 0x46, 0xeb, 0x66, 0xfb, 0x91, 0xfd, 0x76, 0x23, 0xd8, 0x7a, 0x93,
+	0xed, 0xae, 0xca, 0xe9, 0xf2, 0x80, 0xb8, 0xf5, 0x78, 0xf0, 0x89, 0x3e, 0x05, 0xd3, 0x8f, 0xb0,
+	0x10, 0xb4, 0x47, 0x7d, 0x7d, 0xf2, 0x9e, 0x3c, 0x4a, 0x89, 0x38, 0xe2, 0x51, 0x60, 0x42, 0xd3,
+	0x68, 0x55, 0xdc, 0x77, 0x47, 0xf1, 0xfd, 0x01, 0x6c, 0x3d, 0x87, 0xfa, 0x59, 0x49, 0xd4, 0x80,
+	0xf9, 0xee, 0x93, 0xfd, 0xb5, 0x0d, 0xaf, 0xbb, 0xd3, 0x59, 0xf7, 0x0e, 0xb6, 0xf7, 0x76, 0xd7,
+	0xd7, 0x36, 0x9f, 0x6e, 0xae, 0x77, 0x66, 0xaf, 0xa1, 0x3b, 0x70, 0xbb, 0x80, 0x6d, 0xbc, 0x58,
+	0x75, 0x37, 0x3b, 0xb3, 0x06, 0x9a, 0x07, 0x54, 0x08, 0x77, 0xb7, 0xbc, 0x9d, 0xed, 0xad, 0x17,
+	0xb3, 0x15, 0xeb, 0x21, 0xdc, 0x7a, 0x46, 0xa4, 0xd6, 0xec, 0x92, 0xaf, 0xfa, 0x44, 0xbc, 0xd5,
+	0x1f, 0x16, 0x85, 0xb9, 0x3d, 0x82, 0x53, 0xff, 0x48, 0xb3, 0xc5, 0x18, 0xba, 0x3a, 0xbd, 0x44,
+	0x9d, 0xb4, 0xa0, 0xa7, 0x99, 0x97, 0x26, 0xdd, 0x9a, 0x0a, 0xec, 0xd1, 0x53, 0xa2, 0xce, 0x46,
+	0x83, 0x92, 0xbf, 0x22, 0x2c, 0x77, 0x8f, 0xa6, 0xef, 0xab, 0x80, 0x75, 0x02, 0xef, 0x8c, 0xb6,
+	0x12, 0x09, 0x67, 0x42, 0x6d, 0x60, 0x55, 0xcf, 0xa3, 0x30, 0x8d, 0xe6, 0x44, 0x6b, 0xaa, 0x7d,
+	0x7f, 0xec, 0x41, 0xb8, 0x79, 0x02, 0x5a, 0x82, 0x5b, 0x8c, 0xbc, 0x96, 0x5e, 0xa1, 0x6d, 0x66,
+	0xf0, 0x19, 0x15, 0xde, 0x3d, 0x6b, 0xfd, 0x08, 0x6e, 0xef, 0xa7, 0x98, 0xb2, 0x2b, 0x6d, 0xc9,
+	0x26, 0xa0, 0xf5, 0xd7, 0xca, 0xba, 0x57, 0x61, 0xab, 0x1d, 0xd1, 0x62, 0xb4, 0x1f, 0xb3, 0xe6,
+	0x35, 0x1d, 0x38, 0x48, 0xa9, 0x15, 0xc0, 0xdc, 0x48, 0xa9, 0x7c, 0xc5, 0x0b, 0xc5, 0x1c, 0x5d,
+	0x6e, 0xe3, 0xda, 0x30, 0x0b, 0x2d, 0xc2, 0x4c, 0x06, 0xfb, 0x9c, 0x49, 0xd5, 0x51, 0x95, 0x9d,
+	0xde, 0xb8, 0xe6, 0x4e, 0xeb, 0xf0, 0x5a, 0x16, 0x5d, 0xbd, 0x01, 0x93, 0xfa, 0xdf, 0x7a, 0x03,
+	0x68, 0x33, 0xbe, 0xb2, 0xe0, 0x85, 0x0b, 0x82, 0xcb, 0x9b, 0x4f, 0x94, 0x37, 0xff, 0x06, 0xe6,
+	0x5c, 0x22, 0x24, 0x4f, 0xc9, 0xff, 0xd0, 0xbd, 0xfd, 0x77, 0x15, 0xaa, 0x99, 0x9d, 0xd0, 0x77,
+	0x06, 0xd4, 0x06, 0xae, 0x47, 0xa5, 0xc3, 0x7c, 0x6e, 0x36, 0x1a, 0xe3, 0x0d, 0x67, 0x2d, 0x7e,
+	0xff, 0xe7, 0x5f, 0x3f, 0x57, 0xde, 0x47, 0x0b, 0xea, 0xf6, 0x78, 0x93, 0xad, 0xe5, 0xf3, 0x24,
+	0xe5, 0x5f, 0x12, 0x5f, 0x0a, 0x67, 0xf9, 0xdb, 0xec, 0x46, 0x41, 0xbf, 0x19, 0x30, 0x5d, 0xf4,
+	0x38, 0x72, 0xca, 0x4a, 0x5f, 0x32, 0x78, 0x8d, 0xc7, 0x57, 0x4f, 0xc8, 0xcc, 0x64, 0x7d, 0xa8,
+	0xa5, 0x2d, 0xa1, 0x0f, 0x4a, 0xa5, 0xad, 0x08, 0x9d, 0x8b, 0x7e, 0x30, 0x00, 0x86, 0xa3, 0x80,
+	0x3e, 0x2a, 0x6b, 0x77, 0x61, 0x64, 0x1a, 0x0b, 0x03, 0x7a, 0xe1, 0xca, 0xb3, 0x77, 0x06, 0x57,
+	0x9e, 0x65, 0x6b, 0x29, 0x2d, 0xeb, 0x41, 0xb9, 0x14, 0xa9, 0xea, 0xae, 0x18, 0xcb, 0xe8, 0x47,
+	0x03, 0xa6, 0x0a, 0xf3, 0x81, 0xec, 0x32, 0x35, 0x17, 0x67, 0x72, 0x9c, 0x1c, 0x47, 0xcb, 0x79,
+	0x68, 0x8d, 0xd9, 0x19, 0xa2, 0x0b, 0x0f, 0xf4, 0x14, 0x26, 0xa9, 0x5c, 0xcf, 0xc5, 0x91, 0xfb,
+	0x8f, 0xf4, 0xd0, 0x78, 0xa0, 0xe7, 0x27, 0x03, 0xa6, 0x8b, 0xc3, 0x55, 0x6e, 0xa7, 0x4b, 0xc6,
+	0x70, 0x9c, 0xa2, 0xc7, 0x5a, 0xd1, 0xb2, 0xb5, 0x58, 0xae, 0x28, 0xcd, 0x2a, 0xaf, 0x18, 0xcb,
+	0xab, 0xbf, 0x1a, 0xf0, 0x9e, 0xcf, 0xe3, 0x12, 0x1d, 0xab, 0xa0, 0x15, 0xec, 0xaa, 0x07, 0xca,
+	0xae, 0xf1, 0xb2, 0x93, 0x33, 0x43, 0xae, 0x9e, 0x09, 0x36, 0x4f, 0x43, 0x27, 0x24, 0x4c, 0x3f,
+	0x5f, 0x9c, 0x0c, 0xc2, 0x09, 0x15, 0x97, 0xbd, 0xd2, 0x3e, 0x1b, 0xfe, 0xfd, 0x63, 0x18, 0xbf,
+	0x57, 0x2a, 0x9d, 0xa7, 0x7f, 0x54, 0x1a, 0xcf, 0xb2, 0x72, 0x6b, 0xba, 0x71, 0x67, 0xd8, 0xf8,
+	0x79, 0xfb, 0xb0, 0xaa, 0xab, 0x7e, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0x9d, 0x2a,
+	0xd4, 0xfa, 0x09, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/context.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/context.pb.go
new file mode 100644
index 00000000..d2ef7c67
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/context.pb.go
@@ -0,0 +1,738 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2/context.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Represents a context.
+type Context struct {
+	// Required. The unique identifier of the context. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Optional. The number of conversational query requests after which the
+	// context expires. If set to `0` (the default) the context expires
+	// immediately. Contexts expire automatically after 10 minutes even if there
+	// are no matching queries.
+	LifespanCount int32 `protobuf:"varint,2,opt,name=lifespan_count,json=lifespanCount,proto3" json:"lifespan_count,omitempty"`
+	// Optional. The collection of parameters associated with this context.
+	// Refer to [this doc](https://dialogflow.com/docs/actions-and-parameters) for
+	// syntax.
+	Parameters           *_struct.Struct `protobuf:"bytes,3,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Context) Reset()         { *m = Context{} }
+func (m *Context) String() string { return proto.CompactTextString(m) }
+func (*Context) ProtoMessage()    {}
+func (*Context) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_81c56ca1e96cd61f, []int{0}
+}
+func (m *Context) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Context.Unmarshal(m, b)
+}
+func (m *Context) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Context.Marshal(b, m, deterministic)
+}
+func (dst *Context) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Context.Merge(dst, src)
+}
+func (m *Context) XXX_Size() int {
+	return xxx_messageInfo_Context.Size(m)
+}
+func (m *Context) XXX_DiscardUnknown() {
+	xxx_messageInfo_Context.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Context proto.InternalMessageInfo
+
+func (m *Context) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Context) GetLifespanCount() int32 {
+	if m != nil {
+		return m.LifespanCount
+	}
+	return 0
+}
+
+func (m *Context) GetParameters() *_struct.Struct {
+	if m != nil {
+		return m.Parameters
+	}
+	return nil
+}
+
+// The request message for [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
+type ListContextsRequest struct {
+	// Required. The session to list all contexts from.
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The maximum number of items to return in a single page. By
+	// default 100 and at most 1000.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional. The next_page_token value returned from a previous list request.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListContextsRequest) Reset()         { *m = ListContextsRequest{} }
+func (m *ListContextsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListContextsRequest) ProtoMessage()    {}
+func (*ListContextsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_81c56ca1e96cd61f, []int{1}
+}
+func (m *ListContextsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListContextsRequest.Unmarshal(m, b)
+}
+func (m *ListContextsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListContextsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListContextsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListContextsRequest.Merge(dst, src)
+}
+func (m *ListContextsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListContextsRequest.Size(m)
+}
+func (m *ListContextsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListContextsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListContextsRequest proto.InternalMessageInfo
+
+func (m *ListContextsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListContextsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListContextsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// The response message for [Contexts.ListContexts][google.cloud.dialogflow.v2.Contexts.ListContexts].
+type ListContextsResponse struct {
+	// The list of contexts. There will be a maximum number of items
+	// returned based on the page_size field in the request.
+	Contexts []*Context `protobuf:"bytes,1,rep,name=contexts,proto3" json:"contexts,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListContextsResponse) Reset()         { *m = ListContextsResponse{} }
+func (m *ListContextsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListContextsResponse) ProtoMessage()    {}
+func (*ListContextsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_81c56ca1e96cd61f, []int{2}
+}
+func (m *ListContextsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListContextsResponse.Unmarshal(m, b)
+}
+func (m *ListContextsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListContextsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListContextsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListContextsResponse.Merge(dst, src)
+}
+func (m *ListContextsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListContextsResponse.Size(m)
+}
+func (m *ListContextsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListContextsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListContextsResponse proto.InternalMessageInfo
+
+func (m *ListContextsResponse) GetContexts() []*Context {
+	if m != nil {
+		return m.Contexts
+	}
+	return nil
+}
+
+func (m *ListContextsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The request message for [Contexts.GetContext][google.cloud.dialogflow.v2.Contexts.GetContext].
+type GetContextRequest struct {
+	// Required. The name of the context. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetContextRequest) Reset()         { *m = GetContextRequest{} }
+func (m *GetContextRequest) String() string { return proto.CompactTextString(m) }
+func (*GetContextRequest) ProtoMessage()    {}
+func (*GetContextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_81c56ca1e96cd61f, []int{3}
+}
+func (m *GetContextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetContextRequest.Unmarshal(m, b)
+}
+func (m *GetContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetContextRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetContextRequest.Merge(dst, src)
+}
+func (m *GetContextRequest) XXX_Size() int {
+	return xxx_messageInfo_GetContextRequest.Size(m)
+}
+func (m *GetContextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetContextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetContextRequest proto.InternalMessageInfo
+
+func (m *GetContextRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The request message for [Contexts.CreateContext][google.cloud.dialogflow.v2.Contexts.CreateContext].
+type CreateContextRequest struct {
+	// Required. The session to create a context for.
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The context to create.
+	Context              *Context `protobuf:"bytes,2,opt,name=context,proto3" json:"context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateContextRequest) Reset()         { *m = CreateContextRequest{} }
+func (m *CreateContextRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateContextRequest) ProtoMessage()    {}
+func (*CreateContextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_81c56ca1e96cd61f, []int{4}
+}
+func (m *CreateContextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateContextRequest.Unmarshal(m, b)
+}
+func (m *CreateContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateContextRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateContextRequest.Merge(dst, src)
+}
+func (m *CreateContextRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateContextRequest.Size(m)
+}
+func (m *CreateContextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateContextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateContextRequest proto.InternalMessageInfo
+
+func (m *CreateContextRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateContextRequest) GetContext() *Context {
+	if m != nil {
+		return m.Context
+	}
+	return nil
+}
+
+// The request message for [Contexts.UpdateContext][google.cloud.dialogflow.v2.Contexts.UpdateContext].
+type UpdateContextRequest struct {
+	// Required. The context to update.
+	Context *Context `protobuf:"bytes,1,opt,name=context,proto3" json:"context,omitempty"`
+	// Optional. The mask to control which fields get updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateContextRequest) Reset()         { *m = UpdateContextRequest{} }
+func (m *UpdateContextRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateContextRequest) ProtoMessage()    {}
+func (*UpdateContextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_81c56ca1e96cd61f, []int{5}
+}
+func (m *UpdateContextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateContextRequest.Unmarshal(m, b)
+}
+func (m *UpdateContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateContextRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateContextRequest.Merge(dst, src)
+}
+func (m *UpdateContextRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateContextRequest.Size(m)
+}
+func (m *UpdateContextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateContextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateContextRequest proto.InternalMessageInfo
+
+func (m *UpdateContextRequest) GetContext() *Context {
+	if m != nil {
+		return m.Context
+	}
+	return nil
+}
+
+func (m *UpdateContextRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// The request message for [Contexts.DeleteContext][google.cloud.dialogflow.v2.Contexts.DeleteContext].
+type DeleteContextRequest struct {
+	// Required. The name of the context to delete. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteContextRequest) Reset()         { *m = DeleteContextRequest{} }
+func (m *DeleteContextRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteContextRequest) ProtoMessage()    {}
+func (*DeleteContextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_81c56ca1e96cd61f, []int{6}
+}
+func (m *DeleteContextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteContextRequest.Unmarshal(m, b)
+}
+func (m *DeleteContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteContextRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteContextRequest.Merge(dst, src)
+}
+func (m *DeleteContextRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteContextRequest.Size(m)
+}
+func (m *DeleteContextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteContextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteContextRequest proto.InternalMessageInfo
+
+func (m *DeleteContextRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The request message for [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2.Contexts.DeleteAllContexts].
+type DeleteAllContextsRequest struct {
+	// Required. The name of the session to delete all contexts from. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>`.
+	Parent               string   `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteAllContextsRequest) Reset()         { *m = DeleteAllContextsRequest{} }
+func (m *DeleteAllContextsRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteAllContextsRequest) ProtoMessage()    {}
+func (*DeleteAllContextsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_81c56ca1e96cd61f, []int{7}
+}
+func (m *DeleteAllContextsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteAllContextsRequest.Unmarshal(m, b)
+}
+func (m *DeleteAllContextsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteAllContextsRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteAllContextsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAllContextsRequest.Merge(dst, src)
+}
+func (m *DeleteAllContextsRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteAllContextsRequest.Size(m)
+}
+func (m *DeleteAllContextsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteAllContextsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteAllContextsRequest proto.InternalMessageInfo
+
+func (m *DeleteAllContextsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Context)(nil), "google.cloud.dialogflow.v2.Context")
+	proto.RegisterType((*ListContextsRequest)(nil), "google.cloud.dialogflow.v2.ListContextsRequest")
+	proto.RegisterType((*ListContextsResponse)(nil), "google.cloud.dialogflow.v2.ListContextsResponse")
+	proto.RegisterType((*GetContextRequest)(nil), "google.cloud.dialogflow.v2.GetContextRequest")
+	proto.RegisterType((*CreateContextRequest)(nil), "google.cloud.dialogflow.v2.CreateContextRequest")
+	proto.RegisterType((*UpdateContextRequest)(nil), "google.cloud.dialogflow.v2.UpdateContextRequest")
+	proto.RegisterType((*DeleteContextRequest)(nil), "google.cloud.dialogflow.v2.DeleteContextRequest")
+	proto.RegisterType((*DeleteAllContextsRequest)(nil), "google.cloud.dialogflow.v2.DeleteAllContextsRequest")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ContextsClient is the client API for Contexts service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ContextsClient interface {
+	// Returns the list of all contexts in the specified session.
+	ListContexts(ctx context.Context, in *ListContextsRequest, opts ...grpc.CallOption) (*ListContextsResponse, error)
+	// Retrieves the specified context.
+	GetContext(ctx context.Context, in *GetContextRequest, opts ...grpc.CallOption) (*Context, error)
+	// Creates a context.
+	CreateContext(ctx context.Context, in *CreateContextRequest, opts ...grpc.CallOption) (*Context, error)
+	// Updates the specified context.
+	UpdateContext(ctx context.Context, in *UpdateContextRequest, opts ...grpc.CallOption) (*Context, error)
+	// Deletes the specified context.
+	DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Deletes all active contexts in the specified session.
+	DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+}
+
+type contextsClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewContextsClient(cc *grpc.ClientConn) ContextsClient {
+	return &contextsClient{cc}
+}
+
+func (c *contextsClient) ListContexts(ctx context.Context, in *ListContextsRequest, opts ...grpc.CallOption) (*ListContextsResponse, error) {
+	out := new(ListContextsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Contexts/ListContexts", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *contextsClient) GetContext(ctx context.Context, in *GetContextRequest, opts ...grpc.CallOption) (*Context, error) {
+	out := new(Context)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Contexts/GetContext", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *contextsClient) CreateContext(ctx context.Context, in *CreateContextRequest, opts ...grpc.CallOption) (*Context, error) {
+	out := new(Context)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Contexts/CreateContext", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *contextsClient) UpdateContext(ctx context.Context, in *UpdateContextRequest, opts ...grpc.CallOption) (*Context, error) {
+	out := new(Context)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Contexts/UpdateContext", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *contextsClient) DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Contexts/DeleteContext", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *contextsClient) DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Contexts/DeleteAllContexts", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ContextsServer is the server API for Contexts service.
+type ContextsServer interface {
+	// Returns the list of all contexts in the specified session.
+	ListContexts(context.Context, *ListContextsRequest) (*ListContextsResponse, error)
+	// Retrieves the specified context.
+	GetContext(context.Context, *GetContextRequest) (*Context, error)
+	// Creates a context.
+	CreateContext(context.Context, *CreateContextRequest) (*Context, error)
+	// Updates the specified context.
+	UpdateContext(context.Context, *UpdateContextRequest) (*Context, error)
+	// Deletes the specified context.
+	DeleteContext(context.Context, *DeleteContextRequest) (*empty.Empty, error)
+	// Deletes all active contexts in the specified session.
+	DeleteAllContexts(context.Context, *DeleteAllContextsRequest) (*empty.Empty, error)
+}
+
+func RegisterContextsServer(s *grpc.Server, srv ContextsServer) {
+	s.RegisterService(&_Contexts_serviceDesc, srv)
+}
+
+func _Contexts_ListContexts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListContextsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContextsServer).ListContexts(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Contexts/ListContexts",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContextsServer).ListContexts(ctx, req.(*ListContextsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Contexts_GetContext_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetContextRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContextsServer).GetContext(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Contexts/GetContext",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContextsServer).GetContext(ctx, req.(*GetContextRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Contexts_CreateContext_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateContextRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContextsServer).CreateContext(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Contexts/CreateContext",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContextsServer).CreateContext(ctx, req.(*CreateContextRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Contexts_UpdateContext_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateContextRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContextsServer).UpdateContext(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Contexts/UpdateContext",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContextsServer).UpdateContext(ctx, req.(*UpdateContextRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Contexts_DeleteContext_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteContextRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContextsServer).DeleteContext(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Contexts/DeleteContext",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContextsServer).DeleteContext(ctx, req.(*DeleteContextRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Contexts_DeleteAllContexts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteAllContextsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContextsServer).DeleteAllContexts(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Contexts/DeleteAllContexts",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContextsServer).DeleteAllContexts(ctx, req.(*DeleteAllContextsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Contexts_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.dialogflow.v2.Contexts",
+	HandlerType: (*ContextsServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListContexts",
+			Handler:    _Contexts_ListContexts_Handler,
+		},
+		{
+			MethodName: "GetContext",
+			Handler:    _Contexts_GetContext_Handler,
+		},
+		{
+			MethodName: "CreateContext",
+			Handler:    _Contexts_CreateContext_Handler,
+		},
+		{
+			MethodName: "UpdateContext",
+			Handler:    _Contexts_UpdateContext_Handler,
+		},
+		{
+			MethodName: "DeleteContext",
+			Handler:    _Contexts_DeleteContext_Handler,
+		},
+		{
+			MethodName: "DeleteAllContexts",
+			Handler:    _Contexts_DeleteAllContexts_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/dialogflow/v2/context.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/context.proto", fileDescriptor_context_81c56ca1e96cd61f)
+}
+
+var fileDescriptor_context_81c56ca1e96cd61f = []byte{
+	// 715 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x4f, 0x6f, 0xd3, 0x30,
+	0x18, 0xc6, 0xe5, 0x0e, 0xf6, 0xe7, 0xdd, 0x0a, 0x9a, 0xa9, 0x46, 0x95, 0x0d, 0x54, 0x05, 0x01,
+	0x55, 0x25, 0x62, 0xc8, 0x90, 0xd0, 0x18, 0x13, 0x62, 0x2d, 0x9b, 0x84, 0x40, 0x9a, 0x3a, 0xe0,
+	0xc0, 0xa5, 0xf2, 0x5a, 0x37, 0x0a, 0x4b, 0xe3, 0x10, 0xbb, 0x63, 0x0c, 0x4d, 0x48, 0x7c, 0x04,
+	0xe0, 0x36, 0x4e, 0x1c, 0x27, 0x4e, 0x7c, 0x15, 0xbe, 0x02, 0x77, 0xae, 0x1c, 0x51, 0x1c, 0xa7,
+	0xff, 0x57, 0x52, 0x6e, 0x89, 0xfd, 0xd8, 0xcf, 0xcf, 0xaf, 0x9f, 0x37, 0x81, 0xa2, 0xc3, 0xb9,
+	0xe3, 0x31, 0x52, 0xf7, 0x78, 0xbb, 0x41, 0x1a, 0x2e, 0xf5, 0xb8, 0xd3, 0xf4, 0xf8, 0x5b, 0x72,
+	0x60, 0x93, 0x3a, 0xf7, 0x25, 0x3b, 0x94, 0x56, 0x10, 0x72, 0xc9, 0xb1, 0x11, 0x2b, 0x2d, 0xa5,
+	0xb4, 0xba, 0x4a, 0xeb, 0xc0, 0x36, 0x56, 0xf4, 0x2e, 0x34, 0x70, 0x09, 0xf5, 0x7d, 0x2e, 0xa9,
+	0x74, 0xb9, 0x2f, 0xe2, 0x95, 0xc6, 0xb2, 0x9e, 0x55, 0x6f, 0x7b, 0xed, 0x26, 0x61, 0xad, 0x40,
+	0xbe, 0xd3, 0x93, 0x85, 0xc1, 0xc9, 0xa6, 0xcb, 0xbc, 0x46, 0xad, 0x45, 0xc5, 0xbe, 0x56, 0xac,
+	0x0c, 0x2a, 0x84, 0x0c, 0xdb, 0x75, 0x8d, 0x65, 0x1e, 0xc3, 0x4c, 0x39, 0xe6, 0xc4, 0x18, 0xce,
+	0xf9, 0xb4, 0xc5, 0xf2, 0xa8, 0x80, 0x8a, 0x73, 0x55, 0xf5, 0x8c, 0xaf, 0xc3, 0x05, 0xcf, 0x6d,
+	0x32, 0x11, 0x50, 0xbf, 0x56, 0xe7, 0x6d, 0x5f, 0xe6, 0x33, 0x05, 0x54, 0x3c, 0x5f, 0xcd, 0x26,
+	0xa3, 0xe5, 0x68, 0x10, 0xdf, 0x03, 0x08, 0x68, 0x48, 0x5b, 0x4c, 0xb2, 0x50, 0xe4, 0xa7, 0x0a,
+	0xa8, 0x38, 0x6f, 0x5f, 0xb6, 0xf4, 0x89, 0x13, 0x63, 0x6b, 0x57, 0x19, 0x57, 0x7b, 0xa4, 0xa6,
+	0x0b, 0x97, 0x9e, 0xba, 0x42, 0x6a, 0x04, 0x51, 0x65, 0x6f, 0xda, 0x4c, 0x48, 0xbc, 0x04, 0xd3,
+	0x01, 0x0d, 0x99, 0x2f, 0x35, 0x8c, 0x7e, 0xc3, 0xcb, 0x30, 0x17, 0x50, 0x87, 0xd5, 0x84, 0x7b,
+	0xc4, 0x34, 0xc9, 0x6c, 0x34, 0xb0, 0xeb, 0x1e, 0x31, 0x7c, 0x25, 0x82, 0x70, 0x58, 0x4d, 0xf2,
+	0x7d, 0xe6, 0x2b, 0x88, 0xb9, 0xaa, 0x92, 0x3f, 0x8f, 0x06, 0xcc, 0x0f, 0x90, 0xeb, 0xb7, 0x12,
+	0x01, 0xf7, 0x05, 0xc3, 0x0f, 0x61, 0x56, 0xdf, 0x94, 0xc8, 0xa3, 0xc2, 0x54, 0x71, 0xde, 0xbe,
+	0x66, 0x9d, 0x7d, 0x57, 0x96, 0x5e, 0x5f, 0xed, 0x2c, 0xc2, 0x37, 0xe0, 0xa2, 0xcf, 0x0e, 0x65,
+	0xad, 0xc7, 0x3c, 0xa3, 0xcc, 0xb3, 0xd1, 0xf0, 0x4e, 0x07, 0xe0, 0x26, 0x2c, 0x6e, 0xb3, 0xc4,
+	0x3f, 0x39, 0xe9, 0x88, 0xa2, 0x9b, 0x2d, 0xc8, 0x95, 0x43, 0x46, 0x25, 0x1b, 0xd0, 0x9e, 0x55,
+	0x95, 0x0d, 0x98, 0xd1, 0x30, 0xca, 0x38, 0xe5, 0x01, 0x92, 0x35, 0xe6, 0x27, 0x04, 0xb9, 0x17,
+	0x41, 0x63, 0xd8, 0xaf, 0x67, 0x5f, 0x34, 0xf9, 0xbe, 0x78, 0x1d, 0xe6, 0xdb, 0x6a, 0x5b, 0x95,
+	0x46, 0x8d, 0x66, 0x0c, 0xa5, 0x62, 0x2b, 0x0a, 0xec, 0x33, 0x2a, 0xf6, 0xab, 0x10, 0xcb, 0xa3,
+	0x67, 0xb3, 0x04, 0xb9, 0x0a, 0xf3, 0xd8, 0x10, 0xd3, 0xa8, 0x7a, 0xd9, 0x90, 0x8f, 0xb5, 0x8f,
+	0x3c, 0x2f, 0x65, 0x92, 0xec, 0xdf, 0x33, 0x30, 0x9b, 0x68, 0xf1, 0x77, 0x04, 0x0b, 0xbd, 0xd9,
+	0xc0, 0x64, 0xdc, 0x41, 0x47, 0x04, 0xd6, 0xb8, 0x9d, 0x7e, 0x41, 0x1c, 0x3b, 0x73, 0xed, 0xe3,
+	0xcf, 0x5f, 0x9f, 0x33, 0xab, 0xf8, 0x4e, 0xf4, 0xa9, 0x78, 0x1f, 0x53, 0x6d, 0x04, 0x21, 0x7f,
+	0xcd, 0xea, 0x52, 0x90, 0x12, 0xa1, 0x0e, 0xf3, 0x25, 0x11, 0x4c, 0x88, 0xe8, 0x53, 0x40, 0x4a,
+	0xc7, 0xa4, 0x13, 0xb8, 0x13, 0x04, 0xd0, 0x4d, 0x12, 0xbe, 0x35, 0xce, 0x7b, 0x28, 0x71, 0x46,
+	0x9a, 0x4b, 0x1c, 0xa0, 0x8b, 0xaa, 0x3c, 0x8e, 0xad, 0x83, 0x46, 0x4a, 0xc7, 0xf8, 0x14, 0x41,
+	0xb6, 0x2f, 0xbe, 0x78, 0x6c, 0x71, 0x46, 0x25, 0x3d, 0x1d, 0xe3, 0xa6, 0x62, 0x7c, 0x60, 0x4e,
+	0x5e, 0xc1, 0xfb, 0x9d, 0x8c, 0xfe, 0x40, 0x90, 0xed, 0xcb, 0xfe, 0x78, 0xd8, 0x51, 0x6d, 0x92,
+	0x0e, 0xf6, 0x89, 0x82, 0xad, 0xd8, 0x6b, 0x0a, 0x36, 0xf9, 0x35, 0x4c, 0x52, 0xd8, 0x2e, 0xf4,
+	0x17, 0x04, 0xd9, 0xbe, 0xe6, 0x18, 0x0f, 0x3d, 0xaa, 0x8f, 0x8c, 0xa5, 0xa1, 0x3e, 0x7c, 0x1c,
+	0xfd, 0x55, 0x92, 0x8b, 0x2f, 0xfd, 0xc7, 0xc5, 0x7f, 0x45, 0xb0, 0x38, 0xd4, 0x87, 0xf8, 0xee,
+	0xbf, 0xd1, 0x86, 0xdb, 0x36, 0x25, 0xde, 0x24, 0x77, 0xbe, 0x79, 0x82, 0xe0, 0x6a, 0x9d, 0xb7,
+	0xc6, 0xe0, 0x6c, 0x2e, 0x68, 0x8c, 0x9d, 0xc8, 0x74, 0x07, 0xbd, 0xaa, 0x68, 0xad, 0xc3, 0x3d,
+	0xea, 0x3b, 0x16, 0x0f, 0x1d, 0xe2, 0x30, 0x5f, 0x21, 0x91, 0x78, 0x8a, 0x06, 0xae, 0x18, 0xf5,
+	0xf3, 0x5f, 0xef, 0xbe, 0xfd, 0x41, 0xe8, 0x5b, 0x26, 0x53, 0xd9, 0x3a, 0xcd, 0x18, 0xdb, 0xf1,
+	0x76, 0x65, 0x65, 0x5d, 0xe9, 0x5a, 0xbf, 0xb4, 0xf7, 0xa6, 0xd5, 0xae, 0xab, 0x7f, 0x03, 0x00,
+	0x00, 0xff, 0xff, 0xb8, 0xb1, 0x2f, 0xbf, 0x51, 0x08, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/entity_type.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/entity_type.pb.go
new file mode 100644
index 00000000..87ac22c4
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/entity_type.pb.go
@@ -0,0 +1,1613 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2/entity_type.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _ "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Represents kinds of entities.
+type EntityType_Kind int32
+
+const (
+	// Not specified. This value should be never used.
+	EntityType_KIND_UNSPECIFIED EntityType_Kind = 0
+	// Map entity types allow mapping of a group of synonyms to a canonical
+	// value.
+	EntityType_KIND_MAP EntityType_Kind = 1
+	// List entity types contain a set of entries that do not map to canonical
+	// values. However, list entity types can contain references to other entity
+	// types (with or without aliases).
+	EntityType_KIND_LIST EntityType_Kind = 2
+)
+
+var EntityType_Kind_name = map[int32]string{
+	0: "KIND_UNSPECIFIED",
+	1: "KIND_MAP",
+	2: "KIND_LIST",
+}
+var EntityType_Kind_value = map[string]int32{
+	"KIND_UNSPECIFIED": 0,
+	"KIND_MAP":         1,
+	"KIND_LIST":        2,
+}
+
+func (x EntityType_Kind) String() string {
+	return proto.EnumName(EntityType_Kind_name, int32(x))
+}
+func (EntityType_Kind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{0, 0}
+}
+
+// Represents different entity type expansion modes. Automated expansion
+// allows an agent to recognize values that have not been explicitly listed in
+// the entity (for example, new kinds of shopping list items).
+type EntityType_AutoExpansionMode int32
+
+const (
+	// Auto expansion disabled for the entity.
+	EntityType_AUTO_EXPANSION_MODE_UNSPECIFIED EntityType_AutoExpansionMode = 0
+	// Allows an agent to recognize values that have not been explicitly
+	// listed in the entity.
+	EntityType_AUTO_EXPANSION_MODE_DEFAULT EntityType_AutoExpansionMode = 1
+)
+
+var EntityType_AutoExpansionMode_name = map[int32]string{
+	0: "AUTO_EXPANSION_MODE_UNSPECIFIED",
+	1: "AUTO_EXPANSION_MODE_DEFAULT",
+}
+var EntityType_AutoExpansionMode_value = map[string]int32{
+	"AUTO_EXPANSION_MODE_UNSPECIFIED": 0,
+	"AUTO_EXPANSION_MODE_DEFAULT":     1,
+}
+
+func (x EntityType_AutoExpansionMode) String() string {
+	return proto.EnumName(EntityType_AutoExpansionMode_name, int32(x))
+}
+func (EntityType_AutoExpansionMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{0, 1}
+}
+
+// Represents an entity type.
+// Entity types serve as a tool for extracting parameter values from natural
+// language queries.
+type EntityType struct {
+	// Required for all methods except `create` (`create` populates the name
+	// automatically.
+	// The unique identifier of the entity type. Format:
+	// `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The name of the entity.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Required. Indicates the kind of entity type.
+	Kind EntityType_Kind `protobuf:"varint,3,opt,name=kind,proto3,enum=google.cloud.dialogflow.v2.EntityType_Kind" json:"kind,omitempty"`
+	// Optional. Indicates whether the entity type can be automatically
+	// expanded.
+	AutoExpansionMode EntityType_AutoExpansionMode `protobuf:"varint,4,opt,name=auto_expansion_mode,json=autoExpansionMode,proto3,enum=google.cloud.dialogflow.v2.EntityType_AutoExpansionMode" json:"auto_expansion_mode,omitempty"`
+	// Optional. The collection of entities associated with the entity type.
+	Entities             []*EntityType_Entity `protobuf:"bytes,6,rep,name=entities,proto3" json:"entities,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *EntityType) Reset()         { *m = EntityType{} }
+func (m *EntityType) String() string { return proto.CompactTextString(m) }
+func (*EntityType) ProtoMessage()    {}
+func (*EntityType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{0}
+}
+func (m *EntityType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityType.Unmarshal(m, b)
+}
+func (m *EntityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityType.Marshal(b, m, deterministic)
+}
+func (dst *EntityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityType.Merge(dst, src)
+}
+func (m *EntityType) XXX_Size() int {
+	return xxx_messageInfo_EntityType.Size(m)
+}
+func (m *EntityType) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityType proto.InternalMessageInfo
+
+func (m *EntityType) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *EntityType) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *EntityType) GetKind() EntityType_Kind {
+	if m != nil {
+		return m.Kind
+	}
+	return EntityType_KIND_UNSPECIFIED
+}
+
+func (m *EntityType) GetAutoExpansionMode() EntityType_AutoExpansionMode {
+	if m != nil {
+		return m.AutoExpansionMode
+	}
+	return EntityType_AUTO_EXPANSION_MODE_UNSPECIFIED
+}
+
+func (m *EntityType) GetEntities() []*EntityType_Entity {
+	if m != nil {
+		return m.Entities
+	}
+	return nil
+}
+
+// Optional. Represents an entity.
+type EntityType_Entity struct {
+	// Required.
+	// For `KIND_MAP` entity types:
+	//   A canonical name to be used in place of synonyms.
+	// For `KIND_LIST` entity types:
+	//   A string that can contain references to other entity types (with or
+	//   without aliases).
+	Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	// Required. A collection of synonyms. For `KIND_LIST` entity types this
+	// must contain exactly one synonym equal to `value`.
+	Synonyms             []string `protobuf:"bytes,2,rep,name=synonyms,proto3" json:"synonyms,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EntityType_Entity) Reset()         { *m = EntityType_Entity{} }
+func (m *EntityType_Entity) String() string { return proto.CompactTextString(m) }
+func (*EntityType_Entity) ProtoMessage()    {}
+func (*EntityType_Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{0, 0}
+}
+func (m *EntityType_Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityType_Entity.Unmarshal(m, b)
+}
+func (m *EntityType_Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityType_Entity.Marshal(b, m, deterministic)
+}
+func (dst *EntityType_Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityType_Entity.Merge(dst, src)
+}
+func (m *EntityType_Entity) XXX_Size() int {
+	return xxx_messageInfo_EntityType_Entity.Size(m)
+}
+func (m *EntityType_Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityType_Entity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityType_Entity proto.InternalMessageInfo
+
+func (m *EntityType_Entity) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+func (m *EntityType_Entity) GetSynonyms() []string {
+	if m != nil {
+		return m.Synonyms
+	}
+	return nil
+}
+
+// The request message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
+type ListEntityTypesRequest struct {
+	// Required. The agent to list all entity types from.
+	// Format: `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The language to list entity synonyms for. If not specified,
+	// the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The maximum number of items to return in a single page. By
+	// default 100 and at most 1000.
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional. The next_page_token value returned from a previous list request.
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListEntityTypesRequest) Reset()         { *m = ListEntityTypesRequest{} }
+func (m *ListEntityTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListEntityTypesRequest) ProtoMessage()    {}
+func (*ListEntityTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{1}
+}
+func (m *ListEntityTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListEntityTypesRequest.Unmarshal(m, b)
+}
+func (m *ListEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListEntityTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEntityTypesRequest.Merge(dst, src)
+}
+func (m *ListEntityTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListEntityTypesRequest.Size(m)
+}
+func (m *ListEntityTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListEntityTypesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListEntityTypesRequest proto.InternalMessageInfo
+
+func (m *ListEntityTypesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListEntityTypesRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *ListEntityTypesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListEntityTypesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// The response message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2.EntityTypes.ListEntityTypes].
+type ListEntityTypesResponse struct {
+	// The list of agent entity types. There will be a maximum number of items
+	// returned based on the page_size field in the request.
+	EntityTypes []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes,proto3" json:"entity_types,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListEntityTypesResponse) Reset()         { *m = ListEntityTypesResponse{} }
+func (m *ListEntityTypesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListEntityTypesResponse) ProtoMessage()    {}
+func (*ListEntityTypesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{2}
+}
+func (m *ListEntityTypesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListEntityTypesResponse.Unmarshal(m, b)
+}
+func (m *ListEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListEntityTypesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEntityTypesResponse.Merge(dst, src)
+}
+func (m *ListEntityTypesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListEntityTypesResponse.Size(m)
+}
+func (m *ListEntityTypesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListEntityTypesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListEntityTypesResponse proto.InternalMessageInfo
+
+func (m *ListEntityTypesResponse) GetEntityTypes() []*EntityType {
+	if m != nil {
+		return m.EntityTypes
+	}
+	return nil
+}
+
+func (m *ListEntityTypesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The request message for [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType].
+type GetEntityTypeRequest struct {
+	// Required. The name of the entity type.
+	// Format: `projects/<Project ID>/agent/entityTypes/<EntityType ID>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Optional. The language to retrieve entity synonyms for. If not specified,
+	// the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode         string   `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetEntityTypeRequest) Reset()         { *m = GetEntityTypeRequest{} }
+func (m *GetEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*GetEntityTypeRequest) ProtoMessage()    {}
+func (*GetEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{3}
+}
+func (m *GetEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *GetEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetEntityTypeRequest.Merge(dst, src)
+}
+func (m *GetEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_GetEntityTypeRequest.Size(m)
+}
+func (m *GetEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetEntityTypeRequest proto.InternalMessageInfo
+
+func (m *GetEntityTypeRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *GetEntityTypeRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+// The request message for [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2.EntityTypes.CreateEntityType].
+type CreateEntityTypeRequest struct {
+	// Required. The agent to create a entity type for.
+	// Format: `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The entity type to create.
+	EntityType *EntityType `protobuf:"bytes,2,opt,name=entity_type,json=entityType,proto3" json:"entity_type,omitempty"`
+	// Optional. The language of entity synonyms defined in `entity_type`. If not
+	// specified, the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateEntityTypeRequest) Reset()         { *m = CreateEntityTypeRequest{} }
+func (m *CreateEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateEntityTypeRequest) ProtoMessage()    {}
+func (*CreateEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{4}
+}
+func (m *CreateEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *CreateEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateEntityTypeRequest.Merge(dst, src)
+}
+func (m *CreateEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateEntityTypeRequest.Size(m)
+}
+func (m *CreateEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateEntityTypeRequest proto.InternalMessageInfo
+
+func (m *CreateEntityTypeRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateEntityTypeRequest) GetEntityType() *EntityType {
+	if m != nil {
+		return m.EntityType
+	}
+	return nil
+}
+
+func (m *CreateEntityTypeRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+// The request message for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2.EntityTypes.UpdateEntityType].
+type UpdateEntityTypeRequest struct {
+	// Required. The entity type to update.
+	// Format: `projects/<Project ID>/agent/entityTypes/<EntityType ID>`.
+	EntityType *EntityType `protobuf:"bytes,1,opt,name=entity_type,json=entityType,proto3" json:"entity_type,omitempty"`
+	// Optional. The language of entity synonyms defined in `entity_type`. If not
+	// specified, the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The mask to control which fields get updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateEntityTypeRequest) Reset()         { *m = UpdateEntityTypeRequest{} }
+func (m *UpdateEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateEntityTypeRequest) ProtoMessage()    {}
+func (*UpdateEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{5}
+}
+func (m *UpdateEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *UpdateEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateEntityTypeRequest.Merge(dst, src)
+}
+func (m *UpdateEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateEntityTypeRequest.Size(m)
+}
+func (m *UpdateEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateEntityTypeRequest proto.InternalMessageInfo
+
+func (m *UpdateEntityTypeRequest) GetEntityType() *EntityType {
+	if m != nil {
+		return m.EntityType
+	}
+	return nil
+}
+
+func (m *UpdateEntityTypeRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *UpdateEntityTypeRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// The request message for [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2.EntityTypes.DeleteEntityType].
+type DeleteEntityTypeRequest struct {
+	// Required. The name of the entity type to delete.
+	// Format: `projects/<Project ID>/agent/entityTypes/<EntityType ID>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteEntityTypeRequest) Reset()         { *m = DeleteEntityTypeRequest{} }
+func (m *DeleteEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteEntityTypeRequest) ProtoMessage()    {}
+func (*DeleteEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{6}
+}
+func (m *DeleteEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *DeleteEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteEntityTypeRequest.Merge(dst, src)
+}
+func (m *DeleteEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteEntityTypeRequest.Size(m)
+}
+func (m *DeleteEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteEntityTypeRequest proto.InternalMessageInfo
+
+func (m *DeleteEntityTypeRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The request message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
+type BatchUpdateEntityTypesRequest struct {
+	// Required. The name of the agent to update or create entity types in.
+	// Format: `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The source of the entity type batch.
+	//
+	// For each entity type in the batch:
+	// * If `name` is specified, we update an existing entity type.
+	// * If `name` is not specified, we create a new entity type.
+	//
+	// Types that are valid to be assigned to EntityTypeBatch:
+	//	*BatchUpdateEntityTypesRequest_EntityTypeBatchUri
+	//	*BatchUpdateEntityTypesRequest_EntityTypeBatchInline
+	EntityTypeBatch isBatchUpdateEntityTypesRequest_EntityTypeBatch `protobuf_oneof:"entity_type_batch"`
+	// Optional. The language of entity synonyms defined in `entity_types`. If not
+	// specified, the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode string `protobuf:"bytes,4,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The mask to control which fields get updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *BatchUpdateEntityTypesRequest) Reset()         { *m = BatchUpdateEntityTypesRequest{} }
+func (m *BatchUpdateEntityTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateEntityTypesRequest) ProtoMessage()    {}
+func (*BatchUpdateEntityTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{7}
+}
+func (m *BatchUpdateEntityTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Unmarshal(m, b)
+}
+func (m *BatchUpdateEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntityTypesRequest.Merge(dst, src)
+}
+func (m *BatchUpdateEntityTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Size(m)
+}
+func (m *BatchUpdateEntityTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateEntityTypesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchUpdateEntityTypesRequest proto.InternalMessageInfo
+
+func (m *BatchUpdateEntityTypesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+type isBatchUpdateEntityTypesRequest_EntityTypeBatch interface {
+	isBatchUpdateEntityTypesRequest_EntityTypeBatch()
+}
+
+type BatchUpdateEntityTypesRequest_EntityTypeBatchUri struct {
+	EntityTypeBatchUri string `protobuf:"bytes,2,opt,name=entity_type_batch_uri,json=entityTypeBatchUri,proto3,oneof"`
+}
+
+type BatchUpdateEntityTypesRequest_EntityTypeBatchInline struct {
+	EntityTypeBatchInline *EntityTypeBatch `protobuf:"bytes,3,opt,name=entity_type_batch_inline,json=entityTypeBatchInline,proto3,oneof"`
+}
+
+func (*BatchUpdateEntityTypesRequest_EntityTypeBatchUri) isBatchUpdateEntityTypesRequest_EntityTypeBatch() {
+}
+
+func (*BatchUpdateEntityTypesRequest_EntityTypeBatchInline) isBatchUpdateEntityTypesRequest_EntityTypeBatch() {
+}
+
+func (m *BatchUpdateEntityTypesRequest) GetEntityTypeBatch() isBatchUpdateEntityTypesRequest_EntityTypeBatch {
+	if m != nil {
+		return m.EntityTypeBatch
+	}
+	return nil
+}
+
+func (m *BatchUpdateEntityTypesRequest) GetEntityTypeBatchUri() string {
+	if x, ok := m.GetEntityTypeBatch().(*BatchUpdateEntityTypesRequest_EntityTypeBatchUri); ok {
+		return x.EntityTypeBatchUri
+	}
+	return ""
+}
+
+func (m *BatchUpdateEntityTypesRequest) GetEntityTypeBatchInline() *EntityTypeBatch {
+	if x, ok := m.GetEntityTypeBatch().(*BatchUpdateEntityTypesRequest_EntityTypeBatchInline); ok {
+		return x.EntityTypeBatchInline
+	}
+	return nil
+}
+
+func (m *BatchUpdateEntityTypesRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *BatchUpdateEntityTypesRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*BatchUpdateEntityTypesRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _BatchUpdateEntityTypesRequest_OneofMarshaler, _BatchUpdateEntityTypesRequest_OneofUnmarshaler, _BatchUpdateEntityTypesRequest_OneofSizer, []interface{}{
+		(*BatchUpdateEntityTypesRequest_EntityTypeBatchUri)(nil),
+		(*BatchUpdateEntityTypesRequest_EntityTypeBatchInline)(nil),
+	}
+}
+
+func _BatchUpdateEntityTypesRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*BatchUpdateEntityTypesRequest)
+	// entity_type_batch
+	switch x := m.EntityTypeBatch.(type) {
+	case *BatchUpdateEntityTypesRequest_EntityTypeBatchUri:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.EntityTypeBatchUri)
+	case *BatchUpdateEntityTypesRequest_EntityTypeBatchInline:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.EntityTypeBatchInline); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("BatchUpdateEntityTypesRequest.EntityTypeBatch has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _BatchUpdateEntityTypesRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*BatchUpdateEntityTypesRequest)
+	switch tag {
+	case 2: // entity_type_batch.entity_type_batch_uri
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.EntityTypeBatch = &BatchUpdateEntityTypesRequest_EntityTypeBatchUri{x}
+		return true, err
+	case 3: // entity_type_batch.entity_type_batch_inline
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(EntityTypeBatch)
+		err := b.DecodeMessage(msg)
+		m.EntityTypeBatch = &BatchUpdateEntityTypesRequest_EntityTypeBatchInline{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _BatchUpdateEntityTypesRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*BatchUpdateEntityTypesRequest)
+	// entity_type_batch
+	switch x := m.EntityTypeBatch.(type) {
+	case *BatchUpdateEntityTypesRequest_EntityTypeBatchUri:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.EntityTypeBatchUri)))
+		n += len(x.EntityTypeBatchUri)
+	case *BatchUpdateEntityTypesRequest_EntityTypeBatchInline:
+		s := proto.Size(x.EntityTypeBatchInline)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The response message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchUpdateEntityTypes].
+type BatchUpdateEntityTypesResponse struct {
+	// The collection of updated or created entity types.
+	EntityTypes          []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes,proto3" json:"entity_types,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *BatchUpdateEntityTypesResponse) Reset()         { *m = BatchUpdateEntityTypesResponse{} }
+func (m *BatchUpdateEntityTypesResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateEntityTypesResponse) ProtoMessage()    {}
+func (*BatchUpdateEntityTypesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{8}
+}
+func (m *BatchUpdateEntityTypesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Unmarshal(m, b)
+}
+func (m *BatchUpdateEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntityTypesResponse.Merge(dst, src)
+}
+func (m *BatchUpdateEntityTypesResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Size(m)
+}
+func (m *BatchUpdateEntityTypesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateEntityTypesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchUpdateEntityTypesResponse proto.InternalMessageInfo
+
+func (m *BatchUpdateEntityTypesResponse) GetEntityTypes() []*EntityType {
+	if m != nil {
+		return m.EntityTypes
+	}
+	return nil
+}
+
+// The request message for [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntityTypes].
+type BatchDeleteEntityTypesRequest struct {
+	// Required. The name of the agent to delete all entities types for. Format:
+	// `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The names entity types to delete. All names must point to the
+	// same agent as `parent`.
+	EntityTypeNames      []string `protobuf:"bytes,2,rep,name=entity_type_names,json=entityTypeNames,proto3" json:"entity_type_names,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BatchDeleteEntityTypesRequest) Reset()         { *m = BatchDeleteEntityTypesRequest{} }
+func (m *BatchDeleteEntityTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchDeleteEntityTypesRequest) ProtoMessage()    {}
+func (*BatchDeleteEntityTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{9}
+}
+func (m *BatchDeleteEntityTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Unmarshal(m, b)
+}
+func (m *BatchDeleteEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchDeleteEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteEntityTypesRequest.Merge(dst, src)
+}
+func (m *BatchDeleteEntityTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Size(m)
+}
+func (m *BatchDeleteEntityTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchDeleteEntityTypesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchDeleteEntityTypesRequest proto.InternalMessageInfo
+
+func (m *BatchDeleteEntityTypesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *BatchDeleteEntityTypesRequest) GetEntityTypeNames() []string {
+	if m != nil {
+		return m.EntityTypeNames
+	}
+	return nil
+}
+
+// The request message for [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchCreateEntities].
+type BatchCreateEntitiesRequest struct {
+	// Required. The name of the entity type to create entities in. Format:
+	// `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The collection of entities to create.
+	Entities []*EntityType_Entity `protobuf:"bytes,2,rep,name=entities,proto3" json:"entities,omitempty"`
+	// Optional. The language of entity synonyms defined in `entities`. If not
+	// specified, the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BatchCreateEntitiesRequest) Reset()         { *m = BatchCreateEntitiesRequest{} }
+func (m *BatchCreateEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchCreateEntitiesRequest) ProtoMessage()    {}
+func (*BatchCreateEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{10}
+}
+func (m *BatchCreateEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchCreateEntitiesRequest.Unmarshal(m, b)
+}
+func (m *BatchCreateEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchCreateEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchCreateEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateEntitiesRequest.Merge(dst, src)
+}
+func (m *BatchCreateEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchCreateEntitiesRequest.Size(m)
+}
+func (m *BatchCreateEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchCreateEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchCreateEntitiesRequest proto.InternalMessageInfo
+
+func (m *BatchCreateEntitiesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *BatchCreateEntitiesRequest) GetEntities() []*EntityType_Entity {
+	if m != nil {
+		return m.Entities
+	}
+	return nil
+}
+
+func (m *BatchCreateEntitiesRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+// The response message for [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2.EntityTypes.BatchCreateEntities].
+type BatchUpdateEntitiesRequest struct {
+	// Required. The name of the entity type to update the entities in. Format:
+	// `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The collection of new entities to replace the existing entities.
+	Entities []*EntityType_Entity `protobuf:"bytes,2,rep,name=entities,proto3" json:"entities,omitempty"`
+	// Optional. The language of entity synonyms defined in `entities`. If not
+	// specified, the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The mask to control which fields get updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *BatchUpdateEntitiesRequest) Reset()         { *m = BatchUpdateEntitiesRequest{} }
+func (m *BatchUpdateEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateEntitiesRequest) ProtoMessage()    {}
+func (*BatchUpdateEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{11}
+}
+func (m *BatchUpdateEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateEntitiesRequest.Unmarshal(m, b)
+}
+func (m *BatchUpdateEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntitiesRequest.Merge(dst, src)
+}
+func (m *BatchUpdateEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateEntitiesRequest.Size(m)
+}
+func (m *BatchUpdateEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchUpdateEntitiesRequest proto.InternalMessageInfo
+
+func (m *BatchUpdateEntitiesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *BatchUpdateEntitiesRequest) GetEntities() []*EntityType_Entity {
+	if m != nil {
+		return m.Entities
+	}
+	return nil
+}
+
+func (m *BatchUpdateEntitiesRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *BatchUpdateEntitiesRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// The request message for [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2.EntityTypes.BatchDeleteEntities].
+type BatchDeleteEntitiesRequest struct {
+	// Required. The name of the entity type to delete entries for. Format:
+	// `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The canonical `values` of the entities to delete. Note that
+	// these are not fully-qualified names, i.e. they don't start with
+	// `projects/<Project ID>`.
+	EntityValues []string `protobuf:"bytes,2,rep,name=entity_values,json=entityValues,proto3" json:"entity_values,omitempty"`
+	// Optional. The language of entity synonyms defined in `entities`. If not
+	// specified, the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BatchDeleteEntitiesRequest) Reset()         { *m = BatchDeleteEntitiesRequest{} }
+func (m *BatchDeleteEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchDeleteEntitiesRequest) ProtoMessage()    {}
+func (*BatchDeleteEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{12}
+}
+func (m *BatchDeleteEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchDeleteEntitiesRequest.Unmarshal(m, b)
+}
+func (m *BatchDeleteEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchDeleteEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchDeleteEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteEntitiesRequest.Merge(dst, src)
+}
+func (m *BatchDeleteEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchDeleteEntitiesRequest.Size(m)
+}
+func (m *BatchDeleteEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchDeleteEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchDeleteEntitiesRequest proto.InternalMessageInfo
+
+func (m *BatchDeleteEntitiesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *BatchDeleteEntitiesRequest) GetEntityValues() []string {
+	if m != nil {
+		return m.EntityValues
+	}
+	return nil
+}
+
+func (m *BatchDeleteEntitiesRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+// This message is a wrapper around a collection of entity types.
+type EntityTypeBatch struct {
+	// A collection of entity types.
+	EntityTypes          []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes,proto3" json:"entity_types,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *EntityTypeBatch) Reset()         { *m = EntityTypeBatch{} }
+func (m *EntityTypeBatch) String() string { return proto.CompactTextString(m) }
+func (*EntityTypeBatch) ProtoMessage()    {}
+func (*EntityTypeBatch) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_5022cc8f1b023825, []int{13}
+}
+func (m *EntityTypeBatch) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityTypeBatch.Unmarshal(m, b)
+}
+func (m *EntityTypeBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityTypeBatch.Marshal(b, m, deterministic)
+}
+func (dst *EntityTypeBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityTypeBatch.Merge(dst, src)
+}
+func (m *EntityTypeBatch) XXX_Size() int {
+	return xxx_messageInfo_EntityTypeBatch.Size(m)
+}
+func (m *EntityTypeBatch) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityTypeBatch.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityTypeBatch proto.InternalMessageInfo
+
+func (m *EntityTypeBatch) GetEntityTypes() []*EntityType {
+	if m != nil {
+		return m.EntityTypes
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*EntityType)(nil), "google.cloud.dialogflow.v2.EntityType")
+	proto.RegisterType((*EntityType_Entity)(nil), "google.cloud.dialogflow.v2.EntityType.Entity")
+	proto.RegisterType((*ListEntityTypesRequest)(nil), "google.cloud.dialogflow.v2.ListEntityTypesRequest")
+	proto.RegisterType((*ListEntityTypesResponse)(nil), "google.cloud.dialogflow.v2.ListEntityTypesResponse")
+	proto.RegisterType((*GetEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.GetEntityTypeRequest")
+	proto.RegisterType((*CreateEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.CreateEntityTypeRequest")
+	proto.RegisterType((*UpdateEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.UpdateEntityTypeRequest")
+	proto.RegisterType((*DeleteEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.DeleteEntityTypeRequest")
+	proto.RegisterType((*BatchUpdateEntityTypesRequest)(nil), "google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest")
+	proto.RegisterType((*BatchUpdateEntityTypesResponse)(nil), "google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse")
+	proto.RegisterType((*BatchDeleteEntityTypesRequest)(nil), "google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest")
+	proto.RegisterType((*BatchCreateEntitiesRequest)(nil), "google.cloud.dialogflow.v2.BatchCreateEntitiesRequest")
+	proto.RegisterType((*BatchUpdateEntitiesRequest)(nil), "google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest")
+	proto.RegisterType((*BatchDeleteEntitiesRequest)(nil), "google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest")
+	proto.RegisterType((*EntityTypeBatch)(nil), "google.cloud.dialogflow.v2.EntityTypeBatch")
+	proto.RegisterEnum("google.cloud.dialogflow.v2.EntityType_Kind", EntityType_Kind_name, EntityType_Kind_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.EntityType_AutoExpansionMode", EntityType_AutoExpansionMode_name, EntityType_AutoExpansionMode_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// EntityTypesClient is the client API for EntityTypes service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type EntityTypesClient interface {
+	// Returns the list of all entity types in the specified agent.
+	ListEntityTypes(ctx context.Context, in *ListEntityTypesRequest, opts ...grpc.CallOption) (*ListEntityTypesResponse, error)
+	// Retrieves the specified entity type.
+	GetEntityType(ctx context.Context, in *GetEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error)
+	// Creates an entity type in the specified agent.
+	CreateEntityType(ctx context.Context, in *CreateEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error)
+	// Updates the specified entity type.
+	UpdateEntityType(ctx context.Context, in *UpdateEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error)
+	// Deletes the specified entity type.
+	DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Updates/Creates multiple entity types in the specified agent.
+	//
+	// Operation <response: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	BatchUpdateEntityTypes(ctx context.Context, in *BatchUpdateEntityTypesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Deletes entity types in the specified agent.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	BatchDeleteEntityTypes(ctx context.Context, in *BatchDeleteEntityTypesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Creates multiple new entities in the specified entity type (extends the
+	// existing collection of entries).
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty]>
+	BatchCreateEntities(ctx context.Context, in *BatchCreateEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Updates entities in the specified entity type (replaces the existing
+	// collection of entries).
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	BatchUpdateEntities(ctx context.Context, in *BatchUpdateEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Deletes entities in the specified entity type.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	BatchDeleteEntities(ctx context.Context, in *BatchDeleteEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type entityTypesClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewEntityTypesClient(cc *grpc.ClientConn) EntityTypesClient {
+	return &entityTypesClient{cc}
+}
+
+func (c *entityTypesClient) ListEntityTypes(ctx context.Context, in *ListEntityTypesRequest, opts ...grpc.CallOption) (*ListEntityTypesResponse, error) {
+	out := new(ListEntityTypesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/ListEntityTypes", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) GetEntityType(ctx context.Context, in *GetEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error) {
+	out := new(EntityType)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/GetEntityType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) CreateEntityType(ctx context.Context, in *CreateEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error) {
+	out := new(EntityType)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/CreateEntityType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) UpdateEntityType(ctx context.Context, in *UpdateEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error) {
+	out := new(EntityType)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/UpdateEntityType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/DeleteEntityType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) BatchUpdateEntityTypes(ctx context.Context, in *BatchUpdateEntityTypesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/BatchUpdateEntityTypes", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) BatchDeleteEntityTypes(ctx context.Context, in *BatchDeleteEntityTypesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/BatchDeleteEntityTypes", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) BatchCreateEntities(ctx context.Context, in *BatchCreateEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/BatchCreateEntities", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) BatchUpdateEntities(ctx context.Context, in *BatchUpdateEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/BatchUpdateEntities", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *entityTypesClient) BatchDeleteEntities(ctx context.Context, in *BatchDeleteEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/BatchDeleteEntities", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// EntityTypesServer is the server API for EntityTypes service.
+type EntityTypesServer interface {
+	// Returns the list of all entity types in the specified agent.
+	ListEntityTypes(context.Context, *ListEntityTypesRequest) (*ListEntityTypesResponse, error)
+	// Retrieves the specified entity type.
+	GetEntityType(context.Context, *GetEntityTypeRequest) (*EntityType, error)
+	// Creates an entity type in the specified agent.
+	CreateEntityType(context.Context, *CreateEntityTypeRequest) (*EntityType, error)
+	// Updates the specified entity type.
+	UpdateEntityType(context.Context, *UpdateEntityTypeRequest) (*EntityType, error)
+	// Deletes the specified entity type.
+	DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*empty.Empty, error)
+	// Updates/Creates multiple entity types in the specified agent.
+	//
+	// Operation <response: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	BatchUpdateEntityTypes(context.Context, *BatchUpdateEntityTypesRequest) (*longrunning.Operation, error)
+	// Deletes entity types in the specified agent.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	BatchDeleteEntityTypes(context.Context, *BatchDeleteEntityTypesRequest) (*longrunning.Operation, error)
+	// Creates multiple new entities in the specified entity type (extends the
+	// existing collection of entries).
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty]>
+	BatchCreateEntities(context.Context, *BatchCreateEntitiesRequest) (*longrunning.Operation, error)
+	// Updates entities in the specified entity type (replaces the existing
+	// collection of entries).
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	BatchUpdateEntities(context.Context, *BatchUpdateEntitiesRequest) (*longrunning.Operation, error)
+	// Deletes entities in the specified entity type.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
+	BatchDeleteEntities(context.Context, *BatchDeleteEntitiesRequest) (*longrunning.Operation, error)
+}
+
+func RegisterEntityTypesServer(s *grpc.Server, srv EntityTypesServer) {
+	s.RegisterService(&_EntityTypes_serviceDesc, srv)
+}
+
+func _EntityTypes_ListEntityTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListEntityTypesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).ListEntityTypes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/ListEntityTypes",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).ListEntityTypes(ctx, req.(*ListEntityTypesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_GetEntityType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetEntityTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).GetEntityType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/GetEntityType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).GetEntityType(ctx, req.(*GetEntityTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_CreateEntityType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateEntityTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).CreateEntityType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/CreateEntityType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).CreateEntityType(ctx, req.(*CreateEntityTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_UpdateEntityType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateEntityTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).UpdateEntityType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/UpdateEntityType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).UpdateEntityType(ctx, req.(*UpdateEntityTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_DeleteEntityType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteEntityTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).DeleteEntityType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/DeleteEntityType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).DeleteEntityType(ctx, req.(*DeleteEntityTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_BatchUpdateEntityTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchUpdateEntityTypesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).BatchUpdateEntityTypes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/BatchUpdateEntityTypes",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).BatchUpdateEntityTypes(ctx, req.(*BatchUpdateEntityTypesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_BatchDeleteEntityTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchDeleteEntityTypesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).BatchDeleteEntityTypes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/BatchDeleteEntityTypes",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).BatchDeleteEntityTypes(ctx, req.(*BatchDeleteEntityTypesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_BatchCreateEntities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchCreateEntitiesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).BatchCreateEntities(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/BatchCreateEntities",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).BatchCreateEntities(ctx, req.(*BatchCreateEntitiesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_BatchUpdateEntities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchUpdateEntitiesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).BatchUpdateEntities(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/BatchUpdateEntities",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).BatchUpdateEntities(ctx, req.(*BatchUpdateEntitiesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _EntityTypes_BatchDeleteEntities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchDeleteEntitiesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EntityTypesServer).BatchDeleteEntities(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.EntityTypes/BatchDeleteEntities",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EntityTypesServer).BatchDeleteEntities(ctx, req.(*BatchDeleteEntitiesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _EntityTypes_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.dialogflow.v2.EntityTypes",
+	HandlerType: (*EntityTypesServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListEntityTypes",
+			Handler:    _EntityTypes_ListEntityTypes_Handler,
+		},
+		{
+			MethodName: "GetEntityType",
+			Handler:    _EntityTypes_GetEntityType_Handler,
+		},
+		{
+			MethodName: "CreateEntityType",
+			Handler:    _EntityTypes_CreateEntityType_Handler,
+		},
+		{
+			MethodName: "UpdateEntityType",
+			Handler:    _EntityTypes_UpdateEntityType_Handler,
+		},
+		{
+			MethodName: "DeleteEntityType",
+			Handler:    _EntityTypes_DeleteEntityType_Handler,
+		},
+		{
+			MethodName: "BatchUpdateEntityTypes",
+			Handler:    _EntityTypes_BatchUpdateEntityTypes_Handler,
+		},
+		{
+			MethodName: "BatchDeleteEntityTypes",
+			Handler:    _EntityTypes_BatchDeleteEntityTypes_Handler,
+		},
+		{
+			MethodName: "BatchCreateEntities",
+			Handler:    _EntityTypes_BatchCreateEntities_Handler,
+		},
+		{
+			MethodName: "BatchUpdateEntities",
+			Handler:    _EntityTypes_BatchUpdateEntities_Handler,
+		},
+		{
+			MethodName: "BatchDeleteEntities",
+			Handler:    _EntityTypes_BatchDeleteEntities_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/dialogflow/v2/entity_type.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/entity_type.proto", fileDescriptor_entity_type_5022cc8f1b023825)
+}
+
+var fileDescriptor_entity_type_5022cc8f1b023825 = []byte{
+	// 1233 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xcf, 0x6f, 0xe3, 0x44,
+	0x14, 0xc7, 0x3b, 0x69, 0x5a, 0xb5, 0x2f, 0xed, 0x36, 0x9d, 0x76, 0xdb, 0xc8, 0xdd, 0xee, 0x16,
+	0x57, 0x5a, 0x95, 0x2e, 0x1b, 0x43, 0xaa, 0x45, 0xbb, 0x5d, 0x01, 0xdb, 0x36, 0x69, 0x37, 0xf4,
+	0x57, 0xe4, 0xb6, 0x2b, 0x40, 0x48, 0x96, 0x9b, 0x4c, 0xb3, 0xa6, 0xce, 0x8c, 0x89, 0xed, 0xb2,
+	0x59, 0xb4, 0x1c, 0xe0, 0x08, 0x17, 0xe0, 0x8a, 0x40, 0x42, 0x9c, 0x90, 0x10, 0x17, 0x2e, 0x88,
+	0x2b, 0x37, 0x8e, 0xfc, 0x05, 0x48, 0xfc, 0x11, 0x1c, 0x91, 0xc7, 0x76, 0xed, 0x38, 0x4e, 0xe2,
+	0x8a, 0xb2, 0xda, 0x5b, 0x3c, 0xf3, 0xfc, 0xde, 0xe7, 0xfd, 0x98, 0xf9, 0xd6, 0x85, 0x57, 0xea,
+	0x8c, 0xd5, 0x75, 0x22, 0x55, 0x75, 0x66, 0xd7, 0xa4, 0x9a, 0xa6, 0xea, 0xac, 0x7e, 0xa2, 0xb3,
+	0x8f, 0xa4, 0xb3, 0x82, 0x44, 0xa8, 0xa5, 0x59, 0x2d, 0xc5, 0x6a, 0x19, 0x24, 0x6f, 0x34, 0x99,
+	0xc5, 0xb0, 0xe0, 0x5a, 0xe7, 0xb9, 0x75, 0x3e, 0xb0, 0xce, 0x9f, 0x15, 0x84, 0x6b, 0x9e, 0x27,
+	0xd5, 0xd0, 0x24, 0x95, 0x52, 0x66, 0xa9, 0x96, 0xc6, 0xa8, 0xe9, 0xbe, 0x29, 0x2c, 0x7a, 0xbb,
+	0x3a, 0xa3, 0xf5, 0xa6, 0x4d, 0xa9, 0x46, 0xeb, 0x12, 0x33, 0x48, 0xb3, 0xcd, 0x68, 0xce, 0x33,
+	0xe2, 0x4f, 0xc7, 0xf6, 0x89, 0x44, 0x1a, 0x86, 0xd5, 0xf2, 0x36, 0x17, 0xa2, 0x9b, 0x27, 0x1a,
+	0xd1, 0x6b, 0x4a, 0x43, 0x35, 0x4f, 0x3d, 0x8b, 0x6b, 0x51, 0x0b, 0xd3, 0x6a, 0xda, 0x55, 0xcb,
+	0xdd, 0x15, 0x3f, 0x4f, 0x03, 0x94, 0x78, 0x46, 0x87, 0x2d, 0x83, 0x60, 0x0c, 0x69, 0xaa, 0x36,
+	0x48, 0x0e, 0x2d, 0xa0, 0xa5, 0x51, 0x99, 0xff, 0xc6, 0x2f, 0xc1, 0x58, 0x4d, 0x33, 0x0d, 0x5d,
+	0x6d, 0x29, 0x7c, 0x2f, 0xc5, 0xf7, 0x32, 0xde, 0xda, 0x9e, 0x63, 0xf2, 0x16, 0xa4, 0x4f, 0x35,
+	0x5a, 0xcb, 0x0d, 0x2e, 0xa0, 0xa5, 0x2b, 0x85, 0x5b, 0xf9, 0xee, 0x05, 0xc9, 0x07, 0xc1, 0xf2,
+	0xdb, 0x1a, 0xad, 0xc9, 0xfc, 0x45, 0xfc, 0x18, 0xa6, 0x54, 0xdb, 0x62, 0x0a, 0x79, 0x62, 0xa8,
+	0xd4, 0xd4, 0x18, 0x55, 0x1a, 0xac, 0x46, 0x72, 0x69, 0xee, 0xef, 0x6e, 0x42, 0x7f, 0x6b, 0xb6,
+	0xc5, 0x4a, 0xbe, 0x83, 0x5d, 0x56, 0x23, 0xf2, 0xa4, 0x1a, 0x5d, 0xc2, 0x65, 0x18, 0xe1, 0x1d,
+	0xd4, 0x88, 0x99, 0x1b, 0x5e, 0x18, 0x5c, 0xca, 0x14, 0x6e, 0x27, 0x74, 0xef, 0xfe, 0x94, 0xcf,
+	0x5f, 0x17, 0x56, 0x61, 0xd8, 0x5d, 0xc3, 0xd3, 0x30, 0x74, 0xa6, 0xea, 0xb6, 0x5f, 0x37, 0xf7,
+	0x01, 0x0b, 0x30, 0x62, 0xb6, 0x28, 0xa3, 0xad, 0x86, 0x99, 0x4b, 0x2d, 0x0c, 0x2e, 0x8d, 0xca,
+	0xe7, 0xcf, 0xe2, 0x3d, 0x48, 0x3b, 0xe9, 0xe3, 0x69, 0xc8, 0x6e, 0x97, 0xf7, 0x8a, 0xca, 0xd1,
+	0xde, 0x41, 0xa5, 0xb4, 0x51, 0xde, 0x2c, 0x97, 0x8a, 0xd9, 0x01, 0x3c, 0x06, 0x23, 0x7c, 0x75,
+	0x77, 0xad, 0x92, 0x45, 0x78, 0x1c, 0x46, 0xf9, 0xd3, 0x4e, 0xf9, 0xe0, 0x30, 0x9b, 0x12, 0xdf,
+	0x85, 0xc9, 0x8e, 0x4c, 0xf1, 0x22, 0xdc, 0x58, 0x3b, 0x3a, 0xdc, 0x57, 0x4a, 0xef, 0x54, 0xd6,
+	0xf6, 0x0e, 0xca, 0xfb, 0x7b, 0xca, 0xee, 0x7e, 0xb1, 0x14, 0x71, 0x7b, 0x03, 0xe6, 0xe2, 0x8c,
+	0x8a, 0xa5, 0xcd, 0xb5, 0xa3, 0x9d, 0xc3, 0x2c, 0x12, 0xbf, 0x44, 0x30, 0xb3, 0xa3, 0x99, 0x56,
+	0x90, 0xb5, 0x29, 0x93, 0x0f, 0x6d, 0x62, 0x5a, 0x78, 0x06, 0x86, 0x0d, 0xb5, 0x49, 0xa8, 0xe5,
+	0xe5, 0xe8, 0x3d, 0xe1, 0x45, 0x18, 0xd7, 0x55, 0x5a, 0xb7, 0xd5, 0x3a, 0x51, 0xaa, 0x4e, 0xcf,
+	0xdc, 0xf1, 0x18, 0xf3, 0x17, 0x37, 0x1c, 0xba, 0x39, 0x18, 0x35, 0x1c, 0x03, 0x53, 0x7b, 0x4a,
+	0xf8, 0x90, 0x0c, 0xc9, 0x23, 0xce, 0xc2, 0x81, 0xf6, 0x94, 0xe0, 0x79, 0x00, 0xbe, 0x69, 0xb1,
+	0x53, 0x42, 0x79, 0xcb, 0x47, 0x65, 0x6e, 0x7e, 0xe8, 0x2c, 0x88, 0x5f, 0x20, 0x98, 0xed, 0x60,
+	0x32, 0x0d, 0x46, 0x4d, 0xa7, 0x99, 0x63, 0xa1, 0xe3, 0x68, 0xe6, 0x10, 0x6f, 0xe8, 0xcd, 0x64,
+	0x0d, 0x95, 0x33, 0x24, 0x70, 0x89, 0x6f, 0xc2, 0x04, 0x25, 0x4f, 0x2c, 0x25, 0x84, 0xe2, 0x66,
+	0x32, 0xee, 0x2c, 0x57, 0xce, 0x71, 0xf6, 0x61, 0x7a, 0x8b, 0x84, 0x60, 0xfc, 0xfa, 0xc4, 0x9d,
+	0x9c, 0x24, 0xb5, 0x11, 0xbf, 0x43, 0x30, 0xbb, 0xd1, 0x24, 0xaa, 0x45, 0x3a, 0x9d, 0x76, 0x2b,
+	0xfa, 0x16, 0x64, 0x42, 0x79, 0x73, 0xb7, 0xc9, 0xd3, 0x86, 0x20, 0xed, 0x4e, 0xc2, 0xc1, 0x18,
+	0xc2, 0xdf, 0x11, 0xcc, 0x1e, 0x19, 0xb5, 0x58, 0xc2, 0x08, 0x09, 0xba, 0x3c, 0x92, 0xb8, 0x39,
+	0xba, 0x0f, 0x19, 0x9b, 0x83, 0xf0, 0x0b, 0x8e, 0xc3, 0x66, 0x0a, 0x82, 0x1f, 0xcd, 0xbf, 0xe1,
+	0xf2, 0x9b, 0xce, 0x1d, 0xb8, 0xab, 0x9a, 0xa7, 0x32, 0xb8, 0xe6, 0xce, 0x6f, 0xf1, 0x36, 0xcc,
+	0x16, 0x89, 0x4e, 0xe2, 0xb2, 0x88, 0x69, 0x9e, 0xf8, 0x47, 0x0a, 0xe6, 0xd7, 0x55, 0xab, 0xfa,
+	0x38, 0x9a, 0x7a, 0xdf, 0x23, 0xb1, 0x02, 0x57, 0x43, 0x35, 0x51, 0x8e, 0x1d, 0x27, 0x8a, 0xdd,
+	0xd4, 0xdc, 0x94, 0x1e, 0x0e, 0xc8, 0x38, 0xc8, 0xdb, 0x8d, 0xd0, 0xd4, 0xf0, 0x09, 0xe4, 0x3a,
+	0x5f, 0xd2, 0xa8, 0xae, 0x51, 0xe2, 0xe5, 0x99, 0xf0, 0x5a, 0xe5, 0x1e, 0x1f, 0x0e, 0xc8, 0x57,
+	0x23, 0x41, 0xca, 0xdc, 0x57, 0x67, 0x9d, 0xd3, 0xfd, 0xeb, 0x3c, 0x74, 0x91, 0x3a, 0xaf, 0x4f,
+	0xc1, 0x64, 0x47, 0x26, 0xe2, 0x29, 0x5c, 0xef, 0x56, 0xcc, 0x4b, 0x3f, 0xcb, 0x62, 0xd5, 0xeb,
+	0x5c, 0xb4, 0xdd, 0x7d, 0x3b, 0xb7, 0xdc, 0x8e, 0xee, 0xcc, 0x81, 0x7f, 0x75, 0x4f, 0x04, 0x01,
+	0x1c, 0xc9, 0x33, 0xc5, 0x1f, 0x10, 0x08, 0x3c, 0x4a, 0xe8, 0xf0, 0x6a, 0xfd, 0x43, 0x84, 0xf5,
+	0x27, 0xf5, 0x9f, 0xf4, 0x27, 0xd9, 0xe1, 0xfd, 0xcb, 0xc7, 0x0c, 0x55, 0xfe, 0xc5, 0xc3, 0x8c,
+	0x4e, 0x5c, 0xfa, 0x42, 0x27, 0xfb, 0x13, 0x2f, 0xc5, 0x50, 0xbf, 0xb5, 0x44, 0xca, 0xe5, 0x35,
+	0x9b, 0xcb, 0xb5, 0xdf, 0x68, 0x6f, 0x0a, 0x1f, 0xf1, 0xb5, 0x64, 0x35, 0x7e, 0x1f, 0x26, 0x22,
+	0xe7, 0xef, 0x12, 0xa7, 0xb9, 0xf0, 0xd9, 0x15, 0xc8, 0x84, 0x66, 0x18, 0xff, 0x84, 0x60, 0x22,
+	0x22, 0x88, 0xb8, 0xd0, 0xcb, 0x71, 0xbc, 0xa2, 0x0b, 0x2b, 0x17, 0x7a, 0xc7, 0x3d, 0xa5, 0xe2,
+	0x6b, 0x9f, 0xfe, 0xf9, 0xf7, 0xd7, 0xa9, 0x5b, 0xf8, 0x65, 0xe7, 0x4f, 0xe1, 0x8f, 0xdd, 0x4a,
+	0xbe, 0x61, 0x34, 0xd9, 0x07, 0xa4, 0x6a, 0x99, 0xd2, 0xb2, 0xa4, 0xd6, 0x09, 0xb5, 0x9e, 0x49,
+	0x61, 0x65, 0xfd, 0x06, 0xc1, 0x78, 0x9b, 0x64, 0xe2, 0x57, 0x7b, 0x45, 0x8e, 0x53, 0x57, 0x21,
+	0x61, 0xe1, 0x22, 0x78, 0xce, 0xf9, 0xed, 0x80, 0x0b, 0xb3, 0x49, 0xcb, 0xcf, 0xf0, 0xcf, 0x08,
+	0xb2, 0x51, 0xfd, 0xc5, 0x3d, 0x6b, 0xd3, 0x45, 0xad, 0x13, 0x43, 0xbe, 0xc9, 0x21, 0xef, 0x8a,
+	0xc9, 0x6b, 0xb8, 0x1a, 0x16, 0x59, 0xfc, 0x1b, 0x82, 0x6c, 0xf4, 0x1e, 0xed, 0x4d, 0xdc, 0x45,
+	0xbd, 0x13, 0x13, 0xbf, 0xcd, 0x89, 0x8b, 0x85, 0x3b, 0x9c, 0x38, 0xfc, 0x05, 0x94, 0xa4, 0xc4,
+	0xed, 0xf4, 0x5f, 0x21, 0xc8, 0x46, 0x2f, 0xe6, 0xde, 0xf4, 0x5d, 0x54, 0x5b, 0x98, 0xe9, 0xb8,
+	0x1e, 0x4a, 0xce, 0x97, 0x91, 0x3f, 0x04, 0xcb, 0x17, 0x18, 0x82, 0x5f, 0x10, 0xcc, 0xc4, 0xeb,
+	0x13, 0xbe, 0xd7, 0x0b, 0xad, 0xe7, 0x1f, 0x08, 0xc2, 0xbc, 0xff, 0x6a, 0xe8, 0xfb, 0x2e, 0xbf,
+	0xef, 0x7f, 0xdf, 0x89, 0x0f, 0x38, 0xe7, 0xaa, 0x78, 0x27, 0xf9, 0x1c, 0x1c, 0x07, 0xf1, 0x56,
+	0xd1, 0x72, 0x80, 0xdd, 0xa1, 0x74, 0x09, 0xb0, 0xbb, 0xa9, 0xe3, 0xff, 0x85, 0xed, 0xc6, 0x73,
+	0xb0, 0x7f, 0x45, 0x30, 0x15, 0x23, 0x9d, 0xf8, 0xf5, 0xbe, 0xcc, 0xb1, 0x5a, 0xdb, 0x0f, 0x78,
+	0x9b, 0x03, 0x97, 0xc4, 0x07, 0xbd, 0x80, 0x23, 0x13, 0x21, 0xf9, 0xf2, 0xe5, 0xb2, 0xbb, 0x71,
+	0xdb, 0xd8, 0xdb, 0xf5, 0x34, 0x01, 0x7b, 0xac, 0x00, 0x3f, 0x07, 0xf6, 0x60, 0x5c, 0xce, 0xd9,
+	0xdb, 0x85, 0x32, 0x01, 0x7b, 0xac, 0xb2, 0x3e, 0x07, 0xf6, 0xf3, 0x99, 0x59, 0xff, 0x16, 0xc1,
+	0xf5, 0x2a, 0x6b, 0xf4, 0x20, 0x5d, 0x0f, 0x89, 0x70, 0xc5, 0xb9, 0x11, 0x2a, 0xe8, 0xbd, 0xa2,
+	0x67, 0x5e, 0x67, 0x8e, 0x60, 0xe7, 0x59, 0xb3, 0x2e, 0xd5, 0x09, 0xe5, 0xf7, 0x85, 0xe4, 0x6e,
+	0xa9, 0x86, 0x66, 0xc6, 0xfd, 0x9f, 0xe7, 0x7e, 0xf0, 0xf4, 0x0f, 0x42, 0xdf, 0xa7, 0x52, 0xc5,
+	0xcd, 0x1f, 0x53, 0xc2, 0x96, 0xeb, 0x6e, 0x83, 0x47, 0x2f, 0x06, 0xd1, 0x1f, 0x15, 0x8e, 0x87,
+	0xb9, 0xd7, 0x95, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x95, 0xab, 0x4c, 0xcf, 0x3c, 0x12, 0x00,
+	0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/intent.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/intent.pb.go
new file mode 100644
index 00000000..a06e47a4
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/intent.pb.go
@@ -0,0 +1,3354 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2/intent.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Represents the options for views of an intent.
+// An intent can be a sizable object. Therefore, we provide a resource view that
+// does not return training phrases in the response by default.
+type IntentView int32
+
+const (
+	// Training phrases field is not populated in the response.
+	IntentView_INTENT_VIEW_UNSPECIFIED IntentView = 0
+	// All fields are populated.
+	IntentView_INTENT_VIEW_FULL IntentView = 1
+)
+
+var IntentView_name = map[int32]string{
+	0: "INTENT_VIEW_UNSPECIFIED",
+	1: "INTENT_VIEW_FULL",
+}
+var IntentView_value = map[string]int32{
+	"INTENT_VIEW_UNSPECIFIED": 0,
+	"INTENT_VIEW_FULL":        1,
+}
+
+func (x IntentView) String() string {
+	return proto.EnumName(IntentView_name, int32(x))
+}
+func (IntentView) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0}
+}
+
+// Represents the different states that webhooks can be in.
+type Intent_WebhookState int32
+
+const (
+	// Webhook is disabled in the agent and in the intent.
+	Intent_WEBHOOK_STATE_UNSPECIFIED Intent_WebhookState = 0
+	// Webhook is enabled in the agent and in the intent.
+	Intent_WEBHOOK_STATE_ENABLED Intent_WebhookState = 1
+	// Webhook is enabled in the agent and in the intent. Also, each slot
+	// filling prompt is forwarded to the webhook.
+	Intent_WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING Intent_WebhookState = 2
+)
+
+var Intent_WebhookState_name = map[int32]string{
+	0: "WEBHOOK_STATE_UNSPECIFIED",
+	1: "WEBHOOK_STATE_ENABLED",
+	2: "WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING",
+}
+var Intent_WebhookState_value = map[string]int32{
+	"WEBHOOK_STATE_UNSPECIFIED":              0,
+	"WEBHOOK_STATE_ENABLED":                  1,
+	"WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING": 2,
+}
+
+func (x Intent_WebhookState) String() string {
+	return proto.EnumName(Intent_WebhookState_name, int32(x))
+}
+func (Intent_WebhookState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 0}
+}
+
+// Represents different types of training phrases.
+type Intent_TrainingPhrase_Type int32
+
+const (
+	// Not specified. This value should never be used.
+	Intent_TrainingPhrase_TYPE_UNSPECIFIED Intent_TrainingPhrase_Type = 0
+	// Examples do not contain @-prefixed entity type names, but example parts
+	// can be annotated with entity types.
+	Intent_TrainingPhrase_EXAMPLE Intent_TrainingPhrase_Type = 1
+	// Templates are not annotated with entity types, but they can contain
+	// @-prefixed entity type names as substrings.
+	Intent_TrainingPhrase_TEMPLATE Intent_TrainingPhrase_Type = 2
+)
+
+var Intent_TrainingPhrase_Type_name = map[int32]string{
+	0: "TYPE_UNSPECIFIED",
+	1: "EXAMPLE",
+	2: "TEMPLATE",
+}
+var Intent_TrainingPhrase_Type_value = map[string]int32{
+	"TYPE_UNSPECIFIED": 0,
+	"EXAMPLE":          1,
+	"TEMPLATE":         2,
+}
+
+func (x Intent_TrainingPhrase_Type) String() string {
+	return proto.EnumName(Intent_TrainingPhrase_Type_name, int32(x))
+}
+func (Intent_TrainingPhrase_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 0, 0}
+}
+
+// Represents different platforms that a rich message can be intended for.
+type Intent_Message_Platform int32
+
+const (
+	// Not specified.
+	Intent_Message_PLATFORM_UNSPECIFIED Intent_Message_Platform = 0
+	// Facebook.
+	Intent_Message_FACEBOOK Intent_Message_Platform = 1
+	// Slack.
+	Intent_Message_SLACK Intent_Message_Platform = 2
+	// Telegram.
+	Intent_Message_TELEGRAM Intent_Message_Platform = 3
+	// Kik.
+	Intent_Message_KIK Intent_Message_Platform = 4
+	// Skype.
+	Intent_Message_SKYPE Intent_Message_Platform = 5
+	// Line.
+	Intent_Message_LINE Intent_Message_Platform = 6
+	// Viber.
+	Intent_Message_VIBER Intent_Message_Platform = 7
+	// Actions on Google.
+	// When using Actions on Google, you can choose one of the specific
+	// Intent.Message types that mention support for Actions on Google,
+	// or you can use the advanced Intent.Message.payload field.
+	// The payload field provides access to AoG features not available in the
+	// specific message types.
+	// If using the Intent.Message.payload field, it should have a structure
+	// similar to the JSON message shown here. For more information, see
+	// [Actions on Google Webhook
+	// Format](https://developers.google.com/actions/dialogflow/webhook)
+	// <pre>{
+	//   "expectUserResponse": true,
+	//   "isSsml": false,
+	//   "noInputPrompts": [],
+	//   "richResponse": {
+	//     "items": [
+	//       {
+	//         "simpleResponse": {
+	//           "displayText": "hi",
+	//           "textToSpeech": "hello"
+	//         }
+	//       }
+	//     ],
+	//     "suggestions": [
+	//       {
+	//         "title": "Say this"
+	//       },
+	//       {
+	//         "title": "or this"
+	//       }
+	//     ]
+	//   },
+	//   "systemIntent": {
+	//     "data": {
+	//       "@type": "type.googleapis.com/google.actions.v2.OptionValueSpec",
+	//       "listSelect": {
+	//         "items": [
+	//           {
+	//             "optionInfo": {
+	//               "key": "key1",
+	//               "synonyms": [
+	//                 "key one"
+	//               ]
+	//             },
+	//             "title": "must not be empty, but unique"
+	//           },
+	//           {
+	//             "optionInfo": {
+	//               "key": "key2",
+	//               "synonyms": [
+	//                 "key two"
+	//               ]
+	//             },
+	//             "title": "must not be empty, but unique"
+	//           }
+	//         ]
+	//       }
+	//     },
+	//     "intent": "actions.intent.OPTION"
+	//   }
+	// }</pre>
+	Intent_Message_ACTIONS_ON_GOOGLE Intent_Message_Platform = 8
+)
+
+var Intent_Message_Platform_name = map[int32]string{
+	0: "PLATFORM_UNSPECIFIED",
+	1: "FACEBOOK",
+	2: "SLACK",
+	3: "TELEGRAM",
+	4: "KIK",
+	5: "SKYPE",
+	6: "LINE",
+	7: "VIBER",
+	8: "ACTIONS_ON_GOOGLE",
+}
+var Intent_Message_Platform_value = map[string]int32{
+	"PLATFORM_UNSPECIFIED": 0,
+	"FACEBOOK":             1,
+	"SLACK":                2,
+	"TELEGRAM":             3,
+	"KIK":                  4,
+	"SKYPE":                5,
+	"LINE":                 6,
+	"VIBER":                7,
+	"ACTIONS_ON_GOOGLE":    8,
+}
+
+func (x Intent_Message_Platform) String() string {
+	return proto.EnumName(Intent_Message_Platform_name, int32(x))
+}
+func (Intent_Message_Platform) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 0}
+}
+
+// Represents an intent.
+// Intents convert a number of user expressions or patterns into an action. An
+// action is an extraction of a user command or sentence semantics.
+type Intent struct {
+	// Required for all methods except `create` (`create` populates the name
+	// automatically.
+	// The unique identifier of this intent.
+	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The name of this intent.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Required. Indicates whether webhooks are enabled for the intent.
+	WebhookState Intent_WebhookState `protobuf:"varint,6,opt,name=webhook_state,json=webhookState,proto3,enum=google.cloud.dialogflow.v2.Intent_WebhookState" json:"webhook_state,omitempty"`
+	// Optional. The priority of this intent. Higher numbers represent higher
+	// priorities. Zero or negative numbers mean that the intent is disabled.
+	Priority int32 `protobuf:"varint,3,opt,name=priority,proto3" json:"priority,omitempty"`
+	// Optional. Indicates whether this is a fallback intent.
+	IsFallback bool `protobuf:"varint,4,opt,name=is_fallback,json=isFallback,proto3" json:"is_fallback,omitempty"`
+	// Optional. Indicates whether Machine Learning is disabled for the intent.
+	// Note: If `ml_diabled` setting is set to true, then this intent is not
+	// taken into account during inference in `ML ONLY` match mode. Also,
+	// auto-markup in the UI is turned off.
+	MlDisabled bool `protobuf:"varint,19,opt,name=ml_disabled,json=mlDisabled,proto3" json:"ml_disabled,omitempty"`
+	// Optional. The list of context names required for this intent to be
+	// triggered.
+	// Format: `projects/<Project ID>/agent/sessions/-/contexts/<Context ID>`.
+	InputContextNames []string `protobuf:"bytes,7,rep,name=input_context_names,json=inputContextNames,proto3" json:"input_context_names,omitempty"`
+	// Optional. The collection of event names that trigger the intent.
+	// If the collection of input contexts is not empty, all of the contexts must
+	// be present in the active user session for an event to trigger this intent.
+	Events []string `protobuf:"bytes,8,rep,name=events,proto3" json:"events,omitempty"`
+	// Optional. The collection of examples/templates that the agent is
+	// trained on.
+	TrainingPhrases []*Intent_TrainingPhrase `protobuf:"bytes,9,rep,name=training_phrases,json=trainingPhrases,proto3" json:"training_phrases,omitempty"`
+	// Optional. The name of the action associated with the intent.
+	Action string `protobuf:"bytes,10,opt,name=action,proto3" json:"action,omitempty"`
+	// Optional. The collection of contexts that are activated when the intent
+	// is matched. Context messages in this collection should not set the
+	// parameters field. Setting the `lifespan_count` to 0 will reset the context
+	// when the intent is matched.
+	// Format: `projects/<Project ID>/agent/sessions/-/contexts/<Context ID>`.
+	OutputContexts []*Context `protobuf:"bytes,11,rep,name=output_contexts,json=outputContexts,proto3" json:"output_contexts,omitempty"`
+	// Optional. Indicates whether to delete all contexts in the current
+	// session when this intent is matched.
+	ResetContexts bool `protobuf:"varint,12,opt,name=reset_contexts,json=resetContexts,proto3" json:"reset_contexts,omitempty"`
+	// Optional. The collection of parameters associated with the intent.
+	Parameters []*Intent_Parameter `protobuf:"bytes,13,rep,name=parameters,proto3" json:"parameters,omitempty"`
+	// Optional. The collection of rich messages corresponding to the
+	// `Response` field in the Dialogflow console.
+	Messages []*Intent_Message `protobuf:"bytes,14,rep,name=messages,proto3" json:"messages,omitempty"`
+	// Optional. The list of platforms for which the first response will be
+	// taken from among the messages assigned to the DEFAULT_PLATFORM.
+	DefaultResponsePlatforms []Intent_Message_Platform `protobuf:"varint,15,rep,packed,name=default_response_platforms,json=defaultResponsePlatforms,proto3,enum=google.cloud.dialogflow.v2.Intent_Message_Platform" json:"default_response_platforms,omitempty"`
+	// The unique identifier of the root intent in the chain of followup intents.
+	// It identifies the correct followup intents chain for this intent.
+	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
+	RootFollowupIntentName string `protobuf:"bytes,16,opt,name=root_followup_intent_name,json=rootFollowupIntentName,proto3" json:"root_followup_intent_name,omitempty"`
+	// The unique identifier of the parent intent in the chain of followup
+	// intents.
+	// It identifies the parent followup intent.
+	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
+	ParentFollowupIntentName string `protobuf:"bytes,17,opt,name=parent_followup_intent_name,json=parentFollowupIntentName,proto3" json:"parent_followup_intent_name,omitempty"`
+	// Optional. Collection of information about all followup intents that have
+	// name of this intent as a root_name.
+	FollowupIntentInfo   []*Intent_FollowupIntentInfo `protobuf:"bytes,18,rep,name=followup_intent_info,json=followupIntentInfo,proto3" json:"followup_intent_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *Intent) Reset()         { *m = Intent{} }
+func (m *Intent) String() string { return proto.CompactTextString(m) }
+func (*Intent) ProtoMessage()    {}
+func (*Intent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0}
+}
+func (m *Intent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent.Unmarshal(m, b)
+}
+func (m *Intent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent.Marshal(b, m, deterministic)
+}
+func (dst *Intent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent.Merge(dst, src)
+}
+func (m *Intent) XXX_Size() int {
+	return xxx_messageInfo_Intent.Size(m)
+}
+func (m *Intent) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent proto.InternalMessageInfo
+
+func (m *Intent) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Intent) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *Intent) GetWebhookState() Intent_WebhookState {
+	if m != nil {
+		return m.WebhookState
+	}
+	return Intent_WEBHOOK_STATE_UNSPECIFIED
+}
+
+func (m *Intent) GetPriority() int32 {
+	if m != nil {
+		return m.Priority
+	}
+	return 0
+}
+
+func (m *Intent) GetIsFallback() bool {
+	if m != nil {
+		return m.IsFallback
+	}
+	return false
+}
+
+func (m *Intent) GetMlDisabled() bool {
+	if m != nil {
+		return m.MlDisabled
+	}
+	return false
+}
+
+func (m *Intent) GetInputContextNames() []string {
+	if m != nil {
+		return m.InputContextNames
+	}
+	return nil
+}
+
+func (m *Intent) GetEvents() []string {
+	if m != nil {
+		return m.Events
+	}
+	return nil
+}
+
+func (m *Intent) GetTrainingPhrases() []*Intent_TrainingPhrase {
+	if m != nil {
+		return m.TrainingPhrases
+	}
+	return nil
+}
+
+func (m *Intent) GetAction() string {
+	if m != nil {
+		return m.Action
+	}
+	return ""
+}
+
+func (m *Intent) GetOutputContexts() []*Context {
+	if m != nil {
+		return m.OutputContexts
+	}
+	return nil
+}
+
+func (m *Intent) GetResetContexts() bool {
+	if m != nil {
+		return m.ResetContexts
+	}
+	return false
+}
+
+func (m *Intent) GetParameters() []*Intent_Parameter {
+	if m != nil {
+		return m.Parameters
+	}
+	return nil
+}
+
+func (m *Intent) GetMessages() []*Intent_Message {
+	if m != nil {
+		return m.Messages
+	}
+	return nil
+}
+
+func (m *Intent) GetDefaultResponsePlatforms() []Intent_Message_Platform {
+	if m != nil {
+		return m.DefaultResponsePlatforms
+	}
+	return nil
+}
+
+func (m *Intent) GetRootFollowupIntentName() string {
+	if m != nil {
+		return m.RootFollowupIntentName
+	}
+	return ""
+}
+
+func (m *Intent) GetParentFollowupIntentName() string {
+	if m != nil {
+		return m.ParentFollowupIntentName
+	}
+	return ""
+}
+
+func (m *Intent) GetFollowupIntentInfo() []*Intent_FollowupIntentInfo {
+	if m != nil {
+		return m.FollowupIntentInfo
+	}
+	return nil
+}
+
+// Represents an example or template that the agent is trained on.
+type Intent_TrainingPhrase struct {
+	// Required. The unique identifier of this training phrase.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The type of the training phrase.
+	Type Intent_TrainingPhrase_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.dialogflow.v2.Intent_TrainingPhrase_Type" json:"type,omitempty"`
+	// Required. The collection of training phrase parts (can be annotated).
+	// Fields: `entity_type`, `alias` and `user_defined` should be populated
+	// only for the annotated parts of the training phrase.
+	Parts []*Intent_TrainingPhrase_Part `protobuf:"bytes,3,rep,name=parts,proto3" json:"parts,omitempty"`
+	// Optional. Indicates how many times this example or template was added to
+	// the intent. Each time a developer adds an existing sample by editing an
+	// intent or training, this counter is increased.
+	TimesAddedCount      int32    `protobuf:"varint,4,opt,name=times_added_count,json=timesAddedCount,proto3" json:"times_added_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_TrainingPhrase) Reset()         { *m = Intent_TrainingPhrase{} }
+func (m *Intent_TrainingPhrase) String() string { return proto.CompactTextString(m) }
+func (*Intent_TrainingPhrase) ProtoMessage()    {}
+func (*Intent_TrainingPhrase) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 0}
+}
+func (m *Intent_TrainingPhrase) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_TrainingPhrase.Unmarshal(m, b)
+}
+func (m *Intent_TrainingPhrase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_TrainingPhrase.Marshal(b, m, deterministic)
+}
+func (dst *Intent_TrainingPhrase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_TrainingPhrase.Merge(dst, src)
+}
+func (m *Intent_TrainingPhrase) XXX_Size() int {
+	return xxx_messageInfo_Intent_TrainingPhrase.Size(m)
+}
+func (m *Intent_TrainingPhrase) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_TrainingPhrase.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_TrainingPhrase proto.InternalMessageInfo
+
+func (m *Intent_TrainingPhrase) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Intent_TrainingPhrase) GetType() Intent_TrainingPhrase_Type {
+	if m != nil {
+		return m.Type
+	}
+	return Intent_TrainingPhrase_TYPE_UNSPECIFIED
+}
+
+func (m *Intent_TrainingPhrase) GetParts() []*Intent_TrainingPhrase_Part {
+	if m != nil {
+		return m.Parts
+	}
+	return nil
+}
+
+func (m *Intent_TrainingPhrase) GetTimesAddedCount() int32 {
+	if m != nil {
+		return m.TimesAddedCount
+	}
+	return 0
+}
+
+// Represents a part of a training phrase.
+type Intent_TrainingPhrase_Part struct {
+	// Required. The text corresponding to the example or template,
+	// if there are no annotations. For
+	// annotated examples, it is the text for one of the example's parts.
+	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
+	// Optional. The entity type name prefixed with `@`. This field is
+	// required for the annotated part of the text and applies only to
+	// examples.
+	EntityType string `protobuf:"bytes,2,opt,name=entity_type,json=entityType,proto3" json:"entity_type,omitempty"`
+	// Optional. The parameter name for the value extracted from the
+	// annotated part of the example.
+	Alias string `protobuf:"bytes,3,opt,name=alias,proto3" json:"alias,omitempty"`
+	// Optional. Indicates whether the text was manually annotated by the
+	// developer.
+	UserDefined          bool     `protobuf:"varint,4,opt,name=user_defined,json=userDefined,proto3" json:"user_defined,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_TrainingPhrase_Part) Reset()         { *m = Intent_TrainingPhrase_Part{} }
+func (m *Intent_TrainingPhrase_Part) String() string { return proto.CompactTextString(m) }
+func (*Intent_TrainingPhrase_Part) ProtoMessage()    {}
+func (*Intent_TrainingPhrase_Part) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 0, 0}
+}
+func (m *Intent_TrainingPhrase_Part) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_TrainingPhrase_Part.Unmarshal(m, b)
+}
+func (m *Intent_TrainingPhrase_Part) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_TrainingPhrase_Part.Marshal(b, m, deterministic)
+}
+func (dst *Intent_TrainingPhrase_Part) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_TrainingPhrase_Part.Merge(dst, src)
+}
+func (m *Intent_TrainingPhrase_Part) XXX_Size() int {
+	return xxx_messageInfo_Intent_TrainingPhrase_Part.Size(m)
+}
+func (m *Intent_TrainingPhrase_Part) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_TrainingPhrase_Part.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_TrainingPhrase_Part proto.InternalMessageInfo
+
+func (m *Intent_TrainingPhrase_Part) GetText() string {
+	if m != nil {
+		return m.Text
+	}
+	return ""
+}
+
+func (m *Intent_TrainingPhrase_Part) GetEntityType() string {
+	if m != nil {
+		return m.EntityType
+	}
+	return ""
+}
+
+func (m *Intent_TrainingPhrase_Part) GetAlias() string {
+	if m != nil {
+		return m.Alias
+	}
+	return ""
+}
+
+func (m *Intent_TrainingPhrase_Part) GetUserDefined() bool {
+	if m != nil {
+		return m.UserDefined
+	}
+	return false
+}
+
+// Represents intent parameters.
+type Intent_Parameter struct {
+	// The unique identifier of this parameter.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The name of the parameter.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Optional. The definition of the parameter value. It can be:
+	// - a constant string,
+	// - a parameter value defined as `$parameter_name`,
+	// - an original parameter value defined as `$parameter_name.original`,
+	// - a parameter value from some context defined as
+	//   `#context_name.parameter_name`.
+	Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
+	// Optional. The default value to use when the `value` yields an empty
+	// result.
+	// Default values can be extracted from contexts by using the following
+	// syntax: `#context_name.parameter_name`.
+	DefaultValue string `protobuf:"bytes,4,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
+	// Optional. The name of the entity type, prefixed with `@`, that
+	// describes values of the parameter. If the parameter is
+	// required, this must be provided.
+	EntityTypeDisplayName string `protobuf:"bytes,5,opt,name=entity_type_display_name,json=entityTypeDisplayName,proto3" json:"entity_type_display_name,omitempty"`
+	// Optional. Indicates whether the parameter is required. That is,
+	// whether the intent cannot be completed without collecting the parameter
+	// value.
+	Mandatory bool `protobuf:"varint,6,opt,name=mandatory,proto3" json:"mandatory,omitempty"`
+	// Optional. The collection of prompts that the agent can present to the
+	// user in order to collect value for the parameter.
+	Prompts []string `protobuf:"bytes,7,rep,name=prompts,proto3" json:"prompts,omitempty"`
+	// Optional. Indicates whether the parameter represents a list of values.
+	IsList               bool     `protobuf:"varint,8,opt,name=is_list,json=isList,proto3" json:"is_list,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Parameter) Reset()         { *m = Intent_Parameter{} }
+func (m *Intent_Parameter) String() string { return proto.CompactTextString(m) }
+func (*Intent_Parameter) ProtoMessage()    {}
+func (*Intent_Parameter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 1}
+}
+func (m *Intent_Parameter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Parameter.Unmarshal(m, b)
+}
+func (m *Intent_Parameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Parameter.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Parameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Parameter.Merge(dst, src)
+}
+func (m *Intent_Parameter) XXX_Size() int {
+	return xxx_messageInfo_Intent_Parameter.Size(m)
+}
+func (m *Intent_Parameter) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Parameter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Parameter proto.InternalMessageInfo
+
+func (m *Intent_Parameter) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Intent_Parameter) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *Intent_Parameter) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+func (m *Intent_Parameter) GetDefaultValue() string {
+	if m != nil {
+		return m.DefaultValue
+	}
+	return ""
+}
+
+func (m *Intent_Parameter) GetEntityTypeDisplayName() string {
+	if m != nil {
+		return m.EntityTypeDisplayName
+	}
+	return ""
+}
+
+func (m *Intent_Parameter) GetMandatory() bool {
+	if m != nil {
+		return m.Mandatory
+	}
+	return false
+}
+
+func (m *Intent_Parameter) GetPrompts() []string {
+	if m != nil {
+		return m.Prompts
+	}
+	return nil
+}
+
+func (m *Intent_Parameter) GetIsList() bool {
+	if m != nil {
+		return m.IsList
+	}
+	return false
+}
+
+// Corresponds to the `Response` field in the Dialogflow console.
+type Intent_Message struct {
+	// Required. The rich response message.
+	//
+	// Types that are valid to be assigned to Message:
+	//	*Intent_Message_Text_
+	//	*Intent_Message_Image_
+	//	*Intent_Message_QuickReplies_
+	//	*Intent_Message_Card_
+	//	*Intent_Message_Payload
+	//	*Intent_Message_SimpleResponses_
+	//	*Intent_Message_BasicCard_
+	//	*Intent_Message_Suggestions_
+	//	*Intent_Message_LinkOutSuggestion_
+	//	*Intent_Message_ListSelect_
+	//	*Intent_Message_CarouselSelect_
+	Message isIntent_Message_Message `protobuf_oneof:"message"`
+	// Optional. The platform that this message is intended for.
+	Platform             Intent_Message_Platform `protobuf:"varint,6,opt,name=platform,proto3,enum=google.cloud.dialogflow.v2.Intent_Message_Platform" json:"platform,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *Intent_Message) Reset()         { *m = Intent_Message{} }
+func (m *Intent_Message) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message) ProtoMessage()    {}
+func (*Intent_Message) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2}
+}
+func (m *Intent_Message) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message.Unmarshal(m, b)
+}
+func (m *Intent_Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message.Merge(dst, src)
+}
+func (m *Intent_Message) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message.Size(m)
+}
+func (m *Intent_Message) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message proto.InternalMessageInfo
+
+type isIntent_Message_Message interface {
+	isIntent_Message_Message()
+}
+
+type Intent_Message_Text_ struct {
+	Text *Intent_Message_Text `protobuf:"bytes,1,opt,name=text,proto3,oneof"`
+}
+
+type Intent_Message_Image_ struct {
+	Image *Intent_Message_Image `protobuf:"bytes,2,opt,name=image,proto3,oneof"`
+}
+
+type Intent_Message_QuickReplies_ struct {
+	QuickReplies *Intent_Message_QuickReplies `protobuf:"bytes,3,opt,name=quick_replies,json=quickReplies,proto3,oneof"`
+}
+
+type Intent_Message_Card_ struct {
+	Card *Intent_Message_Card `protobuf:"bytes,4,opt,name=card,proto3,oneof"`
+}
+
+type Intent_Message_Payload struct {
+	Payload *_struct.Struct `protobuf:"bytes,5,opt,name=payload,proto3,oneof"`
+}
+
+type Intent_Message_SimpleResponses_ struct {
+	SimpleResponses *Intent_Message_SimpleResponses `protobuf:"bytes,7,opt,name=simple_responses,json=simpleResponses,proto3,oneof"`
+}
+
+type Intent_Message_BasicCard_ struct {
+	BasicCard *Intent_Message_BasicCard `protobuf:"bytes,8,opt,name=basic_card,json=basicCard,proto3,oneof"`
+}
+
+type Intent_Message_Suggestions_ struct {
+	Suggestions *Intent_Message_Suggestions `protobuf:"bytes,9,opt,name=suggestions,proto3,oneof"`
+}
+
+type Intent_Message_LinkOutSuggestion_ struct {
+	LinkOutSuggestion *Intent_Message_LinkOutSuggestion `protobuf:"bytes,10,opt,name=link_out_suggestion,json=linkOutSuggestion,proto3,oneof"`
+}
+
+type Intent_Message_ListSelect_ struct {
+	ListSelect *Intent_Message_ListSelect `protobuf:"bytes,11,opt,name=list_select,json=listSelect,proto3,oneof"`
+}
+
+type Intent_Message_CarouselSelect_ struct {
+	CarouselSelect *Intent_Message_CarouselSelect `protobuf:"bytes,12,opt,name=carousel_select,json=carouselSelect,proto3,oneof"`
+}
+
+func (*Intent_Message_Text_) isIntent_Message_Message() {}
+
+func (*Intent_Message_Image_) isIntent_Message_Message() {}
+
+func (*Intent_Message_QuickReplies_) isIntent_Message_Message() {}
+
+func (*Intent_Message_Card_) isIntent_Message_Message() {}
+
+func (*Intent_Message_Payload) isIntent_Message_Message() {}
+
+func (*Intent_Message_SimpleResponses_) isIntent_Message_Message() {}
+
+func (*Intent_Message_BasicCard_) isIntent_Message_Message() {}
+
+func (*Intent_Message_Suggestions_) isIntent_Message_Message() {}
+
+func (*Intent_Message_LinkOutSuggestion_) isIntent_Message_Message() {}
+
+func (*Intent_Message_ListSelect_) isIntent_Message_Message() {}
+
+func (*Intent_Message_CarouselSelect_) isIntent_Message_Message() {}
+
+func (m *Intent_Message) GetMessage() isIntent_Message_Message {
+	if m != nil {
+		return m.Message
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetText() *Intent_Message_Text {
+	if x, ok := m.GetMessage().(*Intent_Message_Text_); ok {
+		return x.Text
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetImage() *Intent_Message_Image {
+	if x, ok := m.GetMessage().(*Intent_Message_Image_); ok {
+		return x.Image
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetQuickReplies() *Intent_Message_QuickReplies {
+	if x, ok := m.GetMessage().(*Intent_Message_QuickReplies_); ok {
+		return x.QuickReplies
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetCard() *Intent_Message_Card {
+	if x, ok := m.GetMessage().(*Intent_Message_Card_); ok {
+		return x.Card
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetPayload() *_struct.Struct {
+	if x, ok := m.GetMessage().(*Intent_Message_Payload); ok {
+		return x.Payload
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetSimpleResponses() *Intent_Message_SimpleResponses {
+	if x, ok := m.GetMessage().(*Intent_Message_SimpleResponses_); ok {
+		return x.SimpleResponses
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetBasicCard() *Intent_Message_BasicCard {
+	if x, ok := m.GetMessage().(*Intent_Message_BasicCard_); ok {
+		return x.BasicCard
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetSuggestions() *Intent_Message_Suggestions {
+	if x, ok := m.GetMessage().(*Intent_Message_Suggestions_); ok {
+		return x.Suggestions
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetLinkOutSuggestion() *Intent_Message_LinkOutSuggestion {
+	if x, ok := m.GetMessage().(*Intent_Message_LinkOutSuggestion_); ok {
+		return x.LinkOutSuggestion
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetListSelect() *Intent_Message_ListSelect {
+	if x, ok := m.GetMessage().(*Intent_Message_ListSelect_); ok {
+		return x.ListSelect
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetCarouselSelect() *Intent_Message_CarouselSelect {
+	if x, ok := m.GetMessage().(*Intent_Message_CarouselSelect_); ok {
+		return x.CarouselSelect
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetPlatform() Intent_Message_Platform {
+	if m != nil {
+		return m.Platform
+	}
+	return Intent_Message_PLATFORM_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Intent_Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Intent_Message_OneofMarshaler, _Intent_Message_OneofUnmarshaler, _Intent_Message_OneofSizer, []interface{}{
+		(*Intent_Message_Text_)(nil),
+		(*Intent_Message_Image_)(nil),
+		(*Intent_Message_QuickReplies_)(nil),
+		(*Intent_Message_Card_)(nil),
+		(*Intent_Message_Payload)(nil),
+		(*Intent_Message_SimpleResponses_)(nil),
+		(*Intent_Message_BasicCard_)(nil),
+		(*Intent_Message_Suggestions_)(nil),
+		(*Intent_Message_LinkOutSuggestion_)(nil),
+		(*Intent_Message_ListSelect_)(nil),
+		(*Intent_Message_CarouselSelect_)(nil),
+	}
+}
+
+func _Intent_Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Intent_Message)
+	// message
+	switch x := m.Message.(type) {
+	case *Intent_Message_Text_:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Text); err != nil {
+			return err
+		}
+	case *Intent_Message_Image_:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Image); err != nil {
+			return err
+		}
+	case *Intent_Message_QuickReplies_:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.QuickReplies); err != nil {
+			return err
+		}
+	case *Intent_Message_Card_:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Card); err != nil {
+			return err
+		}
+	case *Intent_Message_Payload:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Payload); err != nil {
+			return err
+		}
+	case *Intent_Message_SimpleResponses_:
+		b.EncodeVarint(7<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.SimpleResponses); err != nil {
+			return err
+		}
+	case *Intent_Message_BasicCard_:
+		b.EncodeVarint(8<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.BasicCard); err != nil {
+			return err
+		}
+	case *Intent_Message_Suggestions_:
+		b.EncodeVarint(9<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Suggestions); err != nil {
+			return err
+		}
+	case *Intent_Message_LinkOutSuggestion_:
+		b.EncodeVarint(10<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.LinkOutSuggestion); err != nil {
+			return err
+		}
+	case *Intent_Message_ListSelect_:
+		b.EncodeVarint(11<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ListSelect); err != nil {
+			return err
+		}
+	case *Intent_Message_CarouselSelect_:
+		b.EncodeVarint(12<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CarouselSelect); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Intent_Message.Message has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Intent_Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Intent_Message)
+	switch tag {
+	case 1: // message.text
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_Text)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_Text_{msg}
+		return true, err
+	case 2: // message.image
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_Image)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_Image_{msg}
+		return true, err
+	case 3: // message.quick_replies
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_QuickReplies)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_QuickReplies_{msg}
+		return true, err
+	case 4: // message.card
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_Card)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_Card_{msg}
+		return true, err
+	case 5: // message.payload
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(_struct.Struct)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_Payload{msg}
+		return true, err
+	case 7: // message.simple_responses
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_SimpleResponses)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_SimpleResponses_{msg}
+		return true, err
+	case 8: // message.basic_card
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_BasicCard)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_BasicCard_{msg}
+		return true, err
+	case 9: // message.suggestions
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_Suggestions)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_Suggestions_{msg}
+		return true, err
+	case 10: // message.link_out_suggestion
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_LinkOutSuggestion)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_LinkOutSuggestion_{msg}
+		return true, err
+	case 11: // message.list_select
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_ListSelect)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_ListSelect_{msg}
+		return true, err
+	case 12: // message.carousel_select
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_CarouselSelect)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_CarouselSelect_{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Intent_Message_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Intent_Message)
+	// message
+	switch x := m.Message.(type) {
+	case *Intent_Message_Text_:
+		s := proto.Size(x.Text)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_Image_:
+		s := proto.Size(x.Image)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_QuickReplies_:
+		s := proto.Size(x.QuickReplies)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_Card_:
+		s := proto.Size(x.Card)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_Payload:
+		s := proto.Size(x.Payload)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_SimpleResponses_:
+		s := proto.Size(x.SimpleResponses)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_BasicCard_:
+		s := proto.Size(x.BasicCard)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_Suggestions_:
+		s := proto.Size(x.Suggestions)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_LinkOutSuggestion_:
+		s := proto.Size(x.LinkOutSuggestion)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_ListSelect_:
+		s := proto.Size(x.ListSelect)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_CarouselSelect_:
+		s := proto.Size(x.CarouselSelect)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The text response message.
+type Intent_Message_Text struct {
+	// Optional. The collection of the agent's responses.
+	Text                 []string `protobuf:"bytes,1,rep,name=text,proto3" json:"text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_Text) Reset()         { *m = Intent_Message_Text{} }
+func (m *Intent_Message_Text) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Text) ProtoMessage()    {}
+func (*Intent_Message_Text) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 0}
+}
+func (m *Intent_Message_Text) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Text.Unmarshal(m, b)
+}
+func (m *Intent_Message_Text) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Text.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Text) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Text.Merge(dst, src)
+}
+func (m *Intent_Message_Text) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Text.Size(m)
+}
+func (m *Intent_Message_Text) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Text.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Text proto.InternalMessageInfo
+
+func (m *Intent_Message_Text) GetText() []string {
+	if m != nil {
+		return m.Text
+	}
+	return nil
+}
+
+// The image response message.
+type Intent_Message_Image struct {
+	// Optional. The public URI to an image file.
+	ImageUri string `protobuf:"bytes,1,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	// Optional. A text description of the image to be used for accessibility,
+	// e.g., screen readers.
+	AccessibilityText    string   `protobuf:"bytes,2,opt,name=accessibility_text,json=accessibilityText,proto3" json:"accessibility_text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_Image) Reset()         { *m = Intent_Message_Image{} }
+func (m *Intent_Message_Image) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Image) ProtoMessage()    {}
+func (*Intent_Message_Image) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 1}
+}
+func (m *Intent_Message_Image) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Image.Unmarshal(m, b)
+}
+func (m *Intent_Message_Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Image.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Image.Merge(dst, src)
+}
+func (m *Intent_Message_Image) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Image.Size(m)
+}
+func (m *Intent_Message_Image) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Image.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Image proto.InternalMessageInfo
+
+func (m *Intent_Message_Image) GetImageUri() string {
+	if m != nil {
+		return m.ImageUri
+	}
+	return ""
+}
+
+func (m *Intent_Message_Image) GetAccessibilityText() string {
+	if m != nil {
+		return m.AccessibilityText
+	}
+	return ""
+}
+
+// The quick replies response message.
+type Intent_Message_QuickReplies struct {
+	// Optional. The title of the collection of quick replies.
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
+	// Optional. The collection of quick replies.
+	QuickReplies         []string `protobuf:"bytes,2,rep,name=quick_replies,json=quickReplies,proto3" json:"quick_replies,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_QuickReplies) Reset()         { *m = Intent_Message_QuickReplies{} }
+func (m *Intent_Message_QuickReplies) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_QuickReplies) ProtoMessage()    {}
+func (*Intent_Message_QuickReplies) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 2}
+}
+func (m *Intent_Message_QuickReplies) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_QuickReplies.Unmarshal(m, b)
+}
+func (m *Intent_Message_QuickReplies) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_QuickReplies.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_QuickReplies) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_QuickReplies.Merge(dst, src)
+}
+func (m *Intent_Message_QuickReplies) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_QuickReplies.Size(m)
+}
+func (m *Intent_Message_QuickReplies) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_QuickReplies.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_QuickReplies proto.InternalMessageInfo
+
+func (m *Intent_Message_QuickReplies) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *Intent_Message_QuickReplies) GetQuickReplies() []string {
+	if m != nil {
+		return m.QuickReplies
+	}
+	return nil
+}
+
+// The card response message.
+type Intent_Message_Card struct {
+	// Optional. The title of the card.
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
+	// Optional. The subtitle of the card.
+	Subtitle string `protobuf:"bytes,2,opt,name=subtitle,proto3" json:"subtitle,omitempty"`
+	// Optional. The public URI to an image file for the card.
+	ImageUri string `protobuf:"bytes,3,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	// Optional. The collection of card buttons.
+	Buttons              []*Intent_Message_Card_Button `protobuf:"bytes,4,rep,name=buttons,proto3" json:"buttons,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *Intent_Message_Card) Reset()         { *m = Intent_Message_Card{} }
+func (m *Intent_Message_Card) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Card) ProtoMessage()    {}
+func (*Intent_Message_Card) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 3}
+}
+func (m *Intent_Message_Card) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Card.Unmarshal(m, b)
+}
+func (m *Intent_Message_Card) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Card.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Card) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Card.Merge(dst, src)
+}
+func (m *Intent_Message_Card) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Card.Size(m)
+}
+func (m *Intent_Message_Card) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Card.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Card proto.InternalMessageInfo
+
+func (m *Intent_Message_Card) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *Intent_Message_Card) GetSubtitle() string {
+	if m != nil {
+		return m.Subtitle
+	}
+	return ""
+}
+
+func (m *Intent_Message_Card) GetImageUri() string {
+	if m != nil {
+		return m.ImageUri
+	}
+	return ""
+}
+
+func (m *Intent_Message_Card) GetButtons() []*Intent_Message_Card_Button {
+	if m != nil {
+		return m.Buttons
+	}
+	return nil
+}
+
+// Optional. Contains information about a button.
+type Intent_Message_Card_Button struct {
+	// Optional. The text to show on the button.
+	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
+	// Optional. The text to send back to the Dialogflow API or a URI to
+	// open.
+	Postback             string   `protobuf:"bytes,2,opt,name=postback,proto3" json:"postback,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_Card_Button) Reset()         { *m = Intent_Message_Card_Button{} }
+func (m *Intent_Message_Card_Button) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Card_Button) ProtoMessage()    {}
+func (*Intent_Message_Card_Button) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 3, 0}
+}
+func (m *Intent_Message_Card_Button) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Card_Button.Unmarshal(m, b)
+}
+func (m *Intent_Message_Card_Button) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Card_Button.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Card_Button) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Card_Button.Merge(dst, src)
+}
+func (m *Intent_Message_Card_Button) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Card_Button.Size(m)
+}
+func (m *Intent_Message_Card_Button) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Card_Button.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Card_Button proto.InternalMessageInfo
+
+func (m *Intent_Message_Card_Button) GetText() string {
+	if m != nil {
+		return m.Text
+	}
+	return ""
+}
+
+func (m *Intent_Message_Card_Button) GetPostback() string {
+	if m != nil {
+		return m.Postback
+	}
+	return ""
+}
+
+// The simple response message containing speech or text.
+type Intent_Message_SimpleResponse struct {
+	// One of text_to_speech or ssml must be provided. The plain text of the
+	// speech output. Mutually exclusive with ssml.
+	TextToSpeech string `protobuf:"bytes,1,opt,name=text_to_speech,json=textToSpeech,proto3" json:"text_to_speech,omitempty"`
+	// One of text_to_speech or ssml must be provided. Structured spoken
+	// response to the user in the SSML format. Mutually exclusive with
+	// text_to_speech.
+	Ssml string `protobuf:"bytes,2,opt,name=ssml,proto3" json:"ssml,omitempty"`
+	// Optional. The text to display.
+	DisplayText          string   `protobuf:"bytes,3,opt,name=display_text,json=displayText,proto3" json:"display_text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_SimpleResponse) Reset()         { *m = Intent_Message_SimpleResponse{} }
+func (m *Intent_Message_SimpleResponse) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_SimpleResponse) ProtoMessage()    {}
+func (*Intent_Message_SimpleResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 4}
+}
+func (m *Intent_Message_SimpleResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_SimpleResponse.Unmarshal(m, b)
+}
+func (m *Intent_Message_SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_SimpleResponse.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SimpleResponse.Merge(dst, src)
+}
+func (m *Intent_Message_SimpleResponse) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_SimpleResponse.Size(m)
+}
+func (m *Intent_Message_SimpleResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_SimpleResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_SimpleResponse proto.InternalMessageInfo
+
+func (m *Intent_Message_SimpleResponse) GetTextToSpeech() string {
+	if m != nil {
+		return m.TextToSpeech
+	}
+	return ""
+}
+
+func (m *Intent_Message_SimpleResponse) GetSsml() string {
+	if m != nil {
+		return m.Ssml
+	}
+	return ""
+}
+
+func (m *Intent_Message_SimpleResponse) GetDisplayText() string {
+	if m != nil {
+		return m.DisplayText
+	}
+	return ""
+}
+
+// The collection of simple response candidates.
+// This message in `QueryResult.fulfillment_messages` and
+// `WebhookResponse.fulfillment_messages` should contain only one
+// `SimpleResponse`.
+type Intent_Message_SimpleResponses struct {
+	// Required. The list of simple responses.
+	SimpleResponses      []*Intent_Message_SimpleResponse `protobuf:"bytes,1,rep,name=simple_responses,json=simpleResponses,proto3" json:"simple_responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
+	XXX_unrecognized     []byte                           `json:"-"`
+	XXX_sizecache        int32                            `json:"-"`
+}
+
+func (m *Intent_Message_SimpleResponses) Reset()         { *m = Intent_Message_SimpleResponses{} }
+func (m *Intent_Message_SimpleResponses) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_SimpleResponses) ProtoMessage()    {}
+func (*Intent_Message_SimpleResponses) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 5}
+}
+func (m *Intent_Message_SimpleResponses) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_SimpleResponses.Unmarshal(m, b)
+}
+func (m *Intent_Message_SimpleResponses) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_SimpleResponses.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_SimpleResponses) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SimpleResponses.Merge(dst, src)
+}
+func (m *Intent_Message_SimpleResponses) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_SimpleResponses.Size(m)
+}
+func (m *Intent_Message_SimpleResponses) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_SimpleResponses.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_SimpleResponses proto.InternalMessageInfo
+
+func (m *Intent_Message_SimpleResponses) GetSimpleResponses() []*Intent_Message_SimpleResponse {
+	if m != nil {
+		return m.SimpleResponses
+	}
+	return nil
+}
+
+// The basic card message. Useful for displaying information.
+type Intent_Message_BasicCard struct {
+	// Optional. The title of the card.
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
+	// Optional. The subtitle of the card.
+	Subtitle string `protobuf:"bytes,2,opt,name=subtitle,proto3" json:"subtitle,omitempty"`
+	// Required, unless image is present. The body text of the card.
+	FormattedText string `protobuf:"bytes,3,opt,name=formatted_text,json=formattedText,proto3" json:"formatted_text,omitempty"`
+	// Optional. The image for the card.
+	Image *Intent_Message_Image `protobuf:"bytes,4,opt,name=image,proto3" json:"image,omitempty"`
+	// Optional. The collection of card buttons.
+	Buttons              []*Intent_Message_BasicCard_Button `protobuf:"bytes,5,rep,name=buttons,proto3" json:"buttons,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
+}
+
+func (m *Intent_Message_BasicCard) Reset()         { *m = Intent_Message_BasicCard{} }
+func (m *Intent_Message_BasicCard) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_BasicCard) ProtoMessage()    {}
+func (*Intent_Message_BasicCard) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 6}
+}
+func (m *Intent_Message_BasicCard) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_BasicCard.Unmarshal(m, b)
+}
+func (m *Intent_Message_BasicCard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_BasicCard.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_BasicCard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard.Merge(dst, src)
+}
+func (m *Intent_Message_BasicCard) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_BasicCard.Size(m)
+}
+func (m *Intent_Message_BasicCard) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_BasicCard.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_BasicCard proto.InternalMessageInfo
+
+func (m *Intent_Message_BasicCard) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *Intent_Message_BasicCard) GetSubtitle() string {
+	if m != nil {
+		return m.Subtitle
+	}
+	return ""
+}
+
+func (m *Intent_Message_BasicCard) GetFormattedText() string {
+	if m != nil {
+		return m.FormattedText
+	}
+	return ""
+}
+
+func (m *Intent_Message_BasicCard) GetImage() *Intent_Message_Image {
+	if m != nil {
+		return m.Image
+	}
+	return nil
+}
+
+func (m *Intent_Message_BasicCard) GetButtons() []*Intent_Message_BasicCard_Button {
+	if m != nil {
+		return m.Buttons
+	}
+	return nil
+}
+
+// The button object that appears at the bottom of a card.
+type Intent_Message_BasicCard_Button struct {
+	// Required. The title of the button.
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
+	// Required. Action to take when a user taps on the button.
+	OpenUriAction        *Intent_Message_BasicCard_Button_OpenUriAction `protobuf:"bytes,2,opt,name=open_uri_action,json=openUriAction,proto3" json:"open_uri_action,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                       `json:"-"`
+	XXX_unrecognized     []byte                                         `json:"-"`
+	XXX_sizecache        int32                                          `json:"-"`
+}
+
+func (m *Intent_Message_BasicCard_Button) Reset()         { *m = Intent_Message_BasicCard_Button{} }
+func (m *Intent_Message_BasicCard_Button) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_BasicCard_Button) ProtoMessage()    {}
+func (*Intent_Message_BasicCard_Button) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 6, 0}
+}
+func (m *Intent_Message_BasicCard_Button) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button.Unmarshal(m, b)
+}
+func (m *Intent_Message_BasicCard_Button) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_BasicCard_Button) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard_Button.Merge(dst, src)
+}
+func (m *Intent_Message_BasicCard_Button) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button.Size(m)
+}
+func (m *Intent_Message_BasicCard_Button) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_BasicCard_Button.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_BasicCard_Button proto.InternalMessageInfo
+
+func (m *Intent_Message_BasicCard_Button) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *Intent_Message_BasicCard_Button) GetOpenUriAction() *Intent_Message_BasicCard_Button_OpenUriAction {
+	if m != nil {
+		return m.OpenUriAction
+	}
+	return nil
+}
+
+// Opens the given URI.
+type Intent_Message_BasicCard_Button_OpenUriAction struct {
+	// Required. The HTTP or HTTPS scheme URI.
+	Uri                  string   `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) Reset() {
+	*m = Intent_Message_BasicCard_Button_OpenUriAction{}
+}
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) String() string {
+	return proto.CompactTextString(m)
+}
+func (*Intent_Message_BasicCard_Button_OpenUriAction) ProtoMessage() {}
+func (*Intent_Message_BasicCard_Button_OpenUriAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 6, 0, 0}
+}
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Unmarshal(m, b)
+}
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Merge(dst, src)
+}
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Size(m)
+}
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction proto.InternalMessageInfo
+
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+// The suggestion chip message that the user can tap to quickly post a reply
+// to the conversation.
+type Intent_Message_Suggestion struct {
+	// Required. The text shown the in the suggestion chip.
+	Title                string   `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_Suggestion) Reset()         { *m = Intent_Message_Suggestion{} }
+func (m *Intent_Message_Suggestion) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Suggestion) ProtoMessage()    {}
+func (*Intent_Message_Suggestion) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 7}
+}
+func (m *Intent_Message_Suggestion) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Suggestion.Unmarshal(m, b)
+}
+func (m *Intent_Message_Suggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Suggestion.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Suggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Suggestion.Merge(dst, src)
+}
+func (m *Intent_Message_Suggestion) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Suggestion.Size(m)
+}
+func (m *Intent_Message_Suggestion) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Suggestion.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Suggestion proto.InternalMessageInfo
+
+func (m *Intent_Message_Suggestion) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+// The collection of suggestions.
+type Intent_Message_Suggestions struct {
+	// Required. The list of suggested replies.
+	Suggestions          []*Intent_Message_Suggestion `protobuf:"bytes,1,rep,name=suggestions,proto3" json:"suggestions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *Intent_Message_Suggestions) Reset()         { *m = Intent_Message_Suggestions{} }
+func (m *Intent_Message_Suggestions) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Suggestions) ProtoMessage()    {}
+func (*Intent_Message_Suggestions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 8}
+}
+func (m *Intent_Message_Suggestions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Suggestions.Unmarshal(m, b)
+}
+func (m *Intent_Message_Suggestions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Suggestions.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Suggestions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Suggestions.Merge(dst, src)
+}
+func (m *Intent_Message_Suggestions) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Suggestions.Size(m)
+}
+func (m *Intent_Message_Suggestions) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Suggestions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Suggestions proto.InternalMessageInfo
+
+func (m *Intent_Message_Suggestions) GetSuggestions() []*Intent_Message_Suggestion {
+	if m != nil {
+		return m.Suggestions
+	}
+	return nil
+}
+
+// The suggestion chip message that allows the user to jump out to the app
+// or website associated with this agent.
+type Intent_Message_LinkOutSuggestion struct {
+	// Required. The name of the app or site this chip is linking to.
+	DestinationName string `protobuf:"bytes,1,opt,name=destination_name,json=destinationName,proto3" json:"destination_name,omitempty"`
+	// Required. The URI of the app or site to open when the user taps the
+	// suggestion chip.
+	Uri                  string   `protobuf:"bytes,2,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_LinkOutSuggestion) Reset()         { *m = Intent_Message_LinkOutSuggestion{} }
+func (m *Intent_Message_LinkOutSuggestion) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_LinkOutSuggestion) ProtoMessage()    {}
+func (*Intent_Message_LinkOutSuggestion) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 9}
+}
+func (m *Intent_Message_LinkOutSuggestion) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Unmarshal(m, b)
+}
+func (m *Intent_Message_LinkOutSuggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_LinkOutSuggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_LinkOutSuggestion.Merge(dst, src)
+}
+func (m *Intent_Message_LinkOutSuggestion) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Size(m)
+}
+func (m *Intent_Message_LinkOutSuggestion) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_LinkOutSuggestion.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_LinkOutSuggestion proto.InternalMessageInfo
+
+func (m *Intent_Message_LinkOutSuggestion) GetDestinationName() string {
+	if m != nil {
+		return m.DestinationName
+	}
+	return ""
+}
+
+func (m *Intent_Message_LinkOutSuggestion) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+// The card for presenting a list of options to select from.
+type Intent_Message_ListSelect struct {
+	// Optional. The overall title of the list.
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
+	// Required. List items.
+	Items                []*Intent_Message_ListSelect_Item `protobuf:"bytes,2,rep,name=items,proto3" json:"items,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *Intent_Message_ListSelect) Reset()         { *m = Intent_Message_ListSelect{} }
+func (m *Intent_Message_ListSelect) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_ListSelect) ProtoMessage()    {}
+func (*Intent_Message_ListSelect) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 10}
+}
+func (m *Intent_Message_ListSelect) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_ListSelect.Unmarshal(m, b)
+}
+func (m *Intent_Message_ListSelect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_ListSelect.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_ListSelect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_ListSelect.Merge(dst, src)
+}
+func (m *Intent_Message_ListSelect) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_ListSelect.Size(m)
+}
+func (m *Intent_Message_ListSelect) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_ListSelect.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_ListSelect proto.InternalMessageInfo
+
+func (m *Intent_Message_ListSelect) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *Intent_Message_ListSelect) GetItems() []*Intent_Message_ListSelect_Item {
+	if m != nil {
+		return m.Items
+	}
+	return nil
+}
+
+// An item in the list.
+type Intent_Message_ListSelect_Item struct {
+	// Required. Additional information about this option.
+	Info *Intent_Message_SelectItemInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"`
+	// Required. The title of the list item.
+	Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
+	// Optional. The main text describing the item.
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// Optional. The image to display.
+	Image                *Intent_Message_Image `protobuf:"bytes,4,opt,name=image,proto3" json:"image,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *Intent_Message_ListSelect_Item) Reset()         { *m = Intent_Message_ListSelect_Item{} }
+func (m *Intent_Message_ListSelect_Item) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_ListSelect_Item) ProtoMessage()    {}
+func (*Intent_Message_ListSelect_Item) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 10, 0}
+}
+func (m *Intent_Message_ListSelect_Item) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_ListSelect_Item.Unmarshal(m, b)
+}
+func (m *Intent_Message_ListSelect_Item) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_ListSelect_Item.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_ListSelect_Item) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_ListSelect_Item.Merge(dst, src)
+}
+func (m *Intent_Message_ListSelect_Item) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_ListSelect_Item.Size(m)
+}
+func (m *Intent_Message_ListSelect_Item) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_ListSelect_Item.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_ListSelect_Item proto.InternalMessageInfo
+
+func (m *Intent_Message_ListSelect_Item) GetInfo() *Intent_Message_SelectItemInfo {
+	if m != nil {
+		return m.Info
+	}
+	return nil
+}
+
+func (m *Intent_Message_ListSelect_Item) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *Intent_Message_ListSelect_Item) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *Intent_Message_ListSelect_Item) GetImage() *Intent_Message_Image {
+	if m != nil {
+		return m.Image
+	}
+	return nil
+}
+
+// The card for presenting a carousel of options to select from.
+type Intent_Message_CarouselSelect struct {
+	// Required. Carousel items.
+	Items                []*Intent_Message_CarouselSelect_Item `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
+}
+
+func (m *Intent_Message_CarouselSelect) Reset()         { *m = Intent_Message_CarouselSelect{} }
+func (m *Intent_Message_CarouselSelect) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_CarouselSelect) ProtoMessage()    {}
+func (*Intent_Message_CarouselSelect) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 11}
+}
+func (m *Intent_Message_CarouselSelect) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_CarouselSelect.Unmarshal(m, b)
+}
+func (m *Intent_Message_CarouselSelect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_CarouselSelect.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_CarouselSelect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_CarouselSelect.Merge(dst, src)
+}
+func (m *Intent_Message_CarouselSelect) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_CarouselSelect.Size(m)
+}
+func (m *Intent_Message_CarouselSelect) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_CarouselSelect.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_CarouselSelect proto.InternalMessageInfo
+
+func (m *Intent_Message_CarouselSelect) GetItems() []*Intent_Message_CarouselSelect_Item {
+	if m != nil {
+		return m.Items
+	}
+	return nil
+}
+
+// An item in the carousel.
+type Intent_Message_CarouselSelect_Item struct {
+	// Required. Additional info about the option item.
+	Info *Intent_Message_SelectItemInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"`
+	// Required. Title of the carousel item.
+	Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
+	// Optional. The body text of the card.
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// Optional. The image to display.
+	Image                *Intent_Message_Image `protobuf:"bytes,4,opt,name=image,proto3" json:"image,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *Intent_Message_CarouselSelect_Item) Reset()         { *m = Intent_Message_CarouselSelect_Item{} }
+func (m *Intent_Message_CarouselSelect_Item) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_CarouselSelect_Item) ProtoMessage()    {}
+func (*Intent_Message_CarouselSelect_Item) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 11, 0}
+}
+func (m *Intent_Message_CarouselSelect_Item) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Unmarshal(m, b)
+}
+func (m *Intent_Message_CarouselSelect_Item) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_CarouselSelect_Item) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_CarouselSelect_Item.Merge(dst, src)
+}
+func (m *Intent_Message_CarouselSelect_Item) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Size(m)
+}
+func (m *Intent_Message_CarouselSelect_Item) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_CarouselSelect_Item.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_CarouselSelect_Item proto.InternalMessageInfo
+
+func (m *Intent_Message_CarouselSelect_Item) GetInfo() *Intent_Message_SelectItemInfo {
+	if m != nil {
+		return m.Info
+	}
+	return nil
+}
+
+func (m *Intent_Message_CarouselSelect_Item) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *Intent_Message_CarouselSelect_Item) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *Intent_Message_CarouselSelect_Item) GetImage() *Intent_Message_Image {
+	if m != nil {
+		return m.Image
+	}
+	return nil
+}
+
+// Additional info about the select item for when it is triggered in a
+// dialog.
+type Intent_Message_SelectItemInfo struct {
+	// Required. A unique key that will be sent back to the agent if this
+	// response is given.
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// Optional. A list of synonyms that can also be used to trigger this
+	// item in dialog.
+	Synonyms             []string `protobuf:"bytes,2,rep,name=synonyms,proto3" json:"synonyms,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_SelectItemInfo) Reset()         { *m = Intent_Message_SelectItemInfo{} }
+func (m *Intent_Message_SelectItemInfo) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_SelectItemInfo) ProtoMessage()    {}
+func (*Intent_Message_SelectItemInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 2, 12}
+}
+func (m *Intent_Message_SelectItemInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_SelectItemInfo.Unmarshal(m, b)
+}
+func (m *Intent_Message_SelectItemInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_SelectItemInfo.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_SelectItemInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SelectItemInfo.Merge(dst, src)
+}
+func (m *Intent_Message_SelectItemInfo) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_SelectItemInfo.Size(m)
+}
+func (m *Intent_Message_SelectItemInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_SelectItemInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_SelectItemInfo proto.InternalMessageInfo
+
+func (m *Intent_Message_SelectItemInfo) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *Intent_Message_SelectItemInfo) GetSynonyms() []string {
+	if m != nil {
+		return m.Synonyms
+	}
+	return nil
+}
+
+// Represents a single followup intent in the chain.
+type Intent_FollowupIntentInfo struct {
+	// The unique identifier of the followup intent.
+	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
+	FollowupIntentName string `protobuf:"bytes,1,opt,name=followup_intent_name,json=followupIntentName,proto3" json:"followup_intent_name,omitempty"`
+	// The unique identifier of the followup intent parent.
+	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
+	ParentFollowupIntentName string   `protobuf:"bytes,2,opt,name=parent_followup_intent_name,json=parentFollowupIntentName,proto3" json:"parent_followup_intent_name,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
+}
+
+func (m *Intent_FollowupIntentInfo) Reset()         { *m = Intent_FollowupIntentInfo{} }
+func (m *Intent_FollowupIntentInfo) String() string { return proto.CompactTextString(m) }
+func (*Intent_FollowupIntentInfo) ProtoMessage()    {}
+func (*Intent_FollowupIntentInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{0, 3}
+}
+func (m *Intent_FollowupIntentInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_FollowupIntentInfo.Unmarshal(m, b)
+}
+func (m *Intent_FollowupIntentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_FollowupIntentInfo.Marshal(b, m, deterministic)
+}
+func (dst *Intent_FollowupIntentInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_FollowupIntentInfo.Merge(dst, src)
+}
+func (m *Intent_FollowupIntentInfo) XXX_Size() int {
+	return xxx_messageInfo_Intent_FollowupIntentInfo.Size(m)
+}
+func (m *Intent_FollowupIntentInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_FollowupIntentInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_FollowupIntentInfo proto.InternalMessageInfo
+
+func (m *Intent_FollowupIntentInfo) GetFollowupIntentName() string {
+	if m != nil {
+		return m.FollowupIntentName
+	}
+	return ""
+}
+
+func (m *Intent_FollowupIntentInfo) GetParentFollowupIntentName() string {
+	if m != nil {
+		return m.ParentFollowupIntentName
+	}
+	return ""
+}
+
+// The request message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
+type ListIntentsRequest struct {
+	// Required. The agent to list all intents from.
+	// Format: `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The language to list training phrases, parameters and rich
+	// messages for. If not specified, the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent before they can be used.
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The resource view to apply to the returned intent.
+	IntentView IntentView `protobuf:"varint,3,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2.IntentView" json:"intent_view,omitempty"`
+	// Optional. The maximum number of items to return in a single page. By
+	// default 100 and at most 1000.
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional. The next_page_token value returned from a previous list request.
+	PageToken            string   `protobuf:"bytes,5,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListIntentsRequest) Reset()         { *m = ListIntentsRequest{} }
+func (m *ListIntentsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListIntentsRequest) ProtoMessage()    {}
+func (*ListIntentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{1}
+}
+func (m *ListIntentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListIntentsRequest.Unmarshal(m, b)
+}
+func (m *ListIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListIntentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIntentsRequest.Merge(dst, src)
+}
+func (m *ListIntentsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListIntentsRequest.Size(m)
+}
+func (m *ListIntentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListIntentsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListIntentsRequest proto.InternalMessageInfo
+
+func (m *ListIntentsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListIntentsRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *ListIntentsRequest) GetIntentView() IntentView {
+	if m != nil {
+		return m.IntentView
+	}
+	return IntentView_INTENT_VIEW_UNSPECIFIED
+}
+
+func (m *ListIntentsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListIntentsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// The response message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents].
+type ListIntentsResponse struct {
+	// The list of agent intents. There will be a maximum number of items
+	// returned based on the page_size field in the request.
+	Intents []*Intent `protobuf:"bytes,1,rep,name=intents,proto3" json:"intents,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListIntentsResponse) Reset()         { *m = ListIntentsResponse{} }
+func (m *ListIntentsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListIntentsResponse) ProtoMessage()    {}
+func (*ListIntentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{2}
+}
+func (m *ListIntentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListIntentsResponse.Unmarshal(m, b)
+}
+func (m *ListIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListIntentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIntentsResponse.Merge(dst, src)
+}
+func (m *ListIntentsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListIntentsResponse.Size(m)
+}
+func (m *ListIntentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListIntentsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListIntentsResponse proto.InternalMessageInfo
+
+func (m *ListIntentsResponse) GetIntents() []*Intent {
+	if m != nil {
+		return m.Intents
+	}
+	return nil
+}
+
+func (m *ListIntentsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The request message for [Intents.GetIntent][google.cloud.dialogflow.v2.Intents.GetIntent].
+type GetIntentRequest struct {
+	// Required. The name of the intent.
+	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Optional. The language to retrieve training phrases, parameters and rich
+	// messages for. If not specified, the agent's default language is used.
+	// [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The resource view to apply to the returned intent.
+	IntentView           IntentView `protobuf:"varint,3,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2.IntentView" json:"intent_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *GetIntentRequest) Reset()         { *m = GetIntentRequest{} }
+func (m *GetIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*GetIntentRequest) ProtoMessage()    {}
+func (*GetIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{3}
+}
+func (m *GetIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetIntentRequest.Unmarshal(m, b)
+}
+func (m *GetIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIntentRequest.Merge(dst, src)
+}
+func (m *GetIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_GetIntentRequest.Size(m)
+}
+func (m *GetIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetIntentRequest proto.InternalMessageInfo
+
+func (m *GetIntentRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *GetIntentRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *GetIntentRequest) GetIntentView() IntentView {
+	if m != nil {
+		return m.IntentView
+	}
+	return IntentView_INTENT_VIEW_UNSPECIFIED
+}
+
+// The request message for [Intents.CreateIntent][google.cloud.dialogflow.v2.Intents.CreateIntent].
+type CreateIntentRequest struct {
+	// Required. The agent to create a intent for.
+	// Format: `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The intent to create.
+	Intent *Intent `protobuf:"bytes,2,opt,name=intent,proto3" json:"intent,omitempty"`
+	// Optional. The language of training phrases, parameters and rich messages
+	// defined in `intent`. If not specified, the agent's default language is
+	// used. [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The resource view to apply to the returned intent.
+	IntentView           IntentView `protobuf:"varint,4,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2.IntentView" json:"intent_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *CreateIntentRequest) Reset()         { *m = CreateIntentRequest{} }
+func (m *CreateIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateIntentRequest) ProtoMessage()    {}
+func (*CreateIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{4}
+}
+func (m *CreateIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateIntentRequest.Unmarshal(m, b)
+}
+func (m *CreateIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIntentRequest.Merge(dst, src)
+}
+func (m *CreateIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateIntentRequest.Size(m)
+}
+func (m *CreateIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateIntentRequest proto.InternalMessageInfo
+
+func (m *CreateIntentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateIntentRequest) GetIntent() *Intent {
+	if m != nil {
+		return m.Intent
+	}
+	return nil
+}
+
+func (m *CreateIntentRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *CreateIntentRequest) GetIntentView() IntentView {
+	if m != nil {
+		return m.IntentView
+	}
+	return IntentView_INTENT_VIEW_UNSPECIFIED
+}
+
+// The request message for [Intents.UpdateIntent][google.cloud.dialogflow.v2.Intents.UpdateIntent].
+type UpdateIntentRequest struct {
+	// Required. The intent to update.
+	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
+	Intent *Intent `protobuf:"bytes,1,opt,name=intent,proto3" json:"intent,omitempty"`
+	// Optional. The language of training phrases, parameters and rich messages
+	// defined in `intent`. If not specified, the agent's default language is
+	// used. [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The mask to control which fields get updated.
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	// Optional. The resource view to apply to the returned intent.
+	IntentView           IntentView `protobuf:"varint,4,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2.IntentView" json:"intent_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *UpdateIntentRequest) Reset()         { *m = UpdateIntentRequest{} }
+func (m *UpdateIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateIntentRequest) ProtoMessage()    {}
+func (*UpdateIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{5}
+}
+func (m *UpdateIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateIntentRequest.Unmarshal(m, b)
+}
+func (m *UpdateIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateIntentRequest.Merge(dst, src)
+}
+func (m *UpdateIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateIntentRequest.Size(m)
+}
+func (m *UpdateIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateIntentRequest proto.InternalMessageInfo
+
+func (m *UpdateIntentRequest) GetIntent() *Intent {
+	if m != nil {
+		return m.Intent
+	}
+	return nil
+}
+
+func (m *UpdateIntentRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *UpdateIntentRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+func (m *UpdateIntentRequest) GetIntentView() IntentView {
+	if m != nil {
+		return m.IntentView
+	}
+	return IntentView_INTENT_VIEW_UNSPECIFIED
+}
+
+// The request message for [Intents.DeleteIntent][google.cloud.dialogflow.v2.Intents.DeleteIntent].
+type DeleteIntentRequest struct {
+	// Required. The name of the intent to delete.
+	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteIntentRequest) Reset()         { *m = DeleteIntentRequest{} }
+func (m *DeleteIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteIntentRequest) ProtoMessage()    {}
+func (*DeleteIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{6}
+}
+func (m *DeleteIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteIntentRequest.Unmarshal(m, b)
+}
+func (m *DeleteIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIntentRequest.Merge(dst, src)
+}
+func (m *DeleteIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteIntentRequest.Size(m)
+}
+func (m *DeleteIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteIntentRequest proto.InternalMessageInfo
+
+func (m *DeleteIntentRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The request message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
+type BatchUpdateIntentsRequest struct {
+	// Required. The name of the agent to update or create intents in.
+	// Format: `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The source of the intent batch.
+	//
+	// Types that are valid to be assigned to IntentBatch:
+	//	*BatchUpdateIntentsRequest_IntentBatchUri
+	//	*BatchUpdateIntentsRequest_IntentBatchInline
+	IntentBatch isBatchUpdateIntentsRequest_IntentBatch `protobuf_oneof:"intent_batch"`
+	// Optional. The language of training phrases, parameters and rich messages
+	// defined in `intents`. If not specified, the agent's default language is
+	// used. [More than a dozen
+	// languages](https://dialogflow.com/docs/reference/language) are supported.
+	// Note: languages must be enabled in the agent, before they can be used.
+	LanguageCode string `protobuf:"bytes,4,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The mask to control which fields get updated.
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	// Optional. The resource view to apply to the returned intent.
+	IntentView           IntentView `protobuf:"varint,6,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2.IntentView" json:"intent_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *BatchUpdateIntentsRequest) Reset()         { *m = BatchUpdateIntentsRequest{} }
+func (m *BatchUpdateIntentsRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateIntentsRequest) ProtoMessage()    {}
+func (*BatchUpdateIntentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{7}
+}
+func (m *BatchUpdateIntentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateIntentsRequest.Unmarshal(m, b)
+}
+func (m *BatchUpdateIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateIntentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateIntentsRequest.Merge(dst, src)
+}
+func (m *BatchUpdateIntentsRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateIntentsRequest.Size(m)
+}
+func (m *BatchUpdateIntentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateIntentsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchUpdateIntentsRequest proto.InternalMessageInfo
+
+func (m *BatchUpdateIntentsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+type isBatchUpdateIntentsRequest_IntentBatch interface {
+	isBatchUpdateIntentsRequest_IntentBatch()
+}
+
+type BatchUpdateIntentsRequest_IntentBatchUri struct {
+	IntentBatchUri string `protobuf:"bytes,2,opt,name=intent_batch_uri,json=intentBatchUri,proto3,oneof"`
+}
+
+type BatchUpdateIntentsRequest_IntentBatchInline struct {
+	IntentBatchInline *IntentBatch `protobuf:"bytes,3,opt,name=intent_batch_inline,json=intentBatchInline,proto3,oneof"`
+}
+
+func (*BatchUpdateIntentsRequest_IntentBatchUri) isBatchUpdateIntentsRequest_IntentBatch() {}
+
+func (*BatchUpdateIntentsRequest_IntentBatchInline) isBatchUpdateIntentsRequest_IntentBatch() {}
+
+func (m *BatchUpdateIntentsRequest) GetIntentBatch() isBatchUpdateIntentsRequest_IntentBatch {
+	if m != nil {
+		return m.IntentBatch
+	}
+	return nil
+}
+
+func (m *BatchUpdateIntentsRequest) GetIntentBatchUri() string {
+	if x, ok := m.GetIntentBatch().(*BatchUpdateIntentsRequest_IntentBatchUri); ok {
+		return x.IntentBatchUri
+	}
+	return ""
+}
+
+func (m *BatchUpdateIntentsRequest) GetIntentBatchInline() *IntentBatch {
+	if x, ok := m.GetIntentBatch().(*BatchUpdateIntentsRequest_IntentBatchInline); ok {
+		return x.IntentBatchInline
+	}
+	return nil
+}
+
+func (m *BatchUpdateIntentsRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *BatchUpdateIntentsRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+func (m *BatchUpdateIntentsRequest) GetIntentView() IntentView {
+	if m != nil {
+		return m.IntentView
+	}
+	return IntentView_INTENT_VIEW_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*BatchUpdateIntentsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _BatchUpdateIntentsRequest_OneofMarshaler, _BatchUpdateIntentsRequest_OneofUnmarshaler, _BatchUpdateIntentsRequest_OneofSizer, []interface{}{
+		(*BatchUpdateIntentsRequest_IntentBatchUri)(nil),
+		(*BatchUpdateIntentsRequest_IntentBatchInline)(nil),
+	}
+}
+
+func _BatchUpdateIntentsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*BatchUpdateIntentsRequest)
+	// intent_batch
+	switch x := m.IntentBatch.(type) {
+	case *BatchUpdateIntentsRequest_IntentBatchUri:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.IntentBatchUri)
+	case *BatchUpdateIntentsRequest_IntentBatchInline:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.IntentBatchInline); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("BatchUpdateIntentsRequest.IntentBatch has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _BatchUpdateIntentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*BatchUpdateIntentsRequest)
+	switch tag {
+	case 2: // intent_batch.intent_batch_uri
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.IntentBatch = &BatchUpdateIntentsRequest_IntentBatchUri{x}
+		return true, err
+	case 3: // intent_batch.intent_batch_inline
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(IntentBatch)
+		err := b.DecodeMessage(msg)
+		m.IntentBatch = &BatchUpdateIntentsRequest_IntentBatchInline{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _BatchUpdateIntentsRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*BatchUpdateIntentsRequest)
+	// intent_batch
+	switch x := m.IntentBatch.(type) {
+	case *BatchUpdateIntentsRequest_IntentBatchUri:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.IntentBatchUri)))
+		n += len(x.IntentBatchUri)
+	case *BatchUpdateIntentsRequest_IntentBatchInline:
+		s := proto.Size(x.IntentBatchInline)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The response message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2.Intents.BatchUpdateIntents].
+type BatchUpdateIntentsResponse struct {
+	// The collection of updated or created intents.
+	Intents              []*Intent `protobuf:"bytes,1,rep,name=intents,proto3" json:"intents,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *BatchUpdateIntentsResponse) Reset()         { *m = BatchUpdateIntentsResponse{} }
+func (m *BatchUpdateIntentsResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateIntentsResponse) ProtoMessage()    {}
+func (*BatchUpdateIntentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{8}
+}
+func (m *BatchUpdateIntentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateIntentsResponse.Unmarshal(m, b)
+}
+func (m *BatchUpdateIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateIntentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateIntentsResponse.Merge(dst, src)
+}
+func (m *BatchUpdateIntentsResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateIntentsResponse.Size(m)
+}
+func (m *BatchUpdateIntentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateIntentsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchUpdateIntentsResponse proto.InternalMessageInfo
+
+func (m *BatchUpdateIntentsResponse) GetIntents() []*Intent {
+	if m != nil {
+		return m.Intents
+	}
+	return nil
+}
+
+// The request message for [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2.Intents.BatchDeleteIntents].
+type BatchDeleteIntentsRequest struct {
+	// Required. The name of the agent to delete all entities types for. Format:
+	// `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The collection of intents to delete. Only intent `name` must be
+	// filled in.
+	Intents              []*Intent `protobuf:"bytes,2,rep,name=intents,proto3" json:"intents,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *BatchDeleteIntentsRequest) Reset()         { *m = BatchDeleteIntentsRequest{} }
+func (m *BatchDeleteIntentsRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchDeleteIntentsRequest) ProtoMessage()    {}
+func (*BatchDeleteIntentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{9}
+}
+func (m *BatchDeleteIntentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchDeleteIntentsRequest.Unmarshal(m, b)
+}
+func (m *BatchDeleteIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchDeleteIntentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchDeleteIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteIntentsRequest.Merge(dst, src)
+}
+func (m *BatchDeleteIntentsRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchDeleteIntentsRequest.Size(m)
+}
+func (m *BatchDeleteIntentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchDeleteIntentsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchDeleteIntentsRequest proto.InternalMessageInfo
+
+func (m *BatchDeleteIntentsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *BatchDeleteIntentsRequest) GetIntents() []*Intent {
+	if m != nil {
+		return m.Intents
+	}
+	return nil
+}
+
+// This message is a wrapper around a collection of intents.
+type IntentBatch struct {
+	// A collection of intents.
+	Intents              []*Intent `protobuf:"bytes,1,rep,name=intents,proto3" json:"intents,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *IntentBatch) Reset()         { *m = IntentBatch{} }
+func (m *IntentBatch) String() string { return proto.CompactTextString(m) }
+func (*IntentBatch) ProtoMessage()    {}
+func (*IntentBatch) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_eb465f5d3cf7c1e7, []int{10}
+}
+func (m *IntentBatch) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IntentBatch.Unmarshal(m, b)
+}
+func (m *IntentBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IntentBatch.Marshal(b, m, deterministic)
+}
+func (dst *IntentBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntentBatch.Merge(dst, src)
+}
+func (m *IntentBatch) XXX_Size() int {
+	return xxx_messageInfo_IntentBatch.Size(m)
+}
+func (m *IntentBatch) XXX_DiscardUnknown() {
+	xxx_messageInfo_IntentBatch.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_IntentBatch proto.InternalMessageInfo
+
+func (m *IntentBatch) GetIntents() []*Intent {
+	if m != nil {
+		return m.Intents
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Intent)(nil), "google.cloud.dialogflow.v2.Intent")
+	proto.RegisterType((*Intent_TrainingPhrase)(nil), "google.cloud.dialogflow.v2.Intent.TrainingPhrase")
+	proto.RegisterType((*Intent_TrainingPhrase_Part)(nil), "google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part")
+	proto.RegisterType((*Intent_Parameter)(nil), "google.cloud.dialogflow.v2.Intent.Parameter")
+	proto.RegisterType((*Intent_Message)(nil), "google.cloud.dialogflow.v2.Intent.Message")
+	proto.RegisterType((*Intent_Message_Text)(nil), "google.cloud.dialogflow.v2.Intent.Message.Text")
+	proto.RegisterType((*Intent_Message_Image)(nil), "google.cloud.dialogflow.v2.Intent.Message.Image")
+	proto.RegisterType((*Intent_Message_QuickReplies)(nil), "google.cloud.dialogflow.v2.Intent.Message.QuickReplies")
+	proto.RegisterType((*Intent_Message_Card)(nil), "google.cloud.dialogflow.v2.Intent.Message.Card")
+	proto.RegisterType((*Intent_Message_Card_Button)(nil), "google.cloud.dialogflow.v2.Intent.Message.Card.Button")
+	proto.RegisterType((*Intent_Message_SimpleResponse)(nil), "google.cloud.dialogflow.v2.Intent.Message.SimpleResponse")
+	proto.RegisterType((*Intent_Message_SimpleResponses)(nil), "google.cloud.dialogflow.v2.Intent.Message.SimpleResponses")
+	proto.RegisterType((*Intent_Message_BasicCard)(nil), "google.cloud.dialogflow.v2.Intent.Message.BasicCard")
+	proto.RegisterType((*Intent_Message_BasicCard_Button)(nil), "google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button")
+	proto.RegisterType((*Intent_Message_BasicCard_Button_OpenUriAction)(nil), "google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction")
+	proto.RegisterType((*Intent_Message_Suggestion)(nil), "google.cloud.dialogflow.v2.Intent.Message.Suggestion")
+	proto.RegisterType((*Intent_Message_Suggestions)(nil), "google.cloud.dialogflow.v2.Intent.Message.Suggestions")
+	proto.RegisterType((*Intent_Message_LinkOutSuggestion)(nil), "google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion")
+	proto.RegisterType((*Intent_Message_ListSelect)(nil), "google.cloud.dialogflow.v2.Intent.Message.ListSelect")
+	proto.RegisterType((*Intent_Message_ListSelect_Item)(nil), "google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item")
+	proto.RegisterType((*Intent_Message_CarouselSelect)(nil), "google.cloud.dialogflow.v2.Intent.Message.CarouselSelect")
+	proto.RegisterType((*Intent_Message_CarouselSelect_Item)(nil), "google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item")
+	proto.RegisterType((*Intent_Message_SelectItemInfo)(nil), "google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo")
+	proto.RegisterType((*Intent_FollowupIntentInfo)(nil), "google.cloud.dialogflow.v2.Intent.FollowupIntentInfo")
+	proto.RegisterType((*ListIntentsRequest)(nil), "google.cloud.dialogflow.v2.ListIntentsRequest")
+	proto.RegisterType((*ListIntentsResponse)(nil), "google.cloud.dialogflow.v2.ListIntentsResponse")
+	proto.RegisterType((*GetIntentRequest)(nil), "google.cloud.dialogflow.v2.GetIntentRequest")
+	proto.RegisterType((*CreateIntentRequest)(nil), "google.cloud.dialogflow.v2.CreateIntentRequest")
+	proto.RegisterType((*UpdateIntentRequest)(nil), "google.cloud.dialogflow.v2.UpdateIntentRequest")
+	proto.RegisterType((*DeleteIntentRequest)(nil), "google.cloud.dialogflow.v2.DeleteIntentRequest")
+	proto.RegisterType((*BatchUpdateIntentsRequest)(nil), "google.cloud.dialogflow.v2.BatchUpdateIntentsRequest")
+	proto.RegisterType((*BatchUpdateIntentsResponse)(nil), "google.cloud.dialogflow.v2.BatchUpdateIntentsResponse")
+	proto.RegisterType((*BatchDeleteIntentsRequest)(nil), "google.cloud.dialogflow.v2.BatchDeleteIntentsRequest")
+	proto.RegisterType((*IntentBatch)(nil), "google.cloud.dialogflow.v2.IntentBatch")
+	proto.RegisterEnum("google.cloud.dialogflow.v2.IntentView", IntentView_name, IntentView_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_WebhookState", Intent_WebhookState_name, Intent_WebhookState_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_TrainingPhrase_Type", Intent_TrainingPhrase_Type_name, Intent_TrainingPhrase_Type_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.Intent_Message_Platform", Intent_Message_Platform_name, Intent_Message_Platform_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// IntentsClient is the client API for Intents service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type IntentsClient interface {
+	// Returns the list of all intents in the specified agent.
+	ListIntents(ctx context.Context, in *ListIntentsRequest, opts ...grpc.CallOption) (*ListIntentsResponse, error)
+	// Retrieves the specified intent.
+	GetIntent(ctx context.Context, in *GetIntentRequest, opts ...grpc.CallOption) (*Intent, error)
+	// Creates an intent in the specified agent.
+	CreateIntent(ctx context.Context, in *CreateIntentRequest, opts ...grpc.CallOption) (*Intent, error)
+	// Updates the specified intent.
+	UpdateIntent(ctx context.Context, in *UpdateIntentRequest, opts ...grpc.CallOption) (*Intent, error)
+	// Deletes the specified intent.
+	DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Updates/Creates multiple intents in the specified agent.
+	//
+	// Operation <response: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]>
+	BatchUpdateIntents(ctx context.Context, in *BatchUpdateIntentsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Deletes intents in the specified agent.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty]>
+	BatchDeleteIntents(ctx context.Context, in *BatchDeleteIntentsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type intentsClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewIntentsClient(cc *grpc.ClientConn) IntentsClient {
+	return &intentsClient{cc}
+}
+
+func (c *intentsClient) ListIntents(ctx context.Context, in *ListIntentsRequest, opts ...grpc.CallOption) (*ListIntentsResponse, error) {
+	out := new(ListIntentsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Intents/ListIntents", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *intentsClient) GetIntent(ctx context.Context, in *GetIntentRequest, opts ...grpc.CallOption) (*Intent, error) {
+	out := new(Intent)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Intents/GetIntent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *intentsClient) CreateIntent(ctx context.Context, in *CreateIntentRequest, opts ...grpc.CallOption) (*Intent, error) {
+	out := new(Intent)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Intents/CreateIntent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *intentsClient) UpdateIntent(ctx context.Context, in *UpdateIntentRequest, opts ...grpc.CallOption) (*Intent, error) {
+	out := new(Intent)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Intents/UpdateIntent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *intentsClient) DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Intents/DeleteIntent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *intentsClient) BatchUpdateIntents(ctx context.Context, in *BatchUpdateIntentsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Intents/BatchUpdateIntents", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *intentsClient) BatchDeleteIntents(ctx context.Context, in *BatchDeleteIntentsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Intents/BatchDeleteIntents", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// IntentsServer is the server API for Intents service.
+type IntentsServer interface {
+	// Returns the list of all intents in the specified agent.
+	ListIntents(context.Context, *ListIntentsRequest) (*ListIntentsResponse, error)
+	// Retrieves the specified intent.
+	GetIntent(context.Context, *GetIntentRequest) (*Intent, error)
+	// Creates an intent in the specified agent.
+	CreateIntent(context.Context, *CreateIntentRequest) (*Intent, error)
+	// Updates the specified intent.
+	UpdateIntent(context.Context, *UpdateIntentRequest) (*Intent, error)
+	// Deletes the specified intent.
+	DeleteIntent(context.Context, *DeleteIntentRequest) (*empty.Empty, error)
+	// Updates/Creates multiple intents in the specified agent.
+	//
+	// Operation <response: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2.BatchUpdateIntentsResponse]>
+	BatchUpdateIntents(context.Context, *BatchUpdateIntentsRequest) (*longrunning.Operation, error)
+	// Deletes intents in the specified agent.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty]>
+	BatchDeleteIntents(context.Context, *BatchDeleteIntentsRequest) (*longrunning.Operation, error)
+}
+
+func RegisterIntentsServer(s *grpc.Server, srv IntentsServer) {
+	s.RegisterService(&_Intents_serviceDesc, srv)
+}
+
+func _Intents_ListIntents_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListIntentsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IntentsServer).ListIntents(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Intents/ListIntents",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IntentsServer).ListIntents(ctx, req.(*ListIntentsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Intents_GetIntent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetIntentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IntentsServer).GetIntent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Intents/GetIntent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IntentsServer).GetIntent(ctx, req.(*GetIntentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Intents_CreateIntent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateIntentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IntentsServer).CreateIntent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Intents/CreateIntent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IntentsServer).CreateIntent(ctx, req.(*CreateIntentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Intents_UpdateIntent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateIntentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IntentsServer).UpdateIntent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Intents/UpdateIntent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IntentsServer).UpdateIntent(ctx, req.(*UpdateIntentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Intents_DeleteIntent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteIntentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IntentsServer).DeleteIntent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Intents/DeleteIntent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IntentsServer).DeleteIntent(ctx, req.(*DeleteIntentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Intents_BatchUpdateIntents_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchUpdateIntentsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IntentsServer).BatchUpdateIntents(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Intents/BatchUpdateIntents",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IntentsServer).BatchUpdateIntents(ctx, req.(*BatchUpdateIntentsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Intents_BatchDeleteIntents_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchDeleteIntentsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IntentsServer).BatchDeleteIntents(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Intents/BatchDeleteIntents",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IntentsServer).BatchDeleteIntents(ctx, req.(*BatchDeleteIntentsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Intents_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.dialogflow.v2.Intents",
+	HandlerType: (*IntentsServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListIntents",
+			Handler:    _Intents_ListIntents_Handler,
+		},
+		{
+			MethodName: "GetIntent",
+			Handler:    _Intents_GetIntent_Handler,
+		},
+		{
+			MethodName: "CreateIntent",
+			Handler:    _Intents_CreateIntent_Handler,
+		},
+		{
+			MethodName: "UpdateIntent",
+			Handler:    _Intents_UpdateIntent_Handler,
+		},
+		{
+			MethodName: "DeleteIntent",
+			Handler:    _Intents_DeleteIntent_Handler,
+		},
+		{
+			MethodName: "BatchUpdateIntents",
+			Handler:    _Intents_BatchUpdateIntents_Handler,
+		},
+		{
+			MethodName: "BatchDeleteIntents",
+			Handler:    _Intents_BatchDeleteIntents_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/dialogflow/v2/intent.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/intent.proto", fileDescriptor_intent_eb465f5d3cf7c1e7)
+}
+
+var fileDescriptor_intent_eb465f5d3cf7c1e7 = []byte{
+	// 2562 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x23, 0x57,
+	0xf5, 0x77, 0xeb, 0x61, 0x4b, 0x47, 0xb2, 0x2c, 0x5f, 0x4f, 0x26, 0x9a, 0x4e, 0xf2, 0xff, 0x3b,
+	0x0a, 0x49, 0x1c, 0x57, 0x22, 0x25, 0x0a, 0x49, 0xc8, 0xe4, 0x41, 0xf9, 0x21, 0xdb, 0xc2, 0xb2,
+	0x25, 0xda, 0xf2, 0x4c, 0x92, 0xa2, 0xe8, 0x6a, 0x4b, 0x57, 0x9a, 0x8b, 0x5b, 0xdd, 0x3d, 0x7d,
+	0xaf, 0xec, 0x28, 0xa9, 0x6c, 0xa8, 0x02, 0x16, 0xb0, 0x83, 0x0d, 0xa9, 0xa2, 0x28, 0x58, 0x51,
+	0xac, 0x59, 0xb1, 0xe0, 0x13, 0xb0, 0xa3, 0x80, 0x6c, 0xa9, 0xe2, 0x2b, 0x50, 0xc5, 0x82, 0x05,
+	0x75, 0x1f, 0x2d, 0xb5, 0x1e, 0x63, 0x4b, 0x9e, 0x81, 0x0d, 0x3b, 0xdd, 0x73, 0xcf, 0xfb, 0x9c,
+	0xfb, 0x3b, 0xf7, 0xb6, 0x0d, 0x2f, 0x77, 0x5c, 0xb7, 0x63, 0xe3, 0x62, 0xd3, 0x76, 0x7b, 0xad,
+	0x62, 0x8b, 0x58, 0xb6, 0xdb, 0x69, 0xdb, 0xee, 0x65, 0xf1, 0xa2, 0x54, 0x24, 0x0e, 0xc3, 0x0e,
+	0x2b, 0x78, 0xbe, 0xcb, 0x5c, 0xa4, 0x4b, 0xc6, 0x82, 0x60, 0x2c, 0x0c, 0x19, 0x0b, 0x17, 0x25,
+	0xfd, 0x59, 0xa5, 0xc4, 0xf2, 0x48, 0xd1, 0x72, 0x1c, 0x97, 0x59, 0x8c, 0xb8, 0x0e, 0x95, 0x92,
+	0xfa, 0xc6, 0x15, 0x26, 0x9a, 0xae, 0xc3, 0xf0, 0xa7, 0xca, 0x86, 0xfe, 0x82, 0xe2, 0xb4, 0x5d,
+	0xa7, 0xe3, 0xf7, 0x1c, 0x87, 0x38, 0x9d, 0xa2, 0xeb, 0x61, 0x7f, 0x44, 0xdd, 0x33, 0x8a, 0x49,
+	0xac, 0xce, 0x7a, 0xed, 0x22, 0xee, 0x7a, 0xac, 0xaf, 0x36, 0xd7, 0xc7, 0x37, 0xdb, 0x04, 0xdb,
+	0x2d, 0xb3, 0x6b, 0xd1, 0x73, 0xc5, 0xf1, 0xec, 0x38, 0x07, 0x65, 0x7e, 0xaf, 0xa9, 0x3c, 0xc8,
+	0x7f, 0xb5, 0x01, 0x8b, 0x15, 0x11, 0x36, 0x42, 0x10, 0x73, 0xac, 0x2e, 0xce, 0x69, 0xeb, 0xda,
+	0x46, 0xd2, 0x10, 0xbf, 0xd1, 0xf3, 0x90, 0x6e, 0x11, 0xea, 0xd9, 0x56, 0xdf, 0x14, 0x7b, 0x11,
+	0xb1, 0x97, 0x52, 0xb4, 0x63, 0xce, 0xd2, 0x80, 0xe5, 0x4b, 0x7c, 0xf6, 0xc0, 0x75, 0xcf, 0x4d,
+	0xca, 0x2c, 0x86, 0x73, 0x8b, 0xeb, 0xda, 0x46, 0xa6, 0x54, 0x2c, 0x3c, 0x3a, 0x7f, 0x05, 0x69,
+	0xb1, 0x70, 0x5f, 0xca, 0x9d, 0x70, 0x31, 0x23, 0x7d, 0x19, 0x5a, 0x21, 0x1d, 0x12, 0x9e, 0x4f,
+	0x5c, 0x9f, 0xb0, 0x7e, 0x2e, 0xba, 0xae, 0x6d, 0xc4, 0x8d, 0xc1, 0x1a, 0xfd, 0x3f, 0xa4, 0x08,
+	0x35, 0xdb, 0x96, 0x6d, 0x9f, 0x59, 0xcd, 0xf3, 0x5c, 0x6c, 0x5d, 0xdb, 0x48, 0x18, 0x40, 0xe8,
+	0x9e, 0xa2, 0x70, 0x86, 0xae, 0x6d, 0xb6, 0x08, 0xb5, 0xce, 0x6c, 0xdc, 0xca, 0xad, 0x49, 0x86,
+	0xae, 0xbd, 0xab, 0x28, 0xa8, 0x00, 0x6b, 0xc4, 0xf1, 0x7a, 0xcc, 0x54, 0xe5, 0x10, 0xc1, 0xd1,
+	0xdc, 0xd2, 0x7a, 0x74, 0x23, 0x69, 0xac, 0x8a, 0xad, 0x1d, 0xb9, 0xc3, 0x43, 0xa4, 0xe8, 0x36,
+	0x2c, 0xe2, 0x0b, 0xec, 0x30, 0x9a, 0x4b, 0x08, 0x16, 0xb5, 0x42, 0xdf, 0x81, 0x2c, 0xf3, 0x2d,
+	0xc2, 0xeb, 0x66, 0x7a, 0x0f, 0x7c, 0x8b, 0x62, 0x9a, 0x4b, 0xae, 0x47, 0x37, 0x52, 0xa5, 0x37,
+	0x66, 0x08, 0xbf, 0xa1, 0x44, 0xeb, 0x42, 0xd2, 0x58, 0x61, 0x23, 0x6b, 0x61, 0xd5, 0x6a, 0xf2,
+	0x4e, 0xc8, 0x81, 0x48, 0xbb, 0x5a, 0xa1, 0x2a, 0xac, 0xb8, 0x3d, 0x16, 0x72, 0x9f, 0xe6, 0x52,
+	0xc2, 0xe8, 0x0b, 0x57, 0x19, 0x55, 0x01, 0x19, 0x19, 0x29, 0xab, 0x96, 0x14, 0xbd, 0x08, 0x19,
+	0x1f, 0x53, 0x1c, 0x52, 0x96, 0x16, 0xf9, 0x5a, 0x16, 0xd4, 0x01, 0x5b, 0x15, 0xc0, 0xb3, 0x7c,
+	0xab, 0x8b, 0x19, 0xf6, 0x69, 0x6e, 0x59, 0xd8, 0x7b, 0x75, 0x86, 0x20, 0xeb, 0x81, 0x90, 0x11,
+	0x92, 0x47, 0x7b, 0x90, 0xe8, 0x62, 0x4a, 0xad, 0x0e, 0xa6, 0xb9, 0x8c, 0xd0, 0xb5, 0x39, 0x83,
+	0xae, 0x23, 0x29, 0x62, 0x0c, 0x64, 0xd1, 0x43, 0xd0, 0x5b, 0xb8, 0x6d, 0xf5, 0x6c, 0x66, 0xfa,
+	0x98, 0x7a, 0xae, 0x43, 0xb1, 0xe9, 0xd9, 0x16, 0x6b, 0xbb, 0x7e, 0x97, 0xe6, 0x56, 0xd6, 0xa3,
+	0x1b, 0x99, 0xd2, 0x9b, 0xb3, 0x6b, 0x2e, 0xd4, 0x95, 0xac, 0x91, 0x53, 0x6a, 0x0d, 0xa5, 0x35,
+	0xd8, 0xa0, 0xe8, 0x5d, 0xb8, 0xe3, 0xbb, 0x2e, 0x33, 0xdb, 0xae, 0x6d, 0xbb, 0x97, 0x3d, 0xcf,
+	0x94, 0xa8, 0x21, 0xcf, 0x47, 0x56, 0x14, 0xea, 0x36, 0x67, 0xd8, 0x53, 0xfb, 0xd2, 0x82, 0x38,
+	0x2a, 0x1f, 0xc0, 0x33, 0x9e, 0xe5, 0x73, 0xe6, 0xa9, 0xc2, 0xab, 0x42, 0x38, 0x27, 0x59, 0xa6,
+	0x88, 0x77, 0xe0, 0xd6, 0xb8, 0x1c, 0x71, 0xda, 0x6e, 0x0e, 0x89, 0x04, 0xbe, 0x35, 0x43, 0x98,
+	0xa3, 0x4a, 0x2b, 0x4e, 0xdb, 0x35, 0x50, 0x7b, 0x82, 0xa6, 0xff, 0x3c, 0x0a, 0x99, 0xd1, 0xe6,
+	0x9c, 0x0a, 0x0e, 0xdf, 0x82, 0x18, 0xeb, 0x7b, 0x12, 0x14, 0x32, 0xa5, 0xb7, 0xe7, 0xee, 0xf8,
+	0x42, 0xa3, 0xef, 0x61, 0x43, 0xe8, 0x40, 0x55, 0x88, 0x7b, 0x96, 0xcf, 0x68, 0x2e, 0x2a, 0x82,
+	0xb9, 0x81, 0xb2, 0xba, 0xe5, 0x33, 0x43, 0x2a, 0x41, 0x9b, 0xb0, 0xca, 0x48, 0x17, 0x53, 0xd3,
+	0x6a, 0xb5, 0x70, 0xcb, 0x6c, 0xba, 0x3d, 0x87, 0x09, 0x9c, 0x88, 0x1b, 0x2b, 0x62, 0x63, 0x8b,
+	0xd3, 0x77, 0x38, 0x59, 0x67, 0x10, 0xe3, 0xa2, 0x3c, 0x42, 0xde, 0xe9, 0x41, 0x84, 0xfc, 0x37,
+	0x07, 0x12, 0xec, 0x30, 0xc2, 0xfa, 0xe6, 0x20, 0xd0, 0xa4, 0x01, 0x92, 0xc4, 0x9d, 0x47, 0xb7,
+	0x20, 0x6e, 0xd9, 0xc4, 0xa2, 0x02, 0xa3, 0x92, 0x86, 0x5c, 0x70, 0xd4, 0xec, 0x51, 0xec, 0x9b,
+	0x2d, 0xdc, 0x26, 0x0e, 0x6e, 0x29, 0x84, 0x4a, 0x71, 0xda, 0xae, 0x24, 0xe5, 0xdf, 0x81, 0x98,
+	0x52, 0x90, 0x6d, 0x7c, 0x5c, 0x2f, 0x9b, 0xa7, 0xc7, 0x27, 0xf5, 0xf2, 0x4e, 0x65, 0xaf, 0x52,
+	0xde, 0xcd, 0x2e, 0xa0, 0x14, 0x2c, 0x95, 0x3f, 0xda, 0x3a, 0xaa, 0x57, 0xcb, 0x59, 0x0d, 0xa5,
+	0x21, 0xd1, 0x28, 0x1f, 0xd5, 0xab, 0x5b, 0x8d, 0x72, 0x36, 0xa2, 0xff, 0x28, 0x02, 0xc9, 0xc1,
+	0x99, 0xba, 0x29, 0x66, 0xdf, 0x82, 0xf8, 0x85, 0x65, 0xf7, 0x70, 0xe0, 0xb6, 0x58, 0xa0, 0x17,
+	0x60, 0x39, 0x38, 0x4c, 0x72, 0x37, 0x26, 0x76, 0xd3, 0x8a, 0x78, 0x4f, 0x30, 0xbd, 0x03, 0xb9,
+	0x50, 0x4a, 0xcc, 0x11, 0x4b, 0x71, 0xc1, 0xff, 0xd4, 0x30, 0x3f, 0xbb, 0x21, 0x9b, 0xcf, 0x42,
+	0xb2, 0x6b, 0x39, 0x2d, 0x8b, 0xb9, 0x7e, 0x5f, 0xcc, 0x88, 0x84, 0x31, 0x24, 0xa0, 0x1c, 0x2c,
+	0x79, 0xbe, 0xdb, 0xf5, 0x58, 0x80, 0xc2, 0xc1, 0x12, 0x3d, 0x0d, 0x4b, 0x84, 0x9a, 0x36, 0xa1,
+	0x2c, 0x97, 0x10, 0x52, 0x8b, 0x84, 0x56, 0x09, 0x65, 0xfa, 0x2f, 0xef, 0xc0, 0x92, 0x3a, 0xb7,
+	0xa8, 0x1c, 0x2a, 0x5e, 0x6a, 0xa6, 0xd9, 0x13, 0x9c, 0xf8, 0x06, 0xfe, 0x94, 0x1d, 0x2c, 0xa8,
+	0x7a, 0x1f, 0x40, 0x9c, 0x74, 0xad, 0x8e, 0xcc, 0x59, 0xaa, 0xf4, 0xfa, 0x1c, 0x7a, 0x2a, 0x5c,
+	0xee, 0x60, 0xc1, 0x90, 0x0a, 0xd0, 0x77, 0x61, 0xf9, 0x61, 0x8f, 0x34, 0xcf, 0x4d, 0x1f, 0x7b,
+	0x36, 0xc1, 0xb2, 0x41, 0x52, 0xa5, 0x77, 0xe6, 0xd0, 0xf8, 0x6d, 0x2e, 0x6f, 0x48, 0xf1, 0x83,
+	0x05, 0x23, 0xfd, 0x30, 0xb4, 0xe6, 0x01, 0x37, 0x2d, 0x5f, 0xb6, 0xd6, 0x7c, 0x01, 0xef, 0x58,
+	0x7e, 0x8b, 0x07, 0xcc, 0xc5, 0xd1, 0x9b, 0xb0, 0xe4, 0x59, 0x7d, 0xdb, 0xb5, 0x5a, 0xa2, 0x78,
+	0xa9, 0xd2, 0xd3, 0x81, 0xa6, 0xe0, 0xba, 0x50, 0x38, 0x11, 0xd7, 0x85, 0x83, 0x05, 0x23, 0xe0,
+	0x44, 0x1d, 0xc8, 0x52, 0xd2, 0xf5, 0x6c, 0x3c, 0xc0, 0x5c, 0x5e, 0x34, 0x2e, 0x7d, 0x77, 0x0e,
+	0x3f, 0x4e, 0x84, 0x8a, 0x00, 0x5f, 0x79, 0x84, 0x2b, 0x74, 0x94, 0x84, 0x4e, 0x01, 0xce, 0x2c,
+	0x4a, 0x9a, 0xa6, 0x08, 0x35, 0x21, 0x4c, 0x7c, 0x7d, 0x0e, 0x13, 0xdb, 0x5c, 0x58, 0xc5, 0x9b,
+	0x3c, 0x0b, 0x16, 0xe8, 0x13, 0x48, 0xd1, 0x5e, 0xa7, 0x83, 0xa9, 0xb8, 0x65, 0xe5, 0x92, 0x42,
+	0xef, 0xdb, 0xf3, 0xb8, 0x3e, 0x94, 0x3e, 0x58, 0x30, 0xc2, 0xca, 0x90, 0x03, 0x6b, 0x36, 0x71,
+	0xce, 0x4d, 0xb7, 0xc7, 0xcc, 0x21, 0x5d, 0x0c, 0xf0, 0x54, 0xe9, 0xfd, 0x39, 0x6c, 0x54, 0x89,
+	0x73, 0x5e, 0xeb, 0xb1, 0xa1, 0xa9, 0x83, 0x05, 0x63, 0xd5, 0x1e, 0x27, 0xa2, 0x8f, 0x20, 0xc5,
+	0x8f, 0x86, 0x49, 0xb1, 0x8d, 0x9b, 0x2c, 0x97, 0x12, 0x76, 0xde, 0x9a, 0xcb, 0x0e, 0x65, 0x27,
+	0x42, 0xf8, 0x60, 0xc1, 0x00, 0x7b, 0xb0, 0x42, 0x2d, 0x58, 0x69, 0x5a, 0xbe, 0xdb, 0xa3, 0xd8,
+	0x0e, 0xb4, 0xa7, 0x85, 0xf6, 0x77, 0xe7, 0x6b, 0x36, 0xa1, 0x61, 0x60, 0x21, 0xd3, 0x1c, 0xa1,
+	0xa0, 0x1a, 0x24, 0x82, 0x79, 0xad, 0x2e, 0x8e, 0x37, 0x1a, 0xd7, 0x03, 0x25, 0xba, 0x0e, 0x31,
+	0x7e, 0xa4, 0x43, 0x70, 0x1e, 0x0d, 0xe0, 0x5c, 0x3f, 0x81, 0xb8, 0x38, 0xa6, 0xe8, 0x19, 0x48,
+	0x8a, 0x63, 0x6a, 0xf6, 0x7c, 0xa2, 0xb0, 0x33, 0x21, 0x08, 0xa7, 0x3e, 0x41, 0xaf, 0x01, 0xb2,
+	0x9a, 0x4d, 0x4c, 0x29, 0x39, 0x23, 0xb6, 0x00, 0x3a, 0xae, 0x47, 0xa2, 0xe8, 0xea, 0xc8, 0x0e,
+	0x37, 0xa4, 0x57, 0x20, 0x1d, 0x3e, 0xa9, 0x1c, 0x5b, 0x19, 0x61, 0x76, 0x80, 0xc9, 0x72, 0xc1,
+	0xb1, 0x75, 0x14, 0x0f, 0x22, 0xc2, 0xaf, 0x91, 0x43, 0xad, 0xff, 0x4d, 0x83, 0x98, 0xe8, 0xd0,
+	0xe9, 0x3a, 0x74, 0x48, 0xd0, 0xde, 0x99, 0xdc, 0x90, 0xee, 0x0c, 0xd6, 0xa3, 0x11, 0x45, 0xc7,
+	0x22, 0xaa, 0xc3, 0xd2, 0x59, 0x8f, 0x31, 0xde, 0xec, 0xb1, 0x99, 0xc7, 0x6b, 0x18, 0x2f, 0x0a,
+	0xdb, 0x42, 0xdc, 0x08, 0xd4, 0xe8, 0xdf, 0x80, 0x45, 0x49, 0x9a, 0x3a, 0x36, 0xf9, 0xe5, 0xdd,
+	0xa5, 0x4c, 0xdc, 0xce, 0x95, 0xa3, 0xc1, 0x5a, 0xef, 0x42, 0x66, 0xf4, 0xe4, 0xa3, 0xaf, 0x41,
+	0x46, 0xdc, 0xc1, 0x99, 0x6b, 0x52, 0x0f, 0xe3, 0xe6, 0x03, 0xa5, 0x2b, 0xcd, 0xa9, 0x0d, 0xf7,
+	0x44, 0xd0, 0xb8, 0x1d, 0x4a, 0xbb, 0xb6, 0xd2, 0x27, 0x7e, 0x87, 0x27, 0x9d, 0xf0, 0x21, 0x3a,
+	0x32, 0xe9, 0x44, 0x75, 0x2e, 0x61, 0x65, 0x0c, 0x68, 0x50, 0x6b, 0x0a, 0x7c, 0x69, 0x22, 0x2d,
+	0xef, 0xde, 0x18, 0xbe, 0x26, 0xb0, 0x4b, 0xff, 0x7d, 0x14, 0x92, 0x03, 0xfc, 0xb9, 0x41, 0x41,
+	0x5f, 0x84, 0x0c, 0xef, 0x67, 0x8b, 0x31, 0xdc, 0x0a, 0x47, 0xb7, 0x3c, 0xa0, 0x8a, 0x36, 0xdf,
+	0x0b, 0x26, 0x56, 0xec, 0x66, 0x13, 0x2b, 0x98, 0x57, 0xa7, 0xc3, 0x16, 0x89, 0x8b, 0x5c, 0xbc,
+	0x77, 0x13, 0x9c, 0x9d, 0xe8, 0x93, 0xdf, 0x69, 0x83, 0x46, 0x99, 0x9e, 0x82, 0x87, 0xb0, 0xe2,
+	0x7a, 0xd8, 0xe1, 0x6d, 0x6b, 0xaa, 0xc7, 0x8e, 0x9c, 0xbd, 0x95, 0xc7, 0xb0, 0x5f, 0xa8, 0x79,
+	0xd8, 0x39, 0xf5, 0xc9, 0x96, 0x50, 0x68, 0x2c, 0xbb, 0xe1, 0xa5, 0xfe, 0x3c, 0x2c, 0x8f, 0xec,
+	0xa3, 0x2c, 0x44, 0x87, 0x38, 0xc0, 0x7f, 0xea, 0x79, 0x80, 0x10, 0xc6, 0x4e, 0xf5, 0x5c, 0x6f,
+	0x43, 0x2a, 0x34, 0x07, 0xd0, 0xfd, 0xd1, 0xa1, 0xa2, 0xcd, 0x7c, 0x27, 0x9f, 0x1c, 0x2a, 0x23,
+	0x13, 0x45, 0xaf, 0xc3, 0xea, 0xc4, 0x2c, 0x40, 0xaf, 0x40, 0xb6, 0xc5, 0x7f, 0x3a, 0xe2, 0x4b,
+	0x81, 0x19, 0xba, 0x03, 0xae, 0x84, 0xe8, 0xe2, 0xde, 0xa5, 0xa2, 0x8b, 0x0c, 0xa3, 0xfb, 0x63,
+	0x04, 0x60, 0x08, 0xfb, 0x8f, 0x28, 0x4c, 0x1d, 0xe2, 0x84, 0xe1, 0xae, 0x04, 0xaa, 0xf9, 0x26,
+	0xfb, 0x50, 0x77, 0xa1, 0xc2, 0x70, 0xd7, 0x90, 0x8a, 0xf4, 0x3f, 0x6b, 0x10, 0xe3, 0x6b, 0x74,
+	0x04, 0x31, 0xf1, 0x6e, 0xd1, 0xe6, 0x1e, 0x27, 0x52, 0x2b, 0x57, 0x22, 0xde, 0x2e, 0x42, 0xcd,
+	0xd0, 0xff, 0x48, 0xd8, 0xff, 0x75, 0x48, 0xb5, 0x30, 0x6d, 0xfa, 0xc4, 0x13, 0x4d, 0x15, 0x40,
+	0xc3, 0x90, 0xf4, 0xa4, 0x8e, 0x8e, 0xfe, 0x87, 0x08, 0x64, 0x46, 0xe7, 0x1c, 0x6a, 0x04, 0xc9,
+	0x93, 0x6d, 0xf0, 0xe1, 0x8d, 0x27, 0xe6, 0xff, 0x44, 0x02, 0x3f, 0x84, 0xcc, 0xa8, 0x5f, 0xbc,
+	0x67, 0xcf, 0x71, 0x3f, 0x38, 0x91, 0xe7, 0xb8, 0x2f, 0xa0, 0xb2, 0xef, 0xb8, 0x4e, 0xbf, 0x1b,
+	0x8c, 0xce, 0xc1, 0x3a, 0xff, 0x63, 0x0d, 0x12, 0xc1, 0x4d, 0x00, 0xe5, 0xe0, 0x16, 0x7f, 0x2a,
+	0xed, 0xd5, 0x8c, 0xa3, 0xb1, 0x47, 0x55, 0x1a, 0x12, 0x7b, 0x5b, 0x3b, 0xe5, 0xed, 0x5a, 0xed,
+	0x30, 0xab, 0xa1, 0x24, 0xc4, 0x4f, 0xaa, 0x5b, 0x3b, 0x87, 0xd9, 0x88, 0x7c, 0x60, 0x55, 0xcb,
+	0xfb, 0xc6, 0xd6, 0x51, 0x36, 0x8a, 0x96, 0x20, 0x7a, 0x58, 0x39, 0xcc, 0xc6, 0x04, 0xc7, 0xe1,
+	0xc7, 0xf5, 0x72, 0x36, 0x8e, 0x12, 0x10, 0xab, 0x56, 0x8e, 0xcb, 0xd9, 0x45, 0x4e, 0xbc, 0x57,
+	0xd9, 0x2e, 0x1b, 0xd9, 0x25, 0xf4, 0x14, 0xac, 0x6e, 0xed, 0x34, 0x2a, 0xb5, 0xe3, 0x13, 0xb3,
+	0x76, 0x6c, 0xee, 0xd7, 0x6a, 0xfb, 0xd5, 0x72, 0x36, 0xb1, 0x9d, 0x84, 0x25, 0xf5, 0x79, 0x42,
+	0xff, 0x81, 0x06, 0x68, 0xf2, 0xc9, 0x8d, 0x5e, 0x9f, 0x7c, 0xc7, 0x87, 0x0e, 0xf0, 0xd8, 0x83,
+	0x7c, 0x96, 0x0f, 0x07, 0x91, 0xab, 0x3f, 0x1c, 0xe4, 0x19, 0xa4, 0xc3, 0x9f, 0xda, 0xd0, 0x73,
+	0x70, 0xe7, 0x7e, 0x79, 0xfb, 0xa0, 0x56, 0x3b, 0x34, 0x4f, 0x1a, 0x5b, 0x8d, 0xf1, 0xd7, 0xe7,
+	0x1d, 0x78, 0x6a, 0x74, 0xbb, 0x7c, 0xbc, 0xb5, 0x5d, 0x2d, 0xef, 0x66, 0x35, 0xb4, 0x09, 0x2f,
+	0x4d, 0xdd, 0x32, 0xf7, 0x6a, 0x86, 0x79, 0x52, 0xad, 0x35, 0xcc, 0xbd, 0x4a, 0xb5, 0x5a, 0x39,
+	0xde, 0xcf, 0x46, 0xf2, 0x7f, 0xd1, 0x00, 0x71, 0x28, 0x90, 0x8e, 0x50, 0x03, 0x3f, 0xec, 0x61,
+	0xca, 0xd0, 0x6d, 0x58, 0x94, 0x8e, 0xaa, 0x78, 0xd5, 0x8a, 0xdf, 0x90, 0x6c, 0xcb, 0xe9, 0xf4,
+	0xf8, 0x25, 0xa6, 0xe9, 0xb6, 0x82, 0xa8, 0xd2, 0x01, 0x71, 0xc7, 0x6d, 0x61, 0xb4, 0x0f, 0x29,
+	0x15, 0xf8, 0x05, 0xc1, 0x97, 0xa2, 0x29, 0x33, 0xa5, 0x97, 0xae, 0x6f, 0xbc, 0x7b, 0x04, 0x5f,
+	0x1a, 0x40, 0x06, 0xbf, 0xf9, 0x7d, 0xc9, 0xe3, 0x96, 0x28, 0xf9, 0x0c, 0xab, 0x2f, 0x03, 0x09,
+	0x4e, 0x38, 0x21, 0x9f, 0xf1, 0xfc, 0x80, 0xd8, 0x64, 0xee, 0x39, 0x76, 0xd4, 0xab, 0x56, 0xb0,
+	0x37, 0x38, 0x21, 0xff, 0x39, 0xac, 0x8d, 0xc4, 0xa5, 0xee, 0x31, 0xef, 0xc3, 0x92, 0x34, 0x10,
+	0x1c, 0xfb, 0xfc, 0xf5, 0x7e, 0x19, 0x81, 0x08, 0x7a, 0x09, 0x56, 0x1c, 0x7e, 0x0b, 0x0a, 0x19,
+	0x96, 0x09, 0x58, 0xe6, 0xe4, 0xfa, 0xc0, 0xf8, 0xcf, 0x34, 0xc8, 0xee, 0x63, 0x65, 0x3c, 0xc8,
+	0xe9, 0xb4, 0xcf, 0x00, 0xff, 0xd5, 0x7c, 0xe6, 0xff, 0xaa, 0xc1, 0xda, 0x8e, 0x8f, 0x2d, 0x86,
+	0x47, 0x3d, 0x7b, 0x54, 0xb5, 0xef, 0xc2, 0xa2, 0x94, 0x56, 0xe3, 0x7e, 0x96, 0x5c, 0x29, 0x89,
+	0xc9, 0xc8, 0xa2, 0xd7, 0x47, 0x16, 0xbb, 0x71, 0x64, 0xff, 0xd2, 0x60, 0xed, 0xd4, 0x6b, 0x4d,
+	0x44, 0x36, 0x8c, 0x40, 0x7b, 0xfc, 0x08, 0xa6, 0xd5, 0xe6, 0x3d, 0x48, 0xf5, 0x84, 0x5d, 0xf1,
+	0x35, 0x5f, 0x7d, 0x40, 0xd0, 0x27, 0xde, 0xe7, 0x7b, 0x04, 0xdb, 0xad, 0x23, 0x8b, 0x9e, 0x1b,
+	0x20, 0xd9, 0xf9, 0xef, 0x27, 0x17, 0xfe, 0x2b, 0xb0, 0xb6, 0x8b, 0x6d, 0x3c, 0x1e, 0xfd, 0x94,
+	0x8e, 0xcb, 0xff, 0x23, 0x02, 0x77, 0xb6, 0x2d, 0xd6, 0x7c, 0x10, 0x4e, 0xd7, 0xb5, 0xe7, 0x7e,
+	0x13, 0xb2, 0xca, 0xd3, 0x33, 0x2e, 0x6b, 0x0e, 0x2e, 0x2b, 0xfc, 0xb5, 0x28, 0x77, 0xa4, 0x52,
+	0x9f, 0xa0, 0x8f, 0x61, 0x6d, 0x84, 0x97, 0x38, 0x36, 0x71, 0xb0, 0x4a, 0xcd, 0xcb, 0xd7, 0x47,
+	0x27, 0x14, 0xf1, 0x87, 0x74, 0x48, 0x6f, 0x45, 0xe8, 0x98, 0x2c, 0x49, 0xec, 0xfa, 0x92, 0xc4,
+	0x1f, 0xa7, 0x24, 0x8b, 0x37, 0x2d, 0xc9, 0x76, 0x06, 0xd2, 0xe1, 0x2c, 0xe4, 0x3f, 0x01, 0x7d,
+	0x5a, 0xda, 0x9f, 0x04, 0x2c, 0xe5, 0x1f, 0xaa, 0x92, 0x86, 0x7b, 0xe0, 0xda, 0x92, 0x86, 0x4c,
+	0x46, 0xe6, 0x37, 0x79, 0x08, 0xa9, 0x50, 0xb5, 0x1e, 0xcf, 0xff, 0xcd, 0x6f, 0x02, 0x54, 0xc2,
+	0xa8, 0xff, 0x74, 0xe5, 0xb8, 0x51, 0x3e, 0x6e, 0x98, 0xf7, 0x2a, 0xe5, 0xfb, 0x63, 0x63, 0xef,
+	0x16, 0x64, 0xc3, 0x9b, 0x7b, 0xa7, 0xd5, 0x6a, 0x56, 0x2b, 0x7d, 0x95, 0x80, 0x25, 0x15, 0x36,
+	0xfa, 0x85, 0x06, 0xa9, 0x10, 0xf2, 0xa3, 0xc2, 0x55, 0x9e, 0x4c, 0x8e, 0x3e, 0xbd, 0x38, 0x33,
+	0xbf, 0xac, 0x5d, 0xfe, 0xb5, 0xef, 0xff, 0xe9, 0xef, 0x3f, 0x8d, 0xbc, 0x8c, 0x5e, 0x2c, 0x5e,
+	0x94, 0x8a, 0x9f, 0xcb, 0xec, 0x7e, 0xe0, 0xf9, 0xee, 0xf7, 0x70, 0x93, 0xd1, 0xe2, 0x66, 0xd1,
+	0xea, 0x60, 0x87, 0x7d, 0x51, 0x0c, 0x66, 0xc8, 0x4f, 0x34, 0x48, 0x0e, 0x66, 0x03, 0xba, 0xf2,
+	0xaf, 0x33, 0xe3, 0x23, 0x44, 0x9f, 0x21, 0xab, 0x63, 0xee, 0xf0, 0x33, 0x3f, 0xe1, 0x4c, 0xe0,
+	0x4b, 0x71, 0xf3, 0x0b, 0xf4, 0xa5, 0x06, 0xe9, 0xf0, 0x4c, 0x40, 0x57, 0xc6, 0x3f, 0x65, 0x7a,
+	0xcc, 0xe4, 0xd4, 0x5b, 0xc2, 0xa9, 0x62, 0x7e, 0xb6, 0x1c, 0xdd, 0x0d, 0x20, 0xf8, 0x57, 0x1a,
+	0xa4, 0xc3, 0x07, 0xe6, 0x6a, 0xe7, 0xa6, 0x0c, 0x80, 0x99, 0x9c, 0x7b, 0x5f, 0x38, 0xf7, 0x76,
+	0xe9, 0x55, 0xe1, 0x9c, 0xfa, 0xfb, 0xf2, 0x75, 0x89, 0x1b, 0xf8, 0xf8, 0x43, 0x0d, 0xd2, 0xe1,
+	0x83, 0x77, 0xb5, 0x8f, 0x53, 0x60, 0x5a, 0xbf, 0x3d, 0x81, 0x4d, 0xe5, 0xae, 0xc7, 0xfa, 0x41,
+	0x25, 0x37, 0x67, 0xac, 0xe4, 0x6f, 0x34, 0x40, 0x93, 0x10, 0x83, 0xae, 0x7c, 0xde, 0x3e, 0x72,
+	0x12, 0xe8, 0xcf, 0x05, 0x62, 0xa1, 0x3f, 0x7b, 0xf3, 0x27, 0xbb, 0xfc, 0xb3, 0x77, 0x90, 0xb3,
+	0xfc, 0x1b, 0xb3, 0x15, 0xf4, 0x6c, 0x68, 0xe7, 0xae, 0xb6, 0x39, 0x74, 0x75, 0x04, 0xb1, 0x66,
+	0x70, 0x75, 0x1a, 0xc2, 0xfd, 0x27, 0x5c, 0x95, 0x76, 0xee, 0x6a, 0x9b, 0xdb, 0x5f, 0x6a, 0xf0,
+	0x7f, 0x4d, 0xb7, 0x7b, 0x85, 0x67, 0xdb, 0x0a, 0x09, 0xeb, 0xbc, 0x7a, 0x75, 0xed, 0x93, 0x5d,
+	0xc5, 0xda, 0x71, 0xf9, 0x58, 0x2a, 0xb8, 0x7e, 0xa7, 0xd8, 0xc1, 0x8e, 0xa8, 0x6d, 0x51, 0x6e,
+	0x59, 0x1e, 0xa1, 0xd3, 0xfe, 0xf1, 0xe0, 0xbd, 0xe1, 0xea, 0x9f, 0x9a, 0xf6, 0xeb, 0x48, 0x64,
+	0x77, 0xef, 0xb7, 0x11, 0x7d, 0x5f, 0xaa, 0xdb, 0x11, 0x96, 0x77, 0x87, 0x96, 0xef, 0x95, 0xce,
+	0x16, 0x85, 0xd6, 0x37, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x12, 0xed, 0x16, 0x8e, 0x30, 0x21,
+	0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/session.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/session.pb.go
new file mode 100644
index 00000000..a3e60888
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/session.pb.go
@@ -0,0 +1,1506 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2/session.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Audio encoding of the audio content sent in the conversational query request.
+// Refer to the [Cloud Speech API documentation](/speech/docs/basics) for more
+// details.
+type AudioEncoding int32
+
+const (
+	// Not specified.
+	AudioEncoding_AUDIO_ENCODING_UNSPECIFIED AudioEncoding = 0
+	// Uncompressed 16-bit signed little-endian samples (Linear PCM).
+	AudioEncoding_AUDIO_ENCODING_LINEAR_16 AudioEncoding = 1
+	// [`FLAC`](https://xiph.org/flac/documentation.html) (Free Lossless Audio
+	// Codec) is the recommended encoding because it is lossless (therefore
+	// recognition is not compromised) and requires only about half the
+	// bandwidth of `LINEAR16`. `FLAC` stream encoding supports 16-bit and
+	// 24-bit samples, however, not all fields in `STREAMINFO` are supported.
+	AudioEncoding_AUDIO_ENCODING_FLAC AudioEncoding = 2
+	// 8-bit samples that compand 14-bit audio samples using G.711 PCMU/mu-law.
+	AudioEncoding_AUDIO_ENCODING_MULAW AudioEncoding = 3
+	// Adaptive Multi-Rate Narrowband codec. `sample_rate_hertz` must be 8000.
+	AudioEncoding_AUDIO_ENCODING_AMR AudioEncoding = 4
+	// Adaptive Multi-Rate Wideband codec. `sample_rate_hertz` must be 16000.
+	AudioEncoding_AUDIO_ENCODING_AMR_WB AudioEncoding = 5
+	// Opus encoded audio frames in Ogg container
+	// ([OggOpus](https://wiki.xiph.org/OggOpus)).
+	// `sample_rate_hertz` must be 16000.
+	AudioEncoding_AUDIO_ENCODING_OGG_OPUS AudioEncoding = 6
+	// Although the use of lossy encodings is not recommended, if a very low
+	// bitrate encoding is required, `OGG_OPUS` is highly preferred over
+	// Speex encoding. The [Speex](https://speex.org/) encoding supported by
+	// Dialogflow API has a header byte in each block, as in MIME type
+	// `audio/x-speex-with-header-byte`.
+	// It is a variant of the RTP Speex encoding defined in
+	// [RFC 5574](https://tools.ietf.org/html/rfc5574).
+	// The stream is a sequence of blocks, one block per RTP packet. Each block
+	// starts with a byte containing the length of the block, in bytes, followed
+	// by one or more frames of Speex data, padded to an integral number of
+	// bytes (octets) as specified in RFC 5574. In other words, each RTP header
+	// is replaced with a single byte containing the block length. Only Speex
+	// wideband is supported. `sample_rate_hertz` must be 16000.
+	AudioEncoding_AUDIO_ENCODING_SPEEX_WITH_HEADER_BYTE AudioEncoding = 7
+)
+
+var AudioEncoding_name = map[int32]string{
+	0: "AUDIO_ENCODING_UNSPECIFIED",
+	1: "AUDIO_ENCODING_LINEAR_16",
+	2: "AUDIO_ENCODING_FLAC",
+	3: "AUDIO_ENCODING_MULAW",
+	4: "AUDIO_ENCODING_AMR",
+	5: "AUDIO_ENCODING_AMR_WB",
+	6: "AUDIO_ENCODING_OGG_OPUS",
+	7: "AUDIO_ENCODING_SPEEX_WITH_HEADER_BYTE",
+}
+var AudioEncoding_value = map[string]int32{
+	"AUDIO_ENCODING_UNSPECIFIED":            0,
+	"AUDIO_ENCODING_LINEAR_16":              1,
+	"AUDIO_ENCODING_FLAC":                   2,
+	"AUDIO_ENCODING_MULAW":                  3,
+	"AUDIO_ENCODING_AMR":                    4,
+	"AUDIO_ENCODING_AMR_WB":                 5,
+	"AUDIO_ENCODING_OGG_OPUS":               6,
+	"AUDIO_ENCODING_SPEEX_WITH_HEADER_BYTE": 7,
+}
+
+func (x AudioEncoding) String() string {
+	return proto.EnumName(AudioEncoding_name, int32(x))
+}
+func (AudioEncoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{0}
+}
+
+// Type of the response message.
+type StreamingRecognitionResult_MessageType int32
+
+const (
+	// Not specified. Should never be used.
+	StreamingRecognitionResult_MESSAGE_TYPE_UNSPECIFIED StreamingRecognitionResult_MessageType = 0
+	// Message contains a (possibly partial) transcript.
+	StreamingRecognitionResult_TRANSCRIPT StreamingRecognitionResult_MessageType = 1
+	// Event indicates that the server has detected the end of the user's speech
+	// utterance and expects no additional speech. Therefore, the server will
+	// not process additional audio (although it may subsequently return
+	// additional results). The client should stop sending additional audio
+	// data, half-close the gRPC connection, and wait for any additional results
+	// until the server closes the gRPC connection. This message is only sent if
+	// `single_utterance` was set to `true`, and is not used otherwise.
+	StreamingRecognitionResult_END_OF_SINGLE_UTTERANCE StreamingRecognitionResult_MessageType = 2
+)
+
+var StreamingRecognitionResult_MessageType_name = map[int32]string{
+	0: "MESSAGE_TYPE_UNSPECIFIED",
+	1: "TRANSCRIPT",
+	2: "END_OF_SINGLE_UTTERANCE",
+}
+var StreamingRecognitionResult_MessageType_value = map[string]int32{
+	"MESSAGE_TYPE_UNSPECIFIED": 0,
+	"TRANSCRIPT":               1,
+	"END_OF_SINGLE_UTTERANCE":  2,
+}
+
+func (x StreamingRecognitionResult_MessageType) String() string {
+	return proto.EnumName(StreamingRecognitionResult_MessageType_name, int32(x))
+}
+func (StreamingRecognitionResult_MessageType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{7, 0}
+}
+
+// The request to detect user's intent.
+type DetectIntentRequest struct {
+	// Required. The name of the session this query is sent to. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>`. It's up to the API
+	// caller to choose an appropriate session ID. It can be a random number or
+	// some type of user identifier (preferably hashed). The length of the session
+	// ID must not exceed 36 bytes.
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
+	// Optional. The parameters of this query.
+	QueryParams *QueryParameters `protobuf:"bytes,2,opt,name=query_params,json=queryParams,proto3" json:"query_params,omitempty"`
+	// Required. The input specification. It can be set to:
+	//
+	// 1.  an audio config
+	//     which instructs the speech recognizer how to process the speech audio,
+	//
+	// 2.  a conversational query in the form of text, or
+	//
+	// 3.  an event that specifies which intent to trigger.
+	QueryInput *QueryInput `protobuf:"bytes,3,opt,name=query_input,json=queryInput,proto3" json:"query_input,omitempty"`
+	// Optional. The natural language speech audio to be processed. This field
+	// should be populated iff `query_input` is set to an input audio config.
+	// A single request can contain up to 1 minute of speech audio data.
+	InputAudio           []byte   `protobuf:"bytes,5,opt,name=input_audio,json=inputAudio,proto3" json:"input_audio,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DetectIntentRequest) Reset()         { *m = DetectIntentRequest{} }
+func (m *DetectIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*DetectIntentRequest) ProtoMessage()    {}
+func (*DetectIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{0}
+}
+func (m *DetectIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DetectIntentRequest.Unmarshal(m, b)
+}
+func (m *DetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DetectIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *DetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectIntentRequest.Merge(dst, src)
+}
+func (m *DetectIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_DetectIntentRequest.Size(m)
+}
+func (m *DetectIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DetectIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DetectIntentRequest proto.InternalMessageInfo
+
+func (m *DetectIntentRequest) GetSession() string {
+	if m != nil {
+		return m.Session
+	}
+	return ""
+}
+
+func (m *DetectIntentRequest) GetQueryParams() *QueryParameters {
+	if m != nil {
+		return m.QueryParams
+	}
+	return nil
+}
+
+func (m *DetectIntentRequest) GetQueryInput() *QueryInput {
+	if m != nil {
+		return m.QueryInput
+	}
+	return nil
+}
+
+func (m *DetectIntentRequest) GetInputAudio() []byte {
+	if m != nil {
+		return m.InputAudio
+	}
+	return nil
+}
+
+// The message returned from the DetectIntent method.
+type DetectIntentResponse struct {
+	// The unique identifier of the response. It can be used to
+	// locate a response in the training example set or for reporting issues.
+	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId,proto3" json:"response_id,omitempty"`
+	// The results of the conversational query or event processing.
+	QueryResult *QueryResult `protobuf:"bytes,2,opt,name=query_result,json=queryResult,proto3" json:"query_result,omitempty"`
+	// Specifies the status of the webhook request. `webhook_status`
+	// is never populated in webhook requests.
+	WebhookStatus        *status.Status `protobuf:"bytes,3,opt,name=webhook_status,json=webhookStatus,proto3" json:"webhook_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *DetectIntentResponse) Reset()         { *m = DetectIntentResponse{} }
+func (m *DetectIntentResponse) String() string { return proto.CompactTextString(m) }
+func (*DetectIntentResponse) ProtoMessage()    {}
+func (*DetectIntentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{1}
+}
+func (m *DetectIntentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DetectIntentResponse.Unmarshal(m, b)
+}
+func (m *DetectIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DetectIntentResponse.Marshal(b, m, deterministic)
+}
+func (dst *DetectIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectIntentResponse.Merge(dst, src)
+}
+func (m *DetectIntentResponse) XXX_Size() int {
+	return xxx_messageInfo_DetectIntentResponse.Size(m)
+}
+func (m *DetectIntentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DetectIntentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DetectIntentResponse proto.InternalMessageInfo
+
+func (m *DetectIntentResponse) GetResponseId() string {
+	if m != nil {
+		return m.ResponseId
+	}
+	return ""
+}
+
+func (m *DetectIntentResponse) GetQueryResult() *QueryResult {
+	if m != nil {
+		return m.QueryResult
+	}
+	return nil
+}
+
+func (m *DetectIntentResponse) GetWebhookStatus() *status.Status {
+	if m != nil {
+		return m.WebhookStatus
+	}
+	return nil
+}
+
+// Represents the parameters of the conversational query.
+type QueryParameters struct {
+	// Optional. The time zone of this conversational query from the
+	// [time zone database](https://www.iana.org/time-zones), e.g.,
+	// America/New_York, Europe/Paris. If not provided, the time zone specified in
+	// agent settings is used.
+	TimeZone string `protobuf:"bytes,1,opt,name=time_zone,json=timeZone,proto3" json:"time_zone,omitempty"`
+	// Optional. The geo location of this conversational query.
+	GeoLocation *latlng.LatLng `protobuf:"bytes,2,opt,name=geo_location,json=geoLocation,proto3" json:"geo_location,omitempty"`
+	// Optional. The collection of contexts to be activated before this query is
+	// executed.
+	Contexts []*Context `protobuf:"bytes,3,rep,name=contexts,proto3" json:"contexts,omitempty"`
+	// Optional. Specifies whether to delete all contexts in the current session
+	// before the new ones are activated.
+	ResetContexts bool `protobuf:"varint,4,opt,name=reset_contexts,json=resetContexts,proto3" json:"reset_contexts,omitempty"`
+	// Optional. The collection of session entity types to replace or extend
+	// developer entities with for this query only. The entity synonyms apply
+	// to all languages.
+	SessionEntityTypes []*SessionEntityType `protobuf:"bytes,5,rep,name=session_entity_types,json=sessionEntityTypes,proto3" json:"session_entity_types,omitempty"`
+	// Optional. This field can be used to pass custom data into the webhook
+	// associated with the agent. Arbitrary JSON objects are supported.
+	Payload              *_struct.Struct `protobuf:"bytes,6,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *QueryParameters) Reset()         { *m = QueryParameters{} }
+func (m *QueryParameters) String() string { return proto.CompactTextString(m) }
+func (*QueryParameters) ProtoMessage()    {}
+func (*QueryParameters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{2}
+}
+func (m *QueryParameters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryParameters.Unmarshal(m, b)
+}
+func (m *QueryParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryParameters.Marshal(b, m, deterministic)
+}
+func (dst *QueryParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryParameters.Merge(dst, src)
+}
+func (m *QueryParameters) XXX_Size() int {
+	return xxx_messageInfo_QueryParameters.Size(m)
+}
+func (m *QueryParameters) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryParameters.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryParameters proto.InternalMessageInfo
+
+func (m *QueryParameters) GetTimeZone() string {
+	if m != nil {
+		return m.TimeZone
+	}
+	return ""
+}
+
+func (m *QueryParameters) GetGeoLocation() *latlng.LatLng {
+	if m != nil {
+		return m.GeoLocation
+	}
+	return nil
+}
+
+func (m *QueryParameters) GetContexts() []*Context {
+	if m != nil {
+		return m.Contexts
+	}
+	return nil
+}
+
+func (m *QueryParameters) GetResetContexts() bool {
+	if m != nil {
+		return m.ResetContexts
+	}
+	return false
+}
+
+func (m *QueryParameters) GetSessionEntityTypes() []*SessionEntityType {
+	if m != nil {
+		return m.SessionEntityTypes
+	}
+	return nil
+}
+
+func (m *QueryParameters) GetPayload() *_struct.Struct {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+// Represents the query input. It can contain either:
+//
+// 1.  An audio config which
+//     instructs the speech recognizer how to process the speech audio.
+//
+// 2.  A conversational query in the form of text,.
+//
+// 3.  An event that specifies which intent to trigger.
+type QueryInput struct {
+	// Required. The input specification.
+	//
+	// Types that are valid to be assigned to Input:
+	//	*QueryInput_AudioConfig
+	//	*QueryInput_Text
+	//	*QueryInput_Event
+	Input                isQueryInput_Input `protobuf_oneof:"input"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *QueryInput) Reset()         { *m = QueryInput{} }
+func (m *QueryInput) String() string { return proto.CompactTextString(m) }
+func (*QueryInput) ProtoMessage()    {}
+func (*QueryInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{3}
+}
+func (m *QueryInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryInput.Unmarshal(m, b)
+}
+func (m *QueryInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryInput.Marshal(b, m, deterministic)
+}
+func (dst *QueryInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryInput.Merge(dst, src)
+}
+func (m *QueryInput) XXX_Size() int {
+	return xxx_messageInfo_QueryInput.Size(m)
+}
+func (m *QueryInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryInput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryInput proto.InternalMessageInfo
+
+type isQueryInput_Input interface {
+	isQueryInput_Input()
+}
+
+type QueryInput_AudioConfig struct {
+	AudioConfig *InputAudioConfig `protobuf:"bytes,1,opt,name=audio_config,json=audioConfig,proto3,oneof"`
+}
+
+type QueryInput_Text struct {
+	Text *TextInput `protobuf:"bytes,2,opt,name=text,proto3,oneof"`
+}
+
+type QueryInput_Event struct {
+	Event *EventInput `protobuf:"bytes,3,opt,name=event,proto3,oneof"`
+}
+
+func (*QueryInput_AudioConfig) isQueryInput_Input() {}
+
+func (*QueryInput_Text) isQueryInput_Input() {}
+
+func (*QueryInput_Event) isQueryInput_Input() {}
+
+func (m *QueryInput) GetInput() isQueryInput_Input {
+	if m != nil {
+		return m.Input
+	}
+	return nil
+}
+
+func (m *QueryInput) GetAudioConfig() *InputAudioConfig {
+	if x, ok := m.GetInput().(*QueryInput_AudioConfig); ok {
+		return x.AudioConfig
+	}
+	return nil
+}
+
+func (m *QueryInput) GetText() *TextInput {
+	if x, ok := m.GetInput().(*QueryInput_Text); ok {
+		return x.Text
+	}
+	return nil
+}
+
+func (m *QueryInput) GetEvent() *EventInput {
+	if x, ok := m.GetInput().(*QueryInput_Event); ok {
+		return x.Event
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*QueryInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _QueryInput_OneofMarshaler, _QueryInput_OneofUnmarshaler, _QueryInput_OneofSizer, []interface{}{
+		(*QueryInput_AudioConfig)(nil),
+		(*QueryInput_Text)(nil),
+		(*QueryInput_Event)(nil),
+	}
+}
+
+func _QueryInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*QueryInput)
+	// input
+	switch x := m.Input.(type) {
+	case *QueryInput_AudioConfig:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.AudioConfig); err != nil {
+			return err
+		}
+	case *QueryInput_Text:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Text); err != nil {
+			return err
+		}
+	case *QueryInput_Event:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Event); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("QueryInput.Input has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _QueryInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*QueryInput)
+	switch tag {
+	case 1: // input.audio_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InputAudioConfig)
+		err := b.DecodeMessage(msg)
+		m.Input = &QueryInput_AudioConfig{msg}
+		return true, err
+	case 2: // input.text
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TextInput)
+		err := b.DecodeMessage(msg)
+		m.Input = &QueryInput_Text{msg}
+		return true, err
+	case 3: // input.event
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(EventInput)
+		err := b.DecodeMessage(msg)
+		m.Input = &QueryInput_Event{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _QueryInput_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*QueryInput)
+	// input
+	switch x := m.Input.(type) {
+	case *QueryInput_AudioConfig:
+		s := proto.Size(x.AudioConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *QueryInput_Text:
+		s := proto.Size(x.Text)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *QueryInput_Event:
+		s := proto.Size(x.Event)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Represents the result of conversational query or event processing.
+type QueryResult struct {
+	// The original conversational query text:
+	// - If natural language text was provided as input, `query_text` contains
+	//   a copy of the input.
+	// - If natural language speech audio was provided as input, `query_text`
+	//   contains the speech recognition result. If speech recognizer produced
+	//   multiple alternatives, a particular one is picked.
+	// - If an event was provided as input, `query_text` is not set.
+	QueryText string `protobuf:"bytes,1,opt,name=query_text,json=queryText,proto3" json:"query_text,omitempty"`
+	// The language that was triggered during intent detection.
+	// See [Language Support](https://dialogflow.com/docs/reference/language)
+	// for a list of the currently supported language codes.
+	LanguageCode string `protobuf:"bytes,15,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// The Speech recognition confidence between 0.0 and 1.0. A higher number
+	// indicates an estimated greater likelihood that the recognized words are
+	// correct. The default of 0.0 is a sentinel value indicating that confidence
+	// was not set.
+	//
+	// You should not rely on this field as it isn't guaranteed to be accurate, or
+	// even set. In particular this field isn't set in Webhook calls and for
+	// StreamingDetectIntent since the streaming endpoint has separate confidence
+	// estimates per portion of the audio in StreamingRecognitionResult.
+	SpeechRecognitionConfidence float32 `protobuf:"fixed32,2,opt,name=speech_recognition_confidence,json=speechRecognitionConfidence,proto3" json:"speech_recognition_confidence,omitempty"`
+	// The action name from the matched intent.
+	Action string `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"`
+	// The collection of extracted parameters.
+	Parameters *_struct.Struct `protobuf:"bytes,4,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	// This field is set to:
+	// - `false` if the matched intent has required parameters and not all of
+	//    the required parameter values have been collected.
+	// - `true` if all required parameter values have been collected, or if the
+	//    matched intent doesn't contain any required parameters.
+	AllRequiredParamsPresent bool `protobuf:"varint,5,opt,name=all_required_params_present,json=allRequiredParamsPresent,proto3" json:"all_required_params_present,omitempty"`
+	// The text to be pronounced to the user or shown on the screen.
+	FulfillmentText string `protobuf:"bytes,6,opt,name=fulfillment_text,json=fulfillmentText,proto3" json:"fulfillment_text,omitempty"`
+	// The collection of rich messages to present to the user.
+	FulfillmentMessages []*Intent_Message `protobuf:"bytes,7,rep,name=fulfillment_messages,json=fulfillmentMessages,proto3" json:"fulfillment_messages,omitempty"`
+	// If the query was fulfilled by a webhook call, this field is set to the
+	// value of the `source` field returned in the webhook response.
+	WebhookSource string `protobuf:"bytes,8,opt,name=webhook_source,json=webhookSource,proto3" json:"webhook_source,omitempty"`
+	// If the query was fulfilled by a webhook call, this field is set to the
+	// value of the `payload` field returned in the webhook response.
+	WebhookPayload *_struct.Struct `protobuf:"bytes,9,opt,name=webhook_payload,json=webhookPayload,proto3" json:"webhook_payload,omitempty"`
+	// The collection of output contexts. If applicable,
+	// `output_contexts.parameters` contains entries with name
+	// `<parameter name>.original` containing the original parameter values
+	// before the query.
+	OutputContexts []*Context `protobuf:"bytes,10,rep,name=output_contexts,json=outputContexts,proto3" json:"output_contexts,omitempty"`
+	// The intent that matched the conversational query. Some, not
+	// all fields are filled in this message, including but not limited to:
+	// `name`, `display_name` and `webhook_state`.
+	Intent *Intent `protobuf:"bytes,11,opt,name=intent,proto3" json:"intent,omitempty"`
+	// The intent detection confidence. Values range from 0.0
+	// (completely uncertain) to 1.0 (completely certain).
+	IntentDetectionConfidence float32 `protobuf:"fixed32,12,opt,name=intent_detection_confidence,json=intentDetectionConfidence,proto3" json:"intent_detection_confidence,omitempty"`
+	// The free-form diagnostic info. For example, this field
+	// could contain webhook call latency.
+	DiagnosticInfo       *_struct.Struct `protobuf:"bytes,14,opt,name=diagnostic_info,json=diagnosticInfo,proto3" json:"diagnostic_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *QueryResult) Reset()         { *m = QueryResult{} }
+func (m *QueryResult) String() string { return proto.CompactTextString(m) }
+func (*QueryResult) ProtoMessage()    {}
+func (*QueryResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{4}
+}
+func (m *QueryResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryResult.Unmarshal(m, b)
+}
+func (m *QueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryResult.Marshal(b, m, deterministic)
+}
+func (dst *QueryResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResult.Merge(dst, src)
+}
+func (m *QueryResult) XXX_Size() int {
+	return xxx_messageInfo_QueryResult.Size(m)
+}
+func (m *QueryResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryResult proto.InternalMessageInfo
+
+func (m *QueryResult) GetQueryText() string {
+	if m != nil {
+		return m.QueryText
+	}
+	return ""
+}
+
+func (m *QueryResult) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *QueryResult) GetSpeechRecognitionConfidence() float32 {
+	if m != nil {
+		return m.SpeechRecognitionConfidence
+	}
+	return 0
+}
+
+func (m *QueryResult) GetAction() string {
+	if m != nil {
+		return m.Action
+	}
+	return ""
+}
+
+func (m *QueryResult) GetParameters() *_struct.Struct {
+	if m != nil {
+		return m.Parameters
+	}
+	return nil
+}
+
+func (m *QueryResult) GetAllRequiredParamsPresent() bool {
+	if m != nil {
+		return m.AllRequiredParamsPresent
+	}
+	return false
+}
+
+func (m *QueryResult) GetFulfillmentText() string {
+	if m != nil {
+		return m.FulfillmentText
+	}
+	return ""
+}
+
+func (m *QueryResult) GetFulfillmentMessages() []*Intent_Message {
+	if m != nil {
+		return m.FulfillmentMessages
+	}
+	return nil
+}
+
+func (m *QueryResult) GetWebhookSource() string {
+	if m != nil {
+		return m.WebhookSource
+	}
+	return ""
+}
+
+func (m *QueryResult) GetWebhookPayload() *_struct.Struct {
+	if m != nil {
+		return m.WebhookPayload
+	}
+	return nil
+}
+
+func (m *QueryResult) GetOutputContexts() []*Context {
+	if m != nil {
+		return m.OutputContexts
+	}
+	return nil
+}
+
+func (m *QueryResult) GetIntent() *Intent {
+	if m != nil {
+		return m.Intent
+	}
+	return nil
+}
+
+func (m *QueryResult) GetIntentDetectionConfidence() float32 {
+	if m != nil {
+		return m.IntentDetectionConfidence
+	}
+	return 0
+}
+
+func (m *QueryResult) GetDiagnosticInfo() *_struct.Struct {
+	if m != nil {
+		return m.DiagnosticInfo
+	}
+	return nil
+}
+
+// The top-level message sent by the client to the
+// `StreamingDetectIntent` method.
+//
+// Multiple request messages should be sent in order:
+//
+// 1.  The first message must contain `session`, `query_input` plus optionally
+//     `query_params` and/or `single_utterance`. The message must not contain `input_audio`.
+//
+// 2.  If `query_input` was set to a streaming input audio config,
+//     all subsequent messages must contain only `input_audio`.
+//     Otherwise, finish the request stream.
+type StreamingDetectIntentRequest struct {
+	// Required. The name of the session the query is sent to.
+	// Format of the session name:
+	// `projects/<Project ID>/agent/sessions/<Session ID>`. It’s up to the API
+	// caller to choose an appropriate <Session ID>. It can be a random number or
+	// some type of user identifier (preferably hashed). The length of the session
+	// ID must not exceed 36 characters.
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
+	// Optional. The parameters of this query.
+	QueryParams *QueryParameters `protobuf:"bytes,2,opt,name=query_params,json=queryParams,proto3" json:"query_params,omitempty"`
+	// Required. The input specification. It can be set to:
+	//
+	// 1.  an audio config which instructs the speech recognizer how to process
+	//     the speech audio,
+	//
+	// 2.  a conversational query in the form of text, or
+	//
+	// 3.  an event that specifies which intent to trigger.
+	QueryInput *QueryInput `protobuf:"bytes,3,opt,name=query_input,json=queryInput,proto3" json:"query_input,omitempty"`
+	// Optional. If `false` (default), recognition does not cease until the
+	// client closes the stream.
+	// If `true`, the recognizer will detect a single spoken utterance in input
+	// audio. Recognition ceases when it detects the audio's voice has
+	// stopped or paused. In this case, once a detected intent is received, the
+	// client should close the stream and start a new request with a new stream as
+	// needed.
+	// This setting is ignored when `query_input` is a piece of text or an event.
+	SingleUtterance bool `protobuf:"varint,4,opt,name=single_utterance,json=singleUtterance,proto3" json:"single_utterance,omitempty"`
+	// Optional. The input audio content to be recognized. Must be sent if
+	// `query_input` was set to a streaming input audio config. The complete audio
+	// over all streaming messages must not exceed 1 minute.
+	InputAudio           []byte   `protobuf:"bytes,6,opt,name=input_audio,json=inputAudio,proto3" json:"input_audio,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingDetectIntentRequest) Reset()         { *m = StreamingDetectIntentRequest{} }
+func (m *StreamingDetectIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingDetectIntentRequest) ProtoMessage()    {}
+func (*StreamingDetectIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{5}
+}
+func (m *StreamingDetectIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingDetectIntentRequest.Unmarshal(m, b)
+}
+func (m *StreamingDetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingDetectIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingDetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingDetectIntentRequest.Merge(dst, src)
+}
+func (m *StreamingDetectIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingDetectIntentRequest.Size(m)
+}
+func (m *StreamingDetectIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingDetectIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingDetectIntentRequest proto.InternalMessageInfo
+
+func (m *StreamingDetectIntentRequest) GetSession() string {
+	if m != nil {
+		return m.Session
+	}
+	return ""
+}
+
+func (m *StreamingDetectIntentRequest) GetQueryParams() *QueryParameters {
+	if m != nil {
+		return m.QueryParams
+	}
+	return nil
+}
+
+func (m *StreamingDetectIntentRequest) GetQueryInput() *QueryInput {
+	if m != nil {
+		return m.QueryInput
+	}
+	return nil
+}
+
+func (m *StreamingDetectIntentRequest) GetSingleUtterance() bool {
+	if m != nil {
+		return m.SingleUtterance
+	}
+	return false
+}
+
+func (m *StreamingDetectIntentRequest) GetInputAudio() []byte {
+	if m != nil {
+		return m.InputAudio
+	}
+	return nil
+}
+
+// The top-level message returned from the
+// `StreamingDetectIntent` method.
+//
+// Multiple response messages can be returned in order:
+//
+// 1.  If the input was set to streaming audio, the first one or more messages
+//     contain `recognition_result`. Each `recognition_result` represents a more
+//     complete transcript of what the user said. The last `recognition_result`
+//     has `is_final` set to `true`.
+//
+// 2.  The next message contains `response_id`, `query_result`
+//     and optionally `webhook_status` if a WebHook was called.
+type StreamingDetectIntentResponse struct {
+	// The unique identifier of the response. It can be used to
+	// locate a response in the training example set or for reporting issues.
+	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId,proto3" json:"response_id,omitempty"`
+	// The result of speech recognition.
+	RecognitionResult *StreamingRecognitionResult `protobuf:"bytes,2,opt,name=recognition_result,json=recognitionResult,proto3" json:"recognition_result,omitempty"`
+	// The result of the conversational query or event processing.
+	QueryResult *QueryResult `protobuf:"bytes,3,opt,name=query_result,json=queryResult,proto3" json:"query_result,omitempty"`
+	// Specifies the status of the webhook request.
+	WebhookStatus        *status.Status `protobuf:"bytes,4,opt,name=webhook_status,json=webhookStatus,proto3" json:"webhook_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *StreamingDetectIntentResponse) Reset()         { *m = StreamingDetectIntentResponse{} }
+func (m *StreamingDetectIntentResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingDetectIntentResponse) ProtoMessage()    {}
+func (*StreamingDetectIntentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{6}
+}
+func (m *StreamingDetectIntentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingDetectIntentResponse.Unmarshal(m, b)
+}
+func (m *StreamingDetectIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingDetectIntentResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingDetectIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingDetectIntentResponse.Merge(dst, src)
+}
+func (m *StreamingDetectIntentResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingDetectIntentResponse.Size(m)
+}
+func (m *StreamingDetectIntentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingDetectIntentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingDetectIntentResponse proto.InternalMessageInfo
+
+func (m *StreamingDetectIntentResponse) GetResponseId() string {
+	if m != nil {
+		return m.ResponseId
+	}
+	return ""
+}
+
+func (m *StreamingDetectIntentResponse) GetRecognitionResult() *StreamingRecognitionResult {
+	if m != nil {
+		return m.RecognitionResult
+	}
+	return nil
+}
+
+func (m *StreamingDetectIntentResponse) GetQueryResult() *QueryResult {
+	if m != nil {
+		return m.QueryResult
+	}
+	return nil
+}
+
+func (m *StreamingDetectIntentResponse) GetWebhookStatus() *status.Status {
+	if m != nil {
+		return m.WebhookStatus
+	}
+	return nil
+}
+
+// Contains a speech recognition result corresponding to a portion of the audio
+// that is currently being processed or an indication that this is the end
+// of the single requested utterance.
+//
+// Example:
+//
+// 1.  transcript: "tube"
+//
+// 2.  transcript: "to be a"
+//
+// 3.  transcript: "to be"
+//
+// 4.  transcript: "to be or not to be"
+//     is_final: true
+//
+// 5.  transcript: " that's"
+//
+// 6.  transcript: " that is"
+//
+// 7.  recognition_event_type: `RECOGNITION_EVENT_END_OF_SINGLE_UTTERANCE`
+//
+// 8.  transcript: " that is the question"
+//     is_final: true
+//
+// Only two of the responses contain final results (#4 and #8 indicated by
+// `is_final: true`). Concatenating these generates the full transcript: "to be
+// or not to be that is the question".
+//
+// In each response we populate:
+//
+// *  for `MESSAGE_TYPE_TRANSCRIPT`: `transcript` and possibly `is_final`.
+//
+// *  for `MESSAGE_TYPE_END_OF_SINGLE_UTTERANCE`: only `event_type`.
+type StreamingRecognitionResult struct {
+	// Type of the result message.
+	MessageType StreamingRecognitionResult_MessageType `protobuf:"varint,1,opt,name=message_type,json=messageType,proto3,enum=google.cloud.dialogflow.v2.StreamingRecognitionResult_MessageType" json:"message_type,omitempty"`
+	// Transcript text representing the words that the user spoke.
+	// Populated if and only if `event_type` = `RECOGNITION_EVENT_TRANSCRIPT`.
+	Transcript string `protobuf:"bytes,2,opt,name=transcript,proto3" json:"transcript,omitempty"`
+	// The default of 0.0 is a sentinel value indicating `confidence` was not set.
+	// If `false`, the `StreamingRecognitionResult` represents an
+	// interim result that may change. If `true`, the recognizer will not return
+	// any further hypotheses about this piece of the audio. May only be populated
+	// for `event_type` = `RECOGNITION_EVENT_TRANSCRIPT`.
+	IsFinal bool `protobuf:"varint,3,opt,name=is_final,json=isFinal,proto3" json:"is_final,omitempty"`
+	// The Speech confidence between 0.0 and 1.0 for the current portion of audio.
+	// A higher number indicates an estimated greater likelihood that the
+	// recognized words are correct. The default of 0.0 is a sentinel value
+	// indicating that confidence was not set.
+	//
+	// This field is typically only provided if `is_final` is true and you should
+	// not rely on it being accurate or even set.
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingRecognitionResult) Reset()         { *m = StreamingRecognitionResult{} }
+func (m *StreamingRecognitionResult) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognitionResult) ProtoMessage()    {}
+func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{7}
+}
+func (m *StreamingRecognitionResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognitionResult.Unmarshal(m, b)
+}
+func (m *StreamingRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognitionResult.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionResult.Merge(dst, src)
+}
+func (m *StreamingRecognitionResult) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognitionResult.Size(m)
+}
+func (m *StreamingRecognitionResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognitionResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingRecognitionResult proto.InternalMessageInfo
+
+func (m *StreamingRecognitionResult) GetMessageType() StreamingRecognitionResult_MessageType {
+	if m != nil {
+		return m.MessageType
+	}
+	return StreamingRecognitionResult_MESSAGE_TYPE_UNSPECIFIED
+}
+
+func (m *StreamingRecognitionResult) GetTranscript() string {
+	if m != nil {
+		return m.Transcript
+	}
+	return ""
+}
+
+func (m *StreamingRecognitionResult) GetIsFinal() bool {
+	if m != nil {
+		return m.IsFinal
+	}
+	return false
+}
+
+func (m *StreamingRecognitionResult) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Instructs the speech recognizer how to process the audio content.
+type InputAudioConfig struct {
+	// Required. Audio encoding of the audio content to process.
+	AudioEncoding AudioEncoding `protobuf:"varint,1,opt,name=audio_encoding,json=audioEncoding,proto3,enum=google.cloud.dialogflow.v2.AudioEncoding" json:"audio_encoding,omitempty"`
+	// Required. Sample rate (in Hertz) of the audio content sent in the query.
+	// Refer to [Cloud Speech API documentation](/speech/docs/basics) for more
+	// details.
+	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
+	// Required. The language of the supplied audio. Dialogflow does not do
+	// translations. See [Language
+	// Support](https://dialogflow.com/docs/languages) for a list of the
+	// currently supported language codes. Note that queries in the same session
+	// do not necessarily need to specify the same language.
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional. The collection of phrase hints which are used to boost accuracy
+	// of speech recognition.
+	// Refer to [Cloud Speech API documentation](/speech/docs/basics#phrase-hints)
+	// for more details.
+	PhraseHints          []string `protobuf:"bytes,4,rep,name=phrase_hints,json=phraseHints,proto3" json:"phrase_hints,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InputAudioConfig) Reset()         { *m = InputAudioConfig{} }
+func (m *InputAudioConfig) String() string { return proto.CompactTextString(m) }
+func (*InputAudioConfig) ProtoMessage()    {}
+func (*InputAudioConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{8}
+}
+func (m *InputAudioConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InputAudioConfig.Unmarshal(m, b)
+}
+func (m *InputAudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InputAudioConfig.Marshal(b, m, deterministic)
+}
+func (dst *InputAudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputAudioConfig.Merge(dst, src)
+}
+func (m *InputAudioConfig) XXX_Size() int {
+	return xxx_messageInfo_InputAudioConfig.Size(m)
+}
+func (m *InputAudioConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InputAudioConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InputAudioConfig proto.InternalMessageInfo
+
+func (m *InputAudioConfig) GetAudioEncoding() AudioEncoding {
+	if m != nil {
+		return m.AudioEncoding
+	}
+	return AudioEncoding_AUDIO_ENCODING_UNSPECIFIED
+}
+
+func (m *InputAudioConfig) GetSampleRateHertz() int32 {
+	if m != nil {
+		return m.SampleRateHertz
+	}
+	return 0
+}
+
+func (m *InputAudioConfig) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *InputAudioConfig) GetPhraseHints() []string {
+	if m != nil {
+		return m.PhraseHints
+	}
+	return nil
+}
+
+// Represents the natural language text to be processed.
+type TextInput struct {
+	// Required. The UTF-8 encoded natural language text to be processed.
+	// Text length must not exceed 256 bytes.
+	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
+	// Required. The language of this conversational query. See [Language
+	// Support](https://dialogflow.com/docs/languages) for a list of the
+	// currently supported language codes. Note that queries in the same session
+	// do not necessarily need to specify the same language.
+	LanguageCode         string   `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextInput) Reset()         { *m = TextInput{} }
+func (m *TextInput) String() string { return proto.CompactTextString(m) }
+func (*TextInput) ProtoMessage()    {}
+func (*TextInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{9}
+}
+func (m *TextInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextInput.Unmarshal(m, b)
+}
+func (m *TextInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextInput.Marshal(b, m, deterministic)
+}
+func (dst *TextInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextInput.Merge(dst, src)
+}
+func (m *TextInput) XXX_Size() int {
+	return xxx_messageInfo_TextInput.Size(m)
+}
+func (m *TextInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextInput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextInput proto.InternalMessageInfo
+
+func (m *TextInput) GetText() string {
+	if m != nil {
+		return m.Text
+	}
+	return ""
+}
+
+func (m *TextInput) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+// Events allow for matching intents by event name instead of the natural
+// language input. For instance, input `<event: { name: “welcome_event”,
+// parameters: { name: “Sam” } }>` can trigger a personalized welcome response.
+// The parameter `name` may be used by the agent in the response:
+// `“Hello #welcome_event.name! What can I do for you today?”`.
+type EventInput struct {
+	// Required. The unique identifier of the event.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Optional. The collection of parameters associated with the event.
+	Parameters *_struct.Struct `protobuf:"bytes,2,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	// Required. The language of this query. See [Language
+	// Support](https://dialogflow.com/docs/languages) for a list of the
+	// currently supported language codes. Note that queries in the same session
+	// do not necessarily need to specify the same language.
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EventInput) Reset()         { *m = EventInput{} }
+func (m *EventInput) String() string { return proto.CompactTextString(m) }
+func (*EventInput) ProtoMessage()    {}
+func (*EventInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_e51df00932adac70, []int{10}
+}
+func (m *EventInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EventInput.Unmarshal(m, b)
+}
+func (m *EventInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EventInput.Marshal(b, m, deterministic)
+}
+func (dst *EventInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventInput.Merge(dst, src)
+}
+func (m *EventInput) XXX_Size() int {
+	return xxx_messageInfo_EventInput.Size(m)
+}
+func (m *EventInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_EventInput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EventInput proto.InternalMessageInfo
+
+func (m *EventInput) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *EventInput) GetParameters() *_struct.Struct {
+	if m != nil {
+		return m.Parameters
+	}
+	return nil
+}
+
+func (m *EventInput) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*DetectIntentRequest)(nil), "google.cloud.dialogflow.v2.DetectIntentRequest")
+	proto.RegisterType((*DetectIntentResponse)(nil), "google.cloud.dialogflow.v2.DetectIntentResponse")
+	proto.RegisterType((*QueryParameters)(nil), "google.cloud.dialogflow.v2.QueryParameters")
+	proto.RegisterType((*QueryInput)(nil), "google.cloud.dialogflow.v2.QueryInput")
+	proto.RegisterType((*QueryResult)(nil), "google.cloud.dialogflow.v2.QueryResult")
+	proto.RegisterType((*StreamingDetectIntentRequest)(nil), "google.cloud.dialogflow.v2.StreamingDetectIntentRequest")
+	proto.RegisterType((*StreamingDetectIntentResponse)(nil), "google.cloud.dialogflow.v2.StreamingDetectIntentResponse")
+	proto.RegisterType((*StreamingRecognitionResult)(nil), "google.cloud.dialogflow.v2.StreamingRecognitionResult")
+	proto.RegisterType((*InputAudioConfig)(nil), "google.cloud.dialogflow.v2.InputAudioConfig")
+	proto.RegisterType((*TextInput)(nil), "google.cloud.dialogflow.v2.TextInput")
+	proto.RegisterType((*EventInput)(nil), "google.cloud.dialogflow.v2.EventInput")
+	proto.RegisterEnum("google.cloud.dialogflow.v2.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2.StreamingRecognitionResult_MessageType", StreamingRecognitionResult_MessageType_name, StreamingRecognitionResult_MessageType_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// SessionsClient is the client API for Sessions service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type SessionsClient interface {
+	// Processes a natural language query and returns structured, actionable data
+	// as a result. This method is not idempotent, because it may cause contexts
+	// and session entity types to be updated, which in turn might affect
+	// results of future queries.
+	DetectIntent(ctx context.Context, in *DetectIntentRequest, opts ...grpc.CallOption) (*DetectIntentResponse, error)
+	// Processes a natural language query in audio format in a streaming fashion
+	// and returns structured, actionable data as a result. This method is only
+	// available via the gRPC API (not REST).
+	StreamingDetectIntent(ctx context.Context, opts ...grpc.CallOption) (Sessions_StreamingDetectIntentClient, error)
+}
+
+type sessionsClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewSessionsClient(cc *grpc.ClientConn) SessionsClient {
+	return &sessionsClient{cc}
+}
+
+func (c *sessionsClient) DetectIntent(ctx context.Context, in *DetectIntentRequest, opts ...grpc.CallOption) (*DetectIntentResponse, error) {
+	out := new(DetectIntentResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Sessions/DetectIntent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *sessionsClient) StreamingDetectIntent(ctx context.Context, opts ...grpc.CallOption) (Sessions_StreamingDetectIntentClient, error) {
+	stream, err := c.cc.NewStream(ctx, &_Sessions_serviceDesc.Streams[0], "/google.cloud.dialogflow.v2.Sessions/StreamingDetectIntent", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &sessionsStreamingDetectIntentClient{stream}
+	return x, nil
+}
+
+type Sessions_StreamingDetectIntentClient interface {
+	Send(*StreamingDetectIntentRequest) error
+	Recv() (*StreamingDetectIntentResponse, error)
+	grpc.ClientStream
+}
+
+type sessionsStreamingDetectIntentClient struct {
+	grpc.ClientStream
+}
+
+func (x *sessionsStreamingDetectIntentClient) Send(m *StreamingDetectIntentRequest) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *sessionsStreamingDetectIntentClient) Recv() (*StreamingDetectIntentResponse, error) {
+	m := new(StreamingDetectIntentResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// SessionsServer is the server API for Sessions service.
+type SessionsServer interface {
+	// Processes a natural language query and returns structured, actionable data
+	// as a result. This method is not idempotent, because it may cause contexts
+	// and session entity types to be updated, which in turn might affect
+	// results of future queries.
+	DetectIntent(context.Context, *DetectIntentRequest) (*DetectIntentResponse, error)
+	// Processes a natural language query in audio format in a streaming fashion
+	// and returns structured, actionable data as a result. This method is only
+	// available via the gRPC API (not REST).
+	StreamingDetectIntent(Sessions_StreamingDetectIntentServer) error
+}
+
+func RegisterSessionsServer(s *grpc.Server, srv SessionsServer) {
+	s.RegisterService(&_Sessions_serviceDesc, srv)
+}
+
+func _Sessions_DetectIntent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DetectIntentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SessionsServer).DetectIntent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.Sessions/DetectIntent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SessionsServer).DetectIntent(ctx, req.(*DetectIntentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Sessions_StreamingDetectIntent_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(SessionsServer).StreamingDetectIntent(&sessionsStreamingDetectIntentServer{stream})
+}
+
+type Sessions_StreamingDetectIntentServer interface {
+	Send(*StreamingDetectIntentResponse) error
+	Recv() (*StreamingDetectIntentRequest, error)
+	grpc.ServerStream
+}
+
+type sessionsStreamingDetectIntentServer struct {
+	grpc.ServerStream
+}
+
+func (x *sessionsStreamingDetectIntentServer) Send(m *StreamingDetectIntentResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func (x *sessionsStreamingDetectIntentServer) Recv() (*StreamingDetectIntentRequest, error) {
+	m := new(StreamingDetectIntentRequest)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+var _Sessions_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.dialogflow.v2.Sessions",
+	HandlerType: (*SessionsServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "DetectIntent",
+			Handler:    _Sessions_DetectIntent_Handler,
+		},
+	},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "StreamingDetectIntent",
+			Handler:       _Sessions_StreamingDetectIntent_Handler,
+			ServerStreams: true,
+			ClientStreams: true,
+		},
+	},
+	Metadata: "google/cloud/dialogflow/v2/session.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/session.proto", fileDescriptor_session_e51df00932adac70)
+}
+
+var fileDescriptor_session_e51df00932adac70 = []byte{
+	// 1575 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x4f, 0x73, 0x1b, 0x49,
+	0x15, 0xcf, 0xc8, 0xff, 0xe4, 0x27, 0xd9, 0xd2, 0x76, 0xb2, 0x9b, 0x89, 0x9d, 0x84, 0xa0, 0xad,
+	0xb0, 0x8a, 0x01, 0x69, 0x57, 0x50, 0x81, 0x4d, 0x6a, 0x97, 0x95, 0xa5, 0xb1, 0x2d, 0x4a, 0x96,
+	0xb5, 0x2d, 0x99, 0xec, 0x6e, 0x15, 0xd5, 0xd5, 0x19, 0xb5, 0xc6, 0x03, 0xa3, 0xee, 0xf1, 0x74,
+	0x2b, 0xbb, 0x5e, 0x0a, 0x0e, 0x7c, 0x02, 0xaa, 0x38, 0x52, 0x5c, 0x28, 0x4e, 0x1c, 0x38, 0x71,
+	0xe0, 0xc4, 0x97, 0x80, 0x03, 0x67, 0x0a, 0x0e, 0x7c, 0x03, 0xaa, 0xb8, 0x50, 0xd3, 0x3d, 0x23,
+	0x29, 0xb2, 0x23, 0xab, 0x52, 0x9c, 0xf6, 0x36, 0xfd, 0xfa, 0xf7, 0x5e, 0xbf, 0xf7, 0xe6, 0xd7,
+	0xef, 0x37, 0x03, 0x65, 0x4f, 0x08, 0x2f, 0x60, 0x55, 0x37, 0x10, 0xe3, 0x41, 0x75, 0xe0, 0xd3,
+	0x40, 0x78, 0xc3, 0x40, 0x7c, 0x5e, 0x7d, 0x51, 0xab, 0x4a, 0x26, 0xa5, 0x2f, 0x78, 0x25, 0x8c,
+	0x84, 0x12, 0x68, 0xc7, 0x20, 0x2b, 0x1a, 0x59, 0x99, 0x22, 0x2b, 0x2f, 0x6a, 0x3b, 0x77, 0x93,
+	0x28, 0x34, 0xf4, 0xab, 0x94, 0x73, 0xa1, 0xa8, 0xf2, 0x05, 0x97, 0xc6, 0x73, 0x67, 0xd1, 0x19,
+	0xae, 0xe0, 0x8a, 0x7d, 0xa1, 0x12, 0xe4, 0x3b, 0x0b, 0x90, 0x3e, 0x57, 0x8c, 0xa7, 0xc0, 0xef,
+	0x5e, 0x9f, 0x36, 0x61, 0x5c, 0xf9, 0xea, 0x82, 0xa8, 0x8b, 0x90, 0x25, 0x5e, 0x69, 0x9a, 0x7a,
+	0xf5, 0x7c, 0x3c, 0xac, 0x4a, 0x15, 0x8d, 0xdd, 0x34, 0xe6, 0xed, 0x64, 0x37, 0x0a, 0xdd, 0xaa,
+	0x54, 0x54, 0x8d, 0xd3, 0xfc, 0xed, 0x64, 0x23, 0x8e, 0x54, 0x0d, 0xa8, 0x0a, 0xb8, 0x67, 0x76,
+	0x4a, 0xff, 0xb6, 0xe0, 0x66, 0x93, 0x29, 0xe6, 0xaa, 0x96, 0xce, 0x0e, 0xb3, 0xf3, 0x31, 0x93,
+	0x0a, 0xd9, 0xb0, 0x91, 0x64, 0x61, 0x5b, 0x0f, 0xac, 0xf2, 0x26, 0x4e, 0x97, 0xa8, 0x03, 0xf9,
+	0xf3, 0x31, 0x8b, 0x2e, 0x48, 0x48, 0x23, 0x3a, 0x92, 0x76, 0xe6, 0x81, 0x55, 0xce, 0xd5, 0xbe,
+	0x59, 0x79, 0x75, 0x73, 0x2b, 0x1f, 0xc7, 0xf8, 0x6e, 0x0c, 0x67, 0x8a, 0x45, 0x12, 0xe7, 0xce,
+	0x27, 0x06, 0x89, 0x0e, 0xc1, 0x2c, 0x89, 0xcf, 0xc3, 0xb1, 0xb2, 0x57, 0x74, 0xb8, 0x6f, 0x5c,
+	0x1b, 0xae, 0x15, 0xa3, 0x31, 0x9c, 0x4f, 0x9e, 0xd1, 0xd7, 0x20, 0xa7, 0x43, 0x10, 0x3a, 0x1e,
+	0xf8, 0xc2, 0x5e, 0x7b, 0x60, 0x95, 0xf3, 0x18, 0xb4, 0xa9, 0x1e, 0x5b, 0x4a, 0x7f, 0xb1, 0xe0,
+	0xd6, 0xcb, 0xb5, 0xca, 0x50, 0x70, 0xc9, 0x62, 0xcf, 0x28, 0x79, 0x26, 0xfe, 0x20, 0x29, 0x18,
+	0x52, 0x53, 0x6b, 0x80, 0x7e, 0x98, 0xd6, 0x1c, 0x31, 0x39, 0x0e, 0x54, 0x52, 0xf3, 0x3b, 0xd7,
+	0x26, 0x89, 0x35, 0x3c, 0xa9, 0xd7, 0x2c, 0xd0, 0xfb, 0xb0, 0xfd, 0x39, 0x7b, 0x7e, 0x26, 0xc4,
+	0x4f, 0x89, 0x79, 0x47, 0x49, 0xc9, 0x28, 0x8d, 0x16, 0x85, 0x6e, 0xa5, 0xa7, 0x77, 0xf0, 0x56,
+	0x82, 0x34, 0xcb, 0xd2, 0x3f, 0x32, 0x50, 0x98, 0xeb, 0x25, 0xda, 0x85, 0x4d, 0xe5, 0x8f, 0x18,
+	0xf9, 0x52, 0x70, 0x96, 0x64, 0x9e, 0x8d, 0x0d, 0x9f, 0x09, 0xce, 0xd0, 0x63, 0xc8, 0x7b, 0x4c,
+	0x90, 0x40, 0xb8, 0x9a, 0xce, 0x49, 0xde, 0x37, 0xd3, 0x93, 0x34, 0xb1, 0xda, 0x54, 0xb5, 0xb9,
+	0x87, 0x73, 0x1e, 0x13, 0xed, 0x04, 0x87, 0x7e, 0x00, 0xd9, 0x84, 0xd6, 0x71, 0x76, 0x2b, 0xe5,
+	0x5c, 0xed, 0xed, 0x45, 0xb5, 0x36, 0x0c, 0x16, 0x4f, 0x9c, 0xd0, 0x43, 0xd8, 0x8e, 0x98, 0x64,
+	0x8a, 0x4c, 0xc2, 0xac, 0x3e, 0xb0, 0xca, 0x59, 0xbc, 0xa5, 0xad, 0x8d, 0x14, 0x46, 0xe0, 0xd6,
+	0x15, 0x5c, 0x97, 0xf6, 0x9a, 0x3e, 0xf3, 0xdb, 0x8b, 0xce, 0xec, 0x19, 0x3f, 0x47, 0xbb, 0xf5,
+	0x2f, 0x42, 0x86, 0x91, 0x9c, 0x37, 0x49, 0xf4, 0x1e, 0x6c, 0x84, 0xf4, 0x22, 0x10, 0x74, 0x60,
+	0xaf, 0xeb, 0xda, 0x6f, 0xa7, 0x31, 0xd3, 0x1b, 0x54, 0xe9, 0xe9, 0x1b, 0x84, 0x53, 0x5c, 0xe9,
+	0x5f, 0x16, 0xc0, 0x94, 0x61, 0xe8, 0x63, 0xc8, 0x6b, 0x3e, 0xc5, 0x95, 0x0c, 0x7d, 0x4f, 0xb7,
+	0x38, 0x57, 0xfb, 0xd6, 0xa2, 0xd4, 0x5a, 0x13, 0xca, 0x35, 0xb4, 0xcf, 0xd1, 0x0d, 0x9c, 0xa3,
+	0xd3, 0x25, 0x7a, 0x0a, 0xab, 0x71, 0xf9, 0xc9, 0xdb, 0x78, 0xb8, 0x28, 0x54, 0x9f, 0x7d, 0xa1,
+	0x74, 0xb8, 0xa3, 0x1b, 0x58, 0x3b, 0xa1, 0x0f, 0x61, 0x8d, 0xbd, 0x60, 0x7c, 0xa9, 0x8b, 0xe2,
+	0xc4, 0xc0, 0xd4, 0xdd, 0xb8, 0xed, 0x6f, 0xc0, 0x9a, 0xbe, 0x12, 0xa5, 0xdf, 0xaf, 0x43, 0x6e,
+	0x86, 0xa4, 0xe8, 0x1e, 0x98, 0xcb, 0x44, 0x74, 0x6e, 0x86, 0x49, 0x9b, 0xda, 0x12, 0x27, 0x81,
+	0xde, 0x86, 0xad, 0x80, 0x72, 0x6f, 0x4c, 0x3d, 0x46, 0x5c, 0x31, 0x60, 0x76, 0x41, 0x23, 0xf2,
+	0xa9, 0xb1, 0x21, 0x06, 0x0c, 0xed, 0xc3, 0x3d, 0x19, 0x32, 0xe6, 0x9e, 0x91, 0x88, 0xb9, 0xc2,
+	0xe3, 0x7e, 0xcc, 0x26, 0xd3, 0xb9, 0x01, 0xe3, 0x2e, 0xd3, 0x25, 0x67, 0xf0, 0xae, 0x01, 0xe1,
+	0x29, 0xa6, 0x31, 0x81, 0xa0, 0xb7, 0x60, 0x9d, 0xba, 0x9a, 0xad, 0x2b, 0xfa, 0x84, 0x64, 0x85,
+	0xbe, 0x07, 0x10, 0x4e, 0x68, 0xaf, 0xe9, 0xb4, 0xe0, 0x6d, 0xce, 0x40, 0xd1, 0x07, 0xb0, 0x4b,
+	0x83, 0x80, 0x44, 0xec, 0x7c, 0xec, 0x47, 0x6c, 0x90, 0xcc, 0x2d, 0x12, 0xc6, 0x54, 0xe4, 0x4a,
+	0xcf, 0x89, 0x2c, 0xb6, 0x69, 0x10, 0xe0, 0x04, 0x61, 0x06, 0x53, 0xd7, 0xec, 0xa3, 0x47, 0x50,
+	0x1c, 0x8e, 0x83, 0xa1, 0x1f, 0x04, 0x23, 0xc6, 0x95, 0xe9, 0xce, 0xba, 0xce, 0xac, 0x30, 0x63,
+	0xd7, 0x3d, 0xfa, 0x31, 0xdc, 0x9a, 0x85, 0x8e, 0x98, 0x94, 0xd4, 0x63, 0xd2, 0xde, 0xd0, 0x74,
+	0xde, 0x5b, 0xcc, 0x19, 0xad, 0x0d, 0xc7, 0xc6, 0x05, 0xdf, 0x9c, 0x89, 0x93, 0xd8, 0xf4, 0xa5,
+	0x9a, 0x4c, 0x0e, 0x31, 0x8e, 0x5c, 0x66, 0x67, 0x75, 0x1e, 0x93, 0x29, 0xa1, 0x8d, 0xe8, 0x23,
+	0x28, 0xa4, 0xb0, 0x94, 0xfb, 0x9b, 0x8b, 0xbb, 0x95, 0x86, 0xed, 0x1a, 0x38, 0x6a, 0x43, 0x41,
+	0x8c, 0x55, 0x3c, 0x4a, 0x27, 0xd7, 0x17, 0x96, 0x9f, 0x02, 0xdb, 0xc6, 0x77, 0x72, 0xc9, 0x9f,
+	0xc0, 0xba, 0x51, 0x3e, 0x3b, 0xa7, 0xd3, 0x28, 0x5d, 0xdf, 0x07, 0x9c, 0x78, 0xa0, 0x0f, 0x61,
+	0xd7, 0x3c, 0x91, 0x81, 0x1e, 0xdc, 0x73, 0x74, 0xca, 0x6b, 0x3a, 0xdd, 0x31, 0x90, 0x66, 0x8a,
+	0x98, 0x21, 0xd3, 0x47, 0x50, 0x18, 0xf8, 0xd4, 0xe3, 0x42, 0x2a, 0xdf, 0x25, 0x3e, 0x1f, 0x0a,
+	0x7b, 0xfb, 0x9a, 0x5e, 0x4c, 0xf1, 0x2d, 0x3e, 0x14, 0xa5, 0xdf, 0x66, 0xe0, 0x6e, 0x4f, 0x45,
+	0x8c, 0x8e, 0x7c, 0xee, 0x7d, 0x45, 0x94, 0xf2, 0x11, 0x14, 0xa5, 0xcf, 0xbd, 0x80, 0x91, 0xb1,
+	0x52, 0x2c, 0xa2, 0x71, 0x2b, 0xcd, 0x7c, 0x2e, 0x18, 0xfb, 0x69, 0x6a, 0x9e, 0x17, 0xd5, 0xf5,
+	0x4b, 0xa2, 0xfa, 0xc7, 0x0c, 0xdc, 0x7b, 0x45, 0x7f, 0x96, 0x55, 0x57, 0x06, 0x68, 0x76, 0x5c,
+	0xbc, 0xa4, 0xb1, 0x8f, 0x17, 0x6a, 0x40, 0x7a, 0xee, 0xcc, 0x24, 0x49, 0x24, 0xf7, 0x8d, 0x68,
+	0xde, 0x74, 0x49, 0xc4, 0x57, 0xfe, 0xaf, 0x22, 0xbe, 0xba, 0xac, 0x88, 0xff, 0x39, 0x03, 0x3b,
+	0xaf, 0x4e, 0x1c, 0x31, 0xc8, 0x27, 0x73, 0x43, 0x6b, 0xa1, 0x6e, 0xd7, 0x76, 0x6d, 0xff, 0xf5,
+	0xda, 0x90, 0xce, 0x13, 0xad, 0x8f, 0xb9, 0xd1, 0x74, 0x81, 0xee, 0x03, 0xa8, 0x88, 0x72, 0xe9,
+	0x46, 0x7e, 0x68, 0x7a, 0xbd, 0x89, 0x67, 0x2c, 0xe8, 0x0e, 0x64, 0x7d, 0x49, 0x86, 0x3e, 0xa7,
+	0x81, 0x6e, 0x54, 0x16, 0x6f, 0xf8, 0xf2, 0x20, 0x5e, 0xc6, 0xae, 0x33, 0x57, 0x70, 0x55, 0x5f,
+	0xc1, 0x19, 0x4b, 0xe9, 0x13, 0xc8, 0xcd, 0x1c, 0x8b, 0xee, 0x82, 0x7d, 0xec, 0xf4, 0x7a, 0xf5,
+	0x43, 0x87, 0xf4, 0x3f, 0xed, 0x3a, 0xe4, 0xb4, 0xd3, 0xeb, 0x3a, 0x8d, 0xd6, 0x41, 0xcb, 0x69,
+	0x16, 0x6f, 0xa0, 0x6d, 0x80, 0x3e, 0xae, 0x77, 0x7a, 0x0d, 0xdc, 0xea, 0xf6, 0x8b, 0x16, 0xda,
+	0x85, 0xdb, 0x4e, 0xa7, 0x49, 0x4e, 0x0e, 0x48, 0xaf, 0xd5, 0x39, 0x6c, 0x3b, 0xe4, 0xb4, 0xdf,
+	0x77, 0x70, 0xbd, 0xd3, 0x70, 0x8a, 0x99, 0xd2, 0xdf, 0x2d, 0x28, 0xce, 0x8b, 0x2b, 0xea, 0xc2,
+	0xb6, 0x11, 0x68, 0xc6, 0x5d, 0x31, 0xf0, 0xb9, 0x97, 0xb4, 0xec, 0xd1, 0xa2, 0x96, 0xe9, 0x00,
+	0x4e, 0xe2, 0x80, 0xb7, 0xe8, 0xec, 0x12, 0xed, 0xc1, 0x1b, 0x92, 0x8e, 0xc2, 0x80, 0x91, 0x88,
+	0x2a, 0x46, 0xce, 0x58, 0xa4, 0xbe, 0xd4, 0x2d, 0x5a, 0xc3, 0x05, 0xb3, 0x81, 0xa9, 0x62, 0x47,
+	0xb1, 0xf9, 0xb2, 0x2c, 0xae, 0x5c, 0x21, 0x8b, 0x5f, 0x87, 0x7c, 0x78, 0x16, 0x51, 0xc9, 0xc8,
+	0x99, 0xcf, 0xf5, 0xb7, 0xd0, 0x4a, 0x79, 0x13, 0xe7, 0x8c, 0xed, 0x28, 0x36, 0x95, 0x9a, 0xb0,
+	0x39, 0xd1, 0x7a, 0x84, 0x92, 0x0f, 0x04, 0x73, 0x55, 0x8c, 0xee, 0x5f, 0x3a, 0x28, 0x73, 0xf9,
+	0xa0, 0xd2, 0x2f, 0x00, 0xa6, 0x9a, 0x1f, 0x87, 0xe1, 0x74, 0x94, 0x7e, 0x15, 0xea, 0xe7, 0x39,
+	0x15, 0xcd, 0x2c, 0xaf, 0xa2, 0xcb, 0x14, 0xba, 0xf7, 0x5f, 0x0b, 0xb6, 0x5e, 0x6a, 0x2d, 0xba,
+	0x0f, 0x3b, 0xf5, 0xd3, 0x66, 0xeb, 0x84, 0x38, 0x9d, 0xc6, 0x49, 0xb3, 0xd5, 0x39, 0x9c, 0x7b,
+	0xff, 0x77, 0xc1, 0x9e, 0xdb, 0x6f, 0xb7, 0x3a, 0x4e, 0x1d, 0x93, 0xf7, 0x1e, 0x17, 0x2d, 0x74,
+	0x1b, 0x6e, 0xce, 0xed, 0x1e, 0xb4, 0xeb, 0x8d, 0x62, 0x06, 0xd9, 0x70, 0x6b, 0x6e, 0xe3, 0xf8,
+	0xb4, 0x5d, 0x7f, 0x56, 0x5c, 0x41, 0x6f, 0x01, 0x9a, 0xdb, 0xa9, 0x1f, 0xe3, 0xe2, 0x2a, 0xba,
+	0x03, 0x6f, 0x5e, 0xb6, 0x93, 0x67, 0xfb, 0xc5, 0xb5, 0x98, 0x73, 0x73, 0x5b, 0x27, 0x87, 0x87,
+	0xe4, 0xa4, 0x7b, 0xda, 0x2b, 0xae, 0xa3, 0x47, 0xf0, 0x70, 0x6e, 0xb3, 0xd7, 0x75, 0x9c, 0x4f,
+	0xc8, 0xb3, 0x56, 0xff, 0x88, 0x1c, 0x39, 0xf5, 0xa6, 0x83, 0xc9, 0xfe, 0xa7, 0x7d, 0xa7, 0xb8,
+	0x51, 0xfb, 0x5b, 0x06, 0xb2, 0xc9, 0x67, 0xa9, 0x44, 0x7f, 0xb2, 0x20, 0x3f, 0x3b, 0x0e, 0x51,
+	0x75, 0x11, 0x1f, 0xaf, 0x10, 0x96, 0x9d, 0x77, 0x97, 0x77, 0x30, 0xa3, 0xb4, 0x54, 0xff, 0xe5,
+	0x5f, 0xff, 0xf9, 0xeb, 0xcc, 0xd3, 0xd2, 0xe3, 0xf8, 0x27, 0xf2, 0x67, 0x89, 0x0c, 0x7d, 0x10,
+	0x46, 0xe2, 0x27, 0xcc, 0x55, 0xb2, 0xba, 0x57, 0xa5, 0x1e, 0xe3, 0x2a, 0xfd, 0xbd, 0x94, 0xd5,
+	0xbd, 0x9f, 0x3f, 0x19, 0xcc, 0xc4, 0x79, 0x62, 0xed, 0xa1, 0x5f, 0x59, 0xf0, 0xe6, 0x95, 0xe3,
+	0x1c, 0x7d, 0x7f, 0xa9, 0x11, 0x74, 0x55, 0x21, 0xef, 0xbf, 0x86, 0xa7, 0xa9, 0xa8, 0x6c, 0xbd,
+	0x6b, 0xed, 0xff, 0xc6, 0x82, 0xfb, 0xae, 0x18, 0x2d, 0x08, 0xb2, 0x9f, 0x4f, 0xda, 0xde, 0x8d,
+	0x09, 0xdc, 0xb5, 0x3e, 0x6b, 0x26, 0x58, 0x4f, 0xc4, 0xf4, 0xac, 0x88, 0xc8, 0xab, 0x7a, 0x8c,
+	0x6b, 0x7a, 0x57, 0xcd, 0x16, 0x0d, 0x7d, 0x79, 0xd5, 0xbf, 0xf7, 0xd3, 0xe9, 0xea, 0x3f, 0x96,
+	0xf5, 0xbb, 0x4c, 0xa6, 0x79, 0xf0, 0x87, 0xcc, 0xce, 0xa1, 0x09, 0xd7, 0xd0, 0x47, 0x37, 0xa7,
+	0x47, 0xff, 0xa8, 0xf6, 0x7c, 0x5d, 0x47, 0xfd, 0xce, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe8,
+	0xf3, 0x64, 0x26, 0x87, 0x10, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go
new file mode 100644
index 00000000..b8f86d29
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/session_entity_type.pb.go
@@ -0,0 +1,710 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2/session_entity_type.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The types of modifications for a session entity type.
+type SessionEntityType_EntityOverrideMode int32
+
+const (
+	// Not specified. This value should be never used.
+	SessionEntityType_ENTITY_OVERRIDE_MODE_UNSPECIFIED SessionEntityType_EntityOverrideMode = 0
+	// The collection of session entities overrides the collection of entities
+	// in the corresponding developer entity type.
+	SessionEntityType_ENTITY_OVERRIDE_MODE_OVERRIDE SessionEntityType_EntityOverrideMode = 1
+	// The collection of session entities extends the collection of entities in
+	// the corresponding developer entity type.
+	// Calls to `ListSessionEntityTypes`, `GetSessionEntityType`,
+	// `CreateSessionEntityType` and `UpdateSessionEntityType` return the full
+	// collection of entities from the developer entity type in the agent's
+	// default language and the session entity type.
+	SessionEntityType_ENTITY_OVERRIDE_MODE_SUPPLEMENT SessionEntityType_EntityOverrideMode = 2
+)
+
+var SessionEntityType_EntityOverrideMode_name = map[int32]string{
+	0: "ENTITY_OVERRIDE_MODE_UNSPECIFIED",
+	1: "ENTITY_OVERRIDE_MODE_OVERRIDE",
+	2: "ENTITY_OVERRIDE_MODE_SUPPLEMENT",
+}
+var SessionEntityType_EntityOverrideMode_value = map[string]int32{
+	"ENTITY_OVERRIDE_MODE_UNSPECIFIED": 0,
+	"ENTITY_OVERRIDE_MODE_OVERRIDE":    1,
+	"ENTITY_OVERRIDE_MODE_SUPPLEMENT":  2,
+}
+
+func (x SessionEntityType_EntityOverrideMode) String() string {
+	return proto.EnumName(SessionEntityType_EntityOverrideMode_name, int32(x))
+}
+func (SessionEntityType_EntityOverrideMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_f014f04ccf41506d, []int{0, 0}
+}
+
+// Represents a session entity type.
+//
+// Extends or replaces a developer entity type at the user session level (we
+// refer to the entity types defined at the agent level as "developer entity
+// types").
+//
+// Note: session entity types apply to all queries, regardless of the language.
+type SessionEntityType struct {
+	// Required. The unique identifier of this session entity type. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
+	// Display Name>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. Indicates whether the additional data should override or
+	// supplement the developer entity type definition.
+	EntityOverrideMode SessionEntityType_EntityOverrideMode `protobuf:"varint,2,opt,name=entity_override_mode,json=entityOverrideMode,proto3,enum=google.cloud.dialogflow.v2.SessionEntityType_EntityOverrideMode" json:"entity_override_mode,omitempty"`
+	// Required. The collection of entities associated with this session entity
+	// type.
+	Entities             []*EntityType_Entity `protobuf:"bytes,3,rep,name=entities,proto3" json:"entities,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *SessionEntityType) Reset()         { *m = SessionEntityType{} }
+func (m *SessionEntityType) String() string { return proto.CompactTextString(m) }
+func (*SessionEntityType) ProtoMessage()    {}
+func (*SessionEntityType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_f014f04ccf41506d, []int{0}
+}
+func (m *SessionEntityType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SessionEntityType.Unmarshal(m, b)
+}
+func (m *SessionEntityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SessionEntityType.Marshal(b, m, deterministic)
+}
+func (dst *SessionEntityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SessionEntityType.Merge(dst, src)
+}
+func (m *SessionEntityType) XXX_Size() int {
+	return xxx_messageInfo_SessionEntityType.Size(m)
+}
+func (m *SessionEntityType) XXX_DiscardUnknown() {
+	xxx_messageInfo_SessionEntityType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SessionEntityType proto.InternalMessageInfo
+
+func (m *SessionEntityType) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *SessionEntityType) GetEntityOverrideMode() SessionEntityType_EntityOverrideMode {
+	if m != nil {
+		return m.EntityOverrideMode
+	}
+	return SessionEntityType_ENTITY_OVERRIDE_MODE_UNSPECIFIED
+}
+
+func (m *SessionEntityType) GetEntities() []*EntityType_Entity {
+	if m != nil {
+		return m.Entities
+	}
+	return nil
+}
+
+// The request message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
+type ListSessionEntityTypesRequest struct {
+	// Required. The session to list all session entity types from.
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The maximum number of items to return in a single page. By
+	// default 100 and at most 1000.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional. The next_page_token value returned from a previous list request.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSessionEntityTypesRequest) Reset()         { *m = ListSessionEntityTypesRequest{} }
+func (m *ListSessionEntityTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSessionEntityTypesRequest) ProtoMessage()    {}
+func (*ListSessionEntityTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_f014f04ccf41506d, []int{1}
+}
+func (m *ListSessionEntityTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSessionEntityTypesRequest.Unmarshal(m, b)
+}
+func (m *ListSessionEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSessionEntityTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSessionEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionEntityTypesRequest.Merge(dst, src)
+}
+func (m *ListSessionEntityTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSessionEntityTypesRequest.Size(m)
+}
+func (m *ListSessionEntityTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSessionEntityTypesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSessionEntityTypesRequest proto.InternalMessageInfo
+
+func (m *ListSessionEntityTypesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListSessionEntityTypesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListSessionEntityTypesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// The response message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityTypes.ListSessionEntityTypes].
+type ListSessionEntityTypesResponse struct {
+	// The list of session entity types. There will be a maximum number of items
+	// returned based on the page_size field in the request.
+	SessionEntityTypes []*SessionEntityType `protobuf:"bytes,1,rep,name=session_entity_types,json=sessionEntityTypes,proto3" json:"session_entity_types,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSessionEntityTypesResponse) Reset()         { *m = ListSessionEntityTypesResponse{} }
+func (m *ListSessionEntityTypesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSessionEntityTypesResponse) ProtoMessage()    {}
+func (*ListSessionEntityTypesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_f014f04ccf41506d, []int{2}
+}
+func (m *ListSessionEntityTypesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSessionEntityTypesResponse.Unmarshal(m, b)
+}
+func (m *ListSessionEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSessionEntityTypesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSessionEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionEntityTypesResponse.Merge(dst, src)
+}
+func (m *ListSessionEntityTypesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSessionEntityTypesResponse.Size(m)
+}
+func (m *ListSessionEntityTypesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSessionEntityTypesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSessionEntityTypesResponse proto.InternalMessageInfo
+
+func (m *ListSessionEntityTypesResponse) GetSessionEntityTypes() []*SessionEntityType {
+	if m != nil {
+		return m.SessionEntityTypes
+	}
+	return nil
+}
+
+func (m *ListSessionEntityTypesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The request message for [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.GetSessionEntityType].
+type GetSessionEntityTypeRequest struct {
+	// Required. The name of the session entity type. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
+	// Display Name>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSessionEntityTypeRequest) Reset()         { *m = GetSessionEntityTypeRequest{} }
+func (m *GetSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSessionEntityTypeRequest) ProtoMessage()    {}
+func (*GetSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_f014f04ccf41506d, []int{3}
+}
+func (m *GetSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSessionEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *GetSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSessionEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSessionEntityTypeRequest.Merge(dst, src)
+}
+func (m *GetSessionEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSessionEntityTypeRequest.Size(m)
+}
+func (m *GetSessionEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSessionEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetSessionEntityTypeRequest proto.InternalMessageInfo
+
+func (m *GetSessionEntityTypeRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The request message for [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.CreateSessionEntityType].
+type CreateSessionEntityTypeRequest struct {
+	// Required. The session to create a session entity type for.
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The session entity type to create.
+	SessionEntityType    *SessionEntityType `protobuf:"bytes,2,opt,name=session_entity_type,json=sessionEntityType,proto3" json:"session_entity_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *CreateSessionEntityTypeRequest) Reset()         { *m = CreateSessionEntityTypeRequest{} }
+func (m *CreateSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateSessionEntityTypeRequest) ProtoMessage()    {}
+func (*CreateSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_f014f04ccf41506d, []int{4}
+}
+func (m *CreateSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateSessionEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *CreateSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateSessionEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSessionEntityTypeRequest.Merge(dst, src)
+}
+func (m *CreateSessionEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateSessionEntityTypeRequest.Size(m)
+}
+func (m *CreateSessionEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateSessionEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateSessionEntityTypeRequest proto.InternalMessageInfo
+
+func (m *CreateSessionEntityTypeRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateSessionEntityTypeRequest) GetSessionEntityType() *SessionEntityType {
+	if m != nil {
+		return m.SessionEntityType
+	}
+	return nil
+}
+
+// The request message for [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.UpdateSessionEntityType].
+type UpdateSessionEntityTypeRequest struct {
+	// Required. The entity type to update. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
+	// Display Name>`.
+	SessionEntityType *SessionEntityType `protobuf:"bytes,1,opt,name=session_entity_type,json=sessionEntityType,proto3" json:"session_entity_type,omitempty"`
+	// Optional. The mask to control which fields get updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateSessionEntityTypeRequest) Reset()         { *m = UpdateSessionEntityTypeRequest{} }
+func (m *UpdateSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateSessionEntityTypeRequest) ProtoMessage()    {}
+func (*UpdateSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_f014f04ccf41506d, []int{5}
+}
+func (m *UpdateSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *UpdateSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSessionEntityTypeRequest.Merge(dst, src)
+}
+func (m *UpdateSessionEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Size(m)
+}
+func (m *UpdateSessionEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateSessionEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateSessionEntityTypeRequest proto.InternalMessageInfo
+
+func (m *UpdateSessionEntityTypeRequest) GetSessionEntityType() *SessionEntityType {
+	if m != nil {
+		return m.SessionEntityType
+	}
+	return nil
+}
+
+func (m *UpdateSessionEntityTypeRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// The request message for [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2.SessionEntityTypes.DeleteSessionEntityType].
+type DeleteSessionEntityTypeRequest struct {
+	// Required. The name of the entity type to delete. Format:
+	// `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
+	// Display Name>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSessionEntityTypeRequest) Reset()         { *m = DeleteSessionEntityTypeRequest{} }
+func (m *DeleteSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSessionEntityTypeRequest) ProtoMessage()    {}
+func (*DeleteSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_f014f04ccf41506d, []int{6}
+}
+func (m *DeleteSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *DeleteSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSessionEntityTypeRequest.Merge(dst, src)
+}
+func (m *DeleteSessionEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Size(m)
+}
+func (m *DeleteSessionEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSessionEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteSessionEntityTypeRequest proto.InternalMessageInfo
+
+func (m *DeleteSessionEntityTypeRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*SessionEntityType)(nil), "google.cloud.dialogflow.v2.SessionEntityType")
+	proto.RegisterType((*ListSessionEntityTypesRequest)(nil), "google.cloud.dialogflow.v2.ListSessionEntityTypesRequest")
+	proto.RegisterType((*ListSessionEntityTypesResponse)(nil), "google.cloud.dialogflow.v2.ListSessionEntityTypesResponse")
+	proto.RegisterType((*GetSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.GetSessionEntityTypeRequest")
+	proto.RegisterType((*CreateSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest")
+	proto.RegisterType((*UpdateSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest")
+	proto.RegisterType((*DeleteSessionEntityTypeRequest)(nil), "google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest")
+	proto.RegisterEnum("google.cloud.dialogflow.v2.SessionEntityType_EntityOverrideMode", SessionEntityType_EntityOverrideMode_name, SessionEntityType_EntityOverrideMode_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// SessionEntityTypesClient is the client API for SessionEntityTypes service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type SessionEntityTypesClient interface {
+	// Returns the list of all session entity types in the specified session.
+	ListSessionEntityTypes(ctx context.Context, in *ListSessionEntityTypesRequest, opts ...grpc.CallOption) (*ListSessionEntityTypesResponse, error)
+	// Retrieves the specified session entity type.
+	GetSessionEntityType(ctx context.Context, in *GetSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error)
+	// Creates a session entity type.
+	CreateSessionEntityType(ctx context.Context, in *CreateSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error)
+	// Updates the specified session entity type.
+	UpdateSessionEntityType(ctx context.Context, in *UpdateSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error)
+	// Deletes the specified session entity type.
+	DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+}
+
+type sessionEntityTypesClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewSessionEntityTypesClient(cc *grpc.ClientConn) SessionEntityTypesClient {
+	return &sessionEntityTypesClient{cc}
+}
+
+func (c *sessionEntityTypesClient) ListSessionEntityTypes(ctx context.Context, in *ListSessionEntityTypesRequest, opts ...grpc.CallOption) (*ListSessionEntityTypesResponse, error) {
+	out := new(ListSessionEntityTypesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.SessionEntityTypes/ListSessionEntityTypes", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *sessionEntityTypesClient) GetSessionEntityType(ctx context.Context, in *GetSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error) {
+	out := new(SessionEntityType)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.SessionEntityTypes/GetSessionEntityType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *sessionEntityTypesClient) CreateSessionEntityType(ctx context.Context, in *CreateSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error) {
+	out := new(SessionEntityType)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *sessionEntityTypesClient) UpdateSessionEntityType(ctx context.Context, in *UpdateSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error) {
+	out := new(SessionEntityType)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *sessionEntityTypesClient) DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// SessionEntityTypesServer is the server API for SessionEntityTypes service.
+type SessionEntityTypesServer interface {
+	// Returns the list of all session entity types in the specified session.
+	ListSessionEntityTypes(context.Context, *ListSessionEntityTypesRequest) (*ListSessionEntityTypesResponse, error)
+	// Retrieves the specified session entity type.
+	GetSessionEntityType(context.Context, *GetSessionEntityTypeRequest) (*SessionEntityType, error)
+	// Creates a session entity type.
+	CreateSessionEntityType(context.Context, *CreateSessionEntityTypeRequest) (*SessionEntityType, error)
+	// Updates the specified session entity type.
+	UpdateSessionEntityType(context.Context, *UpdateSessionEntityTypeRequest) (*SessionEntityType, error)
+	// Deletes the specified session entity type.
+	DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*empty.Empty, error)
+}
+
+func RegisterSessionEntityTypesServer(s *grpc.Server, srv SessionEntityTypesServer) {
+	s.RegisterService(&_SessionEntityTypes_serviceDesc, srv)
+}
+
+func _SessionEntityTypes_ListSessionEntityTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListSessionEntityTypesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SessionEntityTypesServer).ListSessionEntityTypes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.SessionEntityTypes/ListSessionEntityTypes",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SessionEntityTypesServer).ListSessionEntityTypes(ctx, req.(*ListSessionEntityTypesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _SessionEntityTypes_GetSessionEntityType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetSessionEntityTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SessionEntityTypesServer).GetSessionEntityType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.SessionEntityTypes/GetSessionEntityType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SessionEntityTypesServer).GetSessionEntityType(ctx, req.(*GetSessionEntityTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _SessionEntityTypes_CreateSessionEntityType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateSessionEntityTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SessionEntityTypesServer).CreateSessionEntityType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SessionEntityTypesServer).CreateSessionEntityType(ctx, req.(*CreateSessionEntityTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _SessionEntityTypes_UpdateSessionEntityType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateSessionEntityTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SessionEntityTypesServer).UpdateSessionEntityType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SessionEntityTypesServer).UpdateSessionEntityType(ctx, req.(*UpdateSessionEntityTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _SessionEntityTypes_DeleteSessionEntityType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteSessionEntityTypeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SessionEntityTypesServer).DeleteSessionEntityType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SessionEntityTypesServer).DeleteSessionEntityType(ctx, req.(*DeleteSessionEntityTypeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _SessionEntityTypes_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.dialogflow.v2.SessionEntityTypes",
+	HandlerType: (*SessionEntityTypesServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListSessionEntityTypes",
+			Handler:    _SessionEntityTypes_ListSessionEntityTypes_Handler,
+		},
+		{
+			MethodName: "GetSessionEntityType",
+			Handler:    _SessionEntityTypes_GetSessionEntityType_Handler,
+		},
+		{
+			MethodName: "CreateSessionEntityType",
+			Handler:    _SessionEntityTypes_CreateSessionEntityType_Handler,
+		},
+		{
+			MethodName: "UpdateSessionEntityType",
+			Handler:    _SessionEntityTypes_UpdateSessionEntityType_Handler,
+		},
+		{
+			MethodName: "DeleteSessionEntityType",
+			Handler:    _SessionEntityTypes_DeleteSessionEntityType_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/dialogflow/v2/session_entity_type.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/session_entity_type.proto", fileDescriptor_session_entity_type_f014f04ccf41506d)
+}
+
+var fileDescriptor_session_entity_type_f014f04ccf41506d = []byte{
+	// 793 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x4e, 0xd4, 0x4a,
+	0x18, 0x3f, 0x53, 0xce, 0x21, 0x30, 0xe4, 0x9c, 0x03, 0x73, 0xc8, 0xb2, 0x29, 0x87, 0x75, 0xad,
+	0xc6, 0x90, 0x8d, 0xb6, 0x71, 0x25, 0x1a, 0x41, 0x13, 0x03, 0x5b, 0x70, 0x23, 0x0b, 0x6b, 0x77,
+	0x21, 0xd1, 0xc4, 0x34, 0x85, 0xfd, 0x68, 0x2a, 0xbb, 0x9d, 0xda, 0xe9, 0xa2, 0x8b, 0xe1, 0x86,
+	0x57, 0xf0, 0xc2, 0x78, 0x6b, 0xe2, 0x85, 0xfa, 0x0a, 0xbc, 0x82, 0x57, 0x5e, 0xf8, 0x02, 0xde,
+	0xf1, 0x02, 0x5e, 0x9a, 0x4e, 0xbb, 0x40, 0x68, 0x3b, 0x66, 0x89, 0x77, 0xf3, 0xe7, 0xfb, 0xf3,
+	0xfb, 0x7d, 0xf3, 0xfb, 0xbe, 0x0c, 0x9e, 0xb3, 0x29, 0xb5, 0xdb, 0xa0, 0x6d, 0xb7, 0x69, 0xb7,
+	0xa5, 0xb5, 0x1c, 0xab, 0x4d, 0xed, 0x9d, 0x36, 0x7d, 0xa9, 0xed, 0x95, 0x35, 0x06, 0x8c, 0x39,
+	0xd4, 0x35, 0xc1, 0x0d, 0x9c, 0xa0, 0x67, 0x06, 0x3d, 0x0f, 0x54, 0xcf, 0xa7, 0x01, 0x25, 0x72,
+	0xe4, 0xa5, 0x72, 0x2f, 0xf5, 0xd4, 0x4b, 0xdd, 0x2b, 0xcb, 0xff, 0xc7, 0x11, 0x2d, 0xcf, 0xd1,
+	0x2c, 0xd7, 0xa5, 0x81, 0x15, 0x38, 0xd4, 0x65, 0x91, 0xa7, 0x7c, 0x5d, 0x90, 0x2f, 0x91, 0x47,
+	0x9e, 0x8e, 0xad, 0xf9, 0x6e, 0xab, 0xbb, 0xa3, 0x41, 0xc7, 0x0b, 0x7a, 0xf1, 0x65, 0xf1, 0xfc,
+	0xe5, 0x8e, 0x03, 0xed, 0x96, 0xd9, 0xb1, 0xd8, 0x6e, 0x64, 0xa1, 0x1c, 0x4b, 0x78, 0xa2, 0x11,
+	0x91, 0xd0, 0x79, 0xec, 0x66, 0xcf, 0x03, 0x42, 0xf0, 0x9f, 0xae, 0xd5, 0x81, 0x3c, 0x2a, 0xa2,
+	0xd9, 0x51, 0x83, 0xaf, 0x89, 0x8f, 0x27, 0xe3, 0xec, 0x74, 0x0f, 0x7c, 0xdf, 0x69, 0x81, 0xd9,
+	0xa1, 0x2d, 0xc8, 0x4b, 0x45, 0x34, 0xfb, 0x4f, 0xf9, 0x81, 0x9a, 0xcd, 0x57, 0x4d, 0x24, 0x50,
+	0xa3, 0xe5, 0x7a, 0x1c, 0xa8, 0x46, 0x5b, 0x60, 0x10, 0x48, 0x9c, 0x91, 0x2a, 0x1e, 0xe1, 0xa7,
+	0x0e, 0xb0, 0xfc, 0x50, 0x71, 0x68, 0x76, 0xac, 0x7c, 0x43, 0x94, 0x27, 0x91, 0xc0, 0x38, 0x71,
+	0x57, 0x0e, 0x11, 0x26, 0xc9, 0xac, 0xe4, 0x2a, 0x2e, 0xea, 0x6b, 0xcd, 0x6a, 0xf3, 0x89, 0xb9,
+	0xbe, 0xa9, 0x1b, 0x46, 0xb5, 0xa2, 0x9b, 0xb5, 0xf5, 0x8a, 0x6e, 0x6e, 0xac, 0x35, 0xea, 0xfa,
+	0x52, 0x75, 0xb9, 0xaa, 0x57, 0xc6, 0xff, 0x20, 0x97, 0xf1, 0x4c, 0xaa, 0x55, 0x7f, 0x37, 0x8e,
+	0xc8, 0x15, 0x7c, 0x29, 0xd5, 0xa4, 0xb1, 0x51, 0xaf, 0xaf, 0xea, 0x35, 0x7d, 0xad, 0x39, 0x2e,
+	0x29, 0x0c, 0xcf, 0xac, 0x3a, 0x2c, 0x48, 0xd4, 0x83, 0x19, 0xf0, 0xa2, 0x0b, 0x2c, 0x20, 0x39,
+	0x3c, 0xec, 0x59, 0x3e, 0xb8, 0x41, 0x5c, 0xfa, 0x78, 0x47, 0xa6, 0xf1, 0xa8, 0x67, 0xd9, 0x60,
+	0x32, 0x67, 0x3f, 0xaa, 0xf8, 0x5f, 0xc6, 0x48, 0x78, 0xd0, 0x70, 0xf6, 0x81, 0xcc, 0x60, 0xcc,
+	0x2f, 0x03, 0xba, 0x0b, 0x6e, 0x7e, 0x88, 0x3b, 0x72, 0xf3, 0x66, 0x78, 0xa0, 0x7c, 0x44, 0xb8,
+	0x90, 0x95, 0x95, 0x79, 0xd4, 0x65, 0x40, 0x4c, 0x3c, 0x99, 0xa2, 0x64, 0x96, 0x47, 0xbf, 0xae,
+	0x79, 0x22, 0xaa, 0x41, 0x58, 0x22, 0x11, 0xb9, 0x86, 0xff, 0x75, 0xe1, 0x55, 0x60, 0x9e, 0xc1,
+	0x29, 0x71, 0x9c, 0x7f, 0x87, 0xc7, 0xf5, 0x13, 0xac, 0x37, 0xf1, 0xf4, 0x0a, 0x24, 0x91, 0xf6,
+	0xcb, 0x93, 0xa2, 0x4b, 0xe5, 0x2d, 0xc2, 0x85, 0x25, 0x1f, 0xac, 0x00, 0x32, 0xdd, 0xb2, 0xaa,
+	0xfa, 0x0c, 0xff, 0x97, 0x42, 0x9b, 0x23, 0x1b, 0x98, 0xf5, 0x44, 0x82, 0xb5, 0x72, 0x84, 0x70,
+	0x61, 0xc3, 0x6b, 0x89, 0x90, 0x65, 0x20, 0x40, 0xbf, 0x07, 0x01, 0x59, 0xc0, 0x63, 0x5d, 0x0e,
+	0x80, 0xb7, 0x7c, 0x4c, 0x4c, 0xee, 0x87, 0xed, 0x4f, 0x05, 0x75, 0x39, 0x9c, 0x0a, 0x35, 0x8b,
+	0xed, 0x1a, 0x38, 0x32, 0x0f, 0xd7, 0xca, 0x1c, 0x2e, 0x54, 0xa0, 0x0d, 0x02, 0xf4, 0x29, 0xcf,
+	0x51, 0x7e, 0x37, 0x82, 0x49, 0x52, 0x69, 0xe4, 0x0b, 0xc2, 0xb9, 0x74, 0x11, 0x92, 0xbb, 0x22,
+	0x9a, 0xc2, 0x76, 0x91, 0xe7, 0x2f, 0xe2, 0x1a, 0x69, 0x5e, 0xb9, 0x77, 0xf8, 0xf5, 0xfb, 0x1b,
+	0xe9, 0x36, 0x99, 0x0b, 0xe7, 0xea, 0xeb, 0x48, 0x11, 0xf7, 0x3d, 0x9f, 0x3e, 0x87, 0xed, 0x80,
+	0x69, 0x25, 0xcd, 0xb2, 0xc1, 0x0d, 0xfa, 0x03, 0x9e, 0x69, 0xa5, 0x83, 0x78, 0xf8, 0x46, 0xa0,
+	0x8f, 0x10, 0x9e, 0x4c, 0x53, 0x2a, 0xb9, 0x23, 0x82, 0x24, 0xd0, 0xb6, 0x3c, 0xd8, 0x6b, 0x9f,
+	0x83, 0x1f, 0x96, 0x5e, 0x04, 0xfe, 0x2c, 0x76, 0xad, 0x74, 0x40, 0xbe, 0x21, 0x3c, 0x95, 0xd1,
+	0x34, 0x44, 0x58, 0x54, 0x71, 0xa7, 0x0d, 0x4a, 0xe2, 0x31, 0x27, 0xf1, 0x48, 0xb9, 0xd0, 0x1b,
+	0xcc, 0xa7, 0xb5, 0x0e, 0x39, 0x46, 0x78, 0x2a, 0xa3, 0xe9, 0xc4, 0xcc, 0xc4, 0x9d, 0x3a, 0x28,
+	0x33, 0xe0, 0xcc, 0xcc, 0xf2, 0x43, 0xce, 0x2c, 0xed, 0x9b, 0x30, 0xe0, 0x93, 0xa5, 0xb3, 0xfd,
+	0x8c, 0xf0, 0x54, 0x46, 0x93, 0x8a, 0xd9, 0x8a, 0x3b, 0x5b, 0xce, 0x25, 0x66, 0x84, 0x1e, 0x7e,
+	0x2b, 0xfa, 0xaa, 0x2b, 0x5d, 0x48, 0x75, 0x8b, 0x1f, 0x10, 0x2e, 0x6c, 0xd3, 0x8e, 0x00, 0xd7,
+	0x62, 0x2e, 0x01, 0xa9, 0x1e, 0x22, 0xa8, 0xa3, 0xa7, 0x95, 0xd8, 0xcb, 0xa6, 0x6d, 0xcb, 0xb5,
+	0x55, 0xea, 0xdb, 0x9a, 0x0d, 0x2e, 0xc7, 0xa7, 0x45, 0x57, 0x96, 0xe7, 0xb0, 0xb4, 0x5f, 0xd3,
+	0xc2, 0xe9, 0xee, 0x07, 0x42, 0xef, 0x25, 0xa9, 0xb2, 0xfc, 0x49, 0x92, 0x57, 0xa2, 0x70, 0x4b,
+	0x1c, 0x44, 0xe5, 0x14, 0xc4, 0x66, 0x79, 0x6b, 0x98, 0x47, 0xbd, 0xf5, 0x33, 0x00, 0x00, 0xff,
+	0xff, 0x3d, 0x82, 0x36, 0x5e, 0xfa, 0x09, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/webhook.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/webhook.pb.go
new file mode 100644
index 00000000..a71eef36
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2/webhook.pb.go
@@ -0,0 +1,304 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2/webhook.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The request message for a webhook call.
+type WebhookRequest struct {
+	// The unique identifier of detectIntent request session.
+	// Can be used to identify end-user inside webhook implementation.
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
+	Session string `protobuf:"bytes,4,opt,name=session,proto3" json:"session,omitempty"`
+	// The unique identifier of the response. Contains the same value as
+	// `[Streaming]DetectIntentResponse.response_id`.
+	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId,proto3" json:"response_id,omitempty"`
+	// The result of the conversational query or event processing. Contains the
+	// same value as `[Streaming]DetectIntentResponse.query_result`.
+	QueryResult *QueryResult `protobuf:"bytes,2,opt,name=query_result,json=queryResult,proto3" json:"query_result,omitempty"`
+	// Optional. The contents of the original request that was passed to
+	// `[Streaming]DetectIntent` call.
+	OriginalDetectIntentRequest *OriginalDetectIntentRequest `protobuf:"bytes,3,opt,name=original_detect_intent_request,json=originalDetectIntentRequest,proto3" json:"original_detect_intent_request,omitempty"`
+	XXX_NoUnkeyedLiteral        struct{}                     `json:"-"`
+	XXX_unrecognized            []byte                       `json:"-"`
+	XXX_sizecache               int32                        `json:"-"`
+}
+
+func (m *WebhookRequest) Reset()         { *m = WebhookRequest{} }
+func (m *WebhookRequest) String() string { return proto.CompactTextString(m) }
+func (*WebhookRequest) ProtoMessage()    {}
+func (*WebhookRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_webhook_d01678681840ffff, []int{0}
+}
+func (m *WebhookRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebhookRequest.Unmarshal(m, b)
+}
+func (m *WebhookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebhookRequest.Marshal(b, m, deterministic)
+}
+func (dst *WebhookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebhookRequest.Merge(dst, src)
+}
+func (m *WebhookRequest) XXX_Size() int {
+	return xxx_messageInfo_WebhookRequest.Size(m)
+}
+func (m *WebhookRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebhookRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebhookRequest proto.InternalMessageInfo
+
+func (m *WebhookRequest) GetSession() string {
+	if m != nil {
+		return m.Session
+	}
+	return ""
+}
+
+func (m *WebhookRequest) GetResponseId() string {
+	if m != nil {
+		return m.ResponseId
+	}
+	return ""
+}
+
+func (m *WebhookRequest) GetQueryResult() *QueryResult {
+	if m != nil {
+		return m.QueryResult
+	}
+	return nil
+}
+
+func (m *WebhookRequest) GetOriginalDetectIntentRequest() *OriginalDetectIntentRequest {
+	if m != nil {
+		return m.OriginalDetectIntentRequest
+	}
+	return nil
+}
+
+// The response message for a webhook call.
+type WebhookResponse struct {
+	// Optional. The text to be shown on the screen. This value is passed directly
+	// to `QueryResult.fulfillment_text`.
+	FulfillmentText string `protobuf:"bytes,1,opt,name=fulfillment_text,json=fulfillmentText,proto3" json:"fulfillment_text,omitempty"`
+	// Optional. The collection of rich messages to present to the user. This
+	// value is passed directly to `QueryResult.fulfillment_messages`.
+	FulfillmentMessages []*Intent_Message `protobuf:"bytes,2,rep,name=fulfillment_messages,json=fulfillmentMessages,proto3" json:"fulfillment_messages,omitempty"`
+	// Optional. This value is passed directly to `QueryResult.webhook_source`.
+	Source string `protobuf:"bytes,3,opt,name=source,proto3" json:"source,omitempty"`
+	// Optional. This value is passed directly to `QueryResult.webhook_payload`.
+	// See the related `fulfillment_messages[i].payload field`, which may be used
+	// as an alternative to this field.
+	//
+	// This field can be used for Actions on Google responses.
+	// It should have a structure similar to the JSON message shown here. For more
+	// information, see
+	// [Actions on Google Webhook
+	// Format](https://developers.google.com/actions/dialogflow/webhook)
+	// <pre>{
+	//   "google": {
+	//     "expectUserResponse": true,
+	//     "richResponse": {
+	//       "items": [
+	//         {
+	//           "simpleResponse": {
+	//             "textToSpeech": "this is a simple response"
+	//           }
+	//         }
+	//       ]
+	//     }
+	//   }
+	// }</pre>
+	Payload *_struct.Struct `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
+	// Optional. The collection of output contexts. This value is passed directly
+	// to `QueryResult.output_contexts`.
+	OutputContexts []*Context `protobuf:"bytes,5,rep,name=output_contexts,json=outputContexts,proto3" json:"output_contexts,omitempty"`
+	// Optional. Makes the platform immediately invoke another `DetectIntent` call
+	// internally with the specified event as input.
+	FollowupEventInput   *EventInput `protobuf:"bytes,6,opt,name=followup_event_input,json=followupEventInput,proto3" json:"followup_event_input,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *WebhookResponse) Reset()         { *m = WebhookResponse{} }
+func (m *WebhookResponse) String() string { return proto.CompactTextString(m) }
+func (*WebhookResponse) ProtoMessage()    {}
+func (*WebhookResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_webhook_d01678681840ffff, []int{1}
+}
+func (m *WebhookResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebhookResponse.Unmarshal(m, b)
+}
+func (m *WebhookResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebhookResponse.Marshal(b, m, deterministic)
+}
+func (dst *WebhookResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebhookResponse.Merge(dst, src)
+}
+func (m *WebhookResponse) XXX_Size() int {
+	return xxx_messageInfo_WebhookResponse.Size(m)
+}
+func (m *WebhookResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebhookResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebhookResponse proto.InternalMessageInfo
+
+func (m *WebhookResponse) GetFulfillmentText() string {
+	if m != nil {
+		return m.FulfillmentText
+	}
+	return ""
+}
+
+func (m *WebhookResponse) GetFulfillmentMessages() []*Intent_Message {
+	if m != nil {
+		return m.FulfillmentMessages
+	}
+	return nil
+}
+
+func (m *WebhookResponse) GetSource() string {
+	if m != nil {
+		return m.Source
+	}
+	return ""
+}
+
+func (m *WebhookResponse) GetPayload() *_struct.Struct {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (m *WebhookResponse) GetOutputContexts() []*Context {
+	if m != nil {
+		return m.OutputContexts
+	}
+	return nil
+}
+
+func (m *WebhookResponse) GetFollowupEventInput() *EventInput {
+	if m != nil {
+		return m.FollowupEventInput
+	}
+	return nil
+}
+
+// Represents the contents of the original request that was passed to
+// the `[Streaming]DetectIntent` call.
+type OriginalDetectIntentRequest struct {
+	// The source of this request, e.g., `google`, `facebook`, `slack`. It is set
+	// by Dialogflow-owned servers.
+	Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"`
+	// Optional. This field is set to the value of `QueryParameters.payload` field
+	// passed in the request.
+	Payload              *_struct.Struct `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *OriginalDetectIntentRequest) Reset()         { *m = OriginalDetectIntentRequest{} }
+func (m *OriginalDetectIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*OriginalDetectIntentRequest) ProtoMessage()    {}
+func (*OriginalDetectIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_webhook_d01678681840ffff, []int{2}
+}
+func (m *OriginalDetectIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OriginalDetectIntentRequest.Unmarshal(m, b)
+}
+func (m *OriginalDetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OriginalDetectIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *OriginalDetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OriginalDetectIntentRequest.Merge(dst, src)
+}
+func (m *OriginalDetectIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_OriginalDetectIntentRequest.Size(m)
+}
+func (m *OriginalDetectIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_OriginalDetectIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OriginalDetectIntentRequest proto.InternalMessageInfo
+
+func (m *OriginalDetectIntentRequest) GetSource() string {
+	if m != nil {
+		return m.Source
+	}
+	return ""
+}
+
+func (m *OriginalDetectIntentRequest) GetPayload() *_struct.Struct {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*WebhookRequest)(nil), "google.cloud.dialogflow.v2.WebhookRequest")
+	proto.RegisterType((*WebhookResponse)(nil), "google.cloud.dialogflow.v2.WebhookResponse")
+	proto.RegisterType((*OriginalDetectIntentRequest)(nil), "google.cloud.dialogflow.v2.OriginalDetectIntentRequest")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2/webhook.proto", fileDescriptor_webhook_d01678681840ffff)
+}
+
+var fileDescriptor_webhook_d01678681840ffff = []byte{
+	// 536 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xc1, 0x6f, 0xd3, 0x30,
+	0x14, 0xc6, 0x95, 0x14, 0x3a, 0xcd, 0x9d, 0x56, 0x64, 0x26, 0x88, 0x3a, 0x34, 0xaa, 0x22, 0xb1,
+	0xc2, 0x21, 0x11, 0xe1, 0xc0, 0x81, 0xdb, 0x56, 0x40, 0x45, 0x20, 0x46, 0x40, 0x80, 0x90, 0x50,
+	0x94, 0x26, 0x6e, 0x66, 0xe1, 0xfa, 0xa5, 0xb1, 0xdd, 0x6e, 0x12, 0x7f, 0x03, 0x37, 0x4e, 0xdc,
+	0x38, 0xf2, 0x17, 0x72, 0x44, 0xb1, 0x1d, 0xd2, 0x03, 0x8d, 0x76, 0x7c, 0xf6, 0xe7, 0xdf, 0xfb,
+	0xde, 0xf7, 0x12, 0x34, 0xce, 0x01, 0x72, 0x46, 0x82, 0x94, 0x81, 0xca, 0x82, 0x8c, 0x26, 0x0c,
+	0xf2, 0x39, 0x83, 0x75, 0xb0, 0x0a, 0x83, 0x35, 0x99, 0x9d, 0x03, 0x7c, 0xf5, 0x8b, 0x12, 0x24,
+	0xe0, 0x81, 0x51, 0xfa, 0x5a, 0xe9, 0x37, 0x4a, 0x7f, 0x15, 0x0e, 0xee, 0x58, 0x4a, 0x52, 0xd0,
+	0x20, 0xe1, 0x1c, 0x64, 0x22, 0x29, 0x70, 0x61, 0x5e, 0x0e, 0xda, 0x7a, 0xa4, 0xc0, 0x25, 0xb9,
+	0x90, 0x56, 0x79, 0xdc, 0xa2, 0xa4, 0x5c, 0x12, 0x2e, 0xaf, 0x80, 0x14, 0x44, 0x08, 0x0a, 0xdc,
+	0x2a, 0x6b, 0x6b, 0xba, 0x9a, 0xa9, 0x79, 0x20, 0x64, 0xa9, 0x52, 0xcb, 0x19, 0xfd, 0x70, 0xd1,
+	0xfe, 0x47, 0x33, 0x66, 0x44, 0x96, 0x8a, 0x08, 0x89, 0x3d, 0xb4, 0x63, 0x09, 0xde, 0xb5, 0xa1,
+	0x33, 0xde, 0x8d, 0xea, 0x12, 0xdf, 0x45, 0xbd, 0x92, 0x88, 0x02, 0xb8, 0x20, 0x31, 0xcd, 0x3c,
+	0x47, 0xdf, 0xa2, 0xfa, 0x68, 0x9a, 0xe1, 0x97, 0x68, 0x6f, 0xa9, 0x48, 0x79, 0x19, 0x97, 0x44,
+	0x28, 0x26, 0x3d, 0x77, 0xe8, 0x8c, 0x7b, 0xe1, 0xb1, 0xbf, 0x3d, 0x39, 0xff, 0x6d, 0xa5, 0x8f,
+	0xb4, 0x3c, 0xea, 0x2d, 0x9b, 0x02, 0x7f, 0x43, 0x47, 0x50, 0xd2, 0x9c, 0xf2, 0x84, 0xc5, 0x19,
+	0x91, 0x24, 0x95, 0xb1, 0x49, 0x20, 0x2e, 0x8d, 0x51, 0xaf, 0xa3, 0xe9, 0x4f, 0xda, 0xe8, 0x6f,
+	0x2c, 0x61, 0xa2, 0x01, 0x53, 0xfd, 0xde, 0xce, 0x19, 0x1d, 0xc2, 0xf6, 0xcb, 0xd1, 0xf7, 0x0e,
+	0xea, 0xff, 0xcb, 0xc5, 0xcc, 0x87, 0x1f, 0xa0, 0x1b, 0x73, 0xc5, 0xe6, 0x94, 0xb1, 0x45, 0x65,
+	0xa3, 0x5a, 0x9b, 0xcd, 0xa0, 0xbf, 0x71, 0xfe, 0x9e, 0x5c, 0x48, 0xfc, 0x05, 0x1d, 0x6c, 0x4a,
+	0x17, 0x44, 0x88, 0x24, 0x27, 0xc2, 0x73, 0x87, 0x9d, 0x71, 0x2f, 0x7c, 0xd8, 0x66, 0xd9, 0xf8,
+	0xf0, 0x5f, 0x9b, 0x27, 0xd1, 0xcd, 0x0d, 0x8e, 0x3d, 0x13, 0xf8, 0x16, 0xea, 0x0a, 0x50, 0x65,
+	0x4a, 0x74, 0x06, 0xbb, 0x91, 0xad, 0xf0, 0x23, 0xb4, 0x53, 0x24, 0x97, 0x0c, 0x92, 0x4c, 0xaf,
+	0xae, 0x17, 0xde, 0xae, 0x3b, 0xd5, 0xdb, 0xf7, 0xdf, 0xe9, 0xed, 0x47, 0xb5, 0x0e, 0xbf, 0x42,
+	0x7d, 0x50, 0xb2, 0x50, 0x32, 0xb6, 0x5f, 0xa2, 0xf0, 0xae, 0x6b, 0x93, 0xf7, 0xda, 0x4c, 0x9e,
+	0x1a, 0x6d, 0xb4, 0x6f, 0xde, 0xda, 0x52, 0xe0, 0x4f, 0xe8, 0x60, 0x0e, 0x8c, 0xc1, 0x5a, 0x15,
+	0x31, 0x59, 0x55, 0xa3, 0x53, 0x5e, 0x28, 0xe9, 0x75, 0xb5, 0x9b, 0xfb, 0x6d, 0xc8, 0x67, 0x95,
+	0x7c, 0x5a, 0xa9, 0x23, 0x5c, 0x33, 0x9a, 0xb3, 0xd1, 0x39, 0x3a, 0x6c, 0x59, 0xe6, 0x46, 0x22,
+	0xce, 0xb6, 0x44, 0x3a, 0x57, 0x4b, 0xe4, 0xe4, 0xa7, 0x83, 0x8e, 0x52, 0x58, 0xb4, 0x78, 0x3d,
+	0xd9, 0xb3, 0x9f, 0xc6, 0x59, 0xc5, 0x38, 0x73, 0x3e, 0x4f, 0xac, 0x36, 0x07, 0x96, 0xf0, 0xdc,
+	0x87, 0x32, 0x0f, 0x72, 0xc2, 0x75, 0x87, 0xc0, 0x5c, 0x25, 0x05, 0x15, 0xff, 0xfb, 0x59, 0x9f,
+	0x36, 0xd5, 0x1f, 0xc7, 0xf9, 0xe5, 0xba, 0x93, 0xe7, 0xbf, 0xdd, 0xc1, 0x0b, 0x83, 0x3b, 0xd5,
+	0xad, 0x27, 0x4d, 0xeb, 0x0f, 0xe1, 0xac, 0xab, 0xa9, 0x8f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff,
+	0x75, 0x98, 0x13, 0x07, 0xb8, 0x04, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/agent.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
index 204423db..7cc058b1 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/agent.pb.go
@@ -1,93 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/agent.proto
 
-/*
-Package dialogflow is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/dialogflow/v2beta1/agent.proto
-	google/cloud/dialogflow/v2beta1/context.proto
-	google/cloud/dialogflow/v2beta1/entity_type.proto
-	google/cloud/dialogflow/v2beta1/intent.proto
-	google/cloud/dialogflow/v2beta1/session.proto
-	google/cloud/dialogflow/v2beta1/session_entity_type.proto
-	google/cloud/dialogflow/v2beta1/webhook.proto
-
-It has these top-level messages:
-	Agent
-	GetAgentRequest
-	SearchAgentsRequest
-	SearchAgentsResponse
-	TrainAgentRequest
-	ExportAgentRequest
-	ExportAgentResponse
-	ImportAgentRequest
-	RestoreAgentRequest
-	Context
-	ListContextsRequest
-	ListContextsResponse
-	GetContextRequest
-	CreateContextRequest
-	UpdateContextRequest
-	DeleteContextRequest
-	DeleteAllContextsRequest
-	EntityType
-	ListEntityTypesRequest
-	ListEntityTypesResponse
-	GetEntityTypeRequest
-	CreateEntityTypeRequest
-	UpdateEntityTypeRequest
-	DeleteEntityTypeRequest
-	BatchUpdateEntityTypesRequest
-	BatchUpdateEntityTypesResponse
-	BatchDeleteEntityTypesRequest
-	BatchCreateEntitiesRequest
-	BatchUpdateEntitiesRequest
-	BatchDeleteEntitiesRequest
-	EntityTypeBatch
-	Intent
-	ListIntentsRequest
-	ListIntentsResponse
-	GetIntentRequest
-	CreateIntentRequest
-	UpdateIntentRequest
-	DeleteIntentRequest
-	BatchUpdateIntentsRequest
-	BatchUpdateIntentsResponse
-	BatchDeleteIntentsRequest
-	IntentBatch
-	DetectIntentRequest
-	DetectIntentResponse
-	QueryParameters
-	QueryInput
-	QueryResult
-	StreamingDetectIntentRequest
-	StreamingDetectIntentResponse
-	StreamingRecognitionResult
-	InputAudioConfig
-	TextInput
-	EventInput
-	SessionEntityType
-	ListSessionEntityTypesRequest
-	ListSessionEntityTypesResponse
-	GetSessionEntityTypeRequest
-	CreateSessionEntityTypeRequest
-	UpdateSessionEntityTypeRequest
-	DeleteSessionEntityTypeRequest
-	WebhookRequest
-	WebhookResponse
-	OriginalDetectIntentRequest
-*/
-package dialogflow
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
 import _ "github.com/golang/protobuf/ptypes/empty"
-import _ "google.golang.org/genproto/protobuf/field_mask"
 import _ "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import _ "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -133,38 +56,40 @@ var Agent_MatchMode_value = map[string]int32{
 func (x Agent_MatchMode) String() string {
 	return proto.EnumName(Agent_MatchMode_name, int32(x))
 }
-func (Agent_MatchMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (Agent_MatchMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{0, 0}
+}
 
 // Represents a conversational agent.
 type Agent struct {
 	// Required. The project of this agent.
 	// Format: `projects/<Project ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The name of this agent.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Required. The default language of the agent as a language tag. See
 	// [Language Support](https://dialogflow.com/docs/reference/language) for a
 	// list of the currently supported language codes.
 	// This field cannot be set by the `Update` method.
-	DefaultLanguageCode string `protobuf:"bytes,3,opt,name=default_language_code,json=defaultLanguageCode" json:"default_language_code,omitempty"`
+	DefaultLanguageCode string `protobuf:"bytes,3,opt,name=default_language_code,json=defaultLanguageCode,proto3" json:"default_language_code,omitempty"`
 	// Optional. The list of all languages supported by this agent (except for the
 	// `default_language_code`).
-	SupportedLanguageCodes []string `protobuf:"bytes,4,rep,name=supported_language_codes,json=supportedLanguageCodes" json:"supported_language_codes,omitempty"`
+	SupportedLanguageCodes []string `protobuf:"bytes,4,rep,name=supported_language_codes,json=supportedLanguageCodes,proto3" json:"supported_language_codes,omitempty"`
 	// Required. The time zone of this agent from the
 	// [time zone database](https://www.iana.org/time-zones), e.g.,
 	// America/New_York, Europe/Paris.
-	TimeZone string `protobuf:"bytes,5,opt,name=time_zone,json=timeZone" json:"time_zone,omitempty"`
+	TimeZone string `protobuf:"bytes,5,opt,name=time_zone,json=timeZone,proto3" json:"time_zone,omitempty"`
 	// Optional. The description of this agent.
 	// The maximum length is 500 characters. If exceeded, the request is rejected.
-	Description string `protobuf:"bytes,6,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"`
 	// Optional. The URI of the agent's avatar.
-	// Avatars are used throughout API.AI console and in the self-hosted
+	// Avatars are used throughout the Dialogflow console and in the self-hosted
 	// [Web Demo](https://dialogflow.com/docs/integrations/web-demo) integration.
-	AvatarUri string `protobuf:"bytes,7,opt,name=avatar_uri,json=avatarUri" json:"avatar_uri,omitempty"`
+	AvatarUri string `protobuf:"bytes,7,opt,name=avatar_uri,json=avatarUri,proto3" json:"avatar_uri,omitempty"`
 	// Optional. Determines whether this agent should log conversation queries.
-	EnableLogging bool `protobuf:"varint,8,opt,name=enable_logging,json=enableLogging" json:"enable_logging,omitempty"`
+	EnableLogging bool `protobuf:"varint,8,opt,name=enable_logging,json=enableLogging,proto3" json:"enable_logging,omitempty"`
 	// Optional. Determines how intents are detected from user queries.
-	MatchMode Agent_MatchMode `protobuf:"varint,9,opt,name=match_mode,json=matchMode,enum=google.cloud.dialogflow.v2beta1.Agent_MatchMode" json:"match_mode,omitempty"`
+	MatchMode Agent_MatchMode `protobuf:"varint,9,opt,name=match_mode,json=matchMode,proto3,enum=google.cloud.dialogflow.v2beta1.Agent_MatchMode" json:"match_mode,omitempty"`
 	// Optional. To filter out false positive results and still get variety in
 	// matched natural language inputs for your agent, you can tune the machine
 	// learning classification threshold. If the returned score value is less than
@@ -172,13 +97,35 @@ type Agent struct {
 	// are no fallback intents defined, no intent will be triggered. The score
 	// values range from 0.0 (completely uncertain) to 1.0 (completely certain).
 	// If set to 0.0, the default of 0.3 is used.
-	ClassificationThreshold float32 `protobuf:"fixed32,10,opt,name=classification_threshold,json=classificationThreshold" json:"classification_threshold,omitempty"`
+	ClassificationThreshold float32  `protobuf:"fixed32,10,opt,name=classification_threshold,json=classificationThreshold,proto3" json:"classification_threshold,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
+	XXX_unrecognized        []byte   `json:"-"`
+	XXX_sizecache           int32    `json:"-"`
+}
+
+func (m *Agent) Reset()         { *m = Agent{} }
+func (m *Agent) String() string { return proto.CompactTextString(m) }
+func (*Agent) ProtoMessage()    {}
+func (*Agent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{0}
+}
+func (m *Agent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Agent.Unmarshal(m, b)
+}
+func (m *Agent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Agent.Marshal(b, m, deterministic)
+}
+func (dst *Agent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Agent.Merge(dst, src)
+}
+func (m *Agent) XXX_Size() int {
+	return xxx_messageInfo_Agent.Size(m)
+}
+func (m *Agent) XXX_DiscardUnknown() {
+	xxx_messageInfo_Agent.DiscardUnknown(m)
 }
 
-func (m *Agent) Reset()                    { *m = Agent{} }
-func (m *Agent) String() string            { return proto.CompactTextString(m) }
-func (*Agent) ProtoMessage()               {}
-func (*Agent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Agent proto.InternalMessageInfo
 
 func (m *Agent) GetParent() string {
 	if m != nil {
@@ -250,18 +197,39 @@ func (m *Agent) GetClassificationThreshold() float32 {
 	return 0
 }
 
-// The request message for
-// [Agents.GetAgent][google.cloud.dialogflow.v2beta1.Agents.GetAgent].
+// The request message for [Agents.GetAgent][google.cloud.dialogflow.v2beta1.Agents.GetAgent].
 type GetAgentRequest struct {
 	// Required. The project that the agent to fetch is associated with.
 	// Format: `projects/<Project ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetAgentRequest) Reset()                    { *m = GetAgentRequest{} }
-func (m *GetAgentRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetAgentRequest) ProtoMessage()               {}
-func (*GetAgentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *GetAgentRequest) Reset()         { *m = GetAgentRequest{} }
+func (m *GetAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*GetAgentRequest) ProtoMessage()    {}
+func (*GetAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{1}
+}
+func (m *GetAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetAgentRequest.Unmarshal(m, b)
+}
+func (m *GetAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAgentRequest.Merge(dst, src)
+}
+func (m *GetAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_GetAgentRequest.Size(m)
+}
+func (m *GetAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetAgentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetAgentRequest proto.InternalMessageInfo
 
 func (m *GetAgentRequest) GetParent() string {
 	if m != nil {
@@ -270,23 +238,44 @@ func (m *GetAgentRequest) GetParent() string {
 	return ""
 }
 
-// The request message for
-// [Agents.SearchAgents][google.cloud.dialogflow.v2beta1.Agents.SearchAgents].
+// The request message for [Agents.SearchAgents][google.cloud.dialogflow.v2beta1.Agents.SearchAgents].
 type SearchAgentsRequest struct {
 	// Required. The project to list agents from.
 	// Format: `projects/<Project ID or '-'>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. The maximum number of items to return in a single page. By
 	// default 100 and at most 1000.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The next_page_token value returned from a previous list request.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchAgentsRequest) Reset()                    { *m = SearchAgentsRequest{} }
-func (m *SearchAgentsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchAgentsRequest) ProtoMessage()               {}
-func (*SearchAgentsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *SearchAgentsRequest) Reset()         { *m = SearchAgentsRequest{} }
+func (m *SearchAgentsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchAgentsRequest) ProtoMessage()    {}
+func (*SearchAgentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{2}
+}
+func (m *SearchAgentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchAgentsRequest.Unmarshal(m, b)
+}
+func (m *SearchAgentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchAgentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchAgentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAgentsRequest.Merge(dst, src)
+}
+func (m *SearchAgentsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchAgentsRequest.Size(m)
+}
+func (m *SearchAgentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchAgentsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchAgentsRequest proto.InternalMessageInfo
 
 func (m *SearchAgentsRequest) GetParent() string {
 	if m != nil {
@@ -309,21 +298,42 @@ func (m *SearchAgentsRequest) GetPageToken() string {
 	return ""
 }
 
-// The response message for
-// [Agents.SearchAgents][google.cloud.dialogflow.v2beta1.Agents.SearchAgents].
+// The response message for [Agents.SearchAgents][google.cloud.dialogflow.v2beta1.Agents.SearchAgents].
 type SearchAgentsResponse struct {
 	// The list of agents. There will be a maximum number of items returned based
 	// on the page_size field in the request.
-	Agents []*Agent `protobuf:"bytes,1,rep,name=agents" json:"agents,omitempty"`
+	Agents []*Agent `protobuf:"bytes,1,rep,name=agents,proto3" json:"agents,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no
 	// more results in the list.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchAgentsResponse) Reset()         { *m = SearchAgentsResponse{} }
+func (m *SearchAgentsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchAgentsResponse) ProtoMessage()    {}
+func (*SearchAgentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{3}
+}
+func (m *SearchAgentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchAgentsResponse.Unmarshal(m, b)
+}
+func (m *SearchAgentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchAgentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchAgentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAgentsResponse.Merge(dst, src)
+}
+func (m *SearchAgentsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchAgentsResponse.Size(m)
+}
+func (m *SearchAgentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchAgentsResponse.DiscardUnknown(m)
 }
 
-func (m *SearchAgentsResponse) Reset()                    { *m = SearchAgentsResponse{} }
-func (m *SearchAgentsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchAgentsResponse) ProtoMessage()               {}
-func (*SearchAgentsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_SearchAgentsResponse proto.InternalMessageInfo
 
 func (m *SearchAgentsResponse) GetAgents() []*Agent {
 	if m != nil {
@@ -339,18 +349,39 @@ func (m *SearchAgentsResponse) GetNextPageToken() string {
 	return ""
 }
 
-// The request message for
-// [Agents.TrainAgent][google.cloud.dialogflow.v2beta1.Agents.TrainAgent].
+// The request message for [Agents.TrainAgent][google.cloud.dialogflow.v2beta1.Agents.TrainAgent].
 type TrainAgentRequest struct {
 	// Required. The project that the agent to train is associated with.
 	// Format: `projects/<Project ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TrainAgentRequest) Reset()         { *m = TrainAgentRequest{} }
+func (m *TrainAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*TrainAgentRequest) ProtoMessage()    {}
+func (*TrainAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{4}
+}
+func (m *TrainAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TrainAgentRequest.Unmarshal(m, b)
+}
+func (m *TrainAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TrainAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *TrainAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrainAgentRequest.Merge(dst, src)
+}
+func (m *TrainAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_TrainAgentRequest.Size(m)
+}
+func (m *TrainAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_TrainAgentRequest.DiscardUnknown(m)
 }
 
-func (m *TrainAgentRequest) Reset()                    { *m = TrainAgentRequest{} }
-func (m *TrainAgentRequest) String() string            { return proto.CompactTextString(m) }
-func (*TrainAgentRequest) ProtoMessage()               {}
-func (*TrainAgentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_TrainAgentRequest proto.InternalMessageInfo
 
 func (m *TrainAgentRequest) GetParent() string {
 	if m != nil {
@@ -359,25 +390,45 @@ func (m *TrainAgentRequest) GetParent() string {
 	return ""
 }
 
-// The request message for
-// [Agents.ExportAgent][google.cloud.dialogflow.v2beta1.Agents.ExportAgent].
+// The request message for [Agents.ExportAgent][google.cloud.dialogflow.v2beta1.Agents.ExportAgent].
 type ExportAgentRequest struct {
 	// Required. The project that the agent to export is associated with.
 	// Format: `projects/<Project ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Warning: Exporting agents to a URI is not implemented yet.
-	// This feature is coming soon.
-	//
-	// Optional. The Google Cloud Storage URI to export the agent to.
-	// Note: The URI must start with
-	// "gs://". If left unspecified, the serialized agent is returned inline.
-	AgentUri string `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri" json:"agent_uri,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The
+	// [Google Cloud Storage](https://cloud.google.com/storage/docs/)
+	// URI to export the agent to.
+	// The format of this URI must be `gs://<bucket-name>/<object-name>`.
+	// If left unspecified, the serialized agent is returned inline.
+	AgentUri             string   `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri,proto3" json:"agent_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ExportAgentRequest) Reset()                    { *m = ExportAgentRequest{} }
-func (m *ExportAgentRequest) String() string            { return proto.CompactTextString(m) }
-func (*ExportAgentRequest) ProtoMessage()               {}
-func (*ExportAgentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ExportAgentRequest) Reset()         { *m = ExportAgentRequest{} }
+func (m *ExportAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*ExportAgentRequest) ProtoMessage()    {}
+func (*ExportAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{5}
+}
+func (m *ExportAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportAgentRequest.Unmarshal(m, b)
+}
+func (m *ExportAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExportAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAgentRequest.Merge(dst, src)
+}
+func (m *ExportAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_ExportAgentRequest.Size(m)
+}
+func (m *ExportAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportAgentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportAgentRequest proto.InternalMessageInfo
 
 func (m *ExportAgentRequest) GetParent() string {
 	if m != nil {
@@ -393,34 +444,57 @@ func (m *ExportAgentRequest) GetAgentUri() string {
 	return ""
 }
 
-// The response message for
-// [Agents.ExportAgent][google.cloud.dialogflow.v2beta1.Agents.ExportAgent].
+// The response message for [Agents.ExportAgent][google.cloud.dialogflow.v2beta1.Agents.ExportAgent].
 type ExportAgentResponse struct {
 	// Required. The exported agent.
 	//
 	// Types that are valid to be assigned to Agent:
 	//	*ExportAgentResponse_AgentUri
 	//	*ExportAgentResponse_AgentContent
-	Agent isExportAgentResponse_Agent `protobuf_oneof:"agent"`
+	Agent                isExportAgentResponse_Agent `protobuf_oneof:"agent"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
-func (m *ExportAgentResponse) Reset()                    { *m = ExportAgentResponse{} }
-func (m *ExportAgentResponse) String() string            { return proto.CompactTextString(m) }
-func (*ExportAgentResponse) ProtoMessage()               {}
-func (*ExportAgentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *ExportAgentResponse) Reset()         { *m = ExportAgentResponse{} }
+func (m *ExportAgentResponse) String() string { return proto.CompactTextString(m) }
+func (*ExportAgentResponse) ProtoMessage()    {}
+func (*ExportAgentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{6}
+}
+func (m *ExportAgentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportAgentResponse.Unmarshal(m, b)
+}
+func (m *ExportAgentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportAgentResponse.Marshal(b, m, deterministic)
+}
+func (dst *ExportAgentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportAgentResponse.Merge(dst, src)
+}
+func (m *ExportAgentResponse) XXX_Size() int {
+	return xxx_messageInfo_ExportAgentResponse.Size(m)
+}
+func (m *ExportAgentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportAgentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportAgentResponse proto.InternalMessageInfo
 
 type isExportAgentResponse_Agent interface {
 	isExportAgentResponse_Agent()
 }
 
 type ExportAgentResponse_AgentUri struct {
-	AgentUri string `protobuf:"bytes,1,opt,name=agent_uri,json=agentUri,oneof"`
+	AgentUri string `protobuf:"bytes,1,opt,name=agent_uri,json=agentUri,proto3,oneof"`
 }
+
 type ExportAgentResponse_AgentContent struct {
 	AgentContent []byte `protobuf:"bytes,2,opt,name=agent_content,json=agentContent,proto3,oneof"`
 }
 
-func (*ExportAgentResponse_AgentUri) isExportAgentResponse_Agent()     {}
+func (*ExportAgentResponse_AgentUri) isExportAgentResponse_Agent() {}
+
 func (*ExportAgentResponse_AgentContent) isExportAgentResponse_Agent() {}
 
 func (m *ExportAgentResponse) GetAgent() isExportAgentResponse_Agent {
@@ -496,11 +570,11 @@ func _ExportAgentResponse_OneofSizer(msg proto.Message) (n int) {
 	// agent
 	switch x := m.Agent.(type) {
 	case *ExportAgentResponse_AgentUri:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AgentUri)))
 		n += len(x.AgentUri)
 	case *ExportAgentResponse_AgentContent:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AgentContent)))
 		n += len(x.AgentContent)
 	case nil:
@@ -510,37 +584,67 @@ func _ExportAgentResponse_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-// The request message for
-// [Agents.ImportAgent][google.cloud.dialogflow.v2beta1.Agents.ImportAgent].
+// The request message for [Agents.ImportAgent][google.cloud.dialogflow.v2beta1.Agents.ImportAgent].
 type ImportAgentRequest struct {
 	// Required. The project that the agent to import is associated with.
 	// Format: `projects/<Project ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The agent to import.
 	//
 	// Types that are valid to be assigned to Agent:
 	//	*ImportAgentRequest_AgentUri
 	//	*ImportAgentRequest_AgentContent
-	Agent isImportAgentRequest_Agent `protobuf_oneof:"agent"`
+	Agent                isImportAgentRequest_Agent `protobuf_oneof:"agent"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *ImportAgentRequest) Reset()         { *m = ImportAgentRequest{} }
+func (m *ImportAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportAgentRequest) ProtoMessage()    {}
+func (*ImportAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{7}
+}
+func (m *ImportAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportAgentRequest.Unmarshal(m, b)
+}
+func (m *ImportAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportAgentRequest.Merge(dst, src)
+}
+func (m *ImportAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportAgentRequest.Size(m)
+}
+func (m *ImportAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportAgentRequest.DiscardUnknown(m)
 }
 
-func (m *ImportAgentRequest) Reset()                    { *m = ImportAgentRequest{} }
-func (m *ImportAgentRequest) String() string            { return proto.CompactTextString(m) }
-func (*ImportAgentRequest) ProtoMessage()               {}
-func (*ImportAgentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ImportAgentRequest proto.InternalMessageInfo
+
+func (m *ImportAgentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
 
 type isImportAgentRequest_Agent interface {
 	isImportAgentRequest_Agent()
 }
 
 type ImportAgentRequest_AgentUri struct {
-	AgentUri string `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri,oneof"`
+	AgentUri string `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri,proto3,oneof"`
 }
+
 type ImportAgentRequest_AgentContent struct {
 	AgentContent []byte `protobuf:"bytes,3,opt,name=agent_content,json=agentContent,proto3,oneof"`
 }
 
-func (*ImportAgentRequest_AgentUri) isImportAgentRequest_Agent()     {}
+func (*ImportAgentRequest_AgentUri) isImportAgentRequest_Agent() {}
+
 func (*ImportAgentRequest_AgentContent) isImportAgentRequest_Agent() {}
 
 func (m *ImportAgentRequest) GetAgent() isImportAgentRequest_Agent {
@@ -550,13 +654,6 @@ func (m *ImportAgentRequest) GetAgent() isImportAgentRequest_Agent {
 	return nil
 }
 
-func (m *ImportAgentRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
 func (m *ImportAgentRequest) GetAgentUri() string {
 	if x, ok := m.GetAgent().(*ImportAgentRequest_AgentUri); ok {
 		return x.AgentUri
@@ -623,11 +720,11 @@ func _ImportAgentRequest_OneofSizer(msg proto.Message) (n int) {
 	// agent
 	switch x := m.Agent.(type) {
 	case *ImportAgentRequest_AgentUri:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AgentUri)))
 		n += len(x.AgentUri)
 	case *ImportAgentRequest_AgentContent:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AgentContent)))
 		n += len(x.AgentContent)
 	case nil:
@@ -637,37 +734,67 @@ func _ImportAgentRequest_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-// The request message for
-// [Agents.RestoreAgent][google.cloud.dialogflow.v2beta1.Agents.RestoreAgent].
+// The request message for [Agents.RestoreAgent][google.cloud.dialogflow.v2beta1.Agents.RestoreAgent].
 type RestoreAgentRequest struct {
 	// Required. The project that the agent to restore is associated with.
 	// Format: `projects/<Project ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The agent to restore.
 	//
 	// Types that are valid to be assigned to Agent:
 	//	*RestoreAgentRequest_AgentUri
 	//	*RestoreAgentRequest_AgentContent
-	Agent isRestoreAgentRequest_Agent `protobuf_oneof:"agent"`
+	Agent                isRestoreAgentRequest_Agent `protobuf_oneof:"agent"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
-func (m *RestoreAgentRequest) Reset()                    { *m = RestoreAgentRequest{} }
-func (m *RestoreAgentRequest) String() string            { return proto.CompactTextString(m) }
-func (*RestoreAgentRequest) ProtoMessage()               {}
-func (*RestoreAgentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *RestoreAgentRequest) Reset()         { *m = RestoreAgentRequest{} }
+func (m *RestoreAgentRequest) String() string { return proto.CompactTextString(m) }
+func (*RestoreAgentRequest) ProtoMessage()    {}
+func (*RestoreAgentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_agent_d116f64d830b765d, []int{8}
+}
+func (m *RestoreAgentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RestoreAgentRequest.Unmarshal(m, b)
+}
+func (m *RestoreAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RestoreAgentRequest.Marshal(b, m, deterministic)
+}
+func (dst *RestoreAgentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestoreAgentRequest.Merge(dst, src)
+}
+func (m *RestoreAgentRequest) XXX_Size() int {
+	return xxx_messageInfo_RestoreAgentRequest.Size(m)
+}
+func (m *RestoreAgentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RestoreAgentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RestoreAgentRequest proto.InternalMessageInfo
+
+func (m *RestoreAgentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
 
 type isRestoreAgentRequest_Agent interface {
 	isRestoreAgentRequest_Agent()
 }
 
 type RestoreAgentRequest_AgentUri struct {
-	AgentUri string `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri,oneof"`
+	AgentUri string `protobuf:"bytes,2,opt,name=agent_uri,json=agentUri,proto3,oneof"`
 }
+
 type RestoreAgentRequest_AgentContent struct {
 	AgentContent []byte `protobuf:"bytes,3,opt,name=agent_content,json=agentContent,proto3,oneof"`
 }
 
-func (*RestoreAgentRequest_AgentUri) isRestoreAgentRequest_Agent()     {}
+func (*RestoreAgentRequest_AgentUri) isRestoreAgentRequest_Agent() {}
+
 func (*RestoreAgentRequest_AgentContent) isRestoreAgentRequest_Agent() {}
 
 func (m *RestoreAgentRequest) GetAgent() isRestoreAgentRequest_Agent {
@@ -677,13 +804,6 @@ func (m *RestoreAgentRequest) GetAgent() isRestoreAgentRequest_Agent {
 	return nil
 }
 
-func (m *RestoreAgentRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
 func (m *RestoreAgentRequest) GetAgentUri() string {
 	if x, ok := m.GetAgent().(*RestoreAgentRequest_AgentUri); ok {
 		return x.AgentUri
@@ -750,11 +870,11 @@ func _RestoreAgentRequest_OneofSizer(msg proto.Message) (n int) {
 	// agent
 	switch x := m.Agent.(type) {
 	case *RestoreAgentRequest_AgentUri:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AgentUri)))
 		n += len(x.AgentUri)
 	case *RestoreAgentRequest_AgentContent:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AgentContent)))
 		n += len(x.AgentContent)
 	case nil:
@@ -785,8 +905,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Agents service
-
+// AgentsClient is the client API for Agents service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type AgentsClient interface {
 	// Retrieves the specified agent.
 	GetAgent(ctx context.Context, in *GetAgentRequest, opts ...grpc.CallOption) (*Agent, error)
@@ -803,14 +924,13 @@ type AgentsClient interface {
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	TrainAgent(ctx context.Context, in *TrainAgentRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	TrainAgent(ctx context.Context, in *TrainAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Exports the specified agent to a ZIP file.
 	//
 	//
-	// Operation <response:
-	// [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse],
+	// Operation <response: [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	ExportAgent(ctx context.Context, in *ExportAgentRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	ExportAgent(ctx context.Context, in *ExportAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Imports the specified agent from a ZIP file.
 	//
 	// Uploads new intents and entity types without deleting the existing ones.
@@ -820,7 +940,7 @@ type AgentsClient interface {
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	ImportAgent(ctx context.Context, in *ImportAgentRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	ImportAgent(ctx context.Context, in *ImportAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Restores the specified agent from a ZIP file.
 	//
 	// Replaces the current agent version with a new one. All the intents and
@@ -829,7 +949,7 @@ type AgentsClient interface {
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	RestoreAgent(ctx context.Context, in *RestoreAgentRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	RestoreAgent(ctx context.Context, in *RestoreAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type agentsClient struct {
@@ -842,7 +962,7 @@ func NewAgentsClient(cc *grpc.ClientConn) AgentsClient {
 
 func (c *agentsClient) GetAgent(ctx context.Context, in *GetAgentRequest, opts ...grpc.CallOption) (*Agent, error) {
 	out := new(Agent)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/GetAgent", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/GetAgent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -851,51 +971,50 @@ func (c *agentsClient) GetAgent(ctx context.Context, in *GetAgentRequest, opts .
 
 func (c *agentsClient) SearchAgents(ctx context.Context, in *SearchAgentsRequest, opts ...grpc.CallOption) (*SearchAgentsResponse, error) {
 	out := new(SearchAgentsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/SearchAgents", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/SearchAgents", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *agentsClient) TrainAgent(ctx context.Context, in *TrainAgentRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/TrainAgent", in, out, c.cc, opts...)
+func (c *agentsClient) TrainAgent(ctx context.Context, in *TrainAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/TrainAgent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *agentsClient) ExportAgent(ctx context.Context, in *ExportAgentRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/ExportAgent", in, out, c.cc, opts...)
+func (c *agentsClient) ExportAgent(ctx context.Context, in *ExportAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/ExportAgent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *agentsClient) ImportAgent(ctx context.Context, in *ImportAgentRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/ImportAgent", in, out, c.cc, opts...)
+func (c *agentsClient) ImportAgent(ctx context.Context, in *ImportAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/ImportAgent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *agentsClient) RestoreAgent(ctx context.Context, in *RestoreAgentRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/RestoreAgent", in, out, c.cc, opts...)
+func (c *agentsClient) RestoreAgent(ctx context.Context, in *RestoreAgentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Agents/RestoreAgent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Agents service
-
+// AgentsServer is the server API for Agents service.
 type AgentsServer interface {
 	// Retrieves the specified agent.
 	GetAgent(context.Context, *GetAgentRequest) (*Agent, error)
@@ -912,14 +1031,13 @@ type AgentsServer interface {
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	TrainAgent(context.Context, *TrainAgentRequest) (*google_longrunning.Operation, error)
+	TrainAgent(context.Context, *TrainAgentRequest) (*longrunning.Operation, error)
 	// Exports the specified agent to a ZIP file.
 	//
 	//
-	// Operation <response:
-	// [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse],
+	// Operation <response: [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	ExportAgent(context.Context, *ExportAgentRequest) (*google_longrunning.Operation, error)
+	ExportAgent(context.Context, *ExportAgentRequest) (*longrunning.Operation, error)
 	// Imports the specified agent from a ZIP file.
 	//
 	// Uploads new intents and entity types without deleting the existing ones.
@@ -929,7 +1047,7 @@ type AgentsServer interface {
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	ImportAgent(context.Context, *ImportAgentRequest) (*google_longrunning.Operation, error)
+	ImportAgent(context.Context, *ImportAgentRequest) (*longrunning.Operation, error)
 	// Restores the specified agent from a ZIP file.
 	//
 	// Replaces the current agent version with a new one. All the intents and
@@ -938,7 +1056,7 @@ type AgentsServer interface {
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	RestoreAgent(context.Context, *RestoreAgentRequest) (*google_longrunning.Operation, error)
+	RestoreAgent(context.Context, *RestoreAgentRequest) (*longrunning.Operation, error)
 }
 
 func RegisterAgentsServer(s *grpc.Server, srv AgentsServer) {
@@ -1086,9 +1204,11 @@ var _Agents_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dialogflow/v2beta1/agent.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dialogflow/v2beta1/agent.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/agent.proto", fileDescriptor_agent_d116f64d830b765d)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_agent_d116f64d830b765d = []byte{
 	// 975 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x41, 0x6f, 0xdc, 0x44,
 	0x14, 0xae, 0x37, 0x4d, 0xb2, 0xfb, 0x92, 0xb4, 0xe9, 0x84, 0x06, 0x6b, 0xdb, 0xa8, 0x8b, 0x4b,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go
new file mode 100644
index 00000000..e43414e8
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/audio_config.pb.go
@@ -0,0 +1,357 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2beta1/audio_config.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Gender of the voice as described in
+// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
+type SsmlVoiceGender int32
+
+const (
+	// An unspecified gender, which means that the client doesn't care which
+	// gender the selected voice will have.
+	SsmlVoiceGender_SSML_VOICE_GENDER_UNSPECIFIED SsmlVoiceGender = 0
+	// A male voice.
+	SsmlVoiceGender_SSML_VOICE_GENDER_MALE SsmlVoiceGender = 1
+	// A female voice.
+	SsmlVoiceGender_SSML_VOICE_GENDER_FEMALE SsmlVoiceGender = 2
+	// A gender-neutral voice.
+	SsmlVoiceGender_SSML_VOICE_GENDER_NEUTRAL SsmlVoiceGender = 3
+)
+
+var SsmlVoiceGender_name = map[int32]string{
+	0: "SSML_VOICE_GENDER_UNSPECIFIED",
+	1: "SSML_VOICE_GENDER_MALE",
+	2: "SSML_VOICE_GENDER_FEMALE",
+	3: "SSML_VOICE_GENDER_NEUTRAL",
+}
+var SsmlVoiceGender_value = map[string]int32{
+	"SSML_VOICE_GENDER_UNSPECIFIED": 0,
+	"SSML_VOICE_GENDER_MALE":        1,
+	"SSML_VOICE_GENDER_FEMALE":      2,
+	"SSML_VOICE_GENDER_NEUTRAL":     3,
+}
+
+func (x SsmlVoiceGender) String() string {
+	return proto.EnumName(SsmlVoiceGender_name, int32(x))
+}
+func (SsmlVoiceGender) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_audio_config_b255710fcad33f7d, []int{0}
+}
+
+// Audio encoding of the output audio format in Text-To-Speech.
+type OutputAudioEncoding int32
+
+const (
+	// Not specified.
+	OutputAudioEncoding_OUTPUT_AUDIO_ENCODING_UNSPECIFIED OutputAudioEncoding = 0
+	// Uncompressed 16-bit signed little-endian samples (Linear PCM).
+	// Audio content returned as LINEAR16 also contains a WAV header.
+	OutputAudioEncoding_OUTPUT_AUDIO_ENCODING_LINEAR_16 OutputAudioEncoding = 1
+	// MP3 audio.
+	OutputAudioEncoding_OUTPUT_AUDIO_ENCODING_MP3 OutputAudioEncoding = 2
+	// Opus encoded audio wrapped in an ogg container. The result will be a
+	// file which can be played natively on Android, and in browsers (at least
+	// Chrome and Firefox). The quality of the encoding is considerably higher
+	// than MP3 while using approximately the same bitrate.
+	OutputAudioEncoding_OUTPUT_AUDIO_ENCODING_OGG_OPUS OutputAudioEncoding = 3
+)
+
+var OutputAudioEncoding_name = map[int32]string{
+	0: "OUTPUT_AUDIO_ENCODING_UNSPECIFIED",
+	1: "OUTPUT_AUDIO_ENCODING_LINEAR_16",
+	2: "OUTPUT_AUDIO_ENCODING_MP3",
+	3: "OUTPUT_AUDIO_ENCODING_OGG_OPUS",
+}
+var OutputAudioEncoding_value = map[string]int32{
+	"OUTPUT_AUDIO_ENCODING_UNSPECIFIED": 0,
+	"OUTPUT_AUDIO_ENCODING_LINEAR_16":   1,
+	"OUTPUT_AUDIO_ENCODING_MP3":         2,
+	"OUTPUT_AUDIO_ENCODING_OGG_OPUS":    3,
+}
+
+func (x OutputAudioEncoding) String() string {
+	return proto.EnumName(OutputAudioEncoding_name, int32(x))
+}
+func (OutputAudioEncoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_audio_config_b255710fcad33f7d, []int{1}
+}
+
+// Description of which voice to use for speech synthesis.
+type VoiceSelectionParams struct {
+	// Optional. The name of the voice. If not set, the service will choose a
+	// voice based on the other parameters such as language_code and gender.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Optional. The preferred gender of the voice. If not set, the service will
+	// choose a voice based on the other parameters such as language_code and
+	// name. Note that this is only a preference, not requirement. If a
+	// voice of the appropriate gender is not available, the synthesizer should
+	// substitute a voice with a different gender rather than failing the request.
+	SsmlGender           SsmlVoiceGender `protobuf:"varint,2,opt,name=ssml_gender,json=ssmlGender,proto3,enum=google.cloud.dialogflow.v2beta1.SsmlVoiceGender" json:"ssml_gender,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *VoiceSelectionParams) Reset()         { *m = VoiceSelectionParams{} }
+func (m *VoiceSelectionParams) String() string { return proto.CompactTextString(m) }
+func (*VoiceSelectionParams) ProtoMessage()    {}
+func (*VoiceSelectionParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audio_config_b255710fcad33f7d, []int{0}
+}
+func (m *VoiceSelectionParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VoiceSelectionParams.Unmarshal(m, b)
+}
+func (m *VoiceSelectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VoiceSelectionParams.Marshal(b, m, deterministic)
+}
+func (dst *VoiceSelectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoiceSelectionParams.Merge(dst, src)
+}
+func (m *VoiceSelectionParams) XXX_Size() int {
+	return xxx_messageInfo_VoiceSelectionParams.Size(m)
+}
+func (m *VoiceSelectionParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_VoiceSelectionParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VoiceSelectionParams proto.InternalMessageInfo
+
+func (m *VoiceSelectionParams) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *VoiceSelectionParams) GetSsmlGender() SsmlVoiceGender {
+	if m != nil {
+		return m.SsmlGender
+	}
+	return SsmlVoiceGender_SSML_VOICE_GENDER_UNSPECIFIED
+}
+
+// Configuration of how speech should be synthesized.
+type SynthesizeSpeechConfig struct {
+	// Optional. Speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+	// native speed supported by the specific voice. 2.0 is twice as fast, and
+	// 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+	// other values < 0.25 or > 4.0 will return an error.
+	SpeakingRate float64 `protobuf:"fixed64,1,opt,name=speaking_rate,json=speakingRate,proto3" json:"speaking_rate,omitempty"`
+	// Optional. Speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+	// semitones from the original pitch. -20 means decrease 20 semitones from the
+	// original pitch.
+	Pitch float64 `protobuf:"fixed64,2,opt,name=pitch,proto3" json:"pitch,omitempty"`
+	// Optional. Volume gain (in dB) of the normal native volume supported by the
+	// specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+	// 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+	// will play at approximately half the amplitude of the normal native signal
+	// amplitude. A value of +6.0 (dB) will play at approximately twice the
+	// amplitude of the normal native signal amplitude. We strongly recommend not
+	// to exceed +10 (dB) as there's usually no effective increase in loudness for
+	// any value greater than that.
+	VolumeGainDb float64 `protobuf:"fixed64,3,opt,name=volume_gain_db,json=volumeGainDb,proto3" json:"volume_gain_db,omitempty"`
+	// Optional. An identifier which selects 'audio effects' profiles that are
+	// applied on (post synthesized) text to speech. Effects are applied on top of
+	// each other in the order they are given.
+	EffectsProfileId []string `protobuf:"bytes,5,rep,name=effects_profile_id,json=effectsProfileId,proto3" json:"effects_profile_id,omitempty"`
+	// Optional. The desired voice of the synthesized audio.
+	Voice                *VoiceSelectionParams `protobuf:"bytes,4,opt,name=voice,proto3" json:"voice,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *SynthesizeSpeechConfig) Reset()         { *m = SynthesizeSpeechConfig{} }
+func (m *SynthesizeSpeechConfig) String() string { return proto.CompactTextString(m) }
+func (*SynthesizeSpeechConfig) ProtoMessage()    {}
+func (*SynthesizeSpeechConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audio_config_b255710fcad33f7d, []int{1}
+}
+func (m *SynthesizeSpeechConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SynthesizeSpeechConfig.Unmarshal(m, b)
+}
+func (m *SynthesizeSpeechConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SynthesizeSpeechConfig.Marshal(b, m, deterministic)
+}
+func (dst *SynthesizeSpeechConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechConfig.Merge(dst, src)
+}
+func (m *SynthesizeSpeechConfig) XXX_Size() int {
+	return xxx_messageInfo_SynthesizeSpeechConfig.Size(m)
+}
+func (m *SynthesizeSpeechConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_SynthesizeSpeechConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SynthesizeSpeechConfig proto.InternalMessageInfo
+
+func (m *SynthesizeSpeechConfig) GetSpeakingRate() float64 {
+	if m != nil {
+		return m.SpeakingRate
+	}
+	return 0
+}
+
+func (m *SynthesizeSpeechConfig) GetPitch() float64 {
+	if m != nil {
+		return m.Pitch
+	}
+	return 0
+}
+
+func (m *SynthesizeSpeechConfig) GetVolumeGainDb() float64 {
+	if m != nil {
+		return m.VolumeGainDb
+	}
+	return 0
+}
+
+func (m *SynthesizeSpeechConfig) GetEffectsProfileId() []string {
+	if m != nil {
+		return m.EffectsProfileId
+	}
+	return nil
+}
+
+func (m *SynthesizeSpeechConfig) GetVoice() *VoiceSelectionParams {
+	if m != nil {
+		return m.Voice
+	}
+	return nil
+}
+
+// Instructs the speech synthesizer how to generate the output audio content.
+type OutputAudioConfig struct {
+	// Required. Audio encoding of the synthesized audio content.
+	AudioEncoding OutputAudioEncoding `protobuf:"varint,1,opt,name=audio_encoding,json=audioEncoding,proto3,enum=google.cloud.dialogflow.v2beta1.OutputAudioEncoding" json:"audio_encoding,omitempty"`
+	// Optional. The synthesis sample rate (in hertz) for this audio. If not
+	// provided, then the synthesizer will use the default sample rate based on
+	// the audio encoding. If this is different from the voice's natural sample
+	// rate, then the synthesizer will honor this request by converting to the
+	// desired sample rate (which might result in worse audio quality).
+	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
+	// Optional. Configuration of how speech should be synthesized.
+	SynthesizeSpeechConfig *SynthesizeSpeechConfig `protobuf:"bytes,3,opt,name=synthesize_speech_config,json=synthesizeSpeechConfig,proto3" json:"synthesize_speech_config,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{}                `json:"-"`
+	XXX_unrecognized       []byte                  `json:"-"`
+	XXX_sizecache          int32                   `json:"-"`
+}
+
+func (m *OutputAudioConfig) Reset()         { *m = OutputAudioConfig{} }
+func (m *OutputAudioConfig) String() string { return proto.CompactTextString(m) }
+func (*OutputAudioConfig) ProtoMessage()    {}
+func (*OutputAudioConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audio_config_b255710fcad33f7d, []int{2}
+}
+func (m *OutputAudioConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputAudioConfig.Unmarshal(m, b)
+}
+func (m *OutputAudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputAudioConfig.Marshal(b, m, deterministic)
+}
+func (dst *OutputAudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputAudioConfig.Merge(dst, src)
+}
+func (m *OutputAudioConfig) XXX_Size() int {
+	return xxx_messageInfo_OutputAudioConfig.Size(m)
+}
+func (m *OutputAudioConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputAudioConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutputAudioConfig proto.InternalMessageInfo
+
+func (m *OutputAudioConfig) GetAudioEncoding() OutputAudioEncoding {
+	if m != nil {
+		return m.AudioEncoding
+	}
+	return OutputAudioEncoding_OUTPUT_AUDIO_ENCODING_UNSPECIFIED
+}
+
+func (m *OutputAudioConfig) GetSampleRateHertz() int32 {
+	if m != nil {
+		return m.SampleRateHertz
+	}
+	return 0
+}
+
+func (m *OutputAudioConfig) GetSynthesizeSpeechConfig() *SynthesizeSpeechConfig {
+	if m != nil {
+		return m.SynthesizeSpeechConfig
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.dialogflow.v2beta1.VoiceSelectionParams")
+	proto.RegisterType((*SynthesizeSpeechConfig)(nil), "google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig")
+	proto.RegisterType((*OutputAudioConfig)(nil), "google.cloud.dialogflow.v2beta1.OutputAudioConfig")
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.OutputAudioEncoding", OutputAudioEncoding_name, OutputAudioEncoding_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/audio_config.proto", fileDescriptor_audio_config_b255710fcad33f7d)
+}
+
+var fileDescriptor_audio_config_b255710fcad33f7d = []byte{
+	// 647 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x4f, 0x6f, 0xd3, 0x3e,
+	0x18, 0xfe, 0xb9, 0x5d, 0x7f, 0xd2, 0x3c, 0xd6, 0x65, 0x66, 0x9a, 0xca, 0xb4, 0xb1, 0xae, 0x03,
+	0xa9, 0x9a, 0x50, 0xcb, 0x3a, 0xfe, 0x1c, 0x38, 0x75, 0x6d, 0x56, 0x22, 0xba, 0x26, 0x24, 0xeb,
+	0x0e, 0x70, 0xb0, 0xdc, 0xc4, 0x4d, 0x2d, 0x12, 0x3b, 0x24, 0xe9, 0x10, 0x93, 0xf8, 0x08, 0x88,
+	0xef, 0x80, 0x38, 0x71, 0xe0, 0xd3, 0x71, 0xe0, 0x88, 0x62, 0x07, 0x36, 0x6d, 0x41, 0xbd, 0xc5,
+	0xef, 0xe3, 0xe7, 0xf5, 0xf3, 0x3e, 0x8f, 0x63, 0xd8, 0xf1, 0x85, 0xf0, 0x03, 0xda, 0x76, 0x03,
+	0x31, 0xf7, 0xda, 0x1e, 0x23, 0x81, 0xf0, 0xa7, 0x81, 0xf8, 0xd0, 0xbe, 0xe8, 0x4c, 0x68, 0x4a,
+	0x0e, 0xdb, 0x64, 0xee, 0x31, 0x81, 0x5d, 0xc1, 0xa7, 0xcc, 0x6f, 0x45, 0xb1, 0x48, 0x05, 0xda,
+	0x55, 0x9c, 0x96, 0xe4, 0xb4, 0xae, 0x38, 0xad, 0x9c, 0xb3, 0xb5, 0x9d, 0x37, 0x25, 0x11, 0x6b,
+	0x13, 0xce, 0x45, 0x4a, 0x52, 0x26, 0x78, 0xa2, 0xe8, 0x8d, 0x4f, 0x70, 0xe3, 0x5c, 0x30, 0x97,
+	0x3a, 0x34, 0xa0, 0x6e, 0x06, 0x58, 0x24, 0x26, 0x61, 0x82, 0x10, 0x5c, 0xe2, 0x24, 0xa4, 0x35,
+	0x50, 0x07, 0xcd, 0x65, 0x5b, 0x7e, 0xa3, 0xd7, 0x70, 0x25, 0x49, 0xc2, 0x00, 0xfb, 0x94, 0x7b,
+	0x34, 0xae, 0x95, 0xea, 0xa0, 0x59, 0xed, 0x3c, 0x6e, 0x2d, 0x10, 0xd0, 0x72, 0x92, 0x30, 0x90,
+	0x67, 0x0c, 0x24, 0xcf, 0x86, 0x59, 0x13, 0xf5, 0xdd, 0xf8, 0x09, 0xe0, 0xa6, 0xf3, 0x91, 0xa7,
+	0x33, 0x9a, 0xb0, 0x4b, 0xea, 0x44, 0x94, 0xba, 0xb3, 0x9e, 0x1c, 0x0f, 0xed, 0xc3, 0xd5, 0x24,
+	0xa2, 0xe4, 0x1d, 0xe3, 0x3e, 0x8e, 0x49, 0xaa, 0xa4, 0x00, 0xfb, 0xce, 0x9f, 0xa2, 0x4d, 0x52,
+	0x8a, 0x36, 0x60, 0x25, 0x62, 0xa9, 0x3b, 0x93, 0x62, 0x80, 0xad, 0x16, 0xe8, 0x01, 0xac, 0x5e,
+	0x88, 0x60, 0x1e, 0x52, 0xec, 0x13, 0xc6, 0xb1, 0x37, 0xa9, 0x95, 0x15, 0x57, 0x55, 0x07, 0x84,
+	0xf1, 0xfe, 0x04, 0x3d, 0x82, 0x88, 0x4e, 0xa7, 0xd4, 0x4d, 0x13, 0x1c, 0xc5, 0x62, 0xca, 0x02,
+	0x8a, 0x99, 0x57, 0xab, 0xd4, 0xcb, 0xcd, 0x65, 0x5b, 0xcb, 0x11, 0x4b, 0x01, 0x86, 0x87, 0x5e,
+	0xc1, 0xca, 0x45, 0x36, 0x44, 0x6d, 0xa9, 0x0e, 0x9a, 0x2b, 0x9d, 0xa7, 0x0b, 0xc7, 0x2e, 0xb2,
+	0xd5, 0x56, 0x3d, 0x1a, 0x5f, 0x4a, 0x70, 0xdd, 0x9c, 0xa7, 0xd1, 0x3c, 0xed, 0x66, 0x89, 0xe6,
+	0x13, 0xbf, 0x85, 0x55, 0x15, 0x30, 0xe5, 0xae, 0xf0, 0x18, 0xf7, 0xe5, 0xc8, 0xd5, 0xce, 0x93,
+	0x85, 0x67, 0x5d, 0xeb, 0xa5, 0xe7, 0x5c, 0x7b, 0x95, 0x5c, 0x5f, 0xa2, 0x03, 0xb8, 0x9e, 0x90,
+	0x30, 0x0a, 0xa8, 0x34, 0x13, 0xcf, 0x68, 0x9c, 0x5e, 0x4a, 0xd7, 0x2a, 0xf6, 0x9a, 0x02, 0x32,
+	0x43, 0x5f, 0x66, 0x65, 0xf4, 0x1e, 0xd6, 0x92, 0xbf, 0xa1, 0xe0, 0x44, 0xa6, 0x92, 0xdf, 0x3a,
+	0xe9, 0xe4, 0x4a, 0xe7, 0xf9, 0xe2, 0xd4, 0x0b, 0x53, 0xb5, 0x37, 0x93, 0xc2, 0xfa, 0xc1, 0x67,
+	0x00, 0xd7, 0x6e, 0x5c, 0x14, 0xb4, 0x07, 0x77, 0x1c, 0xe7, 0x74, 0x88, 0xcf, 0x4d, 0xa3, 0xa7,
+	0xe3, 0x81, 0x3e, 0xea, 0xeb, 0x36, 0x1e, 0x8f, 0x1c, 0x4b, 0xef, 0x19, 0x27, 0x86, 0xde, 0xd7,
+	0xfe, 0x43, 0x5b, 0x70, 0xf3, 0xf6, 0x96, 0xd3, 0xee, 0x50, 0xd7, 0x00, 0xda, 0x86, 0xb5, 0xdb,
+	0xd8, 0x89, 0x2e, 0xd1, 0x12, 0xda, 0x81, 0xf7, 0x6e, 0xa3, 0x23, 0x7d, 0x7c, 0x66, 0x77, 0x87,
+	0x5a, 0xf9, 0xe0, 0x1b, 0x80, 0x77, 0x0b, 0x5c, 0x45, 0x0f, 0xe1, 0x9e, 0x39, 0x3e, 0xb3, 0xc6,
+	0x67, 0xb8, 0x3b, 0xee, 0x1b, 0x26, 0xd6, 0x47, 0x3d, 0xb3, 0x6f, 0x8c, 0x06, 0x37, 0x74, 0xed,
+	0xc3, 0xdd, 0xe2, 0x6d, 0x43, 0x63, 0xa4, 0x77, 0x6d, 0x7c, 0xf8, 0x4c, 0x03, 0x99, 0x84, 0xe2,
+	0x4d, 0xa7, 0xd6, 0x91, 0x56, 0x42, 0x0d, 0x78, 0xbf, 0x18, 0x36, 0x07, 0x03, 0x6c, 0x5a, 0x63,
+	0x47, 0x2b, 0x1f, 0xff, 0x00, 0x70, 0xdf, 0x15, 0xe1, 0xa2, 0x34, 0x8e, 0xb5, 0x6b, 0xf7, 0xcc,
+	0xca, 0x7e, 0x7c, 0x0b, 0xbc, 0x31, 0x72, 0x92, 0x2f, 0x02, 0xc2, 0xfd, 0x96, 0x88, 0xfd, 0xb6,
+	0x4f, 0xb9, 0x7c, 0x16, 0xda, 0x0a, 0x22, 0x11, 0x4b, 0xfe, 0xf9, 0x18, 0xbd, 0xb8, 0x2a, 0xfd,
+	0x02, 0xe0, 0x6b, 0xa9, 0xd4, 0x3f, 0xf9, 0x5e, 0xda, 0x1d, 0xa8, 0x9e, 0x3d, 0x29, 0xa4, 0x7f,
+	0x25, 0xe4, 0x5c, 0x91, 0x26, 0xff, 0xcb, 0xfe, 0x47, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x18,
+	0xb5, 0x45, 0x5e, 0xeb, 0x04, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/context.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/context.pb.go
index dafb4353..fb5eba94 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/context.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/context.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/context.proto
 
-package dialogflow
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/struct"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,27 +21,59 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Represents a context.
 type Context struct {
 	// Required. The unique identifier of the context. Format:
-	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`.
-	// Note: The Context ID is always converted to lowercase.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`,
+	// or `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
+	// ID>/sessions/<Session ID>/contexts/<Context ID>`. The `Context ID` is
+	// always converted to lowercase. If `Environment ID` is not specified, we
+	// assume default 'draft' environment. If `User ID` is not specified, we
+	// assume default '-' user.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The number of conversational query requests after which the
 	// context expires. If set to `0` (the default) the context expires
 	// immediately. Contexts expire automatically after 10 minutes even if there
 	// are no matching queries.
-	LifespanCount int32 `protobuf:"varint,2,opt,name=lifespan_count,json=lifespanCount" json:"lifespan_count,omitempty"`
+	LifespanCount int32 `protobuf:"varint,2,opt,name=lifespan_count,json=lifespanCount,proto3" json:"lifespan_count,omitempty"`
 	// Optional. The collection of parameters associated with this context.
 	// Refer to [this doc](https://dialogflow.com/docs/actions-and-parameters) for
 	// syntax.
-	Parameters *google_protobuf4.Struct `protobuf:"bytes,3,opt,name=parameters" json:"parameters,omitempty"`
+	Parameters           *_struct.Struct `protobuf:"bytes,3,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Context) Reset()         { *m = Context{} }
+func (m *Context) String() string { return proto.CompactTextString(m) }
+func (*Context) ProtoMessage()    {}
+func (*Context) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_1af894e4ed9b5507, []int{0}
+}
+func (m *Context) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Context.Unmarshal(m, b)
+}
+func (m *Context) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Context.Marshal(b, m, deterministic)
+}
+func (dst *Context) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Context.Merge(dst, src)
+}
+func (m *Context) XXX_Size() int {
+	return xxx_messageInfo_Context.Size(m)
+}
+func (m *Context) XXX_DiscardUnknown() {
+	xxx_messageInfo_Context.DiscardUnknown(m)
 }
 
-func (m *Context) Reset()                    { *m = Context{} }
-func (m *Context) String() string            { return proto.CompactTextString(m) }
-func (*Context) ProtoMessage()               {}
-func (*Context) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Context proto.InternalMessageInfo
 
 func (m *Context) GetName() string {
 	if m != nil {
@@ -57,30 +89,55 @@ func (m *Context) GetLifespanCount() int32 {
 	return 0
 }
 
-func (m *Context) GetParameters() *google_protobuf4.Struct {
+func (m *Context) GetParameters() *_struct.Struct {
 	if m != nil {
 		return m.Parameters
 	}
 	return nil
 }
 
-// The request message for
-// [Contexts.ListContexts][google.cloud.dialogflow.v2beta1.Contexts.ListContexts].
+// The request message for [Contexts.ListContexts][google.cloud.dialogflow.v2beta1.Contexts.ListContexts].
 type ListContextsRequest struct {
 	// Required. The session to list all contexts from.
-	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>` or
+	// `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
+	// ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume
+	// default 'draft' environment. If `User ID` is not specified, we assume
+	// default '-' user.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. The maximum number of items to return in a single page. By
 	// default 100 and at most 1000.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The next_page_token value returned from a previous list request.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListContextsRequest) Reset()         { *m = ListContextsRequest{} }
+func (m *ListContextsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListContextsRequest) ProtoMessage()    {}
+func (*ListContextsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_1af894e4ed9b5507, []int{1}
+}
+func (m *ListContextsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListContextsRequest.Unmarshal(m, b)
+}
+func (m *ListContextsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListContextsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListContextsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListContextsRequest.Merge(dst, src)
+}
+func (m *ListContextsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListContextsRequest.Size(m)
+}
+func (m *ListContextsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListContextsRequest.DiscardUnknown(m)
 }
 
-func (m *ListContextsRequest) Reset()                    { *m = ListContextsRequest{} }
-func (m *ListContextsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListContextsRequest) ProtoMessage()               {}
-func (*ListContextsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_ListContextsRequest proto.InternalMessageInfo
 
 func (m *ListContextsRequest) GetParent() string {
 	if m != nil {
@@ -103,21 +160,42 @@ func (m *ListContextsRequest) GetPageToken() string {
 	return ""
 }
 
-// The response message for
-// [Contexts.ListContexts][google.cloud.dialogflow.v2beta1.Contexts.ListContexts].
+// The response message for [Contexts.ListContexts][google.cloud.dialogflow.v2beta1.Contexts.ListContexts].
 type ListContextsResponse struct {
 	// The list of contexts. There will be a maximum number of items
 	// returned based on the page_size field in the request.
-	Contexts []*Context `protobuf:"bytes,1,rep,name=contexts" json:"contexts,omitempty"`
+	Contexts []*Context `protobuf:"bytes,1,rep,name=contexts,proto3" json:"contexts,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no
 	// more results in the list.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListContextsResponse) Reset()                    { *m = ListContextsResponse{} }
-func (m *ListContextsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListContextsResponse) ProtoMessage()               {}
-func (*ListContextsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *ListContextsResponse) Reset()         { *m = ListContextsResponse{} }
+func (m *ListContextsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListContextsResponse) ProtoMessage()    {}
+func (*ListContextsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_1af894e4ed9b5507, []int{2}
+}
+func (m *ListContextsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListContextsResponse.Unmarshal(m, b)
+}
+func (m *ListContextsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListContextsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListContextsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListContextsResponse.Merge(dst, src)
+}
+func (m *ListContextsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListContextsResponse.Size(m)
+}
+func (m *ListContextsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListContextsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListContextsResponse proto.InternalMessageInfo
 
 func (m *ListContextsResponse) GetContexts() []*Context {
 	if m != nil {
@@ -133,18 +211,43 @@ func (m *ListContextsResponse) GetNextPageToken() string {
 	return ""
 }
 
-// The request message for
-// [Contexts.GetContext][google.cloud.dialogflow.v2beta1.Contexts.GetContext].
+// The request message for [Contexts.GetContext][google.cloud.dialogflow.v2beta1.Contexts.GetContext].
 type GetContextRequest struct {
 	// Required. The name of the context. Format:
-	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`
+	// or `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
+	// ID>/sessions/<Session ID>/contexts/<Context ID>`. If `Environment ID` is
+	// not specified, we assume default 'draft' environment. If `User ID` is not
+	// specified, we assume default '-' user.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetContextRequest) Reset()                    { *m = GetContextRequest{} }
-func (m *GetContextRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetContextRequest) ProtoMessage()               {}
-func (*GetContextRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *GetContextRequest) Reset()         { *m = GetContextRequest{} }
+func (m *GetContextRequest) String() string { return proto.CompactTextString(m) }
+func (*GetContextRequest) ProtoMessage()    {}
+func (*GetContextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_1af894e4ed9b5507, []int{3}
+}
+func (m *GetContextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetContextRequest.Unmarshal(m, b)
+}
+func (m *GetContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetContextRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetContextRequest.Merge(dst, src)
+}
+func (m *GetContextRequest) XXX_Size() int {
+	return xxx_messageInfo_GetContextRequest.Size(m)
+}
+func (m *GetContextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetContextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetContextRequest proto.InternalMessageInfo
 
 func (m *GetContextRequest) GetName() string {
 	if m != nil {
@@ -153,20 +256,45 @@ func (m *GetContextRequest) GetName() string {
 	return ""
 }
 
-// The request message for
-// [Contexts.CreateContext][google.cloud.dialogflow.v2beta1.Contexts.CreateContext].
+// The request message for [Contexts.CreateContext][google.cloud.dialogflow.v2beta1.Contexts.CreateContext].
 type CreateContextRequest struct {
 	// Required. The session to create a context for.
-	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>` or
+	// `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
+	// ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume
+	// default 'draft' environment. If `User ID` is not specified, we assume
+	// default '-' user.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The context to create.
-	Context *Context `protobuf:"bytes,2,opt,name=context" json:"context,omitempty"`
+	Context              *Context `protobuf:"bytes,2,opt,name=context,proto3" json:"context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateContextRequest) Reset()                    { *m = CreateContextRequest{} }
-func (m *CreateContextRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateContextRequest) ProtoMessage()               {}
-func (*CreateContextRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (m *CreateContextRequest) Reset()         { *m = CreateContextRequest{} }
+func (m *CreateContextRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateContextRequest) ProtoMessage()    {}
+func (*CreateContextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_1af894e4ed9b5507, []int{4}
+}
+func (m *CreateContextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateContextRequest.Unmarshal(m, b)
+}
+func (m *CreateContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateContextRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateContextRequest.Merge(dst, src)
+}
+func (m *CreateContextRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateContextRequest.Size(m)
+}
+func (m *CreateContextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateContextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateContextRequest proto.InternalMessageInfo
 
 func (m *CreateContextRequest) GetParent() string {
 	if m != nil {
@@ -182,19 +310,40 @@ func (m *CreateContextRequest) GetContext() *Context {
 	return nil
 }
 
-// The request message for
-// [Contexts.UpdateContext][google.cloud.dialogflow.v2beta1.Contexts.UpdateContext].
+// The request message for [Contexts.UpdateContext][google.cloud.dialogflow.v2beta1.Contexts.UpdateContext].
 type UpdateContextRequest struct {
 	// Required. The context to update.
-	Context *Context `protobuf:"bytes,1,opt,name=context" json:"context,omitempty"`
+	Context *Context `protobuf:"bytes,1,opt,name=context,proto3" json:"context,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateContextRequest) Reset()                    { *m = UpdateContextRequest{} }
-func (m *UpdateContextRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateContextRequest) ProtoMessage()               {}
-func (*UpdateContextRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *UpdateContextRequest) Reset()         { *m = UpdateContextRequest{} }
+func (m *UpdateContextRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateContextRequest) ProtoMessage()    {}
+func (*UpdateContextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_1af894e4ed9b5507, []int{5}
+}
+func (m *UpdateContextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateContextRequest.Unmarshal(m, b)
+}
+func (m *UpdateContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateContextRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateContextRequest.Merge(dst, src)
+}
+func (m *UpdateContextRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateContextRequest.Size(m)
+}
+func (m *UpdateContextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateContextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateContextRequest proto.InternalMessageInfo
 
 func (m *UpdateContextRequest) GetContext() *Context {
 	if m != nil {
@@ -203,25 +352,50 @@ func (m *UpdateContextRequest) GetContext() *Context {
 	return nil
 }
 
-func (m *UpdateContextRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateContextRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
 	return nil
 }
 
-// The request message for
-// [Contexts.DeleteContext][google.cloud.dialogflow.v2beta1.Contexts.DeleteContext].
+// The request message for [Contexts.DeleteContext][google.cloud.dialogflow.v2beta1.Contexts.DeleteContext].
 type DeleteContextRequest struct {
 	// Required. The name of the context to delete. Format:
-	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// `projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>`
+	// or `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
+	// ID>/sessions/<Session ID>/contexts/<Context ID>`. If `Environment ID` is
+	// not specified, we assume default 'draft' environment. If `User ID` is not
+	// specified, we assume default '-' user.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteContextRequest) Reset()         { *m = DeleteContextRequest{} }
+func (m *DeleteContextRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteContextRequest) ProtoMessage()    {}
+func (*DeleteContextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_1af894e4ed9b5507, []int{6}
+}
+func (m *DeleteContextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteContextRequest.Unmarshal(m, b)
+}
+func (m *DeleteContextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteContextRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteContextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteContextRequest.Merge(dst, src)
+}
+func (m *DeleteContextRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteContextRequest.Size(m)
+}
+func (m *DeleteContextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteContextRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteContextRequest) Reset()                    { *m = DeleteContextRequest{} }
-func (m *DeleteContextRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteContextRequest) ProtoMessage()               {}
-func (*DeleteContextRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_DeleteContextRequest proto.InternalMessageInfo
 
 func (m *DeleteContextRequest) GetName() string {
 	if m != nil {
@@ -230,18 +404,42 @@ func (m *DeleteContextRequest) GetName() string {
 	return ""
 }
 
-// The request message for
-// [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2beta1.Contexts.DeleteAllContexts].
+// The request message for [Contexts.DeleteAllContexts][google.cloud.dialogflow.v2beta1.Contexts.DeleteAllContexts].
 type DeleteAllContextsRequest struct {
 	// Required. The name of the session to delete all contexts from. Format:
-	// `projects/<Project ID>/agent/sessions/<Session ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	// `projects/<Project ID>/agent/sessions/<Session ID>` or `projects/<Project
+	// ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session
+	// ID>`. If `Environment ID` is not specified we assume default 'draft'
+	// environment. If `User ID` is not specified, we assume default '-' user.
+	Parent               string   `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteAllContextsRequest) Reset()                    { *m = DeleteAllContextsRequest{} }
-func (m *DeleteAllContextsRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteAllContextsRequest) ProtoMessage()               {}
-func (*DeleteAllContextsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+func (m *DeleteAllContextsRequest) Reset()         { *m = DeleteAllContextsRequest{} }
+func (m *DeleteAllContextsRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteAllContextsRequest) ProtoMessage()    {}
+func (*DeleteAllContextsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_context_1af894e4ed9b5507, []int{7}
+}
+func (m *DeleteAllContextsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteAllContextsRequest.Unmarshal(m, b)
+}
+func (m *DeleteAllContextsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteAllContextsRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteAllContextsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAllContextsRequest.Merge(dst, src)
+}
+func (m *DeleteAllContextsRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteAllContextsRequest.Size(m)
+}
+func (m *DeleteAllContextsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteAllContextsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteAllContextsRequest proto.InternalMessageInfo
 
 func (m *DeleteAllContextsRequest) GetParent() string {
 	if m != nil {
@@ -269,8 +467,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Contexts service
-
+// ContextsClient is the client API for Contexts service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ContextsClient interface {
 	// Returns the list of all contexts in the specified session.
 	ListContexts(ctx context.Context, in *ListContextsRequest, opts ...grpc.CallOption) (*ListContextsResponse, error)
@@ -281,9 +480,9 @@ type ContextsClient interface {
 	// Updates the specified context.
 	UpdateContext(ctx context.Context, in *UpdateContextRequest, opts ...grpc.CallOption) (*Context, error)
 	// Deletes the specified context.
-	DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Deletes all active contexts in the specified session.
-	DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type contextsClient struct {
@@ -296,7 +495,7 @@ func NewContextsClient(cc *grpc.ClientConn) ContextsClient {
 
 func (c *contextsClient) ListContexts(ctx context.Context, in *ListContextsRequest, opts ...grpc.CallOption) (*ListContextsResponse, error) {
 	out := new(ListContextsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/ListContexts", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/ListContexts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -305,7 +504,7 @@ func (c *contextsClient) ListContexts(ctx context.Context, in *ListContextsReque
 
 func (c *contextsClient) GetContext(ctx context.Context, in *GetContextRequest, opts ...grpc.CallOption) (*Context, error) {
 	out := new(Context)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/GetContext", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/GetContext", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -314,7 +513,7 @@ func (c *contextsClient) GetContext(ctx context.Context, in *GetContextRequest,
 
 func (c *contextsClient) CreateContext(ctx context.Context, in *CreateContextRequest, opts ...grpc.CallOption) (*Context, error) {
 	out := new(Context)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/CreateContext", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/CreateContext", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -323,33 +522,32 @@ func (c *contextsClient) CreateContext(ctx context.Context, in *CreateContextReq
 
 func (c *contextsClient) UpdateContext(ctx context.Context, in *UpdateContextRequest, opts ...grpc.CallOption) (*Context, error) {
 	out := new(Context)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/UpdateContext", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/UpdateContext", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *contextsClient) DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/DeleteContext", in, out, c.cc, opts...)
+func (c *contextsClient) DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/DeleteContext", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *contextsClient) DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/DeleteAllContexts", in, out, c.cc, opts...)
+func (c *contextsClient) DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Contexts/DeleteAllContexts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Contexts service
-
+// ContextsServer is the server API for Contexts service.
 type ContextsServer interface {
 	// Returns the list of all contexts in the specified session.
 	ListContexts(context.Context, *ListContextsRequest) (*ListContextsResponse, error)
@@ -360,9 +558,9 @@ type ContextsServer interface {
 	// Updates the specified context.
 	UpdateContext(context.Context, *UpdateContextRequest) (*Context, error)
 	// Deletes the specified context.
-	DeleteContext(context.Context, *DeleteContextRequest) (*google_protobuf2.Empty, error)
+	DeleteContext(context.Context, *DeleteContextRequest) (*empty.Empty, error)
 	// Deletes all active contexts in the specified session.
-	DeleteAllContexts(context.Context, *DeleteAllContextsRequest) (*google_protobuf2.Empty, error)
+	DeleteAllContexts(context.Context, *DeleteAllContextsRequest) (*empty.Empty, error)
 }
 
 func RegisterContextsServer(s *grpc.Server, srv ContextsServer) {
@@ -510,54 +708,61 @@ var _Contexts_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dialogflow/v2beta1/context.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dialogflow/v2beta1/context.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 731 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x96, 0xcd, 0x6e, 0xd3, 0x4a,
-	0x14, 0xc7, 0x35, 0xe9, 0xbd, 0x6d, 0x7a, 0xda, 0xdc, 0xab, 0x0e, 0x51, 0x89, 0xd2, 0xa2, 0x46,
-	0x46, 0x40, 0x14, 0x09, 0x5b, 0x84, 0x6f, 0x2a, 0x2a, 0xb5, 0x09, 0xad, 0x2a, 0x81, 0xa8, 0x52,
-	0x60, 0xc1, 0x26, 0x9a, 0x26, 0x27, 0x96, 0xa9, 0xe3, 0x31, 0x9e, 0x09, 0x94, 0xa2, 0x6e, 0x10,
-	0x6f, 0xc0, 0x82, 0x1d, 0x0b, 0x16, 0x2c, 0xfa, 0x06, 0x88, 0x05, 0xe2, 0x19, 0x78, 0x05, 0x1e,
-	0x82, 0x25, 0xf2, 0x78, 0x9c, 0x8f, 0x26, 0x25, 0x71, 0x77, 0xf1, 0xcc, 0x7f, 0xce, 0xf9, 0x9d,
-	0x33, 0xff, 0x63, 0x07, 0xae, 0xda, 0x9c, 0xdb, 0x2e, 0x5a, 0x0d, 0x97, 0x77, 0x9a, 0x56, 0xd3,
-	0x61, 0x2e, 0xb7, 0x5b, 0x2e, 0x7f, 0x6d, 0xbd, 0x2a, 0xef, 0xa1, 0x64, 0xd7, 0xac, 0x06, 0xf7,
-	0x24, 0x1e, 0x48, 0xd3, 0x0f, 0xb8, 0xe4, 0x74, 0x25, 0x92, 0x9b, 0x4a, 0x6e, 0xf6, 0xe4, 0xa6,
-	0x96, 0xe7, 0x97, 0x75, 0x3c, 0xe6, 0x3b, 0x16, 0xf3, 0x3c, 0x2e, 0x99, 0x74, 0xb8, 0x27, 0xa2,
-	0xe3, 0xf9, 0x25, 0xbd, 0xab, 0x9e, 0xf6, 0x3a, 0x2d, 0x0b, 0xdb, 0xbe, 0x7c, 0xa3, 0x37, 0x0b,
-	0x27, 0x37, 0x5b, 0x0e, 0xba, 0xcd, 0x7a, 0x9b, 0x89, 0x7d, 0xad, 0x58, 0x3e, 0xa9, 0x10, 0x32,
-	0xe8, 0x34, 0x34, 0x9b, 0x71, 0x04, 0x33, 0x95, 0x08, 0x96, 0x52, 0xf8, 0xc7, 0x63, 0x6d, 0xcc,
-	0x91, 0x02, 0x29, 0xce, 0xd6, 0xd4, 0x6f, 0x7a, 0x09, 0xfe, 0x73, 0x9d, 0x16, 0x0a, 0x9f, 0x79,
-	0xf5, 0x06, 0xef, 0x78, 0x32, 0x97, 0x2a, 0x90, 0xe2, 0xbf, 0xb5, 0x4c, 0xbc, 0x5a, 0x09, 0x17,
-	0xe9, 0x6d, 0x00, 0x9f, 0x05, 0xac, 0x8d, 0x12, 0x03, 0x91, 0x9b, 0x2a, 0x90, 0xe2, 0x5c, 0xf9,
-	0xbc, 0xa9, 0xcb, 0x8e, 0x13, 0x9b, 0xbb, 0x2a, 0x71, 0xad, 0x4f, 0x6a, 0x38, 0x70, 0xee, 0xa1,
-	0x23, 0xa4, 0x46, 0x10, 0x35, 0x7c, 0xd9, 0x41, 0x21, 0xe9, 0x22, 0x4c, 0xfb, 0x2c, 0x40, 0x4f,
-	0x6a, 0x18, 0xfd, 0x44, 0x97, 0x60, 0xd6, 0x67, 0x36, 0xd6, 0x85, 0x73, 0x88, 0x9a, 0x24, 0x1d,
-	0x2e, 0xec, 0x3a, 0x87, 0x48, 0x2f, 0x84, 0x10, 0x36, 0xd6, 0x25, 0xdf, 0x47, 0x4f, 0x41, 0xcc,
-	0xd6, 0x94, 0xfc, 0x49, 0xb8, 0x60, 0xbc, 0x27, 0x90, 0x1d, 0xcc, 0x25, 0x7c, 0xee, 0x09, 0xa4,
-	0x55, 0x48, 0xeb, 0xfb, 0x12, 0x39, 0x52, 0x98, 0x2a, 0xce, 0x95, 0x8b, 0xe6, 0x98, 0x1b, 0x33,
-	0x75, 0x90, 0x5a, 0xf7, 0x24, 0xbd, 0x0c, 0xff, 0x7b, 0x78, 0x20, 0xeb, 0x7d, 0x08, 0x29, 0x85,
-	0x90, 0x09, 0x97, 0x77, 0xba, 0x18, 0x57, 0x60, 0x61, 0x0b, 0x63, 0x88, 0xb8, 0xde, 0x11, 0xad,
-	0x37, 0x02, 0xc8, 0x56, 0x02, 0x64, 0x12, 0x4f, 0x68, 0x4f, 0xeb, 0xcd, 0x06, 0xcc, 0x68, 0x18,
-	0x95, 0x38, 0x49, 0x15, 0xf1, 0x41, 0xe3, 0x23, 0x81, 0xec, 0x53, 0xbf, 0x39, 0x9c, 0xb4, 0x2f,
-	0x38, 0x39, 0x63, 0x70, 0xba, 0x0a, 0x73, 0x1d, 0x15, 0x5b, 0xb9, 0x53, 0x43, 0xe6, 0x87, 0x5c,
-	0xb2, 0x19, 0x1a, 0xf8, 0x11, 0x13, 0xfb, 0x35, 0x88, 0xe4, 0xe1, 0x6f, 0xa3, 0x04, 0xd9, 0x2a,
-	0xba, 0x38, 0x04, 0x36, 0xaa, 0x73, 0x65, 0xc8, 0x45, 0xda, 0x75, 0xd7, 0x9d, 0xd0, 0x59, 0xe5,
-	0xef, 0x69, 0x48, 0xc7, 0x5a, 0xfa, 0x8d, 0xc0, 0x7c, 0xbf, 0x55, 0xe8, 0x8d, 0xb1, 0xd5, 0x8e,
-	0x70, 0x71, 0xfe, 0x66, 0xc2, 0x53, 0x91, 0x1f, 0x8d, 0xb5, 0x77, 0x3f, 0x7f, 0x7d, 0x48, 0xdd,
-	0xa1, 0xb7, 0xba, 0xaf, 0x93, 0xb7, 0x11, 0xe4, 0x7d, 0x3f, 0xe0, 0x2f, 0xb0, 0x21, 0x85, 0x55,
-	0xb2, 0x98, 0x8d, 0x9e, 0xb4, 0x04, 0x0a, 0x11, 0xbe, 0x29, 0xac, 0xd2, 0x91, 0xd5, 0x75, 0xe2,
-	0x31, 0x01, 0xe8, 0x59, 0x8c, 0x96, 0xc7, 0x52, 0x0c, 0xf9, 0x31, 0x3f, 0xf1, 0xed, 0x8e, 0x82,
-	0x0d, 0xef, 0xe0, 0x6f, 0xa8, 0x5d, 0x52, 0xab, 0x74, 0x44, 0xbf, 0x12, 0xc8, 0x0c, 0xd8, 0x9c,
-	0x8e, 0xef, 0xda, 0xa8, 0xb1, 0x48, 0x80, 0xbc, 0xa5, 0x90, 0xd7, 0x8d, 0x33, 0xf6, 0xf7, 0x5e,
-	0xd7, 0xd0, 0x3f, 0x08, 0x64, 0x06, 0xa6, 0x65, 0x02, 0xf6, 0x51, 0xd3, 0x95, 0x80, 0xfd, 0xb1,
-	0x62, 0xdf, 0x2e, 0xaf, 0xf5, 0xd8, 0xe3, 0x6f, 0x4d, 0x92, 0xb6, 0xf7, 0x6a, 0xf8, 0x44, 0x20,
-	0x33, 0x30, 0x58, 0x13, 0xd4, 0x30, 0x6a, 0x10, 0xf3, 0x8b, 0x43, 0x83, 0xfc, 0x20, 0xfc, 0x4c,
-	0xc5, 0x06, 0x29, 0x9d, 0xd5, 0x20, 0x5f, 0x08, 0x2c, 0x0c, 0x4d, 0x33, 0xbd, 0x3b, 0x21, 0xe4,
-	0xf0, 0x1b, 0x20, 0x09, 0x68, 0x12, 0x5b, 0x6c, 0x1c, 0x13, 0xb8, 0xd8, 0xe0, 0xed, 0x71, 0x60,
-	0x1b, 0xf3, 0x1a, 0x68, 0x27, 0x4c, 0xbf, 0x43, 0x9e, 0x6f, 0xeb, 0x03, 0x36, 0x77, 0x99, 0x67,
-	0x9b, 0x3c, 0xb0, 0x2d, 0x1b, 0x3d, 0x05, 0x67, 0x45, 0x5b, 0xcc, 0x77, 0xc4, 0xa9, 0xff, 0x35,
-	0x56, 0x7b, 0x4b, 0xbf, 0x09, 0xf9, 0x9c, 0x4a, 0x55, 0x37, 0x8f, 0x53, 0x2b, 0x5b, 0x51, 0xcc,
-	0x8a, 0x82, 0xa8, 0xf6, 0x20, 0x9e, 0x45, 0x87, 0xf6, 0xa6, 0x55, 0xfc, 0xeb, 0x7f, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0x69, 0x4e, 0x3f, 0xa2, 0xca, 0x08, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/context.proto", fileDescriptor_context_1af894e4ed9b5507)
+}
+
+var fileDescriptor_context_1af894e4ed9b5507 = []byte{
+	// 807 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6b, 0xdb, 0x48,
+	0x14, 0x66, 0x94, 0xdd, 0xfc, 0x98, 0xc4, 0xbb, 0x64, 0xd6, 0x64, 0x8d, 0x93, 0x25, 0x46, 0xcb,
+	0xee, 0x1a, 0xc3, 0x4a, 0xac, 0xf6, 0x17, 0xbb, 0x61, 0x17, 0x1a, 0xbb, 0x09, 0x85, 0x86, 0x06,
+	0xa7, 0x29, 0x25, 0x17, 0x77, 0x62, 0x3f, 0x0b, 0x35, 0xf2, 0x8c, 0xaa, 0x19, 0xa7, 0x69, 0x4a,
+	0x2e, 0xa5, 0x97, 0x5e, 0x4a, 0xa1, 0x94, 0x1e, 0x7a, 0x0b, 0xf4, 0x92, 0xde, 0xfa, 0x6f, 0xf4,
+	0xd8, 0x7f, 0xa1, 0xff, 0x40, 0x6f, 0xed, 0xa1, 0x50, 0x24, 0x8d, 0x2c, 0x3b, 0x56, 0x6a, 0x2b,
+	0xe4, 0x64, 0x69, 0xe6, 0x7b, 0x6f, 0xbe, 0xef, 0xcd, 0xf7, 0x9e, 0x85, 0x7f, 0xb5, 0x39, 0xb7,
+	0x5d, 0x30, 0x9b, 0x2e, 0xef, 0xb6, 0xcc, 0x96, 0x43, 0x5d, 0x6e, 0xb7, 0x5d, 0x7e, 0xd7, 0xdc,
+	0xb7, 0x76, 0x41, 0xd2, 0xdf, 0xcc, 0x26, 0x67, 0x12, 0x0e, 0xa4, 0xe1, 0xf9, 0x5c, 0x72, 0xb2,
+	0x1c, 0xc1, 0x8d, 0x10, 0x6e, 0x24, 0x70, 0x43, 0xc1, 0x8b, 0x4b, 0x2a, 0x1f, 0xf5, 0x1c, 0x93,
+	0x32, 0xc6, 0x25, 0x95, 0x0e, 0x67, 0x22, 0x0a, 0x2f, 0x2e, 0xaa, 0xdd, 0xf0, 0x6d, 0xb7, 0xdb,
+	0x36, 0xa1, 0xe3, 0xc9, 0x7b, 0x6a, 0xb3, 0x74, 0x7a, 0xb3, 0xed, 0x80, 0xdb, 0x6a, 0x74, 0xa8,
+	0xd8, 0x53, 0x88, 0xa5, 0xd3, 0x08, 0x21, 0xfd, 0x6e, 0x53, 0x71, 0xd3, 0x8f, 0xf0, 0x54, 0x35,
+	0x22, 0x4b, 0x08, 0xfe, 0x8a, 0xd1, 0x0e, 0x14, 0x50, 0x09, 0x95, 0x67, 0xea, 0xe1, 0x33, 0xf9,
+	0x09, 0x7f, 0xe3, 0x3a, 0x6d, 0x10, 0x1e, 0x65, 0x8d, 0x26, 0xef, 0x32, 0x59, 0xd0, 0x4a, 0xa8,
+	0xfc, 0x75, 0x3d, 0x17, 0xaf, 0x56, 0x83, 0x45, 0xf2, 0x37, 0xc6, 0x1e, 0xf5, 0x69, 0x07, 0x24,
+	0xf8, 0xa2, 0x30, 0x51, 0x42, 0xe5, 0x59, 0xeb, 0x7b, 0x43, 0xc9, 0x8e, 0x0f, 0x36, 0xb6, 0xc2,
+	0x83, 0xeb, 0x7d, 0x50, 0xdd, 0xc1, 0xdf, 0x5d, 0x75, 0x84, 0x54, 0x14, 0x44, 0x1d, 0xee, 0x74,
+	0x41, 0x48, 0xb2, 0x80, 0x27, 0x3d, 0xea, 0x03, 0x93, 0x8a, 0x8c, 0x7a, 0x23, 0x8b, 0x78, 0xc6,
+	0xa3, 0x36, 0x34, 0x84, 0x73, 0x08, 0x8a, 0xc9, 0x74, 0xb0, 0xb0, 0xe5, 0x1c, 0x02, 0xf9, 0x21,
+	0x20, 0x61, 0x43, 0x43, 0xf2, 0x3d, 0x60, 0x21, 0x89, 0x99, 0x7a, 0x08, 0xbf, 0x1e, 0x2c, 0xe8,
+	0x0f, 0x11, 0xce, 0x0f, 0x9e, 0x25, 0x3c, 0xce, 0x04, 0x90, 0x1a, 0x9e, 0x56, 0xf7, 0x25, 0x0a,
+	0xa8, 0x34, 0x51, 0x9e, 0xb5, 0xca, 0xc6, 0x88, 0x1b, 0x33, 0x54, 0x92, 0x7a, 0x2f, 0x92, 0xfc,
+	0x8c, 0xbf, 0x65, 0x70, 0x20, 0x1b, 0x7d, 0x14, 0xb4, 0x90, 0x42, 0x2e, 0x58, 0xde, 0xec, 0xd1,
+	0xf8, 0x05, 0xcf, 0xaf, 0x43, 0x4c, 0x22, 0xd6, 0x9b, 0x52, 0x7a, 0xdd, 0xc7, 0xf9, 0xaa, 0x0f,
+	0x54, 0xc2, 0x29, 0xec, 0x59, 0xb5, 0x59, 0xc5, 0x53, 0x8a, 0x4c, 0x78, 0x70, 0x16, 0x15, 0x71,
+	0xa0, 0xfe, 0x1c, 0xe1, 0xfc, 0xb6, 0xd7, 0x1a, 0x3e, 0xb4, 0x2f, 0x39, 0x3a, 0x67, 0x72, 0xb2,
+	0x82, 0x67, 0xbb, 0x61, 0xee, 0xd0, 0x9d, 0x8a, 0x64, 0x71, 0xc8, 0x25, 0x6b, 0x81, 0x81, 0x37,
+	0xa8, 0xd8, 0xab, 0xe3, 0x08, 0x1e, 0x3c, 0xeb, 0x15, 0x9c, 0xaf, 0x81, 0x0b, 0x43, 0xc4, 0xd2,
+	0x2a, 0x67, 0xe1, 0x42, 0x84, 0xbd, 0xe4, 0xba, 0x63, 0x3a, 0xcb, 0x7a, 0x33, 0x87, 0xa7, 0x63,
+	0x2c, 0x79, 0xac, 0xe1, 0xb9, 0x7e, 0xab, 0x90, 0x3f, 0x46, 0xaa, 0x4d, 0x71, 0x71, 0xf1, 0xcf,
+	0x8c, 0x51, 0x91, 0x1f, 0xf5, 0x27, 0xe8, 0xc1, 0xdb, 0x77, 0x4f, 0xb5, 0x47, 0x88, 0xfc, 0xd5,
+	0x1b, 0x28, 0xf7, 0x23, 0x9a, 0xff, 0x79, 0x3e, 0xbf, 0x0d, 0x4d, 0x29, 0xcc, 0x8a, 0x49, 0x6d,
+	0x60, 0xd2, 0x14, 0x20, 0x44, 0x30, 0x2b, 0xcc, 0xca, 0x51, 0x3c, 0x75, 0xc4, 0xce, 0x35, 0xb2,
+	0x31, 0x3a, 0x12, 0xd8, 0xbe, 0xe3, 0x73, 0xd6, 0x01, 0x16, 0x2e, 0x76, 0x05, 0xf8, 0xc1, 0x6f,
+	0x5a, 0x42, 0xf2, 0x09, 0x61, 0x9c, 0xb8, 0x96, 0x58, 0x23, 0x85, 0x0d, 0x59, 0xbc, 0x38, 0xb6,
+	0x61, 0xd2, 0xf5, 0x07, 0x17, 0xfb, 0x25, 0xf5, 0x3d, 0xae, 0x66, 0xe5, 0x68, 0x50, 0x7f, 0x7a,
+	0xe4, 0x48, 0xf5, 0xfd, 0x09, 0xc9, 0x33, 0x0d, 0xe7, 0x06, 0x9a, 0x91, 0x8c, 0xbe, 0xdb, 0xb4,
+	0xe6, 0xcd, 0x50, 0x85, 0xe3, 0xa8, 0x0a, 0x2f, 0x90, 0x7e, 0x4e, 0x17, 0xfc, 0x1b, 0x37, 0xde,
+	0xce, 0x4d, 0xfd, 0x62, 0xed, 0xd0, 0xcb, 0x4c, 0x5e, 0x6a, 0x38, 0x37, 0x30, 0x2f, 0xc6, 0xa8,
+	0x4b, 0xda, 0x7c, 0xc9, 0x50, 0x97, 0xd7, 0x51, 0x5d, 0x5e, 0x21, 0xeb, 0xff, 0x44, 0x54, 0xfc,
+	0x7f, 0x9b, 0xc5, 0x25, 0x49, 0x7d, 0x6e, 0x59, 0xdb, 0xe3, 0xa6, 0xca, 0x64, 0x9b, 0xa4, 0x4e,
+	0xef, 0x11, 0xce, 0x0d, 0x8c, 0xaf, 0x31, 0xea, 0x94, 0x36, 0xee, 0x8a, 0x0b, 0x43, 0xe3, 0xf2,
+	0x72, 0xf0, 0x31, 0x90, 0xf4, 0x4c, 0xe5, 0xdc, 0x3d, 0x53, 0xb9, 0xe0, 0x9e, 0xf9, 0x88, 0xf0,
+	0xfc, 0xd0, 0x18, 0x26, 0xff, 0x8c, 0xa9, 0x7b, 0x78, 0x74, 0x67, 0xd3, 0x9e, 0x6d, 0x5e, 0x56,
+	0x2e, 0xb6, 0x41, 0x56, 0x4f, 0x10, 0xfe, 0xb1, 0xc9, 0x3b, 0xa3, 0xb4, 0xae, 0xce, 0x29, 0x8d,
+	0x9b, 0x81, 0xa2, 0x4d, 0xb4, 0x73, 0x45, 0x05, 0xd8, 0xdc, 0xa5, 0xcc, 0x36, 0xb8, 0x6f, 0x9b,
+	0x36, 0xb0, 0x50, 0xaf, 0x19, 0x6d, 0x51, 0xcf, 0x11, 0x67, 0x7e, 0x77, 0xae, 0x24, 0x4b, 0x1f,
+	0x10, 0x3a, 0xd6, 0xb4, 0xda, 0xda, 0x89, 0xb6, 0xbc, 0x1e, 0xe5, 0xac, 0x86, 0x24, 0x6a, 0x09,
+	0x89, 0x1b, 0x51, 0xd0, 0xee, 0x64, 0x98, 0xff, 0xf7, 0xcf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x48,
+	0x77, 0xb8, 0xb5, 0xd6, 0x0a, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/document.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/document.pb.go
new file mode 100644
index 00000000..ee26ae8c
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/document.pb.go
@@ -0,0 +1,830 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2beta1/document.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "github.com/golang/protobuf/ptypes/empty"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import _ "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The knowledge type of document content.
+type Document_KnowledgeType int32
+
+const (
+	// The type is unspecified or arbitrary.
+	Document_KNOWLEDGE_TYPE_UNSPECIFIED Document_KnowledgeType = 0
+	// The document content contains question and answer pairs as either HTML or
+	// CSV. Typical FAQ HTML formats are parsed accurately, but unusual formats
+	// may fail to be parsed.
+	//
+	// CSV must have questions in the first column and answers in the second,
+	// with no header. Because of this explicit format, they are always parsed
+	// accurately.
+	Document_FAQ Document_KnowledgeType = 1
+	// Documents for which unstructured text is extracted and used for
+	// question answering.
+	Document_EXTRACTIVE_QA Document_KnowledgeType = 2
+)
+
+var Document_KnowledgeType_name = map[int32]string{
+	0: "KNOWLEDGE_TYPE_UNSPECIFIED",
+	1: "FAQ",
+	2: "EXTRACTIVE_QA",
+}
+var Document_KnowledgeType_value = map[string]int32{
+	"KNOWLEDGE_TYPE_UNSPECIFIED": 0,
+	"FAQ":           1,
+	"EXTRACTIVE_QA": 2,
+}
+
+func (x Document_KnowledgeType) String() string {
+	return proto.EnumName(Document_KnowledgeType_name, int32(x))
+}
+func (Document_KnowledgeType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{0, 0}
+}
+
+// States of the operation.
+type KnowledgeOperationMetadata_State int32
+
+const (
+	// State unspecified.
+	KnowledgeOperationMetadata_STATE_UNSPECIFIED KnowledgeOperationMetadata_State = 0
+	// The operation has been created.
+	KnowledgeOperationMetadata_PENDING KnowledgeOperationMetadata_State = 1
+	// The operation is currently running.
+	KnowledgeOperationMetadata_RUNNING KnowledgeOperationMetadata_State = 2
+	// The operation is done, either cancelled or completed.
+	KnowledgeOperationMetadata_DONE KnowledgeOperationMetadata_State = 3
+)
+
+var KnowledgeOperationMetadata_State_name = map[int32]string{
+	0: "STATE_UNSPECIFIED",
+	1: "PENDING",
+	2: "RUNNING",
+	3: "DONE",
+}
+var KnowledgeOperationMetadata_State_value = map[string]int32{
+	"STATE_UNSPECIFIED": 0,
+	"PENDING":           1,
+	"RUNNING":           2,
+	"DONE":              3,
+}
+
+func (x KnowledgeOperationMetadata_State) String() string {
+	return proto.EnumName(KnowledgeOperationMetadata_State_name, int32(x))
+}
+func (KnowledgeOperationMetadata_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{6, 0}
+}
+
+// A document resource.
+type Document struct {
+	// The document resource name.
+	// The name must be empty when creating a document.
+	// Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base
+	// ID>/documents/<Document ID>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The display name of the document. The name must be 1024 bytes or
+	// less; otherwise, the creation request fails.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Required. The MIME type of this document.
+	MimeType string `protobuf:"bytes,3,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
+	// Required. The knowledge type of document content.
+	KnowledgeTypes []Document_KnowledgeType `protobuf:"varint,4,rep,packed,name=knowledge_types,json=knowledgeTypes,proto3,enum=google.cloud.dialogflow.v2beta1.Document_KnowledgeType" json:"knowledge_types,omitempty"`
+	// Required. The source of this document.
+	//
+	// Types that are valid to be assigned to Source:
+	//	*Document_ContentUri
+	//	*Document_Content
+	Source               isDocument_Source `protobuf_oneof:"source"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Document) Reset()         { *m = Document{} }
+func (m *Document) String() string { return proto.CompactTextString(m) }
+func (*Document) ProtoMessage()    {}
+func (*Document) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{0}
+}
+func (m *Document) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Document.Unmarshal(m, b)
+}
+func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
+}
+func (dst *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(dst, src)
+}
+func (m *Document) XXX_Size() int {
+	return xxx_messageInfo_Document.Size(m)
+}
+func (m *Document) XXX_DiscardUnknown() {
+	xxx_messageInfo_Document.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Document proto.InternalMessageInfo
+
+func (m *Document) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Document) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *Document) GetMimeType() string {
+	if m != nil {
+		return m.MimeType
+	}
+	return ""
+}
+
+func (m *Document) GetKnowledgeTypes() []Document_KnowledgeType {
+	if m != nil {
+		return m.KnowledgeTypes
+	}
+	return nil
+}
+
+type isDocument_Source interface {
+	isDocument_Source()
+}
+
+type Document_ContentUri struct {
+	ContentUri string `protobuf:"bytes,5,opt,name=content_uri,json=contentUri,proto3,oneof"`
+}
+
+type Document_Content struct {
+	Content string `protobuf:"bytes,6,opt,name=content,proto3,oneof"`
+}
+
+func (*Document_ContentUri) isDocument_Source() {}
+
+func (*Document_Content) isDocument_Source() {}
+
+func (m *Document) GetSource() isDocument_Source {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+func (m *Document) GetContentUri() string {
+	if x, ok := m.GetSource().(*Document_ContentUri); ok {
+		return x.ContentUri
+	}
+	return ""
+}
+
+func (m *Document) GetContent() string {
+	if x, ok := m.GetSource().(*Document_Content); ok {
+		return x.Content
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Document) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Document_OneofMarshaler, _Document_OneofUnmarshaler, _Document_OneofSizer, []interface{}{
+		(*Document_ContentUri)(nil),
+		(*Document_Content)(nil),
+	}
+}
+
+func _Document_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Document)
+	// source
+	switch x := m.Source.(type) {
+	case *Document_ContentUri:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.ContentUri)
+	case *Document_Content:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Content)
+	case nil:
+	default:
+		return fmt.Errorf("Document.Source has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Document_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Document)
+	switch tag {
+	case 5: // source.content_uri
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Source = &Document_ContentUri{x}
+		return true, err
+	case 6: // source.content
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Source = &Document_Content{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Document_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Document)
+	// source
+	switch x := m.Source.(type) {
+	case *Document_ContentUri:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.ContentUri)))
+		n += len(x.ContentUri)
+	case *Document_Content:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Content)))
+		n += len(x.Content)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Request message for [Documents.ListDocuments][google.cloud.dialogflow.v2beta1.Documents.ListDocuments].
+type ListDocumentsRequest struct {
+	// Required. The knowledge base to list all documents for.
+	// Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The maximum number of items to return in a single page. By
+	// default 10 and at most 100.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional. The next_page_token value returned from a previous list request.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDocumentsRequest) Reset()         { *m = ListDocumentsRequest{} }
+func (m *ListDocumentsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDocumentsRequest) ProtoMessage()    {}
+func (*ListDocumentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{1}
+}
+func (m *ListDocumentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDocumentsRequest.Unmarshal(m, b)
+}
+func (m *ListDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDocumentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsRequest.Merge(dst, src)
+}
+func (m *ListDocumentsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDocumentsRequest.Size(m)
+}
+func (m *ListDocumentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDocumentsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDocumentsRequest proto.InternalMessageInfo
+
+func (m *ListDocumentsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListDocumentsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListDocumentsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for [Documents.ListDocuments][google.cloud.dialogflow.v2beta1.Documents.ListDocuments].
+type ListDocumentsResponse struct {
+	// The list of documents.
+	Documents []*Document `protobuf:"bytes,1,rep,name=documents,proto3" json:"documents,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDocumentsResponse) Reset()         { *m = ListDocumentsResponse{} }
+func (m *ListDocumentsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDocumentsResponse) ProtoMessage()    {}
+func (*ListDocumentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{2}
+}
+func (m *ListDocumentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDocumentsResponse.Unmarshal(m, b)
+}
+func (m *ListDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDocumentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsResponse.Merge(dst, src)
+}
+func (m *ListDocumentsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDocumentsResponse.Size(m)
+}
+func (m *ListDocumentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDocumentsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDocumentsResponse proto.InternalMessageInfo
+
+func (m *ListDocumentsResponse) GetDocuments() []*Document {
+	if m != nil {
+		return m.Documents
+	}
+	return nil
+}
+
+func (m *ListDocumentsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for [Documents.GetDocument][google.cloud.dialogflow.v2beta1.Documents.GetDocument].
+type GetDocumentRequest struct {
+	// Required. The name of the document to retrieve.
+	// Format `projects/<Project ID>/knowledgeBases/<Knowledge Base
+	// ID>/documents/<Document ID>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetDocumentRequest) Reset()         { *m = GetDocumentRequest{} }
+func (m *GetDocumentRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDocumentRequest) ProtoMessage()    {}
+func (*GetDocumentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{3}
+}
+func (m *GetDocumentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDocumentRequest.Unmarshal(m, b)
+}
+func (m *GetDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDocumentRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDocumentRequest.Merge(dst, src)
+}
+func (m *GetDocumentRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDocumentRequest.Size(m)
+}
+func (m *GetDocumentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDocumentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDocumentRequest proto.InternalMessageInfo
+
+func (m *GetDocumentRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [Documents.CreateDocument][google.cloud.dialogflow.v2beta1.Documents.CreateDocument].
+type CreateDocumentRequest struct {
+	// Required. The knoweldge base to create a document for.
+	// Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base ID>`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The document to create.
+	Document             *Document `protobuf:"bytes,2,opt,name=document,proto3" json:"document,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CreateDocumentRequest) Reset()         { *m = CreateDocumentRequest{} }
+func (m *CreateDocumentRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDocumentRequest) ProtoMessage()    {}
+func (*CreateDocumentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{4}
+}
+func (m *CreateDocumentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDocumentRequest.Unmarshal(m, b)
+}
+func (m *CreateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDocumentRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDocumentRequest.Merge(dst, src)
+}
+func (m *CreateDocumentRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDocumentRequest.Size(m)
+}
+func (m *CreateDocumentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDocumentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateDocumentRequest proto.InternalMessageInfo
+
+func (m *CreateDocumentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateDocumentRequest) GetDocument() *Document {
+	if m != nil {
+		return m.Document
+	}
+	return nil
+}
+
+// Request message for [Documents.DeleteDocument][google.cloud.dialogflow.v2beta1.Documents.DeleteDocument].
+type DeleteDocumentRequest struct {
+	// The name of the document to delete.
+	// Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base
+	// ID>/documents/<Document ID>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteDocumentRequest) Reset()         { *m = DeleteDocumentRequest{} }
+func (m *DeleteDocumentRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteDocumentRequest) ProtoMessage()    {}
+func (*DeleteDocumentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{5}
+}
+func (m *DeleteDocumentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteDocumentRequest.Unmarshal(m, b)
+}
+func (m *DeleteDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteDocumentRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDocumentRequest.Merge(dst, src)
+}
+func (m *DeleteDocumentRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteDocumentRequest.Size(m)
+}
+func (m *DeleteDocumentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteDocumentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteDocumentRequest proto.InternalMessageInfo
+
+func (m *DeleteDocumentRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Metadata in google::longrunning::Operation for Knowledge operations.
+type KnowledgeOperationMetadata struct {
+	// Required. The current state of this operation.
+	State                KnowledgeOperationMetadata_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata_State" json:"state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
+	XXX_unrecognized     []byte                           `json:"-"`
+	XXX_sizecache        int32                            `json:"-"`
+}
+
+func (m *KnowledgeOperationMetadata) Reset()         { *m = KnowledgeOperationMetadata{} }
+func (m *KnowledgeOperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*KnowledgeOperationMetadata) ProtoMessage()    {}
+func (*KnowledgeOperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_3131c12790f8bf44, []int{6}
+}
+func (m *KnowledgeOperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KnowledgeOperationMetadata.Unmarshal(m, b)
+}
+func (m *KnowledgeOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KnowledgeOperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *KnowledgeOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnowledgeOperationMetadata.Merge(dst, src)
+}
+func (m *KnowledgeOperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_KnowledgeOperationMetadata.Size(m)
+}
+func (m *KnowledgeOperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_KnowledgeOperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KnowledgeOperationMetadata proto.InternalMessageInfo
+
+func (m *KnowledgeOperationMetadata) GetState() KnowledgeOperationMetadata_State {
+	if m != nil {
+		return m.State
+	}
+	return KnowledgeOperationMetadata_STATE_UNSPECIFIED
+}
+
+func init() {
+	proto.RegisterType((*Document)(nil), "google.cloud.dialogflow.v2beta1.Document")
+	proto.RegisterType((*ListDocumentsRequest)(nil), "google.cloud.dialogflow.v2beta1.ListDocumentsRequest")
+	proto.RegisterType((*ListDocumentsResponse)(nil), "google.cloud.dialogflow.v2beta1.ListDocumentsResponse")
+	proto.RegisterType((*GetDocumentRequest)(nil), "google.cloud.dialogflow.v2beta1.GetDocumentRequest")
+	proto.RegisterType((*CreateDocumentRequest)(nil), "google.cloud.dialogflow.v2beta1.CreateDocumentRequest")
+	proto.RegisterType((*DeleteDocumentRequest)(nil), "google.cloud.dialogflow.v2beta1.DeleteDocumentRequest")
+	proto.RegisterType((*KnowledgeOperationMetadata)(nil), "google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata")
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.Document_KnowledgeType", Document_KnowledgeType_name, Document_KnowledgeType_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata_State", KnowledgeOperationMetadata_State_name, KnowledgeOperationMetadata_State_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// DocumentsClient is the client API for Documents service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type DocumentsClient interface {
+	// Returns the list of all documents of the knowledge base.
+	ListDocuments(ctx context.Context, in *ListDocumentsRequest, opts ...grpc.CallOption) (*ListDocumentsResponse, error)
+	// Retrieves the specified document.
+	GetDocument(ctx context.Context, in *GetDocumentRequest, opts ...grpc.CallOption) (*Document, error)
+	// Creates a new document.
+	//
+	// Operation <response: [Document][google.cloud.dialogflow.v2beta1.Document],
+	//            metadata: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata]>
+	CreateDocument(ctx context.Context, in *CreateDocumentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Deletes the specified document.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata]>
+	DeleteDocument(ctx context.Context, in *DeleteDocumentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type documentsClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewDocumentsClient(cc *grpc.ClientConn) DocumentsClient {
+	return &documentsClient{cc}
+}
+
+func (c *documentsClient) ListDocuments(ctx context.Context, in *ListDocumentsRequest, opts ...grpc.CallOption) (*ListDocumentsResponse, error) {
+	out := new(ListDocumentsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Documents/ListDocuments", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *documentsClient) GetDocument(ctx context.Context, in *GetDocumentRequest, opts ...grpc.CallOption) (*Document, error) {
+	out := new(Document)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Documents/GetDocument", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *documentsClient) CreateDocument(ctx context.Context, in *CreateDocumentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Documents/CreateDocument", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *documentsClient) DeleteDocument(ctx context.Context, in *DeleteDocumentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Documents/DeleteDocument", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// DocumentsServer is the server API for Documents service.
+type DocumentsServer interface {
+	// Returns the list of all documents of the knowledge base.
+	ListDocuments(context.Context, *ListDocumentsRequest) (*ListDocumentsResponse, error)
+	// Retrieves the specified document.
+	GetDocument(context.Context, *GetDocumentRequest) (*Document, error)
+	// Creates a new document.
+	//
+	// Operation <response: [Document][google.cloud.dialogflow.v2beta1.Document],
+	//            metadata: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata]>
+	CreateDocument(context.Context, *CreateDocumentRequest) (*longrunning.Operation, error)
+	// Deletes the specified document.
+	//
+	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
+	//            metadata: [KnowledgeOperationMetadata][google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata]>
+	DeleteDocument(context.Context, *DeleteDocumentRequest) (*longrunning.Operation, error)
+}
+
+func RegisterDocumentsServer(s *grpc.Server, srv DocumentsServer) {
+	s.RegisterService(&_Documents_serviceDesc, srv)
+}
+
+func _Documents_ListDocuments_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListDocumentsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DocumentsServer).ListDocuments(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2beta1.Documents/ListDocuments",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DocumentsServer).ListDocuments(ctx, req.(*ListDocumentsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Documents_GetDocument_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDocumentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DocumentsServer).GetDocument(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2beta1.Documents/GetDocument",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DocumentsServer).GetDocument(ctx, req.(*GetDocumentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Documents_CreateDocument_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateDocumentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DocumentsServer).CreateDocument(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2beta1.Documents/CreateDocument",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DocumentsServer).CreateDocument(ctx, req.(*CreateDocumentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Documents_DeleteDocument_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteDocumentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DocumentsServer).DeleteDocument(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2beta1.Documents/DeleteDocument",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DocumentsServer).DeleteDocument(ctx, req.(*DeleteDocumentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Documents_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.dialogflow.v2beta1.Documents",
+	HandlerType: (*DocumentsServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListDocuments",
+			Handler:    _Documents_ListDocuments_Handler,
+		},
+		{
+			MethodName: "GetDocument",
+			Handler:    _Documents_GetDocument_Handler,
+		},
+		{
+			MethodName: "CreateDocument",
+			Handler:    _Documents_CreateDocument_Handler,
+		},
+		{
+			MethodName: "DeleteDocument",
+			Handler:    _Documents_DeleteDocument_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/dialogflow/v2beta1/document.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/document.proto", fileDescriptor_document_3131c12790f8bf44)
+}
+
+var fileDescriptor_document_3131c12790f8bf44 = []byte{
+	// 885 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0x1b, 0x55,
+	0x14, 0xee, 0x1d, 0xe7, 0xc7, 0x39, 0xc6, 0xae, 0x7b, 0x45, 0x90, 0xe5, 0x52, 0x9a, 0x4e, 0x25,
+	0x14, 0x8c, 0x34, 0x23, 0x5c, 0x41, 0x25, 0x50, 0x85, 0xec, 0xcc, 0xc4, 0x58, 0x29, 0x13, 0x77,
+	0xe2, 0xb4, 0x90, 0xcd, 0x70, 0x63, 0xdf, 0x8c, 0xa6, 0x19, 0xdf, 0x3b, 0xcc, 0xbd, 0x6e, 0x49,
+	0x50, 0x25, 0x60, 0xc5, 0x8a, 0x0d, 0xe2, 0x05, 0x58, 0xc2, 0x13, 0xf0, 0x1c, 0x48, 0x3c, 0x01,
+	0x2b, 0x56, 0xb0, 0x63, 0x07, 0x9a, 0x5f, 0xc7, 0xae, 0x13, 0xa7, 0xed, 0xce, 0xe7, 0xef, 0x9b,
+	0xef, 0x9c, 0xf3, 0x9d, 0xf1, 0x80, 0xe6, 0x72, 0xee, 0xfa, 0x54, 0x1f, 0xf8, 0x7c, 0x3c, 0xd4,
+	0x87, 0x1e, 0xf1, 0xb9, 0x7b, 0xe4, 0xf3, 0xa7, 0xfa, 0x93, 0xe6, 0x21, 0x95, 0xe4, 0x3d, 0x7d,
+	0xc8, 0x07, 0xe3, 0x11, 0x65, 0x52, 0x0b, 0x42, 0x2e, 0x39, 0xbe, 0x99, 0xe4, 0x6b, 0x71, 0xbe,
+	0x36, 0xc9, 0xd7, 0xd2, 0xfc, 0xfa, 0x9b, 0x29, 0x20, 0x09, 0x3c, 0x9d, 0x30, 0xc6, 0x25, 0x91,
+	0x1e, 0x67, 0x22, 0x29, 0xaf, 0xdf, 0x4e, 0xa3, 0x3e, 0x67, 0x6e, 0x38, 0x66, 0xcc, 0x63, 0xae,
+	0xce, 0x03, 0x1a, 0x4e, 0x25, 0x5d, 0x4f, 0x93, 0x62, 0xeb, 0x70, 0x7c, 0xa4, 0xd3, 0x51, 0x20,
+	0x4f, 0xd2, 0xe0, 0xc6, 0x6c, 0xf0, 0xc8, 0xa3, 0xfe, 0xd0, 0x19, 0x11, 0x71, 0x9c, 0x64, 0xa8,
+	0x7f, 0x28, 0x50, 0x34, 0x52, 0xd6, 0x18, 0xc3, 0x12, 0x23, 0x23, 0x5a, 0x43, 0x1b, 0x68, 0x73,
+	0xcd, 0x8e, 0x7f, 0xe3, 0x5b, 0xf0, 0xda, 0xd0, 0x13, 0x81, 0x4f, 0x4e, 0x9c, 0x38, 0xa6, 0xc4,
+	0xb1, 0x52, 0xea, 0xb3, 0xa2, 0x94, 0xeb, 0xb0, 0x36, 0xf2, 0x46, 0xd4, 0x91, 0x27, 0x01, 0xad,
+	0x15, 0xe2, 0x78, 0x31, 0x72, 0xf4, 0x4f, 0x02, 0x8a, 0xbf, 0x80, 0xab, 0xc7, 0x8c, 0x3f, 0xf5,
+	0xe9, 0xd0, 0x4d, 0x32, 0x44, 0x6d, 0x69, 0xa3, 0xb0, 0x59, 0x69, 0xde, 0xd5, 0x16, 0x4c, 0x47,
+	0xcb, 0x78, 0x69, 0x3b, 0x19, 0x40, 0x84, 0x68, 0x57, 0x8e, 0xcf, 0x9a, 0x02, 0xdf, 0x82, 0xd2,
+	0x80, 0x33, 0x49, 0x99, 0x74, 0xc6, 0xa1, 0x57, 0x5b, 0x8e, 0x08, 0x7c, 0x72, 0xc5, 0x86, 0xd4,
+	0xb9, 0x1f, 0x7a, 0xb8, 0x0e, 0xab, 0xa9, 0x55, 0x5b, 0x49, 0xc3, 0x99, 0x43, 0xdd, 0x81, 0xf2,
+	0x14, 0x3e, 0x7e, 0x0b, 0xea, 0x3b, 0xd6, 0xee, 0xa3, 0xfb, 0xa6, 0xd1, 0x31, 0x9d, 0xfe, 0xe7,
+	0x3d, 0xd3, 0xd9, 0xb7, 0xf6, 0x7a, 0xe6, 0x56, 0x77, 0xbb, 0x6b, 0x1a, 0xd5, 0x2b, 0x78, 0x15,
+	0x0a, 0xdb, 0xad, 0x07, 0x55, 0x84, 0xaf, 0x41, 0xd9, 0xfc, 0xac, 0x6f, 0xb7, 0xb6, 0xfa, 0xdd,
+	0x87, 0xa6, 0xf3, 0xa0, 0x55, 0x55, 0xda, 0x45, 0x58, 0x11, 0x7c, 0x1c, 0x0e, 0xa8, 0xfa, 0x18,
+	0x5e, 0xbf, 0xef, 0x09, 0x99, 0xf5, 0x20, 0x6c, 0xfa, 0xe5, 0x98, 0x0a, 0x89, 0xdf, 0x80, 0x95,
+	0x80, 0x84, 0x11, 0x93, 0x64, 0xca, 0xa9, 0x15, 0x0d, 0x31, 0x20, 0x2e, 0x75, 0x84, 0x77, 0x9a,
+	0x0c, 0x79, 0xd9, 0x2e, 0x46, 0x8e, 0x3d, 0xef, 0x94, 0xe2, 0x1b, 0x00, 0x71, 0x50, 0xf2, 0x63,
+	0xca, 0xd2, 0x11, 0xc7, 0xe9, 0xfd, 0xc8, 0xa1, 0x7e, 0x8f, 0x60, 0x7d, 0xe6, 0x61, 0x22, 0xe0,
+	0x4c, 0x50, 0xdc, 0x81, 0xb5, 0x4c, 0x93, 0xa2, 0x86, 0x36, 0x0a, 0x9b, 0xa5, 0xe6, 0x3b, 0x97,
+	0x9e, 0xbb, 0x3d, 0xa9, 0xc5, 0x6f, 0xc3, 0x55, 0x46, 0xbf, 0x92, 0xce, 0x19, 0x1a, 0x89, 0x12,
+	0xca, 0x91, 0xbb, 0x97, 0x53, 0xd9, 0x04, 0xdc, 0xa1, 0x39, 0x91, 0xac, 0xe9, 0x39, 0xc2, 0x52,
+	0x9f, 0xc0, 0xfa, 0x56, 0x48, 0x89, 0xa4, 0xb3, 0xc9, 0xe7, 0x4d, 0xc8, 0x84, 0x62, 0xc6, 0x27,
+	0x7e, 0xf6, 0x0b, 0xb5, 0x92, 0x97, 0xaa, 0xef, 0xc2, 0xba, 0x41, 0x7d, 0xfa, 0xfc, 0x73, 0xe7,
+	0x91, 0xfc, 0x0d, 0x41, 0x3d, 0x57, 0xc7, 0x6e, 0x76, 0x7b, 0x9f, 0x52, 0x49, 0x86, 0x44, 0x12,
+	0xfc, 0x08, 0x96, 0x85, 0x24, 0x32, 0xa9, 0xa9, 0x34, 0x5b, 0x0b, 0xf9, 0x9c, 0x8f, 0xa5, 0xed,
+	0x45, 0x40, 0x76, 0x82, 0xa7, 0xb6, 0x61, 0x39, 0xb6, 0xf1, 0x3a, 0x5c, 0xdb, 0xeb, 0xb7, 0xfa,
+	0xb3, 0x1a, 0x2c, 0xc1, 0x6a, 0xcf, 0xb4, 0x8c, 0xae, 0xd5, 0xa9, 0xa2, 0xc8, 0xb0, 0xf7, 0x2d,
+	0x2b, 0x32, 0x14, 0x5c, 0x84, 0x25, 0x63, 0xd7, 0x32, 0xab, 0x85, 0xe6, 0x3f, 0xab, 0xb0, 0x96,
+	0x2b, 0x02, 0x7f, 0xab, 0x40, 0x79, 0x4a, 0x23, 0xf8, 0xfd, 0x85, 0x6c, 0xe7, 0x09, 0xb8, 0xfe,
+	0xc1, 0x8b, 0x96, 0x25, 0x52, 0x54, 0xbf, 0x41, 0xdf, 0xfd, 0xfe, 0xe7, 0x8f, 0xca, 0x29, 0xbe,
+	0x9b, 0xbf, 0x2e, 0xbf, 0x4e, 0x36, 0x7b, 0x2f, 0x08, 0xf9, 0x63, 0x3a, 0x90, 0x42, 0x6f, 0xe8,
+	0xf9, 0x6d, 0xb7, 0x89, 0xa0, 0x42, 0x6f, 0x3c, 0xcb, 0xdf, 0xa9, 0xe2, 0xe0, 0x63, 0x7c, 0xef,
+	0xa2, 0x52, 0xe2, 0x52, 0x26, 0x2f, 0x02, 0xc0, 0x7f, 0x23, 0x28, 0x9d, 0x51, 0x27, 0xbe, 0xb3,
+	0xb0, 0x95, 0xe7, 0xb5, 0x5c, 0xbf, 0xbc, 0xe8, 0xe6, 0xb6, 0x1c, 0xc9, 0xea, 0xa2, 0x86, 0x27,
+	0x74, 0xf5, 0xc6, 0xb3, 0xe9, 0x96, 0x67, 0x4b, 0xe7, 0x37, 0x3c, 0x05, 0x80, 0xff, 0x43, 0x50,
+	0x99, 0x3e, 0x33, 0xbc, 0x78, 0x81, 0x73, 0xef, 0xb2, 0x7e, 0x23, 0xab, 0x3b, 0xf3, 0x7f, 0xa4,
+	0xe5, 0x3a, 0x56, 0x7f, 0x4a, 0x9a, 0xfd, 0x01, 0xa9, 0x2f, 0xbb, 0xe0, 0x0f, 0xf3, 0x23, 0x3d,
+	0xe8, 0xaa, 0xaf, 0xb6, 0xea, 0x09, 0x14, 0xfe, 0x0b, 0x41, 0x65, 0xfa, 0xe0, 0x2f, 0x31, 0x81,
+	0xb9, 0x6f, 0x88, 0x45, 0x13, 0xc8, 0xd6, 0xdd, 0x78, 0xf9, 0x75, 0x37, 0x5e, 0x6d, 0xdd, 0xed,
+	0x5f, 0x11, 0xdc, 0x1e, 0xf0, 0xd1, 0xa2, 0xfe, 0xda, 0xe5, 0xac, 0xb5, 0x5e, 0xf4, 0x15, 0xd0,
+	0x43, 0x07, 0xdd, 0xb4, 0xc2, 0xe5, 0x3e, 0x61, 0xae, 0xc6, 0x43, 0x57, 0x77, 0x29, 0x8b, 0xbf,
+	0x11, 0xf4, 0x24, 0x44, 0x02, 0x4f, 0x9c, 0xfb, 0xe5, 0xf3, 0xd1, 0xc4, 0xf5, 0x2f, 0x42, 0x3f,
+	0x2b, 0x8a, 0xb1, 0xfd, 0x8b, 0x72, 0xb3, 0x93, 0x60, 0x6e, 0xc5, 0x2c, 0x8c, 0x09, 0x8b, 0x87,
+	0x49, 0xd1, 0xe1, 0x4a, 0x8c, 0x7f, 0xe7, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xc6, 0x50,
+	0x98, 0x58, 0x09, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
index 31d44cbf..fa894f1d 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/entity_type.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/entity_type.proto
 
-package dialogflow
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -22,6 +22,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Represents kinds of entities.
 type EntityType_Kind int32
 
@@ -51,7 +57,9 @@ var EntityType_Kind_value = map[string]int32{
 func (x EntityType_Kind) String() string {
 	return proto.EnumName(EntityType_Kind_name, int32(x))
 }
-func (EntityType_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (EntityType_Kind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{0, 0}
+}
 
 // Represents different entity type expansion modes. Automated expansion
 // allows an agent to recognize values that have not been explicitly listed in
@@ -79,7 +87,7 @@ func (x EntityType_AutoExpansionMode) String() string {
 	return proto.EnumName(EntityType_AutoExpansionMode_name, int32(x))
 }
 func (EntityType_AutoExpansionMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 1}
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{0, 1}
 }
 
 // Represents an entity type.
@@ -90,22 +98,44 @@ type EntityType struct {
 	// automatically.
 	// The unique identifier of the entity type. Format:
 	// `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The name of the entity.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Required. Indicates the kind of entity type.
-	Kind EntityType_Kind `protobuf:"varint,3,opt,name=kind,enum=google.cloud.dialogflow.v2beta1.EntityType_Kind" json:"kind,omitempty"`
+	Kind EntityType_Kind `protobuf:"varint,3,opt,name=kind,proto3,enum=google.cloud.dialogflow.v2beta1.EntityType_Kind" json:"kind,omitempty"`
 	// Optional. Indicates whether the entity type can be automatically
 	// expanded.
-	AutoExpansionMode EntityType_AutoExpansionMode `protobuf:"varint,4,opt,name=auto_expansion_mode,json=autoExpansionMode,enum=google.cloud.dialogflow.v2beta1.EntityType_AutoExpansionMode" json:"auto_expansion_mode,omitempty"`
+	AutoExpansionMode EntityType_AutoExpansionMode `protobuf:"varint,4,opt,name=auto_expansion_mode,json=autoExpansionMode,proto3,enum=google.cloud.dialogflow.v2beta1.EntityType_AutoExpansionMode" json:"auto_expansion_mode,omitempty"`
 	// Optional. The collection of entities associated with the entity type.
-	Entities []*EntityType_Entity `protobuf:"bytes,6,rep,name=entities" json:"entities,omitempty"`
+	Entities             []*EntityType_Entity `protobuf:"bytes,6,rep,name=entities,proto3" json:"entities,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *EntityType) Reset()                    { *m = EntityType{} }
-func (m *EntityType) String() string            { return proto.CompactTextString(m) }
-func (*EntityType) ProtoMessage()               {}
-func (*EntityType) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (m *EntityType) Reset()         { *m = EntityType{} }
+func (m *EntityType) String() string { return proto.CompactTextString(m) }
+func (*EntityType) ProtoMessage()    {}
+func (*EntityType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{0}
+}
+func (m *EntityType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityType.Unmarshal(m, b)
+}
+func (m *EntityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityType.Marshal(b, m, deterministic)
+}
+func (dst *EntityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityType.Merge(dst, src)
+}
+func (m *EntityType) XXX_Size() int {
+	return xxx_messageInfo_EntityType.Size(m)
+}
+func (m *EntityType) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityType proto.InternalMessageInfo
 
 func (m *EntityType) GetName() string {
 	if m != nil {
@@ -150,16 +180,38 @@ type EntityType_Entity struct {
 	// For `KIND_LIST` entity types:
 	//   A string that can contain references to other entity types (with or
 	//   without aliases).
-	Value string `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 	// Required. A collection of synonyms. For `KIND_LIST` entity types this
 	// must contain exactly one synonym equal to `value`.
-	Synonyms []string `protobuf:"bytes,2,rep,name=synonyms" json:"synonyms,omitempty"`
+	Synonyms             []string `protobuf:"bytes,2,rep,name=synonyms,proto3" json:"synonyms,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *EntityType_Entity) Reset()                    { *m = EntityType_Entity{} }
-func (m *EntityType_Entity) String() string            { return proto.CompactTextString(m) }
-func (*EntityType_Entity) ProtoMessage()               {}
-func (*EntityType_Entity) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (m *EntityType_Entity) Reset()         { *m = EntityType_Entity{} }
+func (m *EntityType_Entity) String() string { return proto.CompactTextString(m) }
+func (*EntityType_Entity) ProtoMessage()    {}
+func (*EntityType_Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{0, 0}
+}
+func (m *EntityType_Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityType_Entity.Unmarshal(m, b)
+}
+func (m *EntityType_Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityType_Entity.Marshal(b, m, deterministic)
+}
+func (dst *EntityType_Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityType_Entity.Merge(dst, src)
+}
+func (m *EntityType_Entity) XXX_Size() int {
+	return xxx_messageInfo_EntityType_Entity.Size(m)
+}
+func (m *EntityType_Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityType_Entity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityType_Entity proto.InternalMessageInfo
 
 func (m *EntityType_Entity) GetValue() string {
 	if m != nil {
@@ -175,29 +227,50 @@ func (m *EntityType_Entity) GetSynonyms() []string {
 	return nil
 }
 
-// The request message for
-// [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.ListEntityTypes].
+// The request message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.ListEntityTypes].
 type ListEntityTypesRequest struct {
 	// Required. The agent to list all entity types from.
 	// Format: `projects/<Project ID>/agent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. The language to list entity synonyms for. If not specified,
 	// the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The maximum number of items to return in a single page. By
 	// default 100 and at most 1000.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The next_page_token value returned from a previous list request.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListEntityTypesRequest) Reset()         { *m = ListEntityTypesRequest{} }
+func (m *ListEntityTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListEntityTypesRequest) ProtoMessage()    {}
+func (*ListEntityTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{1}
+}
+func (m *ListEntityTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListEntityTypesRequest.Unmarshal(m, b)
+}
+func (m *ListEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListEntityTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEntityTypesRequest.Merge(dst, src)
+}
+func (m *ListEntityTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListEntityTypesRequest.Size(m)
+}
+func (m *ListEntityTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListEntityTypesRequest.DiscardUnknown(m)
 }
 
-func (m *ListEntityTypesRequest) Reset()                    { *m = ListEntityTypesRequest{} }
-func (m *ListEntityTypesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListEntityTypesRequest) ProtoMessage()               {}
-func (*ListEntityTypesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_ListEntityTypesRequest proto.InternalMessageInfo
 
 func (m *ListEntityTypesRequest) GetParent() string {
 	if m != nil {
@@ -227,21 +300,42 @@ func (m *ListEntityTypesRequest) GetPageToken() string {
 	return ""
 }
 
-// The response message for
-// [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.ListEntityTypes].
+// The response message for [EntityTypes.ListEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.ListEntityTypes].
 type ListEntityTypesResponse struct {
 	// The list of agent entity types. There will be a maximum number of items
 	// returned based on the page_size field in the request.
-	EntityTypes []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes" json:"entity_types,omitempty"`
+	EntityTypes []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes,proto3" json:"entity_types,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no
 	// more results in the list.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListEntityTypesResponse) Reset()         { *m = ListEntityTypesResponse{} }
+func (m *ListEntityTypesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListEntityTypesResponse) ProtoMessage()    {}
+func (*ListEntityTypesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{2}
+}
+func (m *ListEntityTypesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListEntityTypesResponse.Unmarshal(m, b)
+}
+func (m *ListEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListEntityTypesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEntityTypesResponse.Merge(dst, src)
+}
+func (m *ListEntityTypesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListEntityTypesResponse.Size(m)
+}
+func (m *ListEntityTypesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListEntityTypesResponse.DiscardUnknown(m)
 }
 
-func (m *ListEntityTypesResponse) Reset()                    { *m = ListEntityTypesResponse{} }
-func (m *ListEntityTypesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListEntityTypesResponse) ProtoMessage()               {}
-func (*ListEntityTypesResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_ListEntityTypesResponse proto.InternalMessageInfo
 
 func (m *ListEntityTypesResponse) GetEntityTypes() []*EntityType {
 	if m != nil {
@@ -257,24 +351,45 @@ func (m *ListEntityTypesResponse) GetNextPageToken() string {
 	return ""
 }
 
-// The request message for
-// [EntityTypes.GetEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.GetEntityType].
+// The request message for [EntityTypes.GetEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.GetEntityType].
 type GetEntityTypeRequest struct {
 	// Required. The name of the entity type.
 	// Format: `projects/<Project ID>/agent/entityTypes/<EntityType ID>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The language to retrieve entity synonyms for. If not specified,
 	// the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetEntityTypeRequest) Reset()                    { *m = GetEntityTypeRequest{} }
-func (m *GetEntityTypeRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetEntityTypeRequest) ProtoMessage()               {}
-func (*GetEntityTypeRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+func (m *GetEntityTypeRequest) Reset()         { *m = GetEntityTypeRequest{} }
+func (m *GetEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*GetEntityTypeRequest) ProtoMessage()    {}
+func (*GetEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{3}
+}
+func (m *GetEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *GetEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetEntityTypeRequest.Merge(dst, src)
+}
+func (m *GetEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_GetEntityTypeRequest.Size(m)
+}
+func (m *GetEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetEntityTypeRequest proto.InternalMessageInfo
 
 func (m *GetEntityTypeRequest) GetName() string {
 	if m != nil {
@@ -290,26 +405,47 @@ func (m *GetEntityTypeRequest) GetLanguageCode() string {
 	return ""
 }
 
-// The request message for
-// [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.CreateEntityType].
+// The request message for [EntityTypes.CreateEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.CreateEntityType].
 type CreateEntityTypeRequest struct {
 	// Required. The agent to create a entity type for.
 	// Format: `projects/<Project ID>/agent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The entity type to create.
-	EntityType *EntityType `protobuf:"bytes,2,opt,name=entity_type,json=entityType" json:"entity_type,omitempty"`
+	EntityType *EntityType `protobuf:"bytes,2,opt,name=entity_type,json=entityType,proto3" json:"entity_type,omitempty"`
 	// Optional. The language of entity synonyms defined in `entity_type`. If not
 	// specified, the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateEntityTypeRequest) Reset()         { *m = CreateEntityTypeRequest{} }
+func (m *CreateEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateEntityTypeRequest) ProtoMessage()    {}
+func (*CreateEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{4}
+}
+func (m *CreateEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *CreateEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateEntityTypeRequest.Merge(dst, src)
+}
+func (m *CreateEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateEntityTypeRequest.Size(m)
+}
+func (m *CreateEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateEntityTypeRequest.DiscardUnknown(m)
 }
 
-func (m *CreateEntityTypeRequest) Reset()                    { *m = CreateEntityTypeRequest{} }
-func (m *CreateEntityTypeRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateEntityTypeRequest) ProtoMessage()               {}
-func (*CreateEntityTypeRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_CreateEntityTypeRequest proto.InternalMessageInfo
 
 func (m *CreateEntityTypeRequest) GetParent() string {
 	if m != nil {
@@ -332,26 +468,47 @@ func (m *CreateEntityTypeRequest) GetLanguageCode() string {
 	return ""
 }
 
-// The request message for
-// [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.UpdateEntityType].
+// The request message for [EntityTypes.UpdateEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.UpdateEntityType].
 type UpdateEntityTypeRequest struct {
 	// Required. The entity type to update.
 	// Format: `projects/<Project ID>/agent/entityTypes/<EntityType ID>`.
-	EntityType *EntityType `protobuf:"bytes,1,opt,name=entity_type,json=entityType" json:"entity_type,omitempty"`
+	EntityType *EntityType `protobuf:"bytes,1,opt,name=entity_type,json=entityType,proto3" json:"entity_type,omitempty"`
 	// Optional. The language of entity synonyms defined in `entity_type`. If not
 	// specified, the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateEntityTypeRequest) Reset()         { *m = UpdateEntityTypeRequest{} }
+func (m *UpdateEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateEntityTypeRequest) ProtoMessage()    {}
+func (*UpdateEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{5}
+}
+func (m *UpdateEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *UpdateEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateEntityTypeRequest.Merge(dst, src)
+}
+func (m *UpdateEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateEntityTypeRequest.Size(m)
+}
+func (m *UpdateEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateEntityTypeRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateEntityTypeRequest) Reset()                    { *m = UpdateEntityTypeRequest{} }
-func (m *UpdateEntityTypeRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateEntityTypeRequest) ProtoMessage()               {}
-func (*UpdateEntityTypeRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_UpdateEntityTypeRequest proto.InternalMessageInfo
 
 func (m *UpdateEntityTypeRequest) GetEntityType() *EntityType {
 	if m != nil {
@@ -367,25 +524,46 @@ func (m *UpdateEntityTypeRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (m *UpdateEntityTypeRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateEntityTypeRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
 	return nil
 }
 
-// The request message for
-// [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.DeleteEntityType].
+// The request message for [EntityTypes.DeleteEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.DeleteEntityType].
 type DeleteEntityTypeRequest struct {
 	// Required. The name of the entity type to delete.
 	// Format: `projects/<Project ID>/agent/entityTypes/<EntityType ID>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteEntityTypeRequest) Reset()         { *m = DeleteEntityTypeRequest{} }
+func (m *DeleteEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteEntityTypeRequest) ProtoMessage()    {}
+func (*DeleteEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{6}
+}
+func (m *DeleteEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *DeleteEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteEntityTypeRequest.Merge(dst, src)
+}
+func (m *DeleteEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteEntityTypeRequest.Size(m)
+}
+func (m *DeleteEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteEntityTypeRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteEntityTypeRequest) Reset()                    { *m = DeleteEntityTypeRequest{} }
-func (m *DeleteEntityTypeRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteEntityTypeRequest) ProtoMessage()               {}
-func (*DeleteEntityTypeRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+var xxx_messageInfo_DeleteEntityTypeRequest proto.InternalMessageInfo
 
 func (m *DeleteEntityTypeRequest) GetName() string {
 	if m != nil {
@@ -394,12 +572,11 @@ func (m *DeleteEntityTypeRequest) GetName() string {
 	return ""
 }
 
-// The request message for
-// [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.BatchUpdateEntityTypes].
+// The request message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.BatchUpdateEntityTypes].
 type BatchUpdateEntityTypesRequest struct {
 	// Required. The name of the agent to update or create entity types in.
 	// Format: `projects/<Project ID>/agent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The source of the entity type batch.
 	//
 	// For each entity type in the batch:
@@ -415,29 +592,60 @@ type BatchUpdateEntityTypesRequest struct {
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,4,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,4,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *BatchUpdateEntityTypesRequest) Reset()         { *m = BatchUpdateEntityTypesRequest{} }
+func (m *BatchUpdateEntityTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateEntityTypesRequest) ProtoMessage()    {}
+func (*BatchUpdateEntityTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{7}
+}
+func (m *BatchUpdateEntityTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Unmarshal(m, b)
+}
+func (m *BatchUpdateEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntityTypesRequest.Merge(dst, src)
+}
+func (m *BatchUpdateEntityTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateEntityTypesRequest.Size(m)
+}
+func (m *BatchUpdateEntityTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateEntityTypesRequest.DiscardUnknown(m)
 }
 
-func (m *BatchUpdateEntityTypesRequest) Reset()                    { *m = BatchUpdateEntityTypesRequest{} }
-func (m *BatchUpdateEntityTypesRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdateEntityTypesRequest) ProtoMessage()               {}
-func (*BatchUpdateEntityTypesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+var xxx_messageInfo_BatchUpdateEntityTypesRequest proto.InternalMessageInfo
+
+func (m *BatchUpdateEntityTypesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
 
 type isBatchUpdateEntityTypesRequest_EntityTypeBatch interface {
 	isBatchUpdateEntityTypesRequest_EntityTypeBatch()
 }
 
 type BatchUpdateEntityTypesRequest_EntityTypeBatchUri struct {
-	EntityTypeBatchUri string `protobuf:"bytes,2,opt,name=entity_type_batch_uri,json=entityTypeBatchUri,oneof"`
+	EntityTypeBatchUri string `protobuf:"bytes,2,opt,name=entity_type_batch_uri,json=entityTypeBatchUri,proto3,oneof"`
 }
+
 type BatchUpdateEntityTypesRequest_EntityTypeBatchInline struct {
-	EntityTypeBatchInline *EntityTypeBatch `protobuf:"bytes,3,opt,name=entity_type_batch_inline,json=entityTypeBatchInline,oneof"`
+	EntityTypeBatchInline *EntityTypeBatch `protobuf:"bytes,3,opt,name=entity_type_batch_inline,json=entityTypeBatchInline,proto3,oneof"`
 }
 
 func (*BatchUpdateEntityTypesRequest_EntityTypeBatchUri) isBatchUpdateEntityTypesRequest_EntityTypeBatch() {
 }
+
 func (*BatchUpdateEntityTypesRequest_EntityTypeBatchInline) isBatchUpdateEntityTypesRequest_EntityTypeBatch() {
 }
 
@@ -448,13 +656,6 @@ func (m *BatchUpdateEntityTypesRequest) GetEntityTypeBatch() isBatchUpdateEntity
 	return nil
 }
 
-func (m *BatchUpdateEntityTypesRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
 func (m *BatchUpdateEntityTypesRequest) GetEntityTypeBatchUri() string {
 	if x, ok := m.GetEntityTypeBatch().(*BatchUpdateEntityTypesRequest_EntityTypeBatchUri); ok {
 		return x.EntityTypeBatchUri
@@ -476,7 +677,7 @@ func (m *BatchUpdateEntityTypesRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (m *BatchUpdateEntityTypesRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *BatchUpdateEntityTypesRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -538,12 +739,12 @@ func _BatchUpdateEntityTypesRequest_OneofSizer(msg proto.Message) (n int) {
 	// entity_type_batch
 	switch x := m.EntityTypeBatch.(type) {
 	case *BatchUpdateEntityTypesRequest_EntityTypeBatchUri:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.EntityTypeBatchUri)))
 		n += len(x.EntityTypeBatchUri)
 	case *BatchUpdateEntityTypesRequest_EntityTypeBatchInline:
 		s := proto.Size(x.EntityTypeBatchInline)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -553,17 +754,38 @@ func _BatchUpdateEntityTypesRequest_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-// The response message for
-// [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.BatchUpdateEntityTypes].
+// The response message for [EntityTypes.BatchUpdateEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.BatchUpdateEntityTypes].
 type BatchUpdateEntityTypesResponse struct {
 	// The collection of updated or created entity types.
-	EntityTypes []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes" json:"entity_types,omitempty"`
+	EntityTypes          []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes,proto3" json:"entity_types,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *BatchUpdateEntityTypesResponse) Reset()         { *m = BatchUpdateEntityTypesResponse{} }
+func (m *BatchUpdateEntityTypesResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateEntityTypesResponse) ProtoMessage()    {}
+func (*BatchUpdateEntityTypesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{8}
+}
+func (m *BatchUpdateEntityTypesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Unmarshal(m, b)
+}
+func (m *BatchUpdateEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntityTypesResponse.Merge(dst, src)
+}
+func (m *BatchUpdateEntityTypesResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateEntityTypesResponse.Size(m)
+}
+func (m *BatchUpdateEntityTypesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateEntityTypesResponse.DiscardUnknown(m)
 }
 
-func (m *BatchUpdateEntityTypesResponse) Reset()                    { *m = BatchUpdateEntityTypesResponse{} }
-func (m *BatchUpdateEntityTypesResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdateEntityTypesResponse) ProtoMessage()               {}
-func (*BatchUpdateEntityTypesResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+var xxx_messageInfo_BatchUpdateEntityTypesResponse proto.InternalMessageInfo
 
 func (m *BatchUpdateEntityTypesResponse) GetEntityTypes() []*EntityType {
 	if m != nil {
@@ -572,21 +794,42 @@ func (m *BatchUpdateEntityTypesResponse) GetEntityTypes() []*EntityType {
 	return nil
 }
 
-// The request message for
-// [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.BatchDeleteEntityTypes].
+// The request message for [EntityTypes.BatchDeleteEntityTypes][google.cloud.dialogflow.v2beta1.EntityTypes.BatchDeleteEntityTypes].
 type BatchDeleteEntityTypesRequest struct {
 	// Required. The name of the agent to delete all entities types for. Format:
 	// `projects/<Project ID>/agent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The names entity types to delete. All names must point to the
 	// same agent as `parent`.
-	EntityTypeNames []string `protobuf:"bytes,2,rep,name=entity_type_names,json=entityTypeNames" json:"entity_type_names,omitempty"`
+	EntityTypeNames      []string `protobuf:"bytes,2,rep,name=entity_type_names,json=entityTypeNames,proto3" json:"entity_type_names,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BatchDeleteEntityTypesRequest) Reset()         { *m = BatchDeleteEntityTypesRequest{} }
+func (m *BatchDeleteEntityTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchDeleteEntityTypesRequest) ProtoMessage()    {}
+func (*BatchDeleteEntityTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{9}
+}
+func (m *BatchDeleteEntityTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Unmarshal(m, b)
+}
+func (m *BatchDeleteEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchDeleteEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteEntityTypesRequest.Merge(dst, src)
+}
+func (m *BatchDeleteEntityTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchDeleteEntityTypesRequest.Size(m)
+}
+func (m *BatchDeleteEntityTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchDeleteEntityTypesRequest.DiscardUnknown(m)
 }
 
-func (m *BatchDeleteEntityTypesRequest) Reset()                    { *m = BatchDeleteEntityTypesRequest{} }
-func (m *BatchDeleteEntityTypesRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchDeleteEntityTypesRequest) ProtoMessage()               {}
-func (*BatchDeleteEntityTypesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+var xxx_messageInfo_BatchDeleteEntityTypesRequest proto.InternalMessageInfo
 
 func (m *BatchDeleteEntityTypesRequest) GetParent() string {
 	if m != nil {
@@ -602,26 +845,47 @@ func (m *BatchDeleteEntityTypesRequest) GetEntityTypeNames() []string {
 	return nil
 }
 
-// The request message for
-// [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2beta1.EntityTypes.BatchCreateEntities].
+// The request message for [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2beta1.EntityTypes.BatchCreateEntities].
 type BatchCreateEntitiesRequest struct {
 	// Required. The name of the entity type to create entities in. Format:
 	// `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The collection of entities to create.
-	Entities []*EntityType_Entity `protobuf:"bytes,2,rep,name=entities" json:"entities,omitempty"`
+	Entities []*EntityType_Entity `protobuf:"bytes,2,rep,name=entities,proto3" json:"entities,omitempty"`
 	// Optional. The language of entity synonyms defined in `entities`. If not
 	// specified, the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BatchCreateEntitiesRequest) Reset()                    { *m = BatchCreateEntitiesRequest{} }
-func (m *BatchCreateEntitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchCreateEntitiesRequest) ProtoMessage()               {}
-func (*BatchCreateEntitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} }
+func (m *BatchCreateEntitiesRequest) Reset()         { *m = BatchCreateEntitiesRequest{} }
+func (m *BatchCreateEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchCreateEntitiesRequest) ProtoMessage()    {}
+func (*BatchCreateEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{10}
+}
+func (m *BatchCreateEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchCreateEntitiesRequest.Unmarshal(m, b)
+}
+func (m *BatchCreateEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchCreateEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchCreateEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateEntitiesRequest.Merge(dst, src)
+}
+func (m *BatchCreateEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchCreateEntitiesRequest.Size(m)
+}
+func (m *BatchCreateEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchCreateEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchCreateEntitiesRequest proto.InternalMessageInfo
 
 func (m *BatchCreateEntitiesRequest) GetParent() string {
 	if m != nil {
@@ -644,28 +908,49 @@ func (m *BatchCreateEntitiesRequest) GetLanguageCode() string {
 	return ""
 }
 
-// The response message for
-// [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2beta1.EntityTypes.BatchCreateEntities].
+// The response message for [EntityTypes.BatchCreateEntities][google.cloud.dialogflow.v2beta1.EntityTypes.BatchCreateEntities].
 type BatchUpdateEntitiesRequest struct {
 	// Required. The name of the entity type to update the entities in. Format:
 	// `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The collection of new entities to replace the existing entities.
-	Entities []*EntityType_Entity `protobuf:"bytes,2,rep,name=entities" json:"entities,omitempty"`
+	Entities []*EntityType_Entity `protobuf:"bytes,2,rep,name=entities,proto3" json:"entities,omitempty"`
 	// Optional. The language of entity synonyms defined in `entities`. If not
 	// specified, the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *BatchUpdateEntitiesRequest) Reset()         { *m = BatchUpdateEntitiesRequest{} }
+func (m *BatchUpdateEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateEntitiesRequest) ProtoMessage()    {}
+func (*BatchUpdateEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{11}
+}
+func (m *BatchUpdateEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateEntitiesRequest.Unmarshal(m, b)
+}
+func (m *BatchUpdateEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateEntitiesRequest.Merge(dst, src)
+}
+func (m *BatchUpdateEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateEntitiesRequest.Size(m)
+}
+func (m *BatchUpdateEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateEntitiesRequest.DiscardUnknown(m)
 }
 
-func (m *BatchUpdateEntitiesRequest) Reset()                    { *m = BatchUpdateEntitiesRequest{} }
-func (m *BatchUpdateEntitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdateEntitiesRequest) ProtoMessage()               {}
-func (*BatchUpdateEntitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} }
+var xxx_messageInfo_BatchUpdateEntitiesRequest proto.InternalMessageInfo
 
 func (m *BatchUpdateEntitiesRequest) GetParent() string {
 	if m != nil {
@@ -688,35 +973,56 @@ func (m *BatchUpdateEntitiesRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (m *BatchUpdateEntitiesRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *BatchUpdateEntitiesRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
 	return nil
 }
 
-// The request message for
-// [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2beta1.EntityTypes.BatchDeleteEntities].
+// The request message for [EntityTypes.BatchDeleteEntities][google.cloud.dialogflow.v2beta1.EntityTypes.BatchDeleteEntities].
 type BatchDeleteEntitiesRequest struct {
 	// Required. The name of the entity type to delete entries for. Format:
 	// `projects/<Project ID>/agent/entityTypes/<Entity Type ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The canonical `values` of the entities to delete. Note that
 	// these are not fully-qualified names, i.e. they don't start with
 	// `projects/<Project ID>`.
-	EntityValues []string `protobuf:"bytes,2,rep,name=entity_values,json=entityValues" json:"entity_values,omitempty"`
+	EntityValues []string `protobuf:"bytes,2,rep,name=entity_values,json=entityValues,proto3" json:"entity_values,omitempty"`
 	// Optional. The language of entity synonyms defined in `entities`. If not
 	// specified, the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BatchDeleteEntitiesRequest) Reset()         { *m = BatchDeleteEntitiesRequest{} }
+func (m *BatchDeleteEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchDeleteEntitiesRequest) ProtoMessage()    {}
+func (*BatchDeleteEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{12}
+}
+func (m *BatchDeleteEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchDeleteEntitiesRequest.Unmarshal(m, b)
+}
+func (m *BatchDeleteEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchDeleteEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchDeleteEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteEntitiesRequest.Merge(dst, src)
+}
+func (m *BatchDeleteEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchDeleteEntitiesRequest.Size(m)
+}
+func (m *BatchDeleteEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchDeleteEntitiesRequest.DiscardUnknown(m)
 }
 
-func (m *BatchDeleteEntitiesRequest) Reset()                    { *m = BatchDeleteEntitiesRequest{} }
-func (m *BatchDeleteEntitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchDeleteEntitiesRequest) ProtoMessage()               {}
-func (*BatchDeleteEntitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{12} }
+var xxx_messageInfo_BatchDeleteEntitiesRequest proto.InternalMessageInfo
 
 func (m *BatchDeleteEntitiesRequest) GetParent() string {
 	if m != nil {
@@ -742,13 +1048,35 @@ func (m *BatchDeleteEntitiesRequest) GetLanguageCode() string {
 // This message is a wrapper around a collection of entity types.
 type EntityTypeBatch struct {
 	// A collection of entity types.
-	EntityTypes []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes" json:"entity_types,omitempty"`
+	EntityTypes          []*EntityType `protobuf:"bytes,1,rep,name=entity_types,json=entityTypes,proto3" json:"entity_types,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *EntityTypeBatch) Reset()         { *m = EntityTypeBatch{} }
+func (m *EntityTypeBatch) String() string { return proto.CompactTextString(m) }
+func (*EntityTypeBatch) ProtoMessage()    {}
+func (*EntityTypeBatch) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_type_09eabae6717aed63, []int{13}
+}
+func (m *EntityTypeBatch) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityTypeBatch.Unmarshal(m, b)
+}
+func (m *EntityTypeBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityTypeBatch.Marshal(b, m, deterministic)
+}
+func (dst *EntityTypeBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityTypeBatch.Merge(dst, src)
+}
+func (m *EntityTypeBatch) XXX_Size() int {
+	return xxx_messageInfo_EntityTypeBatch.Size(m)
+}
+func (m *EntityTypeBatch) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityTypeBatch.DiscardUnknown(m)
 }
 
-func (m *EntityTypeBatch) Reset()                    { *m = EntityTypeBatch{} }
-func (m *EntityTypeBatch) String() string            { return proto.CompactTextString(m) }
-func (*EntityTypeBatch) ProtoMessage()               {}
-func (*EntityTypeBatch) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{13} }
+var xxx_messageInfo_EntityTypeBatch proto.InternalMessageInfo
 
 func (m *EntityTypeBatch) GetEntityTypes() []*EntityType {
 	if m != nil {
@@ -785,8 +1113,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for EntityTypes service
-
+// EntityTypesClient is the client API for EntityTypes service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type EntityTypesClient interface {
 	// Returns the list of all entity types in the specified agent.
 	ListEntityTypes(ctx context.Context, in *ListEntityTypesRequest, opts ...grpc.CallOption) (*ListEntityTypesResponse, error)
@@ -797,34 +1126,33 @@ type EntityTypesClient interface {
 	// Updates the specified entity type.
 	UpdateEntityType(ctx context.Context, in *UpdateEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error)
 	// Deletes the specified entity type.
-	DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Updates/Creates multiple entity types in the specified agent.
 	//
-	// Operation <response:
-	// [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse],
+	// Operation <response: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	BatchUpdateEntityTypes(ctx context.Context, in *BatchUpdateEntityTypesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	BatchUpdateEntityTypes(ctx context.Context, in *BatchUpdateEntityTypesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes entity types in the specified agent.
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	BatchDeleteEntityTypes(ctx context.Context, in *BatchDeleteEntityTypesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	BatchDeleteEntityTypes(ctx context.Context, in *BatchDeleteEntityTypesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Creates multiple new entities in the specified entity type (extends the
 	// existing collection of entries).
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty]>
-	BatchCreateEntities(ctx context.Context, in *BatchCreateEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	BatchCreateEntities(ctx context.Context, in *BatchCreateEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Updates entities in the specified entity type (replaces the existing
 	// collection of entries).
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	BatchUpdateEntities(ctx context.Context, in *BatchUpdateEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	BatchUpdateEntities(ctx context.Context, in *BatchUpdateEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes entities in the specified entity type.
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	BatchDeleteEntities(ctx context.Context, in *BatchDeleteEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	BatchDeleteEntities(ctx context.Context, in *BatchDeleteEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type entityTypesClient struct {
@@ -837,7 +1165,7 @@ func NewEntityTypesClient(cc *grpc.ClientConn) EntityTypesClient {
 
 func (c *entityTypesClient) ListEntityTypes(ctx context.Context, in *ListEntityTypesRequest, opts ...grpc.CallOption) (*ListEntityTypesResponse, error) {
 	out := new(ListEntityTypesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/ListEntityTypes", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/ListEntityTypes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -846,7 +1174,7 @@ func (c *entityTypesClient) ListEntityTypes(ctx context.Context, in *ListEntityT
 
 func (c *entityTypesClient) GetEntityType(ctx context.Context, in *GetEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error) {
 	out := new(EntityType)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/GetEntityType", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/GetEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -855,7 +1183,7 @@ func (c *entityTypesClient) GetEntityType(ctx context.Context, in *GetEntityType
 
 func (c *entityTypesClient) CreateEntityType(ctx context.Context, in *CreateEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error) {
 	out := new(EntityType)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/CreateEntityType", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/CreateEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -864,69 +1192,68 @@ func (c *entityTypesClient) CreateEntityType(ctx context.Context, in *CreateEnti
 
 func (c *entityTypesClient) UpdateEntityType(ctx context.Context, in *UpdateEntityTypeRequest, opts ...grpc.CallOption) (*EntityType, error) {
 	out := new(EntityType)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/UpdateEntityType", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/UpdateEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *entityTypesClient) DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/DeleteEntityType", in, out, c.cc, opts...)
+func (c *entityTypesClient) DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/DeleteEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *entityTypesClient) BatchUpdateEntityTypes(ctx context.Context, in *BatchUpdateEntityTypesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchUpdateEntityTypes", in, out, c.cc, opts...)
+func (c *entityTypesClient) BatchUpdateEntityTypes(ctx context.Context, in *BatchUpdateEntityTypesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchUpdateEntityTypes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *entityTypesClient) BatchDeleteEntityTypes(ctx context.Context, in *BatchDeleteEntityTypesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchDeleteEntityTypes", in, out, c.cc, opts...)
+func (c *entityTypesClient) BatchDeleteEntityTypes(ctx context.Context, in *BatchDeleteEntityTypesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchDeleteEntityTypes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *entityTypesClient) BatchCreateEntities(ctx context.Context, in *BatchCreateEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchCreateEntities", in, out, c.cc, opts...)
+func (c *entityTypesClient) BatchCreateEntities(ctx context.Context, in *BatchCreateEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchCreateEntities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *entityTypesClient) BatchUpdateEntities(ctx context.Context, in *BatchUpdateEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchUpdateEntities", in, out, c.cc, opts...)
+func (c *entityTypesClient) BatchUpdateEntities(ctx context.Context, in *BatchUpdateEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchUpdateEntities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *entityTypesClient) BatchDeleteEntities(ctx context.Context, in *BatchDeleteEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchDeleteEntities", in, out, c.cc, opts...)
+func (c *entityTypesClient) BatchDeleteEntities(ctx context.Context, in *BatchDeleteEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.EntityTypes/BatchDeleteEntities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for EntityTypes service
-
+// EntityTypesServer is the server API for EntityTypes service.
 type EntityTypesServer interface {
 	// Returns the list of all entity types in the specified agent.
 	ListEntityTypes(context.Context, *ListEntityTypesRequest) (*ListEntityTypesResponse, error)
@@ -937,34 +1264,33 @@ type EntityTypesServer interface {
 	// Updates the specified entity type.
 	UpdateEntityType(context.Context, *UpdateEntityTypeRequest) (*EntityType, error)
 	// Deletes the specified entity type.
-	DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*google_protobuf2.Empty, error)
+	DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*empty.Empty, error)
 	// Updates/Creates multiple entity types in the specified agent.
 	//
-	// Operation <response:
-	// [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse],
+	// Operation <response: [BatchUpdateEntityTypesResponse][google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	BatchUpdateEntityTypes(context.Context, *BatchUpdateEntityTypesRequest) (*google_longrunning.Operation, error)
+	BatchUpdateEntityTypes(context.Context, *BatchUpdateEntityTypesRequest) (*longrunning.Operation, error)
 	// Deletes entity types in the specified agent.
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	BatchDeleteEntityTypes(context.Context, *BatchDeleteEntityTypesRequest) (*google_longrunning.Operation, error)
+	BatchDeleteEntityTypes(context.Context, *BatchDeleteEntityTypesRequest) (*longrunning.Operation, error)
 	// Creates multiple new entities in the specified entity type (extends the
 	// existing collection of entries).
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty]>
-	BatchCreateEntities(context.Context, *BatchCreateEntitiesRequest) (*google_longrunning.Operation, error)
+	BatchCreateEntities(context.Context, *BatchCreateEntitiesRequest) (*longrunning.Operation, error)
 	// Updates entities in the specified entity type (replaces the existing
 	// collection of entries).
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	BatchUpdateEntities(context.Context, *BatchUpdateEntitiesRequest) (*google_longrunning.Operation, error)
+	BatchUpdateEntities(context.Context, *BatchUpdateEntitiesRequest) (*longrunning.Operation, error)
 	// Deletes entities in the specified entity type.
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty],
 	//            metadata: [google.protobuf.Struct][google.protobuf.Struct]>
-	BatchDeleteEntities(context.Context, *BatchDeleteEntitiesRequest) (*google_longrunning.Operation, error)
+	BatchDeleteEntities(context.Context, *BatchDeleteEntitiesRequest) (*longrunning.Operation, error)
 }
 
 func RegisterEntityTypesServer(s *grpc.Server, srv EntityTypesServer) {
@@ -1200,9 +1526,11 @@ var _EntityTypes_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dialogflow/v2beta1/entity_type.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dialogflow/v2beta1/entity_type.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/entity_type.proto", fileDescriptor_entity_type_09eabae6717aed63)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_entity_type_09eabae6717aed63 = []byte{
 	// 1236 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6e, 0xe3, 0xd4,
 	0x17, 0x9e, 0x9b, 0xa6, 0x55, 0x7b, 0xd2, 0x4e, 0xd3, 0xdb, 0x4e, 0x1b, 0xa5, 0xd3, 0x5f, 0xfb,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/intent.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
index b343de04..ee3efd5a 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/intent.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/intent.proto
 
-package dialogflow
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/struct"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -22,6 +22,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Represents the options for views of an intent.
 // An intent can be a sizable object. Therefore, we provide a resource view that
 // does not return training phrases in the response by default.
@@ -46,7 +52,9 @@ var IntentView_value = map[string]int32{
 func (x IntentView) String() string {
 	return proto.EnumName(IntentView_name, int32(x))
 }
-func (IntentView) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (IntentView) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0}
+}
 
 // Represents the different states that webhooks can be in.
 type Intent_WebhookState int32
@@ -75,7 +83,9 @@ var Intent_WebhookState_value = map[string]int32{
 func (x Intent_WebhookState) String() string {
 	return proto.EnumName(Intent_WebhookState_name, int32(x))
 }
-func (Intent_WebhookState) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+func (Intent_WebhookState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 0}
+}
 
 // Represents different types of training phrases.
 type Intent_TrainingPhrase_Type int32
@@ -106,7 +116,7 @@ func (x Intent_TrainingPhrase_Type) String() string {
 	return proto.EnumName(Intent_TrainingPhrase_Type_name, int32(x))
 }
 func (Intent_TrainingPhrase_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 0, 0}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 0, 0}
 }
 
 // Represents different platforms that a rich message can be intended for.
@@ -130,19 +140,82 @@ const (
 	// Viber.
 	Intent_Message_VIBER Intent_Message_Platform = 7
 	// Actions on Google.
+	// When using Actions on Google, you can choose one of the specific
+	// Intent.Message types that mention support for Actions on Google,
+	// or you can use the advanced Intent.Message.payload field.
+	// The payload field provides access to AoG features not available in the
+	// specific message types.
+	// If using the Intent.Message.payload field, it should have a structure
+	// similar to the JSON message shown here. For more information, see
+	// [Actions on Google Webhook
+	// Format](https://developers.google.com/actions/dialogflow/webhook)
+	// <pre>{
+	//   "expectUserResponse": true,
+	//   "isSsml": false,
+	//   "noInputPrompts": [],
+	//   "richResponse": {
+	//     "items": [
+	//       {
+	//         "simpleResponse": {
+	//           "displayText": "hi",
+	//           "textToSpeech": "hello"
+	//         }
+	//       }
+	//     ],
+	//     "suggestions": [
+	//       {
+	//         "title": "Say this"
+	//       },
+	//       {
+	//         "title": "or this"
+	//       }
+	//     ]
+	//   },
+	//   "systemIntent": {
+	//     "data": {
+	//       "@type": "type.googleapis.com/google.actions.v2.OptionValueSpec",
+	//       "listSelect": {
+	//         "items": [
+	//           {
+	//             "optionInfo": {
+	//               "key": "key1",
+	//               "synonyms": [
+	//                 "key one"
+	//               ]
+	//             },
+	//             "title": "must not be empty, but unique"
+	//           },
+	//           {
+	//             "optionInfo": {
+	//               "key": "key2",
+	//               "synonyms": [
+	//                 "key two"
+	//               ]
+	//             },
+	//             "title": "must not be empty, but unique"
+	//           }
+	//         ]
+	//       }
+	//     },
+	//     "intent": "actions.intent.OPTION"
+	//   }
+	// }</pre>
 	Intent_Message_ACTIONS_ON_GOOGLE Intent_Message_Platform = 8
+	// Telephony Gateway.
+	Intent_Message_TELEPHONY Intent_Message_Platform = 10
 )
 
 var Intent_Message_Platform_name = map[int32]string{
-	0: "PLATFORM_UNSPECIFIED",
-	1: "FACEBOOK",
-	2: "SLACK",
-	3: "TELEGRAM",
-	4: "KIK",
-	5: "SKYPE",
-	6: "LINE",
-	7: "VIBER",
-	8: "ACTIONS_ON_GOOGLE",
+	0:  "PLATFORM_UNSPECIFIED",
+	1:  "FACEBOOK",
+	2:  "SLACK",
+	3:  "TELEGRAM",
+	4:  "KIK",
+	5:  "SKYPE",
+	6:  "LINE",
+	7:  "VIBER",
+	8:  "ACTIONS_ON_GOOGLE",
+	10: "TELEPHONY",
 }
 var Intent_Message_Platform_value = map[string]int32{
 	"PLATFORM_UNSPECIFIED": 0,
@@ -154,13 +227,14 @@ var Intent_Message_Platform_value = map[string]int32{
 	"LINE":                 6,
 	"VIBER":                7,
 	"ACTIONS_ON_GOOGLE":    8,
+	"TELEPHONY":            10,
 }
 
 func (x Intent_Message_Platform) String() string {
 	return proto.EnumName(Intent_Message_Platform_name, int32(x))
 }
 func (Intent_Message_Platform) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 0}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 0}
 }
 
 // Represents an intent.
@@ -171,69 +245,108 @@ type Intent struct {
 	// automatically.
 	// The unique identifier of this intent.
 	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The name of this intent.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Required. Indicates whether webhooks are enabled for the intent.
-	WebhookState Intent_WebhookState `protobuf:"varint,6,opt,name=webhook_state,json=webhookState,enum=google.cloud.dialogflow.v2beta1.Intent_WebhookState" json:"webhook_state,omitempty"`
+	WebhookState Intent_WebhookState `protobuf:"varint,6,opt,name=webhook_state,json=webhookState,proto3,enum=google.cloud.dialogflow.v2beta1.Intent_WebhookState" json:"webhook_state,omitempty"`
 	// Optional. The priority of this intent. Higher numbers represent higher
 	// priorities. Zero or negative numbers mean that the intent is disabled.
-	Priority int32 `protobuf:"varint,3,opt,name=priority" json:"priority,omitempty"`
+	Priority int32 `protobuf:"varint,3,opt,name=priority,proto3" json:"priority,omitempty"`
 	// Optional. Indicates whether this is a fallback intent.
-	IsFallback bool `protobuf:"varint,4,opt,name=is_fallback,json=isFallback" json:"is_fallback,omitempty"`
+	IsFallback bool `protobuf:"varint,4,opt,name=is_fallback,json=isFallback,proto3" json:"is_fallback,omitempty"`
 	// Optional. Indicates whether Machine Learning is enabled for the intent.
 	// Note: If `ml_enabled` setting is set to false, then this intent is not
 	// taken into account during inference in `ML ONLY` match mode. Also,
 	// auto-markup in the UI is turned off.
-	MlEnabled bool `protobuf:"varint,5,opt,name=ml_enabled,json=mlEnabled" json:"ml_enabled,omitempty"`
+	// DEPRECATED! Please use `ml_disabled` field instead.
+	// NOTE: If both `ml_enabled` and `ml_disabled` are either not set or false,
+	// then the default value is determined as follows:
+	// - Before April 15th, 2018 the default is:
+	//   ml_enabled = false / ml_disabled = true.
+	// - After April 15th, 2018 the default is:
+	//   ml_enabled = true / ml_disabled = false.
+	MlEnabled bool `protobuf:"varint,5,opt,name=ml_enabled,json=mlEnabled,proto3" json:"ml_enabled,omitempty"` // Deprecated: Do not use.
+	// Optional. Indicates whether Machine Learning is disabled for the intent.
+	// Note: If `ml_disabled` setting is set to true, then this intent is not
+	// taken into account during inference in `ML ONLY` match mode. Also,
+	// auto-markup in the UI is turned off.
+	MlDisabled bool `protobuf:"varint,19,opt,name=ml_disabled,json=mlDisabled,proto3" json:"ml_disabled,omitempty"`
+	// Optional. Indicates that this intent ends an interaction. Some integrations
+	// (e.g., Actions on Google or Dialogflow phone gateway) use this information
+	// to close interaction with an end user. Default is false.
+	EndInteraction bool `protobuf:"varint,21,opt,name=end_interaction,json=endInteraction,proto3" json:"end_interaction,omitempty"`
 	// Optional. The list of context names required for this intent to be
 	// triggered.
 	// Format: `projects/<Project ID>/agent/sessions/-/contexts/<Context ID>`.
-	InputContextNames []string `protobuf:"bytes,7,rep,name=input_context_names,json=inputContextNames" json:"input_context_names,omitempty"`
+	InputContextNames []string `protobuf:"bytes,7,rep,name=input_context_names,json=inputContextNames,proto3" json:"input_context_names,omitempty"`
 	// Optional. The collection of event names that trigger the intent.
 	// If the collection of input contexts is not empty, all of the contexts must
 	// be present in the active user session for an event to trigger this intent.
-	Events []string `protobuf:"bytes,8,rep,name=events" json:"events,omitempty"`
+	Events []string `protobuf:"bytes,8,rep,name=events,proto3" json:"events,omitempty"`
 	// Optional. The collection of examples/templates that the agent is
 	// trained on.
-	TrainingPhrases []*Intent_TrainingPhrase `protobuf:"bytes,9,rep,name=training_phrases,json=trainingPhrases" json:"training_phrases,omitempty"`
+	TrainingPhrases []*Intent_TrainingPhrase `protobuf:"bytes,9,rep,name=training_phrases,json=trainingPhrases,proto3" json:"training_phrases,omitempty"`
 	// Optional. The name of the action associated with the intent.
-	Action string `protobuf:"bytes,10,opt,name=action" json:"action,omitempty"`
+	// Note: The action name must not contain whitespaces.
+	Action string `protobuf:"bytes,10,opt,name=action,proto3" json:"action,omitempty"`
 	// Optional. The collection of contexts that are activated when the intent
 	// is matched. Context messages in this collection should not set the
 	// parameters field. Setting the `lifespan_count` to 0 will reset the context
 	// when the intent is matched.
 	// Format: `projects/<Project ID>/agent/sessions/-/contexts/<Context ID>`.
-	OutputContexts []*Context `protobuf:"bytes,11,rep,name=output_contexts,json=outputContexts" json:"output_contexts,omitempty"`
+	OutputContexts []*Context `protobuf:"bytes,11,rep,name=output_contexts,json=outputContexts,proto3" json:"output_contexts,omitempty"`
 	// Optional. Indicates whether to delete all contexts in the current
 	// session when this intent is matched.
-	ResetContexts bool `protobuf:"varint,12,opt,name=reset_contexts,json=resetContexts" json:"reset_contexts,omitempty"`
+	ResetContexts bool `protobuf:"varint,12,opt,name=reset_contexts,json=resetContexts,proto3" json:"reset_contexts,omitempty"`
 	// Optional. The collection of parameters associated with the intent.
-	Parameters []*Intent_Parameter `protobuf:"bytes,13,rep,name=parameters" json:"parameters,omitempty"`
+	Parameters []*Intent_Parameter `protobuf:"bytes,13,rep,name=parameters,proto3" json:"parameters,omitempty"`
 	// Optional. The collection of rich messages corresponding to the
-	// `Response` field in API.AI console.
-	Messages []*Intent_Message `protobuf:"bytes,14,rep,name=messages" json:"messages,omitempty"`
+	// `Response` field in the Dialogflow console.
+	Messages []*Intent_Message `protobuf:"bytes,14,rep,name=messages,proto3" json:"messages,omitempty"`
 	// Optional. The list of platforms for which the first response will be
 	// taken from among the messages assigned to the DEFAULT_PLATFORM.
-	DefaultResponsePlatforms []Intent_Message_Platform `protobuf:"varint,15,rep,packed,name=default_response_platforms,json=defaultResponsePlatforms,enum=google.cloud.dialogflow.v2beta1.Intent_Message_Platform" json:"default_response_platforms,omitempty"`
+	DefaultResponsePlatforms []Intent_Message_Platform `protobuf:"varint,15,rep,packed,name=default_response_platforms,json=defaultResponsePlatforms,proto3,enum=google.cloud.dialogflow.v2beta1.Intent_Message_Platform" json:"default_response_platforms,omitempty"`
 	// The unique identifier of the root intent in the chain of followup intents.
 	// It identifies the correct followup intents chain for this intent.
 	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-	RootFollowupIntentName string `protobuf:"bytes,16,opt,name=root_followup_intent_name,json=rootFollowupIntentName" json:"root_followup_intent_name,omitempty"`
+	RootFollowupIntentName string `protobuf:"bytes,16,opt,name=root_followup_intent_name,json=rootFollowupIntentName,proto3" json:"root_followup_intent_name,omitempty"`
 	// The unique identifier of the parent intent in the chain of followup
 	// intents.
 	// It identifies the parent followup intent.
 	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-	ParentFollowupIntentName string `protobuf:"bytes,17,opt,name=parent_followup_intent_name,json=parentFollowupIntentName" json:"parent_followup_intent_name,omitempty"`
+	ParentFollowupIntentName string `protobuf:"bytes,17,opt,name=parent_followup_intent_name,json=parentFollowupIntentName,proto3" json:"parent_followup_intent_name,omitempty"`
 	// Optional. Collection of information about all followup intents that have
 	// name of this intent as a root_name.
-	FollowupIntentInfo []*Intent_FollowupIntentInfo `protobuf:"bytes,18,rep,name=followup_intent_info,json=followupIntentInfo" json:"followup_intent_info,omitempty"`
+	FollowupIntentInfo   []*Intent_FollowupIntentInfo `protobuf:"bytes,18,rep,name=followup_intent_info,json=followupIntentInfo,proto3" json:"followup_intent_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *Intent) Reset()         { *m = Intent{} }
+func (m *Intent) String() string { return proto.CompactTextString(m) }
+func (*Intent) ProtoMessage()    {}
+func (*Intent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0}
+}
+func (m *Intent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent.Unmarshal(m, b)
+}
+func (m *Intent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent.Marshal(b, m, deterministic)
+}
+func (dst *Intent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent.Merge(dst, src)
+}
+func (m *Intent) XXX_Size() int {
+	return xxx_messageInfo_Intent.Size(m)
+}
+func (m *Intent) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent.DiscardUnknown(m)
 }
 
-func (m *Intent) Reset()                    { *m = Intent{} }
-func (m *Intent) String() string            { return proto.CompactTextString(m) }
-func (*Intent) ProtoMessage()               {}
-func (*Intent) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_Intent proto.InternalMessageInfo
 
 func (m *Intent) GetName() string {
 	if m != nil {
@@ -270,6 +383,7 @@ func (m *Intent) GetIsFallback() bool {
 	return false
 }
 
+// Deprecated: Do not use.
 func (m *Intent) GetMlEnabled() bool {
 	if m != nil {
 		return m.MlEnabled
@@ -277,6 +391,20 @@ func (m *Intent) GetMlEnabled() bool {
 	return false
 }
 
+func (m *Intent) GetMlDisabled() bool {
+	if m != nil {
+		return m.MlDisabled
+	}
+	return false
+}
+
+func (m *Intent) GetEndInteraction() bool {
+	if m != nil {
+		return m.EndInteraction
+	}
+	return false
+}
+
 func (m *Intent) GetInputContextNames() []string {
 	if m != nil {
 		return m.InputContextNames
@@ -364,23 +492,45 @@ func (m *Intent) GetFollowupIntentInfo() []*Intent_FollowupIntentInfo {
 // Represents an example or template that the agent is trained on.
 type Intent_TrainingPhrase struct {
 	// Required. The unique identifier of this training phrase.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The type of the training phrase.
-	Type Intent_TrainingPhrase_Type `protobuf:"varint,2,opt,name=type,enum=google.cloud.dialogflow.v2beta1.Intent_TrainingPhrase_Type" json:"type,omitempty"`
+	Type Intent_TrainingPhrase_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.dialogflow.v2beta1.Intent_TrainingPhrase_Type" json:"type,omitempty"`
 	// Required. The collection of training phrase parts (can be annotated).
 	// Fields: `entity_type`, `alias` and `user_defined` should be populated
 	// only for the annotated parts of the training phrase.
-	Parts []*Intent_TrainingPhrase_Part `protobuf:"bytes,3,rep,name=parts" json:"parts,omitempty"`
+	Parts []*Intent_TrainingPhrase_Part `protobuf:"bytes,3,rep,name=parts,proto3" json:"parts,omitempty"`
 	// Optional. Indicates how many times this example or template was added to
 	// the intent. Each time a developer adds an existing sample by editing an
 	// intent or training, this counter is increased.
-	TimesAddedCount int32 `protobuf:"varint,4,opt,name=times_added_count,json=timesAddedCount" json:"times_added_count,omitempty"`
+	TimesAddedCount      int32    `protobuf:"varint,4,opt,name=times_added_count,json=timesAddedCount,proto3" json:"times_added_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_TrainingPhrase) Reset()         { *m = Intent_TrainingPhrase{} }
+func (m *Intent_TrainingPhrase) String() string { return proto.CompactTextString(m) }
+func (*Intent_TrainingPhrase) ProtoMessage()    {}
+func (*Intent_TrainingPhrase) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 0}
+}
+func (m *Intent_TrainingPhrase) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_TrainingPhrase.Unmarshal(m, b)
+}
+func (m *Intent_TrainingPhrase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_TrainingPhrase.Marshal(b, m, deterministic)
+}
+func (dst *Intent_TrainingPhrase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_TrainingPhrase.Merge(dst, src)
+}
+func (m *Intent_TrainingPhrase) XXX_Size() int {
+	return xxx_messageInfo_Intent_TrainingPhrase.Size(m)
+}
+func (m *Intent_TrainingPhrase) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_TrainingPhrase.DiscardUnknown(m)
 }
 
-func (m *Intent_TrainingPhrase) Reset()                    { *m = Intent_TrainingPhrase{} }
-func (m *Intent_TrainingPhrase) String() string            { return proto.CompactTextString(m) }
-func (*Intent_TrainingPhrase) ProtoMessage()               {}
-func (*Intent_TrainingPhrase) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+var xxx_messageInfo_Intent_TrainingPhrase proto.InternalMessageInfo
 
 func (m *Intent_TrainingPhrase) GetName() string {
 	if m != nil {
@@ -415,25 +565,45 @@ type Intent_TrainingPhrase_Part struct {
 	// Required. The text corresponding to the example or template,
 	// if there are no annotations. For
 	// annotated examples, it is the text for one of the example's parts.
-	Text string `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// Optional. The entity type name prefixed with `@`. This field is
 	// required for the annotated part of the text and applies only to
 	// examples.
-	EntityType string `protobuf:"bytes,2,opt,name=entity_type,json=entityType" json:"entity_type,omitempty"`
+	EntityType string `protobuf:"bytes,2,opt,name=entity_type,json=entityType,proto3" json:"entity_type,omitempty"`
 	// Optional. The parameter name for the value extracted from the
 	// annotated part of the example.
-	Alias string `protobuf:"bytes,3,opt,name=alias" json:"alias,omitempty"`
+	Alias string `protobuf:"bytes,3,opt,name=alias,proto3" json:"alias,omitempty"`
 	// Optional. Indicates whether the text was manually annotated by the
 	// developer.
-	UserDefined bool `protobuf:"varint,4,opt,name=user_defined,json=userDefined" json:"user_defined,omitempty"`
+	UserDefined          bool     `protobuf:"varint,4,opt,name=user_defined,json=userDefined,proto3" json:"user_defined,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Intent_TrainingPhrase_Part) Reset()         { *m = Intent_TrainingPhrase_Part{} }
 func (m *Intent_TrainingPhrase_Part) String() string { return proto.CompactTextString(m) }
 func (*Intent_TrainingPhrase_Part) ProtoMessage()    {}
 func (*Intent_TrainingPhrase_Part) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 0, 0}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 0, 0}
+}
+func (m *Intent_TrainingPhrase_Part) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_TrainingPhrase_Part.Unmarshal(m, b)
+}
+func (m *Intent_TrainingPhrase_Part) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_TrainingPhrase_Part.Marshal(b, m, deterministic)
+}
+func (dst *Intent_TrainingPhrase_Part) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_TrainingPhrase_Part.Merge(dst, src)
+}
+func (m *Intent_TrainingPhrase_Part) XXX_Size() int {
+	return xxx_messageInfo_Intent_TrainingPhrase_Part.Size(m)
 }
+func (m *Intent_TrainingPhrase_Part) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_TrainingPhrase_Part.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_TrainingPhrase_Part proto.InternalMessageInfo
 
 func (m *Intent_TrainingPhrase_Part) GetText() string {
 	if m != nil {
@@ -466,40 +636,62 @@ func (m *Intent_TrainingPhrase_Part) GetUserDefined() bool {
 // Represents intent parameters.
 type Intent_Parameter struct {
 	// The unique identifier of this parameter.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The name of the parameter.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Optional. The definition of the parameter value. It can be:
 	// - a constant string,
 	// - a parameter value defined as `$parameter_name`,
 	// - an original parameter value defined as `$parameter_name.original`,
 	// - a parameter value from some context defined as
 	//   `#context_name.parameter_name`.
-	Value string `protobuf:"bytes,3,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
 	// Optional. The default value to use when the `value` yields an empty
 	// result.
 	// Default values can be extracted from contexts by using the following
 	// syntax: `#context_name.parameter_name`.
-	DefaultValue string `protobuf:"bytes,4,opt,name=default_value,json=defaultValue" json:"default_value,omitempty"`
+	DefaultValue string `protobuf:"bytes,4,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
 	// Optional. The name of the entity type, prefixed with `@`, that
 	// describes values of the parameter. If the parameter is
 	// required, this must be provided.
-	EntityTypeDisplayName string `protobuf:"bytes,5,opt,name=entity_type_display_name,json=entityTypeDisplayName" json:"entity_type_display_name,omitempty"`
+	EntityTypeDisplayName string `protobuf:"bytes,5,opt,name=entity_type_display_name,json=entityTypeDisplayName,proto3" json:"entity_type_display_name,omitempty"`
 	// Optional. Indicates whether the parameter is required. That is,
 	// whether the intent cannot be completed without collecting the parameter
 	// value.
-	Mandatory bool `protobuf:"varint,6,opt,name=mandatory" json:"mandatory,omitempty"`
+	Mandatory bool `protobuf:"varint,6,opt,name=mandatory,proto3" json:"mandatory,omitempty"`
 	// Optional. The collection of prompts that the agent can present to the
 	// user in order to collect value for the parameter.
-	Prompts []string `protobuf:"bytes,7,rep,name=prompts" json:"prompts,omitempty"`
+	Prompts []string `protobuf:"bytes,7,rep,name=prompts,proto3" json:"prompts,omitempty"`
 	// Optional. Indicates whether the parameter represents a list of values.
-	IsList bool `protobuf:"varint,8,opt,name=is_list,json=isList" json:"is_list,omitempty"`
+	IsList               bool     `protobuf:"varint,8,opt,name=is_list,json=isList,proto3" json:"is_list,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Intent_Parameter) Reset()                    { *m = Intent_Parameter{} }
-func (m *Intent_Parameter) String() string            { return proto.CompactTextString(m) }
-func (*Intent_Parameter) ProtoMessage()               {}
-func (*Intent_Parameter) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 1} }
+func (m *Intent_Parameter) Reset()         { *m = Intent_Parameter{} }
+func (m *Intent_Parameter) String() string { return proto.CompactTextString(m) }
+func (*Intent_Parameter) ProtoMessage()    {}
+func (*Intent_Parameter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 1}
+}
+func (m *Intent_Parameter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Parameter.Unmarshal(m, b)
+}
+func (m *Intent_Parameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Parameter.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Parameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Parameter.Merge(dst, src)
+}
+func (m *Intent_Parameter) XXX_Size() int {
+	return xxx_messageInfo_Intent_Parameter.Size(m)
+}
+func (m *Intent_Parameter) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Parameter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Parameter proto.InternalMessageInfo
 
 func (m *Intent_Parameter) GetName() string {
 	if m != nil {
@@ -557,7 +749,7 @@ func (m *Intent_Parameter) GetIsList() bool {
 	return false
 }
 
-// Corresponds to the `Response` field in API.AI console.
+// Corresponds to the `Response` field in the Dialogflow console.
 type Intent_Message struct {
 	// Required. The rich response message.
 	//
@@ -573,65 +765,128 @@ type Intent_Message struct {
 	//	*Intent_Message_LinkOutSuggestion_
 	//	*Intent_Message_ListSelect_
 	//	*Intent_Message_CarouselSelect_
+	//	*Intent_Message_TelephonyPlayAudio_
+	//	*Intent_Message_TelephonySynthesizeSpeech_
+	//	*Intent_Message_TelephonyTransferCall_
 	Message isIntent_Message_Message `protobuf_oneof:"message"`
 	// Optional. The platform that this message is intended for.
-	Platform Intent_Message_Platform `protobuf:"varint,6,opt,name=platform,enum=google.cloud.dialogflow.v2beta1.Intent_Message_Platform" json:"platform,omitempty"`
+	Platform             Intent_Message_Platform `protobuf:"varint,6,opt,name=platform,proto3,enum=google.cloud.dialogflow.v2beta1.Intent_Message_Platform" json:"platform,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
 }
 
-func (m *Intent_Message) Reset()                    { *m = Intent_Message{} }
-func (m *Intent_Message) String() string            { return proto.CompactTextString(m) }
-func (*Intent_Message) ProtoMessage()               {}
-func (*Intent_Message) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 2} }
+func (m *Intent_Message) Reset()         { *m = Intent_Message{} }
+func (m *Intent_Message) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message) ProtoMessage()    {}
+func (*Intent_Message) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2}
+}
+func (m *Intent_Message) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message.Unmarshal(m, b)
+}
+func (m *Intent_Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message.Merge(dst, src)
+}
+func (m *Intent_Message) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message.Size(m)
+}
+func (m *Intent_Message) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message proto.InternalMessageInfo
 
 type isIntent_Message_Message interface {
 	isIntent_Message_Message()
 }
 
 type Intent_Message_Text_ struct {
-	Text *Intent_Message_Text `protobuf:"bytes,1,opt,name=text,oneof"`
+	Text *Intent_Message_Text `protobuf:"bytes,1,opt,name=text,proto3,oneof"`
 }
+
 type Intent_Message_Image_ struct {
-	Image *Intent_Message_Image `protobuf:"bytes,2,opt,name=image,oneof"`
+	Image *Intent_Message_Image `protobuf:"bytes,2,opt,name=image,proto3,oneof"`
 }
+
 type Intent_Message_QuickReplies_ struct {
-	QuickReplies *Intent_Message_QuickReplies `protobuf:"bytes,3,opt,name=quick_replies,json=quickReplies,oneof"`
+	QuickReplies *Intent_Message_QuickReplies `protobuf:"bytes,3,opt,name=quick_replies,json=quickReplies,proto3,oneof"`
 }
+
 type Intent_Message_Card_ struct {
-	Card *Intent_Message_Card `protobuf:"bytes,4,opt,name=card,oneof"`
+	Card *Intent_Message_Card `protobuf:"bytes,4,opt,name=card,proto3,oneof"`
 }
+
 type Intent_Message_Payload struct {
-	Payload *google_protobuf4.Struct `protobuf:"bytes,5,opt,name=payload,oneof"`
+	Payload *_struct.Struct `protobuf:"bytes,5,opt,name=payload,proto3,oneof"`
 }
+
 type Intent_Message_SimpleResponses_ struct {
-	SimpleResponses *Intent_Message_SimpleResponses `protobuf:"bytes,7,opt,name=simple_responses,json=simpleResponses,oneof"`
+	SimpleResponses *Intent_Message_SimpleResponses `protobuf:"bytes,7,opt,name=simple_responses,json=simpleResponses,proto3,oneof"`
 }
+
 type Intent_Message_BasicCard_ struct {
-	BasicCard *Intent_Message_BasicCard `protobuf:"bytes,8,opt,name=basic_card,json=basicCard,oneof"`
+	BasicCard *Intent_Message_BasicCard `protobuf:"bytes,8,opt,name=basic_card,json=basicCard,proto3,oneof"`
 }
+
 type Intent_Message_Suggestions_ struct {
-	Suggestions *Intent_Message_Suggestions `protobuf:"bytes,9,opt,name=suggestions,oneof"`
+	Suggestions *Intent_Message_Suggestions `protobuf:"bytes,9,opt,name=suggestions,proto3,oneof"`
 }
+
 type Intent_Message_LinkOutSuggestion_ struct {
-	LinkOutSuggestion *Intent_Message_LinkOutSuggestion `protobuf:"bytes,10,opt,name=link_out_suggestion,json=linkOutSuggestion,oneof"`
+	LinkOutSuggestion *Intent_Message_LinkOutSuggestion `protobuf:"bytes,10,opt,name=link_out_suggestion,json=linkOutSuggestion,proto3,oneof"`
 }
+
 type Intent_Message_ListSelect_ struct {
-	ListSelect *Intent_Message_ListSelect `protobuf:"bytes,11,opt,name=list_select,json=listSelect,oneof"`
+	ListSelect *Intent_Message_ListSelect `protobuf:"bytes,11,opt,name=list_select,json=listSelect,proto3,oneof"`
 }
+
 type Intent_Message_CarouselSelect_ struct {
-	CarouselSelect *Intent_Message_CarouselSelect `protobuf:"bytes,12,opt,name=carousel_select,json=carouselSelect,oneof"`
+	CarouselSelect *Intent_Message_CarouselSelect `protobuf:"bytes,12,opt,name=carousel_select,json=carouselSelect,proto3,oneof"`
+}
+
+type Intent_Message_TelephonyPlayAudio_ struct {
+	TelephonyPlayAudio *Intent_Message_TelephonyPlayAudio `protobuf:"bytes,13,opt,name=telephony_play_audio,json=telephonyPlayAudio,proto3,oneof"`
+}
+
+type Intent_Message_TelephonySynthesizeSpeech_ struct {
+	TelephonySynthesizeSpeech *Intent_Message_TelephonySynthesizeSpeech `protobuf:"bytes,14,opt,name=telephony_synthesize_speech,json=telephonySynthesizeSpeech,proto3,oneof"`
 }
 
-func (*Intent_Message_Text_) isIntent_Message_Message()              {}
-func (*Intent_Message_Image_) isIntent_Message_Message()             {}
-func (*Intent_Message_QuickReplies_) isIntent_Message_Message()      {}
-func (*Intent_Message_Card_) isIntent_Message_Message()              {}
-func (*Intent_Message_Payload) isIntent_Message_Message()            {}
-func (*Intent_Message_SimpleResponses_) isIntent_Message_Message()   {}
-func (*Intent_Message_BasicCard_) isIntent_Message_Message()         {}
-func (*Intent_Message_Suggestions_) isIntent_Message_Message()       {}
+type Intent_Message_TelephonyTransferCall_ struct {
+	TelephonyTransferCall *Intent_Message_TelephonyTransferCall `protobuf:"bytes,15,opt,name=telephony_transfer_call,json=telephonyTransferCall,proto3,oneof"`
+}
+
+func (*Intent_Message_Text_) isIntent_Message_Message() {}
+
+func (*Intent_Message_Image_) isIntent_Message_Message() {}
+
+func (*Intent_Message_QuickReplies_) isIntent_Message_Message() {}
+
+func (*Intent_Message_Card_) isIntent_Message_Message() {}
+
+func (*Intent_Message_Payload) isIntent_Message_Message() {}
+
+func (*Intent_Message_SimpleResponses_) isIntent_Message_Message() {}
+
+func (*Intent_Message_BasicCard_) isIntent_Message_Message() {}
+
+func (*Intent_Message_Suggestions_) isIntent_Message_Message() {}
+
 func (*Intent_Message_LinkOutSuggestion_) isIntent_Message_Message() {}
-func (*Intent_Message_ListSelect_) isIntent_Message_Message()        {}
-func (*Intent_Message_CarouselSelect_) isIntent_Message_Message()    {}
+
+func (*Intent_Message_ListSelect_) isIntent_Message_Message() {}
+
+func (*Intent_Message_CarouselSelect_) isIntent_Message_Message() {}
+
+func (*Intent_Message_TelephonyPlayAudio_) isIntent_Message_Message() {}
+
+func (*Intent_Message_TelephonySynthesizeSpeech_) isIntent_Message_Message() {}
+
+func (*Intent_Message_TelephonyTransferCall_) isIntent_Message_Message() {}
 
 func (m *Intent_Message) GetMessage() isIntent_Message_Message {
 	if m != nil {
@@ -668,7 +923,7 @@ func (m *Intent_Message) GetCard() *Intent_Message_Card {
 	return nil
 }
 
-func (m *Intent_Message) GetPayload() *google_protobuf4.Struct {
+func (m *Intent_Message) GetPayload() *_struct.Struct {
 	if x, ok := m.GetMessage().(*Intent_Message_Payload); ok {
 		return x.Payload
 	}
@@ -717,6 +972,27 @@ func (m *Intent_Message) GetCarouselSelect() *Intent_Message_CarouselSelect {
 	return nil
 }
 
+func (m *Intent_Message) GetTelephonyPlayAudio() *Intent_Message_TelephonyPlayAudio {
+	if x, ok := m.GetMessage().(*Intent_Message_TelephonyPlayAudio_); ok {
+		return x.TelephonyPlayAudio
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetTelephonySynthesizeSpeech() *Intent_Message_TelephonySynthesizeSpeech {
+	if x, ok := m.GetMessage().(*Intent_Message_TelephonySynthesizeSpeech_); ok {
+		return x.TelephonySynthesizeSpeech
+	}
+	return nil
+}
+
+func (m *Intent_Message) GetTelephonyTransferCall() *Intent_Message_TelephonyTransferCall {
+	if x, ok := m.GetMessage().(*Intent_Message_TelephonyTransferCall_); ok {
+		return x.TelephonyTransferCall
+	}
+	return nil
+}
+
 func (m *Intent_Message) GetPlatform() Intent_Message_Platform {
 	if m != nil {
 		return m.Platform
@@ -738,6 +1014,9 @@ func (*Intent_Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 		(*Intent_Message_LinkOutSuggestion_)(nil),
 		(*Intent_Message_ListSelect_)(nil),
 		(*Intent_Message_CarouselSelect_)(nil),
+		(*Intent_Message_TelephonyPlayAudio_)(nil),
+		(*Intent_Message_TelephonySynthesizeSpeech_)(nil),
+		(*Intent_Message_TelephonyTransferCall_)(nil),
 	}
 }
 
@@ -800,6 +1079,21 @@ func _Intent_Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 		if err := b.EncodeMessage(x.CarouselSelect); err != nil {
 			return err
 		}
+	case *Intent_Message_TelephonyPlayAudio_:
+		b.EncodeVarint(13<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TelephonyPlayAudio); err != nil {
+			return err
+		}
+	case *Intent_Message_TelephonySynthesizeSpeech_:
+		b.EncodeVarint(14<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TelephonySynthesizeSpeech); err != nil {
+			return err
+		}
+	case *Intent_Message_TelephonyTransferCall_:
+		b.EncodeVarint(15<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TelephonyTransferCall); err != nil {
+			return err
+		}
 	case nil:
 	default:
 		return fmt.Errorf("Intent_Message.Message has unexpected type %T", x)
@@ -846,7 +1140,7 @@ func _Intent_Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf4.Struct)
+		msg := new(_struct.Struct)
 		err := b.DecodeMessage(msg)
 		m.Message = &Intent_Message_Payload{msg}
 		return true, err
@@ -898,6 +1192,30 @@ func _Intent_Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto
 		err := b.DecodeMessage(msg)
 		m.Message = &Intent_Message_CarouselSelect_{msg}
 		return true, err
+	case 13: // message.telephony_play_audio
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_TelephonyPlayAudio)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_TelephonyPlayAudio_{msg}
+		return true, err
+	case 14: // message.telephony_synthesize_speech
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_TelephonySynthesizeSpeech)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_TelephonySynthesizeSpeech_{msg}
+		return true, err
+	case 15: // message.telephony_transfer_call
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Intent_Message_TelephonyTransferCall)
+		err := b.DecodeMessage(msg)
+		m.Message = &Intent_Message_TelephonyTransferCall_{msg}
+		return true, err
 	default:
 		return false, nil
 	}
@@ -909,57 +1227,72 @@ func _Intent_Message_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Message.(type) {
 	case *Intent_Message_Text_:
 		s := proto.Size(x.Text)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_Image_:
 		s := proto.Size(x.Image)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_QuickReplies_:
 		s := proto.Size(x.QuickReplies)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_Card_:
 		s := proto.Size(x.Card)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_Payload:
 		s := proto.Size(x.Payload)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_SimpleResponses_:
 		s := proto.Size(x.SimpleResponses)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_BasicCard_:
 		s := proto.Size(x.BasicCard)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_Suggestions_:
 		s := proto.Size(x.Suggestions)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_LinkOutSuggestion_:
 		s := proto.Size(x.LinkOutSuggestion)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_ListSelect_:
 		s := proto.Size(x.ListSelect)
-		n += proto.SizeVarint(11<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Intent_Message_CarouselSelect_:
 		s := proto.Size(x.CarouselSelect)
-		n += proto.SizeVarint(12<<3 | proto.WireBytes)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_TelephonyPlayAudio_:
+		s := proto.Size(x.TelephonyPlayAudio)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_TelephonySynthesizeSpeech_:
+		s := proto.Size(x.TelephonySynthesizeSpeech)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Intent_Message_TelephonyTransferCall_:
+		s := proto.Size(x.TelephonyTransferCall)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -972,13 +1305,35 @@ func _Intent_Message_OneofSizer(msg proto.Message) (n int) {
 // The text response message.
 type Intent_Message_Text struct {
 	// Optional. The collection of the agent's responses.
-	Text []string `protobuf:"bytes,1,rep,name=text" json:"text,omitempty"`
+	Text                 []string `protobuf:"bytes,1,rep,name=text,proto3" json:"text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Intent_Message_Text) Reset()                    { *m = Intent_Message_Text{} }
-func (m *Intent_Message_Text) String() string            { return proto.CompactTextString(m) }
-func (*Intent_Message_Text) ProtoMessage()               {}
-func (*Intent_Message_Text) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 2, 0} }
+func (m *Intent_Message_Text) Reset()         { *m = Intent_Message_Text{} }
+func (m *Intent_Message_Text) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Text) ProtoMessage()    {}
+func (*Intent_Message_Text) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 0}
+}
+func (m *Intent_Message_Text) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Text.Unmarshal(m, b)
+}
+func (m *Intent_Message_Text) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Text.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Text) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Text.Merge(dst, src)
+}
+func (m *Intent_Message_Text) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Text.Size(m)
+}
+func (m *Intent_Message_Text) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Text.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Text proto.InternalMessageInfo
 
 func (m *Intent_Message_Text) GetText() []string {
 	if m != nil {
@@ -990,16 +1345,38 @@ func (m *Intent_Message_Text) GetText() []string {
 // The image response message.
 type Intent_Message_Image struct {
 	// Optional. The public URI to an image file.
-	ImageUri string `protobuf:"bytes,1,opt,name=image_uri,json=imageUri" json:"image_uri,omitempty"`
-	// Optional. A text description of the image to be used for accessibility,
-	// e.g., screen readers.
-	AccessibilityText string `protobuf:"bytes,2,opt,name=accessibility_text,json=accessibilityText" json:"accessibility_text,omitempty"`
+	ImageUri string `protobuf:"bytes,1,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	// A text description of the image to be used for accessibility,
+	// e.g., screen readers. Required if image_uri is set for CarouselSelect.
+	AccessibilityText    string   `protobuf:"bytes,2,opt,name=accessibility_text,json=accessibilityText,proto3" json:"accessibility_text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Intent_Message_Image) Reset()                    { *m = Intent_Message_Image{} }
-func (m *Intent_Message_Image) String() string            { return proto.CompactTextString(m) }
-func (*Intent_Message_Image) ProtoMessage()               {}
-func (*Intent_Message_Image) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 2, 1} }
+func (m *Intent_Message_Image) Reset()         { *m = Intent_Message_Image{} }
+func (m *Intent_Message_Image) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Image) ProtoMessage()    {}
+func (*Intent_Message_Image) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 1}
+}
+func (m *Intent_Message_Image) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Image.Unmarshal(m, b)
+}
+func (m *Intent_Message_Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Image.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Image.Merge(dst, src)
+}
+func (m *Intent_Message_Image) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Image.Size(m)
+}
+func (m *Intent_Message_Image) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Image.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Image proto.InternalMessageInfo
 
 func (m *Intent_Message_Image) GetImageUri() string {
 	if m != nil {
@@ -1018,18 +1395,38 @@ func (m *Intent_Message_Image) GetAccessibilityText() string {
 // The quick replies response message.
 type Intent_Message_QuickReplies struct {
 	// Optional. The title of the collection of quick replies.
-	Title string `protobuf:"bytes,1,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
 	// Optional. The collection of quick replies.
-	QuickReplies []string `protobuf:"bytes,2,rep,name=quick_replies,json=quickReplies" json:"quick_replies,omitempty"`
+	QuickReplies         []string `protobuf:"bytes,2,rep,name=quick_replies,json=quickReplies,proto3" json:"quick_replies,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Intent_Message_QuickReplies) Reset()         { *m = Intent_Message_QuickReplies{} }
 func (m *Intent_Message_QuickReplies) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_QuickReplies) ProtoMessage()    {}
 func (*Intent_Message_QuickReplies) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 2}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 2}
+}
+func (m *Intent_Message_QuickReplies) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_QuickReplies.Unmarshal(m, b)
+}
+func (m *Intent_Message_QuickReplies) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_QuickReplies.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_QuickReplies) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_QuickReplies.Merge(dst, src)
+}
+func (m *Intent_Message_QuickReplies) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_QuickReplies.Size(m)
+}
+func (m *Intent_Message_QuickReplies) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_QuickReplies.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Intent_Message_QuickReplies proto.InternalMessageInfo
+
 func (m *Intent_Message_QuickReplies) GetTitle() string {
 	if m != nil {
 		return m.Title
@@ -1047,19 +1444,41 @@ func (m *Intent_Message_QuickReplies) GetQuickReplies() []string {
 // The card response message.
 type Intent_Message_Card struct {
 	// Optional. The title of the card.
-	Title string `protobuf:"bytes,1,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
 	// Optional. The subtitle of the card.
-	Subtitle string `protobuf:"bytes,2,opt,name=subtitle" json:"subtitle,omitempty"`
+	Subtitle string `protobuf:"bytes,2,opt,name=subtitle,proto3" json:"subtitle,omitempty"`
 	// Optional. The public URI to an image file for the card.
-	ImageUri string `protobuf:"bytes,3,opt,name=image_uri,json=imageUri" json:"image_uri,omitempty"`
+	ImageUri string `protobuf:"bytes,3,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
 	// Optional. The collection of card buttons.
-	Buttons []*Intent_Message_Card_Button `protobuf:"bytes,4,rep,name=buttons" json:"buttons,omitempty"`
+	Buttons              []*Intent_Message_Card_Button `protobuf:"bytes,4,rep,name=buttons,proto3" json:"buttons,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *Intent_Message_Card) Reset()         { *m = Intent_Message_Card{} }
+func (m *Intent_Message_Card) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Card) ProtoMessage()    {}
+func (*Intent_Message_Card) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 3}
+}
+func (m *Intent_Message_Card) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Card.Unmarshal(m, b)
+}
+func (m *Intent_Message_Card) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Card.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Card) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Card.Merge(dst, src)
+}
+func (m *Intent_Message_Card) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Card.Size(m)
+}
+func (m *Intent_Message_Card) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Card.DiscardUnknown(m)
 }
 
-func (m *Intent_Message_Card) Reset()                    { *m = Intent_Message_Card{} }
-func (m *Intent_Message_Card) String() string            { return proto.CompactTextString(m) }
-func (*Intent_Message_Card) ProtoMessage()               {}
-func (*Intent_Message_Card) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 2, 3} }
+var xxx_messageInfo_Intent_Message_Card proto.InternalMessageInfo
 
 func (m *Intent_Message_Card) GetTitle() string {
 	if m != nil {
@@ -1092,18 +1511,38 @@ func (m *Intent_Message_Card) GetButtons() []*Intent_Message_Card_Button {
 // Optional. Contains information about a button.
 type Intent_Message_Card_Button struct {
 	// Optional. The text to show on the button.
-	Text string `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// Optional. The text to send back to the Dialogflow API or a URI to
 	// open.
-	Postback string `protobuf:"bytes,2,opt,name=postback" json:"postback,omitempty"`
+	Postback             string   `protobuf:"bytes,2,opt,name=postback,proto3" json:"postback,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Intent_Message_Card_Button) Reset()         { *m = Intent_Message_Card_Button{} }
 func (m *Intent_Message_Card_Button) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Card_Button) ProtoMessage()    {}
 func (*Intent_Message_Card_Button) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 3, 0}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 3, 0}
+}
+func (m *Intent_Message_Card_Button) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Card_Button.Unmarshal(m, b)
+}
+func (m *Intent_Message_Card_Button) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Card_Button.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Card_Button) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Card_Button.Merge(dst, src)
+}
+func (m *Intent_Message_Card_Button) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Card_Button.Size(m)
 }
+func (m *Intent_Message_Card_Button) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Card_Button.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Card_Button proto.InternalMessageInfo
 
 func (m *Intent_Message_Card_Button) GetText() string {
 	if m != nil {
@@ -1123,22 +1562,42 @@ func (m *Intent_Message_Card_Button) GetPostback() string {
 type Intent_Message_SimpleResponse struct {
 	// One of text_to_speech or ssml must be provided. The plain text of the
 	// speech output. Mutually exclusive with ssml.
-	TextToSpeech string `protobuf:"bytes,1,opt,name=text_to_speech,json=textToSpeech" json:"text_to_speech,omitempty"`
+	TextToSpeech string `protobuf:"bytes,1,opt,name=text_to_speech,json=textToSpeech,proto3" json:"text_to_speech,omitempty"`
 	// One of text_to_speech or ssml must be provided. Structured spoken
 	// response to the user in the SSML format. Mutually exclusive with
 	// text_to_speech.
-	Ssml string `protobuf:"bytes,2,opt,name=ssml" json:"ssml,omitempty"`
+	Ssml string `protobuf:"bytes,2,opt,name=ssml,proto3" json:"ssml,omitempty"`
 	// Optional. The text to display.
-	DisplayText string `protobuf:"bytes,3,opt,name=display_text,json=displayText" json:"display_text,omitempty"`
+	DisplayText          string   `protobuf:"bytes,3,opt,name=display_text,json=displayText,proto3" json:"display_text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Intent_Message_SimpleResponse) Reset()         { *m = Intent_Message_SimpleResponse{} }
 func (m *Intent_Message_SimpleResponse) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SimpleResponse) ProtoMessage()    {}
 func (*Intent_Message_SimpleResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 4}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 4}
+}
+func (m *Intent_Message_SimpleResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_SimpleResponse.Unmarshal(m, b)
+}
+func (m *Intent_Message_SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_SimpleResponse.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SimpleResponse.Merge(dst, src)
+}
+func (m *Intent_Message_SimpleResponse) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_SimpleResponse.Size(m)
+}
+func (m *Intent_Message_SimpleResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_SimpleResponse.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Intent_Message_SimpleResponse proto.InternalMessageInfo
+
 func (m *Intent_Message_SimpleResponse) GetTextToSpeech() string {
 	if m != nil {
 		return m.TextToSpeech
@@ -1166,16 +1625,36 @@ func (m *Intent_Message_SimpleResponse) GetDisplayText() string {
 // `SimpleResponse`.
 type Intent_Message_SimpleResponses struct {
 	// Required. The list of simple responses.
-	SimpleResponses []*Intent_Message_SimpleResponse `protobuf:"bytes,1,rep,name=simple_responses,json=simpleResponses" json:"simple_responses,omitempty"`
+	SimpleResponses      []*Intent_Message_SimpleResponse `protobuf:"bytes,1,rep,name=simple_responses,json=simpleResponses,proto3" json:"simple_responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
+	XXX_unrecognized     []byte                           `json:"-"`
+	XXX_sizecache        int32                            `json:"-"`
 }
 
 func (m *Intent_Message_SimpleResponses) Reset()         { *m = Intent_Message_SimpleResponses{} }
 func (m *Intent_Message_SimpleResponses) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SimpleResponses) ProtoMessage()    {}
 func (*Intent_Message_SimpleResponses) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 5}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 5}
+}
+func (m *Intent_Message_SimpleResponses) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_SimpleResponses.Unmarshal(m, b)
+}
+func (m *Intent_Message_SimpleResponses) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_SimpleResponses.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_SimpleResponses) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SimpleResponses.Merge(dst, src)
+}
+func (m *Intent_Message_SimpleResponses) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_SimpleResponses.Size(m)
+}
+func (m *Intent_Message_SimpleResponses) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_SimpleResponses.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Intent_Message_SimpleResponses proto.InternalMessageInfo
+
 func (m *Intent_Message_SimpleResponses) GetSimpleResponses() []*Intent_Message_SimpleResponse {
 	if m != nil {
 		return m.SimpleResponses
@@ -1186,21 +1665,43 @@ func (m *Intent_Message_SimpleResponses) GetSimpleResponses() []*Intent_Message_
 // The basic card message. Useful for displaying information.
 type Intent_Message_BasicCard struct {
 	// Optional. The title of the card.
-	Title string `protobuf:"bytes,1,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
 	// Optional. The subtitle of the card.
-	Subtitle string `protobuf:"bytes,2,opt,name=subtitle" json:"subtitle,omitempty"`
+	Subtitle string `protobuf:"bytes,2,opt,name=subtitle,proto3" json:"subtitle,omitempty"`
 	// Required, unless image is present. The body text of the card.
-	FormattedText string `protobuf:"bytes,3,opt,name=formatted_text,json=formattedText" json:"formatted_text,omitempty"`
+	FormattedText string `protobuf:"bytes,3,opt,name=formatted_text,json=formattedText,proto3" json:"formatted_text,omitempty"`
 	// Optional. The image for the card.
-	Image *Intent_Message_Image `protobuf:"bytes,4,opt,name=image" json:"image,omitempty"`
+	Image *Intent_Message_Image `protobuf:"bytes,4,opt,name=image,proto3" json:"image,omitempty"`
 	// Optional. The collection of card buttons.
-	Buttons []*Intent_Message_BasicCard_Button `protobuf:"bytes,5,rep,name=buttons" json:"buttons,omitempty"`
+	Buttons              []*Intent_Message_BasicCard_Button `protobuf:"bytes,5,rep,name=buttons,proto3" json:"buttons,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
+}
+
+func (m *Intent_Message_BasicCard) Reset()         { *m = Intent_Message_BasicCard{} }
+func (m *Intent_Message_BasicCard) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_BasicCard) ProtoMessage()    {}
+func (*Intent_Message_BasicCard) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 6}
+}
+func (m *Intent_Message_BasicCard) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_BasicCard.Unmarshal(m, b)
+}
+func (m *Intent_Message_BasicCard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_BasicCard.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_BasicCard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard.Merge(dst, src)
+}
+func (m *Intent_Message_BasicCard) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_BasicCard.Size(m)
+}
+func (m *Intent_Message_BasicCard) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_BasicCard.DiscardUnknown(m)
 }
 
-func (m *Intent_Message_BasicCard) Reset()                    { *m = Intent_Message_BasicCard{} }
-func (m *Intent_Message_BasicCard) String() string            { return proto.CompactTextString(m) }
-func (*Intent_Message_BasicCard) ProtoMessage()               {}
-func (*Intent_Message_BasicCard) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 2, 6} }
+var xxx_messageInfo_Intent_Message_BasicCard proto.InternalMessageInfo
 
 func (m *Intent_Message_BasicCard) GetTitle() string {
 	if m != nil {
@@ -1240,17 +1741,37 @@ func (m *Intent_Message_BasicCard) GetButtons() []*Intent_Message_BasicCard_Butt
 // The button object that appears at the bottom of a card.
 type Intent_Message_BasicCard_Button struct {
 	// Required. The title of the button.
-	Title string `protobuf:"bytes,1,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
 	// Required. Action to take when a user taps on the button.
-	OpenUriAction *Intent_Message_BasicCard_Button_OpenUriAction `protobuf:"bytes,2,opt,name=open_uri_action,json=openUriAction" json:"open_uri_action,omitempty"`
+	OpenUriAction        *Intent_Message_BasicCard_Button_OpenUriAction `protobuf:"bytes,2,opt,name=open_uri_action,json=openUriAction,proto3" json:"open_uri_action,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                       `json:"-"`
+	XXX_unrecognized     []byte                                         `json:"-"`
+	XXX_sizecache        int32                                          `json:"-"`
 }
 
 func (m *Intent_Message_BasicCard_Button) Reset()         { *m = Intent_Message_BasicCard_Button{} }
 func (m *Intent_Message_BasicCard_Button) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_BasicCard_Button) ProtoMessage()    {}
 func (*Intent_Message_BasicCard_Button) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 6, 0}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 6, 0}
+}
+func (m *Intent_Message_BasicCard_Button) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button.Unmarshal(m, b)
+}
+func (m *Intent_Message_BasicCard_Button) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_BasicCard_Button) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard_Button.Merge(dst, src)
 }
+func (m *Intent_Message_BasicCard_Button) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button.Size(m)
+}
+func (m *Intent_Message_BasicCard_Button) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_BasicCard_Button.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_BasicCard_Button proto.InternalMessageInfo
 
 func (m *Intent_Message_BasicCard_Button) GetTitle() string {
 	if m != nil {
@@ -1269,7 +1790,10 @@ func (m *Intent_Message_BasicCard_Button) GetOpenUriAction() *Intent_Message_Bas
 // Opens the given URI.
 type Intent_Message_BasicCard_Button_OpenUriAction struct {
 	// Required. The HTTP or HTTPS scheme URI.
-	Uri string `protobuf:"bytes,1,opt,name=uri" json:"uri,omitempty"`
+	Uri                  string   `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Intent_Message_BasicCard_Button_OpenUriAction) Reset() {
@@ -1280,8 +1804,25 @@ func (m *Intent_Message_BasicCard_Button_OpenUriAction) String() string {
 }
 func (*Intent_Message_BasicCard_Button_OpenUriAction) ProtoMessage() {}
 func (*Intent_Message_BasicCard_Button_OpenUriAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 6, 0, 0}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 6, 0, 0}
 }
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Unmarshal(m, b)
+}
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Merge(dst, src)
+}
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.Size(m)
+}
+func (m *Intent_Message_BasicCard_Button_OpenUriAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_BasicCard_Button_OpenUriAction proto.InternalMessageInfo
 
 func (m *Intent_Message_BasicCard_Button_OpenUriAction) GetUri() string {
 	if m != nil {
@@ -1294,13 +1835,35 @@ func (m *Intent_Message_BasicCard_Button_OpenUriAction) GetUri() string {
 // to the conversation.
 type Intent_Message_Suggestion struct {
 	// Required. The text shown the in the suggestion chip.
-	Title string `protobuf:"bytes,1,opt,name=title" json:"title,omitempty"`
+	Title                string   `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_Suggestion) Reset()         { *m = Intent_Message_Suggestion{} }
+func (m *Intent_Message_Suggestion) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_Suggestion) ProtoMessage()    {}
+func (*Intent_Message_Suggestion) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 7}
+}
+func (m *Intent_Message_Suggestion) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Suggestion.Unmarshal(m, b)
+}
+func (m *Intent_Message_Suggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Suggestion.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Suggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Suggestion.Merge(dst, src)
+}
+func (m *Intent_Message_Suggestion) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Suggestion.Size(m)
+}
+func (m *Intent_Message_Suggestion) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Suggestion.DiscardUnknown(m)
 }
 
-func (m *Intent_Message_Suggestion) Reset()                    { *m = Intent_Message_Suggestion{} }
-func (m *Intent_Message_Suggestion) String() string            { return proto.CompactTextString(m) }
-func (*Intent_Message_Suggestion) ProtoMessage()               {}
-func (*Intent_Message_Suggestion) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 2, 7} }
+var xxx_messageInfo_Intent_Message_Suggestion proto.InternalMessageInfo
 
 func (m *Intent_Message_Suggestion) GetTitle() string {
 	if m != nil {
@@ -1312,15 +1875,35 @@ func (m *Intent_Message_Suggestion) GetTitle() string {
 // The collection of suggestions.
 type Intent_Message_Suggestions struct {
 	// Required. The list of suggested replies.
-	Suggestions []*Intent_Message_Suggestion `protobuf:"bytes,1,rep,name=suggestions" json:"suggestions,omitempty"`
+	Suggestions          []*Intent_Message_Suggestion `protobuf:"bytes,1,rep,name=suggestions,proto3" json:"suggestions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
 }
 
 func (m *Intent_Message_Suggestions) Reset()         { *m = Intent_Message_Suggestions{} }
 func (m *Intent_Message_Suggestions) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_Suggestions) ProtoMessage()    {}
 func (*Intent_Message_Suggestions) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 8}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 8}
 }
+func (m *Intent_Message_Suggestions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_Suggestions.Unmarshal(m, b)
+}
+func (m *Intent_Message_Suggestions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_Suggestions.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_Suggestions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_Suggestions.Merge(dst, src)
+}
+func (m *Intent_Message_Suggestions) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_Suggestions.Size(m)
+}
+func (m *Intent_Message_Suggestions) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_Suggestions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_Suggestions proto.InternalMessageInfo
 
 func (m *Intent_Message_Suggestions) GetSuggestions() []*Intent_Message_Suggestion {
 	if m != nil {
@@ -1333,19 +1916,39 @@ func (m *Intent_Message_Suggestions) GetSuggestions() []*Intent_Message_Suggesti
 // or website associated with this agent.
 type Intent_Message_LinkOutSuggestion struct {
 	// Required. The name of the app or site this chip is linking to.
-	DestinationName string `protobuf:"bytes,1,opt,name=destination_name,json=destinationName" json:"destination_name,omitempty"`
+	DestinationName string `protobuf:"bytes,1,opt,name=destination_name,json=destinationName,proto3" json:"destination_name,omitempty"`
 	// Required. The URI of the app or site to open when the user taps the
 	// suggestion chip.
-	Uri string `protobuf:"bytes,2,opt,name=uri" json:"uri,omitempty"`
+	Uri                  string   `protobuf:"bytes,2,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Intent_Message_LinkOutSuggestion) Reset()         { *m = Intent_Message_LinkOutSuggestion{} }
 func (m *Intent_Message_LinkOutSuggestion) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_LinkOutSuggestion) ProtoMessage()    {}
 func (*Intent_Message_LinkOutSuggestion) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 9}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 9}
+}
+func (m *Intent_Message_LinkOutSuggestion) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Unmarshal(m, b)
+}
+func (m *Intent_Message_LinkOutSuggestion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_LinkOutSuggestion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_LinkOutSuggestion.Merge(dst, src)
+}
+func (m *Intent_Message_LinkOutSuggestion) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_LinkOutSuggestion.Size(m)
+}
+func (m *Intent_Message_LinkOutSuggestion) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_LinkOutSuggestion.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Intent_Message_LinkOutSuggestion proto.InternalMessageInfo
+
 func (m *Intent_Message_LinkOutSuggestion) GetDestinationName() string {
 	if m != nil {
 		return m.DestinationName
@@ -1363,17 +1966,37 @@ func (m *Intent_Message_LinkOutSuggestion) GetUri() string {
 // The card for presenting a list of options to select from.
 type Intent_Message_ListSelect struct {
 	// Optional. The overall title of the list.
-	Title string `protobuf:"bytes,1,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
 	// Required. List items.
-	Items []*Intent_Message_ListSelect_Item `protobuf:"bytes,2,rep,name=items" json:"items,omitempty"`
+	Items                []*Intent_Message_ListSelect_Item `protobuf:"bytes,2,rep,name=items,proto3" json:"items,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
 }
 
 func (m *Intent_Message_ListSelect) Reset()         { *m = Intent_Message_ListSelect{} }
 func (m *Intent_Message_ListSelect) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_ListSelect) ProtoMessage()    {}
 func (*Intent_Message_ListSelect) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 10}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 10}
+}
+func (m *Intent_Message_ListSelect) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_ListSelect.Unmarshal(m, b)
+}
+func (m *Intent_Message_ListSelect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_ListSelect.Marshal(b, m, deterministic)
 }
+func (dst *Intent_Message_ListSelect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_ListSelect.Merge(dst, src)
+}
+func (m *Intent_Message_ListSelect) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_ListSelect.Size(m)
+}
+func (m *Intent_Message_ListSelect) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_ListSelect.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_ListSelect proto.InternalMessageInfo
 
 func (m *Intent_Message_ListSelect) GetTitle() string {
 	if m != nil {
@@ -1392,21 +2015,41 @@ func (m *Intent_Message_ListSelect) GetItems() []*Intent_Message_ListSelect_Item
 // An item in the list.
 type Intent_Message_ListSelect_Item struct {
 	// Required. Additional information about this option.
-	Info *Intent_Message_SelectItemInfo `protobuf:"bytes,1,opt,name=info" json:"info,omitempty"`
+	Info *Intent_Message_SelectItemInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"`
 	// Required. The title of the list item.
-	Title string `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
 	// Optional. The main text describing the item.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Optional. The image to display.
-	Image *Intent_Message_Image `protobuf:"bytes,4,opt,name=image" json:"image,omitempty"`
+	Image                *Intent_Message_Image `protobuf:"bytes,4,opt,name=image,proto3" json:"image,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
 func (m *Intent_Message_ListSelect_Item) Reset()         { *m = Intent_Message_ListSelect_Item{} }
 func (m *Intent_Message_ListSelect_Item) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_ListSelect_Item) ProtoMessage()    {}
 func (*Intent_Message_ListSelect_Item) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 10, 0}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 10, 0}
+}
+func (m *Intent_Message_ListSelect_Item) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_ListSelect_Item.Unmarshal(m, b)
+}
+func (m *Intent_Message_ListSelect_Item) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_ListSelect_Item.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_ListSelect_Item) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_ListSelect_Item.Merge(dst, src)
 }
+func (m *Intent_Message_ListSelect_Item) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_ListSelect_Item.Size(m)
+}
+func (m *Intent_Message_ListSelect_Item) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_ListSelect_Item.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_ListSelect_Item proto.InternalMessageInfo
 
 func (m *Intent_Message_ListSelect_Item) GetInfo() *Intent_Message_SelectItemInfo {
 	if m != nil {
@@ -1439,16 +2082,36 @@ func (m *Intent_Message_ListSelect_Item) GetImage() *Intent_Message_Image {
 // The card for presenting a carousel of options to select from.
 type Intent_Message_CarouselSelect struct {
 	// Required. Carousel items.
-	Items []*Intent_Message_CarouselSelect_Item `protobuf:"bytes,1,rep,name=items" json:"items,omitempty"`
+	Items                []*Intent_Message_CarouselSelect_Item `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
 }
 
 func (m *Intent_Message_CarouselSelect) Reset()         { *m = Intent_Message_CarouselSelect{} }
 func (m *Intent_Message_CarouselSelect) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_CarouselSelect) ProtoMessage()    {}
 func (*Intent_Message_CarouselSelect) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 11}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 11}
+}
+func (m *Intent_Message_CarouselSelect) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_CarouselSelect.Unmarshal(m, b)
+}
+func (m *Intent_Message_CarouselSelect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_CarouselSelect.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_CarouselSelect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_CarouselSelect.Merge(dst, src)
+}
+func (m *Intent_Message_CarouselSelect) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_CarouselSelect.Size(m)
+}
+func (m *Intent_Message_CarouselSelect) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_CarouselSelect.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Intent_Message_CarouselSelect proto.InternalMessageInfo
+
 func (m *Intent_Message_CarouselSelect) GetItems() []*Intent_Message_CarouselSelect_Item {
 	if m != nil {
 		return m.Items
@@ -1459,21 +2122,41 @@ func (m *Intent_Message_CarouselSelect) GetItems() []*Intent_Message_CarouselSel
 // An item in the carousel.
 type Intent_Message_CarouselSelect_Item struct {
 	// Required. Additional info about the option item.
-	Info *Intent_Message_SelectItemInfo `protobuf:"bytes,1,opt,name=info" json:"info,omitempty"`
+	Info *Intent_Message_SelectItemInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"`
 	// Required. Title of the carousel item.
-	Title string `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
 	// Optional. The body text of the card.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Optional. The image to display.
-	Image *Intent_Message_Image `protobuf:"bytes,4,opt,name=image" json:"image,omitempty"`
+	Image                *Intent_Message_Image `protobuf:"bytes,4,opt,name=image,proto3" json:"image,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
 func (m *Intent_Message_CarouselSelect_Item) Reset()         { *m = Intent_Message_CarouselSelect_Item{} }
 func (m *Intent_Message_CarouselSelect_Item) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_CarouselSelect_Item) ProtoMessage()    {}
 func (*Intent_Message_CarouselSelect_Item) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 11, 0}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 11, 0}
+}
+func (m *Intent_Message_CarouselSelect_Item) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Unmarshal(m, b)
+}
+func (m *Intent_Message_CarouselSelect_Item) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_CarouselSelect_Item) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_CarouselSelect_Item.Merge(dst, src)
+}
+func (m *Intent_Message_CarouselSelect_Item) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_CarouselSelect_Item.Size(m)
 }
+func (m *Intent_Message_CarouselSelect_Item) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_CarouselSelect_Item.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_CarouselSelect_Item proto.InternalMessageInfo
 
 func (m *Intent_Message_CarouselSelect_Item) GetInfo() *Intent_Message_SelectItemInfo {
 	if m != nil {
@@ -1508,19 +2191,39 @@ func (m *Intent_Message_CarouselSelect_Item) GetImage() *Intent_Message_Image {
 type Intent_Message_SelectItemInfo struct {
 	// Required. A unique key that will be sent back to the agent if this
 	// response is given.
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// Optional. A list of synonyms that can also be used to trigger this
 	// item in dialog.
-	Synonyms []string `protobuf:"bytes,2,rep,name=synonyms" json:"synonyms,omitempty"`
+	Synonyms             []string `protobuf:"bytes,2,rep,name=synonyms,proto3" json:"synonyms,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Intent_Message_SelectItemInfo) Reset()         { *m = Intent_Message_SelectItemInfo{} }
 func (m *Intent_Message_SelectItemInfo) String() string { return proto.CompactTextString(m) }
 func (*Intent_Message_SelectItemInfo) ProtoMessage()    {}
 func (*Intent_Message_SelectItemInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 12}
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 12}
+}
+func (m *Intent_Message_SelectItemInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_SelectItemInfo.Unmarshal(m, b)
+}
+func (m *Intent_Message_SelectItemInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_SelectItemInfo.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_SelectItemInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_SelectItemInfo.Merge(dst, src)
+}
+func (m *Intent_Message_SelectItemInfo) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_SelectItemInfo.Size(m)
+}
+func (m *Intent_Message_SelectItemInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_SelectItemInfo.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Intent_Message_SelectItemInfo proto.InternalMessageInfo
+
 func (m *Intent_Message_SelectItemInfo) GetKey() string {
 	if m != nil {
 		return m.Key
@@ -1535,20 +2238,286 @@ func (m *Intent_Message_SelectItemInfo) GetSynonyms() []string {
 	return nil
 }
 
+// Plays audio from a file in Telephony Gateway.
+type Intent_Message_TelephonyPlayAudio struct {
+	// Required. URI to a Google Cloud Storage object containing the audio to
+	// play, e.g., "gs://bucket/object". The object must contain a single
+	// channel (mono) of linear PCM audio (2 bytes / sample) at 8kHz.
+	//
+	// This object must be readable by the `service-<Project
+	// Number>@gcp-sa-dialogflow.iam.gserviceaccount.com` service account
+	// where <Project Number> is the number of the Telephony Gateway project
+	// (usually the same as the Dialogflow agent project). If the Google Cloud
+	// Storage bucket is in the Telephony Gateway project, this permission is
+	// added by default when enabling the Dialogflow V2 API.
+	//
+	// For audio from other sources, consider using the
+	// `TelephonySynthesizeSpeech` message with SSML.
+	AudioUri             string   `protobuf:"bytes,1,opt,name=audio_uri,json=audioUri,proto3" json:"audio_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_TelephonyPlayAudio) Reset()         { *m = Intent_Message_TelephonyPlayAudio{} }
+func (m *Intent_Message_TelephonyPlayAudio) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_TelephonyPlayAudio) ProtoMessage()    {}
+func (*Intent_Message_TelephonyPlayAudio) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 13}
+}
+func (m *Intent_Message_TelephonyPlayAudio) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Unmarshal(m, b)
+}
+func (m *Intent_Message_TelephonyPlayAudio) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_TelephonyPlayAudio) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Merge(dst, src)
+}
+func (m *Intent_Message_TelephonyPlayAudio) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_TelephonyPlayAudio.Size(m)
+}
+func (m *Intent_Message_TelephonyPlayAudio) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_TelephonyPlayAudio.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_TelephonyPlayAudio proto.InternalMessageInfo
+
+func (m *Intent_Message_TelephonyPlayAudio) GetAudioUri() string {
+	if m != nil {
+		return m.AudioUri
+	}
+	return ""
+}
+
+// Synthesizes speech and plays back the synthesized audio to the caller in
+// Telephony Gateway.
+//
+// Telephony Gateway takes the synthesizer settings from
+// `DetectIntentResponse.output_audio_config` which can either be set
+// at request-level or can come from the agent-level synthesizer config.
+type Intent_Message_TelephonySynthesizeSpeech struct {
+	// Required. The source to be synthesized.
+	//
+	// Types that are valid to be assigned to Source:
+	//	*Intent_Message_TelephonySynthesizeSpeech_Text
+	//	*Intent_Message_TelephonySynthesizeSpeech_Ssml
+	Source               isIntent_Message_TelephonySynthesizeSpeech_Source `protobuf_oneof:"source"`
+	XXX_NoUnkeyedLiteral struct{}                                          `json:"-"`
+	XXX_unrecognized     []byte                                            `json:"-"`
+	XXX_sizecache        int32                                             `json:"-"`
+}
+
+func (m *Intent_Message_TelephonySynthesizeSpeech) Reset() {
+	*m = Intent_Message_TelephonySynthesizeSpeech{}
+}
+func (m *Intent_Message_TelephonySynthesizeSpeech) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_TelephonySynthesizeSpeech) ProtoMessage()    {}
+func (*Intent_Message_TelephonySynthesizeSpeech) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 14}
+}
+func (m *Intent_Message_TelephonySynthesizeSpeech) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Unmarshal(m, b)
+}
+func (m *Intent_Message_TelephonySynthesizeSpeech) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_TelephonySynthesizeSpeech) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Merge(dst, src)
+}
+func (m *Intent_Message_TelephonySynthesizeSpeech) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.Size(m)
+}
+func (m *Intent_Message_TelephonySynthesizeSpeech) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_TelephonySynthesizeSpeech proto.InternalMessageInfo
+
+type isIntent_Message_TelephonySynthesizeSpeech_Source interface {
+	isIntent_Message_TelephonySynthesizeSpeech_Source()
+}
+
+type Intent_Message_TelephonySynthesizeSpeech_Text struct {
+	Text string `protobuf:"bytes,1,opt,name=text,proto3,oneof"`
+}
+
+type Intent_Message_TelephonySynthesizeSpeech_Ssml struct {
+	Ssml string `protobuf:"bytes,2,opt,name=ssml,proto3,oneof"`
+}
+
+func (*Intent_Message_TelephonySynthesizeSpeech_Text) isIntent_Message_TelephonySynthesizeSpeech_Source() {
+}
+
+func (*Intent_Message_TelephonySynthesizeSpeech_Ssml) isIntent_Message_TelephonySynthesizeSpeech_Source() {
+}
+
+func (m *Intent_Message_TelephonySynthesizeSpeech) GetSource() isIntent_Message_TelephonySynthesizeSpeech_Source {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+func (m *Intent_Message_TelephonySynthesizeSpeech) GetText() string {
+	if x, ok := m.GetSource().(*Intent_Message_TelephonySynthesizeSpeech_Text); ok {
+		return x.Text
+	}
+	return ""
+}
+
+func (m *Intent_Message_TelephonySynthesizeSpeech) GetSsml() string {
+	if x, ok := m.GetSource().(*Intent_Message_TelephonySynthesizeSpeech_Ssml); ok {
+		return x.Ssml
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Intent_Message_TelephonySynthesizeSpeech) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Intent_Message_TelephonySynthesizeSpeech_OneofMarshaler, _Intent_Message_TelephonySynthesizeSpeech_OneofUnmarshaler, _Intent_Message_TelephonySynthesizeSpeech_OneofSizer, []interface{}{
+		(*Intent_Message_TelephonySynthesizeSpeech_Text)(nil),
+		(*Intent_Message_TelephonySynthesizeSpeech_Ssml)(nil),
+	}
+}
+
+func _Intent_Message_TelephonySynthesizeSpeech_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Intent_Message_TelephonySynthesizeSpeech)
+	// source
+	switch x := m.Source.(type) {
+	case *Intent_Message_TelephonySynthesizeSpeech_Text:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Text)
+	case *Intent_Message_TelephonySynthesizeSpeech_Ssml:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Ssml)
+	case nil:
+	default:
+		return fmt.Errorf("Intent_Message_TelephonySynthesizeSpeech.Source has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Intent_Message_TelephonySynthesizeSpeech_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Intent_Message_TelephonySynthesizeSpeech)
+	switch tag {
+	case 1: // source.text
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Source = &Intent_Message_TelephonySynthesizeSpeech_Text{x}
+		return true, err
+	case 2: // source.ssml
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Source = &Intent_Message_TelephonySynthesizeSpeech_Ssml{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Intent_Message_TelephonySynthesizeSpeech_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Intent_Message_TelephonySynthesizeSpeech)
+	// source
+	switch x := m.Source.(type) {
+	case *Intent_Message_TelephonySynthesizeSpeech_Text:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Text)))
+		n += len(x.Text)
+	case *Intent_Message_TelephonySynthesizeSpeech_Ssml:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Ssml)))
+		n += len(x.Ssml)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Transfers the call in Telephony Gateway.
+type Intent_Message_TelephonyTransferCall struct {
+	// Required. The phone number to transfer the call to
+	// in [E.164 format](https://en.wikipedia.org/wiki/E.164).
+	//
+	// We currently only allow transferring to US numbers (+1xxxyyyzzzz).
+	PhoneNumber          string   `protobuf:"bytes,1,opt,name=phone_number,json=phoneNumber,proto3" json:"phone_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Intent_Message_TelephonyTransferCall) Reset()         { *m = Intent_Message_TelephonyTransferCall{} }
+func (m *Intent_Message_TelephonyTransferCall) String() string { return proto.CompactTextString(m) }
+func (*Intent_Message_TelephonyTransferCall) ProtoMessage()    {}
+func (*Intent_Message_TelephonyTransferCall) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 2, 15}
+}
+func (m *Intent_Message_TelephonyTransferCall) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_Message_TelephonyTransferCall.Unmarshal(m, b)
+}
+func (m *Intent_Message_TelephonyTransferCall) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_Message_TelephonyTransferCall.Marshal(b, m, deterministic)
+}
+func (dst *Intent_Message_TelephonyTransferCall) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_Message_TelephonyTransferCall.Merge(dst, src)
+}
+func (m *Intent_Message_TelephonyTransferCall) XXX_Size() int {
+	return xxx_messageInfo_Intent_Message_TelephonyTransferCall.Size(m)
+}
+func (m *Intent_Message_TelephonyTransferCall) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_Message_TelephonyTransferCall.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_Message_TelephonyTransferCall proto.InternalMessageInfo
+
+func (m *Intent_Message_TelephonyTransferCall) GetPhoneNumber() string {
+	if m != nil {
+		return m.PhoneNumber
+	}
+	return ""
+}
+
 // Represents a single followup intent in the chain.
 type Intent_FollowupIntentInfo struct {
 	// The unique identifier of the followup intent.
 	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-	FollowupIntentName string `protobuf:"bytes,1,opt,name=followup_intent_name,json=followupIntentName" json:"followup_intent_name,omitempty"`
+	FollowupIntentName string `protobuf:"bytes,1,opt,name=followup_intent_name,json=followupIntentName,proto3" json:"followup_intent_name,omitempty"`
 	// The unique identifier of the followup intent parent.
 	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-	ParentFollowupIntentName string `protobuf:"bytes,2,opt,name=parent_followup_intent_name,json=parentFollowupIntentName" json:"parent_followup_intent_name,omitempty"`
+	ParentFollowupIntentName string   `protobuf:"bytes,2,opt,name=parent_followup_intent_name,json=parentFollowupIntentName,proto3" json:"parent_followup_intent_name,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
 }
 
-func (m *Intent_FollowupIntentInfo) Reset()                    { *m = Intent_FollowupIntentInfo{} }
-func (m *Intent_FollowupIntentInfo) String() string            { return proto.CompactTextString(m) }
-func (*Intent_FollowupIntentInfo) ProtoMessage()               {}
-func (*Intent_FollowupIntentInfo) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 3} }
+func (m *Intent_FollowupIntentInfo) Reset()         { *m = Intent_FollowupIntentInfo{} }
+func (m *Intent_FollowupIntentInfo) String() string { return proto.CompactTextString(m) }
+func (*Intent_FollowupIntentInfo) ProtoMessage()    {}
+func (*Intent_FollowupIntentInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{0, 3}
+}
+func (m *Intent_FollowupIntentInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Intent_FollowupIntentInfo.Unmarshal(m, b)
+}
+func (m *Intent_FollowupIntentInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Intent_FollowupIntentInfo.Marshal(b, m, deterministic)
+}
+func (dst *Intent_FollowupIntentInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Intent_FollowupIntentInfo.Merge(dst, src)
+}
+func (m *Intent_FollowupIntentInfo) XXX_Size() int {
+	return xxx_messageInfo_Intent_FollowupIntentInfo.Size(m)
+}
+func (m *Intent_FollowupIntentInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_Intent_FollowupIntentInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Intent_FollowupIntentInfo proto.InternalMessageInfo
 
 func (m *Intent_FollowupIntentInfo) GetFollowupIntentName() string {
 	if m != nil {
@@ -1564,31 +2533,52 @@ func (m *Intent_FollowupIntentInfo) GetParentFollowupIntentName() string {
 	return ""
 }
 
-// The request message for
-// [Intents.ListIntents][google.cloud.dialogflow.v2beta1.Intents.ListIntents].
+// The request message for [Intents.ListIntents][google.cloud.dialogflow.v2beta1.Intents.ListIntents].
 type ListIntentsRequest struct {
 	// Required. The agent to list all intents from.
 	// Format: `projects/<Project ID>/agent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. The language to list training phrases, parameters and rich
 	// messages for. If not specified, the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent before they can be used.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The resource view to apply to the returned intent.
-	IntentView IntentView `protobuf:"varint,3,opt,name=intent_view,json=intentView,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	IntentView IntentView `protobuf:"varint,3,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
 	// Optional. The maximum number of items to return in a single page. By
 	// default 100 and at most 1000.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The next_page_token value returned from a previous list request.
-	PageToken string `protobuf:"bytes,5,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,5,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListIntentsRequest) Reset()                    { *m = ListIntentsRequest{} }
-func (m *ListIntentsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListIntentsRequest) ProtoMessage()               {}
-func (*ListIntentsRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+func (m *ListIntentsRequest) Reset()         { *m = ListIntentsRequest{} }
+func (m *ListIntentsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListIntentsRequest) ProtoMessage()    {}
+func (*ListIntentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{1}
+}
+func (m *ListIntentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListIntentsRequest.Unmarshal(m, b)
+}
+func (m *ListIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListIntentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIntentsRequest.Merge(dst, src)
+}
+func (m *ListIntentsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListIntentsRequest.Size(m)
+}
+func (m *ListIntentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListIntentsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListIntentsRequest proto.InternalMessageInfo
 
 func (m *ListIntentsRequest) GetParent() string {
 	if m != nil {
@@ -1625,21 +2615,42 @@ func (m *ListIntentsRequest) GetPageToken() string {
 	return ""
 }
 
-// The response message for
-// [Intents.ListIntents][google.cloud.dialogflow.v2beta1.Intents.ListIntents].
+// The response message for [Intents.ListIntents][google.cloud.dialogflow.v2beta1.Intents.ListIntents].
 type ListIntentsResponse struct {
 	// The list of agent intents. There will be a maximum number of items
 	// returned based on the page_size field in the request.
-	Intents []*Intent `protobuf:"bytes,1,rep,name=intents" json:"intents,omitempty"`
+	Intents []*Intent `protobuf:"bytes,1,rep,name=intents,proto3" json:"intents,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no
 	// more results in the list.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListIntentsResponse) Reset()         { *m = ListIntentsResponse{} }
+func (m *ListIntentsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListIntentsResponse) ProtoMessage()    {}
+func (*ListIntentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{2}
+}
+func (m *ListIntentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListIntentsResponse.Unmarshal(m, b)
+}
+func (m *ListIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListIntentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIntentsResponse.Merge(dst, src)
+}
+func (m *ListIntentsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListIntentsResponse.Size(m)
+}
+func (m *ListIntentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListIntentsResponse.DiscardUnknown(m)
 }
 
-func (m *ListIntentsResponse) Reset()                    { *m = ListIntentsResponse{} }
-func (m *ListIntentsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListIntentsResponse) ProtoMessage()               {}
-func (*ListIntentsResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
+var xxx_messageInfo_ListIntentsResponse proto.InternalMessageInfo
 
 func (m *ListIntentsResponse) GetIntents() []*Intent {
 	if m != nil {
@@ -1655,26 +2666,47 @@ func (m *ListIntentsResponse) GetNextPageToken() string {
 	return ""
 }
 
-// The request message for
-// [Intents.GetIntent][google.cloud.dialogflow.v2beta1.Intents.GetIntent].
+// The request message for [Intents.GetIntent][google.cloud.dialogflow.v2beta1.Intents.GetIntent].
 type GetIntentRequest struct {
 	// Required. The name of the intent.
 	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The language to retrieve training phrases, parameters and rich
 	// messages for. If not specified, the agent's default language is used.
 	// [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The resource view to apply to the returned intent.
-	IntentView IntentView `protobuf:"varint,3,opt,name=intent_view,json=intentView,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	IntentView           IntentView `protobuf:"varint,3,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *GetIntentRequest) Reset()         { *m = GetIntentRequest{} }
+func (m *GetIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*GetIntentRequest) ProtoMessage()    {}
+func (*GetIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{3}
+}
+func (m *GetIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetIntentRequest.Unmarshal(m, b)
+}
+func (m *GetIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIntentRequest.Merge(dst, src)
+}
+func (m *GetIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_GetIntentRequest.Size(m)
+}
+func (m *GetIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetIntentRequest.DiscardUnknown(m)
 }
 
-func (m *GetIntentRequest) Reset()                    { *m = GetIntentRequest{} }
-func (m *GetIntentRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetIntentRequest) ProtoMessage()               {}
-func (*GetIntentRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{3} }
+var xxx_messageInfo_GetIntentRequest proto.InternalMessageInfo
 
 func (m *GetIntentRequest) GetName() string {
 	if m != nil {
@@ -1697,28 +2729,49 @@ func (m *GetIntentRequest) GetIntentView() IntentView {
 	return IntentView_INTENT_VIEW_UNSPECIFIED
 }
 
-// The request message for
-// [Intents.CreateIntent][google.cloud.dialogflow.v2beta1.Intents.CreateIntent].
+// The request message for [Intents.CreateIntent][google.cloud.dialogflow.v2beta1.Intents.CreateIntent].
 type CreateIntentRequest struct {
 	// Required. The agent to create a intent for.
 	// Format: `projects/<Project ID>/agent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The intent to create.
-	Intent *Intent `protobuf:"bytes,2,opt,name=intent" json:"intent,omitempty"`
+	Intent *Intent `protobuf:"bytes,2,opt,name=intent,proto3" json:"intent,omitempty"`
 	// Optional. The language of training phrases, parameters and rich messages
 	// defined in `intent`. If not specified, the agent's default language is
 	// used. [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The resource view to apply to the returned intent.
-	IntentView IntentView `protobuf:"varint,4,opt,name=intent_view,json=intentView,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	IntentView           IntentView `protobuf:"varint,4,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *CreateIntentRequest) Reset()                    { *m = CreateIntentRequest{} }
-func (m *CreateIntentRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateIntentRequest) ProtoMessage()               {}
-func (*CreateIntentRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{4} }
+func (m *CreateIntentRequest) Reset()         { *m = CreateIntentRequest{} }
+func (m *CreateIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateIntentRequest) ProtoMessage()    {}
+func (*CreateIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{4}
+}
+func (m *CreateIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateIntentRequest.Unmarshal(m, b)
+}
+func (m *CreateIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIntentRequest.Merge(dst, src)
+}
+func (m *CreateIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateIntentRequest.Size(m)
+}
+func (m *CreateIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateIntentRequest proto.InternalMessageInfo
 
 func (m *CreateIntentRequest) GetParent() string {
 	if m != nil {
@@ -1748,28 +2801,49 @@ func (m *CreateIntentRequest) GetIntentView() IntentView {
 	return IntentView_INTENT_VIEW_UNSPECIFIED
 }
 
-// The request message for
-// [Intents.UpdateIntent][google.cloud.dialogflow.v2beta1.Intents.UpdateIntent].
+// The request message for [Intents.UpdateIntent][google.cloud.dialogflow.v2beta1.Intents.UpdateIntent].
 type UpdateIntentRequest struct {
 	// Required. The intent to update.
 	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-	Intent *Intent `protobuf:"bytes,1,opt,name=intent" json:"intent,omitempty"`
+	Intent *Intent `protobuf:"bytes,1,opt,name=intent,proto3" json:"intent,omitempty"`
 	// Optional. The language of training phrases, parameters and rich messages
 	// defined in `intent`. If not specified, the agent's default language is
 	// used. [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. The resource view to apply to the returned intent.
-	IntentView IntentView `protobuf:"varint,4,opt,name=intent_view,json=intentView,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	IntentView           IntentView `protobuf:"varint,4,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *UpdateIntentRequest) Reset()                    { *m = UpdateIntentRequest{} }
-func (m *UpdateIntentRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateIntentRequest) ProtoMessage()               {}
-func (*UpdateIntentRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{5} }
+func (m *UpdateIntentRequest) Reset()         { *m = UpdateIntentRequest{} }
+func (m *UpdateIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateIntentRequest) ProtoMessage()    {}
+func (*UpdateIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{5}
+}
+func (m *UpdateIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateIntentRequest.Unmarshal(m, b)
+}
+func (m *UpdateIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateIntentRequest.Merge(dst, src)
+}
+func (m *UpdateIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateIntentRequest.Size(m)
+}
+func (m *UpdateIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateIntentRequest proto.InternalMessageInfo
 
 func (m *UpdateIntentRequest) GetIntent() *Intent {
 	if m != nil {
@@ -1785,7 +2859,7 @@ func (m *UpdateIntentRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (m *UpdateIntentRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateIntentRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1799,18 +2873,39 @@ func (m *UpdateIntentRequest) GetIntentView() IntentView {
 	return IntentView_INTENT_VIEW_UNSPECIFIED
 }
 
-// The request message for
-// [Intents.DeleteIntent][google.cloud.dialogflow.v2beta1.Intents.DeleteIntent].
+// The request message for [Intents.DeleteIntent][google.cloud.dialogflow.v2beta1.Intents.DeleteIntent].
 type DeleteIntentRequest struct {
 	// Required. The name of the intent to delete.
 	// Format: `projects/<Project ID>/agent/intents/<Intent ID>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteIntentRequest) Reset()                    { *m = DeleteIntentRequest{} }
-func (m *DeleteIntentRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteIntentRequest) ProtoMessage()               {}
-func (*DeleteIntentRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{6} }
+func (m *DeleteIntentRequest) Reset()         { *m = DeleteIntentRequest{} }
+func (m *DeleteIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteIntentRequest) ProtoMessage()    {}
+func (*DeleteIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{6}
+}
+func (m *DeleteIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteIntentRequest.Unmarshal(m, b)
+}
+func (m *DeleteIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIntentRequest.Merge(dst, src)
+}
+func (m *DeleteIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteIntentRequest.Size(m)
+}
+func (m *DeleteIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteIntentRequest proto.InternalMessageInfo
 
 func (m *DeleteIntentRequest) GetName() string {
 	if m != nil {
@@ -1819,12 +2914,11 @@ func (m *DeleteIntentRequest) GetName() string {
 	return ""
 }
 
-// The request message for
-// [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2beta1.Intents.BatchUpdateIntents].
+// The request message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2beta1.Intents.BatchUpdateIntents].
 type BatchUpdateIntentsRequest struct {
 	// Required. The name of the agent to update or create intents in.
 	// Format: `projects/<Project ID>/agent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The source of the intent batch.
 	//
 	// Types that are valid to be assigned to IntentBatch:
@@ -1836,30 +2930,61 @@ type BatchUpdateIntentsRequest struct {
 	// used. [More than a dozen
 	// languages](https://dialogflow.com/docs/reference/language) are supported.
 	// Note: languages must be enabled in the agent, before they can be used.
-	LanguageCode string `protobuf:"bytes,4,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,4,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. The resource view to apply to the returned intent.
-	IntentView IntentView `protobuf:"varint,6,opt,name=intent_view,json=intentView,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	IntentView           IntentView `protobuf:"varint,6,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2beta1.IntentView" json:"intent_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *BatchUpdateIntentsRequest) Reset()         { *m = BatchUpdateIntentsRequest{} }
+func (m *BatchUpdateIntentsRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateIntentsRequest) ProtoMessage()    {}
+func (*BatchUpdateIntentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{7}
+}
+func (m *BatchUpdateIntentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateIntentsRequest.Unmarshal(m, b)
+}
+func (m *BatchUpdateIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateIntentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateIntentsRequest.Merge(dst, src)
+}
+func (m *BatchUpdateIntentsRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateIntentsRequest.Size(m)
+}
+func (m *BatchUpdateIntentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateIntentsRequest.DiscardUnknown(m)
 }
 
-func (m *BatchUpdateIntentsRequest) Reset()                    { *m = BatchUpdateIntentsRequest{} }
-func (m *BatchUpdateIntentsRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdateIntentsRequest) ProtoMessage()               {}
-func (*BatchUpdateIntentsRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{7} }
+var xxx_messageInfo_BatchUpdateIntentsRequest proto.InternalMessageInfo
+
+func (m *BatchUpdateIntentsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
 
 type isBatchUpdateIntentsRequest_IntentBatch interface {
 	isBatchUpdateIntentsRequest_IntentBatch()
 }
 
 type BatchUpdateIntentsRequest_IntentBatchUri struct {
-	IntentBatchUri string `protobuf:"bytes,2,opt,name=intent_batch_uri,json=intentBatchUri,oneof"`
+	IntentBatchUri string `protobuf:"bytes,2,opt,name=intent_batch_uri,json=intentBatchUri,proto3,oneof"`
 }
+
 type BatchUpdateIntentsRequest_IntentBatchInline struct {
-	IntentBatchInline *IntentBatch `protobuf:"bytes,3,opt,name=intent_batch_inline,json=intentBatchInline,oneof"`
+	IntentBatchInline *IntentBatch `protobuf:"bytes,3,opt,name=intent_batch_inline,json=intentBatchInline,proto3,oneof"`
 }
 
-func (*BatchUpdateIntentsRequest_IntentBatchUri) isBatchUpdateIntentsRequest_IntentBatch()    {}
+func (*BatchUpdateIntentsRequest_IntentBatchUri) isBatchUpdateIntentsRequest_IntentBatch() {}
+
 func (*BatchUpdateIntentsRequest_IntentBatchInline) isBatchUpdateIntentsRequest_IntentBatch() {}
 
 func (m *BatchUpdateIntentsRequest) GetIntentBatch() isBatchUpdateIntentsRequest_IntentBatch {
@@ -1869,13 +2994,6 @@ func (m *BatchUpdateIntentsRequest) GetIntentBatch() isBatchUpdateIntentsRequest
 	return nil
 }
 
-func (m *BatchUpdateIntentsRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
 func (m *BatchUpdateIntentsRequest) GetIntentBatchUri() string {
 	if x, ok := m.GetIntentBatch().(*BatchUpdateIntentsRequest_IntentBatchUri); ok {
 		return x.IntentBatchUri
@@ -1897,7 +3015,7 @@ func (m *BatchUpdateIntentsRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (m *BatchUpdateIntentsRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *BatchUpdateIntentsRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1966,12 +3084,12 @@ func _BatchUpdateIntentsRequest_OneofSizer(msg proto.Message) (n int) {
 	// intent_batch
 	switch x := m.IntentBatch.(type) {
 	case *BatchUpdateIntentsRequest_IntentBatchUri:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.IntentBatchUri)))
 		n += len(x.IntentBatchUri)
 	case *BatchUpdateIntentsRequest_IntentBatchInline:
 		s := proto.Size(x.IntentBatchInline)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1981,17 +3099,38 @@ func _BatchUpdateIntentsRequest_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-// The response message for
-// [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2beta1.Intents.BatchUpdateIntents].
+// The response message for [Intents.BatchUpdateIntents][google.cloud.dialogflow.v2beta1.Intents.BatchUpdateIntents].
 type BatchUpdateIntentsResponse struct {
 	// The collection of updated or created intents.
-	Intents []*Intent `protobuf:"bytes,1,rep,name=intents" json:"intents,omitempty"`
+	Intents              []*Intent `protobuf:"bytes,1,rep,name=intents,proto3" json:"intents,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *BatchUpdateIntentsResponse) Reset()                    { *m = BatchUpdateIntentsResponse{} }
-func (m *BatchUpdateIntentsResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdateIntentsResponse) ProtoMessage()               {}
-func (*BatchUpdateIntentsResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{8} }
+func (m *BatchUpdateIntentsResponse) Reset()         { *m = BatchUpdateIntentsResponse{} }
+func (m *BatchUpdateIntentsResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateIntentsResponse) ProtoMessage()    {}
+func (*BatchUpdateIntentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{8}
+}
+func (m *BatchUpdateIntentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateIntentsResponse.Unmarshal(m, b)
+}
+func (m *BatchUpdateIntentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateIntentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateIntentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateIntentsResponse.Merge(dst, src)
+}
+func (m *BatchUpdateIntentsResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateIntentsResponse.Size(m)
+}
+func (m *BatchUpdateIntentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateIntentsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchUpdateIntentsResponse proto.InternalMessageInfo
 
 func (m *BatchUpdateIntentsResponse) GetIntents() []*Intent {
 	if m != nil {
@@ -2000,21 +3139,42 @@ func (m *BatchUpdateIntentsResponse) GetIntents() []*Intent {
 	return nil
 }
 
-// The request message for
-// [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2beta1.Intents.BatchDeleteIntents].
+// The request message for [Intents.BatchDeleteIntents][google.cloud.dialogflow.v2beta1.Intents.BatchDeleteIntents].
 type BatchDeleteIntentsRequest struct {
 	// Required. The name of the agent to delete all entities types for. Format:
 	// `projects/<Project ID>/agent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The collection of intents to delete. Only intent `name` must be
 	// filled in.
-	Intents []*Intent `protobuf:"bytes,2,rep,name=intents" json:"intents,omitempty"`
+	Intents              []*Intent `protobuf:"bytes,2,rep,name=intents,proto3" json:"intents,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *BatchDeleteIntentsRequest) Reset()         { *m = BatchDeleteIntentsRequest{} }
+func (m *BatchDeleteIntentsRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchDeleteIntentsRequest) ProtoMessage()    {}
+func (*BatchDeleteIntentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{9}
+}
+func (m *BatchDeleteIntentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchDeleteIntentsRequest.Unmarshal(m, b)
+}
+func (m *BatchDeleteIntentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchDeleteIntentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchDeleteIntentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeleteIntentsRequest.Merge(dst, src)
+}
+func (m *BatchDeleteIntentsRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchDeleteIntentsRequest.Size(m)
+}
+func (m *BatchDeleteIntentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchDeleteIntentsRequest.DiscardUnknown(m)
 }
 
-func (m *BatchDeleteIntentsRequest) Reset()                    { *m = BatchDeleteIntentsRequest{} }
-func (m *BatchDeleteIntentsRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchDeleteIntentsRequest) ProtoMessage()               {}
-func (*BatchDeleteIntentsRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{9} }
+var xxx_messageInfo_BatchDeleteIntentsRequest proto.InternalMessageInfo
 
 func (m *BatchDeleteIntentsRequest) GetParent() string {
 	if m != nil {
@@ -2033,13 +3193,35 @@ func (m *BatchDeleteIntentsRequest) GetIntents() []*Intent {
 // This message is a wrapper around a collection of intents.
 type IntentBatch struct {
 	// A collection of intents.
-	Intents []*Intent `protobuf:"bytes,1,rep,name=intents" json:"intents,omitempty"`
+	Intents              []*Intent `protobuf:"bytes,1,rep,name=intents,proto3" json:"intents,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *IntentBatch) Reset()                    { *m = IntentBatch{} }
-func (m *IntentBatch) String() string            { return proto.CompactTextString(m) }
-func (*IntentBatch) ProtoMessage()               {}
-func (*IntentBatch) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{10} }
+func (m *IntentBatch) Reset()         { *m = IntentBatch{} }
+func (m *IntentBatch) String() string { return proto.CompactTextString(m) }
+func (*IntentBatch) ProtoMessage()    {}
+func (*IntentBatch) Descriptor() ([]byte, []int) {
+	return fileDescriptor_intent_ceca89a12cc28578, []int{10}
+}
+func (m *IntentBatch) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IntentBatch.Unmarshal(m, b)
+}
+func (m *IntentBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IntentBatch.Marshal(b, m, deterministic)
+}
+func (dst *IntentBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IntentBatch.Merge(dst, src)
+}
+func (m *IntentBatch) XXX_Size() int {
+	return xxx_messageInfo_IntentBatch.Size(m)
+}
+func (m *IntentBatch) XXX_DiscardUnknown() {
+	xxx_messageInfo_IntentBatch.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_IntentBatch proto.InternalMessageInfo
 
 func (m *IntentBatch) GetIntents() []*Intent {
 	if m != nil {
@@ -2072,6 +3254,9 @@ func init() {
 	proto.RegisterType((*Intent_Message_CarouselSelect)(nil), "google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect")
 	proto.RegisterType((*Intent_Message_CarouselSelect_Item)(nil), "google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item")
 	proto.RegisterType((*Intent_Message_SelectItemInfo)(nil), "google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo")
+	proto.RegisterType((*Intent_Message_TelephonyPlayAudio)(nil), "google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyPlayAudio")
+	proto.RegisterType((*Intent_Message_TelephonySynthesizeSpeech)(nil), "google.cloud.dialogflow.v2beta1.Intent.Message.TelephonySynthesizeSpeech")
+	proto.RegisterType((*Intent_Message_TelephonyTransferCall)(nil), "google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyTransferCall")
 	proto.RegisterType((*Intent_FollowupIntentInfo)(nil), "google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo")
 	proto.RegisterType((*ListIntentsRequest)(nil), "google.cloud.dialogflow.v2beta1.ListIntentsRequest")
 	proto.RegisterType((*ListIntentsResponse)(nil), "google.cloud.dialogflow.v2beta1.ListIntentsResponse")
@@ -2097,8 +3282,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Intents service
-
+// IntentsClient is the client API for Intents service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type IntentsClient interface {
 	// Returns the list of all intents in the specified agent.
 	ListIntents(ctx context.Context, in *ListIntentsRequest, opts ...grpc.CallOption) (*ListIntentsResponse, error)
@@ -2109,16 +3295,15 @@ type IntentsClient interface {
 	// Updates the specified intent.
 	UpdateIntent(ctx context.Context, in *UpdateIntentRequest, opts ...grpc.CallOption) (*Intent, error)
 	// Deletes the specified intent.
-	DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Updates/Creates multiple intents in the specified agent.
 	//
-	// Operation <response:
-	// [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse]>
-	BatchUpdateIntents(ctx context.Context, in *BatchUpdateIntentsRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	// Operation <response: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse]>
+	BatchUpdateIntents(ctx context.Context, in *BatchUpdateIntentsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes intents in the specified agent.
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty]>
-	BatchDeleteIntents(ctx context.Context, in *BatchDeleteIntentsRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	BatchDeleteIntents(ctx context.Context, in *BatchDeleteIntentsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type intentsClient struct {
@@ -2131,7 +3316,7 @@ func NewIntentsClient(cc *grpc.ClientConn) IntentsClient {
 
 func (c *intentsClient) ListIntents(ctx context.Context, in *ListIntentsRequest, opts ...grpc.CallOption) (*ListIntentsResponse, error) {
 	out := new(ListIntentsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/ListIntents", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/ListIntents", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2140,7 +3325,7 @@ func (c *intentsClient) ListIntents(ctx context.Context, in *ListIntentsRequest,
 
 func (c *intentsClient) GetIntent(ctx context.Context, in *GetIntentRequest, opts ...grpc.CallOption) (*Intent, error) {
 	out := new(Intent)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/GetIntent", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/GetIntent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2149,7 +3334,7 @@ func (c *intentsClient) GetIntent(ctx context.Context, in *GetIntentRequest, opt
 
 func (c *intentsClient) CreateIntent(ctx context.Context, in *CreateIntentRequest, opts ...grpc.CallOption) (*Intent, error) {
 	out := new(Intent)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/CreateIntent", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/CreateIntent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2158,42 +3343,41 @@ func (c *intentsClient) CreateIntent(ctx context.Context, in *CreateIntentReques
 
 func (c *intentsClient) UpdateIntent(ctx context.Context, in *UpdateIntentRequest, opts ...grpc.CallOption) (*Intent, error) {
 	out := new(Intent)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/UpdateIntent", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/UpdateIntent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *intentsClient) DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/DeleteIntent", in, out, c.cc, opts...)
+func (c *intentsClient) DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/DeleteIntent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *intentsClient) BatchUpdateIntents(ctx context.Context, in *BatchUpdateIntentsRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/BatchUpdateIntents", in, out, c.cc, opts...)
+func (c *intentsClient) BatchUpdateIntents(ctx context.Context, in *BatchUpdateIntentsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/BatchUpdateIntents", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *intentsClient) BatchDeleteIntents(ctx context.Context, in *BatchDeleteIntentsRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/BatchDeleteIntents", in, out, c.cc, opts...)
+func (c *intentsClient) BatchDeleteIntents(ctx context.Context, in *BatchDeleteIntentsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Intents/BatchDeleteIntents", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Intents service
-
+// IntentsServer is the server API for Intents service.
 type IntentsServer interface {
 	// Returns the list of all intents in the specified agent.
 	ListIntents(context.Context, *ListIntentsRequest) (*ListIntentsResponse, error)
@@ -2204,16 +3388,15 @@ type IntentsServer interface {
 	// Updates the specified intent.
 	UpdateIntent(context.Context, *UpdateIntentRequest) (*Intent, error)
 	// Deletes the specified intent.
-	DeleteIntent(context.Context, *DeleteIntentRequest) (*google_protobuf2.Empty, error)
+	DeleteIntent(context.Context, *DeleteIntentRequest) (*empty.Empty, error)
 	// Updates/Creates multiple intents in the specified agent.
 	//
-	// Operation <response:
-	// [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse]>
-	BatchUpdateIntents(context.Context, *BatchUpdateIntentsRequest) (*google_longrunning.Operation, error)
+	// Operation <response: [BatchUpdateIntentsResponse][google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse]>
+	BatchUpdateIntents(context.Context, *BatchUpdateIntentsRequest) (*longrunning.Operation, error)
 	// Deletes intents in the specified agent.
 	//
 	// Operation <response: [google.protobuf.Empty][google.protobuf.Empty]>
-	BatchDeleteIntents(context.Context, *BatchDeleteIntentsRequest) (*google_longrunning.Operation, error)
+	BatchDeleteIntents(context.Context, *BatchDeleteIntentsRequest) (*longrunning.Operation, error)
 }
 
 func RegisterIntentsServer(s *grpc.Server, srv IntentsServer) {
@@ -2383,170 +3566,186 @@ var _Intents_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dialogflow/v2beta1/intent.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dialogflow/v2beta1/intent.proto", fileDescriptor3) }
-
-var fileDescriptor3 = []byte{
-	// 2577 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0x47,
-	0xd9, 0xf7, 0xe8, 0xc3, 0x96, 0x1e, 0xc9, 0xb2, 0xdc, 0xde, 0x6c, 0xb4, 0x93, 0xa4, 0xe2, 0x28,
-	0x6f, 0xf2, 0x3a, 0x7e, 0x13, 0xe9, 0x8d, 0x92, 0x37, 0x1f, 0xbb, 0x6f, 0x12, 0x64, 0x5b, 0x5e,
-	0x0b, 0xcb, 0x96, 0x76, 0x2c, 0x6f, 0xd8, 0x14, 0x30, 0x35, 0x92, 0xda, 0xda, 0xc6, 0xa3, 0x99,
-	0xc9, 0x74, 0xcb, 0x1b, 0x05, 0x52, 0x45, 0x51, 0x05, 0x1c, 0xb8, 0x50, 0x70, 0xa2, 0xb8, 0xc1,
-	0x29, 0x14, 0x07, 0x2a, 0x37, 0xfe, 0x04, 0x0e, 0x9c, 0x38, 0xe6, 0x40, 0x51, 0x45, 0xf1, 0x27,
-	0x50, 0xdc, 0xa0, 0xfa, 0x63, 0xa4, 0x91, 0xa5, 0x45, 0x92, 0xbd, 0x70, 0xe1, 0x36, 0xfd, 0x74,
-	0xf7, 0xef, 0xf9, 0xea, 0xfe, 0x3d, 0xdd, 0x2d, 0xc1, 0xab, 0x5d, 0xd7, 0xed, 0xda, 0xb8, 0xd8,
-	0xb6, 0xdd, 0x7e, 0xa7, 0xd8, 0x21, 0x96, 0xed, 0x76, 0xcf, 0x6c, 0xf7, 0x51, 0xf1, 0xa2, 0xd4,
-	0xc2, 0xcc, 0x7a, 0xbd, 0x48, 0x1c, 0x86, 0x1d, 0x56, 0xf0, 0x7c, 0x97, 0xb9, 0xe8, 0x79, 0x39,
-	0xba, 0x20, 0x46, 0x17, 0x46, 0xa3, 0x0b, 0x6a, 0xb4, 0xfe, 0xac, 0x82, 0xb3, 0x3c, 0x52, 0xb4,
-	0x1c, 0xc7, 0x65, 0x16, 0x23, 0xae, 0x43, 0xe5, 0x74, 0xfd, 0xb5, 0x59, 0xca, 0xda, 0xae, 0xc3,
-	0xf0, 0x27, 0x4a, 0x9b, 0xfe, 0xa2, 0x1a, 0x6e, 0xbb, 0x4e, 0xd7, 0xef, 0x3b, 0x0e, 0x71, 0xba,
-	0x45, 0xd7, 0xc3, 0xfe, 0x18, 0xe6, 0x33, 0x6a, 0x90, 0x68, 0xb5, 0xfa, 0x67, 0x45, 0xdc, 0xf3,
-	0xd8, 0x40, 0x75, 0x6e, 0x5e, 0xee, 0x3c, 0x23, 0xd8, 0xee, 0x98, 0x3d, 0x8b, 0x9e, 0xab, 0x11,
-	0xcf, 0x5e, 0x1e, 0x41, 0x99, 0xdf, 0x6f, 0x2b, 0x0b, 0xf2, 0x7f, 0x7d, 0x05, 0x96, 0xab, 0x22,
-	0x00, 0x08, 0x41, 0xcc, 0xb1, 0x7a, 0x38, 0xa7, 0x6d, 0x6a, 0x5b, 0x49, 0x43, 0x7c, 0xa3, 0x17,
-	0x20, 0xdd, 0x21, 0xd4, 0xb3, 0xad, 0x81, 0x29, 0xfa, 0x22, 0xa2, 0x2f, 0xa5, 0x64, 0xc7, 0x7c,
-	0xc8, 0x03, 0x58, 0x7d, 0x84, 0x5b, 0x0f, 0x5d, 0xf7, 0xdc, 0xa4, 0xcc, 0x62, 0x38, 0xb7, 0xbc,
-	0xa9, 0x6d, 0x65, 0x4a, 0x6f, 0x16, 0x66, 0x44, 0xb2, 0x20, 0xd5, 0x16, 0x3e, 0x94, 0x93, 0x4f,
-	0xf8, 0x5c, 0x23, 0xfd, 0x28, 0xd4, 0x42, 0x3a, 0x24, 0x3c, 0x9f, 0xb8, 0x3e, 0x61, 0x83, 0x5c,
-	0x74, 0x53, 0xdb, 0x8a, 0x1b, 0xc3, 0x36, 0x7a, 0x1e, 0x52, 0x84, 0x9a, 0x67, 0x96, 0x6d, 0xb7,
-	0xac, 0xf6, 0x79, 0x2e, 0xb6, 0xa9, 0x6d, 0x25, 0x0c, 0x20, 0x74, 0x5f, 0x49, 0xd0, 0x73, 0x00,
-	0x3d, 0xdb, 0xc4, 0x8e, 0xd5, 0xb2, 0x71, 0x27, 0x17, 0x17, 0xfd, 0xc9, 0x9e, 0x5d, 0x91, 0x02,
-	0x54, 0x80, 0x0d, 0xe2, 0x78, 0x7d, 0x66, 0xaa, 0x8c, 0x08, 0xff, 0x68, 0x6e, 0x65, 0x33, 0xba,
-	0x95, 0x34, 0xd6, 0x45, 0xd7, 0xae, 0xec, 0xe1, 0x5e, 0x52, 0x74, 0x13, 0x96, 0xf1, 0x05, 0x76,
-	0x18, 0xcd, 0x25, 0xc4, 0x10, 0xd5, 0x42, 0x16, 0x64, 0x99, 0x6f, 0x11, 0x9e, 0x3a, 0xd3, 0x7b,
-	0xe8, 0x5b, 0x14, 0xd3, 0x5c, 0x72, 0x33, 0xba, 0x95, 0x2a, 0xbd, 0x35, 0x6f, 0x04, 0x9a, 0x6a,
-	0x7e, 0x43, 0x4c, 0x37, 0xd6, 0xd8, 0x58, 0x5b, 0xa8, 0xb6, 0xda, 0x7c, 0x45, 0xe4, 0x40, 0x84,
-	0x5f, 0xb5, 0xd0, 0x3d, 0x58, 0x73, 0xfb, 0x2c, 0xe4, 0x03, 0xcd, 0xa5, 0x84, 0xe6, 0xad, 0x99,
-	0x9a, 0x95, 0x6b, 0x46, 0x46, 0x02, 0xa8, 0x26, 0x45, 0x2f, 0x41, 0xc6, 0xc7, 0x14, 0x87, 0x10,
-	0xd3, 0x22, 0x70, 0xab, 0x42, 0x3a, 0x1c, 0x76, 0x0f, 0xc0, 0xb3, 0x7c, 0xab, 0x87, 0x19, 0xf6,
-	0x69, 0x6e, 0x55, 0x28, 0x7d, 0x7d, 0x5e, 0x77, 0x1b, 0xc1, 0x4c, 0x23, 0x04, 0x82, 0x0e, 0x21,
-	0xd1, 0xc3, 0x94, 0x5a, 0x5d, 0x4c, 0x73, 0x19, 0x01, 0x58, 0x9c, 0x17, 0xf0, 0x48, 0xce, 0x33,
-	0x86, 0x00, 0xe8, 0x02, 0xf4, 0x0e, 0x3e, 0xb3, 0xfa, 0x36, 0x33, 0x7d, 0x4c, 0x3d, 0xd7, 0xa1,
-	0xd8, 0xf4, 0x6c, 0x8b, 0x9d, 0xb9, 0x7e, 0x8f, 0xe6, 0xd6, 0x36, 0xa3, 0x5b, 0x99, 0xd2, 0x3b,
-	0x0b, 0xc2, 0x17, 0x1a, 0x0a, 0xc0, 0xc8, 0x29, 0x6c, 0x43, 0x41, 0x07, 0x1d, 0x14, 0xbd, 0x0b,
-	0xb7, 0x7c, 0xd7, 0x65, 0xe6, 0x99, 0x6b, 0xdb, 0xee, 0xa3, 0xbe, 0x67, 0x4a, 0x6e, 0x91, 0x7b,
-	0x27, 0x2b, 0x92, 0x77, 0x93, 0x0f, 0xd8, 0x57, 0xfd, 0x52, 0x83, 0xd8, 0x46, 0xef, 0xc1, 0x33,
-	0x9e, 0xe5, 0xf3, 0xc1, 0x53, 0x27, 0xaf, 0x8b, 0xc9, 0x39, 0x39, 0x64, 0xca, 0x74, 0x1b, 0x6e,
-	0x5c, 0x9e, 0x47, 0x9c, 0x33, 0x37, 0x87, 0x44, 0x28, 0x6f, 0xcf, 0xeb, 0xeb, 0x38, 0x72, 0xd5,
-	0x39, 0x73, 0x0d, 0x74, 0x36, 0x21, 0xd3, 0x7f, 0x19, 0x85, 0xcc, 0xf8, 0xaa, 0x9d, 0xca, 0x1e,
-	0x75, 0x88, 0xb1, 0x81, 0x27, 0x59, 0x23, 0x53, 0xba, 0x73, 0xb5, 0xfd, 0x50, 0x68, 0x0e, 0x3c,
-	0x6c, 0x08, 0x20, 0x74, 0x0f, 0xe2, 0x9e, 0xe5, 0x33, 0x9a, 0x8b, 0x0a, 0xb7, 0xae, 0x8a, 0xd8,
-	0xb0, 0x7c, 0x66, 0x48, 0x24, 0xb4, 0x0d, 0xeb, 0x8c, 0xf4, 0x30, 0x35, 0xad, 0x4e, 0x07, 0x77,
-	0xcc, 0xb6, 0xdb, 0x77, 0x98, 0x60, 0x93, 0xb8, 0xb1, 0x26, 0x3a, 0xca, 0x5c, 0xbe, 0xcb, 0xc5,
-	0x3a, 0x83, 0x18, 0x9f, 0xca, 0x7d, 0xe5, 0xfb, 0x20, 0xf0, 0x95, 0x7f, 0x73, 0x3e, 0xc2, 0x0e,
-	0x23, 0x6c, 0x60, 0x0e, 0x5d, 0x4e, 0x1a, 0x20, 0x45, 0xdc, 0x03, 0x74, 0x03, 0xe2, 0x96, 0x4d,
-	0x2c, 0x2a, 0x98, 0x2c, 0x69, 0xc8, 0x06, 0x27, 0xd8, 0x3e, 0xc5, 0xbe, 0xd9, 0xc1, 0x67, 0xc4,
-	0xc1, 0x1d, 0xc5, 0x63, 0x29, 0x2e, 0xdb, 0x93, 0xa2, 0xfc, 0xdb, 0x10, 0x53, 0x00, 0xd9, 0xe6,
-	0x83, 0x46, 0xc5, 0x3c, 0x3d, 0x3e, 0x69, 0x54, 0x76, 0xab, 0xfb, 0xd5, 0xca, 0x5e, 0x76, 0x09,
-	0xa5, 0x60, 0xa5, 0xf2, 0xb5, 0xf2, 0x51, 0xa3, 0x56, 0xc9, 0x6a, 0x28, 0x0d, 0x89, 0x66, 0xe5,
-	0xa8, 0x51, 0x2b, 0x37, 0x2b, 0xd9, 0x88, 0xfe, 0xc3, 0x08, 0x24, 0x87, 0x9b, 0xed, 0xaa, 0xf4,
-	0x7e, 0x03, 0xe2, 0x17, 0x96, 0xdd, 0xc7, 0x81, 0xd9, 0xa2, 0x81, 0x5e, 0x84, 0xd5, 0x60, 0x83,
-	0xc9, 0xde, 0x98, 0xe8, 0x4d, 0x2b, 0xe1, 0x7d, 0x31, 0xe8, 0x6d, 0xc8, 0x85, 0x42, 0x62, 0x8e,
-	0x69, 0x8a, 0x8b, 0xf1, 0x4f, 0x8d, 0xe2, 0xb3, 0x17, 0xd2, 0xf9, 0x2c, 0x24, 0x7b, 0x96, 0xd3,
-	0xb1, 0x98, 0xeb, 0x0f, 0x44, 0x39, 0xe1, 0xcc, 0x1d, 0x08, 0x50, 0x0e, 0x56, 0x3c, 0xdf, 0xed,
-	0x79, 0x2c, 0x60, 0xeb, 0xa0, 0x89, 0x9e, 0x86, 0x15, 0x42, 0x4d, 0x9b, 0x50, 0x96, 0x4b, 0x88,
-	0x59, 0xcb, 0x84, 0xd6, 0x08, 0x65, 0xfa, 0x4f, 0x74, 0x58, 0x51, 0xdb, 0x18, 0x7d, 0x35, 0x94,
-	0xbc, 0xd4, 0xfc, 0x65, 0x2a, 0x60, 0x81, 0x26, 0xfe, 0x84, 0x1d, 0x2c, 0xa9, 0xa4, 0x1f, 0x41,
-	0x9c, 0xf4, 0xac, 0xae, 0x0c, 0x5c, 0xaa, 0xf4, 0x7f, 0x8b, 0x82, 0x55, 0xf9, 0xe4, 0x83, 0x25,
-	0x43, 0xa2, 0xa0, 0x36, 0xac, 0x7e, 0xdc, 0x27, 0xed, 0x73, 0xd3, 0xc7, 0x9e, 0x4d, 0xb0, 0x5c,
-	0x2a, 0xa9, 0xd2, 0xff, 0x2f, 0x0a, 0x7b, 0x8f, 0x83, 0x18, 0x12, 0xe3, 0x60, 0xc9, 0x48, 0x7f,
-	0x1c, 0x6a, 0x73, 0xff, 0xdb, 0x96, 0x2f, 0x57, 0xda, 0x15, 0xfc, 0xdf, 0xb5, 0xfc, 0x0e, 0xf7,
-	0x9f, 0x63, 0xa0, 0x37, 0x60, 0xc5, 0xb3, 0x06, 0xb6, 0x6b, 0xc9, 0x02, 0x9b, 0x2a, 0x3d, 0x1d,
-	0xc0, 0x05, 0xa7, 0x8d, 0xc2, 0x89, 0x38, 0x6d, 0x1c, 0x2c, 0x19, 0xc1, 0x48, 0x64, 0x43, 0x96,
-	0x92, 0x9e, 0x67, 0xe3, 0x21, 0x37, 0xf3, 0x44, 0xf2, 0xd9, 0x1f, 0x2c, 0x6a, 0xcc, 0x89, 0xc0,
-	0x09, 0x78, 0x98, 0xfb, 0xba, 0x46, 0xc7, 0x45, 0xe8, 0x23, 0x80, 0x96, 0x45, 0x49, 0xdb, 0x14,
-	0x4e, 0x27, 0x84, 0x9e, 0x77, 0x17, 0xd5, 0xb3, 0xc3, 0x11, 0x94, 0xe7, 0xc9, 0x56, 0xd0, 0x40,
-	0x26, 0xa4, 0x68, 0xbf, 0xdb, 0xc5, 0x54, 0x1c, 0xd7, 0x72, 0x49, 0x01, 0x7e, 0x67, 0x61, 0x27,
-	0x46, 0x10, 0x07, 0x4b, 0x46, 0x18, 0x11, 0x51, 0xd8, 0xb0, 0x89, 0x73, 0x6e, 0xba, 0x7d, 0x66,
-	0x8e, 0xe4, 0xe2, 0x18, 0x90, 0x2a, 0x95, 0x17, 0x55, 0x54, 0x23, 0xce, 0x79, 0xbd, 0xcf, 0x46,
-	0xfa, 0x0e, 0x96, 0x8c, 0x75, 0xfb, 0xb2, 0x10, 0x7d, 0x03, 0x52, 0x7c, 0x0b, 0x99, 0x14, 0xdb,
-	0xb8, 0xcd, 0x72, 0x29, 0xa1, 0xec, 0xf6, 0xe2, 0xca, 0x28, 0x3b, 0x11, 0x08, 0x07, 0x4b, 0x06,
-	0xd8, 0xc3, 0x16, 0x22, 0xb0, 0xd6, 0xb6, 0x7c, 0xb7, 0x4f, 0xb1, 0x1d, 0xa8, 0x48, 0x0b, 0x15,
-	0xef, 0x5f, 0x61, 0x29, 0x0a, 0x98, 0xa1, 0x9a, 0x4c, 0x7b, 0x4c, 0x82, 0x9a, 0x90, 0x08, 0xaa,
-	0xbe, 0x3a, 0x95, 0x5e, 0xbd, 0xe8, 0x0f, 0x91, 0x74, 0x1d, 0x62, 0x9c, 0x04, 0x42, 0x55, 0x20,
-	0x1a, 0x54, 0x01, 0xfd, 0x04, 0xe2, 0x62, 0x4f, 0xa3, 0x67, 0x20, 0x29, 0xf6, 0xb4, 0xd9, 0xf7,
-	0x89, 0xa2, 0xdc, 0x84, 0x10, 0x9c, 0xfa, 0x04, 0xbd, 0x06, 0xc8, 0x6a, 0xb7, 0x31, 0xa5, 0xa4,
-	0x45, 0x6c, 0xc1, 0x8f, 0x1c, 0x47, 0x92, 0xef, 0xfa, 0x58, 0x0f, 0x57, 0xa4, 0x57, 0x21, 0x1d,
-	0xde, 0xd1, 0x9c, 0x92, 0x19, 0x61, 0x76, 0x40, 0xe5, 0xb2, 0xc1, 0x29, 0x79, 0x9c, 0x3c, 0x22,
-	0xc2, 0xae, 0xb1, 0xcd, 0xaf, 0xff, 0x45, 0x83, 0x98, 0x58, 0xba, 0xd3, 0x31, 0x74, 0x48, 0xd0,
-	0x7e, 0x4b, 0x76, 0x48, 0x73, 0x86, 0xed, 0x71, 0x8f, 0xa2, 0x97, 0x3c, 0x3a, 0x85, 0x95, 0x56,
-	0x9f, 0x31, 0xbe, 0x0b, 0x62, 0x8b, 0x95, 0xe6, 0x30, 0xaf, 0x14, 0x76, 0x04, 0x86, 0x11, 0x60,
-	0xe9, 0xef, 0xc0, 0xb2, 0x14, 0x4d, 0x2d, 0xb9, 0xfc, 0x7a, 0xe0, 0x52, 0x26, 0xce, 0xff, 0xca,
-	0xda, 0xa0, 0xad, 0xf7, 0x20, 0x33, 0x4e, 0x0e, 0xe8, 0xbf, 0x20, 0x23, 0xce, 0xf9, 0xcc, 0x35,
-	0xa9, 0x87, 0x71, 0xfb, 0xa1, 0xc2, 0x4a, 0x73, 0x69, 0xd3, 0x3d, 0x11, 0x32, 0xae, 0x87, 0xd2,
-	0x9e, 0xad, 0xf0, 0xc4, 0x77, 0xb8, 0x4a, 0x0a, 0x1b, 0xa2, 0x63, 0x55, 0x52, 0xa4, 0xe8, 0x3b,
-	0xb0, 0x76, 0x89, 0x8b, 0x10, 0x99, 0x42, 0x73, 0x9a, 0x88, 0xcd, 0xfb, 0xd7, 0xa3, 0xb9, 0x09,
-	0x8e, 0xd3, 0x7f, 0x17, 0x85, 0xe4, 0x90, 0xa2, 0xae, 0x90, 0xda, 0x97, 0x20, 0xc3, 0x57, 0xb6,
-	0xc5, 0x18, 0xee, 0x84, 0x5d, 0x5c, 0x1d, 0x4a, 0xc5, 0x82, 0x3f, 0x0c, 0xaa, 0x5d, 0xec, 0x1a,
-	0xd5, 0x2e, 0xa8, 0x75, 0x1f, 0x8d, 0x56, 0x4c, 0x5c, 0x44, 0xe5, 0x2b, 0x57, 0x26, 0xe5, 0x89,
-	0x65, 0xf3, 0x5b, 0x6d, 0xb8, 0x6e, 0xa6, 0x07, 0xe3, 0x02, 0xd6, 0x5c, 0x0f, 0x3b, 0x7c, 0x29,
-	0x9b, 0xea, 0x6a, 0x25, 0x2b, 0xf8, 0xf1, 0x75, 0x8d, 0x28, 0xd4, 0x3d, 0xec, 0x9c, 0xfa, 0xa4,
-	0x2c, 0x50, 0x8d, 0x55, 0x37, 0xdc, 0xd4, 0x5f, 0x80, 0xd5, 0xb1, 0x7e, 0x94, 0x85, 0xe8, 0x88,
-	0x20, 0xf8, 0xa7, 0x9e, 0x07, 0x08, 0x71, 0xf1, 0x54, 0xf3, 0xf5, 0x73, 0x48, 0x85, 0x8a, 0x06,
-	0xfa, 0xfa, 0x78, 0x19, 0xd2, 0x16, 0x3b, 0xf2, 0x4f, 0x96, 0xa1, 0xb1, 0x1a, 0xa4, 0x37, 0x60,
-	0x7d, 0xa2, 0x70, 0xa0, 0x57, 0x20, 0xdb, 0xe1, 0x9f, 0x8e, 0x78, 0xa9, 0x30, 0x43, 0x07, 0xcb,
-	0xb5, 0x90, 0x5c, 0x1c, 0xe6, 0x94, 0x8b, 0x91, 0x91, 0x8b, 0x5f, 0x46, 0x00, 0x46, 0xe5, 0xe1,
-	0x31, 0x29, 0x3a, 0x85, 0x38, 0x61, 0xb8, 0x27, 0x69, 0xec, 0x0a, 0x47, 0x83, 0x91, 0x82, 0x42,
-	0x95, 0xe1, 0x9e, 0x21, 0xd1, 0xf4, 0x3f, 0x6a, 0x10, 0xe3, 0x6d, 0x64, 0x40, 0x4c, 0x5c, 0x90,
-	0xb4, 0xab, 0xd5, 0x1e, 0x09, 0xcd, 0x91, 0xc4, 0x25, 0x49, 0x60, 0x8d, 0x3c, 0x89, 0x84, 0x3d,
-	0xd9, 0x84, 0x54, 0x07, 0xd3, 0xb6, 0x4f, 0x3c, 0xb1, 0xd0, 0x02, 0xf6, 0x18, 0x89, 0x9e, 0xe8,
-	0xc6, 0xd2, 0x7f, 0x1f, 0x81, 0xcc, 0x78, 0x65, 0x44, 0x0f, 0x82, 0x58, 0xca, 0xa5, 0xb1, 0x7b,
-	0xbd, 0x42, 0xfb, 0x1f, 0x16, 0xcf, 0xf7, 0x21, 0x33, 0x6e, 0x1c, 0x5f, 0xd1, 0xe7, 0x78, 0x10,
-	0x6c, 0xda, 0x73, 0x3c, 0x10, 0xe4, 0x3a, 0x70, 0x5c, 0x67, 0xd0, 0x0b, 0xca, 0xee, 0xb0, 0x9d,
-	0xff, 0x91, 0x06, 0x89, 0xe0, 0x14, 0x81, 0x72, 0x70, 0x83, 0xdf, 0xce, 0xf6, 0xeb, 0xc6, 0xd1,
-	0xa5, 0x7b, 0x5c, 0x1a, 0x12, 0xfb, 0xe5, 0xdd, 0xca, 0x4e, 0xbd, 0x7e, 0x98, 0xd5, 0x50, 0x12,
-	0xe2, 0x27, 0xb5, 0xf2, 0xee, 0x61, 0x36, 0x22, 0xef, 0x74, 0xb5, 0xca, 0x5d, 0xa3, 0x7c, 0x94,
-	0x8d, 0xa2, 0x15, 0x88, 0x1e, 0x56, 0x0f, 0xb3, 0x31, 0x31, 0xe2, 0xf0, 0x41, 0xa3, 0x92, 0x8d,
-	0xa3, 0x04, 0xc4, 0x6a, 0xd5, 0xe3, 0x4a, 0x76, 0x99, 0x0b, 0xef, 0x57, 0x77, 0x2a, 0x46, 0x76,
-	0x05, 0x3d, 0x05, 0xeb, 0xe5, 0xdd, 0x66, 0xb5, 0x7e, 0x7c, 0x62, 0xd6, 0x8f, 0xcd, 0xbb, 0xf5,
-	0xfa, 0xdd, 0x5a, 0x25, 0x9b, 0xd8, 0x49, 0xc2, 0x8a, 0x7a, 0x25, 0xd1, 0xbf, 0xaf, 0x01, 0x9a,
-	0xbc, 0xef, 0xa3, 0xff, 0x9d, 0x7c, 0x49, 0x08, 0x6d, 0xef, 0x4b, 0xaf, 0x01, 0xf3, 0x3c, 0x5d,
-	0x44, 0xfe, 0xf9, 0xd3, 0x45, 0x9e, 0x41, 0x3a, 0xfc, 0x06, 0x88, 0x9e, 0x83, 0x5b, 0x1f, 0x56,
-	0x76, 0x0e, 0xea, 0xf5, 0x43, 0xf3, 0xa4, 0x59, 0x6e, 0x5e, 0xbe, 0xf0, 0xde, 0x82, 0xa7, 0xc6,
-	0xbb, 0x2b, 0xc7, 0xe5, 0x9d, 0x5a, 0x65, 0x2f, 0xab, 0xa1, 0x6d, 0x78, 0x79, 0x6a, 0x97, 0xb9,
-	0x5f, 0x37, 0xcc, 0x93, 0x5a, 0xbd, 0x69, 0xee, 0x57, 0x6b, 0xb5, 0xea, 0xf1, 0xdd, 0x6c, 0x24,
-	0xff, 0xa5, 0x06, 0x88, 0x73, 0x84, 0x34, 0x84, 0x1a, 0xf8, 0xe3, 0x3e, 0xa6, 0x0c, 0xdd, 0x84,
-	0x65, 0x69, 0xa8, 0xf2, 0x57, 0xb5, 0xf8, 0xe9, 0xca, 0xb6, 0x9c, 0x6e, 0x9f, 0x1f, 0x80, 0xda,
-	0x6e, 0x27, 0xf0, 0x2a, 0x1d, 0x08, 0x77, 0xdd, 0x0e, 0x46, 0x35, 0x48, 0x29, 0xc7, 0x2f, 0x08,
-	0x7e, 0x24, 0x56, 0x66, 0xa6, 0xf4, 0x3f, 0x73, 0xae, 0xbe, 0xfb, 0x04, 0x3f, 0x32, 0x80, 0x0c,
-	0xbf, 0xf9, 0x81, 0xcb, 0xe3, 0xea, 0x28, 0xf9, 0x14, 0xab, 0x17, 0x89, 0x04, 0x17, 0x9c, 0x90,
-	0x4f, 0x79, 0x90, 0x40, 0x74, 0x32, 0xf7, 0x1c, 0x3b, 0xea, 0x36, 0x2d, 0x86, 0x37, 0xb9, 0x20,
-	0xff, 0x5d, 0x0d, 0x36, 0xc6, 0xbc, 0x53, 0x87, 0xa0, 0x32, 0xac, 0x48, 0x0d, 0x01, 0x17, 0xfc,
-	0xf7, 0x9c, 0xd6, 0x19, 0xc1, 0x3c, 0xf4, 0x32, 0xac, 0x39, 0xfc, 0x1c, 0x15, 0x52, 0x2f, 0x63,
-	0xb1, 0xca, 0xc5, 0x8d, 0xa1, 0x09, 0x3f, 0xd3, 0x20, 0x7b, 0x17, 0x2b, 0x0b, 0x82, 0xf0, 0x4e,
-	0x7b, 0x84, 0xf8, 0xf7, 0x87, 0x36, 0xff, 0x27, 0x0d, 0x36, 0x76, 0x7d, 0x6c, 0x31, 0x3c, 0x6e,
-	0xde, 0xe3, 0xb2, 0xff, 0x01, 0x2c, 0xcb, 0xd9, 0xea, 0x98, 0x30, 0x77, 0xd4, 0xd4, 0xb4, 0x49,
-	0x1f, 0xa3, 0xb3, 0x7d, 0x8c, 0x5d, 0xcf, 0xc7, 0x1f, 0x44, 0x60, 0xe3, 0xd4, 0xeb, 0x4c, 0xf8,
-	0x38, 0xf2, 0x45, 0x7b, 0x42, 0xbe, 0x4c, 0xcb, 0xd7, 0x1d, 0x48, 0xf5, 0x85, 0x72, 0xf1, 0x53,
-	0x84, 0x7a, 0xc8, 0xd0, 0x27, 0x5e, 0x07, 0xf6, 0x09, 0xb6, 0x3b, 0x47, 0x16, 0x3d, 0x37, 0x40,
-	0x0e, 0xe7, 0xdf, 0x4f, 0x38, 0x10, 0xaf, 0xc0, 0xc6, 0x1e, 0xb6, 0xf1, 0xe5, 0x38, 0x4c, 0x59,
-	0x8a, 0xf9, 0xbf, 0x47, 0xe0, 0xd6, 0x8e, 0xc5, 0xda, 0x0f, 0xc3, 0x81, 0x9b, 0xc9, 0x0d, 0xdb,
-	0x90, 0x55, 0xe6, 0xb6, 0xf8, 0x5c, 0x73, 0x78, 0xdc, 0xe1, 0x57, 0x52, 0xd9, 0x23, 0x41, 0x7d,
-	0x82, 0xbe, 0x09, 0x1b, 0x63, 0x63, 0x89, 0x63, 0x13, 0x07, 0xab, 0xf8, 0xbc, 0x3a, 0xa7, 0x8b,
-	0x02, 0x8d, 0x5f, 0xde, 0x43, 0xe0, 0x55, 0x01, 0x34, 0x99, 0x9c, 0xd8, 0xec, 0xe4, 0xc4, 0xaf,
-	0x93, 0x9c, 0xe5, 0x6b, 0x25, 0x67, 0x27, 0x03, 0xe9, 0x70, 0x3c, 0xf2, 0x26, 0xe8, 0xd3, 0x12,
-	0xf0, 0xc4, 0xe8, 0x2b, 0x7f, 0xa1, 0x32, 0x1c, 0x5e, 0x12, 0x33, 0x33, 0x1c, 0xd2, 0x1b, 0xb9,
-	0xa2, 0xde, 0x06, 0xa4, 0x42, 0xc9, 0x7b, 0x02, 0x9e, 0x6c, 0x7f, 0x00, 0x50, 0x0d, 0x57, 0x8b,
-	0xa7, 0xab, 0xc7, 0xcd, 0xca, 0x71, 0xd3, 0xbc, 0x5f, 0xad, 0x7c, 0x78, 0xa9, 0x66, 0xde, 0x80,
-	0x6c, 0xb8, 0x73, 0xff, 0xb4, 0x56, 0xcb, 0x6a, 0xa5, 0x2f, 0x92, 0xb0, 0xa2, 0x02, 0x80, 0x7e,
-	0xad, 0x41, 0x2a, 0x54, 0x30, 0xd0, 0x1b, 0x33, 0xcd, 0x99, 0x2c, 0x9e, 0xfa, 0x9b, 0x8b, 0x4d,
-	0x92, 0x49, 0xcd, 0x97, 0xbe, 0xf7, 0x87, 0x3f, 0xff, 0x34, 0xf2, 0x2a, 0xda, 0x1e, 0xfe, 0x48,
-	0xfa, 0x6d, 0x19, 0xf6, 0xf7, 0x3c, 0xdf, 0xfd, 0x16, 0x6e, 0x33, 0x5a, 0xdc, 0x2e, 0x5a, 0x5d,
-	0xec, 0xb0, 0xcf, 0x8a, 0x41, 0x11, 0xfa, 0xb9, 0x06, 0xc9, 0x61, 0x71, 0x41, 0xb3, 0x7f, 0x7a,
-	0xba, 0x5c, 0x88, 0xf4, 0x79, 0xc3, 0x3d, 0xcd, 0x3a, 0x4e, 0x15, 0x13, 0xb6, 0x05, 0xa6, 0x15,
-	0xb7, 0x3f, 0x43, 0x9f, 0x6b, 0x90, 0x0e, 0x97, 0x17, 0x34, 0x3b, 0x30, 0x53, 0xaa, 0xd1, 0xfc,
-	0x36, 0xde, 0x16, 0x36, 0xbe, 0x99, 0x5f, 0x20, 0x82, 0xb7, 0x03, 0x36, 0xff, 0x8d, 0x06, 0xe9,
-	0xf0, 0x66, 0x9b, 0xc3, 0xd6, 0x29, 0x55, 0x65, 0x7e, 0x5b, 0xcb, 0xc2, 0xd6, 0x3b, 0xa5, 0xd7,
-	0x47, 0xb6, 0xaa, 0x1f, 0xe0, 0x67, 0x85, 0x75, 0x68, 0xf2, 0x8f, 0x35, 0x48, 0x87, 0xb7, 0xef,
-	0x1c, 0x26, 0x4f, 0x29, 0x00, 0xfa, 0xcd, 0x09, 0xc2, 0xab, 0xf4, 0x3c, 0x36, 0x08, 0x32, 0xbe,
-	0xbd, 0x48, 0xc6, 0xbf, 0xd0, 0x00, 0x4d, 0xf2, 0x16, 0x9a, 0x7d, 0x09, 0x7f, 0x6c, 0xb5, 0xd1,
-	0x9f, 0x0b, 0xe6, 0x86, 0xfe, 0x1c, 0x50, 0xa8, 0x07, 0x7f, 0x0e, 0x08, 0xe2, 0x98, 0x7f, 0x6b,
-	0x81, 0x9c, 0xb7, 0x46, 0xca, 0x6e, 0x6b, 0xdb, 0x23, 0xa3, 0xc7, 0xb8, 0x70, 0x5e, 0xa3, 0xa7,
-	0x11, 0xe8, 0xbf, 0xcc, 0x68, 0xa9, 0xec, 0xb6, 0xb6, 0xbd, 0xf3, 0xb9, 0x06, 0x2f, 0xb6, 0xdd,
-	0xde, 0x2c, 0x1b, 0x77, 0x14, 0xdb, 0x36, 0x78, 0x6e, 0x1b, 0xda, 0x47, 0x55, 0x35, 0xbe, 0xeb,
-	0xf2, 0x4a, 0x58, 0x70, 0xfd, 0x6e, 0xb1, 0x8b, 0x1d, 0x91, 0xf9, 0xa2, 0xec, 0xb2, 0x3c, 0x42,
-	0x1f, 0xfb, 0xbf, 0x8d, 0x3b, 0x23, 0xd1, 0xdf, 0x34, 0xed, 0x17, 0x91, 0xc8, 0xde, 0xfe, 0xaf,
-	0x22, 0xcf, 0xdf, 0x95, 0x98, 0xbb, 0xc2, 0x86, 0xbd, 0x91, 0x0d, 0xf7, 0xe5, 0xa4, 0xd6, 0xb2,
-	0xc0, 0x7f, 0xe3, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x83, 0x8c, 0xb5, 0x01, 0x83, 0x22, 0x00,
-	0x00,
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/intent.proto", fileDescriptor_intent_ceca89a12cc28578)
+}
+
+var fileDescriptor_intent_ceca89a12cc28578 = []byte{
+	// 2808 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcf, 0x73, 0x23, 0x47,
+	0xf5, 0xf7, 0xe8, 0x87, 0x2d, 0x3d, 0xc9, 0xb2, 0xdc, 0xf6, 0xee, 0xce, 0xce, 0x26, 0xdf, 0x38,
+	0xca, 0x37, 0x89, 0x63, 0x12, 0x89, 0x75, 0x42, 0x7e, 0x78, 0x49, 0x82, 0x64, 0xcb, 0x2b, 0x61,
+	0xd9, 0xd2, 0x8e, 0xe4, 0x0d, 0x9b, 0x02, 0xa6, 0x46, 0x52, 0x5b, 0x3b, 0x78, 0x34, 0x33, 0x3b,
+	0xdd, 0xf2, 0x46, 0x81, 0x14, 0x14, 0x55, 0xc0, 0x81, 0x0b, 0x55, 0x9c, 0xf8, 0x71, 0x82, 0x53,
+	0x28, 0x0e, 0x54, 0x6e, 0xfc, 0x09, 0x1c, 0x38, 0x71, 0xcc, 0x81, 0xa2, 0x8a, 0xe2, 0xc0, 0x5f,
+	0xc0, 0x0d, 0xaa, 0x7b, 0x7a, 0xa4, 0x91, 0xa5, 0x45, 0x3f, 0xbc, 0x70, 0xe1, 0x36, 0xfd, 0xfa,
+	0xf5, 0xe7, 0xfd, 0xea, 0x7e, 0xef, 0x75, 0x4b, 0xf0, 0x6a, 0xc7, 0xb6, 0x3b, 0x26, 0xce, 0xb5,
+	0x4c, 0xbb, 0xd7, 0xce, 0xb5, 0x0d, 0xdd, 0xb4, 0x3b, 0x67, 0xa6, 0xfd, 0x38, 0x77, 0xb1, 0xdb,
+	0xc4, 0x54, 0xbf, 0x9d, 0x33, 0x2c, 0x8a, 0x2d, 0x9a, 0x75, 0x5c, 0x9b, 0xda, 0xe8, 0x39, 0x8f,
+	0x3b, 0xcb, 0xb9, 0xb3, 0x43, 0xee, 0xac, 0xe0, 0x56, 0x9e, 0x11, 0x70, 0xba, 0x63, 0xe4, 0x74,
+	0xcb, 0xb2, 0xa9, 0x4e, 0x0d, 0xdb, 0x22, 0xde, 0x72, 0xe5, 0xb5, 0x69, 0xc2, 0x5a, 0xb6, 0x45,
+	0xf1, 0x47, 0x42, 0x9a, 0xf2, 0x82, 0x60, 0x37, 0x6d, 0xab, 0xe3, 0xf6, 0x2c, 0xcb, 0xb0, 0x3a,
+	0x39, 0xdb, 0xc1, 0xee, 0x08, 0xe6, 0x2d, 0xc1, 0xc4, 0x47, 0xcd, 0xde, 0x59, 0x0e, 0x77, 0x1d,
+	0xda, 0x17, 0x93, 0x5b, 0x97, 0x27, 0xcf, 0x0c, 0x6c, 0xb6, 0xb5, 0xae, 0x4e, 0xce, 0x05, 0xc7,
+	0x33, 0x97, 0x39, 0x08, 0x75, 0x7b, 0x2d, 0xa1, 0x41, 0xe6, 0x97, 0x39, 0x58, 0x2e, 0x73, 0x07,
+	0x20, 0x04, 0x11, 0x4b, 0xef, 0x62, 0x59, 0xda, 0x92, 0xb6, 0xe3, 0x2a, 0xff, 0x46, 0xcf, 0x43,
+	0xb2, 0x6d, 0x10, 0xc7, 0xd4, 0xfb, 0x1a, 0x9f, 0x0b, 0xf1, 0xb9, 0x84, 0xa0, 0x9d, 0x30, 0x96,
+	0x07, 0xb0, 0xfa, 0x18, 0x37, 0x1f, 0xda, 0xf6, 0xb9, 0x46, 0xa8, 0x4e, 0xb1, 0xbc, 0xbc, 0x25,
+	0x6d, 0xa7, 0x76, 0xdf, 0xc8, 0x4e, 0xf1, 0x64, 0xd6, 0x13, 0x9b, 0xfd, 0xc0, 0x5b, 0x5c, 0x67,
+	0x6b, 0xd5, 0xe4, 0xe3, 0xc0, 0x08, 0x29, 0x10, 0x73, 0x5c, 0xc3, 0x76, 0x0d, 0xda, 0x97, 0xc3,
+	0x5b, 0xd2, 0x76, 0x54, 0x1d, 0x8c, 0xd1, 0x73, 0x90, 0x30, 0x88, 0x76, 0xa6, 0x9b, 0x66, 0x53,
+	0x6f, 0x9d, 0xcb, 0x91, 0x2d, 0x69, 0x3b, 0xa6, 0x82, 0x41, 0x0e, 0x05, 0x05, 0x3d, 0x0f, 0xd0,
+	0x35, 0x35, 0x6c, 0xe9, 0x4d, 0x13, 0xb7, 0xe5, 0x28, 0x9b, 0x2f, 0x84, 0x64, 0x49, 0x8d, 0x77,
+	0xcd, 0xa2, 0x47, 0x64, 0x18, 0x5d, 0x53, 0x6b, 0x1b, 0xc4, 0xe3, 0xd9, 0xf0, 0x30, 0xba, 0xe6,
+	0x81, 0xa0, 0xa0, 0x97, 0x61, 0x0d, 0x5b, 0x6d, 0x8d, 0xed, 0x10, 0x57, 0x6f, 0xb1, 0xa0, 0xc8,
+	0xd7, 0x38, 0x53, 0x0a, 0x5b, 0xed, 0xf2, 0x90, 0x8a, 0xb2, 0xb0, 0x61, 0x58, 0x4e, 0x8f, 0x6a,
+	0x22, 0xbe, 0xdc, 0x5b, 0x44, 0x5e, 0xd9, 0x0a, 0x6f, 0xc7, 0xd5, 0x75, 0x3e, 0xb5, 0xef, 0xcd,
+	0x30, 0x9f, 0x11, 0x74, 0x1d, 0x96, 0xf1, 0x05, 0xb6, 0x28, 0x91, 0x63, 0x9c, 0x45, 0x8c, 0x90,
+	0x0e, 0x69, 0xea, 0xea, 0x06, 0xdb, 0x08, 0x9a, 0xf3, 0xd0, 0xd5, 0x09, 0x26, 0x72, 0x7c, 0x2b,
+	0xbc, 0x9d, 0xd8, 0x7d, 0x73, 0x56, 0x7f, 0x36, 0xc4, 0xfa, 0x1a, 0x5f, 0xae, 0xae, 0xd1, 0x91,
+	0x31, 0x17, 0x2d, 0x4c, 0x01, 0x1e, 0x4c, 0x31, 0x42, 0xf7, 0x60, 0xcd, 0xee, 0xd1, 0x80, 0x0d,
+	0x44, 0x4e, 0x70, 0xc9, 0xdb, 0x53, 0x25, 0x0b, 0xd3, 0xd4, 0x94, 0x07, 0x20, 0x86, 0x04, 0xbd,
+	0x08, 0x29, 0x17, 0x13, 0x1c, 0x40, 0x4c, 0x72, 0xef, 0xad, 0x72, 0xea, 0x80, 0xed, 0x1e, 0x80,
+	0xa3, 0xbb, 0x7a, 0x17, 0x53, 0xec, 0x12, 0x79, 0x95, 0x0b, 0xbd, 0x3d, 0xab, 0xb9, 0x35, 0x7f,
+	0xa5, 0x1a, 0x00, 0x41, 0x47, 0x10, 0xeb, 0x62, 0x42, 0xf4, 0x0e, 0x26, 0x72, 0x8a, 0x03, 0xe6,
+	0x66, 0x05, 0x3c, 0xf6, 0xd6, 0xa9, 0x03, 0x00, 0x74, 0x01, 0x4a, 0x1b, 0x9f, 0xe9, 0x3d, 0x93,
+	0x6a, 0x2e, 0x26, 0x8e, 0x6d, 0x11, 0xac, 0x39, 0xa6, 0x4e, 0xcf, 0x6c, 0xb7, 0x4b, 0xe4, 0xb5,
+	0xad, 0xf0, 0x76, 0x6a, 0xf7, 0xed, 0x39, 0xe1, 0xb3, 0x35, 0x01, 0xa0, 0xca, 0x02, 0x5b, 0x15,
+	0xd0, 0xfe, 0x04, 0x41, 0xef, 0xc0, 0x4d, 0xd7, 0xb6, 0xa9, 0x76, 0x66, 0x9b, 0xa6, 0xfd, 0xb8,
+	0xe7, 0x68, 0x5e, 0xa6, 0xf2, 0x4e, 0x62, 0x9a, 0x07, 0xef, 0x3a, 0x63, 0x38, 0x14, 0xf3, 0x9e,
+	0x04, 0x7e, 0x28, 0xdf, 0x85, 0x5b, 0x8e, 0xee, 0x32, 0xe6, 0x89, 0x8b, 0xd7, 0xf9, 0x62, 0xd9,
+	0x63, 0x99, 0xb0, 0xdc, 0x84, 0xcd, 0xcb, 0xeb, 0x0c, 0xeb, 0xcc, 0x96, 0x11, 0x77, 0xe5, 0xde,
+	0xac, 0xb6, 0x8e, 0x22, 0x97, 0xad, 0x33, 0x5b, 0x45, 0x67, 0x63, 0x34, 0xe5, 0xd7, 0x61, 0x48,
+	0x8d, 0xee, 0xda, 0x89, 0xb9, 0xa8, 0x0a, 0x11, 0xda, 0x77, 0xbc, 0x1c, 0x94, 0xda, 0xbd, 0xb3,
+	0xd8, 0x79, 0xc8, 0x36, 0xfa, 0x0e, 0x56, 0x39, 0x10, 0xba, 0x07, 0x51, 0x47, 0x77, 0x29, 0x91,
+	0xc3, 0xdc, 0xac, 0x45, 0x11, 0x6b, 0xba, 0x4b, 0x55, 0x0f, 0x09, 0xed, 0xc0, 0x3a, 0x35, 0xba,
+	0x98, 0x68, 0x7a, 0xbb, 0x8d, 0xdb, 0x5a, 0xcb, 0xee, 0x59, 0x94, 0xe7, 0xa6, 0xa8, 0xba, 0xc6,
+	0x27, 0xf2, 0x8c, 0xbe, 0xcf, 0xc8, 0x0a, 0x85, 0x08, 0x5b, 0xca, 0x6c, 0x65, 0xe7, 0xc0, 0xb7,
+	0x95, 0x7d, 0xb3, 0xcc, 0x84, 0x2d, 0x6a, 0xd0, 0xbe, 0x36, 0x30, 0x39, 0xae, 0x82, 0x47, 0x62,
+	0x16, 0xa0, 0x4d, 0x88, 0xea, 0xa6, 0xa1, 0x13, 0x9e, 0x17, 0xe3, 0xaa, 0x37, 0x60, 0xe9, 0xba,
+	0x47, 0xb0, 0xab, 0xb5, 0xf1, 0x99, 0x61, 0xe1, 0xb6, 0xc8, 0x8a, 0x09, 0x46, 0x3b, 0xf0, 0x48,
+	0x99, 0xb7, 0x20, 0x22, 0x00, 0xd2, 0x8d, 0x07, 0xb5, 0xa2, 0x76, 0x7a, 0x52, 0xaf, 0x15, 0xf7,
+	0xcb, 0x87, 0xe5, 0xe2, 0x41, 0x7a, 0x09, 0x25, 0x60, 0xa5, 0xf8, 0xb5, 0xfc, 0x71, 0xad, 0x52,
+	0x4c, 0x4b, 0x28, 0x09, 0xb1, 0x46, 0xf1, 0xb8, 0x56, 0xc9, 0x37, 0x8a, 0xe9, 0x90, 0xf2, 0xa3,
+	0x10, 0xc4, 0x07, 0x87, 0x6d, 0xd1, 0x62, 0xb1, 0x09, 0xd1, 0x0b, 0xdd, 0xec, 0x61, 0x5f, 0x6d,
+	0x3e, 0x40, 0x2f, 0xc0, 0xaa, 0x7f, 0xc0, 0xbc, 0xd9, 0x08, 0x9f, 0x4d, 0x0a, 0xe2, 0x7d, 0xce,
+	0xf4, 0x16, 0xc8, 0x01, 0x97, 0x68, 0x23, 0x92, 0xa2, 0x9c, 0xff, 0xda, 0xd0, 0x3f, 0x07, 0x01,
+	0x99, 0xcf, 0x40, 0xbc, 0xab, 0x5b, 0x6d, 0x9d, 0xda, 0x6e, 0x9f, 0x17, 0xa7, 0x98, 0x3a, 0x24,
+	0x20, 0x19, 0x56, 0x1c, 0xd7, 0xee, 0x3a, 0xd4, 0xcf, 0xd6, 0xfe, 0x10, 0xdd, 0x80, 0x15, 0x83,
+	0x68, 0xa6, 0x41, 0xa8, 0x1c, 0xe3, 0xab, 0x96, 0x0d, 0x52, 0x31, 0x08, 0x55, 0xfe, 0xfe, 0x7f,
+	0xb0, 0x22, 0x8e, 0x31, 0xfa, 0x6a, 0x20, 0x78, 0x89, 0xd9, 0x8b, 0x9e, 0x9f, 0x05, 0x1a, 0xf8,
+	0x23, 0x5a, 0x5a, 0x12, 0x41, 0x3f, 0x86, 0xa8, 0xd1, 0xd5, 0x3b, 0x9e, 0xe3, 0x12, 0xbb, 0x5f,
+	0x9a, 0x17, 0xac, 0xcc, 0x16, 0x97, 0x96, 0x54, 0x0f, 0x05, 0xb5, 0x60, 0xf5, 0x51, 0xcf, 0x68,
+	0x9d, 0x6b, 0x2e, 0x76, 0x4c, 0x03, 0x7b, 0x5b, 0x25, 0xb1, 0xfb, 0xe5, 0x79, 0x61, 0xef, 0x31,
+	0x10, 0xd5, 0xc3, 0x28, 0x2d, 0xa9, 0xc9, 0x47, 0x81, 0x31, 0xb3, 0xbf, 0xa5, 0xbb, 0xde, 0x4e,
+	0x5b, 0xc0, 0xfe, 0x7d, 0xdd, 0x6d, 0x33, 0xfb, 0x19, 0x06, 0x7a, 0x1d, 0x56, 0x1c, 0xbd, 0x6f,
+	0xda, 0xba, 0x57, 0xae, 0x13, 0xbb, 0x37, 0x7c, 0x38, 0xbf, 0x77, 0xc9, 0xd6, 0x79, 0xef, 0x52,
+	0x5a, 0x52, 0x7d, 0x4e, 0x64, 0x42, 0x9a, 0x18, 0x5d, 0xc7, 0xc4, 0x83, 0xdc, 0xcc, 0x02, 0xc9,
+	0x56, 0xbf, 0x3f, 0xaf, 0x32, 0x75, 0x8e, 0xe3, 0xe7, 0x61, 0x66, 0xeb, 0x1a, 0x19, 0x25, 0xa1,
+	0x0f, 0x01, 0x9a, 0x3a, 0x31, 0x5a, 0x1a, 0x37, 0x3a, 0xc6, 0xe5, 0xbc, 0x33, 0xaf, 0x9c, 0x02,
+	0x43, 0x10, 0x96, 0xc7, 0x9b, 0xfe, 0x00, 0x69, 0x90, 0x20, 0xbd, 0x4e, 0x07, 0x13, 0xde, 0xfc,
+	0xc9, 0x71, 0x0e, 0x7e, 0x67, 0x6e, 0x23, 0x86, 0x10, 0xa5, 0x25, 0x35, 0x88, 0x88, 0x08, 0x6c,
+	0x98, 0x86, 0x75, 0xae, 0xd9, 0x3d, 0xaa, 0x0d, 0xe9, 0xbc, 0x0d, 0x48, 0xec, 0xe6, 0xe7, 0x15,
+	0x54, 0x31, 0xac, 0xf3, 0x6a, 0x8f, 0x0e, 0xe5, 0x95, 0x96, 0xd4, 0x75, 0xf3, 0x32, 0x11, 0x7d,
+	0x03, 0x12, 0xec, 0x08, 0x69, 0x04, 0x9b, 0xb8, 0x45, 0xe5, 0x04, 0x17, 0xb6, 0x37, 0xbf, 0x30,
+	0x42, 0xeb, 0x1c, 0xa1, 0xb4, 0xa4, 0x82, 0x39, 0x18, 0x21, 0x03, 0xd6, 0x5a, 0xba, 0x6b, 0xf7,
+	0x08, 0x36, 0x7d, 0x11, 0x49, 0x2e, 0xe2, 0xbd, 0x05, 0xb6, 0x22, 0x87, 0x19, 0x88, 0x49, 0xb5,
+	0x46, 0x28, 0xe8, 0x02, 0x36, 0x29, 0x36, 0xb1, 0xf3, 0xd0, 0xb6, 0xfa, 0x1a, 0xcf, 0x3d, 0x7a,
+	0xaf, 0x6d, 0xd8, 0xf2, 0x2a, 0x97, 0x57, 0x98, 0xff, 0xe8, 0x0b, 0xac, 0x9a, 0xa9, 0xf7, 0xf3,
+	0x0c, 0xa9, 0xb4, 0xa4, 0x22, 0x3a, 0x46, 0x45, 0x3f, 0x96, 0xe0, 0xd6, 0x50, 0x30, 0xe9, 0x5b,
+	0xf4, 0x21, 0x26, 0xc6, 0xc7, 0x58, 0x23, 0x0e, 0xc6, 0xad, 0x87, 0x72, 0x8a, 0xcb, 0x2f, 0x2f,
+	0x2c, 0xbf, 0x3e, 0x40, 0xac, 0x73, 0xc0, 0xd2, 0x92, 0x7a, 0x93, 0x3e, 0x69, 0x12, 0x7d, 0x17,
+	0x6e, 0x0c, 0x95, 0xa1, 0xae, 0x6e, 0x91, 0x33, 0xec, 0x6a, 0x2d, 0xdd, 0x34, 0xe5, 0x35, 0xae,
+	0x48, 0x71, 0x61, 0x45, 0x1a, 0x02, 0x6d, 0x5f, 0x37, 0xcd, 0xd2, 0x92, 0x7a, 0x8d, 0x4e, 0x9a,
+	0x40, 0x0d, 0x88, 0xf9, 0xcd, 0x97, 0xb8, 0x6a, 0x2c, 0xde, 0x7b, 0x0d, 0x90, 0x14, 0x05, 0x22,
+	0x2c, 0x17, 0x07, 0x8a, 0x71, 0xd8, 0x2f, 0xc6, 0x4a, 0x1d, 0xa2, 0x3c, 0xb5, 0xa2, 0x5b, 0x10,
+	0xe7, 0xa9, 0x55, 0xeb, 0xb9, 0x86, 0xa8, 0x7c, 0x31, 0x4e, 0x38, 0x75, 0x0d, 0xf4, 0x1a, 0x20,
+	0xbd, 0xd5, 0xc2, 0x84, 0x18, 0x4d, 0xc3, 0xe4, 0x65, 0x8a, 0xe1, 0x78, 0x35, 0x70, 0x7d, 0x64,
+	0x86, 0x09, 0x52, 0xca, 0x90, 0x0c, 0x26, 0x56, 0x56, 0x19, 0xa9, 0x41, 0x4d, 0xbf, 0xa2, 0x7a,
+	0x03, 0x56, 0x19, 0x47, 0x73, 0x78, 0x88, 0xeb, 0x35, 0x92, 0x83, 0x95, 0xbf, 0x49, 0x10, 0xe1,
+	0x19, 0x64, 0x32, 0x86, 0x02, 0x31, 0xd2, 0x6b, 0x7a, 0x13, 0x9e, 0x3a, 0x83, 0xf1, 0xa8, 0x45,
+	0xe1, 0x4b, 0x16, 0x9d, 0xc2, 0x4a, 0xb3, 0x47, 0x29, 0x4b, 0x46, 0x91, 0xf9, 0x3a, 0xa4, 0x60,
+	0x7a, 0xcf, 0x16, 0x38, 0x86, 0xea, 0x63, 0x29, 0x6f, 0xc3, 0xb2, 0x47, 0x9a, 0xd8, 0xf9, 0xb0,
+	0x3b, 0x9f, 0x4d, 0x28, 0xbf, 0xd4, 0x09, 0x6d, 0xfd, 0xb1, 0xd2, 0x85, 0xd4, 0x68, 0x8e, 0x46,
+	0xff, 0x0f, 0x29, 0x7e, 0xdd, 0xa2, 0xb6, 0x7f, 0x1a, 0x3c, 0xac, 0x24, 0xa3, 0x36, 0x6c, 0xb1,
+	0x67, 0x11, 0x44, 0x08, 0xe9, 0x9a, 0x02, 0x8f, 0x7f, 0x07, 0x9b, 0x15, 0xae, 0x43, 0x78, 0xa4,
+	0x59, 0xe1, 0x21, 0xfa, 0x0e, 0xac, 0x5d, 0x2a, 0x09, 0xc8, 0x98, 0x50, 0x6d, 0x24, 0xee, 0x9b,
+	0xf7, 0xae, 0x56, 0x6d, 0xc6, 0x4a, 0x8d, 0xf2, 0x87, 0x30, 0xc4, 0x07, 0x95, 0x62, 0x81, 0xd0,
+	0xbe, 0x08, 0x29, 0xb6, 0xb3, 0x75, 0x4a, 0x71, 0x3b, 0x68, 0xe2, 0xea, 0x80, 0xca, 0x37, 0xfc,
+	0x91, 0xdf, 0x74, 0x44, 0xae, 0xd0, 0x74, 0xf8, 0x2d, 0xc7, 0x87, 0xc3, 0x1d, 0x13, 0xe5, 0x5e,
+	0xf9, 0xca, 0xc2, 0xb5, 0x71, 0x6c, 0xdb, 0xfc, 0x5e, 0x1a, 0xec, 0x9b, 0xc9, 0xce, 0xb8, 0x80,
+	0x35, 0xdb, 0xc1, 0x16, 0xdb, 0xca, 0x9a, 0xb8, 0xe1, 0x7a, 0x8d, 0xd4, 0xc9, 0x55, 0x95, 0xc8,
+	0x56, 0x1d, 0x6c, 0x9d, 0xba, 0x46, 0x9e, 0xa3, 0xaa, 0xab, 0x76, 0x70, 0xa8, 0x3c, 0x0f, 0xab,
+	0x23, 0xf3, 0x28, 0x0d, 0xe1, 0x61, 0x82, 0x60, 0x9f, 0x4a, 0x06, 0x20, 0x50, 0x12, 0x27, 0xaa,
+	0xaf, 0x9c, 0x43, 0x22, 0x50, 0xbb, 0xd1, 0xd7, 0x47, 0xbb, 0x01, 0x69, 0xbe, 0x9b, 0xd7, 0x78,
+	0x37, 0x30, 0xd2, 0x0a, 0x28, 0x35, 0x58, 0x1f, 0xab, 0xdf, 0xe8, 0x15, 0x48, 0xb7, 0xd9, 0xa7,
+	0xc5, 0x9f, 0x9f, 0xb4, 0x40, 0x7f, 0xbf, 0x16, 0xa0, 0xf3, 0x9e, 0x5a, 0x98, 0x18, 0x1a, 0x9a,
+	0xf8, 0x79, 0x08, 0x60, 0x58, 0xa5, 0x9f, 0x10, 0xa2, 0x53, 0x88, 0x1a, 0x14, 0x77, 0xbd, 0x34,
+	0xb6, 0x40, 0x87, 0x36, 0x14, 0x90, 0x2d, 0x53, 0xdc, 0x55, 0x3d, 0x34, 0xe5, 0xcf, 0x12, 0x44,
+	0xd8, 0x18, 0xa9, 0x10, 0xe1, 0xf7, 0x54, 0x69, 0xb1, 0x16, 0xc0, 0x83, 0x66, 0x48, 0xfc, 0xae,
+	0xca, 0xb1, 0x86, 0x96, 0x84, 0x82, 0x96, 0x6c, 0x41, 0xa2, 0x8d, 0x49, 0xcb, 0x35, 0x1c, 0xbe,
+	0xd1, 0xfc, 0xec, 0x31, 0x24, 0x3d, 0xd5, 0x83, 0xa5, 0xfc, 0x31, 0x04, 0xa9, 0xd1, 0x06, 0x05,
+	0x3d, 0xf0, 0x7d, 0xe9, 0x6d, 0x8d, 0xfd, 0xab, 0xf5, 0x3b, 0xff, 0x63, 0xfe, 0x7c, 0x0f, 0x52,
+	0xa3, 0xca, 0xb1, 0x1d, 0x7d, 0x8e, 0xfb, 0xfe, 0xa1, 0x3d, 0xc7, 0x7d, 0x9e, 0x5c, 0xfb, 0x96,
+	0x6d, 0xf5, 0xbb, 0x7e, 0xd9, 0x1d, 0x8c, 0x95, 0xdb, 0x80, 0xc6, 0xfb, 0x37, 0x56, 0x4d, 0x79,
+	0x4b, 0x18, 0xec, 0x0f, 0x38, 0xe1, 0xd4, 0x35, 0x94, 0x7b, 0x70, 0xf3, 0x89, 0x2d, 0x17, 0xda,
+	0x0c, 0x56, 0xc2, 0xc1, 0x85, 0x70, 0x33, 0x58, 0xb7, 0x18, 0x95, 0x8d, 0x0a, 0x31, 0x58, 0x26,
+	0x76, 0xcf, 0x6d, 0x61, 0x65, 0x0f, 0xae, 0x4d, 0x6c, 0x9e, 0x58, 0x71, 0x63, 0x44, 0xac, 0x59,
+	0xbd, 0x6e, 0x13, 0xbb, 0x42, 0x97, 0x04, 0xa7, 0x9d, 0x70, 0x52, 0xe6, 0xe7, 0x12, 0xc4, 0xfc,
+	0x3e, 0x08, 0xc9, 0xb0, 0xc9, 0xae, 0xf9, 0x87, 0x55, 0xf5, 0xf8, 0xd2, 0x83, 0x40, 0x12, 0x62,
+	0x87, 0xf9, 0xfd, 0x62, 0xa1, 0x5a, 0x3d, 0x4a, 0x4b, 0x28, 0x0e, 0xd1, 0x7a, 0x25, 0xbf, 0x7f,
+	0x94, 0x0e, 0x79, 0x8f, 0x03, 0x95, 0xe2, 0x5d, 0x35, 0x7f, 0x9c, 0x0e, 0xa3, 0x15, 0x08, 0x1f,
+	0x95, 0x8f, 0xd2, 0x11, 0xce, 0x71, 0xf4, 0xa0, 0x56, 0x4c, 0x47, 0x51, 0x0c, 0x22, 0x95, 0xf2,
+	0x49, 0x31, 0xbd, 0xcc, 0x88, 0xf7, 0xcb, 0x85, 0xa2, 0x9a, 0x5e, 0x41, 0xd7, 0x60, 0x3d, 0xbf,
+	0xdf, 0x28, 0x57, 0x4f, 0xea, 0x5a, 0xf5, 0x44, 0xbb, 0x5b, 0xad, 0xde, 0xad, 0x14, 0xd3, 0x31,
+	0xb4, 0x0a, 0x71, 0x86, 0x56, 0x2b, 0x55, 0x4f, 0x1e, 0xa4, 0xa1, 0x10, 0x87, 0x15, 0xf1, 0xfa,
+	0xa6, 0xfc, 0x40, 0x02, 0x34, 0xfe, 0x8e, 0x84, 0xbe, 0x38, 0xfe, 0x42, 0x15, 0xc8, 0x57, 0x97,
+	0x5e, 0x99, 0x66, 0x79, 0x12, 0x0b, 0xfd, 0xfb, 0x27, 0xb1, 0x0c, 0x85, 0x64, 0xf0, 0xa5, 0x1a,
+	0x3d, 0x0b, 0x37, 0x3f, 0x28, 0x16, 0x4a, 0xd5, 0xea, 0x91, 0x56, 0x6f, 0xe4, 0x1b, 0x97, 0x1f,
+	0x52, 0x6e, 0xc2, 0xb5, 0xd1, 0xe9, 0xe2, 0x49, 0xbe, 0x50, 0x29, 0x1e, 0xa4, 0x25, 0xb4, 0x03,
+	0x2f, 0x4d, 0x9c, 0xd2, 0x0e, 0xab, 0xaa, 0x56, 0xaf, 0x54, 0x1b, 0xda, 0x61, 0xb9, 0x52, 0x29,
+	0x9f, 0xdc, 0x4d, 0x87, 0x32, 0x9f, 0x4b, 0x80, 0x58, 0xd2, 0xf3, 0x14, 0x21, 0x2a, 0x7e, 0xd4,
+	0xc3, 0x84, 0xa2, 0xeb, 0xb0, 0xec, 0x29, 0x2a, 0xec, 0x15, 0x23, 0xd6, 0x2e, 0x9a, 0xba, 0xd5,
+	0xe9, 0xb1, 0x8e, 0xae, 0x65, 0xb7, 0x7d, 0xab, 0x92, 0x3e, 0x71, 0xdf, 0x6e, 0x63, 0x54, 0x81,
+	0x84, 0x30, 0xfc, 0xc2, 0xc0, 0x8f, 0xf9, 0x51, 0x4b, 0xed, 0x7e, 0x61, 0xc6, 0xe3, 0x74, 0xdf,
+	0xc0, 0x8f, 0x55, 0x30, 0x06, 0xdf, 0x6c, 0xcf, 0x3b, 0x4c, 0x1c, 0xdb, 0xcc, 0xe2, 0xa5, 0x2b,
+	0xc6, 0x08, 0x75, 0xe3, 0x63, 0xe6, 0x24, 0xe0, 0x93, 0xd4, 0x3e, 0xc7, 0x96, 0x78, 0xa5, 0xe1,
+	0xec, 0x0d, 0x46, 0xc8, 0x7c, 0x4f, 0x82, 0x8d, 0x11, 0xeb, 0x44, 0x57, 0x97, 0x87, 0x15, 0x4f,
+	0x82, 0x9f, 0xdc, 0x5e, 0x9e, 0x51, 0x3b, 0xd5, 0x5f, 0x87, 0x5e, 0x82, 0x35, 0x8b, 0x35, 0x86,
+	0x01, 0xf1, 0x9e, 0x2f, 0x56, 0x19, 0xb9, 0x36, 0x50, 0xe1, 0x67, 0x12, 0xa4, 0xef, 0x62, 0xa1,
+	0x81, 0xef, 0xde, 0x49, 0x8f, 0x5b, 0xff, 0x7d, 0xd7, 0x66, 0xfe, 0x22, 0xc1, 0xc6, 0xbe, 0x8b,
+	0x75, 0x8a, 0x47, 0xd5, 0x7b, 0x52, 0xf4, 0xdf, 0x87, 0x65, 0x6f, 0xb5, 0xe8, 0x7b, 0x66, 0xf6,
+	0x9a, 0x58, 0x36, 0x6e, 0x63, 0x78, 0xba, 0x8d, 0x91, 0xab, 0xd9, 0xf8, 0xc3, 0x10, 0x6c, 0x9c,
+	0x3a, 0xed, 0x31, 0x1b, 0x87, 0xb6, 0x48, 0x4f, 0xc9, 0x96, 0x49, 0xf1, 0xba, 0x03, 0x89, 0x1e,
+	0x17, 0xce, 0x7f, 0x30, 0x13, 0x0f, 0x64, 0xca, 0xd8, 0xab, 0xd3, 0xa1, 0x81, 0xcd, 0xf6, 0xb1,
+	0x4e, 0xce, 0x55, 0xf0, 0xd8, 0xd9, 0xf7, 0x53, 0x76, 0xc4, 0x2b, 0xb0, 0x71, 0x80, 0x4d, 0x7c,
+	0xd9, 0x0f, 0x13, 0xb6, 0x62, 0xe6, 0x9f, 0x21, 0xb8, 0x59, 0xd0, 0x69, 0xeb, 0x61, 0xd0, 0x71,
+	0x53, 0x73, 0xc3, 0x0e, 0xa4, 0x85, 0xba, 0x4d, 0xb6, 0x56, 0x1b, 0xf4, 0x6f, 0xa5, 0x25, 0x35,
+	0xe5, 0xcd, 0x78, 0xa0, 0xae, 0x81, 0xbe, 0x09, 0x1b, 0x23, 0xbc, 0x86, 0x65, 0x1a, 0x16, 0x16,
+	0xfe, 0x79, 0x75, 0x46, 0x13, 0x39, 0x5a, 0x69, 0x49, 0x5d, 0x0f, 0x80, 0x97, 0x39, 0xd0, 0x78,
+	0x70, 0x22, 0xd3, 0x83, 0x13, 0xbd, 0x4a, 0x70, 0x96, 0xaf, 0x14, 0x9c, 0x42, 0x0a, 0x92, 0x41,
+	0x7f, 0x64, 0x34, 0x50, 0x26, 0x05, 0xe0, 0xa9, 0xa5, 0xaf, 0xcc, 0x85, 0x88, 0x70, 0x70, 0x4b,
+	0x4c, 0x8d, 0x70, 0x40, 0x6e, 0x68, 0x41, 0xb9, 0x35, 0x48, 0x04, 0x82, 0xf7, 0x14, 0x2c, 0xd9,
+	0x79, 0x1f, 0xa0, 0x1c, 0xac, 0x16, 0x37, 0xca, 0x27, 0x8d, 0xe2, 0x49, 0x43, 0xbb, 0x5f, 0x2e,
+	0x7e, 0x70, 0xa9, 0x66, 0x6e, 0x42, 0x3a, 0x38, 0x79, 0x78, 0x5a, 0xa9, 0xa4, 0xa5, 0xdd, 0xcf,
+	0xe2, 0xb0, 0x22, 0x1c, 0x80, 0x7e, 0x2b, 0x41, 0x22, 0x50, 0x30, 0xd0, 0xeb, 0x53, 0xd5, 0x19,
+	0x2f, 0x9e, 0xca, 0x1b, 0xf3, 0x2d, 0xf2, 0x82, 0x9a, 0xd9, 0xfd, 0xfe, 0x9f, 0xfe, 0xfa, 0xd3,
+	0xd0, 0xab, 0x68, 0x67, 0xf0, 0x53, 0xfe, 0xb7, 0x3d, 0xb7, 0xbf, 0xeb, 0xb8, 0xf6, 0xb7, 0x70,
+	0x8b, 0x92, 0xdc, 0x4e, 0x4e, 0xef, 0x60, 0x8b, 0x7e, 0x92, 0xf3, 0x8b, 0xd0, 0x2f, 0x24, 0x88,
+	0x0f, 0x8a, 0x0b, 0x9a, 0xfe, 0x93, 0xe6, 0xe5, 0x42, 0xa4, 0xcc, 0xea, 0xee, 0x49, 0xda, 0xb1,
+	0x54, 0x31, 0xa6, 0x9b, 0xaf, 0x5a, 0x6e, 0xe7, 0x13, 0xf4, 0xa9, 0x04, 0xc9, 0x60, 0x79, 0x41,
+	0xd3, 0x1d, 0x33, 0xa1, 0x1a, 0xcd, 0xae, 0xe3, 0x1e, 0xd7, 0xf1, 0x8d, 0xcc, 0x1c, 0x1e, 0xdc,
+	0xf3, 0xb3, 0xf9, 0xef, 0x24, 0x48, 0x06, 0x0f, 0xdb, 0x0c, 0xba, 0x4e, 0xa8, 0x2a, 0xb3, 0xeb,
+	0x9a, 0xe7, 0xba, 0xde, 0xd9, 0xbd, 0x3d, 0xd4, 0x55, 0xfc, 0x4d, 0x64, 0x9a, 0x5b, 0x07, 0x2a,
+	0xff, 0x44, 0x82, 0x64, 0xf0, 0xf8, 0xce, 0xa0, 0xf2, 0x84, 0x02, 0xa0, 0x5c, 0x1f, 0x4b, 0x78,
+	0xc5, 0xae, 0x43, 0xfb, 0x7e, 0xc4, 0x77, 0xe6, 0x89, 0xf8, 0x67, 0x12, 0xa0, 0xf1, 0xbc, 0x85,
+	0xa6, 0xbf, 0x2a, 0x3c, 0xb1, 0xda, 0x28, 0xcf, 0xfa, 0x6b, 0x03, 0x7f, 0x61, 0xc9, 0x56, 0xfd,
+	0xbf, 0xb0, 0xf8, 0x7e, 0xcc, 0xbc, 0x39, 0x47, 0xcc, 0x9b, 0x43, 0x61, 0x7b, 0xd2, 0xce, 0x50,
+	0xe9, 0x91, 0x5c, 0x38, 0xab, 0xd2, 0x93, 0x12, 0xe8, 0x7f, 0x4c, 0x69, 0x4f, 0xd8, 0x9e, 0xb4,
+	0x53, 0xf8, 0x54, 0x82, 0x17, 0x5a, 0x76, 0x77, 0x9a, 0x8e, 0x05, 0x91, 0x6d, 0x6b, 0x2c, 0xb6,
+	0x35, 0xe9, 0xc3, 0xb2, 0xe0, 0xef, 0xd8, 0xac, 0x12, 0x66, 0x6d, 0xb7, 0x93, 0xeb, 0x60, 0x8b,
+	0x47, 0x3e, 0xe7, 0x4d, 0xe9, 0x8e, 0x41, 0x9e, 0xf8, 0xef, 0xa2, 0x3b, 0x43, 0xd2, 0x3f, 0x24,
+	0xe9, 0x57, 0xa1, 0xd0, 0xc1, 0xe1, 0x6f, 0x42, 0xcf, 0xdd, 0xf5, 0x30, 0xf7, 0xb9, 0x0e, 0x07,
+	0x43, 0x1d, 0xee, 0x7b, 0x8b, 0x9a, 0xcb, 0x1c, 0xff, 0xf5, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff,
+	0xb3, 0x5d, 0x82, 0x52, 0x29, 0x25, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go
new file mode 100644
index 00000000..f78f53f6
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/knowledge_base.pb.go
@@ -0,0 +1,567 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/dialogflow/v2beta1/knowledge_base.proto
+
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import _ "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Represents knowledge base resource.
+type KnowledgeBase struct {
+	// The knowledge base resource name.
+	// The name must be empty when creating a knowledge base.
+	// Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base ID>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The display name of the knowledge base. The name must be 1024
+	// bytes or less; otherwise, the creation request fails.
+	DisplayName          string   `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KnowledgeBase) Reset()         { *m = KnowledgeBase{} }
+func (m *KnowledgeBase) String() string { return proto.CompactTextString(m) }
+func (*KnowledgeBase) ProtoMessage()    {}
+func (*KnowledgeBase) Descriptor() ([]byte, []int) {
+	return fileDescriptor_knowledge_base_5078794a2722dd36, []int{0}
+}
+func (m *KnowledgeBase) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KnowledgeBase.Unmarshal(m, b)
+}
+func (m *KnowledgeBase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KnowledgeBase.Marshal(b, m, deterministic)
+}
+func (dst *KnowledgeBase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnowledgeBase.Merge(dst, src)
+}
+func (m *KnowledgeBase) XXX_Size() int {
+	return xxx_messageInfo_KnowledgeBase.Size(m)
+}
+func (m *KnowledgeBase) XXX_DiscardUnknown() {
+	xxx_messageInfo_KnowledgeBase.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KnowledgeBase proto.InternalMessageInfo
+
+func (m *KnowledgeBase) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *KnowledgeBase) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+// Request message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2beta1.KnowledgeBases.ListKnowledgeBases].
+type ListKnowledgeBasesRequest struct {
+	// Required. The agent to list of knowledge bases for.
+	// Format: `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. The maximum number of items to return in a single page. By
+	// default 10 and at most 100.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional. The next_page_token value returned from a previous list request.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListKnowledgeBasesRequest) Reset()         { *m = ListKnowledgeBasesRequest{} }
+func (m *ListKnowledgeBasesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListKnowledgeBasesRequest) ProtoMessage()    {}
+func (*ListKnowledgeBasesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_knowledge_base_5078794a2722dd36, []int{1}
+}
+func (m *ListKnowledgeBasesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListKnowledgeBasesRequest.Unmarshal(m, b)
+}
+func (m *ListKnowledgeBasesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListKnowledgeBasesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListKnowledgeBasesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListKnowledgeBasesRequest.Merge(dst, src)
+}
+func (m *ListKnowledgeBasesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListKnowledgeBasesRequest.Size(m)
+}
+func (m *ListKnowledgeBasesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListKnowledgeBasesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListKnowledgeBasesRequest proto.InternalMessageInfo
+
+func (m *ListKnowledgeBasesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListKnowledgeBasesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListKnowledgeBasesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2beta1.KnowledgeBases.ListKnowledgeBases].
+type ListKnowledgeBasesResponse struct {
+	// The list of knowledge bases.
+	KnowledgeBases []*KnowledgeBase `protobuf:"bytes,1,rep,name=knowledge_bases,json=knowledgeBases,proto3" json:"knowledge_bases,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListKnowledgeBasesResponse) Reset()         { *m = ListKnowledgeBasesResponse{} }
+func (m *ListKnowledgeBasesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListKnowledgeBasesResponse) ProtoMessage()    {}
+func (*ListKnowledgeBasesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_knowledge_base_5078794a2722dd36, []int{2}
+}
+func (m *ListKnowledgeBasesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListKnowledgeBasesResponse.Unmarshal(m, b)
+}
+func (m *ListKnowledgeBasesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListKnowledgeBasesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListKnowledgeBasesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListKnowledgeBasesResponse.Merge(dst, src)
+}
+func (m *ListKnowledgeBasesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListKnowledgeBasesResponse.Size(m)
+}
+func (m *ListKnowledgeBasesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListKnowledgeBasesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListKnowledgeBasesResponse proto.InternalMessageInfo
+
+func (m *ListKnowledgeBasesResponse) GetKnowledgeBases() []*KnowledgeBase {
+	if m != nil {
+		return m.KnowledgeBases
+	}
+	return nil
+}
+
+func (m *ListKnowledgeBasesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for [KnowledgeBase.GetDocument][].
+type GetKnowledgeBaseRequest struct {
+	// Required. The name of the knowledge base to retrieve.
+	// Format `projects/<Project ID>/knowledgeBases/<Knowledge Base ID>`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetKnowledgeBaseRequest) Reset()         { *m = GetKnowledgeBaseRequest{} }
+func (m *GetKnowledgeBaseRequest) String() string { return proto.CompactTextString(m) }
+func (*GetKnowledgeBaseRequest) ProtoMessage()    {}
+func (*GetKnowledgeBaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_knowledge_base_5078794a2722dd36, []int{3}
+}
+func (m *GetKnowledgeBaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetKnowledgeBaseRequest.Unmarshal(m, b)
+}
+func (m *GetKnowledgeBaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetKnowledgeBaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKnowledgeBaseRequest.Merge(dst, src)
+}
+func (m *GetKnowledgeBaseRequest) XXX_Size() int {
+	return xxx_messageInfo_GetKnowledgeBaseRequest.Size(m)
+}
+func (m *GetKnowledgeBaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetKnowledgeBaseRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetKnowledgeBaseRequest proto.InternalMessageInfo
+
+func (m *GetKnowledgeBaseRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [KnowledgeBases.CreateKnowledgeBase][google.cloud.dialogflow.v2beta1.KnowledgeBases.CreateKnowledgeBase].
+type CreateKnowledgeBaseRequest struct {
+	// Required. The agent to create a knowledge base for.
+	// Format: `projects/<Project ID>/agent`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The knowledge base to create.
+	KnowledgeBase        *KnowledgeBase `protobuf:"bytes,2,opt,name=knowledge_base,json=knowledgeBase,proto3" json:"knowledge_base,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *CreateKnowledgeBaseRequest) Reset()         { *m = CreateKnowledgeBaseRequest{} }
+func (m *CreateKnowledgeBaseRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateKnowledgeBaseRequest) ProtoMessage()    {}
+func (*CreateKnowledgeBaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_knowledge_base_5078794a2722dd36, []int{4}
+}
+func (m *CreateKnowledgeBaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateKnowledgeBaseRequest.Unmarshal(m, b)
+}
+func (m *CreateKnowledgeBaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateKnowledgeBaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateKnowledgeBaseRequest.Merge(dst, src)
+}
+func (m *CreateKnowledgeBaseRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateKnowledgeBaseRequest.Size(m)
+}
+func (m *CreateKnowledgeBaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateKnowledgeBaseRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateKnowledgeBaseRequest proto.InternalMessageInfo
+
+func (m *CreateKnowledgeBaseRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateKnowledgeBaseRequest) GetKnowledgeBase() *KnowledgeBase {
+	if m != nil {
+		return m.KnowledgeBase
+	}
+	return nil
+}
+
+// Request message for [KnowledgeBases.DeleteKnowledgeBase][google.cloud.dialogflow.v2beta1.KnowledgeBases.DeleteKnowledgeBase].
+type DeleteKnowledgeBaseRequest struct {
+	// Required. The name of the knowledge base to delete.
+	// Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base ID>`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Optional. Force deletes the knowledge base. When set to true, any documents
+	// in the knowledge base are also deleted.
+	Force                bool     `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteKnowledgeBaseRequest) Reset()         { *m = DeleteKnowledgeBaseRequest{} }
+func (m *DeleteKnowledgeBaseRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteKnowledgeBaseRequest) ProtoMessage()    {}
+func (*DeleteKnowledgeBaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_knowledge_base_5078794a2722dd36, []int{5}
+}
+func (m *DeleteKnowledgeBaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteKnowledgeBaseRequest.Unmarshal(m, b)
+}
+func (m *DeleteKnowledgeBaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteKnowledgeBaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteKnowledgeBaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteKnowledgeBaseRequest.Merge(dst, src)
+}
+func (m *DeleteKnowledgeBaseRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteKnowledgeBaseRequest.Size(m)
+}
+func (m *DeleteKnowledgeBaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteKnowledgeBaseRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteKnowledgeBaseRequest proto.InternalMessageInfo
+
+func (m *DeleteKnowledgeBaseRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *DeleteKnowledgeBaseRequest) GetForce() bool {
+	if m != nil {
+		return m.Force
+	}
+	return false
+}
+
+func init() {
+	proto.RegisterType((*KnowledgeBase)(nil), "google.cloud.dialogflow.v2beta1.KnowledgeBase")
+	proto.RegisterType((*ListKnowledgeBasesRequest)(nil), "google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest")
+	proto.RegisterType((*ListKnowledgeBasesResponse)(nil), "google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse")
+	proto.RegisterType((*GetKnowledgeBaseRequest)(nil), "google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest")
+	proto.RegisterType((*CreateKnowledgeBaseRequest)(nil), "google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest")
+	proto.RegisterType((*DeleteKnowledgeBaseRequest)(nil), "google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// KnowledgeBasesClient is the client API for KnowledgeBases service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type KnowledgeBasesClient interface {
+	// Returns the list of all knowledge bases of the specified agent.
+	ListKnowledgeBases(ctx context.Context, in *ListKnowledgeBasesRequest, opts ...grpc.CallOption) (*ListKnowledgeBasesResponse, error)
+	// Retrieves the specified knowledge base.
+	GetKnowledgeBase(ctx context.Context, in *GetKnowledgeBaseRequest, opts ...grpc.CallOption) (*KnowledgeBase, error)
+	// Creates a knowledge base.
+	CreateKnowledgeBase(ctx context.Context, in *CreateKnowledgeBaseRequest, opts ...grpc.CallOption) (*KnowledgeBase, error)
+	// Deletes the specified knowledge base.
+	DeleteKnowledgeBase(ctx context.Context, in *DeleteKnowledgeBaseRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+}
+
+type knowledgeBasesClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewKnowledgeBasesClient(cc *grpc.ClientConn) KnowledgeBasesClient {
+	return &knowledgeBasesClient{cc}
+}
+
+func (c *knowledgeBasesClient) ListKnowledgeBases(ctx context.Context, in *ListKnowledgeBasesRequest, opts ...grpc.CallOption) (*ListKnowledgeBasesResponse, error) {
+	out := new(ListKnowledgeBasesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.KnowledgeBases/ListKnowledgeBases", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *knowledgeBasesClient) GetKnowledgeBase(ctx context.Context, in *GetKnowledgeBaseRequest, opts ...grpc.CallOption) (*KnowledgeBase, error) {
+	out := new(KnowledgeBase)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.KnowledgeBases/GetKnowledgeBase", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *knowledgeBasesClient) CreateKnowledgeBase(ctx context.Context, in *CreateKnowledgeBaseRequest, opts ...grpc.CallOption) (*KnowledgeBase, error) {
+	out := new(KnowledgeBase)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.KnowledgeBases/CreateKnowledgeBase", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *knowledgeBasesClient) DeleteKnowledgeBase(ctx context.Context, in *DeleteKnowledgeBaseRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.KnowledgeBases/DeleteKnowledgeBase", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// KnowledgeBasesServer is the server API for KnowledgeBases service.
+type KnowledgeBasesServer interface {
+	// Returns the list of all knowledge bases of the specified agent.
+	ListKnowledgeBases(context.Context, *ListKnowledgeBasesRequest) (*ListKnowledgeBasesResponse, error)
+	// Retrieves the specified knowledge base.
+	GetKnowledgeBase(context.Context, *GetKnowledgeBaseRequest) (*KnowledgeBase, error)
+	// Creates a knowledge base.
+	CreateKnowledgeBase(context.Context, *CreateKnowledgeBaseRequest) (*KnowledgeBase, error)
+	// Deletes the specified knowledge base.
+	DeleteKnowledgeBase(context.Context, *DeleteKnowledgeBaseRequest) (*empty.Empty, error)
+}
+
+func RegisterKnowledgeBasesServer(s *grpc.Server, srv KnowledgeBasesServer) {
+	s.RegisterService(&_KnowledgeBases_serviceDesc, srv)
+}
+
+func _KnowledgeBases_ListKnowledgeBases_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListKnowledgeBasesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KnowledgeBasesServer).ListKnowledgeBases(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2beta1.KnowledgeBases/ListKnowledgeBases",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KnowledgeBasesServer).ListKnowledgeBases(ctx, req.(*ListKnowledgeBasesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KnowledgeBases_GetKnowledgeBase_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetKnowledgeBaseRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KnowledgeBasesServer).GetKnowledgeBase(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2beta1.KnowledgeBases/GetKnowledgeBase",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KnowledgeBasesServer).GetKnowledgeBase(ctx, req.(*GetKnowledgeBaseRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KnowledgeBases_CreateKnowledgeBase_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateKnowledgeBaseRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KnowledgeBasesServer).CreateKnowledgeBase(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2beta1.KnowledgeBases/CreateKnowledgeBase",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KnowledgeBasesServer).CreateKnowledgeBase(ctx, req.(*CreateKnowledgeBaseRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KnowledgeBases_DeleteKnowledgeBase_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteKnowledgeBaseRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KnowledgeBasesServer).DeleteKnowledgeBase(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.dialogflow.v2beta1.KnowledgeBases/DeleteKnowledgeBase",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KnowledgeBasesServer).DeleteKnowledgeBase(ctx, req.(*DeleteKnowledgeBaseRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _KnowledgeBases_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.dialogflow.v2beta1.KnowledgeBases",
+	HandlerType: (*KnowledgeBasesServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListKnowledgeBases",
+			Handler:    _KnowledgeBases_ListKnowledgeBases_Handler,
+		},
+		{
+			MethodName: "GetKnowledgeBase",
+			Handler:    _KnowledgeBases_GetKnowledgeBase_Handler,
+		},
+		{
+			MethodName: "CreateKnowledgeBase",
+			Handler:    _KnowledgeBases_CreateKnowledgeBase_Handler,
+		},
+		{
+			MethodName: "DeleteKnowledgeBase",
+			Handler:    _KnowledgeBases_DeleteKnowledgeBase_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/dialogflow/v2beta1/knowledge_base.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/knowledge_base.proto", fileDescriptor_knowledge_base_5078794a2722dd36)
+}
+
+var fileDescriptor_knowledge_base_5078794a2722dd36 = []byte{
+	// 639 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x4f, 0xd4, 0x40,
+	0x14, 0xce, 0x2c, 0x82, 0x30, 0x08, 0x98, 0xc1, 0x20, 0x16, 0x0d, 0x58, 0x13, 0x43, 0xd6, 0xd8,
+	0x09, 0xe0, 0xc1, 0x40, 0xbc, 0x00, 0x42, 0x8c, 0xc6, 0x90, 0xf5, 0x57, 0xc2, 0x65, 0x33, 0xbb,
+	0xfb, 0xb6, 0xd6, 0xed, 0xce, 0xd4, 0xce, 0x20, 0x82, 0xe1, 0xc2, 0xcd, 0x98, 0x78, 0xf1, 0xec,
+	0xc5, 0xa3, 0x27, 0xff, 0x17, 0xbd, 0x79, 0x35, 0xfe, 0x0b, 0x7a, 0x34, 0x9d, 0xe9, 0x02, 0x53,
+	0x5a, 0xd7, 0x7a, 0xdb, 0x79, 0x6f, 0xbe, 0x37, 0xdf, 0xf7, 0xbe, 0xf7, 0xba, 0xf8, 0x96, 0x2f,
+	0x84, 0x1f, 0x02, 0x6d, 0x86, 0x62, 0xa7, 0x45, 0x5b, 0x01, 0x0b, 0x85, 0xdf, 0x0e, 0xc5, 0x2e,
+	0x7d, 0xb5, 0xd8, 0x00, 0xc5, 0x16, 0x68, 0x87, 0x8b, 0xdd, 0x10, 0x5a, 0x3e, 0xd4, 0x1b, 0x4c,
+	0x82, 0x17, 0xc5, 0x42, 0x09, 0x32, 0x6b, 0x50, 0x9e, 0x46, 0x79, 0xc7, 0x28, 0x2f, 0x45, 0x39,
+	0x97, 0xd3, 0xb2, 0x2c, 0x0a, 0x28, 0xe3, 0x5c, 0x28, 0xa6, 0x02, 0xc1, 0xa5, 0x81, 0x3b, 0x33,
+	0x69, 0x56, 0x9f, 0x1a, 0x3b, 0x6d, 0x0a, 0xdd, 0x48, 0xed, 0xa5, 0xc9, 0xb9, 0x6c, 0xb2, 0x1d,
+	0x40, 0xd8, 0xaa, 0x77, 0x99, 0xec, 0x98, 0x1b, 0xee, 0x06, 0x1e, 0xbb, 0xdf, 0x63, 0xb5, 0xca,
+	0x24, 0x10, 0x82, 0xcf, 0x70, 0xd6, 0x85, 0x69, 0x34, 0x87, 0xe6, 0x47, 0x6a, 0xfa, 0x37, 0xb9,
+	0x8a, 0xcf, 0xb5, 0x02, 0x19, 0x85, 0x6c, 0xaf, 0xae, 0x73, 0x15, 0x9d, 0x1b, 0x4d, 0x63, 0x0f,
+	0x59, 0x17, 0x5c, 0x81, 0x2f, 0x3d, 0x08, 0xa4, 0xb2, 0x6a, 0xc9, 0x1a, 0xbc, 0xdc, 0x01, 0xa9,
+	0xc8, 0x14, 0x1e, 0x8a, 0x58, 0x0c, 0x5c, 0xa5, 0x55, 0xd3, 0x13, 0x99, 0xc1, 0x23, 0x11, 0xf3,
+	0xa1, 0x2e, 0x83, 0x7d, 0x53, 0x74, 0xb0, 0x36, 0x9c, 0x04, 0x1e, 0x05, 0xfb, 0x40, 0xae, 0x60,
+	0xac, 0x93, 0x4a, 0x74, 0x80, 0x4f, 0x0f, 0x68, 0xa0, 0xbe, 0xfe, 0x38, 0x09, 0xb8, 0x1f, 0x11,
+	0x76, 0xf2, 0x5e, 0x94, 0x91, 0xe0, 0x12, 0xc8, 0x33, 0x3c, 0x61, 0x77, 0x5b, 0x4e, 0xa3, 0xb9,
+	0x81, 0xf9, 0xd1, 0x45, 0xcf, 0xeb, 0xd3, 0x6f, 0xcf, 0xaa, 0x58, 0x1b, 0xef, 0x58, 0x0f, 0x90,
+	0xeb, 0x78, 0x82, 0xc3, 0x6b, 0x55, 0x3f, 0xc1, 0xcd, 0xb4, 0x63, 0x2c, 0x09, 0x6f, 0x1d, 0xf1,
+	0xbb, 0x89, 0x2f, 0x6e, 0x82, 0xcd, 0xae, 0xd7, 0x8e, 0x9c, 0x16, 0xbb, 0xef, 0x10, 0x76, 0xd6,
+	0x62, 0x60, 0x0a, 0x72, 0x21, 0x45, 0x1d, 0x7c, 0x82, 0xc7, 0x6d, 0x99, 0x9a, 0x4c, 0x79, 0x95,
+	0x63, 0x96, 0x4a, 0x77, 0x03, 0x3b, 0xeb, 0x10, 0x42, 0x01, 0x99, 0xbc, 0x11, 0xb9, 0x80, 0x07,
+	0xdb, 0x22, 0x6e, 0x9a, 0xf7, 0x87, 0x6b, 0xe6, 0xb0, 0xf8, 0xfd, 0x2c, 0x1e, 0xb7, 0x0d, 0x22,
+	0xbf, 0x10, 0x26, 0xa7, 0x7d, 0x23, 0xcb, 0x7d, 0x09, 0x17, 0x8e, 0x97, 0xb3, 0xf2, 0x5f, 0x58,
+	0x33, 0x28, 0xee, 0xf3, 0xc3, 0xaf, 0x3f, 0x3e, 0x54, 0x1a, 0xe4, 0xc6, 0xd1, 0x96, 0xbe, 0x31,
+	0xbd, 0xbd, 0x13, 0xc5, 0xe2, 0x05, 0x34, 0x95, 0xa4, 0xd5, 0x03, 0x6a, 0x0f, 0xc1, 0xf6, 0x12,
+	0x59, 0xf8, 0xcb, 0x75, 0xca, 0x7c, 0xe0, 0x2a, 0x0b, 0x22, 0x3f, 0x11, 0x3e, 0x9f, 0x1d, 0x09,
+	0x72, 0xbb, 0x2f, 0xf7, 0x82, 0x29, 0x72, 0x4a, 0x5a, 0x9c, 0x27, 0x34, 0x71, 0xee, 0x24, 0x6f,
+	0x9b, 0x30, 0xad, 0x1e, 0xd8, 0x42, 0xb3, 0xd7, 0xb5, 0xcc, 0xd3, 0x20, 0xf2, 0xbe, 0x82, 0x27,
+	0x73, 0x66, 0x99, 0xf4, 0xf7, 0xa9, 0x78, 0x03, 0x4a, 0xcb, 0x7d, 0x8b, 0xb4, 0xde, 0x43, 0xe4,
+	0x96, 0x71, 0x76, 0x39, 0xb3, 0x4e, 0xdb, 0x6b, 0x6e, 0x79, 0xa7, 0xb3, 0x45, 0xc8, 0x37, 0x84,
+	0x27, 0x73, 0xf6, 0xe9, 0x1f, 0x1a, 0x52, 0xbc, 0x85, 0xce, 0x54, 0x0f, 0xdc, 0xfb, 0xb8, 0x7b,
+	0x77, 0x93, 0x2f, 0x7f, 0xcf, 0xe7, 0x6a, 0x39, 0x9f, 0xab, 0xe5, 0x7d, 0x5e, 0xfd, 0x82, 0xf0,
+	0xb5, 0xa6, 0xe8, 0xf6, 0x13, 0xb1, 0x4a, 0x2c, 0xfe, 0x5b, 0x09, 0xdd, 0x2d, 0xb4, 0x7d, 0x2f,
+	0x85, 0xf9, 0x22, 0x64, 0xdc, 0xf7, 0x44, 0xec, 0x53, 0x1f, 0xb8, 0x16, 0x43, 0x4d, 0x8a, 0x45,
+	0x81, 0x2c, 0xfc, 0x33, 0x5d, 0x39, 0x0e, 0xfd, 0x46, 0xe8, 0x53, 0xa5, 0xb2, 0xbe, 0xf1, 0xb9,
+	0x32, 0xbb, 0x69, 0x6a, 0xae, 0x69, 0x2a, 0xeb, 0xc7, 0x54, 0x9e, 0x1a, 0x50, 0x63, 0x48, 0xd7,
+	0x5f, 0xfa, 0x13, 0x00, 0x00, 0xff, 0xff, 0xad, 0x8b, 0xb2, 0x9f, 0xab, 0x07, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/session.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/session.pb.go
index fa627cb9..8346e323 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/session.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/session.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/session.proto
 
-package dialogflow
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/struct"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
-import google_type "google.golang.org/genproto/googleapis/type/latlng"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,8 +21,16 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Audio encoding of the audio content sent in the conversational query request.
-// Refer to the [Cloud Speech API documentation](/speech/docs/basics) for more
+// Refer to the
+// [Cloud Speech API
+// documentation](https://cloud.google.com/speech-to-text/docs/basics) for more
 // details.
 type AudioEncoding int32
 
@@ -87,7 +95,44 @@ var AudioEncoding_value = map[string]int32{
 func (x AudioEncoding) String() string {
 	return proto.EnumName(AudioEncoding_name, int32(x))
 }
-func (AudioEncoding) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+func (AudioEncoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{0}
+}
+
+// Represents the system's confidence that this knowledge answer is a good
+// match for this conversational query.
+type KnowledgeAnswers_Answer_MatchConfidenceLevel int32
+
+const (
+	// Not specified.
+	KnowledgeAnswers_Answer_MATCH_CONFIDENCE_LEVEL_UNSPECIFIED KnowledgeAnswers_Answer_MatchConfidenceLevel = 0
+	// Indicates that the confidence is low.
+	KnowledgeAnswers_Answer_LOW KnowledgeAnswers_Answer_MatchConfidenceLevel = 1
+	// Indicates our confidence is medium.
+	KnowledgeAnswers_Answer_MEDIUM KnowledgeAnswers_Answer_MatchConfidenceLevel = 2
+	// Indicates our confidence is high.
+	KnowledgeAnswers_Answer_HIGH KnowledgeAnswers_Answer_MatchConfidenceLevel = 3
+)
+
+var KnowledgeAnswers_Answer_MatchConfidenceLevel_name = map[int32]string{
+	0: "MATCH_CONFIDENCE_LEVEL_UNSPECIFIED",
+	1: "LOW",
+	2: "MEDIUM",
+	3: "HIGH",
+}
+var KnowledgeAnswers_Answer_MatchConfidenceLevel_value = map[string]int32{
+	"MATCH_CONFIDENCE_LEVEL_UNSPECIFIED": 0,
+	"LOW":    1,
+	"MEDIUM": 2,
+	"HIGH":   3,
+}
+
+func (x KnowledgeAnswers_Answer_MatchConfidenceLevel) String() string {
+	return proto.EnumName(KnowledgeAnswers_Answer_MatchConfidenceLevel_name, int32(x))
+}
+func (KnowledgeAnswers_Answer_MatchConfidenceLevel) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{5, 0, 0}
+}
 
 // Type of the response message.
 type StreamingRecognitionResult_MessageType int32
@@ -122,19 +167,23 @@ func (x StreamingRecognitionResult_MessageType) String() string {
 	return proto.EnumName(StreamingRecognitionResult_MessageType_name, int32(x))
 }
 func (StreamingRecognitionResult_MessageType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{7, 0}
+	return fileDescriptor_session_251d19dfdf11847a, []int{8, 0}
 }
 
 // The request to detect user's intent.
 type DetectIntentRequest struct {
 	// Required. The name of the session this query is sent to. Format:
-	// `projects/<Project ID>/agent/sessions/<Session ID>`.
-	// It's up to the API caller to choose an appropriate session ID. It can be
-	// a random number or some type of user identifier (preferably hashed).
-	// The length of the session ID must not exceed 36 bytes.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	// `projects/<Project ID>/agent/sessions/<Session ID>`, or
+	// `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
+	// ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume
+	// default 'draft' environment. If `User ID` is not specified, we are using
+	// "-". It’s up to the API caller to choose an appropriate `Session ID` and
+	// `User Id`. They can be a random numbers or some type of user and session
+	// identifiers (preferably hashed). The length of the `Session ID` and
+	// `User ID` must not exceed 36 characters.
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// Optional. The parameters of this query.
-	QueryParams *QueryParameters `protobuf:"bytes,2,opt,name=query_params,json=queryParams" json:"query_params,omitempty"`
+	QueryParams *QueryParameters `protobuf:"bytes,2,opt,name=query_params,json=queryParams,proto3" json:"query_params,omitempty"`
 	// Required. The input specification. It can be set to:
 	//
 	// 1.  an audio config
@@ -143,17 +192,43 @@ type DetectIntentRequest struct {
 	// 2.  a conversational query in the form of text, or
 	//
 	// 3.  an event that specifies which intent to trigger.
-	QueryInput *QueryInput `protobuf:"bytes,3,opt,name=query_input,json=queryInput" json:"query_input,omitempty"`
+	QueryInput *QueryInput `protobuf:"bytes,3,opt,name=query_input,json=queryInput,proto3" json:"query_input,omitempty"`
+	// Optional. Instructs the speech synthesizer how to generate the output
+	// audio. If this field is not set and agent-level speech synthesizer is not
+	// configured, no output audio is generated.
+	OutputAudioConfig *OutputAudioConfig `protobuf:"bytes,4,opt,name=output_audio_config,json=outputAudioConfig,proto3" json:"output_audio_config,omitempty"`
 	// Optional. The natural language speech audio to be processed. This field
 	// should be populated iff `query_input` is set to an input audio config.
 	// A single request can contain up to 1 minute of speech audio data.
-	InputAudio []byte `protobuf:"bytes,5,opt,name=input_audio,json=inputAudio,proto3" json:"input_audio,omitempty"`
+	InputAudio           []byte   `protobuf:"bytes,5,opt,name=input_audio,json=inputAudio,proto3" json:"input_audio,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DetectIntentRequest) Reset()         { *m = DetectIntentRequest{} }
+func (m *DetectIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*DetectIntentRequest) ProtoMessage()    {}
+func (*DetectIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{0}
+}
+func (m *DetectIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DetectIntentRequest.Unmarshal(m, b)
+}
+func (m *DetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DetectIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *DetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectIntentRequest.Merge(dst, src)
+}
+func (m *DetectIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_DetectIntentRequest.Size(m)
+}
+func (m *DetectIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DetectIntentRequest.DiscardUnknown(m)
 }
 
-func (m *DetectIntentRequest) Reset()                    { *m = DetectIntentRequest{} }
-func (m *DetectIntentRequest) String() string            { return proto.CompactTextString(m) }
-func (*DetectIntentRequest) ProtoMessage()               {}
-func (*DetectIntentRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_DetectIntentRequest proto.InternalMessageInfo
 
 func (m *DetectIntentRequest) GetSession() string {
 	if m != nil {
@@ -176,6 +251,13 @@ func (m *DetectIntentRequest) GetQueryInput() *QueryInput {
 	return nil
 }
 
+func (m *DetectIntentRequest) GetOutputAudioConfig() *OutputAudioConfig {
+	if m != nil {
+		return m.OutputAudioConfig
+	}
+	return nil
+}
+
 func (m *DetectIntentRequest) GetInputAudio() []byte {
 	if m != nil {
 		return m.InputAudio
@@ -187,18 +269,56 @@ func (m *DetectIntentRequest) GetInputAudio() []byte {
 type DetectIntentResponse struct {
 	// The unique identifier of the response. It can be used to
 	// locate a response in the training example set or for reporting issues.
-	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId" json:"response_id,omitempty"`
-	// The results of the conversational query or event processing.
-	QueryResult *QueryResult `protobuf:"bytes,2,opt,name=query_result,json=queryResult" json:"query_result,omitempty"`
+	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId,proto3" json:"response_id,omitempty"`
+	// The selected results of the conversational query or event processing.
+	// See `alternative_query_results` for additional potential results.
+	QueryResult *QueryResult `protobuf:"bytes,2,opt,name=query_result,json=queryResult,proto3" json:"query_result,omitempty"`
+	// If Knowledge Connectors are enabled, there could be more than one result
+	// returned for a given query or event, and this field will contain all
+	// results except for the top one, which is captured in query_result. The
+	// alternative results are ordered by decreasing
+	// `QueryResult.intent_detection_confidence`. If Knowledge Connectors are
+	// disabled, this field will be empty until multiple responses for regular
+	// intents are supported, at which point those additional results will be
+	// surfaced here.
+	AlternativeQueryResults []*QueryResult `protobuf:"bytes,5,rep,name=alternative_query_results,json=alternativeQueryResults,proto3" json:"alternative_query_results,omitempty"`
 	// Specifies the status of the webhook request. `webhook_status`
 	// is never populated in webhook requests.
-	WebhookStatus *google_rpc.Status `protobuf:"bytes,3,opt,name=webhook_status,json=webhookStatus" json:"webhook_status,omitempty"`
+	WebhookStatus *status.Status `protobuf:"bytes,3,opt,name=webhook_status,json=webhookStatus,proto3" json:"webhook_status,omitempty"`
+	// The audio data bytes encoded as specified in the request.
+	OutputAudio []byte `protobuf:"bytes,4,opt,name=output_audio,json=outputAudio,proto3" json:"output_audio,omitempty"`
+	// Instructs the speech synthesizer how to generate the output audio. This
+	// field is populated from the agent-level speech synthesizer configuration,
+	// if enabled.
+	OutputAudioConfig    *OutputAudioConfig `protobuf:"bytes,6,opt,name=output_audio_config,json=outputAudioConfig,proto3" json:"output_audio_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *DetectIntentResponse) Reset()         { *m = DetectIntentResponse{} }
+func (m *DetectIntentResponse) String() string { return proto.CompactTextString(m) }
+func (*DetectIntentResponse) ProtoMessage()    {}
+func (*DetectIntentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{1}
+}
+func (m *DetectIntentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DetectIntentResponse.Unmarshal(m, b)
+}
+func (m *DetectIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DetectIntentResponse.Marshal(b, m, deterministic)
+}
+func (dst *DetectIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DetectIntentResponse.Merge(dst, src)
+}
+func (m *DetectIntentResponse) XXX_Size() int {
+	return xxx_messageInfo_DetectIntentResponse.Size(m)
+}
+func (m *DetectIntentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DetectIntentResponse.DiscardUnknown(m)
 }
 
-func (m *DetectIntentResponse) Reset()                    { *m = DetectIntentResponse{} }
-func (m *DetectIntentResponse) String() string            { return proto.CompactTextString(m) }
-func (*DetectIntentResponse) ProtoMessage()               {}
-func (*DetectIntentResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+var xxx_messageInfo_DetectIntentResponse proto.InternalMessageInfo
 
 func (m *DetectIntentResponse) GetResponseId() string {
 	if m != nil {
@@ -214,41 +334,97 @@ func (m *DetectIntentResponse) GetQueryResult() *QueryResult {
 	return nil
 }
 
-func (m *DetectIntentResponse) GetWebhookStatus() *google_rpc.Status {
+func (m *DetectIntentResponse) GetAlternativeQueryResults() []*QueryResult {
+	if m != nil {
+		return m.AlternativeQueryResults
+	}
+	return nil
+}
+
+func (m *DetectIntentResponse) GetWebhookStatus() *status.Status {
 	if m != nil {
 		return m.WebhookStatus
 	}
 	return nil
 }
 
+func (m *DetectIntentResponse) GetOutputAudio() []byte {
+	if m != nil {
+		return m.OutputAudio
+	}
+	return nil
+}
+
+func (m *DetectIntentResponse) GetOutputAudioConfig() *OutputAudioConfig {
+	if m != nil {
+		return m.OutputAudioConfig
+	}
+	return nil
+}
+
 // Represents the parameters of the conversational query.
 type QueryParameters struct {
 	// Optional. The time zone of this conversational query from the
 	// [time zone database](https://www.iana.org/time-zones), e.g.,
 	// America/New_York, Europe/Paris. If not provided, the time zone specified in
 	// agent settings is used.
-	TimeZone string `protobuf:"bytes,1,opt,name=time_zone,json=timeZone" json:"time_zone,omitempty"`
+	TimeZone string `protobuf:"bytes,1,opt,name=time_zone,json=timeZone,proto3" json:"time_zone,omitempty"`
 	// Optional. The geo location of this conversational query.
-	GeoLocation *google_type.LatLng `protobuf:"bytes,2,opt,name=geo_location,json=geoLocation" json:"geo_location,omitempty"`
+	GeoLocation *latlng.LatLng `protobuf:"bytes,2,opt,name=geo_location,json=geoLocation,proto3" json:"geo_location,omitempty"`
 	// Optional. The collection of contexts to be activated before this query is
 	// executed.
-	Contexts []*Context `protobuf:"bytes,3,rep,name=contexts" json:"contexts,omitempty"`
+	Contexts []*Context `protobuf:"bytes,3,rep,name=contexts,proto3" json:"contexts,omitempty"`
 	// Optional. Specifies whether to delete all contexts in the current session
 	// before the new ones are activated.
-	ResetContexts bool `protobuf:"varint,4,opt,name=reset_contexts,json=resetContexts" json:"reset_contexts,omitempty"`
+	ResetContexts bool `protobuf:"varint,4,opt,name=reset_contexts,json=resetContexts,proto3" json:"reset_contexts,omitempty"`
 	// Optional. The collection of session entity types to replace or extend
 	// developer entities with for this query only. The entity synonyms apply
 	// to all languages.
-	SessionEntityTypes []*SessionEntityType `protobuf:"bytes,5,rep,name=session_entity_types,json=sessionEntityTypes" json:"session_entity_types,omitempty"`
+	SessionEntityTypes []*SessionEntityType `protobuf:"bytes,5,rep,name=session_entity_types,json=sessionEntityTypes,proto3" json:"session_entity_types,omitempty"`
 	// Optional. This field can be used to pass custom data into the webhook
 	// associated with the agent. Arbitrary JSON objects are supported.
-	Payload *google_protobuf4.Struct `protobuf:"bytes,6,opt,name=payload" json:"payload,omitempty"`
+	Payload *_struct.Struct `protobuf:"bytes,6,opt,name=payload,proto3" json:"payload,omitempty"`
+	// Optional. KnowledgeBases to get alternative results from. If not set, the
+	// KnowledgeBases enabled in the agent (through UI) will be used.
+	// Format:  `projects/<Project ID>/knowledgeBases/<Knowledge Base ID>`.
+	//
+	// Note: This field is `repeated` for forward compatibility, currently only
+	// the first one is supported, we may return an error if multiple
+	// KnowledgeBases are specified.
+	KnowledgeBaseNames []string `protobuf:"bytes,12,rep,name=knowledge_base_names,json=knowledgeBaseNames,proto3" json:"knowledge_base_names,omitempty"`
+	// Optional. Configures the type of sentiment analysis to perform. If not
+	// provided, sentiment analysis is not performed.
+	// Note: Sentiment Analysis is only currently available for Enterprise Edition
+	// agents.
+	SentimentAnalysisRequestConfig *SentimentAnalysisRequestConfig `protobuf:"bytes,10,opt,name=sentiment_analysis_request_config,json=sentimentAnalysisRequestConfig,proto3" json:"sentiment_analysis_request_config,omitempty"`
+	XXX_NoUnkeyedLiteral           struct{}                        `json:"-"`
+	XXX_unrecognized               []byte                          `json:"-"`
+	XXX_sizecache                  int32                           `json:"-"`
+}
+
+func (m *QueryParameters) Reset()         { *m = QueryParameters{} }
+func (m *QueryParameters) String() string { return proto.CompactTextString(m) }
+func (*QueryParameters) ProtoMessage()    {}
+func (*QueryParameters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{2}
+}
+func (m *QueryParameters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryParameters.Unmarshal(m, b)
+}
+func (m *QueryParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryParameters.Marshal(b, m, deterministic)
+}
+func (dst *QueryParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryParameters.Merge(dst, src)
+}
+func (m *QueryParameters) XXX_Size() int {
+	return xxx_messageInfo_QueryParameters.Size(m)
+}
+func (m *QueryParameters) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryParameters.DiscardUnknown(m)
 }
 
-func (m *QueryParameters) Reset()                    { *m = QueryParameters{} }
-func (m *QueryParameters) String() string            { return proto.CompactTextString(m) }
-func (*QueryParameters) ProtoMessage()               {}
-func (*QueryParameters) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
+var xxx_messageInfo_QueryParameters proto.InternalMessageInfo
 
 func (m *QueryParameters) GetTimeZone() string {
 	if m != nil {
@@ -257,7 +433,7 @@ func (m *QueryParameters) GetTimeZone() string {
 	return ""
 }
 
-func (m *QueryParameters) GetGeoLocation() *google_type.LatLng {
+func (m *QueryParameters) GetGeoLocation() *latlng.LatLng {
 	if m != nil {
 		return m.GeoLocation
 	}
@@ -285,13 +461,27 @@ func (m *QueryParameters) GetSessionEntityTypes() []*SessionEntityType {
 	return nil
 }
 
-func (m *QueryParameters) GetPayload() *google_protobuf4.Struct {
+func (m *QueryParameters) GetPayload() *_struct.Struct {
 	if m != nil {
 		return m.Payload
 	}
 	return nil
 }
 
+func (m *QueryParameters) GetKnowledgeBaseNames() []string {
+	if m != nil {
+		return m.KnowledgeBaseNames
+	}
+	return nil
+}
+
+func (m *QueryParameters) GetSentimentAnalysisRequestConfig() *SentimentAnalysisRequestConfig {
+	if m != nil {
+		return m.SentimentAnalysisRequestConfig
+	}
+	return nil
+}
+
 // Represents the query input. It can contain either:
 //
 // 1.  An audio config which
@@ -307,31 +497,57 @@ type QueryInput struct {
 	//	*QueryInput_AudioConfig
 	//	*QueryInput_Text
 	//	*QueryInput_Event
-	Input isQueryInput_Input `protobuf_oneof:"input"`
+	Input                isQueryInput_Input `protobuf_oneof:"input"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *QueryInput) Reset()         { *m = QueryInput{} }
+func (m *QueryInput) String() string { return proto.CompactTextString(m) }
+func (*QueryInput) ProtoMessage()    {}
+func (*QueryInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{3}
+}
+func (m *QueryInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryInput.Unmarshal(m, b)
+}
+func (m *QueryInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryInput.Marshal(b, m, deterministic)
+}
+func (dst *QueryInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryInput.Merge(dst, src)
+}
+func (m *QueryInput) XXX_Size() int {
+	return xxx_messageInfo_QueryInput.Size(m)
+}
+func (m *QueryInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryInput.DiscardUnknown(m)
 }
 
-func (m *QueryInput) Reset()                    { *m = QueryInput{} }
-func (m *QueryInput) String() string            { return proto.CompactTextString(m) }
-func (*QueryInput) ProtoMessage()               {}
-func (*QueryInput) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+var xxx_messageInfo_QueryInput proto.InternalMessageInfo
 
 type isQueryInput_Input interface {
 	isQueryInput_Input()
 }
 
 type QueryInput_AudioConfig struct {
-	AudioConfig *InputAudioConfig `protobuf:"bytes,1,opt,name=audio_config,json=audioConfig,oneof"`
+	AudioConfig *InputAudioConfig `protobuf:"bytes,1,opt,name=audio_config,json=audioConfig,proto3,oneof"`
 }
+
 type QueryInput_Text struct {
-	Text *TextInput `protobuf:"bytes,2,opt,name=text,oneof"`
+	Text *TextInput `protobuf:"bytes,2,opt,name=text,proto3,oneof"`
 }
+
 type QueryInput_Event struct {
-	Event *EventInput `protobuf:"bytes,3,opt,name=event,oneof"`
+	Event *EventInput `protobuf:"bytes,3,opt,name=event,proto3,oneof"`
 }
 
 func (*QueryInput_AudioConfig) isQueryInput_Input() {}
-func (*QueryInput_Text) isQueryInput_Input()        {}
-func (*QueryInput_Event) isQueryInput_Input()       {}
+
+func (*QueryInput_Text) isQueryInput_Input() {}
+
+func (*QueryInput_Event) isQueryInput_Input() {}
 
 func (m *QueryInput) GetInput() isQueryInput_Input {
 	if m != nil {
@@ -434,17 +650,17 @@ func _QueryInput_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Input.(type) {
 	case *QueryInput_AudioConfig:
 		s := proto.Size(x.AudioConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *QueryInput_Text:
 		s := proto.Size(x.Text)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *QueryInput_Event:
 		s := proto.Size(x.Event)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -463,62 +679,92 @@ type QueryResult struct {
 	//   contains the speech recognition result. If speech recognizer produced
 	//   multiple alternatives, a particular one is picked.
 	// - If an event was provided as input, `query_text` is not set.
-	QueryText string `protobuf:"bytes,1,opt,name=query_text,json=queryText" json:"query_text,omitempty"`
+	QueryText string `protobuf:"bytes,1,opt,name=query_text,json=queryText,proto3" json:"query_text,omitempty"`
 	// The language that was triggered during intent detection.
 	// See [Language Support](https://dialogflow.com/docs/reference/language)
 	// for a list of the currently supported language codes.
-	LanguageCode string `protobuf:"bytes,15,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,15,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// The Speech recognition confidence between 0.0 and 1.0. A higher number
 	// indicates an estimated greater likelihood that the recognized words are
 	// correct. The default of 0.0 is a sentinel value indicating that confidence
 	// was not set.
 	//
-	// You should not rely on this field as it isn't guaranteed to be accurate, or
-	// even set. In particular this field isn't set in Webhook calls and for
-	// StreamingDetectIntent since the streaming endpoint has separate confidence
-	// estimates per portion of the audio in StreamingRecognitionResult.
-	SpeechRecognitionConfidence float32 `protobuf:"fixed32,2,opt,name=speech_recognition_confidence,json=speechRecognitionConfidence" json:"speech_recognition_confidence,omitempty"`
+	// This field is not guaranteed to be accurate or set. In particular this
+	// field isn't set for StreamingDetectIntent since the streaming endpoint has
+	// separate confidence estimates per portion of the audio in
+	// StreamingRecognitionResult.
+	SpeechRecognitionConfidence float32 `protobuf:"fixed32,2,opt,name=speech_recognition_confidence,json=speechRecognitionConfidence,proto3" json:"speech_recognition_confidence,omitempty"`
 	// The action name from the matched intent.
-	Action string `protobuf:"bytes,3,opt,name=action" json:"action,omitempty"`
+	Action string `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"`
 	// The collection of extracted parameters.
-	Parameters *google_protobuf4.Struct `protobuf:"bytes,4,opt,name=parameters" json:"parameters,omitempty"`
+	Parameters *_struct.Struct `protobuf:"bytes,4,opt,name=parameters,proto3" json:"parameters,omitempty"`
 	// This field is set to:
 	// - `false` if the matched intent has required parameters and not all of
 	//    the required parameter values have been collected.
 	// - `true` if all required parameter values have been collected, or if the
 	//    matched intent doesn't contain any required parameters.
-	AllRequiredParamsPresent bool `protobuf:"varint,5,opt,name=all_required_params_present,json=allRequiredParamsPresent" json:"all_required_params_present,omitempty"`
+	AllRequiredParamsPresent bool `protobuf:"varint,5,opt,name=all_required_params_present,json=allRequiredParamsPresent,proto3" json:"all_required_params_present,omitempty"`
 	// The text to be pronounced to the user or shown on the screen.
-	FulfillmentText string `protobuf:"bytes,6,opt,name=fulfillment_text,json=fulfillmentText" json:"fulfillment_text,omitempty"`
+	FulfillmentText string `protobuf:"bytes,6,opt,name=fulfillment_text,json=fulfillmentText,proto3" json:"fulfillment_text,omitempty"`
 	// The collection of rich messages to present to the user.
-	FulfillmentMessages []*Intent_Message `protobuf:"bytes,7,rep,name=fulfillment_messages,json=fulfillmentMessages" json:"fulfillment_messages,omitempty"`
+	FulfillmentMessages []*Intent_Message `protobuf:"bytes,7,rep,name=fulfillment_messages,json=fulfillmentMessages,proto3" json:"fulfillment_messages,omitempty"`
 	// If the query was fulfilled by a webhook call, this field is set to the
 	// value of the `source` field returned in the webhook response.
-	WebhookSource string `protobuf:"bytes,8,opt,name=webhook_source,json=webhookSource" json:"webhook_source,omitempty"`
+	WebhookSource string `protobuf:"bytes,8,opt,name=webhook_source,json=webhookSource,proto3" json:"webhook_source,omitempty"`
 	// If the query was fulfilled by a webhook call, this field is set to the
 	// value of the `payload` field returned in the webhook response.
-	WebhookPayload *google_protobuf4.Struct `protobuf:"bytes,9,opt,name=webhook_payload,json=webhookPayload" json:"webhook_payload,omitempty"`
+	WebhookPayload *_struct.Struct `protobuf:"bytes,9,opt,name=webhook_payload,json=webhookPayload,proto3" json:"webhook_payload,omitempty"`
 	// The collection of output contexts. If applicable,
 	// `output_contexts.parameters` contains entries with name
 	// `<parameter name>.original` containing the original parameter values
 	// before the query.
-	OutputContexts []*Context `protobuf:"bytes,10,rep,name=output_contexts,json=outputContexts" json:"output_contexts,omitempty"`
+	OutputContexts []*Context `protobuf:"bytes,10,rep,name=output_contexts,json=outputContexts,proto3" json:"output_contexts,omitempty"`
 	// The intent that matched the conversational query. Some, not
 	// all fields are filled in this message, including but not limited to:
 	// `name`, `display_name` and `webhook_state`.
-	Intent *Intent `protobuf:"bytes,11,opt,name=intent" json:"intent,omitempty"`
+	Intent *Intent `protobuf:"bytes,11,opt,name=intent,proto3" json:"intent,omitempty"`
 	// The intent detection confidence. Values range from 0.0
 	// (completely uncertain) to 1.0 (completely certain).
-	IntentDetectionConfidence float32 `protobuf:"fixed32,12,opt,name=intent_detection_confidence,json=intentDetectionConfidence" json:"intent_detection_confidence,omitempty"`
+	// If there are `multiple knowledge_answers` messages, this value is set to
+	// the greatest `knowledgeAnswers.match_confidence` value in the list.
+	IntentDetectionConfidence float32 `protobuf:"fixed32,12,opt,name=intent_detection_confidence,json=intentDetectionConfidence,proto3" json:"intent_detection_confidence,omitempty"`
 	// The free-form diagnostic info. For example, this field
 	// could contain webhook call latency.
-	DiagnosticInfo *google_protobuf4.Struct `protobuf:"bytes,14,opt,name=diagnostic_info,json=diagnosticInfo" json:"diagnostic_info,omitempty"`
+	DiagnosticInfo *_struct.Struct `protobuf:"bytes,14,opt,name=diagnostic_info,json=diagnosticInfo,proto3" json:"diagnostic_info,omitempty"`
+	// The sentiment analysis result, which depends on the
+	// `sentiment_analysis_request_config` specified in the request.
+	SentimentAnalysisResult *SentimentAnalysisResult `protobuf:"bytes,17,opt,name=sentiment_analysis_result,json=sentimentAnalysisResult,proto3" json:"sentiment_analysis_result,omitempty"`
+	// The result from Knowledge Connector (if any), ordered by decreasing
+	// `KnowledgeAnswers.match_confidence`.
+	KnowledgeAnswers     *KnowledgeAnswers `protobuf:"bytes,18,opt,name=knowledge_answers,json=knowledgeAnswers,proto3" json:"knowledge_answers,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *QueryResult) Reset()         { *m = QueryResult{} }
+func (m *QueryResult) String() string { return proto.CompactTextString(m) }
+func (*QueryResult) ProtoMessage()    {}
+func (*QueryResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{4}
+}
+func (m *QueryResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryResult.Unmarshal(m, b)
+}
+func (m *QueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryResult.Marshal(b, m, deterministic)
+}
+func (dst *QueryResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResult.Merge(dst, src)
+}
+func (m *QueryResult) XXX_Size() int {
+	return xxx_messageInfo_QueryResult.Size(m)
+}
+func (m *QueryResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryResult.DiscardUnknown(m)
 }
 
-func (m *QueryResult) Reset()                    { *m = QueryResult{} }
-func (m *QueryResult) String() string            { return proto.CompactTextString(m) }
-func (*QueryResult) ProtoMessage()               {}
-func (*QueryResult) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
+var xxx_messageInfo_QueryResult proto.InternalMessageInfo
 
 func (m *QueryResult) GetQueryText() string {
 	if m != nil {
@@ -548,7 +794,7 @@ func (m *QueryResult) GetAction() string {
 	return ""
 }
 
-func (m *QueryResult) GetParameters() *google_protobuf4.Struct {
+func (m *QueryResult) GetParameters() *_struct.Struct {
 	if m != nil {
 		return m.Parameters
 	}
@@ -583,7 +829,7 @@ func (m *QueryResult) GetWebhookSource() string {
 	return ""
 }
 
-func (m *QueryResult) GetWebhookPayload() *google_protobuf4.Struct {
+func (m *QueryResult) GetWebhookPayload() *_struct.Struct {
 	if m != nil {
 		return m.WebhookPayload
 	}
@@ -611,21 +857,168 @@ func (m *QueryResult) GetIntentDetectionConfidence() float32 {
 	return 0
 }
 
-func (m *QueryResult) GetDiagnosticInfo() *google_protobuf4.Struct {
+func (m *QueryResult) GetDiagnosticInfo() *_struct.Struct {
 	if m != nil {
 		return m.DiagnosticInfo
 	}
 	return nil
 }
 
+func (m *QueryResult) GetSentimentAnalysisResult() *SentimentAnalysisResult {
+	if m != nil {
+		return m.SentimentAnalysisResult
+	}
+	return nil
+}
+
+func (m *QueryResult) GetKnowledgeAnswers() *KnowledgeAnswers {
+	if m != nil {
+		return m.KnowledgeAnswers
+	}
+	return nil
+}
+
+// Represents the result of querying a Knowledge base.
+type KnowledgeAnswers struct {
+	// A list of answers from Knowledge Connector.
+	Answers              []*KnowledgeAnswers_Answer `protobuf:"bytes,1,rep,name=answers,proto3" json:"answers,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *KnowledgeAnswers) Reset()         { *m = KnowledgeAnswers{} }
+func (m *KnowledgeAnswers) String() string { return proto.CompactTextString(m) }
+func (*KnowledgeAnswers) ProtoMessage()    {}
+func (*KnowledgeAnswers) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{5}
+}
+func (m *KnowledgeAnswers) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KnowledgeAnswers.Unmarshal(m, b)
+}
+func (m *KnowledgeAnswers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KnowledgeAnswers.Marshal(b, m, deterministic)
+}
+func (dst *KnowledgeAnswers) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnowledgeAnswers.Merge(dst, src)
+}
+func (m *KnowledgeAnswers) XXX_Size() int {
+	return xxx_messageInfo_KnowledgeAnswers.Size(m)
+}
+func (m *KnowledgeAnswers) XXX_DiscardUnknown() {
+	xxx_messageInfo_KnowledgeAnswers.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KnowledgeAnswers proto.InternalMessageInfo
+
+func (m *KnowledgeAnswers) GetAnswers() []*KnowledgeAnswers_Answer {
+	if m != nil {
+		return m.Answers
+	}
+	return nil
+}
+
+// An answer from Knowledge Connector.
+type KnowledgeAnswers_Answer struct {
+	// Indicates which Knowledge Document this answer was extracted from.
+	// Format: `projects/<Project ID>/knowledgeBases/<Knowledge Base
+	// ID>/documents/<Document ID>`.
+	Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"`
+	// The corresponding FAQ question if the answer was extracted from a FAQ
+	// Document, empty otherwise.
+	FaqQuestion string `protobuf:"bytes,2,opt,name=faq_question,json=faqQuestion,proto3" json:"faq_question,omitempty"`
+	// The piece of text from the `source` knowledge base document that answers
+	// this conversational query.
+	Answer string `protobuf:"bytes,3,opt,name=answer,proto3" json:"answer,omitempty"`
+	// The system's confidence level that this knowledge answer is a good match
+	// for this conversational query.
+	// NOTE: The confidence level for a given `<query, answer>` pair may change
+	// without notice, as it depends on models that are constantly being
+	// improved. However, it will change less frequently than the confidence
+	// score below, and should be preferred for referencing the quality of an
+	// answer.
+	MatchConfidenceLevel KnowledgeAnswers_Answer_MatchConfidenceLevel `protobuf:"varint,4,opt,name=match_confidence_level,json=matchConfidenceLevel,proto3,enum=google.cloud.dialogflow.v2beta1.KnowledgeAnswers_Answer_MatchConfidenceLevel" json:"match_confidence_level,omitempty"`
+	// The system's confidence score that this Knowledge answer is a good match
+	// for this converstational query, range from 0.0 (completely uncertain)
+	// to 1.0 (completely certain).
+	// Note: The confidence score is likely to vary somewhat (possibly even for
+	// identical requests), as the underlying model is under constant
+	// improvement, we may deprecate it in the future. We recommend using
+	// `match_confidence_level` which should be generally more stable.
+	MatchConfidence      float32  `protobuf:"fixed32,5,opt,name=match_confidence,json=matchConfidence,proto3" json:"match_confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KnowledgeAnswers_Answer) Reset()         { *m = KnowledgeAnswers_Answer{} }
+func (m *KnowledgeAnswers_Answer) String() string { return proto.CompactTextString(m) }
+func (*KnowledgeAnswers_Answer) ProtoMessage()    {}
+func (*KnowledgeAnswers_Answer) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{5, 0}
+}
+func (m *KnowledgeAnswers_Answer) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KnowledgeAnswers_Answer.Unmarshal(m, b)
+}
+func (m *KnowledgeAnswers_Answer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KnowledgeAnswers_Answer.Marshal(b, m, deterministic)
+}
+func (dst *KnowledgeAnswers_Answer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KnowledgeAnswers_Answer.Merge(dst, src)
+}
+func (m *KnowledgeAnswers_Answer) XXX_Size() int {
+	return xxx_messageInfo_KnowledgeAnswers_Answer.Size(m)
+}
+func (m *KnowledgeAnswers_Answer) XXX_DiscardUnknown() {
+	xxx_messageInfo_KnowledgeAnswers_Answer.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KnowledgeAnswers_Answer proto.InternalMessageInfo
+
+func (m *KnowledgeAnswers_Answer) GetSource() string {
+	if m != nil {
+		return m.Source
+	}
+	return ""
+}
+
+func (m *KnowledgeAnswers_Answer) GetFaqQuestion() string {
+	if m != nil {
+		return m.FaqQuestion
+	}
+	return ""
+}
+
+func (m *KnowledgeAnswers_Answer) GetAnswer() string {
+	if m != nil {
+		return m.Answer
+	}
+	return ""
+}
+
+func (m *KnowledgeAnswers_Answer) GetMatchConfidenceLevel() KnowledgeAnswers_Answer_MatchConfidenceLevel {
+	if m != nil {
+		return m.MatchConfidenceLevel
+	}
+	return KnowledgeAnswers_Answer_MATCH_CONFIDENCE_LEVEL_UNSPECIFIED
+}
+
+func (m *KnowledgeAnswers_Answer) GetMatchConfidence() float32 {
+	if m != nil {
+		return m.MatchConfidence
+	}
+	return 0
+}
+
 // The top-level message sent by the client to the
 // `StreamingDetectIntent` method.
 //
 // Multiple request messages should be sent in order:
 //
 // 1.  The first message must contain `session`, `query_input` plus optionally
-//     `query_params` and/or `single_utterance`. The message must not contain
-//     `input_audio`.
+//     `query_params` and/or `single_utterance`. If the client wants to receive
+//     an audio response, it should also contain `output_audio_config`.
+//     The message must not contain `input_audio`.
 //
 // 2.  If `query_input` was set to a streaming input audio config,
 //     all subsequent messages must contain only `input_audio`.
@@ -633,13 +1026,17 @@ func (m *QueryResult) GetDiagnosticInfo() *google_protobuf4.Struct {
 type StreamingDetectIntentRequest struct {
 	// Required. The name of the session the query is sent to.
 	// Format of the session name:
-	// `projects/<Project ID>/agent/sessions/<Session ID>`.
-	// It’s up to the API caller to choose an appropriate <Session ID>. It can be
-	// a random number or some type of user identifier (preferably hashed).
-	// The length of the session ID must not exceed 36 characters.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	// `projects/<Project ID>/agent/sessions/<Session ID>`, or
+	// `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
+	// ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume
+	// default 'draft' environment. If `User ID` is not specified, we are using
+	// "-". It’s up to the API caller to choose an appropriate `Session ID` and
+	// `User Id`. They can be a random numbers or some type of user and session
+	// identifiers (preferably hashed). The length of the `Session ID` and
+	// `User ID` must not exceed 36 characters.
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// Optional. The parameters of this query.
-	QueryParams *QueryParameters `protobuf:"bytes,2,opt,name=query_params,json=queryParams" json:"query_params,omitempty"`
+	QueryParams *QueryParameters `protobuf:"bytes,2,opt,name=query_params,json=queryParams,proto3" json:"query_params,omitempty"`
 	// Required. The input specification. It can be set to:
 	//
 	// 1.  an audio config which instructs the speech recognizer how to process
@@ -648,22 +1045,52 @@ type StreamingDetectIntentRequest struct {
 	// 2.  a conversational query in the form of text, or
 	//
 	// 3.  an event that specifies which intent to trigger.
-	QueryInput *QueryInput `protobuf:"bytes,3,opt,name=query_input,json=queryInput" json:"query_input,omitempty"`
-	// Optional. If `true`, the recognizer will detect a single spoken utterance
-	// in input audio. When it detects that the user has paused or stopped
-	// speaking, it will cease recognition. This setting is ignored when
-	// `query_input` is a piece of text or an event.
-	SingleUtterance bool `protobuf:"varint,4,opt,name=single_utterance,json=singleUtterance" json:"single_utterance,omitempty"`
+	QueryInput *QueryInput `protobuf:"bytes,3,opt,name=query_input,json=queryInput,proto3" json:"query_input,omitempty"`
+	// Optional. If `false` (default), recognition does not cease until the
+	// client closes the stream.
+	// If `true`, the recognizer will detect a single spoken utterance in input
+	// audio. Recognition ceases when it detects the audio's voice has
+	// stopped or paused. In this case, once a detected intent is received, the
+	// client should close the stream and start a new request with a new stream as
+	// needed.
+	// This setting is ignored when `query_input` is a piece of text or an event.
+	SingleUtterance bool `protobuf:"varint,4,opt,name=single_utterance,json=singleUtterance,proto3" json:"single_utterance,omitempty"`
+	// Optional. Instructs the speech synthesizer how to generate the output
+	// audio. If this field is not set and agent-level speech synthesizer is not
+	// configured, no output audio is generated.
+	OutputAudioConfig *OutputAudioConfig `protobuf:"bytes,5,opt,name=output_audio_config,json=outputAudioConfig,proto3" json:"output_audio_config,omitempty"`
 	// Optional. The input audio content to be recognized. Must be sent if
 	// `query_input` was set to a streaming input audio config. The complete audio
 	// over all streaming messages must not exceed 1 minute.
-	InputAudio []byte `protobuf:"bytes,6,opt,name=input_audio,json=inputAudio,proto3" json:"input_audio,omitempty"`
+	InputAudio           []byte   `protobuf:"bytes,6,opt,name=input_audio,json=inputAudio,proto3" json:"input_audio,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingDetectIntentRequest) Reset()         { *m = StreamingDetectIntentRequest{} }
+func (m *StreamingDetectIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingDetectIntentRequest) ProtoMessage()    {}
+func (*StreamingDetectIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{6}
+}
+func (m *StreamingDetectIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingDetectIntentRequest.Unmarshal(m, b)
+}
+func (m *StreamingDetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingDetectIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingDetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingDetectIntentRequest.Merge(dst, src)
+}
+func (m *StreamingDetectIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingDetectIntentRequest.Size(m)
+}
+func (m *StreamingDetectIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingDetectIntentRequest.DiscardUnknown(m)
 }
 
-func (m *StreamingDetectIntentRequest) Reset()                    { *m = StreamingDetectIntentRequest{} }
-func (m *StreamingDetectIntentRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingDetectIntentRequest) ProtoMessage()               {}
-func (*StreamingDetectIntentRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
+var xxx_messageInfo_StreamingDetectIntentRequest proto.InternalMessageInfo
 
 func (m *StreamingDetectIntentRequest) GetSession() string {
 	if m != nil {
@@ -693,6 +1120,13 @@ func (m *StreamingDetectIntentRequest) GetSingleUtterance() bool {
 	return false
 }
 
+func (m *StreamingDetectIntentRequest) GetOutputAudioConfig() *OutputAudioConfig {
+	if m != nil {
+		return m.OutputAudioConfig
+	}
+	return nil
+}
+
 func (m *StreamingDetectIntentRequest) GetInputAudio() []byte {
 	if m != nil {
 		return m.InputAudio
@@ -710,24 +1144,67 @@ func (m *StreamingDetectIntentRequest) GetInputAudio() []byte {
 //     complete transcript of what the user said. The last `recognition_result`
 //     has `is_final` set to `true`.
 //
-// 2.  The next message contains `response_id`, `query_result`
-//     and optionally `webhook_status` if a WebHook was called.
+// 2.  The next message contains `response_id`, `query_result`,
+//     `alternative_query_results` and optionally `webhook_status` if a WebHook
+//     was called.
+//
+// 3.  If `output_audio_config` was specified in the request or agent-level
+//     speech synthesizer is configured, all subsequent messages contain
+//     `output_audio` and `output_audio_config`.
 type StreamingDetectIntentResponse struct {
 	// The unique identifier of the response. It can be used to
 	// locate a response in the training example set or for reporting issues.
-	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId" json:"response_id,omitempty"`
+	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId,proto3" json:"response_id,omitempty"`
 	// The result of speech recognition.
-	RecognitionResult *StreamingRecognitionResult `protobuf:"bytes,2,opt,name=recognition_result,json=recognitionResult" json:"recognition_result,omitempty"`
-	// The result of the conversational query or event processing.
-	QueryResult *QueryResult `protobuf:"bytes,3,opt,name=query_result,json=queryResult" json:"query_result,omitempty"`
+	RecognitionResult *StreamingRecognitionResult `protobuf:"bytes,2,opt,name=recognition_result,json=recognitionResult,proto3" json:"recognition_result,omitempty"`
+	// The selected results of the conversational query or event processing.
+	// See `alternative_query_results` for additional potential results.
+	QueryResult *QueryResult `protobuf:"bytes,3,opt,name=query_result,json=queryResult,proto3" json:"query_result,omitempty"`
+	// If Knowledge Connectors are enabled, there could be more than one result
+	// returned for a given query or event, and this field will contain all
+	// results except for the top one, which is captured in query_result. The
+	// alternative results are ordered by decreasing
+	// `QueryResult.intent_detection_confidence`. If Knowledge Connectors are
+	// disabled, this field will be empty until multiple responses for regular
+	// intents are supported, at which point those additional results will be
+	// surfaced here.
+	AlternativeQueryResults []*QueryResult `protobuf:"bytes,7,rep,name=alternative_query_results,json=alternativeQueryResults,proto3" json:"alternative_query_results,omitempty"`
 	// Specifies the status of the webhook request.
-	WebhookStatus *google_rpc.Status `protobuf:"bytes,4,opt,name=webhook_status,json=webhookStatus" json:"webhook_status,omitempty"`
+	WebhookStatus *status.Status `protobuf:"bytes,4,opt,name=webhook_status,json=webhookStatus,proto3" json:"webhook_status,omitempty"`
+	// The audio data bytes encoded as specified in the request.
+	OutputAudio []byte `protobuf:"bytes,5,opt,name=output_audio,json=outputAudio,proto3" json:"output_audio,omitempty"`
+	// Instructs the speech synthesizer how to generate the output audio. This
+	// field is populated from the agent-level speech synthesizer configuration,
+	// if enabled.
+	OutputAudioConfig    *OutputAudioConfig `protobuf:"bytes,6,opt,name=output_audio_config,json=outputAudioConfig,proto3" json:"output_audio_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *StreamingDetectIntentResponse) Reset()         { *m = StreamingDetectIntentResponse{} }
+func (m *StreamingDetectIntentResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingDetectIntentResponse) ProtoMessage()    {}
+func (*StreamingDetectIntentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{7}
+}
+func (m *StreamingDetectIntentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingDetectIntentResponse.Unmarshal(m, b)
+}
+func (m *StreamingDetectIntentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingDetectIntentResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingDetectIntentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingDetectIntentResponse.Merge(dst, src)
+}
+func (m *StreamingDetectIntentResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingDetectIntentResponse.Size(m)
+}
+func (m *StreamingDetectIntentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingDetectIntentResponse.DiscardUnknown(m)
 }
 
-func (m *StreamingDetectIntentResponse) Reset()                    { *m = StreamingDetectIntentResponse{} }
-func (m *StreamingDetectIntentResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingDetectIntentResponse) ProtoMessage()               {}
-func (*StreamingDetectIntentResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
+var xxx_messageInfo_StreamingDetectIntentResponse proto.InternalMessageInfo
 
 func (m *StreamingDetectIntentResponse) GetResponseId() string {
 	if m != nil {
@@ -750,13 +1227,34 @@ func (m *StreamingDetectIntentResponse) GetQueryResult() *QueryResult {
 	return nil
 }
 
-func (m *StreamingDetectIntentResponse) GetWebhookStatus() *google_rpc.Status {
+func (m *StreamingDetectIntentResponse) GetAlternativeQueryResults() []*QueryResult {
+	if m != nil {
+		return m.AlternativeQueryResults
+	}
+	return nil
+}
+
+func (m *StreamingDetectIntentResponse) GetWebhookStatus() *status.Status {
 	if m != nil {
 		return m.WebhookStatus
 	}
 	return nil
 }
 
+func (m *StreamingDetectIntentResponse) GetOutputAudio() []byte {
+	if m != nil {
+		return m.OutputAudio
+	}
+	return nil
+}
+
+func (m *StreamingDetectIntentResponse) GetOutputAudioConfig() *OutputAudioConfig {
+	if m != nil {
+		return m.OutputAudioConfig
+	}
+	return nil
+}
+
 // Contains a speech recognition result corresponding to a portion of the audio
 // that is currently being processed or an indication that this is the end
 // of the single requested utterance.
@@ -792,16 +1290,16 @@ func (m *StreamingDetectIntentResponse) GetWebhookStatus() *google_rpc.Status {
 // *  for `MESSAGE_TYPE_END_OF_SINGLE_UTTERANCE`: only `event_type`.
 type StreamingRecognitionResult struct {
 	// Type of the result message.
-	MessageType StreamingRecognitionResult_MessageType `protobuf:"varint,1,opt,name=message_type,json=messageType,enum=google.cloud.dialogflow.v2beta1.StreamingRecognitionResult_MessageType" json:"message_type,omitempty"`
+	MessageType StreamingRecognitionResult_MessageType `protobuf:"varint,1,opt,name=message_type,json=messageType,proto3,enum=google.cloud.dialogflow.v2beta1.StreamingRecognitionResult_MessageType" json:"message_type,omitempty"`
 	// Transcript text representing the words that the user spoke.
 	// Populated if and only if `event_type` = `RECOGNITION_EVENT_TRANSCRIPT`.
-	Transcript string `protobuf:"bytes,2,opt,name=transcript" json:"transcript,omitempty"`
+	Transcript string `protobuf:"bytes,2,opt,name=transcript,proto3" json:"transcript,omitempty"`
 	// The default of 0.0 is a sentinel value indicating `confidence` was not set.
 	// If `false`, the `StreamingRecognitionResult` represents an
 	// interim result that may change. If `true`, the recognizer will not return
 	// any further hypotheses about this piece of the audio. May only be populated
 	// for `event_type` = `RECOGNITION_EVENT_TRANSCRIPT`.
-	IsFinal bool `protobuf:"varint,3,opt,name=is_final,json=isFinal" json:"is_final,omitempty"`
+	IsFinal bool `protobuf:"varint,3,opt,name=is_final,json=isFinal,proto3" json:"is_final,omitempty"`
 	// The Speech confidence between 0.0 and 1.0 for the current portion of audio.
 	// A higher number indicates an estimated greater likelihood that the
 	// recognized words are correct. The default of 0.0 is a sentinel value
@@ -809,13 +1307,35 @@ type StreamingRecognitionResult struct {
 	//
 	// This field is typically only provided if `is_final` is true and you should
 	// not rely on it being accurate or even set.
-	Confidence float32 `protobuf:"fixed32,4,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StreamingRecognitionResult) Reset()                    { *m = StreamingRecognitionResult{} }
-func (m *StreamingRecognitionResult) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognitionResult) ProtoMessage()               {}
-func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{7} }
+func (m *StreamingRecognitionResult) Reset()         { *m = StreamingRecognitionResult{} }
+func (m *StreamingRecognitionResult) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognitionResult) ProtoMessage()    {}
+func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{8}
+}
+func (m *StreamingRecognitionResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognitionResult.Unmarshal(m, b)
+}
+func (m *StreamingRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognitionResult.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionResult.Merge(dst, src)
+}
+func (m *StreamingRecognitionResult) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognitionResult.Size(m)
+}
+func (m *StreamingRecognitionResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognitionResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingRecognitionResult proto.InternalMessageInfo
 
 func (m *StreamingRecognitionResult) GetMessageType() StreamingRecognitionResult_MessageType {
 	if m != nil {
@@ -848,28 +1368,66 @@ func (m *StreamingRecognitionResult) GetConfidence() float32 {
 // Instructs the speech recognizer how to process the audio content.
 type InputAudioConfig struct {
 	// Required. Audio encoding of the audio content to process.
-	AudioEncoding AudioEncoding `protobuf:"varint,1,opt,name=audio_encoding,json=audioEncoding,enum=google.cloud.dialogflow.v2beta1.AudioEncoding" json:"audio_encoding,omitempty"`
+	AudioEncoding AudioEncoding `protobuf:"varint,1,opt,name=audio_encoding,json=audioEncoding,proto3,enum=google.cloud.dialogflow.v2beta1.AudioEncoding" json:"audio_encoding,omitempty"`
 	// Required. Sample rate (in Hertz) of the audio content sent in the query.
-	// Refer to [Cloud Speech API documentation](/speech/docs/basics) for more
-	// details.
-	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz" json:"sample_rate_hertz,omitempty"`
+	// Refer to
+	// [Cloud Speech API
+	// documentation](https://cloud.google.com/speech-to-text/docs/basics) for
+	// more details.
+	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
 	// Required. The language of the supplied audio. Dialogflow does not do
 	// translations. See [Language
 	// Support](https://dialogflow.com/docs/languages) for a list of the
 	// currently supported language codes. Note that queries in the same session
 	// do not necessarily need to specify the same language.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The collection of phrase hints which are used to boost accuracy
 	// of speech recognition.
-	// Refer to [Cloud Speech API documentation](/speech/docs/basics#phrase-hints)
+	// Refer to
+	// [Cloud Speech API
+	// documentation](https://cloud.google.com/speech-to-text/docs/basics#phrase-hints)
+	// for more details.
+	PhraseHints []string `protobuf:"bytes,4,rep,name=phrase_hints,json=phraseHints,proto3" json:"phrase_hints,omitempty"`
+	// Optional. Which Speech model to select for the given request. Select the
+	// model best suited to your domain to get best results. If a model is not
+	// explicitly specified, then we auto-select a model based on the parameters
+	// in the InputAudioConfig.
+	// If enhanced speech model is enabled for the agent and an enhanced
+	// version of the specified model for the language does not exist, then the
+	// speech is recognized using the standard version of the specified model.
+	// Refer to
+	// [Cloud Speech API
+	// documentation](https://cloud.google.com/speech-to-text/docs/basics#select-model)
 	// for more details.
-	PhraseHints []string `protobuf:"bytes,4,rep,name=phrase_hints,json=phraseHints" json:"phrase_hints,omitempty"`
+	Model                string   `protobuf:"bytes,7,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *InputAudioConfig) Reset()                    { *m = InputAudioConfig{} }
-func (m *InputAudioConfig) String() string            { return proto.CompactTextString(m) }
-func (*InputAudioConfig) ProtoMessage()               {}
-func (*InputAudioConfig) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{8} }
+func (m *InputAudioConfig) Reset()         { *m = InputAudioConfig{} }
+func (m *InputAudioConfig) String() string { return proto.CompactTextString(m) }
+func (*InputAudioConfig) ProtoMessage()    {}
+func (*InputAudioConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{9}
+}
+func (m *InputAudioConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InputAudioConfig.Unmarshal(m, b)
+}
+func (m *InputAudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InputAudioConfig.Marshal(b, m, deterministic)
+}
+func (dst *InputAudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputAudioConfig.Merge(dst, src)
+}
+func (m *InputAudioConfig) XXX_Size() int {
+	return xxx_messageInfo_InputAudioConfig.Size(m)
+}
+func (m *InputAudioConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InputAudioConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InputAudioConfig proto.InternalMessageInfo
 
 func (m *InputAudioConfig) GetAudioEncoding() AudioEncoding {
 	if m != nil {
@@ -899,22 +1457,51 @@ func (m *InputAudioConfig) GetPhraseHints() []string {
 	return nil
 }
 
+func (m *InputAudioConfig) GetModel() string {
+	if m != nil {
+		return m.Model
+	}
+	return ""
+}
+
 // Represents the natural language text to be processed.
 type TextInput struct {
 	// Required. The UTF-8 encoded natural language text to be processed.
 	// Text length must not exceed 256 bytes.
-	Text string `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// Required. The language of this conversational query. See [Language
 	// Support](https://dialogflow.com/docs/languages) for a list of the
 	// currently supported language codes. Note that queries in the same session
 	// do not necessarily need to specify the same language.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextInput) Reset()         { *m = TextInput{} }
+func (m *TextInput) String() string { return proto.CompactTextString(m) }
+func (*TextInput) ProtoMessage()    {}
+func (*TextInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{10}
+}
+func (m *TextInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextInput.Unmarshal(m, b)
+}
+func (m *TextInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextInput.Marshal(b, m, deterministic)
+}
+func (dst *TextInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextInput.Merge(dst, src)
+}
+func (m *TextInput) XXX_Size() int {
+	return xxx_messageInfo_TextInput.Size(m)
+}
+func (m *TextInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextInput.DiscardUnknown(m)
 }
 
-func (m *TextInput) Reset()                    { *m = TextInput{} }
-func (m *TextInput) String() string            { return proto.CompactTextString(m) }
-func (*TextInput) ProtoMessage()               {}
-func (*TextInput) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{9} }
+var xxx_messageInfo_TextInput proto.InternalMessageInfo
 
 func (m *TextInput) GetText() string {
 	if m != nil {
@@ -937,20 +1524,42 @@ func (m *TextInput) GetLanguageCode() string {
 // `“Hello #welcome_event.name! What can I do for you today?”`.
 type EventInput struct {
 	// Required. The unique identifier of the event.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The collection of parameters associated with the event.
-	Parameters *google_protobuf4.Struct `protobuf:"bytes,2,opt,name=parameters" json:"parameters,omitempty"`
+	Parameters *_struct.Struct `protobuf:"bytes,2,opt,name=parameters,proto3" json:"parameters,omitempty"`
 	// Required. The language of this query. See [Language
 	// Support](https://dialogflow.com/docs/languages) for a list of the
 	// currently supported language codes. Note that queries in the same session
 	// do not necessarily need to specify the same language.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EventInput) Reset()         { *m = EventInput{} }
+func (m *EventInput) String() string { return proto.CompactTextString(m) }
+func (*EventInput) ProtoMessage()    {}
+func (*EventInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{11}
+}
+func (m *EventInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EventInput.Unmarshal(m, b)
+}
+func (m *EventInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EventInput.Marshal(b, m, deterministic)
+}
+func (dst *EventInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventInput.Merge(dst, src)
+}
+func (m *EventInput) XXX_Size() int {
+	return xxx_messageInfo_EventInput.Size(m)
+}
+func (m *EventInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_EventInput.DiscardUnknown(m)
 }
 
-func (m *EventInput) Reset()                    { *m = EventInput{} }
-func (m *EventInput) String() string            { return proto.CompactTextString(m) }
-func (*EventInput) ProtoMessage()               {}
-func (*EventInput) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{10} }
+var xxx_messageInfo_EventInput proto.InternalMessageInfo
 
 func (m *EventInput) GetName() string {
 	if m != nil {
@@ -959,7 +1568,7 @@ func (m *EventInput) GetName() string {
 	return ""
 }
 
-func (m *EventInput) GetParameters() *google_protobuf4.Struct {
+func (m *EventInput) GetParameters() *_struct.Struct {
 	if m != nil {
 		return m.Parameters
 	}
@@ -973,19 +1582,160 @@ func (m *EventInput) GetLanguageCode() string {
 	return ""
 }
 
+// Configures the types of sentiment analysis to perform.
+type SentimentAnalysisRequestConfig struct {
+	// Optional. Instructs the service to perform sentiment analysis on
+	// `query_text`. If not provided, sentiment analysis is not performed on
+	// `query_text`.
+	AnalyzeQueryTextSentiment bool     `protobuf:"varint,1,opt,name=analyze_query_text_sentiment,json=analyzeQueryTextSentiment,proto3" json:"analyze_query_text_sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral      struct{} `json:"-"`
+	XXX_unrecognized          []byte   `json:"-"`
+	XXX_sizecache             int32    `json:"-"`
+}
+
+func (m *SentimentAnalysisRequestConfig) Reset()         { *m = SentimentAnalysisRequestConfig{} }
+func (m *SentimentAnalysisRequestConfig) String() string { return proto.CompactTextString(m) }
+func (*SentimentAnalysisRequestConfig) ProtoMessage()    {}
+func (*SentimentAnalysisRequestConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{12}
+}
+func (m *SentimentAnalysisRequestConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SentimentAnalysisRequestConfig.Unmarshal(m, b)
+}
+func (m *SentimentAnalysisRequestConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SentimentAnalysisRequestConfig.Marshal(b, m, deterministic)
+}
+func (dst *SentimentAnalysisRequestConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SentimentAnalysisRequestConfig.Merge(dst, src)
+}
+func (m *SentimentAnalysisRequestConfig) XXX_Size() int {
+	return xxx_messageInfo_SentimentAnalysisRequestConfig.Size(m)
+}
+func (m *SentimentAnalysisRequestConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_SentimentAnalysisRequestConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SentimentAnalysisRequestConfig proto.InternalMessageInfo
+
+func (m *SentimentAnalysisRequestConfig) GetAnalyzeQueryTextSentiment() bool {
+	if m != nil {
+		return m.AnalyzeQueryTextSentiment
+	}
+	return false
+}
+
+// The result of sentiment analysis as configured by
+// `sentiment_analysis_request_config`.
+type SentimentAnalysisResult struct {
+	// The sentiment analysis result for `query_text`.
+	QueryTextSentiment   *Sentiment `protobuf:"bytes,1,opt,name=query_text_sentiment,json=queryTextSentiment,proto3" json:"query_text_sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *SentimentAnalysisResult) Reset()         { *m = SentimentAnalysisResult{} }
+func (m *SentimentAnalysisResult) String() string { return proto.CompactTextString(m) }
+func (*SentimentAnalysisResult) ProtoMessage()    {}
+func (*SentimentAnalysisResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{13}
+}
+func (m *SentimentAnalysisResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SentimentAnalysisResult.Unmarshal(m, b)
+}
+func (m *SentimentAnalysisResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SentimentAnalysisResult.Marshal(b, m, deterministic)
+}
+func (dst *SentimentAnalysisResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SentimentAnalysisResult.Merge(dst, src)
+}
+func (m *SentimentAnalysisResult) XXX_Size() int {
+	return xxx_messageInfo_SentimentAnalysisResult.Size(m)
+}
+func (m *SentimentAnalysisResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_SentimentAnalysisResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SentimentAnalysisResult proto.InternalMessageInfo
+
+func (m *SentimentAnalysisResult) GetQueryTextSentiment() *Sentiment {
+	if m != nil {
+		return m.QueryTextSentiment
+	}
+	return nil
+}
+
+// The sentiment, such as positive/negative feeling or association, for a unit
+// of analysis, such as the query text.
+type Sentiment struct {
+	// Sentiment score between -1.0 (negative sentiment) and 1.0 (positive
+	// sentiment).
+	Score float32 `protobuf:"fixed32,1,opt,name=score,proto3" json:"score,omitempty"`
+	// A non-negative number in the [0, +inf) range, which represents the absolute
+	// magnitude of sentiment, regardless of score (positive or negative).
+	Magnitude            float32  `protobuf:"fixed32,2,opt,name=magnitude,proto3" json:"magnitude,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Sentiment) Reset()         { *m = Sentiment{} }
+func (m *Sentiment) String() string { return proto.CompactTextString(m) }
+func (*Sentiment) ProtoMessage()    {}
+func (*Sentiment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_251d19dfdf11847a, []int{14}
+}
+func (m *Sentiment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
+}
+func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
+}
+func (dst *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(dst, src)
+}
+func (m *Sentiment) XXX_Size() int {
+	return xxx_messageInfo_Sentiment.Size(m)
+}
+func (m *Sentiment) XXX_DiscardUnknown() {
+	xxx_messageInfo_Sentiment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Sentiment proto.InternalMessageInfo
+
+func (m *Sentiment) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *Sentiment) GetMagnitude() float32 {
+	if m != nil {
+		return m.Magnitude
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterType((*DetectIntentRequest)(nil), "google.cloud.dialogflow.v2beta1.DetectIntentRequest")
 	proto.RegisterType((*DetectIntentResponse)(nil), "google.cloud.dialogflow.v2beta1.DetectIntentResponse")
 	proto.RegisterType((*QueryParameters)(nil), "google.cloud.dialogflow.v2beta1.QueryParameters")
 	proto.RegisterType((*QueryInput)(nil), "google.cloud.dialogflow.v2beta1.QueryInput")
 	proto.RegisterType((*QueryResult)(nil), "google.cloud.dialogflow.v2beta1.QueryResult")
+	proto.RegisterType((*KnowledgeAnswers)(nil), "google.cloud.dialogflow.v2beta1.KnowledgeAnswers")
+	proto.RegisterType((*KnowledgeAnswers_Answer)(nil), "google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer")
 	proto.RegisterType((*StreamingDetectIntentRequest)(nil), "google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest")
 	proto.RegisterType((*StreamingDetectIntentResponse)(nil), "google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse")
 	proto.RegisterType((*StreamingRecognitionResult)(nil), "google.cloud.dialogflow.v2beta1.StreamingRecognitionResult")
 	proto.RegisterType((*InputAudioConfig)(nil), "google.cloud.dialogflow.v2beta1.InputAudioConfig")
 	proto.RegisterType((*TextInput)(nil), "google.cloud.dialogflow.v2beta1.TextInput")
 	proto.RegisterType((*EventInput)(nil), "google.cloud.dialogflow.v2beta1.EventInput")
+	proto.RegisterType((*SentimentAnalysisRequestConfig)(nil), "google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig")
+	proto.RegisterType((*SentimentAnalysisResult)(nil), "google.cloud.dialogflow.v2beta1.SentimentAnalysisResult")
+	proto.RegisterType((*Sentiment)(nil), "google.cloud.dialogflow.v2beta1.Sentiment")
 	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
+	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.KnowledgeAnswers_Answer_MatchConfidenceLevel", KnowledgeAnswers_Answer_MatchConfidenceLevel_name, KnowledgeAnswers_Answer_MatchConfidenceLevel_value)
 	proto.RegisterEnum("google.cloud.dialogflow.v2beta1.StreamingRecognitionResult_MessageType", StreamingRecognitionResult_MessageType_name, StreamingRecognitionResult_MessageType_value)
 }
 
@@ -997,8 +1747,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Sessions service
-
+// SessionsClient is the client API for Sessions service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SessionsClient interface {
 	// Processes a natural language query and returns structured, actionable data
 	// as a result. This method is not idempotent, because it may cause contexts
@@ -1021,7 +1772,7 @@ func NewSessionsClient(cc *grpc.ClientConn) SessionsClient {
 
 func (c *sessionsClient) DetectIntent(ctx context.Context, in *DetectIntentRequest, opts ...grpc.CallOption) (*DetectIntentResponse, error) {
 	out := new(DetectIntentResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Sessions/DetectIntent", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.Sessions/DetectIntent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1029,7 +1780,7 @@ func (c *sessionsClient) DetectIntent(ctx context.Context, in *DetectIntentReque
 }
 
 func (c *sessionsClient) StreamingDetectIntent(ctx context.Context, opts ...grpc.CallOption) (Sessions_StreamingDetectIntentClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Sessions_serviceDesc.Streams[0], c.cc, "/google.cloud.dialogflow.v2beta1.Sessions/StreamingDetectIntent", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Sessions_serviceDesc.Streams[0], "/google.cloud.dialogflow.v2beta1.Sessions/StreamingDetectIntent", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1059,8 +1810,7 @@ func (x *sessionsStreamingDetectIntentClient) Recv() (*StreamingDetectIntentResp
 	return m, nil
 }
 
-// Server API for Sessions service
-
+// SessionsServer is the server API for Sessions service.
 type SessionsServer interface {
 	// Processes a natural language query and returns structured, actionable data
 	// as a result. This method is not idempotent, because it may cause contexts
@@ -1141,107 +1891,141 @@ var _Sessions_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/dialogflow/v2beta1/session.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/dialogflow/v2beta1/session.proto", fileDescriptor4) }
-
-var fileDescriptor4 = []byte{
-	// 1580 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x3f, 0x73, 0x1b, 0xc7,
-	0x15, 0xd7, 0x81, 0xff, 0x1f, 0x40, 0x12, 0x5e, 0xc9, 0xd6, 0x89, 0x94, 0x2c, 0x05, 0x1e, 0x4f,
-	0x28, 0xc6, 0x01, 0x2c, 0x26, 0x71, 0xc6, 0xd6, 0xc8, 0x11, 0x08, 0x1c, 0x49, 0xcc, 0x80, 0x20,
-	0xbc, 0x00, 0x2d, 0xdb, 0xcd, 0xce, 0xf2, 0xb0, 0x38, 0x9e, 0x72, 0xd8, 0x3d, 0xde, 0x2e, 0x6c,
-	0xd3, 0x99, 0xa4, 0xc8, 0x57, 0x48, 0x97, 0x32, 0x4d, 0x66, 0xdc, 0xa6, 0x49, 0x93, 0xca, 0x1f,
-	0x21, 0x75, 0xba, 0x94, 0x49, 0x95, 0x14, 0x99, 0x49, 0x93, 0xb9, 0xdd, 0x3d, 0x00, 0x02, 0x29,
-	0x03, 0x4a, 0x52, 0xb9, 0xc3, 0xbe, 0xf7, 0x7b, 0x6f, 0xdf, 0x7b, 0xf7, 0x7b, 0xef, 0x2d, 0xe0,
-	0x87, 0x81, 0x10, 0x41, 0xc4, 0x2a, 0x7e, 0x24, 0x86, 0xbd, 0x4a, 0x2f, 0xa4, 0x91, 0x08, 0xfa,
-	0x91, 0xf8, 0xa2, 0xf2, 0xf9, 0xde, 0x19, 0x53, 0xf4, 0x51, 0x45, 0x32, 0x29, 0x43, 0xc1, 0xcb,
-	0x71, 0x22, 0x94, 0x40, 0xf7, 0x0d, 0xbc, 0xac, 0xe1, 0xe5, 0x31, 0xbc, 0x6c, 0xe1, 0x5b, 0x77,
-	0xad, 0x3f, 0x1a, 0x87, 0x15, 0xca, 0xb9, 0x50, 0x54, 0x85, 0x82, 0x4b, 0x63, 0xbe, 0x35, 0xf3,
-	0x36, 0x5f, 0x70, 0xc5, 0xbe, 0x54, 0x16, 0xfe, 0xce, 0x2c, 0x78, 0xc8, 0x15, 0xe3, 0x19, 0xfa,
-	0xfd, 0x39, 0x53, 0x21, 0x8c, 0xab, 0x50, 0x5d, 0x12, 0x75, 0x19, 0x33, 0x6b, 0x9a, 0x45, 0xad,
-	0x4f, 0x67, 0xc3, 0x7e, 0x45, 0xaa, 0x64, 0xe8, 0x67, 0x8e, 0x6f, 0x5b, 0x6d, 0x12, 0xfb, 0x15,
-	0xa9, 0xa8, 0x1a, 0x66, 0xe9, 0xb8, 0x56, 0x91, 0x7a, 0xaa, 0x44, 0x54, 0x45, 0x3c, 0x30, 0x9a,
-	0xd2, 0x3f, 0x1c, 0xb8, 0x59, 0x67, 0x8a, 0xf9, 0xaa, 0xa1, 0x43, 0xc4, 0xec, 0x62, 0xc8, 0xa4,
-	0x42, 0x2e, 0xac, 0xd8, 0x28, 0x5c, 0xe7, 0x81, 0xb3, 0xb3, 0x86, 0xb3, 0x23, 0xea, 0x40, 0xe1,
-	0x62, 0xc8, 0x92, 0x4b, 0x12, 0xd3, 0x84, 0x0e, 0xa4, 0x9b, 0x7b, 0xe0, 0xec, 0xe4, 0xf7, 0xde,
-	0x2d, 0xcf, 0x28, 0x78, 0xf9, 0xa3, 0xd4, 0xa8, 0x9d, 0xda, 0x30, 0xc5, 0x12, 0x89, 0xf3, 0x17,
-	0x23, 0x81, 0x44, 0x4d, 0x30, 0x47, 0x12, 0xf2, 0x78, 0xa8, 0xdc, 0x05, 0xed, 0xf3, 0x07, 0xf3,
-	0xf9, 0x6c, 0xa4, 0x26, 0x18, 0x2e, 0x46, 0xbf, 0xd1, 0x7d, 0xc8, 0x6b, 0x3f, 0x84, 0x0e, 0x7b,
-	0xa1, 0x70, 0x97, 0x1e, 0x38, 0x3b, 0x05, 0x0c, 0x5a, 0x54, 0x4d, 0x25, 0xa5, 0x6f, 0x1c, 0xb8,
-	0xf5, 0x62, 0xd6, 0x32, 0x16, 0x5c, 0xb2, 0xd4, 0x32, 0xb1, 0xbf, 0x49, 0xd8, 0xb3, 0xa9, 0x43,
-	0x26, 0x6a, 0xf4, 0xd0, 0x49, 0x96, 0x7d, 0xc2, 0xe4, 0x30, 0x52, 0x36, 0xfb, 0x77, 0xe6, 0x8b,
-	0x14, 0x6b, 0x1b, 0x9b, 0xb9, 0x39, 0xa0, 0xf7, 0x61, 0xe3, 0x0b, 0x76, 0x76, 0x2e, 0xc4, 0xcf,
-	0x89, 0xf9, 0x64, 0x36, 0x79, 0x94, 0xb9, 0x4c, 0x62, 0xbf, 0xdc, 0xd1, 0x1a, 0xbc, 0x6e, 0x91,
-	0xe6, 0x58, 0xfa, 0x5b, 0x0e, 0x36, 0xa7, 0xaa, 0x8a, 0xb6, 0x61, 0x4d, 0x85, 0x03, 0x46, 0xbe,
-	0x12, 0x9c, 0xd9, 0xf0, 0x57, 0x53, 0xc1, 0x67, 0x82, 0x33, 0xf4, 0x1e, 0x14, 0x02, 0x26, 0x48,
-	0x24, 0x7c, 0x4d, 0x76, 0x1b, 0xfc, 0xcd, 0xec, 0x26, 0xcd, 0xb3, 0x26, 0x55, 0x4d, 0x1e, 0xe0,
-	0x7c, 0xc0, 0x44, 0xd3, 0xe2, 0x50, 0x1d, 0x56, 0x2d, 0xdf, 0xd3, 0xe8, 0x16, 0x76, 0xf2, 0x7b,
-	0x3b, 0x33, 0x13, 0xae, 0x19, 0x03, 0x3c, 0xb2, 0x44, 0x6f, 0xc3, 0x46, 0xc2, 0x24, 0x53, 0x64,
-	0xe4, 0x6b, 0xf1, 0x81, 0xb3, 0xb3, 0x8a, 0xd7, 0xb5, 0xb4, 0x96, 0xc1, 0x7a, 0x70, 0xeb, 0x1a,
-	0xfe, 0x4b, 0x77, 0x49, 0x5f, 0xbc, 0x37, 0xf3, 0xe2, 0x8e, 0x31, 0xf6, 0xb4, 0x6d, 0xf7, 0x32,
-	0x66, 0x18, 0xc9, 0x69, 0x91, 0x44, 0x8f, 0x60, 0x25, 0xa6, 0x97, 0x91, 0xa0, 0x3d, 0x77, 0x59,
-	0x57, 0xe1, 0x76, 0xe6, 0x38, 0x6b, 0xad, 0x72, 0x47, 0xb7, 0x16, 0xce, 0x70, 0xa5, 0x7f, 0x3a,
-	0x00, 0x63, 0xc2, 0xa1, 0x8f, 0xa1, 0xa0, 0xe9, 0x95, 0xa6, 0xd3, 0x0f, 0x03, 0x5d, 0xec, 0xfc,
-	0xde, 0xa3, 0x99, 0xf1, 0x35, 0x46, 0x34, 0xac, 0x69, 0xc3, 0xa3, 0x1b, 0x38, 0x4f, 0xc7, 0x47,
-	0xf4, 0x14, 0x16, 0xd3, 0x42, 0xd8, 0x8f, 0xb3, 0x3b, 0xd3, 0x5f, 0x97, 0x7d, 0xa9, 0xb4, 0xcf,
-	0xa3, 0x1b, 0x58, 0x5b, 0xa2, 0x1a, 0x2c, 0xb1, 0xcf, 0x19, 0x9f, 0xbf, 0x8d, 0xbc, 0x14, 0x9d,
-	0xf9, 0x30, 0xb6, 0xfb, 0x2b, 0xb0, 0xa4, 0x1b, 0xa6, 0xf4, 0x87, 0x65, 0xc8, 0x4f, 0xb0, 0x17,
-	0xdd, 0x03, 0xd3, 0x6a, 0x44, 0x47, 0x69, 0x28, 0xb6, 0xa6, 0x25, 0x69, 0x24, 0xe8, 0x2d, 0x58,
-	0x8f, 0x28, 0x0f, 0x86, 0x34, 0x60, 0xc4, 0x17, 0x3d, 0xe6, 0x6e, 0x6a, 0x44, 0x21, 0x13, 0xd6,
-	0x44, 0x8f, 0xa1, 0x7d, 0xb8, 0x27, 0x63, 0xc6, 0xfc, 0x73, 0x92, 0x30, 0x5f, 0x04, 0x3c, 0x4c,
-	0x69, 0x66, 0x0a, 0xd9, 0x63, 0xdc, 0x67, 0x3a, 0xf9, 0x1c, 0xde, 0x36, 0x20, 0x3c, 0xc6, 0xd4,
-	0x46, 0x10, 0xf4, 0x06, 0x2c, 0x53, 0x5f, 0xd3, 0x78, 0x41, 0xdf, 0x60, 0x4f, 0xe8, 0xa7, 0x00,
-	0xf1, 0xa8, 0x1f, 0x34, 0xc5, 0xbe, 0xe5, 0xe3, 0x4e, 0x40, 0xd1, 0x13, 0xd8, 0xa6, 0x51, 0x44,
-	0x12, 0x76, 0x31, 0x0c, 0x13, 0xd6, 0xb3, 0xf3, 0x8d, 0xc4, 0x29, 0x3d, 0xb9, 0xd2, 0x53, 0x64,
-	0x15, 0xbb, 0x34, 0x8a, 0xb0, 0x45, 0x98, 0xd9, 0xd5, 0x36, 0x7a, 0xf4, 0x10, 0x8a, 0xfd, 0x61,
-	0xd4, 0x0f, 0xa3, 0x68, 0xc0, 0xb8, 0x32, 0xd5, 0x59, 0xd6, 0x91, 0x6d, 0x4e, 0xc8, 0x75, 0x8d,
-	0xce, 0xe0, 0xd6, 0x24, 0x74, 0xc0, 0xa4, 0xa4, 0x01, 0x93, 0xee, 0x8a, 0xa6, 0x78, 0x65, 0x0e,
-	0x0a, 0xe9, 0x6d, 0x72, 0x6c, 0xec, 0xf0, 0xcd, 0x09, 0x67, 0x56, 0xa6, 0xbb, 0x6d, 0x34, 0x57,
-	0xc4, 0x30, 0xf1, 0x99, 0xbb, 0xaa, 0x83, 0x19, 0xcd, 0x10, 0x2d, 0x44, 0x4f, 0x61, 0x33, 0x83,
-	0x65, 0xfd, 0xb0, 0xf6, 0xed, 0x25, 0xcb, 0xdc, 0xb6, 0x0d, 0x1c, 0x7d, 0x04, 0x9b, 0x62, 0xa8,
-	0xd2, 0x69, 0x3b, 0xea, 0x6b, 0x78, 0xc5, 0x19, 0xb1, 0x61, 0x1c, 0x8c, 0x46, 0xc0, 0xcf, 0x60,
-	0xd9, 0x2c, 0x4c, 0x37, 0xaf, 0x63, 0xf9, 0xfe, 0x9c, 0x15, 0xc1, 0xd6, 0x0c, 0x7d, 0x08, 0xdb,
-	0xe6, 0x17, 0xe9, 0xe9, 0x29, 0x3f, 0xc5, 0xae, 0x82, 0x66, 0xd7, 0x1d, 0x03, 0xa9, 0x67, 0x88,
-	0x09, 0x6e, 0x3d, 0x85, 0xcd, 0x5e, 0x48, 0x03, 0x2e, 0xa4, 0x0a, 0x7d, 0x12, 0xf2, 0xbe, 0x70,
-	0x37, 0x66, 0x54, 0x65, 0x8c, 0x6f, 0xf0, 0xbe, 0x28, 0xfd, 0x3e, 0x07, 0x77, 0x3b, 0x2a, 0x61,
-	0x74, 0x10, 0xf2, 0xe0, 0x3b, 0xb7, 0x60, 0x1f, 0x42, 0x51, 0x86, 0x3c, 0x88, 0x18, 0x19, 0x2a,
-	0xc5, 0x12, 0x9a, 0x16, 0xd5, 0x0c, 0xf3, 0x4d, 0x23, 0x3f, 0xcd, 0xc4, 0xd3, 0xbb, 0x78, 0xf9,
-	0xca, 0x2e, 0xfe, 0x63, 0x0e, 0xee, 0xbd, 0xa4, 0x52, 0xf3, 0x2e, 0xe5, 0xe7, 0x80, 0x26, 0xe7,
-	0xc8, 0x0b, 0xab, 0xf9, 0xf1, 0xec, 0x85, 0x91, 0x5d, 0x3e, 0x31, 0x67, 0xec, 0xa6, 0x7e, 0x2d,
-	0x99, 0x16, 0x5d, 0x79, 0x00, 0x2c, 0xfc, 0xff, 0x1f, 0x00, 0x8b, 0xf3, 0x3e, 0x00, 0xfe, 0x94,
-	0x83, 0xad, 0x97, 0x47, 0x8f, 0x9e, 0x43, 0xc1, 0x8e, 0x16, 0xbd, 0x42, 0x75, 0xe1, 0x36, 0xf6,
-	0x0e, 0xff, 0x87, 0x82, 0x64, 0x23, 0x47, 0xaf, 0xd5, 0xfc, 0x60, 0x7c, 0x40, 0x6f, 0x02, 0xa8,
-	0x84, 0x72, 0xe9, 0x27, 0x61, 0x6c, 0x4a, 0xbf, 0x86, 0x27, 0x24, 0xe8, 0x0e, 0xac, 0x86, 0x92,
-	0xf4, 0x43, 0x4e, 0x23, 0x5d, 0xb2, 0x55, 0xbc, 0x12, 0xca, 0x83, 0xf4, 0x98, 0x9a, 0x4e, 0xf4,
-	0xe6, 0xa2, 0xee, 0xcd, 0x09, 0x49, 0xe9, 0x13, 0xc8, 0x4f, 0x5c, 0x8b, 0xee, 0x82, 0x7b, 0xec,
-	0x75, 0x3a, 0xd5, 0x43, 0x8f, 0x74, 0x3f, 0x6d, 0x7b, 0xe4, 0xb4, 0xd5, 0x69, 0x7b, 0xb5, 0xc6,
-	0x41, 0xc3, 0xab, 0x17, 0x6f, 0xa0, 0x0d, 0x80, 0x2e, 0xae, 0xb6, 0x3a, 0x35, 0xdc, 0x68, 0x77,
-	0x8b, 0x0e, 0xda, 0x86, 0xdb, 0x5e, 0xab, 0x4e, 0x4e, 0x0e, 0x48, 0xa7, 0xd1, 0x3a, 0x6c, 0x7a,
-	0xe4, 0xb4, 0xdb, 0xf5, 0x70, 0xb5, 0x55, 0xf3, 0x8a, 0xb9, 0xd2, 0x5f, 0x1c, 0x28, 0x4e, 0xaf,
-	0x63, 0x74, 0x0a, 0x1b, 0x66, 0xaf, 0x33, 0xee, 0x8b, 0x5e, 0xc8, 0x03, 0x5b, 0xb7, 0xf2, 0xcc,
-	0xba, 0x69, 0x2f, 0x9e, 0xb5, 0xc2, 0xeb, 0x74, 0xf2, 0x88, 0x76, 0xe1, 0x35, 0x49, 0x07, 0x71,
-	0xc4, 0x48, 0x42, 0x15, 0x23, 0xe7, 0x2c, 0x51, 0x5f, 0xe9, 0x3a, 0x2d, 0xe1, 0x4d, 0xa3, 0xc0,
-	0x54, 0xb1, 0xa3, 0x54, 0x7c, 0x75, 0x87, 0x2e, 0x5c, 0xb3, 0x43, 0xbf, 0x07, 0x85, 0xf8, 0x3c,
-	0xa1, 0x92, 0x91, 0xf3, 0x90, 0xeb, 0xc7, 0xd4, 0xc2, 0xce, 0x1a, 0xce, 0x1b, 0xd9, 0x51, 0x2a,
-	0x2a, 0xd5, 0x61, 0x6d, 0xf4, 0x3a, 0x40, 0xc8, 0xbe, 0x2b, 0x4c, 0xfb, 0x98, 0x97, 0xc2, 0x95,
-	0x8b, 0x72, 0x57, 0x2f, 0x2a, 0xfd, 0x0a, 0x60, 0xfc, 0x40, 0x48, 0xdd, 0x70, 0x3a, 0xc8, 0xde,
-	0x96, 0xfa, 0xf7, 0xd4, 0xca, 0xcd, 0xcd, 0xbf, 0x72, 0xe7, 0x49, 0x74, 0xf7, 0xdf, 0x0e, 0xac,
-	0xbf, 0x50, 0x5a, 0xf4, 0x26, 0x6c, 0x55, 0x4f, 0xeb, 0x8d, 0x13, 0xe2, 0xb5, 0x6a, 0x27, 0xf5,
-	0x46, 0xeb, 0x70, 0x8a, 0x04, 0x77, 0xc1, 0x9d, 0xd2, 0x37, 0x1b, 0x2d, 0xaf, 0x8a, 0xc9, 0xa3,
-	0xf7, 0x8a, 0x0e, 0xba, 0x0d, 0x37, 0xa7, 0xb4, 0x07, 0xcd, 0x6a, 0xad, 0x98, 0x43, 0x2e, 0xdc,
-	0x9a, 0x52, 0x1c, 0x9f, 0x36, 0xab, 0xcf, 0x8a, 0x0b, 0xe8, 0x0d, 0x40, 0x53, 0x9a, 0xea, 0x31,
-	0x2e, 0x2e, 0xa2, 0x3b, 0xf0, 0xfa, 0x55, 0x39, 0x79, 0xb6, 0x5f, 0x5c, 0x4a, 0x89, 0x37, 0xa5,
-	0x3a, 0x39, 0x3c, 0x24, 0x27, 0xed, 0xd3, 0x4e, 0x71, 0x19, 0x3d, 0x84, 0xb7, 0xa7, 0x94, 0x9d,
-	0xb6, 0xe7, 0x7d, 0x42, 0x9e, 0x35, 0xba, 0x47, 0xe4, 0xc8, 0xab, 0xd6, 0x3d, 0x4c, 0xf6, 0x3f,
-	0xed, 0x7a, 0xc5, 0x95, 0xbd, 0xbf, 0xe7, 0x60, 0xd5, 0x3e, 0x69, 0x25, 0xfa, 0xc6, 0x81, 0xc2,
-	0xe4, 0x88, 0x44, 0x3f, 0x9e, 0x49, 0xca, 0x6b, 0x76, 0xcf, 0xd6, 0x4f, 0x5e, 0xd1, 0xca, 0x0c,
-	0xda, 0xd2, 0xc1, 0xaf, 0xff, 0xfc, 0xd7, 0xdf, 0xe4, 0x9e, 0x96, 0x1e, 0x8f, 0xfe, 0xa8, 0xfe,
-	0xc2, 0xee, 0xac, 0x27, 0x71, 0x22, 0x9e, 0x33, 0x5f, 0xc9, 0xca, 0x6e, 0x85, 0x06, 0x8c, 0xab,
-	0xec, 0x2f, 0xac, 0xac, 0xec, 0xfe, 0xf2, 0x83, 0xde, 0x84, 0xb3, 0x0f, 0x9c, 0x5d, 0xf4, 0x5b,
-	0x07, 0x5e, 0xbf, 0x76, 0xe2, 0xa3, 0x27, 0xf3, 0xcf, 0xa6, 0xeb, 0xf2, 0xfa, 0xf0, 0xbf, 0x35,
-	0x37, 0x09, 0xee, 0x38, 0xef, 0x3a, 0xfb, 0x5f, 0x3b, 0xf0, 0x96, 0x2f, 0x06, 0xb3, 0x3c, 0xed,
-	0x17, 0xec, 0x47, 0x69, 0xa7, 0xf4, 0x6e, 0x3b, 0x9f, 0x35, 0xac, 0x41, 0x20, 0x52, 0xf2, 0x96,
-	0x45, 0x12, 0x54, 0x02, 0xc6, 0x35, 0xf9, 0x2b, 0x46, 0x45, 0xe3, 0x50, 0xbe, 0xf4, 0x3f, 0xff,
-	0xe3, 0xb1, 0xe8, 0x5f, 0x8e, 0xf3, 0xbb, 0x5c, 0xae, 0x7e, 0xf0, 0x75, 0xee, 0xfe, 0xa1, 0xf1,
-	0x59, 0xd3, 0x41, 0xd4, 0xc7, 0x41, 0x7c, 0x6c, 0x8c, 0xce, 0x96, 0xb5, 0xff, 0x1f, 0xfd, 0x27,
-	0x00, 0x00, 0xff, 0xff, 0x78, 0xce, 0xe5, 0x99, 0x1d, 0x11, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/session.proto", fileDescriptor_session_251d19dfdf11847a)
+}
+
+var fileDescriptor_session_251d19dfdf11847a = []byte{
+	// 2081 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcd, 0x73, 0x1b, 0x49,
+	0x15, 0xcf, 0x48, 0xfe, 0x90, 0x9f, 0x14, 0x5b, 0xe9, 0x78, 0x63, 0xd9, 0x71, 0xbe, 0xb4, 0xb5,
+	0xe0, 0x98, 0x45, 0x4a, 0x0c, 0x2c, 0xbb, 0x9b, 0xca, 0x26, 0xb2, 0x34, 0xb6, 0x55, 0xc8, 0xb2,
+	0xd3, 0xb2, 0x93, 0xdd, 0x14, 0xd0, 0xd5, 0x1e, 0xb5, 0xe4, 0x49, 0x46, 0x33, 0xf2, 0x74, 0x2b,
+	0x59, 0x87, 0x82, 0x03, 0x9c, 0x80, 0x23, 0x27, 0xaa, 0x28, 0x8a, 0xe2, 0xc6, 0x72, 0xe5, 0xca,
+	0x3f, 0xc0, 0x15, 0xaa, 0xf8, 0x07, 0xb8, 0x71, 0x84, 0x03, 0x55, 0x5c, 0xa8, 0xfe, 0x18, 0x69,
+	0x22, 0xdb, 0x91, 0x12, 0x48, 0x51, 0xb5, 0x27, 0xa9, 0x5f, 0xbf, 0xf7, 0xeb, 0xee, 0xf7, 0x5e,
+	0xff, 0xfa, 0xbd, 0x81, 0xaf, 0xb7, 0x83, 0xa0, 0xed, 0xb1, 0xa2, 0xe3, 0x05, 0xbd, 0x66, 0xb1,
+	0xe9, 0x52, 0x2f, 0x68, 0xb7, 0xbc, 0xe0, 0x79, 0xf1, 0xd9, 0xda, 0x01, 0x13, 0xf4, 0x76, 0x91,
+	0x33, 0xce, 0xdd, 0xc0, 0x2f, 0x74, 0xc3, 0x40, 0x04, 0xe8, 0x9a, 0x56, 0x2f, 0x28, 0xf5, 0xc2,
+	0x40, 0xbd, 0x60, 0xd4, 0x97, 0x96, 0x0d, 0x1e, 0xed, 0xba, 0x45, 0xea, 0xfb, 0x81, 0xa0, 0xc2,
+	0x0d, 0x7c, 0xae, 0xcd, 0x97, 0xd6, 0x46, 0xad, 0x46, 0x7b, 0x4d, 0x37, 0x20, 0x4e, 0xe0, 0xb7,
+	0xdc, 0xb6, 0xb1, 0x19, 0xb9, 0x43, 0x27, 0xf0, 0x05, 0xfb, 0x5c, 0x18, 0xf5, 0xf7, 0x47, 0xa9,
+	0xbb, 0xbe, 0x60, 0x7e, 0xa4, 0xfd, 0xd1, 0x98, 0xc7, 0x27, 0xcc, 0x17, 0xae, 0x38, 0x26, 0xe2,
+	0xb8, 0xcb, 0x8c, 0x69, 0x74, 0x52, 0x35, 0x3a, 0xe8, 0xb5, 0x8a, 0x5c, 0x84, 0x3d, 0x27, 0x02,
+	0x5e, 0x30, 0xb3, 0x61, 0xd7, 0x29, 0x72, 0x41, 0x45, 0x2f, 0x72, 0x41, 0xce, 0x4c, 0x48, 0xa4,
+	0xa2, 0x47, 0x85, 0xe7, 0x9b, 0x83, 0xe6, 0xff, 0x9a, 0x80, 0x8b, 0x15, 0x26, 0x98, 0x23, 0xaa,
+	0x6a, 0x8b, 0x98, 0x1d, 0xf5, 0x18, 0x17, 0x28, 0x07, 0xd3, 0x66, 0x17, 0x39, 0xeb, 0xba, 0xb5,
+	0x32, 0x83, 0xa3, 0x21, 0x6a, 0x40, 0xe6, 0xa8, 0xc7, 0xc2, 0x63, 0xd2, 0xa5, 0x21, 0xed, 0xf0,
+	0x5c, 0xe2, 0xba, 0xb5, 0x92, 0x5e, 0xbb, 0x55, 0x18, 0x11, 0xa4, 0xc2, 0x03, 0x69, 0xb4, 0x2b,
+	0x6d, 0x98, 0x60, 0x21, 0xc7, 0xe9, 0xa3, 0xbe, 0x80, 0xa3, 0x1a, 0xe8, 0x21, 0x71, 0xfd, 0x6e,
+	0x4f, 0xe4, 0x92, 0x0a, 0xf3, 0x6b, 0xe3, 0x61, 0x56, 0xa5, 0x09, 0x86, 0xa3, 0xfe, 0x7f, 0x74,
+	0x00, 0x17, 0x83, 0x9e, 0xe8, 0xf6, 0x04, 0x89, 0x87, 0x36, 0x37, 0xa1, 0x50, 0xd7, 0x46, 0xa2,
+	0xee, 0x28, 0xdb, 0x92, 0x34, 0x2d, 0x2b, 0x4b, 0x7c, 0x21, 0x18, 0x16, 0xa1, 0x6b, 0x90, 0x56,
+	0x7b, 0xd5, 0x4b, 0xe4, 0x26, 0xaf, 0x5b, 0x2b, 0x19, 0x0c, 0x4a, 0xa4, 0xd4, 0xf2, 0x7f, 0x48,
+	0xc2, 0xfc, 0xcb, 0x9e, 0xe5, 0xdd, 0xc0, 0xe7, 0x4c, 0x5a, 0x86, 0xe6, 0x3f, 0x71, 0x9b, 0xc6,
+	0xbd, 0x10, 0x89, 0xaa, 0x4d, 0xb4, 0x13, 0x79, 0x38, 0x64, 0xbc, 0xe7, 0x09, 0xe3, 0xe1, 0xf7,
+	0xc7, 0xf3, 0x06, 0x56, 0x36, 0xc6, 0xbb, 0x7a, 0x80, 0x0e, 0x61, 0x91, 0x7a, 0x82, 0x85, 0x3e,
+	0x15, 0xee, 0x33, 0x46, 0xe2, 0xe0, 0x3c, 0x37, 0x79, 0x3d, 0xf9, 0xda, 0xe8, 0x0b, 0x31, 0xb8,
+	0x98, 0x9c, 0xa3, 0x8f, 0x60, 0xf6, 0x39, 0x3b, 0x38, 0x0c, 0x82, 0xa7, 0x44, 0x27, 0xa0, 0x09,
+	0x25, 0x8a, 0xe0, 0xc3, 0xae, 0x53, 0x68, 0xa8, 0x19, 0x7c, 0xde, 0x68, 0xea, 0x21, 0xba, 0x01,
+	0x99, 0x78, 0xd0, 0x54, 0xb4, 0x32, 0x38, 0x1d, 0xf3, 0xfc, 0x59, 0x71, 0x9d, 0xfa, 0x1f, 0xc6,
+	0x35, 0xff, 0xfb, 0x09, 0x98, 0x1b, 0x4a, 0x55, 0x74, 0x19, 0x66, 0x84, 0xdb, 0x61, 0xe4, 0x45,
+	0xe0, 0x33, 0x13, 0xaf, 0x94, 0x14, 0x3c, 0x0e, 0x7c, 0x86, 0x3e, 0x80, 0x4c, 0x9b, 0x05, 0xc4,
+	0x0b, 0x1c, 0xc5, 0x3a, 0x26, 0x5a, 0x17, 0xa3, 0xdd, 0xa8, 0xcb, 0x5b, 0xa3, 0xa2, 0xe6, 0xb7,
+	0x71, 0xba, 0xcd, 0x82, 0x9a, 0xd1, 0x43, 0x15, 0x48, 0x19, 0x12, 0x91, 0x4e, 0x92, 0x31, 0x58,
+	0x19, 0x79, 0x82, 0xb2, 0x36, 0xc0, 0x7d, 0x4b, 0xf4, 0x1e, 0xcc, 0x86, 0x8c, 0x33, 0x41, 0xfa,
+	0x58, 0xd2, 0x6f, 0x29, 0x7c, 0x5e, 0x49, 0xcb, 0x91, 0x5a, 0x13, 0xe6, 0x4f, 0x21, 0x95, 0x28,
+	0xf8, 0xa3, 0x5d, 0xd7, 0xd0, 0xc6, 0xb6, 0xb2, 0xdd, 0x3b, 0xee, 0x32, 0x8c, 0xf8, 0xb0, 0x88,
+	0xa3, 0xdb, 0x30, 0xdd, 0xa5, 0xc7, 0x5e, 0x40, 0x9b, 0x26, 0x26, 0x0b, 0x11, 0x70, 0xc4, 0x57,
+	0x85, 0x86, 0xe2, 0x2b, 0x1c, 0xe9, 0xa1, 0x5b, 0x30, 0xff, 0xd4, 0x0f, 0x9e, 0x7b, 0xac, 0xd9,
+	0x66, 0xe4, 0x80, 0x72, 0x46, 0x7c, 0xda, 0x61, 0x3c, 0x97, 0xb9, 0x9e, 0x5c, 0x99, 0xc1, 0xa8,
+	0x3f, 0xb7, 0x4e, 0x39, 0xab, 0xcb, 0x19, 0xf4, 0x33, 0x0b, 0x6e, 0x70, 0x79, 0x88, 0x0e, 0xf3,
+	0x05, 0xa1, 0x3e, 0xf5, 0x8e, 0xb9, 0xcb, 0x49, 0xa8, 0x89, 0x2b, 0xca, 0x09, 0x50, 0xeb, 0xdf,
+	0x1b, 0xe3, 0x60, 0x06, 0xa9, 0x64, 0x80, 0x0c, 0x01, 0x9a, 0x04, 0xb9, 0xca, 0x5f, 0x39, 0x9f,
+	0xff, 0xa7, 0x05, 0x30, 0x20, 0x21, 0xf4, 0x10, 0x32, 0x2f, 0x65, 0xa6, 0xa5, 0x76, 0x71, 0x7b,
+	0xe4, 0x2e, 0xaa, 0xfe, 0xcb, 0x59, 0xb8, 0x75, 0x0e, 0xa7, 0x69, 0x8c, 0x6c, 0xee, 0xc3, 0x84,
+	0x8c, 0xa3, 0xc9, 0xad, 0xd5, 0x91, 0x78, 0x7b, 0xec, 0x73, 0xa1, 0x30, 0xb7, 0xce, 0x61, 0x65,
+	0x89, 0xca, 0x30, 0xc9, 0x9e, 0x31, 0x7f, 0x7c, 0x6a, 0xb5, 0xa5, 0x76, 0x84, 0xa1, 0x6d, 0xd7,
+	0xa7, 0x61, 0x52, 0x11, 0x5c, 0xfe, 0xa7, 0x29, 0x48, 0xc7, 0xee, 0x3d, 0xba, 0x02, 0x9a, 0x7e,
+	0x89, 0xda, 0xa5, 0xbe, 0x21, 0x33, 0x4a, 0x22, 0x77, 0x82, 0xde, 0x85, 0xf3, 0x1e, 0xf5, 0xdb,
+	0x3d, 0xda, 0x66, 0xc4, 0x09, 0x9a, 0x2c, 0x37, 0xa7, 0x34, 0x32, 0x91, 0xb0, 0x1c, 0x34, 0x19,
+	0x5a, 0x87, 0x2b, 0xbc, 0xcb, 0x98, 0x73, 0x48, 0x42, 0xe6, 0x04, 0x6d, 0xdf, 0x95, 0xb7, 0x44,
+	0x3b, 0xb2, 0xc9, 0x7c, 0x87, 0xa9, 0xc3, 0x27, 0xf0, 0x65, 0xad, 0x84, 0x07, 0x3a, 0xe5, 0xbe,
+	0x0a, 0xba, 0x04, 0x53, 0xd4, 0x51, 0xb7, 0x30, 0xa9, 0x56, 0x30, 0x23, 0xf4, 0x6d, 0x80, 0x6e,
+	0xff, 0x3a, 0x9b, 0x77, 0xe0, 0xcc, 0xdc, 0x8c, 0xa9, 0xa2, 0xbb, 0x70, 0x99, 0x7a, 0x9e, 0x4a,
+	0x2e, 0x37, 0x64, 0x4d, 0xf3, 0xe6, 0x91, 0xae, 0xbc, 0x5d, 0xbe, 0x50, 0xac, 0x9f, 0xc2, 0x39,
+	0xea, 0x79, 0xd8, 0x68, 0xe8, 0xf7, 0x6c, 0x57, 0xcf, 0xa3, 0x9b, 0x90, 0x6d, 0xf5, 0xbc, 0x96,
+	0xeb, 0x79, 0x2a, 0x59, 0x95, 0x77, 0xa6, 0xd4, 0xce, 0xe6, 0x62, 0x72, 0xe5, 0xa3, 0x03, 0x98,
+	0x8f, 0xab, 0x76, 0x18, 0xe7, 0xb4, 0xcd, 0x78, 0x6e, 0x5a, 0xdd, 0xd0, 0xe2, 0x18, 0x29, 0xa4,
+	0x2a, 0x8c, 0x6d, 0x6d, 0x87, 0x2f, 0xc6, 0xc0, 0x8c, 0x4c, 0x91, 0x45, 0x9f, 0x9d, 0x83, 0x5e,
+	0xe8, 0xb0, 0x5c, 0x4a, 0x6d, 0xa6, 0xcf, 0xc4, 0x4a, 0x88, 0xee, 0xc3, 0x5c, 0xa4, 0x16, 0x5d,
+	0xe7, 0x99, 0x57, 0xbb, 0x2c, 0x82, 0xdd, 0x35, 0xb7, 0xfa, 0x01, 0xcc, 0x19, 0xa2, 0xee, 0xd3,
+	0x12, 0xbc, 0x26, 0xc5, 0xcd, 0x6a, 0x80, 0x3e, 0x83, 0xdd, 0x83, 0x29, 0x5d, 0x44, 0xe5, 0xd2,
+	0x6a, 0x2f, 0x5f, 0x1d, 0xd3, 0x23, 0xd8, 0x98, 0xa1, 0x4f, 0xe0, 0xb2, 0xfe, 0x47, 0x9a, 0xea,
+	0x55, 0x1e, 0xca, 0xae, 0x8c, 0xca, 0xae, 0x45, 0xad, 0x52, 0x89, 0x34, 0x62, 0xb9, 0x75, 0x1f,
+	0xe6, 0x9a, 0x2e, 0x6d, 0xfb, 0x01, 0x17, 0xae, 0x43, 0x5c, 0xbf, 0x15, 0xe4, 0x66, 0x47, 0x78,
+	0x65, 0xa0, 0x5f, 0xf5, 0x5b, 0x01, 0x12, 0xb0, 0x78, 0x2a, 0x71, 0xa9, 0x47, 0xfe, 0x82, 0xc2,
+	0xfa, 0xf0, 0x4d, 0x08, 0x4b, 0x3f, 0xc9, 0xfc, 0xf4, 0x09, 0xf4, 0x7d, 0xb8, 0x30, 0x60, 0x58,
+	0xea, 0xf3, 0xe7, 0xf2, 0x0a, 0xa0, 0x31, 0x89, 0xe9, 0x3b, 0x91, 0x65, 0x49, 0x1b, 0xe2, 0xec,
+	0xd3, 0x21, 0x49, 0xfe, 0x2f, 0x49, 0xc8, 0x0e, 0xab, 0x21, 0x0c, 0xd3, 0xd1, 0x52, 0x96, 0x0a,
+	0xfc, 0x87, 0xaf, 0xbd, 0x54, 0x41, 0xff, 0xe2, 0x08, 0x68, 0xe9, 0xef, 0x09, 0x98, 0xd2, 0x32,
+	0x79, 0xcf, 0x4d, 0x02, 0x6b, 0xae, 0x31, 0x23, 0x59, 0x43, 0xb4, 0xe8, 0x11, 0x51, 0x0c, 0x1d,
+	0xbd, 0xc5, 0x33, 0x38, 0xdd, 0xa2, 0x47, 0x0f, 0x8c, 0x48, 0x51, 0x84, 0x02, 0xe9, 0x53, 0x84,
+	0x86, 0xfc, 0x89, 0x05, 0x97, 0x3a, 0x54, 0x38, 0x87, 0xb1, 0xa4, 0x20, 0x1e, 0x7b, 0xc6, 0x3c,
+	0xc5, 0x17, 0xb3, 0x6b, 0xdb, 0x6f, 0x7a, 0x82, 0xc2, 0xb6, 0x84, 0x1d, 0x64, 0x52, 0x4d, 0x82,
+	0xe2, 0xf9, 0xce, 0x29, 0x52, 0x49, 0x18, 0xc3, 0x9b, 0x50, 0x24, 0x93, 0xc0, 0x73, 0x43, 0xfa,
+	0xf9, 0xef, 0xc1, 0xfc, 0x69, 0xc0, 0xe8, 0x2b, 0x90, 0xdf, 0x2e, 0xed, 0x95, 0xb7, 0x48, 0x79,
+	0xa7, 0xbe, 0x51, 0xad, 0xd8, 0xf5, 0xb2, 0x4d, 0x6a, 0xf6, 0x43, 0xbb, 0x46, 0xf6, 0xeb, 0x8d,
+	0x5d, 0xbb, 0x5c, 0xdd, 0xa8, 0xda, 0x95, 0xec, 0x39, 0x34, 0x0d, 0xc9, 0xda, 0xce, 0xa3, 0xac,
+	0x85, 0x00, 0xa6, 0xb6, 0xed, 0x4a, 0x75, 0x7f, 0x3b, 0x9b, 0x40, 0x29, 0x98, 0xd8, 0xaa, 0x6e,
+	0x6e, 0x65, 0x93, 0xf9, 0x9f, 0x27, 0x61, 0xb9, 0x21, 0x42, 0x46, 0x3b, 0xae, 0xdf, 0xfe, 0xd2,
+	0x75, 0x08, 0x37, 0x21, 0xcb, 0x5d, 0xbf, 0xed, 0x31, 0xd2, 0x13, 0x82, 0x85, 0x54, 0xfa, 0x59,
+	0x17, 0x4e, 0x73, 0x5a, 0xbe, 0x1f, 0x89, 0xcf, 0x2a, 0x3a, 0x27, 0xdf, 0x62, 0x33, 0x31, 0x75,
+	0xa2, 0x99, 0xf8, 0xdd, 0x04, 0x5c, 0x39, 0x23, 0x1a, 0xe3, 0x76, 0x15, 0x4f, 0x00, 0xc5, 0x1f,
+	0xd6, 0x97, 0x7a, 0x8b, 0x3b, 0xa3, 0x69, 0x27, 0x5a, 0x3c, 0xf6, 0xf0, 0x1a, 0xe6, 0xb9, 0x10,
+	0x0e, 0x8b, 0x4e, 0x74, 0x30, 0xc9, 0xb7, 0xda, 0xc1, 0x4c, 0xbf, 0xdd, 0x0e, 0x66, 0xe2, 0x4d,
+	0x3b, 0x98, 0xc9, 0xff, 0x4f, 0x07, 0xf3, 0xc7, 0x04, 0x2c, 0x9d, 0x1d, 0x2e, 0xf4, 0x04, 0x32,
+	0xa6, 0xb8, 0x50, 0x3d, 0x80, 0xca, 0x94, 0xd9, 0xb5, 0xcd, 0xff, 0x22, 0x03, 0xa2, 0xa2, 0x43,
+	0xf5, 0x05, 0xe9, 0xce, 0x60, 0x80, 0xae, 0x02, 0x88, 0x90, 0xfa, 0xdc, 0x09, 0xdd, 0xae, 0x30,
+	0x6c, 0x1c, 0x93, 0xa0, 0x45, 0x48, 0xb9, 0x9c, 0xb4, 0x5c, 0x9f, 0x7a, 0x2a, 0x47, 0x52, 0x78,
+	0xda, 0xe5, 0x1b, 0x72, 0x28, 0x4d, 0x63, 0x1c, 0x38, 0xa1, 0x38, 0x30, 0x26, 0xc9, 0x7f, 0x0a,
+	0xe9, 0xd8, 0xb2, 0x68, 0x19, 0x72, 0xdb, 0x76, 0xa3, 0x51, 0xda, 0xb4, 0xc9, 0xde, 0x67, 0xbb,
+	0xf6, 0x10, 0xd7, 0xcd, 0x02, 0xec, 0xe1, 0x52, 0xbd, 0x51, 0xc6, 0xd5, 0xdd, 0xbd, 0xac, 0x85,
+	0x2e, 0xc3, 0x82, 0x5d, 0xaf, 0x90, 0x9d, 0x0d, 0xd2, 0xa8, 0xd6, 0x37, 0x6b, 0x36, 0xd9, 0xdf,
+	0xdb, 0xb3, 0x71, 0xa9, 0x5e, 0xb6, 0xb3, 0x89, 0xfc, 0x3f, 0x2c, 0xc8, 0x0e, 0x17, 0xe4, 0x68,
+	0x1f, 0x66, 0x75, 0xc4, 0x98, 0xef, 0x04, 0x4d, 0xd7, 0x6f, 0x1b, 0xbf, 0x15, 0x46, 0xfa, 0x4d,
+	0xa1, 0xd8, 0xc6, 0x0a, 0x9f, 0xa7, 0xf1, 0x21, 0x5a, 0x85, 0x0b, 0x9c, 0x76, 0xba, 0x1e, 0x23,
+	0x21, 0x15, 0x8c, 0x1c, 0xb2, 0x50, 0xbc, 0x50, 0x7e, 0x9a, 0xc4, 0x73, 0x7a, 0x02, 0x53, 0xc1,
+	0xb6, 0xa4, 0xf8, 0x64, 0x15, 0x9d, 0x3c, 0xa5, 0x8a, 0xbe, 0x01, 0x99, 0xee, 0x61, 0x28, 0xfb,
+	0xa8, 0x43, 0xd7, 0x57, 0xdd, 0xa0, 0xec, 0xa3, 0xd2, 0x5a, 0xb6, 0x25, 0x45, 0x68, 0x1e, 0x26,
+	0x3b, 0x41, 0x93, 0x79, 0xb9, 0x69, 0x65, 0xaf, 0x07, 0xf9, 0x0a, 0xcc, 0xf4, 0xbb, 0x06, 0x84,
+	0x4c, 0xbf, 0xa1, 0x59, 0x44, 0x77, 0x10, 0x27, 0x96, 0x4f, 0x9c, 0x5c, 0x3e, 0xff, 0x23, 0x80,
+	0x41, 0xe3, 0x20, 0x61, 0x64, 0x37, 0x17, 0xc1, 0xc8, 0xff, 0x43, 0xa5, 0x78, 0x62, 0xfc, 0x52,
+	0x7c, 0x9c, 0xe3, 0xe7, 0x29, 0x5c, 0x7d, 0x75, 0x47, 0x87, 0xee, 0xc1, 0xb2, 0x2a, 0xbd, 0x5e,
+	0x44, 0x2c, 0x22, 0x0f, 0x47, 0xfa, 0xc5, 0x93, 0xda, 0x6b, 0x0a, 0x2f, 0x1a, 0x9d, 0x07, 0x51,
+	0x0f, 0xd3, 0x47, 0xcd, 0x3f, 0x87, 0x85, 0x33, 0x6a, 0x30, 0xf4, 0x5d, 0x98, 0x3f, 0x13, 0x73,
+	0x9c, 0xb6, 0xad, 0x8f, 0x8b, 0xd1, 0xd1, 0xc9, 0x85, 0xef, 0xc1, 0x4c, 0x7f, 0x20, 0x83, 0xc8,
+	0x9d, 0x20, 0xd4, 0xbe, 0x4d, 0x60, 0x3d, 0x40, 0xcb, 0x30, 0xd3, 0xa1, 0xf2, 0x6e, 0xf6, 0x9a,
+	0x51, 0xbf, 0x34, 0x10, 0xac, 0xfe, 0xdb, 0x82, 0xf3, 0x2f, 0x65, 0x23, 0xba, 0x0a, 0x4b, 0xa5,
+	0xfd, 0x4a, 0x75, 0x87, 0xd8, 0xf5, 0xf2, 0x4e, 0xa5, 0x5a, 0xdf, 0x1c, 0xba, 0x37, 0xcb, 0x90,
+	0x1b, 0x9a, 0xaf, 0x55, 0xeb, 0x76, 0x09, 0x93, 0xdb, 0x1f, 0x64, 0x2d, 0xb4, 0x00, 0x17, 0x87,
+	0x66, 0x37, 0x6a, 0xa5, 0x72, 0x36, 0x81, 0x72, 0x30, 0x3f, 0x34, 0xb1, 0xbd, 0x5f, 0x2b, 0x3d,
+	0xca, 0x26, 0xd1, 0x25, 0x40, 0x43, 0x33, 0xa5, 0x6d, 0x9c, 0x9d, 0x40, 0x8b, 0xf0, 0xce, 0x49,
+	0x39, 0x79, 0xb4, 0x9e, 0x9d, 0x94, 0x77, 0x75, 0x68, 0x6a, 0x67, 0x73, 0x93, 0xec, 0xec, 0xee,
+	0x37, 0xb2, 0x53, 0xe8, 0x26, 0xbc, 0x37, 0x34, 0xd9, 0xd8, 0xb5, 0xed, 0x4f, 0xc9, 0xa3, 0xea,
+	0xde, 0x16, 0xd9, 0xb2, 0x4b, 0x15, 0x1b, 0x93, 0xf5, 0xcf, 0xf6, 0xec, 0xec, 0xf4, 0xda, 0x9f,
+	0x92, 0x90, 0x32, 0x9f, 0x31, 0x38, 0xfa, 0x75, 0x02, 0x32, 0xf1, 0x67, 0x14, 0x7d, 0x73, 0x64,
+	0x70, 0x4e, 0xa9, 0x81, 0x96, 0xbe, 0xf5, 0x9a, 0x56, 0xfa, 0x31, 0xce, 0xff, 0xc6, 0xfa, 0xf1,
+	0x9f, 0xff, 0xf6, 0x8b, 0xc4, 0x2f, 0xad, 0xfc, 0x9d, 0xfe, 0x37, 0xdf, 0x1f, 0x98, 0xea, 0xe9,
+	0x6e, 0x37, 0x0c, 0x9e, 0x30, 0x47, 0xf0, 0xe2, 0x6a, 0x91, 0xb6, 0x99, 0x2f, 0xa2, 0xaf, 0xc1,
+	0xbc, 0xb8, 0xfa, 0xc3, 0x8f, 0x9b, 0x31, 0xb8, 0x8f, 0xad, 0xd5, 0xc7, 0x8f, 0xf2, 0x78, 0x0c,
+	0x04, 0xe6, 0x3f, 0x73, 0xc3, 0xc0, 0x97, 0x89, 0x23, 0x85, 0x3d, 0xce, 0x42, 0xf9, 0xfb, 0x0a,
+	0x60, 0xf4, 0x2b, 0x0b, 0xde, 0x39, 0xb5, 0xe0, 0x40, 0x77, 0xc7, 0x7f, 0x29, 0x4e, 0x73, 0xd9,
+	0x27, 0x6f, 0x6a, 0x6e, 0x7c, 0x77, 0x6e, 0xc5, 0xba, 0x65, 0xad, 0x7f, 0x61, 0xc1, 0xbb, 0x4e,
+	0xd0, 0x19, 0x85, 0xb5, 0x9e, 0x31, 0x11, 0xdf, 0x95, 0xc4, 0xb2, 0x6b, 0x3d, 0xae, 0x1a, 0x83,
+	0x76, 0x20, 0x69, 0xa3, 0x10, 0x84, 0xed, 0x62, 0x9b, 0xf9, 0x8a, 0x76, 0x8a, 0x7a, 0x8a, 0x76,
+	0x5d, 0x7e, 0xe6, 0x97, 0xf9, 0x3b, 0x03, 0xd1, 0xbf, 0x2c, 0xeb, 0xb7, 0x89, 0x44, 0x65, 0xe3,
+	0x8b, 0xc4, 0xb5, 0x4d, 0x8d, 0x59, 0x56, 0x9b, 0xa8, 0x0c, 0x36, 0xf1, 0x50, 0x1b, 0x1d, 0x4c,
+	0x29, 0xfc, 0x6f, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x78, 0x67, 0x76, 0xf7, 0x18, 0x00,
+	0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
index da14f264..d1ee4f29 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/session_entity_type.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/session_entity_type.proto
 
-package dialogflow
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -20,6 +20,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The types of modifications for a session entity type.
 type SessionEntityType_EntityOverrideMode int32
 
@@ -53,7 +59,7 @@ func (x SessionEntityType_EntityOverrideMode) String() string {
 	return proto.EnumName(SessionEntityType_EntityOverrideMode_name, int32(x))
 }
 func (SessionEntityType_EntityOverrideMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor5, []int{0, 0}
+	return fileDescriptor_session_entity_type_0a5ede95d4809454, []int{0, 0}
 }
 
 // Represents a session entity type.
@@ -66,20 +72,46 @@ func (SessionEntityType_EntityOverrideMode) EnumDescriptor() ([]byte, []int) {
 type SessionEntityType struct {
 	// Required. The unique identifier of this session entity type. Format:
 	// `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
-	// Display Name>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// Display Name>`, or
+	// `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
+	// ID>/sessions/<Session ID>/entityTypes/<Entity Type Display Name>`.
+	// If `Environment ID` is not specified, we assume default 'draft'
+	// environment. If `User ID` is not specified, we assume default '-' user.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. Indicates whether the additional data should override or
 	// supplement the developer entity type definition.
-	EntityOverrideMode SessionEntityType_EntityOverrideMode `protobuf:"varint,2,opt,name=entity_override_mode,json=entityOverrideMode,enum=google.cloud.dialogflow.v2beta1.SessionEntityType_EntityOverrideMode" json:"entity_override_mode,omitempty"`
+	EntityOverrideMode SessionEntityType_EntityOverrideMode `protobuf:"varint,2,opt,name=entity_override_mode,json=entityOverrideMode,proto3,enum=google.cloud.dialogflow.v2beta1.SessionEntityType_EntityOverrideMode" json:"entity_override_mode,omitempty"`
 	// Required. The collection of entities associated with this session entity
 	// type.
-	Entities []*EntityType_Entity `protobuf:"bytes,3,rep,name=entities" json:"entities,omitempty"`
+	Entities             []*EntityType_Entity `protobuf:"bytes,3,rep,name=entities,proto3" json:"entities,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *SessionEntityType) Reset()         { *m = SessionEntityType{} }
+func (m *SessionEntityType) String() string { return proto.CompactTextString(m) }
+func (*SessionEntityType) ProtoMessage()    {}
+func (*SessionEntityType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_0a5ede95d4809454, []int{0}
+}
+func (m *SessionEntityType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SessionEntityType.Unmarshal(m, b)
+}
+func (m *SessionEntityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SessionEntityType.Marshal(b, m, deterministic)
+}
+func (dst *SessionEntityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SessionEntityType.Merge(dst, src)
+}
+func (m *SessionEntityType) XXX_Size() int {
+	return xxx_messageInfo_SessionEntityType.Size(m)
+}
+func (m *SessionEntityType) XXX_DiscardUnknown() {
+	xxx_messageInfo_SessionEntityType.DiscardUnknown(m)
 }
 
-func (m *SessionEntityType) Reset()                    { *m = SessionEntityType{} }
-func (m *SessionEntityType) String() string            { return proto.CompactTextString(m) }
-func (*SessionEntityType) ProtoMessage()               {}
-func (*SessionEntityType) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+var xxx_messageInfo_SessionEntityType proto.InternalMessageInfo
 
 func (m *SessionEntityType) GetName() string {
 	if m != nil {
@@ -102,23 +134,48 @@ func (m *SessionEntityType) GetEntities() []*EntityType_Entity {
 	return nil
 }
 
-// The request message for
-// [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2beta1.SessionEntityTypes.ListSessionEntityTypes].
+// The request message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2beta1.SessionEntityTypes.ListSessionEntityTypes].
 type ListSessionEntityTypesRequest struct {
 	// Required. The session to list all session entity types from.
-	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>` or
+	// `projects/<Project ID>/agent/environments/<Environment ID>/users/<User ID>/
+	// sessions/<Session ID>`.
+	// If `Environment ID` is not specified, we assume default 'draft'
+	// environment. If `User ID` is not specified, we assume default '-' user.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. The maximum number of items to return in a single page. By
 	// default 100 and at most 1000.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. The next_page_token value returned from a previous list request.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListSessionEntityTypesRequest) Reset()                    { *m = ListSessionEntityTypesRequest{} }
-func (m *ListSessionEntityTypesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListSessionEntityTypesRequest) ProtoMessage()               {}
-func (*ListSessionEntityTypesRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
+func (m *ListSessionEntityTypesRequest) Reset()         { *m = ListSessionEntityTypesRequest{} }
+func (m *ListSessionEntityTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSessionEntityTypesRequest) ProtoMessage()    {}
+func (*ListSessionEntityTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_0a5ede95d4809454, []int{1}
+}
+func (m *ListSessionEntityTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSessionEntityTypesRequest.Unmarshal(m, b)
+}
+func (m *ListSessionEntityTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSessionEntityTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSessionEntityTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionEntityTypesRequest.Merge(dst, src)
+}
+func (m *ListSessionEntityTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSessionEntityTypesRequest.Size(m)
+}
+func (m *ListSessionEntityTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSessionEntityTypesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSessionEntityTypesRequest proto.InternalMessageInfo
 
 func (m *ListSessionEntityTypesRequest) GetParent() string {
 	if m != nil {
@@ -141,21 +198,42 @@ func (m *ListSessionEntityTypesRequest) GetPageToken() string {
 	return ""
 }
 
-// The response message for
-// [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2beta1.SessionEntityTypes.ListSessionEntityTypes].
+// The response message for [SessionEntityTypes.ListSessionEntityTypes][google.cloud.dialogflow.v2beta1.SessionEntityTypes.ListSessionEntityTypes].
 type ListSessionEntityTypesResponse struct {
 	// The list of session entity types. There will be a maximum number of items
 	// returned based on the page_size field in the request.
-	SessionEntityTypes []*SessionEntityType `protobuf:"bytes,1,rep,name=session_entity_types,json=sessionEntityTypes" json:"session_entity_types,omitempty"`
+	SessionEntityTypes []*SessionEntityType `protobuf:"bytes,1,rep,name=session_entity_types,json=sessionEntityTypes,proto3" json:"session_entity_types,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no
 	// more results in the list.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListSessionEntityTypesResponse) Reset()                    { *m = ListSessionEntityTypesResponse{} }
-func (m *ListSessionEntityTypesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListSessionEntityTypesResponse) ProtoMessage()               {}
-func (*ListSessionEntityTypesResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} }
+func (m *ListSessionEntityTypesResponse) Reset()         { *m = ListSessionEntityTypesResponse{} }
+func (m *ListSessionEntityTypesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSessionEntityTypesResponse) ProtoMessage()    {}
+func (*ListSessionEntityTypesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_0a5ede95d4809454, []int{2}
+}
+func (m *ListSessionEntityTypesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSessionEntityTypesResponse.Unmarshal(m, b)
+}
+func (m *ListSessionEntityTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSessionEntityTypesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSessionEntityTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionEntityTypesResponse.Merge(dst, src)
+}
+func (m *ListSessionEntityTypesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSessionEntityTypesResponse.Size(m)
+}
+func (m *ListSessionEntityTypesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSessionEntityTypesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSessionEntityTypesResponse proto.InternalMessageInfo
 
 func (m *ListSessionEntityTypesResponse) GetSessionEntityTypes() []*SessionEntityType {
 	if m != nil {
@@ -171,19 +249,43 @@ func (m *ListSessionEntityTypesResponse) GetNextPageToken() string {
 	return ""
 }
 
-// The request message for
-// [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.GetSessionEntityType].
+// The request message for [SessionEntityTypes.GetSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.GetSessionEntityType].
 type GetSessionEntityTypeRequest struct {
 	// Required. The name of the session entity type. Format:
 	// `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
-	// Display Name>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// Display Name>` or `projects/<Project ID>/agent/environments/<Environment
+	// ID>/users/<User ID>/sessions/<Session ID>/entityTypes/<Entity Type Display
+	// Name>`. If `Environment ID` is not specified, we assume default 'draft'
+	// environment. If `User ID` is not specified, we assume default '-' user.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSessionEntityTypeRequest) Reset()         { *m = GetSessionEntityTypeRequest{} }
+func (m *GetSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSessionEntityTypeRequest) ProtoMessage()    {}
+func (*GetSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_0a5ede95d4809454, []int{3}
+}
+func (m *GetSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSessionEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *GetSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSessionEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSessionEntityTypeRequest.Merge(dst, src)
+}
+func (m *GetSessionEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSessionEntityTypeRequest.Size(m)
+}
+func (m *GetSessionEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSessionEntityTypeRequest.DiscardUnknown(m)
 }
 
-func (m *GetSessionEntityTypeRequest) Reset()                    { *m = GetSessionEntityTypeRequest{} }
-func (m *GetSessionEntityTypeRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSessionEntityTypeRequest) ProtoMessage()               {}
-func (*GetSessionEntityTypeRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{3} }
+var xxx_messageInfo_GetSessionEntityTypeRequest proto.InternalMessageInfo
 
 func (m *GetSessionEntityTypeRequest) GetName() string {
 	if m != nil {
@@ -192,20 +294,45 @@ func (m *GetSessionEntityTypeRequest) GetName() string {
 	return ""
 }
 
-// The request message for
-// [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.CreateSessionEntityType].
+// The request message for [SessionEntityTypes.CreateSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.CreateSessionEntityType].
 type CreateSessionEntityTypeRequest struct {
 	// Required. The session to create a session entity type for.
-	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	// Format: `projects/<Project ID>/agent/sessions/<Session ID>` or
+	// `projects/<Project ID>/agent/environments/<Environment ID>/users/<User ID>/
+	// sessions/<Session ID>`. If `Environment ID` is not specified, we assume
+	// default 'draft' environment. If `User ID` is not specified, we assume
+	// default '-' user.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The session entity type to create.
-	SessionEntityType *SessionEntityType `protobuf:"bytes,2,opt,name=session_entity_type,json=sessionEntityType" json:"session_entity_type,omitempty"`
+	SessionEntityType    *SessionEntityType `protobuf:"bytes,2,opt,name=session_entity_type,json=sessionEntityType,proto3" json:"session_entity_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *CreateSessionEntityTypeRequest) Reset()         { *m = CreateSessionEntityTypeRequest{} }
+func (m *CreateSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateSessionEntityTypeRequest) ProtoMessage()    {}
+func (*CreateSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_0a5ede95d4809454, []int{4}
+}
+func (m *CreateSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateSessionEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *CreateSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateSessionEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSessionEntityTypeRequest.Merge(dst, src)
+}
+func (m *CreateSessionEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateSessionEntityTypeRequest.Size(m)
+}
+func (m *CreateSessionEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateSessionEntityTypeRequest.DiscardUnknown(m)
 }
 
-func (m *CreateSessionEntityTypeRequest) Reset()                    { *m = CreateSessionEntityTypeRequest{} }
-func (m *CreateSessionEntityTypeRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateSessionEntityTypeRequest) ProtoMessage()               {}
-func (*CreateSessionEntityTypeRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{4} }
+var xxx_messageInfo_CreateSessionEntityTypeRequest proto.InternalMessageInfo
 
 func (m *CreateSessionEntityTypeRequest) GetParent() string {
 	if m != nil {
@@ -221,21 +348,45 @@ func (m *CreateSessionEntityTypeRequest) GetSessionEntityType() *SessionEntityTy
 	return nil
 }
 
-// The request message for
-// [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.UpdateSessionEntityType].
+// The request message for [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.UpdateSessionEntityType].
 type UpdateSessionEntityTypeRequest struct {
 	// Required. The entity type to update. Format:
 	// `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
-	// Display Name>`.
-	SessionEntityType *SessionEntityType `protobuf:"bytes,1,opt,name=session_entity_type,json=sessionEntityType" json:"session_entity_type,omitempty"`
+	// Display Name>` or `projects/<Project ID>/agent/environments/<Environment
+	// ID>/users/<User ID>/sessions/<Session ID>/entityTypes/<Entity Type Display
+	// Name>`. If `Environment ID` is not specified, we assume default 'draft'
+	// environment. If `User ID` is not specified, we assume default '-' user.
+	SessionEntityType *SessionEntityType `protobuf:"bytes,1,opt,name=session_entity_type,json=sessionEntityType,proto3" json:"session_entity_type,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateSessionEntityTypeRequest) Reset()                    { *m = UpdateSessionEntityTypeRequest{} }
-func (m *UpdateSessionEntityTypeRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateSessionEntityTypeRequest) ProtoMessage()               {}
-func (*UpdateSessionEntityTypeRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{5} }
+func (m *UpdateSessionEntityTypeRequest) Reset()         { *m = UpdateSessionEntityTypeRequest{} }
+func (m *UpdateSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateSessionEntityTypeRequest) ProtoMessage()    {}
+func (*UpdateSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_0a5ede95d4809454, []int{5}
+}
+func (m *UpdateSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *UpdateSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSessionEntityTypeRequest.Merge(dst, src)
+}
+func (m *UpdateSessionEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateSessionEntityTypeRequest.Size(m)
+}
+func (m *UpdateSessionEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateSessionEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateSessionEntityTypeRequest proto.InternalMessageInfo
 
 func (m *UpdateSessionEntityTypeRequest) GetSessionEntityType() *SessionEntityType {
 	if m != nil {
@@ -244,26 +395,50 @@ func (m *UpdateSessionEntityTypeRequest) GetSessionEntityType() *SessionEntityTy
 	return nil
 }
 
-func (m *UpdateSessionEntityTypeRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateSessionEntityTypeRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
 	return nil
 }
 
-// The request message for
-// [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.DeleteSessionEntityType].
+// The request message for [SessionEntityTypes.DeleteSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.DeleteSessionEntityType].
 type DeleteSessionEntityTypeRequest struct {
 	// Required. The name of the entity type to delete. Format:
 	// `projects/<Project ID>/agent/sessions/<Session ID>/entityTypes/<Entity Type
-	// Display Name>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// Display Name>` or `projects/<Project ID>/agent/environments/<Environment
+	// ID>/users/<User ID>/sessions/<Session ID>/entityTypes/<Entity Type Display
+	// Name>`. If `Environment ID` is not specified, we assume default 'draft'
+	// environment. If `User ID` is not specified, we assume default '-' user.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteSessionEntityTypeRequest) Reset()                    { *m = DeleteSessionEntityTypeRequest{} }
-func (m *DeleteSessionEntityTypeRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSessionEntityTypeRequest) ProtoMessage()               {}
-func (*DeleteSessionEntityTypeRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{6} }
+func (m *DeleteSessionEntityTypeRequest) Reset()         { *m = DeleteSessionEntityTypeRequest{} }
+func (m *DeleteSessionEntityTypeRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSessionEntityTypeRequest) ProtoMessage()    {}
+func (*DeleteSessionEntityTypeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_session_entity_type_0a5ede95d4809454, []int{6}
+}
+func (m *DeleteSessionEntityTypeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Unmarshal(m, b)
+}
+func (m *DeleteSessionEntityTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSessionEntityTypeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSessionEntityTypeRequest.Merge(dst, src)
+}
+func (m *DeleteSessionEntityTypeRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSessionEntityTypeRequest.Size(m)
+}
+func (m *DeleteSessionEntityTypeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSessionEntityTypeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteSessionEntityTypeRequest proto.InternalMessageInfo
 
 func (m *DeleteSessionEntityTypeRequest) GetName() string {
 	if m != nil {
@@ -291,8 +466,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for SessionEntityTypes service
-
+// SessionEntityTypesClient is the client API for SessionEntityTypes service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SessionEntityTypesClient interface {
 	// Returns the list of all session entity types in the specified session.
 	ListSessionEntityTypes(ctx context.Context, in *ListSessionEntityTypesRequest, opts ...grpc.CallOption) (*ListSessionEntityTypesResponse, error)
@@ -303,7 +479,7 @@ type SessionEntityTypesClient interface {
 	// Updates the specified session entity type.
 	UpdateSessionEntityType(ctx context.Context, in *UpdateSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error)
 	// Deletes the specified session entity type.
-	DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type sessionEntityTypesClient struct {
@@ -316,7 +492,7 @@ func NewSessionEntityTypesClient(cc *grpc.ClientConn) SessionEntityTypesClient {
 
 func (c *sessionEntityTypesClient) ListSessionEntityTypes(ctx context.Context, in *ListSessionEntityTypesRequest, opts ...grpc.CallOption) (*ListSessionEntityTypesResponse, error) {
 	out := new(ListSessionEntityTypesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/ListSessionEntityTypes", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/ListSessionEntityTypes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -325,7 +501,7 @@ func (c *sessionEntityTypesClient) ListSessionEntityTypes(ctx context.Context, i
 
 func (c *sessionEntityTypesClient) GetSessionEntityType(ctx context.Context, in *GetSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error) {
 	out := new(SessionEntityType)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/GetSessionEntityType", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/GetSessionEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -334,7 +510,7 @@ func (c *sessionEntityTypesClient) GetSessionEntityType(ctx context.Context, in
 
 func (c *sessionEntityTypesClient) CreateSessionEntityType(ctx context.Context, in *CreateSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error) {
 	out := new(SessionEntityType)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -343,24 +519,23 @@ func (c *sessionEntityTypesClient) CreateSessionEntityType(ctx context.Context,
 
 func (c *sessionEntityTypesClient) UpdateSessionEntityType(ctx context.Context, in *UpdateSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error) {
 	out := new(SessionEntityType)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *sessionEntityTypesClient) DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", in, out, c.cc, opts...)
+func (c *sessionEntityTypesClient) DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for SessionEntityTypes service
-
+// SessionEntityTypesServer is the server API for SessionEntityTypes service.
 type SessionEntityTypesServer interface {
 	// Returns the list of all session entity types in the specified session.
 	ListSessionEntityTypes(context.Context, *ListSessionEntityTypesRequest) (*ListSessionEntityTypesResponse, error)
@@ -371,7 +546,7 @@ type SessionEntityTypesServer interface {
 	// Updates the specified session entity type.
 	UpdateSessionEntityType(context.Context, *UpdateSessionEntityTypeRequest) (*SessionEntityType, error)
 	// Deletes the specified session entity type.
-	DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*google_protobuf2.Empty, error)
+	DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*empty.Empty, error)
 }
 
 func RegisterSessionEntityTypesServer(s *grpc.Server, srv SessionEntityTypesServer) {
@@ -498,60 +673,64 @@ var _SessionEntityTypes_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/dialogflow/v2beta1/session_entity_type.proto", fileDescriptor5)
-}
-
-var fileDescriptor5 = []byte{
-	// 804 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x4f, 0xdb, 0x48,
-	0x14, 0xdf, 0x31, 0xbb, 0x08, 0x06, 0xed, 0x2e, 0xcc, 0xa2, 0x10, 0x85, 0x25, 0x64, 0xcd, 0x6a,
-	0x85, 0x72, 0xb0, 0x45, 0x76, 0x2f, 0x2c, 0xfd, 0xa3, 0x42, 0x0c, 0x8a, 0x44, 0x42, 0xe4, 0x04,
-	0xa4, 0xf6, 0x62, 0x39, 0xf8, 0x61, 0x19, 0x12, 0x8f, 0x9b, 0x99, 0x40, 0x43, 0xc5, 0x85, 0xaf,
-	0xd0, 0x6b, 0x4f, 0x3d, 0xf6, 0xd0, 0x53, 0xfb, 0x01, 0x7a, 0xee, 0xb1, 0xd7, 0x4a, 0xbd, 0x54,
-	0xfd, 0x06, 0x95, 0xaa, 0x9e, 0x2a, 0x8f, 0x1d, 0x82, 0xea, 0x3f, 0xa1, 0x51, 0x6f, 0x9e, 0x37,
-	0xf3, 0x7b, 0xef, 0xf7, 0x7b, 0xf3, 0xde, 0xf3, 0xe0, 0x75, 0x9b, 0x52, 0xbb, 0x0d, 0xea, 0x61,
-	0x9b, 0xf6, 0x2c, 0xd5, 0x72, 0xcc, 0x36, 0xb5, 0x8f, 0xda, 0xf4, 0x4c, 0x3d, 0x2d, 0xb5, 0x80,
-	0x9b, 0x6b, 0x2a, 0x03, 0xc6, 0x1c, 0xea, 0x1a, 0xe0, 0x72, 0x87, 0xf7, 0x0d, 0xde, 0xf7, 0x40,
-	0xf1, 0xba, 0x94, 0x53, 0xb2, 0x1c, 0x40, 0x15, 0x01, 0x55, 0x86, 0x50, 0x25, 0x84, 0xe6, 0xfe,
-	0x0c, 0x7d, 0x9b, 0x9e, 0xa3, 0x9a, 0xae, 0x4b, 0xb9, 0xc9, 0x1d, 0xea, 0xb2, 0x00, 0x9e, 0x5b,
-	0x1b, 0x15, 0x39, 0x12, 0x31, 0xb7, 0x18, 0x42, 0xc4, 0xaa, 0xd5, 0x3b, 0x52, 0xa1, 0xe3, 0xf1,
-	0x7e, 0xb8, 0x59, 0xf8, 0x76, 0xf3, 0xc8, 0x81, 0xb6, 0x65, 0x74, 0x4c, 0x76, 0x12, 0x9c, 0x90,
-	0x3f, 0x49, 0x78, 0xae, 0x11, 0xc8, 0xd1, 0x84, 0xef, 0x66, 0xdf, 0x03, 0x42, 0xf0, 0xcf, 0xae,
-	0xd9, 0x81, 0x2c, 0x2a, 0xa0, 0xd5, 0x69, 0x5d, 0x7c, 0x93, 0x33, 0x3c, 0x1f, 0x46, 0xa7, 0xa7,
-	0xd0, 0xed, 0x3a, 0x16, 0x18, 0x1d, 0x6a, 0x41, 0x56, 0x2a, 0xa0, 0xd5, 0xdf, 0x4a, 0x9a, 0x32,
-	0x42, 0xb9, 0x12, 0x89, 0xa2, 0x04, 0x9f, 0x7b, 0xa1, 0xb7, 0x2a, 0xb5, 0x40, 0x27, 0x10, 0xb1,
-	0x91, 0x1a, 0x9e, 0x12, 0x56, 0x07, 0x58, 0x76, 0xa2, 0x30, 0xb1, 0x3a, 0x53, 0x2a, 0x8d, 0x0c,
-	0x16, 0x89, 0xa2, 0x5f, 0xf9, 0x90, 0x2f, 0x11, 0x26, 0xd1, 0xd0, 0xe4, 0x6f, 0x5c, 0xd0, 0x6a,
-	0xcd, 0x4a, 0xf3, 0xbe, 0xb1, 0x77, 0xa0, 0xe9, 0x7a, 0xa5, 0xac, 0x19, 0xd5, 0xbd, 0xb2, 0x66,
-	0xec, 0xd7, 0x1a, 0x75, 0x6d, 0xab, 0xb2, 0x5d, 0xd1, 0xca, 0xb3, 0x3f, 0x91, 0xbf, 0xf0, 0x52,
-	0xec, 0xa9, 0xc1, 0x6a, 0x16, 0x91, 0x15, 0xbc, 0x1c, 0x7b, 0xa4, 0xb1, 0x5f, 0xaf, 0xef, 0x6a,
-	0x55, 0xad, 0xd6, 0x9c, 0x95, 0x64, 0x86, 0x97, 0x76, 0x1d, 0xc6, 0x23, 0x49, 0x61, 0x3a, 0x3c,
-	0xec, 0x01, 0xe3, 0x24, 0x83, 0x27, 0x3d, 0xb3, 0x0b, 0x2e, 0x0f, 0x2f, 0x21, 0x5c, 0x91, 0x45,
-	0x3c, 0xed, 0x99, 0x36, 0x18, 0xcc, 0x39, 0x0f, 0x72, 0xff, 0x8b, 0x3e, 0xe5, 0x1b, 0x1a, 0xce,
-	0x39, 0x90, 0x25, 0x8c, 0xc5, 0x26, 0xa7, 0x27, 0xe0, 0x66, 0x27, 0x04, 0x50, 0x1c, 0x6f, 0xfa,
-	0x06, 0xf9, 0x05, 0xc2, 0xf9, 0xa4, 0xa8, 0xcc, 0xa3, 0x2e, 0x03, 0x62, 0xe1, 0xf9, 0x98, 0xea,
-	0x66, 0x59, 0x74, 0xc3, 0xc4, 0x47, 0x5c, 0xeb, 0x84, 0x45, 0xa2, 0x91, 0x7f, 0xf0, 0xef, 0x2e,
-	0x3c, 0xe2, 0xc6, 0x35, 0xb2, 0x92, 0x20, 0xfb, 0xab, 0x6f, 0xae, 0x5f, 0x11, 0x5e, 0xc3, 0x8b,
-	0x3b, 0x10, 0xa5, 0x3b, 0xc8, 0x51, 0x4c, 0x99, 0xca, 0x4f, 0x11, 0xce, 0x6f, 0x75, 0xc1, 0xe4,
-	0x90, 0x08, 0x4b, 0x4a, 0x6d, 0x0b, 0xff, 0x11, 0xa3, 0x5d, 0x30, 0x1b, 0x4f, 0xfa, 0x5c, 0x44,
-	0xba, 0xfc, 0x1a, 0xe1, 0xfc, 0xbe, 0x67, 0xa5, 0xd1, 0x4b, 0xa0, 0x81, 0x7e, 0x20, 0x0d, 0xb2,
-	0x81, 0x67, 0x7a, 0x82, 0x85, 0x98, 0x05, 0xa1, 0xc4, 0xdc, 0xc0, 0xf7, 0x60, 0x5c, 0x28, 0xdb,
-	0xfe, 0xb8, 0xa8, 0x9a, 0xec, 0x44, 0xc7, 0xc1, 0x71, 0xff, 0x5b, 0xfe, 0x0f, 0xe7, 0xcb, 0xd0,
-	0x86, 0x14, 0x09, 0x31, 0x17, 0x53, 0x7a, 0x3f, 0x85, 0x49, 0xb4, 0xf0, 0xc8, 0x3b, 0x84, 0x33,
-	0xf1, 0x35, 0x49, 0xee, 0x8c, 0xd4, 0x9a, 0xda, 0x42, 0xb9, 0xbb, 0x63, 0xe3, 0x83, 0x66, 0x90,
-	0xef, 0x5d, 0xbe, 0xfd, 0xf0, 0x44, 0xda, 0x20, 0xeb, 0x57, 0xf3, 0xf7, 0x71, 0x50, 0x2a, 0xb7,
-	0xbd, 0x2e, 0x3d, 0x86, 0x43, 0xce, 0xd4, 0xa2, 0x6a, 0xda, 0xe0, 0xf2, 0xc1, 0x2f, 0x81, 0xa9,
-	0xc5, 0x8b, 0x70, 0x48, 0x07, 0x1a, 0xde, 0x20, 0x3c, 0x1f, 0x57, 0xc2, 0xe4, 0xd6, 0x48, 0x72,
-	0x29, 0x95, 0x9f, 0x1b, 0xa3, 0x0c, 0xe2, 0xd4, 0xf8, 0x17, 0x93, 0xa6, 0xe5, 0xba, 0x14, 0xb5,
-	0x78, 0x41, 0x3e, 0x22, 0xbc, 0x90, 0xd0, 0x5c, 0x64, 0x74, 0xb6, 0xd3, 0xdb, 0x72, 0x2c, 0x4d,
-	0x07, 0x42, 0x53, 0x5d, 0x1e, 0xff, 0x86, 0xfe, 0x8f, 0x6b, 0x36, 0xf2, 0x05, 0xe1, 0x85, 0x84,
-	0x36, 0xbd, 0x81, 0xd0, 0xf4, 0x06, 0x1f, 0x4b, 0xe8, 0xb1, 0x10, 0x6a, 0x95, 0xaa, 0x43, 0xa1,
-	0x71, 0xaf, 0x90, 0xef, 0xbc, 0xd0, 0x78, 0xf1, 0xaf, 0x10, 0x5e, 0x48, 0x68, 0xf0, 0x1b, 0x88,
-	0x4f, 0x1f, 0x0d, 0xb9, 0x4c, 0x64, 0xc8, 0x68, 0xfe, 0x83, 0x65, 0x50, 0x9d, 0xc5, 0xf1, 0xab,
-	0x73, 0xf3, 0x25, 0xc2, 0x2b, 0x87, 0xb4, 0x33, 0x8a, 0xe1, 0x66, 0x26, 0x42, 0xae, 0xee, 0x73,
-	0xa9, 0xa3, 0x07, 0x95, 0x10, 0x6a, 0xd3, 0xb6, 0xe9, 0xda, 0x0a, 0xed, 0xda, 0xaa, 0x0d, 0xae,
-	0x60, 0xaa, 0x06, 0x5b, 0xa6, 0xe7, 0xb0, 0xc4, 0xe7, 0xd9, 0xc6, 0xd0, 0xf4, 0x19, 0xa1, 0x67,
-	0x92, 0x54, 0xde, 0x7e, 0x2e, 0x2d, 0xef, 0x04, 0x3e, 0xb7, 0x04, 0x9d, 0xf2, 0x90, 0xce, 0x41,
-	0x00, 0x6a, 0x4d, 0x0a, 0xff, 0xff, 0x7e, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xaf, 0x87, 0xb0, 0xb6,
-	0x77, 0x0a, 0x00, 0x00,
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/session_entity_type.proto", fileDescriptor_session_entity_type_0a5ede95d4809454)
+}
+
+var fileDescriptor_session_entity_type_0a5ede95d4809454 = []byte{
+	// 870 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
+	0x14, 0x66, 0x5c, 0x58, 0xed, 0xce, 0xf2, 0xa3, 0x3b, 0x54, 0x69, 0x94, 0xd2, 0x34, 0x78, 0x11,
+	0xaa, 0x72, 0xb0, 0xd5, 0xc0, 0x65, 0x59, 0x7e, 0x48, 0xdb, 0xb8, 0xab, 0x48, 0x9b, 0x34, 0x72,
+	0xd2, 0x4a, 0xf4, 0x62, 0x39, 0xf5, 0xab, 0x65, 0x9a, 0xcc, 0x18, 0xcf, 0xa4, 0x25, 0xad, 0x7a,
+	0xe9, 0x95, 0x03, 0x07, 0x24, 0x4e, 0x5c, 0xe0, 0xc8, 0x81, 0x03, 0xe2, 0xc2, 0x0d, 0xce, 0x9c,
+	0x10, 0x7f, 0x01, 0x12, 0x07, 0xfe, 0x01, 0x24, 0xb8, 0x21, 0x8f, 0x9d, 0xa6, 0xd4, 0xbf, 0xda,
+	0x6c, 0x4f, 0xb1, 0x9f, 0xe7, 0x7b, 0xef, 0x7d, 0x9f, 0xdf, 0xfb, 0x62, 0xfc, 0xc8, 0x65, 0xcc,
+	0x1d, 0x82, 0xbe, 0x3f, 0x64, 0x63, 0x47, 0x77, 0x3c, 0x7b, 0xc8, 0xdc, 0x83, 0x21, 0x3b, 0xd6,
+	0x8f, 0x1a, 0x03, 0x10, 0xf6, 0x86, 0xce, 0x81, 0x73, 0x8f, 0x51, 0x0b, 0xa8, 0xf0, 0xc4, 0xc4,
+	0x12, 0x13, 0x1f, 0x34, 0x3f, 0x60, 0x82, 0x91, 0xb5, 0x08, 0xaa, 0x49, 0xa8, 0x36, 0x83, 0x6a,
+	0x31, 0xb4, 0xf2, 0x46, 0x9c, 0xdb, 0xf6, 0x3d, 0xdd, 0xa6, 0x94, 0x09, 0x5b, 0x78, 0x8c, 0xf2,
+	0x08, 0x5e, 0xd9, 0x28, 0xaa, 0x9c, 0xa8, 0x58, 0x59, 0x89, 0x21, 0xf2, 0x6e, 0x30, 0x3e, 0xd0,
+	0x61, 0xe4, 0x8b, 0x49, 0xfc, 0xb0, 0x76, 0xf5, 0xe1, 0x81, 0x07, 0x43, 0xc7, 0x1a, 0xd9, 0xfc,
+	0x30, 0x3a, 0xa1, 0xfe, 0xad, 0xe0, 0x07, 0xbd, 0x88, 0x8e, 0x21, 0x73, 0xf7, 0x27, 0x3e, 0x10,
+	0x82, 0x5f, 0xa4, 0xf6, 0x08, 0xca, 0xa8, 0x86, 0xd6, 0xef, 0x99, 0xf2, 0x9a, 0x1c, 0xe3, 0xa5,
+	0xb8, 0x3a, 0x3b, 0x82, 0x20, 0xf0, 0x1c, 0xb0, 0x46, 0xcc, 0x81, 0xb2, 0x52, 0x43, 0xeb, 0xaf,
+	0x36, 0x0c, 0xad, 0x80, 0xb9, 0x96, 0xa8, 0xa2, 0x45, 0x97, 0xdb, 0x71, 0xb6, 0x36, 0x73, 0xc0,
+	0x24, 0x90, 0x88, 0x91, 0x0e, 0xbe, 0x2b, 0xa3, 0x1e, 0xf0, 0xf2, 0x42, 0x6d, 0x61, 0xfd, 0x7e,
+	0xa3, 0x51, 0x58, 0x2c, 0x51, 0xc5, 0xbc, 0xc8, 0xa1, 0x9e, 0x23, 0x4c, 0x92, 0xa5, 0xc9, 0x5b,
+	0xb8, 0x66, 0x74, 0xfa, 0xad, 0xfe, 0xc7, 0xd6, 0xf6, 0xae, 0x61, 0x9a, 0xad, 0xa6, 0x61, 0xb5,
+	0xb7, 0x9b, 0x86, 0xb5, 0xd3, 0xe9, 0x75, 0x8d, 0xcd, 0xd6, 0x56, 0xcb, 0x68, 0x2e, 0xbe, 0x40,
+	0xde, 0xc4, 0xab, 0xa9, 0xa7, 0xa6, 0x77, 0x8b, 0x88, 0x3c, 0xc4, 0x6b, 0xa9, 0x47, 0x7a, 0x3b,
+	0xdd, 0xee, 0x33, 0xa3, 0x6d, 0x74, 0xfa, 0x8b, 0x8a, 0xca, 0xf1, 0xea, 0x33, 0x8f, 0x8b, 0x84,
+	0x28, 0xdc, 0x84, 0x4f, 0xc7, 0xc0, 0x05, 0x29, 0xe1, 0x3b, 0xbe, 0x1d, 0x00, 0x15, 0xf1, 0x4b,
+	0x88, 0xef, 0xc8, 0x0a, 0xbe, 0xe7, 0xdb, 0x2e, 0x58, 0xdc, 0x3b, 0x89, 0xb4, 0x7f, 0xc9, 0xbc,
+	0x1b, 0x06, 0x7a, 0xde, 0x09, 0x90, 0x55, 0x8c, 0xe5, 0x43, 0xc1, 0x0e, 0x81, 0x96, 0x17, 0x24,
+	0x50, 0x1e, 0xef, 0x87, 0x01, 0xf5, 0x7b, 0x84, 0xab, 0x59, 0x55, 0xb9, 0xcf, 0x28, 0x07, 0xe2,
+	0xe0, 0xa5, 0x94, 0xe9, 0xe6, 0x65, 0x74, 0x4d, 0xe1, 0x13, 0xa9, 0x4d, 0xc2, 0x13, 0xd5, 0xc8,
+	0xdb, 0xf8, 0x35, 0x0a, 0x9f, 0x09, 0xeb, 0x52, 0xb3, 0x8a, 0x6c, 0xf6, 0x95, 0x30, 0xdc, 0xbd,
+	0x68, 0x78, 0x03, 0xaf, 0x3c, 0x85, 0x64, 0xbb, 0x53, 0x8d, 0x52, 0xc6, 0x54, 0xfd, 0x1a, 0xe1,
+	0xea, 0x66, 0x00, 0xb6, 0x80, 0x4c, 0x58, 0x96, 0xb4, 0x03, 0xfc, 0x7a, 0x0a, 0x77, 0xd9, 0xd9,
+	0x7c, 0xd4, 0x1f, 0x24, 0xa8, 0xab, 0xbf, 0x20, 0x5c, 0xdd, 0xf1, 0x9d, 0xbc, 0xf6, 0x32, 0xda,
+	0x40, 0xb7, 0xd8, 0x06, 0x79, 0x8c, 0xef, 0x8f, 0x65, 0x17, 0xd2, 0x0b, 0x62, 0x8a, 0x95, 0x69,
+	0xee, 0xa9, 0x5d, 0x68, 0x5b, 0xa1, 0x5d, 0xb4, 0x6d, 0x7e, 0x68, 0xe2, 0xe8, 0x78, 0x78, 0xad,
+	0xbe, 0x8b, 0xab, 0x4d, 0x18, 0x42, 0x0e, 0x85, 0x94, 0x17, 0xd3, 0xf8, 0xf5, 0x65, 0x4c, 0x92,
+	0x83, 0x47, 0x7e, 0x50, 0x70, 0x29, 0x7d, 0x26, 0xc9, 0x87, 0x85, 0x5c, 0x73, 0x57, 0xa8, 0xf2,
+	0xd1, 0xdc, 0xf8, 0x68, 0x19, 0xd4, 0xaf, 0xd0, 0xf9, 0xef, 0x7f, 0x7e, 0xa9, 0x7c, 0x81, 0xc8,
+	0xa3, 0x0b, 0x07, 0x3e, 0x8d, 0x86, 0xe5, 0x03, 0x3f, 0x60, 0x9f, 0xc0, 0xbe, 0xe0, 0x7a, 0x5d,
+	0xb7, 0x5d, 0xa0, 0x62, 0xfa, 0xa7, 0xc0, 0xf5, 0xfa, 0x59, 0x6c, 0xd3, 0x32, 0xd9, 0x9e, 0x49,
+	0xba, 0xc5, 0x60, 0xa0, 0x47, 0x5e, 0xc0, 0xe8, 0x08, 0xa8, 0x0c, 0x8e, 0x39, 0x04, 0xe1, 0x6f,
+	0x46, 0x4e, 0xf2, 0x8d, 0x82, 0x97, 0xd2, 0x16, 0x83, 0xbc, 0x5f, 0x48, 0x39, 0x67, 0x9f, 0x2a,
+	0x73, 0x0c, 0x57, 0xba, 0x46, 0xe1, 0x0b, 0xcf, 0x53, 0xe8, 0x32, 0x19, 0xbd, 0x7e, 0xf6, 0x7f,
+	0x8d, 0xd2, 0xc1, 0x85, 0x0a, 0x5d, 0xc9, 0x49, 0x7e, 0x53, 0xf0, 0x72, 0x86, 0x11, 0x90, 0xe2,
+	0xc9, 0xc8, 0xb7, 0x90, 0xb9, 0x94, 0xfa, 0x39, 0x52, 0xea, 0x27, 0xa4, 0xce, 0x3f, 0x4d, 0xef,
+	0xa5, 0x59, 0xc3, 0x9e, 0xab, 0xde, 0xfa, 0x88, 0xa5, 0x16, 0x22, 0xff, 0x2a, 0x78, 0x39, 0xc3,
+	0xbd, 0xae, 0xa1, 0x69, 0xbe, 0xef, 0xcd, 0xa5, 0xe9, 0x5f, 0x91, 0xa6, 0x7f, 0xa0, 0x46, 0x7b,
+	0xa6, 0x40, 0xda, 0xe7, 0xd9, 0x0d, 0x27, 0x32, 0x5d, 0xe7, 0xd3, 0x86, 0x33, 0x4f, 0x95, 0x9b,
+	0x8e, 0x6e, 0xba, 0xf6, 0x9f, 0x2b, 0x78, 0x39, 0xc3, 0x76, 0xaf, 0xa1, 0x7d, 0xbe, 0x61, 0x57,
+	0x4a, 0x09, 0xeb, 0x37, 0xc2, 0xcf, 0xc8, 0xd9, 0x76, 0xd7, 0x9f, 0x67, 0xbb, 0xeb, 0xb7, 0xbe,
+	0xdd, 0x4f, 0x7e, 0x44, 0xf8, 0xe1, 0x3e, 0x1b, 0x15, 0xf1, 0x7e, 0x52, 0x4a, 0x50, 0xee, 0x86,
+	0x0c, 0xbb, 0x68, 0xaf, 0x15, 0x43, 0x5d, 0x36, 0xb4, 0xa9, 0xab, 0xb1, 0xc0, 0xd5, 0x5d, 0xa0,
+	0x92, 0xbf, 0x1e, 0x3d, 0xb2, 0x7d, 0x8f, 0x67, 0x7e, 0x8a, 0x3f, 0x9e, 0x85, 0xfe, 0x41, 0xe8,
+	0x5b, 0x45, 0x69, 0x6e, 0x7d, 0xa7, 0xac, 0x3d, 0x8d, 0x72, 0x6e, 0xca, 0x76, 0x9a, 0xb3, 0x76,
+	0x76, 0x23, 0xd0, 0xe0, 0x8e, 0xcc, 0xff, 0xce, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xc9,
+	0xd4, 0x00, 0x63, 0x0c, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
index 80e59ea3..d43f3d90 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1/webhook.pb.go
@@ -1,40 +1,70 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/dialogflow/v2beta1/webhook.proto
 
-package dialogflow
+package dialogflow // import "google.golang.org/genproto/googleapis/cloud/dialogflow/v2beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/struct"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The request message for a webhook call.
 type WebhookRequest struct {
 	// The unique identifier of detectIntent request session.
 	// Can be used to identify end-user inside webhook implementation.
 	// Format: `projects/<Project ID>/agent/sessions/<Session ID>`.
-	Session string `protobuf:"bytes,4,opt,name=session" json:"session,omitempty"`
+	Session string `protobuf:"bytes,4,opt,name=session,proto3" json:"session,omitempty"`
 	// The unique identifier of the response. Contains the same value as
 	// `[Streaming]DetectIntentResponse.response_id`.
-	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId" json:"response_id,omitempty"`
+	ResponseId string `protobuf:"bytes,1,opt,name=response_id,json=responseId,proto3" json:"response_id,omitempty"`
 	// The result of the conversational query or event processing. Contains the
 	// same value as `[Streaming]DetectIntentResponse.query_result`.
-	QueryResult *QueryResult `protobuf:"bytes,2,opt,name=query_result,json=queryResult" json:"query_result,omitempty"`
+	QueryResult *QueryResult `protobuf:"bytes,2,opt,name=query_result,json=queryResult,proto3" json:"query_result,omitempty"`
+	// Alternative query results from KnowledgeService.
+	AlternativeQueryResults []*QueryResult `protobuf:"bytes,5,rep,name=alternative_query_results,json=alternativeQueryResults,proto3" json:"alternative_query_results,omitempty"`
 	// Optional. The contents of the original request that was passed to
 	// `[Streaming]DetectIntent` call.
-	OriginalDetectIntentRequest *OriginalDetectIntentRequest `protobuf:"bytes,3,opt,name=original_detect_intent_request,json=originalDetectIntentRequest" json:"original_detect_intent_request,omitempty"`
+	OriginalDetectIntentRequest *OriginalDetectIntentRequest `protobuf:"bytes,3,opt,name=original_detect_intent_request,json=originalDetectIntentRequest,proto3" json:"original_detect_intent_request,omitempty"`
+	XXX_NoUnkeyedLiteral        struct{}                     `json:"-"`
+	XXX_unrecognized            []byte                       `json:"-"`
+	XXX_sizecache               int32                        `json:"-"`
+}
+
+func (m *WebhookRequest) Reset()         { *m = WebhookRequest{} }
+func (m *WebhookRequest) String() string { return proto.CompactTextString(m) }
+func (*WebhookRequest) ProtoMessage()    {}
+func (*WebhookRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_webhook_d5d0c4a657643b71, []int{0}
+}
+func (m *WebhookRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebhookRequest.Unmarshal(m, b)
+}
+func (m *WebhookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebhookRequest.Marshal(b, m, deterministic)
+}
+func (dst *WebhookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebhookRequest.Merge(dst, src)
+}
+func (m *WebhookRequest) XXX_Size() int {
+	return xxx_messageInfo_WebhookRequest.Size(m)
+}
+func (m *WebhookRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebhookRequest.DiscardUnknown(m)
 }
 
-func (m *WebhookRequest) Reset()                    { *m = WebhookRequest{} }
-func (m *WebhookRequest) String() string            { return proto.CompactTextString(m) }
-func (*WebhookRequest) ProtoMessage()               {}
-func (*WebhookRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+var xxx_messageInfo_WebhookRequest proto.InternalMessageInfo
 
 func (m *WebhookRequest) GetSession() string {
 	if m != nil {
@@ -57,6 +87,13 @@ func (m *WebhookRequest) GetQueryResult() *QueryResult {
 	return nil
 }
 
+func (m *WebhookRequest) GetAlternativeQueryResults() []*QueryResult {
+	if m != nil {
+		return m.AlternativeQueryResults
+	}
+	return nil
+}
+
 func (m *WebhookRequest) GetOriginalDetectIntentRequest() *OriginalDetectIntentRequest {
 	if m != nil {
 		return m.OriginalDetectIntentRequest
@@ -68,26 +105,74 @@ func (m *WebhookRequest) GetOriginalDetectIntentRequest() *OriginalDetectIntentR
 type WebhookResponse struct {
 	// Optional. The text to be shown on the screen. This value is passed directly
 	// to `QueryResult.fulfillment_text`.
-	FulfillmentText string `protobuf:"bytes,1,opt,name=fulfillment_text,json=fulfillmentText" json:"fulfillment_text,omitempty"`
+	FulfillmentText string `protobuf:"bytes,1,opt,name=fulfillment_text,json=fulfillmentText,proto3" json:"fulfillment_text,omitempty"`
 	// Optional. The collection of rich messages to present to the user. This
 	// value is passed directly to `QueryResult.fulfillment_messages`.
-	FulfillmentMessages []*Intent_Message `protobuf:"bytes,2,rep,name=fulfillment_messages,json=fulfillmentMessages" json:"fulfillment_messages,omitempty"`
+	FulfillmentMessages []*Intent_Message `protobuf:"bytes,2,rep,name=fulfillment_messages,json=fulfillmentMessages,proto3" json:"fulfillment_messages,omitempty"`
 	// Optional. This value is passed directly to `QueryResult.webhook_source`.
-	Source string `protobuf:"bytes,3,opt,name=source" json:"source,omitempty"`
+	Source string `protobuf:"bytes,3,opt,name=source,proto3" json:"source,omitempty"`
 	// Optional. This value is passed directly to `QueryResult.webhook_payload`.
-	Payload *google_protobuf4.Struct `protobuf:"bytes,4,opt,name=payload" json:"payload,omitempty"`
+	// See the related `fulfillment_messages[i].payload field`, which may be used
+	// as an alternative to this field.
+	//
+	// This field can be used for Actions on Google responses.
+	// It should have a structure similar to the JSON message shown here. For more
+	// information, see
+	// [Actions on Google Webhook
+	// Format](https://developers.google.com/actions/dialogflow/webhook)
+	// <pre>{
+	//   "google": {
+	//     "expectUserResponse": true,
+	//     "richResponse": {
+	//       "items": [
+	//         {
+	//           "simpleResponse": {
+	//             "textToSpeech": "this is a simple response"
+	//           }
+	//         }
+	//       ]
+	//     }
+	//   }
+	// }</pre>
+	Payload *_struct.Struct `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Optional. The collection of output contexts. This value is passed directly
 	// to `QueryResult.output_contexts`.
-	OutputContexts []*Context `protobuf:"bytes,5,rep,name=output_contexts,json=outputContexts" json:"output_contexts,omitempty"`
+	OutputContexts []*Context `protobuf:"bytes,5,rep,name=output_contexts,json=outputContexts,proto3" json:"output_contexts,omitempty"`
 	// Optional. Makes the platform immediately invoke another `DetectIntent` call
 	// internally with the specified event as input.
-	FollowupEventInput *EventInput `protobuf:"bytes,6,opt,name=followup_event_input,json=followupEventInput" json:"followup_event_input,omitempty"`
+	FollowupEventInput *EventInput `protobuf:"bytes,6,opt,name=followup_event_input,json=followupEventInput,proto3" json:"followup_event_input,omitempty"`
+	// Optional. Indicates that this intent ends an interaction. Some integrations
+	// (e.g., Actions on Google or Dialogflow phone gateway) use this information
+	// to close interaction with an end user. Default is false.
+	EndInteraction       bool     `protobuf:"varint,8,opt,name=end_interaction,json=endInteraction,proto3" json:"end_interaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebhookResponse) Reset()         { *m = WebhookResponse{} }
+func (m *WebhookResponse) String() string { return proto.CompactTextString(m) }
+func (*WebhookResponse) ProtoMessage()    {}
+func (*WebhookResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_webhook_d5d0c4a657643b71, []int{1}
+}
+func (m *WebhookResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebhookResponse.Unmarshal(m, b)
+}
+func (m *WebhookResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebhookResponse.Marshal(b, m, deterministic)
+}
+func (dst *WebhookResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebhookResponse.Merge(dst, src)
+}
+func (m *WebhookResponse) XXX_Size() int {
+	return xxx_messageInfo_WebhookResponse.Size(m)
+}
+func (m *WebhookResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebhookResponse.DiscardUnknown(m)
 }
 
-func (m *WebhookResponse) Reset()                    { *m = WebhookResponse{} }
-func (m *WebhookResponse) String() string            { return proto.CompactTextString(m) }
-func (*WebhookResponse) ProtoMessage()               {}
-func (*WebhookResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
+var xxx_messageInfo_WebhookResponse proto.InternalMessageInfo
 
 func (m *WebhookResponse) GetFulfillmentText() string {
 	if m != nil {
@@ -110,7 +195,7 @@ func (m *WebhookResponse) GetSource() string {
 	return ""
 }
 
-func (m *WebhookResponse) GetPayload() *google_protobuf4.Struct {
+func (m *WebhookResponse) GetPayload() *_struct.Struct {
 	if m != nil {
 		return m.Payload
 	}
@@ -131,22 +216,66 @@ func (m *WebhookResponse) GetFollowupEventInput() *EventInput {
 	return nil
 }
 
+func (m *WebhookResponse) GetEndInteraction() bool {
+	if m != nil {
+		return m.EndInteraction
+	}
+	return false
+}
+
 // Represents the contents of the original request that was passed to
 // the `[Streaming]DetectIntent` call.
 type OriginalDetectIntentRequest struct {
 	// The source of this request, e.g., `google`, `facebook`, `slack`. It is set
-	// by Dialogflow-owned servers. Possible values of this field correspond to
-	// [Intent.Message.Platform][google.cloud.dialogflow.v2beta1.Intent.Message.Platform].
-	Source string `protobuf:"bytes,1,opt,name=source" json:"source,omitempty"`
+	// by Dialogflow-owned servers.
+	Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"`
+	// Optional. The version of the protocol used for this request.
+	// This field is AoG-specific.
+	Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
 	// Optional. This field is set to the value of `QueryParameters.payload` field
 	// passed in the request.
-	Payload *google_protobuf4.Struct `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	//
+	// This field is used for the telephony gateway. It should have a
+	// structure similar to this JSON message:
+	// <pre>{
+	//  "telephony": {
+	//    "caller_id": "+18558363987"
+	//  }
+	// }</pre>
+	// Note: The caller ID field (`caller_id`) will be in
+	// [E.164 format](https://en.wikipedia.org/wiki/E.164) and is only supported
+	// for Enterprise Edition and not for Standard Edition agents. When the
+	// telephony gateway is used with a standard tier agent the `caller_id` field
+	// above will have a value of `REDACTED_IN_STANDARD_TIER_AGENT`.
+	Payload              *_struct.Struct `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *OriginalDetectIntentRequest) Reset()                    { *m = OriginalDetectIntentRequest{} }
-func (m *OriginalDetectIntentRequest) String() string            { return proto.CompactTextString(m) }
-func (*OriginalDetectIntentRequest) ProtoMessage()               {}
-func (*OriginalDetectIntentRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{2} }
+func (m *OriginalDetectIntentRequest) Reset()         { *m = OriginalDetectIntentRequest{} }
+func (m *OriginalDetectIntentRequest) String() string { return proto.CompactTextString(m) }
+func (*OriginalDetectIntentRequest) ProtoMessage()    {}
+func (*OriginalDetectIntentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_webhook_d5d0c4a657643b71, []int{2}
+}
+func (m *OriginalDetectIntentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OriginalDetectIntentRequest.Unmarshal(m, b)
+}
+func (m *OriginalDetectIntentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OriginalDetectIntentRequest.Marshal(b, m, deterministic)
+}
+func (dst *OriginalDetectIntentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OriginalDetectIntentRequest.Merge(dst, src)
+}
+func (m *OriginalDetectIntentRequest) XXX_Size() int {
+	return xxx_messageInfo_OriginalDetectIntentRequest.Size(m)
+}
+func (m *OriginalDetectIntentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_OriginalDetectIntentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OriginalDetectIntentRequest proto.InternalMessageInfo
 
 func (m *OriginalDetectIntentRequest) GetSource() string {
 	if m != nil {
@@ -155,7 +284,14 @@ func (m *OriginalDetectIntentRequest) GetSource() string {
 	return ""
 }
 
-func (m *OriginalDetectIntentRequest) GetPayload() *google_protobuf4.Struct {
+func (m *OriginalDetectIntentRequest) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
+func (m *OriginalDetectIntentRequest) GetPayload() *_struct.Struct {
 	if m != nil {
 		return m.Payload
 	}
@@ -168,42 +304,48 @@ func init() {
 	proto.RegisterType((*OriginalDetectIntentRequest)(nil), "google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest")
 }
 
-func init() { proto.RegisterFile("google/cloud/dialogflow/v2beta1/webhook.proto", fileDescriptor6) }
-
-var fileDescriptor6 = []byte{
-	// 538 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x6f, 0xd3, 0x30,
-	0x14, 0x56, 0x52, 0xd8, 0x34, 0x77, 0x5a, 0x91, 0x99, 0x20, 0xda, 0x10, 0xad, 0xca, 0xa5, 0x88,
-	0x91, 0x68, 0xe5, 0x08, 0xa7, 0xad, 0x80, 0x7a, 0x40, 0xdb, 0x02, 0x02, 0x09, 0x09, 0x45, 0x6e,
-	0xe2, 0x66, 0x16, 0xae, 0x5f, 0x1a, 0xdb, 0xeb, 0x76, 0xe4, 0x87, 0x20, 0x21, 0x8e, 0xfb, 0x85,
-	0x1c, 0x51, 0x6c, 0x87, 0xf4, 0x52, 0xb2, 0xe3, 0x7b, 0xfe, 0xbe, 0xef, 0x7d, 0xfe, 0xfc, 0x8c,
-	0x5e, 0xe6, 0x00, 0x39, 0xa7, 0x51, 0xca, 0x41, 0x67, 0x51, 0xc6, 0x08, 0x87, 0x7c, 0xce, 0x61,
-	0x15, 0x5d, 0x8d, 0x67, 0x54, 0x91, 0xe3, 0x68, 0x45, 0x67, 0x97, 0x00, 0xdf, 0xc3, 0xa2, 0x04,
-	0x05, 0xb8, 0x6f, 0xe1, 0xa1, 0x81, 0x87, 0x0d, 0x3c, 0x74, 0xf0, 0x83, 0x27, 0x4e, 0x8f, 0x14,
-	0x2c, 0x22, 0x42, 0x80, 0x22, 0x8a, 0x81, 0x90, 0x96, 0x7e, 0xd0, 0x3a, 0x2d, 0x05, 0xa1, 0xe8,
-	0xb5, 0x72, 0xf0, 0xa3, 0x36, 0x38, 0x13, 0x8a, 0x0a, 0x75, 0x57, 0x71, 0x49, 0xa5, 0x64, 0x20,
-	0x1c, 0xbc, 0x76, 0x6a, 0xaa, 0x99, 0x9e, 0x47, 0x52, 0x95, 0x3a, 0x75, 0x62, 0xc3, 0x5f, 0x3e,
-	0xda, 0xfb, 0x62, 0xaf, 0x1e, 0xd3, 0xa5, 0xa6, 0x52, 0xe1, 0x00, 0x6d, 0x3b, 0x85, 0xe0, 0xde,
-	0xc0, 0x1b, 0xed, 0xc4, 0x75, 0x89, 0xfb, 0xa8, 0x5b, 0x52, 0x59, 0x80, 0x90, 0x34, 0x61, 0x59,
-	0xe0, 0x99, 0x53, 0x54, 0xb7, 0xa6, 0x19, 0x3e, 0x43, 0xbb, 0x4b, 0x4d, 0xcb, 0x9b, 0xa4, 0xa4,
-	0x52, 0x73, 0x15, 0xf8, 0x03, 0x6f, 0xd4, 0x1d, 0x1f, 0x85, 0x2d, 0x69, 0x86, 0x17, 0x15, 0x29,
-	0x36, 0x9c, 0xb8, 0xbb, 0x6c, 0x0a, 0xfc, 0xc3, 0x43, 0x4f, 0xa1, 0x64, 0x39, 0x13, 0x84, 0x27,
-	0x19, 0x55, 0x34, 0x55, 0x89, 0x0d, 0x23, 0x29, 0xad, 0xdd, 0xa0, 0x63, 0x66, 0xbc, 0x69, 0x9d,
-	0x71, 0xe6, 0x64, 0x26, 0x46, 0x65, 0x6a, 0x44, 0xdc, 0x95, 0xe3, 0x43, 0xd8, 0x7c, 0x38, 0xfc,
-	0xd9, 0x41, 0xbd, 0x7f, 0x11, 0xd9, 0xab, 0xe2, 0xe7, 0xe8, 0xc1, 0x5c, 0xf3, 0x39, 0xe3, 0x7c,
-	0x51, 0x79, 0xa9, 0xde, 0xd2, 0xc5, 0xd1, 0x5b, 0xeb, 0x7f, 0xa2, 0xd7, 0x0a, 0xcf, 0xd0, 0xfe,
-	0x3a, 0x74, 0x41, 0xa5, 0x24, 0x39, 0x95, 0x81, 0x3f, 0xe8, 0x8c, 0xba, 0xe3, 0xa8, 0xd5, 0xb7,
-	0x35, 0x13, 0x7e, 0xb0, 0xbc, 0xf8, 0xe1, 0x9a, 0x98, 0xeb, 0x49, 0xfc, 0x08, 0x6d, 0x49, 0xd0,
-	0x65, 0x4a, 0x4d, 0x1a, 0x3b, 0xb1, 0xab, 0xf0, 0x31, 0xda, 0x2e, 0xc8, 0x0d, 0x07, 0x92, 0x99,
-	0xa7, 0xec, 0x8e, 0x1f, 0xd7, 0xe3, 0xea, 0x6d, 0x08, 0x3f, 0x9a, 0x6d, 0x88, 0x6b, 0x1c, 0xbe,
-	0x40, 0x3d, 0xd0, 0xaa, 0xd0, 0x2a, 0x71, 0x3b, 0x2a, 0x83, 0xfb, 0xc6, 0xe9, 0xa8, 0xd5, 0xe9,
-	0xa9, 0x25, 0xc4, 0x7b, 0x56, 0xc0, 0x95, 0x12, 0x7f, 0x43, 0xfb, 0x73, 0xe0, 0x1c, 0x56, 0xba,
-	0x48, 0xe8, 0x55, 0x15, 0x02, 0x13, 0x85, 0x56, 0xc1, 0x96, 0xb1, 0xf4, 0xa2, 0x55, 0xf7, 0x6d,
-	0xc5, 0x99, 0x56, 0x94, 0x18, 0xd7, 0x42, 0x4d, 0x6f, 0x78, 0x89, 0x0e, 0xff, 0xf3, 0xb6, 0x6b,
-	0xd9, 0x78, 0x9b, 0xb2, 0xe9, 0xdc, 0x2d, 0x9b, 0x93, 0x5b, 0x0f, 0x3d, 0x4b, 0x61, 0xd1, 0x66,
-	0xf8, 0x64, 0xd7, 0xad, 0xcb, 0x79, 0x25, 0x74, 0xee, 0x7d, 0x9d, 0x3a, 0x42, 0x0e, 0x9c, 0x88,
-	0x3c, 0x84, 0x32, 0x8f, 0x72, 0x2a, 0xcc, 0x98, 0xc8, 0x1e, 0x91, 0x82, 0xc9, 0x8d, 0x1f, 0xfa,
-	0x75, 0xd3, 0xfa, 0xe3, 0x79, 0xbf, 0x7d, 0x7f, 0xf2, 0xee, 0xd6, 0xef, 0xbf, 0xb7, 0x9a, 0xa7,
-	0xc6, 0xc4, 0xa4, 0x31, 0xf1, 0xd9, 0x92, 0x66, 0x5b, 0x46, 0xff, 0xd5, 0xdf, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x52, 0x6e, 0x3d, 0x85, 0xfa, 0x04, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/dialogflow/v2beta1/webhook.proto", fileDescriptor_webhook_d5d0c4a657643b71)
+}
+
+var fileDescriptor_webhook_d5d0c4a657643b71 = []byte{
+	// 603 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcf, 0x6e, 0xd4, 0x30,
+	0x10, 0xc6, 0x95, 0x5d, 0xe8, 0x1f, 0x6f, 0xd5, 0x45, 0xa6, 0xa2, 0xa1, 0x45, 0x74, 0x55, 0x0e,
+	0x2c, 0xa2, 0x24, 0x6a, 0x39, 0xc2, 0xa9, 0x2d, 0xa0, 0x3d, 0xa0, 0xb6, 0x01, 0x81, 0x84, 0x84,
+	0x22, 0x6f, 0x32, 0x9b, 0x46, 0xb8, 0x9e, 0x34, 0xb6, 0x77, 0xdb, 0x23, 0x1c, 0x79, 0x0c, 0x8e,
+	0x7d, 0x10, 0x9e, 0x89, 0x23, 0x8a, 0xed, 0xb0, 0xe1, 0x50, 0x52, 0x8e, 0x33, 0x9e, 0xef, 0xe7,
+	0xf1, 0x97, 0x99, 0x90, 0x67, 0x19, 0x62, 0xc6, 0x21, 0x4c, 0x38, 0xea, 0x34, 0x4c, 0x73, 0xc6,
+	0x31, 0x9b, 0x70, 0x9c, 0x85, 0xd3, 0xbd, 0x31, 0x28, 0xb6, 0x1b, 0xce, 0x60, 0x7c, 0x8a, 0xf8,
+	0x25, 0x28, 0x4a, 0x54, 0x48, 0xb7, 0x6c, 0x79, 0x60, 0xca, 0x83, 0x79, 0x79, 0xe0, 0xca, 0x37,
+	0x1e, 0x38, 0x1e, 0x2b, 0xf2, 0x90, 0x09, 0x81, 0x8a, 0xa9, 0x1c, 0x85, 0xb4, 0xf2, 0x8d, 0xd6,
+	0xdb, 0x12, 0x14, 0x0a, 0x2e, 0x94, 0x2b, 0xdf, 0x69, 0x2b, 0xcf, 0x85, 0x02, 0xa1, 0x6e, 0x0a,
+	0x97, 0x20, 0x65, 0x8e, 0xc2, 0x95, 0xd7, 0x9d, 0x9a, 0x68, 0xac, 0x27, 0xa1, 0x54, 0xa5, 0x4e,
+	0x1c, 0x6c, 0xfb, 0x7b, 0x97, 0xac, 0x7e, 0xb4, 0x4f, 0x8f, 0xe0, 0x5c, 0x83, 0x54, 0xd4, 0x27,
+	0x8b, 0x8e, 0xe0, 0xdf, 0x1a, 0x78, 0xc3, 0xe5, 0xa8, 0x0e, 0xe9, 0x16, 0xe9, 0x95, 0x20, 0x0b,
+	0x14, 0x12, 0xe2, 0x3c, 0xf5, 0x3d, 0x73, 0x4a, 0xea, 0xd4, 0x28, 0xa5, 0x47, 0x64, 0xe5, 0x5c,
+	0x43, 0x79, 0x19, 0x97, 0x20, 0x35, 0x57, 0x7e, 0x67, 0xe0, 0x0d, 0x7b, 0x7b, 0x3b, 0x41, 0x8b,
+	0x9b, 0xc1, 0x49, 0x25, 0x8a, 0x8c, 0x26, 0xea, 0x9d, 0xcf, 0x03, 0x7a, 0x4a, 0xee, 0x33, 0xae,
+	0xa0, 0x14, 0x4c, 0xe5, 0x53, 0x88, 0x9b, 0x70, 0xe9, 0xdf, 0x1e, 0x74, 0xff, 0x9b, 0xbe, 0xde,
+	0xc0, 0x35, 0xf2, 0x92, 0x7e, 0xf5, 0xc8, 0x43, 0x2c, 0xf3, 0x2c, 0x17, 0x8c, 0xc7, 0x29, 0x28,
+	0x48, 0x54, 0x6c, 0x6d, 0x8f, 0x4b, 0x6b, 0x8c, 0xdf, 0x35, 0xaf, 0x79, 0xd9, 0x7a, 0xdf, 0x91,
+	0xc3, 0x1c, 0x1a, 0xca, 0xc8, 0x40, 0x9c, 0xb9, 0xd1, 0x26, 0x5e, 0x7f, 0xb8, 0xfd, 0xb3, 0x4b,
+	0xfa, 0x7f, 0x3e, 0x86, 0x35, 0x95, 0x3e, 0x21, 0x77, 0x26, 0x9a, 0x4f, 0x72, 0xce, 0xcf, 0xaa,
+	0x5e, 0xaa, 0xa9, 0x71, 0xc6, 0xf7, 0x1b, 0xf9, 0xf7, 0x70, 0xa1, 0xe8, 0x98, 0xac, 0x35, 0x4b,
+	0xcf, 0x40, 0x4a, 0x96, 0x81, 0xf4, 0x3b, 0xc6, 0xa7, 0xb0, 0xb5, 0x6f, 0xdb, 0x4c, 0xf0, 0xd6,
+	0xea, 0xa2, 0xbb, 0x0d, 0x98, 0xcb, 0x49, 0x7a, 0x8f, 0x2c, 0x48, 0xd4, 0x65, 0x02, 0xc6, 0x8d,
+	0xe5, 0xc8, 0x45, 0x74, 0x97, 0x2c, 0x16, 0xec, 0x92, 0x23, 0x4b, 0xcd, 0xd0, 0xf4, 0xf6, 0xd6,
+	0xeb, 0xeb, 0xea, 0xb9, 0x0b, 0xde, 0x99, 0xb9, 0x8b, 0xea, 0x3a, 0x7a, 0x42, 0xfa, 0xa8, 0x55,
+	0xa1, 0x55, 0xec, 0xb6, 0xa1, 0xfe, 0xa2, 0xc3, 0xd6, 0x4e, 0x0f, 0xac, 0x20, 0x5a, 0xb5, 0x00,
+	0x17, 0x4a, 0xfa, 0x99, 0xac, 0x4d, 0x90, 0x73, 0x9c, 0xe9, 0x22, 0x86, 0x69, 0x65, 0x42, 0x2e,
+	0x0a, 0xad, 0xfc, 0x05, 0xd3, 0xd2, 0xd3, 0x56, 0xee, 0xab, 0x4a, 0x33, 0xaa, 0x24, 0x11, 0xad,
+	0x41, 0xf3, 0x1c, 0x7d, 0x4c, 0xfa, 0x20, 0x52, 0x33, 0x16, 0x25, 0x4b, 0xaa, 0x85, 0xf7, 0x97,
+	0x06, 0xde, 0x70, 0x29, 0x5a, 0x05, 0x91, 0x8e, 0xe6, 0xd9, 0xed, 0x6f, 0x1e, 0xd9, 0xfc, 0xc7,
+	0x14, 0x34, 0x5c, 0xf4, 0xfe, 0x72, 0xd1, 0x27, 0x8b, 0x53, 0x28, 0xcd, 0xea, 0x75, 0xec, 0xea,
+	0xb9, 0xb0, 0xe9, 0x6f, 0xf7, 0x66, 0xfe, 0xee, 0x5f, 0x79, 0xe4, 0x51, 0x82, 0x67, 0x6d, 0x8f,
+	0xde, 0x5f, 0x71, 0x23, 0x77, 0x5c, 0x81, 0x8e, 0xbd, 0x4f, 0x23, 0x27, 0xc8, 0x90, 0x33, 0x91,
+	0x05, 0x58, 0x66, 0x61, 0x06, 0xc2, 0x5c, 0x13, 0xda, 0x23, 0x56, 0xe4, 0xf2, 0xda, 0xdf, 0xcf,
+	0x8b, 0x79, 0xea, 0x97, 0xe7, 0xfd, 0xe8, 0x74, 0x0e, 0x5f, 0x5f, 0x75, 0xb6, 0xde, 0x58, 0xe6,
+	0x81, 0x69, 0xe2, 0x70, 0xde, 0xc4, 0x07, 0x2b, 0x1a, 0x2f, 0x18, 0xfe, 0xf3, 0xdf, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x42, 0x28, 0x28, 0xef, 0xa8, 0x05, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/functions/v1beta2/functions.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/functions/v1beta2/functions.pb.go
index 53a9f562..73ad4c4f 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/functions/v1beta2/functions.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/functions/v1beta2/functions.pb.go
@@ -1,38 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/functions/v1beta2/functions.proto
 
-/*
-Package functions is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/functions/v1beta2/functions.proto
-	google/cloud/functions/v1beta2/operations.proto
-
-It has these top-level messages:
-	CloudFunction
-	HTTPSTrigger
-	EventTrigger
-	SourceRepository
-	CreateFunctionRequest
-	UpdateFunctionRequest
-	GetFunctionRequest
-	ListFunctionsRequest
-	ListFunctionsResponse
-	DeleteFunctionRequest
-	CallFunctionRequest
-	CallFunctionResponse
-	OperationMetadataV1Beta2
-*/
-package functions
+package functions // import "google.golang.org/genproto/googleapis/cloud/functions/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -85,14 +63,16 @@ var CloudFunctionStatus_value = map[string]int32{
 func (x CloudFunctionStatus) String() string {
 	return proto.EnumName(CloudFunctionStatus_name, int32(x))
 }
-func (CloudFunctionStatus) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (CloudFunctionStatus) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{0}
+}
 
 // Describes a Cloud Function that contains user computation executed in
 // response to an event. It encapsulate function and triggers configurations.
 type CloudFunction struct {
 	// A user-defined name of the function. Function names must be unique
 	// globally and match pattern `projects/*/locations/*/functions/*`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The location of the function source code.
 	//
 	// Types that are valid to be assigned to SourceCode:
@@ -106,60 +86,80 @@ type CloudFunction struct {
 	//	*CloudFunction_EventTrigger
 	Trigger isCloudFunction_Trigger `protobuf_oneof:"trigger"`
 	// Output only. Status of the function deployment.
-	Status CloudFunctionStatus `protobuf:"varint,7,opt,name=status,enum=google.cloud.functions.v1beta2.CloudFunctionStatus" json:"status,omitempty"`
+	Status CloudFunctionStatus `protobuf:"varint,7,opt,name=status,proto3,enum=google.cloud.functions.v1beta2.CloudFunctionStatus" json:"status,omitempty"`
 	// Output only. Name of the most recent operation modifying the function. If
 	// the function status is `DEPLOYING` or `DELETING`, then it points to the
 	// active operation.
-	LatestOperation string `protobuf:"bytes,8,opt,name=latest_operation,json=latestOperation" json:"latest_operation,omitempty"`
+	LatestOperation string `protobuf:"bytes,8,opt,name=latest_operation,json=latestOperation,proto3" json:"latest_operation,omitempty"`
 	// The name of the function (as defined in source code) that will be
 	// executed. Defaults to the resource name suffix, if not specified. For
 	// backward compatibility, if function with given name is not found, then the
 	// system will try to use function named "function".
 	// For Node.js this is name of a function exported by the module specified
 	// in `source_location`.
-	EntryPoint string `protobuf:"bytes,9,opt,name=entry_point,json=entryPoint" json:"entry_point,omitempty"`
+	EntryPoint string `protobuf:"bytes,9,opt,name=entry_point,json=entryPoint,proto3" json:"entry_point,omitempty"`
 	// The function execution timeout. Execution is considered failed and
 	// can be terminated if the function is not completed at the end of the
 	// timeout period. Defaults to 60 seconds.
-	Timeout *google_protobuf3.Duration `protobuf:"bytes,10,opt,name=timeout" json:"timeout,omitempty"`
+	Timeout *duration.Duration `protobuf:"bytes,10,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// The amount of memory in MB available for a function.
 	// Defaults to 256MB.
-	AvailableMemoryMb int32 `protobuf:"varint,11,opt,name=available_memory_mb,json=availableMemoryMb" json:"available_memory_mb,omitempty"`
+	AvailableMemoryMb int32 `protobuf:"varint,11,opt,name=available_memory_mb,json=availableMemoryMb,proto3" json:"available_memory_mb,omitempty"`
 	// Output only. The service account of the function.
-	ServiceAccount string `protobuf:"bytes,13,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
+	ServiceAccount string `protobuf:"bytes,13,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
 	// Output only. The last update timestamp of a Cloud Function.
-	UpdateTime *google_protobuf4.Timestamp `protobuf:"bytes,15,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,15,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *CloudFunction) Reset()                    { *m = CloudFunction{} }
-func (m *CloudFunction) String() string            { return proto.CompactTextString(m) }
-func (*CloudFunction) ProtoMessage()               {}
-func (*CloudFunction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *CloudFunction) Reset()         { *m = CloudFunction{} }
+func (m *CloudFunction) String() string { return proto.CompactTextString(m) }
+func (*CloudFunction) ProtoMessage()    {}
+func (*CloudFunction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{0}
+}
+func (m *CloudFunction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CloudFunction.Unmarshal(m, b)
+}
+func (m *CloudFunction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CloudFunction.Marshal(b, m, deterministic)
+}
+func (dst *CloudFunction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudFunction.Merge(dst, src)
+}
+func (m *CloudFunction) XXX_Size() int {
+	return xxx_messageInfo_CloudFunction.Size(m)
+}
+func (m *CloudFunction) XXX_DiscardUnknown() {
+	xxx_messageInfo_CloudFunction.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CloudFunction proto.InternalMessageInfo
+
+func (m *CloudFunction) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
 
 type isCloudFunction_SourceCode interface {
 	isCloudFunction_SourceCode()
 }
-type isCloudFunction_Trigger interface {
-	isCloudFunction_Trigger()
-}
 
 type CloudFunction_SourceArchiveUrl struct {
-	SourceArchiveUrl string `protobuf:"bytes,14,opt,name=source_archive_url,json=sourceArchiveUrl,oneof"`
+	SourceArchiveUrl string `protobuf:"bytes,14,opt,name=source_archive_url,json=sourceArchiveUrl,proto3,oneof"`
 }
+
 type CloudFunction_SourceRepository struct {
-	SourceRepository *SourceRepository `protobuf:"bytes,3,opt,name=source_repository,json=sourceRepository,oneof"`
-}
-type CloudFunction_HttpsTrigger struct {
-	HttpsTrigger *HTTPSTrigger `protobuf:"bytes,6,opt,name=https_trigger,json=httpsTrigger,oneof"`
-}
-type CloudFunction_EventTrigger struct {
-	EventTrigger *EventTrigger `protobuf:"bytes,12,opt,name=event_trigger,json=eventTrigger,oneof"`
+	SourceRepository *SourceRepository `protobuf:"bytes,3,opt,name=source_repository,json=sourceRepository,proto3,oneof"`
 }
 
 func (*CloudFunction_SourceArchiveUrl) isCloudFunction_SourceCode() {}
+
 func (*CloudFunction_SourceRepository) isCloudFunction_SourceCode() {}
-func (*CloudFunction_HttpsTrigger) isCloudFunction_Trigger()        {}
-func (*CloudFunction_EventTrigger) isCloudFunction_Trigger()        {}
 
 func (m *CloudFunction) GetSourceCode() isCloudFunction_SourceCode {
 	if m != nil {
@@ -167,19 +167,6 @@ func (m *CloudFunction) GetSourceCode() isCloudFunction_SourceCode {
 	}
 	return nil
 }
-func (m *CloudFunction) GetTrigger() isCloudFunction_Trigger {
-	if m != nil {
-		return m.Trigger
-	}
-	return nil
-}
-
-func (m *CloudFunction) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
 
 func (m *CloudFunction) GetSourceArchiveUrl() string {
 	if x, ok := m.GetSourceCode().(*CloudFunction_SourceArchiveUrl); ok {
@@ -195,6 +182,29 @@ func (m *CloudFunction) GetSourceRepository() *SourceRepository {
 	return nil
 }
 
+type isCloudFunction_Trigger interface {
+	isCloudFunction_Trigger()
+}
+
+type CloudFunction_HttpsTrigger struct {
+	HttpsTrigger *HTTPSTrigger `protobuf:"bytes,6,opt,name=https_trigger,json=httpsTrigger,proto3,oneof"`
+}
+
+type CloudFunction_EventTrigger struct {
+	EventTrigger *EventTrigger `protobuf:"bytes,12,opt,name=event_trigger,json=eventTrigger,proto3,oneof"`
+}
+
+func (*CloudFunction_HttpsTrigger) isCloudFunction_Trigger() {}
+
+func (*CloudFunction_EventTrigger) isCloudFunction_Trigger() {}
+
+func (m *CloudFunction) GetTrigger() isCloudFunction_Trigger {
+	if m != nil {
+		return m.Trigger
+	}
+	return nil
+}
+
 func (m *CloudFunction) GetHttpsTrigger() *HTTPSTrigger {
 	if x, ok := m.GetTrigger().(*CloudFunction_HttpsTrigger); ok {
 		return x.HttpsTrigger
@@ -230,7 +240,7 @@ func (m *CloudFunction) GetEntryPoint() string {
 	return ""
 }
 
-func (m *CloudFunction) GetTimeout() *google_protobuf3.Duration {
+func (m *CloudFunction) GetTimeout() *duration.Duration {
 	if m != nil {
 		return m.Timeout
 	}
@@ -251,7 +261,7 @@ func (m *CloudFunction) GetServiceAccount() string {
 	return ""
 }
 
-func (m *CloudFunction) GetUpdateTime() *google_protobuf4.Timestamp {
+func (m *CloudFunction) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -347,12 +357,12 @@ func _CloudFunction_OneofSizer(msg proto.Message) (n int) {
 	// source_code
 	switch x := m.SourceCode.(type) {
 	case *CloudFunction_SourceArchiveUrl:
-		n += proto.SizeVarint(14<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.SourceArchiveUrl)))
 		n += len(x.SourceArchiveUrl)
 	case *CloudFunction_SourceRepository:
 		s := proto.Size(x.SourceRepository)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -363,12 +373,12 @@ func _CloudFunction_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Trigger.(type) {
 	case *CloudFunction_HttpsTrigger:
 		s := proto.Size(x.HttpsTrigger)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *CloudFunction_EventTrigger:
 		s := proto.Size(x.EventTrigger)
-		n += proto.SizeVarint(12<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -381,13 +391,35 @@ func _CloudFunction_OneofSizer(msg proto.Message) (n int) {
 // Describes HTTPSTrigger, could be used to connect web hooks to function.
 type HTTPSTrigger struct {
 	// Output only. The deployed url for the function.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url                  string   `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HTTPSTrigger) Reset()         { *m = HTTPSTrigger{} }
+func (m *HTTPSTrigger) String() string { return proto.CompactTextString(m) }
+func (*HTTPSTrigger) ProtoMessage()    {}
+func (*HTTPSTrigger) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{1}
+}
+func (m *HTTPSTrigger) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HTTPSTrigger.Unmarshal(m, b)
+}
+func (m *HTTPSTrigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HTTPSTrigger.Marshal(b, m, deterministic)
+}
+func (dst *HTTPSTrigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HTTPSTrigger.Merge(dst, src)
+}
+func (m *HTTPSTrigger) XXX_Size() int {
+	return xxx_messageInfo_HTTPSTrigger.Size(m)
+}
+func (m *HTTPSTrigger) XXX_DiscardUnknown() {
+	xxx_messageInfo_HTTPSTrigger.DiscardUnknown(m)
 }
 
-func (m *HTTPSTrigger) Reset()                    { *m = HTTPSTrigger{} }
-func (m *HTTPSTrigger) String() string            { return proto.CompactTextString(m) }
-func (*HTTPSTrigger) ProtoMessage()               {}
-func (*HTTPSTrigger) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_HTTPSTrigger proto.InternalMessageInfo
 
 func (m *HTTPSTrigger) GetUrl() string {
 	if m != nil {
@@ -409,19 +441,41 @@ type EventTrigger struct {
 	//
 	//      Handle a write to the Firebase Realtime Database
 	//      `providers/firebase.database/eventTypes/data.write`
-	EventType string `protobuf:"bytes,1,opt,name=event_type,json=eventType" json:"event_type,omitempty"`
+	EventType string `protobuf:"bytes,1,opt,name=event_type,json=eventType,proto3" json:"event_type,omitempty"`
 	// Which instance of the source's service should send events. E.g. for Pub/Sub
 	// this would be a Pub/Sub topic at `projects/*/topics/*`. For Google Cloud
 	// Storage this would be a bucket at `projects/*/buckets/*`. For any source
 	// that only supports one instance per-project, this should be the name of the
 	// project (`projects/*`)
-	Resource string `protobuf:"bytes,2,opt,name=resource" json:"resource,omitempty"`
+	Resource             string   `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EventTrigger) Reset()         { *m = EventTrigger{} }
+func (m *EventTrigger) String() string { return proto.CompactTextString(m) }
+func (*EventTrigger) ProtoMessage()    {}
+func (*EventTrigger) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{2}
+}
+func (m *EventTrigger) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EventTrigger.Unmarshal(m, b)
+}
+func (m *EventTrigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EventTrigger.Marshal(b, m, deterministic)
+}
+func (dst *EventTrigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventTrigger.Merge(dst, src)
+}
+func (m *EventTrigger) XXX_Size() int {
+	return xxx_messageInfo_EventTrigger.Size(m)
+}
+func (m *EventTrigger) XXX_DiscardUnknown() {
+	xxx_messageInfo_EventTrigger.DiscardUnknown(m)
 }
 
-func (m *EventTrigger) Reset()                    { *m = EventTrigger{} }
-func (m *EventTrigger) String() string            { return proto.CompactTextString(m) }
-func (*EventTrigger) ProtoMessage()               {}
-func (*EventTrigger) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_EventTrigger proto.InternalMessageInfo
 
 func (m *EventTrigger) GetEventType() string {
 	if m != nil {
@@ -442,12 +496,12 @@ type SourceRepository struct {
 	// URL to the hosted repository where the function is defined. Only paths in
 	// https://source.developers.google.com domain are supported. The path should
 	// contain the name of the repository.
-	RepositoryUrl string `protobuf:"bytes,1,opt,name=repository_url,json=repositoryUrl" json:"repository_url,omitempty"`
+	RepositoryUrl string `protobuf:"bytes,1,opt,name=repository_url,json=repositoryUrl,proto3" json:"repository_url,omitempty"`
 	// The path within the repository where the function is defined. The path
 	// should point to the directory where Cloud Functions files are located. Use
 	// "/" if the function is defined directly in the root directory of a
 	// repository.
-	SourcePath string `protobuf:"bytes,2,opt,name=source_path,json=sourcePath" json:"source_path,omitempty"`
+	SourcePath string `protobuf:"bytes,2,opt,name=source_path,json=sourcePath,proto3" json:"source_path,omitempty"`
 	// The version of a function. Defaults to the latest version of the master
 	// branch.
 	//
@@ -461,30 +515,70 @@ type SourceRepository struct {
 	// branch, it will be the revision id of the latest change on this branch at
 	// that time. If user deployed from revision then this value will be always
 	// equal to the revision specified by the user.
-	DeployedRevision string `protobuf:"bytes,6,opt,name=deployed_revision,json=deployedRevision" json:"deployed_revision,omitempty"`
+	DeployedRevision     string   `protobuf:"bytes,6,opt,name=deployed_revision,json=deployedRevision,proto3" json:"deployed_revision,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SourceRepository) Reset()                    { *m = SourceRepository{} }
-func (m *SourceRepository) String() string            { return proto.CompactTextString(m) }
-func (*SourceRepository) ProtoMessage()               {}
-func (*SourceRepository) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *SourceRepository) Reset()         { *m = SourceRepository{} }
+func (m *SourceRepository) String() string { return proto.CompactTextString(m) }
+func (*SourceRepository) ProtoMessage()    {}
+func (*SourceRepository) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{3}
+}
+func (m *SourceRepository) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceRepository.Unmarshal(m, b)
+}
+func (m *SourceRepository) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceRepository.Marshal(b, m, deterministic)
+}
+func (dst *SourceRepository) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceRepository.Merge(dst, src)
+}
+func (m *SourceRepository) XXX_Size() int {
+	return xxx_messageInfo_SourceRepository.Size(m)
+}
+func (m *SourceRepository) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceRepository.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SourceRepository proto.InternalMessageInfo
+
+func (m *SourceRepository) GetRepositoryUrl() string {
+	if m != nil {
+		return m.RepositoryUrl
+	}
+	return ""
+}
+
+func (m *SourceRepository) GetSourcePath() string {
+	if m != nil {
+		return m.SourcePath
+	}
+	return ""
+}
 
 type isSourceRepository_Version interface {
 	isSourceRepository_Version()
 }
 
 type SourceRepository_Branch struct {
-	Branch string `protobuf:"bytes,3,opt,name=branch,oneof"`
+	Branch string `protobuf:"bytes,3,opt,name=branch,proto3,oneof"`
 }
+
 type SourceRepository_Tag struct {
-	Tag string `protobuf:"bytes,4,opt,name=tag,oneof"`
+	Tag string `protobuf:"bytes,4,opt,name=tag,proto3,oneof"`
 }
+
 type SourceRepository_Revision struct {
-	Revision string `protobuf:"bytes,5,opt,name=revision,oneof"`
+	Revision string `protobuf:"bytes,5,opt,name=revision,proto3,oneof"`
 }
 
-func (*SourceRepository_Branch) isSourceRepository_Version()   {}
-func (*SourceRepository_Tag) isSourceRepository_Version()      {}
+func (*SourceRepository_Branch) isSourceRepository_Version() {}
+
+func (*SourceRepository_Tag) isSourceRepository_Version() {}
+
 func (*SourceRepository_Revision) isSourceRepository_Version() {}
 
 func (m *SourceRepository) GetVersion() isSourceRepository_Version {
@@ -494,20 +588,6 @@ func (m *SourceRepository) GetVersion() isSourceRepository_Version {
 	return nil
 }
 
-func (m *SourceRepository) GetRepositoryUrl() string {
-	if m != nil {
-		return m.RepositoryUrl
-	}
-	return ""
-}
-
-func (m *SourceRepository) GetSourcePath() string {
-	if m != nil {
-		return m.SourcePath
-	}
-	return ""
-}
-
 func (m *SourceRepository) GetBranch() string {
 	if x, ok := m.GetVersion().(*SourceRepository_Branch); ok {
 		return x.Branch
@@ -599,15 +679,15 @@ func _SourceRepository_OneofSizer(msg proto.Message) (n int) {
 	// version
 	switch x := m.Version.(type) {
 	case *SourceRepository_Branch:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Branch)))
 		n += len(x.Branch)
 	case *SourceRepository_Tag:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Tag)))
 		n += len(x.Tag)
 	case *SourceRepository_Revision:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Revision)))
 		n += len(x.Revision)
 	case nil:
@@ -621,15 +701,37 @@ func _SourceRepository_OneofSizer(msg proto.Message) (n int) {
 type CreateFunctionRequest struct {
 	// The project and location in which the function should be created, specified
 	// in the format `projects/*/locations/*`
-	Location string `protobuf:"bytes,1,opt,name=location" json:"location,omitempty"`
+	Location string `protobuf:"bytes,1,opt,name=location,proto3" json:"location,omitempty"`
 	// Function to be created.
-	Function *CloudFunction `protobuf:"bytes,2,opt,name=function" json:"function,omitempty"`
+	Function             *CloudFunction `protobuf:"bytes,2,opt,name=function,proto3" json:"function,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *CreateFunctionRequest) Reset()                    { *m = CreateFunctionRequest{} }
-func (m *CreateFunctionRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateFunctionRequest) ProtoMessage()               {}
-func (*CreateFunctionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *CreateFunctionRequest) Reset()         { *m = CreateFunctionRequest{} }
+func (m *CreateFunctionRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateFunctionRequest) ProtoMessage()    {}
+func (*CreateFunctionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{4}
+}
+func (m *CreateFunctionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateFunctionRequest.Unmarshal(m, b)
+}
+func (m *CreateFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateFunctionRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateFunctionRequest.Merge(dst, src)
+}
+func (m *CreateFunctionRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateFunctionRequest.Size(m)
+}
+func (m *CreateFunctionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateFunctionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateFunctionRequest proto.InternalMessageInfo
 
 func (m *CreateFunctionRequest) GetLocation() string {
 	if m != nil {
@@ -648,15 +750,37 @@ func (m *CreateFunctionRequest) GetFunction() *CloudFunction {
 // Request for the `UpdateFunction` method.
 type UpdateFunctionRequest struct {
 	// The name of the function to be updated.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// New version of the function.
-	Function *CloudFunction `protobuf:"bytes,2,opt,name=function" json:"function,omitempty"`
+	Function             *CloudFunction `protobuf:"bytes,2,opt,name=function,proto3" json:"function,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *UpdateFunctionRequest) Reset()                    { *m = UpdateFunctionRequest{} }
-func (m *UpdateFunctionRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateFunctionRequest) ProtoMessage()               {}
-func (*UpdateFunctionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *UpdateFunctionRequest) Reset()         { *m = UpdateFunctionRequest{} }
+func (m *UpdateFunctionRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateFunctionRequest) ProtoMessage()    {}
+func (*UpdateFunctionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{5}
+}
+func (m *UpdateFunctionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateFunctionRequest.Unmarshal(m, b)
+}
+func (m *UpdateFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateFunctionRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFunctionRequest.Merge(dst, src)
+}
+func (m *UpdateFunctionRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateFunctionRequest.Size(m)
+}
+func (m *UpdateFunctionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateFunctionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateFunctionRequest proto.InternalMessageInfo
 
 func (m *UpdateFunctionRequest) GetName() string {
 	if m != nil {
@@ -675,13 +799,35 @@ func (m *UpdateFunctionRequest) GetFunction() *CloudFunction {
 // Request for the `GetFunction` method.
 type GetFunctionRequest struct {
 	// The name of the function which details should be obtained.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetFunctionRequest) Reset()         { *m = GetFunctionRequest{} }
+func (m *GetFunctionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetFunctionRequest) ProtoMessage()    {}
+func (*GetFunctionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{6}
+}
+func (m *GetFunctionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetFunctionRequest.Unmarshal(m, b)
+}
+func (m *GetFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetFunctionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFunctionRequest.Merge(dst, src)
+}
+func (m *GetFunctionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetFunctionRequest.Size(m)
+}
+func (m *GetFunctionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetFunctionRequest.DiscardUnknown(m)
 }
 
-func (m *GetFunctionRequest) Reset()                    { *m = GetFunctionRequest{} }
-func (m *GetFunctionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetFunctionRequest) ProtoMessage()               {}
-func (*GetFunctionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_GetFunctionRequest proto.InternalMessageInfo
 
 func (m *GetFunctionRequest) GetName() string {
 	if m != nil {
@@ -696,20 +842,42 @@ type ListFunctionsRequest struct {
 	// specified in the format `projects/*/locations/*`
 	// If you want to list functions in all locations, use "-" in place of a
 	// location.
-	Location string `protobuf:"bytes,1,opt,name=location" json:"location,omitempty"`
+	Location string `protobuf:"bytes,1,opt,name=location,proto3" json:"location,omitempty"`
 	// Maximum number of functions to return per call.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last
 	// `ListFunctionsResponse`; indicates that
 	// this is a continuation of a prior `ListFunctions` call, and that the
 	// system should return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListFunctionsRequest) Reset()                    { *m = ListFunctionsRequest{} }
-func (m *ListFunctionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListFunctionsRequest) ProtoMessage()               {}
-func (*ListFunctionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *ListFunctionsRequest) Reset()         { *m = ListFunctionsRequest{} }
+func (m *ListFunctionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListFunctionsRequest) ProtoMessage()    {}
+func (*ListFunctionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{7}
+}
+func (m *ListFunctionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFunctionsRequest.Unmarshal(m, b)
+}
+func (m *ListFunctionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFunctionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListFunctionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFunctionsRequest.Merge(dst, src)
+}
+func (m *ListFunctionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListFunctionsRequest.Size(m)
+}
+func (m *ListFunctionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFunctionsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFunctionsRequest proto.InternalMessageInfo
 
 func (m *ListFunctionsRequest) GetLocation() string {
 	if m != nil {
@@ -735,18 +903,40 @@ func (m *ListFunctionsRequest) GetPageToken() string {
 // Response for the `ListFunctions` method.
 type ListFunctionsResponse struct {
 	// The functions that match the request.
-	Functions []*CloudFunction `protobuf:"bytes,1,rep,name=functions" json:"functions,omitempty"`
+	Functions []*CloudFunction `protobuf:"bytes,1,rep,name=functions,proto3" json:"functions,omitempty"`
 	// If not empty, indicates that there may be more functions that match
 	// the request; this value should be passed in a new
 	// [google.cloud.functions.v1beta2.ListFunctionsRequest][]
 	// to get more functions.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListFunctionsResponse) Reset()                    { *m = ListFunctionsResponse{} }
-func (m *ListFunctionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListFunctionsResponse) ProtoMessage()               {}
-func (*ListFunctionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *ListFunctionsResponse) Reset()         { *m = ListFunctionsResponse{} }
+func (m *ListFunctionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListFunctionsResponse) ProtoMessage()    {}
+func (*ListFunctionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{8}
+}
+func (m *ListFunctionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFunctionsResponse.Unmarshal(m, b)
+}
+func (m *ListFunctionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFunctionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListFunctionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFunctionsResponse.Merge(dst, src)
+}
+func (m *ListFunctionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListFunctionsResponse.Size(m)
+}
+func (m *ListFunctionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFunctionsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFunctionsResponse proto.InternalMessageInfo
 
 func (m *ListFunctionsResponse) GetFunctions() []*CloudFunction {
 	if m != nil {
@@ -765,13 +955,35 @@ func (m *ListFunctionsResponse) GetNextPageToken() string {
 // Request for the `DeleteFunction` method.
 type DeleteFunctionRequest struct {
 	// The name of the function which should be deleted.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteFunctionRequest) Reset()         { *m = DeleteFunctionRequest{} }
+func (m *DeleteFunctionRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteFunctionRequest) ProtoMessage()    {}
+func (*DeleteFunctionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{9}
+}
+func (m *DeleteFunctionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteFunctionRequest.Unmarshal(m, b)
+}
+func (m *DeleteFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteFunctionRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteFunctionRequest.Merge(dst, src)
+}
+func (m *DeleteFunctionRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteFunctionRequest.Size(m)
+}
+func (m *DeleteFunctionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteFunctionRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteFunctionRequest) Reset()                    { *m = DeleteFunctionRequest{} }
-func (m *DeleteFunctionRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteFunctionRequest) ProtoMessage()               {}
-func (*DeleteFunctionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_DeleteFunctionRequest proto.InternalMessageInfo
 
 func (m *DeleteFunctionRequest) GetName() string {
 	if m != nil {
@@ -783,15 +995,37 @@ func (m *DeleteFunctionRequest) GetName() string {
 // Request for the `CallFunction` method.
 type CallFunctionRequest struct {
 	// The name of the function to be called.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Input to be passed to the function.
-	Data string `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
+	Data                 string   `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CallFunctionRequest) Reset()                    { *m = CallFunctionRequest{} }
-func (m *CallFunctionRequest) String() string            { return proto.CompactTextString(m) }
-func (*CallFunctionRequest) ProtoMessage()               {}
-func (*CallFunctionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *CallFunctionRequest) Reset()         { *m = CallFunctionRequest{} }
+func (m *CallFunctionRequest) String() string { return proto.CompactTextString(m) }
+func (*CallFunctionRequest) ProtoMessage()    {}
+func (*CallFunctionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{10}
+}
+func (m *CallFunctionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CallFunctionRequest.Unmarshal(m, b)
+}
+func (m *CallFunctionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CallFunctionRequest.Marshal(b, m, deterministic)
+}
+func (dst *CallFunctionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallFunctionRequest.Merge(dst, src)
+}
+func (m *CallFunctionRequest) XXX_Size() int {
+	return xxx_messageInfo_CallFunctionRequest.Size(m)
+}
+func (m *CallFunctionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CallFunctionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CallFunctionRequest proto.InternalMessageInfo
 
 func (m *CallFunctionRequest) GetName() string {
 	if m != nil {
@@ -810,19 +1044,41 @@ func (m *CallFunctionRequest) GetData() string {
 // Response of `CallFunction` method.
 type CallFunctionResponse struct {
 	// Execution id of function invocation.
-	ExecutionId string `protobuf:"bytes,1,opt,name=execution_id,json=executionId" json:"execution_id,omitempty"`
+	ExecutionId string `protobuf:"bytes,1,opt,name=execution_id,json=executionId,proto3" json:"execution_id,omitempty"`
 	// Result populated for successful execution of synchronous function. Will
 	// not be populated if function does not return a result through context.
-	Result string `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
+	Result string `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	// Either system or user-function generated error. Set if execution
 	// was not successful.
-	Error string `protobuf:"bytes,3,opt,name=error" json:"error,omitempty"`
+	Error                string   `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CallFunctionResponse) Reset()                    { *m = CallFunctionResponse{} }
-func (m *CallFunctionResponse) String() string            { return proto.CompactTextString(m) }
-func (*CallFunctionResponse) ProtoMessage()               {}
-func (*CallFunctionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *CallFunctionResponse) Reset()         { *m = CallFunctionResponse{} }
+func (m *CallFunctionResponse) String() string { return proto.CompactTextString(m) }
+func (*CallFunctionResponse) ProtoMessage()    {}
+func (*CallFunctionResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_functions_a18655d3cc58948d, []int{11}
+}
+func (m *CallFunctionResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CallFunctionResponse.Unmarshal(m, b)
+}
+func (m *CallFunctionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CallFunctionResponse.Marshal(b, m, deterministic)
+}
+func (dst *CallFunctionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallFunctionResponse.Merge(dst, src)
+}
+func (m *CallFunctionResponse) XXX_Size() int {
+	return xxx_messageInfo_CallFunctionResponse.Size(m)
+}
+func (m *CallFunctionResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CallFunctionResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CallFunctionResponse proto.InternalMessageInfo
 
 func (m *CallFunctionResponse) GetExecutionId() string {
 	if m != nil {
@@ -869,8 +1125,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for CloudFunctionsService service
-
+// CloudFunctionsServiceClient is the client API for CloudFunctionsService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type CloudFunctionsServiceClient interface {
 	// Returns a list of functions that belong to the requested project.
 	ListFunctions(ctx context.Context, in *ListFunctionsRequest, opts ...grpc.CallOption) (*ListFunctionsResponse, error)
@@ -879,13 +1136,13 @@ type CloudFunctionsServiceClient interface {
 	// Creates a new function. If a function with the given name already exists in
 	// the specified project, the long running operation will return
 	// `ALREADY_EXISTS` error.
-	CreateFunction(ctx context.Context, in *CreateFunctionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateFunction(ctx context.Context, in *CreateFunctionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Updates existing function.
-	UpdateFunction(ctx context.Context, in *UpdateFunctionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UpdateFunction(ctx context.Context, in *UpdateFunctionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes a function with the given name from the specified project. If the
 	// given function is used by some trigger, the trigger will be updated to
 	// remove this function.
-	DeleteFunction(ctx context.Context, in *DeleteFunctionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteFunction(ctx context.Context, in *DeleteFunctionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Invokes synchronously deployed function. To be used for testing, very
 	// limited traffic allowed.
 	CallFunction(ctx context.Context, in *CallFunctionRequest, opts ...grpc.CallOption) (*CallFunctionResponse, error)
@@ -901,7 +1158,7 @@ func NewCloudFunctionsServiceClient(cc *grpc.ClientConn) CloudFunctionsServiceCl
 
 func (c *cloudFunctionsServiceClient) ListFunctions(ctx context.Context, in *ListFunctionsRequest, opts ...grpc.CallOption) (*ListFunctionsResponse, error) {
 	out := new(ListFunctionsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/ListFunctions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/ListFunctions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -910,34 +1167,34 @@ func (c *cloudFunctionsServiceClient) ListFunctions(ctx context.Context, in *Lis
 
 func (c *cloudFunctionsServiceClient) GetFunction(ctx context.Context, in *GetFunctionRequest, opts ...grpc.CallOption) (*CloudFunction, error) {
 	out := new(CloudFunction)
-	err := grpc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/GetFunction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/GetFunction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudFunctionsServiceClient) CreateFunction(ctx context.Context, in *CreateFunctionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/CreateFunction", in, out, c.cc, opts...)
+func (c *cloudFunctionsServiceClient) CreateFunction(ctx context.Context, in *CreateFunctionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/CreateFunction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudFunctionsServiceClient) UpdateFunction(ctx context.Context, in *UpdateFunctionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/UpdateFunction", in, out, c.cc, opts...)
+func (c *cloudFunctionsServiceClient) UpdateFunction(ctx context.Context, in *UpdateFunctionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/UpdateFunction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudFunctionsServiceClient) DeleteFunction(ctx context.Context, in *DeleteFunctionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/DeleteFunction", in, out, c.cc, opts...)
+func (c *cloudFunctionsServiceClient) DeleteFunction(ctx context.Context, in *DeleteFunctionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/DeleteFunction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -946,15 +1203,14 @@ func (c *cloudFunctionsServiceClient) DeleteFunction(ctx context.Context, in *De
 
 func (c *cloudFunctionsServiceClient) CallFunction(ctx context.Context, in *CallFunctionRequest, opts ...grpc.CallOption) (*CallFunctionResponse, error) {
 	out := new(CallFunctionResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/CallFunction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.functions.v1beta2.CloudFunctionsService/CallFunction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for CloudFunctionsService service
-
+// CloudFunctionsServiceServer is the server API for CloudFunctionsService service.
 type CloudFunctionsServiceServer interface {
 	// Returns a list of functions that belong to the requested project.
 	ListFunctions(context.Context, *ListFunctionsRequest) (*ListFunctionsResponse, error)
@@ -963,13 +1219,13 @@ type CloudFunctionsServiceServer interface {
 	// Creates a new function. If a function with the given name already exists in
 	// the specified project, the long running operation will return
 	// `ALREADY_EXISTS` error.
-	CreateFunction(context.Context, *CreateFunctionRequest) (*google_longrunning.Operation, error)
+	CreateFunction(context.Context, *CreateFunctionRequest) (*longrunning.Operation, error)
 	// Updates existing function.
-	UpdateFunction(context.Context, *UpdateFunctionRequest) (*google_longrunning.Operation, error)
+	UpdateFunction(context.Context, *UpdateFunctionRequest) (*longrunning.Operation, error)
 	// Deletes a function with the given name from the specified project. If the
 	// given function is used by some trigger, the trigger will be updated to
 	// remove this function.
-	DeleteFunction(context.Context, *DeleteFunctionRequest) (*google_longrunning.Operation, error)
+	DeleteFunction(context.Context, *DeleteFunctionRequest) (*longrunning.Operation, error)
 	// Invokes synchronously deployed function. To be used for testing, very
 	// limited traffic allowed.
 	CallFunction(context.Context, *CallFunctionRequest) (*CallFunctionResponse, error)
@@ -1120,9 +1376,11 @@ var _CloudFunctionsService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/functions/v1beta2/functions.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/functions/v1beta2/functions.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/functions/v1beta2/functions.proto", fileDescriptor_functions_a18655d3cc58948d)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_functions_a18655d3cc58948d = []byte{
 	// 1216 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4d, 0x73, 0xdb, 0x44,
 	0x18, 0xae, 0xf2, 0xe1, 0xc6, 0xaf, 0x3f, 0xe2, 0x6e, 0x9b, 0x8e, 0x30, 0x2d, 0x0d, 0x62, 0x80,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/functions/v1beta2/operations.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/functions/v1beta2/operations.pb.go
index dee76e0c..dddde3ca 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/functions/v1beta2/operations.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/functions/v1beta2/operations.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/functions/v1beta2/operations.proto
 
-package functions
+package functions // import "google.golang.org/genproto/googleapis/cloud/functions/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A type of an operation.
 type OperationType int32
 
@@ -44,23 +50,47 @@ var OperationType_value = map[string]int32{
 func (x OperationType) String() string {
 	return proto.EnumName(OperationType_name, int32(x))
 }
-func (OperationType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (OperationType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_operations_17ab487bbd37bcca, []int{0}
+}
 
 // Metadata describing an [Operation][google.longrunning.Operation]
 type OperationMetadataV1Beta2 struct {
 	// Target of the operation - for example
 	// projects/project-1/locations/region-1/functions/function-1
-	Target string `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"`
+	Target string `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
 	// Type of operation.
-	Type OperationType `protobuf:"varint,2,opt,name=type,enum=google.cloud.functions.v1beta2.OperationType" json:"type,omitempty"`
+	Type OperationType `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.functions.v1beta2.OperationType" json:"type,omitempty"`
 	// The original request that started the operation.
-	Request *google_protobuf1.Any `protobuf:"bytes,3,opt,name=request" json:"request,omitempty"`
+	Request              *any.Any `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *OperationMetadataV1Beta2) Reset()                    { *m = OperationMetadataV1Beta2{} }
-func (m *OperationMetadataV1Beta2) String() string            { return proto.CompactTextString(m) }
-func (*OperationMetadataV1Beta2) ProtoMessage()               {}
-func (*OperationMetadataV1Beta2) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *OperationMetadataV1Beta2) Reset()         { *m = OperationMetadataV1Beta2{} }
+func (m *OperationMetadataV1Beta2) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadataV1Beta2) ProtoMessage()    {}
+func (*OperationMetadataV1Beta2) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_17ab487bbd37bcca, []int{0}
+}
+func (m *OperationMetadataV1Beta2) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadataV1Beta2.Unmarshal(m, b)
+}
+func (m *OperationMetadataV1Beta2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadataV1Beta2.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadataV1Beta2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadataV1Beta2.Merge(dst, src)
+}
+func (m *OperationMetadataV1Beta2) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadataV1Beta2.Size(m)
+}
+func (m *OperationMetadataV1Beta2) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadataV1Beta2.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationMetadataV1Beta2 proto.InternalMessageInfo
 
 func (m *OperationMetadataV1Beta2) GetTarget() string {
 	if m != nil {
@@ -76,7 +106,7 @@ func (m *OperationMetadataV1Beta2) GetType() OperationType {
 	return OperationType_OPERATION_UNSPECIFIED
 }
 
-func (m *OperationMetadataV1Beta2) GetRequest() *google_protobuf1.Any {
+func (m *OperationMetadataV1Beta2) GetRequest() *any.Any {
 	if m != nil {
 		return m.Request
 	}
@@ -88,9 +118,11 @@ func init() {
 	proto.RegisterEnum("google.cloud.functions.v1beta2.OperationType", OperationType_name, OperationType_value)
 }
 
-func init() { proto.RegisterFile("google/cloud/functions/v1beta2/operations.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/cloud/functions/v1beta2/operations.proto", fileDescriptor_operations_17ab487bbd37bcca)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_operations_17ab487bbd37bcca = []byte{
 	// 333 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x4f, 0x4f, 0xf2, 0x30,
 	0x1c, 0xc7, 0x9f, 0xc2, 0x13, 0x8c, 0x35, 0x2a, 0x99, 0x7f, 0x32, 0x88, 0x31, 0x84, 0x13, 0x31,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/iot/v1/device_manager.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/iot/v1/device_manager.pb.go
index 6fc71169..98bbe01d 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/iot/v1/device_manager.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/iot/v1/device_manager.pb.go
@@ -1,55 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/iot/v1/device_manager.proto
 
-/*
-Package iot is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/iot/v1/device_manager.proto
-	google/cloud/iot/v1/resources.proto
-
-It has these top-level messages:
-	CreateDeviceRegistryRequest
-	GetDeviceRegistryRequest
-	DeleteDeviceRegistryRequest
-	UpdateDeviceRegistryRequest
-	ListDeviceRegistriesRequest
-	ListDeviceRegistriesResponse
-	CreateDeviceRequest
-	GetDeviceRequest
-	UpdateDeviceRequest
-	DeleteDeviceRequest
-	ListDevicesRequest
-	ListDevicesResponse
-	ModifyCloudToDeviceConfigRequest
-	ListDeviceConfigVersionsRequest
-	ListDeviceConfigVersionsResponse
-	ListDeviceStatesRequest
-	ListDeviceStatesResponse
-	Device
-	DeviceRegistry
-	MqttConfig
-	HttpConfig
-	EventNotificationConfig
-	StateNotificationConfig
-	RegistryCredential
-	X509CertificateDetails
-	PublicKeyCertificate
-	DeviceCredential
-	PublicKeyCredential
-	DeviceConfig
-	DeviceState
-*/
-package iot
+package iot // import "google.golang.org/genproto/googleapis/cloud/iot/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _ "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _ "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf4 "google.golang.org/genproto/protobuf/field_mask"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -71,17 +33,39 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type CreateDeviceRegistryRequest struct {
 	// The project and cloud region where this device registry must be created.
 	// For example, `projects/example-project/locations/us-central1`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The device registry. The field `name` must be empty. The server will
 	// generate that field from the device registry `id` provided and the
 	// `parent` field.
-	DeviceRegistry *DeviceRegistry `protobuf:"bytes,2,opt,name=device_registry,json=deviceRegistry" json:"device_registry,omitempty"`
+	DeviceRegistry       *DeviceRegistry `protobuf:"bytes,2,opt,name=device_registry,json=deviceRegistry,proto3" json:"device_registry,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *CreateDeviceRegistryRequest) Reset()                    { *m = CreateDeviceRegistryRequest{} }
-func (m *CreateDeviceRegistryRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateDeviceRegistryRequest) ProtoMessage()               {}
-func (*CreateDeviceRegistryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *CreateDeviceRegistryRequest) Reset()         { *m = CreateDeviceRegistryRequest{} }
+func (m *CreateDeviceRegistryRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDeviceRegistryRequest) ProtoMessage()    {}
+func (*CreateDeviceRegistryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{0}
+}
+func (m *CreateDeviceRegistryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDeviceRegistryRequest.Unmarshal(m, b)
+}
+func (m *CreateDeviceRegistryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDeviceRegistryRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDeviceRegistryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDeviceRegistryRequest.Merge(dst, src)
+}
+func (m *CreateDeviceRegistryRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDeviceRegistryRequest.Size(m)
+}
+func (m *CreateDeviceRegistryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDeviceRegistryRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateDeviceRegistryRequest proto.InternalMessageInfo
 
 func (m *CreateDeviceRegistryRequest) GetParent() string {
 	if m != nil {
@@ -101,13 +85,35 @@ func (m *CreateDeviceRegistryRequest) GetDeviceRegistry() *DeviceRegistry {
 type GetDeviceRegistryRequest struct {
 	// The name of the device registry. For example,
 	// `projects/example-project/locations/us-central1/registries/my-registry`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetDeviceRegistryRequest) Reset()                    { *m = GetDeviceRegistryRequest{} }
-func (m *GetDeviceRegistryRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDeviceRegistryRequest) ProtoMessage()               {}
-func (*GetDeviceRegistryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *GetDeviceRegistryRequest) Reset()         { *m = GetDeviceRegistryRequest{} }
+func (m *GetDeviceRegistryRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDeviceRegistryRequest) ProtoMessage()    {}
+func (*GetDeviceRegistryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{1}
+}
+func (m *GetDeviceRegistryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDeviceRegistryRequest.Unmarshal(m, b)
+}
+func (m *GetDeviceRegistryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDeviceRegistryRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDeviceRegistryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDeviceRegistryRequest.Merge(dst, src)
+}
+func (m *GetDeviceRegistryRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDeviceRegistryRequest.Size(m)
+}
+func (m *GetDeviceRegistryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDeviceRegistryRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDeviceRegistryRequest proto.InternalMessageInfo
 
 func (m *GetDeviceRegistryRequest) GetName() string {
 	if m != nil {
@@ -120,13 +126,35 @@ func (m *GetDeviceRegistryRequest) GetName() string {
 type DeleteDeviceRegistryRequest struct {
 	// The name of the device registry. For example,
 	// `projects/example-project/locations/us-central1/registries/my-registry`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteDeviceRegistryRequest) Reset()         { *m = DeleteDeviceRegistryRequest{} }
+func (m *DeleteDeviceRegistryRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteDeviceRegistryRequest) ProtoMessage()    {}
+func (*DeleteDeviceRegistryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{2}
+}
+func (m *DeleteDeviceRegistryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteDeviceRegistryRequest.Unmarshal(m, b)
+}
+func (m *DeleteDeviceRegistryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteDeviceRegistryRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteDeviceRegistryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDeviceRegistryRequest.Merge(dst, src)
+}
+func (m *DeleteDeviceRegistryRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteDeviceRegistryRequest.Size(m)
+}
+func (m *DeleteDeviceRegistryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteDeviceRegistryRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteDeviceRegistryRequest) Reset()                    { *m = DeleteDeviceRegistryRequest{} }
-func (m *DeleteDeviceRegistryRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteDeviceRegistryRequest) ProtoMessage()               {}
-func (*DeleteDeviceRegistryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_DeleteDeviceRegistryRequest proto.InternalMessageInfo
 
 func (m *DeleteDeviceRegistryRequest) GetName() string {
 	if m != nil {
@@ -140,19 +168,41 @@ type UpdateDeviceRegistryRequest struct {
 	// The new values for the device registry. The `id` field must be empty, and
 	// the `name` field must indicate the path of the resource. For example,
 	// `projects/example-project/locations/us-central1/registries/my-registry`.
-	DeviceRegistry *DeviceRegistry `protobuf:"bytes,1,opt,name=device_registry,json=deviceRegistry" json:"device_registry,omitempty"`
+	DeviceRegistry *DeviceRegistry `protobuf:"bytes,1,opt,name=device_registry,json=deviceRegistry,proto3" json:"device_registry,omitempty"`
 	// Only updates the `device_registry` fields indicated by this mask.
 	// The field mask must not be empty, and it must not contain fields that
 	// are immutable or only set by the server.
 	// Mutable top-level fields: `event_notification_config`, `http_config`,
 	// `mqtt_config`, and `state_notification_config`.
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateDeviceRegistryRequest) Reset()                    { *m = UpdateDeviceRegistryRequest{} }
-func (m *UpdateDeviceRegistryRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateDeviceRegistryRequest) ProtoMessage()               {}
-func (*UpdateDeviceRegistryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *UpdateDeviceRegistryRequest) Reset()         { *m = UpdateDeviceRegistryRequest{} }
+func (m *UpdateDeviceRegistryRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateDeviceRegistryRequest) ProtoMessage()    {}
+func (*UpdateDeviceRegistryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{3}
+}
+func (m *UpdateDeviceRegistryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateDeviceRegistryRequest.Unmarshal(m, b)
+}
+func (m *UpdateDeviceRegistryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateDeviceRegistryRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateDeviceRegistryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDeviceRegistryRequest.Merge(dst, src)
+}
+func (m *UpdateDeviceRegistryRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateDeviceRegistryRequest.Size(m)
+}
+func (m *UpdateDeviceRegistryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateDeviceRegistryRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateDeviceRegistryRequest proto.InternalMessageInfo
 
 func (m *UpdateDeviceRegistryRequest) GetDeviceRegistry() *DeviceRegistry {
 	if m != nil {
@@ -161,7 +211,7 @@ func (m *UpdateDeviceRegistryRequest) GetDeviceRegistry() *DeviceRegistry {
 	return nil
 }
 
-func (m *UpdateDeviceRegistryRequest) GetUpdateMask() *google_protobuf4.FieldMask {
+func (m *UpdateDeviceRegistryRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -172,22 +222,44 @@ func (m *UpdateDeviceRegistryRequest) GetUpdateMask() *google_protobuf4.FieldMas
 type ListDeviceRegistriesRequest struct {
 	// The project and cloud region path. For example,
 	// `projects/example-project/locations/us-central1`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The maximum number of registries to return in the response. If this value
 	// is zero, the service will select a default size. A call may return fewer
 	// objects than requested, but if there is a non-empty `page_token`, it
 	// indicates that more entries are available.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last `ListDeviceRegistriesResponse`; indicates
 	// that this is a continuation of a prior `ListDeviceRegistries` call, and
 	// that the system should return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDeviceRegistriesRequest) Reset()         { *m = ListDeviceRegistriesRequest{} }
+func (m *ListDeviceRegistriesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDeviceRegistriesRequest) ProtoMessage()    {}
+func (*ListDeviceRegistriesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{4}
+}
+func (m *ListDeviceRegistriesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDeviceRegistriesRequest.Unmarshal(m, b)
+}
+func (m *ListDeviceRegistriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDeviceRegistriesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDeviceRegistriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceRegistriesRequest.Merge(dst, src)
+}
+func (m *ListDeviceRegistriesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDeviceRegistriesRequest.Size(m)
+}
+func (m *ListDeviceRegistriesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDeviceRegistriesRequest.DiscardUnknown(m)
 }
 
-func (m *ListDeviceRegistriesRequest) Reset()                    { *m = ListDeviceRegistriesRequest{} }
-func (m *ListDeviceRegistriesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDeviceRegistriesRequest) ProtoMessage()               {}
-func (*ListDeviceRegistriesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ListDeviceRegistriesRequest proto.InternalMessageInfo
 
 func (m *ListDeviceRegistriesRequest) GetParent() string {
 	if m != nil {
@@ -213,17 +285,39 @@ func (m *ListDeviceRegistriesRequest) GetPageToken() string {
 // Response for `ListDeviceRegistries`.
 type ListDeviceRegistriesResponse struct {
 	// The registries that matched the query.
-	DeviceRegistries []*DeviceRegistry `protobuf:"bytes,1,rep,name=device_registries,json=deviceRegistries" json:"device_registries,omitempty"`
+	DeviceRegistries []*DeviceRegistry `protobuf:"bytes,1,rep,name=device_registries,json=deviceRegistries,proto3" json:"device_registries,omitempty"`
 	// If not empty, indicates that there may be more registries that match the
 	// request; this value should be passed in a new
 	// `ListDeviceRegistriesRequest`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDeviceRegistriesResponse) Reset()                    { *m = ListDeviceRegistriesResponse{} }
-func (m *ListDeviceRegistriesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDeviceRegistriesResponse) ProtoMessage()               {}
-func (*ListDeviceRegistriesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ListDeviceRegistriesResponse) Reset()         { *m = ListDeviceRegistriesResponse{} }
+func (m *ListDeviceRegistriesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDeviceRegistriesResponse) ProtoMessage()    {}
+func (*ListDeviceRegistriesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{5}
+}
+func (m *ListDeviceRegistriesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDeviceRegistriesResponse.Unmarshal(m, b)
+}
+func (m *ListDeviceRegistriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDeviceRegistriesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDeviceRegistriesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceRegistriesResponse.Merge(dst, src)
+}
+func (m *ListDeviceRegistriesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDeviceRegistriesResponse.Size(m)
+}
+func (m *ListDeviceRegistriesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDeviceRegistriesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDeviceRegistriesResponse proto.InternalMessageInfo
 
 func (m *ListDeviceRegistriesResponse) GetDeviceRegistries() []*DeviceRegistry {
 	if m != nil {
@@ -244,15 +338,39 @@ type CreateDeviceRequest struct {
 	// The name of the device registry where this device should be created.
 	// For example,
 	// `projects/example-project/locations/us-central1/registries/my-registry`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// The device registration details.
-	Device *Device `protobuf:"bytes,2,opt,name=device" json:"device,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The device registration details. The field `name` must be empty. The server
+	// will generate that field from the device registry `id` provided and the
+	// `parent` field.
+	Device               *Device  `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateDeviceRequest) Reset()         { *m = CreateDeviceRequest{} }
+func (m *CreateDeviceRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDeviceRequest) ProtoMessage()    {}
+func (*CreateDeviceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{6}
+}
+func (m *CreateDeviceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDeviceRequest.Unmarshal(m, b)
+}
+func (m *CreateDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDeviceRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDeviceRequest.Merge(dst, src)
+}
+func (m *CreateDeviceRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDeviceRequest.Size(m)
+}
+func (m *CreateDeviceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDeviceRequest.DiscardUnknown(m)
 }
 
-func (m *CreateDeviceRequest) Reset()                    { *m = CreateDeviceRequest{} }
-func (m *CreateDeviceRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateDeviceRequest) ProtoMessage()               {}
-func (*CreateDeviceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_CreateDeviceRequest proto.InternalMessageInfo
 
 func (m *CreateDeviceRequest) GetParent() string {
 	if m != nil {
@@ -273,16 +391,38 @@ type GetDeviceRequest struct {
 	// The name of the device. For example,
 	// `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
 	// `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The fields of the `Device` resource to be returned in the response. If the
 	// field mask is unset or empty, all fields are returned.
-	FieldMask *google_protobuf4.FieldMask `protobuf:"bytes,2,opt,name=field_mask,json=fieldMask" json:"field_mask,omitempty"`
+	FieldMask            *field_mask.FieldMask `protobuf:"bytes,2,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *GetDeviceRequest) Reset()                    { *m = GetDeviceRequest{} }
-func (m *GetDeviceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDeviceRequest) ProtoMessage()               {}
-func (*GetDeviceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *GetDeviceRequest) Reset()         { *m = GetDeviceRequest{} }
+func (m *GetDeviceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDeviceRequest) ProtoMessage()    {}
+func (*GetDeviceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{7}
+}
+func (m *GetDeviceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDeviceRequest.Unmarshal(m, b)
+}
+func (m *GetDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDeviceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDeviceRequest.Merge(dst, src)
+}
+func (m *GetDeviceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDeviceRequest.Size(m)
+}
+func (m *GetDeviceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDeviceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDeviceRequest proto.InternalMessageInfo
 
 func (m *GetDeviceRequest) GetName() string {
 	if m != nil {
@@ -291,7 +431,7 @@ func (m *GetDeviceRequest) GetName() string {
 	return ""
 }
 
-func (m *GetDeviceRequest) GetFieldMask() *google_protobuf4.FieldMask {
+func (m *GetDeviceRequest) GetFieldMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.FieldMask
 	}
@@ -304,18 +444,40 @@ type UpdateDeviceRequest struct {
 	// be empty, and the field `name` must specify the name path. For example,
 	// `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
 	// `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
-	Device *Device `protobuf:"bytes,2,opt,name=device" json:"device,omitempty"`
+	Device *Device `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"`
 	// Only updates the `device` fields indicated by this mask.
 	// The field mask must not be empty, and it must not contain fields that
 	// are immutable or only set by the server.
-	// Mutable top-level fields: `credentials`, `enabled_state`, and `metadata`
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	// Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateDeviceRequest) Reset()         { *m = UpdateDeviceRequest{} }
+func (m *UpdateDeviceRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateDeviceRequest) ProtoMessage()    {}
+func (*UpdateDeviceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{8}
+}
+func (m *UpdateDeviceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateDeviceRequest.Unmarshal(m, b)
+}
+func (m *UpdateDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateDeviceRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDeviceRequest.Merge(dst, src)
+}
+func (m *UpdateDeviceRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateDeviceRequest.Size(m)
+}
+func (m *UpdateDeviceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateDeviceRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateDeviceRequest) Reset()                    { *m = UpdateDeviceRequest{} }
-func (m *UpdateDeviceRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateDeviceRequest) ProtoMessage()               {}
-func (*UpdateDeviceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_UpdateDeviceRequest proto.InternalMessageInfo
 
 func (m *UpdateDeviceRequest) GetDevice() *Device {
 	if m != nil {
@@ -324,7 +486,7 @@ func (m *UpdateDeviceRequest) GetDevice() *Device {
 	return nil
 }
 
-func (m *UpdateDeviceRequest) GetUpdateMask() *google_protobuf4.FieldMask {
+func (m *UpdateDeviceRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -336,13 +498,35 @@ type DeleteDeviceRequest struct {
 	// The name of the device. For example,
 	// `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
 	// `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteDeviceRequest) Reset()                    { *m = DeleteDeviceRequest{} }
-func (m *DeleteDeviceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteDeviceRequest) ProtoMessage()               {}
-func (*DeleteDeviceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *DeleteDeviceRequest) Reset()         { *m = DeleteDeviceRequest{} }
+func (m *DeleteDeviceRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteDeviceRequest) ProtoMessage()    {}
+func (*DeleteDeviceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{9}
+}
+func (m *DeleteDeviceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteDeviceRequest.Unmarshal(m, b)
+}
+func (m *DeleteDeviceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteDeviceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteDeviceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDeviceRequest.Merge(dst, src)
+}
+func (m *DeleteDeviceRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteDeviceRequest.Size(m)
+}
+func (m *DeleteDeviceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteDeviceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteDeviceRequest proto.InternalMessageInfo
 
 func (m *DeleteDeviceRequest) GetName() string {
 	if m != nil {
@@ -355,33 +539,55 @@ func (m *DeleteDeviceRequest) GetName() string {
 type ListDevicesRequest struct {
 	// The device registry path. Required. For example,
 	// `projects/my-project/locations/us-central1/registries/my-registry`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// A list of device numerical ids. If empty, it will ignore this field. This
 	// field cannot hold more than 10,000 entries.
-	DeviceNumIds []uint64 `protobuf:"varint,2,rep,packed,name=device_num_ids,json=deviceNumIds" json:"device_num_ids,omitempty"`
+	DeviceNumIds []uint64 `protobuf:"varint,2,rep,packed,name=device_num_ids,json=deviceNumIds,proto3" json:"device_num_ids,omitempty"`
 	// A list of device string identifiers. If empty, it will ignore this field.
 	// For example, `['device0', 'device12']`. This field cannot hold more than
 	// 10,000 entries.
-	DeviceIds []string `protobuf:"bytes,3,rep,name=device_ids,json=deviceIds" json:"device_ids,omitempty"`
+	DeviceIds []string `protobuf:"bytes,3,rep,name=device_ids,json=deviceIds,proto3" json:"device_ids,omitempty"`
 	// The fields of the `Device` resource to be returned in the response. The
 	// fields `id`, and `num_id` are always returned by default, along with any
 	// other fields specified.
-	FieldMask *google_protobuf4.FieldMask `protobuf:"bytes,4,opt,name=field_mask,json=fieldMask" json:"field_mask,omitempty"`
+	FieldMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
 	// The maximum number of devices to return in the response. If this value
 	// is zero, the service will select a default size. A call may return fewer
 	// objects than requested, but if there is a non-empty `page_token`, it
 	// indicates that more entries are available.
-	PageSize int32 `protobuf:"varint,100,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,100,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last `ListDevicesResponse`; indicates
 	// that this is a continuation of a prior `ListDevices` call, and
 	// that the system should return the next page of data.
-	PageToken string `protobuf:"bytes,101,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,101,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDevicesRequest) Reset()         { *m = ListDevicesRequest{} }
+func (m *ListDevicesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDevicesRequest) ProtoMessage()    {}
+func (*ListDevicesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{10}
+}
+func (m *ListDevicesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDevicesRequest.Unmarshal(m, b)
+}
+func (m *ListDevicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDevicesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDevicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDevicesRequest.Merge(dst, src)
+}
+func (m *ListDevicesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDevicesRequest.Size(m)
+}
+func (m *ListDevicesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDevicesRequest.DiscardUnknown(m)
 }
 
-func (m *ListDevicesRequest) Reset()                    { *m = ListDevicesRequest{} }
-func (m *ListDevicesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDevicesRequest) ProtoMessage()               {}
-func (*ListDevicesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_ListDevicesRequest proto.InternalMessageInfo
 
 func (m *ListDevicesRequest) GetParent() string {
 	if m != nil {
@@ -404,7 +610,7 @@ func (m *ListDevicesRequest) GetDeviceIds() []string {
 	return nil
 }
 
-func (m *ListDevicesRequest) GetFieldMask() *google_protobuf4.FieldMask {
+func (m *ListDevicesRequest) GetFieldMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.FieldMask
 	}
@@ -428,16 +634,38 @@ func (m *ListDevicesRequest) GetPageToken() string {
 // Response for `ListDevices`.
 type ListDevicesResponse struct {
 	// The devices that match the request.
-	Devices []*Device `protobuf:"bytes,1,rep,name=devices" json:"devices,omitempty"`
+	Devices []*Device `protobuf:"bytes,1,rep,name=devices,proto3" json:"devices,omitempty"`
 	// If not empty, indicates that there may be more devices that match the
 	// request; this value should be passed in a new `ListDevicesRequest`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDevicesResponse) Reset()                    { *m = ListDevicesResponse{} }
-func (m *ListDevicesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDevicesResponse) ProtoMessage()               {}
-func (*ListDevicesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *ListDevicesResponse) Reset()         { *m = ListDevicesResponse{} }
+func (m *ListDevicesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDevicesResponse) ProtoMessage()    {}
+func (*ListDevicesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{11}
+}
+func (m *ListDevicesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDevicesResponse.Unmarshal(m, b)
+}
+func (m *ListDevicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDevicesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDevicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDevicesResponse.Merge(dst, src)
+}
+func (m *ListDevicesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDevicesResponse.Size(m)
+}
+func (m *ListDevicesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDevicesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDevicesResponse proto.InternalMessageInfo
 
 func (m *ListDevicesResponse) GetDevices() []*Device {
 	if m != nil {
@@ -458,24 +686,44 @@ type ModifyCloudToDeviceConfigRequest struct {
 	// The name of the device. For example,
 	// `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
 	// `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The version number to update. If this value is zero, it will not check the
 	// version number of the server and will always update the current version;
 	// otherwise, this update will fail if the version number found on the server
 	// does not match this version number. This is used to support multiple
 	// simultaneous updates without losing data.
-	VersionToUpdate int64 `protobuf:"varint,2,opt,name=version_to_update,json=versionToUpdate" json:"version_to_update,omitempty"`
+	VersionToUpdate int64 `protobuf:"varint,2,opt,name=version_to_update,json=versionToUpdate,proto3" json:"version_to_update,omitempty"`
 	// The configuration data for the device.
-	BinaryData []byte `protobuf:"bytes,3,opt,name=binary_data,json=binaryData,proto3" json:"binary_data,omitempty"`
+	BinaryData           []byte   `protobuf:"bytes,3,opt,name=binary_data,json=binaryData,proto3" json:"binary_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ModifyCloudToDeviceConfigRequest) Reset()         { *m = ModifyCloudToDeviceConfigRequest{} }
 func (m *ModifyCloudToDeviceConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*ModifyCloudToDeviceConfigRequest) ProtoMessage()    {}
 func (*ModifyCloudToDeviceConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{12}
+	return fileDescriptor_device_manager_2617478a41a48425, []int{12}
+}
+func (m *ModifyCloudToDeviceConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Unmarshal(m, b)
+}
+func (m *ModifyCloudToDeviceConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *ModifyCloudToDeviceConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Merge(dst, src)
+}
+func (m *ModifyCloudToDeviceConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_ModifyCloudToDeviceConfigRequest.Size(m)
+}
+func (m *ModifyCloudToDeviceConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ModifyCloudToDeviceConfigRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ModifyCloudToDeviceConfigRequest proto.InternalMessageInfo
+
 func (m *ModifyCloudToDeviceConfigRequest) GetName() string {
 	if m != nil {
 		return m.Name
@@ -502,20 +750,40 @@ type ListDeviceConfigVersionsRequest struct {
 	// The name of the device. For example,
 	// `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
 	// `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The number of versions to list. Versions are listed in decreasing order of
 	// the version number. The maximum number of versions retained is 10. If this
 	// value is zero, it will return all the versions available.
-	NumVersions int32 `protobuf:"varint,2,opt,name=num_versions,json=numVersions" json:"num_versions,omitempty"`
+	NumVersions          int32    `protobuf:"varint,2,opt,name=num_versions,json=numVersions,proto3" json:"num_versions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ListDeviceConfigVersionsRequest) Reset()         { *m = ListDeviceConfigVersionsRequest{} }
 func (m *ListDeviceConfigVersionsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListDeviceConfigVersionsRequest) ProtoMessage()    {}
 func (*ListDeviceConfigVersionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{13}
+	return fileDescriptor_device_manager_2617478a41a48425, []int{13}
+}
+func (m *ListDeviceConfigVersionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDeviceConfigVersionsRequest.Unmarshal(m, b)
+}
+func (m *ListDeviceConfigVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDeviceConfigVersionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDeviceConfigVersionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceConfigVersionsRequest.Merge(dst, src)
+}
+func (m *ListDeviceConfigVersionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDeviceConfigVersionsRequest.Size(m)
+}
+func (m *ListDeviceConfigVersionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDeviceConfigVersionsRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ListDeviceConfigVersionsRequest proto.InternalMessageInfo
+
 func (m *ListDeviceConfigVersionsRequest) GetName() string {
 	if m != nil {
 		return m.Name
@@ -534,16 +802,36 @@ func (m *ListDeviceConfigVersionsRequest) GetNumVersions() int32 {
 type ListDeviceConfigVersionsResponse struct {
 	// The device configuration for the last few versions. Versions are listed
 	// in decreasing order, starting from the most recent one.
-	DeviceConfigs []*DeviceConfig `protobuf:"bytes,1,rep,name=device_configs,json=deviceConfigs" json:"device_configs,omitempty"`
+	DeviceConfigs        []*DeviceConfig `protobuf:"bytes,1,rep,name=device_configs,json=deviceConfigs,proto3" json:"device_configs,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
 func (m *ListDeviceConfigVersionsResponse) Reset()         { *m = ListDeviceConfigVersionsResponse{} }
 func (m *ListDeviceConfigVersionsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListDeviceConfigVersionsResponse) ProtoMessage()    {}
 func (*ListDeviceConfigVersionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{14}
+	return fileDescriptor_device_manager_2617478a41a48425, []int{14}
+}
+func (m *ListDeviceConfigVersionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDeviceConfigVersionsResponse.Unmarshal(m, b)
+}
+func (m *ListDeviceConfigVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDeviceConfigVersionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDeviceConfigVersionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceConfigVersionsResponse.Merge(dst, src)
+}
+func (m *ListDeviceConfigVersionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDeviceConfigVersionsResponse.Size(m)
+}
+func (m *ListDeviceConfigVersionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDeviceConfigVersionsResponse.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ListDeviceConfigVersionsResponse proto.InternalMessageInfo
+
 func (m *ListDeviceConfigVersionsResponse) GetDeviceConfigs() []*DeviceConfig {
 	if m != nil {
 		return m.DeviceConfigs
@@ -556,17 +844,39 @@ type ListDeviceStatesRequest struct {
 	// The name of the device. For example,
 	// `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
 	// `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The number of states to list. States are listed in descending order of
 	// update time. The maximum number of states retained is 10. If this
 	// value is zero, it will return all the states available.
-	NumStates int32 `protobuf:"varint,2,opt,name=num_states,json=numStates" json:"num_states,omitempty"`
+	NumStates            int32    `protobuf:"varint,2,opt,name=num_states,json=numStates,proto3" json:"num_states,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDeviceStatesRequest) Reset()         { *m = ListDeviceStatesRequest{} }
+func (m *ListDeviceStatesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDeviceStatesRequest) ProtoMessage()    {}
+func (*ListDeviceStatesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{15}
+}
+func (m *ListDeviceStatesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDeviceStatesRequest.Unmarshal(m, b)
+}
+func (m *ListDeviceStatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDeviceStatesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDeviceStatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceStatesRequest.Merge(dst, src)
+}
+func (m *ListDeviceStatesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDeviceStatesRequest.Size(m)
+}
+func (m *ListDeviceStatesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDeviceStatesRequest.DiscardUnknown(m)
 }
 
-func (m *ListDeviceStatesRequest) Reset()                    { *m = ListDeviceStatesRequest{} }
-func (m *ListDeviceStatesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDeviceStatesRequest) ProtoMessage()               {}
-func (*ListDeviceStatesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_ListDeviceStatesRequest proto.InternalMessageInfo
 
 func (m *ListDeviceStatesRequest) GetName() string {
 	if m != nil {
@@ -586,13 +896,35 @@ func (m *ListDeviceStatesRequest) GetNumStates() int32 {
 type ListDeviceStatesResponse struct {
 	// The last few device states. States are listed in descending order of server
 	// update time, starting from the most recent one.
-	DeviceStates []*DeviceState `protobuf:"bytes,1,rep,name=device_states,json=deviceStates" json:"device_states,omitempty"`
+	DeviceStates         []*DeviceState `protobuf:"bytes,1,rep,name=device_states,json=deviceStates,proto3" json:"device_states,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *ListDeviceStatesResponse) Reset()                    { *m = ListDeviceStatesResponse{} }
-func (m *ListDeviceStatesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDeviceStatesResponse) ProtoMessage()               {}
-func (*ListDeviceStatesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *ListDeviceStatesResponse) Reset()         { *m = ListDeviceStatesResponse{} }
+func (m *ListDeviceStatesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDeviceStatesResponse) ProtoMessage()    {}
+func (*ListDeviceStatesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_manager_2617478a41a48425, []int{16}
+}
+func (m *ListDeviceStatesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDeviceStatesResponse.Unmarshal(m, b)
+}
+func (m *ListDeviceStatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDeviceStatesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDeviceStatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeviceStatesResponse.Merge(dst, src)
+}
+func (m *ListDeviceStatesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDeviceStatesResponse.Size(m)
+}
+func (m *ListDeviceStatesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDeviceStatesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDeviceStatesResponse proto.InternalMessageInfo
 
 func (m *ListDeviceStatesResponse) GetDeviceStates() []*DeviceState {
 	if m != nil {
@@ -629,8 +961,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for DeviceManager service
-
+// DeviceManagerClient is the client API for DeviceManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DeviceManagerClient interface {
 	// Creates a device registry that contains devices.
 	CreateDeviceRegistry(ctx context.Context, in *CreateDeviceRegistryRequest, opts ...grpc.CallOption) (*DeviceRegistry, error)
@@ -639,7 +972,7 @@ type DeviceManagerClient interface {
 	// Updates a device registry configuration.
 	UpdateDeviceRegistry(ctx context.Context, in *UpdateDeviceRegistryRequest, opts ...grpc.CallOption) (*DeviceRegistry, error)
 	// Deletes a device registry configuration.
-	DeleteDeviceRegistry(ctx context.Context, in *DeleteDeviceRegistryRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
+	DeleteDeviceRegistry(ctx context.Context, in *DeleteDeviceRegistryRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Lists device registries.
 	ListDeviceRegistries(ctx context.Context, in *ListDeviceRegistriesRequest, opts ...grpc.CallOption) (*ListDeviceRegistriesResponse, error)
 	// Creates a device in a device registry.
@@ -649,7 +982,7 @@ type DeviceManagerClient interface {
 	// Updates a device.
 	UpdateDevice(ctx context.Context, in *UpdateDeviceRequest, opts ...grpc.CallOption) (*Device, error)
 	// Deletes a device.
-	DeleteDevice(ctx context.Context, in *DeleteDeviceRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
+	DeleteDevice(ctx context.Context, in *DeleteDeviceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// List devices in a device registry.
 	ListDevices(ctx context.Context, in *ListDevicesRequest, opts ...grpc.CallOption) (*ListDevicesResponse, error)
 	// Modifies the configuration for the device, which is eventually sent from
@@ -664,15 +997,15 @@ type DeviceManagerClient interface {
 	ListDeviceStates(ctx context.Context, in *ListDeviceStatesRequest, opts ...grpc.CallOption) (*ListDeviceStatesResponse, error)
 	// Sets the access control policy on the specified resource. Replaces any
 	// existing policy.
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Gets the access control policy for a resource.
 	// Returns an empty policy if the resource exists and does not have a policy
 	// set.
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Returns permissions that a caller has on the specified resource.
 	// If the resource does not exist, this will return an empty set of
 	// permissions, not a NOT_FOUND error.
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
 }
 
 type deviceManagerClient struct {
@@ -685,7 +1018,7 @@ func NewDeviceManagerClient(cc *grpc.ClientConn) DeviceManagerClient {
 
 func (c *deviceManagerClient) CreateDeviceRegistry(ctx context.Context, in *CreateDeviceRegistryRequest, opts ...grpc.CallOption) (*DeviceRegistry, error) {
 	out := new(DeviceRegistry)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/CreateDeviceRegistry", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/CreateDeviceRegistry", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -694,7 +1027,7 @@ func (c *deviceManagerClient) CreateDeviceRegistry(ctx context.Context, in *Crea
 
 func (c *deviceManagerClient) GetDeviceRegistry(ctx context.Context, in *GetDeviceRegistryRequest, opts ...grpc.CallOption) (*DeviceRegistry, error) {
 	out := new(DeviceRegistry)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/GetDeviceRegistry", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/GetDeviceRegistry", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -703,16 +1036,16 @@ func (c *deviceManagerClient) GetDeviceRegistry(ctx context.Context, in *GetDevi
 
 func (c *deviceManagerClient) UpdateDeviceRegistry(ctx context.Context, in *UpdateDeviceRegistryRequest, opts ...grpc.CallOption) (*DeviceRegistry, error) {
 	out := new(DeviceRegistry)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/UpdateDeviceRegistry", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/UpdateDeviceRegistry", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *deviceManagerClient) DeleteDeviceRegistry(ctx context.Context, in *DeleteDeviceRegistryRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/DeleteDeviceRegistry", in, out, c.cc, opts...)
+func (c *deviceManagerClient) DeleteDeviceRegistry(ctx context.Context, in *DeleteDeviceRegistryRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/DeleteDeviceRegistry", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -721,7 +1054,7 @@ func (c *deviceManagerClient) DeleteDeviceRegistry(ctx context.Context, in *Dele
 
 func (c *deviceManagerClient) ListDeviceRegistries(ctx context.Context, in *ListDeviceRegistriesRequest, opts ...grpc.CallOption) (*ListDeviceRegistriesResponse, error) {
 	out := new(ListDeviceRegistriesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ListDeviceRegistries", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ListDeviceRegistries", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -730,7 +1063,7 @@ func (c *deviceManagerClient) ListDeviceRegistries(ctx context.Context, in *List
 
 func (c *deviceManagerClient) CreateDevice(ctx context.Context, in *CreateDeviceRequest, opts ...grpc.CallOption) (*Device, error) {
 	out := new(Device)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/CreateDevice", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/CreateDevice", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -739,7 +1072,7 @@ func (c *deviceManagerClient) CreateDevice(ctx context.Context, in *CreateDevice
 
 func (c *deviceManagerClient) GetDevice(ctx context.Context, in *GetDeviceRequest, opts ...grpc.CallOption) (*Device, error) {
 	out := new(Device)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/GetDevice", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/GetDevice", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -748,16 +1081,16 @@ func (c *deviceManagerClient) GetDevice(ctx context.Context, in *GetDeviceReques
 
 func (c *deviceManagerClient) UpdateDevice(ctx context.Context, in *UpdateDeviceRequest, opts ...grpc.CallOption) (*Device, error) {
 	out := new(Device)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/UpdateDevice", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/UpdateDevice", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *deviceManagerClient) DeleteDevice(ctx context.Context, in *DeleteDeviceRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/DeleteDevice", in, out, c.cc, opts...)
+func (c *deviceManagerClient) DeleteDevice(ctx context.Context, in *DeleteDeviceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/DeleteDevice", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -766,7 +1099,7 @@ func (c *deviceManagerClient) DeleteDevice(ctx context.Context, in *DeleteDevice
 
 func (c *deviceManagerClient) ListDevices(ctx context.Context, in *ListDevicesRequest, opts ...grpc.CallOption) (*ListDevicesResponse, error) {
 	out := new(ListDevicesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ListDevices", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ListDevices", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -775,7 +1108,7 @@ func (c *deviceManagerClient) ListDevices(ctx context.Context, in *ListDevicesRe
 
 func (c *deviceManagerClient) ModifyCloudToDeviceConfig(ctx context.Context, in *ModifyCloudToDeviceConfigRequest, opts ...grpc.CallOption) (*DeviceConfig, error) {
 	out := new(DeviceConfig)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ModifyCloudToDeviceConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ModifyCloudToDeviceConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -784,7 +1117,7 @@ func (c *deviceManagerClient) ModifyCloudToDeviceConfig(ctx context.Context, in
 
 func (c *deviceManagerClient) ListDeviceConfigVersions(ctx context.Context, in *ListDeviceConfigVersionsRequest, opts ...grpc.CallOption) (*ListDeviceConfigVersionsResponse, error) {
 	out := new(ListDeviceConfigVersionsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ListDeviceConfigVersions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ListDeviceConfigVersions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -793,42 +1126,41 @@ func (c *deviceManagerClient) ListDeviceConfigVersions(ctx context.Context, in *
 
 func (c *deviceManagerClient) ListDeviceStates(ctx context.Context, in *ListDeviceStatesRequest, opts ...grpc.CallOption) (*ListDeviceStatesResponse, error) {
 	out := new(ListDeviceStatesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ListDeviceStates", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/ListDeviceStates", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *deviceManagerClient) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/SetIamPolicy", in, out, c.cc, opts...)
+func (c *deviceManagerClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *deviceManagerClient) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/GetIamPolicy", in, out, c.cc, opts...)
+func (c *deviceManagerClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *deviceManagerClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/TestIamPermissions", in, out, c.cc, opts...)
+func (c *deviceManagerClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for DeviceManager service
-
+// DeviceManagerServer is the server API for DeviceManager service.
 type DeviceManagerServer interface {
 	// Creates a device registry that contains devices.
 	CreateDeviceRegistry(context.Context, *CreateDeviceRegistryRequest) (*DeviceRegistry, error)
@@ -837,7 +1169,7 @@ type DeviceManagerServer interface {
 	// Updates a device registry configuration.
 	UpdateDeviceRegistry(context.Context, *UpdateDeviceRegistryRequest) (*DeviceRegistry, error)
 	// Deletes a device registry configuration.
-	DeleteDeviceRegistry(context.Context, *DeleteDeviceRegistryRequest) (*google_protobuf3.Empty, error)
+	DeleteDeviceRegistry(context.Context, *DeleteDeviceRegistryRequest) (*empty.Empty, error)
 	// Lists device registries.
 	ListDeviceRegistries(context.Context, *ListDeviceRegistriesRequest) (*ListDeviceRegistriesResponse, error)
 	// Creates a device in a device registry.
@@ -847,7 +1179,7 @@ type DeviceManagerServer interface {
 	// Updates a device.
 	UpdateDevice(context.Context, *UpdateDeviceRequest) (*Device, error)
 	// Deletes a device.
-	DeleteDevice(context.Context, *DeleteDeviceRequest) (*google_protobuf3.Empty, error)
+	DeleteDevice(context.Context, *DeleteDeviceRequest) (*empty.Empty, error)
 	// List devices in a device registry.
 	ListDevices(context.Context, *ListDevicesRequest) (*ListDevicesResponse, error)
 	// Modifies the configuration for the device, which is eventually sent from
@@ -862,15 +1194,15 @@ type DeviceManagerServer interface {
 	ListDeviceStates(context.Context, *ListDeviceStatesRequest) (*ListDeviceStatesResponse, error)
 	// Sets the access control policy on the specified resource. Replaces any
 	// existing policy.
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Gets the access control policy for a resource.
 	// Returns an empty policy if the resource exists and does not have a policy
 	// set.
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Returns permissions that a caller has on the specified resource.
 	// If the resource does not exist, this will return an empty set of
 	// permissions, not a NOT_FOUND error.
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
 }
 
 func RegisterDeviceManagerServer(s *grpc.Server, srv DeviceManagerServer) {
@@ -1112,7 +1444,7 @@ func _DeviceManager_ListDeviceStates_Handler(srv interface{}, ctx context.Contex
 }
 
 func _DeviceManager_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1124,13 +1456,13 @@ func _DeviceManager_SetIamPolicy_Handler(srv interface{}, ctx context.Context, d
 		FullMethod: "/google.cloud.iot.v1.DeviceManager/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DeviceManagerServer).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(DeviceManagerServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _DeviceManager_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1142,13 +1474,13 @@ func _DeviceManager_GetIamPolicy_Handler(srv interface{}, ctx context.Context, d
 		FullMethod: "/google.cloud.iot.v1.DeviceManager/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DeviceManagerServer).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(DeviceManagerServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _DeviceManager_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1160,7 +1492,7 @@ func _DeviceManager_TestIamPermissions_Handler(srv interface{}, ctx context.Cont
 		FullMethod: "/google.cloud.iot.v1.DeviceManager/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DeviceManagerServer).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(DeviceManagerServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1238,90 +1570,100 @@ var _DeviceManager_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/iot/v1/device_manager.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/iot/v1/device_manager.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 1307 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x98, 0xcf, 0x8f, 0xdb, 0x44,
-	0x14, 0xc7, 0x35, 0x9b, 0x52, 0xd8, 0xb7, 0x29, 0x6d, 0x67, 0xb7, 0x6d, 0x48, 0x5a, 0x9a, 0xba,
-	0xfc, 0x48, 0x23, 0x6a, 0x77, 0xb7, 0xb4, 0x2a, 0xa9, 0xa0, 0xd0, 0x6e, 0xd9, 0xb6, 0x6a, 0x21,
-	0x64, 0x17, 0x8a, 0x90, 0x50, 0x34, 0x1b, 0xcf, 0x46, 0xd3, 0x8d, 0x3d, 0xa9, 0xc7, 0x59, 0xb1,
-	0x45, 0xbd, 0xd0, 0x03, 0x67, 0x40, 0x48, 0xbd, 0x21, 0x71, 0x40, 0xdc, 0x91, 0x10, 0x12, 0x77,
-	0xfe, 0x01, 0x38, 0xf0, 0x07, 0x70, 0xe0, 0x4f, 0xe8, 0x11, 0x79, 0x66, 0xbc, 0x6b, 0x3b, 0xb6,
-	0xe3, 0xe4, 0xc0, 0x2d, 0x9e, 0xf7, 0x66, 0xe6, 0x33, 0xdf, 0xf7, 0x9e, 0xe7, 0xc5, 0xd0, 0xe8,
-	0x73, 0xde, 0x1f, 0x50, 0xab, 0x37, 0xe0, 0x23, 0xdb, 0x62, 0xdc, 0xb7, 0x76, 0x96, 0x2d, 0x9b,
-	0xee, 0xb0, 0x1e, 0xed, 0x3a, 0xc4, 0x25, 0x7d, 0xea, 0x99, 0x43, 0x8f, 0xfb, 0x1c, 0x2f, 0x2a,
-	0x4f, 0x53, 0x7a, 0x9a, 0x8c, 0xfb, 0xe6, 0xce, 0x72, 0xf5, 0xa4, 0x9e, 0x4e, 0x86, 0xcc, 0x22,
-	0xae, 0xcb, 0x7d, 0xe2, 0x33, 0xee, 0x0a, 0x35, 0xa5, 0x7a, 0x36, 0x6d, 0x71, 0x8f, 0x0a, 0x3e,
-	0xf2, 0x7a, 0x34, 0x74, 0x7a, 0x59, 0x3b, 0x31, 0xe2, 0x04, 0x66, 0x46, 0x9c, 0xee, 0x90, 0x0f,
-	0x58, 0x6f, 0x57, 0xdb, 0xab, 0x71, 0x7b, 0xcc, 0x56, 0xd3, 0x36, 0xf9, 0xb4, 0x39, 0xda, 0xb2,
-	0xa8, 0x33, 0xf4, 0x43, 0x63, 0x3d, 0x69, 0xdc, 0x62, 0x74, 0x60, 0x77, 0x1d, 0x22, 0xb6, 0x95,
-	0x87, 0xf1, 0x04, 0x41, 0xed, 0x86, 0x47, 0x89, 0x4f, 0x57, 0xe5, 0x89, 0x3b, 0xb4, 0xcf, 0x84,
-	0xef, 0xed, 0x76, 0xe8, 0xc3, 0x11, 0x15, 0x3e, 0x3e, 0x0e, 0x07, 0x87, 0xc4, 0xa3, 0xae, 0x5f,
-	0x41, 0x75, 0xd4, 0x98, 0xef, 0xe8, 0x27, 0x7c, 0x17, 0x0e, 0x6b, 0x89, 0x3c, 0x3d, 0xa3, 0x32,
-	0x57, 0x47, 0x8d, 0x85, 0x95, 0xb3, 0x66, 0x8a, 0x48, 0x66, 0x62, 0xf1, 0x17, 0xed, 0xd8, 0xb3,
-	0x61, 0x42, 0x65, 0x8d, 0xfa, 0xe9, 0x04, 0x18, 0x0e, 0xb8, 0xc4, 0xa1, 0x7a, 0x7f, 0xf9, 0xdb,
-	0x58, 0x86, 0xda, 0x2a, 0x1d, 0xd0, 0x2c, 0xe8, 0xb4, 0x29, 0x3f, 0x23, 0xa8, 0x7d, 0x3c, 0xb4,
-	0x33, 0x0f, 0x9a, 0x72, 0x20, 0x34, 0xf3, 0x81, 0xf0, 0x55, 0x58, 0x18, 0xc9, 0xcd, 0xa4, 0xd6,
-	0x5a, 0x9a, 0x6a, 0xb8, 0x52, 0x18, 0x0e, 0xf3, 0xfd, 0x20, 0x1c, 0xf7, 0x88, 0xd8, 0xee, 0x80,
-	0x72, 0x0f, 0x7e, 0x1b, 0x0f, 0xa1, 0x76, 0x97, 0x89, 0xb8, 0x1c, 0x8c, 0x8a, 0x49, 0x21, 0xa9,
-	0xc1, 0xfc, 0x90, 0xf4, 0x69, 0x57, 0xb0, 0x47, 0x54, 0xee, 0xf8, 0x5c, 0xe7, 0x85, 0x60, 0x60,
-	0x9d, 0x3d, 0xa2, 0xf8, 0x14, 0x80, 0x34, 0xfa, 0x7c, 0x9b, 0xba, 0x95, 0x92, 0x9c, 0x28, 0xdd,
-	0x37, 0x82, 0x01, 0xe3, 0x29, 0x82, 0x93, 0xe9, 0x7b, 0x8a, 0x21, 0x77, 0x05, 0xc5, 0x6d, 0x38,
-	0x1a, 0x97, 0x87, 0x51, 0x51, 0x41, 0xf5, 0x52, 0x51, 0x81, 0x8e, 0xd8, 0x89, 0x95, 0xf1, 0x6b,
-	0x70, 0xd8, 0xa5, 0x5f, 0xf8, 0xdd, 0x08, 0xd6, 0x9c, 0xc4, 0x3a, 0x14, 0x0c, 0xb7, 0xf7, 0xd0,
-	0x36, 0x61, 0x31, 0x9e, 0xa0, 0xf9, 0x2a, 0x5c, 0x84, 0x83, 0x6a, 0x2b, 0x2d, 0x7a, 0x2d, 0x8f,
-	0x4e, 0xbb, 0x1a, 0x04, 0x8e, 0x44, 0xf2, 0x2f, 0x33, 0x89, 0xf0, 0x5b, 0x00, 0xfb, 0x15, 0x54,
-	0x20, 0xaa, 0xf3, 0x5b, 0xe1, 0x4f, 0xe3, 0x6b, 0x04, 0x8b, 0xf1, 0xfc, 0x53, 0xdb, 0xcc, 0xc2,
-	0x9b, 0x4c, 0xaf, 0xd2, 0x54, 0xe9, 0x75, 0x0e, 0x16, 0xe3, 0xc5, 0x93, 0x5d, 0x34, 0xff, 0x22,
-	0xc0, 0xfb, 0x69, 0x31, 0x31, 0x03, 0x5f, 0x01, 0x5d, 0x07, 0x5d, 0x77, 0xe4, 0x74, 0x99, 0x2d,
-	0x2a, 0x73, 0xf5, 0x52, 0xe3, 0x40, 0xa7, 0xac, 0x46, 0x3f, 0x18, 0x39, 0xb7, 0x6d, 0x11, 0xa4,
-	0xa2, 0xf6, 0x0a, 0x3c, 0x4a, 0xf5, 0x52, 0x90, 0x8a, 0x6a, 0x24, 0x30, 0xc7, 0x35, 0x3e, 0x30,
-	0x85, 0xc6, 0xf1, 0x0a, 0xb0, 0x73, 0x2b, 0x80, 0x26, 0x2b, 0xc0, 0x87, 0xc5, 0xd8, 0x49, 0x75,
-	0xde, 0x5f, 0x82, 0xe7, 0x15, 0x5a, 0x98, 0xed, 0xb9, 0xf1, 0x09, 0x7d, 0x0b, 0x27, 0xf7, 0x13,
-	0x04, 0xf5, 0x7b, 0xdc, 0x66, 0x5b, 0xbb, 0x37, 0x82, 0xe5, 0x36, 0xb8, 0x5a, 0xe8, 0x06, 0x77,
-	0xb7, 0x58, 0x3f, 0x2f, 0x13, 0x9b, 0x70, 0x74, 0x87, 0x7a, 0x82, 0x71, 0xb7, 0xeb, 0xf3, 0xae,
-	0x8a, 0xae, 0xdc, 0xa2, 0xd4, 0x39, 0xac, 0x0d, 0x1b, 0x5c, 0xe5, 0x1b, 0x3e, 0x0d, 0x0b, 0x9b,
-	0xcc, 0x25, 0xde, 0x6e, 0xd7, 0x26, 0x3e, 0x91, 0xd9, 0x52, 0xee, 0x80, 0x1a, 0x5a, 0x25, 0x3e,
-	0x31, 0x3e, 0x85, 0xd3, 0xfb, 0x67, 0x57, 0x7b, 0x7f, 0xa2, 0xd6, 0x10, 0x79, 0x0c, 0x67, 0xa0,
-	0x1c, 0xc4, 0x59, 0x6f, 0x27, 0xf4, 0x3b, 0x67, 0xc1, 0x1d, 0x39, 0xe1, 0x6c, 0x63, 0x00, 0xf5,
-	0xec, 0x95, 0xb5, 0xc4, 0xb7, 0xf6, 0xb2, 0xa6, 0x27, 0x1d, 0x42, 0xa5, 0xcf, 0xe4, 0x28, 0xad,
-	0x05, 0x3a, 0x64, 0x47, 0x9e, 0x84, 0x71, 0x17, 0x4e, 0xec, 0xef, 0xb6, 0xee, 0x13, 0x9f, 0xe6,
-	0xf2, 0x9f, 0x02, 0x08, 0xf8, 0x85, 0x74, 0xd4, 0xf4, 0xf3, 0xee, 0xc8, 0x51, 0x33, 0x0d, 0x02,
-	0x95, 0xf1, 0xd5, 0x34, 0xf3, 0x4d, 0xd0, 0x5b, 0x87, 0xb3, 0x15, 0x72, 0x3d, 0x07, 0x59, 0xae,
-	0x10, 0x96, 0x82, 0x5a, 0x6e, 0xe5, 0xd9, 0x31, 0x38, 0xa4, 0xac, 0xf7, 0x54, 0xa3, 0x81, 0x7f,
-	0x45, 0xb0, 0x94, 0x76, 0x1f, 0xe3, 0x0b, 0xa9, 0x4b, 0xe7, 0x5c, 0xdd, 0xd5, 0x22, 0xef, 0x65,
-	0x63, 0xed, 0xab, 0x3f, 0xff, 0xf9, 0x6e, 0xee, 0x3d, 0xc3, 0x0c, 0x1a, 0x8b, 0x2f, 0x55, 0x1d,
-	0xbf, 0x3d, 0xf4, 0xf8, 0x03, 0xda, 0xf3, 0x85, 0xd5, 0xb4, 0x06, 0xbc, 0xa7, 0xfa, 0x19, 0xab,
-	0xf9, 0xd8, 0xda, 0x7f, 0xf5, 0xb7, 0x92, 0x97, 0x25, 0xfe, 0x01, 0xc1, 0xd1, 0xb1, 0x3b, 0x1c,
-	0x9f, 0x4f, 0x65, 0xc8, 0xba, 0xeb, 0x8b, 0x21, 0x5f, 0x96, 0xc8, 0x17, 0xb0, 0x42, 0x0e, 0x22,
-	0x99, 0x01, 0x1c, 0xe1, 0xb5, 0x9a, 0x8f, 0xf1, 0x1f, 0x08, 0x96, 0xd2, 0x3a, 0x80, 0x0c, 0x69,
-	0x73, 0x9a, 0x85, 0x62, 0x9c, 0xf7, 0x25, 0xe7, 0x47, 0x2b, 0xef, 0x48, 0xce, 0x84, 0x5e, 0x66,
-	0x61, 0xee, 0x71, 0xa9, 0x9f, 0x22, 0x58, 0x4a, 0x6b, 0x7f, 0x32, 0x0e, 0x92, 0xd3, 0x29, 0x55,
-	0x8f, 0x8f, 0xbd, 0x58, 0x6f, 0x06, 0xed, 0x63, 0xa8, 0x71, 0x73, 0x5a, 0x8d, 0x7f, 0x41, 0xb0,
-	0x94, 0xd6, 0x47, 0x64, 0xa0, 0xe5, 0xb4, 0x39, 0xd5, 0xe5, 0x29, 0x66, 0xa8, 0xaa, 0x4c, 0x64,
-	0x46, 0xe1, 0x64, 0x0e, 0x72, 0xb7, 0x1c, 0xad, 0x24, 0xdc, 0x28, 0x50, 0x6c, 0x8a, 0x32, 0xef,
-	0x3a, 0x30, 0x6e, 0x49, 0x9e, 0xeb, 0xc6, 0x95, 0xc9, 0x3c, 0x71, 0x1d, 0xf5, 0xdf, 0x0f, 0xd1,
-	0x0a, 0x2f, 0xfc, 0x6f, 0x10, 0xcc, 0xef, 0x55, 0x0d, 0x7e, 0x75, 0x52, 0x55, 0x15, 0x60, 0x7b,
-	0x57, 0xb2, 0xb5, 0xf0, 0x95, 0xa9, 0x22, 0x1c, 0x82, 0x05, 0xb1, 0xfe, 0x09, 0x41, 0x39, 0x5a,
-	0x24, 0x19, 0xaa, 0xa5, 0x34, 0x3d, 0xf9, 0x64, 0x1f, 0x4a, 0xb2, 0xdb, 0x2b, 0xd7, 0x22, 0x75,
-	0x63, 0xce, 0x00, 0xb8, 0x27, 0xde, 0xb7, 0x08, 0xca, 0xd1, 0x22, 0xc8, 0x00, 0x4d, 0x69, 0x8a,
-	0x32, 0xeb, 0x43, 0xab, 0xd7, 0x9c, 0x5d, 0xbd, 0x1f, 0x11, 0x2c, 0x44, 0x1a, 0x0e, 0xfc, 0xfa,
-	0x84, 0x74, 0xdf, 0xab, 0x8b, 0xc6, 0x64, 0x47, 0x5d, 0x0e, 0xf1, 0x10, 0xcf, 0x90, 0x7e, 0xf8,
-	0x2f, 0x04, 0x2f, 0x65, 0xb6, 0x27, 0xf8, 0x52, 0x2a, 0xc9, 0xa4, 0x76, 0xa6, 0x3a, 0xf9, 0x5e,
-	0x37, 0x3e, 0x97, 0xe4, 0xf7, 0x8d, 0xce, 0xac, 0xf2, 0xb6, 0x9c, 0x2c, 0x8a, 0x16, 0x6a, 0xe2,
-	0xbf, 0x51, 0xf4, 0x6a, 0x8f, 0xb7, 0x25, 0xf8, 0xcd, 0x09, 0xfa, 0xa6, 0xf6, 0x47, 0xd5, 0x4b,
-	0x53, 0xce, 0xd2, 0x21, 0xd2, 0xb9, 0x8e, 0xd7, 0x66, 0x3d, 0xa8, 0xd5, 0x8b, 0xd3, 0xff, 0x86,
-	0xe0, 0x48, 0xb2, 0x6b, 0xc1, 0x6f, 0x4c, 0x80, 0x8b, 0xb5, 0x4a, 0xd5, 0xf3, 0x05, 0xbd, 0xf5,
-	0x11, 0x74, 0x07, 0x81, 0xaf, 0xcd, 0x7c, 0x04, 0xd5, 0x42, 0xe1, 0xef, 0x11, 0x94, 0xd7, 0xa9,
-	0x7f, 0x9b, 0x38, 0x6d, 0xf9, 0x81, 0x03, 0x1b, 0x21, 0x08, 0x23, 0x4e, 0x80, 0x10, 0x35, 0x86,
-	0xb0, 0xc7, 0x12, 0x3e, 0xca, 0x6a, 0xdc, 0x91, 0x50, 0xab, 0x86, 0x82, 0x0a, 0xbf, 0xb7, 0x14,
-	0xbb, 0x6f, 0x45, 0x64, 0x9b, 0x20, 0x5b, 0x02, 0xae, 0xb5, 0x3c, 0xae, 0xb5, 0xff, 0x87, 0xab,
-	0x9f, 0xe0, 0xfa, 0x1d, 0x01, 0xde, 0xa0, 0x42, 0x0e, 0x52, 0xcf, 0x61, 0x42, 0x65, 0x40, 0x23,
-	0xb1, 0xf3, 0xb8, 0x4b, 0xc8, 0x78, 0xae, 0x80, 0xa7, 0x0e, 0x72, 0x5b, 0x72, 0xdf, 0x31, 0x6e,
-	0xce, 0xc0, 0xed, 0x8f, 0x2d, 0xdb, 0x42, 0xcd, 0xeb, 0x0f, 0xe0, 0x44, 0x8f, 0x3b, 0x69, 0xa9,
-	0x76, 0x1d, 0xc7, 0x5a, 0xe2, 0x76, 0xf0, 0xe6, 0x6d, 0xa3, 0xcf, 0x2e, 0x6b, 0xd7, 0x3e, 0x1f,
-	0x10, 0xb7, 0x6f, 0x72, 0xaf, 0x6f, 0xf5, 0xa9, 0x2b, 0xdf, 0xcb, 0x96, 0x32, 0x91, 0x21, 0x13,
-	0xb1, 0x0f, 0x6d, 0x57, 0x19, 0xf7, 0x9f, 0x21, 0xb4, 0x79, 0x50, 0x7a, 0x5d, 0xfc, 0x2f, 0x00,
-	0x00, 0xff, 0xff, 0xe6, 0xf2, 0xe0, 0x78, 0xea, 0x13, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/iot/v1/device_manager.proto", fileDescriptor_device_manager_2617478a41a48425)
+}
+
+var fileDescriptor_device_manager_2617478a41a48425 = []byte{
+	// 1432 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1b, 0x45,
+	0x14, 0xd7, 0xd8, 0xa5, 0x90, 0x17, 0x97, 0xb6, 0x93, 0xd0, 0x1a, 0xbb, 0xa5, 0xee, 0x96, 0x0f,
+	0xd7, 0xa2, 0xde, 0x26, 0xfd, 0x50, 0x49, 0x05, 0x55, 0x9b, 0x96, 0xa4, 0xa8, 0xa9, 0x82, 0x13,
+	0x3e, 0x64, 0x0e, 0x66, 0x62, 0x4f, 0xac, 0x6d, 0xbd, 0x3b, 0xee, 0xce, 0x38, 0x6a, 0x8a, 0x2a,
+	0x24, 0x2a, 0xe0, 0xc4, 0x85, 0x70, 0xa8, 0x90, 0x50, 0x2f, 0x08, 0x71, 0xe2, 0x82, 0x84, 0xe0,
+	0xc6, 0x89, 0x7f, 0x80, 0x03, 0x88, 0x33, 0x42, 0xfc, 0x09, 0x1c, 0x38, 0xa0, 0x9d, 0x99, 0x75,
+	0xbc, 0x9b, 0xdd, 0xf5, 0xda, 0xa9, 0xb8, 0x79, 0xe7, 0x7d, 0xfd, 0xde, 0xef, 0xbd, 0xb7, 0xf3,
+	0xbc, 0x50, 0x6e, 0x33, 0xd6, 0xee, 0x50, 0xb3, 0xd9, 0x61, 0xbd, 0x96, 0x69, 0x31, 0x61, 0x6e,
+	0xcc, 0x98, 0x2d, 0xba, 0x61, 0x35, 0x69, 0xc3, 0x26, 0x0e, 0x69, 0x53, 0xb7, 0xda, 0x75, 0x99,
+	0x60, 0x78, 0x4a, 0x69, 0x56, 0xa5, 0x66, 0xd5, 0x62, 0xa2, 0xba, 0x31, 0x53, 0x38, 0xa2, 0xcd,
+	0x49, 0xd7, 0x32, 0x89, 0xe3, 0x30, 0x41, 0x84, 0xc5, 0x1c, 0xae, 0x4c, 0x0a, 0x27, 0xa2, 0x9c,
+	0xbb, 0x94, 0xb3, 0x9e, 0xdb, 0xa4, 0xbe, 0xd2, 0x73, 0x5a, 0xc9, 0x22, 0xb6, 0x27, 0xb6, 0x88,
+	0xdd, 0xe8, 0xb2, 0x8e, 0xd5, 0xdc, 0xd4, 0xf2, 0x42, 0x50, 0x1e, 0x90, 0xf9, 0xb6, 0xf2, 0x69,
+	0xad, 0xb7, 0x6e, 0xb6, 0x7a, 0xae, 0x44, 0xa0, 0xe5, 0xc5, 0xb0, 0x9c, 0xda, 0x5d, 0xe1, 0x1b,
+	0x97, 0xc2, 0xc2, 0x75, 0x8b, 0x76, 0x5a, 0x0d, 0x9b, 0xf0, 0xdb, 0x5a, 0xe3, 0x58, 0x58, 0x43,
+	0x58, 0x36, 0xe5, 0x82, 0xd8, 0x5d, 0xa5, 0x60, 0x3c, 0x40, 0x50, 0x9c, 0x77, 0x29, 0x11, 0xf4,
+	0xaa, 0xa4, 0xac, 0x46, 0xdb, 0x16, 0x17, 0xee, 0x66, 0x8d, 0xde, 0xe9, 0x51, 0x2e, 0xf0, 0x21,
+	0xd8, 0xdb, 0x25, 0x2e, 0x75, 0x44, 0x1e, 0x95, 0x50, 0x79, 0xa2, 0xa6, 0x9f, 0xf0, 0x0d, 0xd8,
+	0xaf, 0x39, 0x76, 0xb5, 0x45, 0x3e, 0x53, 0x42, 0xe5, 0xc9, 0xd9, 0x13, 0xd5, 0x08, 0x96, 0xab,
+	0x21, 0xe7, 0x4f, 0xb7, 0x02, 0xcf, 0x46, 0x15, 0xf2, 0x0b, 0x54, 0x44, 0x23, 0xc0, 0xb0, 0xc7,
+	0x21, 0x36, 0xd5, 0xf1, 0xe5, 0x6f, 0x63, 0x06, 0x8a, 0x57, 0x69, 0x87, 0xc6, 0x81, 0x8e, 0x32,
+	0xf9, 0x16, 0x41, 0xf1, 0xad, 0x6e, 0x2b, 0x36, 0xd1, 0x88, 0x84, 0xd0, 0xd8, 0x09, 0xe1, 0x8b,
+	0x30, 0xd9, 0x93, 0xc1, 0x64, 0x31, 0x34, 0x35, 0x05, 0xdf, 0x93, 0x5f, 0x8d, 0xea, 0xeb, 0x5e,
+	0xbd, 0x96, 0x08, 0xbf, 0x5d, 0x03, 0xa5, 0xee, 0xfd, 0x36, 0xee, 0x40, 0xf1, 0x86, 0xc5, 0x83,
+	0x74, 0x58, 0x94, 0x0f, 0x2b, 0x49, 0x11, 0x26, 0xba, 0xa4, 0x4d, 0x1b, 0xdc, 0xba, 0x47, 0x65,
+	0xc4, 0x27, 0x6a, 0x4f, 0x79, 0x07, 0x2b, 0xd6, 0x3d, 0x8a, 0x8f, 0x02, 0x48, 0xa1, 0x60, 0xb7,
+	0xa9, 0x93, 0xcf, 0x4a, 0x43, 0xa9, 0xbe, 0xea, 0x1d, 0x18, 0x0f, 0x11, 0x1c, 0x89, 0x8e, 0xc9,
+	0xbb, 0xcc, 0xe1, 0x14, 0x2f, 0xc3, 0xc1, 0x20, 0x3d, 0x16, 0xe5, 0x79, 0x54, 0xca, 0xa6, 0x25,
+	0xe8, 0x40, 0x2b, 0xe4, 0x19, 0xbf, 0x08, 0xfb, 0x1d, 0x7a, 0x57, 0x34, 0x06, 0x60, 0x65, 0x24,
+	0xac, 0x7d, 0xde, 0xf1, 0x72, 0x1f, 0xda, 0x1a, 0x4c, 0x05, 0x1b, 0x34, 0x99, 0x85, 0x33, 0xb0,
+	0x57, 0x85, 0xd2, 0xa4, 0x17, 0x93, 0xd0, 0x69, 0x55, 0x83, 0xc0, 0x81, 0x81, 0xfe, 0x8b, 0x6d,
+	0x22, 0xfc, 0x0a, 0xc0, 0xf6, 0x88, 0xa5, 0xa8, 0xea, 0xc4, 0xba, 0xff, 0xd3, 0xf8, 0x14, 0xc1,
+	0x54, 0xb0, 0xff, 0x54, 0x98, 0x71, 0xf0, 0x86, 0xdb, 0x2b, 0x3b, 0x52, 0x7b, 0x9d, 0x84, 0xa9,
+	0xe0, 0xf0, 0xc4, 0x0f, 0xcd, 0xdf, 0x08, 0xf0, 0x76, 0x5b, 0x0c, 0xed, 0xc0, 0xe7, 0x41, 0xcf,
+	0x41, 0xc3, 0xe9, 0xd9, 0x0d, 0xab, 0xc5, 0xf3, 0x99, 0x52, 0xb6, 0xbc, 0xa7, 0x96, 0x53, 0xa7,
+	0x37, 0x7b, 0xf6, 0xf5, 0x16, 0xf7, 0x5a, 0x51, 0x6b, 0x79, 0x1a, 0xd9, 0x52, 0xd6, 0x6b, 0x45,
+	0x75, 0xe2, 0x89, 0x83, 0x1c, 0xef, 0x19, 0x81, 0xe3, 0xe0, 0x04, 0xb4, 0x12, 0x27, 0x80, 0x86,
+	0x27, 0x40, 0xc0, 0x54, 0x20, 0x53, 0xdd, 0xf7, 0xe7, 0xe0, 0x49, 0x05, 0xcd, 0xef, 0xf6, 0xc4,
+	0xfa, 0xf8, 0xba, 0xa9, 0x9b, 0xfb, 0x01, 0x82, 0xd2, 0x12, 0x6b, 0x59, 0xeb, 0x9b, 0xf3, 0x9e,
+	0xbb, 0x55, 0xa6, 0x1c, 0xcd, 0x33, 0x67, 0xdd, 0x6a, 0x27, 0x75, 0x62, 0x05, 0x0e, 0x6e, 0x50,
+	0x97, 0x5b, 0xcc, 0x69, 0x08, 0xd6, 0x50, 0xd5, 0x95, 0x21, 0xb2, 0xb5, 0xfd, 0x5a, 0xb0, 0xca,
+	0x54, 0xbf, 0xe1, 0x63, 0x30, 0xb9, 0x66, 0x39, 0xc4, 0xdd, 0x6c, 0xb4, 0x88, 0x20, 0xb2, 0x5b,
+	0x72, 0x35, 0x50, 0x47, 0x57, 0x89, 0x20, 0xc6, 0xbb, 0x70, 0x6c, 0x3b, 0x77, 0x15, 0xfb, 0x6d,
+	0xe5, 0x83, 0x27, 0x61, 0x38, 0x0e, 0x39, 0xaf, 0xce, 0x3a, 0x1c, 0xd7, 0xef, 0x9c, 0x49, 0xa7,
+	0x67, 0xfb, 0xd6, 0x46, 0x07, 0x4a, 0xf1, 0x9e, 0x35, 0xc5, 0x8b, 0xfd, 0xae, 0x69, 0x4a, 0x05,
+	0x9f, 0xe9, 0xe3, 0x09, 0x4c, 0x6b, 0x82, 0xf6, 0xb5, 0x06, 0x9e, 0xb8, 0x71, 0x03, 0x0e, 0x6f,
+	0x47, 0x5b, 0x11, 0x44, 0xd0, 0x44, 0xfc, 0x47, 0x01, 0x3c, 0xfc, 0x5c, 0x2a, 0x6a, 0xf4, 0x13,
+	0x4e, 0xcf, 0x56, 0x96, 0x06, 0x81, 0xfc, 0x4e, 0x6f, 0x1a, 0xf3, 0x35, 0xd0, 0xa1, 0x7d, 0x6b,
+	0x05, 0xb9, 0x94, 0x00, 0x59, 0x7a, 0xf0, 0x47, 0x41, 0xb9, 0x9b, 0xdd, 0x3a, 0x02, 0xfb, 0x94,
+	0x74, 0x49, 0x6d, 0x2a, 0xf8, 0x07, 0x04, 0xd3, 0x51, 0xf7, 0x31, 0x3e, 0x1d, 0xe9, 0x3a, 0xe1,
+	0xea, 0x2e, 0xa4, 0x79, 0x2f, 0x1b, 0x0b, 0x1f, 0xfd, 0xfa, 0xe7, 0x56, 0xe6, 0xb2, 0x51, 0xf5,
+	0x36, 0x93, 0x0f, 0xd4, 0x1c, 0xbf, 0xda, 0x75, 0xd9, 0x2d, 0xda, 0x14, 0xdc, 0xac, 0x98, 0x1d,
+	0xd6, 0x54, 0x0b, 0x91, 0x59, 0xb9, 0x6f, 0x6e, 0xbf, 0xfa, 0xe7, 0xc2, 0x97, 0x25, 0x7e, 0x84,
+	0xe0, 0xe0, 0x8e, 0x3b, 0x1c, 0x9f, 0x8a, 0xc4, 0x10, 0x77, 0xd7, 0xa7, 0x83, 0x7c, 0x5e, 0x42,
+	0x3e, 0x8d, 0x15, 0x64, 0xaf, 0x92, 0x31, 0x80, 0x07, 0xf0, 0x9a, 0x95, 0xfb, 0xf8, 0x17, 0x04,
+	0xd3, 0x51, 0x1b, 0x40, 0x0c, 0xb5, 0x09, 0xcb, 0x42, 0x3a, 0x9c, 0xef, 0x48, 0x9c, 0x6f, 0xce,
+	0xbe, 0x26, 0x71, 0x86, 0xf8, 0xaa, 0xa6, 0xc6, 0xbd, 0x93, 0xea, 0x87, 0x08, 0xa6, 0xa3, 0xd6,
+	0x9f, 0x98, 0x44, 0x12, 0x36, 0xa5, 0xc2, 0xa1, 0x1d, 0x2f, 0xd6, 0x6b, 0xde, 0x7e, 0xe9, 0x73,
+	0x5c, 0x19, 0x95, 0xe3, 0xef, 0x11, 0x4c, 0x47, 0xed, 0x11, 0x31, 0xd0, 0x12, 0xd6, 0x9c, 0xc2,
+	0xcc, 0x08, 0x16, 0x6a, 0x2a, 0x43, 0x9d, 0x91, 0xba, 0x99, 0xbd, 0xde, 0xcd, 0x0d, 0x4e, 0x12,
+	0x2e, 0xa7, 0x18, 0x36, 0x85, 0x32, 0xe9, 0x3a, 0x30, 0x16, 0x25, 0x9e, 0x2b, 0xc6, 0x85, 0xe1,
+	0x78, 0x82, 0x3c, 0xea, 0xff, 0x2f, 0x7c, 0xce, 0xbf, 0xf0, 0x7f, 0x43, 0x30, 0xd1, 0x9f, 0x1a,
+	0xfc, 0xc2, 0xb0, 0xa9, 0x4a, 0x81, 0xed, 0x63, 0x24, 0xc1, 0x7d, 0x88, 0x2f, 0x8c, 0x54, 0x62,
+	0x1f, 0x99, 0x59, 0xb9, 0x5f, 0x9f, 0xc7, 0x97, 0x47, 0xb3, 0x6d, 0xbb, 0xac, 0xd7, 0x0d, 0x3a,
+	0xc1, 0xff, 0x22, 0xc8, 0x0d, 0x8e, 0x5a, 0x0c, 0xf7, 0x11, 0xab, 0x53, 0x72, 0x7e, 0x5f, 0xab,
+	0xfc, 0xbe, 0x42, 0xb3, 0x97, 0x06, 0xe6, 0xaf, 0x3a, 0x46, 0x9e, 0x7e, 0x11, 0xea, 0xb5, 0xd9,
+	0xc5, 0xb1, 0x5c, 0x45, 0xa4, 0xdd, 0x2f, 0xec, 0xef, 0x08, 0x72, 0x83, 0x03, 0x1a, 0x93, 0x7e,
+	0xc4, 0xc2, 0x16, 0x3b, 0xbb, 0x7e, 0x65, 0x2b, 0xbb, 0xa8, 0x6c, 0xe5, 0x31, 0x54, 0xf6, 0x0f,
+	0x04, 0x93, 0x03, 0x2b, 0x15, 0x7e, 0x69, 0xc8, 0x40, 0xf7, 0x27, 0xbf, 0x3c, 0x5c, 0x51, 0x0f,
+	0xfc, 0x5d, 0x99, 0xa9, 0x8b, 0xc7, 0x1e, 0xb0, 0xfa, 0x79, 0x7c, 0x36, 0x85, 0xad, 0x9f, 0x5e,
+	0xdf, 0x0e, 0xff, 0x98, 0x81, 0x67, 0x63, 0x17, 0x37, 0x7c, 0x2e, 0x32, 0x83, 0x61, 0x8b, 0x5e,
+	0x61, 0xf8, 0xc6, 0x63, 0xfc, 0xac, 0x8a, 0xfb, 0x13, 0x32, 0x6a, 0xe3, 0x56, 0x77, 0xce, 0x8e,
+	0xc3, 0x31, 0x87, 0x2a, 0xf5, 0xf7, 0x8d, 0xf7, 0x76, 0x5d, 0xfa, 0xc4, 0x08, 0xf8, 0xbb, 0xcc,
+	0xe0, 0x62, 0x15, 0x5c, 0x0a, 0xf1, 0xd9, 0x21, 0xb5, 0x8f, 0xdc, 0x4e, 0x0b, 0xe7, 0x46, 0xb4,
+	0xd2, 0xed, 0xd3, 0x7f, 0x47, 0xe0, 0x85, 0x71, 0xc9, 0x34, 0x9b, 0x01, 0xd7, 0xf5, 0x1a, 0x5e,
+	0xde, 0x35, 0x7d, 0x21, 0x9f, 0xf8, 0x93, 0x0c, 0x1c, 0x08, 0x6f, 0xa2, 0xf8, 0xe5, 0x21, 0x29,
+	0x07, 0xd6, 0xdf, 0xc2, 0xa9, 0x94, 0xda, 0x9a, 0x98, 0x2f, 0x14, 0x31, 0x9f, 0x21, 0x7c, 0x69,
+	0x6c, 0x62, 0xd4, 0x62, 0x5c, 0x7f, 0x03, 0x2f, 0xee, 0x9e, 0x10, 0xe5, 0x0b, 0xff, 0x85, 0x20,
+	0xb7, 0x42, 0xc5, 0x75, 0x62, 0x2f, 0xcb, 0x6f, 0x68, 0xd8, 0xf0, 0xd3, 0xb2, 0x88, 0xed, 0x25,
+	0x34, 0x28, 0xf4, 0x53, 0x7f, 0x26, 0xa4, 0xa3, 0xa4, 0xc6, 0x97, 0x2a, 0xc5, 0x2d, 0x64, 0xa8,
+	0x14, 0xfd, 0x8f, 0x7a, 0xe9, 0x76, 0x32, 0x3e, 0x10, 0xc8, 0x9b, 0x9a, 0x25, 0x63, 0x71, 0x64,
+	0x2f, 0xdb, 0x6f, 0x95, 0xb0, 0x3b, 0x99, 0xe8, 0x42, 0x52, 0xa2, 0x0b, 0xff, 0x57, 0xa2, 0xed,
+	0xc7, 0x9b, 0x68, 0xc8, 0x1d, 0xfe, 0x3c, 0x03, 0x78, 0x95, 0x72, 0x79, 0x48, 0x5d, 0xdb, 0xe2,
+	0xaa, 0xe3, 0xcb, 0xa1, 0x54, 0x76, 0xaa, 0xf8, 0x49, 0x9f, 0x4c, 0xa1, 0xa9, 0x9b, 0xfa, 0x1b,
+	0x45, 0xc4, 0x23, 0x64, 0x5c, 0x1b, 0x83, 0x08, 0xb1, 0xc3, 0xb1, 0x47, 0xc7, 0x8a, 0x71, 0x73,
+	0x37, 0x74, 0x44, 0x3a, 0xbd, 0x72, 0x0b, 0x0e, 0x37, 0x99, 0x1d, 0x35, 0xb1, 0x57, 0x70, 0xe0,
+	0xdf, 0xe2, 0xb2, 0x77, 0xf1, 0x2f, 0xa3, 0xfa, 0x79, 0xad, 0xda, 0x66, 0x1d, 0xe2, 0xb4, 0xab,
+	0xcc, 0x6d, 0x9b, 0x6d, 0xea, 0xc8, 0xb5, 0xc0, 0x54, 0x22, 0xd2, 0xb5, 0x78, 0xe0, 0x23, 0xf6,
+	0x45, 0x8b, 0x89, 0x7f, 0x10, 0x5a, 0xdb, 0x2b, 0xb5, 0xce, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff,
+	0x97, 0x0f, 0xf8, 0xc8, 0x46, 0x17, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/iot/v1/resources.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/iot/v1/resources.pb.go
index 4533c77b..d48dd88e 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/iot/v1/resources.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/iot/v1/resources.pb.go
@@ -1,20 +1,26 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/iot/v1/resources.proto
 
-package iot
+package iot // import "google.golang.org/genproto/googleapis/cloud/iot/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Indicates whether an MQTT connection is enabled or disabled. See the field
 // description for details.
 type MqttState int32
@@ -42,7 +48,9 @@ var MqttState_value = map[string]int32{
 func (x MqttState) String() string {
 	return proto.EnumName(MqttState_name, int32(x))
 }
-func (MqttState) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (MqttState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{0}
+}
 
 // Indicates whether DeviceService (HTTP) is enabled or disabled for the
 // registry. See the field description for details.
@@ -72,7 +80,9 @@ var HttpState_value = map[string]int32{
 func (x HttpState) String() string {
 	return proto.EnumName(HttpState_name, int32(x))
 }
-func (HttpState) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (HttpState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{1}
+}
 
 // The supported formats for the public key.
 type PublicKeyCertificateFormat int32
@@ -99,7 +109,9 @@ var PublicKeyCertificateFormat_value = map[string]int32{
 func (x PublicKeyCertificateFormat) String() string {
 	return proto.EnumName(PublicKeyCertificateFormat_name, int32(x))
 }
-func (PublicKeyCertificateFormat) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (PublicKeyCertificateFormat) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{2}
+}
 
 // The supported formats for the public key.
 type PublicKeyFormat int32
@@ -147,90 +159,116 @@ var PublicKeyFormat_value = map[string]int32{
 func (x PublicKeyFormat) String() string {
 	return proto.EnumName(PublicKeyFormat_name, int32(x))
 }
-func (PublicKeyFormat) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (PublicKeyFormat) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{3}
+}
 
 // The device resource.
 type Device struct {
 	// The user-defined device identifier. The device ID must be unique
 	// within a device registry.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The resource path name. For example,
 	// `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
 	// `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
 	// When `name` is populated as a response from the service, it always ends
 	// in the device numeric ID.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// [Output only] A server-defined unique numeric ID for the device. This is a
 	// more compact way to identify devices, and it is globally unique.
-	NumId uint64 `protobuf:"varint,3,opt,name=num_id,json=numId" json:"num_id,omitempty"`
+	NumId uint64 `protobuf:"varint,3,opt,name=num_id,json=numId,proto3" json:"num_id,omitempty"`
 	// The credentials used to authenticate this device. To allow credential
 	// rotation without interruption, multiple device credentials can be bound to
 	// this device. No more than 3 credentials can be bound to a single device at
 	// a time. When new credentials are added to a device, they are verified
 	// against the registry credentials. For details, see the description of the
 	// `DeviceRegistry.credentials` field.
-	Credentials []*DeviceCredential `protobuf:"bytes,12,rep,name=credentials" json:"credentials,omitempty"`
-	// [Output only] The last time a heartbeat was received. Timestamps are
-	// periodically collected and written to storage; they may be stale by a few
-	// minutes. This field is only for devices connecting through MQTT.
-	LastHeartbeatTime *google_protobuf1.Timestamp `protobuf:"bytes,7,opt,name=last_heartbeat_time,json=lastHeartbeatTime" json:"last_heartbeat_time,omitempty"`
+	Credentials []*DeviceCredential `protobuf:"bytes,12,rep,name=credentials,proto3" json:"credentials,omitempty"`
+	// [Output only] The last time an MQTT `PINGREQ` was received. This field
+	// applies only to devices connecting through MQTT. MQTT clients usually only
+	// send `PINGREQ` messages if the connection is idle, and no other messages
+	// have been sent. Timestamps are periodically collected and written to
+	// storage; they may be stale by a few minutes.
+	LastHeartbeatTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=last_heartbeat_time,json=lastHeartbeatTime,proto3" json:"last_heartbeat_time,omitempty"`
 	// [Output only] The last time a telemetry event was received. Timestamps are
 	// periodically collected and written to storage; they may be stale by a few
 	// minutes.
-	LastEventTime *google_protobuf1.Timestamp `protobuf:"bytes,8,opt,name=last_event_time,json=lastEventTime" json:"last_event_time,omitempty"`
+	LastEventTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=last_event_time,json=lastEventTime,proto3" json:"last_event_time,omitempty"`
 	// [Output only] The last time a state event was received. Timestamps are
 	// periodically collected and written to storage; they may be stale by a few
 	// minutes.
-	LastStateTime *google_protobuf1.Timestamp `protobuf:"bytes,20,opt,name=last_state_time,json=lastStateTime" json:"last_state_time,omitempty"`
+	LastStateTime *timestamp.Timestamp `protobuf:"bytes,20,opt,name=last_state_time,json=lastStateTime,proto3" json:"last_state_time,omitempty"`
 	// [Output only] The last time a cloud-to-device config version acknowledgment
 	// was received from the device. This field is only for configurations
 	// sent through MQTT.
-	LastConfigAckTime *google_protobuf1.Timestamp `protobuf:"bytes,14,opt,name=last_config_ack_time,json=lastConfigAckTime" json:"last_config_ack_time,omitempty"`
+	LastConfigAckTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=last_config_ack_time,json=lastConfigAckTime,proto3" json:"last_config_ack_time,omitempty"`
 	// [Output only] The last time a cloud-to-device config version was sent to
 	// the device.
-	LastConfigSendTime *google_protobuf1.Timestamp `protobuf:"bytes,18,opt,name=last_config_send_time,json=lastConfigSendTime" json:"last_config_send_time,omitempty"`
+	LastConfigSendTime *timestamp.Timestamp `protobuf:"bytes,18,opt,name=last_config_send_time,json=lastConfigSendTime,proto3" json:"last_config_send_time,omitempty"`
 	// If a device is blocked, connections or requests from this device will fail.
 	// Can be used to temporarily prevent the device from connecting if, for
 	// example, the sensor is generating bad data and needs maintenance.
-	Blocked bool `protobuf:"varint,19,opt,name=blocked" json:"blocked,omitempty"`
+	Blocked bool `protobuf:"varint,19,opt,name=blocked,proto3" json:"blocked,omitempty"`
 	// [Output only] The time the most recent error occurred, such as a failure to
 	// publish to Cloud Pub/Sub. This field is the timestamp of
 	// 'last_error_status'.
-	LastErrorTime *google_protobuf1.Timestamp `protobuf:"bytes,10,opt,name=last_error_time,json=lastErrorTime" json:"last_error_time,omitempty"`
+	LastErrorTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=last_error_time,json=lastErrorTime,proto3" json:"last_error_time,omitempty"`
 	// [Output only] The error message of the most recent error, such as a failure
 	// to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
 	// field. If no errors have occurred, this field has an empty message
 	// and the status code 0 == OK. Otherwise, this field is expected to have a
 	// status code other than OK.
-	LastErrorStatus *google_rpc.Status `protobuf:"bytes,11,opt,name=last_error_status,json=lastErrorStatus" json:"last_error_status,omitempty"`
+	LastErrorStatus *status.Status `protobuf:"bytes,11,opt,name=last_error_status,json=lastErrorStatus,proto3" json:"last_error_status,omitempty"`
 	// The most recent device configuration, which is eventually sent from
 	// Cloud IoT Core to the device. If not present on creation, the
 	// configuration will be initialized with an empty payload and version value
 	// of `1`. To update this field after creation, use the
 	// `DeviceManager.ModifyCloudToDeviceConfig` method.
-	Config *DeviceConfig `protobuf:"bytes,13,opt,name=config" json:"config,omitempty"`
+	Config *DeviceConfig `protobuf:"bytes,13,opt,name=config,proto3" json:"config,omitempty"`
 	// [Output only] The state most recently received from the device. If no state
 	// has been reported, this field is not present.
-	State *DeviceState `protobuf:"bytes,16,opt,name=state" json:"state,omitempty"`
+	State *DeviceState `protobuf:"bytes,16,opt,name=state,proto3" json:"state,omitempty"`
 	// The metadata key-value pairs assigned to the device. This metadata is not
 	// interpreted or indexed by Cloud IoT Core. It can be used to add contextual
 	// information for the device.
 	//
-	// Keys must conform to the regular expression [a-zA-Z0-9-_]+ and be less than
-	// 128 bytes in length.
+	// Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+	// be less than 128 bytes in length.
 	//
 	// Values are free-form strings. Each value must be less than or equal to 32
 	// KB in size.
 	//
 	// The total size of all keys and values must be less than 256 KB, and the
 	// maximum number of key-value pairs is 500.
-	Metadata map[string]string `protobuf:"bytes,17,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata             map[string]string `protobuf:"bytes,17,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Device) Reset()         { *m = Device{} }
+func (m *Device) String() string { return proto.CompactTextString(m) }
+func (*Device) ProtoMessage()    {}
+func (*Device) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{0}
+}
+func (m *Device) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Device.Unmarshal(m, b)
+}
+func (m *Device) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Device.Marshal(b, m, deterministic)
+}
+func (dst *Device) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Device.Merge(dst, src)
+}
+func (m *Device) XXX_Size() int {
+	return xxx_messageInfo_Device.Size(m)
+}
+func (m *Device) XXX_DiscardUnknown() {
+	xxx_messageInfo_Device.DiscardUnknown(m)
 }
 
-func (m *Device) Reset()                    { *m = Device{} }
-func (m *Device) String() string            { return proto.CompactTextString(m) }
-func (*Device) ProtoMessage()               {}
-func (*Device) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Device proto.InternalMessageInfo
 
 func (m *Device) GetId() string {
 	if m != nil {
@@ -260,35 +298,35 @@ func (m *Device) GetCredentials() []*DeviceCredential {
 	return nil
 }
 
-func (m *Device) GetLastHeartbeatTime() *google_protobuf1.Timestamp {
+func (m *Device) GetLastHeartbeatTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastHeartbeatTime
 	}
 	return nil
 }
 
-func (m *Device) GetLastEventTime() *google_protobuf1.Timestamp {
+func (m *Device) GetLastEventTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastEventTime
 	}
 	return nil
 }
 
-func (m *Device) GetLastStateTime() *google_protobuf1.Timestamp {
+func (m *Device) GetLastStateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastStateTime
 	}
 	return nil
 }
 
-func (m *Device) GetLastConfigAckTime() *google_protobuf1.Timestamp {
+func (m *Device) GetLastConfigAckTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastConfigAckTime
 	}
 	return nil
 }
 
-func (m *Device) GetLastConfigSendTime() *google_protobuf1.Timestamp {
+func (m *Device) GetLastConfigSendTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastConfigSendTime
 	}
@@ -302,14 +340,14 @@ func (m *Device) GetBlocked() bool {
 	return false
 }
 
-func (m *Device) GetLastErrorTime() *google_protobuf1.Timestamp {
+func (m *Device) GetLastErrorTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastErrorTime
 	}
 	return nil
 }
 
-func (m *Device) GetLastErrorStatus() *google_rpc.Status {
+func (m *Device) GetLastErrorStatus() *status.Status {
 	if m != nil {
 		return m.LastErrorStatus
 	}
@@ -340,30 +378,31 @@ func (m *Device) GetMetadata() map[string]string {
 // A container for a group of devices.
 type DeviceRegistry struct {
 	// The identifier of this device registry. For example, `myRegistry`.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The resource path name. For example,
 	// `projects/example-project/locations/us-central1/registries/my-registry`.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// The configuration for notification of telemetry events received from the
 	// device. All telemetry events that were successfully published by the
 	// device and acknowledged by Cloud IoT Core are guaranteed to be
-	// delivered to Cloud Pub/Sub. Only the first configuration is used. If you
-	// try to publish a device telemetry event using MQTT without specifying a
-	// Cloud Pub/Sub topic for the device's registry, the connection closes
-	// automatically. If you try to do so using an HTTP connection, an error
-	// is returned.
-	EventNotificationConfigs []*EventNotificationConfig `protobuf:"bytes,10,rep,name=event_notification_configs,json=eventNotificationConfigs" json:"event_notification_configs,omitempty"`
+	// delivered to Cloud Pub/Sub. If multiple configurations match a message,
+	// only the first matching configuration is used. If you try to publish a
+	// device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+	// for the device's registry, the connection closes automatically. If you try
+	// to do so using an HTTP connection, an error is returned. Up to 10
+	// configurations may be provided.
+	EventNotificationConfigs []*EventNotificationConfig `protobuf:"bytes,10,rep,name=event_notification_configs,json=eventNotificationConfigs,proto3" json:"event_notification_configs,omitempty"`
 	// The configuration for notification of new states received from the device.
 	// State updates are guaranteed to be stored in the state history, but
 	// notifications to Cloud Pub/Sub are not guaranteed. For example, if
 	// permissions are misconfigured or the specified topic doesn't exist, no
 	// notification will be published but the state will still be stored in Cloud
 	// IoT Core.
-	StateNotificationConfig *StateNotificationConfig `protobuf:"bytes,7,opt,name=state_notification_config,json=stateNotificationConfig" json:"state_notification_config,omitempty"`
+	StateNotificationConfig *StateNotificationConfig `protobuf:"bytes,7,opt,name=state_notification_config,json=stateNotificationConfig,proto3" json:"state_notification_config,omitempty"`
 	// The MQTT configuration for this device registry.
-	MqttConfig *MqttConfig `protobuf:"bytes,4,opt,name=mqtt_config,json=mqttConfig" json:"mqtt_config,omitempty"`
+	MqttConfig *MqttConfig `protobuf:"bytes,4,opt,name=mqtt_config,json=mqttConfig,proto3" json:"mqtt_config,omitempty"`
 	// The DeviceService (HTTP) configuration for this device registry.
-	HttpConfig *HttpConfig `protobuf:"bytes,9,opt,name=http_config,json=httpConfig" json:"http_config,omitempty"`
+	HttpConfig *HttpConfig `protobuf:"bytes,9,opt,name=http_config,json=httpConfig,proto3" json:"http_config,omitempty"`
 	// The credentials used to verify the device credentials. No more than 10
 	// credentials can be bound to a single registry at a time. The verification
 	// process occurs at the time of device creation or update. If this field is
@@ -375,13 +414,35 @@ type DeviceRegistry struct {
 	// modifications to this list of credentials: after a device has been
 	// successfully created in a registry, it should be able to connect even if
 	// its registry credentials are revoked, deleted, or modified.
-	Credentials []*RegistryCredential `protobuf:"bytes,8,rep,name=credentials" json:"credentials,omitempty"`
+	Credentials          []*RegistryCredential `protobuf:"bytes,8,rep,name=credentials,proto3" json:"credentials,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *DeviceRegistry) Reset()                    { *m = DeviceRegistry{} }
-func (m *DeviceRegistry) String() string            { return proto.CompactTextString(m) }
-func (*DeviceRegistry) ProtoMessage()               {}
-func (*DeviceRegistry) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *DeviceRegistry) Reset()         { *m = DeviceRegistry{} }
+func (m *DeviceRegistry) String() string { return proto.CompactTextString(m) }
+func (*DeviceRegistry) ProtoMessage()    {}
+func (*DeviceRegistry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{1}
+}
+func (m *DeviceRegistry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceRegistry.Unmarshal(m, b)
+}
+func (m *DeviceRegistry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceRegistry.Marshal(b, m, deterministic)
+}
+func (dst *DeviceRegistry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceRegistry.Merge(dst, src)
+}
+func (m *DeviceRegistry) XXX_Size() int {
+	return xxx_messageInfo_DeviceRegistry.Size(m)
+}
+func (m *DeviceRegistry) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceRegistry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeviceRegistry proto.InternalMessageInfo
 
 func (m *DeviceRegistry) GetId() string {
 	if m != nil {
@@ -436,13 +497,35 @@ func (m *DeviceRegistry) GetCredentials() []*RegistryCredential {
 type MqttConfig struct {
 	// If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
 	// connections to this registry will fail.
-	MqttEnabledState MqttState `protobuf:"varint,1,opt,name=mqtt_enabled_state,json=mqttEnabledState,enum=google.cloud.iot.v1.MqttState" json:"mqtt_enabled_state,omitempty"`
+	MqttEnabledState     MqttState `protobuf:"varint,1,opt,name=mqtt_enabled_state,json=mqttEnabledState,proto3,enum=google.cloud.iot.v1.MqttState" json:"mqtt_enabled_state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *MqttConfig) Reset()         { *m = MqttConfig{} }
+func (m *MqttConfig) String() string { return proto.CompactTextString(m) }
+func (*MqttConfig) ProtoMessage()    {}
+func (*MqttConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{2}
+}
+func (m *MqttConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MqttConfig.Unmarshal(m, b)
+}
+func (m *MqttConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MqttConfig.Marshal(b, m, deterministic)
+}
+func (dst *MqttConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MqttConfig.Merge(dst, src)
+}
+func (m *MqttConfig) XXX_Size() int {
+	return xxx_messageInfo_MqttConfig.Size(m)
+}
+func (m *MqttConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_MqttConfig.DiscardUnknown(m)
 }
 
-func (m *MqttConfig) Reset()                    { *m = MqttConfig{} }
-func (m *MqttConfig) String() string            { return proto.CompactTextString(m) }
-func (*MqttConfig) ProtoMessage()               {}
-func (*MqttConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_MqttConfig proto.InternalMessageInfo
 
 func (m *MqttConfig) GetMqttEnabledState() MqttState {
 	if m != nil {
@@ -455,13 +538,35 @@ func (m *MqttConfig) GetMqttEnabledState() MqttState {
 type HttpConfig struct {
 	// If enabled, allows devices to use DeviceService via the HTTP protocol.
 	// Otherwise, any requests to DeviceService will fail for this registry.
-	HttpEnabledState HttpState `protobuf:"varint,1,opt,name=http_enabled_state,json=httpEnabledState,enum=google.cloud.iot.v1.HttpState" json:"http_enabled_state,omitempty"`
+	HttpEnabledState     HttpState `protobuf:"varint,1,opt,name=http_enabled_state,json=httpEnabledState,proto3,enum=google.cloud.iot.v1.HttpState" json:"http_enabled_state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *HttpConfig) Reset()                    { *m = HttpConfig{} }
-func (m *HttpConfig) String() string            { return proto.CompactTextString(m) }
-func (*HttpConfig) ProtoMessage()               {}
-func (*HttpConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *HttpConfig) Reset()         { *m = HttpConfig{} }
+func (m *HttpConfig) String() string { return proto.CompactTextString(m) }
+func (*HttpConfig) ProtoMessage()    {}
+func (*HttpConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{3}
+}
+func (m *HttpConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpConfig.Unmarshal(m, b)
+}
+func (m *HttpConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpConfig.Marshal(b, m, deterministic)
+}
+func (dst *HttpConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpConfig.Merge(dst, src)
+}
+func (m *HttpConfig) XXX_Size() int {
+	return xxx_messageInfo_HttpConfig.Size(m)
+}
+func (m *HttpConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HttpConfig proto.InternalMessageInfo
 
 func (m *HttpConfig) GetHttpEnabledState() HttpState {
 	if m != nil {
@@ -470,17 +575,51 @@ func (m *HttpConfig) GetHttpEnabledState() HttpState {
 	return HttpState_HTTP_STATE_UNSPECIFIED
 }
 
-// The configuration to forward telemetry events.
+// The configuration for forwarding telemetry events.
 type EventNotificationConfig struct {
+	// If the subfolder name matches this string exactly, this configuration will
+	// be used. The string must not include the leading '/' character. If empty,
+	// all strings are matched. This field is used only for telemetry events;
+	// subfolders are not supported for state changes.
+	SubfolderMatches string `protobuf:"bytes,2,opt,name=subfolder_matches,json=subfolderMatches,proto3" json:"subfolder_matches,omitempty"`
 	// A Cloud Pub/Sub topic name. For example,
 	// `projects/myProject/topics/deviceEvents`.
-	PubsubTopicName string `protobuf:"bytes,1,opt,name=pubsub_topic_name,json=pubsubTopicName" json:"pubsub_topic_name,omitempty"`
+	PubsubTopicName      string   `protobuf:"bytes,1,opt,name=pubsub_topic_name,json=pubsubTopicName,proto3" json:"pubsub_topic_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EventNotificationConfig) Reset()         { *m = EventNotificationConfig{} }
+func (m *EventNotificationConfig) String() string { return proto.CompactTextString(m) }
+func (*EventNotificationConfig) ProtoMessage()    {}
+func (*EventNotificationConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{4}
+}
+func (m *EventNotificationConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EventNotificationConfig.Unmarshal(m, b)
+}
+func (m *EventNotificationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EventNotificationConfig.Marshal(b, m, deterministic)
+}
+func (dst *EventNotificationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EventNotificationConfig.Merge(dst, src)
+}
+func (m *EventNotificationConfig) XXX_Size() int {
+	return xxx_messageInfo_EventNotificationConfig.Size(m)
+}
+func (m *EventNotificationConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_EventNotificationConfig.DiscardUnknown(m)
 }
 
-func (m *EventNotificationConfig) Reset()                    { *m = EventNotificationConfig{} }
-func (m *EventNotificationConfig) String() string            { return proto.CompactTextString(m) }
-func (*EventNotificationConfig) ProtoMessage()               {}
-func (*EventNotificationConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_EventNotificationConfig proto.InternalMessageInfo
+
+func (m *EventNotificationConfig) GetSubfolderMatches() string {
+	if m != nil {
+		return m.SubfolderMatches
+	}
+	return ""
+}
 
 func (m *EventNotificationConfig) GetPubsubTopicName() string {
 	if m != nil {
@@ -493,13 +632,35 @@ func (m *EventNotificationConfig) GetPubsubTopicName() string {
 type StateNotificationConfig struct {
 	// A Cloud Pub/Sub topic name. For example,
 	// `projects/myProject/topics/deviceEvents`.
-	PubsubTopicName string `protobuf:"bytes,1,opt,name=pubsub_topic_name,json=pubsubTopicName" json:"pubsub_topic_name,omitempty"`
+	PubsubTopicName      string   `protobuf:"bytes,1,opt,name=pubsub_topic_name,json=pubsubTopicName,proto3" json:"pubsub_topic_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StateNotificationConfig) Reset()                    { *m = StateNotificationConfig{} }
-func (m *StateNotificationConfig) String() string            { return proto.CompactTextString(m) }
-func (*StateNotificationConfig) ProtoMessage()               {}
-func (*StateNotificationConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *StateNotificationConfig) Reset()         { *m = StateNotificationConfig{} }
+func (m *StateNotificationConfig) String() string { return proto.CompactTextString(m) }
+func (*StateNotificationConfig) ProtoMessage()    {}
+func (*StateNotificationConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{5}
+}
+func (m *StateNotificationConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StateNotificationConfig.Unmarshal(m, b)
+}
+func (m *StateNotificationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StateNotificationConfig.Marshal(b, m, deterministic)
+}
+func (dst *StateNotificationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StateNotificationConfig.Merge(dst, src)
+}
+func (m *StateNotificationConfig) XXX_Size() int {
+	return xxx_messageInfo_StateNotificationConfig.Size(m)
+}
+func (m *StateNotificationConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_StateNotificationConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StateNotificationConfig proto.InternalMessageInfo
 
 func (m *StateNotificationConfig) GetPubsubTopicName() string {
 	if m != nil {
@@ -514,20 +675,42 @@ type RegistryCredential struct {
 	//
 	// Types that are valid to be assigned to Credential:
 	//	*RegistryCredential_PublicKeyCertificate
-	Credential isRegistryCredential_Credential `protobuf_oneof:"credential"`
+	Credential           isRegistryCredential_Credential `protobuf_oneof:"credential"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
 }
 
-func (m *RegistryCredential) Reset()                    { *m = RegistryCredential{} }
-func (m *RegistryCredential) String() string            { return proto.CompactTextString(m) }
-func (*RegistryCredential) ProtoMessage()               {}
-func (*RegistryCredential) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *RegistryCredential) Reset()         { *m = RegistryCredential{} }
+func (m *RegistryCredential) String() string { return proto.CompactTextString(m) }
+func (*RegistryCredential) ProtoMessage()    {}
+func (*RegistryCredential) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{6}
+}
+func (m *RegistryCredential) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RegistryCredential.Unmarshal(m, b)
+}
+func (m *RegistryCredential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RegistryCredential.Marshal(b, m, deterministic)
+}
+func (dst *RegistryCredential) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegistryCredential.Merge(dst, src)
+}
+func (m *RegistryCredential) XXX_Size() int {
+	return xxx_messageInfo_RegistryCredential.Size(m)
+}
+func (m *RegistryCredential) XXX_DiscardUnknown() {
+	xxx_messageInfo_RegistryCredential.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RegistryCredential proto.InternalMessageInfo
 
 type isRegistryCredential_Credential interface {
 	isRegistryCredential_Credential()
 }
 
 type RegistryCredential_PublicKeyCertificate struct {
-	PublicKeyCertificate *PublicKeyCertificate `protobuf:"bytes,1,opt,name=public_key_certificate,json=publicKeyCertificate,oneof"`
+	PublicKeyCertificate *PublicKeyCertificate `protobuf:"bytes,1,opt,name=public_key_certificate,json=publicKeyCertificate,proto3,oneof"`
 }
 
 func (*RegistryCredential_PublicKeyCertificate) isRegistryCredential_Credential() {}
@@ -591,7 +774,7 @@ func _RegistryCredential_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Credential.(type) {
 	case *RegistryCredential_PublicKeyCertificate:
 		s := proto.Size(x.PublicKeyCertificate)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -604,23 +787,45 @@ func _RegistryCredential_OneofSizer(msg proto.Message) (n int) {
 // Details of an X.509 certificate. For informational purposes only.
 type X509CertificateDetails struct {
 	// The entity that signed the certificate.
-	Issuer string `protobuf:"bytes,1,opt,name=issuer" json:"issuer,omitempty"`
+	Issuer string `protobuf:"bytes,1,opt,name=issuer,proto3" json:"issuer,omitempty"`
 	// The entity the certificate and public key belong to.
-	Subject string `protobuf:"bytes,2,opt,name=subject" json:"subject,omitempty"`
+	Subject string `protobuf:"bytes,2,opt,name=subject,proto3" json:"subject,omitempty"`
 	// The time the certificate becomes valid.
-	StartTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time the certificate becomes invalid.
-	ExpiryTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=expiry_time,json=expiryTime" json:"expiry_time,omitempty"`
+	ExpiryTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=expiry_time,json=expiryTime,proto3" json:"expiry_time,omitempty"`
 	// The algorithm used to sign the certificate.
-	SignatureAlgorithm string `protobuf:"bytes,5,opt,name=signature_algorithm,json=signatureAlgorithm" json:"signature_algorithm,omitempty"`
+	SignatureAlgorithm string `protobuf:"bytes,5,opt,name=signature_algorithm,json=signatureAlgorithm,proto3" json:"signature_algorithm,omitempty"`
 	// The type of public key in the certificate.
-	PublicKeyType string `protobuf:"bytes,6,opt,name=public_key_type,json=publicKeyType" json:"public_key_type,omitempty"`
+	PublicKeyType        string   `protobuf:"bytes,6,opt,name=public_key_type,json=publicKeyType,proto3" json:"public_key_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *X509CertificateDetails) Reset()         { *m = X509CertificateDetails{} }
+func (m *X509CertificateDetails) String() string { return proto.CompactTextString(m) }
+func (*X509CertificateDetails) ProtoMessage()    {}
+func (*X509CertificateDetails) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{7}
+}
+func (m *X509CertificateDetails) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_X509CertificateDetails.Unmarshal(m, b)
+}
+func (m *X509CertificateDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_X509CertificateDetails.Marshal(b, m, deterministic)
+}
+func (dst *X509CertificateDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_X509CertificateDetails.Merge(dst, src)
+}
+func (m *X509CertificateDetails) XXX_Size() int {
+	return xxx_messageInfo_X509CertificateDetails.Size(m)
+}
+func (m *X509CertificateDetails) XXX_DiscardUnknown() {
+	xxx_messageInfo_X509CertificateDetails.DiscardUnknown(m)
 }
 
-func (m *X509CertificateDetails) Reset()                    { *m = X509CertificateDetails{} }
-func (m *X509CertificateDetails) String() string            { return proto.CompactTextString(m) }
-func (*X509CertificateDetails) ProtoMessage()               {}
-func (*X509CertificateDetails) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_X509CertificateDetails proto.InternalMessageInfo
 
 func (m *X509CertificateDetails) GetIssuer() string {
 	if m != nil {
@@ -636,14 +841,14 @@ func (m *X509CertificateDetails) GetSubject() string {
 	return ""
 }
 
-func (m *X509CertificateDetails) GetStartTime() *google_protobuf1.Timestamp {
+func (m *X509CertificateDetails) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *X509CertificateDetails) GetExpiryTime() *google_protobuf1.Timestamp {
+func (m *X509CertificateDetails) GetExpiryTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ExpiryTime
 	}
@@ -667,17 +872,39 @@ func (m *X509CertificateDetails) GetPublicKeyType() string {
 // A public key certificate format and data.
 type PublicKeyCertificate struct {
 	// The certificate format.
-	Format PublicKeyCertificateFormat `protobuf:"varint,1,opt,name=format,enum=google.cloud.iot.v1.PublicKeyCertificateFormat" json:"format,omitempty"`
+	Format PublicKeyCertificateFormat `protobuf:"varint,1,opt,name=format,proto3,enum=google.cloud.iot.v1.PublicKeyCertificateFormat" json:"format,omitempty"`
 	// The certificate data.
-	Certificate string `protobuf:"bytes,2,opt,name=certificate" json:"certificate,omitempty"`
+	Certificate string `protobuf:"bytes,2,opt,name=certificate,proto3" json:"certificate,omitempty"`
 	// [Output only] The certificate details. Used only for X.509 certificates.
-	X509Details *X509CertificateDetails `protobuf:"bytes,3,opt,name=x509_details,json=x509Details" json:"x509_details,omitempty"`
+	X509Details          *X509CertificateDetails `protobuf:"bytes,3,opt,name=x509_details,json=x509Details,proto3" json:"x509_details,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
 }
 
-func (m *PublicKeyCertificate) Reset()                    { *m = PublicKeyCertificate{} }
-func (m *PublicKeyCertificate) String() string            { return proto.CompactTextString(m) }
-func (*PublicKeyCertificate) ProtoMessage()               {}
-func (*PublicKeyCertificate) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+func (m *PublicKeyCertificate) Reset()         { *m = PublicKeyCertificate{} }
+func (m *PublicKeyCertificate) String() string { return proto.CompactTextString(m) }
+func (*PublicKeyCertificate) ProtoMessage()    {}
+func (*PublicKeyCertificate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{8}
+}
+func (m *PublicKeyCertificate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublicKeyCertificate.Unmarshal(m, b)
+}
+func (m *PublicKeyCertificate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublicKeyCertificate.Marshal(b, m, deterministic)
+}
+func (dst *PublicKeyCertificate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublicKeyCertificate.Merge(dst, src)
+}
+func (m *PublicKeyCertificate) XXX_Size() int {
+	return xxx_messageInfo_PublicKeyCertificate.Size(m)
+}
+func (m *PublicKeyCertificate) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublicKeyCertificate.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PublicKeyCertificate proto.InternalMessageInfo
 
 func (m *PublicKeyCertificate) GetFormat() PublicKeyCertificateFormat {
 	if m != nil {
@@ -710,20 +937,42 @@ type DeviceCredential struct {
 	// [Optional] The time at which this credential becomes invalid. This
 	// credential will be ignored for new client authentication requests after
 	// this timestamp; however, it will not be automatically deleted.
-	ExpirationTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime" json:"expiration_time,omitempty"`
+	ExpirationTime       *timestamp.Timestamp `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *DeviceCredential) Reset()                    { *m = DeviceCredential{} }
-func (m *DeviceCredential) String() string            { return proto.CompactTextString(m) }
-func (*DeviceCredential) ProtoMessage()               {}
-func (*DeviceCredential) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+func (m *DeviceCredential) Reset()         { *m = DeviceCredential{} }
+func (m *DeviceCredential) String() string { return proto.CompactTextString(m) }
+func (*DeviceCredential) ProtoMessage()    {}
+func (*DeviceCredential) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{9}
+}
+func (m *DeviceCredential) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceCredential.Unmarshal(m, b)
+}
+func (m *DeviceCredential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceCredential.Marshal(b, m, deterministic)
+}
+func (dst *DeviceCredential) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceCredential.Merge(dst, src)
+}
+func (m *DeviceCredential) XXX_Size() int {
+	return xxx_messageInfo_DeviceCredential.Size(m)
+}
+func (m *DeviceCredential) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceCredential.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeviceCredential proto.InternalMessageInfo
 
 type isDeviceCredential_Credential interface {
 	isDeviceCredential_Credential()
 }
 
 type DeviceCredential_PublicKey struct {
-	PublicKey *PublicKeyCredential `protobuf:"bytes,2,opt,name=public_key,json=publicKey,oneof"`
+	PublicKey *PublicKeyCredential `protobuf:"bytes,2,opt,name=public_key,json=publicKey,proto3,oneof"`
 }
 
 func (*DeviceCredential_PublicKey) isDeviceCredential_Credential() {}
@@ -742,7 +991,7 @@ func (m *DeviceCredential) GetPublicKey() *PublicKeyCredential {
 	return nil
 }
 
-func (m *DeviceCredential) GetExpirationTime() *google_protobuf1.Timestamp {
+func (m *DeviceCredential) GetExpirationTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ExpirationTime
 	}
@@ -794,7 +1043,7 @@ func _DeviceCredential_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Credential.(type) {
 	case *DeviceCredential_PublicKey:
 		s := proto.Size(x.PublicKey)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -807,15 +1056,37 @@ func _DeviceCredential_OneofSizer(msg proto.Message) (n int) {
 // A public key format and data.
 type PublicKeyCredential struct {
 	// The format of the key.
-	Format PublicKeyFormat `protobuf:"varint,1,opt,name=format,enum=google.cloud.iot.v1.PublicKeyFormat" json:"format,omitempty"`
+	Format PublicKeyFormat `protobuf:"varint,1,opt,name=format,proto3,enum=google.cloud.iot.v1.PublicKeyFormat" json:"format,omitempty"`
 	// The key data.
-	Key string `protobuf:"bytes,2,opt,name=key" json:"key,omitempty"`
+	Key                  string   `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PublicKeyCredential) Reset()                    { *m = PublicKeyCredential{} }
-func (m *PublicKeyCredential) String() string            { return proto.CompactTextString(m) }
-func (*PublicKeyCredential) ProtoMessage()               {}
-func (*PublicKeyCredential) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *PublicKeyCredential) Reset()         { *m = PublicKeyCredential{} }
+func (m *PublicKeyCredential) String() string { return proto.CompactTextString(m) }
+func (*PublicKeyCredential) ProtoMessage()    {}
+func (*PublicKeyCredential) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{10}
+}
+func (m *PublicKeyCredential) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublicKeyCredential.Unmarshal(m, b)
+}
+func (m *PublicKeyCredential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublicKeyCredential.Marshal(b, m, deterministic)
+}
+func (dst *PublicKeyCredential) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublicKeyCredential.Merge(dst, src)
+}
+func (m *PublicKeyCredential) XXX_Size() int {
+	return xxx_messageInfo_PublicKeyCredential.Size(m)
+}
+func (m *PublicKeyCredential) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublicKeyCredential.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PublicKeyCredential proto.InternalMessageInfo
 
 func (m *PublicKeyCredential) GetFormat() PublicKeyFormat {
 	if m != nil {
@@ -837,10 +1108,10 @@ type DeviceConfig struct {
 	// the server, and is always greater than 0 after device creation. The
 	// version must be 0 on the `CreateDevice` request if a `config` is
 	// specified; the response of `CreateDevice` will always have a value of 1.
-	Version int64 `protobuf:"varint,1,opt,name=version" json:"version,omitempty"`
+	Version int64 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
 	// [Output only] The time at which this configuration version was updated in
 	// Cloud IoT Core. This timestamp is set by the server.
-	CloudUpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=cloud_update_time,json=cloudUpdateTime" json:"cloud_update_time,omitempty"`
+	CloudUpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=cloud_update_time,json=cloudUpdateTime,proto3" json:"cloud_update_time,omitempty"`
 	// [Output only] The time at which Cloud IoT Core received the
 	// acknowledgment from the device, indicating that the device has received
 	// this configuration version. If this field is not present, the device has
@@ -850,15 +1121,37 @@ type DeviceConfig struct {
 	// connection, only the latest version is sent to the device. Some
 	// versions may never be sent to the device, and therefore are never
 	// acknowledged. This timestamp is set by Cloud IoT Core.
-	DeviceAckTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=device_ack_time,json=deviceAckTime" json:"device_ack_time,omitempty"`
+	DeviceAckTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=device_ack_time,json=deviceAckTime,proto3" json:"device_ack_time,omitempty"`
 	// The device configuration data.
-	BinaryData []byte `protobuf:"bytes,4,opt,name=binary_data,json=binaryData,proto3" json:"binary_data,omitempty"`
+	BinaryData           []byte   `protobuf:"bytes,4,opt,name=binary_data,json=binaryData,proto3" json:"binary_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeviceConfig) Reset()                    { *m = DeviceConfig{} }
-func (m *DeviceConfig) String() string            { return proto.CompactTextString(m) }
-func (*DeviceConfig) ProtoMessage()               {}
-func (*DeviceConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+func (m *DeviceConfig) Reset()         { *m = DeviceConfig{} }
+func (m *DeviceConfig) String() string { return proto.CompactTextString(m) }
+func (*DeviceConfig) ProtoMessage()    {}
+func (*DeviceConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{11}
+}
+func (m *DeviceConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceConfig.Unmarshal(m, b)
+}
+func (m *DeviceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceConfig.Marshal(b, m, deterministic)
+}
+func (dst *DeviceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceConfig.Merge(dst, src)
+}
+func (m *DeviceConfig) XXX_Size() int {
+	return xxx_messageInfo_DeviceConfig.Size(m)
+}
+func (m *DeviceConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeviceConfig proto.InternalMessageInfo
 
 func (m *DeviceConfig) GetVersion() int64 {
 	if m != nil {
@@ -867,14 +1160,14 @@ func (m *DeviceConfig) GetVersion() int64 {
 	return 0
 }
 
-func (m *DeviceConfig) GetCloudUpdateTime() *google_protobuf1.Timestamp {
+func (m *DeviceConfig) GetCloudUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CloudUpdateTime
 	}
 	return nil
 }
 
-func (m *DeviceConfig) GetDeviceAckTime() *google_protobuf1.Timestamp {
+func (m *DeviceConfig) GetDeviceAckTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.DeviceAckTime
 	}
@@ -892,17 +1185,39 @@ func (m *DeviceConfig) GetBinaryData() []byte {
 type DeviceState struct {
 	// [Output only] The time at which this state version was updated in Cloud
 	// IoT Core.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The device state data.
-	BinaryData []byte `protobuf:"bytes,2,opt,name=binary_data,json=binaryData,proto3" json:"binary_data,omitempty"`
+	BinaryData           []byte   `protobuf:"bytes,2,opt,name=binary_data,json=binaryData,proto3" json:"binary_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeviceState) Reset()         { *m = DeviceState{} }
+func (m *DeviceState) String() string { return proto.CompactTextString(m) }
+func (*DeviceState) ProtoMessage()    {}
+func (*DeviceState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_adeeda409206dfbb, []int{12}
+}
+func (m *DeviceState) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceState.Unmarshal(m, b)
+}
+func (m *DeviceState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceState.Marshal(b, m, deterministic)
+}
+func (dst *DeviceState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceState.Merge(dst, src)
+}
+func (m *DeviceState) XXX_Size() int {
+	return xxx_messageInfo_DeviceState.Size(m)
+}
+func (m *DeviceState) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceState.DiscardUnknown(m)
 }
 
-func (m *DeviceState) Reset()                    { *m = DeviceState{} }
-func (m *DeviceState) String() string            { return proto.CompactTextString(m) }
-func (*DeviceState) ProtoMessage()               {}
-func (*DeviceState) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+var xxx_messageInfo_DeviceState proto.InternalMessageInfo
 
-func (m *DeviceState) GetUpdateTime() *google_protobuf1.Timestamp {
+func (m *DeviceState) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -918,6 +1233,7 @@ func (m *DeviceState) GetBinaryData() []byte {
 
 func init() {
 	proto.RegisterType((*Device)(nil), "google.cloud.iot.v1.Device")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.iot.v1.Device.MetadataEntry")
 	proto.RegisterType((*DeviceRegistry)(nil), "google.cloud.iot.v1.DeviceRegistry")
 	proto.RegisterType((*MqttConfig)(nil), "google.cloud.iot.v1.MqttConfig")
 	proto.RegisterType((*HttpConfig)(nil), "google.cloud.iot.v1.HttpConfig")
@@ -936,91 +1252,95 @@ func init() {
 	proto.RegisterEnum("google.cloud.iot.v1.PublicKeyFormat", PublicKeyFormat_name, PublicKeyFormat_value)
 }
 
-func init() { proto.RegisterFile("google/cloud/iot/v1/resources.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 1320 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x97, 0xdd, 0x72, 0xdb, 0x44,
-	0x14, 0xc7, 0x23, 0x27, 0x71, 0x92, 0xe3, 0xf8, 0x23, 0x9b, 0x34, 0x11, 0x1e, 0xa0, 0xae, 0xf9,
-	0x4a, 0x0b, 0xd8, 0x6d, 0x98, 0x76, 0x08, 0x65, 0x18, 0x12, 0x47, 0x69, 0x4c, 0x93, 0x60, 0x64,
-	0x77, 0x06, 0x7a, 0xa3, 0x59, 0x4b, 0x1b, 0x47, 0x8d, 0x2d, 0xa9, 0xd2, 0xca, 0x53, 0x3f, 0x00,
-	0x0f, 0xc0, 0x35, 0x2f, 0xc1, 0xab, 0x70, 0xc1, 0x05, 0x6f, 0xc2, 0x25, 0xb3, 0x67, 0x25, 0xf9,
-	0x03, 0x39, 0x0e, 0x77, 0xde, 0xdd, 0xf3, 0xff, 0x1d, 0x9d, 0xaf, 0x95, 0x0c, 0x1f, 0xf5, 0x5c,
-	0xb7, 0xd7, 0x67, 0x75, 0xb3, 0xef, 0x86, 0x56, 0xdd, 0x76, 0x79, 0x7d, 0xf8, 0xa4, 0xee, 0xb3,
-	0xc0, 0x0d, 0x7d, 0x93, 0x05, 0x35, 0xcf, 0x77, 0xb9, 0x4b, 0xb6, 0xa5, 0x51, 0x0d, 0x8d, 0x6a,
-	0xb6, 0xcb, 0x6b, 0xc3, 0x27, 0xe5, 0xf7, 0x23, 0x25, 0xf5, 0xec, 0x3a, 0x75, 0x1c, 0x97, 0x53,
-	0x6e, 0xbb, 0x4e, 0x24, 0x29, 0xdf, 0x8f, 0x4e, 0x71, 0xd5, 0x0d, 0xaf, 0xea, 0xdc, 0x1e, 0xb0,
-	0x80, 0xd3, 0x81, 0x17, 0x19, 0xec, 0x45, 0x06, 0xbe, 0x67, 0xd6, 0x03, 0x4e, 0x79, 0x18, 0x29,
-	0xab, 0xbf, 0xad, 0x41, 0xf6, 0x84, 0x0d, 0x6d, 0x93, 0x91, 0x02, 0x64, 0x6c, 0x4b, 0x55, 0x2a,
-	0xca, 0xfe, 0x86, 0x9e, 0xb1, 0x2d, 0x42, 0x60, 0xc5, 0xa1, 0x03, 0xa6, 0x66, 0x70, 0x07, 0x7f,
-	0x93, 0x7b, 0x90, 0x75, 0xc2, 0x81, 0x61, 0x5b, 0xea, 0x72, 0x45, 0xd9, 0x5f, 0xd1, 0x57, 0x9d,
-	0x70, 0xd0, 0xb4, 0xc8, 0x0b, 0xc8, 0x99, 0x3e, 0xb3, 0x98, 0xc3, 0x6d, 0xda, 0x0f, 0xd4, 0xcd,
-	0xca, 0xf2, 0x7e, 0xee, 0xe0, 0x93, 0x5a, 0x4a, 0x20, 0x35, 0xe9, 0xac, 0x91, 0x58, 0xeb, 0x93,
-	0x4a, 0xf2, 0x03, 0x6c, 0xf7, 0x69, 0xc0, 0x8d, 0x6b, 0x46, 0x7d, 0xde, 0x65, 0x94, 0x1b, 0x22,
-	0x12, 0x75, 0xad, 0xa2, 0xec, 0xe7, 0x0e, 0xca, 0x31, 0x30, 0x0e, 0xb3, 0xd6, 0x89, 0xc3, 0xd4,
-	0xb7, 0x84, 0xec, 0x2c, 0x56, 0x89, 0x7d, 0x72, 0x0c, 0x45, 0x64, 0xb1, 0x21, 0x73, 0x22, 0xce,
-	0xfa, 0x42, 0x4e, 0x5e, 0x48, 0x34, 0xa1, 0x98, 0x62, 0x88, 0x9c, 0x31, 0xc9, 0xd8, 0xb9, 0x1b,
-	0xa3, 0x2d, 0x14, 0xc8, 0x78, 0x09, 0x3b, 0xc8, 0x30, 0x5d, 0xe7, 0xca, 0xee, 0x19, 0xd4, 0xbc,
-	0x91, 0xa0, 0xc2, 0xdd, 0x82, 0x6a, 0xa0, 0xec, 0xc8, 0xbc, 0x41, 0xd8, 0x05, 0xdc, 0x9b, 0x84,
-	0x05, 0xcc, 0xb1, 0x24, 0x8d, 0x2c, 0xa4, 0x91, 0x31, 0xad, 0xcd, 0x1c, 0x0b, 0x71, 0x2a, 0xac,
-	0x75, 0xfb, 0xae, 0x79, 0xc3, 0x2c, 0x75, 0xbb, 0xa2, 0xec, 0xaf, 0xeb, 0xf1, 0x72, 0x9c, 0x3d,
-	0xdf, 0x77, 0x7d, 0xe9, 0x02, 0xee, 0x98, 0x3d, 0xa1, 0x40, 0xfa, 0x77, 0xb0, 0x35, 0xc1, 0x90,
-	0x7d, 0xa7, 0xe6, 0x90, 0x42, 0x62, 0x8a, 0xef, 0x99, 0xb5, 0x36, 0x9e, 0xe8, 0xc5, 0x44, 0x2d,
-	0x37, 0xc8, 0x21, 0x64, 0x65, 0x9c, 0x6a, 0x1e, 0x45, 0x0f, 0x6e, 0xeb, 0x28, 0x34, 0xd4, 0x23,
-	0x01, 0x79, 0x06, 0xab, 0x58, 0x33, 0xb5, 0x84, 0xca, 0xca, 0x2d, 0x4a, 0xac, 0x94, 0x2e, 0xcd,
-	0x89, 0x06, 0xeb, 0x03, 0xc6, 0xa9, 0x45, 0x39, 0x55, 0xb7, 0xb0, 0x8d, 0x1f, 0xde, 0x22, 0xad,
-	0x5d, 0x44, 0xb6, 0x9a, 0xc3, 0xfd, 0x91, 0x9e, 0x48, 0xcb, 0xcf, 0x21, 0x3f, 0x75, 0x44, 0x4a,
-	0xb0, 0x7c, 0xc3, 0x46, 0xd1, 0x74, 0x89, 0x9f, 0x64, 0x07, 0x56, 0x87, 0xb4, 0x1f, 0xc6, 0xf3,
-	0x25, 0x17, 0xdf, 0x64, 0xbe, 0x56, 0xaa, 0x7f, 0x2f, 0x43, 0x41, 0xf2, 0x75, 0xd6, 0xb3, 0x03,
-	0x21, 0xbf, 0xcb, 0x6c, 0xbe, 0x81, 0xb2, 0x6c, 0x75, 0xc7, 0xe5, 0xf6, 0x95, 0x6d, 0xe2, 0x0d,
-	0x11, 0x35, 0x4a, 0xa0, 0x02, 0x06, 0xf3, 0x45, 0x6a, 0x30, 0xd8, 0xef, 0x97, 0x13, 0xaa, 0x28,
-	0x99, 0x2a, 0x4b, 0x3f, 0x08, 0xc8, 0x35, 0xbc, 0x27, 0x47, 0x22, 0xc5, 0x57, 0x34, 0xad, 0xe9,
-	0xae, 0x30, 0xd9, 0x29, 0xae, 0xf6, 0x82, 0xf4, 0x03, 0xf2, 0x3d, 0xe4, 0x06, 0x6f, 0x79, 0xdc,
-	0xf0, 0xea, 0x0a, 0xb2, 0xef, 0xa7, 0xb2, 0x2f, 0xde, 0xf2, 0xa8, 0xbf, 0x75, 0x18, 0x24, 0xbf,
-	0x05, 0xe1, 0x9a, 0x73, 0x2f, 0x26, 0x6c, 0xdc, 0x42, 0x38, 0xe3, 0xdc, 0x8b, 0x09, 0xd7, 0xc9,
-	0x6f, 0xd2, 0x9c, 0xbe, 0xde, 0xd6, 0x31, 0x95, 0x9f, 0xa5, 0x12, 0xe2, 0x8a, 0xcd, 0xb9, 0xe0,
-	0xaa, 0xaf, 0x01, 0xc6, 0x8f, 0x49, 0xce, 0x81, 0x60, 0x70, 0xcc, 0xa1, 0xdd, 0x3e, 0xb3, 0xe4,
-	0x35, 0x83, 0x65, 0x2e, 0x1c, 0x7c, 0x38, 0x37, 0x46, 0xd9, 0xb0, 0x25, 0xa1, 0xd4, 0xa4, 0x10,
-	0x77, 0x04, 0x7b, 0x1c, 0x80, 0x60, 0x63, 0xd8, 0x77, 0x67, 0x0b, 0x71, 0xc4, 0x16, 0xca, 0x29,
-	0xb6, 0x06, 0x7b, 0x73, 0xba, 0x84, 0x3c, 0x82, 0x2d, 0x2f, 0xec, 0x06, 0x61, 0xd7, 0xe0, 0xae,
-	0x67, 0x9b, 0x06, 0x36, 0xa6, 0x6c, 0xd5, 0xa2, 0x3c, 0xe8, 0x88, 0xfd, 0x4b, 0x3a, 0x40, 0xcc,
-	0x9c, 0x0e, 0xf8, 0x5f, 0x98, 0x5f, 0x15, 0x20, 0xff, 0xcd, 0x34, 0xa1, 0xb0, 0xeb, 0x85, 0xdd,
-	0xbe, 0x6d, 0x1a, 0x37, 0x6c, 0x64, 0x98, 0xcc, 0x8f, 0x9c, 0x48, 0xce, 0xbc, 0x51, 0x6e, 0xa1,
-	0xe4, 0x25, 0x1b, 0x35, 0xc6, 0x82, 0xb3, 0x25, 0x7d, 0xc7, 0x4b, 0xd9, 0x3f, 0xde, 0x04, 0x18,
-	0x97, 0xb3, 0xfa, 0x7b, 0x06, 0x76, 0x7f, 0x7e, 0xfa, 0xf8, 0x70, 0xc2, 0xe2, 0x84, 0x71, 0x6a,
-	0xf7, 0x03, 0xb2, 0x0b, 0x59, 0x3b, 0x08, 0x42, 0xe6, 0x47, 0x31, 0x44, 0x2b, 0x71, 0xe3, 0x06,
-	0x61, 0xf7, 0x0d, 0x33, 0x79, 0x34, 0xbc, 0xf1, 0x92, 0x1c, 0x02, 0x04, 0x9c, 0xfa, 0xd1, 0xab,
-	0x6a, 0x79, 0xe1, 0x65, 0xbb, 0x81, 0xd6, 0x78, 0xd1, 0x3e, 0x87, 0x1c, 0x7b, 0xe7, 0xd9, 0xfe,
-	0x48, 0x6a, 0x57, 0x16, 0x6a, 0x41, 0x9a, 0xa3, 0xb8, 0x0e, 0xdb, 0x81, 0xdd, 0x73, 0x28, 0x0f,
-	0x7d, 0x66, 0xd0, 0x7e, 0xcf, 0xf5, 0x6d, 0x7e, 0x3d, 0x50, 0x57, 0xf1, 0xe9, 0x48, 0x72, 0x74,
-	0x14, 0x9f, 0x90, 0x4f, 0xa1, 0x38, 0x91, 0x66, 0x3e, 0xf2, 0x98, 0x9a, 0x45, 0xe3, 0x7c, 0x92,
-	0xb2, 0xce, 0xc8, 0x63, 0xd5, 0x3f, 0x15, 0xd8, 0x49, 0x4b, 0x2e, 0x79, 0x01, 0xd9, 0x2b, 0xd7,
-	0x1f, 0x50, 0x1e, 0xb5, 0x63, 0xfd, 0xce, 0x75, 0x39, 0x45, 0x99, 0x1e, 0xc9, 0x49, 0x05, 0x72,
-	0x93, 0x55, 0x96, 0x09, 0x9d, 0xdc, 0x22, 0x97, 0xb0, 0xf9, 0xee, 0xe9, 0xe3, 0x43, 0xc3, 0x92,
-	0x65, 0x89, 0xd2, 0xfa, 0x79, 0xaa, 0xc3, 0xf4, 0x4a, 0xea, 0x39, 0x01, 0x88, 0x16, 0xd5, 0x3f,
-	0x14, 0x28, 0xcd, 0x7e, 0xc2, 0x90, 0x26, 0xc0, 0x38, 0x21, 0xf8, 0x14, 0xb9, 0x83, 0xfd, 0x05,
-	0x31, 0x25, 0xea, 0xb3, 0x25, 0x7d, 0x23, 0xc9, 0x1b, 0x69, 0x40, 0x11, 0x4b, 0x23, 0x2f, 0x54,
-	0xac, 0x66, 0x76, 0x61, 0x35, 0x0b, 0x63, 0x89, 0xd8, 0x9c, 0x69, 0x52, 0x06, 0xdb, 0x29, 0x6e,
-	0xc9, 0xb7, 0x33, 0x45, 0xf8, 0xf8, 0xf6, 0x07, 0x9e, 0xc9, 0x7c, 0xf4, 0x3e, 0xcb, 0x24, 0xef,
-	0xb3, 0xea, 0x5f, 0x0a, 0x6c, 0x4e, 0xbe, 0x8a, 0x45, 0xa7, 0x0f, 0x99, 0x1f, 0xd8, 0xae, 0x83,
-	0x1e, 0x96, 0xf5, 0x78, 0x49, 0x4e, 0x61, 0x0b, 0x9d, 0x18, 0xa1, 0x67, 0x25, 0xdf, 0x55, 0x99,
-	0x85, 0x61, 0x16, 0x51, 0xf4, 0x0a, 0x35, 0xf1, 0xd7, 0x99, 0x85, 0x1e, 0xc7, 0x1f, 0x55, 0x8b,
-	0xc7, 0x26, 0x2f, 0x25, 0xf1, 0x07, 0xd5, 0x7d, 0xc8, 0x75, 0x6d, 0x87, 0xfa, 0x23, 0x03, 0xdf,
-	0xf9, 0x62, 0x74, 0x36, 0x75, 0x90, 0x5b, 0x27, 0x94, 0xd3, 0xea, 0x0d, 0xe4, 0x26, 0xbe, 0x13,
-	0xc4, 0xa8, 0x4d, 0x3e, 0xb5, 0xb2, 0x78, 0xd4, 0xc2, 0xf1, 0x03, 0xcf, 0x38, 0xcb, 0xcc, 0x3a,
-	0x7b, 0x74, 0x0e, 0x1b, 0xc9, 0x0d, 0x4f, 0xca, 0xb0, 0x7b, 0xf1, 0x53, 0xa7, 0x63, 0xb4, 0x3b,
-	0x47, 0x1d, 0xcd, 0x78, 0x75, 0xd9, 0x6e, 0x69, 0x8d, 0xe6, 0x69, 0x53, 0x3b, 0x29, 0x2d, 0x91,
-	0x12, 0x6c, 0xe2, 0x99, 0x76, 0x79, 0x74, 0x7c, 0xae, 0x9d, 0x94, 0x14, 0xb2, 0x05, 0x79, 0xdc,
-	0x39, 0x69, 0xb6, 0xe5, 0x56, 0x46, 0xd0, 0x92, 0x3b, 0x5d, 0xd0, 0xce, 0x3a, 0x9d, 0xd6, 0x3c,
-	0x1a, 0x9e, 0x4d, 0xd1, 0x70, 0x67, 0x82, 0xc6, 0xa0, 0x3c, 0x7f, 0x24, 0xc9, 0x97, 0xf0, 0x70,
-	0x82, 0x69, 0xb4, 0x5e, 0x1d, 0x9f, 0x37, 0x1b, 0xc6, 0x4b, 0xed, 0x17, 0xa3, 0xa1, 0xe9, 0x9d,
-	0xe6, 0x69, 0xb3, 0x21, 0xdc, 0x9e, 0xfe, 0xa8, 0x5f, 0x1c, 0x75, 0x4a, 0x4b, 0x44, 0x85, 0x1d,
-	0x31, 0x6e, 0x53, 0x87, 0x2d, 0xed, 0xa2, 0xa4, 0x3c, 0x1a, 0x42, 0x71, 0xa6, 0xe9, 0xc8, 0x03,
-	0xf8, 0x60, 0x0e, 0x3b, 0xe1, 0xe5, 0x60, 0x4d, 0x6f, 0x1f, 0x21, 0x62, 0x59, 0x84, 0x23, 0x16,
-	0xe8, 0x00, 0xa1, 0x24, 0x0f, 0x1b, 0x5a, 0xfb, 0xe0, 0xe9, 0x33, 0x5c, 0x66, 0x08, 0x81, 0x82,
-	0x5c, 0x26, 0x26, 0x2b, 0xc7, 0x57, 0xb0, 0x67, 0xba, 0x83, 0xb4, 0x21, 0x38, 0x2e, 0xe8, 0xf1,
-	0x5f, 0xb4, 0x96, 0xa8, 0x6f, 0x4b, 0x79, 0xfd, 0x2c, 0x32, 0xeb, 0xb9, 0x7d, 0xea, 0xf4, 0x6a,
-	0xae, 0xdf, 0xab, 0xf7, 0x98, 0x83, 0xd5, 0xaf, 0xcb, 0x23, 0xea, 0xd9, 0xc1, 0xd4, 0xff, 0xbc,
-	0xe7, 0xb6, 0xcb, 0xff, 0x51, 0x94, 0x6e, 0x16, 0xad, 0xbe, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff,
-	0x19, 0x85, 0xa9, 0x71, 0x0c, 0x0e, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/iot/v1/resources.proto", fileDescriptor_resources_adeeda409206dfbb)
+}
+
+var fileDescriptor_resources_adeeda409206dfbb = []byte{
+	// 1348 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xdd, 0x52, 0xdb, 0xc6,
+	0x17, 0x47, 0x06, 0x0c, 0x1c, 0x03, 0xb6, 0x17, 0x02, 0xfa, 0x7b, 0xfe, 0x6d, 0x1c, 0xf7, 0x8b,
+	0x24, 0xad, 0x9d, 0xd0, 0x49, 0xa6, 0x34, 0x9d, 0x4e, 0xc1, 0x88, 0xe0, 0x06, 0x53, 0x57, 0x76,
+	0x66, 0xda, 0xdc, 0x68, 0xd6, 0xd2, 0x62, 0x14, 0x6c, 0x49, 0x91, 0x56, 0x9e, 0xf8, 0x01, 0xfa,
+	0x00, 0xbd, 0xee, 0x4b, 0xf4, 0x55, 0x7a, 0xd1, 0x8b, 0xbe, 0x49, 0x2f, 0x3b, 0x7b, 0x56, 0x92,
+	0x3f, 0x2a, 0x63, 0x7a, 0xa7, 0x3d, 0xe7, 0xfc, 0x7e, 0x67, 0xcf, 0xd7, 0xee, 0x0a, 0x3e, 0xea,
+	0xb9, 0x6e, 0xaf, 0xcf, 0x6a, 0x66, 0xdf, 0x0d, 0xad, 0x9a, 0xed, 0xf2, 0xda, 0xf0, 0x69, 0xcd,
+	0x67, 0x81, 0x1b, 0xfa, 0x26, 0x0b, 0xaa, 0x9e, 0xef, 0x72, 0x97, 0xec, 0x48, 0xa3, 0x2a, 0x1a,
+	0x55, 0x6d, 0x97, 0x57, 0x87, 0x4f, 0x4b, 0xff, 0x8f, 0x90, 0xd4, 0xb3, 0x6b, 0xd4, 0x71, 0x5c,
+	0x4e, 0xb9, 0xed, 0x3a, 0x11, 0xa4, 0x74, 0x3f, 0xd2, 0xe2, 0xaa, 0x1b, 0x5e, 0xd5, 0xb8, 0x3d,
+	0x60, 0x01, 0xa7, 0x03, 0x2f, 0x32, 0xd8, 0x8f, 0x0c, 0x7c, 0xcf, 0xac, 0x05, 0x9c, 0xf2, 0x30,
+	0x42, 0x56, 0x7e, 0x5d, 0x83, 0xec, 0x29, 0x1b, 0xda, 0x26, 0x23, 0xdb, 0x90, 0xb1, 0x2d, 0x55,
+	0x29, 0x2b, 0x07, 0x1b, 0x7a, 0xc6, 0xb6, 0x08, 0x81, 0x15, 0x87, 0x0e, 0x98, 0x9a, 0x41, 0x09,
+	0x7e, 0x93, 0x7b, 0x90, 0x75, 0xc2, 0x81, 0x61, 0x5b, 0xea, 0x72, 0x59, 0x39, 0x58, 0xd1, 0x57,
+	0x9d, 0x70, 0xd0, 0xb0, 0xc8, 0x4b, 0xc8, 0x99, 0x3e, 0xb3, 0x98, 0xc3, 0x6d, 0xda, 0x0f, 0xd4,
+	0xcd, 0xf2, 0xf2, 0x41, 0xee, 0xf0, 0x93, 0x6a, 0x4a, 0x20, 0x55, 0xe9, 0xac, 0x9e, 0x58, 0xeb,
+	0x93, 0x48, 0xf2, 0x3d, 0xec, 0xf4, 0x69, 0xc0, 0x8d, 0x6b, 0x46, 0x7d, 0xde, 0x65, 0x94, 0x1b,
+	0x22, 0x12, 0x75, 0xad, 0xac, 0x1c, 0xe4, 0x0e, 0x4b, 0x31, 0x61, 0x1c, 0x66, 0xb5, 0x13, 0x87,
+	0xa9, 0x17, 0x05, 0xec, 0x3c, 0x46, 0x09, 0x39, 0x39, 0x81, 0x3c, 0x72, 0xb1, 0x21, 0x73, 0x22,
+	0x9e, 0xf5, 0x85, 0x3c, 0x5b, 0x02, 0xa2, 0x09, 0xc4, 0x14, 0x87, 0xc8, 0x19, 0x93, 0x1c, 0xbb,
+	0x77, 0xe3, 0x68, 0x0b, 0x04, 0x72, 0xbc, 0x82, 0x5d, 0xe4, 0x30, 0x5d, 0xe7, 0xca, 0xee, 0x19,
+	0xd4, 0xbc, 0x91, 0x44, 0xdb, 0x77, 0x0b, 0xaa, 0x8e, 0xb0, 0x63, 0xf3, 0x06, 0xc9, 0x9a, 0x70,
+	0x6f, 0x92, 0x2c, 0x60, 0x8e, 0x25, 0xd9, 0xc8, 0x42, 0x36, 0x32, 0x66, 0x6b, 0x33, 0xc7, 0x42,
+	0x3a, 0x15, 0xd6, 0xba, 0x7d, 0xd7, 0xbc, 0x61, 0x96, 0xba, 0x53, 0x56, 0x0e, 0xd6, 0xf5, 0x78,
+	0x39, 0xce, 0x9e, 0xef, 0xbb, 0xbe, 0x74, 0x01, 0x77, 0xcc, 0x9e, 0x40, 0x20, 0xfb, 0xb7, 0x50,
+	0x9c, 0xe0, 0x90, 0x7d, 0xa7, 0xe6, 0x90, 0x85, 0xc4, 0x2c, 0xbe, 0x67, 0x56, 0xdb, 0xa8, 0xd1,
+	0xf3, 0x09, 0x5a, 0x0a, 0xc8, 0x11, 0x64, 0x65, 0x9c, 0xea, 0x16, 0x82, 0x1e, 0xdc, 0xd6, 0x51,
+	0x68, 0xa8, 0x47, 0x00, 0xf2, 0x1c, 0x56, 0xb1, 0x66, 0x6a, 0x01, 0x91, 0xe5, 0x5b, 0x90, 0x58,
+	0x29, 0x5d, 0x9a, 0x13, 0x0d, 0xd6, 0x07, 0x8c, 0x53, 0x8b, 0x72, 0xaa, 0x16, 0xb1, 0x8d, 0x1f,
+	0xde, 0x02, 0xad, 0x36, 0x23, 0x5b, 0xcd, 0xe1, 0xfe, 0x48, 0x4f, 0xa0, 0xa5, 0x17, 0xb0, 0x35,
+	0xa5, 0x22, 0x05, 0x58, 0xbe, 0x61, 0xa3, 0x68, 0xba, 0xc4, 0x27, 0xd9, 0x85, 0xd5, 0x21, 0xed,
+	0x87, 0xf1, 0x7c, 0xc9, 0xc5, 0xd7, 0x99, 0xaf, 0x94, 0xca, 0x5f, 0xcb, 0xb0, 0x2d, 0xf9, 0x75,
+	0xd6, 0xb3, 0x03, 0x01, 0xbf, 0xcb, 0x6c, 0xbe, 0x85, 0x92, 0x6c, 0x75, 0xc7, 0xe5, 0xf6, 0x95,
+	0x6d, 0xe2, 0x09, 0x11, 0x35, 0x4a, 0xa0, 0x02, 0x06, 0xf3, 0x79, 0x6a, 0x30, 0xd8, 0xef, 0x97,
+	0x13, 0xa8, 0x28, 0x99, 0x2a, 0x4b, 0x57, 0x04, 0xe4, 0x1a, 0xfe, 0x27, 0x47, 0x22, 0xc5, 0x57,
+	0x34, 0xad, 0xe9, 0xae, 0x30, 0xd9, 0x29, 0xae, 0xf6, 0x83, 0x74, 0x05, 0xf9, 0x0e, 0x72, 0x83,
+	0x77, 0x3c, 0x6e, 0x78, 0x75, 0x05, 0xb9, 0xef, 0xa7, 0x72, 0x37, 0xdf, 0xf1, 0xa8, 0xbf, 0x75,
+	0x18, 0x24, 0xdf, 0x82, 0xe1, 0x9a, 0x73, 0x2f, 0x66, 0xd8, 0xb8, 0x85, 0xe1, 0x9c, 0x73, 0x2f,
+	0x66, 0xb8, 0x4e, 0xbe, 0x49, 0x63, 0xfa, 0x78, 0x5b, 0xc7, 0x54, 0x7e, 0x96, 0xca, 0x10, 0x57,
+	0x6c, 0xce, 0x01, 0x57, 0x79, 0x03, 0x30, 0xde, 0x26, 0xb9, 0x00, 0x82, 0xc1, 0x31, 0x87, 0x76,
+	0xfb, 0xcc, 0x92, 0xc7, 0x0c, 0x96, 0x79, 0xfb, 0xf0, 0xc3, 0xb9, 0x31, 0xca, 0x86, 0x2d, 0x08,
+	0xa4, 0x26, 0x81, 0x28, 0x11, 0xdc, 0xe3, 0x00, 0x04, 0x37, 0x86, 0x7d, 0x77, 0x6e, 0x01, 0x8e,
+	0xb8, 0x05, 0x72, 0x8a, 0xdb, 0x87, 0xfd, 0x39, 0x5d, 0x42, 0x1e, 0x43, 0x31, 0x08, 0xbb, 0x57,
+	0x6e, 0xdf, 0x62, 0xbe, 0x31, 0xa0, 0xdc, 0xbc, 0x66, 0x41, 0xd4, 0x98, 0x85, 0x44, 0xd1, 0x94,
+	0x72, 0xf2, 0x08, 0x8a, 0x5e, 0xd8, 0x0d, 0xc2, 0xae, 0xc1, 0x5d, 0xcf, 0x36, 0x0d, 0xec, 0x62,
+	0xd9, 0xd7, 0x79, 0xa9, 0xe8, 0x08, 0xf9, 0x25, 0x1d, 0xb0, 0x8a, 0x06, 0xfb, 0x73, 0xda, 0xe5,
+	0x3f, 0xd1, 0xfc, 0xa2, 0x00, 0xf9, 0x77, 0x59, 0x08, 0x85, 0x3d, 0x2f, 0xec, 0xf6, 0x6d, 0xd3,
+	0xb8, 0x61, 0x23, 0xc3, 0x64, 0x7e, 0xe4, 0x44, 0xf2, 0xcc, 0x9b, 0xfb, 0x16, 0x42, 0x5e, 0xb1,
+	0x51, 0x7d, 0x0c, 0x38, 0x5f, 0xd2, 0x77, 0xbd, 0x14, 0xf9, 0xc9, 0x26, 0xc0, 0xb8, 0xf6, 0x95,
+	0xdf, 0x32, 0xb0, 0xf7, 0xd3, 0xb3, 0x27, 0x47, 0x13, 0x16, 0xa7, 0x8c, 0x53, 0xbb, 0x1f, 0x90,
+	0x3d, 0xc8, 0xda, 0x41, 0x10, 0x32, 0x3f, 0x8a, 0x21, 0x5a, 0x89, 0xe3, 0x39, 0x08, 0xbb, 0x6f,
+	0x99, 0xc9, 0xa3, 0x84, 0xc6, 0x4b, 0x72, 0x04, 0x10, 0x70, 0xea, 0x47, 0xf7, 0xda, 0xf2, 0xc2,
+	0x93, 0x79, 0x03, 0xad, 0xf1, 0x54, 0x7e, 0x01, 0x39, 0xf6, 0xde, 0xb3, 0xfd, 0x91, 0xc4, 0xae,
+	0x2c, 0xc4, 0x82, 0x34, 0x47, 0x70, 0x0d, 0x76, 0x02, 0xbb, 0xe7, 0x50, 0x1e, 0xfa, 0xcc, 0xa0,
+	0xfd, 0x9e, 0xeb, 0xdb, 0xfc, 0x7a, 0xa0, 0xae, 0xe2, 0xee, 0x48, 0xa2, 0x3a, 0x8e, 0x35, 0xe4,
+	0x53, 0xc8, 0x4f, 0xa4, 0x99, 0x8f, 0x3c, 0xa6, 0x66, 0xd1, 0x78, 0x2b, 0x49, 0x59, 0x67, 0xe4,
+	0xb1, 0xca, 0x1f, 0x0a, 0xec, 0xa6, 0x25, 0x97, 0xbc, 0x84, 0xec, 0x95, 0xeb, 0x0f, 0x28, 0x8f,
+	0x7a, 0xb7, 0x76, 0xe7, 0xba, 0x9c, 0x21, 0x4c, 0x8f, 0xe0, 0xa4, 0x0c, 0xb9, 0xc9, 0x2a, 0xcb,
+	0x84, 0x4e, 0x8a, 0xc8, 0x25, 0x6c, 0xbe, 0x7f, 0xf6, 0xe4, 0xc8, 0xb0, 0x64, 0x59, 0xa2, 0xb4,
+	0x3e, 0x4e, 0x75, 0x98, 0x5e, 0x49, 0x3d, 0x27, 0x08, 0xa2, 0x45, 0xe5, 0x77, 0x05, 0x0a, 0xb3,
+	0xef, 0x1d, 0xd2, 0x00, 0x18, 0x27, 0x04, 0x77, 0x91, 0x3b, 0x3c, 0x58, 0x10, 0x53, 0x82, 0x3e,
+	0x5f, 0xd2, 0x37, 0x92, 0xbc, 0x91, 0x3a, 0xe4, 0xb1, 0x34, 0xf2, 0xf4, 0xc5, 0x6a, 0x66, 0x17,
+	0x56, 0x73, 0x7b, 0x0c, 0x11, 0xc2, 0x99, 0x26, 0x65, 0xb0, 0x93, 0xe2, 0x96, 0x7c, 0x33, 0x53,
+	0x84, 0x8f, 0x6f, 0xdf, 0xf0, 0x4c, 0xe6, 0xa3, 0xcb, 0x2f, 0x93, 0x5c, 0x7e, 0x95, 0x3f, 0x15,
+	0xd8, 0x9c, 0xbc, 0xb7, 0x45, 0xa7, 0x0f, 0x99, 0x1f, 0xd8, 0xae, 0x83, 0x1e, 0x96, 0xf5, 0x78,
+	0x49, 0xce, 0xa0, 0x88, 0x4e, 0x8c, 0xd0, 0xb3, 0x92, 0x47, 0x58, 0x66, 0x61, 0x98, 0x79, 0x04,
+	0xbd, 0x46, 0x4c, 0xfc, 0x94, 0xb3, 0xd0, 0xe3, 0xf8, 0x05, 0xb6, 0x78, 0x6c, 0xb6, 0x24, 0x24,
+	0x7e, 0x7d, 0xdd, 0x87, 0x5c, 0xd7, 0x76, 0xa8, 0x3f, 0x32, 0xf0, 0x81, 0x20, 0x46, 0x67, 0x53,
+	0x07, 0x29, 0x3a, 0xa5, 0x9c, 0x56, 0x6e, 0x20, 0x37, 0xf1, 0xa8, 0x10, 0xa3, 0x36, 0xb9, 0x6b,
+	0x65, 0xf1, 0xa8, 0x85, 0xe3, 0x0d, 0xcf, 0x38, 0xcb, 0xcc, 0x3a, 0x7b, 0x74, 0x01, 0x1b, 0xc9,
+	0x75, 0x40, 0x4a, 0xb0, 0xd7, 0xfc, 0xb1, 0xd3, 0x31, 0xda, 0x9d, 0xe3, 0x8e, 0x66, 0xbc, 0xbe,
+	0x6c, 0xb7, 0xb4, 0x7a, 0xe3, 0xac, 0xa1, 0x9d, 0x16, 0x96, 0x48, 0x01, 0x36, 0x51, 0xa7, 0x5d,
+	0x1e, 0x9f, 0x5c, 0x68, 0xa7, 0x05, 0x85, 0x14, 0x61, 0x0b, 0x25, 0xa7, 0x8d, 0xb6, 0x14, 0x65,
+	0x04, 0x5b, 0x72, 0x01, 0x08, 0xb6, 0xf3, 0x4e, 0xa7, 0x35, 0x8f, 0x0d, 0x75, 0x53, 0x6c, 0x28,
+	0x99, 0x60, 0x63, 0x50, 0x9a, 0x3f, 0x92, 0xe4, 0x0b, 0x78, 0x38, 0xc1, 0x69, 0xb4, 0x5e, 0x9f,
+	0x5c, 0x34, 0xea, 0xc6, 0x2b, 0xed, 0x67, 0xa3, 0xae, 0xe9, 0x9d, 0xc6, 0x59, 0xa3, 0x2e, 0xdc,
+	0x9e, 0xfd, 0xa0, 0x37, 0x8f, 0x3b, 0x85, 0x25, 0xa2, 0xc2, 0xae, 0x18, 0xb7, 0x29, 0x65, 0x4b,
+	0x6b, 0x16, 0x94, 0x47, 0x43, 0xc8, 0xcf, 0x34, 0x1d, 0x79, 0x00, 0x1f, 0xcc, 0xe1, 0x4e, 0xf8,
+	0x72, 0xb0, 0xa6, 0xb7, 0x8f, 0x91, 0x62, 0x59, 0x84, 0x23, 0x16, 0xe8, 0x00, 0x49, 0xc9, 0x16,
+	0x6c, 0x68, 0xed, 0xc3, 0x67, 0xcf, 0x71, 0x99, 0x21, 0x04, 0xb6, 0xe5, 0x32, 0x31, 0x59, 0x39,
+	0xb9, 0x82, 0x7d, 0xd3, 0x1d, 0xa4, 0x0d, 0xc1, 0xc9, 0xb6, 0x1e, 0xff, 0xcf, 0xb5, 0x44, 0x7d,
+	0x5b, 0xca, 0x9b, 0xe7, 0x91, 0x59, 0xcf, 0xed, 0x53, 0xa7, 0x57, 0x75, 0xfd, 0x5e, 0xad, 0xc7,
+	0x1c, 0xac, 0x7e, 0x4d, 0xaa, 0xa8, 0x67, 0x07, 0x53, 0x3f, 0x85, 0x2f, 0x6c, 0x97, 0xff, 0xad,
+	0x28, 0xdd, 0x2c, 0x5a, 0x7d, 0xf9, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xd7, 0xe3, 0xef,
+	0x39, 0x0e, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/kms/v1/resources.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/kms/v1/resources.pb.go
new file mode 100644
index 00000000..649b641d
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/kms/v1/resources.pb.go
@@ -0,0 +1,486 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/kms/v1/resources.proto
+
+package kms // import "google.golang.org/genproto/googleapis/cloud/kms/v1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// [CryptoKeyPurpose][google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose] describes the capabilities of a [CryptoKey][google.cloud.kms.v1.CryptoKey]. Two
+// keys with the same purpose may use different underlying algorithms, but
+// must support the same set of operations.
+type CryptoKey_CryptoKeyPurpose int32
+
+const (
+	// Not specified.
+	CryptoKey_CRYPTO_KEY_PURPOSE_UNSPECIFIED CryptoKey_CryptoKeyPurpose = 0
+	// [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
+	// [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt] and
+	// [Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt].
+	CryptoKey_ENCRYPT_DECRYPT CryptoKey_CryptoKeyPurpose = 1
+)
+
+var CryptoKey_CryptoKeyPurpose_name = map[int32]string{
+	0: "CRYPTO_KEY_PURPOSE_UNSPECIFIED",
+	1: "ENCRYPT_DECRYPT",
+}
+var CryptoKey_CryptoKeyPurpose_value = map[string]int32{
+	"CRYPTO_KEY_PURPOSE_UNSPECIFIED": 0,
+	"ENCRYPT_DECRYPT":                1,
+}
+
+func (x CryptoKey_CryptoKeyPurpose) String() string {
+	return proto.EnumName(CryptoKey_CryptoKeyPurpose_name, int32(x))
+}
+func (CryptoKey_CryptoKeyPurpose) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8a163c5e6421e08e, []int{1, 0}
+}
+
+// The state of a [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion], indicating if it can be used.
+type CryptoKeyVersion_CryptoKeyVersionState int32
+
+const (
+	// Not specified.
+	CryptoKeyVersion_CRYPTO_KEY_VERSION_STATE_UNSPECIFIED CryptoKeyVersion_CryptoKeyVersionState = 0
+	// This version may be used in [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt] and
+	// [Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt] requests.
+	CryptoKeyVersion_ENABLED CryptoKeyVersion_CryptoKeyVersionState = 1
+	// This version may not be used, but the key material is still available,
+	// and the version can be placed back into the [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] state.
+	CryptoKeyVersion_DISABLED CryptoKeyVersion_CryptoKeyVersionState = 2
+	// This version is destroyed, and the key material is no longer stored.
+	// A version may not leave this state once entered.
+	CryptoKeyVersion_DESTROYED CryptoKeyVersion_CryptoKeyVersionState = 3
+	// This version is scheduled for destruction, and will be destroyed soon.
+	// Call
+	// [RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion]
+	// to put it back into the [DISABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DISABLED] state.
+	CryptoKeyVersion_DESTROY_SCHEDULED CryptoKeyVersion_CryptoKeyVersionState = 4
+)
+
+var CryptoKeyVersion_CryptoKeyVersionState_name = map[int32]string{
+	0: "CRYPTO_KEY_VERSION_STATE_UNSPECIFIED",
+	1: "ENABLED",
+	2: "DISABLED",
+	3: "DESTROYED",
+	4: "DESTROY_SCHEDULED",
+}
+var CryptoKeyVersion_CryptoKeyVersionState_value = map[string]int32{
+	"CRYPTO_KEY_VERSION_STATE_UNSPECIFIED": 0,
+	"ENABLED":           1,
+	"DISABLED":          2,
+	"DESTROYED":         3,
+	"DESTROY_SCHEDULED": 4,
+}
+
+func (x CryptoKeyVersion_CryptoKeyVersionState) String() string {
+	return proto.EnumName(CryptoKeyVersion_CryptoKeyVersionState_name, int32(x))
+}
+func (CryptoKeyVersion_CryptoKeyVersionState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8a163c5e6421e08e, []int{2, 0}
+}
+
+// A [KeyRing][google.cloud.kms.v1.KeyRing] is a toplevel logical grouping of [CryptoKeys][google.cloud.kms.v1.CryptoKey].
+type KeyRing struct {
+	// Output only. The resource name for the [KeyRing][google.cloud.kms.v1.KeyRing] in the format
+	// `projects/*/locations/*/keyRings/*`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Output only. The time at which this [KeyRing][google.cloud.kms.v1.KeyRing] was created.
+	CreateTime           *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *KeyRing) Reset()         { *m = KeyRing{} }
+func (m *KeyRing) String() string { return proto.CompactTextString(m) }
+func (*KeyRing) ProtoMessage()    {}
+func (*KeyRing) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8a163c5e6421e08e, []int{0}
+}
+func (m *KeyRing) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KeyRing.Unmarshal(m, b)
+}
+func (m *KeyRing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KeyRing.Marshal(b, m, deterministic)
+}
+func (dst *KeyRing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeyRing.Merge(dst, src)
+}
+func (m *KeyRing) XXX_Size() int {
+	return xxx_messageInfo_KeyRing.Size(m)
+}
+func (m *KeyRing) XXX_DiscardUnknown() {
+	xxx_messageInfo_KeyRing.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KeyRing proto.InternalMessageInfo
+
+func (m *KeyRing) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *KeyRing) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+// A [CryptoKey][google.cloud.kms.v1.CryptoKey] represents a logical key that can be used for cryptographic
+// operations.
+//
+// A [CryptoKey][google.cloud.kms.v1.CryptoKey] is made up of one or more [versions][google.cloud.kms.v1.CryptoKeyVersion], which
+// represent the actual key material used in cryptographic operations.
+type CryptoKey struct {
+	// Output only. The resource name for this [CryptoKey][google.cloud.kms.v1.CryptoKey] in the format
+	// `projects/*/locations/*/keyRings/*/cryptoKeys/*`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Output only. A copy of the "primary" [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] that will be used
+	// by [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt] when this [CryptoKey][google.cloud.kms.v1.CryptoKey] is given
+	// in [EncryptRequest.name][google.cloud.kms.v1.EncryptRequest.name].
+	//
+	// The [CryptoKey][google.cloud.kms.v1.CryptoKey]'s primary version can be updated via
+	// [UpdateCryptoKeyPrimaryVersion][google.cloud.kms.v1.KeyManagementService.UpdateCryptoKeyPrimaryVersion].
+	Primary *CryptoKeyVersion `protobuf:"bytes,2,opt,name=primary,proto3" json:"primary,omitempty"`
+	// The immutable purpose of this [CryptoKey][google.cloud.kms.v1.CryptoKey]. Currently, the only acceptable
+	// purpose is [ENCRYPT_DECRYPT][google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT].
+	Purpose CryptoKey_CryptoKeyPurpose `protobuf:"varint,3,opt,name=purpose,proto3,enum=google.cloud.kms.v1.CryptoKey_CryptoKeyPurpose" json:"purpose,omitempty"`
+	// Output only. The time at which this [CryptoKey][google.cloud.kms.v1.CryptoKey] was created.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// At [next_rotation_time][google.cloud.kms.v1.CryptoKey.next_rotation_time], the Key Management Service will automatically:
+	//
+	// 1. Create a new version of this [CryptoKey][google.cloud.kms.v1.CryptoKey].
+	// 2. Mark the new version as primary.
+	//
+	// Key rotations performed manually via
+	// [CreateCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.CreateCryptoKeyVersion] and
+	// [UpdateCryptoKeyPrimaryVersion][google.cloud.kms.v1.KeyManagementService.UpdateCryptoKeyPrimaryVersion]
+	// do not affect [next_rotation_time][google.cloud.kms.v1.CryptoKey.next_rotation_time].
+	NextRotationTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=next_rotation_time,json=nextRotationTime,proto3" json:"next_rotation_time,omitempty"`
+	// Controls the rate of automatic rotation.
+	//
+	// Types that are valid to be assigned to RotationSchedule:
+	//	*CryptoKey_RotationPeriod
+	RotationSchedule isCryptoKey_RotationSchedule `protobuf_oneof:"rotation_schedule"`
+	// Labels with user-defined metadata. For more information, see
+	// [Labeling Keys](/kms/docs/labeling-keys).
+	Labels               map[string]string `protobuf:"bytes,10,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *CryptoKey) Reset()         { *m = CryptoKey{} }
+func (m *CryptoKey) String() string { return proto.CompactTextString(m) }
+func (*CryptoKey) ProtoMessage()    {}
+func (*CryptoKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8a163c5e6421e08e, []int{1}
+}
+func (m *CryptoKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CryptoKey.Unmarshal(m, b)
+}
+func (m *CryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CryptoKey.Marshal(b, m, deterministic)
+}
+func (dst *CryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoKey.Merge(dst, src)
+}
+func (m *CryptoKey) XXX_Size() int {
+	return xxx_messageInfo_CryptoKey.Size(m)
+}
+func (m *CryptoKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_CryptoKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CryptoKey proto.InternalMessageInfo
+
+func (m *CryptoKey) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *CryptoKey) GetPrimary() *CryptoKeyVersion {
+	if m != nil {
+		return m.Primary
+	}
+	return nil
+}
+
+func (m *CryptoKey) GetPurpose() CryptoKey_CryptoKeyPurpose {
+	if m != nil {
+		return m.Purpose
+	}
+	return CryptoKey_CRYPTO_KEY_PURPOSE_UNSPECIFIED
+}
+
+func (m *CryptoKey) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *CryptoKey) GetNextRotationTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.NextRotationTime
+	}
+	return nil
+}
+
+type isCryptoKey_RotationSchedule interface {
+	isCryptoKey_RotationSchedule()
+}
+
+type CryptoKey_RotationPeriod struct {
+	RotationPeriod *duration.Duration `protobuf:"bytes,8,opt,name=rotation_period,json=rotationPeriod,proto3,oneof"`
+}
+
+func (*CryptoKey_RotationPeriod) isCryptoKey_RotationSchedule() {}
+
+func (m *CryptoKey) GetRotationSchedule() isCryptoKey_RotationSchedule {
+	if m != nil {
+		return m.RotationSchedule
+	}
+	return nil
+}
+
+func (m *CryptoKey) GetRotationPeriod() *duration.Duration {
+	if x, ok := m.GetRotationSchedule().(*CryptoKey_RotationPeriod); ok {
+		return x.RotationPeriod
+	}
+	return nil
+}
+
+func (m *CryptoKey) GetLabels() map[string]string {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CryptoKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CryptoKey_OneofMarshaler, _CryptoKey_OneofUnmarshaler, _CryptoKey_OneofSizer, []interface{}{
+		(*CryptoKey_RotationPeriod)(nil),
+	}
+}
+
+func _CryptoKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CryptoKey)
+	// rotation_schedule
+	switch x := m.RotationSchedule.(type) {
+	case *CryptoKey_RotationPeriod:
+		b.EncodeVarint(8<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.RotationPeriod); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("CryptoKey.RotationSchedule has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CryptoKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CryptoKey)
+	switch tag {
+	case 8: // rotation_schedule.rotation_period
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(duration.Duration)
+		err := b.DecodeMessage(msg)
+		m.RotationSchedule = &CryptoKey_RotationPeriod{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CryptoKey_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CryptoKey)
+	// rotation_schedule
+	switch x := m.RotationSchedule.(type) {
+	case *CryptoKey_RotationPeriod:
+		s := proto.Size(x.RotationPeriod)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// A [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] represents an individual cryptographic key, and the
+// associated key material.
+//
+// It can be used for cryptographic operations either directly, or via its
+// parent [CryptoKey][google.cloud.kms.v1.CryptoKey], in which case the server will choose the appropriate
+// version for the operation.
+//
+// For security reasons, the raw cryptographic key material represented by a
+// [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] can never be viewed or exported. It can only be used to
+// encrypt or decrypt data when an authorized user or application invokes Cloud
+// KMS.
+type CryptoKeyVersion struct {
+	// Output only. The resource name for this [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] in the format
+	// `projects/*/locations/*/keyRings/*/cryptoKeys/*/cryptoKeyVersions/*`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The current state of the [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion].
+	State CryptoKeyVersion_CryptoKeyVersionState `protobuf:"varint,3,opt,name=state,proto3,enum=google.cloud.kms.v1.CryptoKeyVersion_CryptoKeyVersionState" json:"state,omitempty"`
+	// Output only. The time at which this [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] was created.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Output only. The time this [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]'s key material is scheduled
+	// for destruction. Only present if [state][google.cloud.kms.v1.CryptoKeyVersion.state] is
+	// [DESTROY_SCHEDULED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED].
+	DestroyTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=destroy_time,json=destroyTime,proto3" json:"destroy_time,omitempty"`
+	// Output only. The time this CryptoKeyVersion's key material was
+	// destroyed. Only present if [state][google.cloud.kms.v1.CryptoKeyVersion.state] is
+	// [DESTROYED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROYED].
+	DestroyEventTime     *timestamp.Timestamp `protobuf:"bytes,6,opt,name=destroy_event_time,json=destroyEventTime,proto3" json:"destroy_event_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *CryptoKeyVersion) Reset()         { *m = CryptoKeyVersion{} }
+func (m *CryptoKeyVersion) String() string { return proto.CompactTextString(m) }
+func (*CryptoKeyVersion) ProtoMessage()    {}
+func (*CryptoKeyVersion) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8a163c5e6421e08e, []int{2}
+}
+func (m *CryptoKeyVersion) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CryptoKeyVersion.Unmarshal(m, b)
+}
+func (m *CryptoKeyVersion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CryptoKeyVersion.Marshal(b, m, deterministic)
+}
+func (dst *CryptoKeyVersion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoKeyVersion.Merge(dst, src)
+}
+func (m *CryptoKeyVersion) XXX_Size() int {
+	return xxx_messageInfo_CryptoKeyVersion.Size(m)
+}
+func (m *CryptoKeyVersion) XXX_DiscardUnknown() {
+	xxx_messageInfo_CryptoKeyVersion.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CryptoKeyVersion proto.InternalMessageInfo
+
+func (m *CryptoKeyVersion) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *CryptoKeyVersion) GetState() CryptoKeyVersion_CryptoKeyVersionState {
+	if m != nil {
+		return m.State
+	}
+	return CryptoKeyVersion_CRYPTO_KEY_VERSION_STATE_UNSPECIFIED
+}
+
+func (m *CryptoKeyVersion) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *CryptoKeyVersion) GetDestroyTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.DestroyTime
+	}
+	return nil
+}
+
+func (m *CryptoKeyVersion) GetDestroyEventTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.DestroyEventTime
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*KeyRing)(nil), "google.cloud.kms.v1.KeyRing")
+	proto.RegisterType((*CryptoKey)(nil), "google.cloud.kms.v1.CryptoKey")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.kms.v1.CryptoKey.LabelsEntry")
+	proto.RegisterType((*CryptoKeyVersion)(nil), "google.cloud.kms.v1.CryptoKeyVersion")
+	proto.RegisterEnum("google.cloud.kms.v1.CryptoKey_CryptoKeyPurpose", CryptoKey_CryptoKeyPurpose_name, CryptoKey_CryptoKeyPurpose_value)
+	proto.RegisterEnum("google.cloud.kms.v1.CryptoKeyVersion_CryptoKeyVersionState", CryptoKeyVersion_CryptoKeyVersionState_name, CryptoKeyVersion_CryptoKeyVersionState_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/kms/v1/resources.proto", fileDescriptor_resources_8a163c5e6421e08e)
+}
+
+var fileDescriptor_resources_8a163c5e6421e08e = []byte{
+	// 673 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x51, 0x6e, 0xda, 0x4a,
+	0x14, 0x86, 0x63, 0x20, 0x21, 0x1c, 0x72, 0x13, 0x32, 0xdc, 0xe8, 0x72, 0x51, 0x95, 0x22, 0xda,
+	0x4a, 0xa8, 0x0f, 0xb6, 0x48, 0xa5, 0xaa, 0x6d, 0x54, 0x55, 0x01, 0xbb, 0x0d, 0x22, 0x02, 0x77,
+	0x4c, 0x90, 0x12, 0x45, 0xb2, 0x1c, 0x98, 0x52, 0x0b, 0xec, 0xb1, 0x66, 0x0c, 0xaa, 0x5f, 0xbb,
+	0x87, 0x6e, 0xa2, 0xeb, 0xe8, 0x53, 0x77, 0xd0, 0x9d, 0xf4, 0xb1, 0xf2, 0x78, 0x9c, 0xa6, 0x04,
+	0x35, 0xc9, 0x13, 0x33, 0x67, 0xfe, 0xff, 0x33, 0x67, 0xce, 0x6f, 0xc3, 0xa3, 0x09, 0xa5, 0x93,
+	0x19, 0xd1, 0x46, 0x33, 0x3a, 0x1f, 0x6b, 0x53, 0x8f, 0x6b, 0x8b, 0xa6, 0xc6, 0x08, 0xa7, 0x73,
+	0x36, 0x22, 0x5c, 0x0d, 0x18, 0x0d, 0x29, 0x2a, 0x27, 0x22, 0x55, 0x88, 0xd4, 0xa9, 0xc7, 0xd5,
+	0x45, 0xb3, 0xfa, 0x40, 0x3a, 0x9d, 0xc0, 0xd5, 0x1c, 0xdf, 0xa7, 0xa1, 0x13, 0xba, 0xd4, 0x97,
+	0x96, 0xea, 0xbe, 0x3c, 0x15, 0xbb, 0xcb, 0xf9, 0x07, 0x6d, 0x3c, 0x67, 0x42, 0x20, 0xcf, 0x1f,
+	0x2e, 0x9f, 0x87, 0xae, 0x47, 0x78, 0xe8, 0x78, 0x41, 0x22, 0xa8, 0x9f, 0x43, 0xbe, 0x4b, 0x22,
+	0xec, 0xfa, 0x13, 0x84, 0x20, 0xe7, 0x3b, 0x1e, 0xa9, 0x28, 0x35, 0xa5, 0x51, 0xc0, 0x62, 0x8d,
+	0x0e, 0xa1, 0x38, 0x62, 0xc4, 0x09, 0x89, 0x1d, 0x1b, 0x2b, 0x99, 0x9a, 0xd2, 0x28, 0x1e, 0x54,
+	0x55, 0xf9, 0x47, 0x53, 0xaa, 0x3a, 0x48, 0xa9, 0x18, 0x12, 0x79, 0x5c, 0xa8, 0xff, 0xc8, 0x41,
+	0xa1, 0xcd, 0xa2, 0x20, 0xa4, 0x5d, 0x12, 0xad, 0xc4, 0xbf, 0x81, 0x7c, 0xc0, 0x5c, 0xcf, 0x61,
+	0x91, 0x44, 0x3f, 0x51, 0x57, 0xdc, 0x81, 0x7a, 0x05, 0x19, 0x12, 0xc6, 0x5d, 0xea, 0xe3, 0xd4,
+	0x85, 0x3a, 0x90, 0x0f, 0xe6, 0x2c, 0xa0, 0x9c, 0x54, 0xb2, 0x35, 0xa5, 0xb1, 0x7d, 0xa0, 0xfd,
+	0x1d, 0xf0, 0x7b, 0x65, 0x26, 0x36, 0x9c, 0xfa, 0x97, 0x5b, 0x5d, 0xbf, 0x4f, 0xab, 0xe8, 0x18,
+	0x90, 0x4f, 0x3e, 0x85, 0x36, 0x93, 0xf3, 0x49, 0x18, 0xf9, 0x5b, 0x19, 0xa5, 0xd8, 0x85, 0xa5,
+	0x49, 0x90, 0x74, 0xd8, 0xb9, 0x82, 0x04, 0x84, 0xb9, 0x74, 0x5c, 0xd9, 0x14, 0x98, 0xff, 0x6f,
+	0x60, 0x74, 0x39, 0xeb, 0xe3, 0x35, 0xbc, 0x9d, 0x7a, 0x4c, 0x61, 0x41, 0x2d, 0xd8, 0x98, 0x39,
+	0x97, 0x64, 0xc6, 0x2b, 0x50, 0xcb, 0x36, 0x8a, 0x07, 0x4f, 0x6f, 0xb9, 0x96, 0x13, 0x21, 0x36,
+	0xfc, 0x90, 0x45, 0x58, 0x3a, 0xab, 0x2f, 0xa1, 0x78, 0xad, 0x8c, 0x4a, 0x90, 0x9d, 0x92, 0x48,
+	0x8e, 0x2f, 0x5e, 0xa2, 0x7f, 0x61, 0x7d, 0xe1, 0xcc, 0xe6, 0x49, 0x2c, 0x0a, 0x38, 0xd9, 0xbc,
+	0xca, 0xbc, 0x50, 0xea, 0x5d, 0x28, 0x2d, 0x5f, 0x34, 0xaa, 0xc3, 0x7e, 0x1b, 0x9f, 0x99, 0x83,
+	0xbe, 0xdd, 0x35, 0xce, 0x6c, 0xf3, 0x14, 0x9b, 0x7d, 0xcb, 0xb0, 0x4f, 0x7b, 0x96, 0x69, 0xb4,
+	0x3b, 0x6f, 0x3b, 0x86, 0x5e, 0x5a, 0x43, 0x65, 0xd8, 0x31, 0x7a, 0x42, 0x65, 0xeb, 0x86, 0xf8,
+	0x2d, 0x29, 0xad, 0x32, 0xec, 0x5e, 0xdd, 0x08, 0x1f, 0x7d, 0x24, 0xe3, 0xf9, 0x8c, 0xd4, 0xbf,
+	0x65, 0xaf, 0x3d, 0x42, 0xc6, 0x62, 0x65, 0xc4, 0xde, 0xc3, 0x3a, 0x0f, 0x9d, 0x30, 0xcd, 0xc7,
+	0xe1, 0x9d, 0x02, 0x76, 0xa3, 0x60, 0xc5, 0x08, 0x9c, 0x90, 0x96, 0x93, 0x92, 0xbb, 0x57, 0x52,
+	0x5e, 0xc3, 0xd6, 0x98, 0xf0, 0x90, 0xd1, 0xe8, 0xae, 0x39, 0x2b, 0x4a, 0x7d, 0x1a, 0xb4, 0xd4,
+	0x4e, 0x16, 0xc4, 0x0f, 0x13, 0xc8, 0xc6, 0xed, 0x41, 0x93, 0x2e, 0x23, 0x36, 0x89, 0xb7, 0xf3,
+	0xb3, 0x02, 0x7b, 0x2b, 0xdb, 0x44, 0x0d, 0x78, 0x7c, 0x6d, 0x52, 0x43, 0x03, 0x5b, 0x9d, 0x7e,
+	0xcf, 0xb6, 0x06, 0x47, 0x83, 0xe5, 0x79, 0x15, 0x21, 0x6f, 0xf4, 0x8e, 0x5a, 0x27, 0x86, 0x5e,
+	0x52, 0xd0, 0x16, 0x6c, 0xea, 0x1d, 0x2b, 0xd9, 0x65, 0xd0, 0x3f, 0x50, 0xd0, 0x0d, 0x6b, 0x80,
+	0xfb, 0x67, 0x86, 0x5e, 0xca, 0xa2, 0x3d, 0xd8, 0x95, 0x5b, 0xdb, 0x6a, 0x1f, 0x1b, 0xfa, 0x69,
+	0xac, 0xca, 0xb5, 0xbe, 0x28, 0xf0, 0xdf, 0x88, 0x7a, 0xab, 0x86, 0xd2, 0xda, 0xed, 0x7a, 0x1c,
+	0xa7, 0x9f, 0x48, 0x33, 0x6e, 0xc9, 0x54, 0xce, 0x9f, 0x4b, 0xe5, 0x84, 0xce, 0x1c, 0x7f, 0xa2,
+	0x52, 0x36, 0xd1, 0x26, 0xc4, 0x17, 0x0d, 0x6b, 0xc9, 0x91, 0x13, 0xb8, 0xfc, 0x8f, 0xef, 0xec,
+	0xe1, 0xd4, 0xe3, 0x3f, 0x15, 0xe5, 0x6b, 0xa6, 0xfc, 0x2e, 0xf1, 0xb6, 0xc5, 0x53, 0xba, 0x1e,
+	0x57, 0x87, 0xcd, 0xef, 0x69, 0xf5, 0x42, 0x54, 0x2f, 0xba, 0x1e, 0xbf, 0x18, 0x36, 0x2f, 0x37,
+	0x04, 0xf1, 0xd9, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0xc0, 0x0a, 0x0e, 0xb8, 0x05, 0x00,
+	0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/kms/v1/service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/kms/v1/service.pb.go
new file mode 100644
index 00000000..fed6bc52
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/kms/v1/service.pb.go
@@ -0,0 +1,1905 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/kms/v1/service.proto
+
+package kms // import "google.golang.org/genproto/googleapis/cloud/kms/v1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "github.com/golang/protobuf/ptypes/struct"
+import _ "github.com/golang/protobuf/ptypes/wrappers"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Request message for [KeyManagementService.ListKeyRings][google.cloud.kms.v1.KeyManagementService.ListKeyRings].
+type ListKeyRingsRequest struct {
+	// Required. The resource name of the location associated with the
+	// [KeyRings][google.cloud.kms.v1.KeyRing], in the format `projects/*/locations/*`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional limit on the number of [KeyRings][google.cloud.kms.v1.KeyRing] to include in the
+	// response.  Further [KeyRings][google.cloud.kms.v1.KeyRing] can subsequently be obtained by
+	// including the [ListKeyRingsResponse.next_page_token][google.cloud.kms.v1.ListKeyRingsResponse.next_page_token] in a subsequent
+	// request.  If unspecified, the server will pick an appropriate default.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional pagination token, returned earlier via
+	// [ListKeyRingsResponse.next_page_token][google.cloud.kms.v1.ListKeyRingsResponse.next_page_token].
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListKeyRingsRequest) Reset()         { *m = ListKeyRingsRequest{} }
+func (m *ListKeyRingsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListKeyRingsRequest) ProtoMessage()    {}
+func (*ListKeyRingsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{0}
+}
+func (m *ListKeyRingsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListKeyRingsRequest.Unmarshal(m, b)
+}
+func (m *ListKeyRingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListKeyRingsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListKeyRingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListKeyRingsRequest.Merge(dst, src)
+}
+func (m *ListKeyRingsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListKeyRingsRequest.Size(m)
+}
+func (m *ListKeyRingsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListKeyRingsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListKeyRingsRequest proto.InternalMessageInfo
+
+func (m *ListKeyRingsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListKeyRingsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListKeyRingsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Request message for [KeyManagementService.ListCryptoKeys][google.cloud.kms.v1.KeyManagementService.ListCryptoKeys].
+type ListCryptoKeysRequest struct {
+	// Required. The resource name of the [KeyRing][google.cloud.kms.v1.KeyRing] to list, in the format
+	// `projects/*/locations/*/keyRings/*`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional limit on the number of [CryptoKeys][google.cloud.kms.v1.CryptoKey] to include in the
+	// response.  Further [CryptoKeys][google.cloud.kms.v1.CryptoKey] can subsequently be obtained by
+	// including the [ListCryptoKeysResponse.next_page_token][google.cloud.kms.v1.ListCryptoKeysResponse.next_page_token] in a subsequent
+	// request.  If unspecified, the server will pick an appropriate default.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional pagination token, returned earlier via
+	// [ListCryptoKeysResponse.next_page_token][google.cloud.kms.v1.ListCryptoKeysResponse.next_page_token].
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCryptoKeysRequest) Reset()         { *m = ListCryptoKeysRequest{} }
+func (m *ListCryptoKeysRequest) String() string { return proto.CompactTextString(m) }
+func (*ListCryptoKeysRequest) ProtoMessage()    {}
+func (*ListCryptoKeysRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{1}
+}
+func (m *ListCryptoKeysRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCryptoKeysRequest.Unmarshal(m, b)
+}
+func (m *ListCryptoKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCryptoKeysRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListCryptoKeysRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCryptoKeysRequest.Merge(dst, src)
+}
+func (m *ListCryptoKeysRequest) XXX_Size() int {
+	return xxx_messageInfo_ListCryptoKeysRequest.Size(m)
+}
+func (m *ListCryptoKeysRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCryptoKeysRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListCryptoKeysRequest proto.InternalMessageInfo
+
+func (m *ListCryptoKeysRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListCryptoKeysRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListCryptoKeysRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Request message for [KeyManagementService.ListCryptoKeyVersions][google.cloud.kms.v1.KeyManagementService.ListCryptoKeyVersions].
+type ListCryptoKeyVersionsRequest struct {
+	// Required. The resource name of the [CryptoKey][google.cloud.kms.v1.CryptoKey] to list, in the format
+	// `projects/*/locations/*/keyRings/*/cryptoKeys/*`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional limit on the number of [CryptoKeyVersions][google.cloud.kms.v1.CryptoKeyVersion] to
+	// include in the response. Further [CryptoKeyVersions][google.cloud.kms.v1.CryptoKeyVersion] can
+	// subsequently be obtained by including the
+	// [ListCryptoKeyVersionsResponse.next_page_token][google.cloud.kms.v1.ListCryptoKeyVersionsResponse.next_page_token] in a subsequent request.
+	// If unspecified, the server will pick an appropriate default.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional pagination token, returned earlier via
+	// [ListCryptoKeyVersionsResponse.next_page_token][google.cloud.kms.v1.ListCryptoKeyVersionsResponse.next_page_token].
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCryptoKeyVersionsRequest) Reset()         { *m = ListCryptoKeyVersionsRequest{} }
+func (m *ListCryptoKeyVersionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListCryptoKeyVersionsRequest) ProtoMessage()    {}
+func (*ListCryptoKeyVersionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{2}
+}
+func (m *ListCryptoKeyVersionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCryptoKeyVersionsRequest.Unmarshal(m, b)
+}
+func (m *ListCryptoKeyVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCryptoKeyVersionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListCryptoKeyVersionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCryptoKeyVersionsRequest.Merge(dst, src)
+}
+func (m *ListCryptoKeyVersionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListCryptoKeyVersionsRequest.Size(m)
+}
+func (m *ListCryptoKeyVersionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCryptoKeyVersionsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListCryptoKeyVersionsRequest proto.InternalMessageInfo
+
+func (m *ListCryptoKeyVersionsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListCryptoKeyVersionsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListCryptoKeyVersionsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for [KeyManagementService.ListKeyRings][google.cloud.kms.v1.KeyManagementService.ListKeyRings].
+type ListKeyRingsResponse struct {
+	// The list of [KeyRings][google.cloud.kms.v1.KeyRing].
+	KeyRings []*KeyRing `protobuf:"bytes,1,rep,name=key_rings,json=keyRings,proto3" json:"key_rings,omitempty"`
+	// A token to retrieve next page of results. Pass this value in
+	// [ListKeyRingsRequest.page_token][google.cloud.kms.v1.ListKeyRingsRequest.page_token] to retrieve the next page of results.
+	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// The total number of [KeyRings][google.cloud.kms.v1.KeyRing] that matched the query.
+	TotalSize            int32    `protobuf:"varint,3,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListKeyRingsResponse) Reset()         { *m = ListKeyRingsResponse{} }
+func (m *ListKeyRingsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListKeyRingsResponse) ProtoMessage()    {}
+func (*ListKeyRingsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{3}
+}
+func (m *ListKeyRingsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListKeyRingsResponse.Unmarshal(m, b)
+}
+func (m *ListKeyRingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListKeyRingsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListKeyRingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListKeyRingsResponse.Merge(dst, src)
+}
+func (m *ListKeyRingsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListKeyRingsResponse.Size(m)
+}
+func (m *ListKeyRingsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListKeyRingsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListKeyRingsResponse proto.InternalMessageInfo
+
+func (m *ListKeyRingsResponse) GetKeyRings() []*KeyRing {
+	if m != nil {
+		return m.KeyRings
+	}
+	return nil
+}
+
+func (m *ListKeyRingsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+func (m *ListKeyRingsResponse) GetTotalSize() int32 {
+	if m != nil {
+		return m.TotalSize
+	}
+	return 0
+}
+
+// Response message for [KeyManagementService.ListCryptoKeys][google.cloud.kms.v1.KeyManagementService.ListCryptoKeys].
+type ListCryptoKeysResponse struct {
+	// The list of [CryptoKeys][google.cloud.kms.v1.CryptoKey].
+	CryptoKeys []*CryptoKey `protobuf:"bytes,1,rep,name=crypto_keys,json=cryptoKeys,proto3" json:"crypto_keys,omitempty"`
+	// A token to retrieve next page of results. Pass this value in
+	// [ListCryptoKeysRequest.page_token][google.cloud.kms.v1.ListCryptoKeysRequest.page_token] to retrieve the next page of results.
+	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// The total number of [CryptoKeys][google.cloud.kms.v1.CryptoKey] that matched the query.
+	TotalSize            int32    `protobuf:"varint,3,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCryptoKeysResponse) Reset()         { *m = ListCryptoKeysResponse{} }
+func (m *ListCryptoKeysResponse) String() string { return proto.CompactTextString(m) }
+func (*ListCryptoKeysResponse) ProtoMessage()    {}
+func (*ListCryptoKeysResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{4}
+}
+func (m *ListCryptoKeysResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCryptoKeysResponse.Unmarshal(m, b)
+}
+func (m *ListCryptoKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCryptoKeysResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListCryptoKeysResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCryptoKeysResponse.Merge(dst, src)
+}
+func (m *ListCryptoKeysResponse) XXX_Size() int {
+	return xxx_messageInfo_ListCryptoKeysResponse.Size(m)
+}
+func (m *ListCryptoKeysResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCryptoKeysResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListCryptoKeysResponse proto.InternalMessageInfo
+
+func (m *ListCryptoKeysResponse) GetCryptoKeys() []*CryptoKey {
+	if m != nil {
+		return m.CryptoKeys
+	}
+	return nil
+}
+
+func (m *ListCryptoKeysResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+func (m *ListCryptoKeysResponse) GetTotalSize() int32 {
+	if m != nil {
+		return m.TotalSize
+	}
+	return 0
+}
+
+// Response message for [KeyManagementService.ListCryptoKeyVersions][google.cloud.kms.v1.KeyManagementService.ListCryptoKeyVersions].
+type ListCryptoKeyVersionsResponse struct {
+	// The list of [CryptoKeyVersions][google.cloud.kms.v1.CryptoKeyVersion].
+	CryptoKeyVersions []*CryptoKeyVersion `protobuf:"bytes,1,rep,name=crypto_key_versions,json=cryptoKeyVersions,proto3" json:"crypto_key_versions,omitempty"`
+	// A token to retrieve next page of results. Pass this value in
+	// [ListCryptoKeyVersionsRequest.page_token][google.cloud.kms.v1.ListCryptoKeyVersionsRequest.page_token] to retrieve the next page of
+	// results.
+	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// The total number of [CryptoKeyVersions][google.cloud.kms.v1.CryptoKeyVersion] that matched the
+	// query.
+	TotalSize            int32    `protobuf:"varint,3,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCryptoKeyVersionsResponse) Reset()         { *m = ListCryptoKeyVersionsResponse{} }
+func (m *ListCryptoKeyVersionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListCryptoKeyVersionsResponse) ProtoMessage()    {}
+func (*ListCryptoKeyVersionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{5}
+}
+func (m *ListCryptoKeyVersionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCryptoKeyVersionsResponse.Unmarshal(m, b)
+}
+func (m *ListCryptoKeyVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCryptoKeyVersionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListCryptoKeyVersionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCryptoKeyVersionsResponse.Merge(dst, src)
+}
+func (m *ListCryptoKeyVersionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListCryptoKeyVersionsResponse.Size(m)
+}
+func (m *ListCryptoKeyVersionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCryptoKeyVersionsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListCryptoKeyVersionsResponse proto.InternalMessageInfo
+
+func (m *ListCryptoKeyVersionsResponse) GetCryptoKeyVersions() []*CryptoKeyVersion {
+	if m != nil {
+		return m.CryptoKeyVersions
+	}
+	return nil
+}
+
+func (m *ListCryptoKeyVersionsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+func (m *ListCryptoKeyVersionsResponse) GetTotalSize() int32 {
+	if m != nil {
+		return m.TotalSize
+	}
+	return 0
+}
+
+// Request message for [KeyManagementService.GetKeyRing][google.cloud.kms.v1.KeyManagementService.GetKeyRing].
+type GetKeyRingRequest struct {
+	// The [name][google.cloud.kms.v1.KeyRing.name] of the [KeyRing][google.cloud.kms.v1.KeyRing] to get.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetKeyRingRequest) Reset()         { *m = GetKeyRingRequest{} }
+func (m *GetKeyRingRequest) String() string { return proto.CompactTextString(m) }
+func (*GetKeyRingRequest) ProtoMessage()    {}
+func (*GetKeyRingRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{6}
+}
+func (m *GetKeyRingRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetKeyRingRequest.Unmarshal(m, b)
+}
+func (m *GetKeyRingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetKeyRingRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetKeyRingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetKeyRingRequest.Merge(dst, src)
+}
+func (m *GetKeyRingRequest) XXX_Size() int {
+	return xxx_messageInfo_GetKeyRingRequest.Size(m)
+}
+func (m *GetKeyRingRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetKeyRingRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetKeyRingRequest proto.InternalMessageInfo
+
+func (m *GetKeyRingRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [KeyManagementService.GetCryptoKey][google.cloud.kms.v1.KeyManagementService.GetCryptoKey].
+type GetCryptoKeyRequest struct {
+	// The [name][google.cloud.kms.v1.CryptoKey.name] of the [CryptoKey][google.cloud.kms.v1.CryptoKey] to get.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetCryptoKeyRequest) Reset()         { *m = GetCryptoKeyRequest{} }
+func (m *GetCryptoKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*GetCryptoKeyRequest) ProtoMessage()    {}
+func (*GetCryptoKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{7}
+}
+func (m *GetCryptoKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetCryptoKeyRequest.Unmarshal(m, b)
+}
+func (m *GetCryptoKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetCryptoKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetCryptoKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCryptoKeyRequest.Merge(dst, src)
+}
+func (m *GetCryptoKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_GetCryptoKeyRequest.Size(m)
+}
+func (m *GetCryptoKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetCryptoKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetCryptoKeyRequest proto.InternalMessageInfo
+
+func (m *GetCryptoKeyRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [KeyManagementService.GetCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.GetCryptoKeyVersion].
+type GetCryptoKeyVersionRequest struct {
+	// The [name][google.cloud.kms.v1.CryptoKeyVersion.name] of the [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] to get.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetCryptoKeyVersionRequest) Reset()         { *m = GetCryptoKeyVersionRequest{} }
+func (m *GetCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetCryptoKeyVersionRequest) ProtoMessage()    {}
+func (*GetCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{8}
+}
+func (m *GetCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetCryptoKeyVersionRequest.Unmarshal(m, b)
+}
+func (m *GetCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetCryptoKeyVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCryptoKeyVersionRequest.Merge(dst, src)
+}
+func (m *GetCryptoKeyVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetCryptoKeyVersionRequest.Size(m)
+}
+func (m *GetCryptoKeyVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetCryptoKeyVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetCryptoKeyVersionRequest proto.InternalMessageInfo
+
+func (m *GetCryptoKeyVersionRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [KeyManagementService.CreateKeyRing][google.cloud.kms.v1.KeyManagementService.CreateKeyRing].
+type CreateKeyRingRequest struct {
+	// Required. The resource name of the location associated with the
+	// [KeyRings][google.cloud.kms.v1.KeyRing], in the format `projects/*/locations/*`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. It must be unique within a location and match the regular
+	// expression `[a-zA-Z0-9_-]{1,63}`
+	KeyRingId string `protobuf:"bytes,2,opt,name=key_ring_id,json=keyRingId,proto3" json:"key_ring_id,omitempty"`
+	// A [KeyRing][google.cloud.kms.v1.KeyRing] with initial field values.
+	KeyRing              *KeyRing `protobuf:"bytes,3,opt,name=key_ring,json=keyRing,proto3" json:"key_ring,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateKeyRingRequest) Reset()         { *m = CreateKeyRingRequest{} }
+func (m *CreateKeyRingRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateKeyRingRequest) ProtoMessage()    {}
+func (*CreateKeyRingRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{9}
+}
+func (m *CreateKeyRingRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateKeyRingRequest.Unmarshal(m, b)
+}
+func (m *CreateKeyRingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateKeyRingRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateKeyRingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateKeyRingRequest.Merge(dst, src)
+}
+func (m *CreateKeyRingRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateKeyRingRequest.Size(m)
+}
+func (m *CreateKeyRingRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateKeyRingRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateKeyRingRequest proto.InternalMessageInfo
+
+func (m *CreateKeyRingRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateKeyRingRequest) GetKeyRingId() string {
+	if m != nil {
+		return m.KeyRingId
+	}
+	return ""
+}
+
+func (m *CreateKeyRingRequest) GetKeyRing() *KeyRing {
+	if m != nil {
+		return m.KeyRing
+	}
+	return nil
+}
+
+// Request message for [KeyManagementService.CreateCryptoKey][google.cloud.kms.v1.KeyManagementService.CreateCryptoKey].
+type CreateCryptoKeyRequest struct {
+	// Required. The [name][google.cloud.kms.v1.KeyRing.name] of the KeyRing associated with the
+	// [CryptoKeys][google.cloud.kms.v1.CryptoKey].
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. It must be unique within a KeyRing and match the regular
+	// expression `[a-zA-Z0-9_-]{1,63}`
+	CryptoKeyId string `protobuf:"bytes,2,opt,name=crypto_key_id,json=cryptoKeyId,proto3" json:"crypto_key_id,omitempty"`
+	// A [CryptoKey][google.cloud.kms.v1.CryptoKey] with initial field values.
+	CryptoKey            *CryptoKey `protobuf:"bytes,3,opt,name=crypto_key,json=cryptoKey,proto3" json:"crypto_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *CreateCryptoKeyRequest) Reset()         { *m = CreateCryptoKeyRequest{} }
+func (m *CreateCryptoKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateCryptoKeyRequest) ProtoMessage()    {}
+func (*CreateCryptoKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{10}
+}
+func (m *CreateCryptoKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateCryptoKeyRequest.Unmarshal(m, b)
+}
+func (m *CreateCryptoKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateCryptoKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateCryptoKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCryptoKeyRequest.Merge(dst, src)
+}
+func (m *CreateCryptoKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateCryptoKeyRequest.Size(m)
+}
+func (m *CreateCryptoKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateCryptoKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateCryptoKeyRequest proto.InternalMessageInfo
+
+func (m *CreateCryptoKeyRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateCryptoKeyRequest) GetCryptoKeyId() string {
+	if m != nil {
+		return m.CryptoKeyId
+	}
+	return ""
+}
+
+func (m *CreateCryptoKeyRequest) GetCryptoKey() *CryptoKey {
+	if m != nil {
+		return m.CryptoKey
+	}
+	return nil
+}
+
+// Request message for [KeyManagementService.CreateCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.CreateCryptoKeyVersion].
+type CreateCryptoKeyVersionRequest struct {
+	// Required. The [name][google.cloud.kms.v1.CryptoKey.name] of the [CryptoKey][google.cloud.kms.v1.CryptoKey] associated with
+	// the [CryptoKeyVersions][google.cloud.kms.v1.CryptoKeyVersion].
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// A [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] with initial field values.
+	CryptoKeyVersion     *CryptoKeyVersion `protobuf:"bytes,2,opt,name=crypto_key_version,json=cryptoKeyVersion,proto3" json:"crypto_key_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *CreateCryptoKeyVersionRequest) Reset()         { *m = CreateCryptoKeyVersionRequest{} }
+func (m *CreateCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateCryptoKeyVersionRequest) ProtoMessage()    {}
+func (*CreateCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{11}
+}
+func (m *CreateCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateCryptoKeyVersionRequest.Unmarshal(m, b)
+}
+func (m *CreateCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateCryptoKeyVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCryptoKeyVersionRequest.Merge(dst, src)
+}
+func (m *CreateCryptoKeyVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateCryptoKeyVersionRequest.Size(m)
+}
+func (m *CreateCryptoKeyVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateCryptoKeyVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateCryptoKeyVersionRequest proto.InternalMessageInfo
+
+func (m *CreateCryptoKeyVersionRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateCryptoKeyVersionRequest) GetCryptoKeyVersion() *CryptoKeyVersion {
+	if m != nil {
+		return m.CryptoKeyVersion
+	}
+	return nil
+}
+
+// Request message for [KeyManagementService.UpdateCryptoKey][google.cloud.kms.v1.KeyManagementService.UpdateCryptoKey].
+type UpdateCryptoKeyRequest struct {
+	// [CryptoKey][google.cloud.kms.v1.CryptoKey] with updated values.
+	CryptoKey *CryptoKey `protobuf:"bytes,1,opt,name=crypto_key,json=cryptoKey,proto3" json:"crypto_key,omitempty"`
+	// Required list of fields to be updated in this request.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateCryptoKeyRequest) Reset()         { *m = UpdateCryptoKeyRequest{} }
+func (m *UpdateCryptoKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateCryptoKeyRequest) ProtoMessage()    {}
+func (*UpdateCryptoKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{12}
+}
+func (m *UpdateCryptoKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateCryptoKeyRequest.Unmarshal(m, b)
+}
+func (m *UpdateCryptoKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateCryptoKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateCryptoKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCryptoKeyRequest.Merge(dst, src)
+}
+func (m *UpdateCryptoKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateCryptoKeyRequest.Size(m)
+}
+func (m *UpdateCryptoKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateCryptoKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateCryptoKeyRequest proto.InternalMessageInfo
+
+func (m *UpdateCryptoKeyRequest) GetCryptoKey() *CryptoKey {
+	if m != nil {
+		return m.CryptoKey
+	}
+	return nil
+}
+
+func (m *UpdateCryptoKeyRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Request message for [KeyManagementService.UpdateCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.UpdateCryptoKeyVersion].
+type UpdateCryptoKeyVersionRequest struct {
+	// [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] with updated values.
+	CryptoKeyVersion *CryptoKeyVersion `protobuf:"bytes,1,opt,name=crypto_key_version,json=cryptoKeyVersion,proto3" json:"crypto_key_version,omitempty"`
+	// Required list of fields to be updated in this request.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateCryptoKeyVersionRequest) Reset()         { *m = UpdateCryptoKeyVersionRequest{} }
+func (m *UpdateCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateCryptoKeyVersionRequest) ProtoMessage()    {}
+func (*UpdateCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{13}
+}
+func (m *UpdateCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateCryptoKeyVersionRequest.Unmarshal(m, b)
+}
+func (m *UpdateCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateCryptoKeyVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCryptoKeyVersionRequest.Merge(dst, src)
+}
+func (m *UpdateCryptoKeyVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateCryptoKeyVersionRequest.Size(m)
+}
+func (m *UpdateCryptoKeyVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateCryptoKeyVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateCryptoKeyVersionRequest proto.InternalMessageInfo
+
+func (m *UpdateCryptoKeyVersionRequest) GetCryptoKeyVersion() *CryptoKeyVersion {
+	if m != nil {
+		return m.CryptoKeyVersion
+	}
+	return nil
+}
+
+func (m *UpdateCryptoKeyVersionRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Request message for [KeyManagementService.Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt].
+type EncryptRequest struct {
+	// Required. The resource name of the [CryptoKey][google.cloud.kms.v1.CryptoKey] or [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]
+	// to use for encryption.
+	//
+	// If a [CryptoKey][google.cloud.kms.v1.CryptoKey] is specified, the server will use its
+	// [primary version][google.cloud.kms.v1.CryptoKey.primary].
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The data to encrypt. Must be no larger than 64KiB.
+	Plaintext []byte `protobuf:"bytes,2,opt,name=plaintext,proto3" json:"plaintext,omitempty"`
+	// Optional data that, if specified, must also be provided during decryption
+	// through [DecryptRequest.additional_authenticated_data][google.cloud.kms.v1.DecryptRequest.additional_authenticated_data].  Must be no
+	// larger than 64KiB.
+	AdditionalAuthenticatedData []byte   `protobuf:"bytes,3,opt,name=additional_authenticated_data,json=additionalAuthenticatedData,proto3" json:"additional_authenticated_data,omitempty"`
+	XXX_NoUnkeyedLiteral        struct{} `json:"-"`
+	XXX_unrecognized            []byte   `json:"-"`
+	XXX_sizecache               int32    `json:"-"`
+}
+
+func (m *EncryptRequest) Reset()         { *m = EncryptRequest{} }
+func (m *EncryptRequest) String() string { return proto.CompactTextString(m) }
+func (*EncryptRequest) ProtoMessage()    {}
+func (*EncryptRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{14}
+}
+func (m *EncryptRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EncryptRequest.Unmarshal(m, b)
+}
+func (m *EncryptRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EncryptRequest.Marshal(b, m, deterministic)
+}
+func (dst *EncryptRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EncryptRequest.Merge(dst, src)
+}
+func (m *EncryptRequest) XXX_Size() int {
+	return xxx_messageInfo_EncryptRequest.Size(m)
+}
+func (m *EncryptRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_EncryptRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EncryptRequest proto.InternalMessageInfo
+
+func (m *EncryptRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *EncryptRequest) GetPlaintext() []byte {
+	if m != nil {
+		return m.Plaintext
+	}
+	return nil
+}
+
+func (m *EncryptRequest) GetAdditionalAuthenticatedData() []byte {
+	if m != nil {
+		return m.AdditionalAuthenticatedData
+	}
+	return nil
+}
+
+// Request message for [KeyManagementService.Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt].
+type DecryptRequest struct {
+	// Required. The resource name of the [CryptoKey][google.cloud.kms.v1.CryptoKey] to use for decryption.
+	// The server will choose the appropriate version.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required. The encrypted data originally returned in
+	// [EncryptResponse.ciphertext][google.cloud.kms.v1.EncryptResponse.ciphertext].
+	Ciphertext []byte `protobuf:"bytes,2,opt,name=ciphertext,proto3" json:"ciphertext,omitempty"`
+	// Optional data that must match the data originally supplied in
+	// [EncryptRequest.additional_authenticated_data][google.cloud.kms.v1.EncryptRequest.additional_authenticated_data].
+	AdditionalAuthenticatedData []byte   `protobuf:"bytes,3,opt,name=additional_authenticated_data,json=additionalAuthenticatedData,proto3" json:"additional_authenticated_data,omitempty"`
+	XXX_NoUnkeyedLiteral        struct{} `json:"-"`
+	XXX_unrecognized            []byte   `json:"-"`
+	XXX_sizecache               int32    `json:"-"`
+}
+
+func (m *DecryptRequest) Reset()         { *m = DecryptRequest{} }
+func (m *DecryptRequest) String() string { return proto.CompactTextString(m) }
+func (*DecryptRequest) ProtoMessage()    {}
+func (*DecryptRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{15}
+}
+func (m *DecryptRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DecryptRequest.Unmarshal(m, b)
+}
+func (m *DecryptRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DecryptRequest.Marshal(b, m, deterministic)
+}
+func (dst *DecryptRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DecryptRequest.Merge(dst, src)
+}
+func (m *DecryptRequest) XXX_Size() int {
+	return xxx_messageInfo_DecryptRequest.Size(m)
+}
+func (m *DecryptRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DecryptRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DecryptRequest proto.InternalMessageInfo
+
+func (m *DecryptRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *DecryptRequest) GetCiphertext() []byte {
+	if m != nil {
+		return m.Ciphertext
+	}
+	return nil
+}
+
+func (m *DecryptRequest) GetAdditionalAuthenticatedData() []byte {
+	if m != nil {
+		return m.AdditionalAuthenticatedData
+	}
+	return nil
+}
+
+// Response message for [KeyManagementService.Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt].
+type DecryptResponse struct {
+	// The decrypted data originally supplied in [EncryptRequest.plaintext][google.cloud.kms.v1.EncryptRequest.plaintext].
+	Plaintext            []byte   `protobuf:"bytes,1,opt,name=plaintext,proto3" json:"plaintext,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DecryptResponse) Reset()         { *m = DecryptResponse{} }
+func (m *DecryptResponse) String() string { return proto.CompactTextString(m) }
+func (*DecryptResponse) ProtoMessage()    {}
+func (*DecryptResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{16}
+}
+func (m *DecryptResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DecryptResponse.Unmarshal(m, b)
+}
+func (m *DecryptResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DecryptResponse.Marshal(b, m, deterministic)
+}
+func (dst *DecryptResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DecryptResponse.Merge(dst, src)
+}
+func (m *DecryptResponse) XXX_Size() int {
+	return xxx_messageInfo_DecryptResponse.Size(m)
+}
+func (m *DecryptResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DecryptResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DecryptResponse proto.InternalMessageInfo
+
+func (m *DecryptResponse) GetPlaintext() []byte {
+	if m != nil {
+		return m.Plaintext
+	}
+	return nil
+}
+
+// Response message for [KeyManagementService.Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt].
+type EncryptResponse struct {
+	// The resource name of the [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] used in encryption.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The encrypted data.
+	Ciphertext           []byte   `protobuf:"bytes,2,opt,name=ciphertext,proto3" json:"ciphertext,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EncryptResponse) Reset()         { *m = EncryptResponse{} }
+func (m *EncryptResponse) String() string { return proto.CompactTextString(m) }
+func (*EncryptResponse) ProtoMessage()    {}
+func (*EncryptResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{17}
+}
+func (m *EncryptResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EncryptResponse.Unmarshal(m, b)
+}
+func (m *EncryptResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EncryptResponse.Marshal(b, m, deterministic)
+}
+func (dst *EncryptResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EncryptResponse.Merge(dst, src)
+}
+func (m *EncryptResponse) XXX_Size() int {
+	return xxx_messageInfo_EncryptResponse.Size(m)
+}
+func (m *EncryptResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_EncryptResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EncryptResponse proto.InternalMessageInfo
+
+func (m *EncryptResponse) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *EncryptResponse) GetCiphertext() []byte {
+	if m != nil {
+		return m.Ciphertext
+	}
+	return nil
+}
+
+// Request message for [KeyManagementService.UpdateCryptoKeyPrimaryVersion][google.cloud.kms.v1.KeyManagementService.UpdateCryptoKeyPrimaryVersion].
+type UpdateCryptoKeyPrimaryVersionRequest struct {
+	// The resource name of the [CryptoKey][google.cloud.kms.v1.CryptoKey] to update.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The id of the child [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] to use as primary.
+	CryptoKeyVersionId   string   `protobuf:"bytes,2,opt,name=crypto_key_version_id,json=cryptoKeyVersionId,proto3" json:"crypto_key_version_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateCryptoKeyPrimaryVersionRequest) Reset()         { *m = UpdateCryptoKeyPrimaryVersionRequest{} }
+func (m *UpdateCryptoKeyPrimaryVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateCryptoKeyPrimaryVersionRequest) ProtoMessage()    {}
+func (*UpdateCryptoKeyPrimaryVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{18}
+}
+func (m *UpdateCryptoKeyPrimaryVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Unmarshal(m, b)
+}
+func (m *UpdateCryptoKeyPrimaryVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateCryptoKeyPrimaryVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Merge(dst, src)
+}
+func (m *UpdateCryptoKeyPrimaryVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.Size(m)
+}
+func (m *UpdateCryptoKeyPrimaryVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateCryptoKeyPrimaryVersionRequest proto.InternalMessageInfo
+
+func (m *UpdateCryptoKeyPrimaryVersionRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *UpdateCryptoKeyPrimaryVersionRequest) GetCryptoKeyVersionId() string {
+	if m != nil {
+		return m.CryptoKeyVersionId
+	}
+	return ""
+}
+
+// Request message for [KeyManagementService.DestroyCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.DestroyCryptoKeyVersion].
+type DestroyCryptoKeyVersionRequest struct {
+	// The resource name of the [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] to destroy.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DestroyCryptoKeyVersionRequest) Reset()         { *m = DestroyCryptoKeyVersionRequest{} }
+func (m *DestroyCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*DestroyCryptoKeyVersionRequest) ProtoMessage()    {}
+func (*DestroyCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{19}
+}
+func (m *DestroyCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DestroyCryptoKeyVersionRequest.Unmarshal(m, b)
+}
+func (m *DestroyCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DestroyCryptoKeyVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *DestroyCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DestroyCryptoKeyVersionRequest.Merge(dst, src)
+}
+func (m *DestroyCryptoKeyVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_DestroyCryptoKeyVersionRequest.Size(m)
+}
+func (m *DestroyCryptoKeyVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DestroyCryptoKeyVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DestroyCryptoKeyVersionRequest proto.InternalMessageInfo
+
+func (m *DestroyCryptoKeyVersionRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [KeyManagementService.RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion].
+type RestoreCryptoKeyVersionRequest struct {
+	// The resource name of the [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] to restore.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RestoreCryptoKeyVersionRequest) Reset()         { *m = RestoreCryptoKeyVersionRequest{} }
+func (m *RestoreCryptoKeyVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*RestoreCryptoKeyVersionRequest) ProtoMessage()    {}
+func (*RestoreCryptoKeyVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_service_1843fd264e2d923a, []int{20}
+}
+func (m *RestoreCryptoKeyVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RestoreCryptoKeyVersionRequest.Unmarshal(m, b)
+}
+func (m *RestoreCryptoKeyVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RestoreCryptoKeyVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *RestoreCryptoKeyVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RestoreCryptoKeyVersionRequest.Merge(dst, src)
+}
+func (m *RestoreCryptoKeyVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_RestoreCryptoKeyVersionRequest.Size(m)
+}
+func (m *RestoreCryptoKeyVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RestoreCryptoKeyVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RestoreCryptoKeyVersionRequest proto.InternalMessageInfo
+
+func (m *RestoreCryptoKeyVersionRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*ListKeyRingsRequest)(nil), "google.cloud.kms.v1.ListKeyRingsRequest")
+	proto.RegisterType((*ListCryptoKeysRequest)(nil), "google.cloud.kms.v1.ListCryptoKeysRequest")
+	proto.RegisterType((*ListCryptoKeyVersionsRequest)(nil), "google.cloud.kms.v1.ListCryptoKeyVersionsRequest")
+	proto.RegisterType((*ListKeyRingsResponse)(nil), "google.cloud.kms.v1.ListKeyRingsResponse")
+	proto.RegisterType((*ListCryptoKeysResponse)(nil), "google.cloud.kms.v1.ListCryptoKeysResponse")
+	proto.RegisterType((*ListCryptoKeyVersionsResponse)(nil), "google.cloud.kms.v1.ListCryptoKeyVersionsResponse")
+	proto.RegisterType((*GetKeyRingRequest)(nil), "google.cloud.kms.v1.GetKeyRingRequest")
+	proto.RegisterType((*GetCryptoKeyRequest)(nil), "google.cloud.kms.v1.GetCryptoKeyRequest")
+	proto.RegisterType((*GetCryptoKeyVersionRequest)(nil), "google.cloud.kms.v1.GetCryptoKeyVersionRequest")
+	proto.RegisterType((*CreateKeyRingRequest)(nil), "google.cloud.kms.v1.CreateKeyRingRequest")
+	proto.RegisterType((*CreateCryptoKeyRequest)(nil), "google.cloud.kms.v1.CreateCryptoKeyRequest")
+	proto.RegisterType((*CreateCryptoKeyVersionRequest)(nil), "google.cloud.kms.v1.CreateCryptoKeyVersionRequest")
+	proto.RegisterType((*UpdateCryptoKeyRequest)(nil), "google.cloud.kms.v1.UpdateCryptoKeyRequest")
+	proto.RegisterType((*UpdateCryptoKeyVersionRequest)(nil), "google.cloud.kms.v1.UpdateCryptoKeyVersionRequest")
+	proto.RegisterType((*EncryptRequest)(nil), "google.cloud.kms.v1.EncryptRequest")
+	proto.RegisterType((*DecryptRequest)(nil), "google.cloud.kms.v1.DecryptRequest")
+	proto.RegisterType((*DecryptResponse)(nil), "google.cloud.kms.v1.DecryptResponse")
+	proto.RegisterType((*EncryptResponse)(nil), "google.cloud.kms.v1.EncryptResponse")
+	proto.RegisterType((*UpdateCryptoKeyPrimaryVersionRequest)(nil), "google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest")
+	proto.RegisterType((*DestroyCryptoKeyVersionRequest)(nil), "google.cloud.kms.v1.DestroyCryptoKeyVersionRequest")
+	proto.RegisterType((*RestoreCryptoKeyVersionRequest)(nil), "google.cloud.kms.v1.RestoreCryptoKeyVersionRequest")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// KeyManagementServiceClient is the client API for KeyManagementService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type KeyManagementServiceClient interface {
+	// Lists [KeyRings][google.cloud.kms.v1.KeyRing].
+	ListKeyRings(ctx context.Context, in *ListKeyRingsRequest, opts ...grpc.CallOption) (*ListKeyRingsResponse, error)
+	// Lists [CryptoKeys][google.cloud.kms.v1.CryptoKey].
+	ListCryptoKeys(ctx context.Context, in *ListCryptoKeysRequest, opts ...grpc.CallOption) (*ListCryptoKeysResponse, error)
+	// Lists [CryptoKeyVersions][google.cloud.kms.v1.CryptoKeyVersion].
+	ListCryptoKeyVersions(ctx context.Context, in *ListCryptoKeyVersionsRequest, opts ...grpc.CallOption) (*ListCryptoKeyVersionsResponse, error)
+	// Returns metadata for a given [KeyRing][google.cloud.kms.v1.KeyRing].
+	GetKeyRing(ctx context.Context, in *GetKeyRingRequest, opts ...grpc.CallOption) (*KeyRing, error)
+	// Returns metadata for a given [CryptoKey][google.cloud.kms.v1.CryptoKey], as well as its
+	// [primary][google.cloud.kms.v1.CryptoKey.primary] [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion].
+	GetCryptoKey(ctx context.Context, in *GetCryptoKeyRequest, opts ...grpc.CallOption) (*CryptoKey, error)
+	// Returns metadata for a given [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion].
+	GetCryptoKeyVersion(ctx context.Context, in *GetCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error)
+	// Create a new [KeyRing][google.cloud.kms.v1.KeyRing] in a given Project and Location.
+	CreateKeyRing(ctx context.Context, in *CreateKeyRingRequest, opts ...grpc.CallOption) (*KeyRing, error)
+	// Create a new [CryptoKey][google.cloud.kms.v1.CryptoKey] within a [KeyRing][google.cloud.kms.v1.KeyRing].
+	//
+	// [CryptoKey.purpose][google.cloud.kms.v1.CryptoKey.purpose] is required.
+	CreateCryptoKey(ctx context.Context, in *CreateCryptoKeyRequest, opts ...grpc.CallOption) (*CryptoKey, error)
+	// Create a new [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] in a [CryptoKey][google.cloud.kms.v1.CryptoKey].
+	//
+	// The server will assign the next sequential id. If unset,
+	// [state][google.cloud.kms.v1.CryptoKeyVersion.state] will be set to
+	// [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED].
+	CreateCryptoKeyVersion(ctx context.Context, in *CreateCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error)
+	// Update a [CryptoKey][google.cloud.kms.v1.CryptoKey].
+	UpdateCryptoKey(ctx context.Context, in *UpdateCryptoKeyRequest, opts ...grpc.CallOption) (*CryptoKey, error)
+	// Update a [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]'s metadata.
+	//
+	// [state][google.cloud.kms.v1.CryptoKeyVersion.state] may be changed between
+	// [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] and
+	// [DISABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DISABLED] using this
+	// method. See [DestroyCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.DestroyCryptoKeyVersion] and [RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion] to
+	// move between other states.
+	UpdateCryptoKeyVersion(ctx context.Context, in *UpdateCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error)
+	// Encrypts data, so that it can only be recovered by a call to [Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt].
+	Encrypt(ctx context.Context, in *EncryptRequest, opts ...grpc.CallOption) (*EncryptResponse, error)
+	// Decrypts data that was protected by [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt].
+	Decrypt(ctx context.Context, in *DecryptRequest, opts ...grpc.CallOption) (*DecryptResponse, error)
+	// Update the version of a [CryptoKey][google.cloud.kms.v1.CryptoKey] that will be used in [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt]
+	UpdateCryptoKeyPrimaryVersion(ctx context.Context, in *UpdateCryptoKeyPrimaryVersionRequest, opts ...grpc.CallOption) (*CryptoKey, error)
+	// Schedule a [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] for destruction.
+	//
+	// Upon calling this method, [CryptoKeyVersion.state][google.cloud.kms.v1.CryptoKeyVersion.state] will be set to
+	// [DESTROY_SCHEDULED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED]
+	// and [destroy_time][google.cloud.kms.v1.CryptoKeyVersion.destroy_time] will be set to a time 24
+	// hours in the future, at which point the [state][google.cloud.kms.v1.CryptoKeyVersion.state]
+	// will be changed to
+	// [DESTROYED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROYED], and the key
+	// material will be irrevocably destroyed.
+	//
+	// Before the [destroy_time][google.cloud.kms.v1.CryptoKeyVersion.destroy_time] is reached,
+	// [RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion] may be called to reverse the process.
+	DestroyCryptoKeyVersion(ctx context.Context, in *DestroyCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error)
+	// Restore a [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] in the
+	// [DESTROY_SCHEDULED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED],
+	// state.
+	//
+	// Upon restoration of the CryptoKeyVersion, [state][google.cloud.kms.v1.CryptoKeyVersion.state]
+	// will be set to [DISABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DISABLED],
+	// and [destroy_time][google.cloud.kms.v1.CryptoKeyVersion.destroy_time] will be cleared.
+	RestoreCryptoKeyVersion(ctx context.Context, in *RestoreCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error)
+}
+
+type keyManagementServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewKeyManagementServiceClient(cc *grpc.ClientConn) KeyManagementServiceClient {
+	return &keyManagementServiceClient{cc}
+}
+
+func (c *keyManagementServiceClient) ListKeyRings(ctx context.Context, in *ListKeyRingsRequest, opts ...grpc.CallOption) (*ListKeyRingsResponse, error) {
+	out := new(ListKeyRingsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/ListKeyRings", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) ListCryptoKeys(ctx context.Context, in *ListCryptoKeysRequest, opts ...grpc.CallOption) (*ListCryptoKeysResponse, error) {
+	out := new(ListCryptoKeysResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/ListCryptoKeys", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) ListCryptoKeyVersions(ctx context.Context, in *ListCryptoKeyVersionsRequest, opts ...grpc.CallOption) (*ListCryptoKeyVersionsResponse, error) {
+	out := new(ListCryptoKeyVersionsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/ListCryptoKeyVersions", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) GetKeyRing(ctx context.Context, in *GetKeyRingRequest, opts ...grpc.CallOption) (*KeyRing, error) {
+	out := new(KeyRing)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/GetKeyRing", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) GetCryptoKey(ctx context.Context, in *GetCryptoKeyRequest, opts ...grpc.CallOption) (*CryptoKey, error) {
+	out := new(CryptoKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/GetCryptoKey", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) GetCryptoKeyVersion(ctx context.Context, in *GetCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error) {
+	out := new(CryptoKeyVersion)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/GetCryptoKeyVersion", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) CreateKeyRing(ctx context.Context, in *CreateKeyRingRequest, opts ...grpc.CallOption) (*KeyRing, error) {
+	out := new(KeyRing)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/CreateKeyRing", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) CreateCryptoKey(ctx context.Context, in *CreateCryptoKeyRequest, opts ...grpc.CallOption) (*CryptoKey, error) {
+	out := new(CryptoKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/CreateCryptoKey", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) CreateCryptoKeyVersion(ctx context.Context, in *CreateCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error) {
+	out := new(CryptoKeyVersion)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/CreateCryptoKeyVersion", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) UpdateCryptoKey(ctx context.Context, in *UpdateCryptoKeyRequest, opts ...grpc.CallOption) (*CryptoKey, error) {
+	out := new(CryptoKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKey", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) UpdateCryptoKeyVersion(ctx context.Context, in *UpdateCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error) {
+	out := new(CryptoKeyVersion)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyVersion", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) Encrypt(ctx context.Context, in *EncryptRequest, opts ...grpc.CallOption) (*EncryptResponse, error) {
+	out := new(EncryptResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/Encrypt", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) Decrypt(ctx context.Context, in *DecryptRequest, opts ...grpc.CallOption) (*DecryptResponse, error) {
+	out := new(DecryptResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/Decrypt", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) UpdateCryptoKeyPrimaryVersion(ctx context.Context, in *UpdateCryptoKeyPrimaryVersionRequest, opts ...grpc.CallOption) (*CryptoKey, error) {
+	out := new(CryptoKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) DestroyCryptoKeyVersion(ctx context.Context, in *DestroyCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error) {
+	out := new(CryptoKeyVersion)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *keyManagementServiceClient) RestoreCryptoKeyVersion(ctx context.Context, in *RestoreCryptoKeyVersionRequest, opts ...grpc.CallOption) (*CryptoKeyVersion, error) {
+	out := new(CryptoKeyVersion)
+	err := c.cc.Invoke(ctx, "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// KeyManagementServiceServer is the server API for KeyManagementService service.
+type KeyManagementServiceServer interface {
+	// Lists [KeyRings][google.cloud.kms.v1.KeyRing].
+	ListKeyRings(context.Context, *ListKeyRingsRequest) (*ListKeyRingsResponse, error)
+	// Lists [CryptoKeys][google.cloud.kms.v1.CryptoKey].
+	ListCryptoKeys(context.Context, *ListCryptoKeysRequest) (*ListCryptoKeysResponse, error)
+	// Lists [CryptoKeyVersions][google.cloud.kms.v1.CryptoKeyVersion].
+	ListCryptoKeyVersions(context.Context, *ListCryptoKeyVersionsRequest) (*ListCryptoKeyVersionsResponse, error)
+	// Returns metadata for a given [KeyRing][google.cloud.kms.v1.KeyRing].
+	GetKeyRing(context.Context, *GetKeyRingRequest) (*KeyRing, error)
+	// Returns metadata for a given [CryptoKey][google.cloud.kms.v1.CryptoKey], as well as its
+	// [primary][google.cloud.kms.v1.CryptoKey.primary] [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion].
+	GetCryptoKey(context.Context, *GetCryptoKeyRequest) (*CryptoKey, error)
+	// Returns metadata for a given [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion].
+	GetCryptoKeyVersion(context.Context, *GetCryptoKeyVersionRequest) (*CryptoKeyVersion, error)
+	// Create a new [KeyRing][google.cloud.kms.v1.KeyRing] in a given Project and Location.
+	CreateKeyRing(context.Context, *CreateKeyRingRequest) (*KeyRing, error)
+	// Create a new [CryptoKey][google.cloud.kms.v1.CryptoKey] within a [KeyRing][google.cloud.kms.v1.KeyRing].
+	//
+	// [CryptoKey.purpose][google.cloud.kms.v1.CryptoKey.purpose] is required.
+	CreateCryptoKey(context.Context, *CreateCryptoKeyRequest) (*CryptoKey, error)
+	// Create a new [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] in a [CryptoKey][google.cloud.kms.v1.CryptoKey].
+	//
+	// The server will assign the next sequential id. If unset,
+	// [state][google.cloud.kms.v1.CryptoKeyVersion.state] will be set to
+	// [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED].
+	CreateCryptoKeyVersion(context.Context, *CreateCryptoKeyVersionRequest) (*CryptoKeyVersion, error)
+	// Update a [CryptoKey][google.cloud.kms.v1.CryptoKey].
+	UpdateCryptoKey(context.Context, *UpdateCryptoKeyRequest) (*CryptoKey, error)
+	// Update a [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]'s metadata.
+	//
+	// [state][google.cloud.kms.v1.CryptoKeyVersion.state] may be changed between
+	// [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] and
+	// [DISABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DISABLED] using this
+	// method. See [DestroyCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.DestroyCryptoKeyVersion] and [RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion] to
+	// move between other states.
+	UpdateCryptoKeyVersion(context.Context, *UpdateCryptoKeyVersionRequest) (*CryptoKeyVersion, error)
+	// Encrypts data, so that it can only be recovered by a call to [Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt].
+	Encrypt(context.Context, *EncryptRequest) (*EncryptResponse, error)
+	// Decrypts data that was protected by [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt].
+	Decrypt(context.Context, *DecryptRequest) (*DecryptResponse, error)
+	// Update the version of a [CryptoKey][google.cloud.kms.v1.CryptoKey] that will be used in [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt]
+	UpdateCryptoKeyPrimaryVersion(context.Context, *UpdateCryptoKeyPrimaryVersionRequest) (*CryptoKey, error)
+	// Schedule a [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] for destruction.
+	//
+	// Upon calling this method, [CryptoKeyVersion.state][google.cloud.kms.v1.CryptoKeyVersion.state] will be set to
+	// [DESTROY_SCHEDULED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED]
+	// and [destroy_time][google.cloud.kms.v1.CryptoKeyVersion.destroy_time] will be set to a time 24
+	// hours in the future, at which point the [state][google.cloud.kms.v1.CryptoKeyVersion.state]
+	// will be changed to
+	// [DESTROYED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROYED], and the key
+	// material will be irrevocably destroyed.
+	//
+	// Before the [destroy_time][google.cloud.kms.v1.CryptoKeyVersion.destroy_time] is reached,
+	// [RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion] may be called to reverse the process.
+	DestroyCryptoKeyVersion(context.Context, *DestroyCryptoKeyVersionRequest) (*CryptoKeyVersion, error)
+	// Restore a [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] in the
+	// [DESTROY_SCHEDULED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED],
+	// state.
+	//
+	// Upon restoration of the CryptoKeyVersion, [state][google.cloud.kms.v1.CryptoKeyVersion.state]
+	// will be set to [DISABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DISABLED],
+	// and [destroy_time][google.cloud.kms.v1.CryptoKeyVersion.destroy_time] will be cleared.
+	RestoreCryptoKeyVersion(context.Context, *RestoreCryptoKeyVersionRequest) (*CryptoKeyVersion, error)
+}
+
+func RegisterKeyManagementServiceServer(s *grpc.Server, srv KeyManagementServiceServer) {
+	s.RegisterService(&_KeyManagementService_serviceDesc, srv)
+}
+
+func _KeyManagementService_ListKeyRings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListKeyRingsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).ListKeyRings(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/ListKeyRings",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).ListKeyRings(ctx, req.(*ListKeyRingsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_ListCryptoKeys_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListCryptoKeysRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).ListCryptoKeys(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/ListCryptoKeys",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).ListCryptoKeys(ctx, req.(*ListCryptoKeysRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_ListCryptoKeyVersions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListCryptoKeyVersionsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).ListCryptoKeyVersions(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/ListCryptoKeyVersions",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).ListCryptoKeyVersions(ctx, req.(*ListCryptoKeyVersionsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_GetKeyRing_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetKeyRingRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).GetKeyRing(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/GetKeyRing",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).GetKeyRing(ctx, req.(*GetKeyRingRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_GetCryptoKey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetCryptoKeyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).GetCryptoKey(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/GetCryptoKey",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).GetCryptoKey(ctx, req.(*GetCryptoKeyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_GetCryptoKeyVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetCryptoKeyVersionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).GetCryptoKeyVersion(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/GetCryptoKeyVersion",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).GetCryptoKeyVersion(ctx, req.(*GetCryptoKeyVersionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_CreateKeyRing_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateKeyRingRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).CreateKeyRing(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/CreateKeyRing",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).CreateKeyRing(ctx, req.(*CreateKeyRingRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_CreateCryptoKey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateCryptoKeyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).CreateCryptoKey(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/CreateCryptoKey",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).CreateCryptoKey(ctx, req.(*CreateCryptoKeyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_CreateCryptoKeyVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateCryptoKeyVersionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).CreateCryptoKeyVersion(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/CreateCryptoKeyVersion",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).CreateCryptoKeyVersion(ctx, req.(*CreateCryptoKeyVersionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_UpdateCryptoKey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateCryptoKeyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).UpdateCryptoKey(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKey",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).UpdateCryptoKey(ctx, req.(*UpdateCryptoKeyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_UpdateCryptoKeyVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateCryptoKeyVersionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).UpdateCryptoKeyVersion(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyVersion",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).UpdateCryptoKeyVersion(ctx, req.(*UpdateCryptoKeyVersionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_Encrypt_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(EncryptRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).Encrypt(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/Encrypt",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).Encrypt(ctx, req.(*EncryptRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_Decrypt_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DecryptRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).Decrypt(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/Decrypt",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).Decrypt(ctx, req.(*DecryptRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_UpdateCryptoKeyPrimaryVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateCryptoKeyPrimaryVersionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).UpdateCryptoKeyPrimaryVersion(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).UpdateCryptoKeyPrimaryVersion(ctx, req.(*UpdateCryptoKeyPrimaryVersionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_DestroyCryptoKeyVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DestroyCryptoKeyVersionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).DestroyCryptoKeyVersion(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).DestroyCryptoKeyVersion(ctx, req.(*DestroyCryptoKeyVersionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _KeyManagementService_RestoreCryptoKeyVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RestoreCryptoKeyVersionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(KeyManagementServiceServer).RestoreCryptoKeyVersion(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(KeyManagementServiceServer).RestoreCryptoKeyVersion(ctx, req.(*RestoreCryptoKeyVersionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _KeyManagementService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.kms.v1.KeyManagementService",
+	HandlerType: (*KeyManagementServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListKeyRings",
+			Handler:    _KeyManagementService_ListKeyRings_Handler,
+		},
+		{
+			MethodName: "ListCryptoKeys",
+			Handler:    _KeyManagementService_ListCryptoKeys_Handler,
+		},
+		{
+			MethodName: "ListCryptoKeyVersions",
+			Handler:    _KeyManagementService_ListCryptoKeyVersions_Handler,
+		},
+		{
+			MethodName: "GetKeyRing",
+			Handler:    _KeyManagementService_GetKeyRing_Handler,
+		},
+		{
+			MethodName: "GetCryptoKey",
+			Handler:    _KeyManagementService_GetCryptoKey_Handler,
+		},
+		{
+			MethodName: "GetCryptoKeyVersion",
+			Handler:    _KeyManagementService_GetCryptoKeyVersion_Handler,
+		},
+		{
+			MethodName: "CreateKeyRing",
+			Handler:    _KeyManagementService_CreateKeyRing_Handler,
+		},
+		{
+			MethodName: "CreateCryptoKey",
+			Handler:    _KeyManagementService_CreateCryptoKey_Handler,
+		},
+		{
+			MethodName: "CreateCryptoKeyVersion",
+			Handler:    _KeyManagementService_CreateCryptoKeyVersion_Handler,
+		},
+		{
+			MethodName: "UpdateCryptoKey",
+			Handler:    _KeyManagementService_UpdateCryptoKey_Handler,
+		},
+		{
+			MethodName: "UpdateCryptoKeyVersion",
+			Handler:    _KeyManagementService_UpdateCryptoKeyVersion_Handler,
+		},
+		{
+			MethodName: "Encrypt",
+			Handler:    _KeyManagementService_Encrypt_Handler,
+		},
+		{
+			MethodName: "Decrypt",
+			Handler:    _KeyManagementService_Decrypt_Handler,
+		},
+		{
+			MethodName: "UpdateCryptoKeyPrimaryVersion",
+			Handler:    _KeyManagementService_UpdateCryptoKeyPrimaryVersion_Handler,
+		},
+		{
+			MethodName: "DestroyCryptoKeyVersion",
+			Handler:    _KeyManagementService_DestroyCryptoKeyVersion_Handler,
+		},
+		{
+			MethodName: "RestoreCryptoKeyVersion",
+			Handler:    _KeyManagementService_RestoreCryptoKeyVersion_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/kms/v1/service.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/kms/v1/service.proto", fileDescriptor_service_1843fd264e2d923a)
+}
+
+var fileDescriptor_service_1843fd264e2d923a = []byte{
+	// 1362 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0xcd, 0x6f, 0xdc, 0xc4,
+	0x1b, 0xc7, 0x35, 0xe9, 0xef, 0xd7, 0x66, 0x9f, 0xa4, 0x0d, 0x9d, 0xb4, 0x69, 0xb4, 0x4d, 0x56,
+	0xc1, 0x2d, 0x25, 0xdd, 0x22, 0x9b, 0xdd, 0x56, 0x40, 0xb7, 0x2a, 0xa8, 0x69, 0xda, 0xa8, 0xda,
+	0x06, 0x22, 0x87, 0x54, 0x50, 0x45, 0xda, 0x4e, 0xed, 0xe9, 0xd6, 0xec, 0xfa, 0x05, 0x7b, 0x36,
+	0x74, 0x0b, 0xbd, 0x70, 0x80, 0x1e, 0x7a, 0x2b, 0x87, 0x22, 0x2e, 0x08, 0x6e, 0x08, 0x0e, 0xdc,
+	0xb8, 0x70, 0xe3, 0xc4, 0x15, 0x55, 0x1c, 0x90, 0x38, 0xf1, 0x0f, 0x70, 0xe3, 0x88, 0x3c, 0x1e,
+	0x7b, 0xd7, 0x5e, 0x7b, 0xdf, 0xba, 0x15, 0xb7, 0xec, 0xf8, 0x99, 0x99, 0xcf, 0x77, 0x9e, 0xc7,
+	0xf3, 0x7c, 0x1d, 0x78, 0xb1, 0x6e, 0xdb, 0xf5, 0x26, 0x55, 0xb4, 0xa6, 0xdd, 0xd2, 0x95, 0x86,
+	0xe9, 0x29, 0x7b, 0x25, 0xc5, 0xa3, 0xee, 0x9e, 0xa1, 0x51, 0xd9, 0x71, 0x6d, 0x66, 0xe3, 0xf9,
+	0x20, 0x44, 0xe6, 0x21, 0x72, 0xc3, 0xf4, 0xe4, 0xbd, 0x52, 0x7e, 0x49, 0xcc, 0x23, 0x8e, 0xa1,
+	0x10, 0xcb, 0xb2, 0x19, 0x61, 0x86, 0x6d, 0x79, 0xc1, 0x94, 0xfc, 0x89, 0xb4, 0x55, 0x5d, 0xea,
+	0xd9, 0x2d, 0x57, 0xa3, 0x61, 0xd0, 0x8a, 0x08, 0xe2, 0xbf, 0x6e, 0xb7, 0xee, 0x28, 0x77, 0x0c,
+	0xda, 0xd4, 0x6b, 0x26, 0xf1, 0x1a, 0x22, 0x62, 0x29, 0x19, 0xe1, 0x31, 0xb7, 0xa5, 0x31, 0xf1,
+	0xb4, 0x90, 0x7c, 0xfa, 0x91, 0x4b, 0x1c, 0x87, 0xba, 0x62, 0x7d, 0xc9, 0x80, 0xf9, 0xeb, 0x86,
+	0xc7, 0xaa, 0xb4, 0xad, 0x1a, 0x56, 0xdd, 0x53, 0xe9, 0x87, 0x2d, 0xea, 0x31, 0xbc, 0x00, 0xfb,
+	0x1d, 0xe2, 0x52, 0x8b, 0x2d, 0xa2, 0x15, 0xb4, 0x9a, 0x53, 0xc5, 0x2f, 0x7c, 0x1c, 0x72, 0x0e,
+	0xa9, 0xd3, 0x9a, 0x67, 0xdc, 0xa7, 0x8b, 0x53, 0x2b, 0x68, 0xf5, 0xff, 0xea, 0xb4, 0x3f, 0xb0,
+	0x6d, 0xdc, 0xa7, 0x78, 0x19, 0x80, 0x3f, 0x64, 0x76, 0x83, 0x5a, 0x8b, 0xfb, 0xf8, 0x44, 0x1e,
+	0xfe, 0xae, 0x3f, 0x20, 0x35, 0xe0, 0xa8, 0xbf, 0xd5, 0x65, 0xb7, 0xed, 0x30, 0xbb, 0x4a, 0xdb,
+	0xcf, 0x75, 0x33, 0x17, 0x96, 0x62, 0x9b, 0xdd, 0xa0, 0xae, 0xe7, 0x9f, 0xfd, 0xf3, 0xdc, 0xf3,
+	0x09, 0x82, 0x23, 0xf1, 0xc3, 0xf4, 0x1c, 0xdb, 0xf2, 0x28, 0x3e, 0x0f, 0xb9, 0x06, 0x6d, 0xd7,
+	0x5c, 0x7f, 0x70, 0x11, 0xad, 0xec, 0x5b, 0x9d, 0x29, 0x2f, 0xc9, 0x29, 0x05, 0x23, 0x8b, 0x99,
+	0xea, 0x74, 0x43, 0x2c, 0x81, 0x4f, 0xc1, 0x9c, 0x45, 0xef, 0xb1, 0x5a, 0xd7, 0xbe, 0x53, 0x7c,
+	0xdf, 0x83, 0xfe, 0xf0, 0x56, 0xb8, 0xb7, 0x8f, 0xc6, 0x6c, 0x46, 0x9a, 0x01, 0xf8, 0x3e, 0x0e,
+	0x9e, 0xe3, 0x23, 0x3e, 0xb9, 0xf4, 0x35, 0x82, 0x85, 0xe4, 0xe1, 0x0b, 0xb8, 0xb7, 0x60, 0x46,
+	0xe3, 0xa3, 0xb5, 0x06, 0x6d, 0x87, 0x78, 0x85, 0x54, 0xbc, 0x68, 0xb6, 0x0a, 0x5a, 0xb4, 0xd0,
+	0xa4, 0x10, 0x7f, 0x46, 0xb0, 0x9c, 0x91, 0x32, 0x41, 0xba, 0x03, 0xf3, 0x1d, 0xd2, 0xda, 0x9e,
+	0x78, 0x2c, 0x88, 0x5f, 0xea, 0x4f, 0x2c, 0x16, 0x53, 0x0f, 0x6b, 0xc9, 0xe5, 0x27, 0xc5, 0xff,
+	0x32, 0x1c, 0xde, 0xa0, 0x61, 0xee, 0xc3, 0x32, 0xc3, 0xf0, 0x3f, 0x8b, 0x98, 0x54, 0x14, 0x19,
+	0xff, 0x5b, 0x3a, 0x0d, 0xf3, 0x1b, 0xb4, 0x23, 0xb3, 0x5f, 0xe8, 0xab, 0x90, 0xef, 0x0e, 0x0d,
+	0x45, 0xf4, 0x99, 0xf1, 0x39, 0x82, 0x23, 0x97, 0x5d, 0x4a, 0x18, 0x4d, 0x90, 0x64, 0x15, 0x7c,
+	0x01, 0x66, 0xc2, 0xda, 0xac, 0x19, 0xba, 0x50, 0x9e, 0x13, 0xf5, 0x77, 0x4d, 0xc7, 0xaf, 0xc3,
+	0x74, 0xf8, 0x9c, 0x6b, 0x1e, 0x54, 0xba, 0x07, 0xc4, 0x54, 0xe9, 0x31, 0x82, 0x85, 0x80, 0xa4,
+	0x47, 0x6a, 0x16, 0x8b, 0x04, 0x07, 0xbb, 0x12, 0x1c, 0xd1, 0xcc, 0x44, 0x39, 0xbb, 0xa6, 0xe3,
+	0x8b, 0x00, 0x9d, 0x18, 0x41, 0x34, 0xa8, 0x5a, 0x73, 0xd1, 0x02, 0xd2, 0x23, 0x04, 0xcb, 0x09,
+	0xaa, 0xc4, 0xa9, 0x66, 0xc1, 0x6d, 0x03, 0xee, 0xad, 0x3e, 0x4e, 0x38, 0x74, 0xf1, 0xbd, 0x90,
+	0x2c, 0x3e, 0xe9, 0x0b, 0x04, 0x0b, 0x3b, 0x8e, 0x9e, 0x76, 0x48, 0x71, 0xa1, 0x68, 0x44, 0xa1,
+	0xf8, 0x02, 0xcc, 0xb4, 0xf8, 0xc2, 0xbc, 0x57, 0x08, 0xce, 0x7c, 0x38, 0x3f, 0x6c, 0x07, 0xf2,
+	0x55, 0xbf, 0x9d, 0x6c, 0x12, 0xaf, 0xa1, 0x42, 0x10, 0xee, 0xff, 0x2d, 0xfd, 0x88, 0x60, 0x39,
+	0x81, 0x95, 0x38, 0xa5, 0xf4, 0xd3, 0x40, 0xcf, 0x74, 0x1a, 0xcf, 0xc6, 0xfc, 0x19, 0x82, 0x43,
+	0x57, 0x2c, 0xbe, 0x66, 0x9f, 0x17, 0x04, 0x2f, 0x41, 0xce, 0x69, 0x12, 0xc3, 0x62, 0xf4, 0x1e,
+	0xe3, 0x3b, 0xcc, 0xaa, 0x9d, 0x01, 0xbc, 0x06, 0xcb, 0x44, 0xd7, 0x0d, 0xbf, 0x4d, 0x93, 0x66,
+	0x8d, 0xb4, 0xd8, 0x5d, 0x6a, 0x31, 0x43, 0x23, 0x8c, 0xea, 0x35, 0x9d, 0x30, 0xc2, 0x0b, 0x6e,
+	0x56, 0x3d, 0xde, 0x09, 0xba, 0xd4, 0x1d, 0xb3, 0x4e, 0x18, 0x91, 0x1e, 0x22, 0x38, 0xb4, 0x4e,
+	0x07, 0x82, 0x14, 0x00, 0x34, 0xc3, 0xb9, 0x4b, 0xdd, 0x2e, 0x92, 0xae, 0x91, 0x89, 0xa0, 0x28,
+	0x30, 0x17, 0x91, 0x88, 0x4b, 0x34, 0xa6, 0x1f, 0x25, 0xf4, 0x4b, 0x57, 0x60, 0x2e, 0x3a, 0x43,
+	0x31, 0x61, 0x0c, 0x76, 0xc9, 0x84, 0x93, 0x89, 0xf2, 0xd9, 0x72, 0x0d, 0x93, 0xb8, 0x43, 0xdc,
+	0x60, 0xb8, 0x04, 0x47, 0x7b, 0x2b, 0xab, 0x73, 0x19, 0xe0, 0x64, 0xd5, 0x5c, 0xd3, 0xa5, 0x73,
+	0x50, 0x58, 0xa7, 0x1e, 0x73, 0xed, 0xf6, 0x28, 0x57, 0xe5, 0x39, 0x28, 0xa8, 0xd4, 0x63, 0xb6,
+	0x4b, 0x47, 0x98, 0x55, 0xfe, 0xe3, 0x18, 0x1c, 0xa9, 0xd2, 0xf6, 0x26, 0xb1, 0x48, 0x9d, 0x9a,
+	0xd4, 0x62, 0xdb, 0x81, 0x0f, 0xc4, 0x5f, 0x22, 0x98, 0xed, 0xee, 0xfe, 0x78, 0x35, 0xf5, 0x35,
+	0x48, 0x71, 0x5b, 0xf9, 0xd3, 0x43, 0x44, 0x06, 0xd9, 0x90, 0xce, 0x7d, 0xfa, 0xdb, 0x5f, 0x8f,
+	0xa7, 0x64, 0xfc, 0x8a, 0x6f, 0x16, 0x3f, 0x0e, 0xae, 0xa6, 0x8b, 0x8e, 0x6b, 0x7f, 0x40, 0x35,
+	0xe6, 0x29, 0x45, 0xa5, 0x69, 0x6b, 0x81, 0xc9, 0x54, 0x8a, 0x0f, 0x94, 0xc8, 0x45, 0x7c, 0x8f,
+	0xe0, 0x50, 0xbc, 0xfd, 0xe3, 0x62, 0xe6, 0x9e, 0x3d, 0x06, 0x2d, 0x7f, 0x66, 0xa8, 0x58, 0x41,
+	0x78, 0x89, 0x13, 0x5e, 0xc0, 0xe7, 0x07, 0x13, 0x46, 0x80, 0x3e, 0x6c, 0x97, 0xa3, 0x78, 0x8a,
+	0x12, 0x56, 0x31, 0xea, 0xd5, 0xa5, 0xc1, 0x24, 0x09, 0xa7, 0x97, 0x2f, 0x8f, 0x32, 0x45, 0x68,
+	0xd8, 0xe1, 0x1a, 0xde, 0xc1, 0x9b, 0x23, 0x69, 0xe8, 0x92, 0x10, 0x13, 0x14, 0xd1, 0x3f, 0x44,
+	0x00, 0x1d, 0x8f, 0x80, 0x4f, 0xa5, 0x92, 0xf5, 0x98, 0x88, 0x7c, 0xdf, 0x86, 0x9b, 0xa8, 0x08,
+	0xbf, 0x46, 0x87, 0x38, 0x6d, 0xfc, 0x15, 0x82, 0xd9, 0x6e, 0x6b, 0x91, 0x51, 0xad, 0x29, 0x46,
+	0x25, 0x3f, 0xa0, 0x09, 0x25, 0x0a, 0x60, 0x38, 0xa0, 0xf8, 0xd1, 0xe1, 0x5f, 0x50, 0xdc, 0x23,
+	0x85, 0x0d, 0x42, 0x19, 0x08, 0x19, 0x7f, 0x83, 0xf3, 0xc3, 0xb5, 0xa2, 0x44, 0xbe, 0xc7, 0x40,
+	0xee, 0x4d, 0xb6, 0x2f, 0xe3, 0x09, 0x82, 0x83, 0x31, 0x33, 0x86, 0x4f, 0x67, 0xf0, 0xf4, 0x1a,
+	0xb6, 0x01, 0x59, 0x7f, 0x93, 0x13, 0xbf, 0x21, 0x8d, 0x74, 0x0f, 0x54, 0x22, 0x2b, 0x87, 0x7f,
+	0x40, 0x30, 0x97, 0xf0, 0x41, 0xf8, 0x4c, 0x1f, 0xb8, 0x91, 0xab, 0x60, 0x93, 0x03, 0x6e, 0x48,
+	0xe3, 0x5f, 0x03, 0x95, 0x2e, 0xff, 0x83, 0xff, 0xec, 0x75, 0x93, 0x61, 0x51, 0x94, 0x87, 0xc1,
+	0x1e, 0xaf, 0x2e, 0x0c, 0x2e, 0x42, 0x93, 0x26, 0x7b, 0x0f, 0x54, 0x52, 0xac, 0x13, 0xfe, 0x09,
+	0xc1, 0x5c, 0xa2, 0x67, 0x66, 0x24, 0x24, 0xdd, 0x2f, 0x0e, 0x4c, 0xc8, 0x7b, 0x5c, 0x8b, 0x5a,
+	0x5e, 0xe7, 0x5a, 0x3a, 0x04, 0xf2, 0x38, 0x6f, 0x68, 0x2c, 0x37, 0x7f, 0xf7, 0x9a, 0xd8, 0xfe,
+	0xb9, 0xe9, 0x6b, 0x2d, 0x87, 0xcd, 0xcd, 0x27, 0x5c, 0xcf, 0x5e, 0xf9, 0x56, 0x42, 0x4f, 0x78,
+	0xa2, 0xf2, 0xa4, 0x5e, 0xe3, 0xd4, 0x74, 0x7d, 0x8b, 0xe0, 0x80, 0x70, 0x4a, 0xf8, 0x44, 0x2a,
+	0x70, 0xdc, 0x8b, 0xe6, 0x4f, 0xf6, 0x0f, 0x12, 0x8d, 0x27, 0x7c, 0x6b, 0xd6, 0xc6, 0xbd, 0x88,
+	0x8a, 0x0f, 0x2a, 0x34, 0x58, 0xb3, 0x82, 0x8a, 0xf8, 0x1b, 0x04, 0x07, 0x84, 0x01, 0xcc, 0xa0,
+	0x8c, 0x1b, 0xd5, 0x0c, 0xca, 0x84, 0x87, 0x94, 0xae, 0x73, 0xca, 0xab, 0xd2, 0xa5, 0xb1, 0x6f,
+	0xf8, 0x8a, 0x4e, 0x23, 0xc8, 0xa7, 0xbd, 0x1f, 0x1b, 0x71, 0xb7, 0x88, 0xcf, 0x0f, 0x53, 0x45,
+	0xa9, 0x0e, 0x73, 0xe0, 0x5b, 0xf1, 0x3e, 0x97, 0xb2, 0x2d, 0xbd, 0x3d, 0xbe, 0x94, 0xe0, 0x1b,
+	0x24, 0xbe, 0xbd, 0xaf, 0xeb, 0x77, 0x04, 0xc7, 0x32, 0x6c, 0x29, 0x3e, 0x9b, 0x71, 0xce, 0xfd,
+	0x4c, 0xec, 0xb0, 0x2f, 0xc6, 0x2d, 0x2e, 0xe9, 0xa6, 0xb4, 0x33, 0xd1, 0x66, 0x56, 0xd1, 0x03,
+	0xb8, 0x50, 0x59, 0x86, 0x75, 0xce, 0x50, 0xd6, 0xdf, 0x68, 0xff, 0xc7, 0xca, 0xdc, 0x00, 0xae,
+	0x82, 0x8a, 0x6b, 0x8f, 0x10, 0x1c, 0xd3, 0x6c, 0x33, 0x0d, 0x67, 0x6d, 0xba, 0x6a, 0x7a, 0x5b,
+	0xfe, 0x37, 0xe8, 0x16, 0xba, 0xf9, 0x9a, 0x08, 0xa8, 0xdb, 0x4d, 0x62, 0xd5, 0x65, 0xdb, 0xad,
+	0x2b, 0x75, 0x6a, 0xf1, 0x2f, 0x54, 0x25, 0x78, 0x44, 0x1c, 0xc3, 0x8b, 0xfd, 0x6b, 0xf7, 0x42,
+	0xc3, 0xf4, 0xfe, 0x41, 0xe8, 0xbb, 0xa9, 0xf9, 0x8d, 0x60, 0xee, 0x65, 0xbe, 0x78, 0xd5, 0xf4,
+	0xe4, 0x1b, 0xa5, 0x5f, 0xc3, 0xd1, 0x5d, 0x3e, 0xba, 0x5b, 0x35, 0xbd, 0xdd, 0x1b, 0xa5, 0xdb,
+	0xfb, 0xf9, 0x8a, 0x67, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x63, 0xc5, 0xfd, 0xff, 0x81, 0x16,
+	0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/language/v1/language_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/language/v1/language_service.pb.go
index 126175f0..5411cdf8 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/language/v1/language_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/language/v1/language_service.pb.go
@@ -1,37 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1/language_service.proto
 
-/*
-Package language is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/language/v1/language_service.proto
-
-It has these top-level messages:
-	Document
-	Sentence
-	Entity
-	Token
-	Sentiment
-	PartOfSpeech
-	DependencyEdge
-	EntityMention
-	TextSpan
-	ClassificationCategory
-	AnalyzeSentimentRequest
-	AnalyzeSentimentResponse
-	AnalyzeEntitySentimentRequest
-	AnalyzeEntitySentimentResponse
-	AnalyzeEntitiesRequest
-	AnalyzeEntitiesResponse
-	AnalyzeSyntaxRequest
-	AnalyzeSyntaxResponse
-	ClassifyTextRequest
-	ClassifyTextResponse
-	AnnotateTextRequest
-	AnnotateTextResponse
-*/
-package language
+package language // import "google.golang.org/genproto/googleapis/cloud/language/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -95,7 +65,9 @@ var EncodingType_value = map[string]int32{
 func (x EncodingType) String() string {
 	return proto.EnumName(EncodingType_name, int32(x))
 }
-func (EncodingType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (EncodingType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{0}
+}
 
 // The document types enum.
 type Document_Type int32
@@ -123,7 +95,9 @@ var Document_Type_value = map[string]int32{
 func (x Document_Type) String() string {
 	return proto.EnumName(Document_Type_name, int32(x))
 }
-func (Document_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (Document_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{0, 0}
+}
 
 // The type of the entity.
 type Entity_Type int32
@@ -171,7 +145,9 @@ var Entity_Type_value = map[string]int32{
 func (x Entity_Type) String() string {
 	return proto.EnumName(Entity_Type_name, int32(x))
 }
-func (Entity_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (Entity_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{2, 0}
+}
 
 // The part of speech tags enum.
 type PartOfSpeech_Tag int32
@@ -243,7 +219,9 @@ var PartOfSpeech_Tag_value = map[string]int32{
 func (x PartOfSpeech_Tag) String() string {
 	return proto.EnumName(PartOfSpeech_Tag_name, int32(x))
 }
-func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 0} }
+func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 0}
+}
 
 // The characteristic of a verb that expresses time flow during an event.
 type PartOfSpeech_Aspect int32
@@ -275,7 +253,9 @@ var PartOfSpeech_Aspect_value = map[string]int32{
 func (x PartOfSpeech_Aspect) String() string {
 	return proto.EnumName(PartOfSpeech_Aspect_name, int32(x))
 }
-func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 1} }
+func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 1}
+}
 
 // The grammatical function performed by a noun or pronoun in a phrase,
 // clause, or sentence. In some languages, other parts of speech, such as
@@ -353,7 +333,9 @@ var PartOfSpeech_Case_value = map[string]int32{
 func (x PartOfSpeech_Case) String() string {
 	return proto.EnumName(PartOfSpeech_Case_name, int32(x))
 }
-func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 2} }
+func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 2}
+}
 
 // Depending on the language, Form can be categorizing different forms of
 // verbs, adjectives, adverbs, etc. For example, categorizing inflected
@@ -420,7 +402,9 @@ var PartOfSpeech_Form_value = map[string]int32{
 func (x PartOfSpeech_Form) String() string {
 	return proto.EnumName(PartOfSpeech_Form_name, int32(x))
 }
-func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 3} }
+func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 3}
+}
 
 // Gender classes of nouns reflected in the behaviour of associated words.
 type PartOfSpeech_Gender int32
@@ -452,7 +436,9 @@ var PartOfSpeech_Gender_value = map[string]int32{
 func (x PartOfSpeech_Gender) String() string {
 	return proto.EnumName(PartOfSpeech_Gender_name, int32(x))
 }
-func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 4} }
+func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 4}
+}
 
 // The grammatical feature of verbs, used for showing modality and attitude.
 type PartOfSpeech_Mood int32
@@ -496,7 +482,9 @@ var PartOfSpeech_Mood_value = map[string]int32{
 func (x PartOfSpeech_Mood) String() string {
 	return proto.EnumName(PartOfSpeech_Mood_name, int32(x))
 }
-func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 5} }
+func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 5}
+}
 
 // Count distinctions.
 type PartOfSpeech_Number int32
@@ -528,7 +516,9 @@ var PartOfSpeech_Number_value = map[string]int32{
 func (x PartOfSpeech_Number) String() string {
 	return proto.EnumName(PartOfSpeech_Number_name, int32(x))
 }
-func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 6} }
+func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 6}
+}
 
 // The distinction between the speaker, second person, third person, etc.
 type PartOfSpeech_Person int32
@@ -564,7 +554,9 @@ var PartOfSpeech_Person_value = map[string]int32{
 func (x PartOfSpeech_Person) String() string {
 	return proto.EnumName(PartOfSpeech_Person_name, int32(x))
 }
-func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 7} }
+func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 7}
+}
 
 // This category shows if the token is part of a proper name.
 type PartOfSpeech_Proper int32
@@ -592,7 +584,9 @@ var PartOfSpeech_Proper_value = map[string]int32{
 func (x PartOfSpeech_Proper) String() string {
 	return proto.EnumName(PartOfSpeech_Proper_name, int32(x))
 }
-func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 8} }
+func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 8}
+}
 
 // Reciprocal features of a pronoun.
 type PartOfSpeech_Reciprocity int32
@@ -621,7 +615,9 @@ var PartOfSpeech_Reciprocity_value = map[string]int32{
 func (x PartOfSpeech_Reciprocity) String() string {
 	return proto.EnumName(PartOfSpeech_Reciprocity_name, int32(x))
 }
-func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 9} }
+func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 9}
+}
 
 // Time reference.
 type PartOfSpeech_Tense int32
@@ -665,7 +661,9 @@ var PartOfSpeech_Tense_value = map[string]int32{
 func (x PartOfSpeech_Tense) String() string {
 	return proto.EnumName(PartOfSpeech_Tense_name, int32(x))
 }
-func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 10} }
+func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 10}
+}
 
 // The relationship between the action that a verb expresses and the
 // participants identified by its arguments.
@@ -698,7 +696,9 @@ var PartOfSpeech_Voice_value = map[string]int32{
 func (x PartOfSpeech_Voice) String() string {
 	return proto.EnumName(PartOfSpeech_Voice_name, int32(x))
 }
-func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 11} }
+func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5, 11}
+}
 
 // The parse label enum for the token.
 type DependencyEdge_Label int32
@@ -1046,7 +1046,9 @@ var DependencyEdge_Label_value = map[string]int32{
 func (x DependencyEdge_Label) String() string {
 	return proto.EnumName(DependencyEdge_Label_name, int32(x))
 }
-func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{6, 0} }
+func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{6, 0}
+}
 
 // The supported types of mentions.
 type EntityMention_Type int32
@@ -1074,7 +1076,9 @@ var EntityMention_Type_value = map[string]int32{
 func (x EntityMention_Type) String() string {
 	return proto.EnumName(EntityMention_Type_name, int32(x))
 }
-func (EntityMention_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
+func (EntityMention_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{7, 0}
+}
 
 // ################################################################ #
 //
@@ -1082,7 +1086,7 @@ func (EntityMention_Type) EnumDescriptor() ([]byte, []int) { return fileDescript
 type Document struct {
 	// Required. If the type is not set or is `TYPE_UNSPECIFIED`,
 	// returns an `INVALID_ARGUMENT` error.
-	Type Document_Type `protobuf:"varint,1,opt,name=type,enum=google.cloud.language.v1.Document_Type" json:"type,omitempty"`
+	Type Document_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.language.v1.Document_Type" json:"type,omitempty"`
 	// The source of the document: a string containing the content or a
 	// Google Cloud Storage URI.
 	//
@@ -1098,26 +1102,57 @@ type Document struct {
 	// If the language (either specified by the caller or automatically detected)
 	// is not supported by the called API method, an `INVALID_ARGUMENT` error
 	// is returned.
-	Language string `protobuf:"bytes,4,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,4,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Document) Reset()         { *m = Document{} }
+func (m *Document) String() string { return proto.CompactTextString(m) }
+func (*Document) ProtoMessage()    {}
+func (*Document) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{0}
 }
+func (m *Document) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Document.Unmarshal(m, b)
+}
+func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
+}
+func (dst *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(dst, src)
+}
+func (m *Document) XXX_Size() int {
+	return xxx_messageInfo_Document.Size(m)
+}
+func (m *Document) XXX_DiscardUnknown() {
+	xxx_messageInfo_Document.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Document proto.InternalMessageInfo
 
-func (m *Document) Reset()                    { *m = Document{} }
-func (m *Document) String() string            { return proto.CompactTextString(m) }
-func (*Document) ProtoMessage()               {}
-func (*Document) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Document) GetType() Document_Type {
+	if m != nil {
+		return m.Type
+	}
+	return Document_TYPE_UNSPECIFIED
+}
 
 type isDocument_Source interface {
 	isDocument_Source()
 }
 
 type Document_Content struct {
-	Content string `protobuf:"bytes,2,opt,name=content,oneof"`
+	Content string `protobuf:"bytes,2,opt,name=content,proto3,oneof"`
 }
+
 type Document_GcsContentUri struct {
-	GcsContentUri string `protobuf:"bytes,3,opt,name=gcs_content_uri,json=gcsContentUri,oneof"`
+	GcsContentUri string `protobuf:"bytes,3,opt,name=gcs_content_uri,json=gcsContentUri,proto3,oneof"`
 }
 
-func (*Document_Content) isDocument_Source()       {}
+func (*Document_Content) isDocument_Source() {}
+
 func (*Document_GcsContentUri) isDocument_Source() {}
 
 func (m *Document) GetSource() isDocument_Source {
@@ -1127,13 +1162,6 @@ func (m *Document) GetSource() isDocument_Source {
 	return nil
 }
 
-func (m *Document) GetType() Document_Type {
-	if m != nil {
-		return m.Type
-	}
-	return Document_TYPE_UNSPECIFIED
-}
-
 func (m *Document) GetContent() string {
 	if x, ok := m.GetSource().(*Document_Content); ok {
 		return x.Content
@@ -1207,11 +1235,11 @@ func _Document_OneofSizer(msg proto.Message) (n int) {
 	// source
 	switch x := m.Source.(type) {
 	case *Document_Content:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Content)))
 		n += len(x.Content)
 	case *Document_GcsContentUri:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.GcsContentUri)))
 		n += len(x.GcsContentUri)
 	case nil:
@@ -1224,17 +1252,39 @@ func _Document_OneofSizer(msg proto.Message) (n int) {
 // Represents a sentence in the input document.
 type Sentence struct {
 	// The sentence text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// For calls to [AnalyzeSentiment][] or if
 	// [AnnotateTextRequest.Features.extract_document_sentiment][google.cloud.language.v1.AnnotateTextRequest.Features.extract_document_sentiment] is set to
 	// true, this field will contain the sentiment for the sentence.
-	Sentiment *Sentiment `protobuf:"bytes,2,opt,name=sentiment" json:"sentiment,omitempty"`
+	Sentiment            *Sentiment `protobuf:"bytes,2,opt,name=sentiment,proto3" json:"sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *Sentence) Reset()         { *m = Sentence{} }
+func (m *Sentence) String() string { return proto.CompactTextString(m) }
+func (*Sentence) ProtoMessage()    {}
+func (*Sentence) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{1}
+}
+func (m *Sentence) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Sentence.Unmarshal(m, b)
+}
+func (m *Sentence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Sentence.Marshal(b, m, deterministic)
+}
+func (dst *Sentence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentence.Merge(dst, src)
+}
+func (m *Sentence) XXX_Size() int {
+	return xxx_messageInfo_Sentence.Size(m)
+}
+func (m *Sentence) XXX_DiscardUnknown() {
+	xxx_messageInfo_Sentence.DiscardUnknown(m)
 }
 
-func (m *Sentence) Reset()                    { *m = Sentence{} }
-func (m *Sentence) String() string            { return proto.CompactTextString(m) }
-func (*Sentence) ProtoMessage()               {}
-func (*Sentence) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Sentence proto.InternalMessageInfo
 
 func (m *Sentence) GetText() *TextSpan {
 	if m != nil {
@@ -1255,35 +1305,57 @@ func (m *Sentence) GetSentiment() *Sentiment {
 // as salience and mentions, with entities.
 type Entity struct {
 	// The representative name for the entity.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The entity type.
-	Type Entity_Type `protobuf:"varint,2,opt,name=type,enum=google.cloud.language.v1.Entity_Type" json:"type,omitempty"`
+	Type Entity_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.language.v1.Entity_Type" json:"type,omitempty"`
 	// Metadata associated with the entity.
 	//
 	// Currently, Wikipedia URLs and Knowledge Graph MIDs are provided, if
 	// available. The associated keys are "wikipedia_url" and "mid", respectively.
-	Metadata map[string]string `protobuf:"bytes,3,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata map[string]string `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The salience score associated with the entity in the [0, 1.0] range.
 	//
 	// The salience score for an entity provides information about the
 	// importance or centrality of that entity to the entire document text.
 	// Scores closer to 0 are less salient, while scores closer to 1.0 are highly
 	// salient.
-	Salience float32 `protobuf:"fixed32,4,opt,name=salience" json:"salience,omitempty"`
+	Salience float32 `protobuf:"fixed32,4,opt,name=salience,proto3" json:"salience,omitempty"`
 	// The mentions of this entity in the input document. The API currently
 	// supports proper noun mentions.
-	Mentions []*EntityMention `protobuf:"bytes,5,rep,name=mentions" json:"mentions,omitempty"`
+	Mentions []*EntityMention `protobuf:"bytes,5,rep,name=mentions,proto3" json:"mentions,omitempty"`
 	// For calls to [AnalyzeEntitySentiment][] or if
 	// [AnnotateTextRequest.Features.extract_entity_sentiment][google.cloud.language.v1.AnnotateTextRequest.Features.extract_entity_sentiment] is set to
 	// true, this field will contain the aggregate sentiment expressed for this
 	// entity in the provided document.
-	Sentiment *Sentiment `protobuf:"bytes,6,opt,name=sentiment" json:"sentiment,omitempty"`
+	Sentiment            *Sentiment `protobuf:"bytes,6,opt,name=sentiment,proto3" json:"sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *Entity) Reset()                    { *m = Entity{} }
-func (m *Entity) String() string            { return proto.CompactTextString(m) }
-func (*Entity) ProtoMessage()               {}
-func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Entity) Reset()         { *m = Entity{} }
+func (m *Entity) String() string { return proto.CompactTextString(m) }
+func (*Entity) ProtoMessage()    {}
+func (*Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{2}
+}
+func (m *Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Entity.Unmarshal(m, b)
+}
+func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
+}
+func (dst *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(dst, src)
+}
+func (m *Entity) XXX_Size() int {
+	return xxx_messageInfo_Entity.Size(m)
+}
+func (m *Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Entity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Entity proto.InternalMessageInfo
 
 func (m *Entity) GetName() string {
 	if m != nil {
@@ -1330,19 +1402,41 @@ func (m *Entity) GetSentiment() *Sentiment {
 // Represents the smallest syntactic building block of the text.
 type Token struct {
 	// The token text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// Parts of speech tag for this token.
-	PartOfSpeech *PartOfSpeech `protobuf:"bytes,2,opt,name=part_of_speech,json=partOfSpeech" json:"part_of_speech,omitempty"`
+	PartOfSpeech *PartOfSpeech `protobuf:"bytes,2,opt,name=part_of_speech,json=partOfSpeech,proto3" json:"part_of_speech,omitempty"`
 	// Dependency tree parse for this token.
-	DependencyEdge *DependencyEdge `protobuf:"bytes,3,opt,name=dependency_edge,json=dependencyEdge" json:"dependency_edge,omitempty"`
+	DependencyEdge *DependencyEdge `protobuf:"bytes,3,opt,name=dependency_edge,json=dependencyEdge,proto3" json:"dependency_edge,omitempty"`
 	// [Lemma](https://en.wikipedia.org/wiki/Lemma_%28morphology%29) of the token.
-	Lemma string `protobuf:"bytes,4,opt,name=lemma" json:"lemma,omitempty"`
+	Lemma                string   `protobuf:"bytes,4,opt,name=lemma,proto3" json:"lemma,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Token) Reset()                    { *m = Token{} }
-func (m *Token) String() string            { return proto.CompactTextString(m) }
-func (*Token) ProtoMessage()               {}
-func (*Token) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *Token) Reset()         { *m = Token{} }
+func (m *Token) String() string { return proto.CompactTextString(m) }
+func (*Token) ProtoMessage()    {}
+func (*Token) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{3}
+}
+func (m *Token) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Token.Unmarshal(m, b)
+}
+func (m *Token) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Token.Marshal(b, m, deterministic)
+}
+func (dst *Token) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Token.Merge(dst, src)
+}
+func (m *Token) XXX_Size() int {
+	return xxx_messageInfo_Token.Size(m)
+}
+func (m *Token) XXX_DiscardUnknown() {
+	xxx_messageInfo_Token.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Token proto.InternalMessageInfo
 
 func (m *Token) GetText() *TextSpan {
 	if m != nil {
@@ -1378,16 +1472,38 @@ type Sentiment struct {
 	// A non-negative number in the [0, +inf) range, which represents
 	// the absolute magnitude of sentiment regardless of score (positive or
 	// negative).
-	Magnitude float32 `protobuf:"fixed32,2,opt,name=magnitude" json:"magnitude,omitempty"`
+	Magnitude float32 `protobuf:"fixed32,2,opt,name=magnitude,proto3" json:"magnitude,omitempty"`
 	// Sentiment score between -1.0 (negative sentiment) and 1.0
 	// (positive sentiment).
-	Score float32 `protobuf:"fixed32,3,opt,name=score" json:"score,omitempty"`
+	Score                float32  `protobuf:"fixed32,3,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Sentiment) Reset()                    { *m = Sentiment{} }
-func (m *Sentiment) String() string            { return proto.CompactTextString(m) }
-func (*Sentiment) ProtoMessage()               {}
-func (*Sentiment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *Sentiment) Reset()         { *m = Sentiment{} }
+func (m *Sentiment) String() string { return proto.CompactTextString(m) }
+func (*Sentiment) ProtoMessage()    {}
+func (*Sentiment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{4}
+}
+func (m *Sentiment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
+}
+func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
+}
+func (dst *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(dst, src)
+}
+func (m *Sentiment) XXX_Size() int {
+	return xxx_messageInfo_Sentiment.Size(m)
+}
+func (m *Sentiment) XXX_DiscardUnknown() {
+	xxx_messageInfo_Sentiment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Sentiment proto.InternalMessageInfo
 
 func (m *Sentiment) GetMagnitude() float32 {
 	if m != nil {
@@ -1408,35 +1524,57 @@ func (m *Sentiment) GetScore() float32 {
 // http://www.lrec-conf.org/proceedings/lrec2012/pdf/274_Paper.pdf
 type PartOfSpeech struct {
 	// The part of speech tag.
-	Tag PartOfSpeech_Tag `protobuf:"varint,1,opt,name=tag,enum=google.cloud.language.v1.PartOfSpeech_Tag" json:"tag,omitempty"`
+	Tag PartOfSpeech_Tag `protobuf:"varint,1,opt,name=tag,proto3,enum=google.cloud.language.v1.PartOfSpeech_Tag" json:"tag,omitempty"`
 	// The grammatical aspect.
-	Aspect PartOfSpeech_Aspect `protobuf:"varint,2,opt,name=aspect,enum=google.cloud.language.v1.PartOfSpeech_Aspect" json:"aspect,omitempty"`
+	Aspect PartOfSpeech_Aspect `protobuf:"varint,2,opt,name=aspect,proto3,enum=google.cloud.language.v1.PartOfSpeech_Aspect" json:"aspect,omitempty"`
 	// The grammatical case.
-	Case PartOfSpeech_Case `protobuf:"varint,3,opt,name=case,enum=google.cloud.language.v1.PartOfSpeech_Case" json:"case,omitempty"`
+	Case PartOfSpeech_Case `protobuf:"varint,3,opt,name=case,proto3,enum=google.cloud.language.v1.PartOfSpeech_Case" json:"case,omitempty"`
 	// The grammatical form.
-	Form PartOfSpeech_Form `protobuf:"varint,4,opt,name=form,enum=google.cloud.language.v1.PartOfSpeech_Form" json:"form,omitempty"`
+	Form PartOfSpeech_Form `protobuf:"varint,4,opt,name=form,proto3,enum=google.cloud.language.v1.PartOfSpeech_Form" json:"form,omitempty"`
 	// The grammatical gender.
-	Gender PartOfSpeech_Gender `protobuf:"varint,5,opt,name=gender,enum=google.cloud.language.v1.PartOfSpeech_Gender" json:"gender,omitempty"`
+	Gender PartOfSpeech_Gender `protobuf:"varint,5,opt,name=gender,proto3,enum=google.cloud.language.v1.PartOfSpeech_Gender" json:"gender,omitempty"`
 	// The grammatical mood.
-	Mood PartOfSpeech_Mood `protobuf:"varint,6,opt,name=mood,enum=google.cloud.language.v1.PartOfSpeech_Mood" json:"mood,omitempty"`
+	Mood PartOfSpeech_Mood `protobuf:"varint,6,opt,name=mood,proto3,enum=google.cloud.language.v1.PartOfSpeech_Mood" json:"mood,omitempty"`
 	// The grammatical number.
-	Number PartOfSpeech_Number `protobuf:"varint,7,opt,name=number,enum=google.cloud.language.v1.PartOfSpeech_Number" json:"number,omitempty"`
+	Number PartOfSpeech_Number `protobuf:"varint,7,opt,name=number,proto3,enum=google.cloud.language.v1.PartOfSpeech_Number" json:"number,omitempty"`
 	// The grammatical person.
-	Person PartOfSpeech_Person `protobuf:"varint,8,opt,name=person,enum=google.cloud.language.v1.PartOfSpeech_Person" json:"person,omitempty"`
+	Person PartOfSpeech_Person `protobuf:"varint,8,opt,name=person,proto3,enum=google.cloud.language.v1.PartOfSpeech_Person" json:"person,omitempty"`
 	// The grammatical properness.
-	Proper PartOfSpeech_Proper `protobuf:"varint,9,opt,name=proper,enum=google.cloud.language.v1.PartOfSpeech_Proper" json:"proper,omitempty"`
+	Proper PartOfSpeech_Proper `protobuf:"varint,9,opt,name=proper,proto3,enum=google.cloud.language.v1.PartOfSpeech_Proper" json:"proper,omitempty"`
 	// The grammatical reciprocity.
-	Reciprocity PartOfSpeech_Reciprocity `protobuf:"varint,10,opt,name=reciprocity,enum=google.cloud.language.v1.PartOfSpeech_Reciprocity" json:"reciprocity,omitempty"`
+	Reciprocity PartOfSpeech_Reciprocity `protobuf:"varint,10,opt,name=reciprocity,proto3,enum=google.cloud.language.v1.PartOfSpeech_Reciprocity" json:"reciprocity,omitempty"`
 	// The grammatical tense.
-	Tense PartOfSpeech_Tense `protobuf:"varint,11,opt,name=tense,enum=google.cloud.language.v1.PartOfSpeech_Tense" json:"tense,omitempty"`
+	Tense PartOfSpeech_Tense `protobuf:"varint,11,opt,name=tense,proto3,enum=google.cloud.language.v1.PartOfSpeech_Tense" json:"tense,omitempty"`
 	// The grammatical voice.
-	Voice PartOfSpeech_Voice `protobuf:"varint,12,opt,name=voice,enum=google.cloud.language.v1.PartOfSpeech_Voice" json:"voice,omitempty"`
+	Voice                PartOfSpeech_Voice `protobuf:"varint,12,opt,name=voice,proto3,enum=google.cloud.language.v1.PartOfSpeech_Voice" json:"voice,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *PartOfSpeech) Reset()         { *m = PartOfSpeech{} }
+func (m *PartOfSpeech) String() string { return proto.CompactTextString(m) }
+func (*PartOfSpeech) ProtoMessage()    {}
+func (*PartOfSpeech) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{5}
+}
+func (m *PartOfSpeech) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartOfSpeech.Unmarshal(m, b)
+}
+func (m *PartOfSpeech) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartOfSpeech.Marshal(b, m, deterministic)
+}
+func (dst *PartOfSpeech) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartOfSpeech.Merge(dst, src)
+}
+func (m *PartOfSpeech) XXX_Size() int {
+	return xxx_messageInfo_PartOfSpeech.Size(m)
+}
+func (m *PartOfSpeech) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartOfSpeech.DiscardUnknown(m)
 }
 
-func (m *PartOfSpeech) Reset()                    { *m = PartOfSpeech{} }
-func (m *PartOfSpeech) String() string            { return proto.CompactTextString(m) }
-func (*PartOfSpeech) ProtoMessage()               {}
-func (*PartOfSpeech) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_PartOfSpeech proto.InternalMessageInfo
 
 func (m *PartOfSpeech) GetTag() PartOfSpeech_Tag {
 	if m != nil {
@@ -1531,15 +1669,37 @@ type DependencyEdge struct {
 	// The index is the position of the token in the array of tokens returned
 	// by the API method. If this token is a root token, then the
 	// `head_token_index` is its own index.
-	HeadTokenIndex int32 `protobuf:"varint,1,opt,name=head_token_index,json=headTokenIndex" json:"head_token_index,omitempty"`
+	HeadTokenIndex int32 `protobuf:"varint,1,opt,name=head_token_index,json=headTokenIndex,proto3" json:"head_token_index,omitempty"`
 	// The parse label for the token.
-	Label DependencyEdge_Label `protobuf:"varint,2,opt,name=label,enum=google.cloud.language.v1.DependencyEdge_Label" json:"label,omitempty"`
+	Label                DependencyEdge_Label `protobuf:"varint,2,opt,name=label,proto3,enum=google.cloud.language.v1.DependencyEdge_Label" json:"label,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *DependencyEdge) Reset()                    { *m = DependencyEdge{} }
-func (m *DependencyEdge) String() string            { return proto.CompactTextString(m) }
-func (*DependencyEdge) ProtoMessage()               {}
-func (*DependencyEdge) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *DependencyEdge) Reset()         { *m = DependencyEdge{} }
+func (m *DependencyEdge) String() string { return proto.CompactTextString(m) }
+func (*DependencyEdge) ProtoMessage()    {}
+func (*DependencyEdge) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{6}
+}
+func (m *DependencyEdge) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DependencyEdge.Unmarshal(m, b)
+}
+func (m *DependencyEdge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DependencyEdge.Marshal(b, m, deterministic)
+}
+func (dst *DependencyEdge) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DependencyEdge.Merge(dst, src)
+}
+func (m *DependencyEdge) XXX_Size() int {
+	return xxx_messageInfo_DependencyEdge.Size(m)
+}
+func (m *DependencyEdge) XXX_DiscardUnknown() {
+	xxx_messageInfo_DependencyEdge.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DependencyEdge proto.InternalMessageInfo
 
 func (m *DependencyEdge) GetHeadTokenIndex() int32 {
 	if m != nil {
@@ -1559,20 +1719,42 @@ func (m *DependencyEdge) GetLabel() DependencyEdge_Label {
 // mentions are supported.
 type EntityMention struct {
 	// The mention text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// The type of the entity mention.
-	Type EntityMention_Type `protobuf:"varint,2,opt,name=type,enum=google.cloud.language.v1.EntityMention_Type" json:"type,omitempty"`
+	Type EntityMention_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.language.v1.EntityMention_Type" json:"type,omitempty"`
 	// For calls to [AnalyzeEntitySentiment][] or if
 	// [AnnotateTextRequest.Features.extract_entity_sentiment][google.cloud.language.v1.AnnotateTextRequest.Features.extract_entity_sentiment] is set to
 	// true, this field will contain the sentiment expressed for this mention of
 	// the entity in the provided document.
-	Sentiment *Sentiment `protobuf:"bytes,3,opt,name=sentiment" json:"sentiment,omitempty"`
+	Sentiment            *Sentiment `protobuf:"bytes,3,opt,name=sentiment,proto3" json:"sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *EntityMention) Reset()         { *m = EntityMention{} }
+func (m *EntityMention) String() string { return proto.CompactTextString(m) }
+func (*EntityMention) ProtoMessage()    {}
+func (*EntityMention) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{7}
+}
+func (m *EntityMention) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityMention.Unmarshal(m, b)
+}
+func (m *EntityMention) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityMention.Marshal(b, m, deterministic)
+}
+func (dst *EntityMention) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityMention.Merge(dst, src)
+}
+func (m *EntityMention) XXX_Size() int {
+	return xxx_messageInfo_EntityMention.Size(m)
+}
+func (m *EntityMention) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityMention.DiscardUnknown(m)
 }
 
-func (m *EntityMention) Reset()                    { *m = EntityMention{} }
-func (m *EntityMention) String() string            { return proto.CompactTextString(m) }
-func (*EntityMention) ProtoMessage()               {}
-func (*EntityMention) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_EntityMention proto.InternalMessageInfo
 
 func (m *EntityMention) GetText() *TextSpan {
 	if m != nil {
@@ -1598,16 +1780,38 @@ func (m *EntityMention) GetSentiment() *Sentiment {
 // Represents an output piece of text.
 type TextSpan struct {
 	// The content of the output text.
-	Content string `protobuf:"bytes,1,opt,name=content" json:"content,omitempty"`
+	Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
 	// The API calculates the beginning offset of the content in the original
 	// document according to the [EncodingType][google.cloud.language.v1.EncodingType] specified in the API request.
-	BeginOffset int32 `protobuf:"varint,2,opt,name=begin_offset,json=beginOffset" json:"begin_offset,omitempty"`
+	BeginOffset          int32    `protobuf:"varint,2,opt,name=begin_offset,json=beginOffset,proto3" json:"begin_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextSpan) Reset()         { *m = TextSpan{} }
+func (m *TextSpan) String() string { return proto.CompactTextString(m) }
+func (*TextSpan) ProtoMessage()    {}
+func (*TextSpan) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{8}
+}
+func (m *TextSpan) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextSpan.Unmarshal(m, b)
+}
+func (m *TextSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextSpan.Marshal(b, m, deterministic)
+}
+func (dst *TextSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSpan.Merge(dst, src)
+}
+func (m *TextSpan) XXX_Size() int {
+	return xxx_messageInfo_TextSpan.Size(m)
+}
+func (m *TextSpan) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextSpan.DiscardUnknown(m)
 }
 
-func (m *TextSpan) Reset()                    { *m = TextSpan{} }
-func (m *TextSpan) String() string            { return proto.CompactTextString(m) }
-func (*TextSpan) ProtoMessage()               {}
-func (*TextSpan) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_TextSpan proto.InternalMessageInfo
 
 func (m *TextSpan) GetContent() string {
 	if m != nil {
@@ -1626,16 +1830,38 @@ func (m *TextSpan) GetBeginOffset() int32 {
 // Represents a category returned from the text classifier.
 type ClassificationCategory struct {
 	// The name of the category representing the document.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The classifier's confidence of the category. Number represents how certain
 	// the classifier is that this category represents the given text.
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClassificationCategory) Reset()         { *m = ClassificationCategory{} }
+func (m *ClassificationCategory) String() string { return proto.CompactTextString(m) }
+func (*ClassificationCategory) ProtoMessage()    {}
+func (*ClassificationCategory) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{9}
+}
+func (m *ClassificationCategory) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassificationCategory.Unmarshal(m, b)
+}
+func (m *ClassificationCategory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassificationCategory.Marshal(b, m, deterministic)
+}
+func (dst *ClassificationCategory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationCategory.Merge(dst, src)
+}
+func (m *ClassificationCategory) XXX_Size() int {
+	return xxx_messageInfo_ClassificationCategory.Size(m)
+}
+func (m *ClassificationCategory) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassificationCategory.DiscardUnknown(m)
 }
 
-func (m *ClassificationCategory) Reset()                    { *m = ClassificationCategory{} }
-func (m *ClassificationCategory) String() string            { return proto.CompactTextString(m) }
-func (*ClassificationCategory) ProtoMessage()               {}
-func (*ClassificationCategory) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_ClassificationCategory proto.InternalMessageInfo
 
 func (m *ClassificationCategory) GetName() string {
 	if m != nil {
@@ -1654,15 +1880,37 @@ func (m *ClassificationCategory) GetConfidence() float32 {
 // The sentiment analysis request message.
 type AnalyzeSentimentRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate sentence offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *AnalyzeSentimentRequest) Reset()                    { *m = AnalyzeSentimentRequest{} }
-func (m *AnalyzeSentimentRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSentimentRequest) ProtoMessage()               {}
-func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *AnalyzeSentimentRequest) Reset()         { *m = AnalyzeSentimentRequest{} }
+func (m *AnalyzeSentimentRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSentimentRequest) ProtoMessage()    {}
+func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{10}
+}
+func (m *AnalyzeSentimentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeSentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentRequest.Merge(dst, src)
+}
+func (m *AnalyzeSentimentRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Size(m)
+}
+func (m *AnalyzeSentimentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSentimentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeSentimentRequest proto.InternalMessageInfo
 
 func (m *AnalyzeSentimentRequest) GetDocument() *Document {
 	if m != nil {
@@ -1681,19 +1929,41 @@ func (m *AnalyzeSentimentRequest) GetEncodingType() EncodingType {
 // The sentiment analysis response message.
 type AnalyzeSentimentResponse struct {
 	// The overall sentiment of the input document.
-	DocumentSentiment *Sentiment `protobuf:"bytes,1,opt,name=document_sentiment,json=documentSentiment" json:"document_sentiment,omitempty"`
+	DocumentSentiment *Sentiment `protobuf:"bytes,1,opt,name=document_sentiment,json=documentSentiment,proto3" json:"document_sentiment,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1.Document.language] field for more details.
-	Language string `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Language string `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
 	// The sentiment for all the sentences in the document.
-	Sentences []*Sentence `protobuf:"bytes,3,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences            []*Sentence `protobuf:"bytes,3,rep,name=sentences,proto3" json:"sentences,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *AnalyzeSentimentResponse) Reset()                    { *m = AnalyzeSentimentResponse{} }
-func (m *AnalyzeSentimentResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSentimentResponse) ProtoMessage()               {}
-func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *AnalyzeSentimentResponse) Reset()         { *m = AnalyzeSentimentResponse{} }
+func (m *AnalyzeSentimentResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSentimentResponse) ProtoMessage()    {}
+func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{11}
+}
+func (m *AnalyzeSentimentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeSentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentResponse.Merge(dst, src)
+}
+func (m *AnalyzeSentimentResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Size(m)
+}
+func (m *AnalyzeSentimentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSentimentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeSentimentResponse proto.InternalMessageInfo
 
 func (m *AnalyzeSentimentResponse) GetDocumentSentiment() *Sentiment {
 	if m != nil {
@@ -1719,15 +1989,37 @@ func (m *AnalyzeSentimentResponse) GetSentences() []*Sentence {
 // The entity-level sentiment analysis request message.
 type AnalyzeEntitySentimentRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AnalyzeEntitySentimentRequest) Reset()         { *m = AnalyzeEntitySentimentRequest{} }
+func (m *AnalyzeEntitySentimentRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitySentimentRequest) ProtoMessage()    {}
+func (*AnalyzeEntitySentimentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{12}
+}
+func (m *AnalyzeEntitySentimentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitySentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitySentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitySentimentRequest.Merge(dst, src)
+}
+func (m *AnalyzeEntitySentimentRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Size(m)
+}
+func (m *AnalyzeEntitySentimentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitySentimentRequest.DiscardUnknown(m)
 }
 
-func (m *AnalyzeEntitySentimentRequest) Reset()                    { *m = AnalyzeEntitySentimentRequest{} }
-func (m *AnalyzeEntitySentimentRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitySentimentRequest) ProtoMessage()               {}
-func (*AnalyzeEntitySentimentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_AnalyzeEntitySentimentRequest proto.InternalMessageInfo
 
 func (m *AnalyzeEntitySentimentRequest) GetDocument() *Document {
 	if m != nil {
@@ -1746,17 +2038,39 @@ func (m *AnalyzeEntitySentimentRequest) GetEncodingType() EncodingType {
 // The entity-level sentiment analysis response message.
 type AnalyzeEntitySentimentResponse struct {
 	// The recognized entities in the input document with associated sentiments.
-	Entities []*Entity `protobuf:"bytes,1,rep,name=entities" json:"entities,omitempty"`
+	Entities []*Entity `protobuf:"bytes,1,rep,name=entities,proto3" json:"entities,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1.Document.language] field for more details.
-	Language string `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AnalyzeEntitySentimentResponse) Reset()                    { *m = AnalyzeEntitySentimentResponse{} }
-func (m *AnalyzeEntitySentimentResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitySentimentResponse) ProtoMessage()               {}
-func (*AnalyzeEntitySentimentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *AnalyzeEntitySentimentResponse) Reset()         { *m = AnalyzeEntitySentimentResponse{} }
+func (m *AnalyzeEntitySentimentResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitySentimentResponse) ProtoMessage()    {}
+func (*AnalyzeEntitySentimentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{13}
+}
+func (m *AnalyzeEntitySentimentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitySentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitySentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitySentimentResponse.Merge(dst, src)
+}
+func (m *AnalyzeEntitySentimentResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Size(m)
+}
+func (m *AnalyzeEntitySentimentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitySentimentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeEntitySentimentResponse proto.InternalMessageInfo
 
 func (m *AnalyzeEntitySentimentResponse) GetEntities() []*Entity {
 	if m != nil {
@@ -1775,15 +2089,37 @@ func (m *AnalyzeEntitySentimentResponse) GetLanguage() string {
 // The entity analysis request message.
 type AnalyzeEntitiesRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *AnalyzeEntitiesRequest) Reset()                    { *m = AnalyzeEntitiesRequest{} }
-func (m *AnalyzeEntitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitiesRequest) ProtoMessage()               {}
-func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *AnalyzeEntitiesRequest) Reset()         { *m = AnalyzeEntitiesRequest{} }
+func (m *AnalyzeEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitiesRequest) ProtoMessage()    {}
+func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{14}
+}
+func (m *AnalyzeEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(dst, src)
+}
+func (m *AnalyzeEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Size(m)
+}
+func (m *AnalyzeEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeEntitiesRequest proto.InternalMessageInfo
 
 func (m *AnalyzeEntitiesRequest) GetDocument() *Document {
 	if m != nil {
@@ -1802,17 +2138,39 @@ func (m *AnalyzeEntitiesRequest) GetEncodingType() EncodingType {
 // The entity analysis response message.
 type AnalyzeEntitiesResponse struct {
 	// The recognized entities in the input document.
-	Entities []*Entity `protobuf:"bytes,1,rep,name=entities" json:"entities,omitempty"`
+	Entities []*Entity `protobuf:"bytes,1,rep,name=entities,proto3" json:"entities,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1.Document.language] field for more details.
-	Language string `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeEntitiesResponse) Reset()         { *m = AnalyzeEntitiesResponse{} }
+func (m *AnalyzeEntitiesResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitiesResponse) ProtoMessage()    {}
+func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{15}
+}
+func (m *AnalyzeEntitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(dst, src)
+}
+func (m *AnalyzeEntitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Size(m)
+}
+func (m *AnalyzeEntitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitiesResponse.DiscardUnknown(m)
 }
 
-func (m *AnalyzeEntitiesResponse) Reset()                    { *m = AnalyzeEntitiesResponse{} }
-func (m *AnalyzeEntitiesResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitiesResponse) ProtoMessage()               {}
-func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_AnalyzeEntitiesResponse proto.InternalMessageInfo
 
 func (m *AnalyzeEntitiesResponse) GetEntities() []*Entity {
 	if m != nil {
@@ -1831,15 +2189,37 @@ func (m *AnalyzeEntitiesResponse) GetLanguage() string {
 // The syntax analysis request message.
 type AnalyzeSyntaxRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *AnalyzeSyntaxRequest) Reset()                    { *m = AnalyzeSyntaxRequest{} }
-func (m *AnalyzeSyntaxRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSyntaxRequest) ProtoMessage()               {}
-func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *AnalyzeSyntaxRequest) Reset()         { *m = AnalyzeSyntaxRequest{} }
+func (m *AnalyzeSyntaxRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSyntaxRequest) ProtoMessage()    {}
+func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{16}
+}
+func (m *AnalyzeSyntaxRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeSyntaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(dst, src)
+}
+func (m *AnalyzeSyntaxRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Size(m)
+}
+func (m *AnalyzeSyntaxRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSyntaxRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeSyntaxRequest proto.InternalMessageInfo
 
 func (m *AnalyzeSyntaxRequest) GetDocument() *Document {
 	if m != nil {
@@ -1858,19 +2238,41 @@ func (m *AnalyzeSyntaxRequest) GetEncodingType() EncodingType {
 // The syntax analysis response message.
 type AnalyzeSyntaxResponse struct {
 	// Sentences in the input document.
-	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences,proto3" json:"sentences,omitempty"`
 	// Tokens, along with their syntactic information, in the input document.
-	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens" json:"tokens,omitempty"`
+	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens,proto3" json:"tokens,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1.Document.language] field for more details.
-	Language string `protobuf:"bytes,3,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,3,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AnalyzeSyntaxResponse) Reset()                    { *m = AnalyzeSyntaxResponse{} }
-func (m *AnalyzeSyntaxResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSyntaxResponse) ProtoMessage()               {}
-func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *AnalyzeSyntaxResponse) Reset()         { *m = AnalyzeSyntaxResponse{} }
+func (m *AnalyzeSyntaxResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSyntaxResponse) ProtoMessage()    {}
+func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{17}
+}
+func (m *AnalyzeSyntaxResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeSyntaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(dst, src)
+}
+func (m *AnalyzeSyntaxResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Size(m)
+}
+func (m *AnalyzeSyntaxResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSyntaxResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeSyntaxResponse proto.InternalMessageInfo
 
 func (m *AnalyzeSyntaxResponse) GetSentences() []*Sentence {
 	if m != nil {
@@ -1896,13 +2298,35 @@ func (m *AnalyzeSyntaxResponse) GetLanguage() string {
 // The document classification request message.
 type ClassifyTextRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document             *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *ClassifyTextRequest) Reset()                    { *m = ClassifyTextRequest{} }
-func (m *ClassifyTextRequest) String() string            { return proto.CompactTextString(m) }
-func (*ClassifyTextRequest) ProtoMessage()               {}
-func (*ClassifyTextRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *ClassifyTextRequest) Reset()         { *m = ClassifyTextRequest{} }
+func (m *ClassifyTextRequest) String() string { return proto.CompactTextString(m) }
+func (*ClassifyTextRequest) ProtoMessage()    {}
+func (*ClassifyTextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{18}
+}
+func (m *ClassifyTextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassifyTextRequest.Unmarshal(m, b)
+}
+func (m *ClassifyTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassifyTextRequest.Marshal(b, m, deterministic)
+}
+func (dst *ClassifyTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassifyTextRequest.Merge(dst, src)
+}
+func (m *ClassifyTextRequest) XXX_Size() int {
+	return xxx_messageInfo_ClassifyTextRequest.Size(m)
+}
+func (m *ClassifyTextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassifyTextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClassifyTextRequest proto.InternalMessageInfo
 
 func (m *ClassifyTextRequest) GetDocument() *Document {
 	if m != nil {
@@ -1914,13 +2338,35 @@ func (m *ClassifyTextRequest) GetDocument() *Document {
 // The document classification response message.
 type ClassifyTextResponse struct {
 	// Categories representing the input document.
-	Categories []*ClassificationCategory `protobuf:"bytes,1,rep,name=categories" json:"categories,omitempty"`
+	Categories           []*ClassificationCategory `protobuf:"bytes,1,rep,name=categories,proto3" json:"categories,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *ClassifyTextResponse) Reset()         { *m = ClassifyTextResponse{} }
+func (m *ClassifyTextResponse) String() string { return proto.CompactTextString(m) }
+func (*ClassifyTextResponse) ProtoMessage()    {}
+func (*ClassifyTextResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{19}
+}
+func (m *ClassifyTextResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassifyTextResponse.Unmarshal(m, b)
+}
+func (m *ClassifyTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassifyTextResponse.Marshal(b, m, deterministic)
+}
+func (dst *ClassifyTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassifyTextResponse.Merge(dst, src)
+}
+func (m *ClassifyTextResponse) XXX_Size() int {
+	return xxx_messageInfo_ClassifyTextResponse.Size(m)
+}
+func (m *ClassifyTextResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassifyTextResponse.DiscardUnknown(m)
 }
 
-func (m *ClassifyTextResponse) Reset()                    { *m = ClassifyTextResponse{} }
-func (m *ClassifyTextResponse) String() string            { return proto.CompactTextString(m) }
-func (*ClassifyTextResponse) ProtoMessage()               {}
-func (*ClassifyTextResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_ClassifyTextResponse proto.InternalMessageInfo
 
 func (m *ClassifyTextResponse) GetCategories() []*ClassificationCategory {
 	if m != nil {
@@ -1933,17 +2379,39 @@ func (m *ClassifyTextResponse) GetCategories() []*ClassificationCategory {
 // analysis types (sentiment, entities, and syntax) in one call.
 type AnnotateTextRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The enabled features.
-	Features *AnnotateTextRequest_Features `protobuf:"bytes,2,opt,name=features" json:"features,omitempty"`
+	Features *AnnotateTextRequest_Features `protobuf:"bytes,2,opt,name=features,proto3" json:"features,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,3,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,3,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *AnnotateTextRequest) Reset()                    { *m = AnnotateTextRequest{} }
-func (m *AnnotateTextRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateTextRequest) ProtoMessage()               {}
-func (*AnnotateTextRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *AnnotateTextRequest) Reset()         { *m = AnnotateTextRequest{} }
+func (m *AnnotateTextRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateTextRequest) ProtoMessage()    {}
+func (*AnnotateTextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{20}
+}
+func (m *AnnotateTextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextRequest.Unmarshal(m, b)
+}
+func (m *AnnotateTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest.Merge(dst, src)
+}
+func (m *AnnotateTextRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextRequest.Size(m)
+}
+func (m *AnnotateTextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateTextRequest proto.InternalMessageInfo
 
 func (m *AnnotateTextRequest) GetDocument() *Document {
 	if m != nil {
@@ -1970,23 +2438,43 @@ func (m *AnnotateTextRequest) GetEncodingType() EncodingType {
 // Setting each one to true will enable that specific analysis for the input.
 type AnnotateTextRequest_Features struct {
 	// Extract syntax information.
-	ExtractSyntax bool `protobuf:"varint,1,opt,name=extract_syntax,json=extractSyntax" json:"extract_syntax,omitempty"`
+	ExtractSyntax bool `protobuf:"varint,1,opt,name=extract_syntax,json=extractSyntax,proto3" json:"extract_syntax,omitempty"`
 	// Extract entities.
-	ExtractEntities bool `protobuf:"varint,2,opt,name=extract_entities,json=extractEntities" json:"extract_entities,omitempty"`
+	ExtractEntities bool `protobuf:"varint,2,opt,name=extract_entities,json=extractEntities,proto3" json:"extract_entities,omitempty"`
 	// Extract document-level sentiment.
-	ExtractDocumentSentiment bool `protobuf:"varint,3,opt,name=extract_document_sentiment,json=extractDocumentSentiment" json:"extract_document_sentiment,omitempty"`
+	ExtractDocumentSentiment bool `protobuf:"varint,3,opt,name=extract_document_sentiment,json=extractDocumentSentiment,proto3" json:"extract_document_sentiment,omitempty"`
 	// Extract entities and their associated sentiment.
-	ExtractEntitySentiment bool `protobuf:"varint,4,opt,name=extract_entity_sentiment,json=extractEntitySentiment" json:"extract_entity_sentiment,omitempty"`
+	ExtractEntitySentiment bool `protobuf:"varint,4,opt,name=extract_entity_sentiment,json=extractEntitySentiment,proto3" json:"extract_entity_sentiment,omitempty"`
 	// Classify the full document into categories.
-	ClassifyText bool `protobuf:"varint,6,opt,name=classify_text,json=classifyText" json:"classify_text,omitempty"`
+	ClassifyText         bool     `protobuf:"varint,6,opt,name=classify_text,json=classifyText,proto3" json:"classify_text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *AnnotateTextRequest_Features) Reset()         { *m = AnnotateTextRequest_Features{} }
 func (m *AnnotateTextRequest_Features) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest_Features) ProtoMessage()    {}
 func (*AnnotateTextRequest_Features) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{20, 0}
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{20, 0}
 }
+func (m *AnnotateTextRequest_Features) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Unmarshal(m, b)
+}
+func (m *AnnotateTextRequest_Features) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest_Features.Merge(dst, src)
+}
+func (m *AnnotateTextRequest_Features) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Size(m)
+}
+func (m *AnnotateTextRequest_Features) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextRequest_Features.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateTextRequest_Features proto.InternalMessageInfo
 
 func (m *AnnotateTextRequest_Features) GetExtractSyntax() bool {
 	if m != nil {
@@ -2027,30 +2515,52 @@ func (m *AnnotateTextRequest_Features) GetClassifyText() bool {
 type AnnotateTextResponse struct {
 	// Sentences in the input document. Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_syntax][google.cloud.language.v1.AnnotateTextRequest.Features.extract_syntax].
-	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences,proto3" json:"sentences,omitempty"`
 	// Tokens, along with their syntactic information, in the input document.
 	// Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_syntax][google.cloud.language.v1.AnnotateTextRequest.Features.extract_syntax].
-	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens" json:"tokens,omitempty"`
+	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens,proto3" json:"tokens,omitempty"`
 	// Entities, along with their semantic information, in the input document.
 	// Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_entities][google.cloud.language.v1.AnnotateTextRequest.Features.extract_entities].
-	Entities []*Entity `protobuf:"bytes,3,rep,name=entities" json:"entities,omitempty"`
+	Entities []*Entity `protobuf:"bytes,3,rep,name=entities,proto3" json:"entities,omitempty"`
 	// The overall sentiment for the document. Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_document_sentiment][google.cloud.language.v1.AnnotateTextRequest.Features.extract_document_sentiment].
-	DocumentSentiment *Sentiment `protobuf:"bytes,4,opt,name=document_sentiment,json=documentSentiment" json:"document_sentiment,omitempty"`
+	DocumentSentiment *Sentiment `protobuf:"bytes,4,opt,name=document_sentiment,json=documentSentiment,proto3" json:"document_sentiment,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1.Document.language] field for more details.
-	Language string `protobuf:"bytes,5,opt,name=language" json:"language,omitempty"`
+	Language string `protobuf:"bytes,5,opt,name=language,proto3" json:"language,omitempty"`
 	// Categories identified in the input document.
-	Categories []*ClassificationCategory `protobuf:"bytes,6,rep,name=categories" json:"categories,omitempty"`
+	Categories           []*ClassificationCategory `protobuf:"bytes,6,rep,name=categories,proto3" json:"categories,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *AnnotateTextResponse) Reset()                    { *m = AnnotateTextResponse{} }
-func (m *AnnotateTextResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateTextResponse) ProtoMessage()               {}
-func (*AnnotateTextResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+func (m *AnnotateTextResponse) Reset()         { *m = AnnotateTextResponse{} }
+func (m *AnnotateTextResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateTextResponse) ProtoMessage()    {}
+func (*AnnotateTextResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_7142fb5eff0cd389, []int{21}
+}
+func (m *AnnotateTextResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextResponse.Unmarshal(m, b)
+}
+func (m *AnnotateTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextResponse.Merge(dst, src)
+}
+func (m *AnnotateTextResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextResponse.Size(m)
+}
+func (m *AnnotateTextResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateTextResponse proto.InternalMessageInfo
 
 func (m *AnnotateTextResponse) GetSentences() []*Sentence {
 	if m != nil {
@@ -2098,6 +2608,7 @@ func init() {
 	proto.RegisterType((*Document)(nil), "google.cloud.language.v1.Document")
 	proto.RegisterType((*Sentence)(nil), "google.cloud.language.v1.Sentence")
 	proto.RegisterType((*Entity)(nil), "google.cloud.language.v1.Entity")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.language.v1.Entity.MetadataEntry")
 	proto.RegisterType((*Token)(nil), "google.cloud.language.v1.Token")
 	proto.RegisterType((*Sentiment)(nil), "google.cloud.language.v1.Sentiment")
 	proto.RegisterType((*PartOfSpeech)(nil), "google.cloud.language.v1.PartOfSpeech")
@@ -2145,8 +2656,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for LanguageService service
-
+// LanguageServiceClient is the client API for LanguageService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type LanguageServiceClient interface {
 	// Analyzes the sentiment of the provided text.
 	AnalyzeSentiment(ctx context.Context, in *AnalyzeSentimentRequest, opts ...grpc.CallOption) (*AnalyzeSentimentResponse, error)
@@ -2178,7 +2690,7 @@ func NewLanguageServiceClient(cc *grpc.ClientConn) LanguageServiceClient {
 
 func (c *languageServiceClient) AnalyzeSentiment(ctx context.Context, in *AnalyzeSentimentRequest, opts ...grpc.CallOption) (*AnalyzeSentimentResponse, error) {
 	out := new(AnalyzeSentimentResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnalyzeSentiment", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnalyzeSentiment", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2187,7 +2699,7 @@ func (c *languageServiceClient) AnalyzeSentiment(ctx context.Context, in *Analyz
 
 func (c *languageServiceClient) AnalyzeEntities(ctx context.Context, in *AnalyzeEntitiesRequest, opts ...grpc.CallOption) (*AnalyzeEntitiesResponse, error) {
 	out := new(AnalyzeEntitiesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnalyzeEntities", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnalyzeEntities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2196,7 +2708,7 @@ func (c *languageServiceClient) AnalyzeEntities(ctx context.Context, in *Analyze
 
 func (c *languageServiceClient) AnalyzeEntitySentiment(ctx context.Context, in *AnalyzeEntitySentimentRequest, opts ...grpc.CallOption) (*AnalyzeEntitySentimentResponse, error) {
 	out := new(AnalyzeEntitySentimentResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnalyzeEntitySentiment", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnalyzeEntitySentiment", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2205,7 +2717,7 @@ func (c *languageServiceClient) AnalyzeEntitySentiment(ctx context.Context, in *
 
 func (c *languageServiceClient) AnalyzeSyntax(ctx context.Context, in *AnalyzeSyntaxRequest, opts ...grpc.CallOption) (*AnalyzeSyntaxResponse, error) {
 	out := new(AnalyzeSyntaxResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnalyzeSyntax", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnalyzeSyntax", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2214,7 +2726,7 @@ func (c *languageServiceClient) AnalyzeSyntax(ctx context.Context, in *AnalyzeSy
 
 func (c *languageServiceClient) ClassifyText(ctx context.Context, in *ClassifyTextRequest, opts ...grpc.CallOption) (*ClassifyTextResponse, error) {
 	out := new(ClassifyTextResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/ClassifyText", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/ClassifyText", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2223,15 +2735,14 @@ func (c *languageServiceClient) ClassifyText(ctx context.Context, in *ClassifyTe
 
 func (c *languageServiceClient) AnnotateText(ctx context.Context, in *AnnotateTextRequest, opts ...grpc.CallOption) (*AnnotateTextResponse, error) {
 	out := new(AnnotateTextResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnnotateText", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1.LanguageService/AnnotateText", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for LanguageService service
-
+// LanguageServiceServer is the server API for LanguageService service.
 type LanguageServiceServer interface {
 	// Analyzes the sentiment of the provided text.
 	AnalyzeSentiment(context.Context, *AnalyzeSentimentRequest) (*AnalyzeSentimentResponse, error)
@@ -2398,9 +2909,11 @@ var _LanguageService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/language/v1/language_service.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/language/v1/language_service.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/language/v1/language_service.proto", fileDescriptor_language_service_7142fb5eff0cd389)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_language_service_7142fb5eff0cd389 = []byte{
 	// 2967 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcb, 0x73, 0xdb, 0xd6,
 	0xd5, 0x37, 0xf8, 0x12, 0x75, 0x28, 0xc9, 0xd7, 0xb0, 0xe3, 0xf0, 0x53, 0x1c, 0xc7, 0x81, 0x63,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/language/v1beta1/language_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/language/v1beta1/language_service.pb.go
index 4eba8950..bd88f5b1 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/language/v1beta1/language_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/language/v1beta1/language_service.pb.go
@@ -1,32 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1beta1/language_service.proto
 
-/*
-Package language is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/language/v1beta1/language_service.proto
-
-It has these top-level messages:
-	Document
-	Sentence
-	Entity
-	Token
-	Sentiment
-	PartOfSpeech
-	DependencyEdge
-	EntityMention
-	TextSpan
-	AnalyzeSentimentRequest
-	AnalyzeSentimentResponse
-	AnalyzeEntitiesRequest
-	AnalyzeEntitiesResponse
-	AnalyzeSyntaxRequest
-	AnalyzeSyntaxResponse
-	AnnotateTextRequest
-	AnnotateTextResponse
-*/
-package language
+package language // import "google.golang.org/genproto/googleapis/cloud/language/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -90,7 +65,9 @@ var EncodingType_value = map[string]int32{
 func (x EncodingType) String() string {
 	return proto.EnumName(EncodingType_name, int32(x))
 }
-func (EncodingType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (EncodingType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{0}
+}
 
 // The document types enum.
 type Document_Type int32
@@ -118,7 +95,9 @@ var Document_Type_value = map[string]int32{
 func (x Document_Type) String() string {
 	return proto.EnumName(Document_Type_name, int32(x))
 }
-func (Document_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (Document_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{0, 0}
+}
 
 // The type of the entity.
 type Entity_Type int32
@@ -166,7 +145,9 @@ var Entity_Type_value = map[string]int32{
 func (x Entity_Type) String() string {
 	return proto.EnumName(Entity_Type_name, int32(x))
 }
-func (Entity_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (Entity_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{2, 0}
+}
 
 // The part of speech tags enum.
 type PartOfSpeech_Tag int32
@@ -238,7 +219,9 @@ var PartOfSpeech_Tag_value = map[string]int32{
 func (x PartOfSpeech_Tag) String() string {
 	return proto.EnumName(PartOfSpeech_Tag_name, int32(x))
 }
-func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 0} }
+func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 0}
+}
 
 // The characteristic of a verb that expresses time flow during an event.
 type PartOfSpeech_Aspect int32
@@ -270,7 +253,9 @@ var PartOfSpeech_Aspect_value = map[string]int32{
 func (x PartOfSpeech_Aspect) String() string {
 	return proto.EnumName(PartOfSpeech_Aspect_name, int32(x))
 }
-func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 1} }
+func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 1}
+}
 
 // The grammatical function performed by a noun or pronoun in a phrase,
 // clause, or sentence. In some languages, other parts of speech, such as
@@ -348,7 +333,9 @@ var PartOfSpeech_Case_value = map[string]int32{
 func (x PartOfSpeech_Case) String() string {
 	return proto.EnumName(PartOfSpeech_Case_name, int32(x))
 }
-func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 2} }
+func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 2}
+}
 
 // Depending on the language, Form can be categorizing different forms of
 // verbs, adjectives, adverbs, etc. For example, categorizing inflected
@@ -415,7 +402,9 @@ var PartOfSpeech_Form_value = map[string]int32{
 func (x PartOfSpeech_Form) String() string {
 	return proto.EnumName(PartOfSpeech_Form_name, int32(x))
 }
-func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 3} }
+func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 3}
+}
 
 // Gender classes of nouns reflected in the behaviour of associated words.
 type PartOfSpeech_Gender int32
@@ -447,7 +436,9 @@ var PartOfSpeech_Gender_value = map[string]int32{
 func (x PartOfSpeech_Gender) String() string {
 	return proto.EnumName(PartOfSpeech_Gender_name, int32(x))
 }
-func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 4} }
+func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 4}
+}
 
 // The grammatical feature of verbs, used for showing modality and attitude.
 type PartOfSpeech_Mood int32
@@ -491,7 +482,9 @@ var PartOfSpeech_Mood_value = map[string]int32{
 func (x PartOfSpeech_Mood) String() string {
 	return proto.EnumName(PartOfSpeech_Mood_name, int32(x))
 }
-func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 5} }
+func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 5}
+}
 
 // Count distinctions.
 type PartOfSpeech_Number int32
@@ -523,7 +516,9 @@ var PartOfSpeech_Number_value = map[string]int32{
 func (x PartOfSpeech_Number) String() string {
 	return proto.EnumName(PartOfSpeech_Number_name, int32(x))
 }
-func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 6} }
+func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 6}
+}
 
 // The distinction between the speaker, second person, third person, etc.
 type PartOfSpeech_Person int32
@@ -559,7 +554,9 @@ var PartOfSpeech_Person_value = map[string]int32{
 func (x PartOfSpeech_Person) String() string {
 	return proto.EnumName(PartOfSpeech_Person_name, int32(x))
 }
-func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 7} }
+func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 7}
+}
 
 // This category shows if the token is part of a proper name.
 type PartOfSpeech_Proper int32
@@ -587,7 +584,9 @@ var PartOfSpeech_Proper_value = map[string]int32{
 func (x PartOfSpeech_Proper) String() string {
 	return proto.EnumName(PartOfSpeech_Proper_name, int32(x))
 }
-func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 8} }
+func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 8}
+}
 
 // Reciprocal features of a pronoun.
 type PartOfSpeech_Reciprocity int32
@@ -616,7 +615,9 @@ var PartOfSpeech_Reciprocity_value = map[string]int32{
 func (x PartOfSpeech_Reciprocity) String() string {
 	return proto.EnumName(PartOfSpeech_Reciprocity_name, int32(x))
 }
-func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 9} }
+func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 9}
+}
 
 // Time reference.
 type PartOfSpeech_Tense int32
@@ -660,7 +661,9 @@ var PartOfSpeech_Tense_value = map[string]int32{
 func (x PartOfSpeech_Tense) String() string {
 	return proto.EnumName(PartOfSpeech_Tense_name, int32(x))
 }
-func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 10} }
+func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 10}
+}
 
 // The relationship between the action that a verb expresses and the
 // participants identified by its arguments.
@@ -693,7 +696,9 @@ var PartOfSpeech_Voice_value = map[string]int32{
 func (x PartOfSpeech_Voice) String() string {
 	return proto.EnumName(PartOfSpeech_Voice_name, int32(x))
 }
-func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 11} }
+func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5, 11}
+}
 
 // The parse label enum for the token.
 type DependencyEdge_Label int32
@@ -1017,7 +1022,9 @@ var DependencyEdge_Label_value = map[string]int32{
 func (x DependencyEdge_Label) String() string {
 	return proto.EnumName(DependencyEdge_Label_name, int32(x))
 }
-func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{6, 0} }
+func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{6, 0}
+}
 
 // The supported types of mentions.
 type EntityMention_Type int32
@@ -1045,7 +1052,9 @@ var EntityMention_Type_value = map[string]int32{
 func (x EntityMention_Type) String() string {
 	return proto.EnumName(EntityMention_Type_name, int32(x))
 }
-func (EntityMention_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
+func (EntityMention_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{7, 0}
+}
 
 // ################################################################ #
 //
@@ -1053,7 +1062,7 @@ func (EntityMention_Type) EnumDescriptor() ([]byte, []int) { return fileDescript
 type Document struct {
 	// Required. If the type is not set or is `TYPE_UNSPECIFIED`,
 	// returns an `INVALID_ARGUMENT` error.
-	Type Document_Type `protobuf:"varint,1,opt,name=type,enum=google.cloud.language.v1beta1.Document_Type" json:"type,omitempty"`
+	Type Document_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.language.v1beta1.Document_Type" json:"type,omitempty"`
 	// The source of the document: a string containing the content or a
 	// Google Cloud Storage URI.
 	//
@@ -1069,26 +1078,57 @@ type Document struct {
 	// If the language (either specified by the caller or automatically detected)
 	// is not supported by the called API method, an `INVALID_ARGUMENT` error
 	// is returned.
-	Language string `protobuf:"bytes,4,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,4,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Document) Reset()                    { *m = Document{} }
-func (m *Document) String() string            { return proto.CompactTextString(m) }
-func (*Document) ProtoMessage()               {}
-func (*Document) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Document) Reset()         { *m = Document{} }
+func (m *Document) String() string { return proto.CompactTextString(m) }
+func (*Document) ProtoMessage()    {}
+func (*Document) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{0}
+}
+func (m *Document) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Document.Unmarshal(m, b)
+}
+func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
+}
+func (dst *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(dst, src)
+}
+func (m *Document) XXX_Size() int {
+	return xxx_messageInfo_Document.Size(m)
+}
+func (m *Document) XXX_DiscardUnknown() {
+	xxx_messageInfo_Document.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Document proto.InternalMessageInfo
+
+func (m *Document) GetType() Document_Type {
+	if m != nil {
+		return m.Type
+	}
+	return Document_TYPE_UNSPECIFIED
+}
 
 type isDocument_Source interface {
 	isDocument_Source()
 }
 
 type Document_Content struct {
-	Content string `protobuf:"bytes,2,opt,name=content,oneof"`
+	Content string `protobuf:"bytes,2,opt,name=content,proto3,oneof"`
 }
+
 type Document_GcsContentUri struct {
-	GcsContentUri string `protobuf:"bytes,3,opt,name=gcs_content_uri,json=gcsContentUri,oneof"`
+	GcsContentUri string `protobuf:"bytes,3,opt,name=gcs_content_uri,json=gcsContentUri,proto3,oneof"`
 }
 
-func (*Document_Content) isDocument_Source()       {}
+func (*Document_Content) isDocument_Source() {}
+
 func (*Document_GcsContentUri) isDocument_Source() {}
 
 func (m *Document) GetSource() isDocument_Source {
@@ -1098,13 +1138,6 @@ func (m *Document) GetSource() isDocument_Source {
 	return nil
 }
 
-func (m *Document) GetType() Document_Type {
-	if m != nil {
-		return m.Type
-	}
-	return Document_TYPE_UNSPECIFIED
-}
-
 func (m *Document) GetContent() string {
 	if x, ok := m.GetSource().(*Document_Content); ok {
 		return x.Content
@@ -1178,11 +1211,11 @@ func _Document_OneofSizer(msg proto.Message) (n int) {
 	// source
 	switch x := m.Source.(type) {
 	case *Document_Content:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Content)))
 		n += len(x.Content)
 	case *Document_GcsContentUri:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.GcsContentUri)))
 		n += len(x.GcsContentUri)
 	case nil:
@@ -1195,17 +1228,39 @@ func _Document_OneofSizer(msg proto.Message) (n int) {
 // Represents a sentence in the input document.
 type Sentence struct {
 	// The sentence text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// For calls to [AnalyzeSentiment][] or if
 	// [AnnotateTextRequest.Features.extract_document_sentiment][google.cloud.language.v1beta1.AnnotateTextRequest.Features.extract_document_sentiment] is set to
 	// true, this field will contain the sentiment for the sentence.
-	Sentiment *Sentiment `protobuf:"bytes,2,opt,name=sentiment" json:"sentiment,omitempty"`
+	Sentiment            *Sentiment `protobuf:"bytes,2,opt,name=sentiment,proto3" json:"sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *Sentence) Reset()                    { *m = Sentence{} }
-func (m *Sentence) String() string            { return proto.CompactTextString(m) }
-func (*Sentence) ProtoMessage()               {}
-func (*Sentence) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Sentence) Reset()         { *m = Sentence{} }
+func (m *Sentence) String() string { return proto.CompactTextString(m) }
+func (*Sentence) ProtoMessage()    {}
+func (*Sentence) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{1}
+}
+func (m *Sentence) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Sentence.Unmarshal(m, b)
+}
+func (m *Sentence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Sentence.Marshal(b, m, deterministic)
+}
+func (dst *Sentence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentence.Merge(dst, src)
+}
+func (m *Sentence) XXX_Size() int {
+	return xxx_messageInfo_Sentence.Size(m)
+}
+func (m *Sentence) XXX_DiscardUnknown() {
+	xxx_messageInfo_Sentence.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Sentence proto.InternalMessageInfo
 
 func (m *Sentence) GetText() *TextSpan {
 	if m != nil {
@@ -1226,30 +1281,52 @@ func (m *Sentence) GetSentiment() *Sentiment {
 // as salience and mentions, with entities.
 type Entity struct {
 	// The representative name for the entity.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The entity type.
-	Type Entity_Type `protobuf:"varint,2,opt,name=type,enum=google.cloud.language.v1beta1.Entity_Type" json:"type,omitempty"`
+	Type Entity_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.language.v1beta1.Entity_Type" json:"type,omitempty"`
 	// Metadata associated with the entity.
 	//
 	// Currently, Wikipedia URLs and Knowledge Graph MIDs are provided, if
 	// available. The associated keys are "wikipedia_url" and "mid", respectively.
-	Metadata map[string]string `protobuf:"bytes,3,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata map[string]string `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The salience score associated with the entity in the [0, 1.0] range.
 	//
 	// The salience score for an entity provides information about the
 	// importance or centrality of that entity to the entire document text.
 	// Scores closer to 0 are less salient, while scores closer to 1.0 are highly
 	// salient.
-	Salience float32 `protobuf:"fixed32,4,opt,name=salience" json:"salience,omitempty"`
+	Salience float32 `protobuf:"fixed32,4,opt,name=salience,proto3" json:"salience,omitempty"`
 	// The mentions of this entity in the input document. The API currently
 	// supports proper noun mentions.
-	Mentions []*EntityMention `protobuf:"bytes,5,rep,name=mentions" json:"mentions,omitempty"`
+	Mentions             []*EntityMention `protobuf:"bytes,5,rep,name=mentions,proto3" json:"mentions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *Entity) Reset()         { *m = Entity{} }
+func (m *Entity) String() string { return proto.CompactTextString(m) }
+func (*Entity) ProtoMessage()    {}
+func (*Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{2}
+}
+func (m *Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Entity.Unmarshal(m, b)
+}
+func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
+}
+func (dst *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(dst, src)
+}
+func (m *Entity) XXX_Size() int {
+	return xxx_messageInfo_Entity.Size(m)
+}
+func (m *Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Entity.DiscardUnknown(m)
 }
 
-func (m *Entity) Reset()                    { *m = Entity{} }
-func (m *Entity) String() string            { return proto.CompactTextString(m) }
-func (*Entity) ProtoMessage()               {}
-func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_Entity proto.InternalMessageInfo
 
 func (m *Entity) GetName() string {
 	if m != nil {
@@ -1289,19 +1366,41 @@ func (m *Entity) GetMentions() []*EntityMention {
 // Represents the smallest syntactic building block of the text.
 type Token struct {
 	// The token text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// Parts of speech tag for this token.
-	PartOfSpeech *PartOfSpeech `protobuf:"bytes,2,opt,name=part_of_speech,json=partOfSpeech" json:"part_of_speech,omitempty"`
+	PartOfSpeech *PartOfSpeech `protobuf:"bytes,2,opt,name=part_of_speech,json=partOfSpeech,proto3" json:"part_of_speech,omitempty"`
 	// Dependency tree parse for this token.
-	DependencyEdge *DependencyEdge `protobuf:"bytes,3,opt,name=dependency_edge,json=dependencyEdge" json:"dependency_edge,omitempty"`
+	DependencyEdge *DependencyEdge `protobuf:"bytes,3,opt,name=dependency_edge,json=dependencyEdge,proto3" json:"dependency_edge,omitempty"`
 	// [Lemma](https://en.wikipedia.org/wiki/Lemma_%28morphology%29) of the token.
-	Lemma string `protobuf:"bytes,4,opt,name=lemma" json:"lemma,omitempty"`
+	Lemma                string   `protobuf:"bytes,4,opt,name=lemma,proto3" json:"lemma,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Token) Reset()         { *m = Token{} }
+func (m *Token) String() string { return proto.CompactTextString(m) }
+func (*Token) ProtoMessage()    {}
+func (*Token) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{3}
+}
+func (m *Token) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Token.Unmarshal(m, b)
+}
+func (m *Token) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Token.Marshal(b, m, deterministic)
+}
+func (dst *Token) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Token.Merge(dst, src)
+}
+func (m *Token) XXX_Size() int {
+	return xxx_messageInfo_Token.Size(m)
+}
+func (m *Token) XXX_DiscardUnknown() {
+	xxx_messageInfo_Token.DiscardUnknown(m)
 }
 
-func (m *Token) Reset()                    { *m = Token{} }
-func (m *Token) String() string            { return proto.CompactTextString(m) }
-func (*Token) ProtoMessage()               {}
-func (*Token) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_Token proto.InternalMessageInfo
 
 func (m *Token) GetText() *TextSpan {
 	if m != nil {
@@ -1337,20 +1436,42 @@ type Sentiment struct {
 	// DEPRECATED FIELD - This field is being deprecated in
 	// favor of score. Please refer to our documentation at
 	// https://cloud.google.com/natural-language/docs for more information.
-	Polarity float32 `protobuf:"fixed32,1,opt,name=polarity" json:"polarity,omitempty"`
+	Polarity float32 `protobuf:"fixed32,1,opt,name=polarity,proto3" json:"polarity,omitempty"`
 	// A non-negative number in the [0, +inf) range, which represents
 	// the absolute magnitude of sentiment regardless of score (positive or
 	// negative).
-	Magnitude float32 `protobuf:"fixed32,2,opt,name=magnitude" json:"magnitude,omitempty"`
+	Magnitude float32 `protobuf:"fixed32,2,opt,name=magnitude,proto3" json:"magnitude,omitempty"`
 	// Sentiment score between -1.0 (negative sentiment) and 1.0
 	// (positive sentiment).
-	Score float32 `protobuf:"fixed32,3,opt,name=score" json:"score,omitempty"`
+	Score                float32  `protobuf:"fixed32,3,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Sentiment) Reset()                    { *m = Sentiment{} }
-func (m *Sentiment) String() string            { return proto.CompactTextString(m) }
-func (*Sentiment) ProtoMessage()               {}
-func (*Sentiment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *Sentiment) Reset()         { *m = Sentiment{} }
+func (m *Sentiment) String() string { return proto.CompactTextString(m) }
+func (*Sentiment) ProtoMessage()    {}
+func (*Sentiment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{4}
+}
+func (m *Sentiment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
+}
+func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
+}
+func (dst *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(dst, src)
+}
+func (m *Sentiment) XXX_Size() int {
+	return xxx_messageInfo_Sentiment.Size(m)
+}
+func (m *Sentiment) XXX_DiscardUnknown() {
+	xxx_messageInfo_Sentiment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Sentiment proto.InternalMessageInfo
 
 func (m *Sentiment) GetPolarity() float32 {
 	if m != nil {
@@ -1376,35 +1497,57 @@ func (m *Sentiment) GetScore() float32 {
 // Represents part of speech information for a token.
 type PartOfSpeech struct {
 	// The part of speech tag.
-	Tag PartOfSpeech_Tag `protobuf:"varint,1,opt,name=tag,enum=google.cloud.language.v1beta1.PartOfSpeech_Tag" json:"tag,omitempty"`
+	Tag PartOfSpeech_Tag `protobuf:"varint,1,opt,name=tag,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Tag" json:"tag,omitempty"`
 	// The grammatical aspect.
-	Aspect PartOfSpeech_Aspect `protobuf:"varint,2,opt,name=aspect,enum=google.cloud.language.v1beta1.PartOfSpeech_Aspect" json:"aspect,omitempty"`
+	Aspect PartOfSpeech_Aspect `protobuf:"varint,2,opt,name=aspect,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Aspect" json:"aspect,omitempty"`
 	// The grammatical case.
-	Case PartOfSpeech_Case `protobuf:"varint,3,opt,name=case,enum=google.cloud.language.v1beta1.PartOfSpeech_Case" json:"case,omitempty"`
+	Case PartOfSpeech_Case `protobuf:"varint,3,opt,name=case,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Case" json:"case,omitempty"`
 	// The grammatical form.
-	Form PartOfSpeech_Form `protobuf:"varint,4,opt,name=form,enum=google.cloud.language.v1beta1.PartOfSpeech_Form" json:"form,omitempty"`
+	Form PartOfSpeech_Form `protobuf:"varint,4,opt,name=form,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Form" json:"form,omitempty"`
 	// The grammatical gender.
-	Gender PartOfSpeech_Gender `protobuf:"varint,5,opt,name=gender,enum=google.cloud.language.v1beta1.PartOfSpeech_Gender" json:"gender,omitempty"`
+	Gender PartOfSpeech_Gender `protobuf:"varint,5,opt,name=gender,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Gender" json:"gender,omitempty"`
 	// The grammatical mood.
-	Mood PartOfSpeech_Mood `protobuf:"varint,6,opt,name=mood,enum=google.cloud.language.v1beta1.PartOfSpeech_Mood" json:"mood,omitempty"`
+	Mood PartOfSpeech_Mood `protobuf:"varint,6,opt,name=mood,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Mood" json:"mood,omitempty"`
 	// The grammatical number.
-	Number PartOfSpeech_Number `protobuf:"varint,7,opt,name=number,enum=google.cloud.language.v1beta1.PartOfSpeech_Number" json:"number,omitempty"`
+	Number PartOfSpeech_Number `protobuf:"varint,7,opt,name=number,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Number" json:"number,omitempty"`
 	// The grammatical person.
-	Person PartOfSpeech_Person `protobuf:"varint,8,opt,name=person,enum=google.cloud.language.v1beta1.PartOfSpeech_Person" json:"person,omitempty"`
+	Person PartOfSpeech_Person `protobuf:"varint,8,opt,name=person,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Person" json:"person,omitempty"`
 	// The grammatical properness.
-	Proper PartOfSpeech_Proper `protobuf:"varint,9,opt,name=proper,enum=google.cloud.language.v1beta1.PartOfSpeech_Proper" json:"proper,omitempty"`
+	Proper PartOfSpeech_Proper `protobuf:"varint,9,opt,name=proper,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Proper" json:"proper,omitempty"`
 	// The grammatical reciprocity.
-	Reciprocity PartOfSpeech_Reciprocity `protobuf:"varint,10,opt,name=reciprocity,enum=google.cloud.language.v1beta1.PartOfSpeech_Reciprocity" json:"reciprocity,omitempty"`
+	Reciprocity PartOfSpeech_Reciprocity `protobuf:"varint,10,opt,name=reciprocity,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Reciprocity" json:"reciprocity,omitempty"`
 	// The grammatical tense.
-	Tense PartOfSpeech_Tense `protobuf:"varint,11,opt,name=tense,enum=google.cloud.language.v1beta1.PartOfSpeech_Tense" json:"tense,omitempty"`
+	Tense PartOfSpeech_Tense `protobuf:"varint,11,opt,name=tense,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Tense" json:"tense,omitempty"`
 	// The grammatical voice.
-	Voice PartOfSpeech_Voice `protobuf:"varint,12,opt,name=voice,enum=google.cloud.language.v1beta1.PartOfSpeech_Voice" json:"voice,omitempty"`
+	Voice                PartOfSpeech_Voice `protobuf:"varint,12,opt,name=voice,proto3,enum=google.cloud.language.v1beta1.PartOfSpeech_Voice" json:"voice,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *PartOfSpeech) Reset()         { *m = PartOfSpeech{} }
+func (m *PartOfSpeech) String() string { return proto.CompactTextString(m) }
+func (*PartOfSpeech) ProtoMessage()    {}
+func (*PartOfSpeech) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{5}
+}
+func (m *PartOfSpeech) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartOfSpeech.Unmarshal(m, b)
+}
+func (m *PartOfSpeech) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartOfSpeech.Marshal(b, m, deterministic)
+}
+func (dst *PartOfSpeech) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartOfSpeech.Merge(dst, src)
+}
+func (m *PartOfSpeech) XXX_Size() int {
+	return xxx_messageInfo_PartOfSpeech.Size(m)
+}
+func (m *PartOfSpeech) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartOfSpeech.DiscardUnknown(m)
 }
 
-func (m *PartOfSpeech) Reset()                    { *m = PartOfSpeech{} }
-func (m *PartOfSpeech) String() string            { return proto.CompactTextString(m) }
-func (*PartOfSpeech) ProtoMessage()               {}
-func (*PartOfSpeech) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_PartOfSpeech proto.InternalMessageInfo
 
 func (m *PartOfSpeech) GetTag() PartOfSpeech_Tag {
 	if m != nil {
@@ -1497,15 +1640,37 @@ type DependencyEdge struct {
 	// The index is the position of the token in the array of tokens returned
 	// by the API method. If this token is a root token, then the
 	// `head_token_index` is its own index.
-	HeadTokenIndex int32 `protobuf:"varint,1,opt,name=head_token_index,json=headTokenIndex" json:"head_token_index,omitempty"`
+	HeadTokenIndex int32 `protobuf:"varint,1,opt,name=head_token_index,json=headTokenIndex,proto3" json:"head_token_index,omitempty"`
 	// The parse label for the token.
-	Label DependencyEdge_Label `protobuf:"varint,2,opt,name=label,enum=google.cloud.language.v1beta1.DependencyEdge_Label" json:"label,omitempty"`
+	Label                DependencyEdge_Label `protobuf:"varint,2,opt,name=label,proto3,enum=google.cloud.language.v1beta1.DependencyEdge_Label" json:"label,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *DependencyEdge) Reset()                    { *m = DependencyEdge{} }
-func (m *DependencyEdge) String() string            { return proto.CompactTextString(m) }
-func (*DependencyEdge) ProtoMessage()               {}
-func (*DependencyEdge) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *DependencyEdge) Reset()         { *m = DependencyEdge{} }
+func (m *DependencyEdge) String() string { return proto.CompactTextString(m) }
+func (*DependencyEdge) ProtoMessage()    {}
+func (*DependencyEdge) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{6}
+}
+func (m *DependencyEdge) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DependencyEdge.Unmarshal(m, b)
+}
+func (m *DependencyEdge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DependencyEdge.Marshal(b, m, deterministic)
+}
+func (dst *DependencyEdge) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DependencyEdge.Merge(dst, src)
+}
+func (m *DependencyEdge) XXX_Size() int {
+	return xxx_messageInfo_DependencyEdge.Size(m)
+}
+func (m *DependencyEdge) XXX_DiscardUnknown() {
+	xxx_messageInfo_DependencyEdge.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DependencyEdge proto.InternalMessageInfo
 
 func (m *DependencyEdge) GetHeadTokenIndex() int32 {
 	if m != nil {
@@ -1525,15 +1690,37 @@ func (m *DependencyEdge) GetLabel() DependencyEdge_Label {
 // mentions are supported.
 type EntityMention struct {
 	// The mention text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// The type of the entity mention.
-	Type EntityMention_Type `protobuf:"varint,2,opt,name=type,enum=google.cloud.language.v1beta1.EntityMention_Type" json:"type,omitempty"`
+	Type                 EntityMention_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.language.v1beta1.EntityMention_Type" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *EntityMention) Reset()         { *m = EntityMention{} }
+func (m *EntityMention) String() string { return proto.CompactTextString(m) }
+func (*EntityMention) ProtoMessage()    {}
+func (*EntityMention) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{7}
+}
+func (m *EntityMention) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityMention.Unmarshal(m, b)
+}
+func (m *EntityMention) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityMention.Marshal(b, m, deterministic)
+}
+func (dst *EntityMention) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityMention.Merge(dst, src)
+}
+func (m *EntityMention) XXX_Size() int {
+	return xxx_messageInfo_EntityMention.Size(m)
+}
+func (m *EntityMention) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityMention.DiscardUnknown(m)
 }
 
-func (m *EntityMention) Reset()                    { *m = EntityMention{} }
-func (m *EntityMention) String() string            { return proto.CompactTextString(m) }
-func (*EntityMention) ProtoMessage()               {}
-func (*EntityMention) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_EntityMention proto.InternalMessageInfo
 
 func (m *EntityMention) GetText() *TextSpan {
 	if m != nil {
@@ -1552,16 +1739,38 @@ func (m *EntityMention) GetType() EntityMention_Type {
 // Represents an output piece of text.
 type TextSpan struct {
 	// The content of the output text.
-	Content string `protobuf:"bytes,1,opt,name=content" json:"content,omitempty"`
+	Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
 	// The API calculates the beginning offset of the content in the original
 	// document according to the [EncodingType][google.cloud.language.v1beta1.EncodingType] specified in the API request.
-	BeginOffset int32 `protobuf:"varint,2,opt,name=begin_offset,json=beginOffset" json:"begin_offset,omitempty"`
+	BeginOffset          int32    `protobuf:"varint,2,opt,name=begin_offset,json=beginOffset,proto3" json:"begin_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextSpan) Reset()         { *m = TextSpan{} }
+func (m *TextSpan) String() string { return proto.CompactTextString(m) }
+func (*TextSpan) ProtoMessage()    {}
+func (*TextSpan) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{8}
+}
+func (m *TextSpan) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextSpan.Unmarshal(m, b)
+}
+func (m *TextSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextSpan.Marshal(b, m, deterministic)
+}
+func (dst *TextSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSpan.Merge(dst, src)
+}
+func (m *TextSpan) XXX_Size() int {
+	return xxx_messageInfo_TextSpan.Size(m)
+}
+func (m *TextSpan) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextSpan.DiscardUnknown(m)
 }
 
-func (m *TextSpan) Reset()                    { *m = TextSpan{} }
-func (m *TextSpan) String() string            { return proto.CompactTextString(m) }
-func (*TextSpan) ProtoMessage()               {}
-func (*TextSpan) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_TextSpan proto.InternalMessageInfo
 
 func (m *TextSpan) GetContent() string {
 	if m != nil {
@@ -1580,16 +1789,38 @@ func (m *TextSpan) GetBeginOffset() int32 {
 // The sentiment analysis request message.
 type AnalyzeSentimentRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate sentence offsets for the
 	// sentence sentiment.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AnalyzeSentimentRequest) Reset()         { *m = AnalyzeSentimentRequest{} }
+func (m *AnalyzeSentimentRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSentimentRequest) ProtoMessage()    {}
+func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{9}
+}
+func (m *AnalyzeSentimentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeSentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentRequest.Merge(dst, src)
+}
+func (m *AnalyzeSentimentRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Size(m)
+}
+func (m *AnalyzeSentimentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSentimentRequest.DiscardUnknown(m)
 }
 
-func (m *AnalyzeSentimentRequest) Reset()                    { *m = AnalyzeSentimentRequest{} }
-func (m *AnalyzeSentimentRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSentimentRequest) ProtoMessage()               {}
-func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_AnalyzeSentimentRequest proto.InternalMessageInfo
 
 func (m *AnalyzeSentimentRequest) GetDocument() *Document {
 	if m != nil {
@@ -1608,19 +1839,41 @@ func (m *AnalyzeSentimentRequest) GetEncodingType() EncodingType {
 // The sentiment analysis response message.
 type AnalyzeSentimentResponse struct {
 	// The overall sentiment of the input document.
-	DocumentSentiment *Sentiment `protobuf:"bytes,1,opt,name=document_sentiment,json=documentSentiment" json:"document_sentiment,omitempty"`
+	DocumentSentiment *Sentiment `protobuf:"bytes,1,opt,name=document_sentiment,json=documentSentiment,proto3" json:"document_sentiment,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta1.Document.language] field for more details.
-	Language string `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Language string `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
 	// The sentiment for all the sentences in the document.
-	Sentences []*Sentence `protobuf:"bytes,3,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences            []*Sentence `protobuf:"bytes,3,rep,name=sentences,proto3" json:"sentences,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *AnalyzeSentimentResponse) Reset()         { *m = AnalyzeSentimentResponse{} }
+func (m *AnalyzeSentimentResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSentimentResponse) ProtoMessage()    {}
+func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{10}
+}
+func (m *AnalyzeSentimentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeSentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentResponse.Merge(dst, src)
+}
+func (m *AnalyzeSentimentResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Size(m)
+}
+func (m *AnalyzeSentimentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSentimentResponse.DiscardUnknown(m)
 }
 
-func (m *AnalyzeSentimentResponse) Reset()                    { *m = AnalyzeSentimentResponse{} }
-func (m *AnalyzeSentimentResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSentimentResponse) ProtoMessage()               {}
-func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_AnalyzeSentimentResponse proto.InternalMessageInfo
 
 func (m *AnalyzeSentimentResponse) GetDocumentSentiment() *Sentiment {
 	if m != nil {
@@ -1646,15 +1899,37 @@ func (m *AnalyzeSentimentResponse) GetSentences() []*Sentence {
 // The entity analysis request message.
 type AnalyzeEntitiesRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AnalyzeEntitiesRequest) Reset()         { *m = AnalyzeEntitiesRequest{} }
+func (m *AnalyzeEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitiesRequest) ProtoMessage()    {}
+func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{11}
+}
+func (m *AnalyzeEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(dst, src)
+}
+func (m *AnalyzeEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Size(m)
+}
+func (m *AnalyzeEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitiesRequest.DiscardUnknown(m)
 }
 
-func (m *AnalyzeEntitiesRequest) Reset()                    { *m = AnalyzeEntitiesRequest{} }
-func (m *AnalyzeEntitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitiesRequest) ProtoMessage()               {}
-func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_AnalyzeEntitiesRequest proto.InternalMessageInfo
 
 func (m *AnalyzeEntitiesRequest) GetDocument() *Document {
 	if m != nil {
@@ -1673,17 +1948,39 @@ func (m *AnalyzeEntitiesRequest) GetEncodingType() EncodingType {
 // The entity analysis response message.
 type AnalyzeEntitiesResponse struct {
 	// The recognized entities in the input document.
-	Entities []*Entity `protobuf:"bytes,1,rep,name=entities" json:"entities,omitempty"`
+	Entities []*Entity `protobuf:"bytes,1,rep,name=entities,proto3" json:"entities,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta1.Document.language] field for more details.
-	Language string `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeEntitiesResponse) Reset()         { *m = AnalyzeEntitiesResponse{} }
+func (m *AnalyzeEntitiesResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitiesResponse) ProtoMessage()    {}
+func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{12}
+}
+func (m *AnalyzeEntitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(dst, src)
+}
+func (m *AnalyzeEntitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Size(m)
+}
+func (m *AnalyzeEntitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitiesResponse.DiscardUnknown(m)
 }
 
-func (m *AnalyzeEntitiesResponse) Reset()                    { *m = AnalyzeEntitiesResponse{} }
-func (m *AnalyzeEntitiesResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitiesResponse) ProtoMessage()               {}
-func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_AnalyzeEntitiesResponse proto.InternalMessageInfo
 
 func (m *AnalyzeEntitiesResponse) GetEntities() []*Entity {
 	if m != nil {
@@ -1702,15 +1999,37 @@ func (m *AnalyzeEntitiesResponse) GetLanguage() string {
 // The syntax analysis request message.
 type AnalyzeSyntaxRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AnalyzeSyntaxRequest) Reset()         { *m = AnalyzeSyntaxRequest{} }
+func (m *AnalyzeSyntaxRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSyntaxRequest) ProtoMessage()    {}
+func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{13}
+}
+func (m *AnalyzeSyntaxRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeSyntaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(dst, src)
+}
+func (m *AnalyzeSyntaxRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Size(m)
+}
+func (m *AnalyzeSyntaxRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSyntaxRequest.DiscardUnknown(m)
 }
 
-func (m *AnalyzeSyntaxRequest) Reset()                    { *m = AnalyzeSyntaxRequest{} }
-func (m *AnalyzeSyntaxRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSyntaxRequest) ProtoMessage()               {}
-func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_AnalyzeSyntaxRequest proto.InternalMessageInfo
 
 func (m *AnalyzeSyntaxRequest) GetDocument() *Document {
 	if m != nil {
@@ -1729,19 +2048,41 @@ func (m *AnalyzeSyntaxRequest) GetEncodingType() EncodingType {
 // The syntax analysis response message.
 type AnalyzeSyntaxResponse struct {
 	// Sentences in the input document.
-	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences,proto3" json:"sentences,omitempty"`
 	// Tokens, along with their syntactic information, in the input document.
-	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens" json:"tokens,omitempty"`
+	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens,proto3" json:"tokens,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta1.Document.language] field for more details.
-	Language string `protobuf:"bytes,3,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,3,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AnalyzeSyntaxResponse) Reset()                    { *m = AnalyzeSyntaxResponse{} }
-func (m *AnalyzeSyntaxResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSyntaxResponse) ProtoMessage()               {}
-func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *AnalyzeSyntaxResponse) Reset()         { *m = AnalyzeSyntaxResponse{} }
+func (m *AnalyzeSyntaxResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSyntaxResponse) ProtoMessage()    {}
+func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{14}
+}
+func (m *AnalyzeSyntaxResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeSyntaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(dst, src)
+}
+func (m *AnalyzeSyntaxResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Size(m)
+}
+func (m *AnalyzeSyntaxResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSyntaxResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeSyntaxResponse proto.InternalMessageInfo
 
 func (m *AnalyzeSyntaxResponse) GetSentences() []*Sentence {
 	if m != nil {
@@ -1768,17 +2109,39 @@ func (m *AnalyzeSyntaxResponse) GetLanguage() string {
 // analysis types (sentiment, entities, and syntax) in one call.
 type AnnotateTextRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The enabled features.
-	Features *AnnotateTextRequest_Features `protobuf:"bytes,2,opt,name=features" json:"features,omitempty"`
+	Features *AnnotateTextRequest_Features `protobuf:"bytes,2,opt,name=features,proto3" json:"features,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,3,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta1.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,3,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta1.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AnnotateTextRequest) Reset()         { *m = AnnotateTextRequest{} }
+func (m *AnnotateTextRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateTextRequest) ProtoMessage()    {}
+func (*AnnotateTextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{15}
+}
+func (m *AnnotateTextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextRequest.Unmarshal(m, b)
+}
+func (m *AnnotateTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest.Merge(dst, src)
+}
+func (m *AnnotateTextRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextRequest.Size(m)
+}
+func (m *AnnotateTextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextRequest.DiscardUnknown(m)
 }
 
-func (m *AnnotateTextRequest) Reset()                    { *m = AnnotateTextRequest{} }
-func (m *AnnotateTextRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateTextRequest) ProtoMessage()               {}
-func (*AnnotateTextRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_AnnotateTextRequest proto.InternalMessageInfo
 
 func (m *AnnotateTextRequest) GetDocument() *Document {
 	if m != nil {
@@ -1805,19 +2168,39 @@ func (m *AnnotateTextRequest) GetEncodingType() EncodingType {
 // Setting each one to true will enable that specific analysis for the input.
 type AnnotateTextRequest_Features struct {
 	// Extract syntax information.
-	ExtractSyntax bool `protobuf:"varint,1,opt,name=extract_syntax,json=extractSyntax" json:"extract_syntax,omitempty"`
+	ExtractSyntax bool `protobuf:"varint,1,opt,name=extract_syntax,json=extractSyntax,proto3" json:"extract_syntax,omitempty"`
 	// Extract entities.
-	ExtractEntities bool `protobuf:"varint,2,opt,name=extract_entities,json=extractEntities" json:"extract_entities,omitempty"`
+	ExtractEntities bool `protobuf:"varint,2,opt,name=extract_entities,json=extractEntities,proto3" json:"extract_entities,omitempty"`
 	// Extract document-level sentiment.
-	ExtractDocumentSentiment bool `protobuf:"varint,3,opt,name=extract_document_sentiment,json=extractDocumentSentiment" json:"extract_document_sentiment,omitempty"`
+	ExtractDocumentSentiment bool     `protobuf:"varint,3,opt,name=extract_document_sentiment,json=extractDocumentSentiment,proto3" json:"extract_document_sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
 }
 
 func (m *AnnotateTextRequest_Features) Reset()         { *m = AnnotateTextRequest_Features{} }
 func (m *AnnotateTextRequest_Features) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest_Features) ProtoMessage()    {}
 func (*AnnotateTextRequest_Features) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{15, 0}
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{15, 0}
+}
+func (m *AnnotateTextRequest_Features) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Unmarshal(m, b)
 }
+func (m *AnnotateTextRequest_Features) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest_Features.Merge(dst, src)
+}
+func (m *AnnotateTextRequest_Features) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Size(m)
+}
+func (m *AnnotateTextRequest_Features) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextRequest_Features.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateTextRequest_Features proto.InternalMessageInfo
 
 func (m *AnnotateTextRequest_Features) GetExtractSyntax() bool {
 	if m != nil {
@@ -1844,28 +2227,50 @@ func (m *AnnotateTextRequest_Features) GetExtractDocumentSentiment() bool {
 type AnnotateTextResponse struct {
 	// Sentences in the input document. Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_syntax][google.cloud.language.v1beta1.AnnotateTextRequest.Features.extract_syntax].
-	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences,proto3" json:"sentences,omitempty"`
 	// Tokens, along with their syntactic information, in the input document.
 	// Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_syntax][google.cloud.language.v1beta1.AnnotateTextRequest.Features.extract_syntax].
-	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens" json:"tokens,omitempty"`
+	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens,proto3" json:"tokens,omitempty"`
 	// Entities, along with their semantic information, in the input document.
 	// Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_entities][google.cloud.language.v1beta1.AnnotateTextRequest.Features.extract_entities].
-	Entities []*Entity `protobuf:"bytes,3,rep,name=entities" json:"entities,omitempty"`
+	Entities []*Entity `protobuf:"bytes,3,rep,name=entities,proto3" json:"entities,omitempty"`
 	// The overall sentiment for the document. Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_document_sentiment][google.cloud.language.v1beta1.AnnotateTextRequest.Features.extract_document_sentiment].
-	DocumentSentiment *Sentiment `protobuf:"bytes,4,opt,name=document_sentiment,json=documentSentiment" json:"document_sentiment,omitempty"`
+	DocumentSentiment *Sentiment `protobuf:"bytes,4,opt,name=document_sentiment,json=documentSentiment,proto3" json:"document_sentiment,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta1.Document.language] field for more details.
-	Language string `protobuf:"bytes,5,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,5,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AnnotateTextResponse) Reset()                    { *m = AnnotateTextResponse{} }
-func (m *AnnotateTextResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateTextResponse) ProtoMessage()               {}
-func (*AnnotateTextResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *AnnotateTextResponse) Reset()         { *m = AnnotateTextResponse{} }
+func (m *AnnotateTextResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateTextResponse) ProtoMessage()    {}
+func (*AnnotateTextResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_6923389ebfb7184c, []int{16}
+}
+func (m *AnnotateTextResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextResponse.Unmarshal(m, b)
+}
+func (m *AnnotateTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextResponse.Merge(dst, src)
+}
+func (m *AnnotateTextResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextResponse.Size(m)
+}
+func (m *AnnotateTextResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateTextResponse proto.InternalMessageInfo
 
 func (m *AnnotateTextResponse) GetSentences() []*Sentence {
 	if m != nil {
@@ -1906,6 +2311,7 @@ func init() {
 	proto.RegisterType((*Document)(nil), "google.cloud.language.v1beta1.Document")
 	proto.RegisterType((*Sentence)(nil), "google.cloud.language.v1beta1.Sentence")
 	proto.RegisterType((*Entity)(nil), "google.cloud.language.v1beta1.Entity")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.language.v1beta1.Entity.MetadataEntry")
 	proto.RegisterType((*Token)(nil), "google.cloud.language.v1beta1.Token")
 	proto.RegisterType((*Sentiment)(nil), "google.cloud.language.v1beta1.Sentiment")
 	proto.RegisterType((*PartOfSpeech)(nil), "google.cloud.language.v1beta1.PartOfSpeech")
@@ -1948,8 +2354,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for LanguageService service
-
+// LanguageServiceClient is the client API for LanguageService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type LanguageServiceClient interface {
 	// Analyzes the sentiment of the provided text.
 	AnalyzeSentiment(ctx context.Context, in *AnalyzeSentimentRequest, opts ...grpc.CallOption) (*AnalyzeSentimentResponse, error)
@@ -1976,7 +2383,7 @@ func NewLanguageServiceClient(cc *grpc.ClientConn) LanguageServiceClient {
 
 func (c *languageServiceClient) AnalyzeSentiment(ctx context.Context, in *AnalyzeSentimentRequest, opts ...grpc.CallOption) (*AnalyzeSentimentResponse, error) {
 	out := new(AnalyzeSentimentResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta1.LanguageService/AnalyzeSentiment", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta1.LanguageService/AnalyzeSentiment", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1985,7 +2392,7 @@ func (c *languageServiceClient) AnalyzeSentiment(ctx context.Context, in *Analyz
 
 func (c *languageServiceClient) AnalyzeEntities(ctx context.Context, in *AnalyzeEntitiesRequest, opts ...grpc.CallOption) (*AnalyzeEntitiesResponse, error) {
 	out := new(AnalyzeEntitiesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta1.LanguageService/AnalyzeEntities", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta1.LanguageService/AnalyzeEntities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1994,7 +2401,7 @@ func (c *languageServiceClient) AnalyzeEntities(ctx context.Context, in *Analyze
 
 func (c *languageServiceClient) AnalyzeSyntax(ctx context.Context, in *AnalyzeSyntaxRequest, opts ...grpc.CallOption) (*AnalyzeSyntaxResponse, error) {
 	out := new(AnalyzeSyntaxResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta1.LanguageService/AnalyzeSyntax", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta1.LanguageService/AnalyzeSyntax", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2003,15 +2410,14 @@ func (c *languageServiceClient) AnalyzeSyntax(ctx context.Context, in *AnalyzeSy
 
 func (c *languageServiceClient) AnnotateText(ctx context.Context, in *AnnotateTextRequest, opts ...grpc.CallOption) (*AnnotateTextResponse, error) {
 	out := new(AnnotateTextResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta1.LanguageService/AnnotateText", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta1.LanguageService/AnnotateText", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for LanguageService service
-
+// LanguageServiceServer is the server API for LanguageService service.
 type LanguageServiceServer interface {
 	// Analyzes the sentiment of the provided text.
 	AnalyzeSentiment(context.Context, *AnalyzeSentimentRequest) (*AnalyzeSentimentResponse, error)
@@ -2130,10 +2536,10 @@ var _LanguageService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/language/v1beta1/language_service.proto", fileDescriptor0)
+	proto.RegisterFile("google/cloud/language/v1beta1/language_service.proto", fileDescriptor_language_service_6923389ebfb7184c)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_language_service_6923389ebfb7184c = []byte{
 	// 2755 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x4f, 0x73, 0xdb, 0xc6,
 	0x15, 0x37, 0xf8, 0x4f, 0xe4, 0x92, 0x92, 0xd6, 0x88, 0x93, 0xb0, 0x6a, 0xd2, 0x38, 0x48, 0x5c,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/language/v1beta2/language_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/language/v1beta2/language_service.pb.go
index a1fea069..d73f2dd8 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/language/v1beta2/language_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/language/v1beta2/language_service.pb.go
@@ -1,44 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/language/v1beta2/language_service.proto
 
-/*
-Package language is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/language/v1beta2/language_service.proto
-
-It has these top-level messages:
-	Document
-	Sentence
-	Entity
-	Token
-	Sentiment
-	PartOfSpeech
-	DependencyEdge
-	EntityMention
-	TextSpan
-	ClassificationCategory
-	AnalyzeSentimentRequest
-	AnalyzeSentimentResponse
-	AnalyzeEntitySentimentRequest
-	AnalyzeEntitySentimentResponse
-	AnalyzeEntitiesRequest
-	AnalyzeEntitiesResponse
-	AnalyzeSyntaxRequest
-	AnalyzeSyntaxResponse
-	ClassifyTextRequest
-	ClassifyTextResponse
-	AnnotateTextRequest
-	AnnotateTextResponse
-*/
-package language
+package language // import "google.golang.org/genproto/googleapis/cloud/language/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _ "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "google.golang.org/genproto/googleapis/longrunning"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
@@ -98,7 +68,9 @@ var EncodingType_value = map[string]int32{
 func (x EncodingType) String() string {
 	return proto.EnumName(EncodingType_name, int32(x))
 }
-func (EncodingType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (EncodingType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{0}
+}
 
 // The document types enum.
 type Document_Type int32
@@ -126,7 +98,9 @@ var Document_Type_value = map[string]int32{
 func (x Document_Type) String() string {
 	return proto.EnumName(Document_Type_name, int32(x))
 }
-func (Document_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (Document_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{0, 0}
+}
 
 // The type of the entity.
 type Entity_Type int32
@@ -174,7 +148,9 @@ var Entity_Type_value = map[string]int32{
 func (x Entity_Type) String() string {
 	return proto.EnumName(Entity_Type_name, int32(x))
 }
-func (Entity_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (Entity_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{2, 0}
+}
 
 // The part of speech tags enum.
 type PartOfSpeech_Tag int32
@@ -246,7 +222,9 @@ var PartOfSpeech_Tag_value = map[string]int32{
 func (x PartOfSpeech_Tag) String() string {
 	return proto.EnumName(PartOfSpeech_Tag_name, int32(x))
 }
-func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 0} }
+func (PartOfSpeech_Tag) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 0}
+}
 
 // The characteristic of a verb that expresses time flow during an event.
 type PartOfSpeech_Aspect int32
@@ -278,7 +256,9 @@ var PartOfSpeech_Aspect_value = map[string]int32{
 func (x PartOfSpeech_Aspect) String() string {
 	return proto.EnumName(PartOfSpeech_Aspect_name, int32(x))
 }
-func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 1} }
+func (PartOfSpeech_Aspect) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 1}
+}
 
 // The grammatical function performed by a noun or pronoun in a phrase,
 // clause, or sentence. In some languages, other parts of speech, such as
@@ -356,7 +336,9 @@ var PartOfSpeech_Case_value = map[string]int32{
 func (x PartOfSpeech_Case) String() string {
 	return proto.EnumName(PartOfSpeech_Case_name, int32(x))
 }
-func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 2} }
+func (PartOfSpeech_Case) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 2}
+}
 
 // Depending on the language, Form can be categorizing different forms of
 // verbs, adjectives, adverbs, etc. For example, categorizing inflected
@@ -423,7 +405,9 @@ var PartOfSpeech_Form_value = map[string]int32{
 func (x PartOfSpeech_Form) String() string {
 	return proto.EnumName(PartOfSpeech_Form_name, int32(x))
 }
-func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 3} }
+func (PartOfSpeech_Form) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 3}
+}
 
 // Gender classes of nouns reflected in the behaviour of associated words.
 type PartOfSpeech_Gender int32
@@ -455,7 +439,9 @@ var PartOfSpeech_Gender_value = map[string]int32{
 func (x PartOfSpeech_Gender) String() string {
 	return proto.EnumName(PartOfSpeech_Gender_name, int32(x))
 }
-func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 4} }
+func (PartOfSpeech_Gender) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 4}
+}
 
 // The grammatical feature of verbs, used for showing modality and attitude.
 type PartOfSpeech_Mood int32
@@ -499,7 +485,9 @@ var PartOfSpeech_Mood_value = map[string]int32{
 func (x PartOfSpeech_Mood) String() string {
 	return proto.EnumName(PartOfSpeech_Mood_name, int32(x))
 }
-func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 5} }
+func (PartOfSpeech_Mood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 5}
+}
 
 // Count distinctions.
 type PartOfSpeech_Number int32
@@ -531,7 +519,9 @@ var PartOfSpeech_Number_value = map[string]int32{
 func (x PartOfSpeech_Number) String() string {
 	return proto.EnumName(PartOfSpeech_Number_name, int32(x))
 }
-func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 6} }
+func (PartOfSpeech_Number) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 6}
+}
 
 // The distinction between the speaker, second person, third person, etc.
 type PartOfSpeech_Person int32
@@ -567,7 +557,9 @@ var PartOfSpeech_Person_value = map[string]int32{
 func (x PartOfSpeech_Person) String() string {
 	return proto.EnumName(PartOfSpeech_Person_name, int32(x))
 }
-func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 7} }
+func (PartOfSpeech_Person) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 7}
+}
 
 // This category shows if the token is part of a proper name.
 type PartOfSpeech_Proper int32
@@ -595,7 +587,9 @@ var PartOfSpeech_Proper_value = map[string]int32{
 func (x PartOfSpeech_Proper) String() string {
 	return proto.EnumName(PartOfSpeech_Proper_name, int32(x))
 }
-func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 8} }
+func (PartOfSpeech_Proper) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 8}
+}
 
 // Reciprocal features of a pronoun.
 type PartOfSpeech_Reciprocity int32
@@ -624,7 +618,9 @@ var PartOfSpeech_Reciprocity_value = map[string]int32{
 func (x PartOfSpeech_Reciprocity) String() string {
 	return proto.EnumName(PartOfSpeech_Reciprocity_name, int32(x))
 }
-func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 9} }
+func (PartOfSpeech_Reciprocity) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 9}
+}
 
 // Time reference.
 type PartOfSpeech_Tense int32
@@ -668,7 +664,9 @@ var PartOfSpeech_Tense_value = map[string]int32{
 func (x PartOfSpeech_Tense) String() string {
 	return proto.EnumName(PartOfSpeech_Tense_name, int32(x))
 }
-func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 10} }
+func (PartOfSpeech_Tense) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 10}
+}
 
 // The relationship between the action that a verb expresses and the
 // participants identified by its arguments.
@@ -701,7 +699,9 @@ var PartOfSpeech_Voice_value = map[string]int32{
 func (x PartOfSpeech_Voice) String() string {
 	return proto.EnumName(PartOfSpeech_Voice_name, int32(x))
 }
-func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 11} }
+func (PartOfSpeech_Voice) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5, 11}
+}
 
 // The parse label enum for the token.
 type DependencyEdge_Label int32
@@ -1049,7 +1049,9 @@ var DependencyEdge_Label_value = map[string]int32{
 func (x DependencyEdge_Label) String() string {
 	return proto.EnumName(DependencyEdge_Label_name, int32(x))
 }
-func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{6, 0} }
+func (DependencyEdge_Label) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{6, 0}
+}
 
 // The supported types of mentions.
 type EntityMention_Type int32
@@ -1077,7 +1079,9 @@ var EntityMention_Type_value = map[string]int32{
 func (x EntityMention_Type) String() string {
 	return proto.EnumName(EntityMention_Type_name, int32(x))
 }
-func (EntityMention_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
+func (EntityMention_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{7, 0}
+}
 
 // ################################################################ #
 //
@@ -1085,7 +1089,7 @@ func (EntityMention_Type) EnumDescriptor() ([]byte, []int) { return fileDescript
 type Document struct {
 	// Required. If the type is not set or is `TYPE_UNSPECIFIED`,
 	// returns an `INVALID_ARGUMENT` error.
-	Type Document_Type `protobuf:"varint,1,opt,name=type,enum=google.cloud.language.v1beta2.Document_Type" json:"type,omitempty"`
+	Type Document_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.language.v1beta2.Document_Type" json:"type,omitempty"`
 	// The source of the document: a string containing the content or a
 	// Google Cloud Storage URI.
 	//
@@ -1101,26 +1105,57 @@ type Document struct {
 	// If the language (either specified by the caller or automatically detected)
 	// is not supported by the called API method, an `INVALID_ARGUMENT` error
 	// is returned.
-	Language string `protobuf:"bytes,4,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,4,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Document) Reset()         { *m = Document{} }
+func (m *Document) String() string { return proto.CompactTextString(m) }
+func (*Document) ProtoMessage()    {}
+func (*Document) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{0}
+}
+func (m *Document) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Document.Unmarshal(m, b)
+}
+func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
+}
+func (dst *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(dst, src)
+}
+func (m *Document) XXX_Size() int {
+	return xxx_messageInfo_Document.Size(m)
+}
+func (m *Document) XXX_DiscardUnknown() {
+	xxx_messageInfo_Document.DiscardUnknown(m)
 }
 
-func (m *Document) Reset()                    { *m = Document{} }
-func (m *Document) String() string            { return proto.CompactTextString(m) }
-func (*Document) ProtoMessage()               {}
-func (*Document) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Document proto.InternalMessageInfo
+
+func (m *Document) GetType() Document_Type {
+	if m != nil {
+		return m.Type
+	}
+	return Document_TYPE_UNSPECIFIED
+}
 
 type isDocument_Source interface {
 	isDocument_Source()
 }
 
 type Document_Content struct {
-	Content string `protobuf:"bytes,2,opt,name=content,oneof"`
+	Content string `protobuf:"bytes,2,opt,name=content,proto3,oneof"`
 }
+
 type Document_GcsContentUri struct {
-	GcsContentUri string `protobuf:"bytes,3,opt,name=gcs_content_uri,json=gcsContentUri,oneof"`
+	GcsContentUri string `protobuf:"bytes,3,opt,name=gcs_content_uri,json=gcsContentUri,proto3,oneof"`
 }
 
-func (*Document_Content) isDocument_Source()       {}
+func (*Document_Content) isDocument_Source() {}
+
 func (*Document_GcsContentUri) isDocument_Source() {}
 
 func (m *Document) GetSource() isDocument_Source {
@@ -1130,13 +1165,6 @@ func (m *Document) GetSource() isDocument_Source {
 	return nil
 }
 
-func (m *Document) GetType() Document_Type {
-	if m != nil {
-		return m.Type
-	}
-	return Document_TYPE_UNSPECIFIED
-}
-
 func (m *Document) GetContent() string {
 	if x, ok := m.GetSource().(*Document_Content); ok {
 		return x.Content
@@ -1210,11 +1238,11 @@ func _Document_OneofSizer(msg proto.Message) (n int) {
 	// source
 	switch x := m.Source.(type) {
 	case *Document_Content:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Content)))
 		n += len(x.Content)
 	case *Document_GcsContentUri:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.GcsContentUri)))
 		n += len(x.GcsContentUri)
 	case nil:
@@ -1227,17 +1255,39 @@ func _Document_OneofSizer(msg proto.Message) (n int) {
 // Represents a sentence in the input document.
 type Sentence struct {
 	// The sentence text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// For calls to [AnalyzeSentiment][] or if
 	// [AnnotateTextRequest.Features.extract_document_sentiment][google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_document_sentiment] is set to
 	// true, this field will contain the sentiment for the sentence.
-	Sentiment *Sentiment `protobuf:"bytes,2,opt,name=sentiment" json:"sentiment,omitempty"`
+	Sentiment            *Sentiment `protobuf:"bytes,2,opt,name=sentiment,proto3" json:"sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *Sentence) Reset()         { *m = Sentence{} }
+func (m *Sentence) String() string { return proto.CompactTextString(m) }
+func (*Sentence) ProtoMessage()    {}
+func (*Sentence) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{1}
+}
+func (m *Sentence) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Sentence.Unmarshal(m, b)
+}
+func (m *Sentence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Sentence.Marshal(b, m, deterministic)
+}
+func (dst *Sentence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentence.Merge(dst, src)
+}
+func (m *Sentence) XXX_Size() int {
+	return xxx_messageInfo_Sentence.Size(m)
+}
+func (m *Sentence) XXX_DiscardUnknown() {
+	xxx_messageInfo_Sentence.DiscardUnknown(m)
 }
 
-func (m *Sentence) Reset()                    { *m = Sentence{} }
-func (m *Sentence) String() string            { return proto.CompactTextString(m) }
-func (*Sentence) ProtoMessage()               {}
-func (*Sentence) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Sentence proto.InternalMessageInfo
 
 func (m *Sentence) GetText() *TextSpan {
 	if m != nil {
@@ -1258,35 +1308,57 @@ func (m *Sentence) GetSentiment() *Sentiment {
 // as salience and mentions, with entities.
 type Entity struct {
 	// The representative name for the entity.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The entity type.
-	Type Entity_Type `protobuf:"varint,2,opt,name=type,enum=google.cloud.language.v1beta2.Entity_Type" json:"type,omitempty"`
+	Type Entity_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.language.v1beta2.Entity_Type" json:"type,omitempty"`
 	// Metadata associated with the entity.
 	//
 	// Currently, Wikipedia URLs and Knowledge Graph MIDs are provided, if
 	// available. The associated keys are "wikipedia_url" and "mid", respectively.
-	Metadata map[string]string `protobuf:"bytes,3,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata map[string]string `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The salience score associated with the entity in the [0, 1.0] range.
 	//
 	// The salience score for an entity provides information about the
 	// importance or centrality of that entity to the entire document text.
 	// Scores closer to 0 are less salient, while scores closer to 1.0 are highly
 	// salient.
-	Salience float32 `protobuf:"fixed32,4,opt,name=salience" json:"salience,omitempty"`
+	Salience float32 `protobuf:"fixed32,4,opt,name=salience,proto3" json:"salience,omitempty"`
 	// The mentions of this entity in the input document. The API currently
 	// supports proper noun mentions.
-	Mentions []*EntityMention `protobuf:"bytes,5,rep,name=mentions" json:"mentions,omitempty"`
+	Mentions []*EntityMention `protobuf:"bytes,5,rep,name=mentions,proto3" json:"mentions,omitempty"`
 	// For calls to [AnalyzeEntitySentiment][] or if
 	// [AnnotateTextRequest.Features.extract_entity_sentiment][google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_entity_sentiment] is set to
 	// true, this field will contain the aggregate sentiment expressed for this
 	// entity in the provided document.
-	Sentiment *Sentiment `protobuf:"bytes,6,opt,name=sentiment" json:"sentiment,omitempty"`
+	Sentiment            *Sentiment `protobuf:"bytes,6,opt,name=sentiment,proto3" json:"sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *Entity) Reset()                    { *m = Entity{} }
-func (m *Entity) String() string            { return proto.CompactTextString(m) }
-func (*Entity) ProtoMessage()               {}
-func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Entity) Reset()         { *m = Entity{} }
+func (m *Entity) String() string { return proto.CompactTextString(m) }
+func (*Entity) ProtoMessage()    {}
+func (*Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{2}
+}
+func (m *Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Entity.Unmarshal(m, b)
+}
+func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
+}
+func (dst *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(dst, src)
+}
+func (m *Entity) XXX_Size() int {
+	return xxx_messageInfo_Entity.Size(m)
+}
+func (m *Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Entity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Entity proto.InternalMessageInfo
 
 func (m *Entity) GetName() string {
 	if m != nil {
@@ -1333,19 +1405,41 @@ func (m *Entity) GetSentiment() *Sentiment {
 // Represents the smallest syntactic building block of the text.
 type Token struct {
 	// The token text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// Parts of speech tag for this token.
-	PartOfSpeech *PartOfSpeech `protobuf:"bytes,2,opt,name=part_of_speech,json=partOfSpeech" json:"part_of_speech,omitempty"`
+	PartOfSpeech *PartOfSpeech `protobuf:"bytes,2,opt,name=part_of_speech,json=partOfSpeech,proto3" json:"part_of_speech,omitempty"`
 	// Dependency tree parse for this token.
-	DependencyEdge *DependencyEdge `protobuf:"bytes,3,opt,name=dependency_edge,json=dependencyEdge" json:"dependency_edge,omitempty"`
+	DependencyEdge *DependencyEdge `protobuf:"bytes,3,opt,name=dependency_edge,json=dependencyEdge,proto3" json:"dependency_edge,omitempty"`
 	// [Lemma](https://en.wikipedia.org/wiki/Lemma_%28morphology%29) of the token.
-	Lemma string `protobuf:"bytes,4,opt,name=lemma" json:"lemma,omitempty"`
+	Lemma                string   `protobuf:"bytes,4,opt,name=lemma,proto3" json:"lemma,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Token) Reset()         { *m = Token{} }
+func (m *Token) String() string { return proto.CompactTextString(m) }
+func (*Token) ProtoMessage()    {}
+func (*Token) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{3}
+}
+func (m *Token) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Token.Unmarshal(m, b)
+}
+func (m *Token) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Token.Marshal(b, m, deterministic)
+}
+func (dst *Token) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Token.Merge(dst, src)
+}
+func (m *Token) XXX_Size() int {
+	return xxx_messageInfo_Token.Size(m)
+}
+func (m *Token) XXX_DiscardUnknown() {
+	xxx_messageInfo_Token.DiscardUnknown(m)
 }
 
-func (m *Token) Reset()                    { *m = Token{} }
-func (m *Token) String() string            { return proto.CompactTextString(m) }
-func (*Token) ProtoMessage()               {}
-func (*Token) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_Token proto.InternalMessageInfo
 
 func (m *Token) GetText() *TextSpan {
 	if m != nil {
@@ -1381,16 +1475,38 @@ type Sentiment struct {
 	// A non-negative number in the [0, +inf) range, which represents
 	// the absolute magnitude of sentiment regardless of score (positive or
 	// negative).
-	Magnitude float32 `protobuf:"fixed32,2,opt,name=magnitude" json:"magnitude,omitempty"`
+	Magnitude float32 `protobuf:"fixed32,2,opt,name=magnitude,proto3" json:"magnitude,omitempty"`
 	// Sentiment score between -1.0 (negative sentiment) and 1.0
 	// (positive sentiment).
-	Score float32 `protobuf:"fixed32,3,opt,name=score" json:"score,omitempty"`
+	Score                float32  `protobuf:"fixed32,3,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Sentiment) Reset()                    { *m = Sentiment{} }
-func (m *Sentiment) String() string            { return proto.CompactTextString(m) }
-func (*Sentiment) ProtoMessage()               {}
-func (*Sentiment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *Sentiment) Reset()         { *m = Sentiment{} }
+func (m *Sentiment) String() string { return proto.CompactTextString(m) }
+func (*Sentiment) ProtoMessage()    {}
+func (*Sentiment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{4}
+}
+func (m *Sentiment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Sentiment.Unmarshal(m, b)
+}
+func (m *Sentiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Sentiment.Marshal(b, m, deterministic)
+}
+func (dst *Sentiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Sentiment.Merge(dst, src)
+}
+func (m *Sentiment) XXX_Size() int {
+	return xxx_messageInfo_Sentiment.Size(m)
+}
+func (m *Sentiment) XXX_DiscardUnknown() {
+	xxx_messageInfo_Sentiment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Sentiment proto.InternalMessageInfo
 
 func (m *Sentiment) GetMagnitude() float32 {
 	if m != nil {
@@ -1409,35 +1525,57 @@ func (m *Sentiment) GetScore() float32 {
 // Represents part of speech information for a token.
 type PartOfSpeech struct {
 	// The part of speech tag.
-	Tag PartOfSpeech_Tag `protobuf:"varint,1,opt,name=tag,enum=google.cloud.language.v1beta2.PartOfSpeech_Tag" json:"tag,omitempty"`
+	Tag PartOfSpeech_Tag `protobuf:"varint,1,opt,name=tag,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Tag" json:"tag,omitempty"`
 	// The grammatical aspect.
-	Aspect PartOfSpeech_Aspect `protobuf:"varint,2,opt,name=aspect,enum=google.cloud.language.v1beta2.PartOfSpeech_Aspect" json:"aspect,omitempty"`
+	Aspect PartOfSpeech_Aspect `protobuf:"varint,2,opt,name=aspect,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Aspect" json:"aspect,omitempty"`
 	// The grammatical case.
-	Case PartOfSpeech_Case `protobuf:"varint,3,opt,name=case,enum=google.cloud.language.v1beta2.PartOfSpeech_Case" json:"case,omitempty"`
+	Case PartOfSpeech_Case `protobuf:"varint,3,opt,name=case,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Case" json:"case,omitempty"`
 	// The grammatical form.
-	Form PartOfSpeech_Form `protobuf:"varint,4,opt,name=form,enum=google.cloud.language.v1beta2.PartOfSpeech_Form" json:"form,omitempty"`
+	Form PartOfSpeech_Form `protobuf:"varint,4,opt,name=form,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Form" json:"form,omitempty"`
 	// The grammatical gender.
-	Gender PartOfSpeech_Gender `protobuf:"varint,5,opt,name=gender,enum=google.cloud.language.v1beta2.PartOfSpeech_Gender" json:"gender,omitempty"`
+	Gender PartOfSpeech_Gender `protobuf:"varint,5,opt,name=gender,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Gender" json:"gender,omitempty"`
 	// The grammatical mood.
-	Mood PartOfSpeech_Mood `protobuf:"varint,6,opt,name=mood,enum=google.cloud.language.v1beta2.PartOfSpeech_Mood" json:"mood,omitempty"`
+	Mood PartOfSpeech_Mood `protobuf:"varint,6,opt,name=mood,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Mood" json:"mood,omitempty"`
 	// The grammatical number.
-	Number PartOfSpeech_Number `protobuf:"varint,7,opt,name=number,enum=google.cloud.language.v1beta2.PartOfSpeech_Number" json:"number,omitempty"`
+	Number PartOfSpeech_Number `protobuf:"varint,7,opt,name=number,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Number" json:"number,omitempty"`
 	// The grammatical person.
-	Person PartOfSpeech_Person `protobuf:"varint,8,opt,name=person,enum=google.cloud.language.v1beta2.PartOfSpeech_Person" json:"person,omitempty"`
+	Person PartOfSpeech_Person `protobuf:"varint,8,opt,name=person,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Person" json:"person,omitempty"`
 	// The grammatical properness.
-	Proper PartOfSpeech_Proper `protobuf:"varint,9,opt,name=proper,enum=google.cloud.language.v1beta2.PartOfSpeech_Proper" json:"proper,omitempty"`
+	Proper PartOfSpeech_Proper `protobuf:"varint,9,opt,name=proper,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Proper" json:"proper,omitempty"`
 	// The grammatical reciprocity.
-	Reciprocity PartOfSpeech_Reciprocity `protobuf:"varint,10,opt,name=reciprocity,enum=google.cloud.language.v1beta2.PartOfSpeech_Reciprocity" json:"reciprocity,omitempty"`
+	Reciprocity PartOfSpeech_Reciprocity `protobuf:"varint,10,opt,name=reciprocity,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Reciprocity" json:"reciprocity,omitempty"`
 	// The grammatical tense.
-	Tense PartOfSpeech_Tense `protobuf:"varint,11,opt,name=tense,enum=google.cloud.language.v1beta2.PartOfSpeech_Tense" json:"tense,omitempty"`
+	Tense PartOfSpeech_Tense `protobuf:"varint,11,opt,name=tense,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Tense" json:"tense,omitempty"`
 	// The grammatical voice.
-	Voice PartOfSpeech_Voice `protobuf:"varint,12,opt,name=voice,enum=google.cloud.language.v1beta2.PartOfSpeech_Voice" json:"voice,omitempty"`
+	Voice                PartOfSpeech_Voice `protobuf:"varint,12,opt,name=voice,proto3,enum=google.cloud.language.v1beta2.PartOfSpeech_Voice" json:"voice,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *PartOfSpeech) Reset()                    { *m = PartOfSpeech{} }
-func (m *PartOfSpeech) String() string            { return proto.CompactTextString(m) }
-func (*PartOfSpeech) ProtoMessage()               {}
-func (*PartOfSpeech) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *PartOfSpeech) Reset()         { *m = PartOfSpeech{} }
+func (m *PartOfSpeech) String() string { return proto.CompactTextString(m) }
+func (*PartOfSpeech) ProtoMessage()    {}
+func (*PartOfSpeech) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{5}
+}
+func (m *PartOfSpeech) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartOfSpeech.Unmarshal(m, b)
+}
+func (m *PartOfSpeech) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartOfSpeech.Marshal(b, m, deterministic)
+}
+func (dst *PartOfSpeech) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartOfSpeech.Merge(dst, src)
+}
+func (m *PartOfSpeech) XXX_Size() int {
+	return xxx_messageInfo_PartOfSpeech.Size(m)
+}
+func (m *PartOfSpeech) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartOfSpeech.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PartOfSpeech proto.InternalMessageInfo
 
 func (m *PartOfSpeech) GetTag() PartOfSpeech_Tag {
 	if m != nil {
@@ -1530,15 +1668,37 @@ type DependencyEdge struct {
 	// The index is the position of the token in the array of tokens returned
 	// by the API method. If this token is a root token, then the
 	// `head_token_index` is its own index.
-	HeadTokenIndex int32 `protobuf:"varint,1,opt,name=head_token_index,json=headTokenIndex" json:"head_token_index,omitempty"`
+	HeadTokenIndex int32 `protobuf:"varint,1,opt,name=head_token_index,json=headTokenIndex,proto3" json:"head_token_index,omitempty"`
 	// The parse label for the token.
-	Label DependencyEdge_Label `protobuf:"varint,2,opt,name=label,enum=google.cloud.language.v1beta2.DependencyEdge_Label" json:"label,omitempty"`
+	Label                DependencyEdge_Label `protobuf:"varint,2,opt,name=label,proto3,enum=google.cloud.language.v1beta2.DependencyEdge_Label" json:"label,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *DependencyEdge) Reset()         { *m = DependencyEdge{} }
+func (m *DependencyEdge) String() string { return proto.CompactTextString(m) }
+func (*DependencyEdge) ProtoMessage()    {}
+func (*DependencyEdge) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{6}
+}
+func (m *DependencyEdge) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DependencyEdge.Unmarshal(m, b)
+}
+func (m *DependencyEdge) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DependencyEdge.Marshal(b, m, deterministic)
+}
+func (dst *DependencyEdge) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DependencyEdge.Merge(dst, src)
+}
+func (m *DependencyEdge) XXX_Size() int {
+	return xxx_messageInfo_DependencyEdge.Size(m)
+}
+func (m *DependencyEdge) XXX_DiscardUnknown() {
+	xxx_messageInfo_DependencyEdge.DiscardUnknown(m)
 }
 
-func (m *DependencyEdge) Reset()                    { *m = DependencyEdge{} }
-func (m *DependencyEdge) String() string            { return proto.CompactTextString(m) }
-func (*DependencyEdge) ProtoMessage()               {}
-func (*DependencyEdge) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_DependencyEdge proto.InternalMessageInfo
 
 func (m *DependencyEdge) GetHeadTokenIndex() int32 {
 	if m != nil {
@@ -1558,20 +1718,42 @@ func (m *DependencyEdge) GetLabel() DependencyEdge_Label {
 // mentions are supported.
 type EntityMention struct {
 	// The mention text.
-	Text *TextSpan `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text *TextSpan `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// The type of the entity mention.
-	Type EntityMention_Type `protobuf:"varint,2,opt,name=type,enum=google.cloud.language.v1beta2.EntityMention_Type" json:"type,omitempty"`
+	Type EntityMention_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.language.v1beta2.EntityMention_Type" json:"type,omitempty"`
 	// For calls to [AnalyzeEntitySentiment][] or if
 	// [AnnotateTextRequest.Features.extract_entity_sentiment][google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_entity_sentiment] is set to
 	// true, this field will contain the sentiment expressed for this mention of
 	// the entity in the provided document.
-	Sentiment *Sentiment `protobuf:"bytes,3,opt,name=sentiment" json:"sentiment,omitempty"`
+	Sentiment            *Sentiment `protobuf:"bytes,3,opt,name=sentiment,proto3" json:"sentiment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *EntityMention) Reset()         { *m = EntityMention{} }
+func (m *EntityMention) String() string { return proto.CompactTextString(m) }
+func (*EntityMention) ProtoMessage()    {}
+func (*EntityMention) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{7}
+}
+func (m *EntityMention) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityMention.Unmarshal(m, b)
+}
+func (m *EntityMention) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityMention.Marshal(b, m, deterministic)
+}
+func (dst *EntityMention) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityMention.Merge(dst, src)
+}
+func (m *EntityMention) XXX_Size() int {
+	return xxx_messageInfo_EntityMention.Size(m)
+}
+func (m *EntityMention) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityMention.DiscardUnknown(m)
 }
 
-func (m *EntityMention) Reset()                    { *m = EntityMention{} }
-func (m *EntityMention) String() string            { return proto.CompactTextString(m) }
-func (*EntityMention) ProtoMessage()               {}
-func (*EntityMention) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_EntityMention proto.InternalMessageInfo
 
 func (m *EntityMention) GetText() *TextSpan {
 	if m != nil {
@@ -1597,16 +1779,38 @@ func (m *EntityMention) GetSentiment() *Sentiment {
 // Represents an output piece of text.
 type TextSpan struct {
 	// The content of the output text.
-	Content string `protobuf:"bytes,1,opt,name=content" json:"content,omitempty"`
+	Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
 	// The API calculates the beginning offset of the content in the original
 	// document according to the [EncodingType][google.cloud.language.v1beta2.EncodingType] specified in the API request.
-	BeginOffset int32 `protobuf:"varint,2,opt,name=begin_offset,json=beginOffset" json:"begin_offset,omitempty"`
+	BeginOffset          int32    `protobuf:"varint,2,opt,name=begin_offset,json=beginOffset,proto3" json:"begin_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextSpan) Reset()         { *m = TextSpan{} }
+func (m *TextSpan) String() string { return proto.CompactTextString(m) }
+func (*TextSpan) ProtoMessage()    {}
+func (*TextSpan) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{8}
+}
+func (m *TextSpan) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextSpan.Unmarshal(m, b)
+}
+func (m *TextSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextSpan.Marshal(b, m, deterministic)
+}
+func (dst *TextSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextSpan.Merge(dst, src)
+}
+func (m *TextSpan) XXX_Size() int {
+	return xxx_messageInfo_TextSpan.Size(m)
+}
+func (m *TextSpan) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextSpan.DiscardUnknown(m)
 }
 
-func (m *TextSpan) Reset()                    { *m = TextSpan{} }
-func (m *TextSpan) String() string            { return proto.CompactTextString(m) }
-func (*TextSpan) ProtoMessage()               {}
-func (*TextSpan) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_TextSpan proto.InternalMessageInfo
 
 func (m *TextSpan) GetContent() string {
 	if m != nil {
@@ -1625,16 +1829,38 @@ func (m *TextSpan) GetBeginOffset() int32 {
 // Represents a category returned from the text classifier.
 type ClassificationCategory struct {
 	// The name of the category representing the document.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The classifier's confidence of the category. Number represents how certain
 	// the classifier is that this category represents the given text.
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClassificationCategory) Reset()         { *m = ClassificationCategory{} }
+func (m *ClassificationCategory) String() string { return proto.CompactTextString(m) }
+func (*ClassificationCategory) ProtoMessage()    {}
+func (*ClassificationCategory) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{9}
+}
+func (m *ClassificationCategory) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassificationCategory.Unmarshal(m, b)
+}
+func (m *ClassificationCategory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassificationCategory.Marshal(b, m, deterministic)
+}
+func (dst *ClassificationCategory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassificationCategory.Merge(dst, src)
+}
+func (m *ClassificationCategory) XXX_Size() int {
+	return xxx_messageInfo_ClassificationCategory.Size(m)
+}
+func (m *ClassificationCategory) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassificationCategory.DiscardUnknown(m)
 }
 
-func (m *ClassificationCategory) Reset()                    { *m = ClassificationCategory{} }
-func (m *ClassificationCategory) String() string            { return proto.CompactTextString(m) }
-func (*ClassificationCategory) ProtoMessage()               {}
-func (*ClassificationCategory) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_ClassificationCategory proto.InternalMessageInfo
 
 func (m *ClassificationCategory) GetName() string {
 	if m != nil {
@@ -1653,16 +1879,38 @@ func (m *ClassificationCategory) GetConfidence() float32 {
 // The sentiment analysis request message.
 type AnalyzeSentimentRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate sentence offsets for the
 	// sentence sentiment.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AnalyzeSentimentRequest) Reset()         { *m = AnalyzeSentimentRequest{} }
+func (m *AnalyzeSentimentRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSentimentRequest) ProtoMessage()    {}
+func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{10}
+}
+func (m *AnalyzeSentimentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeSentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentRequest.Merge(dst, src)
+}
+func (m *AnalyzeSentimentRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSentimentRequest.Size(m)
+}
+func (m *AnalyzeSentimentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSentimentRequest.DiscardUnknown(m)
 }
 
-func (m *AnalyzeSentimentRequest) Reset()                    { *m = AnalyzeSentimentRequest{} }
-func (m *AnalyzeSentimentRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSentimentRequest) ProtoMessage()               {}
-func (*AnalyzeSentimentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_AnalyzeSentimentRequest proto.InternalMessageInfo
 
 func (m *AnalyzeSentimentRequest) GetDocument() *Document {
 	if m != nil {
@@ -1681,19 +1929,41 @@ func (m *AnalyzeSentimentRequest) GetEncodingType() EncodingType {
 // The sentiment analysis response message.
 type AnalyzeSentimentResponse struct {
 	// The overall sentiment of the input document.
-	DocumentSentiment *Sentiment `protobuf:"bytes,1,opt,name=document_sentiment,json=documentSentiment" json:"document_sentiment,omitempty"`
+	DocumentSentiment *Sentiment `protobuf:"bytes,1,opt,name=document_sentiment,json=documentSentiment,proto3" json:"document_sentiment,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta2.Document.language] field for more details.
-	Language string `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Language string `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
 	// The sentiment for all the sentences in the document.
-	Sentences []*Sentence `protobuf:"bytes,3,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences            []*Sentence `protobuf:"bytes,3,rep,name=sentences,proto3" json:"sentences,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *AnalyzeSentimentResponse) Reset()                    { *m = AnalyzeSentimentResponse{} }
-func (m *AnalyzeSentimentResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSentimentResponse) ProtoMessage()               {}
-func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *AnalyzeSentimentResponse) Reset()         { *m = AnalyzeSentimentResponse{} }
+func (m *AnalyzeSentimentResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSentimentResponse) ProtoMessage()    {}
+func (*AnalyzeSentimentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{11}
+}
+func (m *AnalyzeSentimentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeSentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSentimentResponse.Merge(dst, src)
+}
+func (m *AnalyzeSentimentResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSentimentResponse.Size(m)
+}
+func (m *AnalyzeSentimentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSentimentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeSentimentResponse proto.InternalMessageInfo
 
 func (m *AnalyzeSentimentResponse) GetDocumentSentiment() *Sentiment {
 	if m != nil {
@@ -1719,15 +1989,37 @@ func (m *AnalyzeSentimentResponse) GetSentences() []*Sentence {
 // The entity-level sentiment analysis request message.
 type AnalyzeEntitySentimentRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AnalyzeEntitySentimentRequest) Reset()         { *m = AnalyzeEntitySentimentRequest{} }
+func (m *AnalyzeEntitySentimentRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitySentimentRequest) ProtoMessage()    {}
+func (*AnalyzeEntitySentimentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{12}
+}
+func (m *AnalyzeEntitySentimentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitySentimentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitySentimentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitySentimentRequest.Merge(dst, src)
+}
+func (m *AnalyzeEntitySentimentRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitySentimentRequest.Size(m)
+}
+func (m *AnalyzeEntitySentimentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitySentimentRequest.DiscardUnknown(m)
 }
 
-func (m *AnalyzeEntitySentimentRequest) Reset()                    { *m = AnalyzeEntitySentimentRequest{} }
-func (m *AnalyzeEntitySentimentRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitySentimentRequest) ProtoMessage()               {}
-func (*AnalyzeEntitySentimentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_AnalyzeEntitySentimentRequest proto.InternalMessageInfo
 
 func (m *AnalyzeEntitySentimentRequest) GetDocument() *Document {
 	if m != nil {
@@ -1746,17 +2038,39 @@ func (m *AnalyzeEntitySentimentRequest) GetEncodingType() EncodingType {
 // The entity-level sentiment analysis response message.
 type AnalyzeEntitySentimentResponse struct {
 	// The recognized entities in the input document with associated sentiments.
-	Entities []*Entity `protobuf:"bytes,1,rep,name=entities" json:"entities,omitempty"`
+	Entities []*Entity `protobuf:"bytes,1,rep,name=entities,proto3" json:"entities,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta2.Document.language] field for more details.
-	Language string `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AnalyzeEntitySentimentResponse) Reset()                    { *m = AnalyzeEntitySentimentResponse{} }
-func (m *AnalyzeEntitySentimentResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitySentimentResponse) ProtoMessage()               {}
-func (*AnalyzeEntitySentimentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *AnalyzeEntitySentimentResponse) Reset()         { *m = AnalyzeEntitySentimentResponse{} }
+func (m *AnalyzeEntitySentimentResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitySentimentResponse) ProtoMessage()    {}
+func (*AnalyzeEntitySentimentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{13}
+}
+func (m *AnalyzeEntitySentimentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitySentimentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitySentimentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitySentimentResponse.Merge(dst, src)
+}
+func (m *AnalyzeEntitySentimentResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitySentimentResponse.Size(m)
+}
+func (m *AnalyzeEntitySentimentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitySentimentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeEntitySentimentResponse proto.InternalMessageInfo
 
 func (m *AnalyzeEntitySentimentResponse) GetEntities() []*Entity {
 	if m != nil {
@@ -1775,15 +2089,37 @@ func (m *AnalyzeEntitySentimentResponse) GetLanguage() string {
 // The entity analysis request message.
 type AnalyzeEntitiesRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *AnalyzeEntitiesRequest) Reset()                    { *m = AnalyzeEntitiesRequest{} }
-func (m *AnalyzeEntitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitiesRequest) ProtoMessage()               {}
-func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *AnalyzeEntitiesRequest) Reset()         { *m = AnalyzeEntitiesRequest{} }
+func (m *AnalyzeEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitiesRequest) ProtoMessage()    {}
+func (*AnalyzeEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{14}
+}
+func (m *AnalyzeEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesRequest.Merge(dst, src)
+}
+func (m *AnalyzeEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitiesRequest.Size(m)
+}
+func (m *AnalyzeEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeEntitiesRequest proto.InternalMessageInfo
 
 func (m *AnalyzeEntitiesRequest) GetDocument() *Document {
 	if m != nil {
@@ -1802,17 +2138,39 @@ func (m *AnalyzeEntitiesRequest) GetEncodingType() EncodingType {
 // The entity analysis response message.
 type AnalyzeEntitiesResponse struct {
 	// The recognized entities in the input document.
-	Entities []*Entity `protobuf:"bytes,1,rep,name=entities" json:"entities,omitempty"`
+	Entities []*Entity `protobuf:"bytes,1,rep,name=entities,proto3" json:"entities,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta2.Document.language] field for more details.
-	Language string `protobuf:"bytes,2,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,2,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeEntitiesResponse) Reset()         { *m = AnalyzeEntitiesResponse{} }
+func (m *AnalyzeEntitiesResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeEntitiesResponse) ProtoMessage()    {}
+func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{15}
+}
+func (m *AnalyzeEntitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeEntitiesResponse.Merge(dst, src)
+}
+func (m *AnalyzeEntitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeEntitiesResponse.Size(m)
+}
+func (m *AnalyzeEntitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeEntitiesResponse.DiscardUnknown(m)
 }
 
-func (m *AnalyzeEntitiesResponse) Reset()                    { *m = AnalyzeEntitiesResponse{} }
-func (m *AnalyzeEntitiesResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeEntitiesResponse) ProtoMessage()               {}
-func (*AnalyzeEntitiesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_AnalyzeEntitiesResponse proto.InternalMessageInfo
 
 func (m *AnalyzeEntitiesResponse) GetEntities() []*Entity {
 	if m != nil {
@@ -1831,15 +2189,37 @@ func (m *AnalyzeEntitiesResponse) GetLanguage() string {
 // The syntax analysis request message.
 type AnalyzeSyntaxRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,2,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *AnalyzeSyntaxRequest) Reset()                    { *m = AnalyzeSyntaxRequest{} }
-func (m *AnalyzeSyntaxRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSyntaxRequest) ProtoMessage()               {}
-func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *AnalyzeSyntaxRequest) Reset()         { *m = AnalyzeSyntaxRequest{} }
+func (m *AnalyzeSyntaxRequest) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSyntaxRequest) ProtoMessage()    {}
+func (*AnalyzeSyntaxRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{16}
+}
+func (m *AnalyzeSyntaxRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Unmarshal(m, b)
+}
+func (m *AnalyzeSyntaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSyntaxRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxRequest.Merge(dst, src)
+}
+func (m *AnalyzeSyntaxRequest) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSyntaxRequest.Size(m)
+}
+func (m *AnalyzeSyntaxRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSyntaxRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeSyntaxRequest proto.InternalMessageInfo
 
 func (m *AnalyzeSyntaxRequest) GetDocument() *Document {
 	if m != nil {
@@ -1858,19 +2238,41 @@ func (m *AnalyzeSyntaxRequest) GetEncodingType() EncodingType {
 // The syntax analysis response message.
 type AnalyzeSyntaxResponse struct {
 	// Sentences in the input document.
-	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences,proto3" json:"sentences,omitempty"`
 	// Tokens, along with their syntactic information, in the input document.
-	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens" json:"tokens,omitempty"`
+	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens,proto3" json:"tokens,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta2.Document.language] field for more details.
-	Language string `protobuf:"bytes,3,opt,name=language" json:"language,omitempty"`
+	Language             string   `protobuf:"bytes,3,opt,name=language,proto3" json:"language,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AnalyzeSyntaxResponse) Reset()                    { *m = AnalyzeSyntaxResponse{} }
-func (m *AnalyzeSyntaxResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeSyntaxResponse) ProtoMessage()               {}
-func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *AnalyzeSyntaxResponse) Reset()         { *m = AnalyzeSyntaxResponse{} }
+func (m *AnalyzeSyntaxResponse) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeSyntaxResponse) ProtoMessage()    {}
+func (*AnalyzeSyntaxResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{17}
+}
+func (m *AnalyzeSyntaxResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Unmarshal(m, b)
+}
+func (m *AnalyzeSyntaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeSyntaxResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeSyntaxResponse.Merge(dst, src)
+}
+func (m *AnalyzeSyntaxResponse) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeSyntaxResponse.Size(m)
+}
+func (m *AnalyzeSyntaxResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeSyntaxResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeSyntaxResponse proto.InternalMessageInfo
 
 func (m *AnalyzeSyntaxResponse) GetSentences() []*Sentence {
 	if m != nil {
@@ -1896,13 +2298,35 @@ func (m *AnalyzeSyntaxResponse) GetLanguage() string {
 // The document classification request message.
 type ClassifyTextRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document             *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *ClassifyTextRequest) Reset()                    { *m = ClassifyTextRequest{} }
-func (m *ClassifyTextRequest) String() string            { return proto.CompactTextString(m) }
-func (*ClassifyTextRequest) ProtoMessage()               {}
-func (*ClassifyTextRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *ClassifyTextRequest) Reset()         { *m = ClassifyTextRequest{} }
+func (m *ClassifyTextRequest) String() string { return proto.CompactTextString(m) }
+func (*ClassifyTextRequest) ProtoMessage()    {}
+func (*ClassifyTextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{18}
+}
+func (m *ClassifyTextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassifyTextRequest.Unmarshal(m, b)
+}
+func (m *ClassifyTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassifyTextRequest.Marshal(b, m, deterministic)
+}
+func (dst *ClassifyTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassifyTextRequest.Merge(dst, src)
+}
+func (m *ClassifyTextRequest) XXX_Size() int {
+	return xxx_messageInfo_ClassifyTextRequest.Size(m)
+}
+func (m *ClassifyTextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassifyTextRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClassifyTextRequest proto.InternalMessageInfo
 
 func (m *ClassifyTextRequest) GetDocument() *Document {
 	if m != nil {
@@ -1914,13 +2338,35 @@ func (m *ClassifyTextRequest) GetDocument() *Document {
 // The document classification response message.
 type ClassifyTextResponse struct {
 	// Categories representing the input document.
-	Categories []*ClassificationCategory `protobuf:"bytes,1,rep,name=categories" json:"categories,omitempty"`
+	Categories           []*ClassificationCategory `protobuf:"bytes,1,rep,name=categories,proto3" json:"categories,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *ClassifyTextResponse) Reset()                    { *m = ClassifyTextResponse{} }
-func (m *ClassifyTextResponse) String() string            { return proto.CompactTextString(m) }
-func (*ClassifyTextResponse) ProtoMessage()               {}
-func (*ClassifyTextResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+func (m *ClassifyTextResponse) Reset()         { *m = ClassifyTextResponse{} }
+func (m *ClassifyTextResponse) String() string { return proto.CompactTextString(m) }
+func (*ClassifyTextResponse) ProtoMessage()    {}
+func (*ClassifyTextResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{19}
+}
+func (m *ClassifyTextResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClassifyTextResponse.Unmarshal(m, b)
+}
+func (m *ClassifyTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClassifyTextResponse.Marshal(b, m, deterministic)
+}
+func (dst *ClassifyTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClassifyTextResponse.Merge(dst, src)
+}
+func (m *ClassifyTextResponse) XXX_Size() int {
+	return xxx_messageInfo_ClassifyTextResponse.Size(m)
+}
+func (m *ClassifyTextResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClassifyTextResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClassifyTextResponse proto.InternalMessageInfo
 
 func (m *ClassifyTextResponse) GetCategories() []*ClassificationCategory {
 	if m != nil {
@@ -1933,17 +2379,39 @@ func (m *ClassifyTextResponse) GetCategories() []*ClassificationCategory {
 // analysis types (sentiment, entities, and syntax) in one call.
 type AnnotateTextRequest struct {
 	// Input document.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The enabled features.
-	Features *AnnotateTextRequest_Features `protobuf:"bytes,2,opt,name=features" json:"features,omitempty"`
+	Features *AnnotateTextRequest_Features `protobuf:"bytes,2,opt,name=features,proto3" json:"features,omitempty"`
 	// The encoding type used by the API to calculate offsets.
-	EncodingType EncodingType `protobuf:"varint,3,opt,name=encoding_type,json=encodingType,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	EncodingType         EncodingType `protobuf:"varint,3,opt,name=encoding_type,json=encodingType,proto3,enum=google.cloud.language.v1beta2.EncodingType" json:"encoding_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *AnnotateTextRequest) Reset()         { *m = AnnotateTextRequest{} }
+func (m *AnnotateTextRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateTextRequest) ProtoMessage()    {}
+func (*AnnotateTextRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{20}
+}
+func (m *AnnotateTextRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextRequest.Unmarshal(m, b)
+}
+func (m *AnnotateTextRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest.Merge(dst, src)
+}
+func (m *AnnotateTextRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextRequest.Size(m)
+}
+func (m *AnnotateTextRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextRequest.DiscardUnknown(m)
 }
 
-func (m *AnnotateTextRequest) Reset()                    { *m = AnnotateTextRequest{} }
-func (m *AnnotateTextRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateTextRequest) ProtoMessage()               {}
-func (*AnnotateTextRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+var xxx_messageInfo_AnnotateTextRequest proto.InternalMessageInfo
 
 func (m *AnnotateTextRequest) GetDocument() *Document {
 	if m != nil {
@@ -1970,23 +2438,43 @@ func (m *AnnotateTextRequest) GetEncodingType() EncodingType {
 // Setting each one to true will enable that specific analysis for the input.
 type AnnotateTextRequest_Features struct {
 	// Extract syntax information.
-	ExtractSyntax bool `protobuf:"varint,1,opt,name=extract_syntax,json=extractSyntax" json:"extract_syntax,omitempty"`
+	ExtractSyntax bool `protobuf:"varint,1,opt,name=extract_syntax,json=extractSyntax,proto3" json:"extract_syntax,omitempty"`
 	// Extract entities.
-	ExtractEntities bool `protobuf:"varint,2,opt,name=extract_entities,json=extractEntities" json:"extract_entities,omitempty"`
+	ExtractEntities bool `protobuf:"varint,2,opt,name=extract_entities,json=extractEntities,proto3" json:"extract_entities,omitempty"`
 	// Extract document-level sentiment.
-	ExtractDocumentSentiment bool `protobuf:"varint,3,opt,name=extract_document_sentiment,json=extractDocumentSentiment" json:"extract_document_sentiment,omitempty"`
+	ExtractDocumentSentiment bool `protobuf:"varint,3,opt,name=extract_document_sentiment,json=extractDocumentSentiment,proto3" json:"extract_document_sentiment,omitempty"`
 	// Extract entities and their associated sentiment.
-	ExtractEntitySentiment bool `protobuf:"varint,4,opt,name=extract_entity_sentiment,json=extractEntitySentiment" json:"extract_entity_sentiment,omitempty"`
+	ExtractEntitySentiment bool `protobuf:"varint,4,opt,name=extract_entity_sentiment,json=extractEntitySentiment,proto3" json:"extract_entity_sentiment,omitempty"`
 	// Classify the full document into categories.
-	ClassifyText bool `protobuf:"varint,6,opt,name=classify_text,json=classifyText" json:"classify_text,omitempty"`
+	ClassifyText         bool     `protobuf:"varint,6,opt,name=classify_text,json=classifyText,proto3" json:"classify_text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *AnnotateTextRequest_Features) Reset()         { *m = AnnotateTextRequest_Features{} }
 func (m *AnnotateTextRequest_Features) String() string { return proto.CompactTextString(m) }
 func (*AnnotateTextRequest_Features) ProtoMessage()    {}
 func (*AnnotateTextRequest_Features) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{20, 0}
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{20, 0}
+}
+func (m *AnnotateTextRequest_Features) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Unmarshal(m, b)
+}
+func (m *AnnotateTextRequest_Features) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextRequest_Features) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextRequest_Features.Merge(dst, src)
+}
+func (m *AnnotateTextRequest_Features) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextRequest_Features.Size(m)
 }
+func (m *AnnotateTextRequest_Features) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextRequest_Features.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateTextRequest_Features proto.InternalMessageInfo
 
 func (m *AnnotateTextRequest_Features) GetExtractSyntax() bool {
 	if m != nil {
@@ -2027,30 +2515,52 @@ func (m *AnnotateTextRequest_Features) GetClassifyText() bool {
 type AnnotateTextResponse struct {
 	// Sentences in the input document. Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_syntax][google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_syntax].
-	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences" json:"sentences,omitempty"`
+	Sentences []*Sentence `protobuf:"bytes,1,rep,name=sentences,proto3" json:"sentences,omitempty"`
 	// Tokens, along with their syntactic information, in the input document.
 	// Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_syntax][google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_syntax].
-	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens" json:"tokens,omitempty"`
+	Tokens []*Token `protobuf:"bytes,2,rep,name=tokens,proto3" json:"tokens,omitempty"`
 	// Entities, along with their semantic information, in the input document.
 	// Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_entities][google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_entities].
-	Entities []*Entity `protobuf:"bytes,3,rep,name=entities" json:"entities,omitempty"`
+	Entities []*Entity `protobuf:"bytes,3,rep,name=entities,proto3" json:"entities,omitempty"`
 	// The overall sentiment for the document. Populated if the user enables
 	// [AnnotateTextRequest.Features.extract_document_sentiment][google.cloud.language.v1beta2.AnnotateTextRequest.Features.extract_document_sentiment].
-	DocumentSentiment *Sentiment `protobuf:"bytes,4,opt,name=document_sentiment,json=documentSentiment" json:"document_sentiment,omitempty"`
+	DocumentSentiment *Sentiment `protobuf:"bytes,4,opt,name=document_sentiment,json=documentSentiment,proto3" json:"document_sentiment,omitempty"`
 	// The language of the text, which will be the same as the language specified
 	// in the request or, if not specified, the automatically-detected language.
 	// See [Document.language][google.cloud.language.v1beta2.Document.language] field for more details.
-	Language string `protobuf:"bytes,5,opt,name=language" json:"language,omitempty"`
+	Language string `protobuf:"bytes,5,opt,name=language,proto3" json:"language,omitempty"`
 	// Categories identified in the input document.
-	Categories []*ClassificationCategory `protobuf:"bytes,6,rep,name=categories" json:"categories,omitempty"`
+	Categories           []*ClassificationCategory `protobuf:"bytes,6,rep,name=categories,proto3" json:"categories,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *AnnotateTextResponse) Reset()         { *m = AnnotateTextResponse{} }
+func (m *AnnotateTextResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateTextResponse) ProtoMessage()    {}
+func (*AnnotateTextResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_language_service_62b42b651f43d67b, []int{21}
+}
+func (m *AnnotateTextResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateTextResponse.Unmarshal(m, b)
+}
+func (m *AnnotateTextResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateTextResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateTextResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateTextResponse.Merge(dst, src)
+}
+func (m *AnnotateTextResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateTextResponse.Size(m)
+}
+func (m *AnnotateTextResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateTextResponse.DiscardUnknown(m)
 }
 
-func (m *AnnotateTextResponse) Reset()                    { *m = AnnotateTextResponse{} }
-func (m *AnnotateTextResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateTextResponse) ProtoMessage()               {}
-func (*AnnotateTextResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+var xxx_messageInfo_AnnotateTextResponse proto.InternalMessageInfo
 
 func (m *AnnotateTextResponse) GetSentences() []*Sentence {
 	if m != nil {
@@ -2098,6 +2608,7 @@ func init() {
 	proto.RegisterType((*Document)(nil), "google.cloud.language.v1beta2.Document")
 	proto.RegisterType((*Sentence)(nil), "google.cloud.language.v1beta2.Sentence")
 	proto.RegisterType((*Entity)(nil), "google.cloud.language.v1beta2.Entity")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.language.v1beta2.Entity.MetadataEntry")
 	proto.RegisterType((*Token)(nil), "google.cloud.language.v1beta2.Token")
 	proto.RegisterType((*Sentiment)(nil), "google.cloud.language.v1beta2.Sentiment")
 	proto.RegisterType((*PartOfSpeech)(nil), "google.cloud.language.v1beta2.PartOfSpeech")
@@ -2145,8 +2656,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for LanguageService service
-
+// LanguageServiceClient is the client API for LanguageService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type LanguageServiceClient interface {
 	// Analyzes the sentiment of the provided text.
 	AnalyzeSentiment(ctx context.Context, in *AnalyzeSentimentRequest, opts ...grpc.CallOption) (*AnalyzeSentimentResponse, error)
@@ -2178,7 +2690,7 @@ func NewLanguageServiceClient(cc *grpc.ClientConn) LanguageServiceClient {
 
 func (c *languageServiceClient) AnalyzeSentiment(ctx context.Context, in *AnalyzeSentimentRequest, opts ...grpc.CallOption) (*AnalyzeSentimentResponse, error) {
 	out := new(AnalyzeSentimentResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnalyzeSentiment", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnalyzeSentiment", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2187,7 +2699,7 @@ func (c *languageServiceClient) AnalyzeSentiment(ctx context.Context, in *Analyz
 
 func (c *languageServiceClient) AnalyzeEntities(ctx context.Context, in *AnalyzeEntitiesRequest, opts ...grpc.CallOption) (*AnalyzeEntitiesResponse, error) {
 	out := new(AnalyzeEntitiesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnalyzeEntities", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnalyzeEntities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2196,7 +2708,7 @@ func (c *languageServiceClient) AnalyzeEntities(ctx context.Context, in *Analyze
 
 func (c *languageServiceClient) AnalyzeEntitySentiment(ctx context.Context, in *AnalyzeEntitySentimentRequest, opts ...grpc.CallOption) (*AnalyzeEntitySentimentResponse, error) {
 	out := new(AnalyzeEntitySentimentResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnalyzeEntitySentiment", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnalyzeEntitySentiment", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2205,7 +2717,7 @@ func (c *languageServiceClient) AnalyzeEntitySentiment(ctx context.Context, in *
 
 func (c *languageServiceClient) AnalyzeSyntax(ctx context.Context, in *AnalyzeSyntaxRequest, opts ...grpc.CallOption) (*AnalyzeSyntaxResponse, error) {
 	out := new(AnalyzeSyntaxResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnalyzeSyntax", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnalyzeSyntax", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2214,7 +2726,7 @@ func (c *languageServiceClient) AnalyzeSyntax(ctx context.Context, in *AnalyzeSy
 
 func (c *languageServiceClient) ClassifyText(ctx context.Context, in *ClassifyTextRequest, opts ...grpc.CallOption) (*ClassifyTextResponse, error) {
 	out := new(ClassifyTextResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/ClassifyText", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/ClassifyText", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2223,15 +2735,14 @@ func (c *languageServiceClient) ClassifyText(ctx context.Context, in *ClassifyTe
 
 func (c *languageServiceClient) AnnotateText(ctx context.Context, in *AnnotateTextRequest, opts ...grpc.CallOption) (*AnnotateTextResponse, error) {
 	out := new(AnnotateTextResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnnotateText", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.language.v1beta2.LanguageService/AnnotateText", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for LanguageService service
-
+// LanguageServiceServer is the server API for LanguageService service.
 type LanguageServiceServer interface {
 	// Analyzes the sentiment of the provided text.
 	AnalyzeSentiment(context.Context, *AnalyzeSentimentRequest) (*AnalyzeSentimentResponse, error)
@@ -2399,10 +2910,10 @@ var _LanguageService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/language/v1beta2/language_service.proto", fileDescriptor0)
+	proto.RegisterFile("google/cloud/language/v1beta2/language_service.proto", fileDescriptor_language_service_62b42b651f43d67b)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_language_service_62b42b651f43d67b = []byte{
 	// 3019 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3a, 0x4b, 0x73, 0xdb, 0xc6,
 	0xfd, 0x06, 0x5f, 0xa2, 0x96, 0x92, 0xbc, 0x86, 0x1d, 0x9b, 0x7f, 0xfd, 0xf3, 0x70, 0xe0, 0xb8,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/location/locations.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/location/locations.pb.go
index 2b9f9f52..5a08db47 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/location/locations.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/location/locations.pb.go
@@ -1,25 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/location/locations.proto
 
-/*
-Package location is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/location/locations.proto
-
-It has these top-level messages:
-	ListLocationsRequest
-	ListLocationsResponse
-	GetLocationRequest
-	Location
-*/
-package location
+package location // import "google.golang.org/genproto/googleapis/cloud/location"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
 
 import (
 	context "golang.org/x/net/context"
@@ -40,19 +28,41 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // The request message for [Locations.ListLocations][google.cloud.location.Locations.ListLocations].
 type ListLocationsRequest struct {
 	// The resource that owns the locations collection, if applicable.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The standard list filter.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The standard list page size.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The standard list page token.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListLocationsRequest) Reset()         { *m = ListLocationsRequest{} }
+func (m *ListLocationsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListLocationsRequest) ProtoMessage()    {}
+func (*ListLocationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_locations_7a7af132c8d24683, []int{0}
+}
+func (m *ListLocationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLocationsRequest.Unmarshal(m, b)
+}
+func (m *ListLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLocationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListLocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLocationsRequest.Merge(dst, src)
+}
+func (m *ListLocationsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListLocationsRequest.Size(m)
+}
+func (m *ListLocationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLocationsRequest.DiscardUnknown(m)
 }
 
-func (m *ListLocationsRequest) Reset()                    { *m = ListLocationsRequest{} }
-func (m *ListLocationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListLocationsRequest) ProtoMessage()               {}
-func (*ListLocationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_ListLocationsRequest proto.InternalMessageInfo
 
 func (m *ListLocationsRequest) GetName() string {
 	if m != nil {
@@ -85,15 +95,37 @@ func (m *ListLocationsRequest) GetPageToken() string {
 // The response message for [Locations.ListLocations][google.cloud.location.Locations.ListLocations].
 type ListLocationsResponse struct {
 	// A list of locations that matches the specified filter in the request.
-	Locations []*Location `protobuf:"bytes,1,rep,name=locations" json:"locations,omitempty"`
+	Locations []*Location `protobuf:"bytes,1,rep,name=locations,proto3" json:"locations,omitempty"`
 	// The standard List next-page token.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListLocationsResponse) Reset()         { *m = ListLocationsResponse{} }
+func (m *ListLocationsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListLocationsResponse) ProtoMessage()    {}
+func (*ListLocationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_locations_7a7af132c8d24683, []int{1}
+}
+func (m *ListLocationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLocationsResponse.Unmarshal(m, b)
+}
+func (m *ListLocationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLocationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListLocationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLocationsResponse.Merge(dst, src)
+}
+func (m *ListLocationsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListLocationsResponse.Size(m)
+}
+func (m *ListLocationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLocationsResponse.DiscardUnknown(m)
 }
 
-func (m *ListLocationsResponse) Reset()                    { *m = ListLocationsResponse{} }
-func (m *ListLocationsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListLocationsResponse) ProtoMessage()               {}
-func (*ListLocationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_ListLocationsResponse proto.InternalMessageInfo
 
 func (m *ListLocationsResponse) GetLocations() []*Location {
 	if m != nil {
@@ -112,13 +144,35 @@ func (m *ListLocationsResponse) GetNextPageToken() string {
 // The request message for [Locations.GetLocation][google.cloud.location.Locations.GetLocation].
 type GetLocationRequest struct {
 	// Resource name for the location.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetLocationRequest) Reset()                    { *m = GetLocationRequest{} }
-func (m *GetLocationRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetLocationRequest) ProtoMessage()               {}
-func (*GetLocationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *GetLocationRequest) Reset()         { *m = GetLocationRequest{} }
+func (m *GetLocationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetLocationRequest) ProtoMessage()    {}
+func (*GetLocationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_locations_7a7af132c8d24683, []int{2}
+}
+func (m *GetLocationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetLocationRequest.Unmarshal(m, b)
+}
+func (m *GetLocationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetLocationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetLocationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLocationRequest.Merge(dst, src)
+}
+func (m *GetLocationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetLocationRequest.Size(m)
+}
+func (m *GetLocationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetLocationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetLocationRequest proto.InternalMessageInfo
 
 func (m *GetLocationRequest) GetName() string {
 	if m != nil {
@@ -131,22 +185,47 @@ func (m *GetLocationRequest) GetName() string {
 type Location struct {
 	// Resource name for the location, which may vary between implementations.
 	// For example: `"projects/example-project/locations/us-east1"`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The canonical id for this location. For example: `"us-east1"`.
-	LocationId string `protobuf:"bytes,4,opt,name=location_id,json=locationId" json:"location_id,omitempty"`
+	LocationId string `protobuf:"bytes,4,opt,name=location_id,json=locationId,proto3" json:"location_id,omitempty"`
+	// The friendly name for this location, typically a nearby city name.
+	// For example, "Tokyo".
+	DisplayName string `protobuf:"bytes,5,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Cross-service attributes for the location. For example
 	//
 	//     {"cloud.googleapis.com/region": "us-east1"}
-	Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Service-specific metadata. For example the available capacity at the given
 	// location.
-	Metadata *google_protobuf1.Any `protobuf:"bytes,3,opt,name=metadata" json:"metadata,omitempty"`
+	Metadata             *any.Any `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Location) Reset()         { *m = Location{} }
+func (m *Location) String() string { return proto.CompactTextString(m) }
+func (*Location) ProtoMessage()    {}
+func (*Location) Descriptor() ([]byte, []int) {
+	return fileDescriptor_locations_7a7af132c8d24683, []int{3}
+}
+func (m *Location) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Location.Unmarshal(m, b)
+}
+func (m *Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Location.Marshal(b, m, deterministic)
+}
+func (dst *Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Location.Merge(dst, src)
+}
+func (m *Location) XXX_Size() int {
+	return xxx_messageInfo_Location.Size(m)
+}
+func (m *Location) XXX_DiscardUnknown() {
+	xxx_messageInfo_Location.DiscardUnknown(m)
 }
 
-func (m *Location) Reset()                    { *m = Location{} }
-func (m *Location) String() string            { return proto.CompactTextString(m) }
-func (*Location) ProtoMessage()               {}
-func (*Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_Location proto.InternalMessageInfo
 
 func (m *Location) GetName() string {
 	if m != nil {
@@ -162,6 +241,13 @@ func (m *Location) GetLocationId() string {
 	return ""
 }
 
+func (m *Location) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
 func (m *Location) GetLabels() map[string]string {
 	if m != nil {
 		return m.Labels
@@ -169,7 +255,7 @@ func (m *Location) GetLabels() map[string]string {
 	return nil
 }
 
-func (m *Location) GetMetadata() *google_protobuf1.Any {
+func (m *Location) GetMetadata() *any.Any {
 	if m != nil {
 		return m.Metadata
 	}
@@ -181,6 +267,7 @@ func init() {
 	proto.RegisterType((*ListLocationsResponse)(nil), "google.cloud.location.ListLocationsResponse")
 	proto.RegisterType((*GetLocationRequest)(nil), "google.cloud.location.GetLocationRequest")
 	proto.RegisterType((*Location)(nil), "google.cloud.location.Location")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.location.Location.LabelsEntry")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -191,12 +278,13 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Locations service
-
+// LocationsClient is the client API for Locations service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type LocationsClient interface {
 	// Lists information about the supported locations for this service.
 	ListLocations(ctx context.Context, in *ListLocationsRequest, opts ...grpc.CallOption) (*ListLocationsResponse, error)
-	// Get information about a location.
+	// Gets information about a location.
 	GetLocation(ctx context.Context, in *GetLocationRequest, opts ...grpc.CallOption) (*Location, error)
 }
 
@@ -210,7 +298,7 @@ func NewLocationsClient(cc *grpc.ClientConn) LocationsClient {
 
 func (c *locationsClient) ListLocations(ctx context.Context, in *ListLocationsRequest, opts ...grpc.CallOption) (*ListLocationsResponse, error) {
 	out := new(ListLocationsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.location.Locations/ListLocations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.location.Locations/ListLocations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -219,19 +307,18 @@ func (c *locationsClient) ListLocations(ctx context.Context, in *ListLocationsRe
 
 func (c *locationsClient) GetLocation(ctx context.Context, in *GetLocationRequest, opts ...grpc.CallOption) (*Location, error) {
 	out := new(Location)
-	err := grpc.Invoke(ctx, "/google.cloud.location.Locations/GetLocation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.location.Locations/GetLocation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Locations service
-
+// LocationsServer is the server API for Locations service.
 type LocationsServer interface {
 	// Lists information about the supported locations for this service.
 	ListLocations(context.Context, *ListLocationsRequest) (*ListLocationsResponse, error)
-	// Get information about a location.
+	// Gets information about a location.
 	GetLocation(context.Context, *GetLocationRequest) (*Location, error)
 }
 
@@ -292,40 +379,43 @@ var _Locations_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/location/locations.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/location/locations.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/location/locations.proto", fileDescriptor_locations_7a7af132c8d24683)
+}
 
-var fileDescriptor0 = []byte{
-	// 508 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_locations_7a7af132c8d24683 = []byte{
+	// 527 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0xd6, 0x3a, 0x6d, 0x94, 0x8c, 0x55, 0x40, 0xa3, 0x14, 0xb9, 0x06, 0x94, 0xd4, 0x08, 0x48,
-	0x0b, 0xf2, 0x42, 0xb8, 0xf0, 0xa3, 0x1c, 0x28, 0x42, 0x08, 0x29, 0x87, 0xc8, 0x70, 0xe2, 0x12,
-	0x6d, 0x92, 0xad, 0x65, 0xea, 0xec, 0x1a, 0x7b, 0x53, 0x91, 0xa2, 0xf6, 0x80, 0x78, 0x83, 0xbe,
-	0x04, 0xef, 0xc3, 0x2b, 0xf0, 0x02, 0xdc, 0x38, 0x22, 0xaf, 0x7f, 0x12, 0x8a, 0x4b, 0xb8, 0xcd,
-	0xce, 0x7c, 0xb3, 0xdf, 0x7c, 0xf3, 0xad, 0x0d, 0x77, 0x7c, 0x29, 0xfd, 0x90, 0xd3, 0x49, 0x28,
-	0xe7, 0x53, 0x1a, 0xca, 0x09, 0x53, 0x81, 0x14, 0x65, 0x90, 0xb8, 0x51, 0x2c, 0x95, 0xc4, 0xed,
-	0x0c, 0xe6, 0x6a, 0x98, 0x5b, 0x54, 0xed, 0x9b, 0x79, 0x37, 0x8b, 0x02, 0xca, 0x84, 0x90, 0x6a,
-	0xb5, 0xc9, 0xde, 0xc9, 0xab, 0xfa, 0x34, 0x9e, 0x1f, 0x52, 0x26, 0x16, 0x59, 0xc9, 0x39, 0x83,
-	0xd6, 0x20, 0x48, 0xd4, 0xa0, 0xa0, 0xf1, 0xf8, 0xc7, 0x39, 0x4f, 0x14, 0x22, 0x6c, 0x08, 0x36,
-	0xe3, 0x16, 0xe9, 0x90, 0x6e, 0xd3, 0xd3, 0x31, 0x5e, 0x87, 0xfa, 0x61, 0x10, 0x2a, 0x1e, 0x5b,
-	0x86, 0xce, 0xe6, 0x27, 0xbc, 0x01, 0xcd, 0x88, 0xf9, 0x7c, 0x94, 0x04, 0x27, 0xdc, 0xaa, 0x75,
-	0x48, 0x77, 0xd3, 0x6b, 0xa4, 0x89, 0xb7, 0xc1, 0x09, 0xc7, 0x5b, 0x00, 0xba, 0xa8, 0xe4, 0x11,
-	0x17, 0xd6, 0x86, 0x6e, 0xd4, 0xf0, 0x77, 0x69, 0xc2, 0x39, 0x83, 0xed, 0x0b, 0xfc, 0x49, 0x24,
-	0x45, 0xc2, 0xb1, 0x0f, 0xcd, 0x52, 0xbb, 0x45, 0x3a, 0xb5, 0xae, 0xd9, 0x6b, 0xbb, 0x95, 0xe2,
-	0xdd, 0xa2, 0xd9, 0x5b, 0x76, 0xe0, 0x5d, 0xb8, 0x2a, 0xf8, 0x27, 0x35, 0x5a, 0xe1, 0xce, 0x86,
-	0xde, 0x4a, 0xd3, 0xc3, 0x92, 0xbf, 0x0b, 0xf8, 0x9a, 0x97, 0xf4, 0xff, 0x50, 0xef, 0xfc, 0x24,
-	0xd0, 0x28, 0x70, 0x95, 0xeb, 0x69, 0x83, 0x59, 0xf0, 0x8f, 0x82, 0x69, 0x2e, 0x15, 0x8a, 0xd4,
-	0x9b, 0x29, 0xbe, 0x84, 0x7a, 0xc8, 0xc6, 0x3c, 0x4c, 0x2c, 0x43, 0xeb, 0xb9, 0xbf, 0x46, 0x8f,
-	0x3b, 0xd0, 0xe8, 0x57, 0x42, 0xc5, 0x0b, 0x2f, 0x6f, 0xc5, 0x87, 0xd0, 0x98, 0x71, 0xc5, 0xa6,
-	0x4c, 0x31, 0xbd, 0x6b, 0xb3, 0xd7, 0x2a, 0xae, 0x29, 0xec, 0x75, 0x5f, 0x88, 0x85, 0x57, 0xa2,
-	0xec, 0xa7, 0x60, 0xae, 0x5c, 0x84, 0xd7, 0xa0, 0x76, 0xc4, 0x17, 0xf9, 0xe4, 0x69, 0x88, 0x2d,
-	0xd8, 0x3c, 0x66, 0xe1, 0x9c, 0xe7, 0x1b, 0xca, 0x0e, 0xcf, 0x8c, 0x27, 0xa4, 0xf7, 0xcd, 0x80,
-	0x66, 0x69, 0x0d, 0x9e, 0x13, 0xd8, 0xfa, 0xc3, 0x2c, 0xbc, 0x54, 0x41, 0xc5, 0x93, 0xb2, 0x1f,
-	0xfc, 0x1f, 0x38, 0xf3, 0xdf, 0xb9, 0xf7, 0xe5, 0xfb, 0x8f, 0x73, 0x63, 0x17, 0xdb, 0xf4, 0xf8,
-	0x11, 0xfd, 0x9c, 0x2e, 0xb8, 0x1f, 0xc5, 0xf2, 0x03, 0x9f, 0xa8, 0x84, 0xee, 0x9f, 0x2e, 0xbf,
-	0x0b, 0xfc, 0x4a, 0xc0, 0x5c, 0xb1, 0x10, 0xf7, 0x2e, 0xa1, 0xf9, 0xdb, 0x66, 0x7b, 0xdd, 0x83,
-	0x72, 0xf6, 0xf4, 0x10, 0xb7, 0x71, 0xb7, 0x6a, 0x88, 0xe5, 0x0c, 0x74, 0xff, 0xf4, 0x40, 0xc2,
-	0xce, 0x44, 0xce, 0xaa, 0x2f, 0x3c, 0xb8, 0x52, 0xea, 0x1b, 0xa6, 0x1e, 0x0d, 0xc9, 0xfb, 0x7e,
-	0x0e, 0xf4, 0x65, 0xc8, 0x84, 0xef, 0xca, 0xd8, 0xa7, 0x3e, 0x17, 0xda, 0x41, 0x9a, 0x95, 0x58,
-	0x14, 0x24, 0x17, 0xfe, 0x06, 0xcf, 0x8b, 0xe0, 0x17, 0x21, 0xe3, 0xba, 0x06, 0x3f, 0xfe, 0x1d,
-	0x00, 0x00, 0xff, 0xff, 0x0d, 0x57, 0x9e, 0xa7, 0x39, 0x04, 0x00, 0x00,
+	0x10, 0xd6, 0x3a, 0x4d, 0x94, 0x8c, 0x29, 0xa0, 0x55, 0x8a, 0xdc, 0x00, 0x4a, 0x62, 0x04, 0xa4,
+	0x05, 0x79, 0x21, 0x5c, 0xf8, 0x51, 0x0e, 0x14, 0x21, 0x84, 0x14, 0xa1, 0xc8, 0x70, 0xe2, 0x12,
+	0x6d, 0xe2, 0xad, 0x65, 0xea, 0xec, 0x1a, 0xef, 0xa6, 0xc2, 0x45, 0xed, 0x01, 0xf1, 0x06, 0xe5,
+	0x21, 0x78, 0x1f, 0x5e, 0x81, 0x87, 0xe0, 0x88, 0xbc, 0xfe, 0x49, 0x28, 0x2e, 0xe5, 0xb6, 0x3b,
+	0xf3, 0x7d, 0xf3, 0xcd, 0xb7, 0x33, 0x36, 0xdc, 0xf6, 0x85, 0xf0, 0x43, 0x46, 0xe6, 0xa1, 0x58,
+	0x7a, 0x24, 0x14, 0x73, 0xaa, 0x02, 0xc1, 0xcb, 0x83, 0x74, 0xa2, 0x58, 0x28, 0x81, 0xb7, 0x32,
+	0x98, 0xa3, 0x61, 0x4e, 0x91, 0xed, 0xdc, 0xc8, 0xd9, 0x34, 0x0a, 0x08, 0xe5, 0x5c, 0xa8, 0x75,
+	0x52, 0x67, 0x3b, 0xcf, 0xea, 0xdb, 0x6c, 0xb9, 0x4f, 0x28, 0x4f, 0xb2, 0x94, 0x7d, 0x02, 0xed,
+	0x71, 0x20, 0xd5, 0xb8, 0x90, 0x71, 0xd9, 0xc7, 0x25, 0x93, 0x0a, 0x63, 0xd8, 0xe0, 0x74, 0xc1,
+	0x2c, 0xd4, 0x43, 0x83, 0x96, 0xab, 0xcf, 0xf8, 0x1a, 0x34, 0xf6, 0x83, 0x50, 0xb1, 0xd8, 0x32,
+	0x74, 0x34, 0xbf, 0xe1, 0xeb, 0xd0, 0x8a, 0xa8, 0xcf, 0xa6, 0x32, 0x38, 0x62, 0x56, 0xad, 0x87,
+	0x06, 0x75, 0xb7, 0x99, 0x06, 0xde, 0x06, 0x47, 0x0c, 0xdf, 0x04, 0xd0, 0x49, 0x25, 0x0e, 0x18,
+	0xb7, 0x36, 0x34, 0x51, 0xc3, 0xdf, 0xa5, 0x01, 0xfb, 0x04, 0xb6, 0xce, 0xe8, 0xcb, 0x48, 0x70,
+	0xc9, 0xf0, 0x08, 0x5a, 0xa5, 0x77, 0x0b, 0xf5, 0x6a, 0x03, 0x73, 0xd8, 0x75, 0x2a, 0xcd, 0x3b,
+	0x05, 0xd9, 0x5d, 0x31, 0xf0, 0x1d, 0xb8, 0xc2, 0xd9, 0x27, 0x35, 0x5d, 0xd3, 0xce, 0x9a, 0xde,
+	0x4c, 0xc3, 0x93, 0x52, 0x7f, 0x00, 0xf8, 0x15, 0x2b, 0xe5, 0xff, 0xe1, 0xde, 0xfe, 0x66, 0x40,
+	0xb3, 0xc0, 0x55, 0x3e, 0x4f, 0x17, 0xcc, 0x42, 0x7f, 0x1a, 0x78, 0xb9, 0x55, 0x28, 0x42, 0xaf,
+	0x3d, 0xdc, 0x87, 0x4b, 0x5e, 0x20, 0xa3, 0x90, 0x26, 0x53, 0x4d, 0xae, 0x6b, 0x84, 0x99, 0xc7,
+	0xde, 0xa4, 0x35, 0x5e, 0x40, 0x23, 0xa4, 0x33, 0x16, 0x4a, 0xcb, 0xd0, 0x96, 0xef, 0x5d, 0x60,
+	0xd9, 0x19, 0x6b, 0xf4, 0x4b, 0xae, 0xe2, 0xc4, 0xcd, 0xa9, 0xf8, 0x01, 0x34, 0x17, 0x4c, 0x51,
+	0x8f, 0x2a, 0xaa, 0xc7, 0x61, 0x0e, 0xdb, 0x45, 0x99, 0x62, 0x03, 0x9c, 0xe7, 0x3c, 0x71, 0x4b,
+	0x54, 0xe7, 0x09, 0x98, 0x6b, 0x85, 0xf0, 0x55, 0xa8, 0x1d, 0xb0, 0x24, 0x37, 0x97, 0x1e, 0x71,
+	0x1b, 0xea, 0x87, 0x34, 0x5c, 0xb2, 0xfc, 0x11, 0xb3, 0xcb, 0x53, 0xe3, 0x31, 0x1a, 0x7e, 0x37,
+	0xa0, 0x55, 0x4e, 0x0f, 0x9f, 0x22, 0xd8, 0xfc, 0x63, 0x9e, 0xf8, 0x5c, 0x07, 0x15, 0x5b, 0xd7,
+	0xb9, 0xff, 0x7f, 0xe0, 0x6c, 0x45, 0xec, 0xbb, 0x5f, 0x7e, 0xfc, 0x3c, 0x35, 0xfa, 0xb8, 0x4b,
+	0x0e, 0x1f, 0x92, 0xcf, 0xe9, 0x93, 0x8e, 0xa2, 0x58, 0x7c, 0x60, 0x73, 0x25, 0xc9, 0xee, 0xf1,
+	0xea, 0xd3, 0xc1, 0x5f, 0x11, 0x98, 0x6b, 0x53, 0xc6, 0x3b, 0xe7, 0xc8, 0xfc, 0xbd, 0x09, 0x9d,
+	0x8b, 0x76, 0xce, 0xde, 0xd1, 0x4d, 0xdc, 0xc2, 0xfd, 0xaa, 0x26, 0x56, 0x3d, 0x90, 0xdd, 0xe3,
+	0x3d, 0x01, 0xdb, 0x73, 0xb1, 0xa8, 0x2e, 0xb8, 0x77, 0xb9, 0xf4, 0x37, 0x49, 0x67, 0x34, 0x41,
+	0xef, 0x47, 0x39, 0xd0, 0x17, 0x21, 0xe5, 0xbe, 0x23, 0x62, 0x9f, 0xf8, 0x8c, 0xeb, 0x09, 0x92,
+	0x2c, 0x45, 0xa3, 0x40, 0x9e, 0xf9, 0x61, 0x3c, 0x2b, 0x0e, 0xbf, 0x10, 0x9a, 0x35, 0x34, 0xf8,
+	0xd1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x27, 0xd7, 0x9e, 0x57, 0x5c, 0x04, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/job_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/job_service.pb.go
index b99add0e..6450025e 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/job_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/job_service.pb.go
@@ -1,58 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/job_service.proto
 
-/*
-Package ml is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/ml/v1/job_service.proto
-	google/cloud/ml/v1/model_service.proto
-	google/cloud/ml/v1/operation_metadata.proto
-	google/cloud/ml/v1/prediction_service.proto
-	google/cloud/ml/v1/project_service.proto
-
-It has these top-level messages:
-	TrainingInput
-	HyperparameterSpec
-	ParameterSpec
-	HyperparameterOutput
-	TrainingOutput
-	PredictionInput
-	PredictionOutput
-	Job
-	CreateJobRequest
-	ListJobsRequest
-	ListJobsResponse
-	GetJobRequest
-	CancelJobRequest
-	Model
-	Version
-	ManualScaling
-	CreateModelRequest
-	ListModelsRequest
-	ListModelsResponse
-	GetModelRequest
-	DeleteModelRequest
-	CreateVersionRequest
-	ListVersionsRequest
-	ListVersionsResponse
-	GetVersionRequest
-	DeleteVersionRequest
-	SetDefaultVersionRequest
-	OperationMetadata
-	PredictRequest
-	GetConfigRequest
-	GetConfigResponse
-*/
-package ml
+package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
 
 import (
 	context "golang.org/x/net/context"
@@ -137,7 +94,9 @@ var TrainingInput_ScaleTier_value = map[string]int32{
 func (x TrainingInput_ScaleTier) String() string {
 	return proto.EnumName(TrainingInput_ScaleTier_name, int32(x))
 }
-func (TrainingInput_ScaleTier) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (TrainingInput_ScaleTier) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{0, 0}
+}
 
 // The available types of optimization goals.
 type HyperparameterSpec_GoalType int32
@@ -166,7 +125,7 @@ func (x HyperparameterSpec_GoalType) String() string {
 	return proto.EnumName(HyperparameterSpec_GoalType_name, int32(x))
 }
 func (HyperparameterSpec_GoalType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 0}
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{1, 0}
 }
 
 // The type of the parameter.
@@ -208,7 +167,7 @@ func (x ParameterSpec_ParameterType) String() string {
 	return proto.EnumName(ParameterSpec_ParameterType_name, int32(x))
 }
 func (ParameterSpec_ParameterType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 0}
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{2, 0}
 }
 
 // The type of scaling that should be applied to this parameter.
@@ -245,7 +204,9 @@ var ParameterSpec_ScaleType_value = map[string]int32{
 func (x ParameterSpec_ScaleType) String() string {
 	return proto.EnumName(ParameterSpec_ScaleType_name, int32(x))
 }
-func (ParameterSpec_ScaleType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
+func (ParameterSpec_ScaleType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{2, 1}
+}
 
 // The format used to separate data instances in the source files.
 type PredictionInput_DataFormat int32
@@ -279,7 +240,7 @@ func (x PredictionInput_DataFormat) String() string {
 	return proto.EnumName(PredictionInput_DataFormat_name, int32(x))
 }
 func (PredictionInput_DataFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 0}
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{5, 0}
 }
 
 // Describes the job state.
@@ -331,13 +292,15 @@ var Job_State_value = map[string]int32{
 func (x Job_State) String() string {
 	return proto.EnumName(Job_State_name, int32(x))
 }
-func (Job_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
+func (Job_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{7, 0}
+}
 
 // Represents input parameters for a training job.
 type TrainingInput struct {
 	// Required. Specifies the machine types, the number of replicas for workers
 	// and parameter servers.
-	ScaleTier TrainingInput_ScaleTier `protobuf:"varint,1,opt,name=scale_tier,json=scaleTier,enum=google.cloud.ml.v1.TrainingInput_ScaleTier" json:"scale_tier,omitempty"`
+	ScaleTier TrainingInput_ScaleTier `protobuf:"varint,1,opt,name=scale_tier,json=scaleTier,proto3,enum=google.cloud.ml.v1.TrainingInput_ScaleTier" json:"scale_tier,omitempty"`
 	// Optional. Specifies the type of virtual machine to use for your training
 	// job's master worker.
 	//
@@ -387,7 +350,7 @@ type TrainingInput struct {
 	// </dl>
 	//
 	// You must set this value when `scaleTier` is set to `CUSTOM`.
-	MasterType string `protobuf:"bytes,2,opt,name=master_type,json=masterType" json:"master_type,omitempty"`
+	MasterType string `protobuf:"bytes,2,opt,name=master_type,json=masterType,proto3" json:"master_type,omitempty"`
 	// Optional. Specifies the type of virtual machine to use for your training
 	// job's worker nodes.
 	//
@@ -396,7 +359,7 @@ type TrainingInput struct {
 	//
 	// This value must be present when `scaleTier` is set to `CUSTOM` and
 	// `workerCount` is greater than zero.
-	WorkerType string `protobuf:"bytes,3,opt,name=worker_type,json=workerType" json:"worker_type,omitempty"`
+	WorkerType string `protobuf:"bytes,3,opt,name=worker_type,json=workerType,proto3" json:"worker_type,omitempty"`
 	// Optional. Specifies the type of virtual machine to use for your training
 	// job's parameter server.
 	//
@@ -405,45 +368,67 @@ type TrainingInput struct {
 	//
 	// This value must be present when `scaleTier` is set to `CUSTOM` and
 	// `parameter_server_count` is greater than zero.
-	ParameterServerType string `protobuf:"bytes,4,opt,name=parameter_server_type,json=parameterServerType" json:"parameter_server_type,omitempty"`
+	ParameterServerType string `protobuf:"bytes,4,opt,name=parameter_server_type,json=parameterServerType,proto3" json:"parameter_server_type,omitempty"`
 	// Optional. The number of worker replicas to use for the training job. Each
 	// replica in the cluster will be of the type specified in `worker_type`.
 	//
 	// This value can only be used when `scale_tier` is set to `CUSTOM`. If you
 	// set this value, you must also set `worker_type`.
-	WorkerCount int64 `protobuf:"varint,5,opt,name=worker_count,json=workerCount" json:"worker_count,omitempty"`
+	WorkerCount int64 `protobuf:"varint,5,opt,name=worker_count,json=workerCount,proto3" json:"worker_count,omitempty"`
 	// Optional. The number of parameter server replicas to use for the training
 	// job. Each replica in the cluster will be of the type specified in
 	// `parameter_server_type`.
 	//
 	// This value can only be used when `scale_tier` is set to `CUSTOM`.If you
 	// set this value, you must also set `parameter_server_type`.
-	ParameterServerCount int64 `protobuf:"varint,6,opt,name=parameter_server_count,json=parameterServerCount" json:"parameter_server_count,omitempty"`
+	ParameterServerCount int64 `protobuf:"varint,6,opt,name=parameter_server_count,json=parameterServerCount,proto3" json:"parameter_server_count,omitempty"`
 	// Required. The Google Cloud Storage location of the packages with
 	// the training program and any additional dependencies.
-	PackageUris []string `protobuf:"bytes,7,rep,name=package_uris,json=packageUris" json:"package_uris,omitempty"`
+	PackageUris []string `protobuf:"bytes,7,rep,name=package_uris,json=packageUris,proto3" json:"package_uris,omitempty"`
 	// Required. The Python module name to run after installing the packages.
-	PythonModule string `protobuf:"bytes,8,opt,name=python_module,json=pythonModule" json:"python_module,omitempty"`
+	PythonModule string `protobuf:"bytes,8,opt,name=python_module,json=pythonModule,proto3" json:"python_module,omitempty"`
 	// Optional. Command line arguments to pass to the program.
-	Args []string `protobuf:"bytes,10,rep,name=args" json:"args,omitempty"`
+	Args []string `protobuf:"bytes,10,rep,name=args,proto3" json:"args,omitempty"`
 	// Optional. The set of Hyperparameters to tune.
-	Hyperparameters *HyperparameterSpec `protobuf:"bytes,12,opt,name=hyperparameters" json:"hyperparameters,omitempty"`
+	Hyperparameters *HyperparameterSpec `protobuf:"bytes,12,opt,name=hyperparameters,proto3" json:"hyperparameters,omitempty"`
 	// Required. The Google Compute Engine region to run the training job in.
-	Region string `protobuf:"bytes,14,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,14,opt,name=region,proto3" json:"region,omitempty"`
 	// Optional. A Google Cloud Storage path in which to store training outputs
 	// and other data needed for training. This path is passed to your TensorFlow
 	// program as the 'job_dir' command-line argument. The benefit of specifying
 	// this field is that Cloud ML validates the path for use in training.
-	JobDir string `protobuf:"bytes,16,opt,name=job_dir,json=jobDir" json:"job_dir,omitempty"`
+	JobDir string `protobuf:"bytes,16,opt,name=job_dir,json=jobDir,proto3" json:"job_dir,omitempty"`
 	// Optional. The Google Cloud ML runtime version to use for training.  If not
 	// set, Google Cloud ML will choose the latest stable version.
-	RuntimeVersion string `protobuf:"bytes,15,opt,name=runtime_version,json=runtimeVersion" json:"runtime_version,omitempty"`
+	RuntimeVersion       string   `protobuf:"bytes,15,opt,name=runtime_version,json=runtimeVersion,proto3" json:"runtime_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TrainingInput) Reset()         { *m = TrainingInput{} }
+func (m *TrainingInput) String() string { return proto.CompactTextString(m) }
+func (*TrainingInput) ProtoMessage()    {}
+func (*TrainingInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{0}
+}
+func (m *TrainingInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TrainingInput.Unmarshal(m, b)
+}
+func (m *TrainingInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TrainingInput.Marshal(b, m, deterministic)
+}
+func (dst *TrainingInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrainingInput.Merge(dst, src)
+}
+func (m *TrainingInput) XXX_Size() int {
+	return xxx_messageInfo_TrainingInput.Size(m)
+}
+func (m *TrainingInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_TrainingInput.DiscardUnknown(m)
 }
 
-func (m *TrainingInput) Reset()                    { *m = TrainingInput{} }
-func (m *TrainingInput) String() string            { return proto.CompactTextString(m) }
-func (*TrainingInput) ProtoMessage()               {}
-func (*TrainingInput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_TrainingInput proto.InternalMessageInfo
 
 func (m *TrainingInput) GetScaleTier() TrainingInput_ScaleTier {
 	if m != nil {
@@ -542,14 +527,14 @@ type HyperparameterSpec struct {
 	// `MAXIMIZE` and `MINIMIZE`.
 	//
 	// Defaults to `MAXIMIZE`.
-	Goal HyperparameterSpec_GoalType `protobuf:"varint,1,opt,name=goal,enum=google.cloud.ml.v1.HyperparameterSpec_GoalType" json:"goal,omitempty"`
+	Goal HyperparameterSpec_GoalType `protobuf:"varint,1,opt,name=goal,proto3,enum=google.cloud.ml.v1.HyperparameterSpec_GoalType" json:"goal,omitempty"`
 	// Required. The set of parameters to tune.
-	Params []*ParameterSpec `protobuf:"bytes,2,rep,name=params" json:"params,omitempty"`
+	Params []*ParameterSpec `protobuf:"bytes,2,rep,name=params,proto3" json:"params,omitempty"`
 	// Optional. How many training trials should be attempted to optimize
 	// the specified hyperparameters.
 	//
 	// Defaults to one.
-	MaxTrials int32 `protobuf:"varint,3,opt,name=max_trials,json=maxTrials" json:"max_trials,omitempty"`
+	MaxTrials int32 `protobuf:"varint,3,opt,name=max_trials,json=maxTrials,proto3" json:"max_trials,omitempty"`
 	// Optional. The number of training trials to run concurrently.
 	// You can reduce the time it takes to perform hyperparameter tuning by adding
 	// trials in parallel. However, each trail only benefits from the information
@@ -560,19 +545,41 @@ type HyperparameterSpec struct {
 	// Each trial will use the same scale tier and machine types.
 	//
 	// Defaults to one.
-	MaxParallelTrials int32 `protobuf:"varint,4,opt,name=max_parallel_trials,json=maxParallelTrials" json:"max_parallel_trials,omitempty"`
+	MaxParallelTrials int32 `protobuf:"varint,4,opt,name=max_parallel_trials,json=maxParallelTrials,proto3" json:"max_parallel_trials,omitempty"`
 	// Optional. The Tensorflow summary tag name to use for optimizing trials. For
 	// current versions of Tensorflow, this tag name should exactly match what is
 	// shown in Tensorboard, including all scopes.  For versions of Tensorflow
 	// prior to 0.12, this should be only the tag passed to tf.Summary.
 	// By default, "training/hptuning/metric" will be used.
-	HyperparameterMetricTag string `protobuf:"bytes,5,opt,name=hyperparameter_metric_tag,json=hyperparameterMetricTag" json:"hyperparameter_metric_tag,omitempty"`
+	HyperparameterMetricTag string   `protobuf:"bytes,5,opt,name=hyperparameter_metric_tag,json=hyperparameterMetricTag,proto3" json:"hyperparameter_metric_tag,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
+	XXX_unrecognized        []byte   `json:"-"`
+	XXX_sizecache           int32    `json:"-"`
 }
 
-func (m *HyperparameterSpec) Reset()                    { *m = HyperparameterSpec{} }
-func (m *HyperparameterSpec) String() string            { return proto.CompactTextString(m) }
-func (*HyperparameterSpec) ProtoMessage()               {}
-func (*HyperparameterSpec) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *HyperparameterSpec) Reset()         { *m = HyperparameterSpec{} }
+func (m *HyperparameterSpec) String() string { return proto.CompactTextString(m) }
+func (*HyperparameterSpec) ProtoMessage()    {}
+func (*HyperparameterSpec) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{1}
+}
+func (m *HyperparameterSpec) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HyperparameterSpec.Unmarshal(m, b)
+}
+func (m *HyperparameterSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HyperparameterSpec.Marshal(b, m, deterministic)
+}
+func (dst *HyperparameterSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HyperparameterSpec.Merge(dst, src)
+}
+func (m *HyperparameterSpec) XXX_Size() int {
+	return xxx_messageInfo_HyperparameterSpec.Size(m)
+}
+func (m *HyperparameterSpec) XXX_DiscardUnknown() {
+	xxx_messageInfo_HyperparameterSpec.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HyperparameterSpec proto.InternalMessageInfo
 
 func (m *HyperparameterSpec) GetGoal() HyperparameterSpec_GoalType {
 	if m != nil {
@@ -613,36 +620,58 @@ func (m *HyperparameterSpec) GetHyperparameterMetricTag() string {
 type ParameterSpec struct {
 	// Required. The parameter name must be unique amongst all ParameterConfigs in
 	// a HyperparameterSpec message. E.g., "learning_rate".
-	ParameterName string `protobuf:"bytes,1,opt,name=parameter_name,json=parameterName" json:"parameter_name,omitempty"`
+	ParameterName string `protobuf:"bytes,1,opt,name=parameter_name,json=parameterName,proto3" json:"parameter_name,omitempty"`
 	// Required. The type of the parameter.
-	Type ParameterSpec_ParameterType `protobuf:"varint,4,opt,name=type,enum=google.cloud.ml.v1.ParameterSpec_ParameterType" json:"type,omitempty"`
+	Type ParameterSpec_ParameterType `protobuf:"varint,4,opt,name=type,proto3,enum=google.cloud.ml.v1.ParameterSpec_ParameterType" json:"type,omitempty"`
 	// Required if type is `DOUBLE` or `INTEGER`. This field
 	// should be unset if type is `CATEGORICAL`. This value should be integers if
 	// type is INTEGER.
-	MinValue float64 `protobuf:"fixed64,2,opt,name=min_value,json=minValue" json:"min_value,omitempty"`
+	MinValue float64 `protobuf:"fixed64,2,opt,name=min_value,json=minValue,proto3" json:"min_value,omitempty"`
 	// Required if typeis `DOUBLE` or `INTEGER`. This field
 	// should be unset if type is `CATEGORICAL`. This value should be integers if
 	// type is `INTEGER`.
-	MaxValue float64 `protobuf:"fixed64,3,opt,name=max_value,json=maxValue" json:"max_value,omitempty"`
+	MaxValue float64 `protobuf:"fixed64,3,opt,name=max_value,json=maxValue,proto3" json:"max_value,omitempty"`
 	// Required if type is `CATEGORICAL`. The list of possible categories.
-	CategoricalValues []string `protobuf:"bytes,5,rep,name=categorical_values,json=categoricalValues" json:"categorical_values,omitempty"`
+	CategoricalValues []string `protobuf:"bytes,5,rep,name=categorical_values,json=categoricalValues,proto3" json:"categorical_values,omitempty"`
 	// Required if type is `DISCRETE`.
 	// A list of feasible points.
 	// The list should be in strictly increasing order. For instance, this
 	// parameter might have possible settings of 1.5, 2.5, and 4.0. This list
 	// should not contain more than 1,000 values.
-	DiscreteValues []float64 `protobuf:"fixed64,6,rep,packed,name=discrete_values,json=discreteValues" json:"discrete_values,omitempty"`
+	DiscreteValues []float64 `protobuf:"fixed64,6,rep,packed,name=discrete_values,json=discreteValues,proto3" json:"discrete_values,omitempty"`
 	// Optional. How the parameter should be scaled to the hypercube.
 	// Leave unset for categorical parameters.
 	// Some kind of scaling is strongly recommended for real or integral
 	// parameters (e.g., `UNIT_LINEAR_SCALE`).
-	ScaleType ParameterSpec_ScaleType `protobuf:"varint,7,opt,name=scale_type,json=scaleType,enum=google.cloud.ml.v1.ParameterSpec_ScaleType" json:"scale_type,omitempty"`
+	ScaleType            ParameterSpec_ScaleType `protobuf:"varint,7,opt,name=scale_type,json=scaleType,proto3,enum=google.cloud.ml.v1.ParameterSpec_ScaleType" json:"scale_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *ParameterSpec) Reset()         { *m = ParameterSpec{} }
+func (m *ParameterSpec) String() string { return proto.CompactTextString(m) }
+func (*ParameterSpec) ProtoMessage()    {}
+func (*ParameterSpec) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{2}
+}
+func (m *ParameterSpec) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ParameterSpec.Unmarshal(m, b)
+}
+func (m *ParameterSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ParameterSpec.Marshal(b, m, deterministic)
+}
+func (dst *ParameterSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParameterSpec.Merge(dst, src)
+}
+func (m *ParameterSpec) XXX_Size() int {
+	return xxx_messageInfo_ParameterSpec.Size(m)
+}
+func (m *ParameterSpec) XXX_DiscardUnknown() {
+	xxx_messageInfo_ParameterSpec.DiscardUnknown(m)
 }
 
-func (m *ParameterSpec) Reset()                    { *m = ParameterSpec{} }
-func (m *ParameterSpec) String() string            { return proto.CompactTextString(m) }
-func (*ParameterSpec) ProtoMessage()               {}
-func (*ParameterSpec) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_ParameterSpec proto.InternalMessageInfo
 
 func (m *ParameterSpec) GetParameterName() string {
 	if m != nil {
@@ -699,19 +728,41 @@ func (m *ParameterSpec) GetScaleType() ParameterSpec_ScaleType {
 // of HyperparameterOutput objects, one for each successful trial.
 type HyperparameterOutput struct {
 	// The trial id for these results.
-	TrialId string `protobuf:"bytes,1,opt,name=trial_id,json=trialId" json:"trial_id,omitempty"`
+	TrialId string `protobuf:"bytes,1,opt,name=trial_id,json=trialId,proto3" json:"trial_id,omitempty"`
 	// The hyperparameters given to this trial.
-	Hyperparameters map[string]string `protobuf:"bytes,2,rep,name=hyperparameters" json:"hyperparameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Hyperparameters map[string]string `protobuf:"bytes,2,rep,name=hyperparameters,proto3" json:"hyperparameters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The final objective metric seen for this trial.
-	FinalMetric *HyperparameterOutput_HyperparameterMetric `protobuf:"bytes,3,opt,name=final_metric,json=finalMetric" json:"final_metric,omitempty"`
+	FinalMetric *HyperparameterOutput_HyperparameterMetric `protobuf:"bytes,3,opt,name=final_metric,json=finalMetric,proto3" json:"final_metric,omitempty"`
 	// All recorded object metrics for this trial.
-	AllMetrics []*HyperparameterOutput_HyperparameterMetric `protobuf:"bytes,4,rep,name=all_metrics,json=allMetrics" json:"all_metrics,omitempty"`
+	AllMetrics           []*HyperparameterOutput_HyperparameterMetric `protobuf:"bytes,4,rep,name=all_metrics,json=allMetrics,proto3" json:"all_metrics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                     `json:"-"`
+	XXX_unrecognized     []byte                                       `json:"-"`
+	XXX_sizecache        int32                                        `json:"-"`
+}
+
+func (m *HyperparameterOutput) Reset()         { *m = HyperparameterOutput{} }
+func (m *HyperparameterOutput) String() string { return proto.CompactTextString(m) }
+func (*HyperparameterOutput) ProtoMessage()    {}
+func (*HyperparameterOutput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{3}
+}
+func (m *HyperparameterOutput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HyperparameterOutput.Unmarshal(m, b)
+}
+func (m *HyperparameterOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HyperparameterOutput.Marshal(b, m, deterministic)
+}
+func (dst *HyperparameterOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HyperparameterOutput.Merge(dst, src)
+}
+func (m *HyperparameterOutput) XXX_Size() int {
+	return xxx_messageInfo_HyperparameterOutput.Size(m)
+}
+func (m *HyperparameterOutput) XXX_DiscardUnknown() {
+	xxx_messageInfo_HyperparameterOutput.DiscardUnknown(m)
 }
 
-func (m *HyperparameterOutput) Reset()                    { *m = HyperparameterOutput{} }
-func (m *HyperparameterOutput) String() string            { return proto.CompactTextString(m) }
-func (*HyperparameterOutput) ProtoMessage()               {}
-func (*HyperparameterOutput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_HyperparameterOutput proto.InternalMessageInfo
 
 func (m *HyperparameterOutput) GetTrialId() string {
 	if m != nil {
@@ -744,9 +795,12 @@ func (m *HyperparameterOutput) GetAllMetrics() []*HyperparameterOutput_Hyperpara
 // An observed value of a metric.
 type HyperparameterOutput_HyperparameterMetric struct {
 	// The global training step for this metric.
-	TrainingStep int64 `protobuf:"varint,1,opt,name=training_step,json=trainingStep" json:"training_step,omitempty"`
+	TrainingStep int64 `protobuf:"varint,1,opt,name=training_step,json=trainingStep,proto3" json:"training_step,omitempty"`
 	// The objective value at this training step.
-	ObjectiveValue float64 `protobuf:"fixed64,2,opt,name=objective_value,json=objectiveValue" json:"objective_value,omitempty"`
+	ObjectiveValue       float64  `protobuf:"fixed64,2,opt,name=objective_value,json=objectiveValue,proto3" json:"objective_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *HyperparameterOutput_HyperparameterMetric) Reset() {
@@ -755,8 +809,25 @@ func (m *HyperparameterOutput_HyperparameterMetric) Reset() {
 func (m *HyperparameterOutput_HyperparameterMetric) String() string { return proto.CompactTextString(m) }
 func (*HyperparameterOutput_HyperparameterMetric) ProtoMessage()    {}
 func (*HyperparameterOutput_HyperparameterMetric) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{3, 0}
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{3, 0}
+}
+func (m *HyperparameterOutput_HyperparameterMetric) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Unmarshal(m, b)
+}
+func (m *HyperparameterOutput_HyperparameterMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Marshal(b, m, deterministic)
+}
+func (dst *HyperparameterOutput_HyperparameterMetric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Merge(dst, src)
+}
+func (m *HyperparameterOutput_HyperparameterMetric) XXX_Size() int {
+	return xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.Size(m)
 }
+func (m *HyperparameterOutput_HyperparameterMetric) XXX_DiscardUnknown() {
+	xxx_messageInfo_HyperparameterOutput_HyperparameterMetric.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HyperparameterOutput_HyperparameterMetric proto.InternalMessageInfo
 
 func (m *HyperparameterOutput_HyperparameterMetric) GetTrainingStep() int64 {
 	if m != nil {
@@ -776,20 +847,42 @@ func (m *HyperparameterOutput_HyperparameterMetric) GetObjectiveValue() float64
 type TrainingOutput struct {
 	// The number of hyperparameter tuning trials that completed successfully.
 	// Only set for hyperparameter tuning jobs.
-	CompletedTrialCount int64 `protobuf:"varint,1,opt,name=completed_trial_count,json=completedTrialCount" json:"completed_trial_count,omitempty"`
+	CompletedTrialCount int64 `protobuf:"varint,1,opt,name=completed_trial_count,json=completedTrialCount,proto3" json:"completed_trial_count,omitempty"`
 	// Results for individual Hyperparameter trials.
 	// Only set for hyperparameter tuning jobs.
-	Trials []*HyperparameterOutput `protobuf:"bytes,2,rep,name=trials" json:"trials,omitempty"`
+	Trials []*HyperparameterOutput `protobuf:"bytes,2,rep,name=trials,proto3" json:"trials,omitempty"`
 	// The amount of ML units consumed by the job.
-	ConsumedMlUnits float64 `protobuf:"fixed64,3,opt,name=consumed_ml_units,json=consumedMlUnits" json:"consumed_ml_units,omitempty"`
+	ConsumedMlUnits float64 `protobuf:"fixed64,3,opt,name=consumed_ml_units,json=consumedMlUnits,proto3" json:"consumed_ml_units,omitempty"`
 	// Whether this job is a hyperparameter tuning job.
-	IsHyperparameterTuningJob bool `protobuf:"varint,4,opt,name=is_hyperparameter_tuning_job,json=isHyperparameterTuningJob" json:"is_hyperparameter_tuning_job,omitempty"`
+	IsHyperparameterTuningJob bool     `protobuf:"varint,4,opt,name=is_hyperparameter_tuning_job,json=isHyperparameterTuningJob,proto3" json:"is_hyperparameter_tuning_job,omitempty"`
+	XXX_NoUnkeyedLiteral      struct{} `json:"-"`
+	XXX_unrecognized          []byte   `json:"-"`
+	XXX_sizecache             int32    `json:"-"`
 }
 
-func (m *TrainingOutput) Reset()                    { *m = TrainingOutput{} }
-func (m *TrainingOutput) String() string            { return proto.CompactTextString(m) }
-func (*TrainingOutput) ProtoMessage()               {}
-func (*TrainingOutput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *TrainingOutput) Reset()         { *m = TrainingOutput{} }
+func (m *TrainingOutput) String() string { return proto.CompactTextString(m) }
+func (*TrainingOutput) ProtoMessage()    {}
+func (*TrainingOutput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{4}
+}
+func (m *TrainingOutput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TrainingOutput.Unmarshal(m, b)
+}
+func (m *TrainingOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TrainingOutput.Marshal(b, m, deterministic)
+}
+func (dst *TrainingOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrainingOutput.Merge(dst, src)
+}
+func (m *TrainingOutput) XXX_Size() int {
+	return xxx_messageInfo_TrainingOutput.Size(m)
+}
+func (m *TrainingOutput) XXX_DiscardUnknown() {
+	xxx_messageInfo_TrainingOutput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TrainingOutput proto.InternalMessageInfo
 
 func (m *TrainingOutput) GetCompletedTrialCount() int64 {
 	if m != nil {
@@ -829,47 +922,73 @@ type PredictionInput struct {
 	//	*PredictionInput_Uri
 	ModelVersion isPredictionInput_ModelVersion `protobuf_oneof:"model_version"`
 	// Required. The format of the input data files.
-	DataFormat PredictionInput_DataFormat `protobuf:"varint,3,opt,name=data_format,json=dataFormat,enum=google.cloud.ml.v1.PredictionInput_DataFormat" json:"data_format,omitempty"`
+	DataFormat PredictionInput_DataFormat `protobuf:"varint,3,opt,name=data_format,json=dataFormat,proto3,enum=google.cloud.ml.v1.PredictionInput_DataFormat" json:"data_format,omitempty"`
 	// Required. The Google Cloud Storage location of the input data files.
 	// May contain wildcards.
-	InputPaths []string `protobuf:"bytes,4,rep,name=input_paths,json=inputPaths" json:"input_paths,omitempty"`
+	InputPaths []string `protobuf:"bytes,4,rep,name=input_paths,json=inputPaths,proto3" json:"input_paths,omitempty"`
 	// Required. The output Google Cloud Storage location.
-	OutputPath string `protobuf:"bytes,5,opt,name=output_path,json=outputPath" json:"output_path,omitempty"`
+	OutputPath string `protobuf:"bytes,5,opt,name=output_path,json=outputPath,proto3" json:"output_path,omitempty"`
 	// Optional. The maximum number of workers to be used for parallel processing.
 	// Defaults to 10 if not specified.
-	MaxWorkerCount int64 `protobuf:"varint,6,opt,name=max_worker_count,json=maxWorkerCount" json:"max_worker_count,omitempty"`
+	MaxWorkerCount int64 `protobuf:"varint,6,opt,name=max_worker_count,json=maxWorkerCount,proto3" json:"max_worker_count,omitempty"`
 	// Required. The Google Compute Engine region to run the prediction job in.
-	Region string `protobuf:"bytes,7,opt,name=region" json:"region,omitempty"`
+	Region string `protobuf:"bytes,7,opt,name=region,proto3" json:"region,omitempty"`
 	// Optional. The Google Cloud ML runtime version to use for this batch
 	// prediction. If not set, Google Cloud ML will pick the runtime version used
 	// during the CreateVersion request for this model version, or choose the
 	// latest stable version when model version information is not available
 	// such as when the model is specified by uri.
-	RuntimeVersion string `protobuf:"bytes,8,opt,name=runtime_version,json=runtimeVersion" json:"runtime_version,omitempty"`
+	RuntimeVersion       string   `protobuf:"bytes,8,opt,name=runtime_version,json=runtimeVersion,proto3" json:"runtime_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PredictionInput) Reset()         { *m = PredictionInput{} }
+func (m *PredictionInput) String() string { return proto.CompactTextString(m) }
+func (*PredictionInput) ProtoMessage()    {}
+func (*PredictionInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{5}
+}
+func (m *PredictionInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PredictionInput.Unmarshal(m, b)
+}
+func (m *PredictionInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PredictionInput.Marshal(b, m, deterministic)
+}
+func (dst *PredictionInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictionInput.Merge(dst, src)
+}
+func (m *PredictionInput) XXX_Size() int {
+	return xxx_messageInfo_PredictionInput.Size(m)
+}
+func (m *PredictionInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_PredictionInput.DiscardUnknown(m)
 }
 
-func (m *PredictionInput) Reset()                    { *m = PredictionInput{} }
-func (m *PredictionInput) String() string            { return proto.CompactTextString(m) }
-func (*PredictionInput) ProtoMessage()               {}
-func (*PredictionInput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_PredictionInput proto.InternalMessageInfo
 
 type isPredictionInput_ModelVersion interface {
 	isPredictionInput_ModelVersion()
 }
 
 type PredictionInput_ModelName struct {
-	ModelName string `protobuf:"bytes,1,opt,name=model_name,json=modelName,oneof"`
+	ModelName string `protobuf:"bytes,1,opt,name=model_name,json=modelName,proto3,oneof"`
 }
+
 type PredictionInput_VersionName struct {
-	VersionName string `protobuf:"bytes,2,opt,name=version_name,json=versionName,oneof"`
+	VersionName string `protobuf:"bytes,2,opt,name=version_name,json=versionName,proto3,oneof"`
 }
+
 type PredictionInput_Uri struct {
-	Uri string `protobuf:"bytes,9,opt,name=uri,oneof"`
+	Uri string `protobuf:"bytes,9,opt,name=uri,proto3,oneof"`
 }
 
-func (*PredictionInput_ModelName) isPredictionInput_ModelVersion()   {}
+func (*PredictionInput_ModelName) isPredictionInput_ModelVersion() {}
+
 func (*PredictionInput_VersionName) isPredictionInput_ModelVersion() {}
-func (*PredictionInput_Uri) isPredictionInput_ModelVersion()         {}
+
+func (*PredictionInput_Uri) isPredictionInput_ModelVersion() {}
 
 func (m *PredictionInput) GetModelVersion() isPredictionInput_ModelVersion {
 	if m != nil {
@@ -1004,15 +1123,15 @@ func _PredictionInput_OneofSizer(msg proto.Message) (n int) {
 	// model_version
 	switch x := m.ModelVersion.(type) {
 	case *PredictionInput_ModelName:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ModelName)))
 		n += len(x.ModelName)
 	case *PredictionInput_VersionName:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.VersionName)))
 		n += len(x.VersionName)
 	case *PredictionInput_Uri:
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Uri)))
 		n += len(x.Uri)
 	case nil:
@@ -1025,19 +1144,41 @@ func _PredictionInput_OneofSizer(msg proto.Message) (n int) {
 // Represents results of a prediction job.
 type PredictionOutput struct {
 	// The output Google Cloud Storage location provided at the job creation time.
-	OutputPath string `protobuf:"bytes,1,opt,name=output_path,json=outputPath" json:"output_path,omitempty"`
+	OutputPath string `protobuf:"bytes,1,opt,name=output_path,json=outputPath,proto3" json:"output_path,omitempty"`
 	// The number of generated predictions.
-	PredictionCount int64 `protobuf:"varint,2,opt,name=prediction_count,json=predictionCount" json:"prediction_count,omitempty"`
+	PredictionCount int64 `protobuf:"varint,2,opt,name=prediction_count,json=predictionCount,proto3" json:"prediction_count,omitempty"`
 	// The number of data instances which resulted in errors.
-	ErrorCount int64 `protobuf:"varint,3,opt,name=error_count,json=errorCount" json:"error_count,omitempty"`
+	ErrorCount int64 `protobuf:"varint,3,opt,name=error_count,json=errorCount,proto3" json:"error_count,omitempty"`
 	// Node hours used by the batch prediction job.
-	NodeHours float64 `protobuf:"fixed64,4,opt,name=node_hours,json=nodeHours" json:"node_hours,omitempty"`
+	NodeHours            float64  `protobuf:"fixed64,4,opt,name=node_hours,json=nodeHours,proto3" json:"node_hours,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PredictionOutput) Reset()                    { *m = PredictionOutput{} }
-func (m *PredictionOutput) String() string            { return proto.CompactTextString(m) }
-func (*PredictionOutput) ProtoMessage()               {}
-func (*PredictionOutput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *PredictionOutput) Reset()         { *m = PredictionOutput{} }
+func (m *PredictionOutput) String() string { return proto.CompactTextString(m) }
+func (*PredictionOutput) ProtoMessage()    {}
+func (*PredictionOutput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{6}
+}
+func (m *PredictionOutput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PredictionOutput.Unmarshal(m, b)
+}
+func (m *PredictionOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PredictionOutput.Marshal(b, m, deterministic)
+}
+func (dst *PredictionOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictionOutput.Merge(dst, src)
+}
+func (m *PredictionOutput) XXX_Size() int {
+	return xxx_messageInfo_PredictionOutput.Size(m)
+}
+func (m *PredictionOutput) XXX_DiscardUnknown() {
+	xxx_messageInfo_PredictionOutput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PredictionOutput proto.InternalMessageInfo
 
 func (m *PredictionOutput) GetOutputPath() string {
 	if m != nil {
@@ -1070,7 +1211,7 @@ func (m *PredictionOutput) GetNodeHours() float64 {
 // Represents a training or prediction job.
 type Job struct {
 	// Required. The user-specified id of the job.
-	JobId string `protobuf:"bytes,1,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
+	JobId string `protobuf:"bytes,1,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
 	// Required. Parameters to create a job.
 	//
 	// Types that are valid to be assigned to Input:
@@ -1078,52 +1219,72 @@ type Job struct {
 	//	*Job_PredictionInput
 	Input isJob_Input `protobuf_oneof:"input"`
 	// Output only. When the job was created.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. When the job processing was started.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. When the job processing was completed.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The detailed state of a job.
-	State Job_State `protobuf:"varint,7,opt,name=state,enum=google.cloud.ml.v1.Job_State" json:"state,omitempty"`
+	State Job_State `protobuf:"varint,7,opt,name=state,proto3,enum=google.cloud.ml.v1.Job_State" json:"state,omitempty"`
 	// Output only. The details of a failure or a cancellation.
-	ErrorMessage string `protobuf:"bytes,8,opt,name=error_message,json=errorMessage" json:"error_message,omitempty"`
+	ErrorMessage string `protobuf:"bytes,8,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
 	// Output only. The current result of the job.
 	//
 	// Types that are valid to be assigned to Output:
 	//	*Job_TrainingOutput
 	//	*Job_PredictionOutput
-	Output isJob_Output `protobuf_oneof:"output"`
+	Output               isJob_Output `protobuf_oneof:"output"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Job) Reset()         { *m = Job{} }
+func (m *Job) String() string { return proto.CompactTextString(m) }
+func (*Job) ProtoMessage()    {}
+func (*Job) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{7}
+}
+func (m *Job) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Job.Unmarshal(m, b)
+}
+func (m *Job) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Job.Marshal(b, m, deterministic)
+}
+func (dst *Job) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Job.Merge(dst, src)
+}
+func (m *Job) XXX_Size() int {
+	return xxx_messageInfo_Job.Size(m)
+}
+func (m *Job) XXX_DiscardUnknown() {
+	xxx_messageInfo_Job.DiscardUnknown(m)
 }
 
-func (m *Job) Reset()                    { *m = Job{} }
-func (m *Job) String() string            { return proto.CompactTextString(m) }
-func (*Job) ProtoMessage()               {}
-func (*Job) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_Job proto.InternalMessageInfo
+
+func (m *Job) GetJobId() string {
+	if m != nil {
+		return m.JobId
+	}
+	return ""
+}
 
 type isJob_Input interface {
 	isJob_Input()
 }
-type isJob_Output interface {
-	isJob_Output()
-}
 
 type Job_TrainingInput struct {
-	TrainingInput *TrainingInput `protobuf:"bytes,2,opt,name=training_input,json=trainingInput,oneof"`
+	TrainingInput *TrainingInput `protobuf:"bytes,2,opt,name=training_input,json=trainingInput,proto3,oneof"`
 }
+
 type Job_PredictionInput struct {
-	PredictionInput *PredictionInput `protobuf:"bytes,3,opt,name=prediction_input,json=predictionInput,oneof"`
-}
-type Job_TrainingOutput struct {
-	TrainingOutput *TrainingOutput `protobuf:"bytes,9,opt,name=training_output,json=trainingOutput,oneof"`
-}
-type Job_PredictionOutput struct {
-	PredictionOutput *PredictionOutput `protobuf:"bytes,10,opt,name=prediction_output,json=predictionOutput,oneof"`
+	PredictionInput *PredictionInput `protobuf:"bytes,3,opt,name=prediction_input,json=predictionInput,proto3,oneof"`
 }
 
-func (*Job_TrainingInput) isJob_Input()     {}
-func (*Job_PredictionInput) isJob_Input()   {}
-func (*Job_TrainingOutput) isJob_Output()   {}
-func (*Job_PredictionOutput) isJob_Output() {}
+func (*Job_TrainingInput) isJob_Input() {}
+
+func (*Job_PredictionInput) isJob_Input() {}
 
 func (m *Job) GetInput() isJob_Input {
 	if m != nil {
@@ -1131,19 +1292,6 @@ func (m *Job) GetInput() isJob_Input {
 	}
 	return nil
 }
-func (m *Job) GetOutput() isJob_Output {
-	if m != nil {
-		return m.Output
-	}
-	return nil
-}
-
-func (m *Job) GetJobId() string {
-	if m != nil {
-		return m.JobId
-	}
-	return ""
-}
 
 func (m *Job) GetTrainingInput() *TrainingInput {
 	if x, ok := m.GetInput().(*Job_TrainingInput); ok {
@@ -1159,21 +1307,21 @@ func (m *Job) GetPredictionInput() *PredictionInput {
 	return nil
 }
 
-func (m *Job) GetCreateTime() *google_protobuf2.Timestamp {
+func (m *Job) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Job) GetStartTime() *google_protobuf2.Timestamp {
+func (m *Job) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *Job) GetEndTime() *google_protobuf2.Timestamp {
+func (m *Job) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -1194,6 +1342,29 @@ func (m *Job) GetErrorMessage() string {
 	return ""
 }
 
+type isJob_Output interface {
+	isJob_Output()
+}
+
+type Job_TrainingOutput struct {
+	TrainingOutput *TrainingOutput `protobuf:"bytes,9,opt,name=training_output,json=trainingOutput,proto3,oneof"`
+}
+
+type Job_PredictionOutput struct {
+	PredictionOutput *PredictionOutput `protobuf:"bytes,10,opt,name=prediction_output,json=predictionOutput,proto3,oneof"`
+}
+
+func (*Job_TrainingOutput) isJob_Output() {}
+
+func (*Job_PredictionOutput) isJob_Output() {}
+
+func (m *Job) GetOutput() isJob_Output {
+	if m != nil {
+		return m.Output
+	}
+	return nil
+}
+
 func (m *Job) GetTrainingOutput() *TrainingOutput {
 	if x, ok := m.GetOutput().(*Job_TrainingOutput); ok {
 		return x.TrainingOutput
@@ -1301,12 +1472,12 @@ func _Job_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Input.(type) {
 	case *Job_TrainingInput:
 		s := proto.Size(x.TrainingInput)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_PredictionInput:
 		s := proto.Size(x.PredictionInput)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1317,12 +1488,12 @@ func _Job_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Output.(type) {
 	case *Job_TrainingOutput:
 		s := proto.Size(x.TrainingOutput)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Job_PredictionOutput:
 		s := proto.Size(x.PredictionOutput)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1337,15 +1508,37 @@ type CreateJobRequest struct {
 	// Required. The project name.
 	//
 	// Authorization: requires `Editor` role on the specified project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The job to create.
-	Job *Job `protobuf:"bytes,2,opt,name=job" json:"job,omitempty"`
+	Job                  *Job     `protobuf:"bytes,2,opt,name=job,proto3" json:"job,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateJobRequest) Reset()                    { *m = CreateJobRequest{} }
-func (m *CreateJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateJobRequest) ProtoMessage()               {}
-func (*CreateJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *CreateJobRequest) Reset()         { *m = CreateJobRequest{} }
+func (m *CreateJobRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateJobRequest) ProtoMessage()    {}
+func (*CreateJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{8}
+}
+func (m *CreateJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateJobRequest.Unmarshal(m, b)
+}
+func (m *CreateJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateJobRequest.Merge(dst, src)
+}
+func (m *CreateJobRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateJobRequest.Size(m)
+}
+func (m *CreateJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateJobRequest proto.InternalMessageInfo
 
 func (m *CreateJobRequest) GetParent() string {
 	if m != nil {
@@ -1366,26 +1559,48 @@ type ListJobsRequest struct {
 	// Required. The name of the project for which to list jobs.
 	//
 	// Authorization: requires `Viewer` role on the specified project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. Specifies the subset of jobs to retrieve.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Optional. A page token to request the next page of results.
 	//
 	// You get the token from the `next_page_token` field of the response from
 	// the previous call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional. The number of jobs to retrieve per "page" of results. If there
 	// are more remaining results than this number, the response message will
 	// contain a valid value in the `next_page_token` field.
 	//
 	// The default value is 20, and the maximum page size is 100.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListJobsRequest) Reset()         { *m = ListJobsRequest{} }
+func (m *ListJobsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListJobsRequest) ProtoMessage()    {}
+func (*ListJobsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{9}
+}
+func (m *ListJobsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListJobsRequest.Unmarshal(m, b)
+}
+func (m *ListJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListJobsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsRequest.Merge(dst, src)
+}
+func (m *ListJobsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListJobsRequest.Size(m)
+}
+func (m *ListJobsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListJobsRequest.DiscardUnknown(m)
 }
 
-func (m *ListJobsRequest) Reset()                    { *m = ListJobsRequest{} }
-func (m *ListJobsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListJobsRequest) ProtoMessage()               {}
-func (*ListJobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_ListJobsRequest proto.InternalMessageInfo
 
 func (m *ListJobsRequest) GetParent() string {
 	if m != nil {
@@ -1418,16 +1633,38 @@ func (m *ListJobsRequest) GetPageSize() int32 {
 // Response message for the ListJobs method.
 type ListJobsResponse struct {
 	// The list of jobs.
-	Jobs []*Job `protobuf:"bytes,1,rep,name=jobs" json:"jobs,omitempty"`
+	Jobs []*Job `protobuf:"bytes,1,rep,name=jobs,proto3" json:"jobs,omitempty"`
 	// Optional. Pass this token as the `page_token` field of the request for a
 	// subsequent call.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListJobsResponse) Reset()                    { *m = ListJobsResponse{} }
-func (m *ListJobsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListJobsResponse) ProtoMessage()               {}
-func (*ListJobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *ListJobsResponse) Reset()         { *m = ListJobsResponse{} }
+func (m *ListJobsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListJobsResponse) ProtoMessage()    {}
+func (*ListJobsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{10}
+}
+func (m *ListJobsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListJobsResponse.Unmarshal(m, b)
+}
+func (m *ListJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListJobsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobsResponse.Merge(dst, src)
+}
+func (m *ListJobsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListJobsResponse.Size(m)
+}
+func (m *ListJobsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListJobsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListJobsResponse proto.InternalMessageInfo
 
 func (m *ListJobsResponse) GetJobs() []*Job {
 	if m != nil {
@@ -1448,13 +1685,35 @@ type GetJobRequest struct {
 	// Required. The name of the job to get the description of.
 	//
 	// Authorization: requires `Viewer` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetJobRequest) Reset()         { *m = GetJobRequest{} }
+func (m *GetJobRequest) String() string { return proto.CompactTextString(m) }
+func (*GetJobRequest) ProtoMessage()    {}
+func (*GetJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{11}
+}
+func (m *GetJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetJobRequest.Unmarshal(m, b)
+}
+func (m *GetJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobRequest.Merge(dst, src)
+}
+func (m *GetJobRequest) XXX_Size() int {
+	return xxx_messageInfo_GetJobRequest.Size(m)
+}
+func (m *GetJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetJobRequest.DiscardUnknown(m)
 }
 
-func (m *GetJobRequest) Reset()                    { *m = GetJobRequest{} }
-func (m *GetJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetJobRequest) ProtoMessage()               {}
-func (*GetJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_GetJobRequest proto.InternalMessageInfo
 
 func (m *GetJobRequest) GetName() string {
 	if m != nil {
@@ -1468,13 +1727,35 @@ type CancelJobRequest struct {
 	// Required. The name of the job to cancel.
 	//
 	// Authorization: requires `Editor` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CancelJobRequest) Reset()                    { *m = CancelJobRequest{} }
-func (m *CancelJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelJobRequest) ProtoMessage()               {}
-func (*CancelJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *CancelJobRequest) Reset()         { *m = CancelJobRequest{} }
+func (m *CancelJobRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelJobRequest) ProtoMessage()    {}
+func (*CancelJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_job_service_43f5d77a25caf017, []int{12}
+}
+func (m *CancelJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelJobRequest.Unmarshal(m, b)
+}
+func (m *CancelJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelJobRequest.Merge(dst, src)
+}
+func (m *CancelJobRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelJobRequest.Size(m)
+}
+func (m *CancelJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CancelJobRequest proto.InternalMessageInfo
 
 func (m *CancelJobRequest) GetName() string {
 	if m != nil {
@@ -1488,6 +1769,7 @@ func init() {
 	proto.RegisterType((*HyperparameterSpec)(nil), "google.cloud.ml.v1.HyperparameterSpec")
 	proto.RegisterType((*ParameterSpec)(nil), "google.cloud.ml.v1.ParameterSpec")
 	proto.RegisterType((*HyperparameterOutput)(nil), "google.cloud.ml.v1.HyperparameterOutput")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.ml.v1.HyperparameterOutput.HyperparametersEntry")
 	proto.RegisterType((*HyperparameterOutput_HyperparameterMetric)(nil), "google.cloud.ml.v1.HyperparameterOutput.HyperparameterMetric")
 	proto.RegisterType((*TrainingOutput)(nil), "google.cloud.ml.v1.TrainingOutput")
 	proto.RegisterType((*PredictionInput)(nil), "google.cloud.ml.v1.PredictionInput")
@@ -1514,8 +1796,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for JobService service
-
+// JobServiceClient is the client API for JobService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type JobServiceClient interface {
 	// Creates a training or a batch prediction job.
 	CreateJob(ctx context.Context, in *CreateJobRequest, opts ...grpc.CallOption) (*Job, error)
@@ -1524,7 +1807,7 @@ type JobServiceClient interface {
 	// Describes a job.
 	GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error)
 	// Cancels a running job.
-	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type jobServiceClient struct {
@@ -1537,7 +1820,7 @@ func NewJobServiceClient(cc *grpc.ClientConn) JobServiceClient {
 
 func (c *jobServiceClient) CreateJob(ctx context.Context, in *CreateJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.JobService/CreateJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.JobService/CreateJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1546,7 +1829,7 @@ func (c *jobServiceClient) CreateJob(ctx context.Context, in *CreateJobRequest,
 
 func (c *jobServiceClient) ListJobs(ctx context.Context, in *ListJobsRequest, opts ...grpc.CallOption) (*ListJobsResponse, error) {
 	out := new(ListJobsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.JobService/ListJobs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.JobService/ListJobs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1555,24 +1838,23 @@ func (c *jobServiceClient) ListJobs(ctx context.Context, in *ListJobsRequest, op
 
 func (c *jobServiceClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error) {
 	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.JobService/GetJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.JobService/GetJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *jobServiceClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.JobService/CancelJob", in, out, c.cc, opts...)
+func (c *jobServiceClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.JobService/CancelJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for JobService service
-
+// JobServiceServer is the server API for JobService service.
 type JobServiceServer interface {
 	// Creates a training or a batch prediction job.
 	CreateJob(context.Context, *CreateJobRequest) (*Job, error)
@@ -1581,7 +1863,7 @@ type JobServiceServer interface {
 	// Describes a job.
 	GetJob(context.Context, *GetJobRequest) (*Job, error)
 	// Cancels a running job.
-	CancelJob(context.Context, *CancelJobRequest) (*google_protobuf1.Empty, error)
+	CancelJob(context.Context, *CancelJobRequest) (*empty.Empty, error)
 }
 
 func RegisterJobServiceServer(s *grpc.Server, srv JobServiceServer) {
@@ -1685,9 +1967,11 @@ var _JobService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/ml/v1/job_service.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/ml/v1/job_service.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/job_service.proto", fileDescriptor_job_service_43f5d77a25caf017)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_job_service_43f5d77a25caf017 = []byte{
 	// 2070 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdb, 0x6e, 0x1b, 0xc9,
 	0x11, 0x15, 0xaf, 0x22, 0x8b, 0x12, 0x39, 0x6e, 0x5b, 0x36, 0x4d, 0xdb, 0x6b, 0x79, 0xe4, 0x38,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/model_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/model_service.pb.go
index c05f8adf..38c53b4d 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/model_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/model_service.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/model_service.proto
 
-package ml
+package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Represents a machine learning solution.
 //
 // A model can have multiple versions, each of which is a deployed, trained
@@ -30,28 +36,50 @@ type Model struct {
 	// Required. The name specified for the model when it was created.
 	//
 	// The model name must be unique within the project it is created in.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The description specified for the model when it was created.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The default version of the model. This version will be used to
 	// handle prediction requests that do not specify a version.
 	//
 	// You can change the default version by calling
 	// [projects.methods.versions.setDefault](/ml/reference/rest/v1/projects.models.versions/setDefault).
-	DefaultVersion *Version `protobuf:"bytes,3,opt,name=default_version,json=defaultVersion" json:"default_version,omitempty"`
+	DefaultVersion *Version `protobuf:"bytes,3,opt,name=default_version,json=defaultVersion,proto3" json:"default_version,omitempty"`
 	// Optional. The list of regions where the model is going to be deployed.
 	// Currently only one region per model is supported.
 	// Defaults to 'us-central1' if nothing is set.
-	Regions []string `protobuf:"bytes,4,rep,name=regions" json:"regions,omitempty"`
+	Regions []string `protobuf:"bytes,4,rep,name=regions,proto3" json:"regions,omitempty"`
 	// Optional. If true, enables StackDriver Logging for online prediction.
 	// Default is false.
-	OnlinePredictionLogging bool `protobuf:"varint,5,opt,name=online_prediction_logging,json=onlinePredictionLogging" json:"online_prediction_logging,omitempty"`
+	OnlinePredictionLogging bool     `protobuf:"varint,5,opt,name=online_prediction_logging,json=onlinePredictionLogging,proto3" json:"online_prediction_logging,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
+	XXX_unrecognized        []byte   `json:"-"`
+	XXX_sizecache           int32    `json:"-"`
+}
+
+func (m *Model) Reset()         { *m = Model{} }
+func (m *Model) String() string { return proto.CompactTextString(m) }
+func (*Model) ProtoMessage()    {}
+func (*Model) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{0}
+}
+func (m *Model) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Model.Unmarshal(m, b)
+}
+func (m *Model) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Model.Marshal(b, m, deterministic)
+}
+func (dst *Model) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Model.Merge(dst, src)
+}
+func (m *Model) XXX_Size() int {
+	return xxx_messageInfo_Model.Size(m)
+}
+func (m *Model) XXX_DiscardUnknown() {
+	xxx_messageInfo_Model.DiscardUnknown(m)
 }
 
-func (m *Model) Reset()                    { *m = Model{} }
-func (m *Model) String() string            { return proto.CompactTextString(m) }
-func (*Model) ProtoMessage()               {}
-func (*Model) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Model proto.InternalMessageInfo
 
 func (m *Model) GetName() string {
 	if m != nil {
@@ -98,15 +126,15 @@ type Version struct {
 	// Required.The name specified for the version when it was created.
 	//
 	// The version name must be unique within the model it is created in.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The description specified for the version when it was created.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. If true, this version will be used to handle prediction
 	// requests that do not specify a version.
 	//
 	// You can change the default version by calling
 	// [projects.methods.versions.setDefault](/ml/reference/rest/v1/projects.models.versions/setDefault).
-	IsDefault bool `protobuf:"varint,3,opt,name=is_default,json=isDefault" json:"is_default,omitempty"`
+	IsDefault bool `protobuf:"varint,3,opt,name=is_default,json=isDefault,proto3" json:"is_default,omitempty"`
 	// Required. The Google Cloud Storage location of the trained model used to
 	// create the version. See the
 	// [overview of model deployment](/ml/docs/concepts/deployment-overview) for
@@ -117,27 +145,49 @@ type Version struct {
 	// the model service uses the specified location as the source of the model.
 	// Once deployed, the model version is hosted by the prediction service, so
 	// this location is useful only as a historical record.
-	DeploymentUri string `protobuf:"bytes,4,opt,name=deployment_uri,json=deploymentUri" json:"deployment_uri,omitempty"`
+	DeploymentUri string `protobuf:"bytes,4,opt,name=deployment_uri,json=deploymentUri,proto3" json:"deployment_uri,omitempty"`
 	// Output only. The time the version was created.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the version was last used for prediction.
-	LastUseTime *google_protobuf2.Timestamp `protobuf:"bytes,6,opt,name=last_use_time,json=lastUseTime" json:"last_use_time,omitempty"`
+	LastUseTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=last_use_time,json=lastUseTime,proto3" json:"last_use_time,omitempty"`
 	// Optional. The Google Cloud ML runtime version to use for this deployment.
 	// If not set, Google Cloud ML will choose a version.
-	RuntimeVersion string `protobuf:"bytes,8,opt,name=runtime_version,json=runtimeVersion" json:"runtime_version,omitempty"`
+	RuntimeVersion string `protobuf:"bytes,8,opt,name=runtime_version,json=runtimeVersion,proto3" json:"runtime_version,omitempty"`
 	// Optional. Manually select the number of nodes to use for serving the
 	// model. If unset (i.e., by default), the number of nodes used to serve
 	// the model automatically scales with traffic. However, care should be
 	// taken to ramp up traffic according to the model's ability to scale. If
 	// your model needs to handle bursts of traffic beyond it's ability to
 	// scale, it is recommended you set this field appropriately.
-	ManualScaling *ManualScaling `protobuf:"bytes,9,opt,name=manual_scaling,json=manualScaling" json:"manual_scaling,omitempty"`
+	ManualScaling        *ManualScaling `protobuf:"bytes,9,opt,name=manual_scaling,json=manualScaling,proto3" json:"manual_scaling,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *Version) Reset()                    { *m = Version{} }
-func (m *Version) String() string            { return proto.CompactTextString(m) }
-func (*Version) ProtoMessage()               {}
-func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *Version) Reset()         { *m = Version{} }
+func (m *Version) String() string { return proto.CompactTextString(m) }
+func (*Version) ProtoMessage()    {}
+func (*Version) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{1}
+}
+func (m *Version) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Version.Unmarshal(m, b)
+}
+func (m *Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Version.Marshal(b, m, deterministic)
+}
+func (dst *Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Version.Merge(dst, src)
+}
+func (m *Version) XXX_Size() int {
+	return xxx_messageInfo_Version.Size(m)
+}
+func (m *Version) XXX_DiscardUnknown() {
+	xxx_messageInfo_Version.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Version proto.InternalMessageInfo
 
 func (m *Version) GetName() string {
 	if m != nil {
@@ -167,14 +217,14 @@ func (m *Version) GetDeploymentUri() string {
 	return ""
 }
 
-func (m *Version) GetCreateTime() *google_protobuf2.Timestamp {
+func (m *Version) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Version) GetLastUseTime() *google_protobuf2.Timestamp {
+func (m *Version) GetLastUseTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastUseTime
 	}
@@ -201,13 +251,35 @@ type ManualScaling struct {
 	// starting from the time the model is deployed, so the cost of operating
 	// this model will be proportional to nodes * number of hours since
 	// deployment.
-	Nodes int32 `protobuf:"varint,1,opt,name=nodes" json:"nodes,omitempty"`
+	Nodes                int32    `protobuf:"varint,1,opt,name=nodes,proto3" json:"nodes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ManualScaling) Reset()                    { *m = ManualScaling{} }
-func (m *ManualScaling) String() string            { return proto.CompactTextString(m) }
-func (*ManualScaling) ProtoMessage()               {}
-func (*ManualScaling) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *ManualScaling) Reset()         { *m = ManualScaling{} }
+func (m *ManualScaling) String() string { return proto.CompactTextString(m) }
+func (*ManualScaling) ProtoMessage()    {}
+func (*ManualScaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{2}
+}
+func (m *ManualScaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ManualScaling.Unmarshal(m, b)
+}
+func (m *ManualScaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ManualScaling.Marshal(b, m, deterministic)
+}
+func (dst *ManualScaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ManualScaling.Merge(dst, src)
+}
+func (m *ManualScaling) XXX_Size() int {
+	return xxx_messageInfo_ManualScaling.Size(m)
+}
+func (m *ManualScaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_ManualScaling.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ManualScaling proto.InternalMessageInfo
 
 func (m *ManualScaling) GetNodes() int32 {
 	if m != nil {
@@ -221,15 +293,37 @@ type CreateModelRequest struct {
 	// Required. The project name.
 	//
 	// Authorization: requires `Editor` role on the specified project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The model to create.
-	Model *Model `protobuf:"bytes,2,opt,name=model" json:"model,omitempty"`
+	Model                *Model   `protobuf:"bytes,2,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateModelRequest) Reset()                    { *m = CreateModelRequest{} }
-func (m *CreateModelRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateModelRequest) ProtoMessage()               {}
-func (*CreateModelRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *CreateModelRequest) Reset()         { *m = CreateModelRequest{} }
+func (m *CreateModelRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateModelRequest) ProtoMessage()    {}
+func (*CreateModelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{3}
+}
+func (m *CreateModelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateModelRequest.Unmarshal(m, b)
+}
+func (m *CreateModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateModelRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateModelRequest.Merge(dst, src)
+}
+func (m *CreateModelRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateModelRequest.Size(m)
+}
+func (m *CreateModelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateModelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateModelRequest proto.InternalMessageInfo
 
 func (m *CreateModelRequest) GetParent() string {
 	if m != nil {
@@ -250,24 +344,46 @@ type ListModelsRequest struct {
 	// Required. The name of the project whose models are to be listed.
 	//
 	// Authorization: requires `Viewer` role on the specified project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. A page token to request the next page of results.
 	//
 	// You get the token from the `next_page_token` field of the response from
 	// the previous call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional. The number of models to retrieve per "page" of results. If there
 	// are more remaining results than this number, the response message will
 	// contain a valid value in the `next_page_token` field.
 	//
 	// The default value is 20, and the maximum page size is 100.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListModelsRequest) Reset()                    { *m = ListModelsRequest{} }
-func (m *ListModelsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListModelsRequest) ProtoMessage()               {}
-func (*ListModelsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (m *ListModelsRequest) Reset()         { *m = ListModelsRequest{} }
+func (m *ListModelsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListModelsRequest) ProtoMessage()    {}
+func (*ListModelsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{4}
+}
+func (m *ListModelsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListModelsRequest.Unmarshal(m, b)
+}
+func (m *ListModelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListModelsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListModelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsRequest.Merge(dst, src)
+}
+func (m *ListModelsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListModelsRequest.Size(m)
+}
+func (m *ListModelsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListModelsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListModelsRequest proto.InternalMessageInfo
 
 func (m *ListModelsRequest) GetParent() string {
 	if m != nil {
@@ -293,16 +409,38 @@ func (m *ListModelsRequest) GetPageSize() int32 {
 // Response message for the ListModels method.
 type ListModelsResponse struct {
 	// The list of models.
-	Models []*Model `protobuf:"bytes,1,rep,name=models" json:"models,omitempty"`
+	Models []*Model `protobuf:"bytes,1,rep,name=models,proto3" json:"models,omitempty"`
 	// Optional. Pass this token as the `page_token` field of the request for a
 	// subsequent call.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListModelsResponse) Reset()         { *m = ListModelsResponse{} }
+func (m *ListModelsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListModelsResponse) ProtoMessage()    {}
+func (*ListModelsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{5}
+}
+func (m *ListModelsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListModelsResponse.Unmarshal(m, b)
+}
+func (m *ListModelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListModelsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListModelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListModelsResponse.Merge(dst, src)
+}
+func (m *ListModelsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListModelsResponse.Size(m)
+}
+func (m *ListModelsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListModelsResponse.DiscardUnknown(m)
 }
 
-func (m *ListModelsResponse) Reset()                    { *m = ListModelsResponse{} }
-func (m *ListModelsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListModelsResponse) ProtoMessage()               {}
-func (*ListModelsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_ListModelsResponse proto.InternalMessageInfo
 
 func (m *ListModelsResponse) GetModels() []*Model {
 	if m != nil {
@@ -323,13 +461,35 @@ type GetModelRequest struct {
 	// Required. The name of the model.
 	//
 	// Authorization: requires `Viewer` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetModelRequest) Reset()                    { *m = GetModelRequest{} }
-func (m *GetModelRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetModelRequest) ProtoMessage()               {}
-func (*GetModelRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *GetModelRequest) Reset()         { *m = GetModelRequest{} }
+func (m *GetModelRequest) String() string { return proto.CompactTextString(m) }
+func (*GetModelRequest) ProtoMessage()    {}
+func (*GetModelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{6}
+}
+func (m *GetModelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetModelRequest.Unmarshal(m, b)
+}
+func (m *GetModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetModelRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetModelRequest.Merge(dst, src)
+}
+func (m *GetModelRequest) XXX_Size() int {
+	return xxx_messageInfo_GetModelRequest.Size(m)
+}
+func (m *GetModelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetModelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetModelRequest proto.InternalMessageInfo
 
 func (m *GetModelRequest) GetName() string {
 	if m != nil {
@@ -343,13 +503,35 @@ type DeleteModelRequest struct {
 	// Required. The name of the model.
 	//
 	// Authorization: requires `Editor` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteModelRequest) Reset()                    { *m = DeleteModelRequest{} }
-func (m *DeleteModelRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteModelRequest) ProtoMessage()               {}
-func (*DeleteModelRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+func (m *DeleteModelRequest) Reset()         { *m = DeleteModelRequest{} }
+func (m *DeleteModelRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteModelRequest) ProtoMessage()    {}
+func (*DeleteModelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{7}
+}
+func (m *DeleteModelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteModelRequest.Unmarshal(m, b)
+}
+func (m *DeleteModelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteModelRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteModelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteModelRequest.Merge(dst, src)
+}
+func (m *DeleteModelRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteModelRequest.Size(m)
+}
+func (m *DeleteModelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteModelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteModelRequest proto.InternalMessageInfo
 
 func (m *DeleteModelRequest) GetName() string {
 	if m != nil {
@@ -363,15 +545,37 @@ type CreateVersionRequest struct {
 	// Required. The name of the model.
 	//
 	// Authorization: requires `Editor` role on the parent project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The version details.
-	Version *Version `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
+	Version              *Version `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateVersionRequest) Reset()                    { *m = CreateVersionRequest{} }
-func (m *CreateVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateVersionRequest) ProtoMessage()               {}
-func (*CreateVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+func (m *CreateVersionRequest) Reset()         { *m = CreateVersionRequest{} }
+func (m *CreateVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateVersionRequest) ProtoMessage()    {}
+func (*CreateVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{8}
+}
+func (m *CreateVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateVersionRequest.Unmarshal(m, b)
+}
+func (m *CreateVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVersionRequest.Merge(dst, src)
+}
+func (m *CreateVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateVersionRequest.Size(m)
+}
+func (m *CreateVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateVersionRequest proto.InternalMessageInfo
 
 func (m *CreateVersionRequest) GetParent() string {
 	if m != nil {
@@ -392,24 +596,46 @@ type ListVersionsRequest struct {
 	// Required. The name of the model for which to list the version.
 	//
 	// Authorization: requires `Viewer` role on the parent project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. A page token to request the next page of results.
 	//
 	// You get the token from the `next_page_token` field of the response from
 	// the previous call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional. The number of versions to retrieve per "page" of results. If
 	// there are more remaining results than this number, the response message
 	// will contain a valid value in the `next_page_token` field.
 	//
 	// The default value is 20, and the maximum page size is 100.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVersionsRequest) Reset()         { *m = ListVersionsRequest{} }
+func (m *ListVersionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListVersionsRequest) ProtoMessage()    {}
+func (*ListVersionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{9}
+}
+func (m *ListVersionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVersionsRequest.Unmarshal(m, b)
+}
+func (m *ListVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVersionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListVersionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVersionsRequest.Merge(dst, src)
+}
+func (m *ListVersionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListVersionsRequest.Size(m)
+}
+func (m *ListVersionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVersionsRequest.DiscardUnknown(m)
 }
 
-func (m *ListVersionsRequest) Reset()                    { *m = ListVersionsRequest{} }
-func (m *ListVersionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListVersionsRequest) ProtoMessage()               {}
-func (*ListVersionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_ListVersionsRequest proto.InternalMessageInfo
 
 func (m *ListVersionsRequest) GetParent() string {
 	if m != nil {
@@ -435,16 +661,38 @@ func (m *ListVersionsRequest) GetPageSize() int32 {
 // Response message for the ListVersions method.
 type ListVersionsResponse struct {
 	// The list of versions.
-	Versions []*Version `protobuf:"bytes,1,rep,name=versions" json:"versions,omitempty"`
+	Versions []*Version `protobuf:"bytes,1,rep,name=versions,proto3" json:"versions,omitempty"`
 	// Optional. Pass this token as the `page_token` field of the request for a
 	// subsequent call.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVersionsResponse) Reset()         { *m = ListVersionsResponse{} }
+func (m *ListVersionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListVersionsResponse) ProtoMessage()    {}
+func (*ListVersionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{10}
+}
+func (m *ListVersionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVersionsResponse.Unmarshal(m, b)
+}
+func (m *ListVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVersionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListVersionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVersionsResponse.Merge(dst, src)
+}
+func (m *ListVersionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListVersionsResponse.Size(m)
+}
+func (m *ListVersionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVersionsResponse.DiscardUnknown(m)
 }
 
-func (m *ListVersionsResponse) Reset()                    { *m = ListVersionsResponse{} }
-func (m *ListVersionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListVersionsResponse) ProtoMessage()               {}
-func (*ListVersionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+var xxx_messageInfo_ListVersionsResponse proto.InternalMessageInfo
 
 func (m *ListVersionsResponse) GetVersions() []*Version {
 	if m != nil {
@@ -465,13 +713,35 @@ type GetVersionRequest struct {
 	// Required. The name of the version.
 	//
 	// Authorization: requires `Viewer` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetVersionRequest) Reset()                    { *m = GetVersionRequest{} }
-func (m *GetVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetVersionRequest) ProtoMessage()               {}
-func (*GetVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+func (m *GetVersionRequest) Reset()         { *m = GetVersionRequest{} }
+func (m *GetVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetVersionRequest) ProtoMessage()    {}
+func (*GetVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{11}
+}
+func (m *GetVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetVersionRequest.Unmarshal(m, b)
+}
+func (m *GetVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVersionRequest.Merge(dst, src)
+}
+func (m *GetVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetVersionRequest.Size(m)
+}
+func (m *GetVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetVersionRequest proto.InternalMessageInfo
 
 func (m *GetVersionRequest) GetName() string {
 	if m != nil {
@@ -487,13 +757,35 @@ type DeleteVersionRequest struct {
 	// [projects.models.versions.list](/ml/reference/rest/v1/projects.models.versions/list).
 	//
 	// Authorization: requires `Editor` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteVersionRequest) Reset()         { *m = DeleteVersionRequest{} }
+func (m *DeleteVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteVersionRequest) ProtoMessage()    {}
+func (*DeleteVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{12}
+}
+func (m *DeleteVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteVersionRequest.Unmarshal(m, b)
+}
+func (m *DeleteVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVersionRequest.Merge(dst, src)
+}
+func (m *DeleteVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteVersionRequest.Size(m)
+}
+func (m *DeleteVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteVersionRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteVersionRequest) Reset()                    { *m = DeleteVersionRequest{} }
-func (m *DeleteVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteVersionRequest) ProtoMessage()               {}
-func (*DeleteVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+var xxx_messageInfo_DeleteVersionRequest proto.InternalMessageInfo
 
 func (m *DeleteVersionRequest) GetName() string {
 	if m != nil {
@@ -509,13 +801,35 @@ type SetDefaultVersionRequest struct {
 	// [projects.models.versions.list](/ml/reference/rest/v1/projects.models.versions/list).
 	//
 	// Authorization: requires `Editor` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetDefaultVersionRequest) Reset()                    { *m = SetDefaultVersionRequest{} }
-func (m *SetDefaultVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetDefaultVersionRequest) ProtoMessage()               {}
-func (*SetDefaultVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+func (m *SetDefaultVersionRequest) Reset()         { *m = SetDefaultVersionRequest{} }
+func (m *SetDefaultVersionRequest) String() string { return proto.CompactTextString(m) }
+func (*SetDefaultVersionRequest) ProtoMessage()    {}
+func (*SetDefaultVersionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_model_service_adc1180e67bddc92, []int{13}
+}
+func (m *SetDefaultVersionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetDefaultVersionRequest.Unmarshal(m, b)
+}
+func (m *SetDefaultVersionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetDefaultVersionRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetDefaultVersionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetDefaultVersionRequest.Merge(dst, src)
+}
+func (m *SetDefaultVersionRequest) XXX_Size() int {
+	return xxx_messageInfo_SetDefaultVersionRequest.Size(m)
+}
+func (m *SetDefaultVersionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetDefaultVersionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetDefaultVersionRequest proto.InternalMessageInfo
 
 func (m *SetDefaultVersionRequest) GetName() string {
 	if m != nil {
@@ -549,8 +863,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ModelService service
-
+// ModelServiceClient is the client API for ModelService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ModelServiceClient interface {
 	// Creates a model which will later contain one or more versions.
 	//
@@ -572,7 +887,7 @@ type ModelServiceClient interface {
 	// You can only delete a model if there are no versions in it. You can delete
 	// versions by calling
 	// [projects.models.versions.delete](/ml/reference/rest/v1/projects.models.versions/delete).
-	DeleteModel(ctx context.Context, in *DeleteModelRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteModel(ctx context.Context, in *DeleteModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Creates a new version of a model from a trained TensorFlow model.
 	//
 	// If the version created in the cloud by this call is the first deployed
@@ -581,7 +896,7 @@ type ModelServiceClient interface {
 	// versions, the default version does not automatically change. If you want a
 	// new version to be the default, you must call
 	// [projects.models.versions.setDefault](/ml/reference/rest/v1/projects.models.versions/setDefault).
-	CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Gets basic information about all the versions of a model.
 	//
 	// If you expect that a model has a lot of versions, or if you need to handle
@@ -602,7 +917,7 @@ type ModelServiceClient interface {
 	//
 	// Note: You cannot delete the version that is set as the default version
 	// of the model unless it is the only remaining version.
-	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Designates a version to be the default for the model.
 	//
 	// The default version is used for prediction requests made against the model
@@ -624,7 +939,7 @@ func NewModelServiceClient(cc *grpc.ClientConn) ModelServiceClient {
 
 func (c *modelServiceClient) CreateModel(ctx context.Context, in *CreateModelRequest, opts ...grpc.CallOption) (*Model, error) {
 	out := new(Model)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/CreateModel", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/CreateModel", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -633,7 +948,7 @@ func (c *modelServiceClient) CreateModel(ctx context.Context, in *CreateModelReq
 
 func (c *modelServiceClient) ListModels(ctx context.Context, in *ListModelsRequest, opts ...grpc.CallOption) (*ListModelsResponse, error) {
 	out := new(ListModelsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/ListModels", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/ListModels", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -642,25 +957,25 @@ func (c *modelServiceClient) ListModels(ctx context.Context, in *ListModelsReque
 
 func (c *modelServiceClient) GetModel(ctx context.Context, in *GetModelRequest, opts ...grpc.CallOption) (*Model, error) {
 	out := new(Model)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/GetModel", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/GetModel", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *modelServiceClient) DeleteModel(ctx context.Context, in *DeleteModelRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/DeleteModel", in, out, c.cc, opts...)
+func (c *modelServiceClient) DeleteModel(ctx context.Context, in *DeleteModelRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/DeleteModel", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *modelServiceClient) CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/CreateVersion", in, out, c.cc, opts...)
+func (c *modelServiceClient) CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/CreateVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -669,7 +984,7 @@ func (c *modelServiceClient) CreateVersion(ctx context.Context, in *CreateVersio
 
 func (c *modelServiceClient) ListVersions(ctx context.Context, in *ListVersionsRequest, opts ...grpc.CallOption) (*ListVersionsResponse, error) {
 	out := new(ListVersionsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/ListVersions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/ListVersions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -678,16 +993,16 @@ func (c *modelServiceClient) ListVersions(ctx context.Context, in *ListVersionsR
 
 func (c *modelServiceClient) GetVersion(ctx context.Context, in *GetVersionRequest, opts ...grpc.CallOption) (*Version, error) {
 	out := new(Version)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/GetVersion", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/GetVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *modelServiceClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/DeleteVersion", in, out, c.cc, opts...)
+func (c *modelServiceClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/DeleteVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -696,15 +1011,14 @@ func (c *modelServiceClient) DeleteVersion(ctx context.Context, in *DeleteVersio
 
 func (c *modelServiceClient) SetDefaultVersion(ctx context.Context, in *SetDefaultVersionRequest, opts ...grpc.CallOption) (*Version, error) {
 	out := new(Version)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/SetDefaultVersion", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ModelService/SetDefaultVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ModelService service
-
+// ModelServiceServer is the server API for ModelService service.
 type ModelServiceServer interface {
 	// Creates a model which will later contain one or more versions.
 	//
@@ -726,7 +1040,7 @@ type ModelServiceServer interface {
 	// You can only delete a model if there are no versions in it. You can delete
 	// versions by calling
 	// [projects.models.versions.delete](/ml/reference/rest/v1/projects.models.versions/delete).
-	DeleteModel(context.Context, *DeleteModelRequest) (*google_longrunning.Operation, error)
+	DeleteModel(context.Context, *DeleteModelRequest) (*longrunning.Operation, error)
 	// Creates a new version of a model from a trained TensorFlow model.
 	//
 	// If the version created in the cloud by this call is the first deployed
@@ -735,7 +1049,7 @@ type ModelServiceServer interface {
 	// versions, the default version does not automatically change. If you want a
 	// new version to be the default, you must call
 	// [projects.models.versions.setDefault](/ml/reference/rest/v1/projects.models.versions/setDefault).
-	CreateVersion(context.Context, *CreateVersionRequest) (*google_longrunning.Operation, error)
+	CreateVersion(context.Context, *CreateVersionRequest) (*longrunning.Operation, error)
 	// Gets basic information about all the versions of a model.
 	//
 	// If you expect that a model has a lot of versions, or if you need to handle
@@ -756,7 +1070,7 @@ type ModelServiceServer interface {
 	//
 	// Note: You cannot delete the version that is set as the default version
 	// of the model unless it is the only remaining version.
-	DeleteVersion(context.Context, *DeleteVersionRequest) (*google_longrunning.Operation, error)
+	DeleteVersion(context.Context, *DeleteVersionRequest) (*longrunning.Operation, error)
 	// Designates a version to be the default for the model.
 	//
 	// The default version is used for prediction requests made against the model
@@ -979,9 +1293,11 @@ var _ModelService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/ml/v1/model_service.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/ml/v1/model_service.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/model_service.proto", fileDescriptor_model_service_adc1180e67bddc92)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_model_service_adc1180e67bddc92 = []byte{
 	// 996 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
 	0x14, 0x96, 0xdb, 0xa6, 0x4d, 0x5e, 0x36, 0xad, 0x3a, 0x14, 0xc8, 0x66, 0x29, 0x04, 0xaf, 0xda,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/operation_metadata.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/operation_metadata.pb.go
index a41117d5..4c1326f1 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/operation_metadata.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/operation_metadata.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/operation_metadata.proto
 
-package ml
+package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The operation type.
 type OperationMetadata_OperationType int32
 
@@ -45,47 +51,69 @@ func (x OperationMetadata_OperationType) String() string {
 	return proto.EnumName(OperationMetadata_OperationType_name, int32(x))
 }
 func (OperationMetadata_OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 0}
+	return fileDescriptor_operation_metadata_67f21a738daf74c6, []int{0, 0}
 }
 
 // Represents the metadata of the long-running operation.
 type OperationMetadata struct {
 	// The time the operation was submitted.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time operation processing started.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time operation processing completed.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Indicates whether a request to cancel this operation has been made.
-	IsCancellationRequested bool `protobuf:"varint,4,opt,name=is_cancellation_requested,json=isCancellationRequested" json:"is_cancellation_requested,omitempty"`
+	IsCancellationRequested bool `protobuf:"varint,4,opt,name=is_cancellation_requested,json=isCancellationRequested,proto3" json:"is_cancellation_requested,omitempty"`
 	// The operation type.
-	OperationType OperationMetadata_OperationType `protobuf:"varint,5,opt,name=operation_type,json=operationType,enum=google.cloud.ml.v1.OperationMetadata_OperationType" json:"operation_type,omitempty"`
+	OperationType OperationMetadata_OperationType `protobuf:"varint,5,opt,name=operation_type,json=operationType,proto3,enum=google.cloud.ml.v1.OperationMetadata_OperationType" json:"operation_type,omitempty"`
 	// Contains the name of the model associated with the operation.
-	ModelName string `protobuf:"bytes,6,opt,name=model_name,json=modelName" json:"model_name,omitempty"`
+	ModelName string `protobuf:"bytes,6,opt,name=model_name,json=modelName,proto3" json:"model_name,omitempty"`
 	// Contains the version associated with the operation.
-	Version *Version `protobuf:"bytes,7,opt,name=version" json:"version,omitempty"`
+	Version              *Version `protobuf:"bytes,7,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
+func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata) ProtoMessage()    {}
+func (*OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operation_metadata_67f21a738daf74c6, []int{0}
+}
+func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
+}
+func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+}
+func (m *OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata.Size(m)
+}
+func (m *OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata.DiscardUnknown(m)
 }
 
-func (m *OperationMetadata) Reset()                    { *m = OperationMetadata{} }
-func (m *OperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*OperationMetadata) ProtoMessage()               {}
-func (*OperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_OperationMetadata proto.InternalMessageInfo
 
-func (m *OperationMetadata) GetCreateTime() *google_protobuf2.Timestamp {
+func (m *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *OperationMetadata) GetStartTime() *google_protobuf2.Timestamp {
+func (m *OperationMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *OperationMetadata) GetEndTime() *google_protobuf2.Timestamp {
+func (m *OperationMetadata) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -125,9 +153,11 @@ func init() {
 	proto.RegisterEnum("google.cloud.ml.v1.OperationMetadata_OperationType", OperationMetadata_OperationType_name, OperationMetadata_OperationType_value)
 }
 
-func init() { proto.RegisterFile("google/cloud/ml/v1/operation_metadata.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/operation_metadata.proto", fileDescriptor_operation_metadata_67f21a738daf74c6)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_operation_metadata_67f21a738daf74c6 = []byte{
 	// 454 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x5f, 0x6b, 0xdb, 0x30,
 	0x14, 0xc5, 0xe7, 0xb6, 0x6b, 0x1a, 0x75, 0x0d, 0x99, 0x1e, 0xb6, 0xcc, 0xfb, 0x17, 0xfa, 0x30,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/prediction_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/prediction_service.pb.go
index 9d27c9c4..bf9a7075 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/prediction_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/prediction_service.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/prediction_service.proto
 
-package ml
+package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api3 "google.golang.org/genproto/googleapis/api/httpbody"
+import httpbody "google.golang.org/genproto/googleapis/api/httpbody"
 
 import (
 	context "golang.org/x/net/context"
@@ -19,6 +19,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Request for predictions to be issued against a trained model.
 //
 // The body of the request is a single JSON object with a single top-level
@@ -209,16 +215,38 @@ type PredictRequest struct {
 	// Required. The resource name of a model or a version.
 	//
 	// Authorization: requires `Viewer` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	//
 	// Required. The prediction request body.
-	HttpBody *google_api3.HttpBody `protobuf:"bytes,2,opt,name=http_body,json=httpBody" json:"http_body,omitempty"`
+	HttpBody             *httpbody.HttpBody `protobuf:"bytes,2,opt,name=http_body,json=httpBody,proto3" json:"http_body,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *PredictRequest) Reset()         { *m = PredictRequest{} }
+func (m *PredictRequest) String() string { return proto.CompactTextString(m) }
+func (*PredictRequest) ProtoMessage()    {}
+func (*PredictRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_prediction_service_92107018d3d8c7da, []int{0}
+}
+func (m *PredictRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PredictRequest.Unmarshal(m, b)
+}
+func (m *PredictRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PredictRequest.Marshal(b, m, deterministic)
+}
+func (dst *PredictRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PredictRequest.Merge(dst, src)
+}
+func (m *PredictRequest) XXX_Size() int {
+	return xxx_messageInfo_PredictRequest.Size(m)
+}
+func (m *PredictRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PredictRequest.DiscardUnknown(m)
 }
 
-func (m *PredictRequest) Reset()                    { *m = PredictRequest{} }
-func (m *PredictRequest) String() string            { return proto.CompactTextString(m) }
-func (*PredictRequest) ProtoMessage()               {}
-func (*PredictRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_PredictRequest proto.InternalMessageInfo
 
 func (m *PredictRequest) GetName() string {
 	if m != nil {
@@ -227,7 +255,7 @@ func (m *PredictRequest) GetName() string {
 	return ""
 }
 
-func (m *PredictRequest) GetHttpBody() *google_api3.HttpBody {
+func (m *PredictRequest) GetHttpBody() *httpbody.HttpBody {
 	if m != nil {
 		return m.HttpBody
 	}
@@ -246,13 +274,14 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for OnlinePredictionService service
-
+// OnlinePredictionServiceClient is the client API for OnlinePredictionService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type OnlinePredictionServiceClient interface {
 	// Performs prediction on the data in the request.
 	//
 	// **** REMOVE FROM GENERATED DOCUMENTATION
-	Predict(ctx context.Context, in *PredictRequest, opts ...grpc.CallOption) (*google_api3.HttpBody, error)
+	Predict(ctx context.Context, in *PredictRequest, opts ...grpc.CallOption) (*httpbody.HttpBody, error)
 }
 
 type onlinePredictionServiceClient struct {
@@ -263,22 +292,21 @@ func NewOnlinePredictionServiceClient(cc *grpc.ClientConn) OnlinePredictionServi
 	return &onlinePredictionServiceClient{cc}
 }
 
-func (c *onlinePredictionServiceClient) Predict(ctx context.Context, in *PredictRequest, opts ...grpc.CallOption) (*google_api3.HttpBody, error) {
-	out := new(google_api3.HttpBody)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.OnlinePredictionService/Predict", in, out, c.cc, opts...)
+func (c *onlinePredictionServiceClient) Predict(ctx context.Context, in *PredictRequest, opts ...grpc.CallOption) (*httpbody.HttpBody, error) {
+	out := new(httpbody.HttpBody)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.OnlinePredictionService/Predict", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for OnlinePredictionService service
-
+// OnlinePredictionServiceServer is the server API for OnlinePredictionService service.
 type OnlinePredictionServiceServer interface {
 	// Performs prediction on the data in the request.
 	//
 	// **** REMOVE FROM GENERATED DOCUMENTATION
-	Predict(context.Context, *PredictRequest) (*google_api3.HttpBody, error)
+	Predict(context.Context, *PredictRequest) (*httpbody.HttpBody, error)
 }
 
 func RegisterOnlinePredictionServiceServer(s *grpc.Server, srv OnlinePredictionServiceServer) {
@@ -316,9 +344,11 @@ var _OnlinePredictionService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/ml/v1/prediction_service.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/ml/v1/prediction_service.proto", fileDescriptor3) }
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/prediction_service.proto", fileDescriptor_prediction_service_92107018d3d8c7da)
+}
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_prediction_service_92107018d3d8c7da = []byte{
 	// 308 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0x4f, 0x4b, 0xfb, 0x30,
 	0x18, 0xa6, 0xe3, 0xc7, 0x4f, 0x17, 0xc1, 0x43, 0x10, 0x9d, 0x45, 0x64, 0xd4, 0xcb, 0x9c, 0x90,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/project_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/project_service.pb.go
index 751bce74..c97964bc 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/project_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1/project_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/ml/v1/project_service.proto
 
-package ml
+package ml // import "google.golang.org/genproto/googleapis/cloud/ml/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -18,18 +18,46 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Requests service account information associated with a project.
 type GetConfigRequest struct {
 	// Required. The project name.
 	//
 	// Authorization: requires `Viewer` role on the specified project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetConfigRequest) Reset()         { *m = GetConfigRequest{} }
+func (m *GetConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetConfigRequest) ProtoMessage()    {}
+func (*GetConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_project_service_00dbe1d4c2a6bfee, []int{0}
+}
+func (m *GetConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetConfigRequest.Unmarshal(m, b)
+}
+func (m *GetConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfigRequest.Merge(dst, src)
+}
+func (m *GetConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetConfigRequest.Size(m)
+}
+func (m *GetConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetConfigRequest) Reset()                    { *m = GetConfigRequest{} }
-func (m *GetConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetConfigRequest) ProtoMessage()               {}
-func (*GetConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_GetConfigRequest proto.InternalMessageInfo
 
 func (m *GetConfigRequest) GetName() string {
 	if m != nil {
@@ -41,15 +69,37 @@ func (m *GetConfigRequest) GetName() string {
 // Returns service account information associated with a project.
 type GetConfigResponse struct {
 	// The service account Cloud ML uses to access resources in the project.
-	ServiceAccount string `protobuf:"bytes,1,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
+	ServiceAccount string `protobuf:"bytes,1,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
 	// The project number for `service_account`.
-	ServiceAccountProject int64 `protobuf:"varint,2,opt,name=service_account_project,json=serviceAccountProject" json:"service_account_project,omitempty"`
+	ServiceAccountProject int64    `protobuf:"varint,2,opt,name=service_account_project,json=serviceAccountProject,proto3" json:"service_account_project,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *GetConfigResponse) Reset()         { *m = GetConfigResponse{} }
+func (m *GetConfigResponse) String() string { return proto.CompactTextString(m) }
+func (*GetConfigResponse) ProtoMessage()    {}
+func (*GetConfigResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_project_service_00dbe1d4c2a6bfee, []int{1}
+}
+func (m *GetConfigResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetConfigResponse.Unmarshal(m, b)
+}
+func (m *GetConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetConfigResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetConfigResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfigResponse.Merge(dst, src)
+}
+func (m *GetConfigResponse) XXX_Size() int {
+	return xxx_messageInfo_GetConfigResponse.Size(m)
+}
+func (m *GetConfigResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetConfigResponse.DiscardUnknown(m)
 }
 
-func (m *GetConfigResponse) Reset()                    { *m = GetConfigResponse{} }
-func (m *GetConfigResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetConfigResponse) ProtoMessage()               {}
-func (*GetConfigResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+var xxx_messageInfo_GetConfigResponse proto.InternalMessageInfo
 
 func (m *GetConfigResponse) GetServiceAccount() string {
 	if m != nil {
@@ -78,8 +128,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ProjectManagementService service
-
+// ProjectManagementServiceClient is the client API for ProjectManagementService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ProjectManagementServiceClient interface {
 	// Get the service account information associated with your project. You need
 	// this information in order to grant the service account persmissions for
@@ -98,15 +149,14 @@ func NewProjectManagementServiceClient(cc *grpc.ClientConn) ProjectManagementSer
 
 func (c *projectManagementServiceClient) GetConfig(ctx context.Context, in *GetConfigRequest, opts ...grpc.CallOption) (*GetConfigResponse, error) {
 	out := new(GetConfigResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1.ProjectManagementService/GetConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.ml.v1.ProjectManagementService/GetConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ProjectManagementService service
-
+// ProjectManagementServiceServer is the server API for ProjectManagementService service.
 type ProjectManagementServiceServer interface {
 	// Get the service account information associated with your project. You need
 	// this information in order to grant the service account persmissions for
@@ -150,9 +200,11 @@ var _ProjectManagementService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/ml/v1/project_service.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/ml/v1/project_service.proto", fileDescriptor4) }
+func init() {
+	proto.RegisterFile("google/cloud/ml/v1/project_service.proto", fileDescriptor_project_service_00dbe1d4c2a6bfee)
+}
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_project_service_00dbe1d4c2a6bfee = []byte{
 	// 319 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xbf, 0x4a, 0x43, 0x31,
 	0x14, 0xc6, 0xb9, 0x55, 0x84, 0x66, 0xf0, 0x4f, 0x44, 0x2c, 0x45, 0xb0, 0x16, 0xb5, 0xc5, 0x21,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/job_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/job_service.pb.go
deleted file mode 100644
index df13ca5e..00000000
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/job_service.pb.go
+++ /dev/null
@@ -1,1823 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/cloud/ml/v1beta1/job_service.proto
-
-/*
-Package ml is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/ml/v1beta1/job_service.proto
-	google/cloud/ml/v1beta1/model_service.proto
-	google/cloud/ml/v1beta1/operation_metadata.proto
-	google/cloud/ml/v1beta1/prediction_service.proto
-	google/cloud/ml/v1beta1/project_service.proto
-
-It has these top-level messages:
-	TrainingInput
-	HyperparameterSpec
-	ParameterSpec
-	HyperparameterOutput
-	TrainingOutput
-	PredictionInput
-	PredictionOutput
-	Job
-	CreateJobRequest
-	ListJobsRequest
-	ListJobsResponse
-	GetJobRequest
-	CancelJobRequest
-	Model
-	Version
-	ManualScaling
-	CreateModelRequest
-	ListModelsRequest
-	ListModelsResponse
-	GetModelRequest
-	DeleteModelRequest
-	CreateVersionRequest
-	ListVersionsRequest
-	ListVersionsResponse
-	GetVersionRequest
-	DeleteVersionRequest
-	SetDefaultVersionRequest
-	OperationMetadata
-	PredictRequest
-	GetConfigRequest
-	GetConfigResponse
-*/
-package ml
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-// A scale tier is an abstract representation of the resources Cloud ML
-// will allocate to a training job. When selecting a scale tier for your
-// training job, you should consider the size of your training dataset and
-// the complexity of your model. As the tiers increase, virtual machines are
-// added to handle your job, and the individual machines in the cluster
-// generally have more memory and greater processing power than they do at
-// lower tiers. The number of training units charged per hour of processing
-// increases as tiers get more advanced. Refer to the
-// [pricing guide](/ml/pricing) for more details. Note that in addition to
-// incurring costs, your use of training resources is constrained by the
-// [quota policy](/ml/quota).
-type TrainingInput_ScaleTier int32
-
-const (
-	// A single worker instance. This tier is suitable for learning how to use
-	// Cloud ML, and for experimenting with new models using small datasets.
-	TrainingInput_BASIC TrainingInput_ScaleTier = 0
-	// Many workers and a few parameter servers.
-	TrainingInput_STANDARD_1 TrainingInput_ScaleTier = 1
-	// A large number of workers with many parameter servers.
-	TrainingInput_PREMIUM_1 TrainingInput_ScaleTier = 3
-	// A single worker instance [with a GPU](ml/docs/how-tos/using-gpus).
-	TrainingInput_BASIC_GPU TrainingInput_ScaleTier = 6
-	// The CUSTOM tier is not a set tier, but rather enables you to use your
-	// own cluster specification. When you use this tier, set values to
-	// configure your processing cluster according to these guidelines:
-	//
-	// *   You _must_ set `TrainingInput.masterType` to specify the type
-	//     of machine to use for your master node. This is the only required
-	//     setting.
-	//
-	// *   You _may_ set `TrainingInput.workerCount` to specify the number of
-	//     workers to use. If you specify one or more workers, you _must_ also
-	//     set `TrainingInput.workerType` to specify the type of machine to use
-	//     for your worker nodes.
-	//
-	// *   You _may_ set `TrainingInput.parameterServerCount` to specify the
-	//     number of parameter servers to use. If you specify one or more
-	//     parameter servers, you _must_ also set
-	//     `TrainingInput.parameterServerType` to specify the type of machine to
-	//     use for your parameter servers.
-	//
-	// Note that all of your workers must use the same machine type, which can
-	// be different from your parameter server type and master type. Your
-	// parameter servers must likewise use the same machine type, which can be
-	// different from your worker type and master type.
-	TrainingInput_CUSTOM TrainingInput_ScaleTier = 5
-)
-
-var TrainingInput_ScaleTier_name = map[int32]string{
-	0: "BASIC",
-	1: "STANDARD_1",
-	3: "PREMIUM_1",
-	6: "BASIC_GPU",
-	5: "CUSTOM",
-}
-var TrainingInput_ScaleTier_value = map[string]int32{
-	"BASIC":      0,
-	"STANDARD_1": 1,
-	"PREMIUM_1":  3,
-	"BASIC_GPU":  6,
-	"CUSTOM":     5,
-}
-
-func (x TrainingInput_ScaleTier) String() string {
-	return proto.EnumName(TrainingInput_ScaleTier_name, int32(x))
-}
-func (TrainingInput_ScaleTier) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
-
-// The available types of optimization goals.
-type HyperparameterSpec_GoalType int32
-
-const (
-	// Goal Type will default to maximize.
-	HyperparameterSpec_GOAL_TYPE_UNSPECIFIED HyperparameterSpec_GoalType = 0
-	// Maximize the goal metric.
-	HyperparameterSpec_MAXIMIZE HyperparameterSpec_GoalType = 1
-	// Minimize the goal metric.
-	HyperparameterSpec_MINIMIZE HyperparameterSpec_GoalType = 2
-)
-
-var HyperparameterSpec_GoalType_name = map[int32]string{
-	0: "GOAL_TYPE_UNSPECIFIED",
-	1: "MAXIMIZE",
-	2: "MINIMIZE",
-}
-var HyperparameterSpec_GoalType_value = map[string]int32{
-	"GOAL_TYPE_UNSPECIFIED": 0,
-	"MAXIMIZE":              1,
-	"MINIMIZE":              2,
-}
-
-func (x HyperparameterSpec_GoalType) String() string {
-	return proto.EnumName(HyperparameterSpec_GoalType_name, int32(x))
-}
-func (HyperparameterSpec_GoalType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 0}
-}
-
-// The type of the parameter.
-type ParameterSpec_ParameterType int32
-
-const (
-	// You must specify a valid type. Using this unspecified type will result in
-	// an error.
-	ParameterSpec_PARAMETER_TYPE_UNSPECIFIED ParameterSpec_ParameterType = 0
-	// Type for real-valued parameters.
-	ParameterSpec_DOUBLE ParameterSpec_ParameterType = 1
-	// Type for integral parameters.
-	ParameterSpec_INTEGER ParameterSpec_ParameterType = 2
-	// The parameter is categorical, with a value chosen from the categories
-	// field.
-	ParameterSpec_CATEGORICAL ParameterSpec_ParameterType = 3
-	// The parameter is real valued, with a fixed set of feasible points. If
-	// `type==DISCRETE`, feasible_points must be provided, and
-	// {`min_value`, `max_value`} will be ignored.
-	ParameterSpec_DISCRETE ParameterSpec_ParameterType = 4
-)
-
-var ParameterSpec_ParameterType_name = map[int32]string{
-	0: "PARAMETER_TYPE_UNSPECIFIED",
-	1: "DOUBLE",
-	2: "INTEGER",
-	3: "CATEGORICAL",
-	4: "DISCRETE",
-}
-var ParameterSpec_ParameterType_value = map[string]int32{
-	"PARAMETER_TYPE_UNSPECIFIED": 0,
-	"DOUBLE":                     1,
-	"INTEGER":                    2,
-	"CATEGORICAL":                3,
-	"DISCRETE":                   4,
-}
-
-func (x ParameterSpec_ParameterType) String() string {
-	return proto.EnumName(ParameterSpec_ParameterType_name, int32(x))
-}
-func (ParameterSpec_ParameterType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 0}
-}
-
-// The type of scaling that should be applied to this parameter.
-type ParameterSpec_ScaleType int32
-
-const (
-	// By default, no scaling is applied.
-	ParameterSpec_NONE ParameterSpec_ScaleType = 0
-	// Scales the feasible space to (0, 1) linearly.
-	ParameterSpec_UNIT_LINEAR_SCALE ParameterSpec_ScaleType = 1
-	// Scales the feasible space logarithmically to (0, 1). The entire feasible
-	// space must be strictly positive.
-	ParameterSpec_UNIT_LOG_SCALE ParameterSpec_ScaleType = 2
-	// Scales the feasible space "reverse" logarithmically to (0, 1). The result
-	// is that values close to the top of the feasible space are spread out more
-	// than points near the bottom. The entire feasible space must be strictly
-	// positive.
-	ParameterSpec_UNIT_REVERSE_LOG_SCALE ParameterSpec_ScaleType = 3
-)
-
-var ParameterSpec_ScaleType_name = map[int32]string{
-	0: "NONE",
-	1: "UNIT_LINEAR_SCALE",
-	2: "UNIT_LOG_SCALE",
-	3: "UNIT_REVERSE_LOG_SCALE",
-}
-var ParameterSpec_ScaleType_value = map[string]int32{
-	"NONE":                   0,
-	"UNIT_LINEAR_SCALE":      1,
-	"UNIT_LOG_SCALE":         2,
-	"UNIT_REVERSE_LOG_SCALE": 3,
-}
-
-func (x ParameterSpec_ScaleType) String() string {
-	return proto.EnumName(ParameterSpec_ScaleType_name, int32(x))
-}
-func (ParameterSpec_ScaleType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
-
-// The format used to separate data instances in the source files.
-type PredictionInput_DataFormat int32
-
-const (
-	// Unspecified format.
-	PredictionInput_DATA_FORMAT_UNSPECIFIED PredictionInput_DataFormat = 0
-	// The source file is a text file with instances separated by the
-	// new-line character.
-	PredictionInput_TEXT PredictionInput_DataFormat = 1
-	// The source file is a TFRecord file.
-	PredictionInput_TF_RECORD PredictionInput_DataFormat = 2
-	// The source file is a GZIP-compressed TFRecord file.
-	PredictionInput_TF_RECORD_GZIP PredictionInput_DataFormat = 3
-)
-
-var PredictionInput_DataFormat_name = map[int32]string{
-	0: "DATA_FORMAT_UNSPECIFIED",
-	1: "TEXT",
-	2: "TF_RECORD",
-	3: "TF_RECORD_GZIP",
-}
-var PredictionInput_DataFormat_value = map[string]int32{
-	"DATA_FORMAT_UNSPECIFIED": 0,
-	"TEXT":           1,
-	"TF_RECORD":      2,
-	"TF_RECORD_GZIP": 3,
-}
-
-func (x PredictionInput_DataFormat) String() string {
-	return proto.EnumName(PredictionInput_DataFormat_name, int32(x))
-}
-func (PredictionInput_DataFormat) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 0}
-}
-
-// Describes the job state.
-type Job_State int32
-
-const (
-	// The job state is unspecified.
-	Job_STATE_UNSPECIFIED Job_State = 0
-	// The job has been just created and processing has not yet begun.
-	Job_QUEUED Job_State = 1
-	// The service is preparing to run the job.
-	Job_PREPARING Job_State = 2
-	// The job is in progress.
-	Job_RUNNING Job_State = 3
-	// The job completed successfully.
-	Job_SUCCEEDED Job_State = 4
-	// The job failed.
-	// `error_message` should contain the details of the failure.
-	Job_FAILED Job_State = 5
-	// The job is being cancelled.
-	// `error_message` should describe the reason for the cancellation.
-	Job_CANCELLING Job_State = 6
-	// The job has been cancelled.
-	// `error_message` should describe the reason for the cancellation.
-	Job_CANCELLED Job_State = 7
-)
-
-var Job_State_name = map[int32]string{
-	0: "STATE_UNSPECIFIED",
-	1: "QUEUED",
-	2: "PREPARING",
-	3: "RUNNING",
-	4: "SUCCEEDED",
-	5: "FAILED",
-	6: "CANCELLING",
-	7: "CANCELLED",
-}
-var Job_State_value = map[string]int32{
-	"STATE_UNSPECIFIED": 0,
-	"QUEUED":            1,
-	"PREPARING":         2,
-	"RUNNING":           3,
-	"SUCCEEDED":         4,
-	"FAILED":            5,
-	"CANCELLING":        6,
-	"CANCELLED":         7,
-}
-
-func (x Job_State) String() string {
-	return proto.EnumName(Job_State_name, int32(x))
-}
-func (Job_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
-
-// Represents input parameters for a training job.
-type TrainingInput struct {
-	// Required. Specifies the machine types, the number of replicas for workers
-	// and parameter servers.
-	ScaleTier TrainingInput_ScaleTier `protobuf:"varint,1,opt,name=scale_tier,json=scaleTier,enum=google.cloud.ml.v1beta1.TrainingInput_ScaleTier" json:"scale_tier,omitempty"`
-	// Optional. Specifies the type of virtual machine to use for your training
-	// job's master worker.
-	//
-	// The following types are supported:
-	//
-	// <dl>
-	//   <dt>standard</dt>
-	//   <dd>
-	//   A basic machine configuration suitable for training simple models with
-	//   small to moderate datasets.
-	//   </dd>
-	//   <dt>large_model</dt>
-	//   <dd>
-	//   A machine with a lot of memory, specially suited for parameter servers
-	//   when your model is large (having many hidden layers or layers with very
-	//   large numbers of nodes).
-	//   </dd>
-	//   <dt>complex_model_s</dt>
-	//   <dd>
-	//   A machine suitable for the master and workers of the cluster when your
-	//   model requires more computation than the standard machine can handle
-	//   satisfactorily.
-	//   </dd>
-	//   <dt>complex_model_m</dt>
-	//   <dd>
-	//   A machine with roughly twice the number of cores and roughly double the
-	//   memory of <code suppresswarning="true">complex_model_s</code>.
-	//   </dd>
-	//   <dt>complex_model_l</dt>
-	//   <dd>
-	//   A machine with roughly twice the number of cores and roughly double the
-	//   memory of <code suppresswarning="true">complex_model_m</code>.
-	//   </dd>
-	//   <dt>standard_gpu</dt>
-	//   <dd>
-	//   A machine equivalent to <code suppresswarning="true">standard</code> that
-	//   also includes a
-	//   <a href="ml/docs/how-tos/using-gpus">
-	//   GPU that you can use in your trainer</a>.
-	//   </dd>
-	//   <dt>complex_model_m_gpu</dt>
-	//   <dd>
-	//   A machine equivalent to
-	//   <code suppresswarning="true">coplex_model_m</code> that also includes
-	//   four GPUs.
-	//   </dd>
-	// </dl>
-	//
-	// You must set this value when `scaleTier` is set to `CUSTOM`.
-	MasterType string `protobuf:"bytes,2,opt,name=master_type,json=masterType" json:"master_type,omitempty"`
-	// Optional. Specifies the type of virtual machine to use for your training
-	// job's worker nodes.
-	//
-	// The supported values are the same as those described in the entry for
-	// `masterType`.
-	//
-	// This value must be present when `scaleTier` is set to `CUSTOM` and
-	// `workerCount` is greater than zero.
-	WorkerType string `protobuf:"bytes,3,opt,name=worker_type,json=workerType" json:"worker_type,omitempty"`
-	// Optional. Specifies the type of virtual machine to use for your training
-	// job's parameter server.
-	//
-	// The supported values are the same as those described in the entry for
-	// `master_type`.
-	//
-	// This value must be present when `scaleTier` is set to `CUSTOM` and
-	// `parameter_server_count` is greater than zero.
-	ParameterServerType string `protobuf:"bytes,4,opt,name=parameter_server_type,json=parameterServerType" json:"parameter_server_type,omitempty"`
-	// Optional. The number of worker replicas to use for the training job. Each
-	// replica in the cluster will be of the type specified in `worker_type`.
-	//
-	// This value can only be used when `scale_tier` is set to `CUSTOM`. If you
-	// set this value, you must also set `worker_type`.
-	WorkerCount int64 `protobuf:"varint,5,opt,name=worker_count,json=workerCount" json:"worker_count,omitempty"`
-	// Optional. The number of parameter server replicas to use for the training
-	// job. Each replica in the cluster will be of the type specified in
-	// `parameter_server_type`.
-	//
-	// This value can only be used when `scale_tier` is set to `CUSTOM`.If you
-	// set this value, you must also set `parameter_server_type`.
-	ParameterServerCount int64 `protobuf:"varint,6,opt,name=parameter_server_count,json=parameterServerCount" json:"parameter_server_count,omitempty"`
-	// Required. The Google Cloud Storage location of the packages with
-	// the training program and any additional dependencies.
-	PackageUris []string `protobuf:"bytes,7,rep,name=package_uris,json=packageUris" json:"package_uris,omitempty"`
-	// Required. The Python module name to run after installing the packages.
-	PythonModule string `protobuf:"bytes,8,opt,name=python_module,json=pythonModule" json:"python_module,omitempty"`
-	// Optional. Command line arguments to pass to the program.
-	Args []string `protobuf:"bytes,10,rep,name=args" json:"args,omitempty"`
-	// Optional. The set of Hyperparameters to tune.
-	Hyperparameters *HyperparameterSpec `protobuf:"bytes,12,opt,name=hyperparameters" json:"hyperparameters,omitempty"`
-	// Required. The Google Compute Engine region to run the training job in.
-	Region string `protobuf:"bytes,14,opt,name=region" json:"region,omitempty"`
-	// Optional. A Google Cloud Storage path in which to store training outputs
-	// and other data needed for training. This path is passed to your TensorFlow
-	// program as the 'job_dir' command-line argument. The benefit of specifying
-	// this field is that Cloud ML validates the path for use in training.
-	JobDir string `protobuf:"bytes,16,opt,name=job_dir,json=jobDir" json:"job_dir,omitempty"`
-	// Optional. The Google Cloud ML runtime version to use for training.  If not
-	// set, Google Cloud ML will choose the latest stable version.
-	RuntimeVersion string `protobuf:"bytes,15,opt,name=runtime_version,json=runtimeVersion" json:"runtime_version,omitempty"`
-}
-
-func (m *TrainingInput) Reset()                    { *m = TrainingInput{} }
-func (m *TrainingInput) String() string            { return proto.CompactTextString(m) }
-func (*TrainingInput) ProtoMessage()               {}
-func (*TrainingInput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *TrainingInput) GetScaleTier() TrainingInput_ScaleTier {
-	if m != nil {
-		return m.ScaleTier
-	}
-	return TrainingInput_BASIC
-}
-
-func (m *TrainingInput) GetMasterType() string {
-	if m != nil {
-		return m.MasterType
-	}
-	return ""
-}
-
-func (m *TrainingInput) GetWorkerType() string {
-	if m != nil {
-		return m.WorkerType
-	}
-	return ""
-}
-
-func (m *TrainingInput) GetParameterServerType() string {
-	if m != nil {
-		return m.ParameterServerType
-	}
-	return ""
-}
-
-func (m *TrainingInput) GetWorkerCount() int64 {
-	if m != nil {
-		return m.WorkerCount
-	}
-	return 0
-}
-
-func (m *TrainingInput) GetParameterServerCount() int64 {
-	if m != nil {
-		return m.ParameterServerCount
-	}
-	return 0
-}
-
-func (m *TrainingInput) GetPackageUris() []string {
-	if m != nil {
-		return m.PackageUris
-	}
-	return nil
-}
-
-func (m *TrainingInput) GetPythonModule() string {
-	if m != nil {
-		return m.PythonModule
-	}
-	return ""
-}
-
-func (m *TrainingInput) GetArgs() []string {
-	if m != nil {
-		return m.Args
-	}
-	return nil
-}
-
-func (m *TrainingInput) GetHyperparameters() *HyperparameterSpec {
-	if m != nil {
-		return m.Hyperparameters
-	}
-	return nil
-}
-
-func (m *TrainingInput) GetRegion() string {
-	if m != nil {
-		return m.Region
-	}
-	return ""
-}
-
-func (m *TrainingInput) GetJobDir() string {
-	if m != nil {
-		return m.JobDir
-	}
-	return ""
-}
-
-func (m *TrainingInput) GetRuntimeVersion() string {
-	if m != nil {
-		return m.RuntimeVersion
-	}
-	return ""
-}
-
-// Represents a set of hyperparameters to optimize.
-type HyperparameterSpec struct {
-	// Required. The type of goal to use for tuning. Available types are
-	// `MAXIMIZE` and `MINIMIZE`.
-	//
-	// Defaults to `MAXIMIZE`.
-	Goal HyperparameterSpec_GoalType `protobuf:"varint,1,opt,name=goal,enum=google.cloud.ml.v1beta1.HyperparameterSpec_GoalType" json:"goal,omitempty"`
-	// Required. The set of parameters to tune.
-	Params []*ParameterSpec `protobuf:"bytes,2,rep,name=params" json:"params,omitempty"`
-	// Optional. How many training trials should be attempted to optimize
-	// the specified hyperparameters.
-	//
-	// Defaults to one.
-	MaxTrials int32 `protobuf:"varint,3,opt,name=max_trials,json=maxTrials" json:"max_trials,omitempty"`
-	// Optional. The number of training trials to run concurrently.
-	// You can reduce the time it takes to perform hyperparameter tuning by adding
-	// trials in parallel. However, each trail only benefits from the information
-	// gained in completed trials. That means that a trial does not get access to
-	// the results of trials running at the same time, which could reduce the
-	// quality of the overall optimization.
-	//
-	// Each trial will use the same scale tier and machine types.
-	//
-	// Defaults to one.
-	MaxParallelTrials int32 `protobuf:"varint,4,opt,name=max_parallel_trials,json=maxParallelTrials" json:"max_parallel_trials,omitempty"`
-	// Optional. The Tensorflow summary tag name to use for optimizing trials. For
-	// current versions of Tensorflow, this tag name should exactly match what is
-	// shown in Tensorboard, including all scopes.  For versions of Tensorflow
-	// prior to 0.12, this should be only the tag passed to tf.Summary.
-	// By default, "training/hptuning/metric" will be used.
-	HyperparameterMetricTag string `protobuf:"bytes,5,opt,name=hyperparameter_metric_tag,json=hyperparameterMetricTag" json:"hyperparameter_metric_tag,omitempty"`
-}
-
-func (m *HyperparameterSpec) Reset()                    { *m = HyperparameterSpec{} }
-func (m *HyperparameterSpec) String() string            { return proto.CompactTextString(m) }
-func (*HyperparameterSpec) ProtoMessage()               {}
-func (*HyperparameterSpec) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *HyperparameterSpec) GetGoal() HyperparameterSpec_GoalType {
-	if m != nil {
-		return m.Goal
-	}
-	return HyperparameterSpec_GOAL_TYPE_UNSPECIFIED
-}
-
-func (m *HyperparameterSpec) GetParams() []*ParameterSpec {
-	if m != nil {
-		return m.Params
-	}
-	return nil
-}
-
-func (m *HyperparameterSpec) GetMaxTrials() int32 {
-	if m != nil {
-		return m.MaxTrials
-	}
-	return 0
-}
-
-func (m *HyperparameterSpec) GetMaxParallelTrials() int32 {
-	if m != nil {
-		return m.MaxParallelTrials
-	}
-	return 0
-}
-
-func (m *HyperparameterSpec) GetHyperparameterMetricTag() string {
-	if m != nil {
-		return m.HyperparameterMetricTag
-	}
-	return ""
-}
-
-// Represents a single hyperparameter to optimize.
-type ParameterSpec struct {
-	// Required. The parameter name must be unique amongst all ParameterConfigs in
-	// a HyperparameterSpec message. E.g., "learning_rate".
-	ParameterName string `protobuf:"bytes,1,opt,name=parameter_name,json=parameterName" json:"parameter_name,omitempty"`
-	// Required. The type of the parameter.
-	Type ParameterSpec_ParameterType `protobuf:"varint,4,opt,name=type,enum=google.cloud.ml.v1beta1.ParameterSpec_ParameterType" json:"type,omitempty"`
-	// Required if type is `DOUBLE` or `INTEGER`. This field
-	// should be unset if type is `CATEGORICAL`. This value should be integers if
-	// type is INTEGER.
-	MinValue float64 `protobuf:"fixed64,2,opt,name=min_value,json=minValue" json:"min_value,omitempty"`
-	// Required if typeis `DOUBLE` or `INTEGER`. This field
-	// should be unset if type is `CATEGORICAL`. This value should be integers if
-	// type is `INTEGER`.
-	MaxValue float64 `protobuf:"fixed64,3,opt,name=max_value,json=maxValue" json:"max_value,omitempty"`
-	// Required if type is `CATEGORICAL`. The list of possible categories.
-	CategoricalValues []string `protobuf:"bytes,5,rep,name=categorical_values,json=categoricalValues" json:"categorical_values,omitempty"`
-	// Required if type is `DISCRETE`.
-	// A list of feasible points.
-	// The list should be in strictly increasing order. For instance, this
-	// parameter might have possible settings of 1.5, 2.5, and 4.0. This list
-	// should not contain more than 1,000 values.
-	DiscreteValues []float64 `protobuf:"fixed64,6,rep,packed,name=discrete_values,json=discreteValues" json:"discrete_values,omitempty"`
-	// Optional. How the parameter should be scaled to the hypercube.
-	// Leave unset for categorical parameters.
-	// Some kind of scaling is strongly recommended for real or integral
-	// parameters (e.g., `UNIT_LINEAR_SCALE`).
-	ScaleType ParameterSpec_ScaleType `protobuf:"varint,7,opt,name=scale_type,json=scaleType,enum=google.cloud.ml.v1beta1.ParameterSpec_ScaleType" json:"scale_type,omitempty"`
-}
-
-func (m *ParameterSpec) Reset()                    { *m = ParameterSpec{} }
-func (m *ParameterSpec) String() string            { return proto.CompactTextString(m) }
-func (*ParameterSpec) ProtoMessage()               {}
-func (*ParameterSpec) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *ParameterSpec) GetParameterName() string {
-	if m != nil {
-		return m.ParameterName
-	}
-	return ""
-}
-
-func (m *ParameterSpec) GetType() ParameterSpec_ParameterType {
-	if m != nil {
-		return m.Type
-	}
-	return ParameterSpec_PARAMETER_TYPE_UNSPECIFIED
-}
-
-func (m *ParameterSpec) GetMinValue() float64 {
-	if m != nil {
-		return m.MinValue
-	}
-	return 0
-}
-
-func (m *ParameterSpec) GetMaxValue() float64 {
-	if m != nil {
-		return m.MaxValue
-	}
-	return 0
-}
-
-func (m *ParameterSpec) GetCategoricalValues() []string {
-	if m != nil {
-		return m.CategoricalValues
-	}
-	return nil
-}
-
-func (m *ParameterSpec) GetDiscreteValues() []float64 {
-	if m != nil {
-		return m.DiscreteValues
-	}
-	return nil
-}
-
-func (m *ParameterSpec) GetScaleType() ParameterSpec_ScaleType {
-	if m != nil {
-		return m.ScaleType
-	}
-	return ParameterSpec_NONE
-}
-
-// Represents the result of a single hyperparameter tuning trial from a
-// training job. The TrainingOutput object that is returned on successful
-// completion of a training job with hyperparameter tuning includes a list
-// of HyperparameterOutput objects, one for each successful trial.
-type HyperparameterOutput struct {
-	// The trial id for these results.
-	TrialId string `protobuf:"bytes,1,opt,name=trial_id,json=trialId" json:"trial_id,omitempty"`
-	// The hyperparameters given to this trial.
-	Hyperparameters map[string]string `protobuf:"bytes,2,rep,name=hyperparameters" json:"hyperparameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// The final objective metric seen for this trial.
-	FinalMetric *HyperparameterOutput_HyperparameterMetric `protobuf:"bytes,3,opt,name=final_metric,json=finalMetric" json:"final_metric,omitempty"`
-	// All recorded object metrics for this trial.
-	AllMetrics []*HyperparameterOutput_HyperparameterMetric `protobuf:"bytes,4,rep,name=all_metrics,json=allMetrics" json:"all_metrics,omitempty"`
-}
-
-func (m *HyperparameterOutput) Reset()                    { *m = HyperparameterOutput{} }
-func (m *HyperparameterOutput) String() string            { return proto.CompactTextString(m) }
-func (*HyperparameterOutput) ProtoMessage()               {}
-func (*HyperparameterOutput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *HyperparameterOutput) GetTrialId() string {
-	if m != nil {
-		return m.TrialId
-	}
-	return ""
-}
-
-func (m *HyperparameterOutput) GetHyperparameters() map[string]string {
-	if m != nil {
-		return m.Hyperparameters
-	}
-	return nil
-}
-
-func (m *HyperparameterOutput) GetFinalMetric() *HyperparameterOutput_HyperparameterMetric {
-	if m != nil {
-		return m.FinalMetric
-	}
-	return nil
-}
-
-func (m *HyperparameterOutput) GetAllMetrics() []*HyperparameterOutput_HyperparameterMetric {
-	if m != nil {
-		return m.AllMetrics
-	}
-	return nil
-}
-
-// An observed value of a metric.
-type HyperparameterOutput_HyperparameterMetric struct {
-	// The global training step for this metric.
-	TrainingStep int64 `protobuf:"varint,1,opt,name=training_step,json=trainingStep" json:"training_step,omitempty"`
-	// The objective value at this training step.
-	ObjectiveValue float64 `protobuf:"fixed64,2,opt,name=objective_value,json=objectiveValue" json:"objective_value,omitempty"`
-}
-
-func (m *HyperparameterOutput_HyperparameterMetric) Reset() {
-	*m = HyperparameterOutput_HyperparameterMetric{}
-}
-func (m *HyperparameterOutput_HyperparameterMetric) String() string { return proto.CompactTextString(m) }
-func (*HyperparameterOutput_HyperparameterMetric) ProtoMessage()    {}
-func (*HyperparameterOutput_HyperparameterMetric) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{3, 0}
-}
-
-func (m *HyperparameterOutput_HyperparameterMetric) GetTrainingStep() int64 {
-	if m != nil {
-		return m.TrainingStep
-	}
-	return 0
-}
-
-func (m *HyperparameterOutput_HyperparameterMetric) GetObjectiveValue() float64 {
-	if m != nil {
-		return m.ObjectiveValue
-	}
-	return 0
-}
-
-// Represents results of a training job. Output only.
-type TrainingOutput struct {
-	// The number of hyperparameter tuning trials that completed successfully.
-	// Only set for hyperparameter tuning jobs.
-	CompletedTrialCount int64 `protobuf:"varint,1,opt,name=completed_trial_count,json=completedTrialCount" json:"completed_trial_count,omitempty"`
-	// Results for individual Hyperparameter trials.
-	// Only set for hyperparameter tuning jobs.
-	Trials []*HyperparameterOutput `protobuf:"bytes,2,rep,name=trials" json:"trials,omitempty"`
-	// The amount of ML units consumed by the job.
-	ConsumedMlUnits float64 `protobuf:"fixed64,3,opt,name=consumed_ml_units,json=consumedMlUnits" json:"consumed_ml_units,omitempty"`
-	// Whether this job is a hyperparameter tuning job.
-	IsHyperparameterTuningJob bool `protobuf:"varint,4,opt,name=is_hyperparameter_tuning_job,json=isHyperparameterTuningJob" json:"is_hyperparameter_tuning_job,omitempty"`
-}
-
-func (m *TrainingOutput) Reset()                    { *m = TrainingOutput{} }
-func (m *TrainingOutput) String() string            { return proto.CompactTextString(m) }
-func (*TrainingOutput) ProtoMessage()               {}
-func (*TrainingOutput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *TrainingOutput) GetCompletedTrialCount() int64 {
-	if m != nil {
-		return m.CompletedTrialCount
-	}
-	return 0
-}
-
-func (m *TrainingOutput) GetTrials() []*HyperparameterOutput {
-	if m != nil {
-		return m.Trials
-	}
-	return nil
-}
-
-func (m *TrainingOutput) GetConsumedMlUnits() float64 {
-	if m != nil {
-		return m.ConsumedMlUnits
-	}
-	return 0
-}
-
-func (m *TrainingOutput) GetIsHyperparameterTuningJob() bool {
-	if m != nil {
-		return m.IsHyperparameterTuningJob
-	}
-	return false
-}
-
-// Represents input parameters for a prediction job.
-type PredictionInput struct {
-	// Required. The model or the version to use for prediction.
-	//
-	// Types that are valid to be assigned to ModelVersion:
-	//	*PredictionInput_ModelName
-	//	*PredictionInput_VersionName
-	//	*PredictionInput_Uri
-	ModelVersion isPredictionInput_ModelVersion `protobuf_oneof:"model_version"`
-	// Required. The format of the input data files.
-	DataFormat PredictionInput_DataFormat `protobuf:"varint,3,opt,name=data_format,json=dataFormat,enum=google.cloud.ml.v1beta1.PredictionInput_DataFormat" json:"data_format,omitempty"`
-	// Required. The Google Cloud Storage location of the input data files.
-	// May contain wildcards.
-	InputPaths []string `protobuf:"bytes,4,rep,name=input_paths,json=inputPaths" json:"input_paths,omitempty"`
-	// Required. The output Google Cloud Storage location.
-	OutputPath string `protobuf:"bytes,5,opt,name=output_path,json=outputPath" json:"output_path,omitempty"`
-	// Optional. The maximum number of workers to be used for parallel processing.
-	// Defaults to 10 if not specified.
-	MaxWorkerCount int64 `protobuf:"varint,6,opt,name=max_worker_count,json=maxWorkerCount" json:"max_worker_count,omitempty"`
-	// Required. The Google Compute Engine region to run the prediction job in.
-	Region string `protobuf:"bytes,7,opt,name=region" json:"region,omitempty"`
-	// Optional. The Google Cloud ML runtime version to use for this batch
-	// prediction. If not set, Google Cloud ML will pick the runtime version used
-	// during the CreateVersion request for this model version, or choose the
-	// latest stable version when model version information is not available
-	// such as when the model is specified by uri.
-	RuntimeVersion string `protobuf:"bytes,8,opt,name=runtime_version,json=runtimeVersion" json:"runtime_version,omitempty"`
-}
-
-func (m *PredictionInput) Reset()                    { *m = PredictionInput{} }
-func (m *PredictionInput) String() string            { return proto.CompactTextString(m) }
-func (*PredictionInput) ProtoMessage()               {}
-func (*PredictionInput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-type isPredictionInput_ModelVersion interface {
-	isPredictionInput_ModelVersion()
-}
-
-type PredictionInput_ModelName struct {
-	ModelName string `protobuf:"bytes,1,opt,name=model_name,json=modelName,oneof"`
-}
-type PredictionInput_VersionName struct {
-	VersionName string `protobuf:"bytes,2,opt,name=version_name,json=versionName,oneof"`
-}
-type PredictionInput_Uri struct {
-	Uri string `protobuf:"bytes,9,opt,name=uri,oneof"`
-}
-
-func (*PredictionInput_ModelName) isPredictionInput_ModelVersion()   {}
-func (*PredictionInput_VersionName) isPredictionInput_ModelVersion() {}
-func (*PredictionInput_Uri) isPredictionInput_ModelVersion()         {}
-
-func (m *PredictionInput) GetModelVersion() isPredictionInput_ModelVersion {
-	if m != nil {
-		return m.ModelVersion
-	}
-	return nil
-}
-
-func (m *PredictionInput) GetModelName() string {
-	if x, ok := m.GetModelVersion().(*PredictionInput_ModelName); ok {
-		return x.ModelName
-	}
-	return ""
-}
-
-func (m *PredictionInput) GetVersionName() string {
-	if x, ok := m.GetModelVersion().(*PredictionInput_VersionName); ok {
-		return x.VersionName
-	}
-	return ""
-}
-
-func (m *PredictionInput) GetUri() string {
-	if x, ok := m.GetModelVersion().(*PredictionInput_Uri); ok {
-		return x.Uri
-	}
-	return ""
-}
-
-func (m *PredictionInput) GetDataFormat() PredictionInput_DataFormat {
-	if m != nil {
-		return m.DataFormat
-	}
-	return PredictionInput_DATA_FORMAT_UNSPECIFIED
-}
-
-func (m *PredictionInput) GetInputPaths() []string {
-	if m != nil {
-		return m.InputPaths
-	}
-	return nil
-}
-
-func (m *PredictionInput) GetOutputPath() string {
-	if m != nil {
-		return m.OutputPath
-	}
-	return ""
-}
-
-func (m *PredictionInput) GetMaxWorkerCount() int64 {
-	if m != nil {
-		return m.MaxWorkerCount
-	}
-	return 0
-}
-
-func (m *PredictionInput) GetRegion() string {
-	if m != nil {
-		return m.Region
-	}
-	return ""
-}
-
-func (m *PredictionInput) GetRuntimeVersion() string {
-	if m != nil {
-		return m.RuntimeVersion
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PredictionInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PredictionInput_OneofMarshaler, _PredictionInput_OneofUnmarshaler, _PredictionInput_OneofSizer, []interface{}{
-		(*PredictionInput_ModelName)(nil),
-		(*PredictionInput_VersionName)(nil),
-		(*PredictionInput_Uri)(nil),
-	}
-}
-
-func _PredictionInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PredictionInput)
-	// model_version
-	switch x := m.ModelVersion.(type) {
-	case *PredictionInput_ModelName:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ModelName)
-	case *PredictionInput_VersionName:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.VersionName)
-	case *PredictionInput_Uri:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uri)
-	case nil:
-	default:
-		return fmt.Errorf("PredictionInput.ModelVersion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PredictionInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PredictionInput)
-	switch tag {
-	case 1: // model_version.model_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ModelVersion = &PredictionInput_ModelName{x}
-		return true, err
-	case 2: // model_version.version_name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ModelVersion = &PredictionInput_VersionName{x}
-		return true, err
-	case 9: // model_version.uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ModelVersion = &PredictionInput_Uri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PredictionInput_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PredictionInput)
-	// model_version
-	switch x := m.ModelVersion.(type) {
-	case *PredictionInput_ModelName:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.ModelName)))
-		n += len(x.ModelName)
-	case *PredictionInput_VersionName:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.VersionName)))
-		n += len(x.VersionName)
-	case *PredictionInput_Uri:
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Uri)))
-		n += len(x.Uri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Represents results of a prediction job.
-type PredictionOutput struct {
-	// The output Google Cloud Storage location provided at the job creation time.
-	OutputPath string `protobuf:"bytes,1,opt,name=output_path,json=outputPath" json:"output_path,omitempty"`
-	// The number of generated predictions.
-	PredictionCount int64 `protobuf:"varint,2,opt,name=prediction_count,json=predictionCount" json:"prediction_count,omitempty"`
-	// The number of data instances which resulted in errors.
-	ErrorCount int64 `protobuf:"varint,3,opt,name=error_count,json=errorCount" json:"error_count,omitempty"`
-	// Node hours used by the batch prediction job.
-	NodeHours float64 `protobuf:"fixed64,4,opt,name=node_hours,json=nodeHours" json:"node_hours,omitempty"`
-}
-
-func (m *PredictionOutput) Reset()                    { *m = PredictionOutput{} }
-func (m *PredictionOutput) String() string            { return proto.CompactTextString(m) }
-func (*PredictionOutput) ProtoMessage()               {}
-func (*PredictionOutput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *PredictionOutput) GetOutputPath() string {
-	if m != nil {
-		return m.OutputPath
-	}
-	return ""
-}
-
-func (m *PredictionOutput) GetPredictionCount() int64 {
-	if m != nil {
-		return m.PredictionCount
-	}
-	return 0
-}
-
-func (m *PredictionOutput) GetErrorCount() int64 {
-	if m != nil {
-		return m.ErrorCount
-	}
-	return 0
-}
-
-func (m *PredictionOutput) GetNodeHours() float64 {
-	if m != nil {
-		return m.NodeHours
-	}
-	return 0
-}
-
-// Represents a training or prediction job.
-type Job struct {
-	// Required. The user-specified id of the job.
-	JobId string `protobuf:"bytes,1,opt,name=job_id,json=jobId" json:"job_id,omitempty"`
-	// Required. Parameters to create a job.
-	//
-	// Types that are valid to be assigned to Input:
-	//	*Job_TrainingInput
-	//	*Job_PredictionInput
-	Input isJob_Input `protobuf_oneof:"input"`
-	// Output only. When the job was created.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// Output only. When the job processing was started.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
-	// Output only. When the job processing was completed.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
-	// Output only. The detailed state of a job.
-	State Job_State `protobuf:"varint,7,opt,name=state,enum=google.cloud.ml.v1beta1.Job_State" json:"state,omitempty"`
-	// Output only. The details of a failure or a cancellation.
-	ErrorMessage string `protobuf:"bytes,8,opt,name=error_message,json=errorMessage" json:"error_message,omitempty"`
-	// Output only. The current result of the job.
-	//
-	// Types that are valid to be assigned to Output:
-	//	*Job_TrainingOutput
-	//	*Job_PredictionOutput
-	Output isJob_Output `protobuf_oneof:"output"`
-}
-
-func (m *Job) Reset()                    { *m = Job{} }
-func (m *Job) String() string            { return proto.CompactTextString(m) }
-func (*Job) ProtoMessage()               {}
-func (*Job) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-type isJob_Input interface {
-	isJob_Input()
-}
-type isJob_Output interface {
-	isJob_Output()
-}
-
-type Job_TrainingInput struct {
-	TrainingInput *TrainingInput `protobuf:"bytes,2,opt,name=training_input,json=trainingInput,oneof"`
-}
-type Job_PredictionInput struct {
-	PredictionInput *PredictionInput `protobuf:"bytes,3,opt,name=prediction_input,json=predictionInput,oneof"`
-}
-type Job_TrainingOutput struct {
-	TrainingOutput *TrainingOutput `protobuf:"bytes,9,opt,name=training_output,json=trainingOutput,oneof"`
-}
-type Job_PredictionOutput struct {
-	PredictionOutput *PredictionOutput `protobuf:"bytes,10,opt,name=prediction_output,json=predictionOutput,oneof"`
-}
-
-func (*Job_TrainingInput) isJob_Input()     {}
-func (*Job_PredictionInput) isJob_Input()   {}
-func (*Job_TrainingOutput) isJob_Output()   {}
-func (*Job_PredictionOutput) isJob_Output() {}
-
-func (m *Job) GetInput() isJob_Input {
-	if m != nil {
-		return m.Input
-	}
-	return nil
-}
-func (m *Job) GetOutput() isJob_Output {
-	if m != nil {
-		return m.Output
-	}
-	return nil
-}
-
-func (m *Job) GetJobId() string {
-	if m != nil {
-		return m.JobId
-	}
-	return ""
-}
-
-func (m *Job) GetTrainingInput() *TrainingInput {
-	if x, ok := m.GetInput().(*Job_TrainingInput); ok {
-		return x.TrainingInput
-	}
-	return nil
-}
-
-func (m *Job) GetPredictionInput() *PredictionInput {
-	if x, ok := m.GetInput().(*Job_PredictionInput); ok {
-		return x.PredictionInput
-	}
-	return nil
-}
-
-func (m *Job) GetCreateTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-func (m *Job) GetStartTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.StartTime
-	}
-	return nil
-}
-
-func (m *Job) GetEndTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.EndTime
-	}
-	return nil
-}
-
-func (m *Job) GetState() Job_State {
-	if m != nil {
-		return m.State
-	}
-	return Job_STATE_UNSPECIFIED
-}
-
-func (m *Job) GetErrorMessage() string {
-	if m != nil {
-		return m.ErrorMessage
-	}
-	return ""
-}
-
-func (m *Job) GetTrainingOutput() *TrainingOutput {
-	if x, ok := m.GetOutput().(*Job_TrainingOutput); ok {
-		return x.TrainingOutput
-	}
-	return nil
-}
-
-func (m *Job) GetPredictionOutput() *PredictionOutput {
-	if x, ok := m.GetOutput().(*Job_PredictionOutput); ok {
-		return x.PredictionOutput
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Job) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Job_OneofMarshaler, _Job_OneofUnmarshaler, _Job_OneofSizer, []interface{}{
-		(*Job_TrainingInput)(nil),
-		(*Job_PredictionInput)(nil),
-		(*Job_TrainingOutput)(nil),
-		(*Job_PredictionOutput)(nil),
-	}
-}
-
-func _Job_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Job)
-	// input
-	switch x := m.Input.(type) {
-	case *Job_TrainingInput:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TrainingInput); err != nil {
-			return err
-		}
-	case *Job_PredictionInput:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PredictionInput); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Job.Input has unexpected type %T", x)
-	}
-	// output
-	switch x := m.Output.(type) {
-	case *Job_TrainingOutput:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TrainingOutput); err != nil {
-			return err
-		}
-	case *Job_PredictionOutput:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PredictionOutput); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Job.Output has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Job_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Job)
-	switch tag {
-	case 2: // input.training_input
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TrainingInput)
-		err := b.DecodeMessage(msg)
-		m.Input = &Job_TrainingInput{msg}
-		return true, err
-	case 3: // input.prediction_input
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PredictionInput)
-		err := b.DecodeMessage(msg)
-		m.Input = &Job_PredictionInput{msg}
-		return true, err
-	case 9: // output.training_output
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TrainingOutput)
-		err := b.DecodeMessage(msg)
-		m.Output = &Job_TrainingOutput{msg}
-		return true, err
-	case 10: // output.prediction_output
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PredictionOutput)
-		err := b.DecodeMessage(msg)
-		m.Output = &Job_PredictionOutput{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Job_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Job)
-	// input
-	switch x := m.Input.(type) {
-	case *Job_TrainingInput:
-		s := proto.Size(x.TrainingInput)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_PredictionInput:
-		s := proto.Size(x.PredictionInput)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// output
-	switch x := m.Output.(type) {
-	case *Job_TrainingOutput:
-		s := proto.Size(x.TrainingOutput)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Job_PredictionOutput:
-		s := proto.Size(x.PredictionOutput)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Request message for the CreateJob method.
-type CreateJobRequest struct {
-	// Required. The project name.
-	//
-	// Authorization: requires `Editor` role on the specified project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Required. The job to create.
-	Job *Job `protobuf:"bytes,2,opt,name=job" json:"job,omitempty"`
-}
-
-func (m *CreateJobRequest) Reset()                    { *m = CreateJobRequest{} }
-func (m *CreateJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateJobRequest) ProtoMessage()               {}
-func (*CreateJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *CreateJobRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *CreateJobRequest) GetJob() *Job {
-	if m != nil {
-		return m.Job
-	}
-	return nil
-}
-
-// Request message for the ListJobs method.
-type ListJobsRequest struct {
-	// Required. The name of the project for which to list jobs.
-	//
-	// Authorization: requires `Viewer` role on the specified project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Optional. Specifies the subset of jobs to retrieve.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
-	// Optional. A page token to request the next page of results.
-	//
-	// You get the token from the `next_page_token` field of the response from
-	// the previous call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
-	// Optional. The number of jobs to retrieve per "page" of results. If there
-	// are more remaining results than this number, the response message will
-	// contain a valid value in the `next_page_token` field.
-	//
-	// The default value is 20, and the maximum page size is 100.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
-}
-
-func (m *ListJobsRequest) Reset()                    { *m = ListJobsRequest{} }
-func (m *ListJobsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListJobsRequest) ProtoMessage()               {}
-func (*ListJobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-func (m *ListJobsRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *ListJobsRequest) GetFilter() string {
-	if m != nil {
-		return m.Filter
-	}
-	return ""
-}
-
-func (m *ListJobsRequest) GetPageToken() string {
-	if m != nil {
-		return m.PageToken
-	}
-	return ""
-}
-
-func (m *ListJobsRequest) GetPageSize() int32 {
-	if m != nil {
-		return m.PageSize
-	}
-	return 0
-}
-
-// Response message for the ListJobs method.
-type ListJobsResponse struct {
-	// The list of jobs.
-	Jobs []*Job `protobuf:"bytes,1,rep,name=jobs" json:"jobs,omitempty"`
-	// Optional. Pass this token as the `page_token` field of the request for a
-	// subsequent call.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
-}
-
-func (m *ListJobsResponse) Reset()                    { *m = ListJobsResponse{} }
-func (m *ListJobsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListJobsResponse) ProtoMessage()               {}
-func (*ListJobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-func (m *ListJobsResponse) GetJobs() []*Job {
-	if m != nil {
-		return m.Jobs
-	}
-	return nil
-}
-
-func (m *ListJobsResponse) GetNextPageToken() string {
-	if m != nil {
-		return m.NextPageToken
-	}
-	return ""
-}
-
-// Request message for the GetJob method.
-type GetJobRequest struct {
-	// Required. The name of the job to get the description of.
-	//
-	// Authorization: requires `Viewer` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *GetJobRequest) Reset()                    { *m = GetJobRequest{} }
-func (m *GetJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetJobRequest) ProtoMessage()               {}
-func (*GetJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-func (m *GetJobRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Request message for the CancelJob method.
-type CancelJobRequest struct {
-	// Required. The name of the job to cancel.
-	//
-	// Authorization: requires `Editor` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *CancelJobRequest) Reset()                    { *m = CancelJobRequest{} }
-func (m *CancelJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelJobRequest) ProtoMessage()               {}
-func (*CancelJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-func (m *CancelJobRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*TrainingInput)(nil), "google.cloud.ml.v1beta1.TrainingInput")
-	proto.RegisterType((*HyperparameterSpec)(nil), "google.cloud.ml.v1beta1.HyperparameterSpec")
-	proto.RegisterType((*ParameterSpec)(nil), "google.cloud.ml.v1beta1.ParameterSpec")
-	proto.RegisterType((*HyperparameterOutput)(nil), "google.cloud.ml.v1beta1.HyperparameterOutput")
-	proto.RegisterType((*HyperparameterOutput_HyperparameterMetric)(nil), "google.cloud.ml.v1beta1.HyperparameterOutput.HyperparameterMetric")
-	proto.RegisterType((*TrainingOutput)(nil), "google.cloud.ml.v1beta1.TrainingOutput")
-	proto.RegisterType((*PredictionInput)(nil), "google.cloud.ml.v1beta1.PredictionInput")
-	proto.RegisterType((*PredictionOutput)(nil), "google.cloud.ml.v1beta1.PredictionOutput")
-	proto.RegisterType((*Job)(nil), "google.cloud.ml.v1beta1.Job")
-	proto.RegisterType((*CreateJobRequest)(nil), "google.cloud.ml.v1beta1.CreateJobRequest")
-	proto.RegisterType((*ListJobsRequest)(nil), "google.cloud.ml.v1beta1.ListJobsRequest")
-	proto.RegisterType((*ListJobsResponse)(nil), "google.cloud.ml.v1beta1.ListJobsResponse")
-	proto.RegisterType((*GetJobRequest)(nil), "google.cloud.ml.v1beta1.GetJobRequest")
-	proto.RegisterType((*CancelJobRequest)(nil), "google.cloud.ml.v1beta1.CancelJobRequest")
-	proto.RegisterEnum("google.cloud.ml.v1beta1.TrainingInput_ScaleTier", TrainingInput_ScaleTier_name, TrainingInput_ScaleTier_value)
-	proto.RegisterEnum("google.cloud.ml.v1beta1.HyperparameterSpec_GoalType", HyperparameterSpec_GoalType_name, HyperparameterSpec_GoalType_value)
-	proto.RegisterEnum("google.cloud.ml.v1beta1.ParameterSpec_ParameterType", ParameterSpec_ParameterType_name, ParameterSpec_ParameterType_value)
-	proto.RegisterEnum("google.cloud.ml.v1beta1.ParameterSpec_ScaleType", ParameterSpec_ScaleType_name, ParameterSpec_ScaleType_value)
-	proto.RegisterEnum("google.cloud.ml.v1beta1.PredictionInput_DataFormat", PredictionInput_DataFormat_name, PredictionInput_DataFormat_value)
-	proto.RegisterEnum("google.cloud.ml.v1beta1.Job_State", Job_State_name, Job_State_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for JobService service
-
-type JobServiceClient interface {
-	// Creates a training or a batch prediction job.
-	CreateJob(ctx context.Context, in *CreateJobRequest, opts ...grpc.CallOption) (*Job, error)
-	// Lists the jobs in the project.
-	ListJobs(ctx context.Context, in *ListJobsRequest, opts ...grpc.CallOption) (*ListJobsResponse, error)
-	// Describes a job.
-	GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error)
-	// Cancels a running job.
-	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
-}
-
-type jobServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewJobServiceClient(cc *grpc.ClientConn) JobServiceClient {
-	return &jobServiceClient{cc}
-}
-
-func (c *jobServiceClient) CreateJob(ctx context.Context, in *CreateJobRequest, opts ...grpc.CallOption) (*Job, error) {
-	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.JobService/CreateJob", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) ListJobs(ctx context.Context, in *ListJobsRequest, opts ...grpc.CallOption) (*ListJobsResponse, error) {
-	out := new(ListJobsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.JobService/ListJobs", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error) {
-	out := new(Job)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.JobService/GetJob", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *jobServiceClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.JobService/CancelJob", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for JobService service
-
-type JobServiceServer interface {
-	// Creates a training or a batch prediction job.
-	CreateJob(context.Context, *CreateJobRequest) (*Job, error)
-	// Lists the jobs in the project.
-	ListJobs(context.Context, *ListJobsRequest) (*ListJobsResponse, error)
-	// Describes a job.
-	GetJob(context.Context, *GetJobRequest) (*Job, error)
-	// Cancels a running job.
-	CancelJob(context.Context, *CancelJobRequest) (*google_protobuf1.Empty, error)
-}
-
-func RegisterJobServiceServer(s *grpc.Server, srv JobServiceServer) {
-	s.RegisterService(&_JobService_serviceDesc, srv)
-}
-
-func _JobService_CreateJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).CreateJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.JobService/CreateJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).CreateJob(ctx, req.(*CreateJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_ListJobs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListJobsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).ListJobs(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.JobService/ListJobs",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).ListJobs(ctx, req.(*ListJobsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_GetJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).GetJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.JobService/GetJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).GetJob(ctx, req.(*GetJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _JobService_CancelJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CancelJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(JobServiceServer).CancelJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.JobService/CancelJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(JobServiceServer).CancelJob(ctx, req.(*CancelJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _JobService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.ml.v1beta1.JobService",
-	HandlerType: (*JobServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "CreateJob",
-			Handler:    _JobService_CreateJob_Handler,
-		},
-		{
-			MethodName: "ListJobs",
-			Handler:    _JobService_ListJobs_Handler,
-		},
-		{
-			MethodName: "GetJob",
-			Handler:    _JobService_GetJob_Handler,
-		},
-		{
-			MethodName: "CancelJob",
-			Handler:    _JobService_CancelJob_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/ml/v1beta1/job_service.proto",
-}
-
-func init() { proto.RegisterFile("google/cloud/ml/v1beta1/job_service.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 2082 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4b, 0x6f, 0x1b, 0xc9,
-	0x11, 0x16, 0x9f, 0x22, 0x8b, 0x12, 0x39, 0x6e, 0x5b, 0x36, 0x2d, 0x7b, 0x63, 0x79, 0x8c, 0x78,
-	0x65, 0x07, 0x26, 0xd7, 0xf2, 0x06, 0xd8, 0xf5, 0x22, 0x09, 0x28, 0x72, 0x2c, 0x51, 0x10, 0x1f,
-	0x69, 0x0e, 0x1d, 0xc7, 0x08, 0x30, 0x68, 0x92, 0x6d, 0x7a, 0xe4, 0x99, 0xe9, 0xc9, 0x4c, 0xd3,
-	0x91, 0x36, 0x30, 0x10, 0x24, 0x39, 0xe5, 0x90, 0x4b, 0x90, 0x1c, 0x03, 0xe4, 0x9a, 0xbf, 0x93,
-	0x43, 0xfe, 0x40, 0x8e, 0xf9, 0x01, 0x39, 0x06, 0xfd, 0xe0, 0x53, 0x96, 0xe4, 0x45, 0x72, 0x63,
-	0x7f, 0xf5, 0x55, 0x55, 0x77, 0x55, 0x75, 0x4d, 0x35, 0xe1, 0xd1, 0x98, 0xb1, 0xb1, 0x47, 0xab,
-	0x43, 0x8f, 0x4d, 0x46, 0x55, 0xdf, 0xab, 0xbe, 0x7f, 0x3a, 0xa0, 0x9c, 0x3c, 0xad, 0x9e, 0xb0,
-	0x81, 0x13, 0xd3, 0xe8, 0xbd, 0x3b, 0xa4, 0x95, 0x30, 0x62, 0x9c, 0xa1, 0x5b, 0x8a, 0x5a, 0x91,
-	0xd4, 0x8a, 0xef, 0x55, 0x34, 0x75, 0xfb, 0xae, 0xb6, 0x41, 0x42, 0xb7, 0x4a, 0x82, 0x80, 0x71,
-	0xc2, 0x5d, 0x16, 0xc4, 0x4a, 0x6d, 0x7b, 0x6b, 0x51, 0x3a, 0xe1, 0x6f, 0x35, 0x7c, 0x47, 0xc3,
-	0x72, 0x35, 0x98, 0xbc, 0xa9, 0x52, 0x3f, 0xe4, 0x67, 0x5a, 0x78, 0x6f, 0x55, 0xc8, 0x5d, 0x9f,
-	0xc6, 0x9c, 0xf8, 0xa1, 0x22, 0x98, 0x7f, 0xcc, 0xc0, 0xa6, 0x1d, 0x11, 0x37, 0x70, 0x83, 0x71,
-	0x33, 0x08, 0x27, 0x1c, 0x75, 0x00, 0xe2, 0x21, 0xf1, 0xa8, 0xc3, 0x5d, 0x1a, 0x95, 0x13, 0x3b,
-	0x89, 0xdd, 0xe2, 0xde, 0x17, 0x95, 0x0b, 0xb6, 0x5c, 0x59, 0xd2, 0xad, 0xf4, 0x84, 0xa2, 0xed,
-	0xd2, 0x08, 0xe7, 0xe3, 0xe9, 0x4f, 0x74, 0x0f, 0x0a, 0x3e, 0x89, 0x39, 0x8d, 0x1c, 0x7e, 0x16,
-	0xd2, 0x72, 0x72, 0x27, 0xb1, 0x9b, 0xc7, 0xa0, 0x20, 0xfb, 0x2c, 0xa4, 0x82, 0xf0, 0x2b, 0x16,
-	0xbd, 0x9b, 0x12, 0x52, 0x8a, 0xa0, 0x20, 0x49, 0xd8, 0x83, 0xad, 0x90, 0x44, 0xc4, 0xa7, 0xc2,
-	0x88, 0x88, 0xe5, 0x94, 0x9a, 0x96, 0xd4, 0xeb, 0x33, 0x61, 0x4f, 0xca, 0xa4, 0xce, 0x7d, 0xd8,
-	0xd0, 0x46, 0x87, 0x6c, 0x12, 0xf0, 0x72, 0x66, 0x27, 0xb1, 0x9b, 0xc2, 0xda, 0x51, 0x5d, 0x40,
-	0xe8, 0x4b, 0xb8, 0x79, 0xce, 0xac, 0x22, 0x67, 0x25, 0xf9, 0xc6, 0x8a, 0x5d, 0xa5, 0x75, 0x1f,
-	0x36, 0x42, 0x32, 0x7c, 0x47, 0xc6, 0xd4, 0x99, 0x44, 0x6e, 0x5c, 0x5e, 0xdf, 0x49, 0xed, 0xe6,
-	0x71, 0x41, 0x63, 0xfd, 0xc8, 0x8d, 0xd1, 0x03, 0xd8, 0x0c, 0xcf, 0xf8, 0x5b, 0x16, 0x38, 0x3e,
-	0x1b, 0x4d, 0x3c, 0x5a, 0xce, 0xc9, 0x7d, 0x6e, 0x28, 0xb0, 0x25, 0x31, 0x84, 0x20, 0x4d, 0xa2,
-	0x71, 0x5c, 0x06, 0xa9, 0x2f, 0x7f, 0xa3, 0x3e, 0x94, 0xde, 0x9e, 0x85, 0x34, 0x9a, 0x39, 0x8e,
-	0xcb, 0x1b, 0x3b, 0x89, 0xdd, 0xc2, 0xde, 0x0f, 0x2e, 0x4c, 0xc0, 0xe1, 0x12, 0xbf, 0x17, 0xd2,
-	0x21, 0x5e, 0xb5, 0x81, 0x6e, 0x42, 0x36, 0xa2, 0x63, 0x97, 0x05, 0xe5, 0xa2, 0xdc, 0x88, 0x5e,
-	0xa1, 0x5b, 0xb0, 0x2e, 0xaa, 0x73, 0xe4, 0x46, 0x65, 0x43, 0x09, 0x4e, 0xd8, 0xa0, 0xe1, 0x46,
-	0xe8, 0x73, 0x28, 0x45, 0x93, 0x40, 0xd4, 0x8a, 0xf3, 0x9e, 0x46, 0xb1, 0xd0, 0x2c, 0x49, 0x42,
-	0x51, 0xc3, 0x2f, 0x15, 0x6a, 0x76, 0x21, 0x3f, 0xcb, 0x39, 0xca, 0x43, 0x66, 0xbf, 0xd6, 0x6b,
-	0xd6, 0x8d, 0x35, 0x54, 0x04, 0xe8, 0xd9, 0xb5, 0x76, 0xa3, 0x86, 0x1b, 0xce, 0x53, 0x23, 0x81,
-	0x36, 0x21, 0xdf, 0xc5, 0x56, 0xab, 0xd9, 0x6f, 0x39, 0x4f, 0x8d, 0x94, 0x58, 0x4a, 0xa6, 0x73,
-	0xd0, 0xed, 0x1b, 0x59, 0x04, 0x90, 0xad, 0xf7, 0x7b, 0x76, 0xa7, 0x65, 0x64, 0xcc, 0x7f, 0x27,
-	0x01, 0x9d, 0x3f, 0x13, 0x3a, 0x84, 0xf4, 0x98, 0x11, 0x4f, 0xd7, 0xe3, 0x97, 0xdf, 0x21, 0x1c,
-	0x95, 0x03, 0x46, 0x3c, 0x51, 0x12, 0x58, 0x5a, 0x40, 0x3f, 0x86, 0xac, 0x94, 0xc7, 0xe5, 0xe4,
-	0x4e, 0x6a, 0xb7, 0xb0, 0xf7, 0xf0, 0x42, 0x5b, 0xdd, 0xa5, 0xa8, 0x6a, 0x2d, 0xf4, 0x19, 0x80,
-	0x4f, 0x4e, 0x1d, 0x1e, 0xb9, 0xc4, 0x8b, 0x65, 0xb1, 0x66, 0x70, 0xde, 0x27, 0xa7, 0xb6, 0x04,
-	0x50, 0x05, 0xae, 0x0b, 0xb1, 0x20, 0x7b, 0x1e, 0xf5, 0xa6, 0xbc, 0xb4, 0xe4, 0x5d, 0xf3, 0xc9,
-	0x69, 0x57, 0x4b, 0x34, 0xff, 0x39, 0xdc, 0x5e, 0x4e, 0x97, 0xe3, 0x53, 0x1e, 0xb9, 0x43, 0x87,
-	0x93, 0xb1, 0x2c, 0xda, 0x3c, 0xbe, 0xb5, 0x4c, 0x68, 0x49, 0xb9, 0x4d, 0xc6, 0x66, 0x0d, 0x72,
-	0xd3, 0xc3, 0xa1, 0xdb, 0xb0, 0x75, 0xd0, 0xa9, 0x1d, 0x3b, 0xf6, 0xcf, 0xbb, 0x96, 0xd3, 0x6f,
-	0xf7, 0xba, 0x56, 0xbd, 0xf9, 0xa2, 0x69, 0x35, 0x8c, 0x35, 0xb4, 0x01, 0xb9, 0x56, 0xed, 0x55,
-	0xb3, 0xd5, 0x7c, 0x6d, 0x19, 0x09, 0xb9, 0x6a, 0xb6, 0xd5, 0x2a, 0x69, 0xfe, 0x3d, 0x0d, 0x9b,
-	0x4b, 0xe7, 0x44, 0xdf, 0x87, 0xe2, 0x7c, 0x2f, 0x01, 0xf1, 0xa9, 0x8c, 0x79, 0x1e, 0x6f, 0xce,
-	0xd0, 0x36, 0xf1, 0xa9, 0x48, 0xc8, 0xec, 0x0a, 0x5e, 0x96, 0x90, 0x25, 0xe3, 0xf3, 0x95, 0x4a,
-	0x88, 0xb0, 0x80, 0xee, 0x40, 0xde, 0x77, 0x03, 0xe7, 0x3d, 0xf1, 0x26, 0xaa, 0x3b, 0x24, 0x70,
-	0xce, 0x77, 0x83, 0x97, 0x62, 0x2d, 0x85, 0xe4, 0x54, 0x0b, 0x53, 0x5a, 0x48, 0x4e, 0x95, 0xf0,
-	0x09, 0xa0, 0x21, 0xe1, 0x74, 0xcc, 0x22, 0x77, 0x48, 0x3c, 0x45, 0x8a, 0xcb, 0x19, 0x79, 0xa1,
-	0xae, 0x2d, 0x48, 0x24, 0x3b, 0x16, 0x55, 0x3d, 0x72, 0xe3, 0x61, 0x44, 0x39, 0x9d, 0x72, 0xb3,
-	0x3b, 0xa9, 0xdd, 0x04, 0x2e, 0x4e, 0x61, 0x4d, 0x9c, 0xb7, 0x40, 0x71, 0xc2, 0xf5, 0x2b, 0x5a,
-	0xe0, 0xf2, 0x09, 0xd5, 0x75, 0x10, 0xa7, 0xd3, 0x2d, 0xf0, 0x2c, 0xa4, 0xe6, 0x78, 0x21, 0xc8,
-	0x32, 0x5b, 0xdf, 0x83, 0xed, 0x6e, 0x0d, 0xd7, 0x5a, 0x96, 0x6d, 0xe1, 0x8f, 0xa5, 0x0c, 0x20,
-	0xdb, 0xe8, 0xf4, 0xf7, 0x8f, 0x45, 0xc2, 0x0a, 0xb0, 0xde, 0x6c, 0xdb, 0xd6, 0x81, 0x85, 0x8d,
-	0x24, 0x2a, 0x41, 0xa1, 0x5e, 0xb3, 0xad, 0x83, 0x0e, 0x6e, 0xd6, 0x6b, 0xc7, 0x46, 0x4a, 0xa4,
-	0xb3, 0xd1, 0xec, 0xd5, 0xb1, 0x65, 0x5b, 0x46, 0xda, 0xfc, 0xc5, 0xf4, 0x3e, 0x0a, 0x27, 0x39,
-	0x48, 0xb7, 0x3b, 0x6d, 0xcb, 0x58, 0x43, 0x5b, 0x70, 0xad, 0xdf, 0x6e, 0xda, 0xce, 0x71, 0xb3,
-	0x6d, 0xd5, 0xb0, 0xd3, 0xab, 0xd7, 0xa4, 0x65, 0x04, 0x45, 0x05, 0x77, 0x0e, 0x34, 0x96, 0x44,
-	0xdb, 0x70, 0x53, 0x62, 0xd8, 0x7a, 0x69, 0xe1, 0x9e, 0xb5, 0x20, 0x4b, 0x99, 0x7f, 0x4e, 0xc3,
-	0x8d, 0xe5, 0x0b, 0xd6, 0x99, 0x70, 0xf1, 0xcd, 0xb8, 0x0d, 0x39, 0x59, 0xe7, 0x8e, 0x3b, 0xd2,
-	0xd5, 0xb2, 0x2e, 0xd7, 0xcd, 0x11, 0xf2, 0xce, 0xb7, 0x34, 0x75, 0xef, 0xf6, 0x3f, 0xf1, 0x0e,
-	0x2b, 0x17, 0x2b, 0x60, 0x6c, 0x05, 0x3c, 0x3a, 0x3b, 0xdf, 0xe9, 0x28, 0x6c, 0xbc, 0x71, 0x03,
-	0xe2, 0xe9, 0x4b, 0x24, 0x2b, 0xe6, 0x7f, 0x74, 0xa5, 0xae, 0x1b, 0x2e, 0x48, 0xbb, 0x6a, 0x81,
-	0x86, 0x50, 0x20, 0xde, 0xd4, 0x89, 0xb8, 0xdc, 0xa9, 0xff, 0x93, 0x17, 0x20, 0x9e, 0xf6, 0x11,
-	0x6f, 0x8f, 0x56, 0x83, 0xad, 0x9d, 0x3f, 0x80, 0x4d, 0xae, 0xbf, 0xba, 0x4e, 0xcc, 0x69, 0x28,
-	0x23, 0x9e, 0xc2, 0x1b, 0x53, 0xb0, 0xc7, 0x69, 0x28, 0x6a, 0x9d, 0x0d, 0x4e, 0xe8, 0x90, 0xbb,
-	0xef, 0xe9, 0xd2, 0xd5, 0x2a, 0xce, 0x60, 0x59, 0xec, 0xdb, 0xfb, 0xab, 0x5e, 0x54, 0x68, 0x91,
-	0x01, 0xa9, 0x77, 0xf4, 0x4c, 0x67, 0x53, 0xfc, 0x44, 0x37, 0x20, 0x33, 0x37, 0x94, 0xc7, 0x6a,
-	0xf1, 0x3c, 0xf9, 0x55, 0xc2, 0xfc, 0x4f, 0x02, 0x8a, 0xd3, 0x41, 0x40, 0x57, 0xc4, 0x1e, 0x6c,
-	0x0d, 0x99, 0x1f, 0x7a, 0x94, 0xd3, 0x91, 0xea, 0x81, 0xfa, 0xd3, 0xaa, 0x36, 0x7b, 0x7d, 0x26,
-	0x94, 0x6d, 0x50, 0x7d, 0x59, 0x2d, 0xc8, 0xea, 0x6e, 0xa9, 0x2a, 0xe4, 0xc9, 0x77, 0x0a, 0x28,
-	0xd6, 0xca, 0xe8, 0x31, 0x5c, 0x1b, 0xb2, 0x20, 0x9e, 0xf8, 0x74, 0xe4, 0xf8, 0x9e, 0x33, 0x09,
-	0x5c, 0x1e, 0xeb, 0xd6, 0x51, 0x9a, 0x0a, 0x5a, 0x5e, 0x5f, 0xc0, 0xe8, 0x27, 0x70, 0xd7, 0x8d,
-	0x9d, 0x95, 0x06, 0xcc, 0x27, 0x32, 0xb6, 0x27, 0x6c, 0x20, 0xbb, 0x5b, 0x0e, 0xdf, 0x76, 0xe3,
-	0x65, 0x8f, 0xb6, 0x64, 0x1c, 0xb1, 0x81, 0xf9, 0xcf, 0x14, 0x94, 0xba, 0x11, 0x1d, 0xb9, 0x43,
-	0x31, 0xaa, 0xa9, 0x09, 0xea, 0x1e, 0x80, 0xcf, 0x46, 0xd4, 0x5b, 0xe8, 0x9e, 0x87, 0x6b, 0x38,
-	0x2f, 0x31, 0xd9, 0x3b, 0x1f, 0xc0, 0x86, 0xfe, 0xac, 0x2a, 0x4a, 0x52, 0x53, 0x0a, 0x1a, 0x95,
-	0x24, 0x04, 0xa9, 0x49, 0xe4, 0x96, 0xf3, 0x5a, 0x26, 0x16, 0xc8, 0x86, 0xc2, 0x88, 0x70, 0xe2,
-	0xbc, 0x61, 0x91, 0x4f, 0xb8, 0x3c, 0x54, 0x71, 0xef, 0xd9, 0xc5, 0x9d, 0x69, 0x79, 0x63, 0x95,
-	0x06, 0xe1, 0xe4, 0x85, 0x54, 0xc5, 0x30, 0x9a, 0xfd, 0x16, 0xf3, 0x97, 0x2b, 0xe4, 0x4e, 0x48,
-	0xf8, 0x5b, 0x55, 0xcd, 0x79, 0x0c, 0x12, 0xea, 0x0a, 0x44, 0x10, 0x98, 0x8c, 0xb1, 0x64, 0xe8,
-	0xaf, 0x12, 0x28, 0x48, 0x30, 0xd0, 0x2e, 0x18, 0xa2, 0x4b, 0x2f, 0x0d, 0x5c, 0x6a, 0x86, 0x2a,
-	0xfa, 0xe4, 0xf4, 0x67, 0x0b, 0x33, 0xd7, 0x7c, 0x14, 0x59, 0x5f, 0x1a, 0x45, 0x3e, 0x32, 0x71,
-	0xe4, 0x3e, 0x3a, 0x71, 0xbc, 0x04, 0x98, 0x1f, 0x03, 0xdd, 0x81, 0x5b, 0x8d, 0x9a, 0x5d, 0x73,
-	0x5e, 0x74, 0x70, 0xab, 0x66, 0xaf, 0x34, 0xd1, 0x1c, 0xa4, 0x6d, 0xeb, 0x95, 0xad, 0xc6, 0x0f,
-	0xfb, 0x85, 0x83, 0xad, 0x7a, 0x07, 0x37, 0x8c, 0xa4, 0xe8, 0x7b, 0xb3, 0xa5, 0x73, 0xf0, 0xba,
-	0xd9, 0x35, 0x52, 0xfb, 0x25, 0xd8, 0x54, 0x49, 0xd3, 0xee, 0xcd, 0xbf, 0x26, 0xc0, 0x98, 0x07,
-	0x50, 0x97, 0xf5, 0x4a, 0x24, 0x12, 0xe7, 0x22, 0xf1, 0x08, 0x8c, 0x70, 0xa6, 0xa4, 0x23, 0x91,
-	0x94, 0x91, 0x28, 0xcd, 0x71, 0x15, 0x8a, 0x7b, 0x50, 0xa0, 0x51, 0xc4, 0xa6, 0xf1, 0x4a, 0x49,
-	0x16, 0x48, 0x48, 0x11, 0x3e, 0x03, 0x08, 0xd8, 0x88, 0x3a, 0x6f, 0xd9, 0x24, 0x52, 0x13, 0x44,
-	0x02, 0xe7, 0x05, 0x72, 0x28, 0x00, 0xf3, 0x2f, 0x59, 0x48, 0x1d, 0xb1, 0x01, 0xda, 0x02, 0x31,
-	0xb6, 0xcd, 0x5b, 0x6f, 0xe6, 0x84, 0x0d, 0x9a, 0x23, 0xd4, 0x81, 0xe2, 0xac, 0x4d, 0xc8, 0x5c,
-	0xca, 0x7d, 0x5c, 0x36, 0xef, 0x2c, 0xcd, 0xf2, 0x87, 0x6b, 0x78, 0xd6, 0x66, 0x54, 0x59, 0xf7,
-	0x97, 0x8e, 0xa6, 0x4c, 0xaa, 0xfe, 0xba, 0xfb, 0xa9, 0x15, 0x78, 0xb8, 0xb6, 0x18, 0x06, 0x65,
-	0xf6, 0x1b, 0x28, 0x0c, 0x23, 0x4a, 0xb8, 0x78, 0x70, 0xf8, 0x6a, 0x9e, 0x28, 0xec, 0x6d, 0x4f,
-	0x2d, 0x4e, 0x1f, 0x2e, 0x15, 0x7b, 0xfa, 0x70, 0xc1, 0xa0, 0xe8, 0x02, 0x40, 0x5f, 0x03, 0xc4,
-	0x9c, 0x44, 0x5c, 0xe9, 0x66, 0xae, 0xd4, 0xcd, 0x4b, 0xb6, 0x54, 0xfd, 0x21, 0xe4, 0x68, 0x30,
-	0x52, 0x8a, 0xd9, 0x2b, 0x15, 0xd7, 0x69, 0x30, 0x92, 0x6a, 0x5f, 0x41, 0x26, 0xe6, 0x84, 0x4f,
-	0xc7, 0x02, 0xf3, 0xc2, 0xa3, 0x1f, 0xb1, 0x41, 0xa5, 0x27, 0x98, 0x58, 0x29, 0x88, 0xbe, 0xad,
-	0xf2, 0xed, 0xd3, 0x38, 0x26, 0xe3, 0xd9, 0xab, 0x40, 0x82, 0x2d, 0x85, 0x21, 0x0c, 0xa5, 0x59,
-	0xd6, 0x54, 0x59, 0xc9, 0x0e, 0x50, 0xd8, 0xfb, 0xfc, 0xca, 0xb4, 0xa9, 0x12, 0x3d, 0x4c, 0xe0,
-	0x59, 0xde, 0x75, 0xd1, 0xbe, 0x82, 0x6b, 0x0b, 0x89, 0xd3, 0x56, 0x41, 0x5a, 0x7d, 0xf4, 0x09,
-	0x99, 0x9b, 0xd9, 0x5d, 0x48, 0xbf, 0xc2, 0xcc, 0xdf, 0x24, 0x20, 0x23, 0xcf, 0x28, 0x26, 0x8c,
-	0x9e, 0x5d, 0xb3, 0x3f, 0x32, 0xc7, 0xfc, 0xb4, 0x6f, 0xf5, 0xad, 0xc6, 0xec, 0x0d, 0xd0, 0xad,
-	0xe1, 0x66, 0xfb, 0xc0, 0x48, 0x8a, 0xb1, 0x06, 0xf7, 0xdb, 0x6d, 0xb1, 0x90, 0x0f, 0x82, 0x5e,
-	0xbf, 0x5e, 0xb7, 0xac, 0x86, 0xd5, 0x30, 0xd2, 0x42, 0xed, 0x45, 0xad, 0x79, 0x6c, 0x35, 0x8c,
-	0x8c, 0x78, 0x4a, 0xd4, 0x6b, 0xed, 0xba, 0x75, 0x7c, 0x2c, 0xa8, 0x59, 0x41, 0xd5, 0x6b, 0xab,
-	0x61, 0xac, 0xef, 0xaf, 0x43, 0x46, 0x96, 0xe2, 0x7e, 0x0e, 0xb2, 0xea, 0x68, 0xe6, 0x6b, 0x30,
-	0xea, 0xb2, 0x44, 0x8e, 0xd8, 0x00, 0xd3, 0x5f, 0x4e, 0x68, 0x2c, 0xfb, 0x4e, 0x48, 0x22, 0xaa,
-	0x3f, 0x40, 0x79, 0xac, 0x57, 0xa8, 0x02, 0x29, 0xd1, 0xe7, 0xd5, 0xd5, 0xb8, 0x7b, 0x59, 0x32,
-	0xb1, 0x20, 0x9a, 0x1f, 0xa0, 0x74, 0xec, 0xc6, 0xfc, 0x88, 0x0d, 0xe2, 0xab, 0x4c, 0xdf, 0x84,
-	0xec, 0x1b, 0xd7, 0xe3, 0x34, 0xd2, 0x1f, 0x4c, 0xbd, 0x12, 0xd7, 0x3a, 0x14, 0xaf, 0x47, 0xce,
-	0xde, 0xd1, 0x40, 0x3f, 0x61, 0xf3, 0x02, 0xb1, 0x05, 0x20, 0x26, 0x5e, 0x29, 0x8e, 0xdd, 0x6f,
-	0x55, 0x45, 0x67, 0x70, 0x4e, 0x00, 0x3d, 0xf7, 0x5b, 0x6a, 0x7a, 0x60, 0xcc, 0xdd, 0xc7, 0x21,
-	0x0b, 0x62, 0x8a, 0xbe, 0x80, 0xf4, 0x09, 0x1b, 0xc4, 0xe5, 0x84, 0xfc, 0x68, 0x5e, 0x7e, 0x06,
-	0xc9, 0x44, 0x0f, 0xa1, 0x14, 0xd0, 0x53, 0xd1, 0xc3, 0x66, 0xdb, 0x50, 0x5b, 0xdc, 0x14, 0x70,
-	0x77, 0xba, 0x15, 0xf3, 0x01, 0x6c, 0x1e, 0x50, 0xbe, 0x10, 0x45, 0x04, 0xe9, 0x85, 0x17, 0x81,
-	0xfc, 0x6d, 0x3e, 0x04, 0xa3, 0x4e, 0x82, 0x21, 0xf5, 0x2e, 0xe7, 0xed, 0xfd, 0x2d, 0x0d, 0x70,
-	0xc4, 0x06, 0x3d, 0xf5, 0x57, 0x08, 0xfa, 0x7d, 0x02, 0xf2, 0xb3, 0x2c, 0xa1, 0x8b, 0xeb, 0x70,
-	0x35, 0x93, 0xdb, 0x97, 0x1e, 0xd0, 0xac, 0xfc, 0xf6, 0x1f, 0xff, 0xfa, 0x53, 0x72, 0xd7, 0xbc,
-	0x3f, 0xfb, 0xff, 0xe5, 0xd7, 0x2a, 0x1d, 0x3f, 0x0a, 0x23, 0x26, 0x06, 0x9f, 0xb8, 0xfa, 0xf8,
-	0x43, 0x55, 0x44, 0xe1, 0xb9, 0xc8, 0x27, 0xfa, 0x43, 0x02, 0x72, 0xd3, 0x88, 0xa2, 0x8b, 0xfb,
-	0xd8, 0x4a, 0xce, 0xb7, 0x1f, 0x7d, 0x02, 0x53, 0xa5, 0xc7, 0x7c, 0x24, 0x77, 0xf4, 0x00, 0x5d,
-	0xbd, 0x23, 0x74, 0x06, 0x59, 0x15, 0x6f, 0x74, 0x71, 0x93, 0x5e, 0x4a, 0xc8, 0x15, 0xc1, 0xf8,
-	0x88, 0x6b, 0x91, 0x8a, 0x05, 0xc7, 0xd2, 0x6f, 0xf5, 0xf1, 0x07, 0xf4, 0x3b, 0x91, 0x8e, 0x69,
-	0x1a, 0x2f, 0x4b, 0xc7, 0x4a, 0xaa, 0xb7, 0x6f, 0x9e, 0x6b, 0x9a, 0x96, 0x1f, 0xf2, 0x33, 0xf3,
-	0x99, 0xf4, 0xfd, 0xc4, 0xdc, 0xbd, 0xd2, 0xf7, 0xf3, 0xa1, 0xb4, 0xf9, 0x3c, 0xf1, 0x78, 0x9f,
-	0xc1, 0xbd, 0x21, 0xf3, 0xcf, 0x39, 0x27, 0xa1, 0x3b, 0xdd, 0xc0, 0x7e, 0x69, 0x5e, 0x43, 0x5d,
-	0xe1, 0xb1, 0x9b, 0x78, 0xfd, 0xb5, 0xe6, 0x8f, 0x99, 0x47, 0x82, 0x71, 0x85, 0x45, 0xe3, 0xea,
-	0x98, 0x06, 0x72, 0x3f, 0x55, 0x25, 0x22, 0xa1, 0x1b, 0x9f, 0xfb, 0x67, 0xee, 0x1b, 0xdf, 0x1b,
-	0x64, 0x25, 0xeb, 0xd9, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xaf, 0x10, 0x62, 0xa8, 0xbe, 0x13,
-	0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/model_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/model_service.pb.go
deleted file mode 100644
index 486865db..00000000
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/model_service.pb.go
+++ /dev/null
@@ -1,1050 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/cloud/ml/v1beta1/model_service.proto
-
-package ml
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "google.golang.org/genproto/googleapis/api/serviceconfig"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// Represents a machine learning solution.
-//
-// A model can have multiple versions, each of which is a deployed, trained
-// model ready to receive prediction requests. The model itself is just a
-// container.
-type Model struct {
-	// Required. The name specified for the model when it was created.
-	//
-	// The model name must be unique within the project it is created in.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Optional. The description specified for the model when it was created.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
-	// Output only. The default version of the model. This version will be used to
-	// handle prediction requests that do not specify a version.
-	//
-	// You can change the default version by calling
-	// [projects.methods.versions.setDefault](/ml/reference/rest/v1beta1/projects.models.versions/setDefault).
-	DefaultVersion *Version `protobuf:"bytes,3,opt,name=default_version,json=defaultVersion" json:"default_version,omitempty"`
-	// Optional. The list of regions where the model is going to be deployed.
-	// Currently only one region per model is supported.
-	// Defaults to 'us-central1' if nothing is set.
-	Regions []string `protobuf:"bytes,4,rep,name=regions" json:"regions,omitempty"`
-	// Optional. If true, enables StackDriver Logging for online prediction.
-	// Default is false.
-	OnlinePredictionLogging bool `protobuf:"varint,5,opt,name=online_prediction_logging,json=onlinePredictionLogging" json:"online_prediction_logging,omitempty"`
-}
-
-func (m *Model) Reset()                    { *m = Model{} }
-func (m *Model) String() string            { return proto.CompactTextString(m) }
-func (*Model) ProtoMessage()               {}
-func (*Model) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-func (m *Model) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *Model) GetDescription() string {
-	if m != nil {
-		return m.Description
-	}
-	return ""
-}
-
-func (m *Model) GetDefaultVersion() *Version {
-	if m != nil {
-		return m.DefaultVersion
-	}
-	return nil
-}
-
-func (m *Model) GetRegions() []string {
-	if m != nil {
-		return m.Regions
-	}
-	return nil
-}
-
-func (m *Model) GetOnlinePredictionLogging() bool {
-	if m != nil {
-		return m.OnlinePredictionLogging
-	}
-	return false
-}
-
-// Represents a version of the model.
-//
-// Each version is a trained model deployed in the cloud, ready to handle
-// prediction requests. A model can have multiple versions. You can get
-// information about all of the versions of a given model by calling
-// [projects.models.versions.list](/ml/reference/rest/v1beta1/projects.models.versions/list).
-type Version struct {
-	// Required.The name specified for the version when it was created.
-	//
-	// The version name must be unique within the model it is created in.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Optional. The description specified for the version when it was created.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
-	// Output only. If true, this version will be used to handle prediction
-	// requests that do not specify a version.
-	//
-	// You can change the default version by calling
-	// [projects.methods.versions.setDefault](/ml/reference/rest/v1beta1/projects.models.versions/setDefault).
-	IsDefault bool `protobuf:"varint,3,opt,name=is_default,json=isDefault" json:"is_default,omitempty"`
-	// Required. The Google Cloud Storage location of the trained model used to
-	// create the version. See the
-	// [overview of model deployment](/ml/docs/concepts/deployment-overview) for
-	// more informaiton.
-	//
-	// When passing Version to
-	// [projects.models.versions.create](/ml/reference/rest/v1beta1/projects.models.versions/create)
-	// the model service uses the specified location as the source of the model.
-	// Once deployed, the model version is hosted by the prediction service, so
-	// this location is useful only as a historical record.
-	DeploymentUri string `protobuf:"bytes,4,opt,name=deployment_uri,json=deploymentUri" json:"deployment_uri,omitempty"`
-	// Output only. The time the version was created.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// Output only. The time the version was last used for prediction.
-	LastUseTime *google_protobuf2.Timestamp `protobuf:"bytes,6,opt,name=last_use_time,json=lastUseTime" json:"last_use_time,omitempty"`
-	// Optional. The Google Cloud ML runtime version to use for this deployment.
-	// If not set, Google Cloud ML will choose a version.
-	RuntimeVersion string `protobuf:"bytes,8,opt,name=runtime_version,json=runtimeVersion" json:"runtime_version,omitempty"`
-	// Optional. Manually select the number of nodes to use for serving the
-	// model. If unset (i.e., by default), the number of nodes used to serve
-	// the model automatically scales with traffic. However, care should be
-	// taken to ramp up traffic according to the model's ability to scale. If
-	// your model needs to handle bursts of traffic beyond it's ability to
-	// scale, it is recommended you set this field appropriately.
-	ManualScaling *ManualScaling `protobuf:"bytes,9,opt,name=manual_scaling,json=manualScaling" json:"manual_scaling,omitempty"`
-}
-
-func (m *Version) Reset()                    { *m = Version{} }
-func (m *Version) String() string            { return proto.CompactTextString(m) }
-func (*Version) ProtoMessage()               {}
-func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
-
-func (m *Version) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *Version) GetDescription() string {
-	if m != nil {
-		return m.Description
-	}
-	return ""
-}
-
-func (m *Version) GetIsDefault() bool {
-	if m != nil {
-		return m.IsDefault
-	}
-	return false
-}
-
-func (m *Version) GetDeploymentUri() string {
-	if m != nil {
-		return m.DeploymentUri
-	}
-	return ""
-}
-
-func (m *Version) GetCreateTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-func (m *Version) GetLastUseTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.LastUseTime
-	}
-	return nil
-}
-
-func (m *Version) GetRuntimeVersion() string {
-	if m != nil {
-		return m.RuntimeVersion
-	}
-	return ""
-}
-
-func (m *Version) GetManualScaling() *ManualScaling {
-	if m != nil {
-		return m.ManualScaling
-	}
-	return nil
-}
-
-// Options for manually scaling a model.
-type ManualScaling struct {
-	// The number of nodes to allocate for this model. These nodes are always up,
-	// starting from the time the model is deployed, so the cost of operating
-	// this model will be proportional to nodes * number of hours since
-	// deployment.
-	Nodes int32 `protobuf:"varint,1,opt,name=nodes" json:"nodes,omitempty"`
-}
-
-func (m *ManualScaling) Reset()                    { *m = ManualScaling{} }
-func (m *ManualScaling) String() string            { return proto.CompactTextString(m) }
-func (*ManualScaling) ProtoMessage()               {}
-func (*ManualScaling) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
-
-func (m *ManualScaling) GetNodes() int32 {
-	if m != nil {
-		return m.Nodes
-	}
-	return 0
-}
-
-// Request message for the CreateModel method.
-type CreateModelRequest struct {
-	// Required. The project name.
-	//
-	// Authorization: requires `Editor` role on the specified project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Required. The model to create.
-	Model *Model `protobuf:"bytes,2,opt,name=model" json:"model,omitempty"`
-}
-
-func (m *CreateModelRequest) Reset()                    { *m = CreateModelRequest{} }
-func (m *CreateModelRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateModelRequest) ProtoMessage()               {}
-func (*CreateModelRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
-
-func (m *CreateModelRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *CreateModelRequest) GetModel() *Model {
-	if m != nil {
-		return m.Model
-	}
-	return nil
-}
-
-// Request message for the ListModels method.
-type ListModelsRequest struct {
-	// Required. The name of the project whose models are to be listed.
-	//
-	// Authorization: requires `Viewer` role on the specified project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Optional. A page token to request the next page of results.
-	//
-	// You get the token from the `next_page_token` field of the response from
-	// the previous call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
-	// Optional. The number of models to retrieve per "page" of results. If there
-	// are more remaining results than this number, the response message will
-	// contain a valid value in the `next_page_token` field.
-	//
-	// The default value is 20, and the maximum page size is 100.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
-}
-
-func (m *ListModelsRequest) Reset()                    { *m = ListModelsRequest{} }
-func (m *ListModelsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListModelsRequest) ProtoMessage()               {}
-func (*ListModelsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
-
-func (m *ListModelsRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *ListModelsRequest) GetPageToken() string {
-	if m != nil {
-		return m.PageToken
-	}
-	return ""
-}
-
-func (m *ListModelsRequest) GetPageSize() int32 {
-	if m != nil {
-		return m.PageSize
-	}
-	return 0
-}
-
-// Response message for the ListModels method.
-type ListModelsResponse struct {
-	// The list of models.
-	Models []*Model `protobuf:"bytes,1,rep,name=models" json:"models,omitempty"`
-	// Optional. Pass this token as the `page_token` field of the request for a
-	// subsequent call.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
-}
-
-func (m *ListModelsResponse) Reset()                    { *m = ListModelsResponse{} }
-func (m *ListModelsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListModelsResponse) ProtoMessage()               {}
-func (*ListModelsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
-
-func (m *ListModelsResponse) GetModels() []*Model {
-	if m != nil {
-		return m.Models
-	}
-	return nil
-}
-
-func (m *ListModelsResponse) GetNextPageToken() string {
-	if m != nil {
-		return m.NextPageToken
-	}
-	return ""
-}
-
-// Request message for the GetModel method.
-type GetModelRequest struct {
-	// Required. The name of the model.
-	//
-	// Authorization: requires `Viewer` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *GetModelRequest) Reset()                    { *m = GetModelRequest{} }
-func (m *GetModelRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetModelRequest) ProtoMessage()               {}
-func (*GetModelRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
-
-func (m *GetModelRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Request message for the DeleteModel method.
-type DeleteModelRequest struct {
-	// Required. The name of the model.
-	//
-	// Authorization: requires `Editor` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *DeleteModelRequest) Reset()                    { *m = DeleteModelRequest{} }
-func (m *DeleteModelRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteModelRequest) ProtoMessage()               {}
-func (*DeleteModelRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
-
-func (m *DeleteModelRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Uploads the provided trained model version to Cloud Machine Learning.
-type CreateVersionRequest struct {
-	// Required. The name of the model.
-	//
-	// Authorization: requires `Editor` role on the parent project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Required. The version details.
-	Version *Version `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
-}
-
-func (m *CreateVersionRequest) Reset()                    { *m = CreateVersionRequest{} }
-func (m *CreateVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateVersionRequest) ProtoMessage()               {}
-func (*CreateVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
-
-func (m *CreateVersionRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *CreateVersionRequest) GetVersion() *Version {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-// Request message for the ListVersions method.
-type ListVersionsRequest struct {
-	// Required. The name of the model for which to list the version.
-	//
-	// Authorization: requires `Viewer` role on the parent project.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Optional. A page token to request the next page of results.
-	//
-	// You get the token from the `next_page_token` field of the response from
-	// the previous call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
-	// Optional. The number of versions to retrieve per "page" of results. If
-	// there are more remaining results than this number, the response message
-	// will contain a valid value in the `next_page_token` field.
-	//
-	// The default value is 20, and the maximum page size is 100.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
-}
-
-func (m *ListVersionsRequest) Reset()                    { *m = ListVersionsRequest{} }
-func (m *ListVersionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListVersionsRequest) ProtoMessage()               {}
-func (*ListVersionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
-
-func (m *ListVersionsRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *ListVersionsRequest) GetPageToken() string {
-	if m != nil {
-		return m.PageToken
-	}
-	return ""
-}
-
-func (m *ListVersionsRequest) GetPageSize() int32 {
-	if m != nil {
-		return m.PageSize
-	}
-	return 0
-}
-
-// Response message for the ListVersions method.
-type ListVersionsResponse struct {
-	// The list of versions.
-	Versions []*Version `protobuf:"bytes,1,rep,name=versions" json:"versions,omitempty"`
-	// Optional. Pass this token as the `page_token` field of the request for a
-	// subsequent call.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
-}
-
-func (m *ListVersionsResponse) Reset()                    { *m = ListVersionsResponse{} }
-func (m *ListVersionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListVersionsResponse) ProtoMessage()               {}
-func (*ListVersionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
-
-func (m *ListVersionsResponse) GetVersions() []*Version {
-	if m != nil {
-		return m.Versions
-	}
-	return nil
-}
-
-func (m *ListVersionsResponse) GetNextPageToken() string {
-	if m != nil {
-		return m.NextPageToken
-	}
-	return ""
-}
-
-// Request message for the GetVersion method.
-type GetVersionRequest struct {
-	// Required. The name of the version.
-	//
-	// Authorization: requires `Viewer` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *GetVersionRequest) Reset()                    { *m = GetVersionRequest{} }
-func (m *GetVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetVersionRequest) ProtoMessage()               {}
-func (*GetVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
-
-func (m *GetVersionRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Request message for the DeleteVerionRequest method.
-type DeleteVersionRequest struct {
-	// Required. The name of the version. You can get the names of all the
-	// versions of a model by calling
-	// [projects.models.versions.list](/ml/reference/rest/v1beta1/projects.models.versions/list).
-	//
-	// Authorization: requires `Editor` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *DeleteVersionRequest) Reset()                    { *m = DeleteVersionRequest{} }
-func (m *DeleteVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteVersionRequest) ProtoMessage()               {}
-func (*DeleteVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
-
-func (m *DeleteVersionRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Request message for the SetDefaultVersion request.
-type SetDefaultVersionRequest struct {
-	// Required. The name of the version to make the default for the model. You
-	// can get the names of all the versions of a model by calling
-	// [projects.models.versions.list](/ml/reference/rest/v1beta1/projects.models.versions/list).
-	//
-	// Authorization: requires `Editor` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *SetDefaultVersionRequest) Reset()                    { *m = SetDefaultVersionRequest{} }
-func (m *SetDefaultVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetDefaultVersionRequest) ProtoMessage()               {}
-func (*SetDefaultVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
-
-func (m *SetDefaultVersionRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*Model)(nil), "google.cloud.ml.v1beta1.Model")
-	proto.RegisterType((*Version)(nil), "google.cloud.ml.v1beta1.Version")
-	proto.RegisterType((*ManualScaling)(nil), "google.cloud.ml.v1beta1.ManualScaling")
-	proto.RegisterType((*CreateModelRequest)(nil), "google.cloud.ml.v1beta1.CreateModelRequest")
-	proto.RegisterType((*ListModelsRequest)(nil), "google.cloud.ml.v1beta1.ListModelsRequest")
-	proto.RegisterType((*ListModelsResponse)(nil), "google.cloud.ml.v1beta1.ListModelsResponse")
-	proto.RegisterType((*GetModelRequest)(nil), "google.cloud.ml.v1beta1.GetModelRequest")
-	proto.RegisterType((*DeleteModelRequest)(nil), "google.cloud.ml.v1beta1.DeleteModelRequest")
-	proto.RegisterType((*CreateVersionRequest)(nil), "google.cloud.ml.v1beta1.CreateVersionRequest")
-	proto.RegisterType((*ListVersionsRequest)(nil), "google.cloud.ml.v1beta1.ListVersionsRequest")
-	proto.RegisterType((*ListVersionsResponse)(nil), "google.cloud.ml.v1beta1.ListVersionsResponse")
-	proto.RegisterType((*GetVersionRequest)(nil), "google.cloud.ml.v1beta1.GetVersionRequest")
-	proto.RegisterType((*DeleteVersionRequest)(nil), "google.cloud.ml.v1beta1.DeleteVersionRequest")
-	proto.RegisterType((*SetDefaultVersionRequest)(nil), "google.cloud.ml.v1beta1.SetDefaultVersionRequest")
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for ModelService service
-
-type ModelServiceClient interface {
-	// Creates a model which will later contain one or more versions.
-	//
-	// You must add at least one version before you can request predictions from
-	// the model. Add versions by calling
-	// [projects.models.versions.create](/ml/reference/rest/v1beta1/projects.models.versions/create).
-	CreateModel(ctx context.Context, in *CreateModelRequest, opts ...grpc.CallOption) (*Model, error)
-	// Lists the models in a project.
-	//
-	// Each project can contain multiple models, and each model can have multiple
-	// versions.
-	ListModels(ctx context.Context, in *ListModelsRequest, opts ...grpc.CallOption) (*ListModelsResponse, error)
-	// Gets information about a model, including its name, the description (if
-	// set), and the default version (if at least one version of the model has
-	// been deployed).
-	GetModel(ctx context.Context, in *GetModelRequest, opts ...grpc.CallOption) (*Model, error)
-	// Deletes a model.
-	//
-	// You can only delete a model if there are no versions in it. You can delete
-	// versions by calling
-	// [projects.models.versions.delete](/ml/reference/rest/v1beta1/projects.models.versions/delete).
-	DeleteModel(ctx context.Context, in *DeleteModelRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// Creates a new version of a model from a trained TensorFlow model.
-	//
-	// If the version created in the cloud by this call is the first deployed
-	// version of the specified model, it will be made the default version of the
-	// model. When you add a version to a model that already has one or more
-	// versions, the default version does not automatically change. If you want a
-	// new version to be the default, you must call
-	// [projects.models.versions.setDefault](/ml/reference/rest/v1beta1/projects.models.versions/setDefault).
-	CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// Gets basic information about all the versions of a model.
-	//
-	// If you expect that a model has a lot of versions, or if you need to handle
-	// only a limited number of results at a time, you can request that the list
-	// be retrieved in batches (called pages):
-	ListVersions(ctx context.Context, in *ListVersionsRequest, opts ...grpc.CallOption) (*ListVersionsResponse, error)
-	// Gets information about a model version.
-	//
-	// Models can have multiple versions. You can call
-	// [projects.models.versions.list](/ml/reference/rest/v1beta1/projects.models.versions/list)
-	// to get the same information that this method returns for all of the
-	// versions of a model.
-	GetVersion(ctx context.Context, in *GetVersionRequest, opts ...grpc.CallOption) (*Version, error)
-	// Deletes a model version.
-	//
-	// Each model can have multiple versions deployed and in use at any given
-	// time. Use this method to remove a single version.
-	//
-	// Note: You cannot delete the version that is set as the default version
-	// of the model unless it is the only remaining version.
-	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// Designates a version to be the default for the model.
-	//
-	// The default version is used for prediction requests made against the model
-	// that don't specify a version.
-	//
-	// The first version to be created for a model is automatically set as the
-	// default. You must make any subsequent changes to the default version
-	// setting manually using this method.
-	SetDefaultVersion(ctx context.Context, in *SetDefaultVersionRequest, opts ...grpc.CallOption) (*Version, error)
-}
-
-type modelServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewModelServiceClient(cc *grpc.ClientConn) ModelServiceClient {
-	return &modelServiceClient{cc}
-}
-
-func (c *modelServiceClient) CreateModel(ctx context.Context, in *CreateModelRequest, opts ...grpc.CallOption) (*Model, error) {
-	out := new(Model)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/CreateModel", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *modelServiceClient) ListModels(ctx context.Context, in *ListModelsRequest, opts ...grpc.CallOption) (*ListModelsResponse, error) {
-	out := new(ListModelsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/ListModels", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *modelServiceClient) GetModel(ctx context.Context, in *GetModelRequest, opts ...grpc.CallOption) (*Model, error) {
-	out := new(Model)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/GetModel", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *modelServiceClient) DeleteModel(ctx context.Context, in *DeleteModelRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/DeleteModel", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *modelServiceClient) CreateVersion(ctx context.Context, in *CreateVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/CreateVersion", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *modelServiceClient) ListVersions(ctx context.Context, in *ListVersionsRequest, opts ...grpc.CallOption) (*ListVersionsResponse, error) {
-	out := new(ListVersionsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/ListVersions", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *modelServiceClient) GetVersion(ctx context.Context, in *GetVersionRequest, opts ...grpc.CallOption) (*Version, error) {
-	out := new(Version)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/GetVersion", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *modelServiceClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/DeleteVersion", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *modelServiceClient) SetDefaultVersion(ctx context.Context, in *SetDefaultVersionRequest, opts ...grpc.CallOption) (*Version, error) {
-	out := new(Version)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ModelService/SetDefaultVersion", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for ModelService service
-
-type ModelServiceServer interface {
-	// Creates a model which will later contain one or more versions.
-	//
-	// You must add at least one version before you can request predictions from
-	// the model. Add versions by calling
-	// [projects.models.versions.create](/ml/reference/rest/v1beta1/projects.models.versions/create).
-	CreateModel(context.Context, *CreateModelRequest) (*Model, error)
-	// Lists the models in a project.
-	//
-	// Each project can contain multiple models, and each model can have multiple
-	// versions.
-	ListModels(context.Context, *ListModelsRequest) (*ListModelsResponse, error)
-	// Gets information about a model, including its name, the description (if
-	// set), and the default version (if at least one version of the model has
-	// been deployed).
-	GetModel(context.Context, *GetModelRequest) (*Model, error)
-	// Deletes a model.
-	//
-	// You can only delete a model if there are no versions in it. You can delete
-	// versions by calling
-	// [projects.models.versions.delete](/ml/reference/rest/v1beta1/projects.models.versions/delete).
-	DeleteModel(context.Context, *DeleteModelRequest) (*google_longrunning.Operation, error)
-	// Creates a new version of a model from a trained TensorFlow model.
-	//
-	// If the version created in the cloud by this call is the first deployed
-	// version of the specified model, it will be made the default version of the
-	// model. When you add a version to a model that already has one or more
-	// versions, the default version does not automatically change. If you want a
-	// new version to be the default, you must call
-	// [projects.models.versions.setDefault](/ml/reference/rest/v1beta1/projects.models.versions/setDefault).
-	CreateVersion(context.Context, *CreateVersionRequest) (*google_longrunning.Operation, error)
-	// Gets basic information about all the versions of a model.
-	//
-	// If you expect that a model has a lot of versions, or if you need to handle
-	// only a limited number of results at a time, you can request that the list
-	// be retrieved in batches (called pages):
-	ListVersions(context.Context, *ListVersionsRequest) (*ListVersionsResponse, error)
-	// Gets information about a model version.
-	//
-	// Models can have multiple versions. You can call
-	// [projects.models.versions.list](/ml/reference/rest/v1beta1/projects.models.versions/list)
-	// to get the same information that this method returns for all of the
-	// versions of a model.
-	GetVersion(context.Context, *GetVersionRequest) (*Version, error)
-	// Deletes a model version.
-	//
-	// Each model can have multiple versions deployed and in use at any given
-	// time. Use this method to remove a single version.
-	//
-	// Note: You cannot delete the version that is set as the default version
-	// of the model unless it is the only remaining version.
-	DeleteVersion(context.Context, *DeleteVersionRequest) (*google_longrunning.Operation, error)
-	// Designates a version to be the default for the model.
-	//
-	// The default version is used for prediction requests made against the model
-	// that don't specify a version.
-	//
-	// The first version to be created for a model is automatically set as the
-	// default. You must make any subsequent changes to the default version
-	// setting manually using this method.
-	SetDefaultVersion(context.Context, *SetDefaultVersionRequest) (*Version, error)
-}
-
-func RegisterModelServiceServer(s *grpc.Server, srv ModelServiceServer) {
-	s.RegisterService(&_ModelService_serviceDesc, srv)
-}
-
-func _ModelService_CreateModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateModelRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).CreateModel(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/CreateModel",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).CreateModel(ctx, req.(*CreateModelRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ModelService_ListModels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListModelsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).ListModels(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/ListModels",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).ListModels(ctx, req.(*ListModelsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ModelService_GetModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetModelRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).GetModel(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/GetModel",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).GetModel(ctx, req.(*GetModelRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ModelService_DeleteModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteModelRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).DeleteModel(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/DeleteModel",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).DeleteModel(ctx, req.(*DeleteModelRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ModelService_CreateVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateVersionRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).CreateVersion(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/CreateVersion",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).CreateVersion(ctx, req.(*CreateVersionRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ModelService_ListVersions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListVersionsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).ListVersions(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/ListVersions",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).ListVersions(ctx, req.(*ListVersionsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ModelService_GetVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetVersionRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).GetVersion(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/GetVersion",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).GetVersion(ctx, req.(*GetVersionRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ModelService_DeleteVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteVersionRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).DeleteVersion(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/DeleteVersion",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).DeleteVersion(ctx, req.(*DeleteVersionRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ModelService_SetDefaultVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetDefaultVersionRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ModelServiceServer).SetDefaultVersion(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ModelService/SetDefaultVersion",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ModelServiceServer).SetDefaultVersion(ctx, req.(*SetDefaultVersionRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _ModelService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.ml.v1beta1.ModelService",
-	HandlerType: (*ModelServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "CreateModel",
-			Handler:    _ModelService_CreateModel_Handler,
-		},
-		{
-			MethodName: "ListModels",
-			Handler:    _ModelService_ListModels_Handler,
-		},
-		{
-			MethodName: "GetModel",
-			Handler:    _ModelService_GetModel_Handler,
-		},
-		{
-			MethodName: "DeleteModel",
-			Handler:    _ModelService_DeleteModel_Handler,
-		},
-		{
-			MethodName: "CreateVersion",
-			Handler:    _ModelService_CreateVersion_Handler,
-		},
-		{
-			MethodName: "ListVersions",
-			Handler:    _ModelService_ListVersions_Handler,
-		},
-		{
-			MethodName: "GetVersion",
-			Handler:    _ModelService_GetVersion_Handler,
-		},
-		{
-			MethodName: "DeleteVersion",
-			Handler:    _ModelService_DeleteVersion_Handler,
-		},
-		{
-			MethodName: "SetDefaultVersion",
-			Handler:    _ModelService_SetDefaultVersion_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/ml/v1beta1/model_service.proto",
-}
-
-func init() { proto.RegisterFile("google/cloud/ml/v1beta1/model_service.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 1013 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xd6, 0x26, 0x71, 0x62, 0x3f, 0xd7, 0x89, 0x32, 0x04, 0x6a, 0x0c, 0xa1, 0xd6, 0x56, 0x69,
-	0x2d, 0xa7, 0xdd, 0x25, 0x06, 0x55, 0x8a, 0x0b, 0x45, 0x2a, 0x91, 0x2a, 0xa4, 0x46, 0x44, 0x9b,
-	0x96, 0x03, 0x97, 0xd5, 0xc6, 0x9e, 0x2e, 0x53, 0x76, 0x67, 0xb6, 0x3b, 0xb3, 0x11, 0x14, 0x7a,
-	0x80, 0x03, 0x47, 0x0e, 0x20, 0xae, 0x5c, 0xb8, 0xf3, 0xcf, 0x70, 0xe7, 0x84, 0xf8, 0x23, 0x38,
-	0xa1, 0xf9, 0xb1, 0xce, 0x3a, 0xfe, 0xb1, 0x1b, 0x24, 0x6e, 0x9e, 0x37, 0xdf, 0x9b, 0xf7, 0xcd,
-	0xfb, 0xde, 0x7b, 0x3b, 0x86, 0xfd, 0x90, 0xb1, 0x30, 0xc2, 0xee, 0x28, 0x62, 0xd9, 0xd8, 0x8d,
-	0x23, 0xf7, 0xfc, 0xe0, 0x0c, 0x8b, 0xe0, 0xc0, 0x8d, 0xd9, 0x18, 0x47, 0x3e, 0xc7, 0xe9, 0x39,
-	0x19, 0x61, 0x27, 0x49, 0x99, 0x60, 0xe8, 0xba, 0x06, 0x3b, 0x0a, 0xec, 0xc4, 0x91, 0x63, 0xc0,
-	0x9d, 0xb7, 0xcd, 0x29, 0x41, 0x42, 0xdc, 0x80, 0x52, 0x26, 0x02, 0x41, 0x18, 0xe5, 0xda, 0xad,
-	0xf3, 0x7a, 0x71, 0x37, 0x13, 0x5f, 0x18, 0xf3, 0x4d, 0x63, 0x8e, 0x18, 0x0d, 0xd3, 0x8c, 0x52,
-	0x42, 0x43, 0x97, 0x25, 0x38, 0x9d, 0xf2, 0xbd, 0x61, 0x40, 0x6a, 0x75, 0x96, 0x3d, 0x73, 0x05,
-	0x89, 0x31, 0x17, 0x41, 0x9c, 0x68, 0x80, 0xfd, 0xa7, 0x05, 0xb5, 0x63, 0xc9, 0x15, 0x21, 0x58,
-	0xa3, 0x41, 0x8c, 0xdb, 0x56, 0xd7, 0xea, 0x35, 0x3c, 0xf5, 0x1b, 0x75, 0xa1, 0x39, 0xc6, 0x7c,
-	0x94, 0x92, 0x44, 0x1e, 0xda, 0x5e, 0x51, 0x5b, 0x45, 0x13, 0xfa, 0x04, 0xb6, 0xc6, 0xf8, 0x59,
-	0x90, 0x45, 0xc2, 0x3f, 0xc7, 0x29, 0x97, 0xa8, 0xd5, 0xae, 0xd5, 0x6b, 0x0e, 0xba, 0xce, 0x82,
-	0xdb, 0x3a, 0x9f, 0x69, 0x9c, 0xb7, 0x69, 0x1c, 0xcd, 0x1a, 0xb5, 0x61, 0x23, 0xc5, 0xa1, 0x24,
-	0xdf, 0x5e, 0xeb, 0xae, 0xf6, 0x1a, 0x5e, 0xbe, 0x44, 0x43, 0x78, 0x93, 0xd1, 0x88, 0x50, 0xec,
-	0x27, 0x29, 0x1e, 0x93, 0x91, 0x8c, 0xec, 0x47, 0x2c, 0x0c, 0x09, 0x0d, 0xdb, 0xb5, 0xae, 0xd5,
-	0xab, 0x7b, 0xd7, 0x35, 0xe0, 0x64, 0xb2, 0xff, 0x58, 0x6f, 0xdb, 0xff, 0xac, 0xc0, 0x46, 0x1e,
-	0xe1, 0xbf, 0x5d, 0x71, 0x17, 0x80, 0x70, 0xdf, 0x90, 0x55, 0xb7, 0xab, 0x7b, 0x0d, 0xc2, 0x8f,
-	0xb4, 0x01, 0xed, 0xc1, 0xe6, 0x18, 0x27, 0x11, 0xfb, 0x3a, 0xc6, 0x54, 0xf8, 0x59, 0x4a, 0xda,
-	0x6b, 0xea, 0x8c, 0xd6, 0x85, 0xf5, 0x69, 0x4a, 0xd0, 0x7d, 0x68, 0x8e, 0x52, 0x1c, 0x08, 0xec,
-	0x4b, 0x09, 0x14, 0xeb, 0xe6, 0xa0, 0x93, 0x27, 0x29, 0xd7, 0xc7, 0x79, 0x92, 0xeb, 0xe3, 0x81,
-	0x86, 0x4b, 0x03, 0x7a, 0x00, 0xad, 0x28, 0xe0, 0xc2, 0xcf, 0xb8, 0x71, 0x5f, 0x2f, 0x75, 0x6f,
-	0x4a, 0x87, 0xa7, 0x5c, 0xfb, 0xdf, 0x86, 0xad, 0x34, 0xa3, 0xd2, 0x73, 0xa2, 0x52, 0x5d, 0x91,
-	0xdc, 0x34, 0xe6, 0x3c, 0x43, 0xc7, 0xb0, 0x19, 0x07, 0x34, 0x0b, 0x22, 0x9f, 0x8f, 0x82, 0x48,
-	0xa6, 0xb7, 0xa1, 0x22, 0xdd, 0x5a, 0xa8, 0xe6, 0xb1, 0x82, 0x9f, 0x6a, 0xb4, 0xd7, 0x8a, 0x8b,
-	0x4b, 0x7b, 0x0f, 0x5a, 0x53, 0xfb, 0x68, 0x07, 0x6a, 0x94, 0x8d, 0x31, 0x57, 0x12, 0xd4, 0x3c,
-	0xbd, 0xb0, 0xcf, 0x00, 0x7d, 0xac, 0x2e, 0xab, 0x2a, 0xd1, 0xc3, 0x2f, 0x32, 0xcc, 0x05, 0x7a,
-	0x03, 0xd6, 0x93, 0x20, 0xc5, 0x54, 0x18, 0xbd, 0xcc, 0x0a, 0xbd, 0x0f, 0x35, 0xd5, 0x5d, 0x4a,
-	0xab, 0xe6, 0xe0, 0x9d, 0xc5, 0xd4, 0xd4, 0x69, 0x1a, 0x6c, 0x87, 0xb0, 0xfd, 0x98, 0x70, 0xa1,
-	0x6c, 0xbc, 0x2c, 0xc4, 0x2e, 0x40, 0x12, 0x84, 0xd8, 0x17, 0xec, 0x4b, 0x4c, 0x8d, 0x9e, 0x0d,
-	0x69, 0x79, 0x22, 0x0d, 0xe8, 0x2d, 0x50, 0x0b, 0x9f, 0x93, 0x97, 0x5a, 0xc9, 0x9a, 0x57, 0x97,
-	0x86, 0x53, 0xf2, 0x12, 0xdb, 0x02, 0x50, 0x31, 0x10, 0x4f, 0x18, 0xe5, 0x18, 0xdd, 0x83, 0x75,
-	0xc5, 0x43, 0xde, 0x7c, 0xb5, 0x02, 0x6b, 0x83, 0x46, 0xb7, 0x60, 0x8b, 0xe2, 0xaf, 0x84, 0x5f,
-	0xa0, 0xa3, 0x4b, 0xb4, 0x25, 0xcd, 0x27, 0x39, 0x25, 0x7b, 0x0f, 0xb6, 0x1e, 0x61, 0x31, 0x95,
-	0xbf, 0x39, 0xd5, 0x6e, 0xf7, 0x00, 0x1d, 0xe1, 0x08, 0x5f, 0xca, 0xf4, 0x3c, 0xe4, 0x73, 0xd8,
-	0xd1, 0x9a, 0xe4, 0xed, 0x5a, 0x92, 0xb2, 0x21, 0x6c, 0xe4, 0xa5, 0xb5, 0x52, 0x71, 0x00, 0xe4,
-	0x0e, 0x36, 0x81, 0xd7, 0x64, 0xca, 0x8c, 0xfd, 0x7f, 0x55, 0xe7, 0x5b, 0xd8, 0x99, 0x0e, 0x65,
-	0xf4, 0xf9, 0x00, 0xea, 0x86, 0x4d, 0xae, 0x50, 0x39, 0xff, 0x89, 0x47, 0x65, 0x95, 0x6e, 0xc3,
-	0xf6, 0x23, 0x2c, 0x2e, 0x65, 0x74, 0x5e, 0xf6, 0xfb, 0xb0, 0xa3, 0x75, 0xaa, 0x80, 0x75, 0xa0,
-	0x7d, 0x8a, 0xc5, 0xd1, 0xd4, 0x30, 0x5d, 0x82, 0x1f, 0xfc, 0x0d, 0x70, 0x4d, 0xc9, 0x7f, 0xaa,
-	0xbf, 0x4e, 0xe8, 0x47, 0x0b, 0x9a, 0x85, 0xfe, 0x43, 0xfb, 0x0b, 0x6f, 0x3e, 0xdb, 0xa5, 0x9d,
-	0x92, 0x42, 0xb6, 0x07, 0xdf, 0xff, 0xf1, 0xd7, 0xcf, 0x2b, 0x77, 0xec, 0x9b, 0x93, 0x4f, 0xe3,
-	0x37, 0x5a, 0xc6, 0x0f, 0x93, 0x94, 0x3d, 0xc7, 0x23, 0xc1, 0xdd, 0xfe, 0x2b, 0xfd, 0xb9, 0xe4,
-	0x43, 0xdd, 0xab, 0xe8, 0x27, 0x0b, 0xe0, 0xa2, 0x87, 0x50, 0x7f, 0x61, 0x88, 0x99, 0x8e, 0xee,
-	0xec, 0x57, 0xc2, 0x6a, 0xd1, 0xed, 0x7d, 0xc5, 0x6d, 0x0f, 0x55, 0xe1, 0x86, 0xbe, 0xb3, 0xa0,
-	0x9e, 0xb7, 0x18, 0xea, 0x2d, 0x0c, 0x73, 0xa9, 0x0b, 0x4b, 0xf3, 0x33, 0x87, 0x83, 0x54, 0xa9,
-	0xc0, 0xc0, 0x10, 0x70, 0xfb, 0xaf, 0xd0, 0x0f, 0x16, 0x34, 0x0b, 0xfd, 0xbb, 0x44, 0xa9, 0xd9,
-	0x2e, 0xef, 0xec, 0xe6, 0xe0, 0xc2, 0x8b, 0xc1, 0xf9, 0x34, 0x7f, 0x31, 0xe4, 0x44, 0xfa, 0x95,
-	0x88, 0xfc, 0x6a, 0x41, 0x6b, 0x6a, 0x3c, 0xa0, 0xbb, 0x25, 0x45, 0x33, 0x5d, 0x98, 0x65, 0x64,
-	0x3e, 0x52, 0x64, 0x0e, 0x6d, 0x67, 0x89, 0x32, 0x17, 0x74, 0xdc, 0xbc, 0x11, 0x87, 0xf9, 0x48,
-	0x41, 0xbf, 0x59, 0x70, 0xad, 0xd8, 0xe8, 0xe8, 0xce, 0xd2, 0xc2, 0xb8, 0x34, 0x7a, 0x3a, 0x77,
-	0x2b, 0xa2, 0x4d, 0x21, 0xdd, 0x53, 0x74, 0xdf, 0x45, 0x57, 0xa4, 0xab, 0x0a, 0xfd, 0x62, 0x20,
-	0x2c, 0x29, 0xf4, 0x99, 0xa9, 0xd1, 0x29, 0x1d, 0x4f, 0xf3, 0x48, 0x2d, 0x12, 0x74, 0xc2, 0x48,
-	0x6a, 0xfb, 0x8b, 0x05, 0xad, 0xa9, 0xe1, 0xb3, 0x44, 0xdb, 0x79, 0x43, 0xaa, 0x4c, 0x5b, 0xc3,
-	0xab, 0x7f, 0x55, 0x5e, 0xbf, 0x5b, 0xb0, 0x3d, 0x33, 0xe8, 0xd0, 0xc1, 0x42, 0x6e, 0x8b, 0x86,
-	0x62, 0x85, 0xd4, 0x1d, 0x29, 0x8a, 0x0f, 0xec, 0xc3, 0xab, 0x51, 0x1c, 0xf2, 0x49, 0xc8, 0xa1,
-	0xd5, 0x7f, 0xf8, 0x02, 0x6e, 0x8c, 0x58, 0x3c, 0x13, 0x2c, 0x48, 0x48, 0x1e, 0xf0, 0xe1, 0x76,
-	0x71, 0x10, 0x9f, 0xc8, 0x57, 0xdc, 0x89, 0xf5, 0xf9, 0xa1, 0xf1, 0x08, 0x59, 0x14, 0xd0, 0xd0,
-	0x61, 0x69, 0xe8, 0x86, 0x98, 0xaa, 0x37, 0x9e, 0xab, 0xb7, 0x82, 0x84, 0xf0, 0x99, 0xff, 0x1c,
-	0xf7, 0xe3, 0xe8, 0x6c, 0x5d, 0xa1, 0xde, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0x04, 0x39, 0xff,
-	0x08, 0x98, 0x0c, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/operation_metadata.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/operation_metadata.pb.go
deleted file mode 100644
index 29307773..00000000
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/operation_metadata.pb.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/cloud/ml/v1beta1/operation_metadata.proto
-
-package ml
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// The operation type.
-type OperationMetadata_OperationType int32
-
-const (
-	// Unspecified operation type.
-	OperationMetadata_OPERATION_TYPE_UNSPECIFIED OperationMetadata_OperationType = 0
-	// An operation to create a new version.
-	OperationMetadata_CREATE_VERSION OperationMetadata_OperationType = 1
-	// An operation to delete an existing version.
-	OperationMetadata_DELETE_VERSION OperationMetadata_OperationType = 2
-	// An operation to delete an existing model.
-	OperationMetadata_DELETE_MODEL OperationMetadata_OperationType = 3
-)
-
-var OperationMetadata_OperationType_name = map[int32]string{
-	0: "OPERATION_TYPE_UNSPECIFIED",
-	1: "CREATE_VERSION",
-	2: "DELETE_VERSION",
-	3: "DELETE_MODEL",
-}
-var OperationMetadata_OperationType_value = map[string]int32{
-	"OPERATION_TYPE_UNSPECIFIED": 0,
-	"CREATE_VERSION":             1,
-	"DELETE_VERSION":             2,
-	"DELETE_MODEL":               3,
-}
-
-func (x OperationMetadata_OperationType) String() string {
-	return proto.EnumName(OperationMetadata_OperationType_name, int32(x))
-}
-func (OperationMetadata_OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 0}
-}
-
-// Represents the metadata of the long-running operation.
-type OperationMetadata struct {
-	// The time the operation was submitted.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// The time operation processing started.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
-	// The time operation processing completed.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
-	// Indicates whether a request to cancel this operation has been made.
-	IsCancellationRequested bool `protobuf:"varint,4,opt,name=is_cancellation_requested,json=isCancellationRequested" json:"is_cancellation_requested,omitempty"`
-	// The operation type.
-	OperationType OperationMetadata_OperationType `protobuf:"varint,5,opt,name=operation_type,json=operationType,enum=google.cloud.ml.v1beta1.OperationMetadata_OperationType" json:"operation_type,omitempty"`
-	// Contains the name of the model associated with the operation.
-	ModelName string `protobuf:"bytes,6,opt,name=model_name,json=modelName" json:"model_name,omitempty"`
-	// Contains the version associated with the operation.
-	Version *Version `protobuf:"bytes,7,opt,name=version" json:"version,omitempty"`
-}
-
-func (m *OperationMetadata) Reset()                    { *m = OperationMetadata{} }
-func (m *OperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*OperationMetadata) ProtoMessage()               {}
-func (*OperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
-
-func (m *OperationMetadata) GetCreateTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-func (m *OperationMetadata) GetStartTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.StartTime
-	}
-	return nil
-}
-
-func (m *OperationMetadata) GetEndTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.EndTime
-	}
-	return nil
-}
-
-func (m *OperationMetadata) GetIsCancellationRequested() bool {
-	if m != nil {
-		return m.IsCancellationRequested
-	}
-	return false
-}
-
-func (m *OperationMetadata) GetOperationType() OperationMetadata_OperationType {
-	if m != nil {
-		return m.OperationType
-	}
-	return OperationMetadata_OPERATION_TYPE_UNSPECIFIED
-}
-
-func (m *OperationMetadata) GetModelName() string {
-	if m != nil {
-		return m.ModelName
-	}
-	return ""
-}
-
-func (m *OperationMetadata) GetVersion() *Version {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.ml.v1beta1.OperationMetadata")
-	proto.RegisterEnum("google.cloud.ml.v1beta1.OperationMetadata_OperationType", OperationMetadata_OperationType_name, OperationMetadata_OperationType_value)
-}
-
-func init() { proto.RegisterFile("google/cloud/ml/v1beta1/operation_metadata.proto", fileDescriptor2) }
-
-var fileDescriptor2 = []byte{
-	// 457 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x5f, 0x6b, 0xdb, 0x30,
-	0x14, 0xc5, 0xe7, 0xb6, 0x6b, 0x1b, 0x75, 0x0d, 0x99, 0x1f, 0x56, 0x2f, 0x6c, 0xab, 0xe9, 0x53,
-	0x60, 0x60, 0xaf, 0x1d, 0x83, 0x75, 0x7d, 0x6a, 0x13, 0x0d, 0x02, 0x6d, 0x6c, 0x54, 0xaf, 0xb0,
-	0xbd, 0x18, 0xc5, 0xbe, 0x33, 0x02, 0xfd, 0xf1, 0x2c, 0x25, 0xd0, 0x0f, 0xb4, 0xef, 0x39, 0x22,
-	0xd9, 0x34, 0x23, 0x84, 0x3e, 0xea, 0xdc, 0xf3, 0xbb, 0xf7, 0xf8, 0x5e, 0xa3, 0x4f, 0x95, 0x52,
-	0x15, 0x87, 0xb8, 0xe0, 0x6a, 0x51, 0xc6, 0x82, 0xc7, 0xcb, 0xf3, 0x39, 0x18, 0x7a, 0x1e, 0xab,
-	0x1a, 0x1a, 0x6a, 0x98, 0x92, 0xb9, 0x00, 0x43, 0x4b, 0x6a, 0x68, 0x54, 0x37, 0xca, 0x28, 0xff,
-	0xc4, 0x11, 0x91, 0x25, 0x22, 0xc1, 0xa3, 0x96, 0x18, 0xbe, 0x6b, 0x5b, 0xd1, 0x9a, 0xc5, 0x54,
-	0x4a, 0x65, 0x2c, 0xae, 0x1d, 0x36, 0xfc, 0xb8, 0x6d, 0x90, 0x50, 0x25, 0xf0, 0x5c, 0x43, 0xb3,
-	0x64, 0x05, 0xb4, 0xe6, 0xd3, 0xd6, 0x6c, 0x5f, 0xf3, 0xc5, 0xef, 0xd8, 0x30, 0x01, 0xda, 0x50,
-	0x51, 0x3b, 0xc3, 0xd9, 0xdf, 0x3d, 0xf4, 0x3a, 0xe9, 0x12, 0xde, 0xb5, 0x01, 0xfd, 0x2b, 0x74,
-	0x54, 0x34, 0x40, 0x0d, 0xe4, 0x2b, 0x7f, 0xe0, 0x85, 0xde, 0xe8, 0xe8, 0x62, 0x18, 0xb5, 0x81,
-	0xbb, 0x66, 0x51, 0xd6, 0x35, 0x23, 0xc8, 0xd9, 0x57, 0x82, 0x7f, 0x89, 0x90, 0x36, 0xb4, 0x31,
-	0x8e, 0xdd, 0x79, 0x96, 0xed, 0x59, 0xb7, 0x45, 0xbf, 0xa0, 0x43, 0x90, 0xa5, 0x03, 0x77, 0x9f,
-	0x05, 0x0f, 0x40, 0x96, 0x16, 0xfb, 0x86, 0xde, 0x32, 0x9d, 0x17, 0x54, 0x16, 0xc0, 0xb9, 0xdb,
-	0x75, 0x03, 0x7f, 0x16, 0xa0, 0x0d, 0x94, 0xc1, 0x5e, 0xe8, 0x8d, 0x0e, 0xc9, 0x09, 0xd3, 0xe3,
-	0xb5, 0x3a, 0xe9, 0xca, 0x7e, 0x8e, 0xfa, 0x4f, 0x17, 0x32, 0x8f, 0x35, 0x04, 0x2f, 0x43, 0x6f,
-	0xd4, 0xbf, 0xf8, 0x1a, 0x6d, 0x39, 0x4f, 0xb4, 0xb1, 0xae, 0x27, 0x25, 0x7b, 0xac, 0x81, 0x1c,
-	0xab, 0xf5, 0xa7, 0xff, 0x1e, 0x21, 0x77, 0x19, 0x49, 0x05, 0x04, 0xfb, 0xa1, 0x37, 0xea, 0x91,
-	0x9e, 0x55, 0x66, 0xd4, 0x66, 0x3f, 0x58, 0x42, 0xa3, 0x99, 0x92, 0xc1, 0x81, 0xfd, 0xe2, 0x70,
-	0xeb, 0xe0, 0x07, 0xe7, 0x23, 0x1d, 0x70, 0xc6, 0xd0, 0xf1, 0x7f, 0xa3, 0xfd, 0x0f, 0x68, 0x98,
-	0xa4, 0x98, 0x5c, 0x67, 0xd3, 0x64, 0x96, 0x67, 0x3f, 0x53, 0x9c, 0xff, 0x98, 0xdd, 0xa7, 0x78,
-	0x3c, 0xfd, 0x3e, 0xc5, 0x93, 0xc1, 0x0b, 0xdf, 0x47, 0xfd, 0x31, 0xc1, 0xd7, 0x19, 0xce, 0x1f,
-	0x30, 0xb9, 0x9f, 0x26, 0xb3, 0x81, 0xb7, 0xd2, 0x26, 0xf8, 0x16, 0xaf, 0x69, 0x3b, 0xfe, 0x00,
-	0xbd, 0x6a, 0xb5, 0xbb, 0x64, 0x82, 0x6f, 0x07, 0xbb, 0x37, 0x4b, 0x74, 0x5a, 0x28, 0xb1, 0x11,
-	0x8d, 0xd6, 0xac, 0x8b, 0x77, 0xf3, 0x66, 0x63, 0x31, 0xe9, 0xea, 0x66, 0xa9, 0xf7, 0xeb, 0xb2,
-	0xc5, 0x2a, 0xc5, 0xa9, 0xac, 0x22, 0xd5, 0x54, 0x71, 0x05, 0xd2, 0x5e, 0x34, 0x76, 0x25, 0x5a,
-	0x33, 0xbd, 0xf1, 0x47, 0x5f, 0x09, 0x3e, 0xdf, 0xb7, 0xae, 0xcf, 0xff, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0x89, 0xf8, 0x21, 0xa7, 0x5f, 0x03, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/prediction_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/prediction_service.pb.go
deleted file mode 100644
index 7d6a8ada..00000000
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/prediction_service.pb.go
+++ /dev/null
@@ -1,343 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/cloud/ml/v1beta1/prediction_service.proto
-
-package ml
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api3 "google.golang.org/genproto/googleapis/api/httpbody"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// Request for predictions to be issued against a trained model.
-//
-// The body of the request is a single JSON object with a single top-level
-// field:
-//
-// <dl>
-//   <dt>instances</dt>
-//   <dd>A JSON array containing values representing the instances to use for
-//       prediction.</dd>
-// </dl>
-//
-// The structure of each element of the instances list is determined by your
-// model's input definition. Instances can include named inputs or can contain
-// only unlabeled values.
-//
-// Not all data includes named inputs. Some instances will be simple
-// JSON values (boolean, number, or string). However, instances are often lists
-// of simple values, or complex nested lists. Here are some examples of request
-// bodies:
-//
-// CSV data with each row encoded as a string value:
-// <pre>
-// {"instances": ["1.0,true,\\"x\\"", "-2.0,false,\\"y\\""]}
-// </pre>
-// Plain text:
-// <pre>
-// {"instances": ["the quick brown fox", "la bruja le dio"]}
-// </pre>
-// Sentences encoded as lists of words (vectors of strings):
-// <pre>
-// {
-//   "instances": [
-//     ["the","quick","brown"],
-//     ["la","bruja","le"],
-//     ...
-//   ]
-// }
-// </pre>
-// Floating point scalar values:
-// <pre>
-// {"instances": [0.0, 1.1, 2.2]}
-// </pre>
-// Vectors of integers:
-// <pre>
-// {
-//   "instances": [
-//     [0, 1, 2],
-//     [3, 4, 5],
-//     ...
-//   ]
-// }
-// </pre>
-// Tensors (in this case, two-dimensional tensors):
-// <pre>
-// {
-//   "instances": [
-//     [
-//       [0, 1, 2],
-//       [3, 4, 5]
-//     ],
-//     ...
-//   ]
-// }
-// </pre>
-// Images can be represented different ways. In this encoding scheme the first
-// two dimensions represent the rows and columns of the image, and the third
-// contains lists (vectors) of the R, G, and B values for each pixel.
-// <pre>
-// {
-//   "instances": [
-//     [
-//       [
-//         [138, 30, 66],
-//         [130, 20, 56],
-//         ...
-//       ],
-//       [
-//         [126, 38, 61],
-//         [122, 24, 57],
-//         ...
-//       ],
-//       ...
-//     ],
-//     ...
-//   ]
-// }
-// </pre>
-// JSON strings must be encoded as UTF-8. To send binary data, you must
-// base64-encode the data and mark it as binary. To mark a JSON string
-// as binary, replace it with a JSON object with a single attribute named `b64`:
-// <pre>{"b64": "..."} </pre>
-// For example:
-//
-// Two Serialized tf.Examples (fake data, for illustrative purposes only):
-// <pre>
-// {"instances": [{"b64": "X5ad6u"}, {"b64": "IA9j4nx"}]}
-// </pre>
-// Two JPEG image byte strings (fake data, for illustrative purposes only):
-// <pre>
-// {"instances": [{"b64": "ASa8asdf"}, {"b64": "JLK7ljk3"}]}
-// </pre>
-// If your data includes named references, format each instance as a JSON object
-// with the named references as the keys:
-//
-// JSON input data to be preprocessed:
-// <pre>
-// {
-//   "instances": [
-//     {
-//       "a": 1.0,
-//       "b": true,
-//       "c": "x"
-//     },
-//     {
-//       "a": -2.0,
-//       "b": false,
-//       "c": "y"
-//     }
-//   ]
-// }
-// </pre>
-// Some models have an underlying TensorFlow graph that accepts multiple input
-// tensors. In this case, you should use the names of JSON name/value pairs to
-// identify the input tensors, as shown in the following exmaples:
-//
-// For a graph with input tensor aliases "tag" (string) and "image"
-// (base64-encoded string):
-// <pre>
-// {
-//   "instances": [
-//     {
-//       "tag": "beach",
-//       "image": {"b64": "ASa8asdf"}
-//     },
-//     {
-//       "tag": "car",
-//       "image": {"b64": "JLK7ljk3"}
-//     }
-//   ]
-// }
-// </pre>
-// For a graph with input tensor aliases "tag" (string) and "image"
-// (3-dimensional array of 8-bit ints):
-// <pre>
-// {
-//   "instances": [
-//     {
-//       "tag": "beach",
-//       "image": [
-//         [
-//           [138, 30, 66],
-//           [130, 20, 56],
-//           ...
-//         ],
-//         [
-//           [126, 38, 61],
-//           [122, 24, 57],
-//           ...
-//         ],
-//         ...
-//       ]
-//     },
-//     {
-//       "tag": "car",
-//       "image": [
-//         [
-//           [255, 0, 102],
-//           [255, 0, 97],
-//           ...
-//         ],
-//         [
-//           [254, 1, 101],
-//           [254, 2, 93],
-//           ...
-//         ],
-//         ...
-//       ]
-//     },
-//     ...
-//   ]
-// }
-// </pre>
-// If the call is successful, the response body will contain one prediction
-// entry per instance in the request body. If prediction fails for any
-// instance, the response body will contain no predictions and will contian
-// a single error entry instead.
-type PredictRequest struct {
-	// Required. The resource name of a model or a version.
-	//
-	// Authorization: requires `Viewer` role on the parent project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	//
-	// Required. The prediction request body.
-	HttpBody *google_api3.HttpBody `protobuf:"bytes,2,opt,name=http_body,json=httpBody" json:"http_body,omitempty"`
-}
-
-func (m *PredictRequest) Reset()                    { *m = PredictRequest{} }
-func (m *PredictRequest) String() string            { return proto.CompactTextString(m) }
-func (*PredictRequest) ProtoMessage()               {}
-func (*PredictRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
-
-func (m *PredictRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *PredictRequest) GetHttpBody() *google_api3.HttpBody {
-	if m != nil {
-		return m.HttpBody
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*PredictRequest)(nil), "google.cloud.ml.v1beta1.PredictRequest")
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for OnlinePredictionService service
-
-type OnlinePredictionServiceClient interface {
-	// Performs prediction on the data in the request.
-	//
-	// **** REMOVE FROM GENERATED DOCUMENTATION
-	Predict(ctx context.Context, in *PredictRequest, opts ...grpc.CallOption) (*google_api3.HttpBody, error)
-}
-
-type onlinePredictionServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewOnlinePredictionServiceClient(cc *grpc.ClientConn) OnlinePredictionServiceClient {
-	return &onlinePredictionServiceClient{cc}
-}
-
-func (c *onlinePredictionServiceClient) Predict(ctx context.Context, in *PredictRequest, opts ...grpc.CallOption) (*google_api3.HttpBody, error) {
-	out := new(google_api3.HttpBody)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.OnlinePredictionService/Predict", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for OnlinePredictionService service
-
-type OnlinePredictionServiceServer interface {
-	// Performs prediction on the data in the request.
-	//
-	// **** REMOVE FROM GENERATED DOCUMENTATION
-	Predict(context.Context, *PredictRequest) (*google_api3.HttpBody, error)
-}
-
-func RegisterOnlinePredictionServiceServer(s *grpc.Server, srv OnlinePredictionServiceServer) {
-	s.RegisterService(&_OnlinePredictionService_serviceDesc, srv)
-}
-
-func _OnlinePredictionService_Predict_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PredictRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(OnlinePredictionServiceServer).Predict(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.OnlinePredictionService/Predict",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(OnlinePredictionServiceServer).Predict(ctx, req.(*PredictRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _OnlinePredictionService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.ml.v1beta1.OnlinePredictionService",
-	HandlerType: (*OnlinePredictionServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Predict",
-			Handler:    _OnlinePredictionService_Predict_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/ml/v1beta1/prediction_service.proto",
-}
-
-func init() { proto.RegisterFile("google/cloud/ml/v1beta1/prediction_service.proto", fileDescriptor3) }
-
-var fileDescriptor3 = []byte{
-	// 312 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x4d, 0x4a, 0x03, 0x31,
-	0x14, 0xc7, 0x49, 0x11, 0xb5, 0x11, 0x5c, 0x04, 0xb1, 0xb5, 0x08, 0x96, 0xba, 0xb0, 0x74, 0x91,
-	0xd8, 0xba, 0xb2, 0xe2, 0xa6, 0x2b, 0x77, 0x0e, 0x75, 0x21, 0xb8, 0x29, 0xe9, 0x4c, 0x48, 0x23,
-	0x99, 0xbc, 0x38, 0x93, 0x16, 0x8b, 0xb8, 0xf1, 0x0a, 0x3d, 0x9a, 0x57, 0xf0, 0x20, 0x92, 0x49,
-	0x28, 0xca, 0xe8, 0xee, 0x31, 0x6f, 0x7e, 0xef, 0xff, 0x11, 0x7c, 0x29, 0x01, 0xa4, 0x16, 0x2c,
-	0xd5, 0xb0, 0xcc, 0x58, 0xae, 0xd9, 0x6a, 0x38, 0x17, 0x8e, 0x0f, 0x99, 0x2d, 0x44, 0xa6, 0x52,
-	0xa7, 0xc0, 0xcc, 0x4a, 0x51, 0xac, 0x54, 0x2a, 0xa8, 0x2d, 0xc0, 0x01, 0x69, 0x05, 0x82, 0x56,
-	0x04, 0xcd, 0x35, 0x8d, 0x44, 0xe7, 0x34, 0x9e, 0xe2, 0x56, 0x31, 0x6e, 0x0c, 0x38, 0xee, 0xe9,
-	0x32, 0x60, 0x9d, 0x93, 0x1f, 0xdb, 0x85, 0x73, 0x76, 0x0e, 0xd9, 0x3a, 0xac, 0x7a, 0x8f, 0xf8,
-	0x30, 0x09, 0x6a, 0x53, 0xf1, 0xb2, 0x14, 0xa5, 0x23, 0x04, 0xef, 0x18, 0x9e, 0x8b, 0x36, 0xea,
-	0xa2, 0x7e, 0x73, 0x5a, 0xcd, 0x64, 0x88, 0x9b, 0x9e, 0x9b, 0x79, 0xb0, 0xdd, 0xe8, 0xa2, 0xfe,
-	0xc1, 0xe8, 0x88, 0x46, 0x2f, 0xdc, 0x2a, 0x7a, 0xe7, 0x9c, 0x9d, 0x40, 0xb6, 0x9e, 0xee, 0x2f,
-	0xe2, 0x34, 0xda, 0x20, 0xdc, 0xba, 0x37, 0x5a, 0x19, 0x91, 0x6c, 0xd3, 0x3c, 0x84, 0x30, 0xe4,
-	0x15, 0xef, 0xc5, 0x8f, 0xe4, 0x82, 0xfe, 0x13, 0x89, 0xfe, 0xb6, 0xd5, 0xf9, 0x53, 0xaf, 0x47,
-	0x3f, 0x3e, 0xbf, 0x36, 0x8d, 0x7e, 0xef, 0x7c, 0xdb, 0xdd, 0x9b, 0x37, 0x7c, 0x6b, 0x0b, 0x78,
-	0x16, 0xa9, 0x2b, 0xd9, 0x60, 0xf0, 0x3e, 0x8e, 0x75, 0x8e, 0xd1, 0x60, 0xb2, 0xc2, 0x67, 0x29,
-	0xe4, 0x35, 0x4d, 0x7f, 0x33, 0x1e, 0x98, 0x1c, 0xd7, 0xfc, 0x26, 0xbe, 0xa9, 0x04, 0x3d, 0x5d,
-	0x47, 0x4c, 0x82, 0xe6, 0x46, 0x52, 0x28, 0x24, 0x93, 0xc2, 0x54, 0x3d, 0xb2, 0xb0, 0xe2, 0x56,
-	0x95, 0xb5, 0xe7, 0xbc, 0xc9, 0xf5, 0x7c, 0xb7, 0xfa, 0xeb, 0xea, 0x3b, 0x00, 0x00, 0xff, 0xff,
-	0x00, 0x26, 0x25, 0x67, 0xf3, 0x01, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/project_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/project_service.pb.go
deleted file mode 100644
index cdf5bbc5..00000000
--- a/vendor/google.golang.org/genproto/googleapis/cloud/ml/v1beta1/project_service.pb.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/cloud/ml/v1beta1/project_service.proto
-
-package ml
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// Requests service account information associated with a project.
-type GetConfigRequest struct {
-	// Required. The project name.
-	//
-	// Authorization: requires `Viewer` role on the specified project.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *GetConfigRequest) Reset()                    { *m = GetConfigRequest{} }
-func (m *GetConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetConfigRequest) ProtoMessage()               {}
-func (*GetConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
-
-func (m *GetConfigRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Returns service account information associated with a project.
-type GetConfigResponse struct {
-	// The service account Cloud ML uses to access resources in the project.
-	ServiceAccount string `protobuf:"bytes,1,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
-	// The project number for `service_account`.
-	ServiceAccountProject int64 `protobuf:"varint,2,opt,name=service_account_project,json=serviceAccountProject" json:"service_account_project,omitempty"`
-}
-
-func (m *GetConfigResponse) Reset()                    { *m = GetConfigResponse{} }
-func (m *GetConfigResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetConfigResponse) ProtoMessage()               {}
-func (*GetConfigResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
-
-func (m *GetConfigResponse) GetServiceAccount() string {
-	if m != nil {
-		return m.ServiceAccount
-	}
-	return ""
-}
-
-func (m *GetConfigResponse) GetServiceAccountProject() int64 {
-	if m != nil {
-		return m.ServiceAccountProject
-	}
-	return 0
-}
-
-func init() {
-	proto.RegisterType((*GetConfigRequest)(nil), "google.cloud.ml.v1beta1.GetConfigRequest")
-	proto.RegisterType((*GetConfigResponse)(nil), "google.cloud.ml.v1beta1.GetConfigResponse")
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for ProjectManagementService service
-
-type ProjectManagementServiceClient interface {
-	// Get the service account information associated with your project. You need
-	// this information in order to grant the service account persmissions for
-	// the Google Cloud Storage location where you put your model training code
-	// for training the model with Google Cloud Machine Learning.
-	GetConfig(ctx context.Context, in *GetConfigRequest, opts ...grpc.CallOption) (*GetConfigResponse, error)
-}
-
-type projectManagementServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewProjectManagementServiceClient(cc *grpc.ClientConn) ProjectManagementServiceClient {
-	return &projectManagementServiceClient{cc}
-}
-
-func (c *projectManagementServiceClient) GetConfig(ctx context.Context, in *GetConfigRequest, opts ...grpc.CallOption) (*GetConfigResponse, error) {
-	out := new(GetConfigResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.ml.v1beta1.ProjectManagementService/GetConfig", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for ProjectManagementService service
-
-type ProjectManagementServiceServer interface {
-	// Get the service account information associated with your project. You need
-	// this information in order to grant the service account persmissions for
-	// the Google Cloud Storage location where you put your model training code
-	// for training the model with Google Cloud Machine Learning.
-	GetConfig(context.Context, *GetConfigRequest) (*GetConfigResponse, error)
-}
-
-func RegisterProjectManagementServiceServer(s *grpc.Server, srv ProjectManagementServiceServer) {
-	s.RegisterService(&_ProjectManagementService_serviceDesc, srv)
-}
-
-func _ProjectManagementService_GetConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetConfigRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ProjectManagementServiceServer).GetConfig(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.ml.v1beta1.ProjectManagementService/GetConfig",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProjectManagementServiceServer).GetConfig(ctx, req.(*GetConfigRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _ProjectManagementService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.ml.v1beta1.ProjectManagementService",
-	HandlerType: (*ProjectManagementServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "GetConfig",
-			Handler:    _ProjectManagementService_GetConfig_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/cloud/ml/v1beta1/project_service.proto",
-}
-
-func init() { proto.RegisterFile("google/cloud/ml/v1beta1/project_service.proto", fileDescriptor4) }
-
-var fileDescriptor4 = []byte{
-	// 327 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4f, 0x4a, 0x43, 0x31,
-	0x10, 0xc6, 0x79, 0x55, 0x84, 0x66, 0xe1, 0x9f, 0x88, 0xb4, 0x14, 0xc1, 0x52, 0xa4, 0xd6, 0xa2,
-	0x09, 0x55, 0x10, 0x54, 0x5c, 0x58, 0x17, 0xae, 0x84, 0x52, 0x77, 0x6e, 0x4a, 0xfa, 0x1c, 0xc3,
-	0x93, 0x24, 0x13, 0x5f, 0xd2, 0x6e, 0xc4, 0x8d, 0x27, 0x10, 0x3c, 0x87, 0xa7, 0xf1, 0x0a, 0x1e,
-	0x44, 0xfa, 0x92, 0x16, 0x6d, 0x11, 0xdc, 0x0d, 0x33, 0xbf, 0x6f, 0x32, 0xdf, 0x4c, 0xc8, 0xa1,
-	0x44, 0x94, 0x0a, 0x78, 0xaa, 0x70, 0x74, 0xcf, 0xb5, 0xe2, 0xe3, 0xce, 0x10, 0xbc, 0xe8, 0x70,
-	0x9b, 0xe3, 0x23, 0xa4, 0x7e, 0xe0, 0x20, 0x1f, 0x67, 0x29, 0x30, 0x9b, 0xa3, 0x47, 0x5a, 0x09,
-	0x38, 0x2b, 0x70, 0xa6, 0x15, 0x8b, 0x78, 0x6d, 0x3b, 0xf6, 0x11, 0x36, 0xe3, 0xc2, 0x18, 0xf4,
-	0xc2, 0x67, 0x68, 0x5c, 0x90, 0x35, 0x9a, 0x64, 0xfd, 0x1a, 0xfc, 0x15, 0x9a, 0x87, 0x4c, 0xf6,
-	0xe1, 0x69, 0x04, 0xce, 0x53, 0x4a, 0x96, 0x8d, 0xd0, 0x50, 0x4d, 0xea, 0x49, 0xab, 0xdc, 0x2f,
-	0xe2, 0x86, 0x27, 0x1b, 0x3f, 0x38, 0x67, 0xd1, 0x38, 0xa0, 0x7b, 0x64, 0x2d, 0x0e, 0x31, 0x10,
-	0x69, 0x8a, 0x23, 0xe3, 0xa3, 0x66, 0x35, 0xa6, 0x2f, 0x43, 0x96, 0x9e, 0x90, 0xca, 0x1c, 0x38,
-	0x88, 0x2e, 0xaa, 0xa5, 0x7a, 0xd2, 0x5a, 0xea, 0x6f, 0xfd, 0x16, 0xf4, 0x42, 0xf1, 0xe8, 0x23,
-	0x21, 0xd5, 0x18, 0xdf, 0x08, 0x23, 0x24, 0x68, 0x30, 0xfe, 0x36, 0xa0, 0xf4, 0x2d, 0x21, 0xe5,
-	0xd9, 0x4c, 0x74, 0x9f, 0xfd, 0xb1, 0x00, 0x36, 0xef, 0xaf, 0xd6, 0xfe, 0x0f, 0x1a, 0x2c, 0x36,
-	0x0e, 0x5e, 0x3f, 0xbf, 0xde, 0x4b, 0x4d, 0xba, 0x3b, 0x5b, 0xff, 0xf3, 0x64, 0x1f, 0x17, 0x71,
-	0x7c, 0xc7, 0xdb, 0x2f, 0x67, 0x72, 0xaa, 0xea, 0x3a, 0xb2, 0x93, 0xa2, 0x5e, 0x68, 0x2f, 0x6c,
-	0x36, 0x7d, 0xa2, 0xbb, 0x19, 0xfd, 0x44, 0x17, 0xbd, 0xc9, 0x15, 0x7a, 0xc9, 0xdd, 0x69, 0xd4,
-	0x48, 0x54, 0xc2, 0x48, 0x86, 0xb9, 0xe4, 0x12, 0x4c, 0x71, 0x23, 0x1e, 0x4a, 0xc2, 0x66, 0x6e,
-	0xe1, 0x33, 0x9c, 0x6b, 0x35, 0x5c, 0x29, 0xa8, 0xe3, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x76,
-	0x59, 0xc4, 0x91, 0x31, 0x02, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/common/common.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/common/common.pb.go
index 28d69481..17444de7 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/common/common.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/common/common.pb.go
@@ -1,17 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/common/common.proto
 
-/*
-Package common is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/oslogin/common/common.proto
-
-It has these top-level messages:
-	PosixAccount
-	SshPublicKey
-*/
-package common
+package common // import "google.golang.org/genproto/googleapis/cloud/oslogin/common"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -32,30 +22,52 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // The POSIX account information associated with a Google account.
 type PosixAccount struct {
 	// Only one POSIX account can be marked as primary.
-	Primary bool `protobuf:"varint,1,opt,name=primary" json:"primary,omitempty"`
+	Primary bool `protobuf:"varint,1,opt,name=primary,proto3" json:"primary,omitempty"`
 	// The username of the POSIX account.
-	Username string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
 	// The user ID.
-	Uid int64 `protobuf:"varint,3,opt,name=uid" json:"uid,omitempty"`
+	Uid int64 `protobuf:"varint,3,opt,name=uid,proto3" json:"uid,omitempty"`
 	// The default group ID.
-	Gid int64 `protobuf:"varint,4,opt,name=gid" json:"gid,omitempty"`
+	Gid int64 `protobuf:"varint,4,opt,name=gid,proto3" json:"gid,omitempty"`
 	// The path to the home directory for this account.
-	HomeDirectory string `protobuf:"bytes,5,opt,name=home_directory,json=homeDirectory" json:"home_directory,omitempty"`
+	HomeDirectory string `protobuf:"bytes,5,opt,name=home_directory,json=homeDirectory,proto3" json:"home_directory,omitempty"`
 	// The path to the logic shell for this account.
-	Shell string `protobuf:"bytes,6,opt,name=shell" json:"shell,omitempty"`
+	Shell string `protobuf:"bytes,6,opt,name=shell,proto3" json:"shell,omitempty"`
 	// The GECOS (user information) entry for this account.
-	Gecos string `protobuf:"bytes,7,opt,name=gecos" json:"gecos,omitempty"`
+	Gecos string `protobuf:"bytes,7,opt,name=gecos,proto3" json:"gecos,omitempty"`
 	// System identifier for which account the username or uid applies to.
 	// By default, the empty value is used.
-	SystemId string `protobuf:"bytes,8,opt,name=system_id,json=systemId" json:"system_id,omitempty"`
+	SystemId string `protobuf:"bytes,8,opt,name=system_id,json=systemId,proto3" json:"system_id,omitempty"`
 	// Output only. A POSIX account identifier.
-	AccountId string `protobuf:"bytes,9,opt,name=account_id,json=accountId" json:"account_id,omitempty"`
+	AccountId            string   `protobuf:"bytes,9,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PosixAccount) Reset()         { *m = PosixAccount{} }
+func (m *PosixAccount) String() string { return proto.CompactTextString(m) }
+func (*PosixAccount) ProtoMessage()    {}
+func (*PosixAccount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_ebba42564a5ff09e, []int{0}
+}
+func (m *PosixAccount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PosixAccount.Unmarshal(m, b)
+}
+func (m *PosixAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PosixAccount.Marshal(b, m, deterministic)
+}
+func (dst *PosixAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PosixAccount.Merge(dst, src)
+}
+func (m *PosixAccount) XXX_Size() int {
+	return xxx_messageInfo_PosixAccount.Size(m)
+}
+func (m *PosixAccount) XXX_DiscardUnknown() {
+	xxx_messageInfo_PosixAccount.DiscardUnknown(m)
 }
 
-func (m *PosixAccount) Reset()                    { *m = PosixAccount{} }
-func (m *PosixAccount) String() string            { return proto.CompactTextString(m) }
-func (*PosixAccount) ProtoMessage()               {}
-func (*PosixAccount) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_PosixAccount proto.InternalMessageInfo
 
 func (m *PosixAccount) GetPrimary() bool {
 	if m != nil {
@@ -125,17 +137,39 @@ type SshPublicKey struct {
 	// Public key text in SSH format, defined by
 	// <a href="https://www.ietf.org/rfc/rfc4253.txt" target="_blank">RFC4253</a>
 	// section 6.6.
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// An expiration time in microseconds since epoch.
-	ExpirationTimeUsec int64 `protobuf:"varint,2,opt,name=expiration_time_usec,json=expirationTimeUsec" json:"expiration_time_usec,omitempty"`
+	ExpirationTimeUsec int64 `protobuf:"varint,2,opt,name=expiration_time_usec,json=expirationTimeUsec,proto3" json:"expiration_time_usec,omitempty"`
 	// Output only. The SHA-256 fingerprint of the SSH public key.
-	Fingerprint string `protobuf:"bytes,3,opt,name=fingerprint" json:"fingerprint,omitempty"`
+	Fingerprint          string   `protobuf:"bytes,3,opt,name=fingerprint,proto3" json:"fingerprint,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SshPublicKey) Reset()                    { *m = SshPublicKey{} }
-func (m *SshPublicKey) String() string            { return proto.CompactTextString(m) }
-func (*SshPublicKey) ProtoMessage()               {}
-func (*SshPublicKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *SshPublicKey) Reset()         { *m = SshPublicKey{} }
+func (m *SshPublicKey) String() string { return proto.CompactTextString(m) }
+func (*SshPublicKey) ProtoMessage()    {}
+func (*SshPublicKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_ebba42564a5ff09e, []int{1}
+}
+func (m *SshPublicKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SshPublicKey.Unmarshal(m, b)
+}
+func (m *SshPublicKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SshPublicKey.Marshal(b, m, deterministic)
+}
+func (dst *SshPublicKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SshPublicKey.Merge(dst, src)
+}
+func (m *SshPublicKey) XXX_Size() int {
+	return xxx_messageInfo_SshPublicKey.Size(m)
+}
+func (m *SshPublicKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_SshPublicKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SshPublicKey proto.InternalMessageInfo
 
 func (m *SshPublicKey) GetKey() string {
 	if m != nil {
@@ -163,9 +197,11 @@ func init() {
 	proto.RegisterType((*SshPublicKey)(nil), "google.cloud.oslogin.common.SshPublicKey")
 }
 
-func init() { proto.RegisterFile("google/cloud/oslogin/common/common.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/oslogin/common/common.proto", fileDescriptor_common_ebba42564a5ff09e)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_common_ebba42564a5ff09e = []byte{
 	// 406 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x6b, 0x14, 0x31,
 	0x14, 0xc7, 0x99, 0xae, 0x6d, 0x77, 0xe2, 0x2a, 0x12, 0x7a, 0x08, 0x5d, 0xc5, 0xa5, 0x20, 0xec,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1/oslogin.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1/oslogin.pb.go
index 9ebcb38a..d33d1cab 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1/oslogin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1/oslogin.pb.go
@@ -1,31 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1/oslogin.proto
 
-/*
-Package oslogin is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/oslogin/v1/oslogin.proto
-
-It has these top-level messages:
-	LoginProfile
-	DeletePosixAccountRequest
-	DeleteSshPublicKeyRequest
-	GetLoginProfileRequest
-	GetSshPublicKeyRequest
-	ImportSshPublicKeyRequest
-	ImportSshPublicKeyResponse
-	UpdateSshPublicKeyRequest
-*/
-package oslogin
+package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_cloud_oslogin_common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
+import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -47,20 +31,42 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Google Compute Engine.
 type LoginProfile struct {
 	// The primary email address that uniquely identifies the user.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The list of POSIX accounts associated with the user.
-	PosixAccounts []*google_cloud_oslogin_common.PosixAccount `protobuf:"bytes,2,rep,name=posix_accounts,json=posixAccounts" json:"posix_accounts,omitempty"`
+	PosixAccounts []*common.PosixAccount `protobuf:"bytes,2,rep,name=posix_accounts,json=posixAccounts,proto3" json:"posix_accounts,omitempty"`
 	// A map from SSH public key fingerprint to the associated key object.
-	SshPublicKeys map[string]*google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,3,rep,name=ssh_public_keys,json=sshPublicKeys" json:"ssh_public_keys,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	SshPublicKeys map[string]*common.SshPublicKey `protobuf:"bytes,3,rep,name=ssh_public_keys,json=sshPublicKeys,proto3" json:"ssh_public_keys,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Indicates if the user is suspended. A suspended user cannot log in but
 	// their profile information is retained.
-	Suspended bool `protobuf:"varint,4,opt,name=suspended" json:"suspended,omitempty"`
+	Suspended            bool     `protobuf:"varint,4,opt,name=suspended,proto3" json:"suspended,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *LoginProfile) Reset()                    { *m = LoginProfile{} }
-func (m *LoginProfile) String() string            { return proto.CompactTextString(m) }
-func (*LoginProfile) ProtoMessage()               {}
-func (*LoginProfile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *LoginProfile) Reset()         { *m = LoginProfile{} }
+func (m *LoginProfile) String() string { return proto.CompactTextString(m) }
+func (*LoginProfile) ProtoMessage()    {}
+func (*LoginProfile) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_45adadde0ac6d3e5, []int{0}
+}
+func (m *LoginProfile) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoginProfile.Unmarshal(m, b)
+}
+func (m *LoginProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoginProfile.Marshal(b, m, deterministic)
+}
+func (dst *LoginProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoginProfile.Merge(dst, src)
+}
+func (m *LoginProfile) XXX_Size() int {
+	return xxx_messageInfo_LoginProfile.Size(m)
+}
+func (m *LoginProfile) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoginProfile.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LoginProfile proto.InternalMessageInfo
 
 func (m *LoginProfile) GetName() string {
 	if m != nil {
@@ -69,14 +75,14 @@ func (m *LoginProfile) GetName() string {
 	return ""
 }
 
-func (m *LoginProfile) GetPosixAccounts() []*google_cloud_oslogin_common.PosixAccount {
+func (m *LoginProfile) GetPosixAccounts() []*common.PosixAccount {
 	if m != nil {
 		return m.PosixAccounts
 	}
 	return nil
 }
 
-func (m *LoginProfile) GetSshPublicKeys() map[string]*google_cloud_oslogin_common.SshPublicKey {
+func (m *LoginProfile) GetSshPublicKeys() map[string]*common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKeys
 	}
@@ -95,13 +101,35 @@ type DeletePosixAccountRequest struct {
 	// A reference to the POSIX account to update. POSIX accounts are identified
 	// by the project ID they are associated with. A reference to the POSIX
 	// account is in format `users/{user}/projects/{project}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeletePosixAccountRequest) Reset()                    { *m = DeletePosixAccountRequest{} }
-func (m *DeletePosixAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeletePosixAccountRequest) ProtoMessage()               {}
-func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *DeletePosixAccountRequest) Reset()         { *m = DeletePosixAccountRequest{} }
+func (m *DeletePosixAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*DeletePosixAccountRequest) ProtoMessage()    {}
+func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_45adadde0ac6d3e5, []int{1}
+}
+func (m *DeletePosixAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeletePosixAccountRequest.Unmarshal(m, b)
+}
+func (m *DeletePosixAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeletePosixAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePosixAccountRequest.Merge(dst, src)
+}
+func (m *DeletePosixAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_DeletePosixAccountRequest.Size(m)
+}
+func (m *DeletePosixAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeletePosixAccountRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeletePosixAccountRequest proto.InternalMessageInfo
 
 func (m *DeletePosixAccountRequest) GetName() string {
 	if m != nil {
@@ -115,13 +143,35 @@ type DeleteSshPublicKeyRequest struct {
 	// The fingerprint of the public key to update. Public keys are identified by
 	// their SHA-256 fingerprint. The fingerprint of the public key is in format
 	// `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSshPublicKeyRequest) Reset()         { *m = DeleteSshPublicKeyRequest{} }
+func (m *DeleteSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSshPublicKeyRequest) ProtoMessage()    {}
+func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_45adadde0ac6d3e5, []int{2}
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Size(m)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteSshPublicKeyRequest) Reset()                    { *m = DeleteSshPublicKeyRequest{} }
-func (m *DeleteSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSshPublicKeyRequest) ProtoMessage()               {}
-func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_DeleteSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *DeleteSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -133,13 +183,35 @@ func (m *DeleteSshPublicKeyRequest) GetName() string {
 // A request message for retrieving the login profile information for a user.
 type GetLoginProfileRequest struct {
 	// The unique ID for the user in format `users/{user}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetLoginProfileRequest) Reset()                    { *m = GetLoginProfileRequest{} }
-func (m *GetLoginProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetLoginProfileRequest) ProtoMessage()               {}
-func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *GetLoginProfileRequest) Reset()         { *m = GetLoginProfileRequest{} }
+func (m *GetLoginProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*GetLoginProfileRequest) ProtoMessage()    {}
+func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_45adadde0ac6d3e5, []int{3}
+}
+func (m *GetLoginProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetLoginProfileRequest.Unmarshal(m, b)
+}
+func (m *GetLoginProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetLoginProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLoginProfileRequest.Merge(dst, src)
+}
+func (m *GetLoginProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_GetLoginProfileRequest.Size(m)
+}
+func (m *GetLoginProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetLoginProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetLoginProfileRequest proto.InternalMessageInfo
 
 func (m *GetLoginProfileRequest) GetName() string {
 	if m != nil {
@@ -153,13 +225,35 @@ type GetSshPublicKeyRequest struct {
 	// The fingerprint of the public key to retrieve. Public keys are identified
 	// by their SHA-256 fingerprint. The fingerprint of the public key is in
 	// format `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSshPublicKeyRequest) Reset()         { *m = GetSshPublicKeyRequest{} }
+func (m *GetSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSshPublicKeyRequest) ProtoMessage()    {}
+func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_45adadde0ac6d3e5, []int{4}
+}
+func (m *GetSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *GetSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *GetSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Size(m)
+}
+func (m *GetSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSshPublicKeyRequest.DiscardUnknown(m)
 }
 
-func (m *GetSshPublicKeyRequest) Reset()                    { *m = GetSshPublicKeyRequest{} }
-func (m *GetSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSshPublicKeyRequest) ProtoMessage()               {}
-func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_GetSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *GetSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -171,17 +265,39 @@ func (m *GetSshPublicKeyRequest) GetName() string {
 // A request message for importing an SSH public key.
 type ImportSshPublicKeyRequest struct {
 	// The unique ID for the user in format `users/{user}`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The SSH public key and expiration time.
-	SshPublicKey *google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey" json:"ssh_public_key,omitempty"`
+	SshPublicKey *common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey,proto3" json:"ssh_public_key,omitempty"`
 	// The project ID of the Google Cloud Platform project.
-	ProjectId string `protobuf:"bytes,3,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId            string   `protobuf:"bytes,3,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ImportSshPublicKeyRequest) Reset()                    { *m = ImportSshPublicKeyRequest{} }
-func (m *ImportSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*ImportSshPublicKeyRequest) ProtoMessage()               {}
-func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ImportSshPublicKeyRequest) Reset()         { *m = ImportSshPublicKeyRequest{} }
+func (m *ImportSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportSshPublicKeyRequest) ProtoMessage()    {}
+func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_45adadde0ac6d3e5, []int{5}
+}
+func (m *ImportSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *ImportSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *ImportSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Size(m)
+}
+func (m *ImportSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportSshPublicKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *ImportSshPublicKeyRequest) GetParent() string {
 	if m != nil {
@@ -190,7 +306,7 @@ func (m *ImportSshPublicKeyRequest) GetParent() string {
 	return ""
 }
 
-func (m *ImportSshPublicKeyRequest) GetSshPublicKey() *google_cloud_oslogin_common.SshPublicKey {
+func (m *ImportSshPublicKeyRequest) GetSshPublicKey() *common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKey
 	}
@@ -207,13 +323,35 @@ func (m *ImportSshPublicKeyRequest) GetProjectId() string {
 // A response message for importing an SSH public key.
 type ImportSshPublicKeyResponse struct {
 	// The login profile information for the user.
-	LoginProfile *LoginProfile `protobuf:"bytes,1,opt,name=login_profile,json=loginProfile" json:"login_profile,omitempty"`
+	LoginProfile         *LoginProfile `protobuf:"bytes,1,opt,name=login_profile,json=loginProfile,proto3" json:"login_profile,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ImportSshPublicKeyResponse) Reset()         { *m = ImportSshPublicKeyResponse{} }
+func (m *ImportSshPublicKeyResponse) String() string { return proto.CompactTextString(m) }
+func (*ImportSshPublicKeyResponse) ProtoMessage()    {}
+func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_45adadde0ac6d3e5, []int{6}
+}
+func (m *ImportSshPublicKeyResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Unmarshal(m, b)
+}
+func (m *ImportSshPublicKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Marshal(b, m, deterministic)
+}
+func (dst *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(dst, src)
+}
+func (m *ImportSshPublicKeyResponse) XXX_Size() int {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Size(m)
+}
+func (m *ImportSshPublicKeyResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportSshPublicKeyResponse.DiscardUnknown(m)
 }
 
-func (m *ImportSshPublicKeyResponse) Reset()                    { *m = ImportSshPublicKeyResponse{} }
-func (m *ImportSshPublicKeyResponse) String() string            { return proto.CompactTextString(m) }
-func (*ImportSshPublicKeyResponse) ProtoMessage()               {}
-func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ImportSshPublicKeyResponse proto.InternalMessageInfo
 
 func (m *ImportSshPublicKeyResponse) GetLoginProfile() *LoginProfile {
 	if m != nil {
@@ -227,17 +365,39 @@ type UpdateSshPublicKeyRequest struct {
 	// The fingerprint of the public key to update. Public keys are identified by
 	// their SHA-256 fingerprint. The fingerprint of the public key is in format
 	// `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The SSH public key and expiration time.
-	SshPublicKey *google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey" json:"ssh_public_key,omitempty"`
+	SshPublicKey *common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey,proto3" json:"ssh_public_key,omitempty"`
 	// Mask to control which fields get updated. Updates all if not present.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateSshPublicKeyRequest) Reset()                    { *m = UpdateSshPublicKeyRequest{} }
-func (m *UpdateSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateSshPublicKeyRequest) ProtoMessage()               {}
-func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *UpdateSshPublicKeyRequest) Reset()         { *m = UpdateSshPublicKeyRequest{} }
+func (m *UpdateSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateSshPublicKeyRequest) ProtoMessage()    {}
+func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_45adadde0ac6d3e5, []int{7}
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Size(m)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *UpdateSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -246,14 +406,14 @@ func (m *UpdateSshPublicKeyRequest) GetName() string {
 	return ""
 }
 
-func (m *UpdateSshPublicKeyRequest) GetSshPublicKey() *google_cloud_oslogin_common.SshPublicKey {
+func (m *UpdateSshPublicKeyRequest) GetSshPublicKey() *common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKey
 	}
 	return nil
 }
 
-func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -262,6 +422,7 @@ func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *google_protobuf2.FieldMask
 
 func init() {
 	proto.RegisterType((*LoginProfile)(nil), "google.cloud.oslogin.v1.LoginProfile")
+	proto.RegisterMapType((map[string]*common.SshPublicKey)(nil), "google.cloud.oslogin.v1.LoginProfile.SshPublicKeysEntry")
 	proto.RegisterType((*DeletePosixAccountRequest)(nil), "google.cloud.oslogin.v1.DeletePosixAccountRequest")
 	proto.RegisterType((*DeleteSshPublicKeyRequest)(nil), "google.cloud.oslogin.v1.DeleteSshPublicKeyRequest")
 	proto.RegisterType((*GetLoginProfileRequest)(nil), "google.cloud.oslogin.v1.GetLoginProfileRequest")
@@ -279,25 +440,26 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for OsLoginService service
-
+// OsLoginServiceClient is the client API for OsLoginService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type OsLoginServiceClient interface {
 	// Deletes a POSIX account.
-	DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Deletes an SSH public key.
-	DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Retrieves the profile information used for logging in to a virtual machine
 	// on Google Compute Engine.
 	GetLoginProfile(ctx context.Context, in *GetLoginProfileRequest, opts ...grpc.CallOption) (*LoginProfile, error)
 	// Retrieves an SSH public key.
-	GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error)
+	GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error)
 	// Adds an SSH public key and returns the profile information. Default POSIX
 	// account information is set when no username and UID exist as part of the
 	// login profile.
 	ImportSshPublicKey(ctx context.Context, in *ImportSshPublicKeyRequest, opts ...grpc.CallOption) (*ImportSshPublicKeyResponse, error)
 	// Updates an SSH public key and returns the profile information. This method
 	// supports patch semantics.
-	UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error)
+	UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error)
 }
 
 type osLoginServiceClient struct {
@@ -308,18 +470,18 @@ func NewOsLoginServiceClient(cc *grpc.ClientConn) OsLoginServiceClient {
 	return &osLoginServiceClient{cc}
 }
 
-func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/DeletePosixAccount", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/DeletePosixAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/DeleteSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/DeleteSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -328,16 +490,16 @@ func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *Delet
 
 func (c *osLoginServiceClient) GetLoginProfile(ctx context.Context, in *GetLoginProfileRequest, opts ...grpc.CallOption) (*LoginProfile, error) {
 	out := new(LoginProfile)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/GetLoginProfile", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/GetLoginProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error) {
-	out := new(google_cloud_oslogin_common.SshPublicKey)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/GetSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error) {
+	out := new(common.SshPublicKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/GetSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -346,41 +508,40 @@ func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPu
 
 func (c *osLoginServiceClient) ImportSshPublicKey(ctx context.Context, in *ImportSshPublicKeyRequest, opts ...grpc.CallOption) (*ImportSshPublicKeyResponse, error) {
 	out := new(ImportSshPublicKeyResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/ImportSshPublicKey", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/ImportSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error) {
-	out := new(google_cloud_oslogin_common.SshPublicKey)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/UpdateSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error) {
+	out := new(common.SshPublicKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/UpdateSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for OsLoginService service
-
+// OsLoginServiceServer is the server API for OsLoginService service.
 type OsLoginServiceServer interface {
 	// Deletes a POSIX account.
-	DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*google_protobuf1.Empty, error)
+	DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*empty.Empty, error)
 	// Deletes an SSH public key.
-	DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*google_protobuf1.Empty, error)
+	DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*empty.Empty, error)
 	// Retrieves the profile information used for logging in to a virtual machine
 	// on Google Compute Engine.
 	GetLoginProfile(context.Context, *GetLoginProfileRequest) (*LoginProfile, error)
 	// Retrieves an SSH public key.
-	GetSshPublicKey(context.Context, *GetSshPublicKeyRequest) (*google_cloud_oslogin_common.SshPublicKey, error)
+	GetSshPublicKey(context.Context, *GetSshPublicKeyRequest) (*common.SshPublicKey, error)
 	// Adds an SSH public key and returns the profile information. Default POSIX
 	// account information is set when no username and UID exist as part of the
 	// login profile.
 	ImportSshPublicKey(context.Context, *ImportSshPublicKeyRequest) (*ImportSshPublicKeyResponse, error)
 	// Updates an SSH public key and returns the profile information. This method
 	// supports patch semantics.
-	UpdateSshPublicKey(context.Context, *UpdateSshPublicKeyRequest) (*google_cloud_oslogin_common.SshPublicKey, error)
+	UpdateSshPublicKey(context.Context, *UpdateSshPublicKeyRequest) (*common.SshPublicKey, error)
 }
 
 func RegisterOsLoginServiceServer(s *grpc.Server, srv OsLoginServiceServer) {
@@ -528,9 +689,11 @@ var _OsLoginService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/oslogin/v1/oslogin.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/oslogin/v1/oslogin.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/oslogin/v1/oslogin.proto", fileDescriptor_oslogin_45adadde0ac6d3e5)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_oslogin_45adadde0ac6d3e5 = []byte{
 	// 774 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xd3, 0x40,
 	0x10, 0x96, 0x93, 0x52, 0xe8, 0x26, 0x6d, 0xd1, 0x1e, 0xda, 0xd4, 0x6d, 0xd5, 0x60, 0x51, 0x35,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
index 5fbc3b30..5da64430 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1alpha/oslogin.pb.go
@@ -1,31 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1alpha/oslogin.proto
 
-/*
-Package oslogin is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/oslogin/v1alpha/oslogin.proto
-
-It has these top-level messages:
-	LoginProfile
-	DeletePosixAccountRequest
-	DeleteSshPublicKeyRequest
-	GetLoginProfileRequest
-	GetSshPublicKeyRequest
-	ImportSshPublicKeyRequest
-	ImportSshPublicKeyResponse
-	UpdateSshPublicKeyRequest
-*/
-package oslogin
+package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1alpha"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_cloud_oslogin_common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
+import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -47,19 +31,41 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Google Compute Engine.
 type LoginProfile struct {
 	// A unique user ID for identifying the user.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The list of POSIX accounts associated with the Directory API user.
-	PosixAccounts []*google_cloud_oslogin_common.PosixAccount `protobuf:"bytes,2,rep,name=posix_accounts,json=posixAccounts" json:"posix_accounts,omitempty"`
+	PosixAccounts []*common.PosixAccount `protobuf:"bytes,2,rep,name=posix_accounts,json=posixAccounts,proto3" json:"posix_accounts,omitempty"`
 	// A map from SSH public key fingerprint to the associated key object.
-	SshPublicKeys map[string]*google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,3,rep,name=ssh_public_keys,json=sshPublicKeys" json:"ssh_public_keys,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	SshPublicKeys map[string]*common.SshPublicKey `protobuf:"bytes,3,rep,name=ssh_public_keys,json=sshPublicKeys,proto3" json:"ssh_public_keys,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Indicates if the user is suspended.
-	Suspended bool `protobuf:"varint,4,opt,name=suspended" json:"suspended,omitempty"`
+	Suspended            bool     `protobuf:"varint,4,opt,name=suspended,proto3" json:"suspended,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *LoginProfile) Reset()                    { *m = LoginProfile{} }
-func (m *LoginProfile) String() string            { return proto.CompactTextString(m) }
-func (*LoginProfile) ProtoMessage()               {}
-func (*LoginProfile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *LoginProfile) Reset()         { *m = LoginProfile{} }
+func (m *LoginProfile) String() string { return proto.CompactTextString(m) }
+func (*LoginProfile) ProtoMessage()    {}
+func (*LoginProfile) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_9160791ccb698e5f, []int{0}
+}
+func (m *LoginProfile) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoginProfile.Unmarshal(m, b)
+}
+func (m *LoginProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoginProfile.Marshal(b, m, deterministic)
+}
+func (dst *LoginProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoginProfile.Merge(dst, src)
+}
+func (m *LoginProfile) XXX_Size() int {
+	return xxx_messageInfo_LoginProfile.Size(m)
+}
+func (m *LoginProfile) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoginProfile.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LoginProfile proto.InternalMessageInfo
 
 func (m *LoginProfile) GetName() string {
 	if m != nil {
@@ -68,14 +74,14 @@ func (m *LoginProfile) GetName() string {
 	return ""
 }
 
-func (m *LoginProfile) GetPosixAccounts() []*google_cloud_oslogin_common.PosixAccount {
+func (m *LoginProfile) GetPosixAccounts() []*common.PosixAccount {
 	if m != nil {
 		return m.PosixAccounts
 	}
 	return nil
 }
 
-func (m *LoginProfile) GetSshPublicKeys() map[string]*google_cloud_oslogin_common.SshPublicKey {
+func (m *LoginProfile) GetSshPublicKeys() map[string]*common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKeys
 	}
@@ -94,13 +100,35 @@ type DeletePosixAccountRequest struct {
 	// A reference to the POSIX account to update. POSIX accounts are identified
 	// by the project ID they are associated with. A reference to the POSIX
 	// account is in format `users/{user}/projects/{project}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeletePosixAccountRequest) Reset()                    { *m = DeletePosixAccountRequest{} }
-func (m *DeletePosixAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeletePosixAccountRequest) ProtoMessage()               {}
-func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *DeletePosixAccountRequest) Reset()         { *m = DeletePosixAccountRequest{} }
+func (m *DeletePosixAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*DeletePosixAccountRequest) ProtoMessage()    {}
+func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_9160791ccb698e5f, []int{1}
+}
+func (m *DeletePosixAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeletePosixAccountRequest.Unmarshal(m, b)
+}
+func (m *DeletePosixAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeletePosixAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePosixAccountRequest.Merge(dst, src)
+}
+func (m *DeletePosixAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_DeletePosixAccountRequest.Size(m)
+}
+func (m *DeletePosixAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeletePosixAccountRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeletePosixAccountRequest proto.InternalMessageInfo
 
 func (m *DeletePosixAccountRequest) GetName() string {
 	if m != nil {
@@ -114,13 +142,35 @@ type DeleteSshPublicKeyRequest struct {
 	// The fingerprint of the public key to update. Public keys are identified by
 	// their SHA-256 fingerprint. The fingerprint of the public key is in format
 	// `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSshPublicKeyRequest) Reset()         { *m = DeleteSshPublicKeyRequest{} }
+func (m *DeleteSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSshPublicKeyRequest) ProtoMessage()    {}
+func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_9160791ccb698e5f, []int{2}
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Size(m)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteSshPublicKeyRequest) Reset()                    { *m = DeleteSshPublicKeyRequest{} }
-func (m *DeleteSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSshPublicKeyRequest) ProtoMessage()               {}
-func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_DeleteSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *DeleteSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -132,13 +182,35 @@ func (m *DeleteSshPublicKeyRequest) GetName() string {
 // A request message for retrieving the login profile information for a user.
 type GetLoginProfileRequest struct {
 	// The unique ID for the user in format `users/{user}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetLoginProfileRequest) Reset()                    { *m = GetLoginProfileRequest{} }
-func (m *GetLoginProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetLoginProfileRequest) ProtoMessage()               {}
-func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *GetLoginProfileRequest) Reset()         { *m = GetLoginProfileRequest{} }
+func (m *GetLoginProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*GetLoginProfileRequest) ProtoMessage()    {}
+func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_9160791ccb698e5f, []int{3}
+}
+func (m *GetLoginProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetLoginProfileRequest.Unmarshal(m, b)
+}
+func (m *GetLoginProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetLoginProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLoginProfileRequest.Merge(dst, src)
+}
+func (m *GetLoginProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_GetLoginProfileRequest.Size(m)
+}
+func (m *GetLoginProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetLoginProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetLoginProfileRequest proto.InternalMessageInfo
 
 func (m *GetLoginProfileRequest) GetName() string {
 	if m != nil {
@@ -152,13 +224,35 @@ type GetSshPublicKeyRequest struct {
 	// The fingerprint of the public key to retrieve. Public keys are identified
 	// by their SHA-256 fingerprint. The fingerprint of the public key is in
 	// format `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSshPublicKeyRequest) Reset()         { *m = GetSshPublicKeyRequest{} }
+func (m *GetSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSshPublicKeyRequest) ProtoMessage()    {}
+func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_9160791ccb698e5f, []int{4}
+}
+func (m *GetSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *GetSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *GetSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Size(m)
+}
+func (m *GetSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSshPublicKeyRequest.DiscardUnknown(m)
 }
 
-func (m *GetSshPublicKeyRequest) Reset()                    { *m = GetSshPublicKeyRequest{} }
-func (m *GetSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSshPublicKeyRequest) ProtoMessage()               {}
-func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_GetSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *GetSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -170,17 +264,39 @@ func (m *GetSshPublicKeyRequest) GetName() string {
 // A request message for importing an SSH public key.
 type ImportSshPublicKeyRequest struct {
 	// The unique ID for the user in format `users/{user}`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The SSH public key and expiration time.
-	SshPublicKey *google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey" json:"ssh_public_key,omitempty"`
+	SshPublicKey *common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey,proto3" json:"ssh_public_key,omitempty"`
 	// The project ID of the Google Cloud Platform project.
-	ProjectId string `protobuf:"bytes,3,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId            string   `protobuf:"bytes,3,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ImportSshPublicKeyRequest) Reset()                    { *m = ImportSshPublicKeyRequest{} }
-func (m *ImportSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*ImportSshPublicKeyRequest) ProtoMessage()               {}
-func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ImportSshPublicKeyRequest) Reset()         { *m = ImportSshPublicKeyRequest{} }
+func (m *ImportSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportSshPublicKeyRequest) ProtoMessage()    {}
+func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_9160791ccb698e5f, []int{5}
+}
+func (m *ImportSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *ImportSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *ImportSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Size(m)
+}
+func (m *ImportSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportSshPublicKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *ImportSshPublicKeyRequest) GetParent() string {
 	if m != nil {
@@ -189,7 +305,7 @@ func (m *ImportSshPublicKeyRequest) GetParent() string {
 	return ""
 }
 
-func (m *ImportSshPublicKeyRequest) GetSshPublicKey() *google_cloud_oslogin_common.SshPublicKey {
+func (m *ImportSshPublicKeyRequest) GetSshPublicKey() *common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKey
 	}
@@ -206,13 +322,35 @@ func (m *ImportSshPublicKeyRequest) GetProjectId() string {
 // A response message for importing an SSH public key.
 type ImportSshPublicKeyResponse struct {
 	// The login profile information for the user.
-	LoginProfile *LoginProfile `protobuf:"bytes,1,opt,name=login_profile,json=loginProfile" json:"login_profile,omitempty"`
+	LoginProfile         *LoginProfile `protobuf:"bytes,1,opt,name=login_profile,json=loginProfile,proto3" json:"login_profile,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ImportSshPublicKeyResponse) Reset()         { *m = ImportSshPublicKeyResponse{} }
+func (m *ImportSshPublicKeyResponse) String() string { return proto.CompactTextString(m) }
+func (*ImportSshPublicKeyResponse) ProtoMessage()    {}
+func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_9160791ccb698e5f, []int{6}
+}
+func (m *ImportSshPublicKeyResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Unmarshal(m, b)
+}
+func (m *ImportSshPublicKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Marshal(b, m, deterministic)
+}
+func (dst *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(dst, src)
+}
+func (m *ImportSshPublicKeyResponse) XXX_Size() int {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Size(m)
+}
+func (m *ImportSshPublicKeyResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportSshPublicKeyResponse.DiscardUnknown(m)
 }
 
-func (m *ImportSshPublicKeyResponse) Reset()                    { *m = ImportSshPublicKeyResponse{} }
-func (m *ImportSshPublicKeyResponse) String() string            { return proto.CompactTextString(m) }
-func (*ImportSshPublicKeyResponse) ProtoMessage()               {}
-func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ImportSshPublicKeyResponse proto.InternalMessageInfo
 
 func (m *ImportSshPublicKeyResponse) GetLoginProfile() *LoginProfile {
 	if m != nil {
@@ -226,17 +364,39 @@ type UpdateSshPublicKeyRequest struct {
 	// The fingerprint of the public key to update. Public keys are identified by
 	// their SHA-256 fingerprint. The fingerprint of the public key is in format
 	// `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The SSH public key and expiration time.
-	SshPublicKey *google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey" json:"ssh_public_key,omitempty"`
+	SshPublicKey *common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey,proto3" json:"ssh_public_key,omitempty"`
 	// Mask to control which fields get updated. Updates all if not present.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateSshPublicKeyRequest) Reset()                    { *m = UpdateSshPublicKeyRequest{} }
-func (m *UpdateSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateSshPublicKeyRequest) ProtoMessage()               {}
-func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *UpdateSshPublicKeyRequest) Reset()         { *m = UpdateSshPublicKeyRequest{} }
+func (m *UpdateSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateSshPublicKeyRequest) ProtoMessage()    {}
+func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_9160791ccb698e5f, []int{7}
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Size(m)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *UpdateSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -245,14 +405,14 @@ func (m *UpdateSshPublicKeyRequest) GetName() string {
 	return ""
 }
 
-func (m *UpdateSshPublicKeyRequest) GetSshPublicKey() *google_cloud_oslogin_common.SshPublicKey {
+func (m *UpdateSshPublicKeyRequest) GetSshPublicKey() *common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKey
 	}
 	return nil
 }
 
-func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -261,6 +421,7 @@ func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *google_protobuf2.FieldMask
 
 func init() {
 	proto.RegisterType((*LoginProfile)(nil), "google.cloud.oslogin.v1alpha.LoginProfile")
+	proto.RegisterMapType((map[string]*common.SshPublicKey)(nil), "google.cloud.oslogin.v1alpha.LoginProfile.SshPublicKeysEntry")
 	proto.RegisterType((*DeletePosixAccountRequest)(nil), "google.cloud.oslogin.v1alpha.DeletePosixAccountRequest")
 	proto.RegisterType((*DeleteSshPublicKeyRequest)(nil), "google.cloud.oslogin.v1alpha.DeleteSshPublicKeyRequest")
 	proto.RegisterType((*GetLoginProfileRequest)(nil), "google.cloud.oslogin.v1alpha.GetLoginProfileRequest")
@@ -278,25 +439,26 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for OsLoginService service
-
+// OsLoginServiceClient is the client API for OsLoginService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type OsLoginServiceClient interface {
 	// Deletes a POSIX account.
-	DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Deletes an SSH public key.
-	DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Retrieves the profile information used for logging in to a virtual machine
 	// on Google Compute Engine.
 	GetLoginProfile(ctx context.Context, in *GetLoginProfileRequest, opts ...grpc.CallOption) (*LoginProfile, error)
 	// Retrieves an SSH public key.
-	GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error)
+	GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error)
 	// Adds an SSH public key and returns the profile information. Default POSIX
 	// account information is set when no username and UID exist as part of the
 	// login profile.
 	ImportSshPublicKey(ctx context.Context, in *ImportSshPublicKeyRequest, opts ...grpc.CallOption) (*ImportSshPublicKeyResponse, error)
 	// Updates an SSH public key and returns the profile information. This method
 	// supports patch semantics.
-	UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error)
+	UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error)
 }
 
 type osLoginServiceClient struct {
@@ -307,18 +469,18 @@ func NewOsLoginServiceClient(cc *grpc.ClientConn) OsLoginServiceClient {
 	return &osLoginServiceClient{cc}
 }
 
-func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/DeletePosixAccount", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/DeletePosixAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/DeleteSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/DeleteSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -327,16 +489,16 @@ func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *Delet
 
 func (c *osLoginServiceClient) GetLoginProfile(ctx context.Context, in *GetLoginProfileRequest, opts ...grpc.CallOption) (*LoginProfile, error) {
 	out := new(LoginProfile)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/GetLoginProfile", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/GetLoginProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error) {
-	out := new(google_cloud_oslogin_common.SshPublicKey)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/GetSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error) {
+	out := new(common.SshPublicKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/GetSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -345,41 +507,40 @@ func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPu
 
 func (c *osLoginServiceClient) ImportSshPublicKey(ctx context.Context, in *ImportSshPublicKeyRequest, opts ...grpc.CallOption) (*ImportSshPublicKeyResponse, error) {
 	out := new(ImportSshPublicKeyResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/ImportSshPublicKey", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/ImportSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error) {
-	out := new(google_cloud_oslogin_common.SshPublicKey)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/UpdateSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error) {
+	out := new(common.SshPublicKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1alpha.OsLoginService/UpdateSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for OsLoginService service
-
+// OsLoginServiceServer is the server API for OsLoginService service.
 type OsLoginServiceServer interface {
 	// Deletes a POSIX account.
-	DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*google_protobuf1.Empty, error)
+	DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*empty.Empty, error)
 	// Deletes an SSH public key.
-	DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*google_protobuf1.Empty, error)
+	DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*empty.Empty, error)
 	// Retrieves the profile information used for logging in to a virtual machine
 	// on Google Compute Engine.
 	GetLoginProfile(context.Context, *GetLoginProfileRequest) (*LoginProfile, error)
 	// Retrieves an SSH public key.
-	GetSshPublicKey(context.Context, *GetSshPublicKeyRequest) (*google_cloud_oslogin_common.SshPublicKey, error)
+	GetSshPublicKey(context.Context, *GetSshPublicKeyRequest) (*common.SshPublicKey, error)
 	// Adds an SSH public key and returns the profile information. Default POSIX
 	// account information is set when no username and UID exist as part of the
 	// login profile.
 	ImportSshPublicKey(context.Context, *ImportSshPublicKeyRequest) (*ImportSshPublicKeyResponse, error)
 	// Updates an SSH public key and returns the profile information. This method
 	// supports patch semantics.
-	UpdateSshPublicKey(context.Context, *UpdateSshPublicKeyRequest) (*google_cloud_oslogin_common.SshPublicKey, error)
+	UpdateSshPublicKey(context.Context, *UpdateSshPublicKeyRequest) (*common.SshPublicKey, error)
 }
 
 func RegisterOsLoginServiceServer(s *grpc.Server, srv OsLoginServiceServer) {
@@ -527,9 +688,11 @@ var _OsLoginService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/oslogin/v1alpha/oslogin.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/oslogin/v1alpha/oslogin.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/oslogin/v1alpha/oslogin.proto", fileDescriptor_oslogin_9160791ccb698e5f)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_oslogin_9160791ccb698e5f = []byte{
 	// 779 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6a, 0xdb, 0x4a,
 	0x14, 0x46, 0x76, 0x6e, 0x48, 0xc6, 0x4e, 0x72, 0x99, 0x45, 0x70, 0x74, 0x73, 0xc1, 0x88, 0xd0,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1beta/oslogin.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
index 9171c69e..61869471 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/oslogin/v1beta/oslogin.pb.go
@@ -1,31 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/oslogin/v1beta/oslogin.proto
 
-/*
-Package oslogin is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/oslogin/v1beta/oslogin.proto
-
-It has these top-level messages:
-	LoginProfile
-	DeletePosixAccountRequest
-	DeleteSshPublicKeyRequest
-	GetLoginProfileRequest
-	GetSshPublicKeyRequest
-	ImportSshPublicKeyRequest
-	ImportSshPublicKeyResponse
-	UpdateSshPublicKeyRequest
-*/
-package oslogin
+package oslogin // import "google.golang.org/genproto/googleapis/cloud/oslogin/v1beta"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_cloud_oslogin_common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
+import common "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -47,20 +31,42 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Google Compute Engine.
 type LoginProfile struct {
 	// The primary email address that uniquely identifies the user.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The list of POSIX accounts associated with the user.
-	PosixAccounts []*google_cloud_oslogin_common.PosixAccount `protobuf:"bytes,2,rep,name=posix_accounts,json=posixAccounts" json:"posix_accounts,omitempty"`
+	PosixAccounts []*common.PosixAccount `protobuf:"bytes,2,rep,name=posix_accounts,json=posixAccounts,proto3" json:"posix_accounts,omitempty"`
 	// A map from SSH public key fingerprint to the associated key object.
-	SshPublicKeys map[string]*google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,3,rep,name=ssh_public_keys,json=sshPublicKeys" json:"ssh_public_keys,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	SshPublicKeys map[string]*common.SshPublicKey `protobuf:"bytes,3,rep,name=ssh_public_keys,json=sshPublicKeys,proto3" json:"ssh_public_keys,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Indicates if the user is suspended. A suspended user cannot log in but
 	// their profile information is retained.
-	Suspended bool `protobuf:"varint,4,opt,name=suspended" json:"suspended,omitempty"`
+	Suspended            bool     `protobuf:"varint,4,opt,name=suspended,proto3" json:"suspended,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *LoginProfile) Reset()                    { *m = LoginProfile{} }
-func (m *LoginProfile) String() string            { return proto.CompactTextString(m) }
-func (*LoginProfile) ProtoMessage()               {}
-func (*LoginProfile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *LoginProfile) Reset()         { *m = LoginProfile{} }
+func (m *LoginProfile) String() string { return proto.CompactTextString(m) }
+func (*LoginProfile) ProtoMessage()    {}
+func (*LoginProfile) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_597ae172793c821f, []int{0}
+}
+func (m *LoginProfile) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoginProfile.Unmarshal(m, b)
+}
+func (m *LoginProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoginProfile.Marshal(b, m, deterministic)
+}
+func (dst *LoginProfile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoginProfile.Merge(dst, src)
+}
+func (m *LoginProfile) XXX_Size() int {
+	return xxx_messageInfo_LoginProfile.Size(m)
+}
+func (m *LoginProfile) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoginProfile.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LoginProfile proto.InternalMessageInfo
 
 func (m *LoginProfile) GetName() string {
 	if m != nil {
@@ -69,14 +75,14 @@ func (m *LoginProfile) GetName() string {
 	return ""
 }
 
-func (m *LoginProfile) GetPosixAccounts() []*google_cloud_oslogin_common.PosixAccount {
+func (m *LoginProfile) GetPosixAccounts() []*common.PosixAccount {
 	if m != nil {
 		return m.PosixAccounts
 	}
 	return nil
 }
 
-func (m *LoginProfile) GetSshPublicKeys() map[string]*google_cloud_oslogin_common.SshPublicKey {
+func (m *LoginProfile) GetSshPublicKeys() map[string]*common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKeys
 	}
@@ -95,13 +101,35 @@ type DeletePosixAccountRequest struct {
 	// A reference to the POSIX account to update. POSIX accounts are identified
 	// by the project ID they are associated with. A reference to the POSIX
 	// account is in format `users/{user}/projects/{project}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeletePosixAccountRequest) Reset()                    { *m = DeletePosixAccountRequest{} }
-func (m *DeletePosixAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeletePosixAccountRequest) ProtoMessage()               {}
-func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *DeletePosixAccountRequest) Reset()         { *m = DeletePosixAccountRequest{} }
+func (m *DeletePosixAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*DeletePosixAccountRequest) ProtoMessage()    {}
+func (*DeletePosixAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_597ae172793c821f, []int{1}
+}
+func (m *DeletePosixAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeletePosixAccountRequest.Unmarshal(m, b)
+}
+func (m *DeletePosixAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeletePosixAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeletePosixAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePosixAccountRequest.Merge(dst, src)
+}
+func (m *DeletePosixAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_DeletePosixAccountRequest.Size(m)
+}
+func (m *DeletePosixAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeletePosixAccountRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeletePosixAccountRequest proto.InternalMessageInfo
 
 func (m *DeletePosixAccountRequest) GetName() string {
 	if m != nil {
@@ -115,13 +143,35 @@ type DeleteSshPublicKeyRequest struct {
 	// The fingerprint of the public key to update. Public keys are identified by
 	// their SHA-256 fingerprint. The fingerprint of the public key is in format
 	// `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSshPublicKeyRequest) Reset()         { *m = DeleteSshPublicKeyRequest{} }
+func (m *DeleteSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSshPublicKeyRequest) ProtoMessage()    {}
+func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_597ae172793c821f, []int{2}
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSshPublicKeyRequest.Size(m)
+}
+func (m *DeleteSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSshPublicKeyRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteSshPublicKeyRequest) Reset()                    { *m = DeleteSshPublicKeyRequest{} }
-func (m *DeleteSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSshPublicKeyRequest) ProtoMessage()               {}
-func (*DeleteSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_DeleteSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *DeleteSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -133,13 +183,35 @@ func (m *DeleteSshPublicKeyRequest) GetName() string {
 // A request message for retrieving the login profile information for a user.
 type GetLoginProfileRequest struct {
 	// The unique ID for the user in format `users/{user}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetLoginProfileRequest) Reset()                    { *m = GetLoginProfileRequest{} }
-func (m *GetLoginProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetLoginProfileRequest) ProtoMessage()               {}
-func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *GetLoginProfileRequest) Reset()         { *m = GetLoginProfileRequest{} }
+func (m *GetLoginProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*GetLoginProfileRequest) ProtoMessage()    {}
+func (*GetLoginProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_597ae172793c821f, []int{3}
+}
+func (m *GetLoginProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetLoginProfileRequest.Unmarshal(m, b)
+}
+func (m *GetLoginProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetLoginProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetLoginProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLoginProfileRequest.Merge(dst, src)
+}
+func (m *GetLoginProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_GetLoginProfileRequest.Size(m)
+}
+func (m *GetLoginProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetLoginProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetLoginProfileRequest proto.InternalMessageInfo
 
 func (m *GetLoginProfileRequest) GetName() string {
 	if m != nil {
@@ -153,13 +225,35 @@ type GetSshPublicKeyRequest struct {
 	// The fingerprint of the public key to retrieve. Public keys are identified
 	// by their SHA-256 fingerprint. The fingerprint of the public key is in
 	// format `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSshPublicKeyRequest) Reset()         { *m = GetSshPublicKeyRequest{} }
+func (m *GetSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSshPublicKeyRequest) ProtoMessage()    {}
+func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_597ae172793c821f, []int{4}
+}
+func (m *GetSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *GetSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *GetSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSshPublicKeyRequest.Size(m)
+}
+func (m *GetSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSshPublicKeyRequest.DiscardUnknown(m)
 }
 
-func (m *GetSshPublicKeyRequest) Reset()                    { *m = GetSshPublicKeyRequest{} }
-func (m *GetSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSshPublicKeyRequest) ProtoMessage()               {}
-func (*GetSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_GetSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *GetSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -171,17 +265,39 @@ func (m *GetSshPublicKeyRequest) GetName() string {
 // A request message for importing an SSH public key.
 type ImportSshPublicKeyRequest struct {
 	// The unique ID for the user in format `users/{user}`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The SSH public key and expiration time.
-	SshPublicKey *google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey" json:"ssh_public_key,omitempty"`
+	SshPublicKey *common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey,proto3" json:"ssh_public_key,omitempty"`
 	// The project ID of the Google Cloud Platform project.
-	ProjectId string `protobuf:"bytes,3,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId            string   `protobuf:"bytes,3,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ImportSshPublicKeyRequest) Reset()                    { *m = ImportSshPublicKeyRequest{} }
-func (m *ImportSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*ImportSshPublicKeyRequest) ProtoMessage()               {}
-func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ImportSshPublicKeyRequest) Reset()         { *m = ImportSshPublicKeyRequest{} }
+func (m *ImportSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportSshPublicKeyRequest) ProtoMessage()    {}
+func (*ImportSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_597ae172793c821f, []int{5}
+}
+func (m *ImportSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *ImportSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *ImportSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportSshPublicKeyRequest.Size(m)
+}
+func (m *ImportSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportSshPublicKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *ImportSshPublicKeyRequest) GetParent() string {
 	if m != nil {
@@ -190,7 +306,7 @@ func (m *ImportSshPublicKeyRequest) GetParent() string {
 	return ""
 }
 
-func (m *ImportSshPublicKeyRequest) GetSshPublicKey() *google_cloud_oslogin_common.SshPublicKey {
+func (m *ImportSshPublicKeyRequest) GetSshPublicKey() *common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKey
 	}
@@ -207,13 +323,35 @@ func (m *ImportSshPublicKeyRequest) GetProjectId() string {
 // A response message for importing an SSH public key.
 type ImportSshPublicKeyResponse struct {
 	// The login profile information for the user.
-	LoginProfile *LoginProfile `protobuf:"bytes,1,opt,name=login_profile,json=loginProfile" json:"login_profile,omitempty"`
+	LoginProfile         *LoginProfile `protobuf:"bytes,1,opt,name=login_profile,json=loginProfile,proto3" json:"login_profile,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ImportSshPublicKeyResponse) Reset()         { *m = ImportSshPublicKeyResponse{} }
+func (m *ImportSshPublicKeyResponse) String() string { return proto.CompactTextString(m) }
+func (*ImportSshPublicKeyResponse) ProtoMessage()    {}
+func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_597ae172793c821f, []int{6}
+}
+func (m *ImportSshPublicKeyResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Unmarshal(m, b)
+}
+func (m *ImportSshPublicKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Marshal(b, m, deterministic)
+}
+func (dst *ImportSshPublicKeyResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportSshPublicKeyResponse.Merge(dst, src)
+}
+func (m *ImportSshPublicKeyResponse) XXX_Size() int {
+	return xxx_messageInfo_ImportSshPublicKeyResponse.Size(m)
+}
+func (m *ImportSshPublicKeyResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportSshPublicKeyResponse.DiscardUnknown(m)
 }
 
-func (m *ImportSshPublicKeyResponse) Reset()                    { *m = ImportSshPublicKeyResponse{} }
-func (m *ImportSshPublicKeyResponse) String() string            { return proto.CompactTextString(m) }
-func (*ImportSshPublicKeyResponse) ProtoMessage()               {}
-func (*ImportSshPublicKeyResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ImportSshPublicKeyResponse proto.InternalMessageInfo
 
 func (m *ImportSshPublicKeyResponse) GetLoginProfile() *LoginProfile {
 	if m != nil {
@@ -227,17 +365,39 @@ type UpdateSshPublicKeyRequest struct {
 	// The fingerprint of the public key to update. Public keys are identified by
 	// their SHA-256 fingerprint. The fingerprint of the public key is in format
 	// `users/{user}/sshPublicKeys/{fingerprint}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The SSH public key and expiration time.
-	SshPublicKey *google_cloud_oslogin_common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey" json:"ssh_public_key,omitempty"`
+	SshPublicKey *common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey,proto3" json:"ssh_public_key,omitempty"`
 	// Mask to control which fields get updated. Updates all if not present.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateSshPublicKeyRequest) Reset()                    { *m = UpdateSshPublicKeyRequest{} }
-func (m *UpdateSshPublicKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateSshPublicKeyRequest) ProtoMessage()               {}
-func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *UpdateSshPublicKeyRequest) Reset()         { *m = UpdateSshPublicKeyRequest{} }
+func (m *UpdateSshPublicKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateSshPublicKeyRequest) ProtoMessage()    {}
+func (*UpdateSshPublicKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_oslogin_597ae172793c821f, []int{7}
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Unmarshal(m, b)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateSshPublicKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.Merge(dst, src)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateSshPublicKeyRequest.Size(m)
+}
+func (m *UpdateSshPublicKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateSshPublicKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateSshPublicKeyRequest proto.InternalMessageInfo
 
 func (m *UpdateSshPublicKeyRequest) GetName() string {
 	if m != nil {
@@ -246,14 +406,14 @@ func (m *UpdateSshPublicKeyRequest) GetName() string {
 	return ""
 }
 
-func (m *UpdateSshPublicKeyRequest) GetSshPublicKey() *google_cloud_oslogin_common.SshPublicKey {
+func (m *UpdateSshPublicKeyRequest) GetSshPublicKey() *common.SshPublicKey {
 	if m != nil {
 		return m.SshPublicKey
 	}
 	return nil
 }
 
-func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -262,6 +422,7 @@ func (m *UpdateSshPublicKeyRequest) GetUpdateMask() *google_protobuf2.FieldMask
 
 func init() {
 	proto.RegisterType((*LoginProfile)(nil), "google.cloud.oslogin.v1beta.LoginProfile")
+	proto.RegisterMapType((map[string]*common.SshPublicKey)(nil), "google.cloud.oslogin.v1beta.LoginProfile.SshPublicKeysEntry")
 	proto.RegisterType((*DeletePosixAccountRequest)(nil), "google.cloud.oslogin.v1beta.DeletePosixAccountRequest")
 	proto.RegisterType((*DeleteSshPublicKeyRequest)(nil), "google.cloud.oslogin.v1beta.DeleteSshPublicKeyRequest")
 	proto.RegisterType((*GetLoginProfileRequest)(nil), "google.cloud.oslogin.v1beta.GetLoginProfileRequest")
@@ -279,25 +440,26 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for OsLoginService service
-
+// OsLoginServiceClient is the client API for OsLoginService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type OsLoginServiceClient interface {
 	// Deletes a POSIX account.
-	DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Deletes an SSH public key.
-	DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Retrieves the profile information used for logging in to a virtual machine
 	// on Google Compute Engine.
 	GetLoginProfile(ctx context.Context, in *GetLoginProfileRequest, opts ...grpc.CallOption) (*LoginProfile, error)
 	// Retrieves an SSH public key.
-	GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error)
+	GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error)
 	// Adds an SSH public key and returns the profile information. Default POSIX
 	// account information is set when no username and UID exist as part of the
 	// login profile.
 	ImportSshPublicKey(ctx context.Context, in *ImportSshPublicKeyRequest, opts ...grpc.CallOption) (*ImportSshPublicKeyResponse, error)
 	// Updates an SSH public key and returns the profile information. This method
 	// supports patch semantics.
-	UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error)
+	UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error)
 }
 
 type osLoginServiceClient struct {
@@ -308,18 +470,18 @@ func NewOsLoginServiceClient(cc *grpc.ClientConn) OsLoginServiceClient {
 	return &osLoginServiceClient{cc}
 }
 
-func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/DeletePosixAccount", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/DeletePosixAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/DeleteSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/DeleteSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -328,16 +490,16 @@ func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *Delet
 
 func (c *osLoginServiceClient) GetLoginProfile(ctx context.Context, in *GetLoginProfileRequest, opts ...grpc.CallOption) (*LoginProfile, error) {
 	out := new(LoginProfile)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/GetLoginProfile", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/GetLoginProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error) {
-	out := new(google_cloud_oslogin_common.SshPublicKey)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/GetSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error) {
+	out := new(common.SshPublicKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/GetSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -346,41 +508,40 @@ func (c *osLoginServiceClient) GetSshPublicKey(ctx context.Context, in *GetSshPu
 
 func (c *osLoginServiceClient) ImportSshPublicKey(ctx context.Context, in *ImportSshPublicKeyRequest, opts ...grpc.CallOption) (*ImportSshPublicKeyResponse, error) {
 	out := new(ImportSshPublicKeyResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/ImportSshPublicKey", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/ImportSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *osLoginServiceClient) UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*google_cloud_oslogin_common.SshPublicKey, error) {
-	out := new(google_cloud_oslogin_common.SshPublicKey)
-	err := grpc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/UpdateSshPublicKey", in, out, c.cc, opts...)
+func (c *osLoginServiceClient) UpdateSshPublicKey(ctx context.Context, in *UpdateSshPublicKeyRequest, opts ...grpc.CallOption) (*common.SshPublicKey, error) {
+	out := new(common.SshPublicKey)
+	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1beta.OsLoginService/UpdateSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for OsLoginService service
-
+// OsLoginServiceServer is the server API for OsLoginService service.
 type OsLoginServiceServer interface {
 	// Deletes a POSIX account.
-	DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*google_protobuf1.Empty, error)
+	DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*empty.Empty, error)
 	// Deletes an SSH public key.
-	DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*google_protobuf1.Empty, error)
+	DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*empty.Empty, error)
 	// Retrieves the profile information used for logging in to a virtual machine
 	// on Google Compute Engine.
 	GetLoginProfile(context.Context, *GetLoginProfileRequest) (*LoginProfile, error)
 	// Retrieves an SSH public key.
-	GetSshPublicKey(context.Context, *GetSshPublicKeyRequest) (*google_cloud_oslogin_common.SshPublicKey, error)
+	GetSshPublicKey(context.Context, *GetSshPublicKeyRequest) (*common.SshPublicKey, error)
 	// Adds an SSH public key and returns the profile information. Default POSIX
 	// account information is set when no username and UID exist as part of the
 	// login profile.
 	ImportSshPublicKey(context.Context, *ImportSshPublicKeyRequest) (*ImportSshPublicKeyResponse, error)
 	// Updates an SSH public key and returns the profile information. This method
 	// supports patch semantics.
-	UpdateSshPublicKey(context.Context, *UpdateSshPublicKeyRequest) (*google_cloud_oslogin_common.SshPublicKey, error)
+	UpdateSshPublicKey(context.Context, *UpdateSshPublicKeyRequest) (*common.SshPublicKey, error)
 }
 
 func RegisterOsLoginServiceServer(s *grpc.Server, srv OsLoginServiceServer) {
@@ -528,9 +689,11 @@ var _OsLoginService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/oslogin/v1beta/oslogin.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/oslogin/v1beta/oslogin.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/oslogin/v1beta/oslogin.proto", fileDescriptor_oslogin_597ae172793c821f)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_oslogin_597ae172793c821f = []byte{
 	// 780 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4f, 0x4f, 0x13, 0x4f,
 	0x18, 0xc7, 0xb3, 0x2d, 0x3f, 0x02, 0x43, 0x81, 0x5f, 0xe6, 0x40, 0xca, 0x82, 0xb1, 0x2e, 0xd1,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go
new file mode 100644
index 00000000..11fd18c4
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/redis/v1beta1/cloud_redis.pb.go
@@ -0,0 +1,1095 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package redis // import "google.golang.org/genproto/googleapis/cloud/redis/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Represents the different states of a Redis instance.
+type Instance_State int32
+
+const (
+	// Not set.
+	Instance_STATE_UNSPECIFIED Instance_State = 0
+	// Redis instance is being created.
+	Instance_CREATING Instance_State = 1
+	// Redis instance has been created and is fully usable.
+	Instance_READY Instance_State = 2
+	// Redis instance configuration is being updated. Certain kinds of updates
+	// may cause the instance to become unusable while the update is in
+	// progress.
+	Instance_UPDATING Instance_State = 3
+	// Redis instance is being deleted.
+	Instance_DELETING Instance_State = 4
+	// Redis instance is being repaired and may be unusable. Details can be
+	// found in the `status_message` field.
+	Instance_REPAIRING Instance_State = 5
+	// Maintenance is being performed on this Redis instance.
+	Instance_MAINTENANCE Instance_State = 6
+)
+
+var Instance_State_name = map[int32]string{
+	0: "STATE_UNSPECIFIED",
+	1: "CREATING",
+	2: "READY",
+	3: "UPDATING",
+	4: "DELETING",
+	5: "REPAIRING",
+	6: "MAINTENANCE",
+}
+var Instance_State_value = map[string]int32{
+	"STATE_UNSPECIFIED": 0,
+	"CREATING":          1,
+	"READY":             2,
+	"UPDATING":          3,
+	"DELETING":          4,
+	"REPAIRING":         5,
+	"MAINTENANCE":       6,
+}
+
+func (x Instance_State) String() string {
+	return proto.EnumName(Instance_State_name, int32(x))
+}
+func (Instance_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{0, 0}
+}
+
+// Available service tiers to choose from
+type Instance_Tier int32
+
+const (
+	// Not set.
+	Instance_TIER_UNSPECIFIED Instance_Tier = 0
+	// BASIC tier: standalone instance
+	Instance_BASIC Instance_Tier = 1
+	// STANDARD_HA tier: highly available primary/replica instances
+	Instance_STANDARD_HA Instance_Tier = 3
+)
+
+var Instance_Tier_name = map[int32]string{
+	0: "TIER_UNSPECIFIED",
+	1: "BASIC",
+	3: "STANDARD_HA",
+}
+var Instance_Tier_value = map[string]int32{
+	"TIER_UNSPECIFIED": 0,
+	"BASIC":            1,
+	"STANDARD_HA":      3,
+}
+
+func (x Instance_Tier) String() string {
+	return proto.EnumName(Instance_Tier_name, int32(x))
+}
+func (Instance_Tier) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{0, 1}
+}
+
+// A Google Cloud Redis instance.
+type Instance struct {
+	// Required. Unique name of the resource in this scope including project and
+	// location using the form:
+	//     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+	//
+	// Note: Redis instances are managed and addressed at regional level so
+	// location_id here refers to a GCP region; however, users get to choose which
+	// specific zone (or collection of zones for cross-zone instances) an instance
+	// should be provisioned in. Refer to [location_id] and
+	// [alternative_location_id] fields for more details.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// An arbitrary and optional user-provided name for the instance.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Resource labels to represent user provided metadata
+	Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Optional. The zone where the instance will be provisioned. If not provided,
+	// the service will choose a zone for the instance. For STANDARD_HA tier,
+	// instances will be created across two zones for protection against zonal
+	// failures. if [alternative_location_id] is also provided, it must be
+	// different from [location_id].
+	LocationId string `protobuf:"bytes,4,opt,name=location_id,json=locationId,proto3" json:"location_id,omitempty"`
+	// Optional. Only applicable to STANDARD_HA tier which protects the instance
+	// against zonal failures by provisioning it across two zones. If provided, it
+	// must be a different zone from the one provided in [location_id].
+	AlternativeLocationId string `protobuf:"bytes,5,opt,name=alternative_location_id,json=alternativeLocationId,proto3" json:"alternative_location_id,omitempty"`
+	// Optional. The version of Redis software.
+	// If not provided, latest supported version will be used.
+	RedisVersion string `protobuf:"bytes,7,opt,name=redis_version,json=redisVersion,proto3" json:"redis_version,omitempty"`
+	// Optional. The CIDR range of internal addresses that are reserved for this
+	// instance. If not provided, the service will choose an unused /29 block,
+	// for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+	// and non-overlapping with existing subnets in a network.
+	ReservedIpRange string `protobuf:"bytes,9,opt,name=reserved_ip_range,json=reservedIpRange,proto3" json:"reserved_ip_range,omitempty"`
+	// Output only. Hostname or IP address of the exposed redis endpoint used by
+	// clients to connect to the service.
+	Host string `protobuf:"bytes,10,opt,name=host,proto3" json:"host,omitempty"`
+	// Output only. The port number of the exposed redis endpoint.
+	Port int32 `protobuf:"varint,11,opt,name=port,proto3" json:"port,omitempty"`
+	// Output only. The current zone where the Redis endpoint is placed. In
+	// single zone deployments, this will always be the same as [location_id]
+	// provided by the user at creation time. In cross-zone instances (only
+	// applicable in STANDARD_HA tier), this can be either [location_id] or
+	// [alternative_location_id] and can change on a failover event.
+	CurrentLocationId string `protobuf:"bytes,12,opt,name=current_location_id,json=currentLocationId,proto3" json:"current_location_id,omitempty"`
+	// Output only. The time the instance was created.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Output only. The current state of this instance.
+	State Instance_State `protobuf:"varint,14,opt,name=state,proto3,enum=google.cloud.redis.v1beta1.Instance_State" json:"state,omitempty"`
+	// Output only. Additional information about the current status of this
+	// instance, if available.
+	StatusMessage string `protobuf:"bytes,15,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
+	// Optional. Redis configuration parameters, according to
+	// http://redis.io/topics/config. Currently, the only supported parameters
+	// are:
+	//  * maxmemory-policy
+	//  * notify-keyspace-events
+	RedisConfigs map[string]string `protobuf:"bytes,16,rep,name=redis_configs,json=redisConfigs,proto3" json:"redis_configs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Required. The service tier of the instance.
+	Tier Instance_Tier `protobuf:"varint,17,opt,name=tier,proto3,enum=google.cloud.redis.v1beta1.Instance_Tier" json:"tier,omitempty"`
+	// Required. Redis memory size in GB.
+	MemorySizeGb int32 `protobuf:"varint,18,opt,name=memory_size_gb,json=memorySizeGb,proto3" json:"memory_size_gb,omitempty"`
+	// Optional. The full name of the Google Compute Engine
+	// [network](/compute/docs/networks-and-firewalls#networks) to which the
+	// instance is connected. If left unspecified, the `default` network
+	// will be used.
+	AuthorizedNetwork    string   `protobuf:"bytes,20,opt,name=authorized_network,json=authorizedNetwork,proto3" json:"authorized_network,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Instance) Reset()         { *m = Instance{} }
+func (m *Instance) String() string { return proto.CompactTextString(m) }
+func (*Instance) ProtoMessage()    {}
+func (*Instance) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{0}
+}
+func (m *Instance) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Instance.Unmarshal(m, b)
+}
+func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
+}
+func (dst *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(dst, src)
+}
+func (m *Instance) XXX_Size() int {
+	return xxx_messageInfo_Instance.Size(m)
+}
+func (m *Instance) XXX_DiscardUnknown() {
+	xxx_messageInfo_Instance.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Instance proto.InternalMessageInfo
+
+func (m *Instance) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Instance) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *Instance) GetLabels() map[string]string {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+func (m *Instance) GetLocationId() string {
+	if m != nil {
+		return m.LocationId
+	}
+	return ""
+}
+
+func (m *Instance) GetAlternativeLocationId() string {
+	if m != nil {
+		return m.AlternativeLocationId
+	}
+	return ""
+}
+
+func (m *Instance) GetRedisVersion() string {
+	if m != nil {
+		return m.RedisVersion
+	}
+	return ""
+}
+
+func (m *Instance) GetReservedIpRange() string {
+	if m != nil {
+		return m.ReservedIpRange
+	}
+	return ""
+}
+
+func (m *Instance) GetHost() string {
+	if m != nil {
+		return m.Host
+	}
+	return ""
+}
+
+func (m *Instance) GetPort() int32 {
+	if m != nil {
+		return m.Port
+	}
+	return 0
+}
+
+func (m *Instance) GetCurrentLocationId() string {
+	if m != nil {
+		return m.CurrentLocationId
+	}
+	return ""
+}
+
+func (m *Instance) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *Instance) GetState() Instance_State {
+	if m != nil {
+		return m.State
+	}
+	return Instance_STATE_UNSPECIFIED
+}
+
+func (m *Instance) GetStatusMessage() string {
+	if m != nil {
+		return m.StatusMessage
+	}
+	return ""
+}
+
+func (m *Instance) GetRedisConfigs() map[string]string {
+	if m != nil {
+		return m.RedisConfigs
+	}
+	return nil
+}
+
+func (m *Instance) GetTier() Instance_Tier {
+	if m != nil {
+		return m.Tier
+	}
+	return Instance_TIER_UNSPECIFIED
+}
+
+func (m *Instance) GetMemorySizeGb() int32 {
+	if m != nil {
+		return m.MemorySizeGb
+	}
+	return 0
+}
+
+func (m *Instance) GetAuthorizedNetwork() string {
+	if m != nil {
+		return m.AuthorizedNetwork
+	}
+	return ""
+}
+
+// Request for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
+type ListInstancesRequest struct {
+	// Required. The resource name of the instance location using the form:
+	//     `projects/{project_id}/locations/{location_id}`
+	// where `location_id` refers to a GCP region
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return.
+	//
+	// If not specified, a default value of 1000 will be used by the service.
+	// Regardless of the page_size value, the response may include a partial list
+	// and a caller should only rely on response's
+	// [next_page_token][CloudRedis.ListInstancesResponse.next_page_token]
+	// to determine if there are more instances left to be queried.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// The next_page_token value returned from a previous List request,
+	// if any.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
+func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListInstancesRequest) ProtoMessage()    {}
+func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{1}
+}
+func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
+}
+func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+}
+func (m *ListInstancesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListInstancesRequest.Size(m)
+}
+func (m *ListInstancesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstancesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInstancesRequest proto.InternalMessageInfo
+
+func (m *ListInstancesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListInstancesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListInstancesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
+type ListInstancesResponse struct {
+	// A list of Redis instances in the project in the specified location,
+	// or across all locations.
+	//
+	// If the `location_id` in the parent field of the request is "-", all regions
+	// available to the project are queried, and the results aggregated.
+	// If in such an aggregated query a location is unavailable, a dummy Redis
+	// entry is included in the response with the "name" field set to a value of
+	// the form projects/{project_id}/locations/{location_id}/instances/- and the
+	// "status" field set to ERROR and "status_message" field set to "location not
+	// available for ListInstances".
+	Instances []*Instance `protobuf:"bytes,1,rep,name=instances,proto3" json:"instances,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no more
+	// results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
+func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListInstancesResponse) ProtoMessage()    {}
+func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{2}
+}
+func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
+}
+func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+}
+func (m *ListInstancesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListInstancesResponse.Size(m)
+}
+func (m *ListInstancesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstancesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInstancesResponse proto.InternalMessageInfo
+
+func (m *ListInstancesResponse) GetInstances() []*Instance {
+	if m != nil {
+		return m.Instances
+	}
+	return nil
+}
+
+func (m *ListInstancesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request for [GetInstance][google.cloud.redis.v1beta1.CloudRedis.GetInstance].
+type GetInstanceRequest struct {
+	// Required. Redis instance resource name using the form:
+	//     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+	// where `location_id` refers to a GCP region
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
+func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetInstanceRequest) ProtoMessage()    {}
+func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{3}
+}
+func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
+}
+func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+}
+func (m *GetInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetInstanceRequest.Size(m)
+}
+func (m *GetInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetInstanceRequest proto.InternalMessageInfo
+
+func (m *GetInstanceRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request for [CreateInstance][google.cloud.redis.v1beta1.CloudRedis.CreateInstance].
+type CreateInstanceRequest struct {
+	// Required. The resource name of the instance location using the form:
+	//     `projects/{project_id}/locations/{location_id}`
+	// where `location_id` refers to a GCP region
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required. The logical name of the Redis instance in the customer project
+	// with the following restrictions:
+	//
+	// * Must contain only lowercase letters, numbers, and hyphens.
+	// * Must start with a letter.
+	// * Must be between 1-40 characters.
+	// * Must end with a number or a letter.
+	// * Must be unique within the customer project / location
+	InstanceId string `protobuf:"bytes,2,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
+	// Required. A Redis [Instance] resource
+	Instance             *Instance `protobuf:"bytes,3,opt,name=instance,proto3" json:"instance,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CreateInstanceRequest) Reset()         { *m = CreateInstanceRequest{} }
+func (m *CreateInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateInstanceRequest) ProtoMessage()    {}
+func (*CreateInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{4}
+}
+func (m *CreateInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateInstanceRequest.Unmarshal(m, b)
+}
+func (m *CreateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceRequest.Merge(dst, src)
+}
+func (m *CreateInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateInstanceRequest.Size(m)
+}
+func (m *CreateInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateInstanceRequest proto.InternalMessageInfo
+
+func (m *CreateInstanceRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateInstanceRequest) GetInstanceId() string {
+	if m != nil {
+		return m.InstanceId
+	}
+	return ""
+}
+
+func (m *CreateInstanceRequest) GetInstance() *Instance {
+	if m != nil {
+		return m.Instance
+	}
+	return nil
+}
+
+// Request for [UpdateInstance][google.cloud.redis.v1beta1.CloudRedis.UpdateInstance].
+type UpdateInstanceRequest struct {
+	// Required. Mask of fields to update. At least one path must be supplied in
+	// this field. The elements of the repeated paths field may only include these
+	// fields from [Instance][CloudRedis.Instance]:
+	// * `display_name`
+	// * `labels`
+	// * `memory_size_gb`
+	// * `redis_config`
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	// Required. Update description.
+	// Only fields specified in update_mask are updated.
+	Instance             *Instance `protobuf:"bytes,2,opt,name=instance,proto3" json:"instance,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *UpdateInstanceRequest) Reset()         { *m = UpdateInstanceRequest{} }
+func (m *UpdateInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateInstanceRequest) ProtoMessage()    {}
+func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{5}
+}
+func (m *UpdateInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateInstanceRequest.Unmarshal(m, b)
+}
+func (m *UpdateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceRequest.Merge(dst, src)
+}
+func (m *UpdateInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateInstanceRequest.Size(m)
+}
+func (m *UpdateInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateInstanceRequest proto.InternalMessageInfo
+
+func (m *UpdateInstanceRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+func (m *UpdateInstanceRequest) GetInstance() *Instance {
+	if m != nil {
+		return m.Instance
+	}
+	return nil
+}
+
+// Request for [DeleteInstance][google.cloud.redis.v1beta1.CloudRedis.DeleteInstance].
+type DeleteInstanceRequest struct {
+	// Required. Redis instance resource name using the form:
+	//     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+	// where `location_id` refers to a GCP region
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
+func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteInstanceRequest) ProtoMessage()    {}
+func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{6}
+}
+func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
+}
+func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+}
+func (m *DeleteInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
+}
+func (m *DeleteInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteInstanceRequest proto.InternalMessageInfo
+
+func (m *DeleteInstanceRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// This location metadata represents additional configuration options for a
+// given location where a Redis instance may be created. All fields are output
+// only. It is returned as content of the
+// `google.cloud.location.Location.metadata` field.
+type LocationMetadata struct {
+	// Output only. The set of available zones in the location. The map is keyed
+	// by the lowercase ID of each zone, as defined by GCE. These keys can be
+	// specified in `location_id` or `alternative_location_id` fields when
+	// creating a Redis instance.
+	AvailableZones       map[string]*ZoneMetadata `protobuf:"bytes,1,rep,name=available_zones,json=availableZones,proto3" json:"available_zones,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *LocationMetadata) Reset()         { *m = LocationMetadata{} }
+func (m *LocationMetadata) String() string { return proto.CompactTextString(m) }
+func (*LocationMetadata) ProtoMessage()    {}
+func (*LocationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{7}
+}
+func (m *LocationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocationMetadata.Unmarshal(m, b)
+}
+func (m *LocationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *LocationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationMetadata.Merge(dst, src)
+}
+func (m *LocationMetadata) XXX_Size() int {
+	return xxx_messageInfo_LocationMetadata.Size(m)
+}
+func (m *LocationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LocationMetadata proto.InternalMessageInfo
+
+func (m *LocationMetadata) GetAvailableZones() map[string]*ZoneMetadata {
+	if m != nil {
+		return m.AvailableZones
+	}
+	return nil
+}
+
+// Defines specific information for a particular zone. Currently empty and
+// reserved for future use only.
+type ZoneMetadata struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ZoneMetadata) Reset()         { *m = ZoneMetadata{} }
+func (m *ZoneMetadata) String() string { return proto.CompactTextString(m) }
+func (*ZoneMetadata) ProtoMessage()    {}
+func (*ZoneMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_redis_93920e123363dc4d, []int{8}
+}
+func (m *ZoneMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ZoneMetadata.Unmarshal(m, b)
+}
+func (m *ZoneMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ZoneMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ZoneMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ZoneMetadata.Merge(dst, src)
+}
+func (m *ZoneMetadata) XXX_Size() int {
+	return xxx_messageInfo_ZoneMetadata.Size(m)
+}
+func (m *ZoneMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ZoneMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ZoneMetadata proto.InternalMessageInfo
+
+func init() {
+	proto.RegisterType((*Instance)(nil), "google.cloud.redis.v1beta1.Instance")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.redis.v1beta1.Instance.LabelsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.redis.v1beta1.Instance.RedisConfigsEntry")
+	proto.RegisterType((*ListInstancesRequest)(nil), "google.cloud.redis.v1beta1.ListInstancesRequest")
+	proto.RegisterType((*ListInstancesResponse)(nil), "google.cloud.redis.v1beta1.ListInstancesResponse")
+	proto.RegisterType((*GetInstanceRequest)(nil), "google.cloud.redis.v1beta1.GetInstanceRequest")
+	proto.RegisterType((*CreateInstanceRequest)(nil), "google.cloud.redis.v1beta1.CreateInstanceRequest")
+	proto.RegisterType((*UpdateInstanceRequest)(nil), "google.cloud.redis.v1beta1.UpdateInstanceRequest")
+	proto.RegisterType((*DeleteInstanceRequest)(nil), "google.cloud.redis.v1beta1.DeleteInstanceRequest")
+	proto.RegisterType((*LocationMetadata)(nil), "google.cloud.redis.v1beta1.LocationMetadata")
+	proto.RegisterMapType((map[string]*ZoneMetadata)(nil), "google.cloud.redis.v1beta1.LocationMetadata.AvailableZonesEntry")
+	proto.RegisterType((*ZoneMetadata)(nil), "google.cloud.redis.v1beta1.ZoneMetadata")
+	proto.RegisterEnum("google.cloud.redis.v1beta1.Instance_State", Instance_State_name, Instance_State_value)
+	proto.RegisterEnum("google.cloud.redis.v1beta1.Instance_Tier", Instance_Tier_name, Instance_Tier_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// CloudRedisClient is the client API for CloudRedis service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type CloudRedisClient interface {
+	// Lists all Redis instances owned by a project in either the specified
+	// location (region) or all locations.
+	//
+	// The location should have the following format:
+	// * `projects/{project_id}/locations/{location_id}`
+	//
+	// If `location_id` is specified as `-` (wildcard), then all regions
+	// available to the project are queried, and the results are aggregated.
+	ListInstances(ctx context.Context, in *ListInstancesRequest, opts ...grpc.CallOption) (*ListInstancesResponse, error)
+	// Gets the details of a specific Redis instance.
+	GetInstance(ctx context.Context, in *GetInstanceRequest, opts ...grpc.CallOption) (*Instance, error)
+	// Creates a Redis instance based on the specified tier and memory size.
+	//
+	// By default, the instance is peered to the project's
+	// [default network](/compute/docs/networks-and-firewalls#networks).
+	//
+	// The creation is executed asynchronously and callers may check the returned
+	// operation to track its progress. Once the operation is completed the Redis
+	// instance will be fully functional. Completed longrunning.Operation will
+	// contain the new instance object in the response field.
+	//
+	// The returned operation is automatically deleted after a few hours, so there
+	// is no need to call DeleteOperation.
+	CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Updates the metadata and configuration of a specific Redis instance.
+	//
+	// Completed longrunning.Operation will contain the new instance object
+	// in the response field. The returned operation is automatically deleted
+	// after a few hours, so there is no need to call DeleteOperation.
+	UpdateInstance(ctx context.Context, in *UpdateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Deletes a specific Redis instance.  Instance stops serving and data is
+	// deleted.
+	DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type cloudRedisClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewCloudRedisClient(cc *grpc.ClientConn) CloudRedisClient {
+	return &cloudRedisClient{cc}
+}
+
+func (c *cloudRedisClient) ListInstances(ctx context.Context, in *ListInstancesRequest, opts ...grpc.CallOption) (*ListInstancesResponse, error) {
+	out := new(ListInstancesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.redis.v1beta1.CloudRedis/ListInstances", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudRedisClient) GetInstance(ctx context.Context, in *GetInstanceRequest, opts ...grpc.CallOption) (*Instance, error) {
+	out := new(Instance)
+	err := c.cc.Invoke(ctx, "/google.cloud.redis.v1beta1.CloudRedis/GetInstance", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudRedisClient) CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.redis.v1beta1.CloudRedis/CreateInstance", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudRedisClient) UpdateInstance(ctx context.Context, in *UpdateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.redis.v1beta1.CloudRedis/UpdateInstance", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudRedisClient) DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.redis.v1beta1.CloudRedis/DeleteInstance", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// CloudRedisServer is the server API for CloudRedis service.
+type CloudRedisServer interface {
+	// Lists all Redis instances owned by a project in either the specified
+	// location (region) or all locations.
+	//
+	// The location should have the following format:
+	// * `projects/{project_id}/locations/{location_id}`
+	//
+	// If `location_id` is specified as `-` (wildcard), then all regions
+	// available to the project are queried, and the results are aggregated.
+	ListInstances(context.Context, *ListInstancesRequest) (*ListInstancesResponse, error)
+	// Gets the details of a specific Redis instance.
+	GetInstance(context.Context, *GetInstanceRequest) (*Instance, error)
+	// Creates a Redis instance based on the specified tier and memory size.
+	//
+	// By default, the instance is peered to the project's
+	// [default network](/compute/docs/networks-and-firewalls#networks).
+	//
+	// The creation is executed asynchronously and callers may check the returned
+	// operation to track its progress. Once the operation is completed the Redis
+	// instance will be fully functional. Completed longrunning.Operation will
+	// contain the new instance object in the response field.
+	//
+	// The returned operation is automatically deleted after a few hours, so there
+	// is no need to call DeleteOperation.
+	CreateInstance(context.Context, *CreateInstanceRequest) (*longrunning.Operation, error)
+	// Updates the metadata and configuration of a specific Redis instance.
+	//
+	// Completed longrunning.Operation will contain the new instance object
+	// in the response field. The returned operation is automatically deleted
+	// after a few hours, so there is no need to call DeleteOperation.
+	UpdateInstance(context.Context, *UpdateInstanceRequest) (*longrunning.Operation, error)
+	// Deletes a specific Redis instance.  Instance stops serving and data is
+	// deleted.
+	DeleteInstance(context.Context, *DeleteInstanceRequest) (*longrunning.Operation, error)
+}
+
+func RegisterCloudRedisServer(s *grpc.Server, srv CloudRedisServer) {
+	s.RegisterService(&_CloudRedis_serviceDesc, srv)
+}
+
+func _CloudRedis_ListInstances_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListInstancesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudRedisServer).ListInstances(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.redis.v1beta1.CloudRedis/ListInstances",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudRedisServer).ListInstances(ctx, req.(*ListInstancesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudRedis_GetInstance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetInstanceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudRedisServer).GetInstance(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.redis.v1beta1.CloudRedis/GetInstance",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudRedisServer).GetInstance(ctx, req.(*GetInstanceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudRedis_CreateInstance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateInstanceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudRedisServer).CreateInstance(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.redis.v1beta1.CloudRedis/CreateInstance",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudRedisServer).CreateInstance(ctx, req.(*CreateInstanceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudRedis_UpdateInstance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateInstanceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudRedisServer).UpdateInstance(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.redis.v1beta1.CloudRedis/UpdateInstance",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudRedisServer).UpdateInstance(ctx, req.(*UpdateInstanceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudRedis_DeleteInstance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteInstanceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudRedisServer).DeleteInstance(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.redis.v1beta1.CloudRedis/DeleteInstance",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudRedisServer).DeleteInstance(ctx, req.(*DeleteInstanceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _CloudRedis_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.redis.v1beta1.CloudRedis",
+	HandlerType: (*CloudRedisServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListInstances",
+			Handler:    _CloudRedis_ListInstances_Handler,
+		},
+		{
+			MethodName: "GetInstance",
+			Handler:    _CloudRedis_GetInstance_Handler,
+		},
+		{
+			MethodName: "CreateInstance",
+			Handler:    _CloudRedis_CreateInstance_Handler,
+		},
+		{
+			MethodName: "UpdateInstance",
+			Handler:    _CloudRedis_UpdateInstance_Handler,
+		},
+		{
+			MethodName: "DeleteInstance",
+			Handler:    _CloudRedis_DeleteInstance_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/redis/v1beta1/cloud_redis.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/redis/v1beta1/cloud_redis.proto", fileDescriptor_cloud_redis_93920e123363dc4d)
+}
+
+var fileDescriptor_cloud_redis_93920e123363dc4d = []byte{
+	// 1230 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdf, 0x6e, 0x1b, 0xc5,
+	0x17, 0xfe, 0x6d, 0x12, 0xe7, 0x17, 0x9f, 0x4d, 0x1c, 0x67, 0x9a, 0xc0, 0xca, 0x50, 0x1a, 0xdc,
+	0x82, 0x4c, 0x80, 0x5d, 0x6a, 0x50, 0x55, 0x1a, 0xf5, 0x8f, 0x63, 0x6f, 0x53, 0x4b, 0x89, 0x89,
+	0xd6, 0x2e, 0x12, 0xe5, 0x62, 0x35, 0xb6, 0xa7, 0xdb, 0x6d, 0xd6, 0x3b, 0xcb, 0xce, 0xd8, 0x90,
+	0xa0, 0x0a, 0x09, 0xde, 0x00, 0x24, 0x2e, 0xe1, 0x96, 0x4b, 0x78, 0x12, 0x2e, 0x78, 0x02, 0x24,
+	0xae, 0x78, 0x0a, 0x34, 0x33, 0xbb, 0xb1, 0x9d, 0x6e, 0x5d, 0x37, 0x77, 0x33, 0xdf, 0xf9, 0xce,
+	0xcc, 0x37, 0xe7, 0xcc, 0x37, 0x6b, 0xc3, 0x07, 0x1e, 0xa5, 0x5e, 0x40, 0xac, 0x5e, 0x40, 0x87,
+	0x7d, 0x2b, 0x26, 0x7d, 0x9f, 0x59, 0xa3, 0xeb, 0x5d, 0xc2, 0xf1, 0x75, 0x85, 0xb9, 0x12, 0x33,
+	0xa3, 0x98, 0x72, 0x8a, 0x4a, 0x8a, 0x6d, 0xca, 0x88, 0xa9, 0x22, 0x09, 0xbb, 0xf4, 0x66, 0xb2,
+	0x12, 0x8e, 0x7c, 0x0b, 0x87, 0x21, 0xe5, 0x98, 0xfb, 0x34, 0x4c, 0x32, 0x4b, 0x57, 0x93, 0x68,
+	0x40, 0x43, 0x2f, 0x1e, 0x86, 0xa1, 0x1f, 0x7a, 0x16, 0x8d, 0x48, 0x3c, 0x45, 0xda, 0x4e, 0x48,
+	0x72, 0xd6, 0x1d, 0x3e, 0xb6, 0x1e, 0xfb, 0x24, 0xe8, 0xbb, 0x03, 0xcc, 0x8e, 0x13, 0xc6, 0x95,
+	0xf3, 0x0c, 0xee, 0x0f, 0x08, 0xe3, 0x78, 0x10, 0x29, 0x42, 0xf9, 0xcf, 0x15, 0x58, 0x69, 0x86,
+	0x8c, 0xe3, 0xb0, 0x47, 0x10, 0x82, 0xa5, 0x10, 0x0f, 0x88, 0xa1, 0x6d, 0x6b, 0x95, 0xbc, 0x23,
+	0xc7, 0xe8, 0x6d, 0x58, 0xed, 0xfb, 0x2c, 0x0a, 0xf0, 0x89, 0x2b, 0x63, 0x0b, 0x32, 0xa6, 0x27,
+	0x58, 0x4b, 0x50, 0x1e, 0xc0, 0x72, 0x80, 0xbb, 0x24, 0x60, 0xc6, 0xe2, 0xf6, 0x62, 0x45, 0xaf,
+	0x7e, 0x64, 0xbe, 0xf8, 0xd8, 0x66, 0xba, 0x99, 0x79, 0x20, 0x53, 0xec, 0x90, 0xc7, 0x27, 0x4e,
+	0x92, 0x8f, 0xae, 0x80, 0x1e, 0xd0, 0x9e, 0x3c, 0xa3, 0xeb, 0xf7, 0x8d, 0x25, 0xb9, 0x17, 0xa4,
+	0x50, 0xb3, 0x8f, 0x6e, 0xc0, 0xeb, 0x38, 0xe0, 0x24, 0x0e, 0x31, 0xf7, 0x47, 0xc4, 0x9d, 0x24,
+	0xe7, 0x24, 0x79, 0x6b, 0x22, 0x7c, 0x30, 0xce, 0xbb, 0x0a, 0x6b, 0x52, 0x86, 0x3b, 0x22, 0x31,
+	0xf3, 0x69, 0x68, 0xfc, 0x5f, 0xb2, 0x57, 0x25, 0xf8, 0xb9, 0xc2, 0xd0, 0x0e, 0x6c, 0xc4, 0x84,
+	0x91, 0x78, 0x44, 0xfa, 0xae, 0x1f, 0xb9, 0x31, 0x0e, 0x3d, 0x62, 0xe4, 0x25, 0x71, 0x3d, 0x0d,
+	0x34, 0x23, 0x47, 0xc0, 0xa2, 0x54, 0x4f, 0x28, 0xe3, 0x06, 0xa8, 0x52, 0x89, 0xb1, 0xc0, 0x22,
+	0x1a, 0x73, 0x43, 0xdf, 0xd6, 0x2a, 0x39, 0x47, 0x8e, 0x91, 0x09, 0x97, 0x7a, 0xc3, 0x38, 0x26,
+	0x21, 0x9f, 0x12, 0xbb, 0x2a, 0xd3, 0x36, 0x92, 0xd0, 0x84, 0xd0, 0x5d, 0xd0, 0x7b, 0x31, 0xc1,
+	0x9c, 0xb8, 0xa2, 0x53, 0xc6, 0xda, 0xb6, 0x56, 0xd1, 0xab, 0xa5, 0xb4, 0xa0, 0x69, 0x1b, 0xcd,
+	0x4e, 0xda, 0x46, 0x07, 0x14, 0x5d, 0x00, 0xe8, 0x1e, 0xe4, 0x18, 0xc7, 0x9c, 0x18, 0x85, 0x6d,
+	0xad, 0x52, 0xa8, 0xee, 0xcc, 0xd5, 0x87, 0xb6, 0xc8, 0x70, 0x54, 0x22, 0x7a, 0x07, 0x0a, 0x62,
+	0x30, 0x64, 0xee, 0x80, 0x30, 0x86, 0x3d, 0x62, 0xac, 0x4b, 0xa5, 0x6b, 0x0a, 0x3d, 0x54, 0x20,
+	0xfa, 0x32, 0x2d, 0x67, 0x8f, 0x86, 0x8f, 0x7d, 0x8f, 0x19, 0x45, 0xd9, 0xf8, 0x1b, 0x73, 0x6d,
+	0xe8, 0x08, 0xb8, 0xae, 0x12, 0x55, 0xfb, 0x55, 0x1b, 0x12, 0x08, 0xdd, 0x86, 0x25, 0xee, 0x93,
+	0xd8, 0xd8, 0x90, 0x87, 0x78, 0x6f, 0xae, 0x35, 0x3b, 0x3e, 0x89, 0x1d, 0x99, 0x86, 0xae, 0x41,
+	0x61, 0x40, 0x06, 0x34, 0x3e, 0x71, 0x99, 0x7f, 0x4a, 0x5c, 0xaf, 0x6b, 0x20, 0xd9, 0x8f, 0x55,
+	0x85, 0xb6, 0xfd, 0x53, 0xb2, 0xdf, 0x45, 0x1f, 0x02, 0xc2, 0x43, 0xfe, 0x84, 0xc6, 0xfe, 0x29,
+	0xe9, 0xbb, 0x21, 0xe1, 0x5f, 0xd3, 0xf8, 0xd8, 0xd8, 0x54, 0x6d, 0x19, 0x47, 0x5a, 0x2a, 0x50,
+	0xfa, 0x14, 0xf4, 0x89, 0xfb, 0x8a, 0x8a, 0xb0, 0x78, 0x4c, 0x4e, 0x12, 0x9f, 0x88, 0x21, 0xda,
+	0x84, 0xdc, 0x08, 0x07, 0xc3, 0xd4, 0x1f, 0x6a, 0x72, 0x6b, 0xe1, 0xa6, 0x56, 0xba, 0x0b, 0x1b,
+	0xcf, 0x9d, 0xf8, 0x55, 0x16, 0x28, 0x33, 0xc8, 0xc9, 0x1e, 0xa1, 0x2d, 0xd8, 0x68, 0x77, 0x6a,
+	0x1d, 0xdb, 0x7d, 0xd8, 0x6a, 0x1f, 0xd9, 0xf5, 0xe6, 0xfd, 0xa6, 0xdd, 0x28, 0xfe, 0x0f, 0xad,
+	0xc2, 0x4a, 0xdd, 0xb1, 0x6b, 0x9d, 0x66, 0x6b, 0xbf, 0xa8, 0xa1, 0x3c, 0xe4, 0x1c, 0xbb, 0xd6,
+	0xf8, 0xa2, 0xb8, 0x20, 0x02, 0x0f, 0x8f, 0x1a, 0x2a, 0xb0, 0x28, 0x66, 0x0d, 0xfb, 0xc0, 0x96,
+	0xb3, 0x25, 0xb4, 0x06, 0x79, 0xc7, 0x3e, 0xaa, 0x35, 0x1d, 0x31, 0xcd, 0xa1, 0x75, 0xd0, 0x0f,
+	0x6b, 0xcd, 0x56, 0xc7, 0x6e, 0xd5, 0x5a, 0x75, 0xbb, 0xb8, 0x5c, 0xbe, 0x09, 0x4b, 0xa2, 0xa6,
+	0x68, 0x13, 0x8a, 0x9d, 0xa6, 0xed, 0x9c, 0xdb, 0x32, 0x0f, 0xb9, 0xbd, 0x5a, 0xbb, 0x59, 0x2f,
+	0x6a, 0x22, 0xb3, 0xdd, 0xa9, 0xb5, 0x1a, 0x35, 0xa7, 0xe1, 0x3e, 0xa8, 0x15, 0x17, 0xcb, 0x4f,
+	0x61, 0xf3, 0xc0, 0x67, 0x3c, 0x6d, 0x0d, 0x73, 0xc8, 0x57, 0x43, 0xc2, 0x38, 0x7a, 0x0d, 0x96,
+	0x23, 0x2c, 0x6e, 0x7b, 0x72, 0xea, 0x64, 0x86, 0xde, 0x80, 0x7c, 0x84, 0x3d, 0x22, 0xbb, 0x25,
+	0x0f, 0x9f, 0x73, 0x56, 0x04, 0x20, 0x1a, 0x85, 0x2e, 0x03, 0xc8, 0x20, 0xa7, 0xc7, 0x24, 0x34,
+	0x16, 0x65, 0xa2, 0xa4, 0x77, 0x04, 0x50, 0xfe, 0x41, 0x83, 0xad, 0x73, 0x9b, 0xb1, 0x88, 0x86,
+	0x8c, 0xa0, 0x3d, 0xc8, 0xfb, 0x29, 0x68, 0x68, 0xf2, 0x76, 0x5e, 0x9b, 0xe7, 0x26, 0x39, 0xe3,
+	0x34, 0xf4, 0x2e, 0xac, 0x87, 0xe4, 0x1b, 0xee, 0x4e, 0x28, 0x50, 0xcd, 0x59, 0x13, 0xf0, 0xd1,
+	0x99, 0x8a, 0x0a, 0xa0, 0x7d, 0x72, 0xa6, 0x21, 0x3d, 0x6f, 0xc6, 0x63, 0x5a, 0xfe, 0x51, 0x83,
+	0xad, 0xba, 0xf4, 0xeb, 0x79, 0xf6, 0x8b, 0xaa, 0x73, 0x05, 0xf4, 0x54, 0x90, 0x78, 0x37, 0xd4,
+	0xfe, 0x90, 0x42, 0xcd, 0x3e, 0xba, 0x07, 0x2b, 0xe9, 0x4c, 0xd6, 0x67, 0xde, 0x73, 0x9e, 0x65,
+	0x95, 0x7f, 0xd6, 0x60, 0xeb, 0x61, 0xd4, 0xcf, 0x10, 0xb5, 0x0b, 0xfa, 0x50, 0x06, 0xe4, 0x27,
+	0x45, 0x2a, 0xcb, 0x7a, 0x8c, 0xee, 0x8b, 0xaf, 0xce, 0x21, 0x66, 0xc7, 0x0e, 0x28, 0xba, 0x18,
+	0x4f, 0x09, 0x5b, 0xb8, 0x90, 0xb0, 0xf7, 0x61, 0xab, 0x41, 0x02, 0xf2, 0xbc, 0xae, 0xac, 0xd2,
+	0xfe, 0xab, 0x41, 0x31, 0x7d, 0x47, 0x0f, 0x09, 0xc7, 0x7d, 0xcc, 0x31, 0xf2, 0x61, 0x1d, 0x8f,
+	0xb0, 0x1f, 0xe0, 0x6e, 0x40, 0xdc, 0x53, 0x1a, 0x9e, 0xdd, 0x85, 0x7b, 0xb3, 0xa4, 0x9c, 0x5f,
+	0xc6, 0xac, 0xa5, 0x6b, 0x3c, 0x12, 0x4b, 0xa8, 0x37, 0xab, 0x80, 0xa7, 0xc0, 0xd2, 0x31, 0x5c,
+	0xca, 0xa0, 0x65, 0x18, 0xfd, 0xce, 0xa4, 0xd1, 0xf5, 0x6a, 0x65, 0x96, 0x12, 0xb1, 0x50, 0xaa,
+	0x62, 0xf2, 0x49, 0x28, 0xc0, 0xea, 0x64, 0xa8, 0xfa, 0xf7, 0x32, 0x40, 0x5d, 0xe4, 0xcb, 0x97,
+	0x06, 0xfd, 0xae, 0xc1, 0xda, 0x94, 0x2d, 0xd0, 0xcc, 0x4f, 0x72, 0x96, 0x5d, 0x4b, 0xd7, 0x5f,
+	0x21, 0x43, 0x79, 0xae, 0x7c, 0xeb, 0xfb, 0xbf, 0xfe, 0xf9, 0x69, 0xe1, 0x13, 0x54, 0x3d, 0xfb,
+	0x45, 0xf4, 0xad, 0xba, 0xc5, 0xb7, 0xa3, 0x98, 0x3e, 0x25, 0x3d, 0xce, 0xac, 0x1d, 0x2b, 0xfd,
+	0x0a, 0x32, 0x6b, 0xe7, 0x99, 0x35, 0xf6, 0xda, 0xaf, 0x1a, 0xe8, 0x13, 0x26, 0x42, 0xe6, 0xac,
+	0xed, 0x9f, 0x77, 0x5b, 0x69, 0xae, 0xbb, 0x95, 0xa5, 0x50, 0x5c, 0x9e, 0x17, 0xe8, 0x1b, 0xcb,
+	0xb3, 0x76, 0x9e, 0xa1, 0xdf, 0x34, 0x28, 0x4c, 0x7b, 0x17, 0xcd, 0xac, 0x51, 0xa6, 0xcf, 0x4b,
+	0x97, 0xd3, 0x94, 0x89, 0x1f, 0x76, 0xe6, 0x67, 0xe9, 0x0f, 0xbb, 0x72, 0x43, 0x0a, 0xbc, 0x53,
+	0xbe, 0x40, 0x09, 0x6f, 0x9d, 0x19, 0x07, 0xfd, 0xa1, 0x41, 0x61, 0xda, 0xd1, 0xb3, 0xa5, 0x66,
+	0xba, 0xff, 0x65, 0x52, 0x0f, 0xa5, 0xd4, 0xfd, 0xea, 0xee, 0x58, 0x6a, 0x2a, 0xc0, 0x9c, 0xb7,
+	0xa8, 0x13, 0x9a, 0x7f, 0xd1, 0xa0, 0x30, 0xed, 0xf6, 0xd9, 0x9a, 0x33, 0x5f, 0x86, 0x97, 0x69,
+	0x4e, 0xfa, 0xbf, 0x73, 0x81, 0xfe, 0xef, 0x7d, 0x07, 0x6f, 0xf5, 0xe8, 0x60, 0x86, 0xa4, 0xbd,
+	0xd2, 0xd8, 0x82, 0x6d, 0x12, 0x8f, 0xfc, 0x1e, 0xd9, 0x23, 0x1c, 0x1f, 0x89, 0x67, 0xf2, 0x48,
+	0x7b, 0x74, 0x37, 0xc9, 0xf4, 0x68, 0x80, 0x43, 0xcf, 0xa4, 0xb1, 0x67, 0x79, 0x24, 0x94, 0x8f,
+	0xa8, 0xa5, 0x42, 0x38, 0xf2, 0x59, 0xd6, 0x1f, 0x8b, 0x5d, 0x39, 0xeb, 0x2e, 0x4b, 0xee, 0xc7,
+	0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xab, 0xc9, 0x66, 0xe4, 0x83, 0x0c, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2/folders.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2/folders.pb.go
index 6f360bba..d8a5772b 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2/folders.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2/folders.pb.go
@@ -1,37 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/resourcemanager/v2/folders.proto
 
-/*
-Package resourcemanager is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/resourcemanager/v2/folders.proto
-
-It has these top-level messages:
-	Folder
-	ListFoldersRequest
-	ListFoldersResponse
-	SearchFoldersRequest
-	SearchFoldersResponse
-	GetFolderRequest
-	CreateFolderRequest
-	MoveFolderRequest
-	UpdateFolderRequest
-	DeleteFolderRequest
-	UndeleteFolderRequest
-	FolderOperation
-*/
-package resourcemanager
+package resourcemanager // import "google.golang.org/genproto/googleapis/cloud/resourcemanager/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -75,7 +54,9 @@ var Folder_LifecycleState_value = map[string]int32{
 func (x Folder_LifecycleState) String() string {
 	return proto.EnumName(Folder_LifecycleState_name, int32(x))
 }
-func (Folder_LifecycleState) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (Folder_LifecycleState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{0, 0}
+}
 
 // The type of operation that failed.
 type FolderOperation_OperationType int32
@@ -104,7 +85,7 @@ func (x FolderOperation_OperationType) String() string {
 	return proto.EnumName(FolderOperation_OperationType_name, int32(x))
 }
 func (FolderOperation_OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{11, 0}
+	return fileDescriptor_folders_6c4bd17feec38232, []int{11, 0}
 }
 
 // A Folder in an Organization's resource hierarchy, used to
@@ -112,10 +93,10 @@ func (FolderOperation_OperationType) EnumDescriptor() ([]byte, []int) {
 type Folder struct {
 	// Output only. The resource name of the Folder.
 	// Its format is `folders/{folder_id}`, for example: "folders/1234".
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The Folder’s parent's resource name.
 	// Updates to the folder's parent must be performed via [MoveFolders].
-	Parent string `protobuf:"bytes,2,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,2,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The folder’s display name.
 	// A folder’s display name must be unique amongst its siblings, e.g.
 	// no two folders with the same parent can share the same display name.
@@ -123,21 +104,43 @@ type Folder struct {
 	// letters, digits, spaces, hyphens and underscores and can be no longer
 	// than 30 characters. This is captured by the regular expression:
 	// [\p{L}\p{N}]({\p{L}\p{N}_- ]{0,28}[\p{L}\p{N}])?.
-	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only.  The lifecycle state of the folder.
 	// Updates to the lifecycle_state must be performed via
 	// [DeleteFolder] and [UndeleteFolder].
-	LifecycleState Folder_LifecycleState `protobuf:"varint,4,opt,name=lifecycle_state,json=lifecycleState,enum=google.cloud.resourcemanager.v2.Folder_LifecycleState" json:"lifecycle_state,omitempty"`
+	LifecycleState Folder_LifecycleState `protobuf:"varint,4,opt,name=lifecycle_state,json=lifecycleState,proto3,enum=google.cloud.resourcemanager.v2.Folder_LifecycleState" json:"lifecycle_state,omitempty"`
 	// Output only. Timestamp when the Folder was created. Assigned by the server.
-	CreateTime *google_protobuf4.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp when the Folder was last modified.
-	UpdateTime *google_protobuf4.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Folder) Reset()         { *m = Folder{} }
+func (m *Folder) String() string { return proto.CompactTextString(m) }
+func (*Folder) ProtoMessage()    {}
+func (*Folder) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{0}
+}
+func (m *Folder) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Folder.Unmarshal(m, b)
+}
+func (m *Folder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Folder.Marshal(b, m, deterministic)
+}
+func (dst *Folder) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Folder.Merge(dst, src)
+}
+func (m *Folder) XXX_Size() int {
+	return xxx_messageInfo_Folder.Size(m)
+}
+func (m *Folder) XXX_DiscardUnknown() {
+	xxx_messageInfo_Folder.DiscardUnknown(m)
 }
 
-func (m *Folder) Reset()                    { *m = Folder{} }
-func (m *Folder) String() string            { return proto.CompactTextString(m) }
-func (*Folder) ProtoMessage()               {}
-func (*Folder) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Folder proto.InternalMessageInfo
 
 func (m *Folder) GetName() string {
 	if m != nil {
@@ -167,14 +170,14 @@ func (m *Folder) GetLifecycleState() Folder_LifecycleState {
 	return Folder_LIFECYCLE_STATE_UNSPECIFIED
 }
 
-func (m *Folder) GetCreateTime() *google_protobuf4.Timestamp {
+func (m *Folder) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Folder) GetUpdateTime() *google_protobuf4.Timestamp {
+func (m *Folder) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -188,23 +191,45 @@ type ListFoldersRequest struct {
 	// Must be of the form `folders/{folder_id}` or `organizations/{org_id}`.
 	// Access to this method is controlled by checking the
 	// `resourcemanager.folders.list` permission on the `parent`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The maximum number of Folders to return in the response.
 	// This field is optional.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A pagination token returned from a previous call to `ListFolders`
 	// that indicates where this listing should continue from.
 	// This field is optional.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Controls whether Folders in the [DELETE_REQUESTED} state should
 	// be returned.
-	ShowDeleted bool `protobuf:"varint,4,opt,name=show_deleted,json=showDeleted" json:"show_deleted,omitempty"`
+	ShowDeleted          bool     `protobuf:"varint,4,opt,name=show_deleted,json=showDeleted,proto3" json:"show_deleted,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListFoldersRequest) Reset()                    { *m = ListFoldersRequest{} }
-func (m *ListFoldersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListFoldersRequest) ProtoMessage()               {}
-func (*ListFoldersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ListFoldersRequest) Reset()         { *m = ListFoldersRequest{} }
+func (m *ListFoldersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListFoldersRequest) ProtoMessage()    {}
+func (*ListFoldersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{1}
+}
+func (m *ListFoldersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFoldersRequest.Unmarshal(m, b)
+}
+func (m *ListFoldersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFoldersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListFoldersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFoldersRequest.Merge(dst, src)
+}
+func (m *ListFoldersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListFoldersRequest.Size(m)
+}
+func (m *ListFoldersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFoldersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFoldersRequest proto.InternalMessageInfo
 
 func (m *ListFoldersRequest) GetParent() string {
 	if m != nil {
@@ -238,17 +263,39 @@ func (m *ListFoldersRequest) GetShowDeleted() bool {
 type ListFoldersResponse struct {
 	// A possibly paginated list of Folders that are direct descendants of
 	// the specified parent resource.
-	Folders []*Folder `protobuf:"bytes,1,rep,name=folders" json:"folders,omitempty"`
+	Folders []*Folder `protobuf:"bytes,1,rep,name=folders,proto3" json:"folders,omitempty"`
 	// A pagination token returned from a previous call to `ListFolders`
 	// that indicates from where listing should continue.
 	// This field is optional.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListFoldersResponse) Reset()                    { *m = ListFoldersResponse{} }
-func (m *ListFoldersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListFoldersResponse) ProtoMessage()               {}
-func (*ListFoldersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *ListFoldersResponse) Reset()         { *m = ListFoldersResponse{} }
+func (m *ListFoldersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListFoldersResponse) ProtoMessage()    {}
+func (*ListFoldersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{2}
+}
+func (m *ListFoldersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFoldersResponse.Unmarshal(m, b)
+}
+func (m *ListFoldersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFoldersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListFoldersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFoldersResponse.Merge(dst, src)
+}
+func (m *ListFoldersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListFoldersResponse.Size(m)
+}
+func (m *ListFoldersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFoldersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFoldersResponse proto.InternalMessageInfo
 
 func (m *ListFoldersResponse) GetFolders() []*Folder {
 	if m != nil {
@@ -268,11 +315,11 @@ func (m *ListFoldersResponse) GetNextPageToken() string {
 type SearchFoldersRequest struct {
 	// The maximum number of folders to return in the response.
 	// This field is optional.
-	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A pagination token returned from a previous call to `SearchFolders`
 	// that indicates from where search should continue.
 	// This field is optional.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Search criteria used to select the Folders to return.
 	// If no search criteria is specified then all accessible folders will be
 	// returned.
@@ -289,13 +336,35 @@ type SearchFoldersRequest struct {
 	// |parent=folders/123|Folders whose parent is "folders/123".|
 	// |parent=folders/123 AND lifecycleState=ACTIVE|Active folders whose
 	// parent is "folders/123".|
-	Query string `protobuf:"bytes,3,opt,name=query" json:"query,omitempty"`
+	Query                string   `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchFoldersRequest) Reset()                    { *m = SearchFoldersRequest{} }
-func (m *SearchFoldersRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchFoldersRequest) ProtoMessage()               {}
-func (*SearchFoldersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *SearchFoldersRequest) Reset()         { *m = SearchFoldersRequest{} }
+func (m *SearchFoldersRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchFoldersRequest) ProtoMessage()    {}
+func (*SearchFoldersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{3}
+}
+func (m *SearchFoldersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchFoldersRequest.Unmarshal(m, b)
+}
+func (m *SearchFoldersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchFoldersRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchFoldersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchFoldersRequest.Merge(dst, src)
+}
+func (m *SearchFoldersRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchFoldersRequest.Size(m)
+}
+func (m *SearchFoldersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchFoldersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchFoldersRequest proto.InternalMessageInfo
 
 func (m *SearchFoldersRequest) GetPageSize() int32 {
 	if m != nil {
@@ -322,17 +391,39 @@ func (m *SearchFoldersRequest) GetQuery() string {
 type SearchFoldersResponse struct {
 	// A possibly paginated folder search results.
 	// the specified parent resource.
-	Folders []*Folder `protobuf:"bytes,1,rep,name=folders" json:"folders,omitempty"`
+	Folders []*Folder `protobuf:"bytes,1,rep,name=folders,proto3" json:"folders,omitempty"`
 	// A pagination token returned from a previous call to `SearchFolders`
 	// that indicates from where searching should continue.
 	// This field is optional.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchFoldersResponse) Reset()         { *m = SearchFoldersResponse{} }
+func (m *SearchFoldersResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchFoldersResponse) ProtoMessage()    {}
+func (*SearchFoldersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{4}
+}
+func (m *SearchFoldersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchFoldersResponse.Unmarshal(m, b)
+}
+func (m *SearchFoldersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchFoldersResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchFoldersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchFoldersResponse.Merge(dst, src)
+}
+func (m *SearchFoldersResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchFoldersResponse.Size(m)
+}
+func (m *SearchFoldersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchFoldersResponse.DiscardUnknown(m)
 }
 
-func (m *SearchFoldersResponse) Reset()                    { *m = SearchFoldersResponse{} }
-func (m *SearchFoldersResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchFoldersResponse) ProtoMessage()               {}
-func (*SearchFoldersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_SearchFoldersResponse proto.InternalMessageInfo
 
 func (m *SearchFoldersResponse) GetFolders() []*Folder {
 	if m != nil {
@@ -352,13 +443,35 @@ func (m *SearchFoldersResponse) GetNextPageToken() string {
 type GetFolderRequest struct {
 	// The resource name of the Folder to retrieve.
 	// Must be of the form `folders/{folder_id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetFolderRequest) Reset()                    { *m = GetFolderRequest{} }
-func (m *GetFolderRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetFolderRequest) ProtoMessage()               {}
-func (*GetFolderRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *GetFolderRequest) Reset()         { *m = GetFolderRequest{} }
+func (m *GetFolderRequest) String() string { return proto.CompactTextString(m) }
+func (*GetFolderRequest) ProtoMessage()    {}
+func (*GetFolderRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{5}
+}
+func (m *GetFolderRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetFolderRequest.Unmarshal(m, b)
+}
+func (m *GetFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetFolderRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFolderRequest.Merge(dst, src)
+}
+func (m *GetFolderRequest) XXX_Size() int {
+	return xxx_messageInfo_GetFolderRequest.Size(m)
+}
+func (m *GetFolderRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetFolderRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetFolderRequest proto.InternalMessageInfo
 
 func (m *GetFolderRequest) GetName() string {
 	if m != nil {
@@ -371,16 +484,38 @@ func (m *GetFolderRequest) GetName() string {
 type CreateFolderRequest struct {
 	// The resource name of the new Folder's parent.
 	// Must be of the form `folders/{folder_id}` or `organizations/{org_id}`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The Folder being created, only the display name will be consulted.
 	// All other fields will be ignored.
-	Folder *Folder `protobuf:"bytes,2,opt,name=folder" json:"folder,omitempty"`
+	Folder               *Folder  `protobuf:"bytes,2,opt,name=folder,proto3" json:"folder,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateFolderRequest) Reset()                    { *m = CreateFolderRequest{} }
-func (m *CreateFolderRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateFolderRequest) ProtoMessage()               {}
-func (*CreateFolderRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *CreateFolderRequest) Reset()         { *m = CreateFolderRequest{} }
+func (m *CreateFolderRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateFolderRequest) ProtoMessage()    {}
+func (*CreateFolderRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{6}
+}
+func (m *CreateFolderRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateFolderRequest.Unmarshal(m, b)
+}
+func (m *CreateFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateFolderRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateFolderRequest.Merge(dst, src)
+}
+func (m *CreateFolderRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateFolderRequest.Size(m)
+}
+func (m *CreateFolderRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateFolderRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateFolderRequest proto.InternalMessageInfo
 
 func (m *CreateFolderRequest) GetParent() string {
 	if m != nil {
@@ -400,17 +535,39 @@ func (m *CreateFolderRequest) GetFolder() *Folder {
 type MoveFolderRequest struct {
 	// The resource name of the Folder to move.
 	// Must be of the form folders/{folder_id}
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The resource name of the Folder or Organization to reparent
 	// the folder under.
 	// Must be of the form `folders/{folder_id}` or `organizations/{org_id}`.
-	DestinationParent string `protobuf:"bytes,2,opt,name=destination_parent,json=destinationParent" json:"destination_parent,omitempty"`
+	DestinationParent    string   `protobuf:"bytes,2,opt,name=destination_parent,json=destinationParent,proto3" json:"destination_parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MoveFolderRequest) Reset()         { *m = MoveFolderRequest{} }
+func (m *MoveFolderRequest) String() string { return proto.CompactTextString(m) }
+func (*MoveFolderRequest) ProtoMessage()    {}
+func (*MoveFolderRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{7}
+}
+func (m *MoveFolderRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MoveFolderRequest.Unmarshal(m, b)
+}
+func (m *MoveFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MoveFolderRequest.Marshal(b, m, deterministic)
+}
+func (dst *MoveFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MoveFolderRequest.Merge(dst, src)
+}
+func (m *MoveFolderRequest) XXX_Size() int {
+	return xxx_messageInfo_MoveFolderRequest.Size(m)
+}
+func (m *MoveFolderRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MoveFolderRequest.DiscardUnknown(m)
 }
 
-func (m *MoveFolderRequest) Reset()                    { *m = MoveFolderRequest{} }
-func (m *MoveFolderRequest) String() string            { return proto.CompactTextString(m) }
-func (*MoveFolderRequest) ProtoMessage()               {}
-func (*MoveFolderRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_MoveFolderRequest proto.InternalMessageInfo
 
 func (m *MoveFolderRequest) GetName() string {
 	if m != nil {
@@ -431,16 +588,38 @@ type UpdateFolderRequest struct {
 	// The new definition of the Folder. It must include a
 	// a `name` and `display_name` field. The other fields
 	// will be ignored.
-	Folder *Folder `protobuf:"bytes,1,opt,name=folder" json:"folder,omitempty"`
+	Folder *Folder `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder,omitempty"`
 	// Fields to be updated.
 	// Only the `display_name` can be updated.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateFolderRequest) Reset()                    { *m = UpdateFolderRequest{} }
-func (m *UpdateFolderRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateFolderRequest) ProtoMessage()               {}
-func (*UpdateFolderRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *UpdateFolderRequest) Reset()         { *m = UpdateFolderRequest{} }
+func (m *UpdateFolderRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateFolderRequest) ProtoMessage()    {}
+func (*UpdateFolderRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{8}
+}
+func (m *UpdateFolderRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateFolderRequest.Unmarshal(m, b)
+}
+func (m *UpdateFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateFolderRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateFolderRequest.Merge(dst, src)
+}
+func (m *UpdateFolderRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateFolderRequest.Size(m)
+}
+func (m *UpdateFolderRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateFolderRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateFolderRequest proto.InternalMessageInfo
 
 func (m *UpdateFolderRequest) GetFolder() *Folder {
 	if m != nil {
@@ -449,7 +628,7 @@ func (m *UpdateFolderRequest) GetFolder() *Folder {
 	return nil
 }
 
-func (m *UpdateFolderRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateFolderRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -460,16 +639,38 @@ func (m *UpdateFolderRequest) GetUpdateMask() *google_protobuf3.FieldMask {
 type DeleteFolderRequest struct {
 	// the resource name of the Folder to be deleted.
 	// Must be of the form `folders/{folder_id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Instructs DeleteFolderAction to delete a folder even when the folder is not
 	// empty.
-	RecursiveDelete bool `protobuf:"varint,2,opt,name=recursive_delete,json=recursiveDelete" json:"recursive_delete,omitempty"`
+	RecursiveDelete      bool     `protobuf:"varint,2,opt,name=recursive_delete,json=recursiveDelete,proto3" json:"recursive_delete,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteFolderRequest) Reset()         { *m = DeleteFolderRequest{} }
+func (m *DeleteFolderRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteFolderRequest) ProtoMessage()    {}
+func (*DeleteFolderRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{9}
+}
+func (m *DeleteFolderRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteFolderRequest.Unmarshal(m, b)
+}
+func (m *DeleteFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteFolderRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteFolderRequest.Merge(dst, src)
+}
+func (m *DeleteFolderRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteFolderRequest.Size(m)
+}
+func (m *DeleteFolderRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteFolderRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteFolderRequest) Reset()                    { *m = DeleteFolderRequest{} }
-func (m *DeleteFolderRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteFolderRequest) ProtoMessage()               {}
-func (*DeleteFolderRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_DeleteFolderRequest proto.InternalMessageInfo
 
 func (m *DeleteFolderRequest) GetName() string {
 	if m != nil {
@@ -489,13 +690,35 @@ func (m *DeleteFolderRequest) GetRecursiveDelete() bool {
 type UndeleteFolderRequest struct {
 	// The resource name of the Folder to undelete.
 	// Must be of the form `folders/{folder_id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UndeleteFolderRequest) Reset()         { *m = UndeleteFolderRequest{} }
+func (m *UndeleteFolderRequest) String() string { return proto.CompactTextString(m) }
+func (*UndeleteFolderRequest) ProtoMessage()    {}
+func (*UndeleteFolderRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{10}
+}
+func (m *UndeleteFolderRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UndeleteFolderRequest.Unmarshal(m, b)
+}
+func (m *UndeleteFolderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UndeleteFolderRequest.Marshal(b, m, deterministic)
+}
+func (dst *UndeleteFolderRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteFolderRequest.Merge(dst, src)
+}
+func (m *UndeleteFolderRequest) XXX_Size() int {
+	return xxx_messageInfo_UndeleteFolderRequest.Size(m)
+}
+func (m *UndeleteFolderRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UndeleteFolderRequest.DiscardUnknown(m)
 }
 
-func (m *UndeleteFolderRequest) Reset()                    { *m = UndeleteFolderRequest{} }
-func (m *UndeleteFolderRequest) String() string            { return proto.CompactTextString(m) }
-func (*UndeleteFolderRequest) ProtoMessage()               {}
-func (*UndeleteFolderRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_UndeleteFolderRequest proto.InternalMessageInfo
 
 func (m *UndeleteFolderRequest) GetName() string {
 	if m != nil {
@@ -507,21 +730,43 @@ func (m *UndeleteFolderRequest) GetName() string {
 // Metadata describing a long running folder operation
 type FolderOperation struct {
 	// The display name of the folder.
-	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// The type of this operation.
-	OperationType FolderOperation_OperationType `protobuf:"varint,2,opt,name=operation_type,json=operationType,enum=google.cloud.resourcemanager.v2.FolderOperation_OperationType" json:"operation_type,omitempty"`
+	OperationType FolderOperation_OperationType `protobuf:"varint,2,opt,name=operation_type,json=operationType,proto3,enum=google.cloud.resourcemanager.v2.FolderOperation_OperationType" json:"operation_type,omitempty"`
 	// The resource name of the folder's parent.
 	// Only applicable when the operation_type is MOVE.
-	SourceParent string `protobuf:"bytes,3,opt,name=source_parent,json=sourceParent" json:"source_parent,omitempty"`
+	SourceParent string `protobuf:"bytes,3,opt,name=source_parent,json=sourceParent,proto3" json:"source_parent,omitempty"`
 	// The resource name of the folder or organization we are either creating
 	// the folder under or moving the folder to.
-	DestinationParent string `protobuf:"bytes,4,opt,name=destination_parent,json=destinationParent" json:"destination_parent,omitempty"`
+	DestinationParent    string   `protobuf:"bytes,4,opt,name=destination_parent,json=destinationParent,proto3" json:"destination_parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FolderOperation) Reset()                    { *m = FolderOperation{} }
-func (m *FolderOperation) String() string            { return proto.CompactTextString(m) }
-func (*FolderOperation) ProtoMessage()               {}
-func (*FolderOperation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *FolderOperation) Reset()         { *m = FolderOperation{} }
+func (m *FolderOperation) String() string { return proto.CompactTextString(m) }
+func (*FolderOperation) ProtoMessage()    {}
+func (*FolderOperation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_folders_6c4bd17feec38232, []int{11}
+}
+func (m *FolderOperation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FolderOperation.Unmarshal(m, b)
+}
+func (m *FolderOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FolderOperation.Marshal(b, m, deterministic)
+}
+func (dst *FolderOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FolderOperation.Merge(dst, src)
+}
+func (m *FolderOperation) XXX_Size() int {
+	return xxx_messageInfo_FolderOperation.Size(m)
+}
+func (m *FolderOperation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FolderOperation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FolderOperation proto.InternalMessageInfo
 
 func (m *FolderOperation) GetDisplayName() string {
 	if m != nil {
@@ -576,8 +821,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Folders service
-
+// FoldersClient is the client API for Folders service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type FoldersClient interface {
 	// Lists the Folders that are direct descendants of supplied parent resource.
 	// List provides a strongly consistent view of the Folders underneath
@@ -626,7 +872,7 @@ type FoldersClient interface {
 	//
 	// The caller must have `resourcemanager.folders.create` permission on the
 	// identified parent.
-	CreateFolder(ctx context.Context, in *CreateFolderRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateFolder(ctx context.Context, in *CreateFolderRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Updates a Folder, changing its display_name.
 	// Changes to the folder display_name will be rejected if they violate either
 	// the display_name formatting rules or naming constraints described in
@@ -658,7 +904,7 @@ type FoldersClient interface {
 	// or fanout constraints described in the [CreateFolder] documentation.
 	// The caller must have `resourcemanager.folders.move` permission on the
 	// folder's current and proposed new parent.
-	MoveFolder(ctx context.Context, in *MoveFolderRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	MoveFolder(ctx context.Context, in *MoveFolderRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Requests deletion of a Folder. The Folder is moved into the
 	// [DELETE_REQUESTED] state immediately, and is deleted approximately 30 days
 	// later. This method may only be called on an empty Folder in the [ACTIVE]
@@ -681,19 +927,19 @@ type FoldersClient interface {
 	// be the Folder's resource name, e.g. "folders/1234".
 	// The caller must have `resourcemanager.folders.getIamPolicy` permission
 	// on the identified folder.
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Sets the access control policy on a Folder, replacing any existing policy.
 	// The `resource` field should be the Folder's resource name, e.g.
 	// "folders/1234".
 	// The caller must have `resourcemanager.folders.setIamPolicy` permission
 	// on the identified folder.
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Returns permissions that a caller has on the specified Folder.
 	// The `resource` field should be the Folder's resource name,
 	// e.g. "folders/1234".
 	//
 	// There are no permissions required for making this API call.
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
 }
 
 type foldersClient struct {
@@ -706,7 +952,7 @@ func NewFoldersClient(cc *grpc.ClientConn) FoldersClient {
 
 func (c *foldersClient) ListFolders(ctx context.Context, in *ListFoldersRequest, opts ...grpc.CallOption) (*ListFoldersResponse, error) {
 	out := new(ListFoldersResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/ListFolders", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/ListFolders", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -715,7 +961,7 @@ func (c *foldersClient) ListFolders(ctx context.Context, in *ListFoldersRequest,
 
 func (c *foldersClient) SearchFolders(ctx context.Context, in *SearchFoldersRequest, opts ...grpc.CallOption) (*SearchFoldersResponse, error) {
 	out := new(SearchFoldersResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/SearchFolders", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/SearchFolders", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -724,16 +970,16 @@ func (c *foldersClient) SearchFolders(ctx context.Context, in *SearchFoldersRequ
 
 func (c *foldersClient) GetFolder(ctx context.Context, in *GetFolderRequest, opts ...grpc.CallOption) (*Folder, error) {
 	out := new(Folder)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/GetFolder", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/GetFolder", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *foldersClient) CreateFolder(ctx context.Context, in *CreateFolderRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/CreateFolder", in, out, c.cc, opts...)
+func (c *foldersClient) CreateFolder(ctx context.Context, in *CreateFolderRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/CreateFolder", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -742,16 +988,16 @@ func (c *foldersClient) CreateFolder(ctx context.Context, in *CreateFolderReques
 
 func (c *foldersClient) UpdateFolder(ctx context.Context, in *UpdateFolderRequest, opts ...grpc.CallOption) (*Folder, error) {
 	out := new(Folder)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/UpdateFolder", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/UpdateFolder", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *foldersClient) MoveFolder(ctx context.Context, in *MoveFolderRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/MoveFolder", in, out, c.cc, opts...)
+func (c *foldersClient) MoveFolder(ctx context.Context, in *MoveFolderRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/MoveFolder", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -760,7 +1006,7 @@ func (c *foldersClient) MoveFolder(ctx context.Context, in *MoveFolderRequest, o
 
 func (c *foldersClient) DeleteFolder(ctx context.Context, in *DeleteFolderRequest, opts ...grpc.CallOption) (*Folder, error) {
 	out := new(Folder)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/DeleteFolder", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/DeleteFolder", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -769,42 +1015,41 @@ func (c *foldersClient) DeleteFolder(ctx context.Context, in *DeleteFolderReques
 
 func (c *foldersClient) UndeleteFolder(ctx context.Context, in *UndeleteFolderRequest, opts ...grpc.CallOption) (*Folder, error) {
 	out := new(Folder)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/UndeleteFolder", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/UndeleteFolder", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *foldersClient) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/GetIamPolicy", in, out, c.cc, opts...)
+func (c *foldersClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *foldersClient) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/SetIamPolicy", in, out, c.cc, opts...)
+func (c *foldersClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *foldersClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/TestIamPermissions", in, out, c.cc, opts...)
+func (c *foldersClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.resourcemanager.v2.Folders/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Folders service
-
+// FoldersServer is the server API for Folders service.
 type FoldersServer interface {
 	// Lists the Folders that are direct descendants of supplied parent resource.
 	// List provides a strongly consistent view of the Folders underneath
@@ -853,7 +1098,7 @@ type FoldersServer interface {
 	//
 	// The caller must have `resourcemanager.folders.create` permission on the
 	// identified parent.
-	CreateFolder(context.Context, *CreateFolderRequest) (*google_longrunning.Operation, error)
+	CreateFolder(context.Context, *CreateFolderRequest) (*longrunning.Operation, error)
 	// Updates a Folder, changing its display_name.
 	// Changes to the folder display_name will be rejected if they violate either
 	// the display_name formatting rules or naming constraints described in
@@ -885,7 +1130,7 @@ type FoldersServer interface {
 	// or fanout constraints described in the [CreateFolder] documentation.
 	// The caller must have `resourcemanager.folders.move` permission on the
 	// folder's current and proposed new parent.
-	MoveFolder(context.Context, *MoveFolderRequest) (*google_longrunning.Operation, error)
+	MoveFolder(context.Context, *MoveFolderRequest) (*longrunning.Operation, error)
 	// Requests deletion of a Folder. The Folder is moved into the
 	// [DELETE_REQUESTED] state immediately, and is deleted approximately 30 days
 	// later. This method may only be called on an empty Folder in the [ACTIVE]
@@ -908,19 +1153,19 @@ type FoldersServer interface {
 	// be the Folder's resource name, e.g. "folders/1234".
 	// The caller must have `resourcemanager.folders.getIamPolicy` permission
 	// on the identified folder.
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Sets the access control policy on a Folder, replacing any existing policy.
 	// The `resource` field should be the Folder's resource name, e.g.
 	// "folders/1234".
 	// The caller must have `resourcemanager.folders.setIamPolicy` permission
 	// on the identified folder.
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Returns permissions that a caller has on the specified Folder.
 	// The `resource` field should be the Folder's resource name,
 	// e.g. "folders/1234".
 	//
 	// There are no permissions required for making this API call.
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
 }
 
 func RegisterFoldersServer(s *grpc.Server, srv FoldersServer) {
@@ -1072,7 +1317,7 @@ func _Folders_UndeleteFolder_Handler(srv interface{}, ctx context.Context, dec f
 }
 
 func _Folders_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1084,13 +1329,13 @@ func _Folders_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec fun
 		FullMethod: "/google.cloud.resourcemanager.v2.Folders/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(FoldersServer).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(FoldersServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _Folders_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1102,13 +1347,13 @@ func _Folders_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec fun
 		FullMethod: "/google.cloud.resourcemanager.v2.Folders/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(FoldersServer).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(FoldersServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _Folders_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1120,7 +1365,7 @@ func _Folders_TestIamPermissions_Handler(srv interface{}, ctx context.Context, d
 		FullMethod: "/google.cloud.resourcemanager.v2.Folders/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(FoldersServer).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(FoldersServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1178,9 +1423,11 @@ var _Folders_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/resourcemanager/v2/folders.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/resourcemanager/v2/folders.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/resourcemanager/v2/folders.proto", fileDescriptor_folders_6c4bd17feec38232)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_folders_6c4bd17feec38232 = []byte{
 	// 1235 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5d, 0x6f, 0xdb, 0xd4,
 	0x1b, 0xff, 0x9f, 0xac, 0xcb, 0xba, 0x27, 0x2f, 0xcd, 0x4e, 0xdb, 0xfd, 0x4b, 0xba, 0xbe, 0x70,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
index 157bd2c4..04cf291f 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1/resources.pb.go
@@ -1,46 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/runtimeconfig/v1beta1/resources.proto
 
-/*
-Package runtimeconfig is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/runtimeconfig/v1beta1/resources.proto
-	google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto
-
-It has these top-level messages:
-	RuntimeConfig
-	Variable
-	EndCondition
-	Waiter
-	ListConfigsRequest
-	ListConfigsResponse
-	GetConfigRequest
-	CreateConfigRequest
-	UpdateConfigRequest
-	DeleteConfigRequest
-	ListVariablesRequest
-	ListVariablesResponse
-	WatchVariableRequest
-	GetVariableRequest
-	CreateVariableRequest
-	UpdateVariableRequest
-	DeleteVariableRequest
-	ListWaitersRequest
-	ListWaitersResponse
-	GetWaiterRequest
-	CreateWaiterRequest
-	DeleteWaiterRequest
-*/
-package runtimeconfig
+package runtimeconfig // import "google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -81,7 +50,9 @@ var VariableState_value = map[string]int32{
 func (x VariableState) String() string {
 	return proto.EnumName(VariableState_name, int32(x))
 }
-func (VariableState) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (VariableState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_resources_9e12d793a1d0df41, []int{0}
+}
 
 // A RuntimeConfig resource is the primary resource in the Cloud RuntimeConfig
 // service. A RuntimeConfig resource consists of metadata and a hierarchy of
@@ -98,15 +69,37 @@ type RuntimeConfig struct {
 	// You pick the RuntimeConfig resource name, but the server will validate that
 	// the name adheres to this format. After you create the resource, you cannot
 	// change the resource's name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional description of the RuntimeConfig object.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RuntimeConfig) Reset()         { *m = RuntimeConfig{} }
+func (m *RuntimeConfig) String() string { return proto.CompactTextString(m) }
+func (*RuntimeConfig) ProtoMessage()    {}
+func (*RuntimeConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_9e12d793a1d0df41, []int{0}
+}
+func (m *RuntimeConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RuntimeConfig.Unmarshal(m, b)
+}
+func (m *RuntimeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RuntimeConfig.Marshal(b, m, deterministic)
+}
+func (dst *RuntimeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RuntimeConfig.Merge(dst, src)
+}
+func (m *RuntimeConfig) XXX_Size() int {
+	return xxx_messageInfo_RuntimeConfig.Size(m)
+}
+func (m *RuntimeConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_RuntimeConfig.DiscardUnknown(m)
 }
 
-func (m *RuntimeConfig) Reset()                    { *m = RuntimeConfig{} }
-func (m *RuntimeConfig) String() string            { return proto.CompactTextString(m) }
-func (*RuntimeConfig) ProtoMessage()               {}
-func (*RuntimeConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_RuntimeConfig proto.InternalMessageInfo
 
 func (m *RuntimeConfig) GetName() string {
 	if m != nil {
@@ -144,7 +137,7 @@ type Variable struct {
 	// The length of a `[VARIABLE_NAME]` must be less than 256 bytes.
 	//
 	// Once you create a variable, you cannot change the variable name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The the value of the variable. It can be either a binary or a string
 	// value. You must specify one of either `value` or `text`. Specifying both
 	// will cause the server to return an error.
@@ -154,17 +147,46 @@ type Variable struct {
 	//	*Variable_Text
 	Contents isVariable_Contents `protobuf_oneof:"contents"`
 	// [Output Only] The time of the last variable update.
-	UpdateTime *google_protobuf2.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// [Ouput only] The current state of the variable. The variable state indicates
 	// the outcome of the `variables().watch` call and is visible through the
 	// `get` and `list` calls.
-	State VariableState `protobuf:"varint,4,opt,name=state,enum=google.cloud.runtimeconfig.v1beta1.VariableState" json:"state,omitempty"`
+	State                VariableState `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.runtimeconfig.v1beta1.VariableState" json:"state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *Variable) Reset()                    { *m = Variable{} }
-func (m *Variable) String() string            { return proto.CompactTextString(m) }
-func (*Variable) ProtoMessage()               {}
-func (*Variable) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Variable) Reset()         { *m = Variable{} }
+func (m *Variable) String() string { return proto.CompactTextString(m) }
+func (*Variable) ProtoMessage()    {}
+func (*Variable) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_9e12d793a1d0df41, []int{1}
+}
+func (m *Variable) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Variable.Unmarshal(m, b)
+}
+func (m *Variable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Variable.Marshal(b, m, deterministic)
+}
+func (dst *Variable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Variable.Merge(dst, src)
+}
+func (m *Variable) XXX_Size() int {
+	return xxx_messageInfo_Variable.Size(m)
+}
+func (m *Variable) XXX_DiscardUnknown() {
+	xxx_messageInfo_Variable.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Variable proto.InternalMessageInfo
+
+func (m *Variable) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
 
 type isVariable_Contents interface {
 	isVariable_Contents()
@@ -173,12 +195,14 @@ type isVariable_Contents interface {
 type Variable_Value struct {
 	Value []byte `protobuf:"bytes,2,opt,name=value,proto3,oneof"`
 }
+
 type Variable_Text struct {
-	Text string `protobuf:"bytes,5,opt,name=text,oneof"`
+	Text string `protobuf:"bytes,5,opt,name=text,proto3,oneof"`
 }
 
 func (*Variable_Value) isVariable_Contents() {}
-func (*Variable_Text) isVariable_Contents()  {}
+
+func (*Variable_Text) isVariable_Contents() {}
 
 func (m *Variable) GetContents() isVariable_Contents {
 	if m != nil {
@@ -187,13 +211,6 @@ func (m *Variable) GetContents() isVariable_Contents {
 	return nil
 }
 
-func (m *Variable) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
 func (m *Variable) GetValue() []byte {
 	if x, ok := m.GetContents().(*Variable_Value); ok {
 		return x.Value
@@ -208,7 +225,7 @@ func (m *Variable) GetText() string {
 	return ""
 }
 
-func (m *Variable) GetUpdateTime() *google_protobuf2.Timestamp {
+func (m *Variable) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -274,11 +291,11 @@ func _Variable_OneofSizer(msg proto.Message) (n int) {
 	// contents
 	switch x := m.Contents.(type) {
 	case *Variable_Value:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Value)))
 		n += len(x.Value)
 	case *Variable_Text:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Text)))
 		n += len(x.Text)
 	case nil:
@@ -295,20 +312,42 @@ type EndCondition struct {
 	//
 	// Types that are valid to be assigned to Condition:
 	//	*EndCondition_Cardinality_
-	Condition isEndCondition_Condition `protobuf_oneof:"condition"`
+	Condition            isEndCondition_Condition `protobuf_oneof:"condition"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *EndCondition) Reset()         { *m = EndCondition{} }
+func (m *EndCondition) String() string { return proto.CompactTextString(m) }
+func (*EndCondition) ProtoMessage()    {}
+func (*EndCondition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_9e12d793a1d0df41, []int{2}
+}
+func (m *EndCondition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EndCondition.Unmarshal(m, b)
+}
+func (m *EndCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EndCondition.Marshal(b, m, deterministic)
+}
+func (dst *EndCondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EndCondition.Merge(dst, src)
+}
+func (m *EndCondition) XXX_Size() int {
+	return xxx_messageInfo_EndCondition.Size(m)
+}
+func (m *EndCondition) XXX_DiscardUnknown() {
+	xxx_messageInfo_EndCondition.DiscardUnknown(m)
 }
 
-func (m *EndCondition) Reset()                    { *m = EndCondition{} }
-func (m *EndCondition) String() string            { return proto.CompactTextString(m) }
-func (*EndCondition) ProtoMessage()               {}
-func (*EndCondition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_EndCondition proto.InternalMessageInfo
 
 type isEndCondition_Condition interface {
 	isEndCondition_Condition()
 }
 
 type EndCondition_Cardinality_ struct {
-	Cardinality *EndCondition_Cardinality `protobuf:"bytes,1,opt,name=cardinality,oneof"`
+	Cardinality *EndCondition_Cardinality `protobuf:"bytes,1,opt,name=cardinality,proto3,oneof"`
 }
 
 func (*EndCondition_Cardinality_) isEndCondition_Condition() {}
@@ -372,7 +411,7 @@ func _EndCondition_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Condition.(type) {
 	case *EndCondition_Cardinality_:
 		s := proto.Size(x.Cardinality)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -398,16 +437,38 @@ func _EndCondition_OneofSizer(msg proto.Message) (n int) {
 // path prefix are counted.
 type EndCondition_Cardinality struct {
 	// The root of the variable subtree to monitor. For example, `/foo`.
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// The number variables under the `path` that must exist to meet this
 	// condition. Defaults to 1 if not specified.
-	Number int32 `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
+	Number               int32    `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *EndCondition_Cardinality) Reset()                    { *m = EndCondition_Cardinality{} }
-func (m *EndCondition_Cardinality) String() string            { return proto.CompactTextString(m) }
-func (*EndCondition_Cardinality) ProtoMessage()               {}
-func (*EndCondition_Cardinality) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (m *EndCondition_Cardinality) Reset()         { *m = EndCondition_Cardinality{} }
+func (m *EndCondition_Cardinality) String() string { return proto.CompactTextString(m) }
+func (*EndCondition_Cardinality) ProtoMessage()    {}
+func (*EndCondition_Cardinality) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_9e12d793a1d0df41, []int{2, 0}
+}
+func (m *EndCondition_Cardinality) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EndCondition_Cardinality.Unmarshal(m, b)
+}
+func (m *EndCondition_Cardinality) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EndCondition_Cardinality.Marshal(b, m, deterministic)
+}
+func (dst *EndCondition_Cardinality) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EndCondition_Cardinality.Merge(dst, src)
+}
+func (m *EndCondition_Cardinality) XXX_Size() int {
+	return xxx_messageInfo_EndCondition_Cardinality.Size(m)
+}
+func (m *EndCondition_Cardinality) XXX_DiscardUnknown() {
+	xxx_messageInfo_EndCondition_Cardinality.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EndCondition_Cardinality proto.InternalMessageInfo
 
 func (m *EndCondition_Cardinality) GetPath() string {
 	if m != nil {
@@ -449,42 +510,64 @@ type Waiter struct {
 	// of `[WAITER_NAME]` must be less than 64 bytes.
 	//
 	// After you create a Waiter resource, you cannot change the resource name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// [Required] Specifies the timeout of the waiter in seconds, beginning from
 	// the instant that `waiters().create` method is called. If this time elapses
 	// before the success or failure conditions are met, the waiter fails and sets
 	// the `error` code to `DEADLINE_EXCEEDED`.
-	Timeout *google_protobuf1.Duration `protobuf:"bytes,2,opt,name=timeout" json:"timeout,omitempty"`
+	Timeout *duration.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// [Optional] The failure condition of this waiter. If this condition is met,
 	// `done` will be set to `true` and the `error` code will be set to `ABORTED`.
 	// The failure condition takes precedence over the success condition. If both
 	// conditions are met, a failure will be indicated. This value is optional; if
 	// no failure condition is set, the only failure scenario will be a timeout.
-	Failure *EndCondition `protobuf:"bytes,3,opt,name=failure" json:"failure,omitempty"`
+	Failure *EndCondition `protobuf:"bytes,3,opt,name=failure,proto3" json:"failure,omitempty"`
 	// [Required] The success condition. If this condition is met, `done` will be
 	// set to `true` and the `error` value will remain unset. The failure condition
 	// takes precedence over the success condition. If both conditions are met, a
 	// failure will be indicated.
-	Success *EndCondition `protobuf:"bytes,4,opt,name=success" json:"success,omitempty"`
+	Success *EndCondition `protobuf:"bytes,4,opt,name=success,proto3" json:"success,omitempty"`
 	// [Output Only] The instant at which this Waiter resource was created. Adding
 	// the value of `timeout` to this instant yields the timeout deadline for the
 	// waiter.
-	CreateTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// [Output Only] If the value is `false`, it means the waiter is still waiting
 	// for one of its conditions to be met.
 	//
 	// If true, the waiter has finished. If the waiter finished due to a timeout
 	// or failure, `error` will be set.
-	Done bool `protobuf:"varint,6,opt,name=done" json:"done,omitempty"`
+	Done bool `protobuf:"varint,6,opt,name=done,proto3" json:"done,omitempty"`
 	// [Output Only] If the waiter ended due to a failure or timeout, this value
 	// will be set.
-	Error *google_rpc.Status `protobuf:"bytes,7,opt,name=error" json:"error,omitempty"`
+	Error                *status.Status `protobuf:"bytes,7,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *Waiter) Reset()                    { *m = Waiter{} }
-func (m *Waiter) String() string            { return proto.CompactTextString(m) }
-func (*Waiter) ProtoMessage()               {}
-func (*Waiter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *Waiter) Reset()         { *m = Waiter{} }
+func (m *Waiter) String() string { return proto.CompactTextString(m) }
+func (*Waiter) ProtoMessage()    {}
+func (*Waiter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_9e12d793a1d0df41, []int{3}
+}
+func (m *Waiter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Waiter.Unmarshal(m, b)
+}
+func (m *Waiter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Waiter.Marshal(b, m, deterministic)
+}
+func (dst *Waiter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Waiter.Merge(dst, src)
+}
+func (m *Waiter) XXX_Size() int {
+	return xxx_messageInfo_Waiter.Size(m)
+}
+func (m *Waiter) XXX_DiscardUnknown() {
+	xxx_messageInfo_Waiter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Waiter proto.InternalMessageInfo
 
 func (m *Waiter) GetName() string {
 	if m != nil {
@@ -493,7 +576,7 @@ func (m *Waiter) GetName() string {
 	return ""
 }
 
-func (m *Waiter) GetTimeout() *google_protobuf1.Duration {
+func (m *Waiter) GetTimeout() *duration.Duration {
 	if m != nil {
 		return m.Timeout
 	}
@@ -514,7 +597,7 @@ func (m *Waiter) GetSuccess() *EndCondition {
 	return nil
 }
 
-func (m *Waiter) GetCreateTime() *google_protobuf2.Timestamp {
+func (m *Waiter) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
@@ -528,7 +611,7 @@ func (m *Waiter) GetDone() bool {
 	return false
 }
 
-func (m *Waiter) GetError() *google_rpc.Status {
+func (m *Waiter) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
@@ -544,9 +627,11 @@ func init() {
 	proto.RegisterEnum("google.cloud.runtimeconfig.v1beta1.VariableState", VariableState_name, VariableState_value)
 }
 
-func init() { proto.RegisterFile("google/cloud/runtimeconfig/v1beta1/resources.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/runtimeconfig/v1beta1/resources.proto", fileDescriptor_resources_9e12d793a1d0df41)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_resources_9e12d793a1d0df41 = []byte{
 	// 628 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xdd, 0x6e, 0xd3, 0x30,
 	0x14, 0xc7, 0x9b, 0xd2, 0x8f, 0xed, 0x64, 0x43, 0x93, 0x85, 0x46, 0xa8, 0xd0, 0xa8, 0x7a, 0x81,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
index 2fb9f137..268181ab 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1/runtimeconfig.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto
 
-package runtimeconfig
+package runtimeconfig // import "google.golang.org/genproto/googleapis/cloud/runtimeconfig/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,23 +21,51 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Request for the `ListConfigs()` method.
 type ListConfigsRequest struct {
 	// The [project ID](https://support.google.com/cloud/answer/6158840?hl=en&ref_topic=6158848)
 	// for this request, in the format `projects/[PROJECT_ID]`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Specifies the number of results to return per page. If there are fewer
 	// elements than the specified number, returns all elements.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Specifies a page token to use. Set `pageToken` to a `nextPageToken`
 	// returned by a previous list request to get the next page of results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListConfigsRequest) Reset()         { *m = ListConfigsRequest{} }
+func (m *ListConfigsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListConfigsRequest) ProtoMessage()    {}
+func (*ListConfigsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{0}
+}
+func (m *ListConfigsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListConfigsRequest.Unmarshal(m, b)
+}
+func (m *ListConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListConfigsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfigsRequest.Merge(dst, src)
+}
+func (m *ListConfigsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListConfigsRequest.Size(m)
+}
+func (m *ListConfigsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListConfigsRequest.DiscardUnknown(m)
 }
 
-func (m *ListConfigsRequest) Reset()                    { *m = ListConfigsRequest{} }
-func (m *ListConfigsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListConfigsRequest) ProtoMessage()               {}
-func (*ListConfigsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_ListConfigsRequest proto.InternalMessageInfo
 
 func (m *ListConfigsRequest) GetParent() string {
 	if m != nil {
@@ -65,19 +93,41 @@ func (m *ListConfigsRequest) GetPageToken() string {
 type ListConfigsResponse struct {
 	// A list of the configurations in the project. The order of returned
 	// objects is arbitrary; that is, it is not ordered in any particular way.
-	Configs []*RuntimeConfig `protobuf:"bytes,1,rep,name=configs" json:"configs,omitempty"`
+	Configs []*RuntimeConfig `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"`
 	// This token allows you to get the next page of results for list requests.
 	// If the number of results is larger than `pageSize`, use the `nextPageToken`
 	// as a value for the query parameter `pageToken` in the next list request.
 	// Subsequent list requests will have their own `nextPageToken` to continue
 	// paging through the results
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListConfigsResponse) Reset()                    { *m = ListConfigsResponse{} }
-func (m *ListConfigsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListConfigsResponse) ProtoMessage()               {}
-func (*ListConfigsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *ListConfigsResponse) Reset()         { *m = ListConfigsResponse{} }
+func (m *ListConfigsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListConfigsResponse) ProtoMessage()    {}
+func (*ListConfigsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{1}
+}
+func (m *ListConfigsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListConfigsResponse.Unmarshal(m, b)
+}
+func (m *ListConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListConfigsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfigsResponse.Merge(dst, src)
+}
+func (m *ListConfigsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListConfigsResponse.Size(m)
+}
+func (m *ListConfigsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListConfigsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListConfigsResponse proto.InternalMessageInfo
 
 func (m *ListConfigsResponse) GetConfigs() []*RuntimeConfig {
 	if m != nil {
@@ -98,13 +148,35 @@ type GetConfigRequest struct {
 	// The name of the RuntimeConfig resource to retrieve, in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetConfigRequest) Reset()                    { *m = GetConfigRequest{} }
-func (m *GetConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetConfigRequest) ProtoMessage()               {}
-func (*GetConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *GetConfigRequest) Reset()         { *m = GetConfigRequest{} }
+func (m *GetConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetConfigRequest) ProtoMessage()    {}
+func (*GetConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{2}
+}
+func (m *GetConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetConfigRequest.Unmarshal(m, b)
+}
+func (m *GetConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfigRequest.Merge(dst, src)
+}
+func (m *GetConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetConfigRequest.Size(m)
+}
+func (m *GetConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetConfigRequest proto.InternalMessageInfo
 
 func (m *GetConfigRequest) GetName() string {
 	if m != nil {
@@ -117,9 +189,9 @@ func (m *GetConfigRequest) GetName() string {
 type CreateConfigRequest struct {
 	// The [project ID](https://support.google.com/cloud/answer/6158840?hl=en&ref_topic=6158848)
 	// for this request, in the format `projects/[PROJECT_ID]`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The RuntimeConfig to create.
-	Config *RuntimeConfig `protobuf:"bytes,2,opt,name=config" json:"config,omitempty"`
+	Config *RuntimeConfig `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 	// An optional but recommended unique `request_id`. If the server
 	// receives two `create()` requests  with the same
 	// `request_id`, then the second request will be ignored and the
@@ -130,13 +202,35 @@ type CreateConfigRequest struct {
 	// `request_id` strings.
 	//
 	// `request_id` strings are limited to 64 characters.
-	RequestId string `protobuf:"bytes,3,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
+	RequestId            string   `protobuf:"bytes,3,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateConfigRequest) Reset()         { *m = CreateConfigRequest{} }
+func (m *CreateConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateConfigRequest) ProtoMessage()    {}
+func (*CreateConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{3}
+}
+func (m *CreateConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateConfigRequest.Unmarshal(m, b)
+}
+func (m *CreateConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateConfigRequest.Merge(dst, src)
+}
+func (m *CreateConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateConfigRequest.Size(m)
+}
+func (m *CreateConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateConfigRequest.DiscardUnknown(m)
 }
 
-func (m *CreateConfigRequest) Reset()                    { *m = CreateConfigRequest{} }
-func (m *CreateConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateConfigRequest) ProtoMessage()               {}
-func (*CreateConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_CreateConfigRequest proto.InternalMessageInfo
 
 func (m *CreateConfigRequest) GetParent() string {
 	if m != nil {
@@ -164,15 +258,37 @@ type UpdateConfigRequest struct {
 	// The name of the RuntimeConfig resource to update, in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The config resource to update.
-	Config *RuntimeConfig `protobuf:"bytes,2,opt,name=config" json:"config,omitempty"`
+	Config               *RuntimeConfig `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *UpdateConfigRequest) Reset()                    { *m = UpdateConfigRequest{} }
-func (m *UpdateConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateConfigRequest) ProtoMessage()               {}
-func (*UpdateConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (m *UpdateConfigRequest) Reset()         { *m = UpdateConfigRequest{} }
+func (m *UpdateConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateConfigRequest) ProtoMessage()    {}
+func (*UpdateConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{4}
+}
+func (m *UpdateConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateConfigRequest.Unmarshal(m, b)
+}
+func (m *UpdateConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateConfigRequest.Merge(dst, src)
+}
+func (m *UpdateConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateConfigRequest.Size(m)
+}
+func (m *UpdateConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateConfigRequest proto.InternalMessageInfo
 
 func (m *UpdateConfigRequest) GetName() string {
 	if m != nil {
@@ -193,13 +309,35 @@ type DeleteConfigRequest struct {
 	// The RuntimeConfig resource to delete, in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteConfigRequest) Reset()         { *m = DeleteConfigRequest{} }
+func (m *DeleteConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteConfigRequest) ProtoMessage()    {}
+func (*DeleteConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{5}
+}
+func (m *DeleteConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteConfigRequest.Unmarshal(m, b)
+}
+func (m *DeleteConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteConfigRequest.Merge(dst, src)
+}
+func (m *DeleteConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteConfigRequest.Size(m)
+}
+func (m *DeleteConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteConfigRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteConfigRequest) Reset()                    { *m = DeleteConfigRequest{} }
-func (m *DeleteConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteConfigRequest) ProtoMessage()               {}
-func (*DeleteConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_DeleteConfigRequest proto.InternalMessageInfo
 
 func (m *DeleteConfigRequest) GetName() string {
 	if m != nil {
@@ -214,27 +352,49 @@ type ListVariablesRequest struct {
 	// The configuration must exist beforehand; the path must by in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Filters variables by matching the specified filter. For example:
 	//
 	// `projects/example-project/config/[CONFIG_NAME]/variables/example-variable`.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Specifies the number of results to return per page. If there are fewer
 	// elements than the specified number, returns all elements.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Specifies a page token to use. Set `pageToken` to a `nextPageToken`
 	// returned by a previous list request to get the next page of results.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The flag indicates whether the user wants to return values of variables.
 	// If true, then only those variables that user has IAM GetVariable permission
 	// will be returned along with their values.
-	ReturnValues bool `protobuf:"varint,5,opt,name=return_values,json=returnValues" json:"return_values,omitempty"`
+	ReturnValues         bool     `protobuf:"varint,5,opt,name=return_values,json=returnValues,proto3" json:"return_values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVariablesRequest) Reset()         { *m = ListVariablesRequest{} }
+func (m *ListVariablesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListVariablesRequest) ProtoMessage()    {}
+func (*ListVariablesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{6}
+}
+func (m *ListVariablesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVariablesRequest.Unmarshal(m, b)
+}
+func (m *ListVariablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVariablesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListVariablesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVariablesRequest.Merge(dst, src)
+}
+func (m *ListVariablesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListVariablesRequest.Size(m)
+}
+func (m *ListVariablesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVariablesRequest.DiscardUnknown(m)
 }
 
-func (m *ListVariablesRequest) Reset()                    { *m = ListVariablesRequest{} }
-func (m *ListVariablesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListVariablesRequest) ProtoMessage()               {}
-func (*ListVariablesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_ListVariablesRequest proto.InternalMessageInfo
 
 func (m *ListVariablesRequest) GetParent() string {
 	if m != nil {
@@ -275,19 +435,41 @@ func (m *ListVariablesRequest) GetReturnValues() bool {
 type ListVariablesResponse struct {
 	// A list of variables and their values. The order of returned variable
 	// objects is arbitrary.
-	Variables []*Variable `protobuf:"bytes,1,rep,name=variables" json:"variables,omitempty"`
+	Variables []*Variable `protobuf:"bytes,1,rep,name=variables,proto3" json:"variables,omitempty"`
 	// This token allows you to get the next page of results for list requests.
 	// If the number of results is larger than `pageSize`, use the `nextPageToken`
 	// as a value for the query parameter `pageToken` in the next list request.
 	// Subsequent list requests will have their own `nextPageToken` to continue
 	// paging through the results
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVariablesResponse) Reset()         { *m = ListVariablesResponse{} }
+func (m *ListVariablesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListVariablesResponse) ProtoMessage()    {}
+func (*ListVariablesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{7}
+}
+func (m *ListVariablesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVariablesResponse.Unmarshal(m, b)
+}
+func (m *ListVariablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVariablesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListVariablesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVariablesResponse.Merge(dst, src)
+}
+func (m *ListVariablesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListVariablesResponse.Size(m)
+}
+func (m *ListVariablesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVariablesResponse.DiscardUnknown(m)
 }
 
-func (m *ListVariablesResponse) Reset()                    { *m = ListVariablesResponse{} }
-func (m *ListVariablesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListVariablesResponse) ProtoMessage()               {}
-func (*ListVariablesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_ListVariablesResponse proto.InternalMessageInfo
 
 func (m *ListVariablesResponse) GetVariables() []*Variable {
 	if m != nil {
@@ -308,20 +490,42 @@ type WatchVariableRequest struct {
 	// The name of the variable to watch, in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// If specified, checks the current timestamp of the variable and if the
 	// current timestamp is newer than `newerThan` timestamp, the method returns
 	// immediately.
 	//
 	// If not specified or the variable has an older timestamp, the watcher waits
 	// for a the value to change before returning.
-	NewerThan *google_protobuf2.Timestamp `protobuf:"bytes,4,opt,name=newer_than,json=newerThan" json:"newer_than,omitempty"`
+	NewerThan            *timestamp.Timestamp `protobuf:"bytes,4,opt,name=newer_than,json=newerThan,proto3" json:"newer_than,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *WatchVariableRequest) Reset()         { *m = WatchVariableRequest{} }
+func (m *WatchVariableRequest) String() string { return proto.CompactTextString(m) }
+func (*WatchVariableRequest) ProtoMessage()    {}
+func (*WatchVariableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{8}
+}
+func (m *WatchVariableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WatchVariableRequest.Unmarshal(m, b)
+}
+func (m *WatchVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WatchVariableRequest.Marshal(b, m, deterministic)
+}
+func (dst *WatchVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WatchVariableRequest.Merge(dst, src)
+}
+func (m *WatchVariableRequest) XXX_Size() int {
+	return xxx_messageInfo_WatchVariableRequest.Size(m)
+}
+func (m *WatchVariableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_WatchVariableRequest.DiscardUnknown(m)
 }
 
-func (m *WatchVariableRequest) Reset()                    { *m = WatchVariableRequest{} }
-func (m *WatchVariableRequest) String() string            { return proto.CompactTextString(m) }
-func (*WatchVariableRequest) ProtoMessage()               {}
-func (*WatchVariableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+var xxx_messageInfo_WatchVariableRequest proto.InternalMessageInfo
 
 func (m *WatchVariableRequest) GetName() string {
 	if m != nil {
@@ -330,7 +534,7 @@ func (m *WatchVariableRequest) GetName() string {
 	return ""
 }
 
-func (m *WatchVariableRequest) GetNewerThan() *google_protobuf2.Timestamp {
+func (m *WatchVariableRequest) GetNewerThan() *timestamp.Timestamp {
 	if m != nil {
 		return m.NewerThan
 	}
@@ -342,13 +546,35 @@ type GetVariableRequest struct {
 	// The name of the variable to return, in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/variables/[VARIBLE_NAME]`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetVariableRequest) Reset()                    { *m = GetVariableRequest{} }
-func (m *GetVariableRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetVariableRequest) ProtoMessage()               {}
-func (*GetVariableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+func (m *GetVariableRequest) Reset()         { *m = GetVariableRequest{} }
+func (m *GetVariableRequest) String() string { return proto.CompactTextString(m) }
+func (*GetVariableRequest) ProtoMessage()    {}
+func (*GetVariableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{9}
+}
+func (m *GetVariableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetVariableRequest.Unmarshal(m, b)
+}
+func (m *GetVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetVariableRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVariableRequest.Merge(dst, src)
+}
+func (m *GetVariableRequest) XXX_Size() int {
+	return xxx_messageInfo_GetVariableRequest.Size(m)
+}
+func (m *GetVariableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetVariableRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetVariableRequest proto.InternalMessageInfo
 
 func (m *GetVariableRequest) GetName() string {
 	if m != nil {
@@ -363,9 +589,9 @@ type CreateVariableRequest struct {
 	// The configuration must exist beforehand; the path must by in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The variable to create.
-	Variable *Variable `protobuf:"bytes,2,opt,name=variable" json:"variable,omitempty"`
+	Variable *Variable `protobuf:"bytes,2,opt,name=variable,proto3" json:"variable,omitempty"`
 	// An optional but recommended unique `request_id`. If the server
 	// receives two `create()` requests  with the same
 	// `request_id`, then the second request will be ignored and the
@@ -376,13 +602,35 @@ type CreateVariableRequest struct {
 	// `request_id` strings.
 	//
 	// `request_id` strings are limited to 64 characters.
-	RequestId string `protobuf:"bytes,3,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
+	RequestId            string   `protobuf:"bytes,3,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateVariableRequest) Reset()                    { *m = CreateVariableRequest{} }
-func (m *CreateVariableRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateVariableRequest) ProtoMessage()               {}
-func (*CreateVariableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *CreateVariableRequest) Reset()         { *m = CreateVariableRequest{} }
+func (m *CreateVariableRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateVariableRequest) ProtoMessage()    {}
+func (*CreateVariableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{10}
+}
+func (m *CreateVariableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateVariableRequest.Unmarshal(m, b)
+}
+func (m *CreateVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateVariableRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVariableRequest.Merge(dst, src)
+}
+func (m *CreateVariableRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateVariableRequest.Size(m)
+}
+func (m *CreateVariableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateVariableRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateVariableRequest proto.InternalMessageInfo
 
 func (m *CreateVariableRequest) GetParent() string {
 	if m != nil {
@@ -410,15 +658,37 @@ type UpdateVariableRequest struct {
 	// The name of the variable to update, in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/variables/[VARIABLE_NAME]`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The variable to update.
-	Variable *Variable `protobuf:"bytes,2,opt,name=variable" json:"variable,omitempty"`
+	Variable             *Variable `protobuf:"bytes,2,opt,name=variable,proto3" json:"variable,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *UpdateVariableRequest) Reset()                    { *m = UpdateVariableRequest{} }
-func (m *UpdateVariableRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateVariableRequest) ProtoMessage()               {}
-func (*UpdateVariableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+func (m *UpdateVariableRequest) Reset()         { *m = UpdateVariableRequest{} }
+func (m *UpdateVariableRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateVariableRequest) ProtoMessage()    {}
+func (*UpdateVariableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{11}
+}
+func (m *UpdateVariableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateVariableRequest.Unmarshal(m, b)
+}
+func (m *UpdateVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateVariableRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateVariableRequest.Merge(dst, src)
+}
+func (m *UpdateVariableRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateVariableRequest.Size(m)
+}
+func (m *UpdateVariableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateVariableRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateVariableRequest proto.InternalMessageInfo
 
 func (m *UpdateVariableRequest) GetName() string {
 	if m != nil {
@@ -439,16 +709,38 @@ type DeleteVariableRequest struct {
 	// The name of the variable to delete, in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/variables/[VARIABLE_NAME]`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Set to `true` to recursively delete multiple variables with the same
 	// prefix.
-	Recursive bool `protobuf:"varint,2,opt,name=recursive" json:"recursive,omitempty"`
+	Recursive            bool     `protobuf:"varint,2,opt,name=recursive,proto3" json:"recursive,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteVariableRequest) Reset()         { *m = DeleteVariableRequest{} }
+func (m *DeleteVariableRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteVariableRequest) ProtoMessage()    {}
+func (*DeleteVariableRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{12}
+}
+func (m *DeleteVariableRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteVariableRequest.Unmarshal(m, b)
+}
+func (m *DeleteVariableRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteVariableRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteVariableRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVariableRequest.Merge(dst, src)
+}
+func (m *DeleteVariableRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteVariableRequest.Size(m)
+}
+func (m *DeleteVariableRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteVariableRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteVariableRequest) Reset()                    { *m = DeleteVariableRequest{} }
-func (m *DeleteVariableRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteVariableRequest) ProtoMessage()               {}
-func (*DeleteVariableRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+var xxx_messageInfo_DeleteVariableRequest proto.InternalMessageInfo
 
 func (m *DeleteVariableRequest) GetName() string {
 	if m != nil {
@@ -470,19 +762,41 @@ type ListWaitersRequest struct {
 	// The configuration must exist beforehand; the path must by in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Specifies the number of results to return per page. If there are fewer
 	// elements than the specified number, returns all elements.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Specifies a page token to use. Set `pageToken` to a `nextPageToken`
 	// returned by a previous list request to get the next page of results.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListWaitersRequest) Reset()                    { *m = ListWaitersRequest{} }
-func (m *ListWaitersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListWaitersRequest) ProtoMessage()               {}
-func (*ListWaitersRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+func (m *ListWaitersRequest) Reset()         { *m = ListWaitersRequest{} }
+func (m *ListWaitersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListWaitersRequest) ProtoMessage()    {}
+func (*ListWaitersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{13}
+}
+func (m *ListWaitersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListWaitersRequest.Unmarshal(m, b)
+}
+func (m *ListWaitersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListWaitersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListWaitersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWaitersRequest.Merge(dst, src)
+}
+func (m *ListWaitersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListWaitersRequest.Size(m)
+}
+func (m *ListWaitersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListWaitersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListWaitersRequest proto.InternalMessageInfo
 
 func (m *ListWaitersRequest) GetParent() string {
 	if m != nil {
@@ -509,19 +823,41 @@ func (m *ListWaitersRequest) GetPageToken() string {
 // Order of returned waiter objects is arbitrary.
 type ListWaitersResponse struct {
 	// Found waiters in the project.
-	Waiters []*Waiter `protobuf:"bytes,1,rep,name=waiters" json:"waiters,omitempty"`
+	Waiters []*Waiter `protobuf:"bytes,1,rep,name=waiters,proto3" json:"waiters,omitempty"`
 	// This token allows you to get the next page of results for list requests.
 	// If the number of results is larger than `pageSize`, use the `nextPageToken`
 	// as a value for the query parameter `pageToken` in the next list request.
 	// Subsequent list requests will have their own `nextPageToken` to continue
 	// paging through the results
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListWaitersResponse) Reset()         { *m = ListWaitersResponse{} }
+func (m *ListWaitersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListWaitersResponse) ProtoMessage()    {}
+func (*ListWaitersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{14}
+}
+func (m *ListWaitersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListWaitersResponse.Unmarshal(m, b)
+}
+func (m *ListWaitersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListWaitersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListWaitersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListWaitersResponse.Merge(dst, src)
+}
+func (m *ListWaitersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListWaitersResponse.Size(m)
+}
+func (m *ListWaitersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListWaitersResponse.DiscardUnknown(m)
 }
 
-func (m *ListWaitersResponse) Reset()                    { *m = ListWaitersResponse{} }
-func (m *ListWaitersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListWaitersResponse) ProtoMessage()               {}
-func (*ListWaitersResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+var xxx_messageInfo_ListWaitersResponse proto.InternalMessageInfo
 
 func (m *ListWaitersResponse) GetWaiters() []*Waiter {
 	if m != nil {
@@ -543,13 +879,35 @@ type GetWaiterRequest struct {
 	// format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/waiters/[WAITER_NAME]`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetWaiterRequest) Reset()         { *m = GetWaiterRequest{} }
+func (m *GetWaiterRequest) String() string { return proto.CompactTextString(m) }
+func (*GetWaiterRequest) ProtoMessage()    {}
+func (*GetWaiterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{15}
+}
+func (m *GetWaiterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetWaiterRequest.Unmarshal(m, b)
+}
+func (m *GetWaiterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetWaiterRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetWaiterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetWaiterRequest.Merge(dst, src)
+}
+func (m *GetWaiterRequest) XXX_Size() int {
+	return xxx_messageInfo_GetWaiterRequest.Size(m)
+}
+func (m *GetWaiterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetWaiterRequest.DiscardUnknown(m)
 }
 
-func (m *GetWaiterRequest) Reset()                    { *m = GetWaiterRequest{} }
-func (m *GetWaiterRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetWaiterRequest) ProtoMessage()               {}
-func (*GetWaiterRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+var xxx_messageInfo_GetWaiterRequest proto.InternalMessageInfo
 
 func (m *GetWaiterRequest) GetName() string {
 	if m != nil {
@@ -564,9 +922,9 @@ type CreateWaiterRequest struct {
 	// The configuration must exist beforehand; the path must by in the format:
 	//
 	// `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The Waiter resource to create.
-	Waiter *Waiter `protobuf:"bytes,2,opt,name=waiter" json:"waiter,omitempty"`
+	Waiter *Waiter `protobuf:"bytes,2,opt,name=waiter,proto3" json:"waiter,omitempty"`
 	// An optional but recommended unique `request_id`. If the server
 	// receives two `create()` requests  with the same
 	// `request_id`, then the second request will be ignored and the
@@ -577,13 +935,35 @@ type CreateWaiterRequest struct {
 	// `request_id` strings.
 	//
 	// `request_id` strings are limited to 64 characters.
-	RequestId string `protobuf:"bytes,3,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
+	RequestId            string   `protobuf:"bytes,3,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateWaiterRequest) Reset()                    { *m = CreateWaiterRequest{} }
-func (m *CreateWaiterRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateWaiterRequest) ProtoMessage()               {}
-func (*CreateWaiterRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+func (m *CreateWaiterRequest) Reset()         { *m = CreateWaiterRequest{} }
+func (m *CreateWaiterRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateWaiterRequest) ProtoMessage()    {}
+func (*CreateWaiterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{16}
+}
+func (m *CreateWaiterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateWaiterRequest.Unmarshal(m, b)
+}
+func (m *CreateWaiterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateWaiterRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateWaiterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateWaiterRequest.Merge(dst, src)
+}
+func (m *CreateWaiterRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateWaiterRequest.Size(m)
+}
+func (m *CreateWaiterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateWaiterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateWaiterRequest proto.InternalMessageInfo
 
 func (m *CreateWaiterRequest) GetParent() string {
 	if m != nil {
@@ -611,13 +991,35 @@ type DeleteWaiterRequest struct {
 	// The Waiter resource to delete, in the format:
 	//
 	//  `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/waiters/[WAITER_NAME]`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteWaiterRequest) Reset()         { *m = DeleteWaiterRequest{} }
+func (m *DeleteWaiterRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteWaiterRequest) ProtoMessage()    {}
+func (*DeleteWaiterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_runtimeconfig_6039f7e1dafadd9a, []int{17}
+}
+func (m *DeleteWaiterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteWaiterRequest.Unmarshal(m, b)
+}
+func (m *DeleteWaiterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteWaiterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteWaiterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteWaiterRequest.Merge(dst, src)
+}
+func (m *DeleteWaiterRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteWaiterRequest.Size(m)
+}
+func (m *DeleteWaiterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteWaiterRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteWaiterRequest) Reset()                    { *m = DeleteWaiterRequest{} }
-func (m *DeleteWaiterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteWaiterRequest) ProtoMessage()               {}
-func (*DeleteWaiterRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+var xxx_messageInfo_DeleteWaiterRequest proto.InternalMessageInfo
 
 func (m *DeleteWaiterRequest) GetName() string {
 	if m != nil {
@@ -655,8 +1057,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for RuntimeConfigManager service
-
+// RuntimeConfigManagerClient is the client API for RuntimeConfigManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type RuntimeConfigManagerClient interface {
 	// Lists all the RuntimeConfig resources within project.
 	ListConfigs(ctx context.Context, in *ListConfigsRequest, opts ...grpc.CallOption) (*ListConfigsResponse, error)
@@ -668,7 +1071,7 @@ type RuntimeConfigManagerClient interface {
 	// Updates a RuntimeConfig resource. The configuration must exist beforehand.
 	UpdateConfig(ctx context.Context, in *UpdateConfigRequest, opts ...grpc.CallOption) (*RuntimeConfig, error)
 	// Deletes a RuntimeConfig resource.
-	DeleteConfig(ctx context.Context, in *DeleteConfigRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeleteConfig(ctx context.Context, in *DeleteConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Lists variables within given a configuration, matching any provided filters.
 	// This only lists variable names, not the values, unless `return_values` is
 	// true, in which case only variables that user has IAM permission to
@@ -706,7 +1109,7 @@ type RuntimeConfigManagerClient interface {
 	// specify a prefix and `recursive` is true, then all variables with that
 	// prefix are deleted. You must set a `recursive` to true if you delete
 	// variables by prefix.
-	DeleteVariable(ctx context.Context, in *DeleteVariableRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeleteVariable(ctx context.Context, in *DeleteVariableRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// List waiters within the given configuration.
 	ListWaiters(ctx context.Context, in *ListWaitersRequest, opts ...grpc.CallOption) (*ListWaitersResponse, error)
 	// Gets information about a single waiter.
@@ -716,9 +1119,9 @@ type RuntimeConfigManagerClient interface {
 	// given name will exist (and can be retrieved) prior to the operation
 	// completing. If the operation fails, the failed Waiter resource will
 	// still exist and must be deleted prior to subsequent creation attempts.
-	CreateWaiter(ctx context.Context, in *CreateWaiterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateWaiter(ctx context.Context, in *CreateWaiterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes the waiter with the specified name.
-	DeleteWaiter(ctx context.Context, in *DeleteWaiterRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeleteWaiter(ctx context.Context, in *DeleteWaiterRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type runtimeConfigManagerClient struct {
@@ -731,7 +1134,7 @@ func NewRuntimeConfigManagerClient(cc *grpc.ClientConn) RuntimeConfigManagerClie
 
 func (c *runtimeConfigManagerClient) ListConfigs(ctx context.Context, in *ListConfigsRequest, opts ...grpc.CallOption) (*ListConfigsResponse, error) {
 	out := new(ListConfigsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/ListConfigs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/ListConfigs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -740,7 +1143,7 @@ func (c *runtimeConfigManagerClient) ListConfigs(ctx context.Context, in *ListCo
 
 func (c *runtimeConfigManagerClient) GetConfig(ctx context.Context, in *GetConfigRequest, opts ...grpc.CallOption) (*RuntimeConfig, error) {
 	out := new(RuntimeConfig)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/GetConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/GetConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -749,7 +1152,7 @@ func (c *runtimeConfigManagerClient) GetConfig(ctx context.Context, in *GetConfi
 
 func (c *runtimeConfigManagerClient) CreateConfig(ctx context.Context, in *CreateConfigRequest, opts ...grpc.CallOption) (*RuntimeConfig, error) {
 	out := new(RuntimeConfig)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/CreateConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/CreateConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -758,16 +1161,16 @@ func (c *runtimeConfigManagerClient) CreateConfig(ctx context.Context, in *Creat
 
 func (c *runtimeConfigManagerClient) UpdateConfig(ctx context.Context, in *UpdateConfigRequest, opts ...grpc.CallOption) (*RuntimeConfig, error) {
 	out := new(RuntimeConfig)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/UpdateConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/UpdateConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *runtimeConfigManagerClient) DeleteConfig(ctx context.Context, in *DeleteConfigRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/DeleteConfig", in, out, c.cc, opts...)
+func (c *runtimeConfigManagerClient) DeleteConfig(ctx context.Context, in *DeleteConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/DeleteConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -776,7 +1179,7 @@ func (c *runtimeConfigManagerClient) DeleteConfig(ctx context.Context, in *Delet
 
 func (c *runtimeConfigManagerClient) ListVariables(ctx context.Context, in *ListVariablesRequest, opts ...grpc.CallOption) (*ListVariablesResponse, error) {
 	out := new(ListVariablesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/ListVariables", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/ListVariables", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -785,7 +1188,7 @@ func (c *runtimeConfigManagerClient) ListVariables(ctx context.Context, in *List
 
 func (c *runtimeConfigManagerClient) GetVariable(ctx context.Context, in *GetVariableRequest, opts ...grpc.CallOption) (*Variable, error) {
 	out := new(Variable)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/GetVariable", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/GetVariable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -794,7 +1197,7 @@ func (c *runtimeConfigManagerClient) GetVariable(ctx context.Context, in *GetVar
 
 func (c *runtimeConfigManagerClient) WatchVariable(ctx context.Context, in *WatchVariableRequest, opts ...grpc.CallOption) (*Variable, error) {
 	out := new(Variable)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/WatchVariable", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/WatchVariable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -803,7 +1206,7 @@ func (c *runtimeConfigManagerClient) WatchVariable(ctx context.Context, in *Watc
 
 func (c *runtimeConfigManagerClient) CreateVariable(ctx context.Context, in *CreateVariableRequest, opts ...grpc.CallOption) (*Variable, error) {
 	out := new(Variable)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/CreateVariable", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/CreateVariable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -812,16 +1215,16 @@ func (c *runtimeConfigManagerClient) CreateVariable(ctx context.Context, in *Cre
 
 func (c *runtimeConfigManagerClient) UpdateVariable(ctx context.Context, in *UpdateVariableRequest, opts ...grpc.CallOption) (*Variable, error) {
 	out := new(Variable)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/UpdateVariable", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/UpdateVariable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *runtimeConfigManagerClient) DeleteVariable(ctx context.Context, in *DeleteVariableRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/DeleteVariable", in, out, c.cc, opts...)
+func (c *runtimeConfigManagerClient) DeleteVariable(ctx context.Context, in *DeleteVariableRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/DeleteVariable", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -830,7 +1233,7 @@ func (c *runtimeConfigManagerClient) DeleteVariable(ctx context.Context, in *Del
 
 func (c *runtimeConfigManagerClient) ListWaiters(ctx context.Context, in *ListWaitersRequest, opts ...grpc.CallOption) (*ListWaitersResponse, error) {
 	out := new(ListWaitersResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/ListWaiters", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/ListWaiters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -839,33 +1242,32 @@ func (c *runtimeConfigManagerClient) ListWaiters(ctx context.Context, in *ListWa
 
 func (c *runtimeConfigManagerClient) GetWaiter(ctx context.Context, in *GetWaiterRequest, opts ...grpc.CallOption) (*Waiter, error) {
 	out := new(Waiter)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/GetWaiter", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/GetWaiter", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *runtimeConfigManagerClient) CreateWaiter(ctx context.Context, in *CreateWaiterRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/CreateWaiter", in, out, c.cc, opts...)
+func (c *runtimeConfigManagerClient) CreateWaiter(ctx context.Context, in *CreateWaiterRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/CreateWaiter", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *runtimeConfigManagerClient) DeleteWaiter(ctx context.Context, in *DeleteWaiterRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/DeleteWaiter", in, out, c.cc, opts...)
+func (c *runtimeConfigManagerClient) DeleteWaiter(ctx context.Context, in *DeleteWaiterRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager/DeleteWaiter", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for RuntimeConfigManager service
-
+// RuntimeConfigManagerServer is the server API for RuntimeConfigManager service.
 type RuntimeConfigManagerServer interface {
 	// Lists all the RuntimeConfig resources within project.
 	ListConfigs(context.Context, *ListConfigsRequest) (*ListConfigsResponse, error)
@@ -877,7 +1279,7 @@ type RuntimeConfigManagerServer interface {
 	// Updates a RuntimeConfig resource. The configuration must exist beforehand.
 	UpdateConfig(context.Context, *UpdateConfigRequest) (*RuntimeConfig, error)
 	// Deletes a RuntimeConfig resource.
-	DeleteConfig(context.Context, *DeleteConfigRequest) (*google_protobuf4.Empty, error)
+	DeleteConfig(context.Context, *DeleteConfigRequest) (*empty.Empty, error)
 	// Lists variables within given a configuration, matching any provided filters.
 	// This only lists variable names, not the values, unless `return_values` is
 	// true, in which case only variables that user has IAM permission to
@@ -915,7 +1317,7 @@ type RuntimeConfigManagerServer interface {
 	// specify a prefix and `recursive` is true, then all variables with that
 	// prefix are deleted. You must set a `recursive` to true if you delete
 	// variables by prefix.
-	DeleteVariable(context.Context, *DeleteVariableRequest) (*google_protobuf4.Empty, error)
+	DeleteVariable(context.Context, *DeleteVariableRequest) (*empty.Empty, error)
 	// List waiters within the given configuration.
 	ListWaiters(context.Context, *ListWaitersRequest) (*ListWaitersResponse, error)
 	// Gets information about a single waiter.
@@ -925,9 +1327,9 @@ type RuntimeConfigManagerServer interface {
 	// given name will exist (and can be retrieved) prior to the operation
 	// completing. If the operation fails, the failed Waiter resource will
 	// still exist and must be deleted prior to subsequent creation attempts.
-	CreateWaiter(context.Context, *CreateWaiterRequest) (*google_longrunning.Operation, error)
+	CreateWaiter(context.Context, *CreateWaiterRequest) (*longrunning.Operation, error)
 	// Deletes the waiter with the specified name.
-	DeleteWaiter(context.Context, *DeleteWaiterRequest) (*google_protobuf4.Empty, error)
+	DeleteWaiter(context.Context, *DeleteWaiterRequest) (*empty.Empty, error)
 }
 
 func RegisterRuntimeConfigManagerServer(s *grpc.Server, srv RuntimeConfigManagerServer) {
@@ -1274,10 +1676,10 @@ var _RuntimeConfigManager_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto", fileDescriptor1)
+	proto.RegisterFile("google/cloud/runtimeconfig/v1beta1/runtimeconfig.proto", fileDescriptor_runtimeconfig_6039f7e1dafadd9a)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_runtimeconfig_6039f7e1dafadd9a = []byte{
 	// 1158 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0x4b, 0x6f, 0xdd, 0x44,
 	0x14, 0xc7, 0x35, 0x49, 0x9b, 0xe6, 0x9e, 0x3c, 0x40, 0x93, 0x87, 0x22, 0xb7, 0x15, 0x91, 0x8b,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1/cloud_speech.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1/cloud_speech.pb.go
index 31c6c4e5..e00d0798 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1/cloud_speech.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1/cloud_speech.pb.go
@@ -1,40 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/speech/v1/cloud_speech.proto
 
-/*
-Package speech is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/speech/v1/cloud_speech.proto
-
-It has these top-level messages:
-	RecognizeRequest
-	LongRunningRecognizeRequest
-	StreamingRecognizeRequest
-	StreamingRecognitionConfig
-	RecognitionConfig
-	SpeechContext
-	RecognitionAudio
-	RecognizeResponse
-	LongRunningRecognizeResponse
-	LongRunningRecognizeMetadata
-	StreamingRecognizeResponse
-	StreamingRecognitionResult
-	SpeechRecognitionResult
-	SpeechRecognitionAlternative
-	WordInfo
-*/
-package speech
+package speech // import "google.golang.org/genproto/googleapis/cloud/speech/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
 import _ "github.com/golang/protobuf/ptypes/any"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -127,7 +104,7 @@ func (x RecognitionConfig_AudioEncoding) String() string {
 	return proto.EnumName(RecognitionConfig_AudioEncoding_name, int32(x))
 }
 func (RecognitionConfig_AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{4, 0}
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{4, 0}
 }
 
 // Indicates the type of speech event.
@@ -159,22 +136,44 @@ func (x StreamingRecognizeResponse_SpeechEventType) String() string {
 	return proto.EnumName(StreamingRecognizeResponse_SpeechEventType_name, int32(x))
 }
 func (StreamingRecognizeResponse_SpeechEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{10, 0}
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{10, 0}
 }
 
 // The top-level message sent by the client for the `Recognize` method.
 type RecognizeRequest struct {
 	// *Required* Provides information to the recognizer that specifies how to
 	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
+	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 	// *Required* The audio data to be recognized.
-	Audio *RecognitionAudio `protobuf:"bytes,2,opt,name=audio" json:"audio,omitempty"`
+	Audio                *RecognitionAudio `protobuf:"bytes,2,opt,name=audio,proto3" json:"audio,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *RecognizeRequest) Reset()                    { *m = RecognizeRequest{} }
-func (m *RecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*RecognizeRequest) ProtoMessage()               {}
-func (*RecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *RecognizeRequest) Reset()         { *m = RecognizeRequest{} }
+func (m *RecognizeRequest) String() string { return proto.CompactTextString(m) }
+func (*RecognizeRequest) ProtoMessage()    {}
+func (*RecognizeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{0}
+}
+func (m *RecognizeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognizeRequest.Unmarshal(m, b)
+}
+func (m *RecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognizeRequest.Marshal(b, m, deterministic)
+}
+func (dst *RecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognizeRequest.Merge(dst, src)
+}
+func (m *RecognizeRequest) XXX_Size() int {
+	return xxx_messageInfo_RecognizeRequest.Size(m)
+}
+func (m *RecognizeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognizeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecognizeRequest proto.InternalMessageInfo
 
 func (m *RecognizeRequest) GetConfig() *RecognitionConfig {
 	if m != nil {
@@ -195,15 +194,37 @@ func (m *RecognizeRequest) GetAudio() *RecognitionAudio {
 type LongRunningRecognizeRequest struct {
 	// *Required* Provides information to the recognizer that specifies how to
 	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
+	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 	// *Required* The audio data to be recognized.
-	Audio *RecognitionAudio `protobuf:"bytes,2,opt,name=audio" json:"audio,omitempty"`
+	Audio                *RecognitionAudio `protobuf:"bytes,2,opt,name=audio,proto3" json:"audio,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *LongRunningRecognizeRequest) Reset()                    { *m = LongRunningRecognizeRequest{} }
-func (m *LongRunningRecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*LongRunningRecognizeRequest) ProtoMessage()               {}
-func (*LongRunningRecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *LongRunningRecognizeRequest) Reset()         { *m = LongRunningRecognizeRequest{} }
+func (m *LongRunningRecognizeRequest) String() string { return proto.CompactTextString(m) }
+func (*LongRunningRecognizeRequest) ProtoMessage()    {}
+func (*LongRunningRecognizeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{1}
+}
+func (m *LongRunningRecognizeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LongRunningRecognizeRequest.Unmarshal(m, b)
+}
+func (m *LongRunningRecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LongRunningRecognizeRequest.Marshal(b, m, deterministic)
+}
+func (dst *LongRunningRecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeRequest.Merge(dst, src)
+}
+func (m *LongRunningRecognizeRequest) XXX_Size() int {
+	return xxx_messageInfo_LongRunningRecognizeRequest.Size(m)
+}
+func (m *LongRunningRecognizeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_LongRunningRecognizeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LongRunningRecognizeRequest proto.InternalMessageInfo
 
 func (m *LongRunningRecognizeRequest) GetConfig() *RecognitionConfig {
 	if m != nil {
@@ -230,27 +251,51 @@ type StreamingRecognizeRequest struct {
 	// Types that are valid to be assigned to StreamingRequest:
 	//	*StreamingRecognizeRequest_StreamingConfig
 	//	*StreamingRecognizeRequest_AudioContent
-	StreamingRequest isStreamingRecognizeRequest_StreamingRequest `protobuf_oneof:"streaming_request"`
+	StreamingRequest     isStreamingRecognizeRequest_StreamingRequest `protobuf_oneof:"streaming_request"`
+	XXX_NoUnkeyedLiteral struct{}                                     `json:"-"`
+	XXX_unrecognized     []byte                                       `json:"-"`
+	XXX_sizecache        int32                                        `json:"-"`
+}
+
+func (m *StreamingRecognizeRequest) Reset()         { *m = StreamingRecognizeRequest{} }
+func (m *StreamingRecognizeRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognizeRequest) ProtoMessage()    {}
+func (*StreamingRecognizeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{2}
+}
+func (m *StreamingRecognizeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognizeRequest.Unmarshal(m, b)
+}
+func (m *StreamingRecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognizeRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognizeRequest.Merge(dst, src)
+}
+func (m *StreamingRecognizeRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognizeRequest.Size(m)
+}
+func (m *StreamingRecognizeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognizeRequest.DiscardUnknown(m)
 }
 
-func (m *StreamingRecognizeRequest) Reset()                    { *m = StreamingRecognizeRequest{} }
-func (m *StreamingRecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognizeRequest) ProtoMessage()               {}
-func (*StreamingRecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_StreamingRecognizeRequest proto.InternalMessageInfo
 
 type isStreamingRecognizeRequest_StreamingRequest interface {
 	isStreamingRecognizeRequest_StreamingRequest()
 }
 
 type StreamingRecognizeRequest_StreamingConfig struct {
-	StreamingConfig *StreamingRecognitionConfig `protobuf:"bytes,1,opt,name=streaming_config,json=streamingConfig,oneof"`
+	StreamingConfig *StreamingRecognitionConfig `protobuf:"bytes,1,opt,name=streaming_config,json=streamingConfig,proto3,oneof"`
 }
+
 type StreamingRecognizeRequest_AudioContent struct {
 	AudioContent []byte `protobuf:"bytes,2,opt,name=audio_content,json=audioContent,proto3,oneof"`
 }
 
 func (*StreamingRecognizeRequest_StreamingConfig) isStreamingRecognizeRequest_StreamingRequest() {}
-func (*StreamingRecognizeRequest_AudioContent) isStreamingRecognizeRequest_StreamingRequest()    {}
+
+func (*StreamingRecognizeRequest_AudioContent) isStreamingRecognizeRequest_StreamingRequest() {}
 
 func (m *StreamingRecognizeRequest) GetStreamingRequest() isStreamingRecognizeRequest_StreamingRequest {
 	if m != nil {
@@ -329,11 +374,11 @@ func _StreamingRecognizeRequest_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.StreamingRequest.(type) {
 	case *StreamingRecognizeRequest_StreamingConfig:
 		s := proto.Size(x.StreamingConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *StreamingRecognizeRequest_AudioContent:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AudioContent)))
 		n += len(x.AudioContent)
 	case nil:
@@ -348,7 +393,7 @@ func _StreamingRecognizeRequest_OneofSizer(msg proto.Message) (n int) {
 type StreamingRecognitionConfig struct {
 	// *Required* Provides information to the recognizer that specifies how to
 	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
+	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 	// *Optional* If `false` or omitted, the recognizer will perform continuous
 	// recognition (continuing to wait for and process audio even if the user
 	// pauses speaking) until the client closes the input stream (gRPC API) or
@@ -360,18 +405,40 @@ type StreamingRecognitionConfig struct {
 	// `END_OF_SINGLE_UTTERANCE` event and cease recognition. It will return no
 	// more than one `StreamingRecognitionResult` with the `is_final` flag set to
 	// `true`.
-	SingleUtterance bool `protobuf:"varint,2,opt,name=single_utterance,json=singleUtterance" json:"single_utterance,omitempty"`
+	SingleUtterance bool `protobuf:"varint,2,opt,name=single_utterance,json=singleUtterance,proto3" json:"single_utterance,omitempty"`
 	// *Optional* If `true`, interim results (tentative hypotheses) may be
 	// returned as they become available (these interim results are indicated with
 	// the `is_final=false` flag).
 	// If `false` or omitted, only `is_final=true` result(s) are returned.
-	InterimResults bool `protobuf:"varint,3,opt,name=interim_results,json=interimResults" json:"interim_results,omitempty"`
+	InterimResults       bool     `protobuf:"varint,3,opt,name=interim_results,json=interimResults,proto3" json:"interim_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingRecognitionConfig) Reset()         { *m = StreamingRecognitionConfig{} }
+func (m *StreamingRecognitionConfig) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognitionConfig) ProtoMessage()    {}
+func (*StreamingRecognitionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{3}
+}
+func (m *StreamingRecognitionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognitionConfig.Unmarshal(m, b)
+}
+func (m *StreamingRecognitionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognitionConfig.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognitionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionConfig.Merge(dst, src)
+}
+func (m *StreamingRecognitionConfig) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognitionConfig.Size(m)
+}
+func (m *StreamingRecognitionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognitionConfig.DiscardUnknown(m)
 }
 
-func (m *StreamingRecognitionConfig) Reset()                    { *m = StreamingRecognitionConfig{} }
-func (m *StreamingRecognitionConfig) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognitionConfig) ProtoMessage()               {}
-func (*StreamingRecognitionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_StreamingRecognitionConfig proto.InternalMessageInfo
 
 func (m *StreamingRecognitionConfig) GetConfig() *RecognitionConfig {
 	if m != nil {
@@ -398,44 +465,66 @@ func (m *StreamingRecognitionConfig) GetInterimResults() bool {
 // request.
 type RecognitionConfig struct {
 	// *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
-	Encoding RecognitionConfig_AudioEncoding `protobuf:"varint,1,opt,name=encoding,enum=google.cloud.speech.v1.RecognitionConfig_AudioEncoding" json:"encoding,omitempty"`
+	Encoding RecognitionConfig_AudioEncoding `protobuf:"varint,1,opt,name=encoding,proto3,enum=google.cloud.speech.v1.RecognitionConfig_AudioEncoding" json:"encoding,omitempty"`
 	// *Required* Sample rate in Hertz of the audio data sent in all
 	// `RecognitionAudio` messages. Valid values are: 8000-48000.
 	// 16000 is optimal. For best results, set the sampling rate of the audio
 	// source to 16000 Hz. If that's not possible, use the native sample rate of
 	// the audio source (instead of re-sampling).
-	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz" json:"sample_rate_hertz,omitempty"`
+	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
 	// *Required* The language of the supplied audio as a
 	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
 	// Example: "en-US".
 	// See [Language Support](https://cloud.google.com/speech/docs/languages)
 	// for a list of the currently supported language codes.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// *Optional* Maximum number of recognition hypotheses to be returned.
 	// Specifically, the maximum number of `SpeechRecognitionAlternative` messages
 	// within each `SpeechRecognitionResult`.
 	// The server may return fewer than `max_alternatives`.
 	// Valid values are `0`-`30`. A value of `0` or `1` will return a maximum of
 	// one. If omitted, will return a maximum of one.
-	MaxAlternatives int32 `protobuf:"varint,4,opt,name=max_alternatives,json=maxAlternatives" json:"max_alternatives,omitempty"`
+	MaxAlternatives int32 `protobuf:"varint,4,opt,name=max_alternatives,json=maxAlternatives,proto3" json:"max_alternatives,omitempty"`
 	// *Optional* If set to `true`, the server will attempt to filter out
 	// profanities, replacing all but the initial character in each filtered word
 	// with asterisks, e.g. "f***". If set to `false` or omitted, profanities
 	// won't be filtered out.
-	ProfanityFilter bool `protobuf:"varint,5,opt,name=profanity_filter,json=profanityFilter" json:"profanity_filter,omitempty"`
+	ProfanityFilter bool `protobuf:"varint,5,opt,name=profanity_filter,json=profanityFilter,proto3" json:"profanity_filter,omitempty"`
 	// *Optional* A means to provide context to assist the speech recognition.
-	SpeechContexts []*SpeechContext `protobuf:"bytes,6,rep,name=speech_contexts,json=speechContexts" json:"speech_contexts,omitempty"`
+	SpeechContexts []*SpeechContext `protobuf:"bytes,6,rep,name=speech_contexts,json=speechContexts,proto3" json:"speech_contexts,omitempty"`
 	// *Optional* If `true`, the top result includes a list of words and
 	// the start and end time offsets (timestamps) for those words. If
 	// `false`, no word-level time offset information is returned. The default is
 	// `false`.
-	EnableWordTimeOffsets bool `protobuf:"varint,8,opt,name=enable_word_time_offsets,json=enableWordTimeOffsets" json:"enable_word_time_offsets,omitempty"`
+	EnableWordTimeOffsets bool     `protobuf:"varint,8,opt,name=enable_word_time_offsets,json=enableWordTimeOffsets,proto3" json:"enable_word_time_offsets,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
 }
 
-func (m *RecognitionConfig) Reset()                    { *m = RecognitionConfig{} }
-func (m *RecognitionConfig) String() string            { return proto.CompactTextString(m) }
-func (*RecognitionConfig) ProtoMessage()               {}
-func (*RecognitionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *RecognitionConfig) Reset()         { *m = RecognitionConfig{} }
+func (m *RecognitionConfig) String() string { return proto.CompactTextString(m) }
+func (*RecognitionConfig) ProtoMessage()    {}
+func (*RecognitionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{4}
+}
+func (m *RecognitionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognitionConfig.Unmarshal(m, b)
+}
+func (m *RecognitionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognitionConfig.Marshal(b, m, deterministic)
+}
+func (dst *RecognitionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionConfig.Merge(dst, src)
+}
+func (m *RecognitionConfig) XXX_Size() int {
+	return xxx_messageInfo_RecognitionConfig.Size(m)
+}
+func (m *RecognitionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognitionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecognitionConfig proto.InternalMessageInfo
 
 func (m *RecognitionConfig) GetEncoding() RecognitionConfig_AudioEncoding {
 	if m != nil {
@@ -495,13 +584,35 @@ type SpeechContext struct {
 	// specific commands are typically spoken by the user. This can also be used
 	// to add additional words to the vocabulary of the recognizer. See
 	// [usage limits](https://cloud.google.com/speech/limits#content).
-	Phrases []string `protobuf:"bytes,1,rep,name=phrases" json:"phrases,omitempty"`
+	Phrases              []string `protobuf:"bytes,1,rep,name=phrases,proto3" json:"phrases,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SpeechContext) Reset()                    { *m = SpeechContext{} }
-func (m *SpeechContext) String() string            { return proto.CompactTextString(m) }
-func (*SpeechContext) ProtoMessage()               {}
-func (*SpeechContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *SpeechContext) Reset()         { *m = SpeechContext{} }
+func (m *SpeechContext) String() string { return proto.CompactTextString(m) }
+func (*SpeechContext) ProtoMessage()    {}
+func (*SpeechContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{5}
+}
+func (m *SpeechContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechContext.Unmarshal(m, b)
+}
+func (m *SpeechContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechContext.Marshal(b, m, deterministic)
+}
+func (dst *SpeechContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechContext.Merge(dst, src)
+}
+func (m *SpeechContext) XXX_Size() int {
+	return xxx_messageInfo_SpeechContext.Size(m)
+}
+func (m *SpeechContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpeechContext proto.InternalMessageInfo
 
 func (m *SpeechContext) GetPhrases() []string {
 	if m != nil {
@@ -521,13 +632,35 @@ type RecognitionAudio struct {
 	// Types that are valid to be assigned to AudioSource:
 	//	*RecognitionAudio_Content
 	//	*RecognitionAudio_Uri
-	AudioSource isRecognitionAudio_AudioSource `protobuf_oneof:"audio_source"`
+	AudioSource          isRecognitionAudio_AudioSource `protobuf_oneof:"audio_source"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *RecognitionAudio) Reset()         { *m = RecognitionAudio{} }
+func (m *RecognitionAudio) String() string { return proto.CompactTextString(m) }
+func (*RecognitionAudio) ProtoMessage()    {}
+func (*RecognitionAudio) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{6}
+}
+func (m *RecognitionAudio) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognitionAudio.Unmarshal(m, b)
+}
+func (m *RecognitionAudio) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognitionAudio.Marshal(b, m, deterministic)
+}
+func (dst *RecognitionAudio) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionAudio.Merge(dst, src)
+}
+func (m *RecognitionAudio) XXX_Size() int {
+	return xxx_messageInfo_RecognitionAudio.Size(m)
+}
+func (m *RecognitionAudio) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognitionAudio.DiscardUnknown(m)
 }
 
-func (m *RecognitionAudio) Reset()                    { *m = RecognitionAudio{} }
-func (m *RecognitionAudio) String() string            { return proto.CompactTextString(m) }
-func (*RecognitionAudio) ProtoMessage()               {}
-func (*RecognitionAudio) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_RecognitionAudio proto.InternalMessageInfo
 
 type isRecognitionAudio_AudioSource interface {
 	isRecognitionAudio_AudioSource()
@@ -536,12 +669,14 @@ type isRecognitionAudio_AudioSource interface {
 type RecognitionAudio_Content struct {
 	Content []byte `protobuf:"bytes,1,opt,name=content,proto3,oneof"`
 }
+
 type RecognitionAudio_Uri struct {
-	Uri string `protobuf:"bytes,2,opt,name=uri,oneof"`
+	Uri string `protobuf:"bytes,2,opt,name=uri,proto3,oneof"`
 }
 
 func (*RecognitionAudio_Content) isRecognitionAudio_AudioSource() {}
-func (*RecognitionAudio_Uri) isRecognitionAudio_AudioSource()     {}
+
+func (*RecognitionAudio_Uri) isRecognitionAudio_AudioSource() {}
 
 func (m *RecognitionAudio) GetAudioSource() isRecognitionAudio_AudioSource {
 	if m != nil {
@@ -616,11 +751,11 @@ func _RecognitionAudio_OneofSizer(msg proto.Message) (n int) {
 	// audio_source
 	switch x := m.AudioSource.(type) {
 	case *RecognitionAudio_Content:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Content)))
 		n += len(x.Content)
 	case *RecognitionAudio_Uri:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Uri)))
 		n += len(x.Uri)
 	case nil:
@@ -636,13 +771,35 @@ func _RecognitionAudio_OneofSizer(msg proto.Message) (n int) {
 type RecognizeResponse struct {
 	// *Output-only* Sequential list of transcription results corresponding to
 	// sequential portions of audio.
-	Results []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
+	Results              []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *RecognizeResponse) Reset()         { *m = RecognizeResponse{} }
+func (m *RecognizeResponse) String() string { return proto.CompactTextString(m) }
+func (*RecognizeResponse) ProtoMessage()    {}
+func (*RecognizeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{7}
+}
+func (m *RecognizeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognizeResponse.Unmarshal(m, b)
+}
+func (m *RecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognizeResponse.Marshal(b, m, deterministic)
+}
+func (dst *RecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognizeResponse.Merge(dst, src)
+}
+func (m *RecognizeResponse) XXX_Size() int {
+	return xxx_messageInfo_RecognizeResponse.Size(m)
+}
+func (m *RecognizeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognizeResponse.DiscardUnknown(m)
 }
 
-func (m *RecognizeResponse) Reset()                    { *m = RecognizeResponse{} }
-func (m *RecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*RecognizeResponse) ProtoMessage()               {}
-func (*RecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_RecognizeResponse proto.InternalMessageInfo
 
 func (m *RecognizeResponse) GetResults() []*SpeechRecognitionResult {
 	if m != nil {
@@ -659,13 +816,35 @@ func (m *RecognizeResponse) GetResults() []*SpeechRecognitionResult {
 type LongRunningRecognizeResponse struct {
 	// *Output-only* Sequential list of transcription results corresponding to
 	// sequential portions of audio.
-	Results []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
+	Results              []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *LongRunningRecognizeResponse) Reset()                    { *m = LongRunningRecognizeResponse{} }
-func (m *LongRunningRecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*LongRunningRecognizeResponse) ProtoMessage()               {}
-func (*LongRunningRecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *LongRunningRecognizeResponse) Reset()         { *m = LongRunningRecognizeResponse{} }
+func (m *LongRunningRecognizeResponse) String() string { return proto.CompactTextString(m) }
+func (*LongRunningRecognizeResponse) ProtoMessage()    {}
+func (*LongRunningRecognizeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{8}
+}
+func (m *LongRunningRecognizeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LongRunningRecognizeResponse.Unmarshal(m, b)
+}
+func (m *LongRunningRecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LongRunningRecognizeResponse.Marshal(b, m, deterministic)
+}
+func (dst *LongRunningRecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeResponse.Merge(dst, src)
+}
+func (m *LongRunningRecognizeResponse) XXX_Size() int {
+	return xxx_messageInfo_LongRunningRecognizeResponse.Size(m)
+}
+func (m *LongRunningRecognizeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_LongRunningRecognizeResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LongRunningRecognizeResponse proto.InternalMessageInfo
 
 func (m *LongRunningRecognizeResponse) GetResults() []*SpeechRecognitionResult {
 	if m != nil {
@@ -680,17 +859,39 @@ func (m *LongRunningRecognizeResponse) GetResults() []*SpeechRecognitionResult {
 type LongRunningRecognizeMetadata struct {
 	// Approximate percentage of audio processed thus far. Guaranteed to be 100
 	// when the audio is fully processed and the results are available.
-	ProgressPercent int32 `protobuf:"varint,1,opt,name=progress_percent,json=progressPercent" json:"progress_percent,omitempty"`
+	ProgressPercent int32 `protobuf:"varint,1,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 	// Time when the request was received.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time of the most recent processing update.
-	LastUpdateTime *google_protobuf4.Timestamp `protobuf:"bytes,3,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
+	LastUpdateTime       *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *LongRunningRecognizeMetadata) Reset()                    { *m = LongRunningRecognizeMetadata{} }
-func (m *LongRunningRecognizeMetadata) String() string            { return proto.CompactTextString(m) }
-func (*LongRunningRecognizeMetadata) ProtoMessage()               {}
-func (*LongRunningRecognizeMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *LongRunningRecognizeMetadata) Reset()         { *m = LongRunningRecognizeMetadata{} }
+func (m *LongRunningRecognizeMetadata) String() string { return proto.CompactTextString(m) }
+func (*LongRunningRecognizeMetadata) ProtoMessage()    {}
+func (*LongRunningRecognizeMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{9}
+}
+func (m *LongRunningRecognizeMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LongRunningRecognizeMetadata.Unmarshal(m, b)
+}
+func (m *LongRunningRecognizeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LongRunningRecognizeMetadata.Marshal(b, m, deterministic)
+}
+func (dst *LongRunningRecognizeMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeMetadata.Merge(dst, src)
+}
+func (m *LongRunningRecognizeMetadata) XXX_Size() int {
+	return xxx_messageInfo_LongRunningRecognizeMetadata.Size(m)
+}
+func (m *LongRunningRecognizeMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_LongRunningRecognizeMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LongRunningRecognizeMetadata proto.InternalMessageInfo
 
 func (m *LongRunningRecognizeMetadata) GetProgressPercent() int32 {
 	if m != nil {
@@ -699,14 +900,14 @@ func (m *LongRunningRecognizeMetadata) GetProgressPercent() int32 {
 	return 0
 }
 
-func (m *LongRunningRecognizeMetadata) GetStartTime() *google_protobuf4.Timestamp {
+func (m *LongRunningRecognizeMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *LongRunningRecognizeMetadata) GetLastUpdateTime() *google_protobuf4.Timestamp {
+func (m *LongRunningRecognizeMetadata) GetLastUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastUpdateTime
 	}
@@ -765,22 +966,44 @@ func (m *LongRunningRecognizeMetadata) GetLastUpdateTime() *google_protobuf4.Tim
 type StreamingRecognizeResponse struct {
 	// *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
 	// specifies the error for the operation.
-	Error *google_rpc.Status `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	Error *status.Status `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// *Output-only* This repeated list contains zero or more results that
 	// correspond to consecutive portions of the audio currently being processed.
 	// It contains zero or more `is_final=false` results followed by zero or one
 	// `is_final=true` result (the newly settled portion).
-	Results []*StreamingRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
+	Results []*StreamingRecognitionResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
 	// *Output-only* Indicates the type of speech event.
-	SpeechEventType StreamingRecognizeResponse_SpeechEventType `protobuf:"varint,4,opt,name=speech_event_type,json=speechEventType,enum=google.cloud.speech.v1.StreamingRecognizeResponse_SpeechEventType" json:"speech_event_type,omitempty"`
+	SpeechEventType      StreamingRecognizeResponse_SpeechEventType `protobuf:"varint,4,opt,name=speech_event_type,json=speechEventType,proto3,enum=google.cloud.speech.v1.StreamingRecognizeResponse_SpeechEventType" json:"speech_event_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                   `json:"-"`
+	XXX_unrecognized     []byte                                     `json:"-"`
+	XXX_sizecache        int32                                      `json:"-"`
+}
+
+func (m *StreamingRecognizeResponse) Reset()         { *m = StreamingRecognizeResponse{} }
+func (m *StreamingRecognizeResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognizeResponse) ProtoMessage()    {}
+func (*StreamingRecognizeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{10}
+}
+func (m *StreamingRecognizeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognizeResponse.Unmarshal(m, b)
+}
+func (m *StreamingRecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognizeResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognizeResponse.Merge(dst, src)
+}
+func (m *StreamingRecognizeResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognizeResponse.Size(m)
+}
+func (m *StreamingRecognizeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognizeResponse.DiscardUnknown(m)
 }
 
-func (m *StreamingRecognizeResponse) Reset()                    { *m = StreamingRecognizeResponse{} }
-func (m *StreamingRecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognizeResponse) ProtoMessage()               {}
-func (*StreamingRecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_StreamingRecognizeResponse proto.InternalMessageInfo
 
-func (m *StreamingRecognizeResponse) GetError() *google_rpc.Status {
+func (m *StreamingRecognizeResponse) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
@@ -806,25 +1029,47 @@ func (m *StreamingRecognizeResponse) GetSpeechEventType() StreamingRecognizeResp
 type StreamingRecognitionResult struct {
 	// *Output-only* May contain one or more recognition hypotheses (up to the
 	// maximum specified in `max_alternatives`).
-	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives" json:"alternatives,omitempty"`
+	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives,proto3" json:"alternatives,omitempty"`
 	// *Output-only* If `false`, this `StreamingRecognitionResult` represents an
 	// interim result that may change. If `true`, this is the final time the
 	// speech service will return this particular `StreamingRecognitionResult`,
 	// the recognizer will not return any further hypotheses for this portion of
 	// the transcript and corresponding audio.
-	IsFinal bool `protobuf:"varint,2,opt,name=is_final,json=isFinal" json:"is_final,omitempty"`
+	IsFinal bool `protobuf:"varint,2,opt,name=is_final,json=isFinal,proto3" json:"is_final,omitempty"`
 	// *Output-only* An estimate of the likelihood that the recognizer will not
 	// change its guess about this interim result. Values range from 0.0
 	// (completely unstable) to 1.0 (completely stable).
 	// This field is only provided for interim results (`is_final=false`).
 	// The default of 0.0 is a sentinel value indicating `stability` was not set.
-	Stability float32 `protobuf:"fixed32,3,opt,name=stability" json:"stability,omitempty"`
+	Stability            float32  `protobuf:"fixed32,3,opt,name=stability,proto3" json:"stability,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingRecognitionResult) Reset()         { *m = StreamingRecognitionResult{} }
+func (m *StreamingRecognitionResult) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognitionResult) ProtoMessage()    {}
+func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{11}
+}
+func (m *StreamingRecognitionResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognitionResult.Unmarshal(m, b)
+}
+func (m *StreamingRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognitionResult.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionResult.Merge(dst, src)
+}
+func (m *StreamingRecognitionResult) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognitionResult.Size(m)
+}
+func (m *StreamingRecognitionResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognitionResult.DiscardUnknown(m)
 }
 
-func (m *StreamingRecognitionResult) Reset()                    { *m = StreamingRecognitionResult{} }
-func (m *StreamingRecognitionResult) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognitionResult) ProtoMessage()               {}
-func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_StreamingRecognitionResult proto.InternalMessageInfo
 
 func (m *StreamingRecognitionResult) GetAlternatives() []*SpeechRecognitionAlternative {
 	if m != nil {
@@ -853,13 +1098,35 @@ type SpeechRecognitionResult struct {
 	// maximum specified in `max_alternatives`).
 	// These alternatives are ordered in terms of accuracy, with the top (first)
 	// alternative being the most probable, as ranked by the recognizer.
-	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives" json:"alternatives,omitempty"`
+	Alternatives         []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives,proto3" json:"alternatives,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
 }
 
-func (m *SpeechRecognitionResult) Reset()                    { *m = SpeechRecognitionResult{} }
-func (m *SpeechRecognitionResult) String() string            { return proto.CompactTextString(m) }
-func (*SpeechRecognitionResult) ProtoMessage()               {}
-func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *SpeechRecognitionResult) Reset()         { *m = SpeechRecognitionResult{} }
+func (m *SpeechRecognitionResult) String() string { return proto.CompactTextString(m) }
+func (*SpeechRecognitionResult) ProtoMessage()    {}
+func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{12}
+}
+func (m *SpeechRecognitionResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechRecognitionResult.Unmarshal(m, b)
+}
+func (m *SpeechRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechRecognitionResult.Marshal(b, m, deterministic)
+}
+func (dst *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionResult.Merge(dst, src)
+}
+func (m *SpeechRecognitionResult) XXX_Size() int {
+	return xxx_messageInfo_SpeechRecognitionResult.Size(m)
+}
+func (m *SpeechRecognitionResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechRecognitionResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpeechRecognitionResult proto.InternalMessageInfo
 
 func (m *SpeechRecognitionResult) GetAlternatives() []*SpeechRecognitionAlternative {
 	if m != nil {
@@ -871,22 +1138,44 @@ func (m *SpeechRecognitionResult) GetAlternatives() []*SpeechRecognitionAlternat
 // Alternative hypotheses (a.k.a. n-best list).
 type SpeechRecognitionAlternative struct {
 	// *Output-only* Transcript text representing the words that the user spoke.
-	Transcript string `protobuf:"bytes,1,opt,name=transcript" json:"transcript,omitempty"`
+	Transcript string `protobuf:"bytes,1,opt,name=transcript,proto3" json:"transcript,omitempty"`
 	// *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
 	// indicates an estimated greater likelihood that the recognized words are
 	// correct. This field is typically provided only for the top hypothesis, and
 	// only for `is_final=true` results. Clients should not rely on the
 	// `confidence` field as it is not guaranteed to be accurate or consistent.
 	// The default of 0.0 is a sentinel value indicating `confidence` was not set.
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
 	// *Output-only* A list of word-specific information for each recognized word.
-	Words []*WordInfo `protobuf:"bytes,3,rep,name=words" json:"words,omitempty"`
+	Words                []*WordInfo `protobuf:"bytes,3,rep,name=words,proto3" json:"words,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *SpeechRecognitionAlternative) Reset()                    { *m = SpeechRecognitionAlternative{} }
-func (m *SpeechRecognitionAlternative) String() string            { return proto.CompactTextString(m) }
-func (*SpeechRecognitionAlternative) ProtoMessage()               {}
-func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *SpeechRecognitionAlternative) Reset()         { *m = SpeechRecognitionAlternative{} }
+func (m *SpeechRecognitionAlternative) String() string { return proto.CompactTextString(m) }
+func (*SpeechRecognitionAlternative) ProtoMessage()    {}
+func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{13}
+}
+func (m *SpeechRecognitionAlternative) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Unmarshal(m, b)
+}
+func (m *SpeechRecognitionAlternative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Marshal(b, m, deterministic)
+}
+func (dst *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionAlternative.Merge(dst, src)
+}
+func (m *SpeechRecognitionAlternative) XXX_Size() int {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Size(m)
+}
+func (m *SpeechRecognitionAlternative) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechRecognitionAlternative.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpeechRecognitionAlternative proto.InternalMessageInfo
 
 func (m *SpeechRecognitionAlternative) GetTranscript() string {
 	if m != nil {
@@ -919,31 +1208,53 @@ type WordInfo struct {
 	// in the top hypothesis.
 	// This is an experimental feature and the accuracy of the time offset can
 	// vary.
-	StartTime *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *duration.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// *Output-only* Time offset relative to the beginning of the audio,
 	// and corresponding to the end of the spoken word.
 	// This field is only set if `enable_word_time_offsets=true` and only
 	// in the top hypothesis.
 	// This is an experimental feature and the accuracy of the time offset can
 	// vary.
-	EndTime *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *duration.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// *Output-only* The word corresponding to this set of information.
-	Word string `protobuf:"bytes,3,opt,name=word" json:"word,omitempty"`
+	Word                 string   `protobuf:"bytes,3,opt,name=word,proto3" json:"word,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WordInfo) Reset()         { *m = WordInfo{} }
+func (m *WordInfo) String() string { return proto.CompactTextString(m) }
+func (*WordInfo) ProtoMessage()    {}
+func (*WordInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_0a49d136bdba2e2b, []int{14}
+}
+func (m *WordInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WordInfo.Unmarshal(m, b)
+}
+func (m *WordInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WordInfo.Marshal(b, m, deterministic)
+}
+func (dst *WordInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WordInfo.Merge(dst, src)
+}
+func (m *WordInfo) XXX_Size() int {
+	return xxx_messageInfo_WordInfo.Size(m)
+}
+func (m *WordInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_WordInfo.DiscardUnknown(m)
 }
 
-func (m *WordInfo) Reset()                    { *m = WordInfo{} }
-func (m *WordInfo) String() string            { return proto.CompactTextString(m) }
-func (*WordInfo) ProtoMessage()               {}
-func (*WordInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_WordInfo proto.InternalMessageInfo
 
-func (m *WordInfo) GetStartTime() *google_protobuf3.Duration {
+func (m *WordInfo) GetStartTime() *duration.Duration {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *WordInfo) GetEndTime() *google_protobuf3.Duration {
+func (m *WordInfo) GetEndTime() *duration.Duration {
 	if m != nil {
 		return m.EndTime
 	}
@@ -985,8 +1296,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Speech service
-
+// SpeechClient is the client API for Speech service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SpeechClient interface {
 	// Performs synchronous speech recognition: receive results after all audio
 	// has been sent and processed.
@@ -995,7 +1307,7 @@ type SpeechClient interface {
 	// google.longrunning.Operations interface. Returns either an
 	// `Operation.error` or an `Operation.response` which contains
 	// a `LongRunningRecognizeResponse` message.
-	LongRunningRecognize(ctx context.Context, in *LongRunningRecognizeRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	LongRunningRecognize(ctx context.Context, in *LongRunningRecognizeRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Performs bidirectional streaming speech recognition: receive results while
 	// sending audio. This method is only available via the gRPC API (not REST).
 	StreamingRecognize(ctx context.Context, opts ...grpc.CallOption) (Speech_StreamingRecognizeClient, error)
@@ -1011,16 +1323,16 @@ func NewSpeechClient(cc *grpc.ClientConn) SpeechClient {
 
 func (c *speechClient) Recognize(ctx context.Context, in *RecognizeRequest, opts ...grpc.CallOption) (*RecognizeResponse, error) {
 	out := new(RecognizeResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.speech.v1.Speech/Recognize", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.speech.v1.Speech/Recognize", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *speechClient) LongRunningRecognize(ctx context.Context, in *LongRunningRecognizeRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.speech.v1.Speech/LongRunningRecognize", in, out, c.cc, opts...)
+func (c *speechClient) LongRunningRecognize(ctx context.Context, in *LongRunningRecognizeRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.speech.v1.Speech/LongRunningRecognize", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1028,7 +1340,7 @@ func (c *speechClient) LongRunningRecognize(ctx context.Context, in *LongRunning
 }
 
 func (c *speechClient) StreamingRecognize(ctx context.Context, opts ...grpc.CallOption) (Speech_StreamingRecognizeClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Speech_serviceDesc.Streams[0], c.cc, "/google.cloud.speech.v1.Speech/StreamingRecognize", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Speech_serviceDesc.Streams[0], "/google.cloud.speech.v1.Speech/StreamingRecognize", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1058,8 +1370,7 @@ func (x *speechStreamingRecognizeClient) Recv() (*StreamingRecognizeResponse, er
 	return m, nil
 }
 
-// Server API for Speech service
-
+// SpeechServer is the server API for Speech service.
 type SpeechServer interface {
 	// Performs synchronous speech recognition: receive results after all audio
 	// has been sent and processed.
@@ -1068,7 +1379,7 @@ type SpeechServer interface {
 	// google.longrunning.Operations interface. Returns either an
 	// `Operation.error` or an `Operation.response` which contains
 	// a `LongRunningRecognizeResponse` message.
-	LongRunningRecognize(context.Context, *LongRunningRecognizeRequest) (*google_longrunning.Operation, error)
+	LongRunningRecognize(context.Context, *LongRunningRecognizeRequest) (*longrunning.Operation, error)
 	// Performs bidirectional streaming speech recognition: receive results while
 	// sending audio. This method is only available via the gRPC API (not REST).
 	StreamingRecognize(Speech_StreamingRecognizeServer) error
@@ -1164,9 +1475,11 @@ var _Speech_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/speech/v1/cloud_speech.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/speech/v1/cloud_speech.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/speech/v1/cloud_speech.proto", fileDescriptor_cloud_speech_0a49d136bdba2e2b)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_cloud_speech_0a49d136bdba2e2b = []byte{
 	// 1318 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4d, 0x6f, 0x1b, 0x45,
 	0x18, 0xce, 0xc6, 0x71, 0x3e, 0xde, 0xe6, 0xc3, 0x19, 0x4a, 0xeb, 0xb8, 0xa1, 0x8d, 0xb6, 0x54,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1beta1/cloud_speech.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1beta1/cloud_speech.pb.go
deleted file mode 100644
index 178a9307..00000000
--- a/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1beta1/cloud_speech.pb.go
+++ /dev/null
@@ -1,1195 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/cloud/speech/v1beta1/cloud_speech.proto
-
-/*
-Package speech is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/speech/v1beta1/cloud_speech.proto
-
-It has these top-level messages:
-	SyncRecognizeRequest
-	AsyncRecognizeRequest
-	StreamingRecognizeRequest
-	StreamingRecognitionConfig
-	RecognitionConfig
-	SpeechContext
-	RecognitionAudio
-	SyncRecognizeResponse
-	AsyncRecognizeResponse
-	AsyncRecognizeMetadata
-	StreamingRecognizeResponse
-	StreamingRecognitionResult
-	SpeechRecognitionResult
-	SpeechRecognitionAlternative
-*/
-package speech
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-// Audio encoding of the data sent in the audio message. All encodings support
-// only 1 channel (mono) audio. Only `FLAC` includes a header that describes
-// the bytes of audio that follow the header. The other encodings are raw
-// audio bytes with no header.
-//
-// For best results, the audio source should be captured and transmitted using
-// a lossless encoding (`FLAC` or `LINEAR16`). Recognition accuracy may be
-// reduced if lossy codecs (such as AMR, AMR_WB and MULAW) are used to capture
-// or transmit the audio, particularly if background noise is present.
-type RecognitionConfig_AudioEncoding int32
-
-const (
-	// Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
-	RecognitionConfig_ENCODING_UNSPECIFIED RecognitionConfig_AudioEncoding = 0
-	// Uncompressed 16-bit signed little-endian samples (Linear PCM).
-	// This is the only encoding that may be used by `AsyncRecognize`.
-	RecognitionConfig_LINEAR16 RecognitionConfig_AudioEncoding = 1
-	// This is the recommended encoding for `SyncRecognize` and
-	// `StreamingRecognize` because it uses lossless compression; therefore
-	// recognition accuracy is not compromised by a lossy codec.
-	//
-	// The stream FLAC (Free Lossless Audio Codec) encoding is specified at:
-	// http://flac.sourceforge.net/documentation.html.
-	// 16-bit and 24-bit samples are supported.
-	// Not all fields in STREAMINFO are supported.
-	RecognitionConfig_FLAC RecognitionConfig_AudioEncoding = 2
-	// 8-bit samples that compand 14-bit audio samples using G.711 PCMU/mu-law.
-	RecognitionConfig_MULAW RecognitionConfig_AudioEncoding = 3
-	// Adaptive Multi-Rate Narrowband codec. `sample_rate` must be 8000 Hz.
-	RecognitionConfig_AMR RecognitionConfig_AudioEncoding = 4
-	// Adaptive Multi-Rate Wideband codec. `sample_rate` must be 16000 Hz.
-	RecognitionConfig_AMR_WB RecognitionConfig_AudioEncoding = 5
-)
-
-var RecognitionConfig_AudioEncoding_name = map[int32]string{
-	0: "ENCODING_UNSPECIFIED",
-	1: "LINEAR16",
-	2: "FLAC",
-	3: "MULAW",
-	4: "AMR",
-	5: "AMR_WB",
-}
-var RecognitionConfig_AudioEncoding_value = map[string]int32{
-	"ENCODING_UNSPECIFIED": 0,
-	"LINEAR16":             1,
-	"FLAC":                 2,
-	"MULAW":                3,
-	"AMR":                  4,
-	"AMR_WB":               5,
-}
-
-func (x RecognitionConfig_AudioEncoding) String() string {
-	return proto.EnumName(RecognitionConfig_AudioEncoding_name, int32(x))
-}
-func (RecognitionConfig_AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{4, 0}
-}
-
-// Indicates the type of endpointer event.
-type StreamingRecognizeResponse_EndpointerType int32
-
-const (
-	// No endpointer event specified.
-	StreamingRecognizeResponse_ENDPOINTER_EVENT_UNSPECIFIED StreamingRecognizeResponse_EndpointerType = 0
-	// Speech has been detected in the audio stream, and the service is
-	// beginning to process it.
-	StreamingRecognizeResponse_START_OF_SPEECH StreamingRecognizeResponse_EndpointerType = 1
-	// Speech has ceased to be detected in the audio stream. (For example, the
-	// user may have paused after speaking.) If `single_utterance` is `false`,
-	// the service will continue to process audio, and if subsequent speech is
-	// detected, will send another START_OF_SPEECH event.
-	StreamingRecognizeResponse_END_OF_SPEECH StreamingRecognizeResponse_EndpointerType = 2
-	// This event is sent after the client has half-closed the input stream gRPC
-	// connection and the server has received all of the audio. (The server may
-	// still be processing the audio and may subsequently return additional
-	// results.)
-	StreamingRecognizeResponse_END_OF_AUDIO StreamingRecognizeResponse_EndpointerType = 3
-	// This event is only sent when `single_utterance` is `true`. It indicates
-	// that the server has detected the end of the user's speech utterance and
-	// expects no additional speech. Therefore, the server will not process
-	// additional audio (although it may subsequently return additional
-	// results). The client should stop sending additional audio data,
-	// half-close the gRPC connection, and wait for any additional results
-	// until the server closes the gRPC connection.
-	StreamingRecognizeResponse_END_OF_UTTERANCE StreamingRecognizeResponse_EndpointerType = 4
-)
-
-var StreamingRecognizeResponse_EndpointerType_name = map[int32]string{
-	0: "ENDPOINTER_EVENT_UNSPECIFIED",
-	1: "START_OF_SPEECH",
-	2: "END_OF_SPEECH",
-	3: "END_OF_AUDIO",
-	4: "END_OF_UTTERANCE",
-}
-var StreamingRecognizeResponse_EndpointerType_value = map[string]int32{
-	"ENDPOINTER_EVENT_UNSPECIFIED": 0,
-	"START_OF_SPEECH":              1,
-	"END_OF_SPEECH":                2,
-	"END_OF_AUDIO":                 3,
-	"END_OF_UTTERANCE":             4,
-}
-
-func (x StreamingRecognizeResponse_EndpointerType) String() string {
-	return proto.EnumName(StreamingRecognizeResponse_EndpointerType_name, int32(x))
-}
-func (StreamingRecognizeResponse_EndpointerType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{10, 0}
-}
-
-// The top-level message sent by the client for the `SyncRecognize` method.
-type SyncRecognizeRequest struct {
-	// *Required* Provides information to the recognizer that specifies how to
-	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
-	// *Required* The audio data to be recognized.
-	Audio *RecognitionAudio `protobuf:"bytes,2,opt,name=audio" json:"audio,omitempty"`
-}
-
-func (m *SyncRecognizeRequest) Reset()                    { *m = SyncRecognizeRequest{} }
-func (m *SyncRecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*SyncRecognizeRequest) ProtoMessage()               {}
-func (*SyncRecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *SyncRecognizeRequest) GetConfig() *RecognitionConfig {
-	if m != nil {
-		return m.Config
-	}
-	return nil
-}
-
-func (m *SyncRecognizeRequest) GetAudio() *RecognitionAudio {
-	if m != nil {
-		return m.Audio
-	}
-	return nil
-}
-
-// The top-level message sent by the client for the `AsyncRecognize` method.
-type AsyncRecognizeRequest struct {
-	// *Required* Provides information to the recognizer that specifies how to
-	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
-	// *Required* The audio data to be recognized.
-	Audio *RecognitionAudio `protobuf:"bytes,2,opt,name=audio" json:"audio,omitempty"`
-}
-
-func (m *AsyncRecognizeRequest) Reset()                    { *m = AsyncRecognizeRequest{} }
-func (m *AsyncRecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*AsyncRecognizeRequest) ProtoMessage()               {}
-func (*AsyncRecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *AsyncRecognizeRequest) GetConfig() *RecognitionConfig {
-	if m != nil {
-		return m.Config
-	}
-	return nil
-}
-
-func (m *AsyncRecognizeRequest) GetAudio() *RecognitionAudio {
-	if m != nil {
-		return m.Audio
-	}
-	return nil
-}
-
-// The top-level message sent by the client for the `StreamingRecognize` method.
-// Multiple `StreamingRecognizeRequest` messages are sent. The first message
-// must contain a `streaming_config` message and must not contain `audio` data.
-// All subsequent messages must contain `audio` data and must not contain a
-// `streaming_config` message.
-type StreamingRecognizeRequest struct {
-	// The streaming request, which is either a streaming config or audio content.
-	//
-	// Types that are valid to be assigned to StreamingRequest:
-	//	*StreamingRecognizeRequest_StreamingConfig
-	//	*StreamingRecognizeRequest_AudioContent
-	StreamingRequest isStreamingRecognizeRequest_StreamingRequest `protobuf_oneof:"streaming_request"`
-}
-
-func (m *StreamingRecognizeRequest) Reset()                    { *m = StreamingRecognizeRequest{} }
-func (m *StreamingRecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognizeRequest) ProtoMessage()               {}
-func (*StreamingRecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-type isStreamingRecognizeRequest_StreamingRequest interface {
-	isStreamingRecognizeRequest_StreamingRequest()
-}
-
-type StreamingRecognizeRequest_StreamingConfig struct {
-	StreamingConfig *StreamingRecognitionConfig `protobuf:"bytes,1,opt,name=streaming_config,json=streamingConfig,oneof"`
-}
-type StreamingRecognizeRequest_AudioContent struct {
-	AudioContent []byte `protobuf:"bytes,2,opt,name=audio_content,json=audioContent,proto3,oneof"`
-}
-
-func (*StreamingRecognizeRequest_StreamingConfig) isStreamingRecognizeRequest_StreamingRequest() {}
-func (*StreamingRecognizeRequest_AudioContent) isStreamingRecognizeRequest_StreamingRequest()    {}
-
-func (m *StreamingRecognizeRequest) GetStreamingRequest() isStreamingRecognizeRequest_StreamingRequest {
-	if m != nil {
-		return m.StreamingRequest
-	}
-	return nil
-}
-
-func (m *StreamingRecognizeRequest) GetStreamingConfig() *StreamingRecognitionConfig {
-	if x, ok := m.GetStreamingRequest().(*StreamingRecognizeRequest_StreamingConfig); ok {
-		return x.StreamingConfig
-	}
-	return nil
-}
-
-func (m *StreamingRecognizeRequest) GetAudioContent() []byte {
-	if x, ok := m.GetStreamingRequest().(*StreamingRecognizeRequest_AudioContent); ok {
-		return x.AudioContent
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StreamingRecognizeRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StreamingRecognizeRequest_OneofMarshaler, _StreamingRecognizeRequest_OneofUnmarshaler, _StreamingRecognizeRequest_OneofSizer, []interface{}{
-		(*StreamingRecognizeRequest_StreamingConfig)(nil),
-		(*StreamingRecognizeRequest_AudioContent)(nil),
-	}
-}
-
-func _StreamingRecognizeRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StreamingRecognizeRequest)
-	// streaming_request
-	switch x := m.StreamingRequest.(type) {
-	case *StreamingRecognizeRequest_StreamingConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StreamingConfig); err != nil {
-			return err
-		}
-	case *StreamingRecognizeRequest_AudioContent:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.AudioContent)
-	case nil:
-	default:
-		return fmt.Errorf("StreamingRecognizeRequest.StreamingRequest has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StreamingRecognizeRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StreamingRecognizeRequest)
-	switch tag {
-	case 1: // streaming_request.streaming_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StreamingRecognitionConfig)
-		err := b.DecodeMessage(msg)
-		m.StreamingRequest = &StreamingRecognizeRequest_StreamingConfig{msg}
-		return true, err
-	case 2: // streaming_request.audio_content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.StreamingRequest = &StreamingRecognizeRequest_AudioContent{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StreamingRecognizeRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StreamingRecognizeRequest)
-	// streaming_request
-	switch x := m.StreamingRequest.(type) {
-	case *StreamingRecognizeRequest_StreamingConfig:
-		s := proto.Size(x.StreamingConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StreamingRecognizeRequest_AudioContent:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.AudioContent)))
-		n += len(x.AudioContent)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Provides information to the recognizer that specifies how to process the
-// request.
-type StreamingRecognitionConfig struct {
-	// *Required* Provides information to the recognizer that specifies how to
-	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
-	// *Optional* If `false` or omitted, the recognizer will perform continuous
-	// recognition (continuing to wait for and process audio even if the user
-	// pauses speaking) until the client closes the input stream (gRPC API) or
-	// until the maximum time limit has been reached. May return multiple
-	// `StreamingRecognitionResult`s with the `is_final` flag set to `true`.
-	//
-	// If `true`, the recognizer will detect a single spoken utterance. When it
-	// detects that the user has paused or stopped speaking, it will return an
-	// `END_OF_UTTERANCE` event and cease recognition. It will return no more than
-	// one `StreamingRecognitionResult` with the `is_final` flag set to `true`.
-	SingleUtterance bool `protobuf:"varint,2,opt,name=single_utterance,json=singleUtterance" json:"single_utterance,omitempty"`
-	// *Optional* If `true`, interim results (tentative hypotheses) may be
-	// returned as they become available (these interim results are indicated with
-	// the `is_final=false` flag).
-	// If `false` or omitted, only `is_final=true` result(s) are returned.
-	InterimResults bool `protobuf:"varint,3,opt,name=interim_results,json=interimResults" json:"interim_results,omitempty"`
-}
-
-func (m *StreamingRecognitionConfig) Reset()                    { *m = StreamingRecognitionConfig{} }
-func (m *StreamingRecognitionConfig) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognitionConfig) ProtoMessage()               {}
-func (*StreamingRecognitionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *StreamingRecognitionConfig) GetConfig() *RecognitionConfig {
-	if m != nil {
-		return m.Config
-	}
-	return nil
-}
-
-func (m *StreamingRecognitionConfig) GetSingleUtterance() bool {
-	if m != nil {
-		return m.SingleUtterance
-	}
-	return false
-}
-
-func (m *StreamingRecognitionConfig) GetInterimResults() bool {
-	if m != nil {
-		return m.InterimResults
-	}
-	return false
-}
-
-// Provides information to the recognizer that specifies how to process the
-// request.
-type RecognitionConfig struct {
-	// *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
-	Encoding RecognitionConfig_AudioEncoding `protobuf:"varint,1,opt,name=encoding,enum=google.cloud.speech.v1beta1.RecognitionConfig_AudioEncoding" json:"encoding,omitempty"`
-	// *Required* Sample rate in Hertz of the audio data sent in all
-	// `RecognitionAudio` messages. Valid values are: 8000-48000.
-	// 16000 is optimal. For best results, set the sampling rate of the audio
-	// source to 16000 Hz. If that's not possible, use the native sample rate of
-	// the audio source (instead of re-sampling).
-	SampleRate int32 `protobuf:"varint,2,opt,name=sample_rate,json=sampleRate" json:"sample_rate,omitempty"`
-	// *Optional* The language of the supplied audio as a BCP-47 language tag.
-	// Example: "en-GB"  https://www.rfc-editor.org/rfc/bcp/bcp47.txt
-	// If omitted, defaults to "en-US". See
-	// [Language Support](https://cloud.google.com/speech/docs/languages)
-	// for a list of the currently supported language codes.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
-	// *Optional* Maximum number of recognition hypotheses to be returned.
-	// Specifically, the maximum number of `SpeechRecognitionAlternative` messages
-	// within each `SpeechRecognitionResult`.
-	// The server may return fewer than `max_alternatives`.
-	// Valid values are `0`-`30`. A value of `0` or `1` will return a maximum of
-	// one. If omitted, will return a maximum of one.
-	MaxAlternatives int32 `protobuf:"varint,4,opt,name=max_alternatives,json=maxAlternatives" json:"max_alternatives,omitempty"`
-	// *Optional* If set to `true`, the server will attempt to filter out
-	// profanities, replacing all but the initial character in each filtered word
-	// with asterisks, e.g. "f***". If set to `false` or omitted, profanities
-	// won't be filtered out.
-	ProfanityFilter bool `protobuf:"varint,5,opt,name=profanity_filter,json=profanityFilter" json:"profanity_filter,omitempty"`
-	// *Optional* A means to provide context to assist the speech recognition.
-	SpeechContext *SpeechContext `protobuf:"bytes,6,opt,name=speech_context,json=speechContext" json:"speech_context,omitempty"`
-}
-
-func (m *RecognitionConfig) Reset()                    { *m = RecognitionConfig{} }
-func (m *RecognitionConfig) String() string            { return proto.CompactTextString(m) }
-func (*RecognitionConfig) ProtoMessage()               {}
-func (*RecognitionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *RecognitionConfig) GetEncoding() RecognitionConfig_AudioEncoding {
-	if m != nil {
-		return m.Encoding
-	}
-	return RecognitionConfig_ENCODING_UNSPECIFIED
-}
-
-func (m *RecognitionConfig) GetSampleRate() int32 {
-	if m != nil {
-		return m.SampleRate
-	}
-	return 0
-}
-
-func (m *RecognitionConfig) GetLanguageCode() string {
-	if m != nil {
-		return m.LanguageCode
-	}
-	return ""
-}
-
-func (m *RecognitionConfig) GetMaxAlternatives() int32 {
-	if m != nil {
-		return m.MaxAlternatives
-	}
-	return 0
-}
-
-func (m *RecognitionConfig) GetProfanityFilter() bool {
-	if m != nil {
-		return m.ProfanityFilter
-	}
-	return false
-}
-
-func (m *RecognitionConfig) GetSpeechContext() *SpeechContext {
-	if m != nil {
-		return m.SpeechContext
-	}
-	return nil
-}
-
-// Provides "hints" to the speech recognizer to favor specific words and phrases
-// in the results.
-type SpeechContext struct {
-	// *Optional* A list of strings containing words and phrases "hints" so that
-	// the speech recognition is more likely to recognize them. This can be used
-	// to improve the accuracy for specific words and phrases, for example, if
-	// specific commands are typically spoken by the user. This can also be used
-	// to add additional words to the vocabulary of the recognizer. See
-	// [usage limits](https://cloud.google.com/speech/limits#content).
-	Phrases []string `protobuf:"bytes,1,rep,name=phrases" json:"phrases,omitempty"`
-}
-
-func (m *SpeechContext) Reset()                    { *m = SpeechContext{} }
-func (m *SpeechContext) String() string            { return proto.CompactTextString(m) }
-func (*SpeechContext) ProtoMessage()               {}
-func (*SpeechContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *SpeechContext) GetPhrases() []string {
-	if m != nil {
-		return m.Phrases
-	}
-	return nil
-}
-
-// Contains audio data in the encoding specified in the `RecognitionConfig`.
-// Either `content` or `uri` must be supplied. Supplying both or neither
-// returns [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]. See
-// [audio limits](https://cloud.google.com/speech/limits#content).
-type RecognitionAudio struct {
-	// The audio source, which is either inline content or a GCS uri.
-	//
-	// Types that are valid to be assigned to AudioSource:
-	//	*RecognitionAudio_Content
-	//	*RecognitionAudio_Uri
-	AudioSource isRecognitionAudio_AudioSource `protobuf_oneof:"audio_source"`
-}
-
-func (m *RecognitionAudio) Reset()                    { *m = RecognitionAudio{} }
-func (m *RecognitionAudio) String() string            { return proto.CompactTextString(m) }
-func (*RecognitionAudio) ProtoMessage()               {}
-func (*RecognitionAudio) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-type isRecognitionAudio_AudioSource interface {
-	isRecognitionAudio_AudioSource()
-}
-
-type RecognitionAudio_Content struct {
-	Content []byte `protobuf:"bytes,1,opt,name=content,proto3,oneof"`
-}
-type RecognitionAudio_Uri struct {
-	Uri string `protobuf:"bytes,2,opt,name=uri,oneof"`
-}
-
-func (*RecognitionAudio_Content) isRecognitionAudio_AudioSource() {}
-func (*RecognitionAudio_Uri) isRecognitionAudio_AudioSource()     {}
-
-func (m *RecognitionAudio) GetAudioSource() isRecognitionAudio_AudioSource {
-	if m != nil {
-		return m.AudioSource
-	}
-	return nil
-}
-
-func (m *RecognitionAudio) GetContent() []byte {
-	if x, ok := m.GetAudioSource().(*RecognitionAudio_Content); ok {
-		return x.Content
-	}
-	return nil
-}
-
-func (m *RecognitionAudio) GetUri() string {
-	if x, ok := m.GetAudioSource().(*RecognitionAudio_Uri); ok {
-		return x.Uri
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecognitionAudio) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecognitionAudio_OneofMarshaler, _RecognitionAudio_OneofUnmarshaler, _RecognitionAudio_OneofSizer, []interface{}{
-		(*RecognitionAudio_Content)(nil),
-		(*RecognitionAudio_Uri)(nil),
-	}
-}
-
-func _RecognitionAudio_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecognitionAudio)
-	// audio_source
-	switch x := m.AudioSource.(type) {
-	case *RecognitionAudio_Content:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Content)
-	case *RecognitionAudio_Uri:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Uri)
-	case nil:
-	default:
-		return fmt.Errorf("RecognitionAudio.AudioSource has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecognitionAudio_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecognitionAudio)
-	switch tag {
-	case 1: // audio_source.content
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.AudioSource = &RecognitionAudio_Content{x}
-		return true, err
-	case 2: // audio_source.uri
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.AudioSource = &RecognitionAudio_Uri{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecognitionAudio_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecognitionAudio)
-	// audio_source
-	switch x := m.AudioSource.(type) {
-	case *RecognitionAudio_Content:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Content)))
-		n += len(x.Content)
-	case *RecognitionAudio_Uri:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Uri)))
-		n += len(x.Uri)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// The only message returned to the client by `SyncRecognize`. method. It
-// contains the result as zero or more sequential `SpeechRecognitionResult`
-// messages.
-type SyncRecognizeResponse struct {
-	// *Output-only* Sequential list of transcription results corresponding to
-	// sequential portions of audio.
-	Results []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
-}
-
-func (m *SyncRecognizeResponse) Reset()                    { *m = SyncRecognizeResponse{} }
-func (m *SyncRecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*SyncRecognizeResponse) ProtoMessage()               {}
-func (*SyncRecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *SyncRecognizeResponse) GetResults() []*SpeechRecognitionResult {
-	if m != nil {
-		return m.Results
-	}
-	return nil
-}
-
-// The only message returned to the client by `AsyncRecognize`. It contains the
-// result as zero or more sequential `SpeechRecognitionResult` messages. It is
-// included in the `result.response` field of the `Operation` returned by the
-// `GetOperation` call of the `google::longrunning::Operations` service.
-type AsyncRecognizeResponse struct {
-	// *Output-only* Sequential list of transcription results corresponding to
-	// sequential portions of audio.
-	Results []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
-}
-
-func (m *AsyncRecognizeResponse) Reset()                    { *m = AsyncRecognizeResponse{} }
-func (m *AsyncRecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*AsyncRecognizeResponse) ProtoMessage()               {}
-func (*AsyncRecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *AsyncRecognizeResponse) GetResults() []*SpeechRecognitionResult {
-	if m != nil {
-		return m.Results
-	}
-	return nil
-}
-
-// Describes the progress of a long-running `AsyncRecognize` call. It is
-// included in the `metadata` field of the `Operation` returned by the
-// `GetOperation` call of the `google::longrunning::Operations` service.
-type AsyncRecognizeMetadata struct {
-	// Approximate percentage of audio processed thus far. Guaranteed to be 100
-	// when the audio is fully processed and the results are available.
-	ProgressPercent int32 `protobuf:"varint,1,opt,name=progress_percent,json=progressPercent" json:"progress_percent,omitempty"`
-	// Time when the request was received.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
-	// Time of the most recent processing update.
-	LastUpdateTime *google_protobuf4.Timestamp `protobuf:"bytes,3,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
-}
-
-func (m *AsyncRecognizeMetadata) Reset()                    { *m = AsyncRecognizeMetadata{} }
-func (m *AsyncRecognizeMetadata) String() string            { return proto.CompactTextString(m) }
-func (*AsyncRecognizeMetadata) ProtoMessage()               {}
-func (*AsyncRecognizeMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-func (m *AsyncRecognizeMetadata) GetProgressPercent() int32 {
-	if m != nil {
-		return m.ProgressPercent
-	}
-	return 0
-}
-
-func (m *AsyncRecognizeMetadata) GetStartTime() *google_protobuf4.Timestamp {
-	if m != nil {
-		return m.StartTime
-	}
-	return nil
-}
-
-func (m *AsyncRecognizeMetadata) GetLastUpdateTime() *google_protobuf4.Timestamp {
-	if m != nil {
-		return m.LastUpdateTime
-	}
-	return nil
-}
-
-// `StreamingRecognizeResponse` is the only message returned to the client by
-// `StreamingRecognize`. A series of one or more `StreamingRecognizeResponse`
-// messages are streamed back to the client.
-//
-// Here's an example of a series of ten `StreamingRecognizeResponse`s that might
-// be returned while processing audio:
-//
-// 1. endpointer_type: START_OF_SPEECH
-//
-// 2. results { alternatives { transcript: "tube" } stability: 0.01 }
-//    result_index: 0
-//
-// 3. results { alternatives { transcript: "to be a" } stability: 0.01 }
-//    result_index: 0
-//
-// 4. results { alternatives { transcript: "to be" } stability: 0.9 }
-//    results { alternatives { transcript: " or not to be" } stability: 0.01 }
-//    result_index: 0
-//
-// 5. results { alternatives { transcript: "to be or not to be"
-//                             confidence: 0.92 }
-//              alternatives { transcript: "to bee or not to bee" }
-//              is_final: true }
-//    result_index: 0
-//
-// 6. results { alternatives { transcript: " that's" } stability: 0.01 }
-//    result_index: 1
-//
-// 7. results { alternatives { transcript: " that is" } stability: 0.9 }
-//    results { alternatives { transcript: " the question" } stability: 0.01 }
-//    result_index: 1
-//
-// 8. endpointer_type: END_OF_SPEECH
-//
-// 9. results { alternatives { transcript: " that is the question"
-//                             confidence: 0.98 }
-//              alternatives { transcript: " that was the question" }
-//              is_final: true }
-//    result_index: 1
-//
-// 10. endpointer_type: END_OF_AUDIO
-//
-// Notes:
-//
-// - Only two of the above responses #5 and #9 contain final results, they are
-//   indicated by `is_final: true`. Concatenating these together generates the
-//   full transcript: "to be or not to be that is the question".
-//
-// - The others contain interim `results`. #4 and #7 contain two interim
-//   `results`, the first portion has a high stability and is less likely to
-//   change, the second portion has a low stability and is very likely to
-//   change. A UI designer might choose to show only high stability `results`.
-//
-// - The specific `stability` and `confidence` values shown above are only for
-//   illustrative purposes. Actual values may vary.
-//
-// - The `result_index` indicates the portion of audio that has had final
-//   results returned, and is no longer being processed. For example, the
-//   `results` in #6 and later correspond to the portion of audio after
-//   "to be or not to be".
-type StreamingRecognizeResponse struct {
-	// *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
-	// specifies the error for the operation.
-	Error *google_rpc.Status `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	// *Output-only* This repeated list contains zero or more results that
-	// correspond to consecutive portions of the audio currently being processed.
-	// It contains zero or one `is_final=true` result (the newly settled portion),
-	// followed by zero or more `is_final=false` results.
-	Results []*StreamingRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
-	// *Output-only* Indicates the lowest index in the `results` array that has
-	// changed. The repeated `StreamingRecognitionResult` results overwrite past
-	// results at this index and higher.
-	ResultIndex int32 `protobuf:"varint,3,opt,name=result_index,json=resultIndex" json:"result_index,omitempty"`
-	// *Output-only* Indicates the type of endpointer event.
-	EndpointerType StreamingRecognizeResponse_EndpointerType `protobuf:"varint,4,opt,name=endpointer_type,json=endpointerType,enum=google.cloud.speech.v1beta1.StreamingRecognizeResponse_EndpointerType" json:"endpointer_type,omitempty"`
-}
-
-func (m *StreamingRecognizeResponse) Reset()                    { *m = StreamingRecognizeResponse{} }
-func (m *StreamingRecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognizeResponse) ProtoMessage()               {}
-func (*StreamingRecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-func (m *StreamingRecognizeResponse) GetError() *google_rpc.Status {
-	if m != nil {
-		return m.Error
-	}
-	return nil
-}
-
-func (m *StreamingRecognizeResponse) GetResults() []*StreamingRecognitionResult {
-	if m != nil {
-		return m.Results
-	}
-	return nil
-}
-
-func (m *StreamingRecognizeResponse) GetResultIndex() int32 {
-	if m != nil {
-		return m.ResultIndex
-	}
-	return 0
-}
-
-func (m *StreamingRecognizeResponse) GetEndpointerType() StreamingRecognizeResponse_EndpointerType {
-	if m != nil {
-		return m.EndpointerType
-	}
-	return StreamingRecognizeResponse_ENDPOINTER_EVENT_UNSPECIFIED
-}
-
-// A streaming speech recognition result corresponding to a portion of the audio
-// that is currently being processed.
-type StreamingRecognitionResult struct {
-	// *Output-only* May contain one or more recognition hypotheses (up to the
-	// maximum specified in `max_alternatives`).
-	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives" json:"alternatives,omitempty"`
-	// *Output-only* If `false`, this `StreamingRecognitionResult` represents an
-	// interim result that may change. If `true`, this is the final time the
-	// speech service will return this particular `StreamingRecognitionResult`,
-	// the recognizer will not return any further hypotheses for this portion of
-	// the transcript and corresponding audio.
-	IsFinal bool `protobuf:"varint,2,opt,name=is_final,json=isFinal" json:"is_final,omitempty"`
-	// *Output-only* An estimate of the likelihood that the recognizer will not
-	// change its guess about this interim result. Values range from 0.0
-	// (completely unstable) to 1.0 (completely stable).
-	// This field is only provided for interim results (`is_final=false`).
-	// The default of 0.0 is a sentinel value indicating `stability` was not set.
-	Stability float32 `protobuf:"fixed32,3,opt,name=stability" json:"stability,omitempty"`
-}
-
-func (m *StreamingRecognitionResult) Reset()                    { *m = StreamingRecognitionResult{} }
-func (m *StreamingRecognitionResult) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognitionResult) ProtoMessage()               {}
-func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-func (m *StreamingRecognitionResult) GetAlternatives() []*SpeechRecognitionAlternative {
-	if m != nil {
-		return m.Alternatives
-	}
-	return nil
-}
-
-func (m *StreamingRecognitionResult) GetIsFinal() bool {
-	if m != nil {
-		return m.IsFinal
-	}
-	return false
-}
-
-func (m *StreamingRecognitionResult) GetStability() float32 {
-	if m != nil {
-		return m.Stability
-	}
-	return 0
-}
-
-// A speech recognition result corresponding to a portion of the audio.
-type SpeechRecognitionResult struct {
-	// *Output-only* May contain one or more recognition hypotheses (up to the
-	// maximum specified in `max_alternatives`).
-	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives" json:"alternatives,omitempty"`
-}
-
-func (m *SpeechRecognitionResult) Reset()                    { *m = SpeechRecognitionResult{} }
-func (m *SpeechRecognitionResult) String() string            { return proto.CompactTextString(m) }
-func (*SpeechRecognitionResult) ProtoMessage()               {}
-func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-func (m *SpeechRecognitionResult) GetAlternatives() []*SpeechRecognitionAlternative {
-	if m != nil {
-		return m.Alternatives
-	}
-	return nil
-}
-
-// Alternative hypotheses (a.k.a. n-best list).
-type SpeechRecognitionAlternative struct {
-	// *Output-only* Transcript text representing the words that the user spoke.
-	Transcript string `protobuf:"bytes,1,opt,name=transcript" json:"transcript,omitempty"`
-	// *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
-	// indicates an estimated greater likelihood that the recognized words are
-	// correct. This field is typically provided only for the top hypothesis, and
-	// only for `is_final=true` results. Clients should not rely on the
-	// `confidence` field as it is not guaranteed to be accurate, or even set, in
-	// any of the results.
-	// The default of 0.0 is a sentinel value indicating `confidence` was not set.
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
-}
-
-func (m *SpeechRecognitionAlternative) Reset()                    { *m = SpeechRecognitionAlternative{} }
-func (m *SpeechRecognitionAlternative) String() string            { return proto.CompactTextString(m) }
-func (*SpeechRecognitionAlternative) ProtoMessage()               {}
-func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
-
-func (m *SpeechRecognitionAlternative) GetTranscript() string {
-	if m != nil {
-		return m.Transcript
-	}
-	return ""
-}
-
-func (m *SpeechRecognitionAlternative) GetConfidence() float32 {
-	if m != nil {
-		return m.Confidence
-	}
-	return 0
-}
-
-func init() {
-	proto.RegisterType((*SyncRecognizeRequest)(nil), "google.cloud.speech.v1beta1.SyncRecognizeRequest")
-	proto.RegisterType((*AsyncRecognizeRequest)(nil), "google.cloud.speech.v1beta1.AsyncRecognizeRequest")
-	proto.RegisterType((*StreamingRecognizeRequest)(nil), "google.cloud.speech.v1beta1.StreamingRecognizeRequest")
-	proto.RegisterType((*StreamingRecognitionConfig)(nil), "google.cloud.speech.v1beta1.StreamingRecognitionConfig")
-	proto.RegisterType((*RecognitionConfig)(nil), "google.cloud.speech.v1beta1.RecognitionConfig")
-	proto.RegisterType((*SpeechContext)(nil), "google.cloud.speech.v1beta1.SpeechContext")
-	proto.RegisterType((*RecognitionAudio)(nil), "google.cloud.speech.v1beta1.RecognitionAudio")
-	proto.RegisterType((*SyncRecognizeResponse)(nil), "google.cloud.speech.v1beta1.SyncRecognizeResponse")
-	proto.RegisterType((*AsyncRecognizeResponse)(nil), "google.cloud.speech.v1beta1.AsyncRecognizeResponse")
-	proto.RegisterType((*AsyncRecognizeMetadata)(nil), "google.cloud.speech.v1beta1.AsyncRecognizeMetadata")
-	proto.RegisterType((*StreamingRecognizeResponse)(nil), "google.cloud.speech.v1beta1.StreamingRecognizeResponse")
-	proto.RegisterType((*StreamingRecognitionResult)(nil), "google.cloud.speech.v1beta1.StreamingRecognitionResult")
-	proto.RegisterType((*SpeechRecognitionResult)(nil), "google.cloud.speech.v1beta1.SpeechRecognitionResult")
-	proto.RegisterType((*SpeechRecognitionAlternative)(nil), "google.cloud.speech.v1beta1.SpeechRecognitionAlternative")
-	proto.RegisterEnum("google.cloud.speech.v1beta1.RecognitionConfig_AudioEncoding", RecognitionConfig_AudioEncoding_name, RecognitionConfig_AudioEncoding_value)
-	proto.RegisterEnum("google.cloud.speech.v1beta1.StreamingRecognizeResponse_EndpointerType", StreamingRecognizeResponse_EndpointerType_name, StreamingRecognizeResponse_EndpointerType_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for Speech service
-
-type SpeechClient interface {
-	// Performs synchronous speech recognition: receive results after all audio
-	// has been sent and processed.
-	SyncRecognize(ctx context.Context, in *SyncRecognizeRequest, opts ...grpc.CallOption) (*SyncRecognizeResponse, error)
-	// Performs asynchronous speech recognition: receive results via the
-	// [google.longrunning.Operations]
-	// (/speech/reference/rest/v1beta1/operations#Operation)
-	// interface. Returns either an
-	// `Operation.error` or an `Operation.response` which contains
-	// an `AsyncRecognizeResponse` message.
-	AsyncRecognize(ctx context.Context, in *AsyncRecognizeRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// Performs bidirectional streaming speech recognition: receive results while
-	// sending audio. This method is only available via the gRPC API (not REST).
-	StreamingRecognize(ctx context.Context, opts ...grpc.CallOption) (Speech_StreamingRecognizeClient, error)
-}
-
-type speechClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewSpeechClient(cc *grpc.ClientConn) SpeechClient {
-	return &speechClient{cc}
-}
-
-func (c *speechClient) SyncRecognize(ctx context.Context, in *SyncRecognizeRequest, opts ...grpc.CallOption) (*SyncRecognizeResponse, error) {
-	out := new(SyncRecognizeResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.speech.v1beta1.Speech/SyncRecognize", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *speechClient) AsyncRecognize(ctx context.Context, in *AsyncRecognizeRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.speech.v1beta1.Speech/AsyncRecognize", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *speechClient) StreamingRecognize(ctx context.Context, opts ...grpc.CallOption) (Speech_StreamingRecognizeClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Speech_serviceDesc.Streams[0], c.cc, "/google.cloud.speech.v1beta1.Speech/StreamingRecognize", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &speechStreamingRecognizeClient{stream}
-	return x, nil
-}
-
-type Speech_StreamingRecognizeClient interface {
-	Send(*StreamingRecognizeRequest) error
-	Recv() (*StreamingRecognizeResponse, error)
-	grpc.ClientStream
-}
-
-type speechStreamingRecognizeClient struct {
-	grpc.ClientStream
-}
-
-func (x *speechStreamingRecognizeClient) Send(m *StreamingRecognizeRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *speechStreamingRecognizeClient) Recv() (*StreamingRecognizeResponse, error) {
-	m := new(StreamingRecognizeResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Server API for Speech service
-
-type SpeechServer interface {
-	// Performs synchronous speech recognition: receive results after all audio
-	// has been sent and processed.
-	SyncRecognize(context.Context, *SyncRecognizeRequest) (*SyncRecognizeResponse, error)
-	// Performs asynchronous speech recognition: receive results via the
-	// [google.longrunning.Operations]
-	// (/speech/reference/rest/v1beta1/operations#Operation)
-	// interface. Returns either an
-	// `Operation.error` or an `Operation.response` which contains
-	// an `AsyncRecognizeResponse` message.
-	AsyncRecognize(context.Context, *AsyncRecognizeRequest) (*google_longrunning.Operation, error)
-	// Performs bidirectional streaming speech recognition: receive results while
-	// sending audio. This method is only available via the gRPC API (not REST).
-	StreamingRecognize(Speech_StreamingRecognizeServer) error
-}
-
-func RegisterSpeechServer(s *grpc.Server, srv SpeechServer) {
-	s.RegisterService(&_Speech_serviceDesc, srv)
-}
-
-func _Speech_SyncRecognize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SyncRecognizeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(SpeechServer).SyncRecognize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.speech.v1beta1.Speech/SyncRecognize",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SpeechServer).SyncRecognize(ctx, req.(*SyncRecognizeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Speech_AsyncRecognize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AsyncRecognizeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(SpeechServer).AsyncRecognize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.cloud.speech.v1beta1.Speech/AsyncRecognize",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SpeechServer).AsyncRecognize(ctx, req.(*AsyncRecognizeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Speech_StreamingRecognize_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(SpeechServer).StreamingRecognize(&speechStreamingRecognizeServer{stream})
-}
-
-type Speech_StreamingRecognizeServer interface {
-	Send(*StreamingRecognizeResponse) error
-	Recv() (*StreamingRecognizeRequest, error)
-	grpc.ServerStream
-}
-
-type speechStreamingRecognizeServer struct {
-	grpc.ServerStream
-}
-
-func (x *speechStreamingRecognizeServer) Send(m *StreamingRecognizeResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *speechStreamingRecognizeServer) Recv() (*StreamingRecognizeRequest, error) {
-	m := new(StreamingRecognizeRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-var _Speech_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.cloud.speech.v1beta1.Speech",
-	HandlerType: (*SpeechServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "SyncRecognize",
-			Handler:    _Speech_SyncRecognize_Handler,
-		},
-		{
-			MethodName: "AsyncRecognize",
-			Handler:    _Speech_AsyncRecognize_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "StreamingRecognize",
-			Handler:       _Speech_StreamingRecognize_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-	Metadata: "google/cloud/speech/v1beta1/cloud_speech.proto",
-}
-
-func init() { proto.RegisterFile("google/cloud/speech/v1beta1/cloud_speech.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 1214 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4d, 0x6f, 0x1b, 0xc5,
-	0x1b, 0xcf, 0xda, 0x71, 0x5e, 0x9e, 0xd8, 0xce, 0x76, 0xda, 0xfe, 0xeb, 0xfa, 0x9f, 0xb6, 0x61,
-	0x2b, 0x44, 0x5a, 0x89, 0x35, 0x09, 0xa8, 0x55, 0x0b, 0x17, 0xc7, 0x59, 0x13, 0x4b, 0x8d, 0x93,
-	0x4e, 0x1c, 0x8a, 0x90, 0x60, 0x35, 0x59, 0x4f, 0xb6, 0x2b, 0xd9, 0x33, 0xcb, 0xcc, 0x6c, 0x95,
-	0x70, 0xec, 0x8d, 0x0b, 0x17, 0xbe, 0x00, 0x12, 0x7c, 0x02, 0xc4, 0x81, 0x0b, 0xe2, 0xc2, 0x81,
-	0x3b, 0x5f, 0x81, 0x0f, 0x82, 0x76, 0x66, 0x37, 0xb1, 0x9d, 0xc6, 0x34, 0x88, 0x4a, 0xdc, 0xfc,
-	0xfc, 0x9e, 0x97, 0xf9, 0xed, 0x33, 0xcf, 0xcb, 0x18, 0xdc, 0x90, 0xf3, 0x70, 0x40, 0x1b, 0xc1,
-	0x80, 0x27, 0xfd, 0x86, 0x8c, 0x29, 0x0d, 0x9e, 0x37, 0x5e, 0xac, 0x1f, 0x52, 0x45, 0xd6, 0x0d,
-	0xe8, 0x1b, 0xd0, 0x8d, 0x05, 0x57, 0x1c, 0xfd, 0xdf, 0xd8, 0xbb, 0x5a, 0xe5, 0x66, 0xaa, 0xcc,
-	0xbe, 0xbe, 0x92, 0x05, 0x23, 0x71, 0xd4, 0x20, 0x8c, 0x71, 0x45, 0x54, 0xc4, 0x99, 0x34, 0xae,
-	0xf5, 0xbb, 0x99, 0x76, 0xc0, 0x59, 0x28, 0x12, 0xc6, 0x22, 0x16, 0x36, 0x78, 0x4c, 0xc5, 0x98,
-	0xd1, 0xed, 0xcc, 0x48, 0x4b, 0x87, 0xc9, 0x51, 0xa3, 0x9f, 0x18, 0x83, 0x4c, 0x7f, 0x67, 0x52,
-	0xaf, 0xa2, 0x21, 0x95, 0x8a, 0x0c, 0xe3, 0xcc, 0xe0, 0x46, 0x66, 0x20, 0xe2, 0xa0, 0x21, 0x15,
-	0x51, 0x49, 0x16, 0xd9, 0xf9, 0xde, 0x82, 0x6b, 0xfb, 0x27, 0x2c, 0xc0, 0x34, 0xe0, 0x21, 0x8b,
-	0xbe, 0xa2, 0x98, 0x7e, 0x99, 0x50, 0xa9, 0x50, 0x1b, 0xe6, 0x02, 0xce, 0x8e, 0xa2, 0xb0, 0x66,
-	0xad, 0x5a, 0x6b, 0x4b, 0x1b, 0xae, 0x3b, 0xe5, 0x1b, 0xdd, 0xcc, 0x3d, 0xa5, 0xd4, 0xd2, 0x5e,
-	0x38, 0xf3, 0x46, 0x2d, 0x28, 0x91, 0xa4, 0x1f, 0xf1, 0x5a, 0x41, 0x87, 0x79, 0xf7, 0x75, 0xc3,
-	0x34, 0x53, 0x27, 0x6c, 0x7c, 0x9d, 0x1f, 0x2c, 0xb8, 0xde, 0x94, 0xff, 0x79, 0x9a, 0xbf, 0x58,
-	0x70, 0x73, 0x5f, 0x09, 0x4a, 0x86, 0x11, 0x0b, 0xcf, 0x51, 0xed, 0x83, 0x2d, 0x73, 0xa5, 0x3f,
-	0x46, 0xfa, 0xe1, 0xd4, 0xd3, 0x26, 0x23, 0x9e, 0xb1, 0xdf, 0x9e, 0xc1, 0xcb, 0xa7, 0x21, 0x0d,
-	0x84, 0xde, 0x86, 0x8a, 0x26, 0x93, 0x9e, 0xa0, 0x28, 0x53, 0xfa, 0x83, 0xca, 0xdb, 0x33, 0xb8,
-	0xac, 0xe1, 0x96, 0x41, 0x37, 0xaf, 0xc2, 0x95, 0x33, 0x32, 0xc2, 0x30, 0x74, 0x7e, 0xb6, 0xa0,
-	0x7e, 0xf1, 0x69, 0xff, 0x5a, 0xae, 0xef, 0x81, 0x2d, 0x23, 0x16, 0x0e, 0xa8, 0x9f, 0x28, 0x45,
-	0x05, 0x61, 0x01, 0xd5, 0x2c, 0x17, 0xf0, 0xb2, 0xc1, 0x0f, 0x72, 0x18, 0xbd, 0x03, 0xcb, 0x11,
-	0x53, 0x54, 0x44, 0x43, 0x5f, 0x50, 0x99, 0x0c, 0x94, 0xac, 0x15, 0xb5, 0x65, 0x35, 0x83, 0xb1,
-	0x41, 0x9d, 0x5f, 0x8b, 0x70, 0xe5, 0x3c, 0xe3, 0x4f, 0x61, 0x81, 0xb2, 0x80, 0xf7, 0x23, 0x66,
-	0x38, 0x57, 0x37, 0x3e, 0xba, 0x1c, 0x67, 0x57, 0xdf, 0xaf, 0x97, 0xc5, 0xc0, 0xa7, 0xd1, 0xd0,
-	0x1d, 0x58, 0x92, 0x64, 0x18, 0x0f, 0xa8, 0x2f, 0x88, 0x32, 0xf4, 0x4b, 0x18, 0x0c, 0x84, 0x89,
-	0xa2, 0xe8, 0x2e, 0x54, 0x06, 0x84, 0x85, 0x09, 0x09, 0xa9, 0x1f, 0xf0, 0x3e, 0xd5, 0xbc, 0x17,
-	0x71, 0x39, 0x07, 0x5b, 0xbc, 0x4f, 0xd3, 0x4c, 0x0c, 0xc9, 0xb1, 0x4f, 0x06, 0x8a, 0x0a, 0x46,
-	0x54, 0xf4, 0x82, 0xca, 0xda, 0xac, 0x0e, 0xb5, 0x3c, 0x24, 0xc7, 0xcd, 0x11, 0x38, 0x35, 0x8d,
-	0x05, 0x3f, 0x22, 0x2c, 0x52, 0x27, 0xfe, 0x51, 0x94, 0xaa, 0x6a, 0x25, 0x93, 0xb4, 0x53, 0xbc,
-	0xad, 0x61, 0xf4, 0x14, 0xaa, 0xe6, 0xbb, 0x4c, 0x0d, 0x1c, 0xab, 0xda, 0x9c, 0xbe, 0xaf, 0xfb,
-	0xd3, 0xcb, 0x4c, 0x8b, 0x2d, 0xe3, 0x81, 0x2b, 0x72, 0x54, 0x74, 0x08, 0x54, 0xc6, 0x32, 0x81,
-	0x6a, 0x70, 0xcd, 0xeb, 0xb6, 0x76, 0xb7, 0x3a, 0xdd, 0x8f, 0xfd, 0x83, 0xee, 0xfe, 0x9e, 0xd7,
-	0xea, 0xb4, 0x3b, 0xde, 0x96, 0x3d, 0x83, 0xca, 0xb0, 0xf0, 0xa4, 0xd3, 0xf5, 0x9a, 0x78, 0xfd,
-	0x81, 0x6d, 0xa1, 0x05, 0x98, 0x6d, 0x3f, 0x69, 0xb6, 0xec, 0x02, 0x5a, 0x84, 0xd2, 0xce, 0xc1,
-	0x93, 0xe6, 0x33, 0xbb, 0x88, 0xe6, 0xa1, 0xd8, 0xdc, 0xc1, 0xf6, 0x2c, 0x02, 0x98, 0x6b, 0xee,
-	0x60, 0xff, 0xd9, 0xa6, 0x5d, 0x72, 0xee, 0x41, 0x65, 0x8c, 0x02, 0xaa, 0xc1, 0x7c, 0xfc, 0x5c,
-	0x10, 0x49, 0x65, 0xcd, 0x5a, 0x2d, 0xae, 0x2d, 0xe2, 0x5c, 0x74, 0x30, 0xd8, 0x93, 0x2d, 0x88,
-	0xea, 0x30, 0x9f, 0x57, 0xbc, 0x95, 0x55, 0x7c, 0x0e, 0x20, 0x04, 0xc5, 0x44, 0x44, 0xfa, 0x92,
-	0x16, 0xb7, 0x67, 0x70, 0x2a, 0x6c, 0x56, 0xc1, 0x34, 0x84, 0x2f, 0x79, 0x22, 0x02, 0xea, 0x84,
-	0x70, 0x7d, 0x62, 0x0e, 0xca, 0x98, 0x33, 0x49, 0x51, 0x17, 0xe6, 0xf3, 0xd2, 0x2b, 0xac, 0x16,
-	0xd7, 0x96, 0x36, 0x3e, 0x78, 0x8d, 0x34, 0x8e, 0xd0, 0x33, 0x15, 0x8a, 0xf3, 0x20, 0xce, 0x73,
-	0xf8, 0xdf, 0xe4, 0x28, 0x7b, 0x43, 0x27, 0xfd, 0x66, 0x4d, 0x1e, 0xb5, 0x43, 0x15, 0xe9, 0x13,
-	0x45, 0xb2, 0x6a, 0x0a, 0x05, 0x95, 0xd2, 0x8f, 0xa9, 0x08, 0xf2, 0xb4, 0x95, 0x74, 0x35, 0x69,
-	0x7c, 0xcf, 0xc0, 0xe8, 0x11, 0x80, 0x54, 0x44, 0x28, 0x3f, 0xdd, 0x29, 0xd9, 0x78, 0xac, 0xe7,
-	0xc4, 0xf2, 0x85, 0xe3, 0xf6, 0xf2, 0x85, 0x83, 0x17, 0xb5, 0x75, 0x2a, 0xa3, 0x2d, 0xb0, 0x07,
-	0x44, 0x2a, 0x3f, 0x89, 0xfb, 0x44, 0x51, 0x13, 0xa0, 0xf8, 0xb7, 0x01, 0xaa, 0xa9, 0xcf, 0x81,
-	0x76, 0x49, 0x41, 0xe7, 0xc7, 0xe2, 0xf9, 0xa9, 0x34, 0x92, 0xb5, 0x35, 0x28, 0x51, 0x21, 0xb8,
-	0xc8, 0x86, 0x12, 0xca, 0x23, 0x8b, 0x38, 0x70, 0xf7, 0xf5, 0xaa, 0xc3, 0xc6, 0x00, 0x3d, 0x9d,
-	0xcc, 0xef, 0xe5, 0xe7, 0xee, 0x44, 0x8a, 0xd1, 0x5b, 0x50, 0x36, 0x3f, 0xfd, 0x88, 0xf5, 0xe9,
-	0xb1, 0xfe, 0xba, 0x12, 0x5e, 0x32, 0x58, 0x27, 0x85, 0x10, 0x87, 0x65, 0xca, 0xfa, 0x31, 0xd7,
-	0x03, 0xcb, 0x57, 0x27, 0x31, 0xd5, 0x2d, 0x5e, 0xdd, 0x68, 0x5f, 0xea, 0xf4, 0xb3, 0x2f, 0x76,
-	0xbd, 0xd3, 0x70, 0xbd, 0x93, 0x98, 0xe2, 0x2a, 0x1d, 0x93, 0x9d, 0x97, 0x16, 0x54, 0xc7, 0x4d,
-	0xd0, 0x2a, 0xac, 0x78, 0xdd, 0xad, 0xbd, 0xdd, 0x4e, 0xb7, 0xe7, 0x61, 0xdf, 0xfb, 0xc4, 0xeb,
-	0xf6, 0x26, 0xba, 0xf6, 0x2a, 0x2c, 0xef, 0xf7, 0x9a, 0xb8, 0xe7, 0xef, 0xb6, 0xfd, 0xfd, 0x3d,
-	0xcf, 0x6b, 0x6d, 0xdb, 0x16, 0xba, 0x02, 0x15, 0xaf, 0xbb, 0x35, 0x02, 0x15, 0x90, 0x0d, 0xe5,
-	0x0c, 0x6a, 0x1e, 0x6c, 0x75, 0x76, 0xed, 0x22, 0xba, 0x06, 0x76, 0x86, 0x1c, 0xf4, 0x7a, 0x1e,
-	0x6e, 0x76, 0x5b, 0x9e, 0x3d, 0xeb, 0xfc, 0x74, 0xc1, 0x2a, 0x31, 0x09, 0x44, 0x9f, 0x43, 0x79,
-	0x6c, 0xe8, 0x59, 0xfa, 0x3e, 0x1e, 0x5d, 0xae, 0xde, 0x47, 0xe6, 0x23, 0x1e, 0x0b, 0x87, 0x6e,
-	0xc2, 0x42, 0x24, 0xfd, 0xa3, 0x88, 0x91, 0x41, 0xb6, 0x59, 0xe6, 0x23, 0xd9, 0x4e, 0x45, 0xb4,
-	0x02, 0x69, 0x81, 0x1e, 0x46, 0x83, 0x48, 0x9d, 0xe8, 0xeb, 0x2a, 0xe0, 0x33, 0xc0, 0x39, 0x86,
-	0x1b, 0x17, 0xb4, 0xd5, 0x1b, 0xa6, 0xec, 0x7c, 0x01, 0x2b, 0xd3, 0xac, 0xd1, 0x6d, 0x00, 0x25,
-	0x08, 0x93, 0x81, 0x88, 0x62, 0xd3, 0xab, 0x8b, 0x78, 0x04, 0x49, 0xf5, 0x7a, 0xbd, 0xf6, 0x69,
-	0xbe, 0x4e, 0x0b, 0x78, 0x04, 0xd9, 0xf8, 0xbd, 0x08, 0x73, 0xe6, 0x00, 0xf4, 0x9d, 0x05, 0x95,
-	0xb1, 0x59, 0x87, 0xd6, 0xa7, 0x7f, 0xc5, 0x2b, 0x1e, 0x5e, 0xf5, 0x8d, 0xcb, 0xb8, 0x98, 0xc2,
-	0x75, 0xd6, 0x5e, 0xfe, 0xf1, 0xe7, 0xb7, 0x05, 0xc7, 0xb9, 0x75, 0xfa, 0x96, 0x36, 0x6e, 0x8f,
-	0xd3, 0x21, 0x25, 0x72, 0xf3, 0xc7, 0xd6, 0x7d, 0xf4, 0x8d, 0x05, 0xd5, 0xf1, 0xd1, 0x85, 0xa6,
-	0x1f, 0xf8, 0xca, 0xd7, 0x61, 0xfd, 0x56, 0xee, 0x33, 0xf2, 0xba, 0x76, 0x77, 0xf3, 0xd7, 0xb5,
-	0x73, 0x4f, 0xf3, 0xb9, 0xeb, 0xdc, 0x9e, 0xe4, 0x43, 0xce, 0x11, 0xfa, 0xda, 0x02, 0x74, 0xbe,
-	0x25, 0xd1, 0x83, 0x4b, 0xf7, 0xb0, 0x21, 0xf6, 0xf0, 0x1f, 0xf6, 0xfe, 0x9a, 0xf5, 0x9e, 0xb5,
-	0x29, 0xe1, 0x4e, 0xc0, 0x87, 0xd3, 0x22, 0x6c, 0x2e, 0x99, 0xab, 0xde, 0x4b, 0xa7, 0xeb, 0x9e,
-	0xf5, 0x59, 0x33, 0xb3, 0x0d, 0x79, 0xfa, 0xfc, 0x70, 0xb9, 0x08, 0x1b, 0x21, 0x65, 0x7a, 0xf6,
-	0x36, 0x8c, 0x8a, 0xc4, 0x91, 0x7c, 0xe5, 0xdf, 0x9d, 0x0f, 0x8d, 0x78, 0x38, 0xa7, 0xad, 0xdf,
-	0xff, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x25, 0x0d, 0x06, 0x48, 0x1b, 0x0d, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
index 1a65d2eb..8c453560 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1/cloud_speech.pb.go
@@ -1,40 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/cloud/speech/v1_1beta1/cloud_speech.proto
-
-/*
-Package speech is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/speech/v1_1beta1/cloud_speech.proto
-
-It has these top-level messages:
-	RecognizeRequest
-	LongRunningRecognizeRequest
-	StreamingRecognizeRequest
-	StreamingRecognitionConfig
-	RecognitionConfig
-	RecognitionMetadata
-	SpeechContext
-	RecognitionAudio
-	RecognizeResponse
-	LongRunningRecognizeResponse
-	LongRunningRecognizeMetadata
-	StreamingRecognizeResponse
-	StreamingRecognitionResult
-	SpeechRecognitionResult
-	SpeechRecognitionAlternative
-	WordInfo
-*/
-package speech
+// source: google/cloud/speech/v1p1beta1/cloud_speech.proto
+
+package speech // import "google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _ "github.com/golang/protobuf/ptypes/any"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -52,24 +29,34 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
-// Audio encoding of the data sent in the audio message. All encodings support
-// only 1 channel (mono) audio. Only `FLAC` includes a header that describes
-// the bytes of audio that follow the header. The other encodings are raw
-// audio bytes with no header.
+// The encoding of the audio data sent in the request.
+//
+// All encodings support only 1 channel (mono) audio.
 //
 // For best results, the audio source should be captured and transmitted using
-// a lossless encoding (`FLAC` or `LINEAR16`). Recognition accuracy may be
-// reduced if lossy codecs, which include the other codecs listed in
-// this section, are used to capture or transmit the audio, particularly if
-// background noise is present.
+// a lossless encoding (`FLAC` or `LINEAR16`). The accuracy of the speech
+// recognition can be reduced if lossy codecs are used to capture or transmit
+// audio, particularly if background noise is present. Lossy codecs include
+// `MULAW`, `AMR`, `AMR_WB`, `OGG_OPUS`, and `SPEEX_WITH_HEADER_BYTE`.
+//
+// The `FLAC` and `WAV` audio file formats include a header that describes the
+// included audio content. You can request recognition for `WAV` files that
+// contain either `LINEAR16` or `MULAW` encoded audio.
+// If you send `FLAC` or `WAV` audio file format in
+// your request, you do not need to specify an `AudioEncoding`; the audio
+// encoding format is determined from the file header. If you specify
+// an `AudioEncoding` when you send  send `FLAC` or `WAV` audio, the
+// encoding configuration must match the encoding described in the audio
+// header; otherwise the request returns an
+// [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT] error code.
 type RecognitionConfig_AudioEncoding int32
 
 const (
-	// Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
+	// Not specified.
 	RecognitionConfig_ENCODING_UNSPECIFIED RecognitionConfig_AudioEncoding = 0
 	// Uncompressed 16-bit signed little-endian samples (Linear PCM).
 	RecognitionConfig_LINEAR16 RecognitionConfig_AudioEncoding = 1
-	// [`FLAC`](https://xiph.org/flac/documentation.html) (Free Lossless Audio
+	// `FLAC` (Free Lossless Audio
 	// Codec) is the recommended encoding because it is
 	// lossless--therefore recognition is not compromised--and
 	// requires only about half the bandwidth of `LINEAR16`. `FLAC` stream
@@ -84,7 +71,7 @@ const (
 	RecognitionConfig_AMR_WB RecognitionConfig_AudioEncoding = 5
 	// Opus encoded audio frames in Ogg container
 	// ([OggOpus](https://wiki.xiph.org/OggOpus)).
-	// `sample_rate_hertz` must be 16000.
+	// `sample_rate_hertz` must be one of 8000, 12000, 16000, 24000, or 48000.
 	RecognitionConfig_OGG_OPUS RecognitionConfig_AudioEncoding = 6
 	// Although the use of lossy encodings is not recommended, if a very low
 	// bitrate encoding is required, `OGG_OPUS` is highly preferred over
@@ -127,7 +114,7 @@ func (x RecognitionConfig_AudioEncoding) String() string {
 	return proto.EnumName(RecognitionConfig_AudioEncoding_name, int32(x))
 }
 func (RecognitionConfig_AudioEncoding) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{4, 0}
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{4, 0}
 }
 
 // Use case categories that the audio recognition request can be described
@@ -189,7 +176,7 @@ func (x RecognitionMetadata_InteractionType) String() string {
 	return proto.EnumName(RecognitionMetadata_InteractionType_name, int32(x))
 }
 func (RecognitionMetadata_InteractionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 0}
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{5, 0}
 }
 
 // Enumerates the types of capture settings describing an audio file.
@@ -225,7 +212,7 @@ func (x RecognitionMetadata_MicrophoneDistance) String() string {
 	return proto.EnumName(RecognitionMetadata_MicrophoneDistance_name, int32(x))
 }
 func (RecognitionMetadata_MicrophoneDistance) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 1}
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{5, 1}
 }
 
 // The original media the speech was recorded on.
@@ -255,42 +242,7 @@ func (x RecognitionMetadata_OriginalMediaType) String() string {
 	return proto.EnumName(RecognitionMetadata_OriginalMediaType_name, int32(x))
 }
 func (RecognitionMetadata_OriginalMediaType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 2}
-}
-
-// How many speakers expected in the speech to be recognized.
-type RecognitionMetadata_NumberOfSpeakers int32
-
-const (
-	// Unknown number of persons speaking.
-	RecognitionMetadata_NUMBER_OF_SPEAKERS_UNSPECIFIED RecognitionMetadata_NumberOfSpeakers = 0
-	// Only one person is the prominent speaker (ignore background voices).
-	RecognitionMetadata_ONE_SPEAKER RecognitionMetadata_NumberOfSpeakers = 1
-	// Two people are the prominent speakers (transcript should focus
-	// on the two most prominent speakers).
-	RecognitionMetadata_TWO_SPEAKERS RecognitionMetadata_NumberOfSpeakers = 2
-	// Transcribe all voices.
-	RecognitionMetadata_MULTIPLE_SPEAKERS RecognitionMetadata_NumberOfSpeakers = 3
-)
-
-var RecognitionMetadata_NumberOfSpeakers_name = map[int32]string{
-	0: "NUMBER_OF_SPEAKERS_UNSPECIFIED",
-	1: "ONE_SPEAKER",
-	2: "TWO_SPEAKERS",
-	3: "MULTIPLE_SPEAKERS",
-}
-var RecognitionMetadata_NumberOfSpeakers_value = map[string]int32{
-	"NUMBER_OF_SPEAKERS_UNSPECIFIED": 0,
-	"ONE_SPEAKER":                    1,
-	"TWO_SPEAKERS":                   2,
-	"MULTIPLE_SPEAKERS":              3,
-}
-
-func (x RecognitionMetadata_NumberOfSpeakers) String() string {
-	return proto.EnumName(RecognitionMetadata_NumberOfSpeakers_name, int32(x))
-}
-func (RecognitionMetadata_NumberOfSpeakers) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 3}
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{5, 2}
 }
 
 // The type of device the speech was recorded with.
@@ -336,7 +288,7 @@ func (x RecognitionMetadata_RecordingDeviceType) String() string {
 	return proto.EnumName(RecognitionMetadata_RecordingDeviceType_name, int32(x))
 }
 func (RecognitionMetadata_RecordingDeviceType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{5, 4}
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{5, 3}
 }
 
 // Indicates the type of speech event.
@@ -368,22 +320,44 @@ func (x StreamingRecognizeResponse_SpeechEventType) String() string {
 	return proto.EnumName(StreamingRecognizeResponse_SpeechEventType_name, int32(x))
 }
 func (StreamingRecognizeResponse_SpeechEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{11, 0}
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{11, 0}
 }
 
 // The top-level message sent by the client for the `Recognize` method.
 type RecognizeRequest struct {
 	// *Required* Provides information to the recognizer that specifies how to
 	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
+	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 	// *Required* The audio data to be recognized.
-	Audio *RecognitionAudio `protobuf:"bytes,2,opt,name=audio" json:"audio,omitempty"`
+	Audio                *RecognitionAudio `protobuf:"bytes,2,opt,name=audio,proto3" json:"audio,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *RecognizeRequest) Reset()         { *m = RecognizeRequest{} }
+func (m *RecognizeRequest) String() string { return proto.CompactTextString(m) }
+func (*RecognizeRequest) ProtoMessage()    {}
+func (*RecognizeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{0}
+}
+func (m *RecognizeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognizeRequest.Unmarshal(m, b)
+}
+func (m *RecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognizeRequest.Marshal(b, m, deterministic)
+}
+func (dst *RecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognizeRequest.Merge(dst, src)
+}
+func (m *RecognizeRequest) XXX_Size() int {
+	return xxx_messageInfo_RecognizeRequest.Size(m)
+}
+func (m *RecognizeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognizeRequest.DiscardUnknown(m)
 }
 
-func (m *RecognizeRequest) Reset()                    { *m = RecognizeRequest{} }
-func (m *RecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*RecognizeRequest) ProtoMessage()               {}
-func (*RecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_RecognizeRequest proto.InternalMessageInfo
 
 func (m *RecognizeRequest) GetConfig() *RecognitionConfig {
 	if m != nil {
@@ -404,15 +378,37 @@ func (m *RecognizeRequest) GetAudio() *RecognitionAudio {
 type LongRunningRecognizeRequest struct {
 	// *Required* Provides information to the recognizer that specifies how to
 	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
+	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 	// *Required* The audio data to be recognized.
-	Audio *RecognitionAudio `protobuf:"bytes,2,opt,name=audio" json:"audio,omitempty"`
+	Audio                *RecognitionAudio `protobuf:"bytes,2,opt,name=audio,proto3" json:"audio,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *LongRunningRecognizeRequest) Reset()         { *m = LongRunningRecognizeRequest{} }
+func (m *LongRunningRecognizeRequest) String() string { return proto.CompactTextString(m) }
+func (*LongRunningRecognizeRequest) ProtoMessage()    {}
+func (*LongRunningRecognizeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{1}
+}
+func (m *LongRunningRecognizeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LongRunningRecognizeRequest.Unmarshal(m, b)
+}
+func (m *LongRunningRecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LongRunningRecognizeRequest.Marshal(b, m, deterministic)
+}
+func (dst *LongRunningRecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeRequest.Merge(dst, src)
+}
+func (m *LongRunningRecognizeRequest) XXX_Size() int {
+	return xxx_messageInfo_LongRunningRecognizeRequest.Size(m)
+}
+func (m *LongRunningRecognizeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_LongRunningRecognizeRequest.DiscardUnknown(m)
 }
 
-func (m *LongRunningRecognizeRequest) Reset()                    { *m = LongRunningRecognizeRequest{} }
-func (m *LongRunningRecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*LongRunningRecognizeRequest) ProtoMessage()               {}
-func (*LongRunningRecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_LongRunningRecognizeRequest proto.InternalMessageInfo
 
 func (m *LongRunningRecognizeRequest) GetConfig() *RecognitionConfig {
 	if m != nil {
@@ -439,27 +435,51 @@ type StreamingRecognizeRequest struct {
 	// Types that are valid to be assigned to StreamingRequest:
 	//	*StreamingRecognizeRequest_StreamingConfig
 	//	*StreamingRecognizeRequest_AudioContent
-	StreamingRequest isStreamingRecognizeRequest_StreamingRequest `protobuf_oneof:"streaming_request"`
+	StreamingRequest     isStreamingRecognizeRequest_StreamingRequest `protobuf_oneof:"streaming_request"`
+	XXX_NoUnkeyedLiteral struct{}                                     `json:"-"`
+	XXX_unrecognized     []byte                                       `json:"-"`
+	XXX_sizecache        int32                                        `json:"-"`
 }
 
-func (m *StreamingRecognizeRequest) Reset()                    { *m = StreamingRecognizeRequest{} }
-func (m *StreamingRecognizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognizeRequest) ProtoMessage()               {}
-func (*StreamingRecognizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *StreamingRecognizeRequest) Reset()         { *m = StreamingRecognizeRequest{} }
+func (m *StreamingRecognizeRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognizeRequest) ProtoMessage()    {}
+func (*StreamingRecognizeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{2}
+}
+func (m *StreamingRecognizeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognizeRequest.Unmarshal(m, b)
+}
+func (m *StreamingRecognizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognizeRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognizeRequest.Merge(dst, src)
+}
+func (m *StreamingRecognizeRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognizeRequest.Size(m)
+}
+func (m *StreamingRecognizeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognizeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingRecognizeRequest proto.InternalMessageInfo
 
 type isStreamingRecognizeRequest_StreamingRequest interface {
 	isStreamingRecognizeRequest_StreamingRequest()
 }
 
 type StreamingRecognizeRequest_StreamingConfig struct {
-	StreamingConfig *StreamingRecognitionConfig `protobuf:"bytes,1,opt,name=streaming_config,json=streamingConfig,oneof"`
+	StreamingConfig *StreamingRecognitionConfig `protobuf:"bytes,1,opt,name=streaming_config,json=streamingConfig,proto3,oneof"`
 }
+
 type StreamingRecognizeRequest_AudioContent struct {
 	AudioContent []byte `protobuf:"bytes,2,opt,name=audio_content,json=audioContent,proto3,oneof"`
 }
 
 func (*StreamingRecognizeRequest_StreamingConfig) isStreamingRecognizeRequest_StreamingRequest() {}
-func (*StreamingRecognizeRequest_AudioContent) isStreamingRecognizeRequest_StreamingRequest()    {}
+
+func (*StreamingRecognizeRequest_AudioContent) isStreamingRecognizeRequest_StreamingRequest() {}
 
 func (m *StreamingRecognizeRequest) GetStreamingRequest() isStreamingRecognizeRequest_StreamingRequest {
 	if m != nil {
@@ -538,11 +558,11 @@ func _StreamingRecognizeRequest_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.StreamingRequest.(type) {
 	case *StreamingRecognizeRequest_StreamingConfig:
 		s := proto.Size(x.StreamingConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *StreamingRecognizeRequest_AudioContent:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AudioContent)))
 		n += len(x.AudioContent)
 	case nil:
@@ -557,7 +577,7 @@ func _StreamingRecognizeRequest_OneofSizer(msg proto.Message) (n int) {
 type StreamingRecognitionConfig struct {
 	// *Required* Provides information to the recognizer that specifies how to
 	// process the request.
-	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"`
+	Config *RecognitionConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 	// *Optional* If `false` or omitted, the recognizer will perform continuous
 	// recognition (continuing to wait for and process audio even if the user
 	// pauses speaking) until the client closes the input stream (gRPC API) or
@@ -569,18 +589,40 @@ type StreamingRecognitionConfig struct {
 	// `END_OF_SINGLE_UTTERANCE` event and cease recognition. It will return no
 	// more than one `StreamingRecognitionResult` with the `is_final` flag set to
 	// `true`.
-	SingleUtterance bool `protobuf:"varint,2,opt,name=single_utterance,json=singleUtterance" json:"single_utterance,omitempty"`
+	SingleUtterance bool `protobuf:"varint,2,opt,name=single_utterance,json=singleUtterance,proto3" json:"single_utterance,omitempty"`
 	// *Optional* If `true`, interim results (tentative hypotheses) may be
 	// returned as they become available (these interim results are indicated with
 	// the `is_final=false` flag).
 	// If `false` or omitted, only `is_final=true` result(s) are returned.
-	InterimResults bool `protobuf:"varint,3,opt,name=interim_results,json=interimResults" json:"interim_results,omitempty"`
+	InterimResults       bool     `protobuf:"varint,3,opt,name=interim_results,json=interimResults,proto3" json:"interim_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StreamingRecognitionConfig) Reset()                    { *m = StreamingRecognitionConfig{} }
-func (m *StreamingRecognitionConfig) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognitionConfig) ProtoMessage()               {}
-func (*StreamingRecognitionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *StreamingRecognitionConfig) Reset()         { *m = StreamingRecognitionConfig{} }
+func (m *StreamingRecognitionConfig) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognitionConfig) ProtoMessage()    {}
+func (*StreamingRecognitionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{3}
+}
+func (m *StreamingRecognitionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognitionConfig.Unmarshal(m, b)
+}
+func (m *StreamingRecognitionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognitionConfig.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognitionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionConfig.Merge(dst, src)
+}
+func (m *StreamingRecognitionConfig) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognitionConfig.Size(m)
+}
+func (m *StreamingRecognitionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognitionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingRecognitionConfig proto.InternalMessageInfo
 
 func (m *StreamingRecognitionConfig) GetConfig() *RecognitionConfig {
 	if m != nil {
@@ -606,39 +648,77 @@ func (m *StreamingRecognitionConfig) GetInterimResults() bool {
 // Provides information to the recognizer that specifies how to process the
 // request.
 type RecognitionConfig struct {
-	// *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
-	Encoding RecognitionConfig_AudioEncoding `protobuf:"varint,1,opt,name=encoding,enum=google.cloud.speech.v1p1beta1.RecognitionConfig_AudioEncoding" json:"encoding,omitempty"`
-	// *Required* Sample rate in Hertz of the audio data sent in all
+	// Encoding of audio data sent in all `RecognitionAudio` messages.
+	// This field is optional for `FLAC` and `WAV` audio files and required
+	// for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding].
+	Encoding RecognitionConfig_AudioEncoding `protobuf:"varint,1,opt,name=encoding,proto3,enum=google.cloud.speech.v1p1beta1.RecognitionConfig_AudioEncoding" json:"encoding,omitempty"`
+	// Sample rate in Hertz of the audio data sent in all
 	// `RecognitionAudio` messages. Valid values are: 8000-48000.
 	// 16000 is optimal. For best results, set the sampling rate of the audio
 	// source to 16000 Hz. If that's not possible, use the native sample rate of
 	// the audio source (instead of re-sampling).
-	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz" json:"sample_rate_hertz,omitempty"`
+	// This field is optional for `FLAC` and `WAV` audio files and required
+	// for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding].
+	SampleRateHertz int32 `protobuf:"varint,2,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
+	// *Optional* The number of channels in the input audio data.
+	// ONLY set this for MULTI-CHANNEL recognition.
+	// Valid values for LINEAR16 and FLAC are `1`-`8`.
+	// Valid values for OGG_OPUS are '1'-'254'.
+	// Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+	// If `0` or omitted, defaults to one channel (mono).
+	// NOTE: We only recognize the first channel by default.
+	// To perform independent recognition on each channel set
+	// enable_separate_recognition_per_channel to 'true'.
+	AudioChannelCount int32 `protobuf:"varint,7,opt,name=audio_channel_count,json=audioChannelCount,proto3" json:"audio_channel_count,omitempty"`
+	// This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+	// to get each channel recognized separately. The recognition result will
+	// contain a channel_tag field to state which channel that result belongs to.
+	// If this is not ‘true’, we will only recognize the first channel.
+	// NOTE: The request is also billed cumulatively for all channels recognized:
+	//     (audio_channel_count times the audio length)
+	EnableSeparateRecognitionPerChannel bool `protobuf:"varint,12,opt,name=enable_separate_recognition_per_channel,json=enableSeparateRecognitionPerChannel,proto3" json:"enable_separate_recognition_per_channel,omitempty"`
 	// *Required* The language of the supplied audio as a
 	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
 	// Example: "en-US".
 	// See [Language Support](https://cloud.google.com/speech/docs/languages)
 	// for a list of the currently supported language codes.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// *Optional* A list of up to 3 additional
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+	// listing possible alternative languages of the supplied audio.
+	// See [Language Support](https://cloud.google.com/speech/docs/languages)
+	// for a list of the currently supported language codes.
+	// If alternative languages are listed, recognition result will contain
+	// recognition in the most likely language detected including the main
+	// language_code. The recognition result will include the language tag
+	// of the language detected in the audio.
+	// NOTE: This feature is only supported for Voice Command and Voice Search
+	// use cases and performance may vary for other use cases (e.g., phone call
+	// transcription).
+	AlternativeLanguageCodes []string `protobuf:"bytes,18,rep,name=alternative_language_codes,json=alternativeLanguageCodes,proto3" json:"alternative_language_codes,omitempty"`
 	// *Optional* Maximum number of recognition hypotheses to be returned.
 	// Specifically, the maximum number of `SpeechRecognitionAlternative` messages
 	// within each `SpeechRecognitionResult`.
 	// The server may return fewer than `max_alternatives`.
 	// Valid values are `0`-`30`. A value of `0` or `1` will return a maximum of
 	// one. If omitted, will return a maximum of one.
-	MaxAlternatives int32 `protobuf:"varint,4,opt,name=max_alternatives,json=maxAlternatives" json:"max_alternatives,omitempty"`
+	MaxAlternatives int32 `protobuf:"varint,4,opt,name=max_alternatives,json=maxAlternatives,proto3" json:"max_alternatives,omitempty"`
 	// *Optional* If set to `true`, the server will attempt to filter out
 	// profanities, replacing all but the initial character in each filtered word
 	// with asterisks, e.g. "f***". If set to `false` or omitted, profanities
 	// won't be filtered out.
-	ProfanityFilter bool `protobuf:"varint,5,opt,name=profanity_filter,json=profanityFilter" json:"profanity_filter,omitempty"`
+	ProfanityFilter bool `protobuf:"varint,5,opt,name=profanity_filter,json=profanityFilter,proto3" json:"profanity_filter,omitempty"`
 	// *Optional* A means to provide context to assist the speech recognition.
-	SpeechContexts []*SpeechContext `protobuf:"bytes,6,rep,name=speech_contexts,json=speechContexts" json:"speech_contexts,omitempty"`
+	SpeechContexts []*SpeechContext `protobuf:"bytes,6,rep,name=speech_contexts,json=speechContexts,proto3" json:"speech_contexts,omitempty"`
 	// *Optional* If `true`, the top result includes a list of words and
 	// the start and end time offsets (timestamps) for those words. If
 	// `false`, no word-level time offset information is returned. The default is
 	// `false`.
-	EnableWordTimeOffsets bool `protobuf:"varint,8,opt,name=enable_word_time_offsets,json=enableWordTimeOffsets" json:"enable_word_time_offsets,omitempty"`
+	EnableWordTimeOffsets bool `protobuf:"varint,8,opt,name=enable_word_time_offsets,json=enableWordTimeOffsets,proto3" json:"enable_word_time_offsets,omitempty"`
+	// *Optional* If `true`, the top result includes a list of words and the
+	// confidence for those words. If `false`, no word-level confidence
+	// information is returned. The default is `false`.
+	EnableWordConfidence bool `protobuf:"varint,15,opt,name=enable_word_confidence,json=enableWordConfidence,proto3" json:"enable_word_confidence,omitempty"`
 	// *Optional* If 'true', adds punctuation to recognition result hypotheses.
 	// This feature is only available in select languages. Setting this for
 	// requests in other languages has no effect at all.
@@ -646,15 +726,95 @@ type RecognitionConfig struct {
 	// NOTE: "This is currently offered as an experimental service, complimentary
 	// to all users. In the future this may be exclusively available as a
 	// premium feature."
-	EnableAutomaticPunctuation bool `protobuf:"varint,11,opt,name=enable_automatic_punctuation,json=enableAutomaticPunctuation" json:"enable_automatic_punctuation,omitempty"`
+	EnableAutomaticPunctuation bool `protobuf:"varint,11,opt,name=enable_automatic_punctuation,json=enableAutomaticPunctuation,proto3" json:"enable_automatic_punctuation,omitempty"`
+	// *Optional* If 'true', enables speaker detection for each recognized word in
+	// the top alternative of the recognition result using a speaker_tag provided
+	// in the WordInfo.
+	// Note: When this is true, we send all the words from the beginning of the
+	// audio for the top alternative in every consecutive responses.
+	// This is done in order to improve our speaker tags as our models learn to
+	// identify the speakers in the conversation over time.
+	EnableSpeakerDiarization bool `protobuf:"varint,16,opt,name=enable_speaker_diarization,json=enableSpeakerDiarization,proto3" json:"enable_speaker_diarization,omitempty"`
+	// *Optional*
+	// If set, specifies the estimated number of speakers in the conversation.
+	// If not set, defaults to '2'.
+	// Ignored unless enable_speaker_diarization is set to true."
+	DiarizationSpeakerCount int32 `protobuf:"varint,17,opt,name=diarization_speaker_count,json=diarizationSpeakerCount,proto3" json:"diarization_speaker_count,omitempty"`
 	// *Optional* Metadata regarding this request.
-	Metadata *RecognitionMetadata `protobuf:"bytes,9,opt,name=metadata" json:"metadata,omitempty"`
+	Metadata *RecognitionMetadata `protobuf:"bytes,9,opt,name=metadata,proto3" json:"metadata,omitempty"`
+	// *Optional* Which model to select for the given request. Select the model
+	// best suited to your domain to get best results. If a model is not
+	// explicitly specified, then we auto-select a model based on the parameters
+	// in the RecognitionConfig.
+	// <table>
+	//   <tr>
+	//     <td><b>Model</b></td>
+	//     <td><b>Description</b></td>
+	//   </tr>
+	//   <tr>
+	//     <td><code>command_and_search</code></td>
+	//     <td>Best for short queries such as voice commands or voice search.</td>
+	//   </tr>
+	//   <tr>
+	//     <td><code>phone_call</code></td>
+	//     <td>Best for audio that originated from a phone call (typically
+	//     recorded at an 8khz sampling rate).</td>
+	//   </tr>
+	//   <tr>
+	//     <td><code>video</code></td>
+	//     <td>Best for audio that originated from from video or includes multiple
+	//         speakers. Ideally the audio is recorded at a 16khz or greater
+	//         sampling rate. This is a premium model that costs more than the
+	//         standard rate.</td>
+	//   </tr>
+	//   <tr>
+	//     <td><code>default</code></td>
+	//     <td>Best for audio that is not one of the specific audio models.
+	//         For example, long-form audio. Ideally the audio is high-fidelity,
+	//         recorded at a 16khz or greater sampling rate.</td>
+	//   </tr>
+	// </table>
+	Model string `protobuf:"bytes,13,opt,name=model,proto3" json:"model,omitempty"`
+	// *Optional* Set to true to use an enhanced model for speech recognition.
+	// You must also set the `model` field to a valid, enhanced model. If
+	// `use_enhanced` is set to true and the `model` field is not set, then
+	// `use_enhanced` is ignored. If `use_enhanced` is true and an enhanced
+	// version of the specified model does not exist, then the speech is
+	// recognized using the standard version of the specified model.
+	//
+	// Enhanced speech models require that you opt-in to the audio logging using
+	// instructions in the [alpha documentation](/speech/data-sharing). If you set
+	// `use_enhanced` to true and you have not enabled audio logging, then you
+	// will receive an error.
+	UseEnhanced          bool     `protobuf:"varint,14,opt,name=use_enhanced,json=useEnhanced,proto3" json:"use_enhanced,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RecognitionConfig) Reset()                    { *m = RecognitionConfig{} }
-func (m *RecognitionConfig) String() string            { return proto.CompactTextString(m) }
-func (*RecognitionConfig) ProtoMessage()               {}
-func (*RecognitionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *RecognitionConfig) Reset()         { *m = RecognitionConfig{} }
+func (m *RecognitionConfig) String() string { return proto.CompactTextString(m) }
+func (*RecognitionConfig) ProtoMessage()    {}
+func (*RecognitionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{4}
+}
+func (m *RecognitionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognitionConfig.Unmarshal(m, b)
+}
+func (m *RecognitionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognitionConfig.Marshal(b, m, deterministic)
+}
+func (dst *RecognitionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionConfig.Merge(dst, src)
+}
+func (m *RecognitionConfig) XXX_Size() int {
+	return xxx_messageInfo_RecognitionConfig.Size(m)
+}
+func (m *RecognitionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognitionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecognitionConfig proto.InternalMessageInfo
 
 func (m *RecognitionConfig) GetEncoding() RecognitionConfig_AudioEncoding {
 	if m != nil {
@@ -670,6 +830,20 @@ func (m *RecognitionConfig) GetSampleRateHertz() int32 {
 	return 0
 }
 
+func (m *RecognitionConfig) GetAudioChannelCount() int32 {
+	if m != nil {
+		return m.AudioChannelCount
+	}
+	return 0
+}
+
+func (m *RecognitionConfig) GetEnableSeparateRecognitionPerChannel() bool {
+	if m != nil {
+		return m.EnableSeparateRecognitionPerChannel
+	}
+	return false
+}
+
 func (m *RecognitionConfig) GetLanguageCode() string {
 	if m != nil {
 		return m.LanguageCode
@@ -677,6 +851,13 @@ func (m *RecognitionConfig) GetLanguageCode() string {
 	return ""
 }
 
+func (m *RecognitionConfig) GetAlternativeLanguageCodes() []string {
+	if m != nil {
+		return m.AlternativeLanguageCodes
+	}
+	return nil
+}
+
 func (m *RecognitionConfig) GetMaxAlternatives() int32 {
 	if m != nil {
 		return m.MaxAlternatives
@@ -705,6 +886,13 @@ func (m *RecognitionConfig) GetEnableWordTimeOffsets() bool {
 	return false
 }
 
+func (m *RecognitionConfig) GetEnableWordConfidence() bool {
+	if m != nil {
+		return m.EnableWordConfidence
+	}
+	return false
+}
+
 func (m *RecognitionConfig) GetEnableAutomaticPunctuation() bool {
 	if m != nil {
 		return m.EnableAutomaticPunctuation
@@ -712,6 +900,20 @@ func (m *RecognitionConfig) GetEnableAutomaticPunctuation() bool {
 	return false
 }
 
+func (m *RecognitionConfig) GetEnableSpeakerDiarization() bool {
+	if m != nil {
+		return m.EnableSpeakerDiarization
+	}
+	return false
+}
+
+func (m *RecognitionConfig) GetDiarizationSpeakerCount() int32 {
+	if m != nil {
+		return m.DiarizationSpeakerCount
+	}
+	return 0
+}
+
 func (m *RecognitionConfig) GetMetadata() *RecognitionMetadata {
 	if m != nil {
 		return m.Metadata
@@ -719,45 +921,78 @@ func (m *RecognitionConfig) GetMetadata() *RecognitionMetadata {
 	return nil
 }
 
+func (m *RecognitionConfig) GetModel() string {
+	if m != nil {
+		return m.Model
+	}
+	return ""
+}
+
+func (m *RecognitionConfig) GetUseEnhanced() bool {
+	if m != nil {
+		return m.UseEnhanced
+	}
+	return false
+}
+
 // Description of audio data to be recognized.
 type RecognitionMetadata struct {
 	// The use case most closely describing the audio content to be recognized.
-	InteractionType RecognitionMetadata_InteractionType `protobuf:"varint,1,opt,name=interaction_type,json=interactionType,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_InteractionType" json:"interaction_type,omitempty"`
+	InteractionType RecognitionMetadata_InteractionType `protobuf:"varint,1,opt,name=interaction_type,json=interactionType,proto3,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_InteractionType" json:"interaction_type,omitempty"`
 	// The industry vertical to which this speech recognition request most
 	// closely applies. This is most indicative of the topics contained
 	// in the audio.  Use the 6-digit NAICS code to identify the industry
 	// vertical - see https://www.naics.com/search/.
-	IndustryNaicsCodeOfAudio uint32 `protobuf:"varint,3,opt,name=industry_naics_code_of_audio,json=industryNaicsCodeOfAudio" json:"industry_naics_code_of_audio,omitempty"`
+	IndustryNaicsCodeOfAudio uint32 `protobuf:"varint,3,opt,name=industry_naics_code_of_audio,json=industryNaicsCodeOfAudio,proto3" json:"industry_naics_code_of_audio,omitempty"`
 	// The audio type that most closely describes the audio being recognized.
-	MicrophoneDistance RecognitionMetadata_MicrophoneDistance `protobuf:"varint,4,opt,name=microphone_distance,json=microphoneDistance,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_MicrophoneDistance" json:"microphone_distance,omitempty"`
+	MicrophoneDistance RecognitionMetadata_MicrophoneDistance `protobuf:"varint,4,opt,name=microphone_distance,json=microphoneDistance,proto3,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_MicrophoneDistance" json:"microphone_distance,omitempty"`
 	// The original media the speech was recorded on.
-	OriginalMediaType RecognitionMetadata_OriginalMediaType `protobuf:"varint,5,opt,name=original_media_type,json=originalMediaType,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_OriginalMediaType" json:"original_media_type,omitempty"`
-	// How many people are speaking prominently in the audio and expected to be
-	// recognized.
-	NumberOfSpeakers RecognitionMetadata_NumberOfSpeakers `protobuf:"varint,6,opt,name=number_of_speakers,json=numberOfSpeakers,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_NumberOfSpeakers" json:"number_of_speakers,omitempty"`
+	OriginalMediaType RecognitionMetadata_OriginalMediaType `protobuf:"varint,5,opt,name=original_media_type,json=originalMediaType,proto3,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_OriginalMediaType" json:"original_media_type,omitempty"`
 	// The type of device the speech was recorded with.
-	RecordingDeviceType RecognitionMetadata_RecordingDeviceType `protobuf:"varint,7,opt,name=recording_device_type,json=recordingDeviceType,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_RecordingDeviceType" json:"recording_device_type,omitempty"`
+	RecordingDeviceType RecognitionMetadata_RecordingDeviceType `protobuf:"varint,6,opt,name=recording_device_type,json=recordingDeviceType,proto3,enum=google.cloud.speech.v1p1beta1.RecognitionMetadata_RecordingDeviceType" json:"recording_device_type,omitempty"`
 	// The device used to make the recording.  Examples 'Nexus 5X' or
 	// 'Polycom SoundStation IP 6000' or 'POTS' or 'VoIP' or
 	// 'Cardioid Microphone'.
-	RecordingDeviceName string `protobuf:"bytes,8,opt,name=recording_device_name,json=recordingDeviceName" json:"recording_device_name,omitempty"`
+	RecordingDeviceName string `protobuf:"bytes,7,opt,name=recording_device_name,json=recordingDeviceName,proto3" json:"recording_device_name,omitempty"`
 	// Mime type of the original audio file.  For example `audio/m4a`,
 	// `audio/x-alaw-basic`, `audio/mp3`, `audio/3gpp`.
 	// A list of possible audio mime types is maintained at
 	// http://www.iana.org/assignments/media-types/media-types.xhtml#audio
-	OriginalMimeType string `protobuf:"bytes,9,opt,name=original_mime_type,json=originalMimeType" json:"original_mime_type,omitempty"`
+	OriginalMimeType string `protobuf:"bytes,8,opt,name=original_mime_type,json=originalMimeType,proto3" json:"original_mime_type,omitempty"`
 	// Obfuscated (privacy-protected) ID of the user, to identify number of
 	// unique users using the service.
-	ObfuscatedId int64 `protobuf:"varint,10,opt,name=obfuscated_id,json=obfuscatedId" json:"obfuscated_id,omitempty"`
+	ObfuscatedId int64 `protobuf:"varint,9,opt,name=obfuscated_id,json=obfuscatedId,proto3" json:"obfuscated_id,omitempty"`
 	// Description of the content. Eg. "Recordings of federal supreme court
 	// hearings from 2012".
-	AudioTopic string `protobuf:"bytes,11,opt,name=audio_topic,json=audioTopic" json:"audio_topic,omitempty"`
+	AudioTopic           string   `protobuf:"bytes,10,opt,name=audio_topic,json=audioTopic,proto3" json:"audio_topic,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RecognitionMetadata) Reset()                    { *m = RecognitionMetadata{} }
-func (m *RecognitionMetadata) String() string            { return proto.CompactTextString(m) }
-func (*RecognitionMetadata) ProtoMessage()               {}
-func (*RecognitionMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *RecognitionMetadata) Reset()         { *m = RecognitionMetadata{} }
+func (m *RecognitionMetadata) String() string { return proto.CompactTextString(m) }
+func (*RecognitionMetadata) ProtoMessage()    {}
+func (*RecognitionMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{5}
+}
+func (m *RecognitionMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognitionMetadata.Unmarshal(m, b)
+}
+func (m *RecognitionMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognitionMetadata.Marshal(b, m, deterministic)
+}
+func (dst *RecognitionMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionMetadata.Merge(dst, src)
+}
+func (m *RecognitionMetadata) XXX_Size() int {
+	return xxx_messageInfo_RecognitionMetadata.Size(m)
+}
+func (m *RecognitionMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognitionMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecognitionMetadata proto.InternalMessageInfo
 
 func (m *RecognitionMetadata) GetInteractionType() RecognitionMetadata_InteractionType {
 	if m != nil {
@@ -787,13 +1022,6 @@ func (m *RecognitionMetadata) GetOriginalMediaType() RecognitionMetadata_Origina
 	return RecognitionMetadata_ORIGINAL_MEDIA_TYPE_UNSPECIFIED
 }
 
-func (m *RecognitionMetadata) GetNumberOfSpeakers() RecognitionMetadata_NumberOfSpeakers {
-	if m != nil {
-		return m.NumberOfSpeakers
-	}
-	return RecognitionMetadata_NUMBER_OF_SPEAKERS_UNSPECIFIED
-}
-
 func (m *RecognitionMetadata) GetRecordingDeviceType() RecognitionMetadata_RecordingDeviceType {
 	if m != nil {
 		return m.RecordingDeviceType
@@ -838,13 +1066,35 @@ type SpeechContext struct {
 	// specific commands are typically spoken by the user. This can also be used
 	// to add additional words to the vocabulary of the recognizer. See
 	// [usage limits](https://cloud.google.com/speech/limits#content).
-	Phrases []string `protobuf:"bytes,1,rep,name=phrases" json:"phrases,omitempty"`
+	Phrases              []string `protobuf:"bytes,1,rep,name=phrases,proto3" json:"phrases,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SpeechContext) Reset()         { *m = SpeechContext{} }
+func (m *SpeechContext) String() string { return proto.CompactTextString(m) }
+func (*SpeechContext) ProtoMessage()    {}
+func (*SpeechContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{6}
+}
+func (m *SpeechContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechContext.Unmarshal(m, b)
+}
+func (m *SpeechContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechContext.Marshal(b, m, deterministic)
+}
+func (dst *SpeechContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechContext.Merge(dst, src)
+}
+func (m *SpeechContext) XXX_Size() int {
+	return xxx_messageInfo_SpeechContext.Size(m)
+}
+func (m *SpeechContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechContext.DiscardUnknown(m)
 }
 
-func (m *SpeechContext) Reset()                    { *m = SpeechContext{} }
-func (m *SpeechContext) String() string            { return proto.CompactTextString(m) }
-func (*SpeechContext) ProtoMessage()               {}
-func (*SpeechContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_SpeechContext proto.InternalMessageInfo
 
 func (m *SpeechContext) GetPhrases() []string {
 	if m != nil {
@@ -858,18 +1108,41 @@ func (m *SpeechContext) GetPhrases() []string {
 // returns [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]. See
 // [audio limits](https://cloud.google.com/speech/limits#content).
 type RecognitionAudio struct {
-	// The audio source, which is either inline content or a GCS uri.
+	// The audio source, which is either inline content or a Google Cloud
+	// Storage uri.
 	//
 	// Types that are valid to be assigned to AudioSource:
 	//	*RecognitionAudio_Content
 	//	*RecognitionAudio_Uri
-	AudioSource isRecognitionAudio_AudioSource `protobuf_oneof:"audio_source"`
+	AudioSource          isRecognitionAudio_AudioSource `protobuf_oneof:"audio_source"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *RecognitionAudio) Reset()         { *m = RecognitionAudio{} }
+func (m *RecognitionAudio) String() string { return proto.CompactTextString(m) }
+func (*RecognitionAudio) ProtoMessage()    {}
+func (*RecognitionAudio) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{7}
+}
+func (m *RecognitionAudio) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognitionAudio.Unmarshal(m, b)
+}
+func (m *RecognitionAudio) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognitionAudio.Marshal(b, m, deterministic)
+}
+func (dst *RecognitionAudio) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognitionAudio.Merge(dst, src)
+}
+func (m *RecognitionAudio) XXX_Size() int {
+	return xxx_messageInfo_RecognitionAudio.Size(m)
+}
+func (m *RecognitionAudio) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognitionAudio.DiscardUnknown(m)
 }
 
-func (m *RecognitionAudio) Reset()                    { *m = RecognitionAudio{} }
-func (m *RecognitionAudio) String() string            { return proto.CompactTextString(m) }
-func (*RecognitionAudio) ProtoMessage()               {}
-func (*RecognitionAudio) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_RecognitionAudio proto.InternalMessageInfo
 
 type isRecognitionAudio_AudioSource interface {
 	isRecognitionAudio_AudioSource()
@@ -878,12 +1151,14 @@ type isRecognitionAudio_AudioSource interface {
 type RecognitionAudio_Content struct {
 	Content []byte `protobuf:"bytes,1,opt,name=content,proto3,oneof"`
 }
+
 type RecognitionAudio_Uri struct {
-	Uri string `protobuf:"bytes,2,opt,name=uri,oneof"`
+	Uri string `protobuf:"bytes,2,opt,name=uri,proto3,oneof"`
 }
 
 func (*RecognitionAudio_Content) isRecognitionAudio_AudioSource() {}
-func (*RecognitionAudio_Uri) isRecognitionAudio_AudioSource()     {}
+
+func (*RecognitionAudio_Uri) isRecognitionAudio_AudioSource() {}
 
 func (m *RecognitionAudio) GetAudioSource() isRecognitionAudio_AudioSource {
 	if m != nil {
@@ -958,11 +1233,11 @@ func _RecognitionAudio_OneofSizer(msg proto.Message) (n int) {
 	// audio_source
 	switch x := m.AudioSource.(type) {
 	case *RecognitionAudio_Content:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Content)))
 		n += len(x.Content)
 	case *RecognitionAudio_Uri:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Uri)))
 		n += len(x.Uri)
 	case nil:
@@ -976,15 +1251,37 @@ func _RecognitionAudio_OneofSizer(msg proto.Message) (n int) {
 // contains the result as zero or more sequential `SpeechRecognitionResult`
 // messages.
 type RecognizeResponse struct {
-	// *Output-only* Sequential list of transcription results corresponding to
+	// Output only. Sequential list of transcription results corresponding to
 	// sequential portions of audio.
-	Results []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
+	Results              []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *RecognizeResponse) Reset()         { *m = RecognizeResponse{} }
+func (m *RecognizeResponse) String() string { return proto.CompactTextString(m) }
+func (*RecognizeResponse) ProtoMessage()    {}
+func (*RecognizeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{8}
+}
+func (m *RecognizeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecognizeResponse.Unmarshal(m, b)
+}
+func (m *RecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecognizeResponse.Marshal(b, m, deterministic)
+}
+func (dst *RecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecognizeResponse.Merge(dst, src)
+}
+func (m *RecognizeResponse) XXX_Size() int {
+	return xxx_messageInfo_RecognizeResponse.Size(m)
+}
+func (m *RecognizeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecognizeResponse.DiscardUnknown(m)
 }
 
-func (m *RecognizeResponse) Reset()                    { *m = RecognizeResponse{} }
-func (m *RecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*RecognizeResponse) ProtoMessage()               {}
-func (*RecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_RecognizeResponse proto.InternalMessageInfo
 
 func (m *RecognizeResponse) GetResults() []*SpeechRecognitionResult {
 	if m != nil {
@@ -999,15 +1296,37 @@ func (m *RecognizeResponse) GetResults() []*SpeechRecognitionResult {
 // returned by the `GetOperation` call of the `google::longrunning::Operations`
 // service.
 type LongRunningRecognizeResponse struct {
-	// *Output-only* Sequential list of transcription results corresponding to
+	// Output only. Sequential list of transcription results corresponding to
 	// sequential portions of audio.
-	Results []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
+	Results              []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *LongRunningRecognizeResponse) Reset()         { *m = LongRunningRecognizeResponse{} }
+func (m *LongRunningRecognizeResponse) String() string { return proto.CompactTextString(m) }
+func (*LongRunningRecognizeResponse) ProtoMessage()    {}
+func (*LongRunningRecognizeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{9}
+}
+func (m *LongRunningRecognizeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LongRunningRecognizeResponse.Unmarshal(m, b)
+}
+func (m *LongRunningRecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LongRunningRecognizeResponse.Marshal(b, m, deterministic)
+}
+func (dst *LongRunningRecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeResponse.Merge(dst, src)
+}
+func (m *LongRunningRecognizeResponse) XXX_Size() int {
+	return xxx_messageInfo_LongRunningRecognizeResponse.Size(m)
+}
+func (m *LongRunningRecognizeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_LongRunningRecognizeResponse.DiscardUnknown(m)
 }
 
-func (m *LongRunningRecognizeResponse) Reset()                    { *m = LongRunningRecognizeResponse{} }
-func (m *LongRunningRecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*LongRunningRecognizeResponse) ProtoMessage()               {}
-func (*LongRunningRecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_LongRunningRecognizeResponse proto.InternalMessageInfo
 
 func (m *LongRunningRecognizeResponse) GetResults() []*SpeechRecognitionResult {
 	if m != nil {
@@ -1022,17 +1341,39 @@ func (m *LongRunningRecognizeResponse) GetResults() []*SpeechRecognitionResult {
 type LongRunningRecognizeMetadata struct {
 	// Approximate percentage of audio processed thus far. Guaranteed to be 100
 	// when the audio is fully processed and the results are available.
-	ProgressPercent int32 `protobuf:"varint,1,opt,name=progress_percent,json=progressPercent" json:"progress_percent,omitempty"`
+	ProgressPercent int32 `protobuf:"varint,1,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 	// Time when the request was received.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time of the most recent processing update.
-	LastUpdateTime *google_protobuf4.Timestamp `protobuf:"bytes,3,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
+	LastUpdateTime       *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *LongRunningRecognizeMetadata) Reset()                    { *m = LongRunningRecognizeMetadata{} }
-func (m *LongRunningRecognizeMetadata) String() string            { return proto.CompactTextString(m) }
-func (*LongRunningRecognizeMetadata) ProtoMessage()               {}
-func (*LongRunningRecognizeMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *LongRunningRecognizeMetadata) Reset()         { *m = LongRunningRecognizeMetadata{} }
+func (m *LongRunningRecognizeMetadata) String() string { return proto.CompactTextString(m) }
+func (*LongRunningRecognizeMetadata) ProtoMessage()    {}
+func (*LongRunningRecognizeMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{10}
+}
+func (m *LongRunningRecognizeMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LongRunningRecognizeMetadata.Unmarshal(m, b)
+}
+func (m *LongRunningRecognizeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LongRunningRecognizeMetadata.Marshal(b, m, deterministic)
+}
+func (dst *LongRunningRecognizeMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LongRunningRecognizeMetadata.Merge(dst, src)
+}
+func (m *LongRunningRecognizeMetadata) XXX_Size() int {
+	return xxx_messageInfo_LongRunningRecognizeMetadata.Size(m)
+}
+func (m *LongRunningRecognizeMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_LongRunningRecognizeMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LongRunningRecognizeMetadata proto.InternalMessageInfo
 
 func (m *LongRunningRecognizeMetadata) GetProgressPercent() int32 {
 	if m != nil {
@@ -1041,14 +1382,14 @@ func (m *LongRunningRecognizeMetadata) GetProgressPercent() int32 {
 	return 0
 }
 
-func (m *LongRunningRecognizeMetadata) GetStartTime() *google_protobuf4.Timestamp {
+func (m *LongRunningRecognizeMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *LongRunningRecognizeMetadata) GetLastUpdateTime() *google_protobuf4.Timestamp {
+func (m *LongRunningRecognizeMetadata) GetLastUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastUpdateTime
 	}
@@ -1105,24 +1446,46 @@ func (m *LongRunningRecognizeMetadata) GetLastUpdateTime() *google_protobuf4.Tim
 //     `speech_event_type`, or
 //     one or more (repeated) `results`.
 type StreamingRecognizeResponse struct {
-	// *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+	// Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
 	// specifies the error for the operation.
-	Error *google_rpc.Status `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	// *Output-only* This repeated list contains zero or more results that
+	Error *status.Status `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	// Output only. This repeated list contains zero or more results that
 	// correspond to consecutive portions of the audio currently being processed.
-	// It contains zero or more `is_final=false` results followed by zero or one
-	// `is_final=true` result (the newly settled portion).
-	Results []*StreamingRecognitionResult `protobuf:"bytes,2,rep,name=results" json:"results,omitempty"`
-	// *Output-only* Indicates the type of speech event.
-	SpeechEventType StreamingRecognizeResponse_SpeechEventType `protobuf:"varint,4,opt,name=speech_event_type,json=speechEventType,enum=google.cloud.speech.v1p1beta1.StreamingRecognizeResponse_SpeechEventType" json:"speech_event_type,omitempty"`
+	// It contains zero or one `is_final=true` result (the newly settled portion),
+	// followed by zero or more `is_final=false` results (the interim results).
+	Results []*StreamingRecognitionResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
+	// Output only. Indicates the type of speech event.
+	SpeechEventType      StreamingRecognizeResponse_SpeechEventType `protobuf:"varint,4,opt,name=speech_event_type,json=speechEventType,proto3,enum=google.cloud.speech.v1p1beta1.StreamingRecognizeResponse_SpeechEventType" json:"speech_event_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                   `json:"-"`
+	XXX_unrecognized     []byte                                     `json:"-"`
+	XXX_sizecache        int32                                      `json:"-"`
+}
+
+func (m *StreamingRecognizeResponse) Reset()         { *m = StreamingRecognizeResponse{} }
+func (m *StreamingRecognizeResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognizeResponse) ProtoMessage()    {}
+func (*StreamingRecognizeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{11}
+}
+func (m *StreamingRecognizeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognizeResponse.Unmarshal(m, b)
+}
+func (m *StreamingRecognizeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognizeResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognizeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognizeResponse.Merge(dst, src)
+}
+func (m *StreamingRecognizeResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognizeResponse.Size(m)
+}
+func (m *StreamingRecognizeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognizeResponse.DiscardUnknown(m)
 }
 
-func (m *StreamingRecognizeResponse) Reset()                    { *m = StreamingRecognizeResponse{} }
-func (m *StreamingRecognizeResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognizeResponse) ProtoMessage()               {}
-func (*StreamingRecognizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_StreamingRecognizeResponse proto.InternalMessageInfo
 
-func (m *StreamingRecognizeResponse) GetError() *google_rpc.Status {
+func (m *StreamingRecognizeResponse) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
@@ -1146,27 +1509,60 @@ func (m *StreamingRecognizeResponse) GetSpeechEventType() StreamingRecognizeResp
 // A streaming speech recognition result corresponding to a portion of the audio
 // that is currently being processed.
 type StreamingRecognitionResult struct {
-	// *Output-only* May contain one or more recognition hypotheses (up to the
+	// Output only. May contain one or more recognition hypotheses (up to the
 	// maximum specified in `max_alternatives`).
-	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives" json:"alternatives,omitempty"`
-	// *Output-only* If `false`, this `StreamingRecognitionResult` represents an
+	// These alternatives are ordered in terms of accuracy, with the top (first)
+	// alternative being the most probable, as ranked by the recognizer.
+	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives,proto3" json:"alternatives,omitempty"`
+	// Output only. If `false`, this `StreamingRecognitionResult` represents an
 	// interim result that may change. If `true`, this is the final time the
 	// speech service will return this particular `StreamingRecognitionResult`,
 	// the recognizer will not return any further hypotheses for this portion of
 	// the transcript and corresponding audio.
-	IsFinal bool `protobuf:"varint,2,opt,name=is_final,json=isFinal" json:"is_final,omitempty"`
-	// *Output-only* An estimate of the likelihood that the recognizer will not
+	IsFinal bool `protobuf:"varint,2,opt,name=is_final,json=isFinal,proto3" json:"is_final,omitempty"`
+	// Output only. An estimate of the likelihood that the recognizer will not
 	// change its guess about this interim result. Values range from 0.0
 	// (completely unstable) to 1.0 (completely stable).
 	// This field is only provided for interim results (`is_final=false`).
 	// The default of 0.0 is a sentinel value indicating `stability` was not set.
-	Stability float32 `protobuf:"fixed32,3,opt,name=stability" json:"stability,omitempty"`
+	Stability float32 `protobuf:"fixed32,3,opt,name=stability,proto3" json:"stability,omitempty"`
+	// For multi-channel audio, this is the channel number corresponding to the
+	// recognized result for the audio from that channel.
+	// For audio_channel_count = N, its output values can range from '1' to 'N'.
+	ChannelTag int32 `protobuf:"varint,5,opt,name=channel_tag,json=channelTag,proto3" json:"channel_tag,omitempty"`
+	// Output only. The
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+	// language in this result. This language code was detected to have the most
+	// likelihood of being spoken in the audio.
+	LanguageCode         string   `protobuf:"bytes,6,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StreamingRecognitionResult) Reset()                    { *m = StreamingRecognitionResult{} }
-func (m *StreamingRecognitionResult) String() string            { return proto.CompactTextString(m) }
-func (*StreamingRecognitionResult) ProtoMessage()               {}
-func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *StreamingRecognitionResult) Reset()         { *m = StreamingRecognitionResult{} }
+func (m *StreamingRecognitionResult) String() string { return proto.CompactTextString(m) }
+func (*StreamingRecognitionResult) ProtoMessage()    {}
+func (*StreamingRecognitionResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{12}
+}
+func (m *StreamingRecognitionResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingRecognitionResult.Unmarshal(m, b)
+}
+func (m *StreamingRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingRecognitionResult.Marshal(b, m, deterministic)
+}
+func (dst *StreamingRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingRecognitionResult.Merge(dst, src)
+}
+func (m *StreamingRecognitionResult) XXX_Size() int {
+	return xxx_messageInfo_StreamingRecognitionResult.Size(m)
+}
+func (m *StreamingRecognitionResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingRecognitionResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingRecognitionResult proto.InternalMessageInfo
 
 func (m *StreamingRecognitionResult) GetAlternatives() []*SpeechRecognitionAlternative {
 	if m != nil {
@@ -1189,19 +1585,64 @@ func (m *StreamingRecognitionResult) GetStability() float32 {
 	return 0
 }
 
+func (m *StreamingRecognitionResult) GetChannelTag() int32 {
+	if m != nil {
+		return m.ChannelTag
+	}
+	return 0
+}
+
+func (m *StreamingRecognitionResult) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
 // A speech recognition result corresponding to a portion of the audio.
 type SpeechRecognitionResult struct {
-	// *Output-only* May contain one or more recognition hypotheses (up to the
+	// Output only. May contain one or more recognition hypotheses (up to the
 	// maximum specified in `max_alternatives`).
 	// These alternatives are ordered in terms of accuracy, with the top (first)
 	// alternative being the most probable, as ranked by the recognizer.
-	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives" json:"alternatives,omitempty"`
+	Alternatives []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives,proto3" json:"alternatives,omitempty"`
+	// For multi-channel audio, this is the channel number corresponding to the
+	// recognized result for the audio from that channel.
+	// For audio_channel_count = N, its output values can range from '1' to 'N'.
+	ChannelTag int32 `protobuf:"varint,2,opt,name=channel_tag,json=channelTag,proto3" json:"channel_tag,omitempty"`
+	// Output only. The
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+	// language in this result. This language code was detected to have the most
+	// likelihood of being spoken in the audio.
+	LanguageCode         string   `protobuf:"bytes,5,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SpeechRecognitionResult) Reset()         { *m = SpeechRecognitionResult{} }
+func (m *SpeechRecognitionResult) String() string { return proto.CompactTextString(m) }
+func (*SpeechRecognitionResult) ProtoMessage()    {}
+func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{13}
+}
+func (m *SpeechRecognitionResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechRecognitionResult.Unmarshal(m, b)
+}
+func (m *SpeechRecognitionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechRecognitionResult.Marshal(b, m, deterministic)
+}
+func (dst *SpeechRecognitionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionResult.Merge(dst, src)
+}
+func (m *SpeechRecognitionResult) XXX_Size() int {
+	return xxx_messageInfo_SpeechRecognitionResult.Size(m)
+}
+func (m *SpeechRecognitionResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechRecognitionResult.DiscardUnknown(m)
 }
 
-func (m *SpeechRecognitionResult) Reset()                    { *m = SpeechRecognitionResult{} }
-func (m *SpeechRecognitionResult) String() string            { return proto.CompactTextString(m) }
-func (*SpeechRecognitionResult) ProtoMessage()               {}
-func (*SpeechRecognitionResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_SpeechRecognitionResult proto.InternalMessageInfo
 
 func (m *SpeechRecognitionResult) GetAlternatives() []*SpeechRecognitionAlternative {
 	if m != nil {
@@ -1210,26 +1651,64 @@ func (m *SpeechRecognitionResult) GetAlternatives() []*SpeechRecognitionAlternat
 	return nil
 }
 
+func (m *SpeechRecognitionResult) GetChannelTag() int32 {
+	if m != nil {
+		return m.ChannelTag
+	}
+	return 0
+}
+
+func (m *SpeechRecognitionResult) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
 // Alternative hypotheses (a.k.a. n-best list).
 type SpeechRecognitionAlternative struct {
-	// *Output-only* Transcript text representing the words that the user spoke.
-	Transcript string `protobuf:"bytes,1,opt,name=transcript" json:"transcript,omitempty"`
-	// *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
+	// Output only. Transcript text representing the words that the user spoke.
+	Transcript string `protobuf:"bytes,1,opt,name=transcript,proto3" json:"transcript,omitempty"`
+	// Output only. The confidence estimate between 0.0 and 1.0. A higher number
 	// indicates an estimated greater likelihood that the recognized words are
-	// correct. This field is typically provided only for the top hypothesis, and
-	// only for `is_final=true` results. Clients should not rely on the
-	// `confidence` field as it is not guaranteed to be accurate, or even set, in
-	// any of the results.
+	// correct. This field is set only for the top alternative of a non-streaming
+	// result or, of a streaming result where `is_final=true`.
+	// This field is not guaranteed to be accurate and users should not rely on it
+	// to be always provided.
 	// The default of 0.0 is a sentinel value indicating `confidence` was not set.
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
-	// *Output-only* A list of word-specific information for each recognized word.
-	Words []*WordInfo `protobuf:"bytes,3,rep,name=words" json:"words,omitempty"`
+	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	// Output only. A list of word-specific information for each recognized word.
+	// Note: When enable_speaker_diarization is true, you will see all the words
+	// from the beginning of the audio.
+	Words                []*WordInfo `protobuf:"bytes,3,rep,name=words,proto3" json:"words,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *SpeechRecognitionAlternative) Reset()         { *m = SpeechRecognitionAlternative{} }
+func (m *SpeechRecognitionAlternative) String() string { return proto.CompactTextString(m) }
+func (*SpeechRecognitionAlternative) ProtoMessage()    {}
+func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{14}
+}
+func (m *SpeechRecognitionAlternative) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Unmarshal(m, b)
+}
+func (m *SpeechRecognitionAlternative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Marshal(b, m, deterministic)
+}
+func (dst *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionAlternative.Merge(dst, src)
+}
+func (m *SpeechRecognitionAlternative) XXX_Size() int {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Size(m)
+}
+func (m *SpeechRecognitionAlternative) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechRecognitionAlternative.DiscardUnknown(m)
 }
 
-func (m *SpeechRecognitionAlternative) Reset()                    { *m = SpeechRecognitionAlternative{} }
-func (m *SpeechRecognitionAlternative) String() string            { return proto.CompactTextString(m) }
-func (*SpeechRecognitionAlternative) ProtoMessage()               {}
-func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_SpeechRecognitionAlternative proto.InternalMessageInfo
 
 func (m *SpeechRecognitionAlternative) GetTranscript() string {
 	if m != nil {
@@ -1252,41 +1731,75 @@ func (m *SpeechRecognitionAlternative) GetWords() []*WordInfo {
 	return nil
 }
 
-// Word-specific information for recognized words. Word information is only
-// included in the response when certain request parameters are set, such
-// as `enable_word_time_offsets`.
+// Word-specific information for recognized words.
 type WordInfo struct {
-	// *Output-only* Time offset relative to the beginning of the audio,
+	// Output only. Time offset relative to the beginning of the audio,
 	// and corresponding to the start of the spoken word.
 	// This field is only set if `enable_word_time_offsets=true` and only
 	// in the top hypothesis.
 	// This is an experimental feature and the accuracy of the time offset can
 	// vary.
-	StartTime *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
-	// *Output-only* Time offset relative to the beginning of the audio,
+	StartTime *duration.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// Output only. Time offset relative to the beginning of the audio,
 	// and corresponding to the end of the spoken word.
 	// This field is only set if `enable_word_time_offsets=true` and only
 	// in the top hypothesis.
 	// This is an experimental feature and the accuracy of the time offset can
 	// vary.
-	EndTime *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
-	// *Output-only* The word corresponding to this set of information.
-	Word string `protobuf:"bytes,3,opt,name=word" json:"word,omitempty"`
+	EndTime *duration.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	// Output only. The word corresponding to this set of information.
+	Word string `protobuf:"bytes,3,opt,name=word,proto3" json:"word,omitempty"`
+	// Output only. The confidence estimate between 0.0 and 1.0. A higher number
+	// indicates an estimated greater likelihood that the recognized words are
+	// correct. This field is set only for the top alternative of a non-streaming
+	// result or, of a streaming result where `is_final=true`.
+	// This field is not guaranteed to be accurate and users should not rely on it
+	// to be always provided.
+	// The default of 0.0 is a sentinel value indicating `confidence` was not set.
+	Confidence float32 `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	// Output only. A distinct integer value is assigned for every speaker within
+	// the audio. This field specifies which one of those speakers was detected to
+	// have spoken this word. Value ranges from '1' to diarization_speaker_count.
+	// speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+	// top alternative.
+	SpeakerTag           int32    `protobuf:"varint,5,opt,name=speaker_tag,json=speakerTag,proto3" json:"speaker_tag,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WordInfo) Reset()         { *m = WordInfo{} }
+func (m *WordInfo) String() string { return proto.CompactTextString(m) }
+func (*WordInfo) ProtoMessage()    {}
+func (*WordInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_speech_9c9e7aa236afd686, []int{15}
+}
+func (m *WordInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WordInfo.Unmarshal(m, b)
+}
+func (m *WordInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WordInfo.Marshal(b, m, deterministic)
+}
+func (dst *WordInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WordInfo.Merge(dst, src)
+}
+func (m *WordInfo) XXX_Size() int {
+	return xxx_messageInfo_WordInfo.Size(m)
+}
+func (m *WordInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_WordInfo.DiscardUnknown(m)
 }
 
-func (m *WordInfo) Reset()                    { *m = WordInfo{} }
-func (m *WordInfo) String() string            { return proto.CompactTextString(m) }
-func (*WordInfo) ProtoMessage()               {}
-func (*WordInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_WordInfo proto.InternalMessageInfo
 
-func (m *WordInfo) GetStartTime() *google_protobuf3.Duration {
+func (m *WordInfo) GetStartTime() *duration.Duration {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *WordInfo) GetEndTime() *google_protobuf3.Duration {
+func (m *WordInfo) GetEndTime() *duration.Duration {
 	if m != nil {
 		return m.EndTime
 	}
@@ -1300,6 +1813,20 @@ func (m *WordInfo) GetWord() string {
 	return ""
 }
 
+func (m *WordInfo) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+func (m *WordInfo) GetSpeakerTag() int32 {
+	if m != nil {
+		return m.SpeakerTag
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterType((*RecognizeRequest)(nil), "google.cloud.speech.v1p1beta1.RecognizeRequest")
 	proto.RegisterType((*LongRunningRecognizeRequest)(nil), "google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest")
@@ -1321,7 +1848,6 @@ func init() {
 	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_InteractionType", RecognitionMetadata_InteractionType_name, RecognitionMetadata_InteractionType_value)
 	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_MicrophoneDistance", RecognitionMetadata_MicrophoneDistance_name, RecognitionMetadata_MicrophoneDistance_value)
 	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_OriginalMediaType", RecognitionMetadata_OriginalMediaType_name, RecognitionMetadata_OriginalMediaType_value)
-	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_NumberOfSpeakers", RecognitionMetadata_NumberOfSpeakers_name, RecognitionMetadata_NumberOfSpeakers_value)
 	proto.RegisterEnum("google.cloud.speech.v1p1beta1.RecognitionMetadata_RecordingDeviceType", RecognitionMetadata_RecordingDeviceType_name, RecognitionMetadata_RecordingDeviceType_value)
 	proto.RegisterEnum("google.cloud.speech.v1p1beta1.StreamingRecognizeResponse_SpeechEventType", StreamingRecognizeResponse_SpeechEventType_name, StreamingRecognizeResponse_SpeechEventType_value)
 }
@@ -1334,8 +1860,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Speech service
-
+// SpeechClient is the client API for Speech service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SpeechClient interface {
 	// Performs synchronous speech recognition: receive results after all audio
 	// has been sent and processed.
@@ -1344,7 +1871,7 @@ type SpeechClient interface {
 	// google.longrunning.Operations interface. Returns either an
 	// `Operation.error` or an `Operation.response` which contains
 	// a `LongRunningRecognizeResponse` message.
-	LongRunningRecognize(ctx context.Context, in *LongRunningRecognizeRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	LongRunningRecognize(ctx context.Context, in *LongRunningRecognizeRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Performs bidirectional streaming speech recognition: receive results while
 	// sending audio. This method is only available via the gRPC API (not REST).
 	StreamingRecognize(ctx context.Context, opts ...grpc.CallOption) (Speech_StreamingRecognizeClient, error)
@@ -1360,16 +1887,16 @@ func NewSpeechClient(cc *grpc.ClientConn) SpeechClient {
 
 func (c *speechClient) Recognize(ctx context.Context, in *RecognizeRequest, opts ...grpc.CallOption) (*RecognizeResponse, error) {
 	out := new(RecognizeResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.speech.v1p1beta1.Speech/Recognize", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.speech.v1p1beta1.Speech/Recognize", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *speechClient) LongRunningRecognize(ctx context.Context, in *LongRunningRecognizeRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.speech.v1p1beta1.Speech/LongRunningRecognize", in, out, c.cc, opts...)
+func (c *speechClient) LongRunningRecognize(ctx context.Context, in *LongRunningRecognizeRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.speech.v1p1beta1.Speech/LongRunningRecognize", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1377,7 +1904,7 @@ func (c *speechClient) LongRunningRecognize(ctx context.Context, in *LongRunning
 }
 
 func (c *speechClient) StreamingRecognize(ctx context.Context, opts ...grpc.CallOption) (Speech_StreamingRecognizeClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Speech_serviceDesc.Streams[0], c.cc, "/google.cloud.speech.v1p1beta1.Speech/StreamingRecognize", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Speech_serviceDesc.Streams[0], "/google.cloud.speech.v1p1beta1.Speech/StreamingRecognize", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1407,8 +1934,7 @@ func (x *speechStreamingRecognizeClient) Recv() (*StreamingRecognizeResponse, er
 	return m, nil
 }
 
-// Server API for Speech service
-
+// SpeechServer is the server API for Speech service.
 type SpeechServer interface {
 	// Performs synchronous speech recognition: receive results after all audio
 	// has been sent and processed.
@@ -1417,7 +1943,7 @@ type SpeechServer interface {
 	// google.longrunning.Operations interface. Returns either an
 	// `Operation.error` or an `Operation.response` which contains
 	// a `LongRunningRecognizeResponse` message.
-	LongRunningRecognize(context.Context, *LongRunningRecognizeRequest) (*google_longrunning.Operation, error)
+	LongRunningRecognize(context.Context, *LongRunningRecognizeRequest) (*longrunning.Operation, error)
 	// Performs bidirectional streaming speech recognition: receive results while
 	// sending audio. This method is only available via the gRPC API (not REST).
 	StreamingRecognize(Speech_StreamingRecognizeServer) error
@@ -1510,137 +2036,148 @@ var _Speech_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "google/cloud/speech/v1_1beta1/cloud_speech.proto",
+	Metadata: "google/cloud/speech/v1p1beta1/cloud_speech.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/speech/v1_1beta1/cloud_speech.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/speech/v1p1beta1/cloud_speech.proto", fileDescriptor_cloud_speech_9c9e7aa236afd686)
+}
 
-var fileDescriptor0 = []byte{
-	// 2005 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_cloud_speech_9c9e7aa236afd686 = []byte{
+	// 2147 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xbf, 0x73, 0xdb, 0xc8,
-	0xf5, 0x37, 0x48, 0x51, 0x12, 0x9f, 0x7e, 0x41, 0xab, 0xf3, 0xd7, 0xb4, 0xac, 0xb3, 0x75, 0xf0,
-	0xdc, 0x9d, 0xee, 0xbe, 0x37, 0xa4, 0xa5, 0x64, 0x2e, 0x67, 0xdf, 0xe4, 0x26, 0x10, 0x00, 0x99,
-	0x98, 0x90, 0x00, 0x67, 0x49, 0xda, 0xf1, 0x35, 0x3b, 0x10, 0xb8, 0xa4, 0x31, 0x21, 0x01, 0x1c,
-	0xb0, 0x50, 0x6c, 0x97, 0x69, 0x33, 0x49, 0x93, 0x99, 0x74, 0xa9, 0x72, 0x75, 0xca, 0x14, 0x69,
-	0x52, 0x25, 0x45, 0xda, 0x34, 0x29, 0xaf, 0xc8, 0x1f, 0x91, 0x32, 0xb3, 0xbb, 0x00, 0x45, 0x91,
-	0xb2, 0x2d, 0x6b, 0x72, 0x33, 0xe9, 0x88, 0xcf, 0xbe, 0xf7, 0x79, 0x6f, 0xdf, 0xbe, 0x7d, 0x7c,
-	0x6f, 0xe1, 0xc1, 0x28, 0x8a, 0x46, 0x63, 0xda, 0xf0, 0xc7, 0x51, 0x36, 0x68, 0xa4, 0x31, 0xa5,
-	0xfe, 0xf3, 0xc6, 0xd9, 0x21, 0x39, 0x3c, 0xa5, 0xcc, 0x3b, 0x94, 0x30, 0x91, 0x70, 0x3d, 0x4e,
-	0x22, 0x16, 0xa1, 0xf7, 0xa5, 0x46, 0x5d, 0x2c, 0xd5, 0xf3, 0xa5, 0xb3, 0xc3, 0x58, 0x6a, 0xec,
-	0xee, 0xe5, 0x84, 0x5e, 0x1c, 0x34, 0xbc, 0x30, 0x8c, 0x98, 0xc7, 0x82, 0x28, 0x4c, 0xa5, 0xf2,
-	0xee, 0xfd, 0x7c, 0x75, 0x1c, 0x85, 0xa3, 0x24, 0x0b, 0xc3, 0x20, 0x1c, 0x35, 0xa2, 0x98, 0x26,
-	0x17, 0x84, 0xee, 0xe6, 0x42, 0xe2, 0xeb, 0x34, 0x1b, 0x36, 0x06, 0x99, 0x14, 0xc8, 0xd7, 0xef,
-	0xcd, 0xaf, 0xb3, 0x60, 0x42, 0x53, 0xe6, 0x4d, 0xe2, 0x5c, 0xe0, 0x56, 0x2e, 0x90, 0xc4, 0x7e,
-	0x23, 0x65, 0x1e, 0xcb, 0x72, 0x66, 0xed, 0x0f, 0x0a, 0xa8, 0x98, 0xfa, 0xd1, 0x28, 0x0c, 0x5e,
-	0x51, 0x4c, 0xbf, 0xc9, 0x68, 0xca, 0x50, 0x13, 0x96, 0xfd, 0x28, 0x1c, 0x06, 0xa3, 0x9a, 0xb2,
-	0xaf, 0x1c, 0xac, 0x1d, 0x3d, 0xa8, 0xbf, 0x71, 0x87, 0xf5, 0x9c, 0x80, 0x3b, 0x64, 0x08, 0x3d,
-	0x9c, 0xeb, 0x23, 0x0b, 0x2a, 0x5e, 0x36, 0x08, 0xa2, 0x5a, 0x49, 0x10, 0x35, 0xae, 0x4e, 0xa4,
-	0x73, 0x35, 0x2c, 0xb5, 0xb5, 0x3f, 0x2a, 0x70, 0xa7, 0x15, 0x85, 0x23, 0x2c, 0x03, 0xf4, 0xbf,
-	0xef, 0xf0, 0x5f, 0x14, 0xb8, 0xdd, 0x65, 0x09, 0xf5, 0x26, 0x97, 0xb9, 0x3b, 0x04, 0x35, 0x2d,
-	0x16, 0xc9, 0x05, 0xc7, 0x1f, 0xbe, 0xc5, 0xde, 0x3c, 0xe7, 0xf9, 0x0e, 0x9a, 0x37, 0xf0, 0xd6,
-	0x94, 0x54, 0x42, 0xe8, 0x43, 0xd8, 0x10, 0xee, 0x70, 0x1b, 0x8c, 0x86, 0x4c, 0x6c, 0x6a, 0xbd,
-	0x79, 0x03, 0xaf, 0x0b, 0xd8, 0x90, 0xe8, 0xf1, 0x0e, 0x6c, 0x9f, 0xbb, 0x93, 0x48, 0x1f, 0xb5,
-	0x3f, 0x2b, 0xb0, 0xfb, 0x7a, 0x6b, 0xff, 0xc5, 0x88, 0x7f, 0x02, 0x6a, 0x1a, 0x84, 0xa3, 0x31,
-	0x25, 0x19, 0x63, 0x34, 0xf1, 0x42, 0x9f, 0x0a, 0x3f, 0x57, 0xf1, 0x96, 0xc4, 0xfb, 0x05, 0x8c,
-	0x3e, 0x86, 0xad, 0x20, 0x64, 0x34, 0x09, 0x26, 0x24, 0xa1, 0x69, 0x36, 0x66, 0x69, 0xad, 0x2c,
-	0x24, 0x37, 0x73, 0x18, 0x4b, 0x54, 0xfb, 0x5b, 0x05, 0xb6, 0x17, 0x7d, 0xfe, 0x1a, 0x56, 0x69,
-	0xe8, 0x47, 0x83, 0x20, 0x94, 0x5e, 0x6f, 0x1e, 0x7d, 0xf5, 0xae, 0x5e, 0xd7, 0xc5, 0x29, 0x5b,
-	0x39, 0x0b, 0x9e, 0xf2, 0xa1, 0x4f, 0x61, 0x3b, 0xf5, 0x26, 0xf1, 0x98, 0x92, 0xc4, 0x63, 0x94,
-	0x3c, 0xa7, 0x09, 0x7b, 0x25, 0xb6, 0x51, 0xc1, 0x5b, 0x72, 0x01, 0x7b, 0x8c, 0x36, 0x39, 0x8c,
-	0xee, 0xc3, 0xc6, 0xd8, 0x0b, 0x47, 0x99, 0x37, 0xa2, 0xc4, 0x8f, 0x06, 0x54, 0x6c, 0xa2, 0x8a,
-	0xd7, 0x0b, 0xd0, 0x88, 0x06, 0x94, 0x87, 0x65, 0xe2, 0xbd, 0x20, 0xde, 0x98, 0xd1, 0x24, 0xf4,
-	0x58, 0x70, 0x46, 0xd3, 0xda, 0x92, 0xe4, 0x9b, 0x78, 0x2f, 0xf4, 0x19, 0x98, 0x8b, 0xc6, 0x49,
-	0x34, 0xf4, 0xc2, 0x80, 0xbd, 0x24, 0xc3, 0x80, 0x2f, 0xd5, 0x2a, 0x32, 0x82, 0x53, 0xfc, 0x44,
-	0xc0, 0xa8, 0x0f, 0x5b, 0x72, 0x93, 0x32, 0x25, 0x5e, 0xb0, 0xb4, 0xb6, 0xbc, 0x5f, 0x3e, 0x58,
-	0x3b, 0xfa, 0xec, 0x6d, 0x89, 0x27, 0x00, 0x43, 0x2a, 0xe1, 0xcd, 0x74, 0xf6, 0x33, 0x45, 0x3f,
-	0x82, 0x1a, 0x0d, 0xbd, 0xd3, 0x31, 0x25, 0xbf, 0x88, 0x92, 0x01, 0xe1, 0xd5, 0x87, 0x44, 0xc3,
-	0x61, 0x4a, 0x59, 0x5a, 0x5b, 0x15, 0x9e, 0xdc, 0x94, 0xeb, 0x4f, 0xa3, 0x64, 0xd0, 0x0b, 0x26,
-	0xd4, 0x95, 0x8b, 0xe8, 0x27, 0xb0, 0x97, 0x2b, 0x7a, 0x19, 0x8b, 0x26, 0x1e, 0x0b, 0x7c, 0x12,
-	0x67, 0xa1, 0xcf, 0x32, 0x51, 0xde, 0x6a, 0x6b, 0x42, 0x79, 0x57, 0xca, 0xe8, 0x85, 0x48, 0xe7,
-	0x5c, 0x02, 0x39, 0xb0, 0x3a, 0xa1, 0xcc, 0x1b, 0x78, 0xcc, 0xab, 0x55, 0x45, 0x2a, 0x1e, 0x5d,
-	0xfd, 0x50, 0xdb, 0xb9, 0x26, 0x9e, 0x72, 0x68, 0xbf, 0x52, 0x60, 0xe3, 0xc2, 0x21, 0xa3, 0x1a,
-	0xbc, 0x67, 0x39, 0x86, 0x6b, 0xda, 0xce, 0x63, 0xd2, 0x77, 0xba, 0x1d, 0xcb, 0xb0, 0x4f, 0x6c,
-	0xcb, 0x54, 0x6f, 0xa0, 0x75, 0x58, 0x6d, 0xd9, 0x8e, 0xa5, 0xe3, 0xc3, 0xcf, 0x55, 0x05, 0xad,
-	0xc2, 0xd2, 0x49, 0x4b, 0x37, 0xd4, 0x12, 0xaa, 0x42, 0xa5, 0xdd, 0x6f, 0xe9, 0x4f, 0xd5, 0x32,
-	0x5a, 0x81, 0xb2, 0xde, 0xc6, 0xea, 0x12, 0x02, 0x58, 0xd6, 0xdb, 0x98, 0x3c, 0x3d, 0x56, 0x2b,
-	0x5c, 0xcf, 0x7d, 0xfc, 0x98, 0xb8, 0x9d, 0x7e, 0x57, 0x5d, 0x46, 0xbb, 0xf0, 0x7f, 0xdd, 0x8e,
-	0x65, 0xfd, 0x8c, 0x3c, 0xb5, 0x7b, 0x4d, 0xd2, 0xb4, 0x74, 0xd3, 0xc2, 0xe4, 0xf8, 0x59, 0xcf,
-	0x52, 0x57, 0xb4, 0xef, 0xd6, 0x60, 0xe7, 0x12, 0x7f, 0xd1, 0x04, 0x54, 0x91, 0xf2, 0x9e, 0xcf,
-	0x61, 0xc2, 0x5e, 0xc6, 0x34, 0x4f, 0xe9, 0xe3, 0x77, 0xdf, 0x7d, 0xdd, 0x3e, 0xa7, 0xea, 0xbd,
-	0x8c, 0x29, 0xde, 0x0a, 0x2e, 0x02, 0xe8, 0x2b, 0xd8, 0x0b, 0xc2, 0x41, 0x96, 0xb2, 0xe4, 0x25,
-	0x09, 0xbd, 0xc0, 0x4f, 0x45, 0xde, 0x92, 0x68, 0x48, 0x64, 0xb1, 0xe4, 0x09, 0xbc, 0x81, 0x6b,
-	0x85, 0x8c, 0xc3, 0x45, 0x78, 0x16, 0xbb, 0x43, 0x11, 0x4a, 0x74, 0x06, 0x3b, 0x93, 0xc0, 0x4f,
-	0xa2, 0xf8, 0x79, 0x14, 0x52, 0x32, 0x08, 0x52, 0x26, 0xae, 0xf9, 0x92, 0xf0, 0xd8, 0xba, 0x86,
-	0xc7, 0xed, 0x29, 0x9b, 0x99, 0x93, 0x61, 0x34, 0x59, 0xc0, 0x10, 0x83, 0x9d, 0x28, 0x09, 0x46,
-	0x41, 0xe8, 0x8d, 0xc9, 0x84, 0x0e, 0x02, 0x4f, 0x46, 0xaa, 0x22, 0xec, 0x9a, 0xd7, 0xb0, 0xeb,
-	0xe6, 0x6c, 0x6d, 0x4e, 0x26, 0x62, 0xb5, 0x1d, 0xcd, 0x43, 0xe8, 0x1b, 0x40, 0x61, 0x36, 0x39,
-	0xa5, 0x09, 0x0f, 0x50, 0x1a, 0x53, 0xef, 0xe7, 0x34, 0xe1, 0xf7, 0x8c, 0x1b, 0x35, 0xae, 0x61,
-	0xd4, 0x11, 0x64, 0xee, 0xb0, 0x9b, 0x53, 0x61, 0x35, 0x9c, 0x43, 0xd0, 0x2b, 0xb8, 0x99, 0x50,
-	0x3f, 0x4a, 0x78, 0xc2, 0x92, 0x01, 0x3d, 0x0b, 0x7c, 0x2a, 0xb7, 0xba, 0x22, 0xac, 0x9e, 0x5c,
-	0xc3, 0x2a, 0x2e, 0xf8, 0x4c, 0x41, 0x27, 0x36, 0xbb, 0x93, 0x2c, 0x82, 0xe8, 0xe8, 0x12, 0xdb,
-	0xa1, 0x37, 0xa1, 0xe2, 0xe6, 0x57, 0x17, 0x74, 0x1c, 0x6f, 0x42, 0xd1, 0x67, 0x80, 0xce, 0x0f,
-	0x86, 0x57, 0x0b, 0xe1, 0x6c, 0x55, 0x28, 0xa8, 0xd3, 0x88, 0x06, 0x13, 0x69, 0xe1, 0x3e, 0x6c,
-	0x44, 0xa7, 0xc3, 0x2c, 0xf5, 0x3d, 0x46, 0x07, 0x24, 0x18, 0xd4, 0x60, 0x5f, 0x39, 0x28, 0xe3,
-	0xf5, 0x73, 0xd0, 0x1e, 0xa0, 0x7b, 0xb0, 0x26, 0xff, 0xec, 0x58, 0x14, 0x07, 0xbe, 0xa8, 0x1c,
-	0x55, 0x0c, 0x02, 0xea, 0x71, 0x44, 0xfb, 0xab, 0x02, 0x5b, 0x73, 0x99, 0x8e, 0xf6, 0x61, 0xcf,
-	0x76, 0x7a, 0x16, 0xd6, 0x8d, 0x9e, 0xed, 0x3a, 0xa4, 0xf7, 0xac, 0x63, 0xcd, 0xdd, 0xf1, 0x4d,
-	0x00, 0xd3, 0xee, 0x1a, 0xfd, 0x6e, 0xd7, 0x76, 0x1d, 0x55, 0x41, 0x2a, 0xac, 0x77, 0xb0, 0xd5,
-	0xb5, 0x9c, 0x9e, 0xce, 0x55, 0xd4, 0x12, 0x97, 0xe8, 0x34, 0x5d, 0xc7, 0x22, 0x86, 0xde, 0x6a,
-	0xa9, 0x65, 0xb4, 0x01, 0xd5, 0x27, 0xae, 0x6d, 0x58, 0x6d, 0xdd, 0x6e, 0xa9, 0x4b, 0xe8, 0x0e,
-	0xdc, 0xea, 0x60, 0xf7, 0xc4, 0x12, 0x04, 0x7a, 0xab, 0xf5, 0x8c, 0x74, 0xb0, 0x6b, 0xf6, 0x0d,
-	0xcb, 0x54, 0x2b, 0x9c, 0x4d, 0xc8, 0x92, 0xae, 0xa5, 0x63, 0xa3, 0xa9, 0x2e, 0xa3, 0x6d, 0xd8,
-	0x90, 0x88, 0xe1, 0xb6, 0xdb, 0xba, 0x63, 0xaa, 0x2b, 0x9c, 0xd0, 0xb4, 0x8d, 0xdc, 0xde, 0xaa,
-	0x36, 0x00, 0xb4, 0x98, 0xfe, 0xe8, 0x3e, 0xdc, 0x6b, 0xdb, 0x06, 0x76, 0xa5, 0x2b, 0xa6, 0xdd,
-	0xed, 0xe9, 0x8e, 0x31, 0xbf, 0x99, 0x0d, 0xa8, 0xf2, 0x72, 0x75, 0x62, 0x5b, 0x2d, 0x53, 0x55,
-	0x78, 0x1d, 0x6a, 0xdb, 0xa6, 0xfc, 0x2a, 0xf1, 0xaf, 0x93, 0x62, 0xad, 0xac, 0x39, 0xb0, 0xbd,
-	0x90, 0xec, 0xdc, 0x88, 0x8b, 0xed, 0xc7, 0xb6, 0xa3, 0xb7, 0x48, 0xdb, 0x32, 0x6d, 0xfd, 0xb2,
-	0x88, 0x55, 0xa1, 0xa2, 0xf7, 0x4d, 0xdb, 0x55, 0x15, 0xfe, 0xf3, 0x89, 0x6d, 0x5a, 0xae, 0x5a,
-	0xd2, 0x62, 0x50, 0xe7, 0xf3, 0x18, 0x69, 0x70, 0xd7, 0xe9, 0xb7, 0x8f, 0x2d, 0x4c, 0xdc, 0x13,
-	0xd2, 0xed, 0x58, 0xfa, 0x4f, 0x2d, 0xdc, 0x9d, 0x63, 0xdb, 0x82, 0x35, 0xbe, 0xa1, 0x7c, 0x55,
-	0x1e, 0x40, 0xef, 0xa9, 0x3b, 0x15, 0x57, 0x4b, 0xe8, 0x26, 0x6c, 0xb7, 0xfb, 0xad, 0x9e, 0xdd,
-	0x69, 0x59, 0xe7, 0x70, 0x59, 0xfb, 0x56, 0x91, 0xb5, 0x73, 0x3e, 0x5f, 0x3f, 0x84, 0x0f, 0xb0,
-	0x65, 0xb8, 0x58, 0x14, 0x74, 0xd3, 0x7a, 0xc2, 0x83, 0x7d, 0xf9, 0xc1, 0x77, 0xdb, 0x3a, 0xee,
-	0x89, 0x80, 0xaa, 0x0a, 0x5a, 0x86, 0x52, 0xc7, 0x98, 0x3d, 0x6e, 0x5e, 0xfa, 0xd5, 0x32, 0x5a,
-	0x83, 0x95, 0x27, 0x56, 0xd3, 0x36, 0x5a, 0x96, 0xba, 0xc4, 0xff, 0x2b, 0xdc, 0x5e, 0x93, 0x6f,
-	0xa8, 0xdf, 0x33, 0x5d, 0x17, 0xe7, 0xfc, 0x6a, 0x05, 0xdd, 0x82, 0x1d, 0xb9, 0x62, 0x3b, 0xb3,
-	0x0b, 0xcb, 0xda, 0x27, 0xb0, 0x71, 0xe1, 0xcf, 0x15, 0xd5, 0x60, 0x25, 0x7e, 0x9e, 0x78, 0x29,
-	0x4d, 0x6b, 0xca, 0x7e, 0xf9, 0xa0, 0x8a, 0x8b, 0x4f, 0x0d, 0x4f, 0x7b, 0xf5, 0x69, 0xc3, 0x89,
-	0x76, 0x61, 0xa5, 0xe8, 0xee, 0x94, 0xbc, 0xbb, 0x2b, 0x00, 0x84, 0xa0, 0x9c, 0x25, 0x81, 0x68,
-	0x43, 0xaa, 0xcd, 0x1b, 0x98, 0x7f, 0x1c, 0x6f, 0x82, 0x6c, 0xfe, 0x48, 0x1a, 0x65, 0x89, 0x4f,
-	0x35, 0x3a, 0xed, 0x94, 0x78, 0x7f, 0x9a, 0xc6, 0x51, 0x98, 0x52, 0xd4, 0x81, 0x95, 0xa2, 0xc1,
-	0x2a, 0x89, 0xf6, 0xe0, 0xf3, 0x2b, 0xb5, 0x07, 0x33, 0xce, 0xc9, 0x4e, 0x0c, 0x17, 0x34, 0x5a,
-	0x0c, 0x7b, 0x97, 0x37, 0xf0, 0xdf, 0x9b, 0xc5, 0xbf, 0x2b, 0x97, 0x9b, 0x9c, 0xfe, 0x87, 0xca,
-	0xb6, 0x69, 0x94, 0xd0, 0x34, 0x25, 0x31, 0x4d, 0xfc, 0x22, 0x84, 0x15, 0xd1, 0x36, 0x09, 0xbc,
-	0x23, 0x61, 0xf4, 0x10, 0x20, 0x65, 0x5e, 0xc2, 0x44, 0x67, 0x93, 0x8f, 0x06, 0xbb, 0x85, 0x83,
-	0xc5, 0xd0, 0x55, 0xef, 0x15, 0x43, 0x17, 0xae, 0x0a, 0x69, 0xfe, 0x8d, 0x4c, 0x50, 0xc7, 0x5e,
-	0xca, 0x48, 0x16, 0x0f, 0x78, 0x63, 0x28, 0x08, 0xca, 0x6f, 0x25, 0xd8, 0xe4, 0x3a, 0x7d, 0xa1,
-	0xc2, 0x41, 0xed, 0xbb, 0xd2, 0x62, 0x37, 0x3e, 0x13, 0xbd, 0x03, 0xa8, 0xd0, 0x24, 0x89, 0x92,
-	0xbc, 0x19, 0x47, 0x05, 0x73, 0x12, 0xfb, 0xf5, 0xae, 0x18, 0xf7, 0xb0, 0x14, 0x40, 0xdd, 0xf9,
-	0x38, 0x5f, 0x67, 0xe2, 0x98, 0x0b, 0x35, 0xca, 0x60, 0x3b, 0xef, 0x2a, 0xe9, 0x19, 0x0d, 0x99,
-	0x2c, 0xe6, 0xf2, 0xcf, 0xdd, 0x7e, 0x47, 0xfa, 0xf3, 0x4d, 0xe5, 0x27, 0x6c, 0x71, 0x46, 0xd9,
-	0x95, 0xa4, 0x17, 0x01, 0xad, 0x05, 0x5b, 0x73, 0x32, 0x68, 0x0f, 0x6a, 0xbc, 0x97, 0x32, 0x9a,
-	0xc4, 0x7a, 0x62, 0x39, 0xbd, 0xb9, 0x2b, 0x7d, 0x07, 0x6e, 0x59, 0x8e, 0x29, 0x8a, 0x8d, 0xed,
-	0x3c, 0x6e, 0x59, 0xa4, 0xdf, 0xe3, 0xb5, 0xdf, 0x31, 0x2c, 0x55, 0xd1, 0xfe, 0xf4, 0x9a, 0x81,
-	0x47, 0x6e, 0x16, 0x11, 0x58, 0xbf, 0xd0, 0x8b, 0x2b, 0x22, 0x7a, 0x5f, 0xbe, 0x6b, 0x96, 0xce,
-	0x34, 0xee, 0xf8, 0x02, 0x21, 0xba, 0x0d, 0xab, 0x41, 0x4a, 0x86, 0xbc, 0xe0, 0xe6, 0xf3, 0xcf,
-	0x4a, 0x90, 0x9e, 0xf0, 0x4f, 0xb4, 0x07, 0x3c, 0xa1, 0x4e, 0x83, 0x71, 0xc0, 0x5e, 0x8a, 0xe4,
-	0x29, 0xe1, 0x73, 0x40, 0x7b, 0x05, 0xb7, 0x5e, 0x73, 0x19, 0xbe, 0x77, 0xa7, 0xb5, 0xdf, 0x2b,
-	0xb0, 0xf7, 0x26, 0x71, 0x74, 0x17, 0x80, 0x25, 0x5e, 0x98, 0xfa, 0x49, 0x10, 0xcb, 0xeb, 0x55,
-	0xc5, 0x33, 0x08, 0x5f, 0x17, 0x73, 0xe0, 0x80, 0x16, 0x73, 0x5f, 0x09, 0xcf, 0x20, 0xe8, 0xc7,
-	0x50, 0xe1, 0x23, 0x05, 0x1f, 0xf4, 0xb8, 0xeb, 0x1f, 0xbf, 0xc5, 0x75, 0x3e, 0x5f, 0xd8, 0xe1,
-	0x30, 0xc2, 0x52, 0x4b, 0xfb, 0x8d, 0x02, 0xab, 0x05, 0x86, 0xbe, 0xb8, 0x70, 0x8b, 0xe5, 0x55,
-	0xb9, 0xbd, 0x70, 0x09, 0xcd, 0xfc, 0x69, 0x65, 0xf6, 0x12, 0xff, 0x90, 0x4f, 0x8e, 0x83, 0xd9,
-	0xdb, 0xff, 0x06, 0xbd, 0x15, 0x1a, 0x8a, 0x19, 0x07, 0x21, 0x58, 0xe2, 0x5e, 0xe4, 0xe3, 0x9d,
-	0xf8, 0x7d, 0xf4, 0xcf, 0x32, 0x2c, 0xcb, 0x80, 0xa1, 0xdf, 0x29, 0x50, 0x9d, 0x66, 0x3d, 0xba,
-	0xe2, 0x4b, 0xc3, 0xf4, 0x11, 0x61, 0xf7, 0xc1, 0xd5, 0x15, 0xe4, 0x85, 0xd2, 0x3e, 0xfa, 0xe5,
-	0x3f, 0xfe, 0xf5, 0xdb, 0xd2, 0xbe, 0x76, 0xa7, 0x31, 0x95, 0xca, 0xdf, 0xb7, 0x1e, 0x25, 0x85,
-	0xf0, 0x23, 0xe5, 0x53, 0xf4, 0xad, 0x02, 0xef, 0x5d, 0x56, 0x39, 0xd1, 0xa3, 0xb7, 0x98, 0x7c,
-	0xc3, 0x13, 0xcd, 0xee, 0xfb, 0x85, 0xee, 0xcc, 0x43, 0x57, 0xdd, 0x2d, 0x1e, 0xba, 0xb4, 0x43,
-	0xe1, 0xdb, 0xff, 0x6b, 0x1f, 0x2d, 0xfa, 0x36, 0xa3, 0x70, 0xc1, 0xcd, 0x5f, 0x2b, 0x80, 0x16,
-	0xcb, 0x07, 0xfa, 0xe2, 0x1a, 0x15, 0x47, 0xba, 0xf8, 0xf0, 0xda, 0xb5, 0xea, 0x40, 0x79, 0xa0,
-	0x1c, 0xbf, 0x82, 0x0f, 0xfc, 0x68, 0xf2, 0x66, 0x8e, 0xe3, 0x35, 0x79, 0xf8, 0x1d, 0x9e, 0x35,
-	0x1d, 0xe5, 0x6b, 0x23, 0x97, 0x1e, 0x45, 0x7c, 0xf8, 0xaf, 0x47, 0xc9, 0xa8, 0x31, 0xa2, 0xa1,
-	0xc8, 0xa9, 0x86, 0x5c, 0xf2, 0xe2, 0x20, 0x9d, 0x7f, 0x8b, 0xcc, 0xc9, 0xbe, 0x94, 0xc0, 0xbf,
-	0x15, 0xe5, 0x74, 0x59, 0xa8, 0xfc, 0xe0, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x32, 0x25,
-	0x1e, 0xbd, 0x14, 0x00, 0x00,
+	0xf5, 0x37, 0x48, 0x51, 0x12, 0x9f, 0x7e, 0x41, 0x2b, 0xdf, 0x09, 0x96, 0x75, 0x67, 0x1b, 0x9e,
+	0x3b, 0xfb, 0xee, 0x7b, 0x43, 0xd9, 0xfa, 0xde, 0x5c, 0xce, 0xbe, 0xe4, 0x26, 0x14, 0x00, 0x99,
+	0x98, 0x21, 0x09, 0xce, 0x92, 0xb2, 0xe3, 0x6b, 0x76, 0x56, 0xc0, 0x92, 0xc2, 0x84, 0x04, 0x10,
+	0xfc, 0x70, 0x2c, 0x97, 0x69, 0x33, 0xa9, 0x32, 0x93, 0x2e, 0x55, 0xae, 0xce, 0x1f, 0x90, 0x26,
+	0x69, 0xd2, 0xa4, 0x49, 0x91, 0x26, 0x65, 0x8a, 0xfc, 0x07, 0x69, 0x32, 0x93, 0x14, 0x99, 0xdd,
+	0x05, 0x28, 0x88, 0x94, 0x2d, 0x5b, 0x93, 0x9b, 0x49, 0x87, 0xfd, 0xbc, 0x1f, 0xfb, 0xde, 0xdb,
+	0xb7, 0x6f, 0xdf, 0x03, 0x3c, 0x18, 0x85, 0xe1, 0x68, 0xcc, 0xf6, 0xdc, 0x71, 0x98, 0x79, 0x7b,
+	0x49, 0xc4, 0x98, 0x7b, 0xb2, 0xf7, 0xe2, 0x61, 0xf4, 0xf0, 0x98, 0xa5, 0xf4, 0xa1, 0x84, 0x89,
+	0x84, 0x1b, 0x51, 0x1c, 0xa6, 0x21, 0xfa, 0x40, 0x4a, 0x34, 0x04, 0xa9, 0x91, 0x93, 0xa6, 0x12,
+	0x3b, 0xbb, 0xb9, 0x42, 0x1a, 0xf9, 0x7b, 0x34, 0x08, 0xc2, 0x94, 0xa6, 0x7e, 0x18, 0x24, 0x52,
+	0x78, 0xe7, 0x6e, 0x4e, 0x1d, 0x87, 0xc1, 0x28, 0xce, 0x82, 0xc0, 0x0f, 0x46, 0x7b, 0x61, 0xc4,
+	0xe2, 0x73, 0x4c, 0x37, 0x72, 0x26, 0xb1, 0x3a, 0xce, 0x86, 0x7b, 0x34, 0x38, 0xcd, 0x49, 0x1f,
+	0xce, 0x92, 0xbc, 0x4c, 0xca, 0xe6, 0xf4, 0x5b, 0xb3, 0xf4, 0xd4, 0x9f, 0xb0, 0x24, 0xa5, 0x93,
+	0x28, 0x67, 0xd8, 0xce, 0x19, 0xe2, 0xc8, 0xdd, 0x4b, 0x52, 0x9a, 0x66, 0xf9, 0xa6, 0xfa, 0x6f,
+	0x14, 0x50, 0x31, 0x73, 0xc3, 0x51, 0xe0, 0xbf, 0x62, 0x98, 0xfd, 0x24, 0x63, 0x49, 0x8a, 0x5a,
+	0xb0, 0xe8, 0x86, 0xc1, 0xd0, 0x1f, 0x69, 0xca, 0x6d, 0xe5, 0xfe, 0xca, 0xfe, 0x83, 0xc6, 0x1b,
+	0x9d, 0x6f, 0xe4, 0x0a, 0xb8, 0x41, 0x86, 0x90, 0xc3, 0xb9, 0x3c, 0xb2, 0xa0, 0x46, 0x33, 0xcf,
+	0x0f, 0xb5, 0x8a, 0x50, 0xb4, 0xf7, 0xf6, 0x8a, 0x9a, 0x5c, 0x0c, 0x4b, 0x69, 0xfd, 0xb7, 0x0a,
+	0xdc, 0x6c, 0x87, 0xc1, 0x08, 0xcb, 0xd8, 0xfd, 0xef, 0x1b, 0xfc, 0x7b, 0x05, 0x6e, 0xf4, 0xd3,
+	0x98, 0xd1, 0xc9, 0x45, 0xe6, 0x0e, 0x41, 0x4d, 0x0a, 0x22, 0x39, 0x67, 0xf8, 0xa3, 0x4b, 0xf6,
+	0x9b, 0xd5, 0x79, 0xe6, 0x41, 0xeb, 0x1a, 0xde, 0x98, 0x2a, 0x95, 0x10, 0xfa, 0x08, 0xd6, 0x84,
+	0x39, 0x7c, 0x8f, 0x94, 0x05, 0xa9, 0x70, 0x6a, 0xb5, 0x75, 0x0d, 0xaf, 0x0a, 0xd8, 0x90, 0xe8,
+	0xc1, 0x16, 0x6c, 0x9e, 0x99, 0x13, 0x4b, 0x1b, 0xf5, 0xdf, 0x29, 0xb0, 0xf3, 0xfa, 0xdd, 0xfe,
+	0x8b, 0x11, 0xff, 0x04, 0xd4, 0xc4, 0x0f, 0x46, 0x63, 0x46, 0xb2, 0x34, 0x65, 0x31, 0x0d, 0x5c,
+	0x26, 0xec, 0x5c, 0xc6, 0x1b, 0x12, 0x3f, 0x2a, 0x60, 0x74, 0x0f, 0x36, 0xfc, 0x20, 0x65, 0xb1,
+	0x3f, 0x21, 0x31, 0x4b, 0xb2, 0x71, 0x9a, 0x68, 0x55, 0xc1, 0xb9, 0x9e, 0xc3, 0x58, 0xa2, 0xfa,
+	0x3f, 0x96, 0x61, 0x73, 0xde, 0xe6, 0x6f, 0x60, 0x99, 0x05, 0x6e, 0xe8, 0xf9, 0x81, 0xb4, 0x7a,
+	0x7d, 0xff, 0xeb, 0x77, 0xb5, 0xba, 0x21, 0x4e, 0xd9, 0xca, 0xb5, 0xe0, 0xa9, 0x3e, 0xf4, 0x29,
+	0x6c, 0x26, 0x74, 0x12, 0x8d, 0x19, 0x89, 0x69, 0xca, 0xc8, 0x09, 0x8b, 0xd3, 0x57, 0xc2, 0x8d,
+	0x1a, 0xde, 0x90, 0x04, 0x4c, 0x53, 0xd6, 0xe2, 0x30, 0x6a, 0xc0, 0x56, 0x7e, 0x2c, 0x27, 0x34,
+	0x08, 0xd8, 0x98, 0xb8, 0x61, 0x16, 0xa4, 0xda, 0x92, 0xe0, 0xde, 0x94, 0x47, 0x23, 0x29, 0x06,
+	0x27, 0xa0, 0x01, 0xdc, 0x63, 0x01, 0x3d, 0x1e, 0x33, 0x92, 0xb0, 0x88, 0x0a, 0xfd, 0xf1, 0x99,
+	0x61, 0x24, 0x62, 0x71, 0xa1, 0x49, 0x5b, 0x15, 0xe1, 0xb8, 0x2b, 0xd9, 0xfb, 0x39, 0x77, 0xc9,
+	0x8b, 0x1e, 0x8b, 0x73, 0xd5, 0xe8, 0x2e, 0xac, 0x8d, 0x69, 0x30, 0xca, 0xe8, 0x88, 0x11, 0x37,
+	0xf4, 0x98, 0x08, 0x65, 0x1d, 0xaf, 0x16, 0xa0, 0x11, 0x7a, 0x0c, 0x7d, 0x1f, 0x76, 0xe8, 0x38,
+	0x65, 0x71, 0x40, 0x53, 0xff, 0x05, 0x23, 0xe7, 0x04, 0x12, 0x0d, 0xdd, 0xae, 0xde, 0xaf, 0x63,
+	0xad, 0xc4, 0xd1, 0x2e, 0x09, 0x27, 0xfc, 0x68, 0x27, 0xf4, 0x25, 0x29, 0xd1, 0x13, 0x6d, 0x41,
+	0xc6, 0x64, 0x42, 0x5f, 0x36, 0x4b, 0x30, 0x67, 0x8d, 0xe2, 0x70, 0x48, 0x03, 0x3f, 0x3d, 0x25,
+	0x43, 0x9f, 0x93, 0xb4, 0x9a, 0xcc, 0x82, 0x29, 0x7e, 0x28, 0x60, 0x74, 0x04, 0x1b, 0xf2, 0xa0,
+	0x64, 0x5a, 0xbf, 0x4c, 0x13, 0x6d, 0xf1, 0x76, 0xf5, 0xfe, 0xca, 0xfe, 0x67, 0x97, 0x5d, 0x1e,
+	0x01, 0x18, 0x52, 0x08, 0xaf, 0x27, 0xe5, 0x65, 0x82, 0xbe, 0x07, 0x5a, 0x1e, 0xe5, 0x9f, 0x86,
+	0xb1, 0x47, 0x78, 0x05, 0x25, 0xe1, 0x70, 0x98, 0xb0, 0x34, 0xd1, 0x96, 0x85, 0x25, 0xef, 0x49,
+	0xfa, 0xb3, 0x30, 0xf6, 0x06, 0xfe, 0x84, 0x39, 0x92, 0x88, 0x3e, 0x87, 0xf7, 0xcb, 0x82, 0x22,
+	0xad, 0x3d, 0xc6, 0xd3, 0x78, 0x43, 0x88, 0x5d, 0x3f, 0x13, 0x33, 0xa6, 0x34, 0xf4, 0x43, 0xd8,
+	0xcd, 0xa5, 0x68, 0x96, 0x86, 0x13, 0x9a, 0xfa, 0x2e, 0x89, 0xb2, 0xc0, 0x4d, 0x33, 0x51, 0xd8,
+	0xb5, 0x15, 0x21, 0xbb, 0x23, 0x79, 0x9a, 0x05, 0x4b, 0xef, 0x8c, 0x83, 0x9f, 0x4d, 0x91, 0x16,
+	0x11, 0xa3, 0x3f, 0x66, 0x31, 0xf1, 0x7c, 0x1a, 0xfb, 0xaf, 0xa4, 0xbc, 0x2a, 0xe4, 0x73, 0x97,
+	0xfa, 0x92, 0xc1, 0x3c, 0xa3, 0xa3, 0xc7, 0x70, 0xa3, 0xc4, 0x3e, 0x55, 0x21, 0x53, 0x71, 0x53,
+	0x1c, 0xd2, 0x76, 0x89, 0x21, 0xd7, 0x20, 0x13, 0xb2, 0x0b, 0xcb, 0x13, 0x96, 0x52, 0x8f, 0xa6,
+	0x54, 0xab, 0x8b, 0xeb, 0xbf, 0xff, 0xf6, 0x17, 0xa9, 0x93, 0x4b, 0xe2, 0xa9, 0x0e, 0x74, 0x1d,
+	0x6a, 0x93, 0xd0, 0x63, 0x63, 0x6d, 0x4d, 0xa4, 0xa0, 0x5c, 0xa0, 0x3b, 0xb0, 0x9a, 0x25, 0x8c,
+	0xb0, 0xe0, 0x84, 0x5f, 0x7e, 0x4f, 0x5b, 0x17, 0x1e, 0xad, 0x64, 0x09, 0xb3, 0x72, 0x48, 0xff,
+	0xb9, 0x02, 0x6b, 0xe7, 0x6e, 0x24, 0xd2, 0xe0, 0xba, 0xd5, 0x35, 0x1c, 0xd3, 0xee, 0x3e, 0x21,
+	0x47, 0xdd, 0x7e, 0xcf, 0x32, 0xec, 0x43, 0xdb, 0x32, 0xd5, 0x6b, 0x68, 0x15, 0x96, 0xdb, 0x76,
+	0xd7, 0x6a, 0xe2, 0x87, 0x5f, 0xa8, 0x0a, 0x5a, 0x86, 0x85, 0xc3, 0x76, 0xd3, 0x50, 0x2b, 0xa8,
+	0x0e, 0xb5, 0xce, 0x51, 0xbb, 0xf9, 0x4c, 0xad, 0xa2, 0x25, 0xa8, 0x36, 0x3b, 0x58, 0x5d, 0x40,
+	0x00, 0x8b, 0xcd, 0x0e, 0x26, 0xcf, 0x0e, 0xd4, 0x1a, 0x97, 0x73, 0x9e, 0x3c, 0x21, 0x4e, 0xef,
+	0xa8, 0xaf, 0x2e, 0xa2, 0x1d, 0x78, 0xbf, 0xdf, 0xb3, 0xac, 0x1f, 0x91, 0x67, 0xf6, 0xa0, 0x45,
+	0x5a, 0x56, 0xd3, 0xb4, 0x30, 0x39, 0x78, 0x3e, 0xb0, 0xd4, 0x25, 0xfd, 0x5f, 0x75, 0xd8, 0xba,
+	0xc0, 0x51, 0x34, 0x01, 0x55, 0xd4, 0x27, 0xea, 0x8a, 0x50, 0xa7, 0xa7, 0x11, 0xcb, 0xeb, 0xcf,
+	0xc1, 0xbb, 0x87, 0xad, 0x61, 0x9f, 0xa9, 0x1a, 0x9c, 0x46, 0x0c, 0x6f, 0xf8, 0xe7, 0x01, 0xf4,
+	0x35, 0xec, 0xfa, 0x81, 0x97, 0x25, 0x69, 0x7c, 0x4a, 0x02, 0xea, 0xbb, 0x89, 0xb8, 0xad, 0x24,
+	0x1c, 0x12, 0xf9, 0xb2, 0xf1, 0x7b, 0xbe, 0x86, 0xb5, 0x82, 0xa7, 0xcb, 0x59, 0xf8, 0x7d, 0x75,
+	0x86, 0x22, 0x94, 0xe8, 0x05, 0x6c, 0x4d, 0x7c, 0x37, 0x0e, 0xa3, 0x93, 0x30, 0x60, 0xc4, 0xf3,
+	0x93, 0x54, 0xd4, 0xe4, 0x05, 0x61, 0xb1, 0x75, 0x05, 0x8b, 0x3b, 0x53, 0x6d, 0x66, 0xae, 0x0c,
+	0xa3, 0xc9, 0x1c, 0x86, 0x52, 0xd8, 0x0a, 0x63, 0x7f, 0xe4, 0x07, 0x74, 0x4c, 0x26, 0xcc, 0xf3,
+	0xa9, 0x8c, 0x54, 0x4d, 0xec, 0x6b, 0x5e, 0x61, 0x5f, 0x27, 0xd7, 0xd6, 0xe1, 0xca, 0x44, 0xac,
+	0x36, 0xc3, 0x59, 0x08, 0xbd, 0x82, 0xf7, 0x78, 0x31, 0x8d, 0x79, 0xf6, 0x10, 0x8f, 0xbd, 0xf0,
+	0x5d, 0x26, 0xf7, 0x5d, 0x14, 0xfb, 0x1e, 0x5e, 0x61, 0x5f, 0x5c, 0xe8, 0x33, 0x85, 0x3a, 0xb1,
+	0xf3, 0x56, 0x3c, 0x0f, 0xa2, 0xfd, 0x0b, 0xf6, 0x0e, 0xe8, 0x84, 0x89, 0xa7, 0xa0, 0x3e, 0x27,
+	0xd3, 0xa5, 0x13, 0x86, 0x3e, 0x03, 0x74, 0x16, 0x25, 0x5e, 0xa3, 0x84, 0xb1, 0xcb, 0x42, 0x40,
+	0x9d, 0xba, 0xe7, 0x4f, 0xe4, 0x0e, 0x77, 0x61, 0x2d, 0x3c, 0x1e, 0x66, 0x89, 0x4b, 0x53, 0xe6,
+	0x11, 0xdf, 0x13, 0xd7, 0xb5, 0x8a, 0x57, 0xcf, 0x40, 0xdb, 0x43, 0xb7, 0x60, 0x45, 0xbe, 0x47,
+	0x69, 0x18, 0xf9, 0xae, 0x06, 0x42, 0x17, 0x08, 0x68, 0xc0, 0x11, 0xfd, 0x8f, 0x0a, 0x6c, 0xcc,
+	0xa4, 0x1d, 0xba, 0x0d, 0xbb, 0x76, 0x77, 0x60, 0xe1, 0xa6, 0x31, 0xb0, 0x9d, 0x2e, 0x19, 0x3c,
+	0xef, 0x59, 0x33, 0x17, 0x6e, 0x1d, 0xc0, 0xb4, 0xfb, 0xc6, 0x51, 0xbf, 0x6f, 0x3b, 0x5d, 0x55,
+	0x41, 0x2a, 0xac, 0xf6, 0xb0, 0xd5, 0xb7, 0xba, 0x83, 0x26, 0x17, 0x51, 0x2b, 0x9c, 0xa3, 0xd7,
+	0x72, 0xba, 0x16, 0x31, 0x9a, 0xed, 0xb6, 0x5a, 0x45, 0x6b, 0x50, 0x7f, 0xea, 0xd8, 0x86, 0xd5,
+	0x69, 0xda, 0x6d, 0x75, 0x01, 0xdd, 0x84, 0xed, 0x1e, 0x76, 0x0e, 0x2d, 0xa1, 0xa0, 0xd9, 0x6e,
+	0x3f, 0x27, 0x3d, 0xec, 0x98, 0x47, 0x86, 0x65, 0xaa, 0x35, 0xae, 0x4d, 0xf0, 0x92, 0xbe, 0xd5,
+	0xc4, 0x46, 0x4b, 0x5d, 0x44, 0x9b, 0xb0, 0x26, 0x11, 0xc3, 0xe9, 0x74, 0x9a, 0x5d, 0x53, 0x5d,
+	0xe2, 0x0a, 0x4d, 0xdb, 0xc8, 0xf7, 0x5b, 0xd6, 0x3d, 0x40, 0xf3, 0xb9, 0x88, 0xee, 0xc2, 0xad,
+	0x8e, 0x6d, 0x60, 0x47, 0x9a, 0x62, 0xda, 0xfd, 0x41, 0xb3, 0x6b, 0xcc, 0x3a, 0xb3, 0x06, 0x75,
+	0x5e, 0x3b, 0x0e, 0x6d, 0xab, 0x6d, 0xaa, 0x0a, 0x2f, 0x0a, 0x1d, 0xdb, 0x94, 0xab, 0x0a, 0x5f,
+	0x1d, 0x16, 0xb4, 0xaa, 0xde, 0x85, 0xcd, 0xb9, 0xcc, 0xe3, 0x9b, 0x38, 0xd8, 0x7e, 0x62, 0x77,
+	0x9b, 0x6d, 0xd2, 0xb1, 0x4c, 0xbb, 0x79, 0x51, 0xc4, 0xea, 0x50, 0x6b, 0x1e, 0x99, 0xb6, 0xa3,
+	0x2a, 0xfc, 0xf3, 0xa9, 0x6d, 0x5a, 0x8e, 0x5a, 0xd1, 0xbf, 0x55, 0x64, 0x59, 0x99, 0xcd, 0x9e,
+	0x8f, 0xe0, 0x0e, 0xb6, 0x0c, 0x07, 0x8b, 0x5a, 0x67, 0x5a, 0x4f, 0xb9, 0xeb, 0x17, 0x1f, 0x43,
+	0xbf, 0xd3, 0xc4, 0x03, 0xe1, 0x9e, 0xaa, 0xa0, 0x45, 0xa8, 0xf4, 0x8c, 0x72, 0xf0, 0x79, 0x55,
+	0x54, 0xab, 0x68, 0x05, 0x96, 0x9e, 0x5a, 0x2d, 0xdb, 0x68, 0x5b, 0xea, 0x02, 0x2f, 0xa3, 0xce,
+	0xa0, 0x65, 0x61, 0xe2, 0x1c, 0x0d, 0x4c, 0xc7, 0xc1, 0xb9, 0x7e, 0xb5, 0x86, 0xb6, 0x61, 0x4b,
+	0x52, 0xec, 0x6e, 0x99, 0xb0, 0xa8, 0x7f, 0x02, 0x6b, 0xe7, 0x1e, 0x58, 0xa4, 0xc1, 0x52, 0x74,
+	0x12, 0xd3, 0x84, 0x25, 0x9a, 0x22, 0x1a, 0x85, 0x62, 0xa9, 0xe3, 0xe9, 0xcc, 0x31, 0x6d, 0x9c,
+	0xd1, 0x0e, 0x2c, 0x15, 0x5d, 0xaa, 0x92, 0x77, 0xa9, 0x05, 0x80, 0x10, 0x54, 0xb3, 0xd8, 0x17,
+	0xed, 0x54, 0xbd, 0x75, 0x0d, 0xf3, 0xc5, 0xc1, 0x3a, 0xc8, 0x26, 0x96, 0x24, 0x61, 0x16, 0xbb,
+	0x4c, 0x67, 0xd3, 0x8e, 0x8f, 0xf7, 0xd9, 0x49, 0x14, 0x06, 0x09, 0x43, 0x3d, 0x58, 0x2a, 0x1a,
+	0xc5, 0x8a, 0x68, 0x11, 0xbe, 0x78, 0xab, 0x16, 0xa1, 0x64, 0x9c, 0xec, 0x28, 0x71, 0xa1, 0x46,
+	0x8f, 0x60, 0xf7, 0xe2, 0x41, 0xe4, 0x3b, 0xdb, 0xf1, 0x4f, 0xca, 0xc5, 0x5b, 0x4e, 0x9f, 0x17,
+	0xd9, 0x3a, 0x8d, 0x62, 0x96, 0x24, 0xbc, 0x17, 0x74, 0x8b, 0x10, 0xd6, 0x44, 0xeb, 0x24, 0xf0,
+	0x9e, 0x84, 0xd1, 0x23, 0x80, 0x24, 0xa5, 0x71, 0x2a, 0xba, 0x9b, 0x7c, 0xc4, 0xd9, 0x29, 0x0c,
+	0x2c, 0x86, 0xc7, 0xc6, 0xa0, 0x18, 0x1e, 0x71, 0x5d, 0x70, 0xf3, 0x35, 0x32, 0x41, 0x1d, 0xd3,
+	0x24, 0x25, 0x59, 0xe4, 0xf1, 0x06, 0x54, 0x28, 0xa8, 0x5e, 0xaa, 0x60, 0x9d, 0xcb, 0x1c, 0x09,
+	0x11, 0x0e, 0xea, 0x7f, 0xab, 0xcc, 0x4f, 0x15, 0xa5, 0xe8, 0xdd, 0x87, 0x1a, 0x8b, 0xe3, 0x30,
+	0xce, 0x87, 0x0a, 0x54, 0x68, 0x8e, 0x23, 0xb7, 0xd1, 0x17, 0x63, 0x2b, 0x96, 0x0c, 0xa8, 0x3f,
+	0x1b, 0xe7, 0xab, 0x4c, 0x4e, 0x33, 0xa1, 0x46, 0x19, 0x6c, 0xe6, 0x9d, 0x25, 0x7b, 0xc1, 0x82,
+	0x54, 0x96, 0x56, 0xf9, 0xee, 0xd9, 0xef, 0xa8, 0xfe, 0xcc, 0xa9, 0xfc, 0x84, 0x2d, 0xae, 0x51,
+	0x3e, 0xd8, 0xc9, 0x79, 0x40, 0x6f, 0xc3, 0xc6, 0x0c, 0x0f, 0xda, 0x05, 0x8d, 0xb7, 0x19, 0x46,
+	0x8b, 0x58, 0x4f, 0xad, 0xee, 0x60, 0xe6, 0x4a, 0xdf, 0x84, 0x6d, 0xab, 0x6b, 0x12, 0xe7, 0x90,
+	0xf4, 0xed, 0xee, 0x93, 0xb6, 0x45, 0x8e, 0x06, 0xbc, 0x12, 0x77, 0x0d, 0x4b, 0x55, 0xf4, 0x7f,
+	0xbf, 0x66, 0x70, 0x93, 0xce, 0x22, 0x02, 0xab, 0xe7, 0xfa, 0x71, 0x45, 0x44, 0xef, 0xab, 0x77,
+	0xcd, 0xd2, 0x52, 0xf3, 0x8e, 0xcf, 0x29, 0x44, 0x37, 0x60, 0xd9, 0x4f, 0xc8, 0x90, 0x97, 0xbf,
+	0x7c, 0x8e, 0x5b, 0xf2, 0x93, 0x43, 0xbe, 0x44, 0xbb, 0xc0, 0x13, 0xea, 0xd8, 0x1f, 0xfb, 0xe9,
+	0xa9, 0x48, 0x9e, 0x0a, 0x3e, 0x03, 0xf8, 0x33, 0x54, 0x0c, 0x44, 0x29, 0x1d, 0x89, 0x77, 0xbf,
+	0x86, 0x21, 0x87, 0x06, 0x74, 0x34, 0x3f, 0xb1, 0x2c, 0xce, 0x4f, 0x2c, 0xfa, 0x1f, 0x14, 0xd8,
+	0x7e, 0xcd, 0x9d, 0xfa, 0xee, 0x7d, 0x9f, 0x71, 0xa1, 0x72, 0xb9, 0x0b, 0xb5, 0x0b, 0x5c, 0xf8,
+	0xb5, 0x02, 0xbb, 0x6f, 0xda, 0x14, 0x7d, 0x08, 0x90, 0xc6, 0x34, 0x48, 0xdc, 0xd8, 0x8f, 0xe4,
+	0x5d, 0xaf, 0xe3, 0x12, 0xc2, 0xe9, 0xa5, 0x29, 0xa4, 0x22, 0x02, 0x5d, 0x42, 0xd0, 0x0f, 0xa0,
+	0xc6, 0x47, 0x15, 0x3e, 0x3d, 0xf3, 0x00, 0xdc, 0xbb, 0x24, 0x00, 0x7c, 0x72, 0xb1, 0x83, 0x61,
+	0x88, 0xa5, 0x94, 0xfe, 0x67, 0x05, 0x96, 0x0b, 0x0c, 0x7d, 0x79, 0xae, 0xa4, 0xc8, 0x7b, 0x7b,
+	0x63, 0xae, 0x22, 0x98, 0xf9, 0xff, 0xaa, 0x72, 0x45, 0xf9, 0x9c, 0x8f, 0xe3, 0x5e, 0xb9, 0x14,
+	0xbd, 0x41, 0x6e, 0x89, 0x05, 0x62, 0xe8, 0x42, 0x08, 0x16, 0xb8, 0x15, 0xf9, 0xb4, 0x2a, 0xbe,
+	0x67, 0xfc, 0x5d, 0x98, 0xf3, 0xf7, 0x16, 0xac, 0x14, 0xf3, 0x4d, 0x29, 0xb3, 0x72, 0x68, 0x40,
+	0x47, 0xfb, 0x7f, 0xad, 0xc2, 0xa2, 0x8c, 0x38, 0xfa, 0x95, 0x02, 0xf5, 0xe9, 0x1d, 0x46, 0x6f,
+	0xf9, 0xff, 0x67, 0xfa, 0x6b, 0x67, 0xe7, 0xc1, 0xdb, 0x0b, 0xc8, 0xf2, 0xa0, 0x7f, 0xfc, 0xb3,
+	0xbf, 0xfc, 0xfd, 0x97, 0x95, 0xdb, 0xfa, 0xcd, 0xd2, 0xff, 0x47, 0x29, 0xf6, 0x38, 0x2e, 0x98,
+	0x1f, 0x2b, 0x9f, 0xa2, 0x6f, 0x15, 0xb8, 0x7e, 0xd1, 0x3b, 0x80, 0x1e, 0x5f, 0xb2, 0xe5, 0x1b,
+	0x7e, 0x9c, 0xed, 0x7c, 0x50, 0xc8, 0x96, 0xfe, 0x4c, 0x36, 0x9c, 0xe2, 0xcf, 0xa4, 0xfe, 0x50,
+	0xd8, 0xf6, 0x7f, 0xfa, 0xc7, 0xf3, 0xb6, 0x95, 0x04, 0xce, 0x99, 0xf9, 0x0b, 0x05, 0xd0, 0x7c,
+	0x31, 0x44, 0x5f, 0x5e, 0xa1, 0x7e, 0x4a, 0x13, 0x1f, 0x5d, 0xb9, 0xf2, 0xde, 0x57, 0x1e, 0x28,
+	0x07, 0xaf, 0xe0, 0x8e, 0x1b, 0x4e, 0xde, 0xac, 0xe3, 0x60, 0x45, 0x1e, 0x7e, 0x8f, 0xa7, 0x5d,
+	0x4f, 0xf9, 0xc6, 0xc8, 0xb9, 0x47, 0x21, 0xbf, 0x97, 0x8d, 0x30, 0x1e, 0xed, 0x8d, 0x58, 0x20,
+	0x92, 0x72, 0x4f, 0x92, 0x68, 0xe4, 0x27, 0xaf, 0xf9, 0x79, 0xfc, 0x95, 0x04, 0xfe, 0xa9, 0x28,
+	0xc7, 0x8b, 0x42, 0xe4, 0xff, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0x9d, 0xbc, 0xd0, 0x68, 0x6e,
+	0x16, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/support/common/common.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/support/common/common.pb.go
index b9bbfb86..22e273ba 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/support/common/common.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/support/common/common.pb.go
@@ -1,27 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/support/common.proto
 
-/*
-Package common is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/support/common.proto
-
-It has these top-level messages:
-	SupportAccount
-	Case
-	CustomerIssue
-	SupportRole
-	Comment
-	IssueTaxonomy
-*/
-package common
+package common // import "google.golang.org/genproto/googleapis/cloud/support/common"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -64,7 +50,9 @@ var SupportAccount_State_value = map[string]int32{
 func (x SupportAccount_State) String() string {
 	return proto.EnumName(SupportAccount_State_name, int32(x))
 }
-func (SupportAccount_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (SupportAccount_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{0, 0}
+}
 
 // Pricing model applicable to this support account.
 type SupportAccount_PricingModel int32
@@ -94,7 +82,7 @@ func (x SupportAccount_PricingModel) String() string {
 	return proto.EnumName(SupportAccount_PricingModel_name, int32(x))
 }
 func (SupportAccount_PricingModel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 1}
+	return fileDescriptor_common_f17357843abc5917, []int{0, 1}
 }
 
 // The case priority with P0 being the most urgent and P4 the least.
@@ -138,7 +126,9 @@ var Case_Priority_value = map[string]int32{
 func (x Case_Priority) String() string {
 	return proto.EnumName(Case_Priority_name, int32(x))
 }
-func (Case_Priority) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (Case_Priority) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{1, 0}
+}
 
 // The state of a case.
 type Case_State int32
@@ -190,7 +180,9 @@ var Case_State_value = map[string]int32{
 func (x Case_State) String() string {
 	return proto.EnumName(Case_State_name, int32(x))
 }
-func (Case_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 1} }
+func (Case_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{1, 1}
+}
 
 // The status of a customer issue.
 type CustomerIssue_IssueState int32
@@ -230,7 +222,9 @@ var CustomerIssue_IssueState_value = map[string]int32{
 func (x CustomerIssue_IssueState) String() string {
 	return proto.EnumName(CustomerIssue_IssueState_name, int32(x))
 }
-func (CustomerIssue_IssueState) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (CustomerIssue_IssueState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{2, 0}
+}
 
 // A role which determines the support resources and features a user might
 // get access to.
@@ -267,7 +261,9 @@ var SupportRole_Role_value = map[string]int32{
 func (x SupportRole_Role) String() string {
 	return proto.EnumName(SupportRole_Role_name, int32(x))
 }
-func (SupportRole_Role) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 0} }
+func (SupportRole_Role) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{3, 0}
+}
 
 // A Google Cloud Platform account that identifies support eligibility for a
 // Cloud resource. Currently the Cloud resource can only be an Organization
@@ -276,32 +272,54 @@ type SupportAccount struct {
 	// The resource name for a support account in format
 	// `supportAccounts/{account_id}`.
 	// Output only.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Identifier for this entity that gets persisted in storage system. The
 	// resource name is populated using this field in format
 	// `supportAccounts/{account_id}`.
-	AccountId string `protobuf:"bytes,2,opt,name=account_id,json=accountId" json:"account_id,omitempty"`
+	AccountId string `protobuf:"bytes,2,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"`
 	// The Cloud resource with which this support account is associated.
-	CloudResource string `protobuf:"bytes,3,opt,name=cloud_resource,json=cloudResource" json:"cloud_resource,omitempty"`
+	CloudResource string `protobuf:"bytes,3,opt,name=cloud_resource,json=cloudResource,proto3" json:"cloud_resource,omitempty"`
 	// A user friendly display name assigned to this support account.
-	DisplayName string `protobuf:"bytes,4,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,4,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Indicates the current state of an account.
-	State SupportAccount_State `protobuf:"varint,5,opt,name=state,enum=google.cloud.support.common.SupportAccount_State" json:"state,omitempty"`
+	State SupportAccount_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.cloud.support.common.SupportAccount_State" json:"state,omitempty"`
 	// Time when this account was created.
 	// Output only.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The resource name of a billing account associated with this support
 	// account. For example, `billingAccounts/ABCDEF-012345-567890`.
-	BillingAccountName string `protobuf:"bytes,7,opt,name=billing_account_name,json=billingAccountName" json:"billing_account_name,omitempty"`
-	UnifyAccountId     string `protobuf:"bytes,8,opt,name=unify_account_id,json=unifyAccountId" json:"unify_account_id,omitempty"`
+	BillingAccountName string `protobuf:"bytes,7,opt,name=billing_account_name,json=billingAccountName,proto3" json:"billing_account_name,omitempty"`
+	UnifyAccountId     string `protobuf:"bytes,8,opt,name=unify_account_id,json=unifyAccountId,proto3" json:"unify_account_id,omitempty"`
 	// The PricingModel applicable to this support account.
-	PricingModel SupportAccount_PricingModel `protobuf:"varint,9,opt,name=pricing_model,json=pricingModel,enum=google.cloud.support.common.SupportAccount_PricingModel" json:"pricing_model,omitempty"`
+	PricingModel         SupportAccount_PricingModel `protobuf:"varint,9,opt,name=pricing_model,json=pricingModel,proto3,enum=google.cloud.support.common.SupportAccount_PricingModel" json:"pricing_model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *SupportAccount) Reset()         { *m = SupportAccount{} }
+func (m *SupportAccount) String() string { return proto.CompactTextString(m) }
+func (*SupportAccount) ProtoMessage()    {}
+func (*SupportAccount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{0}
+}
+func (m *SupportAccount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SupportAccount.Unmarshal(m, b)
+}
+func (m *SupportAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SupportAccount.Marshal(b, m, deterministic)
+}
+func (dst *SupportAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SupportAccount.Merge(dst, src)
+}
+func (m *SupportAccount) XXX_Size() int {
+	return xxx_messageInfo_SupportAccount.Size(m)
+}
+func (m *SupportAccount) XXX_DiscardUnknown() {
+	xxx_messageInfo_SupportAccount.DiscardUnknown(m)
 }
 
-func (m *SupportAccount) Reset()                    { *m = SupportAccount{} }
-func (m *SupportAccount) String() string            { return proto.CompactTextString(m) }
-func (*SupportAccount) ProtoMessage()               {}
-func (*SupportAccount) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_SupportAccount proto.InternalMessageInfo
 
 func (m *SupportAccount) GetName() string {
 	if m != nil {
@@ -338,7 +356,7 @@ func (m *SupportAccount) GetState() SupportAccount_State {
 	return SupportAccount_STATE_UNSPECIFIED
 }
 
-func (m *SupportAccount) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *SupportAccount) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
@@ -370,47 +388,69 @@ func (m *SupportAccount) GetPricingModel() SupportAccount_PricingModel {
 type Case struct {
 	// The resource name for the Case in format
 	// `supportAccounts/{account_id}/cases/{case_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The short summary of the issue reported in this case.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// The board description of issue provided with initial summary.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// The product component for which this Case is reported.
-	Component string `protobuf:"bytes,4,opt,name=component" json:"component,omitempty"`
+	Component string `protobuf:"bytes,4,opt,name=component,proto3" json:"component,omitempty"`
 	// The product subcomponent for which this Case is reported.
-	Subcomponent string `protobuf:"bytes,5,opt,name=subcomponent" json:"subcomponent,omitempty"`
+	Subcomponent string `protobuf:"bytes,5,opt,name=subcomponent,proto3" json:"subcomponent,omitempty"`
 	// Timezone the client sending this request is in.
 	// It should be in a format IANA recognizes: https://www.iana.org/time-zone
 	// There is no additional validation done by the API.
-	ClientTimezone string `protobuf:"bytes,6,opt,name=client_timezone,json=clientTimezone" json:"client_timezone,omitempty"`
+	ClientTimezone string `protobuf:"bytes,6,opt,name=client_timezone,json=clientTimezone,proto3" json:"client_timezone,omitempty"`
 	// The email addresses that can be copied to receive updates on this case.
 	// Users can specify a maximum of 10 email addresses.
-	CcAddresses []string `protobuf:"bytes,7,rep,name=cc_addresses,json=ccAddresses" json:"cc_addresses,omitempty"`
+	CcAddresses []string `protobuf:"bytes,7,rep,name=cc_addresses,json=ccAddresses,proto3" json:"cc_addresses,omitempty"`
 	// The Google Cloud Platform project ID for which this case is created.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// List of customer issues associated with this case.
-	Issues []*CustomerIssue `protobuf:"bytes,10,rep,name=issues" json:"issues,omitempty"`
+	Issues []*CustomerIssue `protobuf:"bytes,10,rep,name=issues,proto3" json:"issues,omitempty"`
 	// The current priority of this case.
-	Priority Case_Priority `protobuf:"varint,11,opt,name=priority,enum=google.cloud.support.common.Case_Priority" json:"priority,omitempty"`
+	Priority Case_Priority `protobuf:"varint,11,opt,name=priority,proto3,enum=google.cloud.support.common.Case_Priority" json:"priority,omitempty"`
 	// The current state of this case.
-	State Case_State `protobuf:"varint,12,opt,name=state,enum=google.cloud.support.common.Case_State" json:"state,omitempty"`
+	State Case_State `protobuf:"varint,12,opt,name=state,proto3,enum=google.cloud.support.common.Case_State" json:"state,omitempty"`
 	// Time when this case was created.
 	// Output only.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time when this case was last updated.
 	// Output only.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,14,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Email address of user who created this case.
 	// Output only. It is inferred from credentials supplied during case creation.
-	CreatorEmail string `protobuf:"bytes,15,opt,name=creator_email,json=creatorEmail" json:"creator_email,omitempty"`
+	CreatorEmail string `protobuf:"bytes,15,opt,name=creator_email,json=creatorEmail,proto3" json:"creator_email,omitempty"`
 	// The issue category applicable to this case.
-	Category string `protobuf:"bytes,16,opt,name=category" json:"category,omitempty"`
+	Category             string   `protobuf:"bytes,16,opt,name=category,proto3" json:"category,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Case) Reset()         { *m = Case{} }
+func (m *Case) String() string { return proto.CompactTextString(m) }
+func (*Case) ProtoMessage()    {}
+func (*Case) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{1}
+}
+func (m *Case) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Case.Unmarshal(m, b)
+}
+func (m *Case) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Case.Marshal(b, m, deterministic)
+}
+func (dst *Case) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Case.Merge(dst, src)
+}
+func (m *Case) XXX_Size() int {
+	return xxx_messageInfo_Case.Size(m)
+}
+func (m *Case) XXX_DiscardUnknown() {
+	xxx_messageInfo_Case.DiscardUnknown(m)
 }
 
-func (m *Case) Reset()                    { *m = Case{} }
-func (m *Case) String() string            { return proto.CompactTextString(m) }
-func (*Case) ProtoMessage()               {}
-func (*Case) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Case proto.InternalMessageInfo
 
 func (m *Case) GetName() string {
 	if m != nil {
@@ -489,14 +529,14 @@ func (m *Case) GetState() Case_State {
 	return Case_STATE_UNSPECIFIED
 }
 
-func (m *Case) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *Case) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Case) GetUpdateTime() *google_protobuf1.Timestamp {
+func (m *Case) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -523,25 +563,47 @@ func (m *Case) GetCategory() string {
 type CustomerIssue struct {
 	// Unique identifier for the internal issue.
 	// Output only.
-	IssueId string `protobuf:"bytes,1,opt,name=issue_id,json=issueId" json:"issue_id,omitempty"`
+	IssueId string `protobuf:"bytes,1,opt,name=issue_id,json=issueId,proto3" json:"issue_id,omitempty"`
 	// Represents current status of the internal ticket.
 	// Output only.
-	State CustomerIssue_IssueState `protobuf:"varint,2,opt,name=state,enum=google.cloud.support.common.CustomerIssue_IssueState" json:"state,omitempty"`
+	State CustomerIssue_IssueState `protobuf:"varint,2,opt,name=state,proto3,enum=google.cloud.support.common.CustomerIssue_IssueState" json:"state,omitempty"`
 	// Time when the internal issue was created.
 	// Output only.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time when the internal issue was marked as resolved.
 	// Output only.
-	ResolveTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=resolve_time,json=resolveTime" json:"resolve_time,omitempty"`
+	ResolveTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=resolve_time,json=resolveTime,proto3" json:"resolve_time,omitempty"`
 	// Time when the internal issue was last updated.
 	// Output only.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *CustomerIssue) Reset()         { *m = CustomerIssue{} }
+func (m *CustomerIssue) String() string { return proto.CompactTextString(m) }
+func (*CustomerIssue) ProtoMessage()    {}
+func (*CustomerIssue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{2}
+}
+func (m *CustomerIssue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomerIssue.Unmarshal(m, b)
+}
+func (m *CustomerIssue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomerIssue.Marshal(b, m, deterministic)
+}
+func (dst *CustomerIssue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomerIssue.Merge(dst, src)
+}
+func (m *CustomerIssue) XXX_Size() int {
+	return xxx_messageInfo_CustomerIssue.Size(m)
+}
+func (m *CustomerIssue) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomerIssue.DiscardUnknown(m)
 }
 
-func (m *CustomerIssue) Reset()                    { *m = CustomerIssue{} }
-func (m *CustomerIssue) String() string            { return proto.CompactTextString(m) }
-func (*CustomerIssue) ProtoMessage()               {}
-func (*CustomerIssue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_CustomerIssue proto.InternalMessageInfo
 
 func (m *CustomerIssue) GetIssueId() string {
 	if m != nil {
@@ -557,21 +619,21 @@ func (m *CustomerIssue) GetState() CustomerIssue_IssueState {
 	return CustomerIssue_ISSUE_STATE_UNSPECIFIED
 }
 
-func (m *CustomerIssue) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *CustomerIssue) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *CustomerIssue) GetResolveTime() *google_protobuf1.Timestamp {
+func (m *CustomerIssue) GetResolveTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ResolveTime
 	}
 	return nil
 }
 
-func (m *CustomerIssue) GetUpdateTime() *google_protobuf1.Timestamp {
+func (m *CustomerIssue) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -582,15 +644,37 @@ func (m *CustomerIssue) GetUpdateTime() *google_protobuf1.Timestamp {
 // account.
 type SupportRole struct {
 	// Email address of user being added through this Role.
-	Email string `protobuf:"bytes,1,opt,name=email" json:"email,omitempty"`
+	Email string `protobuf:"bytes,1,opt,name=email,proto3" json:"email,omitempty"`
 	// The type of role assigned to user.
-	Role SupportRole_Role `protobuf:"varint,2,opt,name=role,enum=google.cloud.support.common.SupportRole_Role" json:"role,omitempty"`
+	Role                 SupportRole_Role `protobuf:"varint,2,opt,name=role,proto3,enum=google.cloud.support.common.SupportRole_Role" json:"role,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *SupportRole) Reset()                    { *m = SupportRole{} }
-func (m *SupportRole) String() string            { return proto.CompactTextString(m) }
-func (*SupportRole) ProtoMessage()               {}
-func (*SupportRole) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *SupportRole) Reset()         { *m = SupportRole{} }
+func (m *SupportRole) String() string { return proto.CompactTextString(m) }
+func (*SupportRole) ProtoMessage()    {}
+func (*SupportRole) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{3}
+}
+func (m *SupportRole) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SupportRole.Unmarshal(m, b)
+}
+func (m *SupportRole) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SupportRole.Marshal(b, m, deterministic)
+}
+func (dst *SupportRole) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SupportRole.Merge(dst, src)
+}
+func (m *SupportRole) XXX_Size() int {
+	return xxx_messageInfo_SupportRole.Size(m)
+}
+func (m *SupportRole) XXX_DiscardUnknown() {
+	xxx_messageInfo_SupportRole.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SupportRole proto.InternalMessageInfo
 
 func (m *SupportRole) GetEmail() string {
 	if m != nil {
@@ -609,23 +693,45 @@ func (m *SupportRole) GetRole() SupportRole_Role {
 // The comment text associated with a `Case`.
 type Comment struct {
 	// Text containing a maximum of 3000 characters.
-	Text string `protobuf:"bytes,1,opt,name=text" json:"text,omitempty"`
+	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// Time when this update was created.
 	// Output only.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The email address/name of user who created this comment.
 	// Output only.
-	Author string `protobuf:"bytes,3,opt,name=author" json:"author,omitempty"`
+	Author string `protobuf:"bytes,3,opt,name=author,proto3" json:"author,omitempty"`
 	// The resource name for this comment in format
 	// `supportAccounts/{account_id}/cases/{case_id}/{comment_id}`.
 	// Output only.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Comment) Reset()         { *m = Comment{} }
+func (m *Comment) String() string { return proto.CompactTextString(m) }
+func (*Comment) ProtoMessage()    {}
+func (*Comment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{4}
+}
+func (m *Comment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Comment.Unmarshal(m, b)
+}
+func (m *Comment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Comment.Marshal(b, m, deterministic)
+}
+func (dst *Comment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Comment.Merge(dst, src)
+}
+func (m *Comment) XXX_Size() int {
+	return xxx_messageInfo_Comment.Size(m)
+}
+func (m *Comment) XXX_DiscardUnknown() {
+	xxx_messageInfo_Comment.DiscardUnknown(m)
 }
 
-func (m *Comment) Reset()                    { *m = Comment{} }
-func (m *Comment) String() string            { return proto.CompactTextString(m) }
-func (*Comment) ProtoMessage()               {}
-func (*Comment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_Comment proto.InternalMessageInfo
 
 func (m *Comment) GetText() string {
 	if m != nil {
@@ -634,7 +740,7 @@ func (m *Comment) GetText() string {
 	return ""
 }
 
-func (m *Comment) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *Comment) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
@@ -661,13 +767,35 @@ func (m *Comment) GetName() string {
 // `Case.component` and `Case.subcomponent` fields respectively.
 type IssueTaxonomy struct {
 	// Map of available categories.
-	Categories map[string]*IssueTaxonomy_Category `protobuf:"bytes,1,rep,name=categories" json:"categories,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Categories           map[string]*IssueTaxonomy_Category `protobuf:"bytes,1,rep,name=categories,proto3" json:"categories,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
 }
 
-func (m *IssueTaxonomy) Reset()                    { *m = IssueTaxonomy{} }
-func (m *IssueTaxonomy) String() string            { return proto.CompactTextString(m) }
-func (*IssueTaxonomy) ProtoMessage()               {}
-func (*IssueTaxonomy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *IssueTaxonomy) Reset()         { *m = IssueTaxonomy{} }
+func (m *IssueTaxonomy) String() string { return proto.CompactTextString(m) }
+func (*IssueTaxonomy) ProtoMessage()    {}
+func (*IssueTaxonomy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{5}
+}
+func (m *IssueTaxonomy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IssueTaxonomy.Unmarshal(m, b)
+}
+func (m *IssueTaxonomy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IssueTaxonomy.Marshal(b, m, deterministic)
+}
+func (dst *IssueTaxonomy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssueTaxonomy.Merge(dst, src)
+}
+func (m *IssueTaxonomy) XXX_Size() int {
+	return xxx_messageInfo_IssueTaxonomy.Size(m)
+}
+func (m *IssueTaxonomy) XXX_DiscardUnknown() {
+	xxx_messageInfo_IssueTaxonomy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_IssueTaxonomy proto.InternalMessageInfo
 
 func (m *IssueTaxonomy) GetCategories() map[string]*IssueTaxonomy_Category {
 	if m != nil {
@@ -685,20 +813,42 @@ func (m *IssueTaxonomy) GetCategories() map[string]*IssueTaxonomy_Category {
 // (e.g., Google App Engine > Memcache).
 type IssueTaxonomy_Component struct {
 	// User friendly name of this component.
-	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// List of languages in which a support case can be created under this
 	// component. Represented by language codes in ISO_639-1 standard.
-	Languages []string `protobuf:"bytes,2,rep,name=languages" json:"languages,omitempty"`
+	Languages []string `protobuf:"bytes,2,rep,name=languages,proto3" json:"languages,omitempty"`
 	// Template to be used while filling the description of a support case.
-	Template string `protobuf:"bytes,3,opt,name=template" json:"template,omitempty"`
+	Template string `protobuf:"bytes,3,opt,name=template,proto3" json:"template,omitempty"`
 	// List of subcomponents under this component.
-	Subcomponents []*IssueTaxonomy_Component `protobuf:"bytes,4,rep,name=subcomponents" json:"subcomponents,omitempty"`
+	Subcomponents        []*IssueTaxonomy_Component `protobuf:"bytes,4,rep,name=subcomponents,proto3" json:"subcomponents,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *IssueTaxonomy_Component) Reset()                    { *m = IssueTaxonomy_Component{} }
-func (m *IssueTaxonomy_Component) String() string            { return proto.CompactTextString(m) }
-func (*IssueTaxonomy_Component) ProtoMessage()               {}
-func (*IssueTaxonomy_Component) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 0} }
+func (m *IssueTaxonomy_Component) Reset()         { *m = IssueTaxonomy_Component{} }
+func (m *IssueTaxonomy_Component) String() string { return proto.CompactTextString(m) }
+func (*IssueTaxonomy_Component) ProtoMessage()    {}
+func (*IssueTaxonomy_Component) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{5, 0}
+}
+func (m *IssueTaxonomy_Component) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IssueTaxonomy_Component.Unmarshal(m, b)
+}
+func (m *IssueTaxonomy_Component) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IssueTaxonomy_Component.Marshal(b, m, deterministic)
+}
+func (dst *IssueTaxonomy_Component) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssueTaxonomy_Component.Merge(dst, src)
+}
+func (m *IssueTaxonomy_Component) XXX_Size() int {
+	return xxx_messageInfo_IssueTaxonomy_Component.Size(m)
+}
+func (m *IssueTaxonomy_Component) XXX_DiscardUnknown() {
+	xxx_messageInfo_IssueTaxonomy_Component.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_IssueTaxonomy_Component proto.InternalMessageInfo
 
 func (m *IssueTaxonomy_Component) GetDisplayName() string {
 	if m != nil {
@@ -732,15 +882,37 @@ func (m *IssueTaxonomy_Component) GetSubcomponents() []*IssueTaxonomy_Component
 // reported through a support case.
 type IssueTaxonomy_Category struct {
 	// User friendly name of this category.
-	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Map of product components under this category.
-	Components map[string]*IssueTaxonomy_Component `protobuf:"bytes,2,rep,name=components" json:"components,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Components           map[string]*IssueTaxonomy_Component `protobuf:"bytes,2,rep,name=components,proto3" json:"components,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
 }
 
-func (m *IssueTaxonomy_Category) Reset()                    { *m = IssueTaxonomy_Category{} }
-func (m *IssueTaxonomy_Category) String() string            { return proto.CompactTextString(m) }
-func (*IssueTaxonomy_Category) ProtoMessage()               {}
-func (*IssueTaxonomy_Category) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 1} }
+func (m *IssueTaxonomy_Category) Reset()         { *m = IssueTaxonomy_Category{} }
+func (m *IssueTaxonomy_Category) String() string { return proto.CompactTextString(m) }
+func (*IssueTaxonomy_Category) ProtoMessage()    {}
+func (*IssueTaxonomy_Category) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_f17357843abc5917, []int{5, 1}
+}
+func (m *IssueTaxonomy_Category) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IssueTaxonomy_Category.Unmarshal(m, b)
+}
+func (m *IssueTaxonomy_Category) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IssueTaxonomy_Category.Marshal(b, m, deterministic)
+}
+func (dst *IssueTaxonomy_Category) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IssueTaxonomy_Category.Merge(dst, src)
+}
+func (m *IssueTaxonomy_Category) XXX_Size() int {
+	return xxx_messageInfo_IssueTaxonomy_Category.Size(m)
+}
+func (m *IssueTaxonomy_Category) XXX_DiscardUnknown() {
+	xxx_messageInfo_IssueTaxonomy_Category.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_IssueTaxonomy_Category proto.InternalMessageInfo
 
 func (m *IssueTaxonomy_Category) GetDisplayName() string {
 	if m != nil {
@@ -763,8 +935,10 @@ func init() {
 	proto.RegisterType((*SupportRole)(nil), "google.cloud.support.common.SupportRole")
 	proto.RegisterType((*Comment)(nil), "google.cloud.support.common.Comment")
 	proto.RegisterType((*IssueTaxonomy)(nil), "google.cloud.support.common.IssueTaxonomy")
+	proto.RegisterMapType((map[string]*IssueTaxonomy_Category)(nil), "google.cloud.support.common.IssueTaxonomy.CategoriesEntry")
 	proto.RegisterType((*IssueTaxonomy_Component)(nil), "google.cloud.support.common.IssueTaxonomy.Component")
 	proto.RegisterType((*IssueTaxonomy_Category)(nil), "google.cloud.support.common.IssueTaxonomy.Category")
+	proto.RegisterMapType((map[string]*IssueTaxonomy_Component)(nil), "google.cloud.support.common.IssueTaxonomy.Category.ComponentsEntry")
 	proto.RegisterEnum("google.cloud.support.common.SupportAccount_State", SupportAccount_State_name, SupportAccount_State_value)
 	proto.RegisterEnum("google.cloud.support.common.SupportAccount_PricingModel", SupportAccount_PricingModel_name, SupportAccount_PricingModel_value)
 	proto.RegisterEnum("google.cloud.support.common.Case_Priority", Case_Priority_name, Case_Priority_value)
@@ -773,9 +947,11 @@ func init() {
 	proto.RegisterEnum("google.cloud.support.common.SupportRole_Role", SupportRole_Role_name, SupportRole_Role_value)
 }
 
-func init() { proto.RegisterFile("google/cloud/support/common.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/support/common.proto", fileDescriptor_common_f17357843abc5917)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_common_f17357843abc5917 = []byte{
 	// 1336 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x61, 0x6e, 0xdb, 0xc6,
 	0x12, 0x0e, 0x29, 0xc9, 0x92, 0x46, 0x96, 0xbd, 0x59, 0x38, 0x79, 0x8c, 0x92, 0xbc, 0x38, 0x7a,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/support/v1alpha1/cloud_support.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
index 80ae418c..764aa538 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/support/v1alpha1/cloud_support.pb.go
@@ -1,35 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/support/v1alpha1/cloud_support.proto
 
-/*
-Package support is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/support/v1alpha1/cloud_support.proto
-
-It has these top-level messages:
-	GetSupportAccountRequest
-	ListSupportAccountsRequest
-	ListSupportAccountsResponse
-	GetCaseRequest
-	ListCasesRequest
-	ListCasesResponse
-	ListCommentsRequest
-	ListCommentsResponse
-	CreateCaseRequest
-	UpdateCaseRequest
-	CreateCommentRequest
-	GetIssueTaxonomyRequest
-*/
-package support
+package support // import "google.golang.org/genproto/googleapis/cloud/support/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_cloud_support_common "google.golang.org/genproto/googleapis/cloud/support/common"
 import _ "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import common "google.golang.org/genproto/googleapis/cloud/support/common"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -51,13 +31,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type GetSupportAccountRequest struct {
 	// The resource name of the support accounts. For example:
 	// `supportAccounts/accountA`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSupportAccountRequest) Reset()         { *m = GetSupportAccountRequest{} }
+func (m *GetSupportAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSupportAccountRequest) ProtoMessage()    {}
+func (*GetSupportAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{0}
+}
+func (m *GetSupportAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSupportAccountRequest.Unmarshal(m, b)
+}
+func (m *GetSupportAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSupportAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSupportAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSupportAccountRequest.Merge(dst, src)
+}
+func (m *GetSupportAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSupportAccountRequest.Size(m)
+}
+func (m *GetSupportAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSupportAccountRequest.DiscardUnknown(m)
 }
 
-func (m *GetSupportAccountRequest) Reset()                    { *m = GetSupportAccountRequest{} }
-func (m *GetSupportAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSupportAccountRequest) ProtoMessage()               {}
-func (*GetSupportAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_GetSupportAccountRequest proto.InternalMessageInfo
 
 func (m *GetSupportAccountRequest) GetName() string {
 	if m != nil {
@@ -72,18 +74,40 @@ type ListSupportAccountsRequest struct {
 	// account list by a cloud_resource. For example, to filter results by support
 	// accounts associated with an Organization, its value should be:
 	// "cloud_resource:organizations/<organization_id>"
-	Filter string `protobuf:"bytes,1,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Maximum number of accounts fetched with each request.
-	PageSize int64 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int64 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A token identifying the page of results to return. If unspecified, the
 	// first page is retrieved.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListSupportAccountsRequest) Reset()                    { *m = ListSupportAccountsRequest{} }
-func (m *ListSupportAccountsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListSupportAccountsRequest) ProtoMessage()               {}
-func (*ListSupportAccountsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ListSupportAccountsRequest) Reset()         { *m = ListSupportAccountsRequest{} }
+func (m *ListSupportAccountsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSupportAccountsRequest) ProtoMessage()    {}
+func (*ListSupportAccountsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{1}
+}
+func (m *ListSupportAccountsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSupportAccountsRequest.Unmarshal(m, b)
+}
+func (m *ListSupportAccountsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSupportAccountsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSupportAccountsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSupportAccountsRequest.Merge(dst, src)
+}
+func (m *ListSupportAccountsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSupportAccountsRequest.Size(m)
+}
+func (m *ListSupportAccountsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSupportAccountsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSupportAccountsRequest proto.InternalMessageInfo
 
 func (m *ListSupportAccountsRequest) GetFilter() string {
 	if m != nil {
@@ -109,19 +133,41 @@ func (m *ListSupportAccountsRequest) GetPageToken() string {
 // The response message for `ListSupportAccount`.
 type ListSupportAccountsResponse struct {
 	// A list of support accounts.
-	Accounts []*google_cloud_support_common.SupportAccount `protobuf:"bytes,1,rep,name=accounts" json:"accounts,omitempty"`
+	Accounts []*common.SupportAccount `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"`
 	// A token to retrieve the next page of results. This should be passed on in
 	// `page_token` field of `ListSupportAccountRequest` for next request. If
 	// unspecified, there are no more results to retrieve.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSupportAccountsResponse) Reset()         { *m = ListSupportAccountsResponse{} }
+func (m *ListSupportAccountsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSupportAccountsResponse) ProtoMessage()    {}
+func (*ListSupportAccountsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{2}
+}
+func (m *ListSupportAccountsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSupportAccountsResponse.Unmarshal(m, b)
+}
+func (m *ListSupportAccountsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSupportAccountsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSupportAccountsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSupportAccountsResponse.Merge(dst, src)
+}
+func (m *ListSupportAccountsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSupportAccountsResponse.Size(m)
+}
+func (m *ListSupportAccountsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSupportAccountsResponse.DiscardUnknown(m)
 }
 
-func (m *ListSupportAccountsResponse) Reset()                    { *m = ListSupportAccountsResponse{} }
-func (m *ListSupportAccountsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListSupportAccountsResponse) ProtoMessage()               {}
-func (*ListSupportAccountsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_ListSupportAccountsResponse proto.InternalMessageInfo
 
-func (m *ListSupportAccountsResponse) GetAccounts() []*google_cloud_support_common.SupportAccount {
+func (m *ListSupportAccountsResponse) GetAccounts() []*common.SupportAccount {
 	if m != nil {
 		return m.Accounts
 	}
@@ -139,13 +185,35 @@ func (m *ListSupportAccountsResponse) GetNextPageToken() string {
 type GetCaseRequest struct {
 	// Name of case resource requested.
 	// For example: "supportAccounts/accountA/cases/123"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetCaseRequest) Reset()                    { *m = GetCaseRequest{} }
-func (m *GetCaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetCaseRequest) ProtoMessage()               {}
-func (*GetCaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *GetCaseRequest) Reset()         { *m = GetCaseRequest{} }
+func (m *GetCaseRequest) String() string { return proto.CompactTextString(m) }
+func (*GetCaseRequest) ProtoMessage()    {}
+func (*GetCaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{3}
+}
+func (m *GetCaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetCaseRequest.Unmarshal(m, b)
+}
+func (m *GetCaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetCaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetCaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCaseRequest.Merge(dst, src)
+}
+func (m *GetCaseRequest) XXX_Size() int {
+	return xxx_messageInfo_GetCaseRequest.Size(m)
+}
+func (m *GetCaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetCaseRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetCaseRequest proto.InternalMessageInfo
 
 func (m *GetCaseRequest) GetName() string {
 	if m != nil {
@@ -158,21 +226,43 @@ func (m *GetCaseRequest) GetName() string {
 type ListCasesRequest struct {
 	// Name of the account resource for which cases are requested. For example:
 	// "supportAccounts/accountA"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The filter applied to the search results. Currently it only accepts "OPEN"
 	// or "CLOSED" strings, filtering out cases that are open or resolved.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Maximum number of cases fetched with each request.
-	PageSize int64 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int64 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A token identifying the page of results to return. If unspecified, the
 	// first page is retrieved.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCasesRequest) Reset()         { *m = ListCasesRequest{} }
+func (m *ListCasesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListCasesRequest) ProtoMessage()    {}
+func (*ListCasesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{4}
+}
+func (m *ListCasesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCasesRequest.Unmarshal(m, b)
+}
+func (m *ListCasesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCasesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListCasesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCasesRequest.Merge(dst, src)
+}
+func (m *ListCasesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListCasesRequest.Size(m)
+}
+func (m *ListCasesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCasesRequest.DiscardUnknown(m)
 }
 
-func (m *ListCasesRequest) Reset()                    { *m = ListCasesRequest{} }
-func (m *ListCasesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListCasesRequest) ProtoMessage()               {}
-func (*ListCasesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ListCasesRequest proto.InternalMessageInfo
 
 func (m *ListCasesRequest) GetName() string {
 	if m != nil {
@@ -205,19 +295,41 @@ func (m *ListCasesRequest) GetPageToken() string {
 // The response message for `ListCase` method.
 type ListCasesResponse struct {
 	// A list of cases.
-	Cases []*google_cloud_support_common.Case `protobuf:"bytes,1,rep,name=cases" json:"cases,omitempty"`
+	Cases []*common.Case `protobuf:"bytes,1,rep,name=cases,proto3" json:"cases,omitempty"`
 	// A token to retrieve the next page of results. This should be passed on in
 	// `page_token` field of `ListCaseRequest` for next request. If unspecified,
 	// there are no more results to retrieve.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListCasesResponse) Reset()                    { *m = ListCasesResponse{} }
-func (m *ListCasesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListCasesResponse) ProtoMessage()               {}
-func (*ListCasesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ListCasesResponse) Reset()         { *m = ListCasesResponse{} }
+func (m *ListCasesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListCasesResponse) ProtoMessage()    {}
+func (*ListCasesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{5}
+}
+func (m *ListCasesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCasesResponse.Unmarshal(m, b)
+}
+func (m *ListCasesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCasesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListCasesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCasesResponse.Merge(dst, src)
+}
+func (m *ListCasesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListCasesResponse.Size(m)
+}
+func (m *ListCasesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCasesResponse.DiscardUnknown(m)
+}
 
-func (m *ListCasesResponse) GetCases() []*google_cloud_support_common.Case {
+var xxx_messageInfo_ListCasesResponse proto.InternalMessageInfo
+
+func (m *ListCasesResponse) GetCases() []*common.Case {
 	if m != nil {
 		return m.Cases
 	}
@@ -234,13 +346,35 @@ func (m *ListCasesResponse) GetNextPageToken() string {
 // The request message for `ListComments` method.
 type ListCommentsRequest struct {
 	// The resource name of case for which comments should be listed.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCommentsRequest) Reset()         { *m = ListCommentsRequest{} }
+func (m *ListCommentsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListCommentsRequest) ProtoMessage()    {}
+func (*ListCommentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{6}
+}
+func (m *ListCommentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCommentsRequest.Unmarshal(m, b)
+}
+func (m *ListCommentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCommentsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListCommentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCommentsRequest.Merge(dst, src)
+}
+func (m *ListCommentsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListCommentsRequest.Size(m)
+}
+func (m *ListCommentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCommentsRequest.DiscardUnknown(m)
 }
 
-func (m *ListCommentsRequest) Reset()                    { *m = ListCommentsRequest{} }
-func (m *ListCommentsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListCommentsRequest) ProtoMessage()               {}
-func (*ListCommentsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ListCommentsRequest proto.InternalMessageInfo
 
 func (m *ListCommentsRequest) GetName() string {
 	if m != nil {
@@ -252,15 +386,37 @@ func (m *ListCommentsRequest) GetName() string {
 // The response message for `ListComments` method.
 type ListCommentsResponse struct {
 	// A list of comments.
-	Comments []*google_cloud_support_common.Comment `protobuf:"bytes,1,rep,name=comments" json:"comments,omitempty"`
+	Comments             []*common.Comment `protobuf:"bytes,1,rep,name=comments,proto3" json:"comments,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *ListCommentsResponse) Reset()                    { *m = ListCommentsResponse{} }
-func (m *ListCommentsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListCommentsResponse) ProtoMessage()               {}
-func (*ListCommentsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *ListCommentsResponse) Reset()         { *m = ListCommentsResponse{} }
+func (m *ListCommentsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListCommentsResponse) ProtoMessage()    {}
+func (*ListCommentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{7}
+}
+func (m *ListCommentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCommentsResponse.Unmarshal(m, b)
+}
+func (m *ListCommentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCommentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListCommentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCommentsResponse.Merge(dst, src)
+}
+func (m *ListCommentsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListCommentsResponse.Size(m)
+}
+func (m *ListCommentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCommentsResponse.DiscardUnknown(m)
+}
 
-func (m *ListCommentsResponse) GetComments() []*google_cloud_support_common.Comment {
+var xxx_messageInfo_ListCommentsResponse proto.InternalMessageInfo
+
+func (m *ListCommentsResponse) GetComments() []*common.Comment {
 	if m != nil {
 		return m.Comments
 	}
@@ -270,15 +426,37 @@ func (m *ListCommentsResponse) GetComments() []*google_cloud_support_common.Comm
 // The request message for `CreateCase` method.
 type CreateCaseRequest struct {
 	// The resource name for `SupportAccount` under which this case is created.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The case resource to create.
-	Case *google_cloud_support_common.Case `protobuf:"bytes,2,opt,name=case" json:"case,omitempty"`
+	Case                 *common.Case `protobuf:"bytes,2,opt,name=case,proto3" json:"case,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *CreateCaseRequest) Reset()                    { *m = CreateCaseRequest{} }
-func (m *CreateCaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateCaseRequest) ProtoMessage()               {}
-func (*CreateCaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *CreateCaseRequest) Reset()         { *m = CreateCaseRequest{} }
+func (m *CreateCaseRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateCaseRequest) ProtoMessage()    {}
+func (*CreateCaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{8}
+}
+func (m *CreateCaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateCaseRequest.Unmarshal(m, b)
+}
+func (m *CreateCaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateCaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateCaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCaseRequest.Merge(dst, src)
+}
+func (m *CreateCaseRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateCaseRequest.Size(m)
+}
+func (m *CreateCaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateCaseRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateCaseRequest proto.InternalMessageInfo
 
 func (m *CreateCaseRequest) GetParent() string {
 	if m != nil {
@@ -287,7 +465,7 @@ func (m *CreateCaseRequest) GetParent() string {
 	return ""
 }
 
-func (m *CreateCaseRequest) GetCase() *google_cloud_support_common.Case {
+func (m *CreateCaseRequest) GetCase() *common.Case {
 	if m != nil {
 		return m.Case
 	}
@@ -297,25 +475,47 @@ func (m *CreateCaseRequest) GetCase() *google_cloud_support_common.Case {
 // The request message for `UpdateCase` method.
 type UpdateCaseRequest struct {
 	// The case resource to update.
-	Case *google_cloud_support_common.Case `protobuf:"bytes,1,opt,name=case" json:"case,omitempty"`
+	Case *common.Case `protobuf:"bytes,1,opt,name=case,proto3" json:"case,omitempty"`
 	// A field that represents attributes of a Case object that should be updated
 	// as part of this request.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateCaseRequest) Reset()                    { *m = UpdateCaseRequest{} }
-func (m *UpdateCaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateCaseRequest) ProtoMessage()               {}
-func (*UpdateCaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *UpdateCaseRequest) Reset()         { *m = UpdateCaseRequest{} }
+func (m *UpdateCaseRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateCaseRequest) ProtoMessage()    {}
+func (*UpdateCaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{9}
+}
+func (m *UpdateCaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateCaseRequest.Unmarshal(m, b)
+}
+func (m *UpdateCaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateCaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateCaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCaseRequest.Merge(dst, src)
+}
+func (m *UpdateCaseRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateCaseRequest.Size(m)
+}
+func (m *UpdateCaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateCaseRequest.DiscardUnknown(m)
+}
 
-func (m *UpdateCaseRequest) GetCase() *google_cloud_support_common.Case {
+var xxx_messageInfo_UpdateCaseRequest proto.InternalMessageInfo
+
+func (m *UpdateCaseRequest) GetCase() *common.Case {
 	if m != nil {
 		return m.Case
 	}
 	return nil
 }
 
-func (m *UpdateCaseRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateCaseRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -325,15 +525,37 @@ func (m *UpdateCaseRequest) GetUpdateMask() *google_protobuf3.FieldMask {
 // The request message for `CreateComment` method.
 type CreateCommentRequest struct {
 	// The resource name of case to which this comment should be added.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The `Comment` to be added to this case.
-	Comment *google_cloud_support_common.Comment `protobuf:"bytes,2,opt,name=comment" json:"comment,omitempty"`
+	Comment              *common.Comment `protobuf:"bytes,2,opt,name=comment,proto3" json:"comment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *CreateCommentRequest) Reset()         { *m = CreateCommentRequest{} }
+func (m *CreateCommentRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateCommentRequest) ProtoMessage()    {}
+func (*CreateCommentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{10}
+}
+func (m *CreateCommentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateCommentRequest.Unmarshal(m, b)
+}
+func (m *CreateCommentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateCommentRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateCommentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCommentRequest.Merge(dst, src)
+}
+func (m *CreateCommentRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateCommentRequest.Size(m)
+}
+func (m *CreateCommentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateCommentRequest.DiscardUnknown(m)
 }
 
-func (m *CreateCommentRequest) Reset()                    { *m = CreateCommentRequest{} }
-func (m *CreateCommentRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateCommentRequest) ProtoMessage()               {}
-func (*CreateCommentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_CreateCommentRequest proto.InternalMessageInfo
 
 func (m *CreateCommentRequest) GetName() string {
 	if m != nil {
@@ -342,7 +564,7 @@ func (m *CreateCommentRequest) GetName() string {
 	return ""
 }
 
-func (m *CreateCommentRequest) GetComment() *google_cloud_support_common.Comment {
+func (m *CreateCommentRequest) GetComment() *common.Comment {
 	if m != nil {
 		return m.Comment
 	}
@@ -351,12 +573,34 @@ func (m *CreateCommentRequest) GetComment() *google_cloud_support_common.Comment
 
 // The request message for `GetIssueTaxonomy` method.
 type GetIssueTaxonomyRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetIssueTaxonomyRequest) Reset()                    { *m = GetIssueTaxonomyRequest{} }
-func (m *GetIssueTaxonomyRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetIssueTaxonomyRequest) ProtoMessage()               {}
-func (*GetIssueTaxonomyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *GetIssueTaxonomyRequest) Reset()         { *m = GetIssueTaxonomyRequest{} }
+func (m *GetIssueTaxonomyRequest) String() string { return proto.CompactTextString(m) }
+func (*GetIssueTaxonomyRequest) ProtoMessage()    {}
+func (*GetIssueTaxonomyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_support_33c72ff20b6be0b4, []int{11}
+}
+func (m *GetIssueTaxonomyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetIssueTaxonomyRequest.Unmarshal(m, b)
+}
+func (m *GetIssueTaxonomyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetIssueTaxonomyRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetIssueTaxonomyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIssueTaxonomyRequest.Merge(dst, src)
+}
+func (m *GetIssueTaxonomyRequest) XXX_Size() int {
+	return xxx_messageInfo_GetIssueTaxonomyRequest.Size(m)
+}
+func (m *GetIssueTaxonomyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetIssueTaxonomyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetIssueTaxonomyRequest proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*GetSupportAccountRequest)(nil), "google.cloud.support.v1alpha1.GetSupportAccountRequest")
@@ -381,18 +625,19 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for CloudSupport service
-
+// CloudSupportClient is the client API for CloudSupport service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type CloudSupportClient interface {
 	// Retrieves the support account details given an account identifier.
 	// The authenticated user calling this method must be the account owner.
-	GetSupportAccount(ctx context.Context, in *GetSupportAccountRequest, opts ...grpc.CallOption) (*google_cloud_support_common.SupportAccount, error)
+	GetSupportAccount(ctx context.Context, in *GetSupportAccountRequest, opts ...grpc.CallOption) (*common.SupportAccount, error)
 	// Retrieves the list of accounts the current authenticated user has access
 	// to.
 	ListSupportAccounts(ctx context.Context, in *ListSupportAccountsRequest, opts ...grpc.CallOption) (*ListSupportAccountsResponse, error)
 	// Retrieves the details for a support case. The current authenticated user
 	// calling this method must have permissions to view this case.
-	GetCase(ctx context.Context, in *GetCaseRequest, opts ...grpc.CallOption) (*google_cloud_support_common.Case, error)
+	GetCase(ctx context.Context, in *GetCaseRequest, opts ...grpc.CallOption) (*common.Case, error)
 	// Retrieves the list of support cases associated with an account. The current
 	// authenticated user must have the permission to list and view these cases.
 	ListCases(ctx context.Context, in *ListCasesRequest, opts ...grpc.CallOption) (*ListCasesResponse, error)
@@ -402,15 +647,15 @@ type CloudSupportClient interface {
 	// [SupportAccount][google.cloud.support.v1alpha2.SupportAcccount]. The
 	// authenticated user attempting this action must have permissions to create a
 	// `Case` under that [SupportAccount].
-	CreateCase(ctx context.Context, in *CreateCaseRequest, opts ...grpc.CallOption) (*google_cloud_support_common.Case, error)
+	CreateCase(ctx context.Context, in *CreateCaseRequest, opts ...grpc.CallOption) (*common.Case, error)
 	// Updates a support case. Only a small set of details (priority, subject and
 	// cc_address) can be update after a case is created.
-	UpdateCase(ctx context.Context, in *UpdateCaseRequest, opts ...grpc.CallOption) (*google_cloud_support_common.Case, error)
+	UpdateCase(ctx context.Context, in *UpdateCaseRequest, opts ...grpc.CallOption) (*common.Case, error)
 	// Adds a new comment to a case.
-	CreateComment(ctx context.Context, in *CreateCommentRequest, opts ...grpc.CallOption) (*google_cloud_support_common.Comment, error)
+	CreateComment(ctx context.Context, in *CreateCommentRequest, opts ...grpc.CallOption) (*common.Comment, error)
 	// Retrieves the taxonomy of product categories and components to be used
 	// while creating a support case.
-	GetIssueTaxonomy(ctx context.Context, in *GetIssueTaxonomyRequest, opts ...grpc.CallOption) (*google_cloud_support_common.IssueTaxonomy, error)
+	GetIssueTaxonomy(ctx context.Context, in *GetIssueTaxonomyRequest, opts ...grpc.CallOption) (*common.IssueTaxonomy, error)
 }
 
 type cloudSupportClient struct {
@@ -421,9 +666,9 @@ func NewCloudSupportClient(cc *grpc.ClientConn) CloudSupportClient {
 	return &cloudSupportClient{cc}
 }
 
-func (c *cloudSupportClient) GetSupportAccount(ctx context.Context, in *GetSupportAccountRequest, opts ...grpc.CallOption) (*google_cloud_support_common.SupportAccount, error) {
-	out := new(google_cloud_support_common.SupportAccount)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/GetSupportAccount", in, out, c.cc, opts...)
+func (c *cloudSupportClient) GetSupportAccount(ctx context.Context, in *GetSupportAccountRequest, opts ...grpc.CallOption) (*common.SupportAccount, error) {
+	out := new(common.SupportAccount)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/GetSupportAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -432,16 +677,16 @@ func (c *cloudSupportClient) GetSupportAccount(ctx context.Context, in *GetSuppo
 
 func (c *cloudSupportClient) ListSupportAccounts(ctx context.Context, in *ListSupportAccountsRequest, opts ...grpc.CallOption) (*ListSupportAccountsResponse, error) {
 	out := new(ListSupportAccountsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/ListSupportAccounts", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/ListSupportAccounts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudSupportClient) GetCase(ctx context.Context, in *GetCaseRequest, opts ...grpc.CallOption) (*google_cloud_support_common.Case, error) {
-	out := new(google_cloud_support_common.Case)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/GetCase", in, out, c.cc, opts...)
+func (c *cloudSupportClient) GetCase(ctx context.Context, in *GetCaseRequest, opts ...grpc.CallOption) (*common.Case, error) {
+	out := new(common.Case)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/GetCase", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -450,7 +695,7 @@ func (c *cloudSupportClient) GetCase(ctx context.Context, in *GetCaseRequest, op
 
 func (c *cloudSupportClient) ListCases(ctx context.Context, in *ListCasesRequest, opts ...grpc.CallOption) (*ListCasesResponse, error) {
 	out := new(ListCasesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/ListCases", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/ListCases", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -459,61 +704,60 @@ func (c *cloudSupportClient) ListCases(ctx context.Context, in *ListCasesRequest
 
 func (c *cloudSupportClient) ListComments(ctx context.Context, in *ListCommentsRequest, opts ...grpc.CallOption) (*ListCommentsResponse, error) {
 	out := new(ListCommentsResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/ListComments", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/ListComments", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudSupportClient) CreateCase(ctx context.Context, in *CreateCaseRequest, opts ...grpc.CallOption) (*google_cloud_support_common.Case, error) {
-	out := new(google_cloud_support_common.Case)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/CreateCase", in, out, c.cc, opts...)
+func (c *cloudSupportClient) CreateCase(ctx context.Context, in *CreateCaseRequest, opts ...grpc.CallOption) (*common.Case, error) {
+	out := new(common.Case)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/CreateCase", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudSupportClient) UpdateCase(ctx context.Context, in *UpdateCaseRequest, opts ...grpc.CallOption) (*google_cloud_support_common.Case, error) {
-	out := new(google_cloud_support_common.Case)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/UpdateCase", in, out, c.cc, opts...)
+func (c *cloudSupportClient) UpdateCase(ctx context.Context, in *UpdateCaseRequest, opts ...grpc.CallOption) (*common.Case, error) {
+	out := new(common.Case)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/UpdateCase", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudSupportClient) CreateComment(ctx context.Context, in *CreateCommentRequest, opts ...grpc.CallOption) (*google_cloud_support_common.Comment, error) {
-	out := new(google_cloud_support_common.Comment)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/CreateComment", in, out, c.cc, opts...)
+func (c *cloudSupportClient) CreateComment(ctx context.Context, in *CreateCommentRequest, opts ...grpc.CallOption) (*common.Comment, error) {
+	out := new(common.Comment)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/CreateComment", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudSupportClient) GetIssueTaxonomy(ctx context.Context, in *GetIssueTaxonomyRequest, opts ...grpc.CallOption) (*google_cloud_support_common.IssueTaxonomy, error) {
-	out := new(google_cloud_support_common.IssueTaxonomy)
-	err := grpc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/GetIssueTaxonomy", in, out, c.cc, opts...)
+func (c *cloudSupportClient) GetIssueTaxonomy(ctx context.Context, in *GetIssueTaxonomyRequest, opts ...grpc.CallOption) (*common.IssueTaxonomy, error) {
+	out := new(common.IssueTaxonomy)
+	err := c.cc.Invoke(ctx, "/google.cloud.support.v1alpha1.CloudSupport/GetIssueTaxonomy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for CloudSupport service
-
+// CloudSupportServer is the server API for CloudSupport service.
 type CloudSupportServer interface {
 	// Retrieves the support account details given an account identifier.
 	// The authenticated user calling this method must be the account owner.
-	GetSupportAccount(context.Context, *GetSupportAccountRequest) (*google_cloud_support_common.SupportAccount, error)
+	GetSupportAccount(context.Context, *GetSupportAccountRequest) (*common.SupportAccount, error)
 	// Retrieves the list of accounts the current authenticated user has access
 	// to.
 	ListSupportAccounts(context.Context, *ListSupportAccountsRequest) (*ListSupportAccountsResponse, error)
 	// Retrieves the details for a support case. The current authenticated user
 	// calling this method must have permissions to view this case.
-	GetCase(context.Context, *GetCaseRequest) (*google_cloud_support_common.Case, error)
+	GetCase(context.Context, *GetCaseRequest) (*common.Case, error)
 	// Retrieves the list of support cases associated with an account. The current
 	// authenticated user must have the permission to list and view these cases.
 	ListCases(context.Context, *ListCasesRequest) (*ListCasesResponse, error)
@@ -523,15 +767,15 @@ type CloudSupportServer interface {
 	// [SupportAccount][google.cloud.support.v1alpha2.SupportAcccount]. The
 	// authenticated user attempting this action must have permissions to create a
 	// `Case` under that [SupportAccount].
-	CreateCase(context.Context, *CreateCaseRequest) (*google_cloud_support_common.Case, error)
+	CreateCase(context.Context, *CreateCaseRequest) (*common.Case, error)
 	// Updates a support case. Only a small set of details (priority, subject and
 	// cc_address) can be update after a case is created.
-	UpdateCase(context.Context, *UpdateCaseRequest) (*google_cloud_support_common.Case, error)
+	UpdateCase(context.Context, *UpdateCaseRequest) (*common.Case, error)
 	// Adds a new comment to a case.
-	CreateComment(context.Context, *CreateCommentRequest) (*google_cloud_support_common.Comment, error)
+	CreateComment(context.Context, *CreateCommentRequest) (*common.Comment, error)
 	// Retrieves the taxonomy of product categories and components to be used
 	// while creating a support case.
-	GetIssueTaxonomy(context.Context, *GetIssueTaxonomyRequest) (*google_cloud_support_common.IssueTaxonomy, error)
+	GetIssueTaxonomy(context.Context, *GetIssueTaxonomyRequest) (*common.IssueTaxonomy, error)
 }
 
 func RegisterCloudSupportServer(s *grpc.Server, srv CloudSupportServer) {
@@ -745,9 +989,11 @@ var _CloudSupport_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/cloud/support/v1alpha1/cloud_support.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/support/v1alpha1/cloud_support.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/support/v1alpha1/cloud_support.proto", fileDescriptor_cloud_support_33c72ff20b6be0b4)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_cloud_support_33c72ff20b6be0b4 = []byte{
 	// 863 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x41, 0x4f, 0x33, 0x45,
 	0x18, 0xce, 0xb4, 0xc8, 0x07, 0x2f, 0xdf, 0xa7, 0x5f, 0x47, 0x82, 0x65, 0x0b, 0x49, 0x3b, 0x21,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go
new file mode 100644
index 00000000..47722eb6
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/cloudtasks.pb.go
@@ -0,0 +1,2540 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/tasks/v2beta2/cloudtasks.proto
+
+package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import _ "google.golang.org/genproto/googleapis/rpc/code"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Request message for [ListQueues][google.cloud.tasks.v2beta2.CloudTasks.ListQueues].
+type ListQueuesRequest struct {
+	// Required.
+	//
+	// The location name.
+	// For example: `projects/PROJECT_ID/locations/LOCATION_ID`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// `filter` can be used to specify a subset of queues. Any [Queue][google.cloud.tasks.v2beta2.Queue]
+	// field can be used as a filter and several operators as supported.
+	// For example: `<=, <, >=, >, !=, =, :`. The filter syntax is the same as
+	// described in
+	// [Stackdriver's Advanced Logs Filters](https://cloud.google.com/logging/docs/view/advanced_filters).
+	//
+	// Sample filter "app_engine_http_target: *".
+	//
+	// Note that using filters might cause fewer queues than the
+	// requested_page size to be returned.
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
+	// Requested page size.
+	//
+	// The maximum page size is 9800. If unspecified, the page size will
+	// be the maximum. Fewer queues than requested might be returned,
+	// even if more queues exist; use the
+	// [next_page_token][google.cloud.tasks.v2beta2.ListQueuesResponse.next_page_token] in the
+	// response to determine if more queues exist.
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// A token identifying the page of results to return.
+	//
+	// To request the first page results, page_token must be empty. To
+	// request the next page of results, page_token must be the value of
+	// [next_page_token][google.cloud.tasks.v2beta2.ListQueuesResponse.next_page_token] returned
+	// from the previous call to [ListQueues][google.cloud.tasks.v2beta2.CloudTasks.ListQueues]
+	// method. It is an error to switch the value of the
+	// [filter][google.cloud.tasks.v2beta2.ListQueuesRequest.filter] while iterating through pages.
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListQueuesRequest) Reset()         { *m = ListQueuesRequest{} }
+func (m *ListQueuesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListQueuesRequest) ProtoMessage()    {}
+func (*ListQueuesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{0}
+}
+func (m *ListQueuesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListQueuesRequest.Unmarshal(m, b)
+}
+func (m *ListQueuesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListQueuesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListQueuesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListQueuesRequest.Merge(dst, src)
+}
+func (m *ListQueuesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListQueuesRequest.Size(m)
+}
+func (m *ListQueuesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListQueuesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListQueuesRequest proto.InternalMessageInfo
+
+func (m *ListQueuesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListQueuesRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListQueuesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListQueuesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for [ListQueues][google.cloud.tasks.v2beta2.CloudTasks.ListQueues].
+type ListQueuesResponse struct {
+	// The list of queues.
+	Queues []*Queue `protobuf:"bytes,1,rep,name=queues,proto3" json:"queues,omitempty"`
+	// A token to retrieve next page of results.
+	//
+	// To return the next page of results, call
+	// [ListQueues][google.cloud.tasks.v2beta2.CloudTasks.ListQueues] with this value as the
+	// [page_token][google.cloud.tasks.v2beta2.ListQueuesRequest.page_token].
+	//
+	// If the next_page_token is empty, there are no more results.
+	//
+	// The page token is valid for only 2 hours.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListQueuesResponse) Reset()         { *m = ListQueuesResponse{} }
+func (m *ListQueuesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListQueuesResponse) ProtoMessage()    {}
+func (*ListQueuesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{1}
+}
+func (m *ListQueuesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListQueuesResponse.Unmarshal(m, b)
+}
+func (m *ListQueuesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListQueuesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListQueuesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListQueuesResponse.Merge(dst, src)
+}
+func (m *ListQueuesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListQueuesResponse.Size(m)
+}
+func (m *ListQueuesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListQueuesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListQueuesResponse proto.InternalMessageInfo
+
+func (m *ListQueuesResponse) GetQueues() []*Queue {
+	if m != nil {
+		return m.Queues
+	}
+	return nil
+}
+
+func (m *ListQueuesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for [GetQueue][google.cloud.tasks.v2beta2.CloudTasks.GetQueue].
+type GetQueueRequest struct {
+	// Required.
+	//
+	// The resource name of the queue. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetQueueRequest) Reset()         { *m = GetQueueRequest{} }
+func (m *GetQueueRequest) String() string { return proto.CompactTextString(m) }
+func (*GetQueueRequest) ProtoMessage()    {}
+func (*GetQueueRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{2}
+}
+func (m *GetQueueRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetQueueRequest.Unmarshal(m, b)
+}
+func (m *GetQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetQueueRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetQueueRequest.Merge(dst, src)
+}
+func (m *GetQueueRequest) XXX_Size() int {
+	return xxx_messageInfo_GetQueueRequest.Size(m)
+}
+func (m *GetQueueRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetQueueRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetQueueRequest proto.InternalMessageInfo
+
+func (m *GetQueueRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [CreateQueue][google.cloud.tasks.v2beta2.CloudTasks.CreateQueue].
+type CreateQueueRequest struct {
+	// Required.
+	//
+	// The location name in which the queue will be created.
+	// For example: `projects/PROJECT_ID/locations/LOCATION_ID`
+	//
+	// The list of allowed locations can be obtained by calling Cloud
+	// Tasks' implementation of
+	// [ListLocations][google.cloud.location.Locations.ListLocations].
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required.
+	//
+	// The queue to create.
+	//
+	// [Queue's name][google.cloud.tasks.v2beta2.Queue.name] cannot be the same as an existing queue.
+	Queue                *Queue   `protobuf:"bytes,2,opt,name=queue,proto3" json:"queue,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateQueueRequest) Reset()         { *m = CreateQueueRequest{} }
+func (m *CreateQueueRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateQueueRequest) ProtoMessage()    {}
+func (*CreateQueueRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{3}
+}
+func (m *CreateQueueRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateQueueRequest.Unmarshal(m, b)
+}
+func (m *CreateQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateQueueRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateQueueRequest.Merge(dst, src)
+}
+func (m *CreateQueueRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateQueueRequest.Size(m)
+}
+func (m *CreateQueueRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateQueueRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateQueueRequest proto.InternalMessageInfo
+
+func (m *CreateQueueRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateQueueRequest) GetQueue() *Queue {
+	if m != nil {
+		return m.Queue
+	}
+	return nil
+}
+
+// Request message for [UpdateQueue][google.cloud.tasks.v2beta2.CloudTasks.UpdateQueue].
+type UpdateQueueRequest struct {
+	// Required.
+	//
+	// The queue to create or update.
+	//
+	// The queue's [name][google.cloud.tasks.v2beta2.Queue.name] must be specified.
+	//
+	// Output only fields cannot be modified using UpdateQueue.
+	// Any value specified for an output only field will be ignored.
+	// The queue's [name][google.cloud.tasks.v2beta2.Queue.name] cannot be changed.
+	Queue *Queue `protobuf:"bytes,1,opt,name=queue,proto3" json:"queue,omitempty"`
+	// A mask used to specify which fields of the queue are being updated.
+	//
+	// If empty, then all fields will be updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateQueueRequest) Reset()         { *m = UpdateQueueRequest{} }
+func (m *UpdateQueueRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateQueueRequest) ProtoMessage()    {}
+func (*UpdateQueueRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{4}
+}
+func (m *UpdateQueueRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateQueueRequest.Unmarshal(m, b)
+}
+func (m *UpdateQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateQueueRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateQueueRequest.Merge(dst, src)
+}
+func (m *UpdateQueueRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateQueueRequest.Size(m)
+}
+func (m *UpdateQueueRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateQueueRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateQueueRequest proto.InternalMessageInfo
+
+func (m *UpdateQueueRequest) GetQueue() *Queue {
+	if m != nil {
+		return m.Queue
+	}
+	return nil
+}
+
+func (m *UpdateQueueRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Request message for [DeleteQueue][google.cloud.tasks.v2beta2.CloudTasks.DeleteQueue].
+type DeleteQueueRequest struct {
+	// Required.
+	//
+	// The queue name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteQueueRequest) Reset()         { *m = DeleteQueueRequest{} }
+func (m *DeleteQueueRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteQueueRequest) ProtoMessage()    {}
+func (*DeleteQueueRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{5}
+}
+func (m *DeleteQueueRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteQueueRequest.Unmarshal(m, b)
+}
+func (m *DeleteQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteQueueRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteQueueRequest.Merge(dst, src)
+}
+func (m *DeleteQueueRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteQueueRequest.Size(m)
+}
+func (m *DeleteQueueRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteQueueRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteQueueRequest proto.InternalMessageInfo
+
+func (m *DeleteQueueRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [PurgeQueue][google.cloud.tasks.v2beta2.CloudTasks.PurgeQueue].
+type PurgeQueueRequest struct {
+	// Required.
+	//
+	// The queue name. For example:
+	// `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PurgeQueueRequest) Reset()         { *m = PurgeQueueRequest{} }
+func (m *PurgeQueueRequest) String() string { return proto.CompactTextString(m) }
+func (*PurgeQueueRequest) ProtoMessage()    {}
+func (*PurgeQueueRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{6}
+}
+func (m *PurgeQueueRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PurgeQueueRequest.Unmarshal(m, b)
+}
+func (m *PurgeQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PurgeQueueRequest.Marshal(b, m, deterministic)
+}
+func (dst *PurgeQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PurgeQueueRequest.Merge(dst, src)
+}
+func (m *PurgeQueueRequest) XXX_Size() int {
+	return xxx_messageInfo_PurgeQueueRequest.Size(m)
+}
+func (m *PurgeQueueRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PurgeQueueRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PurgeQueueRequest proto.InternalMessageInfo
+
+func (m *PurgeQueueRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [PauseQueue][google.cloud.tasks.v2beta2.CloudTasks.PauseQueue].
+type PauseQueueRequest struct {
+	// Required.
+	//
+	// The queue name. For example:
+	// `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PauseQueueRequest) Reset()         { *m = PauseQueueRequest{} }
+func (m *PauseQueueRequest) String() string { return proto.CompactTextString(m) }
+func (*PauseQueueRequest) ProtoMessage()    {}
+func (*PauseQueueRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{7}
+}
+func (m *PauseQueueRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PauseQueueRequest.Unmarshal(m, b)
+}
+func (m *PauseQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PauseQueueRequest.Marshal(b, m, deterministic)
+}
+func (dst *PauseQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PauseQueueRequest.Merge(dst, src)
+}
+func (m *PauseQueueRequest) XXX_Size() int {
+	return xxx_messageInfo_PauseQueueRequest.Size(m)
+}
+func (m *PauseQueueRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PauseQueueRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PauseQueueRequest proto.InternalMessageInfo
+
+func (m *PauseQueueRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for [ResumeQueue][google.cloud.tasks.v2beta2.CloudTasks.ResumeQueue].
+type ResumeQueueRequest struct {
+	// Required.
+	//
+	// The queue name. For example:
+	// `projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ResumeQueueRequest) Reset()         { *m = ResumeQueueRequest{} }
+func (m *ResumeQueueRequest) String() string { return proto.CompactTextString(m) }
+func (*ResumeQueueRequest) ProtoMessage()    {}
+func (*ResumeQueueRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{8}
+}
+func (m *ResumeQueueRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResumeQueueRequest.Unmarshal(m, b)
+}
+func (m *ResumeQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResumeQueueRequest.Marshal(b, m, deterministic)
+}
+func (dst *ResumeQueueRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResumeQueueRequest.Merge(dst, src)
+}
+func (m *ResumeQueueRequest) XXX_Size() int {
+	return xxx_messageInfo_ResumeQueueRequest.Size(m)
+}
+func (m *ResumeQueueRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResumeQueueRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ResumeQueueRequest proto.InternalMessageInfo
+
+func (m *ResumeQueueRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for listing tasks using [ListTasks][google.cloud.tasks.v2beta2.CloudTasks.ListTasks].
+type ListTasksRequest struct {
+	// Required.
+	//
+	// The queue name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The response_view specifies which subset of the [Task][google.cloud.tasks.v2beta2.Task] will be
+	// returned.
+	//
+	// By default response_view is [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC]; not all
+	// information is retrieved by default because some data, such as
+	// payloads, might be desirable to return only when needed because
+	// of its large size or because of the sensitivity of data that it
+	// contains.
+	//
+	// Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+	// `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+	// permission on the [Task][google.cloud.tasks.v2beta2.Task] resource.
+	ResponseView Task_View `protobuf:"varint,2,opt,name=response_view,json=responseView,proto3,enum=google.cloud.tasks.v2beta2.Task_View" json:"response_view,omitempty"`
+	// Requested page size. Fewer tasks than requested might be returned.
+	//
+	// The maximum page size is 1000. If unspecified, the page size will
+	// be the maximum. Fewer tasks than requested might be returned,
+	// even if more tasks exist; use
+	// [next_page_token][google.cloud.tasks.v2beta2.ListTasksResponse.next_page_token] in the
+	// response to determine if more tasks exist.
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// A token identifying the page of results to return.
+	//
+	// To request the first page results, page_token must be empty. To
+	// request the next page of results, page_token must be the value of
+	// [next_page_token][google.cloud.tasks.v2beta2.ListTasksResponse.next_page_token] returned
+	// from the previous call to [ListTasks][google.cloud.tasks.v2beta2.CloudTasks.ListTasks]
+	// method.
+	//
+	// The page token is valid for only 2 hours.
+	PageToken            string   `protobuf:"bytes,5,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTasksRequest) Reset()         { *m = ListTasksRequest{} }
+func (m *ListTasksRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTasksRequest) ProtoMessage()    {}
+func (*ListTasksRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{9}
+}
+func (m *ListTasksRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTasksRequest.Unmarshal(m, b)
+}
+func (m *ListTasksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTasksRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTasksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTasksRequest.Merge(dst, src)
+}
+func (m *ListTasksRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTasksRequest.Size(m)
+}
+func (m *ListTasksRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTasksRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTasksRequest proto.InternalMessageInfo
+
+func (m *ListTasksRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListTasksRequest) GetResponseView() Task_View {
+	if m != nil {
+		return m.ResponseView
+	}
+	return Task_VIEW_UNSPECIFIED
+}
+
+func (m *ListTasksRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListTasksRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for listing tasks using [ListTasks][google.cloud.tasks.v2beta2.CloudTasks.ListTasks].
+type ListTasksResponse struct {
+	// The list of tasks.
+	Tasks []*Task `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks,omitempty"`
+	// A token to retrieve next page of results.
+	//
+	// To return the next page of results, call
+	// [ListTasks][google.cloud.tasks.v2beta2.CloudTasks.ListTasks] with this value as the
+	// [page_token][google.cloud.tasks.v2beta2.ListTasksRequest.page_token].
+	//
+	// If the next_page_token is empty, there are no more results.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTasksResponse) Reset()         { *m = ListTasksResponse{} }
+func (m *ListTasksResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTasksResponse) ProtoMessage()    {}
+func (*ListTasksResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{10}
+}
+func (m *ListTasksResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTasksResponse.Unmarshal(m, b)
+}
+func (m *ListTasksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTasksResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTasksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTasksResponse.Merge(dst, src)
+}
+func (m *ListTasksResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTasksResponse.Size(m)
+}
+func (m *ListTasksResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTasksResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTasksResponse proto.InternalMessageInfo
+
+func (m *ListTasksResponse) GetTasks() []*Task {
+	if m != nil {
+		return m.Tasks
+	}
+	return nil
+}
+
+func (m *ListTasksResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for getting a task using [GetTask][google.cloud.tasks.v2beta2.CloudTasks.GetTask].
+type GetTaskRequest struct {
+	// Required.
+	//
+	// The task name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The response_view specifies which subset of the [Task][google.cloud.tasks.v2beta2.Task] will be
+	// returned.
+	//
+	// By default response_view is [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC]; not all
+	// information is retrieved by default because some data, such as
+	// payloads, might be desirable to return only when needed because
+	// of its large size or because of the sensitivity of data that it
+	// contains.
+	//
+	// Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+	// `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+	// permission on the [Task][google.cloud.tasks.v2beta2.Task] resource.
+	ResponseView         Task_View `protobuf:"varint,2,opt,name=response_view,json=responseView,proto3,enum=google.cloud.tasks.v2beta2.Task_View" json:"response_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *GetTaskRequest) Reset()         { *m = GetTaskRequest{} }
+func (m *GetTaskRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTaskRequest) ProtoMessage()    {}
+func (*GetTaskRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{11}
+}
+func (m *GetTaskRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTaskRequest.Unmarshal(m, b)
+}
+func (m *GetTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTaskRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTaskRequest.Merge(dst, src)
+}
+func (m *GetTaskRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTaskRequest.Size(m)
+}
+func (m *GetTaskRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTaskRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetTaskRequest proto.InternalMessageInfo
+
+func (m *GetTaskRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *GetTaskRequest) GetResponseView() Task_View {
+	if m != nil {
+		return m.ResponseView
+	}
+	return Task_VIEW_UNSPECIFIED
+}
+
+// Request message for [CreateTask][google.cloud.tasks.v2beta2.CloudTasks.CreateTask].
+type CreateTaskRequest struct {
+	// Required.
+	//
+	// The queue name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+	//
+	// The queue must already exist.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required.
+	//
+	// The task to add.
+	//
+	// Task names have the following format:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`.
+	// The user can optionally specify a task [name][google.cloud.tasks.v2beta2.Task.name]. If a
+	// name is not specified then the system will generate a random
+	// unique task id, which will be set in the task returned in the
+	// [response][google.cloud.tasks.v2beta2.Task.name].
+	//
+	// If [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] is not set or is in the
+	// past then Cloud Tasks will set it to the current time.
+	//
+	// Task De-duplication:
+	//
+	// Explicitly specifying a task ID enables task de-duplication.  If
+	// a task's ID is identical to that of an existing task or a task
+	// that was deleted or completed recently then the call will fail
+	// with [ALREADY_EXISTS][google.rpc.Code.ALREADY_EXISTS].
+	// If the task's queue was created using Cloud Tasks, then another task with
+	// the same name can't be created for ~1hour after the original task was
+	// deleted or completed. If the task's queue was created using queue.yaml or
+	// queue.xml, then another task with the same name can't be created
+	// for ~9days after the original task was deleted or completed.
+	//
+	// Because there is an extra lookup cost to identify duplicate task
+	// names, these [CreateTask][google.cloud.tasks.v2beta2.CloudTasks.CreateTask] calls have significantly
+	// increased latency. Using hashed strings for the task id or for
+	// the prefix of the task id is recommended. Choosing task ids that
+	// are sequential or have sequential prefixes, for example using a
+	// timestamp, causes an increase in latency and error rates in all
+	// task commands. The infrastructure relies on an approximately
+	// uniform distribution of task ids to store and serve tasks
+	// efficiently.
+	Task *Task `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"`
+	// The response_view specifies which subset of the [Task][google.cloud.tasks.v2beta2.Task] will be
+	// returned.
+	//
+	// By default response_view is [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC]; not all
+	// information is retrieved by default because some data, such as
+	// payloads, might be desirable to return only when needed because
+	// of its large size or because of the sensitivity of data that it
+	// contains.
+	//
+	// Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+	// `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+	// permission on the [Task][google.cloud.tasks.v2beta2.Task] resource.
+	ResponseView         Task_View `protobuf:"varint,3,opt,name=response_view,json=responseView,proto3,enum=google.cloud.tasks.v2beta2.Task_View" json:"response_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CreateTaskRequest) Reset()         { *m = CreateTaskRequest{} }
+func (m *CreateTaskRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateTaskRequest) ProtoMessage()    {}
+func (*CreateTaskRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{12}
+}
+func (m *CreateTaskRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTaskRequest.Unmarshal(m, b)
+}
+func (m *CreateTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTaskRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTaskRequest.Merge(dst, src)
+}
+func (m *CreateTaskRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateTaskRequest.Size(m)
+}
+func (m *CreateTaskRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTaskRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateTaskRequest proto.InternalMessageInfo
+
+func (m *CreateTaskRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateTaskRequest) GetTask() *Task {
+	if m != nil {
+		return m.Task
+	}
+	return nil
+}
+
+func (m *CreateTaskRequest) GetResponseView() Task_View {
+	if m != nil {
+		return m.ResponseView
+	}
+	return Task_VIEW_UNSPECIFIED
+}
+
+// Request message for deleting a task using
+// [DeleteTask][google.cloud.tasks.v2beta2.CloudTasks.DeleteTask].
+type DeleteTaskRequest struct {
+	// Required.
+	//
+	// The task name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteTaskRequest) Reset()         { *m = DeleteTaskRequest{} }
+func (m *DeleteTaskRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteTaskRequest) ProtoMessage()    {}
+func (*DeleteTaskRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{13}
+}
+func (m *DeleteTaskRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteTaskRequest.Unmarshal(m, b)
+}
+func (m *DeleteTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteTaskRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTaskRequest.Merge(dst, src)
+}
+func (m *DeleteTaskRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteTaskRequest.Size(m)
+}
+func (m *DeleteTaskRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteTaskRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteTaskRequest proto.InternalMessageInfo
+
+func (m *DeleteTaskRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for leasing tasks using [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks].
+type LeaseTasksRequest struct {
+	// Required.
+	//
+	// The queue name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of tasks to lease.
+	//
+	// The system will make a best effort to return as close to as
+	// `max_tasks` as possible.
+	//
+	// The largest that `max_tasks` can be is 1000.
+	MaxTasks int32 `protobuf:"varint,2,opt,name=max_tasks,json=maxTasks,proto3" json:"max_tasks,omitempty"`
+	//
+	// After the worker has successfully finished the work associated
+	// with the task, the worker must call via
+	// [AcknowledgeTask][google.cloud.tasks.v2beta2.CloudTasks.AcknowledgeTask] before the
+	// [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time]. Otherwise the task will be
+	// returned to a later [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] call so
+	// that another worker can retry it.
+	//
+	// The maximum lease duration is 1 week.
+	// `lease_duration` will be truncated to the nearest second.
+	LeaseDuration *duration.Duration `protobuf:"bytes,3,opt,name=lease_duration,json=leaseDuration,proto3" json:"lease_duration,omitempty"`
+	// The response_view specifies which subset of the [Task][google.cloud.tasks.v2beta2.Task] will be
+	// returned.
+	//
+	// By default response_view is [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC]; not all
+	// information is retrieved by default because some data, such as
+	// payloads, might be desirable to return only when needed because
+	// of its large size or because of the sensitivity of data that it
+	// contains.
+	//
+	// Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+	// `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+	// permission on the [Task][google.cloud.tasks.v2beta2.Task] resource.
+	ResponseView Task_View `protobuf:"varint,4,opt,name=response_view,json=responseView,proto3,enum=google.cloud.tasks.v2beta2.Task_View" json:"response_view,omitempty"`
+	// `filter` can be used to specify a subset of tasks to lease.
+	//
+	// When `filter` is set to `tag=<my-tag>` then the
+	// [response][google.cloud.tasks.v2beta2.LeaseTasksResponse] will contain only tasks whose
+	// [tag][google.cloud.tasks.v2beta2.PullMessage.tag] is equal to `<my-tag>`. `<my-tag>` must be
+	// less than 500 characters.
+	//
+	// When `filter` is set to `tag_function=oldest_tag()`, only tasks which have
+	// the same tag as the task with the oldest
+	// [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] will be returned.
+	//
+	// Grammar Syntax:
+	//
+	// * `filter = "tag=" tag | "tag_function=" function`
+	//
+	// * `tag = string`
+	//
+	// * `function = "oldest_tag()"`
+	//
+	// The `oldest_tag()` function returns tasks which have the same tag as the
+	// oldest task (ordered by schedule time).
+	//
+	// SDK compatibility: Although the SDK allows tags to be either
+	// string or
+	// [bytes](https://cloud.google.com/appengine/docs/standard/java/javadoc/com/google/appengine/api/taskqueue/TaskOptions.html#tag-byte:A-),
+	// only UTF-8 encoded tags can be used in Cloud Tasks. Tag which
+	// aren't UTF-8 encoded can't be used in the
+	// [filter][google.cloud.tasks.v2beta2.LeaseTasksRequest.filter] and the task's
+	// [tag][google.cloud.tasks.v2beta2.PullMessage.tag] will be displayed as empty in Cloud Tasks.
+	Filter               string   `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LeaseTasksRequest) Reset()         { *m = LeaseTasksRequest{} }
+func (m *LeaseTasksRequest) String() string { return proto.CompactTextString(m) }
+func (*LeaseTasksRequest) ProtoMessage()    {}
+func (*LeaseTasksRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{14}
+}
+func (m *LeaseTasksRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LeaseTasksRequest.Unmarshal(m, b)
+}
+func (m *LeaseTasksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LeaseTasksRequest.Marshal(b, m, deterministic)
+}
+func (dst *LeaseTasksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LeaseTasksRequest.Merge(dst, src)
+}
+func (m *LeaseTasksRequest) XXX_Size() int {
+	return xxx_messageInfo_LeaseTasksRequest.Size(m)
+}
+func (m *LeaseTasksRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_LeaseTasksRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LeaseTasksRequest proto.InternalMessageInfo
+
+func (m *LeaseTasksRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *LeaseTasksRequest) GetMaxTasks() int32 {
+	if m != nil {
+		return m.MaxTasks
+	}
+	return 0
+}
+
+func (m *LeaseTasksRequest) GetLeaseDuration() *duration.Duration {
+	if m != nil {
+		return m.LeaseDuration
+	}
+	return nil
+}
+
+func (m *LeaseTasksRequest) GetResponseView() Task_View {
+	if m != nil {
+		return m.ResponseView
+	}
+	return Task_VIEW_UNSPECIFIED
+}
+
+func (m *LeaseTasksRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+// Response message for leasing tasks using [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks].
+type LeaseTasksResponse struct {
+	// The leased tasks.
+	Tasks                []*Task  `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LeaseTasksResponse) Reset()         { *m = LeaseTasksResponse{} }
+func (m *LeaseTasksResponse) String() string { return proto.CompactTextString(m) }
+func (*LeaseTasksResponse) ProtoMessage()    {}
+func (*LeaseTasksResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{15}
+}
+func (m *LeaseTasksResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LeaseTasksResponse.Unmarshal(m, b)
+}
+func (m *LeaseTasksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LeaseTasksResponse.Marshal(b, m, deterministic)
+}
+func (dst *LeaseTasksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LeaseTasksResponse.Merge(dst, src)
+}
+func (m *LeaseTasksResponse) XXX_Size() int {
+	return xxx_messageInfo_LeaseTasksResponse.Size(m)
+}
+func (m *LeaseTasksResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_LeaseTasksResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LeaseTasksResponse proto.InternalMessageInfo
+
+func (m *LeaseTasksResponse) GetTasks() []*Task {
+	if m != nil {
+		return m.Tasks
+	}
+	return nil
+}
+
+// Request message for acknowledging a task using
+// [AcknowledgeTask][google.cloud.tasks.v2beta2.CloudTasks.AcknowledgeTask].
+type AcknowledgeTaskRequest struct {
+	// Required.
+	//
+	// The task name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required.
+	//
+	// The task's current schedule time, available in the
+	// [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] returned by
+	// [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] response or
+	// [RenewLease][google.cloud.tasks.v2beta2.CloudTasks.RenewLease] response. This restriction is
+	// to ensure that your worker currently holds the lease.
+	ScheduleTime         *timestamp.Timestamp `protobuf:"bytes,2,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *AcknowledgeTaskRequest) Reset()         { *m = AcknowledgeTaskRequest{} }
+func (m *AcknowledgeTaskRequest) String() string { return proto.CompactTextString(m) }
+func (*AcknowledgeTaskRequest) ProtoMessage()    {}
+func (*AcknowledgeTaskRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{16}
+}
+func (m *AcknowledgeTaskRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AcknowledgeTaskRequest.Unmarshal(m, b)
+}
+func (m *AcknowledgeTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AcknowledgeTaskRequest.Marshal(b, m, deterministic)
+}
+func (dst *AcknowledgeTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcknowledgeTaskRequest.Merge(dst, src)
+}
+func (m *AcknowledgeTaskRequest) XXX_Size() int {
+	return xxx_messageInfo_AcknowledgeTaskRequest.Size(m)
+}
+func (m *AcknowledgeTaskRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AcknowledgeTaskRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AcknowledgeTaskRequest proto.InternalMessageInfo
+
+func (m *AcknowledgeTaskRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *AcknowledgeTaskRequest) GetScheduleTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ScheduleTime
+	}
+	return nil
+}
+
+// Request message for renewing a lease using
+// [RenewLease][google.cloud.tasks.v2beta2.CloudTasks.RenewLease].
+type RenewLeaseRequest struct {
+	// Required.
+	//
+	// The task name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required.
+	//
+	// The task's current schedule time, available in the
+	// [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] returned by
+	// [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] response or
+	// [RenewLease][google.cloud.tasks.v2beta2.CloudTasks.RenewLease] response. This restriction is
+	// to ensure that your worker currently holds the lease.
+	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	// Required.
+	//
+	// The desired new lease duration, starting from now.
+	//
+	//
+	// The maximum lease duration is 1 week.
+	// `lease_duration` will be truncated to the nearest second.
+	LeaseDuration *duration.Duration `protobuf:"bytes,3,opt,name=lease_duration,json=leaseDuration,proto3" json:"lease_duration,omitempty"`
+	// The response_view specifies which subset of the [Task][google.cloud.tasks.v2beta2.Task] will be
+	// returned.
+	//
+	// By default response_view is [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC]; not all
+	// information is retrieved by default because some data, such as
+	// payloads, might be desirable to return only when needed because
+	// of its large size or because of the sensitivity of data that it
+	// contains.
+	//
+	// Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+	// `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+	// permission on the [Task][google.cloud.tasks.v2beta2.Task] resource.
+	ResponseView         Task_View `protobuf:"varint,4,opt,name=response_view,json=responseView,proto3,enum=google.cloud.tasks.v2beta2.Task_View" json:"response_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *RenewLeaseRequest) Reset()         { *m = RenewLeaseRequest{} }
+func (m *RenewLeaseRequest) String() string { return proto.CompactTextString(m) }
+func (*RenewLeaseRequest) ProtoMessage()    {}
+func (*RenewLeaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{17}
+}
+func (m *RenewLeaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RenewLeaseRequest.Unmarshal(m, b)
+}
+func (m *RenewLeaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RenewLeaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *RenewLeaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RenewLeaseRequest.Merge(dst, src)
+}
+func (m *RenewLeaseRequest) XXX_Size() int {
+	return xxx_messageInfo_RenewLeaseRequest.Size(m)
+}
+func (m *RenewLeaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RenewLeaseRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RenewLeaseRequest proto.InternalMessageInfo
+
+func (m *RenewLeaseRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *RenewLeaseRequest) GetScheduleTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ScheduleTime
+	}
+	return nil
+}
+
+func (m *RenewLeaseRequest) GetLeaseDuration() *duration.Duration {
+	if m != nil {
+		return m.LeaseDuration
+	}
+	return nil
+}
+
+func (m *RenewLeaseRequest) GetResponseView() Task_View {
+	if m != nil {
+		return m.ResponseView
+	}
+	return Task_VIEW_UNSPECIFIED
+}
+
+// Request message for canceling a lease using
+// [CancelLease][google.cloud.tasks.v2beta2.CloudTasks.CancelLease].
+type CancelLeaseRequest struct {
+	// Required.
+	//
+	// The task name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required.
+	//
+	// The task's current schedule time, available in the
+	// [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] returned by
+	// [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] response or
+	// [RenewLease][google.cloud.tasks.v2beta2.CloudTasks.RenewLease] response. This restriction is
+	// to ensure that your worker currently holds the lease.
+	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	// The response_view specifies which subset of the [Task][google.cloud.tasks.v2beta2.Task] will be
+	// returned.
+	//
+	// By default response_view is [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC]; not all
+	// information is retrieved by default because some data, such as
+	// payloads, might be desirable to return only when needed because
+	// of its large size or because of the sensitivity of data that it
+	// contains.
+	//
+	// Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+	// `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+	// permission on the [Task][google.cloud.tasks.v2beta2.Task] resource.
+	ResponseView         Task_View `protobuf:"varint,3,opt,name=response_view,json=responseView,proto3,enum=google.cloud.tasks.v2beta2.Task_View" json:"response_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CancelLeaseRequest) Reset()         { *m = CancelLeaseRequest{} }
+func (m *CancelLeaseRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelLeaseRequest) ProtoMessage()    {}
+func (*CancelLeaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{18}
+}
+func (m *CancelLeaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelLeaseRequest.Unmarshal(m, b)
+}
+func (m *CancelLeaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelLeaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelLeaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelLeaseRequest.Merge(dst, src)
+}
+func (m *CancelLeaseRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelLeaseRequest.Size(m)
+}
+func (m *CancelLeaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelLeaseRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CancelLeaseRequest proto.InternalMessageInfo
+
+func (m *CancelLeaseRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *CancelLeaseRequest) GetScheduleTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ScheduleTime
+	}
+	return nil
+}
+
+func (m *CancelLeaseRequest) GetResponseView() Task_View {
+	if m != nil {
+		return m.ResponseView
+	}
+	return Task_VIEW_UNSPECIFIED
+}
+
+// Request message for forcing a task to run now using
+// [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask].
+type RunTaskRequest struct {
+	// Required.
+	//
+	// The task name. For example:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The response_view specifies which subset of the [Task][google.cloud.tasks.v2beta2.Task] will be
+	// returned.
+	//
+	// By default response_view is [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC]; not all
+	// information is retrieved by default because some data, such as
+	// payloads, might be desirable to return only when needed because
+	// of its large size or because of the sensitivity of data that it
+	// contains.
+	//
+	// Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+	// `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+	// permission on the [Task][google.cloud.tasks.v2beta2.Task] resource.
+	ResponseView         Task_View `protobuf:"varint,2,opt,name=response_view,json=responseView,proto3,enum=google.cloud.tasks.v2beta2.Task_View" json:"response_view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *RunTaskRequest) Reset()         { *m = RunTaskRequest{} }
+func (m *RunTaskRequest) String() string { return proto.CompactTextString(m) }
+func (*RunTaskRequest) ProtoMessage()    {}
+func (*RunTaskRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudtasks_6e81f3e473b385a7, []int{19}
+}
+func (m *RunTaskRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunTaskRequest.Unmarshal(m, b)
+}
+func (m *RunTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunTaskRequest.Marshal(b, m, deterministic)
+}
+func (dst *RunTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunTaskRequest.Merge(dst, src)
+}
+func (m *RunTaskRequest) XXX_Size() int {
+	return xxx_messageInfo_RunTaskRequest.Size(m)
+}
+func (m *RunTaskRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunTaskRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RunTaskRequest proto.InternalMessageInfo
+
+func (m *RunTaskRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *RunTaskRequest) GetResponseView() Task_View {
+	if m != nil {
+		return m.ResponseView
+	}
+	return Task_VIEW_UNSPECIFIED
+}
+
+func init() {
+	proto.RegisterType((*ListQueuesRequest)(nil), "google.cloud.tasks.v2beta2.ListQueuesRequest")
+	proto.RegisterType((*ListQueuesResponse)(nil), "google.cloud.tasks.v2beta2.ListQueuesResponse")
+	proto.RegisterType((*GetQueueRequest)(nil), "google.cloud.tasks.v2beta2.GetQueueRequest")
+	proto.RegisterType((*CreateQueueRequest)(nil), "google.cloud.tasks.v2beta2.CreateQueueRequest")
+	proto.RegisterType((*UpdateQueueRequest)(nil), "google.cloud.tasks.v2beta2.UpdateQueueRequest")
+	proto.RegisterType((*DeleteQueueRequest)(nil), "google.cloud.tasks.v2beta2.DeleteQueueRequest")
+	proto.RegisterType((*PurgeQueueRequest)(nil), "google.cloud.tasks.v2beta2.PurgeQueueRequest")
+	proto.RegisterType((*PauseQueueRequest)(nil), "google.cloud.tasks.v2beta2.PauseQueueRequest")
+	proto.RegisterType((*ResumeQueueRequest)(nil), "google.cloud.tasks.v2beta2.ResumeQueueRequest")
+	proto.RegisterType((*ListTasksRequest)(nil), "google.cloud.tasks.v2beta2.ListTasksRequest")
+	proto.RegisterType((*ListTasksResponse)(nil), "google.cloud.tasks.v2beta2.ListTasksResponse")
+	proto.RegisterType((*GetTaskRequest)(nil), "google.cloud.tasks.v2beta2.GetTaskRequest")
+	proto.RegisterType((*CreateTaskRequest)(nil), "google.cloud.tasks.v2beta2.CreateTaskRequest")
+	proto.RegisterType((*DeleteTaskRequest)(nil), "google.cloud.tasks.v2beta2.DeleteTaskRequest")
+	proto.RegisterType((*LeaseTasksRequest)(nil), "google.cloud.tasks.v2beta2.LeaseTasksRequest")
+	proto.RegisterType((*LeaseTasksResponse)(nil), "google.cloud.tasks.v2beta2.LeaseTasksResponse")
+	proto.RegisterType((*AcknowledgeTaskRequest)(nil), "google.cloud.tasks.v2beta2.AcknowledgeTaskRequest")
+	proto.RegisterType((*RenewLeaseRequest)(nil), "google.cloud.tasks.v2beta2.RenewLeaseRequest")
+	proto.RegisterType((*CancelLeaseRequest)(nil), "google.cloud.tasks.v2beta2.CancelLeaseRequest")
+	proto.RegisterType((*RunTaskRequest)(nil), "google.cloud.tasks.v2beta2.RunTaskRequest")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// CloudTasksClient is the client API for CloudTasks service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type CloudTasksClient interface {
+	// Lists queues.
+	//
+	// Queues are returned in lexicographical order.
+	ListQueues(ctx context.Context, in *ListQueuesRequest, opts ...grpc.CallOption) (*ListQueuesResponse, error)
+	// Gets a queue.
+	GetQueue(ctx context.Context, in *GetQueueRequest, opts ...grpc.CallOption) (*Queue, error)
+	// Creates a queue.
+	//
+	// Queues created with this method allow tasks to live for a maximum of 31
+	// days. After a task is 31 days old, the task will be deleted regardless of whether
+	// it was dispatched or not.
+	//
+	// WARNING: Using this method may have unintended side effects if you are
+	// using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+	// Read
+	// [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+	// before using this method.
+	CreateQueue(ctx context.Context, in *CreateQueueRequest, opts ...grpc.CallOption) (*Queue, error)
+	// Updates a queue.
+	//
+	// This method creates the queue if it does not exist and updates
+	// the queue if it does exist.
+	//
+	// Queues created with this method allow tasks to live for a maximum of 31
+	// days. After a task is 31 days old, the task will be deleted regardless of whether
+	// it was dispatched or not.
+	//
+	// WARNING: Using this method may have unintended side effects if you are
+	// using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+	// Read
+	// [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+	// before using this method.
+	UpdateQueue(ctx context.Context, in *UpdateQueueRequest, opts ...grpc.CallOption) (*Queue, error)
+	// Deletes a queue.
+	//
+	// This command will delete the queue even if it has tasks in it.
+	//
+	// Note: If you delete a queue, a queue with the same name can't be created
+	// for 7 days.
+	//
+	// WARNING: Using this method may have unintended side effects if you are
+	// using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+	// Read
+	// [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+	// before using this method.
+	DeleteQueue(ctx context.Context, in *DeleteQueueRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Purges a queue by deleting all of its tasks.
+	//
+	// All tasks created before this method is called are permanently deleted.
+	//
+	// Purge operations can take up to one minute to take effect. Tasks
+	// might be dispatched before the purge takes effect. A purge is irreversible.
+	PurgeQueue(ctx context.Context, in *PurgeQueueRequest, opts ...grpc.CallOption) (*Queue, error)
+	// Pauses the queue.
+	//
+	// If a queue is paused then the system will stop dispatching tasks
+	// until the queue is resumed via
+	// [ResumeQueue][google.cloud.tasks.v2beta2.CloudTasks.ResumeQueue]. Tasks can still be added
+	// when the queue is paused. A queue is paused if its
+	// [state][google.cloud.tasks.v2beta2.Queue.state] is [PAUSED][google.cloud.tasks.v2beta2.Queue.State.PAUSED].
+	PauseQueue(ctx context.Context, in *PauseQueueRequest, opts ...grpc.CallOption) (*Queue, error)
+	// Resume a queue.
+	//
+	// This method resumes a queue after it has been
+	// [PAUSED][google.cloud.tasks.v2beta2.Queue.State.PAUSED] or
+	// [DISABLED][google.cloud.tasks.v2beta2.Queue.State.DISABLED]. The state of a queue is stored
+	// in the queue's [state][google.cloud.tasks.v2beta2.Queue.state]; after calling this method it
+	// will be set to [RUNNING][google.cloud.tasks.v2beta2.Queue.State.RUNNING].
+	//
+	// WARNING: Resuming many high-QPS queues at the same time can
+	// lead to target overloading. If you are resuming high-QPS
+	// queues, follow the 500/50/5 pattern described in
+	// [Managing Cloud Tasks Scaling Risks](https://cloud.google.com/tasks/docs/manage-cloud-task-scaling).
+	ResumeQueue(ctx context.Context, in *ResumeQueueRequest, opts ...grpc.CallOption) (*Queue, error)
+	// Gets the access control policy for a [Queue][google.cloud.tasks.v2beta2.Queue].
+	// Returns an empty policy if the resource exists and does not have a policy
+	// set.
+	//
+	// Authorization requires the following
+	// [Google IAM](https://cloud.google.com/iam) permission on the specified
+	// resource parent:
+	//
+	// * `cloudtasks.queues.getIamPolicy`
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
+	// Sets the access control policy for a [Queue][google.cloud.tasks.v2beta2.Queue]. Replaces any existing
+	// policy.
+	//
+	// Note: The Cloud Console does not check queue-level IAM permissions yet.
+	// Project-level permissions are required to use the Cloud Console.
+	//
+	// Authorization requires the following
+	// [Google IAM](https://cloud.google.com/iam) permission on the specified
+	// resource parent:
+	//
+	// * `cloudtasks.queues.setIamPolicy`
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
+	// Returns permissions that a caller has on a [Queue][google.cloud.tasks.v2beta2.Queue].
+	// If the resource does not exist, this will return an empty set of
+	// permissions, not a [NOT_FOUND][google.rpc.Code.NOT_FOUND] error.
+	//
+	// Note: This operation is designed to be used for building permission-aware
+	// UIs and command-line tools, not for authorization checking. This operation
+	// may "fail open" without warning.
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
+	// Lists the tasks in a queue.
+	//
+	// By default, only the [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC] view is retrieved
+	// due to performance considerations;
+	// [response_view][google.cloud.tasks.v2beta2.ListTasksRequest.response_view] controls the
+	// subset of information which is returned.
+	//
+	// The tasks may be returned in any order. The ordering may change at any
+	// time.
+	ListTasks(ctx context.Context, in *ListTasksRequest, opts ...grpc.CallOption) (*ListTasksResponse, error)
+	// Gets a task.
+	GetTask(ctx context.Context, in *GetTaskRequest, opts ...grpc.CallOption) (*Task, error)
+	// Creates a task and adds it to a queue.
+	//
+	// Tasks cannot be updated after creation; there is no UpdateTask command.
+	//
+	// * For [App Engine queues][google.cloud.tasks.v2beta2.AppEngineHttpTarget], the maximum task size is
+	//   100KB.
+	// * For [pull queues][google.cloud.tasks.v2beta2.PullTarget], the maximum task size is 1MB.
+	CreateTask(ctx context.Context, in *CreateTaskRequest, opts ...grpc.CallOption) (*Task, error)
+	// Deletes a task.
+	//
+	// A task can be deleted if it is scheduled or dispatched. A task
+	// cannot be deleted if it has completed successfully or permanently
+	// failed.
+	DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Leases tasks from a pull queue for
+	// [lease_duration][google.cloud.tasks.v2beta2.LeaseTasksRequest.lease_duration].
+	//
+	// This method is invoked by the worker to obtain a lease. The
+	// worker must acknowledge the task via
+	// [AcknowledgeTask][google.cloud.tasks.v2beta2.CloudTasks.AcknowledgeTask] after they have
+	// performed the work associated with the task.
+	//
+	// The [payload][google.cloud.tasks.v2beta2.PullMessage.payload] is intended to store data that
+	// the worker needs to perform the work associated with the task. To
+	// return the payloads in the [response][google.cloud.tasks.v2beta2.LeaseTasksResponse], set
+	// [response_view][google.cloud.tasks.v2beta2.LeaseTasksRequest.response_view] to
+	// [FULL][google.cloud.tasks.v2beta2.Task.View.FULL].
+	//
+	// A maximum of 10 qps of [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks]
+	// requests are allowed per
+	// queue. [RESOURCE_EXHAUSTED][google.rpc.Code.RESOURCE_EXHAUSTED]
+	// is returned when this limit is
+	// exceeded. [RESOURCE_EXHAUSTED][google.rpc.Code.RESOURCE_EXHAUSTED]
+	// is also returned when
+	// [max_tasks_dispatched_per_second][google.cloud.tasks.v2beta2.RateLimits.max_tasks_dispatched_per_second]
+	// is exceeded.
+	LeaseTasks(ctx context.Context, in *LeaseTasksRequest, opts ...grpc.CallOption) (*LeaseTasksResponse, error)
+	// Acknowledges a pull task.
+	//
+	// The worker, that is, the entity that
+	// [leased][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] this task must call this method
+	// to indicate that the work associated with the task has finished.
+	//
+	// The worker must acknowledge a task within the
+	// [lease_duration][google.cloud.tasks.v2beta2.LeaseTasksRequest.lease_duration] or the lease
+	// will expire and the task will become available to be leased
+	// again. After the task is acknowledged, it will not be returned
+	// by a later [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks],
+	// [GetTask][google.cloud.tasks.v2beta2.CloudTasks.GetTask], or
+	// [ListTasks][google.cloud.tasks.v2beta2.CloudTasks.ListTasks].
+	AcknowledgeTask(ctx context.Context, in *AcknowledgeTaskRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Renew the current lease of a pull task.
+	//
+	// The worker can use this method to extend the lease by a new
+	// duration, starting from now. The new task lease will be
+	// returned in the task's [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time].
+	RenewLease(ctx context.Context, in *RenewLeaseRequest, opts ...grpc.CallOption) (*Task, error)
+	// Cancel a pull task's lease.
+	//
+	// The worker can use this method to cancel a task's lease by
+	// setting its [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] to now. This will
+	// make the task available to be leased to the next caller of
+	// [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks].
+	CancelLease(ctx context.Context, in *CancelLeaseRequest, opts ...grpc.CallOption) (*Task, error)
+	// Forces a task to run now.
+	//
+	// When this method is called, Cloud Tasks will dispatch the task, even if
+	// the task is already running, the queue has reached its [RateLimits][google.cloud.tasks.v2beta2.RateLimits] or
+	// is [PAUSED][google.cloud.tasks.v2beta2.Queue.State.PAUSED].
+	//
+	// This command is meant to be used for manual debugging. For
+	// example, [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask] can be used to retry a failed
+	// task after a fix has been made or to manually force a task to be
+	// dispatched now.
+	//
+	// The dispatched task is returned. That is, the task that is returned
+	// contains the [status][google.cloud.tasks.v2beta2.Task.status] after the task is dispatched but
+	// before the task is received by its target.
+	//
+	// If Cloud Tasks receives a successful response from the task's
+	// target, then the task will be deleted; otherwise the task's
+	// [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] will be reset to the time that
+	// [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask] was called plus the retry delay specified
+	// in the queue's [RetryConfig][google.cloud.tasks.v2beta2.RetryConfig].
+	//
+	// [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask] returns
+	// [NOT_FOUND][google.rpc.Code.NOT_FOUND] when it is called on a
+	// task that has already succeeded or permanently failed.
+	//
+	// [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask] cannot be called on a
+	// [pull task][google.cloud.tasks.v2beta2.PullMessage].
+	RunTask(ctx context.Context, in *RunTaskRequest, opts ...grpc.CallOption) (*Task, error)
+}
+
+type cloudTasksClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewCloudTasksClient(cc *grpc.ClientConn) CloudTasksClient {
+	return &cloudTasksClient{cc}
+}
+
+func (c *cloudTasksClient) ListQueues(ctx context.Context, in *ListQueuesRequest, opts ...grpc.CallOption) (*ListQueuesResponse, error) {
+	out := new(ListQueuesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/ListQueues", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) GetQueue(ctx context.Context, in *GetQueueRequest, opts ...grpc.CallOption) (*Queue, error) {
+	out := new(Queue)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/GetQueue", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) CreateQueue(ctx context.Context, in *CreateQueueRequest, opts ...grpc.CallOption) (*Queue, error) {
+	out := new(Queue)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/CreateQueue", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) UpdateQueue(ctx context.Context, in *UpdateQueueRequest, opts ...grpc.CallOption) (*Queue, error) {
+	out := new(Queue)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/UpdateQueue", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) DeleteQueue(ctx context.Context, in *DeleteQueueRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/DeleteQueue", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) PurgeQueue(ctx context.Context, in *PurgeQueueRequest, opts ...grpc.CallOption) (*Queue, error) {
+	out := new(Queue)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/PurgeQueue", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) PauseQueue(ctx context.Context, in *PauseQueueRequest, opts ...grpc.CallOption) (*Queue, error) {
+	out := new(Queue)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/PauseQueue", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) ResumeQueue(ctx context.Context, in *ResumeQueueRequest, opts ...grpc.CallOption) (*Queue, error) {
+	out := new(Queue)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/ResumeQueue", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/GetIamPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/SetIamPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/TestIamPermissions", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) ListTasks(ctx context.Context, in *ListTasksRequest, opts ...grpc.CallOption) (*ListTasksResponse, error) {
+	out := new(ListTasksResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/ListTasks", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) GetTask(ctx context.Context, in *GetTaskRequest, opts ...grpc.CallOption) (*Task, error) {
+	out := new(Task)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/GetTask", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) CreateTask(ctx context.Context, in *CreateTaskRequest, opts ...grpc.CallOption) (*Task, error) {
+	out := new(Task)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/CreateTask", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/DeleteTask", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) LeaseTasks(ctx context.Context, in *LeaseTasksRequest, opts ...grpc.CallOption) (*LeaseTasksResponse, error) {
+	out := new(LeaseTasksResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/LeaseTasks", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) AcknowledgeTask(ctx context.Context, in *AcknowledgeTaskRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/AcknowledgeTask", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) RenewLease(ctx context.Context, in *RenewLeaseRequest, opts ...grpc.CallOption) (*Task, error) {
+	out := new(Task)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/RenewLease", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) CancelLease(ctx context.Context, in *CancelLeaseRequest, opts ...grpc.CallOption) (*Task, error) {
+	out := new(Task)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/CancelLease", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *cloudTasksClient) RunTask(ctx context.Context, in *RunTaskRequest, opts ...grpc.CallOption) (*Task, error) {
+	out := new(Task)
+	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2beta2.CloudTasks/RunTask", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// CloudTasksServer is the server API for CloudTasks service.
+type CloudTasksServer interface {
+	// Lists queues.
+	//
+	// Queues are returned in lexicographical order.
+	ListQueues(context.Context, *ListQueuesRequest) (*ListQueuesResponse, error)
+	// Gets a queue.
+	GetQueue(context.Context, *GetQueueRequest) (*Queue, error)
+	// Creates a queue.
+	//
+	// Queues created with this method allow tasks to live for a maximum of 31
+	// days. After a task is 31 days old, the task will be deleted regardless of whether
+	// it was dispatched or not.
+	//
+	// WARNING: Using this method may have unintended side effects if you are
+	// using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+	// Read
+	// [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+	// before using this method.
+	CreateQueue(context.Context, *CreateQueueRequest) (*Queue, error)
+	// Updates a queue.
+	//
+	// This method creates the queue if it does not exist and updates
+	// the queue if it does exist.
+	//
+	// Queues created with this method allow tasks to live for a maximum of 31
+	// days. After a task is 31 days old, the task will be deleted regardless of whether
+	// it was dispatched or not.
+	//
+	// WARNING: Using this method may have unintended side effects if you are
+	// using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+	// Read
+	// [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+	// before using this method.
+	UpdateQueue(context.Context, *UpdateQueueRequest) (*Queue, error)
+	// Deletes a queue.
+	//
+	// This command will delete the queue even if it has tasks in it.
+	//
+	// Note: If you delete a queue, a queue with the same name can't be created
+	// for 7 days.
+	//
+	// WARNING: Using this method may have unintended side effects if you are
+	// using an App Engine `queue.yaml` or `queue.xml` file to manage your queues.
+	// Read
+	// [Overview of Queue Management and queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml)
+	// before using this method.
+	DeleteQueue(context.Context, *DeleteQueueRequest) (*empty.Empty, error)
+	// Purges a queue by deleting all of its tasks.
+	//
+	// All tasks created before this method is called are permanently deleted.
+	//
+	// Purge operations can take up to one minute to take effect. Tasks
+	// might be dispatched before the purge takes effect. A purge is irreversible.
+	PurgeQueue(context.Context, *PurgeQueueRequest) (*Queue, error)
+	// Pauses the queue.
+	//
+	// If a queue is paused then the system will stop dispatching tasks
+	// until the queue is resumed via
+	// [ResumeQueue][google.cloud.tasks.v2beta2.CloudTasks.ResumeQueue]. Tasks can still be added
+	// when the queue is paused. A queue is paused if its
+	// [state][google.cloud.tasks.v2beta2.Queue.state] is [PAUSED][google.cloud.tasks.v2beta2.Queue.State.PAUSED].
+	PauseQueue(context.Context, *PauseQueueRequest) (*Queue, error)
+	// Resume a queue.
+	//
+	// This method resumes a queue after it has been
+	// [PAUSED][google.cloud.tasks.v2beta2.Queue.State.PAUSED] or
+	// [DISABLED][google.cloud.tasks.v2beta2.Queue.State.DISABLED]. The state of a queue is stored
+	// in the queue's [state][google.cloud.tasks.v2beta2.Queue.state]; after calling this method it
+	// will be set to [RUNNING][google.cloud.tasks.v2beta2.Queue.State.RUNNING].
+	//
+	// WARNING: Resuming many high-QPS queues at the same time can
+	// lead to target overloading. If you are resuming high-QPS
+	// queues, follow the 500/50/5 pattern described in
+	// [Managing Cloud Tasks Scaling Risks](https://cloud.google.com/tasks/docs/manage-cloud-task-scaling).
+	ResumeQueue(context.Context, *ResumeQueueRequest) (*Queue, error)
+	// Gets the access control policy for a [Queue][google.cloud.tasks.v2beta2.Queue].
+	// Returns an empty policy if the resource exists and does not have a policy
+	// set.
+	//
+	// Authorization requires the following
+	// [Google IAM](https://cloud.google.com/iam) permission on the specified
+	// resource parent:
+	//
+	// * `cloudtasks.queues.getIamPolicy`
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
+	// Sets the access control policy for a [Queue][google.cloud.tasks.v2beta2.Queue]. Replaces any existing
+	// policy.
+	//
+	// Note: The Cloud Console does not check queue-level IAM permissions yet.
+	// Project-level permissions are required to use the Cloud Console.
+	//
+	// Authorization requires the following
+	// [Google IAM](https://cloud.google.com/iam) permission on the specified
+	// resource parent:
+	//
+	// * `cloudtasks.queues.setIamPolicy`
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
+	// Returns permissions that a caller has on a [Queue][google.cloud.tasks.v2beta2.Queue].
+	// If the resource does not exist, this will return an empty set of
+	// permissions, not a [NOT_FOUND][google.rpc.Code.NOT_FOUND] error.
+	//
+	// Note: This operation is designed to be used for building permission-aware
+	// UIs and command-line tools, not for authorization checking. This operation
+	// may "fail open" without warning.
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
+	// Lists the tasks in a queue.
+	//
+	// By default, only the [BASIC][google.cloud.tasks.v2beta2.Task.View.BASIC] view is retrieved
+	// due to performance considerations;
+	// [response_view][google.cloud.tasks.v2beta2.ListTasksRequest.response_view] controls the
+	// subset of information which is returned.
+	//
+	// The tasks may be returned in any order. The ordering may change at any
+	// time.
+	ListTasks(context.Context, *ListTasksRequest) (*ListTasksResponse, error)
+	// Gets a task.
+	GetTask(context.Context, *GetTaskRequest) (*Task, error)
+	// Creates a task and adds it to a queue.
+	//
+	// Tasks cannot be updated after creation; there is no UpdateTask command.
+	//
+	// * For [App Engine queues][google.cloud.tasks.v2beta2.AppEngineHttpTarget], the maximum task size is
+	//   100KB.
+	// * For [pull queues][google.cloud.tasks.v2beta2.PullTarget], the maximum task size is 1MB.
+	CreateTask(context.Context, *CreateTaskRequest) (*Task, error)
+	// Deletes a task.
+	//
+	// A task can be deleted if it is scheduled or dispatched. A task
+	// cannot be deleted if it has completed successfully or permanently
+	// failed.
+	DeleteTask(context.Context, *DeleteTaskRequest) (*empty.Empty, error)
+	// Leases tasks from a pull queue for
+	// [lease_duration][google.cloud.tasks.v2beta2.LeaseTasksRequest.lease_duration].
+	//
+	// This method is invoked by the worker to obtain a lease. The
+	// worker must acknowledge the task via
+	// [AcknowledgeTask][google.cloud.tasks.v2beta2.CloudTasks.AcknowledgeTask] after they have
+	// performed the work associated with the task.
+	//
+	// The [payload][google.cloud.tasks.v2beta2.PullMessage.payload] is intended to store data that
+	// the worker needs to perform the work associated with the task. To
+	// return the payloads in the [response][google.cloud.tasks.v2beta2.LeaseTasksResponse], set
+	// [response_view][google.cloud.tasks.v2beta2.LeaseTasksRequest.response_view] to
+	// [FULL][google.cloud.tasks.v2beta2.Task.View.FULL].
+	//
+	// A maximum of 10 qps of [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks]
+	// requests are allowed per
+	// queue. [RESOURCE_EXHAUSTED][google.rpc.Code.RESOURCE_EXHAUSTED]
+	// is returned when this limit is
+	// exceeded. [RESOURCE_EXHAUSTED][google.rpc.Code.RESOURCE_EXHAUSTED]
+	// is also returned when
+	// [max_tasks_dispatched_per_second][google.cloud.tasks.v2beta2.RateLimits.max_tasks_dispatched_per_second]
+	// is exceeded.
+	LeaseTasks(context.Context, *LeaseTasksRequest) (*LeaseTasksResponse, error)
+	// Acknowledges a pull task.
+	//
+	// The worker, that is, the entity that
+	// [leased][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] this task must call this method
+	// to indicate that the work associated with the task has finished.
+	//
+	// The worker must acknowledge a task within the
+	// [lease_duration][google.cloud.tasks.v2beta2.LeaseTasksRequest.lease_duration] or the lease
+	// will expire and the task will become available to be leased
+	// again. After the task is acknowledged, it will not be returned
+	// by a later [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks],
+	// [GetTask][google.cloud.tasks.v2beta2.CloudTasks.GetTask], or
+	// [ListTasks][google.cloud.tasks.v2beta2.CloudTasks.ListTasks].
+	AcknowledgeTask(context.Context, *AcknowledgeTaskRequest) (*empty.Empty, error)
+	// Renew the current lease of a pull task.
+	//
+	// The worker can use this method to extend the lease by a new
+	// duration, starting from now. The new task lease will be
+	// returned in the task's [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time].
+	RenewLease(context.Context, *RenewLeaseRequest) (*Task, error)
+	// Cancel a pull task's lease.
+	//
+	// The worker can use this method to cancel a task's lease by
+	// setting its [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] to now. This will
+	// make the task available to be leased to the next caller of
+	// [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks].
+	CancelLease(context.Context, *CancelLeaseRequest) (*Task, error)
+	// Forces a task to run now.
+	//
+	// When this method is called, Cloud Tasks will dispatch the task, even if
+	// the task is already running, the queue has reached its [RateLimits][google.cloud.tasks.v2beta2.RateLimits] or
+	// is [PAUSED][google.cloud.tasks.v2beta2.Queue.State.PAUSED].
+	//
+	// This command is meant to be used for manual debugging. For
+	// example, [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask] can be used to retry a failed
+	// task after a fix has been made or to manually force a task to be
+	// dispatched now.
+	//
+	// The dispatched task is returned. That is, the task that is returned
+	// contains the [status][google.cloud.tasks.v2beta2.Task.status] after the task is dispatched but
+	// before the task is received by its target.
+	//
+	// If Cloud Tasks receives a successful response from the task's
+	// target, then the task will be deleted; otherwise the task's
+	// [schedule_time][google.cloud.tasks.v2beta2.Task.schedule_time] will be reset to the time that
+	// [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask] was called plus the retry delay specified
+	// in the queue's [RetryConfig][google.cloud.tasks.v2beta2.RetryConfig].
+	//
+	// [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask] returns
+	// [NOT_FOUND][google.rpc.Code.NOT_FOUND] when it is called on a
+	// task that has already succeeded or permanently failed.
+	//
+	// [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask] cannot be called on a
+	// [pull task][google.cloud.tasks.v2beta2.PullMessage].
+	RunTask(context.Context, *RunTaskRequest) (*Task, error)
+}
+
+func RegisterCloudTasksServer(s *grpc.Server, srv CloudTasksServer) {
+	s.RegisterService(&_CloudTasks_serviceDesc, srv)
+}
+
+func _CloudTasks_ListQueues_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListQueuesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).ListQueues(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/ListQueues",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).ListQueues(ctx, req.(*ListQueuesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_GetQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetQueueRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).GetQueue(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/GetQueue",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).GetQueue(ctx, req.(*GetQueueRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_CreateQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateQueueRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).CreateQueue(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/CreateQueue",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).CreateQueue(ctx, req.(*CreateQueueRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_UpdateQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateQueueRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).UpdateQueue(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/UpdateQueue",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).UpdateQueue(ctx, req.(*UpdateQueueRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_DeleteQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteQueueRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).DeleteQueue(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/DeleteQueue",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).DeleteQueue(ctx, req.(*DeleteQueueRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_PurgeQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PurgeQueueRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).PurgeQueue(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/PurgeQueue",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).PurgeQueue(ctx, req.(*PurgeQueueRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_PauseQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PauseQueueRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).PauseQueue(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/PauseQueue",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).PauseQueue(ctx, req.(*PauseQueueRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_ResumeQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ResumeQueueRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).ResumeQueue(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/ResumeQueue",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).ResumeQueue(ctx, req.(*ResumeQueueRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(v1.GetIamPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).GetIamPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/GetIamPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(v1.SetIamPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).SetIamPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/SetIamPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(v1.TestIamPermissionsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).TestIamPermissions(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/TestIamPermissions",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_ListTasks_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListTasksRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).ListTasks(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/ListTasks",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).ListTasks(ctx, req.(*ListTasksRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_GetTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetTaskRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).GetTask(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/GetTask",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).GetTask(ctx, req.(*GetTaskRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_CreateTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateTaskRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).CreateTask(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/CreateTask",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).CreateTask(ctx, req.(*CreateTaskRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_DeleteTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteTaskRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).DeleteTask(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/DeleteTask",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).DeleteTask(ctx, req.(*DeleteTaskRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_LeaseTasks_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(LeaseTasksRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).LeaseTasks(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/LeaseTasks",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).LeaseTasks(ctx, req.(*LeaseTasksRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_AcknowledgeTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AcknowledgeTaskRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).AcknowledgeTask(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/AcknowledgeTask",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).AcknowledgeTask(ctx, req.(*AcknowledgeTaskRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_RenewLease_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RenewLeaseRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).RenewLease(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/RenewLease",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).RenewLease(ctx, req.(*RenewLeaseRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_CancelLease_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CancelLeaseRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).CancelLease(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/CancelLease",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).CancelLease(ctx, req.(*CancelLeaseRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _CloudTasks_RunTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RunTaskRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CloudTasksServer).RunTask(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.tasks.v2beta2.CloudTasks/RunTask",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CloudTasksServer).RunTask(ctx, req.(*RunTaskRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _CloudTasks_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.tasks.v2beta2.CloudTasks",
+	HandlerType: (*CloudTasksServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListQueues",
+			Handler:    _CloudTasks_ListQueues_Handler,
+		},
+		{
+			MethodName: "GetQueue",
+			Handler:    _CloudTasks_GetQueue_Handler,
+		},
+		{
+			MethodName: "CreateQueue",
+			Handler:    _CloudTasks_CreateQueue_Handler,
+		},
+		{
+			MethodName: "UpdateQueue",
+			Handler:    _CloudTasks_UpdateQueue_Handler,
+		},
+		{
+			MethodName: "DeleteQueue",
+			Handler:    _CloudTasks_DeleteQueue_Handler,
+		},
+		{
+			MethodName: "PurgeQueue",
+			Handler:    _CloudTasks_PurgeQueue_Handler,
+		},
+		{
+			MethodName: "PauseQueue",
+			Handler:    _CloudTasks_PauseQueue_Handler,
+		},
+		{
+			MethodName: "ResumeQueue",
+			Handler:    _CloudTasks_ResumeQueue_Handler,
+		},
+		{
+			MethodName: "GetIamPolicy",
+			Handler:    _CloudTasks_GetIamPolicy_Handler,
+		},
+		{
+			MethodName: "SetIamPolicy",
+			Handler:    _CloudTasks_SetIamPolicy_Handler,
+		},
+		{
+			MethodName: "TestIamPermissions",
+			Handler:    _CloudTasks_TestIamPermissions_Handler,
+		},
+		{
+			MethodName: "ListTasks",
+			Handler:    _CloudTasks_ListTasks_Handler,
+		},
+		{
+			MethodName: "GetTask",
+			Handler:    _CloudTasks_GetTask_Handler,
+		},
+		{
+			MethodName: "CreateTask",
+			Handler:    _CloudTasks_CreateTask_Handler,
+		},
+		{
+			MethodName: "DeleteTask",
+			Handler:    _CloudTasks_DeleteTask_Handler,
+		},
+		{
+			MethodName: "LeaseTasks",
+			Handler:    _CloudTasks_LeaseTasks_Handler,
+		},
+		{
+			MethodName: "AcknowledgeTask",
+			Handler:    _CloudTasks_AcknowledgeTask_Handler,
+		},
+		{
+			MethodName: "RenewLease",
+			Handler:    _CloudTasks_RenewLease_Handler,
+		},
+		{
+			MethodName: "CancelLease",
+			Handler:    _CloudTasks_CancelLease_Handler,
+		},
+		{
+			MethodName: "RunTask",
+			Handler:    _CloudTasks_RunTask_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/tasks/v2beta2/cloudtasks.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/tasks/v2beta2/cloudtasks.proto", fileDescriptor_cloudtasks_6e81f3e473b385a7)
+}
+
+var fileDescriptor_cloudtasks_6e81f3e473b385a7 = []byte{
+	// 1382 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xdf, 0x6f, 0x14, 0x55,
+	0x14, 0xc7, 0x73, 0x4b, 0x17, 0xe8, 0x59, 0xda, 0xba, 0x37, 0x81, 0x94, 0x45, 0xb1, 0xde, 0x04,
+	0x58, 0x17, 0xd9, 0x09, 0xab, 0x80, 0x6c, 0x05, 0x4a, 0x0b, 0x14, 0x05, 0x4c, 0x99, 0x56, 0x1f,
+	0x7c, 0xd9, 0x0c, 0xb3, 0x97, 0x75, 0xec, 0xfc, 0x62, 0x7e, 0xb4, 0x15, 0x6d, 0x4c, 0x7c, 0xf4,
+	0xc1, 0x17, 0x8c, 0xf1, 0xcd, 0x9f, 0x31, 0x31, 0x91, 0x98, 0x98, 0xf0, 0xe6, 0x7f, 0xe1, 0xbf,
+	0xe0, 0xb3, 0xf1, 0xc9, 0x67, 0x73, 0x7f, 0xcc, 0xce, 0x74, 0xa6, 0x3b, 0x33, 0x5d, 0x28, 0xf1,
+	0xa9, 0x9d, 0x7b, 0xcf, 0xbd, 0xe7, 0x73, 0xcf, 0x3d, 0xf7, 0xde, 0xef, 0x59, 0x38, 0xdd, 0x77,
+	0x9c, 0xbe, 0x49, 0x15, 0xdd, 0x74, 0xc2, 0x9e, 0x12, 0x68, 0xfe, 0x9a, 0xaf, 0xac, 0xb7, 0xef,
+	0xd1, 0x40, 0x6b, 0x8b, 0x36, 0xde, 0xd4, 0x72, 0x3d, 0x27, 0x70, 0x70, 0x5d, 0x18, 0xb7, 0x78,
+	0x47, 0x4b, 0xf4, 0x48, 0xe3, 0xfa, 0x8b, 0x72, 0x22, 0xcd, 0x35, 0x14, 0xcd, 0xb6, 0x9d, 0x40,
+	0x0b, 0x0c, 0xc7, 0x96, 0x23, 0xeb, 0x27, 0x73, 0xdc, 0x3c, 0x08, 0x69, 0x48, 0xa5, 0xdd, 0x89,
+	0x1c, 0x3b, 0xf6, 0x25, 0xcd, 0x8e, 0x4b, 0x33, 0x43, 0xb3, 0x94, 0xf5, 0xb3, 0xec, 0x4f, 0xd7,
+	0x75, 0x4c, 0x43, 0xff, 0x58, 0xf6, 0xd7, 0xb7, 0xf7, 0x6f, 0xeb, 0x8b, 0xc6, 0xf2, 0xaf, 0x7b,
+	0xe1, 0x7d, 0xa5, 0x17, 0x7a, 0x9c, 0x55, 0xf6, 0x1f, 0x4b, 0xf7, 0x53, 0xcb, 0x0d, 0xa2, 0xc1,
+	0xb3, 0xe9, 0xce, 0xfb, 0x06, 0x35, 0x7b, 0x5d, 0x2b, 0x46, 0x7b, 0x39, 0x6d, 0x11, 0x18, 0x16,
+	0xf5, 0x03, 0xcd, 0x72, 0xa5, 0xc1, 0x61, 0x69, 0xe0, 0xb9, 0xba, 0xa2, 0x3b, 0x3d, 0xb9, 0x72,
+	0xf2, 0x19, 0xd4, 0x6e, 0x1b, 0x7e, 0x70, 0x97, 0x05, 0xc3, 0x57, 0xe9, 0x83, 0x90, 0xfa, 0x01,
+	0x3e, 0x02, 0xfb, 0x5d, 0xcd, 0xa3, 0x76, 0x30, 0x83, 0x66, 0x51, 0x63, 0x42, 0x95, 0x5f, 0xac,
+	0xfd, 0xbe, 0x61, 0x06, 0xd4, 0x9b, 0x19, 0x13, 0xed, 0xe2, 0x0b, 0x1f, 0x83, 0x09, 0x57, 0xeb,
+	0xd3, 0xae, 0x6f, 0x3c, 0xa4, 0x33, 0xfb, 0x66, 0x51, 0xa3, 0xa2, 0x1e, 0x64, 0x0d, 0x2b, 0xc6,
+	0x43, 0x8a, 0x5f, 0x02, 0xe0, 0x9d, 0x81, 0xb3, 0x46, 0xed, 0x99, 0x71, 0x3e, 0x90, 0x9b, 0xaf,
+	0xb2, 0x06, 0xb2, 0x01, 0x38, 0x09, 0xe0, 0xbb, 0x8e, 0xed, 0x53, 0x7c, 0x11, 0xf6, 0xf3, 0xfd,
+	0xf1, 0x67, 0xd0, 0xec, 0xbe, 0x46, 0xb5, 0xfd, 0x4a, 0x6b, 0x78, 0x0e, 0xb4, 0xf8, 0x58, 0x55,
+	0x0e, 0xc0, 0x27, 0x61, 0xda, 0xa6, 0x9b, 0x41, 0x37, 0xe1, 0x54, 0xd0, 0x4e, 0xb2, 0xe6, 0xe5,
+	0x81, 0xe3, 0x13, 0x30, 0xbd, 0x44, 0x85, 0xdf, 0x68, 0xdd, 0x18, 0xc6, 0x6d, 0xcd, 0xa2, 0x72,
+	0xd5, 0xfc, 0x7f, 0x42, 0x01, 0x2f, 0x7a, 0x54, 0x0b, 0xe8, 0x36, 0xcb, 0x61, 0x11, 0xba, 0x00,
+	0x15, 0x8e, 0xc1, 0x5d, 0x96, 0xc2, 0x16, 0xf6, 0xe4, 0x0b, 0x04, 0xf8, 0x3d, 0xb7, 0x97, 0xf6,
+	0x33, 0x98, 0x0f, 0xed, 0x6e, 0x3e, 0x3c, 0x07, 0xd5, 0x90, 0x4f, 0xc7, 0x93, 0x44, 0xe2, 0xd4,
+	0xa3, 0xe1, 0x51, 0x96, 0xb4, 0x6e, 0xb0, 0x3c, 0xba, 0xa3, 0xf9, 0x6b, 0x2a, 0x08, 0x73, 0xf6,
+	0x3f, 0x69, 0x00, 0xbe, 0x46, 0x4d, 0x9a, 0x62, 0xd9, 0x29, 0x3a, 0xa7, 0xa0, 0xb6, 0x1c, 0x7a,
+	0xfd, 0x72, 0x86, 0x5a, 0xe8, 0x17, 0x1b, 0x36, 0x00, 0xab, 0xd4, 0x0f, 0xad, 0x62, 0xcb, 0xdf,
+	0x11, 0xbc, 0xc0, 0x52, 0x67, 0x95, 0x45, 0xa1, 0x68, 0x63, 0xde, 0x81, 0x49, 0x4f, 0x26, 0x57,
+	0x77, 0xdd, 0xa0, 0x1b, 0x3c, 0x22, 0x53, 0xed, 0x13, 0x79, 0x01, 0x65, 0x13, 0xb7, 0xde, 0x37,
+	0xe8, 0x86, 0x7a, 0x28, 0x1a, 0xcb, 0xbe, 0xb6, 0xa7, 0xfb, 0x78, 0x6e, 0xba, 0x57, 0xd2, 0xe9,
+	0xee, 0x8b, 0xf3, 0x26, 0x99, 0x65, 0xb6, 0x9f, 0x87, 0x0a, 0xf7, 0x2c, 0x93, 0x7d, 0xb6, 0x08,
+	0x4a, 0x15, 0xe6, 0xa5, 0x53, 0xdd, 0x85, 0xa9, 0x25, 0xca, 0x7d, 0xe6, 0xc4, 0xf3, 0x59, 0x86,
+	0x88, 0x3c, 0x46, 0x50, 0x13, 0xc7, 0x26, 0xe9, 0x75, 0xd8, 0xe6, 0xbc, 0x01, 0xe3, 0x41, 0x9c,
+	0xa5, 0xc5, 0xcb, 0xe7, 0xd6, 0x59, 0xde, 0x7d, 0xa3, 0xf3, 0x9e, 0x82, 0x9a, 0xc8, 0xf8, 0x82,
+	0x20, 0x91, 0xbf, 0x11, 0xd4, 0x6e, 0x53, 0xcd, 0xa7, 0xa5, 0xb2, 0xee, 0x18, 0x4c, 0x58, 0xda,
+	0x66, 0x57, 0x6c, 0xee, 0x98, 0xc8, 0x14, 0x4b, 0xdb, 0xe4, 0x63, 0xf1, 0x3c, 0x4c, 0x99, 0x6c,
+	0xa6, 0x6e, 0xf4, 0x12, 0xf0, 0x05, 0x54, 0xdb, 0x47, 0x33, 0xa7, 0xf4, 0x9a, 0x34, 0x50, 0x27,
+	0xf9, 0x80, 0xe8, 0x33, 0x1b, 0x81, 0xf1, 0xd1, 0x93, 0x3a, 0xbe, 0xdb, 0x2b, 0xc9, 0xbb, 0x9d,
+	0xdc, 0x06, 0x9c, 0x5c, 0xef, 0xd3, 0x65, 0x2c, 0xb1, 0xe0, 0xc8, 0x55, 0x7d, 0xcd, 0x76, 0x36,
+	0x4c, 0xda, 0xeb, 0x17, 0x05, 0x1b, 0x5f, 0x81, 0x49, 0x5f, 0xff, 0x90, 0xf6, 0x42, 0x93, 0x76,
+	0xd9, 0x7b, 0x36, 0xf4, 0x1a, 0x5b, 0x8d, 0x1e, 0x3b, 0xf5, 0x50, 0x34, 0x80, 0x35, 0x91, 0x7f,
+	0x11, 0xd4, 0x54, 0x6a, 0xd3, 0x0d, 0xbe, 0x84, 0xbd, 0x74, 0xf5, 0xff, 0xda, 0x4d, 0xf2, 0x04,
+	0x01, 0x5e, 0xd4, 0x6c, 0x9d, 0x9a, 0x7b, 0xbf, 0xf2, 0x67, 0x79, 0x0e, 0x5d, 0x98, 0x52, 0x43,
+	0xfb, 0x39, 0xde, 0x54, 0xed, 0x7f, 0x8e, 0x02, 0x2c, 0x32, 0x7b, 0x71, 0x28, 0x7f, 0x42, 0x00,
+	0xb1, 0x1e, 0xc1, 0x67, 0xf2, 0xa6, 0xcc, 0x08, 0xa7, 0x7a, 0xab, 0xac, 0xb9, 0x00, 0x20, 0x17,
+	0x3e, 0xff, 0xf3, 0xaf, 0x47, 0x63, 0x67, 0xb1, 0x32, 0x50, 0x9b, 0x9f, 0x88, 0x9b, 0xe3, 0x92,
+	0xeb, 0x39, 0x1f, 0x51, 0x3d, 0xf0, 0x95, 0xa6, 0x62, 0x3a, 0xba, 0x10, 0xb5, 0x4a, 0x73, 0x4b,
+	0x91, 0x22, 0xe7, 0x11, 0x82, 0x83, 0x91, 0x7a, 0xc1, 0xa7, 0xf3, 0xbc, 0xa6, 0x34, 0x4e, 0xbd,
+	0x58, 0x42, 0xec, 0x44, 0xc5, 0xc2, 0x3e, 0x84, 0x49, 0x22, 0x29, 0xcd, 0x2d, 0xfc, 0x1d, 0x82,
+	0x6a, 0x42, 0x2c, 0xe1, 0xdc, 0x70, 0x64, 0x55, 0x55, 0x19, 0xb6, 0xcb, 0x9c, 0xed, 0x4d, 0xb2,
+	0xdb, 0x88, 0x75, 0xa4, 0x2e, 0xfa, 0x19, 0x41, 0x35, 0xa1, 0xb3, 0xf2, 0x11, 0xb3, 0x82, 0xac,
+	0x0c, 0xe2, 0x35, 0x8e, 0x78, 0xb9, 0x7d, 0x2e, 0x46, 0x14, 0xb5, 0x46, 0xa9, 0x20, 0x46, 0xa0,
+	0x5f, 0x22, 0xa8, 0x26, 0x44, 0x58, 0x3e, 0x68, 0x56, 0xad, 0xd5, 0x8f, 0x64, 0xce, 0xef, 0x75,
+	0x56, 0x50, 0x44, 0x9b, 0xdb, 0x1c, 0x65, 0x73, 0x21, 0xd6, 0x7a, 0xf9, 0x27, 0x23, 0xa3, 0x09,
+	0xcb, 0xc4, 0x6d, 0x9e, 0x93, 0x75, 0xc8, 0xb9, 0x5d, 0x92, 0x75, 0x5c, 0xe6, 0xad, 0x83, 0x9a,
+	0x02, 0x71, 0xa0, 0x32, 0x0b, 0x10, 0xd3, 0x6a, 0x74, 0x6f, 0x11, 0x99, 0x37, 0x86, 0xf8, 0x23,
+	0x82, 0x6a, 0x42, 0xdf, 0xe6, 0x6f, 0x6b, 0x56, 0x08, 0x97, 0x81, 0xbc, 0xca, 0x21, 0xe7, 0xc8,
+	0xf9, 0xdd, 0x42, 0x7a, 0xdc, 0x1d, 0xa3, 0xfc, 0x1a, 0xc1, 0xa1, 0x25, 0x1a, 0xbc, 0xad, 0x59,
+	0xcb, 0xbc, 0x86, 0xc5, 0x24, 0x72, 0x6b, 0x68, 0x56, 0x6b, 0xfd, 0x6c, 0x2b, 0xd9, 0x19, 0xa1,
+	0x1d, 0x4e, 0xd9, 0x88, 0x5e, 0x72, 0x8b, 0xe3, 0x5c, 0x27, 0xf3, 0x31, 0x8e, 0x47, 0x7d, 0x27,
+	0xf4, 0xf4, 0x12, 0x48, 0xfd, 0x84, 0x9f, 0x08, 0x6c, 0x25, 0x0f, 0x6c, 0xe5, 0x39, 0x81, 0xf9,
+	0x29, 0xb0, 0x3f, 0x10, 0xe0, 0x55, 0xea, 0xf3, 0x46, 0xea, 0x59, 0x86, 0xef, 0xb3, 0x21, 0xb8,
+	0x91, 0x72, 0x9d, 0x35, 0x89, 0x20, 0x5f, 0x2d, 0x61, 0x29, 0x5f, 0x8d, 0xbb, 0x1c, 0xfc, 0x16,
+	0xb9, 0x31, 0x0a, 0x78, 0x90, 0x99, 0x97, 0xe1, 0xff, 0x82, 0x60, 0x62, 0x50, 0x97, 0xe0, 0xd7,
+	0x8a, 0x9e, 0xb1, 0xa4, 0xf8, 0xad, 0x9f, 0x29, 0x69, 0x2d, 0xe9, 0xaf, 0x70, 0xfa, 0x8b, 0xf8,
+	0x42, 0xc9, 0x1b, 0x3c, 0x66, 0x17, 0x3f, 0xcc, 0xe0, 0x6f, 0x10, 0x1c, 0x90, 0xe5, 0x0c, 0x6e,
+	0x16, 0x3c, 0x7d, 0x09, 0x25, 0x51, 0x2f, 0x14, 0xa9, 0x3b, 0xa1, 0x95, 0x39, 0x39, 0xf2, 0x07,
+	0xa3, 0xe6, 0x16, 0xfe, 0x1e, 0x01, 0xc4, 0x65, 0x4f, 0xfe, 0x05, 0x94, 0x29, 0x8f, 0x4a, 0x00,
+	0x2e, 0x70, 0xc0, 0xb7, 0xc8, 0xa8, 0xb1, 0x63, 0x5b, 0xfd, 0x15, 0x02, 0x88, 0x6b, 0x9d, 0x7c,
+	0xc6, 0x4c, 0x4d, 0x34, 0xf4, 0x59, 0x91, 0xa1, 0x6b, 0x8e, 0x1c, 0xba, 0x27, 0x4c, 0x78, 0x0d,
+	0x0a, 0x8d, 0x02, 0xe1, 0x95, 0x2e, 0xc0, 0x0a, 0x84, 0x57, 0xa6, 0x7e, 0x21, 0x37, 0x39, 0xee,
+	0x02, 0xb9, 0x34, 0x6a, 0x20, 0xb9, 0x74, 0x67, 0xe1, 0x7c, 0x8c, 0x60, 0x3a, 0x55, 0xd2, 0xe0,
+	0x76, 0x1e, 0xcd, 0xce, 0xf5, 0xcf, 0xd0, 0xc0, 0xbe, 0xcb, 0x49, 0x6f, 0x92, 0xc5, 0x11, 0x03,
+	0xdb, 0xd1, 0x62, 0x7f, 0x8c, 0xf7, 0x57, 0x04, 0x10, 0x97, 0x44, 0xf9, 0x71, 0xce, 0x94, 0x4e,
+	0x25, 0x52, 0xf4, 0x0e, 0xe7, 0x5d, 0x22, 0x0b, 0xa3, 0xf2, 0x7a, 0x03, 0xa7, 0x0c, 0xf7, 0x37,
+	0x26, 0x29, 0xe3, 0x42, 0xa6, 0x40, 0x52, 0x66, 0x2a, 0x9e, 0x12, 0xc0, 0x4f, 0x1d, 0x60, 0x3d,
+	0xf6, 0xca, 0x88, 0xbf, 0x45, 0x70, 0x40, 0xd6, 0x30, 0xf9, 0xd7, 0xd3, 0xf6, 0x42, 0xa7, 0x04,
+	0xe9, 0x0d, 0x4e, 0x3a, 0x4f, 0xe6, 0x46, 0x0e, 0x6d, 0x68, 0x77, 0x50, 0x73, 0xe1, 0x53, 0x38,
+	0xae, 0x3b, 0x56, 0x8e, 0xbb, 0x85, 0xe9, 0xb8, 0x22, 0x5a, 0x66, 0xe9, 0xb8, 0x8c, 0x3e, 0xb8,
+	0x22, 0xcd, 0xfb, 0x8e, 0xa9, 0xd9, 0xfd, 0x96, 0xe3, 0xf5, 0x95, 0x3e, 0xb5, 0x79, 0xb2, 0x2a,
+	0xa2, 0x4b, 0x73, 0x0d, 0x7f, 0xa7, 0x5f, 0xd0, 0xe7, 0xf8, 0xd7, 0x0f, 0x63, 0x95, 0xd5, 0xab,
+	0x2b, 0xb7, 0x56, 0xee, 0xed, 0xe7, 0x63, 0x5e, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x01, 0x6f,
+	0x4f, 0xe1, 0x03, 0x18, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/queue.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/queue.pb.go
new file mode 100644
index 00000000..0f779161
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/queue.pb.go
@@ -0,0 +1,782 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/tasks/v2beta2/queue.proto
+
+package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// State of the queue.
+type Queue_State int32
+
+const (
+	// Unspecified state.
+	Queue_STATE_UNSPECIFIED Queue_State = 0
+	// The queue is running. Tasks can be dispatched.
+	//
+	// If the queue was created using Cloud Tasks and the queue has
+	// had no activity (method calls or task dispatches) for 30 days,
+	// the queue may take a few minutes to re-activate. Some method
+	// calls may return [NOT_FOUND][google.rpc.Code.NOT_FOUND] and
+	// tasks may not be dispatched for a few minutes until the queue
+	// has been re-activated.
+	Queue_RUNNING Queue_State = 1
+	// Tasks are paused by the user. If the queue is paused then Cloud
+	// Tasks will stop delivering tasks from it, but more tasks can
+	// still be added to it by the user. When a pull queue is paused,
+	// all [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] calls will return a
+	// [FAILED_PRECONDITION][google.rpc.Code.FAILED_PRECONDITION].
+	Queue_PAUSED Queue_State = 2
+	// The queue is disabled.
+	//
+	// A queue becomes `DISABLED` when
+	// [queue.yaml](https://cloud.google.com/appengine/docs/python/config/queueref) or
+	// [queue.xml](https://cloud.google.com/appengine/docs/standard/java/config/queueref) is uploaded
+	// which does not contain the queue. You cannot directly disable a queue.
+	//
+	// When a queue is disabled, tasks can still be added to a queue
+	// but the tasks are not dispatched and
+	// [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] calls return a
+	// `FAILED_PRECONDITION` error.
+	//
+	// To permanently delete this queue and all of its tasks, call
+	// [DeleteQueue][google.cloud.tasks.v2beta2.CloudTasks.DeleteQueue].
+	Queue_DISABLED Queue_State = 3
+)
+
+var Queue_State_name = map[int32]string{
+	0: "STATE_UNSPECIFIED",
+	1: "RUNNING",
+	2: "PAUSED",
+	3: "DISABLED",
+}
+var Queue_State_value = map[string]int32{
+	"STATE_UNSPECIFIED": 0,
+	"RUNNING":           1,
+	"PAUSED":            2,
+	"DISABLED":          3,
+}
+
+func (x Queue_State) String() string {
+	return proto.EnumName(Queue_State_name, int32(x))
+}
+func (Queue_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_queue_c4ed304f84e85348, []int{0, 0}
+}
+
+// A queue is a container of related tasks. Queues are configured to manage
+// how those tasks are dispatched. Configurable properties include rate limits,
+// retry options, target types, and others.
+type Queue struct {
+	// Caller-specified and required in [CreateQueue][google.cloud.tasks.v2beta2.CloudTasks.CreateQueue],
+	// after which it becomes output only.
+	//
+	// The queue name.
+	//
+	// The queue name must have the following format:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`
+	//
+	// * `PROJECT_ID` can contain letters ([A-Za-z]), numbers ([0-9]),
+	//    hyphens (-), colons (:), or periods (.).
+	//    For more information, see
+	//    [Identifying projects](https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects)
+	// * `LOCATION_ID` is the canonical ID for the queue's location.
+	//    The list of available locations can be obtained by calling
+	//    [ListLocations][google.cloud.location.Locations.ListLocations].
+	//    For more information, see https://cloud.google.com/about/locations/.
+	// * `QUEUE_ID` can contain letters ([A-Za-z]), numbers ([0-9]), or
+	//   hyphens (-). The maximum length is 100 characters.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Caller-specified and required in [CreateQueue][google.cloud.tasks.v2beta2.CloudTasks.CreateQueue][],
+	// after which the queue config type becomes output only, though fields within
+	// the config are mutable.
+	//
+	// The queue's target.
+	//
+	// The target applies to all tasks in the queue.
+	//
+	// Types that are valid to be assigned to TargetType:
+	//	*Queue_AppEngineHttpTarget
+	//	*Queue_PullTarget
+	TargetType isQueue_TargetType `protobuf_oneof:"target_type"`
+	// Rate limits for task dispatches.
+	//
+	// [rate_limits][google.cloud.tasks.v2beta2.Queue.rate_limits] and
+	// [retry_config][google.cloud.tasks.v2beta2.Queue.retry_config] are related because they both
+	// control task attempts however they control how tasks are
+	// attempted in different ways:
+	//
+	// * [rate_limits][google.cloud.tasks.v2beta2.Queue.rate_limits] controls the total rate of
+	//   dispatches from a queue (i.e. all traffic dispatched from the
+	//   queue, regardless of whether the dispatch is from a first
+	//   attempt or a retry).
+	// * [retry_config][google.cloud.tasks.v2beta2.Queue.retry_config] controls what happens to
+	//   particular a task after its first attempt fails. That is,
+	//   [retry_config][google.cloud.tasks.v2beta2.Queue.retry_config] controls task retries (the
+	//   second attempt, third attempt, etc).
+	RateLimits *RateLimits `protobuf:"bytes,5,opt,name=rate_limits,json=rateLimits,proto3" json:"rate_limits,omitempty"`
+	// Settings that determine the retry behavior.
+	//
+	// * For tasks created using Cloud Tasks: the queue-level retry settings
+	//   apply to all tasks in the queue that were created using Cloud Tasks.
+	//   Retry settings cannot be set on individual tasks.
+	// * For tasks created using the App Engine SDK: the queue-level retry
+	//   settings apply to all tasks in the queue which do not have retry settings
+	//   explicitly set on the task and were created by the App Engine SDK. See
+	//   [App Engine documentation](https://cloud.google.com/appengine/docs/standard/python/taskqueue/push/retrying-tasks).
+	RetryConfig *RetryConfig `protobuf:"bytes,6,opt,name=retry_config,json=retryConfig,proto3" json:"retry_config,omitempty"`
+	// Output only. The state of the queue.
+	//
+	// `state` can only be changed by called
+	// [PauseQueue][google.cloud.tasks.v2beta2.CloudTasks.PauseQueue],
+	// [ResumeQueue][google.cloud.tasks.v2beta2.CloudTasks.ResumeQueue], or uploading
+	// [queue.yaml/xml](https://cloud.google.com/appengine/docs/python/config/queueref).
+	// [UpdateQueue][google.cloud.tasks.v2beta2.CloudTasks.UpdateQueue] cannot be used to change `state`.
+	State Queue_State `protobuf:"varint,7,opt,name=state,proto3,enum=google.cloud.tasks.v2beta2.Queue_State" json:"state,omitempty"`
+	// Output only. The last time this queue was purged.
+	//
+	// All tasks that were [created][google.cloud.tasks.v2beta2.Task.create_time] before this time
+	// were purged.
+	//
+	// A queue can be purged using [PurgeQueue][google.cloud.tasks.v2beta2.CloudTasks.PurgeQueue], the
+	// [App Engine Task Queue SDK, or the Cloud Console](https://cloud.google.com/appengine/docs/standard/python/taskqueue/push/deleting-tasks-and-queues#purging_all_tasks_from_a_queue).
+	//
+	// Purge time will be truncated to the nearest microsecond. Purge
+	// time will be unset if the queue has never been purged.
+	PurgeTime            *timestamp.Timestamp `protobuf:"bytes,8,opt,name=purge_time,json=purgeTime,proto3" json:"purge_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Queue) Reset()         { *m = Queue{} }
+func (m *Queue) String() string { return proto.CompactTextString(m) }
+func (*Queue) ProtoMessage()    {}
+func (*Queue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_queue_c4ed304f84e85348, []int{0}
+}
+func (m *Queue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Queue.Unmarshal(m, b)
+}
+func (m *Queue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Queue.Marshal(b, m, deterministic)
+}
+func (dst *Queue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Queue.Merge(dst, src)
+}
+func (m *Queue) XXX_Size() int {
+	return xxx_messageInfo_Queue.Size(m)
+}
+func (m *Queue) XXX_DiscardUnknown() {
+	xxx_messageInfo_Queue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Queue proto.InternalMessageInfo
+
+func (m *Queue) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+type isQueue_TargetType interface {
+	isQueue_TargetType()
+}
+
+type Queue_AppEngineHttpTarget struct {
+	AppEngineHttpTarget *AppEngineHttpTarget `protobuf:"bytes,3,opt,name=app_engine_http_target,json=appEngineHttpTarget,proto3,oneof"`
+}
+
+type Queue_PullTarget struct {
+	PullTarget *PullTarget `protobuf:"bytes,4,opt,name=pull_target,json=pullTarget,proto3,oneof"`
+}
+
+func (*Queue_AppEngineHttpTarget) isQueue_TargetType() {}
+
+func (*Queue_PullTarget) isQueue_TargetType() {}
+
+func (m *Queue) GetTargetType() isQueue_TargetType {
+	if m != nil {
+		return m.TargetType
+	}
+	return nil
+}
+
+func (m *Queue) GetAppEngineHttpTarget() *AppEngineHttpTarget {
+	if x, ok := m.GetTargetType().(*Queue_AppEngineHttpTarget); ok {
+		return x.AppEngineHttpTarget
+	}
+	return nil
+}
+
+func (m *Queue) GetPullTarget() *PullTarget {
+	if x, ok := m.GetTargetType().(*Queue_PullTarget); ok {
+		return x.PullTarget
+	}
+	return nil
+}
+
+func (m *Queue) GetRateLimits() *RateLimits {
+	if m != nil {
+		return m.RateLimits
+	}
+	return nil
+}
+
+func (m *Queue) GetRetryConfig() *RetryConfig {
+	if m != nil {
+		return m.RetryConfig
+	}
+	return nil
+}
+
+func (m *Queue) GetState() Queue_State {
+	if m != nil {
+		return m.State
+	}
+	return Queue_STATE_UNSPECIFIED
+}
+
+func (m *Queue) GetPurgeTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.PurgeTime
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Queue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Queue_OneofMarshaler, _Queue_OneofUnmarshaler, _Queue_OneofSizer, []interface{}{
+		(*Queue_AppEngineHttpTarget)(nil),
+		(*Queue_PullTarget)(nil),
+	}
+}
+
+func _Queue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Queue)
+	// target_type
+	switch x := m.TargetType.(type) {
+	case *Queue_AppEngineHttpTarget:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.AppEngineHttpTarget); err != nil {
+			return err
+		}
+	case *Queue_PullTarget:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.PullTarget); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Queue.TargetType has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Queue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Queue)
+	switch tag {
+	case 3: // target_type.app_engine_http_target
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AppEngineHttpTarget)
+		err := b.DecodeMessage(msg)
+		m.TargetType = &Queue_AppEngineHttpTarget{msg}
+		return true, err
+	case 4: // target_type.pull_target
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PullTarget)
+		err := b.DecodeMessage(msg)
+		m.TargetType = &Queue_PullTarget{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Queue_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Queue)
+	// target_type
+	switch x := m.TargetType.(type) {
+	case *Queue_AppEngineHttpTarget:
+		s := proto.Size(x.AppEngineHttpTarget)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Queue_PullTarget:
+		s := proto.Size(x.PullTarget)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Rate limits.
+//
+// This message determines the maximum rate that tasks can be dispatched by a
+// queue, regardless of whether the dispatch is a first task attempt or a retry.
+//
+// Note: The debugging command, [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask], will run a task
+// even if the queue has reached its [RateLimits][google.cloud.tasks.v2beta2.RateLimits].
+type RateLimits struct {
+	// The maximum rate at which tasks are dispatched from this queue.
+	//
+	// If unspecified when the queue is created, Cloud Tasks will pick the
+	// default.
+	//
+	// * For [App Engine queues][google.cloud.tasks.v2beta2.AppEngineHttpTarget], the maximum allowed value
+	//   is 500.
+	// * This field is output only   for [pull queues][google.cloud.tasks.v2beta2.PullTarget]. In addition to the
+	//   `max_tasks_dispatched_per_second` limit, a maximum of 10 QPS of
+	//   [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] requests are allowed per pull queue.
+	//
+	//
+	// This field has the same meaning as
+	// [rate in queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#rate).
+	MaxTasksDispatchedPerSecond float64 `protobuf:"fixed64,1,opt,name=max_tasks_dispatched_per_second,json=maxTasksDispatchedPerSecond,proto3" json:"max_tasks_dispatched_per_second,omitempty"`
+	// Output only. The max burst size.
+	//
+	// Max burst size limits how fast tasks in queue are processed when
+	// many tasks are in the queue and the rate is high. This field
+	// allows the queue to have a high rate so processing starts shortly
+	// after a task is enqueued, but still limits resource usage when
+	// many tasks are enqueued in a short period of time.
+	//
+	// The [token bucket](https://wikipedia.org/wiki/Token_Bucket)
+	// algorithm is used to control the rate of task dispatches. Each
+	// queue has a token bucket that holds tokens, up to the maximum
+	// specified by `max_burst_size`. Each time a task is dispatched, a
+	// token is removed from the bucket. Tasks will be dispatched until
+	// the queue's bucket runs out of tokens. The bucket will be
+	// continuously refilled with new tokens based on
+	// [max_tasks_dispatched_per_second][google.cloud.tasks.v2beta2.RateLimits.max_tasks_dispatched_per_second].
+	//
+	// Cloud Tasks will pick the value of `max_burst_size` based on the
+	// value of
+	// [max_tasks_dispatched_per_second][google.cloud.tasks.v2beta2.RateLimits.max_tasks_dispatched_per_second].
+	//
+	// For App Engine queues that were created or updated using
+	// `queue.yaml/xml`, `max_burst_size` is equal to
+	// [bucket_size](https://cloud.google.com/appengine/docs/standard/python/config/queueref#bucket_size).
+	// Since `max_burst_size` is output only, if
+	// [UpdateQueue][google.cloud.tasks.v2beta2.CloudTasks.UpdateQueue] is called on a queue
+	// created by `queue.yaml/xml`, `max_burst_size` will be reset based
+	// on the value of
+	// [max_tasks_dispatched_per_second][google.cloud.tasks.v2beta2.RateLimits.max_tasks_dispatched_per_second],
+	// regardless of whether
+	// [max_tasks_dispatched_per_second][google.cloud.tasks.v2beta2.RateLimits.max_tasks_dispatched_per_second]
+	// is updated.
+	//
+	MaxBurstSize int32 `protobuf:"varint,2,opt,name=max_burst_size,json=maxBurstSize,proto3" json:"max_burst_size,omitempty"`
+	// The maximum number of concurrent tasks that Cloud Tasks allows
+	// to be dispatched for this queue. After this threshold has been
+	// reached, Cloud Tasks stops dispatching tasks until the number of
+	// concurrent requests decreases.
+	//
+	// If unspecified when the queue is created, Cloud Tasks will pick the
+	// default.
+	//
+	//
+	// The maximum allowed value is 5,000.
+	//
+	// This field is output only for
+	// [pull queues][google.cloud.tasks.v2beta2.PullTarget] and always -1, which indicates no limit. No other
+	// queue types can have `max_concurrent_tasks` set to -1.
+	//
+	//
+	// This field has the same meaning as
+	// [max_concurrent_requests in queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#max_concurrent_requests).
+	MaxConcurrentTasks   int32    `protobuf:"varint,3,opt,name=max_concurrent_tasks,json=maxConcurrentTasks,proto3" json:"max_concurrent_tasks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RateLimits) Reset()         { *m = RateLimits{} }
+func (m *RateLimits) String() string { return proto.CompactTextString(m) }
+func (*RateLimits) ProtoMessage()    {}
+func (*RateLimits) Descriptor() ([]byte, []int) {
+	return fileDescriptor_queue_c4ed304f84e85348, []int{1}
+}
+func (m *RateLimits) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RateLimits.Unmarshal(m, b)
+}
+func (m *RateLimits) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RateLimits.Marshal(b, m, deterministic)
+}
+func (dst *RateLimits) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RateLimits.Merge(dst, src)
+}
+func (m *RateLimits) XXX_Size() int {
+	return xxx_messageInfo_RateLimits.Size(m)
+}
+func (m *RateLimits) XXX_DiscardUnknown() {
+	xxx_messageInfo_RateLimits.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RateLimits proto.InternalMessageInfo
+
+func (m *RateLimits) GetMaxTasksDispatchedPerSecond() float64 {
+	if m != nil {
+		return m.MaxTasksDispatchedPerSecond
+	}
+	return 0
+}
+
+func (m *RateLimits) GetMaxBurstSize() int32 {
+	if m != nil {
+		return m.MaxBurstSize
+	}
+	return 0
+}
+
+func (m *RateLimits) GetMaxConcurrentTasks() int32 {
+	if m != nil {
+		return m.MaxConcurrentTasks
+	}
+	return 0
+}
+
+// Retry config.
+//
+// These settings determine how a failed task attempt is retried.
+type RetryConfig struct {
+	// Number of attempts per task.
+	//
+	// If unspecified when the queue is created, Cloud Tasks will pick the
+	// default.
+	//
+	//
+	//
+	// This field has the same meaning as
+	// [task_retry_limit in queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#retry_parameters).
+	//
+	// Types that are valid to be assigned to NumAttempts:
+	//	*RetryConfig_MaxAttempts
+	//	*RetryConfig_UnlimitedAttempts
+	NumAttempts isRetryConfig_NumAttempts `protobuf_oneof:"num_attempts"`
+	// If positive, `max_retry_duration` specifies the time limit for
+	// retrying a failed task, measured from when the task was first
+	// attempted. Once `max_retry_duration` time has passed *and* the
+	// task has been attempted [max_attempts][google.cloud.tasks.v2beta2.RetryConfig.max_attempts]
+	// times, no further attempts will be made and the task will be
+	// deleted.
+	//
+	// If zero, then the task age is unlimited.
+	//
+	// If unspecified when the queue is created, Cloud Tasks will pick the
+	// default.
+	//
+	// This field is output only for [pull queues][google.cloud.tasks.v2beta2.PullTarget].
+	//
+	//
+	// `max_retry_duration` will be truncated to the nearest second.
+	//
+	// This field has the same meaning as
+	// [task_age_limit in queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#retry_parameters).
+	MaxRetryDuration *duration.Duration `protobuf:"bytes,3,opt,name=max_retry_duration,json=maxRetryDuration,proto3" json:"max_retry_duration,omitempty"`
+	// A task will be [scheduled][google.cloud.tasks.v2beta2.Task.schedule_time] for retry between
+	// [min_backoff][google.cloud.tasks.v2beta2.RetryConfig.min_backoff] and
+	// [max_backoff][google.cloud.tasks.v2beta2.RetryConfig.max_backoff] duration after it fails,
+	// if the queue's [RetryConfig][google.cloud.tasks.v2beta2.RetryConfig] specifies that the task should be
+	// retried.
+	//
+	// If unspecified when the queue is created, Cloud Tasks will pick the
+	// default.
+	//
+	// This field is output only for [pull queues][google.cloud.tasks.v2beta2.PullTarget].
+	//
+	//
+	// `min_backoff` will be truncated to the nearest second.
+	//
+	// This field has the same meaning as
+	// [min_backoff_seconds in queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#retry_parameters).
+	MinBackoff *duration.Duration `protobuf:"bytes,4,opt,name=min_backoff,json=minBackoff,proto3" json:"min_backoff,omitempty"`
+	// A task will be [scheduled][google.cloud.tasks.v2beta2.Task.schedule_time] for retry between
+	// [min_backoff][google.cloud.tasks.v2beta2.RetryConfig.min_backoff] and
+	// [max_backoff][google.cloud.tasks.v2beta2.RetryConfig.max_backoff] duration after it fails,
+	// if the queue's [RetryConfig][google.cloud.tasks.v2beta2.RetryConfig] specifies that the task should be
+	// retried.
+	//
+	// If unspecified when the queue is created, Cloud Tasks will pick the
+	// default.
+	//
+	// This field is output only for [pull queues][google.cloud.tasks.v2beta2.PullTarget].
+	//
+	//
+	// `max_backoff` will be truncated to the nearest second.
+	//
+	// This field has the same meaning as
+	// [max_backoff_seconds in queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#retry_parameters).
+	MaxBackoff *duration.Duration `protobuf:"bytes,5,opt,name=max_backoff,json=maxBackoff,proto3" json:"max_backoff,omitempty"`
+	// The time between retries will double `max_doublings` times.
+	//
+	// A task's retry interval starts at
+	// [min_backoff][google.cloud.tasks.v2beta2.RetryConfig.min_backoff], then doubles
+	// `max_doublings` times, then increases linearly, and finally
+	// retries retries at intervals of
+	// [max_backoff][google.cloud.tasks.v2beta2.RetryConfig.max_backoff] up to
+	// [max_attempts][google.cloud.tasks.v2beta2.RetryConfig.max_attempts] times.
+	//
+	// For example, if [min_backoff][google.cloud.tasks.v2beta2.RetryConfig.min_backoff] is 10s,
+	// [max_backoff][google.cloud.tasks.v2beta2.RetryConfig.max_backoff] is 300s, and
+	// `max_doublings` is 3, then the a task will first be retried in
+	// 10s. The retry interval will double three times, and then
+	// increase linearly by 2^3 * 10s.  Finally, the task will retry at
+	// intervals of [max_backoff][google.cloud.tasks.v2beta2.RetryConfig.max_backoff] until the
+	// task has been attempted [max_attempts][google.cloud.tasks.v2beta2.RetryConfig.max_attempts]
+	// times. Thus, the requests will retry at 10s, 20s, 40s, 80s, 160s,
+	// 240s, 300s, 300s, ....
+	//
+	// If unspecified when the queue is created, Cloud Tasks will pick the
+	// default.
+	//
+	// This field is output only for [pull queues][google.cloud.tasks.v2beta2.PullTarget].
+	//
+	//
+	// This field has the same meaning as
+	// [max_doublings in queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#retry_parameters).
+	MaxDoublings         int32    `protobuf:"varint,6,opt,name=max_doublings,json=maxDoublings,proto3" json:"max_doublings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RetryConfig) Reset()         { *m = RetryConfig{} }
+func (m *RetryConfig) String() string { return proto.CompactTextString(m) }
+func (*RetryConfig) ProtoMessage()    {}
+func (*RetryConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_queue_c4ed304f84e85348, []int{2}
+}
+func (m *RetryConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RetryConfig.Unmarshal(m, b)
+}
+func (m *RetryConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RetryConfig.Marshal(b, m, deterministic)
+}
+func (dst *RetryConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryConfig.Merge(dst, src)
+}
+func (m *RetryConfig) XXX_Size() int {
+	return xxx_messageInfo_RetryConfig.Size(m)
+}
+func (m *RetryConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_RetryConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RetryConfig proto.InternalMessageInfo
+
+type isRetryConfig_NumAttempts interface {
+	isRetryConfig_NumAttempts()
+}
+
+type RetryConfig_MaxAttempts struct {
+	MaxAttempts int32 `protobuf:"varint,1,opt,name=max_attempts,json=maxAttempts,proto3,oneof"`
+}
+
+type RetryConfig_UnlimitedAttempts struct {
+	UnlimitedAttempts bool `protobuf:"varint,2,opt,name=unlimited_attempts,json=unlimitedAttempts,proto3,oneof"`
+}
+
+func (*RetryConfig_MaxAttempts) isRetryConfig_NumAttempts() {}
+
+func (*RetryConfig_UnlimitedAttempts) isRetryConfig_NumAttempts() {}
+
+func (m *RetryConfig) GetNumAttempts() isRetryConfig_NumAttempts {
+	if m != nil {
+		return m.NumAttempts
+	}
+	return nil
+}
+
+func (m *RetryConfig) GetMaxAttempts() int32 {
+	if x, ok := m.GetNumAttempts().(*RetryConfig_MaxAttempts); ok {
+		return x.MaxAttempts
+	}
+	return 0
+}
+
+func (m *RetryConfig) GetUnlimitedAttempts() bool {
+	if x, ok := m.GetNumAttempts().(*RetryConfig_UnlimitedAttempts); ok {
+		return x.UnlimitedAttempts
+	}
+	return false
+}
+
+func (m *RetryConfig) GetMaxRetryDuration() *duration.Duration {
+	if m != nil {
+		return m.MaxRetryDuration
+	}
+	return nil
+}
+
+func (m *RetryConfig) GetMinBackoff() *duration.Duration {
+	if m != nil {
+		return m.MinBackoff
+	}
+	return nil
+}
+
+func (m *RetryConfig) GetMaxBackoff() *duration.Duration {
+	if m != nil {
+		return m.MaxBackoff
+	}
+	return nil
+}
+
+func (m *RetryConfig) GetMaxDoublings() int32 {
+	if m != nil {
+		return m.MaxDoublings
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*RetryConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _RetryConfig_OneofMarshaler, _RetryConfig_OneofUnmarshaler, _RetryConfig_OneofSizer, []interface{}{
+		(*RetryConfig_MaxAttempts)(nil),
+		(*RetryConfig_UnlimitedAttempts)(nil),
+	}
+}
+
+func _RetryConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*RetryConfig)
+	// num_attempts
+	switch x := m.NumAttempts.(type) {
+	case *RetryConfig_MaxAttempts:
+		b.EncodeVarint(1<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.MaxAttempts))
+	case *RetryConfig_UnlimitedAttempts:
+		t := uint64(0)
+		if x.UnlimitedAttempts {
+			t = 1
+		}
+		b.EncodeVarint(2<<3 | proto.WireVarint)
+		b.EncodeVarint(t)
+	case nil:
+	default:
+		return fmt.Errorf("RetryConfig.NumAttempts has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _RetryConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*RetryConfig)
+	switch tag {
+	case 1: // num_attempts.max_attempts
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.NumAttempts = &RetryConfig_MaxAttempts{int32(x)}
+		return true, err
+	case 2: // num_attempts.unlimited_attempts
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.NumAttempts = &RetryConfig_UnlimitedAttempts{x != 0}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _RetryConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*RetryConfig)
+	// num_attempts
+	switch x := m.NumAttempts.(type) {
+	case *RetryConfig_MaxAttempts:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.MaxAttempts))
+	case *RetryConfig_UnlimitedAttempts:
+		n += 1 // tag and wire
+		n += 1
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+func init() {
+	proto.RegisterType((*Queue)(nil), "google.cloud.tasks.v2beta2.Queue")
+	proto.RegisterType((*RateLimits)(nil), "google.cloud.tasks.v2beta2.RateLimits")
+	proto.RegisterType((*RetryConfig)(nil), "google.cloud.tasks.v2beta2.RetryConfig")
+	proto.RegisterEnum("google.cloud.tasks.v2beta2.Queue_State", Queue_State_name, Queue_State_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/tasks/v2beta2/queue.proto", fileDescriptor_queue_c4ed304f84e85348)
+}
+
+var fileDescriptor_queue_c4ed304f84e85348 = []byte{
+	// 702 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xcb, 0x6e, 0xdb, 0x3a,
+	0x10, 0x86, 0xad, 0x24, 0xca, 0x65, 0xe4, 0x04, 0x0e, 0xcf, 0x05, 0x3e, 0x3e, 0x45, 0x62, 0x38,
+	0x45, 0xe2, 0x95, 0x54, 0xa4, 0xab, 0xb6, 0x28, 0x0a, 0x3b, 0x72, 0x63, 0x17, 0x81, 0xe1, 0xca,
+	0xce, 0xa6, 0x1b, 0x82, 0x96, 0x69, 0x45, 0x88, 0x44, 0xb2, 0x12, 0x55, 0x38, 0x79, 0xa4, 0x6e,
+	0xfb, 0x34, 0x7d, 0x9b, 0x82, 0xd4, 0x25, 0x45, 0xd3, 0x3a, 0x3b, 0x73, 0xe6, 0xfb, 0xff, 0x19,
+	0x71, 0x86, 0x86, 0xd3, 0x80, 0xf3, 0x20, 0xa2, 0x8e, 0x1f, 0xf1, 0x6c, 0xe1, 0x48, 0x92, 0xde,
+	0xa6, 0xce, 0x97, 0xf3, 0x39, 0x95, 0xe4, 0xdc, 0xf9, 0x9c, 0xd1, 0x8c, 0xda, 0x22, 0xe1, 0x92,
+	0xa3, 0x56, 0xce, 0xd9, 0x9a, 0xb3, 0x35, 0x67, 0x17, 0x5c, 0xeb, 0x59, 0xe1, 0x41, 0x44, 0xe8,
+	0x10, 0xc6, 0xb8, 0x24, 0x32, 0xe4, 0x2c, 0xcd, 0x95, 0xad, 0xb3, 0x35, 0x15, 0x24, 0x49, 0x02,
+	0x2a, 0x0b, 0xf0, 0xa8, 0x00, 0xf5, 0x69, 0x9e, 0x2d, 0x9d, 0x45, 0x96, 0x68, 0xa7, 0x22, 0x7f,
+	0xfc, 0x6b, 0x5e, 0x86, 0x31, 0x4d, 0x25, 0x89, 0x45, 0x0e, 0x74, 0xbe, 0x6d, 0x81, 0xf9, 0x51,
+	0xf5, 0x8c, 0x10, 0x6c, 0x31, 0x12, 0xd3, 0xa6, 0xd1, 0x36, 0xba, 0x7b, 0x9e, 0xfe, 0x8d, 0x96,
+	0xf0, 0x2f, 0x11, 0x02, 0x53, 0x16, 0x84, 0x8c, 0xe2, 0x1b, 0x29, 0x05, 0xce, 0xcb, 0x37, 0x37,
+	0xdb, 0x46, 0xd7, 0x3a, 0x77, 0xec, 0x3f, 0x7f, 0xa2, 0xdd, 0x13, 0x62, 0xa0, 0x85, 0x43, 0x29,
+	0xc5, 0x4c, 0xcb, 0x86, 0x35, 0xef, 0x2f, 0xf2, 0x38, 0x8c, 0x46, 0x60, 0x89, 0x2c, 0x8a, 0x4a,
+	0xf3, 0x2d, 0x6d, 0x7e, 0xba, 0xce, 0x7c, 0x92, 0x45, 0x51, 0xe5, 0x09, 0xa2, 0x3a, 0xa1, 0x4b,
+	0xb0, 0x12, 0x22, 0x29, 0x8e, 0xc2, 0x38, 0x94, 0x69, 0xd3, 0x7c, 0xda, 0xca, 0x23, 0x92, 0x5e,
+	0x69, 0xda, 0x83, 0xa4, 0xfa, 0x8d, 0x3e, 0x40, 0x3d, 0xa1, 0x32, 0xb9, 0xc3, 0x3e, 0x67, 0xcb,
+	0x30, 0x68, 0x6e, 0x6b, 0xa7, 0xb3, 0xb5, 0x4e, 0x8a, 0xbf, 0xd0, 0xb8, 0x67, 0x25, 0x0f, 0x07,
+	0xf4, 0x16, 0xcc, 0x54, 0x12, 0x49, 0x9b, 0x3b, 0x6d, 0xa3, 0x7b, 0xb0, 0xde, 0x44, 0x4f, 0xc3,
+	0x9e, 0x2a, 0xdc, 0xcb, 0x55, 0xe8, 0x15, 0x80, 0xc8, 0x92, 0x80, 0x62, 0x35, 0xbd, 0xe6, 0xae,
+	0x6e, 0xa4, 0x55, 0x7a, 0x94, 0xa3, 0xb5, 0x67, 0xe5, 0x68, 0xbd, 0x3d, 0x4d, 0xab, 0x73, 0x67,
+	0x00, 0xa6, 0xb6, 0x42, 0xff, 0xc0, 0xe1, 0x74, 0xd6, 0x9b, 0x0d, 0xf0, 0xf5, 0x78, 0x3a, 0x19,
+	0x5c, 0x8c, 0xde, 0x8f, 0x06, 0x6e, 0xa3, 0x86, 0x2c, 0xd8, 0xf1, 0xae, 0xc7, 0xe3, 0xd1, 0xf8,
+	0xb2, 0x61, 0x20, 0x80, 0xed, 0x49, 0xef, 0x7a, 0x3a, 0x70, 0x1b, 0x1b, 0xa8, 0x0e, 0xbb, 0xee,
+	0x68, 0xda, 0xeb, 0x5f, 0x0d, 0xdc, 0xc6, 0x66, 0x7f, 0x1f, 0xac, 0x7c, 0x36, 0x58, 0xde, 0x09,
+	0xda, 0xf9, 0x6a, 0x00, 0x3c, 0x5c, 0x1b, 0x72, 0xe1, 0x38, 0x26, 0x2b, 0xac, 0xbf, 0x03, 0x2f,
+	0xc2, 0x54, 0x10, 0xe9, 0xdf, 0xd0, 0x05, 0x16, 0x34, 0xc1, 0x29, 0xf5, 0x39, 0x5b, 0xe8, 0xad,
+	0x32, 0xbc, 0xff, 0x63, 0xb2, 0x9a, 0x29, 0xca, 0xad, 0xa0, 0x09, 0x4d, 0xa6, 0x1a, 0x41, 0xcf,
+	0xe1, 0x40, 0xb9, 0xcc, 0xb3, 0x24, 0x95, 0x38, 0x0d, 0xef, 0x69, 0x73, 0xa3, 0x6d, 0x74, 0x4d,
+	0xaf, 0x1e, 0x93, 0x55, 0x5f, 0x05, 0xa7, 0xe1, 0x3d, 0x45, 0x2f, 0xe0, 0x6f, 0x45, 0xf9, 0x9c,
+	0xf9, 0x59, 0x92, 0x50, 0x26, 0xf3, 0xb2, 0x7a, 0x21, 0x4d, 0x0f, 0xc5, 0x64, 0x75, 0x51, 0xa5,
+	0x74, 0xa9, 0xce, 0xf7, 0x0d, 0xb0, 0x7e, 0x9a, 0x0c, 0x3a, 0x01, 0xe5, 0x88, 0x89, 0x94, 0x34,
+	0x16, 0x32, 0xd5, 0xad, 0x99, 0xc3, 0x9a, 0x67, 0xc5, 0x64, 0xd5, 0x2b, 0x82, 0xc8, 0x01, 0x94,
+	0x31, 0xbd, 0x43, 0x74, 0xf1, 0x80, 0xaa, 0x86, 0x76, 0x87, 0x35, 0xef, 0xb0, 0xca, 0x55, 0x82,
+	0x4b, 0x50, 0xb5, 0x71, 0xbe, 0x32, 0xe5, 0x2b, 0x2c, 0x9e, 0xc9, 0x7f, 0x8f, 0x66, 0xe5, 0x16,
+	0x80, 0xd7, 0x88, 0xc9, 0x4a, 0x37, 0x57, 0x46, 0xd0, 0x6b, 0xb0, 0xe2, 0x90, 0xe1, 0x39, 0xf1,
+	0x6f, 0xf9, 0x72, 0x59, 0xbc, 0x85, 0x35, 0x0e, 0x10, 0x87, 0xac, 0x9f, 0xc3, 0x5a, 0xab, 0xae,
+	0xb0, 0xd0, 0x9a, 0x4f, 0x6b, 0xc9, 0xaa, 0xd4, 0x9e, 0xc0, 0xbe, 0xd2, 0x2e, 0x78, 0x36, 0x8f,
+	0x42, 0x16, 0xa4, 0x7a, 0xe1, 0xf3, 0xdb, 0x77, 0xcb, 0x58, 0xff, 0x00, 0xea, 0x2c, 0x8b, 0xab,
+	0x0b, 0xe9, 0x73, 0x38, 0xf2, 0x79, 0xbc, 0x66, 0x9d, 0xfb, 0xa0, 0xf7, 0x79, 0xa2, 0x4a, 0x4f,
+	0x8c, 0x4f, 0xef, 0x0a, 0x32, 0xe0, 0x11, 0x61, 0x81, 0xcd, 0x93, 0xc0, 0x09, 0x28, 0xd3, 0x8d,
+	0x39, 0x79, 0x8a, 0x88, 0x30, 0xfd, 0xdd, 0xff, 0xde, 0x1b, 0x7d, 0x9a, 0x6f, 0x6b, 0xf6, 0xe5,
+	0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xd1, 0xaa, 0xde, 0x84, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/target.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/target.pb.go
new file mode 100644
index 00000000..9725ed6d
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/target.pb.go
@@ -0,0 +1,626 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/tasks/v2beta2/target.proto
+
+package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "github.com/golang/protobuf/ptypes/duration"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The HTTP method used to execute the task.
+type HttpMethod int32
+
+const (
+	// HTTP method unspecified
+	HttpMethod_HTTP_METHOD_UNSPECIFIED HttpMethod = 0
+	// HTTP POST
+	HttpMethod_POST HttpMethod = 1
+	// HTTP GET
+	HttpMethod_GET HttpMethod = 2
+	// HTTP HEAD
+	HttpMethod_HEAD HttpMethod = 3
+	// HTTP PUT
+	HttpMethod_PUT HttpMethod = 4
+	// HTTP DELETE
+	HttpMethod_DELETE HttpMethod = 5
+)
+
+var HttpMethod_name = map[int32]string{
+	0: "HTTP_METHOD_UNSPECIFIED",
+	1: "POST",
+	2: "GET",
+	3: "HEAD",
+	4: "PUT",
+	5: "DELETE",
+}
+var HttpMethod_value = map[string]int32{
+	"HTTP_METHOD_UNSPECIFIED": 0,
+	"POST":   1,
+	"GET":    2,
+	"HEAD":   3,
+	"PUT":    4,
+	"DELETE": 5,
+}
+
+func (x HttpMethod) String() string {
+	return proto.EnumName(HttpMethod_name, int32(x))
+}
+func (HttpMethod) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_target_97396313f988895e, []int{0}
+}
+
+// Pull target.
+type PullTarget struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PullTarget) Reset()         { *m = PullTarget{} }
+func (m *PullTarget) String() string { return proto.CompactTextString(m) }
+func (*PullTarget) ProtoMessage()    {}
+func (*PullTarget) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_97396313f988895e, []int{0}
+}
+func (m *PullTarget) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PullTarget.Unmarshal(m, b)
+}
+func (m *PullTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PullTarget.Marshal(b, m, deterministic)
+}
+func (dst *PullTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullTarget.Merge(dst, src)
+}
+func (m *PullTarget) XXX_Size() int {
+	return xxx_messageInfo_PullTarget.Size(m)
+}
+func (m *PullTarget) XXX_DiscardUnknown() {
+	xxx_messageInfo_PullTarget.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PullTarget proto.InternalMessageInfo
+
+// The pull message contains data that can be used by the caller of
+// [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] to process the task.
+//
+// This proto can only be used for tasks in a queue which has
+// [pull_target][google.cloud.tasks.v2beta2.Queue.pull_target] set.
+type PullMessage struct {
+	// A data payload consumed by the worker to execute the task.
+	Payload []byte `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	// The task's tag.
+	//
+	// Tags allow similar tasks to be processed in a batch. If you label
+	// tasks with a tag, your worker can
+	// [lease tasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks] with the same tag using
+	// [filter][google.cloud.tasks.v2beta2.LeaseTasksRequest.filter]. For example, if you want to
+	// aggregate the events associated with a specific user once a day,
+	// you could tag tasks with the user ID.
+	//
+	// The task's tag can only be set when the
+	// [task is created][google.cloud.tasks.v2beta2.CloudTasks.CreateTask].
+	//
+	// The tag must be less than 500 characters.
+	//
+	// SDK compatibility: Although the SDK allows tags to be either
+	// string or [bytes](https://cloud.google.com/appengine/docs/standard/java/javadoc/com/google/appengine/api/taskqueue/TaskOptions.html#tag-byte:A-),
+	// only UTF-8 encoded tags can be used in Cloud Tasks. If a tag isn't UTF-8
+	// encoded, the tag will be empty when the task is returned by Cloud Tasks.
+	Tag                  string   `protobuf:"bytes,2,opt,name=tag,proto3" json:"tag,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PullMessage) Reset()         { *m = PullMessage{} }
+func (m *PullMessage) String() string { return proto.CompactTextString(m) }
+func (*PullMessage) ProtoMessage()    {}
+func (*PullMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_97396313f988895e, []int{1}
+}
+func (m *PullMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PullMessage.Unmarshal(m, b)
+}
+func (m *PullMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PullMessage.Marshal(b, m, deterministic)
+}
+func (dst *PullMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullMessage.Merge(dst, src)
+}
+func (m *PullMessage) XXX_Size() int {
+	return xxx_messageInfo_PullMessage.Size(m)
+}
+func (m *PullMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_PullMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PullMessage proto.InternalMessageInfo
+
+func (m *PullMessage) GetPayload() []byte {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (m *PullMessage) GetTag() string {
+	if m != nil {
+		return m.Tag
+	}
+	return ""
+}
+
+// App Engine HTTP target.
+//
+// The task will be delivered to the App Engine application hostname
+// specified by its [AppEngineHttpTarget][google.cloud.tasks.v2beta2.AppEngineHttpTarget] and [AppEngineHttpRequest][google.cloud.tasks.v2beta2.AppEngineHttpRequest].
+// The documentation for [AppEngineHttpRequest][google.cloud.tasks.v2beta2.AppEngineHttpRequest] explains how the
+// task's host URL is constructed.
+//
+// Using [AppEngineHttpTarget][google.cloud.tasks.v2beta2.AppEngineHttpTarget] requires
+// [`appengine.applications.get`](https://cloud.google.com/appengine/docs/admin-api/access-control)
+// Google IAM permission for the project
+// and the following scope:
+//
+// `https://www.googleapis.com/auth/cloud-platform`
+type AppEngineHttpTarget struct {
+	// Overrides for the
+	// [task-level app_engine_routing][google.cloud.tasks.v2beta2.AppEngineHttpRequest.app_engine_routing].
+	//
+	// If set, `app_engine_routing_override` is used for all tasks in
+	// the queue, no matter what the setting is for the
+	// [task-level app_engine_routing][google.cloud.tasks.v2beta2.AppEngineHttpRequest.app_engine_routing].
+	AppEngineRoutingOverride *AppEngineRouting `protobuf:"bytes,1,opt,name=app_engine_routing_override,json=appEngineRoutingOverride,proto3" json:"app_engine_routing_override,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{}          `json:"-"`
+	XXX_unrecognized         []byte            `json:"-"`
+	XXX_sizecache            int32             `json:"-"`
+}
+
+func (m *AppEngineHttpTarget) Reset()         { *m = AppEngineHttpTarget{} }
+func (m *AppEngineHttpTarget) String() string { return proto.CompactTextString(m) }
+func (*AppEngineHttpTarget) ProtoMessage()    {}
+func (*AppEngineHttpTarget) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_97396313f988895e, []int{2}
+}
+func (m *AppEngineHttpTarget) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AppEngineHttpTarget.Unmarshal(m, b)
+}
+func (m *AppEngineHttpTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AppEngineHttpTarget.Marshal(b, m, deterministic)
+}
+func (dst *AppEngineHttpTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpTarget.Merge(dst, src)
+}
+func (m *AppEngineHttpTarget) XXX_Size() int {
+	return xxx_messageInfo_AppEngineHttpTarget.Size(m)
+}
+func (m *AppEngineHttpTarget) XXX_DiscardUnknown() {
+	xxx_messageInfo_AppEngineHttpTarget.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AppEngineHttpTarget proto.InternalMessageInfo
+
+func (m *AppEngineHttpTarget) GetAppEngineRoutingOverride() *AppEngineRouting {
+	if m != nil {
+		return m.AppEngineRoutingOverride
+	}
+	return nil
+}
+
+// App Engine HTTP request.
+//
+// The message defines the HTTP request that is sent to an App Engine app when
+// the task is dispatched.
+//
+// This proto can only be used for tasks in a queue which has
+// [app_engine_http_target][google.cloud.tasks.v2beta2.Queue.app_engine_http_target] set.
+//
+// Using [AppEngineHttpRequest][google.cloud.tasks.v2beta2.AppEngineHttpRequest] requires
+// [`appengine.applications.get`](https://cloud.google.com/appengine/docs/admin-api/access-control)
+// Google IAM permission for the project
+// and the following scope:
+//
+// `https://www.googleapis.com/auth/cloud-platform`
+//
+// The task will be delivered to the App Engine app which belongs to the same
+// project as the queue. For more information, see
+// [How Requests are Routed](https://cloud.google.com/appengine/docs/standard/python/how-requests-are-routed)
+// and how routing is affected by
+// [dispatch files](https://cloud.google.com/appengine/docs/python/config/dispatchref).
+//
+// The [AppEngineRouting][google.cloud.tasks.v2beta2.AppEngineRouting] used to construct the URL that the task is
+// delivered to can be set at the queue-level or task-level:
+//
+// * If set,
+//    [app_engine_routing_override][google.cloud.tasks.v2beta2.AppEngineHttpTarget.app_engine_routing_override]
+//    is used for all tasks in the queue, no matter what the setting
+//    is for the
+//    [task-level app_engine_routing][google.cloud.tasks.v2beta2.AppEngineHttpRequest.app_engine_routing].
+//
+//
+// The `url` that the task will be sent to is:
+//
+// * `url =` [host][google.cloud.tasks.v2beta2.AppEngineRouting.host] `+`
+//   [relative_url][google.cloud.tasks.v2beta2.AppEngineHttpRequest.relative_url]
+//
+// The task attempt has succeeded if the app's request handler returns
+// an HTTP response code in the range [`200` - `299`]. `503` is
+// considered an App Engine system error instead of an application
+// error. Requests returning error `503` will be retried regardless of
+// retry configuration and not counted against retry counts.
+// Any other response code or a failure to receive a response before the
+// deadline is a failed attempt.
+type AppEngineHttpRequest struct {
+	// The HTTP method to use for the request. The default is POST.
+	//
+	// The app's request handler for the task's target URL must be able to handle
+	// HTTP requests with this http_method, otherwise the task attempt will fail
+	// with error code 405 (Method Not Allowed). See
+	// [Writing a push task request handler](https://cloud.google.com/appengine/docs/java/taskqueue/push/creating-handlers#writing_a_push_task_request_handler)
+	// and the documentation for the request handlers in the language your app is
+	// written in e.g.
+	// [Python Request Handler](https://cloud.google.com/appengine/docs/python/tools/webapp/requesthandlerclass).
+	HttpMethod HttpMethod `protobuf:"varint,1,opt,name=http_method,json=httpMethod,proto3,enum=google.cloud.tasks.v2beta2.HttpMethod" json:"http_method,omitempty"`
+	// Task-level setting for App Engine routing.
+	//
+	// If set,
+	// [app_engine_routing_override][google.cloud.tasks.v2beta2.AppEngineHttpTarget.app_engine_routing_override]
+	// is used for all tasks in the queue, no matter what the setting is for the
+	// [task-level app_engine_routing][google.cloud.tasks.v2beta2.AppEngineHttpRequest.app_engine_routing].
+	AppEngineRouting *AppEngineRouting `protobuf:"bytes,2,opt,name=app_engine_routing,json=appEngineRouting,proto3" json:"app_engine_routing,omitempty"`
+	// The relative URL.
+	//
+	// The relative URL must begin with "/" and must be a valid HTTP relative URL.
+	// It can contain a path and query string arguments.
+	// If the relative URL is empty, then the root path "/" will be used.
+	// No spaces are allowed, and the maximum length allowed is 2083 characters.
+	RelativeUrl string `protobuf:"bytes,3,opt,name=relative_url,json=relativeUrl,proto3" json:"relative_url,omitempty"`
+	// HTTP request headers.
+	//
+	// This map contains the header field names and values.
+	// Headers can be set when the
+	// [task is created][google.cloud.tasks.v2beta2.CloudTasks.CreateTask].
+	// Repeated headers are not supported but a header value can contain commas.
+	//
+	// Cloud Tasks sets some headers to default values:
+	//
+	// * `User-Agent`: By default, this header is
+	//   `"AppEngine-Google; (+http://code.google.com/appengine)"`.
+	//   This header can be modified, but Cloud Tasks will append
+	//   `"AppEngine-Google; (+http://code.google.com/appengine)"` to the
+	//   modified `User-Agent`.
+	//
+	// If the task has a [payload][google.cloud.tasks.v2beta2.AppEngineHttpRequest.payload], Cloud
+	// Tasks sets the following headers:
+	//
+	// * `Content-Type`: By default, the `Content-Type` header is set to
+	//   `"application/octet-stream"`. The default can be overridden by explicitly
+	//   setting `Content-Type` to a particular media type when the
+	//   [task is created][google.cloud.tasks.v2beta2.CloudTasks.CreateTask].
+	//   For example, `Content-Type` can be set to `"application/json"`.
+	// * `Content-Length`: This is computed by Cloud Tasks. This value is
+	//   output only.   It cannot be changed.
+	//
+	// The headers below cannot be set or overridden:
+	//
+	// * `Host`
+	// * `X-Google-*`
+	// * `X-AppEngine-*`
+	//
+	// In addition, Cloud Tasks sets some headers when the task is dispatched,
+	// such as headers containing information about the task; see
+	// [request headers](https://cloud.google.com/appengine/docs/python/taskqueue/push/creating-handlers#reading_request_headers).
+	// These headers are set only when the task is dispatched, so they are not
+	// visible when the task is returned in a Cloud Tasks response.
+	//
+	// Although there is no specific limit for the maximum number of headers or
+	// the size, there is a limit on the maximum size of the [Task][google.cloud.tasks.v2beta2.Task]. For more
+	// information, see the [CreateTask][google.cloud.tasks.v2beta2.CloudTasks.CreateTask] documentation.
+	Headers map[string]string `protobuf:"bytes,4,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Payload.
+	//
+	// The payload will be sent as the HTTP message body. A message
+	// body, and thus a payload, is allowed only if the HTTP method is
+	// POST or PUT. It is an error to set a data payload on a task with
+	// an incompatible [HttpMethod][google.cloud.tasks.v2beta2.HttpMethod].
+	Payload              []byte   `protobuf:"bytes,5,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AppEngineHttpRequest) Reset()         { *m = AppEngineHttpRequest{} }
+func (m *AppEngineHttpRequest) String() string { return proto.CompactTextString(m) }
+func (*AppEngineHttpRequest) ProtoMessage()    {}
+func (*AppEngineHttpRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_97396313f988895e, []int{3}
+}
+func (m *AppEngineHttpRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AppEngineHttpRequest.Unmarshal(m, b)
+}
+func (m *AppEngineHttpRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AppEngineHttpRequest.Marshal(b, m, deterministic)
+}
+func (dst *AppEngineHttpRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineHttpRequest.Merge(dst, src)
+}
+func (m *AppEngineHttpRequest) XXX_Size() int {
+	return xxx_messageInfo_AppEngineHttpRequest.Size(m)
+}
+func (m *AppEngineHttpRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AppEngineHttpRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AppEngineHttpRequest proto.InternalMessageInfo
+
+func (m *AppEngineHttpRequest) GetHttpMethod() HttpMethod {
+	if m != nil {
+		return m.HttpMethod
+	}
+	return HttpMethod_HTTP_METHOD_UNSPECIFIED
+}
+
+func (m *AppEngineHttpRequest) GetAppEngineRouting() *AppEngineRouting {
+	if m != nil {
+		return m.AppEngineRouting
+	}
+	return nil
+}
+
+func (m *AppEngineHttpRequest) GetRelativeUrl() string {
+	if m != nil {
+		return m.RelativeUrl
+	}
+	return ""
+}
+
+func (m *AppEngineHttpRequest) GetHeaders() map[string]string {
+	if m != nil {
+		return m.Headers
+	}
+	return nil
+}
+
+func (m *AppEngineHttpRequest) GetPayload() []byte {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+// App Engine Routing.
+//
+// For more information about services, versions, and instances see
+// [An Overview of App Engine](https://cloud.google.com/appengine/docs/python/an-overview-of-app-engine),
+// [Microservices Architecture on Google App Engine](https://cloud.google.com/appengine/docs/python/microservices-on-app-engine),
+// [App Engine Standard request routing](https://cloud.google.com/appengine/docs/standard/python/how-requests-are-routed),
+// and [App Engine Flex request routing](https://cloud.google.com/appengine/docs/flexible/python/how-requests-are-routed).
+type AppEngineRouting struct {
+	// App service.
+	//
+	// By default, the task is sent to the service which is the default
+	// service when the task is attempted.
+	//
+	// For some queues or tasks which were created using the App Engine
+	// Task Queue API, [host][google.cloud.tasks.v2beta2.AppEngineRouting.host] is not parsable
+	// into [service][google.cloud.tasks.v2beta2.AppEngineRouting.service],
+	// [version][google.cloud.tasks.v2beta2.AppEngineRouting.version], and
+	// [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance]. For example, some tasks
+	// which were created using the App Engine SDK use a custom domain
+	// name; custom domains are not parsed by Cloud Tasks. If
+	// [host][google.cloud.tasks.v2beta2.AppEngineRouting.host] is not parsable, then
+	// [service][google.cloud.tasks.v2beta2.AppEngineRouting.service],
+	// [version][google.cloud.tasks.v2beta2.AppEngineRouting.version], and
+	// [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance] are the empty string.
+	Service string `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"`
+	// App version.
+	//
+	// By default, the task is sent to the version which is the default
+	// version when the task is attempted.
+	//
+	// For some queues or tasks which were created using the App Engine
+	// Task Queue API, [host][google.cloud.tasks.v2beta2.AppEngineRouting.host] is not parsable
+	// into [service][google.cloud.tasks.v2beta2.AppEngineRouting.service],
+	// [version][google.cloud.tasks.v2beta2.AppEngineRouting.version], and
+	// [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance]. For example, some tasks
+	// which were created using the App Engine SDK use a custom domain
+	// name; custom domains are not parsed by Cloud Tasks. If
+	// [host][google.cloud.tasks.v2beta2.AppEngineRouting.host] is not parsable, then
+	// [service][google.cloud.tasks.v2beta2.AppEngineRouting.service],
+	// [version][google.cloud.tasks.v2beta2.AppEngineRouting.version], and
+	// [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance] are the empty string.
+	Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+	// App instance.
+	//
+	// By default, the task is sent to an instance which is available when
+	// the task is attempted.
+	//
+	// Requests can only be sent to a specific instance if
+	// [manual scaling is used in App Engine Standard](https://cloud.google.com/appengine/docs/python/an-overview-of-app-engine?hl=en_US#scaling_types_and_instance_classes).
+	// App Engine Flex does not support instances. For more information, see
+	// [App Engine Standard request routing](https://cloud.google.com/appengine/docs/standard/python/how-requests-are-routed)
+	// and [App Engine Flex request routing](https://cloud.google.com/appengine/docs/flexible/python/how-requests-are-routed).
+	Instance string `protobuf:"bytes,3,opt,name=instance,proto3" json:"instance,omitempty"`
+	// Output only. The host that the task is sent to.
+	//
+	// For more information, see
+	// [How Requests are Routed](https://cloud.google.com/appengine/docs/standard/python/how-requests-are-routed).
+	//
+	// The host is constructed as:
+	//
+	//
+	// * `host = [application_domain_name]`</br>
+	//   `| [service] + '.' + [application_domain_name]`</br>
+	//   `| [version] + '.' + [application_domain_name]`</br>
+	//   `| [version_dot_service]+ '.' + [application_domain_name]`</br>
+	//   `| [instance] + '.' + [application_domain_name]`</br>
+	//   `| [instance_dot_service] + '.' + [application_domain_name]`</br>
+	//   `| [instance_dot_version] + '.' + [application_domain_name]`</br>
+	//   `| [instance_dot_version_dot_service] + '.' + [application_domain_name]`
+	//
+	// * `application_domain_name` = The domain name of the app, for
+	//   example <app-id>.appspot.com, which is associated with the
+	//   queue's project ID. Some tasks which were created using the App Engine
+	//   SDK use a custom domain name.
+	//
+	// * `service =` [service][google.cloud.tasks.v2beta2.AppEngineRouting.service]
+	//
+	// * `version =` [version][google.cloud.tasks.v2beta2.AppEngineRouting.version]
+	//
+	// * `version_dot_service =`
+	//   [version][google.cloud.tasks.v2beta2.AppEngineRouting.version] `+ '.' +`
+	//   [service][google.cloud.tasks.v2beta2.AppEngineRouting.service]
+	//
+	// * `instance =` [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance]
+	//
+	// * `instance_dot_service =`
+	//   [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance] `+ '.' +`
+	//   [service][google.cloud.tasks.v2beta2.AppEngineRouting.service]
+	//
+	// * `instance_dot_version =`
+	//   [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance] `+ '.' +`
+	//   [version][google.cloud.tasks.v2beta2.AppEngineRouting.version]
+	//
+	// * `instance_dot_version_dot_service =`
+	//   [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance] `+ '.' +`
+	//   [version][google.cloud.tasks.v2beta2.AppEngineRouting.version] `+ '.' +`
+	//   [service][google.cloud.tasks.v2beta2.AppEngineRouting.service]
+	//
+	// If [service][google.cloud.tasks.v2beta2.AppEngineRouting.service] is empty, then the task will be sent
+	// to the service which is the default service when the task is attempted.
+	//
+	// If [version][google.cloud.tasks.v2beta2.AppEngineRouting.version] is empty, then the task will be sent
+	// to the version which is the default version when the task is attempted.
+	//
+	// If [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance] is empty, then the task
+	// will be sent to an instance which is available when the task is
+	// attempted.
+	//
+	// If [service][google.cloud.tasks.v2beta2.AppEngineRouting.service],
+	// [version][google.cloud.tasks.v2beta2.AppEngineRouting.version], or
+	// [instance][google.cloud.tasks.v2beta2.AppEngineRouting.instance] is invalid, then the task
+	// will be sent to the default version of the default service when
+	// the task is attempted.
+	Host                 string   `protobuf:"bytes,4,opt,name=host,proto3" json:"host,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AppEngineRouting) Reset()         { *m = AppEngineRouting{} }
+func (m *AppEngineRouting) String() string { return proto.CompactTextString(m) }
+func (*AppEngineRouting) ProtoMessage()    {}
+func (*AppEngineRouting) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_97396313f988895e, []int{4}
+}
+func (m *AppEngineRouting) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AppEngineRouting.Unmarshal(m, b)
+}
+func (m *AppEngineRouting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AppEngineRouting.Marshal(b, m, deterministic)
+}
+func (dst *AppEngineRouting) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AppEngineRouting.Merge(dst, src)
+}
+func (m *AppEngineRouting) XXX_Size() int {
+	return xxx_messageInfo_AppEngineRouting.Size(m)
+}
+func (m *AppEngineRouting) XXX_DiscardUnknown() {
+	xxx_messageInfo_AppEngineRouting.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AppEngineRouting proto.InternalMessageInfo
+
+func (m *AppEngineRouting) GetService() string {
+	if m != nil {
+		return m.Service
+	}
+	return ""
+}
+
+func (m *AppEngineRouting) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
+func (m *AppEngineRouting) GetInstance() string {
+	if m != nil {
+		return m.Instance
+	}
+	return ""
+}
+
+func (m *AppEngineRouting) GetHost() string {
+	if m != nil {
+		return m.Host
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*PullTarget)(nil), "google.cloud.tasks.v2beta2.PullTarget")
+	proto.RegisterType((*PullMessage)(nil), "google.cloud.tasks.v2beta2.PullMessage")
+	proto.RegisterType((*AppEngineHttpTarget)(nil), "google.cloud.tasks.v2beta2.AppEngineHttpTarget")
+	proto.RegisterType((*AppEngineHttpRequest)(nil), "google.cloud.tasks.v2beta2.AppEngineHttpRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.cloud.tasks.v2beta2.AppEngineHttpRequest.HeadersEntry")
+	proto.RegisterType((*AppEngineRouting)(nil), "google.cloud.tasks.v2beta2.AppEngineRouting")
+	proto.RegisterEnum("google.cloud.tasks.v2beta2.HttpMethod", HttpMethod_name, HttpMethod_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/tasks/v2beta2/target.proto", fileDescriptor_target_97396313f988895e)
+}
+
+var fileDescriptor_target_97396313f988895e = []byte{
+	// 557 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x6f, 0xd3, 0x4c,
+	0x10, 0xfd, 0x5c, 0xa7, 0xbf, 0xc6, 0xd1, 0x27, 0x6b, 0xa9, 0x84, 0x95, 0xa2, 0xaa, 0xe4, 0x00,
+	0x15, 0x42, 0xb6, 0x14, 0x2e, 0x50, 0x84, 0x50, 0x4b, 0x4c, 0x53, 0x89, 0x12, 0xcb, 0x75, 0x84,
+	0x54, 0x0e, 0xd6, 0x26, 0x19, 0x1c, 0x2b, 0xee, 0xae, 0xd9, 0x5d, 0x5b, 0xca, 0x95, 0x3b, 0xff,
+	0x33, 0xf2, 0xda, 0x09, 0x69, 0x80, 0x0a, 0x6e, 0xf3, 0x66, 0xde, 0xbc, 0xc9, 0xbc, 0xf1, 0x06,
+	0x9e, 0x26, 0x9c, 0x27, 0x19, 0x7a, 0x93, 0x8c, 0x17, 0x53, 0x4f, 0x51, 0x39, 0x97, 0x5e, 0xd9,
+	0x1b, 0xa3, 0xa2, 0x3d, 0x4f, 0x51, 0x91, 0xa0, 0x72, 0x73, 0xc1, 0x15, 0x27, 0x9d, 0x9a, 0xe8,
+	0x6a, 0xa2, 0xab, 0x89, 0x6e, 0x43, 0xec, 0x3c, 0x6a, 0x44, 0x68, 0x9e, 0x7a, 0x94, 0x31, 0xae,
+	0xa8, 0x4a, 0x39, 0x93, 0x75, 0x67, 0xe7, 0xa8, 0xa9, 0x6a, 0x34, 0x2e, 0xbe, 0x78, 0xd3, 0x42,
+	0x68, 0x42, 0x5d, 0xef, 0xb6, 0x01, 0x82, 0x22, 0xcb, 0x22, 0x3d, 0xad, 0xfb, 0x0a, 0xac, 0x0a,
+	0x5d, 0xa1, 0x94, 0x34, 0x41, 0xe2, 0xc0, 0x6e, 0x4e, 0x17, 0x19, 0xa7, 0x53, 0xc7, 0x38, 0x36,
+	0x4e, 0xda, 0xe1, 0x12, 0x12, 0x1b, 0x4c, 0x45, 0x13, 0x67, 0xeb, 0xd8, 0x38, 0xd9, 0x0f, 0xab,
+	0xb0, 0xfb, 0xcd, 0x80, 0x07, 0x67, 0x79, 0xee, 0xb3, 0x24, 0x65, 0x38, 0x50, 0x2a, 0xaf, 0x25,
+	0xc9, 0x1c, 0x0e, 0x69, 0x9e, 0xc7, 0xa8, 0xf3, 0xb1, 0xe0, 0x85, 0x4a, 0x59, 0x12, 0xf3, 0x12,
+	0x85, 0x48, 0xa7, 0xa8, 0x75, 0xad, 0xde, 0x73, 0xf7, 0xcf, 0x0b, 0xba, 0x2b, 0xd5, 0xb0, 0x6e,
+	0x0e, 0x1d, 0xba, 0x91, 0x19, 0x36, 0x6a, 0xdd, 0xef, 0x26, 0x1c, 0xdc, 0xf9, 0x11, 0x21, 0x7e,
+	0x2d, 0x50, 0x2a, 0x72, 0x01, 0xd6, 0x4c, 0xa9, 0x3c, 0xbe, 0x45, 0x35, 0xe3, 0xf5, 0x36, 0xff,
+	0xf7, 0x9e, 0xdc, 0x37, 0xb5, 0xea, 0xbe, 0xd2, 0xec, 0x10, 0x66, 0xab, 0x98, 0xdc, 0x00, 0xf9,
+	0x75, 0x1d, 0xed, 0xc3, 0xbf, 0x6e, 0x61, 0x6f, 0x6e, 0x41, 0x1e, 0x43, 0x5b, 0x60, 0x46, 0x55,
+	0x5a, 0x62, 0x5c, 0x88, 0xcc, 0x31, 0xb5, 0xbb, 0xd6, 0x32, 0x37, 0x12, 0x19, 0xf9, 0x04, 0xbb,
+	0x33, 0xa4, 0x53, 0x14, 0xd2, 0x69, 0x1d, 0x9b, 0x27, 0x56, 0xef, 0xcd, 0x5f, 0xcd, 0x5c, 0xb3,
+	0xc2, 0x1d, 0xd4, 0xfd, 0x3e, 0x53, 0x62, 0x11, 0x2e, 0xd5, 0xd6, 0x4f, 0xbd, 0x7d, 0xe7, 0xd4,
+	0x9d, 0x53, 0x68, 0xaf, 0xb7, 0x54, 0xa7, 0x9f, 0xe3, 0x42, 0x5b, 0xb8, 0x1f, 0x56, 0x21, 0x39,
+	0x80, 0xed, 0x92, 0x66, 0x05, 0x36, 0x9f, 0x43, 0x0d, 0x4e, 0xb7, 0x5e, 0x1a, 0xdd, 0x12, 0xec,
+	0xcd, 0xbd, 0xab, 0x49, 0x12, 0x45, 0x99, 0x4e, 0xb0, 0xd1, 0x58, 0xc2, 0xaa, 0x52, 0xa2, 0x90,
+	0x29, 0x67, 0x8d, 0xd2, 0x12, 0x92, 0x0e, 0xec, 0xa5, 0x4c, 0x2a, 0xca, 0x26, 0xd8, 0xb8, 0xb2,
+	0xc2, 0x84, 0x40, 0x6b, 0xc6, 0xa5, 0x72, 0x5a, 0x3a, 0xaf, 0xe3, 0x67, 0x9f, 0x01, 0x7e, 0xde,
+	0x8f, 0x1c, 0xc2, 0xc3, 0x41, 0x14, 0x05, 0xf1, 0x95, 0x1f, 0x0d, 0x86, 0xfd, 0x78, 0xf4, 0xf1,
+	0x3a, 0xf0, 0xdf, 0x5d, 0xbe, 0xbf, 0xf4, 0xfb, 0xf6, 0x7f, 0x64, 0x0f, 0x5a, 0xc1, 0xf0, 0x3a,
+	0xb2, 0x0d, 0xb2, 0x0b, 0xe6, 0x85, 0x1f, 0xd9, 0x5b, 0x55, 0x6a, 0xe0, 0x9f, 0xf5, 0x6d, 0xb3,
+	0x4a, 0x05, 0xa3, 0xc8, 0x6e, 0x11, 0x80, 0x9d, 0xbe, 0xff, 0xc1, 0x8f, 0x7c, 0x7b, 0xfb, 0x3c,
+	0x87, 0xa3, 0x09, 0xbf, 0xbd, 0xc7, 0xf7, 0x73, 0xab, 0xfe, 0xf6, 0x83, 0xea, 0x85, 0x05, 0xc6,
+	0xcd, 0xdb, 0x86, 0x9a, 0xf0, 0x8c, 0xb2, 0xc4, 0xe5, 0x22, 0xf1, 0x12, 0x64, 0xfa, 0xfd, 0x79,
+	0x75, 0x89, 0xe6, 0xa9, 0xfc, 0xdd, 0xbf, 0xc0, 0x6b, 0x8d, 0xc6, 0x3b, 0x9a, 0xfb, 0xe2, 0x47,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x5d, 0x40, 0x26, 0x30, 0x04, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/task.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/task.pb.go
new file mode 100644
index 00000000..e8f4e62e
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/tasks/v2beta2/task.pb.go
@@ -0,0 +1,504 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/tasks/v2beta2/task.proto
+
+package tasks // import "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The view specifies a subset of [Task][google.cloud.tasks.v2beta2.Task] data.
+//
+// When a task is returned in a response, not all
+// information is retrieved by default because some data, such as
+// payloads, might be desirable to return only when needed because
+// of its large size or because of the sensitivity of data that it
+// contains.
+type Task_View int32
+
+const (
+	// Unspecified. Defaults to BASIC.
+	Task_VIEW_UNSPECIFIED Task_View = 0
+	// The basic view omits fields which can be large or can contain
+	// sensitive data.
+	//
+	// This view does not include the
+	// ([payload in AppEngineHttpRequest][google.cloud.tasks.v2beta2.AppEngineHttpRequest] and
+	// [payload in PullMessage][google.cloud.tasks.v2beta2.PullMessage.payload]). These payloads are
+	// desirable to return only when needed, because they can be large
+	// and because of the sensitivity of the data that you choose to
+	// store in it.
+	Task_BASIC Task_View = 1
+	// All information is returned.
+	//
+	// Authorization for [FULL][google.cloud.tasks.v2beta2.Task.View.FULL] requires
+	// `cloudtasks.tasks.fullView` [Google IAM](https://cloud.google.com/iam/)
+	// permission on the [Queue][google.cloud.tasks.v2beta2.Queue] resource.
+	Task_FULL Task_View = 2
+)
+
+var Task_View_name = map[int32]string{
+	0: "VIEW_UNSPECIFIED",
+	1: "BASIC",
+	2: "FULL",
+}
+var Task_View_value = map[string]int32{
+	"VIEW_UNSPECIFIED": 0,
+	"BASIC":            1,
+	"FULL":             2,
+}
+
+func (x Task_View) String() string {
+	return proto.EnumName(Task_View_name, int32(x))
+}
+func (Task_View) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_task_ce8481b1dd8c8330, []int{0, 0}
+}
+
+// A unit of scheduled work.
+type Task struct {
+	// Optionally caller-specified in [CreateTask][google.cloud.tasks.v2beta2.CloudTasks.CreateTask].
+	//
+	// The task name.
+	//
+	// The task name must have the following format:
+	// `projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`
+	//
+	// * `PROJECT_ID` can contain letters ([A-Za-z]), numbers ([0-9]),
+	//    hyphens (-), colons (:), or periods (.).
+	//    For more information, see
+	//    [Identifying projects](https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects)
+	// * `LOCATION_ID` is the canonical ID for the task's location.
+	//    The list of available locations can be obtained by calling
+	//    [ListLocations][google.cloud.location.Locations.ListLocations].
+	//    For more information, see https://cloud.google.com/about/locations/.
+	// * `QUEUE_ID` can contain letters ([A-Za-z]), numbers ([0-9]), or
+	//   hyphens (-). The maximum length is 100 characters.
+	// * `TASK_ID` can contain only letters ([A-Za-z]), numbers ([0-9]),
+	//   hyphens (-), or underscores (_). The maximum length is 500 characters.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required.
+	//
+	// The task's payload is used by the task's target to process the task.
+	// A payload is valid only if it is compatible with the queue's target.
+	//
+	// Types that are valid to be assigned to PayloadType:
+	//	*Task_AppEngineHttpRequest
+	//	*Task_PullMessage
+	PayloadType isTask_PayloadType `protobuf_oneof:"payload_type"`
+	// The time when the task is scheduled to be attempted.
+	//
+	// For App Engine queues, this is when the task will be attempted or retried.
+	//
+	// For pull queues, this is the time when the task is available to
+	// be leased; if a task is currently leased, this is the time when
+	// the current lease expires, that is, the time that the task was
+	// leased plus the [lease_duration][google.cloud.tasks.v2beta2.LeaseTasksRequest.lease_duration].
+	//
+	// `schedule_time` will be truncated to the nearest microsecond.
+	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	// Output only. The time that the task was created.
+	//
+	// `create_time` will be truncated to the nearest second.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Output only. The task status.
+	Status *TaskStatus `protobuf:"bytes,7,opt,name=status,proto3" json:"status,omitempty"`
+	// Output only. The view specifies which subset of the [Task][google.cloud.tasks.v2beta2.Task] has
+	// been returned.
+	View                 Task_View `protobuf:"varint,8,opt,name=view,proto3,enum=google.cloud.tasks.v2beta2.Task_View" json:"view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *Task) Reset()         { *m = Task{} }
+func (m *Task) String() string { return proto.CompactTextString(m) }
+func (*Task) ProtoMessage()    {}
+func (*Task) Descriptor() ([]byte, []int) {
+	return fileDescriptor_task_ce8481b1dd8c8330, []int{0}
+}
+func (m *Task) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Task.Unmarshal(m, b)
+}
+func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Task.Marshal(b, m, deterministic)
+}
+func (dst *Task) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Task.Merge(dst, src)
+}
+func (m *Task) XXX_Size() int {
+	return xxx_messageInfo_Task.Size(m)
+}
+func (m *Task) XXX_DiscardUnknown() {
+	xxx_messageInfo_Task.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Task proto.InternalMessageInfo
+
+func (m *Task) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+type isTask_PayloadType interface {
+	isTask_PayloadType()
+}
+
+type Task_AppEngineHttpRequest struct {
+	AppEngineHttpRequest *AppEngineHttpRequest `protobuf:"bytes,3,opt,name=app_engine_http_request,json=appEngineHttpRequest,proto3,oneof"`
+}
+
+type Task_PullMessage struct {
+	PullMessage *PullMessage `protobuf:"bytes,4,opt,name=pull_message,json=pullMessage,proto3,oneof"`
+}
+
+func (*Task_AppEngineHttpRequest) isTask_PayloadType() {}
+
+func (*Task_PullMessage) isTask_PayloadType() {}
+
+func (m *Task) GetPayloadType() isTask_PayloadType {
+	if m != nil {
+		return m.PayloadType
+	}
+	return nil
+}
+
+func (m *Task) GetAppEngineHttpRequest() *AppEngineHttpRequest {
+	if x, ok := m.GetPayloadType().(*Task_AppEngineHttpRequest); ok {
+		return x.AppEngineHttpRequest
+	}
+	return nil
+}
+
+func (m *Task) GetPullMessage() *PullMessage {
+	if x, ok := m.GetPayloadType().(*Task_PullMessage); ok {
+		return x.PullMessage
+	}
+	return nil
+}
+
+func (m *Task) GetScheduleTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ScheduleTime
+	}
+	return nil
+}
+
+func (m *Task) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *Task) GetStatus() *TaskStatus {
+	if m != nil {
+		return m.Status
+	}
+	return nil
+}
+
+func (m *Task) GetView() Task_View {
+	if m != nil {
+		return m.View
+	}
+	return Task_VIEW_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Task) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Task_OneofMarshaler, _Task_OneofUnmarshaler, _Task_OneofSizer, []interface{}{
+		(*Task_AppEngineHttpRequest)(nil),
+		(*Task_PullMessage)(nil),
+	}
+}
+
+func _Task_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Task)
+	// payload_type
+	switch x := m.PayloadType.(type) {
+	case *Task_AppEngineHttpRequest:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.AppEngineHttpRequest); err != nil {
+			return err
+		}
+	case *Task_PullMessage:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.PullMessage); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Task.PayloadType has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Task_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Task)
+	switch tag {
+	case 3: // payload_type.app_engine_http_request
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AppEngineHttpRequest)
+		err := b.DecodeMessage(msg)
+		m.PayloadType = &Task_AppEngineHttpRequest{msg}
+		return true, err
+	case 4: // payload_type.pull_message
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PullMessage)
+		err := b.DecodeMessage(msg)
+		m.PayloadType = &Task_PullMessage{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Task_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Task)
+	// payload_type
+	switch x := m.PayloadType.(type) {
+	case *Task_AppEngineHttpRequest:
+		s := proto.Size(x.AppEngineHttpRequest)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Task_PullMessage:
+		s := proto.Size(x.PullMessage)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Status of the task.
+type TaskStatus struct {
+	// Output only. The number of attempts dispatched.
+	//
+	// This count includes tasks which have been dispatched but haven't
+	// received a response.
+	AttemptDispatchCount int32 `protobuf:"varint,1,opt,name=attempt_dispatch_count,json=attemptDispatchCount,proto3" json:"attempt_dispatch_count,omitempty"`
+	// Output only. The number of attempts which have received a response.
+	//
+	// This field is not calculated for [pull tasks][google.cloud.tasks.v2beta2.PullMessage].
+	AttemptResponseCount int32 `protobuf:"varint,2,opt,name=attempt_response_count,json=attemptResponseCount,proto3" json:"attempt_response_count,omitempty"`
+	// Output only. The status of the task's first attempt.
+	//
+	// Only [dispatch_time][google.cloud.tasks.v2beta2.AttemptStatus.dispatch_time] will be set.
+	// The other [AttemptStatus][google.cloud.tasks.v2beta2.AttemptStatus] information is not retained by Cloud Tasks.
+	//
+	// This field is not calculated for [pull tasks][google.cloud.tasks.v2beta2.PullMessage].
+	FirstAttemptStatus *AttemptStatus `protobuf:"bytes,3,opt,name=first_attempt_status,json=firstAttemptStatus,proto3" json:"first_attempt_status,omitempty"`
+	// Output only. The status of the task's last attempt.
+	//
+	// This field is not calculated for [pull tasks][google.cloud.tasks.v2beta2.PullMessage].
+	LastAttemptStatus    *AttemptStatus `protobuf:"bytes,4,opt,name=last_attempt_status,json=lastAttemptStatus,proto3" json:"last_attempt_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *TaskStatus) Reset()         { *m = TaskStatus{} }
+func (m *TaskStatus) String() string { return proto.CompactTextString(m) }
+func (*TaskStatus) ProtoMessage()    {}
+func (*TaskStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_task_ce8481b1dd8c8330, []int{1}
+}
+func (m *TaskStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TaskStatus.Unmarshal(m, b)
+}
+func (m *TaskStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TaskStatus.Marshal(b, m, deterministic)
+}
+func (dst *TaskStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TaskStatus.Merge(dst, src)
+}
+func (m *TaskStatus) XXX_Size() int {
+	return xxx_messageInfo_TaskStatus.Size(m)
+}
+func (m *TaskStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_TaskStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TaskStatus proto.InternalMessageInfo
+
+func (m *TaskStatus) GetAttemptDispatchCount() int32 {
+	if m != nil {
+		return m.AttemptDispatchCount
+	}
+	return 0
+}
+
+func (m *TaskStatus) GetAttemptResponseCount() int32 {
+	if m != nil {
+		return m.AttemptResponseCount
+	}
+	return 0
+}
+
+func (m *TaskStatus) GetFirstAttemptStatus() *AttemptStatus {
+	if m != nil {
+		return m.FirstAttemptStatus
+	}
+	return nil
+}
+
+func (m *TaskStatus) GetLastAttemptStatus() *AttemptStatus {
+	if m != nil {
+		return m.LastAttemptStatus
+	}
+	return nil
+}
+
+// The status of a task attempt.
+type AttemptStatus struct {
+	// Output only. The time that this attempt was scheduled.
+	//
+	// `schedule_time` will be truncated to the nearest microsecond.
+	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	// Output only. The time that this attempt was dispatched.
+	//
+	// `dispatch_time` will be truncated to the nearest microsecond.
+	DispatchTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=dispatch_time,json=dispatchTime,proto3" json:"dispatch_time,omitempty"`
+	// Output only. The time that this attempt response was received.
+	//
+	// `response_time` will be truncated to the nearest microsecond.
+	ResponseTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=response_time,json=responseTime,proto3" json:"response_time,omitempty"`
+	// Output only. The response from the target for this attempt.
+	//
+	// If the task has not been attempted or the task is currently running
+	// then the response status is unset.
+	ResponseStatus       *status.Status `protobuf:"bytes,4,opt,name=response_status,json=responseStatus,proto3" json:"response_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *AttemptStatus) Reset()         { *m = AttemptStatus{} }
+func (m *AttemptStatus) String() string { return proto.CompactTextString(m) }
+func (*AttemptStatus) ProtoMessage()    {}
+func (*AttemptStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_task_ce8481b1dd8c8330, []int{2}
+}
+func (m *AttemptStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AttemptStatus.Unmarshal(m, b)
+}
+func (m *AttemptStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AttemptStatus.Marshal(b, m, deterministic)
+}
+func (dst *AttemptStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttemptStatus.Merge(dst, src)
+}
+func (m *AttemptStatus) XXX_Size() int {
+	return xxx_messageInfo_AttemptStatus.Size(m)
+}
+func (m *AttemptStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_AttemptStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AttemptStatus proto.InternalMessageInfo
+
+func (m *AttemptStatus) GetScheduleTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ScheduleTime
+	}
+	return nil
+}
+
+func (m *AttemptStatus) GetDispatchTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.DispatchTime
+	}
+	return nil
+}
+
+func (m *AttemptStatus) GetResponseTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ResponseTime
+	}
+	return nil
+}
+
+func (m *AttemptStatus) GetResponseStatus() *status.Status {
+	if m != nil {
+		return m.ResponseStatus
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Task)(nil), "google.cloud.tasks.v2beta2.Task")
+	proto.RegisterType((*TaskStatus)(nil), "google.cloud.tasks.v2beta2.TaskStatus")
+	proto.RegisterType((*AttemptStatus)(nil), "google.cloud.tasks.v2beta2.AttemptStatus")
+	proto.RegisterEnum("google.cloud.tasks.v2beta2.Task_View", Task_View_name, Task_View_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/tasks/v2beta2/task.proto", fileDescriptor_task_ce8481b1dd8c8330)
+}
+
+var fileDescriptor_task_ce8481b1dd8c8330 = []byte{
+	// 601 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x5f, 0x6f, 0xda, 0x3c,
+	0x14, 0xc6, 0x1b, 0x9a, 0xf6, 0x2d, 0xe6, 0xcf, 0xcb, 0x3c, 0xb4, 0x46, 0x68, 0xda, 0x10, 0x52,
+	0x57, 0x76, 0x93, 0x6c, 0x6c, 0x37, 0x53, 0xa5, 0xa1, 0x42, 0xa9, 0x40, 0x62, 0x13, 0x0a, 0x6d,
+	0xa7, 0x6d, 0x17, 0x91, 0x09, 0x6e, 0x88, 0x9a, 0xc4, 0x5e, 0x7c, 0xd2, 0xaa, 0x9f, 0xa2, 0x5f,
+	0x65, 0x1f, 0x71, 0x8a, 0xe3, 0xd0, 0xa1, 0x76, 0xa0, 0xde, 0x71, 0xce, 0x79, 0x7e, 0x8f, 0xed,
+	0x47, 0x87, 0xa0, 0x03, 0x8f, 0x31, 0x2f, 0xa0, 0x96, 0x1b, 0xb0, 0x64, 0x6e, 0x01, 0x11, 0x57,
+	0xc2, 0xba, 0xee, 0xcc, 0x28, 0x90, 0x8e, 0xac, 0x4c, 0x1e, 0x33, 0x60, 0xb8, 0x91, 0xc9, 0x4c,
+	0x29, 0x33, 0xa5, 0xcc, 0x54, 0xb2, 0xc6, 0x4b, 0x65, 0x41, 0xb8, 0x6f, 0x91, 0x28, 0x62, 0x40,
+	0xc0, 0x67, 0x91, 0xc8, 0xc8, 0xc6, 0xe1, 0xda, 0x03, 0x62, 0x8f, 0x82, 0x12, 0xbe, 0x56, 0x42,
+	0x59, 0xcd, 0x92, 0x4b, 0x0b, 0xfc, 0x90, 0x0a, 0x20, 0x21, 0x57, 0x82, 0x7d, 0x25, 0x88, 0xb9,
+	0x6b, 0x09, 0x20, 0x90, 0xa8, 0x23, 0x5a, 0x77, 0x3a, 0xd2, 0xcf, 0x88, 0xb8, 0xc2, 0x18, 0xe9,
+	0x11, 0x09, 0xa9, 0xa1, 0x35, 0xb5, 0x76, 0xd1, 0x96, 0xbf, 0xb1, 0x8f, 0xf6, 0x09, 0xe7, 0x0e,
+	0x8d, 0x3c, 0x3f, 0xa2, 0xce, 0x02, 0x80, 0x3b, 0x31, 0xfd, 0x95, 0x50, 0x01, 0xc6, 0x76, 0x53,
+	0x6b, 0x97, 0x3a, 0xef, 0xcc, 0x7f, 0xbf, 0xcd, 0x3c, 0xe6, 0x7c, 0x20, 0xc9, 0x21, 0x00, 0xb7,
+	0x33, 0x6e, 0xb8, 0x65, 0xd7, 0xc9, 0x23, 0x7d, 0x3c, 0x46, 0x65, 0x9e, 0x04, 0x81, 0x13, 0x52,
+	0x21, 0x88, 0x47, 0x0d, 0x5d, 0xfa, 0x1f, 0xae, 0xf3, 0x9f, 0x24, 0x41, 0xf0, 0x25, 0x93, 0x0f,
+	0xb7, 0xec, 0x12, 0xbf, 0x2f, 0x71, 0x17, 0x55, 0x84, 0xbb, 0xa0, 0xf3, 0x24, 0xa0, 0x4e, 0x1a,
+	0x85, 0xb1, 0x23, 0xed, 0x1a, 0xb9, 0x5d, 0x9e, 0x93, 0x79, 0x96, 0xe7, 0x64, 0x97, 0x73, 0x20,
+	0x6d, 0xe1, 0x23, 0x54, 0x72, 0x63, 0x4a, 0x40, 0xe1, 0xbb, 0x1b, 0x71, 0x94, 0xc9, 0x25, 0xfc,
+	0x19, 0xed, 0x66, 0x19, 0x1b, 0xff, 0x49, 0xee, 0xcd, 0xba, 0x57, 0xa4, 0xe1, 0x4f, 0xa5, 0xda,
+	0x56, 0x14, 0xfe, 0x84, 0xf4, 0x6b, 0x9f, 0xde, 0x18, 0x7b, 0x4d, 0xad, 0x5d, 0xed, 0x1c, 0x6c,
+	0xa2, 0xcd, 0x0b, 0x9f, 0xde, 0xd8, 0x12, 0x69, 0xbd, 0x47, 0x7a, 0x5a, 0xe1, 0x3a, 0xaa, 0x5d,
+	0x8c, 0x06, 0xdf, 0x9c, 0xf3, 0xaf, 0xd3, 0xc9, 0xa0, 0x3f, 0x3a, 0x1d, 0x0d, 0x4e, 0x6a, 0x5b,
+	0xb8, 0x88, 0x76, 0x7a, 0xc7, 0xd3, 0x51, 0xbf, 0xa6, 0xe1, 0x3d, 0xa4, 0x9f, 0x9e, 0x8f, 0xc7,
+	0xb5, 0x42, 0xaf, 0x8a, 0xca, 0x9c, 0xdc, 0x06, 0x8c, 0xcc, 0x1d, 0xb8, 0xe5, 0xb4, 0xf5, 0xbb,
+	0x80, 0xd0, 0xfd, 0xa5, 0xf0, 0x47, 0xf4, 0x82, 0x00, 0xd0, 0x90, 0x83, 0x33, 0xf7, 0x05, 0x27,
+	0xe0, 0x2e, 0x1c, 0x97, 0x25, 0x11, 0xc8, 0x4d, 0xd9, 0xb1, 0xeb, 0x6a, 0x7a, 0xa2, 0x86, 0xfd,
+	0x74, 0xf6, 0x37, 0x15, 0x53, 0xc1, 0x59, 0x24, 0xa8, 0xa2, 0x0a, 0x2b, 0x94, 0xad, 0x86, 0x19,
+	0xf5, 0x13, 0xd5, 0x2f, 0xfd, 0x58, 0x80, 0x93, 0xb3, 0x2a, 0xc6, 0x6c, 0xd9, 0xde, 0xae, 0x5d,
+	0xb6, 0x8c, 0x50, 0x49, 0x62, 0x69, 0xb3, 0xd2, 0xc3, 0xdf, 0xd1, 0xf3, 0x80, 0x3c, 0xf4, 0xd6,
+	0x9f, 0xea, 0xfd, 0x2c, 0x75, 0x59, 0x69, 0xb5, 0xee, 0x0a, 0xa8, 0xb2, 0x7a, 0xd8, 0x83, 0x05,
+	0xd4, 0x9e, 0xb8, 0x80, 0x5d, 0x54, 0x59, 0xc6, 0x2d, 0x0d, 0x0a, 0x9b, 0x0d, 0x72, 0x20, 0x37,
+	0x58, 0x26, 0x2f, 0x0d, 0xb6, 0x37, 0x1b, 0xe4, 0x80, 0xfa, 0x0b, 0xfc, 0xbf, 0x34, 0x58, 0xc9,
+	0x0a, 0xe7, 0x16, 0x31, 0x77, 0x4d, 0x15, 0x4a, 0x35, 0x97, 0x66, 0x75, 0x2f, 0x42, 0xaf, 0x5c,
+	0x16, 0xae, 0x09, 0xb5, 0x57, 0x4c, 0x77, 0x6c, 0x92, 0x5e, 0x62, 0xa2, 0xfd, 0xe8, 0x2a, 0xa1,
+	0xc7, 0x02, 0x12, 0x79, 0x26, 0x8b, 0x3d, 0xcb, 0xa3, 0x91, 0xbc, 0xa2, 0x95, 0x8d, 0x08, 0xf7,
+	0xc5, 0x63, 0xdf, 0xc1, 0x23, 0x59, 0xcd, 0x76, 0xa5, 0xf6, 0xc3, 0x9f, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0x67, 0x07, 0xb1, 0x59, 0x93, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go
new file mode 100644
index 00000000..86289bc2
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/texttospeech/v1/cloud_tts.pb.go
@@ -0,0 +1,858 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package texttospeech // import "google.golang.org/genproto/googleapis/cloud/texttospeech/v1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Gender of the voice as described in
+// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
+type SsmlVoiceGender int32
+
+const (
+	// An unspecified gender.
+	// In VoiceSelectionParams, this means that the client doesn't care which
+	// gender the selected voice will have. In the Voice field of
+	// ListVoicesResponse, this may mean that the voice doesn't fit any of the
+	// other categories in this enum, or that the gender of the voice isn't known.
+	SsmlVoiceGender_SSML_VOICE_GENDER_UNSPECIFIED SsmlVoiceGender = 0
+	// A male voice.
+	SsmlVoiceGender_MALE SsmlVoiceGender = 1
+	// A female voice.
+	SsmlVoiceGender_FEMALE SsmlVoiceGender = 2
+	// A gender-neutral voice.
+	SsmlVoiceGender_NEUTRAL SsmlVoiceGender = 3
+)
+
+var SsmlVoiceGender_name = map[int32]string{
+	0: "SSML_VOICE_GENDER_UNSPECIFIED",
+	1: "MALE",
+	2: "FEMALE",
+	3: "NEUTRAL",
+}
+var SsmlVoiceGender_value = map[string]int32{
+	"SSML_VOICE_GENDER_UNSPECIFIED": 0,
+	"MALE":    1,
+	"FEMALE":  2,
+	"NEUTRAL": 3,
+}
+
+func (x SsmlVoiceGender) String() string {
+	return proto.EnumName(SsmlVoiceGender_name, int32(x))
+}
+func (SsmlVoiceGender) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{0}
+}
+
+// Configuration to set up audio encoder. The encoding determines the output
+// audio format that we'd like.
+type AudioEncoding int32
+
+const (
+	// Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][].
+	AudioEncoding_AUDIO_ENCODING_UNSPECIFIED AudioEncoding = 0
+	// Uncompressed 16-bit signed little-endian samples (Linear PCM).
+	// Audio content returned as LINEAR16 also contains a WAV header.
+	AudioEncoding_LINEAR16 AudioEncoding = 1
+	// MP3 audio.
+	AudioEncoding_MP3 AudioEncoding = 2
+	// Opus encoded audio wrapped in an ogg container. The result will be a
+	// file which can be played natively on Android, and in browsers (at least
+	// Chrome and Firefox). The quality of the encoding is considerably higher
+	// than MP3 while using approximately the same bitrate.
+	AudioEncoding_OGG_OPUS AudioEncoding = 3
+)
+
+var AudioEncoding_name = map[int32]string{
+	0: "AUDIO_ENCODING_UNSPECIFIED",
+	1: "LINEAR16",
+	2: "MP3",
+	3: "OGG_OPUS",
+}
+var AudioEncoding_value = map[string]int32{
+	"AUDIO_ENCODING_UNSPECIFIED": 0,
+	"LINEAR16":                   1,
+	"MP3":                        2,
+	"OGG_OPUS":                   3,
+}
+
+func (x AudioEncoding) String() string {
+	return proto.EnumName(AudioEncoding_name, int32(x))
+}
+func (AudioEncoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{1}
+}
+
+// The top-level message sent by the client for the `ListVoices` method.
+type ListVoicesRequest struct {
+	// Optional (but recommended)
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+	// specified, the ListVoices call will only return voices that can be used to
+	// synthesize this language_code. E.g. when specifying "en-NZ", you will get
+	// supported "en-*" voices; when specifying "no", you will get supported
+	// "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+	// will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+	// supported "yue-*" voices.
+	LanguageCode         string   `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVoicesRequest) Reset()         { *m = ListVoicesRequest{} }
+func (m *ListVoicesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListVoicesRequest) ProtoMessage()    {}
+func (*ListVoicesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{0}
+}
+func (m *ListVoicesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVoicesRequest.Unmarshal(m, b)
+}
+func (m *ListVoicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVoicesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListVoicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVoicesRequest.Merge(dst, src)
+}
+func (m *ListVoicesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListVoicesRequest.Size(m)
+}
+func (m *ListVoicesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVoicesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListVoicesRequest proto.InternalMessageInfo
+
+func (m *ListVoicesRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+// The message returned to the client by the `ListVoices` method.
+type ListVoicesResponse struct {
+	// The list of voices.
+	Voices               []*Voice `protobuf:"bytes,1,rep,name=voices,proto3" json:"voices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVoicesResponse) Reset()         { *m = ListVoicesResponse{} }
+func (m *ListVoicesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListVoicesResponse) ProtoMessage()    {}
+func (*ListVoicesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{1}
+}
+func (m *ListVoicesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVoicesResponse.Unmarshal(m, b)
+}
+func (m *ListVoicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVoicesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListVoicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVoicesResponse.Merge(dst, src)
+}
+func (m *ListVoicesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListVoicesResponse.Size(m)
+}
+func (m *ListVoicesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVoicesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListVoicesResponse proto.InternalMessageInfo
+
+func (m *ListVoicesResponse) GetVoices() []*Voice {
+	if m != nil {
+		return m.Voices
+	}
+	return nil
+}
+
+// Description of a voice supported by the TTS service.
+type Voice struct {
+	// The languages that this voice supports, expressed as
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+	// "en-US", "es-419", "cmn-tw").
+	LanguageCodes []string `protobuf:"bytes,1,rep,name=language_codes,json=languageCodes,proto3" json:"language_codes,omitempty"`
+	// The name of this voice.  Each distinct voice has a unique name.
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	// The gender of this voice.
+	SsmlGender SsmlVoiceGender `protobuf:"varint,3,opt,name=ssml_gender,json=ssmlGender,proto3,enum=google.cloud.texttospeech.v1.SsmlVoiceGender" json:"ssml_gender,omitempty"`
+	// The natural sample rate (in hertz) for this voice.
+	NaturalSampleRateHertz int32    `protobuf:"varint,4,opt,name=natural_sample_rate_hertz,json=naturalSampleRateHertz,proto3" json:"natural_sample_rate_hertz,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
+}
+
+func (m *Voice) Reset()         { *m = Voice{} }
+func (m *Voice) String() string { return proto.CompactTextString(m) }
+func (*Voice) ProtoMessage()    {}
+func (*Voice) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{2}
+}
+func (m *Voice) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Voice.Unmarshal(m, b)
+}
+func (m *Voice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Voice.Marshal(b, m, deterministic)
+}
+func (dst *Voice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Voice.Merge(dst, src)
+}
+func (m *Voice) XXX_Size() int {
+	return xxx_messageInfo_Voice.Size(m)
+}
+func (m *Voice) XXX_DiscardUnknown() {
+	xxx_messageInfo_Voice.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Voice proto.InternalMessageInfo
+
+func (m *Voice) GetLanguageCodes() []string {
+	if m != nil {
+		return m.LanguageCodes
+	}
+	return nil
+}
+
+func (m *Voice) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Voice) GetSsmlGender() SsmlVoiceGender {
+	if m != nil {
+		return m.SsmlGender
+	}
+	return SsmlVoiceGender_SSML_VOICE_GENDER_UNSPECIFIED
+}
+
+func (m *Voice) GetNaturalSampleRateHertz() int32 {
+	if m != nil {
+		return m.NaturalSampleRateHertz
+	}
+	return 0
+}
+
+// The top-level message sent by the client for the `SynthesizeSpeech` method.
+type SynthesizeSpeechRequest struct {
+	// Required. The Synthesizer requires either plain text or SSML as input.
+	Input *SynthesisInput `protobuf:"bytes,1,opt,name=input,proto3" json:"input,omitempty"`
+	// Required. The desired voice of the synthesized audio.
+	Voice *VoiceSelectionParams `protobuf:"bytes,2,opt,name=voice,proto3" json:"voice,omitempty"`
+	// Required. The configuration of the synthesized audio.
+	AudioConfig          *AudioConfig `protobuf:"bytes,3,opt,name=audio_config,json=audioConfig,proto3" json:"audio_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *SynthesizeSpeechRequest) Reset()         { *m = SynthesizeSpeechRequest{} }
+func (m *SynthesizeSpeechRequest) String() string { return proto.CompactTextString(m) }
+func (*SynthesizeSpeechRequest) ProtoMessage()    {}
+func (*SynthesizeSpeechRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{3}
+}
+func (m *SynthesizeSpeechRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SynthesizeSpeechRequest.Unmarshal(m, b)
+}
+func (m *SynthesizeSpeechRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SynthesizeSpeechRequest.Marshal(b, m, deterministic)
+}
+func (dst *SynthesizeSpeechRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechRequest.Merge(dst, src)
+}
+func (m *SynthesizeSpeechRequest) XXX_Size() int {
+	return xxx_messageInfo_SynthesizeSpeechRequest.Size(m)
+}
+func (m *SynthesizeSpeechRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SynthesizeSpeechRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SynthesizeSpeechRequest proto.InternalMessageInfo
+
+func (m *SynthesizeSpeechRequest) GetInput() *SynthesisInput {
+	if m != nil {
+		return m.Input
+	}
+	return nil
+}
+
+func (m *SynthesizeSpeechRequest) GetVoice() *VoiceSelectionParams {
+	if m != nil {
+		return m.Voice
+	}
+	return nil
+}
+
+func (m *SynthesizeSpeechRequest) GetAudioConfig() *AudioConfig {
+	if m != nil {
+		return m.AudioConfig
+	}
+	return nil
+}
+
+// Contains text input to be synthesized. Either `text` or `ssml` must be
+// supplied. Supplying both or neither returns
+// [google.rpc.Code.INVALID_ARGUMENT][]. The input size is limited to 5000
+// characters.
+type SynthesisInput struct {
+	// The input source, which is either plain text or SSML.
+	//
+	// Types that are valid to be assigned to InputSource:
+	//	*SynthesisInput_Text
+	//	*SynthesisInput_Ssml
+	InputSource          isSynthesisInput_InputSource `protobuf_oneof:"input_source"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *SynthesisInput) Reset()         { *m = SynthesisInput{} }
+func (m *SynthesisInput) String() string { return proto.CompactTextString(m) }
+func (*SynthesisInput) ProtoMessage()    {}
+func (*SynthesisInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{4}
+}
+func (m *SynthesisInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SynthesisInput.Unmarshal(m, b)
+}
+func (m *SynthesisInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SynthesisInput.Marshal(b, m, deterministic)
+}
+func (dst *SynthesisInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesisInput.Merge(dst, src)
+}
+func (m *SynthesisInput) XXX_Size() int {
+	return xxx_messageInfo_SynthesisInput.Size(m)
+}
+func (m *SynthesisInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_SynthesisInput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SynthesisInput proto.InternalMessageInfo
+
+type isSynthesisInput_InputSource interface {
+	isSynthesisInput_InputSource()
+}
+
+type SynthesisInput_Text struct {
+	Text string `protobuf:"bytes,1,opt,name=text,proto3,oneof"`
+}
+
+type SynthesisInput_Ssml struct {
+	Ssml string `protobuf:"bytes,2,opt,name=ssml,proto3,oneof"`
+}
+
+func (*SynthesisInput_Text) isSynthesisInput_InputSource() {}
+
+func (*SynthesisInput_Ssml) isSynthesisInput_InputSource() {}
+
+func (m *SynthesisInput) GetInputSource() isSynthesisInput_InputSource {
+	if m != nil {
+		return m.InputSource
+	}
+	return nil
+}
+
+func (m *SynthesisInput) GetText() string {
+	if x, ok := m.GetInputSource().(*SynthesisInput_Text); ok {
+		return x.Text
+	}
+	return ""
+}
+
+func (m *SynthesisInput) GetSsml() string {
+	if x, ok := m.GetInputSource().(*SynthesisInput_Ssml); ok {
+		return x.Ssml
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*SynthesisInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _SynthesisInput_OneofMarshaler, _SynthesisInput_OneofUnmarshaler, _SynthesisInput_OneofSizer, []interface{}{
+		(*SynthesisInput_Text)(nil),
+		(*SynthesisInput_Ssml)(nil),
+	}
+}
+
+func _SynthesisInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*SynthesisInput)
+	// input_source
+	switch x := m.InputSource.(type) {
+	case *SynthesisInput_Text:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Text)
+	case *SynthesisInput_Ssml:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Ssml)
+	case nil:
+	default:
+		return fmt.Errorf("SynthesisInput.InputSource has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _SynthesisInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*SynthesisInput)
+	switch tag {
+	case 1: // input_source.text
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.InputSource = &SynthesisInput_Text{x}
+		return true, err
+	case 2: // input_source.ssml
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.InputSource = &SynthesisInput_Ssml{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _SynthesisInput_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*SynthesisInput)
+	// input_source
+	switch x := m.InputSource.(type) {
+	case *SynthesisInput_Text:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Text)))
+		n += len(x.Text)
+	case *SynthesisInput_Ssml:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Ssml)))
+		n += len(x.Ssml)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Description of which voice to use for a synthesis request.
+type VoiceSelectionParams struct {
+	// The language (and optionally also the region) of the voice expressed as a
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+	// "en-US". Required. This should not include a script tag (e.g. use
+	// "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+	// from the input provided in the SynthesisInput.  The TTS service
+	// will use this parameter to help choose an appropriate voice.  Note that
+	// the TTS service may choose a voice with a slightly different language code
+	// than the one selected; it may substitute a different region
+	// (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+	// available), or even a different language, e.g. using "nb" (Norwegian
+	// Bokmal) instead of "no" (Norwegian)".
+	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// The name of the voice. Optional; if not set, the service will choose a
+	// voice based on the other parameters such as language_code and gender.
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	// The preferred gender of the voice. Optional; if not set, the service will
+	// choose a voice based on the other parameters such as language_code and
+	// name. Note that this is only a preference, not requirement; if a
+	// voice of the appropriate gender is not available, the synthesizer should
+	// substitute a voice with a different gender rather than failing the request.
+	SsmlGender           SsmlVoiceGender `protobuf:"varint,3,opt,name=ssml_gender,json=ssmlGender,proto3,enum=google.cloud.texttospeech.v1.SsmlVoiceGender" json:"ssml_gender,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *VoiceSelectionParams) Reset()         { *m = VoiceSelectionParams{} }
+func (m *VoiceSelectionParams) String() string { return proto.CompactTextString(m) }
+func (*VoiceSelectionParams) ProtoMessage()    {}
+func (*VoiceSelectionParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{5}
+}
+func (m *VoiceSelectionParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VoiceSelectionParams.Unmarshal(m, b)
+}
+func (m *VoiceSelectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VoiceSelectionParams.Marshal(b, m, deterministic)
+}
+func (dst *VoiceSelectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoiceSelectionParams.Merge(dst, src)
+}
+func (m *VoiceSelectionParams) XXX_Size() int {
+	return xxx_messageInfo_VoiceSelectionParams.Size(m)
+}
+func (m *VoiceSelectionParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_VoiceSelectionParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VoiceSelectionParams proto.InternalMessageInfo
+
+func (m *VoiceSelectionParams) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *VoiceSelectionParams) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *VoiceSelectionParams) GetSsmlGender() SsmlVoiceGender {
+	if m != nil {
+		return m.SsmlGender
+	}
+	return SsmlVoiceGender_SSML_VOICE_GENDER_UNSPECIFIED
+}
+
+// Description of audio data to be synthesized.
+type AudioConfig struct {
+	// Required. The format of the requested audio byte stream.
+	AudioEncoding AudioEncoding `protobuf:"varint,1,opt,name=audio_encoding,json=audioEncoding,proto3,enum=google.cloud.texttospeech.v1.AudioEncoding" json:"audio_encoding,omitempty"`
+	// Optional speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+	// native speed supported by the specific voice. 2.0 is twice as fast, and
+	// 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+	// other values < 0.25 or > 4.0 will return an error.
+	SpeakingRate float64 `protobuf:"fixed64,2,opt,name=speaking_rate,json=speakingRate,proto3" json:"speaking_rate,omitempty"`
+	// Optional speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+	// semitones from the original pitch. -20 means decrease 20 semitones from the
+	// original pitch.
+	Pitch float64 `protobuf:"fixed64,3,opt,name=pitch,proto3" json:"pitch,omitempty"`
+	// Optional volume gain (in dB) of the normal native volume supported by the
+	// specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+	// 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+	// will play at approximately half the amplitude of the normal native signal
+	// amplitude. A value of +6.0 (dB) will play at approximately twice the
+	// amplitude of the normal native signal amplitude. Strongly recommend not to
+	// exceed +10 (dB) as there's usually no effective increase in loudness for
+	// any value greater than that.
+	VolumeGainDb float64 `protobuf:"fixed64,4,opt,name=volume_gain_db,json=volumeGainDb,proto3" json:"volume_gain_db,omitempty"`
+	// The synthesis sample rate (in hertz) for this audio. Optional.  If this is
+	// different from the voice's natural sample rate, then the synthesizer will
+	// honor this request by converting to the desired sample rate (which might
+	// result in worse audio quality), unless the specified sample rate is not
+	// supported for the encoding chosen, in which case it will fail the request
+	// and return [google.rpc.Code.INVALID_ARGUMENT][].
+	SampleRateHertz      int32    `protobuf:"varint,5,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AudioConfig) Reset()         { *m = AudioConfig{} }
+func (m *AudioConfig) String() string { return proto.CompactTextString(m) }
+func (*AudioConfig) ProtoMessage()    {}
+func (*AudioConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{6}
+}
+func (m *AudioConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AudioConfig.Unmarshal(m, b)
+}
+func (m *AudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AudioConfig.Marshal(b, m, deterministic)
+}
+func (dst *AudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioConfig.Merge(dst, src)
+}
+func (m *AudioConfig) XXX_Size() int {
+	return xxx_messageInfo_AudioConfig.Size(m)
+}
+func (m *AudioConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AudioConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AudioConfig proto.InternalMessageInfo
+
+func (m *AudioConfig) GetAudioEncoding() AudioEncoding {
+	if m != nil {
+		return m.AudioEncoding
+	}
+	return AudioEncoding_AUDIO_ENCODING_UNSPECIFIED
+}
+
+func (m *AudioConfig) GetSpeakingRate() float64 {
+	if m != nil {
+		return m.SpeakingRate
+	}
+	return 0
+}
+
+func (m *AudioConfig) GetPitch() float64 {
+	if m != nil {
+		return m.Pitch
+	}
+	return 0
+}
+
+func (m *AudioConfig) GetVolumeGainDb() float64 {
+	if m != nil {
+		return m.VolumeGainDb
+	}
+	return 0
+}
+
+func (m *AudioConfig) GetSampleRateHertz() int32 {
+	if m != nil {
+		return m.SampleRateHertz
+	}
+	return 0
+}
+
+// The message returned to the client by the `SynthesizeSpeech` method.
+type SynthesizeSpeechResponse struct {
+	// The audio data bytes encoded as specified in the request, including the
+	// header (For LINEAR16 audio, we include the WAV header). Note: as
+	// with all bytes fields, protobuffers use a pure binary representation,
+	// whereas JSON representations use base64.
+	AudioContent         []byte   `protobuf:"bytes,1,opt,name=audio_content,json=audioContent,proto3" json:"audio_content,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SynthesizeSpeechResponse) Reset()         { *m = SynthesizeSpeechResponse{} }
+func (m *SynthesizeSpeechResponse) String() string { return proto.CompactTextString(m) }
+func (*SynthesizeSpeechResponse) ProtoMessage()    {}
+func (*SynthesizeSpeechResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_75c08ddd85578159, []int{7}
+}
+func (m *SynthesizeSpeechResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SynthesizeSpeechResponse.Unmarshal(m, b)
+}
+func (m *SynthesizeSpeechResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SynthesizeSpeechResponse.Marshal(b, m, deterministic)
+}
+func (dst *SynthesizeSpeechResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechResponse.Merge(dst, src)
+}
+func (m *SynthesizeSpeechResponse) XXX_Size() int {
+	return xxx_messageInfo_SynthesizeSpeechResponse.Size(m)
+}
+func (m *SynthesizeSpeechResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SynthesizeSpeechResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SynthesizeSpeechResponse proto.InternalMessageInfo
+
+func (m *SynthesizeSpeechResponse) GetAudioContent() []byte {
+	if m != nil {
+		return m.AudioContent
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*ListVoicesRequest)(nil), "google.cloud.texttospeech.v1.ListVoicesRequest")
+	proto.RegisterType((*ListVoicesResponse)(nil), "google.cloud.texttospeech.v1.ListVoicesResponse")
+	proto.RegisterType((*Voice)(nil), "google.cloud.texttospeech.v1.Voice")
+	proto.RegisterType((*SynthesizeSpeechRequest)(nil), "google.cloud.texttospeech.v1.SynthesizeSpeechRequest")
+	proto.RegisterType((*SynthesisInput)(nil), "google.cloud.texttospeech.v1.SynthesisInput")
+	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.texttospeech.v1.VoiceSelectionParams")
+	proto.RegisterType((*AudioConfig)(nil), "google.cloud.texttospeech.v1.AudioConfig")
+	proto.RegisterType((*SynthesizeSpeechResponse)(nil), "google.cloud.texttospeech.v1.SynthesizeSpeechResponse")
+	proto.RegisterEnum("google.cloud.texttospeech.v1.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
+	proto.RegisterEnum("google.cloud.texttospeech.v1.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// TextToSpeechClient is the client API for TextToSpeech service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type TextToSpeechClient interface {
+	// Returns a list of [Voice][google.cloud.texttospeech.v1.Voice]
+	// supported for synthesis.
+	ListVoices(ctx context.Context, in *ListVoicesRequest, opts ...grpc.CallOption) (*ListVoicesResponse, error)
+	// Synthesizes speech synchronously: receive results after all text input
+	// has been processed.
+	SynthesizeSpeech(ctx context.Context, in *SynthesizeSpeechRequest, opts ...grpc.CallOption) (*SynthesizeSpeechResponse, error)
+}
+
+type textToSpeechClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewTextToSpeechClient(cc *grpc.ClientConn) TextToSpeechClient {
+	return &textToSpeechClient{cc}
+}
+
+func (c *textToSpeechClient) ListVoices(ctx context.Context, in *ListVoicesRequest, opts ...grpc.CallOption) (*ListVoicesResponse, error) {
+	out := new(ListVoicesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.texttospeech.v1.TextToSpeech/ListVoices", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *textToSpeechClient) SynthesizeSpeech(ctx context.Context, in *SynthesizeSpeechRequest, opts ...grpc.CallOption) (*SynthesizeSpeechResponse, error) {
+	out := new(SynthesizeSpeechResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.texttospeech.v1.TextToSpeech/SynthesizeSpeech", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// TextToSpeechServer is the server API for TextToSpeech service.
+type TextToSpeechServer interface {
+	// Returns a list of [Voice][google.cloud.texttospeech.v1.Voice]
+	// supported for synthesis.
+	ListVoices(context.Context, *ListVoicesRequest) (*ListVoicesResponse, error)
+	// Synthesizes speech synchronously: receive results after all text input
+	// has been processed.
+	SynthesizeSpeech(context.Context, *SynthesizeSpeechRequest) (*SynthesizeSpeechResponse, error)
+}
+
+func RegisterTextToSpeechServer(s *grpc.Server, srv TextToSpeechServer) {
+	s.RegisterService(&_TextToSpeech_serviceDesc, srv)
+}
+
+func _TextToSpeech_ListVoices_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListVoicesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TextToSpeechServer).ListVoices(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.texttospeech.v1.TextToSpeech/ListVoices",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TextToSpeechServer).ListVoices(ctx, req.(*ListVoicesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _TextToSpeech_SynthesizeSpeech_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SynthesizeSpeechRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TextToSpeechServer).SynthesizeSpeech(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.texttospeech.v1.TextToSpeech/SynthesizeSpeech",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TextToSpeechServer).SynthesizeSpeech(ctx, req.(*SynthesizeSpeechRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _TextToSpeech_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.texttospeech.v1.TextToSpeech",
+	HandlerType: (*TextToSpeechServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListVoices",
+			Handler:    _TextToSpeech_ListVoices_Handler,
+		},
+		{
+			MethodName: "SynthesizeSpeech",
+			Handler:    _TextToSpeech_SynthesizeSpeech_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/texttospeech/v1/cloud_tts.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/texttospeech/v1/cloud_tts.proto", fileDescriptor_cloud_tts_75c08ddd85578159)
+}
+
+var fileDescriptor_cloud_tts_75c08ddd85578159 = []byte{
+	// 868 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0xee, 0xd8, 0x71, 0xda, 0x3e, 0xaf, 0x5d, 0x67, 0x88, 0xc0, 0x44, 0xa5, 0x32, 0x1b, 0x90,
+	0x42, 0x28, 0x36, 0x76, 0x45, 0x05, 0xed, 0x01, 0x39, 0xf6, 0xd6, 0xb1, 0xe4, 0xd8, 0x66, 0x36,
+	0x09, 0x12, 0x8a, 0xb4, 0x9a, 0xac, 0x87, 0xcd, 0x8a, 0xf5, 0xcc, 0xe2, 0x19, 0x47, 0xa5, 0x47,
+	0xf8, 0x09, 0xfc, 0x00, 0xc4, 0x95, 0x5f, 0xc0, 0x99, 0x23, 0x12, 0x27, 0xfe, 0x02, 0x67, 0x6e,
+	0x48, 0x1c, 0xd1, 0xcc, 0xae, 0xdb, 0x8d, 0x13, 0x19, 0x73, 0xe1, 0xb6, 0xf3, 0xde, 0x7c, 0x6f,
+	0xbe, 0xf7, 0xcd, 0xb7, 0x6f, 0xe0, 0x61, 0x20, 0x44, 0x10, 0xb1, 0x86, 0x1f, 0x89, 0xf9, 0xa4,
+	0xa1, 0xd8, 0x73, 0xa5, 0x84, 0x8c, 0x19, 0xf3, 0x2f, 0x1a, 0x97, 0xcd, 0x24, 0xea, 0x29, 0x25,
+	0xeb, 0xf1, 0x4c, 0x28, 0x81, 0xef, 0x27, 0xbb, 0xeb, 0x26, 0x5e, 0xcf, 0xee, 0xae, 0x5f, 0x36,
+	0x77, 0xd2, 0x6c, 0x83, 0xc6, 0x61, 0x83, 0x72, 0x2e, 0x14, 0x55, 0xa1, 0xe0, 0x29, 0xd6, 0xfe,
+	0x18, 0xb6, 0x06, 0xa1, 0x54, 0xa7, 0x22, 0xf4, 0x99, 0x24, 0xec, 0xeb, 0x39, 0x93, 0x0a, 0xef,
+	0x42, 0x29, 0xa2, 0x3c, 0x98, 0xd3, 0x80, 0x79, 0xbe, 0x98, 0xb0, 0x2a, 0xaa, 0xa1, 0xbd, 0xbb,
+	0xc4, 0x5a, 0x04, 0x3b, 0x62, 0xc2, 0xec, 0xcf, 0x00, 0x67, 0x91, 0x32, 0x16, 0x5c, 0x32, 0xfc,
+	0x14, 0x36, 0x2f, 0x4d, 0xa4, 0x8a, 0x6a, 0xf9, 0xbd, 0x62, 0x6b, 0xb7, 0xbe, 0x8a, 0x5c, 0xdd,
+	0xa0, 0x49, 0x0a, 0xb1, 0x7f, 0x43, 0x50, 0x30, 0x11, 0xfc, 0x2e, 0x94, 0xaf, 0x30, 0x48, 0xca,
+	0xdd, 0x25, 0xa5, 0x2c, 0x05, 0x89, 0x31, 0x6c, 0x70, 0x3a, 0x65, 0xd5, 0x9c, 0xe1, 0x67, 0xbe,
+	0xf1, 0x10, 0x8a, 0x52, 0x4e, 0x23, 0x2f, 0x60, 0x7c, 0xc2, 0x66, 0xd5, 0x7c, 0x0d, 0xed, 0x95,
+	0x5b, 0x1f, 0xac, 0xa6, 0xe1, 0xca, 0x69, 0x64, 0x0e, 0xee, 0x19, 0x10, 0x01, 0x5d, 0x21, 0xf9,
+	0xc6, 0x9f, 0xc0, 0x9b, 0x9c, 0xaa, 0xf9, 0x8c, 0x46, 0x9e, 0xa4, 0xd3, 0x38, 0x62, 0xde, 0x8c,
+	0x2a, 0xe6, 0x5d, 0xb0, 0x99, 0x7a, 0x51, 0xdd, 0xa8, 0xa1, 0xbd, 0x02, 0x79, 0x3d, 0xdd, 0xe0,
+	0x9a, 0x3c, 0xa1, 0x8a, 0x1d, 0xea, 0xac, 0xfd, 0x17, 0x82, 0x37, 0xdc, 0x6f, 0xb8, 0xba, 0x60,
+	0x32, 0x7c, 0xc1, 0x5c, 0x73, 0xdc, 0x42, 0xe3, 0x03, 0x28, 0x84, 0x3c, 0x9e, 0x2b, 0xa3, 0x6d,
+	0xb1, 0xf5, 0xf0, 0x5f, 0x08, 0xa6, 0x55, 0x64, 0x5f, 0x63, 0x48, 0x02, 0xc5, 0x87, 0x50, 0x30,
+	0xca, 0x99, 0xfe, 0x8b, 0xad, 0xd6, 0x1a, 0x5a, 0xbb, 0x2c, 0x62, 0xbe, 0x36, 0xc0, 0x98, 0xce,
+	0xe8, 0x54, 0x92, 0xa4, 0x00, 0x1e, 0x80, 0x45, 0xe7, 0x93, 0x50, 0x78, 0xbe, 0xe0, 0x5f, 0x86,
+	0x81, 0x51, 0xad, 0xd8, 0x7a, 0x6f, 0x75, 0xc1, 0xb6, 0x46, 0x74, 0x0c, 0x80, 0x14, 0xe9, 0xab,
+	0x85, 0x3d, 0x80, 0xf2, 0x55, 0xc2, 0x78, 0x1b, 0x36, 0x34, 0x3a, 0x31, 0xd2, 0xe1, 0x2d, 0x62,
+	0x56, 0x3a, 0xaa, 0x85, 0x4e, 0xae, 0x4f, 0x47, 0xf5, 0xea, 0xa0, 0x0c, 0x96, 0x69, 0xcf, 0x93,
+	0x62, 0x3e, 0xf3, 0x99, 0xfd, 0x03, 0x82, 0xed, 0x9b, 0xb8, 0xaf, 0x65, 0xd3, 0xff, 0xc3, 0x22,
+	0xf6, 0x9f, 0x08, 0x8a, 0x19, 0x31, 0x30, 0x81, 0x72, 0xa2, 0x26, 0xe3, 0xbe, 0x98, 0x84, 0x3c,
+	0x30, 0xcc, 0xca, 0xad, 0xf7, 0xd7, 0xd0, 0xd3, 0x49, 0x21, 0xa4, 0x44, 0xb3, 0x4b, 0xdd, 0xac,
+	0x8c, 0x19, 0xfd, 0x2a, 0xe4, 0x81, 0x31, 0xa0, 0x69, 0x08, 0x11, 0x6b, 0x11, 0xd4, 0xae, 0xc3,
+	0xdb, 0x50, 0x88, 0x43, 0xe5, 0x5f, 0x98, 0x96, 0x10, 0x49, 0x16, 0xf8, 0x1d, 0x28, 0x5f, 0x8a,
+	0x68, 0x3e, 0x65, 0x5e, 0x40, 0x43, 0xee, 0x4d, 0xce, 0x8d, 0x6d, 0x11, 0xb1, 0x92, 0x68, 0x8f,
+	0x86, 0xbc, 0x7b, 0x8e, 0xf7, 0x61, 0xeb, 0xba, 0xbf, 0x0b, 0xc6, 0xdf, 0xf7, 0xe4, 0x92, 0xb1,
+	0x3f, 0x85, 0xea, 0x75, 0x5f, 0xa7, 0x13, 0x60, 0x17, 0x4a, 0x2f, 0xad, 0xa4, 0x18, 0x4f, 0xee,
+	0xdc, 0x22, 0xd6, 0xc2, 0x20, 0x3a, 0xb6, 0xff, 0x39, 0xdc, 0x5b, 0x12, 0x14, 0xbf, 0x0d, 0x6f,
+	0xb9, 0xee, 0xd1, 0xc0, 0x3b, 0x1d, 0xf5, 0x3b, 0x8e, 0xd7, 0x73, 0x86, 0x5d, 0x87, 0x78, 0x27,
+	0x43, 0x77, 0xec, 0x74, 0xfa, 0xcf, 0xfa, 0x4e, 0xb7, 0x72, 0x0b, 0xdf, 0x81, 0x8d, 0xa3, 0xf6,
+	0xc0, 0xa9, 0x20, 0x0c, 0xb0, 0xf9, 0xcc, 0x31, 0xdf, 0x39, 0x5c, 0x84, 0xdb, 0x43, 0xe7, 0xe4,
+	0x98, 0xb4, 0x07, 0x95, 0xfc, 0xfe, 0x31, 0x94, 0xae, 0xc8, 0x88, 0x1f, 0xc0, 0x4e, 0xfb, 0xa4,
+	0xdb, 0x1f, 0x79, 0xce, 0xb0, 0x33, 0xea, 0xf6, 0x87, 0xbd, 0xa5, 0x9a, 0x16, 0xdc, 0x19, 0xf4,
+	0x87, 0x4e, 0x9b, 0x34, 0x1f, 0x57, 0x10, 0xbe, 0x0d, 0xf9, 0xa3, 0xf1, 0xa3, 0x4a, 0x4e, 0x87,
+	0x47, 0xbd, 0x9e, 0x37, 0x1a, 0x9f, 0xb8, 0x95, 0x7c, 0xeb, 0xe7, 0x1c, 0x58, 0xc7, 0xec, 0xb9,
+	0x3a, 0x16, 0x49, 0xb3, 0xf8, 0x3b, 0x04, 0xf0, 0x6a, 0xfa, 0xe1, 0xc6, 0xea, 0x8b, 0xbd, 0x36,
+	0x61, 0x77, 0x3e, 0x5c, 0x1f, 0x90, 0xc8, 0x6a, 0xe3, 0x6f, 0x7f, 0xff, 0xe3, 0xfb, 0x9c, 0x85,
+	0x41, 0xbf, 0x00, 0xc9, 0xbc, 0xc4, 0x3f, 0x22, 0xa8, 0x2c, 0xdf, 0x03, 0xfe, 0x68, 0xbd, 0x49,
+	0xb2, 0x34, 0x8f, 0x76, 0x1e, 0xff, 0x57, 0x58, 0xca, 0xeb, 0x81, 0xe1, 0x55, 0xb5, 0x5f, 0xd3,
+	0xbc, 0x34, 0xea, 0x89, 0x7c, 0xb9, 0xf5, 0x09, 0xda, 0x3f, 0xf8, 0x05, 0x41, 0xcd, 0x17, 0xd3,
+	0x95, 0xd5, 0x0f, 0xb6, 0xb2, 0xe2, 0x8e, 0xf5, 0xc3, 0x34, 0x46, 0x5f, 0x1c, 0xa6, 0x90, 0x40,
+	0xe8, 0x1f, 0xba, 0x2e, 0x66, 0x41, 0x23, 0x60, 0xdc, 0x3c, 0x5b, 0x8d, 0x24, 0x45, 0xe3, 0x50,
+	0xde, 0xfc, 0x46, 0x3e, 0xcd, 0xae, 0xff, 0x46, 0xe8, 0xa7, 0xdc, 0xfd, 0x5e, 0x52, 0xad, 0x63,
+	0x08, 0x64, 0xcf, 0xab, 0x9f, 0x36, 0x7f, 0x5d, 0xa4, 0xcf, 0x4c, 0xfa, 0x2c, 0x9b, 0x3e, 0x3b,
+	0x6d, 0x9e, 0x6f, 0x9a, 0x53, 0x1f, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0x38, 0xd7, 0xcf, 0x2c,
+	0x98, 0x07, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go
new file mode 100644
index 00000000..af33de09
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/texttospeech/v1beta1/cloud_tts.pb.go
@@ -0,0 +1,869 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/texttospeech/v1beta1/cloud_tts.proto
+
+package texttospeech // import "google.golang.org/genproto/googleapis/cloud/texttospeech/v1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Gender of the voice as described in
+// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
+type SsmlVoiceGender int32
+
+const (
+	// An unspecified gender.
+	// In VoiceSelectionParams, this means that the client doesn't care which
+	// gender the selected voice will have. In the Voice field of
+	// ListVoicesResponse, this may mean that the voice doesn't fit any of the
+	// other categories in this enum, or that the gender of the voice isn't known.
+	SsmlVoiceGender_SSML_VOICE_GENDER_UNSPECIFIED SsmlVoiceGender = 0
+	// A male voice.
+	SsmlVoiceGender_MALE SsmlVoiceGender = 1
+	// A female voice.
+	SsmlVoiceGender_FEMALE SsmlVoiceGender = 2
+	// A gender-neutral voice.
+	SsmlVoiceGender_NEUTRAL SsmlVoiceGender = 3
+)
+
+var SsmlVoiceGender_name = map[int32]string{
+	0: "SSML_VOICE_GENDER_UNSPECIFIED",
+	1: "MALE",
+	2: "FEMALE",
+	3: "NEUTRAL",
+}
+var SsmlVoiceGender_value = map[string]int32{
+	"SSML_VOICE_GENDER_UNSPECIFIED": 0,
+	"MALE":    1,
+	"FEMALE":  2,
+	"NEUTRAL": 3,
+}
+
+func (x SsmlVoiceGender) String() string {
+	return proto.EnumName(SsmlVoiceGender_name, int32(x))
+}
+func (SsmlVoiceGender) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{0}
+}
+
+// Configuration to set up audio encoder. The encoding determines the output
+// audio format that we'd like.
+type AudioEncoding int32
+
+const (
+	// Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][].
+	AudioEncoding_AUDIO_ENCODING_UNSPECIFIED AudioEncoding = 0
+	// Uncompressed 16-bit signed little-endian samples (Linear PCM).
+	// Audio content returned as LINEAR16 also contains a WAV header.
+	AudioEncoding_LINEAR16 AudioEncoding = 1
+	// MP3 audio.
+	AudioEncoding_MP3 AudioEncoding = 2
+	// Opus encoded audio wrapped in an ogg container. The result will be a
+	// file which can be played natively on Android, and in browsers (at least
+	// Chrome and Firefox). The quality of the encoding is considerably higher
+	// than MP3 while using approximately the same bitrate.
+	AudioEncoding_OGG_OPUS AudioEncoding = 3
+)
+
+var AudioEncoding_name = map[int32]string{
+	0: "AUDIO_ENCODING_UNSPECIFIED",
+	1: "LINEAR16",
+	2: "MP3",
+	3: "OGG_OPUS",
+}
+var AudioEncoding_value = map[string]int32{
+	"AUDIO_ENCODING_UNSPECIFIED": 0,
+	"LINEAR16":                   1,
+	"MP3":                        2,
+	"OGG_OPUS":                   3,
+}
+
+func (x AudioEncoding) String() string {
+	return proto.EnumName(AudioEncoding_name, int32(x))
+}
+func (AudioEncoding) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{1}
+}
+
+// The top-level message sent by the client for the `ListVoices` method.
+type ListVoicesRequest struct {
+	// Optional (but recommended)
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+	// specified, the ListVoices call will only return voices that can be used to
+	// synthesize this language_code. E.g. when specifying "en-NZ", you will get
+	// supported "en-*" voices; when specifying "no", you will get supported
+	// "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+	// will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+	// supported "yue-*" voices.
+	LanguageCode         string   `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVoicesRequest) Reset()         { *m = ListVoicesRequest{} }
+func (m *ListVoicesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListVoicesRequest) ProtoMessage()    {}
+func (*ListVoicesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{0}
+}
+func (m *ListVoicesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVoicesRequest.Unmarshal(m, b)
+}
+func (m *ListVoicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVoicesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListVoicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVoicesRequest.Merge(dst, src)
+}
+func (m *ListVoicesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListVoicesRequest.Size(m)
+}
+func (m *ListVoicesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVoicesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListVoicesRequest proto.InternalMessageInfo
+
+func (m *ListVoicesRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+// The message returned to the client by the `ListVoices` method.
+type ListVoicesResponse struct {
+	// The list of voices.
+	Voices               []*Voice `protobuf:"bytes,1,rep,name=voices,proto3" json:"voices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListVoicesResponse) Reset()         { *m = ListVoicesResponse{} }
+func (m *ListVoicesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListVoicesResponse) ProtoMessage()    {}
+func (*ListVoicesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{1}
+}
+func (m *ListVoicesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListVoicesResponse.Unmarshal(m, b)
+}
+func (m *ListVoicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListVoicesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListVoicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListVoicesResponse.Merge(dst, src)
+}
+func (m *ListVoicesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListVoicesResponse.Size(m)
+}
+func (m *ListVoicesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListVoicesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListVoicesResponse proto.InternalMessageInfo
+
+func (m *ListVoicesResponse) GetVoices() []*Voice {
+	if m != nil {
+		return m.Voices
+	}
+	return nil
+}
+
+// Description of a voice supported by the TTS service.
+type Voice struct {
+	// The languages that this voice supports, expressed as
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+	// "en-US", "es-419", "cmn-tw").
+	LanguageCodes []string `protobuf:"bytes,1,rep,name=language_codes,json=languageCodes,proto3" json:"language_codes,omitempty"`
+	// The name of this voice.  Each distinct voice has a unique name.
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	// The gender of this voice.
+	SsmlGender SsmlVoiceGender `protobuf:"varint,3,opt,name=ssml_gender,json=ssmlGender,proto3,enum=google.cloud.texttospeech.v1beta1.SsmlVoiceGender" json:"ssml_gender,omitempty"`
+	// The natural sample rate (in hertz) for this voice.
+	NaturalSampleRateHertz int32    `protobuf:"varint,4,opt,name=natural_sample_rate_hertz,json=naturalSampleRateHertz,proto3" json:"natural_sample_rate_hertz,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
+}
+
+func (m *Voice) Reset()         { *m = Voice{} }
+func (m *Voice) String() string { return proto.CompactTextString(m) }
+func (*Voice) ProtoMessage()    {}
+func (*Voice) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{2}
+}
+func (m *Voice) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Voice.Unmarshal(m, b)
+}
+func (m *Voice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Voice.Marshal(b, m, deterministic)
+}
+func (dst *Voice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Voice.Merge(dst, src)
+}
+func (m *Voice) XXX_Size() int {
+	return xxx_messageInfo_Voice.Size(m)
+}
+func (m *Voice) XXX_DiscardUnknown() {
+	xxx_messageInfo_Voice.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Voice proto.InternalMessageInfo
+
+func (m *Voice) GetLanguageCodes() []string {
+	if m != nil {
+		return m.LanguageCodes
+	}
+	return nil
+}
+
+func (m *Voice) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Voice) GetSsmlGender() SsmlVoiceGender {
+	if m != nil {
+		return m.SsmlGender
+	}
+	return SsmlVoiceGender_SSML_VOICE_GENDER_UNSPECIFIED
+}
+
+func (m *Voice) GetNaturalSampleRateHertz() int32 {
+	if m != nil {
+		return m.NaturalSampleRateHertz
+	}
+	return 0
+}
+
+// The top-level message sent by the client for the `SynthesizeSpeech` method.
+type SynthesizeSpeechRequest struct {
+	// Required. The Synthesizer requires either plain text or SSML as input.
+	Input *SynthesisInput `protobuf:"bytes,1,opt,name=input,proto3" json:"input,omitempty"`
+	// Required. The desired voice of the synthesized audio.
+	Voice *VoiceSelectionParams `protobuf:"bytes,2,opt,name=voice,proto3" json:"voice,omitempty"`
+	// Required. The configuration of the synthesized audio.
+	AudioConfig          *AudioConfig `protobuf:"bytes,3,opt,name=audio_config,json=audioConfig,proto3" json:"audio_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *SynthesizeSpeechRequest) Reset()         { *m = SynthesizeSpeechRequest{} }
+func (m *SynthesizeSpeechRequest) String() string { return proto.CompactTextString(m) }
+func (*SynthesizeSpeechRequest) ProtoMessage()    {}
+func (*SynthesizeSpeechRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{3}
+}
+func (m *SynthesizeSpeechRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SynthesizeSpeechRequest.Unmarshal(m, b)
+}
+func (m *SynthesizeSpeechRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SynthesizeSpeechRequest.Marshal(b, m, deterministic)
+}
+func (dst *SynthesizeSpeechRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechRequest.Merge(dst, src)
+}
+func (m *SynthesizeSpeechRequest) XXX_Size() int {
+	return xxx_messageInfo_SynthesizeSpeechRequest.Size(m)
+}
+func (m *SynthesizeSpeechRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SynthesizeSpeechRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SynthesizeSpeechRequest proto.InternalMessageInfo
+
+func (m *SynthesizeSpeechRequest) GetInput() *SynthesisInput {
+	if m != nil {
+		return m.Input
+	}
+	return nil
+}
+
+func (m *SynthesizeSpeechRequest) GetVoice() *VoiceSelectionParams {
+	if m != nil {
+		return m.Voice
+	}
+	return nil
+}
+
+func (m *SynthesizeSpeechRequest) GetAudioConfig() *AudioConfig {
+	if m != nil {
+		return m.AudioConfig
+	}
+	return nil
+}
+
+// Contains text input to be synthesized. Either `text` or `ssml` must be
+// supplied. Supplying both or neither returns
+// [google.rpc.Code.INVALID_ARGUMENT][]. The input size is limited to 5000
+// characters.
+type SynthesisInput struct {
+	// The input source, which is either plain text or SSML.
+	//
+	// Types that are valid to be assigned to InputSource:
+	//	*SynthesisInput_Text
+	//	*SynthesisInput_Ssml
+	InputSource          isSynthesisInput_InputSource `protobuf_oneof:"input_source"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *SynthesisInput) Reset()         { *m = SynthesisInput{} }
+func (m *SynthesisInput) String() string { return proto.CompactTextString(m) }
+func (*SynthesisInput) ProtoMessage()    {}
+func (*SynthesisInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{4}
+}
+func (m *SynthesisInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SynthesisInput.Unmarshal(m, b)
+}
+func (m *SynthesisInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SynthesisInput.Marshal(b, m, deterministic)
+}
+func (dst *SynthesisInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesisInput.Merge(dst, src)
+}
+func (m *SynthesisInput) XXX_Size() int {
+	return xxx_messageInfo_SynthesisInput.Size(m)
+}
+func (m *SynthesisInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_SynthesisInput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SynthesisInput proto.InternalMessageInfo
+
+type isSynthesisInput_InputSource interface {
+	isSynthesisInput_InputSource()
+}
+
+type SynthesisInput_Text struct {
+	Text string `protobuf:"bytes,1,opt,name=text,proto3,oneof"`
+}
+
+type SynthesisInput_Ssml struct {
+	Ssml string `protobuf:"bytes,2,opt,name=ssml,proto3,oneof"`
+}
+
+func (*SynthesisInput_Text) isSynthesisInput_InputSource() {}
+
+func (*SynthesisInput_Ssml) isSynthesisInput_InputSource() {}
+
+func (m *SynthesisInput) GetInputSource() isSynthesisInput_InputSource {
+	if m != nil {
+		return m.InputSource
+	}
+	return nil
+}
+
+func (m *SynthesisInput) GetText() string {
+	if x, ok := m.GetInputSource().(*SynthesisInput_Text); ok {
+		return x.Text
+	}
+	return ""
+}
+
+func (m *SynthesisInput) GetSsml() string {
+	if x, ok := m.GetInputSource().(*SynthesisInput_Ssml); ok {
+		return x.Ssml
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*SynthesisInput) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _SynthesisInput_OneofMarshaler, _SynthesisInput_OneofUnmarshaler, _SynthesisInput_OneofSizer, []interface{}{
+		(*SynthesisInput_Text)(nil),
+		(*SynthesisInput_Ssml)(nil),
+	}
+}
+
+func _SynthesisInput_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*SynthesisInput)
+	// input_source
+	switch x := m.InputSource.(type) {
+	case *SynthesisInput_Text:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Text)
+	case *SynthesisInput_Ssml:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Ssml)
+	case nil:
+	default:
+		return fmt.Errorf("SynthesisInput.InputSource has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _SynthesisInput_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*SynthesisInput)
+	switch tag {
+	case 1: // input_source.text
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.InputSource = &SynthesisInput_Text{x}
+		return true, err
+	case 2: // input_source.ssml
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.InputSource = &SynthesisInput_Ssml{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _SynthesisInput_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*SynthesisInput)
+	// input_source
+	switch x := m.InputSource.(type) {
+	case *SynthesisInput_Text:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Text)))
+		n += len(x.Text)
+	case *SynthesisInput_Ssml:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Ssml)))
+		n += len(x.Ssml)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Description of which voice to use for a synthesis request.
+type VoiceSelectionParams struct {
+	// The language (and optionally also the region) of the voice expressed as a
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+	// "en-US". Required. This should not include a script tag (e.g. use
+	// "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+	// from the input provided in the SynthesisInput.  The TTS service
+	// will use this parameter to help choose an appropriate voice.  Note that
+	// the TTS service may choose a voice with a slightly different language code
+	// than the one selected; it may substitute a different region
+	// (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+	// available), or even a different language, e.g. using "nb" (Norwegian
+	// Bokmal) instead of "no" (Norwegian)".
+	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// The name of the voice. Optional; if not set, the service will choose a
+	// voice based on the other parameters such as language_code and gender.
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	// The preferred gender of the voice. Optional; if not set, the service will
+	// choose a voice based on the other parameters such as language_code and
+	// name. Note that this is only a preference, not requirement; if a
+	// voice of the appropriate gender is not available, the synthesizer should
+	// substitute a voice with a different gender rather than failing the request.
+	SsmlGender           SsmlVoiceGender `protobuf:"varint,3,opt,name=ssml_gender,json=ssmlGender,proto3,enum=google.cloud.texttospeech.v1beta1.SsmlVoiceGender" json:"ssml_gender,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *VoiceSelectionParams) Reset()         { *m = VoiceSelectionParams{} }
+func (m *VoiceSelectionParams) String() string { return proto.CompactTextString(m) }
+func (*VoiceSelectionParams) ProtoMessage()    {}
+func (*VoiceSelectionParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{5}
+}
+func (m *VoiceSelectionParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VoiceSelectionParams.Unmarshal(m, b)
+}
+func (m *VoiceSelectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VoiceSelectionParams.Marshal(b, m, deterministic)
+}
+func (dst *VoiceSelectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VoiceSelectionParams.Merge(dst, src)
+}
+func (m *VoiceSelectionParams) XXX_Size() int {
+	return xxx_messageInfo_VoiceSelectionParams.Size(m)
+}
+func (m *VoiceSelectionParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_VoiceSelectionParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VoiceSelectionParams proto.InternalMessageInfo
+
+func (m *VoiceSelectionParams) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *VoiceSelectionParams) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *VoiceSelectionParams) GetSsmlGender() SsmlVoiceGender {
+	if m != nil {
+		return m.SsmlGender
+	}
+	return SsmlVoiceGender_SSML_VOICE_GENDER_UNSPECIFIED
+}
+
+// Description of audio data to be synthesized.
+type AudioConfig struct {
+	// Required. The format of the requested audio byte stream.
+	AudioEncoding AudioEncoding `protobuf:"varint,1,opt,name=audio_encoding,json=audioEncoding,proto3,enum=google.cloud.texttospeech.v1beta1.AudioEncoding" json:"audio_encoding,omitempty"`
+	// Optional speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+	// native speed supported by the specific voice. 2.0 is twice as fast, and
+	// 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+	// other values < 0.25 or > 4.0 will return an error.
+	SpeakingRate float64 `protobuf:"fixed64,2,opt,name=speaking_rate,json=speakingRate,proto3" json:"speaking_rate,omitempty"`
+	// Optional speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+	// semitones from the original pitch. -20 means decrease 20 semitones from the
+	// original pitch.
+	Pitch float64 `protobuf:"fixed64,3,opt,name=pitch,proto3" json:"pitch,omitempty"`
+	// Optional volume gain (in dB) of the normal native volume supported by the
+	// specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+	// 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+	// will play at approximately half the amplitude of the normal native signal
+	// amplitude. A value of +6.0 (dB) will play at approximately twice the
+	// amplitude of the normal native signal amplitude. Strongly recommend not to
+	// exceed +10 (dB) as there's usually no effective increase in loudness for
+	// any value greater than that.
+	VolumeGainDb float64 `protobuf:"fixed64,4,opt,name=volume_gain_db,json=volumeGainDb,proto3" json:"volume_gain_db,omitempty"`
+	// The synthesis sample rate (in hertz) for this audio. Optional.  If this is
+	// different from the voice's natural sample rate, then the synthesizer will
+	// honor this request by converting to the desired sample rate (which might
+	// result in worse audio quality), unless the specified sample rate is not
+	// supported for the encoding chosen, in which case it will fail the request
+	// and return [google.rpc.Code.INVALID_ARGUMENT][].
+	SampleRateHertz int32 `protobuf:"varint,5,opt,name=sample_rate_hertz,json=sampleRateHertz,proto3" json:"sample_rate_hertz,omitempty"`
+	// An identifier which selects 'audio effects' profiles that are applied on
+	// (post synthesized) text to speech.
+	// Effects are applied on top of each other in the order they are given.
+	EffectsProfileId     []string `protobuf:"bytes,6,rep,name=effects_profile_id,json=effectsProfileId,proto3" json:"effects_profile_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AudioConfig) Reset()         { *m = AudioConfig{} }
+func (m *AudioConfig) String() string { return proto.CompactTextString(m) }
+func (*AudioConfig) ProtoMessage()    {}
+func (*AudioConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{6}
+}
+func (m *AudioConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AudioConfig.Unmarshal(m, b)
+}
+func (m *AudioConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AudioConfig.Marshal(b, m, deterministic)
+}
+func (dst *AudioConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AudioConfig.Merge(dst, src)
+}
+func (m *AudioConfig) XXX_Size() int {
+	return xxx_messageInfo_AudioConfig.Size(m)
+}
+func (m *AudioConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AudioConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AudioConfig proto.InternalMessageInfo
+
+func (m *AudioConfig) GetAudioEncoding() AudioEncoding {
+	if m != nil {
+		return m.AudioEncoding
+	}
+	return AudioEncoding_AUDIO_ENCODING_UNSPECIFIED
+}
+
+func (m *AudioConfig) GetSpeakingRate() float64 {
+	if m != nil {
+		return m.SpeakingRate
+	}
+	return 0
+}
+
+func (m *AudioConfig) GetPitch() float64 {
+	if m != nil {
+		return m.Pitch
+	}
+	return 0
+}
+
+func (m *AudioConfig) GetVolumeGainDb() float64 {
+	if m != nil {
+		return m.VolumeGainDb
+	}
+	return 0
+}
+
+func (m *AudioConfig) GetSampleRateHertz() int32 {
+	if m != nil {
+		return m.SampleRateHertz
+	}
+	return 0
+}
+
+func (m *AudioConfig) GetEffectsProfileId() []string {
+	if m != nil {
+		return m.EffectsProfileId
+	}
+	return nil
+}
+
+// The message returned to the client by the `SynthesizeSpeech` method.
+type SynthesizeSpeechResponse struct {
+	// The audio data bytes encoded as specified in the request, including the
+	// header (For LINEAR16 audio, we include the WAV header). Note: as
+	// with all bytes fields, protobuffers use a pure binary representation,
+	// whereas JSON representations use base64.
+	AudioContent         []byte   `protobuf:"bytes,1,opt,name=audio_content,json=audioContent,proto3" json:"audio_content,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SynthesizeSpeechResponse) Reset()         { *m = SynthesizeSpeechResponse{} }
+func (m *SynthesizeSpeechResponse) String() string { return proto.CompactTextString(m) }
+func (*SynthesizeSpeechResponse) ProtoMessage()    {}
+func (*SynthesizeSpeechResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloud_tts_9d0ebd338dfb28bd, []int{7}
+}
+func (m *SynthesizeSpeechResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SynthesizeSpeechResponse.Unmarshal(m, b)
+}
+func (m *SynthesizeSpeechResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SynthesizeSpeechResponse.Marshal(b, m, deterministic)
+}
+func (dst *SynthesizeSpeechResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SynthesizeSpeechResponse.Merge(dst, src)
+}
+func (m *SynthesizeSpeechResponse) XXX_Size() int {
+	return xxx_messageInfo_SynthesizeSpeechResponse.Size(m)
+}
+func (m *SynthesizeSpeechResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SynthesizeSpeechResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SynthesizeSpeechResponse proto.InternalMessageInfo
+
+func (m *SynthesizeSpeechResponse) GetAudioContent() []byte {
+	if m != nil {
+		return m.AudioContent
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*ListVoicesRequest)(nil), "google.cloud.texttospeech.v1beta1.ListVoicesRequest")
+	proto.RegisterType((*ListVoicesResponse)(nil), "google.cloud.texttospeech.v1beta1.ListVoicesResponse")
+	proto.RegisterType((*Voice)(nil), "google.cloud.texttospeech.v1beta1.Voice")
+	proto.RegisterType((*SynthesizeSpeechRequest)(nil), "google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest")
+	proto.RegisterType((*SynthesisInput)(nil), "google.cloud.texttospeech.v1beta1.SynthesisInput")
+	proto.RegisterType((*VoiceSelectionParams)(nil), "google.cloud.texttospeech.v1beta1.VoiceSelectionParams")
+	proto.RegisterType((*AudioConfig)(nil), "google.cloud.texttospeech.v1beta1.AudioConfig")
+	proto.RegisterType((*SynthesizeSpeechResponse)(nil), "google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse")
+	proto.RegisterEnum("google.cloud.texttospeech.v1beta1.SsmlVoiceGender", SsmlVoiceGender_name, SsmlVoiceGender_value)
+	proto.RegisterEnum("google.cloud.texttospeech.v1beta1.AudioEncoding", AudioEncoding_name, AudioEncoding_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// TextToSpeechClient is the client API for TextToSpeech service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type TextToSpeechClient interface {
+	// Returns a list of [Voice][google.cloud.texttospeech.v1beta1.Voice]
+	// supported for synthesis.
+	ListVoices(ctx context.Context, in *ListVoicesRequest, opts ...grpc.CallOption) (*ListVoicesResponse, error)
+	// Synthesizes speech synchronously: receive results after all text input
+	// has been processed.
+	SynthesizeSpeech(ctx context.Context, in *SynthesizeSpeechRequest, opts ...grpc.CallOption) (*SynthesizeSpeechResponse, error)
+}
+
+type textToSpeechClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewTextToSpeechClient(cc *grpc.ClientConn) TextToSpeechClient {
+	return &textToSpeechClient{cc}
+}
+
+func (c *textToSpeechClient) ListVoices(ctx context.Context, in *ListVoicesRequest, opts ...grpc.CallOption) (*ListVoicesResponse, error) {
+	out := new(ListVoicesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.texttospeech.v1beta1.TextToSpeech/ListVoices", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *textToSpeechClient) SynthesizeSpeech(ctx context.Context, in *SynthesizeSpeechRequest, opts ...grpc.CallOption) (*SynthesizeSpeechResponse, error) {
+	out := new(SynthesizeSpeechResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.texttospeech.v1beta1.TextToSpeech/SynthesizeSpeech", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// TextToSpeechServer is the server API for TextToSpeech service.
+type TextToSpeechServer interface {
+	// Returns a list of [Voice][google.cloud.texttospeech.v1beta1.Voice]
+	// supported for synthesis.
+	ListVoices(context.Context, *ListVoicesRequest) (*ListVoicesResponse, error)
+	// Synthesizes speech synchronously: receive results after all text input
+	// has been processed.
+	SynthesizeSpeech(context.Context, *SynthesizeSpeechRequest) (*SynthesizeSpeechResponse, error)
+}
+
+func RegisterTextToSpeechServer(s *grpc.Server, srv TextToSpeechServer) {
+	s.RegisterService(&_TextToSpeech_serviceDesc, srv)
+}
+
+func _TextToSpeech_ListVoices_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListVoicesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TextToSpeechServer).ListVoices(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.texttospeech.v1beta1.TextToSpeech/ListVoices",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TextToSpeechServer).ListVoices(ctx, req.(*ListVoicesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _TextToSpeech_SynthesizeSpeech_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SynthesizeSpeechRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TextToSpeechServer).SynthesizeSpeech(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.texttospeech.v1beta1.TextToSpeech/SynthesizeSpeech",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TextToSpeechServer).SynthesizeSpeech(ctx, req.(*SynthesizeSpeechRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _TextToSpeech_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.texttospeech.v1beta1.TextToSpeech",
+	HandlerType: (*TextToSpeechServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListVoices",
+			Handler:    _TextToSpeech_ListVoices_Handler,
+		},
+		{
+			MethodName: "SynthesizeSpeech",
+			Handler:    _TextToSpeech_SynthesizeSpeech_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/texttospeech/v1beta1/cloud_tts.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/texttospeech/v1beta1/cloud_tts.proto", fileDescriptor_cloud_tts_9d0ebd338dfb28bd)
+}
+
+var fileDescriptor_cloud_tts_9d0ebd338dfb28bd = []byte{
+	// 875 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xdd, 0x6e, 0x1b, 0x45,
+	0x14, 0xee, 0xd8, 0x71, 0xda, 0x1e, 0xaf, 0x1d, 0x67, 0x14, 0x51, 0x13, 0x51, 0x94, 0x6e, 0xa8,
+	0x64, 0x45, 0xc8, 0xc6, 0x2e, 0xbf, 0xe9, 0x05, 0x38, 0xf6, 0xd6, 0xb5, 0xe4, 0x3f, 0x66, 0x93,
+	0x54, 0xe2, 0x66, 0x35, 0xd9, 0x9d, 0x6c, 0x56, 0xac, 0x67, 0x96, 0x9d, 0x71, 0x54, 0x7a, 0x89,
+	0xb8, 0xe6, 0x02, 0x9e, 0x00, 0x89, 0x07, 0xe0, 0x59, 0x40, 0xe2, 0x09, 0x78, 0x08, 0x2e, 0xd1,
+	0xce, 0x6c, 0x52, 0x27, 0x41, 0xd4, 0xe1, 0x82, 0xbb, 0x99, 0x73, 0xf6, 0x3b, 0xf3, 0x9d, 0x6f,
+	0xbe, 0x3d, 0x03, 0xed, 0x50, 0x88, 0x30, 0x66, 0x2d, 0x3f, 0x16, 0x8b, 0xa0, 0xa5, 0xd8, 0x4b,
+	0xa5, 0x84, 0x4c, 0x18, 0xf3, 0xcf, 0x5a, 0xe7, 0xed, 0x13, 0xa6, 0x68, 0xdb, 0xa4, 0x3c, 0xa5,
+	0x64, 0x33, 0x49, 0x85, 0x12, 0xf8, 0x91, 0x81, 0x34, 0x75, 0xbc, 0xb9, 0x0c, 0x69, 0xe6, 0x90,
+	0xed, 0x77, 0xf2, 0xaa, 0x34, 0x89, 0x5a, 0x94, 0x73, 0xa1, 0xa8, 0x8a, 0x04, 0xcf, 0x0b, 0xd8,
+	0x9f, 0xc2, 0xe6, 0x28, 0x92, 0xea, 0x58, 0x44, 0x3e, 0x93, 0x84, 0x7d, 0xb3, 0x60, 0x52, 0xe1,
+	0x5d, 0xa8, 0xc4, 0x94, 0x87, 0x0b, 0x1a, 0x32, 0xcf, 0x17, 0x01, 0xab, 0xa3, 0x1d, 0xd4, 0xb8,
+	0x4f, 0xac, 0x8b, 0x60, 0x4f, 0x04, 0xcc, 0x3e, 0x06, 0xbc, 0x8c, 0x94, 0x89, 0xe0, 0x92, 0xe1,
+	0x2f, 0x60, 0xfd, 0x5c, 0x47, 0xea, 0x68, 0xa7, 0xd8, 0x28, 0x77, 0x1a, 0xcd, 0x37, 0x32, 0x6c,
+	0xea, 0x12, 0x24, 0xc7, 0xd9, 0xbf, 0x21, 0x28, 0xe9, 0x08, 0x7e, 0x0c, 0xd5, 0x2b, 0x34, 0x4c,
+	0xcd, 0xfb, 0xa4, 0xb2, 0xcc, 0x43, 0x62, 0x0c, 0x6b, 0x9c, 0xce, 0x59, 0xbd, 0xa0, 0x49, 0xea,
+	0x35, 0x76, 0xa1, 0x2c, 0xe5, 0x3c, 0xf6, 0x42, 0xc6, 0x03, 0x96, 0xd6, 0x8b, 0x3b, 0xa8, 0x51,
+	0xed, 0x74, 0x56, 0xe0, 0xe2, 0xca, 0x79, 0xac, 0x4f, 0x1f, 0x68, 0x24, 0x81, 0xac, 0x8c, 0x59,
+	0xe3, 0xcf, 0xe0, 0x6d, 0x4e, 0xd5, 0x22, 0xa5, 0xb1, 0x27, 0xe9, 0x3c, 0x89, 0x99, 0x97, 0x52,
+	0xc5, 0xbc, 0x33, 0x96, 0xaa, 0x57, 0xf5, 0xb5, 0x1d, 0xd4, 0x28, 0x91, 0xb7, 0xf2, 0x0f, 0x5c,
+	0x9d, 0x27, 0x54, 0xb1, 0xe7, 0x59, 0xd6, 0xfe, 0xbe, 0x00, 0x0f, 0xdc, 0x6f, 0xb9, 0x3a, 0x63,
+	0x32, 0x7a, 0xc5, 0x5c, 0x7d, 0xe6, 0x85, 0xda, 0x03, 0x28, 0x45, 0x3c, 0x59, 0x28, 0xad, 0x72,
+	0xb9, 0xd3, 0x5e, 0x85, 0x65, 0x5e, 0x4a, 0x0e, 0x33, 0x20, 0x31, 0x78, 0x3c, 0x86, 0x92, 0xd6,
+	0x50, 0x2b, 0x51, 0xee, 0x7c, 0xb2, 0xaa, 0xf4, 0x2e, 0x8b, 0x99, 0x9f, 0x99, 0x62, 0x46, 0x53,
+	0x3a, 0x97, 0xc4, 0x54, 0xc1, 0x5f, 0x82, 0x45, 0x17, 0x41, 0x24, 0x3c, 0x5f, 0xf0, 0xd3, 0x28,
+	0xd4, 0x22, 0x96, 0x3b, 0xcd, 0x15, 0xaa, 0x76, 0x33, 0x58, 0x4f, 0xa3, 0x48, 0x99, 0xbe, 0xde,
+	0xd8, 0x23, 0xa8, 0x5e, 0xa5, 0x8e, 0xb7, 0x60, 0x2d, 0x2b, 0x61, 0x1c, 0xf6, 0xfc, 0x0e, 0xd1,
+	0xbb, 0x2c, 0x9a, 0xe9, 0x6e, 0xae, 0x34, 0x8b, 0x66, 0xbb, 0x83, 0x2a, 0x58, 0xba, 0x51, 0x4f,
+	0x8a, 0x45, 0xea, 0x33, 0xfb, 0x17, 0x04, 0x5b, 0xff, 0xd4, 0xc0, 0x4a, 0xfe, 0xfd, 0xdf, 0x6c,
+	0x63, 0xff, 0x5c, 0x80, 0xf2, 0x92, 0x22, 0xf8, 0x05, 0x54, 0x8d, 0xae, 0x8c, 0xfb, 0x22, 0x88,
+	0x78, 0xa8, 0xe9, 0x55, 0x3b, 0x1f, 0xac, 0xaa, 0xac, 0x93, 0xe3, 0x48, 0x85, 0x2e, 0x6f, 0xb3,
+	0xb6, 0x65, 0xc2, 0xe8, 0xd7, 0x11, 0x0f, 0xb5, 0x33, 0x75, 0x6b, 0x88, 0x58, 0x17, 0xc1, 0xcc,
+	0x8e, 0x78, 0x0b, 0x4a, 0x49, 0xa4, 0xfc, 0x33, 0xdd, 0x1c, 0x22, 0x66, 0x83, 0xdf, 0x83, 0xea,
+	0xb9, 0x88, 0x17, 0x73, 0xe6, 0x85, 0x34, 0xe2, 0x5e, 0x70, 0xa2, 0xfd, 0x8c, 0x88, 0x65, 0xa2,
+	0x03, 0x1a, 0xf1, 0xfe, 0x09, 0xde, 0x83, 0xcd, 0x9b, 0xc6, 0x2f, 0x69, 0xe3, 0x6f, 0xc8, 0xab,
+	0x8e, 0xc7, 0xef, 0x03, 0x66, 0xa7, 0xa7, 0xcc, 0x57, 0xd2, 0x4b, 0x52, 0x71, 0x1a, 0xc5, 0xcc,
+	0x8b, 0x82, 0xfa, 0xba, 0xfe, 0x81, 0x6b, 0x79, 0x66, 0x66, 0x12, 0xc3, 0xc0, 0xfe, 0x1c, 0xea,
+	0x37, 0x7f, 0x8f, 0x7c, 0xa4, 0xec, 0x42, 0xe5, 0xd2, 0x87, 0x8a, 0x71, 0xe3, 0x15, 0x8b, 0x58,
+	0x17, 0xc6, 0xca, 0x62, 0x7b, 0x2f, 0x60, 0xe3, 0xda, 0x1d, 0xe0, 0x47, 0xf0, 0xd0, 0x75, 0xc7,
+	0x23, 0xef, 0x78, 0x3a, 0xec, 0x39, 0xde, 0xc0, 0x99, 0xf4, 0x1d, 0xe2, 0x1d, 0x4d, 0xdc, 0x99,
+	0xd3, 0x1b, 0x3e, 0x1b, 0x3a, 0xfd, 0xda, 0x1d, 0x7c, 0x0f, 0xd6, 0xc6, 0xdd, 0x91, 0x53, 0x43,
+	0x18, 0x60, 0xfd, 0x99, 0xa3, 0xd7, 0x05, 0x5c, 0x86, 0xbb, 0x13, 0xe7, 0xe8, 0x90, 0x74, 0x47,
+	0xb5, 0xe2, 0xde, 0x21, 0x54, 0xae, 0x88, 0x8e, 0xdf, 0x85, 0xed, 0xee, 0x51, 0x7f, 0x38, 0xf5,
+	0x9c, 0x49, 0x6f, 0xda, 0x1f, 0x4e, 0x06, 0xd7, 0x6a, 0x5a, 0x70, 0x6f, 0x34, 0x9c, 0x38, 0x5d,
+	0xd2, 0xfe, 0xb8, 0x86, 0xf0, 0x5d, 0x28, 0x8e, 0x67, 0x4f, 0x6a, 0x85, 0x2c, 0x3c, 0x1d, 0x0c,
+	0xbc, 0xe9, 0xec, 0xc8, 0xad, 0x15, 0x3b, 0x7f, 0x14, 0xc0, 0x3a, 0x64, 0x2f, 0xd5, 0xa1, 0x30,
+	0xcd, 0xe2, 0x1f, 0x11, 0xc0, 0xeb, 0x71, 0x8a, 0x3f, 0x5c, 0xc1, 0x0b, 0x37, 0xe6, 0xf6, 0xf6,
+	0x47, 0xb7, 0x44, 0x19, 0x81, 0xed, 0x07, 0xdf, 0xfd, 0xfe, 0xe7, 0x4f, 0x85, 0x4d, 0xbc, 0x71,
+	0xf9, 0xcc, 0x98, 0x51, 0x8c, 0x7f, 0x45, 0x50, 0xbb, 0x7e, 0x2d, 0x78, 0xff, 0x16, 0xf3, 0xe9,
+	0xda, 0xa8, 0xdb, 0x7e, 0xfa, 0x9f, 0xb0, 0x39, 0xcd, 0x5d, 0x4d, 0xf3, 0xa1, 0x5d, 0xbf, 0xa4,
+	0x99, 0xe1, 0xf7, 0xe5, 0xe5, 0xf7, 0xfb, 0x68, 0xef, 0xe0, 0x07, 0x04, 0x8f, 0x7d, 0x31, 0x7f,
+	0xf3, 0x39, 0x07, 0x9b, 0xcb, 0xfa, 0xcf, 0xb2, 0xc7, 0x70, 0x86, 0xbe, 0x1a, 0xe7, 0xb8, 0x50,
+	0x64, 0xb3, 0xa2, 0x29, 0xd2, 0xb0, 0x15, 0x32, 0xae, 0x9f, 0xca, 0x96, 0x49, 0xd1, 0x24, 0x92,
+	0xff, 0xf2, 0x42, 0x3f, 0x5d, 0x0e, 0xfe, 0x85, 0xd0, 0xc9, 0xba, 0x06, 0x3f, 0xf9, 0x3b, 0x00,
+	0x00, 0xff, 0xff, 0x26, 0x28, 0xff, 0x42, 0xdd, 0x07, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
index 75b0f760..d5dec255 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1/video_intelligence.pb.go
@@ -1,45 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1/video_intelligence.proto
 
-/*
-Package videointelligence is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/videointelligence/v1/video_intelligence.proto
-
-It has these top-level messages:
-	AnnotateVideoRequest
-	VideoContext
-	LabelDetectionConfig
-	ShotChangeDetectionConfig
-	ExplicitContentDetectionConfig
-	FaceDetectionConfig
-	VideoSegment
-	LabelSegment
-	LabelFrame
-	Entity
-	LabelAnnotation
-	ExplicitContentFrame
-	ExplicitContentAnnotation
-	NormalizedBoundingBox
-	FaceSegment
-	FaceFrame
-	FaceAnnotation
-	VideoAnnotationResults
-	AnnotateVideoResponse
-	VideoAnnotationProgress
-	AnnotateVideoProgress
-*/
-package videointelligence
+package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -91,7 +62,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
-func (Feature) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (Feature) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{0}
+}
 
 // Label detection mode.
 type LabelDetectionMode int32
@@ -123,7 +96,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
-func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{1}
+}
 
 // Bucketized representation of likelihood.
 type Likelihood int32
@@ -163,7 +138,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
-func (Likelihood) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{2}
+}
 
 // Video annotation request.
 type AnnotateVideoRequest struct {
@@ -177,32 +154,54 @@ type AnnotateVideoRequest struct {
 	// multiple videos. Supported wildcards: '*' to match 0 or more characters;
 	// '?' to match 1 character. If unset, the input video should be embedded
 	// in the request as `input_content`. If set, `input_content` should be unset.
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// The video data bytes.
 	// If unset, the input video(s) should be specified via `input_uri`.
 	// If set, `input_uri` should be unset.
 	InputContent []byte `protobuf:"bytes,6,opt,name=input_content,json=inputContent,proto3" json:"input_content,omitempty"`
 	// Requested video annotation features.
-	Features []Feature `protobuf:"varint,2,rep,packed,name=features,enum=google.cloud.videointelligence.v1.Feature" json:"features,omitempty"`
+	Features []Feature `protobuf:"varint,2,rep,packed,name=features,proto3,enum=google.cloud.videointelligence.v1.Feature" json:"features,omitempty"`
 	// Additional video context and/or feature-specific parameters.
-	VideoContext *VideoContext `protobuf:"bytes,3,opt,name=video_context,json=videoContext" json:"video_context,omitempty"`
+	VideoContext *VideoContext `protobuf:"bytes,3,opt,name=video_context,json=videoContext,proto3" json:"video_context,omitempty"`
 	// Optional location where the output (in JSON format) should be stored.
 	// Currently, only [Google Cloud Storage](https://cloud.google.com/storage/)
 	// URIs are supported, which must be specified in the following format:
 	// `gs://bucket-id/object-id` (other URI formats return
 	// [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
 	// [Request URIs](/storage/docs/reference-uris).
-	OutputUri string `protobuf:"bytes,4,opt,name=output_uri,json=outputUri" json:"output_uri,omitempty"`
+	OutputUri string `protobuf:"bytes,4,opt,name=output_uri,json=outputUri,proto3" json:"output_uri,omitempty"`
 	// Optional cloud region where annotation should take place. Supported cloud
 	// regions: `us-east1`, `us-west1`, `europe-west1`, `asia-east1`. If no region
 	// is specified, a region will be determined based on video file location.
-	LocationId string `protobuf:"bytes,5,opt,name=location_id,json=locationId" json:"location_id,omitempty"`
+	LocationId           string   `protobuf:"bytes,5,opt,name=location_id,json=locationId,proto3" json:"location_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
+func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoRequest) ProtoMessage()    {}
+func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{0}
+}
+func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
+}
+func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+}
+func (m *AnnotateVideoRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
+}
+func (m *AnnotateVideoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoRequest.DiscardUnknown(m)
 }
 
-func (m *AnnotateVideoRequest) Reset()                    { *m = AnnotateVideoRequest{} }
-func (m *AnnotateVideoRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoRequest) ProtoMessage()               {}
-func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_AnnotateVideoRequest proto.InternalMessageInfo
 
 func (m *AnnotateVideoRequest) GetInputUri() string {
 	if m != nil {
@@ -251,21 +250,43 @@ type VideoContext struct {
 	// Video segments to annotate. The segments may overlap and are not required
 	// to be contiguous or span the whole video. If unspecified, each video
 	// is treated as a single segment.
-	Segments []*VideoSegment `protobuf:"bytes,1,rep,name=segments" json:"segments,omitempty"`
+	Segments []*VideoSegment `protobuf:"bytes,1,rep,name=segments,proto3" json:"segments,omitempty"`
 	// Config for LABEL_DETECTION.
-	LabelDetectionConfig *LabelDetectionConfig `protobuf:"bytes,2,opt,name=label_detection_config,json=labelDetectionConfig" json:"label_detection_config,omitempty"`
+	LabelDetectionConfig *LabelDetectionConfig `protobuf:"bytes,2,opt,name=label_detection_config,json=labelDetectionConfig,proto3" json:"label_detection_config,omitempty"`
 	// Config for SHOT_CHANGE_DETECTION.
-	ShotChangeDetectionConfig *ShotChangeDetectionConfig `protobuf:"bytes,3,opt,name=shot_change_detection_config,json=shotChangeDetectionConfig" json:"shot_change_detection_config,omitempty"`
+	ShotChangeDetectionConfig *ShotChangeDetectionConfig `protobuf:"bytes,3,opt,name=shot_change_detection_config,json=shotChangeDetectionConfig,proto3" json:"shot_change_detection_config,omitempty"`
 	// Config for EXPLICIT_CONTENT_DETECTION.
-	ExplicitContentDetectionConfig *ExplicitContentDetectionConfig `protobuf:"bytes,4,opt,name=explicit_content_detection_config,json=explicitContentDetectionConfig" json:"explicit_content_detection_config,omitempty"`
+	ExplicitContentDetectionConfig *ExplicitContentDetectionConfig `protobuf:"bytes,4,opt,name=explicit_content_detection_config,json=explicitContentDetectionConfig,proto3" json:"explicit_content_detection_config,omitempty"`
 	// Config for FACE_DETECTION.
-	FaceDetectionConfig *FaceDetectionConfig `protobuf:"bytes,5,opt,name=face_detection_config,json=faceDetectionConfig" json:"face_detection_config,omitempty"`
+	FaceDetectionConfig  *FaceDetectionConfig `protobuf:"bytes,5,opt,name=face_detection_config,json=faceDetectionConfig,proto3" json:"face_detection_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *VideoContext) Reset()                    { *m = VideoContext{} }
-func (m *VideoContext) String() string            { return proto.CompactTextString(m) }
-func (*VideoContext) ProtoMessage()               {}
-func (*VideoContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *VideoContext) Reset()         { *m = VideoContext{} }
+func (m *VideoContext) String() string { return proto.CompactTextString(m) }
+func (*VideoContext) ProtoMessage()    {}
+func (*VideoContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{1}
+}
+func (m *VideoContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
+}
+func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
+}
+func (dst *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(dst, src)
+}
+func (m *VideoContext) XXX_Size() int {
+	return xxx_messageInfo_VideoContext.Size(m)
+}
+func (m *VideoContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoContext proto.InternalMessageInfo
 
 func (m *VideoContext) GetSegments() []*VideoSegment {
 	if m != nil {
@@ -307,21 +328,43 @@ type LabelDetectionConfig struct {
 	// What labels should be detected with LABEL_DETECTION, in addition to
 	// video-level labels or segment-level labels.
 	// If unspecified, defaults to `SHOT_MODE`.
-	LabelDetectionMode LabelDetectionMode `protobuf:"varint,1,opt,name=label_detection_mode,json=labelDetectionMode,enum=google.cloud.videointelligence.v1.LabelDetectionMode" json:"label_detection_mode,omitempty"`
+	LabelDetectionMode LabelDetectionMode `protobuf:"varint,1,opt,name=label_detection_mode,json=labelDetectionMode,proto3,enum=google.cloud.videointelligence.v1.LabelDetectionMode" json:"label_detection_mode,omitempty"`
 	// Whether the video has been shot from a stationary (i.e. non-moving) camera.
 	// When set to true, might improve detection accuracy for moving objects.
 	// Should be used with `SHOT_AND_FRAME_MODE` enabled.
-	StationaryCamera bool `protobuf:"varint,2,opt,name=stationary_camera,json=stationaryCamera" json:"stationary_camera,omitempty"`
+	StationaryCamera bool `protobuf:"varint,2,opt,name=stationary_camera,json=stationaryCamera,proto3" json:"stationary_camera,omitempty"`
 	// Model to use for label detection.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,3,opt,name=model" json:"model,omitempty"`
+	Model                string   `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelDetectionConfig) Reset()         { *m = LabelDetectionConfig{} }
+func (m *LabelDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*LabelDetectionConfig) ProtoMessage()    {}
+func (*LabelDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{2}
+}
+func (m *LabelDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelDetectionConfig.Unmarshal(m, b)
+}
+func (m *LabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *LabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDetectionConfig.Merge(dst, src)
+}
+func (m *LabelDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_LabelDetectionConfig.Size(m)
+}
+func (m *LabelDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelDetectionConfig.DiscardUnknown(m)
 }
 
-func (m *LabelDetectionConfig) Reset()                    { *m = LabelDetectionConfig{} }
-func (m *LabelDetectionConfig) String() string            { return proto.CompactTextString(m) }
-func (*LabelDetectionConfig) ProtoMessage()               {}
-func (*LabelDetectionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_LabelDetectionConfig proto.InternalMessageInfo
 
 func (m *LabelDetectionConfig) GetLabelDetectionMode() LabelDetectionMode {
 	if m != nil {
@@ -349,13 +392,35 @@ type ShotChangeDetectionConfig struct {
 	// Model to use for shot change detection.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,1,opt,name=model" json:"model,omitempty"`
+	Model                string   `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ShotChangeDetectionConfig) Reset()                    { *m = ShotChangeDetectionConfig{} }
-func (m *ShotChangeDetectionConfig) String() string            { return proto.CompactTextString(m) }
-func (*ShotChangeDetectionConfig) ProtoMessage()               {}
-func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ShotChangeDetectionConfig) Reset()         { *m = ShotChangeDetectionConfig{} }
+func (m *ShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*ShotChangeDetectionConfig) ProtoMessage()    {}
+func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{3}
+}
+func (m *ShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Unmarshal(m, b)
+}
+func (m *ShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShotChangeDetectionConfig.Merge(dst, src)
+}
+func (m *ShotChangeDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Size(m)
+}
+func (m *ShotChangeDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ShotChangeDetectionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ShotChangeDetectionConfig proto.InternalMessageInfo
 
 func (m *ShotChangeDetectionConfig) GetModel() string {
 	if m != nil {
@@ -369,13 +434,35 @@ type ExplicitContentDetectionConfig struct {
 	// Model to use for explicit content detection.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,1,opt,name=model" json:"model,omitempty"`
+	Model                string   `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExplicitContentDetectionConfig) Reset()         { *m = ExplicitContentDetectionConfig{} }
+func (m *ExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentDetectionConfig) ProtoMessage()    {}
+func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{4}
+}
+func (m *ExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Unmarshal(m, b)
+}
+func (m *ExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(dst, src)
+}
+func (m *ExplicitContentDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Size(m)
+}
+func (m *ExplicitContentDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentDetectionConfig.DiscardUnknown(m)
 }
 
-func (m *ExplicitContentDetectionConfig) Reset()                    { *m = ExplicitContentDetectionConfig{} }
-func (m *ExplicitContentDetectionConfig) String() string            { return proto.CompactTextString(m) }
-func (*ExplicitContentDetectionConfig) ProtoMessage()               {}
-func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ExplicitContentDetectionConfig proto.InternalMessageInfo
 
 func (m *ExplicitContentDetectionConfig) GetModel() string {
 	if m != nil {
@@ -389,15 +476,37 @@ type FaceDetectionConfig struct {
 	// Model to use for face detection.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,1,opt,name=model" json:"model,omitempty"`
+	Model string `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
 	// Whether bounding boxes be included in the face annotation output.
-	IncludeBoundingBoxes bool `protobuf:"varint,2,opt,name=include_bounding_boxes,json=includeBoundingBoxes" json:"include_bounding_boxes,omitempty"`
+	IncludeBoundingBoxes bool     `protobuf:"varint,2,opt,name=include_bounding_boxes,json=includeBoundingBoxes,proto3" json:"include_bounding_boxes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FaceDetectionConfig) Reset()                    { *m = FaceDetectionConfig{} }
-func (m *FaceDetectionConfig) String() string            { return proto.CompactTextString(m) }
-func (*FaceDetectionConfig) ProtoMessage()               {}
-func (*FaceDetectionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *FaceDetectionConfig) Reset()         { *m = FaceDetectionConfig{} }
+func (m *FaceDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*FaceDetectionConfig) ProtoMessage()    {}
+func (*FaceDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{5}
+}
+func (m *FaceDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceDetectionConfig.Unmarshal(m, b)
+}
+func (m *FaceDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *FaceDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceDetectionConfig.Merge(dst, src)
+}
+func (m *FaceDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_FaceDetectionConfig.Size(m)
+}
+func (m *FaceDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceDetectionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceDetectionConfig proto.InternalMessageInfo
 
 func (m *FaceDetectionConfig) GetModel() string {
 	if m != nil {
@@ -417,25 +526,47 @@ func (m *FaceDetectionConfig) GetIncludeBoundingBoxes() bool {
 type VideoSegment struct {
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the start of the segment (inclusive).
-	StartTimeOffset *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset" json:"start_time_offset,omitempty"`
+	StartTimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the end of the segment (inclusive).
-	EndTimeOffset *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=end_time_offset,json=endTimeOffset" json:"end_time_offset,omitempty"`
+	EndTimeOffset        *duration.Duration `protobuf:"bytes,2,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *VideoSegment) Reset()                    { *m = VideoSegment{} }
-func (m *VideoSegment) String() string            { return proto.CompactTextString(m) }
-func (*VideoSegment) ProtoMessage()               {}
-func (*VideoSegment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
+func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
+func (*VideoSegment) ProtoMessage()    {}
+func (*VideoSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{6}
+}
+func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
+}
+func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
+}
+func (dst *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(dst, src)
+}
+func (m *VideoSegment) XXX_Size() int {
+	return xxx_messageInfo_VideoSegment.Size(m)
+}
+func (m *VideoSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoSegment.DiscardUnknown(m)
+}
 
-func (m *VideoSegment) GetStartTimeOffset() *google_protobuf3.Duration {
+var xxx_messageInfo_VideoSegment proto.InternalMessageInfo
+
+func (m *VideoSegment) GetStartTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.StartTimeOffset
 	}
 	return nil
 }
 
-func (m *VideoSegment) GetEndTimeOffset() *google_protobuf3.Duration {
+func (m *VideoSegment) GetEndTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.EndTimeOffset
 	}
@@ -445,15 +576,37 @@ func (m *VideoSegment) GetEndTimeOffset() *google_protobuf3.Duration {
 // Video segment level annotation results for label detection.
 type LabelSegment struct {
 	// Video segment where a label was detected.
-	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment" json:"segment,omitempty"`
+	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment,proto3" json:"segment,omitempty"`
 	// Confidence that the label is accurate. Range: [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelSegment) Reset()         { *m = LabelSegment{} }
+func (m *LabelSegment) String() string { return proto.CompactTextString(m) }
+func (*LabelSegment) ProtoMessage()    {}
+func (*LabelSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{7}
+}
+func (m *LabelSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelSegment.Unmarshal(m, b)
+}
+func (m *LabelSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelSegment.Marshal(b, m, deterministic)
+}
+func (dst *LabelSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelSegment.Merge(dst, src)
+}
+func (m *LabelSegment) XXX_Size() int {
+	return xxx_messageInfo_LabelSegment.Size(m)
+}
+func (m *LabelSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelSegment.DiscardUnknown(m)
 }
 
-func (m *LabelSegment) Reset()                    { *m = LabelSegment{} }
-func (m *LabelSegment) String() string            { return proto.CompactTextString(m) }
-func (*LabelSegment) ProtoMessage()               {}
-func (*LabelSegment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_LabelSegment proto.InternalMessageInfo
 
 func (m *LabelSegment) GetSegment() *VideoSegment {
 	if m != nil {
@@ -473,17 +626,39 @@ func (m *LabelSegment) GetConfidence() float32 {
 type LabelFrame struct {
 	// Time-offset, relative to the beginning of the video, corresponding to the
 	// video frame for this location.
-	TimeOffset *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset" json:"time_offset,omitempty"`
+	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 	// Confidence that the label is accurate. Range: [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelFrame) Reset()         { *m = LabelFrame{} }
+func (m *LabelFrame) String() string { return proto.CompactTextString(m) }
+func (*LabelFrame) ProtoMessage()    {}
+func (*LabelFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{8}
+}
+func (m *LabelFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelFrame.Unmarshal(m, b)
+}
+func (m *LabelFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelFrame.Marshal(b, m, deterministic)
+}
+func (dst *LabelFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelFrame.Merge(dst, src)
+}
+func (m *LabelFrame) XXX_Size() int {
+	return xxx_messageInfo_LabelFrame.Size(m)
+}
+func (m *LabelFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelFrame.DiscardUnknown(m)
 }
 
-func (m *LabelFrame) Reset()                    { *m = LabelFrame{} }
-func (m *LabelFrame) String() string            { return proto.CompactTextString(m) }
-func (*LabelFrame) ProtoMessage()               {}
-func (*LabelFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_LabelFrame proto.InternalMessageInfo
 
-func (m *LabelFrame) GetTimeOffset() *google_protobuf3.Duration {
+func (m *LabelFrame) GetTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.TimeOffset
 	}
@@ -502,17 +677,39 @@ type Entity struct {
 	// Opaque entity ID. Some IDs may be available in
 	// [Google Knowledge Graph Search
 	// API](https://developers.google.com/knowledge-graph/).
-	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"`
+	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
 	// Textual description, e.g. `Fixed-gear bicycle`.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Language code for `description` in BCP-47 format.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Entity) Reset()                    { *m = Entity{} }
-func (m *Entity) String() string            { return proto.CompactTextString(m) }
-func (*Entity) ProtoMessage()               {}
-func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *Entity) Reset()         { *m = Entity{} }
+func (m *Entity) String() string { return proto.CompactTextString(m) }
+func (*Entity) ProtoMessage()    {}
+func (*Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{9}
+}
+func (m *Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Entity.Unmarshal(m, b)
+}
+func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
+}
+func (dst *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(dst, src)
+}
+func (m *Entity) XXX_Size() int {
+	return xxx_messageInfo_Entity.Size(m)
+}
+func (m *Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Entity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Entity proto.InternalMessageInfo
 
 func (m *Entity) GetEntityId() string {
 	if m != nil {
@@ -538,22 +735,44 @@ func (m *Entity) GetLanguageCode() string {
 // Label annotation.
 type LabelAnnotation struct {
 	// Detected entity.
-	Entity *Entity `protobuf:"bytes,1,opt,name=entity" json:"entity,omitempty"`
+	Entity *Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"`
 	// Common categories for the detected entity.
 	// E.g. when the label is `Terrier` the category is likely `dog`. And in some
 	// cases there might be more than one categories e.g. `Terrier` could also be
 	// a `pet`.
-	CategoryEntities []*Entity `protobuf:"bytes,2,rep,name=category_entities,json=categoryEntities" json:"category_entities,omitempty"`
+	CategoryEntities []*Entity `protobuf:"bytes,2,rep,name=category_entities,json=categoryEntities,proto3" json:"category_entities,omitempty"`
 	// All video segments where a label was detected.
-	Segments []*LabelSegment `protobuf:"bytes,3,rep,name=segments" json:"segments,omitempty"`
+	Segments []*LabelSegment `protobuf:"bytes,3,rep,name=segments,proto3" json:"segments,omitempty"`
 	// All video frames where a label was detected.
-	Frames []*LabelFrame `protobuf:"bytes,4,rep,name=frames" json:"frames,omitempty"`
+	Frames               []*LabelFrame `protobuf:"bytes,4,rep,name=frames,proto3" json:"frames,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
+func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
+func (*LabelAnnotation) ProtoMessage()    {}
+func (*LabelAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{10}
+}
+func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
+}
+func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+}
+func (m *LabelAnnotation) XXX_Size() int {
+	return xxx_messageInfo_LabelAnnotation.Size(m)
+}
+func (m *LabelAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelAnnotation.DiscardUnknown(m)
 }
 
-func (m *LabelAnnotation) Reset()                    { *m = LabelAnnotation{} }
-func (m *LabelAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*LabelAnnotation) ProtoMessage()               {}
-func (*LabelAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_LabelAnnotation proto.InternalMessageInfo
 
 func (m *LabelAnnotation) GetEntity() *Entity {
 	if m != nil {
@@ -587,17 +806,39 @@ func (m *LabelAnnotation) GetFrames() []*LabelFrame {
 type ExplicitContentFrame struct {
 	// Time-offset, relative to the beginning of the video, corresponding to the
 	// video frame for this location.
-	TimeOffset *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset" json:"time_offset,omitempty"`
+	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 	// Likelihood of the pornography content..
-	PornographyLikelihood Likelihood `protobuf:"varint,2,opt,name=pornography_likelihood,json=pornographyLikelihood,enum=google.cloud.videointelligence.v1.Likelihood" json:"pornography_likelihood,omitempty"`
+	PornographyLikelihood Likelihood `protobuf:"varint,2,opt,name=pornography_likelihood,json=pornographyLikelihood,proto3,enum=google.cloud.videointelligence.v1.Likelihood" json:"pornography_likelihood,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}   `json:"-"`
+	XXX_unrecognized      []byte     `json:"-"`
+	XXX_sizecache         int32      `json:"-"`
 }
 
-func (m *ExplicitContentFrame) Reset()                    { *m = ExplicitContentFrame{} }
-func (m *ExplicitContentFrame) String() string            { return proto.CompactTextString(m) }
-func (*ExplicitContentFrame) ProtoMessage()               {}
-func (*ExplicitContentFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *ExplicitContentFrame) Reset()         { *m = ExplicitContentFrame{} }
+func (m *ExplicitContentFrame) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentFrame) ProtoMessage()    {}
+func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{11}
+}
+func (m *ExplicitContentFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentFrame.Unmarshal(m, b)
+}
+func (m *ExplicitContentFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentFrame.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentFrame.Merge(dst, src)
+}
+func (m *ExplicitContentFrame) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentFrame.Size(m)
+}
+func (m *ExplicitContentFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentFrame.DiscardUnknown(m)
+}
 
-func (m *ExplicitContentFrame) GetTimeOffset() *google_protobuf3.Duration {
+var xxx_messageInfo_ExplicitContentFrame proto.InternalMessageInfo
+
+func (m *ExplicitContentFrame) GetTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.TimeOffset
 	}
@@ -616,13 +857,35 @@ func (m *ExplicitContentFrame) GetPornographyLikelihood() Likelihood {
 // present for that frame.
 type ExplicitContentAnnotation struct {
 	// All video frames where explicit content was detected.
-	Frames []*ExplicitContentFrame `protobuf:"bytes,1,rep,name=frames" json:"frames,omitempty"`
+	Frames               []*ExplicitContentFrame `protobuf:"bytes,1,rep,name=frames,proto3" json:"frames,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
 }
 
-func (m *ExplicitContentAnnotation) Reset()                    { *m = ExplicitContentAnnotation{} }
-func (m *ExplicitContentAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*ExplicitContentAnnotation) ProtoMessage()               {}
-func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *ExplicitContentAnnotation) Reset()         { *m = ExplicitContentAnnotation{} }
+func (m *ExplicitContentAnnotation) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentAnnotation) ProtoMessage()    {}
+func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{12}
+}
+func (m *ExplicitContentAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentAnnotation.Unmarshal(m, b)
+}
+func (m *ExplicitContentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentAnnotation.Merge(dst, src)
+}
+func (m *ExplicitContentAnnotation) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentAnnotation.Size(m)
+}
+func (m *ExplicitContentAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExplicitContentAnnotation proto.InternalMessageInfo
 
 func (m *ExplicitContentAnnotation) GetFrames() []*ExplicitContentFrame {
 	if m != nil {
@@ -636,19 +899,41 @@ func (m *ExplicitContentAnnotation) GetFrames() []*ExplicitContentFrame {
 // Range: [0, 1].
 type NormalizedBoundingBox struct {
 	// Left X coordinate.
-	Left float32 `protobuf:"fixed32,1,opt,name=left" json:"left,omitempty"`
+	Left float32 `protobuf:"fixed32,1,opt,name=left,proto3" json:"left,omitempty"`
 	// Top Y coordinate.
-	Top float32 `protobuf:"fixed32,2,opt,name=top" json:"top,omitempty"`
+	Top float32 `protobuf:"fixed32,2,opt,name=top,proto3" json:"top,omitempty"`
 	// Right X coordinate.
-	Right float32 `protobuf:"fixed32,3,opt,name=right" json:"right,omitempty"`
+	Right float32 `protobuf:"fixed32,3,opt,name=right,proto3" json:"right,omitempty"`
 	// Bottom Y coordinate.
-	Bottom float32 `protobuf:"fixed32,4,opt,name=bottom" json:"bottom,omitempty"`
+	Bottom               float32  `protobuf:"fixed32,4,opt,name=bottom,proto3" json:"bottom,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NormalizedBoundingBox) Reset()         { *m = NormalizedBoundingBox{} }
+func (m *NormalizedBoundingBox) String() string { return proto.CompactTextString(m) }
+func (*NormalizedBoundingBox) ProtoMessage()    {}
+func (*NormalizedBoundingBox) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{13}
+}
+func (m *NormalizedBoundingBox) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormalizedBoundingBox.Unmarshal(m, b)
+}
+func (m *NormalizedBoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormalizedBoundingBox.Marshal(b, m, deterministic)
+}
+func (dst *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingBox.Merge(dst, src)
+}
+func (m *NormalizedBoundingBox) XXX_Size() int {
+	return xxx_messageInfo_NormalizedBoundingBox.Size(m)
+}
+func (m *NormalizedBoundingBox) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormalizedBoundingBox.DiscardUnknown(m)
 }
 
-func (m *NormalizedBoundingBox) Reset()                    { *m = NormalizedBoundingBox{} }
-func (m *NormalizedBoundingBox) String() string            { return proto.CompactTextString(m) }
-func (*NormalizedBoundingBox) ProtoMessage()               {}
-func (*NormalizedBoundingBox) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_NormalizedBoundingBox proto.InternalMessageInfo
 
 func (m *NormalizedBoundingBox) GetLeft() float32 {
 	if m != nil {
@@ -681,13 +966,35 @@ func (m *NormalizedBoundingBox) GetBottom() float32 {
 // Video segment level annotation results for face detection.
 type FaceSegment struct {
 	// Video segment where a face was detected.
-	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment" json:"segment,omitempty"`
+	Segment              *VideoSegment `protobuf:"bytes,1,opt,name=segment,proto3" json:"segment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *FaceSegment) Reset()                    { *m = FaceSegment{} }
-func (m *FaceSegment) String() string            { return proto.CompactTextString(m) }
-func (*FaceSegment) ProtoMessage()               {}
-func (*FaceSegment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *FaceSegment) Reset()         { *m = FaceSegment{} }
+func (m *FaceSegment) String() string { return proto.CompactTextString(m) }
+func (*FaceSegment) ProtoMessage()    {}
+func (*FaceSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{14}
+}
+func (m *FaceSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceSegment.Unmarshal(m, b)
+}
+func (m *FaceSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceSegment.Marshal(b, m, deterministic)
+}
+func (dst *FaceSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceSegment.Merge(dst, src)
+}
+func (m *FaceSegment) XXX_Size() int {
+	return xxx_messageInfo_FaceSegment.Size(m)
+}
+func (m *FaceSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceSegment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceSegment proto.InternalMessageInfo
 
 func (m *FaceSegment) GetSegment() *VideoSegment {
 	if m != nil {
@@ -701,16 +1008,38 @@ type FaceFrame struct {
 	// Normalized Bounding boxes in a frame.
 	// There can be more than one boxes if the same face is detected in multiple
 	// locations within the current frame.
-	NormalizedBoundingBoxes []*NormalizedBoundingBox `protobuf:"bytes,1,rep,name=normalized_bounding_boxes,json=normalizedBoundingBoxes" json:"normalized_bounding_boxes,omitempty"`
+	NormalizedBoundingBoxes []*NormalizedBoundingBox `protobuf:"bytes,1,rep,name=normalized_bounding_boxes,json=normalizedBoundingBoxes,proto3" json:"normalized_bounding_boxes,omitempty"`
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the video frame for this location.
-	TimeOffset *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset" json:"time_offset,omitempty"`
+	TimeOffset           *duration.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *FaceFrame) Reset()         { *m = FaceFrame{} }
+func (m *FaceFrame) String() string { return proto.CompactTextString(m) }
+func (*FaceFrame) ProtoMessage()    {}
+func (*FaceFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{15}
+}
+func (m *FaceFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceFrame.Unmarshal(m, b)
+}
+func (m *FaceFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceFrame.Marshal(b, m, deterministic)
+}
+func (dst *FaceFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceFrame.Merge(dst, src)
+}
+func (m *FaceFrame) XXX_Size() int {
+	return xxx_messageInfo_FaceFrame.Size(m)
+}
+func (m *FaceFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceFrame.DiscardUnknown(m)
 }
 
-func (m *FaceFrame) Reset()                    { *m = FaceFrame{} }
-func (m *FaceFrame) String() string            { return proto.CompactTextString(m) }
-func (*FaceFrame) ProtoMessage()               {}
-func (*FaceFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_FaceFrame proto.InternalMessageInfo
 
 func (m *FaceFrame) GetNormalizedBoundingBoxes() []*NormalizedBoundingBox {
 	if m != nil {
@@ -719,7 +1048,7 @@ func (m *FaceFrame) GetNormalizedBoundingBoxes() []*NormalizedBoundingBox {
 	return nil
 }
 
-func (m *FaceFrame) GetTimeOffset() *google_protobuf3.Duration {
+func (m *FaceFrame) GetTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.TimeOffset
 	}
@@ -731,15 +1060,37 @@ type FaceAnnotation struct {
 	// Thumbnail of a representative face view (in JPEG format).
 	Thumbnail []byte `protobuf:"bytes,1,opt,name=thumbnail,proto3" json:"thumbnail,omitempty"`
 	// All video segments where a face was detected.
-	Segments []*FaceSegment `protobuf:"bytes,2,rep,name=segments" json:"segments,omitempty"`
+	Segments []*FaceSegment `protobuf:"bytes,2,rep,name=segments,proto3" json:"segments,omitempty"`
 	// All video frames where a face was detected.
-	Frames []*FaceFrame `protobuf:"bytes,3,rep,name=frames" json:"frames,omitempty"`
+	Frames               []*FaceFrame `protobuf:"bytes,3,rep,name=frames,proto3" json:"frames,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
+func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation) ProtoMessage()    {}
+func (*FaceAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{16}
+}
+func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
+}
+func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+}
+func (m *FaceAnnotation) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation.Size(m)
+}
+func (m *FaceAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation.DiscardUnknown(m)
 }
 
-func (m *FaceAnnotation) Reset()                    { *m = FaceAnnotation{} }
-func (m *FaceAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*FaceAnnotation) ProtoMessage()               {}
-func (*FaceAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_FaceAnnotation proto.InternalMessageInfo
 
 func (m *FaceAnnotation) GetThumbnail() []byte {
 	if m != nil {
@@ -766,31 +1117,53 @@ func (m *FaceAnnotation) GetFrames() []*FaceFrame {
 type VideoAnnotationResults struct {
 	// Video file location in
 	// [Google Cloud Storage](https://cloud.google.com/storage/).
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// Label annotations on video level or user specified segment level.
 	// There is exactly one element for each unique label.
-	SegmentLabelAnnotations []*LabelAnnotation `protobuf:"bytes,2,rep,name=segment_label_annotations,json=segmentLabelAnnotations" json:"segment_label_annotations,omitempty"`
+	SegmentLabelAnnotations []*LabelAnnotation `protobuf:"bytes,2,rep,name=segment_label_annotations,json=segmentLabelAnnotations,proto3" json:"segment_label_annotations,omitempty"`
 	// Label annotations on shot level.
 	// There is exactly one element for each unique label.
-	ShotLabelAnnotations []*LabelAnnotation `protobuf:"bytes,3,rep,name=shot_label_annotations,json=shotLabelAnnotations" json:"shot_label_annotations,omitempty"`
+	ShotLabelAnnotations []*LabelAnnotation `protobuf:"bytes,3,rep,name=shot_label_annotations,json=shotLabelAnnotations,proto3" json:"shot_label_annotations,omitempty"`
 	// Label annotations on frame level.
 	// There is exactly one element for each unique label.
-	FrameLabelAnnotations []*LabelAnnotation `protobuf:"bytes,4,rep,name=frame_label_annotations,json=frameLabelAnnotations" json:"frame_label_annotations,omitempty"`
+	FrameLabelAnnotations []*LabelAnnotation `protobuf:"bytes,4,rep,name=frame_label_annotations,json=frameLabelAnnotations,proto3" json:"frame_label_annotations,omitempty"`
 	// Face annotations. There is exactly one element for each unique face.
-	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,5,rep,name=face_annotations,json=faceAnnotations" json:"face_annotations,omitempty"`
+	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,5,rep,name=face_annotations,json=faceAnnotations,proto3" json:"face_annotations,omitempty"`
 	// Shot annotations. Each shot is represented as a video segment.
-	ShotAnnotations []*VideoSegment `protobuf:"bytes,6,rep,name=shot_annotations,json=shotAnnotations" json:"shot_annotations,omitempty"`
+	ShotAnnotations []*VideoSegment `protobuf:"bytes,6,rep,name=shot_annotations,json=shotAnnotations,proto3" json:"shot_annotations,omitempty"`
 	// Explicit content annotation.
-	ExplicitAnnotation *ExplicitContentAnnotation `protobuf:"bytes,7,opt,name=explicit_annotation,json=explicitAnnotation" json:"explicit_annotation,omitempty"`
+	ExplicitAnnotation *ExplicitContentAnnotation `protobuf:"bytes,7,opt,name=explicit_annotation,json=explicitAnnotation,proto3" json:"explicit_annotation,omitempty"`
 	// If set, indicates an error. Note that for a single `AnnotateVideoRequest`
 	// some videos may succeed and some may fail.
-	Error *google_rpc.Status `protobuf:"bytes,9,opt,name=error" json:"error,omitempty"`
+	Error                *status.Status `protobuf:"bytes,9,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *VideoAnnotationResults) Reset()                    { *m = VideoAnnotationResults{} }
-func (m *VideoAnnotationResults) String() string            { return proto.CompactTextString(m) }
-func (*VideoAnnotationResults) ProtoMessage()               {}
-func (*VideoAnnotationResults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{} }
+func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
+func (*VideoAnnotationResults) ProtoMessage()    {}
+func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{17}
+}
+func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
+}
+func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
+}
+func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+}
+func (m *VideoAnnotationResults) XXX_Size() int {
+	return xxx_messageInfo_VideoAnnotationResults.Size(m)
+}
+func (m *VideoAnnotationResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoAnnotationResults.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoAnnotationResults proto.InternalMessageInfo
 
 func (m *VideoAnnotationResults) GetInputUri() string {
 	if m != nil {
@@ -841,7 +1214,7 @@ func (m *VideoAnnotationResults) GetExplicitAnnotation() *ExplicitContentAnnotat
 	return nil
 }
 
-func (m *VideoAnnotationResults) GetError() *google_rpc.Status {
+func (m *VideoAnnotationResults) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
@@ -853,13 +1226,35 @@ func (m *VideoAnnotationResults) GetError() *google_rpc.Status {
 // call of the `google::longrunning::Operations` service.
 type AnnotateVideoResponse struct {
 	// Annotation results for all videos specified in `AnnotateVideoRequest`.
-	AnnotationResults []*VideoAnnotationResults `protobuf:"bytes,1,rep,name=annotation_results,json=annotationResults" json:"annotation_results,omitempty"`
+	AnnotationResults    []*VideoAnnotationResults `protobuf:"bytes,1,rep,name=annotation_results,json=annotationResults,proto3" json:"annotation_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
+func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoResponse) ProtoMessage()    {}
+func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{18}
+}
+func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
+}
+func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+}
+func (m *AnnotateVideoResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
+}
+func (m *AnnotateVideoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoResponse.DiscardUnknown(m)
 }
 
-func (m *AnnotateVideoResponse) Reset()                    { *m = AnnotateVideoResponse{} }
-func (m *AnnotateVideoResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoResponse) ProtoMessage()               {}
-func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_AnnotateVideoResponse proto.InternalMessageInfo
 
 func (m *AnnotateVideoResponse) GetAnnotationResults() []*VideoAnnotationResults {
 	if m != nil {
@@ -872,20 +1267,42 @@ func (m *AnnotateVideoResponse) GetAnnotationResults() []*VideoAnnotationResults
 type VideoAnnotationProgress struct {
 	// Video file location in
 	// [Google Cloud Storage](https://cloud.google.com/storage/).
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// Approximate percentage processed thus far.
 	// Guaranteed to be 100 when fully processed.
-	ProgressPercent int32 `protobuf:"varint,2,opt,name=progress_percent,json=progressPercent" json:"progress_percent,omitempty"`
+	ProgressPercent int32 `protobuf:"varint,2,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 	// Time when the request was received.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time of the most recent update.
-	UpdateTime *google_protobuf4.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress{} }
+func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
+func (*VideoAnnotationProgress) ProtoMessage()    {}
+func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{19}
+}
+func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
+}
+func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
+}
+func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+}
+func (m *VideoAnnotationProgress) XXX_Size() int {
+	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
+}
+func (m *VideoAnnotationProgress) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoAnnotationProgress.DiscardUnknown(m)
 }
 
-func (m *VideoAnnotationProgress) Reset()                    { *m = VideoAnnotationProgress{} }
-func (m *VideoAnnotationProgress) String() string            { return proto.CompactTextString(m) }
-func (*VideoAnnotationProgress) ProtoMessage()               {}
-func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_VideoAnnotationProgress proto.InternalMessageInfo
 
 func (m *VideoAnnotationProgress) GetInputUri() string {
 	if m != nil {
@@ -901,14 +1318,14 @@ func (m *VideoAnnotationProgress) GetProgressPercent() int32 {
 	return 0
 }
 
-func (m *VideoAnnotationProgress) GetStartTime() *google_protobuf4.Timestamp {
+func (m *VideoAnnotationProgress) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *VideoAnnotationProgress) GetUpdateTime() *google_protobuf4.Timestamp {
+func (m *VideoAnnotationProgress) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -920,13 +1337,35 @@ func (m *VideoAnnotationProgress) GetUpdateTime() *google_protobuf4.Timestamp {
 // call of the `google::longrunning::Operations` service.
 type AnnotateVideoProgress struct {
 	// Progress metadata for all videos specified in `AnnotateVideoRequest`.
-	AnnotationProgress []*VideoAnnotationProgress `protobuf:"bytes,1,rep,name=annotation_progress,json=annotationProgress" json:"annotation_progress,omitempty"`
+	AnnotationProgress   []*VideoAnnotationProgress `protobuf:"bytes,1,rep,name=annotation_progress,json=annotationProgress,proto3" json:"annotation_progress,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *AnnotateVideoProgress) Reset()                    { *m = AnnotateVideoProgress{} }
-func (m *AnnotateVideoProgress) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoProgress) ProtoMessage()               {}
-func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
+func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoProgress) ProtoMessage()    {}
+func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_a20810d9dd100185, []int{20}
+}
+func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
+}
+func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+}
+func (m *AnnotateVideoProgress) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
+}
+func (m *AnnotateVideoProgress) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoProgress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateVideoProgress proto.InternalMessageInfo
 
 func (m *AnnotateVideoProgress) GetAnnotationProgress() []*VideoAnnotationProgress {
 	if m != nil {
@@ -970,14 +1409,15 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for VideoIntelligenceService service
-
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VideoIntelligenceServiceClient interface {
 	// Performs asynchronous video annotation. Progress and results can be
 	// retrieved through the `google.longrunning.Operations` interface.
 	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
 	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type videoIntelligenceServiceClient struct {
@@ -988,23 +1428,22 @@ func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceSer
 	return &videoIntelligenceServiceClient{cc}
 }
 
-func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.videointelligence.v1.VideoIntelligenceService/AnnotateVideo", in, out, c.cc, opts...)
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for VideoIntelligenceService service
-
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
 type VideoIntelligenceServiceServer interface {
 	// Performs asynchronous video annotation. Progress and results can be
 	// retrieved through the `google.longrunning.Operations` interface.
 	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
 	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*google_longrunning.Operation, error)
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
 }
 
 func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
@@ -1043,10 +1482,10 @@ var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1/video_intelligence.proto", fileDescriptor0)
+	proto.RegisterFile("google/cloud/videointelligence/v1/video_intelligence.proto", fileDescriptor_video_intelligence_a20810d9dd100185)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_video_intelligence_a20810d9dd100185 = []byte{
 	// 1705 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcd, 0x73, 0xe3, 0x48,
 	0x15, 0x47, 0xb6, 0x93, 0x89, 0x5f, 0xbe, 0x3c, 0x9d, 0x2f, 0x27, 0xcc, 0x64, 0x33, 0x5a, 0xa8,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
index c9f821ff..527c928a 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1/video_intelligence.pb.go
@@ -1,36 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1beta1/video_intelligence.proto
 
-/*
-Package videointelligence is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/videointelligence/v1beta1/video_intelligence.proto
-
-It has these top-level messages:
-	AnnotateVideoRequest
-	VideoContext
-	VideoSegment
-	LabelLocation
-	LabelAnnotation
-	SafeSearchAnnotation
-	BoundingBox
-	FaceLocation
-	FaceAnnotation
-	VideoAnnotationResults
-	AnnotateVideoResponse
-	VideoAnnotationProgress
-	AnnotateVideoProgress
-*/
-package videointelligence
+package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -82,7 +61,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
-func (Feature) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (Feature) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{0}
+}
 
 // Label level (scope).
 type LabelLevel int32
@@ -119,7 +100,9 @@ var LabelLevel_value = map[string]int32{
 func (x LabelLevel) String() string {
 	return proto.EnumName(LabelLevel_name, int32(x))
 }
-func (LabelLevel) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (LabelLevel) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{1}
+}
 
 // Label detection mode.
 type LabelDetectionMode int32
@@ -151,7 +134,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
-func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{2}
+}
 
 // Bucketized representation of likelihood.
 type Likelihood int32
@@ -191,7 +176,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
-func (Likelihood) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{3}
+}
 
 // Video annotation request.
 type AnnotateVideoRequest struct {
@@ -205,31 +192,53 @@ type AnnotateVideoRequest struct {
 	// multiple videos. Supported wildcards: '*' to match 0 or more characters;
 	// '?' to match 1 character. If unset, the input video should be embedded
 	// in the request as `input_content`. If set, `input_content` should be unset.
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// The video data bytes. Encoding: base64. If unset, the input video(s)
 	// should be specified via `input_uri`. If set, `input_uri` should be unset.
-	InputContent string `protobuf:"bytes,6,opt,name=input_content,json=inputContent" json:"input_content,omitempty"`
+	InputContent string `protobuf:"bytes,6,opt,name=input_content,json=inputContent,proto3" json:"input_content,omitempty"`
 	// Requested video annotation features.
-	Features []Feature `protobuf:"varint,2,rep,packed,name=features,enum=google.cloud.videointelligence.v1beta1.Feature" json:"features,omitempty"`
+	Features []Feature `protobuf:"varint,2,rep,packed,name=features,proto3,enum=google.cloud.videointelligence.v1beta1.Feature" json:"features,omitempty"`
 	// Additional video context and/or feature-specific parameters.
-	VideoContext *VideoContext `protobuf:"bytes,3,opt,name=video_context,json=videoContext" json:"video_context,omitempty"`
+	VideoContext *VideoContext `protobuf:"bytes,3,opt,name=video_context,json=videoContext,proto3" json:"video_context,omitempty"`
 	// Optional location where the output (in JSON format) should be stored.
 	// Currently, only [Google Cloud Storage](https://cloud.google.com/storage/)
 	// URIs are supported, which must be specified in the following format:
 	// `gs://bucket-id/object-id` (other URI formats return
 	// [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
 	// [Request URIs](/storage/docs/reference-uris).
-	OutputUri string `protobuf:"bytes,4,opt,name=output_uri,json=outputUri" json:"output_uri,omitempty"`
+	OutputUri string `protobuf:"bytes,4,opt,name=output_uri,json=outputUri,proto3" json:"output_uri,omitempty"`
 	// Optional cloud region where annotation should take place. Supported cloud
 	// regions: `us-east1`, `us-west1`, `europe-west1`, `asia-east1`. If no region
 	// is specified, a region will be determined based on video file location.
-	LocationId string `protobuf:"bytes,5,opt,name=location_id,json=locationId" json:"location_id,omitempty"`
+	LocationId           string   `protobuf:"bytes,5,opt,name=location_id,json=locationId,proto3" json:"location_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AnnotateVideoRequest) Reset()                    { *m = AnnotateVideoRequest{} }
-func (m *AnnotateVideoRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoRequest) ProtoMessage()               {}
-func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
+func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoRequest) ProtoMessage()    {}
+func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{0}
+}
+func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
+}
+func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+}
+func (m *AnnotateVideoRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
+}
+func (m *AnnotateVideoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateVideoRequest proto.InternalMessageInfo
 
 func (m *AnnotateVideoRequest) GetInputUri() string {
 	if m != nil {
@@ -278,32 +287,54 @@ type VideoContext struct {
 	// Video segments to annotate. The segments may overlap and are not required
 	// to be contiguous or span the whole video. If unspecified, each video
 	// is treated as a single segment.
-	Segments []*VideoSegment `protobuf:"bytes,1,rep,name=segments" json:"segments,omitempty"`
+	Segments []*VideoSegment `protobuf:"bytes,1,rep,name=segments,proto3" json:"segments,omitempty"`
 	// If label detection has been requested, what labels should be detected
 	// in addition to video-level labels or segment-level labels. If unspecified,
 	// defaults to `SHOT_MODE`.
-	LabelDetectionMode LabelDetectionMode `protobuf:"varint,2,opt,name=label_detection_mode,json=labelDetectionMode,enum=google.cloud.videointelligence.v1beta1.LabelDetectionMode" json:"label_detection_mode,omitempty"`
+	LabelDetectionMode LabelDetectionMode `protobuf:"varint,2,opt,name=label_detection_mode,json=labelDetectionMode,proto3,enum=google.cloud.videointelligence.v1beta1.LabelDetectionMode" json:"label_detection_mode,omitempty"`
 	// Whether the video has been shot from a stationary (i.e. non-moving) camera.
 	// When set to true, might improve detection accuracy for moving objects.
-	StationaryCamera bool `protobuf:"varint,3,opt,name=stationary_camera,json=stationaryCamera" json:"stationary_camera,omitempty"`
+	StationaryCamera bool `protobuf:"varint,3,opt,name=stationary_camera,json=stationaryCamera,proto3" json:"stationary_camera,omitempty"`
 	// Model to use for label detection.
 	// Supported values: "latest" and "stable" (the default).
-	LabelDetectionModel string `protobuf:"bytes,4,opt,name=label_detection_model,json=labelDetectionModel" json:"label_detection_model,omitempty"`
+	LabelDetectionModel string `protobuf:"bytes,4,opt,name=label_detection_model,json=labelDetectionModel,proto3" json:"label_detection_model,omitempty"`
 	// Model to use for face detection.
 	// Supported values: "latest" and "stable" (the default).
-	FaceDetectionModel string `protobuf:"bytes,5,opt,name=face_detection_model,json=faceDetectionModel" json:"face_detection_model,omitempty"`
+	FaceDetectionModel string `protobuf:"bytes,5,opt,name=face_detection_model,json=faceDetectionModel,proto3" json:"face_detection_model,omitempty"`
 	// Model to use for shot change detection.
 	// Supported values: "latest" and "stable" (the default).
-	ShotChangeDetectionModel string `protobuf:"bytes,6,opt,name=shot_change_detection_model,json=shotChangeDetectionModel" json:"shot_change_detection_model,omitempty"`
+	ShotChangeDetectionModel string `protobuf:"bytes,6,opt,name=shot_change_detection_model,json=shotChangeDetectionModel,proto3" json:"shot_change_detection_model,omitempty"`
 	// Model to use for safe search detection.
 	// Supported values: "latest" and "stable" (the default).
-	SafeSearchDetectionModel string `protobuf:"bytes,7,opt,name=safe_search_detection_model,json=safeSearchDetectionModel" json:"safe_search_detection_model,omitempty"`
+	SafeSearchDetectionModel string   `protobuf:"bytes,7,opt,name=safe_search_detection_model,json=safeSearchDetectionModel,proto3" json:"safe_search_detection_model,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
 }
 
-func (m *VideoContext) Reset()                    { *m = VideoContext{} }
-func (m *VideoContext) String() string            { return proto.CompactTextString(m) }
-func (*VideoContext) ProtoMessage()               {}
-func (*VideoContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *VideoContext) Reset()         { *m = VideoContext{} }
+func (m *VideoContext) String() string { return proto.CompactTextString(m) }
+func (*VideoContext) ProtoMessage()    {}
+func (*VideoContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{1}
+}
+func (m *VideoContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
+}
+func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
+}
+func (dst *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(dst, src)
+}
+func (m *VideoContext) XXX_Size() int {
+	return xxx_messageInfo_VideoContext.Size(m)
+}
+func (m *VideoContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoContext proto.InternalMessageInfo
 
 func (m *VideoContext) GetSegments() []*VideoSegment {
 	if m != nil {
@@ -357,15 +388,37 @@ func (m *VideoContext) GetSafeSearchDetectionModel() string {
 // Video segment.
 type VideoSegment struct {
 	// Start offset in microseconds (inclusive). Unset means 0.
-	StartTimeOffset int64 `protobuf:"varint,1,opt,name=start_time_offset,json=startTimeOffset" json:"start_time_offset,omitempty"`
+	StartTimeOffset int64 `protobuf:"varint,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 	// End offset in microseconds (inclusive). Unset means 0.
-	EndTimeOffset int64 `protobuf:"varint,2,opt,name=end_time_offset,json=endTimeOffset" json:"end_time_offset,omitempty"`
+	EndTimeOffset        int64    `protobuf:"varint,2,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
+func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
+func (*VideoSegment) ProtoMessage()    {}
+func (*VideoSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{2}
+}
+func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
+}
+func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
+}
+func (dst *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(dst, src)
+}
+func (m *VideoSegment) XXX_Size() int {
+	return xxx_messageInfo_VideoSegment.Size(m)
+}
+func (m *VideoSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoSegment.DiscardUnknown(m)
 }
 
-func (m *VideoSegment) Reset()                    { *m = VideoSegment{} }
-func (m *VideoSegment) String() string            { return proto.CompactTextString(m) }
-func (*VideoSegment) ProtoMessage()               {}
-func (*VideoSegment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_VideoSegment proto.InternalMessageInfo
 
 func (m *VideoSegment) GetStartTimeOffset() int64 {
 	if m != nil {
@@ -387,17 +440,39 @@ type LabelLocation struct {
 	// Set to [timestamp, timestamp] for frame-level labels.
 	// Otherwise, corresponds to one of `AnnotateSpec.segments`
 	// (if specified) or to shot boundaries (if requested).
-	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment" json:"segment,omitempty"`
+	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment,proto3" json:"segment,omitempty"`
 	// Confidence that the label is accurate. Range: [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
 	// Label level.
-	Level LabelLevel `protobuf:"varint,3,opt,name=level,enum=google.cloud.videointelligence.v1beta1.LabelLevel" json:"level,omitempty"`
+	Level                LabelLevel `protobuf:"varint,3,opt,name=level,proto3,enum=google.cloud.videointelligence.v1beta1.LabelLevel" json:"level,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *LabelLocation) Reset()                    { *m = LabelLocation{} }
-func (m *LabelLocation) String() string            { return proto.CompactTextString(m) }
-func (*LabelLocation) ProtoMessage()               {}
-func (*LabelLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *LabelLocation) Reset()         { *m = LabelLocation{} }
+func (m *LabelLocation) String() string { return proto.CompactTextString(m) }
+func (*LabelLocation) ProtoMessage()    {}
+func (*LabelLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{3}
+}
+func (m *LabelLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelLocation.Unmarshal(m, b)
+}
+func (m *LabelLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelLocation.Marshal(b, m, deterministic)
+}
+func (dst *LabelLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelLocation.Merge(dst, src)
+}
+func (m *LabelLocation) XXX_Size() int {
+	return xxx_messageInfo_LabelLocation.Size(m)
+}
+func (m *LabelLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelLocation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LabelLocation proto.InternalMessageInfo
 
 func (m *LabelLocation) GetSegment() *VideoSegment {
 	if m != nil {
@@ -423,17 +498,39 @@ func (m *LabelLocation) GetLevel() LabelLevel {
 // Label annotation.
 type LabelAnnotation struct {
 	// Textual description, e.g. `Fixed-gear bicycle`.
-	Description string `protobuf:"bytes,1,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
 	// Language code for `description` in BCP-47 format.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Where the label was detected and with what confidence.
-	Locations []*LabelLocation `protobuf:"bytes,3,rep,name=locations" json:"locations,omitempty"`
+	Locations            []*LabelLocation `protobuf:"bytes,3,rep,name=locations,proto3" json:"locations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
+func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
+func (*LabelAnnotation) ProtoMessage()    {}
+func (*LabelAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{4}
+}
+func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
+}
+func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+}
+func (m *LabelAnnotation) XXX_Size() int {
+	return xxx_messageInfo_LabelAnnotation.Size(m)
+}
+func (m *LabelAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelAnnotation.DiscardUnknown(m)
 }
 
-func (m *LabelAnnotation) Reset()                    { *m = LabelAnnotation{} }
-func (m *LabelAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*LabelAnnotation) ProtoMessage()               {}
-func (*LabelAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_LabelAnnotation proto.InternalMessageInfo
 
 func (m *LabelAnnotation) GetDescription() string {
 	if m != nil {
@@ -463,24 +560,46 @@ func (m *LabelAnnotation) GetLocations() []*LabelLocation {
 // for all other types of unsafe content.
 type SafeSearchAnnotation struct {
 	// Likelihood of adult content.
-	Adult Likelihood `protobuf:"varint,1,opt,name=adult,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"adult,omitempty"`
+	Adult Likelihood `protobuf:"varint,1,opt,name=adult,proto3,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"adult,omitempty"`
 	// Likelihood that an obvious modification was made to the original
 	// version to make it appear funny or offensive.
-	Spoof Likelihood `protobuf:"varint,2,opt,name=spoof,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"spoof,omitempty"`
+	Spoof Likelihood `protobuf:"varint,2,opt,name=spoof,proto3,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"spoof,omitempty"`
 	// Likelihood of medical content.
-	Medical Likelihood `protobuf:"varint,3,opt,name=medical,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"medical,omitempty"`
+	Medical Likelihood `protobuf:"varint,3,opt,name=medical,proto3,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"medical,omitempty"`
 	// Likelihood of violent content.
-	Violent Likelihood `protobuf:"varint,4,opt,name=violent,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"violent,omitempty"`
+	Violent Likelihood `protobuf:"varint,4,opt,name=violent,proto3,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"violent,omitempty"`
 	// Likelihood of racy content.
-	Racy Likelihood `protobuf:"varint,5,opt,name=racy,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"racy,omitempty"`
+	Racy Likelihood `protobuf:"varint,5,opt,name=racy,proto3,enum=google.cloud.videointelligence.v1beta1.Likelihood" json:"racy,omitempty"`
 	// Video time offset in microseconds.
-	TimeOffset int64 `protobuf:"varint,6,opt,name=time_offset,json=timeOffset" json:"time_offset,omitempty"`
+	TimeOffset           int64    `protobuf:"varint,6,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
+func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
+func (*SafeSearchAnnotation) ProtoMessage()    {}
+func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{5}
+}
+func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
+}
+func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+}
+func (m *SafeSearchAnnotation) XXX_Size() int {
+	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
+}
+func (m *SafeSearchAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_SafeSearchAnnotation.DiscardUnknown(m)
 }
 
-func (m *SafeSearchAnnotation) Reset()                    { *m = SafeSearchAnnotation{} }
-func (m *SafeSearchAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*SafeSearchAnnotation) ProtoMessage()               {}
-func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_SafeSearchAnnotation proto.InternalMessageInfo
 
 func (m *SafeSearchAnnotation) GetAdult() Likelihood {
 	if m != nil {
@@ -527,19 +646,41 @@ func (m *SafeSearchAnnotation) GetTimeOffset() int64 {
 // Bounding box.
 type BoundingBox struct {
 	// Left X coordinate.
-	Left int32 `protobuf:"varint,1,opt,name=left" json:"left,omitempty"`
+	Left int32 `protobuf:"varint,1,opt,name=left,proto3" json:"left,omitempty"`
 	// Right X coordinate.
-	Right int32 `protobuf:"varint,2,opt,name=right" json:"right,omitempty"`
+	Right int32 `protobuf:"varint,2,opt,name=right,proto3" json:"right,omitempty"`
 	// Bottom Y coordinate.
-	Bottom int32 `protobuf:"varint,3,opt,name=bottom" json:"bottom,omitempty"`
+	Bottom int32 `protobuf:"varint,3,opt,name=bottom,proto3" json:"bottom,omitempty"`
 	// Top Y coordinate.
-	Top int32 `protobuf:"varint,4,opt,name=top" json:"top,omitempty"`
+	Top                  int32    `protobuf:"varint,4,opt,name=top,proto3" json:"top,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BoundingBox) Reset()                    { *m = BoundingBox{} }
-func (m *BoundingBox) String() string            { return proto.CompactTextString(m) }
-func (*BoundingBox) ProtoMessage()               {}
-func (*BoundingBox) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *BoundingBox) Reset()         { *m = BoundingBox{} }
+func (m *BoundingBox) String() string { return proto.CompactTextString(m) }
+func (*BoundingBox) ProtoMessage()    {}
+func (*BoundingBox) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{6}
+}
+func (m *BoundingBox) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BoundingBox.Unmarshal(m, b)
+}
+func (m *BoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BoundingBox.Marshal(b, m, deterministic)
+}
+func (dst *BoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingBox.Merge(dst, src)
+}
+func (m *BoundingBox) XXX_Size() int {
+	return xxx_messageInfo_BoundingBox.Size(m)
+}
+func (m *BoundingBox) XXX_DiscardUnknown() {
+	xxx_messageInfo_BoundingBox.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BoundingBox proto.InternalMessageInfo
 
 func (m *BoundingBox) GetLeft() int32 {
 	if m != nil {
@@ -572,15 +713,37 @@ func (m *BoundingBox) GetTop() int32 {
 // Face location.
 type FaceLocation struct {
 	// Bounding box in a frame.
-	BoundingBox *BoundingBox `protobuf:"bytes,1,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingBox `protobuf:"bytes,1,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// Video time offset in microseconds.
-	TimeOffset int64 `protobuf:"varint,2,opt,name=time_offset,json=timeOffset" json:"time_offset,omitempty"`
+	TimeOffset           int64    `protobuf:"varint,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FaceLocation) Reset()         { *m = FaceLocation{} }
+func (m *FaceLocation) String() string { return proto.CompactTextString(m) }
+func (*FaceLocation) ProtoMessage()    {}
+func (*FaceLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{7}
+}
+func (m *FaceLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceLocation.Unmarshal(m, b)
+}
+func (m *FaceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceLocation.Marshal(b, m, deterministic)
+}
+func (dst *FaceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceLocation.Merge(dst, src)
+}
+func (m *FaceLocation) XXX_Size() int {
+	return xxx_messageInfo_FaceLocation.Size(m)
+}
+func (m *FaceLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceLocation.DiscardUnknown(m)
 }
 
-func (m *FaceLocation) Reset()                    { *m = FaceLocation{} }
-func (m *FaceLocation) String() string            { return proto.CompactTextString(m) }
-func (*FaceLocation) ProtoMessage()               {}
-func (*FaceLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_FaceLocation proto.InternalMessageInfo
 
 func (m *FaceLocation) GetBoundingBox() *BoundingBox {
 	if m != nil {
@@ -599,19 +762,41 @@ func (m *FaceLocation) GetTimeOffset() int64 {
 // Face annotation.
 type FaceAnnotation struct {
 	// Thumbnail of a representative face view (in JPEG format). Encoding: base64.
-	Thumbnail string `protobuf:"bytes,1,opt,name=thumbnail" json:"thumbnail,omitempty"`
+	Thumbnail string `protobuf:"bytes,1,opt,name=thumbnail,proto3" json:"thumbnail,omitempty"`
 	// All locations where a face was detected.
 	// Faces are detected and tracked on a per-video basis
 	// (as opposed to across multiple videos).
-	Segments []*VideoSegment `protobuf:"bytes,2,rep,name=segments" json:"segments,omitempty"`
+	Segments []*VideoSegment `protobuf:"bytes,2,rep,name=segments,proto3" json:"segments,omitempty"`
 	// Face locations at one frame per second.
-	Locations []*FaceLocation `protobuf:"bytes,3,rep,name=locations" json:"locations,omitempty"`
+	Locations            []*FaceLocation `protobuf:"bytes,3,rep,name=locations,proto3" json:"locations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
+func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation) ProtoMessage()    {}
+func (*FaceAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{8}
+}
+func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
+}
+func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+}
+func (m *FaceAnnotation) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation.Size(m)
+}
+func (m *FaceAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation.DiscardUnknown(m)
 }
 
-func (m *FaceAnnotation) Reset()                    { *m = FaceAnnotation{} }
-func (m *FaceAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*FaceAnnotation) ProtoMessage()               {}
-func (*FaceAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_FaceAnnotation proto.InternalMessageInfo
 
 func (m *FaceAnnotation) GetThumbnail() string {
 	if m != nil {
@@ -638,24 +823,46 @@ func (m *FaceAnnotation) GetLocations() []*FaceLocation {
 type VideoAnnotationResults struct {
 	// Video file location in
 	// [Google Cloud Storage](https://cloud.google.com/storage/).
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// Label annotations. There is exactly one element for each unique label.
-	LabelAnnotations []*LabelAnnotation `protobuf:"bytes,2,rep,name=label_annotations,json=labelAnnotations" json:"label_annotations,omitempty"`
+	LabelAnnotations []*LabelAnnotation `protobuf:"bytes,2,rep,name=label_annotations,json=labelAnnotations,proto3" json:"label_annotations,omitempty"`
 	// Face annotations. There is exactly one element for each unique face.
-	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,3,rep,name=face_annotations,json=faceAnnotations" json:"face_annotations,omitempty"`
+	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,3,rep,name=face_annotations,json=faceAnnotations,proto3" json:"face_annotations,omitempty"`
 	// Shot annotations. Each shot is represented as a video segment.
-	ShotAnnotations []*VideoSegment `protobuf:"bytes,4,rep,name=shot_annotations,json=shotAnnotations" json:"shot_annotations,omitempty"`
+	ShotAnnotations []*VideoSegment `protobuf:"bytes,4,rep,name=shot_annotations,json=shotAnnotations,proto3" json:"shot_annotations,omitempty"`
 	// Safe search annotations.
-	SafeSearchAnnotations []*SafeSearchAnnotation `protobuf:"bytes,6,rep,name=safe_search_annotations,json=safeSearchAnnotations" json:"safe_search_annotations,omitempty"`
+	SafeSearchAnnotations []*SafeSearchAnnotation `protobuf:"bytes,6,rep,name=safe_search_annotations,json=safeSearchAnnotations,proto3" json:"safe_search_annotations,omitempty"`
 	// If set, indicates an error. Note that for a single `AnnotateVideoRequest`
 	// some videos may succeed and some may fail.
-	Error *google_rpc.Status `protobuf:"bytes,5,opt,name=error" json:"error,omitempty"`
+	Error                *status.Status `protobuf:"bytes,5,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{} }
+func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
+func (*VideoAnnotationResults) ProtoMessage()    {}
+func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{9}
+}
+func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
+}
+func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
+}
+func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+}
+func (m *VideoAnnotationResults) XXX_Size() int {
+	return xxx_messageInfo_VideoAnnotationResults.Size(m)
+}
+func (m *VideoAnnotationResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoAnnotationResults.DiscardUnknown(m)
 }
 
-func (m *VideoAnnotationResults) Reset()                    { *m = VideoAnnotationResults{} }
-func (m *VideoAnnotationResults) String() string            { return proto.CompactTextString(m) }
-func (*VideoAnnotationResults) ProtoMessage()               {}
-func (*VideoAnnotationResults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_VideoAnnotationResults proto.InternalMessageInfo
 
 func (m *VideoAnnotationResults) GetInputUri() string {
 	if m != nil {
@@ -692,7 +899,7 @@ func (m *VideoAnnotationResults) GetSafeSearchAnnotations() []*SafeSearchAnnotat
 	return nil
 }
 
-func (m *VideoAnnotationResults) GetError() *google_rpc.Status {
+func (m *VideoAnnotationResults) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
@@ -704,13 +911,35 @@ func (m *VideoAnnotationResults) GetError() *google_rpc.Status {
 // call of the `google::longrunning::Operations` service.
 type AnnotateVideoResponse struct {
 	// Annotation results for all videos specified in `AnnotateVideoRequest`.
-	AnnotationResults []*VideoAnnotationResults `protobuf:"bytes,1,rep,name=annotation_results,json=annotationResults" json:"annotation_results,omitempty"`
+	AnnotationResults    []*VideoAnnotationResults `protobuf:"bytes,1,rep,name=annotation_results,json=annotationResults,proto3" json:"annotation_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
+func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoResponse) ProtoMessage()    {}
+func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{10}
+}
+func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
+}
+func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+}
+func (m *AnnotateVideoResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
+}
+func (m *AnnotateVideoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoResponse.DiscardUnknown(m)
 }
 
-func (m *AnnotateVideoResponse) Reset()                    { *m = AnnotateVideoResponse{} }
-func (m *AnnotateVideoResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoResponse) ProtoMessage()               {}
-func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_AnnotateVideoResponse proto.InternalMessageInfo
 
 func (m *AnnotateVideoResponse) GetAnnotationResults() []*VideoAnnotationResults {
 	if m != nil {
@@ -723,20 +952,42 @@ func (m *AnnotateVideoResponse) GetAnnotationResults() []*VideoAnnotationResults
 type VideoAnnotationProgress struct {
 	// Video file location in
 	// [Google Cloud Storage](https://cloud.google.com/storage/).
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// Approximate percentage processed thus far.
 	// Guaranteed to be 100 when fully processed.
-	ProgressPercent int32 `protobuf:"varint,2,opt,name=progress_percent,json=progressPercent" json:"progress_percent,omitempty"`
+	ProgressPercent int32 `protobuf:"varint,2,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 	// Time when the request was received.
-	StartTime *google_protobuf3.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time of the most recent update.
-	UpdateTime *google_protobuf3.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress{} }
+func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
+func (*VideoAnnotationProgress) ProtoMessage()    {}
+func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{11}
+}
+func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
+}
+func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
+}
+func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+}
+func (m *VideoAnnotationProgress) XXX_Size() int {
+	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
+}
+func (m *VideoAnnotationProgress) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoAnnotationProgress.DiscardUnknown(m)
 }
 
-func (m *VideoAnnotationProgress) Reset()                    { *m = VideoAnnotationProgress{} }
-func (m *VideoAnnotationProgress) String() string            { return proto.CompactTextString(m) }
-func (*VideoAnnotationProgress) ProtoMessage()               {}
-func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_VideoAnnotationProgress proto.InternalMessageInfo
 
 func (m *VideoAnnotationProgress) GetInputUri() string {
 	if m != nil {
@@ -752,14 +1003,14 @@ func (m *VideoAnnotationProgress) GetProgressPercent() int32 {
 	return 0
 }
 
-func (m *VideoAnnotationProgress) GetStartTime() *google_protobuf3.Timestamp {
+func (m *VideoAnnotationProgress) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *VideoAnnotationProgress) GetUpdateTime() *google_protobuf3.Timestamp {
+func (m *VideoAnnotationProgress) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -771,13 +1022,35 @@ func (m *VideoAnnotationProgress) GetUpdateTime() *google_protobuf3.Timestamp {
 // call of the `google::longrunning::Operations` service.
 type AnnotateVideoProgress struct {
 	// Progress metadata for all videos specified in `AnnotateVideoRequest`.
-	AnnotationProgress []*VideoAnnotationProgress `protobuf:"bytes,1,rep,name=annotation_progress,json=annotationProgress" json:"annotation_progress,omitempty"`
+	AnnotationProgress   []*VideoAnnotationProgress `protobuf:"bytes,1,rep,name=annotation_progress,json=annotationProgress,proto3" json:"annotation_progress,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
+func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoProgress) ProtoMessage()    {}
+func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_2adacfc9be54b175, []int{12}
+}
+func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
+}
+func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+}
+func (m *AnnotateVideoProgress) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
+}
+func (m *AnnotateVideoProgress) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoProgress.DiscardUnknown(m)
 }
 
-func (m *AnnotateVideoProgress) Reset()                    { *m = AnnotateVideoProgress{} }
-func (m *AnnotateVideoProgress) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoProgress) ProtoMessage()               {}
-func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_AnnotateVideoProgress proto.InternalMessageInfo
 
 func (m *AnnotateVideoProgress) GetAnnotationProgress() []*VideoAnnotationProgress {
 	if m != nil {
@@ -814,14 +1087,15 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for VideoIntelligenceService service
-
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VideoIntelligenceServiceClient interface {
 	// Performs asynchronous video annotation. Progress and results can be
 	// retrieved through the `google.longrunning.Operations` interface.
 	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
 	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type videoIntelligenceServiceClient struct {
@@ -832,23 +1106,22 @@ func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceSer
 	return &videoIntelligenceServiceClient{cc}
 }
 
-func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.videointelligence.v1beta1.VideoIntelligenceService/AnnotateVideo", in, out, c.cc, opts...)
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1beta1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for VideoIntelligenceService service
-
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
 type VideoIntelligenceServiceServer interface {
 	// Performs asynchronous video annotation. Progress and results can be
 	// retrieved through the `google.longrunning.Operations` interface.
 	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
 	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*google_longrunning.Operation, error)
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
 }
 
 func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
@@ -887,10 +1160,10 @@ var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1beta1/video_intelligence.proto", fileDescriptor0)
+	proto.RegisterFile("google/cloud/videointelligence/v1beta1/video_intelligence.proto", fileDescriptor_video_intelligence_2adacfc9be54b175)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_video_intelligence_2adacfc9be54b175 = []byte{
 	// 1520 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcb, 0x6f, 0x1b, 0xd5,
 	0x1a, 0xef, 0xf8, 0x91, 0xc4, 0x9f, 0x93, 0xd8, 0x39, 0x49, 0x1a, 0xdf, 0xb4, 0xb9, 0x8d, 0xdc,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
index cf6b2222..c152c181 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2/video_intelligence.pb.go
@@ -1,45 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/videointelligence/v1beta2/video_intelligence.proto
 
-/*
-Package videointelligence is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/videointelligence/v1beta2/video_intelligence.proto
-
-It has these top-level messages:
-	AnnotateVideoRequest
-	VideoContext
-	LabelDetectionConfig
-	ShotChangeDetectionConfig
-	ExplicitContentDetectionConfig
-	FaceDetectionConfig
-	VideoSegment
-	LabelSegment
-	LabelFrame
-	Entity
-	LabelAnnotation
-	ExplicitContentFrame
-	ExplicitContentAnnotation
-	NormalizedBoundingBox
-	FaceSegment
-	FaceFrame
-	FaceAnnotation
-	VideoAnnotationResults
-	AnnotateVideoResponse
-	VideoAnnotationProgress
-	AnnotateVideoProgress
-*/
-package videointelligence
+package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -91,7 +62,9 @@ var Feature_value = map[string]int32{
 func (x Feature) String() string {
 	return proto.EnumName(Feature_name, int32(x))
 }
-func (Feature) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (Feature) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{0}
+}
 
 // Label detection mode.
 type LabelDetectionMode int32
@@ -123,7 +96,9 @@ var LabelDetectionMode_value = map[string]int32{
 func (x LabelDetectionMode) String() string {
 	return proto.EnumName(LabelDetectionMode_name, int32(x))
 }
-func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{1}
+}
 
 // Bucketized representation of likelihood.
 type Likelihood int32
@@ -163,7 +138,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
-func (Likelihood) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{2}
+}
 
 // Video annotation request.
 type AnnotateVideoRequest struct {
@@ -177,32 +154,54 @@ type AnnotateVideoRequest struct {
 	// multiple videos. Supported wildcards: '*' to match 0 or more characters;
 	// '?' to match 1 character. If unset, the input video should be embedded
 	// in the request as `input_content`. If set, `input_content` should be unset.
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// The video data bytes.
 	// If unset, the input video(s) should be specified via `input_uri`.
 	// If set, `input_uri` should be unset.
 	InputContent []byte `protobuf:"bytes,6,opt,name=input_content,json=inputContent,proto3" json:"input_content,omitempty"`
 	// Requested video annotation features.
-	Features []Feature `protobuf:"varint,2,rep,packed,name=features,enum=google.cloud.videointelligence.v1beta2.Feature" json:"features,omitempty"`
+	Features []Feature `protobuf:"varint,2,rep,packed,name=features,proto3,enum=google.cloud.videointelligence.v1beta2.Feature" json:"features,omitempty"`
 	// Additional video context and/or feature-specific parameters.
-	VideoContext *VideoContext `protobuf:"bytes,3,opt,name=video_context,json=videoContext" json:"video_context,omitempty"`
+	VideoContext *VideoContext `protobuf:"bytes,3,opt,name=video_context,json=videoContext,proto3" json:"video_context,omitempty"`
 	// Optional location where the output (in JSON format) should be stored.
 	// Currently, only [Google Cloud Storage](https://cloud.google.com/storage/)
 	// URIs are supported, which must be specified in the following format:
 	// `gs://bucket-id/object-id` (other URI formats return
 	// [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
 	// [Request URIs](/storage/docs/reference-uris).
-	OutputUri string `protobuf:"bytes,4,opt,name=output_uri,json=outputUri" json:"output_uri,omitempty"`
+	OutputUri string `protobuf:"bytes,4,opt,name=output_uri,json=outputUri,proto3" json:"output_uri,omitempty"`
 	// Optional cloud region where annotation should take place. Supported cloud
 	// regions: `us-east1`, `us-west1`, `europe-west1`, `asia-east1`. If no region
 	// is specified, a region will be determined based on video file location.
-	LocationId string `protobuf:"bytes,5,opt,name=location_id,json=locationId" json:"location_id,omitempty"`
+	LocationId           string   `protobuf:"bytes,5,opt,name=location_id,json=locationId,proto3" json:"location_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
+func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoRequest) ProtoMessage()    {}
+func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{0}
+}
+func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
+}
+func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+}
+func (m *AnnotateVideoRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
+}
+func (m *AnnotateVideoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoRequest.DiscardUnknown(m)
 }
 
-func (m *AnnotateVideoRequest) Reset()                    { *m = AnnotateVideoRequest{} }
-func (m *AnnotateVideoRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoRequest) ProtoMessage()               {}
-func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_AnnotateVideoRequest proto.InternalMessageInfo
 
 func (m *AnnotateVideoRequest) GetInputUri() string {
 	if m != nil {
@@ -251,21 +250,43 @@ type VideoContext struct {
 	// Video segments to annotate. The segments may overlap and are not required
 	// to be contiguous or span the whole video. If unspecified, each video
 	// is treated as a single segment.
-	Segments []*VideoSegment `protobuf:"bytes,1,rep,name=segments" json:"segments,omitempty"`
+	Segments []*VideoSegment `protobuf:"bytes,1,rep,name=segments,proto3" json:"segments,omitempty"`
 	// Config for LABEL_DETECTION.
-	LabelDetectionConfig *LabelDetectionConfig `protobuf:"bytes,2,opt,name=label_detection_config,json=labelDetectionConfig" json:"label_detection_config,omitempty"`
+	LabelDetectionConfig *LabelDetectionConfig `protobuf:"bytes,2,opt,name=label_detection_config,json=labelDetectionConfig,proto3" json:"label_detection_config,omitempty"`
 	// Config for SHOT_CHANGE_DETECTION.
-	ShotChangeDetectionConfig *ShotChangeDetectionConfig `protobuf:"bytes,3,opt,name=shot_change_detection_config,json=shotChangeDetectionConfig" json:"shot_change_detection_config,omitempty"`
+	ShotChangeDetectionConfig *ShotChangeDetectionConfig `protobuf:"bytes,3,opt,name=shot_change_detection_config,json=shotChangeDetectionConfig,proto3" json:"shot_change_detection_config,omitempty"`
 	// Config for EXPLICIT_CONTENT_DETECTION.
-	ExplicitContentDetectionConfig *ExplicitContentDetectionConfig `protobuf:"bytes,4,opt,name=explicit_content_detection_config,json=explicitContentDetectionConfig" json:"explicit_content_detection_config,omitempty"`
+	ExplicitContentDetectionConfig *ExplicitContentDetectionConfig `protobuf:"bytes,4,opt,name=explicit_content_detection_config,json=explicitContentDetectionConfig,proto3" json:"explicit_content_detection_config,omitempty"`
 	// Config for FACE_DETECTION.
-	FaceDetectionConfig *FaceDetectionConfig `protobuf:"bytes,5,opt,name=face_detection_config,json=faceDetectionConfig" json:"face_detection_config,omitempty"`
+	FaceDetectionConfig  *FaceDetectionConfig `protobuf:"bytes,5,opt,name=face_detection_config,json=faceDetectionConfig,proto3" json:"face_detection_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *VideoContext) Reset()                    { *m = VideoContext{} }
-func (m *VideoContext) String() string            { return proto.CompactTextString(m) }
-func (*VideoContext) ProtoMessage()               {}
-func (*VideoContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *VideoContext) Reset()         { *m = VideoContext{} }
+func (m *VideoContext) String() string { return proto.CompactTextString(m) }
+func (*VideoContext) ProtoMessage()    {}
+func (*VideoContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{1}
+}
+func (m *VideoContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
+}
+func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
+}
+func (dst *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(dst, src)
+}
+func (m *VideoContext) XXX_Size() int {
+	return xxx_messageInfo_VideoContext.Size(m)
+}
+func (m *VideoContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoContext proto.InternalMessageInfo
 
 func (m *VideoContext) GetSegments() []*VideoSegment {
 	if m != nil {
@@ -307,21 +328,43 @@ type LabelDetectionConfig struct {
 	// What labels should be detected with LABEL_DETECTION, in addition to
 	// video-level labels or segment-level labels.
 	// If unspecified, defaults to `SHOT_MODE`.
-	LabelDetectionMode LabelDetectionMode `protobuf:"varint,1,opt,name=label_detection_mode,json=labelDetectionMode,enum=google.cloud.videointelligence.v1beta2.LabelDetectionMode" json:"label_detection_mode,omitempty"`
+	LabelDetectionMode LabelDetectionMode `protobuf:"varint,1,opt,name=label_detection_mode,json=labelDetectionMode,proto3,enum=google.cloud.videointelligence.v1beta2.LabelDetectionMode" json:"label_detection_mode,omitempty"`
 	// Whether the video has been shot from a stationary (i.e. non-moving) camera.
 	// When set to true, might improve detection accuracy for moving objects.
 	// Should be used with `SHOT_AND_FRAME_MODE` enabled.
-	StationaryCamera bool `protobuf:"varint,2,opt,name=stationary_camera,json=stationaryCamera" json:"stationary_camera,omitempty"`
+	StationaryCamera bool `protobuf:"varint,2,opt,name=stationary_camera,json=stationaryCamera,proto3" json:"stationary_camera,omitempty"`
 	// Model to use for label detection.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,3,opt,name=model" json:"model,omitempty"`
+	Model                string   `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelDetectionConfig) Reset()         { *m = LabelDetectionConfig{} }
+func (m *LabelDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*LabelDetectionConfig) ProtoMessage()    {}
+func (*LabelDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{2}
+}
+func (m *LabelDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelDetectionConfig.Unmarshal(m, b)
+}
+func (m *LabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *LabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDetectionConfig.Merge(dst, src)
+}
+func (m *LabelDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_LabelDetectionConfig.Size(m)
+}
+func (m *LabelDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelDetectionConfig.DiscardUnknown(m)
 }
 
-func (m *LabelDetectionConfig) Reset()                    { *m = LabelDetectionConfig{} }
-func (m *LabelDetectionConfig) String() string            { return proto.CompactTextString(m) }
-func (*LabelDetectionConfig) ProtoMessage()               {}
-func (*LabelDetectionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_LabelDetectionConfig proto.InternalMessageInfo
 
 func (m *LabelDetectionConfig) GetLabelDetectionMode() LabelDetectionMode {
 	if m != nil {
@@ -349,13 +392,35 @@ type ShotChangeDetectionConfig struct {
 	// Model to use for shot change detection.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,1,opt,name=model" json:"model,omitempty"`
+	Model                string   `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ShotChangeDetectionConfig) Reset()                    { *m = ShotChangeDetectionConfig{} }
-func (m *ShotChangeDetectionConfig) String() string            { return proto.CompactTextString(m) }
-func (*ShotChangeDetectionConfig) ProtoMessage()               {}
-func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ShotChangeDetectionConfig) Reset()         { *m = ShotChangeDetectionConfig{} }
+func (m *ShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*ShotChangeDetectionConfig) ProtoMessage()    {}
+func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{3}
+}
+func (m *ShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Unmarshal(m, b)
+}
+func (m *ShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShotChangeDetectionConfig.Merge(dst, src)
+}
+func (m *ShotChangeDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Size(m)
+}
+func (m *ShotChangeDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ShotChangeDetectionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ShotChangeDetectionConfig proto.InternalMessageInfo
 
 func (m *ShotChangeDetectionConfig) GetModel() string {
 	if m != nil {
@@ -369,13 +434,35 @@ type ExplicitContentDetectionConfig struct {
 	// Model to use for explicit content detection.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,1,opt,name=model" json:"model,omitempty"`
+	Model                string   `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExplicitContentDetectionConfig) Reset()         { *m = ExplicitContentDetectionConfig{} }
+func (m *ExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentDetectionConfig) ProtoMessage()    {}
+func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{4}
+}
+func (m *ExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Unmarshal(m, b)
+}
+func (m *ExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(dst, src)
+}
+func (m *ExplicitContentDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Size(m)
+}
+func (m *ExplicitContentDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentDetectionConfig.DiscardUnknown(m)
 }
 
-func (m *ExplicitContentDetectionConfig) Reset()                    { *m = ExplicitContentDetectionConfig{} }
-func (m *ExplicitContentDetectionConfig) String() string            { return proto.CompactTextString(m) }
-func (*ExplicitContentDetectionConfig) ProtoMessage()               {}
-func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ExplicitContentDetectionConfig proto.InternalMessageInfo
 
 func (m *ExplicitContentDetectionConfig) GetModel() string {
 	if m != nil {
@@ -389,15 +476,37 @@ type FaceDetectionConfig struct {
 	// Model to use for face detection.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,1,opt,name=model" json:"model,omitempty"`
+	Model string `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
 	// Whether bounding boxes be included in the face annotation output.
-	IncludeBoundingBoxes bool `protobuf:"varint,2,opt,name=include_bounding_boxes,json=includeBoundingBoxes" json:"include_bounding_boxes,omitempty"`
+	IncludeBoundingBoxes bool     `protobuf:"varint,2,opt,name=include_bounding_boxes,json=includeBoundingBoxes,proto3" json:"include_bounding_boxes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FaceDetectionConfig) Reset()                    { *m = FaceDetectionConfig{} }
-func (m *FaceDetectionConfig) String() string            { return proto.CompactTextString(m) }
-func (*FaceDetectionConfig) ProtoMessage()               {}
-func (*FaceDetectionConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *FaceDetectionConfig) Reset()         { *m = FaceDetectionConfig{} }
+func (m *FaceDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*FaceDetectionConfig) ProtoMessage()    {}
+func (*FaceDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{5}
+}
+func (m *FaceDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceDetectionConfig.Unmarshal(m, b)
+}
+func (m *FaceDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *FaceDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceDetectionConfig.Merge(dst, src)
+}
+func (m *FaceDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_FaceDetectionConfig.Size(m)
+}
+func (m *FaceDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceDetectionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceDetectionConfig proto.InternalMessageInfo
 
 func (m *FaceDetectionConfig) GetModel() string {
 	if m != nil {
@@ -417,25 +526,47 @@ func (m *FaceDetectionConfig) GetIncludeBoundingBoxes() bool {
 type VideoSegment struct {
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the start of the segment (inclusive).
-	StartTimeOffset *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset" json:"start_time_offset,omitempty"`
+	StartTimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the end of the segment (inclusive).
-	EndTimeOffset *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=end_time_offset,json=endTimeOffset" json:"end_time_offset,omitempty"`
+	EndTimeOffset        *duration.Duration `protobuf:"bytes,2,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *VideoSegment) Reset()                    { *m = VideoSegment{} }
-func (m *VideoSegment) String() string            { return proto.CompactTextString(m) }
-func (*VideoSegment) ProtoMessage()               {}
-func (*VideoSegment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
+func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
+func (*VideoSegment) ProtoMessage()    {}
+func (*VideoSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{6}
+}
+func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
+}
+func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
+}
+func (dst *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(dst, src)
+}
+func (m *VideoSegment) XXX_Size() int {
+	return xxx_messageInfo_VideoSegment.Size(m)
+}
+func (m *VideoSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoSegment.DiscardUnknown(m)
+}
 
-func (m *VideoSegment) GetStartTimeOffset() *google_protobuf3.Duration {
+var xxx_messageInfo_VideoSegment proto.InternalMessageInfo
+
+func (m *VideoSegment) GetStartTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.StartTimeOffset
 	}
 	return nil
 }
 
-func (m *VideoSegment) GetEndTimeOffset() *google_protobuf3.Duration {
+func (m *VideoSegment) GetEndTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.EndTimeOffset
 	}
@@ -445,15 +576,37 @@ func (m *VideoSegment) GetEndTimeOffset() *google_protobuf3.Duration {
 // Video segment level annotation results for label detection.
 type LabelSegment struct {
 	// Video segment where a label was detected.
-	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment" json:"segment,omitempty"`
+	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment,proto3" json:"segment,omitempty"`
 	// Confidence that the label is accurate. Range: [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelSegment) Reset()         { *m = LabelSegment{} }
+func (m *LabelSegment) String() string { return proto.CompactTextString(m) }
+func (*LabelSegment) ProtoMessage()    {}
+func (*LabelSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{7}
+}
+func (m *LabelSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelSegment.Unmarshal(m, b)
+}
+func (m *LabelSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelSegment.Marshal(b, m, deterministic)
+}
+func (dst *LabelSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelSegment.Merge(dst, src)
+}
+func (m *LabelSegment) XXX_Size() int {
+	return xxx_messageInfo_LabelSegment.Size(m)
+}
+func (m *LabelSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelSegment.DiscardUnknown(m)
 }
 
-func (m *LabelSegment) Reset()                    { *m = LabelSegment{} }
-func (m *LabelSegment) String() string            { return proto.CompactTextString(m) }
-func (*LabelSegment) ProtoMessage()               {}
-func (*LabelSegment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_LabelSegment proto.InternalMessageInfo
 
 func (m *LabelSegment) GetSegment() *VideoSegment {
 	if m != nil {
@@ -473,17 +626,39 @@ func (m *LabelSegment) GetConfidence() float32 {
 type LabelFrame struct {
 	// Time-offset, relative to the beginning of the video, corresponding to the
 	// video frame for this location.
-	TimeOffset *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset" json:"time_offset,omitempty"`
+	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 	// Confidence that the label is accurate. Range: [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelFrame) Reset()         { *m = LabelFrame{} }
+func (m *LabelFrame) String() string { return proto.CompactTextString(m) }
+func (*LabelFrame) ProtoMessage()    {}
+func (*LabelFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{8}
+}
+func (m *LabelFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelFrame.Unmarshal(m, b)
+}
+func (m *LabelFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelFrame.Marshal(b, m, deterministic)
+}
+func (dst *LabelFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelFrame.Merge(dst, src)
+}
+func (m *LabelFrame) XXX_Size() int {
+	return xxx_messageInfo_LabelFrame.Size(m)
+}
+func (m *LabelFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelFrame.DiscardUnknown(m)
 }
 
-func (m *LabelFrame) Reset()                    { *m = LabelFrame{} }
-func (m *LabelFrame) String() string            { return proto.CompactTextString(m) }
-func (*LabelFrame) ProtoMessage()               {}
-func (*LabelFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_LabelFrame proto.InternalMessageInfo
 
-func (m *LabelFrame) GetTimeOffset() *google_protobuf3.Duration {
+func (m *LabelFrame) GetTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.TimeOffset
 	}
@@ -502,17 +677,39 @@ type Entity struct {
 	// Opaque entity ID. Some IDs may be available in
 	// [Google Knowledge Graph Search
 	// API](https://developers.google.com/knowledge-graph/).
-	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"`
+	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
 	// Textual description, e.g. `Fixed-gear bicycle`.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Language code for `description` in BCP-47 format.
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Entity) Reset()                    { *m = Entity{} }
-func (m *Entity) String() string            { return proto.CompactTextString(m) }
-func (*Entity) ProtoMessage()               {}
-func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *Entity) Reset()         { *m = Entity{} }
+func (m *Entity) String() string { return proto.CompactTextString(m) }
+func (*Entity) ProtoMessage()    {}
+func (*Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{9}
+}
+func (m *Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Entity.Unmarshal(m, b)
+}
+func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
+}
+func (dst *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(dst, src)
+}
+func (m *Entity) XXX_Size() int {
+	return xxx_messageInfo_Entity.Size(m)
+}
+func (m *Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Entity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Entity proto.InternalMessageInfo
 
 func (m *Entity) GetEntityId() string {
 	if m != nil {
@@ -538,22 +735,44 @@ func (m *Entity) GetLanguageCode() string {
 // Label annotation.
 type LabelAnnotation struct {
 	// Detected entity.
-	Entity *Entity `protobuf:"bytes,1,opt,name=entity" json:"entity,omitempty"`
+	Entity *Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"`
 	// Common categories for the detected entity.
 	// E.g. when the label is `Terrier` the category is likely `dog`. And in some
 	// cases there might be more than one categories e.g. `Terrier` could also be
 	// a `pet`.
-	CategoryEntities []*Entity `protobuf:"bytes,2,rep,name=category_entities,json=categoryEntities" json:"category_entities,omitempty"`
+	CategoryEntities []*Entity `protobuf:"bytes,2,rep,name=category_entities,json=categoryEntities,proto3" json:"category_entities,omitempty"`
 	// All video segments where a label was detected.
-	Segments []*LabelSegment `protobuf:"bytes,3,rep,name=segments" json:"segments,omitempty"`
+	Segments []*LabelSegment `protobuf:"bytes,3,rep,name=segments,proto3" json:"segments,omitempty"`
 	// All video frames where a label was detected.
-	Frames []*LabelFrame `protobuf:"bytes,4,rep,name=frames" json:"frames,omitempty"`
+	Frames               []*LabelFrame `protobuf:"bytes,4,rep,name=frames,proto3" json:"frames,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
+func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
+func (*LabelAnnotation) ProtoMessage()    {}
+func (*LabelAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{10}
+}
+func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
+}
+func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+}
+func (m *LabelAnnotation) XXX_Size() int {
+	return xxx_messageInfo_LabelAnnotation.Size(m)
+}
+func (m *LabelAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelAnnotation.DiscardUnknown(m)
 }
 
-func (m *LabelAnnotation) Reset()                    { *m = LabelAnnotation{} }
-func (m *LabelAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*LabelAnnotation) ProtoMessage()               {}
-func (*LabelAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_LabelAnnotation proto.InternalMessageInfo
 
 func (m *LabelAnnotation) GetEntity() *Entity {
 	if m != nil {
@@ -587,17 +806,39 @@ func (m *LabelAnnotation) GetFrames() []*LabelFrame {
 type ExplicitContentFrame struct {
 	// Time-offset, relative to the beginning of the video, corresponding to the
 	// video frame for this location.
-	TimeOffset *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset" json:"time_offset,omitempty"`
+	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 	// Likelihood of the pornography content..
-	PornographyLikelihood Likelihood `protobuf:"varint,2,opt,name=pornography_likelihood,json=pornographyLikelihood,enum=google.cloud.videointelligence.v1beta2.Likelihood" json:"pornography_likelihood,omitempty"`
+	PornographyLikelihood Likelihood `protobuf:"varint,2,opt,name=pornography_likelihood,json=pornographyLikelihood,proto3,enum=google.cloud.videointelligence.v1beta2.Likelihood" json:"pornography_likelihood,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}   `json:"-"`
+	XXX_unrecognized      []byte     `json:"-"`
+	XXX_sizecache         int32      `json:"-"`
 }
 
-func (m *ExplicitContentFrame) Reset()                    { *m = ExplicitContentFrame{} }
-func (m *ExplicitContentFrame) String() string            { return proto.CompactTextString(m) }
-func (*ExplicitContentFrame) ProtoMessage()               {}
-func (*ExplicitContentFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *ExplicitContentFrame) Reset()         { *m = ExplicitContentFrame{} }
+func (m *ExplicitContentFrame) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentFrame) ProtoMessage()    {}
+func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{11}
+}
+func (m *ExplicitContentFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentFrame.Unmarshal(m, b)
+}
+func (m *ExplicitContentFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentFrame.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentFrame.Merge(dst, src)
+}
+func (m *ExplicitContentFrame) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentFrame.Size(m)
+}
+func (m *ExplicitContentFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentFrame.DiscardUnknown(m)
+}
 
-func (m *ExplicitContentFrame) GetTimeOffset() *google_protobuf3.Duration {
+var xxx_messageInfo_ExplicitContentFrame proto.InternalMessageInfo
+
+func (m *ExplicitContentFrame) GetTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.TimeOffset
 	}
@@ -616,13 +857,35 @@ func (m *ExplicitContentFrame) GetPornographyLikelihood() Likelihood {
 // present for that frame.
 type ExplicitContentAnnotation struct {
 	// All video frames where explicit content was detected.
-	Frames []*ExplicitContentFrame `protobuf:"bytes,1,rep,name=frames" json:"frames,omitempty"`
+	Frames               []*ExplicitContentFrame `protobuf:"bytes,1,rep,name=frames,proto3" json:"frames,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
 }
 
-func (m *ExplicitContentAnnotation) Reset()                    { *m = ExplicitContentAnnotation{} }
-func (m *ExplicitContentAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*ExplicitContentAnnotation) ProtoMessage()               {}
-func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *ExplicitContentAnnotation) Reset()         { *m = ExplicitContentAnnotation{} }
+func (m *ExplicitContentAnnotation) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentAnnotation) ProtoMessage()    {}
+func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{12}
+}
+func (m *ExplicitContentAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentAnnotation.Unmarshal(m, b)
+}
+func (m *ExplicitContentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentAnnotation.Merge(dst, src)
+}
+func (m *ExplicitContentAnnotation) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentAnnotation.Size(m)
+}
+func (m *ExplicitContentAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExplicitContentAnnotation proto.InternalMessageInfo
 
 func (m *ExplicitContentAnnotation) GetFrames() []*ExplicitContentFrame {
 	if m != nil {
@@ -636,19 +899,41 @@ func (m *ExplicitContentAnnotation) GetFrames() []*ExplicitContentFrame {
 // Range: [0, 1].
 type NormalizedBoundingBox struct {
 	// Left X coordinate.
-	Left float32 `protobuf:"fixed32,1,opt,name=left" json:"left,omitempty"`
+	Left float32 `protobuf:"fixed32,1,opt,name=left,proto3" json:"left,omitempty"`
 	// Top Y coordinate.
-	Top float32 `protobuf:"fixed32,2,opt,name=top" json:"top,omitempty"`
+	Top float32 `protobuf:"fixed32,2,opt,name=top,proto3" json:"top,omitempty"`
 	// Right X coordinate.
-	Right float32 `protobuf:"fixed32,3,opt,name=right" json:"right,omitempty"`
+	Right float32 `protobuf:"fixed32,3,opt,name=right,proto3" json:"right,omitempty"`
 	// Bottom Y coordinate.
-	Bottom float32 `protobuf:"fixed32,4,opt,name=bottom" json:"bottom,omitempty"`
+	Bottom               float32  `protobuf:"fixed32,4,opt,name=bottom,proto3" json:"bottom,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NormalizedBoundingBox) Reset()         { *m = NormalizedBoundingBox{} }
+func (m *NormalizedBoundingBox) String() string { return proto.CompactTextString(m) }
+func (*NormalizedBoundingBox) ProtoMessage()    {}
+func (*NormalizedBoundingBox) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{13}
+}
+func (m *NormalizedBoundingBox) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormalizedBoundingBox.Unmarshal(m, b)
+}
+func (m *NormalizedBoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormalizedBoundingBox.Marshal(b, m, deterministic)
+}
+func (dst *NormalizedBoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingBox.Merge(dst, src)
+}
+func (m *NormalizedBoundingBox) XXX_Size() int {
+	return xxx_messageInfo_NormalizedBoundingBox.Size(m)
+}
+func (m *NormalizedBoundingBox) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormalizedBoundingBox.DiscardUnknown(m)
 }
 
-func (m *NormalizedBoundingBox) Reset()                    { *m = NormalizedBoundingBox{} }
-func (m *NormalizedBoundingBox) String() string            { return proto.CompactTextString(m) }
-func (*NormalizedBoundingBox) ProtoMessage()               {}
-func (*NormalizedBoundingBox) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_NormalizedBoundingBox proto.InternalMessageInfo
 
 func (m *NormalizedBoundingBox) GetLeft() float32 {
 	if m != nil {
@@ -681,13 +966,35 @@ func (m *NormalizedBoundingBox) GetBottom() float32 {
 // Video segment level annotation results for face detection.
 type FaceSegment struct {
 	// Video segment where a face was detected.
-	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment" json:"segment,omitempty"`
+	Segment              *VideoSegment `protobuf:"bytes,1,opt,name=segment,proto3" json:"segment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *FaceSegment) Reset()                    { *m = FaceSegment{} }
-func (m *FaceSegment) String() string            { return proto.CompactTextString(m) }
-func (*FaceSegment) ProtoMessage()               {}
-func (*FaceSegment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *FaceSegment) Reset()         { *m = FaceSegment{} }
+func (m *FaceSegment) String() string { return proto.CompactTextString(m) }
+func (*FaceSegment) ProtoMessage()    {}
+func (*FaceSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{14}
+}
+func (m *FaceSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceSegment.Unmarshal(m, b)
+}
+func (m *FaceSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceSegment.Marshal(b, m, deterministic)
+}
+func (dst *FaceSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceSegment.Merge(dst, src)
+}
+func (m *FaceSegment) XXX_Size() int {
+	return xxx_messageInfo_FaceSegment.Size(m)
+}
+func (m *FaceSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceSegment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceSegment proto.InternalMessageInfo
 
 func (m *FaceSegment) GetSegment() *VideoSegment {
 	if m != nil {
@@ -701,16 +1008,38 @@ type FaceFrame struct {
 	// Normalized Bounding boxes in a frame.
 	// There can be more than one boxes if the same face is detected in multiple
 	// locations within the current frame.
-	NormalizedBoundingBoxes []*NormalizedBoundingBox `protobuf:"bytes,1,rep,name=normalized_bounding_boxes,json=normalizedBoundingBoxes" json:"normalized_bounding_boxes,omitempty"`
+	NormalizedBoundingBoxes []*NormalizedBoundingBox `protobuf:"bytes,1,rep,name=normalized_bounding_boxes,json=normalizedBoundingBoxes,proto3" json:"normalized_bounding_boxes,omitempty"`
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the video frame for this location.
-	TimeOffset *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset" json:"time_offset,omitempty"`
+	TimeOffset           *duration.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *FaceFrame) Reset()         { *m = FaceFrame{} }
+func (m *FaceFrame) String() string { return proto.CompactTextString(m) }
+func (*FaceFrame) ProtoMessage()    {}
+func (*FaceFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{15}
+}
+func (m *FaceFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceFrame.Unmarshal(m, b)
+}
+func (m *FaceFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceFrame.Marshal(b, m, deterministic)
+}
+func (dst *FaceFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceFrame.Merge(dst, src)
+}
+func (m *FaceFrame) XXX_Size() int {
+	return xxx_messageInfo_FaceFrame.Size(m)
+}
+func (m *FaceFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceFrame.DiscardUnknown(m)
 }
 
-func (m *FaceFrame) Reset()                    { *m = FaceFrame{} }
-func (m *FaceFrame) String() string            { return proto.CompactTextString(m) }
-func (*FaceFrame) ProtoMessage()               {}
-func (*FaceFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_FaceFrame proto.InternalMessageInfo
 
 func (m *FaceFrame) GetNormalizedBoundingBoxes() []*NormalizedBoundingBox {
 	if m != nil {
@@ -719,7 +1048,7 @@ func (m *FaceFrame) GetNormalizedBoundingBoxes() []*NormalizedBoundingBox {
 	return nil
 }
 
-func (m *FaceFrame) GetTimeOffset() *google_protobuf3.Duration {
+func (m *FaceFrame) GetTimeOffset() *duration.Duration {
 	if m != nil {
 		return m.TimeOffset
 	}
@@ -731,15 +1060,37 @@ type FaceAnnotation struct {
 	// Thumbnail of a representative face view (in JPEG format).
 	Thumbnail []byte `protobuf:"bytes,1,opt,name=thumbnail,proto3" json:"thumbnail,omitempty"`
 	// All video segments where a face was detected.
-	Segments []*FaceSegment `protobuf:"bytes,2,rep,name=segments" json:"segments,omitempty"`
+	Segments []*FaceSegment `protobuf:"bytes,2,rep,name=segments,proto3" json:"segments,omitempty"`
 	// All video frames where a face was detected.
-	Frames []*FaceFrame `protobuf:"bytes,3,rep,name=frames" json:"frames,omitempty"`
+	Frames               []*FaceFrame `protobuf:"bytes,3,rep,name=frames,proto3" json:"frames,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
+func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation) ProtoMessage()    {}
+func (*FaceAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{16}
+}
+func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
+}
+func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+}
+func (m *FaceAnnotation) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation.Size(m)
+}
+func (m *FaceAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation.DiscardUnknown(m)
 }
 
-func (m *FaceAnnotation) Reset()                    { *m = FaceAnnotation{} }
-func (m *FaceAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*FaceAnnotation) ProtoMessage()               {}
-func (*FaceAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_FaceAnnotation proto.InternalMessageInfo
 
 func (m *FaceAnnotation) GetThumbnail() []byte {
 	if m != nil {
@@ -766,31 +1117,53 @@ func (m *FaceAnnotation) GetFrames() []*FaceFrame {
 type VideoAnnotationResults struct {
 	// Video file location in
 	// [Google Cloud Storage](https://cloud.google.com/storage/).
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// Label annotations on video level or user specified segment level.
 	// There is exactly one element for each unique label.
-	SegmentLabelAnnotations []*LabelAnnotation `protobuf:"bytes,2,rep,name=segment_label_annotations,json=segmentLabelAnnotations" json:"segment_label_annotations,omitempty"`
+	SegmentLabelAnnotations []*LabelAnnotation `protobuf:"bytes,2,rep,name=segment_label_annotations,json=segmentLabelAnnotations,proto3" json:"segment_label_annotations,omitempty"`
 	// Label annotations on shot level.
 	// There is exactly one element for each unique label.
-	ShotLabelAnnotations []*LabelAnnotation `protobuf:"bytes,3,rep,name=shot_label_annotations,json=shotLabelAnnotations" json:"shot_label_annotations,omitempty"`
+	ShotLabelAnnotations []*LabelAnnotation `protobuf:"bytes,3,rep,name=shot_label_annotations,json=shotLabelAnnotations,proto3" json:"shot_label_annotations,omitempty"`
 	// Label annotations on frame level.
 	// There is exactly one element for each unique label.
-	FrameLabelAnnotations []*LabelAnnotation `protobuf:"bytes,4,rep,name=frame_label_annotations,json=frameLabelAnnotations" json:"frame_label_annotations,omitempty"`
+	FrameLabelAnnotations []*LabelAnnotation `protobuf:"bytes,4,rep,name=frame_label_annotations,json=frameLabelAnnotations,proto3" json:"frame_label_annotations,omitempty"`
 	// Face annotations. There is exactly one element for each unique face.
-	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,5,rep,name=face_annotations,json=faceAnnotations" json:"face_annotations,omitempty"`
+	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,5,rep,name=face_annotations,json=faceAnnotations,proto3" json:"face_annotations,omitempty"`
 	// Shot annotations. Each shot is represented as a video segment.
-	ShotAnnotations []*VideoSegment `protobuf:"bytes,6,rep,name=shot_annotations,json=shotAnnotations" json:"shot_annotations,omitempty"`
+	ShotAnnotations []*VideoSegment `protobuf:"bytes,6,rep,name=shot_annotations,json=shotAnnotations,proto3" json:"shot_annotations,omitempty"`
 	// Explicit content annotation.
-	ExplicitAnnotation *ExplicitContentAnnotation `protobuf:"bytes,7,opt,name=explicit_annotation,json=explicitAnnotation" json:"explicit_annotation,omitempty"`
+	ExplicitAnnotation *ExplicitContentAnnotation `protobuf:"bytes,7,opt,name=explicit_annotation,json=explicitAnnotation,proto3" json:"explicit_annotation,omitempty"`
 	// If set, indicates an error. Note that for a single `AnnotateVideoRequest`
 	// some videos may succeed and some may fail.
-	Error *google_rpc.Status `protobuf:"bytes,9,opt,name=error" json:"error,omitempty"`
+	Error                *status.Status `protobuf:"bytes,9,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *VideoAnnotationResults) Reset()                    { *m = VideoAnnotationResults{} }
-func (m *VideoAnnotationResults) String() string            { return proto.CompactTextString(m) }
-func (*VideoAnnotationResults) ProtoMessage()               {}
-func (*VideoAnnotationResults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{} }
+func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
+func (*VideoAnnotationResults) ProtoMessage()    {}
+func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{17}
+}
+func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
+}
+func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
+}
+func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+}
+func (m *VideoAnnotationResults) XXX_Size() int {
+	return xxx_messageInfo_VideoAnnotationResults.Size(m)
+}
+func (m *VideoAnnotationResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoAnnotationResults.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoAnnotationResults proto.InternalMessageInfo
 
 func (m *VideoAnnotationResults) GetInputUri() string {
 	if m != nil {
@@ -841,7 +1214,7 @@ func (m *VideoAnnotationResults) GetExplicitAnnotation() *ExplicitContentAnnotat
 	return nil
 }
 
-func (m *VideoAnnotationResults) GetError() *google_rpc.Status {
+func (m *VideoAnnotationResults) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
@@ -853,13 +1226,35 @@ func (m *VideoAnnotationResults) GetError() *google_rpc.Status {
 // call of the `google::longrunning::Operations` service.
 type AnnotateVideoResponse struct {
 	// Annotation results for all videos specified in `AnnotateVideoRequest`.
-	AnnotationResults []*VideoAnnotationResults `protobuf:"bytes,1,rep,name=annotation_results,json=annotationResults" json:"annotation_results,omitempty"`
+	AnnotationResults    []*VideoAnnotationResults `protobuf:"bytes,1,rep,name=annotation_results,json=annotationResults,proto3" json:"annotation_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
+func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoResponse) ProtoMessage()    {}
+func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{18}
+}
+func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
+}
+func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+}
+func (m *AnnotateVideoResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
+}
+func (m *AnnotateVideoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoResponse.DiscardUnknown(m)
 }
 
-func (m *AnnotateVideoResponse) Reset()                    { *m = AnnotateVideoResponse{} }
-func (m *AnnotateVideoResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoResponse) ProtoMessage()               {}
-func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_AnnotateVideoResponse proto.InternalMessageInfo
 
 func (m *AnnotateVideoResponse) GetAnnotationResults() []*VideoAnnotationResults {
 	if m != nil {
@@ -872,20 +1267,42 @@ func (m *AnnotateVideoResponse) GetAnnotationResults() []*VideoAnnotationResults
 type VideoAnnotationProgress struct {
 	// Video file location in
 	// [Google Cloud Storage](https://cloud.google.com/storage/).
-	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri" json:"input_uri,omitempty"`
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
 	// Approximate percentage processed thus far.
 	// Guaranteed to be 100 when fully processed.
-	ProgressPercent int32 `protobuf:"varint,2,opt,name=progress_percent,json=progressPercent" json:"progress_percent,omitempty"`
+	ProgressPercent int32 `protobuf:"varint,2,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 	// Time when the request was received.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time of the most recent update.
-	UpdateTime *google_protobuf4.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress{} }
+func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
+func (*VideoAnnotationProgress) ProtoMessage()    {}
+func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{19}
+}
+func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
+}
+func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
+}
+func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+}
+func (m *VideoAnnotationProgress) XXX_Size() int {
+	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
+}
+func (m *VideoAnnotationProgress) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoAnnotationProgress.DiscardUnknown(m)
 }
 
-func (m *VideoAnnotationProgress) Reset()                    { *m = VideoAnnotationProgress{} }
-func (m *VideoAnnotationProgress) String() string            { return proto.CompactTextString(m) }
-func (*VideoAnnotationProgress) ProtoMessage()               {}
-func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_VideoAnnotationProgress proto.InternalMessageInfo
 
 func (m *VideoAnnotationProgress) GetInputUri() string {
 	if m != nil {
@@ -901,14 +1318,14 @@ func (m *VideoAnnotationProgress) GetProgressPercent() int32 {
 	return 0
 }
 
-func (m *VideoAnnotationProgress) GetStartTime() *google_protobuf4.Timestamp {
+func (m *VideoAnnotationProgress) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *VideoAnnotationProgress) GetUpdateTime() *google_protobuf4.Timestamp {
+func (m *VideoAnnotationProgress) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -920,13 +1337,35 @@ func (m *VideoAnnotationProgress) GetUpdateTime() *google_protobuf4.Timestamp {
 // call of the `google::longrunning::Operations` service.
 type AnnotateVideoProgress struct {
 	// Progress metadata for all videos specified in `AnnotateVideoRequest`.
-	AnnotationProgress []*VideoAnnotationProgress `protobuf:"bytes,1,rep,name=annotation_progress,json=annotationProgress" json:"annotation_progress,omitempty"`
+	AnnotationProgress   []*VideoAnnotationProgress `protobuf:"bytes,1,rep,name=annotation_progress,json=annotationProgress,proto3" json:"annotation_progress,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *AnnotateVideoProgress) Reset()                    { *m = AnnotateVideoProgress{} }
-func (m *AnnotateVideoProgress) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateVideoProgress) ProtoMessage()               {}
-func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
+func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoProgress) ProtoMessage()    {}
+func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_c47a9b755759e2f4, []int{20}
+}
+func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
+}
+func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+}
+func (m *AnnotateVideoProgress) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
+}
+func (m *AnnotateVideoProgress) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoProgress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateVideoProgress proto.InternalMessageInfo
 
 func (m *AnnotateVideoProgress) GetAnnotationProgress() []*VideoAnnotationProgress {
 	if m != nil {
@@ -970,14 +1409,15 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for VideoIntelligenceService service
-
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VideoIntelligenceServiceClient interface {
 	// Performs asynchronous video annotation. Progress and results can be
 	// retrieved through the `google.longrunning.Operations` interface.
 	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
 	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type videoIntelligenceServiceClient struct {
@@ -988,23 +1428,22 @@ func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceSer
 	return &videoIntelligenceServiceClient{cc}
 }
 
-func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.cloud.videointelligence.v1beta2.VideoIntelligenceService/AnnotateVideo", in, out, c.cc, opts...)
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1beta2.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for VideoIntelligenceService service
-
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
 type VideoIntelligenceServiceServer interface {
 	// Performs asynchronous video annotation. Progress and results can be
 	// retrieved through the `google.longrunning.Operations` interface.
 	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
 	// `Operation.response` contains `AnnotateVideoResponse` (results).
-	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*google_longrunning.Operation, error)
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
 }
 
 func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
@@ -1043,10 +1482,10 @@ var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/videointelligence/v1beta2/video_intelligence.proto", fileDescriptor0)
+	proto.RegisterFile("google/cloud/videointelligence/v1beta2/video_intelligence.proto", fileDescriptor_video_intelligence_c47a9b755759e2f4)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_video_intelligence_c47a9b755759e2f4 = []byte{
 	// 1718 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0xdb, 0xc8,
 	0x15, 0x2f, 0x25, 0xd9, 0xb1, 0x9e, 0xff, 0x48, 0x19, 0xcb, 0xb6, 0xec, 0x26, 0x5e, 0x97, 0x29,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go
new file mode 100644
index 00000000..7e81664f
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/videointelligence/v1p1beta1/video_intelligence.pb.go
@@ -0,0 +1,1653 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/videointelligence/v1p1beta1/video_intelligence.proto
+
+package videointelligence // import "google.golang.org/genproto/googleapis/cloud/videointelligence/v1p1beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Video annotation feature.
+type Feature int32
+
+const (
+	// Unspecified.
+	Feature_FEATURE_UNSPECIFIED Feature = 0
+	// Label detection. Detect objects, such as dog or flower.
+	Feature_LABEL_DETECTION Feature = 1
+	// Shot change detection.
+	Feature_SHOT_CHANGE_DETECTION Feature = 2
+	// Explicit content detection.
+	Feature_EXPLICIT_CONTENT_DETECTION Feature = 3
+	// Speech transcription.
+	Feature_SPEECH_TRANSCRIPTION Feature = 6
+)
+
+var Feature_name = map[int32]string{
+	0: "FEATURE_UNSPECIFIED",
+	1: "LABEL_DETECTION",
+	2: "SHOT_CHANGE_DETECTION",
+	3: "EXPLICIT_CONTENT_DETECTION",
+	6: "SPEECH_TRANSCRIPTION",
+}
+var Feature_value = map[string]int32{
+	"FEATURE_UNSPECIFIED":        0,
+	"LABEL_DETECTION":            1,
+	"SHOT_CHANGE_DETECTION":      2,
+	"EXPLICIT_CONTENT_DETECTION": 3,
+	"SPEECH_TRANSCRIPTION":       6,
+}
+
+func (x Feature) String() string {
+	return proto.EnumName(Feature_name, int32(x))
+}
+func (Feature) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{0}
+}
+
+// Label detection mode.
+type LabelDetectionMode int32
+
+const (
+	// Unspecified.
+	LabelDetectionMode_LABEL_DETECTION_MODE_UNSPECIFIED LabelDetectionMode = 0
+	// Detect shot-level labels.
+	LabelDetectionMode_SHOT_MODE LabelDetectionMode = 1
+	// Detect frame-level labels.
+	LabelDetectionMode_FRAME_MODE LabelDetectionMode = 2
+	// Detect both shot-level and frame-level labels.
+	LabelDetectionMode_SHOT_AND_FRAME_MODE LabelDetectionMode = 3
+)
+
+var LabelDetectionMode_name = map[int32]string{
+	0: "LABEL_DETECTION_MODE_UNSPECIFIED",
+	1: "SHOT_MODE",
+	2: "FRAME_MODE",
+	3: "SHOT_AND_FRAME_MODE",
+}
+var LabelDetectionMode_value = map[string]int32{
+	"LABEL_DETECTION_MODE_UNSPECIFIED": 0,
+	"SHOT_MODE":                        1,
+	"FRAME_MODE":                       2,
+	"SHOT_AND_FRAME_MODE":              3,
+}
+
+func (x LabelDetectionMode) String() string {
+	return proto.EnumName(LabelDetectionMode_name, int32(x))
+}
+func (LabelDetectionMode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{1}
+}
+
+// Bucketized representation of likelihood.
+type Likelihood int32
+
+const (
+	// Unspecified likelihood.
+	Likelihood_LIKELIHOOD_UNSPECIFIED Likelihood = 0
+	// Very unlikely.
+	Likelihood_VERY_UNLIKELY Likelihood = 1
+	// Unlikely.
+	Likelihood_UNLIKELY Likelihood = 2
+	// Possible.
+	Likelihood_POSSIBLE Likelihood = 3
+	// Likely.
+	Likelihood_LIKELY Likelihood = 4
+	// Very likely.
+	Likelihood_VERY_LIKELY Likelihood = 5
+)
+
+var Likelihood_name = map[int32]string{
+	0: "LIKELIHOOD_UNSPECIFIED",
+	1: "VERY_UNLIKELY",
+	2: "UNLIKELY",
+	3: "POSSIBLE",
+	4: "LIKELY",
+	5: "VERY_LIKELY",
+}
+var Likelihood_value = map[string]int32{
+	"LIKELIHOOD_UNSPECIFIED": 0,
+	"VERY_UNLIKELY":          1,
+	"UNLIKELY":               2,
+	"POSSIBLE":               3,
+	"LIKELY":                 4,
+	"VERY_LIKELY":            5,
+}
+
+func (x Likelihood) String() string {
+	return proto.EnumName(Likelihood_name, int32(x))
+}
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{2}
+}
+
+// Video annotation request.
+type AnnotateVideoRequest struct {
+	// Input video location. Currently, only
+	// [Google Cloud Storage](https://cloud.google.com/storage/) URIs are
+	// supported, which must be specified in the following format:
+	// `gs://bucket-id/object-id` (other URI formats return
+	// [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
+	// [Request URIs](/storage/docs/reference-uris).
+	// A video URI may include wildcards in `object-id`, and thus identify
+	// multiple videos. Supported wildcards: '*' to match 0 or more characters;
+	// '?' to match 1 character. If unset, the input video should be embedded
+	// in the request as `input_content`. If set, `input_content` should be unset.
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
+	// The video data bytes.
+	// If unset, the input video(s) should be specified via `input_uri`.
+	// If set, `input_uri` should be unset.
+	InputContent []byte `protobuf:"bytes,6,opt,name=input_content,json=inputContent,proto3" json:"input_content,omitempty"`
+	// Requested video annotation features.
+	Features []Feature `protobuf:"varint,2,rep,packed,name=features,proto3,enum=google.cloud.videointelligence.v1p1beta1.Feature" json:"features,omitempty"`
+	// Additional video context and/or feature-specific parameters.
+	VideoContext *VideoContext `protobuf:"bytes,3,opt,name=video_context,json=videoContext,proto3" json:"video_context,omitempty"`
+	// Optional location where the output (in JSON format) should be stored.
+	// Currently, only [Google Cloud Storage](https://cloud.google.com/storage/)
+	// URIs are supported, which must be specified in the following format:
+	// `gs://bucket-id/object-id` (other URI formats return
+	// [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
+	// [Request URIs](/storage/docs/reference-uris).
+	OutputUri string `protobuf:"bytes,4,opt,name=output_uri,json=outputUri,proto3" json:"output_uri,omitempty"`
+	// Optional cloud region where annotation should take place. Supported cloud
+	// regions: `us-east1`, `us-west1`, `europe-west1`, `asia-east1`. If no region
+	// is specified, a region will be determined based on video file location.
+	LocationId           string   `protobuf:"bytes,5,opt,name=location_id,json=locationId,proto3" json:"location_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnnotateVideoRequest) Reset()         { *m = AnnotateVideoRequest{} }
+func (m *AnnotateVideoRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoRequest) ProtoMessage()    {}
+func (*AnnotateVideoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{0}
+}
+func (m *AnnotateVideoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoRequest.Unmarshal(m, b)
+}
+func (m *AnnotateVideoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoRequest.Merge(dst, src)
+}
+func (m *AnnotateVideoRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoRequest.Size(m)
+}
+func (m *AnnotateVideoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateVideoRequest proto.InternalMessageInfo
+
+func (m *AnnotateVideoRequest) GetInputUri() string {
+	if m != nil {
+		return m.InputUri
+	}
+	return ""
+}
+
+func (m *AnnotateVideoRequest) GetInputContent() []byte {
+	if m != nil {
+		return m.InputContent
+	}
+	return nil
+}
+
+func (m *AnnotateVideoRequest) GetFeatures() []Feature {
+	if m != nil {
+		return m.Features
+	}
+	return nil
+}
+
+func (m *AnnotateVideoRequest) GetVideoContext() *VideoContext {
+	if m != nil {
+		return m.VideoContext
+	}
+	return nil
+}
+
+func (m *AnnotateVideoRequest) GetOutputUri() string {
+	if m != nil {
+		return m.OutputUri
+	}
+	return ""
+}
+
+func (m *AnnotateVideoRequest) GetLocationId() string {
+	if m != nil {
+		return m.LocationId
+	}
+	return ""
+}
+
+// Video context and/or feature-specific parameters.
+type VideoContext struct {
+	// Video segments to annotate. The segments may overlap and are not required
+	// to be contiguous or span the whole video. If unspecified, each video is
+	// treated as a single segment.
+	Segments []*VideoSegment `protobuf:"bytes,1,rep,name=segments,proto3" json:"segments,omitempty"`
+	// Config for LABEL_DETECTION.
+	LabelDetectionConfig *LabelDetectionConfig `protobuf:"bytes,2,opt,name=label_detection_config,json=labelDetectionConfig,proto3" json:"label_detection_config,omitempty"`
+	// Config for SHOT_CHANGE_DETECTION.
+	ShotChangeDetectionConfig *ShotChangeDetectionConfig `protobuf:"bytes,3,opt,name=shot_change_detection_config,json=shotChangeDetectionConfig,proto3" json:"shot_change_detection_config,omitempty"`
+	// Config for EXPLICIT_CONTENT_DETECTION.
+	ExplicitContentDetectionConfig *ExplicitContentDetectionConfig `protobuf:"bytes,4,opt,name=explicit_content_detection_config,json=explicitContentDetectionConfig,proto3" json:"explicit_content_detection_config,omitempty"`
+	// Config for SPEECH_TRANSCRIPTION.
+	SpeechTranscriptionConfig *SpeechTranscriptionConfig `protobuf:"bytes,6,opt,name=speech_transcription_config,json=speechTranscriptionConfig,proto3" json:"speech_transcription_config,omitempty"`
+	XXX_NoUnkeyedLiteral      struct{}                   `json:"-"`
+	XXX_unrecognized          []byte                     `json:"-"`
+	XXX_sizecache             int32                      `json:"-"`
+}
+
+func (m *VideoContext) Reset()         { *m = VideoContext{} }
+func (m *VideoContext) String() string { return proto.CompactTextString(m) }
+func (*VideoContext) ProtoMessage()    {}
+func (*VideoContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{1}
+}
+func (m *VideoContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoContext.Unmarshal(m, b)
+}
+func (m *VideoContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoContext.Marshal(b, m, deterministic)
+}
+func (dst *VideoContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoContext.Merge(dst, src)
+}
+func (m *VideoContext) XXX_Size() int {
+	return xxx_messageInfo_VideoContext.Size(m)
+}
+func (m *VideoContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoContext proto.InternalMessageInfo
+
+func (m *VideoContext) GetSegments() []*VideoSegment {
+	if m != nil {
+		return m.Segments
+	}
+	return nil
+}
+
+func (m *VideoContext) GetLabelDetectionConfig() *LabelDetectionConfig {
+	if m != nil {
+		return m.LabelDetectionConfig
+	}
+	return nil
+}
+
+func (m *VideoContext) GetShotChangeDetectionConfig() *ShotChangeDetectionConfig {
+	if m != nil {
+		return m.ShotChangeDetectionConfig
+	}
+	return nil
+}
+
+func (m *VideoContext) GetExplicitContentDetectionConfig() *ExplicitContentDetectionConfig {
+	if m != nil {
+		return m.ExplicitContentDetectionConfig
+	}
+	return nil
+}
+
+func (m *VideoContext) GetSpeechTranscriptionConfig() *SpeechTranscriptionConfig {
+	if m != nil {
+		return m.SpeechTranscriptionConfig
+	}
+	return nil
+}
+
+// Config for LABEL_DETECTION.
+type LabelDetectionConfig struct {
+	// What labels should be detected with LABEL_DETECTION, in addition to
+	// video-level labels or segment-level labels.
+	// If unspecified, defaults to `SHOT_MODE`.
+	LabelDetectionMode LabelDetectionMode `protobuf:"varint,1,opt,name=label_detection_mode,json=labelDetectionMode,proto3,enum=google.cloud.videointelligence.v1p1beta1.LabelDetectionMode" json:"label_detection_mode,omitempty"`
+	// Whether the video has been shot from a stationary (i.e. non-moving) camera.
+	// When set to true, might improve detection accuracy for moving objects.
+	// Should be used with `SHOT_AND_FRAME_MODE` enabled.
+	StationaryCamera bool `protobuf:"varint,2,opt,name=stationary_camera,json=stationaryCamera,proto3" json:"stationary_camera,omitempty"`
+	// Model to use for label detection.
+	// Supported values: "builtin/stable" (the default if unset) and
+	// "builtin/latest".
+	Model                string   `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelDetectionConfig) Reset()         { *m = LabelDetectionConfig{} }
+func (m *LabelDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*LabelDetectionConfig) ProtoMessage()    {}
+func (*LabelDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{2}
+}
+func (m *LabelDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelDetectionConfig.Unmarshal(m, b)
+}
+func (m *LabelDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *LabelDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelDetectionConfig.Merge(dst, src)
+}
+func (m *LabelDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_LabelDetectionConfig.Size(m)
+}
+func (m *LabelDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelDetectionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LabelDetectionConfig proto.InternalMessageInfo
+
+func (m *LabelDetectionConfig) GetLabelDetectionMode() LabelDetectionMode {
+	if m != nil {
+		return m.LabelDetectionMode
+	}
+	return LabelDetectionMode_LABEL_DETECTION_MODE_UNSPECIFIED
+}
+
+func (m *LabelDetectionConfig) GetStationaryCamera() bool {
+	if m != nil {
+		return m.StationaryCamera
+	}
+	return false
+}
+
+func (m *LabelDetectionConfig) GetModel() string {
+	if m != nil {
+		return m.Model
+	}
+	return ""
+}
+
+// Config for SHOT_CHANGE_DETECTION.
+type ShotChangeDetectionConfig struct {
+	// Model to use for shot change detection.
+	// Supported values: "builtin/stable" (the default if unset) and
+	// "builtin/latest".
+	Model                string   `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ShotChangeDetectionConfig) Reset()         { *m = ShotChangeDetectionConfig{} }
+func (m *ShotChangeDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*ShotChangeDetectionConfig) ProtoMessage()    {}
+func (*ShotChangeDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{3}
+}
+func (m *ShotChangeDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Unmarshal(m, b)
+}
+func (m *ShotChangeDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *ShotChangeDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ShotChangeDetectionConfig.Merge(dst, src)
+}
+func (m *ShotChangeDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_ShotChangeDetectionConfig.Size(m)
+}
+func (m *ShotChangeDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ShotChangeDetectionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ShotChangeDetectionConfig proto.InternalMessageInfo
+
+func (m *ShotChangeDetectionConfig) GetModel() string {
+	if m != nil {
+		return m.Model
+	}
+	return ""
+}
+
+// Config for EXPLICIT_CONTENT_DETECTION.
+type ExplicitContentDetectionConfig struct {
+	// Model to use for explicit content detection.
+	// Supported values: "builtin/stable" (the default if unset) and
+	// "builtin/latest".
+	Model                string   `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExplicitContentDetectionConfig) Reset()         { *m = ExplicitContentDetectionConfig{} }
+func (m *ExplicitContentDetectionConfig) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentDetectionConfig) ProtoMessage()    {}
+func (*ExplicitContentDetectionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{4}
+}
+func (m *ExplicitContentDetectionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Unmarshal(m, b)
+}
+func (m *ExplicitContentDetectionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentDetectionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentDetectionConfig.Merge(dst, src)
+}
+func (m *ExplicitContentDetectionConfig) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentDetectionConfig.Size(m)
+}
+func (m *ExplicitContentDetectionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentDetectionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExplicitContentDetectionConfig proto.InternalMessageInfo
+
+func (m *ExplicitContentDetectionConfig) GetModel() string {
+	if m != nil {
+		return m.Model
+	}
+	return ""
+}
+
+// Video segment.
+type VideoSegment struct {
+	// Time-offset, relative to the beginning of the video,
+	// corresponding to the start of the segment (inclusive).
+	StartTimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	// Time-offset, relative to the beginning of the video,
+	// corresponding to the end of the segment (inclusive).
+	EndTimeOffset        *duration.Duration `protobuf:"bytes,2,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *VideoSegment) Reset()         { *m = VideoSegment{} }
+func (m *VideoSegment) String() string { return proto.CompactTextString(m) }
+func (*VideoSegment) ProtoMessage()    {}
+func (*VideoSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{5}
+}
+func (m *VideoSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoSegment.Unmarshal(m, b)
+}
+func (m *VideoSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoSegment.Marshal(b, m, deterministic)
+}
+func (dst *VideoSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoSegment.Merge(dst, src)
+}
+func (m *VideoSegment) XXX_Size() int {
+	return xxx_messageInfo_VideoSegment.Size(m)
+}
+func (m *VideoSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoSegment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoSegment proto.InternalMessageInfo
+
+func (m *VideoSegment) GetStartTimeOffset() *duration.Duration {
+	if m != nil {
+		return m.StartTimeOffset
+	}
+	return nil
+}
+
+func (m *VideoSegment) GetEndTimeOffset() *duration.Duration {
+	if m != nil {
+		return m.EndTimeOffset
+	}
+	return nil
+}
+
+// Video segment level annotation results for label detection.
+type LabelSegment struct {
+	// Video segment where a label was detected.
+	Segment *VideoSegment `protobuf:"bytes,1,opt,name=segment,proto3" json:"segment,omitempty"`
+	// Confidence that the label is accurate. Range: [0, 1].
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelSegment) Reset()         { *m = LabelSegment{} }
+func (m *LabelSegment) String() string { return proto.CompactTextString(m) }
+func (*LabelSegment) ProtoMessage()    {}
+func (*LabelSegment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{6}
+}
+func (m *LabelSegment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelSegment.Unmarshal(m, b)
+}
+func (m *LabelSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelSegment.Marshal(b, m, deterministic)
+}
+func (dst *LabelSegment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelSegment.Merge(dst, src)
+}
+func (m *LabelSegment) XXX_Size() int {
+	return xxx_messageInfo_LabelSegment.Size(m)
+}
+func (m *LabelSegment) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelSegment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LabelSegment proto.InternalMessageInfo
+
+func (m *LabelSegment) GetSegment() *VideoSegment {
+	if m != nil {
+		return m.Segment
+	}
+	return nil
+}
+
+func (m *LabelSegment) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Video frame level annotation results for label detection.
+type LabelFrame struct {
+	// Time-offset, relative to the beginning of the video, corresponding to the
+	// video frame for this location.
+	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	// Confidence that the label is accurate. Range: [0, 1].
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LabelFrame) Reset()         { *m = LabelFrame{} }
+func (m *LabelFrame) String() string { return proto.CompactTextString(m) }
+func (*LabelFrame) ProtoMessage()    {}
+func (*LabelFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{7}
+}
+func (m *LabelFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelFrame.Unmarshal(m, b)
+}
+func (m *LabelFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelFrame.Marshal(b, m, deterministic)
+}
+func (dst *LabelFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelFrame.Merge(dst, src)
+}
+func (m *LabelFrame) XXX_Size() int {
+	return xxx_messageInfo_LabelFrame.Size(m)
+}
+func (m *LabelFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelFrame.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LabelFrame proto.InternalMessageInfo
+
+func (m *LabelFrame) GetTimeOffset() *duration.Duration {
+	if m != nil {
+		return m.TimeOffset
+	}
+	return nil
+}
+
+func (m *LabelFrame) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Detected entity from video analysis.
+type Entity struct {
+	// Opaque entity ID. Some IDs may be available in
+	// [Google Knowledge Graph Search
+	// API](https://developers.google.com/knowledge-graph/).
+	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
+	// Textual description, e.g. `Fixed-gear bicycle`.
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	// Language code for `description` in BCP-47 format.
+	LanguageCode         string   `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Entity) Reset()         { *m = Entity{} }
+func (m *Entity) String() string { return proto.CompactTextString(m) }
+func (*Entity) ProtoMessage()    {}
+func (*Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{8}
+}
+func (m *Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Entity.Unmarshal(m, b)
+}
+func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
+}
+func (dst *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(dst, src)
+}
+func (m *Entity) XXX_Size() int {
+	return xxx_messageInfo_Entity.Size(m)
+}
+func (m *Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Entity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Entity proto.InternalMessageInfo
+
+func (m *Entity) GetEntityId() string {
+	if m != nil {
+		return m.EntityId
+	}
+	return ""
+}
+
+func (m *Entity) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *Entity) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+// Label annotation.
+type LabelAnnotation struct {
+	// Detected entity.
+	Entity *Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"`
+	// Common categories for the detected entity.
+	// E.g. when the label is `Terrier` the category is likely `dog`. And in some
+	// cases there might be more than one categories e.g. `Terrier` could also be
+	// a `pet`.
+	CategoryEntities []*Entity `protobuf:"bytes,2,rep,name=category_entities,json=categoryEntities,proto3" json:"category_entities,omitempty"`
+	// All video segments where a label was detected.
+	Segments []*LabelSegment `protobuf:"bytes,3,rep,name=segments,proto3" json:"segments,omitempty"`
+	// All video frames where a label was detected.
+	Frames               []*LabelFrame `protobuf:"bytes,4,rep,name=frames,proto3" json:"frames,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *LabelAnnotation) Reset()         { *m = LabelAnnotation{} }
+func (m *LabelAnnotation) String() string { return proto.CompactTextString(m) }
+func (*LabelAnnotation) ProtoMessage()    {}
+func (*LabelAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{9}
+}
+func (m *LabelAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LabelAnnotation.Unmarshal(m, b)
+}
+func (m *LabelAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LabelAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *LabelAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LabelAnnotation.Merge(dst, src)
+}
+func (m *LabelAnnotation) XXX_Size() int {
+	return xxx_messageInfo_LabelAnnotation.Size(m)
+}
+func (m *LabelAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_LabelAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LabelAnnotation proto.InternalMessageInfo
+
+func (m *LabelAnnotation) GetEntity() *Entity {
+	if m != nil {
+		return m.Entity
+	}
+	return nil
+}
+
+func (m *LabelAnnotation) GetCategoryEntities() []*Entity {
+	if m != nil {
+		return m.CategoryEntities
+	}
+	return nil
+}
+
+func (m *LabelAnnotation) GetSegments() []*LabelSegment {
+	if m != nil {
+		return m.Segments
+	}
+	return nil
+}
+
+func (m *LabelAnnotation) GetFrames() []*LabelFrame {
+	if m != nil {
+		return m.Frames
+	}
+	return nil
+}
+
+// Video frame level annotation results for explicit content.
+type ExplicitContentFrame struct {
+	// Time-offset, relative to the beginning of the video, corresponding to the
+	// video frame for this location.
+	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	// Likelihood of the pornography content..
+	PornographyLikelihood Likelihood `protobuf:"varint,2,opt,name=pornography_likelihood,json=pornographyLikelihood,proto3,enum=google.cloud.videointelligence.v1p1beta1.Likelihood" json:"pornography_likelihood,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}   `json:"-"`
+	XXX_unrecognized      []byte     `json:"-"`
+	XXX_sizecache         int32      `json:"-"`
+}
+
+func (m *ExplicitContentFrame) Reset()         { *m = ExplicitContentFrame{} }
+func (m *ExplicitContentFrame) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentFrame) ProtoMessage()    {}
+func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{10}
+}
+func (m *ExplicitContentFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentFrame.Unmarshal(m, b)
+}
+func (m *ExplicitContentFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentFrame.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentFrame.Merge(dst, src)
+}
+func (m *ExplicitContentFrame) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentFrame.Size(m)
+}
+func (m *ExplicitContentFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentFrame.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExplicitContentFrame proto.InternalMessageInfo
+
+func (m *ExplicitContentFrame) GetTimeOffset() *duration.Duration {
+	if m != nil {
+		return m.TimeOffset
+	}
+	return nil
+}
+
+func (m *ExplicitContentFrame) GetPornographyLikelihood() Likelihood {
+	if m != nil {
+		return m.PornographyLikelihood
+	}
+	return Likelihood_LIKELIHOOD_UNSPECIFIED
+}
+
+// Explicit content annotation (based on per-frame visual signals only).
+// If no explicit content has been detected in a frame, no annotations are
+// present for that frame.
+type ExplicitContentAnnotation struct {
+	// All video frames where explicit content was detected.
+	Frames               []*ExplicitContentFrame `protobuf:"bytes,1,rep,name=frames,proto3" json:"frames,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *ExplicitContentAnnotation) Reset()         { *m = ExplicitContentAnnotation{} }
+func (m *ExplicitContentAnnotation) String() string { return proto.CompactTextString(m) }
+func (*ExplicitContentAnnotation) ProtoMessage()    {}
+func (*ExplicitContentAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{11}
+}
+func (m *ExplicitContentAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExplicitContentAnnotation.Unmarshal(m, b)
+}
+func (m *ExplicitContentAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExplicitContentAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *ExplicitContentAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExplicitContentAnnotation.Merge(dst, src)
+}
+func (m *ExplicitContentAnnotation) XXX_Size() int {
+	return xxx_messageInfo_ExplicitContentAnnotation.Size(m)
+}
+func (m *ExplicitContentAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExplicitContentAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExplicitContentAnnotation proto.InternalMessageInfo
+
+func (m *ExplicitContentAnnotation) GetFrames() []*ExplicitContentFrame {
+	if m != nil {
+		return m.Frames
+	}
+	return nil
+}
+
+// Annotation results for a single video.
+type VideoAnnotationResults struct {
+	// Output only. Video file location in
+	// [Google Cloud Storage](https://cloud.google.com/storage/).
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
+	// Label annotations on video level or user specified segment level.
+	// There is exactly one element for each unique label.
+	SegmentLabelAnnotations []*LabelAnnotation `protobuf:"bytes,2,rep,name=segment_label_annotations,json=segmentLabelAnnotations,proto3" json:"segment_label_annotations,omitempty"`
+	// Label annotations on shot level.
+	// There is exactly one element for each unique label.
+	ShotLabelAnnotations []*LabelAnnotation `protobuf:"bytes,3,rep,name=shot_label_annotations,json=shotLabelAnnotations,proto3" json:"shot_label_annotations,omitempty"`
+	// Label annotations on frame level.
+	// There is exactly one element for each unique label.
+	FrameLabelAnnotations []*LabelAnnotation `protobuf:"bytes,4,rep,name=frame_label_annotations,json=frameLabelAnnotations,proto3" json:"frame_label_annotations,omitempty"`
+	// Shot annotations. Each shot is represented as a video segment.
+	ShotAnnotations []*VideoSegment `protobuf:"bytes,6,rep,name=shot_annotations,json=shotAnnotations,proto3" json:"shot_annotations,omitempty"`
+	// Explicit content annotation.
+	ExplicitAnnotation *ExplicitContentAnnotation `protobuf:"bytes,7,opt,name=explicit_annotation,json=explicitAnnotation,proto3" json:"explicit_annotation,omitempty"`
+	// Speech transcription.
+	SpeechTranscriptions []*SpeechTranscription `protobuf:"bytes,11,rep,name=speech_transcriptions,json=speechTranscriptions,proto3" json:"speech_transcriptions,omitempty"`
+	// Output only. If set, indicates an error. Note that for a single
+	// `AnnotateVideoRequest` some videos may succeed and some may fail.
+	Error                *status.Status `protobuf:"bytes,9,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *VideoAnnotationResults) Reset()         { *m = VideoAnnotationResults{} }
+func (m *VideoAnnotationResults) String() string { return proto.CompactTextString(m) }
+func (*VideoAnnotationResults) ProtoMessage()    {}
+func (*VideoAnnotationResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{12}
+}
+func (m *VideoAnnotationResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoAnnotationResults.Unmarshal(m, b)
+}
+func (m *VideoAnnotationResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoAnnotationResults.Marshal(b, m, deterministic)
+}
+func (dst *VideoAnnotationResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationResults.Merge(dst, src)
+}
+func (m *VideoAnnotationResults) XXX_Size() int {
+	return xxx_messageInfo_VideoAnnotationResults.Size(m)
+}
+func (m *VideoAnnotationResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoAnnotationResults.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoAnnotationResults proto.InternalMessageInfo
+
+func (m *VideoAnnotationResults) GetInputUri() string {
+	if m != nil {
+		return m.InputUri
+	}
+	return ""
+}
+
+func (m *VideoAnnotationResults) GetSegmentLabelAnnotations() []*LabelAnnotation {
+	if m != nil {
+		return m.SegmentLabelAnnotations
+	}
+	return nil
+}
+
+func (m *VideoAnnotationResults) GetShotLabelAnnotations() []*LabelAnnotation {
+	if m != nil {
+		return m.ShotLabelAnnotations
+	}
+	return nil
+}
+
+func (m *VideoAnnotationResults) GetFrameLabelAnnotations() []*LabelAnnotation {
+	if m != nil {
+		return m.FrameLabelAnnotations
+	}
+	return nil
+}
+
+func (m *VideoAnnotationResults) GetShotAnnotations() []*VideoSegment {
+	if m != nil {
+		return m.ShotAnnotations
+	}
+	return nil
+}
+
+func (m *VideoAnnotationResults) GetExplicitAnnotation() *ExplicitContentAnnotation {
+	if m != nil {
+		return m.ExplicitAnnotation
+	}
+	return nil
+}
+
+func (m *VideoAnnotationResults) GetSpeechTranscriptions() []*SpeechTranscription {
+	if m != nil {
+		return m.SpeechTranscriptions
+	}
+	return nil
+}
+
+func (m *VideoAnnotationResults) GetError() *status.Status {
+	if m != nil {
+		return m.Error
+	}
+	return nil
+}
+
+// Video annotation response. Included in the `response`
+// field of the `Operation` returned by the `GetOperation`
+// call of the `google::longrunning::Operations` service.
+type AnnotateVideoResponse struct {
+	// Annotation results for all videos specified in `AnnotateVideoRequest`.
+	AnnotationResults    []*VideoAnnotationResults `protobuf:"bytes,1,rep,name=annotation_results,json=annotationResults,proto3" json:"annotation_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *AnnotateVideoResponse) Reset()         { *m = AnnotateVideoResponse{} }
+func (m *AnnotateVideoResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoResponse) ProtoMessage()    {}
+func (*AnnotateVideoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{13}
+}
+func (m *AnnotateVideoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoResponse.Unmarshal(m, b)
+}
+func (m *AnnotateVideoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoResponse.Merge(dst, src)
+}
+func (m *AnnotateVideoResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoResponse.Size(m)
+}
+func (m *AnnotateVideoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateVideoResponse proto.InternalMessageInfo
+
+func (m *AnnotateVideoResponse) GetAnnotationResults() []*VideoAnnotationResults {
+	if m != nil {
+		return m.AnnotationResults
+	}
+	return nil
+}
+
+// Annotation progress for a single video.
+type VideoAnnotationProgress struct {
+	// Output only. Video file location in
+	// [Google Cloud Storage](https://cloud.google.com/storage/).
+	InputUri string `protobuf:"bytes,1,opt,name=input_uri,json=inputUri,proto3" json:"input_uri,omitempty"`
+	// Output only. Approximate percentage processed thus far. Guaranteed to be
+	// 100 when fully processed.
+	ProgressPercent int32 `protobuf:"varint,2,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
+	// Output only. Time when the request was received.
+	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// Output only. Time of the most recent update.
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *VideoAnnotationProgress) Reset()         { *m = VideoAnnotationProgress{} }
+func (m *VideoAnnotationProgress) String() string { return proto.CompactTextString(m) }
+func (*VideoAnnotationProgress) ProtoMessage()    {}
+func (*VideoAnnotationProgress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{14}
+}
+func (m *VideoAnnotationProgress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VideoAnnotationProgress.Unmarshal(m, b)
+}
+func (m *VideoAnnotationProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VideoAnnotationProgress.Marshal(b, m, deterministic)
+}
+func (dst *VideoAnnotationProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VideoAnnotationProgress.Merge(dst, src)
+}
+func (m *VideoAnnotationProgress) XXX_Size() int {
+	return xxx_messageInfo_VideoAnnotationProgress.Size(m)
+}
+func (m *VideoAnnotationProgress) XXX_DiscardUnknown() {
+	xxx_messageInfo_VideoAnnotationProgress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VideoAnnotationProgress proto.InternalMessageInfo
+
+func (m *VideoAnnotationProgress) GetInputUri() string {
+	if m != nil {
+		return m.InputUri
+	}
+	return ""
+}
+
+func (m *VideoAnnotationProgress) GetProgressPercent() int32 {
+	if m != nil {
+		return m.ProgressPercent
+	}
+	return 0
+}
+
+func (m *VideoAnnotationProgress) GetStartTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.StartTime
+	}
+	return nil
+}
+
+func (m *VideoAnnotationProgress) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
+// Video annotation progress. Included in the `metadata`
+// field of the `Operation` returned by the `GetOperation`
+// call of the `google::longrunning::Operations` service.
+type AnnotateVideoProgress struct {
+	// Progress metadata for all videos specified in `AnnotateVideoRequest`.
+	AnnotationProgress   []*VideoAnnotationProgress `protobuf:"bytes,1,rep,name=annotation_progress,json=annotationProgress,proto3" json:"annotation_progress,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *AnnotateVideoProgress) Reset()         { *m = AnnotateVideoProgress{} }
+func (m *AnnotateVideoProgress) String() string { return proto.CompactTextString(m) }
+func (*AnnotateVideoProgress) ProtoMessage()    {}
+func (*AnnotateVideoProgress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{15}
+}
+func (m *AnnotateVideoProgress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateVideoProgress.Unmarshal(m, b)
+}
+func (m *AnnotateVideoProgress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateVideoProgress.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateVideoProgress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateVideoProgress.Merge(dst, src)
+}
+func (m *AnnotateVideoProgress) XXX_Size() int {
+	return xxx_messageInfo_AnnotateVideoProgress.Size(m)
+}
+func (m *AnnotateVideoProgress) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateVideoProgress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateVideoProgress proto.InternalMessageInfo
+
+func (m *AnnotateVideoProgress) GetAnnotationProgress() []*VideoAnnotationProgress {
+	if m != nil {
+		return m.AnnotationProgress
+	}
+	return nil
+}
+
+// Config for SPEECH_TRANSCRIPTION.
+type SpeechTranscriptionConfig struct {
+	// *Required* The language of the supplied audio as a
+	// [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
+	// Example: "en-US".
+	// See [Language Support](https://cloud.google.com/speech/docs/languages)
+	// for a list of the currently supported language codes.
+	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// *Optional* Maximum number of recognition hypotheses to be returned.
+	// Specifically, the maximum number of `SpeechRecognitionAlternative` messages
+	// within each `SpeechRecognitionResult`. The server may return fewer than
+	// `max_alternatives`. Valid values are `0`-`30`. A value of `0` or `1` will
+	// return a maximum of one. If omitted, will return a maximum of one.
+	MaxAlternatives int32 `protobuf:"varint,2,opt,name=max_alternatives,json=maxAlternatives,proto3" json:"max_alternatives,omitempty"`
+	// *Optional* If set to `true`, the server will attempt to filter out
+	// profanities, replacing all but the initial character in each filtered word
+	// with asterisks, e.g. "f***". If set to `false` or omitted, profanities
+	// won't be filtered out.
+	FilterProfanity bool `protobuf:"varint,3,opt,name=filter_profanity,json=filterProfanity,proto3" json:"filter_profanity,omitempty"`
+	// *Optional* A means to provide context to assist the speech recognition.
+	SpeechContexts []*SpeechContext `protobuf:"bytes,4,rep,name=speech_contexts,json=speechContexts,proto3" json:"speech_contexts,omitempty"`
+	// *Optional* If 'true', adds punctuation to recognition result hypotheses.
+	// This feature is only available in select languages. Setting this for
+	// requests in other languages has no effect at all. The default 'false' value
+	// does not add punctuation to result hypotheses. NOTE: "This is currently
+	// offered as an experimental service, complimentary to all users. In the
+	// future this may be exclusively available as a premium feature."
+	EnableAutomaticPunctuation bool `protobuf:"varint,5,opt,name=enable_automatic_punctuation,json=enableAutomaticPunctuation,proto3" json:"enable_automatic_punctuation,omitempty"`
+	// *Optional* For file formats, such as MXF or MKV, supporting multiple audio
+	// tracks, specify up to two tracks. Default: track 0.
+	AudioTracks          []int32  `protobuf:"varint,6,rep,packed,name=audio_tracks,json=audioTracks,proto3" json:"audio_tracks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SpeechTranscriptionConfig) Reset()         { *m = SpeechTranscriptionConfig{} }
+func (m *SpeechTranscriptionConfig) String() string { return proto.CompactTextString(m) }
+func (*SpeechTranscriptionConfig) ProtoMessage()    {}
+func (*SpeechTranscriptionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{16}
+}
+func (m *SpeechTranscriptionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechTranscriptionConfig.Unmarshal(m, b)
+}
+func (m *SpeechTranscriptionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechTranscriptionConfig.Marshal(b, m, deterministic)
+}
+func (dst *SpeechTranscriptionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechTranscriptionConfig.Merge(dst, src)
+}
+func (m *SpeechTranscriptionConfig) XXX_Size() int {
+	return xxx_messageInfo_SpeechTranscriptionConfig.Size(m)
+}
+func (m *SpeechTranscriptionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechTranscriptionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpeechTranscriptionConfig proto.InternalMessageInfo
+
+func (m *SpeechTranscriptionConfig) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *SpeechTranscriptionConfig) GetMaxAlternatives() int32 {
+	if m != nil {
+		return m.MaxAlternatives
+	}
+	return 0
+}
+
+func (m *SpeechTranscriptionConfig) GetFilterProfanity() bool {
+	if m != nil {
+		return m.FilterProfanity
+	}
+	return false
+}
+
+func (m *SpeechTranscriptionConfig) GetSpeechContexts() []*SpeechContext {
+	if m != nil {
+		return m.SpeechContexts
+	}
+	return nil
+}
+
+func (m *SpeechTranscriptionConfig) GetEnableAutomaticPunctuation() bool {
+	if m != nil {
+		return m.EnableAutomaticPunctuation
+	}
+	return false
+}
+
+func (m *SpeechTranscriptionConfig) GetAudioTracks() []int32 {
+	if m != nil {
+		return m.AudioTracks
+	}
+	return nil
+}
+
+// Provides "hints" to the speech recognizer to favor specific words and phrases
+// in the results.
+type SpeechContext struct {
+	// *Optional* A list of strings containing words and phrases "hints" so that
+	// the speech recognition is more likely to recognize them. This can be used
+	// to improve the accuracy for specific words and phrases, for example, if
+	// specific commands are typically spoken by the user. This can also be used
+	// to add additional words to the vocabulary of the recognizer. See
+	// [usage limits](https://cloud.google.com/speech/limits#content).
+	Phrases              []string `protobuf:"bytes,1,rep,name=phrases,proto3" json:"phrases,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SpeechContext) Reset()         { *m = SpeechContext{} }
+func (m *SpeechContext) String() string { return proto.CompactTextString(m) }
+func (*SpeechContext) ProtoMessage()    {}
+func (*SpeechContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{17}
+}
+func (m *SpeechContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechContext.Unmarshal(m, b)
+}
+func (m *SpeechContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechContext.Marshal(b, m, deterministic)
+}
+func (dst *SpeechContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechContext.Merge(dst, src)
+}
+func (m *SpeechContext) XXX_Size() int {
+	return xxx_messageInfo_SpeechContext.Size(m)
+}
+func (m *SpeechContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpeechContext proto.InternalMessageInfo
+
+func (m *SpeechContext) GetPhrases() []string {
+	if m != nil {
+		return m.Phrases
+	}
+	return nil
+}
+
+// A speech recognition result corresponding to a portion of the audio.
+type SpeechTranscription struct {
+	// Output only. May contain one or more recognition hypotheses (up to the
+	// maximum specified in `max_alternatives`).
+	// These alternatives are ordered in terms of accuracy, with the top (first)
+	// alternative being the most probable, as ranked by the recognizer.
+	Alternatives         []*SpeechRecognitionAlternative `protobuf:"bytes,1,rep,name=alternatives,proto3" json:"alternatives,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
+}
+
+func (m *SpeechTranscription) Reset()         { *m = SpeechTranscription{} }
+func (m *SpeechTranscription) String() string { return proto.CompactTextString(m) }
+func (*SpeechTranscription) ProtoMessage()    {}
+func (*SpeechTranscription) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{18}
+}
+func (m *SpeechTranscription) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechTranscription.Unmarshal(m, b)
+}
+func (m *SpeechTranscription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechTranscription.Marshal(b, m, deterministic)
+}
+func (dst *SpeechTranscription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechTranscription.Merge(dst, src)
+}
+func (m *SpeechTranscription) XXX_Size() int {
+	return xxx_messageInfo_SpeechTranscription.Size(m)
+}
+func (m *SpeechTranscription) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechTranscription.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpeechTranscription proto.InternalMessageInfo
+
+func (m *SpeechTranscription) GetAlternatives() []*SpeechRecognitionAlternative {
+	if m != nil {
+		return m.Alternatives
+	}
+	return nil
+}
+
+// Alternative hypotheses (a.k.a. n-best list).
+type SpeechRecognitionAlternative struct {
+	// Output only. Transcript text representing the words that the user spoke.
+	Transcript string `protobuf:"bytes,1,opt,name=transcript,proto3" json:"transcript,omitempty"`
+	// Output only. The confidence estimate between 0.0 and 1.0. A higher number
+	// indicates an estimated greater likelihood that the recognized words are
+	// correct. This field is typically provided only for the top hypothesis, and
+	// only for `is_final=true` results. Clients should not rely on the
+	// `confidence` field as it is not guaranteed to be accurate or consistent.
+	// The default of 0.0 is a sentinel value indicating `confidence` was not set.
+	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	// Output only. A list of word-specific information for each recognized word.
+	Words                []*WordInfo `protobuf:"bytes,3,rep,name=words,proto3" json:"words,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *SpeechRecognitionAlternative) Reset()         { *m = SpeechRecognitionAlternative{} }
+func (m *SpeechRecognitionAlternative) String() string { return proto.CompactTextString(m) }
+func (*SpeechRecognitionAlternative) ProtoMessage()    {}
+func (*SpeechRecognitionAlternative) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{19}
+}
+func (m *SpeechRecognitionAlternative) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Unmarshal(m, b)
+}
+func (m *SpeechRecognitionAlternative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Marshal(b, m, deterministic)
+}
+func (dst *SpeechRecognitionAlternative) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpeechRecognitionAlternative.Merge(dst, src)
+}
+func (m *SpeechRecognitionAlternative) XXX_Size() int {
+	return xxx_messageInfo_SpeechRecognitionAlternative.Size(m)
+}
+func (m *SpeechRecognitionAlternative) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpeechRecognitionAlternative.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpeechRecognitionAlternative proto.InternalMessageInfo
+
+func (m *SpeechRecognitionAlternative) GetTranscript() string {
+	if m != nil {
+		return m.Transcript
+	}
+	return ""
+}
+
+func (m *SpeechRecognitionAlternative) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+func (m *SpeechRecognitionAlternative) GetWords() []*WordInfo {
+	if m != nil {
+		return m.Words
+	}
+	return nil
+}
+
+// Word-specific information for recognized words. Word information is only
+// included in the response when certain request parameters are set, such
+// as `enable_word_time_offsets`.
+type WordInfo struct {
+	// Output only. Time offset relative to the beginning of the audio, and
+	// corresponding to the start of the spoken word. This field is only set if
+	// `enable_word_time_offsets=true` and only in the top hypothesis. This is an
+	// experimental feature and the accuracy of the time offset can vary.
+	StartTime *duration.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// Output only. Time offset relative to the beginning of the audio, and
+	// corresponding to the end of the spoken word. This field is only set if
+	// `enable_word_time_offsets=true` and only in the top hypothesis. This is an
+	// experimental feature and the accuracy of the time offset can vary.
+	EndTime *duration.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	// Output only. The word corresponding to this set of information.
+	Word                 string   `protobuf:"bytes,3,opt,name=word,proto3" json:"word,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WordInfo) Reset()         { *m = WordInfo{} }
+func (m *WordInfo) String() string { return proto.CompactTextString(m) }
+func (*WordInfo) ProtoMessage()    {}
+func (*WordInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_video_intelligence_71473a3943b6ba10, []int{20}
+}
+func (m *WordInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WordInfo.Unmarshal(m, b)
+}
+func (m *WordInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WordInfo.Marshal(b, m, deterministic)
+}
+func (dst *WordInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WordInfo.Merge(dst, src)
+}
+func (m *WordInfo) XXX_Size() int {
+	return xxx_messageInfo_WordInfo.Size(m)
+}
+func (m *WordInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_WordInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WordInfo proto.InternalMessageInfo
+
+func (m *WordInfo) GetStartTime() *duration.Duration {
+	if m != nil {
+		return m.StartTime
+	}
+	return nil
+}
+
+func (m *WordInfo) GetEndTime() *duration.Duration {
+	if m != nil {
+		return m.EndTime
+	}
+	return nil
+}
+
+func (m *WordInfo) GetWord() string {
+	if m != nil {
+		return m.Word
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*AnnotateVideoRequest)(nil), "google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest")
+	proto.RegisterType((*VideoContext)(nil), "google.cloud.videointelligence.v1p1beta1.VideoContext")
+	proto.RegisterType((*LabelDetectionConfig)(nil), "google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig")
+	proto.RegisterType((*ShotChangeDetectionConfig)(nil), "google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig")
+	proto.RegisterType((*ExplicitContentDetectionConfig)(nil), "google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig")
+	proto.RegisterType((*VideoSegment)(nil), "google.cloud.videointelligence.v1p1beta1.VideoSegment")
+	proto.RegisterType((*LabelSegment)(nil), "google.cloud.videointelligence.v1p1beta1.LabelSegment")
+	proto.RegisterType((*LabelFrame)(nil), "google.cloud.videointelligence.v1p1beta1.LabelFrame")
+	proto.RegisterType((*Entity)(nil), "google.cloud.videointelligence.v1p1beta1.Entity")
+	proto.RegisterType((*LabelAnnotation)(nil), "google.cloud.videointelligence.v1p1beta1.LabelAnnotation")
+	proto.RegisterType((*ExplicitContentFrame)(nil), "google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame")
+	proto.RegisterType((*ExplicitContentAnnotation)(nil), "google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation")
+	proto.RegisterType((*VideoAnnotationResults)(nil), "google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults")
+	proto.RegisterType((*AnnotateVideoResponse)(nil), "google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse")
+	proto.RegisterType((*VideoAnnotationProgress)(nil), "google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress")
+	proto.RegisterType((*AnnotateVideoProgress)(nil), "google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress")
+	proto.RegisterType((*SpeechTranscriptionConfig)(nil), "google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig")
+	proto.RegisterType((*SpeechContext)(nil), "google.cloud.videointelligence.v1p1beta1.SpeechContext")
+	proto.RegisterType((*SpeechTranscription)(nil), "google.cloud.videointelligence.v1p1beta1.SpeechTranscription")
+	proto.RegisterType((*SpeechRecognitionAlternative)(nil), "google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative")
+	proto.RegisterType((*WordInfo)(nil), "google.cloud.videointelligence.v1p1beta1.WordInfo")
+	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.Feature", Feature_name, Feature_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.LabelDetectionMode", LabelDetectionMode_name, LabelDetectionMode_value)
+	proto.RegisterEnum("google.cloud.videointelligence.v1p1beta1.Likelihood", Likelihood_name, Likelihood_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// VideoIntelligenceServiceClient is the client API for VideoIntelligenceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type VideoIntelligenceServiceClient interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type videoIntelligenceServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewVideoIntelligenceServiceClient(cc *grpc.ClientConn) VideoIntelligenceServiceClient {
+	return &videoIntelligenceServiceClient{cc}
+}
+
+func (c *videoIntelligenceServiceClient) AnnotateVideo(ctx context.Context, in *AnnotateVideoRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService/AnnotateVideo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// VideoIntelligenceServiceServer is the server API for VideoIntelligenceService service.
+type VideoIntelligenceServiceServer interface {
+	// Performs asynchronous video annotation. Progress and results can be
+	// retrieved through the `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `AnnotateVideoProgress` (progress).
+	// `Operation.response` contains `AnnotateVideoResponse` (results).
+	AnnotateVideo(context.Context, *AnnotateVideoRequest) (*longrunning.Operation, error)
+}
+
+func RegisterVideoIntelligenceServiceServer(s *grpc.Server, srv VideoIntelligenceServiceServer) {
+	s.RegisterService(&_VideoIntelligenceService_serviceDesc, srv)
+}
+
+func _VideoIntelligenceService_AnnotateVideo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AnnotateVideoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService/AnnotateVideo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VideoIntelligenceServiceServer).AnnotateVideo(ctx, req.(*AnnotateVideoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _VideoIntelligenceService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.videointelligence.v1p1beta1.VideoIntelligenceService",
+	HandlerType: (*VideoIntelligenceServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "AnnotateVideo",
+			Handler:    _VideoIntelligenceService_AnnotateVideo_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/videointelligence/v1p1beta1/video_intelligence.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/videointelligence/v1p1beta1/video_intelligence.proto", fileDescriptor_video_intelligence_71473a3943b6ba10)
+}
+
+var fileDescriptor_video_intelligence_71473a3943b6ba10 = []byte{
+	// 1807 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xcd, 0x6f, 0x23, 0x49,
+	0x15, 0xa7, 0xed, 0xc4, 0x89, 0x9f, 0x9d, 0xd8, 0x53, 0x71, 0x12, 0x27, 0x3b, 0x93, 0xc9, 0xf6,
+	0x82, 0x94, 0x1d, 0x90, 0x4d, 0xc2, 0x6a, 0x61, 0x67, 0x61, 0xb5, 0x8e, 0xd3, 0xd9, 0x58, 0x64,
+	0x62, 0xab, 0xec, 0x09, 0x0c, 0x0c, 0x6a, 0x3a, 0xdd, 0xe5, 0x4e, 0x33, 0xed, 0xae, 0xde, 0xee,
+	0xea, 0x30, 0x73, 0x5b, 0x3e, 0x24, 0x90, 0x40, 0x5c, 0x46, 0x48, 0xfc, 0x09, 0x88, 0x23, 0xff,
+	0x00, 0x17, 0x2e, 0x70, 0xe5, 0x84, 0x04, 0x37, 0xfe, 0x0b, 0x2e, 0xab, 0xae, 0xaa, 0xb6, 0xdb,
+	0x76, 0xbe, 0x9c, 0xdc, 0xdc, 0xef, 0xe3, 0xf7, 0x3e, 0xea, 0xd5, 0x7b, 0xaf, 0x0c, 0x0d, 0x9b,
+	0x52, 0xdb, 0x25, 0x75, 0xd3, 0xa5, 0x91, 0x55, 0xbf, 0x70, 0x2c, 0x42, 0x1d, 0x8f, 0x11, 0xd7,
+	0x75, 0x6c, 0xe2, 0x99, 0xa4, 0x7e, 0xb1, 0xeb, 0xef, 0x9e, 0x11, 0x66, 0xec, 0x0a, 0x9e, 0x9e,
+	0x66, 0xd6, 0xfc, 0x80, 0x32, 0x8a, 0x76, 0x04, 0x44, 0x8d, 0x43, 0xd4, 0xa6, 0x20, 0x6a, 0x43,
+	0x88, 0xcd, 0x87, 0xd2, 0x98, 0xe1, 0x3b, 0x75, 0xc3, 0xf3, 0x28, 0x33, 0x98, 0x43, 0xbd, 0x50,
+	0xe0, 0x6c, 0xbe, 0x27, 0xb9, 0x2e, 0xf5, 0xec, 0x20, 0xf2, 0x3c, 0xc7, 0xb3, 0xeb, 0xd4, 0x27,
+	0xc1, 0x98, 0xd0, 0x96, 0x14, 0xe2, 0x5f, 0x67, 0x51, 0xbf, 0x6e, 0x45, 0x42, 0x40, 0xf2, 0x1f,
+	0x4f, 0xf2, 0x99, 0x33, 0x20, 0x21, 0x33, 0x06, 0xbe, 0x14, 0x58, 0x97, 0x02, 0x81, 0x6f, 0xd6,
+	0x43, 0x66, 0xb0, 0x48, 0x22, 0xab, 0x7f, 0xcf, 0x40, 0xa5, 0x21, 0x9c, 0x22, 0xa7, 0x71, 0x10,
+	0x98, 0x7c, 0x1e, 0x91, 0x90, 0xa1, 0x77, 0x20, 0xef, 0x78, 0x7e, 0xc4, 0xf4, 0x28, 0x70, 0xaa,
+	0xca, 0xb6, 0xb2, 0x93, 0xc7, 0x8b, 0x9c, 0xf0, 0x3c, 0x70, 0xd0, 0x7b, 0xb0, 0x24, 0x98, 0x26,
+	0xf5, 0x18, 0xf1, 0x58, 0x35, 0xb7, 0xad, 0xec, 0x14, 0x71, 0x91, 0x13, 0x9b, 0x82, 0x86, 0x9e,
+	0xc1, 0x62, 0x9f, 0x18, 0x2c, 0x0a, 0x48, 0x58, 0xcd, 0x6c, 0x67, 0x77, 0x96, 0xf7, 0x76, 0x6b,
+	0xb7, 0x4d, 0x5a, 0xed, 0x50, 0x68, 0xe2, 0x21, 0x04, 0xfa, 0x31, 0x2c, 0x89, 0xc3, 0xe0, 0x36,
+	0x5f, 0xb3, 0x6a, 0x76, 0x5b, 0xd9, 0x29, 0xec, 0x7d, 0x78, 0x7b, 0x4c, 0x1e, 0x5f, 0x53, 0x68,
+	0xe3, 0xe2, 0x45, 0xea, 0x0b, 0x3d, 0x02, 0xa0, 0x11, 0x4b, 0xc2, 0x9d, 0xe3, 0xe1, 0xe6, 0x05,
+	0x25, 0x8e, 0xf7, 0x31, 0x14, 0x5c, 0x6a, 0xf2, 0x8c, 0xeb, 0x8e, 0x55, 0x9d, 0xe7, 0x7c, 0x48,
+	0x48, 0x2d, 0x4b, 0xfd, 0xff, 0x1c, 0x14, 0xd3, 0xf0, 0x08, 0xc3, 0x62, 0x48, 0xec, 0x01, 0xf1,
+	0x58, 0x58, 0x55, 0xb6, 0xb3, 0x77, 0x70, 0xb4, 0x2b, 0xd4, 0xf1, 0x10, 0x07, 0x31, 0x58, 0x73,
+	0x8d, 0x33, 0xe2, 0xea, 0x16, 0x61, 0xc4, 0xe4, 0xce, 0x98, 0xd4, 0xeb, 0x3b, 0x76, 0x35, 0xc3,
+	0x53, 0xf1, 0xc9, 0xed, 0x2d, 0x1c, 0xc7, 0x38, 0x07, 0x09, 0x4c, 0x93, 0xa3, 0xe0, 0x8a, 0x7b,
+	0x09, 0x15, 0xfd, 0x5a, 0x81, 0x87, 0xe1, 0x39, 0x65, 0xba, 0x79, 0x6e, 0x78, 0x36, 0x99, 0x36,
+	0x2e, 0xce, 0xa1, 0x79, 0x7b, 0xe3, 0xdd, 0x73, 0xca, 0x9a, 0x1c, 0x6c, 0xd2, 0x83, 0x8d, 0xf0,
+	0x2a, 0x16, 0x7a, 0xab, 0xc0, 0xbb, 0xe4, 0xb5, 0xef, 0x3a, 0xa6, 0x33, 0x2c, 0xbb, 0x69, 0x5f,
+	0xe6, 0xb8, 0x2f, 0x47, 0xb7, 0xf7, 0x45, 0x93, 0x90, 0xb2, 0x68, 0x27, 0x1d, 0xda, 0x22, 0xd7,
+	0xf2, 0xd1, 0xaf, 0x14, 0x78, 0x27, 0xf4, 0x09, 0x31, 0xcf, 0x75, 0x16, 0x18, 0x5e, 0x68, 0x06,
+	0x8e, 0x9f, 0xf6, 0x27, 0x37, 0x73, 0x6e, 0x38, 0x58, 0x2f, 0x8d, 0x35, 0xcc, 0xcd, 0x55, 0x2c,
+	0xf5, 0x1f, 0x0a, 0x54, 0x2e, 0x3b, 0x51, 0xe4, 0x41, 0x65, 0xb2, 0x62, 0x06, 0xd4, 0x22, 0xfc,
+	0x3e, 0x2f, 0xef, 0x7d, 0xf7, 0xae, 0xf5, 0xf2, 0x8c, 0x5a, 0x04, 0x23, 0x77, 0x8a, 0x86, 0xbe,
+	0x0e, 0x0f, 0x42, 0xd1, 0xde, 0x8c, 0xe0, 0x8d, 0x6e, 0x1a, 0x03, 0x12, 0x18, 0xbc, 0x38, 0x17,
+	0x71, 0x79, 0xc4, 0x68, 0x72, 0x3a, 0xaa, 0xc0, 0x7c, 0xec, 0x8c, 0xcb, 0x0b, 0x28, 0x8f, 0xc5,
+	0x87, 0xba, 0x0b, 0x1b, 0x57, 0xd6, 0xc7, 0x48, 0x45, 0x49, 0xab, 0x7c, 0x08, 0x5b, 0xd7, 0x1f,
+	0xe3, 0x15, 0x7a, 0x7f, 0x52, 0xe4, 0xa5, 0x95, 0x57, 0x0d, 0x69, 0xdc, 0xfd, 0x80, 0xe9, 0x71,
+	0xfb, 0xd4, 0x69, 0xbf, 0x1f, 0x12, 0xc6, 0x55, 0x0a, 0x7b, 0x1b, 0x49, 0xae, 0x92, 0x16, 0x5b,
+	0x3b, 0x90, 0x2d, 0x18, 0x97, 0xb8, 0x4e, 0xcf, 0x19, 0x90, 0x36, 0xd7, 0x40, 0x0d, 0x28, 0x11,
+	0xcf, 0x1a, 0x03, 0xc9, 0xdc, 0x04, 0xb2, 0x44, 0x3c, 0x6b, 0x04, 0xa1, 0x7e, 0xa1, 0x40, 0x91,
+	0xe7, 0x3c, 0x71, 0xad, 0x03, 0x0b, 0xb2, 0x0f, 0x48, 0x87, 0xee, 0xda, 0x4e, 0x12, 0x18, 0xb4,
+	0x05, 0xc0, 0x8b, 0xd4, 0x8a, 0xa5, 0xb9, 0x83, 0x19, 0x9c, 0xa2, 0xa8, 0xe7, 0x00, 0xdc, 0x83,
+	0xc3, 0xc0, 0x18, 0x10, 0xf4, 0x14, 0x0a, 0x33, 0x25, 0x05, 0xd8, 0x28, 0x1f, 0x37, 0x59, 0x72,
+	0x21, 0xa7, 0x79, 0xcc, 0x61, 0x6f, 0xe2, 0xa1, 0x43, 0xf8, 0xaf, 0xb8, 0xcb, 0xca, 0xa1, 0x23,
+	0x08, 0x2d, 0x0b, 0x6d, 0x43, 0xc1, 0x22, 0xc3, 0xd2, 0xe7, 0x38, 0x79, 0x9c, 0x26, 0xc5, 0x63,
+	0xc9, 0x35, 0x3c, 0x3b, 0x32, 0x6c, 0xa2, 0x9b, 0x71, 0x9d, 0x8b, 0xca, 0x2a, 0x26, 0xc4, 0x26,
+	0xb5, 0x88, 0xfa, 0x9f, 0x0c, 0x94, 0x78, 0x60, 0x8d, 0xe1, 0x2c, 0x46, 0x47, 0x90, 0x13, 0x66,
+	0x64, 0x60, 0xdf, 0x9c, 0xa1, 0x81, 0x70, 0x3d, 0x2c, 0xf5, 0xd1, 0x4f, 0xe0, 0x81, 0x69, 0x30,
+	0x62, 0xd3, 0xe0, 0x8d, 0xce, 0x49, 0x8e, 0x9c, 0x7e, 0x77, 0x01, 0x2d, 0x27, 0x50, 0x9a, 0x44,
+	0x1a, 0x1b, 0x2b, 0xd9, 0x59, 0xc7, 0x4a, 0xba, 0xa0, 0x52, 0x63, 0xe5, 0x18, 0x72, 0xfd, 0xf8,
+	0x8c, 0xc3, 0xea, 0x1c, 0x47, 0xfc, 0x60, 0x46, 0x44, 0x5e, 0x20, 0x58, 0x62, 0xa8, 0x7f, 0x53,
+	0xa0, 0x32, 0x71, 0x1b, 0xef, 0x5f, 0x41, 0xaf, 0x60, 0xcd, 0xa7, 0x81, 0x47, 0xed, 0xc0, 0xf0,
+	0xcf, 0xdf, 0xe8, 0xae, 0xf3, 0x8a, 0xb8, 0xce, 0x39, 0xa5, 0x16, 0xaf, 0x82, 0xe5, 0x99, 0x5c,
+	0x1e, 0xea, 0xe2, 0xd5, 0x14, 0xe6, 0x88, 0xac, 0x86, 0xb0, 0x31, 0x11, 0x40, 0xaa, 0x52, 0x4e,
+	0x87, 0xc9, 0x12, 0x53, 0xfd, 0x93, 0x3b, 0x8f, 0x9a, 0xf1, 0xb4, 0xfd, 0x26, 0x07, 0x6b, 0xfc,
+	0x9e, 0x8e, 0x6c, 0x61, 0x12, 0x46, 0x2e, 0x0b, 0xaf, 0xdf, 0xc4, 0x22, 0xd8, 0x90, 0x07, 0xa9,
+	0x8b, 0x4e, 0x9f, 0xda, 0x30, 0x65, 0xdd, 0x7d, 0x34, 0xe3, 0x79, 0xa6, 0x3c, 0x58, 0x97, 0xd8,
+	0x13, 0xf4, 0x10, 0x51, 0x58, 0xe3, 0x3b, 0xc1, 0xb4, 0xcd, 0xec, 0x7d, 0x6d, 0x56, 0x62, 0xe0,
+	0x29, 0x83, 0x9f, 0xc3, 0x3a, 0xcf, 0xd4, 0x25, 0x16, 0xe7, 0xee, 0x6b, 0x71, 0x95, 0x23, 0x4f,
+	0x99, 0x34, 0xa0, 0xcc, 0x63, 0x4c, 0xdb, 0xca, 0xdd, 0x6b, 0x95, 0x2b, 0xc5, 0x78, 0x69, 0x13,
+	0x0c, 0x56, 0x86, 0x3b, 0xcd, 0xc8, 0x4c, 0x75, 0x61, 0xd6, 0xad, 0xe1, 0xca, 0x7a, 0xc5, 0x28,
+	0xc1, 0x4f, 0xd5, 0x70, 0x00, 0xab, 0x97, 0xed, 0x2c, 0x61, 0xb5, 0xc0, 0xa3, 0xfb, 0xde, 0xbd,
+	0xb6, 0x15, 0x5c, 0xb9, 0x64, 0x4f, 0x09, 0xd1, 0x0e, 0xcc, 0x93, 0x20, 0xa0, 0x41, 0x35, 0xcf,
+	0x63, 0x43, 0x89, 0x8d, 0xc0, 0x37, 0x6b, 0x5d, 0xfe, 0x20, 0xc1, 0x42, 0x40, 0xfd, 0xad, 0x02,
+	0xab, 0x13, 0x2f, 0x92, 0xd0, 0xa7, 0x5e, 0x48, 0x10, 0x05, 0x34, 0x4a, 0x92, 0x1e, 0x88, 0xeb,
+	0x21, 0xef, 0xe1, 0xa7, 0x33, 0x1e, 0xc9, 0xd4, 0x35, 0xc3, 0x0f, 0x8c, 0x49, 0x92, 0xfa, 0x6f,
+	0x05, 0xd6, 0x27, 0xa4, 0x3b, 0x01, 0xb5, 0x03, 0x12, 0xde, 0x70, 0x2b, 0xdf, 0x87, 0xb2, 0x2f,
+	0x05, 0x75, 0x9f, 0x04, 0x66, 0x3c, 0xb6, 0xe3, 0x4e, 0x35, 0x8f, 0x4b, 0x09, 0xbd, 0x23, 0xc8,
+	0xe8, 0x23, 0x80, 0xd1, 0xce, 0x21, 0x77, 0xe9, 0xcd, 0xa9, 0xae, 0xd8, 0x4b, 0xde, 0x73, 0x38,
+	0x3f, 0xdc, 0x36, 0xd0, 0xc7, 0x50, 0x88, 0x7c, 0xcb, 0x60, 0x44, 0xe8, 0xce, 0xdd, 0xa8, 0x0b,
+	0x42, 0x3c, 0x26, 0xa8, 0xbf, 0x9b, 0x4c, 0xf3, 0x30, 0xb2, 0x00, 0x56, 0x52, 0x69, 0x4e, 0xfc,
+	0x95, 0x79, 0x6e, 0xdc, 0x39, 0xcf, 0x09, 0x3e, 0x4e, 0x1d, 0x62, 0x42, 0x53, 0xff, 0x9b, 0x81,
+	0x8d, 0x2b, 0x57, 0xdf, 0xe9, 0xb9, 0xae, 0x4c, 0xcf, 0xf5, 0x38, 0xe7, 0x03, 0xe3, 0xb5, 0x6e,
+	0xb8, 0x8c, 0x04, 0x9e, 0xc1, 0x9c, 0x0b, 0x3e, 0x78, 0x79, 0xce, 0x07, 0xc6, 0xeb, 0x46, 0x8a,
+	0x1c, 0x8b, 0xf6, 0x9d, 0x98, 0x10, 0x47, 0xd7, 0x37, 0xbc, 0x78, 0xf0, 0x67, 0xf9, 0x96, 0x5a,
+	0x12, 0xf4, 0x4e, 0x42, 0x46, 0x3f, 0x85, 0x92, 0xbc, 0x2b, 0xf2, 0xd9, 0x99, 0xf4, 0x9b, 0x6f,
+	0xcf, 0x7a, 0x4b, 0x92, 0x87, 0xe7, 0x72, 0x98, 0xfe, 0x0c, 0xd1, 0xa7, 0xf0, 0x90, 0x78, 0xc6,
+	0x99, 0x4b, 0x74, 0x23, 0x62, 0x74, 0x60, 0x30, 0xc7, 0xd4, 0xfd, 0xc8, 0x33, 0x59, 0x24, 0x9a,
+	0xc1, 0x3c, 0x77, 0x6c, 0x53, 0xc8, 0x34, 0x12, 0x91, 0xce, 0x48, 0x02, 0xbd, 0x0b, 0x45, 0x23,
+	0xb2, 0x1c, 0x1a, 0x5f, 0x67, 0xf3, 0x95, 0x68, 0x52, 0xf3, 0xb8, 0xc0, 0x69, 0x3d, 0x4e, 0x52,
+	0xdf, 0x87, 0xa5, 0x31, 0x2f, 0x50, 0x15, 0x16, 0xfc, 0xf3, 0xc0, 0x08, 0xe5, 0x20, 0xcb, 0xe3,
+	0xe4, 0x53, 0xfd, 0x85, 0x02, 0x2b, 0x97, 0x1c, 0x05, 0xfa, 0x19, 0x14, 0xc7, 0x72, 0x2b, 0xea,
+	0xe1, 0x70, 0xd6, 0x34, 0x60, 0x62, 0x52, 0xdb, 0x73, 0x62, 0xc8, 0xd4, 0x99, 0xe0, 0x31, 0x6c,
+	0xf5, 0xcf, 0x0a, 0x3c, 0xbc, 0x4e, 0x3c, 0x5e, 0x29, 0x47, 0xbd, 0x4b, 0x96, 0x43, 0x8a, 0x72,
+	0xd3, 0xca, 0x89, 0x8e, 0x60, 0xfe, 0xe7, 0x34, 0xb0, 0x92, 0x71, 0xb5, 0x77, 0xfb, 0x28, 0x7e,
+	0x40, 0x03, 0xab, 0xe5, 0xf5, 0x29, 0x16, 0x00, 0xea, 0x1f, 0x14, 0x58, 0x4c, 0x68, 0xe8, 0x3b,
+	0x63, 0x97, 0xf9, 0xc6, 0x15, 0x27, 0x75, 0x97, 0x3f, 0x80, 0xc5, 0xe4, 0xcd, 0x70, 0xf3, 0x63,
+	0x61, 0x41, 0x3e, 0x16, 0x10, 0x82, 0xb9, 0xd8, 0x0b, 0xb9, 0xe7, 0xf2, 0xdf, 0x4f, 0x7e, 0xaf,
+	0xc0, 0x82, 0xfc, 0xf7, 0x04, 0xad, 0xc3, 0xca, 0xa1, 0xd6, 0xe8, 0x3d, 0xc7, 0x9a, 0xfe, 0xfc,
+	0xa4, 0xdb, 0xd1, 0x9a, 0xad, 0xc3, 0x96, 0x76, 0x50, 0xfe, 0x0a, 0x5a, 0x81, 0xd2, 0x71, 0x63,
+	0x5f, 0x3b, 0xd6, 0x0f, 0xb4, 0x9e, 0xd6, 0xec, 0xb5, 0xda, 0x27, 0x65, 0x05, 0x6d, 0xc0, 0x6a,
+	0xf7, 0xa8, 0xdd, 0xd3, 0x9b, 0x47, 0x8d, 0x93, 0xcf, 0xb4, 0x14, 0x2b, 0x83, 0xb6, 0x60, 0x53,
+	0xfb, 0x61, 0xe7, 0xb8, 0xd5, 0x6c, 0xf5, 0xf4, 0x66, 0xfb, 0xa4, 0xa7, 0x9d, 0xf4, 0x52, 0xfc,
+	0x2c, 0xaa, 0x42, 0xa5, 0xdb, 0xd1, 0xb4, 0xe6, 0x91, 0xde, 0xc3, 0x8d, 0x93, 0x6e, 0x13, 0xb7,
+	0x3a, 0x9c, 0x93, 0x7b, 0x12, 0x00, 0x9a, 0x7e, 0x3c, 0xa2, 0xaf, 0xc2, 0xf6, 0x84, 0x7d, 0xfd,
+	0x59, 0xfb, 0x60, 0xd2, 0xcb, 0x25, 0xc8, 0x73, 0x87, 0x62, 0x56, 0x59, 0x41, 0xcb, 0x00, 0x87,
+	0xb8, 0xf1, 0x4c, 0x13, 0xdf, 0x99, 0x38, 0x3a, 0xce, 0x6e, 0x9c, 0x1c, 0xe8, 0x29, 0x46, 0xf6,
+	0x09, 0x03, 0x18, 0xed, 0x73, 0x68, 0x13, 0xd6, 0x8e, 0x5b, 0xdf, 0xd7, 0x8e, 0x5b, 0x47, 0xed,
+	0xf6, 0xc1, 0x84, 0x85, 0x07, 0xb0, 0x74, 0xaa, 0xe1, 0x17, 0xfa, 0xf3, 0x13, 0x2e, 0xf2, 0xa2,
+	0xac, 0xa0, 0x22, 0x2c, 0x0e, 0xbf, 0x32, 0xf1, 0x57, 0xa7, 0xdd, 0xed, 0xb6, 0xf6, 0x8f, 0xb5,
+	0x72, 0x16, 0x01, 0xe4, 0x24, 0x67, 0x0e, 0x95, 0xa0, 0xc0, 0x55, 0x25, 0x61, 0x7e, 0xef, 0xaf,
+	0x0a, 0x54, 0x79, 0xcf, 0x6b, 0xa5, 0x2a, 0xa7, 0x4b, 0x82, 0x0b, 0xc7, 0x24, 0xe8, 0x8f, 0x0a,
+	0x2c, 0x8d, 0xb5, 0x5b, 0x34, 0xc3, 0xe6, 0x78, 0xd9, 0x1f, 0x74, 0x9b, 0x8f, 0x12, 0xfd, 0xd4,
+	0x3f, 0x87, 0xb5, 0x76, 0xf2, 0xcf, 0xa1, 0xfa, 0xb5, 0x5f, 0xfe, 0xeb, 0x7f, 0x6f, 0x33, 0x8f,
+	0xd5, 0xcd, 0xc9, 0x3f, 0x33, 0xc3, 0xa7, 0xb2, 0xff, 0x92, 0xa7, 0xca, 0x93, 0xfd, 0x2f, 0x32,
+	0xf0, 0x0d, 0x93, 0x0e, 0x6e, 0xed, 0xcb, 0xfe, 0xa3, 0xab, 0x42, 0xec, 0xc4, 0x65, 0xda, 0x51,
+	0x7e, 0xf4, 0x42, 0x42, 0xd9, 0x34, 0x6e, 0xcf, 0x35, 0x1a, 0xd8, 0x75, 0x9b, 0x78, 0xbc, 0x88,
+	0xeb, 0x82, 0x65, 0xf8, 0x4e, 0x78, 0xf3, 0x5f, 0xaf, 0x1f, 0x4f, 0xf1, 0xfe, 0x92, 0xd9, 0xf9,
+	0x4c, 0x60, 0x37, 0xb9, 0x9b, 0x53, 0x9e, 0xd4, 0x4e, 0x77, 0x3b, 0xbb, 0xfb, 0xb1, 0xf2, 0x3f,
+	0x13, 0xd1, 0x97, 0x5c, 0xf4, 0xe5, 0x94, 0xe8, 0xcb, 0xd3, 0xc4, 0xce, 0x59, 0x8e, 0xfb, 0xf6,
+	0xad, 0x2f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x82, 0x99, 0xe4, 0x9b, 0x15, 0x16, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/geometry.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/geometry.pb.go
index f6812d95..6e1bb101 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/geometry.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/geometry.pb.go
@@ -1,49 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/geometry.proto
 
-/*
-Package vision is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/vision/v1/geometry.proto
-	google/cloud/vision/v1/image_annotator.proto
-	google/cloud/vision/v1/text_annotation.proto
-	google/cloud/vision/v1/web_detection.proto
-
-It has these top-level messages:
-	Vertex
-	BoundingPoly
-	Position
-	Feature
-	ImageSource
-	Image
-	FaceAnnotation
-	LocationInfo
-	Property
-	EntityAnnotation
-	SafeSearchAnnotation
-	LatLongRect
-	ColorInfo
-	DominantColorsAnnotation
-	ImageProperties
-	CropHint
-	CropHintsAnnotation
-	CropHintsParams
-	WebDetectionParams
-	ImageContext
-	AnnotateImageRequest
-	AnnotateImageResponse
-	BatchAnnotateImagesRequest
-	BatchAnnotateImagesResponse
-	TextAnnotation
-	Page
-	Block
-	Paragraph
-	Word
-	Symbol
-	WebDetection
-*/
-package vision
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -64,15 +22,37 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // NOTE: the vertex coordinates are in the same scale as the original image.
 type Vertex struct {
 	// X coordinate.
-	X int32 `protobuf:"varint,1,opt,name=x" json:"x,omitempty"`
+	X int32 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"`
 	// Y coordinate.
-	Y int32 `protobuf:"varint,2,opt,name=y" json:"y,omitempty"`
+	Y                    int32    `protobuf:"varint,2,opt,name=y,proto3" json:"y,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Vertex) Reset()                    { *m = Vertex{} }
-func (m *Vertex) String() string            { return proto.CompactTextString(m) }
-func (*Vertex) ProtoMessage()               {}
-func (*Vertex) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Vertex) Reset()         { *m = Vertex{} }
+func (m *Vertex) String() string { return proto.CompactTextString(m) }
+func (*Vertex) ProtoMessage()    {}
+func (*Vertex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_0f6b64e4b94968be, []int{0}
+}
+func (m *Vertex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Vertex.Unmarshal(m, b)
+}
+func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
+}
+func (dst *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(dst, src)
+}
+func (m *Vertex) XXX_Size() int {
+	return xxx_messageInfo_Vertex.Size(m)
+}
+func (m *Vertex) XXX_DiscardUnknown() {
+	xxx_messageInfo_Vertex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Vertex proto.InternalMessageInfo
 
 func (m *Vertex) GetX() int32 {
 	if m != nil {
@@ -88,16 +68,91 @@ func (m *Vertex) GetY() int32 {
 	return 0
 }
 
+// A vertex represents a 2D point in the image.
+// NOTE: the normalized vertex coordinates are relative to the original image
+// and range from 0 to 1.
+type NormalizedVertex struct {
+	// X coordinate.
+	X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"`
+	// Y coordinate.
+	Y                    float32  `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
+func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
+func (*NormalizedVertex) ProtoMessage()    {}
+func (*NormalizedVertex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_0f6b64e4b94968be, []int{1}
+}
+func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
+}
+func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
+}
+func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+}
+func (m *NormalizedVertex) XXX_Size() int {
+	return xxx_messageInfo_NormalizedVertex.Size(m)
+}
+func (m *NormalizedVertex) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormalizedVertex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NormalizedVertex proto.InternalMessageInfo
+
+func (m *NormalizedVertex) GetX() float32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *NormalizedVertex) GetY() float32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
 // A bounding polygon for the detected image annotation.
 type BoundingPoly struct {
 	// The bounding polygon vertices.
-	Vertices []*Vertex `protobuf:"bytes,1,rep,name=vertices" json:"vertices,omitempty"`
+	Vertices []*Vertex `protobuf:"bytes,1,rep,name=vertices,proto3" json:"vertices,omitempty"`
+	// The bounding polygon normalized vertices.
+	NormalizedVertices   []*NormalizedVertex `protobuf:"bytes,2,rep,name=normalized_vertices,json=normalizedVertices,proto3" json:"normalized_vertices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
+func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
+func (*BoundingPoly) ProtoMessage()    {}
+func (*BoundingPoly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_0f6b64e4b94968be, []int{2}
+}
+func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
+}
+func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
+}
+func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+}
+func (m *BoundingPoly) XXX_Size() int {
+	return xxx_messageInfo_BoundingPoly.Size(m)
+}
+func (m *BoundingPoly) XXX_DiscardUnknown() {
+	xxx_messageInfo_BoundingPoly.DiscardUnknown(m)
 }
 
-func (m *BoundingPoly) Reset()                    { *m = BoundingPoly{} }
-func (m *BoundingPoly) String() string            { return proto.CompactTextString(m) }
-func (*BoundingPoly) ProtoMessage()               {}
-func (*BoundingPoly) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_BoundingPoly proto.InternalMessageInfo
 
 func (m *BoundingPoly) GetVertices() []*Vertex {
 	if m != nil {
@@ -106,22 +161,51 @@ func (m *BoundingPoly) GetVertices() []*Vertex {
 	return nil
 }
 
+func (m *BoundingPoly) GetNormalizedVertices() []*NormalizedVertex {
+	if m != nil {
+		return m.NormalizedVertices
+	}
+	return nil
+}
+
 // A 3D position in the image, used primarily for Face detection landmarks.
 // A valid Position must have both x and y coordinates.
 // The position coordinates are in the same scale as the original image.
 type Position struct {
 	// X coordinate.
-	X float32 `protobuf:"fixed32,1,opt,name=x" json:"x,omitempty"`
+	X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"`
 	// Y coordinate.
-	Y float32 `protobuf:"fixed32,2,opt,name=y" json:"y,omitempty"`
+	Y float32 `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"`
 	// Z coordinate (or depth).
-	Z float32 `protobuf:"fixed32,3,opt,name=z" json:"z,omitempty"`
+	Z                    float32  `protobuf:"fixed32,3,opt,name=z,proto3" json:"z,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Position) Reset()                    { *m = Position{} }
-func (m *Position) String() string            { return proto.CompactTextString(m) }
-func (*Position) ProtoMessage()               {}
-func (*Position) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Position) Reset()         { *m = Position{} }
+func (m *Position) String() string { return proto.CompactTextString(m) }
+func (*Position) ProtoMessage()    {}
+func (*Position) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_0f6b64e4b94968be, []int{3}
+}
+func (m *Position) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Position.Unmarshal(m, b)
+}
+func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
+}
+func (dst *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(dst, src)
+}
+func (m *Position) XXX_Size() int {
+	return xxx_messageInfo_Position.Size(m)
+}
+func (m *Position) XXX_DiscardUnknown() {
+	xxx_messageInfo_Position.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Position proto.InternalMessageInfo
 
 func (m *Position) GetX() float32 {
 	if m != nil {
@@ -146,27 +230,33 @@ func (m *Position) GetZ() float32 {
 
 func init() {
 	proto.RegisterType((*Vertex)(nil), "google.cloud.vision.v1.Vertex")
+	proto.RegisterType((*NormalizedVertex)(nil), "google.cloud.vision.v1.NormalizedVertex")
 	proto.RegisterType((*BoundingPoly)(nil), "google.cloud.vision.v1.BoundingPoly")
 	proto.RegisterType((*Position)(nil), "google.cloud.vision.v1.Position")
 }
 
-func init() { proto.RegisterFile("google/cloud/vision/v1/geometry.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 237 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x31, 0x4b, 0x03, 0x31,
-	0x14, 0x80, 0x79, 0x57, 0x2c, 0x25, 0xd6, 0xe5, 0x06, 0x39, 0x1c, 0xa4, 0x1c, 0x0a, 0x9d, 0x12,
-	0xaa, 0x4e, 0xea, 0x74, 0x8b, 0xe0, 0x74, 0xdc, 0xe0, 0xe0, 0x56, 0xaf, 0x8f, 0x47, 0xe0, 0x9a,
-	0x57, 0x92, 0x34, 0x34, 0xfd, 0xe5, 0x8e, 0xd2, 0xa4, 0x28, 0x8a, 0xdd, 0xf2, 0x91, 0x8f, 0xf7,
-	0xf1, 0x9e, 0xb8, 0x25, 0x66, 0x1a, 0x50, 0xf5, 0x03, 0x6f, 0x57, 0x2a, 0x68, 0xa7, 0xd9, 0xa8,
-	0xb0, 0x50, 0x84, 0xbc, 0x46, 0x6f, 0xa3, 0xdc, 0x58, 0xf6, 0x5c, 0x5e, 0x66, 0x4d, 0x26, 0x4d,
-	0x66, 0x4d, 0x86, 0x45, 0x7d, 0x23, 0xc6, 0x6f, 0x68, 0x3d, 0xee, 0xca, 0xa9, 0x80, 0x5d, 0x05,
-	0x33, 0x98, 0x9f, 0x75, 0x90, 0x28, 0x56, 0x45, 0xa6, 0x58, 0xbf, 0x8a, 0x69, 0xc3, 0x5b, 0xb3,
-	0xd2, 0x86, 0x5a, 0x1e, 0x62, 0xf9, 0x28, 0x26, 0x01, 0xad, 0xd7, 0x3d, 0xba, 0x0a, 0x66, 0xa3,
-	0xf9, 0xf9, 0xdd, 0xb5, 0xfc, 0x3f, 0x20, 0xf3, 0xf4, 0xee, 0xdb, 0xaf, 0x1f, 0xc4, 0xa4, 0x65,
-	0xa7, 0xbd, 0x66, 0xf3, 0xd3, 0x2c, 0x7e, 0x35, 0x8b, 0x0e, 0xe2, 0x81, 0xf6, 0xd5, 0x28, 0xd3,
-	0xbe, 0x31, 0xe2, 0xaa, 0xe7, 0xf5, 0x89, 0x48, 0x73, 0xf1, 0x72, 0xdc, 0xb6, 0x3d, 0x2c, 0xdb,
-	0xc2, 0xfb, 0xf3, 0x51, 0x24, 0x1e, 0x96, 0x86, 0x24, 0x5b, 0x52, 0x84, 0x26, 0x9d, 0x42, 0xe5,
-	0xaf, 0xe5, 0x46, 0xbb, 0xbf, 0x47, 0x7b, 0xca, 0xaf, 0x4f, 0x80, 0x8f, 0x71, 0x72, 0xef, 0xbf,
-	0x02, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x04, 0x38, 0x95, 0x5f, 0x01, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1/geometry.proto", fileDescriptor_geometry_0f6b64e4b94968be)
+}
+
+var fileDescriptor_geometry_0f6b64e4b94968be = []byte{
+	// 285 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4b, 0xc3, 0x30,
+	0x14, 0xc7, 0x49, 0xa7, 0x63, 0xc4, 0x09, 0x52, 0x41, 0x8a, 0x07, 0x19, 0x45, 0xa1, 0xa7, 0x84,
+	0xa9, 0x27, 0xf5, 0x54, 0x0f, 0xbb, 0x8d, 0xd2, 0xc3, 0x40, 0x2f, 0x52, 0xdb, 0x10, 0x02, 0x69,
+	0xde, 0x48, 0xd3, 0xb2, 0xf6, 0xe3, 0x08, 0x7e, 0x47, 0x8f, 0xd2, 0x64, 0x14, 0x56, 0x9c, 0xb7,
+	0xfe, 0x9b, 0x5f, 0x7e, 0xef, 0xe5, 0x3d, 0x7c, 0xc7, 0x01, 0xb8, 0x64, 0x34, 0x97, 0x50, 0x17,
+	0xb4, 0x11, 0x95, 0x00, 0x45, 0x9b, 0x25, 0xe5, 0x0c, 0x4a, 0x66, 0x74, 0x4b, 0xb6, 0x1a, 0x0c,
+	0xf8, 0x57, 0x0e, 0x23, 0x16, 0x23, 0x0e, 0x23, 0xcd, 0x32, 0xbc, 0xc5, 0xd3, 0x0d, 0xd3, 0x86,
+	0xed, 0xfc, 0x39, 0x46, 0xbb, 0x00, 0x2d, 0x50, 0x74, 0x9a, 0x22, 0x9b, 0xda, 0xc0, 0x73, 0xa9,
+	0x0d, 0x09, 0xbe, 0x58, 0x83, 0x2e, 0x33, 0x29, 0x3a, 0x56, 0x8c, 0x79, 0xef, 0x80, 0xf7, 0x7a,
+	0xfe, 0x1b, 0xe1, 0x79, 0x0c, 0xb5, 0x2a, 0x84, 0xe2, 0x09, 0xc8, 0xd6, 0x7f, 0xc2, 0xb3, 0x86,
+	0x69, 0x23, 0x72, 0x56, 0x05, 0x68, 0x31, 0x89, 0xce, 0xee, 0x6f, 0xc8, 0xdf, 0x1d, 0x11, 0xa7,
+	0x4f, 0x07, 0xde, 0x7f, 0xc3, 0x97, 0x6a, 0x28, 0xfe, 0x31, 0x68, 0x3c, 0xab, 0x89, 0x8e, 0x69,
+	0xc6, 0xfd, 0xa6, 0xbe, 0x3a, 0xf8, 0xd3, 0x3b, 0xc2, 0x47, 0x3c, 0x4b, 0xa0, 0x12, 0x46, 0x80,
+	0xfa, 0xef, 0x3d, 0x7d, 0xea, 0x82, 0x89, 0x4b, 0x5d, 0x5c, 0xe3, 0xeb, 0x1c, 0xca, 0x23, 0x85,
+	0xe3, 0xf3, 0xd5, 0x7e, 0xf2, 0x49, 0x3f, 0xf8, 0x04, 0xbd, 0xbf, 0xec, 0x41, 0x0e, 0x32, 0x53,
+	0x9c, 0x80, 0xe6, 0x94, 0x33, 0x65, 0xd7, 0x42, 0xdd, 0x51, 0xb6, 0x15, 0xd5, 0x78, 0x81, 0xcf,
+	0xee, 0xeb, 0x07, 0xa1, 0x2f, 0xef, 0x64, 0xf5, 0xba, 0x59, 0x7f, 0x4e, 0xed, 0x95, 0x87, 0xdf,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x3c, 0x20, 0x46, 0xf2, 0x01, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/image_annotator.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/image_annotator.pb.go
index 231ac66d..bdb1d6ca 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/image_annotator.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/image_annotator.pb.go
@@ -1,15 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/image_annotator.proto
 
-package vision
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
-import google_type "google.golang.org/genproto/googleapis/type/color"
-import google_type1 "google.golang.org/genproto/googleapis/type/latlng"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import color "google.golang.org/genproto/googleapis/type/color"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +23,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A bucketized representation of likelihood, which is intended to give clients
 // highly stable results across model upgrades.
 type Likelihood int32
@@ -60,7 +68,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
-func (Likelihood) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{0}
+}
 
 // Type of Google Cloud Vision API feature to be extracted.
 type Feature_Type int32
@@ -125,7 +135,9 @@ var Feature_Type_value = map[string]int32{
 func (x Feature_Type) String() string {
 	return proto.EnumName(Feature_Type_name, int32(x))
 }
-func (Feature_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (Feature_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{0, 0}
+}
 
 // Face landmark (feature) type.
 // Left and right are defined from the vantage of the viewer of the image
@@ -285,7 +297,45 @@ func (x FaceAnnotation_Landmark_Type) String() string {
 	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
 }
 func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{3, 0, 0}
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{3, 0, 0}
+}
+
+// Batch operation states.
+type OperationMetadata_State int32
+
+const (
+	// Invalid.
+	OperationMetadata_STATE_UNSPECIFIED OperationMetadata_State = 0
+	// Request is received.
+	OperationMetadata_CREATED OperationMetadata_State = 1
+	// Request is actively being processed.
+	OperationMetadata_RUNNING OperationMetadata_State = 2
+	// The batch processing is done.
+	OperationMetadata_DONE OperationMetadata_State = 3
+	// The batch processing was cancelled.
+	OperationMetadata_CANCELLED OperationMetadata_State = 4
+)
+
+var OperationMetadata_State_name = map[int32]string{
+	0: "STATE_UNSPECIFIED",
+	1: "CREATED",
+	2: "RUNNING",
+	3: "DONE",
+	4: "CANCELLED",
+}
+var OperationMetadata_State_value = map[string]int32{
+	"STATE_UNSPECIFIED": 0,
+	"CREATED":           1,
+	"RUNNING":           2,
+	"DONE":              3,
+	"CANCELLED":         4,
+}
+
+func (x OperationMetadata_State) String() string {
+	return proto.EnumName(OperationMetadata_State_name, int32(x))
+}
+func (OperationMetadata_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{31, 0}
 }
 
 // The type of Google Cloud Vision API detection to perform, and the maximum
@@ -293,20 +343,42 @@ func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
 // be specified in the `features` list.
 type Feature struct {
 	// The feature type.
-	Type Feature_Type `protobuf:"varint,1,opt,name=type,enum=google.cloud.vision.v1.Feature_Type" json:"type,omitempty"`
+	Type Feature_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.vision.v1.Feature_Type" json:"type,omitempty"`
 	// Maximum number of results of this type. Does not apply to
 	// `TEXT_DETECTION`, `DOCUMENT_TEXT_DETECTION`, or `CROP_HINTS`.
-	MaxResults int32 `protobuf:"varint,2,opt,name=max_results,json=maxResults" json:"max_results,omitempty"`
+	MaxResults int32 `protobuf:"varint,2,opt,name=max_results,json=maxResults,proto3" json:"max_results,omitempty"`
 	// Model to use for the feature.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,3,opt,name=model" json:"model,omitempty"`
+	Model                string   `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Feature) Reset()                    { *m = Feature{} }
-func (m *Feature) String() string            { return proto.CompactTextString(m) }
-func (*Feature) ProtoMessage()               {}
-func (*Feature) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *Feature) Reset()         { *m = Feature{} }
+func (m *Feature) String() string { return proto.CompactTextString(m) }
+func (*Feature) ProtoMessage()    {}
+func (*Feature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{0}
+}
+func (m *Feature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Feature.Unmarshal(m, b)
+}
+func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
+}
+func (dst *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(dst, src)
+}
+func (m *Feature) XXX_Size() int {
+	return xxx_messageInfo_Feature.Size(m)
+}
+func (m *Feature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Feature.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Feature proto.InternalMessageInfo
 
 func (m *Feature) GetType() Feature_Type {
 	if m != nil {
@@ -337,7 +409,7 @@ type ImageSource struct {
 	// `gs://bucket_name/object_name`. Object versioning is not supported. See
 	// [Google Cloud Storage Request
 	// URIs](https://cloud.google.com/storage/docs/reference-uris) for more info.
-	GcsImageUri string `protobuf:"bytes,1,opt,name=gcs_image_uri,json=gcsImageUri" json:"gcs_image_uri,omitempty"`
+	GcsImageUri string `protobuf:"bytes,1,opt,name=gcs_image_uri,json=gcsImageUri,proto3" json:"gcs_image_uri,omitempty"`
 	// The URI of the source image. Can be either:
 	//
 	// 1. A Google Cloud Storage URI of the form
@@ -355,13 +427,35 @@ type ImageSource struct {
 	//
 	// When both `gcs_image_uri` and `image_uri` are specified, `image_uri` takes
 	// precedence.
-	ImageUri string `protobuf:"bytes,2,opt,name=image_uri,json=imageUri" json:"image_uri,omitempty"`
+	ImageUri             string   `protobuf:"bytes,2,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImageSource) Reset()         { *m = ImageSource{} }
+func (m *ImageSource) String() string { return proto.CompactTextString(m) }
+func (*ImageSource) ProtoMessage()    {}
+func (*ImageSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{1}
+}
+func (m *ImageSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
+}
+func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
+}
+func (dst *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(dst, src)
+}
+func (m *ImageSource) XXX_Size() int {
+	return xxx_messageInfo_ImageSource.Size(m)
+}
+func (m *ImageSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageSource.DiscardUnknown(m)
 }
 
-func (m *ImageSource) Reset()                    { *m = ImageSource{} }
-func (m *ImageSource) String() string            { return proto.CompactTextString(m) }
-func (*ImageSource) ProtoMessage()               {}
-func (*ImageSource) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_ImageSource proto.InternalMessageInfo
 
 func (m *ImageSource) GetGcsImageUri() string {
 	if m != nil {
@@ -386,13 +480,35 @@ type Image struct {
 	// Google Cloud Storage image location, or publicly-accessible image
 	// URL. If both `content` and `source` are provided for an image, `content`
 	// takes precedence and is used to perform the image annotation request.
-	Source *ImageSource `protobuf:"bytes,2,opt,name=source" json:"source,omitempty"`
+	Source               *ImageSource `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *Image) Reset()                    { *m = Image{} }
-func (m *Image) String() string            { return proto.CompactTextString(m) }
-func (*Image) ProtoMessage()               {}
-func (*Image) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *Image) Reset()         { *m = Image{} }
+func (m *Image) String() string { return proto.CompactTextString(m) }
+func (*Image) ProtoMessage()    {}
+func (*Image) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{2}
+}
+func (m *Image) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Image.Unmarshal(m, b)
+}
+func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
+}
+func (dst *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(dst, src)
+}
+func (m *Image) XXX_Size() int {
+	return xxx_messageInfo_Image.Size(m)
+}
+func (m *Image) XXX_DiscardUnknown() {
+	xxx_messageInfo_Image.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Image proto.InternalMessageInfo
 
 func (m *Image) GetContent() []byte {
 	if m != nil {
@@ -417,51 +533,73 @@ type FaceAnnotation struct {
 	// Note that one or more x and/or y coordinates may not be generated in the
 	// `BoundingPoly` (the polygon will be unbounded) if only a partial face
 	// appears in the image to be annotated.
-	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly" json:"bounding_poly,omitempty"`
+	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
 	// The `fd_bounding_poly` bounding polygon is tighter than the
 	// `boundingPoly`, and encloses only the skin part of the face. Typically, it
 	// is used to eliminate the face from any image analysis that detects the
 	// "amount of skin" visible in an image. It is not based on the
 	// landmarker results, only on the initial face detection, hence
 	// the <code>fd</code> (face detection) prefix.
-	FdBoundingPoly *BoundingPoly `protobuf:"bytes,2,opt,name=fd_bounding_poly,json=fdBoundingPoly" json:"fd_bounding_poly,omitempty"`
+	FdBoundingPoly *BoundingPoly `protobuf:"bytes,2,opt,name=fd_bounding_poly,json=fdBoundingPoly,proto3" json:"fd_bounding_poly,omitempty"`
 	// Detected face landmarks.
-	Landmarks []*FaceAnnotation_Landmark `protobuf:"bytes,3,rep,name=landmarks" json:"landmarks,omitempty"`
+	Landmarks []*FaceAnnotation_Landmark `protobuf:"bytes,3,rep,name=landmarks,proto3" json:"landmarks,omitempty"`
 	// Roll angle, which indicates the amount of clockwise/anti-clockwise rotation
 	// of the face relative to the image vertical about the axis perpendicular to
 	// the face. Range [-180,180].
-	RollAngle float32 `protobuf:"fixed32,4,opt,name=roll_angle,json=rollAngle" json:"roll_angle,omitempty"`
+	RollAngle float32 `protobuf:"fixed32,4,opt,name=roll_angle,json=rollAngle,proto3" json:"roll_angle,omitempty"`
 	// Yaw angle, which indicates the leftward/rightward angle that the face is
 	// pointing relative to the vertical plane perpendicular to the image. Range
 	// [-180,180].
-	PanAngle float32 `protobuf:"fixed32,5,opt,name=pan_angle,json=panAngle" json:"pan_angle,omitempty"`
+	PanAngle float32 `protobuf:"fixed32,5,opt,name=pan_angle,json=panAngle,proto3" json:"pan_angle,omitempty"`
 	// Pitch angle, which indicates the upwards/downwards angle that the face is
 	// pointing relative to the image's horizontal plane. Range [-180,180].
-	TiltAngle float32 `protobuf:"fixed32,6,opt,name=tilt_angle,json=tiltAngle" json:"tilt_angle,omitempty"`
+	TiltAngle float32 `protobuf:"fixed32,6,opt,name=tilt_angle,json=tiltAngle,proto3" json:"tilt_angle,omitempty"`
 	// Detection confidence. Range [0, 1].
-	DetectionConfidence float32 `protobuf:"fixed32,7,opt,name=detection_confidence,json=detectionConfidence" json:"detection_confidence,omitempty"`
+	DetectionConfidence float32 `protobuf:"fixed32,7,opt,name=detection_confidence,json=detectionConfidence,proto3" json:"detection_confidence,omitempty"`
 	// Face landmarking confidence. Range [0, 1].
-	LandmarkingConfidence float32 `protobuf:"fixed32,8,opt,name=landmarking_confidence,json=landmarkingConfidence" json:"landmarking_confidence,omitempty"`
+	LandmarkingConfidence float32 `protobuf:"fixed32,8,opt,name=landmarking_confidence,json=landmarkingConfidence,proto3" json:"landmarking_confidence,omitempty"`
 	// Joy likelihood.
-	JoyLikelihood Likelihood `protobuf:"varint,9,opt,name=joy_likelihood,json=joyLikelihood,enum=google.cloud.vision.v1.Likelihood" json:"joy_likelihood,omitempty"`
+	JoyLikelihood Likelihood `protobuf:"varint,9,opt,name=joy_likelihood,json=joyLikelihood,proto3,enum=google.cloud.vision.v1.Likelihood" json:"joy_likelihood,omitempty"`
 	// Sorrow likelihood.
-	SorrowLikelihood Likelihood `protobuf:"varint,10,opt,name=sorrow_likelihood,json=sorrowLikelihood,enum=google.cloud.vision.v1.Likelihood" json:"sorrow_likelihood,omitempty"`
+	SorrowLikelihood Likelihood `protobuf:"varint,10,opt,name=sorrow_likelihood,json=sorrowLikelihood,proto3,enum=google.cloud.vision.v1.Likelihood" json:"sorrow_likelihood,omitempty"`
 	// Anger likelihood.
-	AngerLikelihood Likelihood `protobuf:"varint,11,opt,name=anger_likelihood,json=angerLikelihood,enum=google.cloud.vision.v1.Likelihood" json:"anger_likelihood,omitempty"`
+	AngerLikelihood Likelihood `protobuf:"varint,11,opt,name=anger_likelihood,json=angerLikelihood,proto3,enum=google.cloud.vision.v1.Likelihood" json:"anger_likelihood,omitempty"`
 	// Surprise likelihood.
-	SurpriseLikelihood Likelihood `protobuf:"varint,12,opt,name=surprise_likelihood,json=surpriseLikelihood,enum=google.cloud.vision.v1.Likelihood" json:"surprise_likelihood,omitempty"`
+	SurpriseLikelihood Likelihood `protobuf:"varint,12,opt,name=surprise_likelihood,json=surpriseLikelihood,proto3,enum=google.cloud.vision.v1.Likelihood" json:"surprise_likelihood,omitempty"`
 	// Under-exposed likelihood.
-	UnderExposedLikelihood Likelihood `protobuf:"varint,13,opt,name=under_exposed_likelihood,json=underExposedLikelihood,enum=google.cloud.vision.v1.Likelihood" json:"under_exposed_likelihood,omitempty"`
+	UnderExposedLikelihood Likelihood `protobuf:"varint,13,opt,name=under_exposed_likelihood,json=underExposedLikelihood,proto3,enum=google.cloud.vision.v1.Likelihood" json:"under_exposed_likelihood,omitempty"`
 	// Blurred likelihood.
-	BlurredLikelihood Likelihood `protobuf:"varint,14,opt,name=blurred_likelihood,json=blurredLikelihood,enum=google.cloud.vision.v1.Likelihood" json:"blurred_likelihood,omitempty"`
+	BlurredLikelihood Likelihood `protobuf:"varint,14,opt,name=blurred_likelihood,json=blurredLikelihood,proto3,enum=google.cloud.vision.v1.Likelihood" json:"blurred_likelihood,omitempty"`
 	// Headwear likelihood.
-	HeadwearLikelihood Likelihood `protobuf:"varint,15,opt,name=headwear_likelihood,json=headwearLikelihood,enum=google.cloud.vision.v1.Likelihood" json:"headwear_likelihood,omitempty"`
+	HeadwearLikelihood   Likelihood `protobuf:"varint,15,opt,name=headwear_likelihood,json=headwearLikelihood,proto3,enum=google.cloud.vision.v1.Likelihood" json:"headwear_likelihood,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
+func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation) ProtoMessage()    {}
+func (*FaceAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{3}
+}
+func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
+}
+func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+}
+func (m *FaceAnnotation) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation.Size(m)
+}
+func (m *FaceAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation.DiscardUnknown(m)
 }
 
-func (m *FaceAnnotation) Reset()                    { *m = FaceAnnotation{} }
-func (m *FaceAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*FaceAnnotation) ProtoMessage()               {}
-func (*FaceAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_FaceAnnotation proto.InternalMessageInfo
 
 func (m *FaceAnnotation) GetBoundingPoly() *BoundingPoly {
 	if m != nil {
@@ -571,15 +709,37 @@ func (m *FaceAnnotation) GetHeadwearLikelihood() Likelihood {
 // A face-specific landmark (for example, a face feature).
 type FaceAnnotation_Landmark struct {
 	// Face landmark type.
-	Type FaceAnnotation_Landmark_Type `protobuf:"varint,3,opt,name=type,enum=google.cloud.vision.v1.FaceAnnotation_Landmark_Type" json:"type,omitempty"`
+	Type FaceAnnotation_Landmark_Type `protobuf:"varint,3,opt,name=type,proto3,enum=google.cloud.vision.v1.FaceAnnotation_Landmark_Type" json:"type,omitempty"`
 	// Face landmark position.
-	Position *Position `protobuf:"bytes,4,opt,name=position" json:"position,omitempty"`
+	Position             *Position `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *FaceAnnotation_Landmark) Reset()                    { *m = FaceAnnotation_Landmark{} }
-func (m *FaceAnnotation_Landmark) String() string            { return proto.CompactTextString(m) }
-func (*FaceAnnotation_Landmark) ProtoMessage()               {}
-func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3, 0} }
+func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark{} }
+func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation_Landmark) ProtoMessage()    {}
+func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{3, 0}
+}
+func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
+}
+func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+}
+func (m *FaceAnnotation_Landmark) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
+}
+func (m *FaceAnnotation_Landmark) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation_Landmark.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceAnnotation_Landmark proto.InternalMessageInfo
 
 func (m *FaceAnnotation_Landmark) GetType() FaceAnnotation_Landmark_Type {
 	if m != nil {
@@ -598,15 +758,37 @@ func (m *FaceAnnotation_Landmark) GetPosition() *Position {
 // Detected entity location information.
 type LocationInfo struct {
 	// lat/long location coordinates.
-	LatLng *google_type1.LatLng `protobuf:"bytes,1,opt,name=lat_lng,json=latLng" json:"lat_lng,omitempty"`
+	LatLng               *latlng.LatLng `protobuf:"bytes,1,opt,name=lat_lng,json=latLng,proto3" json:"lat_lng,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
+func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
+func (*LocationInfo) ProtoMessage()    {}
+func (*LocationInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{4}
+}
+func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
+}
+func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
+}
+func (dst *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(dst, src)
+}
+func (m *LocationInfo) XXX_Size() int {
+	return xxx_messageInfo_LocationInfo.Size(m)
+}
+func (m *LocationInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocationInfo.DiscardUnknown(m)
 }
 
-func (m *LocationInfo) Reset()                    { *m = LocationInfo{} }
-func (m *LocationInfo) String() string            { return proto.CompactTextString(m) }
-func (*LocationInfo) ProtoMessage()               {}
-func (*LocationInfo) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_LocationInfo proto.InternalMessageInfo
 
-func (m *LocationInfo) GetLatLng() *google_type1.LatLng {
+func (m *LocationInfo) GetLatLng() *latlng.LatLng {
 	if m != nil {
 		return m.LatLng
 	}
@@ -616,17 +798,39 @@ func (m *LocationInfo) GetLatLng() *google_type1.LatLng {
 // A `Property` consists of a user-supplied name/value pair.
 type Property struct {
 	// Name of the property.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Value of the property.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Value of numeric properties.
-	Uint64Value uint64 `protobuf:"varint,3,opt,name=uint64_value,json=uint64Value" json:"uint64_value,omitempty"`
+	Uint64Value          uint64   `protobuf:"varint,3,opt,name=uint64_value,json=uint64Value,proto3" json:"uint64_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Property) Reset()                    { *m = Property{} }
-func (m *Property) String() string            { return proto.CompactTextString(m) }
-func (*Property) ProtoMessage()               {}
-func (*Property) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *Property) Reset()         { *m = Property{} }
+func (m *Property) String() string { return proto.CompactTextString(m) }
+func (*Property) ProtoMessage()    {}
+func (*Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{5}
+}
+func (m *Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Property.Unmarshal(m, b)
+}
+func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
+}
+func (dst *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(dst, src)
+}
+func (m *Property) XXX_Size() int {
+	return xxx_messageInfo_Property.Size(m)
+}
+func (m *Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Property.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Property proto.InternalMessageInfo
 
 func (m *Property) GetName() string {
 	if m != nil {
@@ -654,44 +858,66 @@ type EntityAnnotation struct {
 	// Opaque entity ID. Some IDs may be available in
 	// [Google Knowledge Graph Search
 	// API](https://developers.google.com/knowledge-graph/).
-	Mid string `protobuf:"bytes,1,opt,name=mid" json:"mid,omitempty"`
+	Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid,omitempty"`
 	// The language code for the locale in which the entity textual
 	// `description` is expressed.
-	Locale string `protobuf:"bytes,2,opt,name=locale" json:"locale,omitempty"`
+	Locale string `protobuf:"bytes,2,opt,name=locale,proto3" json:"locale,omitempty"`
 	// Entity textual description, expressed in its `locale` language.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Overall score of the result. Range [0, 1].
-	Score float32 `protobuf:"fixed32,4,opt,name=score" json:"score,omitempty"`
+	Score float32 `protobuf:"fixed32,4,opt,name=score,proto3" json:"score,omitempty"`
 	// **Deprecated. Use `score` instead.**
 	// The accuracy of the entity detection in an image.
 	// For example, for an image in which the "Eiffel Tower" entity is detected,
 	// this field represents the confidence that there is a tower in the query
 	// image. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
 	// The relevancy of the ICA (Image Content Annotation) label to the
 	// image. For example, the relevancy of "tower" is likely higher to an image
 	// containing the detected "Eiffel Tower" than to an image containing a
 	// detected distant towering building, even though the confidence that
 	// there is a tower in each image may be the same. Range [0, 1].
-	Topicality float32 `protobuf:"fixed32,6,opt,name=topicality" json:"topicality,omitempty"`
+	Topicality float32 `protobuf:"fixed32,6,opt,name=topicality,proto3" json:"topicality,omitempty"`
 	// Image region to which this entity belongs. Not produced
 	// for `LABEL_DETECTION` features.
-	BoundingPoly *BoundingPoly `protobuf:"bytes,7,opt,name=bounding_poly,json=boundingPoly" json:"bounding_poly,omitempty"`
+	BoundingPoly *BoundingPoly `protobuf:"bytes,7,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
 	// The location information for the detected entity. Multiple
 	// `LocationInfo` elements can be present because one location may
 	// indicate the location of the scene in the image, and another location
 	// may indicate the location of the place where the image was taken.
 	// Location information is usually present for landmarks.
-	Locations []*LocationInfo `protobuf:"bytes,8,rep,name=locations" json:"locations,omitempty"`
+	Locations []*LocationInfo `protobuf:"bytes,8,rep,name=locations,proto3" json:"locations,omitempty"`
 	// Some entities may have optional user-supplied `Property` (name/value)
 	// fields, such a score or string that qualifies the entity.
-	Properties []*Property `protobuf:"bytes,9,rep,name=properties" json:"properties,omitempty"`
+	Properties           []*Property `protobuf:"bytes,9,rep,name=properties,proto3" json:"properties,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
+func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
+func (*EntityAnnotation) ProtoMessage()    {}
+func (*EntityAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{6}
+}
+func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
+}
+func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+}
+func (m *EntityAnnotation) XXX_Size() int {
+	return xxx_messageInfo_EntityAnnotation.Size(m)
+}
+func (m *EntityAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityAnnotation.DiscardUnknown(m)
 }
 
-func (m *EntityAnnotation) Reset()                    { *m = EntityAnnotation{} }
-func (m *EntityAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*EntityAnnotation) ProtoMessage()               {}
-func (*EntityAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_EntityAnnotation proto.InternalMessageInfo
 
 func (m *EntityAnnotation) GetMid() string {
 	if m != nil {
@@ -763,26 +989,48 @@ type SafeSearchAnnotation struct {
 	// Represents the adult content likelihood for the image. Adult content may
 	// contain elements such as nudity, pornographic images or cartoons, or
 	// sexual activities.
-	Adult Likelihood `protobuf:"varint,1,opt,name=adult,enum=google.cloud.vision.v1.Likelihood" json:"adult,omitempty"`
+	Adult Likelihood `protobuf:"varint,1,opt,name=adult,proto3,enum=google.cloud.vision.v1.Likelihood" json:"adult,omitempty"`
 	// Spoof likelihood. The likelihood that an modification
 	// was made to the image's canonical version to make it appear
 	// funny or offensive.
-	Spoof Likelihood `protobuf:"varint,2,opt,name=spoof,enum=google.cloud.vision.v1.Likelihood" json:"spoof,omitempty"`
+	Spoof Likelihood `protobuf:"varint,2,opt,name=spoof,proto3,enum=google.cloud.vision.v1.Likelihood" json:"spoof,omitempty"`
 	// Likelihood that this is a medical image.
-	Medical Likelihood `protobuf:"varint,3,opt,name=medical,enum=google.cloud.vision.v1.Likelihood" json:"medical,omitempty"`
+	Medical Likelihood `protobuf:"varint,3,opt,name=medical,proto3,enum=google.cloud.vision.v1.Likelihood" json:"medical,omitempty"`
 	// Likelihood that this image contains violent content.
-	Violence Likelihood `protobuf:"varint,4,opt,name=violence,enum=google.cloud.vision.v1.Likelihood" json:"violence,omitempty"`
+	Violence Likelihood `protobuf:"varint,4,opt,name=violence,proto3,enum=google.cloud.vision.v1.Likelihood" json:"violence,omitempty"`
 	// Likelihood that the request image contains racy content. Racy content may
 	// include (but is not limited to) skimpy or sheer clothing, strategically
 	// covered nudity, lewd or provocative poses, or close-ups of sensitive
 	// body areas.
-	Racy Likelihood `protobuf:"varint,9,opt,name=racy,enum=google.cloud.vision.v1.Likelihood" json:"racy,omitempty"`
+	Racy                 Likelihood `protobuf:"varint,9,opt,name=racy,proto3,enum=google.cloud.vision.v1.Likelihood" json:"racy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *SafeSearchAnnotation) Reset()                    { *m = SafeSearchAnnotation{} }
-func (m *SafeSearchAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*SafeSearchAnnotation) ProtoMessage()               {}
-func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
+func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
+func (*SafeSearchAnnotation) ProtoMessage()    {}
+func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{7}
+}
+func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
+}
+func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+}
+func (m *SafeSearchAnnotation) XXX_Size() int {
+	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
+}
+func (m *SafeSearchAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_SafeSearchAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SafeSearchAnnotation proto.InternalMessageInfo
 
 func (m *SafeSearchAnnotation) GetAdult() Likelihood {
 	if m != nil {
@@ -822,24 +1070,46 @@ func (m *SafeSearchAnnotation) GetRacy() Likelihood {
 // Rectangle determined by min and max `LatLng` pairs.
 type LatLongRect struct {
 	// Min lat/long pair.
-	MinLatLng *google_type1.LatLng `protobuf:"bytes,1,opt,name=min_lat_lng,json=minLatLng" json:"min_lat_lng,omitempty"`
+	MinLatLng *latlng.LatLng `protobuf:"bytes,1,opt,name=min_lat_lng,json=minLatLng,proto3" json:"min_lat_lng,omitempty"`
 	// Max lat/long pair.
-	MaxLatLng *google_type1.LatLng `protobuf:"bytes,2,opt,name=max_lat_lng,json=maxLatLng" json:"max_lat_lng,omitempty"`
+	MaxLatLng            *latlng.LatLng `protobuf:"bytes,2,opt,name=max_lat_lng,json=maxLatLng,proto3" json:"max_lat_lng,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
+func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
+func (*LatLongRect) ProtoMessage()    {}
+func (*LatLongRect) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{8}
+}
+func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
+}
+func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
+}
+func (dst *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(dst, src)
+}
+func (m *LatLongRect) XXX_Size() int {
+	return xxx_messageInfo_LatLongRect.Size(m)
+}
+func (m *LatLongRect) XXX_DiscardUnknown() {
+	xxx_messageInfo_LatLongRect.DiscardUnknown(m)
 }
 
-func (m *LatLongRect) Reset()                    { *m = LatLongRect{} }
-func (m *LatLongRect) String() string            { return proto.CompactTextString(m) }
-func (*LatLongRect) ProtoMessage()               {}
-func (*LatLongRect) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+var xxx_messageInfo_LatLongRect proto.InternalMessageInfo
 
-func (m *LatLongRect) GetMinLatLng() *google_type1.LatLng {
+func (m *LatLongRect) GetMinLatLng() *latlng.LatLng {
 	if m != nil {
 		return m.MinLatLng
 	}
 	return nil
 }
 
-func (m *LatLongRect) GetMaxLatLng() *google_type1.LatLng {
+func (m *LatLongRect) GetMaxLatLng() *latlng.LatLng {
 	if m != nil {
 		return m.MaxLatLng
 	}
@@ -850,20 +1120,42 @@ func (m *LatLongRect) GetMaxLatLng() *google_type1.LatLng {
 // the image that the color occupies in the image.
 type ColorInfo struct {
 	// RGB components of the color.
-	Color *google_type.Color `protobuf:"bytes,1,opt,name=color" json:"color,omitempty"`
+	Color *color.Color `protobuf:"bytes,1,opt,name=color,proto3" json:"color,omitempty"`
 	// Image-specific score for this color. Value in range [0, 1].
-	Score float32 `protobuf:"fixed32,2,opt,name=score" json:"score,omitempty"`
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
 	// The fraction of pixels the color occupies in the image.
 	// Value in range [0, 1].
-	PixelFraction float32 `protobuf:"fixed32,3,opt,name=pixel_fraction,json=pixelFraction" json:"pixel_fraction,omitempty"`
+	PixelFraction        float32  `protobuf:"fixed32,3,opt,name=pixel_fraction,json=pixelFraction,proto3" json:"pixel_fraction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
+func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
+func (*ColorInfo) ProtoMessage()    {}
+func (*ColorInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{9}
+}
+func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
+}
+func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
+}
+func (dst *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(dst, src)
+}
+func (m *ColorInfo) XXX_Size() int {
+	return xxx_messageInfo_ColorInfo.Size(m)
+}
+func (m *ColorInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColorInfo.DiscardUnknown(m)
 }
 
-func (m *ColorInfo) Reset()                    { *m = ColorInfo{} }
-func (m *ColorInfo) String() string            { return proto.CompactTextString(m) }
-func (*ColorInfo) ProtoMessage()               {}
-func (*ColorInfo) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_ColorInfo proto.InternalMessageInfo
 
-func (m *ColorInfo) GetColor() *google_type.Color {
+func (m *ColorInfo) GetColor() *color.Color {
 	if m != nil {
 		return m.Color
 	}
@@ -887,13 +1179,35 @@ func (m *ColorInfo) GetPixelFraction() float32 {
 // Set of dominant colors and their corresponding scores.
 type DominantColorsAnnotation struct {
 	// RGB color values with their score and pixel fraction.
-	Colors []*ColorInfo `protobuf:"bytes,1,rep,name=colors" json:"colors,omitempty"`
+	Colors               []*ColorInfo `protobuf:"bytes,1,rep,name=colors,proto3" json:"colors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *DominantColorsAnnotation) Reset()                    { *m = DominantColorsAnnotation{} }
-func (m *DominantColorsAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*DominantColorsAnnotation) ProtoMessage()               {}
-func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotation{} }
+func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
+func (*DominantColorsAnnotation) ProtoMessage()    {}
+func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{10}
+}
+func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
+}
+func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+}
+func (m *DominantColorsAnnotation) XXX_Size() int {
+	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
+}
+func (m *DominantColorsAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_DominantColorsAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DominantColorsAnnotation proto.InternalMessageInfo
 
 func (m *DominantColorsAnnotation) GetColors() []*ColorInfo {
 	if m != nil {
@@ -905,13 +1219,35 @@ func (m *DominantColorsAnnotation) GetColors() []*ColorInfo {
 // Stores image properties, such as dominant colors.
 type ImageProperties struct {
 	// If present, dominant colors completed successfully.
-	DominantColors *DominantColorsAnnotation `protobuf:"bytes,1,opt,name=dominant_colors,json=dominantColors" json:"dominant_colors,omitempty"`
+	DominantColors       *DominantColorsAnnotation `protobuf:"bytes,1,opt,name=dominant_colors,json=dominantColors,proto3" json:"dominant_colors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *ImageProperties) Reset()                    { *m = ImageProperties{} }
-func (m *ImageProperties) String() string            { return proto.CompactTextString(m) }
-func (*ImageProperties) ProtoMessage()               {}
-func (*ImageProperties) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
+func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
+func (*ImageProperties) ProtoMessage()    {}
+func (*ImageProperties) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{11}
+}
+func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
+}
+func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
+}
+func (dst *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(dst, src)
+}
+func (m *ImageProperties) XXX_Size() int {
+	return xxx_messageInfo_ImageProperties.Size(m)
+}
+func (m *ImageProperties) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageProperties.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageProperties proto.InternalMessageInfo
 
 func (m *ImageProperties) GetDominantColors() *DominantColorsAnnotation {
 	if m != nil {
@@ -924,18 +1260,40 @@ func (m *ImageProperties) GetDominantColors() *DominantColorsAnnotation {
 type CropHint struct {
 	// The bounding polygon for the crop region. The coordinates of the bounding
 	// box are in the original image's scale, as returned in `ImageParams`.
-	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly" json:"bounding_poly,omitempty"`
+	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
 	// Confidence of this being a salient region.  Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
 	// Fraction of importance of this salient region with respect to the original
 	// image.
-	ImportanceFraction float32 `protobuf:"fixed32,3,opt,name=importance_fraction,json=importanceFraction" json:"importance_fraction,omitempty"`
+	ImportanceFraction   float32  `protobuf:"fixed32,3,opt,name=importance_fraction,json=importanceFraction,proto3" json:"importance_fraction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CropHint) Reset()                    { *m = CropHint{} }
-func (m *CropHint) String() string            { return proto.CompactTextString(m) }
-func (*CropHint) ProtoMessage()               {}
-func (*CropHint) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+func (m *CropHint) Reset()         { *m = CropHint{} }
+func (m *CropHint) String() string { return proto.CompactTextString(m) }
+func (*CropHint) ProtoMessage()    {}
+func (*CropHint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{12}
+}
+func (m *CropHint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHint.Unmarshal(m, b)
+}
+func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
+}
+func (dst *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(dst, src)
+}
+func (m *CropHint) XXX_Size() int {
+	return xxx_messageInfo_CropHint.Size(m)
+}
+func (m *CropHint) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CropHint proto.InternalMessageInfo
 
 func (m *CropHint) GetBoundingPoly() *BoundingPoly {
 	if m != nil {
@@ -961,13 +1319,35 @@ func (m *CropHint) GetImportanceFraction() float32 {
 // Set of crop hints that are used to generate new crops when serving images.
 type CropHintsAnnotation struct {
 	// Crop hint results.
-	CropHints []*CropHint `protobuf:"bytes,1,rep,name=crop_hints,json=cropHints" json:"crop_hints,omitempty"`
+	CropHints            []*CropHint `protobuf:"bytes,1,rep,name=crop_hints,json=cropHints,proto3" json:"crop_hints,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
+func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
+func (*CropHintsAnnotation) ProtoMessage()    {}
+func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{13}
+}
+func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
+}
+func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+}
+func (m *CropHintsAnnotation) XXX_Size() int {
+	return xxx_messageInfo_CropHintsAnnotation.Size(m)
+}
+func (m *CropHintsAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHintsAnnotation.DiscardUnknown(m)
 }
 
-func (m *CropHintsAnnotation) Reset()                    { *m = CropHintsAnnotation{} }
-func (m *CropHintsAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*CropHintsAnnotation) ProtoMessage()               {}
-func (*CropHintsAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+var xxx_messageInfo_CropHintsAnnotation proto.InternalMessageInfo
 
 func (m *CropHintsAnnotation) GetCropHints() []*CropHint {
 	if m != nil {
@@ -984,13 +1364,35 @@ type CropHintsParams struct {
 	// best possible crop is returned. The number of provided aspect ratios is
 	// limited to a maximum of 16; any aspect ratios provided after the 16th are
 	// ignored.
-	AspectRatios []float32 `protobuf:"fixed32,1,rep,packed,name=aspect_ratios,json=aspectRatios" json:"aspect_ratios,omitempty"`
+	AspectRatios         []float32 `protobuf:"fixed32,1,rep,packed,name=aspect_ratios,json=aspectRatios,proto3" json:"aspect_ratios,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *CropHintsParams) Reset()                    { *m = CropHintsParams{} }
-func (m *CropHintsParams) String() string            { return proto.CompactTextString(m) }
-func (*CropHintsParams) ProtoMessage()               {}
-func (*CropHintsParams) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
+func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
+func (*CropHintsParams) ProtoMessage()    {}
+func (*CropHintsParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{14}
+}
+func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
+}
+func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
+}
+func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+}
+func (m *CropHintsParams) XXX_Size() int {
+	return xxx_messageInfo_CropHintsParams.Size(m)
+}
+func (m *CropHintsParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHintsParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CropHintsParams proto.InternalMessageInfo
 
 func (m *CropHintsParams) GetAspectRatios() []float32 {
 	if m != nil {
@@ -1002,13 +1404,35 @@ func (m *CropHintsParams) GetAspectRatios() []float32 {
 // Parameters for web detection request.
 type WebDetectionParams struct {
 	// Whether to include results derived from the geo information in the image.
-	IncludeGeoResults bool `protobuf:"varint,2,opt,name=include_geo_results,json=includeGeoResults" json:"include_geo_results,omitempty"`
+	IncludeGeoResults    bool     `protobuf:"varint,2,opt,name=include_geo_results,json=includeGeoResults,proto3" json:"include_geo_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
+func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
+func (*WebDetectionParams) ProtoMessage()    {}
+func (*WebDetectionParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{15}
+}
+func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
+}
+func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
+}
+func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+}
+func (m *WebDetectionParams) XXX_Size() int {
+	return xxx_messageInfo_WebDetectionParams.Size(m)
+}
+func (m *WebDetectionParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetectionParams.DiscardUnknown(m)
 }
 
-func (m *WebDetectionParams) Reset()                    { *m = WebDetectionParams{} }
-func (m *WebDetectionParams) String() string            { return proto.CompactTextString(m) }
-func (*WebDetectionParams) ProtoMessage()               {}
-func (*WebDetectionParams) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+var xxx_messageInfo_WebDetectionParams proto.InternalMessageInfo
 
 func (m *WebDetectionParams) GetIncludeGeoResults() bool {
 	if m != nil {
@@ -1019,8 +1443,8 @@ func (m *WebDetectionParams) GetIncludeGeoResults() bool {
 
 // Image context and/or feature-specific parameters.
 type ImageContext struct {
-	// lat/long rectangle that specifies the location of the image.
-	LatLongRect *LatLongRect `protobuf:"bytes,1,opt,name=lat_long_rect,json=latLongRect" json:"lat_long_rect,omitempty"`
+	// Not used.
+	LatLongRect *LatLongRect `protobuf:"bytes,1,opt,name=lat_long_rect,json=latLongRect,proto3" json:"lat_long_rect,omitempty"`
 	// List of languages to use for TEXT_DETECTION. In most cases, an empty value
 	// yields the best results since it enables automatic language detection. For
 	// languages based on the Latin alphabet, setting `language_hints` is not
@@ -1029,17 +1453,39 @@ type ImageContext struct {
 	// significant hindrance if the hint is wrong). Text detection returns an
 	// error if one or more of the specified languages is not one of the
 	// [supported languages](/vision/docs/languages).
-	LanguageHints []string `protobuf:"bytes,2,rep,name=language_hints,json=languageHints" json:"language_hints,omitempty"`
+	LanguageHints []string `protobuf:"bytes,2,rep,name=language_hints,json=languageHints,proto3" json:"language_hints,omitempty"`
 	// Parameters for crop hints annotation request.
-	CropHintsParams *CropHintsParams `protobuf:"bytes,4,opt,name=crop_hints_params,json=cropHintsParams" json:"crop_hints_params,omitempty"`
+	CropHintsParams *CropHintsParams `protobuf:"bytes,4,opt,name=crop_hints_params,json=cropHintsParams,proto3" json:"crop_hints_params,omitempty"`
 	// Parameters for web detection.
-	WebDetectionParams *WebDetectionParams `protobuf:"bytes,6,opt,name=web_detection_params,json=webDetectionParams" json:"web_detection_params,omitempty"`
+	WebDetectionParams   *WebDetectionParams `protobuf:"bytes,6,opt,name=web_detection_params,json=webDetectionParams,proto3" json:"web_detection_params,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *ImageContext) Reset()                    { *m = ImageContext{} }
-func (m *ImageContext) String() string            { return proto.CompactTextString(m) }
-func (*ImageContext) ProtoMessage()               {}
-func (*ImageContext) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+func (m *ImageContext) Reset()         { *m = ImageContext{} }
+func (m *ImageContext) String() string { return proto.CompactTextString(m) }
+func (*ImageContext) ProtoMessage()    {}
+func (*ImageContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{16}
+}
+func (m *ImageContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
+}
+func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
+}
+func (dst *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(dst, src)
+}
+func (m *ImageContext) XXX_Size() int {
+	return xxx_messageInfo_ImageContext.Size(m)
+}
+func (m *ImageContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageContext proto.InternalMessageInfo
 
 func (m *ImageContext) GetLatLongRect() *LatLongRect {
 	if m != nil {
@@ -1073,17 +1519,39 @@ func (m *ImageContext) GetWebDetectionParams() *WebDetectionParams {
 // image, with user-requested features.
 type AnnotateImageRequest struct {
 	// The image to be processed.
-	Image *Image `protobuf:"bytes,1,opt,name=image" json:"image,omitempty"`
+	Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
 	// Requested features.
-	Features []*Feature `protobuf:"bytes,2,rep,name=features" json:"features,omitempty"`
+	Features []*Feature `protobuf:"bytes,2,rep,name=features,proto3" json:"features,omitempty"`
 	// Additional context that may accompany the image.
-	ImageContext *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext" json:"image_context,omitempty"`
+	ImageContext         *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext,proto3" json:"image_context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
+func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateImageRequest) ProtoMessage()    {}
+func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{17}
+}
+func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
+}
+func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+}
+func (m *AnnotateImageRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateImageRequest.Size(m)
+}
+func (m *AnnotateImageRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateImageRequest.DiscardUnknown(m)
 }
 
-func (m *AnnotateImageRequest) Reset()                    { *m = AnnotateImageRequest{} }
-func (m *AnnotateImageRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateImageRequest) ProtoMessage()               {}
-func (*AnnotateImageRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+var xxx_messageInfo_AnnotateImageRequest proto.InternalMessageInfo
 
 func (m *AnnotateImageRequest) GetImage() *Image {
 	if m != nil {
@@ -1106,41 +1574,117 @@ func (m *AnnotateImageRequest) GetImageContext() *ImageContext {
 	return nil
 }
 
+// If an image was produced from a file (e.g. a PDF), this message gives
+// information about the source of that image.
+type ImageAnnotationContext struct {
+	// The URI of the file used to produce the image.
+	Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	// If the file was a PDF or TIFF, this field gives the page number within
+	// the file used to produce the image.
+	PageNumber           int32    `protobuf:"varint,2,opt,name=page_number,json=pageNumber,proto3" json:"page_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImageAnnotationContext) Reset()         { *m = ImageAnnotationContext{} }
+func (m *ImageAnnotationContext) String() string { return proto.CompactTextString(m) }
+func (*ImageAnnotationContext) ProtoMessage()    {}
+func (*ImageAnnotationContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{18}
+}
+func (m *ImageAnnotationContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageAnnotationContext.Unmarshal(m, b)
+}
+func (m *ImageAnnotationContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageAnnotationContext.Marshal(b, m, deterministic)
+}
+func (dst *ImageAnnotationContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAnnotationContext.Merge(dst, src)
+}
+func (m *ImageAnnotationContext) XXX_Size() int {
+	return xxx_messageInfo_ImageAnnotationContext.Size(m)
+}
+func (m *ImageAnnotationContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageAnnotationContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageAnnotationContext proto.InternalMessageInfo
+
+func (m *ImageAnnotationContext) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+func (m *ImageAnnotationContext) GetPageNumber() int32 {
+	if m != nil {
+		return m.PageNumber
+	}
+	return 0
+}
+
 // Response to an image annotation request.
 type AnnotateImageResponse struct {
 	// If present, face detection has completed successfully.
-	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,1,rep,name=face_annotations,json=faceAnnotations" json:"face_annotations,omitempty"`
+	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,1,rep,name=face_annotations,json=faceAnnotations,proto3" json:"face_annotations,omitempty"`
 	// If present, landmark detection has completed successfully.
-	LandmarkAnnotations []*EntityAnnotation `protobuf:"bytes,2,rep,name=landmark_annotations,json=landmarkAnnotations" json:"landmark_annotations,omitempty"`
+	LandmarkAnnotations []*EntityAnnotation `protobuf:"bytes,2,rep,name=landmark_annotations,json=landmarkAnnotations,proto3" json:"landmark_annotations,omitempty"`
 	// If present, logo detection has completed successfully.
-	LogoAnnotations []*EntityAnnotation `protobuf:"bytes,3,rep,name=logo_annotations,json=logoAnnotations" json:"logo_annotations,omitempty"`
+	LogoAnnotations []*EntityAnnotation `protobuf:"bytes,3,rep,name=logo_annotations,json=logoAnnotations,proto3" json:"logo_annotations,omitempty"`
 	// If present, label detection has completed successfully.
-	LabelAnnotations []*EntityAnnotation `protobuf:"bytes,4,rep,name=label_annotations,json=labelAnnotations" json:"label_annotations,omitempty"`
+	LabelAnnotations []*EntityAnnotation `protobuf:"bytes,4,rep,name=label_annotations,json=labelAnnotations,proto3" json:"label_annotations,omitempty"`
 	// If present, text (OCR) detection has completed successfully.
-	TextAnnotations []*EntityAnnotation `protobuf:"bytes,5,rep,name=text_annotations,json=textAnnotations" json:"text_annotations,omitempty"`
+	TextAnnotations []*EntityAnnotation `protobuf:"bytes,5,rep,name=text_annotations,json=textAnnotations,proto3" json:"text_annotations,omitempty"`
 	// If present, text (OCR) detection or document (OCR) text detection has
 	// completed successfully.
 	// This annotation provides the structural hierarchy for the OCR detected
 	// text.
-	FullTextAnnotation *TextAnnotation `protobuf:"bytes,12,opt,name=full_text_annotation,json=fullTextAnnotation" json:"full_text_annotation,omitempty"`
+	FullTextAnnotation *TextAnnotation `protobuf:"bytes,12,opt,name=full_text_annotation,json=fullTextAnnotation,proto3" json:"full_text_annotation,omitempty"`
 	// If present, safe-search annotation has completed successfully.
-	SafeSearchAnnotation *SafeSearchAnnotation `protobuf:"bytes,6,opt,name=safe_search_annotation,json=safeSearchAnnotation" json:"safe_search_annotation,omitempty"`
+	SafeSearchAnnotation *SafeSearchAnnotation `protobuf:"bytes,6,opt,name=safe_search_annotation,json=safeSearchAnnotation,proto3" json:"safe_search_annotation,omitempty"`
 	// If present, image properties were extracted successfully.
-	ImagePropertiesAnnotation *ImageProperties `protobuf:"bytes,8,opt,name=image_properties_annotation,json=imagePropertiesAnnotation" json:"image_properties_annotation,omitempty"`
+	ImagePropertiesAnnotation *ImageProperties `protobuf:"bytes,8,opt,name=image_properties_annotation,json=imagePropertiesAnnotation,proto3" json:"image_properties_annotation,omitempty"`
 	// If present, crop hints have completed successfully.
-	CropHintsAnnotation *CropHintsAnnotation `protobuf:"bytes,11,opt,name=crop_hints_annotation,json=cropHintsAnnotation" json:"crop_hints_annotation,omitempty"`
+	CropHintsAnnotation *CropHintsAnnotation `protobuf:"bytes,11,opt,name=crop_hints_annotation,json=cropHintsAnnotation,proto3" json:"crop_hints_annotation,omitempty"`
 	// If present, web detection has completed successfully.
-	WebDetection *WebDetection `protobuf:"bytes,13,opt,name=web_detection,json=webDetection" json:"web_detection,omitempty"`
+	WebDetection *WebDetection `protobuf:"bytes,13,opt,name=web_detection,json=webDetection,proto3" json:"web_detection,omitempty"`
 	// If set, represents the error message for the operation.
 	// Note that filled-in image annotations are guaranteed to be
 	// correct, even when `error` is set.
-	Error *google_rpc.Status `protobuf:"bytes,9,opt,name=error" json:"error,omitempty"`
+	Error *status.Status `protobuf:"bytes,9,opt,name=error,proto3" json:"error,omitempty"`
+	// If present, contextual information is needed to understand where this image
+	// comes from.
+	Context              *ImageAnnotationContext `protobuf:"bytes,21,opt,name=context,proto3" json:"context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
+func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateImageResponse) ProtoMessage()    {}
+func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{19}
+}
+func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
+}
+func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+}
+func (m *AnnotateImageResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateImageResponse.Size(m)
+}
+func (m *AnnotateImageResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateImageResponse.DiscardUnknown(m)
 }
 
-func (m *AnnotateImageResponse) Reset()                    { *m = AnnotateImageResponse{} }
-func (m *AnnotateImageResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateImageResponse) ProtoMessage()               {}
-func (*AnnotateImageResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{18} }
+var xxx_messageInfo_AnnotateImageResponse proto.InternalMessageInfo
 
 func (m *AnnotateImageResponse) GetFaceAnnotations() []*FaceAnnotation {
 	if m != nil {
@@ -1212,23 +1756,102 @@ func (m *AnnotateImageResponse) GetWebDetection() *WebDetection {
 	return nil
 }
 
-func (m *AnnotateImageResponse) GetError() *google_rpc.Status {
+func (m *AnnotateImageResponse) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
 	return nil
 }
 
+func (m *AnnotateImageResponse) GetContext() *ImageAnnotationContext {
+	if m != nil {
+		return m.Context
+	}
+	return nil
+}
+
+// Response to a single file annotation request. A file may contain one or more
+// images, which individually have their own responses.
+type AnnotateFileResponse struct {
+	// Information about the file for which this response is generated.
+	InputConfig *InputConfig `protobuf:"bytes,1,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
+	// Individual responses to images found within the file.
+	Responses            []*AnnotateImageResponse `protobuf:"bytes,2,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *AnnotateFileResponse) Reset()         { *m = AnnotateFileResponse{} }
+func (m *AnnotateFileResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateFileResponse) ProtoMessage()    {}
+func (*AnnotateFileResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{20}
+}
+func (m *AnnotateFileResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateFileResponse.Unmarshal(m, b)
+}
+func (m *AnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateFileResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileResponse.Merge(dst, src)
+}
+func (m *AnnotateFileResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateFileResponse.Size(m)
+}
+func (m *AnnotateFileResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateFileResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateFileResponse proto.InternalMessageInfo
+
+func (m *AnnotateFileResponse) GetInputConfig() *InputConfig {
+	if m != nil {
+		return m.InputConfig
+	}
+	return nil
+}
+
+func (m *AnnotateFileResponse) GetResponses() []*AnnotateImageResponse {
+	if m != nil {
+		return m.Responses
+	}
+	return nil
+}
+
 // Multiple image annotation requests are batched into a single service call.
 type BatchAnnotateImagesRequest struct {
 	// Individual image annotation requests for this batch.
-	Requests []*AnnotateImageRequest `protobuf:"bytes,1,rep,name=requests" json:"requests,omitempty"`
+	Requests             []*AnnotateImageRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesRequest{} }
+func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
+func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{21}
+}
+func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
+}
+func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+}
+func (m *BatchAnnotateImagesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
+}
+func (m *BatchAnnotateImagesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchAnnotateImagesRequest.DiscardUnknown(m)
 }
 
-func (m *BatchAnnotateImagesRequest) Reset()                    { *m = BatchAnnotateImagesRequest{} }
-func (m *BatchAnnotateImagesRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchAnnotateImagesRequest) ProtoMessage()               {}
-func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{19} }
+var xxx_messageInfo_BatchAnnotateImagesRequest proto.InternalMessageInfo
 
 func (m *BatchAnnotateImagesRequest) GetRequests() []*AnnotateImageRequest {
 	if m != nil {
@@ -1240,13 +1863,35 @@ func (m *BatchAnnotateImagesRequest) GetRequests() []*AnnotateImageRequest {
 // Response to a batch image annotation request.
 type BatchAnnotateImagesResponse struct {
 	// Individual responses to image annotation requests within the batch.
-	Responses []*AnnotateImageResponse `protobuf:"bytes,1,rep,name=responses" json:"responses,omitempty"`
+	Responses            []*AnnotateImageResponse `protobuf:"bytes,1,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *BatchAnnotateImagesResponse) Reset()                    { *m = BatchAnnotateImagesResponse{} }
-func (m *BatchAnnotateImagesResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchAnnotateImagesResponse) ProtoMessage()               {}
-func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{20} }
+func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImagesResponse{} }
+func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
+func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{22}
+}
+func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
+}
+func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+}
+func (m *BatchAnnotateImagesResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
+}
+func (m *BatchAnnotateImagesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchAnnotateImagesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchAnnotateImagesResponse proto.InternalMessageInfo
 
 func (m *BatchAnnotateImagesResponse) GetResponses() []*AnnotateImageResponse {
 	if m != nil {
@@ -1255,6 +1900,457 @@ func (m *BatchAnnotateImagesResponse) GetResponses() []*AnnotateImageResponse {
 	return nil
 }
 
+// An offline file annotation request.
+type AsyncAnnotateFileRequest struct {
+	// Required. Information about the input file.
+	InputConfig *InputConfig `protobuf:"bytes,1,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
+	// Required. Requested features.
+	Features []*Feature `protobuf:"bytes,2,rep,name=features,proto3" json:"features,omitempty"`
+	// Additional context that may accompany the image(s) in the file.
+	ImageContext *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext,proto3" json:"image_context,omitempty"`
+	// Required. The desired output location and metadata (e.g. format).
+	OutputConfig         *OutputConfig `protobuf:"bytes,4,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AsyncAnnotateFileRequest) Reset()         { *m = AsyncAnnotateFileRequest{} }
+func (m *AsyncAnnotateFileRequest) String() string { return proto.CompactTextString(m) }
+func (*AsyncAnnotateFileRequest) ProtoMessage()    {}
+func (*AsyncAnnotateFileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{23}
+}
+func (m *AsyncAnnotateFileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Unmarshal(m, b)
+}
+func (m *AsyncAnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Marshal(b, m, deterministic)
+}
+func (dst *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(dst, src)
+}
+func (m *AsyncAnnotateFileRequest) XXX_Size() int {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Size(m)
+}
+func (m *AsyncAnnotateFileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncAnnotateFileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncAnnotateFileRequest proto.InternalMessageInfo
+
+func (m *AsyncAnnotateFileRequest) GetInputConfig() *InputConfig {
+	if m != nil {
+		return m.InputConfig
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetFeatures() []*Feature {
+	if m != nil {
+		return m.Features
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetImageContext() *ImageContext {
+	if m != nil {
+		return m.ImageContext
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetOutputConfig() *OutputConfig {
+	if m != nil {
+		return m.OutputConfig
+	}
+	return nil
+}
+
+// The response for a single offline file annotation request.
+type AsyncAnnotateFileResponse struct {
+	// The output location and metadata from AsyncAnnotateFileRequest.
+	OutputConfig         *OutputConfig `protobuf:"bytes,1,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AsyncAnnotateFileResponse) Reset()         { *m = AsyncAnnotateFileResponse{} }
+func (m *AsyncAnnotateFileResponse) String() string { return proto.CompactTextString(m) }
+func (*AsyncAnnotateFileResponse) ProtoMessage()    {}
+func (*AsyncAnnotateFileResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{24}
+}
+func (m *AsyncAnnotateFileResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Unmarshal(m, b)
+}
+func (m *AsyncAnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Marshal(b, m, deterministic)
+}
+func (dst *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(dst, src)
+}
+func (m *AsyncAnnotateFileResponse) XXX_Size() int {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Size(m)
+}
+func (m *AsyncAnnotateFileResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncAnnotateFileResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncAnnotateFileResponse proto.InternalMessageInfo
+
+func (m *AsyncAnnotateFileResponse) GetOutputConfig() *OutputConfig {
+	if m != nil {
+		return m.OutputConfig
+	}
+	return nil
+}
+
+// Multiple async file annotation requests are batched into a single service
+// call.
+type AsyncBatchAnnotateFilesRequest struct {
+	// Individual async file annotation requests for this batch.
+	Requests             []*AsyncAnnotateFileRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *AsyncBatchAnnotateFilesRequest) Reset()         { *m = AsyncBatchAnnotateFilesRequest{} }
+func (m *AsyncBatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
+func (*AsyncBatchAnnotateFilesRequest) ProtoMessage()    {}
+func (*AsyncBatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{25}
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Unmarshal(m, b)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Marshal(b, m, deterministic)
+}
+func (dst *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(dst, src)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Size() int {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Size(m)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncBatchAnnotateFilesRequest proto.InternalMessageInfo
+
+func (m *AsyncBatchAnnotateFilesRequest) GetRequests() []*AsyncAnnotateFileRequest {
+	if m != nil {
+		return m.Requests
+	}
+	return nil
+}
+
+// Response to an async batch file annotation request.
+type AsyncBatchAnnotateFilesResponse struct {
+	// The list of file annotation responses, one for each request in
+	// AsyncBatchAnnotateFilesRequest.
+	Responses            []*AsyncAnnotateFileResponse `protobuf:"bytes,1,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *AsyncBatchAnnotateFilesResponse) Reset()         { *m = AsyncBatchAnnotateFilesResponse{} }
+func (m *AsyncBatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
+func (*AsyncBatchAnnotateFilesResponse) ProtoMessage()    {}
+func (*AsyncBatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{26}
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Unmarshal(m, b)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Marshal(b, m, deterministic)
+}
+func (dst *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(dst, src)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Size() int {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Size(m)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncBatchAnnotateFilesResponse proto.InternalMessageInfo
+
+func (m *AsyncBatchAnnotateFilesResponse) GetResponses() []*AsyncAnnotateFileResponse {
+	if m != nil {
+		return m.Responses
+	}
+	return nil
+}
+
+// The desired input location and metadata.
+type InputConfig struct {
+	// The Google Cloud Storage location to read the input from.
+	GcsSource *GcsSource `protobuf:"bytes,1,opt,name=gcs_source,json=gcsSource,proto3" json:"gcs_source,omitempty"`
+	// The type of the file. Currently only "application/pdf" and "image/tiff"
+	// are supported. Wildcards are not supported.
+	MimeType             string   `protobuf:"bytes,2,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InputConfig) Reset()         { *m = InputConfig{} }
+func (m *InputConfig) String() string { return proto.CompactTextString(m) }
+func (*InputConfig) ProtoMessage()    {}
+func (*InputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{27}
+}
+func (m *InputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
+}
+func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
+}
+func (dst *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(dst, src)
+}
+func (m *InputConfig) XXX_Size() int {
+	return xxx_messageInfo_InputConfig.Size(m)
+}
+func (m *InputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InputConfig proto.InternalMessageInfo
+
+func (m *InputConfig) GetGcsSource() *GcsSource {
+	if m != nil {
+		return m.GcsSource
+	}
+	return nil
+}
+
+func (m *InputConfig) GetMimeType() string {
+	if m != nil {
+		return m.MimeType
+	}
+	return ""
+}
+
+// The desired output location and metadata.
+type OutputConfig struct {
+	// The Google Cloud Storage location to write the output(s) to.
+	GcsDestination *GcsDestination `protobuf:"bytes,1,opt,name=gcs_destination,json=gcsDestination,proto3" json:"gcs_destination,omitempty"`
+	// The max number of response protos to put into each output JSON file on
+	// Google Cloud Storage.
+	// The valid range is [1, 100]. If not specified, the default value is 20.
+	//
+	// For example, for one pdf file with 100 pages, 100 response protos will
+	// be generated. If `batch_size` = 20, then 5 json files each
+	// containing 20 response protos will be written under the prefix
+	// `gcs_destination`.`uri`.
+	//
+	// Currently, batch_size only applies to GcsDestination, with potential future
+	// support for other output configurations.
+	BatchSize            int32    `protobuf:"varint,2,opt,name=batch_size,json=batchSize,proto3" json:"batch_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
+func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
+func (*OutputConfig) ProtoMessage()    {}
+func (*OutputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{28}
+}
+func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
+}
+func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
+}
+func (dst *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(dst, src)
+}
+func (m *OutputConfig) XXX_Size() int {
+	return xxx_messageInfo_OutputConfig.Size(m)
+}
+func (m *OutputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutputConfig proto.InternalMessageInfo
+
+func (m *OutputConfig) GetGcsDestination() *GcsDestination {
+	if m != nil {
+		return m.GcsDestination
+	}
+	return nil
+}
+
+func (m *OutputConfig) GetBatchSize() int32 {
+	if m != nil {
+		return m.BatchSize
+	}
+	return 0
+}
+
+// The Google Cloud Storage location where the input will be read from.
+type GcsSource struct {
+	// Google Cloud Storage URI for the input file. This must only be a
+	// Google Cloud Storage object. Wildcards are not currently supported.
+	Uri                  string   `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GcsSource) Reset()         { *m = GcsSource{} }
+func (m *GcsSource) String() string { return proto.CompactTextString(m) }
+func (*GcsSource) ProtoMessage()    {}
+func (*GcsSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{29}
+}
+func (m *GcsSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
+}
+func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
+}
+func (dst *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(dst, src)
+}
+func (m *GcsSource) XXX_Size() int {
+	return xxx_messageInfo_GcsSource.Size(m)
+}
+func (m *GcsSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsSource proto.InternalMessageInfo
+
+func (m *GcsSource) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+// The Google Cloud Storage location where the output will be written to.
+type GcsDestination struct {
+	// Google Cloud Storage URI where the results will be stored. Results will
+	// be in JSON format and preceded by its corresponding input URI. This field
+	// can either represent a single file, or a prefix for multiple outputs.
+	// Prefixes must end in a `/`.
+	//
+	// Examples:
+	//
+	// *    File: gs://bucket-name/filename.json
+	// *    Prefix: gs://bucket-name/prefix/here/
+	// *    File: gs://bucket-name/prefix/here
+	//
+	// If multiple outputs, each response is still AnnotateFileResponse, each of
+	// which contains some subset of the full list of AnnotateImageResponse.
+	// Multiple outputs can happen if, for example, the output JSON is too large
+	// and overflows into multiple sharded files.
+	Uri                  string   `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
+func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
+func (*GcsDestination) ProtoMessage()    {}
+func (*GcsDestination) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{30}
+}
+func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
+}
+func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
+}
+func (dst *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(dst, src)
+}
+func (m *GcsDestination) XXX_Size() int {
+	return xxx_messageInfo_GcsDestination.Size(m)
+}
+func (m *GcsDestination) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsDestination.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsDestination proto.InternalMessageInfo
+
+func (m *GcsDestination) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+// Contains metadata for the BatchAnnotateImages operation.
+type OperationMetadata struct {
+	// Current state of the batch operation.
+	State OperationMetadata_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.vision.v1.OperationMetadata_State" json:"state,omitempty"`
+	// The time when the batch request was received.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// The time when the operation result was last updated.
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
+func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata) ProtoMessage()    {}
+func (*OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_f9154282c1c30734, []int{31}
+}
+func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
+}
+func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+}
+func (m *OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata.Size(m)
+}
+func (m *OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationMetadata proto.InternalMessageInfo
+
+func (m *OperationMetadata) GetState() OperationMetadata_State {
+	if m != nil {
+		return m.State
+	}
+	return OperationMetadata_STATE_UNSPECIFIED
+}
+
+func (m *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*Feature)(nil), "google.cloud.vision.v1.Feature")
 	proto.RegisterType((*ImageSource)(nil), "google.cloud.vision.v1.ImageSource")
@@ -1275,12 +2371,24 @@ func init() {
 	proto.RegisterType((*WebDetectionParams)(nil), "google.cloud.vision.v1.WebDetectionParams")
 	proto.RegisterType((*ImageContext)(nil), "google.cloud.vision.v1.ImageContext")
 	proto.RegisterType((*AnnotateImageRequest)(nil), "google.cloud.vision.v1.AnnotateImageRequest")
+	proto.RegisterType((*ImageAnnotationContext)(nil), "google.cloud.vision.v1.ImageAnnotationContext")
 	proto.RegisterType((*AnnotateImageResponse)(nil), "google.cloud.vision.v1.AnnotateImageResponse")
+	proto.RegisterType((*AnnotateFileResponse)(nil), "google.cloud.vision.v1.AnnotateFileResponse")
 	proto.RegisterType((*BatchAnnotateImagesRequest)(nil), "google.cloud.vision.v1.BatchAnnotateImagesRequest")
 	proto.RegisterType((*BatchAnnotateImagesResponse)(nil), "google.cloud.vision.v1.BatchAnnotateImagesResponse")
+	proto.RegisterType((*AsyncAnnotateFileRequest)(nil), "google.cloud.vision.v1.AsyncAnnotateFileRequest")
+	proto.RegisterType((*AsyncAnnotateFileResponse)(nil), "google.cloud.vision.v1.AsyncAnnotateFileResponse")
+	proto.RegisterType((*AsyncBatchAnnotateFilesRequest)(nil), "google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest")
+	proto.RegisterType((*AsyncBatchAnnotateFilesResponse)(nil), "google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse")
+	proto.RegisterType((*InputConfig)(nil), "google.cloud.vision.v1.InputConfig")
+	proto.RegisterType((*OutputConfig)(nil), "google.cloud.vision.v1.OutputConfig")
+	proto.RegisterType((*GcsSource)(nil), "google.cloud.vision.v1.GcsSource")
+	proto.RegisterType((*GcsDestination)(nil), "google.cloud.vision.v1.GcsDestination")
+	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.vision.v1.OperationMetadata")
 	proto.RegisterEnum("google.cloud.vision.v1.Likelihood", Likelihood_name, Likelihood_value)
 	proto.RegisterEnum("google.cloud.vision.v1.Feature_Type", Feature_Type_name, Feature_Type_value)
 	proto.RegisterEnum("google.cloud.vision.v1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1291,11 +2399,19 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ImageAnnotator service
-
+// ImageAnnotatorClient is the client API for ImageAnnotator service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ImageAnnotatorClient interface {
 	// Run image detection and annotation for a batch of images.
 	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
+	// Run asynchronous image detection and annotation for a list of generic
+	// files, such as PDF files, which may contain multiple pages and multiple
+	// images per page. Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type imageAnnotatorClient struct {
@@ -1308,18 +2424,33 @@ func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
 
 func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
 	out := new(BatchAnnotateImagesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.vision.v1.ImageAnnotator/BatchAnnotateImages", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ImageAnnotator service
+func (c *imageAnnotatorClient) AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1.ImageAnnotator/AsyncBatchAnnotateFiles", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
 
+// ImageAnnotatorServer is the server API for ImageAnnotator service.
 type ImageAnnotatorServer interface {
 	// Run image detection and annotation for a batch of images.
 	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
+	// Run asynchronous image detection and annotation for a list of generic
+	// files, such as PDF files, which may contain multiple pages and multiple
+	// images per page. Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(context.Context, *AsyncBatchAnnotateFilesRequest) (*longrunning.Operation, error)
 }
 
 func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
@@ -1344,6 +2475,24 @@ func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Co
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ImageAnnotator_AsyncBatchAnnotateFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AsyncBatchAnnotateFilesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1.ImageAnnotator/AsyncBatchAnnotateFiles",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, req.(*AsyncBatchAnnotateFilesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "google.cloud.vision.v1.ImageAnnotator",
 	HandlerType: (*ImageAnnotatorServer)(nil),
@@ -1352,162 +2501,200 @@ var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
 			MethodName: "BatchAnnotateImages",
 			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
 		},
+		{
+			MethodName: "AsyncBatchAnnotateFiles",
+			Handler:    _ImageAnnotator_AsyncBatchAnnotateFiles_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/cloud/vision/v1/image_annotator.proto",
 }
 
-func init() { proto.RegisterFile("google/cloud/vision/v1/image_annotator.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 2382 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x4f, 0x6f, 0xe3, 0xc6,
-	0x15, 0x8f, 0xe4, 0x7f, 0xd2, 0x93, 0x2c, 0xd1, 0x23, 0xaf, 0xa3, 0xf5, 0xee, 0x66, 0x1d, 0xa6,
-	0x69, 0x8d, 0x6d, 0x2a, 0x37, 0x4e, 0x1a, 0xa4, 0xc9, 0xa2, 0xad, 0x24, 0xd3, 0xb6, 0xb0, 0xb2,
-	0xa4, 0x8c, 0xe4, 0x38, 0x6e, 0x83, 0x12, 0x34, 0x35, 0xd2, 0x32, 0xa1, 0x38, 0x2c, 0x49, 0xed,
-	0xda, 0xd7, 0x02, 0xfd, 0x04, 0xbd, 0xf7, 0xd8, 0x7b, 0x80, 0x7e, 0x80, 0x5e, 0x7a, 0xe8, 0xb1,
-	0xc8, 0x57, 0xe8, 0x37, 0x28, 0x50, 0xf4, 0x58, 0xcc, 0x1f, 0x52, 0x43, 0xad, 0xb5, 0x2b, 0x17,
-	0x3d, 0x89, 0xf3, 0xde, 0xfb, 0xfd, 0xde, 0xcc, 0x9b, 0x79, 0x33, 0x6f, 0x46, 0xf0, 0xc1, 0x98,
-	0xd2, 0xb1, 0x4b, 0x0e, 0x6c, 0x97, 0x4e, 0x87, 0x07, 0x2f, 0x9c, 0xd0, 0xa1, 0xde, 0xc1, 0x8b,
-	0x0f, 0x0f, 0x9c, 0x89, 0x35, 0x26, 0xa6, 0xe5, 0x79, 0x34, 0xb2, 0x22, 0x1a, 0xd4, 0xfc, 0x80,
-	0x46, 0x14, 0xed, 0x08, 0xeb, 0x1a, 0xb7, 0xae, 0x09, 0xeb, 0xda, 0x8b, 0x0f, 0x77, 0x1f, 0x4a,
-	0x16, 0xcb, 0x77, 0x0e, 0x24, 0xc6, 0xa1, 0x5e, 0x28, 0x50, 0xbb, 0xef, 0x2f, 0xf0, 0x31, 0x26,
-	0x74, 0x42, 0xa2, 0xe0, 0x46, 0x9a, 0x2d, 0xea, 0x4a, 0x44, 0xae, 0x23, 0x73, 0xc6, 0x2a, 0xad,
-	0x9f, 0x2c, 0xb0, 0x7e, 0x49, 0xae, 0xcc, 0x21, 0x89, 0x88, 0xad, 0xd8, 0xbe, 0x2d, 0x6d, 0x03,
-	0xdf, 0x3e, 0x08, 0x23, 0x2b, 0x9a, 0x86, 0x73, 0x8a, 0xe8, 0xc6, 0x27, 0x07, 0x36, 0x75, 0xe3,
-	0x81, 0xee, 0x56, 0x55, 0x85, 0x6b, 0x45, 0xae, 0x37, 0x16, 0x1a, 0xfd, 0x5f, 0x59, 0xd8, 0x38,
-	0x26, 0x56, 0x34, 0x0d, 0x08, 0xfa, 0x14, 0x56, 0x99, 0x41, 0x35, 0xb3, 0x97, 0xd9, 0x2f, 0x1d,
-	0xfe, 0xa0, 0x76, 0x7b, 0x74, 0x6a, 0xd2, 0xbc, 0x36, 0xb8, 0xf1, 0x09, 0xe6, 0x08, 0xf4, 0x18,
-	0x0a, 0x13, 0xeb, 0xda, 0x0c, 0x48, 0x38, 0x75, 0xa3, 0xb0, 0x9a, 0xdd, 0xcb, 0xec, 0xaf, 0x61,
-	0x98, 0x58, 0xd7, 0x58, 0x48, 0xd0, 0x36, 0xac, 0x4d, 0xe8, 0x90, 0xb8, 0xd5, 0x95, 0xbd, 0xcc,
-	0x7e, 0x1e, 0x8b, 0x86, 0xfe, 0xef, 0x0c, 0xac, 0x32, 0x16, 0xb4, 0x0d, 0xda, 0xe0, 0xb2, 0x67,
-	0x98, 0xe7, 0x9d, 0x7e, 0xcf, 0x68, 0xb6, 0x8e, 0x5b, 0xc6, 0x91, 0xf6, 0x16, 0x42, 0x50, 0x3a,
-	0xae, 0x37, 0x0d, 0xf3, 0xc8, 0x18, 0x18, 0xcd, 0x41, 0xab, 0xdb, 0xd1, 0x32, 0x68, 0x07, 0x50,
-	0xbb, 0xde, 0x39, 0x3a, 0xab, 0xe3, 0x67, 0x8a, 0x3c, 0xcb, 0x6c, 0xdb, 0xdd, 0x93, 0xae, 0x22,
-	0x5b, 0x41, 0x15, 0x28, 0xb7, 0xeb, 0x0d, 0xa3, 0xad, 0x08, 0x57, 0x99, 0xe1, 0xc0, 0xf8, 0x6a,
-	0xa0, 0xc8, 0xd6, 0xd0, 0x03, 0x78, 0xfb, 0xa8, 0xdb, 0x3c, 0x3f, 0x33, 0x3a, 0x03, 0x73, 0x4e,
-	0x59, 0x40, 0xf7, 0xe1, 0x5e, 0xbf, 0x7e, 0x6c, 0x98, 0x7d, 0xa3, 0x8e, 0x9b, 0xa7, 0x8a, 0x6a,
-	0x9d, 0x75, 0xbb, 0x75, 0x56, 0x3f, 0x31, 0xcc, 0x1e, 0xee, 0xf6, 0x0c, 0x3c, 0x68, 0x19, 0x7d,
-	0x6d, 0x03, 0x95, 0x00, 0x9a, 0xb8, 0xdb, 0x33, 0x4f, 0x5b, 0x9d, 0x41, 0x5f, 0xcb, 0xa3, 0x2d,
-	0xd8, 0xbc, 0x30, 0x1a, 0x0a, 0x10, 0xf4, 0x0e, 0x14, 0x5a, 0x6c, 0x45, 0xf6, 0xe9, 0x34, 0xb0,
-	0x09, 0xd2, 0x61, 0x73, 0x6c, 0x87, 0xa6, 0x58, 0xa4, 0xd3, 0xc0, 0xe1, 0x33, 0x90, 0xc7, 0x85,
-	0xb1, 0x1d, 0x72, 0xb3, 0xf3, 0xc0, 0x41, 0x0f, 0x20, 0x3f, 0xd3, 0x67, 0xb9, 0x3e, 0xe7, 0x48,
-	0xa5, 0xfe, 0x5b, 0x58, 0xe3, 0x86, 0xa8, 0x0a, 0x1b, 0x36, 0xf5, 0x22, 0xe2, 0x45, 0x9c, 0xa3,
-	0x88, 0xe3, 0x26, 0xfa, 0x1c, 0xd6, 0x43, 0xee, 0x8d, 0x83, 0x0b, 0x87, 0xef, 0x2d, 0x9a, 0x5e,
-	0xa5, 0x63, 0x58, 0x42, 0xf4, 0x7f, 0x94, 0xa1, 0x74, 0x6c, 0xd9, 0xa4, 0x9e, 0x2c, 0x5b, 0xd4,
-	0x82, 0xcd, 0x2b, 0x3a, 0xf5, 0x86, 0x8e, 0x37, 0x36, 0x7d, 0xea, 0xde, 0x70, 0x7f, 0x85, 0xc5,
-	0xab, 0xa6, 0x21, 0x8d, 0x7b, 0xd4, 0xbd, 0xc1, 0xc5, 0x2b, 0xa5, 0x85, 0x3a, 0xa0, 0x8d, 0x86,
-	0x66, 0x9a, 0x2d, 0x7b, 0x07, 0xb6, 0xd2, 0x68, 0xa8, 0xb6, 0xd1, 0x19, 0xe4, 0x5d, 0xcb, 0x1b,
-	0x4e, 0xac, 0xe0, 0xdb, 0xb0, 0xba, 0xb2, 0xb7, 0xb2, 0x5f, 0x38, 0x3c, 0x58, 0xb8, 0x98, 0x53,
-	0xa3, 0xaa, 0xb5, 0x25, 0x0e, 0xcf, 0x18, 0xd0, 0x23, 0x80, 0x80, 0xba, 0xae, 0x69, 0x79, 0x63,
-	0x97, 0x54, 0x57, 0xf7, 0x32, 0xfb, 0x59, 0x9c, 0x67, 0x92, 0x3a, 0x13, 0xb0, 0x89, 0xf1, 0x2d,
-	0x4f, 0x6a, 0xd7, 0xb8, 0x36, 0xe7, 0x5b, 0x9e, 0x50, 0x3e, 0x02, 0x88, 0x1c, 0x37, 0x92, 0xda,
-	0x75, 0x81, 0x65, 0x12, 0xa1, 0xfe, 0x10, 0xb6, 0x93, 0xe4, 0x36, 0x6d, 0xea, 0x8d, 0x9c, 0x21,
-	0xf1, 0x6c, 0x52, 0xdd, 0xe0, 0x86, 0x95, 0x44, 0xd7, 0x4c, 0x54, 0xe8, 0x67, 0xb0, 0x13, 0x77,
-	0x8d, 0x05, 0x4b, 0x01, 0xe5, 0x38, 0xe8, 0x9e, 0xa2, 0x55, 0x60, 0x2d, 0x28, 0x7d, 0x43, 0x6f,
-	0x4c, 0xd7, 0xf9, 0x96, 0xb8, 0xce, 0x73, 0x4a, 0x87, 0xd5, 0x3c, 0xcf, 0x72, 0x7d, 0x51, 0x60,
-	0xda, 0x89, 0x25, 0xde, 0xfc, 0x86, 0xde, 0xcc, 0x9a, 0xa8, 0x0b, 0x5b, 0x21, 0x0d, 0x02, 0xfa,
-	0x52, 0x65, 0x83, 0xa5, 0xd9, 0x34, 0x01, 0x56, 0x08, 0xcf, 0x40, 0xb3, 0xbc, 0x31, 0x09, 0x54,
-	0xbe, 0xc2, 0xd2, 0x7c, 0x65, 0x8e, 0x55, 0xe8, 0xfa, 0x50, 0x09, 0xa7, 0x81, 0x1f, 0x38, 0x21,
-	0x51, 0x19, 0x8b, 0x4b, 0x33, 0xa2, 0x18, 0xae, 0x90, 0x7e, 0x0d, 0xd5, 0xa9, 0x37, 0x24, 0x81,
-	0x49, 0xae, 0x7d, 0x1a, 0x92, 0xa1, 0xca, 0xbc, 0xb9, 0x34, 0xf3, 0x0e, 0xe7, 0x30, 0x04, 0x85,
-	0xc2, 0xfe, 0x05, 0xa0, 0x2b, 0x77, 0x1a, 0x04, 0x69, 0xde, 0xd2, 0xd2, 0xbc, 0x5b, 0x12, 0x9d,
-	0x8e, 0xc2, 0x73, 0x62, 0x0d, 0x5f, 0x12, 0x2b, 0x15, 0xd7, 0xf2, 0xf2, 0x51, 0x88, 0xe1, 0x33,
-	0xd9, 0xee, 0xdf, 0x37, 0x20, 0x17, 0xa7, 0x08, 0x3a, 0x95, 0xc7, 0xc5, 0x0a, 0xa7, 0xfc, 0xf8,
-	0x8e, 0x19, 0xa6, 0x1e, 0x1f, 0x4f, 0x21, 0xe7, 0xd3, 0xd0, 0x61, 0x7a, 0x9e, 0x5f, 0x85, 0xc3,
-	0xbd, 0x45, 0x6c, 0x3d, 0x69, 0x87, 0x13, 0x84, 0xfe, 0x97, 0xf5, 0xd9, 0x29, 0x72, 0xde, 0x79,
-	0xd6, 0xe9, 0x5e, 0x74, 0xcc, 0xf8, 0x8c, 0xd0, 0xde, 0x42, 0x45, 0xc8, 0xb5, 0x8d, 0xe3, 0x81,
-	0x69, 0x5c, 0x1a, 0x5a, 0x06, 0x6d, 0x42, 0x1e, 0xb7, 0x4e, 0x4e, 0x45, 0x33, 0x8b, 0xaa, 0xb0,
-	0xcd, 0x95, 0xdd, 0x63, 0x33, 0x36, 0x6a, 0xe0, 0xee, 0x85, 0xb6, 0xc2, 0xb6, 0x7d, 0x61, 0x38,
-	0xaf, 0x5a, 0x65, 0xaa, 0x18, 0x94, 0x70, 0x71, 0xd5, 0x1a, 0xda, 0x85, 0x9d, 0x04, 0x95, 0xd6,
-	0xad, 0x33, 0xd8, 0x59, 0xeb, 0xa8, 0xd7, 0x6d, 0x75, 0x06, 0x66, 0xc3, 0x18, 0x5c, 0x18, 0x46,
-	0x87, 0x69, 0xd9, 0x91, 0x51, 0x84, 0x5c, 0xa7, 0xdb, 0x37, 0xcc, 0x41, 0xab, 0xa7, 0xe5, 0x58,
-	0x1f, 0xcf, 0x7b, 0x3d, 0x03, 0x9b, 0xed, 0x56, 0x4f, 0xcb, 0xb3, 0x66, 0xbb, 0x7b, 0x21, 0x9b,
-	0xc0, 0x8e, 0x97, 0xb3, 0xee, 0xf9, 0xe0, 0x94, 0xf7, 0x4a, 0x2b, 0xa0, 0x32, 0x14, 0x44, 0x9b,
-	0xfb, 0xd3, 0x8a, 0x48, 0x83, 0xa2, 0x10, 0x34, 0x8d, 0xce, 0xc0, 0xc0, 0xda, 0x26, 0xba, 0x07,
-	0x5b, 0x9c, 0xbe, 0xd1, 0x1d, 0x0c, 0xba, 0x67, 0xd2, 0xb0, 0xc4, 0xe2, 0xa5, 0x8a, 0x39, 0x5f,
-	0x99, 0x9d, 0xb0, 0xaa, 0x54, 0x92, 0x68, 0xc9, 0xa8, 0x8d, 0x4b, 0xc3, 0x1c, 0x74, 0x7b, 0x66,
-	0xa3, 0x7b, 0xde, 0x39, 0xaa, 0xe3, 0x4b, 0x6d, 0x2b, 0xa5, 0x12, 0xa3, 0x6e, 0x76, 0x71, 0xc7,
-	0xc0, 0x1a, 0x42, 0x0f, 0xa1, 0x9a, 0xa8, 0x24, 0x63, 0x02, 0xac, 0x24, 0xe1, 0x67, 0x5a, 0xfe,
-	0x21, 0x71, 0xdb, 0xb3, 0x40, 0xbe, 0xe2, 0xee, 0x5e, 0x5a, 0x97, 0xf2, 0xb7, 0x83, 0x1e, 0xc1,
-	0xfd, 0x99, 0x6e, 0xde, 0xe1, 0xdb, 0xb3, 0x59, 0x9d, 0xf7, 0x58, 0x45, 0x8f, 0xe1, 0x81, 0x3a,
-	0xcf, 0xa6, 0x98, 0x82, 0x78, 0xc6, 0xb4, 0xfb, 0x68, 0x0f, 0x1e, 0xa6, 0xa6, 0x74, 0xde, 0x62,
-	0x97, 0x05, 0x54, 0x50, 0xd4, 0xb1, 0x39, 0xc0, 0xf5, 0x13, 0x76, 0xd8, 0x3f, 0x60, 0xd1, 0x97,
-	0x38, 0x45, 0xfc, 0x90, 0x57, 0x2c, 0xf1, 0xd8, 0x7b, 0xe7, 0xbd, 0x56, 0x5b, 0x7b, 0xc4, 0x2a,
-	0x96, 0x59, 0xf7, 0x84, 0xf0, 0x1d, 0x86, 0x3f, 0xee, 0x62, 0xe3, 0xd4, 0xa8, 0x1f, 0x99, 0x27,
-	0xbc, 0xa0, 0x69, 0xd7, 0xb5, 0xc7, 0xac, 0xac, 0x68, 0x9e, 0xb6, 0x3a, 0xe6, 0x49, 0xa7, 0x3e,
-	0x38, 0x65, 0x94, 0x7b, 0xcc, 0x3f, 0x17, 0x71, 0xde, 0x93, 0x6e, 0x87, 0x49, 0xdf, 0x65, 0x78,
-	0x2e, 0x15, 0xcc, 0x52, 0xac, 0xeb, 0x4f, 0xa1, 0xd8, 0xa6, 0x36, 0x4f, 0xca, 0x96, 0x37, 0xa2,
-	0xe8, 0x03, 0xd8, 0x70, 0xad, 0xc8, 0x74, 0xbd, 0xb1, 0x3c, 0xca, 0x2b, 0x71, 0x0e, 0xb2, 0x1c,
-	0xad, 0xb5, 0xad, 0xa8, 0xed, 0x8d, 0xf1, 0xba, 0xcb, 0x7f, 0xf5, 0x0b, 0xc8, 0xf5, 0x02, 0xea,
-	0x93, 0x20, 0xba, 0x41, 0x08, 0x56, 0x3d, 0x6b, 0x42, 0x64, 0xd5, 0xc2, 0xbf, 0x59, 0xc1, 0xf7,
-	0xc2, 0x72, 0xa7, 0x44, 0x96, 0x2a, 0xa2, 0x81, 0xde, 0x85, 0xe2, 0xd4, 0xf1, 0xa2, 0x4f, 0x3e,
-	0x36, 0x85, 0x92, 0x6d, 0x1d, 0xab, 0xb8, 0x20, 0x64, 0x5f, 0x32, 0x91, 0xfe, 0x87, 0x15, 0xd0,
-	0x0c, 0x2f, 0x72, 0xa2, 0x1b, 0xa5, 0xd8, 0xd0, 0x60, 0x65, 0xe2, 0x0c, 0xa5, 0x03, 0xf6, 0x89,
-	0x76, 0x60, 0xdd, 0xa5, 0xb6, 0xe5, 0xc6, 0x0e, 0x64, 0x0b, 0xed, 0x41, 0x61, 0x48, 0x42, 0x3b,
-	0x70, 0x7c, 0xbe, 0x9b, 0x88, 0x72, 0x53, 0x15, 0xb1, 0x9e, 0x85, 0x36, 0x0d, 0xe2, 0x93, 0x5c,
-	0x34, 0xd0, 0x3b, 0x00, 0xca, 0x51, 0x2a, 0x8e, 0x71, 0x45, 0xc2, 0xf4, 0x11, 0xf5, 0x1d, 0xdb,
-	0x72, 0x9d, 0xe8, 0x46, 0x1e, 0xe4, 0x8a, 0xe4, 0xd5, 0x72, 0x68, 0xe3, 0x7f, 0x2e, 0x87, 0x1a,
-	0x90, 0x77, 0xe5, 0xc4, 0x84, 0xd5, 0x1c, 0x2f, 0x5f, 0x16, 0xd2, 0xa8, 0x33, 0x88, 0x67, 0x30,
-	0xf4, 0x2b, 0x00, 0x5f, 0x4c, 0x8f, 0x43, 0xc2, 0x6a, 0x9e, 0x93, 0x2c, 0xde, 0x53, 0xe5, 0x44,
-	0x62, 0x05, 0xa3, 0xff, 0x35, 0x0b, 0xdb, 0x7d, 0x6b, 0x44, 0xfa, 0xc4, 0x0a, 0xec, 0xe7, 0xca,
-	0x5c, 0x7c, 0x0a, 0x6b, 0xd6, 0x70, 0xea, 0x46, 0xf2, 0x9a, 0xb0, 0xcc, 0x51, 0x22, 0x00, 0x0c,
-	0x19, 0xfa, 0x94, 0x8e, 0xf8, 0x94, 0x2d, 0x89, 0xe4, 0x00, 0xf4, 0x14, 0x36, 0x26, 0x64, 0xc8,
-	0x62, 0x2d, 0x4f, 0x9b, 0x65, 0xb0, 0x31, 0x04, 0xfd, 0x02, 0x72, 0x2f, 0x1c, 0xea, 0xf2, 0x99,
-	0x5d, 0x5d, 0x1a, 0x9e, 0x60, 0xd0, 0x27, 0xb0, 0x1a, 0x58, 0xf6, 0xcd, 0x1d, 0x2a, 0x26, 0x6e,
-	0xaf, 0xbf, 0x84, 0x02, 0xcb, 0x1a, 0xea, 0x8d, 0x31, 0xb1, 0x23, 0xf4, 0x11, 0x14, 0x26, 0x8e,
-	0x67, 0x2e, 0x91, 0x64, 0xf9, 0x89, 0xe3, 0x89, 0x4f, 0x0e, 0xb2, 0xae, 0x13, 0x50, 0xf6, 0x75,
-	0x20, 0xeb, 0x5a, 0x7c, 0xea, 0x01, 0xe4, 0x9b, 0xec, 0xf6, 0xc7, 0xf3, 0x7a, 0x1f, 0xd6, 0xf8,
-	0x55, 0x50, 0x3a, 0x44, 0x29, 0x2c, 0x37, 0xc3, 0xc2, 0x60, 0x96, 0x19, 0x59, 0x35, 0x33, 0xde,
-	0x87, 0x92, 0xef, 0x5c, 0x13, 0xd7, 0x1c, 0x05, 0x96, 0x9d, 0x24, 0x55, 0x16, 0x6f, 0x72, 0xe9,
-	0xb1, 0x14, 0xea, 0xe7, 0x50, 0x3d, 0xa2, 0x13, 0xc7, 0xb3, 0xbc, 0x88, 0x93, 0x86, 0xca, 0x92,
-	0xf9, 0x39, 0xac, 0x73, 0x0f, 0x61, 0x35, 0xc3, 0x57, 0xe2, 0xbb, 0x8b, 0x42, 0x98, 0xf4, 0x1a,
-	0x4b, 0x80, 0xee, 0x42, 0x99, 0x5f, 0x48, 0x7a, 0xc9, 0xca, 0x44, 0x97, 0x50, 0x1e, 0x4a, 0x4f,
-	0x66, 0x42, 0xcb, 0x86, 0xf6, 0xd3, 0x45, 0xb4, 0x8b, 0x3a, 0x86, 0x4b, 0xc3, 0x94, 0x46, 0xff,
-	0x73, 0x06, 0x72, 0xcd, 0x80, 0xfa, 0xa7, 0x8e, 0x17, 0xfd, 0x3f, 0x6f, 0x38, 0xe9, 0xdd, 0x25,
-	0xfb, 0xca, 0xee, 0x72, 0x00, 0x15, 0x67, 0xe2, 0xd3, 0x20, 0xb2, 0x3c, 0x9b, 0xcc, 0x07, 0x1a,
-	0xcd, 0x54, 0x49, 0xb4, 0xbf, 0x84, 0x4a, 0xdc, 0x4f, 0x35, 0xd0, 0xbf, 0x04, 0xb0, 0x03, 0xea,
-	0x9b, 0xcf, 0x99, 0x5c, 0x06, 0x7b, 0x61, 0xda, 0xc7, 0x04, 0x38, 0x6f, 0xc7, 0x54, 0xfa, 0x27,
-	0x50, 0x4e, 0x78, 0x7b, 0x56, 0x60, 0x4d, 0x42, 0xf4, 0x1e, 0x6c, 0x5a, 0xa1, 0x4f, 0xec, 0xc8,
-	0x0c, 0x98, 0x13, 0x41, 0x9b, 0xc5, 0x45, 0x21, 0xc4, 0x5c, 0xa6, 0x1f, 0x01, 0xba, 0x20, 0x57,
-	0x47, 0xf1, 0x7d, 0x45, 0x42, 0x6b, 0x50, 0x71, 0x3c, 0xdb, 0x9d, 0x0e, 0x89, 0x39, 0x26, 0x34,
-	0xf5, 0x3c, 0x90, 0xc3, 0x5b, 0x52, 0x75, 0x42, 0xa8, 0x7c, 0x25, 0xd0, 0xbf, 0xcb, 0x42, 0x91,
-	0xcf, 0x76, 0x93, 0x5d, 0x5a, 0xaf, 0x23, 0x74, 0x02, 0x9b, 0x7c, 0xe5, 0x53, 0x6f, 0x6c, 0x06,
-	0xc4, 0x8e, 0xe4, 0x14, 0x2c, 0xbc, 0xbb, 0x2a, 0xe9, 0x86, 0x0b, 0xae, 0x92, 0x7b, 0xef, 0x43,
-	0xc9, 0xb5, 0xbc, 0xf1, 0x94, 0x5d, 0xa0, 0x45, 0x70, 0xb2, 0x7b, 0x2b, 0xfb, 0x79, 0xbc, 0x19,
-	0x4b, 0xf9, 0x88, 0x51, 0x1f, 0xb6, 0x66, 0xf1, 0x33, 0x7d, 0x3e, 0x0a, 0x59, 0x91, 0xfe, 0xe8,
-	0x4d, 0x61, 0x94, 0xf1, 0xc2, 0x65, 0x7b, 0x2e, 0x80, 0x5f, 0xc3, 0x76, 0xea, 0x15, 0x27, 0xe6,
-	0x5d, 0xe7, 0xbc, 0x4f, 0x16, 0xf1, 0xbe, 0x1a, 0x4f, 0x8c, 0x5e, 0xbe, 0x22, 0xd3, 0xbf, 0xcf,
-	0xc0, 0xb6, 0x5c, 0x01, 0x84, 0xc7, 0x0e, 0x93, 0xdf, 0x4d, 0x49, 0xc8, 0xb6, 0x9b, 0x35, 0xfe,
-	0x3e, 0x20, 0x63, 0xf6, 0xe8, 0xb5, 0xf7, 0x7d, 0x2c, 0x6c, 0xd1, 0xe7, 0x90, 0x1b, 0x89, 0xe7,
-	0x1d, 0x11, 0xa1, 0xc2, 0xe1, 0xe3, 0x37, 0x3c, 0x03, 0xe1, 0x04, 0xc0, 0x12, 0x46, 0x3c, 0x51,
-	0xd8, 0x62, 0xfa, 0xf8, 0xfa, 0x7d, 0x4d, 0xc2, 0xa8, 0x53, 0x8d, 0x8b, 0x8e, 0xd2, 0xd2, 0xff,
-	0xb6, 0x01, 0xf7, 0xe6, 0x46, 0x15, 0xfa, 0xd4, 0x0b, 0x09, 0xfa, 0x02, 0xb4, 0x91, 0x65, 0x13,
-	0xe5, 0x05, 0x2d, 0x5e, 0xe8, 0x3f, 0x5c, 0xee, 0x06, 0x82, 0xcb, 0xa3, 0x54, 0x3b, 0x44, 0xbf,
-	0x81, 0xed, 0xf8, 0xd2, 0x9c, 0xa2, 0x15, 0x01, 0xd8, 0x5f, 0x44, 0x3b, 0x5f, 0xa5, 0xe0, 0x4a,
-	0xcc, 0xa2, 0x92, 0xf7, 0x41, 0x73, 0xe9, 0x98, 0xa6, 0x88, 0x57, 0xee, 0x48, 0x5c, 0x66, 0x0c,
-	0x2a, 0xe9, 0x39, 0x6c, 0xb9, 0xd6, 0x15, 0x71, 0x53, 0xac, 0xab, 0x77, 0x64, 0xd5, 0x38, 0xc5,
-	0x5c, 0x5f, 0xe7, 0x5e, 0x27, 0xc3, 0xea, 0xda, 0x5d, 0xfb, 0xca, 0x18, 0x54, 0xd2, 0xaf, 0x60,
-	0x7b, 0x34, 0x75, 0x5d, 0x73, 0x8e, 0x99, 0xdf, 0xc7, 0x5f, 0x33, 0x69, 0x83, 0x14, 0x0d, 0x46,
-	0x8c, 0x23, 0x2d, 0x43, 0x57, 0xb0, 0x13, 0x5a, 0x23, 0x62, 0x86, 0xbc, 0x44, 0x51, 0xb9, 0x45,
-	0x6a, 0x7d, 0xb0, 0x88, 0xfb, 0xb6, 0xba, 0x06, 0x6f, 0x87, 0xb7, 0x55, 0x3b, 0x63, 0x78, 0x20,
-	0xd6, 0xf4, 0xac, 0x34, 0x52, 0x1d, 0xe5, 0x5e, 0xbf, 0x37, 0xcc, 0x1d, 0x5d, 0xf8, 0xbe, 0x93,
-	0x16, 0x28, 0x8e, 0x4c, 0xb8, 0xa7, 0x6c, 0x3d, 0x8a, 0x8b, 0x02, 0x77, 0xf1, 0xe3, 0x37, 0x6e,
-	0x3f, 0xea, 0x42, 0xb4, 0x6f, 0x39, 0x1b, 0x5a, 0xb0, 0x99, 0xda, 0x86, 0xf8, 0xb3, 0xc5, 0x6b,
-	0xb2, 0x53, 0xdd, 0x7f, 0x70, 0x51, 0xdd, 0x79, 0x58, 0x49, 0x41, 0x82, 0x80, 0x06, 0xbc, 0x22,
-	0x52, 0x4a, 0x8a, 0xc0, 0xb7, 0x6b, 0x7d, 0xfe, 0x20, 0x8d, 0x85, 0x81, 0x3e, 0x82, 0xdd, 0x86,
-	0x15, 0x25, 0x11, 0x15, 0xb9, 0x1c, 0xc6, 0x5b, 0xd4, 0x29, 0xe4, 0x02, 0xf1, 0x19, 0xe7, 0xf0,
-	0xc2, 0x29, 0xbb, 0x6d, 0x8b, 0xc3, 0x09, 0x5a, 0xff, 0x06, 0x1e, 0xdc, 0xea, 0x47, 0x6e, 0x1a,
-	0xcf, 0x20, 0x1f, 0xc8, 0xef, 0xd8, 0xd3, 0x4f, 0x96, 0xf4, 0x24, 0x50, 0x78, 0x86, 0x7f, 0x42,
-	0x00, 0x94, 0x77, 0x96, 0x02, 0x6c, 0xc8, 0x47, 0x07, 0xed, 0x2d, 0x76, 0x27, 0xfb, 0xd2, 0xc0,
-	0x97, 0xe6, 0x79, 0xa7, 0xdd, 0x7a, 0x66, 0xb4, 0x2f, 0xb5, 0x0c, 0xbb, 0xda, 0x27, 0xad, 0x2c,
-	0x6b, 0xf5, 0xba, 0xfd, 0x7e, 0xab, 0xd1, 0x36, 0xb4, 0x15, 0x04, 0xb0, 0x2e, 0x35, 0xab, 0xec,
-	0x1a, 0xcf, 0xa1, 0x52, 0xb0, 0x76, 0xf8, 0x5d, 0x06, 0x4a, 0xbc, 0x0f, 0xf5, 0xf8, 0x5f, 0x0b,
-	0xf4, 0xa7, 0x0c, 0x54, 0x6e, 0x19, 0x26, 0x3a, 0x5c, 0x58, 0x92, 0x2c, 0x8c, 0xfd, 0xee, 0x47,
-	0x77, 0xc2, 0x88, 0xb1, 0xeb, 0xef, 0xfc, 0xfe, 0xfb, 0x7f, 0xfe, 0x31, 0x5b, 0xd5, 0x2b, 0xc9,
-	0x7f, 0x2a, 0xe1, 0x67, 0x72, 0xa9, 0x92, 0xcf, 0x32, 0x4f, 0x1a, 0x11, 0xec, 0xda, 0x74, 0xb2,
-	0x80, 0xb9, 0x51, 0x49, 0x0f, 0xa7, 0x17, 0xd0, 0x88, 0xf6, 0x32, 0xbf, 0x7e, 0x2a, 0xcd, 0xc7,
-	0x94, 0x1d, 0xc6, 0x35, 0x1a, 0x8c, 0x0f, 0xc6, 0xc4, 0xe3, 0x7f, 0x4f, 0x1c, 0x08, 0x95, 0xe5,
-	0x3b, 0xe1, 0xfc, 0x3f, 0x23, 0x9f, 0x8b, 0xaf, 0xff, 0x64, 0x32, 0x57, 0xeb, 0xdc, 0xf6, 0xa3,
-	0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf4, 0xbf, 0x21, 0x35, 0xfd, 0x19, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1/image_annotator.proto", fileDescriptor_image_annotator_f9154282c1c30734)
+}
+
+var fileDescriptor_image_annotator_f9154282c1c30734 = []byte{
+	// 2892 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x73, 0xe3, 0x48,
+	0x15, 0x5f, 0x3b, 0x4e, 0x62, 0x3f, 0x3b, 0x89, 0xd2, 0xf9, 0x18, 0x4f, 0xe6, 0x2b, 0xa3, 0x65,
+	0xd9, 0xd4, 0x30, 0x24, 0x4c, 0x76, 0x99, 0x5a, 0x66, 0xa6, 0x00, 0xc7, 0x51, 0x12, 0xd7, 0x38,
+	0xb6, 0xb7, 0xed, 0xcc, 0x6c, 0x60, 0x0b, 0x95, 0x22, 0xb7, 0x35, 0xda, 0x95, 0x25, 0x21, 0xc9,
+	0x33, 0xc9, 0x52, 0xc5, 0x81, 0x2a, 0xce, 0x1c, 0x38, 0x71, 0xe1, 0xc0, 0x01, 0x0e, 0x9c, 0xa8,
+	0x82, 0x3b, 0x57, 0x0e, 0x1c, 0xa8, 0xfd, 0x17, 0xf8, 0x0f, 0xa8, 0xa2, 0x38, 0x52, 0xfd, 0x21,
+	0xb9, 0xe5, 0x44, 0x99, 0x64, 0xd9, 0x03, 0xa7, 0xb8, 0xdf, 0x7b, 0xbf, 0xdf, 0xeb, 0x7e, 0xdd,
+	0xaf, 0xfb, 0x75, 0x2b, 0xf0, 0xd0, 0xf2, 0x3c, 0xcb, 0x21, 0x5b, 0xa6, 0xe3, 0x8d, 0xfa, 0x5b,
+	0xaf, 0xed, 0xd0, 0xf6, 0xdc, 0xad, 0xd7, 0x8f, 0xb6, 0xec, 0xa1, 0x61, 0x11, 0xdd, 0x70, 0x5d,
+	0x2f, 0x32, 0x22, 0x2f, 0xd8, 0xf4, 0x03, 0x2f, 0xf2, 0xd0, 0x2a, 0xb7, 0xde, 0x64, 0xd6, 0x9b,
+	0xdc, 0x7a, 0xf3, 0xf5, 0xa3, 0xb5, 0xdb, 0x82, 0xc5, 0xf0, 0xed, 0x2d, 0x81, 0xb1, 0x3d, 0x37,
+	0xe4, 0xa8, 0xb5, 0xf7, 0x32, 0x7c, 0x58, 0xc4, 0x1b, 0x92, 0x28, 0x38, 0x13, 0x66, 0x59, 0x5d,
+	0x89, 0xc8, 0x69, 0xa4, 0x8f, 0x59, 0x85, 0xf5, 0x83, 0x0c, 0xeb, 0x37, 0xe4, 0x44, 0xef, 0x93,
+	0x88, 0x98, 0x92, 0xed, 0xbb, 0xc2, 0xd6, 0xf1, 0x5c, 0x2b, 0x18, 0xb9, 0xae, 0xed, 0x5a, 0x5b,
+	0x9e, 0x4f, 0x82, 0x54, 0x2f, 0xef, 0x09, 0x23, 0xd6, 0x3a, 0x19, 0x0d, 0xb6, 0x22, 0x7b, 0x48,
+	0xc2, 0xc8, 0x18, 0xfa, 0xc2, 0xe0, 0x86, 0x30, 0x08, 0x7c, 0x73, 0x2b, 0x8c, 0x8c, 0x68, 0x14,
+	0x4e, 0x28, 0xa2, 0x33, 0x9f, 0x6c, 0x99, 0x9e, 0x13, 0x87, 0x6b, 0xad, 0x2a, 0x2b, 0x1c, 0x23,
+	0x72, 0x5c, 0x8b, 0x6b, 0xd4, 0x7f, 0xe5, 0x61, 0x76, 0x8f, 0x18, 0xd1, 0x28, 0x20, 0xe8, 0x23,
+	0x28, 0x50, 0x83, 0x6a, 0x6e, 0x3d, 0xb7, 0x31, 0xbf, 0xfd, 0x8d, 0xcd, 0x8b, 0x63, 0xbc, 0x29,
+	0xcc, 0x37, 0x7b, 0x67, 0x3e, 0xc1, 0x0c, 0x81, 0xee, 0x41, 0x79, 0x68, 0x9c, 0xea, 0x01, 0x09,
+	0x47, 0x4e, 0x14, 0x56, 0xf3, 0xeb, 0xb9, 0x8d, 0x69, 0x0c, 0x43, 0xe3, 0x14, 0x73, 0x09, 0x5a,
+	0x86, 0xe9, 0xa1, 0xd7, 0x27, 0x4e, 0x75, 0x6a, 0x3d, 0xb7, 0x51, 0xc2, 0xbc, 0xa1, 0xfe, 0x3b,
+	0x07, 0x05, 0xca, 0x82, 0x96, 0x41, 0xe9, 0x1d, 0x77, 0x34, 0xfd, 0xa8, 0xd5, 0xed, 0x68, 0xf5,
+	0xc6, 0x5e, 0x43, 0xdb, 0x55, 0xde, 0x41, 0x08, 0xe6, 0xf7, 0x6a, 0x75, 0x4d, 0xdf, 0xd5, 0x7a,
+	0x5a, 0xbd, 0xd7, 0x68, 0xb7, 0x94, 0x1c, 0x5a, 0x05, 0xd4, 0xac, 0xb5, 0x76, 0x0f, 0x6b, 0xf8,
+	0xb9, 0x24, 0xcf, 0x53, 0xdb, 0x66, 0x7b, 0xbf, 0x2d, 0xc9, 0xa6, 0xd0, 0x12, 0x2c, 0x34, 0x6b,
+	0x3b, 0x5a, 0x53, 0x12, 0x16, 0xa8, 0x61, 0x4f, 0xfb, 0xa4, 0x27, 0xc9, 0xa6, 0xd1, 0x2d, 0xb8,
+	0xb1, 0xdb, 0xae, 0x1f, 0x1d, 0x6a, 0xad, 0x9e, 0x3e, 0xa1, 0x2c, 0xa3, 0x9b, 0xb0, 0xd2, 0xad,
+	0xed, 0x69, 0x7a, 0x57, 0xab, 0xe1, 0xfa, 0x81, 0xa4, 0x9a, 0xa1, 0xdd, 0x6e, 0x1c, 0xd6, 0xf6,
+	0x35, 0xbd, 0x83, 0xdb, 0x1d, 0x0d, 0xf7, 0x1a, 0x5a, 0x57, 0x99, 0x45, 0xf3, 0x00, 0x75, 0xdc,
+	0xee, 0xe8, 0x07, 0x8d, 0x56, 0xaf, 0xab, 0x94, 0xd0, 0x22, 0xcc, 0xbd, 0xd4, 0x76, 0x24, 0x20,
+	0xa8, 0x2d, 0x28, 0x37, 0xe8, 0xba, 0xee, 0x7a, 0xa3, 0xc0, 0x24, 0x48, 0x85, 0x39, 0xcb, 0x0c,
+	0x75, 0xbe, 0xd4, 0x47, 0x81, 0xcd, 0x66, 0xa0, 0x84, 0xcb, 0x96, 0x19, 0x32, 0xb3, 0xa3, 0xc0,
+	0x46, 0xb7, 0xa0, 0x34, 0xd6, 0xe7, 0x99, 0xbe, 0x68, 0x0b, 0xa5, 0xfa, 0x13, 0x98, 0x66, 0x86,
+	0xa8, 0x0a, 0xb3, 0xa6, 0xe7, 0x46, 0xc4, 0x8d, 0x18, 0x47, 0x05, 0xc7, 0x4d, 0xf4, 0x14, 0x66,
+	0x42, 0xe6, 0x8d, 0x81, 0xcb, 0xdb, 0xef, 0x66, 0x4d, 0xaf, 0xd4, 0x31, 0x2c, 0x20, 0xea, 0x3f,
+	0x16, 0x60, 0x7e, 0xcf, 0x30, 0x49, 0x2d, 0x59, 0xfc, 0xa8, 0x01, 0x73, 0x27, 0xde, 0xc8, 0xed,
+	0xdb, 0xae, 0xa5, 0xfb, 0x9e, 0x73, 0xc6, 0xfc, 0x95, 0xb3, 0x57, 0xcd, 0x8e, 0x30, 0xee, 0x78,
+	0xce, 0x19, 0xae, 0x9c, 0x48, 0x2d, 0xd4, 0x02, 0x65, 0xd0, 0xd7, 0xd3, 0x6c, 0xf9, 0x6b, 0xb0,
+	0xcd, 0x0f, 0xfa, 0x72, 0x1b, 0x1d, 0x42, 0xc9, 0x31, 0xdc, 0xfe, 0xd0, 0x08, 0x3e, 0x0f, 0xab,
+	0x53, 0xeb, 0x53, 0x1b, 0xe5, 0xed, 0xad, 0xcc, 0xc5, 0x9c, 0x1a, 0xd5, 0x66, 0x53, 0xe0, 0xf0,
+	0x98, 0x01, 0xdd, 0x01, 0x08, 0x3c, 0xc7, 0xd1, 0x0d, 0xd7, 0x72, 0x48, 0xb5, 0xb0, 0x9e, 0xdb,
+	0xc8, 0xe3, 0x12, 0x95, 0xd4, 0xa8, 0x80, 0x4e, 0x8c, 0x6f, 0xb8, 0x42, 0x3b, 0xcd, 0xb4, 0x45,
+	0xdf, 0x70, 0xb9, 0xf2, 0x0e, 0x40, 0x64, 0x3b, 0x91, 0xd0, 0xce, 0x70, 0x2c, 0x95, 0x70, 0xf5,
+	0x23, 0x58, 0x4e, 0xb6, 0x08, 0xdd, 0xf4, 0xdc, 0x81, 0xdd, 0x27, 0xae, 0x49, 0xaa, 0xb3, 0xcc,
+	0x70, 0x29, 0xd1, 0xd5, 0x13, 0x15, 0xfa, 0x2e, 0xac, 0xc6, 0x5d, 0xa3, 0xc1, 0x92, 0x40, 0x45,
+	0x06, 0x5a, 0x91, 0xb4, 0x12, 0xac, 0x01, 0xf3, 0x9f, 0x79, 0x67, 0xba, 0x63, 0x7f, 0x4e, 0x1c,
+	0xfb, 0x95, 0xe7, 0xf5, 0xab, 0x25, 0x96, 0xe5, 0x6a, 0x56, 0x60, 0x9a, 0x89, 0x25, 0x9e, 0xfb,
+	0xcc, 0x3b, 0x1b, 0x37, 0x51, 0x1b, 0x16, 0x43, 0x2f, 0x08, 0xbc, 0x37, 0x32, 0x1b, 0x5c, 0x99,
+	0x4d, 0xe1, 0x60, 0x89, 0xf0, 0x10, 0x14, 0xc3, 0xb5, 0x48, 0x20, 0xf3, 0x95, 0xaf, 0xcc, 0xb7,
+	0xc0, 0xb0, 0x12, 0x5d, 0x17, 0x96, 0xc2, 0x51, 0xe0, 0x07, 0x76, 0x48, 0x64, 0xc6, 0xca, 0x95,
+	0x19, 0x51, 0x0c, 0x97, 0x48, 0x3f, 0x85, 0xea, 0xc8, 0xed, 0x93, 0x40, 0x27, 0xa7, 0xbe, 0x17,
+	0x92, 0xbe, 0xcc, 0x3c, 0x77, 0x65, 0xe6, 0x55, 0xc6, 0xa1, 0x71, 0x0a, 0x89, 0xfd, 0x63, 0x40,
+	0x27, 0xce, 0x28, 0x08, 0xd2, 0xbc, 0xf3, 0x57, 0xe6, 0x5d, 0x14, 0xe8, 0x74, 0x14, 0x5e, 0x11,
+	0xa3, 0xff, 0x86, 0x18, 0xa9, 0xb8, 0x2e, 0x5c, 0x3d, 0x0a, 0x31, 0x7c, 0x2c, 0x5b, 0xfb, 0xdb,
+	0x2c, 0x14, 0xe3, 0x14, 0x41, 0x07, 0xe2, 0xb8, 0x98, 0x62, 0x94, 0x1f, 0x5e, 0x33, 0xc3, 0xe4,
+	0xe3, 0xe3, 0x19, 0x14, 0x7d, 0x2f, 0xb4, 0xa9, 0x9e, 0xe5, 0x57, 0x79, 0x7b, 0x3d, 0x8b, 0xad,
+	0x23, 0xec, 0x70, 0x82, 0x50, 0xff, 0x3c, 0x33, 0x3e, 0x45, 0x8e, 0x5a, 0xcf, 0x5b, 0xed, 0x97,
+	0x2d, 0x3d, 0x3e, 0x23, 0x94, 0x77, 0x50, 0x05, 0x8a, 0x4d, 0x6d, 0xaf, 0xa7, 0x6b, 0xc7, 0x9a,
+	0x92, 0x43, 0x73, 0x50, 0xc2, 0x8d, 0xfd, 0x03, 0xde, 0xcc, 0xa3, 0x2a, 0x2c, 0x33, 0x65, 0x7b,
+	0x4f, 0x8f, 0x8d, 0x76, 0x70, 0xfb, 0xa5, 0x32, 0x45, 0xb7, 0x7d, 0x6e, 0x38, 0xa9, 0x2a, 0x50,
+	0x55, 0x0c, 0x4a, 0xb8, 0x98, 0x6a, 0x1a, 0xad, 0xc1, 0x6a, 0x82, 0x4a, 0xeb, 0x66, 0x28, 0xec,
+	0xb0, 0xb1, 0xdb, 0x69, 0x37, 0x5a, 0x3d, 0x7d, 0x47, 0xeb, 0xbd, 0xd4, 0xb4, 0x16, 0xd5, 0xd2,
+	0x23, 0xa3, 0x02, 0xc5, 0x56, 0xbb, 0xab, 0xe9, 0xbd, 0x46, 0x47, 0x29, 0xd2, 0x3e, 0x1e, 0x75,
+	0x3a, 0x1a, 0xd6, 0x9b, 0x8d, 0x8e, 0x52, 0xa2, 0xcd, 0x66, 0xfb, 0xa5, 0x68, 0x02, 0x3d, 0x5e,
+	0x0e, 0xdb, 0x47, 0xbd, 0x03, 0xd6, 0x2b, 0xa5, 0x8c, 0x16, 0xa0, 0xcc, 0xdb, 0xcc, 0x9f, 0x52,
+	0x41, 0x0a, 0x54, 0xb8, 0xa0, 0xae, 0xb5, 0x7a, 0x1a, 0x56, 0xe6, 0xd0, 0x0a, 0x2c, 0x32, 0xfa,
+	0x9d, 0x76, 0xaf, 0xd7, 0x3e, 0x14, 0x86, 0xf3, 0x34, 0x5e, 0xb2, 0x98, 0xf1, 0x2d, 0xd0, 0x13,
+	0x56, 0x96, 0x0a, 0x12, 0x25, 0x19, 0xb5, 0x76, 0xac, 0xe9, 0xbd, 0x76, 0x47, 0xdf, 0x69, 0x1f,
+	0xb5, 0x76, 0x6b, 0xf8, 0x58, 0x59, 0x4c, 0xa9, 0xf8, 0xa8, 0xeb, 0x6d, 0xdc, 0xd2, 0xb0, 0x82,
+	0xd0, 0x6d, 0xa8, 0x26, 0x2a, 0xc1, 0x98, 0x00, 0x97, 0x92, 0xf0, 0x53, 0x2d, 0xfb, 0x21, 0x70,
+	0xcb, 0xe3, 0x40, 0x9e, 0x73, 0xb7, 0x92, 0xd6, 0xa5, 0xfc, 0xad, 0xa2, 0x3b, 0x70, 0x73, 0xac,
+	0x9b, 0x74, 0x78, 0x63, 0x3c, 0xab, 0x93, 0x1e, 0xab, 0xe8, 0x1e, 0xdc, 0x92, 0xe7, 0x59, 0xe7,
+	0x53, 0x10, 0xcf, 0x98, 0x72, 0x13, 0xad, 0xc3, 0xed, 0xd4, 0x94, 0x4e, 0x5a, 0xac, 0xd1, 0x80,
+	0x72, 0x8a, 0x1a, 0xd6, 0x7b, 0xb8, 0xb6, 0x4f, 0x0f, 0xfb, 0x5b, 0x34, 0xfa, 0x02, 0x27, 0x89,
+	0x6f, 0xb3, 0x8a, 0x25, 0x1e, 0x7b, 0xe7, 0xa8, 0xd3, 0x68, 0x2a, 0x77, 0x68, 0xc5, 0x32, 0xee,
+	0x1e, 0x17, 0xde, 0xa5, 0xf8, 0xbd, 0x36, 0xd6, 0x0e, 0xb4, 0xda, 0xae, 0xbe, 0xcf, 0x0a, 0x9a,
+	0x66, 0x4d, 0xb9, 0x47, 0xcb, 0x8a, 0xfa, 0x41, 0xa3, 0xa5, 0xef, 0xb7, 0x6a, 0xbd, 0x03, 0x4a,
+	0xb9, 0x4e, 0xfd, 0x33, 0x11, 0xe3, 0xdd, 0x6f, 0xb7, 0xa8, 0xf4, 0x3e, 0xc5, 0x33, 0x29, 0x67,
+	0x16, 0x62, 0x55, 0x7d, 0x06, 0x95, 0xa6, 0x67, 0xb2, 0xa4, 0x6c, 0xb8, 0x03, 0x0f, 0x3d, 0x84,
+	0x59, 0xc7, 0x88, 0x74, 0xc7, 0xb5, 0xc4, 0x51, 0xbe, 0x14, 0xe7, 0x20, 0xcd, 0xd1, 0xcd, 0xa6,
+	0x11, 0x35, 0x5d, 0x0b, 0xcf, 0x38, 0xec, 0xaf, 0xfa, 0x12, 0x8a, 0x9d, 0x80, 0x96, 0xae, 0xd1,
+	0x19, 0x42, 0x50, 0x70, 0x8d, 0x21, 0x11, 0x55, 0x0b, 0xfb, 0x4d, 0x0b, 0xbe, 0xd7, 0x86, 0x33,
+	0x22, 0xa2, 0x54, 0xe1, 0x0d, 0x74, 0x1f, 0x2a, 0x23, 0xdb, 0x8d, 0x1e, 0x7f, 0xa8, 0x73, 0x25,
+	0xdd, 0x3a, 0x0a, 0xb8, 0xcc, 0x65, 0x2f, 0xa8, 0x48, 0xfd, 0xe5, 0x14, 0x28, 0x9a, 0x1b, 0xd9,
+	0xd1, 0x99, 0x54, 0x6c, 0x28, 0x30, 0x35, 0xb4, 0xfb, 0xc2, 0x01, 0xfd, 0x89, 0x56, 0x61, 0xc6,
+	0xf1, 0x4c, 0xc3, 0x89, 0x1d, 0x88, 0x16, 0x5a, 0x87, 0x72, 0x9f, 0x84, 0x66, 0x60, 0xfb, 0x6c,
+	0x37, 0xe1, 0xe5, 0xa6, 0x2c, 0xa2, 0x3d, 0x0b, 0x4d, 0x2f, 0x88, 0x4f, 0x72, 0xde, 0x40, 0x77,
+	0x01, 0xa4, 0xa3, 0x94, 0x1f, 0xe3, 0x92, 0x84, 0xea, 0x23, 0xcf, 0xb7, 0x4d, 0xc3, 0xb1, 0xa3,
+	0x33, 0x71, 0x90, 0x4b, 0x92, 0xf3, 0xe5, 0xd0, 0xec, 0x57, 0x2e, 0x87, 0x76, 0xa0, 0xe4, 0x88,
+	0x89, 0x09, 0xab, 0x45, 0x56, 0xbe, 0x64, 0xd2, 0xc8, 0x33, 0x88, 0xc7, 0x30, 0xf4, 0x43, 0x00,
+	0x9f, 0x4f, 0x8f, 0x4d, 0xc2, 0x6a, 0x89, 0x91, 0x64, 0xef, 0xa9, 0x62, 0x22, 0xb1, 0x84, 0x51,
+	0xff, 0x9a, 0x87, 0xe5, 0xae, 0x31, 0x20, 0x5d, 0x62, 0x04, 0xe6, 0x2b, 0x69, 0x2e, 0x3e, 0x82,
+	0x69, 0xa3, 0x3f, 0x72, 0x22, 0x71, 0x4d, 0xb8, 0xca, 0x51, 0xc2, 0x01, 0x14, 0x19, 0xfa, 0x9e,
+	0x37, 0x60, 0x53, 0x76, 0x45, 0x24, 0x03, 0xa0, 0x67, 0x30, 0x3b, 0x24, 0x7d, 0x1a, 0x6b, 0x71,
+	0xda, 0x5c, 0x05, 0x1b, 0x43, 0xd0, 0xf7, 0xa1, 0xf8, 0xda, 0xf6, 0x1c, 0x36, 0xb3, 0x85, 0x2b,
+	0xc3, 0x13, 0x0c, 0x7a, 0x0c, 0x85, 0xc0, 0x30, 0xcf, 0xae, 0x51, 0x31, 0x31, 0x7b, 0xf5, 0x0d,
+	0x94, 0x69, 0xd6, 0x78, 0xae, 0x85, 0x89, 0x19, 0xa1, 0x0f, 0xa0, 0x3c, 0xb4, 0x5d, 0xfd, 0x0a,
+	0x49, 0x56, 0x1a, 0xda, 0x2e, 0xff, 0xc9, 0x40, 0xc6, 0x69, 0x02, 0xca, 0x5f, 0x06, 0x32, 0x4e,
+	0xf9, 0x4f, 0x35, 0x80, 0x52, 0x9d, 0xde, 0xfe, 0x58, 0x5e, 0x6f, 0xc0, 0x34, 0xbb, 0x0a, 0x0a,
+	0x87, 0x28, 0x85, 0x65, 0x66, 0x98, 0x1b, 0x8c, 0x33, 0x23, 0x2f, 0x67, 0xc6, 0x7b, 0x30, 0xef,
+	0xdb, 0xa7, 0xc4, 0xd1, 0x07, 0x81, 0x61, 0x26, 0x49, 0x95, 0xc7, 0x73, 0x4c, 0xba, 0x27, 0x84,
+	0xea, 0x11, 0x54, 0x77, 0xbd, 0xa1, 0xed, 0x1a, 0x6e, 0xc4, 0x48, 0x43, 0x69, 0xc9, 0x7c, 0x0f,
+	0x66, 0x98, 0x87, 0xb0, 0x9a, 0x63, 0x2b, 0xf1, 0x7e, 0x56, 0x08, 0x93, 0x5e, 0x63, 0x01, 0x50,
+	0x1d, 0x58, 0x60, 0x17, 0x92, 0x4e, 0xb2, 0x32, 0xd1, 0x31, 0x2c, 0xf4, 0x85, 0x27, 0x3d, 0xa1,
+	0xa5, 0x43, 0xfb, 0x4e, 0x16, 0x6d, 0x56, 0xc7, 0xf0, 0x7c, 0x3f, 0xa5, 0x51, 0x7f, 0x9f, 0x83,
+	0x62, 0x3d, 0xf0, 0xfc, 0x03, 0xdb, 0x8d, 0xbe, 0xce, 0x1b, 0x4e, 0x7a, 0x77, 0xc9, 0x9f, 0xdb,
+	0x5d, 0xb6, 0x60, 0xc9, 0x1e, 0xfa, 0x5e, 0x10, 0x19, 0xae, 0x49, 0x26, 0x03, 0x8d, 0xc6, 0xaa,
+	0x24, 0xda, 0x2f, 0x60, 0x29, 0xee, 0xa7, 0x1c, 0xe8, 0x1f, 0x00, 0x98, 0x81, 0xe7, 0xeb, 0xaf,
+	0xa8, 0x5c, 0x04, 0x3b, 0x33, 0xed, 0x63, 0x02, 0x5c, 0x32, 0x63, 0x2a, 0xf5, 0x31, 0x2c, 0x24,
+	0xbc, 0x1d, 0x23, 0x30, 0x86, 0x21, 0x7a, 0x17, 0xe6, 0x8c, 0xd0, 0x27, 0x66, 0xa4, 0xb3, 0x67,
+	0x0a, 0x4e, 0x9b, 0xc7, 0x15, 0x2e, 0xc4, 0x4c, 0xa6, 0xee, 0x02, 0x7a, 0x49, 0x4e, 0x76, 0xe3,
+	0xfb, 0x8a, 0x80, 0x6e, 0xc2, 0x92, 0xed, 0x9a, 0xce, 0xa8, 0x4f, 0x74, 0x8b, 0x78, 0xa9, 0xe7,
+	0x81, 0x22, 0x5e, 0x14, 0xaa, 0x7d, 0xe2, 0x89, 0x57, 0x02, 0xf5, 0x4f, 0x79, 0xa8, 0xb0, 0xd9,
+	0xae, 0xd3, 0x4b, 0xeb, 0x69, 0x84, 0xf6, 0x61, 0x8e, 0xad, 0x7c, 0xcf, 0xb5, 0xf4, 0x80, 0x98,
+	0x91, 0x98, 0x82, 0xcc, 0xbb, 0xab, 0x94, 0x6e, 0xb8, 0xec, 0x48, 0xb9, 0xf7, 0x1e, 0xcc, 0x3b,
+	0x86, 0x6b, 0x8d, 0xe8, 0x05, 0x9a, 0x07, 0x27, 0xbf, 0x3e, 0xb5, 0x51, 0xc2, 0x73, 0xb1, 0x94,
+	0x8d, 0x18, 0x75, 0x61, 0x71, 0x1c, 0x3f, 0xdd, 0x67, 0xa3, 0x10, 0x15, 0xe9, 0xfb, 0x6f, 0x0b,
+	0xa3, 0x88, 0x17, 0x5e, 0x30, 0x27, 0x02, 0xf8, 0x29, 0x2c, 0xa7, 0xde, 0x82, 0x62, 0xde, 0x19,
+	0xc6, 0xfb, 0x20, 0x8b, 0xf7, 0x7c, 0x3c, 0x31, 0x7a, 0x73, 0x4e, 0xa6, 0x7e, 0x99, 0x83, 0x65,
+	0xb1, 0x02, 0x08, 0x8b, 0x1d, 0x26, 0x3f, 0x1d, 0x91, 0x90, 0x6e, 0x37, 0xd3, 0xec, 0x7d, 0x40,
+	0xc4, 0xec, 0xce, 0xa5, 0xf7, 0x7d, 0xcc, 0x6d, 0xd1, 0x53, 0x28, 0x0e, 0xf8, 0xf3, 0x0e, 0x8f,
+	0x50, 0x79, 0xfb, 0xde, 0x5b, 0x9e, 0x81, 0x70, 0x02, 0xa0, 0x09, 0xc3, 0x9f, 0x28, 0x4c, 0x3e,
+	0x7d, 0x6c, 0xfd, 0x5e, 0x92, 0x30, 0xf2, 0x54, 0xe3, 0x8a, 0x2d, 0xb5, 0xd4, 0xe7, 0xb0, 0xca,
+	0xb4, 0xe3, 0xb5, 0x1d, 0x2f, 0x09, 0x05, 0xa6, 0xc6, 0x2f, 0x24, 0xf4, 0x27, 0xba, 0x07, 0x65,
+	0x9f, 0x7a, 0x75, 0x47, 0xc3, 0x13, 0x12, 0xc4, 0x8f, 0x4f, 0x54, 0xd4, 0x62, 0x12, 0xf5, 0x57,
+	0x45, 0x58, 0x99, 0x08, 0x51, 0xe8, 0x7b, 0x6e, 0x48, 0xd0, 0xc7, 0xa0, 0x0c, 0x0c, 0x93, 0x48,
+	0x8f, 0x7a, 0x71, 0xd6, 0x7c, 0xf3, 0x6a, 0xd7, 0x19, 0xbc, 0x30, 0x48, 0xb5, 0x43, 0xf4, 0x63,
+	0x58, 0x8e, 0x6f, 0xe0, 0x29, 0x5a, 0x1e, 0xcd, 0x8d, 0x2c, 0xda, 0xc9, 0x92, 0x07, 0x2f, 0xc5,
+	0x2c, 0x32, 0x79, 0x17, 0x14, 0xc7, 0xb3, 0xbc, 0x14, 0xf1, 0xd4, 0x35, 0x89, 0x17, 0x28, 0x83,
+	0x4c, 0x7a, 0x04, 0x8b, 0x8e, 0x71, 0x42, 0x9c, 0x14, 0x6b, 0xe1, 0x9a, 0xac, 0x0a, 0xa3, 0x98,
+	0xe8, 0xeb, 0xc4, 0x83, 0x69, 0x58, 0x9d, 0xbe, 0x6e, 0x5f, 0x29, 0x83, 0x4c, 0xfa, 0x09, 0x2c,
+	0x0f, 0x46, 0x8e, 0xa3, 0x4f, 0x30, 0xb3, 0xcb, 0xfd, 0x25, 0x93, 0xd6, 0x4b, 0xd1, 0x60, 0x44,
+	0x39, 0xd2, 0x32, 0x74, 0x02, 0xab, 0xa1, 0x31, 0x20, 0x7a, 0xc8, 0xea, 0x1d, 0x99, 0x9b, 0xe7,
+	0xe9, 0xc3, 0x2c, 0xee, 0x8b, 0x8a, 0x24, 0xbc, 0x1c, 0x5e, 0x54, 0x3a, 0x59, 0x70, 0x8b, 0x27,
+	0xc8, 0xb8, 0xce, 0x92, 0x1d, 0x15, 0x2f, 0xdf, 0x68, 0x26, 0xce, 0x41, 0x7c, 0xd3, 0x4e, 0x0b,
+	0x24, 0x47, 0x3a, 0xac, 0x48, 0xfb, 0x98, 0xe4, 0xa2, 0xcc, 0x5c, 0x7c, 0xeb, 0xad, 0x7b, 0x99,
+	0xbc, 0x10, 0xcd, 0x0b, 0x0e, 0x9a, 0x06, 0xcc, 0xa5, 0xf6, 0x34, 0xf6, 0x06, 0x72, 0x49, 0xaa,
+	0xcb, 0x9b, 0x19, 0xae, 0xc8, 0xdb, 0x18, 0xad, 0x4f, 0x48, 0x10, 0x78, 0x01, 0x2b, 0xaf, 0xa4,
+	0xfa, 0x24, 0xf0, 0xcd, 0xcd, 0x2e, 0x7b, 0xdd, 0xc6, 0xdc, 0x00, 0x1d, 0x88, 0xc7, 0xcd, 0xd3,
+	0xa8, 0xba, 0xc2, 0x6c, 0x37, 0x2f, 0x0d, 0xd5, 0xb9, 0xbd, 0x03, 0xc7, 0x70, 0xf5, 0x8f, 0xd2,
+	0xa6, 0xb9, 0x67, 0x3b, 0xe3, 0x0d, 0x61, 0x0f, 0x2a, 0xb6, 0xeb, 0x8f, 0x22, 0xfe, 0xae, 0x66,
+	0xbd, 0xed, 0xbc, 0x69, 0x50, 0x5b, 0xf6, 0xca, 0x66, 0xe1, 0xb2, 0x3d, 0x6e, 0xa0, 0xe7, 0x50,
+	0x0a, 0x04, 0x67, 0x9c, 0xfa, 0xdf, 0xce, 0x22, 0xb9, 0x70, 0x6b, 0xc2, 0x63, 0xbc, 0x3a, 0x80,
+	0xb5, 0x1d, 0x23, 0x4a, 0x56, 0x12, 0x37, 0x0c, 0xe3, 0x7d, 0xfe, 0x00, 0x8a, 0x01, 0xff, 0x19,
+	0xef, 0x5d, 0x0f, 0xaf, 0xe8, 0x89, 0x81, 0x70, 0x82, 0x56, 0x3f, 0x83, 0x5b, 0x17, 0xfa, 0x11,
+	0xb1, 0x49, 0x8d, 0x29, 0xf7, 0x3f, 0x8e, 0xe9, 0x2f, 0x79, 0xa8, 0xd6, 0xc2, 0x33, 0xd7, 0x4c,
+	0x4f, 0x03, 0x1f, 0xd2, 0xd7, 0x35, 0x0b, 0xff, 0x27, 0xa7, 0x19, 0xa5, 0xf2, 0x46, 0x91, 0x34,
+	0xa0, 0xc2, 0xe5, 0x54, 0x6d, 0x66, 0x2c, 0x46, 0x54, 0xf1, 0xa4, 0x96, 0x3a, 0x80, 0x9b, 0x17,
+	0x84, 0x4d, 0xcc, 0xd0, 0x39, 0x3f, 0xb9, 0xaf, 0xec, 0xc7, 0x85, 0xbb, 0xcc, 0x4f, 0x6a, 0x41,
+	0x50, 0x67, 0xc9, 0xba, 0x6b, 0x9e, 0x5b, 0x77, 0x99, 0xf5, 0x77, 0xd6, 0x44, 0x4b, 0x6b, 0x2f,
+	0x80, 0x7b, 0x99, 0xfe, 0xc4, 0xe8, 0xda, 0xe7, 0xd7, 0xdf, 0xa3, 0x6b, 0x78, 0x3c, 0xbf, 0x06,
+	0x1d, 0x28, 0x4b, 0x4b, 0x87, 0xde, 0x99, 0x2d, 0x33, 0xd4, 0xc5, 0x57, 0x12, 0x1e, 0xba, 0xcc,
+	0x9b, 0xca, 0xbe, 0x19, 0x8a, 0x6f, 0x24, 0x25, 0x2b, 0xfe, 0x89, 0x6e, 0x41, 0x69, 0x68, 0x0f,
+	0x89, 0xce, 0x9e, 0x45, 0xc5, 0x37, 0x1a, 0x2a, 0xe8, 0x9d, 0xf9, 0x44, 0xfd, 0x39, 0x54, 0xe4,
+	0x78, 0xa3, 0x36, 0x2c, 0x50, 0x77, 0x7d, 0x12, 0x46, 0xb6, 0xcb, 0x77, 0xe7, 0xdc, 0xe5, 0xa7,
+	0xd8, 0xbe, 0x19, 0xee, 0x8e, 0xad, 0xf1, 0xbc, 0x95, 0x6a, 0xa3, 0x3b, 0x00, 0x27, 0x34, 0x7a,
+	0x7a, 0x68, 0x7f, 0x41, 0x44, 0x19, 0x54, 0x62, 0x92, 0xae, 0xfd, 0x05, 0x51, 0xef, 0x40, 0x29,
+	0xe9, 0xf4, 0xf9, 0x2a, 0x4a, 0x55, 0x61, 0x3e, 0xcd, 0x7f, 0x81, 0xcd, 0x1f, 0xf2, 0xb0, 0xd8,
+	0x8e, 0x3f, 0x57, 0x1e, 0x92, 0xc8, 0xe8, 0x1b, 0x91, 0x81, 0x34, 0x98, 0x0e, 0x69, 0x98, 0xc5,
+	0x83, 0x40, 0xe6, 0xa7, 0x96, 0x73, 0x48, 0xb6, 0xbd, 0x13, 0xcc, 0xd1, 0xe8, 0x29, 0x94, 0xcd,
+	0x80, 0x18, 0x11, 0xd1, 0x23, 0x7b, 0xc8, 0x9f, 0x60, 0xca, 0xdb, 0x6b, 0x31, 0x59, 0xfc, 0x31,
+	0x74, 0xb3, 0x17, 0x7f, 0x0c, 0xc5, 0xc0, 0xcd, 0xa9, 0x80, 0x82, 0x47, 0x7e, 0x3f, 0x01, 0xcf,
+	0xbc, 0x1d, 0xcc, 0xcd, 0xa9, 0x40, 0xfd, 0x18, 0xa6, 0x59, 0x4f, 0xd0, 0x0a, 0x2c, 0x76, 0x7b,
+	0xb5, 0xde, 0xe4, 0x77, 0xc8, 0x32, 0xcc, 0xd6, 0xb1, 0x56, 0xeb, 0x69, 0xbb, 0x4a, 0x8e, 0x36,
+	0xf0, 0x51, 0xab, 0xd5, 0x68, 0xed, 0x2b, 0x79, 0x54, 0x84, 0xc2, 0x6e, 0xbb, 0xa5, 0x29, 0x53,
+	0x68, 0x0e, 0x4a, 0xf5, 0x5a, 0xab, 0xae, 0x35, 0x9b, 0xda, 0xae, 0x52, 0x78, 0x40, 0x00, 0xa4,
+	0xb7, 0xf8, 0x32, 0xcc, 0x8a, 0x87, 0x69, 0xe5, 0x1d, 0xb4, 0x08, 0x73, 0x2f, 0x34, 0x7c, 0xac,
+	0x1f, 0xb5, 0x9a, 0x8d, 0xe7, 0x5a, 0xf3, 0x58, 0xc9, 0xa1, 0x0a, 0x14, 0x93, 0x56, 0x9e, 0xb6,
+	0x3a, 0xed, 0x6e, 0xb7, 0xb1, 0xd3, 0xa4, 0xc4, 0x00, 0x33, 0x42, 0x53, 0x40, 0x0b, 0x50, 0x66,
+	0x50, 0x21, 0x98, 0xde, 0xfe, 0x7b, 0x1e, 0xe6, 0xe5, 0xb3, 0xce, 0x0b, 0xd0, 0x6f, 0x73, 0xb0,
+	0x74, 0xc1, 0x2e, 0x8e, 0xb6, 0x33, 0xaf, 0xad, 0x99, 0x47, 0xcb, 0xda, 0x07, 0xd7, 0xc2, 0xf0,
+	0xb4, 0x52, 0xef, 0xfe, 0xe2, 0xcb, 0x7f, 0xfe, 0x3a, 0x5f, 0x55, 0x97, 0x92, 0xaf, 0xf7, 0xe1,
+	0x13, 0x51, 0x81, 0x90, 0x27, 0xb9, 0x07, 0xe8, 0x37, 0x39, 0xb8, 0x91, 0x91, 0xea, 0xe8, 0xf1,
+	0xa5, 0xf9, 0x9c, 0xb9, 0x17, 0xad, 0x25, 0x97, 0x1b, 0xe9, 0xc3, 0xfa, 0x78, 0xbd, 0xa9, 0xef,
+	0xb3, 0x2e, 0xdd, 0x57, 0x6f, 0xd3, 0x2e, 0x0d, 0x28, 0xf0, 0x89, 0x71, 0x8e, 0xf0, 0x49, 0xee,
+	0xc1, 0xce, 0xcf, 0x60, 0xcd, 0xf4, 0x86, 0x19, 0x9d, 0xd8, 0x59, 0x4a, 0x87, 0xba, 0x43, 0x57,
+	0x55, 0x27, 0xf7, 0xa3, 0x67, 0xc2, 0xdc, 0xf2, 0xe8, 0x65, 0x72, 0xd3, 0x0b, 0xac, 0x2d, 0x8b,
+	0xb8, 0x6c, 0xcd, 0x6d, 0x71, 0x95, 0xe1, 0xdb, 0xe1, 0xe4, 0xff, 0x07, 0x3c, 0xe5, 0xbf, 0xfe,
+	0x93, 0xcb, 0xfd, 0x2e, 0x5f, 0xd8, 0xaf, 0xbf, 0x68, 0x9d, 0xcc, 0x30, 0xc8, 0x07, 0xff, 0x0d,
+	0x00, 0x00, 0xff, 0xff, 0x7a, 0xea, 0x20, 0x54, 0x0a, 0x21, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/text_annotation.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/text_annotation.pb.go
index ebe52488..6023144e 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/text_annotation.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/text_annotation.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/text_annotation.proto
 
-package vision
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Enum to denote the type of break found. New line, space etc.
 type TextAnnotation_DetectedBreak_BreakType int32
 
@@ -53,7 +59,7 @@ func (x TextAnnotation_DetectedBreak_BreakType) String() string {
 	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
 }
 func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 1, 0}
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{0, 1, 0}
 }
 
 // Type of a block (text, image etc) as identified by OCR.
@@ -94,7 +100,9 @@ var Block_BlockType_value = map[string]int32{
 func (x Block_BlockType) String() string {
 	return proto.EnumName(Block_BlockType_name, int32(x))
 }
-func (Block_BlockType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{2, 0} }
+func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{2, 0}
+}
 
 // TextAnnotation contains a structured representation of OCR extracted text.
 // The hierarchy of an OCR extracted text structure is like this:
@@ -105,15 +113,37 @@ func (Block_BlockType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2
 // detail.
 type TextAnnotation struct {
 	// List of pages detected by OCR.
-	Pages []*Page `protobuf:"bytes,1,rep,name=pages" json:"pages,omitempty"`
+	Pages []*Page `protobuf:"bytes,1,rep,name=pages,proto3" json:"pages,omitempty"`
 	// UTF-8 text detected on the pages.
-	Text string `protobuf:"bytes,2,opt,name=text" json:"text,omitempty"`
+	Text                 string   `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
+func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation) ProtoMessage()    {}
+func (*TextAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{0}
+}
+func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
+}
+func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+}
+func (m *TextAnnotation) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation.Size(m)
+}
+func (m *TextAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation.DiscardUnknown(m)
 }
 
-func (m *TextAnnotation) Reset()                    { *m = TextAnnotation{} }
-func (m *TextAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*TextAnnotation) ProtoMessage()               {}
-func (*TextAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_TextAnnotation proto.InternalMessageInfo
 
 func (m *TextAnnotation) GetPages() []*Page {
 	if m != nil {
@@ -134,17 +164,37 @@ type TextAnnotation_DetectedLanguage struct {
 	// The BCP-47 language code, such as "en-US" or "sr-Latn". For more
 	// information, see
 	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
-	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Confidence of detected language. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_DetectedLanguage{} }
 func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
 func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 0}
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{0, 0}
 }
+func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation_DetectedLanguage proto.InternalMessageInfo
 
 func (m *TextAnnotation_DetectedLanguage) GetLanguageCode() string {
 	if m != nil {
@@ -163,15 +213,37 @@ func (m *TextAnnotation_DetectedLanguage) GetConfidence() float32 {
 // Detected start or end of a structural component.
 type TextAnnotation_DetectedBreak struct {
 	// Detected break type.
-	Type TextAnnotation_DetectedBreak_BreakType `protobuf:"varint,1,opt,name=type,enum=google.cloud.vision.v1.TextAnnotation_DetectedBreak_BreakType" json:"type,omitempty"`
+	Type TextAnnotation_DetectedBreak_BreakType `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.vision.v1.TextAnnotation_DetectedBreak_BreakType" json:"type,omitempty"`
 	// True if break prepends the element.
-	IsPrefix bool `protobuf:"varint,2,opt,name=is_prefix,json=isPrefix" json:"is_prefix,omitempty"`
+	IsPrefix             bool     `protobuf:"varint,2,opt,name=is_prefix,json=isPrefix,proto3" json:"is_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TextAnnotation_DetectedBreak) Reset()                    { *m = TextAnnotation_DetectedBreak{} }
-func (m *TextAnnotation_DetectedBreak) String() string            { return proto.CompactTextString(m) }
-func (*TextAnnotation_DetectedBreak) ProtoMessage()               {}
-func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 1} }
+func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_DetectedBreak{} }
+func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
+func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{0, 1}
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation_DetectedBreak proto.InternalMessageInfo
 
 func (m *TextAnnotation_DetectedBreak) GetType() TextAnnotation_DetectedBreak_BreakType {
 	if m != nil {
@@ -190,15 +262,37 @@ func (m *TextAnnotation_DetectedBreak) GetIsPrefix() bool {
 // Additional information detected on the structural component.
 type TextAnnotation_TextProperty struct {
 	// A list of detected languages together with confidence.
-	DetectedLanguages []*TextAnnotation_DetectedLanguage `protobuf:"bytes,1,rep,name=detected_languages,json=detectedLanguages" json:"detected_languages,omitempty"`
+	DetectedLanguages []*TextAnnotation_DetectedLanguage `protobuf:"bytes,1,rep,name=detected_languages,json=detectedLanguages,proto3" json:"detected_languages,omitempty"`
 	// Detected start or end of a text segment.
-	DetectedBreak *TextAnnotation_DetectedBreak `protobuf:"bytes,2,opt,name=detected_break,json=detectedBreak" json:"detected_break,omitempty"`
+	DetectedBreak        *TextAnnotation_DetectedBreak `protobuf:"bytes,2,opt,name=detected_break,json=detectedBreak,proto3" json:"detected_break,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_TextProperty{} }
+func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_TextProperty) ProtoMessage()    {}
+func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{0, 2}
+}
+func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
+}
+func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+}
+func (m *TextAnnotation_TextProperty) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
+}
+func (m *TextAnnotation_TextProperty) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_TextProperty.DiscardUnknown(m)
 }
 
-func (m *TextAnnotation_TextProperty) Reset()                    { *m = TextAnnotation_TextProperty{} }
-func (m *TextAnnotation_TextProperty) String() string            { return proto.CompactTextString(m) }
-func (*TextAnnotation_TextProperty) ProtoMessage()               {}
-func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 2} }
+var xxx_messageInfo_TextAnnotation_TextProperty proto.InternalMessageInfo
 
 func (m *TextAnnotation_TextProperty) GetDetectedLanguages() []*TextAnnotation_DetectedLanguage {
 	if m != nil {
@@ -217,21 +311,45 @@ func (m *TextAnnotation_TextProperty) GetDetectedBreak() *TextAnnotation_Detecte
 // Detected page from OCR.
 type Page struct {
 	// Additional information detected on the page.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
-	// Page width in pixels.
-	Width int32 `protobuf:"varint,2,opt,name=width" json:"width,omitempty"`
-	// Page height in pixels.
-	Height int32 `protobuf:"varint,3,opt,name=height" json:"height,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// Page width. For PDFs the unit is points. For images (including
+	// TIFFs) the unit is pixels.
+	Width int32 `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"`
+	// Page height. For PDFs the unit is points. For images (including
+	// TIFFs) the unit is pixels.
+	Height int32 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
 	// List of blocks of text, images etc on this page.
-	Blocks []*Block `protobuf:"bytes,4,rep,name=blocks" json:"blocks,omitempty"`
+	Blocks []*Block `protobuf:"bytes,4,rep,name=blocks,proto3" json:"blocks,omitempty"`
 	// Confidence of the OCR results on the page. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Page) Reset()                    { *m = Page{} }
-func (m *Page) String() string            { return proto.CompactTextString(m) }
-func (*Page) ProtoMessage()               {}
-func (*Page) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (m *Page) Reset()         { *m = Page{} }
+func (m *Page) String() string { return proto.CompactTextString(m) }
+func (*Page) ProtoMessage()    {}
+func (*Page) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{1}
+}
+func (m *Page) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Page.Unmarshal(m, b)
+}
+func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
+}
+func (dst *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(dst, src)
+}
+func (m *Page) XXX_Size() int {
+	return xxx_messageInfo_Page.Size(m)
+}
+func (m *Page) XXX_DiscardUnknown() {
+	xxx_messageInfo_Page.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Page proto.InternalMessageInfo
 
 func (m *Page) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -271,7 +389,7 @@ func (m *Page) GetConfidence() float32 {
 // Logical element on the page.
 type Block struct {
 	// Additional information detected for the block.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The bounding box for the block.
 	// The vertices are in the order of top-left, top-right, bottom-right,
 	// bottom-left. When a rotation of the bounding box is detected the rotation
@@ -292,19 +410,41 @@ type Block struct {
 	//         1----0
 	//
 	//   and the vertice order will still be (0, 1, 2, 3).
-	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// List of paragraphs in this block (if this blocks is of type text).
-	Paragraphs []*Paragraph `protobuf:"bytes,3,rep,name=paragraphs" json:"paragraphs,omitempty"`
+	Paragraphs []*Paragraph `protobuf:"bytes,3,rep,name=paragraphs,proto3" json:"paragraphs,omitempty"`
 	// Detected block type (text, image etc) for this block.
-	BlockType Block_BlockType `protobuf:"varint,4,opt,name=block_type,json=blockType,enum=google.cloud.vision.v1.Block_BlockType" json:"block_type,omitempty"`
+	BlockType Block_BlockType `protobuf:"varint,4,opt,name=block_type,json=blockType,proto3,enum=google.cloud.vision.v1.Block_BlockType" json:"block_type,omitempty"`
 	// Confidence of the OCR results on the block. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Block) Reset()         { *m = Block{} }
+func (m *Block) String() string { return proto.CompactTextString(m) }
+func (*Block) ProtoMessage()    {}
+func (*Block) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{2}
+}
+func (m *Block) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Block.Unmarshal(m, b)
+}
+func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
+}
+func (dst *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(dst, src)
+}
+func (m *Block) XXX_Size() int {
+	return xxx_messageInfo_Block.Size(m)
+}
+func (m *Block) XXX_DiscardUnknown() {
+	xxx_messageInfo_Block.DiscardUnknown(m)
 }
 
-func (m *Block) Reset()                    { *m = Block{} }
-func (m *Block) String() string            { return proto.CompactTextString(m) }
-func (*Block) ProtoMessage()               {}
-func (*Block) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_Block proto.InternalMessageInfo
 
 func (m *Block) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -344,7 +484,7 @@ func (m *Block) GetConfidence() float32 {
 // Structural unit of text representing a number of words in certain order.
 type Paragraph struct {
 	// Additional information detected for the paragraph.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The bounding box for the paragraph.
 	// The vertices are in the order of top-left, top-right, bottom-right,
 	// bottom-left. When a rotation of the bounding box is detected the rotation
@@ -360,17 +500,39 @@ type Paragraph struct {
 	//      |    |
 	//      1----0
 	//   and the vertice order will still be (0, 1, 2, 3).
-	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// List of words in this paragraph.
-	Words []*Word `protobuf:"bytes,3,rep,name=words" json:"words,omitempty"`
+	Words []*Word `protobuf:"bytes,3,rep,name=words,proto3" json:"words,omitempty"`
 	// Confidence of the OCR results for the paragraph. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,4,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Paragraph) Reset()         { *m = Paragraph{} }
+func (m *Paragraph) String() string { return proto.CompactTextString(m) }
+func (*Paragraph) ProtoMessage()    {}
+func (*Paragraph) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{3}
+}
+func (m *Paragraph) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
+}
+func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
+}
+func (dst *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(dst, src)
+}
+func (m *Paragraph) XXX_Size() int {
+	return xxx_messageInfo_Paragraph.Size(m)
+}
+func (m *Paragraph) XXX_DiscardUnknown() {
+	xxx_messageInfo_Paragraph.DiscardUnknown(m)
 }
 
-func (m *Paragraph) Reset()                    { *m = Paragraph{} }
-func (m *Paragraph) String() string            { return proto.CompactTextString(m) }
-func (*Paragraph) ProtoMessage()               {}
-func (*Paragraph) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_Paragraph proto.InternalMessageInfo
 
 func (m *Paragraph) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -403,7 +565,7 @@ func (m *Paragraph) GetConfidence() float32 {
 // A word representation.
 type Word struct {
 	// Additional information detected for the word.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The bounding box for the word.
 	// The vertices are in the order of top-left, top-right, bottom-right,
 	// bottom-left. When a rotation of the bounding box is detected the rotation
@@ -419,18 +581,40 @@ type Word struct {
 	//      |    |
 	//      1----0
 	//   and the vertice order will still be (0, 1, 2, 3).
-	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// List of symbols in the word.
 	// The order of the symbols follows the natural reading order.
-	Symbols []*Symbol `protobuf:"bytes,3,rep,name=symbols" json:"symbols,omitempty"`
+	Symbols []*Symbol `protobuf:"bytes,3,rep,name=symbols,proto3" json:"symbols,omitempty"`
 	// Confidence of the OCR results for the word. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,4,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Word) Reset()         { *m = Word{} }
+func (m *Word) String() string { return proto.CompactTextString(m) }
+func (*Word) ProtoMessage()    {}
+func (*Word) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{4}
+}
+func (m *Word) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Word.Unmarshal(m, b)
+}
+func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
+}
+func (dst *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(dst, src)
+}
+func (m *Word) XXX_Size() int {
+	return xxx_messageInfo_Word.Size(m)
+}
+func (m *Word) XXX_DiscardUnknown() {
+	xxx_messageInfo_Word.DiscardUnknown(m)
 }
 
-func (m *Word) Reset()                    { *m = Word{} }
-func (m *Word) String() string            { return proto.CompactTextString(m) }
-func (*Word) ProtoMessage()               {}
-func (*Word) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_Word proto.InternalMessageInfo
 
 func (m *Word) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -463,7 +647,7 @@ func (m *Word) GetConfidence() float32 {
 // A single symbol representation.
 type Symbol struct {
 	// Additional information detected for the symbol.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The bounding box for the symbol.
 	// The vertices are in the order of top-left, top-right, bottom-right,
 	// bottom-left. When a rotation of the bounding box is detected the rotation
@@ -479,17 +663,39 @@ type Symbol struct {
 	//      |    |
 	//      1----0
 	//   and the vertice order will still be (0, 1, 2, 3).
-	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// The actual UTF-8 representation of the symbol.
-	Text string `protobuf:"bytes,3,opt,name=text" json:"text,omitempty"`
+	Text string `protobuf:"bytes,3,opt,name=text,proto3" json:"text,omitempty"`
 	// Confidence of the OCR results for the symbol. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,4,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Symbol) Reset()                    { *m = Symbol{} }
-func (m *Symbol) String() string            { return proto.CompactTextString(m) }
-func (*Symbol) ProtoMessage()               {}
-func (*Symbol) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+func (m *Symbol) Reset()         { *m = Symbol{} }
+func (m *Symbol) String() string { return proto.CompactTextString(m) }
+func (*Symbol) ProtoMessage()    {}
+func (*Symbol) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_5ca1a16a28ef616a, []int{5}
+}
+func (m *Symbol) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Symbol.Unmarshal(m, b)
+}
+func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
+}
+func (dst *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(dst, src)
+}
+func (m *Symbol) XXX_Size() int {
+	return xxx_messageInfo_Symbol.Size(m)
+}
+func (m *Symbol) XXX_DiscardUnknown() {
+	xxx_messageInfo_Symbol.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Symbol proto.InternalMessageInfo
 
 func (m *Symbol) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -533,56 +739,59 @@ func init() {
 	proto.RegisterEnum("google.cloud.vision.v1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
 }
 
-func init() { proto.RegisterFile("google/cloud/vision/v1/text_annotation.proto", fileDescriptor2) }
-
-var fileDescriptor2 = []byte{
-	// 763 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcf, 0x6f, 0xd3, 0x4a,
-	0x10, 0x7e, 0x6e, 0xec, 0x34, 0x9e, 0xb4, 0x91, 0xdf, 0xbe, 0xa7, 0x2a, 0x0a, 0xa5, 0x2a, 0x01,
-	0x44, 0x0f, 0xc8, 0x51, 0x53, 0x10, 0x48, 0x20, 0xa4, 0x38, 0x35, 0xb4, 0x6a, 0x94, 0x58, 0xdb,
-	0x44, 0xe5, 0xc7, 0xc1, 0xf2, 0x8f, 0xad, 0x63, 0x35, 0xf5, 0x5a, 0xb6, 0xdb, 0x26, 0xff, 0x0d,
-	0xff, 0x13, 0x12, 0x27, 0xae, 0x9c, 0xb9, 0x02, 0x27, 0xe4, 0xb5, 0x9d, 0x26, 0x01, 0x53, 0x40,
-	0x1c, 0x7a, 0xb1, 0x76, 0x26, 0xdf, 0x7c, 0x33, 0xdf, 0x8c, 0x27, 0x6b, 0xb8, 0xef, 0x50, 0xea,
-	0x8c, 0x48, 0xc3, 0x1a, 0xd1, 0x33, 0xbb, 0x71, 0xee, 0x86, 0x2e, 0xf5, 0x1a, 0xe7, 0xdb, 0x8d,
-	0x88, 0x8c, 0x23, 0xdd, 0xf0, 0x3c, 0x1a, 0x19, 0x91, 0x4b, 0x3d, 0xd9, 0x0f, 0x68, 0x44, 0xd1,
-	0x5a, 0x82, 0x96, 0x19, 0x5a, 0x4e, 0xd0, 0xf2, 0xf9, 0x76, 0x6d, 0x3d, 0x65, 0x31, 0x7c, 0xb7,
-	0x71, 0x19, 0x14, 0x26, 0x51, 0xb5, 0xbb, 0x39, 0x39, 0x1c, 0x42, 0x4f, 0x49, 0x14, 0x4c, 0x12,
-	0x58, 0xfd, 0x13, 0x0f, 0x95, 0x3e, 0x19, 0x47, 0xad, 0x29, 0x01, 0x6a, 0x82, 0xe0, 0x1b, 0x0e,
-	0x09, 0xab, 0xdc, 0x66, 0x61, 0xab, 0xdc, 0x5c, 0x97, 0x7f, 0x9c, 0x5f, 0xd6, 0x0c, 0x87, 0xe0,
-	0x04, 0x8a, 0x10, 0xf0, 0x71, 0xf1, 0xd5, 0xa5, 0x4d, 0x6e, 0x4b, 0xc4, 0xec, 0x5c, 0x3b, 0x02,
-	0x69, 0x97, 0x44, 0xc4, 0x8a, 0x88, 0xdd, 0x31, 0x3c, 0xe7, 0xcc, 0x70, 0x08, 0xba, 0x0d, 0xab,
-	0xa3, 0xf4, 0xac, 0x5b, 0xd4, 0x26, 0x55, 0x8e, 0x05, 0xac, 0x64, 0xce, 0x36, 0xb5, 0x09, 0xda,
-	0x00, 0xb0, 0xa8, 0x77, 0xec, 0xda, 0xc4, 0xb3, 0x08, 0xa3, 0x5c, 0xc2, 0x33, 0x9e, 0xda, 0x47,
-	0x0e, 0x56, 0x33, 0x66, 0x25, 0x20, 0xc6, 0x09, 0xc2, 0xc0, 0x47, 0x13, 0x3f, 0x61, 0xab, 0x34,
-	0x9f, 0xe5, 0x55, 0x3c, 0x2f, 0x54, 0x9e, 0xe3, 0x90, 0xd9, 0xb3, 0x3f, 0xf1, 0x09, 0x66, 0x5c,
-	0xe8, 0x06, 0x88, 0x6e, 0xa8, 0xfb, 0x01, 0x39, 0x76, 0xc7, 0xac, 0x88, 0x12, 0x2e, 0xb9, 0xa1,
-	0xc6, 0xec, 0xba, 0x05, 0xe2, 0x14, 0x8f, 0xca, 0xb0, 0x3c, 0xe8, 0x1e, 0x74, 0x7b, 0x47, 0x5d,
-	0xe9, 0x1f, 0x24, 0x82, 0x70, 0xa8, 0xb5, 0xda, 0xaa, 0xc4, 0xa1, 0x0a, 0xc0, 0xe1, 0x00, 0xab,
-	0x7a, 0x62, 0x2f, 0x21, 0x04, 0x15, 0xb5, 0xd7, 0xd1, 0x67, 0x7c, 0x05, 0x04, 0x50, 0xdc, 0x7b,
-	0xa5, 0xed, 0xa9, 0x5d, 0x89, 0x8f, 0xf1, 0x9d, 0xfd, 0xae, 0xaa, 0x2b, 0x58, 0x6d, 0x1d, 0x48,
-	0x42, 0xed, 0x1d, 0x07, 0x2b, 0x71, 0xc9, 0x5a, 0x40, 0x7d, 0x12, 0x44, 0x13, 0x74, 0x0c, 0xc8,
-	0x4e, 0x6b, 0xd6, 0xb3, 0x8e, 0x65, 0x63, 0x7a, 0xf4, 0x9b, 0xa2, 0xb3, 0x91, 0xe0, 0x7f, 0xed,
-	0x05, 0x4f, 0x88, 0xde, 0x40, 0x65, 0x9a, 0xc7, 0x8c, 0x65, 0x32, 0xfd, 0xe5, 0xe6, 0x83, 0x3f,
-	0x69, 0x2c, 0x5e, 0xb5, 0x67, 0xcd, 0xfa, 0x07, 0x0e, 0xf8, 0xf8, 0xd5, 0x41, 0x3d, 0x28, 0xf9,
-	0xa9, 0x32, 0x36, 0xb8, 0x72, 0x73, 0xe7, 0x17, 0xf9, 0x67, 0x9b, 0x82, 0xa7, 0x24, 0xe8, 0x7f,
-	0x10, 0x2e, 0x5c, 0x3b, 0x1a, 0xb2, 0x6a, 0x05, 0x9c, 0x18, 0x68, 0x0d, 0x8a, 0x43, 0xe2, 0x3a,
-	0xc3, 0xa8, 0x5a, 0x60, 0xee, 0xd4, 0x42, 0x0f, 0xa1, 0x68, 0x8e, 0xa8, 0x75, 0x12, 0x56, 0x79,
-	0xd6, 0xc0, 0x9b, 0x79, 0xc9, 0x95, 0x18, 0x85, 0x53, 0xf0, 0xc2, 0xcb, 0x29, 0x2c, 0xbe, 0x9c,
-	0xf5, 0xb7, 0x05, 0x10, 0x58, 0xc4, 0xdf, 0xd7, 0xf7, 0x02, 0x56, 0x4c, 0x7a, 0xe6, 0xd9, 0xae,
-	0xe7, 0xe8, 0x26, 0x1d, 0xa7, 0x43, 0xb9, 0x93, 0x5b, 0x77, 0x8a, 0xd5, 0xe8, 0x68, 0x82, 0xcb,
-	0x59, 0xa4, 0x42, 0xc7, 0xa8, 0x05, 0xe0, 0x1b, 0x81, 0xe1, 0x04, 0x86, 0x3f, 0x0c, 0xab, 0x05,
-	0x26, 0xff, 0x56, 0xfe, 0x9a, 0xa7, 0x48, 0x3c, 0x13, 0x84, 0x9e, 0x03, 0xb0, 0x86, 0xe8, 0x6c,
-	0xef, 0x78, 0xb6, 0x77, 0xf7, 0x7e, 0xda, 0xc1, 0xe4, 0xc9, 0x16, 0x4c, 0x34, 0xb3, 0xe3, 0x95,
-	0xed, 0xc4, 0x20, 0x4e, 0xe3, 0xe6, 0x17, 0xad, 0x04, 0x7c, 0x5f, 0x7d, 0xd9, 0x97, 0xb8, 0x78,
-	0xe5, 0xfa, 0x2d, 0xa5, 0x13, 0xaf, 0x58, 0x19, 0x96, 0xb5, 0xfd, 0x76, 0x7f, 0x80, 0xe3, 0xdd,
-	0x12, 0x41, 0xc0, 0x83, 0x8e, 0x8a, 0x25, 0x3e, 0xf6, 0x2b, 0x2d, 0xdc, 0xee, 0xed, 0xaa, 0x92,
-	0x50, 0xff, 0xc2, 0x81, 0x38, 0x55, 0x75, 0x8d, 0xc7, 0xd4, 0x04, 0xe1, 0x82, 0x06, 0x76, 0x36,
-	0xa1, 0xdc, 0x3f, 0xe2, 0x23, 0x1a, 0xd8, 0x38, 0x81, 0x2e, 0xf4, 0x93, 0xff, 0xae, 0x9f, 0x5f,
-	0x39, 0xe0, 0x63, 0xfc, 0x35, 0x96, 0xfd, 0x18, 0x96, 0xc3, 0xc9, 0xa9, 0x49, 0x47, 0x99, 0xf0,
-	0x8d, 0x3c, 0x8e, 0x43, 0x06, 0xc3, 0x19, 0xfc, 0x4a, 0xf1, 0xef, 0x39, 0x28, 0x26, 0x31, 0xd7,
-	0x58, 0x7e, 0x76, 0x95, 0x16, 0x2e, 0xaf, 0xd2, 0xab, 0x84, 0x29, 0x11, 0xd4, 0x2c, 0x7a, 0x9a,
-	0x93, 0x4b, 0xf9, 0x6f, 0x5e, 0x81, 0x16, 0x5f, 0xfc, 0x1a, 0xf7, 0xfa, 0x69, 0x0a, 0x77, 0x68,
-	0x7c, 0x97, 0xc8, 0x34, 0x70, 0x1a, 0x0e, 0xf1, 0xd8, 0x67, 0x41, 0x23, 0xf9, 0xc9, 0xf0, 0xdd,
-	0x70, 0xf1, 0x03, 0xe2, 0x49, 0x72, 0xfa, 0xcc, 0x71, 0x66, 0x91, 0x61, 0x77, 0xbe, 0x05, 0x00,
-	0x00, 0xff, 0xff, 0x3f, 0x4a, 0xe7, 0xb0, 0xcf, 0x08, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1/text_annotation.proto", fileDescriptor_text_annotation_5ca1a16a28ef616a)
+}
+
+var fileDescriptor_text_annotation_5ca1a16a28ef616a = []byte{
+	// 774 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcf, 0x6f, 0xd3, 0x58,
+	0x10, 0x5e, 0x27, 0x76, 0x1a, 0x4f, 0xda, 0xc8, 0xfb, 0x76, 0x55, 0x45, 0xd9, 0x6e, 0xd5, 0xcd,
+	0x82, 0xe8, 0x01, 0x39, 0x6a, 0x0a, 0x02, 0x09, 0x84, 0x14, 0xa7, 0xa6, 0xad, 0x1a, 0x25, 0xd6,
+	0x6b, 0x42, 0xf9, 0x71, 0xb0, 0x1c, 0xfb, 0xd5, 0xb1, 0x9a, 0xfa, 0x59, 0xb6, 0xdb, 0x26, 0xe2,
+	0x9f, 0x41, 0xfc, 0x4b, 0x48, 0x9c, 0xb8, 0x72, 0xe6, 0x0a, 0x9c, 0x90, 0x9f, 0xed, 0x34, 0x09,
+	0x98, 0x02, 0xe2, 0xd0, 0x8b, 0xf5, 0x66, 0xf2, 0xcd, 0x37, 0xf3, 0xcd, 0x78, 0xf2, 0x0c, 0xb7,
+	0x6d, 0x4a, 0xed, 0x11, 0xa9, 0x9b, 0x23, 0x7a, 0x66, 0xd5, 0xcf, 0x9d, 0xc0, 0xa1, 0x6e, 0xfd,
+	0x7c, 0xab, 0x1e, 0x92, 0x71, 0xa8, 0x1b, 0xae, 0x4b, 0x43, 0x23, 0x74, 0xa8, 0x2b, 0x7b, 0x3e,
+	0x0d, 0x29, 0x5a, 0x8d, 0xd1, 0x32, 0x43, 0xcb, 0x31, 0x5a, 0x3e, 0xdf, 0xaa, 0xae, 0x25, 0x2c,
+	0x86, 0xe7, 0xd4, 0x2f, 0x83, 0x82, 0x38, 0xaa, 0x7a, 0x33, 0x23, 0x87, 0x4d, 0xe8, 0x29, 0x09,
+	0xfd, 0x49, 0x0c, 0xab, 0x7d, 0xe0, 0xa1, 0xdc, 0x23, 0xe3, 0xb0, 0x39, 0x25, 0x40, 0x0d, 0x10,
+	0x3c, 0xc3, 0x26, 0x41, 0x85, 0xdb, 0xc8, 0x6f, 0x96, 0x1a, 0x6b, 0xf2, 0xb7, 0xf3, 0xcb, 0x9a,
+	0x61, 0x13, 0x1c, 0x43, 0x11, 0x02, 0x3e, 0x2a, 0xbe, 0x92, 0xdb, 0xe0, 0x36, 0x45, 0xcc, 0xce,
+	0xd5, 0x23, 0x90, 0x76, 0x48, 0x48, 0xcc, 0x90, 0x58, 0x6d, 0xc3, 0xb5, 0xcf, 0x0c, 0x9b, 0xa0,
+	0xff, 0x61, 0x65, 0x94, 0x9c, 0x75, 0x93, 0x5a, 0xa4, 0xc2, 0xb1, 0x80, 0xe5, 0xd4, 0xd9, 0xa2,
+	0x16, 0x41, 0xeb, 0x00, 0x26, 0x75, 0x8f, 0x1d, 0x8b, 0xb8, 0x26, 0x61, 0x94, 0x39, 0x3c, 0xe3,
+	0xa9, 0xbe, 0xe7, 0x60, 0x25, 0x65, 0x56, 0x7c, 0x62, 0x9c, 0x20, 0x0c, 0x7c, 0x38, 0xf1, 0x62,
+	0xb6, 0x72, 0xe3, 0x51, 0x56, 0xc5, 0xf3, 0x42, 0xe5, 0x39, 0x0e, 0x99, 0x3d, 0x7b, 0x13, 0x8f,
+	0x60, 0xc6, 0x85, 0xfe, 0x01, 0xd1, 0x09, 0x74, 0xcf, 0x27, 0xc7, 0xce, 0x98, 0x15, 0x51, 0xc4,
+	0x45, 0x27, 0xd0, 0x98, 0x5d, 0x33, 0x41, 0x9c, 0xe2, 0x51, 0x09, 0x96, 0xfa, 0x9d, 0x83, 0x4e,
+	0xf7, 0xa8, 0x23, 0xfd, 0x81, 0x44, 0x10, 0x0e, 0xb5, 0x66, 0x4b, 0x95, 0x38, 0x54, 0x06, 0x38,
+	0xec, 0x63, 0x55, 0x8f, 0xed, 0x1c, 0x42, 0x50, 0x56, 0xbb, 0x6d, 0x7d, 0xc6, 0x97, 0x47, 0x00,
+	0x85, 0xbd, 0x67, 0xda, 0x9e, 0xda, 0x91, 0xf8, 0x08, 0xdf, 0xde, 0xef, 0xa8, 0xba, 0x82, 0xd5,
+	0xe6, 0x81, 0x24, 0x54, 0xdf, 0x70, 0xb0, 0x1c, 0x95, 0xac, 0xf9, 0xd4, 0x23, 0x7e, 0x38, 0x41,
+	0xc7, 0x80, 0xac, 0xa4, 0x66, 0x3d, 0xed, 0x58, 0x3a, 0xa6, 0x7b, 0x3f, 0x29, 0x3a, 0x1d, 0x09,
+	0xfe, 0xd3, 0x5a, 0xf0, 0x04, 0xe8, 0x05, 0x94, 0xa7, 0x79, 0x06, 0x91, 0x4c, 0xa6, 0xbf, 0xd4,
+	0xb8, 0xf3, 0x2b, 0x8d, 0xc5, 0x2b, 0xd6, 0xac, 0x59, 0x7b, 0xc7, 0x01, 0x1f, 0xbd, 0x3a, 0xa8,
+	0x0b, 0x45, 0x2f, 0x51, 0xc6, 0x06, 0x57, 0x6a, 0x6c, 0xff, 0x20, 0xff, 0x6c, 0x53, 0xf0, 0x94,
+	0x04, 0xfd, 0x0d, 0xc2, 0x85, 0x63, 0x85, 0x43, 0x56, 0xad, 0x80, 0x63, 0x03, 0xad, 0x42, 0x61,
+	0x48, 0x1c, 0x7b, 0x18, 0x56, 0xf2, 0xcc, 0x9d, 0x58, 0xe8, 0x2e, 0x14, 0x06, 0x23, 0x6a, 0x9e,
+	0x04, 0x15, 0x9e, 0x35, 0xf0, 0xdf, 0xac, 0xe4, 0x4a, 0x84, 0xc2, 0x09, 0x78, 0xe1, 0xe5, 0x14,
+	0x16, 0x5f, 0xce, 0xda, 0xab, 0x3c, 0x08, 0x2c, 0xe2, 0xf7, 0xeb, 0xdb, 0x85, 0xe5, 0x01, 0x3d,
+	0x73, 0x2d, 0xc7, 0xb5, 0xf5, 0x01, 0x1d, 0x27, 0x43, 0xb9, 0x91, 0x59, 0x77, 0x82, 0xd5, 0xe8,
+	0x68, 0x82, 0x4b, 0x69, 0xa4, 0x42, 0xc7, 0xa8, 0x09, 0xe0, 0x19, 0xbe, 0x61, 0xfb, 0x86, 0x37,
+	0x0c, 0x2a, 0x79, 0x26, 0xff, 0xbf, 0xec, 0x35, 0x4f, 0x90, 0x78, 0x26, 0x08, 0x3d, 0x06, 0x60,
+	0x0d, 0xd1, 0xd9, 0xde, 0xf1, 0x6c, 0xef, 0x6e, 0x7d, 0xb7, 0x83, 0xf1, 0x93, 0x2d, 0x98, 0x38,
+	0x48, 0x8f, 0x57, 0xb6, 0x13, 0x83, 0x38, 0x8d, 0x9b, 0x5f, 0xb4, 0x22, 0xf0, 0x3d, 0xf5, 0x69,
+	0x4f, 0xe2, 0xa2, 0x95, 0xeb, 0x35, 0x95, 0x76, 0xb4, 0x62, 0x25, 0x58, 0xd2, 0xf6, 0x5b, 0xbd,
+	0x3e, 0x8e, 0x76, 0x4b, 0x04, 0x01, 0xf7, 0xdb, 0x2a, 0x96, 0xf8, 0xc8, 0xaf, 0x34, 0x71, 0xab,
+	0xbb, 0xa3, 0x4a, 0x42, 0xed, 0x13, 0x07, 0xe2, 0x54, 0xd5, 0x35, 0x1e, 0x53, 0x03, 0x84, 0x0b,
+	0xea, 0x5b, 0xe9, 0x84, 0x32, 0xff, 0x88, 0x8f, 0xa8, 0x6f, 0xe1, 0x18, 0xba, 0xd0, 0x4f, 0xfe,
+	0xab, 0x7e, 0x7e, 0xe6, 0x80, 0x8f, 0xf0, 0xd7, 0x58, 0xf6, 0x7d, 0x58, 0x0a, 0x26, 0xa7, 0x03,
+	0x3a, 0x4a, 0x85, 0xaf, 0x67, 0x71, 0x1c, 0x32, 0x18, 0x4e, 0xe1, 0x57, 0x8a, 0x7f, 0xcb, 0x41,
+	0x21, 0x8e, 0xb9, 0xc6, 0xf2, 0xd3, 0xab, 0x34, 0x7f, 0x79, 0x95, 0x5e, 0x25, 0x4c, 0x79, 0x09,
+	0x55, 0x93, 0x9e, 0x66, 0xe4, 0x52, 0xfe, 0x9a, 0x57, 0xa0, 0x45, 0x17, 0xbf, 0xc6, 0x3d, 0x7f,
+	0x98, 0xc0, 0x6d, 0x1a, 0xdd, 0x25, 0x32, 0xf5, 0xed, 0xba, 0x4d, 0x5c, 0xf6, 0x59, 0x50, 0x8f,
+	0x7f, 0x32, 0x3c, 0x27, 0x58, 0xfc, 0x80, 0x78, 0x10, 0x9f, 0x3e, 0x72, 0xdc, 0xeb, 0x1c, 0xbf,
+	0xdb, 0x7a, 0xd2, 0x19, 0x14, 0x58, 0xc8, 0xf6, 0x97, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x88,
+	0x57, 0x38, 0xd6, 0x08, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/web_detection.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/web_detection.pb.go
index 921ce4a9..dc413848 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/web_detection.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1/web_detection.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1/web_detection.proto
 
-package vision
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,29 +13,57 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Relevant information for the image from the Internet.
 type WebDetection struct {
 	// Deduced entities from similar images on the Internet.
-	WebEntities []*WebDetection_WebEntity `protobuf:"bytes,1,rep,name=web_entities,json=webEntities" json:"web_entities,omitempty"`
+	WebEntities []*WebDetection_WebEntity `protobuf:"bytes,1,rep,name=web_entities,json=webEntities,proto3" json:"web_entities,omitempty"`
 	// Fully matching images from the Internet.
 	// Can include resized copies of the query image.
-	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,2,rep,name=full_matching_images,json=fullMatchingImages" json:"full_matching_images,omitempty"`
+	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,2,rep,name=full_matching_images,json=fullMatchingImages,proto3" json:"full_matching_images,omitempty"`
 	// Partial matching images from the Internet.
 	// Those images are similar enough to share some key-point features. For
 	// example an original image will likely have partial matching for its crops.
-	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,3,rep,name=partial_matching_images,json=partialMatchingImages" json:"partial_matching_images,omitempty"`
+	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,3,rep,name=partial_matching_images,json=partialMatchingImages,proto3" json:"partial_matching_images,omitempty"`
 	// Web pages containing the matching images from the Internet.
-	PagesWithMatchingImages []*WebDetection_WebPage `protobuf:"bytes,4,rep,name=pages_with_matching_images,json=pagesWithMatchingImages" json:"pages_with_matching_images,omitempty"`
+	PagesWithMatchingImages []*WebDetection_WebPage `protobuf:"bytes,4,rep,name=pages_with_matching_images,json=pagesWithMatchingImages,proto3" json:"pages_with_matching_images,omitempty"`
 	// The visually similar image results.
-	VisuallySimilarImages []*WebDetection_WebImage `protobuf:"bytes,6,rep,name=visually_similar_images,json=visuallySimilarImages" json:"visually_similar_images,omitempty"`
+	VisuallySimilarImages []*WebDetection_WebImage `protobuf:"bytes,6,rep,name=visually_similar_images,json=visuallySimilarImages,proto3" json:"visually_similar_images,omitempty"`
 	// Best guess text labels for the request image.
-	BestGuessLabels []*WebDetection_WebLabel `protobuf:"bytes,8,rep,name=best_guess_labels,json=bestGuessLabels" json:"best_guess_labels,omitempty"`
+	BestGuessLabels      []*WebDetection_WebLabel `protobuf:"bytes,8,rep,name=best_guess_labels,json=bestGuessLabels,proto3" json:"best_guess_labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *WebDetection) Reset()         { *m = WebDetection{} }
+func (m *WebDetection) String() string { return proto.CompactTextString(m) }
+func (*WebDetection) ProtoMessage()    {}
+func (*WebDetection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cd347bf1f824d1ac, []int{0}
+}
+func (m *WebDetection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
+}
+func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(dst, src)
+}
+func (m *WebDetection) XXX_Size() int {
+	return xxx_messageInfo_WebDetection.Size(m)
+}
+func (m *WebDetection) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection.DiscardUnknown(m)
 }
 
-func (m *WebDetection) Reset()                    { *m = WebDetection{} }
-func (m *WebDetection) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection) ProtoMessage()               {}
-func (*WebDetection) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_WebDetection proto.InternalMessageInfo
 
 func (m *WebDetection) GetWebEntities() []*WebDetection_WebEntity {
 	if m != nil {
@@ -82,18 +110,40 @@ func (m *WebDetection) GetBestGuessLabels() []*WebDetection_WebLabel {
 // Entity deduced from similar images on the Internet.
 type WebDetection_WebEntity struct {
 	// Opaque entity ID.
-	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"`
+	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
 	// Overall relevancy score for the entity.
 	// Not normalized and not comparable across different image queries.
-	Score float32 `protobuf:"fixed32,2,opt,name=score" json:"score,omitempty"`
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
 	// Canonical description of the entity, in English.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{} }
+func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebEntity) ProtoMessage()    {}
+func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cd347bf1f824d1ac, []int{0, 0}
+}
+func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
+}
+func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+}
+func (m *WebDetection_WebEntity) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
+}
+func (m *WebDetection_WebEntity) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebEntity.DiscardUnknown(m)
 }
 
-func (m *WebDetection_WebEntity) Reset()                    { *m = WebDetection_WebEntity{} }
-func (m *WebDetection_WebEntity) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection_WebEntity) ProtoMessage()               {}
-func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+var xxx_messageInfo_WebDetection_WebEntity proto.InternalMessageInfo
 
 func (m *WebDetection_WebEntity) GetEntityId() string {
 	if m != nil {
@@ -119,15 +169,37 @@ func (m *WebDetection_WebEntity) GetDescription() string {
 // Metadata for online images.
 type WebDetection_WebImage struct {
 	// The result image URL.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// (Deprecated) Overall relevancy score for the image.
-	Score float32 `protobuf:"fixed32,2,opt,name=score" json:"score,omitempty"`
+	Score                float32  `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *WebDetection_WebImage) Reset()                    { *m = WebDetection_WebImage{} }
-func (m *WebDetection_WebImage) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection_WebImage) ProtoMessage()               {}
-func (*WebDetection_WebImage) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 1} }
+func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
+func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebImage) ProtoMessage()    {}
+func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cd347bf1f824d1ac, []int{0, 1}
+}
+func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
+}
+func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+}
+func (m *WebDetection_WebImage) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebImage.Size(m)
+}
+func (m *WebDetection_WebImage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebImage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebImage proto.InternalMessageInfo
 
 func (m *WebDetection_WebImage) GetUrl() string {
 	if m != nil {
@@ -146,25 +218,47 @@ func (m *WebDetection_WebImage) GetScore() float32 {
 // Metadata for web pages.
 type WebDetection_WebPage struct {
 	// The result web page URL.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// (Deprecated) Overall relevancy score for the web page.
-	Score float32 `protobuf:"fixed32,2,opt,name=score" json:"score,omitempty"`
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
 	// Title for the web page, may contain HTML markups.
-	PageTitle string `protobuf:"bytes,3,opt,name=page_title,json=pageTitle" json:"page_title,omitempty"`
+	PageTitle string `protobuf:"bytes,3,opt,name=page_title,json=pageTitle,proto3" json:"page_title,omitempty"`
 	// Fully matching images on the page.
 	// Can include resized copies of the query image.
-	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,4,rep,name=full_matching_images,json=fullMatchingImages" json:"full_matching_images,omitempty"`
+	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,4,rep,name=full_matching_images,json=fullMatchingImages,proto3" json:"full_matching_images,omitempty"`
 	// Partial matching images on the page.
 	// Those images are similar enough to share some key-point features. For
 	// example an original image will likely have partial matching for its
 	// crops.
-	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,5,rep,name=partial_matching_images,json=partialMatchingImages" json:"partial_matching_images,omitempty"`
+	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,5,rep,name=partial_matching_images,json=partialMatchingImages,proto3" json:"partial_matching_images,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}                 `json:"-"`
+	XXX_unrecognized      []byte                   `json:"-"`
+	XXX_sizecache         int32                    `json:"-"`
+}
+
+func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
+func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebPage) ProtoMessage()    {}
+func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cd347bf1f824d1ac, []int{0, 2}
+}
+func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
+}
+func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+}
+func (m *WebDetection_WebPage) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebPage.Size(m)
+}
+func (m *WebDetection_WebPage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebPage.DiscardUnknown(m)
 }
 
-func (m *WebDetection_WebPage) Reset()                    { *m = WebDetection_WebPage{} }
-func (m *WebDetection_WebPage) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection_WebPage) ProtoMessage()               {}
-func (*WebDetection_WebPage) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 2} }
+var xxx_messageInfo_WebDetection_WebPage proto.InternalMessageInfo
 
 func (m *WebDetection_WebPage) GetUrl() string {
 	if m != nil {
@@ -204,17 +298,39 @@ func (m *WebDetection_WebPage) GetPartialMatchingImages() []*WebDetection_WebIma
 // Label to provide extra metadata for the web detection.
 type WebDetection_WebLabel struct {
 	// Label for extra metadata.
-	Label string `protobuf:"bytes,1,opt,name=label" json:"label,omitempty"`
+	Label string `protobuf:"bytes,1,opt,name=label,proto3" json:"label,omitempty"`
 	// The BCP-47 language code for `label`, such as "en-US" or "sr-Latn".
 	// For more information, see
 	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *WebDetection_WebLabel) Reset()                    { *m = WebDetection_WebLabel{} }
-func (m *WebDetection_WebLabel) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection_WebLabel) ProtoMessage()               {}
-func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 3} }
+func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
+func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebLabel) ProtoMessage()    {}
+func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cd347bf1f824d1ac, []int{0, 3}
+}
+func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
+}
+func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+}
+func (m *WebDetection_WebLabel) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
+}
+func (m *WebDetection_WebLabel) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebLabel.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebLabel proto.InternalMessageInfo
 
 func (m *WebDetection_WebLabel) GetLabel() string {
 	if m != nil {
@@ -238,40 +354,42 @@ func init() {
 	proto.RegisterType((*WebDetection_WebLabel)(nil), "google.cloud.vision.v1.WebDetection.WebLabel")
 }
 
-func init() { proto.RegisterFile("google/cloud/vision/v1/web_detection.proto", fileDescriptor3) }
-
-var fileDescriptor3 = []byte{
-	// 505 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xd1, 0x8b, 0xd3, 0x4e,
-	0x10, 0xc7, 0x49, 0x7b, 0x77, 0xbf, 0x76, 0xdb, 0x1f, 0x7a, 0xcb, 0xe9, 0x85, 0xa8, 0x50, 0xf4,
-	0xa5, 0x88, 0x26, 0xdc, 0xf9, 0xa8, 0x4f, 0xa7, 0x87, 0x1c, 0x28, 0xd4, 0x28, 0x1c, 0xfa, 0xb2,
-	0x6e, 0x92, 0x35, 0x1d, 0xd8, 0x66, 0x43, 0x76, 0xd3, 0xd2, 0xff, 0xc4, 0xbf, 0xca, 0xbf, 0xc7,
-	0x47, 0x99, 0xdd, 0x8d, 0x94, 0xeb, 0x1d, 0xd4, 0x43, 0x7c, 0x9b, 0x99, 0xcc, 0xf7, 0xf3, 0xdd,
-	0x9d, 0x0c, 0x4b, 0x9e, 0x96, 0x4a, 0x95, 0x52, 0x24, 0xb9, 0x54, 0x6d, 0x91, 0x2c, 0x41, 0x83,
-	0xaa, 0x92, 0xe5, 0x49, 0xb2, 0x12, 0x19, 0x2b, 0x84, 0x11, 0xb9, 0x01, 0x55, 0xc5, 0x75, 0xa3,
-	0x8c, 0xa2, 0xf7, 0x5d, 0x6f, 0x6c, 0x7b, 0x63, 0xd7, 0x1b, 0x2f, 0x4f, 0xa2, 0x87, 0x9e, 0xc1,
-	0x6b, 0x48, 0x78, 0x55, 0x29, 0xc3, 0x51, 0xa4, 0x9d, 0xea, 0xf1, 0x8f, 0x01, 0x19, 0x5f, 0x8a,
-	0xec, 0x4d, 0x07, 0xa3, 0x1f, 0xc8, 0x18, 0xe9, 0xa2, 0x32, 0x60, 0x40, 0xe8, 0x30, 0x98, 0xf4,
-	0xa7, 0xa3, 0xd3, 0x38, 0xbe, 0x9e, 0x1e, 0x6f, 0x6a, 0x31, 0x39, 0x47, 0xdd, 0x3a, 0x1d, 0xad,
-	0x7c, 0x08, 0x42, 0x53, 0x46, 0x8e, 0xbe, 0xb5, 0x52, 0xb2, 0x05, 0x37, 0xf9, 0x1c, 0xaa, 0x92,
-	0xc1, 0x82, 0x97, 0x42, 0x87, 0x3d, 0x8b, 0x7e, 0xbe, 0x2b, 0xfa, 0x02, 0x55, 0x29, 0x45, 0xd4,
-	0x7b, 0x4f, 0xb2, 0x25, 0x4d, 0x05, 0x39, 0xae, 0x79, 0x63, 0x80, 0x6f, 0x7b, 0xf4, 0x6f, 0xe3,
-	0x71, 0xcf, 0xd3, 0xae, 0xd8, 0x00, 0x89, 0x6a, 0x0c, 0xd8, 0x0a, 0xcc, 0x7c, 0xcb, 0x69, 0xcf,
-	0x3a, 0x3d, 0xdb, 0xd5, 0x69, 0x86, 0x46, 0xc7, 0x96, 0x77, 0x09, 0x66, 0xbe, 0x7d, 0xa3, 0x25,
-	0xe8, 0x96, 0x4b, 0xb9, 0x66, 0x1a, 0x16, 0x20, 0x79, 0xd3, 0xf9, 0x1c, 0xdc, 0xea, 0x46, 0x1d,
-	0xed, 0xa3, 0x83, 0x79, 0x9b, 0xcf, 0xe4, 0x30, 0x13, 0xda, 0xb0, 0xb2, 0x15, 0x5a, 0x33, 0xc9,
-	0x33, 0x21, 0x75, 0x38, 0xf8, 0x33, 0x83, 0x77, 0xa8, 0x4a, 0xef, 0x20, 0xe7, 0x2d, 0x62, 0x6c,
-	0xae, 0xa3, 0xaf, 0x64, 0xf8, 0x7b, 0x1d, 0xe8, 0x03, 0x32, 0xb4, 0x0b, 0xb5, 0x66, 0x50, 0x84,
-	0xc1, 0x24, 0x98, 0x0e, 0xd3, 0x81, 0x2b, 0x5c, 0x14, 0xf4, 0x88, 0xec, 0xeb, 0x5c, 0x35, 0x22,
-	0xec, 0x4d, 0x82, 0x69, 0x2f, 0x75, 0x09, 0x9d, 0x90, 0x51, 0x21, 0x74, 0xde, 0x40, 0x8d, 0x46,
-	0x61, 0xdf, 0x8a, 0x36, 0x4b, 0xd1, 0x29, 0x19, 0x74, 0xf7, 0xa3, 0x77, 0x49, 0xbf, 0x6d, 0xa4,
-	0x47, 0x63, 0x78, 0x3d, 0x35, 0xfa, 0xde, 0x23, 0xff, 0xf9, 0xe1, 0xef, 0xaa, 0xa1, 0x8f, 0x08,
-	0xc1, 0xdf, 0xc4, 0x0c, 0x18, 0x29, 0xfc, 0x41, 0x86, 0x58, 0xf9, 0x84, 0x85, 0x1b, 0xb7, 0x7b,
-	0xef, 0x1f, 0x6c, 0xf7, 0xfe, 0xdf, 0xdb, 0xee, 0xe8, 0xdc, 0x8e, 0xd3, 0xfe, 0x3d, 0x1c, 0x84,
-	0x5d, 0x06, 0x3f, 0x1c, 0x97, 0xd0, 0x27, 0xe4, 0x7f, 0xc9, 0xab, 0xb2, 0xc5, 0x61, 0xe4, 0xaa,
-	0x70, 0x63, 0x1a, 0xa6, 0xe3, 0xae, 0xf8, 0x5a, 0x15, 0xe2, 0xac, 0x21, 0x51, 0xae, 0x16, 0x37,
-	0x9c, 0xe8, 0xec, 0x70, 0xf3, 0x48, 0x33, 0x7c, 0x81, 0x66, 0xc1, 0x97, 0x57, 0xbe, 0xb9, 0x54,
-	0x48, 0x8a, 0x55, 0x53, 0x26, 0xa5, 0xa8, 0xec, 0xfb, 0x94, 0xb8, 0x4f, 0xbc, 0x06, 0x7d, 0xf5,
-	0x11, 0x7c, 0xe9, 0xa2, 0x9f, 0x41, 0x90, 0x1d, 0xd8, 0xde, 0x17, 0xbf, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0x1c, 0xe5, 0x3e, 0x5b, 0x2f, 0x05, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1/web_detection.proto", fileDescriptor_web_detection_cd347bf1f824d1ac)
+}
+
+var fileDescriptor_web_detection_cd347bf1f824d1ac = []byte{
+	// 512 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x51, 0x6f, 0xd3, 0x30,
+	0x10, 0xc7, 0x95, 0xb6, 0x1b, 0xad, 0x5b, 0x04, 0xb3, 0x06, 0x8b, 0x02, 0x48, 0x15, 0xbc, 0x54,
+	0x08, 0x12, 0x6d, 0x3c, 0xc2, 0xd3, 0xc6, 0x34, 0x4d, 0x02, 0x54, 0x02, 0x62, 0x82, 0x17, 0xe3,
+	0x26, 0x26, 0x3d, 0xc9, 0x8d, 0xa3, 0xd8, 0x69, 0xd5, 0x6f, 0xc2, 0x33, 0x1f, 0x88, 0xcf, 0xc3,
+	0x23, 0x3a, 0xdb, 0x45, 0xd5, 0xba, 0x49, 0x65, 0x42, 0xbc, 0xdd, 0x5d, 0xee, 0xff, 0xfb, 0xdb,
+	0x97, 0x93, 0xc9, 0xd3, 0x42, 0xa9, 0x42, 0x8a, 0x24, 0x93, 0xaa, 0xc9, 0x93, 0x39, 0x68, 0x50,
+	0x65, 0x32, 0x3f, 0x4c, 0x16, 0x62, 0xc2, 0x72, 0x61, 0x44, 0x66, 0x40, 0x95, 0x71, 0x55, 0x2b,
+	0xa3, 0xe8, 0x7d, 0xd7, 0x1b, 0xdb, 0xde, 0xd8, 0xf5, 0xc6, 0xf3, 0xc3, 0xe8, 0xa1, 0x67, 0xf0,
+	0x0a, 0x12, 0x5e, 0x96, 0xca, 0x70, 0x14, 0x69, 0xa7, 0x7a, 0xfc, 0xb3, 0x4b, 0x06, 0x17, 0x62,
+	0xf2, 0x7a, 0x05, 0xa3, 0xef, 0xc9, 0x00, 0xe9, 0xa2, 0x34, 0x60, 0x40, 0xe8, 0x30, 0x18, 0xb6,
+	0x47, 0xfd, 0xa3, 0x38, 0xbe, 0x9a, 0x1e, 0xaf, 0x6b, 0x31, 0x39, 0x45, 0xdd, 0x32, 0xed, 0x2f,
+	0x7c, 0x08, 0x42, 0x53, 0x46, 0xf6, 0xbf, 0x35, 0x52, 0xb2, 0x19, 0x37, 0xd9, 0x14, 0xca, 0x82,
+	0xc1, 0x8c, 0x17, 0x42, 0x87, 0x2d, 0x8b, 0x7e, 0xbe, 0x2d, 0xfa, 0x1c, 0x55, 0x29, 0x45, 0xd4,
+	0x5b, 0x4f, 0xb2, 0x25, 0x4d, 0x05, 0x39, 0xa8, 0x78, 0x6d, 0x80, 0x6f, 0x7a, 0xb4, 0x6f, 0xe2,
+	0x71, 0xcf, 0xd3, 0x2e, 0xd9, 0x00, 0x89, 0x2a, 0x0c, 0xd8, 0x02, 0xcc, 0x74, 0xc3, 0xa9, 0x63,
+	0x9d, 0x9e, 0x6d, 0xeb, 0x34, 0x46, 0xa3, 0x03, 0xcb, 0xbb, 0x00, 0x33, 0xdd, 0xbc, 0xd1, 0x1c,
+	0x74, 0xc3, 0xa5, 0x5c, 0x32, 0x0d, 0x33, 0x90, 0xbc, 0x5e, 0xf9, 0xec, 0xde, 0xe8, 0x46, 0x2b,
+	0xda, 0x07, 0x07, 0xf3, 0x36, 0x9f, 0xc9, 0xde, 0x44, 0x68, 0xc3, 0x8a, 0x46, 0x68, 0xcd, 0x24,
+	0x9f, 0x08, 0xa9, 0xc3, 0xee, 0xdf, 0x19, 0xbc, 0x41, 0x55, 0x7a, 0x07, 0x39, 0x67, 0x88, 0xb1,
+	0xb9, 0x8e, 0xbe, 0x92, 0xde, 0x9f, 0x75, 0xa0, 0x0f, 0x48, 0xcf, 0x2e, 0xd4, 0x92, 0x41, 0x1e,
+	0x06, 0xc3, 0x60, 0xd4, 0x4b, 0xbb, 0xae, 0x70, 0x9e, 0xd3, 0x7d, 0xb2, 0xa3, 0x33, 0x55, 0x8b,
+	0xb0, 0x35, 0x0c, 0x46, 0xad, 0xd4, 0x25, 0x74, 0x48, 0xfa, 0xb9, 0xd0, 0x59, 0x0d, 0x15, 0x1a,
+	0x85, 0x6d, 0x2b, 0x5a, 0x2f, 0x45, 0x47, 0xa4, 0xbb, 0xba, 0x1f, 0xbd, 0x4b, 0xda, 0x4d, 0x2d,
+	0x3d, 0x1a, 0xc3, 0xab, 0xa9, 0xd1, 0xf7, 0x16, 0xb9, 0xe5, 0x87, 0xbf, 0xad, 0x86, 0x3e, 0x22,
+	0x04, 0x7f, 0x13, 0x33, 0x60, 0xa4, 0xf0, 0x07, 0xe9, 0x61, 0xe5, 0x23, 0x16, 0xae, 0xdd, 0xee,
+	0xce, 0x7f, 0xd8, 0xee, 0x9d, 0x7f, 0xb7, 0xdd, 0xd1, 0xa9, 0x1d, 0xa7, 0xfd, 0x7b, 0x38, 0x08,
+	0xbb, 0x0c, 0x7e, 0x38, 0x2e, 0xa1, 0x4f, 0xc8, 0x6d, 0xc9, 0xcb, 0xa2, 0xc1, 0x61, 0x64, 0x2a,
+	0x77, 0x63, 0xea, 0xa5, 0x83, 0x55, 0xf1, 0x44, 0xe5, 0xe2, 0x78, 0x49, 0xa2, 0x4c, 0xcd, 0xae,
+	0x39, 0xd1, 0xf1, 0xde, 0xfa, 0x91, 0xc6, 0xf8, 0x02, 0x8d, 0x83, 0x2f, 0xaf, 0x7c, 0x73, 0xa1,
+	0x90, 0x14, 0xab, 0xba, 0x48, 0x0a, 0x51, 0xda, 0xf7, 0x29, 0x71, 0x9f, 0x78, 0x05, 0xfa, 0xf2,
+	0x23, 0xf8, 0xd2, 0x45, 0xbf, 0x82, 0xe0, 0x47, 0xab, 0x73, 0x76, 0xf2, 0xe9, 0xdd, 0x64, 0xd7,
+	0x4a, 0x5e, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x99, 0x1b, 0x06, 0x03, 0x36, 0x05, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/geometry.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
index c04a32ad..775ad1c8 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/geometry.pb.go
@@ -1,49 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/geometry.proto
 
-/*
-Package vision is a generated protocol buffer package.
-
-It is generated from these files:
-	google/cloud/vision/v1p1beta1/geometry.proto
-	google/cloud/vision/v1p1beta1/image_annotator.proto
-	google/cloud/vision/v1p1beta1/text_annotation.proto
-	google/cloud/vision/v1p1beta1/web_detection.proto
-
-It has these top-level messages:
-	Vertex
-	BoundingPoly
-	Position
-	Feature
-	ImageSource
-	Image
-	FaceAnnotation
-	LocationInfo
-	Property
-	EntityAnnotation
-	SafeSearchAnnotation
-	LatLongRect
-	ColorInfo
-	DominantColorsAnnotation
-	ImageProperties
-	CropHint
-	CropHintsAnnotation
-	CropHintsParams
-	WebDetectionParams
-	ImageContext
-	AnnotateImageRequest
-	AnnotateImageResponse
-	BatchAnnotateImagesRequest
-	BatchAnnotateImagesResponse
-	TextAnnotation
-	Page
-	Block
-	Paragraph
-	Word
-	Symbol
-	WebDetection
-*/
-package vision
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -64,15 +22,37 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // NOTE: the vertex coordinates are in the same scale as the original image.
 type Vertex struct {
 	// X coordinate.
-	X int32 `protobuf:"varint,1,opt,name=x" json:"x,omitempty"`
+	X int32 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"`
 	// Y coordinate.
-	Y int32 `protobuf:"varint,2,opt,name=y" json:"y,omitempty"`
+	Y                    int32    `protobuf:"varint,2,opt,name=y,proto3" json:"y,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Vertex) Reset()                    { *m = Vertex{} }
-func (m *Vertex) String() string            { return proto.CompactTextString(m) }
-func (*Vertex) ProtoMessage()               {}
-func (*Vertex) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Vertex) Reset()         { *m = Vertex{} }
+func (m *Vertex) String() string { return proto.CompactTextString(m) }
+func (*Vertex) ProtoMessage()    {}
+func (*Vertex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_9a7190aad6b30813, []int{0}
+}
+func (m *Vertex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Vertex.Unmarshal(m, b)
+}
+func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
+}
+func (dst *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(dst, src)
+}
+func (m *Vertex) XXX_Size() int {
+	return xxx_messageInfo_Vertex.Size(m)
+}
+func (m *Vertex) XXX_DiscardUnknown() {
+	xxx_messageInfo_Vertex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Vertex proto.InternalMessageInfo
 
 func (m *Vertex) GetX() int32 {
 	if m != nil {
@@ -91,13 +71,35 @@ func (m *Vertex) GetY() int32 {
 // A bounding polygon for the detected image annotation.
 type BoundingPoly struct {
 	// The bounding polygon vertices.
-	Vertices []*Vertex `protobuf:"bytes,1,rep,name=vertices" json:"vertices,omitempty"`
+	Vertices             []*Vertex `protobuf:"bytes,1,rep,name=vertices,proto3" json:"vertices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *BoundingPoly) Reset()                    { *m = BoundingPoly{} }
-func (m *BoundingPoly) String() string            { return proto.CompactTextString(m) }
-func (*BoundingPoly) ProtoMessage()               {}
-func (*BoundingPoly) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
+func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
+func (*BoundingPoly) ProtoMessage()    {}
+func (*BoundingPoly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_9a7190aad6b30813, []int{1}
+}
+func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
+}
+func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
+}
+func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+}
+func (m *BoundingPoly) XXX_Size() int {
+	return xxx_messageInfo_BoundingPoly.Size(m)
+}
+func (m *BoundingPoly) XXX_DiscardUnknown() {
+	xxx_messageInfo_BoundingPoly.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BoundingPoly proto.InternalMessageInfo
 
 func (m *BoundingPoly) GetVertices() []*Vertex {
 	if m != nil {
@@ -111,17 +113,39 @@ func (m *BoundingPoly) GetVertices() []*Vertex {
 // The position coordinates are in the same scale as the original image.
 type Position struct {
 	// X coordinate.
-	X float32 `protobuf:"fixed32,1,opt,name=x" json:"x,omitempty"`
+	X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"`
 	// Y coordinate.
-	Y float32 `protobuf:"fixed32,2,opt,name=y" json:"y,omitempty"`
+	Y float32 `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"`
 	// Z coordinate (or depth).
-	Z float32 `protobuf:"fixed32,3,opt,name=z" json:"z,omitempty"`
+	Z                    float32  `protobuf:"fixed32,3,opt,name=z,proto3" json:"z,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Position) Reset()                    { *m = Position{} }
-func (m *Position) String() string            { return proto.CompactTextString(m) }
-func (*Position) ProtoMessage()               {}
-func (*Position) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Position) Reset()         { *m = Position{} }
+func (m *Position) String() string { return proto.CompactTextString(m) }
+func (*Position) ProtoMessage()    {}
+func (*Position) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_9a7190aad6b30813, []int{2}
+}
+func (m *Position) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Position.Unmarshal(m, b)
+}
+func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
+}
+func (dst *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(dst, src)
+}
+func (m *Position) XXX_Size() int {
+	return xxx_messageInfo_Position.Size(m)
+}
+func (m *Position) XXX_DiscardUnknown() {
+	xxx_messageInfo_Position.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Position proto.InternalMessageInfo
 
 func (m *Position) GetX() float32 {
 	if m != nil {
@@ -150,9 +174,11 @@ func init() {
 	proto.RegisterType((*Position)(nil), "google.cloud.vision.v1p1beta1.Position")
 }
 
-func init() { proto.RegisterFile("google/cloud/vision/v1p1beta1/geometry.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p1beta1/geometry.proto", fileDescriptor_geometry_9a7190aad6b30813)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_geometry_9a7190aad6b30813 = []byte{
 	// 243 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xb1, 0x4b, 0xc3, 0x40,
 	0x14, 0x87, 0x79, 0x29, 0x96, 0x72, 0xd6, 0x25, 0x53, 0x16, 0xa1, 0x06, 0x85, 0x0e, 0x72, 0x47,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
index 0d2b5b65..3b08f5b8 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/image_annotator.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/image_annotator.proto
 
-package vision
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
-import google_type "google.golang.org/genproto/googleapis/type/color"
-import google_type1 "google.golang.org/genproto/googleapis/type/latlng"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import color "google.golang.org/genproto/googleapis/type/color"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A bucketized representation of likelihood, which is intended to give clients
 // highly stable results across model upgrades.
 type Likelihood int32
@@ -60,7 +66,9 @@ var Likelihood_value = map[string]int32{
 func (x Likelihood) String() string {
 	return proto.EnumName(Likelihood_name, int32(x))
 }
-func (Likelihood) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{0}
+}
 
 // Type of image feature.
 type Feature_Type int32
@@ -121,7 +129,9 @@ var Feature_Type_value = map[string]int32{
 func (x Feature_Type) String() string {
 	return proto.EnumName(Feature_Type_name, int32(x))
 }
-func (Feature_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (Feature_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{0, 0}
+}
 
 // Face landmark (feature) type.
 // Left and right are defined from the vantage of the viewer of the image
@@ -281,7 +291,7 @@ func (x FaceAnnotation_Landmark_Type) String() string {
 	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
 }
 func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{3, 0, 0}
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{3, 0, 0}
 }
 
 // Users describe the type of Google Cloud Vision API tasks to perform over
@@ -290,19 +300,41 @@ func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
 // vertical to operate on and the number of top-scoring results to return.
 type Feature struct {
 	// The feature type.
-	Type Feature_Type `protobuf:"varint,1,opt,name=type,enum=google.cloud.vision.v1p1beta1.Feature_Type" json:"type,omitempty"`
+	Type Feature_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.vision.v1p1beta1.Feature_Type" json:"type,omitempty"`
 	// Maximum number of results of this type.
-	MaxResults int32 `protobuf:"varint,2,opt,name=max_results,json=maxResults" json:"max_results,omitempty"`
+	MaxResults int32 `protobuf:"varint,2,opt,name=max_results,json=maxResults,proto3" json:"max_results,omitempty"`
 	// Model to use for the feature.
 	// Supported values: "builtin/stable" (the default if unset) and
 	// "builtin/latest".
-	Model string `protobuf:"bytes,3,opt,name=model" json:"model,omitempty"`
+	Model                string   `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Feature) Reset()         { *m = Feature{} }
+func (m *Feature) String() string { return proto.CompactTextString(m) }
+func (*Feature) ProtoMessage()    {}
+func (*Feature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{0}
+}
+func (m *Feature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Feature.Unmarshal(m, b)
+}
+func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
+}
+func (dst *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(dst, src)
+}
+func (m *Feature) XXX_Size() int {
+	return xxx_messageInfo_Feature.Size(m)
+}
+func (m *Feature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Feature.DiscardUnknown(m)
 }
 
-func (m *Feature) Reset()                    { *m = Feature{} }
-func (m *Feature) String() string            { return proto.CompactTextString(m) }
-func (*Feature) ProtoMessage()               {}
-func (*Feature) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Feature proto.InternalMessageInfo
 
 func (m *Feature) GetType() Feature_Type {
 	if m != nil {
@@ -333,7 +365,7 @@ type ImageSource struct {
 	// [Google Cloud Storage Request
 	// URIs](https://cloud.google.com/storage/docs/reference-uris)).
 	// NOTE: Cloud Storage object versioning is not supported.
-	GcsImageUri string `protobuf:"bytes,1,opt,name=gcs_image_uri,json=gcsImageUri" json:"gcs_image_uri,omitempty"`
+	GcsImageUri string `protobuf:"bytes,1,opt,name=gcs_image_uri,json=gcsImageUri,proto3" json:"gcs_image_uri,omitempty"`
 	// Image URI which supports:
 	// 1) Google Cloud Storage image URI, which must be in the following form:
 	// `gs://bucket_name/object_name` (for details, see
@@ -344,13 +376,35 @@ type ImageSource struct {
 	// This is preferred over the legacy `gcs_image_uri` above. When both
 	// `gcs_image_uri` and `image_uri` are specified, `image_uri` takes
 	// precedence.
-	ImageUri string `protobuf:"bytes,2,opt,name=image_uri,json=imageUri" json:"image_uri,omitempty"`
+	ImageUri             string   `protobuf:"bytes,2,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImageSource) Reset()         { *m = ImageSource{} }
+func (m *ImageSource) String() string { return proto.CompactTextString(m) }
+func (*ImageSource) ProtoMessage()    {}
+func (*ImageSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{1}
+}
+func (m *ImageSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
+}
+func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
+}
+func (dst *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(dst, src)
+}
+func (m *ImageSource) XXX_Size() int {
+	return xxx_messageInfo_ImageSource.Size(m)
+}
+func (m *ImageSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageSource.DiscardUnknown(m)
 }
 
-func (m *ImageSource) Reset()                    { *m = ImageSource{} }
-func (m *ImageSource) String() string            { return proto.CompactTextString(m) }
-func (*ImageSource) ProtoMessage()               {}
-func (*ImageSource) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_ImageSource proto.InternalMessageInfo
 
 func (m *ImageSource) GetGcsImageUri() string {
 	if m != nil {
@@ -375,13 +429,35 @@ type Image struct {
 	// Google Cloud Storage image location. If both `content` and `source`
 	// are provided for an image, `content` takes precedence and is
 	// used to perform the image annotation request.
-	Source *ImageSource `protobuf:"bytes,2,opt,name=source" json:"source,omitempty"`
+	Source               *ImageSource `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Image) Reset()         { *m = Image{} }
+func (m *Image) String() string { return proto.CompactTextString(m) }
+func (*Image) ProtoMessage()    {}
+func (*Image) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{2}
+}
+func (m *Image) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Image.Unmarshal(m, b)
+}
+func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
+}
+func (dst *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(dst, src)
+}
+func (m *Image) XXX_Size() int {
+	return xxx_messageInfo_Image.Size(m)
+}
+func (m *Image) XXX_DiscardUnknown() {
+	xxx_messageInfo_Image.DiscardUnknown(m)
 }
 
-func (m *Image) Reset()                    { *m = Image{} }
-func (m *Image) String() string            { return proto.CompactTextString(m) }
-func (*Image) ProtoMessage()               {}
-func (*Image) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_Image proto.InternalMessageInfo
 
 func (m *Image) GetContent() []byte {
 	if m != nil {
@@ -406,51 +482,73 @@ type FaceAnnotation struct {
 	// Note that one or more x and/or y coordinates may not be generated in the
 	// `BoundingPoly` (the polygon will be unbounded) if only a partial face
 	// appears in the image to be annotated.
-	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly" json:"bounding_poly,omitempty"`
+	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
 	// The `fd_bounding_poly` bounding polygon is tighter than the
 	// `boundingPoly`, and encloses only the skin part of the face. Typically, it
 	// is used to eliminate the face from any image analysis that detects the
 	// "amount of skin" visible in an image. It is not based on the
 	// landmarker results, only on the initial face detection, hence
 	// the <code>fd</code> (face detection) prefix.
-	FdBoundingPoly *BoundingPoly `protobuf:"bytes,2,opt,name=fd_bounding_poly,json=fdBoundingPoly" json:"fd_bounding_poly,omitempty"`
+	FdBoundingPoly *BoundingPoly `protobuf:"bytes,2,opt,name=fd_bounding_poly,json=fdBoundingPoly,proto3" json:"fd_bounding_poly,omitempty"`
 	// Detected face landmarks.
-	Landmarks []*FaceAnnotation_Landmark `protobuf:"bytes,3,rep,name=landmarks" json:"landmarks,omitempty"`
+	Landmarks []*FaceAnnotation_Landmark `protobuf:"bytes,3,rep,name=landmarks,proto3" json:"landmarks,omitempty"`
 	// Roll angle, which indicates the amount of clockwise/anti-clockwise rotation
 	// of the face relative to the image vertical about the axis perpendicular to
 	// the face. Range [-180,180].
-	RollAngle float32 `protobuf:"fixed32,4,opt,name=roll_angle,json=rollAngle" json:"roll_angle,omitempty"`
+	RollAngle float32 `protobuf:"fixed32,4,opt,name=roll_angle,json=rollAngle,proto3" json:"roll_angle,omitempty"`
 	// Yaw angle, which indicates the leftward/rightward angle that the face is
 	// pointing relative to the vertical plane perpendicular to the image. Range
 	// [-180,180].
-	PanAngle float32 `protobuf:"fixed32,5,opt,name=pan_angle,json=panAngle" json:"pan_angle,omitempty"`
+	PanAngle float32 `protobuf:"fixed32,5,opt,name=pan_angle,json=panAngle,proto3" json:"pan_angle,omitempty"`
 	// Pitch angle, which indicates the upwards/downwards angle that the face is
 	// pointing relative to the image's horizontal plane. Range [-180,180].
-	TiltAngle float32 `protobuf:"fixed32,6,opt,name=tilt_angle,json=tiltAngle" json:"tilt_angle,omitempty"`
+	TiltAngle float32 `protobuf:"fixed32,6,opt,name=tilt_angle,json=tiltAngle,proto3" json:"tilt_angle,omitempty"`
 	// Detection confidence. Range [0, 1].
-	DetectionConfidence float32 `protobuf:"fixed32,7,opt,name=detection_confidence,json=detectionConfidence" json:"detection_confidence,omitempty"`
+	DetectionConfidence float32 `protobuf:"fixed32,7,opt,name=detection_confidence,json=detectionConfidence,proto3" json:"detection_confidence,omitempty"`
 	// Face landmarking confidence. Range [0, 1].
-	LandmarkingConfidence float32 `protobuf:"fixed32,8,opt,name=landmarking_confidence,json=landmarkingConfidence" json:"landmarking_confidence,omitempty"`
+	LandmarkingConfidence float32 `protobuf:"fixed32,8,opt,name=landmarking_confidence,json=landmarkingConfidence,proto3" json:"landmarking_confidence,omitempty"`
 	// Joy likelihood.
-	JoyLikelihood Likelihood `protobuf:"varint,9,opt,name=joy_likelihood,json=joyLikelihood,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"joy_likelihood,omitempty"`
+	JoyLikelihood Likelihood `protobuf:"varint,9,opt,name=joy_likelihood,json=joyLikelihood,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"joy_likelihood,omitempty"`
 	// Sorrow likelihood.
-	SorrowLikelihood Likelihood `protobuf:"varint,10,opt,name=sorrow_likelihood,json=sorrowLikelihood,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"sorrow_likelihood,omitempty"`
+	SorrowLikelihood Likelihood `protobuf:"varint,10,opt,name=sorrow_likelihood,json=sorrowLikelihood,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"sorrow_likelihood,omitempty"`
 	// Anger likelihood.
-	AngerLikelihood Likelihood `protobuf:"varint,11,opt,name=anger_likelihood,json=angerLikelihood,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"anger_likelihood,omitempty"`
+	AngerLikelihood Likelihood `protobuf:"varint,11,opt,name=anger_likelihood,json=angerLikelihood,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"anger_likelihood,omitempty"`
 	// Surprise likelihood.
-	SurpriseLikelihood Likelihood `protobuf:"varint,12,opt,name=surprise_likelihood,json=surpriseLikelihood,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"surprise_likelihood,omitempty"`
+	SurpriseLikelihood Likelihood `protobuf:"varint,12,opt,name=surprise_likelihood,json=surpriseLikelihood,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"surprise_likelihood,omitempty"`
 	// Under-exposed likelihood.
-	UnderExposedLikelihood Likelihood `protobuf:"varint,13,opt,name=under_exposed_likelihood,json=underExposedLikelihood,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"under_exposed_likelihood,omitempty"`
+	UnderExposedLikelihood Likelihood `protobuf:"varint,13,opt,name=under_exposed_likelihood,json=underExposedLikelihood,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"under_exposed_likelihood,omitempty"`
 	// Blurred likelihood.
-	BlurredLikelihood Likelihood `protobuf:"varint,14,opt,name=blurred_likelihood,json=blurredLikelihood,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"blurred_likelihood,omitempty"`
+	BlurredLikelihood Likelihood `protobuf:"varint,14,opt,name=blurred_likelihood,json=blurredLikelihood,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"blurred_likelihood,omitempty"`
 	// Headwear likelihood.
-	HeadwearLikelihood Likelihood `protobuf:"varint,15,opt,name=headwear_likelihood,json=headwearLikelihood,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"headwear_likelihood,omitempty"`
+	HeadwearLikelihood   Likelihood `protobuf:"varint,15,opt,name=headwear_likelihood,json=headwearLikelihood,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"headwear_likelihood,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
+func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation) ProtoMessage()    {}
+func (*FaceAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{3}
+}
+func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
+}
+func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+}
+func (m *FaceAnnotation) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation.Size(m)
+}
+func (m *FaceAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation.DiscardUnknown(m)
 }
 
-func (m *FaceAnnotation) Reset()                    { *m = FaceAnnotation{} }
-func (m *FaceAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*FaceAnnotation) ProtoMessage()               {}
-func (*FaceAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_FaceAnnotation proto.InternalMessageInfo
 
 func (m *FaceAnnotation) GetBoundingPoly() *BoundingPoly {
 	if m != nil {
@@ -560,15 +658,37 @@ func (m *FaceAnnotation) GetHeadwearLikelihood() Likelihood {
 // A face-specific landmark (for example, a face feature).
 type FaceAnnotation_Landmark struct {
 	// Face landmark type.
-	Type FaceAnnotation_Landmark_Type `protobuf:"varint,3,opt,name=type,enum=google.cloud.vision.v1p1beta1.FaceAnnotation_Landmark_Type" json:"type,omitempty"`
+	Type FaceAnnotation_Landmark_Type `protobuf:"varint,3,opt,name=type,proto3,enum=google.cloud.vision.v1p1beta1.FaceAnnotation_Landmark_Type" json:"type,omitempty"`
 	// Face landmark position.
-	Position *Position `protobuf:"bytes,4,opt,name=position" json:"position,omitempty"`
+	Position             *Position `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark{} }
+func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation_Landmark) ProtoMessage()    {}
+func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{3, 0}
+}
+func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
+}
+func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+}
+func (m *FaceAnnotation_Landmark) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
+}
+func (m *FaceAnnotation_Landmark) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation_Landmark.DiscardUnknown(m)
 }
 
-func (m *FaceAnnotation_Landmark) Reset()                    { *m = FaceAnnotation_Landmark{} }
-func (m *FaceAnnotation_Landmark) String() string            { return proto.CompactTextString(m) }
-func (*FaceAnnotation_Landmark) ProtoMessage()               {}
-func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3, 0} }
+var xxx_messageInfo_FaceAnnotation_Landmark proto.InternalMessageInfo
 
 func (m *FaceAnnotation_Landmark) GetType() FaceAnnotation_Landmark_Type {
 	if m != nil {
@@ -587,15 +707,37 @@ func (m *FaceAnnotation_Landmark) GetPosition() *Position {
 // Detected entity location information.
 type LocationInfo struct {
 	// lat/long location coordinates.
-	LatLng *google_type1.LatLng `protobuf:"bytes,1,opt,name=lat_lng,json=latLng" json:"lat_lng,omitempty"`
+	LatLng               *latlng.LatLng `protobuf:"bytes,1,opt,name=lat_lng,json=latLng,proto3" json:"lat_lng,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
+func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
+func (*LocationInfo) ProtoMessage()    {}
+func (*LocationInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{4}
+}
+func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
+}
+func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
+}
+func (dst *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(dst, src)
+}
+func (m *LocationInfo) XXX_Size() int {
+	return xxx_messageInfo_LocationInfo.Size(m)
+}
+func (m *LocationInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocationInfo.DiscardUnknown(m)
 }
 
-func (m *LocationInfo) Reset()                    { *m = LocationInfo{} }
-func (m *LocationInfo) String() string            { return proto.CompactTextString(m) }
-func (*LocationInfo) ProtoMessage()               {}
-func (*LocationInfo) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_LocationInfo proto.InternalMessageInfo
 
-func (m *LocationInfo) GetLatLng() *google_type1.LatLng {
+func (m *LocationInfo) GetLatLng() *latlng.LatLng {
 	if m != nil {
 		return m.LatLng
 	}
@@ -605,17 +747,39 @@ func (m *LocationInfo) GetLatLng() *google_type1.LatLng {
 // A `Property` consists of a user-supplied name/value pair.
 type Property struct {
 	// Name of the property.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Value of the property.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Value of numeric properties.
-	Uint64Value uint64 `protobuf:"varint,3,opt,name=uint64_value,json=uint64Value" json:"uint64_value,omitempty"`
+	Uint64Value          uint64   `protobuf:"varint,3,opt,name=uint64_value,json=uint64Value,proto3" json:"uint64_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Property) Reset()         { *m = Property{} }
+func (m *Property) String() string { return proto.CompactTextString(m) }
+func (*Property) ProtoMessage()    {}
+func (*Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{5}
+}
+func (m *Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Property.Unmarshal(m, b)
+}
+func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
+}
+func (dst *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(dst, src)
+}
+func (m *Property) XXX_Size() int {
+	return xxx_messageInfo_Property.Size(m)
+}
+func (m *Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Property.DiscardUnknown(m)
 }
 
-func (m *Property) Reset()                    { *m = Property{} }
-func (m *Property) String() string            { return proto.CompactTextString(m) }
-func (*Property) ProtoMessage()               {}
-func (*Property) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_Property proto.InternalMessageInfo
 
 func (m *Property) GetName() string {
 	if m != nil {
@@ -642,43 +806,65 @@ func (m *Property) GetUint64Value() uint64 {
 type EntityAnnotation struct {
 	// Opaque entity ID. Some IDs may be available in
 	// [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/).
-	Mid string `protobuf:"bytes,1,opt,name=mid" json:"mid,omitempty"`
+	Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid,omitempty"`
 	// The language code for the locale in which the entity textual
 	// `description` is expressed.
-	Locale string `protobuf:"bytes,2,opt,name=locale" json:"locale,omitempty"`
+	Locale string `protobuf:"bytes,2,opt,name=locale,proto3" json:"locale,omitempty"`
 	// Entity textual description, expressed in its `locale` language.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Overall score of the result. Range [0, 1].
-	Score float32 `protobuf:"fixed32,4,opt,name=score" json:"score,omitempty"`
+	Score float32 `protobuf:"fixed32,4,opt,name=score,proto3" json:"score,omitempty"`
 	// The accuracy of the entity detection in an image.
 	// For example, for an image in which the "Eiffel Tower" entity is detected,
 	// this field represents the confidence that there is a tower in the query
 	// image. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
 	// The relevancy of the ICA (Image Content Annotation) label to the
 	// image. For example, the relevancy of "tower" is likely higher to an image
 	// containing the detected "Eiffel Tower" than to an image containing a
 	// detected distant towering building, even though the confidence that
 	// there is a tower in each image may be the same. Range [0, 1].
-	Topicality float32 `protobuf:"fixed32,6,opt,name=topicality" json:"topicality,omitempty"`
+	Topicality float32 `protobuf:"fixed32,6,opt,name=topicality,proto3" json:"topicality,omitempty"`
 	// Image region to which this entity belongs. Not produced
 	// for `LABEL_DETECTION` features.
-	BoundingPoly *BoundingPoly `protobuf:"bytes,7,opt,name=bounding_poly,json=boundingPoly" json:"bounding_poly,omitempty"`
+	BoundingPoly *BoundingPoly `protobuf:"bytes,7,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
 	// The location information for the detected entity. Multiple
 	// `LocationInfo` elements can be present because one location may
 	// indicate the location of the scene in the image, and another location
 	// may indicate the location of the place where the image was taken.
 	// Location information is usually present for landmarks.
-	Locations []*LocationInfo `protobuf:"bytes,8,rep,name=locations" json:"locations,omitempty"`
+	Locations []*LocationInfo `protobuf:"bytes,8,rep,name=locations,proto3" json:"locations,omitempty"`
 	// Some entities may have optional user-supplied `Property` (name/value)
 	// fields, such a score or string that qualifies the entity.
-	Properties []*Property `protobuf:"bytes,9,rep,name=properties" json:"properties,omitempty"`
+	Properties           []*Property `protobuf:"bytes,9,rep,name=properties,proto3" json:"properties,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
+func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
+func (*EntityAnnotation) ProtoMessage()    {}
+func (*EntityAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{6}
+}
+func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
+}
+func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+}
+func (m *EntityAnnotation) XXX_Size() int {
+	return xxx_messageInfo_EntityAnnotation.Size(m)
+}
+func (m *EntityAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityAnnotation.DiscardUnknown(m)
 }
 
-func (m *EntityAnnotation) Reset()                    { *m = EntityAnnotation{} }
-func (m *EntityAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*EntityAnnotation) ProtoMessage()               {}
-func (*EntityAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_EntityAnnotation proto.InternalMessageInfo
 
 func (m *EntityAnnotation) GetMid() string {
 	if m != nil {
@@ -750,26 +936,48 @@ type SafeSearchAnnotation struct {
 	// Represents the adult content likelihood for the image. Adult content may
 	// contain elements such as nudity, pornographic images or cartoons, or
 	// sexual activities.
-	Adult Likelihood `protobuf:"varint,1,opt,name=adult,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"adult,omitempty"`
+	Adult Likelihood `protobuf:"varint,1,opt,name=adult,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"adult,omitempty"`
 	// Spoof likelihood. The likelihood that an modification
 	// was made to the image's canonical version to make it appear
 	// funny or offensive.
-	Spoof Likelihood `protobuf:"varint,2,opt,name=spoof,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"spoof,omitempty"`
+	Spoof Likelihood `protobuf:"varint,2,opt,name=spoof,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"spoof,omitempty"`
 	// Likelihood that this is a medical image.
-	Medical Likelihood `protobuf:"varint,3,opt,name=medical,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"medical,omitempty"`
+	Medical Likelihood `protobuf:"varint,3,opt,name=medical,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"medical,omitempty"`
 	// Likelihood that this image contains violent content.
-	Violence Likelihood `protobuf:"varint,4,opt,name=violence,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"violence,omitempty"`
+	Violence Likelihood `protobuf:"varint,4,opt,name=violence,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"violence,omitempty"`
 	// Likelihood that the request image contains racy content. Racy content may
 	// include (but is not limited to) skimpy or sheer clothing, strategically
 	// covered nudity, lewd or provocative poses, or close-ups of sensitive
 	// body areas.
-	Racy Likelihood `protobuf:"varint,9,opt,name=racy,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"racy,omitempty"`
+	Racy                 Likelihood `protobuf:"varint,9,opt,name=racy,proto3,enum=google.cloud.vision.v1p1beta1.Likelihood" json:"racy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *SafeSearchAnnotation) Reset()                    { *m = SafeSearchAnnotation{} }
-func (m *SafeSearchAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*SafeSearchAnnotation) ProtoMessage()               {}
-func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
+func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
+func (*SafeSearchAnnotation) ProtoMessage()    {}
+func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{7}
+}
+func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
+}
+func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+}
+func (m *SafeSearchAnnotation) XXX_Size() int {
+	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
+}
+func (m *SafeSearchAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_SafeSearchAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SafeSearchAnnotation proto.InternalMessageInfo
 
 func (m *SafeSearchAnnotation) GetAdult() Likelihood {
 	if m != nil {
@@ -809,24 +1017,46 @@ func (m *SafeSearchAnnotation) GetRacy() Likelihood {
 // Rectangle determined by min and max `LatLng` pairs.
 type LatLongRect struct {
 	// Min lat/long pair.
-	MinLatLng *google_type1.LatLng `protobuf:"bytes,1,opt,name=min_lat_lng,json=minLatLng" json:"min_lat_lng,omitempty"`
+	MinLatLng *latlng.LatLng `protobuf:"bytes,1,opt,name=min_lat_lng,json=minLatLng,proto3" json:"min_lat_lng,omitempty"`
 	// Max lat/long pair.
-	MaxLatLng *google_type1.LatLng `protobuf:"bytes,2,opt,name=max_lat_lng,json=maxLatLng" json:"max_lat_lng,omitempty"`
+	MaxLatLng            *latlng.LatLng `protobuf:"bytes,2,opt,name=max_lat_lng,json=maxLatLng,proto3" json:"max_lat_lng,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
+func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
+func (*LatLongRect) ProtoMessage()    {}
+func (*LatLongRect) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{8}
+}
+func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
+}
+func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
+}
+func (dst *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(dst, src)
+}
+func (m *LatLongRect) XXX_Size() int {
+	return xxx_messageInfo_LatLongRect.Size(m)
+}
+func (m *LatLongRect) XXX_DiscardUnknown() {
+	xxx_messageInfo_LatLongRect.DiscardUnknown(m)
 }
 
-func (m *LatLongRect) Reset()                    { *m = LatLongRect{} }
-func (m *LatLongRect) String() string            { return proto.CompactTextString(m) }
-func (*LatLongRect) ProtoMessage()               {}
-func (*LatLongRect) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+var xxx_messageInfo_LatLongRect proto.InternalMessageInfo
 
-func (m *LatLongRect) GetMinLatLng() *google_type1.LatLng {
+func (m *LatLongRect) GetMinLatLng() *latlng.LatLng {
 	if m != nil {
 		return m.MinLatLng
 	}
 	return nil
 }
 
-func (m *LatLongRect) GetMaxLatLng() *google_type1.LatLng {
+func (m *LatLongRect) GetMaxLatLng() *latlng.LatLng {
 	if m != nil {
 		return m.MaxLatLng
 	}
@@ -837,20 +1067,42 @@ func (m *LatLongRect) GetMaxLatLng() *google_type1.LatLng {
 // the image that the color occupies in the image.
 type ColorInfo struct {
 	// RGB components of the color.
-	Color *google_type.Color `protobuf:"bytes,1,opt,name=color" json:"color,omitempty"`
+	Color *color.Color `protobuf:"bytes,1,opt,name=color,proto3" json:"color,omitempty"`
 	// Image-specific score for this color. Value in range [0, 1].
-	Score float32 `protobuf:"fixed32,2,opt,name=score" json:"score,omitempty"`
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
 	// The fraction of pixels the color occupies in the image.
 	// Value in range [0, 1].
-	PixelFraction float32 `protobuf:"fixed32,3,opt,name=pixel_fraction,json=pixelFraction" json:"pixel_fraction,omitempty"`
+	PixelFraction        float32  `protobuf:"fixed32,3,opt,name=pixel_fraction,json=pixelFraction,proto3" json:"pixel_fraction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
+func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
+func (*ColorInfo) ProtoMessage()    {}
+func (*ColorInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{9}
+}
+func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
+}
+func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
+}
+func (dst *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(dst, src)
+}
+func (m *ColorInfo) XXX_Size() int {
+	return xxx_messageInfo_ColorInfo.Size(m)
+}
+func (m *ColorInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColorInfo.DiscardUnknown(m)
 }
 
-func (m *ColorInfo) Reset()                    { *m = ColorInfo{} }
-func (m *ColorInfo) String() string            { return proto.CompactTextString(m) }
-func (*ColorInfo) ProtoMessage()               {}
-func (*ColorInfo) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_ColorInfo proto.InternalMessageInfo
 
-func (m *ColorInfo) GetColor() *google_type.Color {
+func (m *ColorInfo) GetColor() *color.Color {
 	if m != nil {
 		return m.Color
 	}
@@ -874,13 +1126,35 @@ func (m *ColorInfo) GetPixelFraction() float32 {
 // Set of dominant colors and their corresponding scores.
 type DominantColorsAnnotation struct {
 	// RGB color values with their score and pixel fraction.
-	Colors []*ColorInfo `protobuf:"bytes,1,rep,name=colors" json:"colors,omitempty"`
+	Colors               []*ColorInfo `protobuf:"bytes,1,rep,name=colors,proto3" json:"colors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotation{} }
+func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
+func (*DominantColorsAnnotation) ProtoMessage()    {}
+func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{10}
+}
+func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
+}
+func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+}
+func (m *DominantColorsAnnotation) XXX_Size() int {
+	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
+}
+func (m *DominantColorsAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_DominantColorsAnnotation.DiscardUnknown(m)
 }
 
-func (m *DominantColorsAnnotation) Reset()                    { *m = DominantColorsAnnotation{} }
-func (m *DominantColorsAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*DominantColorsAnnotation) ProtoMessage()               {}
-func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+var xxx_messageInfo_DominantColorsAnnotation proto.InternalMessageInfo
 
 func (m *DominantColorsAnnotation) GetColors() []*ColorInfo {
 	if m != nil {
@@ -892,13 +1166,35 @@ func (m *DominantColorsAnnotation) GetColors() []*ColorInfo {
 // Stores image properties, such as dominant colors.
 type ImageProperties struct {
 	// If present, dominant colors completed successfully.
-	DominantColors *DominantColorsAnnotation `protobuf:"bytes,1,opt,name=dominant_colors,json=dominantColors" json:"dominant_colors,omitempty"`
+	DominantColors       *DominantColorsAnnotation `protobuf:"bytes,1,opt,name=dominant_colors,json=dominantColors,proto3" json:"dominant_colors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
+func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
+func (*ImageProperties) ProtoMessage()    {}
+func (*ImageProperties) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{11}
+}
+func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
+}
+func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
+}
+func (dst *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(dst, src)
+}
+func (m *ImageProperties) XXX_Size() int {
+	return xxx_messageInfo_ImageProperties.Size(m)
+}
+func (m *ImageProperties) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageProperties.DiscardUnknown(m)
 }
 
-func (m *ImageProperties) Reset()                    { *m = ImageProperties{} }
-func (m *ImageProperties) String() string            { return proto.CompactTextString(m) }
-func (*ImageProperties) ProtoMessage()               {}
-func (*ImageProperties) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+var xxx_messageInfo_ImageProperties proto.InternalMessageInfo
 
 func (m *ImageProperties) GetDominantColors() *DominantColorsAnnotation {
 	if m != nil {
@@ -911,18 +1207,40 @@ func (m *ImageProperties) GetDominantColors() *DominantColorsAnnotation {
 type CropHint struct {
 	// The bounding polygon for the crop region. The coordinates of the bounding
 	// box are in the original image's scale, as returned in `ImageParams`.
-	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly" json:"bounding_poly,omitempty"`
+	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
 	// Confidence of this being a salient region.  Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
 	// Fraction of importance of this salient region with respect to the original
 	// image.
-	ImportanceFraction float32 `protobuf:"fixed32,3,opt,name=importance_fraction,json=importanceFraction" json:"importance_fraction,omitempty"`
+	ImportanceFraction   float32  `protobuf:"fixed32,3,opt,name=importance_fraction,json=importanceFraction,proto3" json:"importance_fraction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CropHint) Reset()         { *m = CropHint{} }
+func (m *CropHint) String() string { return proto.CompactTextString(m) }
+func (*CropHint) ProtoMessage()    {}
+func (*CropHint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{12}
+}
+func (m *CropHint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHint.Unmarshal(m, b)
+}
+func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
+}
+func (dst *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(dst, src)
+}
+func (m *CropHint) XXX_Size() int {
+	return xxx_messageInfo_CropHint.Size(m)
+}
+func (m *CropHint) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHint.DiscardUnknown(m)
 }
 
-func (m *CropHint) Reset()                    { *m = CropHint{} }
-func (m *CropHint) String() string            { return proto.CompactTextString(m) }
-func (*CropHint) ProtoMessage()               {}
-func (*CropHint) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+var xxx_messageInfo_CropHint proto.InternalMessageInfo
 
 func (m *CropHint) GetBoundingPoly() *BoundingPoly {
 	if m != nil {
@@ -948,13 +1266,35 @@ func (m *CropHint) GetImportanceFraction() float32 {
 // Set of crop hints that are used to generate new crops when serving images.
 type CropHintsAnnotation struct {
 	// Crop hint results.
-	CropHints []*CropHint `protobuf:"bytes,1,rep,name=crop_hints,json=cropHints" json:"crop_hints,omitempty"`
+	CropHints            []*CropHint `protobuf:"bytes,1,rep,name=crop_hints,json=cropHints,proto3" json:"crop_hints,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
+func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
+func (*CropHintsAnnotation) ProtoMessage()    {}
+func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{13}
+}
+func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
+}
+func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+}
+func (m *CropHintsAnnotation) XXX_Size() int {
+	return xxx_messageInfo_CropHintsAnnotation.Size(m)
+}
+func (m *CropHintsAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHintsAnnotation.DiscardUnknown(m)
 }
 
-func (m *CropHintsAnnotation) Reset()                    { *m = CropHintsAnnotation{} }
-func (m *CropHintsAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*CropHintsAnnotation) ProtoMessage()               {}
-func (*CropHintsAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+var xxx_messageInfo_CropHintsAnnotation proto.InternalMessageInfo
 
 func (m *CropHintsAnnotation) GetCropHints() []*CropHint {
 	if m != nil {
@@ -971,13 +1311,35 @@ type CropHintsParams struct {
 	// best possible crop is returned. The number of provided aspect ratios is
 	// limited to a maximum of 16; any aspect ratios provided after the 16th are
 	// ignored.
-	AspectRatios []float32 `protobuf:"fixed32,1,rep,packed,name=aspect_ratios,json=aspectRatios" json:"aspect_ratios,omitempty"`
+	AspectRatios         []float32 `protobuf:"fixed32,1,rep,packed,name=aspect_ratios,json=aspectRatios,proto3" json:"aspect_ratios,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
+func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
+func (*CropHintsParams) ProtoMessage()    {}
+func (*CropHintsParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{14}
+}
+func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
+}
+func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
+}
+func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+}
+func (m *CropHintsParams) XXX_Size() int {
+	return xxx_messageInfo_CropHintsParams.Size(m)
+}
+func (m *CropHintsParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHintsParams.DiscardUnknown(m)
 }
 
-func (m *CropHintsParams) Reset()                    { *m = CropHintsParams{} }
-func (m *CropHintsParams) String() string            { return proto.CompactTextString(m) }
-func (*CropHintsParams) ProtoMessage()               {}
-func (*CropHintsParams) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+var xxx_messageInfo_CropHintsParams proto.InternalMessageInfo
 
 func (m *CropHintsParams) GetAspectRatios() []float32 {
 	if m != nil {
@@ -989,13 +1351,35 @@ func (m *CropHintsParams) GetAspectRatios() []float32 {
 // Parameters for web detection request.
 type WebDetectionParams struct {
 	// Whether to include results derived from the geo information in the image.
-	IncludeGeoResults bool `protobuf:"varint,2,opt,name=include_geo_results,json=includeGeoResults" json:"include_geo_results,omitempty"`
+	IncludeGeoResults    bool     `protobuf:"varint,2,opt,name=include_geo_results,json=includeGeoResults,proto3" json:"include_geo_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
+func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
+func (*WebDetectionParams) ProtoMessage()    {}
+func (*WebDetectionParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{15}
+}
+func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
+}
+func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
+}
+func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+}
+func (m *WebDetectionParams) XXX_Size() int {
+	return xxx_messageInfo_WebDetectionParams.Size(m)
+}
+func (m *WebDetectionParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetectionParams.DiscardUnknown(m)
 }
 
-func (m *WebDetectionParams) Reset()                    { *m = WebDetectionParams{} }
-func (m *WebDetectionParams) String() string            { return proto.CompactTextString(m) }
-func (*WebDetectionParams) ProtoMessage()               {}
-func (*WebDetectionParams) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+var xxx_messageInfo_WebDetectionParams proto.InternalMessageInfo
 
 func (m *WebDetectionParams) GetIncludeGeoResults() bool {
 	if m != nil {
@@ -1007,7 +1391,7 @@ func (m *WebDetectionParams) GetIncludeGeoResults() bool {
 // Image context and/or feature-specific parameters.
 type ImageContext struct {
 	// lat/long rectangle that specifies the location of the image.
-	LatLongRect *LatLongRect `protobuf:"bytes,1,opt,name=lat_long_rect,json=latLongRect" json:"lat_long_rect,omitempty"`
+	LatLongRect *LatLongRect `protobuf:"bytes,1,opt,name=lat_long_rect,json=latLongRect,proto3" json:"lat_long_rect,omitempty"`
 	// List of languages to use for TEXT_DETECTION. In most cases, an empty value
 	// yields the best results since it enables automatic language detection. For
 	// languages based on the Latin alphabet, setting `language_hints` is not
@@ -1016,17 +1400,39 @@ type ImageContext struct {
 	// significant hindrance if the hint is wrong). Text detection returns an
 	// error if one or more of the specified languages is not one of the
 	// [supported languages](/vision/docs/languages).
-	LanguageHints []string `protobuf:"bytes,2,rep,name=language_hints,json=languageHints" json:"language_hints,omitempty"`
+	LanguageHints []string `protobuf:"bytes,2,rep,name=language_hints,json=languageHints,proto3" json:"language_hints,omitempty"`
 	// Parameters for crop hints annotation request.
-	CropHintsParams *CropHintsParams `protobuf:"bytes,4,opt,name=crop_hints_params,json=cropHintsParams" json:"crop_hints_params,omitempty"`
+	CropHintsParams *CropHintsParams `protobuf:"bytes,4,opt,name=crop_hints_params,json=cropHintsParams,proto3" json:"crop_hints_params,omitempty"`
 	// Parameters for web detection.
-	WebDetectionParams *WebDetectionParams `protobuf:"bytes,6,opt,name=web_detection_params,json=webDetectionParams" json:"web_detection_params,omitempty"`
+	WebDetectionParams   *WebDetectionParams `protobuf:"bytes,6,opt,name=web_detection_params,json=webDetectionParams,proto3" json:"web_detection_params,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *ImageContext) Reset()         { *m = ImageContext{} }
+func (m *ImageContext) String() string { return proto.CompactTextString(m) }
+func (*ImageContext) ProtoMessage()    {}
+func (*ImageContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{16}
+}
+func (m *ImageContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
+}
+func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
+}
+func (dst *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(dst, src)
+}
+func (m *ImageContext) XXX_Size() int {
+	return xxx_messageInfo_ImageContext.Size(m)
+}
+func (m *ImageContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageContext.DiscardUnknown(m)
 }
 
-func (m *ImageContext) Reset()                    { *m = ImageContext{} }
-func (m *ImageContext) String() string            { return proto.CompactTextString(m) }
-func (*ImageContext) ProtoMessage()               {}
-func (*ImageContext) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+var xxx_messageInfo_ImageContext proto.InternalMessageInfo
 
 func (m *ImageContext) GetLatLongRect() *LatLongRect {
 	if m != nil {
@@ -1060,17 +1466,39 @@ func (m *ImageContext) GetWebDetectionParams() *WebDetectionParams {
 // image, with user-requested features.
 type AnnotateImageRequest struct {
 	// The image to be processed.
-	Image *Image `protobuf:"bytes,1,opt,name=image" json:"image,omitempty"`
+	Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
 	// Requested features.
-	Features []*Feature `protobuf:"bytes,2,rep,name=features" json:"features,omitempty"`
+	Features []*Feature `protobuf:"bytes,2,rep,name=features,proto3" json:"features,omitempty"`
 	// Additional context that may accompany the image.
-	ImageContext *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext" json:"image_context,omitempty"`
+	ImageContext         *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext,proto3" json:"image_context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *AnnotateImageRequest) Reset()                    { *m = AnnotateImageRequest{} }
-func (m *AnnotateImageRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateImageRequest) ProtoMessage()               {}
-func (*AnnotateImageRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
+func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateImageRequest) ProtoMessage()    {}
+func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{17}
+}
+func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
+}
+func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+}
+func (m *AnnotateImageRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateImageRequest.Size(m)
+}
+func (m *AnnotateImageRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateImageRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateImageRequest proto.InternalMessageInfo
 
 func (m *AnnotateImageRequest) GetImage() *Image {
 	if m != nil {
@@ -1096,38 +1524,60 @@ func (m *AnnotateImageRequest) GetImageContext() *ImageContext {
 // Response to an image annotation request.
 type AnnotateImageResponse struct {
 	// If present, face detection has completed successfully.
-	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,1,rep,name=face_annotations,json=faceAnnotations" json:"face_annotations,omitempty"`
+	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,1,rep,name=face_annotations,json=faceAnnotations,proto3" json:"face_annotations,omitempty"`
 	// If present, landmark detection has completed successfully.
-	LandmarkAnnotations []*EntityAnnotation `protobuf:"bytes,2,rep,name=landmark_annotations,json=landmarkAnnotations" json:"landmark_annotations,omitempty"`
+	LandmarkAnnotations []*EntityAnnotation `protobuf:"bytes,2,rep,name=landmark_annotations,json=landmarkAnnotations,proto3" json:"landmark_annotations,omitempty"`
 	// If present, logo detection has completed successfully.
-	LogoAnnotations []*EntityAnnotation `protobuf:"bytes,3,rep,name=logo_annotations,json=logoAnnotations" json:"logo_annotations,omitempty"`
+	LogoAnnotations []*EntityAnnotation `protobuf:"bytes,3,rep,name=logo_annotations,json=logoAnnotations,proto3" json:"logo_annotations,omitempty"`
 	// If present, label detection has completed successfully.
-	LabelAnnotations []*EntityAnnotation `protobuf:"bytes,4,rep,name=label_annotations,json=labelAnnotations" json:"label_annotations,omitempty"`
+	LabelAnnotations []*EntityAnnotation `protobuf:"bytes,4,rep,name=label_annotations,json=labelAnnotations,proto3" json:"label_annotations,omitempty"`
 	// If present, text (OCR) detection has completed successfully.
-	TextAnnotations []*EntityAnnotation `protobuf:"bytes,5,rep,name=text_annotations,json=textAnnotations" json:"text_annotations,omitempty"`
+	TextAnnotations []*EntityAnnotation `protobuf:"bytes,5,rep,name=text_annotations,json=textAnnotations,proto3" json:"text_annotations,omitempty"`
 	// If present, text (OCR) detection or document (OCR) text detection has
 	// completed successfully.
 	// This annotation provides the structural hierarchy for the OCR detected
 	// text.
-	FullTextAnnotation *TextAnnotation `protobuf:"bytes,12,opt,name=full_text_annotation,json=fullTextAnnotation" json:"full_text_annotation,omitempty"`
+	FullTextAnnotation *TextAnnotation `protobuf:"bytes,12,opt,name=full_text_annotation,json=fullTextAnnotation,proto3" json:"full_text_annotation,omitempty"`
 	// If present, safe-search annotation has completed successfully.
-	SafeSearchAnnotation *SafeSearchAnnotation `protobuf:"bytes,6,opt,name=safe_search_annotation,json=safeSearchAnnotation" json:"safe_search_annotation,omitempty"`
+	SafeSearchAnnotation *SafeSearchAnnotation `protobuf:"bytes,6,opt,name=safe_search_annotation,json=safeSearchAnnotation,proto3" json:"safe_search_annotation,omitempty"`
 	// If present, image properties were extracted successfully.
-	ImagePropertiesAnnotation *ImageProperties `protobuf:"bytes,8,opt,name=image_properties_annotation,json=imagePropertiesAnnotation" json:"image_properties_annotation,omitempty"`
+	ImagePropertiesAnnotation *ImageProperties `protobuf:"bytes,8,opt,name=image_properties_annotation,json=imagePropertiesAnnotation,proto3" json:"image_properties_annotation,omitempty"`
 	// If present, crop hints have completed successfully.
-	CropHintsAnnotation *CropHintsAnnotation `protobuf:"bytes,11,opt,name=crop_hints_annotation,json=cropHintsAnnotation" json:"crop_hints_annotation,omitempty"`
+	CropHintsAnnotation *CropHintsAnnotation `protobuf:"bytes,11,opt,name=crop_hints_annotation,json=cropHintsAnnotation,proto3" json:"crop_hints_annotation,omitempty"`
 	// If present, web detection has completed successfully.
-	WebDetection *WebDetection `protobuf:"bytes,13,opt,name=web_detection,json=webDetection" json:"web_detection,omitempty"`
+	WebDetection *WebDetection `protobuf:"bytes,13,opt,name=web_detection,json=webDetection,proto3" json:"web_detection,omitempty"`
 	// If set, represents the error message for the operation.
 	// Note that filled-in image annotations are guaranteed to be
 	// correct, even when `error` is set.
-	Error *google_rpc.Status `protobuf:"bytes,9,opt,name=error" json:"error,omitempty"`
+	Error                *status.Status `protobuf:"bytes,9,opt,name=error,proto3" json:"error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
+func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateImageResponse) ProtoMessage()    {}
+func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{18}
+}
+func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
+}
+func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+}
+func (m *AnnotateImageResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateImageResponse.Size(m)
+}
+func (m *AnnotateImageResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateImageResponse.DiscardUnknown(m)
 }
 
-func (m *AnnotateImageResponse) Reset()                    { *m = AnnotateImageResponse{} }
-func (m *AnnotateImageResponse) String() string            { return proto.CompactTextString(m) }
-func (*AnnotateImageResponse) ProtoMessage()               {}
-func (*AnnotateImageResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{18} }
+var xxx_messageInfo_AnnotateImageResponse proto.InternalMessageInfo
 
 func (m *AnnotateImageResponse) GetFaceAnnotations() []*FaceAnnotation {
 	if m != nil {
@@ -1199,7 +1649,7 @@ func (m *AnnotateImageResponse) GetWebDetection() *WebDetection {
 	return nil
 }
 
-func (m *AnnotateImageResponse) GetError() *google_rpc.Status {
+func (m *AnnotateImageResponse) GetError() *status.Status {
 	if m != nil {
 		return m.Error
 	}
@@ -1209,13 +1659,35 @@ func (m *AnnotateImageResponse) GetError() *google_rpc.Status {
 // Multiple image annotation requests are batched into a single service call.
 type BatchAnnotateImagesRequest struct {
 	// Individual image annotation requests for this batch.
-	Requests []*AnnotateImageRequest `protobuf:"bytes,1,rep,name=requests" json:"requests,omitempty"`
+	Requests             []*AnnotateImageRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesRequest{} }
+func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
+func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{19}
+}
+func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
+}
+func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+}
+func (m *BatchAnnotateImagesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
+}
+func (m *BatchAnnotateImagesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchAnnotateImagesRequest.DiscardUnknown(m)
 }
 
-func (m *BatchAnnotateImagesRequest) Reset()                    { *m = BatchAnnotateImagesRequest{} }
-func (m *BatchAnnotateImagesRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchAnnotateImagesRequest) ProtoMessage()               {}
-func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{19} }
+var xxx_messageInfo_BatchAnnotateImagesRequest proto.InternalMessageInfo
 
 func (m *BatchAnnotateImagesRequest) GetRequests() []*AnnotateImageRequest {
 	if m != nil {
@@ -1227,13 +1699,35 @@ func (m *BatchAnnotateImagesRequest) GetRequests() []*AnnotateImageRequest {
 // Response to a batch image annotation request.
 type BatchAnnotateImagesResponse struct {
 	// Individual responses to image annotation requests within the batch.
-	Responses []*AnnotateImageResponse `protobuf:"bytes,1,rep,name=responses" json:"responses,omitempty"`
+	Responses            []*AnnotateImageResponse `protobuf:"bytes,1,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImagesResponse{} }
+func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
+func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_5dd1ea17d879c524, []int{20}
+}
+func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
+}
+func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+}
+func (m *BatchAnnotateImagesResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
+}
+func (m *BatchAnnotateImagesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchAnnotateImagesResponse.DiscardUnknown(m)
 }
 
-func (m *BatchAnnotateImagesResponse) Reset()                    { *m = BatchAnnotateImagesResponse{} }
-func (m *BatchAnnotateImagesResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchAnnotateImagesResponse) ProtoMessage()               {}
-func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{20} }
+var xxx_messageInfo_BatchAnnotateImagesResponse proto.InternalMessageInfo
 
 func (m *BatchAnnotateImagesResponse) GetResponses() []*AnnotateImageResponse {
 	if m != nil {
@@ -1278,8 +1772,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ImageAnnotator service
-
+// ImageAnnotatorClient is the client API for ImageAnnotator service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ImageAnnotatorClient interface {
 	// Run image detection and annotation for a batch of images.
 	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
@@ -1295,15 +1790,14 @@ func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
 
 func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
 	out := new(BatchAnnotateImagesResponse)
-	err := grpc.Invoke(ctx, "/google.cloud.vision.v1p1beta1.ImageAnnotator/BatchAnnotateImages", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p1beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ImageAnnotator service
-
+// ImageAnnotatorServer is the server API for ImageAnnotator service.
 type ImageAnnotatorServer interface {
 	// Run image detection and annotation for a batch of images.
 	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
@@ -1345,10 +1839,10 @@ var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p1beta1/image_annotator.proto", fileDescriptor1)
+	proto.RegisterFile("google/cloud/vision/v1p1beta1/image_annotator.proto", fileDescriptor_image_annotator_5dd1ea17d879c524)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_image_annotator_5dd1ea17d879c524 = []byte{
 	// 2392 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x72, 0xe3, 0xc6,
 	0xf1, 0x37, 0xa9, 0x2f, 0xb2, 0x49, 0x91, 0xd0, 0x48, 0x2b, 0x73, 0xb5, 0xbb, 0x5e, 0x19, 0xff,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
index 6143b452..9b6d0ab3 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/text_annotation.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/text_annotation.proto
 
-package vision
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Enum to denote the type of break found. New line, space etc.
 type TextAnnotation_DetectedBreak_BreakType int32
 
@@ -53,7 +59,7 @@ func (x TextAnnotation_DetectedBreak_BreakType) String() string {
 	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
 }
 func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 1, 0}
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{0, 1, 0}
 }
 
 // Type of a block (text, image etc) as identified by OCR.
@@ -94,7 +100,9 @@ var Block_BlockType_value = map[string]int32{
 func (x Block_BlockType) String() string {
 	return proto.EnumName(Block_BlockType_name, int32(x))
 }
-func (Block_BlockType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{2, 0} }
+func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{2, 0}
+}
 
 // TextAnnotation contains a structured representation of OCR extracted text.
 // The hierarchy of an OCR extracted text structure is like this:
@@ -106,15 +114,37 @@ func (Block_BlockType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2
 // message definition below for more detail.
 type TextAnnotation struct {
 	// List of pages detected by OCR.
-	Pages []*Page `protobuf:"bytes,1,rep,name=pages" json:"pages,omitempty"`
+	Pages []*Page `protobuf:"bytes,1,rep,name=pages,proto3" json:"pages,omitempty"`
 	// UTF-8 text detected on the pages.
-	Text string `protobuf:"bytes,2,opt,name=text" json:"text,omitempty"`
+	Text                 string   `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
+func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation) ProtoMessage()    {}
+func (*TextAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{0}
+}
+func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
+}
+func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+}
+func (m *TextAnnotation) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation.Size(m)
+}
+func (m *TextAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation.DiscardUnknown(m)
 }
 
-func (m *TextAnnotation) Reset()                    { *m = TextAnnotation{} }
-func (m *TextAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*TextAnnotation) ProtoMessage()               {}
-func (*TextAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_TextAnnotation proto.InternalMessageInfo
 
 func (m *TextAnnotation) GetPages() []*Page {
 	if m != nil {
@@ -135,18 +165,38 @@ type TextAnnotation_DetectedLanguage struct {
 	// The BCP-47 language code, such as "en-US" or "sr-Latn". For more
 	// information, see
 	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
-	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Confidence of detected language. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_DetectedLanguage{} }
 func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
 func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
 func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 0}
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{0, 0}
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_TextAnnotation_DetectedLanguage proto.InternalMessageInfo
+
 func (m *TextAnnotation_DetectedLanguage) GetLanguageCode() string {
 	if m != nil {
 		return m.LanguageCode
@@ -164,15 +214,37 @@ func (m *TextAnnotation_DetectedLanguage) GetConfidence() float32 {
 // Detected start or end of a structural component.
 type TextAnnotation_DetectedBreak struct {
 	// Detected break type.
-	Type TextAnnotation_DetectedBreak_BreakType `protobuf:"varint,1,opt,name=type,enum=google.cloud.vision.v1p1beta1.TextAnnotation_DetectedBreak_BreakType" json:"type,omitempty"`
+	Type TextAnnotation_DetectedBreak_BreakType `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.vision.v1p1beta1.TextAnnotation_DetectedBreak_BreakType" json:"type,omitempty"`
 	// True if break prepends the element.
-	IsPrefix bool `protobuf:"varint,2,opt,name=is_prefix,json=isPrefix" json:"is_prefix,omitempty"`
+	IsPrefix             bool     `protobuf:"varint,2,opt,name=is_prefix,json=isPrefix,proto3" json:"is_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_DetectedBreak{} }
+func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
+func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{0, 1}
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.DiscardUnknown(m)
 }
 
-func (m *TextAnnotation_DetectedBreak) Reset()                    { *m = TextAnnotation_DetectedBreak{} }
-func (m *TextAnnotation_DetectedBreak) String() string            { return proto.CompactTextString(m) }
-func (*TextAnnotation_DetectedBreak) ProtoMessage()               {}
-func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 1} }
+var xxx_messageInfo_TextAnnotation_DetectedBreak proto.InternalMessageInfo
 
 func (m *TextAnnotation_DetectedBreak) GetType() TextAnnotation_DetectedBreak_BreakType {
 	if m != nil {
@@ -191,15 +263,37 @@ func (m *TextAnnotation_DetectedBreak) GetIsPrefix() bool {
 // Additional information detected on the structural component.
 type TextAnnotation_TextProperty struct {
 	// A list of detected languages together with confidence.
-	DetectedLanguages []*TextAnnotation_DetectedLanguage `protobuf:"bytes,1,rep,name=detected_languages,json=detectedLanguages" json:"detected_languages,omitempty"`
+	DetectedLanguages []*TextAnnotation_DetectedLanguage `protobuf:"bytes,1,rep,name=detected_languages,json=detectedLanguages,proto3" json:"detected_languages,omitempty"`
 	// Detected start or end of a text segment.
-	DetectedBreak *TextAnnotation_DetectedBreak `protobuf:"bytes,2,opt,name=detected_break,json=detectedBreak" json:"detected_break,omitempty"`
+	DetectedBreak        *TextAnnotation_DetectedBreak `protobuf:"bytes,2,opt,name=detected_break,json=detectedBreak,proto3" json:"detected_break,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_TextProperty{} }
+func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_TextProperty) ProtoMessage()    {}
+func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{0, 2}
+}
+func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
+}
+func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+}
+func (m *TextAnnotation_TextProperty) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
+}
+func (m *TextAnnotation_TextProperty) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_TextProperty.DiscardUnknown(m)
 }
 
-func (m *TextAnnotation_TextProperty) Reset()                    { *m = TextAnnotation_TextProperty{} }
-func (m *TextAnnotation_TextProperty) String() string            { return proto.CompactTextString(m) }
-func (*TextAnnotation_TextProperty) ProtoMessage()               {}
-func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 2} }
+var xxx_messageInfo_TextAnnotation_TextProperty proto.InternalMessageInfo
 
 func (m *TextAnnotation_TextProperty) GetDetectedLanguages() []*TextAnnotation_DetectedLanguage {
 	if m != nil {
@@ -218,21 +312,43 @@ func (m *TextAnnotation_TextProperty) GetDetectedBreak() *TextAnnotation_Detecte
 // Detected page from OCR.
 type Page struct {
 	// Additional information detected on the page.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// Page width in pixels.
-	Width int32 `protobuf:"varint,2,opt,name=width" json:"width,omitempty"`
+	Width int32 `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"`
 	// Page height in pixels.
-	Height int32 `protobuf:"varint,3,opt,name=height" json:"height,omitempty"`
+	Height int32 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
 	// List of blocks of text, images etc on this page.
-	Blocks []*Block `protobuf:"bytes,4,rep,name=blocks" json:"blocks,omitempty"`
+	Blocks []*Block `protobuf:"bytes,4,rep,name=blocks,proto3" json:"blocks,omitempty"`
 	// Confidence of the OCR results on the page. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Page) Reset()         { *m = Page{} }
+func (m *Page) String() string { return proto.CompactTextString(m) }
+func (*Page) ProtoMessage()    {}
+func (*Page) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{1}
+}
+func (m *Page) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Page.Unmarshal(m, b)
+}
+func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
+}
+func (dst *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(dst, src)
+}
+func (m *Page) XXX_Size() int {
+	return xxx_messageInfo_Page.Size(m)
+}
+func (m *Page) XXX_DiscardUnknown() {
+	xxx_messageInfo_Page.DiscardUnknown(m)
 }
 
-func (m *Page) Reset()                    { *m = Page{} }
-func (m *Page) String() string            { return proto.CompactTextString(m) }
-func (*Page) ProtoMessage()               {}
-func (*Page) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_Page proto.InternalMessageInfo
 
 func (m *Page) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -272,7 +388,7 @@ func (m *Page) GetConfidence() float32 {
 // Logical element on the page.
 type Block struct {
 	// Additional information detected for the block.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The bounding box for the block.
 	// The vertices are in the order of top-left, top-right, bottom-right,
 	// bottom-left. When a rotation of the bounding box is detected the rotation
@@ -288,19 +404,41 @@ type Block struct {
 	//      |    |
 	//      1----0
 	//   and the vertice order will still be (0, 1, 2, 3).
-	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// List of paragraphs in this block (if this blocks is of type text).
-	Paragraphs []*Paragraph `protobuf:"bytes,3,rep,name=paragraphs" json:"paragraphs,omitempty"`
+	Paragraphs []*Paragraph `protobuf:"bytes,3,rep,name=paragraphs,proto3" json:"paragraphs,omitempty"`
 	// Detected block type (text, image etc) for this block.
-	BlockType Block_BlockType `protobuf:"varint,4,opt,name=block_type,json=blockType,enum=google.cloud.vision.v1p1beta1.Block_BlockType" json:"block_type,omitempty"`
+	BlockType Block_BlockType `protobuf:"varint,4,opt,name=block_type,json=blockType,proto3,enum=google.cloud.vision.v1p1beta1.Block_BlockType" json:"block_type,omitempty"`
 	// Confidence of the OCR results on the block. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Block) Reset()         { *m = Block{} }
+func (m *Block) String() string { return proto.CompactTextString(m) }
+func (*Block) ProtoMessage()    {}
+func (*Block) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{2}
+}
+func (m *Block) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Block.Unmarshal(m, b)
+}
+func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
+}
+func (dst *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(dst, src)
+}
+func (m *Block) XXX_Size() int {
+	return xxx_messageInfo_Block.Size(m)
+}
+func (m *Block) XXX_DiscardUnknown() {
+	xxx_messageInfo_Block.DiscardUnknown(m)
 }
 
-func (m *Block) Reset()                    { *m = Block{} }
-func (m *Block) String() string            { return proto.CompactTextString(m) }
-func (*Block) ProtoMessage()               {}
-func (*Block) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_Block proto.InternalMessageInfo
 
 func (m *Block) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -340,7 +478,7 @@ func (m *Block) GetConfidence() float32 {
 // Structural unit of text representing a number of words in certain order.
 type Paragraph struct {
 	// Additional information detected for the paragraph.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The bounding box for the paragraph.
 	// The vertices are in the order of top-left, top-right, bottom-right,
 	// bottom-left. When a rotation of the bounding box is detected the rotation
@@ -356,17 +494,39 @@ type Paragraph struct {
 	//      |    |
 	//      1----0
 	//   and the vertice order will still be (0, 1, 2, 3).
-	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// List of words in this paragraph.
-	Words []*Word `protobuf:"bytes,3,rep,name=words" json:"words,omitempty"`
+	Words []*Word `protobuf:"bytes,3,rep,name=words,proto3" json:"words,omitempty"`
 	// Confidence of the OCR results for the paragraph. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,4,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Paragraph) Reset()         { *m = Paragraph{} }
+func (m *Paragraph) String() string { return proto.CompactTextString(m) }
+func (*Paragraph) ProtoMessage()    {}
+func (*Paragraph) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{3}
+}
+func (m *Paragraph) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
+}
+func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
+}
+func (dst *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(dst, src)
+}
+func (m *Paragraph) XXX_Size() int {
+	return xxx_messageInfo_Paragraph.Size(m)
+}
+func (m *Paragraph) XXX_DiscardUnknown() {
+	xxx_messageInfo_Paragraph.DiscardUnknown(m)
 }
 
-func (m *Paragraph) Reset()                    { *m = Paragraph{} }
-func (m *Paragraph) String() string            { return proto.CompactTextString(m) }
-func (*Paragraph) ProtoMessage()               {}
-func (*Paragraph) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_Paragraph proto.InternalMessageInfo
 
 func (m *Paragraph) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -399,7 +559,7 @@ func (m *Paragraph) GetConfidence() float32 {
 // A word representation.
 type Word struct {
 	// Additional information detected for the word.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The bounding box for the word.
 	// The vertices are in the order of top-left, top-right, bottom-right,
 	// bottom-left. When a rotation of the bounding box is detected the rotation
@@ -415,18 +575,40 @@ type Word struct {
 	//      |    |
 	//      1----0
 	//   and the vertice order will still be (0, 1, 2, 3).
-	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// List of symbols in the word.
 	// The order of the symbols follows the natural reading order.
-	Symbols []*Symbol `protobuf:"bytes,3,rep,name=symbols" json:"symbols,omitempty"`
+	Symbols []*Symbol `protobuf:"bytes,3,rep,name=symbols,proto3" json:"symbols,omitempty"`
 	// Confidence of the OCR results for the word. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,4,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Word) Reset()         { *m = Word{} }
+func (m *Word) String() string { return proto.CompactTextString(m) }
+func (*Word) ProtoMessage()    {}
+func (*Word) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{4}
+}
+func (m *Word) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Word.Unmarshal(m, b)
+}
+func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
+}
+func (dst *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(dst, src)
+}
+func (m *Word) XXX_Size() int {
+	return xxx_messageInfo_Word.Size(m)
+}
+func (m *Word) XXX_DiscardUnknown() {
+	xxx_messageInfo_Word.DiscardUnknown(m)
 }
 
-func (m *Word) Reset()                    { *m = Word{} }
-func (m *Word) String() string            { return proto.CompactTextString(m) }
-func (*Word) ProtoMessage()               {}
-func (*Word) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_Word proto.InternalMessageInfo
 
 func (m *Word) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -459,7 +641,7 @@ func (m *Word) GetConfidence() float32 {
 // A single symbol representation.
 type Symbol struct {
 	// Additional information detected for the symbol.
-	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The bounding box for the symbol.
 	// The vertices are in the order of top-left, top-right, bottom-right,
 	// bottom-left. When a rotation of the bounding box is detected the rotation
@@ -475,17 +657,39 @@ type Symbol struct {
 	//      |    |
 	//      1----0
 	//   and the vertice order will still be (0, 1, 2, 3).
-	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox" json:"bounding_box,omitempty"`
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
 	// The actual UTF-8 representation of the symbol.
-	Text string `protobuf:"bytes,3,opt,name=text" json:"text,omitempty"`
+	Text string `protobuf:"bytes,3,opt,name=text,proto3" json:"text,omitempty"`
 	// Confidence of the OCR results for the symbol. Range [0, 1].
-	Confidence float32 `protobuf:"fixed32,4,opt,name=confidence" json:"confidence,omitempty"`
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Symbol) Reset()         { *m = Symbol{} }
+func (m *Symbol) String() string { return proto.CompactTextString(m) }
+func (*Symbol) ProtoMessage()    {}
+func (*Symbol) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_0320745aa391b099, []int{5}
+}
+func (m *Symbol) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Symbol.Unmarshal(m, b)
+}
+func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
+}
+func (dst *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(dst, src)
+}
+func (m *Symbol) XXX_Size() int {
+	return xxx_messageInfo_Symbol.Size(m)
+}
+func (m *Symbol) XXX_DiscardUnknown() {
+	xxx_messageInfo_Symbol.DiscardUnknown(m)
 }
 
-func (m *Symbol) Reset()                    { *m = Symbol{} }
-func (m *Symbol) String() string            { return proto.CompactTextString(m) }
-func (*Symbol) ProtoMessage()               {}
-func (*Symbol) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_Symbol proto.InternalMessageInfo
 
 func (m *Symbol) GetProperty() *TextAnnotation_TextProperty {
 	if m != nil {
@@ -530,10 +734,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/cloud/vision/v1p1beta1/text_annotation.proto", fileDescriptor2)
+	proto.RegisterFile("google/cloud/vision/v1p1beta1/text_annotation.proto", fileDescriptor_text_annotation_0320745aa391b099)
 }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_text_annotation_0320745aa391b099 = []byte{
 	// 775 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xd3, 0x48,
 	0x14, 0x5f, 0x27, 0x76, 0x1a, 0xbf, 0xb4, 0x91, 0x77, 0x76, 0xb5, 0x8a, 0xb2, 0xbb, 0xa8, 0xa4,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
index a66a4859..f9ef2081 100644
--- a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1/web_detection.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/cloud/vision/v1p1beta1/web_detection.proto
 
-package vision
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,29 +13,57 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Relevant information for the image from the Internet.
 type WebDetection struct {
 	// Deduced entities from similar images on the Internet.
-	WebEntities []*WebDetection_WebEntity `protobuf:"bytes,1,rep,name=web_entities,json=webEntities" json:"web_entities,omitempty"`
+	WebEntities []*WebDetection_WebEntity `protobuf:"bytes,1,rep,name=web_entities,json=webEntities,proto3" json:"web_entities,omitempty"`
 	// Fully matching images from the Internet.
 	// Can include resized copies of the query image.
-	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,2,rep,name=full_matching_images,json=fullMatchingImages" json:"full_matching_images,omitempty"`
+	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,2,rep,name=full_matching_images,json=fullMatchingImages,proto3" json:"full_matching_images,omitempty"`
 	// Partial matching images from the Internet.
 	// Those images are similar enough to share some key-point features. For
 	// example an original image will likely have partial matching for its crops.
-	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,3,rep,name=partial_matching_images,json=partialMatchingImages" json:"partial_matching_images,omitempty"`
+	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,3,rep,name=partial_matching_images,json=partialMatchingImages,proto3" json:"partial_matching_images,omitempty"`
 	// Web pages containing the matching images from the Internet.
-	PagesWithMatchingImages []*WebDetection_WebPage `protobuf:"bytes,4,rep,name=pages_with_matching_images,json=pagesWithMatchingImages" json:"pages_with_matching_images,omitempty"`
+	PagesWithMatchingImages []*WebDetection_WebPage `protobuf:"bytes,4,rep,name=pages_with_matching_images,json=pagesWithMatchingImages,proto3" json:"pages_with_matching_images,omitempty"`
 	// The visually similar image results.
-	VisuallySimilarImages []*WebDetection_WebImage `protobuf:"bytes,6,rep,name=visually_similar_images,json=visuallySimilarImages" json:"visually_similar_images,omitempty"`
+	VisuallySimilarImages []*WebDetection_WebImage `protobuf:"bytes,6,rep,name=visually_similar_images,json=visuallySimilarImages,proto3" json:"visually_similar_images,omitempty"`
 	// Best guess text labels for the request image.
-	BestGuessLabels []*WebDetection_WebLabel `protobuf:"bytes,8,rep,name=best_guess_labels,json=bestGuessLabels" json:"best_guess_labels,omitempty"`
+	BestGuessLabels      []*WebDetection_WebLabel `protobuf:"bytes,8,rep,name=best_guess_labels,json=bestGuessLabels,proto3" json:"best_guess_labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *WebDetection) Reset()         { *m = WebDetection{} }
+func (m *WebDetection) String() string { return proto.CompactTextString(m) }
+func (*WebDetection) ProtoMessage()    {}
+func (*WebDetection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_1e42c8eaa5ae855c, []int{0}
+}
+func (m *WebDetection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
+}
+func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(dst, src)
+}
+func (m *WebDetection) XXX_Size() int {
+	return xxx_messageInfo_WebDetection.Size(m)
+}
+func (m *WebDetection) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection.DiscardUnknown(m)
 }
 
-func (m *WebDetection) Reset()                    { *m = WebDetection{} }
-func (m *WebDetection) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection) ProtoMessage()               {}
-func (*WebDetection) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_WebDetection proto.InternalMessageInfo
 
 func (m *WebDetection) GetWebEntities() []*WebDetection_WebEntity {
 	if m != nil {
@@ -82,18 +110,40 @@ func (m *WebDetection) GetBestGuessLabels() []*WebDetection_WebLabel {
 // Entity deduced from similar images on the Internet.
 type WebDetection_WebEntity struct {
 	// Opaque entity ID.
-	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"`
+	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
 	// Overall relevancy score for the entity.
 	// Not normalized and not comparable across different image queries.
-	Score float32 `protobuf:"fixed32,2,opt,name=score" json:"score,omitempty"`
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
 	// Canonical description of the entity, in English.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *WebDetection_WebEntity) Reset()                    { *m = WebDetection_WebEntity{} }
-func (m *WebDetection_WebEntity) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection_WebEntity) ProtoMessage()               {}
-func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{} }
+func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebEntity) ProtoMessage()    {}
+func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_1e42c8eaa5ae855c, []int{0, 0}
+}
+func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
+}
+func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+}
+func (m *WebDetection_WebEntity) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
+}
+func (m *WebDetection_WebEntity) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebEntity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebEntity proto.InternalMessageInfo
 
 func (m *WebDetection_WebEntity) GetEntityId() string {
 	if m != nil {
@@ -119,15 +169,37 @@ func (m *WebDetection_WebEntity) GetDescription() string {
 // Metadata for online images.
 type WebDetection_WebImage struct {
 	// The result image URL.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// (Deprecated) Overall relevancy score for the image.
-	Score float32 `protobuf:"fixed32,2,opt,name=score" json:"score,omitempty"`
+	Score                float32  `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
+func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebImage) ProtoMessage()    {}
+func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_1e42c8eaa5ae855c, []int{0, 1}
+}
+func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
+}
+func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+}
+func (m *WebDetection_WebImage) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebImage.Size(m)
+}
+func (m *WebDetection_WebImage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebImage.DiscardUnknown(m)
 }
 
-func (m *WebDetection_WebImage) Reset()                    { *m = WebDetection_WebImage{} }
-func (m *WebDetection_WebImage) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection_WebImage) ProtoMessage()               {}
-func (*WebDetection_WebImage) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 1} }
+var xxx_messageInfo_WebDetection_WebImage proto.InternalMessageInfo
 
 func (m *WebDetection_WebImage) GetUrl() string {
 	if m != nil {
@@ -146,25 +218,47 @@ func (m *WebDetection_WebImage) GetScore() float32 {
 // Metadata for web pages.
 type WebDetection_WebPage struct {
 	// The result web page URL.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// (Deprecated) Overall relevancy score for the web page.
-	Score float32 `protobuf:"fixed32,2,opt,name=score" json:"score,omitempty"`
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
 	// Title for the web page, may contain HTML markups.
-	PageTitle string `protobuf:"bytes,3,opt,name=page_title,json=pageTitle" json:"page_title,omitempty"`
+	PageTitle string `protobuf:"bytes,3,opt,name=page_title,json=pageTitle,proto3" json:"page_title,omitempty"`
 	// Fully matching images on the page.
 	// Can include resized copies of the query image.
-	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,4,rep,name=full_matching_images,json=fullMatchingImages" json:"full_matching_images,omitempty"`
+	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,4,rep,name=full_matching_images,json=fullMatchingImages,proto3" json:"full_matching_images,omitempty"`
 	// Partial matching images on the page.
 	// Those images are similar enough to share some key-point features. For
 	// example an original image will likely have partial matching for its
 	// crops.
-	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,5,rep,name=partial_matching_images,json=partialMatchingImages" json:"partial_matching_images,omitempty"`
+	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,5,rep,name=partial_matching_images,json=partialMatchingImages,proto3" json:"partial_matching_images,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}                 `json:"-"`
+	XXX_unrecognized      []byte                   `json:"-"`
+	XXX_sizecache         int32                    `json:"-"`
+}
+
+func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
+func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebPage) ProtoMessage()    {}
+func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_1e42c8eaa5ae855c, []int{0, 2}
+}
+func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
+}
+func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+}
+func (m *WebDetection_WebPage) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebPage.Size(m)
+}
+func (m *WebDetection_WebPage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebPage.DiscardUnknown(m)
 }
 
-func (m *WebDetection_WebPage) Reset()                    { *m = WebDetection_WebPage{} }
-func (m *WebDetection_WebPage) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection_WebPage) ProtoMessage()               {}
-func (*WebDetection_WebPage) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 2} }
+var xxx_messageInfo_WebDetection_WebPage proto.InternalMessageInfo
 
 func (m *WebDetection_WebPage) GetUrl() string {
 	if m != nil {
@@ -204,17 +298,39 @@ func (m *WebDetection_WebPage) GetPartialMatchingImages() []*WebDetection_WebIma
 // Label to provide extra metadata for the web detection.
 type WebDetection_WebLabel struct {
 	// Label for extra metadata.
-	Label string `protobuf:"bytes,1,opt,name=label" json:"label,omitempty"`
+	Label string `protobuf:"bytes,1,opt,name=label,proto3" json:"label,omitempty"`
 	// The BCP-47 language code for `label`, such as "en-US" or "sr-Latn".
 	// For more information, see
 	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode         string   `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *WebDetection_WebLabel) Reset()                    { *m = WebDetection_WebLabel{} }
-func (m *WebDetection_WebLabel) String() string            { return proto.CompactTextString(m) }
-func (*WebDetection_WebLabel) ProtoMessage()               {}
-func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 3} }
+func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
+func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebLabel) ProtoMessage()    {}
+func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_1e42c8eaa5ae855c, []int{0, 3}
+}
+func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
+}
+func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+}
+func (m *WebDetection_WebLabel) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
+}
+func (m *WebDetection_WebLabel) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebLabel.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebLabel proto.InternalMessageInfo
 
 func (m *WebDetection_WebLabel) GetLabel() string {
 	if m != nil {
@@ -238,9 +354,11 @@ func init() {
 	proto.RegisterType((*WebDetection_WebLabel)(nil), "google.cloud.vision.v1p1beta1.WebDetection.WebLabel")
 }
 
-func init() { proto.RegisterFile("google/cloud/vision/v1p1beta1/web_detection.proto", fileDescriptor3) }
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p1beta1/web_detection.proto", fileDescriptor_web_detection_1e42c8eaa5ae855c)
+}
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_web_detection_1e42c8eaa5ae855c = []byte{
 	// 511 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
 	0x18, 0xc6, 0x95, 0x76, 0x1b, 0x8b, 0x5b, 0x04, 0xb3, 0x86, 0x16, 0x05, 0x26, 0x15, 0xb8, 0xf4,
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/geometry.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/geometry.pb.go
new file mode 100644
index 00000000..144deadd
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/geometry.pb.go
@@ -0,0 +1,262 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p2beta1/geometry.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A vertex represents a 2D point in the image.
+// NOTE: the vertex coordinates are in the same scale as the original image.
+type Vertex struct {
+	// X coordinate.
+	X int32 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"`
+	// Y coordinate.
+	Y                    int32    `protobuf:"varint,2,opt,name=y,proto3" json:"y,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Vertex) Reset()         { *m = Vertex{} }
+func (m *Vertex) String() string { return proto.CompactTextString(m) }
+func (*Vertex) ProtoMessage()    {}
+func (*Vertex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_0665111372b2901b, []int{0}
+}
+func (m *Vertex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Vertex.Unmarshal(m, b)
+}
+func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
+}
+func (dst *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(dst, src)
+}
+func (m *Vertex) XXX_Size() int {
+	return xxx_messageInfo_Vertex.Size(m)
+}
+func (m *Vertex) XXX_DiscardUnknown() {
+	xxx_messageInfo_Vertex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Vertex proto.InternalMessageInfo
+
+func (m *Vertex) GetX() int32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *Vertex) GetY() int32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
+// A vertex represents a 2D point in the image.
+// NOTE: the normalized vertex coordinates are relative to the original image
+// and range from 0 to 1.
+type NormalizedVertex struct {
+	// X coordinate.
+	X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"`
+	// Y coordinate.
+	Y                    float32  `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
+func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
+func (*NormalizedVertex) ProtoMessage()    {}
+func (*NormalizedVertex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_0665111372b2901b, []int{1}
+}
+func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
+}
+func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
+}
+func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+}
+func (m *NormalizedVertex) XXX_Size() int {
+	return xxx_messageInfo_NormalizedVertex.Size(m)
+}
+func (m *NormalizedVertex) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormalizedVertex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NormalizedVertex proto.InternalMessageInfo
+
+func (m *NormalizedVertex) GetX() float32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *NormalizedVertex) GetY() float32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
+// A bounding polygon for the detected image annotation.
+type BoundingPoly struct {
+	// The bounding polygon vertices.
+	Vertices []*Vertex `protobuf:"bytes,1,rep,name=vertices,proto3" json:"vertices,omitempty"`
+	// The bounding polygon normalized vertices.
+	NormalizedVertices   []*NormalizedVertex `protobuf:"bytes,2,rep,name=normalized_vertices,json=normalizedVertices,proto3" json:"normalized_vertices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
+func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
+func (*BoundingPoly) ProtoMessage()    {}
+func (*BoundingPoly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_0665111372b2901b, []int{2}
+}
+func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
+}
+func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
+}
+func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+}
+func (m *BoundingPoly) XXX_Size() int {
+	return xxx_messageInfo_BoundingPoly.Size(m)
+}
+func (m *BoundingPoly) XXX_DiscardUnknown() {
+	xxx_messageInfo_BoundingPoly.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BoundingPoly proto.InternalMessageInfo
+
+func (m *BoundingPoly) GetVertices() []*Vertex {
+	if m != nil {
+		return m.Vertices
+	}
+	return nil
+}
+
+func (m *BoundingPoly) GetNormalizedVertices() []*NormalizedVertex {
+	if m != nil {
+		return m.NormalizedVertices
+	}
+	return nil
+}
+
+// A 3D position in the image, used primarily for Face detection landmarks.
+// A valid Position must have both x and y coordinates.
+// The position coordinates are in the same scale as the original image.
+type Position struct {
+	// X coordinate.
+	X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"`
+	// Y coordinate.
+	Y float32 `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"`
+	// Z coordinate (or depth).
+	Z                    float32  `protobuf:"fixed32,3,opt,name=z,proto3" json:"z,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Position) Reset()         { *m = Position{} }
+func (m *Position) String() string { return proto.CompactTextString(m) }
+func (*Position) ProtoMessage()    {}
+func (*Position) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_0665111372b2901b, []int{3}
+}
+func (m *Position) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Position.Unmarshal(m, b)
+}
+func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
+}
+func (dst *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(dst, src)
+}
+func (m *Position) XXX_Size() int {
+	return xxx_messageInfo_Position.Size(m)
+}
+func (m *Position) XXX_DiscardUnknown() {
+	xxx_messageInfo_Position.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Position proto.InternalMessageInfo
+
+func (m *Position) GetX() float32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *Position) GetY() float32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
+func (m *Position) GetZ() float32 {
+	if m != nil {
+		return m.Z
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*Vertex)(nil), "google.cloud.vision.v1p2beta1.Vertex")
+	proto.RegisterType((*NormalizedVertex)(nil), "google.cloud.vision.v1p2beta1.NormalizedVertex")
+	proto.RegisterType((*BoundingPoly)(nil), "google.cloud.vision.v1p2beta1.BoundingPoly")
+	proto.RegisterType((*Position)(nil), "google.cloud.vision.v1p2beta1.Position")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p2beta1/geometry.proto", fileDescriptor_geometry_0665111372b2901b)
+}
+
+var fileDescriptor_geometry_0665111372b2901b = []byte{
+	// 283 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xc1, 0x4b, 0xc3, 0x30,
+	0x14, 0xc6, 0x49, 0x87, 0x63, 0xc4, 0x09, 0x52, 0x2f, 0xbd, 0x08, 0xb3, 0x28, 0xec, 0x20, 0x09,
+	0x9b, 0xde, 0x3c, 0x59, 0x0f, 0xde, 0xa4, 0xf4, 0xe0, 0xc1, 0x8b, 0x76, 0xed, 0x23, 0x04, 0xda,
+	0xbc, 0x92, 0x66, 0x65, 0x2d, 0xfe, 0x57, 0xfe, 0x73, 0x1e, 0xa5, 0xc9, 0x28, 0x6c, 0x60, 0x77,
+	0xfc, 0x5e, 0x7e, 0xef, 0x7b, 0x5f, 0xf8, 0xe8, 0xbd, 0x40, 0x14, 0x05, 0xf0, 0xac, 0xc0, 0x6d,
+	0xce, 0x1b, 0x59, 0x4b, 0x54, 0xbc, 0x59, 0x55, 0xeb, 0x0d, 0x98, 0x74, 0xc5, 0x05, 0x60, 0x09,
+	0x46, 0xb7, 0xac, 0xd2, 0x68, 0xd0, 0xbf, 0x76, 0x34, 0xb3, 0x34, 0x73, 0x34, 0x1b, 0xe8, 0xf0,
+	0x96, 0x4e, 0xdf, 0x41, 0x1b, 0xd8, 0xf9, 0x73, 0x4a, 0x76, 0x01, 0x59, 0x90, 0xe5, 0x59, 0x42,
+	0xac, 0x6a, 0x03, 0xcf, 0xa9, 0x36, 0x64, 0xf4, 0xf2, 0x0d, 0x75, 0x99, 0x16, 0xb2, 0x83, 0xfc,
+	0x98, 0xf7, 0x0e, 0x78, 0xaf, 0xe7, 0x7f, 0x08, 0x9d, 0x47, 0xb8, 0x55, 0xb9, 0x54, 0x22, 0xc6,
+	0xa2, 0xf5, 0x9f, 0xe9, 0xac, 0x01, 0x6d, 0x64, 0x06, 0x75, 0x40, 0x16, 0x93, 0xe5, 0xf9, 0xfa,
+	0x8e, 0x8d, 0x06, 0x63, 0xee, 0x4a, 0x32, 0xac, 0xf9, 0x5f, 0xf4, 0x4a, 0x0d, 0x19, 0x3e, 0x07,
+	0x37, 0xcf, 0xba, 0xf1, 0x13, 0x6e, 0xc7, 0xe9, 0x13, 0x5f, 0x1d, 0x4c, 0x7a, 0xab, 0xf0, 0x91,
+	0xce, 0x62, 0xac, 0xa5, 0x91, 0xa8, 0xc6, 0x7e, 0xd7, 0xab, 0x2e, 0x98, 0x38, 0xd5, 0x45, 0xdf,
+	0xf4, 0x26, 0xc3, 0x72, 0xfc, 0x7e, 0x74, 0xf1, 0xba, 0x6f, 0x25, 0xee, 0x4b, 0x89, 0xc9, 0xc7,
+	0xcb, 0x9e, 0x17, 0x58, 0xa4, 0x4a, 0x30, 0xd4, 0x82, 0x0b, 0x50, 0xb6, 0x32, 0xee, 0x9e, 0xd2,
+	0x4a, 0xd6, 0xff, 0x74, 0xfc, 0xe4, 0x06, 0xbf, 0x84, 0x6c, 0xa6, 0x76, 0xe5, 0xe1, 0x2f, 0x00,
+	0x00, 0xff, 0xff, 0x3d, 0xe4, 0x63, 0xcf, 0x15, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go
new file mode 100644
index 00000000..91794532
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/image_annotator.pb.go
@@ -0,0 +1,2700 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p2beta1/image_annotator.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import color "google.golang.org/genproto/googleapis/type/color"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A bucketized representation of likelihood, which is intended to give clients
+// highly stable results across model upgrades.
+type Likelihood int32
+
+const (
+	// Unknown likelihood.
+	Likelihood_UNKNOWN Likelihood = 0
+	// It is very unlikely that the image belongs to the specified vertical.
+	Likelihood_VERY_UNLIKELY Likelihood = 1
+	// It is unlikely that the image belongs to the specified vertical.
+	Likelihood_UNLIKELY Likelihood = 2
+	// It is possible that the image belongs to the specified vertical.
+	Likelihood_POSSIBLE Likelihood = 3
+	// It is likely that the image belongs to the specified vertical.
+	Likelihood_LIKELY Likelihood = 4
+	// It is very likely that the image belongs to the specified vertical.
+	Likelihood_VERY_LIKELY Likelihood = 5
+)
+
+var Likelihood_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "VERY_UNLIKELY",
+	2: "UNLIKELY",
+	3: "POSSIBLE",
+	4: "LIKELY",
+	5: "VERY_LIKELY",
+}
+var Likelihood_value = map[string]int32{
+	"UNKNOWN":       0,
+	"VERY_UNLIKELY": 1,
+	"UNLIKELY":      2,
+	"POSSIBLE":      3,
+	"LIKELY":        4,
+	"VERY_LIKELY":   5,
+}
+
+func (x Likelihood) String() string {
+	return proto.EnumName(Likelihood_name, int32(x))
+}
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{0}
+}
+
+// Type of Google Cloud Vision API feature to be extracted.
+type Feature_Type int32
+
+const (
+	// Unspecified feature type.
+	Feature_TYPE_UNSPECIFIED Feature_Type = 0
+	// Run face detection.
+	Feature_FACE_DETECTION Feature_Type = 1
+	// Run landmark detection.
+	Feature_LANDMARK_DETECTION Feature_Type = 2
+	// Run logo detection.
+	Feature_LOGO_DETECTION Feature_Type = 3
+	// Run label detection.
+	Feature_LABEL_DETECTION Feature_Type = 4
+	// Run text detection / optical character recognition (OCR). Text detection
+	// is optimized for areas of text within a larger image; if the image is
+	// a document, use `DOCUMENT_TEXT_DETECTION` instead.
+	Feature_TEXT_DETECTION Feature_Type = 5
+	// Run dense text document OCR. Takes precedence when both
+	// `DOCUMENT_TEXT_DETECTION` and `TEXT_DETECTION` are present.
+	Feature_DOCUMENT_TEXT_DETECTION Feature_Type = 11
+	// Run Safe Search to detect potentially unsafe
+	// or undesirable content.
+	Feature_SAFE_SEARCH_DETECTION Feature_Type = 6
+	// Compute a set of image properties, such as the
+	// image's dominant colors.
+	Feature_IMAGE_PROPERTIES Feature_Type = 7
+	// Run crop hints.
+	Feature_CROP_HINTS Feature_Type = 9
+	// Run web detection.
+	Feature_WEB_DETECTION Feature_Type = 10
+)
+
+var Feature_Type_name = map[int32]string{
+	0:  "TYPE_UNSPECIFIED",
+	1:  "FACE_DETECTION",
+	2:  "LANDMARK_DETECTION",
+	3:  "LOGO_DETECTION",
+	4:  "LABEL_DETECTION",
+	5:  "TEXT_DETECTION",
+	11: "DOCUMENT_TEXT_DETECTION",
+	6:  "SAFE_SEARCH_DETECTION",
+	7:  "IMAGE_PROPERTIES",
+	9:  "CROP_HINTS",
+	10: "WEB_DETECTION",
+}
+var Feature_Type_value = map[string]int32{
+	"TYPE_UNSPECIFIED":        0,
+	"FACE_DETECTION":          1,
+	"LANDMARK_DETECTION":      2,
+	"LOGO_DETECTION":          3,
+	"LABEL_DETECTION":         4,
+	"TEXT_DETECTION":          5,
+	"DOCUMENT_TEXT_DETECTION": 11,
+	"SAFE_SEARCH_DETECTION":   6,
+	"IMAGE_PROPERTIES":        7,
+	"CROP_HINTS":              9,
+	"WEB_DETECTION":           10,
+}
+
+func (x Feature_Type) String() string {
+	return proto.EnumName(Feature_Type_name, int32(x))
+}
+func (Feature_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{0, 0}
+}
+
+// Face landmark (feature) type.
+// Left and right are defined from the vantage of the viewer of the image
+// without considering mirror projections typical of photos. So, `LEFT_EYE`,
+// typically, is the person's right eye.
+type FaceAnnotation_Landmark_Type int32
+
+const (
+	// Unknown face landmark detected. Should not be filled.
+	FaceAnnotation_Landmark_UNKNOWN_LANDMARK FaceAnnotation_Landmark_Type = 0
+	// Left eye.
+	FaceAnnotation_Landmark_LEFT_EYE FaceAnnotation_Landmark_Type = 1
+	// Right eye.
+	FaceAnnotation_Landmark_RIGHT_EYE FaceAnnotation_Landmark_Type = 2
+	// Left of left eyebrow.
+	FaceAnnotation_Landmark_LEFT_OF_LEFT_EYEBROW FaceAnnotation_Landmark_Type = 3
+	// Right of left eyebrow.
+	FaceAnnotation_Landmark_RIGHT_OF_LEFT_EYEBROW FaceAnnotation_Landmark_Type = 4
+	// Left of right eyebrow.
+	FaceAnnotation_Landmark_LEFT_OF_RIGHT_EYEBROW FaceAnnotation_Landmark_Type = 5
+	// Right of right eyebrow.
+	FaceAnnotation_Landmark_RIGHT_OF_RIGHT_EYEBROW FaceAnnotation_Landmark_Type = 6
+	// Midpoint between eyes.
+	FaceAnnotation_Landmark_MIDPOINT_BETWEEN_EYES FaceAnnotation_Landmark_Type = 7
+	// Nose tip.
+	FaceAnnotation_Landmark_NOSE_TIP FaceAnnotation_Landmark_Type = 8
+	// Upper lip.
+	FaceAnnotation_Landmark_UPPER_LIP FaceAnnotation_Landmark_Type = 9
+	// Lower lip.
+	FaceAnnotation_Landmark_LOWER_LIP FaceAnnotation_Landmark_Type = 10
+	// Mouth left.
+	FaceAnnotation_Landmark_MOUTH_LEFT FaceAnnotation_Landmark_Type = 11
+	// Mouth right.
+	FaceAnnotation_Landmark_MOUTH_RIGHT FaceAnnotation_Landmark_Type = 12
+	// Mouth center.
+	FaceAnnotation_Landmark_MOUTH_CENTER FaceAnnotation_Landmark_Type = 13
+	// Nose, bottom right.
+	FaceAnnotation_Landmark_NOSE_BOTTOM_RIGHT FaceAnnotation_Landmark_Type = 14
+	// Nose, bottom left.
+	FaceAnnotation_Landmark_NOSE_BOTTOM_LEFT FaceAnnotation_Landmark_Type = 15
+	// Nose, bottom center.
+	FaceAnnotation_Landmark_NOSE_BOTTOM_CENTER FaceAnnotation_Landmark_Type = 16
+	// Left eye, top boundary.
+	FaceAnnotation_Landmark_LEFT_EYE_TOP_BOUNDARY FaceAnnotation_Landmark_Type = 17
+	// Left eye, right corner.
+	FaceAnnotation_Landmark_LEFT_EYE_RIGHT_CORNER FaceAnnotation_Landmark_Type = 18
+	// Left eye, bottom boundary.
+	FaceAnnotation_Landmark_LEFT_EYE_BOTTOM_BOUNDARY FaceAnnotation_Landmark_Type = 19
+	// Left eye, left corner.
+	FaceAnnotation_Landmark_LEFT_EYE_LEFT_CORNER FaceAnnotation_Landmark_Type = 20
+	// Right eye, top boundary.
+	FaceAnnotation_Landmark_RIGHT_EYE_TOP_BOUNDARY FaceAnnotation_Landmark_Type = 21
+	// Right eye, right corner.
+	FaceAnnotation_Landmark_RIGHT_EYE_RIGHT_CORNER FaceAnnotation_Landmark_Type = 22
+	// Right eye, bottom boundary.
+	FaceAnnotation_Landmark_RIGHT_EYE_BOTTOM_BOUNDARY FaceAnnotation_Landmark_Type = 23
+	// Right eye, left corner.
+	FaceAnnotation_Landmark_RIGHT_EYE_LEFT_CORNER FaceAnnotation_Landmark_Type = 24
+	// Left eyebrow, upper midpoint.
+	FaceAnnotation_Landmark_LEFT_EYEBROW_UPPER_MIDPOINT FaceAnnotation_Landmark_Type = 25
+	// Right eyebrow, upper midpoint.
+	FaceAnnotation_Landmark_RIGHT_EYEBROW_UPPER_MIDPOINT FaceAnnotation_Landmark_Type = 26
+	// Left ear tragion.
+	FaceAnnotation_Landmark_LEFT_EAR_TRAGION FaceAnnotation_Landmark_Type = 27
+	// Right ear tragion.
+	FaceAnnotation_Landmark_RIGHT_EAR_TRAGION FaceAnnotation_Landmark_Type = 28
+	// Left eye pupil.
+	FaceAnnotation_Landmark_LEFT_EYE_PUPIL FaceAnnotation_Landmark_Type = 29
+	// Right eye pupil.
+	FaceAnnotation_Landmark_RIGHT_EYE_PUPIL FaceAnnotation_Landmark_Type = 30
+	// Forehead glabella.
+	FaceAnnotation_Landmark_FOREHEAD_GLABELLA FaceAnnotation_Landmark_Type = 31
+	// Chin gnathion.
+	FaceAnnotation_Landmark_CHIN_GNATHION FaceAnnotation_Landmark_Type = 32
+	// Chin left gonion.
+	FaceAnnotation_Landmark_CHIN_LEFT_GONION FaceAnnotation_Landmark_Type = 33
+	// Chin right gonion.
+	FaceAnnotation_Landmark_CHIN_RIGHT_GONION FaceAnnotation_Landmark_Type = 34
+)
+
+var FaceAnnotation_Landmark_Type_name = map[int32]string{
+	0:  "UNKNOWN_LANDMARK",
+	1:  "LEFT_EYE",
+	2:  "RIGHT_EYE",
+	3:  "LEFT_OF_LEFT_EYEBROW",
+	4:  "RIGHT_OF_LEFT_EYEBROW",
+	5:  "LEFT_OF_RIGHT_EYEBROW",
+	6:  "RIGHT_OF_RIGHT_EYEBROW",
+	7:  "MIDPOINT_BETWEEN_EYES",
+	8:  "NOSE_TIP",
+	9:  "UPPER_LIP",
+	10: "LOWER_LIP",
+	11: "MOUTH_LEFT",
+	12: "MOUTH_RIGHT",
+	13: "MOUTH_CENTER",
+	14: "NOSE_BOTTOM_RIGHT",
+	15: "NOSE_BOTTOM_LEFT",
+	16: "NOSE_BOTTOM_CENTER",
+	17: "LEFT_EYE_TOP_BOUNDARY",
+	18: "LEFT_EYE_RIGHT_CORNER",
+	19: "LEFT_EYE_BOTTOM_BOUNDARY",
+	20: "LEFT_EYE_LEFT_CORNER",
+	21: "RIGHT_EYE_TOP_BOUNDARY",
+	22: "RIGHT_EYE_RIGHT_CORNER",
+	23: "RIGHT_EYE_BOTTOM_BOUNDARY",
+	24: "RIGHT_EYE_LEFT_CORNER",
+	25: "LEFT_EYEBROW_UPPER_MIDPOINT",
+	26: "RIGHT_EYEBROW_UPPER_MIDPOINT",
+	27: "LEFT_EAR_TRAGION",
+	28: "RIGHT_EAR_TRAGION",
+	29: "LEFT_EYE_PUPIL",
+	30: "RIGHT_EYE_PUPIL",
+	31: "FOREHEAD_GLABELLA",
+	32: "CHIN_GNATHION",
+	33: "CHIN_LEFT_GONION",
+	34: "CHIN_RIGHT_GONION",
+}
+var FaceAnnotation_Landmark_Type_value = map[string]int32{
+	"UNKNOWN_LANDMARK":             0,
+	"LEFT_EYE":                     1,
+	"RIGHT_EYE":                    2,
+	"LEFT_OF_LEFT_EYEBROW":         3,
+	"RIGHT_OF_LEFT_EYEBROW":        4,
+	"LEFT_OF_RIGHT_EYEBROW":        5,
+	"RIGHT_OF_RIGHT_EYEBROW":       6,
+	"MIDPOINT_BETWEEN_EYES":        7,
+	"NOSE_TIP":                     8,
+	"UPPER_LIP":                    9,
+	"LOWER_LIP":                    10,
+	"MOUTH_LEFT":                   11,
+	"MOUTH_RIGHT":                  12,
+	"MOUTH_CENTER":                 13,
+	"NOSE_BOTTOM_RIGHT":            14,
+	"NOSE_BOTTOM_LEFT":             15,
+	"NOSE_BOTTOM_CENTER":           16,
+	"LEFT_EYE_TOP_BOUNDARY":        17,
+	"LEFT_EYE_RIGHT_CORNER":        18,
+	"LEFT_EYE_BOTTOM_BOUNDARY":     19,
+	"LEFT_EYE_LEFT_CORNER":         20,
+	"RIGHT_EYE_TOP_BOUNDARY":       21,
+	"RIGHT_EYE_RIGHT_CORNER":       22,
+	"RIGHT_EYE_BOTTOM_BOUNDARY":    23,
+	"RIGHT_EYE_LEFT_CORNER":        24,
+	"LEFT_EYEBROW_UPPER_MIDPOINT":  25,
+	"RIGHT_EYEBROW_UPPER_MIDPOINT": 26,
+	"LEFT_EAR_TRAGION":             27,
+	"RIGHT_EAR_TRAGION":            28,
+	"LEFT_EYE_PUPIL":               29,
+	"RIGHT_EYE_PUPIL":              30,
+	"FOREHEAD_GLABELLA":            31,
+	"CHIN_GNATHION":                32,
+	"CHIN_LEFT_GONION":             33,
+	"CHIN_RIGHT_GONION":            34,
+}
+
+func (x FaceAnnotation_Landmark_Type) String() string {
+	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
+}
+func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{3, 0, 0}
+}
+
+// Batch operation states.
+type OperationMetadata_State int32
+
+const (
+	// Invalid.
+	OperationMetadata_STATE_UNSPECIFIED OperationMetadata_State = 0
+	// Request is received.
+	OperationMetadata_CREATED OperationMetadata_State = 1
+	// Request is actively being processed.
+	OperationMetadata_RUNNING OperationMetadata_State = 2
+	// The batch processing is done.
+	OperationMetadata_DONE OperationMetadata_State = 3
+	// The batch processing was cancelled.
+	OperationMetadata_CANCELLED OperationMetadata_State = 4
+)
+
+var OperationMetadata_State_name = map[int32]string{
+	0: "STATE_UNSPECIFIED",
+	1: "CREATED",
+	2: "RUNNING",
+	3: "DONE",
+	4: "CANCELLED",
+}
+var OperationMetadata_State_value = map[string]int32{
+	"STATE_UNSPECIFIED": 0,
+	"CREATED":           1,
+	"RUNNING":           2,
+	"DONE":              3,
+	"CANCELLED":         4,
+}
+
+func (x OperationMetadata_State) String() string {
+	return proto.EnumName(OperationMetadata_State_name, int32(x))
+}
+func (OperationMetadata_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{31, 0}
+}
+
+// The type of Google Cloud Vision API detection to perform, and the maximum
+// number of results to return for that type. Multiple `Feature` objects can
+// be specified in the `features` list.
+type Feature struct {
+	// The feature type.
+	Type Feature_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.vision.v1p2beta1.Feature_Type" json:"type,omitempty"`
+	// Maximum number of results of this type. Does not apply to
+	// `TEXT_DETECTION`, `DOCUMENT_TEXT_DETECTION`, or `CROP_HINTS`.
+	MaxResults int32 `protobuf:"varint,2,opt,name=max_results,json=maxResults,proto3" json:"max_results,omitempty"`
+	// Model to use for the feature.
+	// Supported values: "builtin/stable" (the default if unset) and
+	// "builtin/latest".
+	Model                string   `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Feature) Reset()         { *m = Feature{} }
+func (m *Feature) String() string { return proto.CompactTextString(m) }
+func (*Feature) ProtoMessage()    {}
+func (*Feature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{0}
+}
+func (m *Feature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Feature.Unmarshal(m, b)
+}
+func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
+}
+func (dst *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(dst, src)
+}
+func (m *Feature) XXX_Size() int {
+	return xxx_messageInfo_Feature.Size(m)
+}
+func (m *Feature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Feature.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Feature proto.InternalMessageInfo
+
+func (m *Feature) GetType() Feature_Type {
+	if m != nil {
+		return m.Type
+	}
+	return Feature_TYPE_UNSPECIFIED
+}
+
+func (m *Feature) GetMaxResults() int32 {
+	if m != nil {
+		return m.MaxResults
+	}
+	return 0
+}
+
+func (m *Feature) GetModel() string {
+	if m != nil {
+		return m.Model
+	}
+	return ""
+}
+
+// External image source (Google Cloud Storage or web URL image location).
+type ImageSource struct {
+	// **Use `image_uri` instead.**
+	//
+	// The Google Cloud Storage  URI of the form
+	// `gs://bucket_name/object_name`. Object versioning is not supported. See
+	// [Google Cloud Storage Request
+	// URIs](https://cloud.google.com/storage/docs/reference-uris) for more info.
+	GcsImageUri string `protobuf:"bytes,1,opt,name=gcs_image_uri,json=gcsImageUri,proto3" json:"gcs_image_uri,omitempty"`
+	// The URI of the source image. Can be either:
+	//
+	// 1. A Google Cloud Storage URI of the form
+	//    `gs://bucket_name/object_name`. Object versioning is not supported. See
+	//    [Google Cloud Storage Request
+	//    URIs](https://cloud.google.com/storage/docs/reference-uris) for more
+	//    info.
+	//
+	// 2. A publicly-accessible image HTTP/HTTPS URL. When fetching images from
+	//    HTTP/HTTPS URLs, Google cannot guarantee that the request will be
+	//    completed. Your request may fail if the specified host denies the
+	//    request (e.g. due to request throttling or DOS prevention), or if Google
+	//    throttles requests to the site for abuse prevention. You should not
+	//    depend on externally-hosted images for production applications.
+	//
+	// When both `gcs_image_uri` and `image_uri` are specified, `image_uri` takes
+	// precedence.
+	ImageUri             string   `protobuf:"bytes,2,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImageSource) Reset()         { *m = ImageSource{} }
+func (m *ImageSource) String() string { return proto.CompactTextString(m) }
+func (*ImageSource) ProtoMessage()    {}
+func (*ImageSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{1}
+}
+func (m *ImageSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
+}
+func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
+}
+func (dst *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(dst, src)
+}
+func (m *ImageSource) XXX_Size() int {
+	return xxx_messageInfo_ImageSource.Size(m)
+}
+func (m *ImageSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageSource proto.InternalMessageInfo
+
+func (m *ImageSource) GetGcsImageUri() string {
+	if m != nil {
+		return m.GcsImageUri
+	}
+	return ""
+}
+
+func (m *ImageSource) GetImageUri() string {
+	if m != nil {
+		return m.ImageUri
+	}
+	return ""
+}
+
+// Client image to perform Google Cloud Vision API tasks over.
+type Image struct {
+	// Image content, represented as a stream of bytes.
+	// Note: As with all `bytes` fields, protobuffers use a pure binary
+	// representation, whereas JSON representations use base64.
+	Content []byte `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
+	// Google Cloud Storage image location, or publicly-accessible image
+	// URL. If both `content` and `source` are provided for an image, `content`
+	// takes precedence and is used to perform the image annotation request.
+	Source               *ImageSource `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Image) Reset()         { *m = Image{} }
+func (m *Image) String() string { return proto.CompactTextString(m) }
+func (*Image) ProtoMessage()    {}
+func (*Image) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{2}
+}
+func (m *Image) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Image.Unmarshal(m, b)
+}
+func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
+}
+func (dst *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(dst, src)
+}
+func (m *Image) XXX_Size() int {
+	return xxx_messageInfo_Image.Size(m)
+}
+func (m *Image) XXX_DiscardUnknown() {
+	xxx_messageInfo_Image.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Image proto.InternalMessageInfo
+
+func (m *Image) GetContent() []byte {
+	if m != nil {
+		return m.Content
+	}
+	return nil
+}
+
+func (m *Image) GetSource() *ImageSource {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+// A face annotation object contains the results of face detection.
+type FaceAnnotation struct {
+	// The bounding polygon around the face. The coordinates of the bounding box
+	// are in the original image's scale, as returned in `ImageParams`.
+	// The bounding box is computed to "frame" the face in accordance with human
+	// expectations. It is based on the landmarker results.
+	// Note that one or more x and/or y coordinates may not be generated in the
+	// `BoundingPoly` (the polygon will be unbounded) if only a partial face
+	// appears in the image to be annotated.
+	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
+	// The `fd_bounding_poly` bounding polygon is tighter than the
+	// `boundingPoly`, and encloses only the skin part of the face. Typically, it
+	// is used to eliminate the face from any image analysis that detects the
+	// "amount of skin" visible in an image. It is not based on the
+	// landmarker results, only on the initial face detection, hence
+	// the <code>fd</code> (face detection) prefix.
+	FdBoundingPoly *BoundingPoly `protobuf:"bytes,2,opt,name=fd_bounding_poly,json=fdBoundingPoly,proto3" json:"fd_bounding_poly,omitempty"`
+	// Detected face landmarks.
+	Landmarks []*FaceAnnotation_Landmark `protobuf:"bytes,3,rep,name=landmarks,proto3" json:"landmarks,omitempty"`
+	// Roll angle, which indicates the amount of clockwise/anti-clockwise rotation
+	// of the face relative to the image vertical about the axis perpendicular to
+	// the face. Range [-180,180].
+	RollAngle float32 `protobuf:"fixed32,4,opt,name=roll_angle,json=rollAngle,proto3" json:"roll_angle,omitempty"`
+	// Yaw angle, which indicates the leftward/rightward angle that the face is
+	// pointing relative to the vertical plane perpendicular to the image. Range
+	// [-180,180].
+	PanAngle float32 `protobuf:"fixed32,5,opt,name=pan_angle,json=panAngle,proto3" json:"pan_angle,omitempty"`
+	// Pitch angle, which indicates the upwards/downwards angle that the face is
+	// pointing relative to the image's horizontal plane. Range [-180,180].
+	TiltAngle float32 `protobuf:"fixed32,6,opt,name=tilt_angle,json=tiltAngle,proto3" json:"tilt_angle,omitempty"`
+	// Detection confidence. Range [0, 1].
+	DetectionConfidence float32 `protobuf:"fixed32,7,opt,name=detection_confidence,json=detectionConfidence,proto3" json:"detection_confidence,omitempty"`
+	// Face landmarking confidence. Range [0, 1].
+	LandmarkingConfidence float32 `protobuf:"fixed32,8,opt,name=landmarking_confidence,json=landmarkingConfidence,proto3" json:"landmarking_confidence,omitempty"`
+	// Joy likelihood.
+	JoyLikelihood Likelihood `protobuf:"varint,9,opt,name=joy_likelihood,json=joyLikelihood,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"joy_likelihood,omitempty"`
+	// Sorrow likelihood.
+	SorrowLikelihood Likelihood `protobuf:"varint,10,opt,name=sorrow_likelihood,json=sorrowLikelihood,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"sorrow_likelihood,omitempty"`
+	// Anger likelihood.
+	AngerLikelihood Likelihood `protobuf:"varint,11,opt,name=anger_likelihood,json=angerLikelihood,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"anger_likelihood,omitempty"`
+	// Surprise likelihood.
+	SurpriseLikelihood Likelihood `protobuf:"varint,12,opt,name=surprise_likelihood,json=surpriseLikelihood,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"surprise_likelihood,omitempty"`
+	// Under-exposed likelihood.
+	UnderExposedLikelihood Likelihood `protobuf:"varint,13,opt,name=under_exposed_likelihood,json=underExposedLikelihood,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"under_exposed_likelihood,omitempty"`
+	// Blurred likelihood.
+	BlurredLikelihood Likelihood `protobuf:"varint,14,opt,name=blurred_likelihood,json=blurredLikelihood,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"blurred_likelihood,omitempty"`
+	// Headwear likelihood.
+	HeadwearLikelihood   Likelihood `protobuf:"varint,15,opt,name=headwear_likelihood,json=headwearLikelihood,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"headwear_likelihood,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
+func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation) ProtoMessage()    {}
+func (*FaceAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{3}
+}
+func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
+}
+func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+}
+func (m *FaceAnnotation) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation.Size(m)
+}
+func (m *FaceAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceAnnotation proto.InternalMessageInfo
+
+func (m *FaceAnnotation) GetBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.BoundingPoly
+	}
+	return nil
+}
+
+func (m *FaceAnnotation) GetFdBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.FdBoundingPoly
+	}
+	return nil
+}
+
+func (m *FaceAnnotation) GetLandmarks() []*FaceAnnotation_Landmark {
+	if m != nil {
+		return m.Landmarks
+	}
+	return nil
+}
+
+func (m *FaceAnnotation) GetRollAngle() float32 {
+	if m != nil {
+		return m.RollAngle
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetPanAngle() float32 {
+	if m != nil {
+		return m.PanAngle
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetTiltAngle() float32 {
+	if m != nil {
+		return m.TiltAngle
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetDetectionConfidence() float32 {
+	if m != nil {
+		return m.DetectionConfidence
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetLandmarkingConfidence() float32 {
+	if m != nil {
+		return m.LandmarkingConfidence
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetJoyLikelihood() Likelihood {
+	if m != nil {
+		return m.JoyLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetSorrowLikelihood() Likelihood {
+	if m != nil {
+		return m.SorrowLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetAngerLikelihood() Likelihood {
+	if m != nil {
+		return m.AngerLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetSurpriseLikelihood() Likelihood {
+	if m != nil {
+		return m.SurpriseLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetUnderExposedLikelihood() Likelihood {
+	if m != nil {
+		return m.UnderExposedLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetBlurredLikelihood() Likelihood {
+	if m != nil {
+		return m.BlurredLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetHeadwearLikelihood() Likelihood {
+	if m != nil {
+		return m.HeadwearLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+// A face-specific landmark (for example, a face feature).
+type FaceAnnotation_Landmark struct {
+	// Face landmark type.
+	Type FaceAnnotation_Landmark_Type `protobuf:"varint,3,opt,name=type,proto3,enum=google.cloud.vision.v1p2beta1.FaceAnnotation_Landmark_Type" json:"type,omitempty"`
+	// Face landmark position.
+	Position             *Position `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark{} }
+func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation_Landmark) ProtoMessage()    {}
+func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{3, 0}
+}
+func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
+}
+func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+}
+func (m *FaceAnnotation_Landmark) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
+}
+func (m *FaceAnnotation_Landmark) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation_Landmark.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceAnnotation_Landmark proto.InternalMessageInfo
+
+func (m *FaceAnnotation_Landmark) GetType() FaceAnnotation_Landmark_Type {
+	if m != nil {
+		return m.Type
+	}
+	return FaceAnnotation_Landmark_UNKNOWN_LANDMARK
+}
+
+func (m *FaceAnnotation_Landmark) GetPosition() *Position {
+	if m != nil {
+		return m.Position
+	}
+	return nil
+}
+
+// Detected entity location information.
+type LocationInfo struct {
+	// lat/long location coordinates.
+	LatLng               *latlng.LatLng `protobuf:"bytes,1,opt,name=lat_lng,json=latLng,proto3" json:"lat_lng,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
+func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
+func (*LocationInfo) ProtoMessage()    {}
+func (*LocationInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{4}
+}
+func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
+}
+func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
+}
+func (dst *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(dst, src)
+}
+func (m *LocationInfo) XXX_Size() int {
+	return xxx_messageInfo_LocationInfo.Size(m)
+}
+func (m *LocationInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocationInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LocationInfo proto.InternalMessageInfo
+
+func (m *LocationInfo) GetLatLng() *latlng.LatLng {
+	if m != nil {
+		return m.LatLng
+	}
+	return nil
+}
+
+// A `Property` consists of a user-supplied name/value pair.
+type Property struct {
+	// Name of the property.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Value of the property.
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	// Value of numeric properties.
+	Uint64Value          uint64   `protobuf:"varint,3,opt,name=uint64_value,json=uint64Value,proto3" json:"uint64_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Property) Reset()         { *m = Property{} }
+func (m *Property) String() string { return proto.CompactTextString(m) }
+func (*Property) ProtoMessage()    {}
+func (*Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{5}
+}
+func (m *Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Property.Unmarshal(m, b)
+}
+func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
+}
+func (dst *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(dst, src)
+}
+func (m *Property) XXX_Size() int {
+	return xxx_messageInfo_Property.Size(m)
+}
+func (m *Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Property.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Property proto.InternalMessageInfo
+
+func (m *Property) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Property) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+func (m *Property) GetUint64Value() uint64 {
+	if m != nil {
+		return m.Uint64Value
+	}
+	return 0
+}
+
+// Set of detected entity features.
+type EntityAnnotation struct {
+	// Opaque entity ID. Some IDs may be available in
+	// [Google Knowledge Graph Search
+	// API](https://developers.google.com/knowledge-graph/).
+	Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid,omitempty"`
+	// The language code for the locale in which the entity textual
+	// `description` is expressed.
+	Locale string `protobuf:"bytes,2,opt,name=locale,proto3" json:"locale,omitempty"`
+	// Entity textual description, expressed in its `locale` language.
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// Overall score of the result. Range [0, 1].
+	Score float32 `protobuf:"fixed32,4,opt,name=score,proto3" json:"score,omitempty"`
+	// **Deprecated. Use `score` instead.**
+	// The accuracy of the entity detection in an image.
+	// For example, for an image in which the "Eiffel Tower" entity is detected,
+	// this field represents the confidence that there is a tower in the query
+	// image. Range [0, 1].
+	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	// The relevancy of the ICA (Image Content Annotation) label to the
+	// image. For example, the relevancy of "tower" is likely higher to an image
+	// containing the detected "Eiffel Tower" than to an image containing a
+	// detected distant towering building, even though the confidence that
+	// there is a tower in each image may be the same. Range [0, 1].
+	Topicality float32 `protobuf:"fixed32,6,opt,name=topicality,proto3" json:"topicality,omitempty"`
+	// Image region to which this entity belongs. Not produced
+	// for `LABEL_DETECTION` features.
+	BoundingPoly *BoundingPoly `protobuf:"bytes,7,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
+	// The location information for the detected entity. Multiple
+	// `LocationInfo` elements can be present because one location may
+	// indicate the location of the scene in the image, and another location
+	// may indicate the location of the place where the image was taken.
+	// Location information is usually present for landmarks.
+	Locations []*LocationInfo `protobuf:"bytes,8,rep,name=locations,proto3" json:"locations,omitempty"`
+	// Some entities may have optional user-supplied `Property` (name/value)
+	// fields, such a score or string that qualifies the entity.
+	Properties           []*Property `protobuf:"bytes,9,rep,name=properties,proto3" json:"properties,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
+func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
+func (*EntityAnnotation) ProtoMessage()    {}
+func (*EntityAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{6}
+}
+func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
+}
+func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+}
+func (m *EntityAnnotation) XXX_Size() int {
+	return xxx_messageInfo_EntityAnnotation.Size(m)
+}
+func (m *EntityAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityAnnotation proto.InternalMessageInfo
+
+func (m *EntityAnnotation) GetMid() string {
+	if m != nil {
+		return m.Mid
+	}
+	return ""
+}
+
+func (m *EntityAnnotation) GetLocale() string {
+	if m != nil {
+		return m.Locale
+	}
+	return ""
+}
+
+func (m *EntityAnnotation) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *EntityAnnotation) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *EntityAnnotation) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+func (m *EntityAnnotation) GetTopicality() float32 {
+	if m != nil {
+		return m.Topicality
+	}
+	return 0
+}
+
+func (m *EntityAnnotation) GetBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.BoundingPoly
+	}
+	return nil
+}
+
+func (m *EntityAnnotation) GetLocations() []*LocationInfo {
+	if m != nil {
+		return m.Locations
+	}
+	return nil
+}
+
+func (m *EntityAnnotation) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+// Set of features pertaining to the image, computed by computer vision
+// methods over safe-search verticals (for example, adult, spoof, medical,
+// violence).
+type SafeSearchAnnotation struct {
+	// Represents the adult content likelihood for the image. Adult content may
+	// contain elements such as nudity, pornographic images or cartoons, or
+	// sexual activities.
+	Adult Likelihood `protobuf:"varint,1,opt,name=adult,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"adult,omitempty"`
+	// Spoof likelihood. The likelihood that an modification
+	// was made to the image's canonical version to make it appear
+	// funny or offensive.
+	Spoof Likelihood `protobuf:"varint,2,opt,name=spoof,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"spoof,omitempty"`
+	// Likelihood that this is a medical image.
+	Medical Likelihood `protobuf:"varint,3,opt,name=medical,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"medical,omitempty"`
+	// Likelihood that this image contains violent content.
+	Violence Likelihood `protobuf:"varint,4,opt,name=violence,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"violence,omitempty"`
+	// Likelihood that the request image contains racy content. Racy content may
+	// include (but is not limited to) skimpy or sheer clothing, strategically
+	// covered nudity, lewd or provocative poses, or close-ups of sensitive
+	// body areas.
+	Racy                 Likelihood `protobuf:"varint,9,opt,name=racy,proto3,enum=google.cloud.vision.v1p2beta1.Likelihood" json:"racy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
+func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
+func (*SafeSearchAnnotation) ProtoMessage()    {}
+func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{7}
+}
+func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
+}
+func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+}
+func (m *SafeSearchAnnotation) XXX_Size() int {
+	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
+}
+func (m *SafeSearchAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_SafeSearchAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SafeSearchAnnotation proto.InternalMessageInfo
+
+func (m *SafeSearchAnnotation) GetAdult() Likelihood {
+	if m != nil {
+		return m.Adult
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *SafeSearchAnnotation) GetSpoof() Likelihood {
+	if m != nil {
+		return m.Spoof
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *SafeSearchAnnotation) GetMedical() Likelihood {
+	if m != nil {
+		return m.Medical
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *SafeSearchAnnotation) GetViolence() Likelihood {
+	if m != nil {
+		return m.Violence
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *SafeSearchAnnotation) GetRacy() Likelihood {
+	if m != nil {
+		return m.Racy
+	}
+	return Likelihood_UNKNOWN
+}
+
+// Rectangle determined by min and max `LatLng` pairs.
+type LatLongRect struct {
+	// Min lat/long pair.
+	MinLatLng *latlng.LatLng `protobuf:"bytes,1,opt,name=min_lat_lng,json=minLatLng,proto3" json:"min_lat_lng,omitempty"`
+	// Max lat/long pair.
+	MaxLatLng            *latlng.LatLng `protobuf:"bytes,2,opt,name=max_lat_lng,json=maxLatLng,proto3" json:"max_lat_lng,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
+func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
+func (*LatLongRect) ProtoMessage()    {}
+func (*LatLongRect) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{8}
+}
+func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
+}
+func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
+}
+func (dst *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(dst, src)
+}
+func (m *LatLongRect) XXX_Size() int {
+	return xxx_messageInfo_LatLongRect.Size(m)
+}
+func (m *LatLongRect) XXX_DiscardUnknown() {
+	xxx_messageInfo_LatLongRect.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LatLongRect proto.InternalMessageInfo
+
+func (m *LatLongRect) GetMinLatLng() *latlng.LatLng {
+	if m != nil {
+		return m.MinLatLng
+	}
+	return nil
+}
+
+func (m *LatLongRect) GetMaxLatLng() *latlng.LatLng {
+	if m != nil {
+		return m.MaxLatLng
+	}
+	return nil
+}
+
+// Color information consists of RGB channels, score, and the fraction of
+// the image that the color occupies in the image.
+type ColorInfo struct {
+	// RGB components of the color.
+	Color *color.Color `protobuf:"bytes,1,opt,name=color,proto3" json:"color,omitempty"`
+	// Image-specific score for this color. Value in range [0, 1].
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	// The fraction of pixels the color occupies in the image.
+	// Value in range [0, 1].
+	PixelFraction        float32  `protobuf:"fixed32,3,opt,name=pixel_fraction,json=pixelFraction,proto3" json:"pixel_fraction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
+func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
+func (*ColorInfo) ProtoMessage()    {}
+func (*ColorInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{9}
+}
+func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
+}
+func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
+}
+func (dst *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(dst, src)
+}
+func (m *ColorInfo) XXX_Size() int {
+	return xxx_messageInfo_ColorInfo.Size(m)
+}
+func (m *ColorInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColorInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ColorInfo proto.InternalMessageInfo
+
+func (m *ColorInfo) GetColor() *color.Color {
+	if m != nil {
+		return m.Color
+	}
+	return nil
+}
+
+func (m *ColorInfo) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *ColorInfo) GetPixelFraction() float32 {
+	if m != nil {
+		return m.PixelFraction
+	}
+	return 0
+}
+
+// Set of dominant colors and their corresponding scores.
+type DominantColorsAnnotation struct {
+	// RGB color values with their score and pixel fraction.
+	Colors               []*ColorInfo `protobuf:"bytes,1,rep,name=colors,proto3" json:"colors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotation{} }
+func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
+func (*DominantColorsAnnotation) ProtoMessage()    {}
+func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{10}
+}
+func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
+}
+func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+}
+func (m *DominantColorsAnnotation) XXX_Size() int {
+	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
+}
+func (m *DominantColorsAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_DominantColorsAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DominantColorsAnnotation proto.InternalMessageInfo
+
+func (m *DominantColorsAnnotation) GetColors() []*ColorInfo {
+	if m != nil {
+		return m.Colors
+	}
+	return nil
+}
+
+// Stores image properties, such as dominant colors.
+type ImageProperties struct {
+	// If present, dominant colors completed successfully.
+	DominantColors       *DominantColorsAnnotation `protobuf:"bytes,1,opt,name=dominant_colors,json=dominantColors,proto3" json:"dominant_colors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
+func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
+func (*ImageProperties) ProtoMessage()    {}
+func (*ImageProperties) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{11}
+}
+func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
+}
+func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
+}
+func (dst *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(dst, src)
+}
+func (m *ImageProperties) XXX_Size() int {
+	return xxx_messageInfo_ImageProperties.Size(m)
+}
+func (m *ImageProperties) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageProperties.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageProperties proto.InternalMessageInfo
+
+func (m *ImageProperties) GetDominantColors() *DominantColorsAnnotation {
+	if m != nil {
+		return m.DominantColors
+	}
+	return nil
+}
+
+// Single crop hint that is used to generate a new crop when serving an image.
+type CropHint struct {
+	// The bounding polygon for the crop region. The coordinates of the bounding
+	// box are in the original image's scale, as returned in `ImageParams`.
+	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
+	// Confidence of this being a salient region.  Range [0, 1].
+	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	// Fraction of importance of this salient region with respect to the original
+	// image.
+	ImportanceFraction   float32  `protobuf:"fixed32,3,opt,name=importance_fraction,json=importanceFraction,proto3" json:"importance_fraction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CropHint) Reset()         { *m = CropHint{} }
+func (m *CropHint) String() string { return proto.CompactTextString(m) }
+func (*CropHint) ProtoMessage()    {}
+func (*CropHint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{12}
+}
+func (m *CropHint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHint.Unmarshal(m, b)
+}
+func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
+}
+func (dst *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(dst, src)
+}
+func (m *CropHint) XXX_Size() int {
+	return xxx_messageInfo_CropHint.Size(m)
+}
+func (m *CropHint) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CropHint proto.InternalMessageInfo
+
+func (m *CropHint) GetBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.BoundingPoly
+	}
+	return nil
+}
+
+func (m *CropHint) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+func (m *CropHint) GetImportanceFraction() float32 {
+	if m != nil {
+		return m.ImportanceFraction
+	}
+	return 0
+}
+
+// Set of crop hints that are used to generate new crops when serving images.
+type CropHintsAnnotation struct {
+	// Crop hint results.
+	CropHints            []*CropHint `protobuf:"bytes,1,rep,name=crop_hints,json=cropHints,proto3" json:"crop_hints,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
+func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
+func (*CropHintsAnnotation) ProtoMessage()    {}
+func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{13}
+}
+func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
+}
+func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+}
+func (m *CropHintsAnnotation) XXX_Size() int {
+	return xxx_messageInfo_CropHintsAnnotation.Size(m)
+}
+func (m *CropHintsAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHintsAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CropHintsAnnotation proto.InternalMessageInfo
+
+func (m *CropHintsAnnotation) GetCropHints() []*CropHint {
+	if m != nil {
+		return m.CropHints
+	}
+	return nil
+}
+
+// Parameters for crop hints annotation request.
+type CropHintsParams struct {
+	// Aspect ratios in floats, representing the ratio of the width to the height
+	// of the image. For example, if the desired aspect ratio is 4/3, the
+	// corresponding float value should be 1.33333.  If not specified, the
+	// best possible crop is returned. The number of provided aspect ratios is
+	// limited to a maximum of 16; any aspect ratios provided after the 16th are
+	// ignored.
+	AspectRatios         []float32 `protobuf:"fixed32,1,rep,packed,name=aspect_ratios,json=aspectRatios,proto3" json:"aspect_ratios,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
+func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
+func (*CropHintsParams) ProtoMessage()    {}
+func (*CropHintsParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{14}
+}
+func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
+}
+func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
+}
+func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+}
+func (m *CropHintsParams) XXX_Size() int {
+	return xxx_messageInfo_CropHintsParams.Size(m)
+}
+func (m *CropHintsParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHintsParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CropHintsParams proto.InternalMessageInfo
+
+func (m *CropHintsParams) GetAspectRatios() []float32 {
+	if m != nil {
+		return m.AspectRatios
+	}
+	return nil
+}
+
+// Parameters for web detection request.
+type WebDetectionParams struct {
+	// Whether to include results derived from the geo information in the image.
+	IncludeGeoResults    bool     `protobuf:"varint,2,opt,name=include_geo_results,json=includeGeoResults,proto3" json:"include_geo_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
+func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
+func (*WebDetectionParams) ProtoMessage()    {}
+func (*WebDetectionParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{15}
+}
+func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
+}
+func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
+}
+func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+}
+func (m *WebDetectionParams) XXX_Size() int {
+	return xxx_messageInfo_WebDetectionParams.Size(m)
+}
+func (m *WebDetectionParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetectionParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetectionParams proto.InternalMessageInfo
+
+func (m *WebDetectionParams) GetIncludeGeoResults() bool {
+	if m != nil {
+		return m.IncludeGeoResults
+	}
+	return false
+}
+
+// Image context and/or feature-specific parameters.
+type ImageContext struct {
+	// Not used.
+	LatLongRect *LatLongRect `protobuf:"bytes,1,opt,name=lat_long_rect,json=latLongRect,proto3" json:"lat_long_rect,omitempty"`
+	// List of languages to use for TEXT_DETECTION. In most cases, an empty value
+	// yields the best results since it enables automatic language detection. For
+	// languages based on the Latin alphabet, setting `language_hints` is not
+	// needed. In rare cases, when the language of the text in the image is known,
+	// setting a hint will help get better results (although it will be a
+	// significant hindrance if the hint is wrong). Text detection returns an
+	// error if one or more of the specified languages is not one of the
+	// [supported languages](/vision/docs/languages).
+	LanguageHints []string `protobuf:"bytes,2,rep,name=language_hints,json=languageHints,proto3" json:"language_hints,omitempty"`
+	// Parameters for crop hints annotation request.
+	CropHintsParams *CropHintsParams `protobuf:"bytes,4,opt,name=crop_hints_params,json=cropHintsParams,proto3" json:"crop_hints_params,omitempty"`
+	// Parameters for web detection.
+	WebDetectionParams   *WebDetectionParams `protobuf:"bytes,6,opt,name=web_detection_params,json=webDetectionParams,proto3" json:"web_detection_params,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *ImageContext) Reset()         { *m = ImageContext{} }
+func (m *ImageContext) String() string { return proto.CompactTextString(m) }
+func (*ImageContext) ProtoMessage()    {}
+func (*ImageContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{16}
+}
+func (m *ImageContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
+}
+func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
+}
+func (dst *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(dst, src)
+}
+func (m *ImageContext) XXX_Size() int {
+	return xxx_messageInfo_ImageContext.Size(m)
+}
+func (m *ImageContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageContext proto.InternalMessageInfo
+
+func (m *ImageContext) GetLatLongRect() *LatLongRect {
+	if m != nil {
+		return m.LatLongRect
+	}
+	return nil
+}
+
+func (m *ImageContext) GetLanguageHints() []string {
+	if m != nil {
+		return m.LanguageHints
+	}
+	return nil
+}
+
+func (m *ImageContext) GetCropHintsParams() *CropHintsParams {
+	if m != nil {
+		return m.CropHintsParams
+	}
+	return nil
+}
+
+func (m *ImageContext) GetWebDetectionParams() *WebDetectionParams {
+	if m != nil {
+		return m.WebDetectionParams
+	}
+	return nil
+}
+
+// Request for performing Google Cloud Vision API tasks over a user-provided
+// image, with user-requested features.
+type AnnotateImageRequest struct {
+	// The image to be processed.
+	Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
+	// Requested features.
+	Features []*Feature `protobuf:"bytes,2,rep,name=features,proto3" json:"features,omitempty"`
+	// Additional context that may accompany the image.
+	ImageContext         *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext,proto3" json:"image_context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
+func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateImageRequest) ProtoMessage()    {}
+func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{17}
+}
+func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
+}
+func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+}
+func (m *AnnotateImageRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateImageRequest.Size(m)
+}
+func (m *AnnotateImageRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateImageRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateImageRequest proto.InternalMessageInfo
+
+func (m *AnnotateImageRequest) GetImage() *Image {
+	if m != nil {
+		return m.Image
+	}
+	return nil
+}
+
+func (m *AnnotateImageRequest) GetFeatures() []*Feature {
+	if m != nil {
+		return m.Features
+	}
+	return nil
+}
+
+func (m *AnnotateImageRequest) GetImageContext() *ImageContext {
+	if m != nil {
+		return m.ImageContext
+	}
+	return nil
+}
+
+// If an image was produced from a file (e.g. a PDF), this message gives
+// information about the source of that image.
+type ImageAnnotationContext struct {
+	// The URI of the file used to produce the image.
+	Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	// If the file was a PDF or TIFF, this field gives the page number within
+	// the file used to produce the image.
+	PageNumber           int32    `protobuf:"varint,2,opt,name=page_number,json=pageNumber,proto3" json:"page_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImageAnnotationContext) Reset()         { *m = ImageAnnotationContext{} }
+func (m *ImageAnnotationContext) String() string { return proto.CompactTextString(m) }
+func (*ImageAnnotationContext) ProtoMessage()    {}
+func (*ImageAnnotationContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{18}
+}
+func (m *ImageAnnotationContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageAnnotationContext.Unmarshal(m, b)
+}
+func (m *ImageAnnotationContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageAnnotationContext.Marshal(b, m, deterministic)
+}
+func (dst *ImageAnnotationContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAnnotationContext.Merge(dst, src)
+}
+func (m *ImageAnnotationContext) XXX_Size() int {
+	return xxx_messageInfo_ImageAnnotationContext.Size(m)
+}
+func (m *ImageAnnotationContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageAnnotationContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageAnnotationContext proto.InternalMessageInfo
+
+func (m *ImageAnnotationContext) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+func (m *ImageAnnotationContext) GetPageNumber() int32 {
+	if m != nil {
+		return m.PageNumber
+	}
+	return 0
+}
+
+// Response to an image annotation request.
+type AnnotateImageResponse struct {
+	// If present, face detection has completed successfully.
+	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,1,rep,name=face_annotations,json=faceAnnotations,proto3" json:"face_annotations,omitempty"`
+	// If present, landmark detection has completed successfully.
+	LandmarkAnnotations []*EntityAnnotation `protobuf:"bytes,2,rep,name=landmark_annotations,json=landmarkAnnotations,proto3" json:"landmark_annotations,omitempty"`
+	// If present, logo detection has completed successfully.
+	LogoAnnotations []*EntityAnnotation `protobuf:"bytes,3,rep,name=logo_annotations,json=logoAnnotations,proto3" json:"logo_annotations,omitempty"`
+	// If present, label detection has completed successfully.
+	LabelAnnotations []*EntityAnnotation `protobuf:"bytes,4,rep,name=label_annotations,json=labelAnnotations,proto3" json:"label_annotations,omitempty"`
+	// If present, text (OCR) detection has completed successfully.
+	TextAnnotations []*EntityAnnotation `protobuf:"bytes,5,rep,name=text_annotations,json=textAnnotations,proto3" json:"text_annotations,omitempty"`
+	// If present, text (OCR) detection or document (OCR) text detection has
+	// completed successfully.
+	// This annotation provides the structural hierarchy for the OCR detected
+	// text.
+	FullTextAnnotation *TextAnnotation `protobuf:"bytes,12,opt,name=full_text_annotation,json=fullTextAnnotation,proto3" json:"full_text_annotation,omitempty"`
+	// If present, safe-search annotation has completed successfully.
+	SafeSearchAnnotation *SafeSearchAnnotation `protobuf:"bytes,6,opt,name=safe_search_annotation,json=safeSearchAnnotation,proto3" json:"safe_search_annotation,omitempty"`
+	// If present, image properties were extracted successfully.
+	ImagePropertiesAnnotation *ImageProperties `protobuf:"bytes,8,opt,name=image_properties_annotation,json=imagePropertiesAnnotation,proto3" json:"image_properties_annotation,omitempty"`
+	// If present, crop hints have completed successfully.
+	CropHintsAnnotation *CropHintsAnnotation `protobuf:"bytes,11,opt,name=crop_hints_annotation,json=cropHintsAnnotation,proto3" json:"crop_hints_annotation,omitempty"`
+	// If present, web detection has completed successfully.
+	WebDetection *WebDetection `protobuf:"bytes,13,opt,name=web_detection,json=webDetection,proto3" json:"web_detection,omitempty"`
+	// If set, represents the error message for the operation.
+	// Note that filled-in image annotations are guaranteed to be
+	// correct, even when `error` is set.
+	Error *status.Status `protobuf:"bytes,9,opt,name=error,proto3" json:"error,omitempty"`
+	// If present, contextual information is needed to understand where this image
+	// comes from.
+	Context              *ImageAnnotationContext `protobuf:"bytes,21,opt,name=context,proto3" json:"context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
+func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateImageResponse) ProtoMessage()    {}
+func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{19}
+}
+func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
+}
+func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+}
+func (m *AnnotateImageResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateImageResponse.Size(m)
+}
+func (m *AnnotateImageResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateImageResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateImageResponse proto.InternalMessageInfo
+
+func (m *AnnotateImageResponse) GetFaceAnnotations() []*FaceAnnotation {
+	if m != nil {
+		return m.FaceAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetLandmarkAnnotations() []*EntityAnnotation {
+	if m != nil {
+		return m.LandmarkAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetLogoAnnotations() []*EntityAnnotation {
+	if m != nil {
+		return m.LogoAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetLabelAnnotations() []*EntityAnnotation {
+	if m != nil {
+		return m.LabelAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetTextAnnotations() []*EntityAnnotation {
+	if m != nil {
+		return m.TextAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetFullTextAnnotation() *TextAnnotation {
+	if m != nil {
+		return m.FullTextAnnotation
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetSafeSearchAnnotation() *SafeSearchAnnotation {
+	if m != nil {
+		return m.SafeSearchAnnotation
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetImagePropertiesAnnotation() *ImageProperties {
+	if m != nil {
+		return m.ImagePropertiesAnnotation
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetCropHintsAnnotation() *CropHintsAnnotation {
+	if m != nil {
+		return m.CropHintsAnnotation
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetWebDetection() *WebDetection {
+	if m != nil {
+		return m.WebDetection
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetError() *status.Status {
+	if m != nil {
+		return m.Error
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetContext() *ImageAnnotationContext {
+	if m != nil {
+		return m.Context
+	}
+	return nil
+}
+
+// Response to a single file annotation request. A file may contain one or more
+// images, which individually have their own responses.
+type AnnotateFileResponse struct {
+	// Information about the file for which this response is generated.
+	InputConfig *InputConfig `protobuf:"bytes,1,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
+	// Individual responses to images found within the file.
+	Responses            []*AnnotateImageResponse `protobuf:"bytes,2,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *AnnotateFileResponse) Reset()         { *m = AnnotateFileResponse{} }
+func (m *AnnotateFileResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateFileResponse) ProtoMessage()    {}
+func (*AnnotateFileResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{20}
+}
+func (m *AnnotateFileResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateFileResponse.Unmarshal(m, b)
+}
+func (m *AnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateFileResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileResponse.Merge(dst, src)
+}
+func (m *AnnotateFileResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateFileResponse.Size(m)
+}
+func (m *AnnotateFileResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateFileResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateFileResponse proto.InternalMessageInfo
+
+func (m *AnnotateFileResponse) GetInputConfig() *InputConfig {
+	if m != nil {
+		return m.InputConfig
+	}
+	return nil
+}
+
+func (m *AnnotateFileResponse) GetResponses() []*AnnotateImageResponse {
+	if m != nil {
+		return m.Responses
+	}
+	return nil
+}
+
+// Multiple image annotation requests are batched into a single service call.
+type BatchAnnotateImagesRequest struct {
+	// Individual image annotation requests for this batch.
+	Requests             []*AnnotateImageRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesRequest{} }
+func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
+func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{21}
+}
+func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
+}
+func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+}
+func (m *BatchAnnotateImagesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
+}
+func (m *BatchAnnotateImagesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchAnnotateImagesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchAnnotateImagesRequest proto.InternalMessageInfo
+
+func (m *BatchAnnotateImagesRequest) GetRequests() []*AnnotateImageRequest {
+	if m != nil {
+		return m.Requests
+	}
+	return nil
+}
+
+// Response to a batch image annotation request.
+type BatchAnnotateImagesResponse struct {
+	// Individual responses to image annotation requests within the batch.
+	Responses            []*AnnotateImageResponse `protobuf:"bytes,1,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImagesResponse{} }
+func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
+func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{22}
+}
+func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
+}
+func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+}
+func (m *BatchAnnotateImagesResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
+}
+func (m *BatchAnnotateImagesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchAnnotateImagesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchAnnotateImagesResponse proto.InternalMessageInfo
+
+func (m *BatchAnnotateImagesResponse) GetResponses() []*AnnotateImageResponse {
+	if m != nil {
+		return m.Responses
+	}
+	return nil
+}
+
+// An offline file annotation request.
+type AsyncAnnotateFileRequest struct {
+	// Required. Information about the input file.
+	InputConfig *InputConfig `protobuf:"bytes,1,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
+	// Required. Requested features.
+	Features []*Feature `protobuf:"bytes,2,rep,name=features,proto3" json:"features,omitempty"`
+	// Additional context that may accompany the image(s) in the file.
+	ImageContext *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext,proto3" json:"image_context,omitempty"`
+	// Required. The desired output location and metadata (e.g. format).
+	OutputConfig         *OutputConfig `protobuf:"bytes,4,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AsyncAnnotateFileRequest) Reset()         { *m = AsyncAnnotateFileRequest{} }
+func (m *AsyncAnnotateFileRequest) String() string { return proto.CompactTextString(m) }
+func (*AsyncAnnotateFileRequest) ProtoMessage()    {}
+func (*AsyncAnnotateFileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{23}
+}
+func (m *AsyncAnnotateFileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Unmarshal(m, b)
+}
+func (m *AsyncAnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Marshal(b, m, deterministic)
+}
+func (dst *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(dst, src)
+}
+func (m *AsyncAnnotateFileRequest) XXX_Size() int {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Size(m)
+}
+func (m *AsyncAnnotateFileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncAnnotateFileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncAnnotateFileRequest proto.InternalMessageInfo
+
+func (m *AsyncAnnotateFileRequest) GetInputConfig() *InputConfig {
+	if m != nil {
+		return m.InputConfig
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetFeatures() []*Feature {
+	if m != nil {
+		return m.Features
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetImageContext() *ImageContext {
+	if m != nil {
+		return m.ImageContext
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetOutputConfig() *OutputConfig {
+	if m != nil {
+		return m.OutputConfig
+	}
+	return nil
+}
+
+// The response for a single offline file annotation request.
+type AsyncAnnotateFileResponse struct {
+	// The output location and metadata from AsyncAnnotateFileRequest.
+	OutputConfig         *OutputConfig `protobuf:"bytes,1,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AsyncAnnotateFileResponse) Reset()         { *m = AsyncAnnotateFileResponse{} }
+func (m *AsyncAnnotateFileResponse) String() string { return proto.CompactTextString(m) }
+func (*AsyncAnnotateFileResponse) ProtoMessage()    {}
+func (*AsyncAnnotateFileResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{24}
+}
+func (m *AsyncAnnotateFileResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Unmarshal(m, b)
+}
+func (m *AsyncAnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Marshal(b, m, deterministic)
+}
+func (dst *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(dst, src)
+}
+func (m *AsyncAnnotateFileResponse) XXX_Size() int {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Size(m)
+}
+func (m *AsyncAnnotateFileResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncAnnotateFileResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncAnnotateFileResponse proto.InternalMessageInfo
+
+func (m *AsyncAnnotateFileResponse) GetOutputConfig() *OutputConfig {
+	if m != nil {
+		return m.OutputConfig
+	}
+	return nil
+}
+
+// Multiple async file annotation requests are batched into a single service
+// call.
+type AsyncBatchAnnotateFilesRequest struct {
+	// Individual async file annotation requests for this batch.
+	Requests             []*AsyncAnnotateFileRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *AsyncBatchAnnotateFilesRequest) Reset()         { *m = AsyncBatchAnnotateFilesRequest{} }
+func (m *AsyncBatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
+func (*AsyncBatchAnnotateFilesRequest) ProtoMessage()    {}
+func (*AsyncBatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{25}
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Unmarshal(m, b)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Marshal(b, m, deterministic)
+}
+func (dst *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(dst, src)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Size() int {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Size(m)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncBatchAnnotateFilesRequest proto.InternalMessageInfo
+
+func (m *AsyncBatchAnnotateFilesRequest) GetRequests() []*AsyncAnnotateFileRequest {
+	if m != nil {
+		return m.Requests
+	}
+	return nil
+}
+
+// Response to an async batch file annotation request.
+type AsyncBatchAnnotateFilesResponse struct {
+	// The list of file annotation responses, one for each request in
+	// AsyncBatchAnnotateFilesRequest.
+	Responses            []*AsyncAnnotateFileResponse `protobuf:"bytes,1,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *AsyncBatchAnnotateFilesResponse) Reset()         { *m = AsyncBatchAnnotateFilesResponse{} }
+func (m *AsyncBatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
+func (*AsyncBatchAnnotateFilesResponse) ProtoMessage()    {}
+func (*AsyncBatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{26}
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Unmarshal(m, b)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Marshal(b, m, deterministic)
+}
+func (dst *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(dst, src)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Size() int {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Size(m)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncBatchAnnotateFilesResponse proto.InternalMessageInfo
+
+func (m *AsyncBatchAnnotateFilesResponse) GetResponses() []*AsyncAnnotateFileResponse {
+	if m != nil {
+		return m.Responses
+	}
+	return nil
+}
+
+// The desired input location and metadata.
+type InputConfig struct {
+	// The Google Cloud Storage location to read the input from.
+	GcsSource *GcsSource `protobuf:"bytes,1,opt,name=gcs_source,json=gcsSource,proto3" json:"gcs_source,omitempty"`
+	// The type of the file. Currently only "application/pdf" and "image/tiff"
+	// are supported. Wildcards are not supported.
+	MimeType             string   `protobuf:"bytes,2,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InputConfig) Reset()         { *m = InputConfig{} }
+func (m *InputConfig) String() string { return proto.CompactTextString(m) }
+func (*InputConfig) ProtoMessage()    {}
+func (*InputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{27}
+}
+func (m *InputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
+}
+func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
+}
+func (dst *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(dst, src)
+}
+func (m *InputConfig) XXX_Size() int {
+	return xxx_messageInfo_InputConfig.Size(m)
+}
+func (m *InputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InputConfig proto.InternalMessageInfo
+
+func (m *InputConfig) GetGcsSource() *GcsSource {
+	if m != nil {
+		return m.GcsSource
+	}
+	return nil
+}
+
+func (m *InputConfig) GetMimeType() string {
+	if m != nil {
+		return m.MimeType
+	}
+	return ""
+}
+
+// The desired output location and metadata.
+type OutputConfig struct {
+	// The Google Cloud Storage location to write the output(s) to.
+	GcsDestination *GcsDestination `protobuf:"bytes,1,opt,name=gcs_destination,json=gcsDestination,proto3" json:"gcs_destination,omitempty"`
+	// The max number of response protos to put into each output JSON file on GCS.
+	// The valid range is [1, 100]. If not specified, the default value is 20.
+	//
+	// For example, for one pdf file with 100 pages, 100 response protos will
+	// be generated. If `batch_size` = 20, then 5 json files each
+	// containing 20 response protos will be written under the prefix
+	// `gcs_destination`.`uri`.
+	//
+	// Currently, batch_size only applies to GcsDestination, with potential future
+	// support for other output configurations.
+	BatchSize            int32    `protobuf:"varint,2,opt,name=batch_size,json=batchSize,proto3" json:"batch_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
+func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
+func (*OutputConfig) ProtoMessage()    {}
+func (*OutputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{28}
+}
+func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
+}
+func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
+}
+func (dst *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(dst, src)
+}
+func (m *OutputConfig) XXX_Size() int {
+	return xxx_messageInfo_OutputConfig.Size(m)
+}
+func (m *OutputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutputConfig proto.InternalMessageInfo
+
+func (m *OutputConfig) GetGcsDestination() *GcsDestination {
+	if m != nil {
+		return m.GcsDestination
+	}
+	return nil
+}
+
+func (m *OutputConfig) GetBatchSize() int32 {
+	if m != nil {
+		return m.BatchSize
+	}
+	return 0
+}
+
+// The Google Cloud Storage location where the input will be read from.
+type GcsSource struct {
+	// Google Cloud Storage URI for the input file. This must only be a GCS
+	// object. Wildcards are not currently supported.
+	Uri                  string   `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GcsSource) Reset()         { *m = GcsSource{} }
+func (m *GcsSource) String() string { return proto.CompactTextString(m) }
+func (*GcsSource) ProtoMessage()    {}
+func (*GcsSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{29}
+}
+func (m *GcsSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
+}
+func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
+}
+func (dst *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(dst, src)
+}
+func (m *GcsSource) XXX_Size() int {
+	return xxx_messageInfo_GcsSource.Size(m)
+}
+func (m *GcsSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsSource proto.InternalMessageInfo
+
+func (m *GcsSource) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+// The Google Cloud Storage location where the output will be written to.
+type GcsDestination struct {
+	// Google Cloud Storage URI where the results will be stored. Results will
+	// be in JSON format and preceded by its corresponding input URI. This field
+	// can either represent a single file, or a prefix for multiple outputs.
+	// Prefixes must end in a `/`.
+	//
+	// Examples:
+	//
+	// *    File: gs://bucket-name/filename.json
+	// *    Prefix: gs://bucket-name/prefix/here/
+	// *    File: gs://bucket-name/prefix/here
+	//
+	// If multiple outputs, each response is still AnnotateFileResponse, each of
+	// which contains some subset of the full list of AnnotateImageResponse.
+	// Multiple outputs can happen if, for example, the output JSON is too large
+	// and overflows into multiple sharded files.
+	Uri                  string   `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
+func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
+func (*GcsDestination) ProtoMessage()    {}
+func (*GcsDestination) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{30}
+}
+func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
+}
+func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
+}
+func (dst *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(dst, src)
+}
+func (m *GcsDestination) XXX_Size() int {
+	return xxx_messageInfo_GcsDestination.Size(m)
+}
+func (m *GcsDestination) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsDestination.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsDestination proto.InternalMessageInfo
+
+func (m *GcsDestination) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+// Contains metadata for the BatchAnnotateImages operation.
+type OperationMetadata struct {
+	// Current state of the batch operation.
+	State OperationMetadata_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.vision.v1p2beta1.OperationMetadata_State" json:"state,omitempty"`
+	// The time when the batch request was received.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// The time when the operation result was last updated.
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
+func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata) ProtoMessage()    {}
+func (*OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a7aed4b950b6a425, []int{31}
+}
+func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
+}
+func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+}
+func (m *OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata.Size(m)
+}
+func (m *OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationMetadata proto.InternalMessageInfo
+
+func (m *OperationMetadata) GetState() OperationMetadata_State {
+	if m != nil {
+		return m.State
+	}
+	return OperationMetadata_STATE_UNSPECIFIED
+}
+
+func (m *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Feature)(nil), "google.cloud.vision.v1p2beta1.Feature")
+	proto.RegisterType((*ImageSource)(nil), "google.cloud.vision.v1p2beta1.ImageSource")
+	proto.RegisterType((*Image)(nil), "google.cloud.vision.v1p2beta1.Image")
+	proto.RegisterType((*FaceAnnotation)(nil), "google.cloud.vision.v1p2beta1.FaceAnnotation")
+	proto.RegisterType((*FaceAnnotation_Landmark)(nil), "google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark")
+	proto.RegisterType((*LocationInfo)(nil), "google.cloud.vision.v1p2beta1.LocationInfo")
+	proto.RegisterType((*Property)(nil), "google.cloud.vision.v1p2beta1.Property")
+	proto.RegisterType((*EntityAnnotation)(nil), "google.cloud.vision.v1p2beta1.EntityAnnotation")
+	proto.RegisterType((*SafeSearchAnnotation)(nil), "google.cloud.vision.v1p2beta1.SafeSearchAnnotation")
+	proto.RegisterType((*LatLongRect)(nil), "google.cloud.vision.v1p2beta1.LatLongRect")
+	proto.RegisterType((*ColorInfo)(nil), "google.cloud.vision.v1p2beta1.ColorInfo")
+	proto.RegisterType((*DominantColorsAnnotation)(nil), "google.cloud.vision.v1p2beta1.DominantColorsAnnotation")
+	proto.RegisterType((*ImageProperties)(nil), "google.cloud.vision.v1p2beta1.ImageProperties")
+	proto.RegisterType((*CropHint)(nil), "google.cloud.vision.v1p2beta1.CropHint")
+	proto.RegisterType((*CropHintsAnnotation)(nil), "google.cloud.vision.v1p2beta1.CropHintsAnnotation")
+	proto.RegisterType((*CropHintsParams)(nil), "google.cloud.vision.v1p2beta1.CropHintsParams")
+	proto.RegisterType((*WebDetectionParams)(nil), "google.cloud.vision.v1p2beta1.WebDetectionParams")
+	proto.RegisterType((*ImageContext)(nil), "google.cloud.vision.v1p2beta1.ImageContext")
+	proto.RegisterType((*AnnotateImageRequest)(nil), "google.cloud.vision.v1p2beta1.AnnotateImageRequest")
+	proto.RegisterType((*ImageAnnotationContext)(nil), "google.cloud.vision.v1p2beta1.ImageAnnotationContext")
+	proto.RegisterType((*AnnotateImageResponse)(nil), "google.cloud.vision.v1p2beta1.AnnotateImageResponse")
+	proto.RegisterType((*AnnotateFileResponse)(nil), "google.cloud.vision.v1p2beta1.AnnotateFileResponse")
+	proto.RegisterType((*BatchAnnotateImagesRequest)(nil), "google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest")
+	proto.RegisterType((*BatchAnnotateImagesResponse)(nil), "google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse")
+	proto.RegisterType((*AsyncAnnotateFileRequest)(nil), "google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest")
+	proto.RegisterType((*AsyncAnnotateFileResponse)(nil), "google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse")
+	proto.RegisterType((*AsyncBatchAnnotateFilesRequest)(nil), "google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest")
+	proto.RegisterType((*AsyncBatchAnnotateFilesResponse)(nil), "google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse")
+	proto.RegisterType((*InputConfig)(nil), "google.cloud.vision.v1p2beta1.InputConfig")
+	proto.RegisterType((*OutputConfig)(nil), "google.cloud.vision.v1p2beta1.OutputConfig")
+	proto.RegisterType((*GcsSource)(nil), "google.cloud.vision.v1p2beta1.GcsSource")
+	proto.RegisterType((*GcsDestination)(nil), "google.cloud.vision.v1p2beta1.GcsDestination")
+	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.vision.v1p2beta1.OperationMetadata")
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ImageAnnotatorClient is the client API for ImageAnnotator service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ImageAnnotatorClient interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
+	// Run async image detection and annotation for a list of generic files (e.g.
+	// PDF) which may contain multiple pages and multiple images per page.
+	// Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type imageAnnotatorClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
+	return &imageAnnotatorClient{cc}
+}
+
+func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
+	out := new(BatchAnnotateImagesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p2beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *imageAnnotatorClient) AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p2beta1.ImageAnnotator/AsyncBatchAnnotateFiles", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ImageAnnotatorServer is the server API for ImageAnnotator service.
+type ImageAnnotatorServer interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
+	// Run async image detection and annotation for a list of generic files (e.g.
+	// PDF) which may contain multiple pages and multiple images per page.
+	// Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(context.Context, *AsyncBatchAnnotateFilesRequest) (*longrunning.Operation, error)
+}
+
+func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
+	s.RegisterService(&_ImageAnnotator_serviceDesc, srv)
+}
+
+func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchAnnotateImagesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p2beta1.ImageAnnotator/BatchAnnotateImages",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, req.(*BatchAnnotateImagesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ImageAnnotator_AsyncBatchAnnotateFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AsyncBatchAnnotateFilesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p2beta1.ImageAnnotator/AsyncBatchAnnotateFiles",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, req.(*AsyncBatchAnnotateFilesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.vision.v1p2beta1.ImageAnnotator",
+	HandlerType: (*ImageAnnotatorServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "BatchAnnotateImages",
+			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
+		},
+		{
+			MethodName: "AsyncBatchAnnotateFiles",
+			Handler:    _ImageAnnotator_AsyncBatchAnnotateFiles_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/vision/v1p2beta1/image_annotator.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p2beta1/image_annotator.proto", fileDescriptor_image_annotator_a7aed4b950b6a425)
+}
+
+var fileDescriptor_image_annotator_a7aed4b950b6a425 = []byte{
+	// 2899 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x73, 0xdb, 0xc6,
+	0xf5, 0x0f, 0xa9, 0x5f, 0xe4, 0x23, 0x25, 0x41, 0xab, 0x1f, 0xa6, 0x65, 0x2b, 0x56, 0x90, 0x6f,
+	0xbe, 0x55, 0xdd, 0x94, 0x1a, 0xcb, 0x49, 0xda, 0x3a, 0xcd, 0xa4, 0x14, 0x09, 0x49, 0x1c, 0x53,
+	0x24, 0xbb, 0x84, 0xec, 0xd8, 0x93, 0x0e, 0x0a, 0x81, 0x4b, 0x1a, 0x09, 0x08, 0x20, 0x00, 0x68,
+	0x8b, 0x39, 0x66, 0xa6, 0x7f, 0x41, 0x6f, 0xbd, 0x77, 0x7a, 0x6a, 0x2f, 0xed, 0xa5, 0xff, 0x40,
+	0xef, 0x9d, 0x1e, 0x7a, 0xe9, 0xad, 0x3d, 0xf4, 0xd8, 0x53, 0xa7, 0xd3, 0x53, 0x67, 0x7f, 0x00,
+	0x5c, 0x50, 0xb2, 0x29, 0x3a, 0xe9, 0x4c, 0x4f, 0xe2, 0xbe, 0xb7, 0x9f, 0xcf, 0xdb, 0x7d, 0xfb,
+	0xf6, 0xed, 0xdb, 0x85, 0xe0, 0x7e, 0xdf, 0xf3, 0xfa, 0x0e, 0xd9, 0xb7, 0x1c, 0x6f, 0xd8, 0xdd,
+	0x7f, 0x6e, 0x87, 0xb6, 0xe7, 0xee, 0x3f, 0xbf, 0xe7, 0x1f, 0x9c, 0x93, 0xc8, 0xbc, 0xb7, 0x6f,
+	0x0f, 0xcc, 0x3e, 0x31, 0x4c, 0xd7, 0xf5, 0x22, 0x33, 0xf2, 0x82, 0xb2, 0x1f, 0x78, 0x91, 0x87,
+	0x76, 0x38, 0xa8, 0xcc, 0x40, 0x65, 0x0e, 0x2a, 0x27, 0xa0, 0xed, 0xdb, 0x82, 0xd3, 0xf4, 0xed,
+	0x7d, 0x01, 0xb5, 0x3d, 0x37, 0xe4, 0xe0, 0xed, 0x77, 0x5f, 0x6d, 0xb1, 0x4f, 0xbc, 0x01, 0x89,
+	0x82, 0x91, 0xe8, 0x3d, 0x65, 0x7c, 0x11, 0xb9, 0x88, 0x8c, 0xb1, 0x0d, 0x01, 0xba, 0xf7, 0x6a,
+	0xd0, 0x0b, 0x72, 0x6e, 0x74, 0x49, 0x44, 0x2c, 0x09, 0xf2, 0xb6, 0x80, 0x38, 0x9e, 0xdb, 0x0f,
+	0x86, 0xae, 0x6b, 0xbb, 0xfd, 0x7d, 0xcf, 0x27, 0x41, 0x6a, 0xe8, 0x77, 0x44, 0x27, 0xd6, 0x3a,
+	0x1f, 0xf6, 0xf6, 0x23, 0x7b, 0x40, 0xc2, 0xc8, 0x1c, 0xf8, 0xa2, 0xc3, 0x0d, 0xd1, 0x21, 0xf0,
+	0xad, 0xfd, 0x30, 0x32, 0xa3, 0x61, 0x38, 0xa1, 0x88, 0x46, 0x3e, 0xd9, 0xb7, 0x3c, 0x27, 0x76,
+	0xe5, 0x76, 0x49, 0x56, 0x38, 0x66, 0xe4, 0xb8, 0x7d, 0xae, 0x51, 0xff, 0x9d, 0x85, 0xa5, 0x23,
+	0x62, 0x46, 0xc3, 0x80, 0xa0, 0x8f, 0x61, 0x9e, 0x76, 0x28, 0x65, 0x76, 0x33, 0x7b, 0x2b, 0x07,
+	0xdf, 0x29, 0xbf, 0xd2, 0xff, 0x65, 0x81, 0x2a, 0xeb, 0x23, 0x9f, 0x60, 0x06, 0x44, 0x77, 0xa0,
+	0x30, 0x30, 0x2f, 0x8c, 0x80, 0x84, 0x43, 0x27, 0x0a, 0x4b, 0xd9, 0xdd, 0xcc, 0xde, 0x02, 0x86,
+	0x81, 0x79, 0x81, 0xb9, 0x04, 0x6d, 0xc0, 0xc2, 0xc0, 0xeb, 0x12, 0xa7, 0x34, 0xb7, 0x9b, 0xd9,
+	0xcb, 0x63, 0xde, 0x50, 0xff, 0x99, 0x81, 0x79, 0xca, 0x82, 0x36, 0x40, 0xd1, 0x9f, 0xb4, 0x35,
+	0xe3, 0xac, 0xd9, 0x69, 0x6b, 0xd5, 0xfa, 0x51, 0x5d, 0xab, 0x29, 0x6f, 0x20, 0x04, 0x2b, 0x47,
+	0x95, 0xaa, 0x66, 0xd4, 0x34, 0x5d, 0xab, 0xea, 0xf5, 0x56, 0x53, 0xc9, 0xa0, 0x2d, 0x40, 0x8d,
+	0x4a, 0xb3, 0x76, 0x5a, 0xc1, 0x0f, 0x25, 0x79, 0x96, 0xf6, 0x6d, 0xb4, 0x8e, 0x5b, 0x92, 0x6c,
+	0x0e, 0xad, 0xc3, 0x6a, 0xa3, 0x72, 0xa8, 0x35, 0x24, 0xe1, 0x3c, 0xed, 0xa8, 0x6b, 0x9f, 0xe8,
+	0x92, 0x6c, 0x01, 0xdd, 0x82, 0x1b, 0xb5, 0x56, 0xf5, 0xec, 0x54, 0x6b, 0xea, 0xc6, 0x84, 0xb2,
+	0x80, 0x6e, 0xc2, 0x66, 0xa7, 0x72, 0xa4, 0x19, 0x1d, 0xad, 0x82, 0xab, 0x27, 0x92, 0x6a, 0x91,
+	0x0e, 0xbb, 0x7e, 0x5a, 0x39, 0xd6, 0x8c, 0x36, 0x6e, 0xb5, 0x35, 0xac, 0xd7, 0xb5, 0x8e, 0xb2,
+	0x84, 0x56, 0x00, 0xaa, 0xb8, 0xd5, 0x36, 0x4e, 0xea, 0x4d, 0xbd, 0xa3, 0xe4, 0xd1, 0x1a, 0x2c,
+	0x3f, 0xd6, 0x0e, 0x25, 0x20, 0xa8, 0x4d, 0x28, 0xd4, 0x69, 0xe8, 0x77, 0xbc, 0x61, 0x60, 0x11,
+	0xa4, 0xc2, 0x72, 0xdf, 0x0a, 0x0d, 0xbe, 0x1b, 0x86, 0x81, 0xcd, 0x16, 0x22, 0x8f, 0x0b, 0x7d,
+	0x2b, 0x64, 0xdd, 0xce, 0x02, 0x1b, 0xdd, 0x82, 0xfc, 0x58, 0x9f, 0x65, 0xfa, 0x9c, 0x2d, 0x94,
+	0x2a, 0x81, 0x05, 0xd6, 0x11, 0x95, 0x60, 0xc9, 0xf2, 0xdc, 0x88, 0xb8, 0x11, 0xe3, 0x28, 0xe2,
+	0xb8, 0x89, 0x0e, 0x61, 0x31, 0x64, 0xd6, 0x18, 0xb8, 0x70, 0x70, 0x77, 0xca, 0x2a, 0x4b, 0xe3,
+	0xc3, 0x02, 0xa9, 0xfe, 0x52, 0x81, 0x95, 0x23, 0xd3, 0x22, 0x95, 0x64, 0x47, 0xa0, 0x36, 0x2c,
+	0x9f, 0x7b, 0x43, 0xb7, 0x6b, 0xbb, 0x7d, 0xc3, 0xf7, 0x9c, 0x11, 0x33, 0x5b, 0x98, 0x1a, 0x43,
+	0x87, 0x02, 0xd3, 0xf6, 0x9c, 0x11, 0x2e, 0x9e, 0x4b, 0x2d, 0x74, 0x06, 0x4a, 0xaf, 0x6b, 0xa4,
+	0x49, 0xb3, 0xb3, 0x93, 0xae, 0xf4, 0xba, 0x72, 0x1b, 0xe9, 0x90, 0x77, 0x4c, 0xb7, 0x3b, 0x30,
+	0x83, 0xcf, 0xc3, 0xd2, 0xdc, 0xee, 0xdc, 0x5e, 0xe1, 0xe0, 0x83, 0x69, 0x81, 0x9e, 0x9a, 0x6a,
+	0xb9, 0x21, 0xe0, 0x78, 0x4c, 0x84, 0x76, 0x00, 0x02, 0xcf, 0x71, 0x0c, 0xd3, 0xed, 0x3b, 0xa4,
+	0x34, 0xbf, 0x9b, 0xd9, 0xcb, 0xe2, 0x3c, 0x95, 0x54, 0xa8, 0x80, 0x2e, 0x9a, 0x6f, 0xba, 0x42,
+	0xbb, 0xc0, 0xb4, 0x39, 0xdf, 0x74, 0xb9, 0x72, 0x07, 0x20, 0xb2, 0x9d, 0x48, 0x68, 0x17, 0x39,
+	0x96, 0x4a, 0xb8, 0xfa, 0x1e, 0x6c, 0x24, 0x59, 0xc4, 0xb0, 0x3c, 0xb7, 0x67, 0x77, 0x89, 0x6b,
+	0x91, 0xd2, 0x12, 0xeb, 0xb8, 0x9e, 0xe8, 0xaa, 0x89, 0x0a, 0xbd, 0x0f, 0x5b, 0xf1, 0xd0, 0xa8,
+	0xeb, 0x24, 0x50, 0x8e, 0x81, 0x36, 0x25, 0xad, 0x04, 0x6b, 0xc3, 0xca, 0x67, 0xde, 0xc8, 0x70,
+	0xec, 0xcf, 0x89, 0x63, 0x3f, 0xf3, 0xbc, 0x6e, 0x29, 0xcf, 0x12, 0xc1, 0xb7, 0xa7, 0xf8, 0xa7,
+	0x91, 0x00, 0xf0, 0xf2, 0x67, 0xde, 0x68, 0xdc, 0x44, 0x8f, 0x60, 0x2d, 0xf4, 0x82, 0xc0, 0x7b,
+	0x21, 0x93, 0xc2, 0xac, 0xa4, 0x0a, 0xe7, 0x90, 0x78, 0x75, 0x50, 0x4c, 0xb7, 0x4f, 0x02, 0x99,
+	0xb6, 0x30, 0x2b, 0xed, 0x2a, 0xa3, 0x90, 0x58, 0x9f, 0xc2, 0x7a, 0x38, 0x0c, 0xfc, 0xc0, 0x0e,
+	0x89, 0x4c, 0x5c, 0x9c, 0x95, 0x18, 0xc5, 0x2c, 0x12, 0xb7, 0x05, 0xa5, 0xa1, 0xdb, 0x25, 0x81,
+	0x41, 0x2e, 0x7c, 0x2f, 0x24, 0x5d, 0xd9, 0xc0, 0xf2, 0xac, 0x06, 0xb6, 0x18, 0x95, 0xc6, 0x99,
+	0x24, 0x23, 0x9f, 0x00, 0x3a, 0x77, 0x86, 0x41, 0x90, 0xa6, 0x5f, 0x99, 0x95, 0x7e, 0x4d, 0x90,
+	0xa4, 0x5d, 0xf3, 0x8c, 0x98, 0xdd, 0x17, 0xc4, 0x4c, 0xf9, 0x7c, 0x75, 0x66, 0xd7, 0xc4, 0x2c,
+	0x63, 0xd9, 0xf6, 0x9f, 0x97, 0x20, 0x17, 0xef, 0x29, 0xd4, 0x12, 0x47, 0xd0, 0x1c, 0x63, 0xfe,
+	0xf0, 0xf5, 0x76, 0xa6, 0x7c, 0x24, 0x55, 0x21, 0xe7, 0x7b, 0xa1, 0x4d, 0xf5, 0x6c, 0x5f, 0x16,
+	0x0e, 0xbe, 0x35, 0x85, 0xb4, 0x2d, 0xba, 0xe3, 0x04, 0xa8, 0xfe, 0x6e, 0x71, 0x7c, 0x40, 0x9d,
+	0x35, 0x1f, 0x36, 0x5b, 0x8f, 0x9b, 0x46, 0x7c, 0xfc, 0x28, 0x6f, 0xa0, 0x22, 0xe4, 0x1a, 0xda,
+	0x91, 0x6e, 0x68, 0x4f, 0x34, 0x25, 0x83, 0x96, 0x21, 0x8f, 0xeb, 0xc7, 0x27, 0xbc, 0x99, 0x45,
+	0x25, 0xd8, 0x60, 0xca, 0xd6, 0x91, 0x11, 0x77, 0x3a, 0xc4, 0xad, 0xc7, 0xca, 0x1c, 0x3d, 0x51,
+	0x78, 0xc7, 0x49, 0xd5, 0x3c, 0x55, 0xc5, 0xa0, 0x84, 0x8b, 0xa9, 0x16, 0xd0, 0x36, 0x6c, 0x25,
+	0xa8, 0xb4, 0x6e, 0x91, 0xc2, 0x4e, 0xeb, 0xb5, 0x76, 0xab, 0xde, 0xd4, 0x8d, 0x43, 0x4d, 0x7f,
+	0xac, 0x69, 0x4d, 0xaa, 0xa5, 0xa7, 0x51, 0x11, 0x72, 0xcd, 0x56, 0x47, 0x33, 0xf4, 0x7a, 0x5b,
+	0xc9, 0xd1, 0x31, 0x9e, 0xb5, 0xdb, 0x1a, 0x36, 0x1a, 0xf5, 0xb6, 0x92, 0xa7, 0xcd, 0x46, 0xeb,
+	0xb1, 0x68, 0x02, 0x3d, 0xb9, 0x4e, 0x5b, 0x67, 0xfa, 0x09, 0x1b, 0x95, 0x52, 0x40, 0xab, 0x50,
+	0xe0, 0x6d, 0x66, 0x4f, 0x29, 0x22, 0x05, 0x8a, 0x5c, 0x50, 0xd5, 0x9a, 0xba, 0x86, 0x95, 0x65,
+	0xb4, 0x09, 0x6b, 0x8c, 0xfe, 0xb0, 0xa5, 0xeb, 0xad, 0x53, 0xd1, 0x71, 0x85, 0xfa, 0x4b, 0x16,
+	0x33, 0xbe, 0x55, 0x7a, 0x78, 0xcb, 0x52, 0x41, 0xa2, 0x24, 0xb3, 0xd6, 0x9e, 0x68, 0x86, 0xde,
+	0x6a, 0x1b, 0x87, 0xad, 0xb3, 0x66, 0xad, 0x82, 0x9f, 0x28, 0x6b, 0x29, 0x15, 0x9f, 0x75, 0xb5,
+	0x85, 0x9b, 0x1a, 0x56, 0x10, 0xba, 0x0d, 0xa5, 0x44, 0x25, 0x18, 0x13, 0xe0, 0x7a, 0xe2, 0x7e,
+	0xaa, 0x65, 0x3f, 0x04, 0x6e, 0x63, 0xec, 0xc8, 0x4b, 0xe6, 0x36, 0xd3, 0xba, 0x94, 0xbd, 0x2d,
+	0xb4, 0x03, 0x37, 0xc7, 0xba, 0x49, 0x83, 0x37, 0xc6, 0xab, 0x3a, 0x69, 0xb1, 0x84, 0xee, 0xc0,
+	0x2d, 0x79, 0x9d, 0x0d, 0xbe, 0x04, 0xf1, 0x8a, 0x29, 0x37, 0xd1, 0x2e, 0xdc, 0x4e, 0x2d, 0xe9,
+	0x64, 0x8f, 0x6d, 0xea, 0x50, 0x4e, 0x51, 0xc1, 0x86, 0x8e, 0x2b, 0xc7, 0xb4, 0x8e, 0xb8, 0x45,
+	0xbd, 0x2f, 0x70, 0x92, 0xf8, 0x36, 0x2b, 0x86, 0xe2, 0xb9, 0xb7, 0xcf, 0xda, 0xf5, 0x86, 0xb2,
+	0x43, 0x8b, 0xa1, 0xf1, 0xf0, 0xb8, 0xf0, 0x4d, 0x8a, 0x3f, 0x6a, 0x61, 0xed, 0x44, 0xab, 0xd4,
+	0x8c, 0x63, 0x56, 0x2b, 0x35, 0x2a, 0xca, 0x1d, 0x5a, 0xb1, 0x54, 0x4f, 0xea, 0x4d, 0xe3, 0xb8,
+	0x59, 0xd1, 0x4f, 0x28, 0xe5, 0x2e, 0xb5, 0xcf, 0x44, 0x8c, 0xf7, 0xb8, 0xd5, 0xa4, 0xd2, 0xb7,
+	0x28, 0x9e, 0x49, 0x39, 0xb3, 0x10, 0xab, 0xea, 0x0f, 0xa1, 0xd8, 0xf0, 0x2c, 0xb6, 0x37, 0xeb,
+	0x6e, 0xcf, 0x43, 0xef, 0xc2, 0x92, 0x63, 0x46, 0x86, 0xe3, 0xf6, 0x45, 0x79, 0xb0, 0x1e, 0x6f,
+	0x45, 0xba, 0x55, 0xcb, 0x0d, 0x33, 0x6a, 0xb8, 0x7d, 0xbc, 0xe8, 0xb0, 0xbf, 0xea, 0x63, 0xc8,
+	0xb5, 0x03, 0x5a, 0x1c, 0x47, 0x23, 0x84, 0x60, 0xde, 0x35, 0x07, 0x44, 0x14, 0x44, 0xec, 0x37,
+	0xad, 0x25, 0x9f, 0x9b, 0xce, 0x90, 0x88, 0x2a, 0x88, 0x37, 0xd0, 0x5b, 0x50, 0x1c, 0xda, 0x6e,
+	0xf4, 0xc1, 0x7b, 0x06, 0x57, 0xd2, 0x44, 0x32, 0x8f, 0x0b, 0x5c, 0xf6, 0x88, 0x8a, 0xd4, 0x5f,
+	0xcc, 0x81, 0xa2, 0xb9, 0x91, 0x1d, 0x8d, 0xa4, 0x02, 0x46, 0x81, 0xb9, 0x81, 0xdd, 0x15, 0x06,
+	0xe8, 0x4f, 0xb4, 0x05, 0x8b, 0x8e, 0x67, 0x99, 0x4e, 0x6c, 0x40, 0xb4, 0xd0, 0x2e, 0x14, 0xba,
+	0x24, 0xb4, 0x02, 0xdb, 0x67, 0x49, 0x85, 0x57, 0xb2, 0xb2, 0x88, 0x8e, 0x2c, 0xb4, 0xbc, 0x20,
+	0x2e, 0x04, 0x78, 0x03, 0xbd, 0x09, 0x20, 0x9d, 0xc4, 0xbc, 0x0a, 0x90, 0x24, 0x54, 0x1f, 0x79,
+	0xbe, 0x6d, 0x99, 0x8e, 0x1d, 0x8d, 0x44, 0x1d, 0x20, 0x49, 0x2e, 0x97, 0x58, 0x4b, 0x5f, 0xb7,
+	0xc4, 0xaa, 0x43, 0xde, 0x11, 0xeb, 0x13, 0x96, 0x72, 0xac, 0x16, 0x9a, 0xc6, 0x26, 0xaf, 0x27,
+	0x1e, 0xa3, 0xd1, 0x31, 0x80, 0xcf, 0x17, 0xcb, 0x26, 0x61, 0x29, 0xcf, 0xb8, 0xa6, 0x26, 0x5a,
+	0xb1, 0xba, 0x58, 0x82, 0xaa, 0x7f, 0xcd, 0xc2, 0x46, 0xc7, 0xec, 0x91, 0x0e, 0x31, 0x03, 0xeb,
+	0x99, 0xb4, 0x40, 0x1f, 0xc3, 0x82, 0xd9, 0x1d, 0x3a, 0x91, 0xb8, 0x9d, 0xcc, 0x70, 0xe8, 0x70,
+	0x1c, 0x25, 0x08, 0x7d, 0xcf, 0xeb, 0xb1, 0xe5, 0x9c, 0x8d, 0x80, 0xe1, 0x50, 0x15, 0x96, 0x06,
+	0xa4, 0x4b, 0x97, 0x43, 0x1c, 0x4f, 0x33, 0x50, 0xc4, 0x48, 0xa4, 0x41, 0xee, 0xb9, 0xed, 0x39,
+	0x2c, 0x06, 0xe6, 0x67, 0x65, 0x49, 0xa0, 0xe8, 0x23, 0x98, 0x0f, 0x4c, 0x6b, 0x34, 0x7b, 0x85,
+	0xc6, 0x60, 0xea, 0x0b, 0x28, 0xd0, 0xdd, 0xe6, 0xb9, 0x7d, 0x4c, 0xac, 0x08, 0xdd, 0x87, 0xc2,
+	0xc0, 0x76, 0x8d, 0x6b, 0x6c, 0xce, 0xfc, 0xc0, 0x76, 0xf9, 0x4f, 0x06, 0x32, 0x2f, 0x12, 0x50,
+	0xf6, 0x55, 0x20, 0xf3, 0x82, 0xff, 0x54, 0x03, 0xc8, 0x57, 0xe9, 0xbd, 0x94, 0xe5, 0x83, 0x3d,
+	0x58, 0x60, 0x97, 0x54, 0x61, 0x10, 0xa5, 0xb0, 0xac, 0x1b, 0xe6, 0x1d, 0xc6, 0x3b, 0x2a, 0x2b,
+	0xef, 0xa8, 0x77, 0x60, 0xc5, 0xb7, 0x2f, 0x88, 0x63, 0xf4, 0x02, 0xd3, 0x4a, 0x36, 0x63, 0x16,
+	0x2f, 0x33, 0xe9, 0x91, 0x10, 0xaa, 0x9f, 0x42, 0xa9, 0xe6, 0x0d, 0x6c, 0xd7, 0x74, 0x23, 0x46,
+	0x1a, 0x4a, 0x51, 0xf5, 0x23, 0x58, 0x64, 0x16, 0xc2, 0x52, 0x86, 0xc5, 0xec, 0xde, 0x14, 0x4f,
+	0x26, 0x83, 0xc7, 0x02, 0xa7, 0x86, 0xb0, 0xca, 0xee, 0x48, 0xed, 0x24, 0x86, 0xd1, 0x4f, 0x61,
+	0xb5, 0x2b, 0x0c, 0x1a, 0x09, 0x3b, 0x9d, 0xe1, 0xf7, 0xa6, 0xb0, 0xbf, 0x6c, 0x98, 0x78, 0xa5,
+	0x9b, 0xd2, 0xa8, 0xbf, 0xce, 0x40, 0xae, 0x1a, 0x78, 0xfe, 0x89, 0xed, 0x46, 0xff, 0x85, 0xbb,
+	0x57, 0x3a, 0x55, 0x65, 0x2f, 0xa5, 0xaa, 0x7d, 0x58, 0xb7, 0x07, 0xbe, 0x17, 0x44, 0xa6, 0x6b,
+	0x91, 0x49, 0xef, 0xa3, 0xb1, 0x2a, 0x59, 0x82, 0x9f, 0xc0, 0x7a, 0x3c, 0x5c, 0xd9, 0xfb, 0x47,
+	0x00, 0x56, 0xe0, 0xf9, 0xc6, 0x33, 0x2a, 0x17, 0x2b, 0x30, 0x2d, 0x6b, 0xc4, 0x3c, 0x38, 0x6f,
+	0xc5, 0x8c, 0xea, 0x07, 0xb0, 0x9a, 0xd0, 0xb7, 0xcd, 0xc0, 0x1c, 0x84, 0xe8, 0x6d, 0x58, 0x36,
+	0x43, 0x9f, 0x58, 0x91, 0xc1, 0x1e, 0x57, 0x38, 0x7b, 0x16, 0x17, 0xb9, 0x10, 0x33, 0x99, 0x5a,
+	0x03, 0xf4, 0x98, 0x9c, 0xd7, 0xe2, 0x2b, 0x94, 0x80, 0x96, 0x61, 0xdd, 0x76, 0x2d, 0x67, 0xd8,
+	0x25, 0x46, 0x9f, 0x78, 0xa9, 0xd7, 0x8c, 0x1c, 0x5e, 0x13, 0xaa, 0x63, 0xe2, 0x89, 0x47, 0x0d,
+	0xf5, 0x0f, 0x59, 0x28, 0xb2, 0x10, 0xa8, 0xd2, 0x3b, 0xf6, 0x45, 0x84, 0x9a, 0xb0, 0xcc, 0x76,
+	0x85, 0xe7, 0xf6, 0x8d, 0x80, 0x58, 0x91, 0x58, 0x90, 0x69, 0x57, 0x6d, 0x69, 0x47, 0xe2, 0x82,
+	0x23, 0x6d, 0xcf, 0x77, 0x60, 0xc5, 0x31, 0xdd, 0xfe, 0x90, 0x5e, 0xfb, 0xb9, 0xab, 0xb2, 0xbb,
+	0x73, 0x7b, 0x79, 0xbc, 0x1c, 0x4b, 0xd9, 0xc4, 0xd1, 0x53, 0x58, 0x1b, 0x7b, 0xd3, 0xf0, 0xd9,
+	0x64, 0x44, 0xcd, 0x5b, 0xbe, 0xa6, 0x53, 0x85, 0xf7, 0xf0, 0xaa, 0x35, 0xe1, 0x4e, 0x0b, 0x36,
+	0x52, 0xef, 0x59, 0x31, 0xfd, 0x22, 0xa3, 0xbf, 0x37, 0x85, 0xfe, 0xb2, 0x93, 0x31, 0x7a, 0x71,
+	0x49, 0xa6, 0xfe, 0x3d, 0x03, 0x1b, 0x22, 0x3a, 0x08, 0x73, 0x28, 0x26, 0x5f, 0x0c, 0x49, 0x18,
+	0xa1, 0x07, 0xb0, 0xc0, 0xde, 0x38, 0x84, 0x23, 0xff, 0xef, 0x3a, 0x6f, 0x16, 0x98, 0x43, 0xd0,
+	0x21, 0xe4, 0x7a, 0xfc, 0xa5, 0x8a, 0xbb, 0xad, 0x70, 0xf0, 0xff, 0xd7, 0x7b, 0xd8, 0xc2, 0x09,
+	0x8e, 0xee, 0x30, 0xfe, 0xe8, 0x62, 0xf1, 0x15, 0x66, 0x91, 0x3e, 0x7d, 0x87, 0xc9, 0x41, 0x81,
+	0x8b, 0xb6, 0xd4, 0x52, 0x1f, 0xc2, 0x16, 0xd3, 0x8e, 0x37, 0x43, 0x1c, 0x3c, 0x0a, 0xcc, 0x8d,
+	0x9f, 0x7e, 0xe8, 0x4f, 0x74, 0x07, 0x0a, 0x3e, 0x35, 0xee, 0x0e, 0x07, 0xe7, 0x24, 0x88, 0x5f,
+	0xd5, 0xa8, 0xa8, 0xc9, 0x24, 0xea, 0x5f, 0x72, 0xb0, 0x39, 0xe1, 0xb7, 0xd0, 0xf7, 0xdc, 0x90,
+	0xa0, 0x4f, 0x40, 0xe9, 0x99, 0x16, 0x91, 0xde, 0x2e, 0xe3, 0x6d, 0xf6, 0xdd, 0x99, 0xae, 0x56,
+	0x78, 0xb5, 0x97, 0x6a, 0x87, 0xe8, 0x1c, 0x36, 0xe2, 0x57, 0x84, 0x14, 0x3b, 0x77, 0xf1, 0xfe,
+	0x14, 0xf6, 0xc9, 0xf2, 0x0b, 0xaf, 0xc7, 0x64, 0xb2, 0x8d, 0xa7, 0xa0, 0x38, 0x5e, 0xdf, 0x4b,
+	0xf1, 0xcf, 0xbd, 0x1e, 0xff, 0x2a, 0x25, 0x92, 0xb9, 0x3f, 0x85, 0x35, 0xc7, 0x3c, 0x27, 0x4e,
+	0x8a, 0x7c, 0xfe, 0xf5, 0xc8, 0x15, 0xc6, 0x34, 0x31, 0xf2, 0x89, 0x37, 0xe3, 0xb0, 0xb4, 0xf0,
+	0x9a, 0x23, 0xa7, 0x44, 0x32, 0xb7, 0x01, 0x1b, 0xbd, 0xa1, 0xe3, 0x18, 0x13, 0x06, 0xd8, 0x3b,
+	0xc5, 0xf4, 0x75, 0xd5, 0x53, 0x6c, 0x18, 0x51, 0xaa, 0xb4, 0x0c, 0xd9, 0xb0, 0x15, 0x9a, 0x3d,
+	0x62, 0x84, 0xac, 0x04, 0x93, 0x4d, 0xf0, 0xdd, 0x7e, 0x7f, 0x8a, 0x89, 0xab, 0xca, 0x37, 0xbc,
+	0x11, 0x5e, 0x55, 0xd4, 0xb9, 0x70, 0x8b, 0x6f, 0xac, 0x71, 0x05, 0x28, 0xdb, 0xcb, 0x5d, 0x2b,
+	0x79, 0x4d, 0x1c, 0xbf, 0xf8, 0xa6, 0x9d, 0x16, 0x48, 0xf6, 0x7a, 0xb0, 0x29, 0xa5, 0x48, 0xc9,
+	0x52, 0x81, 0x59, 0x3a, 0xb8, 0x6e, 0x9a, 0x94, 0x23, 0xd7, 0xba, 0xe2, 0x60, 0x6b, 0xc3, 0x72,
+	0x2a, 0x5d, 0xb2, 0x37, 0x9e, 0xe9, 0x09, 0x43, 0xce, 0x93, 0xb8, 0x28, 0x67, 0x48, 0x5a, 0x2b,
+	0x91, 0x20, 0xf0, 0x02, 0x56, 0xf1, 0x49, 0xb5, 0x52, 0xe0, 0x5b, 0xe5, 0x0e, 0xfb, 0x06, 0x80,
+	0x79, 0x07, 0xd4, 0x12, 0x6f, 0xbf, 0x17, 0x51, 0x69, 0x93, 0xf5, 0x7d, 0xff, 0x3a, 0xfe, 0xbb,
+	0x94, 0x88, 0x70, 0xcc, 0xa2, 0xfe, 0x5e, 0x4a, 0xcb, 0x47, 0xb6, 0x33, 0xce, 0x2e, 0xa7, 0x50,
+	0xb4, 0x5d, 0x7f, 0x18, 0xf1, 0x17, 0xc6, 0xfe, 0x35, 0x8f, 0xb9, 0x3a, 0x85, 0xb0, 0x67, 0xc7,
+	0x3e, 0x2e, 0xd8, 0xe3, 0x06, 0xc2, 0x90, 0x0f, 0x04, 0x75, 0x9c, 0x47, 0xde, 0x9b, 0xc2, 0x75,
+	0x65, 0xd6, 0xc3, 0x63, 0x1a, 0x75, 0x00, 0xdb, 0x87, 0x66, 0x94, 0xc4, 0x1c, 0xef, 0x18, 0xc6,
+	0xe7, 0x4a, 0x0b, 0x72, 0x01, 0xff, 0x19, 0xa7, 0xc5, 0xfb, 0xb3, 0x19, 0x64, 0x58, 0x9c, 0x90,
+	0xa8, 0x5f, 0xc0, 0xad, 0x2b, 0xcd, 0x09, 0x87, 0xa5, 0x66, 0x98, 0xf9, 0x66, 0x66, 0xf8, 0xc7,
+	0x2c, 0x94, 0x2a, 0xe1, 0xc8, 0xb5, 0xd2, 0x4b, 0xc4, 0x27, 0xf8, 0x0d, 0xaf, 0xd0, 0xff, 0xe4,
+	0x59, 0x4a, 0x19, 0xbd, 0x61, 0x24, 0xcd, 0x72, 0xfe, 0x5a, 0x8c, 0x2d, 0x86, 0x11, 0xd3, 0x2c,
+	0x7a, 0x52, 0x4b, 0x1d, 0xc0, 0xcd, 0x2b, 0x5c, 0x2a, 0x16, 0xf1, 0x92, 0xb9, 0xcc, 0xd7, 0x35,
+	0x37, 0x84, 0x37, 0x99, 0xb9, 0x54, 0xe8, 0x50, 0x9b, 0x49, 0xa0, 0x76, 0x2e, 0x05, 0xea, 0xb4,
+	0xab, 0xc4, 0xcb, 0x42, 0x42, 0x0a, 0xd6, 0x11, 0xdc, 0x79, 0xa9, 0x59, 0x31, 0xd7, 0x47, 0x97,
+	0x03, 0xf6, 0xfb, 0xb3, 0x1b, 0xbe, 0x1c, 0xb4, 0x21, 0x14, 0xa4, 0x20, 0x43, 0xc7, 0x00, 0x7d,
+	0x2b, 0x34, 0xc4, 0x87, 0x29, 0xee, 0xcf, 0x69, 0x37, 0xb1, 0x63, 0x2b, 0x14, 0x9f, 0xa5, 0xf2,
+	0xfd, 0xf8, 0x27, 0xba, 0x05, 0xf9, 0x81, 0x3d, 0x20, 0x06, 0x7b, 0x43, 0x16, 0x5f, 0xc7, 0xa8,
+	0x40, 0x1f, 0xf9, 0x44, 0xfd, 0x59, 0x06, 0x8a, 0xf2, 0x2a, 0xa0, 0x47, 0xb0, 0x4a, 0xcd, 0x76,
+	0x49, 0x18, 0xd9, 0x2e, 0x3f, 0x07, 0x32, 0xd7, 0x3a, 0x44, 0x8f, 0xad, 0xb0, 0x36, 0x06, 0xe1,
+	0x95, 0x7e, 0xaa, 0x8d, 0x76, 0x00, 0xce, 0xa9, 0x4f, 0x8d, 0xd0, 0xfe, 0x92, 0x88, 0x7a, 0x2d,
+	0xcf, 0x24, 0x1d, 0xfb, 0x4b, 0xa2, 0xee, 0x40, 0x3e, 0x19, 0xfc, 0xe5, 0x72, 0x4f, 0x55, 0x61,
+	0x25, 0xcd, 0x7f, 0x45, 0x9f, 0xdf, 0x64, 0x61, 0xad, 0x15, 0x7f, 0x37, 0x3e, 0x25, 0x91, 0xd9,
+	0x35, 0x23, 0x13, 0x35, 0x60, 0x21, 0xa4, 0x5e, 0x17, 0x4f, 0x24, 0xd3, 0xbe, 0x6b, 0x5d, 0x22,
+	0x60, 0x07, 0x09, 0xc1, 0x9c, 0x04, 0x7d, 0x08, 0x05, 0x2b, 0x20, 0x66, 0x44, 0x8c, 0xc8, 0x1e,
+	0xf0, 0x07, 0xab, 0xc2, 0xc1, 0x76, 0xcc, 0x19, 0x7f, 0x9c, 0x2e, 0xeb, 0xf1, 0xc7, 0x69, 0x0c,
+	0xbc, 0x3b, 0x15, 0x50, 0xf0, 0xd0, 0xef, 0x26, 0xe0, 0xc5, 0xe9, 0x60, 0xde, 0x9d, 0x0a, 0xd4,
+	0x1f, 0xc3, 0x02, 0x1b, 0x09, 0xda, 0x84, 0xb5, 0x8e, 0x5e, 0xd1, 0x27, 0x3f, 0x08, 0x17, 0x60,
+	0xa9, 0x8a, 0xb5, 0x8a, 0xae, 0xd5, 0x94, 0x0c, 0x6d, 0xe0, 0xb3, 0x66, 0xb3, 0xde, 0x3c, 0x56,
+	0xb2, 0x28, 0x07, 0xf3, 0xb5, 0x56, 0x53, 0x53, 0xe6, 0xd0, 0x32, 0xe4, 0xab, 0x95, 0x66, 0x55,
+	0x6b, 0x34, 0xb4, 0x9a, 0x32, 0x7f, 0x97, 0x00, 0x48, 0x9f, 0x33, 0x0a, 0xb0, 0x24, 0x9e, 0xf1,
+	0x95, 0x37, 0xd0, 0x1a, 0x2c, 0x3f, 0xd2, 0xf0, 0x13, 0xe3, 0xac, 0xd9, 0xa8, 0x3f, 0xd4, 0x1a,
+	0x4f, 0x94, 0x0c, 0x2a, 0x42, 0x2e, 0x69, 0x65, 0x69, 0xab, 0xdd, 0xea, 0x74, 0xea, 0x87, 0x0d,
+	0x4a, 0x0c, 0xb0, 0x28, 0x34, 0xf3, 0x68, 0x15, 0x0a, 0x0c, 0x2a, 0x04, 0x0b, 0x07, 0xff, 0xc8,
+	0xc2, 0x8a, 0x7c, 0x9c, 0x7a, 0x01, 0xfa, 0x6d, 0x06, 0xd6, 0xaf, 0x38, 0x13, 0xd0, 0x0f, 0xa6,
+	0x5d, 0xcf, 0x5f, 0x7a, 0x6c, 0x6d, 0x3f, 0x78, 0x1d, 0x28, 0xdf, 0x7a, 0xea, 0x3b, 0x5f, 0xfd,
+	0xe9, 0x6f, 0x3f, 0xcf, 0xde, 0x51, 0xb7, 0x27, 0xff, 0xfd, 0x22, 0x7c, 0x20, 0xca, 0x21, 0xf2,
+	0x20, 0x73, 0x17, 0xfd, 0x2a, 0x03, 0x37, 0x5e, 0x92, 0x1c, 0xd0, 0x47, 0xd7, 0xc9, 0x00, 0x2f,
+	0xcd, 0x65, 0xdb, 0x3b, 0x31, 0x5c, 0xfa, 0x27, 0x88, 0x71, 0x2c, 0xaa, 0x65, 0x36, 0xc0, 0x3d,
+	0xf5, 0x6d, 0x69, 0x80, 0x3d, 0x8a, 0x7f, 0x60, 0x5e, 0xe2, 0x7d, 0x90, 0xb9, 0x7b, 0xf8, 0x55,
+	0x06, 0xde, 0xb2, 0xbc, 0xc1, 0xab, 0xc7, 0x74, 0xb8, 0x9e, 0x5e, 0x95, 0x36, 0x0d, 0xc0, 0x76,
+	0xe6, 0x69, 0x55, 0xa0, 0xfa, 0x1e, 0xbd, 0x4a, 0x97, 0xbd, 0xa0, 0xbf, 0xdf, 0x27, 0x2e, 0x0b,
+	0xcf, 0x7d, 0xae, 0x32, 0x7d, 0x3b, 0x7c, 0xc9, 0x7f, 0x78, 0x7c, 0xc8, 0x05, 0xff, 0xca, 0x64,
+	0xce, 0x17, 0x19, 0xe4, 0xfe, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xcd, 0x74, 0xeb, 0xe8,
+	0x22, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go
new file mode 100644
index 00000000..494bf919
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/text_annotation.pb.go
@@ -0,0 +1,797 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p2beta1/text_annotation.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Enum to denote the type of break found. New line, space etc.
+type TextAnnotation_DetectedBreak_BreakType int32
+
+const (
+	// Unknown break label type.
+	TextAnnotation_DetectedBreak_UNKNOWN TextAnnotation_DetectedBreak_BreakType = 0
+	// Regular space.
+	TextAnnotation_DetectedBreak_SPACE TextAnnotation_DetectedBreak_BreakType = 1
+	// Sure space (very wide).
+	TextAnnotation_DetectedBreak_SURE_SPACE TextAnnotation_DetectedBreak_BreakType = 2
+	// Line-wrapping break.
+	TextAnnotation_DetectedBreak_EOL_SURE_SPACE TextAnnotation_DetectedBreak_BreakType = 3
+	// End-line hyphen that is not present in text; does not co-occur with
+	// `SPACE`, `LEADER_SPACE`, or `LINE_BREAK`.
+	TextAnnotation_DetectedBreak_HYPHEN TextAnnotation_DetectedBreak_BreakType = 4
+	// Line break that ends a paragraph.
+	TextAnnotation_DetectedBreak_LINE_BREAK TextAnnotation_DetectedBreak_BreakType = 5
+)
+
+var TextAnnotation_DetectedBreak_BreakType_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "SPACE",
+	2: "SURE_SPACE",
+	3: "EOL_SURE_SPACE",
+	4: "HYPHEN",
+	5: "LINE_BREAK",
+}
+var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
+	"UNKNOWN":        0,
+	"SPACE":          1,
+	"SURE_SPACE":     2,
+	"EOL_SURE_SPACE": 3,
+	"HYPHEN":         4,
+	"LINE_BREAK":     5,
+}
+
+func (x TextAnnotation_DetectedBreak_BreakType) String() string {
+	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
+}
+func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{0, 1, 0}
+}
+
+// Type of a block (text, image etc) as identified by OCR.
+type Block_BlockType int32
+
+const (
+	// Unknown block type.
+	Block_UNKNOWN Block_BlockType = 0
+	// Regular text block.
+	Block_TEXT Block_BlockType = 1
+	// Table block.
+	Block_TABLE Block_BlockType = 2
+	// Image block.
+	Block_PICTURE Block_BlockType = 3
+	// Horizontal/vertical line box.
+	Block_RULER Block_BlockType = 4
+	// Barcode block.
+	Block_BARCODE Block_BlockType = 5
+)
+
+var Block_BlockType_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "TEXT",
+	2: "TABLE",
+	3: "PICTURE",
+	4: "RULER",
+	5: "BARCODE",
+}
+var Block_BlockType_value = map[string]int32{
+	"UNKNOWN": 0,
+	"TEXT":    1,
+	"TABLE":   2,
+	"PICTURE": 3,
+	"RULER":   4,
+	"BARCODE": 5,
+}
+
+func (x Block_BlockType) String() string {
+	return proto.EnumName(Block_BlockType_name, int32(x))
+}
+func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{2, 0}
+}
+
+// TextAnnotation contains a structured representation of OCR extracted text.
+// The hierarchy of an OCR extracted text structure is like this:
+//     TextAnnotation -> Page -> Block -> Paragraph -> Word -> Symbol
+// Each structural component, starting from Page, may further have their own
+// properties. Properties describe detected languages, breaks etc.. Please refer
+// to the [TextAnnotation.TextProperty][google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty] message definition below for more
+// detail.
+type TextAnnotation struct {
+	// List of pages detected by OCR.
+	Pages []*Page `protobuf:"bytes,1,rep,name=pages,proto3" json:"pages,omitempty"`
+	// UTF-8 text detected on the pages.
+	Text                 string   `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
+func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation) ProtoMessage()    {}
+func (*TextAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{0}
+}
+func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
+}
+func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+}
+func (m *TextAnnotation) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation.Size(m)
+}
+func (m *TextAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation proto.InternalMessageInfo
+
+func (m *TextAnnotation) GetPages() []*Page {
+	if m != nil {
+		return m.Pages
+	}
+	return nil
+}
+
+func (m *TextAnnotation) GetText() string {
+	if m != nil {
+		return m.Text
+	}
+	return ""
+}
+
+// Detected language for a structural component.
+type TextAnnotation_DetectedLanguage struct {
+	// The BCP-47 language code, such as "en-US" or "sr-Latn". For more
+	// information, see
+	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
+	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Confidence of detected language. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_DetectedLanguage{} }
+func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
+func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{0, 0}
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation_DetectedLanguage proto.InternalMessageInfo
+
+func (m *TextAnnotation_DetectedLanguage) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *TextAnnotation_DetectedLanguage) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Detected start or end of a structural component.
+type TextAnnotation_DetectedBreak struct {
+	// Detected break type.
+	Type TextAnnotation_DetectedBreak_BreakType `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.vision.v1p2beta1.TextAnnotation_DetectedBreak_BreakType" json:"type,omitempty"`
+	// True if break prepends the element.
+	IsPrefix             bool     `protobuf:"varint,2,opt,name=is_prefix,json=isPrefix,proto3" json:"is_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_DetectedBreak{} }
+func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
+func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{0, 1}
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation_DetectedBreak proto.InternalMessageInfo
+
+func (m *TextAnnotation_DetectedBreak) GetType() TextAnnotation_DetectedBreak_BreakType {
+	if m != nil {
+		return m.Type
+	}
+	return TextAnnotation_DetectedBreak_UNKNOWN
+}
+
+func (m *TextAnnotation_DetectedBreak) GetIsPrefix() bool {
+	if m != nil {
+		return m.IsPrefix
+	}
+	return false
+}
+
+// Additional information detected on the structural component.
+type TextAnnotation_TextProperty struct {
+	// A list of detected languages together with confidence.
+	DetectedLanguages []*TextAnnotation_DetectedLanguage `protobuf:"bytes,1,rep,name=detected_languages,json=detectedLanguages,proto3" json:"detected_languages,omitempty"`
+	// Detected start or end of a text segment.
+	DetectedBreak        *TextAnnotation_DetectedBreak `protobuf:"bytes,2,opt,name=detected_break,json=detectedBreak,proto3" json:"detected_break,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_TextProperty{} }
+func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_TextProperty) ProtoMessage()    {}
+func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{0, 2}
+}
+func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
+}
+func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+}
+func (m *TextAnnotation_TextProperty) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
+}
+func (m *TextAnnotation_TextProperty) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_TextProperty.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation_TextProperty proto.InternalMessageInfo
+
+func (m *TextAnnotation_TextProperty) GetDetectedLanguages() []*TextAnnotation_DetectedLanguage {
+	if m != nil {
+		return m.DetectedLanguages
+	}
+	return nil
+}
+
+func (m *TextAnnotation_TextProperty) GetDetectedBreak() *TextAnnotation_DetectedBreak {
+	if m != nil {
+		return m.DetectedBreak
+	}
+	return nil
+}
+
+// Detected page from OCR.
+type Page struct {
+	// Additional information detected on the page.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// Page width. For PDFs the unit is points. For images (including
+	// TIFFs) the unit is pixels.
+	Width int32 `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"`
+	// Page height. For PDFs the unit is points. For images (including
+	// TIFFs) the unit is pixels.
+	Height int32 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
+	// List of blocks of text, images etc on this page.
+	Blocks []*Block `protobuf:"bytes,4,rep,name=blocks,proto3" json:"blocks,omitempty"`
+	// Confidence of the OCR results on the page. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Page) Reset()         { *m = Page{} }
+func (m *Page) String() string { return proto.CompactTextString(m) }
+func (*Page) ProtoMessage()    {}
+func (*Page) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{1}
+}
+func (m *Page) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Page.Unmarshal(m, b)
+}
+func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
+}
+func (dst *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(dst, src)
+}
+func (m *Page) XXX_Size() int {
+	return xxx_messageInfo_Page.Size(m)
+}
+func (m *Page) XXX_DiscardUnknown() {
+	xxx_messageInfo_Page.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Page proto.InternalMessageInfo
+
+func (m *Page) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Page) GetWidth() int32 {
+	if m != nil {
+		return m.Width
+	}
+	return 0
+}
+
+func (m *Page) GetHeight() int32 {
+	if m != nil {
+		return m.Height
+	}
+	return 0
+}
+
+func (m *Page) GetBlocks() []*Block {
+	if m != nil {
+		return m.Blocks
+	}
+	return nil
+}
+
+func (m *Page) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Logical element on the page.
+type Block struct {
+	// Additional information detected for the block.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// The bounding box for the block.
+	// The vertices are in the order of top-left, top-right, bottom-right,
+	// bottom-left. When a rotation of the bounding box is detected the rotation
+	// is represented as around the top-left corner as defined when the text is
+	// read in the 'natural' orientation.
+	// For example:
+	//
+	// * when the text is horizontal it might look like:
+	//
+	//         0----1
+	//         |    |
+	//         3----2
+	//
+	// * when it's rotated 180 degrees around the top-left corner it becomes:
+	//
+	//         2----3
+	//         |    |
+	//         1----0
+	//
+	//   and the vertice order will still be (0, 1, 2, 3).
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
+	// List of paragraphs in this block (if this blocks is of type text).
+	Paragraphs []*Paragraph `protobuf:"bytes,3,rep,name=paragraphs,proto3" json:"paragraphs,omitempty"`
+	// Detected block type (text, image etc) for this block.
+	BlockType Block_BlockType `protobuf:"varint,4,opt,name=block_type,json=blockType,proto3,enum=google.cloud.vision.v1p2beta1.Block_BlockType" json:"block_type,omitempty"`
+	// Confidence of the OCR results on the block. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Block) Reset()         { *m = Block{} }
+func (m *Block) String() string { return proto.CompactTextString(m) }
+func (*Block) ProtoMessage()    {}
+func (*Block) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{2}
+}
+func (m *Block) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Block.Unmarshal(m, b)
+}
+func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
+}
+func (dst *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(dst, src)
+}
+func (m *Block) XXX_Size() int {
+	return xxx_messageInfo_Block.Size(m)
+}
+func (m *Block) XXX_DiscardUnknown() {
+	xxx_messageInfo_Block.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Block proto.InternalMessageInfo
+
+func (m *Block) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Block) GetBoundingBox() *BoundingPoly {
+	if m != nil {
+		return m.BoundingBox
+	}
+	return nil
+}
+
+func (m *Block) GetParagraphs() []*Paragraph {
+	if m != nil {
+		return m.Paragraphs
+	}
+	return nil
+}
+
+func (m *Block) GetBlockType() Block_BlockType {
+	if m != nil {
+		return m.BlockType
+	}
+	return Block_UNKNOWN
+}
+
+func (m *Block) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Structural unit of text representing a number of words in certain order.
+type Paragraph struct {
+	// Additional information detected for the paragraph.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// The bounding box for the paragraph.
+	// The vertices are in the order of top-left, top-right, bottom-right,
+	// bottom-left. When a rotation of the bounding box is detected the rotation
+	// is represented as around the top-left corner as defined when the text is
+	// read in the 'natural' orientation.
+	// For example:
+	//   * when the text is horizontal it might look like:
+	//      0----1
+	//      |    |
+	//      3----2
+	//   * when it's rotated 180 degrees around the top-left corner it becomes:
+	//      2----3
+	//      |    |
+	//      1----0
+	//   and the vertice order will still be (0, 1, 2, 3).
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
+	// List of words in this paragraph.
+	Words []*Word `protobuf:"bytes,3,rep,name=words,proto3" json:"words,omitempty"`
+	// Confidence of the OCR results for the paragraph. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Paragraph) Reset()         { *m = Paragraph{} }
+func (m *Paragraph) String() string { return proto.CompactTextString(m) }
+func (*Paragraph) ProtoMessage()    {}
+func (*Paragraph) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{3}
+}
+func (m *Paragraph) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
+}
+func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
+}
+func (dst *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(dst, src)
+}
+func (m *Paragraph) XXX_Size() int {
+	return xxx_messageInfo_Paragraph.Size(m)
+}
+func (m *Paragraph) XXX_DiscardUnknown() {
+	xxx_messageInfo_Paragraph.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Paragraph proto.InternalMessageInfo
+
+func (m *Paragraph) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Paragraph) GetBoundingBox() *BoundingPoly {
+	if m != nil {
+		return m.BoundingBox
+	}
+	return nil
+}
+
+func (m *Paragraph) GetWords() []*Word {
+	if m != nil {
+		return m.Words
+	}
+	return nil
+}
+
+func (m *Paragraph) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// A word representation.
+type Word struct {
+	// Additional information detected for the word.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// The bounding box for the word.
+	// The vertices are in the order of top-left, top-right, bottom-right,
+	// bottom-left. When a rotation of the bounding box is detected the rotation
+	// is represented as around the top-left corner as defined when the text is
+	// read in the 'natural' orientation.
+	// For example:
+	//   * when the text is horizontal it might look like:
+	//      0----1
+	//      |    |
+	//      3----2
+	//   * when it's rotated 180 degrees around the top-left corner it becomes:
+	//      2----3
+	//      |    |
+	//      1----0
+	//   and the vertice order will still be (0, 1, 2, 3).
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
+	// List of symbols in the word.
+	// The order of the symbols follows the natural reading order.
+	Symbols []*Symbol `protobuf:"bytes,3,rep,name=symbols,proto3" json:"symbols,omitempty"`
+	// Confidence of the OCR results for the word. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Word) Reset()         { *m = Word{} }
+func (m *Word) String() string { return proto.CompactTextString(m) }
+func (*Word) ProtoMessage()    {}
+func (*Word) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{4}
+}
+func (m *Word) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Word.Unmarshal(m, b)
+}
+func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
+}
+func (dst *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(dst, src)
+}
+func (m *Word) XXX_Size() int {
+	return xxx_messageInfo_Word.Size(m)
+}
+func (m *Word) XXX_DiscardUnknown() {
+	xxx_messageInfo_Word.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Word proto.InternalMessageInfo
+
+func (m *Word) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Word) GetBoundingBox() *BoundingPoly {
+	if m != nil {
+		return m.BoundingBox
+	}
+	return nil
+}
+
+func (m *Word) GetSymbols() []*Symbol {
+	if m != nil {
+		return m.Symbols
+	}
+	return nil
+}
+
+func (m *Word) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// A single symbol representation.
+type Symbol struct {
+	// Additional information detected for the symbol.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// The bounding box for the symbol.
+	// The vertices are in the order of top-left, top-right, bottom-right,
+	// bottom-left. When a rotation of the bounding box is detected the rotation
+	// is represented as around the top-left corner as defined when the text is
+	// read in the 'natural' orientation.
+	// For example:
+	//   * when the text is horizontal it might look like:
+	//      0----1
+	//      |    |
+	//      3----2
+	//   * when it's rotated 180 degrees around the top-left corner it becomes:
+	//      2----3
+	//      |    |
+	//      1----0
+	//   and the vertice order will still be (0, 1, 2, 3).
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
+	// The actual UTF-8 representation of the symbol.
+	Text string `protobuf:"bytes,3,opt,name=text,proto3" json:"text,omitempty"`
+	// Confidence of the OCR results for the symbol. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Symbol) Reset()         { *m = Symbol{} }
+func (m *Symbol) String() string { return proto.CompactTextString(m) }
+func (*Symbol) ProtoMessage()    {}
+func (*Symbol) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_8d9193533acd557d, []int{5}
+}
+func (m *Symbol) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Symbol.Unmarshal(m, b)
+}
+func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
+}
+func (dst *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(dst, src)
+}
+func (m *Symbol) XXX_Size() int {
+	return xxx_messageInfo_Symbol.Size(m)
+}
+func (m *Symbol) XXX_DiscardUnknown() {
+	xxx_messageInfo_Symbol.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Symbol proto.InternalMessageInfo
+
+func (m *Symbol) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Symbol) GetBoundingBox() *BoundingPoly {
+	if m != nil {
+		return m.BoundingBox
+	}
+	return nil
+}
+
+func (m *Symbol) GetText() string {
+	if m != nil {
+		return m.Text
+	}
+	return ""
+}
+
+func (m *Symbol) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.vision.v1p2beta1.TextAnnotation")
+	proto.RegisterType((*TextAnnotation_DetectedLanguage)(nil), "google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage")
+	proto.RegisterType((*TextAnnotation_DetectedBreak)(nil), "google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak")
+	proto.RegisterType((*TextAnnotation_TextProperty)(nil), "google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty")
+	proto.RegisterType((*Page)(nil), "google.cloud.vision.v1p2beta1.Page")
+	proto.RegisterType((*Block)(nil), "google.cloud.vision.v1p2beta1.Block")
+	proto.RegisterType((*Paragraph)(nil), "google.cloud.vision.v1p2beta1.Paragraph")
+	proto.RegisterType((*Word)(nil), "google.cloud.vision.v1p2beta1.Word")
+	proto.RegisterType((*Symbol)(nil), "google.cloud.vision.v1p2beta1.Symbol")
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
+	proto.RegisterEnum("google.cloud.vision.v1p2beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p2beta1/text_annotation.proto", fileDescriptor_text_annotation_8d9193533acd557d)
+}
+
+var fileDescriptor_text_annotation_8d9193533acd557d = []byte{
+	// 774 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xd3, 0x48,
+	0x14, 0x5f, 0x27, 0x76, 0x1a, 0xbf, 0xb4, 0x91, 0x77, 0x76, 0xb5, 0x8a, 0xb2, 0xbb, 0xa8, 0xa4,
+	0x20, 0x55, 0x02, 0x39, 0x6a, 0x7a, 0x2a, 0x45, 0xa0, 0x38, 0xb5, 0xd4, 0xaa, 0x21, 0xb5, 0xa6,
+	0x09, 0xa5, 0x5c, 0x2c, 0xff, 0x99, 0x3a, 0x56, 0x13, 0x8f, 0x65, 0xbb, 0x6d, 0x72, 0xe5, 0x8a,
+	0x04, 0x5f, 0x88, 0x2f, 0x83, 0xc4, 0x09, 0xf1, 0x01, 0x38, 0x22, 0x8f, 0xed, 0x34, 0x09, 0xa2,
+	0xe6, 0x8f, 0x38, 0xf4, 0x12, 0xcd, 0x7b, 0x79, 0xbf, 0x37, 0xef, 0xf7, 0x7b, 0xf3, 0x3c, 0x03,
+	0xdb, 0x0e, 0xa5, 0xce, 0x88, 0x34, 0xad, 0x11, 0xbd, 0xb0, 0x9b, 0x97, 0x6e, 0xe8, 0x52, 0xaf,
+	0x79, 0xb9, 0xe5, 0xb7, 0x4c, 0x12, 0x19, 0x5b, 0xcd, 0x88, 0x4c, 0x22, 0xdd, 0xf0, 0x3c, 0x1a,
+	0x19, 0x91, 0x4b, 0x3d, 0xd9, 0x0f, 0x68, 0x44, 0xd1, 0xff, 0x09, 0x48, 0x66, 0x20, 0x39, 0x01,
+	0xc9, 0x33, 0x50, 0xfd, 0xbf, 0x34, 0xa7, 0xe1, 0xbb, 0xcd, 0x6b, 0x6c, 0x98, 0x80, 0xeb, 0x0f,
+	0x6f, 0xde, 0xd1, 0x21, 0x74, 0x4c, 0xa2, 0x60, 0x9a, 0x44, 0x37, 0x5e, 0x0b, 0x50, 0xed, 0x93,
+	0x49, 0xd4, 0x9e, 0xe5, 0x41, 0x3b, 0x20, 0xf8, 0x86, 0x43, 0xc2, 0x1a, 0xb7, 0x5e, 0xdc, 0xac,
+	0xb4, 0x36, 0xe4, 0x1b, 0xab, 0x91, 0x35, 0xc3, 0x21, 0x38, 0x41, 0x20, 0x04, 0x7c, 0xcc, 0xa8,
+	0x56, 0x58, 0xe7, 0x36, 0x45, 0xcc, 0xd6, 0xf5, 0x13, 0x90, 0xf6, 0x48, 0x44, 0xac, 0x88, 0xd8,
+	0x5d, 0xc3, 0x73, 0x2e, 0x0c, 0x87, 0xa0, 0x0d, 0x58, 0x1b, 0xa5, 0x6b, 0xdd, 0xa2, 0x36, 0xa9,
+	0x71, 0x0c, 0xb0, 0x9a, 0x39, 0x3b, 0xd4, 0x26, 0xe8, 0x0e, 0x80, 0x45, 0xbd, 0x33, 0xd7, 0x26,
+	0x9e, 0x45, 0x58, 0xca, 0x02, 0x9e, 0xf3, 0xd4, 0x3f, 0x71, 0xb0, 0x96, 0x65, 0x56, 0x02, 0x62,
+	0x9c, 0xa3, 0x53, 0xe0, 0xa3, 0xa9, 0x9f, 0x64, 0xab, 0xb6, 0xd4, 0x9c, 0xc2, 0x17, 0x69, 0xcb,
+	0x0b, 0xa9, 0x64, 0xf6, 0xdb, 0x9f, 0xfa, 0x04, 0xb3, 0x94, 0xe8, 0x5f, 0x10, 0xdd, 0x50, 0xf7,
+	0x03, 0x72, 0xe6, 0x4e, 0x58, 0x2d, 0x65, 0x5c, 0x76, 0x43, 0x8d, 0xd9, 0x0d, 0x0b, 0xc4, 0x59,
+	0x3c, 0xaa, 0xc0, 0xca, 0xa0, 0x77, 0xd8, 0x3b, 0x3a, 0xe9, 0x49, 0x7f, 0x20, 0x11, 0x84, 0x63,
+	0xad, 0xdd, 0x51, 0x25, 0x0e, 0x55, 0x01, 0x8e, 0x07, 0x58, 0xd5, 0x13, 0xbb, 0x80, 0x10, 0x54,
+	0xd5, 0xa3, 0xae, 0x3e, 0xe7, 0x2b, 0x22, 0x80, 0xd2, 0xfe, 0xa9, 0xb6, 0xaf, 0xf6, 0x24, 0x3e,
+	0x8e, 0xef, 0x1e, 0xf4, 0x54, 0x5d, 0xc1, 0x6a, 0xfb, 0x50, 0x12, 0xea, 0xef, 0x39, 0x58, 0x8d,
+	0x4b, 0xd6, 0x02, 0xea, 0x93, 0x20, 0x9a, 0xa2, 0x31, 0x20, 0x3b, 0xad, 0x59, 0xcf, 0x84, 0xcb,
+	0x9a, 0xf6, 0xe4, 0xe7, 0xb8, 0x67, 0x0d, 0xc2, 0x7f, 0xda, 0x4b, 0x9e, 0x10, 0x99, 0x50, 0x9d,
+	0x6d, 0x67, 0xc6, 0x6c, 0x99, 0x0c, 0x95, 0xd6, 0xee, 0x2f, 0xc8, 0x8c, 0xd7, 0xec, 0x79, 0xb3,
+	0xf1, 0x91, 0x03, 0x3e, 0x3e, 0x4f, 0xe8, 0x39, 0x94, 0xfd, 0x94, 0x27, 0xeb, 0x66, 0xa5, 0xf5,
+	0xe8, 0xc7, 0xb6, 0x99, 0x57, 0x0a, 0xcf, 0x72, 0xa1, 0xbf, 0x41, 0xb8, 0x72, 0xed, 0x68, 0xc8,
+	0x6a, 0x17, 0x70, 0x62, 0xa0, 0x7f, 0xa0, 0x34, 0x24, 0xae, 0x33, 0x8c, 0x6a, 0x45, 0xe6, 0x4e,
+	0x2d, 0xf4, 0x18, 0x4a, 0xe6, 0x88, 0x5a, 0xe7, 0x61, 0x8d, 0x67, 0xaa, 0xde, 0xcb, 0xa9, 0x41,
+	0x89, 0x83, 0x71, 0x8a, 0x59, 0x3a, 0xbf, 0xc2, 0xf2, 0xf9, 0x6d, 0xbc, 0x2b, 0x82, 0xc0, 0x10,
+	0xbf, 0x8d, 0x6d, 0x0f, 0x56, 0x4d, 0x7a, 0xe1, 0xd9, 0xae, 0xe7, 0xe8, 0x26, 0x9d, 0xa4, 0x0d,
+	0x7b, 0x90, 0xc7, 0x22, 0x85, 0x68, 0x74, 0x34, 0xc5, 0x95, 0x2c, 0x81, 0x42, 0x27, 0x68, 0x1f,
+	0xc0, 0x37, 0x02, 0xc3, 0x09, 0x0c, 0x7f, 0x18, 0xd6, 0x8a, 0x4c, 0x93, 0xcd, 0xdc, 0xcf, 0x43,
+	0x0a, 0xc0, 0x73, 0x58, 0xf4, 0x0c, 0x80, 0xa9, 0xa4, 0xb3, 0x79, 0xe5, 0xd9, 0xbc, 0xca, 0xdf,
+	0xa3, 0x6e, 0xf2, 0xcb, 0x06, 0x53, 0x34, 0xb3, 0x65, 0xae, 0xd4, 0x18, 0xc4, 0x19, 0x6e, 0x71,
+	0x40, 0xcb, 0xc0, 0xf7, 0xd5, 0x17, 0x7d, 0x89, 0x8b, 0x47, 0xb5, 0xdf, 0x56, 0xba, 0xf1, 0x68,
+	0x56, 0x60, 0x45, 0x3b, 0xe8, 0xf4, 0x07, 0x38, 0x9e, 0x49, 0x11, 0x04, 0x3c, 0xe8, 0xaa, 0x58,
+	0xe2, 0x63, 0xbf, 0xd2, 0xc6, 0x9d, 0xa3, 0x3d, 0x55, 0x12, 0x1a, 0x6f, 0x0a, 0x20, 0xce, 0xc8,
+	0xdd, 0x9a, 0x16, 0xee, 0x80, 0x70, 0x45, 0x03, 0x3b, 0xeb, 0x5e, 0xde, 0xc7, 0xfd, 0x84, 0x06,
+	0x36, 0x4e, 0x10, 0x4b, 0x22, 0xf3, 0x5f, 0x89, 0xfc, 0xb6, 0x00, 0x7c, 0x1c, 0x7f, 0x6b, 0xb4,
+	0x78, 0x0a, 0x2b, 0xe1, 0x74, 0x6c, 0xd2, 0x51, 0xa6, 0xc6, 0xfd, 0x9c, 0x54, 0xc7, 0x2c, 0x1a,
+	0x67, 0xa8, 0x5c, 0x45, 0x3e, 0x70, 0x50, 0x4a, 0x30, 0xb7, 0x46, 0x93, 0xec, 0x06, 0x2f, 0x5e,
+	0xdf, 0xe0, 0x79, 0x34, 0x95, 0x57, 0x1c, 0xdc, 0xb5, 0xe8, 0xf8, 0xe6, 0x3d, 0x95, 0xbf, 0x16,
+	0x09, 0x69, 0xf1, 0xf3, 0x43, 0xe3, 0x5e, 0x76, 0x52, 0x94, 0x43, 0xe3, 0x3b, 0x4c, 0xa6, 0x81,
+	0xd3, 0x74, 0x88, 0xc7, 0x1e, 0x27, 0xcd, 0xe4, 0x2f, 0xc3, 0x77, 0xc3, 0x6f, 0xbc, 0x66, 0x76,
+	0x13, 0xc7, 0x67, 0x8e, 0x33, 0x4b, 0x0c, 0xb2, 0xfd, 0x25, 0x00, 0x00, 0xff, 0xff, 0xce, 0x91,
+	0x71, 0x97, 0x71, 0x09, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go
new file mode 100644
index 00000000..44aed1ff
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1/web_detection.pb.go
@@ -0,0 +1,395 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p2beta1/web_detection.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p2beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Relevant information for the image from the Internet.
+type WebDetection struct {
+	// Deduced entities from similar images on the Internet.
+	WebEntities []*WebDetection_WebEntity `protobuf:"bytes,1,rep,name=web_entities,json=webEntities,proto3" json:"web_entities,omitempty"`
+	// Fully matching images from the Internet.
+	// Can include resized copies of the query image.
+	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,2,rep,name=full_matching_images,json=fullMatchingImages,proto3" json:"full_matching_images,omitempty"`
+	// Partial matching images from the Internet.
+	// Those images are similar enough to share some key-point features. For
+	// example an original image will likely have partial matching for its crops.
+	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,3,rep,name=partial_matching_images,json=partialMatchingImages,proto3" json:"partial_matching_images,omitempty"`
+	// Web pages containing the matching images from the Internet.
+	PagesWithMatchingImages []*WebDetection_WebPage `protobuf:"bytes,4,rep,name=pages_with_matching_images,json=pagesWithMatchingImages,proto3" json:"pages_with_matching_images,omitempty"`
+	// The visually similar image results.
+	VisuallySimilarImages []*WebDetection_WebImage `protobuf:"bytes,6,rep,name=visually_similar_images,json=visuallySimilarImages,proto3" json:"visually_similar_images,omitempty"`
+	// Best guess text labels for the request image.
+	BestGuessLabels      []*WebDetection_WebLabel `protobuf:"bytes,8,rep,name=best_guess_labels,json=bestGuessLabels,proto3" json:"best_guess_labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *WebDetection) Reset()         { *m = WebDetection{} }
+func (m *WebDetection) String() string { return proto.CompactTextString(m) }
+func (*WebDetection) ProtoMessage()    {}
+func (*WebDetection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cbb14b20b0012343, []int{0}
+}
+func (m *WebDetection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
+}
+func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(dst, src)
+}
+func (m *WebDetection) XXX_Size() int {
+	return xxx_messageInfo_WebDetection.Size(m)
+}
+func (m *WebDetection) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection proto.InternalMessageInfo
+
+func (m *WebDetection) GetWebEntities() []*WebDetection_WebEntity {
+	if m != nil {
+		return m.WebEntities
+	}
+	return nil
+}
+
+func (m *WebDetection) GetFullMatchingImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.FullMatchingImages
+	}
+	return nil
+}
+
+func (m *WebDetection) GetPartialMatchingImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.PartialMatchingImages
+	}
+	return nil
+}
+
+func (m *WebDetection) GetPagesWithMatchingImages() []*WebDetection_WebPage {
+	if m != nil {
+		return m.PagesWithMatchingImages
+	}
+	return nil
+}
+
+func (m *WebDetection) GetVisuallySimilarImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.VisuallySimilarImages
+	}
+	return nil
+}
+
+func (m *WebDetection) GetBestGuessLabels() []*WebDetection_WebLabel {
+	if m != nil {
+		return m.BestGuessLabels
+	}
+	return nil
+}
+
+// Entity deduced from similar images on the Internet.
+type WebDetection_WebEntity struct {
+	// Opaque entity ID.
+	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
+	// Overall relevancy score for the entity.
+	// Not normalized and not comparable across different image queries.
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	// Canonical description of the entity, in English.
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{} }
+func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebEntity) ProtoMessage()    {}
+func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cbb14b20b0012343, []int{0, 0}
+}
+func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
+}
+func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+}
+func (m *WebDetection_WebEntity) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
+}
+func (m *WebDetection_WebEntity) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebEntity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebEntity proto.InternalMessageInfo
+
+func (m *WebDetection_WebEntity) GetEntityId() string {
+	if m != nil {
+		return m.EntityId
+	}
+	return ""
+}
+
+func (m *WebDetection_WebEntity) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *WebDetection_WebEntity) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+// Metadata for online images.
+type WebDetection_WebImage struct {
+	// The result image URL.
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	// (Deprecated) Overall relevancy score for the image.
+	Score                float32  `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
+func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebImage) ProtoMessage()    {}
+func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cbb14b20b0012343, []int{0, 1}
+}
+func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
+}
+func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+}
+func (m *WebDetection_WebImage) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebImage.Size(m)
+}
+func (m *WebDetection_WebImage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebImage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebImage proto.InternalMessageInfo
+
+func (m *WebDetection_WebImage) GetUrl() string {
+	if m != nil {
+		return m.Url
+	}
+	return ""
+}
+
+func (m *WebDetection_WebImage) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+// Metadata for web pages.
+type WebDetection_WebPage struct {
+	// The result web page URL.
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	// (Deprecated) Overall relevancy score for the web page.
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	// Title for the web page, may contain HTML markups.
+	PageTitle string `protobuf:"bytes,3,opt,name=page_title,json=pageTitle,proto3" json:"page_title,omitempty"`
+	// Fully matching images on the page.
+	// Can include resized copies of the query image.
+	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,4,rep,name=full_matching_images,json=fullMatchingImages,proto3" json:"full_matching_images,omitempty"`
+	// Partial matching images on the page.
+	// Those images are similar enough to share some key-point features. For
+	// example an original image will likely have partial matching for its
+	// crops.
+	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,5,rep,name=partial_matching_images,json=partialMatchingImages,proto3" json:"partial_matching_images,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}                 `json:"-"`
+	XXX_unrecognized      []byte                   `json:"-"`
+	XXX_sizecache         int32                    `json:"-"`
+}
+
+func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
+func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebPage) ProtoMessage()    {}
+func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cbb14b20b0012343, []int{0, 2}
+}
+func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
+}
+func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+}
+func (m *WebDetection_WebPage) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebPage.Size(m)
+}
+func (m *WebDetection_WebPage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebPage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebPage proto.InternalMessageInfo
+
+func (m *WebDetection_WebPage) GetUrl() string {
+	if m != nil {
+		return m.Url
+	}
+	return ""
+}
+
+func (m *WebDetection_WebPage) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *WebDetection_WebPage) GetPageTitle() string {
+	if m != nil {
+		return m.PageTitle
+	}
+	return ""
+}
+
+func (m *WebDetection_WebPage) GetFullMatchingImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.FullMatchingImages
+	}
+	return nil
+}
+
+func (m *WebDetection_WebPage) GetPartialMatchingImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.PartialMatchingImages
+	}
+	return nil
+}
+
+// Label to provide extra metadata for the web detection.
+type WebDetection_WebLabel struct {
+	// Label for extra metadata.
+	Label string `protobuf:"bytes,1,opt,name=label,proto3" json:"label,omitempty"`
+	// The BCP-47 language code for `label`, such as "en-US" or "sr-Latn".
+	// For more information, see
+	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
+	LanguageCode         string   `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
+func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebLabel) ProtoMessage()    {}
+func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_cbb14b20b0012343, []int{0, 3}
+}
+func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
+}
+func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+}
+func (m *WebDetection_WebLabel) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
+}
+func (m *WebDetection_WebLabel) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebLabel.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebLabel proto.InternalMessageInfo
+
+func (m *WebDetection_WebLabel) GetLabel() string {
+	if m != nil {
+		return m.Label
+	}
+	return ""
+}
+
+func (m *WebDetection_WebLabel) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*WebDetection)(nil), "google.cloud.vision.v1p2beta1.WebDetection")
+	proto.RegisterType((*WebDetection_WebEntity)(nil), "google.cloud.vision.v1p2beta1.WebDetection.WebEntity")
+	proto.RegisterType((*WebDetection_WebImage)(nil), "google.cloud.vision.v1p2beta1.WebDetection.WebImage")
+	proto.RegisterType((*WebDetection_WebPage)(nil), "google.cloud.vision.v1p2beta1.WebDetection.WebPage")
+	proto.RegisterType((*WebDetection_WebLabel)(nil), "google.cloud.vision.v1p2beta1.WebDetection.WebLabel")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p2beta1/web_detection.proto", fileDescriptor_web_detection_cbb14b20b0012343)
+}
+
+var fileDescriptor_web_detection_cbb14b20b0012343 = []byte{
+	// 511 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
+	0x18, 0xc6, 0x95, 0x76, 0x1b, 0x8d, 0x5b, 0x04, 0xb3, 0x86, 0x16, 0x05, 0x26, 0x15, 0xb8, 0xf4,
+	0x94, 0xa8, 0x1d, 0x9c, 0xb8, 0x6d, 0x4c, 0x68, 0x12, 0x48, 0x55, 0x40, 0x1a, 0xe2, 0x92, 0x39,
+	0x89, 0x97, 0xbe, 0x92, 0x1b, 0x47, 0xb1, 0xd3, 0xaa, 0x37, 0x4e, 0x7c, 0x14, 0x3e, 0x23, 0x47,
+	0xf4, 0xda, 0xee, 0x54, 0x51, 0x36, 0x31, 0x86, 0xb8, 0xf9, 0x7d, 0xac, 0xe7, 0xf9, 0xd9, 0xaf,
+	0xff, 0x90, 0x71, 0x29, 0x65, 0x29, 0x78, 0x9c, 0x0b, 0xd9, 0x16, 0xf1, 0x02, 0x14, 0xc8, 0x2a,
+	0x5e, 0x8c, 0xeb, 0x49, 0xc6, 0x35, 0x1b, 0xc7, 0x4b, 0x9e, 0xa5, 0x05, 0xd7, 0x3c, 0xd7, 0x20,
+	0xab, 0xa8, 0x6e, 0xa4, 0x96, 0xf4, 0xc8, 0x5a, 0x22, 0x63, 0x89, 0xac, 0x25, 0xba, 0xb6, 0x84,
+	0xcf, 0x5c, 0x22, 0xab, 0x21, 0x66, 0x55, 0x25, 0x35, 0x43, 0xaf, 0xb2, 0xe6, 0x17, 0xdf, 0x7c,
+	0x32, 0xb8, 0xe0, 0xd9, 0xdb, 0x75, 0x26, 0xfd, 0x4c, 0x06, 0x08, 0xe1, 0x95, 0x06, 0x0d, 0x5c,
+	0x05, 0xde, 0xb0, 0x3b, 0xea, 0x4f, 0x5e, 0x47, 0xb7, 0x42, 0xa2, 0xcd, 0x08, 0x2c, 0xce, 0xd0,
+	0xbe, 0x4a, 0xfa, 0x4b, 0x37, 0x04, 0xae, 0xe8, 0x15, 0x39, 0xb8, 0x6a, 0x85, 0x48, 0xe7, 0x4c,
+	0xe7, 0x33, 0xa8, 0xca, 0x14, 0xe6, 0xac, 0xe4, 0x2a, 0xe8, 0x18, 0xc2, 0xab, 0x3b, 0x12, 0xce,
+	0xd1, 0x9c, 0x50, 0x4c, 0xfc, 0xe0, 0x02, 0x8d, 0xa4, 0xa8, 0x20, 0x87, 0x35, 0x6b, 0x34, 0xb0,
+	0x6d, 0x54, 0xf7, 0x1e, 0xa8, 0x27, 0x2e, 0xf4, 0x17, 0x5a, 0x4d, 0xc2, 0x1a, 0x07, 0xe9, 0x12,
+	0xf4, 0x6c, 0x0b, 0xb8, 0x63, 0x80, 0xc7, 0x77, 0x04, 0x4e, 0x91, 0x77, 0x68, 0x62, 0x2f, 0x40,
+	0xcf, 0xb6, 0xf7, 0xb7, 0x00, 0xd5, 0x32, 0x21, 0x56, 0xa9, 0x82, 0x39, 0x08, 0xd6, 0xac, 0x71,
+	0x7b, 0xf7, 0xd9, 0xdf, 0x3a, 0xf4, 0xa3, 0xcd, 0x74, 0xb4, 0x4b, 0xb2, 0x9f, 0x71, 0xa5, 0xd3,
+	0xb2, 0xe5, 0x4a, 0xa5, 0x82, 0x65, 0x5c, 0xa8, 0xa0, 0xf7, 0x57, 0x9c, 0xf7, 0x68, 0x4e, 0x1e,
+	0x61, 0xdc, 0x3b, 0x4c, 0x33, 0xb5, 0x0a, 0x2f, 0x89, 0x7f, 0x7d, 0x63, 0xe8, 0x53, 0xe2, 0x9b,
+	0xab, 0xb7, 0x4a, 0xa1, 0x08, 0xbc, 0xa1, 0x37, 0xf2, 0x93, 0x9e, 0x15, 0xce, 0x0b, 0x7a, 0x40,
+	0x76, 0x55, 0x2e, 0x1b, 0x1e, 0x74, 0x86, 0xde, 0xa8, 0x93, 0xd8, 0x82, 0x0e, 0x49, 0xbf, 0xe0,
+	0x2a, 0x6f, 0xa0, 0x46, 0x50, 0xd0, 0x35, 0xa6, 0x4d, 0x29, 0x9c, 0x90, 0xde, 0x7a, 0x9b, 0xf4,
+	0x31, 0xe9, 0xb6, 0x8d, 0x70, 0xd1, 0x38, 0xfc, 0x7d, 0x6a, 0xf8, 0xbd, 0x43, 0x1e, 0xb8, 0xa3,
+	0xf8, 0x53, 0x0f, 0x3d, 0x22, 0x04, 0x0f, 0x2d, 0xd5, 0xa0, 0x05, 0x77, 0x0b, 0xf1, 0x51, 0xf9,
+	0x84, 0xc2, 0x8d, 0x0f, 0x60, 0xe7, 0xff, 0x3d, 0x80, 0xdd, 0x7f, 0xfe, 0x00, 0xc2, 0x33, 0xd3,
+	0x5c, 0x73, 0x96, 0xd8, 0x16, 0x73, 0x43, 0x5c, 0xab, 0x6c, 0x41, 0x5f, 0x92, 0x87, 0x82, 0x55,
+	0x65, 0x8b, 0xad, 0xc9, 0x65, 0x61, 0x9b, 0xe6, 0x27, 0x83, 0xb5, 0x78, 0x2a, 0x0b, 0x7e, 0xf2,
+	0xd5, 0x23, 0xcf, 0x73, 0x39, 0xbf, 0x7d, 0x65, 0x27, 0xfb, 0x9b, 0x4b, 0x9b, 0xe2, 0x0f, 0x36,
+	0xf5, 0xbe, 0x9c, 0x3a, 0x4f, 0x29, 0x31, 0x31, 0x92, 0x4d, 0x19, 0x97, 0xbc, 0x32, 0xff, 0x5b,
+	0x6c, 0xa7, 0x58, 0x0d, 0xea, 0x86, 0x2f, 0xf5, 0x8d, 0x15, 0x7e, 0x78, 0x5e, 0xb6, 0x67, 0x2c,
+	0xc7, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x66, 0x62, 0xaa, 0xcd, 0x84, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/geometry.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/geometry.pb.go
new file mode 100644
index 00000000..36b5b3c3
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/geometry.pb.go
@@ -0,0 +1,306 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p3beta1/geometry.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A vertex represents a 2D point in the image.
+// NOTE: the vertex coordinates are in the same scale as the original image.
+type Vertex struct {
+	// X coordinate.
+	X int32 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"`
+	// Y coordinate.
+	Y                    int32    `protobuf:"varint,2,opt,name=y,proto3" json:"y,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Vertex) Reset()         { *m = Vertex{} }
+func (m *Vertex) String() string { return proto.CompactTextString(m) }
+func (*Vertex) ProtoMessage()    {}
+func (*Vertex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_af1b507a20494236, []int{0}
+}
+func (m *Vertex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Vertex.Unmarshal(m, b)
+}
+func (m *Vertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Vertex.Marshal(b, m, deterministic)
+}
+func (dst *Vertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Vertex.Merge(dst, src)
+}
+func (m *Vertex) XXX_Size() int {
+	return xxx_messageInfo_Vertex.Size(m)
+}
+func (m *Vertex) XXX_DiscardUnknown() {
+	xxx_messageInfo_Vertex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Vertex proto.InternalMessageInfo
+
+func (m *Vertex) GetX() int32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *Vertex) GetY() int32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
+// A vertex represents a 2D point in the image.
+// NOTE: the normalized vertex coordinates are relative to the original image
+// and range from 0 to 1.
+type NormalizedVertex struct {
+	// X coordinate.
+	X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"`
+	// Y coordinate.
+	Y                    float32  `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NormalizedVertex) Reset()         { *m = NormalizedVertex{} }
+func (m *NormalizedVertex) String() string { return proto.CompactTextString(m) }
+func (*NormalizedVertex) ProtoMessage()    {}
+func (*NormalizedVertex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_af1b507a20494236, []int{1}
+}
+func (m *NormalizedVertex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormalizedVertex.Unmarshal(m, b)
+}
+func (m *NormalizedVertex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormalizedVertex.Marshal(b, m, deterministic)
+}
+func (dst *NormalizedVertex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedVertex.Merge(dst, src)
+}
+func (m *NormalizedVertex) XXX_Size() int {
+	return xxx_messageInfo_NormalizedVertex.Size(m)
+}
+func (m *NormalizedVertex) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormalizedVertex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NormalizedVertex proto.InternalMessageInfo
+
+func (m *NormalizedVertex) GetX() float32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *NormalizedVertex) GetY() float32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
+// A bounding polygon for the detected image annotation.
+type BoundingPoly struct {
+	// The bounding polygon vertices.
+	Vertices []*Vertex `protobuf:"bytes,1,rep,name=vertices,proto3" json:"vertices,omitempty"`
+	// The bounding polygon normalized vertices.
+	NormalizedVertices   []*NormalizedVertex `protobuf:"bytes,2,rep,name=normalized_vertices,json=normalizedVertices,proto3" json:"normalized_vertices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *BoundingPoly) Reset()         { *m = BoundingPoly{} }
+func (m *BoundingPoly) String() string { return proto.CompactTextString(m) }
+func (*BoundingPoly) ProtoMessage()    {}
+func (*BoundingPoly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_af1b507a20494236, []int{2}
+}
+func (m *BoundingPoly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BoundingPoly.Unmarshal(m, b)
+}
+func (m *BoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BoundingPoly.Marshal(b, m, deterministic)
+}
+func (dst *BoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingPoly.Merge(dst, src)
+}
+func (m *BoundingPoly) XXX_Size() int {
+	return xxx_messageInfo_BoundingPoly.Size(m)
+}
+func (m *BoundingPoly) XXX_DiscardUnknown() {
+	xxx_messageInfo_BoundingPoly.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BoundingPoly proto.InternalMessageInfo
+
+func (m *BoundingPoly) GetVertices() []*Vertex {
+	if m != nil {
+		return m.Vertices
+	}
+	return nil
+}
+
+func (m *BoundingPoly) GetNormalizedVertices() []*NormalizedVertex {
+	if m != nil {
+		return m.NormalizedVertices
+	}
+	return nil
+}
+
+// A normalized bounding polygon around a portion of an image.
+type NormalizedBoundingPoly struct {
+	// Normalized vertices of the bounding polygon.
+	Vertices             []*NormalizedVertex `protobuf:"bytes,1,rep,name=vertices,proto3" json:"vertices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *NormalizedBoundingPoly) Reset()         { *m = NormalizedBoundingPoly{} }
+func (m *NormalizedBoundingPoly) String() string { return proto.CompactTextString(m) }
+func (*NormalizedBoundingPoly) ProtoMessage()    {}
+func (*NormalizedBoundingPoly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_af1b507a20494236, []int{3}
+}
+func (m *NormalizedBoundingPoly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NormalizedBoundingPoly.Unmarshal(m, b)
+}
+func (m *NormalizedBoundingPoly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NormalizedBoundingPoly.Marshal(b, m, deterministic)
+}
+func (dst *NormalizedBoundingPoly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NormalizedBoundingPoly.Merge(dst, src)
+}
+func (m *NormalizedBoundingPoly) XXX_Size() int {
+	return xxx_messageInfo_NormalizedBoundingPoly.Size(m)
+}
+func (m *NormalizedBoundingPoly) XXX_DiscardUnknown() {
+	xxx_messageInfo_NormalizedBoundingPoly.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NormalizedBoundingPoly proto.InternalMessageInfo
+
+func (m *NormalizedBoundingPoly) GetVertices() []*NormalizedVertex {
+	if m != nil {
+		return m.Vertices
+	}
+	return nil
+}
+
+// A 3D position in the image, used primarily for Face detection landmarks.
+// A valid Position must have both x and y coordinates.
+// The position coordinates are in the same scale as the original image.
+type Position struct {
+	// X coordinate.
+	X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"`
+	// Y coordinate.
+	Y float32 `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"`
+	// Z coordinate (or depth).
+	Z                    float32  `protobuf:"fixed32,3,opt,name=z,proto3" json:"z,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Position) Reset()         { *m = Position{} }
+func (m *Position) String() string { return proto.CompactTextString(m) }
+func (*Position) ProtoMessage()    {}
+func (*Position) Descriptor() ([]byte, []int) {
+	return fileDescriptor_geometry_af1b507a20494236, []int{4}
+}
+func (m *Position) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Position.Unmarshal(m, b)
+}
+func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
+}
+func (dst *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(dst, src)
+}
+func (m *Position) XXX_Size() int {
+	return xxx_messageInfo_Position.Size(m)
+}
+func (m *Position) XXX_DiscardUnknown() {
+	xxx_messageInfo_Position.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Position proto.InternalMessageInfo
+
+func (m *Position) GetX() float32 {
+	if m != nil {
+		return m.X
+	}
+	return 0
+}
+
+func (m *Position) GetY() float32 {
+	if m != nil {
+		return m.Y
+	}
+	return 0
+}
+
+func (m *Position) GetZ() float32 {
+	if m != nil {
+		return m.Z
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*Vertex)(nil), "google.cloud.vision.v1p3beta1.Vertex")
+	proto.RegisterType((*NormalizedVertex)(nil), "google.cloud.vision.v1p3beta1.NormalizedVertex")
+	proto.RegisterType((*BoundingPoly)(nil), "google.cloud.vision.v1p3beta1.BoundingPoly")
+	proto.RegisterType((*NormalizedBoundingPoly)(nil), "google.cloud.vision.v1p3beta1.NormalizedBoundingPoly")
+	proto.RegisterType((*Position)(nil), "google.cloud.vision.v1p3beta1.Position")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/geometry.proto", fileDescriptor_geometry_af1b507a20494236)
+}
+
+var fileDescriptor_geometry_af1b507a20494236 = []byte{
+	// 316 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4b, 0xc3, 0x30,
+	0x14, 0xc6, 0x49, 0x87, 0x63, 0xc4, 0x09, 0x52, 0x41, 0x8a, 0x28, 0xcc, 0xa2, 0xb0, 0x83, 0x24,
+	0xcc, 0x79, 0xf3, 0xe4, 0x3c, 0x78, 0x10, 0xa4, 0xf4, 0xe0, 0xc1, 0x8b, 0x66, 0x6d, 0x08, 0x81,
+	0x36, 0xaf, 0xa4, 0x59, 0x59, 0x8b, 0xff, 0x95, 0xff, 0x9c, 0x47, 0x69, 0x53, 0x2a, 0x9d, 0x58,
+	0xf1, 0xf8, 0xbd, 0xfc, 0xde, 0xf7, 0x3e, 0xf2, 0x1e, 0xbe, 0x12, 0x00, 0x22, 0xe1, 0x34, 0x4a,
+	0x60, 0x13, 0xd3, 0x42, 0xe6, 0x12, 0x14, 0x2d, 0x16, 0xd9, 0x72, 0xcd, 0x0d, 0x5b, 0x50, 0xc1,
+	0x21, 0xe5, 0x46, 0x97, 0x24, 0xd3, 0x60, 0xc0, 0x3d, 0xb3, 0x34, 0x69, 0x68, 0x62, 0x69, 0xd2,
+	0xd1, 0x27, 0xa7, 0xad, 0x19, 0xcb, 0x24, 0x65, 0x4a, 0x81, 0x61, 0x46, 0x82, 0xca, 0x6d, 0xb3,
+	0x7f, 0x81, 0xc7, 0xcf, 0x5c, 0x1b, 0xbe, 0x75, 0xa7, 0x18, 0x6d, 0x3d, 0x34, 0x43, 0xf3, 0xbd,
+	0x10, 0x35, 0xaa, 0xf4, 0x1c, 0xab, 0x4a, 0x9f, 0xe0, 0xc3, 0x27, 0xd0, 0x29, 0x4b, 0x64, 0xc5,
+	0xe3, 0x5d, 0xde, 0xe9, 0xf1, 0x4e, 0xcd, 0x7f, 0x20, 0x3c, 0x5d, 0xc1, 0x46, 0xc5, 0x52, 0x89,
+	0x00, 0x92, 0xd2, 0xbd, 0xc3, 0x93, 0x82, 0x6b, 0x23, 0x23, 0x9e, 0x7b, 0x68, 0x36, 0x9a, 0xef,
+	0x5f, 0x5f, 0x92, 0xc1, 0xd8, 0xc4, 0x4e, 0x09, 0xbb, 0x36, 0xf7, 0x0d, 0x1f, 0xa9, 0x2e, 0xc3,
+	0x6b, 0xe7, 0xe6, 0x34, 0x6e, 0xf4, 0x0f, 0xb7, 0xdd, 0xf4, 0xa1, 0xab, 0x7a, 0x95, 0xda, 0xca,
+	0xe7, 0xf8, 0xf8, 0x9b, 0xeb, 0xc5, 0x7f, 0xfc, 0x11, 0xff, 0xdf, 0x03, 0x3b, 0x03, 0xff, 0x06,
+	0x4f, 0x02, 0xc8, 0x65, 0xbd, 0x85, 0xa1, 0x4f, 0xac, 0x55, 0xe5, 0x8d, 0xac, 0xaa, 0x56, 0xef,
+	0xf8, 0x3c, 0x82, 0x74, 0x78, 0xea, 0xea, 0xe0, 0xa1, 0x3d, 0x8d, 0xa0, 0x5e, 0x6e, 0x80, 0x5e,
+	0xee, 0x5b, 0x5e, 0x40, 0xc2, 0x94, 0x20, 0xa0, 0x05, 0x15, 0x5c, 0x35, 0xab, 0xa7, 0xf6, 0x89,
+	0x65, 0x32, 0xff, 0xe5, 0xd0, 0x6e, 0x6d, 0xe1, 0x13, 0xa1, 0xf5, 0xb8, 0x69, 0x59, 0x7e, 0x05,
+	0x00, 0x00, 0xff, 0xff, 0x79, 0x59, 0xbf, 0x39, 0x9a, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go
new file mode 100644
index 00000000..57e90d7c
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/image_annotator.pb.go
@@ -0,0 +1,2826 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p3beta1/image_annotator.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import color "google.golang.org/genproto/googleapis/type/color"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A bucketized representation of likelihood, which is intended to give clients
+// highly stable results across model upgrades.
+type Likelihood int32
+
+const (
+	// Unknown likelihood.
+	Likelihood_UNKNOWN Likelihood = 0
+	// It is very unlikely that the image belongs to the specified vertical.
+	Likelihood_VERY_UNLIKELY Likelihood = 1
+	// It is unlikely that the image belongs to the specified vertical.
+	Likelihood_UNLIKELY Likelihood = 2
+	// It is possible that the image belongs to the specified vertical.
+	Likelihood_POSSIBLE Likelihood = 3
+	// It is likely that the image belongs to the specified vertical.
+	Likelihood_LIKELY Likelihood = 4
+	// It is very likely that the image belongs to the specified vertical.
+	Likelihood_VERY_LIKELY Likelihood = 5
+)
+
+var Likelihood_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "VERY_UNLIKELY",
+	2: "UNLIKELY",
+	3: "POSSIBLE",
+	4: "LIKELY",
+	5: "VERY_LIKELY",
+}
+var Likelihood_value = map[string]int32{
+	"UNKNOWN":       0,
+	"VERY_UNLIKELY": 1,
+	"UNLIKELY":      2,
+	"POSSIBLE":      3,
+	"LIKELY":        4,
+	"VERY_LIKELY":   5,
+}
+
+func (x Likelihood) String() string {
+	return proto.EnumName(Likelihood_name, int32(x))
+}
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{0}
+}
+
+// Type of Google Cloud Vision API feature to be extracted.
+type Feature_Type int32
+
+const (
+	// Unspecified feature type.
+	Feature_TYPE_UNSPECIFIED Feature_Type = 0
+	// Run face detection.
+	Feature_FACE_DETECTION Feature_Type = 1
+	// Run landmark detection.
+	Feature_LANDMARK_DETECTION Feature_Type = 2
+	// Run logo detection.
+	Feature_LOGO_DETECTION Feature_Type = 3
+	// Run label detection.
+	Feature_LABEL_DETECTION Feature_Type = 4
+	// Run text detection / optical character recognition (OCR). Text detection
+	// is optimized for areas of text within a larger image; if the image is
+	// a document, use `DOCUMENT_TEXT_DETECTION` instead.
+	Feature_TEXT_DETECTION Feature_Type = 5
+	// Run dense text document OCR. Takes precedence when both
+	// `DOCUMENT_TEXT_DETECTION` and `TEXT_DETECTION` are present.
+	Feature_DOCUMENT_TEXT_DETECTION Feature_Type = 11
+	// Run Safe Search to detect potentially unsafe
+	// or undesirable content.
+	Feature_SAFE_SEARCH_DETECTION Feature_Type = 6
+	// Compute a set of image properties, such as the
+	// image's dominant colors.
+	Feature_IMAGE_PROPERTIES Feature_Type = 7
+	// Run crop hints.
+	Feature_CROP_HINTS Feature_Type = 9
+	// Run web detection.
+	Feature_WEB_DETECTION Feature_Type = 10
+	// Run Product Search.
+	Feature_PRODUCT_SEARCH Feature_Type = 12
+	// Run localizer for object detection.
+	Feature_OBJECT_LOCALIZATION Feature_Type = 19
+)
+
+var Feature_Type_name = map[int32]string{
+	0:  "TYPE_UNSPECIFIED",
+	1:  "FACE_DETECTION",
+	2:  "LANDMARK_DETECTION",
+	3:  "LOGO_DETECTION",
+	4:  "LABEL_DETECTION",
+	5:  "TEXT_DETECTION",
+	11: "DOCUMENT_TEXT_DETECTION",
+	6:  "SAFE_SEARCH_DETECTION",
+	7:  "IMAGE_PROPERTIES",
+	9:  "CROP_HINTS",
+	10: "WEB_DETECTION",
+	12: "PRODUCT_SEARCH",
+	19: "OBJECT_LOCALIZATION",
+}
+var Feature_Type_value = map[string]int32{
+	"TYPE_UNSPECIFIED":        0,
+	"FACE_DETECTION":          1,
+	"LANDMARK_DETECTION":      2,
+	"LOGO_DETECTION":          3,
+	"LABEL_DETECTION":         4,
+	"TEXT_DETECTION":          5,
+	"DOCUMENT_TEXT_DETECTION": 11,
+	"SAFE_SEARCH_DETECTION":   6,
+	"IMAGE_PROPERTIES":        7,
+	"CROP_HINTS":              9,
+	"WEB_DETECTION":           10,
+	"PRODUCT_SEARCH":          12,
+	"OBJECT_LOCALIZATION":     19,
+}
+
+func (x Feature_Type) String() string {
+	return proto.EnumName(Feature_Type_name, int32(x))
+}
+func (Feature_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{0, 0}
+}
+
+// Face landmark (feature) type.
+// Left and right are defined from the vantage of the viewer of the image
+// without considering mirror projections typical of photos. So, `LEFT_EYE`,
+// typically, is the person's right eye.
+type FaceAnnotation_Landmark_Type int32
+
+const (
+	// Unknown face landmark detected. Should not be filled.
+	FaceAnnotation_Landmark_UNKNOWN_LANDMARK FaceAnnotation_Landmark_Type = 0
+	// Left eye.
+	FaceAnnotation_Landmark_LEFT_EYE FaceAnnotation_Landmark_Type = 1
+	// Right eye.
+	FaceAnnotation_Landmark_RIGHT_EYE FaceAnnotation_Landmark_Type = 2
+	// Left of left eyebrow.
+	FaceAnnotation_Landmark_LEFT_OF_LEFT_EYEBROW FaceAnnotation_Landmark_Type = 3
+	// Right of left eyebrow.
+	FaceAnnotation_Landmark_RIGHT_OF_LEFT_EYEBROW FaceAnnotation_Landmark_Type = 4
+	// Left of right eyebrow.
+	FaceAnnotation_Landmark_LEFT_OF_RIGHT_EYEBROW FaceAnnotation_Landmark_Type = 5
+	// Right of right eyebrow.
+	FaceAnnotation_Landmark_RIGHT_OF_RIGHT_EYEBROW FaceAnnotation_Landmark_Type = 6
+	// Midpoint between eyes.
+	FaceAnnotation_Landmark_MIDPOINT_BETWEEN_EYES FaceAnnotation_Landmark_Type = 7
+	// Nose tip.
+	FaceAnnotation_Landmark_NOSE_TIP FaceAnnotation_Landmark_Type = 8
+	// Upper lip.
+	FaceAnnotation_Landmark_UPPER_LIP FaceAnnotation_Landmark_Type = 9
+	// Lower lip.
+	FaceAnnotation_Landmark_LOWER_LIP FaceAnnotation_Landmark_Type = 10
+	// Mouth left.
+	FaceAnnotation_Landmark_MOUTH_LEFT FaceAnnotation_Landmark_Type = 11
+	// Mouth right.
+	FaceAnnotation_Landmark_MOUTH_RIGHT FaceAnnotation_Landmark_Type = 12
+	// Mouth center.
+	FaceAnnotation_Landmark_MOUTH_CENTER FaceAnnotation_Landmark_Type = 13
+	// Nose, bottom right.
+	FaceAnnotation_Landmark_NOSE_BOTTOM_RIGHT FaceAnnotation_Landmark_Type = 14
+	// Nose, bottom left.
+	FaceAnnotation_Landmark_NOSE_BOTTOM_LEFT FaceAnnotation_Landmark_Type = 15
+	// Nose, bottom center.
+	FaceAnnotation_Landmark_NOSE_BOTTOM_CENTER FaceAnnotation_Landmark_Type = 16
+	// Left eye, top boundary.
+	FaceAnnotation_Landmark_LEFT_EYE_TOP_BOUNDARY FaceAnnotation_Landmark_Type = 17
+	// Left eye, right corner.
+	FaceAnnotation_Landmark_LEFT_EYE_RIGHT_CORNER FaceAnnotation_Landmark_Type = 18
+	// Left eye, bottom boundary.
+	FaceAnnotation_Landmark_LEFT_EYE_BOTTOM_BOUNDARY FaceAnnotation_Landmark_Type = 19
+	// Left eye, left corner.
+	FaceAnnotation_Landmark_LEFT_EYE_LEFT_CORNER FaceAnnotation_Landmark_Type = 20
+	// Right eye, top boundary.
+	FaceAnnotation_Landmark_RIGHT_EYE_TOP_BOUNDARY FaceAnnotation_Landmark_Type = 21
+	// Right eye, right corner.
+	FaceAnnotation_Landmark_RIGHT_EYE_RIGHT_CORNER FaceAnnotation_Landmark_Type = 22
+	// Right eye, bottom boundary.
+	FaceAnnotation_Landmark_RIGHT_EYE_BOTTOM_BOUNDARY FaceAnnotation_Landmark_Type = 23
+	// Right eye, left corner.
+	FaceAnnotation_Landmark_RIGHT_EYE_LEFT_CORNER FaceAnnotation_Landmark_Type = 24
+	// Left eyebrow, upper midpoint.
+	FaceAnnotation_Landmark_LEFT_EYEBROW_UPPER_MIDPOINT FaceAnnotation_Landmark_Type = 25
+	// Right eyebrow, upper midpoint.
+	FaceAnnotation_Landmark_RIGHT_EYEBROW_UPPER_MIDPOINT FaceAnnotation_Landmark_Type = 26
+	// Left ear tragion.
+	FaceAnnotation_Landmark_LEFT_EAR_TRAGION FaceAnnotation_Landmark_Type = 27
+	// Right ear tragion.
+	FaceAnnotation_Landmark_RIGHT_EAR_TRAGION FaceAnnotation_Landmark_Type = 28
+	// Left eye pupil.
+	FaceAnnotation_Landmark_LEFT_EYE_PUPIL FaceAnnotation_Landmark_Type = 29
+	// Right eye pupil.
+	FaceAnnotation_Landmark_RIGHT_EYE_PUPIL FaceAnnotation_Landmark_Type = 30
+	// Forehead glabella.
+	FaceAnnotation_Landmark_FOREHEAD_GLABELLA FaceAnnotation_Landmark_Type = 31
+	// Chin gnathion.
+	FaceAnnotation_Landmark_CHIN_GNATHION FaceAnnotation_Landmark_Type = 32
+	// Chin left gonion.
+	FaceAnnotation_Landmark_CHIN_LEFT_GONION FaceAnnotation_Landmark_Type = 33
+	// Chin right gonion.
+	FaceAnnotation_Landmark_CHIN_RIGHT_GONION FaceAnnotation_Landmark_Type = 34
+)
+
+var FaceAnnotation_Landmark_Type_name = map[int32]string{
+	0:  "UNKNOWN_LANDMARK",
+	1:  "LEFT_EYE",
+	2:  "RIGHT_EYE",
+	3:  "LEFT_OF_LEFT_EYEBROW",
+	4:  "RIGHT_OF_LEFT_EYEBROW",
+	5:  "LEFT_OF_RIGHT_EYEBROW",
+	6:  "RIGHT_OF_RIGHT_EYEBROW",
+	7:  "MIDPOINT_BETWEEN_EYES",
+	8:  "NOSE_TIP",
+	9:  "UPPER_LIP",
+	10: "LOWER_LIP",
+	11: "MOUTH_LEFT",
+	12: "MOUTH_RIGHT",
+	13: "MOUTH_CENTER",
+	14: "NOSE_BOTTOM_RIGHT",
+	15: "NOSE_BOTTOM_LEFT",
+	16: "NOSE_BOTTOM_CENTER",
+	17: "LEFT_EYE_TOP_BOUNDARY",
+	18: "LEFT_EYE_RIGHT_CORNER",
+	19: "LEFT_EYE_BOTTOM_BOUNDARY",
+	20: "LEFT_EYE_LEFT_CORNER",
+	21: "RIGHT_EYE_TOP_BOUNDARY",
+	22: "RIGHT_EYE_RIGHT_CORNER",
+	23: "RIGHT_EYE_BOTTOM_BOUNDARY",
+	24: "RIGHT_EYE_LEFT_CORNER",
+	25: "LEFT_EYEBROW_UPPER_MIDPOINT",
+	26: "RIGHT_EYEBROW_UPPER_MIDPOINT",
+	27: "LEFT_EAR_TRAGION",
+	28: "RIGHT_EAR_TRAGION",
+	29: "LEFT_EYE_PUPIL",
+	30: "RIGHT_EYE_PUPIL",
+	31: "FOREHEAD_GLABELLA",
+	32: "CHIN_GNATHION",
+	33: "CHIN_LEFT_GONION",
+	34: "CHIN_RIGHT_GONION",
+}
+var FaceAnnotation_Landmark_Type_value = map[string]int32{
+	"UNKNOWN_LANDMARK":             0,
+	"LEFT_EYE":                     1,
+	"RIGHT_EYE":                    2,
+	"LEFT_OF_LEFT_EYEBROW":         3,
+	"RIGHT_OF_LEFT_EYEBROW":        4,
+	"LEFT_OF_RIGHT_EYEBROW":        5,
+	"RIGHT_OF_RIGHT_EYEBROW":       6,
+	"MIDPOINT_BETWEEN_EYES":        7,
+	"NOSE_TIP":                     8,
+	"UPPER_LIP":                    9,
+	"LOWER_LIP":                    10,
+	"MOUTH_LEFT":                   11,
+	"MOUTH_RIGHT":                  12,
+	"MOUTH_CENTER":                 13,
+	"NOSE_BOTTOM_RIGHT":            14,
+	"NOSE_BOTTOM_LEFT":             15,
+	"NOSE_BOTTOM_CENTER":           16,
+	"LEFT_EYE_TOP_BOUNDARY":        17,
+	"LEFT_EYE_RIGHT_CORNER":        18,
+	"LEFT_EYE_BOTTOM_BOUNDARY":     19,
+	"LEFT_EYE_LEFT_CORNER":         20,
+	"RIGHT_EYE_TOP_BOUNDARY":       21,
+	"RIGHT_EYE_RIGHT_CORNER":       22,
+	"RIGHT_EYE_BOTTOM_BOUNDARY":    23,
+	"RIGHT_EYE_LEFT_CORNER":        24,
+	"LEFT_EYEBROW_UPPER_MIDPOINT":  25,
+	"RIGHT_EYEBROW_UPPER_MIDPOINT": 26,
+	"LEFT_EAR_TRAGION":             27,
+	"RIGHT_EAR_TRAGION":            28,
+	"LEFT_EYE_PUPIL":               29,
+	"RIGHT_EYE_PUPIL":              30,
+	"FOREHEAD_GLABELLA":            31,
+	"CHIN_GNATHION":                32,
+	"CHIN_LEFT_GONION":             33,
+	"CHIN_RIGHT_GONION":            34,
+}
+
+func (x FaceAnnotation_Landmark_Type) String() string {
+	return proto.EnumName(FaceAnnotation_Landmark_Type_name, int32(x))
+}
+func (FaceAnnotation_Landmark_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{3, 0, 0}
+}
+
+// Batch operation states.
+type OperationMetadata_State int32
+
+const (
+	// Invalid.
+	OperationMetadata_STATE_UNSPECIFIED OperationMetadata_State = 0
+	// Request is received.
+	OperationMetadata_CREATED OperationMetadata_State = 1
+	// Request is actively being processed.
+	OperationMetadata_RUNNING OperationMetadata_State = 2
+	// The batch processing is done.
+	OperationMetadata_DONE OperationMetadata_State = 3
+	// The batch processing was cancelled.
+	OperationMetadata_CANCELLED OperationMetadata_State = 4
+)
+
+var OperationMetadata_State_name = map[int32]string{
+	0: "STATE_UNSPECIFIED",
+	1: "CREATED",
+	2: "RUNNING",
+	3: "DONE",
+	4: "CANCELLED",
+}
+var OperationMetadata_State_value = map[string]int32{
+	"STATE_UNSPECIFIED": 0,
+	"CREATED":           1,
+	"RUNNING":           2,
+	"DONE":              3,
+	"CANCELLED":         4,
+}
+
+func (x OperationMetadata_State) String() string {
+	return proto.EnumName(OperationMetadata_State_name, int32(x))
+}
+func (OperationMetadata_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{32, 0}
+}
+
+// The type of Google Cloud Vision API detection to perform, and the maximum
+// number of results to return for that type. Multiple `Feature` objects can
+// be specified in the `features` list.
+type Feature struct {
+	// The feature type.
+	Type Feature_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.vision.v1p3beta1.Feature_Type" json:"type,omitempty"`
+	// Maximum number of results of this type. Does not apply to
+	// `TEXT_DETECTION`, `DOCUMENT_TEXT_DETECTION`, or `CROP_HINTS`.
+	MaxResults int32 `protobuf:"varint,2,opt,name=max_results,json=maxResults,proto3" json:"max_results,omitempty"`
+	// Model to use for the feature.
+	// Supported values: "builtin/stable" (the default if unset) and
+	// "builtin/latest".
+	Model                string   `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Feature) Reset()         { *m = Feature{} }
+func (m *Feature) String() string { return proto.CompactTextString(m) }
+func (*Feature) ProtoMessage()    {}
+func (*Feature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{0}
+}
+func (m *Feature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Feature.Unmarshal(m, b)
+}
+func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
+}
+func (dst *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(dst, src)
+}
+func (m *Feature) XXX_Size() int {
+	return xxx_messageInfo_Feature.Size(m)
+}
+func (m *Feature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Feature.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Feature proto.InternalMessageInfo
+
+func (m *Feature) GetType() Feature_Type {
+	if m != nil {
+		return m.Type
+	}
+	return Feature_TYPE_UNSPECIFIED
+}
+
+func (m *Feature) GetMaxResults() int32 {
+	if m != nil {
+		return m.MaxResults
+	}
+	return 0
+}
+
+func (m *Feature) GetModel() string {
+	if m != nil {
+		return m.Model
+	}
+	return ""
+}
+
+// External image source (Google Cloud Storage or web URL image location).
+type ImageSource struct {
+	// **Use `image_uri` instead.**
+	//
+	// The Google Cloud Storage  URI of the form
+	// `gs://bucket_name/object_name`. Object versioning is not supported. See
+	// [Google Cloud Storage Request
+	// URIs](https://cloud.google.com/storage/docs/reference-uris) for more info.
+	GcsImageUri string `protobuf:"bytes,1,opt,name=gcs_image_uri,json=gcsImageUri,proto3" json:"gcs_image_uri,omitempty"`
+	// The URI of the source image. Can be either:
+	//
+	// 1. A Google Cloud Storage URI of the form
+	//    `gs://bucket_name/object_name`. Object versioning is not supported. See
+	//    [Google Cloud Storage Request
+	//    URIs](https://cloud.google.com/storage/docs/reference-uris) for more
+	//    info.
+	//
+	// 2. A publicly-accessible image HTTP/HTTPS URL. When fetching images from
+	//    HTTP/HTTPS URLs, Google cannot guarantee that the request will be
+	//    completed. Your request may fail if the specified host denies the
+	//    request (e.g. due to request throttling or DOS prevention), or if Google
+	//    throttles requests to the site for abuse prevention. You should not
+	//    depend on externally-hosted images for production applications.
+	//
+	// When both `gcs_image_uri` and `image_uri` are specified, `image_uri` takes
+	// precedence.
+	ImageUri             string   `protobuf:"bytes,2,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImageSource) Reset()         { *m = ImageSource{} }
+func (m *ImageSource) String() string { return proto.CompactTextString(m) }
+func (*ImageSource) ProtoMessage()    {}
+func (*ImageSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{1}
+}
+func (m *ImageSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageSource.Unmarshal(m, b)
+}
+func (m *ImageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageSource.Marshal(b, m, deterministic)
+}
+func (dst *ImageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageSource.Merge(dst, src)
+}
+func (m *ImageSource) XXX_Size() int {
+	return xxx_messageInfo_ImageSource.Size(m)
+}
+func (m *ImageSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageSource proto.InternalMessageInfo
+
+func (m *ImageSource) GetGcsImageUri() string {
+	if m != nil {
+		return m.GcsImageUri
+	}
+	return ""
+}
+
+func (m *ImageSource) GetImageUri() string {
+	if m != nil {
+		return m.ImageUri
+	}
+	return ""
+}
+
+// Client image to perform Google Cloud Vision API tasks over.
+type Image struct {
+	// Image content, represented as a stream of bytes.
+	// Note: As with all `bytes` fields, protobuffers use a pure binary
+	// representation, whereas JSON representations use base64.
+	Content []byte `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
+	// Google Cloud Storage image location, or publicly-accessible image
+	// URL. If both `content` and `source` are provided for an image, `content`
+	// takes precedence and is used to perform the image annotation request.
+	Source               *ImageSource `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Image) Reset()         { *m = Image{} }
+func (m *Image) String() string { return proto.CompactTextString(m) }
+func (*Image) ProtoMessage()    {}
+func (*Image) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{2}
+}
+func (m *Image) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Image.Unmarshal(m, b)
+}
+func (m *Image) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Image.Marshal(b, m, deterministic)
+}
+func (dst *Image) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Image.Merge(dst, src)
+}
+func (m *Image) XXX_Size() int {
+	return xxx_messageInfo_Image.Size(m)
+}
+func (m *Image) XXX_DiscardUnknown() {
+	xxx_messageInfo_Image.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Image proto.InternalMessageInfo
+
+func (m *Image) GetContent() []byte {
+	if m != nil {
+		return m.Content
+	}
+	return nil
+}
+
+func (m *Image) GetSource() *ImageSource {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+// A face annotation object contains the results of face detection.
+type FaceAnnotation struct {
+	// The bounding polygon around the face. The coordinates of the bounding box
+	// are in the original image's scale, as returned in `ImageParams`.
+	// The bounding box is computed to "frame" the face in accordance with human
+	// expectations. It is based on the landmarker results.
+	// Note that one or more x and/or y coordinates may not be generated in the
+	// `BoundingPoly` (the polygon will be unbounded) if only a partial face
+	// appears in the image to be annotated.
+	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
+	// The `fd_bounding_poly` bounding polygon is tighter than the
+	// `boundingPoly`, and encloses only the skin part of the face. Typically, it
+	// is used to eliminate the face from any image analysis that detects the
+	// "amount of skin" visible in an image. It is not based on the
+	// landmarker results, only on the initial face detection, hence
+	// the <code>fd</code> (face detection) prefix.
+	FdBoundingPoly *BoundingPoly `protobuf:"bytes,2,opt,name=fd_bounding_poly,json=fdBoundingPoly,proto3" json:"fd_bounding_poly,omitempty"`
+	// Detected face landmarks.
+	Landmarks []*FaceAnnotation_Landmark `protobuf:"bytes,3,rep,name=landmarks,proto3" json:"landmarks,omitempty"`
+	// Roll angle, which indicates the amount of clockwise/anti-clockwise rotation
+	// of the face relative to the image vertical about the axis perpendicular to
+	// the face. Range [-180,180].
+	RollAngle float32 `protobuf:"fixed32,4,opt,name=roll_angle,json=rollAngle,proto3" json:"roll_angle,omitempty"`
+	// Yaw angle, which indicates the leftward/rightward angle that the face is
+	// pointing relative to the vertical plane perpendicular to the image. Range
+	// [-180,180].
+	PanAngle float32 `protobuf:"fixed32,5,opt,name=pan_angle,json=panAngle,proto3" json:"pan_angle,omitempty"`
+	// Pitch angle, which indicates the upwards/downwards angle that the face is
+	// pointing relative to the image's horizontal plane. Range [-180,180].
+	TiltAngle float32 `protobuf:"fixed32,6,opt,name=tilt_angle,json=tiltAngle,proto3" json:"tilt_angle,omitempty"`
+	// Detection confidence. Range [0, 1].
+	DetectionConfidence float32 `protobuf:"fixed32,7,opt,name=detection_confidence,json=detectionConfidence,proto3" json:"detection_confidence,omitempty"`
+	// Face landmarking confidence. Range [0, 1].
+	LandmarkingConfidence float32 `protobuf:"fixed32,8,opt,name=landmarking_confidence,json=landmarkingConfidence,proto3" json:"landmarking_confidence,omitempty"`
+	// Joy likelihood.
+	JoyLikelihood Likelihood `protobuf:"varint,9,opt,name=joy_likelihood,json=joyLikelihood,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"joy_likelihood,omitempty"`
+	// Sorrow likelihood.
+	SorrowLikelihood Likelihood `protobuf:"varint,10,opt,name=sorrow_likelihood,json=sorrowLikelihood,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"sorrow_likelihood,omitempty"`
+	// Anger likelihood.
+	AngerLikelihood Likelihood `protobuf:"varint,11,opt,name=anger_likelihood,json=angerLikelihood,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"anger_likelihood,omitempty"`
+	// Surprise likelihood.
+	SurpriseLikelihood Likelihood `protobuf:"varint,12,opt,name=surprise_likelihood,json=surpriseLikelihood,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"surprise_likelihood,omitempty"`
+	// Under-exposed likelihood.
+	UnderExposedLikelihood Likelihood `protobuf:"varint,13,opt,name=under_exposed_likelihood,json=underExposedLikelihood,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"under_exposed_likelihood,omitempty"`
+	// Blurred likelihood.
+	BlurredLikelihood Likelihood `protobuf:"varint,14,opt,name=blurred_likelihood,json=blurredLikelihood,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"blurred_likelihood,omitempty"`
+	// Headwear likelihood.
+	HeadwearLikelihood   Likelihood `protobuf:"varint,15,opt,name=headwear_likelihood,json=headwearLikelihood,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"headwear_likelihood,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *FaceAnnotation) Reset()         { *m = FaceAnnotation{} }
+func (m *FaceAnnotation) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation) ProtoMessage()    {}
+func (*FaceAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{3}
+}
+func (m *FaceAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation.Unmarshal(m, b)
+}
+func (m *FaceAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation.Merge(dst, src)
+}
+func (m *FaceAnnotation) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation.Size(m)
+}
+func (m *FaceAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceAnnotation proto.InternalMessageInfo
+
+func (m *FaceAnnotation) GetBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.BoundingPoly
+	}
+	return nil
+}
+
+func (m *FaceAnnotation) GetFdBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.FdBoundingPoly
+	}
+	return nil
+}
+
+func (m *FaceAnnotation) GetLandmarks() []*FaceAnnotation_Landmark {
+	if m != nil {
+		return m.Landmarks
+	}
+	return nil
+}
+
+func (m *FaceAnnotation) GetRollAngle() float32 {
+	if m != nil {
+		return m.RollAngle
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetPanAngle() float32 {
+	if m != nil {
+		return m.PanAngle
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetTiltAngle() float32 {
+	if m != nil {
+		return m.TiltAngle
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetDetectionConfidence() float32 {
+	if m != nil {
+		return m.DetectionConfidence
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetLandmarkingConfidence() float32 {
+	if m != nil {
+		return m.LandmarkingConfidence
+	}
+	return 0
+}
+
+func (m *FaceAnnotation) GetJoyLikelihood() Likelihood {
+	if m != nil {
+		return m.JoyLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetSorrowLikelihood() Likelihood {
+	if m != nil {
+		return m.SorrowLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetAngerLikelihood() Likelihood {
+	if m != nil {
+		return m.AngerLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetSurpriseLikelihood() Likelihood {
+	if m != nil {
+		return m.SurpriseLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetUnderExposedLikelihood() Likelihood {
+	if m != nil {
+		return m.UnderExposedLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetBlurredLikelihood() Likelihood {
+	if m != nil {
+		return m.BlurredLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *FaceAnnotation) GetHeadwearLikelihood() Likelihood {
+	if m != nil {
+		return m.HeadwearLikelihood
+	}
+	return Likelihood_UNKNOWN
+}
+
+// A face-specific landmark (for example, a face feature).
+type FaceAnnotation_Landmark struct {
+	// Face landmark type.
+	Type FaceAnnotation_Landmark_Type `protobuf:"varint,3,opt,name=type,proto3,enum=google.cloud.vision.v1p3beta1.FaceAnnotation_Landmark_Type" json:"type,omitempty"`
+	// Face landmark position.
+	Position             *Position `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *FaceAnnotation_Landmark) Reset()         { *m = FaceAnnotation_Landmark{} }
+func (m *FaceAnnotation_Landmark) String() string { return proto.CompactTextString(m) }
+func (*FaceAnnotation_Landmark) ProtoMessage()    {}
+func (*FaceAnnotation_Landmark) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{3, 0}
+}
+func (m *FaceAnnotation_Landmark) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Unmarshal(m, b)
+}
+func (m *FaceAnnotation_Landmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Marshal(b, m, deterministic)
+}
+func (dst *FaceAnnotation_Landmark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FaceAnnotation_Landmark.Merge(dst, src)
+}
+func (m *FaceAnnotation_Landmark) XXX_Size() int {
+	return xxx_messageInfo_FaceAnnotation_Landmark.Size(m)
+}
+func (m *FaceAnnotation_Landmark) XXX_DiscardUnknown() {
+	xxx_messageInfo_FaceAnnotation_Landmark.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceAnnotation_Landmark proto.InternalMessageInfo
+
+func (m *FaceAnnotation_Landmark) GetType() FaceAnnotation_Landmark_Type {
+	if m != nil {
+		return m.Type
+	}
+	return FaceAnnotation_Landmark_UNKNOWN_LANDMARK
+}
+
+func (m *FaceAnnotation_Landmark) GetPosition() *Position {
+	if m != nil {
+		return m.Position
+	}
+	return nil
+}
+
+// Detected entity location information.
+type LocationInfo struct {
+	// lat/long location coordinates.
+	LatLng               *latlng.LatLng `protobuf:"bytes,1,opt,name=lat_lng,json=latLng,proto3" json:"lat_lng,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *LocationInfo) Reset()         { *m = LocationInfo{} }
+func (m *LocationInfo) String() string { return proto.CompactTextString(m) }
+func (*LocationInfo) ProtoMessage()    {}
+func (*LocationInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{4}
+}
+func (m *LocationInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocationInfo.Unmarshal(m, b)
+}
+func (m *LocationInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocationInfo.Marshal(b, m, deterministic)
+}
+func (dst *LocationInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocationInfo.Merge(dst, src)
+}
+func (m *LocationInfo) XXX_Size() int {
+	return xxx_messageInfo_LocationInfo.Size(m)
+}
+func (m *LocationInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocationInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LocationInfo proto.InternalMessageInfo
+
+func (m *LocationInfo) GetLatLng() *latlng.LatLng {
+	if m != nil {
+		return m.LatLng
+	}
+	return nil
+}
+
+// A `Property` consists of a user-supplied name/value pair.
+type Property struct {
+	// Name of the property.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Value of the property.
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	// Value of numeric properties.
+	Uint64Value          uint64   `protobuf:"varint,3,opt,name=uint64_value,json=uint64Value,proto3" json:"uint64_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Property) Reset()         { *m = Property{} }
+func (m *Property) String() string { return proto.CompactTextString(m) }
+func (*Property) ProtoMessage()    {}
+func (*Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{5}
+}
+func (m *Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Property.Unmarshal(m, b)
+}
+func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
+}
+func (dst *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(dst, src)
+}
+func (m *Property) XXX_Size() int {
+	return xxx_messageInfo_Property.Size(m)
+}
+func (m *Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Property.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Property proto.InternalMessageInfo
+
+func (m *Property) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Property) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+func (m *Property) GetUint64Value() uint64 {
+	if m != nil {
+		return m.Uint64Value
+	}
+	return 0
+}
+
+// Set of detected entity features.
+type EntityAnnotation struct {
+	// Opaque entity ID. Some IDs may be available in
+	// [Google Knowledge Graph Search
+	// API](https://developers.google.com/knowledge-graph/).
+	Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid,omitempty"`
+	// The language code for the locale in which the entity textual
+	// `description` is expressed.
+	Locale string `protobuf:"bytes,2,opt,name=locale,proto3" json:"locale,omitempty"`
+	// Entity textual description, expressed in its `locale` language.
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// Overall score of the result. Range [0, 1].
+	Score float32 `protobuf:"fixed32,4,opt,name=score,proto3" json:"score,omitempty"`
+	// **Deprecated. Use `score` instead.**
+	// The accuracy of the entity detection in an image.
+	// For example, for an image in which the "Eiffel Tower" entity is detected,
+	// this field represents the confidence that there is a tower in the query
+	// image. Range [0, 1].
+	Confidence float32 `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	// The relevancy of the ICA (Image Content Annotation) label to the
+	// image. For example, the relevancy of "tower" is likely higher to an image
+	// containing the detected "Eiffel Tower" than to an image containing a
+	// detected distant towering building, even though the confidence that
+	// there is a tower in each image may be the same. Range [0, 1].
+	Topicality float32 `protobuf:"fixed32,6,opt,name=topicality,proto3" json:"topicality,omitempty"`
+	// Image region to which this entity belongs. Not produced
+	// for `LABEL_DETECTION` features.
+	BoundingPoly *BoundingPoly `protobuf:"bytes,7,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
+	// The location information for the detected entity. Multiple
+	// `LocationInfo` elements can be present because one location may
+	// indicate the location of the scene in the image, and another location
+	// may indicate the location of the place where the image was taken.
+	// Location information is usually present for landmarks.
+	Locations []*LocationInfo `protobuf:"bytes,8,rep,name=locations,proto3" json:"locations,omitempty"`
+	// Some entities may have optional user-supplied `Property` (name/value)
+	// fields, such a score or string that qualifies the entity.
+	Properties           []*Property `protobuf:"bytes,9,rep,name=properties,proto3" json:"properties,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *EntityAnnotation) Reset()         { *m = EntityAnnotation{} }
+func (m *EntityAnnotation) String() string { return proto.CompactTextString(m) }
+func (*EntityAnnotation) ProtoMessage()    {}
+func (*EntityAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{6}
+}
+func (m *EntityAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityAnnotation.Unmarshal(m, b)
+}
+func (m *EntityAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *EntityAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityAnnotation.Merge(dst, src)
+}
+func (m *EntityAnnotation) XXX_Size() int {
+	return xxx_messageInfo_EntityAnnotation.Size(m)
+}
+func (m *EntityAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityAnnotation proto.InternalMessageInfo
+
+func (m *EntityAnnotation) GetMid() string {
+	if m != nil {
+		return m.Mid
+	}
+	return ""
+}
+
+func (m *EntityAnnotation) GetLocale() string {
+	if m != nil {
+		return m.Locale
+	}
+	return ""
+}
+
+func (m *EntityAnnotation) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *EntityAnnotation) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *EntityAnnotation) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+func (m *EntityAnnotation) GetTopicality() float32 {
+	if m != nil {
+		return m.Topicality
+	}
+	return 0
+}
+
+func (m *EntityAnnotation) GetBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.BoundingPoly
+	}
+	return nil
+}
+
+func (m *EntityAnnotation) GetLocations() []*LocationInfo {
+	if m != nil {
+		return m.Locations
+	}
+	return nil
+}
+
+func (m *EntityAnnotation) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+// Set of detected objects with bounding boxes.
+type LocalizedObjectAnnotation struct {
+	// Object ID that should align with EntityAnnotation mid.
+	Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid,omitempty"`
+	// The BCP-47 language code, such as "en-US" or "sr-Latn". For more
+	// information, see
+	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
+	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Object name, expressed in its `language_code` language.
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	// Score of the result. Range [0, 1].
+	Score float32 `protobuf:"fixed32,4,opt,name=score,proto3" json:"score,omitempty"`
+	// Image region to which this object belongs. This must be populated.
+	BoundingPoly         *BoundingPoly `protobuf:"bytes,5,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *LocalizedObjectAnnotation) Reset()         { *m = LocalizedObjectAnnotation{} }
+func (m *LocalizedObjectAnnotation) String() string { return proto.CompactTextString(m) }
+func (*LocalizedObjectAnnotation) ProtoMessage()    {}
+func (*LocalizedObjectAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{7}
+}
+func (m *LocalizedObjectAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocalizedObjectAnnotation.Unmarshal(m, b)
+}
+func (m *LocalizedObjectAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocalizedObjectAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *LocalizedObjectAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalizedObjectAnnotation.Merge(dst, src)
+}
+func (m *LocalizedObjectAnnotation) XXX_Size() int {
+	return xxx_messageInfo_LocalizedObjectAnnotation.Size(m)
+}
+func (m *LocalizedObjectAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocalizedObjectAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LocalizedObjectAnnotation proto.InternalMessageInfo
+
+func (m *LocalizedObjectAnnotation) GetMid() string {
+	if m != nil {
+		return m.Mid
+	}
+	return ""
+}
+
+func (m *LocalizedObjectAnnotation) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *LocalizedObjectAnnotation) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *LocalizedObjectAnnotation) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *LocalizedObjectAnnotation) GetBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.BoundingPoly
+	}
+	return nil
+}
+
+// Set of features pertaining to the image, computed by computer vision
+// methods over safe-search verticals (for example, adult, spoof, medical,
+// violence).
+type SafeSearchAnnotation struct {
+	// Represents the adult content likelihood for the image. Adult content may
+	// contain elements such as nudity, pornographic images or cartoons, or
+	// sexual activities.
+	Adult Likelihood `protobuf:"varint,1,opt,name=adult,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"adult,omitempty"`
+	// Spoof likelihood. The likelihood that an modification
+	// was made to the image's canonical version to make it appear
+	// funny or offensive.
+	Spoof Likelihood `protobuf:"varint,2,opt,name=spoof,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"spoof,omitempty"`
+	// Likelihood that this is a medical image.
+	Medical Likelihood `protobuf:"varint,3,opt,name=medical,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"medical,omitempty"`
+	// Likelihood that this image contains violent content.
+	Violence Likelihood `protobuf:"varint,4,opt,name=violence,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"violence,omitempty"`
+	// Likelihood that the request image contains racy content. Racy content may
+	// include (but is not limited to) skimpy or sheer clothing, strategically
+	// covered nudity, lewd or provocative poses, or close-ups of sensitive
+	// body areas.
+	Racy                 Likelihood `protobuf:"varint,9,opt,name=racy,proto3,enum=google.cloud.vision.v1p3beta1.Likelihood" json:"racy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *SafeSearchAnnotation) Reset()         { *m = SafeSearchAnnotation{} }
+func (m *SafeSearchAnnotation) String() string { return proto.CompactTextString(m) }
+func (*SafeSearchAnnotation) ProtoMessage()    {}
+func (*SafeSearchAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{8}
+}
+func (m *SafeSearchAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SafeSearchAnnotation.Unmarshal(m, b)
+}
+func (m *SafeSearchAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SafeSearchAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *SafeSearchAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SafeSearchAnnotation.Merge(dst, src)
+}
+func (m *SafeSearchAnnotation) XXX_Size() int {
+	return xxx_messageInfo_SafeSearchAnnotation.Size(m)
+}
+func (m *SafeSearchAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_SafeSearchAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SafeSearchAnnotation proto.InternalMessageInfo
+
+func (m *SafeSearchAnnotation) GetAdult() Likelihood {
+	if m != nil {
+		return m.Adult
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *SafeSearchAnnotation) GetSpoof() Likelihood {
+	if m != nil {
+		return m.Spoof
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *SafeSearchAnnotation) GetMedical() Likelihood {
+	if m != nil {
+		return m.Medical
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *SafeSearchAnnotation) GetViolence() Likelihood {
+	if m != nil {
+		return m.Violence
+	}
+	return Likelihood_UNKNOWN
+}
+
+func (m *SafeSearchAnnotation) GetRacy() Likelihood {
+	if m != nil {
+		return m.Racy
+	}
+	return Likelihood_UNKNOWN
+}
+
+// Rectangle determined by min and max `LatLng` pairs.
+type LatLongRect struct {
+	// Min lat/long pair.
+	MinLatLng *latlng.LatLng `protobuf:"bytes,1,opt,name=min_lat_lng,json=minLatLng,proto3" json:"min_lat_lng,omitempty"`
+	// Max lat/long pair.
+	MaxLatLng            *latlng.LatLng `protobuf:"bytes,2,opt,name=max_lat_lng,json=maxLatLng,proto3" json:"max_lat_lng,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *LatLongRect) Reset()         { *m = LatLongRect{} }
+func (m *LatLongRect) String() string { return proto.CompactTextString(m) }
+func (*LatLongRect) ProtoMessage()    {}
+func (*LatLongRect) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{9}
+}
+func (m *LatLongRect) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LatLongRect.Unmarshal(m, b)
+}
+func (m *LatLongRect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LatLongRect.Marshal(b, m, deterministic)
+}
+func (dst *LatLongRect) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLongRect.Merge(dst, src)
+}
+func (m *LatLongRect) XXX_Size() int {
+	return xxx_messageInfo_LatLongRect.Size(m)
+}
+func (m *LatLongRect) XXX_DiscardUnknown() {
+	xxx_messageInfo_LatLongRect.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LatLongRect proto.InternalMessageInfo
+
+func (m *LatLongRect) GetMinLatLng() *latlng.LatLng {
+	if m != nil {
+		return m.MinLatLng
+	}
+	return nil
+}
+
+func (m *LatLongRect) GetMaxLatLng() *latlng.LatLng {
+	if m != nil {
+		return m.MaxLatLng
+	}
+	return nil
+}
+
+// Color information consists of RGB channels, score, and the fraction of
+// the image that the color occupies in the image.
+type ColorInfo struct {
+	// RGB components of the color.
+	Color *color.Color `protobuf:"bytes,1,opt,name=color,proto3" json:"color,omitempty"`
+	// Image-specific score for this color. Value in range [0, 1].
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	// The fraction of pixels the color occupies in the image.
+	// Value in range [0, 1].
+	PixelFraction        float32  `protobuf:"fixed32,3,opt,name=pixel_fraction,json=pixelFraction,proto3" json:"pixel_fraction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ColorInfo) Reset()         { *m = ColorInfo{} }
+func (m *ColorInfo) String() string { return proto.CompactTextString(m) }
+func (*ColorInfo) ProtoMessage()    {}
+func (*ColorInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{10}
+}
+func (m *ColorInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColorInfo.Unmarshal(m, b)
+}
+func (m *ColorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColorInfo.Marshal(b, m, deterministic)
+}
+func (dst *ColorInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColorInfo.Merge(dst, src)
+}
+func (m *ColorInfo) XXX_Size() int {
+	return xxx_messageInfo_ColorInfo.Size(m)
+}
+func (m *ColorInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColorInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ColorInfo proto.InternalMessageInfo
+
+func (m *ColorInfo) GetColor() *color.Color {
+	if m != nil {
+		return m.Color
+	}
+	return nil
+}
+
+func (m *ColorInfo) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *ColorInfo) GetPixelFraction() float32 {
+	if m != nil {
+		return m.PixelFraction
+	}
+	return 0
+}
+
+// Set of dominant colors and their corresponding scores.
+type DominantColorsAnnotation struct {
+	// RGB color values with their score and pixel fraction.
+	Colors               []*ColorInfo `protobuf:"bytes,1,rep,name=colors,proto3" json:"colors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *DominantColorsAnnotation) Reset()         { *m = DominantColorsAnnotation{} }
+func (m *DominantColorsAnnotation) String() string { return proto.CompactTextString(m) }
+func (*DominantColorsAnnotation) ProtoMessage()    {}
+func (*DominantColorsAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{11}
+}
+func (m *DominantColorsAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DominantColorsAnnotation.Unmarshal(m, b)
+}
+func (m *DominantColorsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DominantColorsAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *DominantColorsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DominantColorsAnnotation.Merge(dst, src)
+}
+func (m *DominantColorsAnnotation) XXX_Size() int {
+	return xxx_messageInfo_DominantColorsAnnotation.Size(m)
+}
+func (m *DominantColorsAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_DominantColorsAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DominantColorsAnnotation proto.InternalMessageInfo
+
+func (m *DominantColorsAnnotation) GetColors() []*ColorInfo {
+	if m != nil {
+		return m.Colors
+	}
+	return nil
+}
+
+// Stores image properties, such as dominant colors.
+type ImageProperties struct {
+	// If present, dominant colors completed successfully.
+	DominantColors       *DominantColorsAnnotation `protobuf:"bytes,1,opt,name=dominant_colors,json=dominantColors,proto3" json:"dominant_colors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *ImageProperties) Reset()         { *m = ImageProperties{} }
+func (m *ImageProperties) String() string { return proto.CompactTextString(m) }
+func (*ImageProperties) ProtoMessage()    {}
+func (*ImageProperties) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{12}
+}
+func (m *ImageProperties) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageProperties.Unmarshal(m, b)
+}
+func (m *ImageProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageProperties.Marshal(b, m, deterministic)
+}
+func (dst *ImageProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageProperties.Merge(dst, src)
+}
+func (m *ImageProperties) XXX_Size() int {
+	return xxx_messageInfo_ImageProperties.Size(m)
+}
+func (m *ImageProperties) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageProperties.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageProperties proto.InternalMessageInfo
+
+func (m *ImageProperties) GetDominantColors() *DominantColorsAnnotation {
+	if m != nil {
+		return m.DominantColors
+	}
+	return nil
+}
+
+// Single crop hint that is used to generate a new crop when serving an image.
+type CropHint struct {
+	// The bounding polygon for the crop region. The coordinates of the bounding
+	// box are in the original image's scale, as returned in `ImageParams`.
+	BoundingPoly *BoundingPoly `protobuf:"bytes,1,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
+	// Confidence of this being a salient region.  Range [0, 1].
+	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	// Fraction of importance of this salient region with respect to the original
+	// image.
+	ImportanceFraction   float32  `protobuf:"fixed32,3,opt,name=importance_fraction,json=importanceFraction,proto3" json:"importance_fraction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CropHint) Reset()         { *m = CropHint{} }
+func (m *CropHint) String() string { return proto.CompactTextString(m) }
+func (*CropHint) ProtoMessage()    {}
+func (*CropHint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{13}
+}
+func (m *CropHint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHint.Unmarshal(m, b)
+}
+func (m *CropHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHint.Marshal(b, m, deterministic)
+}
+func (dst *CropHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHint.Merge(dst, src)
+}
+func (m *CropHint) XXX_Size() int {
+	return xxx_messageInfo_CropHint.Size(m)
+}
+func (m *CropHint) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CropHint proto.InternalMessageInfo
+
+func (m *CropHint) GetBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.BoundingPoly
+	}
+	return nil
+}
+
+func (m *CropHint) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+func (m *CropHint) GetImportanceFraction() float32 {
+	if m != nil {
+		return m.ImportanceFraction
+	}
+	return 0
+}
+
+// Set of crop hints that are used to generate new crops when serving images.
+type CropHintsAnnotation struct {
+	// Crop hint results.
+	CropHints            []*CropHint `protobuf:"bytes,1,rep,name=crop_hints,json=cropHints,proto3" json:"crop_hints,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *CropHintsAnnotation) Reset()         { *m = CropHintsAnnotation{} }
+func (m *CropHintsAnnotation) String() string { return proto.CompactTextString(m) }
+func (*CropHintsAnnotation) ProtoMessage()    {}
+func (*CropHintsAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{14}
+}
+func (m *CropHintsAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHintsAnnotation.Unmarshal(m, b)
+}
+func (m *CropHintsAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHintsAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *CropHintsAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsAnnotation.Merge(dst, src)
+}
+func (m *CropHintsAnnotation) XXX_Size() int {
+	return xxx_messageInfo_CropHintsAnnotation.Size(m)
+}
+func (m *CropHintsAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHintsAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CropHintsAnnotation proto.InternalMessageInfo
+
+func (m *CropHintsAnnotation) GetCropHints() []*CropHint {
+	if m != nil {
+		return m.CropHints
+	}
+	return nil
+}
+
+// Parameters for crop hints annotation request.
+type CropHintsParams struct {
+	// Aspect ratios in floats, representing the ratio of the width to the height
+	// of the image. For example, if the desired aspect ratio is 4/3, the
+	// corresponding float value should be 1.33333.  If not specified, the
+	// best possible crop is returned. The number of provided aspect ratios is
+	// limited to a maximum of 16; any aspect ratios provided after the 16th are
+	// ignored.
+	AspectRatios         []float32 `protobuf:"fixed32,1,rep,packed,name=aspect_ratios,json=aspectRatios,proto3" json:"aspect_ratios,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CropHintsParams) Reset()         { *m = CropHintsParams{} }
+func (m *CropHintsParams) String() string { return proto.CompactTextString(m) }
+func (*CropHintsParams) ProtoMessage()    {}
+func (*CropHintsParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{15}
+}
+func (m *CropHintsParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CropHintsParams.Unmarshal(m, b)
+}
+func (m *CropHintsParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CropHintsParams.Marshal(b, m, deterministic)
+}
+func (dst *CropHintsParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CropHintsParams.Merge(dst, src)
+}
+func (m *CropHintsParams) XXX_Size() int {
+	return xxx_messageInfo_CropHintsParams.Size(m)
+}
+func (m *CropHintsParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_CropHintsParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CropHintsParams proto.InternalMessageInfo
+
+func (m *CropHintsParams) GetAspectRatios() []float32 {
+	if m != nil {
+		return m.AspectRatios
+	}
+	return nil
+}
+
+// Parameters for web detection request.
+type WebDetectionParams struct {
+	// Whether to include results derived from the geo information in the image.
+	IncludeGeoResults    bool     `protobuf:"varint,2,opt,name=include_geo_results,json=includeGeoResults,proto3" json:"include_geo_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetectionParams) Reset()         { *m = WebDetectionParams{} }
+func (m *WebDetectionParams) String() string { return proto.CompactTextString(m) }
+func (*WebDetectionParams) ProtoMessage()    {}
+func (*WebDetectionParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{16}
+}
+func (m *WebDetectionParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetectionParams.Unmarshal(m, b)
+}
+func (m *WebDetectionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetectionParams.Marshal(b, m, deterministic)
+}
+func (dst *WebDetectionParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetectionParams.Merge(dst, src)
+}
+func (m *WebDetectionParams) XXX_Size() int {
+	return xxx_messageInfo_WebDetectionParams.Size(m)
+}
+func (m *WebDetectionParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetectionParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetectionParams proto.InternalMessageInfo
+
+func (m *WebDetectionParams) GetIncludeGeoResults() bool {
+	if m != nil {
+		return m.IncludeGeoResults
+	}
+	return false
+}
+
+// Image context and/or feature-specific parameters.
+type ImageContext struct {
+	// Not used.
+	LatLongRect *LatLongRect `protobuf:"bytes,1,opt,name=lat_long_rect,json=latLongRect,proto3" json:"lat_long_rect,omitempty"`
+	// List of languages to use for TEXT_DETECTION. In most cases, an empty value
+	// yields the best results since it enables automatic language detection. For
+	// languages based on the Latin alphabet, setting `language_hints` is not
+	// needed. In rare cases, when the language of the text in the image is known,
+	// setting a hint will help get better results (although it will be a
+	// significant hindrance if the hint is wrong). Text detection returns an
+	// error if one or more of the specified languages is not one of the
+	// [supported languages](/vision/docs/languages).
+	LanguageHints []string `protobuf:"bytes,2,rep,name=language_hints,json=languageHints,proto3" json:"language_hints,omitempty"`
+	// Parameters for crop hints annotation request.
+	CropHintsParams *CropHintsParams `protobuf:"bytes,4,opt,name=crop_hints_params,json=cropHintsParams,proto3" json:"crop_hints_params,omitempty"`
+	// Parameters for product search.
+	ProductSearchParams *ProductSearchParams `protobuf:"bytes,5,opt,name=product_search_params,json=productSearchParams,proto3" json:"product_search_params,omitempty"`
+	// Parameters for web detection.
+	WebDetectionParams   *WebDetectionParams `protobuf:"bytes,6,opt,name=web_detection_params,json=webDetectionParams,proto3" json:"web_detection_params,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *ImageContext) Reset()         { *m = ImageContext{} }
+func (m *ImageContext) String() string { return proto.CompactTextString(m) }
+func (*ImageContext) ProtoMessage()    {}
+func (*ImageContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{17}
+}
+func (m *ImageContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageContext.Unmarshal(m, b)
+}
+func (m *ImageContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageContext.Marshal(b, m, deterministic)
+}
+func (dst *ImageContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageContext.Merge(dst, src)
+}
+func (m *ImageContext) XXX_Size() int {
+	return xxx_messageInfo_ImageContext.Size(m)
+}
+func (m *ImageContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageContext proto.InternalMessageInfo
+
+func (m *ImageContext) GetLatLongRect() *LatLongRect {
+	if m != nil {
+		return m.LatLongRect
+	}
+	return nil
+}
+
+func (m *ImageContext) GetLanguageHints() []string {
+	if m != nil {
+		return m.LanguageHints
+	}
+	return nil
+}
+
+func (m *ImageContext) GetCropHintsParams() *CropHintsParams {
+	if m != nil {
+		return m.CropHintsParams
+	}
+	return nil
+}
+
+func (m *ImageContext) GetProductSearchParams() *ProductSearchParams {
+	if m != nil {
+		return m.ProductSearchParams
+	}
+	return nil
+}
+
+func (m *ImageContext) GetWebDetectionParams() *WebDetectionParams {
+	if m != nil {
+		return m.WebDetectionParams
+	}
+	return nil
+}
+
+// Request for performing Google Cloud Vision API tasks over a user-provided
+// image, with user-requested features.
+type AnnotateImageRequest struct {
+	// The image to be processed.
+	Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
+	// Requested features.
+	Features []*Feature `protobuf:"bytes,2,rep,name=features,proto3" json:"features,omitempty"`
+	// Additional context that may accompany the image.
+	ImageContext         *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext,proto3" json:"image_context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AnnotateImageRequest) Reset()         { *m = AnnotateImageRequest{} }
+func (m *AnnotateImageRequest) String() string { return proto.CompactTextString(m) }
+func (*AnnotateImageRequest) ProtoMessage()    {}
+func (*AnnotateImageRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{18}
+}
+func (m *AnnotateImageRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateImageRequest.Unmarshal(m, b)
+}
+func (m *AnnotateImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateImageRequest.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageRequest.Merge(dst, src)
+}
+func (m *AnnotateImageRequest) XXX_Size() int {
+	return xxx_messageInfo_AnnotateImageRequest.Size(m)
+}
+func (m *AnnotateImageRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateImageRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateImageRequest proto.InternalMessageInfo
+
+func (m *AnnotateImageRequest) GetImage() *Image {
+	if m != nil {
+		return m.Image
+	}
+	return nil
+}
+
+func (m *AnnotateImageRequest) GetFeatures() []*Feature {
+	if m != nil {
+		return m.Features
+	}
+	return nil
+}
+
+func (m *AnnotateImageRequest) GetImageContext() *ImageContext {
+	if m != nil {
+		return m.ImageContext
+	}
+	return nil
+}
+
+// If an image was produced from a file (e.g. a PDF), this message gives
+// information about the source of that image.
+type ImageAnnotationContext struct {
+	// The URI of the file used to produce the image.
+	Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	// If the file was a PDF or TIFF, this field gives the page number within
+	// the file used to produce the image.
+	PageNumber           int32    `protobuf:"varint,2,opt,name=page_number,json=pageNumber,proto3" json:"page_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImageAnnotationContext) Reset()         { *m = ImageAnnotationContext{} }
+func (m *ImageAnnotationContext) String() string { return proto.CompactTextString(m) }
+func (*ImageAnnotationContext) ProtoMessage()    {}
+func (*ImageAnnotationContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{19}
+}
+func (m *ImageAnnotationContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageAnnotationContext.Unmarshal(m, b)
+}
+func (m *ImageAnnotationContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageAnnotationContext.Marshal(b, m, deterministic)
+}
+func (dst *ImageAnnotationContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageAnnotationContext.Merge(dst, src)
+}
+func (m *ImageAnnotationContext) XXX_Size() int {
+	return xxx_messageInfo_ImageAnnotationContext.Size(m)
+}
+func (m *ImageAnnotationContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageAnnotationContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageAnnotationContext proto.InternalMessageInfo
+
+func (m *ImageAnnotationContext) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+func (m *ImageAnnotationContext) GetPageNumber() int32 {
+	if m != nil {
+		return m.PageNumber
+	}
+	return 0
+}
+
+// Response to an image annotation request.
+type AnnotateImageResponse struct {
+	// If present, face detection has completed successfully.
+	FaceAnnotations []*FaceAnnotation `protobuf:"bytes,1,rep,name=face_annotations,json=faceAnnotations,proto3" json:"face_annotations,omitempty"`
+	// If present, landmark detection has completed successfully.
+	LandmarkAnnotations []*EntityAnnotation `protobuf:"bytes,2,rep,name=landmark_annotations,json=landmarkAnnotations,proto3" json:"landmark_annotations,omitempty"`
+	// If present, logo detection has completed successfully.
+	LogoAnnotations []*EntityAnnotation `protobuf:"bytes,3,rep,name=logo_annotations,json=logoAnnotations,proto3" json:"logo_annotations,omitempty"`
+	// If present, label detection has completed successfully.
+	LabelAnnotations []*EntityAnnotation `protobuf:"bytes,4,rep,name=label_annotations,json=labelAnnotations,proto3" json:"label_annotations,omitempty"`
+	// If present, localized object detection has completed successfully.
+	// This will be sorted descending by confidence score.
+	LocalizedObjectAnnotations []*LocalizedObjectAnnotation `protobuf:"bytes,22,rep,name=localized_object_annotations,json=localizedObjectAnnotations,proto3" json:"localized_object_annotations,omitempty"`
+	// If present, text (OCR) detection has completed successfully.
+	TextAnnotations []*EntityAnnotation `protobuf:"bytes,5,rep,name=text_annotations,json=textAnnotations,proto3" json:"text_annotations,omitempty"`
+	// If present, text (OCR) detection or document (OCR) text detection has
+	// completed successfully.
+	// This annotation provides the structural hierarchy for the OCR detected
+	// text.
+	FullTextAnnotation *TextAnnotation `protobuf:"bytes,12,opt,name=full_text_annotation,json=fullTextAnnotation,proto3" json:"full_text_annotation,omitempty"`
+	// If present, safe-search annotation has completed successfully.
+	SafeSearchAnnotation *SafeSearchAnnotation `protobuf:"bytes,6,opt,name=safe_search_annotation,json=safeSearchAnnotation,proto3" json:"safe_search_annotation,omitempty"`
+	// If present, image properties were extracted successfully.
+	ImagePropertiesAnnotation *ImageProperties `protobuf:"bytes,8,opt,name=image_properties_annotation,json=imagePropertiesAnnotation,proto3" json:"image_properties_annotation,omitempty"`
+	// If present, crop hints have completed successfully.
+	CropHintsAnnotation *CropHintsAnnotation `protobuf:"bytes,11,opt,name=crop_hints_annotation,json=cropHintsAnnotation,proto3" json:"crop_hints_annotation,omitempty"`
+	// If present, web detection has completed successfully.
+	WebDetection *WebDetection `protobuf:"bytes,13,opt,name=web_detection,json=webDetection,proto3" json:"web_detection,omitempty"`
+	// If present, product search has completed successfully.
+	ProductSearchResults *ProductSearchResults `protobuf:"bytes,14,opt,name=product_search_results,json=productSearchResults,proto3" json:"product_search_results,omitempty"`
+	// If set, represents the error message for the operation.
+	// Note that filled-in image annotations are guaranteed to be
+	// correct, even when `error` is set.
+	Error *status.Status `protobuf:"bytes,9,opt,name=error,proto3" json:"error,omitempty"`
+	// If present, contextual information is needed to understand where this image
+	// comes from.
+	Context              *ImageAnnotationContext `protobuf:"bytes,21,opt,name=context,proto3" json:"context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *AnnotateImageResponse) Reset()         { *m = AnnotateImageResponse{} }
+func (m *AnnotateImageResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateImageResponse) ProtoMessage()    {}
+func (*AnnotateImageResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{20}
+}
+func (m *AnnotateImageResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateImageResponse.Unmarshal(m, b)
+}
+func (m *AnnotateImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateImageResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateImageResponse.Merge(dst, src)
+}
+func (m *AnnotateImageResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateImageResponse.Size(m)
+}
+func (m *AnnotateImageResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateImageResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateImageResponse proto.InternalMessageInfo
+
+func (m *AnnotateImageResponse) GetFaceAnnotations() []*FaceAnnotation {
+	if m != nil {
+		return m.FaceAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetLandmarkAnnotations() []*EntityAnnotation {
+	if m != nil {
+		return m.LandmarkAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetLogoAnnotations() []*EntityAnnotation {
+	if m != nil {
+		return m.LogoAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetLabelAnnotations() []*EntityAnnotation {
+	if m != nil {
+		return m.LabelAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetLocalizedObjectAnnotations() []*LocalizedObjectAnnotation {
+	if m != nil {
+		return m.LocalizedObjectAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetTextAnnotations() []*EntityAnnotation {
+	if m != nil {
+		return m.TextAnnotations
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetFullTextAnnotation() *TextAnnotation {
+	if m != nil {
+		return m.FullTextAnnotation
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetSafeSearchAnnotation() *SafeSearchAnnotation {
+	if m != nil {
+		return m.SafeSearchAnnotation
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetImagePropertiesAnnotation() *ImageProperties {
+	if m != nil {
+		return m.ImagePropertiesAnnotation
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetCropHintsAnnotation() *CropHintsAnnotation {
+	if m != nil {
+		return m.CropHintsAnnotation
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetWebDetection() *WebDetection {
+	if m != nil {
+		return m.WebDetection
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetProductSearchResults() *ProductSearchResults {
+	if m != nil {
+		return m.ProductSearchResults
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetError() *status.Status {
+	if m != nil {
+		return m.Error
+	}
+	return nil
+}
+
+func (m *AnnotateImageResponse) GetContext() *ImageAnnotationContext {
+	if m != nil {
+		return m.Context
+	}
+	return nil
+}
+
+// Response to a single file annotation request. A file may contain one or more
+// images, which individually have their own responses.
+type AnnotateFileResponse struct {
+	// Information about the file for which this response is generated.
+	InputConfig *InputConfig `protobuf:"bytes,1,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
+	// Individual responses to images found within the file.
+	Responses            []*AnnotateImageResponse `protobuf:"bytes,2,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *AnnotateFileResponse) Reset()         { *m = AnnotateFileResponse{} }
+func (m *AnnotateFileResponse) String() string { return proto.CompactTextString(m) }
+func (*AnnotateFileResponse) ProtoMessage()    {}
+func (*AnnotateFileResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{21}
+}
+func (m *AnnotateFileResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotateFileResponse.Unmarshal(m, b)
+}
+func (m *AnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotateFileResponse.Marshal(b, m, deterministic)
+}
+func (dst *AnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotateFileResponse.Merge(dst, src)
+}
+func (m *AnnotateFileResponse) XXX_Size() int {
+	return xxx_messageInfo_AnnotateFileResponse.Size(m)
+}
+func (m *AnnotateFileResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotateFileResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnnotateFileResponse proto.InternalMessageInfo
+
+func (m *AnnotateFileResponse) GetInputConfig() *InputConfig {
+	if m != nil {
+		return m.InputConfig
+	}
+	return nil
+}
+
+func (m *AnnotateFileResponse) GetResponses() []*AnnotateImageResponse {
+	if m != nil {
+		return m.Responses
+	}
+	return nil
+}
+
+// Multiple image annotation requests are batched into a single service call.
+type BatchAnnotateImagesRequest struct {
+	// Individual image annotation requests for this batch.
+	Requests             []*AnnotateImageRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *BatchAnnotateImagesRequest) Reset()         { *m = BatchAnnotateImagesRequest{} }
+func (m *BatchAnnotateImagesRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchAnnotateImagesRequest) ProtoMessage()    {}
+func (*BatchAnnotateImagesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{22}
+}
+func (m *BatchAnnotateImagesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Unmarshal(m, b)
+}
+func (m *BatchAnnotateImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchAnnotateImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesRequest.Merge(dst, src)
+}
+func (m *BatchAnnotateImagesRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchAnnotateImagesRequest.Size(m)
+}
+func (m *BatchAnnotateImagesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchAnnotateImagesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchAnnotateImagesRequest proto.InternalMessageInfo
+
+func (m *BatchAnnotateImagesRequest) GetRequests() []*AnnotateImageRequest {
+	if m != nil {
+		return m.Requests
+	}
+	return nil
+}
+
+// Response to a batch image annotation request.
+type BatchAnnotateImagesResponse struct {
+	// Individual responses to image annotation requests within the batch.
+	Responses            []*AnnotateImageResponse `protobuf:"bytes,1,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *BatchAnnotateImagesResponse) Reset()         { *m = BatchAnnotateImagesResponse{} }
+func (m *BatchAnnotateImagesResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchAnnotateImagesResponse) ProtoMessage()    {}
+func (*BatchAnnotateImagesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{23}
+}
+func (m *BatchAnnotateImagesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Unmarshal(m, b)
+}
+func (m *BatchAnnotateImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchAnnotateImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchAnnotateImagesResponse.Merge(dst, src)
+}
+func (m *BatchAnnotateImagesResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchAnnotateImagesResponse.Size(m)
+}
+func (m *BatchAnnotateImagesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchAnnotateImagesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchAnnotateImagesResponse proto.InternalMessageInfo
+
+func (m *BatchAnnotateImagesResponse) GetResponses() []*AnnotateImageResponse {
+	if m != nil {
+		return m.Responses
+	}
+	return nil
+}
+
+// An offline file annotation request.
+type AsyncAnnotateFileRequest struct {
+	// Required. Information about the input file.
+	InputConfig *InputConfig `protobuf:"bytes,1,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
+	// Required. Requested features.
+	Features []*Feature `protobuf:"bytes,2,rep,name=features,proto3" json:"features,omitempty"`
+	// Additional context that may accompany the image(s) in the file.
+	ImageContext *ImageContext `protobuf:"bytes,3,opt,name=image_context,json=imageContext,proto3" json:"image_context,omitempty"`
+	// Required. The desired output location and metadata (e.g. format).
+	OutputConfig         *OutputConfig `protobuf:"bytes,4,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AsyncAnnotateFileRequest) Reset()         { *m = AsyncAnnotateFileRequest{} }
+func (m *AsyncAnnotateFileRequest) String() string { return proto.CompactTextString(m) }
+func (*AsyncAnnotateFileRequest) ProtoMessage()    {}
+func (*AsyncAnnotateFileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{24}
+}
+func (m *AsyncAnnotateFileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Unmarshal(m, b)
+}
+func (m *AsyncAnnotateFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Marshal(b, m, deterministic)
+}
+func (dst *AsyncAnnotateFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileRequest.Merge(dst, src)
+}
+func (m *AsyncAnnotateFileRequest) XXX_Size() int {
+	return xxx_messageInfo_AsyncAnnotateFileRequest.Size(m)
+}
+func (m *AsyncAnnotateFileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncAnnotateFileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncAnnotateFileRequest proto.InternalMessageInfo
+
+func (m *AsyncAnnotateFileRequest) GetInputConfig() *InputConfig {
+	if m != nil {
+		return m.InputConfig
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetFeatures() []*Feature {
+	if m != nil {
+		return m.Features
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetImageContext() *ImageContext {
+	if m != nil {
+		return m.ImageContext
+	}
+	return nil
+}
+
+func (m *AsyncAnnotateFileRequest) GetOutputConfig() *OutputConfig {
+	if m != nil {
+		return m.OutputConfig
+	}
+	return nil
+}
+
+// The response for a single offline file annotation request.
+type AsyncAnnotateFileResponse struct {
+	// The output location and metadata from AsyncAnnotateFileRequest.
+	OutputConfig         *OutputConfig `protobuf:"bytes,1,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *AsyncAnnotateFileResponse) Reset()         { *m = AsyncAnnotateFileResponse{} }
+func (m *AsyncAnnotateFileResponse) String() string { return proto.CompactTextString(m) }
+func (*AsyncAnnotateFileResponse) ProtoMessage()    {}
+func (*AsyncAnnotateFileResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{25}
+}
+func (m *AsyncAnnotateFileResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Unmarshal(m, b)
+}
+func (m *AsyncAnnotateFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Marshal(b, m, deterministic)
+}
+func (dst *AsyncAnnotateFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncAnnotateFileResponse.Merge(dst, src)
+}
+func (m *AsyncAnnotateFileResponse) XXX_Size() int {
+	return xxx_messageInfo_AsyncAnnotateFileResponse.Size(m)
+}
+func (m *AsyncAnnotateFileResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncAnnotateFileResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncAnnotateFileResponse proto.InternalMessageInfo
+
+func (m *AsyncAnnotateFileResponse) GetOutputConfig() *OutputConfig {
+	if m != nil {
+		return m.OutputConfig
+	}
+	return nil
+}
+
+// Multiple async file annotation requests are batched into a single service
+// call.
+type AsyncBatchAnnotateFilesRequest struct {
+	// Individual async file annotation requests for this batch.
+	Requests             []*AsyncAnnotateFileRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *AsyncBatchAnnotateFilesRequest) Reset()         { *m = AsyncBatchAnnotateFilesRequest{} }
+func (m *AsyncBatchAnnotateFilesRequest) String() string { return proto.CompactTextString(m) }
+func (*AsyncBatchAnnotateFilesRequest) ProtoMessage()    {}
+func (*AsyncBatchAnnotateFilesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{26}
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Unmarshal(m, b)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Marshal(b, m, deterministic)
+}
+func (dst *AsyncBatchAnnotateFilesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Merge(dst, src)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_Size() int {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesRequest.Size(m)
+}
+func (m *AsyncBatchAnnotateFilesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncBatchAnnotateFilesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncBatchAnnotateFilesRequest proto.InternalMessageInfo
+
+func (m *AsyncBatchAnnotateFilesRequest) GetRequests() []*AsyncAnnotateFileRequest {
+	if m != nil {
+		return m.Requests
+	}
+	return nil
+}
+
+// Response to an async batch file annotation request.
+type AsyncBatchAnnotateFilesResponse struct {
+	// The list of file annotation responses, one for each request in
+	// AsyncBatchAnnotateFilesRequest.
+	Responses            []*AsyncAnnotateFileResponse `protobuf:"bytes,1,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *AsyncBatchAnnotateFilesResponse) Reset()         { *m = AsyncBatchAnnotateFilesResponse{} }
+func (m *AsyncBatchAnnotateFilesResponse) String() string { return proto.CompactTextString(m) }
+func (*AsyncBatchAnnotateFilesResponse) ProtoMessage()    {}
+func (*AsyncBatchAnnotateFilesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{27}
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Unmarshal(m, b)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Marshal(b, m, deterministic)
+}
+func (dst *AsyncBatchAnnotateFilesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Merge(dst, src)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_Size() int {
+	return xxx_messageInfo_AsyncBatchAnnotateFilesResponse.Size(m)
+}
+func (m *AsyncBatchAnnotateFilesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AsyncBatchAnnotateFilesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AsyncBatchAnnotateFilesResponse proto.InternalMessageInfo
+
+func (m *AsyncBatchAnnotateFilesResponse) GetResponses() []*AsyncAnnotateFileResponse {
+	if m != nil {
+		return m.Responses
+	}
+	return nil
+}
+
+// The desired input location and metadata.
+type InputConfig struct {
+	// The Google Cloud Storage location to read the input from.
+	GcsSource *GcsSource `protobuf:"bytes,1,opt,name=gcs_source,json=gcsSource,proto3" json:"gcs_source,omitempty"`
+	// The type of the file. Currently only "application/pdf" and "image/tiff"
+	// are supported. Wildcards are not supported.
+	MimeType             string   `protobuf:"bytes,2,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InputConfig) Reset()         { *m = InputConfig{} }
+func (m *InputConfig) String() string { return proto.CompactTextString(m) }
+func (*InputConfig) ProtoMessage()    {}
+func (*InputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{28}
+}
+func (m *InputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InputConfig.Unmarshal(m, b)
+}
+func (m *InputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InputConfig.Marshal(b, m, deterministic)
+}
+func (dst *InputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputConfig.Merge(dst, src)
+}
+func (m *InputConfig) XXX_Size() int {
+	return xxx_messageInfo_InputConfig.Size(m)
+}
+func (m *InputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InputConfig proto.InternalMessageInfo
+
+func (m *InputConfig) GetGcsSource() *GcsSource {
+	if m != nil {
+		return m.GcsSource
+	}
+	return nil
+}
+
+func (m *InputConfig) GetMimeType() string {
+	if m != nil {
+		return m.MimeType
+	}
+	return ""
+}
+
+// The desired output location and metadata.
+type OutputConfig struct {
+	// The Google Cloud Storage location to write the output(s) to.
+	GcsDestination *GcsDestination `protobuf:"bytes,1,opt,name=gcs_destination,json=gcsDestination,proto3" json:"gcs_destination,omitempty"`
+	// The max number of response protos to put into each output JSON file on
+	// Google Cloud Storage.
+	// The valid range is [1, 100]. If not specified, the default value is 20.
+	//
+	// For example, for one pdf file with 100 pages, 100 response protos will
+	// be generated. If `batch_size` = 20, then 5 json files each
+	// containing 20 response protos will be written under the prefix
+	// `gcs_destination`.`uri`.
+	//
+	// Currently, batch_size only applies to GcsDestination, with potential future
+	// support for other output configurations.
+	BatchSize            int32    `protobuf:"varint,2,opt,name=batch_size,json=batchSize,proto3" json:"batch_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OutputConfig) Reset()         { *m = OutputConfig{} }
+func (m *OutputConfig) String() string { return proto.CompactTextString(m) }
+func (*OutputConfig) ProtoMessage()    {}
+func (*OutputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{29}
+}
+func (m *OutputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputConfig.Unmarshal(m, b)
+}
+func (m *OutputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputConfig.Marshal(b, m, deterministic)
+}
+func (dst *OutputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputConfig.Merge(dst, src)
+}
+func (m *OutputConfig) XXX_Size() int {
+	return xxx_messageInfo_OutputConfig.Size(m)
+}
+func (m *OutputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutputConfig proto.InternalMessageInfo
+
+func (m *OutputConfig) GetGcsDestination() *GcsDestination {
+	if m != nil {
+		return m.GcsDestination
+	}
+	return nil
+}
+
+func (m *OutputConfig) GetBatchSize() int32 {
+	if m != nil {
+		return m.BatchSize
+	}
+	return 0
+}
+
+// The Google Cloud Storage location where the input will be read from.
+type GcsSource struct {
+	// Google Cloud Storage URI for the input file. This must only be a
+	// Google Cloud Storage object. Wildcards are not currently supported.
+	Uri                  string   `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GcsSource) Reset()         { *m = GcsSource{} }
+func (m *GcsSource) String() string { return proto.CompactTextString(m) }
+func (*GcsSource) ProtoMessage()    {}
+func (*GcsSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{30}
+}
+func (m *GcsSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsSource.Unmarshal(m, b)
+}
+func (m *GcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsSource.Marshal(b, m, deterministic)
+}
+func (dst *GcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsSource.Merge(dst, src)
+}
+func (m *GcsSource) XXX_Size() int {
+	return xxx_messageInfo_GcsSource.Size(m)
+}
+func (m *GcsSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsSource proto.InternalMessageInfo
+
+func (m *GcsSource) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+// The Google Cloud Storage location where the output will be written to.
+type GcsDestination struct {
+	// Google Cloud Storage URI where the results will be stored. Results will
+	// be in JSON format and preceded by its corresponding input URI. This field
+	// can either represent a single file, or a prefix for multiple outputs.
+	// Prefixes must end in a `/`.
+	//
+	// Examples:
+	//
+	// *    File: gs://bucket-name/filename.json
+	// *    Prefix: gs://bucket-name/prefix/here/
+	// *    File: gs://bucket-name/prefix/here
+	//
+	// If multiple outputs, each response is still AnnotateFileResponse, each of
+	// which contains some subset of the full list of AnnotateImageResponse.
+	// Multiple outputs can happen if, for example, the output JSON is too large
+	// and overflows into multiple sharded files.
+	Uri                  string   `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GcsDestination) Reset()         { *m = GcsDestination{} }
+func (m *GcsDestination) String() string { return proto.CompactTextString(m) }
+func (*GcsDestination) ProtoMessage()    {}
+func (*GcsDestination) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{31}
+}
+func (m *GcsDestination) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsDestination.Unmarshal(m, b)
+}
+func (m *GcsDestination) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsDestination.Marshal(b, m, deterministic)
+}
+func (dst *GcsDestination) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsDestination.Merge(dst, src)
+}
+func (m *GcsDestination) XXX_Size() int {
+	return xxx_messageInfo_GcsDestination.Size(m)
+}
+func (m *GcsDestination) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsDestination.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsDestination proto.InternalMessageInfo
+
+func (m *GcsDestination) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+// Contains metadata for the BatchAnnotateImages operation.
+type OperationMetadata struct {
+	// Current state of the batch operation.
+	State OperationMetadata_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.vision.v1p3beta1.OperationMetadata_State" json:"state,omitempty"`
+	// The time when the batch request was received.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// The time when the operation result was last updated.
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
+func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata) ProtoMessage()    {}
+func (*OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_annotator_a0c5dd8c15adca67, []int{32}
+}
+func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
+}
+func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+}
+func (m *OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata.Size(m)
+}
+func (m *OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationMetadata proto.InternalMessageInfo
+
+func (m *OperationMetadata) GetState() OperationMetadata_State {
+	if m != nil {
+		return m.State
+	}
+	return OperationMetadata_STATE_UNSPECIFIED
+}
+
+func (m *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Feature)(nil), "google.cloud.vision.v1p3beta1.Feature")
+	proto.RegisterType((*ImageSource)(nil), "google.cloud.vision.v1p3beta1.ImageSource")
+	proto.RegisterType((*Image)(nil), "google.cloud.vision.v1p3beta1.Image")
+	proto.RegisterType((*FaceAnnotation)(nil), "google.cloud.vision.v1p3beta1.FaceAnnotation")
+	proto.RegisterType((*FaceAnnotation_Landmark)(nil), "google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark")
+	proto.RegisterType((*LocationInfo)(nil), "google.cloud.vision.v1p3beta1.LocationInfo")
+	proto.RegisterType((*Property)(nil), "google.cloud.vision.v1p3beta1.Property")
+	proto.RegisterType((*EntityAnnotation)(nil), "google.cloud.vision.v1p3beta1.EntityAnnotation")
+	proto.RegisterType((*LocalizedObjectAnnotation)(nil), "google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation")
+	proto.RegisterType((*SafeSearchAnnotation)(nil), "google.cloud.vision.v1p3beta1.SafeSearchAnnotation")
+	proto.RegisterType((*LatLongRect)(nil), "google.cloud.vision.v1p3beta1.LatLongRect")
+	proto.RegisterType((*ColorInfo)(nil), "google.cloud.vision.v1p3beta1.ColorInfo")
+	proto.RegisterType((*DominantColorsAnnotation)(nil), "google.cloud.vision.v1p3beta1.DominantColorsAnnotation")
+	proto.RegisterType((*ImageProperties)(nil), "google.cloud.vision.v1p3beta1.ImageProperties")
+	proto.RegisterType((*CropHint)(nil), "google.cloud.vision.v1p3beta1.CropHint")
+	proto.RegisterType((*CropHintsAnnotation)(nil), "google.cloud.vision.v1p3beta1.CropHintsAnnotation")
+	proto.RegisterType((*CropHintsParams)(nil), "google.cloud.vision.v1p3beta1.CropHintsParams")
+	proto.RegisterType((*WebDetectionParams)(nil), "google.cloud.vision.v1p3beta1.WebDetectionParams")
+	proto.RegisterType((*ImageContext)(nil), "google.cloud.vision.v1p3beta1.ImageContext")
+	proto.RegisterType((*AnnotateImageRequest)(nil), "google.cloud.vision.v1p3beta1.AnnotateImageRequest")
+	proto.RegisterType((*ImageAnnotationContext)(nil), "google.cloud.vision.v1p3beta1.ImageAnnotationContext")
+	proto.RegisterType((*AnnotateImageResponse)(nil), "google.cloud.vision.v1p3beta1.AnnotateImageResponse")
+	proto.RegisterType((*AnnotateFileResponse)(nil), "google.cloud.vision.v1p3beta1.AnnotateFileResponse")
+	proto.RegisterType((*BatchAnnotateImagesRequest)(nil), "google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest")
+	proto.RegisterType((*BatchAnnotateImagesResponse)(nil), "google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse")
+	proto.RegisterType((*AsyncAnnotateFileRequest)(nil), "google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest")
+	proto.RegisterType((*AsyncAnnotateFileResponse)(nil), "google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse")
+	proto.RegisterType((*AsyncBatchAnnotateFilesRequest)(nil), "google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest")
+	proto.RegisterType((*AsyncBatchAnnotateFilesResponse)(nil), "google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse")
+	proto.RegisterType((*InputConfig)(nil), "google.cloud.vision.v1p3beta1.InputConfig")
+	proto.RegisterType((*OutputConfig)(nil), "google.cloud.vision.v1p3beta1.OutputConfig")
+	proto.RegisterType((*GcsSource)(nil), "google.cloud.vision.v1p3beta1.GcsSource")
+	proto.RegisterType((*GcsDestination)(nil), "google.cloud.vision.v1p3beta1.GcsDestination")
+	proto.RegisterType((*OperationMetadata)(nil), "google.cloud.vision.v1p3beta1.OperationMetadata")
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Feature_Type", Feature_Type_name, Feature_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.FaceAnnotation_Landmark_Type", FaceAnnotation_Landmark_Type_name, FaceAnnotation_Landmark_Type_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.OperationMetadata_State", OperationMetadata_State_name, OperationMetadata_State_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ImageAnnotatorClient is the client API for ImageAnnotator service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ImageAnnotatorClient interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error)
+	// Run asynchronous image detection and annotation for a list of generic
+	// files, such as PDF files, which may contain multiple pages and multiple
+	// images per page. Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type imageAnnotatorClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewImageAnnotatorClient(cc *grpc.ClientConn) ImageAnnotatorClient {
+	return &imageAnnotatorClient{cc}
+}
+
+func (c *imageAnnotatorClient) BatchAnnotateImages(ctx context.Context, in *BatchAnnotateImagesRequest, opts ...grpc.CallOption) (*BatchAnnotateImagesResponse, error) {
+	out := new(BatchAnnotateImagesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ImageAnnotator/BatchAnnotateImages", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *imageAnnotatorClient) AsyncBatchAnnotateFiles(ctx context.Context, in *AsyncBatchAnnotateFilesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ImageAnnotator/AsyncBatchAnnotateFiles", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ImageAnnotatorServer is the server API for ImageAnnotator service.
+type ImageAnnotatorServer interface {
+	// Run image detection and annotation for a batch of images.
+	BatchAnnotateImages(context.Context, *BatchAnnotateImagesRequest) (*BatchAnnotateImagesResponse, error)
+	// Run asynchronous image detection and annotation for a list of generic
+	// files, such as PDF files, which may contain multiple pages and multiple
+	// images per page. Progress and results can be retrieved through the
+	// `google.longrunning.Operations` interface.
+	// `Operation.metadata` contains `OperationMetadata` (metadata).
+	// `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+	AsyncBatchAnnotateFiles(context.Context, *AsyncBatchAnnotateFilesRequest) (*longrunning.Operation, error)
+}
+
+func RegisterImageAnnotatorServer(s *grpc.Server, srv ImageAnnotatorServer) {
+	s.RegisterService(&_ImageAnnotator_serviceDesc, srv)
+}
+
+func _ImageAnnotator_BatchAnnotateImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchAnnotateImagesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ImageAnnotator/BatchAnnotateImages",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).BatchAnnotateImages(ctx, req.(*BatchAnnotateImagesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ImageAnnotator_AsyncBatchAnnotateFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AsyncBatchAnnotateFilesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ImageAnnotator/AsyncBatchAnnotateFiles",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ImageAnnotatorServer).AsyncBatchAnnotateFiles(ctx, req.(*AsyncBatchAnnotateFilesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ImageAnnotator_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.vision.v1p3beta1.ImageAnnotator",
+	HandlerType: (*ImageAnnotatorServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "BatchAnnotateImages",
+			Handler:    _ImageAnnotator_BatchAnnotateImages_Handler,
+		},
+		{
+			MethodName: "AsyncBatchAnnotateFiles",
+			Handler:    _ImageAnnotator_AsyncBatchAnnotateFiles_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/vision/v1p3beta1/image_annotator.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/image_annotator.proto", fileDescriptor_image_annotator_a0c5dd8c15adca67)
+}
+
+var fileDescriptor_image_annotator_a0c5dd8c15adca67 = []byte{
+	// 3065 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x73, 0xdb, 0xc6,
+	0xf5, 0x0f, 0xa9, 0x5f, 0xe4, 0x23, 0x25, 0x41, 0xab, 0x1f, 0xa6, 0x65, 0x2b, 0x56, 0x90, 0x6f,
+	0xbe, 0x5f, 0x7d, 0xdd, 0x54, 0x1a, 0xcb, 0x49, 0x9a, 0x3a, 0xcd, 0xa4, 0x14, 0x05, 0x49, 0xac,
+	0x29, 0x82, 0x5d, 0x41, 0x76, 0xec, 0x49, 0x07, 0x85, 0xc0, 0x25, 0x8d, 0x04, 0xc4, 0x22, 0x00,
+	0x68, 0x4b, 0x3e, 0x66, 0xa6, 0x7f, 0x41, 0x6f, 0xbd, 0x76, 0x3a, 0x39, 0x35, 0x97, 0xf6, 0xd2,
+	0x73, 0xef, 0x9d, 0xe9, 0xf4, 0xd0, 0x3f, 0xa0, 0x3d, 0xf4, 0xd8, 0x63, 0x8f, 0x9d, 0x5d, 0x2c,
+	0xc0, 0x05, 0x29, 0x99, 0xa2, 0x93, 0xce, 0xf4, 0x44, 0xec, 0x7b, 0xfb, 0xf9, 0xbc, 0xdd, 0xf7,
+	0x76, 0xdf, 0x3e, 0x2c, 0x08, 0xf7, 0xbb, 0x94, 0x76, 0x5d, 0xb2, 0x63, 0xbb, 0xb4, 0xdf, 0xde,
+	0x79, 0xee, 0x84, 0x0e, 0xf5, 0x76, 0x9e, 0xdf, 0xf3, 0xef, 0x9f, 0x91, 0xc8, 0xba, 0xb7, 0xe3,
+	0xf4, 0xac, 0x2e, 0x31, 0x2d, 0xcf, 0xa3, 0x91, 0x15, 0xd1, 0x60, 0xdb, 0x0f, 0x68, 0x44, 0xd1,
+	0x46, 0x0c, 0xda, 0xe6, 0xa0, 0xed, 0x18, 0xb4, 0x9d, 0x82, 0xd6, 0x6f, 0x0b, 0x4e, 0xcb, 0x77,
+	0x76, 0x04, 0xd4, 0xa1, 0x5e, 0x18, 0x83, 0xd7, 0xdf, 0x7d, 0xb5, 0xc5, 0x2e, 0xa1, 0x3d, 0x12,
+	0x05, 0x17, 0xa2, 0xf7, 0xee, 0xab, 0x7b, 0xfb, 0x01, 0x6d, 0xf7, 0xed, 0xc8, 0x0c, 0x89, 0x15,
+	0xd8, 0xcf, 0x04, 0x66, 0xcc, 0x9c, 0x22, 0x72, 0x1e, 0x99, 0x83, 0x71, 0x09, 0xd0, 0xbd, 0x57,
+	0x83, 0x5e, 0x90, 0x33, 0xb3, 0x4d, 0x22, 0x62, 0x4b, 0x90, 0xb7, 0x05, 0xc4, 0xa5, 0x5e, 0x37,
+	0xe8, 0x7b, 0x9e, 0xe3, 0x75, 0x77, 0xa8, 0x4f, 0x82, 0xcc, 0x74, 0xef, 0x88, 0x4e, 0xbc, 0x75,
+	0xd6, 0xef, 0xec, 0x44, 0x4e, 0x8f, 0x84, 0x91, 0xd5, 0xf3, 0x45, 0x87, 0x1b, 0xa2, 0x43, 0xe0,
+	0xdb, 0x3b, 0x61, 0x64, 0x45, 0xfd, 0x70, 0x48, 0x11, 0x5d, 0xf8, 0x64, 0xc7, 0xa6, 0x6e, 0xe2,
+	0xfe, 0xf5, 0x8a, 0xac, 0x70, 0xad, 0xc8, 0xf5, 0xba, 0xb1, 0x46, 0xfd, 0x7a, 0x0a, 0xe6, 0x0e,
+	0x88, 0x15, 0xf5, 0x03, 0x82, 0x3e, 0x81, 0x69, 0xd6, 0xa1, 0x92, 0xdb, 0xcc, 0x6d, 0x2d, 0xec,
+	0x7e, 0x6f, 0xfb, 0x95, 0x31, 0xdb, 0x16, 0xa8, 0x6d, 0xe3, 0xc2, 0x27, 0x98, 0x03, 0xd1, 0x1d,
+	0x28, 0xf5, 0xac, 0x73, 0x33, 0x20, 0x61, 0xdf, 0x8d, 0xc2, 0x4a, 0x7e, 0x33, 0xb7, 0x35, 0x83,
+	0xa1, 0x67, 0x9d, 0xe3, 0x58, 0x82, 0x56, 0x60, 0xa6, 0x47, 0xdb, 0xc4, 0xad, 0x4c, 0x6d, 0xe6,
+	0xb6, 0x8a, 0x38, 0x6e, 0xa8, 0xbf, 0xce, 0xc3, 0x34, 0x63, 0x41, 0x2b, 0xa0, 0x18, 0x4f, 0x5a,
+	0x9a, 0x79, 0xda, 0x3c, 0x69, 0x69, 0xb5, 0xfa, 0x41, 0x5d, 0xdb, 0x57, 0xde, 0x40, 0x08, 0x16,
+	0x0e, 0xaa, 0x35, 0xcd, 0xdc, 0xd7, 0x0c, 0xad, 0x66, 0xd4, 0xf5, 0xa6, 0x92, 0x43, 0x6b, 0x80,
+	0x1a, 0xd5, 0xe6, 0xfe, 0x71, 0x15, 0x3f, 0x94, 0xe4, 0x79, 0xd6, 0xb7, 0xa1, 0x1f, 0xea, 0x92,
+	0x6c, 0x0a, 0x2d, 0xc3, 0x62, 0xa3, 0xba, 0xa7, 0x35, 0x24, 0xe1, 0x34, 0xeb, 0x68, 0x68, 0x9f,
+	0x1a, 0x92, 0x6c, 0x06, 0xdd, 0x82, 0x1b, 0xfb, 0x7a, 0xed, 0xf4, 0x58, 0x6b, 0x1a, 0xe6, 0x90,
+	0xb2, 0x84, 0x6e, 0xc2, 0xea, 0x49, 0xf5, 0x40, 0x33, 0x4f, 0xb4, 0x2a, 0xae, 0x1d, 0x49, 0xaa,
+	0x59, 0x36, 0xec, 0xfa, 0x71, 0xf5, 0x50, 0x33, 0x5b, 0x58, 0x6f, 0x69, 0xd8, 0xa8, 0x6b, 0x27,
+	0xca, 0x1c, 0x5a, 0x00, 0xa8, 0x61, 0xbd, 0x65, 0x1e, 0xd5, 0x9b, 0xc6, 0x89, 0x52, 0x44, 0x4b,
+	0x30, 0xff, 0x58, 0xdb, 0x93, 0x80, 0xc0, 0x06, 0xd1, 0xc2, 0xfa, 0xfe, 0x69, 0xcd, 0x10, 0xb4,
+	0x4a, 0x19, 0xdd, 0x80, 0x65, 0x7d, 0xef, 0x27, 0x5a, 0xcd, 0x30, 0x1b, 0x7a, 0xad, 0xda, 0xa8,
+	0x3f, 0xad, 0xf2, 0xce, 0xcb, 0x6a, 0x13, 0x4a, 0x75, 0xb6, 0xb7, 0x4e, 0x68, 0x3f, 0xb0, 0x09,
+	0x52, 0x61, 0xbe, 0x6b, 0x87, 0x66, 0xbc, 0xdd, 0xfa, 0x81, 0xc3, 0xa3, 0x56, 0xc4, 0xa5, 0xae,
+	0x1d, 0xf2, 0x6e, 0xa7, 0x81, 0x83, 0x6e, 0x41, 0x71, 0xa0, 0xcf, 0x73, 0x7d, 0xc1, 0x11, 0x4a,
+	0x95, 0xc0, 0x0c, 0xef, 0x88, 0x2a, 0x30, 0x67, 0x53, 0x2f, 0x22, 0x5e, 0xc4, 0x39, 0xca, 0x38,
+	0x69, 0xa2, 0x3d, 0x98, 0x0d, 0xb9, 0x35, 0x0e, 0x2e, 0xed, 0xde, 0x1d, 0xb3, 0x24, 0xa4, 0xf1,
+	0x61, 0x81, 0x54, 0x7f, 0xa3, 0xc0, 0xc2, 0x81, 0x65, 0x93, 0x6a, 0xba, 0x7d, 0x50, 0x0b, 0xe6,
+	0xcf, 0x68, 0xdf, 0x6b, 0x3b, 0x5e, 0xd7, 0xf4, 0xa9, 0x7b, 0xc1, 0xcd, 0x96, 0xc6, 0x2e, 0xb8,
+	0x3d, 0x81, 0x69, 0x51, 0xf7, 0x02, 0x97, 0xcf, 0xa4, 0x16, 0x3a, 0x05, 0xa5, 0xd3, 0x36, 0xb3,
+	0xa4, 0xf9, 0xc9, 0x49, 0x17, 0x3a, 0x6d, 0xb9, 0x8d, 0x0c, 0x28, 0xba, 0x96, 0xd7, 0xee, 0x59,
+	0xc1, 0x17, 0x61, 0x65, 0x6a, 0x73, 0x6a, 0xab, 0xb4, 0xfb, 0xc1, 0xb8, 0x5d, 0x91, 0x99, 0xea,
+	0x76, 0x43, 0xc0, 0xf1, 0x80, 0x08, 0x6d, 0x00, 0x04, 0xd4, 0x75, 0x4d, 0xcb, 0xeb, 0xba, 0xa4,
+	0x32, 0xbd, 0x99, 0xdb, 0xca, 0xe3, 0x22, 0x93, 0x54, 0x99, 0x80, 0x05, 0xcd, 0xb7, 0x3c, 0xa1,
+	0x9d, 0xe1, 0xda, 0x82, 0x6f, 0x79, 0xb1, 0x72, 0x03, 0x20, 0x72, 0xdc, 0x48, 0x68, 0x67, 0x63,
+	0x2c, 0x93, 0xc4, 0xea, 0x7b, 0xb0, 0x92, 0xa6, 0x1c, 0xd3, 0xa6, 0x5e, 0xc7, 0x69, 0x13, 0xcf,
+	0x26, 0x95, 0x39, 0xde, 0x71, 0x39, 0xd5, 0xd5, 0x52, 0x15, 0x7a, 0x1f, 0xd6, 0x92, 0xa1, 0x31,
+	0xd7, 0x49, 0xa0, 0x02, 0x07, 0xad, 0x4a, 0x5a, 0x09, 0xd6, 0x82, 0x85, 0xcf, 0xe9, 0x85, 0xe9,
+	0x3a, 0x5f, 0x10, 0xd7, 0x79, 0x46, 0x69, 0xbb, 0x52, 0xe4, 0x59, 0xe3, 0xff, 0xc7, 0xf8, 0xa7,
+	0x91, 0x02, 0xf0, 0xfc, 0xe7, 0xf4, 0x62, 0xd0, 0x44, 0x8f, 0x60, 0x29, 0xa4, 0x41, 0x40, 0x5f,
+	0xc8, 0xa4, 0x30, 0x29, 0xa9, 0x12, 0x73, 0x48, 0xbc, 0x06, 0x28, 0x96, 0xd7, 0x25, 0x81, 0x4c,
+	0x5b, 0x9a, 0x94, 0x76, 0x91, 0x53, 0x48, 0xac, 0x4f, 0x61, 0x39, 0xec, 0x07, 0x7e, 0xe0, 0x84,
+	0x44, 0x26, 0x2e, 0x4f, 0x4a, 0x8c, 0x12, 0x16, 0x89, 0xdb, 0x86, 0x4a, 0xdf, 0x6b, 0x93, 0xc0,
+	0x24, 0xe7, 0x3e, 0x0d, 0x49, 0x5b, 0x36, 0x30, 0x3f, 0xa9, 0x81, 0x35, 0x4e, 0xa5, 0xc5, 0x4c,
+	0x92, 0x91, 0x4f, 0x01, 0x9d, 0xb9, 0xfd, 0x20, 0xc8, 0xd2, 0x2f, 0x4c, 0x4a, 0xbf, 0x24, 0x48,
+	0xb2, 0xae, 0x79, 0x46, 0xac, 0xf6, 0x0b, 0x62, 0x65, 0x7c, 0xbe, 0x38, 0xb1, 0x6b, 0x12, 0x96,
+	0x81, 0x6c, 0xfd, 0xaf, 0x73, 0x50, 0x48, 0xf6, 0x14, 0xd2, 0xc5, 0x79, 0x35, 0xc5, 0x99, 0x3f,
+	0x7a, 0xbd, 0x9d, 0x29, 0x9f, 0x5f, 0x35, 0x28, 0xf8, 0x34, 0x74, 0x98, 0x9e, 0xef, 0xcb, 0xd2,
+	0xee, 0xff, 0x8d, 0x21, 0x6d, 0x89, 0xee, 0x38, 0x05, 0xaa, 0xbf, 0x9f, 0x1d, 0x9c, 0x66, 0xa7,
+	0xcd, 0x87, 0x4d, 0xfd, 0x71, 0xd3, 0x4c, 0xce, 0x2a, 0xe5, 0x0d, 0x54, 0x86, 0x42, 0x43, 0x3b,
+	0x30, 0x4c, 0xed, 0x89, 0xa6, 0xe4, 0xd0, 0x3c, 0x14, 0x71, 0xfd, 0xf0, 0x28, 0x6e, 0xe6, 0x51,
+	0x05, 0x56, 0xb8, 0x52, 0x3f, 0x30, 0x93, 0x4e, 0x7b, 0x58, 0x7f, 0xac, 0x4c, 0xb1, 0xe3, 0x27,
+	0xee, 0x38, 0xac, 0x9a, 0x66, 0xaa, 0x04, 0x94, 0x72, 0x71, 0xd5, 0x0c, 0x5a, 0x87, 0xb5, 0x14,
+	0x95, 0xd5, 0xcd, 0x32, 0xd8, 0x71, 0x7d, 0xbf, 0xa5, 0xd7, 0x9b, 0x86, 0xb9, 0xa7, 0x19, 0x8f,
+	0x35, 0xad, 0xc9, 0xb4, 0xec, 0xe8, 0x2a, 0x43, 0xa1, 0xa9, 0x9f, 0x68, 0xa6, 0x51, 0x6f, 0x29,
+	0x05, 0x36, 0xc6, 0xd3, 0x56, 0x4b, 0xc3, 0x66, 0xa3, 0xde, 0x52, 0x8a, 0xac, 0xd9, 0xd0, 0x1f,
+	0x8b, 0x26, 0xb0, 0x63, 0xee, 0x58, 0x3f, 0x35, 0x8e, 0xf8, 0xa8, 0x94, 0x12, 0x5a, 0x84, 0x52,
+	0xdc, 0xe6, 0xf6, 0x94, 0x32, 0x52, 0xa0, 0x1c, 0x0b, 0x6a, 0x5a, 0xd3, 0xd0, 0xb0, 0x32, 0x8f,
+	0x56, 0x61, 0x89, 0xd3, 0xef, 0xe9, 0x86, 0xa1, 0x1f, 0x8b, 0x8e, 0x0b, 0xcc, 0x5f, 0xb2, 0x98,
+	0xf3, 0x2d, 0xb2, 0x93, 0x5e, 0x96, 0x0a, 0x12, 0x25, 0x9d, 0xb5, 0xf6, 0x44, 0x33, 0x0d, 0xbd,
+	0x65, 0xee, 0xe9, 0xa7, 0xcd, 0xfd, 0x2a, 0x7e, 0xa2, 0x2c, 0x65, 0x54, 0xf1, 0xac, 0x6b, 0x3a,
+	0x6e, 0x6a, 0x58, 0x41, 0xe8, 0x36, 0x54, 0x52, 0x95, 0x60, 0x4c, 0x81, 0xcb, 0xa9, 0xfb, 0x99,
+	0x96, 0x3f, 0x08, 0xdc, 0xca, 0xc0, 0x91, 0x23, 0xe6, 0x56, 0xb3, 0xba, 0x8c, 0xbd, 0x35, 0xb4,
+	0x01, 0x37, 0x07, 0xba, 0x61, 0x83, 0x37, 0x06, 0x51, 0x1d, 0xb6, 0x58, 0x41, 0x77, 0xe0, 0x96,
+	0x1c, 0x67, 0x33, 0x0e, 0x41, 0x12, 0x31, 0xe5, 0x26, 0xda, 0x84, 0xdb, 0x99, 0x90, 0x0e, 0xf7,
+	0x58, 0x67, 0x0e, 0x8d, 0x29, 0xaa, 0xd8, 0x34, 0x70, 0xf5, 0x90, 0xd5, 0x11, 0xb7, 0x98, 0xf7,
+	0x05, 0x4e, 0x12, 0xdf, 0xe6, 0x95, 0x53, 0x32, 0xf7, 0xd6, 0x69, 0xab, 0xde, 0x50, 0x36, 0x58,
+	0xe5, 0x34, 0x18, 0x5e, 0x2c, 0x7c, 0x93, 0xe1, 0x0f, 0x74, 0xac, 0x1d, 0x69, 0xd5, 0x7d, 0xf3,
+	0x90, 0x17, 0x56, 0x8d, 0xaa, 0x72, 0x87, 0x95, 0x37, 0xb5, 0xa3, 0x7a, 0xd3, 0x3c, 0x6c, 0x56,
+	0x8d, 0x23, 0x46, 0xb9, 0xc9, 0xec, 0x73, 0x11, 0xe7, 0x3d, 0xd4, 0x9b, 0x4c, 0xfa, 0x16, 0xc3,
+	0x73, 0x69, 0xcc, 0x2c, 0xc4, 0xaa, 0xfa, 0x23, 0x28, 0x37, 0xa8, 0xcd, 0xf7, 0x66, 0xdd, 0xeb,
+	0x50, 0xf4, 0x2e, 0xcc, 0xb9, 0x56, 0x64, 0xba, 0x5e, 0x57, 0x94, 0x07, 0xcb, 0xc9, 0x56, 0x64,
+	0x5b, 0x75, 0xbb, 0x61, 0x45, 0x0d, 0xaf, 0x8b, 0x67, 0x5d, 0xfe, 0xab, 0x3e, 0x86, 0x42, 0x2b,
+	0x60, 0x95, 0x74, 0x74, 0x81, 0x10, 0x4c, 0x7b, 0x56, 0x8f, 0x88, 0x82, 0x88, 0x3f, 0xb3, 0xc2,
+	0xf3, 0xb9, 0xe5, 0xf6, 0x89, 0xa8, 0x82, 0xe2, 0x06, 0x7a, 0x0b, 0xca, 0x7d, 0xc7, 0x8b, 0x3e,
+	0x78, 0xcf, 0x8c, 0x95, 0x2c, 0x91, 0x4c, 0xe3, 0x52, 0x2c, 0x7b, 0xc4, 0x44, 0xea, 0xaf, 0xa6,
+	0x40, 0xd1, 0xbc, 0xc8, 0x89, 0x2e, 0xa4, 0x02, 0x46, 0x81, 0xa9, 0x9e, 0xd3, 0x16, 0x06, 0xd8,
+	0x23, 0x5a, 0x83, 0x59, 0x97, 0xda, 0x96, 0x9b, 0x18, 0x10, 0x2d, 0xb4, 0x09, 0xa5, 0x36, 0x09,
+	0xed, 0xc0, 0xf1, 0x79, 0x52, 0x89, 0xcb, 0x5e, 0x59, 0xc4, 0x46, 0x16, 0xda, 0x34, 0x48, 0x0a,
+	0x81, 0xb8, 0x81, 0xde, 0x04, 0x90, 0x4e, 0xe2, 0xb8, 0x0a, 0x90, 0x24, 0x4c, 0x1f, 0x51, 0xdf,
+	0xb1, 0x2d, 0xd7, 0x89, 0x2e, 0x44, 0x1d, 0x20, 0x49, 0x46, 0x4b, 0xac, 0xb9, 0x6f, 0x5b, 0x62,
+	0xd5, 0xa1, 0xe8, 0x8a, 0xf8, 0x84, 0x95, 0x02, 0xaf, 0x85, 0xc6, 0xb1, 0xc9, 0xf1, 0xc4, 0x03,
+	0x34, 0x3a, 0x04, 0xf0, 0xe3, 0x60, 0x39, 0x24, 0xac, 0x14, 0x39, 0xd7, 0xd8, 0x44, 0x2b, 0xa2,
+	0x8b, 0x25, 0xa8, 0xfa, 0xa7, 0x1c, 0xdc, 0x64, 0x46, 0x5c, 0xe7, 0x25, 0x69, 0xeb, 0x67, 0x9f,
+	0x13, 0x3b, 0x7a, 0x65, 0x94, 0xde, 0x86, 0x79, 0xd7, 0xf2, 0xba, 0x7d, 0x56, 0x12, 0xdb, 0xb4,
+	0x9d, 0x04, 0xab, 0x9c, 0x08, 0x6b, 0xb4, 0x4d, 0xd2, 0xe5, 0x33, 0x95, 0x5d, 0x3e, 0x97, 0x04,
+	0x69, 0xc4, 0xc9, 0x33, 0xdf, 0xd2, 0xc9, 0xea, 0xdf, 0xf2, 0xb0, 0x72, 0x62, 0x75, 0xc8, 0x09,
+	0x7f, 0x39, 0x95, 0xe6, 0xf2, 0x09, 0xcc, 0x58, 0xed, 0xbe, 0x1b, 0x89, 0x77, 0xb3, 0x09, 0x4e,
+	0xd1, 0x18, 0xc7, 0x08, 0x42, 0x9f, 0xd2, 0x0e, 0x9f, 0xf2, 0x64, 0x04, 0x1c, 0x87, 0x6a, 0x30,
+	0xd7, 0x23, 0x6d, 0xb6, 0xbe, 0xc4, 0x79, 0x3b, 0x01, 0x45, 0x82, 0x44, 0x1a, 0x14, 0x9e, 0x3b,
+	0xd4, 0xe5, 0x8b, 0x7a, 0x7a, 0x52, 0x96, 0x14, 0x8a, 0x3e, 0x86, 0xe9, 0xc0, 0xb2, 0x2f, 0x26,
+	0x2f, 0x39, 0x39, 0x4c, 0x7d, 0x01, 0x25, 0x96, 0x3e, 0xa8, 0xd7, 0xc5, 0xc4, 0x8e, 0xd0, 0x7d,
+	0x28, 0xf5, 0x1c, 0xcf, 0xbc, 0x46, 0xb6, 0x29, 0xf6, 0x1c, 0x2f, 0x7e, 0xe4, 0x20, 0xeb, 0x3c,
+	0x05, 0xe5, 0x5f, 0x05, 0xb2, 0xce, 0xe3, 0x47, 0x35, 0x80, 0x62, 0x8d, 0xbd, 0x95, 0xf3, 0x04,
+	0xb7, 0x05, 0x33, 0xfc, 0x15, 0x5d, 0x18, 0x44, 0x19, 0x2c, 0xef, 0x86, 0xe3, 0x0e, 0x83, 0xd5,
+	0x97, 0x97, 0x57, 0xdf, 0x3b, 0xb0, 0xe0, 0x3b, 0xe7, 0xc4, 0x35, 0x3b, 0x81, 0x65, 0xa7, 0xd9,
+	0x25, 0x8f, 0xe7, 0xb9, 0xf4, 0x40, 0x08, 0xd5, 0xcf, 0xa0, 0xb2, 0x4f, 0x7b, 0x8e, 0x67, 0x79,
+	0x11, 0x27, 0x0d, 0xa5, 0x55, 0xf5, 0x63, 0x98, 0xe5, 0x16, 0xc2, 0x4a, 0x8e, 0x6f, 0xc2, 0xad,
+	0x31, 0x9e, 0x4c, 0x07, 0x8f, 0x05, 0x4e, 0x0d, 0x61, 0x91, 0xbf, 0xf4, 0xb5, 0xd2, 0x4d, 0x89,
+	0x7e, 0x0e, 0x8b, 0x6d, 0x61, 0xd0, 0x4c, 0xd9, 0xd9, 0x0c, 0x7f, 0x30, 0x86, 0xfd, 0xaa, 0x61,
+	0xe2, 0x85, 0x76, 0x46, 0xa3, 0xfe, 0x36, 0x07, 0x85, 0x5a, 0x40, 0xfd, 0x23, 0xc7, 0x8b, 0xfe,
+	0x03, 0x2f, 0x93, 0xd9, 0xdc, 0x9b, 0x1f, 0xc9, 0xbd, 0x3b, 0xb0, 0xec, 0xf4, 0x7c, 0x1a, 0x44,
+	0x96, 0x67, 0x93, 0x61, 0xef, 0xa3, 0x81, 0x2a, 0x0d, 0xc1, 0xcf, 0x60, 0x39, 0x19, 0xae, 0xec,
+	0xfd, 0x03, 0x00, 0x3b, 0xa0, 0xbe, 0xf9, 0x8c, 0xc9, 0x45, 0x04, 0xc6, 0xa5, 0xc1, 0x84, 0x07,
+	0x17, 0xed, 0x84, 0x51, 0xfd, 0x00, 0x16, 0x53, 0xfa, 0x96, 0x15, 0x58, 0xbd, 0x90, 0x25, 0x3a,
+	0x2b, 0xf4, 0x89, 0x1d, 0x99, 0xfc, 0x6a, 0x29, 0x66, 0xcf, 0xe3, 0x72, 0x2c, 0xc4, 0x5c, 0xa6,
+	0xee, 0x03, 0x7a, 0x4c, 0xce, 0xf6, 0x93, 0x77, 0x42, 0x01, 0xdd, 0x86, 0x65, 0xc7, 0xb3, 0xdd,
+	0x7e, 0x9b, 0x98, 0x5d, 0x42, 0x33, 0x77, 0x39, 0x05, 0xbc, 0x24, 0x54, 0x87, 0x84, 0x8a, 0x2b,
+	0x1d, 0xf5, 0x9b, 0x29, 0x28, 0xf3, 0x25, 0x50, 0xa3, 0x5e, 0x44, 0xce, 0x23, 0xd4, 0x64, 0x49,
+	0x36, 0x32, 0x5d, 0xea, 0x75, 0xcd, 0x80, 0xd8, 0x91, 0x08, 0xc8, 0xb8, 0xbb, 0x03, 0x69, 0x47,
+	0xe2, 0x92, 0x2b, 0x6d, 0xcf, 0x77, 0x60, 0x21, 0x4d, 0xda, 0xb1, 0xab, 0xf2, 0x9b, 0x53, 0x5b,
+	0x45, 0x9c, 0xa6, 0x72, 0x3e, 0x71, 0xf4, 0x14, 0x96, 0x06, 0xde, 0x34, 0x7d, 0x3e, 0x19, 0x51,
+	0xc4, 0x6f, 0x5f, 0xd3, 0xa9, 0xc2, 0x7b, 0x78, 0xd1, 0x1e, 0x72, 0x67, 0x07, 0x56, 0xb3, 0xd7,
+	0x86, 0x09, 0x7f, 0x9c, 0xf0, 0x77, 0xc7, 0x9f, 0x5d, 0x0c, 0x1b, 0x27, 0x75, 0x61, 0x63, 0xd9,
+	0x1f, 0x15, 0x22, 0x1b, 0x56, 0x32, 0xb7, 0x86, 0x89, 0x99, 0x59, 0x6e, 0xe6, 0xde, 0x18, 0x33,
+	0xa3, 0xc1, 0xc4, 0xe8, 0xc5, 0x88, 0x4c, 0xfd, 0x47, 0x0e, 0x56, 0xc4, 0x2a, 0x24, 0x3c, 0x70,
+	0x98, 0x7c, 0xd9, 0x27, 0x61, 0x84, 0x1e, 0xc0, 0x0c, 0xbf, 0x1c, 0x12, 0x01, 0xfb, 0x9f, 0xeb,
+	0x5c, 0xf6, 0xe0, 0x18, 0x82, 0xf6, 0xa0, 0xd0, 0x89, 0xef, 0x03, 0xe3, 0xf0, 0x94, 0x76, 0xff,
+	0xf7, 0x7a, 0xd7, 0x87, 0x38, 0xc5, 0xb1, 0x9d, 0x1c, 0xdf, 0x56, 0xd9, 0xf1, 0x4a, 0xe2, 0x3b,
+	0x6a, 0xfc, 0x4e, 0x96, 0x17, 0x1f, 0x2e, 0x3b, 0x52, 0x4b, 0x7d, 0x08, 0x6b, 0x5c, 0x3b, 0xd8,
+	0x74, 0xc9, 0x22, 0x55, 0x60, 0x6a, 0x70, 0x67, 0xc6, 0x1e, 0xd1, 0x1d, 0x28, 0xf9, 0xcc, 0xb8,
+	0xd7, 0xef, 0x9d, 0x91, 0x20, 0xb9, 0xbb, 0x64, 0xa2, 0x26, 0x97, 0xa8, 0x7f, 0x04, 0x58, 0x1d,
+	0xf2, 0x5b, 0xe8, 0x53, 0x2f, 0x24, 0xe8, 0x53, 0x50, 0x3a, 0x96, 0x4d, 0xa4, 0x1b, 0xe2, 0x64,
+	0x3b, 0x7f, 0x7f, 0xa2, 0x77, 0x52, 0xbc, 0xd8, 0xc9, 0xb4, 0x43, 0x74, 0x06, 0x2b, 0xc9, 0xf5,
+	0x4b, 0x86, 0x3d, 0x76, 0xf1, 0xce, 0x18, 0xf6, 0xe1, 0xba, 0x15, 0x2f, 0x27, 0x64, 0xb2, 0x8d,
+	0xa7, 0xa0, 0xb8, 0xb4, 0x4b, 0x33, 0xfc, 0x53, 0xaf, 0xc7, 0xbf, 0xc8, 0x88, 0x64, 0xee, 0xcf,
+	0x60, 0xc9, 0xb5, 0xce, 0x88, 0x9b, 0x21, 0x9f, 0x7e, 0x3d, 0x72, 0x85, 0x33, 0xc9, 0xec, 0x2f,
+	0xe1, 0xb6, 0x9b, 0x54, 0x7f, 0x26, 0xe5, 0xe5, 0x5f, 0xc6, 0xd0, 0x1a, 0x37, 0xf4, 0xe1, 0x35,
+	0xaa, 0xd4, 0x4b, 0x0b, 0x48, 0xbc, 0xee, 0x5e, 0xa5, 0xe2, 0x5e, 0x1b, 0xfa, 0x2a, 0xc0, 0xb2,
+	0xc1, 0xeb, 0x79, 0x8d, 0x11, 0xc9, 0xdc, 0x26, 0xac, 0x74, 0xfa, 0xae, 0x6b, 0x0e, 0x19, 0xe0,
+	0x97, 0x4b, 0xe3, 0xd7, 0x94, 0x91, 0x61, 0xc3, 0x88, 0x51, 0x65, 0x65, 0xc8, 0x81, 0xb5, 0xd0,
+	0xea, 0x90, 0x24, 0x99, 0x49, 0x26, 0xe2, 0x4c, 0x73, 0x7f, 0x8c, 0x89, 0xcb, 0x4a, 0x54, 0xbc,
+	0x12, 0x5e, 0x56, 0xb8, 0x7a, 0x70, 0x2b, 0xde, 0xd4, 0x83, 0xb2, 0x5d, 0xb6, 0x57, 0xb8, 0x56,
+	0x82, 0x1e, 0x2a, 0x31, 0xf0, 0x4d, 0x27, 0x2b, 0x90, 0xec, 0x75, 0x60, 0x55, 0x3a, 0x06, 0x24,
+	0x4b, 0xa5, 0x6b, 0xa5, 0xea, 0x4b, 0xce, 0x69, 0xbc, 0x6c, 0x5f, 0x72, 0x78, 0xb7, 0x60, 0x3e,
+	0x93, 0xaa, 0xf9, 0xc5, 0xdc, 0xf8, 0x64, 0x25, 0xe7, 0x68, 0x5c, 0x96, 0xb3, 0x33, 0x0b, 0xca,
+	0xd0, 0x21, 0x93, 0x9c, 0xbd, 0x0b, 0xd7, 0x0a, 0x4a, 0xe6, 0x94, 0x11, 0xa7, 0x33, 0x5e, 0xf1,
+	0x2f, 0x91, 0xb2, 0xd2, 0x93, 0x04, 0x01, 0x0d, 0x78, 0x01, 0x2d, 0x95, 0x9e, 0x81, 0x6f, 0x6f,
+	0x9f, 0xf0, 0x0f, 0x4a, 0x38, 0xee, 0x80, 0x74, 0xf1, 0x6d, 0xe0, 0x3c, 0xaa, 0xac, 0xf2, 0xbe,
+	0xef, 0x5f, 0x27, 0x54, 0x23, 0xf9, 0x16, 0x27, 0x2c, 0xea, 0x1f, 0xa4, 0xd3, 0xe7, 0xc0, 0x71,
+	0x07, 0x49, 0xf4, 0x18, 0xca, 0x8e, 0xe7, 0xf7, 0xa3, 0xf8, 0x06, 0xba, 0x7b, 0xcd, 0xaa, 0xa1,
+	0xce, 0x20, 0xfc, 0x5a, 0xba, 0x8b, 0x4b, 0xce, 0xa0, 0x81, 0x30, 0x14, 0x03, 0x41, 0x9d, 0xa4,
+	0xcb, 0xf7, 0xc6, 0x70, 0x5d, 0x9a, 0xdc, 0xf1, 0x80, 0x46, 0xed, 0xc1, 0xfa, 0x9e, 0x15, 0xa5,
+	0xcb, 0x3b, 0xee, 0x18, 0x26, 0xc7, 0xa7, 0x0e, 0x85, 0x20, 0x7e, 0x4c, 0xb2, 0xff, 0xfd, 0xc9,
+	0x0c, 0x72, 0x2c, 0x4e, 0x49, 0xd4, 0x2f, 0xe1, 0xd6, 0xa5, 0xe6, 0x84, 0xc3, 0x32, 0x33, 0xcc,
+	0x7d, 0x37, 0x33, 0xfc, 0x73, 0x1e, 0x2a, 0xd5, 0xf0, 0xc2, 0xb3, 0xb3, 0x21, 0x8a, 0x27, 0xf8,
+	0x1d, 0x47, 0xe8, 0xbf, 0xb2, 0x64, 0x60, 0x8c, 0xb4, 0x1f, 0x49, 0xb3, 0x9c, 0xbe, 0x16, 0xa3,
+	0xce, 0x31, 0x62, 0x9a, 0x65, 0x2a, 0xb5, 0xd4, 0x1e, 0xdc, 0xbc, 0xc4, 0xa5, 0x22, 0x88, 0x23,
+	0xe6, 0x72, 0xdf, 0xd6, 0x5c, 0x1f, 0xde, 0xe4, 0xe6, 0x32, 0x4b, 0x87, 0xd9, 0x4c, 0x17, 0xea,
+	0xc9, 0xc8, 0x42, 0x1d, 0xf7, 0x66, 0x76, 0xd5, 0x92, 0x90, 0x16, 0xeb, 0x05, 0xdc, 0xb9, 0xd2,
+	0xac, 0x98, 0xeb, 0xa3, 0xd1, 0x05, 0xfb, 0xe1, 0xe4, 0x86, 0x47, 0x17, 0x6d, 0x08, 0x25, 0x69,
+	0x91, 0xa1, 0x43, 0x80, 0xae, 0x1d, 0x9a, 0xe2, 0xc3, 0x65, 0xec, 0xcf, 0x71, 0x2f, 0xb6, 0x87,
+	0x76, 0x28, 0x3e, 0x5b, 0x16, 0xbb, 0xc9, 0x23, 0xba, 0x05, 0xc5, 0x9e, 0xd3, 0x23, 0x26, 0xff,
+	0xc6, 0x20, 0xbe, 0x9e, 0x32, 0x81, 0x71, 0xe1, 0x13, 0xf5, 0x17, 0x39, 0x28, 0xcb, 0x51, 0x40,
+	0x8f, 0x60, 0x91, 0x99, 0x6d, 0x93, 0x30, 0x72, 0xbc, 0xf8, 0xc8, 0xc9, 0x5d, 0xeb, 0xbc, 0x3e,
+	0xb4, 0xc3, 0xfd, 0x01, 0x08, 0x2f, 0x74, 0x33, 0x6d, 0xb4, 0x01, 0x70, 0xc6, 0x7c, 0x6a, 0x86,
+	0xce, 0x4b, 0x22, 0xca, 0xd2, 0x22, 0x97, 0x9c, 0x38, 0x2f, 0x89, 0xba, 0x01, 0xc5, 0x74, 0xf0,
+	0xa3, 0x55, 0xad, 0xaa, 0xc2, 0x42, 0x96, 0xff, 0x92, 0x3e, 0xdf, 0xe4, 0x61, 0x49, 0x4f, 0xfe,
+	0x84, 0x70, 0x4c, 0x22, 0xab, 0x6d, 0x45, 0x16, 0x6a, 0xc0, 0x4c, 0xc8, 0xbc, 0x2e, 0x6e, 0x9c,
+	0xc6, 0x7d, 0xf7, 0x1c, 0x21, 0xe0, 0x07, 0x09, 0xc1, 0x31, 0x09, 0xfa, 0x08, 0x4a, 0x76, 0x40,
+	0xac, 0x88, 0x98, 0x91, 0xd3, 0x23, 0xe2, 0xbd, 0x69, 0x3d, 0xe1, 0x4c, 0xfe, 0xe9, 0xb0, 0x6d,
+	0x24, 0xff, 0x74, 0xc0, 0x10, 0x77, 0x67, 0x02, 0x06, 0xee, 0xfb, 0xed, 0x14, 0x3c, 0x3b, 0x1e,
+	0x1c, 0x77, 0x67, 0x02, 0xf5, 0xa7, 0x30, 0xc3, 0x47, 0x82, 0x56, 0x61, 0xe9, 0xc4, 0xa8, 0x1a,
+	0xc3, 0xff, 0x2e, 0x28, 0xc1, 0x5c, 0x0d, 0x6b, 0x55, 0x43, 0xdb, 0x57, 0x72, 0xac, 0x81, 0x4f,
+	0x9b, 0xcd, 0x7a, 0xf3, 0x50, 0xc9, 0xa3, 0x02, 0x4c, 0xef, 0xeb, 0x4d, 0x4d, 0x99, 0x42, 0xf3,
+	0x50, 0xac, 0x55, 0x9b, 0x35, 0xad, 0xd1, 0xd0, 0xf6, 0x95, 0xe9, 0xbb, 0x04, 0x40, 0xfa, 0xdc,
+	0x55, 0x82, 0x39, 0xf1, 0x99, 0x47, 0x79, 0x03, 0x2d, 0xc1, 0xfc, 0x23, 0x0d, 0x3f, 0x31, 0x4f,
+	0x9b, 0x8d, 0xfa, 0x43, 0xad, 0xf1, 0x44, 0xc9, 0xa1, 0x32, 0x14, 0xd2, 0x56, 0x9e, 0xb5, 0x5a,
+	0xfa, 0xc9, 0x49, 0x7d, 0xaf, 0xc1, 0x88, 0x01, 0x66, 0x85, 0x66, 0x1a, 0x2d, 0x42, 0x89, 0x43,
+	0x85, 0x60, 0x66, 0xf7, 0x9f, 0x79, 0x58, 0x90, 0x8f, 0x53, 0x1a, 0xa0, 0xdf, 0xe5, 0x60, 0xf9,
+	0x92, 0x33, 0x01, 0xfd, 0x70, 0xdc, 0x6d, 0xc7, 0x95, 0xc7, 0xd6, 0xfa, 0x83, 0xd7, 0x81, 0xc6,
+	0x5b, 0x4f, 0x7d, 0xe7, 0xab, 0xbf, 0xfc, 0xfd, 0x97, 0xf9, 0x3b, 0xea, 0xfa, 0xf0, 0xff, 0x7f,
+	0xc2, 0x07, 0xa2, 0xf2, 0x22, 0x0f, 0x72, 0x77, 0xd1, 0xd7, 0x39, 0xb8, 0x71, 0x45, 0x72, 0x40,
+	0x1f, 0x5f, 0x27, 0x03, 0x5c, 0x99, 0xcb, 0xd6, 0x37, 0x12, 0xb8, 0xf4, 0x8f, 0x9a, 0xc1, 0x5a,
+	0x54, 0xb7, 0xf9, 0x00, 0xb7, 0xd4, 0xb7, 0xa5, 0x01, 0x76, 0x18, 0xfe, 0x81, 0x35, 0xc2, 0xfb,
+	0x20, 0x77, 0x77, 0xef, 0xab, 0x1c, 0xbc, 0x65, 0xd3, 0xde, 0xab, 0xc7, 0xb4, 0xb7, 0x9c, 0x8d,
+	0x4a, 0x8b, 0x2d, 0xc0, 0x56, 0xee, 0x69, 0x4d, 0xa0, 0xba, 0xd4, 0xb5, 0xbc, 0xee, 0x36, 0x0d,
+	0xba, 0x3b, 0x5d, 0xe2, 0xf1, 0xe5, 0xb9, 0x13, 0xab, 0x2c, 0xdf, 0x09, 0xaf, 0xf8, 0xbb, 0xd0,
+	0x47, 0xb1, 0xe0, 0x5f, 0xb9, 0xdc, 0xd9, 0x2c, 0x87, 0xdc, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xeb, 0x48, 0xba, 0xeb, 0x69, 0x25, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/product_search.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/product_search.pb.go
new file mode 100644
index 00000000..30352277
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/product_search.pb.go
@@ -0,0 +1,481 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p3beta1/product_search.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Supported product search categories.
+type ProductSearchCategory int32
+
+const (
+	// Default value used when a category is not specified.
+	ProductSearchCategory_PRODUCT_SEARCH_CATEGORY_UNSPECIFIED ProductSearchCategory = 0
+	// Shoes category.
+	ProductSearchCategory_SHOES ProductSearchCategory = 1
+	// Bags category.
+	ProductSearchCategory_BAGS ProductSearchCategory = 2
+)
+
+var ProductSearchCategory_name = map[int32]string{
+	0: "PRODUCT_SEARCH_CATEGORY_UNSPECIFIED",
+	1: "SHOES",
+	2: "BAGS",
+}
+var ProductSearchCategory_value = map[string]int32{
+	"PRODUCT_SEARCH_CATEGORY_UNSPECIFIED": 0,
+	"SHOES": 1,
+	"BAGS":  2,
+}
+
+func (x ProductSearchCategory) String() string {
+	return proto.EnumName(ProductSearchCategory_name, int32(x))
+}
+func (ProductSearchCategory) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_5afe37c43a5f30cd, []int{0}
+}
+
+// Specifies the fields to include in product search results.
+type ProductSearchResultsView int32
+
+const (
+	// Product search results contain only `product_category` and `product_id`.
+	// Default value.
+	ProductSearchResultsView_BASIC ProductSearchResultsView = 0
+	// Product search results contain `product_category`, `product_id`,
+	// `image_uri`, and `score`.
+	ProductSearchResultsView_FULL ProductSearchResultsView = 1
+)
+
+var ProductSearchResultsView_name = map[int32]string{
+	0: "BASIC",
+	1: "FULL",
+}
+var ProductSearchResultsView_value = map[string]int32{
+	"BASIC": 0,
+	"FULL":  1,
+}
+
+func (x ProductSearchResultsView) String() string {
+	return proto.EnumName(ProductSearchResultsView_name, int32(x))
+}
+func (ProductSearchResultsView) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_5afe37c43a5f30cd, []int{1}
+}
+
+// Parameters for a product search request.
+type ProductSearchParams struct {
+	// The resource name of the catalog to search.
+	//
+	// Format is: `productSearch/catalogs/CATALOG_NAME`.
+	CatalogName string `protobuf:"bytes,1,opt,name=catalog_name,json=catalogName,proto3" json:"catalog_name,omitempty"`
+	// The category to search in.
+	// Optional. It is inferred by the system if it is not specified.
+	// [Deprecated] Use `product_category`.
+	Category ProductSearchCategory `protobuf:"varint,2,opt,name=category,proto3,enum=google.cloud.vision.v1p3beta1.ProductSearchCategory" json:"category,omitempty"`
+	// The product category to search in.
+	// Optional. It is inferred by the system if it is not specified.
+	// Supported values are `bag`, `shoe`, `sunglasses`, `dress`, `outerwear`,
+	// `skirt`, `top`, `shorts`, and `pants`.
+	ProductCategory string `protobuf:"bytes,5,opt,name=product_category,json=productCategory,proto3" json:"product_category,omitempty"`
+	// The bounding polygon around the area of interest in the image.
+	// Optional. If it is not specified, system discretion will be applied.
+	// [Deprecated] Use `bounding_poly`.
+	NormalizedBoundingPoly *NormalizedBoundingPoly `protobuf:"bytes,3,opt,name=normalized_bounding_poly,json=normalizedBoundingPoly,proto3" json:"normalized_bounding_poly,omitempty"`
+	// The bounding polygon around the area of interest in the image.
+	// Optional. If it is not specified, system discretion will be applied.
+	BoundingPoly *BoundingPoly `protobuf:"bytes,9,opt,name=bounding_poly,json=boundingPoly,proto3" json:"bounding_poly,omitempty"`
+	// Specifies the verbosity of the  product search results.
+	// Optional. Defaults to `BASIC`.
+	View ProductSearchResultsView `protobuf:"varint,4,opt,name=view,proto3,enum=google.cloud.vision.v1p3beta1.ProductSearchResultsView" json:"view,omitempty"`
+	// The resource name of a [ProductSet][google.cloud.vision.v1p3beta1.ProductSet] to be searched for similar images.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID`.
+	ProductSet string `protobuf:"bytes,6,opt,name=product_set,json=productSet,proto3" json:"product_set,omitempty"`
+	// The list of product categories to search in. Currently, we only consider
+	// the first category, and either "homegoods" or "apparel" should be
+	// specified.
+	ProductCategories []string `protobuf:"bytes,7,rep,name=product_categories,json=productCategories,proto3" json:"product_categories,omitempty"`
+	// The filtering expression. This can be used to restrict search results based
+	// on Product labels. We currently support an AND of OR of key-value
+	// expressions, where each expression within an OR must have the same key.
+	//
+	// For example, "(color = red OR color = blue) AND brand = Google" is
+	// acceptable, but not "(color = red OR brand = Google)" or "color: red".
+	Filter               string   `protobuf:"bytes,8,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ProductSearchParams) Reset()         { *m = ProductSearchParams{} }
+func (m *ProductSearchParams) String() string { return proto.CompactTextString(m) }
+func (*ProductSearchParams) ProtoMessage()    {}
+func (*ProductSearchParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_5afe37c43a5f30cd, []int{0}
+}
+func (m *ProductSearchParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProductSearchParams.Unmarshal(m, b)
+}
+func (m *ProductSearchParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProductSearchParams.Marshal(b, m, deterministic)
+}
+func (dst *ProductSearchParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchParams.Merge(dst, src)
+}
+func (m *ProductSearchParams) XXX_Size() int {
+	return xxx_messageInfo_ProductSearchParams.Size(m)
+}
+func (m *ProductSearchParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProductSearchParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ProductSearchParams proto.InternalMessageInfo
+
+func (m *ProductSearchParams) GetCatalogName() string {
+	if m != nil {
+		return m.CatalogName
+	}
+	return ""
+}
+
+func (m *ProductSearchParams) GetCategory() ProductSearchCategory {
+	if m != nil {
+		return m.Category
+	}
+	return ProductSearchCategory_PRODUCT_SEARCH_CATEGORY_UNSPECIFIED
+}
+
+func (m *ProductSearchParams) GetProductCategory() string {
+	if m != nil {
+		return m.ProductCategory
+	}
+	return ""
+}
+
+func (m *ProductSearchParams) GetNormalizedBoundingPoly() *NormalizedBoundingPoly {
+	if m != nil {
+		return m.NormalizedBoundingPoly
+	}
+	return nil
+}
+
+func (m *ProductSearchParams) GetBoundingPoly() *BoundingPoly {
+	if m != nil {
+		return m.BoundingPoly
+	}
+	return nil
+}
+
+func (m *ProductSearchParams) GetView() ProductSearchResultsView {
+	if m != nil {
+		return m.View
+	}
+	return ProductSearchResultsView_BASIC
+}
+
+func (m *ProductSearchParams) GetProductSet() string {
+	if m != nil {
+		return m.ProductSet
+	}
+	return ""
+}
+
+func (m *ProductSearchParams) GetProductCategories() []string {
+	if m != nil {
+		return m.ProductCategories
+	}
+	return nil
+}
+
+func (m *ProductSearchParams) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+// Results for a product search request.
+type ProductSearchResults struct {
+	// Product category.
+	// [Deprecated] Use `product_category`.
+	Category ProductSearchCategory `protobuf:"varint,1,opt,name=category,proto3,enum=google.cloud.vision.v1p3beta1.ProductSearchCategory" json:"category,omitempty"`
+	// Product category.
+	// Supported values are `bag` and `shoe`.
+	// [Deprecated] `product_category` is provided in each Product.
+	ProductCategory string `protobuf:"bytes,4,opt,name=product_category,json=productCategory,proto3" json:"product_category,omitempty"`
+	// Timestamp of the index which provided these results. Changes made after
+	// this time are not reflected in the current results.
+	IndexTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=index_time,json=indexTime,proto3" json:"index_time,omitempty"`
+	// List of detected products.
+	Products []*ProductSearchResults_ProductInfo `protobuf:"bytes,3,rep,name=products,proto3" json:"products,omitempty"`
+	// List of results, one for each product match.
+	Results              []*ProductSearchResults_Result `protobuf:"bytes,5,rep,name=results,proto3" json:"results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *ProductSearchResults) Reset()         { *m = ProductSearchResults{} }
+func (m *ProductSearchResults) String() string { return proto.CompactTextString(m) }
+func (*ProductSearchResults) ProtoMessage()    {}
+func (*ProductSearchResults) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_5afe37c43a5f30cd, []int{1}
+}
+func (m *ProductSearchResults) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProductSearchResults.Unmarshal(m, b)
+}
+func (m *ProductSearchResults) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProductSearchResults.Marshal(b, m, deterministic)
+}
+func (dst *ProductSearchResults) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults.Merge(dst, src)
+}
+func (m *ProductSearchResults) XXX_Size() int {
+	return xxx_messageInfo_ProductSearchResults.Size(m)
+}
+func (m *ProductSearchResults) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProductSearchResults.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ProductSearchResults proto.InternalMessageInfo
+
+func (m *ProductSearchResults) GetCategory() ProductSearchCategory {
+	if m != nil {
+		return m.Category
+	}
+	return ProductSearchCategory_PRODUCT_SEARCH_CATEGORY_UNSPECIFIED
+}
+
+func (m *ProductSearchResults) GetProductCategory() string {
+	if m != nil {
+		return m.ProductCategory
+	}
+	return ""
+}
+
+func (m *ProductSearchResults) GetIndexTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.IndexTime
+	}
+	return nil
+}
+
+func (m *ProductSearchResults) GetProducts() []*ProductSearchResults_ProductInfo {
+	if m != nil {
+		return m.Products
+	}
+	return nil
+}
+
+func (m *ProductSearchResults) GetResults() []*ProductSearchResults_Result {
+	if m != nil {
+		return m.Results
+	}
+	return nil
+}
+
+// Information about a product.
+type ProductSearchResults_ProductInfo struct {
+	// Product ID.
+	ProductId string `protobuf:"bytes,1,opt,name=product_id,json=productId,proto3" json:"product_id,omitempty"`
+	// The URI of the image which matched the query image.
+	//
+	// This field is returned only if `view` is set to `FULL` in
+	// the request.
+	ImageUri string `protobuf:"bytes,2,opt,name=image_uri,json=imageUri,proto3" json:"image_uri,omitempty"`
+	// A confidence level on the match, ranging from 0 (no confidence) to
+	// 1 (full confidence).
+	//
+	// This field is returned only if `view` is set to `FULL` in
+	// the request.
+	Score                float32  `protobuf:"fixed32,3,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ProductSearchResults_ProductInfo) Reset()         { *m = ProductSearchResults_ProductInfo{} }
+func (m *ProductSearchResults_ProductInfo) String() string { return proto.CompactTextString(m) }
+func (*ProductSearchResults_ProductInfo) ProtoMessage()    {}
+func (*ProductSearchResults_ProductInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_5afe37c43a5f30cd, []int{1, 0}
+}
+func (m *ProductSearchResults_ProductInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProductSearchResults_ProductInfo.Unmarshal(m, b)
+}
+func (m *ProductSearchResults_ProductInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProductSearchResults_ProductInfo.Marshal(b, m, deterministic)
+}
+func (dst *ProductSearchResults_ProductInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults_ProductInfo.Merge(dst, src)
+}
+func (m *ProductSearchResults_ProductInfo) XXX_Size() int {
+	return xxx_messageInfo_ProductSearchResults_ProductInfo.Size(m)
+}
+func (m *ProductSearchResults_ProductInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProductSearchResults_ProductInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ProductSearchResults_ProductInfo proto.InternalMessageInfo
+
+func (m *ProductSearchResults_ProductInfo) GetProductId() string {
+	if m != nil {
+		return m.ProductId
+	}
+	return ""
+}
+
+func (m *ProductSearchResults_ProductInfo) GetImageUri() string {
+	if m != nil {
+		return m.ImageUri
+	}
+	return ""
+}
+
+func (m *ProductSearchResults_ProductInfo) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+// Information about a product.
+type ProductSearchResults_Result struct {
+	// The Product.
+	Product *Product `protobuf:"bytes,1,opt,name=product,proto3" json:"product,omitempty"`
+	// A confidence level on the match, ranging from 0 (no confidence) to
+	// 1 (full confidence).
+	//
+	// This field is returned only if `view` is set to `FULL` in
+	// the request.
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	// The resource name of the image from the product that is the closest match
+	// to the query.
+	Image                string   `protobuf:"bytes,3,opt,name=image,proto3" json:"image,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ProductSearchResults_Result) Reset()         { *m = ProductSearchResults_Result{} }
+func (m *ProductSearchResults_Result) String() string { return proto.CompactTextString(m) }
+func (*ProductSearchResults_Result) ProtoMessage()    {}
+func (*ProductSearchResults_Result) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_5afe37c43a5f30cd, []int{1, 1}
+}
+func (m *ProductSearchResults_Result) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProductSearchResults_Result.Unmarshal(m, b)
+}
+func (m *ProductSearchResults_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProductSearchResults_Result.Marshal(b, m, deterministic)
+}
+func (dst *ProductSearchResults_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSearchResults_Result.Merge(dst, src)
+}
+func (m *ProductSearchResults_Result) XXX_Size() int {
+	return xxx_messageInfo_ProductSearchResults_Result.Size(m)
+}
+func (m *ProductSearchResults_Result) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProductSearchResults_Result.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ProductSearchResults_Result proto.InternalMessageInfo
+
+func (m *ProductSearchResults_Result) GetProduct() *Product {
+	if m != nil {
+		return m.Product
+	}
+	return nil
+}
+
+func (m *ProductSearchResults_Result) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *ProductSearchResults_Result) GetImage() string {
+	if m != nil {
+		return m.Image
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*ProductSearchParams)(nil), "google.cloud.vision.v1p3beta1.ProductSearchParams")
+	proto.RegisterType((*ProductSearchResults)(nil), "google.cloud.vision.v1p3beta1.ProductSearchResults")
+	proto.RegisterType((*ProductSearchResults_ProductInfo)(nil), "google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo")
+	proto.RegisterType((*ProductSearchResults_Result)(nil), "google.cloud.vision.v1p3beta1.ProductSearchResults.Result")
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.ProductSearchCategory", ProductSearchCategory_name, ProductSearchCategory_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.ProductSearchResultsView", ProductSearchResultsView_name, ProductSearchResultsView_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/product_search.proto", fileDescriptor_product_search_5afe37c43a5f30cd)
+}
+
+var fileDescriptor_product_search_5afe37c43a5f30cd = []byte{
+	// 698 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xdf, 0x6e, 0xd3, 0x30,
+	0x14, 0xc6, 0x97, 0xfe, 0x5b, 0x73, 0x3a, 0xa0, 0x98, 0x31, 0x45, 0x85, 0x69, 0xdd, 0x90, 0xa0,
+	0x0c, 0x48, 0xb4, 0x0e, 0x84, 0x18, 0x17, 0xd0, 0x76, 0xdd, 0x56, 0x31, 0x6d, 0x91, 0xdb, 0x22,
+	0x01, 0x17, 0x91, 0x9b, 0x78, 0xc1, 0x52, 0x12, 0x47, 0x49, 0xda, 0x51, 0xee, 0x78, 0x20, 0x5e,
+	0x88, 0x27, 0xe1, 0x12, 0xd5, 0x49, 0xba, 0x15, 0x75, 0x1b, 0x9b, 0xc4, 0x55, 0x75, 0x4e, 0xfd,
+	0xfb, 0x3e, 0xfb, 0xe4, 0xb3, 0xa1, 0x6e, 0x73, 0x6e, 0x3b, 0x54, 0x33, 0x1d, 0x3e, 0xb4, 0xb4,
+	0x11, 0x0b, 0x19, 0xf7, 0xb4, 0xd1, 0x96, 0xbf, 0x3d, 0xa0, 0x11, 0xd9, 0xd2, 0xfc, 0x80, 0x5b,
+	0x43, 0x33, 0x32, 0x42, 0x4a, 0x02, 0xf3, 0xab, 0xea, 0x07, 0x3c, 0xe2, 0x68, 0x35, 0x66, 0x54,
+	0xc1, 0xa8, 0x31, 0xa3, 0x4e, 0x99, 0xca, 0xc3, 0x44, 0x92, 0xf8, 0x4c, 0x23, 0x9e, 0xc7, 0x23,
+	0x12, 0x31, 0xee, 0x85, 0x31, 0x5c, 0x79, 0x7e, 0xb9, 0xa1, 0x4d, 0xb9, 0x4b, 0xa3, 0x60, 0x9c,
+	0xac, 0xde, 0xb9, 0xce, 0xf6, 0x8c, 0x90, 0x06, 0x23, 0x66, 0xd2, 0x84, 0x5d, 0x4b, 0x58, 0x51,
+	0x0d, 0x86, 0x27, 0x5a, 0xc4, 0x5c, 0x1a, 0x46, 0xc4, 0xf5, 0xe3, 0x05, 0x1b, 0x3f, 0x73, 0x70,
+	0x4f, 0x8f, 0x15, 0xba, 0x42, 0x40, 0x27, 0x01, 0x71, 0x43, 0xb4, 0x0e, 0x4b, 0x26, 0x89, 0x88,
+	0xc3, 0x6d, 0xc3, 0x23, 0x2e, 0x55, 0xa4, 0xaa, 0x54, 0x93, 0x71, 0x29, 0xe9, 0x1d, 0x11, 0x97,
+	0x22, 0x1d, 0x8a, 0x26, 0x89, 0xa8, 0xcd, 0x83, 0xb1, 0x92, 0xa9, 0x4a, 0xb5, 0xdb, 0xf5, 0x97,
+	0xea, 0xa5, 0x53, 0x51, 0x67, 0x8c, 0x5a, 0x09, 0x8b, 0xa7, 0x2a, 0xe8, 0x29, 0x94, 0xd3, 0xd3,
+	0x4c, 0x95, 0xf3, 0xc2, 0xf8, 0x4e, 0xd2, 0x4f, 0x21, 0xc4, 0x41, 0xf1, 0x78, 0xe0, 0x12, 0x87,
+	0x7d, 0xa7, 0x96, 0x31, 0xe0, 0x43, 0xcf, 0x62, 0x9e, 0x6d, 0xf8, 0xdc, 0x19, 0x2b, 0xd9, 0xaa,
+	0x54, 0x2b, 0xd5, 0x5f, 0x5d, 0xb1, 0x99, 0xa3, 0x29, 0xde, 0x4c, 0x68, 0x9d, 0x3b, 0x63, 0xbc,
+	0xe2, 0xcd, 0xed, 0x23, 0x1d, 0x6e, 0xcd, 0xba, 0xc8, 0xc2, 0xe5, 0xd9, 0x15, 0x2e, 0x33, 0xda,
+	0x4b, 0x83, 0xf3, 0x8a, 0x1f, 0x20, 0x37, 0x62, 0xf4, 0x54, 0xc9, 0x89, 0xd9, 0xbd, 0xbe, 0xce,
+	0xec, 0x30, 0x0d, 0x87, 0x4e, 0x14, 0x7e, 0x64, 0xf4, 0x14, 0x0b, 0x11, 0xb4, 0x06, 0xa5, 0xb3,
+	0x20, 0x44, 0x4a, 0x41, 0x4c, 0x0d, 0xfc, 0x14, 0x8a, 0xd0, 0x0b, 0x40, 0x7f, 0xcd, 0x96, 0xd1,
+	0x50, 0x59, 0xac, 0x66, 0x6b, 0x32, 0xbe, 0x3b, 0x3b, 0x5d, 0x46, 0x43, 0xb4, 0x02, 0x85, 0x13,
+	0xe6, 0x44, 0x34, 0x50, 0x8a, 0x42, 0x2a, 0xa9, 0x36, 0x7e, 0xe5, 0x60, 0x79, 0xde, 0x56, 0x66,
+	0xd2, 0x20, 0xfd, 0xb7, 0x34, 0xe4, 0xe6, 0xa7, 0xe1, 0x0d, 0x00, 0xf3, 0x2c, 0xfa, 0xcd, 0x98,
+	0xc4, 0x5b, 0x84, 0xb1, 0x54, 0xaf, 0xa4, 0xf6, 0x69, 0xf6, 0xd5, 0x5e, 0x9a, 0x7d, 0x2c, 0x8b,
+	0xd5, 0x93, 0x1a, 0x7d, 0x81, 0x62, 0xa2, 0x16, 0x2a, 0xd9, 0x6a, 0xb6, 0x56, 0xaa, 0xbf, 0xbb,
+	0xc1, 0x97, 0x48, 0x9b, 0x1d, 0xef, 0x84, 0xe3, 0xa9, 0x20, 0xea, 0xc1, 0x62, 0x10, 0x2f, 0x50,
+	0xf2, 0x42, 0x7b, 0xe7, 0x26, 0xda, 0xf1, 0x2f, 0x4e, 0xa5, 0x2a, 0x06, 0x94, 0xce, 0xd9, 0xa1,
+	0x55, 0x48, 0xbf, 0xb3, 0xc1, 0xac, 0xe4, 0xa2, 0xca, 0x49, 0xa7, 0x63, 0xa1, 0x07, 0x20, 0x33,
+	0x97, 0xd8, 0xd4, 0x18, 0x06, 0x4c, 0x8c, 0x46, 0xc6, 0x45, 0xd1, 0xe8, 0x07, 0x0c, 0x2d, 0x43,
+	0x3e, 0x34, 0x79, 0x40, 0xc5, 0x9d, 0xc9, 0xe0, 0xb8, 0xa8, 0x8c, 0xa0, 0x10, 0x7b, 0xa2, 0xf7,
+	0xb0, 0x98, 0x28, 0x09, 0xe1, 0x52, 0xfd, 0xf1, 0xbf, 0x1d, 0x00, 0xa7, 0xd8, 0x99, 0x43, 0xe6,
+	0x9c, 0xc3, 0xa4, 0x2b, 0xf6, 0x20, 0x7c, 0x65, 0x1c, 0x17, 0x9b, 0x7d, 0xb8, 0x3f, 0x37, 0x14,
+	0xe8, 0x09, 0x3c, 0xd2, 0xf1, 0xf1, 0x6e, 0xbf, 0xd5, 0x33, 0xba, 0xed, 0x06, 0x6e, 0x1d, 0x18,
+	0xad, 0x46, 0xaf, 0xbd, 0x7f, 0x8c, 0x3f, 0x19, 0xfd, 0xa3, 0xae, 0xde, 0x6e, 0x75, 0xf6, 0x3a,
+	0xed, 0xdd, 0xf2, 0x02, 0x92, 0x21, 0xdf, 0x3d, 0x38, 0x6e, 0x77, 0xcb, 0x12, 0x2a, 0x42, 0xae,
+	0xd9, 0xd8, 0xef, 0x96, 0x33, 0x9b, 0x1a, 0x28, 0x17, 0xdd, 0x9e, 0x09, 0xd0, 0x6c, 0x74, 0x3b,
+	0xad, 0xf2, 0xc2, 0x04, 0xd8, 0xeb, 0x1f, 0x1e, 0x96, 0xa5, 0xe6, 0x0f, 0x09, 0xd6, 0x4d, 0xee,
+	0x5e, 0x7e, 0xd4, 0x26, 0x9a, 0x7d, 0x37, 0x27, 0x29, 0xd3, 0xa5, 0xcf, 0xad, 0x04, 0xb2, 0xb9,
+	0x43, 0x3c, 0x5b, 0xe5, 0x81, 0xad, 0xd9, 0xd4, 0x13, 0x19, 0xd4, 0xe2, 0xbf, 0x88, 0xcf, 0xc2,
+	0x0b, 0x1e, 0xf3, 0xb7, 0x71, 0xe3, 0xb7, 0x24, 0x0d, 0x0a, 0x02, 0xd9, 0xfe, 0x13, 0x00, 0x00,
+	0xff, 0xff, 0x4f, 0x50, 0xae, 0xbc, 0x9d, 0x06, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go
new file mode 100644
index 00000000..25c546da
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/product_search_service.pb.go
@@ -0,0 +1,2963 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p3beta1/product_search_service.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Enumerates the possible states that the batch request can be in.
+type BatchOperationMetadata_State int32
+
+const (
+	// Invalid.
+	BatchOperationMetadata_STATE_UNSPECIFIED BatchOperationMetadata_State = 0
+	// Request is actively being processed.
+	BatchOperationMetadata_PROCESSING BatchOperationMetadata_State = 1
+	// The request is done and at least one item has been successfully
+	// processed.
+	BatchOperationMetadata_SUCCESSFUL BatchOperationMetadata_State = 2
+	// The request is done and no item has been successfully processed.
+	BatchOperationMetadata_FAILED BatchOperationMetadata_State = 3
+	// The request is done after the longrunning.Operations.CancelOperation has
+	// been called by the user.  Any records that were processed before the
+	// cancel command are output as specified in the request.
+	BatchOperationMetadata_CANCELLED BatchOperationMetadata_State = 4
+)
+
+var BatchOperationMetadata_State_name = map[int32]string{
+	0: "STATE_UNSPECIFIED",
+	1: "PROCESSING",
+	2: "SUCCESSFUL",
+	3: "FAILED",
+	4: "CANCELLED",
+}
+var BatchOperationMetadata_State_value = map[string]int32{
+	"STATE_UNSPECIFIED": 0,
+	"PROCESSING":        1,
+	"SUCCESSFUL":        2,
+	"FAILED":            3,
+	"CANCELLED":         4,
+}
+
+func (x BatchOperationMetadata_State) String() string {
+	return proto.EnumName(BatchOperationMetadata_State_name, int32(x))
+}
+func (BatchOperationMetadata_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{28, 0}
+}
+
+// A Product contains ReferenceImages.
+type Product struct {
+	// The resource name of the product.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`.
+	//
+	// This field is ignored when creating a product.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The user-provided name for this Product. Must not be empty. Must be at most
+	// 4096 characters long.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// User-provided metadata to be stored with this product. Must be at most 4096
+	// characters long.
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// The category for the product identified by the reference image. This should
+	// be either "homegoods" or "apparel".
+	//
+	// This field is immutable.
+	ProductCategory string `protobuf:"bytes,4,opt,name=product_category,json=productCategory,proto3" json:"product_category,omitempty"`
+	// Key-value pairs that can be attached to a product. At query time,
+	// constraints can be specified based on the product_labels.
+	//
+	// Note that integer values can be provided as strings, e.g. "1199". Only
+	// strings with integer values can match a range-based restriction which is
+	// to be supported soon.
+	//
+	// Multiple values can be assigned to the same key. One product may have up to
+	// 100 product_labels.
+	ProductLabels        []*Product_KeyValue `protobuf:"bytes,5,rep,name=product_labels,json=productLabels,proto3" json:"product_labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *Product) Reset()         { *m = Product{} }
+func (m *Product) String() string { return proto.CompactTextString(m) }
+func (*Product) ProtoMessage()    {}
+func (*Product) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{0}
+}
+func (m *Product) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Product.Unmarshal(m, b)
+}
+func (m *Product) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Product.Marshal(b, m, deterministic)
+}
+func (dst *Product) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Product.Merge(dst, src)
+}
+func (m *Product) XXX_Size() int {
+	return xxx_messageInfo_Product.Size(m)
+}
+func (m *Product) XXX_DiscardUnknown() {
+	xxx_messageInfo_Product.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Product proto.InternalMessageInfo
+
+func (m *Product) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Product) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *Product) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *Product) GetProductCategory() string {
+	if m != nil {
+		return m.ProductCategory
+	}
+	return ""
+}
+
+func (m *Product) GetProductLabels() []*Product_KeyValue {
+	if m != nil {
+		return m.ProductLabels
+	}
+	return nil
+}
+
+// A product label represented as a key-value pair.
+type Product_KeyValue struct {
+	// The key of the label attached to the product. Cannot be empty and cannot
+	// exceed 128 bytes.
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// The value of the label attached to the product. Cannot be empty and
+	// cannot exceed 128 bytes.
+	Value                string   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Product_KeyValue) Reset()         { *m = Product_KeyValue{} }
+func (m *Product_KeyValue) String() string { return proto.CompactTextString(m) }
+func (*Product_KeyValue) ProtoMessage()    {}
+func (*Product_KeyValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{0, 0}
+}
+func (m *Product_KeyValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Product_KeyValue.Unmarshal(m, b)
+}
+func (m *Product_KeyValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Product_KeyValue.Marshal(b, m, deterministic)
+}
+func (dst *Product_KeyValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Product_KeyValue.Merge(dst, src)
+}
+func (m *Product_KeyValue) XXX_Size() int {
+	return xxx_messageInfo_Product_KeyValue.Size(m)
+}
+func (m *Product_KeyValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_Product_KeyValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Product_KeyValue proto.InternalMessageInfo
+
+func (m *Product_KeyValue) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *Product_KeyValue) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+// A ProductSet contains Products. A ProductSet can contain a maximum of 1
+// million reference images. If the limit is exceeded, periodic indexing will
+// fail.
+type ProductSet struct {
+	// The resource name of the ProductSet.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID`.
+	//
+	// This field is ignored when creating a ProductSet.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The user-provided name for this ProductSet. Must not be empty. Must be at
+	// most 4096 characters long.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Output only. The time at which this ProductSet was last indexed. Query
+	// results will reflect all updates before this time. If this ProductSet has
+	// never been indexed, this field is 0.
+	//
+	// This field is ignored when creating a ProductSet.
+	IndexTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=index_time,json=indexTime,proto3" json:"index_time,omitempty"`
+	// Output only. If there was an error with indexing the product set, the field
+	// is populated.
+	//
+	// This field is ignored when creating a ProductSet.
+	IndexError           *status.Status `protobuf:"bytes,4,opt,name=index_error,json=indexError,proto3" json:"index_error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *ProductSet) Reset()         { *m = ProductSet{} }
+func (m *ProductSet) String() string { return proto.CompactTextString(m) }
+func (*ProductSet) ProtoMessage()    {}
+func (*ProductSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{1}
+}
+func (m *ProductSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProductSet.Unmarshal(m, b)
+}
+func (m *ProductSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProductSet.Marshal(b, m, deterministic)
+}
+func (dst *ProductSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProductSet.Merge(dst, src)
+}
+func (m *ProductSet) XXX_Size() int {
+	return xxx_messageInfo_ProductSet.Size(m)
+}
+func (m *ProductSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProductSet.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ProductSet proto.InternalMessageInfo
+
+func (m *ProductSet) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ProductSet) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *ProductSet) GetIndexTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.IndexTime
+	}
+	return nil
+}
+
+func (m *ProductSet) GetIndexError() *status.Status {
+	if m != nil {
+		return m.IndexError
+	}
+	return nil
+}
+
+// A `ReferenceImage` represents a product image and its associated metadata,
+// such as bounding boxes.
+type ReferenceImage struct {
+	// The resource name of the reference image.
+	//
+	// Format is:
+	//
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID/referenceImages/IMAGE_ID`.
+	//
+	// This field is ignored when creating a reference image.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The Google Cloud Storage URI of the reference image.
+	//
+	// The URI must start with `gs://`.
+	//
+	// Required.
+	Uri string `protobuf:"bytes,2,opt,name=uri,proto3" json:"uri,omitempty"`
+	// Bounding polygons around the areas of interest in the reference image.
+	// Optional. If this field is empty, the system will try to detect regions of
+	// interest. At most 10 bounding polygons will be used.
+	//
+	// The provided shape is converted into a non-rotated rectangle. Once
+	// converted, the small edge of the rectangle must be greater than or equal
+	// to 300 pixels. The aspect ratio must be 1:4 or less (i.e. 1:3 is ok; 1:5
+	// is not).
+	BoundingPolys        []*BoundingPoly `protobuf:"bytes,3,rep,name=bounding_polys,json=boundingPolys,proto3" json:"bounding_polys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *ReferenceImage) Reset()         { *m = ReferenceImage{} }
+func (m *ReferenceImage) String() string { return proto.CompactTextString(m) }
+func (*ReferenceImage) ProtoMessage()    {}
+func (*ReferenceImage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{2}
+}
+func (m *ReferenceImage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReferenceImage.Unmarshal(m, b)
+}
+func (m *ReferenceImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReferenceImage.Marshal(b, m, deterministic)
+}
+func (dst *ReferenceImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReferenceImage.Merge(dst, src)
+}
+func (m *ReferenceImage) XXX_Size() int {
+	return xxx_messageInfo_ReferenceImage.Size(m)
+}
+func (m *ReferenceImage) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReferenceImage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReferenceImage proto.InternalMessageInfo
+
+func (m *ReferenceImage) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ReferenceImage) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+func (m *ReferenceImage) GetBoundingPolys() []*BoundingPoly {
+	if m != nil {
+		return m.BoundingPolys
+	}
+	return nil
+}
+
+// Request message for the `CreateProduct` method.
+type CreateProductRequest struct {
+	// The project in which the Product should be created.
+	//
+	// Format is
+	// `projects/PROJECT_ID/locations/LOC_ID`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The product to create.
+	Product *Product `protobuf:"bytes,2,opt,name=product,proto3" json:"product,omitempty"`
+	// A user-supplied resource id for this Product. If set, the server will
+	// attempt to use this value as the resource id. If it is already in use, an
+	// error is returned with code ALREADY_EXISTS. Must be at most 128 characters
+	// long. It cannot contain the character `/`.
+	ProductId            string   `protobuf:"bytes,3,opt,name=product_id,json=productId,proto3" json:"product_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateProductRequest) Reset()         { *m = CreateProductRequest{} }
+func (m *CreateProductRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateProductRequest) ProtoMessage()    {}
+func (*CreateProductRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{3}
+}
+func (m *CreateProductRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateProductRequest.Unmarshal(m, b)
+}
+func (m *CreateProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateProductRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProductRequest.Merge(dst, src)
+}
+func (m *CreateProductRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateProductRequest.Size(m)
+}
+func (m *CreateProductRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateProductRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateProductRequest proto.InternalMessageInfo
+
+func (m *CreateProductRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateProductRequest) GetProduct() *Product {
+	if m != nil {
+		return m.Product
+	}
+	return nil
+}
+
+func (m *CreateProductRequest) GetProductId() string {
+	if m != nil {
+		return m.ProductId
+	}
+	return ""
+}
+
+// Request message for the `ListProducts` method.
+type ListProductsRequest struct {
+	// The project OR ProductSet from which Products should be listed.
+	//
+	// Format:
+	// `projects/PROJECT_ID/locations/LOC_ID`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return. Default 10, maximum 100.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// The next_page_token returned from a previous List request, if any.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListProductsRequest) Reset()         { *m = ListProductsRequest{} }
+func (m *ListProductsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListProductsRequest) ProtoMessage()    {}
+func (*ListProductsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{4}
+}
+func (m *ListProductsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListProductsRequest.Unmarshal(m, b)
+}
+func (m *ListProductsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListProductsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListProductsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsRequest.Merge(dst, src)
+}
+func (m *ListProductsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListProductsRequest.Size(m)
+}
+func (m *ListProductsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListProductsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListProductsRequest proto.InternalMessageInfo
+
+func (m *ListProductsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListProductsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListProductsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for the `ListProducts` method.
+type ListProductsResponse struct {
+	// List of products.
+	Products []*Product `protobuf:"bytes,1,rep,name=products,proto3" json:"products,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no more
+	// results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListProductsResponse) Reset()         { *m = ListProductsResponse{} }
+func (m *ListProductsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListProductsResponse) ProtoMessage()    {}
+func (*ListProductsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{5}
+}
+func (m *ListProductsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListProductsResponse.Unmarshal(m, b)
+}
+func (m *ListProductsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListProductsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListProductsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsResponse.Merge(dst, src)
+}
+func (m *ListProductsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListProductsResponse.Size(m)
+}
+func (m *ListProductsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListProductsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListProductsResponse proto.InternalMessageInfo
+
+func (m *ListProductsResponse) GetProducts() []*Product {
+	if m != nil {
+		return m.Products
+	}
+	return nil
+}
+
+func (m *ListProductsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for the `GetProduct` method.
+type GetProductRequest struct {
+	// Resource name of the Product to get.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetProductRequest) Reset()         { *m = GetProductRequest{} }
+func (m *GetProductRequest) String() string { return proto.CompactTextString(m) }
+func (*GetProductRequest) ProtoMessage()    {}
+func (*GetProductRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{6}
+}
+func (m *GetProductRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetProductRequest.Unmarshal(m, b)
+}
+func (m *GetProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetProductRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductRequest.Merge(dst, src)
+}
+func (m *GetProductRequest) XXX_Size() int {
+	return xxx_messageInfo_GetProductRequest.Size(m)
+}
+func (m *GetProductRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetProductRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetProductRequest proto.InternalMessageInfo
+
+func (m *GetProductRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for the `UpdateProduct` method.
+type UpdateProductRequest struct {
+	// The Product resource which replaces the one on the server.
+	// product.name is immutable.
+	Product *Product `protobuf:"bytes,1,opt,name=product,proto3" json:"product,omitempty"`
+	// The [FieldMask][google.protobuf.FieldMask] that specifies which fields
+	// to update.
+	// If update_mask isn't specified, all mutable fields are to be updated.
+	// Valid mask paths include `product_labels`, `display_name` and
+	// `description`.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateProductRequest) Reset()         { *m = UpdateProductRequest{} }
+func (m *UpdateProductRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateProductRequest) ProtoMessage()    {}
+func (*UpdateProductRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{7}
+}
+func (m *UpdateProductRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateProductRequest.Unmarshal(m, b)
+}
+func (m *UpdateProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateProductRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProductRequest.Merge(dst, src)
+}
+func (m *UpdateProductRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateProductRequest.Size(m)
+}
+func (m *UpdateProductRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateProductRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateProductRequest proto.InternalMessageInfo
+
+func (m *UpdateProductRequest) GetProduct() *Product {
+	if m != nil {
+		return m.Product
+	}
+	return nil
+}
+
+func (m *UpdateProductRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Request message for the `DeleteProduct` method.
+type DeleteProductRequest struct {
+	// Resource name of product to delete.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteProductRequest) Reset()         { *m = DeleteProductRequest{} }
+func (m *DeleteProductRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteProductRequest) ProtoMessage()    {}
+func (*DeleteProductRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{8}
+}
+func (m *DeleteProductRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteProductRequest.Unmarshal(m, b)
+}
+func (m *DeleteProductRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteProductRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteProductRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProductRequest.Merge(dst, src)
+}
+func (m *DeleteProductRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteProductRequest.Size(m)
+}
+func (m *DeleteProductRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteProductRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteProductRequest proto.InternalMessageInfo
+
+func (m *DeleteProductRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for the `CreateProductSet` method.
+type CreateProductSetRequest struct {
+	// The project in which the ProductSet should be created.
+	//
+	// Format is `projects/PROJECT_ID/locations/LOC_ID`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The ProductSet to create.
+	ProductSet *ProductSet `protobuf:"bytes,2,opt,name=product_set,json=productSet,proto3" json:"product_set,omitempty"`
+	// A user-supplied resource id for this ProductSet. If set, the server will
+	// attempt to use this value as the resource id. If it is already in use, an
+	// error is returned with code ALREADY_EXISTS. Must be at most 128 characters
+	// long. It cannot contain the character `/`.
+	ProductSetId         string   `protobuf:"bytes,3,opt,name=product_set_id,json=productSetId,proto3" json:"product_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateProductSetRequest) Reset()         { *m = CreateProductSetRequest{} }
+func (m *CreateProductSetRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateProductSetRequest) ProtoMessage()    {}
+func (*CreateProductSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{9}
+}
+func (m *CreateProductSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateProductSetRequest.Unmarshal(m, b)
+}
+func (m *CreateProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateProductSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProductSetRequest.Merge(dst, src)
+}
+func (m *CreateProductSetRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateProductSetRequest.Size(m)
+}
+func (m *CreateProductSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateProductSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateProductSetRequest proto.InternalMessageInfo
+
+func (m *CreateProductSetRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateProductSetRequest) GetProductSet() *ProductSet {
+	if m != nil {
+		return m.ProductSet
+	}
+	return nil
+}
+
+func (m *CreateProductSetRequest) GetProductSetId() string {
+	if m != nil {
+		return m.ProductSetId
+	}
+	return ""
+}
+
+// Request message for the `ListProductSets` method.
+type ListProductSetsRequest struct {
+	// The project from which ProductSets should be listed.
+	//
+	// Format is `projects/PROJECT_ID/locations/LOC_ID`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return. Default 10, maximum 100.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// The next_page_token returned from a previous List request, if any.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListProductSetsRequest) Reset()         { *m = ListProductSetsRequest{} }
+func (m *ListProductSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListProductSetsRequest) ProtoMessage()    {}
+func (*ListProductSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{10}
+}
+func (m *ListProductSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListProductSetsRequest.Unmarshal(m, b)
+}
+func (m *ListProductSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListProductSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListProductSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductSetsRequest.Merge(dst, src)
+}
+func (m *ListProductSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListProductSetsRequest.Size(m)
+}
+func (m *ListProductSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListProductSetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListProductSetsRequest proto.InternalMessageInfo
+
+func (m *ListProductSetsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListProductSetsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListProductSetsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for the `ListProductSets` method.
+type ListProductSetsResponse struct {
+	// List of ProductSets.
+	ProductSets []*ProductSet `protobuf:"bytes,1,rep,name=product_sets,json=productSets,proto3" json:"product_sets,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no more
+	// results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListProductSetsResponse) Reset()         { *m = ListProductSetsResponse{} }
+func (m *ListProductSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListProductSetsResponse) ProtoMessage()    {}
+func (*ListProductSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{11}
+}
+func (m *ListProductSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListProductSetsResponse.Unmarshal(m, b)
+}
+func (m *ListProductSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListProductSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListProductSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductSetsResponse.Merge(dst, src)
+}
+func (m *ListProductSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListProductSetsResponse.Size(m)
+}
+func (m *ListProductSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListProductSetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListProductSetsResponse proto.InternalMessageInfo
+
+func (m *ListProductSetsResponse) GetProductSets() []*ProductSet {
+	if m != nil {
+		return m.ProductSets
+	}
+	return nil
+}
+
+func (m *ListProductSetsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for the `GetProductSet` method.
+type GetProductSetRequest struct {
+	// Resource name of the ProductSet to get.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOG_ID/productSets/PRODUCT_SET_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetProductSetRequest) Reset()         { *m = GetProductSetRequest{} }
+func (m *GetProductSetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetProductSetRequest) ProtoMessage()    {}
+func (*GetProductSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{12}
+}
+func (m *GetProductSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetProductSetRequest.Unmarshal(m, b)
+}
+func (m *GetProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetProductSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetProductSetRequest.Merge(dst, src)
+}
+func (m *GetProductSetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetProductSetRequest.Size(m)
+}
+func (m *GetProductSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetProductSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetProductSetRequest proto.InternalMessageInfo
+
+func (m *GetProductSetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for the `UpdateProductSet` method.
+type UpdateProductSetRequest struct {
+	// The ProductSet resource which replaces the one on the server.
+	ProductSet *ProductSet `protobuf:"bytes,1,opt,name=product_set,json=productSet,proto3" json:"product_set,omitempty"`
+	// The [FieldMask][google.protobuf.FieldMask] that specifies which fields to
+	// update.
+	// If update_mask isn't specified, all mutable fields are to be updated.
+	// Valid mask path is `display_name`.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateProductSetRequest) Reset()         { *m = UpdateProductSetRequest{} }
+func (m *UpdateProductSetRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateProductSetRequest) ProtoMessage()    {}
+func (*UpdateProductSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{13}
+}
+func (m *UpdateProductSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateProductSetRequest.Unmarshal(m, b)
+}
+func (m *UpdateProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateProductSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProductSetRequest.Merge(dst, src)
+}
+func (m *UpdateProductSetRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateProductSetRequest.Size(m)
+}
+func (m *UpdateProductSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateProductSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateProductSetRequest proto.InternalMessageInfo
+
+func (m *UpdateProductSetRequest) GetProductSet() *ProductSet {
+	if m != nil {
+		return m.ProductSet
+	}
+	return nil
+}
+
+func (m *UpdateProductSetRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Request message for the `DeleteProductSet` method.
+type DeleteProductSetRequest struct {
+	// Resource name of the ProductSet to delete.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteProductSetRequest) Reset()         { *m = DeleteProductSetRequest{} }
+func (m *DeleteProductSetRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteProductSetRequest) ProtoMessage()    {}
+func (*DeleteProductSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{14}
+}
+func (m *DeleteProductSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteProductSetRequest.Unmarshal(m, b)
+}
+func (m *DeleteProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteProductSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteProductSetRequest.Merge(dst, src)
+}
+func (m *DeleteProductSetRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteProductSetRequest.Size(m)
+}
+func (m *DeleteProductSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteProductSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteProductSetRequest proto.InternalMessageInfo
+
+func (m *DeleteProductSetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for the `CreateReferenceImage` method.
+type CreateReferenceImageRequest struct {
+	// Resource name of the product in which to create the reference image.
+	//
+	// Format is
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The reference image to create.
+	// If an image ID is specified, it is ignored.
+	ReferenceImage *ReferenceImage `protobuf:"bytes,2,opt,name=reference_image,json=referenceImage,proto3" json:"reference_image,omitempty"`
+	// A user-supplied resource id for the ReferenceImage to be added. If set,
+	// the server will attempt to use this value as the resource id. If it is
+	// already in use, an error is returned with code ALREADY_EXISTS. Must be at
+	// most 128 characters long. It cannot contain the character `/`.
+	ReferenceImageId     string   `protobuf:"bytes,3,opt,name=reference_image_id,json=referenceImageId,proto3" json:"reference_image_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateReferenceImageRequest) Reset()         { *m = CreateReferenceImageRequest{} }
+func (m *CreateReferenceImageRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateReferenceImageRequest) ProtoMessage()    {}
+func (*CreateReferenceImageRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{15}
+}
+func (m *CreateReferenceImageRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateReferenceImageRequest.Unmarshal(m, b)
+}
+func (m *CreateReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateReferenceImageRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateReferenceImageRequest.Merge(dst, src)
+}
+func (m *CreateReferenceImageRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateReferenceImageRequest.Size(m)
+}
+func (m *CreateReferenceImageRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateReferenceImageRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateReferenceImageRequest proto.InternalMessageInfo
+
+func (m *CreateReferenceImageRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateReferenceImageRequest) GetReferenceImage() *ReferenceImage {
+	if m != nil {
+		return m.ReferenceImage
+	}
+	return nil
+}
+
+func (m *CreateReferenceImageRequest) GetReferenceImageId() string {
+	if m != nil {
+		return m.ReferenceImageId
+	}
+	return ""
+}
+
+// Request message for the `ListReferenceImages` method.
+type ListReferenceImagesRequest struct {
+	// Resource name of the product containing the reference images.
+	//
+	// Format is
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return. Default 10, maximum 100.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// A token identifying a page of results to be returned. This is the value
+	// of `nextPageToken` returned in a previous reference image list request.
+	//
+	// Defaults to the first page if not specified.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListReferenceImagesRequest) Reset()         { *m = ListReferenceImagesRequest{} }
+func (m *ListReferenceImagesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListReferenceImagesRequest) ProtoMessage()    {}
+func (*ListReferenceImagesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{16}
+}
+func (m *ListReferenceImagesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListReferenceImagesRequest.Unmarshal(m, b)
+}
+func (m *ListReferenceImagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListReferenceImagesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListReferenceImagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReferenceImagesRequest.Merge(dst, src)
+}
+func (m *ListReferenceImagesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListReferenceImagesRequest.Size(m)
+}
+func (m *ListReferenceImagesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListReferenceImagesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListReferenceImagesRequest proto.InternalMessageInfo
+
+func (m *ListReferenceImagesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListReferenceImagesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListReferenceImagesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for the `ListReferenceImages` method.
+type ListReferenceImagesResponse struct {
+	// The list of reference images.
+	ReferenceImages []*ReferenceImage `protobuf:"bytes,1,rep,name=reference_images,json=referenceImages,proto3" json:"reference_images,omitempty"`
+	// The maximum number of items to return. Default 10, maximum 100.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// The next_page_token returned from a previous List request, if any.
+	NextPageToken        string   `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListReferenceImagesResponse) Reset()         { *m = ListReferenceImagesResponse{} }
+func (m *ListReferenceImagesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListReferenceImagesResponse) ProtoMessage()    {}
+func (*ListReferenceImagesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{17}
+}
+func (m *ListReferenceImagesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListReferenceImagesResponse.Unmarshal(m, b)
+}
+func (m *ListReferenceImagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListReferenceImagesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListReferenceImagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReferenceImagesResponse.Merge(dst, src)
+}
+func (m *ListReferenceImagesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListReferenceImagesResponse.Size(m)
+}
+func (m *ListReferenceImagesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListReferenceImagesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListReferenceImagesResponse proto.InternalMessageInfo
+
+func (m *ListReferenceImagesResponse) GetReferenceImages() []*ReferenceImage {
+	if m != nil {
+		return m.ReferenceImages
+	}
+	return nil
+}
+
+func (m *ListReferenceImagesResponse) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListReferenceImagesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for the `GetReferenceImage` method.
+type GetReferenceImageRequest struct {
+	// The resource name of the ReferenceImage to get.
+	//
+	// Format is:
+	//
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID/referenceImages/IMAGE_ID`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetReferenceImageRequest) Reset()         { *m = GetReferenceImageRequest{} }
+func (m *GetReferenceImageRequest) String() string { return proto.CompactTextString(m) }
+func (*GetReferenceImageRequest) ProtoMessage()    {}
+func (*GetReferenceImageRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{18}
+}
+func (m *GetReferenceImageRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetReferenceImageRequest.Unmarshal(m, b)
+}
+func (m *GetReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetReferenceImageRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReferenceImageRequest.Merge(dst, src)
+}
+func (m *GetReferenceImageRequest) XXX_Size() int {
+	return xxx_messageInfo_GetReferenceImageRequest.Size(m)
+}
+func (m *GetReferenceImageRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetReferenceImageRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetReferenceImageRequest proto.InternalMessageInfo
+
+func (m *GetReferenceImageRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for the `DeleteReferenceImage` method.
+type DeleteReferenceImageRequest struct {
+	// The resource name of the reference image to delete.
+	//
+	// Format is:
+	//
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID/referenceImages/IMAGE_ID`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteReferenceImageRequest) Reset()         { *m = DeleteReferenceImageRequest{} }
+func (m *DeleteReferenceImageRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteReferenceImageRequest) ProtoMessage()    {}
+func (*DeleteReferenceImageRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{19}
+}
+func (m *DeleteReferenceImageRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteReferenceImageRequest.Unmarshal(m, b)
+}
+func (m *DeleteReferenceImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteReferenceImageRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteReferenceImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteReferenceImageRequest.Merge(dst, src)
+}
+func (m *DeleteReferenceImageRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteReferenceImageRequest.Size(m)
+}
+func (m *DeleteReferenceImageRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteReferenceImageRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteReferenceImageRequest proto.InternalMessageInfo
+
+func (m *DeleteReferenceImageRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for the `AddProductToProductSet` method.
+type AddProductToProductSetRequest struct {
+	// The resource name for the ProductSet to modify.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The resource name for the Product to be added to this ProductSet.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`
+	Product              string   `protobuf:"bytes,2,opt,name=product,proto3" json:"product,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AddProductToProductSetRequest) Reset()         { *m = AddProductToProductSetRequest{} }
+func (m *AddProductToProductSetRequest) String() string { return proto.CompactTextString(m) }
+func (*AddProductToProductSetRequest) ProtoMessage()    {}
+func (*AddProductToProductSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{20}
+}
+func (m *AddProductToProductSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AddProductToProductSetRequest.Unmarshal(m, b)
+}
+func (m *AddProductToProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AddProductToProductSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *AddProductToProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddProductToProductSetRequest.Merge(dst, src)
+}
+func (m *AddProductToProductSetRequest) XXX_Size() int {
+	return xxx_messageInfo_AddProductToProductSetRequest.Size(m)
+}
+func (m *AddProductToProductSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AddProductToProductSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AddProductToProductSetRequest proto.InternalMessageInfo
+
+func (m *AddProductToProductSetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *AddProductToProductSetRequest) GetProduct() string {
+	if m != nil {
+		return m.Product
+	}
+	return ""
+}
+
+// Request message for the `RemoveProductFromProductSet` method.
+type RemoveProductFromProductSetRequest struct {
+	// The resource name for the ProductSet to modify.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The resource name for the Product to be removed from this ProductSet.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/products/PRODUCT_ID`
+	Product              string   `protobuf:"bytes,2,opt,name=product,proto3" json:"product,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RemoveProductFromProductSetRequest) Reset()         { *m = RemoveProductFromProductSetRequest{} }
+func (m *RemoveProductFromProductSetRequest) String() string { return proto.CompactTextString(m) }
+func (*RemoveProductFromProductSetRequest) ProtoMessage()    {}
+func (*RemoveProductFromProductSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{21}
+}
+func (m *RemoveProductFromProductSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RemoveProductFromProductSetRequest.Unmarshal(m, b)
+}
+func (m *RemoveProductFromProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RemoveProductFromProductSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *RemoveProductFromProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoveProductFromProductSetRequest.Merge(dst, src)
+}
+func (m *RemoveProductFromProductSetRequest) XXX_Size() int {
+	return xxx_messageInfo_RemoveProductFromProductSetRequest.Size(m)
+}
+func (m *RemoveProductFromProductSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RemoveProductFromProductSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RemoveProductFromProductSetRequest proto.InternalMessageInfo
+
+func (m *RemoveProductFromProductSetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *RemoveProductFromProductSetRequest) GetProduct() string {
+	if m != nil {
+		return m.Product
+	}
+	return ""
+}
+
+// Request message for the `ListProductsInProductSet` method.
+type ListProductsInProductSetRequest struct {
+	// The ProductSet resource for which to retrieve Products.
+	//
+	// Format is:
+	// `projects/PROJECT_ID/locations/LOC_ID/productSets/PRODUCT_SET_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The maximum number of items to return. Default 10, maximum 100.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// The next_page_token returned from a previous List request, if any.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListProductsInProductSetRequest) Reset()         { *m = ListProductsInProductSetRequest{} }
+func (m *ListProductsInProductSetRequest) String() string { return proto.CompactTextString(m) }
+func (*ListProductsInProductSetRequest) ProtoMessage()    {}
+func (*ListProductsInProductSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{22}
+}
+func (m *ListProductsInProductSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListProductsInProductSetRequest.Unmarshal(m, b)
+}
+func (m *ListProductsInProductSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListProductsInProductSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListProductsInProductSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsInProductSetRequest.Merge(dst, src)
+}
+func (m *ListProductsInProductSetRequest) XXX_Size() int {
+	return xxx_messageInfo_ListProductsInProductSetRequest.Size(m)
+}
+func (m *ListProductsInProductSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListProductsInProductSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListProductsInProductSetRequest proto.InternalMessageInfo
+
+func (m *ListProductsInProductSetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ListProductsInProductSetRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListProductsInProductSetRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response message for the `ListProductsInProductSet` method.
+type ListProductsInProductSetResponse struct {
+	// The list of Products.
+	Products []*Product `protobuf:"bytes,1,rep,name=products,proto3" json:"products,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no more
+	// results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListProductsInProductSetResponse) Reset()         { *m = ListProductsInProductSetResponse{} }
+func (m *ListProductsInProductSetResponse) String() string { return proto.CompactTextString(m) }
+func (*ListProductsInProductSetResponse) ProtoMessage()    {}
+func (*ListProductsInProductSetResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{23}
+}
+func (m *ListProductsInProductSetResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListProductsInProductSetResponse.Unmarshal(m, b)
+}
+func (m *ListProductsInProductSetResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListProductsInProductSetResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListProductsInProductSetResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListProductsInProductSetResponse.Merge(dst, src)
+}
+func (m *ListProductsInProductSetResponse) XXX_Size() int {
+	return xxx_messageInfo_ListProductsInProductSetResponse.Size(m)
+}
+func (m *ListProductsInProductSetResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListProductsInProductSetResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListProductsInProductSetResponse proto.InternalMessageInfo
+
+func (m *ListProductsInProductSetResponse) GetProducts() []*Product {
+	if m != nil {
+		return m.Products
+	}
+	return nil
+}
+
+func (m *ListProductsInProductSetResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The Google Cloud Storage location for a csv file which preserves a list of
+// ImportProductSetRequests in each line.
+type ImportProductSetsGcsSource struct {
+	// The Google Cloud Storage URI of the input csv file.
+	//
+	// The URI must start with gs://
+	//
+	// The format of the input csv file should be one image per line.
+	// In each line, there are 6 columns.
+	// 1. image_uri
+	// 2, image_id
+	// 3. product_set_id
+	// 4. product_id
+	// 5, product_category
+	// 6, product_display_name
+	// 7, labels
+	// 8. bounding_poly
+	//
+	// Columns 1, 3, 4, and 5 are required, other columns are optional. A new
+	// ProductSet/Product with the same id will be created on the fly
+	// if the ProductSet/Product specified by product_set_id/product_id does not
+	// exist.
+	//
+	// The image_id field is optional but has to be unique if provided. If it is
+	// empty, we will automatically assign an unique id to the image.
+	//
+	// The product_display_name field is optional. If it is empty, a space (" ")
+	// is used as the place holder for the product display_name, which can
+	// be updated later through the realtime API.
+	//
+	// If the Product with product_id already exists, the fields
+	// product_display_name, product_category and labels are ignored.
+	//
+	// If a Product doesn't exist and needs to be created on the fly, the
+	// product_display_name field refers to [Product.display_name][google.cloud.vision.v1p3beta1.Product.display_name], the
+	// product_category field refers to [Product.product_category][google.cloud.vision.v1p3beta1.Product.product_category], and the
+	// labels field refers to [Product.labels][].
+	//
+	// Labels (optional) should be a line containing a list of comma-separated
+	// key-value pairs, with the format
+	//     "key_1=value_1,key_2=value_2,...,key_n=value_n".
+	//
+	// The bounding_poly (optional) field is used to identify one region of
+	// interest from the image in the same manner as CreateReferenceImage. If no
+	// bounding_poly is specified, the system will try to detect regions of
+	// interest automatically.
+	//
+	// Note that the pipeline will resize the image if the image resolution is too
+	// large to process (above 20MP).
+	//
+	// Also note that at most one bounding_poly is allowed per line. If the image
+	// contains multiple regions of interest, the csv should contain one line per
+	// region of interest.
+	//
+	// The bounding_poly column should contain an even number of comma-separated
+	// numbers, with the format "p1_x,p1_y,p2_x,p2_y,...,pn_x,pn_y". Nonnegative
+	// integers should be used for absolute bounding polygons, and float values
+	// in [0, 1] should be used for normalized bounding polygons.
+	CsvFileUri           string   `protobuf:"bytes,1,opt,name=csv_file_uri,json=csvFileUri,proto3" json:"csv_file_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImportProductSetsGcsSource) Reset()         { *m = ImportProductSetsGcsSource{} }
+func (m *ImportProductSetsGcsSource) String() string { return proto.CompactTextString(m) }
+func (*ImportProductSetsGcsSource) ProtoMessage()    {}
+func (*ImportProductSetsGcsSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{24}
+}
+func (m *ImportProductSetsGcsSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportProductSetsGcsSource.Unmarshal(m, b)
+}
+func (m *ImportProductSetsGcsSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportProductSetsGcsSource.Marshal(b, m, deterministic)
+}
+func (dst *ImportProductSetsGcsSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsGcsSource.Merge(dst, src)
+}
+func (m *ImportProductSetsGcsSource) XXX_Size() int {
+	return xxx_messageInfo_ImportProductSetsGcsSource.Size(m)
+}
+func (m *ImportProductSetsGcsSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportProductSetsGcsSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportProductSetsGcsSource proto.InternalMessageInfo
+
+func (m *ImportProductSetsGcsSource) GetCsvFileUri() string {
+	if m != nil {
+		return m.CsvFileUri
+	}
+	return ""
+}
+
+// The input content for the `ImportProductSets` method.
+type ImportProductSetsInputConfig struct {
+	// The source of the input.
+	//
+	// Types that are valid to be assigned to Source:
+	//	*ImportProductSetsInputConfig_GcsSource
+	Source               isImportProductSetsInputConfig_Source `protobuf_oneof:"source"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
+}
+
+func (m *ImportProductSetsInputConfig) Reset()         { *m = ImportProductSetsInputConfig{} }
+func (m *ImportProductSetsInputConfig) String() string { return proto.CompactTextString(m) }
+func (*ImportProductSetsInputConfig) ProtoMessage()    {}
+func (*ImportProductSetsInputConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{25}
+}
+func (m *ImportProductSetsInputConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportProductSetsInputConfig.Unmarshal(m, b)
+}
+func (m *ImportProductSetsInputConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportProductSetsInputConfig.Marshal(b, m, deterministic)
+}
+func (dst *ImportProductSetsInputConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsInputConfig.Merge(dst, src)
+}
+func (m *ImportProductSetsInputConfig) XXX_Size() int {
+	return xxx_messageInfo_ImportProductSetsInputConfig.Size(m)
+}
+func (m *ImportProductSetsInputConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportProductSetsInputConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportProductSetsInputConfig proto.InternalMessageInfo
+
+type isImportProductSetsInputConfig_Source interface {
+	isImportProductSetsInputConfig_Source()
+}
+
+type ImportProductSetsInputConfig_GcsSource struct {
+	GcsSource *ImportProductSetsGcsSource `protobuf:"bytes,1,opt,name=gcs_source,json=gcsSource,proto3,oneof"`
+}
+
+func (*ImportProductSetsInputConfig_GcsSource) isImportProductSetsInputConfig_Source() {}
+
+func (m *ImportProductSetsInputConfig) GetSource() isImportProductSetsInputConfig_Source {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+func (m *ImportProductSetsInputConfig) GetGcsSource() *ImportProductSetsGcsSource {
+	if x, ok := m.GetSource().(*ImportProductSetsInputConfig_GcsSource); ok {
+		return x.GcsSource
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ImportProductSetsInputConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ImportProductSetsInputConfig_OneofMarshaler, _ImportProductSetsInputConfig_OneofUnmarshaler, _ImportProductSetsInputConfig_OneofSizer, []interface{}{
+		(*ImportProductSetsInputConfig_GcsSource)(nil),
+	}
+}
+
+func _ImportProductSetsInputConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ImportProductSetsInputConfig)
+	// source
+	switch x := m.Source.(type) {
+	case *ImportProductSetsInputConfig_GcsSource:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.GcsSource); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("ImportProductSetsInputConfig.Source has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ImportProductSetsInputConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ImportProductSetsInputConfig)
+	switch tag {
+	case 1: // source.gcs_source
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ImportProductSetsGcsSource)
+		err := b.DecodeMessage(msg)
+		m.Source = &ImportProductSetsInputConfig_GcsSource{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ImportProductSetsInputConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ImportProductSetsInputConfig)
+	// source
+	switch x := m.Source.(type) {
+	case *ImportProductSetsInputConfig_GcsSource:
+		s := proto.Size(x.GcsSource)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Request message for the `ImportProductSets` method.
+type ImportProductSetsRequest struct {
+	// The project in which the ProductSets should be imported.
+	//
+	// Format is `projects/PROJECT_ID/locations/LOC_ID`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The input content for the list of requests.
+	InputConfig          *ImportProductSetsInputConfig `protobuf:"bytes,2,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *ImportProductSetsRequest) Reset()         { *m = ImportProductSetsRequest{} }
+func (m *ImportProductSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportProductSetsRequest) ProtoMessage()    {}
+func (*ImportProductSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{26}
+}
+func (m *ImportProductSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportProductSetsRequest.Unmarshal(m, b)
+}
+func (m *ImportProductSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportProductSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportProductSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsRequest.Merge(dst, src)
+}
+func (m *ImportProductSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportProductSetsRequest.Size(m)
+}
+func (m *ImportProductSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportProductSetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportProductSetsRequest proto.InternalMessageInfo
+
+func (m *ImportProductSetsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ImportProductSetsRequest) GetInputConfig() *ImportProductSetsInputConfig {
+	if m != nil {
+		return m.InputConfig
+	}
+	return nil
+}
+
+// Response message for the `ImportProductSets` method.
+//
+// This message is returned by the
+// [google.longrunning.Operations.GetOperation][google.longrunning.Operations.GetOperation] method in the returned
+// [google.longrunning.Operation.response][google.longrunning.Operation.response] field.
+type ImportProductSetsResponse struct {
+	// The list of reference_images that are imported successfully.
+	ReferenceImages []*ReferenceImage `protobuf:"bytes,1,rep,name=reference_images,json=referenceImages,proto3" json:"reference_images,omitempty"`
+	// The rpc status for each ImportProductSet request, including both successes
+	// and errors.
+	//
+	// The number of statuses here matches the number of lines in the csv file,
+	// and statuses[i] stores the success or failure status of processing the i-th
+	// line of the csv, starting from line 0.
+	Statuses             []*status.Status `protobuf:"bytes,2,rep,name=statuses,proto3" json:"statuses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *ImportProductSetsResponse) Reset()         { *m = ImportProductSetsResponse{} }
+func (m *ImportProductSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*ImportProductSetsResponse) ProtoMessage()    {}
+func (*ImportProductSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{27}
+}
+func (m *ImportProductSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportProductSetsResponse.Unmarshal(m, b)
+}
+func (m *ImportProductSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportProductSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ImportProductSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportProductSetsResponse.Merge(dst, src)
+}
+func (m *ImportProductSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_ImportProductSetsResponse.Size(m)
+}
+func (m *ImportProductSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportProductSetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportProductSetsResponse proto.InternalMessageInfo
+
+func (m *ImportProductSetsResponse) GetReferenceImages() []*ReferenceImage {
+	if m != nil {
+		return m.ReferenceImages
+	}
+	return nil
+}
+
+func (m *ImportProductSetsResponse) GetStatuses() []*status.Status {
+	if m != nil {
+		return m.Statuses
+	}
+	return nil
+}
+
+// Metadata for the batch operations such as the current state.
+//
+// This is included in the `metadata` field of the `Operation` returned by the
+// `GetOperation` call of the `google::longrunning::Operations` service.
+type BatchOperationMetadata struct {
+	// The current state of the batch operation.
+	State BatchOperationMetadata_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.vision.v1p3beta1.BatchOperationMetadata_State" json:"state,omitempty"`
+	// The time when the batch request was submitted to the server.
+	SubmitTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	// The time when the batch request is finished and
+	// [google.longrunning.Operation.done][google.longrunning.Operation.done] is set to true.
+	EndTime              *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *BatchOperationMetadata) Reset()         { *m = BatchOperationMetadata{} }
+func (m *BatchOperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*BatchOperationMetadata) ProtoMessage()    {}
+func (*BatchOperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_product_search_service_9317116d58505bed, []int{28}
+}
+func (m *BatchOperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchOperationMetadata.Unmarshal(m, b)
+}
+func (m *BatchOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchOperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *BatchOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchOperationMetadata.Merge(dst, src)
+}
+func (m *BatchOperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_BatchOperationMetadata.Size(m)
+}
+func (m *BatchOperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchOperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchOperationMetadata proto.InternalMessageInfo
+
+func (m *BatchOperationMetadata) GetState() BatchOperationMetadata_State {
+	if m != nil {
+		return m.State
+	}
+	return BatchOperationMetadata_STATE_UNSPECIFIED
+}
+
+func (m *BatchOperationMetadata) GetSubmitTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.SubmitTime
+	}
+	return nil
+}
+
+func (m *BatchOperationMetadata) GetEndTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.EndTime
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Product)(nil), "google.cloud.vision.v1p3beta1.Product")
+	proto.RegisterType((*Product_KeyValue)(nil), "google.cloud.vision.v1p3beta1.Product.KeyValue")
+	proto.RegisterType((*ProductSet)(nil), "google.cloud.vision.v1p3beta1.ProductSet")
+	proto.RegisterType((*ReferenceImage)(nil), "google.cloud.vision.v1p3beta1.ReferenceImage")
+	proto.RegisterType((*CreateProductRequest)(nil), "google.cloud.vision.v1p3beta1.CreateProductRequest")
+	proto.RegisterType((*ListProductsRequest)(nil), "google.cloud.vision.v1p3beta1.ListProductsRequest")
+	proto.RegisterType((*ListProductsResponse)(nil), "google.cloud.vision.v1p3beta1.ListProductsResponse")
+	proto.RegisterType((*GetProductRequest)(nil), "google.cloud.vision.v1p3beta1.GetProductRequest")
+	proto.RegisterType((*UpdateProductRequest)(nil), "google.cloud.vision.v1p3beta1.UpdateProductRequest")
+	proto.RegisterType((*DeleteProductRequest)(nil), "google.cloud.vision.v1p3beta1.DeleteProductRequest")
+	proto.RegisterType((*CreateProductSetRequest)(nil), "google.cloud.vision.v1p3beta1.CreateProductSetRequest")
+	proto.RegisterType((*ListProductSetsRequest)(nil), "google.cloud.vision.v1p3beta1.ListProductSetsRequest")
+	proto.RegisterType((*ListProductSetsResponse)(nil), "google.cloud.vision.v1p3beta1.ListProductSetsResponse")
+	proto.RegisterType((*GetProductSetRequest)(nil), "google.cloud.vision.v1p3beta1.GetProductSetRequest")
+	proto.RegisterType((*UpdateProductSetRequest)(nil), "google.cloud.vision.v1p3beta1.UpdateProductSetRequest")
+	proto.RegisterType((*DeleteProductSetRequest)(nil), "google.cloud.vision.v1p3beta1.DeleteProductSetRequest")
+	proto.RegisterType((*CreateReferenceImageRequest)(nil), "google.cloud.vision.v1p3beta1.CreateReferenceImageRequest")
+	proto.RegisterType((*ListReferenceImagesRequest)(nil), "google.cloud.vision.v1p3beta1.ListReferenceImagesRequest")
+	proto.RegisterType((*ListReferenceImagesResponse)(nil), "google.cloud.vision.v1p3beta1.ListReferenceImagesResponse")
+	proto.RegisterType((*GetReferenceImageRequest)(nil), "google.cloud.vision.v1p3beta1.GetReferenceImageRequest")
+	proto.RegisterType((*DeleteReferenceImageRequest)(nil), "google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest")
+	proto.RegisterType((*AddProductToProductSetRequest)(nil), "google.cloud.vision.v1p3beta1.AddProductToProductSetRequest")
+	proto.RegisterType((*RemoveProductFromProductSetRequest)(nil), "google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest")
+	proto.RegisterType((*ListProductsInProductSetRequest)(nil), "google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest")
+	proto.RegisterType((*ListProductsInProductSetResponse)(nil), "google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse")
+	proto.RegisterType((*ImportProductSetsGcsSource)(nil), "google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource")
+	proto.RegisterType((*ImportProductSetsInputConfig)(nil), "google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig")
+	proto.RegisterType((*ImportProductSetsRequest)(nil), "google.cloud.vision.v1p3beta1.ImportProductSetsRequest")
+	proto.RegisterType((*ImportProductSetsResponse)(nil), "google.cloud.vision.v1p3beta1.ImportProductSetsResponse")
+	proto.RegisterType((*BatchOperationMetadata)(nil), "google.cloud.vision.v1p3beta1.BatchOperationMetadata")
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.BatchOperationMetadata_State", BatchOperationMetadata_State_name, BatchOperationMetadata_State_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ProductSearchClient is the client API for ProductSearch service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ProductSearchClient interface {
+	// Creates and returns a new ProductSet resource.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if display_name is missing, or is longer than
+	//   4096 characters.
+	CreateProductSet(ctx context.Context, in *CreateProductSetRequest, opts ...grpc.CallOption) (*ProductSet, error)
+	// Lists ProductSets in an unspecified order.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if page_size is greater than 100, or less
+	//   than 1.
+	ListProductSets(ctx context.Context, in *ListProductSetsRequest, opts ...grpc.CallOption) (*ListProductSetsResponse, error)
+	// Gets information associated with a ProductSet.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the ProductSet does not exist.
+	GetProductSet(ctx context.Context, in *GetProductSetRequest, opts ...grpc.CallOption) (*ProductSet, error)
+	// Makes changes to a ProductSet resource.
+	// Only display_name can be updated currently.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the ProductSet does not exist.
+	// * Returns INVALID_ARGUMENT if display_name is present in update_mask but
+	//   missing from the request or longer than 4096 characters.
+	UpdateProductSet(ctx context.Context, in *UpdateProductSetRequest, opts ...grpc.CallOption) (*ProductSet, error)
+	// Permanently deletes a ProductSet. All Products and ReferenceImages in the
+	// ProductSet will be deleted.
+	//
+	// The actual image files are not deleted from Google Cloud Storage.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the ProductSet does not exist.
+	DeleteProductSet(ctx context.Context, in *DeleteProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates and returns a new product resource.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if display_name is missing or longer than 4096
+	//   characters.
+	// * Returns INVALID_ARGUMENT if description is longer than 4096 characters.
+	// * Returns INVALID_ARGUMENT if product_category is missing or invalid.
+	CreateProduct(ctx context.Context, in *CreateProductRequest, opts ...grpc.CallOption) (*Product, error)
+	// Lists products in an unspecified order.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if page_size is greater than 100 or less than 1.
+	ListProducts(ctx context.Context, in *ListProductsRequest, opts ...grpc.CallOption) (*ListProductsResponse, error)
+	// Gets information associated with a Product.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the Product does not exist.
+	GetProduct(ctx context.Context, in *GetProductRequest, opts ...grpc.CallOption) (*Product, error)
+	// Makes changes to a Product resource.
+	// Only display_name, description and labels can be updated right now.
+	//
+	// If labels are updated, the change will not be reflected in queries until
+	// the next index time.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the Product does not exist.
+	// * Returns INVALID_ARGUMENT if display_name is present in update_mask but is
+	//   missing from the request or longer than 4096 characters.
+	// * Returns INVALID_ARGUMENT if description is present in update_mask but is
+	//   longer than 4096 characters.
+	// * Returns INVALID_ARGUMENT if product_category is present in update_mask.
+	UpdateProduct(ctx context.Context, in *UpdateProductRequest, opts ...grpc.CallOption) (*Product, error)
+	// Permanently deletes a product and its reference images.
+	//
+	// Metadata of the product and all its images will be deleted right away, but
+	// search queries against ProductSets containing the product may still work
+	// until all related caches are refreshed.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the product does not exist.
+	DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates and returns a new ReferenceImage resource.
+	//
+	// The `bounding_poly` field is optional. If `bounding_poly` is not specified,
+	// the system will try to detect regions of interest in the image that are
+	// compatible with the product_category on the parent product. If it is
+	// specified, detection is ALWAYS skipped. The system converts polygons into
+	// non-rotated rectangles.
+	//
+	// Note that the pipeline will resize the image if the image resolution is too
+	// large to process (above 50MP).
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if the image_uri is missing or longer than 4096
+	//   characters.
+	// * Returns INVALID_ARGUMENT if the product does not exist.
+	// * Returns INVALID_ARGUMENT if bounding_poly is not provided, and nothing
+	//   compatible with the parent product's product_category is detected.
+	// * Returns INVALID_ARGUMENT if bounding_poly contains more than 10 polygons.
+	CreateReferenceImage(ctx context.Context, in *CreateReferenceImageRequest, opts ...grpc.CallOption) (*ReferenceImage, error)
+	// Permanently deletes a reference image.
+	//
+	// The image metadata will be deleted right away, but search queries
+	// against ProductSets containing the image may still work until all related
+	// caches are refreshed.
+	//
+	// The actual image files are not deleted from Google Cloud Storage.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the reference image does not exist.
+	DeleteReferenceImage(ctx context.Context, in *DeleteReferenceImageRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Lists reference images.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the parent product does not exist.
+	// * Returns INVALID_ARGUMENT if the page_size is greater than 100, or less
+	//   than 1.
+	ListReferenceImages(ctx context.Context, in *ListReferenceImagesRequest, opts ...grpc.CallOption) (*ListReferenceImagesResponse, error)
+	// Gets information associated with a ReferenceImage.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the specified image does not exist.
+	GetReferenceImage(ctx context.Context, in *GetReferenceImageRequest, opts ...grpc.CallOption) (*ReferenceImage, error)
+	// Adds a Product to the specified ProductSet. If the Product is already
+	// present, no change is made.
+	//
+	// One Product can be added to at most 100 ProductSets.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the Product or the ProductSet doesn't exist.
+	AddProductToProductSet(ctx context.Context, in *AddProductToProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Removes a Product from the specified ProductSet.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND If the Product is not found under the ProductSet.
+	RemoveProductFromProductSet(ctx context.Context, in *RemoveProductFromProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Lists the Products in a ProductSet, in an unspecified order. If the
+	// ProductSet does not exist, the products field of the response will be
+	// empty.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if page_size is greater than 100 or less than 1.
+	ListProductsInProductSet(ctx context.Context, in *ListProductsInProductSetRequest, opts ...grpc.CallOption) (*ListProductsInProductSetResponse, error)
+	// Asynchronous API that imports a list of reference images to specified
+	// product sets based on a list of image information.
+	//
+	// The [google.longrunning.Operation][google.longrunning.Operation] API can be used to keep track of the
+	// progress and results of the request.
+	// `Operation.metadata` contains `BatchOperationMetadata`. (progress)
+	// `Operation.response` contains `ImportProductSetsResponse`. (results)
+	//
+	// The input source of this method is a csv file on Google Cloud Storage.
+	// For the format of the csv file please see
+	// [ImportProductSetsGcsSource.csv_file_uri][google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource.csv_file_uri].
+	ImportProductSets(ctx context.Context, in *ImportProductSetsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type productSearchClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewProductSearchClient(cc *grpc.ClientConn) ProductSearchClient {
+	return &productSearchClient{cc}
+}
+
+func (c *productSearchClient) CreateProductSet(ctx context.Context, in *CreateProductSetRequest, opts ...grpc.CallOption) (*ProductSet, error) {
+	out := new(ProductSet)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/CreateProductSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) ListProductSets(ctx context.Context, in *ListProductSetsRequest, opts ...grpc.CallOption) (*ListProductSetsResponse, error) {
+	out := new(ListProductSetsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/ListProductSets", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) GetProductSet(ctx context.Context, in *GetProductSetRequest, opts ...grpc.CallOption) (*ProductSet, error) {
+	out := new(ProductSet)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/GetProductSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) UpdateProductSet(ctx context.Context, in *UpdateProductSetRequest, opts ...grpc.CallOption) (*ProductSet, error) {
+	out := new(ProductSet)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/UpdateProductSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) DeleteProductSet(ctx context.Context, in *DeleteProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/DeleteProductSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) CreateProduct(ctx context.Context, in *CreateProductRequest, opts ...grpc.CallOption) (*Product, error) {
+	out := new(Product)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/CreateProduct", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) ListProducts(ctx context.Context, in *ListProductsRequest, opts ...grpc.CallOption) (*ListProductsResponse, error) {
+	out := new(ListProductsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/ListProducts", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) GetProduct(ctx context.Context, in *GetProductRequest, opts ...grpc.CallOption) (*Product, error) {
+	out := new(Product)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/GetProduct", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) UpdateProduct(ctx context.Context, in *UpdateProductRequest, opts ...grpc.CallOption) (*Product, error) {
+	out := new(Product)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/UpdateProduct", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/DeleteProduct", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) CreateReferenceImage(ctx context.Context, in *CreateReferenceImageRequest, opts ...grpc.CallOption) (*ReferenceImage, error) {
+	out := new(ReferenceImage)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/CreateReferenceImage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) DeleteReferenceImage(ctx context.Context, in *DeleteReferenceImageRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/DeleteReferenceImage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) ListReferenceImages(ctx context.Context, in *ListReferenceImagesRequest, opts ...grpc.CallOption) (*ListReferenceImagesResponse, error) {
+	out := new(ListReferenceImagesResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/ListReferenceImages", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) GetReferenceImage(ctx context.Context, in *GetReferenceImageRequest, opts ...grpc.CallOption) (*ReferenceImage, error) {
+	out := new(ReferenceImage)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/GetReferenceImage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) AddProductToProductSet(ctx context.Context, in *AddProductToProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/AddProductToProductSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) RemoveProductFromProductSet(ctx context.Context, in *RemoveProductFromProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/RemoveProductFromProductSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) ListProductsInProductSet(ctx context.Context, in *ListProductsInProductSetRequest, opts ...grpc.CallOption) (*ListProductsInProductSetResponse, error) {
+	out := new(ListProductsInProductSetResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/ListProductsInProductSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *productSearchClient) ImportProductSets(ctx context.Context, in *ImportProductSetsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1p3beta1.ProductSearch/ImportProductSets", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ProductSearchServer is the server API for ProductSearch service.
+type ProductSearchServer interface {
+	// Creates and returns a new ProductSet resource.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if display_name is missing, or is longer than
+	//   4096 characters.
+	CreateProductSet(context.Context, *CreateProductSetRequest) (*ProductSet, error)
+	// Lists ProductSets in an unspecified order.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if page_size is greater than 100, or less
+	//   than 1.
+	ListProductSets(context.Context, *ListProductSetsRequest) (*ListProductSetsResponse, error)
+	// Gets information associated with a ProductSet.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the ProductSet does not exist.
+	GetProductSet(context.Context, *GetProductSetRequest) (*ProductSet, error)
+	// Makes changes to a ProductSet resource.
+	// Only display_name can be updated currently.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the ProductSet does not exist.
+	// * Returns INVALID_ARGUMENT if display_name is present in update_mask but
+	//   missing from the request or longer than 4096 characters.
+	UpdateProductSet(context.Context, *UpdateProductSetRequest) (*ProductSet, error)
+	// Permanently deletes a ProductSet. All Products and ReferenceImages in the
+	// ProductSet will be deleted.
+	//
+	// The actual image files are not deleted from Google Cloud Storage.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the ProductSet does not exist.
+	DeleteProductSet(context.Context, *DeleteProductSetRequest) (*empty.Empty, error)
+	// Creates and returns a new product resource.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if display_name is missing or longer than 4096
+	//   characters.
+	// * Returns INVALID_ARGUMENT if description is longer than 4096 characters.
+	// * Returns INVALID_ARGUMENT if product_category is missing or invalid.
+	CreateProduct(context.Context, *CreateProductRequest) (*Product, error)
+	// Lists products in an unspecified order.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if page_size is greater than 100 or less than 1.
+	ListProducts(context.Context, *ListProductsRequest) (*ListProductsResponse, error)
+	// Gets information associated with a Product.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the Product does not exist.
+	GetProduct(context.Context, *GetProductRequest) (*Product, error)
+	// Makes changes to a Product resource.
+	// Only display_name, description and labels can be updated right now.
+	//
+	// If labels are updated, the change will not be reflected in queries until
+	// the next index time.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the Product does not exist.
+	// * Returns INVALID_ARGUMENT if display_name is present in update_mask but is
+	//   missing from the request or longer than 4096 characters.
+	// * Returns INVALID_ARGUMENT if description is present in update_mask but is
+	//   longer than 4096 characters.
+	// * Returns INVALID_ARGUMENT if product_category is present in update_mask.
+	UpdateProduct(context.Context, *UpdateProductRequest) (*Product, error)
+	// Permanently deletes a product and its reference images.
+	//
+	// Metadata of the product and all its images will be deleted right away, but
+	// search queries against ProductSets containing the product may still work
+	// until all related caches are refreshed.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the product does not exist.
+	DeleteProduct(context.Context, *DeleteProductRequest) (*empty.Empty, error)
+	// Creates and returns a new ReferenceImage resource.
+	//
+	// The `bounding_poly` field is optional. If `bounding_poly` is not specified,
+	// the system will try to detect regions of interest in the image that are
+	// compatible with the product_category on the parent product. If it is
+	// specified, detection is ALWAYS skipped. The system converts polygons into
+	// non-rotated rectangles.
+	//
+	// Note that the pipeline will resize the image if the image resolution is too
+	// large to process (above 50MP).
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if the image_uri is missing or longer than 4096
+	//   characters.
+	// * Returns INVALID_ARGUMENT if the product does not exist.
+	// * Returns INVALID_ARGUMENT if bounding_poly is not provided, and nothing
+	//   compatible with the parent product's product_category is detected.
+	// * Returns INVALID_ARGUMENT if bounding_poly contains more than 10 polygons.
+	CreateReferenceImage(context.Context, *CreateReferenceImageRequest) (*ReferenceImage, error)
+	// Permanently deletes a reference image.
+	//
+	// The image metadata will be deleted right away, but search queries
+	// against ProductSets containing the image may still work until all related
+	// caches are refreshed.
+	//
+	// The actual image files are not deleted from Google Cloud Storage.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the reference image does not exist.
+	DeleteReferenceImage(context.Context, *DeleteReferenceImageRequest) (*empty.Empty, error)
+	// Lists reference images.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the parent product does not exist.
+	// * Returns INVALID_ARGUMENT if the page_size is greater than 100, or less
+	//   than 1.
+	ListReferenceImages(context.Context, *ListReferenceImagesRequest) (*ListReferenceImagesResponse, error)
+	// Gets information associated with a ReferenceImage.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the specified image does not exist.
+	GetReferenceImage(context.Context, *GetReferenceImageRequest) (*ReferenceImage, error)
+	// Adds a Product to the specified ProductSet. If the Product is already
+	// present, no change is made.
+	//
+	// One Product can be added to at most 100 ProductSets.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND if the Product or the ProductSet doesn't exist.
+	AddProductToProductSet(context.Context, *AddProductToProductSetRequest) (*empty.Empty, error)
+	// Removes a Product from the specified ProductSet.
+	//
+	// Possible errors:
+	//
+	// * Returns NOT_FOUND If the Product is not found under the ProductSet.
+	RemoveProductFromProductSet(context.Context, *RemoveProductFromProductSetRequest) (*empty.Empty, error)
+	// Lists the Products in a ProductSet, in an unspecified order. If the
+	// ProductSet does not exist, the products field of the response will be
+	// empty.
+	//
+	// Possible errors:
+	//
+	// * Returns INVALID_ARGUMENT if page_size is greater than 100 or less than 1.
+	ListProductsInProductSet(context.Context, *ListProductsInProductSetRequest) (*ListProductsInProductSetResponse, error)
+	// Asynchronous API that imports a list of reference images to specified
+	// product sets based on a list of image information.
+	//
+	// The [google.longrunning.Operation][google.longrunning.Operation] API can be used to keep track of the
+	// progress and results of the request.
+	// `Operation.metadata` contains `BatchOperationMetadata`. (progress)
+	// `Operation.response` contains `ImportProductSetsResponse`. (results)
+	//
+	// The input source of this method is a csv file on Google Cloud Storage.
+	// For the format of the csv file please see
+	// [ImportProductSetsGcsSource.csv_file_uri][google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource.csv_file_uri].
+	ImportProductSets(context.Context, *ImportProductSetsRequest) (*longrunning.Operation, error)
+}
+
+func RegisterProductSearchServer(s *grpc.Server, srv ProductSearchServer) {
+	s.RegisterService(&_ProductSearch_serviceDesc, srv)
+}
+
+func _ProductSearch_CreateProductSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateProductSetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).CreateProductSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/CreateProductSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).CreateProductSet(ctx, req.(*CreateProductSetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_ListProductSets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListProductSetsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).ListProductSets(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/ListProductSets",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).ListProductSets(ctx, req.(*ListProductSetsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_GetProductSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetProductSetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).GetProductSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/GetProductSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).GetProductSet(ctx, req.(*GetProductSetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_UpdateProductSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateProductSetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).UpdateProductSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/UpdateProductSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).UpdateProductSet(ctx, req.(*UpdateProductSetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_DeleteProductSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteProductSetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).DeleteProductSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/DeleteProductSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).DeleteProductSet(ctx, req.(*DeleteProductSetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_CreateProduct_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateProductRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).CreateProduct(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/CreateProduct",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).CreateProduct(ctx, req.(*CreateProductRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_ListProducts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListProductsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).ListProducts(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/ListProducts",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).ListProducts(ctx, req.(*ListProductsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_GetProduct_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetProductRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).GetProduct(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/GetProduct",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).GetProduct(ctx, req.(*GetProductRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_UpdateProduct_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateProductRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).UpdateProduct(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/UpdateProduct",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).UpdateProduct(ctx, req.(*UpdateProductRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_DeleteProduct_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteProductRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).DeleteProduct(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/DeleteProduct",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).DeleteProduct(ctx, req.(*DeleteProductRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_CreateReferenceImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateReferenceImageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).CreateReferenceImage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/CreateReferenceImage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).CreateReferenceImage(ctx, req.(*CreateReferenceImageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_DeleteReferenceImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteReferenceImageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).DeleteReferenceImage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/DeleteReferenceImage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).DeleteReferenceImage(ctx, req.(*DeleteReferenceImageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_ListReferenceImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListReferenceImagesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).ListReferenceImages(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/ListReferenceImages",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).ListReferenceImages(ctx, req.(*ListReferenceImagesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_GetReferenceImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetReferenceImageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).GetReferenceImage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/GetReferenceImage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).GetReferenceImage(ctx, req.(*GetReferenceImageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_AddProductToProductSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AddProductToProductSetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).AddProductToProductSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/AddProductToProductSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).AddProductToProductSet(ctx, req.(*AddProductToProductSetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_RemoveProductFromProductSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RemoveProductFromProductSetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).RemoveProductFromProductSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/RemoveProductFromProductSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).RemoveProductFromProductSet(ctx, req.(*RemoveProductFromProductSetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_ListProductsInProductSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListProductsInProductSetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).ListProductsInProductSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/ListProductsInProductSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).ListProductsInProductSet(ctx, req.(*ListProductsInProductSetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ProductSearch_ImportProductSets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ImportProductSetsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProductSearchServer).ImportProductSets(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.vision.v1p3beta1.ProductSearch/ImportProductSets",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProductSearchServer).ImportProductSets(ctx, req.(*ImportProductSetsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ProductSearch_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.vision.v1p3beta1.ProductSearch",
+	HandlerType: (*ProductSearchServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "CreateProductSet",
+			Handler:    _ProductSearch_CreateProductSet_Handler,
+		},
+		{
+			MethodName: "ListProductSets",
+			Handler:    _ProductSearch_ListProductSets_Handler,
+		},
+		{
+			MethodName: "GetProductSet",
+			Handler:    _ProductSearch_GetProductSet_Handler,
+		},
+		{
+			MethodName: "UpdateProductSet",
+			Handler:    _ProductSearch_UpdateProductSet_Handler,
+		},
+		{
+			MethodName: "DeleteProductSet",
+			Handler:    _ProductSearch_DeleteProductSet_Handler,
+		},
+		{
+			MethodName: "CreateProduct",
+			Handler:    _ProductSearch_CreateProduct_Handler,
+		},
+		{
+			MethodName: "ListProducts",
+			Handler:    _ProductSearch_ListProducts_Handler,
+		},
+		{
+			MethodName: "GetProduct",
+			Handler:    _ProductSearch_GetProduct_Handler,
+		},
+		{
+			MethodName: "UpdateProduct",
+			Handler:    _ProductSearch_UpdateProduct_Handler,
+		},
+		{
+			MethodName: "DeleteProduct",
+			Handler:    _ProductSearch_DeleteProduct_Handler,
+		},
+		{
+			MethodName: "CreateReferenceImage",
+			Handler:    _ProductSearch_CreateReferenceImage_Handler,
+		},
+		{
+			MethodName: "DeleteReferenceImage",
+			Handler:    _ProductSearch_DeleteReferenceImage_Handler,
+		},
+		{
+			MethodName: "ListReferenceImages",
+			Handler:    _ProductSearch_ListReferenceImages_Handler,
+		},
+		{
+			MethodName: "GetReferenceImage",
+			Handler:    _ProductSearch_GetReferenceImage_Handler,
+		},
+		{
+			MethodName: "AddProductToProductSet",
+			Handler:    _ProductSearch_AddProductToProductSet_Handler,
+		},
+		{
+			MethodName: "RemoveProductFromProductSet",
+			Handler:    _ProductSearch_RemoveProductFromProductSet_Handler,
+		},
+		{
+			MethodName: "ListProductsInProductSet",
+			Handler:    _ProductSearch_ListProductsInProductSet_Handler,
+		},
+		{
+			MethodName: "ImportProductSets",
+			Handler:    _ProductSearch_ImportProductSets_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/vision/v1p3beta1/product_search_service.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/product_search_service.proto", fileDescriptor_product_search_service_9317116d58505bed)
+}
+
+var fileDescriptor_product_search_service_9317116d58505bed = []byte{
+	// 1867 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcf, 0x6f, 0xe3, 0xc6,
+	0x15, 0xce, 0xd8, 0xeb, 0x5d, 0xfb, 0xc9, 0xb2, 0xb5, 0x53, 0xd7, 0x56, 0xe4, 0x2c, 0xe2, 0xb0,
+	0x45, 0x9a, 0xa8, 0x89, 0xd8, 0x95, 0xb1, 0xdb, 0xae, 0xdc, 0x6c, 0x6a, 0xcb, 0xb2, 0xa3, 0xc6,
+	0xbb, 0xeb, 0x50, 0xf6, 0x36, 0xcd, 0x21, 0x02, 0x4d, 0x8e, 0x19, 0x76, 0x29, 0x92, 0xe1, 0x50,
+	0x46, 0x94, 0x22, 0x97, 0xa0, 0x87, 0xa2, 0x87, 0x06, 0x68, 0xd1, 0x43, 0x4e, 0x05, 0x12, 0xf4,
+	0x5c, 0xa0, 0x3f, 0x0e, 0x4d, 0x73, 0x28, 0x7a, 0x6b, 0x0f, 0xbd, 0xf4, 0xd8, 0x53, 0x81, 0xfc,
+	0x11, 0x3d, 0x16, 0x33, 0x1c, 0x4a, 0x24, 0x45, 0x99, 0x94, 0x36, 0x8b, 0xdc, 0x34, 0xc3, 0xf7,
+	0xde, 0x7c, 0xef, 0xbd, 0x6f, 0x66, 0xde, 0x1b, 0x41, 0xc3, 0x70, 0x1c, 0xc3, 0x22, 0xb2, 0x66,
+	0x39, 0x7d, 0x5d, 0xbe, 0x30, 0xa9, 0xe9, 0xd8, 0xf2, 0xc5, 0x4d, 0x77, 0xfb, 0x8c, 0xf8, 0xea,
+	0x4d, 0xd9, 0xf5, 0x1c, 0xbd, 0xaf, 0xf9, 0x5d, 0x4a, 0x54, 0x4f, 0x7b, 0xa7, 0x4b, 0x89, 0x77,
+	0x61, 0x6a, 0xa4, 0xe6, 0x7a, 0x8e, 0xef, 0xe0, 0x1b, 0x81, 0x6e, 0x8d, 0xeb, 0xd6, 0x02, 0xdd,
+	0xda, 0x50, 0xb7, 0xf2, 0x8c, 0x30, 0xad, 0xba, 0xa6, 0xac, 0xda, 0xb6, 0xe3, 0xab, 0xbe, 0xe9,
+	0xd8, 0x34, 0x50, 0xae, 0xbc, 0x74, 0xf9, 0xc2, 0x06, 0x71, 0x7a, 0xc4, 0xf7, 0x06, 0x42, 0xfa,
+	0x1b, 0x42, 0xda, 0x72, 0x6c, 0xc3, 0xeb, 0xdb, 0xb6, 0x69, 0x1b, 0xb2, 0xe3, 0x12, 0x2f, 0x66,
+	0x72, 0x53, 0x08, 0xf1, 0xd1, 0x59, 0xff, 0x5c, 0x26, 0x3d, 0xd7, 0x0f, 0x2d, 0x6c, 0x25, 0x3f,
+	0x9e, 0x9b, 0xc4, 0xd2, 0xbb, 0x3d, 0x95, 0x3e, 0x12, 0x12, 0xcf, 0x26, 0x25, 0x7c, 0xb3, 0x47,
+	0xa8, 0xaf, 0xf6, 0x5c, 0x21, 0xb0, 0x21, 0x04, 0x3c, 0x57, 0x93, 0xa9, 0xaf, 0xfa, 0x7d, 0xb1,
+	0xb0, 0xf4, 0xf1, 0x1c, 0x5c, 0x3b, 0x0e, 0x22, 0x85, 0x31, 0x5c, 0xb1, 0xd5, 0x1e, 0x29, 0xa3,
+	0x2d, 0xf4, 0xc2, 0x92, 0xc2, 0x7f, 0xe3, 0xe7, 0x60, 0x59, 0x37, 0xa9, 0x6b, 0xa9, 0x83, 0x2e,
+	0xff, 0x36, 0xc7, 0xbf, 0x15, 0xc4, 0xdc, 0x7d, 0x26, 0xb2, 0x05, 0x05, 0x9d, 0x50, 0xcd, 0x33,
+	0x5d, 0xe6, 0x51, 0x79, 0x5e, 0x48, 0x8c, 0xa6, 0xf0, 0x8b, 0x50, 0x0a, 0xb3, 0xa1, 0xa9, 0x3e,
+	0x31, 0x1c, 0x6f, 0x50, 0xbe, 0xc2, 0xc5, 0x56, 0xc5, 0x7c, 0x53, 0x4c, 0xe3, 0x87, 0xb0, 0x12,
+	0x8a, 0x5a, 0xea, 0x19, 0xb1, 0x68, 0x79, 0x61, 0x6b, 0xfe, 0x85, 0x42, 0x5d, 0xae, 0x5d, 0x9a,
+	0xb1, 0x9a, 0xf0, 0xa1, 0xf6, 0x3a, 0x19, 0x3c, 0x54, 0xad, 0x3e, 0x51, 0x8a, 0xc2, 0xcc, 0x11,
+	0xb7, 0x52, 0xa9, 0xc3, 0x62, 0xf8, 0x09, 0x97, 0x60, 0xfe, 0x11, 0x19, 0x08, 0x37, 0xd9, 0x4f,
+	0xbc, 0x06, 0x0b, 0x17, 0xec, 0x93, 0x70, 0x2f, 0x18, 0x48, 0x7f, 0x44, 0x00, 0xc2, 0x6e, 0x87,
+	0xcc, 0x1c, 0x9e, 0x3b, 0x00, 0xa6, 0xad, 0x93, 0xf7, 0xba, 0x2c, 0x27, 0x3c, 0x3a, 0x85, 0x7a,
+	0x25, 0xf4, 0x26, 0x4c, 0x58, 0xed, 0x24, 0x4c, 0x98, 0xb2, 0xc4, 0xa5, 0xd9, 0x18, 0x6f, 0x43,
+	0x21, 0x50, 0x25, 0x9e, 0xe7, 0x78, 0x3c, 0x64, 0x85, 0x3a, 0x0e, 0x75, 0x3d, 0x57, 0xab, 0x75,
+	0x78, 0x2e, 0x95, 0x60, 0x85, 0x16, 0x93, 0x92, 0x7e, 0x81, 0x60, 0x45, 0x21, 0xe7, 0xc4, 0x23,
+	0xb6, 0x46, 0xda, 0x3d, 0xd5, 0x20, 0xa9, 0xc8, 0x4b, 0x30, 0xdf, 0xf7, 0x4c, 0x01, 0x98, 0xfd,
+	0xc4, 0x0a, 0xac, 0x9c, 0x39, 0x7d, 0x5b, 0x37, 0x6d, 0xa3, 0xeb, 0x3a, 0xd6, 0x80, 0x96, 0xe7,
+	0x79, 0xe8, 0xbf, 0x9d, 0x11, 0xfa, 0x3d, 0xa1, 0x74, 0xec, 0x58, 0x03, 0xa5, 0x78, 0x16, 0x19,
+	0x51, 0xe9, 0x23, 0x04, 0x6b, 0x4d, 0x8f, 0xa8, 0x3e, 0x11, 0x81, 0x54, 0xc8, 0xbb, 0x7d, 0x42,
+	0x7d, 0xbc, 0x0e, 0x57, 0x5d, 0xd5, 0x23, 0xb6, 0x2f, 0x40, 0x89, 0x11, 0xfe, 0x01, 0x5c, 0x13,
+	0x89, 0xe3, 0xd0, 0x0a, 0xf5, 0xe7, 0xf3, 0x25, 0x5e, 0x09, 0xd5, 0xf0, 0x0d, 0x80, 0x90, 0x41,
+	0xa6, 0x2e, 0xd8, 0xb8, 0x24, 0x66, 0xda, 0xba, 0x64, 0xc2, 0xd7, 0x8e, 0x4c, 0xea, 0x0b, 0x35,
+	0x9a, 0x85, 0x67, 0x13, 0x96, 0x5c, 0xd5, 0x20, 0x5d, 0x6a, 0xbe, 0x1f, 0x64, 0x77, 0x41, 0x59,
+	0x64, 0x13, 0x1d, 0xf3, 0x7d, 0xc2, 0x97, 0x62, 0x1f, 0x7d, 0xe7, 0x11, 0xb1, 0x87, 0x4b, 0xa9,
+	0x06, 0x39, 0x61, 0x13, 0xd2, 0x87, 0x08, 0xd6, 0xe2, 0x6b, 0x51, 0xd7, 0xb1, 0x29, 0xc1, 0x7b,
+	0xb0, 0x28, 0x00, 0xd1, 0x32, 0xe2, 0x31, 0xce, 0xeb, 0xe5, 0x50, 0x0f, 0x3f, 0x0f, 0xab, 0x36,
+	0x79, 0xcf, 0xef, 0x46, 0x00, 0x04, 0xb9, 0x2c, 0xb2, 0xe9, 0xe3, 0x21, 0x88, 0x6f, 0xc1, 0xf5,
+	0x43, 0xe2, 0x27, 0xa2, 0x9f, 0x42, 0x08, 0xe9, 0x37, 0x08, 0xd6, 0x4e, 0x5d, 0x7d, 0x3c, 0x55,
+	0x91, 0x94, 0xa0, 0xd9, 0x52, 0xb2, 0x03, 0x85, 0x3e, 0xb7, 0xcc, 0xcf, 0x2c, 0x91, 0xd8, 0xf1,
+	0x3d, 0x70, 0xc0, 0x8e, 0xb5, 0x7b, 0x2a, 0x7d, 0xa4, 0x40, 0x20, 0xce, 0x7e, 0x4b, 0x55, 0x58,
+	0xdb, 0x27, 0x16, 0x19, 0x83, 0x95, 0xe6, 0xc3, 0xa7, 0x08, 0x36, 0x62, 0x74, 0xeb, 0x90, 0x4c,
+	0xc6, 0xfd, 0x10, 0x0a, 0xa3, 0xab, 0x22, 0x64, 0xdd, 0x8b, 0xf9, 0x5c, 0x64, 0xe6, 0x43, 0xb6,
+	0xb1, 0x23, 0xe2, 0x9b, 0xa3, 0xd3, 0x8b, 0x92, 0x08, 0xff, 0x96, 0x47, 0x32, 0x6d, 0x5d, 0xb2,
+	0x60, 0x3d, 0x42, 0x8b, 0x0e, 0x79, 0xb2, 0x2c, 0xfc, 0x08, 0xc1, 0xc6, 0xd8, 0x72, 0x82, 0x88,
+	0x47, 0xb0, 0x1c, 0xc1, 0x1b, 0x92, 0x71, 0x0a, 0xe7, 0x0b, 0x23, 0xc7, 0xf2, 0x53, 0xb2, 0x0a,
+	0x6b, 0x23, 0x4a, 0x46, 0x32, 0x94, 0x96, 0xd1, 0x4f, 0x10, 0x6c, 0xc4, 0x58, 0x19, 0x91, 0x4f,
+	0x64, 0x0e, 0x3d, 0x4e, 0xe6, 0x1e, 0x8b, 0xa2, 0x2f, 0xc3, 0x46, 0x8c, 0xa2, 0x19, 0x3e, 0xfd,
+	0x15, 0xc1, 0x66, 0xc0, 0xd2, 0xf8, 0x39, 0x9d, 0xc5, 0x82, 0x87, 0xb0, 0xea, 0x85, 0x0a, 0x5d,
+	0x93, 0x69, 0x08, 0x9c, 0x2f, 0x67, 0xf8, 0x9c, 0x58, 0x66, 0xc5, 0x8b, 0x5f, 0x0f, 0x2f, 0x01,
+	0x4e, 0xd8, 0x1d, 0x31, 0xb7, 0x14, 0x97, 0x6d, 0xeb, 0x92, 0x0b, 0x15, 0x46, 0xa7, 0xb8, 0xcd,
+	0x27, 0xca, 0xe0, 0xcf, 0x11, 0x6c, 0xa6, 0x2e, 0x29, 0x58, 0xfc, 0x26, 0x94, 0x12, 0xf8, 0x43,
+	0x26, 0x4f, 0x19, 0x98, 0xd5, 0xb8, 0xb3, 0xf4, 0x72, 0xd4, 0x29, 0x74, 0x9f, 0x4f, 0xa3, 0x7b,
+	0x0d, 0xca, 0x87, 0xc4, 0x4f, 0x4f, 0x75, 0x1a, 0x3d, 0x6e, 0xc2, 0x66, 0xc0, 0xa6, 0xfc, 0x2a,
+	0xf7, 0xe0, 0xc6, 0xae, 0xae, 0x0b, 0xf6, 0x9d, 0x38, 0xb9, 0x68, 0x88, 0xcb, 0xf1, 0xab, 0x76,
+	0x69, 0x78, 0x5e, 0x4b, 0x0a, 0x48, 0x0a, 0xe9, 0x39, 0x17, 0x21, 0x9f, 0x0f, 0x3c, 0xa7, 0xf7,
+	0xb8, 0x36, 0xdf, 0x85, 0x67, 0xa3, 0x77, 0x61, 0xdb, 0xce, 0x67, 0xf0, 0x71, 0x78, 0xf3, 0x4b,
+	0x04, 0x5b, 0x93, 0xd7, 0xfc, 0x0a, 0xee, 0xe2, 0xbb, 0x50, 0x69, 0xf7, 0x5c, 0xc7, 0x8b, 0x9e,
+	0xc5, 0x87, 0x1a, 0xed, 0x38, 0x7d, 0x4f, 0x63, 0x75, 0xf4, 0xb2, 0x46, 0x2f, 0xba, 0xe7, 0xa6,
+	0x45, 0xba, 0xac, 0x34, 0x0b, 0xc2, 0x00, 0x1a, 0xbd, 0x38, 0x30, 0x2d, 0x72, 0xea, 0x99, 0xd2,
+	0xcf, 0x10, 0x3c, 0x33, 0x66, 0xa0, 0x6d, 0xbb, 0x7d, 0xbf, 0xe9, 0xd8, 0xe7, 0xa6, 0x81, 0xdf,
+	0x02, 0x30, 0x34, 0xda, 0xa5, 0xdc, 0xa0, 0x38, 0x10, 0xef, 0x64, 0xb8, 0x33, 0x19, 0xd1, 0x6b,
+	0x4f, 0x29, 0x4b, 0x46, 0x38, 0xd8, 0x5b, 0x84, 0xab, 0x81, 0x5d, 0xe9, 0x57, 0x08, 0xca, 0x63,
+	0x5a, 0x59, 0x07, 0xc0, 0xdb, 0xb0, 0x6c, 0x32, 0xa4, 0x5d, 0x8d, 0x43, 0x15, 0x27, 0xd7, 0xce,
+	0xb4, 0xe0, 0x22, 0xde, 0x2a, 0x05, 0x73, 0x34, 0x90, 0x7e, 0x87, 0xe0, 0xe9, 0x14, 0x50, 0x4f,
+	0xfc, 0x88, 0xa8, 0xc1, 0x62, 0xd0, 0x50, 0x11, 0x5a, 0x9e, 0xe3, 0x16, 0xd3, 0x0a, 0xf4, 0xa1,
+	0x8c, 0xf4, 0xd9, 0x1c, 0xac, 0xef, 0xa9, 0xbe, 0xf6, 0xce, 0x83, 0xb0, 0x07, 0xbc, 0x47, 0x7c,
+	0x55, 0x57, 0x7d, 0x15, 0xbf, 0x01, 0x0b, 0x4c, 0x2c, 0x48, 0xdc, 0x4a, 0x66, 0x6c, 0xd2, 0xad,
+	0xf0, 0x15, 0x89, 0x12, 0x58, 0x62, 0xd7, 0x1a, 0xed, 0x9f, 0xf5, 0x4c, 0x3f, 0xe8, 0x3e, 0xe6,
+	0x32, 0xbb, 0x0f, 0x08, 0xc4, 0x79, 0xfb, 0x71, 0x0b, 0x16, 0x89, 0xad, 0xe7, 0xed, 0x5b, 0xae,
+	0x11, 0x5b, 0x67, 0x23, 0xe9, 0xc7, 0xb0, 0xc0, 0x31, 0xe0, 0xaf, 0xc3, 0xf5, 0xce, 0xc9, 0xee,
+	0x49, 0xab, 0x7b, 0x7a, 0xbf, 0x73, 0xdc, 0x6a, 0xb6, 0x0f, 0xda, 0xad, 0xfd, 0xd2, 0x53, 0x78,
+	0x05, 0xe0, 0x58, 0x79, 0xd0, 0x6c, 0x75, 0x3a, 0xed, 0xfb, 0x87, 0x25, 0xc4, 0xc6, 0x9d, 0xd3,
+	0x26, 0x1b, 0x1f, 0x9c, 0x1e, 0x95, 0xe6, 0x30, 0xc0, 0xd5, 0x83, 0xdd, 0xf6, 0x51, 0x6b, 0xbf,
+	0x34, 0x8f, 0x8b, 0xb0, 0xd4, 0xdc, 0xbd, 0xdf, 0x6c, 0x1d, 0xb1, 0xe1, 0x95, 0xfa, 0x6f, 0x37,
+	0xa1, 0x38, 0x4c, 0x2f, 0x6b, 0xeb, 0xf1, 0xdf, 0x11, 0x94, 0x92, 0x15, 0x1f, 0xbe, 0x9d, 0x11,
+	0xb9, 0x09, 0x25, 0x62, 0x25, 0x7f, 0xed, 0x20, 0xbd, 0xfe, 0xe1, 0xbf, 0xbf, 0xf8, 0xf5, 0x5c,
+	0x4b, 0xba, 0x1d, 0x69, 0xfc, 0x7f, 0x1a, 0x50, 0xfd, 0x15, 0xd7, 0x73, 0x7e, 0x42, 0x34, 0x9f,
+	0xca, 0x55, 0xd9, 0x72, 0xb4, 0xa0, 0xcf, 0x97, 0xab, 0x1f, 0xc8, 0x91, 0x5a, 0xa9, 0x11, 0xad,
+	0x5c, 0xf0, 0xdf, 0x10, 0xac, 0x26, 0x4a, 0x34, 0x7c, 0x2b, 0x03, 0x4b, 0x7a, 0x05, 0x59, 0xb9,
+	0x3d, 0xad, 0x5a, 0xb0, 0x41, 0xa4, 0xbb, 0xdc, 0x9f, 0xef, 0xe1, 0x19, 0xfd, 0xc1, 0xbf, 0x47,
+	0x50, 0x8c, 0x15, 0x75, 0x78, 0x3b, 0x03, 0x49, 0x5a, 0x09, 0x38, 0x4d, 0x06, 0x52, 0x11, 0xb3,
+	0x3b, 0x63, 0x02, 0xde, 0x28, 0x5c, 0xb9, 0xfa, 0x01, 0xfe, 0x17, 0x82, 0x52, 0xb2, 0xb2, 0xcc,
+	0x64, 0xce, 0x84, 0x52, 0x74, 0x1a, 0xdc, 0x3f, 0xe2, 0xb8, 0xdf, 0xa8, 0xef, 0xc5, 0x22, 0x3d,
+	0x62, 0x43, 0x2d, 0xbf, 0x0f, 0x71, 0x16, 0x7d, 0x82, 0xa0, 0x94, 0x2c, 0x43, 0x33, 0x1d, 0x9a,
+	0x50, 0xb7, 0x56, 0xd6, 0xc7, 0x76, 0x7a, 0xab, 0xe7, 0xfa, 0x83, 0x30, 0xea, 0xd5, 0x59, 0xa3,
+	0xfe, 0x07, 0x04, 0xc5, 0xd8, 0xf6, 0xcb, 0xe4, 0x49, 0xda, 0xf3, 0x41, 0x25, 0xe7, 0x1d, 0x2d,
+	0xed, 0x73, 0xb8, 0x77, 0xa5, 0xed, 0xe9, 0x69, 0x4d, 0x1b, 0xc3, 0xfe, 0xf5, 0x4f, 0x08, 0x96,
+	0xa3, 0x85, 0x04, 0xae, 0xe7, 0xdf, 0x65, 0xc3, 0x9d, 0xb9, 0x3d, 0x95, 0x8e, 0xd8, 0x96, 0x3b,
+	0x1c, 0xff, 0x2d, 0x3c, 0x0b, 0x7e, 0xfc, 0x29, 0x02, 0x18, 0xed, 0x32, 0xfc, 0x9d, 0xdc, 0x1b,
+	0x72, 0xda, 0x28, 0xa7, 0xa2, 0xcc, 0x41, 0x0a, 0xce, 0x88, 0xcf, 0x10, 0x14, 0x63, 0xdb, 0x2a,
+	0x93, 0x11, 0x69, 0xaf, 0x14, 0xb9, 0xb1, 0x1e, 0x71, 0xac, 0x07, 0xf5, 0x9d, 0x94, 0xed, 0x57,
+	0xcb, 0x89, 0x79, 0xc4, 0x8c, 0x8f, 0x11, 0x14, 0x63, 0x5b, 0x28, 0x13, 0x7c, 0xda, 0x5b, 0xc6,
+	0xc4, 0xdd, 0x26, 0x02, 0x5b, 0x9d, 0x29, 0xb0, 0xff, 0x1d, 0xbe, 0xbd, 0x25, 0x9e, 0x03, 0x1b,
+	0xb9, 0x76, 0x5c, 0x6a, 0xf7, 0x51, 0x99, 0xae, 0x5c, 0x92, 0xde, 0xe6, 0x0e, 0xbc, 0x29, 0xb5,
+	0x72, 0xf3, 0x37, 0xea, 0x82, 0x9c, 0x28, 0xb6, 0x1a, 0xc9, 0xfe, 0x17, 0xff, 0x05, 0x85, 0xaf,
+	0x43, 0x53, 0xfa, 0x78, 0x49, 0x87, 0x35, 0x31, 0x1b, 0xf7, 0xb8, 0x33, 0x87, 0xd5, 0xd6, 0xf4,
+	0xd9, 0x48, 0x7a, 0xc2, 0xf2, 0xf3, 0x1f, 0x14, 0x3c, 0x45, 0x26, 0xda, 0x5a, 0x7c, 0x27, 0xc7,
+	0x41, 0x91, 0xde, 0x7d, 0x57, 0x1a, 0xb3, 0xa8, 0x8a, 0xa3, 0x46, 0x78, 0x87, 0xbf, 0x9c, 0x54,
+	0xe1, 0x7f, 0x22, 0xfe, 0xf0, 0x98, 0x48, 0xcb, 0x77, 0xb3, 0xcf, 0xa0, 0x2f, 0x85, 0x77, 0xa9,
+	0xce, 0xcc, 0x9e, 0xaa, 0xcf, 0x11, 0xac, 0xa7, 0x37, 0xd8, 0xf8, 0xfb, 0x19, 0xc0, 0x2e, 0xed,
+	0xcb, 0x27, 0x52, 0x4d, 0x9c, 0x52, 0xd2, 0xee, 0x6c, 0xd7, 0x6c, 0x43, 0x1d, 0xae, 0xda, 0x40,
+	0x55, 0xfc, 0x0f, 0x04, 0x9b, 0x97, 0x34, 0xf4, 0x78, 0x37, 0x33, 0xb8, 0x59, 0x8f, 0x01, 0x13,
+	0x1d, 0x79, 0xc0, 0x1d, 0x69, 0x4b, 0xfb, 0x33, 0x3a, 0xe2, 0x45, 0x97, 0x66, 0xbe, 0x7c, 0x81,
+	0xa0, 0x3c, 0xa9, 0xa9, 0xc7, 0x77, 0xa7, 0xb8, 0x63, 0x53, 0x5e, 0x20, 0x2a, 0xaf, 0xce, 0xac,
+	0x2f, 0x36, 0xd1, 0x21, 0x77, 0x77, 0x17, 0xbf, 0x3a, 0x9b, 0xbb, 0xa3, 0xbb, 0xfb, 0xcf, 0x08,
+	0xae, 0x8f, 0xb5, 0xb3, 0x99, 0xdb, 0x67, 0x52, 0x57, 0x5e, 0xb9, 0x11, 0x2a, 0x46, 0xfe, 0x85,
+	0xac, 0x0d, 0x7b, 0x47, 0xe9, 0x35, 0x0e, 0x7b, 0x4f, 0x7a, 0x65, 0xc6, 0x6e, 0xc6, 0xe4, 0xeb,
+	0x36, 0x50, 0x75, 0xef, 0xe7, 0x08, 0x9e, 0xd3, 0x9c, 0xde, 0xe5, 0x38, 0xf7, 0x9e, 0x8e, 0x35,
+	0x71, 0x9d, 0xe0, 0xaf, 0xd9, 0x63, 0xc6, 0x9c, 0x63, 0xf4, 0x56, 0x53, 0xe8, 0x1a, 0x8e, 0xa5,
+	0xda, 0x46, 0xcd, 0xf1, 0x0c, 0xd9, 0x20, 0x36, 0xe7, 0x95, 0x1c, 0x7c, 0x52, 0x5d, 0x93, 0x4e,
+	0xf8, 0xf7, 0x75, 0x27, 0x98, 0xf8, 0x1f, 0x42, 0x67, 0x57, 0xb9, 0xca, 0xf6, 0xff, 0x03, 0x00,
+	0x00, 0xff, 0xff, 0x24, 0x8c, 0xbc, 0xfe, 0x28, 0x1e, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go
new file mode 100644
index 00000000..7fdef8a1
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/text_annotation.pb.go
@@ -0,0 +1,797 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p3beta1/text_annotation.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Enum to denote the type of break found. New line, space etc.
+type TextAnnotation_DetectedBreak_BreakType int32
+
+const (
+	// Unknown break label type.
+	TextAnnotation_DetectedBreak_UNKNOWN TextAnnotation_DetectedBreak_BreakType = 0
+	// Regular space.
+	TextAnnotation_DetectedBreak_SPACE TextAnnotation_DetectedBreak_BreakType = 1
+	// Sure space (very wide).
+	TextAnnotation_DetectedBreak_SURE_SPACE TextAnnotation_DetectedBreak_BreakType = 2
+	// Line-wrapping break.
+	TextAnnotation_DetectedBreak_EOL_SURE_SPACE TextAnnotation_DetectedBreak_BreakType = 3
+	// End-line hyphen that is not present in text; does not co-occur with
+	// `SPACE`, `LEADER_SPACE`, or `LINE_BREAK`.
+	TextAnnotation_DetectedBreak_HYPHEN TextAnnotation_DetectedBreak_BreakType = 4
+	// Line break that ends a paragraph.
+	TextAnnotation_DetectedBreak_LINE_BREAK TextAnnotation_DetectedBreak_BreakType = 5
+)
+
+var TextAnnotation_DetectedBreak_BreakType_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "SPACE",
+	2: "SURE_SPACE",
+	3: "EOL_SURE_SPACE",
+	4: "HYPHEN",
+	5: "LINE_BREAK",
+}
+var TextAnnotation_DetectedBreak_BreakType_value = map[string]int32{
+	"UNKNOWN":        0,
+	"SPACE":          1,
+	"SURE_SPACE":     2,
+	"EOL_SURE_SPACE": 3,
+	"HYPHEN":         4,
+	"LINE_BREAK":     5,
+}
+
+func (x TextAnnotation_DetectedBreak_BreakType) String() string {
+	return proto.EnumName(TextAnnotation_DetectedBreak_BreakType_name, int32(x))
+}
+func (TextAnnotation_DetectedBreak_BreakType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{0, 1, 0}
+}
+
+// Type of a block (text, image etc) as identified by OCR.
+type Block_BlockType int32
+
+const (
+	// Unknown block type.
+	Block_UNKNOWN Block_BlockType = 0
+	// Regular text block.
+	Block_TEXT Block_BlockType = 1
+	// Table block.
+	Block_TABLE Block_BlockType = 2
+	// Image block.
+	Block_PICTURE Block_BlockType = 3
+	// Horizontal/vertical line box.
+	Block_RULER Block_BlockType = 4
+	// Barcode block.
+	Block_BARCODE Block_BlockType = 5
+)
+
+var Block_BlockType_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "TEXT",
+	2: "TABLE",
+	3: "PICTURE",
+	4: "RULER",
+	5: "BARCODE",
+}
+var Block_BlockType_value = map[string]int32{
+	"UNKNOWN": 0,
+	"TEXT":    1,
+	"TABLE":   2,
+	"PICTURE": 3,
+	"RULER":   4,
+	"BARCODE": 5,
+}
+
+func (x Block_BlockType) String() string {
+	return proto.EnumName(Block_BlockType_name, int32(x))
+}
+func (Block_BlockType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{2, 0}
+}
+
+// TextAnnotation contains a structured representation of OCR extracted text.
+// The hierarchy of an OCR extracted text structure is like this:
+//     TextAnnotation -> Page -> Block -> Paragraph -> Word -> Symbol
+// Each structural component, starting from Page, may further have their own
+// properties. Properties describe detected languages, breaks etc.. Please refer
+// to the [TextAnnotation.TextProperty][google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty] message definition below for more
+// detail.
+type TextAnnotation struct {
+	// List of pages detected by OCR.
+	Pages []*Page `protobuf:"bytes,1,rep,name=pages,proto3" json:"pages,omitempty"`
+	// UTF-8 text detected on the pages.
+	Text                 string   `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation) Reset()         { *m = TextAnnotation{} }
+func (m *TextAnnotation) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation) ProtoMessage()    {}
+func (*TextAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{0}
+}
+func (m *TextAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation.Unmarshal(m, b)
+}
+func (m *TextAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation.Merge(dst, src)
+}
+func (m *TextAnnotation) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation.Size(m)
+}
+func (m *TextAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation proto.InternalMessageInfo
+
+func (m *TextAnnotation) GetPages() []*Page {
+	if m != nil {
+		return m.Pages
+	}
+	return nil
+}
+
+func (m *TextAnnotation) GetText() string {
+	if m != nil {
+		return m.Text
+	}
+	return ""
+}
+
+// Detected language for a structural component.
+type TextAnnotation_DetectedLanguage struct {
+	// The BCP-47 language code, such as "en-US" or "sr-Latn". For more
+	// information, see
+	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
+	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Confidence of detected language. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation_DetectedLanguage) Reset()         { *m = TextAnnotation_DetectedLanguage{} }
+func (m *TextAnnotation_DetectedLanguage) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_DetectedLanguage) ProtoMessage()    {}
+func (*TextAnnotation_DetectedLanguage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{0, 0}
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Unmarshal(m, b)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_DetectedLanguage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.Merge(dst, src)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_DetectedLanguage.Size(m)
+}
+func (m *TextAnnotation_DetectedLanguage) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_DetectedLanguage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation_DetectedLanguage proto.InternalMessageInfo
+
+func (m *TextAnnotation_DetectedLanguage) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *TextAnnotation_DetectedLanguage) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Detected start or end of a structural component.
+type TextAnnotation_DetectedBreak struct {
+	// Detected break type.
+	Type TextAnnotation_DetectedBreak_BreakType `protobuf:"varint,1,opt,name=type,proto3,enum=google.cloud.vision.v1p3beta1.TextAnnotation_DetectedBreak_BreakType" json:"type,omitempty"`
+	// True if break prepends the element.
+	IsPrefix             bool     `protobuf:"varint,2,opt,name=is_prefix,json=isPrefix,proto3" json:"is_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TextAnnotation_DetectedBreak) Reset()         { *m = TextAnnotation_DetectedBreak{} }
+func (m *TextAnnotation_DetectedBreak) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_DetectedBreak) ProtoMessage()    {}
+func (*TextAnnotation_DetectedBreak) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{0, 1}
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Unmarshal(m, b)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_DetectedBreak) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.Merge(dst, src)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_DetectedBreak.Size(m)
+}
+func (m *TextAnnotation_DetectedBreak) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_DetectedBreak.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation_DetectedBreak proto.InternalMessageInfo
+
+func (m *TextAnnotation_DetectedBreak) GetType() TextAnnotation_DetectedBreak_BreakType {
+	if m != nil {
+		return m.Type
+	}
+	return TextAnnotation_DetectedBreak_UNKNOWN
+}
+
+func (m *TextAnnotation_DetectedBreak) GetIsPrefix() bool {
+	if m != nil {
+		return m.IsPrefix
+	}
+	return false
+}
+
+// Additional information detected on the structural component.
+type TextAnnotation_TextProperty struct {
+	// A list of detected languages together with confidence.
+	DetectedLanguages []*TextAnnotation_DetectedLanguage `protobuf:"bytes,1,rep,name=detected_languages,json=detectedLanguages,proto3" json:"detected_languages,omitempty"`
+	// Detected start or end of a text segment.
+	DetectedBreak        *TextAnnotation_DetectedBreak `protobuf:"bytes,2,opt,name=detected_break,json=detectedBreak,proto3" json:"detected_break,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *TextAnnotation_TextProperty) Reset()         { *m = TextAnnotation_TextProperty{} }
+func (m *TextAnnotation_TextProperty) String() string { return proto.CompactTextString(m) }
+func (*TextAnnotation_TextProperty) ProtoMessage()    {}
+func (*TextAnnotation_TextProperty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{0, 2}
+}
+func (m *TextAnnotation_TextProperty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Unmarshal(m, b)
+}
+func (m *TextAnnotation_TextProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Marshal(b, m, deterministic)
+}
+func (dst *TextAnnotation_TextProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TextAnnotation_TextProperty.Merge(dst, src)
+}
+func (m *TextAnnotation_TextProperty) XXX_Size() int {
+	return xxx_messageInfo_TextAnnotation_TextProperty.Size(m)
+}
+func (m *TextAnnotation_TextProperty) XXX_DiscardUnknown() {
+	xxx_messageInfo_TextAnnotation_TextProperty.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TextAnnotation_TextProperty proto.InternalMessageInfo
+
+func (m *TextAnnotation_TextProperty) GetDetectedLanguages() []*TextAnnotation_DetectedLanguage {
+	if m != nil {
+		return m.DetectedLanguages
+	}
+	return nil
+}
+
+func (m *TextAnnotation_TextProperty) GetDetectedBreak() *TextAnnotation_DetectedBreak {
+	if m != nil {
+		return m.DetectedBreak
+	}
+	return nil
+}
+
+// Detected page from OCR.
+type Page struct {
+	// Additional information detected on the page.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// Page width. For PDFs the unit is points. For images (including
+	// TIFFs) the unit is pixels.
+	Width int32 `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"`
+	// Page height. For PDFs the unit is points. For images (including
+	// TIFFs) the unit is pixels.
+	Height int32 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
+	// List of blocks of text, images etc on this page.
+	Blocks []*Block `protobuf:"bytes,4,rep,name=blocks,proto3" json:"blocks,omitempty"`
+	// Confidence of the OCR results on the page. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Page) Reset()         { *m = Page{} }
+func (m *Page) String() string { return proto.CompactTextString(m) }
+func (*Page) ProtoMessage()    {}
+func (*Page) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{1}
+}
+func (m *Page) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Page.Unmarshal(m, b)
+}
+func (m *Page) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Page.Marshal(b, m, deterministic)
+}
+func (dst *Page) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Page.Merge(dst, src)
+}
+func (m *Page) XXX_Size() int {
+	return xxx_messageInfo_Page.Size(m)
+}
+func (m *Page) XXX_DiscardUnknown() {
+	xxx_messageInfo_Page.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Page proto.InternalMessageInfo
+
+func (m *Page) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Page) GetWidth() int32 {
+	if m != nil {
+		return m.Width
+	}
+	return 0
+}
+
+func (m *Page) GetHeight() int32 {
+	if m != nil {
+		return m.Height
+	}
+	return 0
+}
+
+func (m *Page) GetBlocks() []*Block {
+	if m != nil {
+		return m.Blocks
+	}
+	return nil
+}
+
+func (m *Page) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Logical element on the page.
+type Block struct {
+	// Additional information detected for the block.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// The bounding box for the block.
+	// The vertices are in the order of top-left, top-right, bottom-right,
+	// bottom-left. When a rotation of the bounding box is detected the rotation
+	// is represented as around the top-left corner as defined when the text is
+	// read in the 'natural' orientation.
+	// For example:
+	//
+	// * when the text is horizontal it might look like:
+	//
+	//         0----1
+	//         |    |
+	//         3----2
+	//
+	// * when it's rotated 180 degrees around the top-left corner it becomes:
+	//
+	//         2----3
+	//         |    |
+	//         1----0
+	//
+	//   and the vertice order will still be (0, 1, 2, 3).
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
+	// List of paragraphs in this block (if this blocks is of type text).
+	Paragraphs []*Paragraph `protobuf:"bytes,3,rep,name=paragraphs,proto3" json:"paragraphs,omitempty"`
+	// Detected block type (text, image etc) for this block.
+	BlockType Block_BlockType `protobuf:"varint,4,opt,name=block_type,json=blockType,proto3,enum=google.cloud.vision.v1p3beta1.Block_BlockType" json:"block_type,omitempty"`
+	// Confidence of the OCR results on the block. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Block) Reset()         { *m = Block{} }
+func (m *Block) String() string { return proto.CompactTextString(m) }
+func (*Block) ProtoMessage()    {}
+func (*Block) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{2}
+}
+func (m *Block) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Block.Unmarshal(m, b)
+}
+func (m *Block) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Block.Marshal(b, m, deterministic)
+}
+func (dst *Block) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Block.Merge(dst, src)
+}
+func (m *Block) XXX_Size() int {
+	return xxx_messageInfo_Block.Size(m)
+}
+func (m *Block) XXX_DiscardUnknown() {
+	xxx_messageInfo_Block.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Block proto.InternalMessageInfo
+
+func (m *Block) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Block) GetBoundingBox() *BoundingPoly {
+	if m != nil {
+		return m.BoundingBox
+	}
+	return nil
+}
+
+func (m *Block) GetParagraphs() []*Paragraph {
+	if m != nil {
+		return m.Paragraphs
+	}
+	return nil
+}
+
+func (m *Block) GetBlockType() Block_BlockType {
+	if m != nil {
+		return m.BlockType
+	}
+	return Block_UNKNOWN
+}
+
+func (m *Block) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// Structural unit of text representing a number of words in certain order.
+type Paragraph struct {
+	// Additional information detected for the paragraph.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// The bounding box for the paragraph.
+	// The vertices are in the order of top-left, top-right, bottom-right,
+	// bottom-left. When a rotation of the bounding box is detected the rotation
+	// is represented as around the top-left corner as defined when the text is
+	// read in the 'natural' orientation.
+	// For example:
+	//   * when the text is horizontal it might look like:
+	//      0----1
+	//      |    |
+	//      3----2
+	//   * when it's rotated 180 degrees around the top-left corner it becomes:
+	//      2----3
+	//      |    |
+	//      1----0
+	//   and the vertice order will still be (0, 1, 2, 3).
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
+	// List of words in this paragraph.
+	Words []*Word `protobuf:"bytes,3,rep,name=words,proto3" json:"words,omitempty"`
+	// Confidence of the OCR results for the paragraph. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Paragraph) Reset()         { *m = Paragraph{} }
+func (m *Paragraph) String() string { return proto.CompactTextString(m) }
+func (*Paragraph) ProtoMessage()    {}
+func (*Paragraph) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{3}
+}
+func (m *Paragraph) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Paragraph.Unmarshal(m, b)
+}
+func (m *Paragraph) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Paragraph.Marshal(b, m, deterministic)
+}
+func (dst *Paragraph) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Paragraph.Merge(dst, src)
+}
+func (m *Paragraph) XXX_Size() int {
+	return xxx_messageInfo_Paragraph.Size(m)
+}
+func (m *Paragraph) XXX_DiscardUnknown() {
+	xxx_messageInfo_Paragraph.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Paragraph proto.InternalMessageInfo
+
+func (m *Paragraph) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Paragraph) GetBoundingBox() *BoundingPoly {
+	if m != nil {
+		return m.BoundingBox
+	}
+	return nil
+}
+
+func (m *Paragraph) GetWords() []*Word {
+	if m != nil {
+		return m.Words
+	}
+	return nil
+}
+
+func (m *Paragraph) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// A word representation.
+type Word struct {
+	// Additional information detected for the word.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// The bounding box for the word.
+	// The vertices are in the order of top-left, top-right, bottom-right,
+	// bottom-left. When a rotation of the bounding box is detected the rotation
+	// is represented as around the top-left corner as defined when the text is
+	// read in the 'natural' orientation.
+	// For example:
+	//   * when the text is horizontal it might look like:
+	//      0----1
+	//      |    |
+	//      3----2
+	//   * when it's rotated 180 degrees around the top-left corner it becomes:
+	//      2----3
+	//      |    |
+	//      1----0
+	//   and the vertice order will still be (0, 1, 2, 3).
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
+	// List of symbols in the word.
+	// The order of the symbols follows the natural reading order.
+	Symbols []*Symbol `protobuf:"bytes,3,rep,name=symbols,proto3" json:"symbols,omitempty"`
+	// Confidence of the OCR results for the word. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Word) Reset()         { *m = Word{} }
+func (m *Word) String() string { return proto.CompactTextString(m) }
+func (*Word) ProtoMessage()    {}
+func (*Word) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{4}
+}
+func (m *Word) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Word.Unmarshal(m, b)
+}
+func (m *Word) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Word.Marshal(b, m, deterministic)
+}
+func (dst *Word) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Word.Merge(dst, src)
+}
+func (m *Word) XXX_Size() int {
+	return xxx_messageInfo_Word.Size(m)
+}
+func (m *Word) XXX_DiscardUnknown() {
+	xxx_messageInfo_Word.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Word proto.InternalMessageInfo
+
+func (m *Word) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Word) GetBoundingBox() *BoundingPoly {
+	if m != nil {
+		return m.BoundingBox
+	}
+	return nil
+}
+
+func (m *Word) GetSymbols() []*Symbol {
+	if m != nil {
+		return m.Symbols
+	}
+	return nil
+}
+
+func (m *Word) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+// A single symbol representation.
+type Symbol struct {
+	// Additional information detected for the symbol.
+	Property *TextAnnotation_TextProperty `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	// The bounding box for the symbol.
+	// The vertices are in the order of top-left, top-right, bottom-right,
+	// bottom-left. When a rotation of the bounding box is detected the rotation
+	// is represented as around the top-left corner as defined when the text is
+	// read in the 'natural' orientation.
+	// For example:
+	//   * when the text is horizontal it might look like:
+	//      0----1
+	//      |    |
+	//      3----2
+	//   * when it's rotated 180 degrees around the top-left corner it becomes:
+	//      2----3
+	//      |    |
+	//      1----0
+	//   and the vertice order will still be (0, 1, 2, 3).
+	BoundingBox *BoundingPoly `protobuf:"bytes,2,opt,name=bounding_box,json=boundingBox,proto3" json:"bounding_box,omitempty"`
+	// The actual UTF-8 representation of the symbol.
+	Text string `protobuf:"bytes,3,opt,name=text,proto3" json:"text,omitempty"`
+	// Confidence of the OCR results for the symbol. Range [0, 1].
+	Confidence           float32  `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Symbol) Reset()         { *m = Symbol{} }
+func (m *Symbol) String() string { return proto.CompactTextString(m) }
+func (*Symbol) ProtoMessage()    {}
+func (*Symbol) Descriptor() ([]byte, []int) {
+	return fileDescriptor_text_annotation_26024690f7632d99, []int{5}
+}
+func (m *Symbol) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Symbol.Unmarshal(m, b)
+}
+func (m *Symbol) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Symbol.Marshal(b, m, deterministic)
+}
+func (dst *Symbol) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Symbol.Merge(dst, src)
+}
+func (m *Symbol) XXX_Size() int {
+	return xxx_messageInfo_Symbol.Size(m)
+}
+func (m *Symbol) XXX_DiscardUnknown() {
+	xxx_messageInfo_Symbol.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Symbol proto.InternalMessageInfo
+
+func (m *Symbol) GetProperty() *TextAnnotation_TextProperty {
+	if m != nil {
+		return m.Property
+	}
+	return nil
+}
+
+func (m *Symbol) GetBoundingBox() *BoundingPoly {
+	if m != nil {
+		return m.BoundingBox
+	}
+	return nil
+}
+
+func (m *Symbol) GetText() string {
+	if m != nil {
+		return m.Text
+	}
+	return ""
+}
+
+func (m *Symbol) GetConfidence() float32 {
+	if m != nil {
+		return m.Confidence
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*TextAnnotation)(nil), "google.cloud.vision.v1p3beta1.TextAnnotation")
+	proto.RegisterType((*TextAnnotation_DetectedLanguage)(nil), "google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage")
+	proto.RegisterType((*TextAnnotation_DetectedBreak)(nil), "google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak")
+	proto.RegisterType((*TextAnnotation_TextProperty)(nil), "google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty")
+	proto.RegisterType((*Page)(nil), "google.cloud.vision.v1p3beta1.Page")
+	proto.RegisterType((*Block)(nil), "google.cloud.vision.v1p3beta1.Block")
+	proto.RegisterType((*Paragraph)(nil), "google.cloud.vision.v1p3beta1.Paragraph")
+	proto.RegisterType((*Word)(nil), "google.cloud.vision.v1p3beta1.Word")
+	proto.RegisterType((*Symbol)(nil), "google.cloud.vision.v1p3beta1.Symbol")
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.TextAnnotation_DetectedBreak_BreakType", TextAnnotation_DetectedBreak_BreakType_name, TextAnnotation_DetectedBreak_BreakType_value)
+	proto.RegisterEnum("google.cloud.vision.v1p3beta1.Block_BlockType", Block_BlockType_name, Block_BlockType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/text_annotation.proto", fileDescriptor_text_annotation_26024690f7632d99)
+}
+
+var fileDescriptor_text_annotation_26024690f7632d99 = []byte{
+	// 775 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xd3, 0x48,
+	0x14, 0x5f, 0x27, 0x76, 0x1a, 0xbf, 0xb4, 0x91, 0x77, 0x76, 0xb5, 0x8a, 0xb2, 0xbb, 0xa8, 0xa4,
+	0x20, 0x55, 0x02, 0x39, 0x6a, 0x7a, 0x2a, 0x45, 0xa0, 0x38, 0xb5, 0xd4, 0xaa, 0x21, 0xb5, 0xa6,
+	0x09, 0xa5, 0x5c, 0x2c, 0xff, 0x99, 0x3a, 0x56, 0x13, 0x8f, 0x65, 0xbb, 0x6d, 0x72, 0xe5, 0x8a,
+	0x04, 0x5f, 0x88, 0x2f, 0x83, 0xc4, 0x09, 0xf1, 0x01, 0x38, 0x22, 0x8f, 0xed, 0x34, 0x09, 0xa2,
+	0xe6, 0x8f, 0x38, 0xf4, 0x12, 0xcd, 0x7b, 0x79, 0xbf, 0x37, 0xef, 0xf7, 0x7b, 0xf3, 0x3c, 0x03,
+	0xdb, 0x0e, 0xa5, 0xce, 0x88, 0x34, 0xad, 0x11, 0xbd, 0xb0, 0x9b, 0x97, 0x6e, 0xe8, 0x52, 0xaf,
+	0x79, 0xb9, 0xe5, 0x6f, 0x9b, 0x24, 0x32, 0xb6, 0x9a, 0x11, 0x99, 0x44, 0xba, 0xe1, 0x79, 0x34,
+	0x32, 0x22, 0x97, 0x7a, 0xb2, 0x1f, 0xd0, 0x88, 0xa2, 0xff, 0x13, 0x90, 0xcc, 0x40, 0x72, 0x02,
+	0x92, 0x67, 0xa0, 0xfa, 0x7f, 0x69, 0x4e, 0xc3, 0x77, 0x9b, 0xd7, 0xd8, 0x30, 0x01, 0xd7, 0x1f,
+	0xde, 0xbc, 0xa3, 0x43, 0xe8, 0x98, 0x44, 0xc1, 0x34, 0x89, 0x6e, 0xbc, 0x16, 0xa0, 0xda, 0x27,
+	0x93, 0xa8, 0x3d, 0xcb, 0x83, 0x76, 0x40, 0xf0, 0x0d, 0x87, 0x84, 0x35, 0x6e, 0xbd, 0xb8, 0x59,
+	0x69, 0x6d, 0xc8, 0x37, 0x56, 0x23, 0x6b, 0x86, 0x43, 0x70, 0x82, 0x40, 0x08, 0xf8, 0x98, 0x51,
+	0xad, 0xb0, 0xce, 0x6d, 0x8a, 0x98, 0xad, 0xeb, 0x27, 0x20, 0xed, 0x91, 0x88, 0x58, 0x11, 0xb1,
+	0xbb, 0x86, 0xe7, 0x5c, 0x18, 0x0e, 0x41, 0x1b, 0xb0, 0x36, 0x4a, 0xd7, 0xba, 0x45, 0x6d, 0x52,
+	0xe3, 0x18, 0x60, 0x35, 0x73, 0x76, 0xa8, 0x4d, 0xd0, 0x1d, 0x00, 0x8b, 0x7a, 0x67, 0xae, 0x4d,
+	0x3c, 0x8b, 0xb0, 0x94, 0x05, 0x3c, 0xe7, 0xa9, 0x7f, 0xe2, 0x60, 0x2d, 0xcb, 0xac, 0x04, 0xc4,
+	0x38, 0x47, 0xa7, 0xc0, 0x47, 0x53, 0x3f, 0xc9, 0x56, 0x6d, 0xa9, 0x39, 0x85, 0x2f, 0xd2, 0x96,
+	0x17, 0x52, 0xc9, 0xec, 0xb7, 0x3f, 0xf5, 0x09, 0x66, 0x29, 0xd1, 0xbf, 0x20, 0xba, 0xa1, 0xee,
+	0x07, 0xe4, 0xcc, 0x9d, 0xb0, 0x5a, 0xca, 0xb8, 0xec, 0x86, 0x1a, 0xb3, 0x1b, 0x16, 0x88, 0xb3,
+	0x78, 0x54, 0x81, 0x95, 0x41, 0xef, 0xb0, 0x77, 0x74, 0xd2, 0x93, 0xfe, 0x40, 0x22, 0x08, 0xc7,
+	0x5a, 0xbb, 0xa3, 0x4a, 0x1c, 0xaa, 0x02, 0x1c, 0x0f, 0xb0, 0xaa, 0x27, 0x76, 0x01, 0x21, 0xa8,
+	0xaa, 0x47, 0x5d, 0x7d, 0xce, 0x57, 0x44, 0x00, 0xa5, 0xfd, 0x53, 0x6d, 0x5f, 0xed, 0x49, 0x7c,
+	0x1c, 0xdf, 0x3d, 0xe8, 0xa9, 0xba, 0x82, 0xd5, 0xf6, 0xa1, 0x24, 0xd4, 0xdf, 0x73, 0xb0, 0x1a,
+	0x97, 0xac, 0x05, 0xd4, 0x27, 0x41, 0x34, 0x45, 0x63, 0x40, 0x76, 0x5a, 0xb3, 0x9e, 0x09, 0x97,
+	0x35, 0xed, 0xc9, 0xcf, 0x71, 0xcf, 0x1a, 0x84, 0xff, 0xb4, 0x97, 0x3c, 0x21, 0x32, 0xa1, 0x3a,
+	0xdb, 0xce, 0x8c, 0xd9, 0x32, 0x19, 0x2a, 0xad, 0xdd, 0x5f, 0x90, 0x19, 0xaf, 0xd9, 0xf3, 0x66,
+	0xe3, 0x23, 0x07, 0x7c, 0x7c, 0x9e, 0xd0, 0x73, 0x28, 0xfb, 0x29, 0x4f, 0xd6, 0xcd, 0x4a, 0xeb,
+	0xd1, 0x8f, 0x6d, 0x33, 0xaf, 0x14, 0x9e, 0xe5, 0x42, 0x7f, 0x83, 0x70, 0xe5, 0xda, 0xd1, 0x90,
+	0xd5, 0x2e, 0xe0, 0xc4, 0x40, 0xff, 0x40, 0x69, 0x48, 0x5c, 0x67, 0x18, 0xd5, 0x8a, 0xcc, 0x9d,
+	0x5a, 0xe8, 0x31, 0x94, 0xcc, 0x11, 0xb5, 0xce, 0xc3, 0x1a, 0xcf, 0x54, 0xbd, 0x97, 0x53, 0x83,
+	0x12, 0x07, 0xe3, 0x14, 0xb3, 0x74, 0x7e, 0x85, 0xe5, 0xf3, 0xdb, 0x78, 0x57, 0x04, 0x81, 0x21,
+	0x7e, 0x1b, 0xdb, 0x1e, 0xac, 0x9a, 0xf4, 0xc2, 0xb3, 0x5d, 0xcf, 0xd1, 0x4d, 0x3a, 0x49, 0x1b,
+	0xf6, 0x20, 0x8f, 0x45, 0x0a, 0xd1, 0xe8, 0x68, 0x8a, 0x2b, 0x59, 0x02, 0x85, 0x4e, 0xd0, 0x3e,
+	0x80, 0x6f, 0x04, 0x86, 0x13, 0x18, 0xfe, 0x30, 0xac, 0x15, 0x99, 0x26, 0x9b, 0xb9, 0x9f, 0x87,
+	0x14, 0x80, 0xe7, 0xb0, 0xe8, 0x19, 0x00, 0x53, 0x49, 0x67, 0xf3, 0xca, 0xb3, 0x79, 0x95, 0xbf,
+	0x47, 0xdd, 0xe4, 0x97, 0x0d, 0xa6, 0x68, 0x66, 0xcb, 0x5c, 0xa9, 0x31, 0x88, 0x33, 0xdc, 0xe2,
+	0x80, 0x96, 0x81, 0xef, 0xab, 0x2f, 0xfa, 0x12, 0x17, 0x8f, 0x6a, 0xbf, 0xad, 0x74, 0xe3, 0xd1,
+	0xac, 0xc0, 0x8a, 0x76, 0xd0, 0xe9, 0x0f, 0x70, 0x3c, 0x93, 0x22, 0x08, 0x78, 0xd0, 0x55, 0xb1,
+	0xc4, 0xc7, 0x7e, 0xa5, 0x8d, 0x3b, 0x47, 0x7b, 0xaa, 0x24, 0x34, 0xde, 0x14, 0x40, 0x9c, 0x91,
+	0xbb, 0x35, 0x2d, 0xdc, 0x01, 0xe1, 0x8a, 0x06, 0x76, 0xd6, 0xbd, 0xbc, 0x8f, 0xfb, 0x09, 0x0d,
+	0x6c, 0x9c, 0x20, 0x96, 0x44, 0xe6, 0xbf, 0x12, 0xf9, 0x6d, 0x01, 0xf8, 0x38, 0xfe, 0xd6, 0x68,
+	0xf1, 0x14, 0x56, 0xc2, 0xe9, 0xd8, 0xa4, 0xa3, 0x4c, 0x8d, 0xfb, 0x39, 0xa9, 0x8e, 0x59, 0x34,
+	0xce, 0x50, 0xb9, 0x8a, 0x7c, 0xe0, 0xa0, 0x94, 0x60, 0x6e, 0x8d, 0x26, 0xd9, 0x0d, 0x5e, 0xbc,
+	0xbe, 0xc1, 0xf3, 0x68, 0x2a, 0xaf, 0x38, 0xb8, 0x6b, 0xd1, 0xf1, 0xcd, 0x7b, 0x2a, 0x7f, 0x2d,
+	0x12, 0xd2, 0xe2, 0xe7, 0x87, 0xc6, 0xbd, 0xec, 0xa4, 0x28, 0x87, 0xc6, 0x77, 0x98, 0x4c, 0x03,
+	0xa7, 0xe9, 0x10, 0x8f, 0x3d, 0x4e, 0x9a, 0xc9, 0x5f, 0x86, 0xef, 0x86, 0xdf, 0x78, 0xcd, 0xec,
+	0x26, 0x8e, 0xcf, 0x1c, 0x67, 0x96, 0x18, 0x64, 0xfb, 0x4b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x24,
+	0x7c, 0x70, 0x3a, 0x71, 0x09, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go
new file mode 100644
index 00000000..a9f5745f
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1/web_detection.pb.go
@@ -0,0 +1,395 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/vision/v1p3beta1/web_detection.proto
+
+package vision // import "google.golang.org/genproto/googleapis/cloud/vision/v1p3beta1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Relevant information for the image from the Internet.
+type WebDetection struct {
+	// Deduced entities from similar images on the Internet.
+	WebEntities []*WebDetection_WebEntity `protobuf:"bytes,1,rep,name=web_entities,json=webEntities,proto3" json:"web_entities,omitempty"`
+	// Fully matching images from the Internet.
+	// Can include resized copies of the query image.
+	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,2,rep,name=full_matching_images,json=fullMatchingImages,proto3" json:"full_matching_images,omitempty"`
+	// Partial matching images from the Internet.
+	// Those images are similar enough to share some key-point features. For
+	// example an original image will likely have partial matching for its crops.
+	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,3,rep,name=partial_matching_images,json=partialMatchingImages,proto3" json:"partial_matching_images,omitempty"`
+	// Web pages containing the matching images from the Internet.
+	PagesWithMatchingImages []*WebDetection_WebPage `protobuf:"bytes,4,rep,name=pages_with_matching_images,json=pagesWithMatchingImages,proto3" json:"pages_with_matching_images,omitempty"`
+	// The visually similar image results.
+	VisuallySimilarImages []*WebDetection_WebImage `protobuf:"bytes,6,rep,name=visually_similar_images,json=visuallySimilarImages,proto3" json:"visually_similar_images,omitempty"`
+	// Best guess text labels for the request image.
+	BestGuessLabels      []*WebDetection_WebLabel `protobuf:"bytes,8,rep,name=best_guess_labels,json=bestGuessLabels,proto3" json:"best_guess_labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *WebDetection) Reset()         { *m = WebDetection{} }
+func (m *WebDetection) String() string { return proto.CompactTextString(m) }
+func (*WebDetection) ProtoMessage()    {}
+func (*WebDetection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_48b1ad42bf628bbe, []int{0}
+}
+func (m *WebDetection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection.Unmarshal(m, b)
+}
+func (m *WebDetection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection.Merge(dst, src)
+}
+func (m *WebDetection) XXX_Size() int {
+	return xxx_messageInfo_WebDetection.Size(m)
+}
+func (m *WebDetection) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection proto.InternalMessageInfo
+
+func (m *WebDetection) GetWebEntities() []*WebDetection_WebEntity {
+	if m != nil {
+		return m.WebEntities
+	}
+	return nil
+}
+
+func (m *WebDetection) GetFullMatchingImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.FullMatchingImages
+	}
+	return nil
+}
+
+func (m *WebDetection) GetPartialMatchingImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.PartialMatchingImages
+	}
+	return nil
+}
+
+func (m *WebDetection) GetPagesWithMatchingImages() []*WebDetection_WebPage {
+	if m != nil {
+		return m.PagesWithMatchingImages
+	}
+	return nil
+}
+
+func (m *WebDetection) GetVisuallySimilarImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.VisuallySimilarImages
+	}
+	return nil
+}
+
+func (m *WebDetection) GetBestGuessLabels() []*WebDetection_WebLabel {
+	if m != nil {
+		return m.BestGuessLabels
+	}
+	return nil
+}
+
+// Entity deduced from similar images on the Internet.
+type WebDetection_WebEntity struct {
+	// Opaque entity ID.
+	EntityId string `protobuf:"bytes,1,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
+	// Overall relevancy score for the entity.
+	// Not normalized and not comparable across different image queries.
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	// Canonical description of the entity, in English.
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetection_WebEntity) Reset()         { *m = WebDetection_WebEntity{} }
+func (m *WebDetection_WebEntity) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebEntity) ProtoMessage()    {}
+func (*WebDetection_WebEntity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_48b1ad42bf628bbe, []int{0, 0}
+}
+func (m *WebDetection_WebEntity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebEntity.Unmarshal(m, b)
+}
+func (m *WebDetection_WebEntity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebEntity.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebEntity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebEntity.Merge(dst, src)
+}
+func (m *WebDetection_WebEntity) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebEntity.Size(m)
+}
+func (m *WebDetection_WebEntity) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebEntity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebEntity proto.InternalMessageInfo
+
+func (m *WebDetection_WebEntity) GetEntityId() string {
+	if m != nil {
+		return m.EntityId
+	}
+	return ""
+}
+
+func (m *WebDetection_WebEntity) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *WebDetection_WebEntity) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+// Metadata for online images.
+type WebDetection_WebImage struct {
+	// The result image URL.
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	// (Deprecated) Overall relevancy score for the image.
+	Score                float32  `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetection_WebImage) Reset()         { *m = WebDetection_WebImage{} }
+func (m *WebDetection_WebImage) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebImage) ProtoMessage()    {}
+func (*WebDetection_WebImage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_48b1ad42bf628bbe, []int{0, 1}
+}
+func (m *WebDetection_WebImage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebImage.Unmarshal(m, b)
+}
+func (m *WebDetection_WebImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebImage.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebImage.Merge(dst, src)
+}
+func (m *WebDetection_WebImage) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebImage.Size(m)
+}
+func (m *WebDetection_WebImage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebImage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebImage proto.InternalMessageInfo
+
+func (m *WebDetection_WebImage) GetUrl() string {
+	if m != nil {
+		return m.Url
+	}
+	return ""
+}
+
+func (m *WebDetection_WebImage) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+// Metadata for web pages.
+type WebDetection_WebPage struct {
+	// The result web page URL.
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	// (Deprecated) Overall relevancy score for the web page.
+	Score float32 `protobuf:"fixed32,2,opt,name=score,proto3" json:"score,omitempty"`
+	// Title for the web page, may contain HTML markups.
+	PageTitle string `protobuf:"bytes,3,opt,name=page_title,json=pageTitle,proto3" json:"page_title,omitempty"`
+	// Fully matching images on the page.
+	// Can include resized copies of the query image.
+	FullMatchingImages []*WebDetection_WebImage `protobuf:"bytes,4,rep,name=full_matching_images,json=fullMatchingImages,proto3" json:"full_matching_images,omitempty"`
+	// Partial matching images on the page.
+	// Those images are similar enough to share some key-point features. For
+	// example an original image will likely have partial matching for its
+	// crops.
+	PartialMatchingImages []*WebDetection_WebImage `protobuf:"bytes,5,rep,name=partial_matching_images,json=partialMatchingImages,proto3" json:"partial_matching_images,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}                 `json:"-"`
+	XXX_unrecognized      []byte                   `json:"-"`
+	XXX_sizecache         int32                    `json:"-"`
+}
+
+func (m *WebDetection_WebPage) Reset()         { *m = WebDetection_WebPage{} }
+func (m *WebDetection_WebPage) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebPage) ProtoMessage()    {}
+func (*WebDetection_WebPage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_48b1ad42bf628bbe, []int{0, 2}
+}
+func (m *WebDetection_WebPage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebPage.Unmarshal(m, b)
+}
+func (m *WebDetection_WebPage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebPage.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebPage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebPage.Merge(dst, src)
+}
+func (m *WebDetection_WebPage) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebPage.Size(m)
+}
+func (m *WebDetection_WebPage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebPage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebPage proto.InternalMessageInfo
+
+func (m *WebDetection_WebPage) GetUrl() string {
+	if m != nil {
+		return m.Url
+	}
+	return ""
+}
+
+func (m *WebDetection_WebPage) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *WebDetection_WebPage) GetPageTitle() string {
+	if m != nil {
+		return m.PageTitle
+	}
+	return ""
+}
+
+func (m *WebDetection_WebPage) GetFullMatchingImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.FullMatchingImages
+	}
+	return nil
+}
+
+func (m *WebDetection_WebPage) GetPartialMatchingImages() []*WebDetection_WebImage {
+	if m != nil {
+		return m.PartialMatchingImages
+	}
+	return nil
+}
+
+// Label to provide extra metadata for the web detection.
+type WebDetection_WebLabel struct {
+	// Label for extra metadata.
+	Label string `protobuf:"bytes,1,opt,name=label,proto3" json:"label,omitempty"`
+	// The BCP-47 language code for `label`, such as "en-US" or "sr-Latn".
+	// For more information, see
+	// http://www.unicode.org/reports/tr35/#Unicode_locale_identifier.
+	LanguageCode         string   `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WebDetection_WebLabel) Reset()         { *m = WebDetection_WebLabel{} }
+func (m *WebDetection_WebLabel) String() string { return proto.CompactTextString(m) }
+func (*WebDetection_WebLabel) ProtoMessage()    {}
+func (*WebDetection_WebLabel) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_detection_48b1ad42bf628bbe, []int{0, 3}
+}
+func (m *WebDetection_WebLabel) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WebDetection_WebLabel.Unmarshal(m, b)
+}
+func (m *WebDetection_WebLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WebDetection_WebLabel.Marshal(b, m, deterministic)
+}
+func (dst *WebDetection_WebLabel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WebDetection_WebLabel.Merge(dst, src)
+}
+func (m *WebDetection_WebLabel) XXX_Size() int {
+	return xxx_messageInfo_WebDetection_WebLabel.Size(m)
+}
+func (m *WebDetection_WebLabel) XXX_DiscardUnknown() {
+	xxx_messageInfo_WebDetection_WebLabel.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WebDetection_WebLabel proto.InternalMessageInfo
+
+func (m *WebDetection_WebLabel) GetLabel() string {
+	if m != nil {
+		return m.Label
+	}
+	return ""
+}
+
+func (m *WebDetection_WebLabel) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*WebDetection)(nil), "google.cloud.vision.v1p3beta1.WebDetection")
+	proto.RegisterType((*WebDetection_WebEntity)(nil), "google.cloud.vision.v1p3beta1.WebDetection.WebEntity")
+	proto.RegisterType((*WebDetection_WebImage)(nil), "google.cloud.vision.v1p3beta1.WebDetection.WebImage")
+	proto.RegisterType((*WebDetection_WebPage)(nil), "google.cloud.vision.v1p3beta1.WebDetection.WebPage")
+	proto.RegisterType((*WebDetection_WebLabel)(nil), "google.cloud.vision.v1p3beta1.WebDetection.WebLabel")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/vision/v1p3beta1/web_detection.proto", fileDescriptor_web_detection_48b1ad42bf628bbe)
+}
+
+var fileDescriptor_web_detection_48b1ad42bf628bbe = []byte{
+	// 511 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
+	0x18, 0xc6, 0x95, 0x76, 0x1b, 0x8d, 0x5b, 0x04, 0xb3, 0x86, 0x16, 0x05, 0x26, 0x15, 0xb8, 0xf4,
+	0x94, 0xa8, 0x2b, 0x9c, 0xb8, 0x6d, 0x4c, 0x68, 0x12, 0x48, 0x55, 0x40, 0x1a, 0xe2, 0x92, 0x39,
+	0x89, 0x97, 0xbe, 0x92, 0x1b, 0x47, 0xb1, 0xd3, 0xaa, 0x37, 0x4e, 0x7c, 0x14, 0x3e, 0x23, 0x47,
+	0xf4, 0xda, 0xee, 0x54, 0x51, 0x36, 0x31, 0x86, 0xb8, 0xf9, 0x7d, 0xac, 0xe7, 0xf9, 0xd9, 0xaf,
+	0xff, 0x90, 0x71, 0x29, 0x65, 0x29, 0x78, 0x9c, 0x0b, 0xd9, 0x16, 0xf1, 0x02, 0x14, 0xc8, 0x2a,
+	0x5e, 0x8c, 0xeb, 0x49, 0xc6, 0x35, 0x1b, 0xc7, 0x4b, 0x9e, 0xa5, 0x05, 0xd7, 0x3c, 0xd7, 0x20,
+	0xab, 0xa8, 0x6e, 0xa4, 0x96, 0xf4, 0xc8, 0x5a, 0x22, 0x63, 0x89, 0xac, 0x25, 0xba, 0xb6, 0x84,
+	0xcf, 0x5c, 0x22, 0xab, 0x21, 0x66, 0x55, 0x25, 0x35, 0x43, 0xaf, 0xb2, 0xe6, 0x17, 0xdf, 0x7c,
+	0x32, 0xb8, 0xe0, 0xd9, 0xdb, 0x75, 0x26, 0xfd, 0x4c, 0x06, 0x08, 0xe1, 0x95, 0x06, 0x0d, 0x5c,
+	0x05, 0xde, 0xb0, 0x3b, 0xea, 0x1f, 0xbf, 0x8e, 0x6e, 0x85, 0x44, 0x9b, 0x11, 0x58, 0x9c, 0xa1,
+	0x7d, 0x95, 0xf4, 0x97, 0x6e, 0x08, 0x5c, 0xd1, 0x2b, 0x72, 0x70, 0xd5, 0x0a, 0x91, 0xce, 0x99,
+	0xce, 0x67, 0x50, 0x95, 0x29, 0xcc, 0x59, 0xc9, 0x55, 0xd0, 0x31, 0x84, 0x57, 0x77, 0x24, 0x9c,
+	0xa3, 0x39, 0xa1, 0x98, 0xf8, 0xc1, 0x05, 0x1a, 0x49, 0x51, 0x41, 0x0e, 0x6b, 0xd6, 0x68, 0x60,
+	0xdb, 0xa8, 0xee, 0x3d, 0x50, 0x4f, 0x5c, 0xe8, 0x2f, 0xb4, 0x9a, 0x84, 0x35, 0x0e, 0xd2, 0x25,
+	0xe8, 0xd9, 0x16, 0x70, 0xc7, 0x00, 0x27, 0x77, 0x04, 0x4e, 0x91, 0x77, 0x68, 0x62, 0x2f, 0x40,
+	0xcf, 0xb6, 0xf7, 0xb7, 0x00, 0xd5, 0x32, 0x21, 0x56, 0xa9, 0x82, 0x39, 0x08, 0xd6, 0xac, 0x71,
+	0x7b, 0xf7, 0xd9, 0xdf, 0x3a, 0xf4, 0xa3, 0xcd, 0x74, 0xb4, 0x4b, 0xb2, 0x9f, 0x71, 0xa5, 0xd3,
+	0xb2, 0xe5, 0x4a, 0xa5, 0x82, 0x65, 0x5c, 0xa8, 0xa0, 0xf7, 0x57, 0x9c, 0xf7, 0x68, 0x4e, 0x1e,
+	0x61, 0xdc, 0x3b, 0x4c, 0x33, 0xb5, 0x0a, 0x2f, 0x89, 0x7f, 0x7d, 0x63, 0xe8, 0x53, 0xe2, 0x9b,
+	0xab, 0xb7, 0x4a, 0xa1, 0x08, 0xbc, 0xa1, 0x37, 0xf2, 0x93, 0x9e, 0x15, 0xce, 0x0b, 0x7a, 0x40,
+	0x76, 0x55, 0x2e, 0x1b, 0x1e, 0x74, 0x86, 0xde, 0xa8, 0x93, 0xd8, 0x82, 0x0e, 0x49, 0xbf, 0xe0,
+	0x2a, 0x6f, 0xa0, 0x46, 0x50, 0xd0, 0x35, 0xa6, 0x4d, 0x29, 0x3c, 0x26, 0xbd, 0xf5, 0x36, 0xe9,
+	0x63, 0xd2, 0x6d, 0x1b, 0xe1, 0xa2, 0x71, 0xf8, 0xfb, 0xd4, 0xf0, 0x7b, 0x87, 0x3c, 0x70, 0x47,
+	0xf1, 0xa7, 0x1e, 0x7a, 0x44, 0x08, 0x1e, 0x5a, 0xaa, 0x41, 0x0b, 0xee, 0x16, 0xe2, 0xa3, 0xf2,
+	0x09, 0x85, 0x1b, 0x1f, 0xc0, 0xce, 0xff, 0x7b, 0x00, 0xbb, 0xff, 0xfc, 0x01, 0x84, 0x67, 0xa6,
+	0xb9, 0xe6, 0x2c, 0xb1, 0x2d, 0xe6, 0x86, 0xb8, 0x56, 0xd9, 0x82, 0xbe, 0x24, 0x0f, 0x05, 0xab,
+	0xca, 0x16, 0x5b, 0x93, 0xcb, 0xc2, 0x36, 0xcd, 0x4f, 0x06, 0x6b, 0xf1, 0x54, 0x16, 0xfc, 0xe4,
+	0xab, 0x47, 0x9e, 0xe7, 0x72, 0x7e, 0xfb, 0xca, 0x4e, 0xf6, 0x37, 0x97, 0x36, 0xc5, 0x1f, 0x6c,
+	0xea, 0x7d, 0x39, 0x75, 0x9e, 0x52, 0x62, 0x62, 0x24, 0x9b, 0x32, 0x2e, 0x79, 0x65, 0xfe, 0xb7,
+	0xd8, 0x4e, 0xb1, 0x1a, 0xd4, 0x0d, 0x5f, 0xea, 0x1b, 0x2b, 0xfc, 0xf0, 0xbc, 0x6c, 0xcf, 0x58,
+	0x26, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xb6, 0x81, 0x34, 0x84, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go
new file mode 100644
index 00000000..7ffb7f5b
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/crawled_url.pb.go
@@ -0,0 +1,111 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/websecurityscanner/v1alpha/crawled_url.proto
+
+package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A CrawledUrl resource represents a URL that was crawled during a ScanRun. Web
+// Security Scanner Service crawls the web applications, following all links
+// within the scope of sites, to find the URLs to test against.
+type CrawledUrl struct {
+	// Output only.
+	// The http method of the request that was used to visit the URL, in
+	// uppercase.
+	HttpMethod string `protobuf:"bytes,1,opt,name=http_method,json=httpMethod,proto3" json:"http_method,omitempty"`
+	// Output only.
+	// The URL that was crawled.
+	Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"`
+	// Output only.
+	// The body of the request that was used to visit the URL.
+	Body                 string   `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CrawledUrl) Reset()         { *m = CrawledUrl{} }
+func (m *CrawledUrl) String() string { return proto.CompactTextString(m) }
+func (*CrawledUrl) ProtoMessage()    {}
+func (*CrawledUrl) Descriptor() ([]byte, []int) {
+	return fileDescriptor_crawled_url_b553fc5280c7b49d, []int{0}
+}
+func (m *CrawledUrl) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CrawledUrl.Unmarshal(m, b)
+}
+func (m *CrawledUrl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CrawledUrl.Marshal(b, m, deterministic)
+}
+func (dst *CrawledUrl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CrawledUrl.Merge(dst, src)
+}
+func (m *CrawledUrl) XXX_Size() int {
+	return xxx_messageInfo_CrawledUrl.Size(m)
+}
+func (m *CrawledUrl) XXX_DiscardUnknown() {
+	xxx_messageInfo_CrawledUrl.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CrawledUrl proto.InternalMessageInfo
+
+func (m *CrawledUrl) GetHttpMethod() string {
+	if m != nil {
+		return m.HttpMethod
+	}
+	return ""
+}
+
+func (m *CrawledUrl) GetUrl() string {
+	if m != nil {
+		return m.Url
+	}
+	return ""
+}
+
+func (m *CrawledUrl) GetBody() string {
+	if m != nil {
+		return m.Body
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*CrawledUrl)(nil), "google.cloud.websecurityscanner.v1alpha.CrawledUrl")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/crawled_url.proto", fileDescriptor_crawled_url_b553fc5280c7b49d)
+}
+
+var fileDescriptor_crawled_url_b553fc5280c7b49d = []byte{
+	// 235 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x31, 0x4b, 0x04, 0x31,
+	0x10, 0x85, 0x59, 0x4f, 0x04, 0xc7, 0x42, 0x49, 0xb5, 0x88, 0xa0, 0xd8, 0x28, 0x08, 0x09, 0x62,
+	0x25, 0x76, 0x67, 0x2d, 0x1c, 0x8a, 0x85, 0x36, 0xc7, 0x6c, 0x36, 0x64, 0x17, 0xe6, 0x32, 0x61,
+	0x36, 0xeb, 0x71, 0xbf, 0xc5, 0x3f, 0x2b, 0x9b, 0x2c, 0x58, 0x5c, 0xa1, 0xdd, 0xf0, 0x1e, 0xdf,
+	0xcb, 0x47, 0xe0, 0xd1, 0x33, 0x7b, 0x72, 0xc6, 0x12, 0x8f, 0xad, 0xd9, 0xba, 0x66, 0x70, 0x76,
+	0x94, 0x3e, 0xed, 0x06, 0x8b, 0x21, 0x38, 0x31, 0x5f, 0xf7, 0x48, 0xb1, 0x43, 0x63, 0x05, 0xb7,
+	0xe4, 0xda, 0xf5, 0x28, 0xa4, 0xa3, 0x70, 0x62, 0x75, 0x53, 0x50, 0x9d, 0x51, 0xbd, 0x8f, 0xea,
+	0x19, 0x3d, 0xbf, 0x98, 0xdf, 0xc0, 0xd8, 0x1b, 0x0c, 0x81, 0x13, 0xa6, 0x9e, 0xc3, 0x50, 0x66,
+	0xae, 0xdf, 0x00, 0x9e, 0xcb, 0xf6, 0xbb, 0x90, 0xba, 0x84, 0x93, 0x2e, 0xa5, 0xb8, 0xde, 0xb8,
+	0xd4, 0x71, 0x5b, 0x57, 0x57, 0xd5, 0xed, 0xf1, 0x2b, 0x4c, 0xd1, 0x4b, 0x4e, 0xd4, 0x19, 0x2c,
+	0x46, 0xa1, 0xfa, 0x20, 0x17, 0xd3, 0xa9, 0x14, 0x1c, 0x36, 0xdc, 0xee, 0xea, 0x45, 0x8e, 0xf2,
+	0xbd, 0xfc, 0xae, 0xe0, 0xce, 0xf2, 0x46, 0xff, 0x53, 0x71, 0x79, 0xfa, 0xab, 0xb0, 0x9a, 0xac,
+	0x56, 0xd5, 0xe7, 0xc7, 0xcc, 0x7a, 0x26, 0x0c, 0x5e, 0xb3, 0x78, 0xe3, 0x5d, 0xc8, 0xce, 0xa6,
+	0x54, 0x18, 0xfb, 0xe1, 0xcf, 0x8f, 0x7b, 0xda, 0xaf, 0x9a, 0xa3, 0xbc, 0xf2, 0xf0, 0x13, 0x00,
+	0x00, 0xff, 0xff, 0x7b, 0x55, 0xd9, 0x73, 0x7d, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go
new file mode 100644
index 00000000..1d93b36c
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding.pb.go
@@ -0,0 +1,322 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/websecurityscanner/v1alpha/finding.proto
+
+package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Types of Findings.
+type Finding_FindingType int32
+
+const (
+	// The invalid finding type.
+	Finding_FINDING_TYPE_UNSPECIFIED Finding_FindingType = 0
+	// A page that was served over HTTPS also resources over HTTP. A
+	// man-in-the-middle attacker could tamper with the HTTP resource and gain
+	// full access to the website that loads the resource or to monitor the
+	// actions taken by the user.
+	Finding_MIXED_CONTENT Finding_FindingType = 1
+	// The version of an included library is known to contain a security issue.
+	// The scanner checks the version of library in use against a known list of
+	// vulnerable libraries. False positives are possible if the version
+	// detection fails or if the library has been manually patched.
+	Finding_OUTDATED_LIBRARY Finding_FindingType = 2
+	// This type of vulnerability occurs when the value of a request parameter
+	// is reflected at the beginning of the response, for example, in requests
+	// using JSONP. Under certain circumstances, an attacker may be able to
+	// supply an alphanumeric-only Flash file in the vulnerable parameter
+	// causing the browser to execute the Flash file as if it originated on the
+	// vulnerable server.
+	Finding_ROSETTA_FLASH Finding_FindingType = 5
+	// A cross-site scripting (XSS) bug is found via JavaScript callback. For
+	// detailed explanations on XSS, see
+	// https://www.google.com/about/appsecurity/learning/xss/.
+	Finding_XSS_CALLBACK Finding_FindingType = 3
+	// A potential cross-site scripting (XSS) bug due to JavaScript breakage.
+	// In some circumstances, the application under test might modify the test
+	// string before it is parsed by the browser. When the browser attempts to
+	// runs this modified test string, it will likely break and throw a
+	// JavaScript execution error, thus an injection issue is occurring.
+	// However, it may not be exploitable. Manual verification is needed to see
+	// if the test string modifications can be evaded and confirm that the issue
+	// is in fact an XSS vulnerability. For detailed explanations on XSS, see
+	// https://www.google.com/about/appsecurity/learning/xss/.
+	Finding_XSS_ERROR Finding_FindingType = 4
+	// An application appears to be transmitting a password field in clear text.
+	// An attacker can eavesdrop network traffic and sniff the password field.
+	Finding_CLEAR_TEXT_PASSWORD Finding_FindingType = 6
+)
+
+var Finding_FindingType_name = map[int32]string{
+	0: "FINDING_TYPE_UNSPECIFIED",
+	1: "MIXED_CONTENT",
+	2: "OUTDATED_LIBRARY",
+	5: "ROSETTA_FLASH",
+	3: "XSS_CALLBACK",
+	4: "XSS_ERROR",
+	6: "CLEAR_TEXT_PASSWORD",
+}
+var Finding_FindingType_value = map[string]int32{
+	"FINDING_TYPE_UNSPECIFIED": 0,
+	"MIXED_CONTENT":            1,
+	"OUTDATED_LIBRARY":         2,
+	"ROSETTA_FLASH":            5,
+	"XSS_CALLBACK":             3,
+	"XSS_ERROR":                4,
+	"CLEAR_TEXT_PASSWORD":      6,
+}
+
+func (x Finding_FindingType) String() string {
+	return proto.EnumName(Finding_FindingType_name, int32(x))
+}
+func (Finding_FindingType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_finding_48bce3fbd749d4f0, []int{0, 0}
+}
+
+// A Finding resource represents a vulnerability instance identified during a
+// ScanRun.
+type Finding struct {
+	// Output only.
+	// The resource name of the Finding. The name follows the format of
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+	// The finding IDs are generated by the system.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Output only.
+	// The type of the Finding.
+	FindingType Finding_FindingType `protobuf:"varint,2,opt,name=finding_type,json=findingType,proto3,enum=google.cloud.websecurityscanner.v1alpha.Finding_FindingType" json:"finding_type,omitempty"`
+	// Output only.
+	// The http method of the request that triggered the vulnerability, in
+	// uppercase.
+	HttpMethod string `protobuf:"bytes,3,opt,name=http_method,json=httpMethod,proto3" json:"http_method,omitempty"`
+	// Output only.
+	// The URL produced by the server-side fuzzer and used in the request that
+	// triggered the vulnerability.
+	FuzzedUrl string `protobuf:"bytes,4,opt,name=fuzzed_url,json=fuzzedUrl,proto3" json:"fuzzed_url,omitempty"`
+	// Output only.
+	// The body of the request that triggered the vulnerability.
+	Body string `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"`
+	// Output only.
+	// The description of the vulnerability.
+	Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"`
+	// Output only.
+	// The URL containing human-readable payload that user can leverage to
+	// reproduce the vulnerability.
+	ReproductionUrl string `protobuf:"bytes,7,opt,name=reproduction_url,json=reproductionUrl,proto3" json:"reproduction_url,omitempty"`
+	// Output only.
+	// If the vulnerability was originated from nested IFrame, the immediate
+	// parent IFrame is reported.
+	FrameUrl string `protobuf:"bytes,8,opt,name=frame_url,json=frameUrl,proto3" json:"frame_url,omitempty"`
+	// Output only.
+	// The URL where the browser lands when the vulnerability is detected.
+	FinalUrl string `protobuf:"bytes,9,opt,name=final_url,json=finalUrl,proto3" json:"final_url,omitempty"`
+	// Output only.
+	// The tracking ID uniquely identifies a vulnerability instance across
+	// multiple ScanRuns.
+	TrackingId string `protobuf:"bytes,10,opt,name=tracking_id,json=trackingId,proto3" json:"tracking_id,omitempty"`
+	// Output only.
+	// An addon containing information about outdated libraries.
+	OutdatedLibrary *OutdatedLibrary `protobuf:"bytes,11,opt,name=outdated_library,json=outdatedLibrary,proto3" json:"outdated_library,omitempty"`
+	// Output only.
+	// An addon containing detailed information regarding any resource causing the
+	// vulnerability such as JavaScript sources, image, audio files, etc.
+	ViolatingResource *ViolatingResource `protobuf:"bytes,12,opt,name=violating_resource,json=violatingResource,proto3" json:"violating_resource,omitempty"`
+	// Output only.
+	// An addon containing information about request parameters which were found
+	// to be vulnerable.
+	VulnerableParameters *VulnerableParameters `protobuf:"bytes,13,opt,name=vulnerable_parameters,json=vulnerableParameters,proto3" json:"vulnerable_parameters,omitempty"`
+	// Output only.
+	// An addon containing information reported for an XSS, if any.
+	Xss                  *Xss     `protobuf:"bytes,14,opt,name=xss,proto3" json:"xss,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Finding) Reset()         { *m = Finding{} }
+func (m *Finding) String() string { return proto.CompactTextString(m) }
+func (*Finding) ProtoMessage()    {}
+func (*Finding) Descriptor() ([]byte, []int) {
+	return fileDescriptor_finding_48bce3fbd749d4f0, []int{0}
+}
+func (m *Finding) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Finding.Unmarshal(m, b)
+}
+func (m *Finding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Finding.Marshal(b, m, deterministic)
+}
+func (dst *Finding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Finding.Merge(dst, src)
+}
+func (m *Finding) XXX_Size() int {
+	return xxx_messageInfo_Finding.Size(m)
+}
+func (m *Finding) XXX_DiscardUnknown() {
+	xxx_messageInfo_Finding.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Finding proto.InternalMessageInfo
+
+func (m *Finding) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Finding) GetFindingType() Finding_FindingType {
+	if m != nil {
+		return m.FindingType
+	}
+	return Finding_FINDING_TYPE_UNSPECIFIED
+}
+
+func (m *Finding) GetHttpMethod() string {
+	if m != nil {
+		return m.HttpMethod
+	}
+	return ""
+}
+
+func (m *Finding) GetFuzzedUrl() string {
+	if m != nil {
+		return m.FuzzedUrl
+	}
+	return ""
+}
+
+func (m *Finding) GetBody() string {
+	if m != nil {
+		return m.Body
+	}
+	return ""
+}
+
+func (m *Finding) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *Finding) GetReproductionUrl() string {
+	if m != nil {
+		return m.ReproductionUrl
+	}
+	return ""
+}
+
+func (m *Finding) GetFrameUrl() string {
+	if m != nil {
+		return m.FrameUrl
+	}
+	return ""
+}
+
+func (m *Finding) GetFinalUrl() string {
+	if m != nil {
+		return m.FinalUrl
+	}
+	return ""
+}
+
+func (m *Finding) GetTrackingId() string {
+	if m != nil {
+		return m.TrackingId
+	}
+	return ""
+}
+
+func (m *Finding) GetOutdatedLibrary() *OutdatedLibrary {
+	if m != nil {
+		return m.OutdatedLibrary
+	}
+	return nil
+}
+
+func (m *Finding) GetViolatingResource() *ViolatingResource {
+	if m != nil {
+		return m.ViolatingResource
+	}
+	return nil
+}
+
+func (m *Finding) GetVulnerableParameters() *VulnerableParameters {
+	if m != nil {
+		return m.VulnerableParameters
+	}
+	return nil
+}
+
+func (m *Finding) GetXss() *Xss {
+	if m != nil {
+		return m.Xss
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Finding)(nil), "google.cloud.websecurityscanner.v1alpha.Finding")
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.Finding_FindingType", Finding_FindingType_name, Finding_FindingType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding.proto", fileDescriptor_finding_48bce3fbd749d4f0)
+}
+
+var fileDescriptor_finding_48bce3fbd749d4f0 = []byte{
+	// 631 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5f, 0x6f, 0xd3, 0x3e,
+	0x14, 0xfd, 0x65, 0xff, 0xeb, 0x74, 0x5b, 0xe6, 0xdf, 0x10, 0xd1, 0x18, 0x5a, 0xb5, 0x17, 0x86,
+	0x40, 0x89, 0x18, 0x42, 0x42, 0x0c, 0x90, 0xd2, 0x36, 0x85, 0x88, 0xae, 0xad, 0x9c, 0x0c, 0x3a,
+	0x5e, 0x2c, 0x37, 0x71, 0xb3, 0x88, 0x34, 0x8e, 0x9c, 0xa4, 0xd0, 0x7d, 0x12, 0x5e, 0xe1, 0x93,
+	0x22, 0x3b, 0xe9, 0x28, 0x0c, 0x89, 0xf2, 0x54, 0xfb, 0x9c, 0x7b, 0xce, 0xb9, 0xf7, 0xaa, 0x31,
+	0x78, 0x16, 0x32, 0x16, 0xc6, 0xd4, 0xf4, 0x63, 0x56, 0x04, 0xe6, 0x67, 0x3a, 0xca, 0xa8, 0x5f,
+	0xf0, 0x28, 0x9f, 0x65, 0x3e, 0x49, 0x12, 0xca, 0xcd, 0xe9, 0x13, 0x12, 0xa7, 0x57, 0xc4, 0x1c,
+	0x47, 0x49, 0x10, 0x25, 0xa1, 0x91, 0x72, 0x96, 0x33, 0xf8, 0xa0, 0x94, 0x19, 0x52, 0x66, 0xdc,
+	0x96, 0x19, 0x95, 0xec, 0xe0, 0xb0, 0xf2, 0x27, 0x69, 0x64, 0x92, 0x24, 0x61, 0x39, 0xc9, 0x23,
+	0x96, 0x64, 0xa5, 0xcd, 0xc1, 0xd9, 0x3f, 0xa6, 0x63, 0x12, 0x04, 0x2c, 0x29, 0xc5, 0xc7, 0xdf,
+	0x37, 0xc1, 0x66, 0xa7, 0xc4, 0x21, 0x04, 0x6b, 0x09, 0x99, 0x50, 0x5d, 0x69, 0x28, 0x27, 0x35,
+	0x24, 0xcf, 0x10, 0x83, 0xfa, 0x5c, 0x96, 0xcf, 0x52, 0xaa, 0xaf, 0x34, 0x94, 0x93, 0x9d, 0xd3,
+	0x97, 0xc6, 0x92, 0xad, 0x1b, 0x95, 0xf7, 0xfc, 0xd7, 0x9b, 0xa5, 0x14, 0xa9, 0xe3, 0x9f, 0x17,
+	0x78, 0x04, 0xd4, 0xab, 0x3c, 0x4f, 0xf1, 0x84, 0xe6, 0x57, 0x2c, 0xd0, 0x57, 0x65, 0x36, 0x10,
+	0xd0, 0xb9, 0x44, 0xe0, 0x7d, 0x00, 0xc6, 0xc5, 0xf5, 0x35, 0x0d, 0x70, 0xc1, 0x63, 0x7d, 0x4d,
+	0xf2, 0xb5, 0x12, 0xb9, 0xe0, 0xb1, 0x68, 0x7a, 0xc4, 0x82, 0x99, 0xbe, 0x5e, 0x36, 0x2d, 0xce,
+	0xb0, 0x01, 0xd4, 0x80, 0x66, 0x3e, 0x8f, 0x52, 0xb1, 0x27, 0x7d, 0x43, 0x52, 0x8b, 0x10, 0x7c,
+	0x08, 0x34, 0x4e, 0x53, 0xce, 0x82, 0xc2, 0x17, 0x77, 0x69, 0xbd, 0x29, 0xcb, 0x76, 0x17, 0x71,
+	0x11, 0x70, 0x0f, 0xd4, 0xc6, 0x9c, 0x4c, 0xa8, 0xac, 0xd9, 0x92, 0x35, 0x5b, 0x12, 0x98, 0x93,
+	0x51, 0x42, 0x62, 0x49, 0xd6, 0x2a, 0x52, 0x00, 0x82, 0x3c, 0x02, 0x6a, 0xce, 0x89, 0xff, 0x49,
+	0x2c, 0x2f, 0x0a, 0x74, 0x50, 0x8e, 0x36, 0x87, 0x9c, 0x00, 0xfa, 0x40, 0x63, 0x45, 0x1e, 0x90,
+	0x9c, 0x06, 0x38, 0x8e, 0x46, 0x9c, 0xf0, 0x99, 0xae, 0x36, 0x94, 0x13, 0xf5, 0xf4, 0xf9, 0xd2,
+	0x0b, 0xee, 0x57, 0x06, 0xdd, 0x52, 0x8f, 0x76, 0xd9, 0xaf, 0x00, 0x8c, 0x00, 0x9c, 0x46, 0x2c,
+	0x26, 0xb9, 0x68, 0x83, 0xd3, 0x8c, 0x15, 0xdc, 0xa7, 0x7a, 0x5d, 0xc6, 0xbc, 0x58, 0x3a, 0xe6,
+	0xfd, 0xdc, 0x02, 0x55, 0x0e, 0x68, 0x6f, 0xfa, 0x3b, 0x04, 0x39, 0xb8, 0x33, 0x2d, 0xe2, 0x84,
+	0x72, 0x32, 0x8a, 0x29, 0x4e, 0x89, 0xd8, 0x52, 0x4e, 0x79, 0xa6, 0x6f, 0xcb, 0xb4, 0x57, 0xcb,
+	0xa7, 0xdd, 0xb8, 0x0c, 0x6e, 0x4c, 0xd0, 0xfe, 0xf4, 0x0f, 0x28, 0x7c, 0x0d, 0x56, 0xbf, 0x64,
+	0x99, 0xbe, 0x23, 0x13, 0x1e, 0x2f, 0x9d, 0x30, 0xcc, 0x32, 0x24, 0x84, 0xc7, 0xdf, 0x14, 0xa0,
+	0x2e, 0xfc, 0x39, 0xe1, 0x21, 0xd0, 0x3b, 0x4e, 0xaf, 0xed, 0xf4, 0xde, 0x60, 0xef, 0x72, 0x60,
+	0xe3, 0x8b, 0x9e, 0x3b, 0xb0, 0x5b, 0x4e, 0xc7, 0xb1, 0xdb, 0xda, 0x7f, 0x70, 0x0f, 0x6c, 0x9f,
+	0x3b, 0x43, 0xbb, 0x8d, 0x5b, 0xfd, 0x9e, 0x67, 0xf7, 0x3c, 0x4d, 0x81, 0xfb, 0x40, 0xeb, 0x5f,
+	0x78, 0x6d, 0xcb, 0xb3, 0xdb, 0xb8, 0xeb, 0x34, 0x91, 0x85, 0x2e, 0xb5, 0x15, 0x51, 0x88, 0xfa,
+	0xae, 0xed, 0x79, 0x16, 0xee, 0x74, 0x2d, 0xf7, 0xad, 0xb6, 0x0e, 0x35, 0x50, 0x1f, 0xba, 0x2e,
+	0x6e, 0x59, 0xdd, 0x6e, 0xd3, 0x6a, 0xbd, 0xd3, 0x56, 0xe1, 0x36, 0xa8, 0x09, 0xc4, 0x46, 0xa8,
+	0x8f, 0xb4, 0x35, 0x78, 0x17, 0xfc, 0xdf, 0xea, 0xda, 0x16, 0xc2, 0x9e, 0x3d, 0xf4, 0xf0, 0xc0,
+	0x72, 0xdd, 0x0f, 0x7d, 0xd4, 0xd6, 0x36, 0x9a, 0x5f, 0x15, 0xf0, 0xc8, 0x67, 0x93, 0x65, 0x87,
+	0x6b, 0xd6, 0xab, 0x81, 0x06, 0xe2, 0x13, 0x1f, 0x28, 0x1f, 0x2f, 0x2b, 0x61, 0xc8, 0x62, 0x92,
+	0x84, 0x06, 0xe3, 0xa1, 0x19, 0xd2, 0x44, 0x3e, 0x00, 0x66, 0x49, 0x91, 0x34, 0xca, 0xfe, 0xfa,
+	0x80, 0x9c, 0xdd, 0xa6, 0x46, 0x1b, 0xd2, 0xe5, 0xe9, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8a,
+	0x7d, 0x4d, 0xc7, 0x03, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go
new file mode 100644
index 00000000..a6be3140
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding_addon.pb.go
@@ -0,0 +1,257 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Information reported for an outdated library.
+type OutdatedLibrary struct {
+	// The name of the outdated library.
+	LibraryName string `protobuf:"bytes,1,opt,name=library_name,json=libraryName,proto3" json:"library_name,omitempty"`
+	// The version number.
+	Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+	// URLs to learn more information about the vulnerabilities in the library.
+	LearnMoreUrls        []string `protobuf:"bytes,3,rep,name=learn_more_urls,json=learnMoreUrls,proto3" json:"learn_more_urls,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *OutdatedLibrary) Reset()         { *m = OutdatedLibrary{} }
+func (m *OutdatedLibrary) String() string { return proto.CompactTextString(m) }
+func (*OutdatedLibrary) ProtoMessage()    {}
+func (*OutdatedLibrary) Descriptor() ([]byte, []int) {
+	return fileDescriptor_finding_addon_10f44c23dab1483b, []int{0}
+}
+func (m *OutdatedLibrary) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutdatedLibrary.Unmarshal(m, b)
+}
+func (m *OutdatedLibrary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutdatedLibrary.Marshal(b, m, deterministic)
+}
+func (dst *OutdatedLibrary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutdatedLibrary.Merge(dst, src)
+}
+func (m *OutdatedLibrary) XXX_Size() int {
+	return xxx_messageInfo_OutdatedLibrary.Size(m)
+}
+func (m *OutdatedLibrary) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutdatedLibrary.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutdatedLibrary proto.InternalMessageInfo
+
+func (m *OutdatedLibrary) GetLibraryName() string {
+	if m != nil {
+		return m.LibraryName
+	}
+	return ""
+}
+
+func (m *OutdatedLibrary) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
+func (m *OutdatedLibrary) GetLearnMoreUrls() []string {
+	if m != nil {
+		return m.LearnMoreUrls
+	}
+	return nil
+}
+
+// Information regarding any resource causing the vulnerability such
+// as JavaScript sources, image, audio files, etc.
+type ViolatingResource struct {
+	// The MIME type of this resource.
+	ContentType string `protobuf:"bytes,1,opt,name=content_type,json=contentType,proto3" json:"content_type,omitempty"`
+	// URL of this violating resource.
+	ResourceUrl          string   `protobuf:"bytes,2,opt,name=resource_url,json=resourceUrl,proto3" json:"resource_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ViolatingResource) Reset()         { *m = ViolatingResource{} }
+func (m *ViolatingResource) String() string { return proto.CompactTextString(m) }
+func (*ViolatingResource) ProtoMessage()    {}
+func (*ViolatingResource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_finding_addon_10f44c23dab1483b, []int{1}
+}
+func (m *ViolatingResource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ViolatingResource.Unmarshal(m, b)
+}
+func (m *ViolatingResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ViolatingResource.Marshal(b, m, deterministic)
+}
+func (dst *ViolatingResource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ViolatingResource.Merge(dst, src)
+}
+func (m *ViolatingResource) XXX_Size() int {
+	return xxx_messageInfo_ViolatingResource.Size(m)
+}
+func (m *ViolatingResource) XXX_DiscardUnknown() {
+	xxx_messageInfo_ViolatingResource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ViolatingResource proto.InternalMessageInfo
+
+func (m *ViolatingResource) GetContentType() string {
+	if m != nil {
+		return m.ContentType
+	}
+	return ""
+}
+
+func (m *ViolatingResource) GetResourceUrl() string {
+	if m != nil {
+		return m.ResourceUrl
+	}
+	return ""
+}
+
+// Information about vulnerable request parameters.
+type VulnerableParameters struct {
+	// The vulnerable parameter names.
+	ParameterNames       []string `protobuf:"bytes,1,rep,name=parameter_names,json=parameterNames,proto3" json:"parameter_names,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *VulnerableParameters) Reset()         { *m = VulnerableParameters{} }
+func (m *VulnerableParameters) String() string { return proto.CompactTextString(m) }
+func (*VulnerableParameters) ProtoMessage()    {}
+func (*VulnerableParameters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_finding_addon_10f44c23dab1483b, []int{2}
+}
+func (m *VulnerableParameters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VulnerableParameters.Unmarshal(m, b)
+}
+func (m *VulnerableParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VulnerableParameters.Marshal(b, m, deterministic)
+}
+func (dst *VulnerableParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerableParameters.Merge(dst, src)
+}
+func (m *VulnerableParameters) XXX_Size() int {
+	return xxx_messageInfo_VulnerableParameters.Size(m)
+}
+func (m *VulnerableParameters) XXX_DiscardUnknown() {
+	xxx_messageInfo_VulnerableParameters.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VulnerableParameters proto.InternalMessageInfo
+
+func (m *VulnerableParameters) GetParameterNames() []string {
+	if m != nil {
+		return m.ParameterNames
+	}
+	return nil
+}
+
+// Information reported for an XSS.
+type Xss struct {
+	// Stack traces leading to the point where the XSS occurred.
+	StackTraces []string `protobuf:"bytes,1,rep,name=stack_traces,json=stackTraces,proto3" json:"stack_traces,omitempty"`
+	// An error message generated by a javascript breakage.
+	ErrorMessage         string   `protobuf:"bytes,2,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Xss) Reset()         { *m = Xss{} }
+func (m *Xss) String() string { return proto.CompactTextString(m) }
+func (*Xss) ProtoMessage()    {}
+func (*Xss) Descriptor() ([]byte, []int) {
+	return fileDescriptor_finding_addon_10f44c23dab1483b, []int{3}
+}
+func (m *Xss) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Xss.Unmarshal(m, b)
+}
+func (m *Xss) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Xss.Marshal(b, m, deterministic)
+}
+func (dst *Xss) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Xss.Merge(dst, src)
+}
+func (m *Xss) XXX_Size() int {
+	return xxx_messageInfo_Xss.Size(m)
+}
+func (m *Xss) XXX_DiscardUnknown() {
+	xxx_messageInfo_Xss.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Xss proto.InternalMessageInfo
+
+func (m *Xss) GetStackTraces() []string {
+	if m != nil {
+		return m.StackTraces
+	}
+	return nil
+}
+
+func (m *Xss) GetErrorMessage() string {
+	if m != nil {
+		return m.ErrorMessage
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*OutdatedLibrary)(nil), "google.cloud.websecurityscanner.v1alpha.OutdatedLibrary")
+	proto.RegisterType((*ViolatingResource)(nil), "google.cloud.websecurityscanner.v1alpha.ViolatingResource")
+	proto.RegisterType((*VulnerableParameters)(nil), "google.cloud.websecurityscanner.v1alpha.VulnerableParameters")
+	proto.RegisterType((*Xss)(nil), "google.cloud.websecurityscanner.v1alpha.Xss")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding_addon.proto", fileDescriptor_finding_addon_10f44c23dab1483b)
+}
+
+var fileDescriptor_finding_addon_10f44c23dab1483b = []byte{
+	// 388 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6b, 0xd4, 0x50,
+	0x10, 0xc6, 0x89, 0x0b, 0x4a, 0xdf, 0xb6, 0x2e, 0x0d, 0x1e, 0x82, 0x78, 0xa8, 0x2b, 0xd8, 0x82,
+	0x90, 0x20, 0x1e, 0x7b, 0x10, 0x7b, 0xf0, 0xe4, 0xea, 0xb2, 0xb4, 0xc5, 0x7a, 0x09, 0xb3, 0xc9,
+	0xf8, 0x7c, 0xf8, 0x32, 0x13, 0x66, 0x5e, 0x56, 0xf2, 0xc7, 0xf8, 0xbf, 0x4a, 0x5e, 0xb2, 0x7b,
+	0xd9, 0x83, 0xbd, 0xe5, 0xfd, 0x66, 0xbe, 0xf9, 0x66, 0xf8, 0x62, 0xae, 0x2d, 0xb3, 0xf5, 0x58,
+	0x54, 0x9e, 0xbb, 0xba, 0xf8, 0x83, 0x5b, 0xc5, 0xaa, 0x13, 0x17, 0x7a, 0xad, 0x80, 0x08, 0xa5,
+	0xd8, 0xbd, 0x07, 0xdf, 0xfe, 0x82, 0xe2, 0xa7, 0xa3, 0xda, 0x91, 0x2d, 0xa1, 0xae, 0x99, 0xf2,
+	0x56, 0x38, 0x70, 0x7a, 0x39, 0x8a, 0xf3, 0x28, 0xce, 0x8f, 0xc5, 0xf9, 0x24, 0x7e, 0xf9, 0x6a,
+	0x72, 0x81, 0xd6, 0x15, 0x40, 0xc4, 0x01, 0x82, 0x63, 0xd2, 0x71, 0xcc, 0x72, 0x67, 0x16, 0xdf,
+	0xba, 0x50, 0x43, 0xc0, 0xfa, 0x8b, 0xdb, 0x0a, 0x48, 0x9f, 0xbe, 0x36, 0xa7, 0x7e, 0xfc, 0x2c,
+	0x09, 0x1a, 0xcc, 0x92, 0x8b, 0xe4, 0xea, 0x64, 0x33, 0x9f, 0xd8, 0x57, 0x68, 0x30, 0xcd, 0xcc,
+	0xb3, 0x1d, 0x8a, 0x3a, 0xa6, 0xec, 0x49, 0xac, 0xee, 0x9f, 0xe9, 0x5b, 0xb3, 0xf0, 0x08, 0x42,
+	0x65, 0xc3, 0x82, 0x65, 0x27, 0x5e, 0xb3, 0xd9, 0xc5, 0xec, 0xea, 0x64, 0x73, 0x16, 0xf1, 0x8a,
+	0x05, 0xef, 0xc4, 0xeb, 0xf2, 0xc1, 0x9c, 0xdf, 0x3b, 0xf6, 0x10, 0x1c, 0xd9, 0x0d, 0x2a, 0x77,
+	0x52, 0xe1, 0xe0, 0x5c, 0x31, 0x05, 0xa4, 0x50, 0x86, 0xbe, 0x3d, 0x38, 0x4f, 0xec, 0xb6, 0x6f,
+	0x63, 0x8b, 0x4c, 0xed, 0xc3, 0xf4, 0xc9, 0x7e, 0xbe, 0x67, 0x77, 0xe2, 0x97, 0x1f, 0xcd, 0x8b,
+	0xfb, 0xce, 0x13, 0x0a, 0x6c, 0x3d, 0xae, 0x41, 0xa0, 0xc1, 0x80, 0xa2, 0xe9, 0xa5, 0x59, 0xb4,
+	0xfb, 0x57, 0xbc, 0x4c, 0xb3, 0x24, 0xae, 0xf6, 0xfc, 0x80, 0x87, 0xe3, 0x74, 0xb9, 0x32, 0xb3,
+	0xef, 0xaa, 0x83, 0x95, 0x06, 0xa8, 0x7e, 0x97, 0x41, 0xa0, 0x3a, 0x34, 0xcf, 0x23, 0xbb, 0x8d,
+	0x28, 0x7d, 0x63, 0xce, 0x50, 0x84, 0xa5, 0x6c, 0x50, 0x15, 0x2c, 0x4e, 0xeb, 0x9c, 0x46, 0xb8,
+	0x1a, 0xd9, 0xcd, 0xdf, 0xc4, 0xbc, 0xab, 0xb8, 0xc9, 0x1f, 0x19, 0xd8, 0xcd, 0xf9, 0xe7, 0x31,
+	0xee, 0x4f, 0x43, 0xda, 0xeb, 0x21, 0xa5, 0x75, 0xf2, 0xe3, 0x61, 0x52, 0x5b, 0xf6, 0x40, 0x36,
+	0x67, 0xb1, 0x85, 0x45, 0x8a, 0x19, 0x16, 0x63, 0x09, 0x5a, 0xa7, 0xff, 0xfd, 0x95, 0xae, 0x8f,
+	0x4b, 0xdb, 0xa7, 0x71, 0xca, 0x87, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x61, 0x84, 0x84,
+	0x8f, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go
new file mode 100644
index 00000000..0352e6fc
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/finding_type_stats.pb.go
@@ -0,0 +1,100 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
+
+package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A FindingTypeStats resource represents stats regarding a specific FindingType
+// of Findings under a given ScanRun.
+type FindingTypeStats struct {
+	// Output only.
+	// The finding type associated with the stats.
+	FindingType Finding_FindingType `protobuf:"varint,1,opt,name=finding_type,json=findingType,proto3,enum=google.cloud.websecurityscanner.v1alpha.Finding_FindingType" json:"finding_type,omitempty"`
+	// Output only.
+	// The count of findings belonging to this finding type.
+	FindingCount         int32    `protobuf:"varint,2,opt,name=finding_count,json=findingCount,proto3" json:"finding_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FindingTypeStats) Reset()         { *m = FindingTypeStats{} }
+func (m *FindingTypeStats) String() string { return proto.CompactTextString(m) }
+func (*FindingTypeStats) ProtoMessage()    {}
+func (*FindingTypeStats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_finding_type_stats_94c253b9b7add3fc, []int{0}
+}
+func (m *FindingTypeStats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FindingTypeStats.Unmarshal(m, b)
+}
+func (m *FindingTypeStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FindingTypeStats.Marshal(b, m, deterministic)
+}
+func (dst *FindingTypeStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FindingTypeStats.Merge(dst, src)
+}
+func (m *FindingTypeStats) XXX_Size() int {
+	return xxx_messageInfo_FindingTypeStats.Size(m)
+}
+func (m *FindingTypeStats) XXX_DiscardUnknown() {
+	xxx_messageInfo_FindingTypeStats.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FindingTypeStats proto.InternalMessageInfo
+
+func (m *FindingTypeStats) GetFindingType() Finding_FindingType {
+	if m != nil {
+		return m.FindingType
+	}
+	return Finding_FINDING_TYPE_UNSPECIFIED
+}
+
+func (m *FindingTypeStats) GetFindingCount() int32 {
+	if m != nil {
+		return m.FindingCount
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*FindingTypeStats)(nil), "google.cloud.websecurityscanner.v1alpha.FindingTypeStats")
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto", fileDescriptor_finding_type_stats_94c253b9b7add3fc)
+}
+
+var fileDescriptor_finding_type_stats_94c253b9b7add3fc = []byte{
+	// 256 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x48, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0x4f, 0xce, 0xc9, 0x2f, 0x4d, 0xd1, 0x2f, 0x4f, 0x4d, 0x2a, 0x4e, 0x4d, 0x2e,
+	0x2d, 0xca, 0x2c, 0xa9, 0x2c, 0x4e, 0x4e, 0xcc, 0xcb, 0x4b, 0x2d, 0xd2, 0x2f, 0x33, 0x4c, 0xcc,
+	0x29, 0xc8, 0x48, 0xd4, 0x4f, 0xcb, 0xcc, 0x4b, 0xc9, 0xcc, 0x4b, 0x8f, 0x2f, 0xa9, 0x2c, 0x48,
+	0x8d, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0x87, 0x98,
+	0xa0, 0x07, 0x36, 0x41, 0x0f, 0xd3, 0x04, 0x3d, 0xa8, 0x09, 0x52, 0x32, 0x50, 0xab, 0x12, 0x0b,
+	0x32, 0xf5, 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0xa0, 0xc6, 0x48, 0x99,
+	0x92, 0xe8, 0x10, 0x88, 0x36, 0xa5, 0x19, 0x8c, 0x5c, 0x02, 0x6e, 0x10, 0x91, 0x90, 0xca, 0x82,
+	0xd4, 0x60, 0x90, 0xc3, 0x84, 0xe2, 0xb9, 0x78, 0x90, 0x9d, 0x2b, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1,
+	0x67, 0x64, 0xa3, 0x47, 0xa4, 0x4b, 0xf5, 0xa0, 0x06, 0xea, 0x21, 0x19, 0x1c, 0xc4, 0x9d, 0x86,
+	0xe0, 0x08, 0x29, 0x73, 0xf1, 0xc2, 0x2c, 0x48, 0xce, 0x2f, 0xcd, 0x2b, 0x91, 0x60, 0x52, 0x60,
+	0xd4, 0x60, 0x0d, 0x82, 0xd9, 0xea, 0x0c, 0x12, 0x73, 0x5a, 0xc8, 0xc8, 0xa5, 0x9d, 0x9c, 0x9f,
+	0x4b, 0xac, 0xad, 0x4e, 0xa2, 0xe8, 0xfe, 0x08, 0x00, 0xf9, 0x30, 0x80, 0x31, 0x2a, 0x12, 0x6a,
+	0x42, 0x7a, 0x7e, 0x4e, 0x62, 0x5e, 0xba, 0x5e, 0x7e, 0x51, 0xba, 0x7e, 0x7a, 0x6a, 0x1e, 0xd8,
+	0xff, 0xfa, 0x10, 0xa9, 0xc4, 0x82, 0xcc, 0x62, 0x82, 0x21, 0x67, 0x8d, 0x29, 0x95, 0xc4, 0x06,
+	0x36, 0xc5, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xb4, 0x52, 0xba, 0x07, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go
new file mode 100644
index 00000000..d550e725
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/scan_config.pb.go
@@ -0,0 +1,595 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/websecurityscanner/v1alpha/scan_config.proto
+
+package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Type of user agents used for scanning.
+type ScanConfig_UserAgent int32
+
+const (
+	// The user agent is unknown. Service will default to CHROME_LINUX.
+	ScanConfig_USER_AGENT_UNSPECIFIED ScanConfig_UserAgent = 0
+	// Chrome on Linux. This is the service default if unspecified.
+	ScanConfig_CHROME_LINUX ScanConfig_UserAgent = 1
+	// Chrome on Android.
+	ScanConfig_CHROME_ANDROID ScanConfig_UserAgent = 2
+	// Safari on IPhone.
+	ScanConfig_SAFARI_IPHONE ScanConfig_UserAgent = 3
+)
+
+var ScanConfig_UserAgent_name = map[int32]string{
+	0: "USER_AGENT_UNSPECIFIED",
+	1: "CHROME_LINUX",
+	2: "CHROME_ANDROID",
+	3: "SAFARI_IPHONE",
+}
+var ScanConfig_UserAgent_value = map[string]int32{
+	"USER_AGENT_UNSPECIFIED": 0,
+	"CHROME_LINUX":           1,
+	"CHROME_ANDROID":         2,
+	"SAFARI_IPHONE":          3,
+}
+
+func (x ScanConfig_UserAgent) String() string {
+	return proto.EnumName(ScanConfig_UserAgent_name, int32(x))
+}
+func (ScanConfig_UserAgent) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_scan_config_5acdaab1055c88fd, []int{0, 0}
+}
+
+// Cloud platforms supported by Cloud Web Security Scanner.
+type ScanConfig_TargetPlatform int32
+
+const (
+	// The target platform is unknown. Requests with this enum value will be
+	// rejected with INVALID_ARGUMENT error.
+	ScanConfig_TARGET_PLATFORM_UNSPECIFIED ScanConfig_TargetPlatform = 0
+	// Google App Engine service.
+	ScanConfig_APP_ENGINE ScanConfig_TargetPlatform = 1
+	// Google Compute Engine service.
+	ScanConfig_COMPUTE ScanConfig_TargetPlatform = 2
+)
+
+var ScanConfig_TargetPlatform_name = map[int32]string{
+	0: "TARGET_PLATFORM_UNSPECIFIED",
+	1: "APP_ENGINE",
+	2: "COMPUTE",
+}
+var ScanConfig_TargetPlatform_value = map[string]int32{
+	"TARGET_PLATFORM_UNSPECIFIED": 0,
+	"APP_ENGINE":                  1,
+	"COMPUTE":                     2,
+}
+
+func (x ScanConfig_TargetPlatform) String() string {
+	return proto.EnumName(ScanConfig_TargetPlatform_name, int32(x))
+}
+func (ScanConfig_TargetPlatform) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_scan_config_5acdaab1055c88fd, []int{0, 1}
+}
+
+// A ScanConfig resource contains the configurations to launch a scan.
+type ScanConfig struct {
+	// The resource name of the ScanConfig. The name follows the format of
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+	// generated by the system.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Required.
+	// The user provided display name of the ScanConfig.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// The maximum QPS during scanning. A valid value ranges from 5 to 20
+	// inclusively. If the field is unspecified or its value is set 0, server will
+	// default to 15. Other values outside of [5, 20] range will be rejected with
+	// INVALID_ARGUMENT error.
+	MaxQps int32 `protobuf:"varint,3,opt,name=max_qps,json=maxQps,proto3" json:"max_qps,omitempty"`
+	// Required.
+	// The starting URLs from which the scanner finds site pages.
+	StartingUrls []string `protobuf:"bytes,4,rep,name=starting_urls,json=startingUrls,proto3" json:"starting_urls,omitempty"`
+	// The authentication configuration. If specified, service will use the
+	// authentication configuration during scanning.
+	Authentication *ScanConfig_Authentication `protobuf:"bytes,5,opt,name=authentication,proto3" json:"authentication,omitempty"`
+	// The user agent used during scanning.
+	UserAgent ScanConfig_UserAgent `protobuf:"varint,6,opt,name=user_agent,json=userAgent,proto3,enum=google.cloud.websecurityscanner.v1alpha.ScanConfig_UserAgent" json:"user_agent,omitempty"`
+	// The blacklist URL patterns as described in
+	// https://cloud.google.com/security-scanner/docs/excluded-urls
+	BlacklistPatterns []string `protobuf:"bytes,7,rep,name=blacklist_patterns,json=blacklistPatterns,proto3" json:"blacklist_patterns,omitempty"`
+	// The schedule of the ScanConfig.
+	Schedule *ScanConfig_Schedule `protobuf:"bytes,8,opt,name=schedule,proto3" json:"schedule,omitempty"`
+	// Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+	// used as a default.
+	TargetPlatforms      []ScanConfig_TargetPlatform `protobuf:"varint,9,rep,packed,name=target_platforms,json=targetPlatforms,proto3,enum=google.cloud.websecurityscanner.v1alpha.ScanConfig_TargetPlatform" json:"target_platforms,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *ScanConfig) Reset()         { *m = ScanConfig{} }
+func (m *ScanConfig) String() string { return proto.CompactTextString(m) }
+func (*ScanConfig) ProtoMessage()    {}
+func (*ScanConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_scan_config_5acdaab1055c88fd, []int{0}
+}
+func (m *ScanConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScanConfig.Unmarshal(m, b)
+}
+func (m *ScanConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScanConfig.Marshal(b, m, deterministic)
+}
+func (dst *ScanConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig.Merge(dst, src)
+}
+func (m *ScanConfig) XXX_Size() int {
+	return xxx_messageInfo_ScanConfig.Size(m)
+}
+func (m *ScanConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScanConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScanConfig proto.InternalMessageInfo
+
+func (m *ScanConfig) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ScanConfig) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *ScanConfig) GetMaxQps() int32 {
+	if m != nil {
+		return m.MaxQps
+	}
+	return 0
+}
+
+func (m *ScanConfig) GetStartingUrls() []string {
+	if m != nil {
+		return m.StartingUrls
+	}
+	return nil
+}
+
+func (m *ScanConfig) GetAuthentication() *ScanConfig_Authentication {
+	if m != nil {
+		return m.Authentication
+	}
+	return nil
+}
+
+func (m *ScanConfig) GetUserAgent() ScanConfig_UserAgent {
+	if m != nil {
+		return m.UserAgent
+	}
+	return ScanConfig_USER_AGENT_UNSPECIFIED
+}
+
+func (m *ScanConfig) GetBlacklistPatterns() []string {
+	if m != nil {
+		return m.BlacklistPatterns
+	}
+	return nil
+}
+
+func (m *ScanConfig) GetSchedule() *ScanConfig_Schedule {
+	if m != nil {
+		return m.Schedule
+	}
+	return nil
+}
+
+func (m *ScanConfig) GetTargetPlatforms() []ScanConfig_TargetPlatform {
+	if m != nil {
+		return m.TargetPlatforms
+	}
+	return nil
+}
+
+// Scan authentication configuration.
+type ScanConfig_Authentication struct {
+	// Required.
+	// Authentication configuration
+	//
+	// Types that are valid to be assigned to Authentication:
+	//	*ScanConfig_Authentication_GoogleAccount_
+	//	*ScanConfig_Authentication_CustomAccount_
+	Authentication       isScanConfig_Authentication_Authentication `protobuf_oneof:"authentication"`
+	XXX_NoUnkeyedLiteral struct{}                                   `json:"-"`
+	XXX_unrecognized     []byte                                     `json:"-"`
+	XXX_sizecache        int32                                      `json:"-"`
+}
+
+func (m *ScanConfig_Authentication) Reset()         { *m = ScanConfig_Authentication{} }
+func (m *ScanConfig_Authentication) String() string { return proto.CompactTextString(m) }
+func (*ScanConfig_Authentication) ProtoMessage()    {}
+func (*ScanConfig_Authentication) Descriptor() ([]byte, []int) {
+	return fileDescriptor_scan_config_5acdaab1055c88fd, []int{0, 0}
+}
+func (m *ScanConfig_Authentication) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScanConfig_Authentication.Unmarshal(m, b)
+}
+func (m *ScanConfig_Authentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScanConfig_Authentication.Marshal(b, m, deterministic)
+}
+func (dst *ScanConfig_Authentication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication.Merge(dst, src)
+}
+func (m *ScanConfig_Authentication) XXX_Size() int {
+	return xxx_messageInfo_ScanConfig_Authentication.Size(m)
+}
+func (m *ScanConfig_Authentication) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScanConfig_Authentication.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScanConfig_Authentication proto.InternalMessageInfo
+
+type isScanConfig_Authentication_Authentication interface {
+	isScanConfig_Authentication_Authentication()
+}
+
+type ScanConfig_Authentication_GoogleAccount_ struct {
+	GoogleAccount *ScanConfig_Authentication_GoogleAccount `protobuf:"bytes,1,opt,name=google_account,json=googleAccount,proto3,oneof"`
+}
+
+type ScanConfig_Authentication_CustomAccount_ struct {
+	CustomAccount *ScanConfig_Authentication_CustomAccount `protobuf:"bytes,2,opt,name=custom_account,json=customAccount,proto3,oneof"`
+}
+
+func (*ScanConfig_Authentication_GoogleAccount_) isScanConfig_Authentication_Authentication() {}
+
+func (*ScanConfig_Authentication_CustomAccount_) isScanConfig_Authentication_Authentication() {}
+
+func (m *ScanConfig_Authentication) GetAuthentication() isScanConfig_Authentication_Authentication {
+	if m != nil {
+		return m.Authentication
+	}
+	return nil
+}
+
+func (m *ScanConfig_Authentication) GetGoogleAccount() *ScanConfig_Authentication_GoogleAccount {
+	if x, ok := m.GetAuthentication().(*ScanConfig_Authentication_GoogleAccount_); ok {
+		return x.GoogleAccount
+	}
+	return nil
+}
+
+func (m *ScanConfig_Authentication) GetCustomAccount() *ScanConfig_Authentication_CustomAccount {
+	if x, ok := m.GetAuthentication().(*ScanConfig_Authentication_CustomAccount_); ok {
+		return x.CustomAccount
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ScanConfig_Authentication) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ScanConfig_Authentication_OneofMarshaler, _ScanConfig_Authentication_OneofUnmarshaler, _ScanConfig_Authentication_OneofSizer, []interface{}{
+		(*ScanConfig_Authentication_GoogleAccount_)(nil),
+		(*ScanConfig_Authentication_CustomAccount_)(nil),
+	}
+}
+
+func _ScanConfig_Authentication_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ScanConfig_Authentication)
+	// authentication
+	switch x := m.Authentication.(type) {
+	case *ScanConfig_Authentication_GoogleAccount_:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.GoogleAccount); err != nil {
+			return err
+		}
+	case *ScanConfig_Authentication_CustomAccount_:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CustomAccount); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("ScanConfig_Authentication.Authentication has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ScanConfig_Authentication_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ScanConfig_Authentication)
+	switch tag {
+	case 1: // authentication.google_account
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ScanConfig_Authentication_GoogleAccount)
+		err := b.DecodeMessage(msg)
+		m.Authentication = &ScanConfig_Authentication_GoogleAccount_{msg}
+		return true, err
+	case 2: // authentication.custom_account
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ScanConfig_Authentication_CustomAccount)
+		err := b.DecodeMessage(msg)
+		m.Authentication = &ScanConfig_Authentication_CustomAccount_{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ScanConfig_Authentication_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ScanConfig_Authentication)
+	// authentication
+	switch x := m.Authentication.(type) {
+	case *ScanConfig_Authentication_GoogleAccount_:
+		s := proto.Size(x.GoogleAccount)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ScanConfig_Authentication_CustomAccount_:
+		s := proto.Size(x.CustomAccount)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Describes authentication configuration that uses a Google account.
+type ScanConfig_Authentication_GoogleAccount struct {
+	// Required.
+	// The user name of the Google account.
+	Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	// Input only.
+	// Required.
+	// The password of the Google account. The credential is stored encrypted
+	// and not returned in any response.
+	Password             string   `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ScanConfig_Authentication_GoogleAccount) Reset() {
+	*m = ScanConfig_Authentication_GoogleAccount{}
+}
+func (m *ScanConfig_Authentication_GoogleAccount) String() string { return proto.CompactTextString(m) }
+func (*ScanConfig_Authentication_GoogleAccount) ProtoMessage()    {}
+func (*ScanConfig_Authentication_GoogleAccount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_scan_config_5acdaab1055c88fd, []int{0, 0, 0}
+}
+func (m *ScanConfig_Authentication_GoogleAccount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Unmarshal(m, b)
+}
+func (m *ScanConfig_Authentication_GoogleAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Marshal(b, m, deterministic)
+}
+func (dst *ScanConfig_Authentication_GoogleAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Merge(dst, src)
+}
+func (m *ScanConfig_Authentication_GoogleAccount) XXX_Size() int {
+	return xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.Size(m)
+}
+func (m *ScanConfig_Authentication_GoogleAccount) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScanConfig_Authentication_GoogleAccount.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScanConfig_Authentication_GoogleAccount proto.InternalMessageInfo
+
+func (m *ScanConfig_Authentication_GoogleAccount) GetUsername() string {
+	if m != nil {
+		return m.Username
+	}
+	return ""
+}
+
+func (m *ScanConfig_Authentication_GoogleAccount) GetPassword() string {
+	if m != nil {
+		return m.Password
+	}
+	return ""
+}
+
+// Describes authentication configuration that uses a custom account.
+type ScanConfig_Authentication_CustomAccount struct {
+	// Required.
+	// The user name of the custom account.
+	Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	// Input only.
+	// Required.
+	// The password of the custom account. The credential is stored encrypted
+	// and not returned in any response.
+	Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	// Required.
+	// The login form URL of the website.
+	LoginUrl             string   `protobuf:"bytes,3,opt,name=login_url,json=loginUrl,proto3" json:"login_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ScanConfig_Authentication_CustomAccount) Reset() {
+	*m = ScanConfig_Authentication_CustomAccount{}
+}
+func (m *ScanConfig_Authentication_CustomAccount) String() string { return proto.CompactTextString(m) }
+func (*ScanConfig_Authentication_CustomAccount) ProtoMessage()    {}
+func (*ScanConfig_Authentication_CustomAccount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_scan_config_5acdaab1055c88fd, []int{0, 0, 1}
+}
+func (m *ScanConfig_Authentication_CustomAccount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Unmarshal(m, b)
+}
+func (m *ScanConfig_Authentication_CustomAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Marshal(b, m, deterministic)
+}
+func (dst *ScanConfig_Authentication_CustomAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Merge(dst, src)
+}
+func (m *ScanConfig_Authentication_CustomAccount) XXX_Size() int {
+	return xxx_messageInfo_ScanConfig_Authentication_CustomAccount.Size(m)
+}
+func (m *ScanConfig_Authentication_CustomAccount) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScanConfig_Authentication_CustomAccount.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScanConfig_Authentication_CustomAccount proto.InternalMessageInfo
+
+func (m *ScanConfig_Authentication_CustomAccount) GetUsername() string {
+	if m != nil {
+		return m.Username
+	}
+	return ""
+}
+
+func (m *ScanConfig_Authentication_CustomAccount) GetPassword() string {
+	if m != nil {
+		return m.Password
+	}
+	return ""
+}
+
+func (m *ScanConfig_Authentication_CustomAccount) GetLoginUrl() string {
+	if m != nil {
+		return m.LoginUrl
+	}
+	return ""
+}
+
+// Scan schedule configuration.
+type ScanConfig_Schedule struct {
+	// A timestamp indicates when the next run will be scheduled. The value is
+	// refreshed by the server after each run. If unspecified, it will default
+	// to current server time, which means the scan will be scheduled to start
+	// immediately.
+	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	// Required.
+	// The duration of time between executions in days.
+	IntervalDurationDays int32    `protobuf:"varint,2,opt,name=interval_duration_days,json=intervalDurationDays,proto3" json:"interval_duration_days,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ScanConfig_Schedule) Reset()         { *m = ScanConfig_Schedule{} }
+func (m *ScanConfig_Schedule) String() string { return proto.CompactTextString(m) }
+func (*ScanConfig_Schedule) ProtoMessage()    {}
+func (*ScanConfig_Schedule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_scan_config_5acdaab1055c88fd, []int{0, 1}
+}
+func (m *ScanConfig_Schedule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScanConfig_Schedule.Unmarshal(m, b)
+}
+func (m *ScanConfig_Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScanConfig_Schedule.Marshal(b, m, deterministic)
+}
+func (dst *ScanConfig_Schedule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig_Schedule.Merge(dst, src)
+}
+func (m *ScanConfig_Schedule) XXX_Size() int {
+	return xxx_messageInfo_ScanConfig_Schedule.Size(m)
+}
+func (m *ScanConfig_Schedule) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScanConfig_Schedule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScanConfig_Schedule proto.InternalMessageInfo
+
+func (m *ScanConfig_Schedule) GetScheduleTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ScheduleTime
+	}
+	return nil
+}
+
+func (m *ScanConfig_Schedule) GetIntervalDurationDays() int32 {
+	if m != nil {
+		return m.IntervalDurationDays
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*ScanConfig)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig")
+	proto.RegisterType((*ScanConfig_Authentication)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication")
+	proto.RegisterType((*ScanConfig_Authentication_GoogleAccount)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount")
+	proto.RegisterType((*ScanConfig_Authentication_CustomAccount)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount")
+	proto.RegisterType((*ScanConfig_Schedule)(nil), "google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule")
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanConfig_UserAgent", ScanConfig_UserAgent_name, ScanConfig_UserAgent_value)
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanConfig_TargetPlatform", ScanConfig_TargetPlatform_name, ScanConfig_TargetPlatform_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/scan_config.proto", fileDescriptor_scan_config_5acdaab1055c88fd)
+}
+
+var fileDescriptor_scan_config_5acdaab1055c88fd = []byte{
+	// 748 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x51, 0x6f, 0xe3, 0x44,
+	0x10, 0x3e, 0x37, 0xd7, 0x36, 0x99, 0x36, 0x39, 0xdf, 0x0a, 0x1d, 0x91, 0x0f, 0xe9, 0x42, 0x79,
+	0x20, 0x12, 0xc2, 0x16, 0x85, 0x17, 0x04, 0x08, 0xb9, 0x89, 0x9b, 0x46, 0xba, 0x3a, 0x66, 0x93,
+	0x48, 0x07, 0x42, 0x5a, 0xb6, 0xce, 0xd6, 0x35, 0xd8, 0xbb, 0x66, 0x77, 0x7d, 0x77, 0x79, 0xe4,
+	0x77, 0xf0, 0x73, 0x78, 0xe0, 0x6f, 0x21, 0x6f, 0xec, 0x5c, 0xd3, 0x7b, 0xa0, 0x2a, 0xbc, 0x79,
+	0xe6, 0xf3, 0x7c, 0xdf, 0xec, 0xf8, 0x9b, 0x35, 0x7c, 0x9d, 0x08, 0x91, 0x64, 0xcc, 0x8b, 0x33,
+	0x51, 0xae, 0xbc, 0x37, 0xec, 0x4a, 0xb1, 0xb8, 0x94, 0xa9, 0x5e, 0xab, 0x98, 0x72, 0xce, 0xa4,
+	0xf7, 0xfa, 0x0b, 0x9a, 0x15, 0x37, 0xd4, 0xab, 0x62, 0x12, 0x0b, 0x7e, 0x9d, 0x26, 0x6e, 0x21,
+	0x85, 0x16, 0xe8, 0xd3, 0x4d, 0xa9, 0x6b, 0x4a, 0xdd, 0xf7, 0x4b, 0xdd, 0xba, 0xd4, 0xf9, 0xa8,
+	0xd6, 0xa0, 0x45, 0xea, 0x51, 0xce, 0x85, 0xa6, 0x3a, 0x15, 0x5c, 0x6d, 0x68, 0x9c, 0x17, 0x35,
+	0x6a, 0xa2, 0xab, 0xf2, 0xda, 0xd3, 0x69, 0xce, 0x94, 0xa6, 0x79, 0xb1, 0x79, 0xe1, 0xe4, 0x2f,
+	0x00, 0x98, 0xc7, 0x94, 0x8f, 0x8c, 0x38, 0x42, 0xf0, 0x98, 0xd3, 0x9c, 0xf5, 0xad, 0x81, 0x35,
+	0xec, 0x60, 0xf3, 0x8c, 0x3e, 0x86, 0xe3, 0x55, 0xaa, 0x8a, 0x8c, 0xae, 0x89, 0xc1, 0xf6, 0x0c,
+	0x76, 0x54, 0xe7, 0xc2, 0xea, 0x95, 0x0f, 0xe1, 0x30, 0xa7, 0x6f, 0xc9, 0xef, 0x85, 0xea, 0xb7,
+	0x06, 0xd6, 0x70, 0x1f, 0x1f, 0xe4, 0xf4, 0xed, 0x0f, 0x85, 0x42, 0x9f, 0x40, 0x57, 0x69, 0x2a,
+	0x75, 0xca, 0x13, 0x52, 0xca, 0x4c, 0xf5, 0x1f, 0x0f, 0x5a, 0xc3, 0x0e, 0x3e, 0x6e, 0x92, 0x4b,
+	0x99, 0x29, 0xf4, 0x2b, 0xf4, 0x68, 0xa9, 0x6f, 0x18, 0xd7, 0x69, 0x6c, 0xba, 0xef, 0xef, 0x0f,
+	0xac, 0xe1, 0xd1, 0xe9, 0x99, 0x7b, 0xcf, 0x21, 0xb8, 0xef, 0x4e, 0xe0, 0xfa, 0x3b, 0x4c, 0xf8,
+	0x0e, 0x33, 0xfa, 0x19, 0xa0, 0x54, 0x4c, 0x12, 0x9a, 0x30, 0xae, 0xfb, 0x07, 0x03, 0x6b, 0xd8,
+	0x3b, 0xfd, 0xee, 0x21, 0x3a, 0x4b, 0xc5, 0xa4, 0x5f, 0x91, 0xe0, 0x4e, 0xd9, 0x3c, 0xa2, 0xcf,
+	0x01, 0x5d, 0x65, 0x34, 0xfe, 0x2d, 0x4b, 0x95, 0x26, 0x05, 0xd5, 0x9a, 0x49, 0xae, 0xfa, 0x87,
+	0xe6, 0xcc, 0x4f, 0xb7, 0x48, 0x54, 0x03, 0xe8, 0x15, 0xb4, 0x55, 0x7c, 0xc3, 0x56, 0x65, 0xc6,
+	0xfa, 0x6d, 0x73, 0xe4, 0x6f, 0x1f, 0xd2, 0xca, 0xbc, 0xe6, 0xc0, 0x5b, 0x36, 0x94, 0x83, 0xad,
+	0xa9, 0x4c, 0x98, 0x26, 0x45, 0x46, 0xf5, 0xb5, 0x90, 0xb9, 0xea, 0x77, 0x06, 0xad, 0x61, 0xef,
+	0x61, 0x43, 0x5d, 0x18, 0xae, 0xa8, 0xa6, 0xc2, 0x4f, 0xf4, 0x4e, 0xac, 0x9c, 0xbf, 0x5b, 0xd0,
+	0xdb, 0x1d, 0x3c, 0x5a, 0x43, 0x6f, 0x23, 0x44, 0x68, 0x1c, 0x8b, 0x92, 0x6b, 0xe3, 0xa9, 0xa3,
+	0xd3, 0xe8, 0xbf, 0x7f, 0x54, 0x77, 0x62, 0x18, 0xfc, 0x0d, 0xef, 0xc5, 0x23, 0xdc, 0x4d, 0x6e,
+	0x27, 0x2a, 0xe9, 0xb8, 0x54, 0x5a, 0xe4, 0x5b, 0xe9, 0xbd, 0xff, 0x4d, 0x7a, 0x64, 0x88, 0x6f,
+	0x49, 0xc7, 0xb7, 0x13, 0xce, 0x04, 0xba, 0x3b, 0xcd, 0x21, 0x07, 0xda, 0x95, 0x3d, 0x6e, 0x2d,
+	0xd5, 0x36, 0xae, 0xb0, 0x82, 0x2a, 0xf5, 0x46, 0xc8, 0x55, 0xbd, 0x54, 0xdb, 0xd8, 0x59, 0x41,
+	0x77, 0x47, 0xea, 0xa1, 0x44, 0xe8, 0x39, 0x74, 0x32, 0x91, 0xa4, 0xbc, 0x5a, 0x3f, 0xb3, 0x9c,
+	0x1d, 0xdc, 0x36, 0x89, 0xa5, 0xcc, 0xce, 0xec, 0xbb, 0x9b, 0xe7, 0xfc, 0x61, 0x41, 0xbb, 0xf1,
+	0x13, 0xfa, 0x1e, 0xba, 0x8d, 0xa3, 0x48, 0x75, 0x71, 0xd4, 0x9f, 0xd0, 0x69, 0xe6, 0xd8, 0xdc,
+	0x2a, 0xee, 0xa2, 0xb9, 0x55, 0xf0, 0x71, 0x53, 0x50, 0xa5, 0xd0, 0x57, 0xf0, 0x2c, 0xe5, 0x9a,
+	0xc9, 0xd7, 0x34, 0x23, 0xab, 0x52, 0x1a, 0x09, 0xb2, 0xa2, 0x6b, 0x65, 0xda, 0xdc, 0xc7, 0x1f,
+	0x34, 0xe8, 0xb8, 0x06, 0xc7, 0x74, 0xad, 0x4e, 0x7e, 0x81, 0xce, 0x76, 0xbb, 0x90, 0x03, 0xcf,
+	0x96, 0xf3, 0x00, 0x13, 0x7f, 0x12, 0x84, 0x0b, 0xb2, 0x0c, 0xe7, 0x51, 0x30, 0x9a, 0x9e, 0x4f,
+	0x83, 0xb1, 0xfd, 0x08, 0xd9, 0x70, 0x3c, 0xba, 0xc0, 0xb3, 0xcb, 0x80, 0xbc, 0x9c, 0x86, 0xcb,
+	0x57, 0xb6, 0x85, 0x10, 0xf4, 0xea, 0x8c, 0x1f, 0x8e, 0xf1, 0x6c, 0x3a, 0xb6, 0xf7, 0xd0, 0x53,
+	0xe8, 0xce, 0xfd, 0x73, 0x1f, 0x4f, 0xc9, 0x34, 0xba, 0x98, 0x85, 0x81, 0xdd, 0x3a, 0x09, 0xa1,
+	0xb7, 0x6b, 0x69, 0xf4, 0x02, 0x9e, 0x2f, 0x7c, 0x3c, 0x09, 0x16, 0x24, 0x7a, 0xe9, 0x2f, 0xce,
+	0x67, 0xf8, 0xf2, 0x8e, 0x56, 0x0f, 0xc0, 0x8f, 0x22, 0x12, 0x84, 0x93, 0x69, 0x18, 0xd8, 0x16,
+	0x3a, 0x82, 0xc3, 0xd1, 0xec, 0x32, 0x5a, 0x2e, 0x02, 0x7b, 0xef, 0xec, 0x4f, 0x0b, 0x3e, 0x8b,
+	0x45, 0x7e, 0x5f, 0x7f, 0x9d, 0x3d, 0x79, 0x67, 0xb0, 0xa8, 0x9a, 0x61, 0x64, 0xfd, 0xf4, 0x63,
+	0x5d, 0x9b, 0x88, 0x8c, 0xf2, 0xc4, 0x15, 0x32, 0xf1, 0x12, 0xc6, 0xcd, 0x84, 0xbd, 0x0d, 0x44,
+	0x8b, 0x54, 0xfd, 0xeb, 0xaf, 0xe4, 0x9b, 0xf7, 0xa1, 0xab, 0x03, 0xc3, 0xf2, 0xe5, 0x3f, 0x01,
+	0x00, 0x00, 0xff, 0xff, 0x7d, 0xa3, 0x6b, 0x23, 0x8f, 0x06, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go
new file mode 100644
index 00000000..f8f3b27b
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/scan_run.pb.go
@@ -0,0 +1,272 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/websecurityscanner/v1alpha/scan_run.proto
+
+package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Types of ScanRun execution state.
+type ScanRun_ExecutionState int32
+
+const (
+	// Represents an invalid state caused by internal server error. This value
+	// should never be returned.
+	ScanRun_EXECUTION_STATE_UNSPECIFIED ScanRun_ExecutionState = 0
+	// The scan is waiting in the queue.
+	ScanRun_QUEUED ScanRun_ExecutionState = 1
+	// The scan is in progress.
+	ScanRun_SCANNING ScanRun_ExecutionState = 2
+	// The scan is either finished or stopped by user.
+	ScanRun_FINISHED ScanRun_ExecutionState = 3
+)
+
+var ScanRun_ExecutionState_name = map[int32]string{
+	0: "EXECUTION_STATE_UNSPECIFIED",
+	1: "QUEUED",
+	2: "SCANNING",
+	3: "FINISHED",
+}
+var ScanRun_ExecutionState_value = map[string]int32{
+	"EXECUTION_STATE_UNSPECIFIED": 0,
+	"QUEUED":                      1,
+	"SCANNING":                    2,
+	"FINISHED":                    3,
+}
+
+func (x ScanRun_ExecutionState) String() string {
+	return proto.EnumName(ScanRun_ExecutionState_name, int32(x))
+}
+func (ScanRun_ExecutionState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_scan_run_8ce9e7c54bb44c79, []int{0, 0}
+}
+
+// Types of ScanRun result state.
+type ScanRun_ResultState int32
+
+const (
+	// Default value. This value is returned when the ScanRun is not yet
+	// finished.
+	ScanRun_RESULT_STATE_UNSPECIFIED ScanRun_ResultState = 0
+	// The scan finished without errors.
+	ScanRun_SUCCESS ScanRun_ResultState = 1
+	// The scan finished with errors.
+	ScanRun_ERROR ScanRun_ResultState = 2
+	// The scan was terminated by user.
+	ScanRun_KILLED ScanRun_ResultState = 3
+)
+
+var ScanRun_ResultState_name = map[int32]string{
+	0: "RESULT_STATE_UNSPECIFIED",
+	1: "SUCCESS",
+	2: "ERROR",
+	3: "KILLED",
+}
+var ScanRun_ResultState_value = map[string]int32{
+	"RESULT_STATE_UNSPECIFIED": 0,
+	"SUCCESS":                  1,
+	"ERROR":                    2,
+	"KILLED":                   3,
+}
+
+func (x ScanRun_ResultState) String() string {
+	return proto.EnumName(ScanRun_ResultState_name, int32(x))
+}
+func (ScanRun_ResultState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_scan_run_8ce9e7c54bb44c79, []int{0, 1}
+}
+
+// A ScanRun is a output-only resource representing an actual run of the scan.
+type ScanRun struct {
+	// Output only.
+	// The resource name of the ScanRun. The name follows the format of
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+	// The ScanRun IDs are generated by the system.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Output only.
+	// The execution state of the ScanRun.
+	ExecutionState ScanRun_ExecutionState `protobuf:"varint,2,opt,name=execution_state,json=executionState,proto3,enum=google.cloud.websecurityscanner.v1alpha.ScanRun_ExecutionState" json:"execution_state,omitempty"`
+	// Output only.
+	// The result state of the ScanRun. This field is only available after the
+	// execution state reaches "FINISHED".
+	ResultState ScanRun_ResultState `protobuf:"varint,3,opt,name=result_state,json=resultState,proto3,enum=google.cloud.websecurityscanner.v1alpha.ScanRun_ResultState" json:"result_state,omitempty"`
+	// Output only.
+	// The time at which the ScanRun started.
+	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// Output only.
+	// The time at which the ScanRun reached termination state - that the ScanRun
+	// is either finished or stopped by user.
+	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	// Output only.
+	// The number of URLs crawled during this ScanRun. If the scan is in progress,
+	// the value represents the number of URLs crawled up to now.
+	UrlsCrawledCount int64 `protobuf:"varint,6,opt,name=urls_crawled_count,json=urlsCrawledCount,proto3" json:"urls_crawled_count,omitempty"`
+	// Output only.
+	// The number of URLs tested during this ScanRun. If the scan is in progress,
+	// the value represents the number of URLs tested up to now. The number of
+	// URLs tested is usually larger than the number URLS crawled because
+	// typically a crawled URL is tested with multiple test payloads.
+	UrlsTestedCount int64 `protobuf:"varint,7,opt,name=urls_tested_count,json=urlsTestedCount,proto3" json:"urls_tested_count,omitempty"`
+	// Output only.
+	// Whether the scan run has found any vulnerabilities.
+	HasVulnerabilities bool `protobuf:"varint,8,opt,name=has_vulnerabilities,json=hasVulnerabilities,proto3" json:"has_vulnerabilities,omitempty"`
+	// Output only.
+	// The percentage of total completion ranging from 0 to 100.
+	// If the scan is in queue, the value is 0.
+	// If the scan is running, the value ranges from 0 to 100.
+	// If the scan is finished, the value is 100.
+	ProgressPercent      int32    `protobuf:"varint,9,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ScanRun) Reset()         { *m = ScanRun{} }
+func (m *ScanRun) String() string { return proto.CompactTextString(m) }
+func (*ScanRun) ProtoMessage()    {}
+func (*ScanRun) Descriptor() ([]byte, []int) {
+	return fileDescriptor_scan_run_8ce9e7c54bb44c79, []int{0}
+}
+func (m *ScanRun) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScanRun.Unmarshal(m, b)
+}
+func (m *ScanRun) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScanRun.Marshal(b, m, deterministic)
+}
+func (dst *ScanRun) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanRun.Merge(dst, src)
+}
+func (m *ScanRun) XXX_Size() int {
+	return xxx_messageInfo_ScanRun.Size(m)
+}
+func (m *ScanRun) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScanRun.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScanRun proto.InternalMessageInfo
+
+func (m *ScanRun) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ScanRun) GetExecutionState() ScanRun_ExecutionState {
+	if m != nil {
+		return m.ExecutionState
+	}
+	return ScanRun_EXECUTION_STATE_UNSPECIFIED
+}
+
+func (m *ScanRun) GetResultState() ScanRun_ResultState {
+	if m != nil {
+		return m.ResultState
+	}
+	return ScanRun_RESULT_STATE_UNSPECIFIED
+}
+
+func (m *ScanRun) GetStartTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.StartTime
+	}
+	return nil
+}
+
+func (m *ScanRun) GetEndTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.EndTime
+	}
+	return nil
+}
+
+func (m *ScanRun) GetUrlsCrawledCount() int64 {
+	if m != nil {
+		return m.UrlsCrawledCount
+	}
+	return 0
+}
+
+func (m *ScanRun) GetUrlsTestedCount() int64 {
+	if m != nil {
+		return m.UrlsTestedCount
+	}
+	return 0
+}
+
+func (m *ScanRun) GetHasVulnerabilities() bool {
+	if m != nil {
+		return m.HasVulnerabilities
+	}
+	return false
+}
+
+func (m *ScanRun) GetProgressPercent() int32 {
+	if m != nil {
+		return m.ProgressPercent
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*ScanRun)(nil), "google.cloud.websecurityscanner.v1alpha.ScanRun")
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanRun_ExecutionState", ScanRun_ExecutionState_name, ScanRun_ExecutionState_value)
+	proto.RegisterEnum("google.cloud.websecurityscanner.v1alpha.ScanRun_ResultState", ScanRun_ResultState_name, ScanRun_ResultState_value)
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/scan_run.proto", fileDescriptor_scan_run_8ce9e7c54bb44c79)
+}
+
+var fileDescriptor_scan_run_8ce9e7c54bb44c79 = []byte{
+	// 547 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xdd, 0x6e, 0xd3, 0x3c,
+	0x18, 0xfe, 0xb2, 0xad, 0x6b, 0xeb, 0x4e, 0x5b, 0x3e, 0x73, 0x12, 0x8d, 0x49, 0x8b, 0x76, 0x42,
+	0xf8, 0x51, 0x22, 0x86, 0x40, 0x42, 0x20, 0xa1, 0x2d, 0xf3, 0x20, 0x62, 0xca, 0x8a, 0x93, 0x20,
+	0xc6, 0x49, 0xe4, 0xa6, 0x26, 0x8d, 0x94, 0xda, 0x91, 0xed, 0x6c, 0x70, 0x27, 0x5c, 0x0c, 0x17,
+	0x87, 0xec, 0xa4, 0xc0, 0x34, 0xa4, 0x8d, 0xb3, 0x3e, 0xef, 0xf3, 0x57, 0xbd, 0xaf, 0x03, 0x5e,
+	0x94, 0x9c, 0x97, 0x35, 0x0d, 0x8a, 0x9a, 0xb7, 0xf3, 0xe0, 0x8a, 0xce, 0x24, 0x2d, 0x5a, 0x51,
+	0xa9, 0x6f, 0xb2, 0x20, 0x8c, 0x51, 0x11, 0x5c, 0x3e, 0x25, 0x75, 0xb3, 0x20, 0x81, 0xc6, 0xb9,
+	0x68, 0x99, 0xdf, 0x08, 0xae, 0x38, 0x7c, 0xd0, 0xf9, 0x7c, 0xe3, 0xf3, 0x6f, 0xfa, 0xfc, 0xde,
+	0xb7, 0xbb, 0xd7, 0x17, 0x90, 0xa6, 0x0a, 0x08, 0x63, 0x5c, 0x11, 0x55, 0x71, 0x26, 0xbb, 0x98,
+	0xdd, 0xfd, 0x9e, 0x35, 0x68, 0xd6, 0x7e, 0x09, 0x54, 0xb5, 0xa4, 0x52, 0x91, 0x65, 0xd3, 0x09,
+	0x0e, 0x7e, 0x0c, 0xc0, 0x30, 0x29, 0x08, 0xc3, 0x2d, 0x83, 0x10, 0x6c, 0x30, 0xb2, 0xa4, 0x8e,
+	0xe5, 0x5a, 0xde, 0x18, 0x9b, 0xdf, 0x70, 0x01, 0x76, 0xe8, 0x57, 0x5a, 0xb4, 0x3a, 0x34, 0x97,
+	0x8a, 0x28, 0xea, 0xac, 0xb9, 0x96, 0xb7, 0x7d, 0xf8, 0xc6, 0xbf, 0xe3, 0x3f, 0xf4, 0xfb, 0x78,
+	0x1f, 0xad, 0x72, 0x12, 0x1d, 0x83, 0xb7, 0xe9, 0x35, 0x0c, 0x73, 0xb0, 0x25, 0xa8, 0x6c, 0x6b,
+	0xd5, 0xd7, 0xac, 0x9b, 0x9a, 0xd7, 0xff, 0x5c, 0x83, 0x4d, 0x48, 0xd7, 0x31, 0x11, 0xbf, 0x01,
+	0x7c, 0x09, 0x80, 0x54, 0x44, 0xa8, 0x5c, 0xef, 0xc0, 0xd9, 0x70, 0x2d, 0x6f, 0x72, 0xb8, 0xbb,
+	0x8a, 0x5f, 0x2d, 0xc8, 0x4f, 0x57, 0x0b, 0xc2, 0x63, 0xa3, 0xd6, 0x18, 0x3e, 0x07, 0x23, 0xca,
+	0xe6, 0x9d, 0x71, 0x70, 0xab, 0x71, 0x48, 0xd9, 0xdc, 0xd8, 0x9e, 0x00, 0xd8, 0x8a, 0x5a, 0xe6,
+	0x85, 0x20, 0x57, 0x35, 0x9d, 0xe7, 0x05, 0x6f, 0x99, 0x72, 0x36, 0x5d, 0xcb, 0x5b, 0xc7, 0xb6,
+	0x66, 0xc2, 0x8e, 0x08, 0xf5, 0x1c, 0x3e, 0x02, 0xff, 0x1b, 0xb5, 0xa2, 0x52, 0xfd, 0x12, 0x0f,
+	0x8d, 0x78, 0x47, 0x13, 0xa9, 0x99, 0x77, 0xda, 0x00, 0xdc, 0x5b, 0x10, 0x99, 0x5f, 0xb6, 0x35,
+	0xa3, 0x82, 0xcc, 0xaa, 0xba, 0x52, 0x15, 0x95, 0xce, 0xc8, 0xb5, 0xbc, 0x11, 0x86, 0x0b, 0x22,
+	0x3f, 0x5e, 0x67, 0xe0, 0x43, 0x60, 0x37, 0x82, 0x97, 0x82, 0x4a, 0x99, 0x37, 0x54, 0x14, 0x94,
+	0x29, 0x67, 0xec, 0x5a, 0xde, 0x00, 0xef, 0xac, 0xe6, 0xd3, 0x6e, 0x7c, 0x70, 0x01, 0xb6, 0xaf,
+	0x9f, 0x0a, 0xee, 0x83, 0xfb, 0xe8, 0x13, 0x0a, 0xb3, 0x34, 0x3a, 0x8f, 0xf3, 0x24, 0x3d, 0x4a,
+	0x51, 0x9e, 0xc5, 0xc9, 0x14, 0x85, 0xd1, 0x69, 0x84, 0x4e, 0xec, 0xff, 0x20, 0x00, 0x9b, 0x1f,
+	0x32, 0x94, 0xa1, 0x13, 0xdb, 0x82, 0x5b, 0x60, 0x94, 0x84, 0x47, 0x71, 0x1c, 0xc5, 0x6f, 0xed,
+	0x35, 0x8d, 0x4e, 0xa3, 0x38, 0x4a, 0xde, 0xa1, 0x13, 0x7b, 0xfd, 0xe0, 0x1c, 0x4c, 0xfe, 0x38,
+	0x0f, 0xdc, 0x03, 0x0e, 0x46, 0x49, 0x76, 0x96, 0xfe, 0x35, 0x74, 0x02, 0x86, 0x49, 0x16, 0x86,
+	0x28, 0x49, 0x6c, 0x0b, 0x8e, 0xc1, 0x00, 0x61, 0x7c, 0x8e, 0xed, 0x35, 0x5d, 0xf6, 0x3e, 0x3a,
+	0x3b, 0xd3, 0x81, 0xc7, 0xdf, 0x2d, 0xf0, 0xb8, 0xe0, 0xcb, 0xbb, 0x3e, 0x92, 0xe3, 0xad, 0xfe,
+	0x95, 0x4c, 0xf5, 0xd5, 0xa6, 0xd6, 0xe7, 0x8b, 0xde, 0x58, 0xf2, 0x9a, 0xb0, 0xd2, 0xe7, 0xa2,
+	0x0c, 0x4a, 0xca, 0xcc, 0x4d, 0x83, 0x8e, 0x22, 0x4d, 0x25, 0x6f, 0xfd, 0x7a, 0x5f, 0xdd, 0xa4,
+	0x66, 0x9b, 0x26, 0xe5, 0xd9, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x43, 0xba, 0xc7, 0x02,
+	0x04, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go
new file mode 100644
index 00000000..3094af85
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha/web_security_scanner.pb.go
@@ -0,0 +1,1537 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package websecurityscanner // import "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Request for the `CreateScanConfig` method.
+type CreateScanConfigRequest struct {
+	// Required.
+	// The parent resource name where the scan is created, which should be a
+	// project resource name in the format 'projects/{projectId}'.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Required.
+	// The ScanConfig to be created.
+	ScanConfig           *ScanConfig `protobuf:"bytes,2,opt,name=scan_config,json=scanConfig,proto3" json:"scan_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *CreateScanConfigRequest) Reset()         { *m = CreateScanConfigRequest{} }
+func (m *CreateScanConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateScanConfigRequest) ProtoMessage()    {}
+func (*CreateScanConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{0}
+}
+func (m *CreateScanConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateScanConfigRequest.Unmarshal(m, b)
+}
+func (m *CreateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateScanConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateScanConfigRequest.Merge(dst, src)
+}
+func (m *CreateScanConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateScanConfigRequest.Size(m)
+}
+func (m *CreateScanConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateScanConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateScanConfigRequest proto.InternalMessageInfo
+
+func (m *CreateScanConfigRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateScanConfigRequest) GetScanConfig() *ScanConfig {
+	if m != nil {
+		return m.ScanConfig
+	}
+	return nil
+}
+
+// Request for the `DeleteScanConfig` method.
+type DeleteScanConfigRequest struct {
+	// Required.
+	// The resource name of the ScanConfig to be deleted. The name follows the
+	// format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteScanConfigRequest) Reset()         { *m = DeleteScanConfigRequest{} }
+func (m *DeleteScanConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteScanConfigRequest) ProtoMessage()    {}
+func (*DeleteScanConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{1}
+}
+func (m *DeleteScanConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteScanConfigRequest.Unmarshal(m, b)
+}
+func (m *DeleteScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteScanConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteScanConfigRequest.Merge(dst, src)
+}
+func (m *DeleteScanConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteScanConfigRequest.Size(m)
+}
+func (m *DeleteScanConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteScanConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteScanConfigRequest proto.InternalMessageInfo
+
+func (m *DeleteScanConfigRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request for the `GetScanConfig` method.
+type GetScanConfigRequest struct {
+	// Required.
+	// The resource name of the ScanConfig to be returned. The name follows the
+	// format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetScanConfigRequest) Reset()         { *m = GetScanConfigRequest{} }
+func (m *GetScanConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetScanConfigRequest) ProtoMessage()    {}
+func (*GetScanConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{2}
+}
+func (m *GetScanConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetScanConfigRequest.Unmarshal(m, b)
+}
+func (m *GetScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetScanConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanConfigRequest.Merge(dst, src)
+}
+func (m *GetScanConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetScanConfigRequest.Size(m)
+}
+func (m *GetScanConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetScanConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetScanConfigRequest proto.InternalMessageInfo
+
+func (m *GetScanConfigRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request for the `ListScanConfigs` method.
+type ListScanConfigsRequest struct {
+	// Required.
+	// The parent resource name, which should be a project resource name in the
+	// format 'projects/{projectId}'.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// A token identifying a page of results to be returned. This should be a
+	// `next_page_token` value returned from a previous List request.
+	// If unspecified, the first page of results is returned.
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// The maximum number of ScanConfigs to return, can be limited by server.
+	// If not specified or not positive, the implementation will select a
+	// reasonable value.
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListScanConfigsRequest) Reset()         { *m = ListScanConfigsRequest{} }
+func (m *ListScanConfigsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListScanConfigsRequest) ProtoMessage()    {}
+func (*ListScanConfigsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{3}
+}
+func (m *ListScanConfigsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListScanConfigsRequest.Unmarshal(m, b)
+}
+func (m *ListScanConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListScanConfigsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsRequest.Merge(dst, src)
+}
+func (m *ListScanConfigsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListScanConfigsRequest.Size(m)
+}
+func (m *ListScanConfigsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListScanConfigsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListScanConfigsRequest proto.InternalMessageInfo
+
+func (m *ListScanConfigsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListScanConfigsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+func (m *ListScanConfigsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+// Request for the `UpdateScanConfigRequest` method.
+type UpdateScanConfigRequest struct {
+	// Required.
+	// The ScanConfig to be updated. The name field must be set to identify the
+	// resource to be updated. The values of fields not covered by the mask
+	// will be ignored.
+	ScanConfig *ScanConfig `protobuf:"bytes,2,opt,name=scan_config,json=scanConfig,proto3" json:"scan_config,omitempty"`
+	// Required.
+	// The update mask applies to the resource. For the `FieldMask` definition,
+	// see
+	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateScanConfigRequest) Reset()         { *m = UpdateScanConfigRequest{} }
+func (m *UpdateScanConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateScanConfigRequest) ProtoMessage()    {}
+func (*UpdateScanConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{4}
+}
+func (m *UpdateScanConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateScanConfigRequest.Unmarshal(m, b)
+}
+func (m *UpdateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateScanConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateScanConfigRequest.Merge(dst, src)
+}
+func (m *UpdateScanConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateScanConfigRequest.Size(m)
+}
+func (m *UpdateScanConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateScanConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateScanConfigRequest proto.InternalMessageInfo
+
+func (m *UpdateScanConfigRequest) GetScanConfig() *ScanConfig {
+	if m != nil {
+		return m.ScanConfig
+	}
+	return nil
+}
+
+func (m *UpdateScanConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Response for the `ListScanConfigs` method.
+type ListScanConfigsResponse struct {
+	// The list of ScanConfigs returned.
+	ScanConfigs []*ScanConfig `protobuf:"bytes,1,rep,name=scan_configs,json=scanConfigs,proto3" json:"scan_configs,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListScanConfigsResponse) Reset()         { *m = ListScanConfigsResponse{} }
+func (m *ListScanConfigsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListScanConfigsResponse) ProtoMessage()    {}
+func (*ListScanConfigsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{5}
+}
+func (m *ListScanConfigsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListScanConfigsResponse.Unmarshal(m, b)
+}
+func (m *ListScanConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListScanConfigsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsResponse.Merge(dst, src)
+}
+func (m *ListScanConfigsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListScanConfigsResponse.Size(m)
+}
+func (m *ListScanConfigsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListScanConfigsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListScanConfigsResponse proto.InternalMessageInfo
+
+func (m *ListScanConfigsResponse) GetScanConfigs() []*ScanConfig {
+	if m != nil {
+		return m.ScanConfigs
+	}
+	return nil
+}
+
+func (m *ListScanConfigsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request for the `StartScanRun` method.
+type StartScanRunRequest struct {
+	// Required.
+	// The resource name of the ScanConfig to be used. The name follows the
+	// format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StartScanRunRequest) Reset()         { *m = StartScanRunRequest{} }
+func (m *StartScanRunRequest) String() string { return proto.CompactTextString(m) }
+func (*StartScanRunRequest) ProtoMessage()    {}
+func (*StartScanRunRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{6}
+}
+func (m *StartScanRunRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StartScanRunRequest.Unmarshal(m, b)
+}
+func (m *StartScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StartScanRunRequest.Marshal(b, m, deterministic)
+}
+func (dst *StartScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartScanRunRequest.Merge(dst, src)
+}
+func (m *StartScanRunRequest) XXX_Size() int {
+	return xxx_messageInfo_StartScanRunRequest.Size(m)
+}
+func (m *StartScanRunRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StartScanRunRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StartScanRunRequest proto.InternalMessageInfo
+
+func (m *StartScanRunRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request for the `GetScanRun` method.
+type GetScanRunRequest struct {
+	// Required.
+	// The resource name of the ScanRun to be returned. The name follows the
+	// format of
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetScanRunRequest) Reset()         { *m = GetScanRunRequest{} }
+func (m *GetScanRunRequest) String() string { return proto.CompactTextString(m) }
+func (*GetScanRunRequest) ProtoMessage()    {}
+func (*GetScanRunRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{7}
+}
+func (m *GetScanRunRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetScanRunRequest.Unmarshal(m, b)
+}
+func (m *GetScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetScanRunRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanRunRequest.Merge(dst, src)
+}
+func (m *GetScanRunRequest) XXX_Size() int {
+	return xxx_messageInfo_GetScanRunRequest.Size(m)
+}
+func (m *GetScanRunRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetScanRunRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetScanRunRequest proto.InternalMessageInfo
+
+func (m *GetScanRunRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request for the `ListScanRuns` method.
+type ListScanRunsRequest struct {
+	// Required.
+	// The parent resource name, which should be a scan resource name in the
+	// format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// A token identifying a page of results to be returned. This should be a
+	// `next_page_token` value returned from a previous List request.
+	// If unspecified, the first page of results is returned.
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// The maximum number of ScanRuns to return, can be limited by server.
+	// If not specified or not positive, the implementation will select a
+	// reasonable value.
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListScanRunsRequest) Reset()         { *m = ListScanRunsRequest{} }
+func (m *ListScanRunsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListScanRunsRequest) ProtoMessage()    {}
+func (*ListScanRunsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{8}
+}
+func (m *ListScanRunsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListScanRunsRequest.Unmarshal(m, b)
+}
+func (m *ListScanRunsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListScanRunsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListScanRunsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanRunsRequest.Merge(dst, src)
+}
+func (m *ListScanRunsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListScanRunsRequest.Size(m)
+}
+func (m *ListScanRunsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListScanRunsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListScanRunsRequest proto.InternalMessageInfo
+
+func (m *ListScanRunsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListScanRunsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+func (m *ListScanRunsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+// Response for the `ListScanRuns` method.
+type ListScanRunsResponse struct {
+	// The list of ScanRuns returned.
+	ScanRuns []*ScanRun `protobuf:"bytes,1,rep,name=scan_runs,json=scanRuns,proto3" json:"scan_runs,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListScanRunsResponse) Reset()         { *m = ListScanRunsResponse{} }
+func (m *ListScanRunsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListScanRunsResponse) ProtoMessage()    {}
+func (*ListScanRunsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{9}
+}
+func (m *ListScanRunsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListScanRunsResponse.Unmarshal(m, b)
+}
+func (m *ListScanRunsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListScanRunsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListScanRunsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanRunsResponse.Merge(dst, src)
+}
+func (m *ListScanRunsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListScanRunsResponse.Size(m)
+}
+func (m *ListScanRunsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListScanRunsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListScanRunsResponse proto.InternalMessageInfo
+
+func (m *ListScanRunsResponse) GetScanRuns() []*ScanRun {
+	if m != nil {
+		return m.ScanRuns
+	}
+	return nil
+}
+
+func (m *ListScanRunsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request for the `StopScanRun` method.
+type StopScanRunRequest struct {
+	// Required.
+	// The resource name of the ScanRun to be stopped. The name follows the
+	// format of
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StopScanRunRequest) Reset()         { *m = StopScanRunRequest{} }
+func (m *StopScanRunRequest) String() string { return proto.CompactTextString(m) }
+func (*StopScanRunRequest) ProtoMessage()    {}
+func (*StopScanRunRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{10}
+}
+func (m *StopScanRunRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StopScanRunRequest.Unmarshal(m, b)
+}
+func (m *StopScanRunRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StopScanRunRequest.Marshal(b, m, deterministic)
+}
+func (dst *StopScanRunRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StopScanRunRequest.Merge(dst, src)
+}
+func (m *StopScanRunRequest) XXX_Size() int {
+	return xxx_messageInfo_StopScanRunRequest.Size(m)
+}
+func (m *StopScanRunRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StopScanRunRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StopScanRunRequest proto.InternalMessageInfo
+
+func (m *StopScanRunRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request for the `ListCrawledUrls` method.
+type ListCrawledUrlsRequest struct {
+	// Required.
+	// The parent resource name, which should be a scan run resource name in the
+	// format
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// A token identifying a page of results to be returned. This should be a
+	// `next_page_token` value returned from a previous List request.
+	// If unspecified, the first page of results is returned.
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// The maximum number of CrawledUrls to return, can be limited by server.
+	// If not specified or not positive, the implementation will select a
+	// reasonable value.
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCrawledUrlsRequest) Reset()         { *m = ListCrawledUrlsRequest{} }
+func (m *ListCrawledUrlsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListCrawledUrlsRequest) ProtoMessage()    {}
+func (*ListCrawledUrlsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{11}
+}
+func (m *ListCrawledUrlsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCrawledUrlsRequest.Unmarshal(m, b)
+}
+func (m *ListCrawledUrlsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCrawledUrlsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListCrawledUrlsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCrawledUrlsRequest.Merge(dst, src)
+}
+func (m *ListCrawledUrlsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListCrawledUrlsRequest.Size(m)
+}
+func (m *ListCrawledUrlsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCrawledUrlsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListCrawledUrlsRequest proto.InternalMessageInfo
+
+func (m *ListCrawledUrlsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListCrawledUrlsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+func (m *ListCrawledUrlsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+// Response for the `ListCrawledUrls` method.
+type ListCrawledUrlsResponse struct {
+	// The list of CrawledUrls returned.
+	CrawledUrls []*CrawledUrl `protobuf:"bytes,1,rep,name=crawled_urls,json=crawledUrls,proto3" json:"crawled_urls,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCrawledUrlsResponse) Reset()         { *m = ListCrawledUrlsResponse{} }
+func (m *ListCrawledUrlsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListCrawledUrlsResponse) ProtoMessage()    {}
+func (*ListCrawledUrlsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{12}
+}
+func (m *ListCrawledUrlsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCrawledUrlsResponse.Unmarshal(m, b)
+}
+func (m *ListCrawledUrlsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCrawledUrlsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListCrawledUrlsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCrawledUrlsResponse.Merge(dst, src)
+}
+func (m *ListCrawledUrlsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListCrawledUrlsResponse.Size(m)
+}
+func (m *ListCrawledUrlsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCrawledUrlsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListCrawledUrlsResponse proto.InternalMessageInfo
+
+func (m *ListCrawledUrlsResponse) GetCrawledUrls() []*CrawledUrl {
+	if m != nil {
+		return m.CrawledUrls
+	}
+	return nil
+}
+
+func (m *ListCrawledUrlsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request for the `GetFinding` method.
+type GetFindingRequest struct {
+	// Required.
+	// The resource name of the Finding to be returned. The name follows the
+	// format of
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetFindingRequest) Reset()         { *m = GetFindingRequest{} }
+func (m *GetFindingRequest) String() string { return proto.CompactTextString(m) }
+func (*GetFindingRequest) ProtoMessage()    {}
+func (*GetFindingRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{13}
+}
+func (m *GetFindingRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetFindingRequest.Unmarshal(m, b)
+}
+func (m *GetFindingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetFindingRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetFindingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFindingRequest.Merge(dst, src)
+}
+func (m *GetFindingRequest) XXX_Size() int {
+	return xxx_messageInfo_GetFindingRequest.Size(m)
+}
+func (m *GetFindingRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetFindingRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetFindingRequest proto.InternalMessageInfo
+
+func (m *GetFindingRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request for the `ListFindings` method.
+type ListFindingsRequest struct {
+	// Required.
+	// The parent resource name, which should be a scan run resource name in the
+	// format
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The filter expression. The expression must be in the format: <field>
+	// <operator> <value>.
+	// Supported field: 'finding_type'.
+	// Supported operator: '='.
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
+	// A token identifying a page of results to be returned. This should be a
+	// `next_page_token` value returned from a previous List request.
+	// If unspecified, the first page of results is returned.
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// The maximum number of Findings to return, can be limited by server.
+	// If not specified or not positive, the implementation will select a
+	// reasonable value.
+	PageSize             int32    `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListFindingsRequest) Reset()         { *m = ListFindingsRequest{} }
+func (m *ListFindingsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListFindingsRequest) ProtoMessage()    {}
+func (*ListFindingsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{14}
+}
+func (m *ListFindingsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFindingsRequest.Unmarshal(m, b)
+}
+func (m *ListFindingsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFindingsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListFindingsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsRequest.Merge(dst, src)
+}
+func (m *ListFindingsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListFindingsRequest.Size(m)
+}
+func (m *ListFindingsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFindingsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFindingsRequest proto.InternalMessageInfo
+
+func (m *ListFindingsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListFindingsRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListFindingsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+func (m *ListFindingsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+// Response for the `ListFindings` method.
+type ListFindingsResponse struct {
+	// The list of Findings returned.
+	Findings []*Finding `protobuf:"bytes,1,rep,name=findings,proto3" json:"findings,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListFindingsResponse) Reset()         { *m = ListFindingsResponse{} }
+func (m *ListFindingsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListFindingsResponse) ProtoMessage()    {}
+func (*ListFindingsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{15}
+}
+func (m *ListFindingsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFindingsResponse.Unmarshal(m, b)
+}
+func (m *ListFindingsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFindingsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListFindingsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingsResponse.Merge(dst, src)
+}
+func (m *ListFindingsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListFindingsResponse.Size(m)
+}
+func (m *ListFindingsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFindingsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFindingsResponse proto.InternalMessageInfo
+
+func (m *ListFindingsResponse) GetFindings() []*Finding {
+	if m != nil {
+		return m.Findings
+	}
+	return nil
+}
+
+func (m *ListFindingsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request for the `ListFindingTypeStats` method.
+type ListFindingTypeStatsRequest struct {
+	// Required.
+	// The parent resource name, which should be a scan run resource name in the
+	// format
+	// 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+	Parent               string   `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListFindingTypeStatsRequest) Reset()         { *m = ListFindingTypeStatsRequest{} }
+func (m *ListFindingTypeStatsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListFindingTypeStatsRequest) ProtoMessage()    {}
+func (*ListFindingTypeStatsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{16}
+}
+func (m *ListFindingTypeStatsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFindingTypeStatsRequest.Unmarshal(m, b)
+}
+func (m *ListFindingTypeStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFindingTypeStatsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListFindingTypeStatsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingTypeStatsRequest.Merge(dst, src)
+}
+func (m *ListFindingTypeStatsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListFindingTypeStatsRequest.Size(m)
+}
+func (m *ListFindingTypeStatsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFindingTypeStatsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFindingTypeStatsRequest proto.InternalMessageInfo
+
+func (m *ListFindingTypeStatsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+// Response for the `ListFindingTypeStats` method.
+type ListFindingTypeStatsResponse struct {
+	// The list of FindingTypeStats returned.
+	FindingTypeStats     []*FindingTypeStats `protobuf:"bytes,1,rep,name=finding_type_stats,json=findingTypeStats,proto3" json:"finding_type_stats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *ListFindingTypeStatsResponse) Reset()         { *m = ListFindingTypeStatsResponse{} }
+func (m *ListFindingTypeStatsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListFindingTypeStatsResponse) ProtoMessage()    {}
+func (*ListFindingTypeStatsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_web_security_scanner_f0a8594a85d56336, []int{17}
+}
+func (m *ListFindingTypeStatsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFindingTypeStatsResponse.Unmarshal(m, b)
+}
+func (m *ListFindingTypeStatsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFindingTypeStatsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListFindingTypeStatsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFindingTypeStatsResponse.Merge(dst, src)
+}
+func (m *ListFindingTypeStatsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListFindingTypeStatsResponse.Size(m)
+}
+func (m *ListFindingTypeStatsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFindingTypeStatsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFindingTypeStatsResponse proto.InternalMessageInfo
+
+func (m *ListFindingTypeStatsResponse) GetFindingTypeStats() []*FindingTypeStats {
+	if m != nil {
+		return m.FindingTypeStats
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*CreateScanConfigRequest)(nil), "google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest")
+	proto.RegisterType((*DeleteScanConfigRequest)(nil), "google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest")
+	proto.RegisterType((*GetScanConfigRequest)(nil), "google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest")
+	proto.RegisterType((*ListScanConfigsRequest)(nil), "google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest")
+	proto.RegisterType((*UpdateScanConfigRequest)(nil), "google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest")
+	proto.RegisterType((*ListScanConfigsResponse)(nil), "google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse")
+	proto.RegisterType((*StartScanRunRequest)(nil), "google.cloud.websecurityscanner.v1alpha.StartScanRunRequest")
+	proto.RegisterType((*GetScanRunRequest)(nil), "google.cloud.websecurityscanner.v1alpha.GetScanRunRequest")
+	proto.RegisterType((*ListScanRunsRequest)(nil), "google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest")
+	proto.RegisterType((*ListScanRunsResponse)(nil), "google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse")
+	proto.RegisterType((*StopScanRunRequest)(nil), "google.cloud.websecurityscanner.v1alpha.StopScanRunRequest")
+	proto.RegisterType((*ListCrawledUrlsRequest)(nil), "google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest")
+	proto.RegisterType((*ListCrawledUrlsResponse)(nil), "google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse")
+	proto.RegisterType((*GetFindingRequest)(nil), "google.cloud.websecurityscanner.v1alpha.GetFindingRequest")
+	proto.RegisterType((*ListFindingsRequest)(nil), "google.cloud.websecurityscanner.v1alpha.ListFindingsRequest")
+	proto.RegisterType((*ListFindingsResponse)(nil), "google.cloud.websecurityscanner.v1alpha.ListFindingsResponse")
+	proto.RegisterType((*ListFindingTypeStatsRequest)(nil), "google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest")
+	proto.RegisterType((*ListFindingTypeStatsResponse)(nil), "google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// WebSecurityScannerClient is the client API for WebSecurityScanner service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type WebSecurityScannerClient interface {
+	// Creates a new ScanConfig.
+	CreateScanConfig(ctx context.Context, in *CreateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
+	// Deletes an existing ScanConfig and its child resources.
+	DeleteScanConfig(ctx context.Context, in *DeleteScanConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Gets a ScanConfig.
+	GetScanConfig(ctx context.Context, in *GetScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
+	// Lists ScanConfigs under a given project.
+	ListScanConfigs(ctx context.Context, in *ListScanConfigsRequest, opts ...grpc.CallOption) (*ListScanConfigsResponse, error)
+	// Updates a ScanConfig. This method support partial update of a ScanConfig.
+	UpdateScanConfig(ctx context.Context, in *UpdateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
+	// Start a ScanRun according to the given ScanConfig.
+	StartScanRun(ctx context.Context, in *StartScanRunRequest, opts ...grpc.CallOption) (*ScanRun, error)
+	// Gets a ScanRun.
+	GetScanRun(ctx context.Context, in *GetScanRunRequest, opts ...grpc.CallOption) (*ScanRun, error)
+	// Lists ScanRuns under a given ScanConfig, in descending order of ScanRun
+	// stop time.
+	ListScanRuns(ctx context.Context, in *ListScanRunsRequest, opts ...grpc.CallOption) (*ListScanRunsResponse, error)
+	// Stops a ScanRun. The stopped ScanRun is returned.
+	StopScanRun(ctx context.Context, in *StopScanRunRequest, opts ...grpc.CallOption) (*ScanRun, error)
+	// List CrawledUrls under a given ScanRun.
+	ListCrawledUrls(ctx context.Context, in *ListCrawledUrlsRequest, opts ...grpc.CallOption) (*ListCrawledUrlsResponse, error)
+	// Gets a Finding.
+	GetFinding(ctx context.Context, in *GetFindingRequest, opts ...grpc.CallOption) (*Finding, error)
+	// List Findings under a given ScanRun.
+	ListFindings(ctx context.Context, in *ListFindingsRequest, opts ...grpc.CallOption) (*ListFindingsResponse, error)
+	// List all FindingTypeStats under a given ScanRun.
+	ListFindingTypeStats(ctx context.Context, in *ListFindingTypeStatsRequest, opts ...grpc.CallOption) (*ListFindingTypeStatsResponse, error)
+}
+
+type webSecurityScannerClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewWebSecurityScannerClient(cc *grpc.ClientConn) WebSecurityScannerClient {
+	return &webSecurityScannerClient{cc}
+}
+
+func (c *webSecurityScannerClient) CreateScanConfig(ctx context.Context, in *CreateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error) {
+	out := new(ScanConfig)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/CreateScanConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) DeleteScanConfig(ctx context.Context, in *DeleteScanConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/DeleteScanConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) GetScanConfig(ctx context.Context, in *GetScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error) {
+	out := new(ScanConfig)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetScanConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) ListScanConfigs(ctx context.Context, in *ListScanConfigsRequest, opts ...grpc.CallOption) (*ListScanConfigsResponse, error) {
+	out := new(ListScanConfigsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListScanConfigs", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) UpdateScanConfig(ctx context.Context, in *UpdateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error) {
+	out := new(ScanConfig)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/UpdateScanConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) StartScanRun(ctx context.Context, in *StartScanRunRequest, opts ...grpc.CallOption) (*ScanRun, error) {
+	out := new(ScanRun)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/StartScanRun", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) GetScanRun(ctx context.Context, in *GetScanRunRequest, opts ...grpc.CallOption) (*ScanRun, error) {
+	out := new(ScanRun)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetScanRun", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) ListScanRuns(ctx context.Context, in *ListScanRunsRequest, opts ...grpc.CallOption) (*ListScanRunsResponse, error) {
+	out := new(ListScanRunsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListScanRuns", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) StopScanRun(ctx context.Context, in *StopScanRunRequest, opts ...grpc.CallOption) (*ScanRun, error) {
+	out := new(ScanRun)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/StopScanRun", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) ListCrawledUrls(ctx context.Context, in *ListCrawledUrlsRequest, opts ...grpc.CallOption) (*ListCrawledUrlsResponse, error) {
+	out := new(ListCrawledUrlsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListCrawledUrls", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) GetFinding(ctx context.Context, in *GetFindingRequest, opts ...grpc.CallOption) (*Finding, error) {
+	out := new(Finding)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetFinding", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) ListFindings(ctx context.Context, in *ListFindingsRequest, opts ...grpc.CallOption) (*ListFindingsResponse, error) {
+	out := new(ListFindingsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListFindings", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *webSecurityScannerClient) ListFindingTypeStats(ctx context.Context, in *ListFindingTypeStatsRequest, opts ...grpc.CallOption) (*ListFindingTypeStatsResponse, error) {
+	out := new(ListFindingTypeStatsResponse)
+	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListFindingTypeStats", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// WebSecurityScannerServer is the server API for WebSecurityScanner service.
+type WebSecurityScannerServer interface {
+	// Creates a new ScanConfig.
+	CreateScanConfig(context.Context, *CreateScanConfigRequest) (*ScanConfig, error)
+	// Deletes an existing ScanConfig and its child resources.
+	DeleteScanConfig(context.Context, *DeleteScanConfigRequest) (*empty.Empty, error)
+	// Gets a ScanConfig.
+	GetScanConfig(context.Context, *GetScanConfigRequest) (*ScanConfig, error)
+	// Lists ScanConfigs under a given project.
+	ListScanConfigs(context.Context, *ListScanConfigsRequest) (*ListScanConfigsResponse, error)
+	// Updates a ScanConfig. This method support partial update of a ScanConfig.
+	UpdateScanConfig(context.Context, *UpdateScanConfigRequest) (*ScanConfig, error)
+	// Start a ScanRun according to the given ScanConfig.
+	StartScanRun(context.Context, *StartScanRunRequest) (*ScanRun, error)
+	// Gets a ScanRun.
+	GetScanRun(context.Context, *GetScanRunRequest) (*ScanRun, error)
+	// Lists ScanRuns under a given ScanConfig, in descending order of ScanRun
+	// stop time.
+	ListScanRuns(context.Context, *ListScanRunsRequest) (*ListScanRunsResponse, error)
+	// Stops a ScanRun. The stopped ScanRun is returned.
+	StopScanRun(context.Context, *StopScanRunRequest) (*ScanRun, error)
+	// List CrawledUrls under a given ScanRun.
+	ListCrawledUrls(context.Context, *ListCrawledUrlsRequest) (*ListCrawledUrlsResponse, error)
+	// Gets a Finding.
+	GetFinding(context.Context, *GetFindingRequest) (*Finding, error)
+	// List Findings under a given ScanRun.
+	ListFindings(context.Context, *ListFindingsRequest) (*ListFindingsResponse, error)
+	// List all FindingTypeStats under a given ScanRun.
+	ListFindingTypeStats(context.Context, *ListFindingTypeStatsRequest) (*ListFindingTypeStatsResponse, error)
+}
+
+func RegisterWebSecurityScannerServer(s *grpc.Server, srv WebSecurityScannerServer) {
+	s.RegisterService(&_WebSecurityScanner_serviceDesc, srv)
+}
+
+func _WebSecurityScanner_CreateScanConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateScanConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).CreateScanConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/CreateScanConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).CreateScanConfig(ctx, req.(*CreateScanConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_DeleteScanConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteScanConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).DeleteScanConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/DeleteScanConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).DeleteScanConfig(ctx, req.(*DeleteScanConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_GetScanConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetScanConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).GetScanConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetScanConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).GetScanConfig(ctx, req.(*GetScanConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_ListScanConfigs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListScanConfigsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).ListScanConfigs(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListScanConfigs",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).ListScanConfigs(ctx, req.(*ListScanConfigsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_UpdateScanConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateScanConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).UpdateScanConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/UpdateScanConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).UpdateScanConfig(ctx, req.(*UpdateScanConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_StartScanRun_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StartScanRunRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).StartScanRun(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/StartScanRun",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).StartScanRun(ctx, req.(*StartScanRunRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_GetScanRun_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetScanRunRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).GetScanRun(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetScanRun",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).GetScanRun(ctx, req.(*GetScanRunRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_ListScanRuns_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListScanRunsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).ListScanRuns(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListScanRuns",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).ListScanRuns(ctx, req.(*ListScanRunsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_StopScanRun_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StopScanRunRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).StopScanRun(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/StopScanRun",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).StopScanRun(ctx, req.(*StopScanRunRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_ListCrawledUrls_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListCrawledUrlsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).ListCrawledUrls(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListCrawledUrls",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).ListCrawledUrls(ctx, req.(*ListCrawledUrlsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_GetFinding_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetFindingRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).GetFinding(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetFinding",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).GetFinding(ctx, req.(*GetFindingRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_ListFindings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListFindingsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).ListFindings(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListFindings",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).ListFindings(ctx, req.(*ListFindingsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _WebSecurityScanner_ListFindingTypeStats_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListFindingTypeStatsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(WebSecurityScannerServer).ListFindingTypeStats(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListFindingTypeStats",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(WebSecurityScannerServer).ListFindingTypeStats(ctx, req.(*ListFindingTypeStatsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _WebSecurityScanner_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner",
+	HandlerType: (*WebSecurityScannerServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "CreateScanConfig",
+			Handler:    _WebSecurityScanner_CreateScanConfig_Handler,
+		},
+		{
+			MethodName: "DeleteScanConfig",
+			Handler:    _WebSecurityScanner_DeleteScanConfig_Handler,
+		},
+		{
+			MethodName: "GetScanConfig",
+			Handler:    _WebSecurityScanner_GetScanConfig_Handler,
+		},
+		{
+			MethodName: "ListScanConfigs",
+			Handler:    _WebSecurityScanner_ListScanConfigs_Handler,
+		},
+		{
+			MethodName: "UpdateScanConfig",
+			Handler:    _WebSecurityScanner_UpdateScanConfig_Handler,
+		},
+		{
+			MethodName: "StartScanRun",
+			Handler:    _WebSecurityScanner_StartScanRun_Handler,
+		},
+		{
+			MethodName: "GetScanRun",
+			Handler:    _WebSecurityScanner_GetScanRun_Handler,
+		},
+		{
+			MethodName: "ListScanRuns",
+			Handler:    _WebSecurityScanner_ListScanRuns_Handler,
+		},
+		{
+			MethodName: "StopScanRun",
+			Handler:    _WebSecurityScanner_StopScanRun_Handler,
+		},
+		{
+			MethodName: "ListCrawledUrls",
+			Handler:    _WebSecurityScanner_ListCrawledUrls_Handler,
+		},
+		{
+			MethodName: "GetFinding",
+			Handler:    _WebSecurityScanner_GetFinding_Handler,
+		},
+		{
+			MethodName: "ListFindings",
+			Handler:    _WebSecurityScanner_ListFindings_Handler,
+		},
+		{
+			MethodName: "ListFindingTypeStats",
+			Handler:    _WebSecurityScanner_ListFindingTypeStats_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto", fileDescriptor_web_security_scanner_f0a8594a85d56336)
+}
+
+var fileDescriptor_web_security_scanner_f0a8594a85d56336 = []byte{
+	// 1115 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcf, 0x6f, 0x1b, 0x45,
+	0x14, 0xd6, 0xb4, 0x25, 0x4a, 0x9e, 0x53, 0x35, 0x4c, 0xa3, 0x38, 0xda, 0x14, 0xc9, 0xda, 0x03,
+	0x35, 0x46, 0x78, 0x4b, 0x42, 0x80, 0x38, 0x18, 0x42, 0xdc, 0x06, 0x90, 0x5a, 0x14, 0xd9, 0x29,
+	0x08, 0x2e, 0xab, 0x8d, 0x3d, 0x36, 0x4b, 0x36, 0xb3, 0xcb, 0xce, 0x98, 0x92, 0xa2, 0x1e, 0xe0,
+	0xc2, 0x05, 0x4e, 0x9c, 0xb8, 0x70, 0xe1, 0xca, 0x15, 0x21, 0x8e, 0x70, 0x40, 0x3d, 0x22, 0x95,
+	0x3b, 0x17, 0xfe, 0x03, 0xfe, 0x01, 0xb4, 0xb3, 0xb3, 0xf6, 0x78, 0x77, 0x6b, 0xef, 0x38, 0xca,
+	0x6d, 0xe7, 0xd7, 0x9b, 0xef, 0x7d, 0xef, 0xbd, 0x79, 0x9f, 0x16, 0xf6, 0x07, 0xbe, 0x3f, 0xf0,
+	0x88, 0xd5, 0xf5, 0xfc, 0x61, 0xcf, 0x7a, 0x40, 0x8e, 0x19, 0xe9, 0x0e, 0x43, 0x97, 0x9f, 0xb1,
+	0xae, 0x43, 0x29, 0x09, 0xad, 0xcf, 0x5f, 0x76, 0xbc, 0xe0, 0x13, 0x27, 0x5a, 0xb2, 0x93, 0x35,
+	0x5b, 0x2e, 0xd6, 0x83, 0xd0, 0xe7, 0x3e, 0xbe, 0x19, 0xdb, 0xa8, 0x0b, 0x1b, 0xf5, 0xac, 0x8d,
+	0xba, 0xb4, 0x61, 0xdc, 0x90, 0x97, 0x39, 0x81, 0x6b, 0x39, 0x94, 0xfa, 0xdc, 0xe1, 0xae, 0x4f,
+	0x59, 0x6c, 0xc6, 0xd8, 0x29, 0x0a, 0xa5, 0x1b, 0x3a, 0x0f, 0x3c, 0xd2, 0xb3, 0x87, 0xa1, 0x27,
+	0x8f, 0x6e, 0x17, 0x3d, 0xda, 0x77, 0x69, 0xcf, 0xa5, 0x03, 0x79, 0x6c, 0x4f, 0xf3, 0x98, 0xcd,
+	0xcf, 0x02, 0x62, 0x33, 0xee, 0x70, 0x6d, 0xcc, 0xd1, 0xd8, 0xee, 0xfa, 0xb4, 0xef, 0x26, 0x97,
+	0xbf, 0xaa, 0x75, 0x34, 0x1c, 0x52, 0x79, 0x6e, 0x43, 0x9e, 0x13, 0xa3, 0xe3, 0x61, 0xdf, 0x22,
+	0xa7, 0x01, 0x3f, 0x93, 0x8b, 0x95, 0xf4, 0x62, 0xdf, 0x25, 0x5e, 0xcf, 0x3e, 0x75, 0xd8, 0x49,
+	0xbc, 0xc3, 0xfc, 0x06, 0x41, 0xb9, 0x15, 0x12, 0x87, 0x93, 0x4e, 0xd7, 0xa1, 0x2d, 0x81, 0xa8,
+	0x4d, 0x3e, 0x1b, 0x12, 0xc6, 0xf1, 0x1a, 0x2c, 0x04, 0x4e, 0x48, 0x28, 0x5f, 0x47, 0x15, 0x54,
+	0x5d, 0x6a, 0xcb, 0x11, 0x3e, 0x82, 0x92, 0x82, 0x7f, 0xfd, 0x52, 0x05, 0x55, 0x4b, 0x9b, 0x5b,
+	0xf5, 0x82, 0x61, 0xaf, 0x2b, 0x17, 0x01, 0x1b, 0x7d, 0x9b, 0x2f, 0x41, 0xf9, 0x36, 0xf1, 0x48,
+	0x1e, 0x10, 0x0c, 0x57, 0xa8, 0x73, 0x4a, 0x24, 0x0c, 0xf1, 0x6d, 0xd6, 0x60, 0xf5, 0x1d, 0xc2,
+	0x8b, 0xed, 0xf5, 0x60, 0xed, 0xae, 0xcb, 0x94, 0xcd, 0x6c, 0x96, 0x8b, 0xcf, 0x01, 0x04, 0xce,
+	0x80, 0xd8, 0xdc, 0x3f, 0x21, 0x54, 0x78, 0xb8, 0xd4, 0x5e, 0x8a, 0x66, 0x8e, 0xa2, 0x09, 0xbc,
+	0x01, 0x62, 0x60, 0x33, 0xf7, 0x21, 0x59, 0xbf, 0x5c, 0x41, 0xd5, 0x67, 0xda, 0x8b, 0xd1, 0x44,
+	0xc7, 0x7d, 0x48, 0xcc, 0x9f, 0x11, 0x94, 0xef, 0x07, 0xbd, 0x5c, 0x4a, 0x2f, 0x84, 0x3a, 0xbc,
+	0x0b, 0xa5, 0xa1, 0xb8, 0x50, 0x44, 0x56, 0x00, 0x2a, 0x6d, 0x1a, 0x89, 0xd5, 0x24, 0xf8, 0xf5,
+	0x83, 0x28, 0xf8, 0xf7, 0x1c, 0x76, 0xd2, 0x86, 0x78, 0x7b, 0xf4, 0x6d, 0xfe, 0x80, 0xa0, 0x9c,
+	0x61, 0x87, 0x05, 0x3e, 0x65, 0x04, 0x7f, 0x00, 0xcb, 0x0a, 0x5c, 0xb6, 0x8e, 0x2a, 0x97, 0xe7,
+	0xc5, 0x5b, 0x1a, 0xe3, 0x65, 0xf8, 0x79, 0xb8, 0x46, 0xc9, 0x17, 0xdc, 0xce, 0x70, 0x7c, 0x35,
+	0x9a, 0x3e, 0x4c, 0x78, 0x36, 0x5f, 0x80, 0xeb, 0x1d, 0xee, 0x84, 0x02, 0x5b, 0x7b, 0x48, 0xa7,
+	0xc5, 0xf8, 0x26, 0x3c, 0x2b, 0xf3, 0x61, 0xc6, 0x46, 0x17, 0xae, 0x27, 0xee, 0xb6, 0x87, 0xf4,
+	0x42, 0x33, 0xe1, 0x3b, 0x04, 0xab, 0x93, 0x77, 0x49, 0x5e, 0xef, 0xc1, 0x52, 0x52, 0xc6, 0x09,
+	0xa9, 0xb7, 0xb4, 0x48, 0x8d, 0x7c, 0x5c, 0x64, 0xd2, 0x6c, 0x61, 0x3a, 0xab, 0x80, 0x3b, 0xdc,
+	0x0f, 0x0a, 0x90, 0x24, 0x2b, 0xa6, 0x15, 0x3f, 0xad, 0xf7, 0x43, 0xef, 0x42, 0x79, 0x4a, 0x52,
+	0x70, 0xe2, 0xba, 0x71, 0x0a, 0x2a, 0x0f, 0xbc, 0x7e, 0x0a, 0x8e, 0x6d, 0xb6, 0x4b, 0xdd, 0xb1,
+	0xfd, 0xc2, 0x9c, 0xc5, 0x79, 0x75, 0x10, 0xbf, 0xf8, 0xd3, 0x28, 0xfb, 0x0a, 0xc5, 0x89, 0x25,
+	0xb7, 0xce, 0x24, 0x6c, 0x0d, 0x16, 0xfa, 0xae, 0xc7, 0x49, 0x28, 0xef, 0x95, 0xa3, 0x14, 0x91,
+	0x97, 0xa7, 0x12, 0x79, 0x25, 0x45, 0xe4, 0xb7, 0x32, 0xe1, 0xc6, 0x18, 0x24, 0x8b, 0x77, 0x61,
+	0x51, 0x36, 0x2d, 0xfd, 0x7c, 0x4b, 0x7c, 0x1f, 0x59, 0x28, 0xcc, 0xdd, 0x36, 0x6c, 0x28, 0x68,
+	0x8e, 0xce, 0x02, 0xd2, 0x89, 0x9a, 0xe5, 0x0c, 0x66, 0xa2, 0x9e, 0x74, 0x23, 0xff, 0x9c, 0xf4,
+	0x66, 0x00, 0x38, 0xdb, 0x82, 0xa5, 0x5f, 0x3b, 0xba, 0x7e, 0x8d, 0xcd, 0xaf, 0xf4, 0x53, 0x33,
+	0x9b, 0x7f, 0xad, 0x02, 0xfe, 0x90, 0x1c, 0x77, 0xa4, 0x85, 0x4e, 0x6c, 0x01, 0x3f, 0x46, 0xb0,
+	0x92, 0x6e, 0x9a, 0x78, 0x4f, 0x23, 0x25, 0x73, 0xfb, 0xad, 0x31, 0xcf, 0xbb, 0x6a, 0x36, 0xbf,
+	0x7e, 0xf2, 0xef, 0xf7, 0x97, 0x5e, 0x33, 0xab, 0x23, 0x81, 0xf0, 0x65, 0x4c, 0x63, 0x33, 0x08,
+	0xfd, 0x4f, 0x49, 0x97, 0x33, 0xab, 0xf6, 0xc8, 0x52, 0x1e, 0xdf, 0x86, 0xda, 0x81, 0xf0, 0x8f,
+	0x08, 0x56, 0xd2, 0x6d, 0x57, 0xc3, 0x95, 0xa7, 0x74, 0x6c, 0x63, 0x2d, 0xd3, 0x7c, 0xee, 0x44,
+	0xb2, 0xc4, 0xbc, 0x25, 0xd0, 0xd6, 0x6a, 0x0a, 0xda, 0xa8, 0x78, 0x14, 0xac, 0x2a, 0x54, 0xab,
+	0xf6, 0x08, 0xff, 0x82, 0xe0, 0xea, 0x44, 0xa3, 0xc7, 0xcd, 0xc2, 0xe8, 0xf2, 0x04, 0xc2, 0x7c,
+	0x2c, 0x4b, 0xdc, 0xb8, 0x38, 0xee, 0x3f, 0x11, 0x5c, 0x4b, 0xb5, 0x55, 0xfc, 0x56, 0xe1, 0xab,
+	0xf3, 0xe5, 0x8a, 0xb1, 0x37, 0xbf, 0x81, 0xb8, 0x74, 0xf2, 0x1c, 0x99, 0x9e, 0x2e, 0xf8, 0x6f,
+	0x04, 0x2b, 0x69, 0x39, 0xa3, 0x91, 0x21, 0x4f, 0x51, 0x42, 0xf3, 0x85, 0xe1, 0x3d, 0x81, 0xbe,
+	0xb5, 0xf9, 0xca, 0x18, 0xbd, 0xaa, 0xa4, 0xa7, 0x87, 0x64, 0x32, 0xf1, 0x7f, 0x43, 0xb0, 0xac,
+	0x6a, 0x0b, 0xfc, 0x46, 0x71, 0x40, 0x59, 0x49, 0x62, 0x68, 0xb7, 0x6f, 0x73, 0x47, 0xf8, 0xb2,
+	0x65, 0xd6, 0x8b, 0xa6, 0x54, 0x83, 0x45, 0xf7, 0x36, 0x50, 0x0d, 0xff, 0x8a, 0x00, 0xc6, 0x62,
+	0x07, 0x37, 0x74, 0x0b, 0xe2, 0x5c, 0xb8, 0x77, 0x05, 0xee, 0x6d, 0xbc, 0x55, 0x10, 0xb7, 0x95,
+	0xc8, 0x94, 0xa8, 0x2a, 0x1e, 0x23, 0x58, 0x56, 0x15, 0x91, 0x06, 0xeb, 0x39, 0xa2, 0xcd, 0x68,
+	0xce, 0x79, 0x5a, 0x16, 0x43, 0x8e, 0x2b, 0x99, 0x62, 0x48, 0x05, 0x61, 0xe4, 0x0d, 0xfe, 0x1d,
+	0x41, 0x49, 0x51, 0x53, 0x78, 0x57, 0x23, 0x7f, 0xd2, 0x1a, 0x6c, 0x8e, 0x30, 0xb4, 0x04, 0xf6,
+	0xa6, 0xf9, 0xfa, 0x1c, 0x61, 0x68, 0x30, 0xee, 0x07, 0x51, 0x22, 0xfd, 0x23, 0x1f, 0x29, 0x45,
+	0x78, 0x69, 0x3e, 0x52, 0x59, 0x85, 0xa8, 0xf9, 0x48, 0xe5, 0x68, 0xbe, 0xa4, 0xcc, 0xf1, 0xdb,
+	0x85, 0xe3, 0xa2, 0x7a, 0x67, 0xa9, 0x32, 0xef, 0x8f, 0xb8, 0x54, 0x64, 0xaf, 0xd7, 0x2b, 0x95,
+	0x49, 0xd1, 0x67, 0x68, 0x2b, 0x26, 0xf3, 0x40, 0xf8, 0xb1, 0x87, 0xdf, 0xd4, 0x8f, 0x51, 0xf2,
+	0x8f, 0x41, 0x54, 0xcd, 0x13, 0x59, 0x35, 0x89, 0xac, 0xd3, 0xac, 0x9a, 0x94, 0x22, 0xd5, 0xac,
+	0x9a, 0xb4, 0x96, 0xcc, 0xf3, 0x4a, 0x27, 0x3a, 0x23, 0x15, 0xf9, 0xdf, 0xa4, 0x58, 0x1d, 0xa9,
+	0x2e, 0x7c, 0x7b, 0x1e, 0x7c, 0x69, 0x75, 0x69, 0xdc, 0x39, 0xa7, 0x15, 0xe9, 0xed, 0xfb, 0xc2,
+	0xdb, 0x77, 0xf1, 0xc1, 0xb9, 0xbc, 0x1d, 0xd9, 0xdd, 0xff, 0x09, 0xc1, 0x8b, 0x5d, 0xff, 0xb4,
+	0x28, 0xb8, 0xfd, 0x72, 0x56, 0x7f, 0x1e, 0x46, 0x9a, 0xea, 0x10, 0x7d, 0xfc, 0x91, 0xb4, 0x31,
+	0xf0, 0x3d, 0x87, 0x0e, 0xea, 0x7e, 0x38, 0xb0, 0x06, 0x84, 0x0a, 0xc5, 0x65, 0xc5, 0x4b, 0x4e,
+	0xe0, 0xb2, 0x99, 0x7f, 0x94, 0x76, 0xb3, 0x4b, 0xc7, 0x0b, 0xc2, 0xca, 0xd6, 0xff, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x32, 0x00, 0x5e, 0x95, 0x10, 0x14, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/container/v1/cluster_service.pb.go b/vendor/google.golang.org/genproto/googleapis/container/v1/cluster_service.pb.go
index 15da6ae8..066adb87 100644
--- a/vendor/google.golang.org/genproto/googleapis/container/v1/cluster_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/container/v1/cluster_service.pb.go
@@ -1,78 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1/cluster_service.proto
 
-/*
-Package container is a generated protocol buffer package.
-
-It is generated from these files:
-	google/container/v1/cluster_service.proto
-
-It has these top-level messages:
-	NodeConfig
-	MasterAuth
-	ClientCertificateConfig
-	AddonsConfig
-	HttpLoadBalancing
-	HorizontalPodAutoscaling
-	KubernetesDashboard
-	NetworkPolicyConfig
-	MasterAuthorizedNetworksConfig
-	LegacyAbac
-	NetworkPolicy
-	IPAllocationPolicy
-	Cluster
-	ClusterUpdate
-	Operation
-	CreateClusterRequest
-	GetClusterRequest
-	UpdateClusterRequest
-	UpdateNodePoolRequest
-	SetNodePoolAutoscalingRequest
-	SetLoggingServiceRequest
-	SetMonitoringServiceRequest
-	SetAddonsConfigRequest
-	SetLocationsRequest
-	UpdateMasterRequest
-	SetMasterAuthRequest
-	DeleteClusterRequest
-	ListClustersRequest
-	ListClustersResponse
-	GetOperationRequest
-	ListOperationsRequest
-	CancelOperationRequest
-	ListOperationsResponse
-	GetServerConfigRequest
-	ServerConfig
-	CreateNodePoolRequest
-	DeleteNodePoolRequest
-	ListNodePoolsRequest
-	GetNodePoolRequest
-	NodePool
-	NodeManagement
-	AutoUpgradeOptions
-	MaintenancePolicy
-	MaintenanceWindow
-	DailyMaintenanceWindow
-	SetNodePoolManagementRequest
-	SetNodePoolSizeRequest
-	RollbackNodePoolUpgradeRequest
-	ListNodePoolsResponse
-	NodePoolAutoscaling
-	SetLabelsRequest
-	SetLegacyAbacRequest
-	StartIPRotationRequest
-	CompleteIPRotationRequest
-	AcceleratorConfig
-	SetNetworkPolicyRequest
-	SetMaintenancePolicyRequest
-*/
-package container
+package container // import "google.golang.org/genproto/googleapis/container/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -112,7 +47,9 @@ var NetworkPolicy_Provider_value = map[string]int32{
 func (x NetworkPolicy_Provider) String() string {
 	return proto.EnumName(NetworkPolicy_Provider_name, int32(x))
 }
-func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 0} }
+func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{10, 0}
+}
 
 // The current status of the cluster.
 type Cluster_Status int32
@@ -156,7 +93,9 @@ var Cluster_Status_value = map[string]int32{
 func (x Cluster_Status) String() string {
 	return proto.EnumName(Cluster_Status_name, int32(x))
 }
-func (Cluster_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{12, 0} }
+func (Cluster_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{12, 0}
+}
 
 // Current status of the operation.
 type Operation_Status int32
@@ -192,7 +131,9 @@ var Operation_Status_value = map[string]int32{
 func (x Operation_Status) String() string {
 	return proto.EnumName(Operation_Status_name, int32(x))
 }
-func (Operation_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{14, 0} }
+func (Operation_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{14, 0}
+}
 
 // Operation type.
 type Operation_Type int32
@@ -276,7 +217,9 @@ var Operation_Type_value = map[string]int32{
 func (x Operation_Type) String() string {
 	return proto.EnumName(Operation_Type_name, int32(x))
 }
-func (Operation_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{14, 1} }
+func (Operation_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{14, 1}
+}
 
 // Operation type: what type update to perform.
 type SetMasterAuthRequest_Action int32
@@ -312,7 +255,7 @@ func (x SetMasterAuthRequest_Action) String() string {
 	return proto.EnumName(SetMasterAuthRequest_Action_name, int32(x))
 }
 func (SetMasterAuthRequest_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{25, 0}
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{25, 0}
 }
 
 // The current status of the node pool instance.
@@ -364,7 +307,9 @@ var NodePool_Status_value = map[string]int32{
 func (x NodePool_Status) String() string {
 	return proto.EnumName(NodePool_Status_name, int32(x))
 }
-func (NodePool_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{39, 0} }
+func (NodePool_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{39, 0}
+}
 
 // Parameters that describe the nodes in a cluster.
 type NodeConfig struct {
@@ -374,12 +319,12 @@ type NodeConfig struct {
 	//
 	// If unspecified, the default machine type is
 	// `n1-standard-1`.
-	MachineType string `protobuf:"bytes,1,opt,name=machine_type,json=machineType" json:"machine_type,omitempty"`
+	MachineType string `protobuf:"bytes,1,opt,name=machine_type,json=machineType,proto3" json:"machine_type,omitempty"`
 	// Size of the disk attached to each node, specified in GB.
 	// The smallest allowed disk size is 10GB.
 	//
 	// If unspecified, the default disk size is 100GB.
-	DiskSizeGb int32 `protobuf:"varint,2,opt,name=disk_size_gb,json=diskSizeGb" json:"disk_size_gb,omitempty"`
+	DiskSizeGb int32 `protobuf:"varint,2,opt,name=disk_size_gb,json=diskSizeGb,proto3" json:"disk_size_gb,omitempty"`
 	// The set of Google API scopes to be made available on all of the
 	// node VMs under the "default" service account.
 	//
@@ -394,10 +339,10 @@ type NodeConfig struct {
 	//
 	// If unspecified, no scopes are added, unless Cloud Logging or Cloud
 	// Monitoring are enabled, in which case their required scopes will be added.
-	OauthScopes []string `protobuf:"bytes,3,rep,name=oauth_scopes,json=oauthScopes" json:"oauth_scopes,omitempty"`
+	OauthScopes []string `protobuf:"bytes,3,rep,name=oauth_scopes,json=oauthScopes,proto3" json:"oauth_scopes,omitempty"`
 	// The Google Cloud Platform Service Account to be used by the node VMs. If
 	// no Service Account is specified, the "default" service account is used.
-	ServiceAccount string `protobuf:"bytes,9,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
+	ServiceAccount string `protobuf:"bytes,9,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
 	// The metadata key/value pairs assigned to instances in the cluster.
 	//
 	// Keys must conform to the regexp [a-zA-Z0-9-_]+ and be less than 128 bytes
@@ -411,10 +356,10 @@ type NodeConfig struct {
 	// that each value's size must be less than or equal to 32 KB.
 	//
 	// The total size of all keys and values must be less than 512 KB.
-	Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The image type to use for this node. Note that for a given image type,
 	// the latest version of it will be used.
-	ImageType string `protobuf:"bytes,5,opt,name=image_type,json=imageType" json:"image_type,omitempty"`
+	ImageType string `protobuf:"bytes,5,opt,name=image_type,json=imageType,proto3" json:"image_type,omitempty"`
 	// The map of Kubernetes labels (key/value pairs) to be applied to each node.
 	// These will added in addition to any default label(s) that
 	// Kubernetes may apply to the node.
@@ -423,40 +368,62 @@ type NodeConfig struct {
 	// and conflicts should be avoided.
 	// For more information, including usage and the valid values, see:
 	// https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-	Labels map[string]string `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The number of local SSD disks to be attached to the node.
 	//
 	// The limit for this value is dependant upon the maximum number of
 	// disks available on a machine per zone. See:
 	// https://cloud.google.com/compute/docs/disks/local-ssd#local_ssd_limits
 	// for more information.
-	LocalSsdCount int32 `protobuf:"varint,7,opt,name=local_ssd_count,json=localSsdCount" json:"local_ssd_count,omitempty"`
+	LocalSsdCount int32 `protobuf:"varint,7,opt,name=local_ssd_count,json=localSsdCount,proto3" json:"local_ssd_count,omitempty"`
 	// The list of instance tags applied to all nodes. Tags are used to identify
 	// valid sources or targets for network firewalls and are specified by
 	// the client during cluster or node pool creation. Each tag within the list
 	// must comply with RFC1035.
-	Tags []string `protobuf:"bytes,8,rep,name=tags" json:"tags,omitempty"`
+	Tags []string `protobuf:"bytes,8,rep,name=tags,proto3" json:"tags,omitempty"`
 	// Whether the nodes are created as preemptible VM instances. See:
 	// https://cloud.google.com/compute/docs/instances/preemptible for more
 	// information about preemptible VM instances.
-	Preemptible bool `protobuf:"varint,10,opt,name=preemptible" json:"preemptible,omitempty"`
+	Preemptible bool `protobuf:"varint,10,opt,name=preemptible,proto3" json:"preemptible,omitempty"`
 	// A list of hardware accelerators to be attached to each node.
 	// See https://cloud.google.com/compute/docs/gpus for more information about
 	// support for GPUs.
-	Accelerators []*AcceleratorConfig `protobuf:"bytes,11,rep,name=accelerators" json:"accelerators,omitempty"`
+	Accelerators []*AcceleratorConfig `protobuf:"bytes,11,rep,name=accelerators,proto3" json:"accelerators,omitempty"`
 	// Minimum CPU platform to be used by this instance. The instance may be
 	// scheduled on the specified or newer CPU platform. Applicable values are the
 	// friendly names of CPU platforms, such as
 	// <code>minCpuPlatform: &quot;Intel Haswell&quot;</code> or
 	// <code>minCpuPlatform: &quot;Intel Sandy Bridge&quot;</code>. For more
 	// information, read [how to specify min CPU platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform)
-	MinCpuPlatform string `protobuf:"bytes,13,opt,name=min_cpu_platform,json=minCpuPlatform" json:"min_cpu_platform,omitempty"`
+	MinCpuPlatform       string   `protobuf:"bytes,13,opt,name=min_cpu_platform,json=minCpuPlatform,proto3" json:"min_cpu_platform,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NodeConfig) Reset()                    { *m = NodeConfig{} }
-func (m *NodeConfig) String() string            { return proto.CompactTextString(m) }
-func (*NodeConfig) ProtoMessage()               {}
-func (*NodeConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *NodeConfig) Reset()         { *m = NodeConfig{} }
+func (m *NodeConfig) String() string { return proto.CompactTextString(m) }
+func (*NodeConfig) ProtoMessage()    {}
+func (*NodeConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{0}
+}
+func (m *NodeConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeConfig.Unmarshal(m, b)
+}
+func (m *NodeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeConfig.Marshal(b, m, deterministic)
+}
+func (dst *NodeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeConfig.Merge(dst, src)
+}
+func (m *NodeConfig) XXX_Size() int {
+	return xxx_messageInfo_NodeConfig.Size(m)
+}
+func (m *NodeConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeConfig proto.InternalMessageInfo
 
 func (m *NodeConfig) GetMachineType() string {
 	if m != nil {
@@ -549,30 +516,52 @@ type MasterAuth struct {
 	// The username to use for HTTP basic authentication to the master endpoint.
 	// For clusters v1.6.0 and later, you can disable basic authentication by
 	// providing an empty username.
-	Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
+	Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
 	// The password to use for HTTP basic authentication to the master endpoint.
 	// Because the master endpoint is open to the Internet, you should create a
 	// strong password.  If a password is provided for cluster creation, username
 	// must be non-empty.
-	Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
+	Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
 	// Configuration for client certificate authentication on the cluster.  If no
 	// configuration is specified, a client certificate is issued.
-	ClientCertificateConfig *ClientCertificateConfig `protobuf:"bytes,3,opt,name=client_certificate_config,json=clientCertificateConfig" json:"client_certificate_config,omitempty"`
+	ClientCertificateConfig *ClientCertificateConfig `protobuf:"bytes,3,opt,name=client_certificate_config,json=clientCertificateConfig,proto3" json:"client_certificate_config,omitempty"`
 	// [Output only] Base64-encoded public certificate that is the root of
 	// trust for the cluster.
-	ClusterCaCertificate string `protobuf:"bytes,100,opt,name=cluster_ca_certificate,json=clusterCaCertificate" json:"cluster_ca_certificate,omitempty"`
+	ClusterCaCertificate string `protobuf:"bytes,100,opt,name=cluster_ca_certificate,json=clusterCaCertificate,proto3" json:"cluster_ca_certificate,omitempty"`
 	// [Output only] Base64-encoded public certificate used by clients to
 	// authenticate to the cluster endpoint.
-	ClientCertificate string `protobuf:"bytes,101,opt,name=client_certificate,json=clientCertificate" json:"client_certificate,omitempty"`
+	ClientCertificate string `protobuf:"bytes,101,opt,name=client_certificate,json=clientCertificate,proto3" json:"client_certificate,omitempty"`
 	// [Output only] Base64-encoded private key used by clients to authenticate
 	// to the cluster endpoint.
-	ClientKey string `protobuf:"bytes,102,opt,name=client_key,json=clientKey" json:"client_key,omitempty"`
+	ClientKey            string   `protobuf:"bytes,102,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MasterAuth) Reset()         { *m = MasterAuth{} }
+func (m *MasterAuth) String() string { return proto.CompactTextString(m) }
+func (*MasterAuth) ProtoMessage()    {}
+func (*MasterAuth) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{1}
+}
+func (m *MasterAuth) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuth.Unmarshal(m, b)
+}
+func (m *MasterAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuth.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuth) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuth.Merge(dst, src)
+}
+func (m *MasterAuth) XXX_Size() int {
+	return xxx_messageInfo_MasterAuth.Size(m)
+}
+func (m *MasterAuth) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuth.DiscardUnknown(m)
 }
 
-func (m *MasterAuth) Reset()                    { *m = MasterAuth{} }
-func (m *MasterAuth) String() string            { return proto.CompactTextString(m) }
-func (*MasterAuth) ProtoMessage()               {}
-func (*MasterAuth) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_MasterAuth proto.InternalMessageInfo
 
 func (m *MasterAuth) GetUsername() string {
 	if m != nil {
@@ -619,13 +608,35 @@ func (m *MasterAuth) GetClientKey() string {
 // Configuration for client certificates on the cluster.
 type ClientCertificateConfig struct {
 	// Issue a client certificate.
-	IssueClientCertificate bool `protobuf:"varint,1,opt,name=issue_client_certificate,json=issueClientCertificate" json:"issue_client_certificate,omitempty"`
+	IssueClientCertificate bool     `protobuf:"varint,1,opt,name=issue_client_certificate,json=issueClientCertificate,proto3" json:"issue_client_certificate,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
+}
+
+func (m *ClientCertificateConfig) Reset()         { *m = ClientCertificateConfig{} }
+func (m *ClientCertificateConfig) String() string { return proto.CompactTextString(m) }
+func (*ClientCertificateConfig) ProtoMessage()    {}
+func (*ClientCertificateConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{2}
+}
+func (m *ClientCertificateConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientCertificateConfig.Unmarshal(m, b)
+}
+func (m *ClientCertificateConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientCertificateConfig.Marshal(b, m, deterministic)
+}
+func (dst *ClientCertificateConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientCertificateConfig.Merge(dst, src)
+}
+func (m *ClientCertificateConfig) XXX_Size() int {
+	return xxx_messageInfo_ClientCertificateConfig.Size(m)
+}
+func (m *ClientCertificateConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientCertificateConfig.DiscardUnknown(m)
 }
 
-func (m *ClientCertificateConfig) Reset()                    { *m = ClientCertificateConfig{} }
-func (m *ClientCertificateConfig) String() string            { return proto.CompactTextString(m) }
-func (*ClientCertificateConfig) ProtoMessage()               {}
-func (*ClientCertificateConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_ClientCertificateConfig proto.InternalMessageInfo
 
 func (m *ClientCertificateConfig) GetIssueClientCertificate() bool {
 	if m != nil {
@@ -639,23 +650,45 @@ func (m *ClientCertificateConfig) GetIssueClientCertificate() bool {
 type AddonsConfig struct {
 	// Configuration for the HTTP (L7) load balancing controller addon, which
 	// makes it easy to set up HTTP load balancers for services in a cluster.
-	HttpLoadBalancing *HttpLoadBalancing `protobuf:"bytes,1,opt,name=http_load_balancing,json=httpLoadBalancing" json:"http_load_balancing,omitempty"`
+	HttpLoadBalancing *HttpLoadBalancing `protobuf:"bytes,1,opt,name=http_load_balancing,json=httpLoadBalancing,proto3" json:"http_load_balancing,omitempty"`
 	// Configuration for the horizontal pod autoscaling feature, which
 	// increases or decreases the number of replica pods a replication controller
 	// has based on the resource usage of the existing pods.
-	HorizontalPodAutoscaling *HorizontalPodAutoscaling `protobuf:"bytes,2,opt,name=horizontal_pod_autoscaling,json=horizontalPodAutoscaling" json:"horizontal_pod_autoscaling,omitempty"`
+	HorizontalPodAutoscaling *HorizontalPodAutoscaling `protobuf:"bytes,2,opt,name=horizontal_pod_autoscaling,json=horizontalPodAutoscaling,proto3" json:"horizontal_pod_autoscaling,omitempty"`
 	// Configuration for the Kubernetes Dashboard.
-	KubernetesDashboard *KubernetesDashboard `protobuf:"bytes,3,opt,name=kubernetes_dashboard,json=kubernetesDashboard" json:"kubernetes_dashboard,omitempty"`
+	KubernetesDashboard *KubernetesDashboard `protobuf:"bytes,3,opt,name=kubernetes_dashboard,json=kubernetesDashboard,proto3" json:"kubernetes_dashboard,omitempty"`
 	// Configuration for NetworkPolicy. This only tracks whether the addon
 	// is enabled or not on the Master, it does not track whether network policy
 	// is enabled for the nodes.
-	NetworkPolicyConfig *NetworkPolicyConfig `protobuf:"bytes,4,opt,name=network_policy_config,json=networkPolicyConfig" json:"network_policy_config,omitempty"`
+	NetworkPolicyConfig  *NetworkPolicyConfig `protobuf:"bytes,4,opt,name=network_policy_config,json=networkPolicyConfig,proto3" json:"network_policy_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *AddonsConfig) Reset()                    { *m = AddonsConfig{} }
-func (m *AddonsConfig) String() string            { return proto.CompactTextString(m) }
-func (*AddonsConfig) ProtoMessage()               {}
-func (*AddonsConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *AddonsConfig) Reset()         { *m = AddonsConfig{} }
+func (m *AddonsConfig) String() string { return proto.CompactTextString(m) }
+func (*AddonsConfig) ProtoMessage()    {}
+func (*AddonsConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{3}
+}
+func (m *AddonsConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AddonsConfig.Unmarshal(m, b)
+}
+func (m *AddonsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AddonsConfig.Marshal(b, m, deterministic)
+}
+func (dst *AddonsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddonsConfig.Merge(dst, src)
+}
+func (m *AddonsConfig) XXX_Size() int {
+	return xxx_messageInfo_AddonsConfig.Size(m)
+}
+func (m *AddonsConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AddonsConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AddonsConfig proto.InternalMessageInfo
 
 func (m *AddonsConfig) GetHttpLoadBalancing() *HttpLoadBalancing {
 	if m != nil {
@@ -691,13 +724,35 @@ type HttpLoadBalancing struct {
 	// Whether the HTTP Load Balancing controller is enabled in the cluster.
 	// When enabled, it runs a small pod in the cluster that manages the load
 	// balancers.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HttpLoadBalancing) Reset()         { *m = HttpLoadBalancing{} }
+func (m *HttpLoadBalancing) String() string { return proto.CompactTextString(m) }
+func (*HttpLoadBalancing) ProtoMessage()    {}
+func (*HttpLoadBalancing) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{4}
+}
+func (m *HttpLoadBalancing) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpLoadBalancing.Unmarshal(m, b)
+}
+func (m *HttpLoadBalancing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpLoadBalancing.Marshal(b, m, deterministic)
+}
+func (dst *HttpLoadBalancing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpLoadBalancing.Merge(dst, src)
+}
+func (m *HttpLoadBalancing) XXX_Size() int {
+	return xxx_messageInfo_HttpLoadBalancing.Size(m)
+}
+func (m *HttpLoadBalancing) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpLoadBalancing.DiscardUnknown(m)
 }
 
-func (m *HttpLoadBalancing) Reset()                    { *m = HttpLoadBalancing{} }
-func (m *HttpLoadBalancing) String() string            { return proto.CompactTextString(m) }
-func (*HttpLoadBalancing) ProtoMessage()               {}
-func (*HttpLoadBalancing) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_HttpLoadBalancing proto.InternalMessageInfo
 
 func (m *HttpLoadBalancing) GetDisabled() bool {
 	if m != nil {
@@ -713,13 +768,35 @@ type HorizontalPodAutoscaling struct {
 	// Whether the Horizontal Pod Autoscaling feature is enabled in the cluster.
 	// When enabled, it ensures that a Heapster pod is running in the cluster,
 	// which is also used by the Cloud Monitoring service.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *HorizontalPodAutoscaling) Reset()                    { *m = HorizontalPodAutoscaling{} }
-func (m *HorizontalPodAutoscaling) String() string            { return proto.CompactTextString(m) }
-func (*HorizontalPodAutoscaling) ProtoMessage()               {}
-func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *HorizontalPodAutoscaling) Reset()         { *m = HorizontalPodAutoscaling{} }
+func (m *HorizontalPodAutoscaling) String() string { return proto.CompactTextString(m) }
+func (*HorizontalPodAutoscaling) ProtoMessage()    {}
+func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{5}
+}
+func (m *HorizontalPodAutoscaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Unmarshal(m, b)
+}
+func (m *HorizontalPodAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Marshal(b, m, deterministic)
+}
+func (dst *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HorizontalPodAutoscaling.Merge(dst, src)
+}
+func (m *HorizontalPodAutoscaling) XXX_Size() int {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Size(m)
+}
+func (m *HorizontalPodAutoscaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_HorizontalPodAutoscaling.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HorizontalPodAutoscaling proto.InternalMessageInfo
 
 func (m *HorizontalPodAutoscaling) GetDisabled() bool {
 	if m != nil {
@@ -731,13 +808,35 @@ func (m *HorizontalPodAutoscaling) GetDisabled() bool {
 // Configuration for the Kubernetes Dashboard.
 type KubernetesDashboard struct {
 	// Whether the Kubernetes Dashboard is enabled for this cluster.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KubernetesDashboard) Reset()         { *m = KubernetesDashboard{} }
+func (m *KubernetesDashboard) String() string { return proto.CompactTextString(m) }
+func (*KubernetesDashboard) ProtoMessage()    {}
+func (*KubernetesDashboard) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{6}
+}
+func (m *KubernetesDashboard) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KubernetesDashboard.Unmarshal(m, b)
+}
+func (m *KubernetesDashboard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KubernetesDashboard.Marshal(b, m, deterministic)
+}
+func (dst *KubernetesDashboard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KubernetesDashboard.Merge(dst, src)
+}
+func (m *KubernetesDashboard) XXX_Size() int {
+	return xxx_messageInfo_KubernetesDashboard.Size(m)
+}
+func (m *KubernetesDashboard) XXX_DiscardUnknown() {
+	xxx_messageInfo_KubernetesDashboard.DiscardUnknown(m)
 }
 
-func (m *KubernetesDashboard) Reset()                    { *m = KubernetesDashboard{} }
-func (m *KubernetesDashboard) String() string            { return proto.CompactTextString(m) }
-func (*KubernetesDashboard) ProtoMessage()               {}
-func (*KubernetesDashboard) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_KubernetesDashboard proto.InternalMessageInfo
 
 func (m *KubernetesDashboard) GetDisabled() bool {
 	if m != nil {
@@ -751,13 +850,35 @@ func (m *KubernetesDashboard) GetDisabled() bool {
 // is enabled for the nodes.
 type NetworkPolicyConfig struct {
 	// Whether NetworkPolicy is enabled for this cluster.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NetworkPolicyConfig) Reset()                    { *m = NetworkPolicyConfig{} }
-func (m *NetworkPolicyConfig) String() string            { return proto.CompactTextString(m) }
-func (*NetworkPolicyConfig) ProtoMessage()               {}
-func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *NetworkPolicyConfig) Reset()         { *m = NetworkPolicyConfig{} }
+func (m *NetworkPolicyConfig) String() string { return proto.CompactTextString(m) }
+func (*NetworkPolicyConfig) ProtoMessage()    {}
+func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{7}
+}
+func (m *NetworkPolicyConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NetworkPolicyConfig.Unmarshal(m, b)
+}
+func (m *NetworkPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NetworkPolicyConfig.Marshal(b, m, deterministic)
+}
+func (dst *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicyConfig.Merge(dst, src)
+}
+func (m *NetworkPolicyConfig) XXX_Size() int {
+	return xxx_messageInfo_NetworkPolicyConfig.Size(m)
+}
+func (m *NetworkPolicyConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_NetworkPolicyConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NetworkPolicyConfig proto.InternalMessageInfo
 
 func (m *NetworkPolicyConfig) GetDisabled() bool {
 	if m != nil {
@@ -773,16 +894,38 @@ func (m *NetworkPolicyConfig) GetDisabled() bool {
 // Google Compute Engine Public IPs and Google Prod IPs.
 type MasterAuthorizedNetworksConfig struct {
 	// Whether or not master authorized networks is enabled.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// cidr_blocks define up to 10 external networks that could access
 	// Kubernetes master through HTTPS.
-	CidrBlocks []*MasterAuthorizedNetworksConfig_CidrBlock `protobuf:"bytes,2,rep,name=cidr_blocks,json=cidrBlocks" json:"cidr_blocks,omitempty"`
+	CidrBlocks           []*MasterAuthorizedNetworksConfig_CidrBlock `protobuf:"bytes,2,rep,name=cidr_blocks,json=cidrBlocks,proto3" json:"cidr_blocks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                    `json:"-"`
+	XXX_unrecognized     []byte                                      `json:"-"`
+	XXX_sizecache        int32                                       `json:"-"`
+}
+
+func (m *MasterAuthorizedNetworksConfig) Reset()         { *m = MasterAuthorizedNetworksConfig{} }
+func (m *MasterAuthorizedNetworksConfig) String() string { return proto.CompactTextString(m) }
+func (*MasterAuthorizedNetworksConfig) ProtoMessage()    {}
+func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{8}
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Unmarshal(m, b)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(dst, src)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Size() int {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Size(m)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.DiscardUnknown(m)
 }
 
-func (m *MasterAuthorizedNetworksConfig) Reset()                    { *m = MasterAuthorizedNetworksConfig{} }
-func (m *MasterAuthorizedNetworksConfig) String() string            { return proto.CompactTextString(m) }
-func (*MasterAuthorizedNetworksConfig) ProtoMessage()               {}
-func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_MasterAuthorizedNetworksConfig proto.InternalMessageInfo
 
 func (m *MasterAuthorizedNetworksConfig) GetEnabled() bool {
 	if m != nil {
@@ -801,9 +944,12 @@ func (m *MasterAuthorizedNetworksConfig) GetCidrBlocks() []*MasterAuthorizedNetw
 // CidrBlock contains an optional name and one CIDR block.
 type MasterAuthorizedNetworksConfig_CidrBlock struct {
 	// display_name is an optional field for users to identify CIDR blocks.
-	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// cidr_block must be specified in CIDR notation.
-	CidrBlock string `protobuf:"bytes,2,opt,name=cidr_block,json=cidrBlock" json:"cidr_block,omitempty"`
+	CidrBlock            string   `protobuf:"bytes,2,opt,name=cidr_block,json=cidrBlock,proto3" json:"cidr_block,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
@@ -812,8 +958,25 @@ func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig_CidrBlock) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig_CidrBlock) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{8, 0}
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{8, 0}
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Unmarshal(m, b)
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(dst, src)
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Size() int {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Size(m)
 }
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock proto.InternalMessageInfo
 
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) GetDisplayName() string {
 	if m != nil {
@@ -836,13 +999,35 @@ type LegacyAbac struct {
 	// identities in the system, including service accounts, nodes, and
 	// controllers, will have statically granted permissions beyond those
 	// provided by the RBAC configuration or IAM.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled              bool     `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LegacyAbac) Reset()         { *m = LegacyAbac{} }
+func (m *LegacyAbac) String() string { return proto.CompactTextString(m) }
+func (*LegacyAbac) ProtoMessage()    {}
+func (*LegacyAbac) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{9}
+}
+func (m *LegacyAbac) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LegacyAbac.Unmarshal(m, b)
+}
+func (m *LegacyAbac) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LegacyAbac.Marshal(b, m, deterministic)
+}
+func (dst *LegacyAbac) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LegacyAbac.Merge(dst, src)
+}
+func (m *LegacyAbac) XXX_Size() int {
+	return xxx_messageInfo_LegacyAbac.Size(m)
+}
+func (m *LegacyAbac) XXX_DiscardUnknown() {
+	xxx_messageInfo_LegacyAbac.DiscardUnknown(m)
 }
 
-func (m *LegacyAbac) Reset()                    { *m = LegacyAbac{} }
-func (m *LegacyAbac) String() string            { return proto.CompactTextString(m) }
-func (*LegacyAbac) ProtoMessage()               {}
-func (*LegacyAbac) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_LegacyAbac proto.InternalMessageInfo
 
 func (m *LegacyAbac) GetEnabled() bool {
 	if m != nil {
@@ -855,15 +1040,37 @@ func (m *LegacyAbac) GetEnabled() bool {
 // https://kubernetes.io/docs/concepts/services-networking/networkpolicies/
 type NetworkPolicy struct {
 	// The selected network policy provider.
-	Provider NetworkPolicy_Provider `protobuf:"varint,1,opt,name=provider,enum=google.container.v1.NetworkPolicy_Provider" json:"provider,omitempty"`
+	Provider NetworkPolicy_Provider `protobuf:"varint,1,opt,name=provider,proto3,enum=google.container.v1.NetworkPolicy_Provider" json:"provider,omitempty"`
 	// Whether network policy is enabled on the cluster.
-	Enabled bool `protobuf:"varint,2,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled              bool     `protobuf:"varint,2,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NetworkPolicy) Reset()                    { *m = NetworkPolicy{} }
-func (m *NetworkPolicy) String() string            { return proto.CompactTextString(m) }
-func (*NetworkPolicy) ProtoMessage()               {}
-func (*NetworkPolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *NetworkPolicy) Reset()         { *m = NetworkPolicy{} }
+func (m *NetworkPolicy) String() string { return proto.CompactTextString(m) }
+func (*NetworkPolicy) ProtoMessage()    {}
+func (*NetworkPolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{10}
+}
+func (m *NetworkPolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NetworkPolicy.Unmarshal(m, b)
+}
+func (m *NetworkPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NetworkPolicy.Marshal(b, m, deterministic)
+}
+func (dst *NetworkPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicy.Merge(dst, src)
+}
+func (m *NetworkPolicy) XXX_Size() int {
+	return xxx_messageInfo_NetworkPolicy.Size(m)
+}
+func (m *NetworkPolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_NetworkPolicy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NetworkPolicy proto.InternalMessageInfo
 
 func (m *NetworkPolicy) GetProvider() NetworkPolicy_Provider {
 	if m != nil {
@@ -882,21 +1089,21 @@ func (m *NetworkPolicy) GetEnabled() bool {
 // Configuration for controlling how IPs are allocated in the cluster.
 type IPAllocationPolicy struct {
 	// Whether alias IPs will be used for pod IPs in the cluster.
-	UseIpAliases bool `protobuf:"varint,1,opt,name=use_ip_aliases,json=useIpAliases" json:"use_ip_aliases,omitempty"`
+	UseIpAliases bool `protobuf:"varint,1,opt,name=use_ip_aliases,json=useIpAliases,proto3" json:"use_ip_aliases,omitempty"`
 	// Whether a new subnetwork will be created automatically for the cluster.
 	//
 	// This field is only applicable when `use_ip_aliases` is true.
-	CreateSubnetwork bool `protobuf:"varint,2,opt,name=create_subnetwork,json=createSubnetwork" json:"create_subnetwork,omitempty"`
+	CreateSubnetwork bool `protobuf:"varint,2,opt,name=create_subnetwork,json=createSubnetwork,proto3" json:"create_subnetwork,omitempty"`
 	// A custom subnetwork name to be used if `create_subnetwork` is true.  If
 	// this field is empty, then an automatic name will be chosen for the new
 	// subnetwork.
-	SubnetworkName string `protobuf:"bytes,3,opt,name=subnetwork_name,json=subnetworkName" json:"subnetwork_name,omitempty"`
+	SubnetworkName string `protobuf:"bytes,3,opt,name=subnetwork_name,json=subnetworkName,proto3" json:"subnetwork_name,omitempty"`
 	// This field is deprecated, use cluster_ipv4_cidr_block.
-	ClusterIpv4Cidr string `protobuf:"bytes,4,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr" json:"cluster_ipv4_cidr,omitempty"`
+	ClusterIpv4Cidr string `protobuf:"bytes,4,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr,proto3" json:"cluster_ipv4_cidr,omitempty"`
 	// This field is deprecated, use node_ipv4_cidr_block.
-	NodeIpv4Cidr string `protobuf:"bytes,5,opt,name=node_ipv4_cidr,json=nodeIpv4Cidr" json:"node_ipv4_cidr,omitempty"`
+	NodeIpv4Cidr string `protobuf:"bytes,5,opt,name=node_ipv4_cidr,json=nodeIpv4Cidr,proto3" json:"node_ipv4_cidr,omitempty"`
 	// This field is deprecated, use services_ipv4_cidr_block.
-	ServicesIpv4Cidr string `protobuf:"bytes,6,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr" json:"services_ipv4_cidr,omitempty"`
+	ServicesIpv4Cidr string `protobuf:"bytes,6,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr,proto3" json:"services_ipv4_cidr,omitempty"`
 	// The name of the secondary range to be used for the cluster CIDR
 	// block.  The secondary range will be used for pod IP
 	// addresses. This must be an existing secondary range associated
@@ -904,7 +1111,7 @@ type IPAllocationPolicy struct {
 	//
 	// This field is only applicable with use_ip_aliases is true and
 	// create_subnetwork is false.
-	ClusterSecondaryRangeName string `protobuf:"bytes,7,opt,name=cluster_secondary_range_name,json=clusterSecondaryRangeName" json:"cluster_secondary_range_name,omitempty"`
+	ClusterSecondaryRangeName string `protobuf:"bytes,7,opt,name=cluster_secondary_range_name,json=clusterSecondaryRangeName,proto3" json:"cluster_secondary_range_name,omitempty"`
 	// The name of the secondary range to be used as for the services
 	// CIDR block.  The secondary range will be used for service
 	// ClusterIPs. This must be an existing secondary range associated
@@ -912,7 +1119,7 @@ type IPAllocationPolicy struct {
 	//
 	// This field is only applicable with use_ip_aliases is true and
 	// create_subnetwork is false.
-	ServicesSecondaryRangeName string `protobuf:"bytes,8,opt,name=services_secondary_range_name,json=servicesSecondaryRangeName" json:"services_secondary_range_name,omitempty"`
+	ServicesSecondaryRangeName string `protobuf:"bytes,8,opt,name=services_secondary_range_name,json=servicesSecondaryRangeName,proto3" json:"services_secondary_range_name,omitempty"`
 	// The IP address range for the cluster pod IPs. If this field is set, then
 	// `cluster.cluster_ipv4_cidr` must be left blank.
 	//
@@ -928,7 +1135,7 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	ClusterIpv4CidrBlock string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr_block,json=clusterIpv4CidrBlock" json:"cluster_ipv4_cidr_block,omitempty"`
+	ClusterIpv4CidrBlock string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr_block,json=clusterIpv4CidrBlock,proto3" json:"cluster_ipv4_cidr_block,omitempty"`
 	// The IP address range of the instance IPs in this cluster.
 	//
 	// This is applicable only if `create_subnetwork` is true.
@@ -943,7 +1150,7 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	NodeIpv4CidrBlock string `protobuf:"bytes,10,opt,name=node_ipv4_cidr_block,json=nodeIpv4CidrBlock" json:"node_ipv4_cidr_block,omitempty"`
+	NodeIpv4CidrBlock string `protobuf:"bytes,10,opt,name=node_ipv4_cidr_block,json=nodeIpv4CidrBlock,proto3" json:"node_ipv4_cidr_block,omitempty"`
 	// The IP address range of the services IPs in this cluster. If blank, a range
 	// will be automatically chosen with the default size.
 	//
@@ -959,13 +1166,35 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	ServicesIpv4CidrBlock string `protobuf:"bytes,11,opt,name=services_ipv4_cidr_block,json=servicesIpv4CidrBlock" json:"services_ipv4_cidr_block,omitempty"`
+	ServicesIpv4CidrBlock string   `protobuf:"bytes,11,opt,name=services_ipv4_cidr_block,json=servicesIpv4CidrBlock,proto3" json:"services_ipv4_cidr_block,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *IPAllocationPolicy) Reset()         { *m = IPAllocationPolicy{} }
+func (m *IPAllocationPolicy) String() string { return proto.CompactTextString(m) }
+func (*IPAllocationPolicy) ProtoMessage()    {}
+func (*IPAllocationPolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{11}
+}
+func (m *IPAllocationPolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IPAllocationPolicy.Unmarshal(m, b)
+}
+func (m *IPAllocationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IPAllocationPolicy.Marshal(b, m, deterministic)
+}
+func (dst *IPAllocationPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IPAllocationPolicy.Merge(dst, src)
+}
+func (m *IPAllocationPolicy) XXX_Size() int {
+	return xxx_messageInfo_IPAllocationPolicy.Size(m)
+}
+func (m *IPAllocationPolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_IPAllocationPolicy.DiscardUnknown(m)
 }
 
-func (m *IPAllocationPolicy) Reset()                    { *m = IPAllocationPolicy{} }
-func (m *IPAllocationPolicy) String() string            { return proto.CompactTextString(m) }
-func (*IPAllocationPolicy) ProtoMessage()               {}
-func (*IPAllocationPolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_IPAllocationPolicy proto.InternalMessageInfo
 
 func (m *IPAllocationPolicy) GetUseIpAliases() bool {
 	if m != nil {
@@ -1052,9 +1281,9 @@ type Cluster struct {
 	// * Lowercase letters, numbers, and hyphens only.
 	// * Must start with a letter.
 	// * Must end with a number or a letter.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional description of this cluster.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// The number of nodes to create in this cluster. You must ensure that your
 	// Compute Engine <a href="/compute/docs/resource-quotas">resource quota</a>
 	// is sufficient for this number of instances. You must also have available
@@ -1063,7 +1292,7 @@ type Cluster struct {
 	// "node_pool" object, since this configuration (along with the
 	// "node_config") will be used to create a "NodePool" object with an
 	// auto-generated name. Do not use this and a node_pool at the same time.
-	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount" json:"initial_node_count,omitempty"`
+	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount,proto3" json:"initial_node_count,omitempty"`
 	// Parameters used in creating the cluster's nodes.
 	// See `nodeConfig` for the description of its properties.
 	// For requests, this field should only be used in lieu of a
@@ -1074,125 +1303,147 @@ type Cluster struct {
 	// the first node pool.
 	//
 	// If unspecified, the defaults are used.
-	NodeConfig *NodeConfig `protobuf:"bytes,4,opt,name=node_config,json=nodeConfig" json:"node_config,omitempty"`
+	NodeConfig *NodeConfig `protobuf:"bytes,4,opt,name=node_config,json=nodeConfig,proto3" json:"node_config,omitempty"`
 	// The authentication information for accessing the master endpoint.
-	MasterAuth *MasterAuth `protobuf:"bytes,5,opt,name=master_auth,json=masterAuth" json:"master_auth,omitempty"`
+	MasterAuth *MasterAuth `protobuf:"bytes,5,opt,name=master_auth,json=masterAuth,proto3" json:"master_auth,omitempty"`
 	// The logging service the cluster should use to write logs.
 	// Currently available options:
 	//
 	// * `logging.googleapis.com` - the Google Cloud Logging service.
 	// * `none` - no logs will be exported from the cluster.
 	// * if left as an empty string,`logging.googleapis.com` will be used.
-	LoggingService string `protobuf:"bytes,6,opt,name=logging_service,json=loggingService" json:"logging_service,omitempty"`
+	LoggingService string `protobuf:"bytes,6,opt,name=logging_service,json=loggingService,proto3" json:"logging_service,omitempty"`
 	// The monitoring service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * `monitoring.googleapis.com` - the Google Cloud Monitoring service.
 	// * `none` - no metrics will be exported from the cluster.
 	// * if left as an empty string, `monitoring.googleapis.com` will be used.
-	MonitoringService string `protobuf:"bytes,7,opt,name=monitoring_service,json=monitoringService" json:"monitoring_service,omitempty"`
+	MonitoringService string `protobuf:"bytes,7,opt,name=monitoring_service,json=monitoringService,proto3" json:"monitoring_service,omitempty"`
 	// The name of the Google Compute Engine
 	// [network](/compute/docs/networks-and-firewalls#networks) to which the
 	// cluster is connected. If left unspecified, the `default` network
 	// will be used.
-	Network string `protobuf:"bytes,8,opt,name=network" json:"network,omitempty"`
+	Network string `protobuf:"bytes,8,opt,name=network,proto3" json:"network,omitempty"`
 	// The IP address range of the container pods in this cluster, in
 	// [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
 	// notation (e.g. `10.96.0.0/14`). Leave blank to have
 	// one automatically chosen or specify a `/14` block in `10.0.0.0/8`.
-	ClusterIpv4Cidr string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr" json:"cluster_ipv4_cidr,omitempty"`
+	ClusterIpv4Cidr string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr,proto3" json:"cluster_ipv4_cidr,omitempty"`
 	// Configurations for the various addons available to run in the cluster.
-	AddonsConfig *AddonsConfig `protobuf:"bytes,10,opt,name=addons_config,json=addonsConfig" json:"addons_config,omitempty"`
+	AddonsConfig *AddonsConfig `protobuf:"bytes,10,opt,name=addons_config,json=addonsConfig,proto3" json:"addons_config,omitempty"`
 	// The name of the Google Compute Engine
 	// [subnetwork](/compute/docs/subnetworks) to which the
 	// cluster is connected.
-	Subnetwork string `protobuf:"bytes,11,opt,name=subnetwork" json:"subnetwork,omitempty"`
+	Subnetwork string `protobuf:"bytes,11,opt,name=subnetwork,proto3" json:"subnetwork,omitempty"`
 	// The node pools associated with this cluster.
 	// This field should not be set if "node_config" or "initial_node_count" are
 	// specified.
-	NodePools []*NodePool `protobuf:"bytes,12,rep,name=node_pools,json=nodePools" json:"node_pools,omitempty"`
+	NodePools []*NodePool `protobuf:"bytes,12,rep,name=node_pools,json=nodePools,proto3" json:"node_pools,omitempty"`
 	// The list of Google Compute Engine
 	// [locations](/compute/docs/zones#available) in which the cluster's nodes
 	// should be located.
-	Locations []string `protobuf:"bytes,13,rep,name=locations" json:"locations,omitempty"`
+	Locations []string `protobuf:"bytes,13,rep,name=locations,proto3" json:"locations,omitempty"`
 	// Kubernetes alpha features are enabled on this cluster. This includes alpha
 	// API groups (e.g. v1alpha1) and features that may not be production ready in
 	// the kubernetes version of the master and nodes.
 	// The cluster has no SLA for uptime and master/node upgrades are disabled.
 	// Alpha enabled clusters are automatically deleted thirty days after
 	// creation.
-	EnableKubernetesAlpha bool `protobuf:"varint,14,opt,name=enable_kubernetes_alpha,json=enableKubernetesAlpha" json:"enable_kubernetes_alpha,omitempty"`
+	EnableKubernetesAlpha bool `protobuf:"varint,14,opt,name=enable_kubernetes_alpha,json=enableKubernetesAlpha,proto3" json:"enable_kubernetes_alpha,omitempty"`
 	// The resource labels for the cluster to use to annotate any related
 	// Google Compute Engine resources.
-	ResourceLabels map[string]string `protobuf:"bytes,15,rep,name=resource_labels,json=resourceLabels" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ResourceLabels map[string]string `protobuf:"bytes,15,rep,name=resource_labels,json=resourceLabels,proto3" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The fingerprint of the set of labels for this cluster.
-	LabelFingerprint string `protobuf:"bytes,16,opt,name=label_fingerprint,json=labelFingerprint" json:"label_fingerprint,omitempty"`
+	LabelFingerprint string `protobuf:"bytes,16,opt,name=label_fingerprint,json=labelFingerprint,proto3" json:"label_fingerprint,omitempty"`
 	// Configuration for the legacy ABAC authorization mode.
-	LegacyAbac *LegacyAbac `protobuf:"bytes,18,opt,name=legacy_abac,json=legacyAbac" json:"legacy_abac,omitempty"`
+	LegacyAbac *LegacyAbac `protobuf:"bytes,18,opt,name=legacy_abac,json=legacyAbac,proto3" json:"legacy_abac,omitempty"`
 	// Configuration options for the NetworkPolicy feature.
-	NetworkPolicy *NetworkPolicy `protobuf:"bytes,19,opt,name=network_policy,json=networkPolicy" json:"network_policy,omitempty"`
+	NetworkPolicy *NetworkPolicy `protobuf:"bytes,19,opt,name=network_policy,json=networkPolicy,proto3" json:"network_policy,omitempty"`
 	// Configuration for cluster IP allocation.
-	IpAllocationPolicy *IPAllocationPolicy `protobuf:"bytes,20,opt,name=ip_allocation_policy,json=ipAllocationPolicy" json:"ip_allocation_policy,omitempty"`
+	IpAllocationPolicy *IPAllocationPolicy `protobuf:"bytes,20,opt,name=ip_allocation_policy,json=ipAllocationPolicy,proto3" json:"ip_allocation_policy,omitempty"`
 	// Master authorized networks is a Beta feature.
 	// The configuration options for master authorized networks feature.
-	MasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,22,opt,name=master_authorized_networks_config,json=masterAuthorizedNetworksConfig" json:"master_authorized_networks_config,omitempty"`
+	MasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,22,opt,name=master_authorized_networks_config,json=masterAuthorizedNetworksConfig,proto3" json:"master_authorized_networks_config,omitempty"`
 	// Configure the maintenance policy for this cluster.
-	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,23,opt,name=maintenance_policy,json=maintenancePolicy" json:"maintenance_policy,omitempty"`
+	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,23,opt,name=maintenance_policy,json=maintenancePolicy,proto3" json:"maintenance_policy,omitempty"`
 	// [Output only] Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// [Output only] The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,101,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,101,opt,name=zone,proto3" json:"zone,omitempty"`
 	// [Output only] The IP address of this cluster's master endpoint.
 	// The endpoint can be accessed from the internet at
 	// `https://username:password@endpoint/`.
 	//
 	// See the `masterAuth` property of this resource for username and
 	// password information.
-	Endpoint string `protobuf:"bytes,102,opt,name=endpoint" json:"endpoint,omitempty"`
+	Endpoint string `protobuf:"bytes,102,opt,name=endpoint,proto3" json:"endpoint,omitempty"`
 	// The initial Kubernetes version for this cluster.  Valid versions are those
 	// found in validMasterVersions returned by getServerConfig.  The version can
 	// be upgraded over time; such upgrades are reflected in
 	// currentMasterVersion and currentNodeVersion.
-	InitialClusterVersion string `protobuf:"bytes,103,opt,name=initial_cluster_version,json=initialClusterVersion" json:"initial_cluster_version,omitempty"`
+	InitialClusterVersion string `protobuf:"bytes,103,opt,name=initial_cluster_version,json=initialClusterVersion,proto3" json:"initial_cluster_version,omitempty"`
 	// [Output only] The current software version of the master endpoint.
-	CurrentMasterVersion string `protobuf:"bytes,104,opt,name=current_master_version,json=currentMasterVersion" json:"current_master_version,omitempty"`
+	CurrentMasterVersion string `protobuf:"bytes,104,opt,name=current_master_version,json=currentMasterVersion,proto3" json:"current_master_version,omitempty"`
 	// [Output only] The current version of the node software components.
 	// If they are currently at multiple versions because they're in the process
 	// of being upgraded, this reflects the minimum version of all nodes.
-	CurrentNodeVersion string `protobuf:"bytes,105,opt,name=current_node_version,json=currentNodeVersion" json:"current_node_version,omitempty"`
+	CurrentNodeVersion string `protobuf:"bytes,105,opt,name=current_node_version,json=currentNodeVersion,proto3" json:"current_node_version,omitempty"`
 	// [Output only] The time the cluster was created, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	CreateTime string `protobuf:"bytes,106,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime string `protobuf:"bytes,106,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// [Output only] The current status of this cluster.
-	Status Cluster_Status `protobuf:"varint,107,opt,name=status,enum=google.container.v1.Cluster_Status" json:"status,omitempty"`
+	Status Cluster_Status `protobuf:"varint,107,opt,name=status,proto3,enum=google.container.v1.Cluster_Status" json:"status,omitempty"`
 	// [Output only] Additional information about the current status of this
 	// cluster, if available.
-	StatusMessage string `protobuf:"bytes,108,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage string `protobuf:"bytes,108,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// [Output only] The size of the address space on each node for hosting
 	// containers. This is provisioned from within the `container_ipv4_cidr`
 	// range.
-	NodeIpv4CidrSize int32 `protobuf:"varint,109,opt,name=node_ipv4_cidr_size,json=nodeIpv4CidrSize" json:"node_ipv4_cidr_size,omitempty"`
+	NodeIpv4CidrSize int32 `protobuf:"varint,109,opt,name=node_ipv4_cidr_size,json=nodeIpv4CidrSize,proto3" json:"node_ipv4_cidr_size,omitempty"`
 	// [Output only] The IP address range of the Kubernetes services in
 	// this cluster, in
 	// [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
 	// notation (e.g. `1.2.3.4/29`). Service addresses are
 	// typically put in the last `/16` from the container CIDR.
-	ServicesIpv4Cidr string `protobuf:"bytes,110,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr" json:"services_ipv4_cidr,omitempty"`
+	ServicesIpv4Cidr string `protobuf:"bytes,110,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr,proto3" json:"services_ipv4_cidr,omitempty"`
 	// Deprecated. Use node_pools.instance_group_urls.
-	InstanceGroupUrls []string `protobuf:"bytes,111,rep,name=instance_group_urls,json=instanceGroupUrls" json:"instance_group_urls,omitempty"`
+	InstanceGroupUrls []string `protobuf:"bytes,111,rep,name=instance_group_urls,json=instanceGroupUrls,proto3" json:"instance_group_urls,omitempty"`
 	// [Output only] The number of nodes currently in the cluster.
-	CurrentNodeCount int32 `protobuf:"varint,112,opt,name=current_node_count,json=currentNodeCount" json:"current_node_count,omitempty"`
+	CurrentNodeCount int32 `protobuf:"varint,112,opt,name=current_node_count,json=currentNodeCount,proto3" json:"current_node_count,omitempty"`
 	// [Output only] The time the cluster will be automatically
 	// deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	ExpireTime string `protobuf:"bytes,113,opt,name=expire_time,json=expireTime" json:"expire_time,omitempty"`
+	ExpireTime           string   `protobuf:"bytes,113,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Cluster) Reset()                    { *m = Cluster{} }
-func (m *Cluster) String() string            { return proto.CompactTextString(m) }
-func (*Cluster) ProtoMessage()               {}
-func (*Cluster) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *Cluster) Reset()         { *m = Cluster{} }
+func (m *Cluster) String() string { return proto.CompactTextString(m) }
+func (*Cluster) ProtoMessage()    {}
+func (*Cluster) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{12}
+}
+func (m *Cluster) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cluster.Unmarshal(m, b)
+}
+func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
+}
+func (dst *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(dst, src)
+}
+func (m *Cluster) XXX_Size() int {
+	return xxx_messageInfo_Cluster.Size(m)
+}
+func (m *Cluster) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cluster.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Cluster proto.InternalMessageInfo
 
 func (m *Cluster) GetName() string {
 	if m != nil {
@@ -1446,28 +1697,28 @@ type ClusterUpdate struct {
 	// The Kubernetes version to change the nodes to (typically an
 	// upgrade). Use `-` to upgrade to the latest version supported by
 	// the server.
-	DesiredNodeVersion string `protobuf:"bytes,4,opt,name=desired_node_version,json=desiredNodeVersion" json:"desired_node_version,omitempty"`
+	DesiredNodeVersion string `protobuf:"bytes,4,opt,name=desired_node_version,json=desiredNodeVersion,proto3" json:"desired_node_version,omitempty"`
 	// The monitoring service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * "monitoring.googleapis.com" - the Google Cloud Monitoring service
 	// * "none" - no metrics will be exported from the cluster
-	DesiredMonitoringService string `protobuf:"bytes,5,opt,name=desired_monitoring_service,json=desiredMonitoringService" json:"desired_monitoring_service,omitempty"`
+	DesiredMonitoringService string `protobuf:"bytes,5,opt,name=desired_monitoring_service,json=desiredMonitoringService,proto3" json:"desired_monitoring_service,omitempty"`
 	// Configurations for the various addons available to run in the cluster.
-	DesiredAddonsConfig *AddonsConfig `protobuf:"bytes,6,opt,name=desired_addons_config,json=desiredAddonsConfig" json:"desired_addons_config,omitempty"`
+	DesiredAddonsConfig *AddonsConfig `protobuf:"bytes,6,opt,name=desired_addons_config,json=desiredAddonsConfig,proto3" json:"desired_addons_config,omitempty"`
 	// The node pool to be upgraded. This field is mandatory if
 	// "desired_node_version", "desired_image_family" or
 	// "desired_node_pool_autoscaling" is specified and there is more than one
 	// node pool on the cluster.
-	DesiredNodePoolId string `protobuf:"bytes,7,opt,name=desired_node_pool_id,json=desiredNodePoolId" json:"desired_node_pool_id,omitempty"`
+	DesiredNodePoolId string `protobuf:"bytes,7,opt,name=desired_node_pool_id,json=desiredNodePoolId,proto3" json:"desired_node_pool_id,omitempty"`
 	// The desired image type for the node pool.
 	// NOTE: Set the "desired_node_pool" field as well.
-	DesiredImageType string `protobuf:"bytes,8,opt,name=desired_image_type,json=desiredImageType" json:"desired_image_type,omitempty"`
+	DesiredImageType string `protobuf:"bytes,8,opt,name=desired_image_type,json=desiredImageType,proto3" json:"desired_image_type,omitempty"`
 	// Autoscaler configuration for the node pool specified in
 	// desired_node_pool_id. If there is only one pool in the
 	// cluster and desired_node_pool_id is not provided then
 	// the change applies to that single node pool.
-	DesiredNodePoolAutoscaling *NodePoolAutoscaling `protobuf:"bytes,9,opt,name=desired_node_pool_autoscaling,json=desiredNodePoolAutoscaling" json:"desired_node_pool_autoscaling,omitempty"`
+	DesiredNodePoolAutoscaling *NodePoolAutoscaling `protobuf:"bytes,9,opt,name=desired_node_pool_autoscaling,json=desiredNodePoolAutoscaling,proto3" json:"desired_node_pool_autoscaling,omitempty"`
 	// The desired list of Google Compute Engine
 	// [locations](/compute/docs/zones#available) in which the cluster's nodes
 	// should be located. Changing the locations a cluster is in will result
@@ -1475,20 +1726,42 @@ type ClusterUpdate struct {
 	// whether locations are being added or removed.
 	//
 	// This list must always include the cluster's primary zone.
-	DesiredLocations []string `protobuf:"bytes,10,rep,name=desired_locations,json=desiredLocations" json:"desired_locations,omitempty"`
+	DesiredLocations []string `protobuf:"bytes,10,rep,name=desired_locations,json=desiredLocations,proto3" json:"desired_locations,omitempty"`
 	// Master authorized networks is a Beta feature.
 	// The desired configuration options for master authorized networks feature.
-	DesiredMasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,12,opt,name=desired_master_authorized_networks_config,json=desiredMasterAuthorizedNetworksConfig" json:"desired_master_authorized_networks_config,omitempty"`
+	DesiredMasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,12,opt,name=desired_master_authorized_networks_config,json=desiredMasterAuthorizedNetworksConfig,proto3" json:"desired_master_authorized_networks_config,omitempty"`
 	// The Kubernetes version to change the master to. The only valid value is the
 	// latest supported version. Use "-" to have the server automatically select
 	// the latest version.
-	DesiredMasterVersion string `protobuf:"bytes,100,opt,name=desired_master_version,json=desiredMasterVersion" json:"desired_master_version,omitempty"`
+	DesiredMasterVersion string   `protobuf:"bytes,100,opt,name=desired_master_version,json=desiredMasterVersion,proto3" json:"desired_master_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ClusterUpdate) Reset()                    { *m = ClusterUpdate{} }
-func (m *ClusterUpdate) String() string            { return proto.CompactTextString(m) }
-func (*ClusterUpdate) ProtoMessage()               {}
-func (*ClusterUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *ClusterUpdate) Reset()         { *m = ClusterUpdate{} }
+func (m *ClusterUpdate) String() string { return proto.CompactTextString(m) }
+func (*ClusterUpdate) ProtoMessage()    {}
+func (*ClusterUpdate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{13}
+}
+func (m *ClusterUpdate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterUpdate.Unmarshal(m, b)
+}
+func (m *ClusterUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterUpdate.Marshal(b, m, deterministic)
+}
+func (dst *ClusterUpdate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterUpdate.Merge(dst, src)
+}
+func (m *ClusterUpdate) XXX_Size() int {
+	return xxx_messageInfo_ClusterUpdate.Size(m)
+}
+func (m *ClusterUpdate) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterUpdate.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterUpdate proto.InternalMessageInfo
 
 func (m *ClusterUpdate) GetDesiredNodeVersion() string {
 	if m != nil {
@@ -1557,35 +1830,57 @@ func (m *ClusterUpdate) GetDesiredMasterVersion() string {
 // happening on the cluster. All fields are output only.
 type Operation struct {
 	// The server-assigned ID for the operation.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the operation
 	// is taking place.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The operation type.
-	OperationType Operation_Type `protobuf:"varint,3,opt,name=operation_type,json=operationType,enum=google.container.v1.Operation_Type" json:"operation_type,omitempty"`
+	OperationType Operation_Type `protobuf:"varint,3,opt,name=operation_type,json=operationType,proto3,enum=google.container.v1.Operation_Type" json:"operation_type,omitempty"`
 	// The current status of the operation.
-	Status Operation_Status `protobuf:"varint,4,opt,name=status,enum=google.container.v1.Operation_Status" json:"status,omitempty"`
+	Status Operation_Status `protobuf:"varint,4,opt,name=status,proto3,enum=google.container.v1.Operation_Status" json:"status,omitempty"`
 	// Detailed operation progress, if available.
-	Detail string `protobuf:"bytes,8,opt,name=detail" json:"detail,omitempty"`
+	Detail string `protobuf:"bytes,8,opt,name=detail,proto3" json:"detail,omitempty"`
 	// If an error has occurred, a textual description of the error.
-	StatusMessage string `protobuf:"bytes,5,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage string `protobuf:"bytes,5,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,6,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,6,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// Server-defined URL for the target of the operation.
-	TargetLink string `protobuf:"bytes,7,opt,name=target_link,json=targetLink" json:"target_link,omitempty"`
+	TargetLink string `protobuf:"bytes,7,opt,name=target_link,json=targetLink,proto3" json:"target_link,omitempty"`
 	// [Output only] The time the operation started, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	StartTime string `protobuf:"bytes,10,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime string `protobuf:"bytes,10,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// [Output only] The time the operation completed, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	EndTime string `protobuf:"bytes,11,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              string   `protobuf:"bytes,11,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Operation) Reset()                    { *m = Operation{} }
-func (m *Operation) String() string            { return proto.CompactTextString(m) }
-func (*Operation) ProtoMessage()               {}
-func (*Operation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *Operation) Reset()         { *m = Operation{} }
+func (m *Operation) String() string { return proto.CompactTextString(m) }
+func (*Operation) ProtoMessage()    {}
+func (*Operation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{14}
+}
+func (m *Operation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Operation.Unmarshal(m, b)
+}
+func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
+}
+func (dst *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(dst, src)
+}
+func (m *Operation) XXX_Size() int {
+	return xxx_messageInfo_Operation.Size(m)
+}
+func (m *Operation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Operation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Operation proto.InternalMessageInfo
 
 func (m *Operation) GetName() string {
 	if m != nil {
@@ -1661,20 +1956,42 @@ func (m *Operation) GetEndTime() string {
 type CreateClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// A [cluster
 	// resource](/container-engine/reference/rest/v1/projects.zones.clusters)
-	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster              *Cluster `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
+func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterRequest) ProtoMessage()    {}
+func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{15}
+}
+func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
+}
+func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+}
+func (m *CreateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterRequest.Size(m)
+}
+func (m *CreateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterRequest.DiscardUnknown(m)
 }
 
-func (m *CreateClusterRequest) Reset()                    { *m = CreateClusterRequest{} }
-func (m *CreateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterRequest) ProtoMessage()               {}
-func (*CreateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_CreateClusterRequest proto.InternalMessageInfo
 
 func (m *CreateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1701,19 +2018,41 @@ func (m *CreateClusterRequest) GetCluster() *Cluster {
 type GetClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to retrieve.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId            string   `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
+func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*GetClusterRequest) ProtoMessage()    {}
+func (*GetClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{16}
+}
+func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
+}
+func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+}
+func (m *GetClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_GetClusterRequest.Size(m)
+}
+func (m *GetClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetClusterRequest.DiscardUnknown(m)
 }
 
-func (m *GetClusterRequest) Reset()                    { *m = GetClusterRequest{} }
-func (m *GetClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetClusterRequest) ProtoMessage()               {}
-func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_GetClusterRequest proto.InternalMessageInfo
 
 func (m *GetClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1740,21 +2079,43 @@ func (m *GetClusterRequest) GetClusterId() string {
 type UpdateClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// A description of the update.
-	Update *ClusterUpdate `protobuf:"bytes,4,opt,name=update" json:"update,omitempty"`
+	Update               *ClusterUpdate `protobuf:"bytes,4,opt,name=update,proto3" json:"update,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *UpdateClusterRequest) Reset()                    { *m = UpdateClusterRequest{} }
-func (m *UpdateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateClusterRequest) ProtoMessage()               {}
-func (*UpdateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
+func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateClusterRequest) ProtoMessage()    {}
+func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{17}
+}
+func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
+}
+func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+}
+func (m *UpdateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateClusterRequest.Size(m)
+}
+func (m *UpdateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateClusterRequest proto.InternalMessageInfo
 
 func (m *UpdateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1788,27 +2149,49 @@ func (m *UpdateClusterRequest) GetUpdate() *ClusterUpdate {
 type UpdateNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to upgrade.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The Kubernetes version to change the nodes to (typically an
 	// upgrade). Use `-` to upgrade to the latest version supported by
 	// the server.
-	NodeVersion string `protobuf:"bytes,5,opt,name=node_version,json=nodeVersion" json:"node_version,omitempty"`
+	NodeVersion string `protobuf:"bytes,5,opt,name=node_version,json=nodeVersion,proto3" json:"node_version,omitempty"`
 	// The desired image type for the node pool.
-	ImageType string `protobuf:"bytes,6,opt,name=image_type,json=imageType" json:"image_type,omitempty"`
+	ImageType            string   `protobuf:"bytes,6,opt,name=image_type,json=imageType,proto3" json:"image_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateNodePoolRequest) Reset()         { *m = UpdateNodePoolRequest{} }
+func (m *UpdateNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateNodePoolRequest) ProtoMessage()    {}
+func (*UpdateNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{18}
+}
+func (m *UpdateNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateNodePoolRequest.Unmarshal(m, b)
+}
+func (m *UpdateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNodePoolRequest.Merge(dst, src)
+}
+func (m *UpdateNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateNodePoolRequest.Size(m)
+}
+func (m *UpdateNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateNodePoolRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateNodePoolRequest) Reset()                    { *m = UpdateNodePoolRequest{} }
-func (m *UpdateNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateNodePoolRequest) ProtoMessage()               {}
-func (*UpdateNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_UpdateNodePoolRequest proto.InternalMessageInfo
 
 func (m *UpdateNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -1856,23 +2239,45 @@ func (m *UpdateNodePoolRequest) GetImageType() string {
 type SetNodePoolAutoscalingRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to upgrade.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// Autoscaling configuration for the node pool.
-	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,5,opt,name=autoscaling" json:"autoscaling,omitempty"`
+	Autoscaling          *NodePoolAutoscaling `protobuf:"bytes,5,opt,name=autoscaling,proto3" json:"autoscaling,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *SetNodePoolAutoscalingRequest) Reset()                    { *m = SetNodePoolAutoscalingRequest{} }
-func (m *SetNodePoolAutoscalingRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNodePoolAutoscalingRequest) ProtoMessage()               {}
-func (*SetNodePoolAutoscalingRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+func (m *SetNodePoolAutoscalingRequest) Reset()         { *m = SetNodePoolAutoscalingRequest{} }
+func (m *SetNodePoolAutoscalingRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNodePoolAutoscalingRequest) ProtoMessage()    {}
+func (*SetNodePoolAutoscalingRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{19}
+}
+func (m *SetNodePoolAutoscalingRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Unmarshal(m, b)
+}
+func (m *SetNodePoolAutoscalingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(dst, src)
+}
+func (m *SetNodePoolAutoscalingRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Size(m)
+}
+func (m *SetNodePoolAutoscalingRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNodePoolAutoscalingRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetNodePoolAutoscalingRequest proto.InternalMessageInfo
 
 func (m *SetNodePoolAutoscalingRequest) GetProjectId() string {
 	if m != nil {
@@ -1913,25 +2318,47 @@ func (m *SetNodePoolAutoscalingRequest) GetAutoscaling() *NodePoolAutoscaling {
 type SetLoggingServiceRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The logging service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * "logging.googleapis.com" - the Google Cloud Logging service
 	// * "none" - no metrics will be exported from the cluster
-	LoggingService string `protobuf:"bytes,4,opt,name=logging_service,json=loggingService" json:"logging_service,omitempty"`
+	LoggingService       string   `protobuf:"bytes,4,opt,name=logging_service,json=loggingService,proto3" json:"logging_service,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLoggingServiceRequest) Reset()                    { *m = SetLoggingServiceRequest{} }
-func (m *SetLoggingServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLoggingServiceRequest) ProtoMessage()               {}
-func (*SetLoggingServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *SetLoggingServiceRequest) Reset()         { *m = SetLoggingServiceRequest{} }
+func (m *SetLoggingServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLoggingServiceRequest) ProtoMessage()    {}
+func (*SetLoggingServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{20}
+}
+func (m *SetLoggingServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLoggingServiceRequest.Unmarshal(m, b)
+}
+func (m *SetLoggingServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLoggingServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLoggingServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLoggingServiceRequest.Merge(dst, src)
+}
+func (m *SetLoggingServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLoggingServiceRequest.Size(m)
+}
+func (m *SetLoggingServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLoggingServiceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLoggingServiceRequest proto.InternalMessageInfo
 
 func (m *SetLoggingServiceRequest) GetProjectId() string {
 	if m != nil {
@@ -1965,25 +2392,47 @@ func (m *SetLoggingServiceRequest) GetLoggingService() string {
 type SetMonitoringServiceRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The monitoring service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * "monitoring.googleapis.com" - the Google Cloud Monitoring service
 	// * "none" - no metrics will be exported from the cluster
-	MonitoringService string `protobuf:"bytes,4,opt,name=monitoring_service,json=monitoringService" json:"monitoring_service,omitempty"`
+	MonitoringService    string   `protobuf:"bytes,4,opt,name=monitoring_service,json=monitoringService,proto3" json:"monitoring_service,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetMonitoringServiceRequest) Reset()                    { *m = SetMonitoringServiceRequest{} }
-func (m *SetMonitoringServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetMonitoringServiceRequest) ProtoMessage()               {}
-func (*SetMonitoringServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+func (m *SetMonitoringServiceRequest) Reset()         { *m = SetMonitoringServiceRequest{} }
+func (m *SetMonitoringServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*SetMonitoringServiceRequest) ProtoMessage()    {}
+func (*SetMonitoringServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{21}
+}
+func (m *SetMonitoringServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetMonitoringServiceRequest.Unmarshal(m, b)
+}
+func (m *SetMonitoringServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetMonitoringServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMonitoringServiceRequest.Merge(dst, src)
+}
+func (m *SetMonitoringServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_SetMonitoringServiceRequest.Size(m)
+}
+func (m *SetMonitoringServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetMonitoringServiceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetMonitoringServiceRequest proto.InternalMessageInfo
 
 func (m *SetMonitoringServiceRequest) GetProjectId() string {
 	if m != nil {
@@ -2017,22 +2466,44 @@ func (m *SetMonitoringServiceRequest) GetMonitoringService() string {
 type SetAddonsConfigRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The desired configurations for the various addons available to run in the
 	// cluster.
-	AddonsConfig *AddonsConfig `protobuf:"bytes,4,opt,name=addons_config,json=addonsConfig" json:"addons_config,omitempty"`
+	AddonsConfig         *AddonsConfig `protobuf:"bytes,4,opt,name=addons_config,json=addonsConfig,proto3" json:"addons_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *SetAddonsConfigRequest) Reset()         { *m = SetAddonsConfigRequest{} }
+func (m *SetAddonsConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*SetAddonsConfigRequest) ProtoMessage()    {}
+func (*SetAddonsConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{22}
+}
+func (m *SetAddonsConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetAddonsConfigRequest.Unmarshal(m, b)
+}
+func (m *SetAddonsConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetAddonsConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetAddonsConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetAddonsConfigRequest.Merge(dst, src)
+}
+func (m *SetAddonsConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_SetAddonsConfigRequest.Size(m)
+}
+func (m *SetAddonsConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetAddonsConfigRequest.DiscardUnknown(m)
 }
 
-func (m *SetAddonsConfigRequest) Reset()                    { *m = SetAddonsConfigRequest{} }
-func (m *SetAddonsConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetAddonsConfigRequest) ProtoMessage()               {}
-func (*SetAddonsConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+var xxx_messageInfo_SetAddonsConfigRequest proto.InternalMessageInfo
 
 func (m *SetAddonsConfigRequest) GetProjectId() string {
 	if m != nil {
@@ -2066,13 +2537,13 @@ func (m *SetAddonsConfigRequest) GetAddonsConfig() *AddonsConfig {
 type SetLocationsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The desired list of Google Compute Engine
 	// [locations](/compute/docs/zones#available) in which the cluster's nodes
 	// should be located. Changing the locations a cluster is in will result
@@ -2080,13 +2551,35 @@ type SetLocationsRequest struct {
 	// whether locations are being added or removed.
 	//
 	// This list must always include the cluster's primary zone.
-	Locations []string `protobuf:"bytes,4,rep,name=locations" json:"locations,omitempty"`
+	Locations            []string `protobuf:"bytes,4,rep,name=locations,proto3" json:"locations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLocationsRequest) Reset()                    { *m = SetLocationsRequest{} }
-func (m *SetLocationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLocationsRequest) ProtoMessage()               {}
-func (*SetLocationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+func (m *SetLocationsRequest) Reset()         { *m = SetLocationsRequest{} }
+func (m *SetLocationsRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLocationsRequest) ProtoMessage()    {}
+func (*SetLocationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{23}
+}
+func (m *SetLocationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLocationsRequest.Unmarshal(m, b)
+}
+func (m *SetLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLocationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLocationsRequest.Merge(dst, src)
+}
+func (m *SetLocationsRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLocationsRequest.Size(m)
+}
+func (m *SetLocationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLocationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLocationsRequest proto.InternalMessageInfo
 
 func (m *SetLocationsRequest) GetProjectId() string {
 	if m != nil {
@@ -2120,23 +2613,45 @@ func (m *SetLocationsRequest) GetLocations() []string {
 type UpdateMasterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The Kubernetes version to change the master to. The only valid value is the
 	// latest supported version. Use "-" to have the server automatically select
 	// the latest version.
-	MasterVersion string `protobuf:"bytes,4,opt,name=master_version,json=masterVersion" json:"master_version,omitempty"`
+	MasterVersion        string   `protobuf:"bytes,4,opt,name=master_version,json=masterVersion,proto3" json:"master_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UpdateMasterRequest) Reset()                    { *m = UpdateMasterRequest{} }
-func (m *UpdateMasterRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateMasterRequest) ProtoMessage()               {}
-func (*UpdateMasterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
+func (m *UpdateMasterRequest) Reset()         { *m = UpdateMasterRequest{} }
+func (m *UpdateMasterRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateMasterRequest) ProtoMessage()    {}
+func (*UpdateMasterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{24}
+}
+func (m *UpdateMasterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateMasterRequest.Unmarshal(m, b)
+}
+func (m *UpdateMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateMasterRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateMasterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateMasterRequest.Merge(dst, src)
+}
+func (m *UpdateMasterRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateMasterRequest.Size(m)
+}
+func (m *UpdateMasterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateMasterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateMasterRequest proto.InternalMessageInfo
 
 func (m *UpdateMasterRequest) GetProjectId() string {
 	if m != nil {
@@ -2170,23 +2685,45 @@ func (m *UpdateMasterRequest) GetMasterVersion() string {
 type SetMasterAuthRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The exact form of action to be taken on the master auth.
-	Action SetMasterAuthRequest_Action `protobuf:"varint,4,opt,name=action,enum=google.container.v1.SetMasterAuthRequest_Action" json:"action,omitempty"`
+	Action SetMasterAuthRequest_Action `protobuf:"varint,4,opt,name=action,proto3,enum=google.container.v1.SetMasterAuthRequest_Action" json:"action,omitempty"`
 	// A description of the update.
-	Update *MasterAuth `protobuf:"bytes,5,opt,name=update" json:"update,omitempty"`
+	Update               *MasterAuth `protobuf:"bytes,5,opt,name=update,proto3" json:"update,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *SetMasterAuthRequest) Reset()                    { *m = SetMasterAuthRequest{} }
-func (m *SetMasterAuthRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetMasterAuthRequest) ProtoMessage()               {}
-func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
+func (m *SetMasterAuthRequest) Reset()         { *m = SetMasterAuthRequest{} }
+func (m *SetMasterAuthRequest) String() string { return proto.CompactTextString(m) }
+func (*SetMasterAuthRequest) ProtoMessage()    {}
+func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{25}
+}
+func (m *SetMasterAuthRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetMasterAuthRequest.Unmarshal(m, b)
+}
+func (m *SetMasterAuthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetMasterAuthRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMasterAuthRequest.Merge(dst, src)
+}
+func (m *SetMasterAuthRequest) XXX_Size() int {
+	return xxx_messageInfo_SetMasterAuthRequest.Size(m)
+}
+func (m *SetMasterAuthRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetMasterAuthRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetMasterAuthRequest proto.InternalMessageInfo
 
 func (m *SetMasterAuthRequest) GetProjectId() string {
 	if m != nil {
@@ -2227,19 +2764,41 @@ func (m *SetMasterAuthRequest) GetUpdate() *MasterAuth {
 type DeleteClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to delete.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId            string   `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteClusterRequest) Reset()                    { *m = DeleteClusterRequest{} }
-func (m *DeleteClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteClusterRequest) ProtoMessage()               {}
-func (*DeleteClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
+func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
+func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteClusterRequest) ProtoMessage()    {}
+func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{26}
+}
+func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
+}
+func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+}
+func (m *DeleteClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteClusterRequest.Size(m)
+}
+func (m *DeleteClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteClusterRequest proto.InternalMessageInfo
 
 func (m *DeleteClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -2266,17 +2825,39 @@ func (m *DeleteClusterRequest) GetClusterId() string {
 type ListClustersRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides, or "-" for all zones.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone                 string   `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
+func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClustersRequest) ProtoMessage()    {}
+func (*ListClustersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{27}
+}
+func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
+}
+func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+}
+func (m *ListClustersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClustersRequest.Size(m)
+}
+func (m *ListClustersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersRequest.DiscardUnknown(m)
 }
 
-func (m *ListClustersRequest) Reset()                    { *m = ListClustersRequest{} }
-func (m *ListClustersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersRequest) ProtoMessage()               {}
-func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
+var xxx_messageInfo_ListClustersRequest proto.InternalMessageInfo
 
 func (m *ListClustersRequest) GetProjectId() string {
 	if m != nil {
@@ -2296,16 +2877,38 @@ func (m *ListClustersRequest) GetZone() string {
 type ListClustersResponse struct {
 	// A list of clusters in the project in the specified zone, or
 	// across all ones.
-	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters" json:"clusters,omitempty"`
+	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	// If any zones are listed here, the list of clusters returned
 	// may be missing those zones.
-	MissingZones []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones" json:"missing_zones,omitempty"`
+	MissingZones         []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones,proto3" json:"missing_zones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListClustersResponse) Reset()                    { *m = ListClustersResponse{} }
-func (m *ListClustersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersResponse) ProtoMessage()               {}
-func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
+func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
+func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClustersResponse) ProtoMessage()    {}
+func (*ListClustersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{28}
+}
+func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
+}
+func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+}
+func (m *ListClustersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClustersResponse.Size(m)
+}
+func (m *ListClustersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClustersResponse proto.InternalMessageInfo
 
 func (m *ListClustersResponse) GetClusters() []*Cluster {
 	if m != nil {
@@ -2325,19 +2928,41 @@ func (m *ListClustersResponse) GetMissingZones() []string {
 type GetOperationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The server-assigned `name` of the operation.
-	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId          string   `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetOperationRequest) Reset()         { *m = GetOperationRequest{} }
+func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetOperationRequest) ProtoMessage()    {}
+func (*GetOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{29}
+}
+func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b)
+}
+func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperationRequest.Merge(dst, src)
+}
+func (m *GetOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetOperationRequest.Size(m)
+}
+func (m *GetOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetOperationRequest.DiscardUnknown(m)
 }
 
-func (m *GetOperationRequest) Reset()                    { *m = GetOperationRequest{} }
-func (m *GetOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetOperationRequest) ProtoMessage()               {}
-func (*GetOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
+var xxx_messageInfo_GetOperationRequest proto.InternalMessageInfo
 
 func (m *GetOperationRequest) GetProjectId() string {
 	if m != nil {
@@ -2364,16 +2989,38 @@ func (m *GetOperationRequest) GetOperationId() string {
 type ListOperationsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine [zone](/compute/docs/zones#available)
 	// to return operations for, or `-` for all zones.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone                 string   `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListOperationsRequest) Reset()                    { *m = ListOperationsRequest{} }
-func (m *ListOperationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListOperationsRequest) ProtoMessage()               {}
-func (*ListOperationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
+func (m *ListOperationsRequest) Reset()         { *m = ListOperationsRequest{} }
+func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListOperationsRequest) ProtoMessage()    {}
+func (*ListOperationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{30}
+}
+func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b)
+}
+func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsRequest.Merge(dst, src)
+}
+func (m *ListOperationsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListOperationsRequest.Size(m)
+}
+func (m *ListOperationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOperationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListOperationsRequest proto.InternalMessageInfo
 
 func (m *ListOperationsRequest) GetProjectId() string {
 	if m != nil {
@@ -2393,18 +3040,40 @@ func (m *ListOperationsRequest) GetZone() string {
 type CancelOperationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the operation resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The server-assigned `name` of the operation.
-	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId          string   `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CancelOperationRequest) Reset()         { *m = CancelOperationRequest{} }
+func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelOperationRequest) ProtoMessage()    {}
+func (*CancelOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{31}
+}
+func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b)
+}
+func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelOperationRequest.Merge(dst, src)
+}
+func (m *CancelOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelOperationRequest.Size(m)
+}
+func (m *CancelOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelOperationRequest.DiscardUnknown(m)
 }
 
-func (m *CancelOperationRequest) Reset()                    { *m = CancelOperationRequest{} }
-func (m *CancelOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelOperationRequest) ProtoMessage()               {}
-func (*CancelOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
+var xxx_messageInfo_CancelOperationRequest proto.InternalMessageInfo
 
 func (m *CancelOperationRequest) GetProjectId() string {
 	if m != nil {
@@ -2430,16 +3099,38 @@ func (m *CancelOperationRequest) GetOperationId() string {
 // ListOperationsResponse is the result of ListOperationsRequest.
 type ListOperationsResponse struct {
 	// A list of operations in the project in the specified zone.
-	Operations []*Operation `protobuf:"bytes,1,rep,name=operations" json:"operations,omitempty"`
+	Operations []*Operation `protobuf:"bytes,1,rep,name=operations,proto3" json:"operations,omitempty"`
 	// If any zones are listed here, the list of operations returned
 	// may be missing the operations from those zones.
-	MissingZones []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones" json:"missing_zones,omitempty"`
+	MissingZones         []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones,proto3" json:"missing_zones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListOperationsResponse) Reset()                    { *m = ListOperationsResponse{} }
-func (m *ListOperationsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListOperationsResponse) ProtoMessage()               {}
-func (*ListOperationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
+func (m *ListOperationsResponse) Reset()         { *m = ListOperationsResponse{} }
+func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListOperationsResponse) ProtoMessage()    {}
+func (*ListOperationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{32}
+}
+func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b)
+}
+func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsResponse.Merge(dst, src)
+}
+func (m *ListOperationsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListOperationsResponse.Size(m)
+}
+func (m *ListOperationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOperationsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListOperationsResponse proto.InternalMessageInfo
 
 func (m *ListOperationsResponse) GetOperations() []*Operation {
 	if m != nil {
@@ -2459,16 +3150,38 @@ func (m *ListOperationsResponse) GetMissingZones() []string {
 type GetServerConfigRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine [zone](/compute/docs/zones#available)
 	// to return operations for.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone                 string   `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServerConfigRequest) Reset()         { *m = GetServerConfigRequest{} }
+func (m *GetServerConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServerConfigRequest) ProtoMessage()    {}
+func (*GetServerConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{33}
+}
+func (m *GetServerConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServerConfigRequest.Unmarshal(m, b)
+}
+func (m *GetServerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServerConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServerConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServerConfigRequest.Merge(dst, src)
+}
+func (m *GetServerConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServerConfigRequest.Size(m)
+}
+func (m *GetServerConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServerConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetServerConfigRequest) Reset()                    { *m = GetServerConfigRequest{} }
-func (m *GetServerConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServerConfigRequest) ProtoMessage()               {}
-func (*GetServerConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} }
+var xxx_messageInfo_GetServerConfigRequest proto.InternalMessageInfo
 
 func (m *GetServerConfigRequest) GetProjectId() string {
 	if m != nil {
@@ -2487,21 +3200,43 @@ func (m *GetServerConfigRequest) GetZone() string {
 // Container Engine service configuration.
 type ServerConfig struct {
 	// Version of Kubernetes the service deploys by default.
-	DefaultClusterVersion string `protobuf:"bytes,1,opt,name=default_cluster_version,json=defaultClusterVersion" json:"default_cluster_version,omitempty"`
+	DefaultClusterVersion string `protobuf:"bytes,1,opt,name=default_cluster_version,json=defaultClusterVersion,proto3" json:"default_cluster_version,omitempty"`
 	// List of valid node upgrade target versions.
-	ValidNodeVersions []string `protobuf:"bytes,3,rep,name=valid_node_versions,json=validNodeVersions" json:"valid_node_versions,omitempty"`
+	ValidNodeVersions []string `protobuf:"bytes,3,rep,name=valid_node_versions,json=validNodeVersions,proto3" json:"valid_node_versions,omitempty"`
 	// Default image type.
-	DefaultImageType string `protobuf:"bytes,4,opt,name=default_image_type,json=defaultImageType" json:"default_image_type,omitempty"`
+	DefaultImageType string `protobuf:"bytes,4,opt,name=default_image_type,json=defaultImageType,proto3" json:"default_image_type,omitempty"`
 	// List of valid image types.
-	ValidImageTypes []string `protobuf:"bytes,5,rep,name=valid_image_types,json=validImageTypes" json:"valid_image_types,omitempty"`
+	ValidImageTypes []string `protobuf:"bytes,5,rep,name=valid_image_types,json=validImageTypes,proto3" json:"valid_image_types,omitempty"`
 	// List of valid master versions.
-	ValidMasterVersions []string `protobuf:"bytes,6,rep,name=valid_master_versions,json=validMasterVersions" json:"valid_master_versions,omitempty"`
+	ValidMasterVersions  []string `protobuf:"bytes,6,rep,name=valid_master_versions,json=validMasterVersions,proto3" json:"valid_master_versions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ServerConfig) Reset()                    { *m = ServerConfig{} }
-func (m *ServerConfig) String() string            { return proto.CompactTextString(m) }
-func (*ServerConfig) ProtoMessage()               {}
-func (*ServerConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} }
+func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
+func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
+func (*ServerConfig) ProtoMessage()    {}
+func (*ServerConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{34}
+}
+func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
+}
+func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
+}
+func (dst *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(dst, src)
+}
+func (m *ServerConfig) XXX_Size() int {
+	return xxx_messageInfo_ServerConfig.Size(m)
+}
+func (m *ServerConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerConfig proto.InternalMessageInfo
 
 func (m *ServerConfig) GetDefaultClusterVersion() string {
 	if m != nil {
@@ -2542,21 +3277,43 @@ func (m *ServerConfig) GetValidMasterVersions() []string {
 type CreateNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The node pool to create.
-	NodePool *NodePool `protobuf:"bytes,4,opt,name=node_pool,json=nodePool" json:"node_pool,omitempty"`
+	NodePool             *NodePool `protobuf:"bytes,4,opt,name=node_pool,json=nodePool,proto3" json:"node_pool,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CreateNodePoolRequest) Reset()         { *m = CreateNodePoolRequest{} }
+func (m *CreateNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateNodePoolRequest) ProtoMessage()    {}
+func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{35}
+}
+func (m *CreateNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateNodePoolRequest.Unmarshal(m, b)
+}
+func (m *CreateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNodePoolRequest.Merge(dst, src)
+}
+func (m *CreateNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateNodePoolRequest.Size(m)
+}
+func (m *CreateNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateNodePoolRequest.DiscardUnknown(m)
 }
 
-func (m *CreateNodePoolRequest) Reset()                    { *m = CreateNodePoolRequest{} }
-func (m *CreateNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateNodePoolRequest) ProtoMessage()               {}
-func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} }
+var xxx_messageInfo_CreateNodePoolRequest proto.InternalMessageInfo
 
 func (m *CreateNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2590,21 +3347,43 @@ func (m *CreateNodePoolRequest) GetNodePool() *NodePool {
 type DeleteNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to delete.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId           string   `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteNodePoolRequest) Reset()                    { *m = DeleteNodePoolRequest{} }
-func (m *DeleteNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteNodePoolRequest) ProtoMessage()               {}
-func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} }
+func (m *DeleteNodePoolRequest) Reset()         { *m = DeleteNodePoolRequest{} }
+func (m *DeleteNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteNodePoolRequest) ProtoMessage()    {}
+func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{36}
+}
+func (m *DeleteNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteNodePoolRequest.Unmarshal(m, b)
+}
+func (m *DeleteNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNodePoolRequest.Merge(dst, src)
+}
+func (m *DeleteNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteNodePoolRequest.Size(m)
+}
+func (m *DeleteNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteNodePoolRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteNodePoolRequest proto.InternalMessageInfo
 
 func (m *DeleteNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2638,19 +3417,41 @@ func (m *DeleteNodePoolRequest) GetNodePoolId() string {
 type ListNodePoolsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId            string   `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListNodePoolsRequest) Reset()         { *m = ListNodePoolsRequest{} }
+func (m *ListNodePoolsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListNodePoolsRequest) ProtoMessage()    {}
+func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{37}
+}
+func (m *ListNodePoolsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNodePoolsRequest.Unmarshal(m, b)
+}
+func (m *ListNodePoolsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNodePoolsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsRequest.Merge(dst, src)
+}
+func (m *ListNodePoolsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListNodePoolsRequest.Size(m)
+}
+func (m *ListNodePoolsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNodePoolsRequest.DiscardUnknown(m)
 }
 
-func (m *ListNodePoolsRequest) Reset()                    { *m = ListNodePoolsRequest{} }
-func (m *ListNodePoolsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListNodePoolsRequest) ProtoMessage()               {}
-func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} }
+var xxx_messageInfo_ListNodePoolsRequest proto.InternalMessageInfo
 
 func (m *ListNodePoolsRequest) GetProjectId() string {
 	if m != nil {
@@ -2677,21 +3478,43 @@ func (m *ListNodePoolsRequest) GetClusterId() string {
 type GetNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId           string   `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetNodePoolRequest) Reset()                    { *m = GetNodePoolRequest{} }
-func (m *GetNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetNodePoolRequest) ProtoMessage()               {}
-func (*GetNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} }
+func (m *GetNodePoolRequest) Reset()         { *m = GetNodePoolRequest{} }
+func (m *GetNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*GetNodePoolRequest) ProtoMessage()    {}
+func (*GetNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{38}
+}
+func (m *GetNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetNodePoolRequest.Unmarshal(m, b)
+}
+func (m *GetNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNodePoolRequest.Merge(dst, src)
+}
+func (m *GetNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_GetNodePoolRequest.Size(m)
+}
+func (m *GetNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetNodePoolRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetNodePoolRequest proto.InternalMessageInfo
 
 func (m *GetNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2729,38 +3552,60 @@ func (m *GetNodePoolRequest) GetNodePoolId() string {
 // the workload.
 type NodePool struct {
 	// The name of the node pool.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The node configuration of the pool.
-	Config *NodeConfig `protobuf:"bytes,2,opt,name=config" json:"config,omitempty"`
+	Config *NodeConfig `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 	// The initial node count for the pool. You must ensure that your
 	// Compute Engine <a href="/compute/docs/resource-quotas">resource quota</a>
 	// is sufficient for this number of instances. You must also have available
 	// firewall and routes quota.
-	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount" json:"initial_node_count,omitempty"`
+	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount,proto3" json:"initial_node_count,omitempty"`
 	// [Output only] Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// The version of the Kubernetes of this node.
-	Version string `protobuf:"bytes,101,opt,name=version" json:"version,omitempty"`
+	Version string `protobuf:"bytes,101,opt,name=version,proto3" json:"version,omitempty"`
 	// [Output only] The resource URLs of the [managed instance
 	// groups](/compute/docs/instance-groups/creating-groups-of-managed-instances)
 	// associated with this node pool.
-	InstanceGroupUrls []string `protobuf:"bytes,102,rep,name=instance_group_urls,json=instanceGroupUrls" json:"instance_group_urls,omitempty"`
+	InstanceGroupUrls []string `protobuf:"bytes,102,rep,name=instance_group_urls,json=instanceGroupUrls,proto3" json:"instance_group_urls,omitempty"`
 	// [Output only] The status of the nodes in this pool instance.
-	Status NodePool_Status `protobuf:"varint,103,opt,name=status,enum=google.container.v1.NodePool_Status" json:"status,omitempty"`
+	Status NodePool_Status `protobuf:"varint,103,opt,name=status,proto3,enum=google.container.v1.NodePool_Status" json:"status,omitempty"`
 	// [Output only] Additional information about the current status of this
 	// node pool instance, if available.
-	StatusMessage string `protobuf:"bytes,104,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage string `protobuf:"bytes,104,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// Autoscaler configuration for this NodePool. Autoscaler is enabled
 	// only if a valid configuration is present.
-	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,4,opt,name=autoscaling" json:"autoscaling,omitempty"`
+	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,4,opt,name=autoscaling,proto3" json:"autoscaling,omitempty"`
 	// NodeManagement configuration for this NodePool.
-	Management *NodeManagement `protobuf:"bytes,5,opt,name=management" json:"management,omitempty"`
+	Management           *NodeManagement `protobuf:"bytes,5,opt,name=management,proto3" json:"management,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *NodePool) Reset()         { *m = NodePool{} }
+func (m *NodePool) String() string { return proto.CompactTextString(m) }
+func (*NodePool) ProtoMessage()    {}
+func (*NodePool) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{39}
+}
+func (m *NodePool) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodePool.Unmarshal(m, b)
+}
+func (m *NodePool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodePool.Marshal(b, m, deterministic)
+}
+func (dst *NodePool) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePool.Merge(dst, src)
+}
+func (m *NodePool) XXX_Size() int {
+	return xxx_messageInfo_NodePool.Size(m)
+}
+func (m *NodePool) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodePool.DiscardUnknown(m)
 }
 
-func (m *NodePool) Reset()                    { *m = NodePool{} }
-func (m *NodePool) String() string            { return proto.CompactTextString(m) }
-func (*NodePool) ProtoMessage()               {}
-func (*NodePool) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} }
+var xxx_messageInfo_NodePool proto.InternalMessageInfo
 
 func (m *NodePool) GetName() string {
 	if m != nil {
@@ -2838,20 +3683,42 @@ type NodeManagement struct {
 	// A flag that specifies whether node auto-upgrade is enabled for the node
 	// pool. If enabled, node auto-upgrade helps keep the nodes in your node pool
 	// up to date with the latest release version of Kubernetes.
-	AutoUpgrade bool `protobuf:"varint,1,opt,name=auto_upgrade,json=autoUpgrade" json:"auto_upgrade,omitempty"`
+	AutoUpgrade bool `protobuf:"varint,1,opt,name=auto_upgrade,json=autoUpgrade,proto3" json:"auto_upgrade,omitempty"`
 	// A flag that specifies whether the node auto-repair is enabled for the node
 	// pool. If enabled, the nodes in this node pool will be monitored and, if
 	// they fail health checks too many times, an automatic repair action will be
 	// triggered.
-	AutoRepair bool `protobuf:"varint,2,opt,name=auto_repair,json=autoRepair" json:"auto_repair,omitempty"`
+	AutoRepair bool `protobuf:"varint,2,opt,name=auto_repair,json=autoRepair,proto3" json:"auto_repair,omitempty"`
 	// Specifies the Auto Upgrade knobs for the node pool.
-	UpgradeOptions *AutoUpgradeOptions `protobuf:"bytes,10,opt,name=upgrade_options,json=upgradeOptions" json:"upgrade_options,omitempty"`
+	UpgradeOptions       *AutoUpgradeOptions `protobuf:"bytes,10,opt,name=upgrade_options,json=upgradeOptions,proto3" json:"upgrade_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *NodeManagement) Reset()         { *m = NodeManagement{} }
+func (m *NodeManagement) String() string { return proto.CompactTextString(m) }
+func (*NodeManagement) ProtoMessage()    {}
+func (*NodeManagement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{40}
+}
+func (m *NodeManagement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeManagement.Unmarshal(m, b)
+}
+func (m *NodeManagement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeManagement.Marshal(b, m, deterministic)
+}
+func (dst *NodeManagement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeManagement.Merge(dst, src)
+}
+func (m *NodeManagement) XXX_Size() int {
+	return xxx_messageInfo_NodeManagement.Size(m)
+}
+func (m *NodeManagement) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeManagement.DiscardUnknown(m)
 }
 
-func (m *NodeManagement) Reset()                    { *m = NodeManagement{} }
-func (m *NodeManagement) String() string            { return proto.CompactTextString(m) }
-func (*NodeManagement) ProtoMessage()               {}
-func (*NodeManagement) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} }
+var xxx_messageInfo_NodeManagement proto.InternalMessageInfo
 
 func (m *NodeManagement) GetAutoUpgrade() bool {
 	if m != nil {
@@ -2880,16 +3747,38 @@ type AutoUpgradeOptions struct {
 	// [Output only] This field is set when upgrades are about to commence
 	// with the approximate start time for the upgrades, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	AutoUpgradeStartTime string `protobuf:"bytes,1,opt,name=auto_upgrade_start_time,json=autoUpgradeStartTime" json:"auto_upgrade_start_time,omitempty"`
+	AutoUpgradeStartTime string `protobuf:"bytes,1,opt,name=auto_upgrade_start_time,json=autoUpgradeStartTime,proto3" json:"auto_upgrade_start_time,omitempty"`
 	// [Output only] This field is set when upgrades are about to commence
 	// with the description of the upgrade.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AutoUpgradeOptions) Reset()                    { *m = AutoUpgradeOptions{} }
-func (m *AutoUpgradeOptions) String() string            { return proto.CompactTextString(m) }
-func (*AutoUpgradeOptions) ProtoMessage()               {}
-func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} }
+func (m *AutoUpgradeOptions) Reset()         { *m = AutoUpgradeOptions{} }
+func (m *AutoUpgradeOptions) String() string { return proto.CompactTextString(m) }
+func (*AutoUpgradeOptions) ProtoMessage()    {}
+func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{41}
+}
+func (m *AutoUpgradeOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AutoUpgradeOptions.Unmarshal(m, b)
+}
+func (m *AutoUpgradeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AutoUpgradeOptions.Marshal(b, m, deterministic)
+}
+func (dst *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AutoUpgradeOptions.Merge(dst, src)
+}
+func (m *AutoUpgradeOptions) XXX_Size() int {
+	return xxx_messageInfo_AutoUpgradeOptions.Size(m)
+}
+func (m *AutoUpgradeOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_AutoUpgradeOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AutoUpgradeOptions proto.InternalMessageInfo
 
 func (m *AutoUpgradeOptions) GetAutoUpgradeStartTime() string {
 	if m != nil {
@@ -2908,13 +3797,35 @@ func (m *AutoUpgradeOptions) GetDescription() string {
 // MaintenancePolicy defines the maintenance policy to be used for the cluster.
 type MaintenancePolicy struct {
 	// Specifies the maintenance window in which maintenance may be performed.
-	Window *MaintenanceWindow `protobuf:"bytes,1,opt,name=window" json:"window,omitempty"`
+	Window               *MaintenanceWindow `protobuf:"bytes,1,opt,name=window,proto3" json:"window,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *MaintenancePolicy) Reset()                    { *m = MaintenancePolicy{} }
-func (m *MaintenancePolicy) String() string            { return proto.CompactTextString(m) }
-func (*MaintenancePolicy) ProtoMessage()               {}
-func (*MaintenancePolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{42} }
+func (m *MaintenancePolicy) Reset()         { *m = MaintenancePolicy{} }
+func (m *MaintenancePolicy) String() string { return proto.CompactTextString(m) }
+func (*MaintenancePolicy) ProtoMessage()    {}
+func (*MaintenancePolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{42}
+}
+func (m *MaintenancePolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MaintenancePolicy.Unmarshal(m, b)
+}
+func (m *MaintenancePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MaintenancePolicy.Marshal(b, m, deterministic)
+}
+func (dst *MaintenancePolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenancePolicy.Merge(dst, src)
+}
+func (m *MaintenancePolicy) XXX_Size() int {
+	return xxx_messageInfo_MaintenancePolicy.Size(m)
+}
+func (m *MaintenancePolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaintenancePolicy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MaintenancePolicy proto.InternalMessageInfo
 
 func (m *MaintenancePolicy) GetWindow() *MaintenanceWindow {
 	if m != nil {
@@ -2927,20 +3838,42 @@ func (m *MaintenancePolicy) GetWindow() *MaintenanceWindow {
 type MaintenanceWindow struct {
 	// Types that are valid to be assigned to Policy:
 	//	*MaintenanceWindow_DailyMaintenanceWindow
-	Policy isMaintenanceWindow_Policy `protobuf_oneof:"policy"`
+	Policy               isMaintenanceWindow_Policy `protobuf_oneof:"policy"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *MaintenanceWindow) Reset()                    { *m = MaintenanceWindow{} }
-func (m *MaintenanceWindow) String() string            { return proto.CompactTextString(m) }
-func (*MaintenanceWindow) ProtoMessage()               {}
-func (*MaintenanceWindow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{43} }
+func (m *MaintenanceWindow) Reset()         { *m = MaintenanceWindow{} }
+func (m *MaintenanceWindow) String() string { return proto.CompactTextString(m) }
+func (*MaintenanceWindow) ProtoMessage()    {}
+func (*MaintenanceWindow) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{43}
+}
+func (m *MaintenanceWindow) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MaintenanceWindow.Unmarshal(m, b)
+}
+func (m *MaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MaintenanceWindow.Marshal(b, m, deterministic)
+}
+func (dst *MaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenanceWindow.Merge(dst, src)
+}
+func (m *MaintenanceWindow) XXX_Size() int {
+	return xxx_messageInfo_MaintenanceWindow.Size(m)
+}
+func (m *MaintenanceWindow) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaintenanceWindow.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MaintenanceWindow proto.InternalMessageInfo
 
 type isMaintenanceWindow_Policy interface {
 	isMaintenanceWindow_Policy()
 }
 
 type MaintenanceWindow_DailyMaintenanceWindow struct {
-	DailyMaintenanceWindow *DailyMaintenanceWindow `protobuf:"bytes,2,opt,name=daily_maintenance_window,json=dailyMaintenanceWindow,oneof"`
+	DailyMaintenanceWindow *DailyMaintenanceWindow `protobuf:"bytes,2,opt,name=daily_maintenance_window,json=dailyMaintenanceWindow,proto3,oneof"`
 }
 
 func (*MaintenanceWindow_DailyMaintenanceWindow) isMaintenanceWindow_Policy() {}
@@ -3004,7 +3937,7 @@ func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Policy.(type) {
 	case *MaintenanceWindow_DailyMaintenanceWindow:
 		s := proto.Size(x.DailyMaintenanceWindow)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -3019,18 +3952,40 @@ type DailyMaintenanceWindow struct {
 	// Time within the maintenance window to start the maintenance operations.
 	// Time format should be in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt)
 	// format "HH:MM”, where HH : [00-23] and MM : [00-59] GMT.
-	StartTime string `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime string `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// [Output only] Duration of the time window, automatically chosen to be
 	// smallest possible in the given scenario.
 	// Duration will be in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt)
 	// format "PTnHnMnS".
-	Duration string `protobuf:"bytes,3,opt,name=duration" json:"duration,omitempty"`
+	Duration             string   `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DailyMaintenanceWindow) Reset()         { *m = DailyMaintenanceWindow{} }
+func (m *DailyMaintenanceWindow) String() string { return proto.CompactTextString(m) }
+func (*DailyMaintenanceWindow) ProtoMessage()    {}
+func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{44}
+}
+func (m *DailyMaintenanceWindow) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DailyMaintenanceWindow.Unmarshal(m, b)
+}
+func (m *DailyMaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DailyMaintenanceWindow.Marshal(b, m, deterministic)
+}
+func (dst *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DailyMaintenanceWindow.Merge(dst, src)
+}
+func (m *DailyMaintenanceWindow) XXX_Size() int {
+	return xxx_messageInfo_DailyMaintenanceWindow.Size(m)
+}
+func (m *DailyMaintenanceWindow) XXX_DiscardUnknown() {
+	xxx_messageInfo_DailyMaintenanceWindow.DiscardUnknown(m)
 }
 
-func (m *DailyMaintenanceWindow) Reset()                    { *m = DailyMaintenanceWindow{} }
-func (m *DailyMaintenanceWindow) String() string            { return proto.CompactTextString(m) }
-func (*DailyMaintenanceWindow) ProtoMessage()               {}
-func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{44} }
+var xxx_messageInfo_DailyMaintenanceWindow proto.InternalMessageInfo
 
 func (m *DailyMaintenanceWindow) GetStartTime() string {
 	if m != nil {
@@ -3051,23 +4006,45 @@ func (m *DailyMaintenanceWindow) GetDuration() string {
 type SetNodePoolManagementRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to update.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// NodeManagement configuration for the node pool.
-	Management *NodeManagement `protobuf:"bytes,5,opt,name=management" json:"management,omitempty"`
+	Management           *NodeManagement `protobuf:"bytes,5,opt,name=management,proto3" json:"management,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *SetNodePoolManagementRequest) Reset()                    { *m = SetNodePoolManagementRequest{} }
-func (m *SetNodePoolManagementRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNodePoolManagementRequest) ProtoMessage()               {}
-func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{45} }
+func (m *SetNodePoolManagementRequest) Reset()         { *m = SetNodePoolManagementRequest{} }
+func (m *SetNodePoolManagementRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNodePoolManagementRequest) ProtoMessage()    {}
+func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{45}
+}
+func (m *SetNodePoolManagementRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Unmarshal(m, b)
+}
+func (m *SetNodePoolManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolManagementRequest.Merge(dst, src)
+}
+func (m *SetNodePoolManagementRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Size(m)
+}
+func (m *SetNodePoolManagementRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNodePoolManagementRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetNodePoolManagementRequest proto.InternalMessageInfo
 
 func (m *SetNodePoolManagementRequest) GetProjectId() string {
 	if m != nil {
@@ -3109,23 +4086,45 @@ func (m *SetNodePoolManagementRequest) GetManagement() *NodeManagement {
 type SetNodePoolSizeRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to update.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The desired node count for the pool.
-	NodeCount int32 `protobuf:"varint,5,opt,name=node_count,json=nodeCount" json:"node_count,omitempty"`
+	NodeCount            int32    `protobuf:"varint,5,opt,name=node_count,json=nodeCount,proto3" json:"node_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SetNodePoolSizeRequest) Reset()         { *m = SetNodePoolSizeRequest{} }
+func (m *SetNodePoolSizeRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNodePoolSizeRequest) ProtoMessage()    {}
+func (*SetNodePoolSizeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{46}
+}
+func (m *SetNodePoolSizeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNodePoolSizeRequest.Unmarshal(m, b)
+}
+func (m *SetNodePoolSizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNodePoolSizeRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolSizeRequest.Merge(dst, src)
+}
+func (m *SetNodePoolSizeRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNodePoolSizeRequest.Size(m)
+}
+func (m *SetNodePoolSizeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNodePoolSizeRequest.DiscardUnknown(m)
 }
 
-func (m *SetNodePoolSizeRequest) Reset()                    { *m = SetNodePoolSizeRequest{} }
-func (m *SetNodePoolSizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNodePoolSizeRequest) ProtoMessage()               {}
-func (*SetNodePoolSizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46} }
+var xxx_messageInfo_SetNodePoolSizeRequest proto.InternalMessageInfo
 
 func (m *SetNodePoolSizeRequest) GetProjectId() string {
 	if m != nil {
@@ -3168,21 +4167,43 @@ func (m *SetNodePoolSizeRequest) GetNodeCount() int32 {
 type RollbackNodePoolUpgradeRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to rollback.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to rollback.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId           string   `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RollbackNodePoolUpgradeRequest) Reset()                    { *m = RollbackNodePoolUpgradeRequest{} }
-func (m *RollbackNodePoolUpgradeRequest) String() string            { return proto.CompactTextString(m) }
-func (*RollbackNodePoolUpgradeRequest) ProtoMessage()               {}
-func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{47} }
+func (m *RollbackNodePoolUpgradeRequest) Reset()         { *m = RollbackNodePoolUpgradeRequest{} }
+func (m *RollbackNodePoolUpgradeRequest) String() string { return proto.CompactTextString(m) }
+func (*RollbackNodePoolUpgradeRequest) ProtoMessage()    {}
+func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{47}
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Unmarshal(m, b)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Marshal(b, m, deterministic)
+}
+func (dst *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(dst, src)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Size() int {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Size(m)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RollbackNodePoolUpgradeRequest proto.InternalMessageInfo
 
 func (m *RollbackNodePoolUpgradeRequest) GetProjectId() string {
 	if m != nil {
@@ -3215,13 +4236,35 @@ func (m *RollbackNodePoolUpgradeRequest) GetNodePoolId() string {
 // ListNodePoolsResponse is the result of ListNodePoolsRequest.
 type ListNodePoolsResponse struct {
 	// A list of node pools for a cluster.
-	NodePools []*NodePool `protobuf:"bytes,1,rep,name=node_pools,json=nodePools" json:"node_pools,omitempty"`
+	NodePools            []*NodePool `protobuf:"bytes,1,rep,name=node_pools,json=nodePools,proto3" json:"node_pools,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *ListNodePoolsResponse) Reset()         { *m = ListNodePoolsResponse{} }
+func (m *ListNodePoolsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListNodePoolsResponse) ProtoMessage()    {}
+func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{48}
+}
+func (m *ListNodePoolsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNodePoolsResponse.Unmarshal(m, b)
+}
+func (m *ListNodePoolsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNodePoolsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsResponse.Merge(dst, src)
+}
+func (m *ListNodePoolsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListNodePoolsResponse.Size(m)
+}
+func (m *ListNodePoolsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNodePoolsResponse.DiscardUnknown(m)
 }
 
-func (m *ListNodePoolsResponse) Reset()                    { *m = ListNodePoolsResponse{} }
-func (m *ListNodePoolsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListNodePoolsResponse) ProtoMessage()               {}
-func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{48} }
+var xxx_messageInfo_ListNodePoolsResponse proto.InternalMessageInfo
 
 func (m *ListNodePoolsResponse) GetNodePools() []*NodePool {
 	if m != nil {
@@ -3234,19 +4277,41 @@ func (m *ListNodePoolsResponse) GetNodePools() []*NodePool {
 // adjust the size of the node pool to the current cluster usage.
 type NodePoolAutoscaling struct {
 	// Is autoscaling enabled for this node pool.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// Minimum number of nodes in the NodePool. Must be >= 1 and <=
 	// max_node_count.
-	MinNodeCount int32 `protobuf:"varint,2,opt,name=min_node_count,json=minNodeCount" json:"min_node_count,omitempty"`
+	MinNodeCount int32 `protobuf:"varint,2,opt,name=min_node_count,json=minNodeCount,proto3" json:"min_node_count,omitempty"`
 	// Maximum number of nodes in the NodePool. Must be >= min_node_count. There
 	// has to enough quota to scale up the cluster.
-	MaxNodeCount int32 `protobuf:"varint,3,opt,name=max_node_count,json=maxNodeCount" json:"max_node_count,omitempty"`
+	MaxNodeCount         int32    `protobuf:"varint,3,opt,name=max_node_count,json=maxNodeCount,proto3" json:"max_node_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NodePoolAutoscaling) Reset()                    { *m = NodePoolAutoscaling{} }
-func (m *NodePoolAutoscaling) String() string            { return proto.CompactTextString(m) }
-func (*NodePoolAutoscaling) ProtoMessage()               {}
-func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{49} }
+func (m *NodePoolAutoscaling) Reset()         { *m = NodePoolAutoscaling{} }
+func (m *NodePoolAutoscaling) String() string { return proto.CompactTextString(m) }
+func (*NodePoolAutoscaling) ProtoMessage()    {}
+func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{49}
+}
+func (m *NodePoolAutoscaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodePoolAutoscaling.Unmarshal(m, b)
+}
+func (m *NodePoolAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodePoolAutoscaling.Marshal(b, m, deterministic)
+}
+func (dst *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePoolAutoscaling.Merge(dst, src)
+}
+func (m *NodePoolAutoscaling) XXX_Size() int {
+	return xxx_messageInfo_NodePoolAutoscaling.Size(m)
+}
+func (m *NodePoolAutoscaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodePoolAutoscaling.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodePoolAutoscaling proto.InternalMessageInfo
 
 func (m *NodePoolAutoscaling) GetEnabled() bool {
 	if m != nil {
@@ -3275,28 +4340,50 @@ func (m *NodePoolAutoscaling) GetMaxNodeCount() int32 {
 type SetLabelsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The labels to set for that cluster.
-	ResourceLabels map[string]string `protobuf:"bytes,4,rep,name=resource_labels,json=resourceLabels" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ResourceLabels map[string]string `protobuf:"bytes,4,rep,name=resource_labels,json=resourceLabels,proto3" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The fingerprint of the previous set of labels for this resource,
 	// used to detect conflicts. The fingerprint is initially generated by
 	// Container Engine and changes after every request to modify or update
 	// labels. You must always provide an up-to-date fingerprint hash when
 	// updating or changing labels. Make a <code>get()</code> request to the
 	// resource to get the latest fingerprint.
-	LabelFingerprint string `protobuf:"bytes,5,opt,name=label_fingerprint,json=labelFingerprint" json:"label_fingerprint,omitempty"`
+	LabelFingerprint     string   `protobuf:"bytes,5,opt,name=label_fingerprint,json=labelFingerprint,proto3" json:"label_fingerprint,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLabelsRequest) Reset()                    { *m = SetLabelsRequest{} }
-func (m *SetLabelsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLabelsRequest) ProtoMessage()               {}
-func (*SetLabelsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{50} }
+func (m *SetLabelsRequest) Reset()         { *m = SetLabelsRequest{} }
+func (m *SetLabelsRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLabelsRequest) ProtoMessage()    {}
+func (*SetLabelsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{50}
+}
+func (m *SetLabelsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLabelsRequest.Unmarshal(m, b)
+}
+func (m *SetLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLabelsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLabelsRequest.Merge(dst, src)
+}
+func (m *SetLabelsRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLabelsRequest.Size(m)
+}
+func (m *SetLabelsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLabelsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLabelsRequest proto.InternalMessageInfo
 
 func (m *SetLabelsRequest) GetProjectId() string {
 	if m != nil {
@@ -3338,21 +4425,43 @@ func (m *SetLabelsRequest) GetLabelFingerprint() string {
 type SetLegacyAbacRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// Whether ABAC authorization will be enabled in the cluster.
-	Enabled bool `protobuf:"varint,4,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled              bool     `protobuf:"varint,4,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLegacyAbacRequest) Reset()                    { *m = SetLegacyAbacRequest{} }
-func (m *SetLegacyAbacRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLegacyAbacRequest) ProtoMessage()               {}
-func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51} }
+func (m *SetLegacyAbacRequest) Reset()         { *m = SetLegacyAbacRequest{} }
+func (m *SetLegacyAbacRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLegacyAbacRequest) ProtoMessage()    {}
+func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{51}
+}
+func (m *SetLegacyAbacRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLegacyAbacRequest.Unmarshal(m, b)
+}
+func (m *SetLegacyAbacRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLegacyAbacRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLegacyAbacRequest.Merge(dst, src)
+}
+func (m *SetLegacyAbacRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLegacyAbacRequest.Size(m)
+}
+func (m *SetLegacyAbacRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLegacyAbacRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLegacyAbacRequest proto.InternalMessageInfo
 
 func (m *SetLegacyAbacRequest) GetProjectId() string {
 	if m != nil {
@@ -3387,19 +4496,41 @@ func (m *SetLegacyAbacRequest) GetEnabled() bool {
 type StartIPRotationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId            string   `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StartIPRotationRequest) Reset()         { *m = StartIPRotationRequest{} }
+func (m *StartIPRotationRequest) String() string { return proto.CompactTextString(m) }
+func (*StartIPRotationRequest) ProtoMessage()    {}
+func (*StartIPRotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{52}
+}
+func (m *StartIPRotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StartIPRotationRequest.Unmarshal(m, b)
+}
+func (m *StartIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StartIPRotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *StartIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartIPRotationRequest.Merge(dst, src)
+}
+func (m *StartIPRotationRequest) XXX_Size() int {
+	return xxx_messageInfo_StartIPRotationRequest.Size(m)
+}
+func (m *StartIPRotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StartIPRotationRequest.DiscardUnknown(m)
 }
 
-func (m *StartIPRotationRequest) Reset()                    { *m = StartIPRotationRequest{} }
-func (m *StartIPRotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*StartIPRotationRequest) ProtoMessage()               {}
-func (*StartIPRotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{52} }
+var xxx_messageInfo_StartIPRotationRequest proto.InternalMessageInfo
 
 func (m *StartIPRotationRequest) GetProjectId() string {
 	if m != nil {
@@ -3426,19 +4557,41 @@ func (m *StartIPRotationRequest) GetClusterId() string {
 type CompleteIPRotationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId            string   `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CompleteIPRotationRequest) Reset()         { *m = CompleteIPRotationRequest{} }
+func (m *CompleteIPRotationRequest) String() string { return proto.CompactTextString(m) }
+func (*CompleteIPRotationRequest) ProtoMessage()    {}
+func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{53}
+}
+func (m *CompleteIPRotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CompleteIPRotationRequest.Unmarshal(m, b)
+}
+func (m *CompleteIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CompleteIPRotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteIPRotationRequest.Merge(dst, src)
+}
+func (m *CompleteIPRotationRequest) XXX_Size() int {
+	return xxx_messageInfo_CompleteIPRotationRequest.Size(m)
+}
+func (m *CompleteIPRotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CompleteIPRotationRequest.DiscardUnknown(m)
 }
 
-func (m *CompleteIPRotationRequest) Reset()                    { *m = CompleteIPRotationRequest{} }
-func (m *CompleteIPRotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CompleteIPRotationRequest) ProtoMessage()               {}
-func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{53} }
+var xxx_messageInfo_CompleteIPRotationRequest proto.InternalMessageInfo
 
 func (m *CompleteIPRotationRequest) GetProjectId() string {
 	if m != nil {
@@ -3464,16 +4617,38 @@ func (m *CompleteIPRotationRequest) GetClusterId() string {
 // AcceleratorConfig represents a Hardware Accelerator request.
 type AcceleratorConfig struct {
 	// The number of the accelerator cards exposed to an instance.
-	AcceleratorCount int64 `protobuf:"varint,1,opt,name=accelerator_count,json=acceleratorCount" json:"accelerator_count,omitempty"`
+	AcceleratorCount int64 `protobuf:"varint,1,opt,name=accelerator_count,json=acceleratorCount,proto3" json:"accelerator_count,omitempty"`
 	// The accelerator type resource name. List of supported accelerators
 	// [here](/compute/docs/gpus/#Introduction)
-	AcceleratorType string `protobuf:"bytes,2,opt,name=accelerator_type,json=acceleratorType" json:"accelerator_type,omitempty"`
+	AcceleratorType      string   `protobuf:"bytes,2,opt,name=accelerator_type,json=acceleratorType,proto3" json:"accelerator_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AcceleratorConfig) Reset()                    { *m = AcceleratorConfig{} }
-func (m *AcceleratorConfig) String() string            { return proto.CompactTextString(m) }
-func (*AcceleratorConfig) ProtoMessage()               {}
-func (*AcceleratorConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{54} }
+func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
+func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
+func (*AcceleratorConfig) ProtoMessage()    {}
+func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{54}
+}
+func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
+}
+func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
+}
+func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+}
+func (m *AcceleratorConfig) XXX_Size() int {
+	return xxx_messageInfo_AcceleratorConfig.Size(m)
+}
+func (m *AcceleratorConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AcceleratorConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AcceleratorConfig proto.InternalMessageInfo
 
 func (m *AcceleratorConfig) GetAcceleratorCount() int64 {
 	if m != nil {
@@ -3493,21 +4668,43 @@ func (m *AcceleratorConfig) GetAcceleratorType() string {
 type SetNetworkPolicyRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// Configuration options for the NetworkPolicy feature.
-	NetworkPolicy *NetworkPolicy `protobuf:"bytes,4,opt,name=network_policy,json=networkPolicy" json:"network_policy,omitempty"`
+	NetworkPolicy        *NetworkPolicy `protobuf:"bytes,4,opt,name=network_policy,json=networkPolicy,proto3" json:"network_policy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *SetNetworkPolicyRequest) Reset()                    { *m = SetNetworkPolicyRequest{} }
-func (m *SetNetworkPolicyRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNetworkPolicyRequest) ProtoMessage()               {}
-func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{55} }
+func (m *SetNetworkPolicyRequest) Reset()         { *m = SetNetworkPolicyRequest{} }
+func (m *SetNetworkPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNetworkPolicyRequest) ProtoMessage()    {}
+func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{55}
+}
+func (m *SetNetworkPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Unmarshal(m, b)
+}
+func (m *SetNetworkPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNetworkPolicyRequest.Merge(dst, src)
+}
+func (m *SetNetworkPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Size(m)
+}
+func (m *SetNetworkPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNetworkPolicyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetNetworkPolicyRequest proto.InternalMessageInfo
 
 func (m *SetNetworkPolicyRequest) GetProjectId() string {
 	if m != nil {
@@ -3541,22 +4738,44 @@ func (m *SetNetworkPolicyRequest) GetNetworkPolicy() *NetworkPolicy {
 type SetMaintenancePolicyRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The maintenance policy to be set for the cluster. An empty field
 	// clears the existing maintenance policy.
-	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,4,opt,name=maintenance_policy,json=maintenancePolicy" json:"maintenance_policy,omitempty"`
+	MaintenancePolicy    *MaintenancePolicy `protobuf:"bytes,4,opt,name=maintenance_policy,json=maintenancePolicy,proto3" json:"maintenance_policy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *SetMaintenancePolicyRequest) Reset()         { *m = SetMaintenancePolicyRequest{} }
+func (m *SetMaintenancePolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*SetMaintenancePolicyRequest) ProtoMessage()    {}
+func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5118ef8ec5d5f37b, []int{56}
+}
+func (m *SetMaintenancePolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Unmarshal(m, b)
+}
+func (m *SetMaintenancePolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(dst, src)
+}
+func (m *SetMaintenancePolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Size(m)
+}
+func (m *SetMaintenancePolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetMaintenancePolicyRequest.DiscardUnknown(m)
 }
 
-func (m *SetMaintenancePolicyRequest) Reset()                    { *m = SetMaintenancePolicyRequest{} }
-func (m *SetMaintenancePolicyRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetMaintenancePolicyRequest) ProtoMessage()               {}
-func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56} }
+var xxx_messageInfo_SetMaintenancePolicyRequest proto.InternalMessageInfo
 
 func (m *SetMaintenancePolicyRequest) GetProjectId() string {
 	if m != nil {
@@ -3588,6 +4807,8 @@ func (m *SetMaintenancePolicyRequest) GetMaintenancePolicy() *MaintenancePolicy
 
 func init() {
 	proto.RegisterType((*NodeConfig)(nil), "google.container.v1.NodeConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1.NodeConfig.LabelsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1.NodeConfig.MetadataEntry")
 	proto.RegisterType((*MasterAuth)(nil), "google.container.v1.MasterAuth")
 	proto.RegisterType((*ClientCertificateConfig)(nil), "google.container.v1.ClientCertificateConfig")
 	proto.RegisterType((*AddonsConfig)(nil), "google.container.v1.AddonsConfig")
@@ -3601,6 +4822,7 @@ func init() {
 	proto.RegisterType((*NetworkPolicy)(nil), "google.container.v1.NetworkPolicy")
 	proto.RegisterType((*IPAllocationPolicy)(nil), "google.container.v1.IPAllocationPolicy")
 	proto.RegisterType((*Cluster)(nil), "google.container.v1.Cluster")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1.Cluster.ResourceLabelsEntry")
 	proto.RegisterType((*ClusterUpdate)(nil), "google.container.v1.ClusterUpdate")
 	proto.RegisterType((*Operation)(nil), "google.container.v1.Operation")
 	proto.RegisterType((*CreateClusterRequest)(nil), "google.container.v1.CreateClusterRequest")
@@ -3639,6 +4861,7 @@ func init() {
 	proto.RegisterType((*ListNodePoolsResponse)(nil), "google.container.v1.ListNodePoolsResponse")
 	proto.RegisterType((*NodePoolAutoscaling)(nil), "google.container.v1.NodePoolAutoscaling")
 	proto.RegisterType((*SetLabelsRequest)(nil), "google.container.v1.SetLabelsRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1.SetLabelsRequest.ResourceLabelsEntry")
 	proto.RegisterType((*SetLegacyAbacRequest)(nil), "google.container.v1.SetLegacyAbacRequest")
 	proto.RegisterType((*StartIPRotationRequest)(nil), "google.container.v1.StartIPRotationRequest")
 	proto.RegisterType((*CompleteIPRotationRequest)(nil), "google.container.v1.CompleteIPRotationRequest")
@@ -3661,8 +4884,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ClusterManager service
-
+// ClusterManagerClient is the client API for ClusterManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ClusterManagerClient interface {
 	// Lists all clusters owned by a project in either the specified zone or all
 	// zones.
@@ -3718,7 +4942,7 @@ type ClusterManagerClient interface {
 	// Gets the specified operation.
 	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
 	// Cancels the specified operation.
-	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Returns configuration info about the Container Engine service.
 	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
 	// Lists the node pools for a cluster.
@@ -3760,7 +4984,7 @@ func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
 
 func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
 	out := new(ListClustersResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/ListClusters", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListClusters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3769,7 +4993,7 @@ func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListCluster
 
 func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/GetCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3778,7 +5002,7 @@ func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterReq
 
 func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3787,7 +5011,7 @@ func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClus
 
 func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3796,7 +5020,7 @@ func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClus
 
 func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3805,7 +5029,7 @@ func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNod
 
 func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolAutoscaling", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3814,7 +5038,7 @@ func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *S
 
 func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLoggingService", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLoggingService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3823,7 +5047,7 @@ func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLog
 
 func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMonitoringService", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMonitoringService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3832,7 +5056,7 @@ func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *Set
 
 func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetAddonsConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetAddonsConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3841,7 +5065,7 @@ func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddon
 
 func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLocations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLocations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3850,7 +5074,7 @@ func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocation
 
 func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateMaster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/UpdateMaster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3859,7 +5083,7 @@ func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMaste
 
 func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMasterAuth", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMasterAuth", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3868,7 +5092,7 @@ func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterA
 
 func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3877,7 +5101,7 @@ func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClus
 
 func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
 	out := new(ListOperationsResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/ListOperations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListOperations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3886,16 +5110,16 @@ func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOpera
 
 func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/GetOperation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/CancelOperation", in, out, c.cc, opts...)
+func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CancelOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3904,7 +5128,7 @@ func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOp
 
 func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
 	out := new(ServerConfig)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/GetServerConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetServerConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3913,7 +5137,7 @@ func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServe
 
 func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
 	out := new(ListNodePoolsResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/ListNodePools", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/ListNodePools", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3922,7 +5146,7 @@ func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePo
 
 func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
 	out := new(NodePool)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/GetNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/GetNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3931,7 +5155,7 @@ func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolR
 
 func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CreateNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3940,7 +5164,7 @@ func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNod
 
 func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/DeleteNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3949,7 +5173,7 @@ func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNod
 
 func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3958,7 +5182,7 @@ func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *
 
 func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolManagement", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolManagement", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3967,7 +5191,7 @@ func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *Se
 
 func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLabels", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLabels", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3976,7 +5200,7 @@ func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsReque
 
 func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLegacyAbac", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetLegacyAbac", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3985,7 +5209,7 @@ func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyA
 
 func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/StartIPRotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/StartIPRotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3994,7 +5218,7 @@ func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPR
 
 func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/CompleteIPRotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CompleteIPRotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4003,7 +5227,7 @@ func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *Compl
 
 func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolSize", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNodePoolSize", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4012,7 +5236,7 @@ func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodeP
 
 func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNetworkPolicy", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetNetworkPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4021,15 +5245,14 @@ func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetw
 
 func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMaintenancePolicy", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ClusterManager service
-
+// ClusterManagerServer is the server API for ClusterManager service.
 type ClusterManagerServer interface {
 	// Lists all clusters owned by a project in either the specified zone or all
 	// zones.
@@ -4085,7 +5308,7 @@ type ClusterManagerServer interface {
 	// Gets the specified operation.
 	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
 	// Cancels the specified operation.
-	CancelOperation(context.Context, *CancelOperationRequest) (*google_protobuf1.Empty, error)
+	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
 	// Returns configuration info about the Container Engine service.
 	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
 	// Lists the node pools for a cluster.
@@ -4790,9 +6013,11 @@ var _ClusterManager_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/container/v1/cluster_service.proto",
 }
 
-func init() { proto.RegisterFile("google/container/v1/cluster_service.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/container/v1/cluster_service.proto", fileDescriptor_cluster_service_5118ef8ec5d5f37b)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_cluster_service_5118ef8ec5d5f37b = []byte{
 	// 4602 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5c, 0xdd, 0x8f, 0x23, 0x57,
 	0x56, 0xdf, 0xea, 0x76, 0xbb, 0xdb, 0xc7, 0x1f, 0xed, 0xbe, 0xfd, 0xe5, 0x38, 0x33, 0xc9, 0x4c,
diff --git a/vendor/google.golang.org/genproto/googleapis/container/v1alpha1/cluster_service.pb.go b/vendor/google.golang.org/genproto/googleapis/container/v1alpha1/cluster_service.pb.go
index ddf0e22d..09351038 100644
--- a/vendor/google.golang.org/genproto/googleapis/container/v1alpha1/cluster_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/container/v1alpha1/cluster_service.pb.go
@@ -1,79 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1alpha1/cluster_service.proto
 
-/*
-Package container is a generated protocol buffer package.
-
-It is generated from these files:
-	google/container/v1alpha1/cluster_service.proto
-
-It has these top-level messages:
-	NodeConfig
-	NodeTaint
-	MasterAuth
-	ClientCertificateConfig
-	AddonsConfig
-	HttpLoadBalancing
-	HorizontalPodAutoscaling
-	KubernetesDashboard
-	NetworkPolicyConfig
-	MasterAuthorizedNetworksConfig
-	NetworkPolicy
-	IPAllocationPolicy
-	PodSecurityPolicyConfig
-	Cluster
-	ClusterUpdate
-	Operation
-	CreateClusterRequest
-	GetClusterRequest
-	UpdateClusterRequest
-	UpdateNodePoolRequest
-	SetNodePoolAutoscalingRequest
-	SetLoggingServiceRequest
-	SetMonitoringServiceRequest
-	SetAddonsConfigRequest
-	SetLocationsRequest
-	UpdateMasterRequest
-	SetMasterAuthRequest
-	DeleteClusterRequest
-	ListClustersRequest
-	ListClustersResponse
-	GetOperationRequest
-	ListOperationsRequest
-	CancelOperationRequest
-	ListOperationsResponse
-	GetServerConfigRequest
-	ServerConfig
-	CreateNodePoolRequest
-	DeleteNodePoolRequest
-	ListNodePoolsRequest
-	GetNodePoolRequest
-	NodePool
-	NodeManagement
-	AutoUpgradeOptions
-	MaintenancePolicy
-	MaintenanceWindow
-	DailyMaintenanceWindow
-	SetNodePoolManagementRequest
-	SetNodePoolSizeRequest
-	RollbackNodePoolUpgradeRequest
-	ListNodePoolsResponse
-	NodePoolAutoscaling
-	SetLabelsRequest
-	SetLegacyAbacRequest
-	StartIPRotationRequest
-	CompleteIPRotationRequest
-	AcceleratorConfig
-	SetNetworkPolicyRequest
-	SetMaintenancePolicyRequest
-*/
-package container
+package container // import "google.golang.org/genproto/googleapis/container/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -121,7 +55,9 @@ var NodeTaint_Effect_value = map[string]int32{
 func (x NodeTaint_Effect) String() string {
 	return proto.EnumName(NodeTaint_Effect_name, int32(x))
 }
-func (NodeTaint_Effect) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (NodeTaint_Effect) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{1, 0}
+}
 
 // Allowed Network Policy providers.
 type NetworkPolicy_Provider int32
@@ -145,7 +81,9 @@ var NetworkPolicy_Provider_value = map[string]int32{
 func (x NetworkPolicy_Provider) String() string {
 	return proto.EnumName(NetworkPolicy_Provider_name, int32(x))
 }
-func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 0} }
+func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{10, 0}
+}
 
 // The current status of the cluster.
 type Cluster_Status int32
@@ -189,7 +127,9 @@ var Cluster_Status_value = map[string]int32{
 func (x Cluster_Status) String() string {
 	return proto.EnumName(Cluster_Status_name, int32(x))
 }
-func (Cluster_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{13, 0} }
+func (Cluster_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{13, 0}
+}
 
 // Current status of the operation.
 type Operation_Status int32
@@ -225,7 +165,9 @@ var Operation_Status_value = map[string]int32{
 func (x Operation_Status) String() string {
 	return proto.EnumName(Operation_Status_name, int32(x))
 }
-func (Operation_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{15, 0} }
+func (Operation_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{15, 0}
+}
 
 // Operation type.
 type Operation_Type int32
@@ -309,7 +251,9 @@ var Operation_Type_value = map[string]int32{
 func (x Operation_Type) String() string {
 	return proto.EnumName(Operation_Type_name, int32(x))
 }
-func (Operation_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{15, 1} }
+func (Operation_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{15, 1}
+}
 
 // Operation type: what type update to perform.
 type SetMasterAuthRequest_Action int32
@@ -345,7 +289,7 @@ func (x SetMasterAuthRequest_Action) String() string {
 	return proto.EnumName(SetMasterAuthRequest_Action_name, int32(x))
 }
 func (SetMasterAuthRequest_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{26, 0}
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{26, 0}
 }
 
 // The current status of the node pool instance.
@@ -397,7 +341,9 @@ var NodePool_Status_value = map[string]int32{
 func (x NodePool_Status) String() string {
 	return proto.EnumName(NodePool_Status_name, int32(x))
 }
-func (NodePool_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{40, 0} }
+func (NodePool_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{40, 0}
+}
 
 // Parameters that describe the nodes in a cluster.
 type NodeConfig struct {
@@ -407,12 +353,12 @@ type NodeConfig struct {
 	//
 	// If unspecified, the default machine type is
 	// `n1-standard-1`.
-	MachineType string `protobuf:"bytes,1,opt,name=machine_type,json=machineType" json:"machine_type,omitempty"`
+	MachineType string `protobuf:"bytes,1,opt,name=machine_type,json=machineType,proto3" json:"machine_type,omitempty"`
 	// Size of the disk attached to each node, specified in GB.
 	// The smallest allowed disk size is 10GB.
 	//
 	// If unspecified, the default disk size is 100GB.
-	DiskSizeGb int32 `protobuf:"varint,2,opt,name=disk_size_gb,json=diskSizeGb" json:"disk_size_gb,omitempty"`
+	DiskSizeGb int32 `protobuf:"varint,2,opt,name=disk_size_gb,json=diskSizeGb,proto3" json:"disk_size_gb,omitempty"`
 	// The set of Google API scopes to be made available on all of the
 	// node VMs under the "default" service account.
 	//
@@ -427,10 +373,10 @@ type NodeConfig struct {
 	//
 	// If unspecified, no scopes are added, unless Cloud Logging or Cloud
 	// Monitoring are enabled, in which case their required scopes will be added.
-	OauthScopes []string `protobuf:"bytes,3,rep,name=oauth_scopes,json=oauthScopes" json:"oauth_scopes,omitempty"`
+	OauthScopes []string `protobuf:"bytes,3,rep,name=oauth_scopes,json=oauthScopes,proto3" json:"oauth_scopes,omitempty"`
 	// The Google Cloud Platform Service Account to be used by the node VMs. If
 	// no Service Account is specified, the "default" service account is used.
-	ServiceAccount string `protobuf:"bytes,9,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
+	ServiceAccount string `protobuf:"bytes,9,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
 	// The metadata key/value pairs assigned to instances in the cluster.
 	//
 	// Keys must conform to the regexp [a-zA-Z0-9-_]+ and be less than 128 bytes
@@ -444,10 +390,10 @@ type NodeConfig struct {
 	// that each value's size must be less than or equal to 32 KB.
 	//
 	// The total size of all keys and values must be less than 512 KB.
-	Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The image type to use for this node. Note that for a given image type,
 	// the latest version of it will be used.
-	ImageType string `protobuf:"bytes,5,opt,name=image_type,json=imageType" json:"image_type,omitempty"`
+	ImageType string `protobuf:"bytes,5,opt,name=image_type,json=imageType,proto3" json:"image_type,omitempty"`
 	// The map of Kubernetes labels (key/value pairs) to be applied to each node.
 	// These will added in addition to any default label(s) that
 	// Kubernetes may apply to the node.
@@ -456,45 +402,67 @@ type NodeConfig struct {
 	// and conflicts should be avoided.
 	// For more information, including usage and the valid values, see:
 	// https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-	Labels map[string]string `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The number of local SSD disks to be attached to the node.
 	//
 	// The limit for this value is dependant upon the maximum number of
 	// disks available on a machine per zone. See:
 	// https://cloud.google.com/compute/docs/disks/local-ssd#local_ssd_limits
 	// for more information.
-	LocalSsdCount int32 `protobuf:"varint,7,opt,name=local_ssd_count,json=localSsdCount" json:"local_ssd_count,omitempty"`
+	LocalSsdCount int32 `protobuf:"varint,7,opt,name=local_ssd_count,json=localSsdCount,proto3" json:"local_ssd_count,omitempty"`
 	// The list of instance tags applied to all nodes. Tags are used to identify
 	// valid sources or targets for network firewalls and are specified by
 	// the client during cluster or node pool creation. Each tag within the list
 	// must comply with RFC1035.
-	Tags []string `protobuf:"bytes,8,rep,name=tags" json:"tags,omitempty"`
+	Tags []string `protobuf:"bytes,8,rep,name=tags,proto3" json:"tags,omitempty"`
 	// Whether the nodes are created as preemptible VM instances. See:
 	// https://cloud.google.com/compute/docs/instances/preemptible for more
 	// inforamtion about preemptible VM instances.
-	Preemptible bool `protobuf:"varint,10,opt,name=preemptible" json:"preemptible,omitempty"`
+	Preemptible bool `protobuf:"varint,10,opt,name=preemptible,proto3" json:"preemptible,omitempty"`
 	// A list of hardware accelerators to be attached to each node.
 	// See https://cloud.google.com/compute/docs/gpus for more information about
 	// support for GPUs.
-	Accelerators []*AcceleratorConfig `protobuf:"bytes,11,rep,name=accelerators" json:"accelerators,omitempty"`
+	Accelerators []*AcceleratorConfig `protobuf:"bytes,11,rep,name=accelerators,proto3" json:"accelerators,omitempty"`
 	// Minimum CPU platform to be used by this instance. The instance may be
 	// scheduled on the specified or newer CPU platform. Applicable values are the
 	// friendly names of CPU platforms, such as
 	// <code>minCpuPlatform: &quot;Intel Haswell&quot;</code> or
 	// <code>minCpuPlatform: &quot;Intel Sandy Bridge&quot;</code>. For more
 	// information, read [how to specify min CPU platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform)
-	MinCpuPlatform string `protobuf:"bytes,13,opt,name=min_cpu_platform,json=minCpuPlatform" json:"min_cpu_platform,omitempty"`
+	MinCpuPlatform string `protobuf:"bytes,13,opt,name=min_cpu_platform,json=minCpuPlatform,proto3" json:"min_cpu_platform,omitempty"`
 	// List of kubernetes taints to be applied to each node.
 	//
 	// For more information, including usage and the valid values, see:
 	// https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-	Taints []*NodeTaint `protobuf:"bytes,15,rep,name=taints" json:"taints,omitempty"`
+	Taints               []*NodeTaint `protobuf:"bytes,15,rep,name=taints,proto3" json:"taints,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *NodeConfig) Reset()         { *m = NodeConfig{} }
+func (m *NodeConfig) String() string { return proto.CompactTextString(m) }
+func (*NodeConfig) ProtoMessage()    {}
+func (*NodeConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{0}
+}
+func (m *NodeConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeConfig.Unmarshal(m, b)
+}
+func (m *NodeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeConfig.Marshal(b, m, deterministic)
+}
+func (dst *NodeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeConfig.Merge(dst, src)
+}
+func (m *NodeConfig) XXX_Size() int {
+	return xxx_messageInfo_NodeConfig.Size(m)
+}
+func (m *NodeConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeConfig.DiscardUnknown(m)
 }
 
-func (m *NodeConfig) Reset()                    { *m = NodeConfig{} }
-func (m *NodeConfig) String() string            { return proto.CompactTextString(m) }
-func (*NodeConfig) ProtoMessage()               {}
-func (*NodeConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_NodeConfig proto.InternalMessageInfo
 
 func (m *NodeConfig) GetMachineType() string {
 	if m != nil {
@@ -594,17 +562,39 @@ func (m *NodeConfig) GetTaints() []*NodeTaint {
 // https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 type NodeTaint struct {
 	// Key for taint.
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// Value for taint.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Effect for taint.
-	Effect NodeTaint_Effect `protobuf:"varint,3,opt,name=effect,enum=google.container.v1alpha1.NodeTaint_Effect" json:"effect,omitempty"`
+	Effect               NodeTaint_Effect `protobuf:"varint,3,opt,name=effect,proto3,enum=google.container.v1alpha1.NodeTaint_Effect" json:"effect,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *NodeTaint) Reset()                    { *m = NodeTaint{} }
-func (m *NodeTaint) String() string            { return proto.CompactTextString(m) }
-func (*NodeTaint) ProtoMessage()               {}
-func (*NodeTaint) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *NodeTaint) Reset()         { *m = NodeTaint{} }
+func (m *NodeTaint) String() string { return proto.CompactTextString(m) }
+func (*NodeTaint) ProtoMessage()    {}
+func (*NodeTaint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{1}
+}
+func (m *NodeTaint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeTaint.Unmarshal(m, b)
+}
+func (m *NodeTaint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeTaint.Marshal(b, m, deterministic)
+}
+func (dst *NodeTaint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeTaint.Merge(dst, src)
+}
+func (m *NodeTaint) XXX_Size() int {
+	return xxx_messageInfo_NodeTaint.Size(m)
+}
+func (m *NodeTaint) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeTaint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeTaint proto.InternalMessageInfo
 
 func (m *NodeTaint) GetKey() string {
 	if m != nil {
@@ -634,30 +624,52 @@ type MasterAuth struct {
 	// The username to use for HTTP basic authentication to the master endpoint.
 	// For clusters v1.6.0 and later, you can disable basic authentication by
 	// providing an empty username.
-	Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
+	Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
 	// The password to use for HTTP basic authentication to the master endpoint.
 	// Because the master endpoint is open to the Internet, you should create a
 	// strong password.  If a password is provided for cluster creation, username
 	// must be non-empty.
-	Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
+	Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
 	// Configuration for client certificate authentication on the cluster.  If no
 	// configuration is specified, a client certificate is issued.
-	ClientCertificateConfig *ClientCertificateConfig `protobuf:"bytes,3,opt,name=client_certificate_config,json=clientCertificateConfig" json:"client_certificate_config,omitempty"`
+	ClientCertificateConfig *ClientCertificateConfig `protobuf:"bytes,3,opt,name=client_certificate_config,json=clientCertificateConfig,proto3" json:"client_certificate_config,omitempty"`
 	// [Output only] Base64-encoded public certificate that is the root of
 	// trust for the cluster.
-	ClusterCaCertificate string `protobuf:"bytes,100,opt,name=cluster_ca_certificate,json=clusterCaCertificate" json:"cluster_ca_certificate,omitempty"`
+	ClusterCaCertificate string `protobuf:"bytes,100,opt,name=cluster_ca_certificate,json=clusterCaCertificate,proto3" json:"cluster_ca_certificate,omitempty"`
 	// [Output only] Base64-encoded public certificate used by clients to
 	// authenticate to the cluster endpoint.
-	ClientCertificate string `protobuf:"bytes,101,opt,name=client_certificate,json=clientCertificate" json:"client_certificate,omitempty"`
+	ClientCertificate string `protobuf:"bytes,101,opt,name=client_certificate,json=clientCertificate,proto3" json:"client_certificate,omitempty"`
 	// [Output only] Base64-encoded private key used by clients to authenticate
 	// to the cluster endpoint.
-	ClientKey string `protobuf:"bytes,102,opt,name=client_key,json=clientKey" json:"client_key,omitempty"`
+	ClientKey            string   `protobuf:"bytes,102,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MasterAuth) Reset()         { *m = MasterAuth{} }
+func (m *MasterAuth) String() string { return proto.CompactTextString(m) }
+func (*MasterAuth) ProtoMessage()    {}
+func (*MasterAuth) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{2}
+}
+func (m *MasterAuth) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuth.Unmarshal(m, b)
+}
+func (m *MasterAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuth.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuth) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuth.Merge(dst, src)
+}
+func (m *MasterAuth) XXX_Size() int {
+	return xxx_messageInfo_MasterAuth.Size(m)
+}
+func (m *MasterAuth) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuth.DiscardUnknown(m)
 }
 
-func (m *MasterAuth) Reset()                    { *m = MasterAuth{} }
-func (m *MasterAuth) String() string            { return proto.CompactTextString(m) }
-func (*MasterAuth) ProtoMessage()               {}
-func (*MasterAuth) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_MasterAuth proto.InternalMessageInfo
 
 func (m *MasterAuth) GetUsername() string {
 	if m != nil {
@@ -704,13 +716,35 @@ func (m *MasterAuth) GetClientKey() string {
 // Configuration for client certificates on the cluster.
 type ClientCertificateConfig struct {
 	// Issue a client certificate.
-	IssueClientCertificate bool `protobuf:"varint,1,opt,name=issue_client_certificate,json=issueClientCertificate" json:"issue_client_certificate,omitempty"`
+	IssueClientCertificate bool     `protobuf:"varint,1,opt,name=issue_client_certificate,json=issueClientCertificate,proto3" json:"issue_client_certificate,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
 }
 
-func (m *ClientCertificateConfig) Reset()                    { *m = ClientCertificateConfig{} }
-func (m *ClientCertificateConfig) String() string            { return proto.CompactTextString(m) }
-func (*ClientCertificateConfig) ProtoMessage()               {}
-func (*ClientCertificateConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ClientCertificateConfig) Reset()         { *m = ClientCertificateConfig{} }
+func (m *ClientCertificateConfig) String() string { return proto.CompactTextString(m) }
+func (*ClientCertificateConfig) ProtoMessage()    {}
+func (*ClientCertificateConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{3}
+}
+func (m *ClientCertificateConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientCertificateConfig.Unmarshal(m, b)
+}
+func (m *ClientCertificateConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientCertificateConfig.Marshal(b, m, deterministic)
+}
+func (dst *ClientCertificateConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientCertificateConfig.Merge(dst, src)
+}
+func (m *ClientCertificateConfig) XXX_Size() int {
+	return xxx_messageInfo_ClientCertificateConfig.Size(m)
+}
+func (m *ClientCertificateConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientCertificateConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClientCertificateConfig proto.InternalMessageInfo
 
 func (m *ClientCertificateConfig) GetIssueClientCertificate() bool {
 	if m != nil {
@@ -724,23 +758,45 @@ func (m *ClientCertificateConfig) GetIssueClientCertificate() bool {
 type AddonsConfig struct {
 	// Configuration for the HTTP (L7) load balancing controller addon, which
 	// makes it easy to set up HTTP load balancers for services in a cluster.
-	HttpLoadBalancing *HttpLoadBalancing `protobuf:"bytes,1,opt,name=http_load_balancing,json=httpLoadBalancing" json:"http_load_balancing,omitempty"`
+	HttpLoadBalancing *HttpLoadBalancing `protobuf:"bytes,1,opt,name=http_load_balancing,json=httpLoadBalancing,proto3" json:"http_load_balancing,omitempty"`
 	// Configuration for the horizontal pod autoscaling feature, which
 	// increases or decreases the number of replica pods a replication controller
 	// has based on the resource usage of the existing pods.
-	HorizontalPodAutoscaling *HorizontalPodAutoscaling `protobuf:"bytes,2,opt,name=horizontal_pod_autoscaling,json=horizontalPodAutoscaling" json:"horizontal_pod_autoscaling,omitempty"`
+	HorizontalPodAutoscaling *HorizontalPodAutoscaling `protobuf:"bytes,2,opt,name=horizontal_pod_autoscaling,json=horizontalPodAutoscaling,proto3" json:"horizontal_pod_autoscaling,omitempty"`
 	// Configuration for the Kubernetes Dashboard.
-	KubernetesDashboard *KubernetesDashboard `protobuf:"bytes,3,opt,name=kubernetes_dashboard,json=kubernetesDashboard" json:"kubernetes_dashboard,omitempty"`
+	KubernetesDashboard *KubernetesDashboard `protobuf:"bytes,3,opt,name=kubernetes_dashboard,json=kubernetesDashboard,proto3" json:"kubernetes_dashboard,omitempty"`
 	// Configuration for NetworkPolicy. This only tracks whether the addon
 	// is enabled or not on the Master, it does not track whether network policy
 	// is enabled for the nodes.
-	NetworkPolicyConfig *NetworkPolicyConfig `protobuf:"bytes,4,opt,name=network_policy_config,json=networkPolicyConfig" json:"network_policy_config,omitempty"`
+	NetworkPolicyConfig  *NetworkPolicyConfig `protobuf:"bytes,4,opt,name=network_policy_config,json=networkPolicyConfig,proto3" json:"network_policy_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *AddonsConfig) Reset()         { *m = AddonsConfig{} }
+func (m *AddonsConfig) String() string { return proto.CompactTextString(m) }
+func (*AddonsConfig) ProtoMessage()    {}
+func (*AddonsConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{4}
+}
+func (m *AddonsConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AddonsConfig.Unmarshal(m, b)
+}
+func (m *AddonsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AddonsConfig.Marshal(b, m, deterministic)
+}
+func (dst *AddonsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddonsConfig.Merge(dst, src)
+}
+func (m *AddonsConfig) XXX_Size() int {
+	return xxx_messageInfo_AddonsConfig.Size(m)
+}
+func (m *AddonsConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AddonsConfig.DiscardUnknown(m)
 }
 
-func (m *AddonsConfig) Reset()                    { *m = AddonsConfig{} }
-func (m *AddonsConfig) String() string            { return proto.CompactTextString(m) }
-func (*AddonsConfig) ProtoMessage()               {}
-func (*AddonsConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_AddonsConfig proto.InternalMessageInfo
 
 func (m *AddonsConfig) GetHttpLoadBalancing() *HttpLoadBalancing {
 	if m != nil {
@@ -776,13 +832,35 @@ type HttpLoadBalancing struct {
 	// Whether the HTTP Load Balancing controller is enabled in the cluster.
 	// When enabled, it runs a small pod in the cluster that manages the load
 	// balancers.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *HttpLoadBalancing) Reset()                    { *m = HttpLoadBalancing{} }
-func (m *HttpLoadBalancing) String() string            { return proto.CompactTextString(m) }
-func (*HttpLoadBalancing) ProtoMessage()               {}
-func (*HttpLoadBalancing) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *HttpLoadBalancing) Reset()         { *m = HttpLoadBalancing{} }
+func (m *HttpLoadBalancing) String() string { return proto.CompactTextString(m) }
+func (*HttpLoadBalancing) ProtoMessage()    {}
+func (*HttpLoadBalancing) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{5}
+}
+func (m *HttpLoadBalancing) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpLoadBalancing.Unmarshal(m, b)
+}
+func (m *HttpLoadBalancing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpLoadBalancing.Marshal(b, m, deterministic)
+}
+func (dst *HttpLoadBalancing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpLoadBalancing.Merge(dst, src)
+}
+func (m *HttpLoadBalancing) XXX_Size() int {
+	return xxx_messageInfo_HttpLoadBalancing.Size(m)
+}
+func (m *HttpLoadBalancing) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpLoadBalancing.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HttpLoadBalancing proto.InternalMessageInfo
 
 func (m *HttpLoadBalancing) GetDisabled() bool {
 	if m != nil {
@@ -798,13 +876,35 @@ type HorizontalPodAutoscaling struct {
 	// Whether the Horizontal Pod Autoscaling feature is enabled in the cluster.
 	// When enabled, it ensures that a Heapster pod is running in the cluster,
 	// which is also used by the Cloud Monitoring service.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HorizontalPodAutoscaling) Reset()         { *m = HorizontalPodAutoscaling{} }
+func (m *HorizontalPodAutoscaling) String() string { return proto.CompactTextString(m) }
+func (*HorizontalPodAutoscaling) ProtoMessage()    {}
+func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{6}
+}
+func (m *HorizontalPodAutoscaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Unmarshal(m, b)
+}
+func (m *HorizontalPodAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Marshal(b, m, deterministic)
+}
+func (dst *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HorizontalPodAutoscaling.Merge(dst, src)
+}
+func (m *HorizontalPodAutoscaling) XXX_Size() int {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Size(m)
+}
+func (m *HorizontalPodAutoscaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_HorizontalPodAutoscaling.DiscardUnknown(m)
 }
 
-func (m *HorizontalPodAutoscaling) Reset()                    { *m = HorizontalPodAutoscaling{} }
-func (m *HorizontalPodAutoscaling) String() string            { return proto.CompactTextString(m) }
-func (*HorizontalPodAutoscaling) ProtoMessage()               {}
-func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_HorizontalPodAutoscaling proto.InternalMessageInfo
 
 func (m *HorizontalPodAutoscaling) GetDisabled() bool {
 	if m != nil {
@@ -816,13 +916,35 @@ func (m *HorizontalPodAutoscaling) GetDisabled() bool {
 // Configuration for the Kubernetes Dashboard.
 type KubernetesDashboard struct {
 	// Whether the Kubernetes Dashboard is enabled for this cluster.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KubernetesDashboard) Reset()         { *m = KubernetesDashboard{} }
+func (m *KubernetesDashboard) String() string { return proto.CompactTextString(m) }
+func (*KubernetesDashboard) ProtoMessage()    {}
+func (*KubernetesDashboard) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{7}
+}
+func (m *KubernetesDashboard) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KubernetesDashboard.Unmarshal(m, b)
+}
+func (m *KubernetesDashboard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KubernetesDashboard.Marshal(b, m, deterministic)
+}
+func (dst *KubernetesDashboard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KubernetesDashboard.Merge(dst, src)
+}
+func (m *KubernetesDashboard) XXX_Size() int {
+	return xxx_messageInfo_KubernetesDashboard.Size(m)
+}
+func (m *KubernetesDashboard) XXX_DiscardUnknown() {
+	xxx_messageInfo_KubernetesDashboard.DiscardUnknown(m)
 }
 
-func (m *KubernetesDashboard) Reset()                    { *m = KubernetesDashboard{} }
-func (m *KubernetesDashboard) String() string            { return proto.CompactTextString(m) }
-func (*KubernetesDashboard) ProtoMessage()               {}
-func (*KubernetesDashboard) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_KubernetesDashboard proto.InternalMessageInfo
 
 func (m *KubernetesDashboard) GetDisabled() bool {
 	if m != nil {
@@ -836,13 +958,35 @@ func (m *KubernetesDashboard) GetDisabled() bool {
 // is enabled for the nodes.
 type NetworkPolicyConfig struct {
 	// Whether NetworkPolicy is enabled for this cluster.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NetworkPolicyConfig) Reset()                    { *m = NetworkPolicyConfig{} }
-func (m *NetworkPolicyConfig) String() string            { return proto.CompactTextString(m) }
-func (*NetworkPolicyConfig) ProtoMessage()               {}
-func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *NetworkPolicyConfig) Reset()         { *m = NetworkPolicyConfig{} }
+func (m *NetworkPolicyConfig) String() string { return proto.CompactTextString(m) }
+func (*NetworkPolicyConfig) ProtoMessage()    {}
+func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{8}
+}
+func (m *NetworkPolicyConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NetworkPolicyConfig.Unmarshal(m, b)
+}
+func (m *NetworkPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NetworkPolicyConfig.Marshal(b, m, deterministic)
+}
+func (dst *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicyConfig.Merge(dst, src)
+}
+func (m *NetworkPolicyConfig) XXX_Size() int {
+	return xxx_messageInfo_NetworkPolicyConfig.Size(m)
+}
+func (m *NetworkPolicyConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_NetworkPolicyConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NetworkPolicyConfig proto.InternalMessageInfo
 
 func (m *NetworkPolicyConfig) GetDisabled() bool {
 	if m != nil {
@@ -857,16 +1001,38 @@ func (m *NetworkPolicyConfig) GetDisabled() bool {
 // Google Compute Engine Public IPs and Google Prod IPs.
 type MasterAuthorizedNetworksConfig struct {
 	// Whether or not master authorized networks is enabled.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// cidr_blocks define up to 10 external networks that could access
 	// Kubernetes master through HTTPS.
-	CidrBlocks []*MasterAuthorizedNetworksConfig_CidrBlock `protobuf:"bytes,2,rep,name=cidr_blocks,json=cidrBlocks" json:"cidr_blocks,omitempty"`
+	CidrBlocks           []*MasterAuthorizedNetworksConfig_CidrBlock `protobuf:"bytes,2,rep,name=cidr_blocks,json=cidrBlocks,proto3" json:"cidr_blocks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                    `json:"-"`
+	XXX_unrecognized     []byte                                      `json:"-"`
+	XXX_sizecache        int32                                       `json:"-"`
 }
 
-func (m *MasterAuthorizedNetworksConfig) Reset()                    { *m = MasterAuthorizedNetworksConfig{} }
-func (m *MasterAuthorizedNetworksConfig) String() string            { return proto.CompactTextString(m) }
-func (*MasterAuthorizedNetworksConfig) ProtoMessage()               {}
-func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *MasterAuthorizedNetworksConfig) Reset()         { *m = MasterAuthorizedNetworksConfig{} }
+func (m *MasterAuthorizedNetworksConfig) String() string { return proto.CompactTextString(m) }
+func (*MasterAuthorizedNetworksConfig) ProtoMessage()    {}
+func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{9}
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Unmarshal(m, b)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(dst, src)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Size() int {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Size(m)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MasterAuthorizedNetworksConfig proto.InternalMessageInfo
 
 func (m *MasterAuthorizedNetworksConfig) GetEnabled() bool {
 	if m != nil {
@@ -885,9 +1051,12 @@ func (m *MasterAuthorizedNetworksConfig) GetCidrBlocks() []*MasterAuthorizedNetw
 // CidrBlock contains an optional name and one CIDR block.
 type MasterAuthorizedNetworksConfig_CidrBlock struct {
 	// display_name is an optional field for users to identify CIDR blocks.
-	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// cidr_block must be specified in CIDR notation.
-	CidrBlock string `protobuf:"bytes,2,opt,name=cidr_block,json=cidrBlock" json:"cidr_block,omitempty"`
+	CidrBlock            string   `protobuf:"bytes,2,opt,name=cidr_block,json=cidrBlock,proto3" json:"cidr_block,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
@@ -896,8 +1065,25 @@ func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig_CidrBlock) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig_CidrBlock) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{9, 0}
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{9, 0}
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Unmarshal(m, b)
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(dst, src)
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Size() int {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Size(m)
 }
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock proto.InternalMessageInfo
 
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) GetDisplayName() string {
 	if m != nil {
@@ -917,15 +1103,37 @@ func (m *MasterAuthorizedNetworksConfig_CidrBlock) GetCidrBlock() string {
 // https://kubernetes.io/docs/concepts/services-networking/networkpolicies/
 type NetworkPolicy struct {
 	// The selected network policy provider.
-	Provider NetworkPolicy_Provider `protobuf:"varint,1,opt,name=provider,enum=google.container.v1alpha1.NetworkPolicy_Provider" json:"provider,omitempty"`
+	Provider NetworkPolicy_Provider `protobuf:"varint,1,opt,name=provider,proto3,enum=google.container.v1alpha1.NetworkPolicy_Provider" json:"provider,omitempty"`
 	// Whether network policy is enabled on the cluster.
-	Enabled bool `protobuf:"varint,2,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled              bool     `protobuf:"varint,2,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NetworkPolicy) Reset()                    { *m = NetworkPolicy{} }
-func (m *NetworkPolicy) String() string            { return proto.CompactTextString(m) }
-func (*NetworkPolicy) ProtoMessage()               {}
-func (*NetworkPolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *NetworkPolicy) Reset()         { *m = NetworkPolicy{} }
+func (m *NetworkPolicy) String() string { return proto.CompactTextString(m) }
+func (*NetworkPolicy) ProtoMessage()    {}
+func (*NetworkPolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{10}
+}
+func (m *NetworkPolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NetworkPolicy.Unmarshal(m, b)
+}
+func (m *NetworkPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NetworkPolicy.Marshal(b, m, deterministic)
+}
+func (dst *NetworkPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicy.Merge(dst, src)
+}
+func (m *NetworkPolicy) XXX_Size() int {
+	return xxx_messageInfo_NetworkPolicy.Size(m)
+}
+func (m *NetworkPolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_NetworkPolicy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NetworkPolicy proto.InternalMessageInfo
 
 func (m *NetworkPolicy) GetProvider() NetworkPolicy_Provider {
 	if m != nil {
@@ -944,21 +1152,21 @@ func (m *NetworkPolicy) GetEnabled() bool {
 // Configuration for controlling how IPs are allocated in the cluster.
 type IPAllocationPolicy struct {
 	// Whether alias IPs will be used for pod IPs in the cluster.
-	UseIpAliases bool `protobuf:"varint,1,opt,name=use_ip_aliases,json=useIpAliases" json:"use_ip_aliases,omitempty"`
+	UseIpAliases bool `protobuf:"varint,1,opt,name=use_ip_aliases,json=useIpAliases,proto3" json:"use_ip_aliases,omitempty"`
 	// Whether a new subnetwork will be created automatically for the cluster.
 	//
 	// This field is only applicable when `use_ip_aliases` is true.
-	CreateSubnetwork bool `protobuf:"varint,2,opt,name=create_subnetwork,json=createSubnetwork" json:"create_subnetwork,omitempty"`
+	CreateSubnetwork bool `protobuf:"varint,2,opt,name=create_subnetwork,json=createSubnetwork,proto3" json:"create_subnetwork,omitempty"`
 	// A custom subnetwork name to be used if `create_subnetwork` is true.  If
 	// this field is empty, then an automatic name will be chosen for the new
 	// subnetwork.
-	SubnetworkName string `protobuf:"bytes,3,opt,name=subnetwork_name,json=subnetworkName" json:"subnetwork_name,omitempty"`
+	SubnetworkName string `protobuf:"bytes,3,opt,name=subnetwork_name,json=subnetworkName,proto3" json:"subnetwork_name,omitempty"`
 	// This field is deprecated, use cluster_ipv4_cidr_block.
-	ClusterIpv4Cidr string `protobuf:"bytes,4,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr" json:"cluster_ipv4_cidr,omitempty"`
+	ClusterIpv4Cidr string `protobuf:"bytes,4,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr,proto3" json:"cluster_ipv4_cidr,omitempty"`
 	// This field is deprecated, use node_ipv4_cidr_block.
-	NodeIpv4Cidr string `protobuf:"bytes,5,opt,name=node_ipv4_cidr,json=nodeIpv4Cidr" json:"node_ipv4_cidr,omitempty"`
+	NodeIpv4Cidr string `protobuf:"bytes,5,opt,name=node_ipv4_cidr,json=nodeIpv4Cidr,proto3" json:"node_ipv4_cidr,omitempty"`
 	// This field is deprecated, use services_ipv4_cidr_block.
-	ServicesIpv4Cidr string `protobuf:"bytes,6,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr" json:"services_ipv4_cidr,omitempty"`
+	ServicesIpv4Cidr string `protobuf:"bytes,6,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr,proto3" json:"services_ipv4_cidr,omitempty"`
 	// The name of the secondary range to be used for the cluster CIDR
 	// block.  The secondary range will be used for pod IP
 	// addresses. This must be an existing secondary range associated
@@ -966,7 +1174,7 @@ type IPAllocationPolicy struct {
 	//
 	// This field is only applicable if use_ip_aliases is true and
 	// create_subnetwork is false.
-	ClusterSecondaryRangeName string `protobuf:"bytes,7,opt,name=cluster_secondary_range_name,json=clusterSecondaryRangeName" json:"cluster_secondary_range_name,omitempty"`
+	ClusterSecondaryRangeName string `protobuf:"bytes,7,opt,name=cluster_secondary_range_name,json=clusterSecondaryRangeName,proto3" json:"cluster_secondary_range_name,omitempty"`
 	// The name of the secondary range to be used as for the services
 	// CIDR block.  The secondary range will be used for service
 	// ClusterIPs. This must be an existing secondary range associated
@@ -974,7 +1182,7 @@ type IPAllocationPolicy struct {
 	//
 	// This field is only applicable with use_ip_aliases is true and
 	// create_subnetwork is false.
-	ServicesSecondaryRangeName string `protobuf:"bytes,8,opt,name=services_secondary_range_name,json=servicesSecondaryRangeName" json:"services_secondary_range_name,omitempty"`
+	ServicesSecondaryRangeName string `protobuf:"bytes,8,opt,name=services_secondary_range_name,json=servicesSecondaryRangeName,proto3" json:"services_secondary_range_name,omitempty"`
 	// The IP address range for the cluster pod IPs. If this field is set, then
 	// `cluster.cluster_ipv4_cidr` must be left blank.
 	//
@@ -990,7 +1198,7 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	ClusterIpv4CidrBlock string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr_block,json=clusterIpv4CidrBlock" json:"cluster_ipv4_cidr_block,omitempty"`
+	ClusterIpv4CidrBlock string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr_block,json=clusterIpv4CidrBlock,proto3" json:"cluster_ipv4_cidr_block,omitempty"`
 	// The IP address range of the instance IPs in this cluster.
 	//
 	// This is applicable only if `create_subnetwork` is true.
@@ -1005,7 +1213,7 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	NodeIpv4CidrBlock string `protobuf:"bytes,10,opt,name=node_ipv4_cidr_block,json=nodeIpv4CidrBlock" json:"node_ipv4_cidr_block,omitempty"`
+	NodeIpv4CidrBlock string `protobuf:"bytes,10,opt,name=node_ipv4_cidr_block,json=nodeIpv4CidrBlock,proto3" json:"node_ipv4_cidr_block,omitempty"`
 	// The IP address range of the services IPs in this cluster. If blank, a range
 	// will be automatically chosen with the default size.
 	//
@@ -1021,13 +1229,35 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	ServicesIpv4CidrBlock string `protobuf:"bytes,11,opt,name=services_ipv4_cidr_block,json=servicesIpv4CidrBlock" json:"services_ipv4_cidr_block,omitempty"`
+	ServicesIpv4CidrBlock string   `protobuf:"bytes,11,opt,name=services_ipv4_cidr_block,json=servicesIpv4CidrBlock,proto3" json:"services_ipv4_cidr_block,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *IPAllocationPolicy) Reset()         { *m = IPAllocationPolicy{} }
+func (m *IPAllocationPolicy) String() string { return proto.CompactTextString(m) }
+func (*IPAllocationPolicy) ProtoMessage()    {}
+func (*IPAllocationPolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{11}
+}
+func (m *IPAllocationPolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IPAllocationPolicy.Unmarshal(m, b)
+}
+func (m *IPAllocationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IPAllocationPolicy.Marshal(b, m, deterministic)
+}
+func (dst *IPAllocationPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IPAllocationPolicy.Merge(dst, src)
+}
+func (m *IPAllocationPolicy) XXX_Size() int {
+	return xxx_messageInfo_IPAllocationPolicy.Size(m)
+}
+func (m *IPAllocationPolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_IPAllocationPolicy.DiscardUnknown(m)
 }
 
-func (m *IPAllocationPolicy) Reset()                    { *m = IPAllocationPolicy{} }
-func (m *IPAllocationPolicy) String() string            { return proto.CompactTextString(m) }
-func (*IPAllocationPolicy) ProtoMessage()               {}
-func (*IPAllocationPolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_IPAllocationPolicy proto.InternalMessageInfo
 
 func (m *IPAllocationPolicy) GetUseIpAliases() bool {
 	if m != nil {
@@ -1110,13 +1340,35 @@ func (m *IPAllocationPolicy) GetServicesIpv4CidrBlock() string {
 type PodSecurityPolicyConfig struct {
 	// Enable the PodSecurityPolicy controller for this cluster. If enabled, pods
 	// must be valid under a PodSecurityPolicy to be created.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled              bool     `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PodSecurityPolicyConfig) Reset()                    { *m = PodSecurityPolicyConfig{} }
-func (m *PodSecurityPolicyConfig) String() string            { return proto.CompactTextString(m) }
-func (*PodSecurityPolicyConfig) ProtoMessage()               {}
-func (*PodSecurityPolicyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *PodSecurityPolicyConfig) Reset()         { *m = PodSecurityPolicyConfig{} }
+func (m *PodSecurityPolicyConfig) String() string { return proto.CompactTextString(m) }
+func (*PodSecurityPolicyConfig) ProtoMessage()    {}
+func (*PodSecurityPolicyConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{12}
+}
+func (m *PodSecurityPolicyConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PodSecurityPolicyConfig.Unmarshal(m, b)
+}
+func (m *PodSecurityPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PodSecurityPolicyConfig.Marshal(b, m, deterministic)
+}
+func (dst *PodSecurityPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PodSecurityPolicyConfig.Merge(dst, src)
+}
+func (m *PodSecurityPolicyConfig) XXX_Size() int {
+	return xxx_messageInfo_PodSecurityPolicyConfig.Size(m)
+}
+func (m *PodSecurityPolicyConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PodSecurityPolicyConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PodSecurityPolicyConfig proto.InternalMessageInfo
 
 func (m *PodSecurityPolicyConfig) GetEnabled() bool {
 	if m != nil {
@@ -1133,9 +1385,9 @@ type Cluster struct {
 	// * Lowercase letters, numbers, and hyphens only.
 	// * Must start with a letter.
 	// * Must end with a number or a letter.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional description of this cluster.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// The number of nodes to create in this cluster. You must ensure that your
 	// Compute Engine <a href="/compute/docs/resource-quotas">resource quota</a>
 	// is sufficient for this number of instances. You must also have available
@@ -1144,7 +1396,7 @@ type Cluster struct {
 	// "node_pool" object, since this configuration (along with the
 	// "node_config") will be used to create a "NodePool" object with an
 	// auto-generated name. Do not use this and a node_pool at the same time.
-	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount" json:"initial_node_count,omitempty"`
+	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount,proto3" json:"initial_node_count,omitempty"`
 	// Parameters used in creating the cluster's nodes.
 	// See `nodeConfig` for the description of its properties.
 	// For requests, this field should only be used in lieu of a
@@ -1155,127 +1407,149 @@ type Cluster struct {
 	// the first node pool.
 	//
 	// If unspecified, the defaults are used.
-	NodeConfig *NodeConfig `protobuf:"bytes,4,opt,name=node_config,json=nodeConfig" json:"node_config,omitempty"`
+	NodeConfig *NodeConfig `protobuf:"bytes,4,opt,name=node_config,json=nodeConfig,proto3" json:"node_config,omitempty"`
 	// The authentication information for accessing the master endpoint.
-	MasterAuth *MasterAuth `protobuf:"bytes,5,opt,name=master_auth,json=masterAuth" json:"master_auth,omitempty"`
+	MasterAuth *MasterAuth `protobuf:"bytes,5,opt,name=master_auth,json=masterAuth,proto3" json:"master_auth,omitempty"`
 	// The logging service the cluster should use to write logs.
 	// Currently available options:
 	//
 	// * `logging.googleapis.com` - the Google Cloud Logging service.
 	// * `none` - no logs will be exported from the cluster.
 	// * if left as an empty string,`logging.googleapis.com` will be used.
-	LoggingService string `protobuf:"bytes,6,opt,name=logging_service,json=loggingService" json:"logging_service,omitempty"`
+	LoggingService string `protobuf:"bytes,6,opt,name=logging_service,json=loggingService,proto3" json:"logging_service,omitempty"`
 	// The monitoring service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * `monitoring.googleapis.com` - the Google Cloud Monitoring service.
 	// * `none` - no metrics will be exported from the cluster.
 	// * if left as an empty string, `monitoring.googleapis.com` will be used.
-	MonitoringService string `protobuf:"bytes,7,opt,name=monitoring_service,json=monitoringService" json:"monitoring_service,omitempty"`
+	MonitoringService string `protobuf:"bytes,7,opt,name=monitoring_service,json=monitoringService,proto3" json:"monitoring_service,omitempty"`
 	// The name of the Google Compute Engine
 	// [network](/compute/docs/networks-and-firewalls#networks) to which the
 	// cluster is connected. If left unspecified, the `default` network
 	// will be used.
-	Network string `protobuf:"bytes,8,opt,name=network" json:"network,omitempty"`
+	Network string `protobuf:"bytes,8,opt,name=network,proto3" json:"network,omitempty"`
 	// The IP address range of the container pods in this cluster, in
 	// [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
 	// notation (e.g. `10.96.0.0/14`). Leave blank to have
 	// one automatically chosen or specify a `/14` block in `10.0.0.0/8`.
-	ClusterIpv4Cidr string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr" json:"cluster_ipv4_cidr,omitempty"`
+	ClusterIpv4Cidr string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr,proto3" json:"cluster_ipv4_cidr,omitempty"`
 	// Configurations for the various addons available to run in the cluster.
-	AddonsConfig *AddonsConfig `protobuf:"bytes,10,opt,name=addons_config,json=addonsConfig" json:"addons_config,omitempty"`
+	AddonsConfig *AddonsConfig `protobuf:"bytes,10,opt,name=addons_config,json=addonsConfig,proto3" json:"addons_config,omitempty"`
 	// The name of the Google Compute Engine
 	// [subnetwork](/compute/docs/subnetworks) to which the
 	// cluster is connected.
-	Subnetwork string `protobuf:"bytes,11,opt,name=subnetwork" json:"subnetwork,omitempty"`
+	Subnetwork string `protobuf:"bytes,11,opt,name=subnetwork,proto3" json:"subnetwork,omitempty"`
 	// The node pools associated with this cluster.
 	// This field should not be set if "node_config" or "initial_node_count" are
 	// specified.
-	NodePools []*NodePool `protobuf:"bytes,12,rep,name=node_pools,json=nodePools" json:"node_pools,omitempty"`
+	NodePools []*NodePool `protobuf:"bytes,12,rep,name=node_pools,json=nodePools,proto3" json:"node_pools,omitempty"`
 	// The list of Google Compute Engine
 	// [locations](/compute/docs/zones#available) in which the cluster's nodes
 	// should be located.
-	Locations []string `protobuf:"bytes,13,rep,name=locations" json:"locations,omitempty"`
+	Locations []string `protobuf:"bytes,13,rep,name=locations,proto3" json:"locations,omitempty"`
 	// Kubernetes alpha features are enabled on this cluster. This includes alpha
 	// API groups (e.g. v1alpha1) and features that may not be production ready in
 	// the kubernetes version of the master and nodes.
 	// The cluster has no SLA for uptime and master/node upgrades are disabled.
 	// Alpha enabled clusters are automatically deleted thirty days after
 	// creation.
-	EnableKubernetesAlpha bool `protobuf:"varint,14,opt,name=enable_kubernetes_alpha,json=enableKubernetesAlpha" json:"enable_kubernetes_alpha,omitempty"`
+	EnableKubernetesAlpha bool `protobuf:"varint,14,opt,name=enable_kubernetes_alpha,json=enableKubernetesAlpha,proto3" json:"enable_kubernetes_alpha,omitempty"`
 	// Configuration options for the NetworkPolicy feature.
-	NetworkPolicy *NetworkPolicy `protobuf:"bytes,19,opt,name=network_policy,json=networkPolicy" json:"network_policy,omitempty"`
+	NetworkPolicy *NetworkPolicy `protobuf:"bytes,19,opt,name=network_policy,json=networkPolicy,proto3" json:"network_policy,omitempty"`
 	// Configuration for cluster IP allocation.
-	IpAllocationPolicy *IPAllocationPolicy `protobuf:"bytes,20,opt,name=ip_allocation_policy,json=ipAllocationPolicy" json:"ip_allocation_policy,omitempty"`
+	IpAllocationPolicy *IPAllocationPolicy `protobuf:"bytes,20,opt,name=ip_allocation_policy,json=ipAllocationPolicy,proto3" json:"ip_allocation_policy,omitempty"`
 	// The configuration options for master authorized networks feature.
-	MasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,22,opt,name=master_authorized_networks_config,json=masterAuthorizedNetworksConfig" json:"master_authorized_networks_config,omitempty"`
+	MasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,22,opt,name=master_authorized_networks_config,json=masterAuthorizedNetworksConfig,proto3" json:"master_authorized_networks_config,omitempty"`
 	// Configure the maintenance policy for this cluster.
-	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,23,opt,name=maintenance_policy,json=maintenancePolicy" json:"maintenance_policy,omitempty"`
+	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,23,opt,name=maintenance_policy,json=maintenancePolicy,proto3" json:"maintenance_policy,omitempty"`
 	// Configuration for the PodSecurityPolicy feature.
-	PodSecurityPolicyConfig *PodSecurityPolicyConfig `protobuf:"bytes,25,opt,name=pod_security_policy_config,json=podSecurityPolicyConfig" json:"pod_security_policy_config,omitempty"`
+	PodSecurityPolicyConfig *PodSecurityPolicyConfig `protobuf:"bytes,25,opt,name=pod_security_policy_config,json=podSecurityPolicyConfig,proto3" json:"pod_security_policy_config,omitempty"`
 	// [Output only] Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// [Output only] The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use location instead.
-	Zone string `protobuf:"bytes,101,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,101,opt,name=zone,proto3" json:"zone,omitempty"`
 	// [Output only] The IP address of this cluster's master endpoint.
 	// The endpoint can be accessed from the internet at
 	// `https://username:password@endpoint/`.
 	//
 	// See the `masterAuth` property of this resource for username and
 	// password information.
-	Endpoint string `protobuf:"bytes,102,opt,name=endpoint" json:"endpoint,omitempty"`
+	Endpoint string `protobuf:"bytes,102,opt,name=endpoint,proto3" json:"endpoint,omitempty"`
 	// The initial Kubernetes version for this cluster.  Valid versions are those
 	// found in validMasterVersions returned by getServerConfig.  The version can
 	// be upgraded over time; such upgrades are reflected in
 	// currentMasterVersion and currentNodeVersion.
-	InitialClusterVersion string `protobuf:"bytes,103,opt,name=initial_cluster_version,json=initialClusterVersion" json:"initial_cluster_version,omitempty"`
+	InitialClusterVersion string `protobuf:"bytes,103,opt,name=initial_cluster_version,json=initialClusterVersion,proto3" json:"initial_cluster_version,omitempty"`
 	// [Output only] The current software version of the master endpoint.
-	CurrentMasterVersion string `protobuf:"bytes,104,opt,name=current_master_version,json=currentMasterVersion" json:"current_master_version,omitempty"`
+	CurrentMasterVersion string `protobuf:"bytes,104,opt,name=current_master_version,json=currentMasterVersion,proto3" json:"current_master_version,omitempty"`
 	// [Output only] The current version of the node software components.
 	// If they are currently at multiple versions because they're in the process
 	// of being upgraded, this reflects the minimum version of all nodes.
-	CurrentNodeVersion string `protobuf:"bytes,105,opt,name=current_node_version,json=currentNodeVersion" json:"current_node_version,omitempty"`
+	CurrentNodeVersion string `protobuf:"bytes,105,opt,name=current_node_version,json=currentNodeVersion,proto3" json:"current_node_version,omitempty"`
 	// [Output only] The time the cluster was created, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	CreateTime string `protobuf:"bytes,106,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime string `protobuf:"bytes,106,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// [Output only] The current status of this cluster.
-	Status Cluster_Status `protobuf:"varint,107,opt,name=status,enum=google.container.v1alpha1.Cluster_Status" json:"status,omitempty"`
+	Status Cluster_Status `protobuf:"varint,107,opt,name=status,proto3,enum=google.container.v1alpha1.Cluster_Status" json:"status,omitempty"`
 	// [Output only] Additional information about the current status of this
 	// cluster, if available.
-	StatusMessage string `protobuf:"bytes,108,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage string `protobuf:"bytes,108,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// [Output only] The size of the address space on each node for hosting
 	// containers. This is provisioned from within the `container_ipv4_cidr`
 	// range.
-	NodeIpv4CidrSize int32 `protobuf:"varint,109,opt,name=node_ipv4_cidr_size,json=nodeIpv4CidrSize" json:"node_ipv4_cidr_size,omitempty"`
+	NodeIpv4CidrSize int32 `protobuf:"varint,109,opt,name=node_ipv4_cidr_size,json=nodeIpv4CidrSize,proto3" json:"node_ipv4_cidr_size,omitempty"`
 	// [Output only] The IP address range of the Kubernetes services in
 	// this cluster, in
 	// [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
 	// notation (e.g. `1.2.3.4/29`). Service addresses are
 	// typically put in the last `/16` from the container CIDR.
-	ServicesIpv4Cidr string `protobuf:"bytes,110,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr" json:"services_ipv4_cidr,omitempty"`
+	ServicesIpv4Cidr string `protobuf:"bytes,110,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr,proto3" json:"services_ipv4_cidr,omitempty"`
 	// [Output only] The resource URLs of [instance
 	// groups](/compute/docs/instance-groups/) associated with this
 	// cluster.
-	InstanceGroupUrls []string `protobuf:"bytes,111,rep,name=instance_group_urls,json=instanceGroupUrls" json:"instance_group_urls,omitempty"`
+	InstanceGroupUrls []string `protobuf:"bytes,111,rep,name=instance_group_urls,json=instanceGroupUrls,proto3" json:"instance_group_urls,omitempty"`
 	// [Output only] The number of nodes currently in the cluster.
-	CurrentNodeCount int32 `protobuf:"varint,112,opt,name=current_node_count,json=currentNodeCount" json:"current_node_count,omitempty"`
+	CurrentNodeCount int32 `protobuf:"varint,112,opt,name=current_node_count,json=currentNodeCount,proto3" json:"current_node_count,omitempty"`
 	// [Output only] The time the cluster will be automatically
 	// deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	ExpireTime string `protobuf:"bytes,113,opt,name=expire_time,json=expireTime" json:"expire_time,omitempty"`
+	ExpireTime string `protobuf:"bytes,113,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// [Output only] The name of the Google Compute Engine
 	// [zone](/compute/docs/regions-zones/regions-zones#available) or
 	// [region](/compute/docs/regions-zones/regions-zones#available) in which
 	// the cluster resides.
-	Location string `protobuf:"bytes,114,opt,name=location" json:"location,omitempty"`
+	Location             string   `protobuf:"bytes,114,opt,name=location,proto3" json:"location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Cluster) Reset()         { *m = Cluster{} }
+func (m *Cluster) String() string { return proto.CompactTextString(m) }
+func (*Cluster) ProtoMessage()    {}
+func (*Cluster) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{13}
+}
+func (m *Cluster) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cluster.Unmarshal(m, b)
+}
+func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
+}
+func (dst *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(dst, src)
+}
+func (m *Cluster) XXX_Size() int {
+	return xxx_messageInfo_Cluster.Size(m)
+}
+func (m *Cluster) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cluster.DiscardUnknown(m)
 }
 
-func (m *Cluster) Reset()                    { *m = Cluster{} }
-func (m *Cluster) String() string            { return proto.CompactTextString(m) }
-func (*Cluster) ProtoMessage()               {}
-func (*Cluster) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_Cluster proto.InternalMessageInfo
 
 func (m *Cluster) GetName() string {
 	if m != nil {
@@ -1522,28 +1796,28 @@ type ClusterUpdate struct {
 	// The Kubernetes version to change the nodes to (typically an
 	// upgrade). Use `-` to upgrade to the latest version supported by
 	// the server.
-	DesiredNodeVersion string `protobuf:"bytes,4,opt,name=desired_node_version,json=desiredNodeVersion" json:"desired_node_version,omitempty"`
+	DesiredNodeVersion string `protobuf:"bytes,4,opt,name=desired_node_version,json=desiredNodeVersion,proto3" json:"desired_node_version,omitempty"`
 	// The monitoring service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * "monitoring.googleapis.com" - the Google Cloud Monitoring service
 	// * "none" - no metrics will be exported from the cluster
-	DesiredMonitoringService string `protobuf:"bytes,5,opt,name=desired_monitoring_service,json=desiredMonitoringService" json:"desired_monitoring_service,omitempty"`
+	DesiredMonitoringService string `protobuf:"bytes,5,opt,name=desired_monitoring_service,json=desiredMonitoringService,proto3" json:"desired_monitoring_service,omitempty"`
 	// Configurations for the various addons available to run in the cluster.
-	DesiredAddonsConfig *AddonsConfig `protobuf:"bytes,6,opt,name=desired_addons_config,json=desiredAddonsConfig" json:"desired_addons_config,omitempty"`
+	DesiredAddonsConfig *AddonsConfig `protobuf:"bytes,6,opt,name=desired_addons_config,json=desiredAddonsConfig,proto3" json:"desired_addons_config,omitempty"`
 	// The node pool to be upgraded. This field is mandatory if
 	// "desired_node_version", "desired_image_family" or
 	// "desired_node_pool_autoscaling" is specified and there is more than one
 	// node pool on the cluster.
-	DesiredNodePoolId string `protobuf:"bytes,7,opt,name=desired_node_pool_id,json=desiredNodePoolId" json:"desired_node_pool_id,omitempty"`
+	DesiredNodePoolId string `protobuf:"bytes,7,opt,name=desired_node_pool_id,json=desiredNodePoolId,proto3" json:"desired_node_pool_id,omitempty"`
 	// The desired image type for the node pool.
 	// NOTE: Set the "desired_node_pool" field as well.
-	DesiredImageType string `protobuf:"bytes,8,opt,name=desired_image_type,json=desiredImageType" json:"desired_image_type,omitempty"`
+	DesiredImageType string `protobuf:"bytes,8,opt,name=desired_image_type,json=desiredImageType,proto3" json:"desired_image_type,omitempty"`
 	// Autoscaler configuration for the node pool specified in
 	// desired_node_pool_id. If there is only one pool in the
 	// cluster and desired_node_pool_id is not provided then
 	// the change applies to that single node pool.
-	DesiredNodePoolAutoscaling *NodePoolAutoscaling `protobuf:"bytes,9,opt,name=desired_node_pool_autoscaling,json=desiredNodePoolAutoscaling" json:"desired_node_pool_autoscaling,omitempty"`
+	DesiredNodePoolAutoscaling *NodePoolAutoscaling `protobuf:"bytes,9,opt,name=desired_node_pool_autoscaling,json=desiredNodePoolAutoscaling,proto3" json:"desired_node_pool_autoscaling,omitempty"`
 	// The desired list of Google Compute Engine
 	// [locations](/compute/docs/zones#available) in which the cluster's nodes
 	// should be located. Changing the locations a cluster is in will result
@@ -1551,21 +1825,43 @@ type ClusterUpdate struct {
 	// whether locations are being added or removed.
 	//
 	// This list must always include the cluster's primary zone.
-	DesiredLocations []string `protobuf:"bytes,10,rep,name=desired_locations,json=desiredLocations" json:"desired_locations,omitempty"`
+	DesiredLocations []string `protobuf:"bytes,10,rep,name=desired_locations,json=desiredLocations,proto3" json:"desired_locations,omitempty"`
 	// The desired configuration options for master authorized networks feature.
-	DesiredMasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,12,opt,name=desired_master_authorized_networks_config,json=desiredMasterAuthorizedNetworksConfig" json:"desired_master_authorized_networks_config,omitempty"`
+	DesiredMasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,12,opt,name=desired_master_authorized_networks_config,json=desiredMasterAuthorizedNetworksConfig,proto3" json:"desired_master_authorized_networks_config,omitempty"`
 	// The desired configuration options for the PodSecurityPolicy feature.
-	DesiredPodSecurityPolicyConfig *PodSecurityPolicyConfig `protobuf:"bytes,14,opt,name=desired_pod_security_policy_config,json=desiredPodSecurityPolicyConfig" json:"desired_pod_security_policy_config,omitempty"`
+	DesiredPodSecurityPolicyConfig *PodSecurityPolicyConfig `protobuf:"bytes,14,opt,name=desired_pod_security_policy_config,json=desiredPodSecurityPolicyConfig,proto3" json:"desired_pod_security_policy_config,omitempty"`
 	// The Kubernetes version to change the master to. The only valid value is the
 	// latest supported version. Use "-" to have the server automatically select
 	// the latest version.
-	DesiredMasterVersion string `protobuf:"bytes,100,opt,name=desired_master_version,json=desiredMasterVersion" json:"desired_master_version,omitempty"`
+	DesiredMasterVersion string   `protobuf:"bytes,100,opt,name=desired_master_version,json=desiredMasterVersion,proto3" json:"desired_master_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClusterUpdate) Reset()         { *m = ClusterUpdate{} }
+func (m *ClusterUpdate) String() string { return proto.CompactTextString(m) }
+func (*ClusterUpdate) ProtoMessage()    {}
+func (*ClusterUpdate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{14}
+}
+func (m *ClusterUpdate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterUpdate.Unmarshal(m, b)
+}
+func (m *ClusterUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterUpdate.Marshal(b, m, deterministic)
+}
+func (dst *ClusterUpdate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterUpdate.Merge(dst, src)
+}
+func (m *ClusterUpdate) XXX_Size() int {
+	return xxx_messageInfo_ClusterUpdate.Size(m)
+}
+func (m *ClusterUpdate) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterUpdate.DiscardUnknown(m)
 }
 
-func (m *ClusterUpdate) Reset()                    { *m = ClusterUpdate{} }
-func (m *ClusterUpdate) String() string            { return proto.CompactTextString(m) }
-func (*ClusterUpdate) ProtoMessage()               {}
-func (*ClusterUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_ClusterUpdate proto.InternalMessageInfo
 
 func (m *ClusterUpdate) GetDesiredNodeVersion() string {
 	if m != nil {
@@ -1641,41 +1937,63 @@ func (m *ClusterUpdate) GetDesiredMasterVersion() string {
 // happening on the cluster. All fields are output only.
 type Operation struct {
 	// The server-assigned ID for the operation.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the operation
 	// is taking place.
 	// This field is deprecated, use location instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The operation type.
-	OperationType Operation_Type `protobuf:"varint,3,opt,name=operation_type,json=operationType,enum=google.container.v1alpha1.Operation_Type" json:"operation_type,omitempty"`
+	OperationType Operation_Type `protobuf:"varint,3,opt,name=operation_type,json=operationType,proto3,enum=google.container.v1alpha1.Operation_Type" json:"operation_type,omitempty"`
 	// The current status of the operation.
-	Status Operation_Status `protobuf:"varint,4,opt,name=status,enum=google.container.v1alpha1.Operation_Status" json:"status,omitempty"`
+	Status Operation_Status `protobuf:"varint,4,opt,name=status,proto3,enum=google.container.v1alpha1.Operation_Status" json:"status,omitempty"`
 	// Detailed operation progress, if available.
-	Detail string `protobuf:"bytes,8,opt,name=detail" json:"detail,omitempty"`
+	Detail string `protobuf:"bytes,8,opt,name=detail,proto3" json:"detail,omitempty"`
 	// If an error has occurred, a textual description of the error.
-	StatusMessage string `protobuf:"bytes,5,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage string `protobuf:"bytes,5,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,6,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,6,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// Server-defined URL for the target of the operation.
-	TargetLink string `protobuf:"bytes,7,opt,name=target_link,json=targetLink" json:"target_link,omitempty"`
+	TargetLink string `protobuf:"bytes,7,opt,name=target_link,json=targetLink,proto3" json:"target_link,omitempty"`
 	// [Output only] The name of the Google Compute Engine
 	// [zone](/compute/docs/regions-zones/regions-zones#available) or
 	// [region](/compute/docs/regions-zones/regions-zones#available) in which
 	// the cluster resides.
-	Location string `protobuf:"bytes,9,opt,name=location" json:"location,omitempty"`
+	Location string `protobuf:"bytes,9,opt,name=location,proto3" json:"location,omitempty"`
 	// [Output only] The time the operation started, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	StartTime string `protobuf:"bytes,10,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime string `protobuf:"bytes,10,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// [Output only] The time the operation completed, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	EndTime string `protobuf:"bytes,11,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              string   `protobuf:"bytes,11,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Operation) Reset()                    { *m = Operation{} }
-func (m *Operation) String() string            { return proto.CompactTextString(m) }
-func (*Operation) ProtoMessage()               {}
-func (*Operation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *Operation) Reset()         { *m = Operation{} }
+func (m *Operation) String() string { return proto.CompactTextString(m) }
+func (*Operation) ProtoMessage()    {}
+func (*Operation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{15}
+}
+func (m *Operation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Operation.Unmarshal(m, b)
+}
+func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
+}
+func (dst *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(dst, src)
+}
+func (m *Operation) XXX_Size() int {
+	return xxx_messageInfo_Operation.Size(m)
+}
+func (m *Operation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Operation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Operation proto.InternalMessageInfo
 
 func (m *Operation) GetName() string {
 	if m != nil {
@@ -1759,24 +2077,46 @@ type CreateClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// A [cluster
 	// resource](/container-engine/reference/rest/v1alpha1/projects.zones.clusters)
-	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	// The parent (project and location) where the cluster will be created.
 	// Specified in the format 'projects/*/locations/*'.
-	Parent string `protobuf:"bytes,5,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateClusterRequest) Reset()                    { *m = CreateClusterRequest{} }
-func (m *CreateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterRequest) ProtoMessage()               {}
-func (*CreateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
+func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterRequest) ProtoMessage()    {}
+func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{16}
+}
+func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
+}
+func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+}
+func (m *CreateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterRequest.Size(m)
+}
+func (m *CreateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateClusterRequest proto.InternalMessageInfo
 
 func (m *CreateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1811,24 +2151,46 @@ type GetClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to retrieve.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name (project, location, cluster) of the cluster to retrieve.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetClusterRequest) Reset()                    { *m = GetClusterRequest{} }
-func (m *GetClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetClusterRequest) ProtoMessage()               {}
-func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
+func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*GetClusterRequest) ProtoMessage()    {}
+func (*GetClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{17}
+}
+func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
+}
+func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+}
+func (m *GetClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_GetClusterRequest.Size(m)
+}
+func (m *GetClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetClusterRequest proto.InternalMessageInfo
 
 func (m *GetClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1863,26 +2225,48 @@ type UpdateClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// A description of the update.
-	Update *ClusterUpdate `protobuf:"bytes,4,opt,name=update" json:"update,omitempty"`
+	Update *ClusterUpdate `protobuf:"bytes,4,opt,name=update,proto3" json:"update,omitempty"`
 	// The name (project, location, cluster) of the cluster to update.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UpdateClusterRequest) Reset()                    { *m = UpdateClusterRequest{} }
-func (m *UpdateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateClusterRequest) ProtoMessage()               {}
-func (*UpdateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
+func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateClusterRequest) ProtoMessage()    {}
+func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{18}
+}
+func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
+}
+func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+}
+func (m *UpdateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateClusterRequest.Size(m)
+}
+func (m *UpdateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateClusterRequest proto.InternalMessageInfo
 
 func (m *UpdateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1924,33 +2308,55 @@ type UpdateNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to upgrade.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The Kubernetes version to change the nodes to (typically an
 	// upgrade). Use `-` to upgrade to the latest version supported by
 	// the server.
-	NodeVersion string `protobuf:"bytes,5,opt,name=node_version,json=nodeVersion" json:"node_version,omitempty"`
+	NodeVersion string `protobuf:"bytes,5,opt,name=node_version,json=nodeVersion,proto3" json:"node_version,omitempty"`
 	// The desired image type for the node pool.
-	ImageType string `protobuf:"bytes,6,opt,name=image_type,json=imageType" json:"image_type,omitempty"`
+	ImageType string `protobuf:"bytes,6,opt,name=image_type,json=imageType,proto3" json:"image_type,omitempty"`
 	// The name (project, location, cluster, node pool) of the node pool to update.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,8,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,8,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateNodePoolRequest) Reset()         { *m = UpdateNodePoolRequest{} }
+func (m *UpdateNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateNodePoolRequest) ProtoMessage()    {}
+func (*UpdateNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{19}
+}
+func (m *UpdateNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateNodePoolRequest.Unmarshal(m, b)
+}
+func (m *UpdateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNodePoolRequest.Merge(dst, src)
+}
+func (m *UpdateNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateNodePoolRequest.Size(m)
+}
+func (m *UpdateNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateNodePoolRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateNodePoolRequest) Reset()                    { *m = UpdateNodePoolRequest{} }
-func (m *UpdateNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateNodePoolRequest) ProtoMessage()               {}
-func (*UpdateNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_UpdateNodePoolRequest proto.InternalMessageInfo
 
 func (m *UpdateNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2006,30 +2412,52 @@ type SetNodePoolAutoscalingRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to upgrade.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// Autoscaling configuration for the node pool.
-	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,5,opt,name=autoscaling" json:"autoscaling,omitempty"`
+	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,5,opt,name=autoscaling,proto3" json:"autoscaling,omitempty"`
 	// The name (project, location, cluster, node pool) of the node pool to set
 	// autoscaler settings. Specified in the format
 	// 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SetNodePoolAutoscalingRequest) Reset()         { *m = SetNodePoolAutoscalingRequest{} }
+func (m *SetNodePoolAutoscalingRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNodePoolAutoscalingRequest) ProtoMessage()    {}
+func (*SetNodePoolAutoscalingRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{20}
+}
+func (m *SetNodePoolAutoscalingRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Unmarshal(m, b)
+}
+func (m *SetNodePoolAutoscalingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNodePoolAutoscalingRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolAutoscalingRequest.Merge(dst, src)
+}
+func (m *SetNodePoolAutoscalingRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNodePoolAutoscalingRequest.Size(m)
+}
+func (m *SetNodePoolAutoscalingRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNodePoolAutoscalingRequest.DiscardUnknown(m)
 }
 
-func (m *SetNodePoolAutoscalingRequest) Reset()                    { *m = SetNodePoolAutoscalingRequest{} }
-func (m *SetNodePoolAutoscalingRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNodePoolAutoscalingRequest) ProtoMessage()               {}
-func (*SetNodePoolAutoscalingRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+var xxx_messageInfo_SetNodePoolAutoscalingRequest proto.InternalMessageInfo
 
 func (m *SetNodePoolAutoscalingRequest) GetProjectId() string {
 	if m != nil {
@@ -2078,29 +2506,51 @@ type SetLoggingServiceRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The logging service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * "logging.googleapis.com" - the Google Cloud Logging service
 	// * "none" - no metrics will be exported from the cluster
-	LoggingService string `protobuf:"bytes,4,opt,name=logging_service,json=loggingService" json:"logging_service,omitempty"`
+	LoggingService string `protobuf:"bytes,4,opt,name=logging_service,json=loggingService,proto3" json:"logging_service,omitempty"`
 	// The name (project, location, cluster) of the cluster to set logging.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLoggingServiceRequest) Reset()                    { *m = SetLoggingServiceRequest{} }
-func (m *SetLoggingServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLoggingServiceRequest) ProtoMessage()               {}
-func (*SetLoggingServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+func (m *SetLoggingServiceRequest) Reset()         { *m = SetLoggingServiceRequest{} }
+func (m *SetLoggingServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLoggingServiceRequest) ProtoMessage()    {}
+func (*SetLoggingServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{21}
+}
+func (m *SetLoggingServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLoggingServiceRequest.Unmarshal(m, b)
+}
+func (m *SetLoggingServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLoggingServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLoggingServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLoggingServiceRequest.Merge(dst, src)
+}
+func (m *SetLoggingServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLoggingServiceRequest.Size(m)
+}
+func (m *SetLoggingServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLoggingServiceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLoggingServiceRequest proto.InternalMessageInfo
 
 func (m *SetLoggingServiceRequest) GetProjectId() string {
 	if m != nil {
@@ -2142,30 +2592,52 @@ type SetMonitoringServiceRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The monitoring service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * "monitoring.googleapis.com" - the Google Cloud Monitoring service
 	// * "none" - no metrics will be exported from the cluster
-	MonitoringService string `protobuf:"bytes,4,opt,name=monitoring_service,json=monitoringService" json:"monitoring_service,omitempty"`
+	MonitoringService string `protobuf:"bytes,4,opt,name=monitoring_service,json=monitoringService,proto3" json:"monitoring_service,omitempty"`
 	// The name (project, location, cluster) of the cluster to set monitoring.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SetMonitoringServiceRequest) Reset()         { *m = SetMonitoringServiceRequest{} }
+func (m *SetMonitoringServiceRequest) String() string { return proto.CompactTextString(m) }
+func (*SetMonitoringServiceRequest) ProtoMessage()    {}
+func (*SetMonitoringServiceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{22}
+}
+func (m *SetMonitoringServiceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetMonitoringServiceRequest.Unmarshal(m, b)
+}
+func (m *SetMonitoringServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetMonitoringServiceRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetMonitoringServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMonitoringServiceRequest.Merge(dst, src)
+}
+func (m *SetMonitoringServiceRequest) XXX_Size() int {
+	return xxx_messageInfo_SetMonitoringServiceRequest.Size(m)
+}
+func (m *SetMonitoringServiceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetMonitoringServiceRequest.DiscardUnknown(m)
 }
 
-func (m *SetMonitoringServiceRequest) Reset()                    { *m = SetMonitoringServiceRequest{} }
-func (m *SetMonitoringServiceRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetMonitoringServiceRequest) ProtoMessage()               {}
-func (*SetMonitoringServiceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+var xxx_messageInfo_SetMonitoringServiceRequest proto.InternalMessageInfo
 
 func (m *SetMonitoringServiceRequest) GetProjectId() string {
 	if m != nil {
@@ -2207,27 +2679,49 @@ type SetAddonsConfigRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The desired configurations for the various addons available to run in the
 	// cluster.
-	AddonsConfig *AddonsConfig `protobuf:"bytes,4,opt,name=addons_config,json=addonsConfig" json:"addons_config,omitempty"`
+	AddonsConfig *AddonsConfig `protobuf:"bytes,4,opt,name=addons_config,json=addonsConfig,proto3" json:"addons_config,omitempty"`
 	// The name (project, location, cluster) of the cluster to set addons.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetAddonsConfigRequest) Reset()                    { *m = SetAddonsConfigRequest{} }
-func (m *SetAddonsConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetAddonsConfigRequest) ProtoMessage()               {}
-func (*SetAddonsConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+func (m *SetAddonsConfigRequest) Reset()         { *m = SetAddonsConfigRequest{} }
+func (m *SetAddonsConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*SetAddonsConfigRequest) ProtoMessage()    {}
+func (*SetAddonsConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{23}
+}
+func (m *SetAddonsConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetAddonsConfigRequest.Unmarshal(m, b)
+}
+func (m *SetAddonsConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetAddonsConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetAddonsConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetAddonsConfigRequest.Merge(dst, src)
+}
+func (m *SetAddonsConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_SetAddonsConfigRequest.Size(m)
+}
+func (m *SetAddonsConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetAddonsConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetAddonsConfigRequest proto.InternalMessageInfo
 
 func (m *SetAddonsConfigRequest) GetProjectId() string {
 	if m != nil {
@@ -2269,15 +2763,15 @@ type SetLocationsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The desired list of Google Compute Engine
 	// [locations](/compute/docs/zones#available) in which the cluster's nodes
 	// should be located. Changing the locations a cluster is in will result
@@ -2285,16 +2779,38 @@ type SetLocationsRequest struct {
 	// whether locations are being added or removed.
 	//
 	// This list must always include the cluster's primary zone.
-	Locations []string `protobuf:"bytes,4,rep,name=locations" json:"locations,omitempty"`
+	Locations []string `protobuf:"bytes,4,rep,name=locations,proto3" json:"locations,omitempty"`
 	// The name (project, location, cluster) of the cluster to set locations.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLocationsRequest) Reset()                    { *m = SetLocationsRequest{} }
-func (m *SetLocationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLocationsRequest) ProtoMessage()               {}
-func (*SetLocationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
+func (m *SetLocationsRequest) Reset()         { *m = SetLocationsRequest{} }
+func (m *SetLocationsRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLocationsRequest) ProtoMessage()    {}
+func (*SetLocationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{24}
+}
+func (m *SetLocationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLocationsRequest.Unmarshal(m, b)
+}
+func (m *SetLocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLocationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLocationsRequest.Merge(dst, src)
+}
+func (m *SetLocationsRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLocationsRequest.Size(m)
+}
+func (m *SetLocationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLocationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLocationsRequest proto.InternalMessageInfo
 
 func (m *SetLocationsRequest) GetProjectId() string {
 	if m != nil {
@@ -2335,28 +2851,50 @@ func (m *SetLocationsRequest) GetName() string {
 type UpdateMasterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The Kubernetes version to change the master to. The only valid value is the
 	// latest supported version. Use "-" to have the server automatically select
 	// the latest version.
-	MasterVersion string `protobuf:"bytes,4,opt,name=master_version,json=masterVersion" json:"master_version,omitempty"`
+	MasterVersion string `protobuf:"bytes,4,opt,name=master_version,json=masterVersion,proto3" json:"master_version,omitempty"`
 	// The name (project, location, cluster) of the cluster to update.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UpdateMasterRequest) Reset()                    { *m = UpdateMasterRequest{} }
-func (m *UpdateMasterRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateMasterRequest) ProtoMessage()               {}
-func (*UpdateMasterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
+func (m *UpdateMasterRequest) Reset()         { *m = UpdateMasterRequest{} }
+func (m *UpdateMasterRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateMasterRequest) ProtoMessage()    {}
+func (*UpdateMasterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{25}
+}
+func (m *UpdateMasterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateMasterRequest.Unmarshal(m, b)
+}
+func (m *UpdateMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateMasterRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateMasterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateMasterRequest.Merge(dst, src)
+}
+func (m *UpdateMasterRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateMasterRequest.Size(m)
+}
+func (m *UpdateMasterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateMasterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateMasterRequest proto.InternalMessageInfo
 
 func (m *UpdateMasterRequest) GetProjectId() string {
 	if m != nil {
@@ -2398,28 +2936,50 @@ type SetMasterAuthRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The exact form of action to be taken on the master auth.
-	Action SetMasterAuthRequest_Action `protobuf:"varint,4,opt,name=action,enum=google.container.v1alpha1.SetMasterAuthRequest_Action" json:"action,omitempty"`
+	Action SetMasterAuthRequest_Action `protobuf:"varint,4,opt,name=action,proto3,enum=google.container.v1alpha1.SetMasterAuthRequest_Action" json:"action,omitempty"`
 	// A description of the update.
-	Update *MasterAuth `protobuf:"bytes,5,opt,name=update" json:"update,omitempty"`
+	Update *MasterAuth `protobuf:"bytes,5,opt,name=update,proto3" json:"update,omitempty"`
 	// The name (project, location, cluster) of the cluster to set auth.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SetMasterAuthRequest) Reset()         { *m = SetMasterAuthRequest{} }
+func (m *SetMasterAuthRequest) String() string { return proto.CompactTextString(m) }
+func (*SetMasterAuthRequest) ProtoMessage()    {}
+func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{26}
+}
+func (m *SetMasterAuthRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetMasterAuthRequest.Unmarshal(m, b)
+}
+func (m *SetMasterAuthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetMasterAuthRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMasterAuthRequest.Merge(dst, src)
+}
+func (m *SetMasterAuthRequest) XXX_Size() int {
+	return xxx_messageInfo_SetMasterAuthRequest.Size(m)
+}
+func (m *SetMasterAuthRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetMasterAuthRequest.DiscardUnknown(m)
 }
 
-func (m *SetMasterAuthRequest) Reset()                    { *m = SetMasterAuthRequest{} }
-func (m *SetMasterAuthRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetMasterAuthRequest) ProtoMessage()               {}
-func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
+var xxx_messageInfo_SetMasterAuthRequest proto.InternalMessageInfo
 
 func (m *SetMasterAuthRequest) GetProjectId() string {
 	if m != nil {
@@ -2468,24 +3028,46 @@ type DeleteClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to delete.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name (project, location, cluster) of the cluster to delete.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteClusterRequest) Reset()                    { *m = DeleteClusterRequest{} }
-func (m *DeleteClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteClusterRequest) ProtoMessage()               {}
-func (*DeleteClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
+func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
+func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteClusterRequest) ProtoMessage()    {}
+func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{27}
+}
+func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
+}
+func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+}
+func (m *DeleteClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteClusterRequest.Size(m)
+}
+func (m *DeleteClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteClusterRequest proto.InternalMessageInfo
 
 func (m *DeleteClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -2520,22 +3102,44 @@ type ListClustersRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides, or "-" for all zones.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The parent (project and location) where the clusters will be listed.
 	// Specified in the format 'projects/*/locations/*'.
 	// Location "-" matches all zones and all regions.
-	Parent string `protobuf:"bytes,4,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListClustersRequest) Reset()                    { *m = ListClustersRequest{} }
-func (m *ListClustersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersRequest) ProtoMessage()               {}
-func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
+func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
+func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClustersRequest) ProtoMessage()    {}
+func (*ListClustersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{28}
+}
+func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
+}
+func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+}
+func (m *ListClustersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClustersRequest.Size(m)
+}
+func (m *ListClustersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListClustersRequest proto.InternalMessageInfo
 
 func (m *ListClustersRequest) GetProjectId() string {
 	if m != nil {
@@ -2562,16 +3166,38 @@ func (m *ListClustersRequest) GetParent() string {
 type ListClustersResponse struct {
 	// A list of clusters in the project in the specified zone, or
 	// across all ones.
-	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters" json:"clusters,omitempty"`
+	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	// If any zones are listed here, the list of clusters returned
 	// may be missing those zones.
-	MissingZones []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones" json:"missing_zones,omitempty"`
+	MissingZones         []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones,proto3" json:"missing_zones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
+func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClustersResponse) ProtoMessage()    {}
+func (*ListClustersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{29}
+}
+func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
+}
+func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+}
+func (m *ListClustersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClustersResponse.Size(m)
+}
+func (m *ListClustersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersResponse.DiscardUnknown(m)
 }
 
-func (m *ListClustersResponse) Reset()                    { *m = ListClustersResponse{} }
-func (m *ListClustersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersResponse) ProtoMessage()               {}
-func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
+var xxx_messageInfo_ListClustersResponse proto.InternalMessageInfo
 
 func (m *ListClustersResponse) GetClusters() []*Cluster {
 	if m != nil {
@@ -2592,24 +3218,46 @@ type GetOperationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The server-assigned `name` of the operation.
 	// This field is deprecated, use name instead.
-	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// The name (project, location, operation id) of the operation to get.
 	// Specified in the format 'projects/*/locations/*/operations/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetOperationRequest) Reset()                    { *m = GetOperationRequest{} }
-func (m *GetOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetOperationRequest) ProtoMessage()               {}
-func (*GetOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
+func (m *GetOperationRequest) Reset()         { *m = GetOperationRequest{} }
+func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetOperationRequest) ProtoMessage()    {}
+func (*GetOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{30}
+}
+func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b)
+}
+func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperationRequest.Merge(dst, src)
+}
+func (m *GetOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetOperationRequest.Size(m)
+}
+func (m *GetOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetOperationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetOperationRequest proto.InternalMessageInfo
 
 func (m *GetOperationRequest) GetProjectId() string {
 	if m != nil {
@@ -2644,21 +3292,43 @@ type ListOperationsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine [zone](/compute/docs/zones#available)
 	// to return operations for, or `-` for all zones.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The parent (project and location) where the operations will be listed.
 	// Specified in the format 'projects/*/locations/*'.
 	// Location "-" matches all zones and all regions.
-	Parent string `protobuf:"bytes,4,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListOperationsRequest) Reset()                    { *m = ListOperationsRequest{} }
-func (m *ListOperationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListOperationsRequest) ProtoMessage()               {}
-func (*ListOperationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
+func (m *ListOperationsRequest) Reset()         { *m = ListOperationsRequest{} }
+func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListOperationsRequest) ProtoMessage()    {}
+func (*ListOperationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{31}
+}
+func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b)
+}
+func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsRequest.Merge(dst, src)
+}
+func (m *ListOperationsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListOperationsRequest.Size(m)
+}
+func (m *ListOperationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOperationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListOperationsRequest proto.InternalMessageInfo
 
 func (m *ListOperationsRequest) GetProjectId() string {
 	if m != nil {
@@ -2686,23 +3356,45 @@ type CancelOperationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the operation resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The server-assigned `name` of the operation.
 	// This field is deprecated, use name instead.
-	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// The name (project, location, operation id) of the operation to cancel.
 	// Specified in the format 'projects/*/locations/*/operations/*'.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CancelOperationRequest) Reset()                    { *m = CancelOperationRequest{} }
-func (m *CancelOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelOperationRequest) ProtoMessage()               {}
-func (*CancelOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
+func (m *CancelOperationRequest) Reset()         { *m = CancelOperationRequest{} }
+func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelOperationRequest) ProtoMessage()    {}
+func (*CancelOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{32}
+}
+func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b)
+}
+func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelOperationRequest.Merge(dst, src)
+}
+func (m *CancelOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelOperationRequest.Size(m)
+}
+func (m *CancelOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelOperationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CancelOperationRequest proto.InternalMessageInfo
 
 func (m *CancelOperationRequest) GetProjectId() string {
 	if m != nil {
@@ -2735,16 +3427,38 @@ func (m *CancelOperationRequest) GetName() string {
 // ListOperationsResponse is the result of ListOperationsRequest.
 type ListOperationsResponse struct {
 	// A list of operations in the project in the specified zone.
-	Operations []*Operation `protobuf:"bytes,1,rep,name=operations" json:"operations,omitempty"`
+	Operations []*Operation `protobuf:"bytes,1,rep,name=operations,proto3" json:"operations,omitempty"`
 	// If any zones are listed here, the list of operations returned
 	// may be missing the operations from those zones.
-	MissingZones []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones" json:"missing_zones,omitempty"`
+	MissingZones         []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones,proto3" json:"missing_zones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListOperationsResponse) Reset()                    { *m = ListOperationsResponse{} }
-func (m *ListOperationsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListOperationsResponse) ProtoMessage()               {}
-func (*ListOperationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} }
+func (m *ListOperationsResponse) Reset()         { *m = ListOperationsResponse{} }
+func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListOperationsResponse) ProtoMessage()    {}
+func (*ListOperationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{33}
+}
+func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b)
+}
+func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsResponse.Merge(dst, src)
+}
+func (m *ListOperationsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListOperationsResponse.Size(m)
+}
+func (m *ListOperationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOperationsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListOperationsResponse proto.InternalMessageInfo
 
 func (m *ListOperationsResponse) GetOperations() []*Operation {
 	if m != nil {
@@ -2765,20 +3479,42 @@ type GetServerConfigRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine [zone](/compute/docs/zones#available)
 	// to return operations for.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name (project and location) of the server config to get
 	// Specified in the format 'projects/*/locations/*'.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServerConfigRequest) Reset()         { *m = GetServerConfigRequest{} }
+func (m *GetServerConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServerConfigRequest) ProtoMessage()    {}
+func (*GetServerConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{34}
+}
+func (m *GetServerConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServerConfigRequest.Unmarshal(m, b)
+}
+func (m *GetServerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServerConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServerConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServerConfigRequest.Merge(dst, src)
+}
+func (m *GetServerConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServerConfigRequest.Size(m)
+}
+func (m *GetServerConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServerConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetServerConfigRequest) Reset()                    { *m = GetServerConfigRequest{} }
-func (m *GetServerConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServerConfigRequest) ProtoMessage()               {}
-func (*GetServerConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} }
+var xxx_messageInfo_GetServerConfigRequest proto.InternalMessageInfo
 
 func (m *GetServerConfigRequest) GetProjectId() string {
 	if m != nil {
@@ -2804,21 +3540,43 @@ func (m *GetServerConfigRequest) GetName() string {
 // Container Engine service configuration.
 type ServerConfig struct {
 	// Version of Kubernetes the service deploys by default.
-	DefaultClusterVersion string `protobuf:"bytes,1,opt,name=default_cluster_version,json=defaultClusterVersion" json:"default_cluster_version,omitempty"`
+	DefaultClusterVersion string `protobuf:"bytes,1,opt,name=default_cluster_version,json=defaultClusterVersion,proto3" json:"default_cluster_version,omitempty"`
 	// List of valid node upgrade target versions.
-	ValidNodeVersions []string `protobuf:"bytes,3,rep,name=valid_node_versions,json=validNodeVersions" json:"valid_node_versions,omitempty"`
+	ValidNodeVersions []string `protobuf:"bytes,3,rep,name=valid_node_versions,json=validNodeVersions,proto3" json:"valid_node_versions,omitempty"`
 	// Default image type.
-	DefaultImageType string `protobuf:"bytes,4,opt,name=default_image_type,json=defaultImageType" json:"default_image_type,omitempty"`
+	DefaultImageType string `protobuf:"bytes,4,opt,name=default_image_type,json=defaultImageType,proto3" json:"default_image_type,omitempty"`
 	// List of valid image types.
-	ValidImageTypes []string `protobuf:"bytes,5,rep,name=valid_image_types,json=validImageTypes" json:"valid_image_types,omitempty"`
+	ValidImageTypes []string `protobuf:"bytes,5,rep,name=valid_image_types,json=validImageTypes,proto3" json:"valid_image_types,omitempty"`
 	// List of valid master versions.
-	ValidMasterVersions []string `protobuf:"bytes,6,rep,name=valid_master_versions,json=validMasterVersions" json:"valid_master_versions,omitempty"`
+	ValidMasterVersions  []string `protobuf:"bytes,6,rep,name=valid_master_versions,json=validMasterVersions,proto3" json:"valid_master_versions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ServerConfig) Reset()                    { *m = ServerConfig{} }
-func (m *ServerConfig) String() string            { return proto.CompactTextString(m) }
-func (*ServerConfig) ProtoMessage()               {}
-func (*ServerConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} }
+func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
+func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
+func (*ServerConfig) ProtoMessage()    {}
+func (*ServerConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{35}
+}
+func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
+}
+func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
+}
+func (dst *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(dst, src)
+}
+func (m *ServerConfig) XXX_Size() int {
+	return xxx_messageInfo_ServerConfig.Size(m)
+}
+func (m *ServerConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerConfig proto.InternalMessageInfo
 
 func (m *ServerConfig) GetDefaultClusterVersion() string {
 	if m != nil {
@@ -2860,26 +3618,48 @@ type CreateNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use parent instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The node pool to create.
-	NodePool *NodePool `protobuf:"bytes,4,opt,name=node_pool,json=nodePool" json:"node_pool,omitempty"`
+	NodePool *NodePool `protobuf:"bytes,4,opt,name=node_pool,json=nodePool,proto3" json:"node_pool,omitempty"`
 	// The parent (project, location, cluster id) where the node pool will be created.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Parent string `protobuf:"bytes,6,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,6,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateNodePoolRequest) Reset()         { *m = CreateNodePoolRequest{} }
+func (m *CreateNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateNodePoolRequest) ProtoMessage()    {}
+func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{36}
+}
+func (m *CreateNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateNodePoolRequest.Unmarshal(m, b)
+}
+func (m *CreateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNodePoolRequest.Merge(dst, src)
+}
+func (m *CreateNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateNodePoolRequest.Size(m)
+}
+func (m *CreateNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateNodePoolRequest.DiscardUnknown(m)
 }
 
-func (m *CreateNodePoolRequest) Reset()                    { *m = CreateNodePoolRequest{} }
-func (m *CreateNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateNodePoolRequest) ProtoMessage()               {}
-func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} }
+var xxx_messageInfo_CreateNodePoolRequest proto.InternalMessageInfo
 
 func (m *CreateNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2921,27 +3701,49 @@ type DeleteNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to delete.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node pool to delete.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteNodePoolRequest) Reset()         { *m = DeleteNodePoolRequest{} }
+func (m *DeleteNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteNodePoolRequest) ProtoMessage()    {}
+func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{37}
+}
+func (m *DeleteNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteNodePoolRequest.Unmarshal(m, b)
+}
+func (m *DeleteNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNodePoolRequest.Merge(dst, src)
+}
+func (m *DeleteNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteNodePoolRequest.Size(m)
+}
+func (m *DeleteNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteNodePoolRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteNodePoolRequest) Reset()                    { *m = DeleteNodePoolRequest{} }
-func (m *DeleteNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteNodePoolRequest) ProtoMessage()               {}
-func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} }
+var xxx_messageInfo_DeleteNodePoolRequest proto.InternalMessageInfo
 
 func (m *DeleteNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2983,24 +3785,46 @@ type ListNodePoolsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use parent instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The parent (project, location, cluster id) where the node pools will be listed.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Parent string `protobuf:"bytes,5,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListNodePoolsRequest) Reset()                    { *m = ListNodePoolsRequest{} }
-func (m *ListNodePoolsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListNodePoolsRequest) ProtoMessage()               {}
-func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} }
+func (m *ListNodePoolsRequest) Reset()         { *m = ListNodePoolsRequest{} }
+func (m *ListNodePoolsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListNodePoolsRequest) ProtoMessage()    {}
+func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{38}
+}
+func (m *ListNodePoolsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNodePoolsRequest.Unmarshal(m, b)
+}
+func (m *ListNodePoolsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNodePoolsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsRequest.Merge(dst, src)
+}
+func (m *ListNodePoolsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListNodePoolsRequest.Size(m)
+}
+func (m *ListNodePoolsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNodePoolsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNodePoolsRequest proto.InternalMessageInfo
 
 func (m *ListNodePoolsRequest) GetProjectId() string {
 	if m != nil {
@@ -3035,27 +3859,49 @@ type GetNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node pool to get.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetNodePoolRequest) Reset()         { *m = GetNodePoolRequest{} }
+func (m *GetNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*GetNodePoolRequest) ProtoMessage()    {}
+func (*GetNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{39}
+}
+func (m *GetNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetNodePoolRequest.Unmarshal(m, b)
+}
+func (m *GetNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNodePoolRequest.Merge(dst, src)
+}
+func (m *GetNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_GetNodePoolRequest.Size(m)
+}
+func (m *GetNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetNodePoolRequest.DiscardUnknown(m)
 }
 
-func (m *GetNodePoolRequest) Reset()                    { *m = GetNodePoolRequest{} }
-func (m *GetNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetNodePoolRequest) ProtoMessage()               {}
-func (*GetNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} }
+var xxx_messageInfo_GetNodePoolRequest proto.InternalMessageInfo
 
 func (m *GetNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -3100,38 +3946,60 @@ func (m *GetNodePoolRequest) GetName() string {
 // the workload.
 type NodePool struct {
 	// The name of the node pool.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The node configuration of the pool.
-	Config *NodeConfig `protobuf:"bytes,2,opt,name=config" json:"config,omitempty"`
+	Config *NodeConfig `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 	// The initial node count for the pool. You must ensure that your
 	// Compute Engine <a href="/compute/docs/resource-quotas">resource quota</a>
 	// is sufficient for this number of instances. You must also have available
 	// firewall and routes quota.
-	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount" json:"initial_node_count,omitempty"`
+	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount,proto3" json:"initial_node_count,omitempty"`
 	// Autoscaler configuration for this NodePool. Autoscaler is enabled
 	// only if a valid configuration is present.
-	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,4,opt,name=autoscaling" json:"autoscaling,omitempty"`
+	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,4,opt,name=autoscaling,proto3" json:"autoscaling,omitempty"`
 	// NodeManagement configuration for this NodePool.
-	Management *NodeManagement `protobuf:"bytes,5,opt,name=management" json:"management,omitempty"`
+	Management *NodeManagement `protobuf:"bytes,5,opt,name=management,proto3" json:"management,omitempty"`
 	// [Output only] Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// [Output only] The version of the Kubernetes of this node.
-	Version string `protobuf:"bytes,101,opt,name=version" json:"version,omitempty"`
+	Version string `protobuf:"bytes,101,opt,name=version,proto3" json:"version,omitempty"`
 	// [Output only] The resource URLs of [instance
 	// groups](/compute/docs/instance-groups/) associated with this
 	// node pool.
-	InstanceGroupUrls []string `protobuf:"bytes,102,rep,name=instance_group_urls,json=instanceGroupUrls" json:"instance_group_urls,omitempty"`
+	InstanceGroupUrls []string `protobuf:"bytes,102,rep,name=instance_group_urls,json=instanceGroupUrls,proto3" json:"instance_group_urls,omitempty"`
 	// [Output only] The status of the nodes in this pool instance.
-	Status NodePool_Status `protobuf:"varint,103,opt,name=status,enum=google.container.v1alpha1.NodePool_Status" json:"status,omitempty"`
+	Status NodePool_Status `protobuf:"varint,103,opt,name=status,proto3,enum=google.container.v1alpha1.NodePool_Status" json:"status,omitempty"`
 	// [Output only] Additional information about the current status of this
 	// node pool instance, if available.
-	StatusMessage string `protobuf:"bytes,104,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage        string   `protobuf:"bytes,104,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NodePool) Reset()                    { *m = NodePool{} }
-func (m *NodePool) String() string            { return proto.CompactTextString(m) }
-func (*NodePool) ProtoMessage()               {}
-func (*NodePool) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} }
+func (m *NodePool) Reset()         { *m = NodePool{} }
+func (m *NodePool) String() string { return proto.CompactTextString(m) }
+func (*NodePool) ProtoMessage()    {}
+func (*NodePool) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{40}
+}
+func (m *NodePool) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodePool.Unmarshal(m, b)
+}
+func (m *NodePool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodePool.Marshal(b, m, deterministic)
+}
+func (dst *NodePool) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePool.Merge(dst, src)
+}
+func (m *NodePool) XXX_Size() int {
+	return xxx_messageInfo_NodePool.Size(m)
+}
+func (m *NodePool) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodePool.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodePool proto.InternalMessageInfo
 
 func (m *NodePool) GetName() string {
 	if m != nil {
@@ -3207,17 +4075,39 @@ func (m *NodePool) GetStatusMessage() string {
 // node pool.
 type NodeManagement struct {
 	// Whether the nodes will be automatically upgraded.
-	AutoUpgrade bool `protobuf:"varint,1,opt,name=auto_upgrade,json=autoUpgrade" json:"auto_upgrade,omitempty"`
+	AutoUpgrade bool `protobuf:"varint,1,opt,name=auto_upgrade,json=autoUpgrade,proto3" json:"auto_upgrade,omitempty"`
 	// Whether the nodes will be automatically repaired.
-	AutoRepair bool `protobuf:"varint,2,opt,name=auto_repair,json=autoRepair" json:"auto_repair,omitempty"`
+	AutoRepair bool `protobuf:"varint,2,opt,name=auto_repair,json=autoRepair,proto3" json:"auto_repair,omitempty"`
 	// Specifies the Auto Upgrade knobs for the node pool.
-	UpgradeOptions *AutoUpgradeOptions `protobuf:"bytes,10,opt,name=upgrade_options,json=upgradeOptions" json:"upgrade_options,omitempty"`
+	UpgradeOptions       *AutoUpgradeOptions `protobuf:"bytes,10,opt,name=upgrade_options,json=upgradeOptions,proto3" json:"upgrade_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *NodeManagement) Reset()         { *m = NodeManagement{} }
+func (m *NodeManagement) String() string { return proto.CompactTextString(m) }
+func (*NodeManagement) ProtoMessage()    {}
+func (*NodeManagement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{41}
+}
+func (m *NodeManagement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeManagement.Unmarshal(m, b)
+}
+func (m *NodeManagement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeManagement.Marshal(b, m, deterministic)
+}
+func (dst *NodeManagement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeManagement.Merge(dst, src)
+}
+func (m *NodeManagement) XXX_Size() int {
+	return xxx_messageInfo_NodeManagement.Size(m)
+}
+func (m *NodeManagement) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeManagement.DiscardUnknown(m)
 }
 
-func (m *NodeManagement) Reset()                    { *m = NodeManagement{} }
-func (m *NodeManagement) String() string            { return proto.CompactTextString(m) }
-func (*NodeManagement) ProtoMessage()               {}
-func (*NodeManagement) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} }
+var xxx_messageInfo_NodeManagement proto.InternalMessageInfo
 
 func (m *NodeManagement) GetAutoUpgrade() bool {
 	if m != nil {
@@ -3246,16 +4136,38 @@ type AutoUpgradeOptions struct {
 	// [Output only] This field is set when upgrades are about to commence
 	// with the approximate start time for the upgrades, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	AutoUpgradeStartTime string `protobuf:"bytes,1,opt,name=auto_upgrade_start_time,json=autoUpgradeStartTime" json:"auto_upgrade_start_time,omitempty"`
+	AutoUpgradeStartTime string `protobuf:"bytes,1,opt,name=auto_upgrade_start_time,json=autoUpgradeStartTime,proto3" json:"auto_upgrade_start_time,omitempty"`
 	// [Output only] This field is set when upgrades are about to commence
 	// with the description of the upgrade.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AutoUpgradeOptions) Reset()                    { *m = AutoUpgradeOptions{} }
-func (m *AutoUpgradeOptions) String() string            { return proto.CompactTextString(m) }
-func (*AutoUpgradeOptions) ProtoMessage()               {}
-func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{42} }
+func (m *AutoUpgradeOptions) Reset()         { *m = AutoUpgradeOptions{} }
+func (m *AutoUpgradeOptions) String() string { return proto.CompactTextString(m) }
+func (*AutoUpgradeOptions) ProtoMessage()    {}
+func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{42}
+}
+func (m *AutoUpgradeOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AutoUpgradeOptions.Unmarshal(m, b)
+}
+func (m *AutoUpgradeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AutoUpgradeOptions.Marshal(b, m, deterministic)
+}
+func (dst *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AutoUpgradeOptions.Merge(dst, src)
+}
+func (m *AutoUpgradeOptions) XXX_Size() int {
+	return xxx_messageInfo_AutoUpgradeOptions.Size(m)
+}
+func (m *AutoUpgradeOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_AutoUpgradeOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AutoUpgradeOptions proto.InternalMessageInfo
 
 func (m *AutoUpgradeOptions) GetAutoUpgradeStartTime() string {
 	if m != nil {
@@ -3274,13 +4186,35 @@ func (m *AutoUpgradeOptions) GetDescription() string {
 // MaintenancePolicy defines the maintenance policy to be used for the cluster.
 type MaintenancePolicy struct {
 	// Specifies the maintenance window in which maintenance may be performed.
-	Window *MaintenanceWindow `protobuf:"bytes,1,opt,name=window" json:"window,omitempty"`
+	Window               *MaintenanceWindow `protobuf:"bytes,1,opt,name=window,proto3" json:"window,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *MaintenancePolicy) Reset()                    { *m = MaintenancePolicy{} }
-func (m *MaintenancePolicy) String() string            { return proto.CompactTextString(m) }
-func (*MaintenancePolicy) ProtoMessage()               {}
-func (*MaintenancePolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{43} }
+func (m *MaintenancePolicy) Reset()         { *m = MaintenancePolicy{} }
+func (m *MaintenancePolicy) String() string { return proto.CompactTextString(m) }
+func (*MaintenancePolicy) ProtoMessage()    {}
+func (*MaintenancePolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{43}
+}
+func (m *MaintenancePolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MaintenancePolicy.Unmarshal(m, b)
+}
+func (m *MaintenancePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MaintenancePolicy.Marshal(b, m, deterministic)
+}
+func (dst *MaintenancePolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenancePolicy.Merge(dst, src)
+}
+func (m *MaintenancePolicy) XXX_Size() int {
+	return xxx_messageInfo_MaintenancePolicy.Size(m)
+}
+func (m *MaintenancePolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaintenancePolicy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MaintenancePolicy proto.InternalMessageInfo
 
 func (m *MaintenancePolicy) GetWindow() *MaintenanceWindow {
 	if m != nil {
@@ -3296,20 +4230,42 @@ type MaintenanceWindow struct {
 	//
 	// Types that are valid to be assigned to Policy:
 	//	*MaintenanceWindow_DailyMaintenanceWindow
-	Policy isMaintenanceWindow_Policy `protobuf_oneof:"policy"`
+	Policy               isMaintenanceWindow_Policy `protobuf_oneof:"policy"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *MaintenanceWindow) Reset()         { *m = MaintenanceWindow{} }
+func (m *MaintenanceWindow) String() string { return proto.CompactTextString(m) }
+func (*MaintenanceWindow) ProtoMessage()    {}
+func (*MaintenanceWindow) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{44}
+}
+func (m *MaintenanceWindow) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MaintenanceWindow.Unmarshal(m, b)
+}
+func (m *MaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MaintenanceWindow.Marshal(b, m, deterministic)
+}
+func (dst *MaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenanceWindow.Merge(dst, src)
+}
+func (m *MaintenanceWindow) XXX_Size() int {
+	return xxx_messageInfo_MaintenanceWindow.Size(m)
+}
+func (m *MaintenanceWindow) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaintenanceWindow.DiscardUnknown(m)
 }
 
-func (m *MaintenanceWindow) Reset()                    { *m = MaintenanceWindow{} }
-func (m *MaintenanceWindow) String() string            { return proto.CompactTextString(m) }
-func (*MaintenanceWindow) ProtoMessage()               {}
-func (*MaintenanceWindow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{44} }
+var xxx_messageInfo_MaintenanceWindow proto.InternalMessageInfo
 
 type isMaintenanceWindow_Policy interface {
 	isMaintenanceWindow_Policy()
 }
 
 type MaintenanceWindow_DailyMaintenanceWindow struct {
-	DailyMaintenanceWindow *DailyMaintenanceWindow `protobuf:"bytes,2,opt,name=daily_maintenance_window,json=dailyMaintenanceWindow,oneof"`
+	DailyMaintenanceWindow *DailyMaintenanceWindow `protobuf:"bytes,2,opt,name=daily_maintenance_window,json=dailyMaintenanceWindow,proto3,oneof"`
 }
 
 func (*MaintenanceWindow_DailyMaintenanceWindow) isMaintenanceWindow_Policy() {}
@@ -3373,7 +4329,7 @@ func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Policy.(type) {
 	case *MaintenanceWindow_DailyMaintenanceWindow:
 		s := proto.Size(x.DailyMaintenanceWindow)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -3387,16 +4343,38 @@ func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) {
 type DailyMaintenanceWindow struct {
 	// Time within the maintenance window to start the maintenance operations.
 	// It must be in format "HH:MM”, where HH : [00-23] and MM : [00-59] GMT.
-	StartTime string `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime string `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// [Output only] Duration of the time window, automatically chosen to be
 	// smallest possible in the given scenario.
-	Duration string `protobuf:"bytes,3,opt,name=duration" json:"duration,omitempty"`
+	Duration             string   `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DailyMaintenanceWindow) Reset()                    { *m = DailyMaintenanceWindow{} }
-func (m *DailyMaintenanceWindow) String() string            { return proto.CompactTextString(m) }
-func (*DailyMaintenanceWindow) ProtoMessage()               {}
-func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{45} }
+func (m *DailyMaintenanceWindow) Reset()         { *m = DailyMaintenanceWindow{} }
+func (m *DailyMaintenanceWindow) String() string { return proto.CompactTextString(m) }
+func (*DailyMaintenanceWindow) ProtoMessage()    {}
+func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{45}
+}
+func (m *DailyMaintenanceWindow) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DailyMaintenanceWindow.Unmarshal(m, b)
+}
+func (m *DailyMaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DailyMaintenanceWindow.Marshal(b, m, deterministic)
+}
+func (dst *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DailyMaintenanceWindow.Merge(dst, src)
+}
+func (m *DailyMaintenanceWindow) XXX_Size() int {
+	return xxx_messageInfo_DailyMaintenanceWindow.Size(m)
+}
+func (m *DailyMaintenanceWindow) XXX_DiscardUnknown() {
+	xxx_messageInfo_DailyMaintenanceWindow.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DailyMaintenanceWindow proto.InternalMessageInfo
 
 func (m *DailyMaintenanceWindow) GetStartTime() string {
 	if m != nil {
@@ -3418,30 +4396,52 @@ type SetNodePoolManagementRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to update.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// NodeManagement configuration for the node pool.
-	Management *NodeManagement `protobuf:"bytes,5,opt,name=management" json:"management,omitempty"`
+	Management *NodeManagement `protobuf:"bytes,5,opt,name=management,proto3" json:"management,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node pool to set
 	// management properties. Specified in the format
 	// 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetNodePoolManagementRequest) Reset()                    { *m = SetNodePoolManagementRequest{} }
-func (m *SetNodePoolManagementRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNodePoolManagementRequest) ProtoMessage()               {}
-func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46} }
+func (m *SetNodePoolManagementRequest) Reset()         { *m = SetNodePoolManagementRequest{} }
+func (m *SetNodePoolManagementRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNodePoolManagementRequest) ProtoMessage()    {}
+func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{46}
+}
+func (m *SetNodePoolManagementRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Unmarshal(m, b)
+}
+func (m *SetNodePoolManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolManagementRequest.Merge(dst, src)
+}
+func (m *SetNodePoolManagementRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Size(m)
+}
+func (m *SetNodePoolManagementRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNodePoolManagementRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetNodePoolManagementRequest proto.InternalMessageInfo
 
 func (m *SetNodePoolManagementRequest) GetProjectId() string {
 	if m != nil {
@@ -3490,30 +4490,52 @@ func (m *SetNodePoolManagementRequest) GetName() string {
 type SetNodePoolSizeRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to update.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The desired node count for the pool.
-	NodeCount int32 `protobuf:"varint,5,opt,name=node_count,json=nodeCount" json:"node_count,omitempty"`
+	NodeCount int32 `protobuf:"varint,5,opt,name=node_count,json=nodeCount,proto3" json:"node_count,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node pool to set
 	// size.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetNodePoolSizeRequest) Reset()                    { *m = SetNodePoolSizeRequest{} }
-func (m *SetNodePoolSizeRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNodePoolSizeRequest) ProtoMessage()               {}
-func (*SetNodePoolSizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{47} }
+func (m *SetNodePoolSizeRequest) Reset()         { *m = SetNodePoolSizeRequest{} }
+func (m *SetNodePoolSizeRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNodePoolSizeRequest) ProtoMessage()    {}
+func (*SetNodePoolSizeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{47}
+}
+func (m *SetNodePoolSizeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNodePoolSizeRequest.Unmarshal(m, b)
+}
+func (m *SetNodePoolSizeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNodePoolSizeRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNodePoolSizeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolSizeRequest.Merge(dst, src)
+}
+func (m *SetNodePoolSizeRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNodePoolSizeRequest.Size(m)
+}
+func (m *SetNodePoolSizeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNodePoolSizeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetNodePoolSizeRequest proto.InternalMessageInfo
 
 func (m *SetNodePoolSizeRequest) GetProjectId() string {
 	if m != nil {
@@ -3564,28 +4586,50 @@ type RollbackNodePoolUpgradeRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to rollback.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to rollback.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node poll to
 	// rollback upgrade.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RollbackNodePoolUpgradeRequest) Reset()                    { *m = RollbackNodePoolUpgradeRequest{} }
-func (m *RollbackNodePoolUpgradeRequest) String() string            { return proto.CompactTextString(m) }
-func (*RollbackNodePoolUpgradeRequest) ProtoMessage()               {}
-func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{48} }
+func (m *RollbackNodePoolUpgradeRequest) Reset()         { *m = RollbackNodePoolUpgradeRequest{} }
+func (m *RollbackNodePoolUpgradeRequest) String() string { return proto.CompactTextString(m) }
+func (*RollbackNodePoolUpgradeRequest) ProtoMessage()    {}
+func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{48}
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Unmarshal(m, b)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Marshal(b, m, deterministic)
+}
+func (dst *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(dst, src)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Size() int {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Size(m)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RollbackNodePoolUpgradeRequest proto.InternalMessageInfo
 
 func (m *RollbackNodePoolUpgradeRequest) GetProjectId() string {
 	if m != nil {
@@ -3625,13 +4669,35 @@ func (m *RollbackNodePoolUpgradeRequest) GetName() string {
 // ListNodePoolsResponse is the result of ListNodePoolsRequest.
 type ListNodePoolsResponse struct {
 	// A list of node pools for a cluster.
-	NodePools []*NodePool `protobuf:"bytes,1,rep,name=node_pools,json=nodePools" json:"node_pools,omitempty"`
+	NodePools            []*NodePool `protobuf:"bytes,1,rep,name=node_pools,json=nodePools,proto3" json:"node_pools,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *ListNodePoolsResponse) Reset()         { *m = ListNodePoolsResponse{} }
+func (m *ListNodePoolsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListNodePoolsResponse) ProtoMessage()    {}
+func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{49}
+}
+func (m *ListNodePoolsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNodePoolsResponse.Unmarshal(m, b)
+}
+func (m *ListNodePoolsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNodePoolsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsResponse.Merge(dst, src)
+}
+func (m *ListNodePoolsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListNodePoolsResponse.Size(m)
+}
+func (m *ListNodePoolsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNodePoolsResponse.DiscardUnknown(m)
 }
 
-func (m *ListNodePoolsResponse) Reset()                    { *m = ListNodePoolsResponse{} }
-func (m *ListNodePoolsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListNodePoolsResponse) ProtoMessage()               {}
-func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{49} }
+var xxx_messageInfo_ListNodePoolsResponse proto.InternalMessageInfo
 
 func (m *ListNodePoolsResponse) GetNodePools() []*NodePool {
 	if m != nil {
@@ -3644,19 +4710,41 @@ func (m *ListNodePoolsResponse) GetNodePools() []*NodePool {
 // adjust the size of the node pool to the current cluster usage.
 type NodePoolAutoscaling struct {
 	// Is autoscaling enabled for this node pool.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// Minimum number of nodes in the NodePool. Must be >= 1 and <=
 	// max_node_count.
-	MinNodeCount int32 `protobuf:"varint,2,opt,name=min_node_count,json=minNodeCount" json:"min_node_count,omitempty"`
+	MinNodeCount int32 `protobuf:"varint,2,opt,name=min_node_count,json=minNodeCount,proto3" json:"min_node_count,omitempty"`
 	// Maximum number of nodes in the NodePool. Must be >= min_node_count. There
 	// has to enough quota to scale up the cluster.
-	MaxNodeCount int32 `protobuf:"varint,3,opt,name=max_node_count,json=maxNodeCount" json:"max_node_count,omitempty"`
+	MaxNodeCount         int32    `protobuf:"varint,3,opt,name=max_node_count,json=maxNodeCount,proto3" json:"max_node_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NodePoolAutoscaling) Reset()                    { *m = NodePoolAutoscaling{} }
-func (m *NodePoolAutoscaling) String() string            { return proto.CompactTextString(m) }
-func (*NodePoolAutoscaling) ProtoMessage()               {}
-func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{50} }
+func (m *NodePoolAutoscaling) Reset()         { *m = NodePoolAutoscaling{} }
+func (m *NodePoolAutoscaling) String() string { return proto.CompactTextString(m) }
+func (*NodePoolAutoscaling) ProtoMessage()    {}
+func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{50}
+}
+func (m *NodePoolAutoscaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodePoolAutoscaling.Unmarshal(m, b)
+}
+func (m *NodePoolAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodePoolAutoscaling.Marshal(b, m, deterministic)
+}
+func (dst *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePoolAutoscaling.Merge(dst, src)
+}
+func (m *NodePoolAutoscaling) XXX_Size() int {
+	return xxx_messageInfo_NodePoolAutoscaling.Size(m)
+}
+func (m *NodePoolAutoscaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodePoolAutoscaling.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodePoolAutoscaling proto.InternalMessageInfo
 
 func (m *NodePoolAutoscaling) GetEnabled() bool {
 	if m != nil {
@@ -3686,33 +4774,55 @@ type SetLabelsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The labels to set for that cluster.
-	ResourceLabels map[string]string `protobuf:"bytes,4,rep,name=resource_labels,json=resourceLabels" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ResourceLabels map[string]string `protobuf:"bytes,4,rep,name=resource_labels,json=resourceLabels,proto3" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The fingerprint of the previous set of labels for this resource,
 	// used to detect conflicts. The fingerprint is initially generated by
 	// Container Engine and changes after every request to modify or update
 	// labels. You must always provide an up-to-date fingerprint hash when
 	// updating or changing labels. Make a <code>get()</code> request to the
 	// resource to get the latest fingerprint.
-	LabelFingerprint string `protobuf:"bytes,5,opt,name=label_fingerprint,json=labelFingerprint" json:"label_fingerprint,omitempty"`
+	LabelFingerprint string `protobuf:"bytes,5,opt,name=label_fingerprint,json=labelFingerprint,proto3" json:"label_fingerprint,omitempty"`
 	// The name (project, location, cluster id) of the cluster to set labels.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLabelsRequest) Reset()                    { *m = SetLabelsRequest{} }
-func (m *SetLabelsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLabelsRequest) ProtoMessage()               {}
-func (*SetLabelsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51} }
+func (m *SetLabelsRequest) Reset()         { *m = SetLabelsRequest{} }
+func (m *SetLabelsRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLabelsRequest) ProtoMessage()    {}
+func (*SetLabelsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{51}
+}
+func (m *SetLabelsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLabelsRequest.Unmarshal(m, b)
+}
+func (m *SetLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLabelsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLabelsRequest.Merge(dst, src)
+}
+func (m *SetLabelsRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLabelsRequest.Size(m)
+}
+func (m *SetLabelsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLabelsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLabelsRequest proto.InternalMessageInfo
 
 func (m *SetLabelsRequest) GetProjectId() string {
 	if m != nil {
@@ -3762,26 +4872,48 @@ type SetLegacyAbacRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// Whether ABAC authorization will be enabled in the cluster.
-	Enabled bool `protobuf:"varint,4,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled bool `protobuf:"varint,4,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// The name (project, location, cluster id) of the cluster to set legacy abac.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLegacyAbacRequest) Reset()                    { *m = SetLegacyAbacRequest{} }
-func (m *SetLegacyAbacRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLegacyAbacRequest) ProtoMessage()               {}
-func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{52} }
+func (m *SetLegacyAbacRequest) Reset()         { *m = SetLegacyAbacRequest{} }
+func (m *SetLegacyAbacRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLegacyAbacRequest) ProtoMessage()    {}
+func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{52}
+}
+func (m *SetLegacyAbacRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLegacyAbacRequest.Unmarshal(m, b)
+}
+func (m *SetLegacyAbacRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLegacyAbacRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLegacyAbacRequest.Merge(dst, src)
+}
+func (m *SetLegacyAbacRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLegacyAbacRequest.Size(m)
+}
+func (m *SetLegacyAbacRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLegacyAbacRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLegacyAbacRequest proto.InternalMessageInfo
 
 func (m *SetLegacyAbacRequest) GetProjectId() string {
 	if m != nil {
@@ -3824,24 +4956,46 @@ type StartIPRotationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name (project, location, cluster id) of the cluster to start IP rotation.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StartIPRotationRequest) Reset()         { *m = StartIPRotationRequest{} }
+func (m *StartIPRotationRequest) String() string { return proto.CompactTextString(m) }
+func (*StartIPRotationRequest) ProtoMessage()    {}
+func (*StartIPRotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{53}
+}
+func (m *StartIPRotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StartIPRotationRequest.Unmarshal(m, b)
+}
+func (m *StartIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StartIPRotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *StartIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartIPRotationRequest.Merge(dst, src)
+}
+func (m *StartIPRotationRequest) XXX_Size() int {
+	return xxx_messageInfo_StartIPRotationRequest.Size(m)
+}
+func (m *StartIPRotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StartIPRotationRequest.DiscardUnknown(m)
 }
 
-func (m *StartIPRotationRequest) Reset()                    { *m = StartIPRotationRequest{} }
-func (m *StartIPRotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*StartIPRotationRequest) ProtoMessage()               {}
-func (*StartIPRotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{53} }
+var xxx_messageInfo_StartIPRotationRequest proto.InternalMessageInfo
 
 func (m *StartIPRotationRequest) GetProjectId() string {
 	if m != nil {
@@ -3876,24 +5030,46 @@ type CompleteIPRotationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name (project, location, cluster id) of the cluster to complete IP rotation.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CompleteIPRotationRequest) Reset()         { *m = CompleteIPRotationRequest{} }
+func (m *CompleteIPRotationRequest) String() string { return proto.CompactTextString(m) }
+func (*CompleteIPRotationRequest) ProtoMessage()    {}
+func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{54}
+}
+func (m *CompleteIPRotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CompleteIPRotationRequest.Unmarshal(m, b)
+}
+func (m *CompleteIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CompleteIPRotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteIPRotationRequest.Merge(dst, src)
+}
+func (m *CompleteIPRotationRequest) XXX_Size() int {
+	return xxx_messageInfo_CompleteIPRotationRequest.Size(m)
+}
+func (m *CompleteIPRotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CompleteIPRotationRequest.DiscardUnknown(m)
 }
 
-func (m *CompleteIPRotationRequest) Reset()                    { *m = CompleteIPRotationRequest{} }
-func (m *CompleteIPRotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CompleteIPRotationRequest) ProtoMessage()               {}
-func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{54} }
+var xxx_messageInfo_CompleteIPRotationRequest proto.InternalMessageInfo
 
 func (m *CompleteIPRotationRequest) GetProjectId() string {
 	if m != nil {
@@ -3926,16 +5102,38 @@ func (m *CompleteIPRotationRequest) GetName() string {
 // AcceleratorConfig represents a Hardware Accelerator request.
 type AcceleratorConfig struct {
 	// The number of the accelerator cards exposed to an instance.
-	AcceleratorCount int64 `protobuf:"varint,1,opt,name=accelerator_count,json=acceleratorCount" json:"accelerator_count,omitempty"`
+	AcceleratorCount int64 `protobuf:"varint,1,opt,name=accelerator_count,json=acceleratorCount,proto3" json:"accelerator_count,omitempty"`
 	// The accelerator type resource name. List of supported accelerators
 	// [here](/compute/docs/gpus/#Introduction)
-	AcceleratorType string `protobuf:"bytes,2,opt,name=accelerator_type,json=acceleratorType" json:"accelerator_type,omitempty"`
+	AcceleratorType      string   `protobuf:"bytes,2,opt,name=accelerator_type,json=acceleratorType,proto3" json:"accelerator_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AcceleratorConfig) Reset()                    { *m = AcceleratorConfig{} }
-func (m *AcceleratorConfig) String() string            { return proto.CompactTextString(m) }
-func (*AcceleratorConfig) ProtoMessage()               {}
-func (*AcceleratorConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{55} }
+func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
+func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
+func (*AcceleratorConfig) ProtoMessage()    {}
+func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{55}
+}
+func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
+}
+func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
+}
+func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+}
+func (m *AcceleratorConfig) XXX_Size() int {
+	return xxx_messageInfo_AcceleratorConfig.Size(m)
+}
+func (m *AcceleratorConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AcceleratorConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AcceleratorConfig proto.InternalMessageInfo
 
 func (m *AcceleratorConfig) GetAcceleratorCount() int64 {
 	if m != nil {
@@ -3956,27 +5154,49 @@ type SetNetworkPolicyRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// Configuration options for the NetworkPolicy feature.
-	NetworkPolicy *NetworkPolicy `protobuf:"bytes,4,opt,name=network_policy,json=networkPolicy" json:"network_policy,omitempty"`
+	NetworkPolicy *NetworkPolicy `protobuf:"bytes,4,opt,name=network_policy,json=networkPolicy,proto3" json:"network_policy,omitempty"`
 	// The name (project, location, cluster id) of the cluster to set networking
 	// policy.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SetNetworkPolicyRequest) Reset()         { *m = SetNetworkPolicyRequest{} }
+func (m *SetNetworkPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNetworkPolicyRequest) ProtoMessage()    {}
+func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{56}
+}
+func (m *SetNetworkPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Unmarshal(m, b)
+}
+func (m *SetNetworkPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNetworkPolicyRequest.Merge(dst, src)
+}
+func (m *SetNetworkPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Size(m)
+}
+func (m *SetNetworkPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNetworkPolicyRequest.DiscardUnknown(m)
 }
 
-func (m *SetNetworkPolicyRequest) Reset()                    { *m = SetNetworkPolicyRequest{} }
-func (m *SetNetworkPolicyRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNetworkPolicyRequest) ProtoMessage()               {}
-func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56} }
+var xxx_messageInfo_SetNetworkPolicyRequest proto.InternalMessageInfo
 
 func (m *SetNetworkPolicyRequest) GetProjectId() string {
 	if m != nil {
@@ -4017,26 +5237,48 @@ func (m *SetNetworkPolicyRequest) GetName() string {
 type SetMaintenancePolicyRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The maintenance policy to be set for the cluster. An empty field
 	// clears the existing maintenance policy.
-	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,4,opt,name=maintenance_policy,json=maintenancePolicy" json:"maintenance_policy,omitempty"`
+	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,4,opt,name=maintenance_policy,json=maintenancePolicy,proto3" json:"maintenance_policy,omitempty"`
 	// The name (project, location, cluster id) of the cluster to set maintenance
 	// policy.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetMaintenancePolicyRequest) Reset()                    { *m = SetMaintenancePolicyRequest{} }
-func (m *SetMaintenancePolicyRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetMaintenancePolicyRequest) ProtoMessage()               {}
-func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{57} }
+func (m *SetMaintenancePolicyRequest) Reset()         { *m = SetMaintenancePolicyRequest{} }
+func (m *SetMaintenancePolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*SetMaintenancePolicyRequest) ProtoMessage()    {}
+func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_5c8bce40ab9ac3ed, []int{57}
+}
+func (m *SetMaintenancePolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Unmarshal(m, b)
+}
+func (m *SetMaintenancePolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(dst, src)
+}
+func (m *SetMaintenancePolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Size(m)
+}
+func (m *SetMaintenancePolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetMaintenancePolicyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetMaintenancePolicyRequest proto.InternalMessageInfo
 
 func (m *SetMaintenancePolicyRequest) GetProjectId() string {
 	if m != nil {
@@ -4075,6 +5317,8 @@ func (m *SetMaintenancePolicyRequest) GetName() string {
 
 func init() {
 	proto.RegisterType((*NodeConfig)(nil), "google.container.v1alpha1.NodeConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1alpha1.NodeConfig.LabelsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1alpha1.NodeConfig.MetadataEntry")
 	proto.RegisterType((*NodeTaint)(nil), "google.container.v1alpha1.NodeTaint")
 	proto.RegisterType((*MasterAuth)(nil), "google.container.v1alpha1.MasterAuth")
 	proto.RegisterType((*ClientCertificateConfig)(nil), "google.container.v1alpha1.ClientCertificateConfig")
@@ -4127,6 +5371,7 @@ func init() {
 	proto.RegisterType((*ListNodePoolsResponse)(nil), "google.container.v1alpha1.ListNodePoolsResponse")
 	proto.RegisterType((*NodePoolAutoscaling)(nil), "google.container.v1alpha1.NodePoolAutoscaling")
 	proto.RegisterType((*SetLabelsRequest)(nil), "google.container.v1alpha1.SetLabelsRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1alpha1.SetLabelsRequest.ResourceLabelsEntry")
 	proto.RegisterType((*SetLegacyAbacRequest)(nil), "google.container.v1alpha1.SetLegacyAbacRequest")
 	proto.RegisterType((*StartIPRotationRequest)(nil), "google.container.v1alpha1.StartIPRotationRequest")
 	proto.RegisterType((*CompleteIPRotationRequest)(nil), "google.container.v1alpha1.CompleteIPRotationRequest")
@@ -4150,8 +5395,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ClusterManager service
-
+// ClusterManagerClient is the client API for ClusterManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ClusterManagerClient interface {
 	// Lists all clusters owned by a project in either the specified zone or all
 	// zones.
@@ -4208,7 +5454,7 @@ type ClusterManagerClient interface {
 	// Gets the specified operation.
 	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
 	// Cancels the specified operation.
-	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Returns configuration info about the Container Engine service.
 	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
 	// Lists the node pools for a cluster.
@@ -4250,7 +5496,7 @@ func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
 
 func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
 	out := new(ListClustersResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListClusters", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListClusters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4259,7 +5505,7 @@ func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListCluster
 
 func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4268,7 +5514,7 @@ func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterReq
 
 func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CreateCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CreateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4277,7 +5523,7 @@ func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClus
 
 func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4286,7 +5532,7 @@ func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClus
 
 func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4295,7 +5541,7 @@ func (c *clusterManagerClient) UpdateNodePool(ctx context.Context, in *UpdateNod
 
 func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *SetNodePoolAutoscalingRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolAutoscaling", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolAutoscaling", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4304,7 +5550,7 @@ func (c *clusterManagerClient) SetNodePoolAutoscaling(ctx context.Context, in *S
 
 func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLoggingServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLoggingService", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLoggingService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4313,7 +5559,7 @@ func (c *clusterManagerClient) SetLoggingService(ctx context.Context, in *SetLog
 
 func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *SetMonitoringServiceRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMonitoringService", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMonitoringService", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4322,7 +5568,7 @@ func (c *clusterManagerClient) SetMonitoringService(ctx context.Context, in *Set
 
 func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddonsConfigRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetAddonsConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetAddonsConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4331,7 +5577,7 @@ func (c *clusterManagerClient) SetAddonsConfig(ctx context.Context, in *SetAddon
 
 func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocationsRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLocations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLocations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4340,7 +5586,7 @@ func (c *clusterManagerClient) SetLocations(ctx context.Context, in *SetLocation
 
 func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMasterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateMaster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/UpdateMaster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4349,7 +5595,7 @@ func (c *clusterManagerClient) UpdateMaster(ctx context.Context, in *UpdateMaste
 
 func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMasterAuth", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMasterAuth", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4358,7 +5604,7 @@ func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterA
 
 func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/DeleteCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/DeleteCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4367,7 +5613,7 @@ func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClus
 
 func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
 	out := new(ListOperationsResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListOperations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListOperations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4376,16 +5622,16 @@ func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOpera
 
 func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetOperation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CancelOperation", in, out, c.cc, opts...)
+func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CancelOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4394,7 +5640,7 @@ func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOp
 
 func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
 	out := new(ServerConfig)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetServerConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetServerConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4403,7 +5649,7 @@ func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServe
 
 func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
 	out := new(ListNodePoolsResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListNodePools", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/ListNodePools", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4412,7 +5658,7 @@ func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePo
 
 func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
 	out := new(NodePool)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/GetNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4421,7 +5667,7 @@ func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolR
 
 func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CreateNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CreateNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4430,7 +5676,7 @@ func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNod
 
 func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/DeleteNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/DeleteNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4439,7 +5685,7 @@ func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNod
 
 func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/RollbackNodePoolUpgrade", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4448,7 +5694,7 @@ func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *
 
 func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolManagement", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolManagement", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4457,7 +5703,7 @@ func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *Se
 
 func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLabels", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLabels", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4466,7 +5712,7 @@ func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsReque
 
 func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLegacyAbac", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetLegacyAbac", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4475,7 +5721,7 @@ func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyA
 
 func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/StartIPRotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/StartIPRotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4484,7 +5730,7 @@ func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPR
 
 func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CompleteIPRotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/CompleteIPRotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4493,7 +5739,7 @@ func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *Compl
 
 func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodePoolSizeRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolSize", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNodePoolSize", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4502,7 +5748,7 @@ func (c *clusterManagerClient) SetNodePoolSize(ctx context.Context, in *SetNodeP
 
 func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNetworkPolicy", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetNetworkPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -4511,15 +5757,14 @@ func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetw
 
 func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMaintenancePolicy", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1alpha1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ClusterManager service
-
+// ClusterManagerServer is the server API for ClusterManager service.
 type ClusterManagerServer interface {
 	// Lists all clusters owned by a project in either the specified zone or all
 	// zones.
@@ -4576,7 +5821,7 @@ type ClusterManagerServer interface {
 	// Gets the specified operation.
 	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
 	// Cancels the specified operation.
-	CancelOperation(context.Context, *CancelOperationRequest) (*google_protobuf1.Empty, error)
+	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
 	// Returns configuration info about the Container Engine service.
 	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
 	// Lists the node pools for a cluster.
@@ -5281,9 +6526,11 @@ var _ClusterManager_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/container/v1alpha1/cluster_service.proto",
 }
 
-func init() { proto.RegisterFile("google/container/v1alpha1/cluster_service.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/container/v1alpha1/cluster_service.proto", fileDescriptor_cluster_service_5c8bce40ab9ac3ed)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_cluster_service_5c8bce40ab9ac3ed = []byte{
 	// 4786 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x7c, 0x5d, 0x6c, 0x23, 0xd7,
 	0x75, 0x7f, 0x46, 0xa2, 0x28, 0xf1, 0x90, 0xa2, 0xa8, 0xab, 0x2f, 0x2e, 0xed, 0xb5, 0xd7, 0x13,
diff --git a/vendor/google.golang.org/genproto/googleapis/container/v1beta1/cluster_service.pb.go b/vendor/google.golang.org/genproto/googleapis/container/v1beta1/cluster_service.pb.go
index 9fb21a43..24f66722 100644
--- a/vendor/google.golang.org/genproto/googleapis/container/v1beta1/cluster_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/container/v1beta1/cluster_service.pb.go
@@ -1,71 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/container/v1beta1/cluster_service.proto
 
-/*
-Package container is a generated protocol buffer package.
-
-It is generated from these files:
-	google/container/v1beta1/cluster_service.proto
-
-It has these top-level messages:
-	NodeConfig
-	NodeTaint
-	MasterAuth
-	ClientCertificateConfig
-	AddonsConfig
-	HttpLoadBalancing
-	HorizontalPodAutoscaling
-	KubernetesDashboard
-	NetworkPolicyConfig
-	MasterAuthorizedNetworksConfig
-	NetworkPolicy
-	IPAllocationPolicy
-	PodSecurityPolicyConfig
-	Cluster
-	ClusterUpdate
-	Operation
-	CreateClusterRequest
-	GetClusterRequest
-	UpdateClusterRequest
-	SetMasterAuthRequest
-	DeleteClusterRequest
-	ListClustersRequest
-	ListClustersResponse
-	GetOperationRequest
-	ListOperationsRequest
-	CancelOperationRequest
-	ListOperationsResponse
-	GetServerConfigRequest
-	ServerConfig
-	CreateNodePoolRequest
-	DeleteNodePoolRequest
-	ListNodePoolsRequest
-	GetNodePoolRequest
-	NodePool
-	NodeManagement
-	AutoUpgradeOptions
-	MaintenancePolicy
-	MaintenanceWindow
-	DailyMaintenanceWindow
-	SetNodePoolManagementRequest
-	RollbackNodePoolUpgradeRequest
-	ListNodePoolsResponse
-	NodePoolAutoscaling
-	SetLabelsRequest
-	SetLegacyAbacRequest
-	StartIPRotationRequest
-	CompleteIPRotationRequest
-	AcceleratorConfig
-	SetNetworkPolicyRequest
-	SetMaintenancePolicyRequest
-*/
-package container
+package container // import "google.golang.org/genproto/googleapis/container/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -113,7 +55,9 @@ var NodeTaint_Effect_value = map[string]int32{
 func (x NodeTaint_Effect) String() string {
 	return proto.EnumName(NodeTaint_Effect_name, int32(x))
 }
-func (NodeTaint_Effect) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (NodeTaint_Effect) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{1, 0}
+}
 
 // Allowed Network Policy providers.
 type NetworkPolicy_Provider int32
@@ -137,7 +81,9 @@ var NetworkPolicy_Provider_value = map[string]int32{
 func (x NetworkPolicy_Provider) String() string {
 	return proto.EnumName(NetworkPolicy_Provider_name, int32(x))
 }
-func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 0} }
+func (NetworkPolicy_Provider) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{10, 0}
+}
 
 // The current status of the cluster.
 type Cluster_Status int32
@@ -181,7 +127,9 @@ var Cluster_Status_value = map[string]int32{
 func (x Cluster_Status) String() string {
 	return proto.EnumName(Cluster_Status_name, int32(x))
 }
-func (Cluster_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{13, 0} }
+func (Cluster_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{13, 0}
+}
 
 // Current status of the operation.
 type Operation_Status int32
@@ -217,7 +165,9 @@ var Operation_Status_value = map[string]int32{
 func (x Operation_Status) String() string {
 	return proto.EnumName(Operation_Status_name, int32(x))
 }
-func (Operation_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{15, 0} }
+func (Operation_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{15, 0}
+}
 
 // Operation type.
 type Operation_Type int32
@@ -301,7 +251,9 @@ var Operation_Type_value = map[string]int32{
 func (x Operation_Type) String() string {
 	return proto.EnumName(Operation_Type_name, int32(x))
 }
-func (Operation_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{15, 1} }
+func (Operation_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{15, 1}
+}
 
 // Operation type: what type update to perform.
 type SetMasterAuthRequest_Action int32
@@ -337,7 +289,7 @@ func (x SetMasterAuthRequest_Action) String() string {
 	return proto.EnumName(SetMasterAuthRequest_Action_name, int32(x))
 }
 func (SetMasterAuthRequest_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{19, 0}
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{19, 0}
 }
 
 // The current status of the node pool instance.
@@ -389,7 +341,9 @@ var NodePool_Status_value = map[string]int32{
 func (x NodePool_Status) String() string {
 	return proto.EnumName(NodePool_Status_name, int32(x))
 }
-func (NodePool_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{33, 0} }
+func (NodePool_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{33, 0}
+}
 
 // Parameters that describe the nodes in a cluster.
 type NodeConfig struct {
@@ -399,12 +353,12 @@ type NodeConfig struct {
 	//
 	// If unspecified, the default machine type is
 	// `n1-standard-1`.
-	MachineType string `protobuf:"bytes,1,opt,name=machine_type,json=machineType" json:"machine_type,omitempty"`
+	MachineType string `protobuf:"bytes,1,opt,name=machine_type,json=machineType,proto3" json:"machine_type,omitempty"`
 	// Size of the disk attached to each node, specified in GB.
 	// The smallest allowed disk size is 10GB.
 	//
 	// If unspecified, the default disk size is 100GB.
-	DiskSizeGb int32 `protobuf:"varint,2,opt,name=disk_size_gb,json=diskSizeGb" json:"disk_size_gb,omitempty"`
+	DiskSizeGb int32 `protobuf:"varint,2,opt,name=disk_size_gb,json=diskSizeGb,proto3" json:"disk_size_gb,omitempty"`
 	// The set of Google API scopes to be made available on all of the
 	// node VMs under the "default" service account.
 	//
@@ -419,10 +373,10 @@ type NodeConfig struct {
 	//
 	// If unspecified, no scopes are added, unless Cloud Logging or Cloud
 	// Monitoring are enabled, in which case their required scopes will be added.
-	OauthScopes []string `protobuf:"bytes,3,rep,name=oauth_scopes,json=oauthScopes" json:"oauth_scopes,omitempty"`
+	OauthScopes []string `protobuf:"bytes,3,rep,name=oauth_scopes,json=oauthScopes,proto3" json:"oauth_scopes,omitempty"`
 	// The Google Cloud Platform Service Account to be used by the node VMs. If
 	// no Service Account is specified, the "default" service account is used.
-	ServiceAccount string `protobuf:"bytes,9,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
+	ServiceAccount string `protobuf:"bytes,9,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
 	// The metadata key/value pairs assigned to instances in the cluster.
 	//
 	// Keys must conform to the regexp [a-zA-Z0-9-_]+ and be less than 128 bytes
@@ -436,10 +390,10 @@ type NodeConfig struct {
 	// that each value's size must be less than or equal to 32 KB.
 	//
 	// The total size of all keys and values must be less than 512 KB.
-	Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The image type to use for this node. Note that for a given image type,
 	// the latest version of it will be used.
-	ImageType string `protobuf:"bytes,5,opt,name=image_type,json=imageType" json:"image_type,omitempty"`
+	ImageType string `protobuf:"bytes,5,opt,name=image_type,json=imageType,proto3" json:"image_type,omitempty"`
 	// The map of Kubernetes labels (key/value pairs) to be applied to each node.
 	// These will added in addition to any default label(s) that
 	// Kubernetes may apply to the node.
@@ -448,45 +402,67 @@ type NodeConfig struct {
 	// and conflicts should be avoided.
 	// For more information, including usage and the valid values, see:
 	// https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-	Labels map[string]string `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The number of local SSD disks to be attached to the node.
 	//
 	// The limit for this value is dependant upon the maximum number of
 	// disks available on a machine per zone. See:
 	// https://cloud.google.com/compute/docs/disks/local-ssd#local_ssd_limits
 	// for more information.
-	LocalSsdCount int32 `protobuf:"varint,7,opt,name=local_ssd_count,json=localSsdCount" json:"local_ssd_count,omitempty"`
+	LocalSsdCount int32 `protobuf:"varint,7,opt,name=local_ssd_count,json=localSsdCount,proto3" json:"local_ssd_count,omitempty"`
 	// The list of instance tags applied to all nodes. Tags are used to identify
 	// valid sources or targets for network firewalls and are specified by
 	// the client during cluster or node pool creation. Each tag within the list
 	// must comply with RFC1035.
-	Tags []string `protobuf:"bytes,8,rep,name=tags" json:"tags,omitempty"`
+	Tags []string `protobuf:"bytes,8,rep,name=tags,proto3" json:"tags,omitempty"`
 	// Whether the nodes are created as preemptible VM instances. See:
 	// https://cloud.google.com/compute/docs/instances/preemptible for more
 	// inforamtion about preemptible VM instances.
-	Preemptible bool `protobuf:"varint,10,opt,name=preemptible" json:"preemptible,omitempty"`
+	Preemptible bool `protobuf:"varint,10,opt,name=preemptible,proto3" json:"preemptible,omitempty"`
 	// A list of hardware accelerators to be attached to each node.
 	// See https://cloud.google.com/compute/docs/gpus for more information about
 	// support for GPUs.
-	Accelerators []*AcceleratorConfig `protobuf:"bytes,11,rep,name=accelerators" json:"accelerators,omitempty"`
+	Accelerators []*AcceleratorConfig `protobuf:"bytes,11,rep,name=accelerators,proto3" json:"accelerators,omitempty"`
 	// Minimum CPU platform to be used by this instance. The instance may be
 	// scheduled on the specified or newer CPU platform. Applicable values are the
 	// friendly names of CPU platforms, such as
 	// <code>minCpuPlatform: &quot;Intel Haswell&quot;</code> or
 	// <code>minCpuPlatform: &quot;Intel Sandy Bridge&quot;</code>. For more
 	// information, read [how to specify min CPU platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform)
-	MinCpuPlatform string `protobuf:"bytes,13,opt,name=min_cpu_platform,json=minCpuPlatform" json:"min_cpu_platform,omitempty"`
+	MinCpuPlatform string `protobuf:"bytes,13,opt,name=min_cpu_platform,json=minCpuPlatform,proto3" json:"min_cpu_platform,omitempty"`
 	// List of kubernetes taints to be applied to each node.
 	//
 	// For more information, including usage and the valid values, see:
 	// https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-	Taints []*NodeTaint `protobuf:"bytes,15,rep,name=taints" json:"taints,omitempty"`
+	Taints               []*NodeTaint `protobuf:"bytes,15,rep,name=taints,proto3" json:"taints,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *NodeConfig) Reset()                    { *m = NodeConfig{} }
-func (m *NodeConfig) String() string            { return proto.CompactTextString(m) }
-func (*NodeConfig) ProtoMessage()               {}
-func (*NodeConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *NodeConfig) Reset()         { *m = NodeConfig{} }
+func (m *NodeConfig) String() string { return proto.CompactTextString(m) }
+func (*NodeConfig) ProtoMessage()    {}
+func (*NodeConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{0}
+}
+func (m *NodeConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeConfig.Unmarshal(m, b)
+}
+func (m *NodeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeConfig.Marshal(b, m, deterministic)
+}
+func (dst *NodeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeConfig.Merge(dst, src)
+}
+func (m *NodeConfig) XXX_Size() int {
+	return xxx_messageInfo_NodeConfig.Size(m)
+}
+func (m *NodeConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeConfig proto.InternalMessageInfo
 
 func (m *NodeConfig) GetMachineType() string {
 	if m != nil {
@@ -586,17 +562,39 @@ func (m *NodeConfig) GetTaints() []*NodeTaint {
 // https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 type NodeTaint struct {
 	// Key for taint.
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// Value for taint.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Effect for taint.
-	Effect NodeTaint_Effect `protobuf:"varint,3,opt,name=effect,enum=google.container.v1beta1.NodeTaint_Effect" json:"effect,omitempty"`
+	Effect               NodeTaint_Effect `protobuf:"varint,3,opt,name=effect,proto3,enum=google.container.v1beta1.NodeTaint_Effect" json:"effect,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *NodeTaint) Reset()                    { *m = NodeTaint{} }
-func (m *NodeTaint) String() string            { return proto.CompactTextString(m) }
-func (*NodeTaint) ProtoMessage()               {}
-func (*NodeTaint) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *NodeTaint) Reset()         { *m = NodeTaint{} }
+func (m *NodeTaint) String() string { return proto.CompactTextString(m) }
+func (*NodeTaint) ProtoMessage()    {}
+func (*NodeTaint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{1}
+}
+func (m *NodeTaint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeTaint.Unmarshal(m, b)
+}
+func (m *NodeTaint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeTaint.Marshal(b, m, deterministic)
+}
+func (dst *NodeTaint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeTaint.Merge(dst, src)
+}
+func (m *NodeTaint) XXX_Size() int {
+	return xxx_messageInfo_NodeTaint.Size(m)
+}
+func (m *NodeTaint) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeTaint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodeTaint proto.InternalMessageInfo
 
 func (m *NodeTaint) GetKey() string {
 	if m != nil {
@@ -626,30 +624,52 @@ type MasterAuth struct {
 	// The username to use for HTTP basic authentication to the master endpoint.
 	// For clusters v1.6.0 and later, you can disable basic authentication by
 	// providing an empty username.
-	Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
+	Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
 	// The password to use for HTTP basic authentication to the master endpoint.
 	// Because the master endpoint is open to the Internet, you should create a
 	// strong password.  If a password is provided for cluster creation, username
 	// must be non-empty.
-	Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
+	Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
 	// Configuration for client certificate authentication on the cluster.  If no
 	// configuration is specified, a client certificate is issued.
-	ClientCertificateConfig *ClientCertificateConfig `protobuf:"bytes,3,opt,name=client_certificate_config,json=clientCertificateConfig" json:"client_certificate_config,omitempty"`
+	ClientCertificateConfig *ClientCertificateConfig `protobuf:"bytes,3,opt,name=client_certificate_config,json=clientCertificateConfig,proto3" json:"client_certificate_config,omitempty"`
 	// [Output only] Base64-encoded public certificate that is the root of
 	// trust for the cluster.
-	ClusterCaCertificate string `protobuf:"bytes,100,opt,name=cluster_ca_certificate,json=clusterCaCertificate" json:"cluster_ca_certificate,omitempty"`
+	ClusterCaCertificate string `protobuf:"bytes,100,opt,name=cluster_ca_certificate,json=clusterCaCertificate,proto3" json:"cluster_ca_certificate,omitempty"`
 	// [Output only] Base64-encoded public certificate used by clients to
 	// authenticate to the cluster endpoint.
-	ClientCertificate string `protobuf:"bytes,101,opt,name=client_certificate,json=clientCertificate" json:"client_certificate,omitempty"`
+	ClientCertificate string `protobuf:"bytes,101,opt,name=client_certificate,json=clientCertificate,proto3" json:"client_certificate,omitempty"`
 	// [Output only] Base64-encoded private key used by clients to authenticate
 	// to the cluster endpoint.
-	ClientKey string `protobuf:"bytes,102,opt,name=client_key,json=clientKey" json:"client_key,omitempty"`
+	ClientKey            string   `protobuf:"bytes,102,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MasterAuth) Reset()         { *m = MasterAuth{} }
+func (m *MasterAuth) String() string { return proto.CompactTextString(m) }
+func (*MasterAuth) ProtoMessage()    {}
+func (*MasterAuth) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{2}
+}
+func (m *MasterAuth) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuth.Unmarshal(m, b)
+}
+func (m *MasterAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuth.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuth) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuth.Merge(dst, src)
+}
+func (m *MasterAuth) XXX_Size() int {
+	return xxx_messageInfo_MasterAuth.Size(m)
+}
+func (m *MasterAuth) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuth.DiscardUnknown(m)
 }
 
-func (m *MasterAuth) Reset()                    { *m = MasterAuth{} }
-func (m *MasterAuth) String() string            { return proto.CompactTextString(m) }
-func (*MasterAuth) ProtoMessage()               {}
-func (*MasterAuth) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_MasterAuth proto.InternalMessageInfo
 
 func (m *MasterAuth) GetUsername() string {
 	if m != nil {
@@ -696,13 +716,35 @@ func (m *MasterAuth) GetClientKey() string {
 // Configuration for client certificates on the cluster.
 type ClientCertificateConfig struct {
 	// Issue a client certificate.
-	IssueClientCertificate bool `protobuf:"varint,1,opt,name=issue_client_certificate,json=issueClientCertificate" json:"issue_client_certificate,omitempty"`
+	IssueClientCertificate bool     `protobuf:"varint,1,opt,name=issue_client_certificate,json=issueClientCertificate,proto3" json:"issue_client_certificate,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
+}
+
+func (m *ClientCertificateConfig) Reset()         { *m = ClientCertificateConfig{} }
+func (m *ClientCertificateConfig) String() string { return proto.CompactTextString(m) }
+func (*ClientCertificateConfig) ProtoMessage()    {}
+func (*ClientCertificateConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{3}
+}
+func (m *ClientCertificateConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientCertificateConfig.Unmarshal(m, b)
+}
+func (m *ClientCertificateConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientCertificateConfig.Marshal(b, m, deterministic)
+}
+func (dst *ClientCertificateConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientCertificateConfig.Merge(dst, src)
+}
+func (m *ClientCertificateConfig) XXX_Size() int {
+	return xxx_messageInfo_ClientCertificateConfig.Size(m)
+}
+func (m *ClientCertificateConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientCertificateConfig.DiscardUnknown(m)
 }
 
-func (m *ClientCertificateConfig) Reset()                    { *m = ClientCertificateConfig{} }
-func (m *ClientCertificateConfig) String() string            { return proto.CompactTextString(m) }
-func (*ClientCertificateConfig) ProtoMessage()               {}
-func (*ClientCertificateConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_ClientCertificateConfig proto.InternalMessageInfo
 
 func (m *ClientCertificateConfig) GetIssueClientCertificate() bool {
 	if m != nil {
@@ -716,23 +758,45 @@ func (m *ClientCertificateConfig) GetIssueClientCertificate() bool {
 type AddonsConfig struct {
 	// Configuration for the HTTP (L7) load balancing controller addon, which
 	// makes it easy to set up HTTP load balancers for services in a cluster.
-	HttpLoadBalancing *HttpLoadBalancing `protobuf:"bytes,1,opt,name=http_load_balancing,json=httpLoadBalancing" json:"http_load_balancing,omitempty"`
+	HttpLoadBalancing *HttpLoadBalancing `protobuf:"bytes,1,opt,name=http_load_balancing,json=httpLoadBalancing,proto3" json:"http_load_balancing,omitempty"`
 	// Configuration for the horizontal pod autoscaling feature, which
 	// increases or decreases the number of replica pods a replication controller
 	// has based on the resource usage of the existing pods.
-	HorizontalPodAutoscaling *HorizontalPodAutoscaling `protobuf:"bytes,2,opt,name=horizontal_pod_autoscaling,json=horizontalPodAutoscaling" json:"horizontal_pod_autoscaling,omitempty"`
+	HorizontalPodAutoscaling *HorizontalPodAutoscaling `protobuf:"bytes,2,opt,name=horizontal_pod_autoscaling,json=horizontalPodAutoscaling,proto3" json:"horizontal_pod_autoscaling,omitempty"`
 	// Configuration for the Kubernetes Dashboard.
-	KubernetesDashboard *KubernetesDashboard `protobuf:"bytes,3,opt,name=kubernetes_dashboard,json=kubernetesDashboard" json:"kubernetes_dashboard,omitempty"`
+	KubernetesDashboard *KubernetesDashboard `protobuf:"bytes,3,opt,name=kubernetes_dashboard,json=kubernetesDashboard,proto3" json:"kubernetes_dashboard,omitempty"`
 	// Configuration for NetworkPolicy. This only tracks whether the addon
 	// is enabled or not on the Master, it does not track whether network policy
 	// is enabled for the nodes.
-	NetworkPolicyConfig *NetworkPolicyConfig `protobuf:"bytes,4,opt,name=network_policy_config,json=networkPolicyConfig" json:"network_policy_config,omitempty"`
+	NetworkPolicyConfig  *NetworkPolicyConfig `protobuf:"bytes,4,opt,name=network_policy_config,json=networkPolicyConfig,proto3" json:"network_policy_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *AddonsConfig) Reset()                    { *m = AddonsConfig{} }
-func (m *AddonsConfig) String() string            { return proto.CompactTextString(m) }
-func (*AddonsConfig) ProtoMessage()               {}
-func (*AddonsConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *AddonsConfig) Reset()         { *m = AddonsConfig{} }
+func (m *AddonsConfig) String() string { return proto.CompactTextString(m) }
+func (*AddonsConfig) ProtoMessage()    {}
+func (*AddonsConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{4}
+}
+func (m *AddonsConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AddonsConfig.Unmarshal(m, b)
+}
+func (m *AddonsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AddonsConfig.Marshal(b, m, deterministic)
+}
+func (dst *AddonsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddonsConfig.Merge(dst, src)
+}
+func (m *AddonsConfig) XXX_Size() int {
+	return xxx_messageInfo_AddonsConfig.Size(m)
+}
+func (m *AddonsConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AddonsConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AddonsConfig proto.InternalMessageInfo
 
 func (m *AddonsConfig) GetHttpLoadBalancing() *HttpLoadBalancing {
 	if m != nil {
@@ -768,13 +832,35 @@ type HttpLoadBalancing struct {
 	// Whether the HTTP Load Balancing controller is enabled in the cluster.
 	// When enabled, it runs a small pod in the cluster that manages the load
 	// balancers.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HttpLoadBalancing) Reset()         { *m = HttpLoadBalancing{} }
+func (m *HttpLoadBalancing) String() string { return proto.CompactTextString(m) }
+func (*HttpLoadBalancing) ProtoMessage()    {}
+func (*HttpLoadBalancing) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{5}
+}
+func (m *HttpLoadBalancing) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpLoadBalancing.Unmarshal(m, b)
+}
+func (m *HttpLoadBalancing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpLoadBalancing.Marshal(b, m, deterministic)
+}
+func (dst *HttpLoadBalancing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpLoadBalancing.Merge(dst, src)
+}
+func (m *HttpLoadBalancing) XXX_Size() int {
+	return xxx_messageInfo_HttpLoadBalancing.Size(m)
+}
+func (m *HttpLoadBalancing) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpLoadBalancing.DiscardUnknown(m)
 }
 
-func (m *HttpLoadBalancing) Reset()                    { *m = HttpLoadBalancing{} }
-func (m *HttpLoadBalancing) String() string            { return proto.CompactTextString(m) }
-func (*HttpLoadBalancing) ProtoMessage()               {}
-func (*HttpLoadBalancing) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_HttpLoadBalancing proto.InternalMessageInfo
 
 func (m *HttpLoadBalancing) GetDisabled() bool {
 	if m != nil {
@@ -790,13 +876,35 @@ type HorizontalPodAutoscaling struct {
 	// Whether the Horizontal Pod Autoscaling feature is enabled in the cluster.
 	// When enabled, it ensures that a Heapster pod is running in the cluster,
 	// which is also used by the Cloud Monitoring service.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HorizontalPodAutoscaling) Reset()         { *m = HorizontalPodAutoscaling{} }
+func (m *HorizontalPodAutoscaling) String() string { return proto.CompactTextString(m) }
+func (*HorizontalPodAutoscaling) ProtoMessage()    {}
+func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{6}
+}
+func (m *HorizontalPodAutoscaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Unmarshal(m, b)
+}
+func (m *HorizontalPodAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Marshal(b, m, deterministic)
+}
+func (dst *HorizontalPodAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HorizontalPodAutoscaling.Merge(dst, src)
+}
+func (m *HorizontalPodAutoscaling) XXX_Size() int {
+	return xxx_messageInfo_HorizontalPodAutoscaling.Size(m)
+}
+func (m *HorizontalPodAutoscaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_HorizontalPodAutoscaling.DiscardUnknown(m)
 }
 
-func (m *HorizontalPodAutoscaling) Reset()                    { *m = HorizontalPodAutoscaling{} }
-func (m *HorizontalPodAutoscaling) String() string            { return proto.CompactTextString(m) }
-func (*HorizontalPodAutoscaling) ProtoMessage()               {}
-func (*HorizontalPodAutoscaling) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_HorizontalPodAutoscaling proto.InternalMessageInfo
 
 func (m *HorizontalPodAutoscaling) GetDisabled() bool {
 	if m != nil {
@@ -808,13 +916,35 @@ func (m *HorizontalPodAutoscaling) GetDisabled() bool {
 // Configuration for the Kubernetes Dashboard.
 type KubernetesDashboard struct {
 	// Whether the Kubernetes Dashboard is enabled for this cluster.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *KubernetesDashboard) Reset()                    { *m = KubernetesDashboard{} }
-func (m *KubernetesDashboard) String() string            { return proto.CompactTextString(m) }
-func (*KubernetesDashboard) ProtoMessage()               {}
-func (*KubernetesDashboard) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *KubernetesDashboard) Reset()         { *m = KubernetesDashboard{} }
+func (m *KubernetesDashboard) String() string { return proto.CompactTextString(m) }
+func (*KubernetesDashboard) ProtoMessage()    {}
+func (*KubernetesDashboard) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{7}
+}
+func (m *KubernetesDashboard) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KubernetesDashboard.Unmarshal(m, b)
+}
+func (m *KubernetesDashboard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KubernetesDashboard.Marshal(b, m, deterministic)
+}
+func (dst *KubernetesDashboard) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KubernetesDashboard.Merge(dst, src)
+}
+func (m *KubernetesDashboard) XXX_Size() int {
+	return xxx_messageInfo_KubernetesDashboard.Size(m)
+}
+func (m *KubernetesDashboard) XXX_DiscardUnknown() {
+	xxx_messageInfo_KubernetesDashboard.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KubernetesDashboard proto.InternalMessageInfo
 
 func (m *KubernetesDashboard) GetDisabled() bool {
 	if m != nil {
@@ -828,13 +958,35 @@ func (m *KubernetesDashboard) GetDisabled() bool {
 // is enabled for the nodes.
 type NetworkPolicyConfig struct {
 	// Whether NetworkPolicy is enabled for this cluster.
-	Disabled bool `protobuf:"varint,1,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,1,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NetworkPolicyConfig) Reset()         { *m = NetworkPolicyConfig{} }
+func (m *NetworkPolicyConfig) String() string { return proto.CompactTextString(m) }
+func (*NetworkPolicyConfig) ProtoMessage()    {}
+func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{8}
+}
+func (m *NetworkPolicyConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NetworkPolicyConfig.Unmarshal(m, b)
+}
+func (m *NetworkPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NetworkPolicyConfig.Marshal(b, m, deterministic)
+}
+func (dst *NetworkPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicyConfig.Merge(dst, src)
+}
+func (m *NetworkPolicyConfig) XXX_Size() int {
+	return xxx_messageInfo_NetworkPolicyConfig.Size(m)
+}
+func (m *NetworkPolicyConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_NetworkPolicyConfig.DiscardUnknown(m)
 }
 
-func (m *NetworkPolicyConfig) Reset()                    { *m = NetworkPolicyConfig{} }
-func (m *NetworkPolicyConfig) String() string            { return proto.CompactTextString(m) }
-func (*NetworkPolicyConfig) ProtoMessage()               {}
-func (*NetworkPolicyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_NetworkPolicyConfig proto.InternalMessageInfo
 
 func (m *NetworkPolicyConfig) GetDisabled() bool {
 	if m != nil {
@@ -849,16 +1001,38 @@ func (m *NetworkPolicyConfig) GetDisabled() bool {
 // Google Compute Engine Public IPs and Google Prod IPs.
 type MasterAuthorizedNetworksConfig struct {
 	// Whether or not master authorized networks is enabled.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// cidr_blocks define up to 10 external networks that could access
 	// Kubernetes master through HTTPS.
-	CidrBlocks []*MasterAuthorizedNetworksConfig_CidrBlock `protobuf:"bytes,2,rep,name=cidr_blocks,json=cidrBlocks" json:"cidr_blocks,omitempty"`
+	CidrBlocks           []*MasterAuthorizedNetworksConfig_CidrBlock `protobuf:"bytes,2,rep,name=cidr_blocks,json=cidrBlocks,proto3" json:"cidr_blocks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                    `json:"-"`
+	XXX_unrecognized     []byte                                      `json:"-"`
+	XXX_sizecache        int32                                       `json:"-"`
 }
 
-func (m *MasterAuthorizedNetworksConfig) Reset()                    { *m = MasterAuthorizedNetworksConfig{} }
-func (m *MasterAuthorizedNetworksConfig) String() string            { return proto.CompactTextString(m) }
-func (*MasterAuthorizedNetworksConfig) ProtoMessage()               {}
-func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *MasterAuthorizedNetworksConfig) Reset()         { *m = MasterAuthorizedNetworksConfig{} }
+func (m *MasterAuthorizedNetworksConfig) String() string { return proto.CompactTextString(m) }
+func (*MasterAuthorizedNetworksConfig) ProtoMessage()    {}
+func (*MasterAuthorizedNetworksConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{9}
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Unmarshal(m, b)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuthorizedNetworksConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.Merge(dst, src)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_Size() int {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig.Size(m)
+}
+func (m *MasterAuthorizedNetworksConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MasterAuthorizedNetworksConfig proto.InternalMessageInfo
 
 func (m *MasterAuthorizedNetworksConfig) GetEnabled() bool {
 	if m != nil {
@@ -877,9 +1051,12 @@ func (m *MasterAuthorizedNetworksConfig) GetCidrBlocks() []*MasterAuthorizedNetw
 // CidrBlock contains an optional name and one CIDR block.
 type MasterAuthorizedNetworksConfig_CidrBlock struct {
 	// display_name is an optional field for users to identify CIDR blocks.
-	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,1,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// cidr_block must be specified in CIDR notation.
-	CidrBlock string `protobuf:"bytes,2,opt,name=cidr_block,json=cidrBlock" json:"cidr_block,omitempty"`
+	CidrBlock            string   `protobuf:"bytes,2,opt,name=cidr_block,json=cidrBlock,proto3" json:"cidr_block,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
@@ -888,9 +1065,26 @@ func (m *MasterAuthorizedNetworksConfig_CidrBlock) Reset() {
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) String() string { return proto.CompactTextString(m) }
 func (*MasterAuthorizedNetworksConfig_CidrBlock) ProtoMessage()    {}
 func (*MasterAuthorizedNetworksConfig_CidrBlock) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{9, 0}
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{9, 0}
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Unmarshal(m, b)
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Marshal(b, m, deterministic)
+}
+func (dst *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Merge(dst, src)
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_Size() int {
+	return xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.Size(m)
+}
+func (m *MasterAuthorizedNetworksConfig_CidrBlock) XXX_DiscardUnknown() {
+	xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_MasterAuthorizedNetworksConfig_CidrBlock proto.InternalMessageInfo
+
 func (m *MasterAuthorizedNetworksConfig_CidrBlock) GetDisplayName() string {
 	if m != nil {
 		return m.DisplayName
@@ -909,15 +1103,37 @@ func (m *MasterAuthorizedNetworksConfig_CidrBlock) GetCidrBlock() string {
 // https://kubernetes.io/docs/concepts/services-networking/networkpolicies/
 type NetworkPolicy struct {
 	// The selected network policy provider.
-	Provider NetworkPolicy_Provider `protobuf:"varint,1,opt,name=provider,enum=google.container.v1beta1.NetworkPolicy_Provider" json:"provider,omitempty"`
+	Provider NetworkPolicy_Provider `protobuf:"varint,1,opt,name=provider,proto3,enum=google.container.v1beta1.NetworkPolicy_Provider" json:"provider,omitempty"`
 	// Whether network policy is enabled on the cluster.
-	Enabled bool `protobuf:"varint,2,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled              bool     `protobuf:"varint,2,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NetworkPolicy) Reset()                    { *m = NetworkPolicy{} }
-func (m *NetworkPolicy) String() string            { return proto.CompactTextString(m) }
-func (*NetworkPolicy) ProtoMessage()               {}
-func (*NetworkPolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *NetworkPolicy) Reset()         { *m = NetworkPolicy{} }
+func (m *NetworkPolicy) String() string { return proto.CompactTextString(m) }
+func (*NetworkPolicy) ProtoMessage()    {}
+func (*NetworkPolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{10}
+}
+func (m *NetworkPolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NetworkPolicy.Unmarshal(m, b)
+}
+func (m *NetworkPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NetworkPolicy.Marshal(b, m, deterministic)
+}
+func (dst *NetworkPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NetworkPolicy.Merge(dst, src)
+}
+func (m *NetworkPolicy) XXX_Size() int {
+	return xxx_messageInfo_NetworkPolicy.Size(m)
+}
+func (m *NetworkPolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_NetworkPolicy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NetworkPolicy proto.InternalMessageInfo
 
 func (m *NetworkPolicy) GetProvider() NetworkPolicy_Provider {
 	if m != nil {
@@ -936,21 +1152,21 @@ func (m *NetworkPolicy) GetEnabled() bool {
 // Configuration for controlling how IPs are allocated in the cluster.
 type IPAllocationPolicy struct {
 	// Whether alias IPs will be used for pod IPs in the cluster.
-	UseIpAliases bool `protobuf:"varint,1,opt,name=use_ip_aliases,json=useIpAliases" json:"use_ip_aliases,omitempty"`
+	UseIpAliases bool `protobuf:"varint,1,opt,name=use_ip_aliases,json=useIpAliases,proto3" json:"use_ip_aliases,omitempty"`
 	// Whether a new subnetwork will be created automatically for the cluster.
 	//
 	// This field is only applicable when `use_ip_aliases` is true.
-	CreateSubnetwork bool `protobuf:"varint,2,opt,name=create_subnetwork,json=createSubnetwork" json:"create_subnetwork,omitempty"`
+	CreateSubnetwork bool `protobuf:"varint,2,opt,name=create_subnetwork,json=createSubnetwork,proto3" json:"create_subnetwork,omitempty"`
 	// A custom subnetwork name to be used if `create_subnetwork` is true.  If
 	// this field is empty, then an automatic name will be chosen for the new
 	// subnetwork.
-	SubnetworkName string `protobuf:"bytes,3,opt,name=subnetwork_name,json=subnetworkName" json:"subnetwork_name,omitempty"`
+	SubnetworkName string `protobuf:"bytes,3,opt,name=subnetwork_name,json=subnetworkName,proto3" json:"subnetwork_name,omitempty"`
 	// This field is deprecated, use cluster_ipv4_cidr_block.
-	ClusterIpv4Cidr string `protobuf:"bytes,4,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr" json:"cluster_ipv4_cidr,omitempty"`
+	ClusterIpv4Cidr string `protobuf:"bytes,4,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr,proto3" json:"cluster_ipv4_cidr,omitempty"`
 	// This field is deprecated, use node_ipv4_cidr_block.
-	NodeIpv4Cidr string `protobuf:"bytes,5,opt,name=node_ipv4_cidr,json=nodeIpv4Cidr" json:"node_ipv4_cidr,omitempty"`
+	NodeIpv4Cidr string `protobuf:"bytes,5,opt,name=node_ipv4_cidr,json=nodeIpv4Cidr,proto3" json:"node_ipv4_cidr,omitempty"`
 	// This field is deprecated, use services_ipv4_cidr_block.
-	ServicesIpv4Cidr string `protobuf:"bytes,6,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr" json:"services_ipv4_cidr,omitempty"`
+	ServicesIpv4Cidr string `protobuf:"bytes,6,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr,proto3" json:"services_ipv4_cidr,omitempty"`
 	// The name of the secondary range to be used for the cluster CIDR
 	// block.  The secondary range will be used for pod IP
 	// addresses. This must be an existing secondary range associated
@@ -958,7 +1174,7 @@ type IPAllocationPolicy struct {
 	//
 	// This field is only applicable with use_ip_aliases and
 	// create_subnetwork is false.
-	ClusterSecondaryRangeName string `protobuf:"bytes,7,opt,name=cluster_secondary_range_name,json=clusterSecondaryRangeName" json:"cluster_secondary_range_name,omitempty"`
+	ClusterSecondaryRangeName string `protobuf:"bytes,7,opt,name=cluster_secondary_range_name,json=clusterSecondaryRangeName,proto3" json:"cluster_secondary_range_name,omitempty"`
 	// The name of the secondary range to be used as for the services
 	// CIDR block.  The secondary range will be used for service
 	// ClusterIPs. This must be an existing secondary range associated
@@ -966,7 +1182,7 @@ type IPAllocationPolicy struct {
 	//
 	// This field is only applicable with use_ip_aliases and
 	// create_subnetwork is false.
-	ServicesSecondaryRangeName string `protobuf:"bytes,8,opt,name=services_secondary_range_name,json=servicesSecondaryRangeName" json:"services_secondary_range_name,omitempty"`
+	ServicesSecondaryRangeName string `protobuf:"bytes,8,opt,name=services_secondary_range_name,json=servicesSecondaryRangeName,proto3" json:"services_secondary_range_name,omitempty"`
 	// The IP address range for the cluster pod IPs. If this field is set, then
 	// `cluster.cluster_ipv4_cidr` must be left blank.
 	//
@@ -982,7 +1198,7 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	ClusterIpv4CidrBlock string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr_block,json=clusterIpv4CidrBlock" json:"cluster_ipv4_cidr_block,omitempty"`
+	ClusterIpv4CidrBlock string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr_block,json=clusterIpv4CidrBlock,proto3" json:"cluster_ipv4_cidr_block,omitempty"`
 	// The IP address range of the instance IPs in this cluster.
 	//
 	// This is applicable only if `create_subnetwork` is true.
@@ -997,7 +1213,7 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	NodeIpv4CidrBlock string `protobuf:"bytes,10,opt,name=node_ipv4_cidr_block,json=nodeIpv4CidrBlock" json:"node_ipv4_cidr_block,omitempty"`
+	NodeIpv4CidrBlock string `protobuf:"bytes,10,opt,name=node_ipv4_cidr_block,json=nodeIpv4CidrBlock,proto3" json:"node_ipv4_cidr_block,omitempty"`
 	// The IP address range of the services IPs in this cluster. If blank, a range
 	// will be automatically chosen with the default size.
 	//
@@ -1013,13 +1229,35 @@ type IPAllocationPolicy struct {
 	// notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g.
 	// `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range
 	// to use.
-	ServicesIpv4CidrBlock string `protobuf:"bytes,11,opt,name=services_ipv4_cidr_block,json=servicesIpv4CidrBlock" json:"services_ipv4_cidr_block,omitempty"`
+	ServicesIpv4CidrBlock string   `protobuf:"bytes,11,opt,name=services_ipv4_cidr_block,json=servicesIpv4CidrBlock,proto3" json:"services_ipv4_cidr_block,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *IPAllocationPolicy) Reset()         { *m = IPAllocationPolicy{} }
+func (m *IPAllocationPolicy) String() string { return proto.CompactTextString(m) }
+func (*IPAllocationPolicy) ProtoMessage()    {}
+func (*IPAllocationPolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{11}
+}
+func (m *IPAllocationPolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IPAllocationPolicy.Unmarshal(m, b)
+}
+func (m *IPAllocationPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IPAllocationPolicy.Marshal(b, m, deterministic)
+}
+func (dst *IPAllocationPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IPAllocationPolicy.Merge(dst, src)
+}
+func (m *IPAllocationPolicy) XXX_Size() int {
+	return xxx_messageInfo_IPAllocationPolicy.Size(m)
+}
+func (m *IPAllocationPolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_IPAllocationPolicy.DiscardUnknown(m)
 }
 
-func (m *IPAllocationPolicy) Reset()                    { *m = IPAllocationPolicy{} }
-func (m *IPAllocationPolicy) String() string            { return proto.CompactTextString(m) }
-func (*IPAllocationPolicy) ProtoMessage()               {}
-func (*IPAllocationPolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_IPAllocationPolicy proto.InternalMessageInfo
 
 func (m *IPAllocationPolicy) GetUseIpAliases() bool {
 	if m != nil {
@@ -1102,13 +1340,35 @@ func (m *IPAllocationPolicy) GetServicesIpv4CidrBlock() string {
 type PodSecurityPolicyConfig struct {
 	// Enable the PodSecurityPolicy controller for this cluster. If enabled, pods
 	// must be valid under a PodSecurityPolicy to be created.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled              bool     `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PodSecurityPolicyConfig) Reset()         { *m = PodSecurityPolicyConfig{} }
+func (m *PodSecurityPolicyConfig) String() string { return proto.CompactTextString(m) }
+func (*PodSecurityPolicyConfig) ProtoMessage()    {}
+func (*PodSecurityPolicyConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{12}
+}
+func (m *PodSecurityPolicyConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PodSecurityPolicyConfig.Unmarshal(m, b)
+}
+func (m *PodSecurityPolicyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PodSecurityPolicyConfig.Marshal(b, m, deterministic)
+}
+func (dst *PodSecurityPolicyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PodSecurityPolicyConfig.Merge(dst, src)
+}
+func (m *PodSecurityPolicyConfig) XXX_Size() int {
+	return xxx_messageInfo_PodSecurityPolicyConfig.Size(m)
+}
+func (m *PodSecurityPolicyConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PodSecurityPolicyConfig.DiscardUnknown(m)
 }
 
-func (m *PodSecurityPolicyConfig) Reset()                    { *m = PodSecurityPolicyConfig{} }
-func (m *PodSecurityPolicyConfig) String() string            { return proto.CompactTextString(m) }
-func (*PodSecurityPolicyConfig) ProtoMessage()               {}
-func (*PodSecurityPolicyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_PodSecurityPolicyConfig proto.InternalMessageInfo
 
 func (m *PodSecurityPolicyConfig) GetEnabled() bool {
 	if m != nil {
@@ -1125,9 +1385,9 @@ type Cluster struct {
 	// * Lowercase letters, numbers, and hyphens only.
 	// * Must start with a letter.
 	// * Must end with a number or a letter.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional description of this cluster.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// The number of nodes to create in this cluster. You must ensure that your
 	// Compute Engine <a href="/compute/docs/resource-quotas">resource quota</a>
 	// is sufficient for this number of instances. You must also have available
@@ -1136,7 +1396,7 @@ type Cluster struct {
 	// "node_pool" object, since this configuration (along with the
 	// "node_config") will be used to create a "NodePool" object with an
 	// auto-generated name. Do not use this and a node_pool at the same time.
-	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount" json:"initial_node_count,omitempty"`
+	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount,proto3" json:"initial_node_count,omitempty"`
 	// Parameters used in creating the cluster's nodes.
 	// See `nodeConfig` for the description of its properties.
 	// For requests, this field should only be used in lieu of a
@@ -1147,127 +1407,149 @@ type Cluster struct {
 	// the first node pool.
 	//
 	// If unspecified, the defaults are used.
-	NodeConfig *NodeConfig `protobuf:"bytes,4,opt,name=node_config,json=nodeConfig" json:"node_config,omitempty"`
+	NodeConfig *NodeConfig `protobuf:"bytes,4,opt,name=node_config,json=nodeConfig,proto3" json:"node_config,omitempty"`
 	// The authentication information for accessing the master endpoint.
-	MasterAuth *MasterAuth `protobuf:"bytes,5,opt,name=master_auth,json=masterAuth" json:"master_auth,omitempty"`
+	MasterAuth *MasterAuth `protobuf:"bytes,5,opt,name=master_auth,json=masterAuth,proto3" json:"master_auth,omitempty"`
 	// The logging service the cluster should use to write logs.
 	// Currently available options:
 	//
 	// * `logging.googleapis.com` - the Google Cloud Logging service.
 	// * `none` - no logs will be exported from the cluster.
 	// * if left as an empty string,`logging.googleapis.com` will be used.
-	LoggingService string `protobuf:"bytes,6,opt,name=logging_service,json=loggingService" json:"logging_service,omitempty"`
+	LoggingService string `protobuf:"bytes,6,opt,name=logging_service,json=loggingService,proto3" json:"logging_service,omitempty"`
 	// The monitoring service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * `monitoring.googleapis.com` - the Google Cloud Monitoring service.
 	// * `none` - no metrics will be exported from the cluster.
 	// * if left as an empty string, `monitoring.googleapis.com` will be used.
-	MonitoringService string `protobuf:"bytes,7,opt,name=monitoring_service,json=monitoringService" json:"monitoring_service,omitempty"`
+	MonitoringService string `protobuf:"bytes,7,opt,name=monitoring_service,json=monitoringService,proto3" json:"monitoring_service,omitempty"`
 	// The name of the Google Compute Engine
 	// [network](/compute/docs/networks-and-firewalls#networks) to which the
 	// cluster is connected. If left unspecified, the `default` network
 	// will be used.
-	Network string `protobuf:"bytes,8,opt,name=network" json:"network,omitempty"`
+	Network string `protobuf:"bytes,8,opt,name=network,proto3" json:"network,omitempty"`
 	// The IP address range of the container pods in this cluster, in
 	// [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
 	// notation (e.g. `10.96.0.0/14`). Leave blank to have
 	// one automatically chosen or specify a `/14` block in `10.0.0.0/8`.
-	ClusterIpv4Cidr string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr" json:"cluster_ipv4_cidr,omitempty"`
+	ClusterIpv4Cidr string `protobuf:"bytes,9,opt,name=cluster_ipv4_cidr,json=clusterIpv4Cidr,proto3" json:"cluster_ipv4_cidr,omitempty"`
 	// Configurations for the various addons available to run in the cluster.
-	AddonsConfig *AddonsConfig `protobuf:"bytes,10,opt,name=addons_config,json=addonsConfig" json:"addons_config,omitempty"`
+	AddonsConfig *AddonsConfig `protobuf:"bytes,10,opt,name=addons_config,json=addonsConfig,proto3" json:"addons_config,omitempty"`
 	// The name of the Google Compute Engine
 	// [subnetwork](/compute/docs/subnetworks) to which the
 	// cluster is connected.
-	Subnetwork string `protobuf:"bytes,11,opt,name=subnetwork" json:"subnetwork,omitempty"`
+	Subnetwork string `protobuf:"bytes,11,opt,name=subnetwork,proto3" json:"subnetwork,omitempty"`
 	// The node pools associated with this cluster.
 	// This field should not be set if "node_config" or "initial_node_count" are
 	// specified.
-	NodePools []*NodePool `protobuf:"bytes,12,rep,name=node_pools,json=nodePools" json:"node_pools,omitempty"`
+	NodePools []*NodePool `protobuf:"bytes,12,rep,name=node_pools,json=nodePools,proto3" json:"node_pools,omitempty"`
 	// The list of Google Compute Engine
 	// [locations](/compute/docs/zones#available) in which the cluster's nodes
 	// should be located.
-	Locations []string `protobuf:"bytes,13,rep,name=locations" json:"locations,omitempty"`
+	Locations []string `protobuf:"bytes,13,rep,name=locations,proto3" json:"locations,omitempty"`
 	// Kubernetes alpha features are enabled on this cluster. This includes alpha
 	// API groups (e.g. v1beta1) and features that may not be production ready in
 	// the kubernetes version of the master and nodes.
 	// The cluster has no SLA for uptime and master/node upgrades are disabled.
 	// Alpha enabled clusters are automatically deleted thirty days after
 	// creation.
-	EnableKubernetesAlpha bool `protobuf:"varint,14,opt,name=enable_kubernetes_alpha,json=enableKubernetesAlpha" json:"enable_kubernetes_alpha,omitempty"`
+	EnableKubernetesAlpha bool `protobuf:"varint,14,opt,name=enable_kubernetes_alpha,json=enableKubernetesAlpha,proto3" json:"enable_kubernetes_alpha,omitempty"`
 	// Configuration options for the NetworkPolicy feature.
-	NetworkPolicy *NetworkPolicy `protobuf:"bytes,19,opt,name=network_policy,json=networkPolicy" json:"network_policy,omitempty"`
+	NetworkPolicy *NetworkPolicy `protobuf:"bytes,19,opt,name=network_policy,json=networkPolicy,proto3" json:"network_policy,omitempty"`
 	// Configuration for cluster IP allocation.
-	IpAllocationPolicy *IPAllocationPolicy `protobuf:"bytes,20,opt,name=ip_allocation_policy,json=ipAllocationPolicy" json:"ip_allocation_policy,omitempty"`
+	IpAllocationPolicy *IPAllocationPolicy `protobuf:"bytes,20,opt,name=ip_allocation_policy,json=ipAllocationPolicy,proto3" json:"ip_allocation_policy,omitempty"`
 	// The configuration options for master authorized networks feature.
-	MasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,22,opt,name=master_authorized_networks_config,json=masterAuthorizedNetworksConfig" json:"master_authorized_networks_config,omitempty"`
+	MasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,22,opt,name=master_authorized_networks_config,json=masterAuthorizedNetworksConfig,proto3" json:"master_authorized_networks_config,omitempty"`
 	// Configure the maintenance policy for this cluster.
-	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,23,opt,name=maintenance_policy,json=maintenancePolicy" json:"maintenance_policy,omitempty"`
+	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,23,opt,name=maintenance_policy,json=maintenancePolicy,proto3" json:"maintenance_policy,omitempty"`
 	// Configuration for the PodSecurityPolicy feature.
-	PodSecurityPolicyConfig *PodSecurityPolicyConfig `protobuf:"bytes,25,opt,name=pod_security_policy_config,json=podSecurityPolicyConfig" json:"pod_security_policy_config,omitempty"`
+	PodSecurityPolicyConfig *PodSecurityPolicyConfig `protobuf:"bytes,25,opt,name=pod_security_policy_config,json=podSecurityPolicyConfig,proto3" json:"pod_security_policy_config,omitempty"`
 	// [Output only] Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// [Output only] The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use location instead.
-	Zone string `protobuf:"bytes,101,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,101,opt,name=zone,proto3" json:"zone,omitempty"`
 	// [Output only] The IP address of this cluster's master endpoint.
 	// The endpoint can be accessed from the internet at
 	// `https://username:password@endpoint/`.
 	//
 	// See the `masterAuth` property of this resource for username and
 	// password information.
-	Endpoint string `protobuf:"bytes,102,opt,name=endpoint" json:"endpoint,omitempty"`
+	Endpoint string `protobuf:"bytes,102,opt,name=endpoint,proto3" json:"endpoint,omitempty"`
 	// The initial Kubernetes version for this cluster.  Valid versions are those
 	// found in validMasterVersions returned by getServerConfig.  The version can
 	// be upgraded over time; such upgrades are reflected in
 	// currentMasterVersion and currentNodeVersion.
-	InitialClusterVersion string `protobuf:"bytes,103,opt,name=initial_cluster_version,json=initialClusterVersion" json:"initial_cluster_version,omitempty"`
+	InitialClusterVersion string `protobuf:"bytes,103,opt,name=initial_cluster_version,json=initialClusterVersion,proto3" json:"initial_cluster_version,omitempty"`
 	// [Output only] The current software version of the master endpoint.
-	CurrentMasterVersion string `protobuf:"bytes,104,opt,name=current_master_version,json=currentMasterVersion" json:"current_master_version,omitempty"`
+	CurrentMasterVersion string `protobuf:"bytes,104,opt,name=current_master_version,json=currentMasterVersion,proto3" json:"current_master_version,omitempty"`
 	// [Output only] The current version of the node software components.
 	// If they are currently at multiple versions because they're in the process
 	// of being upgraded, this reflects the minimum version of all nodes.
-	CurrentNodeVersion string `protobuf:"bytes,105,opt,name=current_node_version,json=currentNodeVersion" json:"current_node_version,omitempty"`
+	CurrentNodeVersion string `protobuf:"bytes,105,opt,name=current_node_version,json=currentNodeVersion,proto3" json:"current_node_version,omitempty"`
 	// [Output only] The time the cluster was created, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	CreateTime string `protobuf:"bytes,106,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime string `protobuf:"bytes,106,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// [Output only] The current status of this cluster.
-	Status Cluster_Status `protobuf:"varint,107,opt,name=status,enum=google.container.v1beta1.Cluster_Status" json:"status,omitempty"`
+	Status Cluster_Status `protobuf:"varint,107,opt,name=status,proto3,enum=google.container.v1beta1.Cluster_Status" json:"status,omitempty"`
 	// [Output only] Additional information about the current status of this
 	// cluster, if available.
-	StatusMessage string `protobuf:"bytes,108,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage string `protobuf:"bytes,108,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// [Output only] The size of the address space on each node for hosting
 	// containers. This is provisioned from within the `container_ipv4_cidr`
 	// range.
-	NodeIpv4CidrSize int32 `protobuf:"varint,109,opt,name=node_ipv4_cidr_size,json=nodeIpv4CidrSize" json:"node_ipv4_cidr_size,omitempty"`
+	NodeIpv4CidrSize int32 `protobuf:"varint,109,opt,name=node_ipv4_cidr_size,json=nodeIpv4CidrSize,proto3" json:"node_ipv4_cidr_size,omitempty"`
 	// [Output only] The IP address range of the Kubernetes services in
 	// this cluster, in
 	// [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
 	// notation (e.g. `1.2.3.4/29`). Service addresses are
 	// typically put in the last `/16` from the container CIDR.
-	ServicesIpv4Cidr string `protobuf:"bytes,110,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr" json:"services_ipv4_cidr,omitempty"`
+	ServicesIpv4Cidr string `protobuf:"bytes,110,opt,name=services_ipv4_cidr,json=servicesIpv4Cidr,proto3" json:"services_ipv4_cidr,omitempty"`
 	// [Output only] The resource URLs of [instance
 	// groups](/compute/docs/instance-groups/) associated with this
 	// cluster.
-	InstanceGroupUrls []string `protobuf:"bytes,111,rep,name=instance_group_urls,json=instanceGroupUrls" json:"instance_group_urls,omitempty"`
+	InstanceGroupUrls []string `protobuf:"bytes,111,rep,name=instance_group_urls,json=instanceGroupUrls,proto3" json:"instance_group_urls,omitempty"`
 	// [Output only] The number of nodes currently in the cluster.
-	CurrentNodeCount int32 `protobuf:"varint,112,opt,name=current_node_count,json=currentNodeCount" json:"current_node_count,omitempty"`
+	CurrentNodeCount int32 `protobuf:"varint,112,opt,name=current_node_count,json=currentNodeCount,proto3" json:"current_node_count,omitempty"`
 	// [Output only] The time the cluster will be automatically
 	// deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	ExpireTime string `protobuf:"bytes,113,opt,name=expire_time,json=expireTime" json:"expire_time,omitempty"`
+	ExpireTime string `protobuf:"bytes,113,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// [Output only] The name of the Google Compute Engine
 	// [zone](/compute/docs/regions-zones/regions-zones#available) or
 	// [region](/compute/docs/regions-zones/regions-zones#available) in which
 	// the cluster resides.
-	Location string `protobuf:"bytes,114,opt,name=location" json:"location,omitempty"`
+	Location             string   `protobuf:"bytes,114,opt,name=location,proto3" json:"location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Cluster) Reset()                    { *m = Cluster{} }
-func (m *Cluster) String() string            { return proto.CompactTextString(m) }
-func (*Cluster) ProtoMessage()               {}
-func (*Cluster) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *Cluster) Reset()         { *m = Cluster{} }
+func (m *Cluster) String() string { return proto.CompactTextString(m) }
+func (*Cluster) ProtoMessage()    {}
+func (*Cluster) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{13}
+}
+func (m *Cluster) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cluster.Unmarshal(m, b)
+}
+func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
+}
+func (dst *Cluster) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cluster.Merge(dst, src)
+}
+func (m *Cluster) XXX_Size() int {
+	return xxx_messageInfo_Cluster.Size(m)
+}
+func (m *Cluster) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cluster.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Cluster proto.InternalMessageInfo
 
 func (m *Cluster) GetName() string {
 	if m != nil {
@@ -1514,28 +1796,28 @@ type ClusterUpdate struct {
 	// The Kubernetes version to change the nodes to (typically an
 	// upgrade). Use `-` to upgrade to the latest version supported by
 	// the server.
-	DesiredNodeVersion string `protobuf:"bytes,4,opt,name=desired_node_version,json=desiredNodeVersion" json:"desired_node_version,omitempty"`
+	DesiredNodeVersion string `protobuf:"bytes,4,opt,name=desired_node_version,json=desiredNodeVersion,proto3" json:"desired_node_version,omitempty"`
 	// The monitoring service the cluster should use to write metrics.
 	// Currently available options:
 	//
 	// * "monitoring.googleapis.com" - the Google Cloud Monitoring service
 	// * "none" - no metrics will be exported from the cluster
-	DesiredMonitoringService string `protobuf:"bytes,5,opt,name=desired_monitoring_service,json=desiredMonitoringService" json:"desired_monitoring_service,omitempty"`
+	DesiredMonitoringService string `protobuf:"bytes,5,opt,name=desired_monitoring_service,json=desiredMonitoringService,proto3" json:"desired_monitoring_service,omitempty"`
 	// Configurations for the various addons available to run in the cluster.
-	DesiredAddonsConfig *AddonsConfig `protobuf:"bytes,6,opt,name=desired_addons_config,json=desiredAddonsConfig" json:"desired_addons_config,omitempty"`
+	DesiredAddonsConfig *AddonsConfig `protobuf:"bytes,6,opt,name=desired_addons_config,json=desiredAddonsConfig,proto3" json:"desired_addons_config,omitempty"`
 	// The node pool to be upgraded. This field is mandatory if
 	// "desired_node_version", "desired_image_family" or
 	// "desired_node_pool_autoscaling" is specified and there is more than one
 	// node pool on the cluster.
-	DesiredNodePoolId string `protobuf:"bytes,7,opt,name=desired_node_pool_id,json=desiredNodePoolId" json:"desired_node_pool_id,omitempty"`
+	DesiredNodePoolId string `protobuf:"bytes,7,opt,name=desired_node_pool_id,json=desiredNodePoolId,proto3" json:"desired_node_pool_id,omitempty"`
 	// The desired image type for the node pool.
 	// NOTE: Set the "desired_node_pool" field as well.
-	DesiredImageType string `protobuf:"bytes,8,opt,name=desired_image_type,json=desiredImageType" json:"desired_image_type,omitempty"`
+	DesiredImageType string `protobuf:"bytes,8,opt,name=desired_image_type,json=desiredImageType,proto3" json:"desired_image_type,omitempty"`
 	// Autoscaler configuration for the node pool specified in
 	// desired_node_pool_id. If there is only one pool in the
 	// cluster and desired_node_pool_id is not provided then
 	// the change applies to that single node pool.
-	DesiredNodePoolAutoscaling *NodePoolAutoscaling `protobuf:"bytes,9,opt,name=desired_node_pool_autoscaling,json=desiredNodePoolAutoscaling" json:"desired_node_pool_autoscaling,omitempty"`
+	DesiredNodePoolAutoscaling *NodePoolAutoscaling `protobuf:"bytes,9,opt,name=desired_node_pool_autoscaling,json=desiredNodePoolAutoscaling,proto3" json:"desired_node_pool_autoscaling,omitempty"`
 	// The desired list of Google Compute Engine
 	// [locations](/compute/docs/zones#available) in which the cluster's nodes
 	// should be located. Changing the locations a cluster is in will result
@@ -1543,21 +1825,43 @@ type ClusterUpdate struct {
 	// whether locations are being added or removed.
 	//
 	// This list must always include the cluster's primary zone.
-	DesiredLocations []string `protobuf:"bytes,10,rep,name=desired_locations,json=desiredLocations" json:"desired_locations,omitempty"`
+	DesiredLocations []string `protobuf:"bytes,10,rep,name=desired_locations,json=desiredLocations,proto3" json:"desired_locations,omitempty"`
 	// The desired configuration options for master authorized networks feature.
-	DesiredMasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,12,opt,name=desired_master_authorized_networks_config,json=desiredMasterAuthorizedNetworksConfig" json:"desired_master_authorized_networks_config,omitempty"`
+	DesiredMasterAuthorizedNetworksConfig *MasterAuthorizedNetworksConfig `protobuf:"bytes,12,opt,name=desired_master_authorized_networks_config,json=desiredMasterAuthorizedNetworksConfig,proto3" json:"desired_master_authorized_networks_config,omitempty"`
 	// The desired configuration options for the PodSecurityPolicy feature.
-	DesiredPodSecurityPolicyConfig *PodSecurityPolicyConfig `protobuf:"bytes,14,opt,name=desired_pod_security_policy_config,json=desiredPodSecurityPolicyConfig" json:"desired_pod_security_policy_config,omitempty"`
+	DesiredPodSecurityPolicyConfig *PodSecurityPolicyConfig `protobuf:"bytes,14,opt,name=desired_pod_security_policy_config,json=desiredPodSecurityPolicyConfig,proto3" json:"desired_pod_security_policy_config,omitempty"`
 	// The Kubernetes version to change the master to. The only valid value is the
 	// latest supported version. Use "-" to have the server automatically select
 	// the latest version.
-	DesiredMasterVersion string `protobuf:"bytes,100,opt,name=desired_master_version,json=desiredMasterVersion" json:"desired_master_version,omitempty"`
+	DesiredMasterVersion string   `protobuf:"bytes,100,opt,name=desired_master_version,json=desiredMasterVersion,proto3" json:"desired_master_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClusterUpdate) Reset()         { *m = ClusterUpdate{} }
+func (m *ClusterUpdate) String() string { return proto.CompactTextString(m) }
+func (*ClusterUpdate) ProtoMessage()    {}
+func (*ClusterUpdate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{14}
+}
+func (m *ClusterUpdate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClusterUpdate.Unmarshal(m, b)
+}
+func (m *ClusterUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClusterUpdate.Marshal(b, m, deterministic)
+}
+func (dst *ClusterUpdate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClusterUpdate.Merge(dst, src)
+}
+func (m *ClusterUpdate) XXX_Size() int {
+	return xxx_messageInfo_ClusterUpdate.Size(m)
+}
+func (m *ClusterUpdate) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClusterUpdate.DiscardUnknown(m)
 }
 
-func (m *ClusterUpdate) Reset()                    { *m = ClusterUpdate{} }
-func (m *ClusterUpdate) String() string            { return proto.CompactTextString(m) }
-func (*ClusterUpdate) ProtoMessage()               {}
-func (*ClusterUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_ClusterUpdate proto.InternalMessageInfo
 
 func (m *ClusterUpdate) GetDesiredNodeVersion() string {
 	if m != nil {
@@ -1633,41 +1937,63 @@ func (m *ClusterUpdate) GetDesiredMasterVersion() string {
 // happening on the cluster. All fields are output only.
 type Operation struct {
 	// The server-assigned ID for the operation.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the operation
 	// is taking place.
 	// This field is deprecated, use location instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The operation type.
-	OperationType Operation_Type `protobuf:"varint,3,opt,name=operation_type,json=operationType,enum=google.container.v1beta1.Operation_Type" json:"operation_type,omitempty"`
+	OperationType Operation_Type `protobuf:"varint,3,opt,name=operation_type,json=operationType,proto3,enum=google.container.v1beta1.Operation_Type" json:"operation_type,omitempty"`
 	// The current status of the operation.
-	Status Operation_Status `protobuf:"varint,4,opt,name=status,enum=google.container.v1beta1.Operation_Status" json:"status,omitempty"`
+	Status Operation_Status `protobuf:"varint,4,opt,name=status,proto3,enum=google.container.v1beta1.Operation_Status" json:"status,omitempty"`
 	// Detailed operation progress, if available.
-	Detail string `protobuf:"bytes,8,opt,name=detail" json:"detail,omitempty"`
+	Detail string `protobuf:"bytes,8,opt,name=detail,proto3" json:"detail,omitempty"`
 	// If an error has occurred, a textual description of the error.
-	StatusMessage string `protobuf:"bytes,5,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage string `protobuf:"bytes,5,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,6,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,6,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// Server-defined URL for the target of the operation.
-	TargetLink string `protobuf:"bytes,7,opt,name=target_link,json=targetLink" json:"target_link,omitempty"`
+	TargetLink string `protobuf:"bytes,7,opt,name=target_link,json=targetLink,proto3" json:"target_link,omitempty"`
 	// [Output only] The name of the Google Compute Engine
 	// [zone](/compute/docs/regions-zones/regions-zones#available) or
 	// [region](/compute/docs/regions-zones/regions-zones#available) in which
 	// the cluster resides.
-	Location string `protobuf:"bytes,9,opt,name=location" json:"location,omitempty"`
+	Location string `protobuf:"bytes,9,opt,name=location,proto3" json:"location,omitempty"`
 	// [Output only] The time the operation started, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	StartTime string `protobuf:"bytes,10,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime string `protobuf:"bytes,10,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// [Output only] The time the operation completed, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	EndTime string `protobuf:"bytes,11,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              string   `protobuf:"bytes,11,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Operation) Reset()         { *m = Operation{} }
+func (m *Operation) String() string { return proto.CompactTextString(m) }
+func (*Operation) ProtoMessage()    {}
+func (*Operation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{15}
+}
+func (m *Operation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Operation.Unmarshal(m, b)
+}
+func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
+}
+func (dst *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(dst, src)
+}
+func (m *Operation) XXX_Size() int {
+	return xxx_messageInfo_Operation.Size(m)
+}
+func (m *Operation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Operation.DiscardUnknown(m)
 }
 
-func (m *Operation) Reset()                    { *m = Operation{} }
-func (m *Operation) String() string            { return proto.CompactTextString(m) }
-func (*Operation) ProtoMessage()               {}
-func (*Operation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_Operation proto.InternalMessageInfo
 
 func (m *Operation) GetName() string {
 	if m != nil {
@@ -1751,24 +2077,46 @@ type CreateClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// A [cluster
 	// resource](/container-engine/reference/rest/v1beta1/projects.zones.clusters)
-	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster" json:"cluster,omitempty"`
+	Cluster *Cluster `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`
 	// The parent (project and location) where the cluster will be created.
 	// Specified in the format 'projects/*/locations/*'.
-	Parent string `protobuf:"bytes,5,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateClusterRequest) Reset()                    { *m = CreateClusterRequest{} }
-func (m *CreateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateClusterRequest) ProtoMessage()               {}
-func (*CreateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *CreateClusterRequest) Reset()         { *m = CreateClusterRequest{} }
+func (m *CreateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateClusterRequest) ProtoMessage()    {}
+func (*CreateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{16}
+}
+func (m *CreateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateClusterRequest.Unmarshal(m, b)
+}
+func (m *CreateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateClusterRequest.Merge(dst, src)
+}
+func (m *CreateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateClusterRequest.Size(m)
+}
+func (m *CreateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateClusterRequest proto.InternalMessageInfo
 
 func (m *CreateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1803,24 +2151,46 @@ type GetClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to retrieve.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name (project, location, cluster) of the cluster to retrieve.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetClusterRequest) Reset()         { *m = GetClusterRequest{} }
+func (m *GetClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*GetClusterRequest) ProtoMessage()    {}
+func (*GetClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{17}
+}
+func (m *GetClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetClusterRequest.Unmarshal(m, b)
+}
+func (m *GetClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetClusterRequest.Merge(dst, src)
+}
+func (m *GetClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_GetClusterRequest.Size(m)
+}
+func (m *GetClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetClusterRequest.DiscardUnknown(m)
 }
 
-func (m *GetClusterRequest) Reset()                    { *m = GetClusterRequest{} }
-func (m *GetClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetClusterRequest) ProtoMessage()               {}
-func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+var xxx_messageInfo_GetClusterRequest proto.InternalMessageInfo
 
 func (m *GetClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1855,26 +2225,48 @@ type UpdateClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// A description of the update.
-	Update *ClusterUpdate `protobuf:"bytes,4,opt,name=update" json:"update,omitempty"`
+	Update *ClusterUpdate `protobuf:"bytes,4,opt,name=update,proto3" json:"update,omitempty"`
 	// The name (project, location, cluster) of the cluster to update.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UpdateClusterRequest) Reset()                    { *m = UpdateClusterRequest{} }
-func (m *UpdateClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateClusterRequest) ProtoMessage()               {}
-func (*UpdateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *UpdateClusterRequest) Reset()         { *m = UpdateClusterRequest{} }
+func (m *UpdateClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateClusterRequest) ProtoMessage()    {}
+func (*UpdateClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{18}
+}
+func (m *UpdateClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateClusterRequest.Unmarshal(m, b)
+}
+func (m *UpdateClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateClusterRequest.Merge(dst, src)
+}
+func (m *UpdateClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateClusterRequest.Size(m)
+}
+func (m *UpdateClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateClusterRequest proto.InternalMessageInfo
 
 func (m *UpdateClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -1916,28 +2308,50 @@ type SetMasterAuthRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to upgrade.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The exact form of action to be taken on the master auth.
-	Action SetMasterAuthRequest_Action `protobuf:"varint,4,opt,name=action,enum=google.container.v1beta1.SetMasterAuthRequest_Action" json:"action,omitempty"`
+	Action SetMasterAuthRequest_Action `protobuf:"varint,4,opt,name=action,proto3,enum=google.container.v1beta1.SetMasterAuthRequest_Action" json:"action,omitempty"`
 	// A description of the update.
-	Update *MasterAuth `protobuf:"bytes,5,opt,name=update" json:"update,omitempty"`
+	Update *MasterAuth `protobuf:"bytes,5,opt,name=update,proto3" json:"update,omitempty"`
 	// The name (project, location, cluster) of the cluster to set auth.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetMasterAuthRequest) Reset()                    { *m = SetMasterAuthRequest{} }
-func (m *SetMasterAuthRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetMasterAuthRequest) ProtoMessage()               {}
-func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+func (m *SetMasterAuthRequest) Reset()         { *m = SetMasterAuthRequest{} }
+func (m *SetMasterAuthRequest) String() string { return proto.CompactTextString(m) }
+func (*SetMasterAuthRequest) ProtoMessage()    {}
+func (*SetMasterAuthRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{19}
+}
+func (m *SetMasterAuthRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetMasterAuthRequest.Unmarshal(m, b)
+}
+func (m *SetMasterAuthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetMasterAuthRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetMasterAuthRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMasterAuthRequest.Merge(dst, src)
+}
+func (m *SetMasterAuthRequest) XXX_Size() int {
+	return xxx_messageInfo_SetMasterAuthRequest.Size(m)
+}
+func (m *SetMasterAuthRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetMasterAuthRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetMasterAuthRequest proto.InternalMessageInfo
 
 func (m *SetMasterAuthRequest) GetProjectId() string {
 	if m != nil {
@@ -1986,24 +2400,46 @@ type DeleteClusterRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to delete.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name (project, location, cluster) of the cluster to delete.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteClusterRequest) Reset()                    { *m = DeleteClusterRequest{} }
-func (m *DeleteClusterRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteClusterRequest) ProtoMessage()               {}
-func (*DeleteClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *DeleteClusterRequest) Reset()         { *m = DeleteClusterRequest{} }
+func (m *DeleteClusterRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteClusterRequest) ProtoMessage()    {}
+func (*DeleteClusterRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{20}
+}
+func (m *DeleteClusterRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteClusterRequest.Unmarshal(m, b)
+}
+func (m *DeleteClusterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteClusterRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteClusterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteClusterRequest.Merge(dst, src)
+}
+func (m *DeleteClusterRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteClusterRequest.Size(m)
+}
+func (m *DeleteClusterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteClusterRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteClusterRequest proto.InternalMessageInfo
 
 func (m *DeleteClusterRequest) GetProjectId() string {
 	if m != nil {
@@ -2038,22 +2474,44 @@ type ListClustersRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides, or "-" for all zones.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The parent (project and location) where the clusters will be listed.
 	// Specified in the format 'projects/*/locations/*'.
 	// Location "-" matches all zones and all regions.
-	Parent string `protobuf:"bytes,4,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListClustersRequest) Reset()         { *m = ListClustersRequest{} }
+func (m *ListClustersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListClustersRequest) ProtoMessage()    {}
+func (*ListClustersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{21}
+}
+func (m *ListClustersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersRequest.Unmarshal(m, b)
+}
+func (m *ListClustersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersRequest.Merge(dst, src)
+}
+func (m *ListClustersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListClustersRequest.Size(m)
+}
+func (m *ListClustersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersRequest.DiscardUnknown(m)
 }
 
-func (m *ListClustersRequest) Reset()                    { *m = ListClustersRequest{} }
-func (m *ListClustersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersRequest) ProtoMessage()               {}
-func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+var xxx_messageInfo_ListClustersRequest proto.InternalMessageInfo
 
 func (m *ListClustersRequest) GetProjectId() string {
 	if m != nil {
@@ -2080,16 +2538,38 @@ func (m *ListClustersRequest) GetParent() string {
 type ListClustersResponse struct {
 	// A list of clusters in the project in the specified zone, or
 	// across all ones.
-	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters" json:"clusters,omitempty"`
+	Clusters []*Cluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	// If any zones are listed here, the list of clusters returned
 	// may be missing those zones.
-	MissingZones []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones" json:"missing_zones,omitempty"`
+	MissingZones         []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones,proto3" json:"missing_zones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListClustersResponse) Reset()         { *m = ListClustersResponse{} }
+func (m *ListClustersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListClustersResponse) ProtoMessage()    {}
+func (*ListClustersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{22}
+}
+func (m *ListClustersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListClustersResponse.Unmarshal(m, b)
+}
+func (m *ListClustersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListClustersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListClustersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListClustersResponse.Merge(dst, src)
+}
+func (m *ListClustersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListClustersResponse.Size(m)
+}
+func (m *ListClustersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListClustersResponse.DiscardUnknown(m)
 }
 
-func (m *ListClustersResponse) Reset()                    { *m = ListClustersResponse{} }
-func (m *ListClustersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListClustersResponse) ProtoMessage()               {}
-func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+var xxx_messageInfo_ListClustersResponse proto.InternalMessageInfo
 
 func (m *ListClustersResponse) GetClusters() []*Cluster {
 	if m != nil {
@@ -2110,24 +2590,46 @@ type GetOperationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The server-assigned `name` of the operation.
 	// This field is deprecated, use name instead.
-	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// The name (project, location, operation id) of the operation to get.
 	// Specified in the format 'projects/*/locations/*/operations/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetOperationRequest) Reset()                    { *m = GetOperationRequest{} }
-func (m *GetOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetOperationRequest) ProtoMessage()               {}
-func (*GetOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+func (m *GetOperationRequest) Reset()         { *m = GetOperationRequest{} }
+func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetOperationRequest) ProtoMessage()    {}
+func (*GetOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{23}
+}
+func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b)
+}
+func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperationRequest.Merge(dst, src)
+}
+func (m *GetOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetOperationRequest.Size(m)
+}
+func (m *GetOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetOperationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetOperationRequest proto.InternalMessageInfo
 
 func (m *GetOperationRequest) GetProjectId() string {
 	if m != nil {
@@ -2162,21 +2664,43 @@ type ListOperationsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine [zone](/compute/docs/zones#available)
 	// to return operations for, or `-` for all zones.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The parent (project and location) where the operations will be listed.
 	// Specified in the format 'projects/*/locations/*'.
 	// Location "-" matches all zones and all regions.
-	Parent string `protobuf:"bytes,4,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListOperationsRequest) Reset()                    { *m = ListOperationsRequest{} }
-func (m *ListOperationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListOperationsRequest) ProtoMessage()               {}
-func (*ListOperationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
+func (m *ListOperationsRequest) Reset()         { *m = ListOperationsRequest{} }
+func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListOperationsRequest) ProtoMessage()    {}
+func (*ListOperationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{24}
+}
+func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b)
+}
+func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsRequest.Merge(dst, src)
+}
+func (m *ListOperationsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListOperationsRequest.Size(m)
+}
+func (m *ListOperationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOperationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListOperationsRequest proto.InternalMessageInfo
 
 func (m *ListOperationsRequest) GetProjectId() string {
 	if m != nil {
@@ -2204,23 +2728,45 @@ type CancelOperationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the operation resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The server-assigned `name` of the operation.
 	// This field is deprecated, use name instead.
-	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
 	// The name (project, location, operation id) of the operation to cancel.
 	// Specified in the format 'projects/*/locations/*/operations/*'.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CancelOperationRequest) Reset()         { *m = CancelOperationRequest{} }
+func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelOperationRequest) ProtoMessage()    {}
+func (*CancelOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{25}
+}
+func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b)
+}
+func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelOperationRequest.Merge(dst, src)
+}
+func (m *CancelOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelOperationRequest.Size(m)
+}
+func (m *CancelOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelOperationRequest.DiscardUnknown(m)
 }
 
-func (m *CancelOperationRequest) Reset()                    { *m = CancelOperationRequest{} }
-func (m *CancelOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelOperationRequest) ProtoMessage()               {}
-func (*CancelOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
+var xxx_messageInfo_CancelOperationRequest proto.InternalMessageInfo
 
 func (m *CancelOperationRequest) GetProjectId() string {
 	if m != nil {
@@ -2253,16 +2799,38 @@ func (m *CancelOperationRequest) GetName() string {
 // ListOperationsResponse is the result of ListOperationsRequest.
 type ListOperationsResponse struct {
 	// A list of operations in the project in the specified zone.
-	Operations []*Operation `protobuf:"bytes,1,rep,name=operations" json:"operations,omitempty"`
+	Operations []*Operation `protobuf:"bytes,1,rep,name=operations,proto3" json:"operations,omitempty"`
 	// If any zones are listed here, the list of operations returned
 	// may be missing the operations from those zones.
-	MissingZones []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones" json:"missing_zones,omitempty"`
+	MissingZones         []string `protobuf:"bytes,2,rep,name=missing_zones,json=missingZones,proto3" json:"missing_zones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListOperationsResponse) Reset()                    { *m = ListOperationsResponse{} }
-func (m *ListOperationsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListOperationsResponse) ProtoMessage()               {}
-func (*ListOperationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
+func (m *ListOperationsResponse) Reset()         { *m = ListOperationsResponse{} }
+func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListOperationsResponse) ProtoMessage()    {}
+func (*ListOperationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{26}
+}
+func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b)
+}
+func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsResponse.Merge(dst, src)
+}
+func (m *ListOperationsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListOperationsResponse.Size(m)
+}
+func (m *ListOperationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOperationsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListOperationsResponse proto.InternalMessageInfo
 
 func (m *ListOperationsResponse) GetOperations() []*Operation {
 	if m != nil {
@@ -2283,20 +2851,42 @@ type GetServerConfigRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine [zone](/compute/docs/zones#available)
 	// to return operations for.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name (project and location) of the server config to get
 	// Specified in the format 'projects/*/locations/*'.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServerConfigRequest) Reset()         { *m = GetServerConfigRequest{} }
+func (m *GetServerConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServerConfigRequest) ProtoMessage()    {}
+func (*GetServerConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{27}
+}
+func (m *GetServerConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServerConfigRequest.Unmarshal(m, b)
+}
+func (m *GetServerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServerConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServerConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServerConfigRequest.Merge(dst, src)
+}
+func (m *GetServerConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServerConfigRequest.Size(m)
+}
+func (m *GetServerConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServerConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetServerConfigRequest) Reset()                    { *m = GetServerConfigRequest{} }
-func (m *GetServerConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServerConfigRequest) ProtoMessage()               {}
-func (*GetServerConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
+var xxx_messageInfo_GetServerConfigRequest proto.InternalMessageInfo
 
 func (m *GetServerConfigRequest) GetProjectId() string {
 	if m != nil {
@@ -2322,21 +2912,43 @@ func (m *GetServerConfigRequest) GetName() string {
 // Container Engine service configuration.
 type ServerConfig struct {
 	// Version of Kubernetes the service deploys by default.
-	DefaultClusterVersion string `protobuf:"bytes,1,opt,name=default_cluster_version,json=defaultClusterVersion" json:"default_cluster_version,omitempty"`
+	DefaultClusterVersion string `protobuf:"bytes,1,opt,name=default_cluster_version,json=defaultClusterVersion,proto3" json:"default_cluster_version,omitempty"`
 	// List of valid node upgrade target versions.
-	ValidNodeVersions []string `protobuf:"bytes,3,rep,name=valid_node_versions,json=validNodeVersions" json:"valid_node_versions,omitempty"`
+	ValidNodeVersions []string `protobuf:"bytes,3,rep,name=valid_node_versions,json=validNodeVersions,proto3" json:"valid_node_versions,omitempty"`
 	// Default image type.
-	DefaultImageType string `protobuf:"bytes,4,opt,name=default_image_type,json=defaultImageType" json:"default_image_type,omitempty"`
+	DefaultImageType string `protobuf:"bytes,4,opt,name=default_image_type,json=defaultImageType,proto3" json:"default_image_type,omitempty"`
 	// List of valid image types.
-	ValidImageTypes []string `protobuf:"bytes,5,rep,name=valid_image_types,json=validImageTypes" json:"valid_image_types,omitempty"`
+	ValidImageTypes []string `protobuf:"bytes,5,rep,name=valid_image_types,json=validImageTypes,proto3" json:"valid_image_types,omitempty"`
 	// List of valid master versions.
-	ValidMasterVersions []string `protobuf:"bytes,6,rep,name=valid_master_versions,json=validMasterVersions" json:"valid_master_versions,omitempty"`
+	ValidMasterVersions  []string `protobuf:"bytes,6,rep,name=valid_master_versions,json=validMasterVersions,proto3" json:"valid_master_versions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
+func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
+func (*ServerConfig) ProtoMessage()    {}
+func (*ServerConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{28}
+}
+func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
+}
+func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
+}
+func (dst *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(dst, src)
+}
+func (m *ServerConfig) XXX_Size() int {
+	return xxx_messageInfo_ServerConfig.Size(m)
+}
+func (m *ServerConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerConfig.DiscardUnknown(m)
 }
 
-func (m *ServerConfig) Reset()                    { *m = ServerConfig{} }
-func (m *ServerConfig) String() string            { return proto.CompactTextString(m) }
-func (*ServerConfig) ProtoMessage()               {}
-func (*ServerConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
+var xxx_messageInfo_ServerConfig proto.InternalMessageInfo
 
 func (m *ServerConfig) GetDefaultClusterVersion() string {
 	if m != nil {
@@ -2378,26 +2990,48 @@ type CreateNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use parent instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The node pool to create.
-	NodePool *NodePool `protobuf:"bytes,4,opt,name=node_pool,json=nodePool" json:"node_pool,omitempty"`
+	NodePool *NodePool `protobuf:"bytes,4,opt,name=node_pool,json=nodePool,proto3" json:"node_pool,omitempty"`
 	// The parent (project, location, cluster id) where the node pool will be created.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Parent string `protobuf:"bytes,6,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,6,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateNodePoolRequest) Reset()                    { *m = CreateNodePoolRequest{} }
-func (m *CreateNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateNodePoolRequest) ProtoMessage()               {}
-func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
+func (m *CreateNodePoolRequest) Reset()         { *m = CreateNodePoolRequest{} }
+func (m *CreateNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateNodePoolRequest) ProtoMessage()    {}
+func (*CreateNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{29}
+}
+func (m *CreateNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateNodePoolRequest.Unmarshal(m, b)
+}
+func (m *CreateNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNodePoolRequest.Merge(dst, src)
+}
+func (m *CreateNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateNodePoolRequest.Size(m)
+}
+func (m *CreateNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateNodePoolRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateNodePoolRequest proto.InternalMessageInfo
 
 func (m *CreateNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2439,27 +3073,49 @@ type DeleteNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to delete.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node pool to delete.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteNodePoolRequest) Reset()                    { *m = DeleteNodePoolRequest{} }
-func (m *DeleteNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteNodePoolRequest) ProtoMessage()               {}
-func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
+func (m *DeleteNodePoolRequest) Reset()         { *m = DeleteNodePoolRequest{} }
+func (m *DeleteNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteNodePoolRequest) ProtoMessage()    {}
+func (*DeleteNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{30}
+}
+func (m *DeleteNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteNodePoolRequest.Unmarshal(m, b)
+}
+func (m *DeleteNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNodePoolRequest.Merge(dst, src)
+}
+func (m *DeleteNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteNodePoolRequest.Size(m)
+}
+func (m *DeleteNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteNodePoolRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteNodePoolRequest proto.InternalMessageInfo
 
 func (m *DeleteNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2501,24 +3157,46 @@ type ListNodePoolsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use parent instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use parent instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use parent instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The parent (project, location, cluster id) where the node pools will be listed.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Parent string `protobuf:"bytes,5,opt,name=parent" json:"parent,omitempty"`
+	Parent               string   `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListNodePoolsRequest) Reset()         { *m = ListNodePoolsRequest{} }
+func (m *ListNodePoolsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListNodePoolsRequest) ProtoMessage()    {}
+func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{31}
+}
+func (m *ListNodePoolsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNodePoolsRequest.Unmarshal(m, b)
+}
+func (m *ListNodePoolsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNodePoolsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListNodePoolsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsRequest.Merge(dst, src)
+}
+func (m *ListNodePoolsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListNodePoolsRequest.Size(m)
+}
+func (m *ListNodePoolsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNodePoolsRequest.DiscardUnknown(m)
 }
 
-func (m *ListNodePoolsRequest) Reset()                    { *m = ListNodePoolsRequest{} }
-func (m *ListNodePoolsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListNodePoolsRequest) ProtoMessage()               {}
-func (*ListNodePoolsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
+var xxx_messageInfo_ListNodePoolsRequest proto.InternalMessageInfo
 
 func (m *ListNodePoolsRequest) GetProjectId() string {
 	if m != nil {
@@ -2553,27 +3231,49 @@ type GetNodePoolRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node pool to get.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetNodePoolRequest) Reset()                    { *m = GetNodePoolRequest{} }
-func (m *GetNodePoolRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetNodePoolRequest) ProtoMessage()               {}
-func (*GetNodePoolRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
+func (m *GetNodePoolRequest) Reset()         { *m = GetNodePoolRequest{} }
+func (m *GetNodePoolRequest) String() string { return proto.CompactTextString(m) }
+func (*GetNodePoolRequest) ProtoMessage()    {}
+func (*GetNodePoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{32}
+}
+func (m *GetNodePoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetNodePoolRequest.Unmarshal(m, b)
+}
+func (m *GetNodePoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetNodePoolRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetNodePoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNodePoolRequest.Merge(dst, src)
+}
+func (m *GetNodePoolRequest) XXX_Size() int {
+	return xxx_messageInfo_GetNodePoolRequest.Size(m)
+}
+func (m *GetNodePoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetNodePoolRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetNodePoolRequest proto.InternalMessageInfo
 
 func (m *GetNodePoolRequest) GetProjectId() string {
 	if m != nil {
@@ -2618,38 +3318,60 @@ func (m *GetNodePoolRequest) GetName() string {
 // the workload.
 type NodePool struct {
 	// The name of the node pool.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The node configuration of the pool.
-	Config *NodeConfig `protobuf:"bytes,2,opt,name=config" json:"config,omitempty"`
+	Config *NodeConfig `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 	// The initial node count for the pool. You must ensure that your
 	// Compute Engine <a href="/compute/docs/resource-quotas">resource quota</a>
 	// is sufficient for this number of instances. You must also have available
 	// firewall and routes quota.
-	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount" json:"initial_node_count,omitempty"`
+	InitialNodeCount int32 `protobuf:"varint,3,opt,name=initial_node_count,json=initialNodeCount,proto3" json:"initial_node_count,omitempty"`
 	// [Output only] Server-defined URL for the resource.
-	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink" json:"self_link,omitempty"`
+	SelfLink string `protobuf:"bytes,100,opt,name=self_link,json=selfLink,proto3" json:"self_link,omitempty"`
 	// [Output only] The version of the Kubernetes of this node.
-	Version string `protobuf:"bytes,101,opt,name=version" json:"version,omitempty"`
+	Version string `protobuf:"bytes,101,opt,name=version,proto3" json:"version,omitempty"`
 	// [Output only] The resource URLs of [instance
 	// groups](/compute/docs/instance-groups/) associated with this
 	// node pool.
-	InstanceGroupUrls []string `protobuf:"bytes,102,rep,name=instance_group_urls,json=instanceGroupUrls" json:"instance_group_urls,omitempty"`
+	InstanceGroupUrls []string `protobuf:"bytes,102,rep,name=instance_group_urls,json=instanceGroupUrls,proto3" json:"instance_group_urls,omitempty"`
 	// [Output only] The status of the nodes in this pool instance.
-	Status NodePool_Status `protobuf:"varint,103,opt,name=status,enum=google.container.v1beta1.NodePool_Status" json:"status,omitempty"`
+	Status NodePool_Status `protobuf:"varint,103,opt,name=status,proto3,enum=google.container.v1beta1.NodePool_Status" json:"status,omitempty"`
 	// [Output only] Additional information about the current status of this
 	// node pool instance, if available.
-	StatusMessage string `protobuf:"bytes,104,opt,name=status_message,json=statusMessage" json:"status_message,omitempty"`
+	StatusMessage string `protobuf:"bytes,104,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// Autoscaler configuration for this NodePool. Autoscaler is enabled
 	// only if a valid configuration is present.
-	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,4,opt,name=autoscaling" json:"autoscaling,omitempty"`
+	Autoscaling *NodePoolAutoscaling `protobuf:"bytes,4,opt,name=autoscaling,proto3" json:"autoscaling,omitempty"`
 	// NodeManagement configuration for this NodePool.
-	Management *NodeManagement `protobuf:"bytes,5,opt,name=management" json:"management,omitempty"`
+	Management           *NodeManagement `protobuf:"bytes,5,opt,name=management,proto3" json:"management,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *NodePool) Reset()                    { *m = NodePool{} }
-func (m *NodePool) String() string            { return proto.CompactTextString(m) }
-func (*NodePool) ProtoMessage()               {}
-func (*NodePool) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} }
+func (m *NodePool) Reset()         { *m = NodePool{} }
+func (m *NodePool) String() string { return proto.CompactTextString(m) }
+func (*NodePool) ProtoMessage()    {}
+func (*NodePool) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{33}
+}
+func (m *NodePool) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodePool.Unmarshal(m, b)
+}
+func (m *NodePool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodePool.Marshal(b, m, deterministic)
+}
+func (dst *NodePool) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePool.Merge(dst, src)
+}
+func (m *NodePool) XXX_Size() int {
+	return xxx_messageInfo_NodePool.Size(m)
+}
+func (m *NodePool) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodePool.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodePool proto.InternalMessageInfo
 
 func (m *NodePool) GetName() string {
 	if m != nil {
@@ -2725,17 +3447,39 @@ func (m *NodePool) GetManagement() *NodeManagement {
 // node pool.
 type NodeManagement struct {
 	// Whether the nodes will be automatically upgraded.
-	AutoUpgrade bool `protobuf:"varint,1,opt,name=auto_upgrade,json=autoUpgrade" json:"auto_upgrade,omitempty"`
+	AutoUpgrade bool `protobuf:"varint,1,opt,name=auto_upgrade,json=autoUpgrade,proto3" json:"auto_upgrade,omitempty"`
 	// Whether the nodes will be automatically repaired.
-	AutoRepair bool `protobuf:"varint,2,opt,name=auto_repair,json=autoRepair" json:"auto_repair,omitempty"`
+	AutoRepair bool `protobuf:"varint,2,opt,name=auto_repair,json=autoRepair,proto3" json:"auto_repair,omitempty"`
 	// Specifies the Auto Upgrade knobs for the node pool.
-	UpgradeOptions *AutoUpgradeOptions `protobuf:"bytes,10,opt,name=upgrade_options,json=upgradeOptions" json:"upgrade_options,omitempty"`
+	UpgradeOptions       *AutoUpgradeOptions `protobuf:"bytes,10,opt,name=upgrade_options,json=upgradeOptions,proto3" json:"upgrade_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *NodeManagement) Reset()         { *m = NodeManagement{} }
+func (m *NodeManagement) String() string { return proto.CompactTextString(m) }
+func (*NodeManagement) ProtoMessage()    {}
+func (*NodeManagement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{34}
+}
+func (m *NodeManagement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodeManagement.Unmarshal(m, b)
+}
+func (m *NodeManagement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodeManagement.Marshal(b, m, deterministic)
+}
+func (dst *NodeManagement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodeManagement.Merge(dst, src)
+}
+func (m *NodeManagement) XXX_Size() int {
+	return xxx_messageInfo_NodeManagement.Size(m)
+}
+func (m *NodeManagement) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodeManagement.DiscardUnknown(m)
 }
 
-func (m *NodeManagement) Reset()                    { *m = NodeManagement{} }
-func (m *NodeManagement) String() string            { return proto.CompactTextString(m) }
-func (*NodeManagement) ProtoMessage()               {}
-func (*NodeManagement) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} }
+var xxx_messageInfo_NodeManagement proto.InternalMessageInfo
 
 func (m *NodeManagement) GetAutoUpgrade() bool {
 	if m != nil {
@@ -2764,16 +3508,38 @@ type AutoUpgradeOptions struct {
 	// [Output only] This field is set when upgrades are about to commence
 	// with the approximate start time for the upgrades, in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	AutoUpgradeStartTime string `protobuf:"bytes,1,opt,name=auto_upgrade_start_time,json=autoUpgradeStartTime" json:"auto_upgrade_start_time,omitempty"`
+	AutoUpgradeStartTime string `protobuf:"bytes,1,opt,name=auto_upgrade_start_time,json=autoUpgradeStartTime,proto3" json:"auto_upgrade_start_time,omitempty"`
 	// [Output only] This field is set when upgrades are about to commence
 	// with the description of the upgrade.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AutoUpgradeOptions) Reset()         { *m = AutoUpgradeOptions{} }
+func (m *AutoUpgradeOptions) String() string { return proto.CompactTextString(m) }
+func (*AutoUpgradeOptions) ProtoMessage()    {}
+func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{35}
+}
+func (m *AutoUpgradeOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AutoUpgradeOptions.Unmarshal(m, b)
+}
+func (m *AutoUpgradeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AutoUpgradeOptions.Marshal(b, m, deterministic)
+}
+func (dst *AutoUpgradeOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AutoUpgradeOptions.Merge(dst, src)
+}
+func (m *AutoUpgradeOptions) XXX_Size() int {
+	return xxx_messageInfo_AutoUpgradeOptions.Size(m)
+}
+func (m *AutoUpgradeOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_AutoUpgradeOptions.DiscardUnknown(m)
 }
 
-func (m *AutoUpgradeOptions) Reset()                    { *m = AutoUpgradeOptions{} }
-func (m *AutoUpgradeOptions) String() string            { return proto.CompactTextString(m) }
-func (*AutoUpgradeOptions) ProtoMessage()               {}
-func (*AutoUpgradeOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} }
+var xxx_messageInfo_AutoUpgradeOptions proto.InternalMessageInfo
 
 func (m *AutoUpgradeOptions) GetAutoUpgradeStartTime() string {
 	if m != nil {
@@ -2792,13 +3558,35 @@ func (m *AutoUpgradeOptions) GetDescription() string {
 // MaintenancePolicy defines the maintenance policy to be used for the cluster.
 type MaintenancePolicy struct {
 	// Specifies the maintenance window in which maintenance may be performed.
-	Window *MaintenanceWindow `protobuf:"bytes,1,opt,name=window" json:"window,omitempty"`
+	Window               *MaintenanceWindow `protobuf:"bytes,1,opt,name=window,proto3" json:"window,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *MaintenancePolicy) Reset()                    { *m = MaintenancePolicy{} }
-func (m *MaintenancePolicy) String() string            { return proto.CompactTextString(m) }
-func (*MaintenancePolicy) ProtoMessage()               {}
-func (*MaintenancePolicy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} }
+func (m *MaintenancePolicy) Reset()         { *m = MaintenancePolicy{} }
+func (m *MaintenancePolicy) String() string { return proto.CompactTextString(m) }
+func (*MaintenancePolicy) ProtoMessage()    {}
+func (*MaintenancePolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{36}
+}
+func (m *MaintenancePolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MaintenancePolicy.Unmarshal(m, b)
+}
+func (m *MaintenancePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MaintenancePolicy.Marshal(b, m, deterministic)
+}
+func (dst *MaintenancePolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenancePolicy.Merge(dst, src)
+}
+func (m *MaintenancePolicy) XXX_Size() int {
+	return xxx_messageInfo_MaintenancePolicy.Size(m)
+}
+func (m *MaintenancePolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaintenancePolicy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MaintenancePolicy proto.InternalMessageInfo
 
 func (m *MaintenancePolicy) GetWindow() *MaintenanceWindow {
 	if m != nil {
@@ -2814,20 +3602,42 @@ type MaintenanceWindow struct {
 	//
 	// Types that are valid to be assigned to Policy:
 	//	*MaintenanceWindow_DailyMaintenanceWindow
-	Policy isMaintenanceWindow_Policy `protobuf_oneof:"policy"`
+	Policy               isMaintenanceWindow_Policy `protobuf_oneof:"policy"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
-func (m *MaintenanceWindow) Reset()                    { *m = MaintenanceWindow{} }
-func (m *MaintenanceWindow) String() string            { return proto.CompactTextString(m) }
-func (*MaintenanceWindow) ProtoMessage()               {}
-func (*MaintenanceWindow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} }
+func (m *MaintenanceWindow) Reset()         { *m = MaintenanceWindow{} }
+func (m *MaintenanceWindow) String() string { return proto.CompactTextString(m) }
+func (*MaintenanceWindow) ProtoMessage()    {}
+func (*MaintenanceWindow) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{37}
+}
+func (m *MaintenanceWindow) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MaintenanceWindow.Unmarshal(m, b)
+}
+func (m *MaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MaintenanceWindow.Marshal(b, m, deterministic)
+}
+func (dst *MaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaintenanceWindow.Merge(dst, src)
+}
+func (m *MaintenanceWindow) XXX_Size() int {
+	return xxx_messageInfo_MaintenanceWindow.Size(m)
+}
+func (m *MaintenanceWindow) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaintenanceWindow.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MaintenanceWindow proto.InternalMessageInfo
 
 type isMaintenanceWindow_Policy interface {
 	isMaintenanceWindow_Policy()
 }
 
 type MaintenanceWindow_DailyMaintenanceWindow struct {
-	DailyMaintenanceWindow *DailyMaintenanceWindow `protobuf:"bytes,2,opt,name=daily_maintenance_window,json=dailyMaintenanceWindow,oneof"`
+	DailyMaintenanceWindow *DailyMaintenanceWindow `protobuf:"bytes,2,opt,name=daily_maintenance_window,json=dailyMaintenanceWindow,proto3,oneof"`
 }
 
 func (*MaintenanceWindow_DailyMaintenanceWindow) isMaintenanceWindow_Policy() {}
@@ -2891,7 +3701,7 @@ func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Policy.(type) {
 	case *MaintenanceWindow_DailyMaintenanceWindow:
 		s := proto.Size(x.DailyMaintenanceWindow)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -2905,16 +3715,38 @@ func _MaintenanceWindow_OneofSizer(msg proto.Message) (n int) {
 type DailyMaintenanceWindow struct {
 	// Time within the maintenance window to start the maintenance operations.
 	// It must be in format "HH:MM”, where HH : [00-23] and MM : [00-59] GMT.
-	StartTime string `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime string `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// [Output only] Duration of the time window, automatically chosen to be
 	// smallest possible in the given scenario.
-	Duration string `protobuf:"bytes,3,opt,name=duration" json:"duration,omitempty"`
+	Duration             string   `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DailyMaintenanceWindow) Reset()         { *m = DailyMaintenanceWindow{} }
+func (m *DailyMaintenanceWindow) String() string { return proto.CompactTextString(m) }
+func (*DailyMaintenanceWindow) ProtoMessage()    {}
+func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{38}
+}
+func (m *DailyMaintenanceWindow) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DailyMaintenanceWindow.Unmarshal(m, b)
+}
+func (m *DailyMaintenanceWindow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DailyMaintenanceWindow.Marshal(b, m, deterministic)
+}
+func (dst *DailyMaintenanceWindow) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DailyMaintenanceWindow.Merge(dst, src)
+}
+func (m *DailyMaintenanceWindow) XXX_Size() int {
+	return xxx_messageInfo_DailyMaintenanceWindow.Size(m)
+}
+func (m *DailyMaintenanceWindow) XXX_DiscardUnknown() {
+	xxx_messageInfo_DailyMaintenanceWindow.DiscardUnknown(m)
 }
 
-func (m *DailyMaintenanceWindow) Reset()                    { *m = DailyMaintenanceWindow{} }
-func (m *DailyMaintenanceWindow) String() string            { return proto.CompactTextString(m) }
-func (*DailyMaintenanceWindow) ProtoMessage()               {}
-func (*DailyMaintenanceWindow) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} }
+var xxx_messageInfo_DailyMaintenanceWindow proto.InternalMessageInfo
 
 func (m *DailyMaintenanceWindow) GetStartTime() string {
 	if m != nil {
@@ -2936,30 +3768,52 @@ type SetNodePoolManagementRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to update.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// NodeManagement configuration for the node pool.
-	Management *NodeManagement `protobuf:"bytes,5,opt,name=management" json:"management,omitempty"`
+	Management *NodeManagement `protobuf:"bytes,5,opt,name=management,proto3" json:"management,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node pool to set
 	// management properties. Specified in the format
 	// 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetNodePoolManagementRequest) Reset()                    { *m = SetNodePoolManagementRequest{} }
-func (m *SetNodePoolManagementRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNodePoolManagementRequest) ProtoMessage()               {}
-func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} }
+func (m *SetNodePoolManagementRequest) Reset()         { *m = SetNodePoolManagementRequest{} }
+func (m *SetNodePoolManagementRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNodePoolManagementRequest) ProtoMessage()    {}
+func (*SetNodePoolManagementRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{39}
+}
+func (m *SetNodePoolManagementRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Unmarshal(m, b)
+}
+func (m *SetNodePoolManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNodePoolManagementRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNodePoolManagementRequest.Merge(dst, src)
+}
+func (m *SetNodePoolManagementRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNodePoolManagementRequest.Size(m)
+}
+func (m *SetNodePoolManagementRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNodePoolManagementRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetNodePoolManagementRequest proto.InternalMessageInfo
 
 func (m *SetNodePoolManagementRequest) GetProjectId() string {
 	if m != nil {
@@ -3010,28 +3864,50 @@ type RollbackNodePoolUpgradeRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to rollback.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name of the node pool to rollback.
 	// This field is deprecated, use name instead.
-	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId" json:"node_pool_id,omitempty"`
+	NodePoolId string `protobuf:"bytes,4,opt,name=node_pool_id,json=nodePoolId,proto3" json:"node_pool_id,omitempty"`
 	// The name (project, location, cluster, node pool id) of the node poll to
 	// rollback upgrade.
 	// Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RollbackNodePoolUpgradeRequest) Reset()         { *m = RollbackNodePoolUpgradeRequest{} }
+func (m *RollbackNodePoolUpgradeRequest) String() string { return proto.CompactTextString(m) }
+func (*RollbackNodePoolUpgradeRequest) ProtoMessage()    {}
+func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{40}
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Unmarshal(m, b)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Marshal(b, m, deterministic)
+}
+func (dst *RollbackNodePoolUpgradeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.Merge(dst, src)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_Size() int {
+	return xxx_messageInfo_RollbackNodePoolUpgradeRequest.Size(m)
+}
+func (m *RollbackNodePoolUpgradeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackNodePoolUpgradeRequest.DiscardUnknown(m)
 }
 
-func (m *RollbackNodePoolUpgradeRequest) Reset()                    { *m = RollbackNodePoolUpgradeRequest{} }
-func (m *RollbackNodePoolUpgradeRequest) String() string            { return proto.CompactTextString(m) }
-func (*RollbackNodePoolUpgradeRequest) ProtoMessage()               {}
-func (*RollbackNodePoolUpgradeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} }
+var xxx_messageInfo_RollbackNodePoolUpgradeRequest proto.InternalMessageInfo
 
 func (m *RollbackNodePoolUpgradeRequest) GetProjectId() string {
 	if m != nil {
@@ -3071,13 +3947,35 @@ func (m *RollbackNodePoolUpgradeRequest) GetName() string {
 // ListNodePoolsResponse is the result of ListNodePoolsRequest.
 type ListNodePoolsResponse struct {
 	// A list of node pools for a cluster.
-	NodePools []*NodePool `protobuf:"bytes,1,rep,name=node_pools,json=nodePools" json:"node_pools,omitempty"`
+	NodePools            []*NodePool `protobuf:"bytes,1,rep,name=node_pools,json=nodePools,proto3" json:"node_pools,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *ListNodePoolsResponse) Reset()                    { *m = ListNodePoolsResponse{} }
-func (m *ListNodePoolsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListNodePoolsResponse) ProtoMessage()               {}
-func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} }
+func (m *ListNodePoolsResponse) Reset()         { *m = ListNodePoolsResponse{} }
+func (m *ListNodePoolsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListNodePoolsResponse) ProtoMessage()    {}
+func (*ListNodePoolsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{41}
+}
+func (m *ListNodePoolsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNodePoolsResponse.Unmarshal(m, b)
+}
+func (m *ListNodePoolsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNodePoolsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListNodePoolsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNodePoolsResponse.Merge(dst, src)
+}
+func (m *ListNodePoolsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListNodePoolsResponse.Size(m)
+}
+func (m *ListNodePoolsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNodePoolsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNodePoolsResponse proto.InternalMessageInfo
 
 func (m *ListNodePoolsResponse) GetNodePools() []*NodePool {
 	if m != nil {
@@ -3090,19 +3988,41 @@ func (m *ListNodePoolsResponse) GetNodePools() []*NodePool {
 // adjust the size of the node pool to the current cluster usage.
 type NodePoolAutoscaling struct {
 	// Is autoscaling enabled for this node pool.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// Minimum number of nodes in the NodePool. Must be >= 1 and <=
 	// max_node_count.
-	MinNodeCount int32 `protobuf:"varint,2,opt,name=min_node_count,json=minNodeCount" json:"min_node_count,omitempty"`
+	MinNodeCount int32 `protobuf:"varint,2,opt,name=min_node_count,json=minNodeCount,proto3" json:"min_node_count,omitempty"`
 	// Maximum number of nodes in the NodePool. Must be >= min_node_count. There
 	// has to enough quota to scale up the cluster.
-	MaxNodeCount int32 `protobuf:"varint,3,opt,name=max_node_count,json=maxNodeCount" json:"max_node_count,omitempty"`
+	MaxNodeCount         int32    `protobuf:"varint,3,opt,name=max_node_count,json=maxNodeCount,proto3" json:"max_node_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *NodePoolAutoscaling) Reset()                    { *m = NodePoolAutoscaling{} }
-func (m *NodePoolAutoscaling) String() string            { return proto.CompactTextString(m) }
-func (*NodePoolAutoscaling) ProtoMessage()               {}
-func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{42} }
+func (m *NodePoolAutoscaling) Reset()         { *m = NodePoolAutoscaling{} }
+func (m *NodePoolAutoscaling) String() string { return proto.CompactTextString(m) }
+func (*NodePoolAutoscaling) ProtoMessage()    {}
+func (*NodePoolAutoscaling) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{42}
+}
+func (m *NodePoolAutoscaling) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NodePoolAutoscaling.Unmarshal(m, b)
+}
+func (m *NodePoolAutoscaling) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NodePoolAutoscaling.Marshal(b, m, deterministic)
+}
+func (dst *NodePoolAutoscaling) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NodePoolAutoscaling.Merge(dst, src)
+}
+func (m *NodePoolAutoscaling) XXX_Size() int {
+	return xxx_messageInfo_NodePoolAutoscaling.Size(m)
+}
+func (m *NodePoolAutoscaling) XXX_DiscardUnknown() {
+	xxx_messageInfo_NodePoolAutoscaling.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NodePoolAutoscaling proto.InternalMessageInfo
 
 func (m *NodePoolAutoscaling) GetEnabled() bool {
 	if m != nil {
@@ -3132,33 +4052,55 @@ type SetLabelsRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The labels to set for that cluster.
-	ResourceLabels map[string]string `protobuf:"bytes,4,rep,name=resource_labels,json=resourceLabels" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ResourceLabels map[string]string `protobuf:"bytes,4,rep,name=resource_labels,json=resourceLabels,proto3" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The fingerprint of the previous set of labels for this resource,
 	// used to detect conflicts. The fingerprint is initially generated by
 	// Container Engine and changes after every request to modify or update
 	// labels. You must always provide an up-to-date fingerprint hash when
 	// updating or changing labels. Make a <code>get()</code> request to the
 	// resource to get the latest fingerprint.
-	LabelFingerprint string `protobuf:"bytes,5,opt,name=label_fingerprint,json=labelFingerprint" json:"label_fingerprint,omitempty"`
+	LabelFingerprint string `protobuf:"bytes,5,opt,name=label_fingerprint,json=labelFingerprint,proto3" json:"label_fingerprint,omitempty"`
 	// The name (project, location, cluster id) of the cluster to set labels.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLabelsRequest) Reset()                    { *m = SetLabelsRequest{} }
-func (m *SetLabelsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLabelsRequest) ProtoMessage()               {}
-func (*SetLabelsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{43} }
+func (m *SetLabelsRequest) Reset()         { *m = SetLabelsRequest{} }
+func (m *SetLabelsRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLabelsRequest) ProtoMessage()    {}
+func (*SetLabelsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{43}
+}
+func (m *SetLabelsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLabelsRequest.Unmarshal(m, b)
+}
+func (m *SetLabelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLabelsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLabelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLabelsRequest.Merge(dst, src)
+}
+func (m *SetLabelsRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLabelsRequest.Size(m)
+}
+func (m *SetLabelsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLabelsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLabelsRequest proto.InternalMessageInfo
 
 func (m *SetLabelsRequest) GetProjectId() string {
 	if m != nil {
@@ -3208,26 +4150,48 @@ type SetLegacyAbacRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// Whether ABAC authorization will be enabled in the cluster.
-	Enabled bool `protobuf:"varint,4,opt,name=enabled" json:"enabled,omitempty"`
+	Enabled bool `protobuf:"varint,4,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// The name (project, location, cluster id) of the cluster to set legacy abac.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetLegacyAbacRequest) Reset()                    { *m = SetLegacyAbacRequest{} }
-func (m *SetLegacyAbacRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetLegacyAbacRequest) ProtoMessage()               {}
-func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{44} }
+func (m *SetLegacyAbacRequest) Reset()         { *m = SetLegacyAbacRequest{} }
+func (m *SetLegacyAbacRequest) String() string { return proto.CompactTextString(m) }
+func (*SetLegacyAbacRequest) ProtoMessage()    {}
+func (*SetLegacyAbacRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{44}
+}
+func (m *SetLegacyAbacRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetLegacyAbacRequest.Unmarshal(m, b)
+}
+func (m *SetLegacyAbacRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetLegacyAbacRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetLegacyAbacRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetLegacyAbacRequest.Merge(dst, src)
+}
+func (m *SetLegacyAbacRequest) XXX_Size() int {
+	return xxx_messageInfo_SetLegacyAbacRequest.Size(m)
+}
+func (m *SetLegacyAbacRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetLegacyAbacRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetLegacyAbacRequest proto.InternalMessageInfo
 
 func (m *SetLegacyAbacRequest) GetProjectId() string {
 	if m != nil {
@@ -3270,24 +4234,46 @@ type StartIPRotationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name (project, location, cluster id) of the cluster to start IP rotation.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StartIPRotationRequest) Reset()         { *m = StartIPRotationRequest{} }
+func (m *StartIPRotationRequest) String() string { return proto.CompactTextString(m) }
+func (*StartIPRotationRequest) ProtoMessage()    {}
+func (*StartIPRotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{45}
+}
+func (m *StartIPRotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StartIPRotationRequest.Unmarshal(m, b)
+}
+func (m *StartIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StartIPRotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *StartIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartIPRotationRequest.Merge(dst, src)
+}
+func (m *StartIPRotationRequest) XXX_Size() int {
+	return xxx_messageInfo_StartIPRotationRequest.Size(m)
+}
+func (m *StartIPRotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StartIPRotationRequest.DiscardUnknown(m)
 }
 
-func (m *StartIPRotationRequest) Reset()                    { *m = StartIPRotationRequest{} }
-func (m *StartIPRotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*StartIPRotationRequest) ProtoMessage()               {}
-func (*StartIPRotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{45} }
+var xxx_messageInfo_StartIPRotationRequest proto.InternalMessageInfo
 
 func (m *StartIPRotationRequest) GetProjectId() string {
 	if m != nil {
@@ -3322,24 +4308,46 @@ type CompleteIPRotationRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The name (project, location, cluster id) of the cluster to complete IP rotation.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CompleteIPRotationRequest) Reset()                    { *m = CompleteIPRotationRequest{} }
-func (m *CompleteIPRotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CompleteIPRotationRequest) ProtoMessage()               {}
-func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46} }
+func (m *CompleteIPRotationRequest) Reset()         { *m = CompleteIPRotationRequest{} }
+func (m *CompleteIPRotationRequest) String() string { return proto.CompactTextString(m) }
+func (*CompleteIPRotationRequest) ProtoMessage()    {}
+func (*CompleteIPRotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{46}
+}
+func (m *CompleteIPRotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CompleteIPRotationRequest.Unmarshal(m, b)
+}
+func (m *CompleteIPRotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CompleteIPRotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CompleteIPRotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompleteIPRotationRequest.Merge(dst, src)
+}
+func (m *CompleteIPRotationRequest) XXX_Size() int {
+	return xxx_messageInfo_CompleteIPRotationRequest.Size(m)
+}
+func (m *CompleteIPRotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CompleteIPRotationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CompleteIPRotationRequest proto.InternalMessageInfo
 
 func (m *CompleteIPRotationRequest) GetProjectId() string {
 	if m != nil {
@@ -3372,16 +4380,38 @@ func (m *CompleteIPRotationRequest) GetName() string {
 // AcceleratorConfig represents a Hardware Accelerator request.
 type AcceleratorConfig struct {
 	// The number of the accelerator cards exposed to an instance.
-	AcceleratorCount int64 `protobuf:"varint,1,opt,name=accelerator_count,json=acceleratorCount" json:"accelerator_count,omitempty"`
+	AcceleratorCount int64 `protobuf:"varint,1,opt,name=accelerator_count,json=acceleratorCount,proto3" json:"accelerator_count,omitempty"`
 	// The accelerator type resource name. List of supported accelerators
 	// [here](/compute/docs/gpus/#Introduction)
-	AcceleratorType string `protobuf:"bytes,2,opt,name=accelerator_type,json=acceleratorType" json:"accelerator_type,omitempty"`
+	AcceleratorType      string   `protobuf:"bytes,2,opt,name=accelerator_type,json=acceleratorType,proto3" json:"accelerator_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AcceleratorConfig) Reset()                    { *m = AcceleratorConfig{} }
-func (m *AcceleratorConfig) String() string            { return proto.CompactTextString(m) }
-func (*AcceleratorConfig) ProtoMessage()               {}
-func (*AcceleratorConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{47} }
+func (m *AcceleratorConfig) Reset()         { *m = AcceleratorConfig{} }
+func (m *AcceleratorConfig) String() string { return proto.CompactTextString(m) }
+func (*AcceleratorConfig) ProtoMessage()    {}
+func (*AcceleratorConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{47}
+}
+func (m *AcceleratorConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AcceleratorConfig.Unmarshal(m, b)
+}
+func (m *AcceleratorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AcceleratorConfig.Marshal(b, m, deterministic)
+}
+func (dst *AcceleratorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcceleratorConfig.Merge(dst, src)
+}
+func (m *AcceleratorConfig) XXX_Size() int {
+	return xxx_messageInfo_AcceleratorConfig.Size(m)
+}
+func (m *AcceleratorConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_AcceleratorConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AcceleratorConfig proto.InternalMessageInfo
 
 func (m *AcceleratorConfig) GetAcceleratorCount() int64 {
 	if m != nil {
@@ -3402,26 +4432,48 @@ type SetNetworkPolicyRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://developers.google.com/console/help/new/#projectnumber).
 	// This field is deprecated, use name instead.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
 	// This field is deprecated, use name instead.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster.
 	// This field is deprecated, use name instead.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// Configuration options for the NetworkPolicy feature.
-	NetworkPolicy *NetworkPolicy `protobuf:"bytes,4,opt,name=network_policy,json=networkPolicy" json:"network_policy,omitempty"`
+	NetworkPolicy *NetworkPolicy `protobuf:"bytes,4,opt,name=network_policy,json=networkPolicy,proto3" json:"network_policy,omitempty"`
 	// The name (project, location, cluster id) of the cluster to set networking policy.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,6,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetNetworkPolicyRequest) Reset()                    { *m = SetNetworkPolicyRequest{} }
-func (m *SetNetworkPolicyRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetNetworkPolicyRequest) ProtoMessage()               {}
-func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{48} }
+func (m *SetNetworkPolicyRequest) Reset()         { *m = SetNetworkPolicyRequest{} }
+func (m *SetNetworkPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*SetNetworkPolicyRequest) ProtoMessage()    {}
+func (*SetNetworkPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{48}
+}
+func (m *SetNetworkPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Unmarshal(m, b)
+}
+func (m *SetNetworkPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetNetworkPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetNetworkPolicyRequest.Merge(dst, src)
+}
+func (m *SetNetworkPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_SetNetworkPolicyRequest.Size(m)
+}
+func (m *SetNetworkPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetNetworkPolicyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetNetworkPolicyRequest proto.InternalMessageInfo
 
 func (m *SetNetworkPolicyRequest) GetProjectId() string {
 	if m != nil {
@@ -3462,26 +4514,48 @@ func (m *SetNetworkPolicyRequest) GetName() string {
 type SetMaintenancePolicyRequest struct {
 	// The Google Developers Console [project ID or project
 	// number](https://support.google.com/cloud/answer/6158840).
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the Google Compute Engine
 	// [zone](/compute/docs/zones#available) in which the cluster
 	// resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The name of the cluster to update.
-	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId" json:"cluster_id,omitempty"`
+	ClusterId string `protobuf:"bytes,3,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
 	// The maintenance policy to be set for the cluster. An empty field
 	// clears the existing maintenance policy.
-	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,4,opt,name=maintenance_policy,json=maintenancePolicy" json:"maintenance_policy,omitempty"`
+	MaintenancePolicy *MaintenancePolicy `protobuf:"bytes,4,opt,name=maintenance_policy,json=maintenancePolicy,proto3" json:"maintenance_policy,omitempty"`
 	// The name (project, location, cluster id) of the cluster to set maintenance
 	// policy.
 	// Specified in the format 'projects/*/locations/*/clusters/*'.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SetMaintenancePolicyRequest) Reset()         { *m = SetMaintenancePolicyRequest{} }
+func (m *SetMaintenancePolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*SetMaintenancePolicyRequest) ProtoMessage()    {}
+func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cluster_service_8f6af64c98801cf8, []int{49}
+}
+func (m *SetMaintenancePolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Unmarshal(m, b)
+}
+func (m *SetMaintenancePolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetMaintenancePolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetMaintenancePolicyRequest.Merge(dst, src)
+}
+func (m *SetMaintenancePolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_SetMaintenancePolicyRequest.Size(m)
+}
+func (m *SetMaintenancePolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetMaintenancePolicyRequest.DiscardUnknown(m)
 }
 
-func (m *SetMaintenancePolicyRequest) Reset()                    { *m = SetMaintenancePolicyRequest{} }
-func (m *SetMaintenancePolicyRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetMaintenancePolicyRequest) ProtoMessage()               {}
-func (*SetMaintenancePolicyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{49} }
+var xxx_messageInfo_SetMaintenancePolicyRequest proto.InternalMessageInfo
 
 func (m *SetMaintenancePolicyRequest) GetProjectId() string {
 	if m != nil {
@@ -3520,6 +4594,8 @@ func (m *SetMaintenancePolicyRequest) GetName() string {
 
 func init() {
 	proto.RegisterType((*NodeConfig)(nil), "google.container.v1beta1.NodeConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1beta1.NodeConfig.LabelsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1beta1.NodeConfig.MetadataEntry")
 	proto.RegisterType((*NodeTaint)(nil), "google.container.v1beta1.NodeTaint")
 	proto.RegisterType((*MasterAuth)(nil), "google.container.v1beta1.MasterAuth")
 	proto.RegisterType((*ClientCertificateConfig)(nil), "google.container.v1beta1.ClientCertificateConfig")
@@ -3564,6 +4640,7 @@ func init() {
 	proto.RegisterType((*ListNodePoolsResponse)(nil), "google.container.v1beta1.ListNodePoolsResponse")
 	proto.RegisterType((*NodePoolAutoscaling)(nil), "google.container.v1beta1.NodePoolAutoscaling")
 	proto.RegisterType((*SetLabelsRequest)(nil), "google.container.v1beta1.SetLabelsRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.container.v1beta1.SetLabelsRequest.ResourceLabelsEntry")
 	proto.RegisterType((*SetLegacyAbacRequest)(nil), "google.container.v1beta1.SetLegacyAbacRequest")
 	proto.RegisterType((*StartIPRotationRequest)(nil), "google.container.v1beta1.StartIPRotationRequest")
 	proto.RegisterType((*CompleteIPRotationRequest)(nil), "google.container.v1beta1.CompleteIPRotationRequest")
@@ -3587,8 +4664,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ClusterManager service
-
+// ClusterManagerClient is the client API for ClusterManager service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ClusterManagerClient interface {
 	// Lists all clusters owned by a project in either the specified zone or all
 	// zones.
@@ -3631,7 +4709,7 @@ type ClusterManagerClient interface {
 	// Gets the specified operation.
 	GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error)
 	// Cancels the specified operation.
-	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Returns configuration info about the Container Engine service.
 	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
 	// Lists the node pools for a cluster.
@@ -3671,7 +4749,7 @@ func NewClusterManagerClient(cc *grpc.ClientConn) ClusterManagerClient {
 
 func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListClustersRequest, opts ...grpc.CallOption) (*ListClustersResponse, error) {
 	out := new(ListClustersResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListClusters", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListClusters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3680,7 +4758,7 @@ func (c *clusterManagerClient) ListClusters(ctx context.Context, in *ListCluster
 
 func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterRequest, opts ...grpc.CallOption) (*Cluster, error) {
 	out := new(Cluster)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3689,7 +4767,7 @@ func (c *clusterManagerClient) GetCluster(ctx context.Context, in *GetClusterReq
 
 func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CreateCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CreateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3698,7 +4776,7 @@ func (c *clusterManagerClient) CreateCluster(ctx context.Context, in *CreateClus
 
 func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/UpdateCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/UpdateCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3707,7 +4785,7 @@ func (c *clusterManagerClient) UpdateCluster(ctx context.Context, in *UpdateClus
 
 func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterAuthRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMasterAuth", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMasterAuth", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3716,7 +4794,7 @@ func (c *clusterManagerClient) SetMasterAuth(ctx context.Context, in *SetMasterA
 
 func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClusterRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/DeleteCluster", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/DeleteCluster", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3725,7 +4803,7 @@ func (c *clusterManagerClient) DeleteCluster(ctx context.Context, in *DeleteClus
 
 func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
 	out := new(ListOperationsResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListOperations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListOperations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3734,16 +4812,16 @@ func (c *clusterManagerClient) ListOperations(ctx context.Context, in *ListOpera
 
 func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetOperation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CancelOperation", in, out, c.cc, opts...)
+func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CancelOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3752,7 +4830,7 @@ func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOp
 
 func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error) {
 	out := new(ServerConfig)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetServerConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetServerConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3761,7 +4839,7 @@ func (c *clusterManagerClient) GetServerConfig(ctx context.Context, in *GetServe
 
 func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePoolsRequest, opts ...grpc.CallOption) (*ListNodePoolsResponse, error) {
 	out := new(ListNodePoolsResponse)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListNodePools", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/ListNodePools", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3770,7 +4848,7 @@ func (c *clusterManagerClient) ListNodePools(ctx context.Context, in *ListNodePo
 
 func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolRequest, opts ...grpc.CallOption) (*NodePool, error) {
 	out := new(NodePool)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/GetNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3779,7 +4857,7 @@ func (c *clusterManagerClient) GetNodePool(ctx context.Context, in *GetNodePoolR
 
 func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CreateNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CreateNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3788,7 +4866,7 @@ func (c *clusterManagerClient) CreateNodePool(ctx context.Context, in *CreateNod
 
 func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/DeleteNodePool", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/DeleteNodePool", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3797,7 +4875,7 @@ func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNod
 
 func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3806,7 +4884,7 @@ func (c *clusterManagerClient) RollbackNodePoolUpgrade(ctx context.Context, in *
 
 func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *SetNodePoolManagementRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNodePoolManagement", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNodePoolManagement", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3815,7 +4893,7 @@ func (c *clusterManagerClient) SetNodePoolManagement(ctx context.Context, in *Se
 
 func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLabels", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLabels", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3824,7 +4902,7 @@ func (c *clusterManagerClient) SetLabels(ctx context.Context, in *SetLabelsReque
 
 func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyAbacRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLegacyAbac", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetLegacyAbac", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3833,7 +4911,7 @@ func (c *clusterManagerClient) SetLegacyAbac(ctx context.Context, in *SetLegacyA
 
 func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/StartIPRotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/StartIPRotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3842,7 +4920,7 @@ func (c *clusterManagerClient) StartIPRotation(ctx context.Context, in *StartIPR
 
 func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *CompleteIPRotationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CompleteIPRotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/CompleteIPRotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3851,7 +4929,7 @@ func (c *clusterManagerClient) CompleteIPRotation(ctx context.Context, in *Compl
 
 func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetworkPolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNetworkPolicy", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetNetworkPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3860,15 +4938,14 @@ func (c *clusterManagerClient) SetNetworkPolicy(ctx context.Context, in *SetNetw
 
 func (c *clusterManagerClient) SetMaintenancePolicy(ctx context.Context, in *SetMaintenancePolicyRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMaintenancePolicy", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.container.v1beta1.ClusterManager/SetMaintenancePolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ClusterManager service
-
+// ClusterManagerServer is the server API for ClusterManager service.
 type ClusterManagerServer interface {
 	// Lists all clusters owned by a project in either the specified zone or all
 	// zones.
@@ -3911,7 +4988,7 @@ type ClusterManagerServer interface {
 	// Gets the specified operation.
 	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
 	// Cancels the specified operation.
-	CancelOperation(context.Context, *CancelOperationRequest) (*google_protobuf1.Empty, error)
+	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
 	// Returns configuration info about the Container Engine service.
 	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
 	// Lists the node pools for a cluster.
@@ -4438,9 +5515,11 @@ var _ClusterManager_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/container/v1beta1/cluster_service.proto",
 }
 
-func init() { proto.RegisterFile("google/container/v1beta1/cluster_service.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/container/v1beta1/cluster_service.proto", fileDescriptor_cluster_service_8f6af64c98801cf8)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_cluster_service_8f6af64c98801cf8 = []byte{
 	// 4381 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x7c, 0x5b, 0x6c, 0xe3, 0x56,
 	0x7a, 0xf0, 0xd2, 0x17, 0xd9, 0xfa, 0x24, 0xcb, 0xf2, 0xf1, 0x4d, 0x51, 0x26, 0x93, 0x09, 0x93,
diff --git a/vendor/google.golang.org/genproto/googleapis/datastore/admin/v1/datastore_admin.pb.go b/vendor/google.golang.org/genproto/googleapis/datastore/admin/v1/datastore_admin.pb.go
new file mode 100644
index 00000000..9086651d
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/datastore/admin/v1/datastore_admin.pb.go
@@ -0,0 +1,897 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/datastore/admin/v1/datastore_admin.proto
+
+package admin // import "google.golang.org/genproto/googleapis/datastore/admin/v1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Operation types.
+type OperationType int32
+
+const (
+	// Unspecified.
+	OperationType_OPERATION_TYPE_UNSPECIFIED OperationType = 0
+	// ExportEntities.
+	OperationType_EXPORT_ENTITIES OperationType = 1
+	// ImportEntities.
+	OperationType_IMPORT_ENTITIES OperationType = 2
+)
+
+var OperationType_name = map[int32]string{
+	0: "OPERATION_TYPE_UNSPECIFIED",
+	1: "EXPORT_ENTITIES",
+	2: "IMPORT_ENTITIES",
+}
+var OperationType_value = map[string]int32{
+	"OPERATION_TYPE_UNSPECIFIED": 0,
+	"EXPORT_ENTITIES":            1,
+	"IMPORT_ENTITIES":            2,
+}
+
+func (x OperationType) String() string {
+	return proto.EnumName(OperationType_name, int32(x))
+}
+func (OperationType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{0}
+}
+
+// The various possible states for an ongoing Operation.
+type CommonMetadata_State int32
+
+const (
+	// Unspecified.
+	CommonMetadata_STATE_UNSPECIFIED CommonMetadata_State = 0
+	// Request is being prepared for processing.
+	CommonMetadata_INITIALIZING CommonMetadata_State = 1
+	// Request is actively being processed.
+	CommonMetadata_PROCESSING CommonMetadata_State = 2
+	// Request is in the process of being cancelled after user called
+	// google.longrunning.Operations.CancelOperation on the operation.
+	CommonMetadata_CANCELLING CommonMetadata_State = 3
+	// Request has been processed and is in its finalization stage.
+	CommonMetadata_FINALIZING CommonMetadata_State = 4
+	// Request has completed successfully.
+	CommonMetadata_SUCCESSFUL CommonMetadata_State = 5
+	// Request has finished being processed, but encountered an error.
+	CommonMetadata_FAILED CommonMetadata_State = 6
+	// Request has finished being cancelled after user called
+	// google.longrunning.Operations.CancelOperation.
+	CommonMetadata_CANCELLED CommonMetadata_State = 7
+)
+
+var CommonMetadata_State_name = map[int32]string{
+	0: "STATE_UNSPECIFIED",
+	1: "INITIALIZING",
+	2: "PROCESSING",
+	3: "CANCELLING",
+	4: "FINALIZING",
+	5: "SUCCESSFUL",
+	6: "FAILED",
+	7: "CANCELLED",
+}
+var CommonMetadata_State_value = map[string]int32{
+	"STATE_UNSPECIFIED": 0,
+	"INITIALIZING":      1,
+	"PROCESSING":        2,
+	"CANCELLING":        3,
+	"FINALIZING":        4,
+	"SUCCESSFUL":        5,
+	"FAILED":            6,
+	"CANCELLED":         7,
+}
+
+func (x CommonMetadata_State) String() string {
+	return proto.EnumName(CommonMetadata_State_name, int32(x))
+}
+func (CommonMetadata_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{0, 0}
+}
+
+// Metadata common to all Datastore Admin operations.
+type CommonMetadata struct {
+	// The time that work began on the operation.
+	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// The time the operation ended, either successfully or otherwise.
+	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	// The type of the operation. Can be used as a filter in
+	// ListOperationsRequest.
+	OperationType OperationType `protobuf:"varint,3,opt,name=operation_type,json=operationType,proto3,enum=google.datastore.admin.v1.OperationType" json:"operation_type,omitempty"`
+	// The client-assigned labels which were provided when the operation was
+	// created. May also include additional labels.
+	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// The current state of the Operation.
+	State                CommonMetadata_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.datastore.admin.v1.CommonMetadata_State" json:"state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *CommonMetadata) Reset()         { *m = CommonMetadata{} }
+func (m *CommonMetadata) String() string { return proto.CompactTextString(m) }
+func (*CommonMetadata) ProtoMessage()    {}
+func (*CommonMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{0}
+}
+func (m *CommonMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommonMetadata.Unmarshal(m, b)
+}
+func (m *CommonMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommonMetadata.Marshal(b, m, deterministic)
+}
+func (dst *CommonMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommonMetadata.Merge(dst, src)
+}
+func (m *CommonMetadata) XXX_Size() int {
+	return xxx_messageInfo_CommonMetadata.Size(m)
+}
+func (m *CommonMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommonMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommonMetadata proto.InternalMessageInfo
+
+func (m *CommonMetadata) GetStartTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.StartTime
+	}
+	return nil
+}
+
+func (m *CommonMetadata) GetEndTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.EndTime
+	}
+	return nil
+}
+
+func (m *CommonMetadata) GetOperationType() OperationType {
+	if m != nil {
+		return m.OperationType
+	}
+	return OperationType_OPERATION_TYPE_UNSPECIFIED
+}
+
+func (m *CommonMetadata) GetLabels() map[string]string {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+func (m *CommonMetadata) GetState() CommonMetadata_State {
+	if m != nil {
+		return m.State
+	}
+	return CommonMetadata_STATE_UNSPECIFIED
+}
+
+// Measures the progress of a particular metric.
+type Progress struct {
+	// The amount of work that has been completed. Note that this may be greater
+	// than work_estimated.
+	WorkCompleted int64 `protobuf:"varint,1,opt,name=work_completed,json=workCompleted,proto3" json:"work_completed,omitempty"`
+	// An estimate of how much work needs to be performed. May be zero if the
+	// work estimate is unavailable.
+	WorkEstimated        int64    `protobuf:"varint,2,opt,name=work_estimated,json=workEstimated,proto3" json:"work_estimated,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Progress) Reset()         { *m = Progress{} }
+func (m *Progress) String() string { return proto.CompactTextString(m) }
+func (*Progress) ProtoMessage()    {}
+func (*Progress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{1}
+}
+func (m *Progress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Progress.Unmarshal(m, b)
+}
+func (m *Progress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Progress.Marshal(b, m, deterministic)
+}
+func (dst *Progress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Progress.Merge(dst, src)
+}
+func (m *Progress) XXX_Size() int {
+	return xxx_messageInfo_Progress.Size(m)
+}
+func (m *Progress) XXX_DiscardUnknown() {
+	xxx_messageInfo_Progress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Progress proto.InternalMessageInfo
+
+func (m *Progress) GetWorkCompleted() int64 {
+	if m != nil {
+		return m.WorkCompleted
+	}
+	return 0
+}
+
+func (m *Progress) GetWorkEstimated() int64 {
+	if m != nil {
+		return m.WorkEstimated
+	}
+	return 0
+}
+
+// The request for
+// [google.datastore.admin.v1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1.DatastoreAdmin.ExportEntities].
+type ExportEntitiesRequest struct {
+	// Project ID against which to make the request.
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// Client-assigned labels.
+	Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Description of what data from the project is included in the export.
+	EntityFilter *EntityFilter `protobuf:"bytes,3,opt,name=entity_filter,json=entityFilter,proto3" json:"entity_filter,omitempty"`
+	// Location for the export metadata and data files.
+	//
+	// The full resource URL of the external storage location. Currently, only
+	// Google Cloud Storage is supported. So output_url_prefix should be of the
+	// form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
+	// name of the Cloud Storage bucket and `NAMESPACE_PATH` is an optional Cloud
+	// Storage namespace path (this is not a Cloud Datastore namespace). For more
+	// information about Cloud Storage namespace paths, see
+	// [Object name
+	// considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+	//
+	// The resulting files will be nested deeper than the specified URL prefix.
+	// The final output URL will be provided in the
+	// [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
+	// value should be used for subsequent ImportEntities operations.
+	//
+	// By nesting the data files deeper, the same Cloud Storage bucket can be used
+	// in multiple ExportEntities operations without conflict.
+	OutputUrlPrefix      string   `protobuf:"bytes,4,opt,name=output_url_prefix,json=outputUrlPrefix,proto3" json:"output_url_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExportEntitiesRequest) Reset()         { *m = ExportEntitiesRequest{} }
+func (m *ExportEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*ExportEntitiesRequest) ProtoMessage()    {}
+func (*ExportEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{2}
+}
+func (m *ExportEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportEntitiesRequest.Unmarshal(m, b)
+}
+func (m *ExportEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExportEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesRequest.Merge(dst, src)
+}
+func (m *ExportEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_ExportEntitiesRequest.Size(m)
+}
+func (m *ExportEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportEntitiesRequest proto.InternalMessageInfo
+
+func (m *ExportEntitiesRequest) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+func (m *ExportEntitiesRequest) GetLabels() map[string]string {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+func (m *ExportEntitiesRequest) GetEntityFilter() *EntityFilter {
+	if m != nil {
+		return m.EntityFilter
+	}
+	return nil
+}
+
+func (m *ExportEntitiesRequest) GetOutputUrlPrefix() string {
+	if m != nil {
+		return m.OutputUrlPrefix
+	}
+	return ""
+}
+
+// The request for
+// [google.datastore.admin.v1.DatastoreAdmin.ImportEntities][google.datastore.admin.v1.DatastoreAdmin.ImportEntities].
+type ImportEntitiesRequest struct {
+	// Project ID against which to make the request.
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// Client-assigned labels.
+	Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// The full resource URL of the external storage location. Currently, only
+	// Google Cloud Storage is supported. So input_url should be of the form:
+	// `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
+	// `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is
+	// an optional Cloud Storage namespace path (this is not a Cloud Datastore
+	// namespace), and `OVERALL_EXPORT_METADATA_FILE` is the metadata file written
+	// by the ExportEntities operation. For more information about Cloud Storage
+	// namespace paths, see
+	// [Object name
+	// considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+	//
+	// For more information, see
+	// [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+	InputUrl string `protobuf:"bytes,3,opt,name=input_url,json=inputUrl,proto3" json:"input_url,omitempty"`
+	// Optionally specify which kinds/namespaces are to be imported. If provided,
+	// the list must be a subset of the EntityFilter used in creating the export,
+	// otherwise a FAILED_PRECONDITION error will be returned. If no filter is
+	// specified then all entities from the export are imported.
+	EntityFilter         *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter,proto3" json:"entity_filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ImportEntitiesRequest) Reset()         { *m = ImportEntitiesRequest{} }
+func (m *ImportEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportEntitiesRequest) ProtoMessage()    {}
+func (*ImportEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{3}
+}
+func (m *ImportEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportEntitiesRequest.Unmarshal(m, b)
+}
+func (m *ImportEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportEntitiesRequest.Merge(dst, src)
+}
+func (m *ImportEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportEntitiesRequest.Size(m)
+}
+func (m *ImportEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportEntitiesRequest proto.InternalMessageInfo
+
+func (m *ImportEntitiesRequest) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+func (m *ImportEntitiesRequest) GetLabels() map[string]string {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+func (m *ImportEntitiesRequest) GetInputUrl() string {
+	if m != nil {
+		return m.InputUrl
+	}
+	return ""
+}
+
+func (m *ImportEntitiesRequest) GetEntityFilter() *EntityFilter {
+	if m != nil {
+		return m.EntityFilter
+	}
+	return nil
+}
+
+// The response for
+// [google.datastore.admin.v1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1.DatastoreAdmin.ExportEntities].
+type ExportEntitiesResponse struct {
+	// Location of the output metadata file. This can be used to begin an import
+	// into Cloud Datastore (this project or another project). See
+	// [google.datastore.admin.v1.ImportEntitiesRequest.input_url][google.datastore.admin.v1.ImportEntitiesRequest.input_url].
+	// Only present if the operation completed successfully.
+	OutputUrl            string   `protobuf:"bytes,1,opt,name=output_url,json=outputUrl,proto3" json:"output_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExportEntitiesResponse) Reset()         { *m = ExportEntitiesResponse{} }
+func (m *ExportEntitiesResponse) String() string { return proto.CompactTextString(m) }
+func (*ExportEntitiesResponse) ProtoMessage()    {}
+func (*ExportEntitiesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{4}
+}
+func (m *ExportEntitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportEntitiesResponse.Unmarshal(m, b)
+}
+func (m *ExportEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportEntitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ExportEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesResponse.Merge(dst, src)
+}
+func (m *ExportEntitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_ExportEntitiesResponse.Size(m)
+}
+func (m *ExportEntitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportEntitiesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportEntitiesResponse proto.InternalMessageInfo
+
+func (m *ExportEntitiesResponse) GetOutputUrl() string {
+	if m != nil {
+		return m.OutputUrl
+	}
+	return ""
+}
+
+// Metadata for ExportEntities operations.
+type ExportEntitiesMetadata struct {
+	// Metadata common to all Datastore Admin operations.
+	Common *CommonMetadata `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"`
+	// An estimate of the number of entities processed.
+	ProgressEntities *Progress `protobuf:"bytes,2,opt,name=progress_entities,json=progressEntities,proto3" json:"progress_entities,omitempty"`
+	// An estimate of the number of bytes processed.
+	ProgressBytes *Progress `protobuf:"bytes,3,opt,name=progress_bytes,json=progressBytes,proto3" json:"progress_bytes,omitempty"`
+	// Description of which entities are being exported.
+	EntityFilter *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter,proto3" json:"entity_filter,omitempty"`
+	// Location for the export metadata and data files. This will be the same
+	// value as the
+	// [google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1.ExportEntitiesRequest.output_url_prefix]
+	// field. The final output location is provided in
+	// [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
+	OutputUrlPrefix      string   `protobuf:"bytes,5,opt,name=output_url_prefix,json=outputUrlPrefix,proto3" json:"output_url_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExportEntitiesMetadata) Reset()         { *m = ExportEntitiesMetadata{} }
+func (m *ExportEntitiesMetadata) String() string { return proto.CompactTextString(m) }
+func (*ExportEntitiesMetadata) ProtoMessage()    {}
+func (*ExportEntitiesMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{5}
+}
+func (m *ExportEntitiesMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportEntitiesMetadata.Unmarshal(m, b)
+}
+func (m *ExportEntitiesMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportEntitiesMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ExportEntitiesMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesMetadata.Merge(dst, src)
+}
+func (m *ExportEntitiesMetadata) XXX_Size() int {
+	return xxx_messageInfo_ExportEntitiesMetadata.Size(m)
+}
+func (m *ExportEntitiesMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportEntitiesMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportEntitiesMetadata proto.InternalMessageInfo
+
+func (m *ExportEntitiesMetadata) GetCommon() *CommonMetadata {
+	if m != nil {
+		return m.Common
+	}
+	return nil
+}
+
+func (m *ExportEntitiesMetadata) GetProgressEntities() *Progress {
+	if m != nil {
+		return m.ProgressEntities
+	}
+	return nil
+}
+
+func (m *ExportEntitiesMetadata) GetProgressBytes() *Progress {
+	if m != nil {
+		return m.ProgressBytes
+	}
+	return nil
+}
+
+func (m *ExportEntitiesMetadata) GetEntityFilter() *EntityFilter {
+	if m != nil {
+		return m.EntityFilter
+	}
+	return nil
+}
+
+func (m *ExportEntitiesMetadata) GetOutputUrlPrefix() string {
+	if m != nil {
+		return m.OutputUrlPrefix
+	}
+	return ""
+}
+
+// Metadata for ImportEntities operations.
+type ImportEntitiesMetadata struct {
+	// Metadata common to all Datastore Admin operations.
+	Common *CommonMetadata `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"`
+	// An estimate of the number of entities processed.
+	ProgressEntities *Progress `protobuf:"bytes,2,opt,name=progress_entities,json=progressEntities,proto3" json:"progress_entities,omitempty"`
+	// An estimate of the number of bytes processed.
+	ProgressBytes *Progress `protobuf:"bytes,3,opt,name=progress_bytes,json=progressBytes,proto3" json:"progress_bytes,omitempty"`
+	// Description of which entities are being imported.
+	EntityFilter *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter,proto3" json:"entity_filter,omitempty"`
+	// The location of the import metadata file. This will be the same value as
+	// the [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field.
+	InputUrl             string   `protobuf:"bytes,5,opt,name=input_url,json=inputUrl,proto3" json:"input_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImportEntitiesMetadata) Reset()         { *m = ImportEntitiesMetadata{} }
+func (m *ImportEntitiesMetadata) String() string { return proto.CompactTextString(m) }
+func (*ImportEntitiesMetadata) ProtoMessage()    {}
+func (*ImportEntitiesMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{6}
+}
+func (m *ImportEntitiesMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportEntitiesMetadata.Unmarshal(m, b)
+}
+func (m *ImportEntitiesMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportEntitiesMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ImportEntitiesMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportEntitiesMetadata.Merge(dst, src)
+}
+func (m *ImportEntitiesMetadata) XXX_Size() int {
+	return xxx_messageInfo_ImportEntitiesMetadata.Size(m)
+}
+func (m *ImportEntitiesMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportEntitiesMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportEntitiesMetadata proto.InternalMessageInfo
+
+func (m *ImportEntitiesMetadata) GetCommon() *CommonMetadata {
+	if m != nil {
+		return m.Common
+	}
+	return nil
+}
+
+func (m *ImportEntitiesMetadata) GetProgressEntities() *Progress {
+	if m != nil {
+		return m.ProgressEntities
+	}
+	return nil
+}
+
+func (m *ImportEntitiesMetadata) GetProgressBytes() *Progress {
+	if m != nil {
+		return m.ProgressBytes
+	}
+	return nil
+}
+
+func (m *ImportEntitiesMetadata) GetEntityFilter() *EntityFilter {
+	if m != nil {
+		return m.EntityFilter
+	}
+	return nil
+}
+
+func (m *ImportEntitiesMetadata) GetInputUrl() string {
+	if m != nil {
+		return m.InputUrl
+	}
+	return ""
+}
+
+// Identifies a subset of entities in a project. This is specified as
+// combinations of kinds and namespaces (either or both of which may be all, as
+// described in the following examples).
+// Example usage:
+//
+// Entire project:
+//   kinds=[], namespace_ids=[]
+//
+// Kinds Foo and Bar in all namespaces:
+//   kinds=['Foo', 'Bar'], namespace_ids=[]
+//
+// Kinds Foo and Bar only in the default namespace:
+//   kinds=['Foo', 'Bar'], namespace_ids=['']
+//
+// Kinds Foo and Bar in both the default and Baz namespaces:
+//   kinds=['Foo', 'Bar'], namespace_ids=['', 'Baz']
+//
+// The entire Baz namespace:
+//   kinds=[], namespace_ids=['Baz']
+type EntityFilter struct {
+	// If empty, then this represents all kinds.
+	Kinds []string `protobuf:"bytes,1,rep,name=kinds,proto3" json:"kinds,omitempty"`
+	// An empty list represents all namespaces. This is the preferred
+	// usage for projects that don't use namespaces.
+	//
+	// An empty string element represents the default namespace. This should be
+	// used if the project has data in non-default namespaces, but doesn't want to
+	// include them.
+	// Each namespace in this list must be unique.
+	NamespaceIds         []string `protobuf:"bytes,2,rep,name=namespace_ids,json=namespaceIds,proto3" json:"namespace_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EntityFilter) Reset()         { *m = EntityFilter{} }
+func (m *EntityFilter) String() string { return proto.CompactTextString(m) }
+func (*EntityFilter) ProtoMessage()    {}
+func (*EntityFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_975ad63a4fcacb5f, []int{7}
+}
+func (m *EntityFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityFilter.Unmarshal(m, b)
+}
+func (m *EntityFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityFilter.Marshal(b, m, deterministic)
+}
+func (dst *EntityFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityFilter.Merge(dst, src)
+}
+func (m *EntityFilter) XXX_Size() int {
+	return xxx_messageInfo_EntityFilter.Size(m)
+}
+func (m *EntityFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityFilter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityFilter proto.InternalMessageInfo
+
+func (m *EntityFilter) GetKinds() []string {
+	if m != nil {
+		return m.Kinds
+	}
+	return nil
+}
+
+func (m *EntityFilter) GetNamespaceIds() []string {
+	if m != nil {
+		return m.NamespaceIds
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*CommonMetadata)(nil), "google.datastore.admin.v1.CommonMetadata")
+	proto.RegisterMapType((map[string]string)(nil), "google.datastore.admin.v1.CommonMetadata.LabelsEntry")
+	proto.RegisterType((*Progress)(nil), "google.datastore.admin.v1.Progress")
+	proto.RegisterType((*ExportEntitiesRequest)(nil), "google.datastore.admin.v1.ExportEntitiesRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.datastore.admin.v1.ExportEntitiesRequest.LabelsEntry")
+	proto.RegisterType((*ImportEntitiesRequest)(nil), "google.datastore.admin.v1.ImportEntitiesRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.datastore.admin.v1.ImportEntitiesRequest.LabelsEntry")
+	proto.RegisterType((*ExportEntitiesResponse)(nil), "google.datastore.admin.v1.ExportEntitiesResponse")
+	proto.RegisterType((*ExportEntitiesMetadata)(nil), "google.datastore.admin.v1.ExportEntitiesMetadata")
+	proto.RegisterType((*ImportEntitiesMetadata)(nil), "google.datastore.admin.v1.ImportEntitiesMetadata")
+	proto.RegisterType((*EntityFilter)(nil), "google.datastore.admin.v1.EntityFilter")
+	proto.RegisterEnum("google.datastore.admin.v1.OperationType", OperationType_name, OperationType_value)
+	proto.RegisterEnum("google.datastore.admin.v1.CommonMetadata_State", CommonMetadata_State_name, CommonMetadata_State_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// DatastoreAdminClient is the client API for DatastoreAdmin service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type DatastoreAdminClient interface {
+	// Exports a copy of all or a subset of entities from Google Cloud Datastore
+	// to another storage system, such as Google Cloud Storage. Recent updates to
+	// entities may not be reflected in the export. The export occurs in the
+	// background and its progress can be monitored and managed via the
+	// Operation resource that is created. The output of an export may only be
+	// used once the associated operation is done. If an export operation is
+	// cancelled before completion it may leave partial data behind in Google
+	// Cloud Storage.
+	ExportEntities(ctx context.Context, in *ExportEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Imports entities into Google Cloud Datastore. Existing entities with the
+	// same key are overwritten. The import occurs in the background and its
+	// progress can be monitored and managed via the Operation resource that is
+	// created. If an ImportEntities operation is cancelled, it is possible
+	// that a subset of the data has already been imported to Cloud Datastore.
+	ImportEntities(ctx context.Context, in *ImportEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+}
+
+type datastoreAdminClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewDatastoreAdminClient(cc *grpc.ClientConn) DatastoreAdminClient {
+	return &datastoreAdminClient{cc}
+}
+
+func (c *datastoreAdminClient) ExportEntities(ctx context.Context, in *ExportEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.datastore.admin.v1.DatastoreAdmin/ExportEntities", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *datastoreAdminClient) ImportEntities(ctx context.Context, in *ImportEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.datastore.admin.v1.DatastoreAdmin/ImportEntities", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// DatastoreAdminServer is the server API for DatastoreAdmin service.
+type DatastoreAdminServer interface {
+	// Exports a copy of all or a subset of entities from Google Cloud Datastore
+	// to another storage system, such as Google Cloud Storage. Recent updates to
+	// entities may not be reflected in the export. The export occurs in the
+	// background and its progress can be monitored and managed via the
+	// Operation resource that is created. The output of an export may only be
+	// used once the associated operation is done. If an export operation is
+	// cancelled before completion it may leave partial data behind in Google
+	// Cloud Storage.
+	ExportEntities(context.Context, *ExportEntitiesRequest) (*longrunning.Operation, error)
+	// Imports entities into Google Cloud Datastore. Existing entities with the
+	// same key are overwritten. The import occurs in the background and its
+	// progress can be monitored and managed via the Operation resource that is
+	// created. If an ImportEntities operation is cancelled, it is possible
+	// that a subset of the data has already been imported to Cloud Datastore.
+	ImportEntities(context.Context, *ImportEntitiesRequest) (*longrunning.Operation, error)
+}
+
+func RegisterDatastoreAdminServer(s *grpc.Server, srv DatastoreAdminServer) {
+	s.RegisterService(&_DatastoreAdmin_serviceDesc, srv)
+}
+
+func _DatastoreAdmin_ExportEntities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ExportEntitiesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DatastoreAdminServer).ExportEntities(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.datastore.admin.v1.DatastoreAdmin/ExportEntities",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DatastoreAdminServer).ExportEntities(ctx, req.(*ExportEntitiesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DatastoreAdmin_ImportEntities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ImportEntitiesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DatastoreAdminServer).ImportEntities(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.datastore.admin.v1.DatastoreAdmin/ImportEntities",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DatastoreAdminServer).ImportEntities(ctx, req.(*ImportEntitiesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _DatastoreAdmin_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.datastore.admin.v1.DatastoreAdmin",
+	HandlerType: (*DatastoreAdminServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ExportEntities",
+			Handler:    _DatastoreAdmin_ExportEntities_Handler,
+		},
+		{
+			MethodName: "ImportEntities",
+			Handler:    _DatastoreAdmin_ImportEntities_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/datastore/admin/v1/datastore_admin.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/datastore/admin/v1/datastore_admin.proto", fileDescriptor_datastore_admin_975ad63a4fcacb5f)
+}
+
+var fileDescriptor_datastore_admin_975ad63a4fcacb5f = []byte{
+	// 987 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xdd, 0x6e, 0xe3, 0x44,
+	0x14, 0xc6, 0xce, 0xcf, 0x36, 0xa7, 0x4d, 0x36, 0x9d, 0xa5, 0xab, 0x10, 0x28, 0x1b, 0xa5, 0x5a,
+	0x51, 0x8a, 0x64, 0xd3, 0xa0, 0x15, 0x6c, 0x41, 0x48, 0x69, 0xea, 0xac, 0x8c, 0xd2, 0xc4, 0x72,
+	0x1c, 0xb4, 0xbb, 0x37, 0x96, 0x1b, 0x4f, 0x23, 0x53, 0xdb, 0x63, 0xec, 0x49, 0xd9, 0x08, 0x71,
+	0xc3, 0x2d, 0x12, 0x37, 0xdc, 0xf0, 0x0c, 0x5c, 0xf6, 0x0d, 0x78, 0x06, 0x5e, 0x61, 0xdf, 0x80,
+	0x17, 0x40, 0x33, 0xb6, 0x93, 0xb8, 0x64, 0x43, 0xa1, 0xcb, 0xdd, 0xde, 0xf9, 0x9c, 0x39, 0xdf,
+	0x37, 0x67, 0xbe, 0x99, 0x73, 0x7c, 0x40, 0x9e, 0x10, 0x32, 0x71, 0xb1, 0x6c, 0x5b, 0xd4, 0x8a,
+	0x28, 0x09, 0xb1, 0x6c, 0xd9, 0x9e, 0xe3, 0xcb, 0x97, 0x87, 0x0b, 0x97, 0xc9, 0x5d, 0x52, 0x10,
+	0x12, 0x4a, 0xd0, 0x3b, 0x31, 0x40, 0x9a, 0xaf, 0x4a, 0xf1, 0xea, 0xe5, 0x61, 0xfd, 0xbd, 0x84,
+	0xcb, 0x0a, 0x1c, 0xd9, 0xf2, 0x7d, 0x42, 0x2d, 0xea, 0x10, 0x3f, 0x8a, 0x81, 0xf5, 0xbd, 0x64,
+	0xd5, 0x25, 0xfe, 0x24, 0x9c, 0xfa, 0xbe, 0xe3, 0x4f, 0x64, 0x12, 0xe0, 0x30, 0x13, 0xf4, 0x20,
+	0x09, 0xe2, 0xd6, 0xd9, 0xf4, 0x5c, 0xa6, 0x8e, 0x87, 0x23, 0x6a, 0x79, 0x41, 0x1c, 0xd0, 0xbc,
+	0xca, 0x43, 0xa5, 0x43, 0x3c, 0x8f, 0xf8, 0xa7, 0x98, 0x5a, 0x2c, 0x09, 0xf4, 0x18, 0x20, 0xa2,
+	0x56, 0x48, 0x4d, 0x16, 0x5b, 0x13, 0x1a, 0xc2, 0xfe, 0x66, 0xab, 0x2e, 0x25, 0x69, 0xa6, 0x44,
+	0x92, 0x91, 0x12, 0xe9, 0x25, 0x1e, 0xcd, 0x6c, 0xf4, 0x08, 0x36, 0xb0, 0x6f, 0xc7, 0x40, 0xf1,
+	0x1f, 0x81, 0x77, 0xb0, 0x6f, 0x73, 0xd8, 0x00, 0x2a, 0xf3, 0xcc, 0x4d, 0x3a, 0x0b, 0x70, 0x2d,
+	0xd7, 0x10, 0xf6, 0x2b, 0xad, 0x7d, 0xe9, 0x95, 0xe2, 0x48, 0x83, 0x14, 0x60, 0xcc, 0x02, 0xac,
+	0x97, 0xc9, 0xb2, 0x89, 0x4e, 0xa1, 0xe8, 0x5a, 0x67, 0xd8, 0x8d, 0x6a, 0xf9, 0x46, 0x6e, 0x7f,
+	0xb3, 0xf5, 0x68, 0x0d, 0x51, 0xf6, 0xf4, 0x52, 0x8f, 0xe3, 0x14, 0x9f, 0x86, 0x33, 0x3d, 0x21,
+	0x41, 0x0a, 0x14, 0x22, 0x6a, 0x51, 0x5c, 0x2b, 0xf0, 0xb4, 0xe4, 0x9b, 0xb3, 0x0d, 0x19, 0x4c,
+	0x8f, 0xd1, 0xf5, 0xc7, 0xb0, 0xb9, 0xc4, 0x8e, 0xaa, 0x90, 0xbb, 0xc0, 0x33, 0x2e, 0x70, 0x49,
+	0x67, 0x9f, 0xe8, 0x6d, 0x28, 0x5c, 0x5a, 0xee, 0x34, 0xd6, 0xae, 0xa4, 0xc7, 0xc6, 0x91, 0xf8,
+	0x99, 0xd0, 0xfc, 0x49, 0x80, 0x02, 0xe7, 0x42, 0x3b, 0xb0, 0x3d, 0x34, 0xda, 0x86, 0x62, 0x8e,
+	0xfa, 0x43, 0x4d, 0xe9, 0xa8, 0x5d, 0x55, 0x39, 0xa9, 0xbe, 0x85, 0xaa, 0xb0, 0xa5, 0xf6, 0x55,
+	0x43, 0x6d, 0xf7, 0xd4, 0xe7, 0x6a, 0xff, 0x49, 0x55, 0x40, 0x15, 0x00, 0x4d, 0x1f, 0x74, 0x94,
+	0xe1, 0x90, 0xd9, 0x22, 0xb3, 0x3b, 0xed, 0x7e, 0x47, 0xe9, 0xf5, 0x98, 0x9d, 0x63, 0x76, 0x57,
+	0xed, 0xa7, 0xf1, 0x79, 0x66, 0x0f, 0x47, 0x1d, 0x16, 0xdf, 0x1d, 0xf5, 0xaa, 0x05, 0x04, 0x50,
+	0xec, 0xb6, 0xd5, 0x9e, 0x72, 0x52, 0x2d, 0xa2, 0x32, 0x94, 0x12, 0xac, 0x72, 0x52, 0xbd, 0xd3,
+	0x7c, 0x0a, 0x1b, 0x5a, 0x48, 0x26, 0x21, 0x8e, 0x22, 0xf4, 0x10, 0x2a, 0xdf, 0x91, 0xf0, 0xc2,
+	0x1c, 0x13, 0x2f, 0x70, 0x31, 0xc5, 0x36, 0x3f, 0x50, 0x4e, 0x2f, 0x33, 0x6f, 0x27, 0x75, 0xce,
+	0xc3, 0x70, 0x44, 0x1d, 0xcf, 0x62, 0x61, 0xe2, 0x22, 0x4c, 0x49, 0x9d, 0xcd, 0xdf, 0x45, 0xd8,
+	0x51, 0x5e, 0x04, 0x24, 0xa4, 0x8a, 0x4f, 0x1d, 0xea, 0xe0, 0x48, 0xc7, 0xdf, 0x4e, 0x71, 0x44,
+	0xd1, 0x2e, 0x40, 0x10, 0x92, 0x6f, 0xf0, 0x98, 0x9a, 0x8e, 0x9d, 0x88, 0x56, 0x4a, 0x3c, 0xaa,
+	0x8d, 0x8c, 0xf9, 0x8d, 0x8b, 0xfc, 0xc6, 0xbf, 0x58, 0x73, 0x47, 0x2b, 0x37, 0x58, 0x79, 0xf1,
+	0x3d, 0x28, 0x63, 0x16, 0x36, 0x33, 0xcf, 0x1d, 0x97, 0xe2, 0x90, 0xbf, 0xcb, 0xcd, 0xd6, 0x07,
+	0xeb, 0xc8, 0x79, 0x7c, 0x97, 0x87, 0xeb, 0x5b, 0x78, 0xc9, 0x42, 0x07, 0xb0, 0x4d, 0xa6, 0x34,
+	0x98, 0x52, 0x73, 0x1a, 0xba, 0x66, 0x10, 0xe2, 0x73, 0xe7, 0x45, 0x2d, 0xcf, 0x4f, 0x72, 0x37,
+	0x5e, 0x18, 0x85, 0xae, 0xc6, 0xdd, 0xb7, 0x79, 0x2b, 0x57, 0x22, 0xec, 0xa8, 0xde, 0xff, 0xac,
+	0xe1, 0xca, 0x0d, 0x56, 0x6a, 0xf8, 0x2e, 0x94, 0x1c, 0x3f, 0x39, 0x34, 0xd7, 0xaf, 0xa4, 0x6f,
+	0x70, 0xc7, 0x28, 0x74, 0xff, 0x2e, 0x70, 0xfe, 0x16, 0x02, 0xdf, 0x46, 0xb4, 0x4f, 0xe1, 0xfe,
+	0xf5, 0x67, 0x11, 0x05, 0xc4, 0x8f, 0x30, 0x13, 0x6d, 0x71, 0x6b, 0xa9, 0x68, 0xf3, 0xeb, 0x6a,
+	0xfe, 0x29, 0x5e, 0x47, 0xce, 0x1b, 0x69, 0x1b, 0x8a, 0x63, 0xde, 0x0e, 0x92, 0x26, 0xfa, 0xe1,
+	0x8d, 0xfb, 0x86, 0x9e, 0x00, 0x91, 0x06, 0xdb, 0x41, 0x52, 0x69, 0x26, 0x4e, 0xf8, 0x93, 0xce,
+	0xba, 0xb7, 0x86, 0x2d, 0xad, 0x4e, 0xbd, 0x9a, 0xa2, 0xd3, 0xe4, 0xd0, 0x57, 0x50, 0x99, 0x33,
+	0x9e, 0xcd, 0x28, 0x8e, 0x92, 0x37, 0x7d, 0x23, 0xba, 0x72, 0x0a, 0x3d, 0x66, 0xc8, 0xd7, 0x7b,
+	0x7b, 0xab, 0xcb, 0xa3, 0xb0, 0xb2, 0x3c, 0x9a, 0x2f, 0x45, 0xb8, 0x9f, 0x7d, 0x82, 0x6f, 0x54,
+	0xff, 0x6f, 0xaa, 0x67, 0xca, 0xb3, 0x90, 0x2d, 0xcf, 0xa6, 0x0a, 0x5b, 0xcb, 0x50, 0x56, 0x3f,
+	0x17, 0x8e, 0x6f, 0x47, 0x35, 0xa1, 0x91, 0x63, 0xf5, 0xc3, 0x0d, 0xb4, 0x07, 0x65, 0xdf, 0xf2,
+	0x70, 0x14, 0x58, 0x63, 0x6c, 0x3a, 0x76, 0xdc, 0x3e, 0x4a, 0xfa, 0xd6, 0xdc, 0xa9, 0xda, 0xd1,
+	0xc1, 0x33, 0x28, 0x67, 0x7e, 0xd9, 0xe8, 0x7d, 0xa8, 0x0f, 0x34, 0x45, 0x6f, 0x1b, 0xea, 0xa0,
+	0x6f, 0x1a, 0xcf, 0xb4, 0xeb, 0x7f, 0xb4, 0x7b, 0x70, 0x57, 0x79, 0xaa, 0x0d, 0x74, 0xc3, 0x54,
+	0xfa, 0x86, 0x6a, 0xa8, 0xca, 0xb0, 0x2a, 0x30, 0xa7, 0x7a, 0x9a, 0x75, 0x8a, 0xad, 0x2b, 0x11,
+	0x2a, 0x27, 0xe9, 0xa1, 0xdb, 0xec, 0xcc, 0xe8, 0x67, 0x01, 0x2a, 0xd9, 0xaa, 0x44, 0x1f, 0xff,
+	0xdb, 0x3f, 0x42, 0x7d, 0x37, 0x45, 0x2c, 0x8d, 0x58, 0x8b, 0xb9, 0xa3, 0xf9, 0xd1, 0x8f, 0x7f,
+	0xbc, 0xfc, 0x45, 0x7c, 0xd8, 0x6c, 0xb0, 0xe1, 0x2e, 0xe9, 0xa2, 0x91, 0xfc, 0xfd, 0xa2, 0xc3,
+	0xfe, 0x70, 0x84, 0x39, 0xef, 0x91, 0x70, 0xc0, 0x13, 0xca, 0x3e, 0xd8, 0xb5, 0x09, 0xad, 0x6c,
+	0xaf, 0xaf, 0x21, 0x21, 0xc7, 0x4b, 0x12, 0x3a, 0xfe, 0x55, 0x80, 0xdd, 0x31, 0xf1, 0x5e, 0x9d,
+	0xc3, 0xf1, 0xbd, 0xac, 0xa6, 0x1a, 0x1b, 0xe0, 0x34, 0xe1, 0xf9, 0x97, 0x09, 0x62, 0x42, 0x5c,
+	0xcb, 0x9f, 0x48, 0x24, 0x9c, 0xc8, 0x13, 0xec, 0xf3, 0xf1, 0x2e, 0x19, 0x7e, 0xad, 0xc0, 0x89,
+	0x56, 0x0c, 0xc0, 0x9f, 0xf3, 0x8f, 0xdf, 0xc4, 0x07, 0x4f, 0x62, 0x82, 0x8e, 0x4b, 0xa6, 0xb6,
+	0x34, 0xdf, 0x44, 0xe2, 0xbb, 0x48, 0x5f, 0x1f, 0x9e, 0x15, 0x39, 0xd9, 0x27, 0x7f, 0x05, 0x00,
+	0x00, 0xff, 0xff, 0xb6, 0xdd, 0x44, 0x86, 0x4c, 0x0b, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go b/vendor/google.golang.org/genproto/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
index e9f3136d..86cfa7f4 100644
--- a/vendor/google.golang.org/genproto/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/datastore/admin/v1beta1/datastore_admin.pb.go
@@ -1,30 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/admin/v1beta1/datastore_admin.proto
 
-/*
-Package admin is a generated protocol buffer package.
-
-It is generated from these files:
-	google/datastore/admin/v1beta1/datastore_admin.proto
-
-It has these top-level messages:
-	CommonMetadata
-	Progress
-	ExportEntitiesRequest
-	ImportEntitiesRequest
-	ExportEntitiesResponse
-	ExportEntitiesMetadata
-	ImportEntitiesMetadata
-	EntityFilter
-*/
-package admin
+package admin // import "google.golang.org/genproto/googleapis/datastore/admin/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -68,7 +52,9 @@ var OperationType_value = map[string]int32{
 func (x OperationType) String() string {
 	return proto.EnumName(OperationType_name, int32(x))
 }
-func (OperationType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (OperationType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{0}
+}
 
 // The various possible states for an ongoing Operation.
 type CommonMetadata_State int32
@@ -118,37 +104,61 @@ var CommonMetadata_State_value = map[string]int32{
 func (x CommonMetadata_State) String() string {
 	return proto.EnumName(CommonMetadata_State_name, int32(x))
 }
-func (CommonMetadata_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (CommonMetadata_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{0, 0}
+}
 
 // Metadata common to all Datastore Admin operations.
 type CommonMetadata struct {
 	// The time that work began on the operation.
-	StartTime *google_protobuf3.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time the operation ended, either successfully or otherwise.
-	EndTime *google_protobuf3.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The type of the operation. Can be used as a filter in
 	// ListOperationsRequest.
-	OperationType OperationType `protobuf:"varint,3,opt,name=operation_type,json=operationType,enum=google.datastore.admin.v1beta1.OperationType" json:"operation_type,omitempty"`
+	OperationType OperationType `protobuf:"varint,3,opt,name=operation_type,json=operationType,proto3,enum=google.datastore.admin.v1beta1.OperationType" json:"operation_type,omitempty"`
 	// The client-assigned labels which were provided when the operation was
 	// created. May also include additional labels.
-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The current state of the Operation.
-	State CommonMetadata_State `protobuf:"varint,5,opt,name=state,enum=google.datastore.admin.v1beta1.CommonMetadata_State" json:"state,omitempty"`
+	State                CommonMetadata_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.datastore.admin.v1beta1.CommonMetadata_State" json:"state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *CommonMetadata) Reset()         { *m = CommonMetadata{} }
+func (m *CommonMetadata) String() string { return proto.CompactTextString(m) }
+func (*CommonMetadata) ProtoMessage()    {}
+func (*CommonMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{0}
+}
+func (m *CommonMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommonMetadata.Unmarshal(m, b)
+}
+func (m *CommonMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommonMetadata.Marshal(b, m, deterministic)
+}
+func (dst *CommonMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommonMetadata.Merge(dst, src)
+}
+func (m *CommonMetadata) XXX_Size() int {
+	return xxx_messageInfo_CommonMetadata.Size(m)
+}
+func (m *CommonMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommonMetadata.DiscardUnknown(m)
 }
 
-func (m *CommonMetadata) Reset()                    { *m = CommonMetadata{} }
-func (m *CommonMetadata) String() string            { return proto.CompactTextString(m) }
-func (*CommonMetadata) ProtoMessage()               {}
-func (*CommonMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_CommonMetadata proto.InternalMessageInfo
 
-func (m *CommonMetadata) GetStartTime() *google_protobuf3.Timestamp {
+func (m *CommonMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *CommonMetadata) GetEndTime() *google_protobuf3.Timestamp {
+func (m *CommonMetadata) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -180,16 +190,38 @@ func (m *CommonMetadata) GetState() CommonMetadata_State {
 type Progress struct {
 	// The amount of work that has been completed. Note that this may be greater
 	// than work_estimated.
-	WorkCompleted int64 `protobuf:"varint,1,opt,name=work_completed,json=workCompleted" json:"work_completed,omitempty"`
+	WorkCompleted int64 `protobuf:"varint,1,opt,name=work_completed,json=workCompleted,proto3" json:"work_completed,omitempty"`
 	// An estimate of how much work needs to be performed. May be zero if the
 	// work estimate is unavailable.
-	WorkEstimated int64 `protobuf:"varint,2,opt,name=work_estimated,json=workEstimated" json:"work_estimated,omitempty"`
+	WorkEstimated        int64    `protobuf:"varint,2,opt,name=work_estimated,json=workEstimated,proto3" json:"work_estimated,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Progress) Reset()         { *m = Progress{} }
+func (m *Progress) String() string { return proto.CompactTextString(m) }
+func (*Progress) ProtoMessage()    {}
+func (*Progress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{1}
+}
+func (m *Progress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Progress.Unmarshal(m, b)
+}
+func (m *Progress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Progress.Marshal(b, m, deterministic)
+}
+func (dst *Progress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Progress.Merge(dst, src)
+}
+func (m *Progress) XXX_Size() int {
+	return xxx_messageInfo_Progress.Size(m)
+}
+func (m *Progress) XXX_DiscardUnknown() {
+	xxx_messageInfo_Progress.DiscardUnknown(m)
 }
 
-func (m *Progress) Reset()                    { *m = Progress{} }
-func (m *Progress) String() string            { return proto.CompactTextString(m) }
-func (*Progress) ProtoMessage()               {}
-func (*Progress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Progress proto.InternalMessageInfo
 
 func (m *Progress) GetWorkCompleted() int64 {
 	if m != nil {
@@ -209,11 +241,11 @@ func (m *Progress) GetWorkEstimated() int64 {
 // [google.datastore.admin.v1beta1.DatastoreAdmin.ExportEntities][google.datastore.admin.v1beta1.DatastoreAdmin.ExportEntities].
 type ExportEntitiesRequest struct {
 	// Project ID against which to make the request.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Client-assigned labels.
-	Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Description of what data from the project is included in the export.
-	EntityFilter *EntityFilter `protobuf:"bytes,3,opt,name=entity_filter,json=entityFilter" json:"entity_filter,omitempty"`
+	EntityFilter *EntityFilter `protobuf:"bytes,3,opt,name=entity_filter,json=entityFilter,proto3" json:"entity_filter,omitempty"`
 	// Location for the export metadata and data files.
 	//
 	// The full resource URL of the external storage location. Currently, only
@@ -232,13 +264,35 @@ type ExportEntitiesRequest struct {
 	//
 	// By nesting the data files deeper, the same Cloud Storage bucket can be used
 	// in multiple ExportEntities operations without conflict.
-	OutputUrlPrefix string `protobuf:"bytes,4,opt,name=output_url_prefix,json=outputUrlPrefix" json:"output_url_prefix,omitempty"`
+	OutputUrlPrefix      string   `protobuf:"bytes,4,opt,name=output_url_prefix,json=outputUrlPrefix,proto3" json:"output_url_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ExportEntitiesRequest) Reset()                    { *m = ExportEntitiesRequest{} }
-func (m *ExportEntitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ExportEntitiesRequest) ProtoMessage()               {}
-func (*ExportEntitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *ExportEntitiesRequest) Reset()         { *m = ExportEntitiesRequest{} }
+func (m *ExportEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*ExportEntitiesRequest) ProtoMessage()    {}
+func (*ExportEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{2}
+}
+func (m *ExportEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportEntitiesRequest.Unmarshal(m, b)
+}
+func (m *ExportEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExportEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesRequest.Merge(dst, src)
+}
+func (m *ExportEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_ExportEntitiesRequest.Size(m)
+}
+func (m *ExportEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportEntitiesRequest proto.InternalMessageInfo
 
 func (m *ExportEntitiesRequest) GetProjectId() string {
 	if m != nil {
@@ -272,9 +326,9 @@ func (m *ExportEntitiesRequest) GetOutputUrlPrefix() string {
 // [google.datastore.admin.v1beta1.DatastoreAdmin.ImportEntities][google.datastore.admin.v1beta1.DatastoreAdmin.ImportEntities].
 type ImportEntitiesRequest struct {
 	// Project ID against which to make the request.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Client-assigned labels.
-	Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The full resource URL of the external storage location. Currently, only
 	// Google Cloud Storage is supported. So input_url should be of the form:
 	// `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where
@@ -288,18 +342,40 @@ type ImportEntitiesRequest struct {
 	//
 	// For more information, see
 	// [google.datastore.admin.v1beta1.ExportEntitiesResponse.output_url][google.datastore.admin.v1beta1.ExportEntitiesResponse.output_url].
-	InputUrl string `protobuf:"bytes,3,opt,name=input_url,json=inputUrl" json:"input_url,omitempty"`
+	InputUrl string `protobuf:"bytes,3,opt,name=input_url,json=inputUrl,proto3" json:"input_url,omitempty"`
 	// Optionally specify which kinds/namespaces are to be imported. If provided,
 	// the list must be a subset of the EntityFilter used in creating the export,
 	// otherwise a FAILED_PRECONDITION error will be returned. If no filter is
 	// specified then all entities from the export are imported.
-	EntityFilter *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter" json:"entity_filter,omitempty"`
+	EntityFilter         *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter,proto3" json:"entity_filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *ImportEntitiesRequest) Reset()                    { *m = ImportEntitiesRequest{} }
-func (m *ImportEntitiesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ImportEntitiesRequest) ProtoMessage()               {}
-func (*ImportEntitiesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ImportEntitiesRequest) Reset()         { *m = ImportEntitiesRequest{} }
+func (m *ImportEntitiesRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportEntitiesRequest) ProtoMessage()    {}
+func (*ImportEntitiesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{3}
+}
+func (m *ImportEntitiesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportEntitiesRequest.Unmarshal(m, b)
+}
+func (m *ImportEntitiesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportEntitiesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportEntitiesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportEntitiesRequest.Merge(dst, src)
+}
+func (m *ImportEntitiesRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportEntitiesRequest.Size(m)
+}
+func (m *ImportEntitiesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportEntitiesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportEntitiesRequest proto.InternalMessageInfo
 
 func (m *ImportEntitiesRequest) GetProjectId() string {
 	if m != nil {
@@ -336,13 +412,35 @@ type ExportEntitiesResponse struct {
 	// into Cloud Datastore (this project or another project). See
 	// [google.datastore.admin.v1beta1.ImportEntitiesRequest.input_url][google.datastore.admin.v1beta1.ImportEntitiesRequest.input_url].
 	// Only present if the operation completed successfully.
-	OutputUrl string `protobuf:"bytes,1,opt,name=output_url,json=outputUrl" json:"output_url,omitempty"`
+	OutputUrl            string   `protobuf:"bytes,1,opt,name=output_url,json=outputUrl,proto3" json:"output_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ExportEntitiesResponse) Reset()                    { *m = ExportEntitiesResponse{} }
-func (m *ExportEntitiesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ExportEntitiesResponse) ProtoMessage()               {}
-func (*ExportEntitiesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ExportEntitiesResponse) Reset()         { *m = ExportEntitiesResponse{} }
+func (m *ExportEntitiesResponse) String() string { return proto.CompactTextString(m) }
+func (*ExportEntitiesResponse) ProtoMessage()    {}
+func (*ExportEntitiesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{4}
+}
+func (m *ExportEntitiesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportEntitiesResponse.Unmarshal(m, b)
+}
+func (m *ExportEntitiesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportEntitiesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ExportEntitiesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesResponse.Merge(dst, src)
+}
+func (m *ExportEntitiesResponse) XXX_Size() int {
+	return xxx_messageInfo_ExportEntitiesResponse.Size(m)
+}
+func (m *ExportEntitiesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportEntitiesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportEntitiesResponse proto.InternalMessageInfo
 
 func (m *ExportEntitiesResponse) GetOutputUrl() string {
 	if m != nil {
@@ -354,25 +452,47 @@ func (m *ExportEntitiesResponse) GetOutputUrl() string {
 // Metadata for ExportEntities operations.
 type ExportEntitiesMetadata struct {
 	// Metadata common to all Datastore Admin operations.
-	Common *CommonMetadata `protobuf:"bytes,1,opt,name=common" json:"common,omitempty"`
+	Common *CommonMetadata `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"`
 	// An estimate of the number of entities processed.
-	ProgressEntities *Progress `protobuf:"bytes,2,opt,name=progress_entities,json=progressEntities" json:"progress_entities,omitempty"`
+	ProgressEntities *Progress `protobuf:"bytes,2,opt,name=progress_entities,json=progressEntities,proto3" json:"progress_entities,omitempty"`
 	// An estimate of the number of bytes processed.
-	ProgressBytes *Progress `protobuf:"bytes,3,opt,name=progress_bytes,json=progressBytes" json:"progress_bytes,omitempty"`
+	ProgressBytes *Progress `protobuf:"bytes,3,opt,name=progress_bytes,json=progressBytes,proto3" json:"progress_bytes,omitempty"`
 	// Description of which entities are being exported.
-	EntityFilter *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter" json:"entity_filter,omitempty"`
+	EntityFilter *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter,proto3" json:"entity_filter,omitempty"`
 	// Location for the export metadata and data files. This will be the same
 	// value as the
 	// [google.datastore.admin.v1beta1.ExportEntitiesRequest.output_url_prefix][google.datastore.admin.v1beta1.ExportEntitiesRequest.output_url_prefix]
 	// field. The final output location is provided in
 	// [google.datastore.admin.v1beta1.ExportEntitiesResponse.output_url][google.datastore.admin.v1beta1.ExportEntitiesResponse.output_url].
-	OutputUrlPrefix string `protobuf:"bytes,5,opt,name=output_url_prefix,json=outputUrlPrefix" json:"output_url_prefix,omitempty"`
+	OutputUrlPrefix      string   `protobuf:"bytes,5,opt,name=output_url_prefix,json=outputUrlPrefix,proto3" json:"output_url_prefix,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ExportEntitiesMetadata) Reset()                    { *m = ExportEntitiesMetadata{} }
-func (m *ExportEntitiesMetadata) String() string            { return proto.CompactTextString(m) }
-func (*ExportEntitiesMetadata) ProtoMessage()               {}
-func (*ExportEntitiesMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ExportEntitiesMetadata) Reset()         { *m = ExportEntitiesMetadata{} }
+func (m *ExportEntitiesMetadata) String() string { return proto.CompactTextString(m) }
+func (*ExportEntitiesMetadata) ProtoMessage()    {}
+func (*ExportEntitiesMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{5}
+}
+func (m *ExportEntitiesMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportEntitiesMetadata.Unmarshal(m, b)
+}
+func (m *ExportEntitiesMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportEntitiesMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ExportEntitiesMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportEntitiesMetadata.Merge(dst, src)
+}
+func (m *ExportEntitiesMetadata) XXX_Size() int {
+	return xxx_messageInfo_ExportEntitiesMetadata.Size(m)
+}
+func (m *ExportEntitiesMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportEntitiesMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportEntitiesMetadata proto.InternalMessageInfo
 
 func (m *ExportEntitiesMetadata) GetCommon() *CommonMetadata {
 	if m != nil {
@@ -412,23 +532,45 @@ func (m *ExportEntitiesMetadata) GetOutputUrlPrefix() string {
 // Metadata for ImportEntities operations.
 type ImportEntitiesMetadata struct {
 	// Metadata common to all Datastore Admin operations.
-	Common *CommonMetadata `protobuf:"bytes,1,opt,name=common" json:"common,omitempty"`
+	Common *CommonMetadata `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"`
 	// An estimate of the number of entities processed.
-	ProgressEntities *Progress `protobuf:"bytes,2,opt,name=progress_entities,json=progressEntities" json:"progress_entities,omitempty"`
+	ProgressEntities *Progress `protobuf:"bytes,2,opt,name=progress_entities,json=progressEntities,proto3" json:"progress_entities,omitempty"`
 	// An estimate of the number of bytes processed.
-	ProgressBytes *Progress `protobuf:"bytes,3,opt,name=progress_bytes,json=progressBytes" json:"progress_bytes,omitempty"`
+	ProgressBytes *Progress `protobuf:"bytes,3,opt,name=progress_bytes,json=progressBytes,proto3" json:"progress_bytes,omitempty"`
 	// Description of which entities are being imported.
-	EntityFilter *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter" json:"entity_filter,omitempty"`
+	EntityFilter *EntityFilter `protobuf:"bytes,4,opt,name=entity_filter,json=entityFilter,proto3" json:"entity_filter,omitempty"`
 	// The location of the import metadata file. This will be the same value as
 	// the [google.datastore.admin.v1beta1.ExportEntitiesResponse.output_url][google.datastore.admin.v1beta1.ExportEntitiesResponse.output_url]
 	// field.
-	InputUrl string `protobuf:"bytes,5,opt,name=input_url,json=inputUrl" json:"input_url,omitempty"`
+	InputUrl             string   `protobuf:"bytes,5,opt,name=input_url,json=inputUrl,proto3" json:"input_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ImportEntitiesMetadata) Reset()         { *m = ImportEntitiesMetadata{} }
+func (m *ImportEntitiesMetadata) String() string { return proto.CompactTextString(m) }
+func (*ImportEntitiesMetadata) ProtoMessage()    {}
+func (*ImportEntitiesMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{6}
+}
+func (m *ImportEntitiesMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportEntitiesMetadata.Unmarshal(m, b)
+}
+func (m *ImportEntitiesMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportEntitiesMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ImportEntitiesMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportEntitiesMetadata.Merge(dst, src)
+}
+func (m *ImportEntitiesMetadata) XXX_Size() int {
+	return xxx_messageInfo_ImportEntitiesMetadata.Size(m)
+}
+func (m *ImportEntitiesMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportEntitiesMetadata.DiscardUnknown(m)
 }
 
-func (m *ImportEntitiesMetadata) Reset()                    { *m = ImportEntitiesMetadata{} }
-func (m *ImportEntitiesMetadata) String() string            { return proto.CompactTextString(m) }
-func (*ImportEntitiesMetadata) ProtoMessage()               {}
-func (*ImportEntitiesMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ImportEntitiesMetadata proto.InternalMessageInfo
 
 func (m *ImportEntitiesMetadata) GetCommon() *CommonMetadata {
 	if m != nil {
@@ -486,7 +628,7 @@ func (m *ImportEntitiesMetadata) GetInputUrl() string {
 //   kinds=[], namespace_ids=['Baz']
 type EntityFilter struct {
 	// If empty, then this represents all kinds.
-	Kinds []string `protobuf:"bytes,1,rep,name=kinds" json:"kinds,omitempty"`
+	Kinds []string `protobuf:"bytes,1,rep,name=kinds,proto3" json:"kinds,omitempty"`
 	// An empty list represents all namespaces. This is the preferred
 	// usage for projects that don't use namespaces.
 	//
@@ -494,13 +636,35 @@ type EntityFilter struct {
 	// used if the project has data in non-default namespaces, but doesn't want to
 	// include them.
 	// Each namespace in this list must be unique.
-	NamespaceIds []string `protobuf:"bytes,2,rep,name=namespace_ids,json=namespaceIds" json:"namespace_ids,omitempty"`
+	NamespaceIds         []string `protobuf:"bytes,2,rep,name=namespace_ids,json=namespaceIds,proto3" json:"namespace_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *EntityFilter) Reset()                    { *m = EntityFilter{} }
-func (m *EntityFilter) String() string            { return proto.CompactTextString(m) }
-func (*EntityFilter) ProtoMessage()               {}
-func (*EntityFilter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *EntityFilter) Reset()         { *m = EntityFilter{} }
+func (m *EntityFilter) String() string { return proto.CompactTextString(m) }
+func (*EntityFilter) ProtoMessage()    {}
+func (*EntityFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_admin_55d05b81962cd4ab, []int{7}
+}
+func (m *EntityFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityFilter.Unmarshal(m, b)
+}
+func (m *EntityFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityFilter.Marshal(b, m, deterministic)
+}
+func (dst *EntityFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityFilter.Merge(dst, src)
+}
+func (m *EntityFilter) XXX_Size() int {
+	return xxx_messageInfo_EntityFilter.Size(m)
+}
+func (m *EntityFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityFilter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityFilter proto.InternalMessageInfo
 
 func (m *EntityFilter) GetKinds() []string {
 	if m != nil {
@@ -518,9 +682,12 @@ func (m *EntityFilter) GetNamespaceIds() []string {
 
 func init() {
 	proto.RegisterType((*CommonMetadata)(nil), "google.datastore.admin.v1beta1.CommonMetadata")
+	proto.RegisterMapType((map[string]string)(nil), "google.datastore.admin.v1beta1.CommonMetadata.LabelsEntry")
 	proto.RegisterType((*Progress)(nil), "google.datastore.admin.v1beta1.Progress")
 	proto.RegisterType((*ExportEntitiesRequest)(nil), "google.datastore.admin.v1beta1.ExportEntitiesRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.datastore.admin.v1beta1.ExportEntitiesRequest.LabelsEntry")
 	proto.RegisterType((*ImportEntitiesRequest)(nil), "google.datastore.admin.v1beta1.ImportEntitiesRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.datastore.admin.v1beta1.ImportEntitiesRequest.LabelsEntry")
 	proto.RegisterType((*ExportEntitiesResponse)(nil), "google.datastore.admin.v1beta1.ExportEntitiesResponse")
 	proto.RegisterType((*ExportEntitiesMetadata)(nil), "google.datastore.admin.v1beta1.ExportEntitiesMetadata")
 	proto.RegisterType((*ImportEntitiesMetadata)(nil), "google.datastore.admin.v1beta1.ImportEntitiesMetadata")
@@ -537,8 +704,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for DatastoreAdmin service
-
+// DatastoreAdminClient is the client API for DatastoreAdmin service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DatastoreAdminClient interface {
 	// Exports a copy of all or a subset of entities from Google Cloud Datastore
 	// to another storage system, such as Google Cloud Storage. Recent updates to
@@ -548,13 +716,13 @@ type DatastoreAdminClient interface {
 	// used once the associated operation is done. If an export operation is
 	// cancelled before completion it may leave partial data behind in Google
 	// Cloud Storage.
-	ExportEntities(ctx context.Context, in *ExportEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	ExportEntities(ctx context.Context, in *ExportEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Imports entities into Google Cloud Datastore. Existing entities with the
 	// same key are overwritten. The import occurs in the background and its
 	// progress can be monitored and managed via the Operation resource that is
 	// created. If an ImportEntities operation is cancelled, it is possible
 	// that a subset of the data has already been imported to Cloud Datastore.
-	ImportEntities(ctx context.Context, in *ImportEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	ImportEntities(ctx context.Context, in *ImportEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type datastoreAdminClient struct {
@@ -565,26 +733,25 @@ func NewDatastoreAdminClient(cc *grpc.ClientConn) DatastoreAdminClient {
 	return &datastoreAdminClient{cc}
 }
 
-func (c *datastoreAdminClient) ExportEntities(ctx context.Context, in *ExportEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.datastore.admin.v1beta1.DatastoreAdmin/ExportEntities", in, out, c.cc, opts...)
+func (c *datastoreAdminClient) ExportEntities(ctx context.Context, in *ExportEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.datastore.admin.v1beta1.DatastoreAdmin/ExportEntities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *datastoreAdminClient) ImportEntities(ctx context.Context, in *ImportEntitiesRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.datastore.admin.v1beta1.DatastoreAdmin/ImportEntities", in, out, c.cc, opts...)
+func (c *datastoreAdminClient) ImportEntities(ctx context.Context, in *ImportEntitiesRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.datastore.admin.v1beta1.DatastoreAdmin/ImportEntities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for DatastoreAdmin service
-
+// DatastoreAdminServer is the server API for DatastoreAdmin service.
 type DatastoreAdminServer interface {
 	// Exports a copy of all or a subset of entities from Google Cloud Datastore
 	// to another storage system, such as Google Cloud Storage. Recent updates to
@@ -594,13 +761,13 @@ type DatastoreAdminServer interface {
 	// used once the associated operation is done. If an export operation is
 	// cancelled before completion it may leave partial data behind in Google
 	// Cloud Storage.
-	ExportEntities(context.Context, *ExportEntitiesRequest) (*google_longrunning.Operation, error)
+	ExportEntities(context.Context, *ExportEntitiesRequest) (*longrunning.Operation, error)
 	// Imports entities into Google Cloud Datastore. Existing entities with the
 	// same key are overwritten. The import occurs in the background and its
 	// progress can be monitored and managed via the Operation resource that is
 	// created. If an ImportEntities operation is cancelled, it is possible
 	// that a subset of the data has already been imported to Cloud Datastore.
-	ImportEntities(context.Context, *ImportEntitiesRequest) (*google_longrunning.Operation, error)
+	ImportEntities(context.Context, *ImportEntitiesRequest) (*longrunning.Operation, error)
 }
 
 func RegisterDatastoreAdminServer(s *grpc.Server, srv DatastoreAdminServer) {
@@ -661,10 +828,10 @@ var _DatastoreAdmin_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/datastore/admin/v1beta1/datastore_admin.proto", fileDescriptor0)
+	proto.RegisterFile("google/datastore/admin/v1beta1/datastore_admin.proto", fileDescriptor_datastore_admin_55d05b81962cd4ab)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_datastore_admin_55d05b81962cd4ab = []byte{
 	// 996 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x41, 0x8f, 0xdb, 0x44,
 	0x14, 0xc6, 0xce, 0x26, 0x6d, 0xde, 0x6e, 0xd2, 0xec, 0x94, 0xad, 0xa2, 0x40, 0xcb, 0xca, 0xa5,
diff --git a/vendor/google.golang.org/genproto/googleapis/datastore/v1/datastore.pb.go b/vendor/google.golang.org/genproto/googleapis/datastore/v1/datastore.pb.go
index a62c12ea..61665912 100644
--- a/vendor/google.golang.org/genproto/googleapis/datastore/v1/datastore.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/datastore/v1/datastore.pb.go
@@ -1,52 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/datastore.proto
 
-/*
-Package datastore is a generated protocol buffer package.
-
-It is generated from these files:
-	google/datastore/v1/datastore.proto
-	google/datastore/v1/entity.proto
-	google/datastore/v1/query.proto
-
-It has these top-level messages:
-	LookupRequest
-	LookupResponse
-	RunQueryRequest
-	RunQueryResponse
-	BeginTransactionRequest
-	BeginTransactionResponse
-	RollbackRequest
-	RollbackResponse
-	CommitRequest
-	CommitResponse
-	AllocateIdsRequest
-	AllocateIdsResponse
-	ReserveIdsRequest
-	ReserveIdsResponse
-	Mutation
-	MutationResult
-	ReadOptions
-	TransactionOptions
-	PartitionId
-	Key
-	ArrayValue
-	Value
-	Entity
-	EntityResult
-	Query
-	KindExpression
-	PropertyReference
-	Projection
-	PropertyOrder
-	Filter
-	CompositeFilter
-	PropertyFilter
-	GqlQuery
-	GqlQueryParameter
-	QueryResultBatch
-*/
-package datastore
+package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -96,7 +51,9 @@ var CommitRequest_Mode_value = map[string]int32{
 func (x CommitRequest_Mode) String() string {
 	return proto.EnumName(CommitRequest_Mode_name, int32(x))
 }
-func (CommitRequest_Mode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{8, 0} }
+func (CommitRequest_Mode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{8, 0}
+}
 
 // The possible values for read consistencies.
 type ReadOptions_ReadConsistency int32
@@ -125,23 +82,45 @@ func (x ReadOptions_ReadConsistency) String() string {
 	return proto.EnumName(ReadOptions_ReadConsistency_name, int32(x))
 }
 func (ReadOptions_ReadConsistency) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{16, 0}
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{16, 0}
 }
 
 // The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
 type LookupRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The options for this lookup request.
-	ReadOptions *ReadOptions `protobuf:"bytes,1,opt,name=read_options,json=readOptions" json:"read_options,omitempty"`
+	ReadOptions *ReadOptions `protobuf:"bytes,1,opt,name=read_options,json=readOptions,proto3" json:"read_options,omitempty"`
 	// Keys of entities to look up.
-	Keys []*Key `protobuf:"bytes,3,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*Key   `protobuf:"bytes,3,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LookupRequest) Reset()         { *m = LookupRequest{} }
+func (m *LookupRequest) String() string { return proto.CompactTextString(m) }
+func (*LookupRequest) ProtoMessage()    {}
+func (*LookupRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{0}
+}
+func (m *LookupRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LookupRequest.Unmarshal(m, b)
+}
+func (m *LookupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LookupRequest.Marshal(b, m, deterministic)
+}
+func (dst *LookupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupRequest.Merge(dst, src)
+}
+func (m *LookupRequest) XXX_Size() int {
+	return xxx_messageInfo_LookupRequest.Size(m)
+}
+func (m *LookupRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_LookupRequest.DiscardUnknown(m)
 }
 
-func (m *LookupRequest) Reset()                    { *m = LookupRequest{} }
-func (m *LookupRequest) String() string            { return proto.CompactTextString(m) }
-func (*LookupRequest) ProtoMessage()               {}
-func (*LookupRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_LookupRequest proto.InternalMessageInfo
 
 func (m *LookupRequest) GetProjectId() string {
 	if m != nil {
@@ -169,21 +148,43 @@ type LookupResponse struct {
 	// Entities found as `ResultType.FULL` entities. The order of results in this
 	// field is undefined and has no relation to the order of the keys in the
 	// input.
-	Found []*EntityResult `protobuf:"bytes,1,rep,name=found" json:"found,omitempty"`
+	Found []*EntityResult `protobuf:"bytes,1,rep,name=found,proto3" json:"found,omitempty"`
 	// Entities not found as `ResultType.KEY_ONLY` entities. The order of results
 	// in this field is undefined and has no relation to the order of the keys
 	// in the input.
-	Missing []*EntityResult `protobuf:"bytes,2,rep,name=missing" json:"missing,omitempty"`
+	Missing []*EntityResult `protobuf:"bytes,2,rep,name=missing,proto3" json:"missing,omitempty"`
 	// A list of keys that were not looked up due to resource constraints. The
 	// order of results in this field is undefined and has no relation to the
 	// order of the keys in the input.
-	Deferred []*Key `protobuf:"bytes,3,rep,name=deferred" json:"deferred,omitempty"`
+	Deferred             []*Key   `protobuf:"bytes,3,rep,name=deferred,proto3" json:"deferred,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *LookupResponse) Reset()                    { *m = LookupResponse{} }
-func (m *LookupResponse) String() string            { return proto.CompactTextString(m) }
-func (*LookupResponse) ProtoMessage()               {}
-func (*LookupResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *LookupResponse) Reset()         { *m = LookupResponse{} }
+func (m *LookupResponse) String() string { return proto.CompactTextString(m) }
+func (*LookupResponse) ProtoMessage()    {}
+func (*LookupResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{1}
+}
+func (m *LookupResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LookupResponse.Unmarshal(m, b)
+}
+func (m *LookupResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LookupResponse.Marshal(b, m, deterministic)
+}
+func (dst *LookupResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupResponse.Merge(dst, src)
+}
+func (m *LookupResponse) XXX_Size() int {
+	return xxx_messageInfo_LookupResponse.Size(m)
+}
+func (m *LookupResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_LookupResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LookupResponse proto.InternalMessageInfo
 
 func (m *LookupResponse) GetFound() []*EntityResult {
 	if m != nil {
@@ -209,48 +210,49 @@ func (m *LookupResponse) GetDeferred() []*Key {
 // The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
 type RunQueryRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Entities are partitioned into subsets, identified by a partition ID.
 	// Queries are scoped to a single partition.
 	// This partition ID is normalized with the standard default context
 	// partition ID.
-	PartitionId *PartitionId `protobuf:"bytes,2,opt,name=partition_id,json=partitionId" json:"partition_id,omitempty"`
+	PartitionId *PartitionId `protobuf:"bytes,2,opt,name=partition_id,json=partitionId,proto3" json:"partition_id,omitempty"`
 	// The options for this query.
-	ReadOptions *ReadOptions `protobuf:"bytes,1,opt,name=read_options,json=readOptions" json:"read_options,omitempty"`
+	ReadOptions *ReadOptions `protobuf:"bytes,1,opt,name=read_options,json=readOptions,proto3" json:"read_options,omitempty"`
 	// The type of query.
 	//
 	// Types that are valid to be assigned to QueryType:
 	//	*RunQueryRequest_Query
 	//	*RunQueryRequest_GqlQuery
-	QueryType isRunQueryRequest_QueryType `protobuf_oneof:"query_type"`
+	QueryType            isRunQueryRequest_QueryType `protobuf_oneof:"query_type"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
-func (m *RunQueryRequest) Reset()                    { *m = RunQueryRequest{} }
-func (m *RunQueryRequest) String() string            { return proto.CompactTextString(m) }
-func (*RunQueryRequest) ProtoMessage()               {}
-func (*RunQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-type isRunQueryRequest_QueryType interface {
-	isRunQueryRequest_QueryType()
+func (m *RunQueryRequest) Reset()         { *m = RunQueryRequest{} }
+func (m *RunQueryRequest) String() string { return proto.CompactTextString(m) }
+func (*RunQueryRequest) ProtoMessage()    {}
+func (*RunQueryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{2}
 }
-
-type RunQueryRequest_Query struct {
-	Query *Query `protobuf:"bytes,3,opt,name=query,oneof"`
+func (m *RunQueryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunQueryRequest.Unmarshal(m, b)
 }
-type RunQueryRequest_GqlQuery struct {
-	GqlQuery *GqlQuery `protobuf:"bytes,7,opt,name=gql_query,json=gqlQuery,oneof"`
+func (m *RunQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunQueryRequest.Marshal(b, m, deterministic)
 }
-
-func (*RunQueryRequest_Query) isRunQueryRequest_QueryType()    {}
-func (*RunQueryRequest_GqlQuery) isRunQueryRequest_QueryType() {}
-
-func (m *RunQueryRequest) GetQueryType() isRunQueryRequest_QueryType {
-	if m != nil {
-		return m.QueryType
-	}
-	return nil
+func (dst *RunQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryRequest.Merge(dst, src)
+}
+func (m *RunQueryRequest) XXX_Size() int {
+	return xxx_messageInfo_RunQueryRequest.Size(m)
+}
+func (m *RunQueryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunQueryRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_RunQueryRequest proto.InternalMessageInfo
+
 func (m *RunQueryRequest) GetProjectId() string {
 	if m != nil {
 		return m.ProjectId
@@ -272,6 +274,29 @@ func (m *RunQueryRequest) GetReadOptions() *ReadOptions {
 	return nil
 }
 
+type isRunQueryRequest_QueryType interface {
+	isRunQueryRequest_QueryType()
+}
+
+type RunQueryRequest_Query struct {
+	Query *Query `protobuf:"bytes,3,opt,name=query,proto3,oneof"`
+}
+
+type RunQueryRequest_GqlQuery struct {
+	GqlQuery *GqlQuery `protobuf:"bytes,7,opt,name=gql_query,json=gqlQuery,proto3,oneof"`
+}
+
+func (*RunQueryRequest_Query) isRunQueryRequest_QueryType() {}
+
+func (*RunQueryRequest_GqlQuery) isRunQueryRequest_QueryType() {}
+
+func (m *RunQueryRequest) GetQueryType() isRunQueryRequest_QueryType {
+	if m != nil {
+		return m.QueryType
+	}
+	return nil
+}
+
 func (m *RunQueryRequest) GetQuery() *Query {
 	if x, ok := m.GetQueryType().(*RunQueryRequest_Query); ok {
 		return x.Query
@@ -345,12 +370,12 @@ func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.QueryType.(type) {
 	case *RunQueryRequest_Query:
 		s := proto.Size(x.Query)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RunQueryRequest_GqlQuery:
 		s := proto.Size(x.GqlQuery)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -363,15 +388,37 @@ func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
 // The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
 type RunQueryResponse struct {
 	// A batch of query results (always present).
-	Batch *QueryResultBatch `protobuf:"bytes,1,opt,name=batch" json:"batch,omitempty"`
+	Batch *QueryResultBatch `protobuf:"bytes,1,opt,name=batch,proto3" json:"batch,omitempty"`
 	// The parsed form of the `GqlQuery` from the request, if it was set.
-	Query *Query `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
+	Query                *Query   `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RunQueryResponse) Reset()                    { *m = RunQueryResponse{} }
-func (m *RunQueryResponse) String() string            { return proto.CompactTextString(m) }
-func (*RunQueryResponse) ProtoMessage()               {}
-func (*RunQueryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *RunQueryResponse) Reset()         { *m = RunQueryResponse{} }
+func (m *RunQueryResponse) String() string { return proto.CompactTextString(m) }
+func (*RunQueryResponse) ProtoMessage()    {}
+func (*RunQueryResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{3}
+}
+func (m *RunQueryResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunQueryResponse.Unmarshal(m, b)
+}
+func (m *RunQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunQueryResponse.Marshal(b, m, deterministic)
+}
+func (dst *RunQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryResponse.Merge(dst, src)
+}
+func (m *RunQueryResponse) XXX_Size() int {
+	return xxx_messageInfo_RunQueryResponse.Size(m)
+}
+func (m *RunQueryResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunQueryResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RunQueryResponse proto.InternalMessageInfo
 
 func (m *RunQueryResponse) GetBatch() *QueryResultBatch {
 	if m != nil {
@@ -390,15 +437,37 @@ func (m *RunQueryResponse) GetQuery() *Query {
 // The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 type BeginTransactionRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Options for a new transaction.
-	TransactionOptions *TransactionOptions `protobuf:"bytes,10,opt,name=transaction_options,json=transactionOptions" json:"transaction_options,omitempty"`
+	TransactionOptions   *TransactionOptions `protobuf:"bytes,10,opt,name=transaction_options,json=transactionOptions,proto3" json:"transaction_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *BeginTransactionRequest) Reset()                    { *m = BeginTransactionRequest{} }
-func (m *BeginTransactionRequest) String() string            { return proto.CompactTextString(m) }
-func (*BeginTransactionRequest) ProtoMessage()               {}
-func (*BeginTransactionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest{} }
+func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
+func (*BeginTransactionRequest) ProtoMessage()    {}
+func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{4}
+}
+func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
+}
+func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
+}
+func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+}
+func (m *BeginTransactionRequest) XXX_Size() int {
+	return xxx_messageInfo_BeginTransactionRequest.Size(m)
+}
+func (m *BeginTransactionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BeginTransactionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BeginTransactionRequest proto.InternalMessageInfo
 
 func (m *BeginTransactionRequest) GetProjectId() string {
 	if m != nil {
@@ -417,13 +486,35 @@ func (m *BeginTransactionRequest) GetTransactionOptions() *TransactionOptions {
 // The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
 type BeginTransactionResponse struct {
 	// The transaction identifier (always present).
-	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	Transaction          []byte   `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BeginTransactionResponse) Reset()                    { *m = BeginTransactionResponse{} }
-func (m *BeginTransactionResponse) String() string            { return proto.CompactTextString(m) }
-func (*BeginTransactionResponse) ProtoMessage()               {}
-func (*BeginTransactionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *BeginTransactionResponse) Reset()         { *m = BeginTransactionResponse{} }
+func (m *BeginTransactionResponse) String() string { return proto.CompactTextString(m) }
+func (*BeginTransactionResponse) ProtoMessage()    {}
+func (*BeginTransactionResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{5}
+}
+func (m *BeginTransactionResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BeginTransactionResponse.Unmarshal(m, b)
+}
+func (m *BeginTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BeginTransactionResponse.Marshal(b, m, deterministic)
+}
+func (dst *BeginTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionResponse.Merge(dst, src)
+}
+func (m *BeginTransactionResponse) XXX_Size() int {
+	return xxx_messageInfo_BeginTransactionResponse.Size(m)
+}
+func (m *BeginTransactionResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BeginTransactionResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BeginTransactionResponse proto.InternalMessageInfo
 
 func (m *BeginTransactionResponse) GetTransaction() []byte {
 	if m != nil {
@@ -435,16 +526,38 @@ func (m *BeginTransactionResponse) GetTransaction() []byte {
 // The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
 type RollbackRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The transaction identifier, returned by a call to
 	// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
-	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	Transaction          []byte   `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
+func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
+func (*RollbackRequest) ProtoMessage()    {}
+func (*RollbackRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{6}
+}
+func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
+}
+func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
+}
+func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+}
+func (m *RollbackRequest) XXX_Size() int {
+	return xxx_messageInfo_RollbackRequest.Size(m)
+}
+func (m *RollbackRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackRequest.DiscardUnknown(m)
 }
 
-func (m *RollbackRequest) Reset()                    { *m = RollbackRequest{} }
-func (m *RollbackRequest) String() string            { return proto.CompactTextString(m) }
-func (*RollbackRequest) ProtoMessage()               {}
-func (*RollbackRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_RollbackRequest proto.InternalMessageInfo
 
 func (m *RollbackRequest) GetProjectId() string {
 	if m != nil {
@@ -463,19 +576,41 @@ func (m *RollbackRequest) GetTransaction() []byte {
 // The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
 // (an empty message).
 type RollbackResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RollbackResponse) Reset()                    { *m = RollbackResponse{} }
-func (m *RollbackResponse) String() string            { return proto.CompactTextString(m) }
-func (*RollbackResponse) ProtoMessage()               {}
-func (*RollbackResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *RollbackResponse) Reset()         { *m = RollbackResponse{} }
+func (m *RollbackResponse) String() string { return proto.CompactTextString(m) }
+func (*RollbackResponse) ProtoMessage()    {}
+func (*RollbackResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{7}
+}
+func (m *RollbackResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackResponse.Unmarshal(m, b)
+}
+func (m *RollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackResponse.Marshal(b, m, deterministic)
+}
+func (dst *RollbackResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackResponse.Merge(dst, src)
+}
+func (m *RollbackResponse) XXX_Size() int {
+	return xxx_messageInfo_RollbackResponse.Size(m)
+}
+func (m *RollbackResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RollbackResponse proto.InternalMessageInfo
 
 // The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
 type CommitRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The type of commit to perform. Defaults to `TRANSACTIONAL`.
-	Mode CommitRequest_Mode `protobuf:"varint,5,opt,name=mode,enum=google.datastore.v1.CommitRequest_Mode" json:"mode,omitempty"`
+	Mode CommitRequest_Mode `protobuf:"varint,5,opt,name=mode,proto3,enum=google.datastore.v1.CommitRequest_Mode" json:"mode,omitempty"`
 	// Must be set when mode is `TRANSACTIONAL`.
 	//
 	// Types that are valid to be assigned to TransactionSelector:
@@ -494,30 +629,35 @@ type CommitRequest struct {
 	//
 	// When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
 	// entity.
-	Mutations []*Mutation `protobuf:"bytes,6,rep,name=mutations" json:"mutations,omitempty"`
+	Mutations            []*Mutation `protobuf:"bytes,6,rep,name=mutations,proto3" json:"mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *CommitRequest) Reset()                    { *m = CommitRequest{} }
-func (m *CommitRequest) String() string            { return proto.CompactTextString(m) }
-func (*CommitRequest) ProtoMessage()               {}
-func (*CommitRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-type isCommitRequest_TransactionSelector interface {
-	isCommitRequest_TransactionSelector()
+func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
+func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
+func (*CommitRequest) ProtoMessage()    {}
+func (*CommitRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{8}
 }
-
-type CommitRequest_Transaction struct {
-	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3,oneof"`
+func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
-
-func (*CommitRequest_Transaction) isCommitRequest_TransactionSelector() {}
-
-func (m *CommitRequest) GetTransactionSelector() isCommitRequest_TransactionSelector {
-	if m != nil {
-		return m.TransactionSelector
-	}
-	return nil
+func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
+}
+func (dst *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(dst, src)
+}
+func (m *CommitRequest) XXX_Size() int {
+	return xxx_messageInfo_CommitRequest.Size(m)
 }
+func (m *CommitRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommitRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommitRequest proto.InternalMessageInfo
 
 func (m *CommitRequest) GetProjectId() string {
 	if m != nil {
@@ -533,6 +673,23 @@ func (m *CommitRequest) GetMode() CommitRequest_Mode {
 	return CommitRequest_MODE_UNSPECIFIED
 }
 
+type isCommitRequest_TransactionSelector interface {
+	isCommitRequest_TransactionSelector()
+}
+
+type CommitRequest_Transaction struct {
+	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3,oneof"`
+}
+
+func (*CommitRequest_Transaction) isCommitRequest_TransactionSelector() {}
+
+func (m *CommitRequest) GetTransactionSelector() isCommitRequest_TransactionSelector {
+	if m != nil {
+		return m.TransactionSelector
+	}
+	return nil
+}
+
 func (m *CommitRequest) GetTransaction() []byte {
 	if x, ok := m.GetTransactionSelector().(*CommitRequest_Transaction); ok {
 		return x.Transaction
@@ -588,7 +745,7 @@ func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
 	// transaction_selector
 	switch x := m.TransactionSelector.(type) {
 	case *CommitRequest_Transaction:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Transaction)))
 		n += len(x.Transaction)
 	case nil:
@@ -602,16 +759,38 @@ func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
 type CommitResponse struct {
 	// The result of performing the mutations.
 	// The i-th mutation result corresponds to the i-th mutation in the request.
-	MutationResults []*MutationResult `protobuf:"bytes,3,rep,name=mutation_results,json=mutationResults" json:"mutation_results,omitempty"`
+	MutationResults []*MutationResult `protobuf:"bytes,3,rep,name=mutation_results,json=mutationResults,proto3" json:"mutation_results,omitempty"`
 	// The number of index entries updated during the commit, or zero if none were
 	// updated.
-	IndexUpdates int32 `protobuf:"varint,4,opt,name=index_updates,json=indexUpdates" json:"index_updates,omitempty"`
+	IndexUpdates         int32    `protobuf:"varint,4,opt,name=index_updates,json=indexUpdates,proto3" json:"index_updates,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
+func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
+func (*CommitResponse) ProtoMessage()    {}
+func (*CommitResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{9}
+}
+func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
+}
+func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
+}
+func (dst *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(dst, src)
+}
+func (m *CommitResponse) XXX_Size() int {
+	return xxx_messageInfo_CommitResponse.Size(m)
+}
+func (m *CommitResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommitResponse.DiscardUnknown(m)
 }
 
-func (m *CommitResponse) Reset()                    { *m = CommitResponse{} }
-func (m *CommitResponse) String() string            { return proto.CompactTextString(m) }
-func (*CommitResponse) ProtoMessage()               {}
-func (*CommitResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_CommitResponse proto.InternalMessageInfo
 
 func (m *CommitResponse) GetMutationResults() []*MutationResult {
 	if m != nil {
@@ -630,16 +809,38 @@ func (m *CommitResponse) GetIndexUpdates() int32 {
 // The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
 type AllocateIdsRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// A list of keys with incomplete key paths for which to allocate IDs.
 	// No key may be reserved/read-only.
-	Keys []*Key `protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*Key   `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AllocateIdsRequest) Reset()         { *m = AllocateIdsRequest{} }
+func (m *AllocateIdsRequest) String() string { return proto.CompactTextString(m) }
+func (*AllocateIdsRequest) ProtoMessage()    {}
+func (*AllocateIdsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{10}
+}
+func (m *AllocateIdsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AllocateIdsRequest.Unmarshal(m, b)
+}
+func (m *AllocateIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AllocateIdsRequest.Marshal(b, m, deterministic)
+}
+func (dst *AllocateIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateIdsRequest.Merge(dst, src)
+}
+func (m *AllocateIdsRequest) XXX_Size() int {
+	return xxx_messageInfo_AllocateIdsRequest.Size(m)
+}
+func (m *AllocateIdsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AllocateIdsRequest.DiscardUnknown(m)
 }
 
-func (m *AllocateIdsRequest) Reset()                    { *m = AllocateIdsRequest{} }
-func (m *AllocateIdsRequest) String() string            { return proto.CompactTextString(m) }
-func (*AllocateIdsRequest) ProtoMessage()               {}
-func (*AllocateIdsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_AllocateIdsRequest proto.InternalMessageInfo
 
 func (m *AllocateIdsRequest) GetProjectId() string {
 	if m != nil {
@@ -659,13 +860,35 @@ func (m *AllocateIdsRequest) GetKeys() []*Key {
 type AllocateIdsResponse struct {
 	// The keys specified in the request (in the same order), each with
 	// its key path completed with a newly allocated ID.
-	Keys []*Key `protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*Key   `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AllocateIdsResponse) Reset()                    { *m = AllocateIdsResponse{} }
-func (m *AllocateIdsResponse) String() string            { return proto.CompactTextString(m) }
-func (*AllocateIdsResponse) ProtoMessage()               {}
-func (*AllocateIdsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *AllocateIdsResponse) Reset()         { *m = AllocateIdsResponse{} }
+func (m *AllocateIdsResponse) String() string { return proto.CompactTextString(m) }
+func (*AllocateIdsResponse) ProtoMessage()    {}
+func (*AllocateIdsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{11}
+}
+func (m *AllocateIdsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AllocateIdsResponse.Unmarshal(m, b)
+}
+func (m *AllocateIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AllocateIdsResponse.Marshal(b, m, deterministic)
+}
+func (dst *AllocateIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateIdsResponse.Merge(dst, src)
+}
+func (m *AllocateIdsResponse) XXX_Size() int {
+	return xxx_messageInfo_AllocateIdsResponse.Size(m)
+}
+func (m *AllocateIdsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AllocateIdsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AllocateIdsResponse proto.InternalMessageInfo
 
 func (m *AllocateIdsResponse) GetKeys() []*Key {
 	if m != nil {
@@ -677,18 +900,40 @@ func (m *AllocateIdsResponse) GetKeys() []*Key {
 // The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
 type ReserveIdsRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// If not empty, the ID of the database against which to make the request.
-	DatabaseId string `protobuf:"bytes,9,opt,name=database_id,json=databaseId" json:"database_id,omitempty"`
+	DatabaseId string `protobuf:"bytes,9,opt,name=database_id,json=databaseId,proto3" json:"database_id,omitempty"`
 	// A list of keys with complete key paths whose numeric IDs should not be
 	// auto-allocated.
-	Keys []*Key `protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*Key   `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ReserveIdsRequest) Reset()                    { *m = ReserveIdsRequest{} }
-func (m *ReserveIdsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReserveIdsRequest) ProtoMessage()               {}
-func (*ReserveIdsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *ReserveIdsRequest) Reset()         { *m = ReserveIdsRequest{} }
+func (m *ReserveIdsRequest) String() string { return proto.CompactTextString(m) }
+func (*ReserveIdsRequest) ProtoMessage()    {}
+func (*ReserveIdsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{12}
+}
+func (m *ReserveIdsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReserveIdsRequest.Unmarshal(m, b)
+}
+func (m *ReserveIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReserveIdsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReserveIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReserveIdsRequest.Merge(dst, src)
+}
+func (m *ReserveIdsRequest) XXX_Size() int {
+	return xxx_messageInfo_ReserveIdsRequest.Size(m)
+}
+func (m *ReserveIdsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReserveIdsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReserveIdsRequest proto.InternalMessageInfo
 
 func (m *ReserveIdsRequest) GetProjectId() string {
 	if m != nil {
@@ -713,12 +958,34 @@ func (m *ReserveIdsRequest) GetKeys() []*Key {
 
 // The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
 type ReserveIdsResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReserveIdsResponse) Reset()         { *m = ReserveIdsResponse{} }
+func (m *ReserveIdsResponse) String() string { return proto.CompactTextString(m) }
+func (*ReserveIdsResponse) ProtoMessage()    {}
+func (*ReserveIdsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{13}
+}
+func (m *ReserveIdsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReserveIdsResponse.Unmarshal(m, b)
+}
+func (m *ReserveIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReserveIdsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReserveIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReserveIdsResponse.Merge(dst, src)
+}
+func (m *ReserveIdsResponse) XXX_Size() int {
+	return xxx_messageInfo_ReserveIdsResponse.Size(m)
+}
+func (m *ReserveIdsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReserveIdsResponse.DiscardUnknown(m)
 }
 
-func (m *ReserveIdsResponse) Reset()                    { *m = ReserveIdsResponse{} }
-func (m *ReserveIdsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReserveIdsResponse) ProtoMessage()               {}
-func (*ReserveIdsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_ReserveIdsResponse proto.InternalMessageInfo
 
 // A mutation to apply to an entity.
 type Mutation struct {
@@ -744,41 +1011,62 @@ type Mutation struct {
 	// Types that are valid to be assigned to ConflictDetectionStrategy:
 	//	*Mutation_BaseVersion
 	ConflictDetectionStrategy isMutation_ConflictDetectionStrategy `protobuf_oneof:"conflict_detection_strategy"`
+	XXX_NoUnkeyedLiteral      struct{}                             `json:"-"`
+	XXX_unrecognized          []byte                               `json:"-"`
+	XXX_sizecache             int32                                `json:"-"`
 }
 
-func (m *Mutation) Reset()                    { *m = Mutation{} }
-func (m *Mutation) String() string            { return proto.CompactTextString(m) }
-func (*Mutation) ProtoMessage()               {}
-func (*Mutation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *Mutation) Reset()         { *m = Mutation{} }
+func (m *Mutation) String() string { return proto.CompactTextString(m) }
+func (*Mutation) ProtoMessage()    {}
+func (*Mutation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{14}
+}
+func (m *Mutation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation.Unmarshal(m, b)
+}
+func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
+}
+func (dst *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(dst, src)
+}
+func (m *Mutation) XXX_Size() int {
+	return xxx_messageInfo_Mutation.Size(m)
+}
+func (m *Mutation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation proto.InternalMessageInfo
 
 type isMutation_Operation interface {
 	isMutation_Operation()
 }
-type isMutation_ConflictDetectionStrategy interface {
-	isMutation_ConflictDetectionStrategy()
-}
 
 type Mutation_Insert struct {
-	Insert *Entity `protobuf:"bytes,4,opt,name=insert,oneof"`
+	Insert *Entity `protobuf:"bytes,4,opt,name=insert,proto3,oneof"`
 }
+
 type Mutation_Update struct {
-	Update *Entity `protobuf:"bytes,5,opt,name=update,oneof"`
+	Update *Entity `protobuf:"bytes,5,opt,name=update,proto3,oneof"`
 }
+
 type Mutation_Upsert struct {
-	Upsert *Entity `protobuf:"bytes,6,opt,name=upsert,oneof"`
+	Upsert *Entity `protobuf:"bytes,6,opt,name=upsert,proto3,oneof"`
 }
+
 type Mutation_Delete struct {
-	Delete *Key `protobuf:"bytes,7,opt,name=delete,oneof"`
-}
-type Mutation_BaseVersion struct {
-	BaseVersion int64 `protobuf:"varint,8,opt,name=base_version,json=baseVersion,oneof"`
+	Delete *Key `protobuf:"bytes,7,opt,name=delete,proto3,oneof"`
 }
 
-func (*Mutation_Insert) isMutation_Operation()                      {}
-func (*Mutation_Update) isMutation_Operation()                      {}
-func (*Mutation_Upsert) isMutation_Operation()                      {}
-func (*Mutation_Delete) isMutation_Operation()                      {}
-func (*Mutation_BaseVersion) isMutation_ConflictDetectionStrategy() {}
+func (*Mutation_Insert) isMutation_Operation() {}
+
+func (*Mutation_Update) isMutation_Operation() {}
+
+func (*Mutation_Upsert) isMutation_Operation() {}
+
+func (*Mutation_Delete) isMutation_Operation() {}
 
 func (m *Mutation) GetOperation() isMutation_Operation {
 	if m != nil {
@@ -786,12 +1074,6 @@ func (m *Mutation) GetOperation() isMutation_Operation {
 	}
 	return nil
 }
-func (m *Mutation) GetConflictDetectionStrategy() isMutation_ConflictDetectionStrategy {
-	if m != nil {
-		return m.ConflictDetectionStrategy
-	}
-	return nil
-}
 
 func (m *Mutation) GetInsert() *Entity {
 	if x, ok := m.GetOperation().(*Mutation_Insert); ok {
@@ -821,6 +1103,23 @@ func (m *Mutation) GetDelete() *Key {
 	return nil
 }
 
+type isMutation_ConflictDetectionStrategy interface {
+	isMutation_ConflictDetectionStrategy()
+}
+
+type Mutation_BaseVersion struct {
+	BaseVersion int64 `protobuf:"varint,8,opt,name=base_version,json=baseVersion,proto3,oneof"`
+}
+
+func (*Mutation_BaseVersion) isMutation_ConflictDetectionStrategy() {}
+
+func (m *Mutation) GetConflictDetectionStrategy() isMutation_ConflictDetectionStrategy {
+	if m != nil {
+		return m.ConflictDetectionStrategy
+	}
+	return nil
+}
+
 func (m *Mutation) GetBaseVersion() int64 {
 	if x, ok := m.GetConflictDetectionStrategy().(*Mutation_BaseVersion); ok {
 		return x.BaseVersion
@@ -932,22 +1231,22 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Operation.(type) {
 	case *Mutation_Insert:
 		s := proto.Size(x.Insert)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Update:
 		s := proto.Size(x.Update)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Upsert:
 		s := proto.Size(x.Upsert)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Delete:
 		s := proto.Size(x.Delete)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -957,7 +1256,7 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 	// conflict_detection_strategy
 	switch x := m.ConflictDetectionStrategy.(type) {
 	case *Mutation_BaseVersion:
-		n += proto.SizeVarint(8<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.BaseVersion))
 	case nil:
 	default:
@@ -970,22 +1269,44 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 type MutationResult struct {
 	// The automatically allocated key.
 	// Set only when the mutation allocated a key.
-	Key *Key `protobuf:"bytes,3,opt,name=key" json:"key,omitempty"`
+	Key *Key `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
 	// The version of the entity on the server after processing the mutation. If
 	// the mutation doesn't change anything on the server, then the version will
 	// be the version of the current entity or, if no entity is present, a version
 	// that is strictly greater than the version of any previous entity and less
 	// than the version of any possible future entity.
-	Version int64 `protobuf:"varint,4,opt,name=version" json:"version,omitempty"`
+	Version int64 `protobuf:"varint,4,opt,name=version,proto3" json:"version,omitempty"`
 	// Whether a conflict was detected for this mutation. Always false when a
 	// conflict detection strategy field is not set in the mutation.
-	ConflictDetected bool `protobuf:"varint,5,opt,name=conflict_detected,json=conflictDetected" json:"conflict_detected,omitempty"`
+	ConflictDetected     bool     `protobuf:"varint,5,opt,name=conflict_detected,json=conflictDetected,proto3" json:"conflict_detected,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *MutationResult) Reset()                    { *m = MutationResult{} }
-func (m *MutationResult) String() string            { return proto.CompactTextString(m) }
-func (*MutationResult) ProtoMessage()               {}
-func (*MutationResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *MutationResult) Reset()         { *m = MutationResult{} }
+func (m *MutationResult) String() string { return proto.CompactTextString(m) }
+func (*MutationResult) ProtoMessage()    {}
+func (*MutationResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{15}
+}
+func (m *MutationResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutationResult.Unmarshal(m, b)
+}
+func (m *MutationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutationResult.Marshal(b, m, deterministic)
+}
+func (dst *MutationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutationResult.Merge(dst, src)
+}
+func (m *MutationResult) XXX_Size() int {
+	return xxx_messageInfo_MutationResult.Size(m)
+}
+func (m *MutationResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutationResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutationResult proto.InternalMessageInfo
 
 func (m *MutationResult) GetKey() *Key {
 	if m != nil {
@@ -1017,27 +1338,51 @@ type ReadOptions struct {
 	// Types that are valid to be assigned to ConsistencyType:
 	//	*ReadOptions_ReadConsistency_
 	//	*ReadOptions_Transaction
-	ConsistencyType isReadOptions_ConsistencyType `protobuf_oneof:"consistency_type"`
+	ConsistencyType      isReadOptions_ConsistencyType `protobuf_oneof:"consistency_type"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *ReadOptions) Reset()         { *m = ReadOptions{} }
+func (m *ReadOptions) String() string { return proto.CompactTextString(m) }
+func (*ReadOptions) ProtoMessage()    {}
+func (*ReadOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{16}
+}
+func (m *ReadOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadOptions.Unmarshal(m, b)
+}
+func (m *ReadOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadOptions.Marshal(b, m, deterministic)
+}
+func (dst *ReadOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadOptions.Merge(dst, src)
+}
+func (m *ReadOptions) XXX_Size() int {
+	return xxx_messageInfo_ReadOptions.Size(m)
+}
+func (m *ReadOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadOptions.DiscardUnknown(m)
 }
 
-func (m *ReadOptions) Reset()                    { *m = ReadOptions{} }
-func (m *ReadOptions) String() string            { return proto.CompactTextString(m) }
-func (*ReadOptions) ProtoMessage()               {}
-func (*ReadOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_ReadOptions proto.InternalMessageInfo
 
 type isReadOptions_ConsistencyType interface {
 	isReadOptions_ConsistencyType()
 }
 
 type ReadOptions_ReadConsistency_ struct {
-	ReadConsistency ReadOptions_ReadConsistency `protobuf:"varint,1,opt,name=read_consistency,json=readConsistency,enum=google.datastore.v1.ReadOptions_ReadConsistency,oneof"`
+	ReadConsistency ReadOptions_ReadConsistency `protobuf:"varint,1,opt,name=read_consistency,json=readConsistency,proto3,enum=google.datastore.v1.ReadOptions_ReadConsistency,oneof"`
 }
+
 type ReadOptions_Transaction struct {
 	Transaction []byte `protobuf:"bytes,2,opt,name=transaction,proto3,oneof"`
 }
 
 func (*ReadOptions_ReadConsistency_) isReadOptions_ConsistencyType() {}
-func (*ReadOptions_Transaction) isReadOptions_ConsistencyType()      {}
+
+func (*ReadOptions_Transaction) isReadOptions_ConsistencyType() {}
 
 func (m *ReadOptions) GetConsistencyType() isReadOptions_ConsistencyType {
 	if m != nil {
@@ -1112,10 +1457,10 @@ func _ReadOptions_OneofSizer(msg proto.Message) (n int) {
 	// consistency_type
 	switch x := m.ConsistencyType.(type) {
 	case *ReadOptions_ReadConsistency_:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.ReadConsistency))
 	case *ReadOptions_Transaction:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Transaction)))
 		n += len(x.Transaction)
 	case nil:
@@ -1137,27 +1482,51 @@ type TransactionOptions struct {
 	// Types that are valid to be assigned to Mode:
 	//	*TransactionOptions_ReadWrite_
 	//	*TransactionOptions_ReadOnly_
-	Mode isTransactionOptions_Mode `protobuf_oneof:"mode"`
+	Mode                 isTransactionOptions_Mode `protobuf_oneof:"mode"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *TransactionOptions) Reset()                    { *m = TransactionOptions{} }
-func (m *TransactionOptions) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions) ProtoMessage()               {}
-func (*TransactionOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
+func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions) ProtoMessage()    {}
+func (*TransactionOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{17}
+}
+func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
+}
+func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+}
+func (m *TransactionOptions) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions.Size(m)
+}
+func (m *TransactionOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransactionOptions proto.InternalMessageInfo
 
 type isTransactionOptions_Mode interface {
 	isTransactionOptions_Mode()
 }
 
 type TransactionOptions_ReadWrite_ struct {
-	ReadWrite *TransactionOptions_ReadWrite `protobuf:"bytes,1,opt,name=read_write,json=readWrite,oneof"`
+	ReadWrite *TransactionOptions_ReadWrite `protobuf:"bytes,1,opt,name=read_write,json=readWrite,proto3,oneof"`
 }
+
 type TransactionOptions_ReadOnly_ struct {
-	ReadOnly *TransactionOptions_ReadOnly `protobuf:"bytes,2,opt,name=read_only,json=readOnly,oneof"`
+	ReadOnly *TransactionOptions_ReadOnly `protobuf:"bytes,2,opt,name=read_only,json=readOnly,proto3,oneof"`
 }
 
 func (*TransactionOptions_ReadWrite_) isTransactionOptions_Mode() {}
-func (*TransactionOptions_ReadOnly_) isTransactionOptions_Mode()  {}
+
+func (*TransactionOptions_ReadOnly_) isTransactionOptions_Mode() {}
 
 func (m *TransactionOptions) GetMode() isTransactionOptions_Mode {
 	if m != nil {
@@ -1239,12 +1608,12 @@ func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Mode.(type) {
 	case *TransactionOptions_ReadWrite_:
 		s := proto.Size(x.ReadWrite)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransactionOptions_ReadOnly_:
 		s := proto.Size(x.ReadOnly)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1257,16 +1626,36 @@ func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
 // Options specific to read / write transactions.
 type TransactionOptions_ReadWrite struct {
 	// The transaction identifier of the transaction being retried.
-	PreviousTransaction []byte `protobuf:"bytes,1,opt,name=previous_transaction,json=previousTransaction,proto3" json:"previous_transaction,omitempty"`
+	PreviousTransaction  []byte   `protobuf:"bytes,1,opt,name=previous_transaction,json=previousTransaction,proto3" json:"previous_transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions_ReadWrite{} }
 func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
 func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{17, 0}
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{17, 0}
+}
+func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
+}
+func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+}
+func (m *TransactionOptions_ReadWrite) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
+}
+func (m *TransactionOptions_ReadWrite) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions_ReadWrite.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_TransactionOptions_ReadWrite proto.InternalMessageInfo
+
 func (m *TransactionOptions_ReadWrite) GetPreviousTransaction() []byte {
 	if m != nil {
 		return m.PreviousTransaction
@@ -1276,12 +1665,34 @@ func (m *TransactionOptions_ReadWrite) GetPreviousTransaction() []byte {
 
 // Options specific to read-only transactions.
 type TransactionOptions_ReadOnly struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TransactionOptions_ReadOnly) Reset()                    { *m = TransactionOptions_ReadOnly{} }
-func (m *TransactionOptions_ReadOnly) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions_ReadOnly) ProtoMessage()               {}
-func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17, 1} }
+func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_ReadOnly{} }
+func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
+func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_43db8ce3c69efb71, []int{17, 1}
+}
+func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
+}
+func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+}
+func (m *TransactionOptions_ReadOnly) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
+}
+func (m *TransactionOptions_ReadOnly) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions_ReadOnly.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransactionOptions_ReadOnly proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*LookupRequest)(nil), "google.datastore.v1.LookupRequest")
@@ -1316,8 +1727,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Datastore service
-
+// DatastoreClient is the client API for Datastore service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DatastoreClient interface {
 	// Looks up entities by key.
 	Lookup(ctx context.Context, in *LookupRequest, opts ...grpc.CallOption) (*LookupResponse, error)
@@ -1348,7 +1760,7 @@ func NewDatastoreClient(cc *grpc.ClientConn) DatastoreClient {
 
 func (c *datastoreClient) Lookup(ctx context.Context, in *LookupRequest, opts ...grpc.CallOption) (*LookupResponse, error) {
 	out := new(LookupResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1.Datastore/Lookup", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1.Datastore/Lookup", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1357,7 +1769,7 @@ func (c *datastoreClient) Lookup(ctx context.Context, in *LookupRequest, opts ..
 
 func (c *datastoreClient) RunQuery(ctx context.Context, in *RunQueryRequest, opts ...grpc.CallOption) (*RunQueryResponse, error) {
 	out := new(RunQueryResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1.Datastore/RunQuery", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1.Datastore/RunQuery", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1366,7 +1778,7 @@ func (c *datastoreClient) RunQuery(ctx context.Context, in *RunQueryRequest, opt
 
 func (c *datastoreClient) BeginTransaction(ctx context.Context, in *BeginTransactionRequest, opts ...grpc.CallOption) (*BeginTransactionResponse, error) {
 	out := new(BeginTransactionResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1.Datastore/BeginTransaction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1.Datastore/BeginTransaction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1375,7 +1787,7 @@ func (c *datastoreClient) BeginTransaction(ctx context.Context, in *BeginTransac
 
 func (c *datastoreClient) Commit(ctx context.Context, in *CommitRequest, opts ...grpc.CallOption) (*CommitResponse, error) {
 	out := new(CommitResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1.Datastore/Commit", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1.Datastore/Commit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1384,7 +1796,7 @@ func (c *datastoreClient) Commit(ctx context.Context, in *CommitRequest, opts ..
 
 func (c *datastoreClient) Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*RollbackResponse, error) {
 	out := new(RollbackResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1.Datastore/Rollback", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1.Datastore/Rollback", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1393,7 +1805,7 @@ func (c *datastoreClient) Rollback(ctx context.Context, in *RollbackRequest, opt
 
 func (c *datastoreClient) AllocateIds(ctx context.Context, in *AllocateIdsRequest, opts ...grpc.CallOption) (*AllocateIdsResponse, error) {
 	out := new(AllocateIdsResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1.Datastore/AllocateIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1.Datastore/AllocateIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1402,15 +1814,14 @@ func (c *datastoreClient) AllocateIds(ctx context.Context, in *AllocateIdsReques
 
 func (c *datastoreClient) ReserveIds(ctx context.Context, in *ReserveIdsRequest, opts ...grpc.CallOption) (*ReserveIdsResponse, error) {
 	out := new(ReserveIdsResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1.Datastore/ReserveIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1.Datastore/ReserveIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Datastore service
-
+// DatastoreServer is the server API for Datastore service.
 type DatastoreServer interface {
 	// Looks up entities by key.
 	Lookup(context.Context, *LookupRequest) (*LookupResponse, error)
@@ -1598,9 +2009,11 @@ var _Datastore_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/datastore/v1/datastore.proto",
 }
 
-func init() { proto.RegisterFile("google/datastore/v1/datastore.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/datastore/v1/datastore.proto", fileDescriptor_datastore_43db8ce3c69efb71)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_datastore_43db8ce3c69efb71 = []byte{
 	// 1390 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdf, 0x6f, 0x1b, 0xc5,
 	0x13, 0xcf, 0x3a, 0x89, 0x63, 0x8f, 0xf3, 0xc3, 0xd9, 0xe4, 0xfb, 0xad, 0x71, 0x5b, 0xd5, 0x5c,
diff --git a/vendor/google.golang.org/genproto/googleapis/datastore/v1/entity.pb.go b/vendor/google.golang.org/genproto/googleapis/datastore/v1/entity.pb.go
index d1d078db..213c46b7 100644
--- a/vendor/google.golang.org/genproto/googleapis/datastore/v1/entity.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/datastore/v1/entity.pb.go
@@ -1,21 +1,27 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/entity.proto
 
-package datastore
+package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-import google_type "google.golang.org/genproto/googleapis/type/latlng"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A partition ID identifies a grouping of entities. The grouping is always
 // by project and namespace, however the namespace ID may be empty.
 //
@@ -37,15 +43,37 @@ var _ = math.Inf
 // Reads and writes of foreign partition IDs may fail if the project is not in an active state.
 type PartitionId struct {
 	// The ID of the project to which the entities belong.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// If not empty, the ID of the namespace to which the entities belong.
-	NamespaceId string `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceId" json:"namespace_id,omitempty"`
+	NamespaceId          string   `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PartitionId) Reset()                    { *m = PartitionId{} }
-func (m *PartitionId) String() string            { return proto.CompactTextString(m) }
-func (*PartitionId) ProtoMessage()               {}
-func (*PartitionId) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *PartitionId) Reset()         { *m = PartitionId{} }
+func (m *PartitionId) String() string { return proto.CompactTextString(m) }
+func (*PartitionId) ProtoMessage()    {}
+func (*PartitionId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_45da7198f13d942c, []int{0}
+}
+func (m *PartitionId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartitionId.Unmarshal(m, b)
+}
+func (m *PartitionId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartitionId.Marshal(b, m, deterministic)
+}
+func (dst *PartitionId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionId.Merge(dst, src)
+}
+func (m *PartitionId) XXX_Size() int {
+	return xxx_messageInfo_PartitionId.Size(m)
+}
+func (m *PartitionId) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartitionId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PartitionId proto.InternalMessageInfo
 
 func (m *PartitionId) GetProjectId() string {
 	if m != nil {
@@ -69,7 +97,7 @@ type Key struct {
 	// Entities are partitioned into subsets, currently identified by a project
 	// ID and namespace ID.
 	// Queries are scoped to a single partition.
-	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId" json:"partition_id,omitempty"`
+	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId,proto3" json:"partition_id,omitempty"`
 	// The entity path.
 	// An entity path consists of one or more elements composed of a kind and a
 	// string or numerical identifier, which identify entities. The first
@@ -86,13 +114,35 @@ type Key struct {
 	// identifier.
 	//
 	// A path can never be empty, and a path can have at most 100 elements.
-	Path []*Key_PathElement `protobuf:"bytes,2,rep,name=path" json:"path,omitempty"`
+	Path                 []*Key_PathElement `protobuf:"bytes,2,rep,name=path,proto3" json:"path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *Key) Reset()                    { *m = Key{} }
-func (m *Key) String() string            { return proto.CompactTextString(m) }
-func (*Key) ProtoMessage()               {}
-func (*Key) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *Key) Reset()         { *m = Key{} }
+func (m *Key) String() string { return proto.CompactTextString(m) }
+func (*Key) ProtoMessage()    {}
+func (*Key) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_45da7198f13d942c, []int{1}
+}
+func (m *Key) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Key.Unmarshal(m, b)
+}
+func (m *Key) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Key.Marshal(b, m, deterministic)
+}
+func (dst *Key) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key.Merge(dst, src)
+}
+func (m *Key) XXX_Size() int {
+	return xxx_messageInfo_Key.Size(m)
+}
+func (m *Key) XXX_DiscardUnknown() {
+	xxx_messageInfo_Key.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Key proto.InternalMessageInfo
 
 func (m *Key) GetPartitionId() *PartitionId {
 	if m != nil {
@@ -117,32 +167,63 @@ type Key_PathElement struct {
 	// A kind matching regex `__.*__` is reserved/read-only.
 	// A kind must not contain more than 1500 bytes when UTF-8 encoded.
 	// Cannot be `""`.
-	Kind string `protobuf:"bytes,1,opt,name=kind" json:"kind,omitempty"`
+	Kind string `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"`
 	// The type of ID.
 	//
 	// Types that are valid to be assigned to IdType:
 	//	*Key_PathElement_Id
 	//	*Key_PathElement_Name
-	IdType isKey_PathElement_IdType `protobuf_oneof:"id_type"`
+	IdType               isKey_PathElement_IdType `protobuf_oneof:"id_type"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *Key_PathElement) Reset()                    { *m = Key_PathElement{} }
-func (m *Key_PathElement) String() string            { return proto.CompactTextString(m) }
-func (*Key_PathElement) ProtoMessage()               {}
-func (*Key_PathElement) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} }
+func (m *Key_PathElement) Reset()         { *m = Key_PathElement{} }
+func (m *Key_PathElement) String() string { return proto.CompactTextString(m) }
+func (*Key_PathElement) ProtoMessage()    {}
+func (*Key_PathElement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_45da7198f13d942c, []int{1, 0}
+}
+func (m *Key_PathElement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Key_PathElement.Unmarshal(m, b)
+}
+func (m *Key_PathElement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Key_PathElement.Marshal(b, m, deterministic)
+}
+func (dst *Key_PathElement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key_PathElement.Merge(dst, src)
+}
+func (m *Key_PathElement) XXX_Size() int {
+	return xxx_messageInfo_Key_PathElement.Size(m)
+}
+func (m *Key_PathElement) XXX_DiscardUnknown() {
+	xxx_messageInfo_Key_PathElement.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Key_PathElement proto.InternalMessageInfo
+
+func (m *Key_PathElement) GetKind() string {
+	if m != nil {
+		return m.Kind
+	}
+	return ""
+}
 
 type isKey_PathElement_IdType interface {
 	isKey_PathElement_IdType()
 }
 
 type Key_PathElement_Id struct {
-	Id int64 `protobuf:"varint,2,opt,name=id,oneof"`
+	Id int64 `protobuf:"varint,2,opt,name=id,proto3,oneof"`
 }
+
 type Key_PathElement_Name struct {
-	Name string `protobuf:"bytes,3,opt,name=name,oneof"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3,oneof"`
 }
 
-func (*Key_PathElement_Id) isKey_PathElement_IdType()   {}
+func (*Key_PathElement_Id) isKey_PathElement_IdType() {}
+
 func (*Key_PathElement_Name) isKey_PathElement_IdType() {}
 
 func (m *Key_PathElement) GetIdType() isKey_PathElement_IdType {
@@ -152,13 +233,6 @@ func (m *Key_PathElement) GetIdType() isKey_PathElement_IdType {
 	return nil
 }
 
-func (m *Key_PathElement) GetKind() string {
-	if m != nil {
-		return m.Kind
-	}
-	return ""
-}
-
 func (m *Key_PathElement) GetId() int64 {
 	if x, ok := m.GetIdType().(*Key_PathElement_Id); ok {
 		return x.Id
@@ -225,10 +299,10 @@ func _Key_PathElement_OneofSizer(msg proto.Message) (n int) {
 	// id_type
 	switch x := m.IdType.(type) {
 	case *Key_PathElement_Id:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.Id))
 	case *Key_PathElement_Name:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Name)))
 		n += len(x.Name)
 	case nil:
@@ -243,13 +317,35 @@ type ArrayValue struct {
 	// Values in the array.
 	// The order of this array may not be preserved if it contains a mix of
 	// indexed and unindexed values.
-	Values []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
+	Values               []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ArrayValue) Reset()                    { *m = ArrayValue{} }
-func (m *ArrayValue) String() string            { return proto.CompactTextString(m) }
-func (*ArrayValue) ProtoMessage()               {}
-func (*ArrayValue) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *ArrayValue) Reset()         { *m = ArrayValue{} }
+func (m *ArrayValue) String() string { return proto.CompactTextString(m) }
+func (*ArrayValue) ProtoMessage()    {}
+func (*ArrayValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_45da7198f13d942c, []int{2}
+}
+func (m *ArrayValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ArrayValue.Unmarshal(m, b)
+}
+func (m *ArrayValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ArrayValue.Marshal(b, m, deterministic)
+}
+func (dst *ArrayValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArrayValue.Merge(dst, src)
+}
+func (m *ArrayValue) XXX_Size() int {
+	return xxx_messageInfo_ArrayValue.Size(m)
+}
+func (m *ArrayValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_ArrayValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ArrayValue proto.InternalMessageInfo
 
 func (m *ArrayValue) GetValues() []*Value {
 	if m != nil {
@@ -277,66 +373,108 @@ type Value struct {
 	//	*Value_ArrayValue
 	ValueType isValue_ValueType `protobuf_oneof:"value_type"`
 	// The `meaning` field should only be populated for backwards compatibility.
-	Meaning int32 `protobuf:"varint,14,opt,name=meaning" json:"meaning,omitempty"`
+	Meaning int32 `protobuf:"varint,14,opt,name=meaning,proto3" json:"meaning,omitempty"`
 	// If the value should be excluded from all indexes including those defined
 	// explicitly.
-	ExcludeFromIndexes bool `protobuf:"varint,19,opt,name=exclude_from_indexes,json=excludeFromIndexes" json:"exclude_from_indexes,omitempty"`
+	ExcludeFromIndexes   bool     `protobuf:"varint,19,opt,name=exclude_from_indexes,json=excludeFromIndexes,proto3" json:"exclude_from_indexes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Value) Reset()         { *m = Value{} }
+func (m *Value) String() string { return proto.CompactTextString(m) }
+func (*Value) ProtoMessage()    {}
+func (*Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_45da7198f13d942c, []int{3}
+}
+func (m *Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Value.Unmarshal(m, b)
+}
+func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
+}
+func (dst *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(dst, src)
+}
+func (m *Value) XXX_Size() int {
+	return xxx_messageInfo_Value.Size(m)
+}
+func (m *Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_Value.DiscardUnknown(m)
 }
 
-func (m *Value) Reset()                    { *m = Value{} }
-func (m *Value) String() string            { return proto.CompactTextString(m) }
-func (*Value) ProtoMessage()               {}
-func (*Value) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_Value proto.InternalMessageInfo
 
 type isValue_ValueType interface {
 	isValue_ValueType()
 }
 
 type Value_NullValue struct {
-	NullValue google_protobuf1.NullValue `protobuf:"varint,11,opt,name=null_value,json=nullValue,enum=google.protobuf.NullValue,oneof"`
+	NullValue _struct.NullValue `protobuf:"varint,11,opt,name=null_value,json=nullValue,proto3,enum=google.protobuf.NullValue,oneof"`
 }
+
 type Value_BooleanValue struct {
-	BooleanValue bool `protobuf:"varint,1,opt,name=boolean_value,json=booleanValue,oneof"`
+	BooleanValue bool `protobuf:"varint,1,opt,name=boolean_value,json=booleanValue,proto3,oneof"`
 }
+
 type Value_IntegerValue struct {
-	IntegerValue int64 `protobuf:"varint,2,opt,name=integer_value,json=integerValue,oneof"`
+	IntegerValue int64 `protobuf:"varint,2,opt,name=integer_value,json=integerValue,proto3,oneof"`
 }
+
 type Value_DoubleValue struct {
-	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,oneof"`
+	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,proto3,oneof"`
 }
+
 type Value_TimestampValue struct {
-	TimestampValue *google_protobuf2.Timestamp `protobuf:"bytes,10,opt,name=timestamp_value,json=timestampValue,oneof"`
+	TimestampValue *timestamp.Timestamp `protobuf:"bytes,10,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
 }
+
 type Value_KeyValue struct {
-	KeyValue *Key `protobuf:"bytes,5,opt,name=key_value,json=keyValue,oneof"`
+	KeyValue *Key `protobuf:"bytes,5,opt,name=key_value,json=keyValue,proto3,oneof"`
 }
+
 type Value_StringValue struct {
-	StringValue string `protobuf:"bytes,17,opt,name=string_value,json=stringValue,oneof"`
+	StringValue string `protobuf:"bytes,17,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
+
 type Value_BlobValue struct {
 	BlobValue []byte `protobuf:"bytes,18,opt,name=blob_value,json=blobValue,proto3,oneof"`
 }
+
 type Value_GeoPointValue struct {
-	GeoPointValue *google_type.LatLng `protobuf:"bytes,8,opt,name=geo_point_value,json=geoPointValue,oneof"`
+	GeoPointValue *latlng.LatLng `protobuf:"bytes,8,opt,name=geo_point_value,json=geoPointValue,proto3,oneof"`
 }
+
 type Value_EntityValue struct {
-	EntityValue *Entity `protobuf:"bytes,6,opt,name=entity_value,json=entityValue,oneof"`
+	EntityValue *Entity `protobuf:"bytes,6,opt,name=entity_value,json=entityValue,proto3,oneof"`
 }
+
 type Value_ArrayValue struct {
-	ArrayValue *ArrayValue `protobuf:"bytes,9,opt,name=array_value,json=arrayValue,oneof"`
+	ArrayValue *ArrayValue `protobuf:"bytes,9,opt,name=array_value,json=arrayValue,proto3,oneof"`
 }
 
-func (*Value_NullValue) isValue_ValueType()      {}
-func (*Value_BooleanValue) isValue_ValueType()   {}
-func (*Value_IntegerValue) isValue_ValueType()   {}
-func (*Value_DoubleValue) isValue_ValueType()    {}
+func (*Value_NullValue) isValue_ValueType() {}
+
+func (*Value_BooleanValue) isValue_ValueType() {}
+
+func (*Value_IntegerValue) isValue_ValueType() {}
+
+func (*Value_DoubleValue) isValue_ValueType() {}
+
 func (*Value_TimestampValue) isValue_ValueType() {}
-func (*Value_KeyValue) isValue_ValueType()       {}
-func (*Value_StringValue) isValue_ValueType()    {}
-func (*Value_BlobValue) isValue_ValueType()      {}
-func (*Value_GeoPointValue) isValue_ValueType()  {}
-func (*Value_EntityValue) isValue_ValueType()    {}
-func (*Value_ArrayValue) isValue_ValueType()     {}
+
+func (*Value_KeyValue) isValue_ValueType() {}
+
+func (*Value_StringValue) isValue_ValueType() {}
+
+func (*Value_BlobValue) isValue_ValueType() {}
+
+func (*Value_GeoPointValue) isValue_ValueType() {}
+
+func (*Value_EntityValue) isValue_ValueType() {}
+
+func (*Value_ArrayValue) isValue_ValueType() {}
 
 func (m *Value) GetValueType() isValue_ValueType {
 	if m != nil {
@@ -345,11 +483,11 @@ func (m *Value) GetValueType() isValue_ValueType {
 	return nil
 }
 
-func (m *Value) GetNullValue() google_protobuf1.NullValue {
+func (m *Value) GetNullValue() _struct.NullValue {
 	if x, ok := m.GetValueType().(*Value_NullValue); ok {
 		return x.NullValue
 	}
-	return google_protobuf1.NullValue_NULL_VALUE
+	return _struct.NullValue_NULL_VALUE
 }
 
 func (m *Value) GetBooleanValue() bool {
@@ -373,7 +511,7 @@ func (m *Value) GetDoubleValue() float64 {
 	return 0
 }
 
-func (m *Value) GetTimestampValue() *google_protobuf2.Timestamp {
+func (m *Value) GetTimestampValue() *timestamp.Timestamp {
 	if x, ok := m.GetValueType().(*Value_TimestampValue); ok {
 		return x.TimestampValue
 	}
@@ -401,7 +539,7 @@ func (m *Value) GetBlobValue() []byte {
 	return nil
 }
 
-func (m *Value) GetGeoPointValue() *google_type.LatLng {
+func (m *Value) GetGeoPointValue() *latlng.LatLng {
 	if x, ok := m.GetValueType().(*Value_GeoPointValue); ok {
 		return x.GeoPointValue
 	}
@@ -519,7 +657,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 			return true, proto.ErrInternalBadWireType
 		}
 		x, err := b.DecodeVarint()
-		m.ValueType = &Value_NullValue{google_protobuf1.NullValue(x)}
+		m.ValueType = &Value_NullValue{_struct.NullValue(x)}
 		return true, err
 	case 1: // value_type.boolean_value
 		if wire != proto.WireVarint {
@@ -546,7 +684,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf2.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ValueType = &Value_TimestampValue{msg}
 		return true, err
@@ -576,7 +714,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_type.LatLng)
+		msg := new(latlng.LatLng)
 		err := b.DecodeMessage(msg)
 		m.ValueType = &Value_GeoPointValue{msg}
 		return true, err
@@ -606,48 +744,48 @@ func _Value_OneofSizer(msg proto.Message) (n int) {
 	// value_type
 	switch x := m.ValueType.(type) {
 	case *Value_NullValue:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.NullValue))
 	case *Value_BooleanValue:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *Value_IntegerValue:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.IntegerValue))
 	case *Value_DoubleValue:
-		n += proto.SizeVarint(3<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *Value_TimestampValue:
 		s := proto.Size(x.TimestampValue)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_KeyValue:
 		s := proto.Size(x.KeyValue)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_StringValue:
-		n += proto.SizeVarint(17<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StringValue)))
 		n += len(x.StringValue)
 	case *Value_BlobValue:
-		n += proto.SizeVarint(18<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.BlobValue)))
 		n += len(x.BlobValue)
 	case *Value_GeoPointValue:
 		s := proto.Size(x.GeoPointValue)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_EntityValue:
 		s := proto.Size(x.EntityValue)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_ArrayValue:
 		s := proto.Size(x.ArrayValue)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -669,20 +807,42 @@ type Entity struct {
 	// an entity in `Value.entity_value` may have no key).
 	// An entity's kind is its key path's last element's kind,
 	// or null if it has no key.
-	Key *Key `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key *Key `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// The entity's properties.
 	// The map's keys are property names.
 	// A property name matching regex `__.*__` is reserved.
 	// A reserved property name is forbidden in certain documented contexts.
 	// The name must not contain more than 500 characters.
 	// The name cannot be `""`.
-	Properties map[string]*Value `protobuf:"bytes,3,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties           map[string]*Value `protobuf:"bytes,3,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Entity) Reset()         { *m = Entity{} }
+func (m *Entity) String() string { return proto.CompactTextString(m) }
+func (*Entity) ProtoMessage()    {}
+func (*Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_45da7198f13d942c, []int{4}
+}
+func (m *Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Entity.Unmarshal(m, b)
+}
+func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
+}
+func (dst *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(dst, src)
+}
+func (m *Entity) XXX_Size() int {
+	return xxx_messageInfo_Entity.Size(m)
+}
+func (m *Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Entity.DiscardUnknown(m)
 }
 
-func (m *Entity) Reset()                    { *m = Entity{} }
-func (m *Entity) String() string            { return proto.CompactTextString(m) }
-func (*Entity) ProtoMessage()               {}
-func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_Entity proto.InternalMessageInfo
 
 func (m *Entity) GetKey() *Key {
 	if m != nil {
@@ -705,11 +865,14 @@ func init() {
 	proto.RegisterType((*ArrayValue)(nil), "google.datastore.v1.ArrayValue")
 	proto.RegisterType((*Value)(nil), "google.datastore.v1.Value")
 	proto.RegisterType((*Entity)(nil), "google.datastore.v1.Entity")
+	proto.RegisterMapType((map[string]*Value)(nil), "google.datastore.v1.Entity.PropertiesEntry")
 }
 
-func init() { proto.RegisterFile("google/datastore/v1/entity.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/datastore/v1/entity.proto", fileDescriptor_entity_45da7198f13d942c)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_entity_45da7198f13d942c = []byte{
 	// 780 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xff, 0x6e, 0xdc, 0x44,
 	0x10, 0xc7, 0xed, 0xbb, 0x5c, 0x1a, 0x8f, 0xdd, 0xa4, 0x6c, 0x2a, 0x61, 0x02, 0x28, 0x26, 0x80,
diff --git a/vendor/google.golang.org/genproto/googleapis/datastore/v1/query.pb.go b/vendor/google.golang.org/genproto/googleapis/datastore/v1/query.pb.go
index bdfcc174..55226d56 100644
--- a/vendor/google.golang.org/genproto/googleapis/datastore/v1/query.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/datastore/v1/query.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1/query.proto
 
-package datastore
+package datastore // import "google.golang.org/genproto/googleapis/datastore/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/type/latlng"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -15,6 +15,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Specifies what data the 'entity' field contains.
 // A `ResultType` is either implied (for example, in `LookupResponse.missing`
 // from `datastore.proto`, it is always `KEY_ONLY`) or specified by context
@@ -49,7 +55,9 @@ var EntityResult_ResultType_value = map[string]int32{
 func (x EntityResult_ResultType) String() string {
 	return proto.EnumName(EntityResult_ResultType_name, int32(x))
 }
-func (EntityResult_ResultType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (EntityResult_ResultType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{0, 0}
+}
 
 // The sort direction.
 type PropertyOrder_Direction int32
@@ -77,7 +85,9 @@ var PropertyOrder_Direction_value = map[string]int32{
 func (x PropertyOrder_Direction) String() string {
 	return proto.EnumName(PropertyOrder_Direction_name, int32(x))
 }
-func (PropertyOrder_Direction) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{5, 0} }
+func (PropertyOrder_Direction) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{5, 0}
+}
 
 // A composite filter operator.
 type CompositeFilter_Operator int32
@@ -101,7 +111,9 @@ var CompositeFilter_Operator_value = map[string]int32{
 func (x CompositeFilter_Operator) String() string {
 	return proto.EnumName(CompositeFilter_Operator_name, int32(x))
 }
-func (CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{7, 0} }
+func (CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{7, 0}
+}
 
 // A property filter operator.
 type PropertyFilter_Operator int32
@@ -145,7 +157,9 @@ var PropertyFilter_Operator_value = map[string]int32{
 func (x PropertyFilter_Operator) String() string {
 	return proto.EnumName(PropertyFilter_Operator_name, int32(x))
 }
-func (PropertyFilter_Operator) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{8, 0} }
+func (PropertyFilter_Operator) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{8, 0}
+}
 
 // The possible values for the `more_results` field.
 type QueryResultBatch_MoreResultsType int32
@@ -183,13 +197,13 @@ func (x QueryResultBatch_MoreResultsType) String() string {
 	return proto.EnumName(QueryResultBatch_MoreResultsType_name, int32(x))
 }
 func (QueryResultBatch_MoreResultsType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{11, 0}
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{11, 0}
 }
 
 // The result of fetching an entity from Datastore.
 type EntityResult struct {
 	// The resulting entity.
-	Entity *Entity `protobuf:"bytes,1,opt,name=entity" json:"entity,omitempty"`
+	Entity *Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"`
 	// The version of the entity, a strictly positive number that monotonically
 	// increases with changes to the entity.
 	//
@@ -199,16 +213,38 @@ type EntityResult struct {
 	// For [missing][google.datastore.v1.LookupResponse.missing] entities in `LookupResponse`, this
 	// is the version of the snapshot that was used to look up the entity, and it
 	// is always set except for eventually consistent reads.
-	Version int64 `protobuf:"varint,4,opt,name=version" json:"version,omitempty"`
+	Version int64 `protobuf:"varint,4,opt,name=version,proto3" json:"version,omitempty"`
 	// A cursor that points to the position after the result entity.
 	// Set only when the `EntityResult` is part of a `QueryResultBatch` message.
-	Cursor []byte `protobuf:"bytes,3,opt,name=cursor,proto3" json:"cursor,omitempty"`
+	Cursor               []byte   `protobuf:"bytes,3,opt,name=cursor,proto3" json:"cursor,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EntityResult) Reset()         { *m = EntityResult{} }
+func (m *EntityResult) String() string { return proto.CompactTextString(m) }
+func (*EntityResult) ProtoMessage()    {}
+func (*EntityResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{0}
+}
+func (m *EntityResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityResult.Unmarshal(m, b)
+}
+func (m *EntityResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityResult.Marshal(b, m, deterministic)
+}
+func (dst *EntityResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityResult.Merge(dst, src)
+}
+func (m *EntityResult) XXX_Size() int {
+	return xxx_messageInfo_EntityResult.Size(m)
+}
+func (m *EntityResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityResult.DiscardUnknown(m)
 }
 
-func (m *EntityResult) Reset()                    { *m = EntityResult{} }
-func (m *EntityResult) String() string            { return proto.CompactTextString(m) }
-func (*EntityResult) ProtoMessage()               {}
-func (*EntityResult) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_EntityResult proto.InternalMessageInfo
 
 func (m *EntityResult) GetEntity() *Entity {
 	if m != nil {
@@ -234,18 +270,18 @@ func (m *EntityResult) GetCursor() []byte {
 // A query for entities.
 type Query struct {
 	// The projection to return. Defaults to returning all properties.
-	Projection []*Projection `protobuf:"bytes,2,rep,name=projection" json:"projection,omitempty"`
+	Projection []*Projection `protobuf:"bytes,2,rep,name=projection,proto3" json:"projection,omitempty"`
 	// The kinds to query (if empty, returns entities of all kinds).
 	// Currently at most 1 kind may be specified.
-	Kind []*KindExpression `protobuf:"bytes,3,rep,name=kind" json:"kind,omitempty"`
+	Kind []*KindExpression `protobuf:"bytes,3,rep,name=kind,proto3" json:"kind,omitempty"`
 	// The filter to apply.
-	Filter *Filter `protobuf:"bytes,4,opt,name=filter" json:"filter,omitempty"`
+	Filter *Filter `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The order to apply to the query results (if empty, order is unspecified).
-	Order []*PropertyOrder `protobuf:"bytes,5,rep,name=order" json:"order,omitempty"`
+	Order []*PropertyOrder `protobuf:"bytes,5,rep,name=order,proto3" json:"order,omitempty"`
 	// The properties to make distinct. The query results will contain the first
 	// result for each distinct combination of values for the given properties
 	// (if empty, all results are returned).
-	DistinctOn []*PropertyReference `protobuf:"bytes,6,rep,name=distinct_on,json=distinctOn" json:"distinct_on,omitempty"`
+	DistinctOn []*PropertyReference `protobuf:"bytes,6,rep,name=distinct_on,json=distinctOn,proto3" json:"distinct_on,omitempty"`
 	// A starting point for the query results. Query cursors are
 	// returned in query result batches and
 	// [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
@@ -256,18 +292,40 @@ type Query struct {
 	EndCursor []byte `protobuf:"bytes,8,opt,name=end_cursor,json=endCursor,proto3" json:"end_cursor,omitempty"`
 	// The number of results to skip. Applies before limit, but after all other
 	// constraints. Optional. Must be >= 0 if specified.
-	Offset int32 `protobuf:"varint,10,opt,name=offset" json:"offset,omitempty"`
+	Offset int32 `protobuf:"varint,10,opt,name=offset,proto3" json:"offset,omitempty"`
 	// The maximum number of results to return. Applies after all other
 	// constraints. Optional.
 	// Unspecified is interpreted as no limit.
 	// Must be >= 0 if specified.
-	Limit *google_protobuf3.Int32Value `protobuf:"bytes,12,opt,name=limit" json:"limit,omitempty"`
+	Limit                *wrappers.Int32Value `protobuf:"bytes,12,opt,name=limit,proto3" json:"limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *Query) Reset()                    { *m = Query{} }
-func (m *Query) String() string            { return proto.CompactTextString(m) }
-func (*Query) ProtoMessage()               {}
-func (*Query) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (m *Query) Reset()         { *m = Query{} }
+func (m *Query) String() string { return proto.CompactTextString(m) }
+func (*Query) ProtoMessage()    {}
+func (*Query) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{1}
+}
+func (m *Query) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Query.Unmarshal(m, b)
+}
+func (m *Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Query.Marshal(b, m, deterministic)
+}
+func (dst *Query) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Query.Merge(dst, src)
+}
+func (m *Query) XXX_Size() int {
+	return xxx_messageInfo_Query.Size(m)
+}
+func (m *Query) XXX_DiscardUnknown() {
+	xxx_messageInfo_Query.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Query proto.InternalMessageInfo
 
 func (m *Query) GetProjection() []*Projection {
 	if m != nil {
@@ -325,7 +383,7 @@ func (m *Query) GetOffset() int32 {
 	return 0
 }
 
-func (m *Query) GetLimit() *google_protobuf3.Int32Value {
+func (m *Query) GetLimit() *wrappers.Int32Value {
 	if m != nil {
 		return m.Limit
 	}
@@ -335,13 +393,35 @@ func (m *Query) GetLimit() *google_protobuf3.Int32Value {
 // A representation of a kind.
 type KindExpression struct {
 	// The name of the kind.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KindExpression) Reset()         { *m = KindExpression{} }
+func (m *KindExpression) String() string { return proto.CompactTextString(m) }
+func (*KindExpression) ProtoMessage()    {}
+func (*KindExpression) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{2}
+}
+func (m *KindExpression) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KindExpression.Unmarshal(m, b)
+}
+func (m *KindExpression) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KindExpression.Marshal(b, m, deterministic)
+}
+func (dst *KindExpression) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KindExpression.Merge(dst, src)
+}
+func (m *KindExpression) XXX_Size() int {
+	return xxx_messageInfo_KindExpression.Size(m)
+}
+func (m *KindExpression) XXX_DiscardUnknown() {
+	xxx_messageInfo_KindExpression.DiscardUnknown(m)
 }
 
-func (m *KindExpression) Reset()                    { *m = KindExpression{} }
-func (m *KindExpression) String() string            { return proto.CompactTextString(m) }
-func (*KindExpression) ProtoMessage()               {}
-func (*KindExpression) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_KindExpression proto.InternalMessageInfo
 
 func (m *KindExpression) GetName() string {
 	if m != nil {
@@ -354,13 +434,35 @@ func (m *KindExpression) GetName() string {
 type PropertyReference struct {
 	// The name of the property.
 	// If name includes "."s, it may be interpreted as a property name path.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PropertyReference) Reset()         { *m = PropertyReference{} }
+func (m *PropertyReference) String() string { return proto.CompactTextString(m) }
+func (*PropertyReference) ProtoMessage()    {}
+func (*PropertyReference) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{3}
+}
+func (m *PropertyReference) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PropertyReference.Unmarshal(m, b)
+}
+func (m *PropertyReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PropertyReference.Marshal(b, m, deterministic)
+}
+func (dst *PropertyReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyReference.Merge(dst, src)
+}
+func (m *PropertyReference) XXX_Size() int {
+	return xxx_messageInfo_PropertyReference.Size(m)
+}
+func (m *PropertyReference) XXX_DiscardUnknown() {
+	xxx_messageInfo_PropertyReference.DiscardUnknown(m)
 }
 
-func (m *PropertyReference) Reset()                    { *m = PropertyReference{} }
-func (m *PropertyReference) String() string            { return proto.CompactTextString(m) }
-func (*PropertyReference) ProtoMessage()               {}
-func (*PropertyReference) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_PropertyReference proto.InternalMessageInfo
 
 func (m *PropertyReference) GetName() string {
 	if m != nil {
@@ -372,13 +474,35 @@ func (m *PropertyReference) GetName() string {
 // A representation of a property in a projection.
 type Projection struct {
 	// The property to project.
-	Property *PropertyReference `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property             *PropertyReference `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Projection) Reset()         { *m = Projection{} }
+func (m *Projection) String() string { return proto.CompactTextString(m) }
+func (*Projection) ProtoMessage()    {}
+func (*Projection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{4}
+}
+func (m *Projection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Projection.Unmarshal(m, b)
+}
+func (m *Projection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Projection.Marshal(b, m, deterministic)
+}
+func (dst *Projection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Projection.Merge(dst, src)
+}
+func (m *Projection) XXX_Size() int {
+	return xxx_messageInfo_Projection.Size(m)
+}
+func (m *Projection) XXX_DiscardUnknown() {
+	xxx_messageInfo_Projection.DiscardUnknown(m)
 }
 
-func (m *Projection) Reset()                    { *m = Projection{} }
-func (m *Projection) String() string            { return proto.CompactTextString(m) }
-func (*Projection) ProtoMessage()               {}
-func (*Projection) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_Projection proto.InternalMessageInfo
 
 func (m *Projection) GetProperty() *PropertyReference {
 	if m != nil {
@@ -390,15 +514,37 @@ func (m *Projection) GetProperty() *PropertyReference {
 // The desired order for a specific property.
 type PropertyOrder struct {
 	// The property to order by.
-	Property *PropertyReference `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *PropertyReference `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The direction to order by. Defaults to `ASCENDING`.
-	Direction PropertyOrder_Direction `protobuf:"varint,2,opt,name=direction,enum=google.datastore.v1.PropertyOrder_Direction" json:"direction,omitempty"`
+	Direction            PropertyOrder_Direction `protobuf:"varint,2,opt,name=direction,proto3,enum=google.datastore.v1.PropertyOrder_Direction" json:"direction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *PropertyOrder) Reset()         { *m = PropertyOrder{} }
+func (m *PropertyOrder) String() string { return proto.CompactTextString(m) }
+func (*PropertyOrder) ProtoMessage()    {}
+func (*PropertyOrder) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{5}
+}
+func (m *PropertyOrder) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PropertyOrder.Unmarshal(m, b)
+}
+func (m *PropertyOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PropertyOrder.Marshal(b, m, deterministic)
+}
+func (dst *PropertyOrder) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyOrder.Merge(dst, src)
+}
+func (m *PropertyOrder) XXX_Size() int {
+	return xxx_messageInfo_PropertyOrder.Size(m)
+}
+func (m *PropertyOrder) XXX_DiscardUnknown() {
+	xxx_messageInfo_PropertyOrder.DiscardUnknown(m)
 }
 
-func (m *PropertyOrder) Reset()                    { *m = PropertyOrder{} }
-func (m *PropertyOrder) String() string            { return proto.CompactTextString(m) }
-func (*PropertyOrder) ProtoMessage()               {}
-func (*PropertyOrder) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_PropertyOrder proto.InternalMessageInfo
 
 func (m *PropertyOrder) GetProperty() *PropertyReference {
 	if m != nil {
@@ -421,27 +567,51 @@ type Filter struct {
 	// Types that are valid to be assigned to FilterType:
 	//	*Filter_CompositeFilter
 	//	*Filter_PropertyFilter
-	FilterType isFilter_FilterType `protobuf_oneof:"filter_type"`
+	FilterType           isFilter_FilterType `protobuf_oneof:"filter_type"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *Filter) Reset()                    { *m = Filter{} }
-func (m *Filter) String() string            { return proto.CompactTextString(m) }
-func (*Filter) ProtoMessage()               {}
-func (*Filter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+func (m *Filter) Reset()         { *m = Filter{} }
+func (m *Filter) String() string { return proto.CompactTextString(m) }
+func (*Filter) ProtoMessage()    {}
+func (*Filter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{6}
+}
+func (m *Filter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Filter.Unmarshal(m, b)
+}
+func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Filter.Marshal(b, m, deterministic)
+}
+func (dst *Filter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Filter.Merge(dst, src)
+}
+func (m *Filter) XXX_Size() int {
+	return xxx_messageInfo_Filter.Size(m)
+}
+func (m *Filter) XXX_DiscardUnknown() {
+	xxx_messageInfo_Filter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Filter proto.InternalMessageInfo
 
 type isFilter_FilterType interface {
 	isFilter_FilterType()
 }
 
 type Filter_CompositeFilter struct {
-	CompositeFilter *CompositeFilter `protobuf:"bytes,1,opt,name=composite_filter,json=compositeFilter,oneof"`
+	CompositeFilter *CompositeFilter `protobuf:"bytes,1,opt,name=composite_filter,json=compositeFilter,proto3,oneof"`
 }
+
 type Filter_PropertyFilter struct {
-	PropertyFilter *PropertyFilter `protobuf:"bytes,2,opt,name=property_filter,json=propertyFilter,oneof"`
+	PropertyFilter *PropertyFilter `protobuf:"bytes,2,opt,name=property_filter,json=propertyFilter,proto3,oneof"`
 }
 
 func (*Filter_CompositeFilter) isFilter_FilterType() {}
-func (*Filter_PropertyFilter) isFilter_FilterType()  {}
+
+func (*Filter_PropertyFilter) isFilter_FilterType() {}
 
 func (m *Filter) GetFilterType() isFilter_FilterType {
 	if m != nil {
@@ -523,12 +693,12 @@ func _Filter_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.FilterType.(type) {
 	case *Filter_CompositeFilter:
 		s := proto.Size(x.CompositeFilter)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Filter_PropertyFilter:
 		s := proto.Size(x.PropertyFilter)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -541,16 +711,38 @@ func _Filter_OneofSizer(msg proto.Message) (n int) {
 // A filter that merges multiple other filters using the given operator.
 type CompositeFilter struct {
 	// The operator for combining multiple filters.
-	Op CompositeFilter_Operator `protobuf:"varint,1,opt,name=op,enum=google.datastore.v1.CompositeFilter_Operator" json:"op,omitempty"`
+	Op CompositeFilter_Operator `protobuf:"varint,1,opt,name=op,proto3,enum=google.datastore.v1.CompositeFilter_Operator" json:"op,omitempty"`
 	// The list of filters to combine.
 	// Must contain at least one filter.
-	Filters []*Filter `protobuf:"bytes,2,rep,name=filters" json:"filters,omitempty"`
+	Filters              []*Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CompositeFilter) Reset()         { *m = CompositeFilter{} }
+func (m *CompositeFilter) String() string { return proto.CompactTextString(m) }
+func (*CompositeFilter) ProtoMessage()    {}
+func (*CompositeFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{7}
+}
+func (m *CompositeFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CompositeFilter.Unmarshal(m, b)
+}
+func (m *CompositeFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CompositeFilter.Marshal(b, m, deterministic)
+}
+func (dst *CompositeFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompositeFilter.Merge(dst, src)
+}
+func (m *CompositeFilter) XXX_Size() int {
+	return xxx_messageInfo_CompositeFilter.Size(m)
+}
+func (m *CompositeFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_CompositeFilter.DiscardUnknown(m)
 }
 
-func (m *CompositeFilter) Reset()                    { *m = CompositeFilter{} }
-func (m *CompositeFilter) String() string            { return proto.CompactTextString(m) }
-func (*CompositeFilter) ProtoMessage()               {}
-func (*CompositeFilter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+var xxx_messageInfo_CompositeFilter proto.InternalMessageInfo
 
 func (m *CompositeFilter) GetOp() CompositeFilter_Operator {
 	if m != nil {
@@ -569,17 +761,39 @@ func (m *CompositeFilter) GetFilters() []*Filter {
 // A filter on a specific property.
 type PropertyFilter struct {
 	// The property to filter by.
-	Property *PropertyReference `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *PropertyReference `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The operator to filter by.
-	Op PropertyFilter_Operator `protobuf:"varint,2,opt,name=op,enum=google.datastore.v1.PropertyFilter_Operator" json:"op,omitempty"`
+	Op PropertyFilter_Operator `protobuf:"varint,2,opt,name=op,proto3,enum=google.datastore.v1.PropertyFilter_Operator" json:"op,omitempty"`
 	// The value to compare the property to.
-	Value *Value `protobuf:"bytes,3,opt,name=value" json:"value,omitempty"`
+	Value                *Value   `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PropertyFilter) Reset()         { *m = PropertyFilter{} }
+func (m *PropertyFilter) String() string { return proto.CompactTextString(m) }
+func (*PropertyFilter) ProtoMessage()    {}
+func (*PropertyFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{8}
+}
+func (m *PropertyFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PropertyFilter.Unmarshal(m, b)
+}
+func (m *PropertyFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PropertyFilter.Marshal(b, m, deterministic)
+}
+func (dst *PropertyFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyFilter.Merge(dst, src)
+}
+func (m *PropertyFilter) XXX_Size() int {
+	return xxx_messageInfo_PropertyFilter.Size(m)
+}
+func (m *PropertyFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_PropertyFilter.DiscardUnknown(m)
 }
 
-func (m *PropertyFilter) Reset()                    { *m = PropertyFilter{} }
-func (m *PropertyFilter) String() string            { return proto.CompactTextString(m) }
-func (*PropertyFilter) ProtoMessage()               {}
-func (*PropertyFilter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+var xxx_messageInfo_PropertyFilter proto.InternalMessageInfo
 
 func (m *PropertyFilter) GetProperty() *PropertyReference {
 	if m != nil {
@@ -606,30 +820,52 @@ func (m *PropertyFilter) GetValue() *Value {
 type GqlQuery struct {
 	// A string of the format described
 	// [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
-	QueryString string `protobuf:"bytes,1,opt,name=query_string,json=queryString" json:"query_string,omitempty"`
+	QueryString string `protobuf:"bytes,1,opt,name=query_string,json=queryString,proto3" json:"query_string,omitempty"`
 	// When false, the query string must not contain any literals and instead must
 	// bind all values. For example,
 	// `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while
 	// `SELECT * FROM Kind WHERE a = @value` is.
-	AllowLiterals bool `protobuf:"varint,2,opt,name=allow_literals,json=allowLiterals" json:"allow_literals,omitempty"`
+	AllowLiterals bool `protobuf:"varint,2,opt,name=allow_literals,json=allowLiterals,proto3" json:"allow_literals,omitempty"`
 	// For each non-reserved named binding site in the query string, there must be
 	// a named parameter with that name, but not necessarily the inverse.
 	//
 	// Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
 	// `__.*__`, and must not be `""`.
-	NamedBindings map[string]*GqlQueryParameter `protobuf:"bytes,5,rep,name=named_bindings,json=namedBindings" json:"named_bindings,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	NamedBindings map[string]*GqlQueryParameter `protobuf:"bytes,5,rep,name=named_bindings,json=namedBindings,proto3" json:"named_bindings,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Numbered binding site @1 references the first numbered parameter,
 	// effectively using 1-based indexing, rather than the usual 0.
 	//
 	// For each binding site numbered i in `query_string`, there must be an i-th
 	// numbered parameter. The inverse must also be true.
-	PositionalBindings []*GqlQueryParameter `protobuf:"bytes,4,rep,name=positional_bindings,json=positionalBindings" json:"positional_bindings,omitempty"`
+	PositionalBindings   []*GqlQueryParameter `protobuf:"bytes,4,rep,name=positional_bindings,json=positionalBindings,proto3" json:"positional_bindings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *GqlQuery) Reset()                    { *m = GqlQuery{} }
-func (m *GqlQuery) String() string            { return proto.CompactTextString(m) }
-func (*GqlQuery) ProtoMessage()               {}
-func (*GqlQuery) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+func (m *GqlQuery) Reset()         { *m = GqlQuery{} }
+func (m *GqlQuery) String() string { return proto.CompactTextString(m) }
+func (*GqlQuery) ProtoMessage()    {}
+func (*GqlQuery) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{9}
+}
+func (m *GqlQuery) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GqlQuery.Unmarshal(m, b)
+}
+func (m *GqlQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GqlQuery.Marshal(b, m, deterministic)
+}
+func (dst *GqlQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GqlQuery.Merge(dst, src)
+}
+func (m *GqlQuery) XXX_Size() int {
+	return xxx_messageInfo_GqlQuery.Size(m)
+}
+func (m *GqlQuery) XXX_DiscardUnknown() {
+	xxx_messageInfo_GqlQuery.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GqlQuery proto.InternalMessageInfo
 
 func (m *GqlQuery) GetQueryString() string {
 	if m != nil {
@@ -666,26 +902,50 @@ type GqlQueryParameter struct {
 	// Types that are valid to be assigned to ParameterType:
 	//	*GqlQueryParameter_Value
 	//	*GqlQueryParameter_Cursor
-	ParameterType isGqlQueryParameter_ParameterType `protobuf_oneof:"parameter_type"`
+	ParameterType        isGqlQueryParameter_ParameterType `protobuf_oneof:"parameter_type"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *GqlQueryParameter) Reset()         { *m = GqlQueryParameter{} }
+func (m *GqlQueryParameter) String() string { return proto.CompactTextString(m) }
+func (*GqlQueryParameter) ProtoMessage()    {}
+func (*GqlQueryParameter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{10}
+}
+func (m *GqlQueryParameter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GqlQueryParameter.Unmarshal(m, b)
+}
+func (m *GqlQueryParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GqlQueryParameter.Marshal(b, m, deterministic)
+}
+func (dst *GqlQueryParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GqlQueryParameter.Merge(dst, src)
+}
+func (m *GqlQueryParameter) XXX_Size() int {
+	return xxx_messageInfo_GqlQueryParameter.Size(m)
+}
+func (m *GqlQueryParameter) XXX_DiscardUnknown() {
+	xxx_messageInfo_GqlQueryParameter.DiscardUnknown(m)
 }
 
-func (m *GqlQueryParameter) Reset()                    { *m = GqlQueryParameter{} }
-func (m *GqlQueryParameter) String() string            { return proto.CompactTextString(m) }
-func (*GqlQueryParameter) ProtoMessage()               {}
-func (*GqlQueryParameter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} }
+var xxx_messageInfo_GqlQueryParameter proto.InternalMessageInfo
 
 type isGqlQueryParameter_ParameterType interface {
 	isGqlQueryParameter_ParameterType()
 }
 
 type GqlQueryParameter_Value struct {
-	Value *Value `protobuf:"bytes,2,opt,name=value,oneof"`
+	Value *Value `protobuf:"bytes,2,opt,name=value,proto3,oneof"`
 }
+
 type GqlQueryParameter_Cursor struct {
 	Cursor []byte `protobuf:"bytes,3,opt,name=cursor,proto3,oneof"`
 }
 
-func (*GqlQueryParameter_Value) isGqlQueryParameter_ParameterType()  {}
+func (*GqlQueryParameter_Value) isGqlQueryParameter_ParameterType() {}
+
 func (*GqlQueryParameter_Cursor) isGqlQueryParameter_ParameterType() {}
 
 func (m *GqlQueryParameter) GetParameterType() isGqlQueryParameter_ParameterType {
@@ -765,11 +1025,11 @@ func _GqlQueryParameter_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.ParameterType.(type) {
 	case *GqlQueryParameter_Value:
 		s := proto.Size(x.Value)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GqlQueryParameter_Cursor:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Cursor)))
 		n += len(x.Cursor)
 	case nil:
@@ -782,18 +1042,18 @@ func _GqlQueryParameter_OneofSizer(msg proto.Message) (n int) {
 // A batch of results produced by a query.
 type QueryResultBatch struct {
 	// The number of results skipped, typically because of an offset.
-	SkippedResults int32 `protobuf:"varint,6,opt,name=skipped_results,json=skippedResults" json:"skipped_results,omitempty"`
+	SkippedResults int32 `protobuf:"varint,6,opt,name=skipped_results,json=skippedResults,proto3" json:"skipped_results,omitempty"`
 	// A cursor that points to the position after the last skipped result.
 	// Will be set when `skipped_results` != 0.
 	SkippedCursor []byte `protobuf:"bytes,3,opt,name=skipped_cursor,json=skippedCursor,proto3" json:"skipped_cursor,omitempty"`
 	// The result type for every entity in `entity_results`.
-	EntityResultType EntityResult_ResultType `protobuf:"varint,1,opt,name=entity_result_type,json=entityResultType,enum=google.datastore.v1.EntityResult_ResultType" json:"entity_result_type,omitempty"`
+	EntityResultType EntityResult_ResultType `protobuf:"varint,1,opt,name=entity_result_type,json=entityResultType,proto3,enum=google.datastore.v1.EntityResult_ResultType" json:"entity_result_type,omitempty"`
 	// The results for this batch.
-	EntityResults []*EntityResult `protobuf:"bytes,2,rep,name=entity_results,json=entityResults" json:"entity_results,omitempty"`
+	EntityResults []*EntityResult `protobuf:"bytes,2,rep,name=entity_results,json=entityResults,proto3" json:"entity_results,omitempty"`
 	// A cursor that points to the position after the last result in the batch.
 	EndCursor []byte `protobuf:"bytes,4,opt,name=end_cursor,json=endCursor,proto3" json:"end_cursor,omitempty"`
 	// The state of the query after the current batch.
-	MoreResults QueryResultBatch_MoreResultsType `protobuf:"varint,5,opt,name=more_results,json=moreResults,enum=google.datastore.v1.QueryResultBatch_MoreResultsType" json:"more_results,omitempty"`
+	MoreResults QueryResultBatch_MoreResultsType `protobuf:"varint,5,opt,name=more_results,json=moreResults,proto3,enum=google.datastore.v1.QueryResultBatch_MoreResultsType" json:"more_results,omitempty"`
 	// The version number of the snapshot this batch was returned from.
 	// This applies to the range of results from the query's `start_cursor` (or
 	// the beginning of the query if no cursor was given) to this batch's
@@ -803,13 +1063,35 @@ type QueryResultBatch struct {
 	// can have a greater snapshot version number. Each batch's snapshot version
 	// is valid for all preceding batches.
 	// The value will be zero for eventually consistent queries.
-	SnapshotVersion int64 `protobuf:"varint,7,opt,name=snapshot_version,json=snapshotVersion" json:"snapshot_version,omitempty"`
+	SnapshotVersion      int64    `protobuf:"varint,7,opt,name=snapshot_version,json=snapshotVersion,proto3" json:"snapshot_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *QueryResultBatch) Reset()                    { *m = QueryResultBatch{} }
-func (m *QueryResultBatch) String() string            { return proto.CompactTextString(m) }
-func (*QueryResultBatch) ProtoMessage()               {}
-func (*QueryResultBatch) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} }
+func (m *QueryResultBatch) Reset()         { *m = QueryResultBatch{} }
+func (m *QueryResultBatch) String() string { return proto.CompactTextString(m) }
+func (*QueryResultBatch) ProtoMessage()    {}
+func (*QueryResultBatch) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_2312a1dfc5fd06f2, []int{11}
+}
+func (m *QueryResultBatch) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryResultBatch.Unmarshal(m, b)
+}
+func (m *QueryResultBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryResultBatch.Marshal(b, m, deterministic)
+}
+func (dst *QueryResultBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResultBatch.Merge(dst, src)
+}
+func (m *QueryResultBatch) XXX_Size() int {
+	return xxx_messageInfo_QueryResultBatch.Size(m)
+}
+func (m *QueryResultBatch) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryResultBatch.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryResultBatch proto.InternalMessageInfo
 
 func (m *QueryResultBatch) GetSkippedResults() int32 {
 	if m != nil {
@@ -871,6 +1153,7 @@ func init() {
 	proto.RegisterType((*CompositeFilter)(nil), "google.datastore.v1.CompositeFilter")
 	proto.RegisterType((*PropertyFilter)(nil), "google.datastore.v1.PropertyFilter")
 	proto.RegisterType((*GqlQuery)(nil), "google.datastore.v1.GqlQuery")
+	proto.RegisterMapType((map[string]*GqlQueryParameter)(nil), "google.datastore.v1.GqlQuery.NamedBindingsEntry")
 	proto.RegisterType((*GqlQueryParameter)(nil), "google.datastore.v1.GqlQueryParameter")
 	proto.RegisterType((*QueryResultBatch)(nil), "google.datastore.v1.QueryResultBatch")
 	proto.RegisterEnum("google.datastore.v1.EntityResult_ResultType", EntityResult_ResultType_name, EntityResult_ResultType_value)
@@ -880,9 +1163,11 @@ func init() {
 	proto.RegisterEnum("google.datastore.v1.QueryResultBatch_MoreResultsType", QueryResultBatch_MoreResultsType_name, QueryResultBatch_MoreResultsType_value)
 }
 
-func init() { proto.RegisterFile("google/datastore/v1/query.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/datastore/v1/query.proto", fileDescriptor_query_2312a1dfc5fd06f2)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_query_2312a1dfc5fd06f2 = []byte{
 	// 1313 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x72, 0xd3, 0x46,
 	0x14, 0x8e, 0x64, 0x3b, 0x89, 0x8f, 0xff, 0xc4, 0xd2, 0x82, 0x08, 0x50, 0x12, 0x41, 0x4b, 0x3a,
diff --git a/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/datastore.pb.go b/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/datastore.pb.go
index 4330f528..6fbf502d 100644
--- a/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/datastore.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/datastore.pb.go
@@ -1,52 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/datastore.proto
 
-/*
-Package datastore is a generated protocol buffer package.
-
-It is generated from these files:
-	google/datastore/v1beta3/datastore.proto
-	google/datastore/v1beta3/entity.proto
-	google/datastore/v1beta3/query.proto
-
-It has these top-level messages:
-	LookupRequest
-	LookupResponse
-	RunQueryRequest
-	RunQueryResponse
-	BeginTransactionRequest
-	BeginTransactionResponse
-	RollbackRequest
-	RollbackResponse
-	CommitRequest
-	CommitResponse
-	AllocateIdsRequest
-	AllocateIdsResponse
-	ReserveIdsRequest
-	ReserveIdsResponse
-	Mutation
-	MutationResult
-	ReadOptions
-	TransactionOptions
-	PartitionId
-	Key
-	ArrayValue
-	Value
-	Entity
-	EntityResult
-	Query
-	KindExpression
-	PropertyReference
-	Projection
-	PropertyOrder
-	Filter
-	CompositeFilter
-	PropertyFilter
-	GqlQuery
-	GqlQueryParameter
-	QueryResultBatch
-*/
-package datastore
+package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -96,7 +51,9 @@ var CommitRequest_Mode_value = map[string]int32{
 func (x CommitRequest_Mode) String() string {
 	return proto.EnumName(CommitRequest_Mode_name, int32(x))
 }
-func (CommitRequest_Mode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{8, 0} }
+func (CommitRequest_Mode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{8, 0}
+}
 
 // The possible values for read consistencies.
 type ReadOptions_ReadConsistency int32
@@ -125,23 +82,45 @@ func (x ReadOptions_ReadConsistency) String() string {
 	return proto.EnumName(ReadOptions_ReadConsistency_name, int32(x))
 }
 func (ReadOptions_ReadConsistency) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{16, 0}
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{16, 0}
 }
 
 // The request for [Datastore.Lookup][google.datastore.v1beta3.Datastore.Lookup].
 type LookupRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The options for this lookup request.
-	ReadOptions *ReadOptions `protobuf:"bytes,1,opt,name=read_options,json=readOptions" json:"read_options,omitempty"`
+	ReadOptions *ReadOptions `protobuf:"bytes,1,opt,name=read_options,json=readOptions,proto3" json:"read_options,omitempty"`
 	// Keys of entities to look up.
-	Keys []*Key `protobuf:"bytes,3,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*Key   `protobuf:"bytes,3,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LookupRequest) Reset()         { *m = LookupRequest{} }
+func (m *LookupRequest) String() string { return proto.CompactTextString(m) }
+func (*LookupRequest) ProtoMessage()    {}
+func (*LookupRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{0}
+}
+func (m *LookupRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LookupRequest.Unmarshal(m, b)
+}
+func (m *LookupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LookupRequest.Marshal(b, m, deterministic)
+}
+func (dst *LookupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupRequest.Merge(dst, src)
+}
+func (m *LookupRequest) XXX_Size() int {
+	return xxx_messageInfo_LookupRequest.Size(m)
+}
+func (m *LookupRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_LookupRequest.DiscardUnknown(m)
 }
 
-func (m *LookupRequest) Reset()                    { *m = LookupRequest{} }
-func (m *LookupRequest) String() string            { return proto.CompactTextString(m) }
-func (*LookupRequest) ProtoMessage()               {}
-func (*LookupRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_LookupRequest proto.InternalMessageInfo
 
 func (m *LookupRequest) GetProjectId() string {
 	if m != nil {
@@ -169,21 +148,43 @@ type LookupResponse struct {
 	// Entities found as `ResultType.FULL` entities. The order of results in this
 	// field is undefined and has no relation to the order of the keys in the
 	// input.
-	Found []*EntityResult `protobuf:"bytes,1,rep,name=found" json:"found,omitempty"`
+	Found []*EntityResult `protobuf:"bytes,1,rep,name=found,proto3" json:"found,omitempty"`
 	// Entities not found as `ResultType.KEY_ONLY` entities. The order of results
 	// in this field is undefined and has no relation to the order of the keys
 	// in the input.
-	Missing []*EntityResult `protobuf:"bytes,2,rep,name=missing" json:"missing,omitempty"`
+	Missing []*EntityResult `protobuf:"bytes,2,rep,name=missing,proto3" json:"missing,omitempty"`
 	// A list of keys that were not looked up due to resource constraints. The
 	// order of results in this field is undefined and has no relation to the
 	// order of the keys in the input.
-	Deferred []*Key `protobuf:"bytes,3,rep,name=deferred" json:"deferred,omitempty"`
+	Deferred             []*Key   `protobuf:"bytes,3,rep,name=deferred,proto3" json:"deferred,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *LookupResponse) Reset()                    { *m = LookupResponse{} }
-func (m *LookupResponse) String() string            { return proto.CompactTextString(m) }
-func (*LookupResponse) ProtoMessage()               {}
-func (*LookupResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *LookupResponse) Reset()         { *m = LookupResponse{} }
+func (m *LookupResponse) String() string { return proto.CompactTextString(m) }
+func (*LookupResponse) ProtoMessage()    {}
+func (*LookupResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{1}
+}
+func (m *LookupResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LookupResponse.Unmarshal(m, b)
+}
+func (m *LookupResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LookupResponse.Marshal(b, m, deterministic)
+}
+func (dst *LookupResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LookupResponse.Merge(dst, src)
+}
+func (m *LookupResponse) XXX_Size() int {
+	return xxx_messageInfo_LookupResponse.Size(m)
+}
+func (m *LookupResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_LookupResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LookupResponse proto.InternalMessageInfo
 
 func (m *LookupResponse) GetFound() []*EntityResult {
 	if m != nil {
@@ -209,48 +210,49 @@ func (m *LookupResponse) GetDeferred() []*Key {
 // The request for [Datastore.RunQuery][google.datastore.v1beta3.Datastore.RunQuery].
 type RunQueryRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Entities are partitioned into subsets, identified by a partition ID.
 	// Queries are scoped to a single partition.
 	// This partition ID is normalized with the standard default context
 	// partition ID.
-	PartitionId *PartitionId `protobuf:"bytes,2,opt,name=partition_id,json=partitionId" json:"partition_id,omitempty"`
+	PartitionId *PartitionId `protobuf:"bytes,2,opt,name=partition_id,json=partitionId,proto3" json:"partition_id,omitempty"`
 	// The options for this query.
-	ReadOptions *ReadOptions `protobuf:"bytes,1,opt,name=read_options,json=readOptions" json:"read_options,omitempty"`
+	ReadOptions *ReadOptions `protobuf:"bytes,1,opt,name=read_options,json=readOptions,proto3" json:"read_options,omitempty"`
 	// The type of query.
 	//
 	// Types that are valid to be assigned to QueryType:
 	//	*RunQueryRequest_Query
 	//	*RunQueryRequest_GqlQuery
-	QueryType isRunQueryRequest_QueryType `protobuf_oneof:"query_type"`
+	QueryType            isRunQueryRequest_QueryType `protobuf_oneof:"query_type"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
-func (m *RunQueryRequest) Reset()                    { *m = RunQueryRequest{} }
-func (m *RunQueryRequest) String() string            { return proto.CompactTextString(m) }
-func (*RunQueryRequest) ProtoMessage()               {}
-func (*RunQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-type isRunQueryRequest_QueryType interface {
-	isRunQueryRequest_QueryType()
+func (m *RunQueryRequest) Reset()         { *m = RunQueryRequest{} }
+func (m *RunQueryRequest) String() string { return proto.CompactTextString(m) }
+func (*RunQueryRequest) ProtoMessage()    {}
+func (*RunQueryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{2}
 }
-
-type RunQueryRequest_Query struct {
-	Query *Query `protobuf:"bytes,3,opt,name=query,oneof"`
+func (m *RunQueryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunQueryRequest.Unmarshal(m, b)
 }
-type RunQueryRequest_GqlQuery struct {
-	GqlQuery *GqlQuery `protobuf:"bytes,7,opt,name=gql_query,json=gqlQuery,oneof"`
+func (m *RunQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunQueryRequest.Marshal(b, m, deterministic)
 }
-
-func (*RunQueryRequest_Query) isRunQueryRequest_QueryType()    {}
-func (*RunQueryRequest_GqlQuery) isRunQueryRequest_QueryType() {}
-
-func (m *RunQueryRequest) GetQueryType() isRunQueryRequest_QueryType {
-	if m != nil {
-		return m.QueryType
-	}
-	return nil
+func (dst *RunQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryRequest.Merge(dst, src)
+}
+func (m *RunQueryRequest) XXX_Size() int {
+	return xxx_messageInfo_RunQueryRequest.Size(m)
+}
+func (m *RunQueryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunQueryRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_RunQueryRequest proto.InternalMessageInfo
+
 func (m *RunQueryRequest) GetProjectId() string {
 	if m != nil {
 		return m.ProjectId
@@ -272,6 +274,29 @@ func (m *RunQueryRequest) GetReadOptions() *ReadOptions {
 	return nil
 }
 
+type isRunQueryRequest_QueryType interface {
+	isRunQueryRequest_QueryType()
+}
+
+type RunQueryRequest_Query struct {
+	Query *Query `protobuf:"bytes,3,opt,name=query,proto3,oneof"`
+}
+
+type RunQueryRequest_GqlQuery struct {
+	GqlQuery *GqlQuery `protobuf:"bytes,7,opt,name=gql_query,json=gqlQuery,proto3,oneof"`
+}
+
+func (*RunQueryRequest_Query) isRunQueryRequest_QueryType() {}
+
+func (*RunQueryRequest_GqlQuery) isRunQueryRequest_QueryType() {}
+
+func (m *RunQueryRequest) GetQueryType() isRunQueryRequest_QueryType {
+	if m != nil {
+		return m.QueryType
+	}
+	return nil
+}
+
 func (m *RunQueryRequest) GetQuery() *Query {
 	if x, ok := m.GetQueryType().(*RunQueryRequest_Query); ok {
 		return x.Query
@@ -345,12 +370,12 @@ func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.QueryType.(type) {
 	case *RunQueryRequest_Query:
 		s := proto.Size(x.Query)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RunQueryRequest_GqlQuery:
 		s := proto.Size(x.GqlQuery)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -363,15 +388,37 @@ func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
 // The response for [Datastore.RunQuery][google.datastore.v1beta3.Datastore.RunQuery].
 type RunQueryResponse struct {
 	// A batch of query results (always present).
-	Batch *QueryResultBatch `protobuf:"bytes,1,opt,name=batch" json:"batch,omitempty"`
+	Batch *QueryResultBatch `protobuf:"bytes,1,opt,name=batch,proto3" json:"batch,omitempty"`
 	// The parsed form of the `GqlQuery` from the request, if it was set.
-	Query *Query `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
+	Query                *Query   `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RunQueryResponse) Reset()                    { *m = RunQueryResponse{} }
-func (m *RunQueryResponse) String() string            { return proto.CompactTextString(m) }
-func (*RunQueryResponse) ProtoMessage()               {}
-func (*RunQueryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *RunQueryResponse) Reset()         { *m = RunQueryResponse{} }
+func (m *RunQueryResponse) String() string { return proto.CompactTextString(m) }
+func (*RunQueryResponse) ProtoMessage()    {}
+func (*RunQueryResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{3}
+}
+func (m *RunQueryResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunQueryResponse.Unmarshal(m, b)
+}
+func (m *RunQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunQueryResponse.Marshal(b, m, deterministic)
+}
+func (dst *RunQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryResponse.Merge(dst, src)
+}
+func (m *RunQueryResponse) XXX_Size() int {
+	return xxx_messageInfo_RunQueryResponse.Size(m)
+}
+func (m *RunQueryResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunQueryResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RunQueryResponse proto.InternalMessageInfo
 
 func (m *RunQueryResponse) GetBatch() *QueryResultBatch {
 	if m != nil {
@@ -390,15 +437,37 @@ func (m *RunQueryResponse) GetQuery() *Query {
 // The request for [Datastore.BeginTransaction][google.datastore.v1beta3.Datastore.BeginTransaction].
 type BeginTransactionRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Options for a new transaction.
-	TransactionOptions *TransactionOptions `protobuf:"bytes,10,opt,name=transaction_options,json=transactionOptions" json:"transaction_options,omitempty"`
+	TransactionOptions   *TransactionOptions `protobuf:"bytes,10,opt,name=transaction_options,json=transactionOptions,proto3" json:"transaction_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *BeginTransactionRequest) Reset()                    { *m = BeginTransactionRequest{} }
-func (m *BeginTransactionRequest) String() string            { return proto.CompactTextString(m) }
-func (*BeginTransactionRequest) ProtoMessage()               {}
-func (*BeginTransactionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest{} }
+func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
+func (*BeginTransactionRequest) ProtoMessage()    {}
+func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{4}
+}
+func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
+}
+func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
+}
+func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+}
+func (m *BeginTransactionRequest) XXX_Size() int {
+	return xxx_messageInfo_BeginTransactionRequest.Size(m)
+}
+func (m *BeginTransactionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BeginTransactionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BeginTransactionRequest proto.InternalMessageInfo
 
 func (m *BeginTransactionRequest) GetProjectId() string {
 	if m != nil {
@@ -417,13 +486,35 @@ func (m *BeginTransactionRequest) GetTransactionOptions() *TransactionOptions {
 // The response for [Datastore.BeginTransaction][google.datastore.v1beta3.Datastore.BeginTransaction].
 type BeginTransactionResponse struct {
 	// The transaction identifier (always present).
-	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	Transaction          []byte   `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BeginTransactionResponse) Reset()                    { *m = BeginTransactionResponse{} }
-func (m *BeginTransactionResponse) String() string            { return proto.CompactTextString(m) }
-func (*BeginTransactionResponse) ProtoMessage()               {}
-func (*BeginTransactionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *BeginTransactionResponse) Reset()         { *m = BeginTransactionResponse{} }
+func (m *BeginTransactionResponse) String() string { return proto.CompactTextString(m) }
+func (*BeginTransactionResponse) ProtoMessage()    {}
+func (*BeginTransactionResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{5}
+}
+func (m *BeginTransactionResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BeginTransactionResponse.Unmarshal(m, b)
+}
+func (m *BeginTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BeginTransactionResponse.Marshal(b, m, deterministic)
+}
+func (dst *BeginTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionResponse.Merge(dst, src)
+}
+func (m *BeginTransactionResponse) XXX_Size() int {
+	return xxx_messageInfo_BeginTransactionResponse.Size(m)
+}
+func (m *BeginTransactionResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BeginTransactionResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BeginTransactionResponse proto.InternalMessageInfo
 
 func (m *BeginTransactionResponse) GetTransaction() []byte {
 	if m != nil {
@@ -435,16 +526,38 @@ func (m *BeginTransactionResponse) GetTransaction() []byte {
 // The request for [Datastore.Rollback][google.datastore.v1beta3.Datastore.Rollback].
 type RollbackRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The transaction identifier, returned by a call to
 	// [Datastore.BeginTransaction][google.datastore.v1beta3.Datastore.BeginTransaction].
-	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	Transaction          []byte   `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
+func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
+func (*RollbackRequest) ProtoMessage()    {}
+func (*RollbackRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{6}
+}
+func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
+}
+func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
+}
+func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+}
+func (m *RollbackRequest) XXX_Size() int {
+	return xxx_messageInfo_RollbackRequest.Size(m)
+}
+func (m *RollbackRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackRequest.DiscardUnknown(m)
 }
 
-func (m *RollbackRequest) Reset()                    { *m = RollbackRequest{} }
-func (m *RollbackRequest) String() string            { return proto.CompactTextString(m) }
-func (*RollbackRequest) ProtoMessage()               {}
-func (*RollbackRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_RollbackRequest proto.InternalMessageInfo
 
 func (m *RollbackRequest) GetProjectId() string {
 	if m != nil {
@@ -463,19 +576,41 @@ func (m *RollbackRequest) GetTransaction() []byte {
 // The response for [Datastore.Rollback][google.datastore.v1beta3.Datastore.Rollback].
 // (an empty message).
 type RollbackResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RollbackResponse) Reset()                    { *m = RollbackResponse{} }
-func (m *RollbackResponse) String() string            { return proto.CompactTextString(m) }
-func (*RollbackResponse) ProtoMessage()               {}
-func (*RollbackResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *RollbackResponse) Reset()         { *m = RollbackResponse{} }
+func (m *RollbackResponse) String() string { return proto.CompactTextString(m) }
+func (*RollbackResponse) ProtoMessage()    {}
+func (*RollbackResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{7}
+}
+func (m *RollbackResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackResponse.Unmarshal(m, b)
+}
+func (m *RollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackResponse.Marshal(b, m, deterministic)
+}
+func (dst *RollbackResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackResponse.Merge(dst, src)
+}
+func (m *RollbackResponse) XXX_Size() int {
+	return xxx_messageInfo_RollbackResponse.Size(m)
+}
+func (m *RollbackResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RollbackResponse proto.InternalMessageInfo
 
 // The request for [Datastore.Commit][google.datastore.v1beta3.Datastore.Commit].
 type CommitRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The type of commit to perform. Defaults to `TRANSACTIONAL`.
-	Mode CommitRequest_Mode `protobuf:"varint,5,opt,name=mode,enum=google.datastore.v1beta3.CommitRequest_Mode" json:"mode,omitempty"`
+	Mode CommitRequest_Mode `protobuf:"varint,5,opt,name=mode,proto3,enum=google.datastore.v1beta3.CommitRequest_Mode" json:"mode,omitempty"`
 	// Must be set when mode is `TRANSACTIONAL`.
 	//
 	// Types that are valid to be assigned to TransactionSelector:
@@ -494,30 +629,35 @@ type CommitRequest struct {
 	//
 	// When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
 	// entity.
-	Mutations []*Mutation `protobuf:"bytes,6,rep,name=mutations" json:"mutations,omitempty"`
+	Mutations            []*Mutation `protobuf:"bytes,6,rep,name=mutations,proto3" json:"mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *CommitRequest) Reset()                    { *m = CommitRequest{} }
-func (m *CommitRequest) String() string            { return proto.CompactTextString(m) }
-func (*CommitRequest) ProtoMessage()               {}
-func (*CommitRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-type isCommitRequest_TransactionSelector interface {
-	isCommitRequest_TransactionSelector()
+func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
+func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
+func (*CommitRequest) ProtoMessage()    {}
+func (*CommitRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{8}
 }
-
-type CommitRequest_Transaction struct {
-	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3,oneof"`
+func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
 }
-
-func (*CommitRequest_Transaction) isCommitRequest_TransactionSelector() {}
-
-func (m *CommitRequest) GetTransactionSelector() isCommitRequest_TransactionSelector {
-	if m != nil {
-		return m.TransactionSelector
-	}
-	return nil
+func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
+}
+func (dst *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(dst, src)
+}
+func (m *CommitRequest) XXX_Size() int {
+	return xxx_messageInfo_CommitRequest.Size(m)
 }
+func (m *CommitRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommitRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommitRequest proto.InternalMessageInfo
 
 func (m *CommitRequest) GetProjectId() string {
 	if m != nil {
@@ -533,6 +673,23 @@ func (m *CommitRequest) GetMode() CommitRequest_Mode {
 	return CommitRequest_MODE_UNSPECIFIED
 }
 
+type isCommitRequest_TransactionSelector interface {
+	isCommitRequest_TransactionSelector()
+}
+
+type CommitRequest_Transaction struct {
+	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3,oneof"`
+}
+
+func (*CommitRequest_Transaction) isCommitRequest_TransactionSelector() {}
+
+func (m *CommitRequest) GetTransactionSelector() isCommitRequest_TransactionSelector {
+	if m != nil {
+		return m.TransactionSelector
+	}
+	return nil
+}
+
 func (m *CommitRequest) GetTransaction() []byte {
 	if x, ok := m.GetTransactionSelector().(*CommitRequest_Transaction); ok {
 		return x.Transaction
@@ -588,7 +745,7 @@ func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
 	// transaction_selector
 	switch x := m.TransactionSelector.(type) {
 	case *CommitRequest_Transaction:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Transaction)))
 		n += len(x.Transaction)
 	case nil:
@@ -602,16 +759,38 @@ func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
 type CommitResponse struct {
 	// The result of performing the mutations.
 	// The i-th mutation result corresponds to the i-th mutation in the request.
-	MutationResults []*MutationResult `protobuf:"bytes,3,rep,name=mutation_results,json=mutationResults" json:"mutation_results,omitempty"`
+	MutationResults []*MutationResult `protobuf:"bytes,3,rep,name=mutation_results,json=mutationResults,proto3" json:"mutation_results,omitempty"`
 	// The number of index entries updated during the commit, or zero if none were
 	// updated.
-	IndexUpdates int32 `protobuf:"varint,4,opt,name=index_updates,json=indexUpdates" json:"index_updates,omitempty"`
+	IndexUpdates         int32    `protobuf:"varint,4,opt,name=index_updates,json=indexUpdates,proto3" json:"index_updates,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
+func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
+func (*CommitResponse) ProtoMessage()    {}
+func (*CommitResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{9}
+}
+func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
+}
+func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
+}
+func (dst *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(dst, src)
+}
+func (m *CommitResponse) XXX_Size() int {
+	return xxx_messageInfo_CommitResponse.Size(m)
+}
+func (m *CommitResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommitResponse.DiscardUnknown(m)
 }
 
-func (m *CommitResponse) Reset()                    { *m = CommitResponse{} }
-func (m *CommitResponse) String() string            { return proto.CompactTextString(m) }
-func (*CommitResponse) ProtoMessage()               {}
-func (*CommitResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_CommitResponse proto.InternalMessageInfo
 
 func (m *CommitResponse) GetMutationResults() []*MutationResult {
 	if m != nil {
@@ -630,16 +809,38 @@ func (m *CommitResponse) GetIndexUpdates() int32 {
 // The request for [Datastore.AllocateIds][google.datastore.v1beta3.Datastore.AllocateIds].
 type AllocateIdsRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// A list of keys with incomplete key paths for which to allocate IDs.
 	// No key may be reserved/read-only.
-	Keys []*Key `protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*Key   `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AllocateIdsRequest) Reset()         { *m = AllocateIdsRequest{} }
+func (m *AllocateIdsRequest) String() string { return proto.CompactTextString(m) }
+func (*AllocateIdsRequest) ProtoMessage()    {}
+func (*AllocateIdsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{10}
+}
+func (m *AllocateIdsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AllocateIdsRequest.Unmarshal(m, b)
+}
+func (m *AllocateIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AllocateIdsRequest.Marshal(b, m, deterministic)
+}
+func (dst *AllocateIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateIdsRequest.Merge(dst, src)
+}
+func (m *AllocateIdsRequest) XXX_Size() int {
+	return xxx_messageInfo_AllocateIdsRequest.Size(m)
+}
+func (m *AllocateIdsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AllocateIdsRequest.DiscardUnknown(m)
 }
 
-func (m *AllocateIdsRequest) Reset()                    { *m = AllocateIdsRequest{} }
-func (m *AllocateIdsRequest) String() string            { return proto.CompactTextString(m) }
-func (*AllocateIdsRequest) ProtoMessage()               {}
-func (*AllocateIdsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_AllocateIdsRequest proto.InternalMessageInfo
 
 func (m *AllocateIdsRequest) GetProjectId() string {
 	if m != nil {
@@ -659,13 +860,35 @@ func (m *AllocateIdsRequest) GetKeys() []*Key {
 type AllocateIdsResponse struct {
 	// The keys specified in the request (in the same order), each with
 	// its key path completed with a newly allocated ID.
-	Keys []*Key `protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*Key   `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AllocateIdsResponse) Reset()                    { *m = AllocateIdsResponse{} }
-func (m *AllocateIdsResponse) String() string            { return proto.CompactTextString(m) }
-func (*AllocateIdsResponse) ProtoMessage()               {}
-func (*AllocateIdsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *AllocateIdsResponse) Reset()         { *m = AllocateIdsResponse{} }
+func (m *AllocateIdsResponse) String() string { return proto.CompactTextString(m) }
+func (*AllocateIdsResponse) ProtoMessage()    {}
+func (*AllocateIdsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{11}
+}
+func (m *AllocateIdsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AllocateIdsResponse.Unmarshal(m, b)
+}
+func (m *AllocateIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AllocateIdsResponse.Marshal(b, m, deterministic)
+}
+func (dst *AllocateIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AllocateIdsResponse.Merge(dst, src)
+}
+func (m *AllocateIdsResponse) XXX_Size() int {
+	return xxx_messageInfo_AllocateIdsResponse.Size(m)
+}
+func (m *AllocateIdsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AllocateIdsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AllocateIdsResponse proto.InternalMessageInfo
 
 func (m *AllocateIdsResponse) GetKeys() []*Key {
 	if m != nil {
@@ -677,18 +900,40 @@ func (m *AllocateIdsResponse) GetKeys() []*Key {
 // The request for [Datastore.ReserveIds][google.datastore.v1beta3.Datastore.ReserveIds].
 type ReserveIdsRequest struct {
 	// The ID of the project against which to make the request.
-	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,8,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// If not empty, the ID of the database against which to make the request.
-	DatabaseId string `protobuf:"bytes,9,opt,name=database_id,json=databaseId" json:"database_id,omitempty"`
+	DatabaseId string `protobuf:"bytes,9,opt,name=database_id,json=databaseId,proto3" json:"database_id,omitempty"`
 	// A list of keys with complete key paths whose numeric IDs should not be
 	// auto-allocated.
-	Keys []*Key `protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*Key   `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ReserveIdsRequest) Reset()                    { *m = ReserveIdsRequest{} }
-func (m *ReserveIdsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReserveIdsRequest) ProtoMessage()               {}
-func (*ReserveIdsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *ReserveIdsRequest) Reset()         { *m = ReserveIdsRequest{} }
+func (m *ReserveIdsRequest) String() string { return proto.CompactTextString(m) }
+func (*ReserveIdsRequest) ProtoMessage()    {}
+func (*ReserveIdsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{12}
+}
+func (m *ReserveIdsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReserveIdsRequest.Unmarshal(m, b)
+}
+func (m *ReserveIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReserveIdsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReserveIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReserveIdsRequest.Merge(dst, src)
+}
+func (m *ReserveIdsRequest) XXX_Size() int {
+	return xxx_messageInfo_ReserveIdsRequest.Size(m)
+}
+func (m *ReserveIdsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReserveIdsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReserveIdsRequest proto.InternalMessageInfo
 
 func (m *ReserveIdsRequest) GetProjectId() string {
 	if m != nil {
@@ -713,12 +958,34 @@ func (m *ReserveIdsRequest) GetKeys() []*Key {
 
 // The response for [Datastore.ReserveIds][google.datastore.v1beta3.Datastore.ReserveIds].
 type ReserveIdsResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReserveIdsResponse) Reset()         { *m = ReserveIdsResponse{} }
+func (m *ReserveIdsResponse) String() string { return proto.CompactTextString(m) }
+func (*ReserveIdsResponse) ProtoMessage()    {}
+func (*ReserveIdsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{13}
+}
+func (m *ReserveIdsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReserveIdsResponse.Unmarshal(m, b)
+}
+func (m *ReserveIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReserveIdsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReserveIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReserveIdsResponse.Merge(dst, src)
+}
+func (m *ReserveIdsResponse) XXX_Size() int {
+	return xxx_messageInfo_ReserveIdsResponse.Size(m)
+}
+func (m *ReserveIdsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReserveIdsResponse.DiscardUnknown(m)
 }
 
-func (m *ReserveIdsResponse) Reset()                    { *m = ReserveIdsResponse{} }
-func (m *ReserveIdsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReserveIdsResponse) ProtoMessage()               {}
-func (*ReserveIdsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_ReserveIdsResponse proto.InternalMessageInfo
 
 // A mutation to apply to an entity.
 type Mutation struct {
@@ -744,41 +1011,62 @@ type Mutation struct {
 	// Types that are valid to be assigned to ConflictDetectionStrategy:
 	//	*Mutation_BaseVersion
 	ConflictDetectionStrategy isMutation_ConflictDetectionStrategy `protobuf_oneof:"conflict_detection_strategy"`
+	XXX_NoUnkeyedLiteral      struct{}                             `json:"-"`
+	XXX_unrecognized          []byte                               `json:"-"`
+	XXX_sizecache             int32                                `json:"-"`
 }
 
-func (m *Mutation) Reset()                    { *m = Mutation{} }
-func (m *Mutation) String() string            { return proto.CompactTextString(m) }
-func (*Mutation) ProtoMessage()               {}
-func (*Mutation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *Mutation) Reset()         { *m = Mutation{} }
+func (m *Mutation) String() string { return proto.CompactTextString(m) }
+func (*Mutation) ProtoMessage()    {}
+func (*Mutation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{14}
+}
+func (m *Mutation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation.Unmarshal(m, b)
+}
+func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
+}
+func (dst *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(dst, src)
+}
+func (m *Mutation) XXX_Size() int {
+	return xxx_messageInfo_Mutation.Size(m)
+}
+func (m *Mutation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation proto.InternalMessageInfo
 
 type isMutation_Operation interface {
 	isMutation_Operation()
 }
-type isMutation_ConflictDetectionStrategy interface {
-	isMutation_ConflictDetectionStrategy()
-}
 
 type Mutation_Insert struct {
-	Insert *Entity `protobuf:"bytes,4,opt,name=insert,oneof"`
+	Insert *Entity `protobuf:"bytes,4,opt,name=insert,proto3,oneof"`
 }
+
 type Mutation_Update struct {
-	Update *Entity `protobuf:"bytes,5,opt,name=update,oneof"`
+	Update *Entity `protobuf:"bytes,5,opt,name=update,proto3,oneof"`
 }
+
 type Mutation_Upsert struct {
-	Upsert *Entity `protobuf:"bytes,6,opt,name=upsert,oneof"`
+	Upsert *Entity `protobuf:"bytes,6,opt,name=upsert,proto3,oneof"`
 }
+
 type Mutation_Delete struct {
-	Delete *Key `protobuf:"bytes,7,opt,name=delete,oneof"`
-}
-type Mutation_BaseVersion struct {
-	BaseVersion int64 `protobuf:"varint,8,opt,name=base_version,json=baseVersion,oneof"`
+	Delete *Key `protobuf:"bytes,7,opt,name=delete,proto3,oneof"`
 }
 
-func (*Mutation_Insert) isMutation_Operation()                      {}
-func (*Mutation_Update) isMutation_Operation()                      {}
-func (*Mutation_Upsert) isMutation_Operation()                      {}
-func (*Mutation_Delete) isMutation_Operation()                      {}
-func (*Mutation_BaseVersion) isMutation_ConflictDetectionStrategy() {}
+func (*Mutation_Insert) isMutation_Operation() {}
+
+func (*Mutation_Update) isMutation_Operation() {}
+
+func (*Mutation_Upsert) isMutation_Operation() {}
+
+func (*Mutation_Delete) isMutation_Operation() {}
 
 func (m *Mutation) GetOperation() isMutation_Operation {
 	if m != nil {
@@ -786,12 +1074,6 @@ func (m *Mutation) GetOperation() isMutation_Operation {
 	}
 	return nil
 }
-func (m *Mutation) GetConflictDetectionStrategy() isMutation_ConflictDetectionStrategy {
-	if m != nil {
-		return m.ConflictDetectionStrategy
-	}
-	return nil
-}
 
 func (m *Mutation) GetInsert() *Entity {
 	if x, ok := m.GetOperation().(*Mutation_Insert); ok {
@@ -821,6 +1103,23 @@ func (m *Mutation) GetDelete() *Key {
 	return nil
 }
 
+type isMutation_ConflictDetectionStrategy interface {
+	isMutation_ConflictDetectionStrategy()
+}
+
+type Mutation_BaseVersion struct {
+	BaseVersion int64 `protobuf:"varint,8,opt,name=base_version,json=baseVersion,proto3,oneof"`
+}
+
+func (*Mutation_BaseVersion) isMutation_ConflictDetectionStrategy() {}
+
+func (m *Mutation) GetConflictDetectionStrategy() isMutation_ConflictDetectionStrategy {
+	if m != nil {
+		return m.ConflictDetectionStrategy
+	}
+	return nil
+}
+
 func (m *Mutation) GetBaseVersion() int64 {
 	if x, ok := m.GetConflictDetectionStrategy().(*Mutation_BaseVersion); ok {
 		return x.BaseVersion
@@ -932,22 +1231,22 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Operation.(type) {
 	case *Mutation_Insert:
 		s := proto.Size(x.Insert)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Update:
 		s := proto.Size(x.Update)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Upsert:
 		s := proto.Size(x.Upsert)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Delete:
 		s := proto.Size(x.Delete)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -957,7 +1256,7 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 	// conflict_detection_strategy
 	switch x := m.ConflictDetectionStrategy.(type) {
 	case *Mutation_BaseVersion:
-		n += proto.SizeVarint(8<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.BaseVersion))
 	case nil:
 	default:
@@ -970,22 +1269,44 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 type MutationResult struct {
 	// The automatically allocated key.
 	// Set only when the mutation allocated a key.
-	Key *Key `protobuf:"bytes,3,opt,name=key" json:"key,omitempty"`
+	Key *Key `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
 	// The version of the entity on the server after processing the mutation. If
 	// the mutation doesn't change anything on the server, then the version will
 	// be the version of the current entity or, if no entity is present, a version
 	// that is strictly greater than the version of any previous entity and less
 	// than the version of any possible future entity.
-	Version int64 `protobuf:"varint,4,opt,name=version" json:"version,omitempty"`
+	Version int64 `protobuf:"varint,4,opt,name=version,proto3" json:"version,omitempty"`
 	// Whether a conflict was detected for this mutation. Always false when a
 	// conflict detection strategy field is not set in the mutation.
-	ConflictDetected bool `protobuf:"varint,5,opt,name=conflict_detected,json=conflictDetected" json:"conflict_detected,omitempty"`
+	ConflictDetected     bool     `protobuf:"varint,5,opt,name=conflict_detected,json=conflictDetected,proto3" json:"conflict_detected,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *MutationResult) Reset()                    { *m = MutationResult{} }
-func (m *MutationResult) String() string            { return proto.CompactTextString(m) }
-func (*MutationResult) ProtoMessage()               {}
-func (*MutationResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *MutationResult) Reset()         { *m = MutationResult{} }
+func (m *MutationResult) String() string { return proto.CompactTextString(m) }
+func (*MutationResult) ProtoMessage()    {}
+func (*MutationResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{15}
+}
+func (m *MutationResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutationResult.Unmarshal(m, b)
+}
+func (m *MutationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutationResult.Marshal(b, m, deterministic)
+}
+func (dst *MutationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutationResult.Merge(dst, src)
+}
+func (m *MutationResult) XXX_Size() int {
+	return xxx_messageInfo_MutationResult.Size(m)
+}
+func (m *MutationResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutationResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutationResult proto.InternalMessageInfo
 
 func (m *MutationResult) GetKey() *Key {
 	if m != nil {
@@ -1017,27 +1338,51 @@ type ReadOptions struct {
 	// Types that are valid to be assigned to ConsistencyType:
 	//	*ReadOptions_ReadConsistency_
 	//	*ReadOptions_Transaction
-	ConsistencyType isReadOptions_ConsistencyType `protobuf_oneof:"consistency_type"`
+	ConsistencyType      isReadOptions_ConsistencyType `protobuf_oneof:"consistency_type"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *ReadOptions) Reset()         { *m = ReadOptions{} }
+func (m *ReadOptions) String() string { return proto.CompactTextString(m) }
+func (*ReadOptions) ProtoMessage()    {}
+func (*ReadOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{16}
+}
+func (m *ReadOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadOptions.Unmarshal(m, b)
+}
+func (m *ReadOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadOptions.Marshal(b, m, deterministic)
+}
+func (dst *ReadOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadOptions.Merge(dst, src)
+}
+func (m *ReadOptions) XXX_Size() int {
+	return xxx_messageInfo_ReadOptions.Size(m)
+}
+func (m *ReadOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadOptions.DiscardUnknown(m)
 }
 
-func (m *ReadOptions) Reset()                    { *m = ReadOptions{} }
-func (m *ReadOptions) String() string            { return proto.CompactTextString(m) }
-func (*ReadOptions) ProtoMessage()               {}
-func (*ReadOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_ReadOptions proto.InternalMessageInfo
 
 type isReadOptions_ConsistencyType interface {
 	isReadOptions_ConsistencyType()
 }
 
 type ReadOptions_ReadConsistency_ struct {
-	ReadConsistency ReadOptions_ReadConsistency `protobuf:"varint,1,opt,name=read_consistency,json=readConsistency,enum=google.datastore.v1beta3.ReadOptions_ReadConsistency,oneof"`
+	ReadConsistency ReadOptions_ReadConsistency `protobuf:"varint,1,opt,name=read_consistency,json=readConsistency,proto3,enum=google.datastore.v1beta3.ReadOptions_ReadConsistency,oneof"`
 }
+
 type ReadOptions_Transaction struct {
 	Transaction []byte `protobuf:"bytes,2,opt,name=transaction,proto3,oneof"`
 }
 
 func (*ReadOptions_ReadConsistency_) isReadOptions_ConsistencyType() {}
-func (*ReadOptions_Transaction) isReadOptions_ConsistencyType()      {}
+
+func (*ReadOptions_Transaction) isReadOptions_ConsistencyType() {}
 
 func (m *ReadOptions) GetConsistencyType() isReadOptions_ConsistencyType {
 	if m != nil {
@@ -1112,10 +1457,10 @@ func _ReadOptions_OneofSizer(msg proto.Message) (n int) {
 	// consistency_type
 	switch x := m.ConsistencyType.(type) {
 	case *ReadOptions_ReadConsistency_:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.ReadConsistency))
 	case *ReadOptions_Transaction:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Transaction)))
 		n += len(x.Transaction)
 	case nil:
@@ -1137,27 +1482,51 @@ type TransactionOptions struct {
 	// Types that are valid to be assigned to Mode:
 	//	*TransactionOptions_ReadWrite_
 	//	*TransactionOptions_ReadOnly_
-	Mode isTransactionOptions_Mode `protobuf_oneof:"mode"`
+	Mode                 isTransactionOptions_Mode `protobuf_oneof:"mode"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *TransactionOptions) Reset()                    { *m = TransactionOptions{} }
-func (m *TransactionOptions) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions) ProtoMessage()               {}
-func (*TransactionOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
+func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions) ProtoMessage()    {}
+func (*TransactionOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{17}
+}
+func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
+}
+func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+}
+func (m *TransactionOptions) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions.Size(m)
+}
+func (m *TransactionOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransactionOptions proto.InternalMessageInfo
 
 type isTransactionOptions_Mode interface {
 	isTransactionOptions_Mode()
 }
 
 type TransactionOptions_ReadWrite_ struct {
-	ReadWrite *TransactionOptions_ReadWrite `protobuf:"bytes,1,opt,name=read_write,json=readWrite,oneof"`
+	ReadWrite *TransactionOptions_ReadWrite `protobuf:"bytes,1,opt,name=read_write,json=readWrite,proto3,oneof"`
 }
+
 type TransactionOptions_ReadOnly_ struct {
-	ReadOnly *TransactionOptions_ReadOnly `protobuf:"bytes,2,opt,name=read_only,json=readOnly,oneof"`
+	ReadOnly *TransactionOptions_ReadOnly `protobuf:"bytes,2,opt,name=read_only,json=readOnly,proto3,oneof"`
 }
 
 func (*TransactionOptions_ReadWrite_) isTransactionOptions_Mode() {}
-func (*TransactionOptions_ReadOnly_) isTransactionOptions_Mode()  {}
+
+func (*TransactionOptions_ReadOnly_) isTransactionOptions_Mode() {}
 
 func (m *TransactionOptions) GetMode() isTransactionOptions_Mode {
 	if m != nil {
@@ -1239,12 +1608,12 @@ func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Mode.(type) {
 	case *TransactionOptions_ReadWrite_:
 		s := proto.Size(x.ReadWrite)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransactionOptions_ReadOnly_:
 		s := proto.Size(x.ReadOnly)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1257,16 +1626,36 @@ func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
 // Options specific to read / write transactions.
 type TransactionOptions_ReadWrite struct {
 	// The transaction identifier of the transaction being retried.
-	PreviousTransaction []byte `protobuf:"bytes,1,opt,name=previous_transaction,json=previousTransaction,proto3" json:"previous_transaction,omitempty"`
+	PreviousTransaction  []byte   `protobuf:"bytes,1,opt,name=previous_transaction,json=previousTransaction,proto3" json:"previous_transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions_ReadWrite{} }
 func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
 func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
 func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{17, 0}
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{17, 0}
+}
+func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
+}
+func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+}
+func (m *TransactionOptions_ReadWrite) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
+}
+func (m *TransactionOptions_ReadWrite) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions_ReadWrite.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_TransactionOptions_ReadWrite proto.InternalMessageInfo
+
 func (m *TransactionOptions_ReadWrite) GetPreviousTransaction() []byte {
 	if m != nil {
 		return m.PreviousTransaction
@@ -1276,12 +1665,34 @@ func (m *TransactionOptions_ReadWrite) GetPreviousTransaction() []byte {
 
 // Options specific to read-only transactions.
 type TransactionOptions_ReadOnly struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TransactionOptions_ReadOnly) Reset()                    { *m = TransactionOptions_ReadOnly{} }
-func (m *TransactionOptions_ReadOnly) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions_ReadOnly) ProtoMessage()               {}
-func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17, 1} }
+func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_ReadOnly{} }
+func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
+func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datastore_e879c8d0a88da1b3, []int{17, 1}
+}
+func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
+}
+func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+}
+func (m *TransactionOptions_ReadOnly) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
+}
+func (m *TransactionOptions_ReadOnly) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions_ReadOnly.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransactionOptions_ReadOnly proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*LookupRequest)(nil), "google.datastore.v1beta3.LookupRequest")
@@ -1316,8 +1727,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Datastore service
-
+// DatastoreClient is the client API for Datastore service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DatastoreClient interface {
 	// Looks up entities by key.
 	Lookup(ctx context.Context, in *LookupRequest, opts ...grpc.CallOption) (*LookupResponse, error)
@@ -1348,7 +1760,7 @@ func NewDatastoreClient(cc *grpc.ClientConn) DatastoreClient {
 
 func (c *datastoreClient) Lookup(ctx context.Context, in *LookupRequest, opts ...grpc.CallOption) (*LookupResponse, error) {
 	out := new(LookupResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/Lookup", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/Lookup", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1357,7 +1769,7 @@ func (c *datastoreClient) Lookup(ctx context.Context, in *LookupRequest, opts ..
 
 func (c *datastoreClient) RunQuery(ctx context.Context, in *RunQueryRequest, opts ...grpc.CallOption) (*RunQueryResponse, error) {
 	out := new(RunQueryResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/RunQuery", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/RunQuery", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1366,7 +1778,7 @@ func (c *datastoreClient) RunQuery(ctx context.Context, in *RunQueryRequest, opt
 
 func (c *datastoreClient) BeginTransaction(ctx context.Context, in *BeginTransactionRequest, opts ...grpc.CallOption) (*BeginTransactionResponse, error) {
 	out := new(BeginTransactionResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/BeginTransaction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/BeginTransaction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1375,7 +1787,7 @@ func (c *datastoreClient) BeginTransaction(ctx context.Context, in *BeginTransac
 
 func (c *datastoreClient) Commit(ctx context.Context, in *CommitRequest, opts ...grpc.CallOption) (*CommitResponse, error) {
 	out := new(CommitResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/Commit", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/Commit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1384,7 +1796,7 @@ func (c *datastoreClient) Commit(ctx context.Context, in *CommitRequest, opts ..
 
 func (c *datastoreClient) Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*RollbackResponse, error) {
 	out := new(RollbackResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/Rollback", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/Rollback", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1393,7 +1805,7 @@ func (c *datastoreClient) Rollback(ctx context.Context, in *RollbackRequest, opt
 
 func (c *datastoreClient) AllocateIds(ctx context.Context, in *AllocateIdsRequest, opts ...grpc.CallOption) (*AllocateIdsResponse, error) {
 	out := new(AllocateIdsResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/AllocateIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/AllocateIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1402,15 +1814,14 @@ func (c *datastoreClient) AllocateIds(ctx context.Context, in *AllocateIdsReques
 
 func (c *datastoreClient) ReserveIds(ctx context.Context, in *ReserveIdsRequest, opts ...grpc.CallOption) (*ReserveIdsResponse, error) {
 	out := new(ReserveIdsResponse)
-	err := grpc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/ReserveIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.datastore.v1beta3.Datastore/ReserveIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Datastore service
-
+// DatastoreServer is the server API for Datastore service.
 type DatastoreServer interface {
 	// Looks up entities by key.
 	Lookup(context.Context, *LookupRequest) (*LookupResponse, error)
@@ -1598,9 +2009,11 @@ var _Datastore_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/datastore/v1beta3/datastore.proto",
 }
 
-func init() { proto.RegisterFile("google/datastore/v1beta3/datastore.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/datastore/v1beta3/datastore.proto", fileDescriptor_datastore_e879c8d0a88da1b3)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_datastore_e879c8d0a88da1b3 = []byte{
 	// 1403 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc5,
 	0x17, 0xcf, 0x38, 0x89, 0x6b, 0x3f, 0xe7, 0x87, 0x33, 0xcd, 0xf7, 0x8b, 0x65, 0x5a, 0x6a, 0x6d,
diff --git a/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/entity.pb.go b/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/entity.pb.go
index 390ca207..93c83a6b 100644
--- a/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/entity.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/entity.pb.go
@@ -1,21 +1,27 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/entity.proto
 
-package datastore
+package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-import google_type "google.golang.org/genproto/googleapis/type/latlng"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A partition ID identifies a grouping of entities. The grouping is always
 // by project and namespace, however the namespace ID may be empty.
 //
@@ -37,15 +43,37 @@ var _ = math.Inf
 // Reads and writes of foreign partition IDs may fail if the project is not in an active state.
 type PartitionId struct {
 	// The ID of the project to which the entities belong.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// If not empty, the ID of the namespace to which the entities belong.
-	NamespaceId string `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceId" json:"namespace_id,omitempty"`
+	NamespaceId          string   `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PartitionId) Reset()                    { *m = PartitionId{} }
-func (m *PartitionId) String() string            { return proto.CompactTextString(m) }
-func (*PartitionId) ProtoMessage()               {}
-func (*PartitionId) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *PartitionId) Reset()         { *m = PartitionId{} }
+func (m *PartitionId) String() string { return proto.CompactTextString(m) }
+func (*PartitionId) ProtoMessage()    {}
+func (*PartitionId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_01235876269a0b39, []int{0}
+}
+func (m *PartitionId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartitionId.Unmarshal(m, b)
+}
+func (m *PartitionId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartitionId.Marshal(b, m, deterministic)
+}
+func (dst *PartitionId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionId.Merge(dst, src)
+}
+func (m *PartitionId) XXX_Size() int {
+	return xxx_messageInfo_PartitionId.Size(m)
+}
+func (m *PartitionId) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartitionId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PartitionId proto.InternalMessageInfo
 
 func (m *PartitionId) GetProjectId() string {
 	if m != nil {
@@ -69,7 +97,7 @@ type Key struct {
 	// Entities are partitioned into subsets, currently identified by a project
 	// ID and namespace ID.
 	// Queries are scoped to a single partition.
-	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId" json:"partition_id,omitempty"`
+	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId,proto3" json:"partition_id,omitempty"`
 	// The entity path.
 	// An entity path consists of one or more elements composed of a kind and a
 	// string or numerical identifier, which identify entities. The first
@@ -86,13 +114,35 @@ type Key struct {
 	// identifier.
 	//
 	// A path can never be empty, and a path can have at most 100 elements.
-	Path []*Key_PathElement `protobuf:"bytes,2,rep,name=path" json:"path,omitempty"`
+	Path                 []*Key_PathElement `protobuf:"bytes,2,rep,name=path,proto3" json:"path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *Key) Reset()                    { *m = Key{} }
-func (m *Key) String() string            { return proto.CompactTextString(m) }
-func (*Key) ProtoMessage()               {}
-func (*Key) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *Key) Reset()         { *m = Key{} }
+func (m *Key) String() string { return proto.CompactTextString(m) }
+func (*Key) ProtoMessage()    {}
+func (*Key) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_01235876269a0b39, []int{1}
+}
+func (m *Key) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Key.Unmarshal(m, b)
+}
+func (m *Key) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Key.Marshal(b, m, deterministic)
+}
+func (dst *Key) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key.Merge(dst, src)
+}
+func (m *Key) XXX_Size() int {
+	return xxx_messageInfo_Key.Size(m)
+}
+func (m *Key) XXX_DiscardUnknown() {
+	xxx_messageInfo_Key.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Key proto.InternalMessageInfo
 
 func (m *Key) GetPartitionId() *PartitionId {
 	if m != nil {
@@ -117,32 +167,63 @@ type Key_PathElement struct {
 	// A kind matching regex `__.*__` is reserved/read-only.
 	// A kind must not contain more than 1500 bytes when UTF-8 encoded.
 	// Cannot be `""`.
-	Kind string `protobuf:"bytes,1,opt,name=kind" json:"kind,omitempty"`
+	Kind string `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"`
 	// The type of ID.
 	//
 	// Types that are valid to be assigned to IdType:
 	//	*Key_PathElement_Id
 	//	*Key_PathElement_Name
-	IdType isKey_PathElement_IdType `protobuf_oneof:"id_type"`
+	IdType               isKey_PathElement_IdType `protobuf_oneof:"id_type"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *Key_PathElement) Reset()                    { *m = Key_PathElement{} }
-func (m *Key_PathElement) String() string            { return proto.CompactTextString(m) }
-func (*Key_PathElement) ProtoMessage()               {}
-func (*Key_PathElement) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} }
+func (m *Key_PathElement) Reset()         { *m = Key_PathElement{} }
+func (m *Key_PathElement) String() string { return proto.CompactTextString(m) }
+func (*Key_PathElement) ProtoMessage()    {}
+func (*Key_PathElement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_01235876269a0b39, []int{1, 0}
+}
+func (m *Key_PathElement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Key_PathElement.Unmarshal(m, b)
+}
+func (m *Key_PathElement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Key_PathElement.Marshal(b, m, deterministic)
+}
+func (dst *Key_PathElement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key_PathElement.Merge(dst, src)
+}
+func (m *Key_PathElement) XXX_Size() int {
+	return xxx_messageInfo_Key_PathElement.Size(m)
+}
+func (m *Key_PathElement) XXX_DiscardUnknown() {
+	xxx_messageInfo_Key_PathElement.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Key_PathElement proto.InternalMessageInfo
+
+func (m *Key_PathElement) GetKind() string {
+	if m != nil {
+		return m.Kind
+	}
+	return ""
+}
 
 type isKey_PathElement_IdType interface {
 	isKey_PathElement_IdType()
 }
 
 type Key_PathElement_Id struct {
-	Id int64 `protobuf:"varint,2,opt,name=id,oneof"`
+	Id int64 `protobuf:"varint,2,opt,name=id,proto3,oneof"`
 }
+
 type Key_PathElement_Name struct {
-	Name string `protobuf:"bytes,3,opt,name=name,oneof"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3,oneof"`
 }
 
-func (*Key_PathElement_Id) isKey_PathElement_IdType()   {}
+func (*Key_PathElement_Id) isKey_PathElement_IdType() {}
+
 func (*Key_PathElement_Name) isKey_PathElement_IdType() {}
 
 func (m *Key_PathElement) GetIdType() isKey_PathElement_IdType {
@@ -152,13 +233,6 @@ func (m *Key_PathElement) GetIdType() isKey_PathElement_IdType {
 	return nil
 }
 
-func (m *Key_PathElement) GetKind() string {
-	if m != nil {
-		return m.Kind
-	}
-	return ""
-}
-
 func (m *Key_PathElement) GetId() int64 {
 	if x, ok := m.GetIdType().(*Key_PathElement_Id); ok {
 		return x.Id
@@ -225,10 +299,10 @@ func _Key_PathElement_OneofSizer(msg proto.Message) (n int) {
 	// id_type
 	switch x := m.IdType.(type) {
 	case *Key_PathElement_Id:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.Id))
 	case *Key_PathElement_Name:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Name)))
 		n += len(x.Name)
 	case nil:
@@ -243,13 +317,35 @@ type ArrayValue struct {
 	// Values in the array.
 	// The order of this array may not be preserved if it contains a mix of
 	// indexed and unindexed values.
-	Values []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
+	Values               []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ArrayValue) Reset()                    { *m = ArrayValue{} }
-func (m *ArrayValue) String() string            { return proto.CompactTextString(m) }
-func (*ArrayValue) ProtoMessage()               {}
-func (*ArrayValue) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *ArrayValue) Reset()         { *m = ArrayValue{} }
+func (m *ArrayValue) String() string { return proto.CompactTextString(m) }
+func (*ArrayValue) ProtoMessage()    {}
+func (*ArrayValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_01235876269a0b39, []int{2}
+}
+func (m *ArrayValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ArrayValue.Unmarshal(m, b)
+}
+func (m *ArrayValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ArrayValue.Marshal(b, m, deterministic)
+}
+func (dst *ArrayValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArrayValue.Merge(dst, src)
+}
+func (m *ArrayValue) XXX_Size() int {
+	return xxx_messageInfo_ArrayValue.Size(m)
+}
+func (m *ArrayValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_ArrayValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ArrayValue proto.InternalMessageInfo
 
 func (m *ArrayValue) GetValues() []*Value {
 	if m != nil {
@@ -277,66 +373,108 @@ type Value struct {
 	//	*Value_ArrayValue
 	ValueType isValue_ValueType `protobuf_oneof:"value_type"`
 	// The `meaning` field should only be populated for backwards compatibility.
-	Meaning int32 `protobuf:"varint,14,opt,name=meaning" json:"meaning,omitempty"`
+	Meaning int32 `protobuf:"varint,14,opt,name=meaning,proto3" json:"meaning,omitempty"`
 	// If the value should be excluded from all indexes including those defined
 	// explicitly.
-	ExcludeFromIndexes bool `protobuf:"varint,19,opt,name=exclude_from_indexes,json=excludeFromIndexes" json:"exclude_from_indexes,omitempty"`
+	ExcludeFromIndexes   bool     `protobuf:"varint,19,opt,name=exclude_from_indexes,json=excludeFromIndexes,proto3" json:"exclude_from_indexes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Value) Reset()         { *m = Value{} }
+func (m *Value) String() string { return proto.CompactTextString(m) }
+func (*Value) ProtoMessage()    {}
+func (*Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_01235876269a0b39, []int{3}
+}
+func (m *Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Value.Unmarshal(m, b)
+}
+func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
+}
+func (dst *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(dst, src)
+}
+func (m *Value) XXX_Size() int {
+	return xxx_messageInfo_Value.Size(m)
+}
+func (m *Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_Value.DiscardUnknown(m)
 }
 
-func (m *Value) Reset()                    { *m = Value{} }
-func (m *Value) String() string            { return proto.CompactTextString(m) }
-func (*Value) ProtoMessage()               {}
-func (*Value) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_Value proto.InternalMessageInfo
 
 type isValue_ValueType interface {
 	isValue_ValueType()
 }
 
 type Value_NullValue struct {
-	NullValue google_protobuf1.NullValue `protobuf:"varint,11,opt,name=null_value,json=nullValue,enum=google.protobuf.NullValue,oneof"`
+	NullValue _struct.NullValue `protobuf:"varint,11,opt,name=null_value,json=nullValue,proto3,enum=google.protobuf.NullValue,oneof"`
 }
+
 type Value_BooleanValue struct {
-	BooleanValue bool `protobuf:"varint,1,opt,name=boolean_value,json=booleanValue,oneof"`
+	BooleanValue bool `protobuf:"varint,1,opt,name=boolean_value,json=booleanValue,proto3,oneof"`
 }
+
 type Value_IntegerValue struct {
-	IntegerValue int64 `protobuf:"varint,2,opt,name=integer_value,json=integerValue,oneof"`
+	IntegerValue int64 `protobuf:"varint,2,opt,name=integer_value,json=integerValue,proto3,oneof"`
 }
+
 type Value_DoubleValue struct {
-	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,oneof"`
+	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,proto3,oneof"`
 }
+
 type Value_TimestampValue struct {
-	TimestampValue *google_protobuf2.Timestamp `protobuf:"bytes,10,opt,name=timestamp_value,json=timestampValue,oneof"`
+	TimestampValue *timestamp.Timestamp `protobuf:"bytes,10,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
 }
+
 type Value_KeyValue struct {
-	KeyValue *Key `protobuf:"bytes,5,opt,name=key_value,json=keyValue,oneof"`
+	KeyValue *Key `protobuf:"bytes,5,opt,name=key_value,json=keyValue,proto3,oneof"`
 }
+
 type Value_StringValue struct {
-	StringValue string `protobuf:"bytes,17,opt,name=string_value,json=stringValue,oneof"`
+	StringValue string `protobuf:"bytes,17,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
+
 type Value_BlobValue struct {
 	BlobValue []byte `protobuf:"bytes,18,opt,name=blob_value,json=blobValue,proto3,oneof"`
 }
+
 type Value_GeoPointValue struct {
-	GeoPointValue *google_type.LatLng `protobuf:"bytes,8,opt,name=geo_point_value,json=geoPointValue,oneof"`
+	GeoPointValue *latlng.LatLng `protobuf:"bytes,8,opt,name=geo_point_value,json=geoPointValue,proto3,oneof"`
 }
+
 type Value_EntityValue struct {
-	EntityValue *Entity `protobuf:"bytes,6,opt,name=entity_value,json=entityValue,oneof"`
+	EntityValue *Entity `protobuf:"bytes,6,opt,name=entity_value,json=entityValue,proto3,oneof"`
 }
+
 type Value_ArrayValue struct {
-	ArrayValue *ArrayValue `protobuf:"bytes,9,opt,name=array_value,json=arrayValue,oneof"`
+	ArrayValue *ArrayValue `protobuf:"bytes,9,opt,name=array_value,json=arrayValue,proto3,oneof"`
 }
 
-func (*Value_NullValue) isValue_ValueType()      {}
-func (*Value_BooleanValue) isValue_ValueType()   {}
-func (*Value_IntegerValue) isValue_ValueType()   {}
-func (*Value_DoubleValue) isValue_ValueType()    {}
+func (*Value_NullValue) isValue_ValueType() {}
+
+func (*Value_BooleanValue) isValue_ValueType() {}
+
+func (*Value_IntegerValue) isValue_ValueType() {}
+
+func (*Value_DoubleValue) isValue_ValueType() {}
+
 func (*Value_TimestampValue) isValue_ValueType() {}
-func (*Value_KeyValue) isValue_ValueType()       {}
-func (*Value_StringValue) isValue_ValueType()    {}
-func (*Value_BlobValue) isValue_ValueType()      {}
-func (*Value_GeoPointValue) isValue_ValueType()  {}
-func (*Value_EntityValue) isValue_ValueType()    {}
-func (*Value_ArrayValue) isValue_ValueType()     {}
+
+func (*Value_KeyValue) isValue_ValueType() {}
+
+func (*Value_StringValue) isValue_ValueType() {}
+
+func (*Value_BlobValue) isValue_ValueType() {}
+
+func (*Value_GeoPointValue) isValue_ValueType() {}
+
+func (*Value_EntityValue) isValue_ValueType() {}
+
+func (*Value_ArrayValue) isValue_ValueType() {}
 
 func (m *Value) GetValueType() isValue_ValueType {
 	if m != nil {
@@ -345,11 +483,11 @@ func (m *Value) GetValueType() isValue_ValueType {
 	return nil
 }
 
-func (m *Value) GetNullValue() google_protobuf1.NullValue {
+func (m *Value) GetNullValue() _struct.NullValue {
 	if x, ok := m.GetValueType().(*Value_NullValue); ok {
 		return x.NullValue
 	}
-	return google_protobuf1.NullValue_NULL_VALUE
+	return _struct.NullValue_NULL_VALUE
 }
 
 func (m *Value) GetBooleanValue() bool {
@@ -373,7 +511,7 @@ func (m *Value) GetDoubleValue() float64 {
 	return 0
 }
 
-func (m *Value) GetTimestampValue() *google_protobuf2.Timestamp {
+func (m *Value) GetTimestampValue() *timestamp.Timestamp {
 	if x, ok := m.GetValueType().(*Value_TimestampValue); ok {
 		return x.TimestampValue
 	}
@@ -401,7 +539,7 @@ func (m *Value) GetBlobValue() []byte {
 	return nil
 }
 
-func (m *Value) GetGeoPointValue() *google_type.LatLng {
+func (m *Value) GetGeoPointValue() *latlng.LatLng {
 	if x, ok := m.GetValueType().(*Value_GeoPointValue); ok {
 		return x.GeoPointValue
 	}
@@ -519,7 +657,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 			return true, proto.ErrInternalBadWireType
 		}
 		x, err := b.DecodeVarint()
-		m.ValueType = &Value_NullValue{google_protobuf1.NullValue(x)}
+		m.ValueType = &Value_NullValue{_struct.NullValue(x)}
 		return true, err
 	case 1: // value_type.boolean_value
 		if wire != proto.WireVarint {
@@ -546,7 +684,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf2.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ValueType = &Value_TimestampValue{msg}
 		return true, err
@@ -576,7 +714,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_type.LatLng)
+		msg := new(latlng.LatLng)
 		err := b.DecodeMessage(msg)
 		m.ValueType = &Value_GeoPointValue{msg}
 		return true, err
@@ -606,48 +744,48 @@ func _Value_OneofSizer(msg proto.Message) (n int) {
 	// value_type
 	switch x := m.ValueType.(type) {
 	case *Value_NullValue:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.NullValue))
 	case *Value_BooleanValue:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *Value_IntegerValue:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.IntegerValue))
 	case *Value_DoubleValue:
-		n += proto.SizeVarint(3<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *Value_TimestampValue:
 		s := proto.Size(x.TimestampValue)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_KeyValue:
 		s := proto.Size(x.KeyValue)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_StringValue:
-		n += proto.SizeVarint(17<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StringValue)))
 		n += len(x.StringValue)
 	case *Value_BlobValue:
-		n += proto.SizeVarint(18<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.BlobValue)))
 		n += len(x.BlobValue)
 	case *Value_GeoPointValue:
 		s := proto.Size(x.GeoPointValue)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_EntityValue:
 		s := proto.Size(x.EntityValue)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_ArrayValue:
 		s := proto.Size(x.ArrayValue)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -669,20 +807,42 @@ type Entity struct {
 	// an entity in `Value.entity_value` may have no key).
 	// An entity's kind is its key path's last element's kind,
 	// or null if it has no key.
-	Key *Key `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key *Key `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// The entity's properties.
 	// The map's keys are property names.
 	// A property name matching regex `__.*__` is reserved.
 	// A reserved property name is forbidden in certain documented contexts.
 	// The name must not contain more than 500 characters.
 	// The name cannot be `""`.
-	Properties map[string]*Value `protobuf:"bytes,3,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Properties           map[string]*Value `protobuf:"bytes,3,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Entity) Reset()         { *m = Entity{} }
+func (m *Entity) String() string { return proto.CompactTextString(m) }
+func (*Entity) ProtoMessage()    {}
+func (*Entity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_entity_01235876269a0b39, []int{4}
+}
+func (m *Entity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Entity.Unmarshal(m, b)
+}
+func (m *Entity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Entity.Marshal(b, m, deterministic)
+}
+func (dst *Entity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Entity.Merge(dst, src)
+}
+func (m *Entity) XXX_Size() int {
+	return xxx_messageInfo_Entity.Size(m)
+}
+func (m *Entity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Entity.DiscardUnknown(m)
 }
 
-func (m *Entity) Reset()                    { *m = Entity{} }
-func (m *Entity) String() string            { return proto.CompactTextString(m) }
-func (*Entity) ProtoMessage()               {}
-func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_Entity proto.InternalMessageInfo
 
 func (m *Entity) GetKey() *Key {
 	if m != nil {
@@ -705,11 +865,14 @@ func init() {
 	proto.RegisterType((*ArrayValue)(nil), "google.datastore.v1beta3.ArrayValue")
 	proto.RegisterType((*Value)(nil), "google.datastore.v1beta3.Value")
 	proto.RegisterType((*Entity)(nil), "google.datastore.v1beta3.Entity")
+	proto.RegisterMapType((map[string]*Value)(nil), "google.datastore.v1beta3.Entity.PropertiesEntry")
 }
 
-func init() { proto.RegisterFile("google/datastore/v1beta3/entity.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/datastore/v1beta3/entity.proto", fileDescriptor_entity_01235876269a0b39)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_entity_01235876269a0b39 = []byte{
 	// 789 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xdf, 0x8e, 0xdb, 0x44,
 	0x14, 0xc6, 0xed, 0x64, 0xb3, 0x5d, 0x1f, 0xbb, 0xbb, 0x65, 0xda, 0x0b, 0x2b, 0x6a, 0xd9, 0x10,
diff --git a/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/query.pb.go b/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/query.pb.go
index b2f2ce01..3ce1a4f4 100644
--- a/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/query.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/datastore/v1beta3/query.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/datastore/v1beta3/query.proto
 
-package datastore
+package datastore // import "google.golang.org/genproto/googleapis/datastore/v1beta3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/type/latlng"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -15,6 +15,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Specifies what data the 'entity' field contains.
 // A `ResultType` is either implied (for example, in `LookupResponse.missing`
 // from `datastore.proto`, it is always `KEY_ONLY`) or specified by context
@@ -49,7 +55,9 @@ var EntityResult_ResultType_value = map[string]int32{
 func (x EntityResult_ResultType) String() string {
 	return proto.EnumName(EntityResult_ResultType_name, int32(x))
 }
-func (EntityResult_ResultType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (EntityResult_ResultType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{0, 0}
+}
 
 // The sort direction.
 type PropertyOrder_Direction int32
@@ -77,7 +85,9 @@ var PropertyOrder_Direction_value = map[string]int32{
 func (x PropertyOrder_Direction) String() string {
 	return proto.EnumName(PropertyOrder_Direction_name, int32(x))
 }
-func (PropertyOrder_Direction) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{5, 0} }
+func (PropertyOrder_Direction) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{5, 0}
+}
 
 // A composite filter operator.
 type CompositeFilter_Operator int32
@@ -101,7 +111,9 @@ var CompositeFilter_Operator_value = map[string]int32{
 func (x CompositeFilter_Operator) String() string {
 	return proto.EnumName(CompositeFilter_Operator_name, int32(x))
 }
-func (CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{7, 0} }
+func (CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{7, 0}
+}
 
 // A property filter operator.
 type PropertyFilter_Operator int32
@@ -145,7 +157,9 @@ var PropertyFilter_Operator_value = map[string]int32{
 func (x PropertyFilter_Operator) String() string {
 	return proto.EnumName(PropertyFilter_Operator_name, int32(x))
 }
-func (PropertyFilter_Operator) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{8, 0} }
+func (PropertyFilter_Operator) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{8, 0}
+}
 
 // The possible values for the `more_results` field.
 type QueryResultBatch_MoreResultsType int32
@@ -183,13 +197,13 @@ func (x QueryResultBatch_MoreResultsType) String() string {
 	return proto.EnumName(QueryResultBatch_MoreResultsType_name, int32(x))
 }
 func (QueryResultBatch_MoreResultsType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{11, 0}
+	return fileDescriptor_query_756a9031b51ce9dc, []int{11, 0}
 }
 
 // The result of fetching an entity from Datastore.
 type EntityResult struct {
 	// The resulting entity.
-	Entity *Entity `protobuf:"bytes,1,opt,name=entity" json:"entity,omitempty"`
+	Entity *Entity `protobuf:"bytes,1,opt,name=entity,proto3" json:"entity,omitempty"`
 	// The version of the entity, a strictly positive number that monotonically
 	// increases with changes to the entity.
 	//
@@ -199,16 +213,38 @@ type EntityResult struct {
 	// For [missing][google.datastore.v1beta3.LookupResponse.missing] entities in `LookupResponse`, this
 	// is the version of the snapshot that was used to look up the entity, and it
 	// is always set except for eventually consistent reads.
-	Version int64 `protobuf:"varint,4,opt,name=version" json:"version,omitempty"`
+	Version int64 `protobuf:"varint,4,opt,name=version,proto3" json:"version,omitempty"`
 	// A cursor that points to the position after the result entity.
 	// Set only when the `EntityResult` is part of a `QueryResultBatch` message.
-	Cursor []byte `protobuf:"bytes,3,opt,name=cursor,proto3" json:"cursor,omitempty"`
+	Cursor               []byte   `protobuf:"bytes,3,opt,name=cursor,proto3" json:"cursor,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EntityResult) Reset()         { *m = EntityResult{} }
+func (m *EntityResult) String() string { return proto.CompactTextString(m) }
+func (*EntityResult) ProtoMessage()    {}
+func (*EntityResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{0}
+}
+func (m *EntityResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityResult.Unmarshal(m, b)
+}
+func (m *EntityResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityResult.Marshal(b, m, deterministic)
+}
+func (dst *EntityResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityResult.Merge(dst, src)
+}
+func (m *EntityResult) XXX_Size() int {
+	return xxx_messageInfo_EntityResult.Size(m)
+}
+func (m *EntityResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityResult.DiscardUnknown(m)
 }
 
-func (m *EntityResult) Reset()                    { *m = EntityResult{} }
-func (m *EntityResult) String() string            { return proto.CompactTextString(m) }
-func (*EntityResult) ProtoMessage()               {}
-func (*EntityResult) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_EntityResult proto.InternalMessageInfo
 
 func (m *EntityResult) GetEntity() *Entity {
 	if m != nil {
@@ -234,18 +270,18 @@ func (m *EntityResult) GetCursor() []byte {
 // A query for entities.
 type Query struct {
 	// The projection to return. Defaults to returning all properties.
-	Projection []*Projection `protobuf:"bytes,2,rep,name=projection" json:"projection,omitempty"`
+	Projection []*Projection `protobuf:"bytes,2,rep,name=projection,proto3" json:"projection,omitempty"`
 	// The kinds to query (if empty, returns entities of all kinds).
 	// Currently at most 1 kind may be specified.
-	Kind []*KindExpression `protobuf:"bytes,3,rep,name=kind" json:"kind,omitempty"`
+	Kind []*KindExpression `protobuf:"bytes,3,rep,name=kind,proto3" json:"kind,omitempty"`
 	// The filter to apply.
-	Filter *Filter `protobuf:"bytes,4,opt,name=filter" json:"filter,omitempty"`
+	Filter *Filter `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The order to apply to the query results (if empty, order is unspecified).
-	Order []*PropertyOrder `protobuf:"bytes,5,rep,name=order" json:"order,omitempty"`
+	Order []*PropertyOrder `protobuf:"bytes,5,rep,name=order,proto3" json:"order,omitempty"`
 	// The properties to make distinct. The query results will contain the first
 	// result for each distinct combination of values for the given properties
 	// (if empty, all results are returned).
-	DistinctOn []*PropertyReference `protobuf:"bytes,6,rep,name=distinct_on,json=distinctOn" json:"distinct_on,omitempty"`
+	DistinctOn []*PropertyReference `protobuf:"bytes,6,rep,name=distinct_on,json=distinctOn,proto3" json:"distinct_on,omitempty"`
 	// A starting point for the query results. Query cursors are
 	// returned in query result batches and
 	// [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets).
@@ -256,18 +292,40 @@ type Query struct {
 	EndCursor []byte `protobuf:"bytes,8,opt,name=end_cursor,json=endCursor,proto3" json:"end_cursor,omitempty"`
 	// The number of results to skip. Applies before limit, but after all other
 	// constraints. Optional. Must be >= 0 if specified.
-	Offset int32 `protobuf:"varint,10,opt,name=offset" json:"offset,omitempty"`
+	Offset int32 `protobuf:"varint,10,opt,name=offset,proto3" json:"offset,omitempty"`
 	// The maximum number of results to return. Applies after all other
 	// constraints. Optional.
 	// Unspecified is interpreted as no limit.
 	// Must be >= 0 if specified.
-	Limit *google_protobuf3.Int32Value `protobuf:"bytes,12,opt,name=limit" json:"limit,omitempty"`
+	Limit                *wrappers.Int32Value `protobuf:"bytes,12,opt,name=limit,proto3" json:"limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *Query) Reset()                    { *m = Query{} }
-func (m *Query) String() string            { return proto.CompactTextString(m) }
-func (*Query) ProtoMessage()               {}
-func (*Query) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (m *Query) Reset()         { *m = Query{} }
+func (m *Query) String() string { return proto.CompactTextString(m) }
+func (*Query) ProtoMessage()    {}
+func (*Query) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{1}
+}
+func (m *Query) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Query.Unmarshal(m, b)
+}
+func (m *Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Query.Marshal(b, m, deterministic)
+}
+func (dst *Query) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Query.Merge(dst, src)
+}
+func (m *Query) XXX_Size() int {
+	return xxx_messageInfo_Query.Size(m)
+}
+func (m *Query) XXX_DiscardUnknown() {
+	xxx_messageInfo_Query.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Query proto.InternalMessageInfo
 
 func (m *Query) GetProjection() []*Projection {
 	if m != nil {
@@ -325,7 +383,7 @@ func (m *Query) GetOffset() int32 {
 	return 0
 }
 
-func (m *Query) GetLimit() *google_protobuf3.Int32Value {
+func (m *Query) GetLimit() *wrappers.Int32Value {
 	if m != nil {
 		return m.Limit
 	}
@@ -335,13 +393,35 @@ func (m *Query) GetLimit() *google_protobuf3.Int32Value {
 // A representation of a kind.
 type KindExpression struct {
 	// The name of the kind.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KindExpression) Reset()         { *m = KindExpression{} }
+func (m *KindExpression) String() string { return proto.CompactTextString(m) }
+func (*KindExpression) ProtoMessage()    {}
+func (*KindExpression) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{2}
+}
+func (m *KindExpression) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KindExpression.Unmarshal(m, b)
+}
+func (m *KindExpression) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KindExpression.Marshal(b, m, deterministic)
+}
+func (dst *KindExpression) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KindExpression.Merge(dst, src)
+}
+func (m *KindExpression) XXX_Size() int {
+	return xxx_messageInfo_KindExpression.Size(m)
+}
+func (m *KindExpression) XXX_DiscardUnknown() {
+	xxx_messageInfo_KindExpression.DiscardUnknown(m)
 }
 
-func (m *KindExpression) Reset()                    { *m = KindExpression{} }
-func (m *KindExpression) String() string            { return proto.CompactTextString(m) }
-func (*KindExpression) ProtoMessage()               {}
-func (*KindExpression) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_KindExpression proto.InternalMessageInfo
 
 func (m *KindExpression) GetName() string {
 	if m != nil {
@@ -354,13 +434,35 @@ func (m *KindExpression) GetName() string {
 type PropertyReference struct {
 	// The name of the property.
 	// If name includes "."s, it may be interpreted as a property name path.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PropertyReference) Reset()         { *m = PropertyReference{} }
+func (m *PropertyReference) String() string { return proto.CompactTextString(m) }
+func (*PropertyReference) ProtoMessage()    {}
+func (*PropertyReference) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{3}
+}
+func (m *PropertyReference) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PropertyReference.Unmarshal(m, b)
+}
+func (m *PropertyReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PropertyReference.Marshal(b, m, deterministic)
+}
+func (dst *PropertyReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyReference.Merge(dst, src)
+}
+func (m *PropertyReference) XXX_Size() int {
+	return xxx_messageInfo_PropertyReference.Size(m)
+}
+func (m *PropertyReference) XXX_DiscardUnknown() {
+	xxx_messageInfo_PropertyReference.DiscardUnknown(m)
 }
 
-func (m *PropertyReference) Reset()                    { *m = PropertyReference{} }
-func (m *PropertyReference) String() string            { return proto.CompactTextString(m) }
-func (*PropertyReference) ProtoMessage()               {}
-func (*PropertyReference) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_PropertyReference proto.InternalMessageInfo
 
 func (m *PropertyReference) GetName() string {
 	if m != nil {
@@ -372,13 +474,35 @@ func (m *PropertyReference) GetName() string {
 // A representation of a property in a projection.
 type Projection struct {
 	// The property to project.
-	Property *PropertyReference `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property             *PropertyReference `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Projection) Reset()         { *m = Projection{} }
+func (m *Projection) String() string { return proto.CompactTextString(m) }
+func (*Projection) ProtoMessage()    {}
+func (*Projection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{4}
+}
+func (m *Projection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Projection.Unmarshal(m, b)
+}
+func (m *Projection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Projection.Marshal(b, m, deterministic)
+}
+func (dst *Projection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Projection.Merge(dst, src)
+}
+func (m *Projection) XXX_Size() int {
+	return xxx_messageInfo_Projection.Size(m)
+}
+func (m *Projection) XXX_DiscardUnknown() {
+	xxx_messageInfo_Projection.DiscardUnknown(m)
 }
 
-func (m *Projection) Reset()                    { *m = Projection{} }
-func (m *Projection) String() string            { return proto.CompactTextString(m) }
-func (*Projection) ProtoMessage()               {}
-func (*Projection) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_Projection proto.InternalMessageInfo
 
 func (m *Projection) GetProperty() *PropertyReference {
 	if m != nil {
@@ -390,15 +514,37 @@ func (m *Projection) GetProperty() *PropertyReference {
 // The desired order for a specific property.
 type PropertyOrder struct {
 	// The property to order by.
-	Property *PropertyReference `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *PropertyReference `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The direction to order by. Defaults to `ASCENDING`.
-	Direction PropertyOrder_Direction `protobuf:"varint,2,opt,name=direction,enum=google.datastore.v1beta3.PropertyOrder_Direction" json:"direction,omitempty"`
+	Direction            PropertyOrder_Direction `protobuf:"varint,2,opt,name=direction,proto3,enum=google.datastore.v1beta3.PropertyOrder_Direction" json:"direction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *PropertyOrder) Reset()         { *m = PropertyOrder{} }
+func (m *PropertyOrder) String() string { return proto.CompactTextString(m) }
+func (*PropertyOrder) ProtoMessage()    {}
+func (*PropertyOrder) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{5}
+}
+func (m *PropertyOrder) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PropertyOrder.Unmarshal(m, b)
+}
+func (m *PropertyOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PropertyOrder.Marshal(b, m, deterministic)
+}
+func (dst *PropertyOrder) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyOrder.Merge(dst, src)
+}
+func (m *PropertyOrder) XXX_Size() int {
+	return xxx_messageInfo_PropertyOrder.Size(m)
+}
+func (m *PropertyOrder) XXX_DiscardUnknown() {
+	xxx_messageInfo_PropertyOrder.DiscardUnknown(m)
 }
 
-func (m *PropertyOrder) Reset()                    { *m = PropertyOrder{} }
-func (m *PropertyOrder) String() string            { return proto.CompactTextString(m) }
-func (*PropertyOrder) ProtoMessage()               {}
-func (*PropertyOrder) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_PropertyOrder proto.InternalMessageInfo
 
 func (m *PropertyOrder) GetProperty() *PropertyReference {
 	if m != nil {
@@ -421,27 +567,51 @@ type Filter struct {
 	// Types that are valid to be assigned to FilterType:
 	//	*Filter_CompositeFilter
 	//	*Filter_PropertyFilter
-	FilterType isFilter_FilterType `protobuf_oneof:"filter_type"`
+	FilterType           isFilter_FilterType `protobuf_oneof:"filter_type"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *Filter) Reset()                    { *m = Filter{} }
-func (m *Filter) String() string            { return proto.CompactTextString(m) }
-func (*Filter) ProtoMessage()               {}
-func (*Filter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+func (m *Filter) Reset()         { *m = Filter{} }
+func (m *Filter) String() string { return proto.CompactTextString(m) }
+func (*Filter) ProtoMessage()    {}
+func (*Filter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{6}
+}
+func (m *Filter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Filter.Unmarshal(m, b)
+}
+func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Filter.Marshal(b, m, deterministic)
+}
+func (dst *Filter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Filter.Merge(dst, src)
+}
+func (m *Filter) XXX_Size() int {
+	return xxx_messageInfo_Filter.Size(m)
+}
+func (m *Filter) XXX_DiscardUnknown() {
+	xxx_messageInfo_Filter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Filter proto.InternalMessageInfo
 
 type isFilter_FilterType interface {
 	isFilter_FilterType()
 }
 
 type Filter_CompositeFilter struct {
-	CompositeFilter *CompositeFilter `protobuf:"bytes,1,opt,name=composite_filter,json=compositeFilter,oneof"`
+	CompositeFilter *CompositeFilter `protobuf:"bytes,1,opt,name=composite_filter,json=compositeFilter,proto3,oneof"`
 }
+
 type Filter_PropertyFilter struct {
-	PropertyFilter *PropertyFilter `protobuf:"bytes,2,opt,name=property_filter,json=propertyFilter,oneof"`
+	PropertyFilter *PropertyFilter `protobuf:"bytes,2,opt,name=property_filter,json=propertyFilter,proto3,oneof"`
 }
 
 func (*Filter_CompositeFilter) isFilter_FilterType() {}
-func (*Filter_PropertyFilter) isFilter_FilterType()  {}
+
+func (*Filter_PropertyFilter) isFilter_FilterType() {}
 
 func (m *Filter) GetFilterType() isFilter_FilterType {
 	if m != nil {
@@ -523,12 +693,12 @@ func _Filter_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.FilterType.(type) {
 	case *Filter_CompositeFilter:
 		s := proto.Size(x.CompositeFilter)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Filter_PropertyFilter:
 		s := proto.Size(x.PropertyFilter)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -541,16 +711,38 @@ func _Filter_OneofSizer(msg proto.Message) (n int) {
 // A filter that merges multiple other filters using the given operator.
 type CompositeFilter struct {
 	// The operator for combining multiple filters.
-	Op CompositeFilter_Operator `protobuf:"varint,1,opt,name=op,enum=google.datastore.v1beta3.CompositeFilter_Operator" json:"op,omitempty"`
+	Op CompositeFilter_Operator `protobuf:"varint,1,opt,name=op,proto3,enum=google.datastore.v1beta3.CompositeFilter_Operator" json:"op,omitempty"`
 	// The list of filters to combine.
 	// Must contain at least one filter.
-	Filters []*Filter `protobuf:"bytes,2,rep,name=filters" json:"filters,omitempty"`
+	Filters              []*Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CompositeFilter) Reset()         { *m = CompositeFilter{} }
+func (m *CompositeFilter) String() string { return proto.CompactTextString(m) }
+func (*CompositeFilter) ProtoMessage()    {}
+func (*CompositeFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{7}
+}
+func (m *CompositeFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CompositeFilter.Unmarshal(m, b)
+}
+func (m *CompositeFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CompositeFilter.Marshal(b, m, deterministic)
+}
+func (dst *CompositeFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CompositeFilter.Merge(dst, src)
+}
+func (m *CompositeFilter) XXX_Size() int {
+	return xxx_messageInfo_CompositeFilter.Size(m)
+}
+func (m *CompositeFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_CompositeFilter.DiscardUnknown(m)
 }
 
-func (m *CompositeFilter) Reset()                    { *m = CompositeFilter{} }
-func (m *CompositeFilter) String() string            { return proto.CompactTextString(m) }
-func (*CompositeFilter) ProtoMessage()               {}
-func (*CompositeFilter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+var xxx_messageInfo_CompositeFilter proto.InternalMessageInfo
 
 func (m *CompositeFilter) GetOp() CompositeFilter_Operator {
 	if m != nil {
@@ -569,17 +761,39 @@ func (m *CompositeFilter) GetFilters() []*Filter {
 // A filter on a specific property.
 type PropertyFilter struct {
 	// The property to filter by.
-	Property *PropertyReference `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
+	Property *PropertyReference `protobuf:"bytes,1,opt,name=property,proto3" json:"property,omitempty"`
 	// The operator to filter by.
-	Op PropertyFilter_Operator `protobuf:"varint,2,opt,name=op,enum=google.datastore.v1beta3.PropertyFilter_Operator" json:"op,omitempty"`
+	Op PropertyFilter_Operator `protobuf:"varint,2,opt,name=op,proto3,enum=google.datastore.v1beta3.PropertyFilter_Operator" json:"op,omitempty"`
 	// The value to compare the property to.
-	Value *Value `protobuf:"bytes,3,opt,name=value" json:"value,omitempty"`
+	Value                *Value   `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PropertyFilter) Reset()         { *m = PropertyFilter{} }
+func (m *PropertyFilter) String() string { return proto.CompactTextString(m) }
+func (*PropertyFilter) ProtoMessage()    {}
+func (*PropertyFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{8}
+}
+func (m *PropertyFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PropertyFilter.Unmarshal(m, b)
+}
+func (m *PropertyFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PropertyFilter.Marshal(b, m, deterministic)
+}
+func (dst *PropertyFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PropertyFilter.Merge(dst, src)
+}
+func (m *PropertyFilter) XXX_Size() int {
+	return xxx_messageInfo_PropertyFilter.Size(m)
+}
+func (m *PropertyFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_PropertyFilter.DiscardUnknown(m)
 }
 
-func (m *PropertyFilter) Reset()                    { *m = PropertyFilter{} }
-func (m *PropertyFilter) String() string            { return proto.CompactTextString(m) }
-func (*PropertyFilter) ProtoMessage()               {}
-func (*PropertyFilter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+var xxx_messageInfo_PropertyFilter proto.InternalMessageInfo
 
 func (m *PropertyFilter) GetProperty() *PropertyReference {
 	if m != nil {
@@ -606,30 +820,52 @@ func (m *PropertyFilter) GetValue() *Value {
 type GqlQuery struct {
 	// A string of the format described
 	// [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
-	QueryString string `protobuf:"bytes,1,opt,name=query_string,json=queryString" json:"query_string,omitempty"`
+	QueryString string `protobuf:"bytes,1,opt,name=query_string,json=queryString,proto3" json:"query_string,omitempty"`
 	// When false, the query string must not contain any literals and instead must
 	// bind all values. For example,
 	// `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while
 	// `SELECT * FROM Kind WHERE a = @value` is.
-	AllowLiterals bool `protobuf:"varint,2,opt,name=allow_literals,json=allowLiterals" json:"allow_literals,omitempty"`
+	AllowLiterals bool `protobuf:"varint,2,opt,name=allow_literals,json=allowLiterals,proto3" json:"allow_literals,omitempty"`
 	// For each non-reserved named binding site in the query string, there must be
 	// a named parameter with that name, but not necessarily the inverse.
 	//
 	// Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
 	// `__.*__`, and must not be `""`.
-	NamedBindings map[string]*GqlQueryParameter `protobuf:"bytes,5,rep,name=named_bindings,json=namedBindings" json:"named_bindings,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	NamedBindings map[string]*GqlQueryParameter `protobuf:"bytes,5,rep,name=named_bindings,json=namedBindings,proto3" json:"named_bindings,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Numbered binding site @1 references the first numbered parameter,
 	// effectively using 1-based indexing, rather than the usual 0.
 	//
 	// For each binding site numbered i in `query_string`, there must be an i-th
 	// numbered parameter. The inverse must also be true.
-	PositionalBindings []*GqlQueryParameter `protobuf:"bytes,4,rep,name=positional_bindings,json=positionalBindings" json:"positional_bindings,omitempty"`
+	PositionalBindings   []*GqlQueryParameter `protobuf:"bytes,4,rep,name=positional_bindings,json=positionalBindings,proto3" json:"positional_bindings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *GqlQuery) Reset()                    { *m = GqlQuery{} }
-func (m *GqlQuery) String() string            { return proto.CompactTextString(m) }
-func (*GqlQuery) ProtoMessage()               {}
-func (*GqlQuery) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+func (m *GqlQuery) Reset()         { *m = GqlQuery{} }
+func (m *GqlQuery) String() string { return proto.CompactTextString(m) }
+func (*GqlQuery) ProtoMessage()    {}
+func (*GqlQuery) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{9}
+}
+func (m *GqlQuery) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GqlQuery.Unmarshal(m, b)
+}
+func (m *GqlQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GqlQuery.Marshal(b, m, deterministic)
+}
+func (dst *GqlQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GqlQuery.Merge(dst, src)
+}
+func (m *GqlQuery) XXX_Size() int {
+	return xxx_messageInfo_GqlQuery.Size(m)
+}
+func (m *GqlQuery) XXX_DiscardUnknown() {
+	xxx_messageInfo_GqlQuery.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GqlQuery proto.InternalMessageInfo
 
 func (m *GqlQuery) GetQueryString() string {
 	if m != nil {
@@ -666,26 +902,50 @@ type GqlQueryParameter struct {
 	// Types that are valid to be assigned to ParameterType:
 	//	*GqlQueryParameter_Value
 	//	*GqlQueryParameter_Cursor
-	ParameterType isGqlQueryParameter_ParameterType `protobuf_oneof:"parameter_type"`
+	ParameterType        isGqlQueryParameter_ParameterType `protobuf_oneof:"parameter_type"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *GqlQueryParameter) Reset()         { *m = GqlQueryParameter{} }
+func (m *GqlQueryParameter) String() string { return proto.CompactTextString(m) }
+func (*GqlQueryParameter) ProtoMessage()    {}
+func (*GqlQueryParameter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{10}
+}
+func (m *GqlQueryParameter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GqlQueryParameter.Unmarshal(m, b)
+}
+func (m *GqlQueryParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GqlQueryParameter.Marshal(b, m, deterministic)
+}
+func (dst *GqlQueryParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GqlQueryParameter.Merge(dst, src)
+}
+func (m *GqlQueryParameter) XXX_Size() int {
+	return xxx_messageInfo_GqlQueryParameter.Size(m)
+}
+func (m *GqlQueryParameter) XXX_DiscardUnknown() {
+	xxx_messageInfo_GqlQueryParameter.DiscardUnknown(m)
 }
 
-func (m *GqlQueryParameter) Reset()                    { *m = GqlQueryParameter{} }
-func (m *GqlQueryParameter) String() string            { return proto.CompactTextString(m) }
-func (*GqlQueryParameter) ProtoMessage()               {}
-func (*GqlQueryParameter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} }
+var xxx_messageInfo_GqlQueryParameter proto.InternalMessageInfo
 
 type isGqlQueryParameter_ParameterType interface {
 	isGqlQueryParameter_ParameterType()
 }
 
 type GqlQueryParameter_Value struct {
-	Value *Value `protobuf:"bytes,2,opt,name=value,oneof"`
+	Value *Value `protobuf:"bytes,2,opt,name=value,proto3,oneof"`
 }
+
 type GqlQueryParameter_Cursor struct {
 	Cursor []byte `protobuf:"bytes,3,opt,name=cursor,proto3,oneof"`
 }
 
-func (*GqlQueryParameter_Value) isGqlQueryParameter_ParameterType()  {}
+func (*GqlQueryParameter_Value) isGqlQueryParameter_ParameterType() {}
+
 func (*GqlQueryParameter_Cursor) isGqlQueryParameter_ParameterType() {}
 
 func (m *GqlQueryParameter) GetParameterType() isGqlQueryParameter_ParameterType {
@@ -765,11 +1025,11 @@ func _GqlQueryParameter_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.ParameterType.(type) {
 	case *GqlQueryParameter_Value:
 		s := proto.Size(x.Value)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *GqlQueryParameter_Cursor:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Cursor)))
 		n += len(x.Cursor)
 	case nil:
@@ -782,18 +1042,18 @@ func _GqlQueryParameter_OneofSizer(msg proto.Message) (n int) {
 // A batch of results produced by a query.
 type QueryResultBatch struct {
 	// The number of results skipped, typically because of an offset.
-	SkippedResults int32 `protobuf:"varint,6,opt,name=skipped_results,json=skippedResults" json:"skipped_results,omitempty"`
+	SkippedResults int32 `protobuf:"varint,6,opt,name=skipped_results,json=skippedResults,proto3" json:"skipped_results,omitempty"`
 	// A cursor that points to the position after the last skipped result.
 	// Will be set when `skipped_results` != 0.
 	SkippedCursor []byte `protobuf:"bytes,3,opt,name=skipped_cursor,json=skippedCursor,proto3" json:"skipped_cursor,omitempty"`
 	// The result type for every entity in `entity_results`.
-	EntityResultType EntityResult_ResultType `protobuf:"varint,1,opt,name=entity_result_type,json=entityResultType,enum=google.datastore.v1beta3.EntityResult_ResultType" json:"entity_result_type,omitempty"`
+	EntityResultType EntityResult_ResultType `protobuf:"varint,1,opt,name=entity_result_type,json=entityResultType,proto3,enum=google.datastore.v1beta3.EntityResult_ResultType" json:"entity_result_type,omitempty"`
 	// The results for this batch.
-	EntityResults []*EntityResult `protobuf:"bytes,2,rep,name=entity_results,json=entityResults" json:"entity_results,omitempty"`
+	EntityResults []*EntityResult `protobuf:"bytes,2,rep,name=entity_results,json=entityResults,proto3" json:"entity_results,omitempty"`
 	// A cursor that points to the position after the last result in the batch.
 	EndCursor []byte `protobuf:"bytes,4,opt,name=end_cursor,json=endCursor,proto3" json:"end_cursor,omitempty"`
 	// The state of the query after the current batch.
-	MoreResults QueryResultBatch_MoreResultsType `protobuf:"varint,5,opt,name=more_results,json=moreResults,enum=google.datastore.v1beta3.QueryResultBatch_MoreResultsType" json:"more_results,omitempty"`
+	MoreResults QueryResultBatch_MoreResultsType `protobuf:"varint,5,opt,name=more_results,json=moreResults,proto3,enum=google.datastore.v1beta3.QueryResultBatch_MoreResultsType" json:"more_results,omitempty"`
 	// The version number of the snapshot this batch was returned from.
 	// This applies to the range of results from the query's `start_cursor` (or
 	// the beginning of the query if no cursor was given) to this batch's
@@ -803,13 +1063,35 @@ type QueryResultBatch struct {
 	// can have a greater snapshot version number. Each batch's snapshot version
 	// is valid for all preceding batches.
 	// The value will be zero for eventually consistent queries.
-	SnapshotVersion int64 `protobuf:"varint,7,opt,name=snapshot_version,json=snapshotVersion" json:"snapshot_version,omitempty"`
+	SnapshotVersion      int64    `protobuf:"varint,7,opt,name=snapshot_version,json=snapshotVersion,proto3" json:"snapshot_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *QueryResultBatch) Reset()                    { *m = QueryResultBatch{} }
-func (m *QueryResultBatch) String() string            { return proto.CompactTextString(m) }
-func (*QueryResultBatch) ProtoMessage()               {}
-func (*QueryResultBatch) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} }
+func (m *QueryResultBatch) Reset()         { *m = QueryResultBatch{} }
+func (m *QueryResultBatch) String() string { return proto.CompactTextString(m) }
+func (*QueryResultBatch) ProtoMessage()    {}
+func (*QueryResultBatch) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_756a9031b51ce9dc, []int{11}
+}
+func (m *QueryResultBatch) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryResultBatch.Unmarshal(m, b)
+}
+func (m *QueryResultBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryResultBatch.Marshal(b, m, deterministic)
+}
+func (dst *QueryResultBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResultBatch.Merge(dst, src)
+}
+func (m *QueryResultBatch) XXX_Size() int {
+	return xxx_messageInfo_QueryResultBatch.Size(m)
+}
+func (m *QueryResultBatch) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryResultBatch.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryResultBatch proto.InternalMessageInfo
 
 func (m *QueryResultBatch) GetSkippedResults() int32 {
 	if m != nil {
@@ -871,6 +1153,7 @@ func init() {
 	proto.RegisterType((*CompositeFilter)(nil), "google.datastore.v1beta3.CompositeFilter")
 	proto.RegisterType((*PropertyFilter)(nil), "google.datastore.v1beta3.PropertyFilter")
 	proto.RegisterType((*GqlQuery)(nil), "google.datastore.v1beta3.GqlQuery")
+	proto.RegisterMapType((map[string]*GqlQueryParameter)(nil), "google.datastore.v1beta3.GqlQuery.NamedBindingsEntry")
 	proto.RegisterType((*GqlQueryParameter)(nil), "google.datastore.v1beta3.GqlQueryParameter")
 	proto.RegisterType((*QueryResultBatch)(nil), "google.datastore.v1beta3.QueryResultBatch")
 	proto.RegisterEnum("google.datastore.v1beta3.EntityResult_ResultType", EntityResult_ResultType_name, EntityResult_ResultType_value)
@@ -880,9 +1163,11 @@ func init() {
 	proto.RegisterEnum("google.datastore.v1beta3.QueryResultBatch_MoreResultsType", QueryResultBatch_MoreResultsType_name, QueryResultBatch_MoreResultsType_value)
 }
 
-func init() { proto.RegisterFile("google/datastore/v1beta3/query.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/datastore/v1beta3/query.proto", fileDescriptor_query_756a9031b51ce9dc)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_query_756a9031b51ce9dc = []byte{
 	// 1323 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcb, 0x6e, 0xdb, 0x46,
 	0x14, 0x35, 0xa9, 0x87, 0xa5, 0xab, 0x17, 0x33, 0x69, 0x53, 0xc6, 0x79, 0xd4, 0x21, 0x92, 0x46,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/build_events.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/build_events.pb.go
index dc5d7a50..8c64314e 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/build_events.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/build_events.pb.go
@@ -1,32 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/build_events.proto
 
-/*
-Package build is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/build/v1/build_events.proto
-	google/devtools/build/v1/build_status.proto
-	google/devtools/build/v1/publish_build_event.proto
-
-It has these top-level messages:
-	BuildEvent
-	StreamId
-	BuildStatus
-	PublishLifecycleEventRequest
-	PublishBuildToolEventStreamResponse
-	OrderedBuildEvent
-	PublishBuildToolEventStreamRequest
-*/
-package build
+package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -66,7 +49,9 @@ var ConsoleOutputStream_value = map[string]int32{
 func (x ConsoleOutputStream) String() string {
 	return proto.EnumName(ConsoleOutputStream_name, int32(x))
 }
-func (ConsoleOutputStream) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (ConsoleOutputStream) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0}
+}
 
 // How did the event stream finish.
 type BuildEvent_BuildComponentStreamFinished_FinishType int32
@@ -98,7 +83,7 @@ func (x BuildEvent_BuildComponentStreamFinished_FinishType) String() string {
 	return proto.EnumName(BuildEvent_BuildComponentStreamFinished_FinishType_name, int32(x))
 }
 func (BuildEvent_BuildComponentStreamFinished_FinishType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 5, 0}
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0, 5, 0}
 }
 
 // Which build component generates this event stream. Each build component
@@ -132,13 +117,15 @@ var StreamId_BuildComponent_value = map[string]int32{
 func (x StreamId_BuildComponent) String() string {
 	return proto.EnumName(StreamId_BuildComponent_name, int32(x))
 }
-func (StreamId_BuildComponent) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (StreamId_BuildComponent) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{1, 0}
+}
 
 // An event representing some state change that occured in the build. This
 // message does not include field for uniquely identifying an event.
 type BuildEvent struct {
 	// The timestamp of this event.
-	EventTime *google_protobuf2.Timestamp `protobuf:"bytes,1,opt,name=event_time,json=eventTime" json:"event_time,omitempty"`
+	EventTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
 	// //////////////////////////////////////////////////////////////////////////
 	// Events that indicate a state change of a build request in the build
 	// queue.
@@ -153,55 +140,100 @@ type BuildEvent struct {
 	//	*BuildEvent_BazelEvent
 	//	*BuildEvent_BuildExecutionEvent
 	//	*BuildEvent_SourceFetchEvent
-	Event isBuildEvent_Event `protobuf_oneof:"event"`
+	Event                isBuildEvent_Event `protobuf_oneof:"event"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *BuildEvent) Reset()                    { *m = BuildEvent{} }
-func (m *BuildEvent) String() string            { return proto.CompactTextString(m) }
-func (*BuildEvent) ProtoMessage()               {}
-func (*BuildEvent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *BuildEvent) Reset()         { *m = BuildEvent{} }
+func (m *BuildEvent) String() string { return proto.CompactTextString(m) }
+func (*BuildEvent) ProtoMessage()    {}
+func (*BuildEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0}
+}
+func (m *BuildEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildEvent.Unmarshal(m, b)
+}
+func (m *BuildEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildEvent.Marshal(b, m, deterministic)
+}
+func (dst *BuildEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent.Merge(dst, src)
+}
+func (m *BuildEvent) XXX_Size() int {
+	return xxx_messageInfo_BuildEvent.Size(m)
+}
+func (m *BuildEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildEvent proto.InternalMessageInfo
+
+func (m *BuildEvent) GetEventTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.EventTime
+	}
+	return nil
+}
 
 type isBuildEvent_Event interface {
 	isBuildEvent_Event()
 }
 
 type BuildEvent_InvocationAttemptStarted_ struct {
-	InvocationAttemptStarted *BuildEvent_InvocationAttemptStarted `protobuf:"bytes,51,opt,name=invocation_attempt_started,json=invocationAttemptStarted,oneof"`
+	InvocationAttemptStarted *BuildEvent_InvocationAttemptStarted `protobuf:"bytes,51,opt,name=invocation_attempt_started,json=invocationAttemptStarted,proto3,oneof"`
 }
+
 type BuildEvent_InvocationAttemptFinished_ struct {
-	InvocationAttemptFinished *BuildEvent_InvocationAttemptFinished `protobuf:"bytes,52,opt,name=invocation_attempt_finished,json=invocationAttemptFinished,oneof"`
+	InvocationAttemptFinished *BuildEvent_InvocationAttemptFinished `protobuf:"bytes,52,opt,name=invocation_attempt_finished,json=invocationAttemptFinished,proto3,oneof"`
 }
+
 type BuildEvent_BuildEnqueued_ struct {
-	BuildEnqueued *BuildEvent_BuildEnqueued `protobuf:"bytes,53,opt,name=build_enqueued,json=buildEnqueued,oneof"`
+	BuildEnqueued *BuildEvent_BuildEnqueued `protobuf:"bytes,53,opt,name=build_enqueued,json=buildEnqueued,proto3,oneof"`
 }
+
 type BuildEvent_BuildFinished_ struct {
-	BuildFinished *BuildEvent_BuildFinished `protobuf:"bytes,55,opt,name=build_finished,json=buildFinished,oneof"`
+	BuildFinished *BuildEvent_BuildFinished `protobuf:"bytes,55,opt,name=build_finished,json=buildFinished,proto3,oneof"`
 }
+
 type BuildEvent_ConsoleOutput_ struct {
-	ConsoleOutput *BuildEvent_ConsoleOutput `protobuf:"bytes,56,opt,name=console_output,json=consoleOutput,oneof"`
+	ConsoleOutput *BuildEvent_ConsoleOutput `protobuf:"bytes,56,opt,name=console_output,json=consoleOutput,proto3,oneof"`
 }
+
 type BuildEvent_ComponentStreamFinished struct {
-	ComponentStreamFinished *BuildEvent_BuildComponentStreamFinished `protobuf:"bytes,59,opt,name=component_stream_finished,json=componentStreamFinished,oneof"`
+	ComponentStreamFinished *BuildEvent_BuildComponentStreamFinished `protobuf:"bytes,59,opt,name=component_stream_finished,json=componentStreamFinished,proto3,oneof"`
 }
+
 type BuildEvent_BazelEvent struct {
-	BazelEvent *google_protobuf1.Any `protobuf:"bytes,60,opt,name=bazel_event,json=bazelEvent,oneof"`
+	BazelEvent *any.Any `protobuf:"bytes,60,opt,name=bazel_event,json=bazelEvent,proto3,oneof"`
 }
+
 type BuildEvent_BuildExecutionEvent struct {
-	BuildExecutionEvent *google_protobuf1.Any `protobuf:"bytes,61,opt,name=build_execution_event,json=buildExecutionEvent,oneof"`
+	BuildExecutionEvent *any.Any `protobuf:"bytes,61,opt,name=build_execution_event,json=buildExecutionEvent,proto3,oneof"`
 }
+
 type BuildEvent_SourceFetchEvent struct {
-	SourceFetchEvent *google_protobuf1.Any `protobuf:"bytes,62,opt,name=source_fetch_event,json=sourceFetchEvent,oneof"`
+	SourceFetchEvent *any.Any `protobuf:"bytes,62,opt,name=source_fetch_event,json=sourceFetchEvent,proto3,oneof"`
 }
 
-func (*BuildEvent_InvocationAttemptStarted_) isBuildEvent_Event()  {}
+func (*BuildEvent_InvocationAttemptStarted_) isBuildEvent_Event() {}
+
 func (*BuildEvent_InvocationAttemptFinished_) isBuildEvent_Event() {}
-func (*BuildEvent_BuildEnqueued_) isBuildEvent_Event()             {}
-func (*BuildEvent_BuildFinished_) isBuildEvent_Event()             {}
-func (*BuildEvent_ConsoleOutput_) isBuildEvent_Event()             {}
-func (*BuildEvent_ComponentStreamFinished) isBuildEvent_Event()    {}
-func (*BuildEvent_BazelEvent) isBuildEvent_Event()                 {}
-func (*BuildEvent_BuildExecutionEvent) isBuildEvent_Event()        {}
-func (*BuildEvent_SourceFetchEvent) isBuildEvent_Event()           {}
+
+func (*BuildEvent_BuildEnqueued_) isBuildEvent_Event() {}
+
+func (*BuildEvent_BuildFinished_) isBuildEvent_Event() {}
+
+func (*BuildEvent_ConsoleOutput_) isBuildEvent_Event() {}
+
+func (*BuildEvent_ComponentStreamFinished) isBuildEvent_Event() {}
+
+func (*BuildEvent_BazelEvent) isBuildEvent_Event() {}
+
+func (*BuildEvent_BuildExecutionEvent) isBuildEvent_Event() {}
+
+func (*BuildEvent_SourceFetchEvent) isBuildEvent_Event() {}
 
 func (m *BuildEvent) GetEvent() isBuildEvent_Event {
 	if m != nil {
@@ -210,13 +242,6 @@ func (m *BuildEvent) GetEvent() isBuildEvent_Event {
 	return nil
 }
 
-func (m *BuildEvent) GetEventTime() *google_protobuf2.Timestamp {
-	if m != nil {
-		return m.EventTime
-	}
-	return nil
-}
-
 func (m *BuildEvent) GetInvocationAttemptStarted() *BuildEvent_InvocationAttemptStarted {
 	if x, ok := m.GetEvent().(*BuildEvent_InvocationAttemptStarted_); ok {
 		return x.InvocationAttemptStarted
@@ -259,21 +284,21 @@ func (m *BuildEvent) GetComponentStreamFinished() *BuildEvent_BuildComponentStre
 	return nil
 }
 
-func (m *BuildEvent) GetBazelEvent() *google_protobuf1.Any {
+func (m *BuildEvent) GetBazelEvent() *any.Any {
 	if x, ok := m.GetEvent().(*BuildEvent_BazelEvent); ok {
 		return x.BazelEvent
 	}
 	return nil
 }
 
-func (m *BuildEvent) GetBuildExecutionEvent() *google_protobuf1.Any {
+func (m *BuildEvent) GetBuildExecutionEvent() *any.Any {
 	if x, ok := m.GetEvent().(*BuildEvent_BuildExecutionEvent); ok {
 		return x.BuildExecutionEvent
 	}
 	return nil
 }
 
-func (m *BuildEvent) GetSourceFetchEvent() *google_protobuf1.Any {
+func (m *BuildEvent) GetSourceFetchEvent() *any.Any {
 	if x, ok := m.GetEvent().(*BuildEvent_SourceFetchEvent); ok {
 		return x.SourceFetchEvent
 	}
@@ -406,7 +431,7 @@ func _BuildEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buf
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Any)
+		msg := new(any.Any)
 		err := b.DecodeMessage(msg)
 		m.Event = &BuildEvent_BazelEvent{msg}
 		return true, err
@@ -414,7 +439,7 @@ func _BuildEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buf
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Any)
+		msg := new(any.Any)
 		err := b.DecodeMessage(msg)
 		m.Event = &BuildEvent_BuildExecutionEvent{msg}
 		return true, err
@@ -422,7 +447,7 @@ func _BuildEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buf
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Any)
+		msg := new(any.Any)
 		err := b.DecodeMessage(msg)
 		m.Event = &BuildEvent_SourceFetchEvent{msg}
 		return true, err
@@ -437,47 +462,47 @@ func _BuildEvent_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Event.(type) {
 	case *BuildEvent_InvocationAttemptStarted_:
 		s := proto.Size(x.InvocationAttemptStarted)
-		n += proto.SizeVarint(51<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildEvent_InvocationAttemptFinished_:
 		s := proto.Size(x.InvocationAttemptFinished)
-		n += proto.SizeVarint(52<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildEvent_BuildEnqueued_:
 		s := proto.Size(x.BuildEnqueued)
-		n += proto.SizeVarint(53<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildEvent_BuildFinished_:
 		s := proto.Size(x.BuildFinished)
-		n += proto.SizeVarint(55<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildEvent_ConsoleOutput_:
 		s := proto.Size(x.ConsoleOutput)
-		n += proto.SizeVarint(56<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildEvent_ComponentStreamFinished:
 		s := proto.Size(x.ComponentStreamFinished)
-		n += proto.SizeVarint(59<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildEvent_BazelEvent:
 		s := proto.Size(x.BazelEvent)
-		n += proto.SizeVarint(60<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildEvent_BuildExecutionEvent:
 		s := proto.Size(x.BuildExecutionEvent)
-		n += proto.SizeVarint(61<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildEvent_SourceFetchEvent:
 		s := proto.Size(x.SourceFetchEvent)
-		n += proto.SizeVarint(62<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -492,16 +517,36 @@ type BuildEvent_InvocationAttemptStarted struct {
 	// The number of the invocation attempt, starting at 1 and increasing by 1
 	// for each new attempt. Can be used to determine if there is a later
 	// invocation attempt replacing the current one a client is processing.
-	AttemptNumber int64 `protobuf:"varint,1,opt,name=attempt_number,json=attemptNumber" json:"attempt_number,omitempty"`
+	AttemptNumber        int64    `protobuf:"varint,1,opt,name=attempt_number,json=attemptNumber,proto3" json:"attempt_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *BuildEvent_InvocationAttemptStarted) Reset()         { *m = BuildEvent_InvocationAttemptStarted{} }
 func (m *BuildEvent_InvocationAttemptStarted) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_InvocationAttemptStarted) ProtoMessage()    {}
 func (*BuildEvent_InvocationAttemptStarted) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 0}
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0, 0}
+}
+func (m *BuildEvent_InvocationAttemptStarted) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Unmarshal(m, b)
+}
+func (m *BuildEvent_InvocationAttemptStarted) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Marshal(b, m, deterministic)
+}
+func (dst *BuildEvent_InvocationAttemptStarted) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Merge(dst, src)
+}
+func (m *BuildEvent_InvocationAttemptStarted) XXX_Size() int {
+	return xxx_messageInfo_BuildEvent_InvocationAttemptStarted.Size(m)
+}
+func (m *BuildEvent_InvocationAttemptStarted) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildEvent_InvocationAttemptStarted.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_BuildEvent_InvocationAttemptStarted proto.InternalMessageInfo
+
 func (m *BuildEvent_InvocationAttemptStarted) GetAttemptNumber() int64 {
 	if m != nil {
 		return m.AttemptNumber
@@ -512,19 +557,39 @@ func (m *BuildEvent_InvocationAttemptStarted) GetAttemptNumber() int64 {
 // Notification that an invocation attempt has finished.
 type BuildEvent_InvocationAttemptFinished struct {
 	// The exit code of the build tool.
-	ExitCode *google_protobuf3.Int32Value `protobuf:"bytes,2,opt,name=exit_code,json=exitCode" json:"exit_code,omitempty"`
+	ExitCode *wrappers.Int32Value `protobuf:"bytes,2,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"`
 	// Final status of the invocation.
-	InvocationStatus *BuildStatus `protobuf:"bytes,3,opt,name=invocation_status,json=invocationStatus" json:"invocation_status,omitempty"`
+	InvocationStatus     *BuildStatus `protobuf:"bytes,3,opt,name=invocation_status,json=invocationStatus,proto3" json:"invocation_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
 func (m *BuildEvent_InvocationAttemptFinished) Reset()         { *m = BuildEvent_InvocationAttemptFinished{} }
 func (m *BuildEvent_InvocationAttemptFinished) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_InvocationAttemptFinished) ProtoMessage()    {}
 func (*BuildEvent_InvocationAttemptFinished) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 1}
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0, 1}
+}
+func (m *BuildEvent_InvocationAttemptFinished) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Unmarshal(m, b)
+}
+func (m *BuildEvent_InvocationAttemptFinished) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Marshal(b, m, deterministic)
+}
+func (dst *BuildEvent_InvocationAttemptFinished) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Merge(dst, src)
+}
+func (m *BuildEvent_InvocationAttemptFinished) XXX_Size() int {
+	return xxx_messageInfo_BuildEvent_InvocationAttemptFinished.Size(m)
+}
+func (m *BuildEvent_InvocationAttemptFinished) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildEvent_InvocationAttemptFinished.DiscardUnknown(m)
 }
 
-func (m *BuildEvent_InvocationAttemptFinished) GetExitCode() *google_protobuf3.Int32Value {
+var xxx_messageInfo_BuildEvent_InvocationAttemptFinished proto.InternalMessageInfo
+
+func (m *BuildEvent_InvocationAttemptFinished) GetExitCode() *wrappers.Int32Value {
 	if m != nil {
 		return m.ExitCode
 	}
@@ -543,25 +608,69 @@ func (m *BuildEvent_InvocationAttemptFinished) GetInvocationStatus() *BuildStatu
 // build request is put back into the build queue due to a previous build
 // failure.
 type BuildEvent_BuildEnqueued struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BuildEvent_BuildEnqueued) Reset()                    { *m = BuildEvent_BuildEnqueued{} }
-func (m *BuildEvent_BuildEnqueued) String() string            { return proto.CompactTextString(m) }
-func (*BuildEvent_BuildEnqueued) ProtoMessage()               {}
-func (*BuildEvent_BuildEnqueued) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 2} }
+func (m *BuildEvent_BuildEnqueued) Reset()         { *m = BuildEvent_BuildEnqueued{} }
+func (m *BuildEvent_BuildEnqueued) String() string { return proto.CompactTextString(m) }
+func (*BuildEvent_BuildEnqueued) ProtoMessage()    {}
+func (*BuildEvent_BuildEnqueued) Descriptor() ([]byte, []int) {
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0, 2}
+}
+func (m *BuildEvent_BuildEnqueued) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildEvent_BuildEnqueued.Unmarshal(m, b)
+}
+func (m *BuildEvent_BuildEnqueued) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildEvent_BuildEnqueued.Marshal(b, m, deterministic)
+}
+func (dst *BuildEvent_BuildEnqueued) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_BuildEnqueued.Merge(dst, src)
+}
+func (m *BuildEvent_BuildEnqueued) XXX_Size() int {
+	return xxx_messageInfo_BuildEvent_BuildEnqueued.Size(m)
+}
+func (m *BuildEvent_BuildEnqueued) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildEvent_BuildEnqueued.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildEvent_BuildEnqueued proto.InternalMessageInfo
 
 // Notification that the build request has finished, and no further
 // invocations will occur.  Note that this applies to the entire Build.
 // Individual invocations trigger InvocationFinished when they finish.
 type BuildEvent_BuildFinished struct {
 	// Final status of the build.
-	Status *BuildStatus `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"`
+	Status               *BuildStatus `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *BuildEvent_BuildFinished) Reset()                    { *m = BuildEvent_BuildFinished{} }
-func (m *BuildEvent_BuildFinished) String() string            { return proto.CompactTextString(m) }
-func (*BuildEvent_BuildFinished) ProtoMessage()               {}
-func (*BuildEvent_BuildFinished) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 3} }
+func (m *BuildEvent_BuildFinished) Reset()         { *m = BuildEvent_BuildFinished{} }
+func (m *BuildEvent_BuildFinished) String() string { return proto.CompactTextString(m) }
+func (*BuildEvent_BuildFinished) ProtoMessage()    {}
+func (*BuildEvent_BuildFinished) Descriptor() ([]byte, []int) {
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0, 3}
+}
+func (m *BuildEvent_BuildFinished) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildEvent_BuildFinished.Unmarshal(m, b)
+}
+func (m *BuildEvent_BuildFinished) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildEvent_BuildFinished.Marshal(b, m, deterministic)
+}
+func (dst *BuildEvent_BuildFinished) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_BuildFinished.Merge(dst, src)
+}
+func (m *BuildEvent_BuildFinished) XXX_Size() int {
+	return xxx_messageInfo_BuildEvent_BuildFinished.Size(m)
+}
+func (m *BuildEvent_BuildFinished) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildEvent_BuildFinished.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildEvent_BuildFinished proto.InternalMessageInfo
 
 func (m *BuildEvent_BuildFinished) GetStatus() *BuildStatus {
 	if m != nil {
@@ -573,32 +682,63 @@ func (m *BuildEvent_BuildFinished) GetStatus() *BuildStatus {
 // Textual output written to standard output or standard error.
 type BuildEvent_ConsoleOutput struct {
 	// The output stream type.
-	Type ConsoleOutputStream `protobuf:"varint,1,opt,name=type,enum=google.devtools.build.v1.ConsoleOutputStream" json:"type,omitempty"`
+	Type ConsoleOutputStream `protobuf:"varint,1,opt,name=type,proto3,enum=google.devtools.build.v1.ConsoleOutputStream" json:"type,omitempty"`
 	// The output stream content.
 	//
 	// Types that are valid to be assigned to Output:
 	//	*BuildEvent_ConsoleOutput_TextOutput
 	//	*BuildEvent_ConsoleOutput_BinaryOutput
-	Output isBuildEvent_ConsoleOutput_Output `protobuf_oneof:"output"`
+	Output               isBuildEvent_ConsoleOutput_Output `protobuf_oneof:"output"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
 }
 
-func (m *BuildEvent_ConsoleOutput) Reset()                    { *m = BuildEvent_ConsoleOutput{} }
-func (m *BuildEvent_ConsoleOutput) String() string            { return proto.CompactTextString(m) }
-func (*BuildEvent_ConsoleOutput) ProtoMessage()               {}
-func (*BuildEvent_ConsoleOutput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 4} }
+func (m *BuildEvent_ConsoleOutput) Reset()         { *m = BuildEvent_ConsoleOutput{} }
+func (m *BuildEvent_ConsoleOutput) String() string { return proto.CompactTextString(m) }
+func (*BuildEvent_ConsoleOutput) ProtoMessage()    {}
+func (*BuildEvent_ConsoleOutput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0, 4}
+}
+func (m *BuildEvent_ConsoleOutput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildEvent_ConsoleOutput.Unmarshal(m, b)
+}
+func (m *BuildEvent_ConsoleOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildEvent_ConsoleOutput.Marshal(b, m, deterministic)
+}
+func (dst *BuildEvent_ConsoleOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_ConsoleOutput.Merge(dst, src)
+}
+func (m *BuildEvent_ConsoleOutput) XXX_Size() int {
+	return xxx_messageInfo_BuildEvent_ConsoleOutput.Size(m)
+}
+func (m *BuildEvent_ConsoleOutput) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildEvent_ConsoleOutput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildEvent_ConsoleOutput proto.InternalMessageInfo
+
+func (m *BuildEvent_ConsoleOutput) GetType() ConsoleOutputStream {
+	if m != nil {
+		return m.Type
+	}
+	return ConsoleOutputStream_UNKNOWN
+}
 
 type isBuildEvent_ConsoleOutput_Output interface {
 	isBuildEvent_ConsoleOutput_Output()
 }
 
 type BuildEvent_ConsoleOutput_TextOutput struct {
-	TextOutput string `protobuf:"bytes,2,opt,name=text_output,json=textOutput,oneof"`
+	TextOutput string `protobuf:"bytes,2,opt,name=text_output,json=textOutput,proto3,oneof"`
 }
+
 type BuildEvent_ConsoleOutput_BinaryOutput struct {
 	BinaryOutput []byte `protobuf:"bytes,3,opt,name=binary_output,json=binaryOutput,proto3,oneof"`
 }
 
-func (*BuildEvent_ConsoleOutput_TextOutput) isBuildEvent_ConsoleOutput_Output()   {}
+func (*BuildEvent_ConsoleOutput_TextOutput) isBuildEvent_ConsoleOutput_Output() {}
+
 func (*BuildEvent_ConsoleOutput_BinaryOutput) isBuildEvent_ConsoleOutput_Output() {}
 
 func (m *BuildEvent_ConsoleOutput) GetOutput() isBuildEvent_ConsoleOutput_Output {
@@ -608,13 +748,6 @@ func (m *BuildEvent_ConsoleOutput) GetOutput() isBuildEvent_ConsoleOutput_Output
 	return nil
 }
 
-func (m *BuildEvent_ConsoleOutput) GetType() ConsoleOutputStream {
-	if m != nil {
-		return m.Type
-	}
-	return ConsoleOutputStream_UNKNOWN
-}
-
 func (m *BuildEvent_ConsoleOutput) GetTextOutput() string {
 	if x, ok := m.GetOutput().(*BuildEvent_ConsoleOutput_TextOutput); ok {
 		return x.TextOutput
@@ -681,11 +814,11 @@ func _BuildEvent_ConsoleOutput_OneofSizer(msg proto.Message) (n int) {
 	// output
 	switch x := m.Output.(type) {
 	case *BuildEvent_ConsoleOutput_TextOutput:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.TextOutput)))
 		n += len(x.TextOutput)
 	case *BuildEvent_ConsoleOutput_BinaryOutput:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.BinaryOutput)))
 		n += len(x.BinaryOutput)
 	case nil:
@@ -699,7 +832,10 @@ func _BuildEvent_ConsoleOutput_OneofSizer(msg proto.Message) (n int) {
 // component other than CONTROLLER (See StreamId.BuildComponents).
 type BuildEvent_BuildComponentStreamFinished struct {
 	// How the event stream finished.
-	Type BuildEvent_BuildComponentStreamFinished_FinishType `protobuf:"varint,1,opt,name=type,enum=google.devtools.build.v1.BuildEvent_BuildComponentStreamFinished_FinishType" json:"type,omitempty"`
+	Type                 BuildEvent_BuildComponentStreamFinished_FinishType `protobuf:"varint,1,opt,name=type,proto3,enum=google.devtools.build.v1.BuildEvent_BuildComponentStreamFinished_FinishType" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                           `json:"-"`
+	XXX_unrecognized     []byte                                             `json:"-"`
+	XXX_sizecache        int32                                              `json:"-"`
 }
 
 func (m *BuildEvent_BuildComponentStreamFinished) Reset() {
@@ -708,8 +844,25 @@ func (m *BuildEvent_BuildComponentStreamFinished) Reset() {
 func (m *BuildEvent_BuildComponentStreamFinished) String() string { return proto.CompactTextString(m) }
 func (*BuildEvent_BuildComponentStreamFinished) ProtoMessage()    {}
 func (*BuildEvent_BuildComponentStreamFinished) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 5}
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{0, 5}
+}
+func (m *BuildEvent_BuildComponentStreamFinished) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Unmarshal(m, b)
+}
+func (m *BuildEvent_BuildComponentStreamFinished) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Marshal(b, m, deterministic)
+}
+func (dst *BuildEvent_BuildComponentStreamFinished) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Merge(dst, src)
 }
+func (m *BuildEvent_BuildComponentStreamFinished) XXX_Size() int {
+	return xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.Size(m)
+}
+func (m *BuildEvent_BuildComponentStreamFinished) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildEvent_BuildComponentStreamFinished.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildEvent_BuildComponentStreamFinished proto.InternalMessageInfo
 
 func (m *BuildEvent_BuildComponentStreamFinished) GetType() BuildEvent_BuildComponentStreamFinished_FinishType {
 	if m != nil {
@@ -721,18 +874,40 @@ func (m *BuildEvent_BuildComponentStreamFinished) GetType() BuildEvent_BuildComp
 // Unique identifier for a build event stream.
 type StreamId struct {
 	// The id of a Build message.
-	BuildId string `protobuf:"bytes,1,opt,name=build_id,json=buildId" json:"build_id,omitempty"`
+	BuildId string `protobuf:"bytes,1,opt,name=build_id,json=buildId,proto3" json:"build_id,omitempty"`
 	// The unique invocation ID within this build.
 	// It should be the same as {invocation} (below) during the migration.
-	InvocationId string `protobuf:"bytes,6,opt,name=invocation_id,json=invocationId" json:"invocation_id,omitempty"`
+	InvocationId string `protobuf:"bytes,6,opt,name=invocation_id,json=invocationId,proto3" json:"invocation_id,omitempty"`
 	// The component that emitted this event.
-	Component StreamId_BuildComponent `protobuf:"varint,3,opt,name=component,enum=google.devtools.build.v1.StreamId_BuildComponent" json:"component,omitempty"`
+	Component            StreamId_BuildComponent `protobuf:"varint,3,opt,name=component,proto3,enum=google.devtools.build.v1.StreamId_BuildComponent" json:"component,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *StreamId) Reset()         { *m = StreamId{} }
+func (m *StreamId) String() string { return proto.CompactTextString(m) }
+func (*StreamId) ProtoMessage()    {}
+func (*StreamId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_build_events_e8fab93011e40aeb, []int{1}
+}
+func (m *StreamId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamId.Unmarshal(m, b)
+}
+func (m *StreamId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamId.Marshal(b, m, deterministic)
+}
+func (dst *StreamId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamId.Merge(dst, src)
+}
+func (m *StreamId) XXX_Size() int {
+	return xxx_messageInfo_StreamId.Size(m)
+}
+func (m *StreamId) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamId.DiscardUnknown(m)
 }
 
-func (m *StreamId) Reset()                    { *m = StreamId{} }
-func (m *StreamId) String() string            { return proto.CompactTextString(m) }
-func (*StreamId) ProtoMessage()               {}
-func (*StreamId) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_StreamId proto.InternalMessageInfo
 
 func (m *StreamId) GetBuildId() string {
 	if m != nil {
@@ -769,9 +944,11 @@ func init() {
 	proto.RegisterEnum("google.devtools.build.v1.StreamId_BuildComponent", StreamId_BuildComponent_name, StreamId_BuildComponent_value)
 }
 
-func init() { proto.RegisterFile("google/devtools/build/v1/build_events.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/devtools/build/v1/build_events.proto", fileDescriptor_build_events_e8fab93011e40aeb)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_build_events_e8fab93011e40aeb = []byte{
 	// 927 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x6d, 0x6f, 0xe3, 0x44,
 	0x10, 0x8e, 0xdb, 0xa3, 0x4d, 0xa7, 0x49, 0xce, 0xb7, 0xc7, 0xa9, 0x8e, 0x5b, 0xf1, 0x52, 0x54,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/build_status.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/build_status.pb.go
index 940ddd69..75a94533 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/build_status.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/build_status.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/build_status.proto
 
-package build
+package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The end result of the Build.
 type BuildStatus_Result int32
 
@@ -64,20 +70,44 @@ var BuildStatus_Result_value = map[string]int32{
 func (x BuildStatus_Result) String() string {
 	return proto.EnumName(BuildStatus_Result_name, int32(x))
 }
-func (BuildStatus_Result) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (BuildStatus_Result) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_build_status_062894fe191e028f, []int{0, 0}
+}
 
 // Status used for both invocation attempt and overall build completion.
 type BuildStatus struct {
 	// The end result.
-	Result BuildStatus_Result `protobuf:"varint,1,opt,name=result,enum=google.devtools.build.v1.BuildStatus_Result" json:"result,omitempty"`
+	Result BuildStatus_Result `protobuf:"varint,1,opt,name=result,proto3,enum=google.devtools.build.v1.BuildStatus_Result" json:"result,omitempty"`
 	// Fine-grained diagnostic information to complement the status.
-	Details *google_protobuf1.Any `protobuf:"bytes,2,opt,name=details" json:"details,omitempty"`
+	Details              *any.Any `protobuf:"bytes,2,opt,name=details,proto3" json:"details,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BuildStatus) Reset()                    { *m = BuildStatus{} }
-func (m *BuildStatus) String() string            { return proto.CompactTextString(m) }
-func (*BuildStatus) ProtoMessage()               {}
-func (*BuildStatus) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *BuildStatus) Reset()         { *m = BuildStatus{} }
+func (m *BuildStatus) String() string { return proto.CompactTextString(m) }
+func (*BuildStatus) ProtoMessage()    {}
+func (*BuildStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_build_status_062894fe191e028f, []int{0}
+}
+func (m *BuildStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildStatus.Unmarshal(m, b)
+}
+func (m *BuildStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildStatus.Marshal(b, m, deterministic)
+}
+func (dst *BuildStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildStatus.Merge(dst, src)
+}
+func (m *BuildStatus) XXX_Size() int {
+	return xxx_messageInfo_BuildStatus.Size(m)
+}
+func (m *BuildStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildStatus proto.InternalMessageInfo
 
 func (m *BuildStatus) GetResult() BuildStatus_Result {
 	if m != nil {
@@ -86,7 +116,7 @@ func (m *BuildStatus) GetResult() BuildStatus_Result {
 	return BuildStatus_UNKNOWN_STATUS
 }
 
-func (m *BuildStatus) GetDetails() *google_protobuf1.Any {
+func (m *BuildStatus) GetDetails() *any.Any {
 	if m != nil {
 		return m.Details
 	}
@@ -98,9 +128,11 @@ func init() {
 	proto.RegisterEnum("google.devtools.build.v1.BuildStatus_Result", BuildStatus_Result_name, BuildStatus_Result_value)
 }
 
-func init() { proto.RegisterFile("google/devtools/build/v1/build_status.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/devtools/build/v1/build_status.proto", fileDescriptor_build_status_062894fe191e028f)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_build_status_062894fe191e028f = []byte{
 	// 390 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x0b, 0xd3, 0x30,
 	0x18, 0xc6, 0xcd, 0xd4, 0x4e, 0x33, 0x1d, 0x35, 0xa8, 0x6c, 0x63, 0xc2, 0xd8, 0x69, 0xa0, 0xa4,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/publish_build_event.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/publish_build_event.pb.go
index ee9fd227..803b1f7e 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/publish_build_event.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/build/v1/publish_build_event.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/build/v1/publish_build_event.proto
 
-package build
+package build // import "google.golang.org/genproto/googleapis/devtools/build/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -20,6 +20,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The service level of the build request. Backends only uses this value when
 // the BuildEnqueued event is published to determine what level of service
 // this build should receive.
@@ -46,7 +52,7 @@ func (x PublishLifecycleEventRequest_ServiceLevel) String() string {
 	return proto.EnumName(PublishLifecycleEventRequest_ServiceLevel_name, int32(x))
 }
 func (PublishLifecycleEventRequest_ServiceLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 0}
+	return fileDescriptor_publish_build_event_3702c05a2ef5b2cf, []int{0, 0}
 }
 
 // Publishes 'lifecycle events' that update the high-level state of a build:
@@ -57,29 +63,51 @@ func (PublishLifecycleEventRequest_ServiceLevel) EnumDescriptor() ([]byte, []int
 // - BuildFinished: When a build is finished.
 type PublishLifecycleEventRequest struct {
 	// The interactivity of this build.
-	ServiceLevel PublishLifecycleEventRequest_ServiceLevel `protobuf:"varint,1,opt,name=service_level,json=serviceLevel,enum=google.devtools.build.v1.PublishLifecycleEventRequest_ServiceLevel" json:"service_level,omitempty"`
+	ServiceLevel PublishLifecycleEventRequest_ServiceLevel `protobuf:"varint,1,opt,name=service_level,json=serviceLevel,proto3,enum=google.devtools.build.v1.PublishLifecycleEventRequest_ServiceLevel" json:"service_level,omitempty"`
 	// The lifecycle build event. If this is a build tool event, the RPC will fail
 	// with INVALID_REQUEST.
-	BuildEvent *OrderedBuildEvent `protobuf:"bytes,2,opt,name=build_event,json=buildEvent" json:"build_event,omitempty"`
+	BuildEvent *OrderedBuildEvent `protobuf:"bytes,2,opt,name=build_event,json=buildEvent,proto3" json:"build_event,omitempty"`
 	// If the next event for this build or invocation (depending on the event
 	// type) hasn't been published after this duration from when {build_event}
 	// is written to BES, consider this stream expired. If this field is not set,
 	// BES backend will use its own default value.
-	StreamTimeout *google_protobuf4.Duration `protobuf:"bytes,3,opt,name=stream_timeout,json=streamTimeout" json:"stream_timeout,omitempty"`
+	StreamTimeout *duration.Duration `protobuf:"bytes,3,opt,name=stream_timeout,json=streamTimeout,proto3" json:"stream_timeout,omitempty"`
 	// Additional information about a build request. These are define by the event
 	// publishers, and the Build Event Service does not validate or interpret
 	// them. They are used while notifying internal systems of new builds and
 	// invocations if the OrderedBuildEvent.event type is
 	// BuildEnqueued/InvocationAttemptStarted.
-	NotificationKeywords []string `protobuf:"bytes,4,rep,name=notification_keywords,json=notificationKeywords" json:"notification_keywords,omitempty"`
+	NotificationKeywords []string `protobuf:"bytes,4,rep,name=notification_keywords,json=notificationKeywords,proto3" json:"notification_keywords,omitempty"`
 	// This field identifies which project (if any) the build is associated with.
-	ProjectId string `protobuf:"bytes,6,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId            string   `protobuf:"bytes,6,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PublishLifecycleEventRequest) Reset()         { *m = PublishLifecycleEventRequest{} }
+func (m *PublishLifecycleEventRequest) String() string { return proto.CompactTextString(m) }
+func (*PublishLifecycleEventRequest) ProtoMessage()    {}
+func (*PublishLifecycleEventRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_publish_build_event_3702c05a2ef5b2cf, []int{0}
+}
+func (m *PublishLifecycleEventRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublishLifecycleEventRequest.Unmarshal(m, b)
+}
+func (m *PublishLifecycleEventRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublishLifecycleEventRequest.Marshal(b, m, deterministic)
+}
+func (dst *PublishLifecycleEventRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishLifecycleEventRequest.Merge(dst, src)
+}
+func (m *PublishLifecycleEventRequest) XXX_Size() int {
+	return xxx_messageInfo_PublishLifecycleEventRequest.Size(m)
+}
+func (m *PublishLifecycleEventRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublishLifecycleEventRequest.DiscardUnknown(m)
 }
 
-func (m *PublishLifecycleEventRequest) Reset()                    { *m = PublishLifecycleEventRequest{} }
-func (m *PublishLifecycleEventRequest) String() string            { return proto.CompactTextString(m) }
-func (*PublishLifecycleEventRequest) ProtoMessage()               {}
-func (*PublishLifecycleEventRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_PublishLifecycleEventRequest proto.InternalMessageInfo
 
 func (m *PublishLifecycleEventRequest) GetServiceLevel() PublishLifecycleEventRequest_ServiceLevel {
 	if m != nil {
@@ -95,7 +123,7 @@ func (m *PublishLifecycleEventRequest) GetBuildEvent() *OrderedBuildEvent {
 	return nil
 }
 
-func (m *PublishLifecycleEventRequest) GetStreamTimeout() *google_protobuf4.Duration {
+func (m *PublishLifecycleEventRequest) GetStreamTimeout() *duration.Duration {
 	if m != nil {
 		return m.StreamTimeout
 	}
@@ -120,18 +148,38 @@ func (m *PublishLifecycleEventRequest) GetProjectId() string {
 // RPC errors, hence not recorded by this proto.
 type PublishBuildToolEventStreamResponse struct {
 	// The stream that contains this event.
-	StreamId *StreamId `protobuf:"bytes,1,opt,name=stream_id,json=streamId" json:"stream_id,omitempty"`
+	StreamId *StreamId `protobuf:"bytes,1,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"`
 	// The sequence number of this event that has been committed.
-	SequenceNumber int64 `protobuf:"varint,2,opt,name=sequence_number,json=sequenceNumber" json:"sequence_number,omitempty"`
+	SequenceNumber       int64    `protobuf:"varint,2,opt,name=sequence_number,json=sequenceNumber,proto3" json:"sequence_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *PublishBuildToolEventStreamResponse) Reset()         { *m = PublishBuildToolEventStreamResponse{} }
 func (m *PublishBuildToolEventStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*PublishBuildToolEventStreamResponse) ProtoMessage()    {}
 func (*PublishBuildToolEventStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{1}
+	return fileDescriptor_publish_build_event_3702c05a2ef5b2cf, []int{1}
+}
+func (m *PublishBuildToolEventStreamResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublishBuildToolEventStreamResponse.Unmarshal(m, b)
+}
+func (m *PublishBuildToolEventStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublishBuildToolEventStreamResponse.Marshal(b, m, deterministic)
+}
+func (dst *PublishBuildToolEventStreamResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishBuildToolEventStreamResponse.Merge(dst, src)
+}
+func (m *PublishBuildToolEventStreamResponse) XXX_Size() int {
+	return xxx_messageInfo_PublishBuildToolEventStreamResponse.Size(m)
+}
+func (m *PublishBuildToolEventStreamResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublishBuildToolEventStreamResponse.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_PublishBuildToolEventStreamResponse proto.InternalMessageInfo
+
 func (m *PublishBuildToolEventStreamResponse) GetStreamId() *StreamId {
 	if m != nil {
 		return m.StreamId
@@ -150,19 +198,41 @@ func (m *PublishBuildToolEventStreamResponse) GetSequenceNumber() int64 {
 // its position in that stream.
 type OrderedBuildEvent struct {
 	// Which build event stream this event belongs to.
-	StreamId *StreamId `protobuf:"bytes,1,opt,name=stream_id,json=streamId" json:"stream_id,omitempty"`
+	StreamId *StreamId `protobuf:"bytes,1,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"`
 	// The position of this event in the stream. The sequence numbers for a build
 	// event stream should be a sequence of consecutive natural numbers starting
 	// from one. (1, 2, 3, ...)
-	SequenceNumber int64 `protobuf:"varint,2,opt,name=sequence_number,json=sequenceNumber" json:"sequence_number,omitempty"`
+	SequenceNumber int64 `protobuf:"varint,2,opt,name=sequence_number,json=sequenceNumber,proto3" json:"sequence_number,omitempty"`
 	// The actual event.
-	Event *BuildEvent `protobuf:"bytes,3,opt,name=event" json:"event,omitempty"`
+	Event                *BuildEvent `protobuf:"bytes,3,opt,name=event,proto3" json:"event,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *OrderedBuildEvent) Reset()                    { *m = OrderedBuildEvent{} }
-func (m *OrderedBuildEvent) String() string            { return proto.CompactTextString(m) }
-func (*OrderedBuildEvent) ProtoMessage()               {}
-func (*OrderedBuildEvent) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+func (m *OrderedBuildEvent) Reset()         { *m = OrderedBuildEvent{} }
+func (m *OrderedBuildEvent) String() string { return proto.CompactTextString(m) }
+func (*OrderedBuildEvent) ProtoMessage()    {}
+func (*OrderedBuildEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_publish_build_event_3702c05a2ef5b2cf, []int{2}
+}
+func (m *OrderedBuildEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OrderedBuildEvent.Unmarshal(m, b)
+}
+func (m *OrderedBuildEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OrderedBuildEvent.Marshal(b, m, deterministic)
+}
+func (dst *OrderedBuildEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrderedBuildEvent.Merge(dst, src)
+}
+func (m *OrderedBuildEvent) XXX_Size() int {
+	return xxx_messageInfo_OrderedBuildEvent.Size(m)
+}
+func (m *OrderedBuildEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_OrderedBuildEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OrderedBuildEvent proto.InternalMessageInfo
 
 func (m *OrderedBuildEvent) GetStreamId() *StreamId {
 	if m != nil {
@@ -187,30 +257,51 @@ func (m *OrderedBuildEvent) GetEvent() *BuildEvent {
 
 type PublishBuildToolEventStreamRequest struct {
 	// Which build event stream this event belongs to.
-	StreamId *StreamId `protobuf:"bytes,1,opt,name=stream_id,json=streamId" json:"stream_id,omitempty"`
+	StreamId *StreamId `protobuf:"bytes,1,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"` // Deprecated: Do not use.
 	// The position of this event in the stream. The sequence numbers for a build
 	// event stream should be a sequence of consecutive natural numbers starting
 	// from one. (1, 2, 3, ...)
-	SequenceNumber int64 `protobuf:"varint,2,opt,name=sequence_number,json=sequenceNumber" json:"sequence_number,omitempty"`
+	SequenceNumber int64 `protobuf:"varint,2,opt,name=sequence_number,json=sequenceNumber,proto3" json:"sequence_number,omitempty"` // Deprecated: Do not use.
 	// The actual event.
-	Event *BuildEvent `protobuf:"bytes,3,opt,name=event" json:"event,omitempty"`
+	Event *BuildEvent `protobuf:"bytes,3,opt,name=event,proto3" json:"event,omitempty"` // Deprecated: Do not use.
 	// The build event with position info.
 	// New publishing clients should use this field rather than the 3 above.
-	OrderedBuildEvent *OrderedBuildEvent `protobuf:"bytes,4,opt,name=ordered_build_event,json=orderedBuildEvent" json:"ordered_build_event,omitempty"`
+	OrderedBuildEvent *OrderedBuildEvent `protobuf:"bytes,4,opt,name=ordered_build_event,json=orderedBuildEvent,proto3" json:"ordered_build_event,omitempty"`
 	// The keywords to be attached to the notification which notifies the start
 	// of a new build event stream. BES only reads this field when sequence_number
 	// or ordered_build_event.sequence_number is 1 in this message. If this field
 	// is empty, BES will not publish notification messages for this stream.
-	NotificationKeywords []string `protobuf:"bytes,5,rep,name=notification_keywords,json=notificationKeywords" json:"notification_keywords,omitempty"`
+	NotificationKeywords []string `protobuf:"bytes,5,rep,name=notification_keywords,json=notificationKeywords,proto3" json:"notification_keywords,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *PublishBuildToolEventStreamRequest) Reset()         { *m = PublishBuildToolEventStreamRequest{} }
 func (m *PublishBuildToolEventStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*PublishBuildToolEventStreamRequest) ProtoMessage()    {}
 func (*PublishBuildToolEventStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{3}
+	return fileDescriptor_publish_build_event_3702c05a2ef5b2cf, []int{3}
+}
+func (m *PublishBuildToolEventStreamRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublishBuildToolEventStreamRequest.Unmarshal(m, b)
+}
+func (m *PublishBuildToolEventStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublishBuildToolEventStreamRequest.Marshal(b, m, deterministic)
 }
+func (dst *PublishBuildToolEventStreamRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishBuildToolEventStreamRequest.Merge(dst, src)
+}
+func (m *PublishBuildToolEventStreamRequest) XXX_Size() int {
+	return xxx_messageInfo_PublishBuildToolEventStreamRequest.Size(m)
+}
+func (m *PublishBuildToolEventStreamRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublishBuildToolEventStreamRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PublishBuildToolEventStreamRequest proto.InternalMessageInfo
 
+// Deprecated: Do not use.
 func (m *PublishBuildToolEventStreamRequest) GetStreamId() *StreamId {
 	if m != nil {
 		return m.StreamId
@@ -218,6 +309,7 @@ func (m *PublishBuildToolEventStreamRequest) GetStreamId() *StreamId {
 	return nil
 }
 
+// Deprecated: Do not use.
 func (m *PublishBuildToolEventStreamRequest) GetSequenceNumber() int64 {
 	if m != nil {
 		return m.SequenceNumber
@@ -225,6 +317,7 @@ func (m *PublishBuildToolEventStreamRequest) GetSequenceNumber() int64 {
 	return 0
 }
 
+// Deprecated: Do not use.
 func (m *PublishBuildToolEventStreamRequest) GetEvent() *BuildEvent {
 	if m != nil {
 		return m.Event
@@ -262,8 +355,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for PublishBuildEvent service
-
+// PublishBuildEventClient is the client API for PublishBuildEvent service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type PublishBuildEventClient interface {
 	// Publish a build event stating the new state of a build (typically from the
 	// build queue). If the event is a BuildEnqueued event, also register the new
@@ -275,7 +369,7 @@ type PublishBuildEventClient interface {
 	// The commit status of the request is reported by the RPC's util_status()
 	// function. The error code is the canoncial error code defined in
 	// //util/task/codes.proto.
-	PublishLifecycleEvent(ctx context.Context, in *PublishLifecycleEventRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error)
+	PublishLifecycleEvent(ctx context.Context, in *PublishLifecycleEventRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Publish build tool events belonging to the same stream to a backend job
 	// using bidirectional streaming.
 	PublishBuildToolEventStream(ctx context.Context, opts ...grpc.CallOption) (PublishBuildEvent_PublishBuildToolEventStreamClient, error)
@@ -289,9 +383,9 @@ func NewPublishBuildEventClient(cc *grpc.ClientConn) PublishBuildEventClient {
 	return &publishBuildEventClient{cc}
 }
 
-func (c *publishBuildEventClient) PublishLifecycleEvent(ctx context.Context, in *PublishLifecycleEventRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error) {
-	out := new(google_protobuf5.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.build.v1.PublishBuildEvent/PublishLifecycleEvent", in, out, c.cc, opts...)
+func (c *publishBuildEventClient) PublishLifecycleEvent(ctx context.Context, in *PublishLifecycleEventRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.build.v1.PublishBuildEvent/PublishLifecycleEvent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -299,7 +393,7 @@ func (c *publishBuildEventClient) PublishLifecycleEvent(ctx context.Context, in
 }
 
 func (c *publishBuildEventClient) PublishBuildToolEventStream(ctx context.Context, opts ...grpc.CallOption) (PublishBuildEvent_PublishBuildToolEventStreamClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_PublishBuildEvent_serviceDesc.Streams[0], c.cc, "/google.devtools.build.v1.PublishBuildEvent/PublishBuildToolEventStream", opts...)
+	stream, err := c.cc.NewStream(ctx, &_PublishBuildEvent_serviceDesc.Streams[0], "/google.devtools.build.v1.PublishBuildEvent/PublishBuildToolEventStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -308,7 +402,7 @@ func (c *publishBuildEventClient) PublishBuildToolEventStream(ctx context.Contex
 }
 
 type PublishBuildEvent_PublishBuildToolEventStreamClient interface {
-	Send(*OrderedBuildEvent) error
+	Send(*PublishBuildToolEventStreamRequest) error
 	Recv() (*PublishBuildToolEventStreamResponse, error)
 	grpc.ClientStream
 }
@@ -317,7 +411,7 @@ type publishBuildEventPublishBuildToolEventStreamClient struct {
 	grpc.ClientStream
 }
 
-func (x *publishBuildEventPublishBuildToolEventStreamClient) Send(m *OrderedBuildEvent) error {
+func (x *publishBuildEventPublishBuildToolEventStreamClient) Send(m *PublishBuildToolEventStreamRequest) error {
 	return x.ClientStream.SendMsg(m)
 }
 
@@ -329,8 +423,7 @@ func (x *publishBuildEventPublishBuildToolEventStreamClient) Recv() (*PublishBui
 	return m, nil
 }
 
-// Server API for PublishBuildEvent service
-
+// PublishBuildEventServer is the server API for PublishBuildEvent service.
 type PublishBuildEventServer interface {
 	// Publish a build event stating the new state of a build (typically from the
 	// build queue). If the event is a BuildEnqueued event, also register the new
@@ -342,7 +435,7 @@ type PublishBuildEventServer interface {
 	// The commit status of the request is reported by the RPC's util_status()
 	// function. The error code is the canoncial error code defined in
 	// //util/task/codes.proto.
-	PublishLifecycleEvent(context.Context, *PublishLifecycleEventRequest) (*google_protobuf5.Empty, error)
+	PublishLifecycleEvent(context.Context, *PublishLifecycleEventRequest) (*empty.Empty, error)
 	// Publish build tool events belonging to the same stream to a backend job
 	// using bidirectional streaming.
 	PublishBuildToolEventStream(PublishBuildEvent_PublishBuildToolEventStreamServer) error
@@ -376,7 +469,7 @@ func _PublishBuildEvent_PublishBuildToolEventStream_Handler(srv interface{}, str
 
 type PublishBuildEvent_PublishBuildToolEventStreamServer interface {
 	Send(*PublishBuildToolEventStreamResponse) error
-	Recv() (*OrderedBuildEvent, error)
+	Recv() (*PublishBuildToolEventStreamRequest, error)
 	grpc.ServerStream
 }
 
@@ -388,8 +481,8 @@ func (x *publishBuildEventPublishBuildToolEventStreamServer) Send(m *PublishBuil
 	return x.ServerStream.SendMsg(m)
 }
 
-func (x *publishBuildEventPublishBuildToolEventStreamServer) Recv() (*OrderedBuildEvent, error) {
-	m := new(OrderedBuildEvent)
+func (x *publishBuildEventPublishBuildToolEventStreamServer) Recv() (*PublishBuildToolEventStreamRequest, error) {
+	m := new(PublishBuildToolEventStreamRequest)
 	if err := x.ServerStream.RecvMsg(m); err != nil {
 		return nil, err
 	}
@@ -416,50 +509,52 @@ var _PublishBuildEvent_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/build/v1/publish_build_event.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/build/v1/publish_build_event.proto", fileDescriptor2) }
-
-var fileDescriptor2 = []byte{
-	// 666 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcf, 0x6e, 0xd3, 0x4e,
-	0x10, 0xfe, 0x6d, 0xd2, 0x56, 0xbf, 0x6c, 0xda, 0x94, 0x2e, 0x14, 0x4c, 0xda, 0xa2, 0xc8, 0x20,
-	0x88, 0xa8, 0x64, 0xd3, 0x54, 0xe2, 0x50, 0x54, 0xfe, 0xa4, 0xe4, 0x10, 0x51, 0xa5, 0x95, 0x1b,
-	0x71, 0x80, 0x83, 0xe5, 0xd8, 0xd3, 0x74, 0xa9, 0xe3, 0x35, 0xde, 0xb5, 0x51, 0xaf, 0xbc, 0x40,
-	0x0f, 0x3c, 0x01, 0x77, 0x5e, 0x80, 0xe7, 0x80, 0x47, 0xe0, 0xc0, 0x23, 0x70, 0x44, 0xde, 0x75,
-	0x90, 0x69, 0x70, 0x50, 0x73, 0xe0, 0xe6, 0xdd, 0x99, 0xf9, 0x66, 0xbe, 0x6f, 0x76, 0xc6, 0xb8,
-	0x35, 0x64, 0x6c, 0xe8, 0x83, 0xe9, 0x41, 0x22, 0x18, 0xf3, 0xb9, 0x39, 0x88, 0xa9, 0xef, 0x99,
-	0xc9, 0x96, 0x19, 0xc6, 0x03, 0x9f, 0xf2, 0x13, 0x5b, 0x5e, 0xd8, 0x90, 0x40, 0x20, 0x8c, 0x30,
-	0x62, 0x82, 0x11, 0x4d, 0xc5, 0x18, 0xe3, 0x18, 0x43, 0xba, 0x18, 0xc9, 0x56, 0x7d, 0x3d, 0x43,
-	0x73, 0x42, 0x6a, 0x3a, 0x41, 0xc0, 0x84, 0x23, 0x28, 0x0b, 0xb8, 0x8a, 0xab, 0x6f, 0x16, 0xe6,
-	0xca, 0xe5, 0x18, 0x3b, 0xdf, 0xca, 0x9c, 0xe5, 0x69, 0x10, 0x1f, 0x9b, 0x5e, 0x1c, 0x49, 0xb4,
-	0xcc, 0xbe, 0x76, 0xd1, 0x0e, 0xa3, 0x50, 0x9c, 0x29, 0xa3, 0xfe, 0xb1, 0x8c, 0xd7, 0x0f, 0x55,
-	0xfd, 0xfb, 0xf4, 0x18, 0xdc, 0x33, 0xd7, 0x87, 0x4e, 0x8a, 0x6e, 0xc1, 0xdb, 0x18, 0xb8, 0x20,
-	0x27, 0x78, 0x89, 0x43, 0x94, 0x50, 0x17, 0x6c, 0x1f, 0x12, 0xf0, 0x35, 0xd4, 0x40, 0xcd, 0x5a,
-	0x6b, 0xcf, 0x28, 0xa2, 0x66, 0x4c, 0x83, 0x33, 0x8e, 0x14, 0xd6, 0x7e, 0x0a, 0x65, 0x2d, 0xf2,
-	0xdc, 0x89, 0xec, 0xe3, 0x6a, 0x8e, 0x9d, 0x56, 0x6a, 0xa0, 0x66, 0xb5, 0xb5, 0x59, 0x9c, 0xe7,
-	0x20, 0xf2, 0x20, 0x02, 0xaf, 0x9d, 0x9e, 0x55, 0x0e, 0x3c, 0xf8, 0xf5, 0x4d, 0x9e, 0xe2, 0x1a,
-	0x17, 0x11, 0x38, 0x23, 0x5b, 0xd0, 0x11, 0xb0, 0x58, 0x68, 0x65, 0x09, 0x78, 0x73, 0x0c, 0x38,
-	0x96, 0xc3, 0x78, 0x9e, 0xc9, 0x65, 0x2d, 0xa9, 0x80, 0xbe, 0xf2, 0x27, 0xdb, 0x78, 0x35, 0x60,
-	0x82, 0x1e, 0x53, 0x57, 0x9a, 0xed, 0x53, 0x38, 0x7b, 0xc7, 0x22, 0x8f, 0x6b, 0x73, 0x8d, 0x72,
-	0xb3, 0x62, 0x5d, 0xcb, 0x1b, 0x5f, 0x64, 0x36, 0xb2, 0x81, 0x71, 0x18, 0xb1, 0x37, 0xe0, 0x0a,
-	0x9b, 0x7a, 0xda, 0x42, 0x03, 0x35, 0x2b, 0x56, 0x25, 0xbb, 0xe9, 0x7a, 0xfa, 0x36, 0x5e, 0xcc,
-	0x2b, 0x40, 0x08, 0xae, 0xf5, 0x0e, 0x7a, 0xdd, 0x5e, 0xbf, 0x63, 0x3d, 0xdb, 0xeb, 0x77, 0x5f,
-	0x76, 0xae, 0xfc, 0x47, 0x96, 0x71, 0x35, 0x7f, 0x81, 0xf4, 0x73, 0x84, 0x6f, 0x67, 0xa2, 0x4a,
-	0xb2, 0x7d, 0xc6, 0x7c, 0x49, 0xf2, 0x48, 0xd6, 0x6b, 0x01, 0x0f, 0x59, 0xc0, 0x81, 0x3c, 0xc1,
-	0x95, 0x8c, 0x32, 0xf5, 0x64, 0x9b, 0xaa, 0x2d, 0xbd, 0x58, 0x3e, 0x15, 0xdc, 0xf5, 0xac, 0xff,
-	0x79, 0xf6, 0x45, 0xee, 0xe1, 0x65, 0x9e, 0xf6, 0x29, 0x70, 0xc1, 0x0e, 0xe2, 0xd1, 0x00, 0x22,
-	0xd9, 0x85, 0xb2, 0x55, 0x1b, 0x5f, 0xf7, 0xe4, 0xad, 0xfe, 0x19, 0xe1, 0x95, 0x09, 0xf9, 0xff,
-	0x5d, 0x7e, 0xb2, 0x83, 0xe7, 0xd5, 0x23, 0x51, 0x3d, 0xbd, 0x53, 0x9c, 0x25, 0xf7, 0x3a, 0x54,
-	0x88, 0xfe, 0xbd, 0x84, 0xf5, 0xa9, 0x6a, 0xaa, 0x77, 0xbf, 0x37, 0x13, 0x99, 0x76, 0x49, 0x43,
-	0x39, 0x42, 0x9b, 0x05, 0x84, 0xa4, 0xdb, 0x45, 0x52, 0x8f, 0x67, 0x20, 0x25, 0x81, 0x54, 0x18,
-	0x79, 0x8d, 0xaf, 0x32, 0xd5, 0x93, 0xfc, 0x26, 0xd2, 0xe6, 0x2e, 0x3f, 0x47, 0x2b, 0x6c, 0xa2,
-	0xb7, 0x85, 0xc3, 0x30, 0x5f, 0x3c, 0x0c, 0xad, 0xaf, 0x25, 0xbc, 0x92, 0x97, 0x5a, 0x41, 0x9d,
-	0x23, 0xbc, 0xfa, 0xc7, 0x1d, 0x41, 0x1e, 0xce, 0xb6, 0x54, 0xea, 0xd7, 0x27, 0x66, 0xba, 0x93,
-	0xae, 0x38, 0xfd, 0xee, 0xfb, 0x2f, 0xdf, 0x3e, 0x94, 0x1a, 0xfa, 0x5a, 0xba, 0x39, 0xfd, 0xdf,
-	0x42, 0xf9, 0x4e, 0xb6, 0xb5, 0x77, 0xd0, 0x7d, 0xf2, 0x09, 0xe1, 0xb5, 0x29, 0x4f, 0x82, 0x5c,
-	0x46, 0xbc, 0xfa, 0xee, 0x5f, 0x49, 0x4c, 0x1b, 0x62, 0x7d, 0x43, 0xd6, 0x7c, 0x43, 0x27, 0x69,
-	0xcd, 0x70, 0xb1, 0xd4, 0x26, 0x7a, 0x80, 0xda, 0x21, 0x5e, 0x77, 0xd9, 0xa8, 0x30, 0x4d, 0x7b,
-	0xb1, 0xed, 0xb8, 0xa7, 0x10, 0x78, 0x87, 0xa9, 0x1a, 0x87, 0xe8, 0xd5, 0x6e, 0xe6, 0x39, 0x64,
-	0xbe, 0x13, 0x0c, 0x0d, 0x16, 0x0d, 0xcd, 0x21, 0x04, 0x52, 0x2b, 0x53, 0x99, 0x9c, 0x90, 0xf2,
-	0xc9, 0x9f, 0xcd, 0x23, 0xf9, 0xf1, 0x03, 0xa1, 0xc1, 0x82, 0x74, 0xde, 0xfe, 0x19, 0x00, 0x00,
-	0xff, 0xff, 0x85, 0x4c, 0x16, 0x72, 0x04, 0x07, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/devtools/build/v1/publish_build_event.proto", fileDescriptor_publish_build_event_3702c05a2ef5b2cf)
+}
+
+var fileDescriptor_publish_build_event_3702c05a2ef5b2cf = []byte{
+	// 668 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xfd, 0x26, 0x69, 0xab, 0x2f, 0x93, 0x36, 0xa5, 0x03, 0x05, 0x93, 0xb6, 0x28, 0x32, 0x08,
+	0x22, 0x2a, 0xd9, 0x34, 0x95, 0x58, 0x14, 0xca, 0x4f, 0x4a, 0x16, 0x11, 0x55, 0x5a, 0xb9, 0x11,
+	0x0b, 0x58, 0x58, 0x8e, 0x7d, 0x9b, 0x0e, 0x75, 0x3c, 0xc6, 0x33, 0x36, 0xea, 0x96, 0x17, 0xe8,
+	0x82, 0x27, 0xe0, 0x31, 0x58, 0xf0, 0x14, 0xbc, 0x02, 0x48, 0x3c, 0x02, 0x4b, 0xe4, 0x19, 0x07,
+	0x99, 0x06, 0x07, 0x91, 0x05, 0x3b, 0xcf, 0xdc, 0x7b, 0xcf, 0x9d, 0x73, 0xee, 0x8f, 0x71, 0x6b,
+	0xc8, 0xd8, 0xd0, 0x07, 0xd3, 0x83, 0x44, 0x30, 0xe6, 0x73, 0x73, 0x10, 0x53, 0xdf, 0x33, 0x93,
+	0x2d, 0x33, 0x8c, 0x07, 0x3e, 0xe5, 0x27, 0xb6, 0xbc, 0xb0, 0x21, 0x81, 0x40, 0x18, 0x61, 0xc4,
+	0x04, 0x23, 0x9a, 0x8a, 0x31, 0xc6, 0x31, 0x86, 0x74, 0x31, 0x92, 0xad, 0xfa, 0x7a, 0x86, 0xe6,
+	0x84, 0xd4, 0x74, 0x82, 0x80, 0x09, 0x47, 0x50, 0x16, 0x70, 0x15, 0x57, 0xdf, 0x2c, 0xcc, 0x95,
+	0xcb, 0x31, 0x76, 0xbe, 0x91, 0x39, 0xcb, 0xd3, 0x20, 0x3e, 0x36, 0xbd, 0x38, 0x92, 0x68, 0x99,
+	0x7d, 0xed, 0xa2, 0x1d, 0x46, 0xa1, 0x38, 0x53, 0x46, 0xfd, 0x43, 0x19, 0xaf, 0x1f, 0xaa, 0xf7,
+	0xef, 0xd3, 0x63, 0x70, 0xcf, 0x5c, 0x1f, 0x3a, 0x29, 0xba, 0x05, 0x6f, 0x62, 0xe0, 0x82, 0x9c,
+	0xe0, 0x25, 0x0e, 0x51, 0x42, 0x5d, 0xb0, 0x7d, 0x48, 0xc0, 0xd7, 0x50, 0x03, 0x35, 0x6b, 0xad,
+	0x3d, 0xa3, 0x88, 0x9a, 0x31, 0x0d, 0xce, 0x38, 0x52, 0x58, 0xfb, 0x29, 0x94, 0xb5, 0xc8, 0x73,
+	0x27, 0xb2, 0x8f, 0xab, 0x39, 0x76, 0x5a, 0xa9, 0x81, 0x9a, 0xd5, 0xd6, 0x66, 0x71, 0x9e, 0x83,
+	0xc8, 0x83, 0x08, 0xbc, 0x76, 0x7a, 0x56, 0x39, 0xf0, 0xe0, 0xe7, 0x37, 0x79, 0x82, 0x6b, 0x5c,
+	0x44, 0xe0, 0x8c, 0x6c, 0x41, 0x47, 0xc0, 0x62, 0xa1, 0x95, 0x25, 0xe0, 0xf5, 0x31, 0xe0, 0x58,
+	0x0e, 0xe3, 0x59, 0x26, 0x97, 0xb5, 0xa4, 0x02, 0xfa, 0xca, 0x9f, 0x6c, 0xe3, 0xd5, 0x80, 0x09,
+	0x7a, 0x4c, 0x5d, 0x69, 0xb6, 0x4f, 0xe1, 0xec, 0x2d, 0x8b, 0x3c, 0xae, 0xcd, 0x35, 0xca, 0xcd,
+	0x8a, 0x75, 0x25, 0x6f, 0x7c, 0x9e, 0xd9, 0xc8, 0x06, 0xc6, 0x61, 0xc4, 0x5e, 0x83, 0x2b, 0x6c,
+	0xea, 0x69, 0x0b, 0x0d, 0xd4, 0xac, 0x58, 0x95, 0xec, 0xa6, 0xeb, 0xe9, 0xdb, 0x78, 0x31, 0xaf,
+	0x00, 0x21, 0xb8, 0xd6, 0x3b, 0xe8, 0x75, 0x7b, 0xfd, 0x8e, 0xf5, 0x74, 0xaf, 0xdf, 0x7d, 0xd1,
+	0xb9, 0xf4, 0x1f, 0x59, 0xc6, 0xd5, 0xfc, 0x05, 0xd2, 0xcf, 0x11, 0xbe, 0x99, 0x89, 0x2a, 0xc9,
+	0xf6, 0x19, 0xf3, 0x25, 0xc9, 0x23, 0xf9, 0x5e, 0x0b, 0x78, 0xc8, 0x02, 0x0e, 0xe4, 0x31, 0xae,
+	0x64, 0x94, 0xa9, 0x27, 0xcb, 0x54, 0x6d, 0xe9, 0xc5, 0xf2, 0xa9, 0xe0, 0xae, 0x67, 0xfd, 0xcf,
+	0xb3, 0x2f, 0x72, 0x07, 0x2f, 0xf3, 0xb4, 0x4e, 0x81, 0x0b, 0x76, 0x10, 0x8f, 0x06, 0x10, 0xc9,
+	0x2a, 0x94, 0xad, 0xda, 0xf8, 0xba, 0x27, 0x6f, 0xf5, 0x8f, 0x08, 0xaf, 0x4c, 0xc8, 0xff, 0xef,
+	0xf2, 0x93, 0x1d, 0x3c, 0xaf, 0x9a, 0x44, 0xd5, 0xf4, 0x56, 0x71, 0x96, 0x5c, 0x77, 0xa8, 0x10,
+	0xfd, 0x5b, 0x09, 0xeb, 0x53, 0xd5, 0x54, 0x7d, 0xbf, 0x37, 0x13, 0x99, 0x76, 0x49, 0x43, 0x39,
+	0x42, 0x9b, 0x05, 0x84, 0xa4, 0xdb, 0x45, 0x52, 0x8f, 0x66, 0x20, 0x25, 0x81, 0x54, 0x18, 0x79,
+	0x85, 0x2f, 0x33, 0x55, 0x93, 0xfc, 0x26, 0xd2, 0xe6, 0xfe, 0x7e, 0x8e, 0x56, 0xd8, 0x44, 0x6d,
+	0x0b, 0x87, 0x61, 0xbe, 0x78, 0x18, 0x5a, 0x5f, 0x4b, 0x78, 0x25, 0x2f, 0xb5, 0x82, 0x3a, 0x47,
+	0x78, 0xf5, 0xb7, 0x3b, 0x82, 0xdc, 0x9f, 0x6d, 0xa9, 0xd4, 0xaf, 0x4e, 0xcc, 0x74, 0x27, 0x5d,
+	0x71, 0xfa, 0xed, 0x77, 0x9f, 0xbf, 0xbc, 0x2f, 0x35, 0xf4, 0xb5, 0x74, 0x73, 0xfa, 0xbf, 0x84,
+	0xf2, 0x9d, 0x6c, 0x6b, 0xef, 0xa0, 0xbb, 0xe4, 0x13, 0xc2, 0x6b, 0x53, 0x5a, 0x82, 0x3c, 0xfc,
+	0xe3, 0xbb, 0xa6, 0x74, 0x52, 0x7d, 0x77, 0xc6, 0x68, 0x35, 0xd5, 0xfa, 0x86, 0x24, 0x71, 0x4d,
+	0x27, 0x29, 0x09, 0xb8, 0xf8, 0xf6, 0x26, 0xba, 0x87, 0xda, 0x21, 0x5e, 0x77, 0xd9, 0xa8, 0x30,
+	0x4d, 0x7b, 0xb1, 0xed, 0xb8, 0xa7, 0x10, 0x78, 0x87, 0xa9, 0x3c, 0x87, 0xe8, 0xe5, 0x6e, 0xe6,
+	0x39, 0x64, 0xbe, 0x13, 0x0c, 0x0d, 0x16, 0x0d, 0xcd, 0x21, 0x04, 0x52, 0x3c, 0x53, 0x99, 0x9c,
+	0x90, 0xf2, 0xc9, 0xbf, 0xcf, 0x03, 0xf9, 0xf1, 0x1d, 0xa1, 0xc1, 0x82, 0x74, 0xde, 0xfe, 0x11,
+	0x00, 0x00, 0xff, 0xff, 0xf0, 0x9d, 0x50, 0x3a, 0x15, 0x07, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
index 0b62fd0d..8a32982f 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1/cloudbuild.pb.go
@@ -1,54 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudbuild/v1/cloudbuild.proto
 
-/*
-Package cloudbuild is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/cloudbuild/v1/cloudbuild.proto
-
-It has these top-level messages:
-	RetryBuildRequest
-	RunBuildTriggerRequest
-	StorageSource
-	RepoSource
-	Source
-	BuiltImage
-	BuildStep
-	Volume
-	Results
-	Build
-	TimeSpan
-	BuildOperationMetadata
-	SourceProvenance
-	FileHashes
-	Hash
-	Secret
-	CreateBuildRequest
-	GetBuildRequest
-	ListBuildsRequest
-	ListBuildsResponse
-	CancelBuildRequest
-	BuildTrigger
-	CreateBuildTriggerRequest
-	GetBuildTriggerRequest
-	ListBuildTriggersRequest
-	ListBuildTriggersResponse
-	DeleteBuildTriggerRequest
-	UpdateBuildTriggerRequest
-	BuildOptions
-*/
-package cloudbuild
+package cloudbuild // import "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
+import _ "google.golang.org/genproto/googleapis/api/httpbody"
 import _ "google.golang.org/genproto/googleapis/cloud/audit"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -66,25 +30,25 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
-// Possible status of a build.
+// Possible status of a build or build step.
 type Build_Status int32
 
 const (
 	// Status of the build is unknown.
 	Build_STATUS_UNKNOWN Build_Status = 0
-	// Build is queued; work has not yet begun.
+	// Build or step is queued; work has not yet begun.
 	Build_QUEUED Build_Status = 1
-	// Build is being executed.
+	// Build or step is being executed.
 	Build_WORKING Build_Status = 2
-	// Build finished successfully.
+	// Build or step finished successfully.
 	Build_SUCCESS Build_Status = 3
-	// Build failed to complete successfully.
+	// Build or step failed to complete successfully.
 	Build_FAILURE Build_Status = 4
-	// Build failed due to an internal cause.
+	// Build or step failed due to an internal cause.
 	Build_INTERNAL_ERROR Build_Status = 5
-	// Build took longer than was allowed.
+	// Build or step took longer than was allowed.
 	Build_TIMEOUT Build_Status = 6
-	// Build was canceled by a user.
+	// Build or step was canceled by a user.
 	Build_CANCELLED Build_Status = 7
 )
 
@@ -112,7 +76,9 @@ var Build_Status_value = map[string]int32{
 func (x Build_Status) String() string {
 	return proto.EnumName(Build_Status_name, int32(x))
 }
-func (Build_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
+func (Build_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{10, 0}
+}
 
 // Specifies the hash algorithm, if any.
 type Hash_HashType int32
@@ -122,21 +88,27 @@ const (
 	Hash_NONE Hash_HashType = 0
 	// Use a sha256 hash.
 	Hash_SHA256 Hash_HashType = 1
+	// Use a md5 hash.
+	Hash_MD5 Hash_HashType = 2
 )
 
 var Hash_HashType_name = map[int32]string{
 	0: "NONE",
 	1: "SHA256",
+	2: "MD5",
 }
 var Hash_HashType_value = map[string]int32{
 	"NONE":   0,
 	"SHA256": 1,
+	"MD5":    2,
 }
 
 func (x Hash_HashType) String() string {
 	return proto.EnumName(Hash_HashType_name, int32(x))
 }
-func (Hash_HashType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{14, 0} }
+func (Hash_HashType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{16, 0}
+}
 
 // Specifies the manner in which the build should be verified, if at all.
 type BuildOptions_VerifyOption int32
@@ -161,7 +133,7 @@ func (x BuildOptions_VerifyOption) String() string {
 	return proto.EnumName(BuildOptions_VerifyOption_name, int32(x))
 }
 func (BuildOptions_VerifyOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 0}
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{30, 0}
 }
 
 // Supported VM sizes.
@@ -190,7 +162,9 @@ var BuildOptions_MachineType_value = map[string]int32{
 func (x BuildOptions_MachineType) String() string {
 	return proto.EnumName(BuildOptions_MachineType_name, int32(x))
 }
-func (BuildOptions_MachineType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{28, 1} }
+func (BuildOptions_MachineType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{30, 1}
+}
 
 // Specifies the behavior when there is an error in the substitution checks.
 type BuildOptions_SubstitutionOption int32
@@ -216,7 +190,7 @@ func (x BuildOptions_SubstitutionOption) String() string {
 	return proto.EnumName(BuildOptions_SubstitutionOption_name, int32(x))
 }
 func (BuildOptions_SubstitutionOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 2}
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{30, 2}
 }
 
 // Specifies the behavior when writing build logs to Google Cloud Storage.
@@ -247,21 +221,43 @@ func (x BuildOptions_LogStreamingOption) String() string {
 	return proto.EnumName(BuildOptions_LogStreamingOption_name, int32(x))
 }
 func (BuildOptions_LogStreamingOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 3}
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{30, 3}
 }
 
-// RetryBuildRequest specifies a build to retry.
+// Specifies a build to retry.
 type RetryBuildRequest struct {
 	// ID of the project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Build ID of the original build.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id                   string   `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RetryBuildRequest) Reset()                    { *m = RetryBuildRequest{} }
-func (m *RetryBuildRequest) String() string            { return proto.CompactTextString(m) }
-func (*RetryBuildRequest) ProtoMessage()               {}
-func (*RetryBuildRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *RetryBuildRequest) Reset()         { *m = RetryBuildRequest{} }
+func (m *RetryBuildRequest) String() string { return proto.CompactTextString(m) }
+func (*RetryBuildRequest) ProtoMessage()    {}
+func (*RetryBuildRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{0}
+}
+func (m *RetryBuildRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RetryBuildRequest.Unmarshal(m, b)
+}
+func (m *RetryBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RetryBuildRequest.Marshal(b, m, deterministic)
+}
+func (dst *RetryBuildRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryBuildRequest.Merge(dst, src)
+}
+func (m *RetryBuildRequest) XXX_Size() int {
+	return xxx_messageInfo_RetryBuildRequest.Size(m)
+}
+func (m *RetryBuildRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RetryBuildRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RetryBuildRequest proto.InternalMessageInfo
 
 func (m *RetryBuildRequest) GetProjectId() string {
 	if m != nil {
@@ -277,21 +273,42 @@ func (m *RetryBuildRequest) GetId() string {
 	return ""
 }
 
-// RunBuildTriggerRequest specifies a build trigger to run and the source to
-// use.
+// Specifies a build trigger to run and the source to use.
 type RunBuildTriggerRequest struct {
 	// ID of the project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// ID of the trigger.
-	TriggerId string `protobuf:"bytes,2,opt,name=trigger_id,json=triggerId" json:"trigger_id,omitempty"`
+	TriggerId string `protobuf:"bytes,2,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"`
 	// Source to build against this trigger.
-	Source *RepoSource `protobuf:"bytes,3,opt,name=source" json:"source,omitempty"`
+	Source               *RepoSource `protobuf:"bytes,3,opt,name=source,proto3" json:"source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *RunBuildTriggerRequest) Reset()                    { *m = RunBuildTriggerRequest{} }
-func (m *RunBuildTriggerRequest) String() string            { return proto.CompactTextString(m) }
-func (*RunBuildTriggerRequest) ProtoMessage()               {}
-func (*RunBuildTriggerRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *RunBuildTriggerRequest) Reset()         { *m = RunBuildTriggerRequest{} }
+func (m *RunBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*RunBuildTriggerRequest) ProtoMessage()    {}
+func (*RunBuildTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{1}
+}
+func (m *RunBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunBuildTriggerRequest.Unmarshal(m, b)
+}
+func (m *RunBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunBuildTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *RunBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunBuildTriggerRequest.Merge(dst, src)
+}
+func (m *RunBuildTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_RunBuildTriggerRequest.Size(m)
+}
+func (m *RunBuildTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunBuildTriggerRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RunBuildTriggerRequest proto.InternalMessageInfo
 
 func (m *RunBuildTriggerRequest) GetProjectId() string {
 	if m != nil {
@@ -314,27 +331,48 @@ func (m *RunBuildTriggerRequest) GetSource() *RepoSource {
 	return nil
 }
 
-// StorageSource describes the location of the source in an archive file in
-// Google Cloud Storage.
+// Location of the source in an archive file in Google Cloud Storage.
 type StorageSource struct {
-	// Google Cloud Storage bucket containing source (see
+	// Google Cloud Storage bucket containing the source (see
 	// [Bucket Name
 	// Requirements](https://cloud.google.com/storage/docs/bucket-naming#requirements)).
-	Bucket string `protobuf:"bytes,1,opt,name=bucket" json:"bucket,omitempty"`
-	// Google Cloud Storage object containing source.
+	Bucket string `protobuf:"bytes,1,opt,name=bucket,proto3" json:"bucket,omitempty"`
+	// Google Cloud Storage object containing the source.
 	//
-	// This object must be a gzipped archive file (.tar.gz) containing source to
+	// This object must be a gzipped archive file (`.tar.gz`) containing source to
 	// build.
-	Object string `protobuf:"bytes,2,opt,name=object" json:"object,omitempty"`
+	Object string `protobuf:"bytes,2,opt,name=object,proto3" json:"object,omitempty"`
 	// Google Cloud Storage generation for the object. If the generation is
 	// omitted, the latest generation will be used.
-	Generation int64 `protobuf:"varint,3,opt,name=generation" json:"generation,omitempty"`
+	Generation           int64    `protobuf:"varint,3,opt,name=generation,proto3" json:"generation,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StorageSource) Reset()         { *m = StorageSource{} }
+func (m *StorageSource) String() string { return proto.CompactTextString(m) }
+func (*StorageSource) ProtoMessage()    {}
+func (*StorageSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{2}
+}
+func (m *StorageSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StorageSource.Unmarshal(m, b)
+}
+func (m *StorageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StorageSource.Marshal(b, m, deterministic)
+}
+func (dst *StorageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StorageSource.Merge(dst, src)
+}
+func (m *StorageSource) XXX_Size() int {
+	return xxx_messageInfo_StorageSource.Size(m)
+}
+func (m *StorageSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_StorageSource.DiscardUnknown(m)
 }
 
-func (m *StorageSource) Reset()                    { *m = StorageSource{} }
-func (m *StorageSource) String() string            { return proto.CompactTextString(m) }
-func (*StorageSource) ProtoMessage()               {}
-func (*StorageSource) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_StorageSource proto.InternalMessageInfo
 
 func (m *StorageSource) GetBucket() string {
 	if m != nil {
@@ -357,15 +395,15 @@ func (m *StorageSource) GetGeneration() int64 {
 	return 0
 }
 
-// RepoSource describes the location of the source in a Google Cloud Source
-// Repository.
+// Location of the source in a Google Cloud Source Repository.
 type RepoSource struct {
-	// ID of the project that owns the repo. If omitted, the project ID requesting
-	// the build is assumed.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// Name of the repo. If omitted, the name "default" is assumed.
-	RepoName string `protobuf:"bytes,2,opt,name=repo_name,json=repoName" json:"repo_name,omitempty"`
-	// A revision within the source repository must be specified in
+	// ID of the project that owns the Cloud Source Repository. If omitted, the
+	// project ID requesting the build is assumed.
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// Name of the Cloud Source Repository. If omitted, the name "default" is
+	// assumed.
+	RepoName string `protobuf:"bytes,2,opt,name=repo_name,json=repoName,proto3" json:"repo_name,omitempty"`
+	// A revision within the Cloud Source Repository must be specified in
 	// one of these ways.
 	//
 	// Types that are valid to be assigned to Revision:
@@ -374,31 +412,74 @@ type RepoSource struct {
 	//	*RepoSource_CommitSha
 	Revision isRepoSource_Revision `protobuf_oneof:"revision"`
 	// Directory, relative to the source root, in which to run the build.
-	Dir string `protobuf:"bytes,7,opt,name=dir" json:"dir,omitempty"`
+	//
+	// This must be a relative path. If a step's `dir` is specified and is an
+	// absolute path, this value is ignored for that step's execution.
+	Dir                  string   `protobuf:"bytes,7,opt,name=dir,proto3" json:"dir,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RepoSource) Reset()                    { *m = RepoSource{} }
-func (m *RepoSource) String() string            { return proto.CompactTextString(m) }
-func (*RepoSource) ProtoMessage()               {}
-func (*RepoSource) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *RepoSource) Reset()         { *m = RepoSource{} }
+func (m *RepoSource) String() string { return proto.CompactTextString(m) }
+func (*RepoSource) ProtoMessage()    {}
+func (*RepoSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{3}
+}
+func (m *RepoSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RepoSource.Unmarshal(m, b)
+}
+func (m *RepoSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RepoSource.Marshal(b, m, deterministic)
+}
+func (dst *RepoSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoSource.Merge(dst, src)
+}
+func (m *RepoSource) XXX_Size() int {
+	return xxx_messageInfo_RepoSource.Size(m)
+}
+func (m *RepoSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_RepoSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RepoSource proto.InternalMessageInfo
+
+func (m *RepoSource) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+func (m *RepoSource) GetRepoName() string {
+	if m != nil {
+		return m.RepoName
+	}
+	return ""
+}
 
 type isRepoSource_Revision interface {
 	isRepoSource_Revision()
 }
 
 type RepoSource_BranchName struct {
-	BranchName string `protobuf:"bytes,3,opt,name=branch_name,json=branchName,oneof"`
+	BranchName string `protobuf:"bytes,3,opt,name=branch_name,json=branchName,proto3,oneof"`
 }
+
 type RepoSource_TagName struct {
-	TagName string `protobuf:"bytes,4,opt,name=tag_name,json=tagName,oneof"`
+	TagName string `protobuf:"bytes,4,opt,name=tag_name,json=tagName,proto3,oneof"`
 }
+
 type RepoSource_CommitSha struct {
-	CommitSha string `protobuf:"bytes,5,opt,name=commit_sha,json=commitSha,oneof"`
+	CommitSha string `protobuf:"bytes,5,opt,name=commit_sha,json=commitSha,proto3,oneof"`
 }
 
 func (*RepoSource_BranchName) isRepoSource_Revision() {}
-func (*RepoSource_TagName) isRepoSource_Revision()    {}
-func (*RepoSource_CommitSha) isRepoSource_Revision()  {}
+
+func (*RepoSource_TagName) isRepoSource_Revision() {}
+
+func (*RepoSource_CommitSha) isRepoSource_Revision() {}
 
 func (m *RepoSource) GetRevision() isRepoSource_Revision {
 	if m != nil {
@@ -407,20 +488,6 @@ func (m *RepoSource) GetRevision() isRepoSource_Revision {
 	return nil
 }
 
-func (m *RepoSource) GetProjectId() string {
-	if m != nil {
-		return m.ProjectId
-	}
-	return ""
-}
-
-func (m *RepoSource) GetRepoName() string {
-	if m != nil {
-		return m.RepoName
-	}
-	return ""
-}
-
 func (m *RepoSource) GetBranchName() string {
 	if x, ok := m.GetRevision().(*RepoSource_BranchName); ok {
 		return x.BranchName
@@ -512,15 +579,15 @@ func _RepoSource_OneofSizer(msg proto.Message) (n int) {
 	// revision
 	switch x := m.Revision.(type) {
 	case *RepoSource_BranchName:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.BranchName)))
 		n += len(x.BranchName)
 	case *RepoSource_TagName:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.TagName)))
 		n += len(x.TagName)
 	case *RepoSource_CommitSha:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.CommitSha)))
 		n += len(x.CommitSha)
 	case nil:
@@ -530,35 +597,58 @@ func _RepoSource_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-// Source describes the location of the source in a supported storage
-// service.
+// Location of the source in a supported storage service.
 type Source struct {
-	// Describes location of source.
+	// Location of source.
 	//
 	// Types that are valid to be assigned to Source:
 	//	*Source_StorageSource
 	//	*Source_RepoSource
-	Source isSource_Source `protobuf_oneof:"source"`
+	Source               isSource_Source `protobuf_oneof:"source"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Source) Reset()         { *m = Source{} }
+func (m *Source) String() string { return proto.CompactTextString(m) }
+func (*Source) ProtoMessage()    {}
+func (*Source) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{4}
+}
+func (m *Source) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Source.Unmarshal(m, b)
+}
+func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
+}
+func (dst *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(dst, src)
+}
+func (m *Source) XXX_Size() int {
+	return xxx_messageInfo_Source.Size(m)
+}
+func (m *Source) XXX_DiscardUnknown() {
+	xxx_messageInfo_Source.DiscardUnknown(m)
 }
 
-func (m *Source) Reset()                    { *m = Source{} }
-func (m *Source) String() string            { return proto.CompactTextString(m) }
-func (*Source) ProtoMessage()               {}
-func (*Source) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_Source proto.InternalMessageInfo
 
 type isSource_Source interface {
 	isSource_Source()
 }
 
 type Source_StorageSource struct {
-	StorageSource *StorageSource `protobuf:"bytes,2,opt,name=storage_source,json=storageSource,oneof"`
+	StorageSource *StorageSource `protobuf:"bytes,2,opt,name=storage_source,json=storageSource,proto3,oneof"`
 }
+
 type Source_RepoSource struct {
-	RepoSource *RepoSource `protobuf:"bytes,3,opt,name=repo_source,json=repoSource,oneof"`
+	RepoSource *RepoSource `protobuf:"bytes,3,opt,name=repo_source,json=repoSource,proto3,oneof"`
 }
 
 func (*Source_StorageSource) isSource_Source() {}
-func (*Source_RepoSource) isSource_Source()    {}
+
+func (*Source_RepoSource) isSource_Source() {}
 
 func (m *Source) GetSource() isSource_Source {
 	if m != nil {
@@ -640,12 +730,12 @@ func _Source_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Source.(type) {
 	case *Source_StorageSource:
 		s := proto.Size(x.StorageSource)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Source_RepoSource:
 		s := proto.Size(x.RepoSource)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -655,21 +745,43 @@ func _Source_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-// BuiltImage describes an image built by the pipeline.
+// An image built by the pipeline.
 type BuiltImage struct {
 	// Name used to push the container image to Google Container Registry, as
 	// presented to `docker push`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Docker Registry 2.0 digest.
-	Digest string `protobuf:"bytes,3,opt,name=digest" json:"digest,omitempty"`
-	// Stores timing information for pushing the specified image.
-	PushTiming *TimeSpan `protobuf:"bytes,4,opt,name=push_timing,json=pushTiming" json:"push_timing,omitempty"`
+	Digest string `protobuf:"bytes,3,opt,name=digest,proto3" json:"digest,omitempty"`
+	// Output only. Stores timing information for pushing the specified image.
+	PushTiming           *TimeSpan `protobuf:"bytes,4,opt,name=push_timing,json=pushTiming,proto3" json:"push_timing,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *BuiltImage) Reset()                    { *m = BuiltImage{} }
-func (m *BuiltImage) String() string            { return proto.CompactTextString(m) }
-func (*BuiltImage) ProtoMessage()               {}
-func (*BuiltImage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *BuiltImage) Reset()         { *m = BuiltImage{} }
+func (m *BuiltImage) String() string { return proto.CompactTextString(m) }
+func (*BuiltImage) ProtoMessage()    {}
+func (*BuiltImage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{5}
+}
+func (m *BuiltImage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuiltImage.Unmarshal(m, b)
+}
+func (m *BuiltImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuiltImage.Marshal(b, m, deterministic)
+}
+func (dst *BuiltImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuiltImage.Merge(dst, src)
+}
+func (m *BuiltImage) XXX_Size() int {
+	return xxx_messageInfo_BuiltImage.Size(m)
+}
+func (m *BuiltImage) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuiltImage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuiltImage proto.InternalMessageInfo
 
 func (m *BuiltImage) GetName() string {
 	if m != nil {
@@ -692,11 +804,12 @@ func (m *BuiltImage) GetPushTiming() *TimeSpan {
 	return nil
 }
 
-// BuildStep describes a step to perform in the build pipeline.
+// A step in the build pipeline.
 type BuildStep struct {
-	// The name of the container image that will run this particular build step.
+	// Required. The name of the container image that will run this particular
+	// build step.
 	//
-	// If the image is already available in the host's Docker daemon's cache, it
+	// If the image is available in the host's Docker daemon's cache, it
 	// will be run directly. If not, the host will attempt to pull the image
 	// first, using the builder service account's credentials if necessary.
 	//
@@ -710,37 +823,46 @@ type BuildStep struct {
 	// If you built an image in a previous build step, it will be stored in the
 	// host's Docker daemon's cache and is available to use as the name for a
 	// later build step.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A list of environment variable definitions to be used when running a step.
 	//
 	// The elements are of the form "KEY=VALUE" for the environment variable "KEY"
 	// being given the value "VALUE".
-	Env []string `protobuf:"bytes,2,rep,name=env" json:"env,omitempty"`
+	Env []string `protobuf:"bytes,2,rep,name=env,proto3" json:"env,omitempty"`
 	// A list of arguments that will be presented to the step when it is started.
 	//
-	// If the image used to run the step's container has an entrypoint, these args
-	// will be used as arguments to that entrypoint. If the image does not define
-	// an entrypoint, the first element in args will be used as the entrypoint,
+	// If the image used to run the step's container has an entrypoint, the `args`
+	// are used as arguments to that entrypoint. If the image does not define
+	// an entrypoint, the first element in args is used as the entrypoint,
 	// and the remainder will be used as arguments.
-	Args []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
-	// Working directory (relative to project source root) to use when running
-	// this operation's container.
-	Dir string `protobuf:"bytes,4,opt,name=dir" json:"dir,omitempty"`
-	// Optional unique identifier for this build step, used in wait_for to
+	Args []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
+	// Working directory to use when running this step's container.
+	//
+	// If this value is a relative path, it is relative to the build's working
+	// directory. If this value is absolute, it may be outside the build's working
+	// directory, in which case the contents of the path may not be persisted
+	// across build step executions, unless a `volume` for that path is specified.
+	//
+	// If the build specifies a `RepoSource` with `dir` and a step with a `dir`,
+	// which specifies an absolute path, the `RepoSource` `dir` is ignored for
+	// the step's execution.
+	Dir string `protobuf:"bytes,4,opt,name=dir,proto3" json:"dir,omitempty"`
+	// Unique identifier for this build step, used in `wait_for` to
 	// reference this build step as a dependency.
-	Id string `protobuf:"bytes,5,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,5,opt,name=id,proto3" json:"id,omitempty"`
 	// The ID(s) of the step(s) that this build step depends on.
-	// This build step will not start until all the build steps in wait_for
-	// have completed successfully. If wait_for is empty, this build step will
-	// start when all previous build steps in the Build.Steps list have completed
-	// successfully.
-	WaitFor []string `protobuf:"bytes,6,rep,name=wait_for,json=waitFor" json:"wait_for,omitempty"`
-	// Optional entrypoint to be used instead of the build step image's default
-	// If unset, the image's default will be used.
-	Entrypoint string `protobuf:"bytes,7,opt,name=entrypoint" json:"entrypoint,omitempty"`
-	// A list of environment variables which are encrypted using a Cloud KMS
-	// crypto key. These values must be specified in the build's secrets.
-	SecretEnv []string `protobuf:"bytes,8,rep,name=secret_env,json=secretEnv" json:"secret_env,omitempty"`
+	// This build step will not start until all the build steps in `wait_for`
+	// have completed successfully. If `wait_for` is empty, this build step will
+	// start when all previous build steps in the `Build.Steps` list have
+	// completed successfully.
+	WaitFor []string `protobuf:"bytes,6,rep,name=wait_for,json=waitFor,proto3" json:"wait_for,omitempty"`
+	// Entrypoint to be used instead of the build step image's default entrypoint.
+	// If unset, the image's default entrypoint is used.
+	Entrypoint string `protobuf:"bytes,7,opt,name=entrypoint,proto3" json:"entrypoint,omitempty"`
+	// A list of environment variables which are encrypted using a Cloud Key
+	// Management Service crypto key. These values must be specified in the
+	// build's `Secret`.
+	SecretEnv []string `protobuf:"bytes,8,rep,name=secret_env,json=secretEnv,proto3" json:"secret_env,omitempty"`
 	// List of volumes to mount into the build step.
 	//
 	// Each volume will be created as an empty volume prior to execution of the
@@ -749,15 +871,45 @@ type BuildStep struct {
 	//
 	// Using a named volume in only one step is not valid as it is indicative
 	// of a mis-configured build request.
-	Volumes []*Volume `protobuf:"bytes,9,rep,name=volumes" json:"volumes,omitempty"`
-	// Stores timing information for executing this build step.
-	Timing *TimeSpan `protobuf:"bytes,10,opt,name=timing" json:"timing,omitempty"`
+	Volumes []*Volume `protobuf:"bytes,9,rep,name=volumes,proto3" json:"volumes,omitempty"`
+	// Output only. Stores timing information for executing this build step.
+	Timing *TimeSpan `protobuf:"bytes,10,opt,name=timing,proto3" json:"timing,omitempty"`
+	// Time limit for executing this build step. If not defined, the step has no
+	// time limit and will be allowed to continue to run until either it completes
+	// or the build itself times out.
+	Timeout *duration.Duration `protobuf:"bytes,11,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	// Output only. Status of the build step. At this time, build step status is
+	// only updated on build completion; step status is not updated in real-time
+	// as the build progresses.
+	Status               Build_Status `protobuf:"varint,12,opt,name=status,proto3,enum=google.devtools.cloudbuild.v1.Build_Status" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *BuildStep) Reset()         { *m = BuildStep{} }
+func (m *BuildStep) String() string { return proto.CompactTextString(m) }
+func (*BuildStep) ProtoMessage()    {}
+func (*BuildStep) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{6}
+}
+func (m *BuildStep) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildStep.Unmarshal(m, b)
+}
+func (m *BuildStep) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildStep.Marshal(b, m, deterministic)
+}
+func (dst *BuildStep) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildStep.Merge(dst, src)
+}
+func (m *BuildStep) XXX_Size() int {
+	return xxx_messageInfo_BuildStep.Size(m)
+}
+func (m *BuildStep) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildStep.DiscardUnknown(m)
 }
 
-func (m *BuildStep) Reset()                    { *m = BuildStep{} }
-func (m *BuildStep) String() string            { return proto.CompactTextString(m) }
-func (*BuildStep) ProtoMessage()               {}
-func (*BuildStep) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_BuildStep proto.InternalMessageInfo
 
 func (m *BuildStep) GetName() string {
 	if m != nil {
@@ -829,6 +981,20 @@ func (m *BuildStep) GetTiming() *TimeSpan {
 	return nil
 }
 
+func (m *BuildStep) GetTimeout() *duration.Duration {
+	if m != nil {
+		return m.Timeout
+	}
+	return nil
+}
+
+func (m *BuildStep) GetStatus() Build_Status {
+	if m != nil {
+		return m.Status
+	}
+	return Build_STATUS_UNKNOWN
+}
+
 // Volume describes a Docker container volume which is mounted into build steps
 // in order to persist files across build step execution.
 type Volume struct {
@@ -836,18 +1002,40 @@ type Volume struct {
 	//
 	// Volume names must be unique per build step and must be valid names for
 	// Docker volumes. Each named volume must be used by at least two build steps.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Path at which to mount the volume.
 	//
 	// Paths must be absolute and cannot conflict with other volume paths on the
 	// same build step or with certain reserved volume paths.
-	Path string `protobuf:"bytes,2,opt,name=path" json:"path,omitempty"`
+	Path                 string   `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Volume) Reset()                    { *m = Volume{} }
-func (m *Volume) String() string            { return proto.CompactTextString(m) }
-func (*Volume) ProtoMessage()               {}
-func (*Volume) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *Volume) Reset()         { *m = Volume{} }
+func (m *Volume) String() string { return proto.CompactTextString(m) }
+func (*Volume) ProtoMessage()    {}
+func (*Volume) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{7}
+}
+func (m *Volume) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Volume.Unmarshal(m, b)
+}
+func (m *Volume) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Volume.Marshal(b, m, deterministic)
+}
+func (dst *Volume) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Volume.Merge(dst, src)
+}
+func (m *Volume) XXX_Size() int {
+	return xxx_messageInfo_Volume.Size(m)
+}
+func (m *Volume) XXX_DiscardUnknown() {
+	xxx_messageInfo_Volume.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Volume proto.InternalMessageInfo
 
 func (m *Volume) GetName() string {
 	if m != nil {
@@ -863,18 +1051,45 @@ func (m *Volume) GetPath() string {
 	return ""
 }
 
-// Results describes the artifacts created by the build pipeline.
+// Artifacts created by the build pipeline.
 type Results struct {
-	// Images that were built as a part of the build.
-	Images []*BuiltImage `protobuf:"bytes,2,rep,name=images" json:"images,omitempty"`
-	// List of build step digests, in order corresponding to build step indices.
-	BuildStepImages []string `protobuf:"bytes,3,rep,name=build_step_images,json=buildStepImages" json:"build_step_images,omitempty"`
+	// Container images that were built as a part of the build.
+	Images []*BuiltImage `protobuf:"bytes,2,rep,name=images,proto3" json:"images,omitempty"`
+	// List of build step digests, in the order corresponding to build step
+	// indices.
+	BuildStepImages []string `protobuf:"bytes,3,rep,name=build_step_images,json=buildStepImages,proto3" json:"build_step_images,omitempty"`
+	// Path to the artifact manifest. Only populated when artifacts are uploaded.
+	ArtifactManifest string `protobuf:"bytes,4,opt,name=artifact_manifest,json=artifactManifest,proto3" json:"artifact_manifest,omitempty"`
+	// Number of artifacts uploaded. Only populated when artifacts are uploaded.
+	NumArtifacts         int64    `protobuf:"varint,5,opt,name=num_artifacts,json=numArtifacts,proto3" json:"num_artifacts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Results) Reset()                    { *m = Results{} }
-func (m *Results) String() string            { return proto.CompactTextString(m) }
-func (*Results) ProtoMessage()               {}
-func (*Results) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *Results) Reset()         { *m = Results{} }
+func (m *Results) String() string { return proto.CompactTextString(m) }
+func (*Results) ProtoMessage()    {}
+func (*Results) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{8}
+}
+func (m *Results) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Results.Unmarshal(m, b)
+}
+func (m *Results) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Results.Marshal(b, m, deterministic)
+}
+func (dst *Results) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Results.Merge(dst, src)
+}
+func (m *Results) XXX_Size() int {
+	return xxx_messageInfo_Results.Size(m)
+}
+func (m *Results) XXX_DiscardUnknown() {
+	xxx_messageInfo_Results.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Results proto.InternalMessageInfo
 
 func (m *Results) GetImages() []*BuiltImage {
 	if m != nil {
@@ -890,13 +1105,79 @@ func (m *Results) GetBuildStepImages() []string {
 	return nil
 }
 
-// A build resource in the Container Builder API.
+func (m *Results) GetArtifactManifest() string {
+	if m != nil {
+		return m.ArtifactManifest
+	}
+	return ""
+}
+
+func (m *Results) GetNumArtifacts() int64 {
+	if m != nil {
+		return m.NumArtifacts
+	}
+	return 0
+}
+
+// An artifact that was uploaded during a build. This
+// is a single record in the artifact manifest JSON file.
+type ArtifactResult struct {
+	// The path of an artifact in a Google Cloud Storage bucket, with the
+	// generation number. For example,
+	// `gs://mybucket/path/to/output.jar#generation`.
+	Location string `protobuf:"bytes,1,opt,name=location,proto3" json:"location,omitempty"`
+	// The file hash of the artifact.
+	FileHash             []*FileHashes `protobuf:"bytes,2,rep,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ArtifactResult) Reset()         { *m = ArtifactResult{} }
+func (m *ArtifactResult) String() string { return proto.CompactTextString(m) }
+func (*ArtifactResult) ProtoMessage()    {}
+func (*ArtifactResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{9}
+}
+func (m *ArtifactResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ArtifactResult.Unmarshal(m, b)
+}
+func (m *ArtifactResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ArtifactResult.Marshal(b, m, deterministic)
+}
+func (dst *ArtifactResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArtifactResult.Merge(dst, src)
+}
+func (m *ArtifactResult) XXX_Size() int {
+	return xxx_messageInfo_ArtifactResult.Size(m)
+}
+func (m *ArtifactResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_ArtifactResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ArtifactResult proto.InternalMessageInfo
+
+func (m *ArtifactResult) GetLocation() string {
+	if m != nil {
+		return m.Location
+	}
+	return ""
+}
+
+func (m *ArtifactResult) GetFileHash() []*FileHashes {
+	if m != nil {
+		return m.FileHash
+	}
+	return nil
+}
+
+// A build resource in the Cloud Build API.
 //
-// At a high level, a Build describes where to find source code, how to build
-// it (for example, the builder image to run on the source), and what tag to
-// apply to the built image when it is pushed to Google Container Registry.
+// At a high level, a `Build` describes where to find source code, how to build
+// it (for example, the builder image to run on the source), and where to store
+// the built artifacts.
 //
-// Fields can include the following variables which will be expanded when the
+// Fields can include the following variables, which will be expanded when the
 // build is created:
 //
 // - $PROJECT_ID: the project ID of the build.
@@ -908,90 +1189,107 @@ func (m *Results) GetBuildStepImages() []string {
 //   resolved from the specified branch or tag.
 // - $SHORT_SHA: first 7 characters of $REVISION_ID or $COMMIT_SHA.
 type Build struct {
-	// Unique identifier of the build.
-	// @OutputOnly
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
-	// ID of the project.
-	// @OutputOnly.
-	ProjectId string `protobuf:"bytes,16,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// Status of the build.
-	// @OutputOnly
-	Status Build_Status `protobuf:"varint,2,opt,name=status,enum=google.devtools.cloudbuild.v1.Build_Status" json:"status,omitempty"`
-	// Customer-readable message about the current status.
-	// @OutputOnly
-	StatusDetail string `protobuf:"bytes,24,opt,name=status_detail,json=statusDetail" json:"status_detail,omitempty"`
-	// Describes where to find the source files to build.
-	Source *Source `protobuf:"bytes,3,opt,name=source" json:"source,omitempty"`
-	// Describes the operations to be performed on the workspace.
-	Steps []*BuildStep `protobuf:"bytes,11,rep,name=steps" json:"steps,omitempty"`
-	// Results of the build.
-	// @OutputOnly
-	Results *Results `protobuf:"bytes,10,opt,name=results" json:"results,omitempty"`
-	// Time at which the request to create the build was received.
-	// @OutputOnly
-	CreateTime *google_protobuf5.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// Time at which execution of the build was started.
-	// @OutputOnly
-	StartTime *google_protobuf5.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
-	// Time at which execution of the build was finished.
+	// Output only. Unique identifier of the build.
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	// Output only. ID of the project.
+	ProjectId string `protobuf:"bytes,16,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// Output only. Status of the build.
+	Status Build_Status `protobuf:"varint,2,opt,name=status,proto3,enum=google.devtools.cloudbuild.v1.Build_Status" json:"status,omitempty"`
+	// Output only. Customer-readable message about the current status.
+	StatusDetail string `protobuf:"bytes,24,opt,name=status_detail,json=statusDetail,proto3" json:"status_detail,omitempty"`
+	// The location of the source files to build.
+	Source *Source `protobuf:"bytes,3,opt,name=source,proto3" json:"source,omitempty"`
+	// Required. The operations to be performed on the workspace.
+	Steps []*BuildStep `protobuf:"bytes,11,rep,name=steps,proto3" json:"steps,omitempty"`
+	// Output only. Results of the build.
+	Results *Results `protobuf:"bytes,10,opt,name=results,proto3" json:"results,omitempty"`
+	// Output only. Time at which the request to create the build was received.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Output only. Time at which execution of the build was started.
+	StartTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// Output only. Time at which execution of the build was finished.
 	//
 	// The difference between finish_time and start_time is the duration of the
 	// build's execution.
-	// @OutputOnly
-	FinishTime *google_protobuf5.Timestamp `protobuf:"bytes,8,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
 	// Amount of time that this build should be allowed to run, to second
 	// granularity. If this amount of time elapses, work on the build will cease
-	// and the build status will be TIMEOUT.
+	// and the build status will be `TIMEOUT`.
 	//
 	// Default time is ten minutes.
-	Timeout *google_protobuf4.Duration `protobuf:"bytes,12,opt,name=timeout" json:"timeout,omitempty"`
+	Timeout *duration.Duration `protobuf:"bytes,12,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// A list of images to be pushed upon the successful completion of all build
 	// steps.
 	//
-	// The images will be pushed using the builder service account's credentials.
+	// The images are pushed using the builder service account's credentials.
 	//
-	// The digests of the pushed images will be stored in the Build resource's
+	// The digests of the pushed images will be stored in the `Build` resource's
 	// results field.
 	//
-	// If any of the images fail to be pushed, the build is marked FAILURE.
-	Images []string `protobuf:"bytes,13,rep,name=images" json:"images,omitempty"`
+	// If any of the images fail to be pushed, the build status is marked
+	// `FAILURE`.
+	Images []string `protobuf:"bytes,13,rep,name=images,proto3" json:"images,omitempty"`
+	// Artifacts produced by the build that should be uploaded upon
+	// successful completion of all build steps.
+	Artifacts *Artifacts `protobuf:"bytes,37,opt,name=artifacts,proto3" json:"artifacts,omitempty"`
 	// Google Cloud Storage bucket where logs should be written (see
 	// [Bucket Name
 	// Requirements](https://cloud.google.com/storage/docs/bucket-naming#requirements)).
 	// Logs file names will be of the format `${logs_bucket}/log-${build_id}.txt`.
-	LogsBucket string `protobuf:"bytes,19,opt,name=logs_bucket,json=logsBucket" json:"logs_bucket,omitempty"`
-	// A permanent fixed identifier for source.
-	// @OutputOnly
-	SourceProvenance *SourceProvenance `protobuf:"bytes,21,opt,name=source_provenance,json=sourceProvenance" json:"source_provenance,omitempty"`
-	// The ID of the BuildTrigger that triggered this build, if it was
-	// triggered automatically.
-	// @OutputOnly
-	BuildTriggerId string `protobuf:"bytes,22,opt,name=build_trigger_id,json=buildTriggerId" json:"build_trigger_id,omitempty"`
+	LogsBucket string `protobuf:"bytes,19,opt,name=logs_bucket,json=logsBucket,proto3" json:"logs_bucket,omitempty"`
+	// Output only. A permanent fixed identifier for source.
+	SourceProvenance *SourceProvenance `protobuf:"bytes,21,opt,name=source_provenance,json=sourceProvenance,proto3" json:"source_provenance,omitempty"`
+	// Output only. The ID of the `BuildTrigger` that triggered this build, if it
+	// was triggered automatically.
+	BuildTriggerId string `protobuf:"bytes,22,opt,name=build_trigger_id,json=buildTriggerId,proto3" json:"build_trigger_id,omitempty"`
 	// Special options for this build.
-	Options *BuildOptions `protobuf:"bytes,23,opt,name=options" json:"options,omitempty"`
-	// URL to logs for this build in Google Cloud Logging.
-	// @OutputOnly
-	LogUrl string `protobuf:"bytes,25,opt,name=log_url,json=logUrl" json:"log_url,omitempty"`
-	// Substitutions data for Build resource.
-	Substitutions map[string]string `protobuf:"bytes,29,rep,name=substitutions" json:"substitutions,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Tags for annotation of a Build. These are not docker tags.
-	Tags []string `protobuf:"bytes,31,rep,name=tags" json:"tags,omitempty"`
-	// Secrets to decrypt using Cloud KMS.
-	Secrets []*Secret `protobuf:"bytes,32,rep,name=secrets" json:"secrets,omitempty"`
-	// Stores timing information for phases of the build.
-	// Valid keys are:
-	// - BUILD: time to execute all build steps
-	// - PUSH: time to push all specified images.
-	// - FETCHSOURCE: time to fetch source.
-	// If the build does not specify source, or does not specify images,
+	Options *BuildOptions `protobuf:"bytes,23,opt,name=options,proto3" json:"options,omitempty"`
+	// Output only. URL to logs for this build in Google Cloud Console.
+	LogUrl string `protobuf:"bytes,25,opt,name=log_url,json=logUrl,proto3" json:"log_url,omitempty"`
+	// Substitutions data for `Build` resource.
+	Substitutions map[string]string `protobuf:"bytes,29,rep,name=substitutions,proto3" json:"substitutions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Tags for annotation of a `Build`. These are not docker tags.
+	Tags []string `protobuf:"bytes,31,rep,name=tags,proto3" json:"tags,omitempty"`
+	// Secrets to decrypt using Cloud Key Management Service.
+	Secrets []*Secret `protobuf:"bytes,32,rep,name=secrets,proto3" json:"secrets,omitempty"`
+	// Output only. Stores timing information for phases of the build. Valid keys
+	// are:
+	//
+	// * BUILD: time to execute all build steps
+	// * PUSH: time to push all specified images.
+	// * FETCHSOURCE: time to fetch source.
+	//
+	// If the build does not specify source or images,
 	// these keys will not be included.
-	Timing map[string]*TimeSpan `protobuf:"bytes,33,rep,name=timing" json:"timing,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Timing               map[string]*TimeSpan `protobuf:"bytes,33,rep,name=timing,proto3" json:"timing,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *Build) Reset()                    { *m = Build{} }
-func (m *Build) String() string            { return proto.CompactTextString(m) }
-func (*Build) ProtoMessage()               {}
-func (*Build) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *Build) Reset()         { *m = Build{} }
+func (m *Build) String() string { return proto.CompactTextString(m) }
+func (*Build) ProtoMessage()    {}
+func (*Build) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{10}
+}
+func (m *Build) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Build.Unmarshal(m, b)
+}
+func (m *Build) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Build.Marshal(b, m, deterministic)
+}
+func (dst *Build) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Build.Merge(dst, src)
+}
+func (m *Build) XXX_Size() int {
+	return xxx_messageInfo_Build.Size(m)
+}
+func (m *Build) XXX_DiscardUnknown() {
+	xxx_messageInfo_Build.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Build proto.InternalMessageInfo
 
 func (m *Build) GetId() string {
 	if m != nil {
@@ -1042,28 +1340,28 @@ func (m *Build) GetResults() *Results {
 	return nil
 }
 
-func (m *Build) GetCreateTime() *google_protobuf5.Timestamp {
+func (m *Build) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Build) GetStartTime() *google_protobuf5.Timestamp {
+func (m *Build) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *Build) GetFinishTime() *google_protobuf5.Timestamp {
+func (m *Build) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
 	return nil
 }
 
-func (m *Build) GetTimeout() *google_protobuf4.Duration {
+func (m *Build) GetTimeout() *duration.Duration {
 	if m != nil {
 		return m.Timeout
 	}
@@ -1077,6 +1375,13 @@ func (m *Build) GetImages() []string {
 	return nil
 }
 
+func (m *Build) GetArtifacts() *Artifacts {
+	if m != nil {
+		return m.Artifacts
+	}
+	return nil
+}
+
 func (m *Build) GetLogsBucket() string {
 	if m != nil {
 		return m.LogsBucket
@@ -1140,27 +1445,181 @@ func (m *Build) GetTiming() map[string]*TimeSpan {
 	return nil
 }
 
-// Stores start and end times for a build execution phase.
+// Artifacts produced by a build that should be uploaded upon
+// successful completion of all build steps.
+type Artifacts struct {
+	// A list of images to be pushed upon the successful completion of all build
+	// steps.
+	//
+	// The images will be pushed using the builder service account's credentials.
+	//
+	// The digests of the pushed images will be stored in the Build resource's
+	// results field.
+	//
+	// If any of the images fail to be pushed, the build is marked FAILURE.
+	Images []string `protobuf:"bytes,1,rep,name=images,proto3" json:"images,omitempty"`
+	// A list of objects to be uploaded to Cloud Storage upon successful
+	// completion of all build steps.
+	//
+	// Files in the workspace matching specified paths globs will be uploaded to
+	// the specified Cloud Storage location using the builder service account's
+	// credentials.
+	//
+	// The location and generation of the uploaded objects will be stored in the
+	// Build resource's results field.
+	//
+	// If any objects fail to be pushed, the build is marked FAILURE.
+	Objects              *Artifacts_ArtifactObjects `protobuf:"bytes,2,opt,name=objects,proto3" json:"objects,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *Artifacts) Reset()         { *m = Artifacts{} }
+func (m *Artifacts) String() string { return proto.CompactTextString(m) }
+func (*Artifacts) ProtoMessage()    {}
+func (*Artifacts) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{11}
+}
+func (m *Artifacts) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Artifacts.Unmarshal(m, b)
+}
+func (m *Artifacts) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Artifacts.Marshal(b, m, deterministic)
+}
+func (dst *Artifacts) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Artifacts.Merge(dst, src)
+}
+func (m *Artifacts) XXX_Size() int {
+	return xxx_messageInfo_Artifacts.Size(m)
+}
+func (m *Artifacts) XXX_DiscardUnknown() {
+	xxx_messageInfo_Artifacts.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Artifacts proto.InternalMessageInfo
+
+func (m *Artifacts) GetImages() []string {
+	if m != nil {
+		return m.Images
+	}
+	return nil
+}
+
+func (m *Artifacts) GetObjects() *Artifacts_ArtifactObjects {
+	if m != nil {
+		return m.Objects
+	}
+	return nil
+}
+
+// Files in the workspace to upload to Cloud Storage upon successful
+// completion of all build steps.
+type Artifacts_ArtifactObjects struct {
+	// Cloud Storage bucket and optional object path, in the form
+	// "gs://bucket/path/to/somewhere/". (see [Bucket Name
+	// Requirements](https://cloud.google.com/storage/docs/bucket-naming#requirements)).
+	//
+	// Files in the workspace matching any path pattern will be uploaded to
+	// Cloud Storage with this location as a prefix.
+	Location string `protobuf:"bytes,1,opt,name=location,proto3" json:"location,omitempty"`
+	// Path globs used to match files in the build's workspace.
+	Paths []string `protobuf:"bytes,2,rep,name=paths,proto3" json:"paths,omitempty"`
+	// Output only. Stores timing information for pushing all artifact objects.
+	Timing               *TimeSpan `protobuf:"bytes,3,opt,name=timing,proto3" json:"timing,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *Artifacts_ArtifactObjects) Reset()         { *m = Artifacts_ArtifactObjects{} }
+func (m *Artifacts_ArtifactObjects) String() string { return proto.CompactTextString(m) }
+func (*Artifacts_ArtifactObjects) ProtoMessage()    {}
+func (*Artifacts_ArtifactObjects) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{11, 0}
+}
+func (m *Artifacts_ArtifactObjects) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Artifacts_ArtifactObjects.Unmarshal(m, b)
+}
+func (m *Artifacts_ArtifactObjects) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Artifacts_ArtifactObjects.Marshal(b, m, deterministic)
+}
+func (dst *Artifacts_ArtifactObjects) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Artifacts_ArtifactObjects.Merge(dst, src)
+}
+func (m *Artifacts_ArtifactObjects) XXX_Size() int {
+	return xxx_messageInfo_Artifacts_ArtifactObjects.Size(m)
+}
+func (m *Artifacts_ArtifactObjects) XXX_DiscardUnknown() {
+	xxx_messageInfo_Artifacts_ArtifactObjects.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Artifacts_ArtifactObjects proto.InternalMessageInfo
+
+func (m *Artifacts_ArtifactObjects) GetLocation() string {
+	if m != nil {
+		return m.Location
+	}
+	return ""
+}
+
+func (m *Artifacts_ArtifactObjects) GetPaths() []string {
+	if m != nil {
+		return m.Paths
+	}
+	return nil
+}
+
+func (m *Artifacts_ArtifactObjects) GetTiming() *TimeSpan {
+	if m != nil {
+		return m.Timing
+	}
+	return nil
+}
+
+// Start and end times for a build execution phase.
 type TimeSpan struct {
 	// Start of time span.
-	StartTime *google_protobuf5.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End of time span.
-	EndTime *google_protobuf5.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *TimeSpan) Reset()                    { *m = TimeSpan{} }
-func (m *TimeSpan) String() string            { return proto.CompactTextString(m) }
-func (*TimeSpan) ProtoMessage()               {}
-func (*TimeSpan) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *TimeSpan) Reset()         { *m = TimeSpan{} }
+func (m *TimeSpan) String() string { return proto.CompactTextString(m) }
+func (*TimeSpan) ProtoMessage()    {}
+func (*TimeSpan) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{12}
+}
+func (m *TimeSpan) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimeSpan.Unmarshal(m, b)
+}
+func (m *TimeSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimeSpan.Marshal(b, m, deterministic)
+}
+func (dst *TimeSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeSpan.Merge(dst, src)
+}
+func (m *TimeSpan) XXX_Size() int {
+	return xxx_messageInfo_TimeSpan.Size(m)
+}
+func (m *TimeSpan) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimeSpan.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TimeSpan proto.InternalMessageInfo
 
-func (m *TimeSpan) GetStartTime() *google_protobuf5.Timestamp {
+func (m *TimeSpan) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *TimeSpan) GetEndTime() *google_protobuf5.Timestamp {
+func (m *TimeSpan) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -1170,13 +1629,35 @@ func (m *TimeSpan) GetEndTime() *google_protobuf5.Timestamp {
 // Metadata for build operations.
 type BuildOperationMetadata struct {
 	// The build that the operation is tracking.
-	Build *Build `protobuf:"bytes,1,opt,name=build" json:"build,omitempty"`
+	Build                *Build   `protobuf:"bytes,1,opt,name=build,proto3" json:"build,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BuildOperationMetadata) Reset()                    { *m = BuildOperationMetadata{} }
-func (m *BuildOperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*BuildOperationMetadata) ProtoMessage()               {}
-func (*BuildOperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *BuildOperationMetadata) Reset()         { *m = BuildOperationMetadata{} }
+func (m *BuildOperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*BuildOperationMetadata) ProtoMessage()    {}
+func (*BuildOperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{13}
+}
+func (m *BuildOperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildOperationMetadata.Unmarshal(m, b)
+}
+func (m *BuildOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildOperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *BuildOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildOperationMetadata.Merge(dst, src)
+}
+func (m *BuildOperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_BuildOperationMetadata.Size(m)
+}
+func (m *BuildOperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildOperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildOperationMetadata proto.InternalMessageInfo
 
 func (m *BuildOperationMetadata) GetBuild() *Build {
 	if m != nil {
@@ -1188,29 +1669,51 @@ func (m *BuildOperationMetadata) GetBuild() *Build {
 // Provenance of the source. Ways to find the original source, or verify that
 // some source was used for this build.
 type SourceProvenance struct {
-	// A copy of the build's source.storage_source, if exists, with any
+	// A copy of the build's `source.storage_source`, if exists, with any
 	// generations resolved.
-	ResolvedStorageSource *StorageSource `protobuf:"bytes,3,opt,name=resolved_storage_source,json=resolvedStorageSource" json:"resolved_storage_source,omitempty"`
-	// A copy of the build's source.repo_source, if exists, with any
+	ResolvedStorageSource *StorageSource `protobuf:"bytes,3,opt,name=resolved_storage_source,json=resolvedStorageSource,proto3" json:"resolved_storage_source,omitempty"`
+	// A copy of the build's `source.repo_source`, if exists, with any
 	// revisions resolved.
-	ResolvedRepoSource *RepoSource `protobuf:"bytes,6,opt,name=resolved_repo_source,json=resolvedRepoSource" json:"resolved_repo_source,omitempty"`
-	// Hash(es) of the build source, which can be used to verify that the original
-	// source integrity was maintained in the build. Note that FileHashes will
-	// only be populated if BuildOptions has requested a SourceProvenanceHash.
+	ResolvedRepoSource *RepoSource `protobuf:"bytes,6,opt,name=resolved_repo_source,json=resolvedRepoSource,proto3" json:"resolved_repo_source,omitempty"`
+	// Output only. Hash(es) of the build source, which can be used to verify that
+	// the originalsource integrity was maintained in the build. Note that
+	// `FileHashes` willonly be populated if `BuildOptions` has requested a
+	// `SourceProvenanceHash`.
 	//
 	// The keys to this map are file paths used as build source and the values
 	// contain the hash values for those files.
 	//
 	// If the build source came in a single package such as a gzipped tarfile
-	// (.tar.gz), the FileHash will be for the single path to that file.
-	// @OutputOnly
-	FileHashes map[string]*FileHashes `protobuf:"bytes,4,rep,name=file_hashes,json=fileHashes" json:"file_hashes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// (`.tar.gz`), the `FileHash` will be for the single path to that file.
+	FileHashes           map[string]*FileHashes `protobuf:"bytes,4,rep,name=file_hashes,json=fileHashes,proto3" json:"file_hashes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *SourceProvenance) Reset()         { *m = SourceProvenance{} }
+func (m *SourceProvenance) String() string { return proto.CompactTextString(m) }
+func (*SourceProvenance) ProtoMessage()    {}
+func (*SourceProvenance) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{14}
+}
+func (m *SourceProvenance) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceProvenance.Unmarshal(m, b)
+}
+func (m *SourceProvenance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceProvenance.Marshal(b, m, deterministic)
+}
+func (dst *SourceProvenance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceProvenance.Merge(dst, src)
+}
+func (m *SourceProvenance) XXX_Size() int {
+	return xxx_messageInfo_SourceProvenance.Size(m)
+}
+func (m *SourceProvenance) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceProvenance.DiscardUnknown(m)
 }
 
-func (m *SourceProvenance) Reset()                    { *m = SourceProvenance{} }
-func (m *SourceProvenance) String() string            { return proto.CompactTextString(m) }
-func (*SourceProvenance) ProtoMessage()               {}
-func (*SourceProvenance) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_SourceProvenance proto.InternalMessageInfo
 
 func (m *SourceProvenance) GetResolvedStorageSource() *StorageSource {
 	if m != nil {
@@ -1237,13 +1740,35 @@ func (m *SourceProvenance) GetFileHashes() map[string]*FileHashes {
 // SourceProvenance messages to verify integrity of source input to the build.
 type FileHashes struct {
 	// Collection of file hashes.
-	FileHash []*Hash `protobuf:"bytes,1,rep,name=file_hash,json=fileHash" json:"file_hash,omitempty"`
+	FileHash             []*Hash  `protobuf:"bytes,1,rep,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FileHashes) Reset()                    { *m = FileHashes{} }
-func (m *FileHashes) String() string            { return proto.CompactTextString(m) }
-func (*FileHashes) ProtoMessage()               {}
-func (*FileHashes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *FileHashes) Reset()         { *m = FileHashes{} }
+func (m *FileHashes) String() string { return proto.CompactTextString(m) }
+func (*FileHashes) ProtoMessage()    {}
+func (*FileHashes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{15}
+}
+func (m *FileHashes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileHashes.Unmarshal(m, b)
+}
+func (m *FileHashes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileHashes.Marshal(b, m, deterministic)
+}
+func (dst *FileHashes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileHashes.Merge(dst, src)
+}
+func (m *FileHashes) XXX_Size() int {
+	return xxx_messageInfo_FileHashes.Size(m)
+}
+func (m *FileHashes) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileHashes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileHashes proto.InternalMessageInfo
 
 func (m *FileHashes) GetFileHash() []*Hash {
 	if m != nil {
@@ -1255,15 +1780,37 @@ func (m *FileHashes) GetFileHash() []*Hash {
 // Container message for hash values.
 type Hash struct {
 	// The type of hash that was performed.
-	Type Hash_HashType `protobuf:"varint,1,opt,name=type,enum=google.devtools.cloudbuild.v1.Hash_HashType" json:"type,omitempty"`
+	Type Hash_HashType `protobuf:"varint,1,opt,name=type,proto3,enum=google.devtools.cloudbuild.v1.Hash_HashType" json:"type,omitempty"`
 	// The hash value.
-	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	Value                []byte   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Hash) Reset()         { *m = Hash{} }
+func (m *Hash) String() string { return proto.CompactTextString(m) }
+func (*Hash) ProtoMessage()    {}
+func (*Hash) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{16}
+}
+func (m *Hash) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Hash.Unmarshal(m, b)
+}
+func (m *Hash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Hash.Marshal(b, m, deterministic)
+}
+func (dst *Hash) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Hash.Merge(dst, src)
+}
+func (m *Hash) XXX_Size() int {
+	return xxx_messageInfo_Hash.Size(m)
+}
+func (m *Hash) XXX_DiscardUnknown() {
+	xxx_messageInfo_Hash.DiscardUnknown(m)
 }
 
-func (m *Hash) Reset()                    { *m = Hash{} }
-func (m *Hash) String() string            { return proto.CompactTextString(m) }
-func (*Hash) ProtoMessage()               {}
-func (*Hash) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_Hash proto.InternalMessageInfo
 
 func (m *Hash) GetType() Hash_HashType {
 	if m != nil {
@@ -1279,24 +1826,46 @@ func (m *Hash) GetValue() []byte {
 	return nil
 }
 
-// Secret pairs a set of secret environment variables containing encrypted
+// Pairs a set of secret environment variables containing encrypted
 // values with the Cloud KMS key to use to decrypt the value.
 type Secret struct {
 	// Cloud KMS key name to use to decrypt these envs.
-	KmsKeyName string `protobuf:"bytes,1,opt,name=kms_key_name,json=kmsKeyName" json:"kms_key_name,omitempty"`
+	KmsKeyName string `protobuf:"bytes,1,opt,name=kms_key_name,json=kmsKeyName,proto3" json:"kms_key_name,omitempty"`
 	// Map of environment variable name to its encrypted value.
 	//
 	// Secret environment variables must be unique across all of a build's
 	// secrets, and must be used by at least one build step. Values can be at most
 	// 1 KB in size. There can be at most ten secret values across all of a
 	// build's secrets.
-	SecretEnv map[string][]byte `protobuf:"bytes,3,rep,name=secret_env,json=secretEnv" json:"secret_env,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	SecretEnv            map[string][]byte `protobuf:"bytes,3,rep,name=secret_env,json=secretEnv,proto3" json:"secret_env,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *Secret) Reset()                    { *m = Secret{} }
-func (m *Secret) String() string            { return proto.CompactTextString(m) }
-func (*Secret) ProtoMessage()               {}
-func (*Secret) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *Secret) Reset()         { *m = Secret{} }
+func (m *Secret) String() string { return proto.CompactTextString(m) }
+func (*Secret) ProtoMessage()    {}
+func (*Secret) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{17}
+}
+func (m *Secret) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Secret.Unmarshal(m, b)
+}
+func (m *Secret) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Secret.Marshal(b, m, deterministic)
+}
+func (dst *Secret) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Secret.Merge(dst, src)
+}
+func (m *Secret) XXX_Size() int {
+	return xxx_messageInfo_Secret.Size(m)
+}
+func (m *Secret) XXX_DiscardUnknown() {
+	xxx_messageInfo_Secret.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Secret proto.InternalMessageInfo
 
 func (m *Secret) GetKmsKeyName() string {
 	if m != nil {
@@ -1315,15 +1884,37 @@ func (m *Secret) GetSecretEnv() map[string][]byte {
 // Request to create a new build.
 type CreateBuildRequest struct {
 	// ID of the project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Build resource to create.
-	Build *Build `protobuf:"bytes,2,opt,name=build" json:"build,omitempty"`
+	Build                *Build   `protobuf:"bytes,2,opt,name=build,proto3" json:"build,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateBuildRequest) Reset()                    { *m = CreateBuildRequest{} }
-func (m *CreateBuildRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateBuildRequest) ProtoMessage()               {}
-func (*CreateBuildRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *CreateBuildRequest) Reset()         { *m = CreateBuildRequest{} }
+func (m *CreateBuildRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateBuildRequest) ProtoMessage()    {}
+func (*CreateBuildRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{18}
+}
+func (m *CreateBuildRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateBuildRequest.Unmarshal(m, b)
+}
+func (m *CreateBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateBuildRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateBuildRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBuildRequest.Merge(dst, src)
+}
+func (m *CreateBuildRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateBuildRequest.Size(m)
+}
+func (m *CreateBuildRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateBuildRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateBuildRequest proto.InternalMessageInfo
 
 func (m *CreateBuildRequest) GetProjectId() string {
 	if m != nil {
@@ -1342,15 +1933,37 @@ func (m *CreateBuildRequest) GetBuild() *Build {
 // Request to get a build.
 type GetBuildRequest struct {
 	// ID of the project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// ID of the build.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id                   string   `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetBuildRequest) Reset()         { *m = GetBuildRequest{} }
+func (m *GetBuildRequest) String() string { return proto.CompactTextString(m) }
+func (*GetBuildRequest) ProtoMessage()    {}
+func (*GetBuildRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{19}
+}
+func (m *GetBuildRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetBuildRequest.Unmarshal(m, b)
+}
+func (m *GetBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetBuildRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetBuildRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBuildRequest.Merge(dst, src)
+}
+func (m *GetBuildRequest) XXX_Size() int {
+	return xxx_messageInfo_GetBuildRequest.Size(m)
+}
+func (m *GetBuildRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetBuildRequest.DiscardUnknown(m)
 }
 
-func (m *GetBuildRequest) Reset()                    { *m = GetBuildRequest{} }
-func (m *GetBuildRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetBuildRequest) ProtoMessage()               {}
-func (*GetBuildRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+var xxx_messageInfo_GetBuildRequest proto.InternalMessageInfo
 
 func (m *GetBuildRequest) GetProjectId() string {
 	if m != nil {
@@ -1369,19 +1982,41 @@ func (m *GetBuildRequest) GetId() string {
 // Request to list builds.
 type ListBuildsRequest struct {
 	// ID of the project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Number of results to return in the list.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Token to provide to skip to a particular spot in the list.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The raw filter text to constrain the results.
-	Filter string `protobuf:"bytes,8,opt,name=filter" json:"filter,omitempty"`
+	Filter               string   `protobuf:"bytes,8,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListBuildsRequest) Reset()         { *m = ListBuildsRequest{} }
+func (m *ListBuildsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListBuildsRequest) ProtoMessage()    {}
+func (*ListBuildsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{20}
+}
+func (m *ListBuildsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBuildsRequest.Unmarshal(m, b)
+}
+func (m *ListBuildsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBuildsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListBuildsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBuildsRequest.Merge(dst, src)
+}
+func (m *ListBuildsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListBuildsRequest.Size(m)
+}
+func (m *ListBuildsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBuildsRequest.DiscardUnknown(m)
 }
 
-func (m *ListBuildsRequest) Reset()                    { *m = ListBuildsRequest{} }
-func (m *ListBuildsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListBuildsRequest) ProtoMessage()               {}
-func (*ListBuildsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_ListBuildsRequest proto.InternalMessageInfo
 
 func (m *ListBuildsRequest) GetProjectId() string {
 	if m != nil {
@@ -1413,16 +2048,38 @@ func (m *ListBuildsRequest) GetFilter() string {
 
 // Response including listed builds.
 type ListBuildsResponse struct {
-	// Builds will be sorted by create_time, descending.
-	Builds []*Build `protobuf:"bytes,1,rep,name=builds" json:"builds,omitempty"`
+	// Builds will be sorted by `create_time`, descending.
+	Builds []*Build `protobuf:"bytes,1,rep,name=builds,proto3" json:"builds,omitempty"`
 	// Token to receive the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListBuildsResponse) Reset()         { *m = ListBuildsResponse{} }
+func (m *ListBuildsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListBuildsResponse) ProtoMessage()    {}
+func (*ListBuildsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{21}
+}
+func (m *ListBuildsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBuildsResponse.Unmarshal(m, b)
+}
+func (m *ListBuildsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBuildsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListBuildsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBuildsResponse.Merge(dst, src)
+}
+func (m *ListBuildsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListBuildsResponse.Size(m)
+}
+func (m *ListBuildsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBuildsResponse.DiscardUnknown(m)
 }
 
-func (m *ListBuildsResponse) Reset()                    { *m = ListBuildsResponse{} }
-func (m *ListBuildsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListBuildsResponse) ProtoMessage()               {}
-func (*ListBuildsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_ListBuildsResponse proto.InternalMessageInfo
 
 func (m *ListBuildsResponse) GetBuilds() []*Build {
 	if m != nil {
@@ -1441,15 +2098,37 @@ func (m *ListBuildsResponse) GetNextPageToken() string {
 // Request to cancel an ongoing build.
 type CancelBuildRequest struct {
 	// ID of the project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// ID of the build.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id                   string   `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CancelBuildRequest) Reset()                    { *m = CancelBuildRequest{} }
-func (m *CancelBuildRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelBuildRequest) ProtoMessage()               {}
-func (*CancelBuildRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *CancelBuildRequest) Reset()         { *m = CancelBuildRequest{} }
+func (m *CancelBuildRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelBuildRequest) ProtoMessage()    {}
+func (*CancelBuildRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{22}
+}
+func (m *CancelBuildRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelBuildRequest.Unmarshal(m, b)
+}
+func (m *CancelBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelBuildRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelBuildRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelBuildRequest.Merge(dst, src)
+}
+func (m *CancelBuildRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelBuildRequest.Size(m)
+}
+func (m *CancelBuildRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelBuildRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CancelBuildRequest proto.InternalMessageInfo
 
 func (m *CancelBuildRequest) GetProjectId() string {
 	if m != nil {
@@ -1468,59 +2147,56 @@ func (m *CancelBuildRequest) GetId() string {
 // Configuration for an automated build in response to source repository
 // changes.
 type BuildTrigger struct {
-	// Unique identifier of the trigger.
-	//
-	// @OutputOnly
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	// Output only. Unique identifier of the trigger.
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// Human-readable description of this trigger.
-	Description string `protobuf:"bytes,10,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,10,opt,name=description,proto3" json:"description,omitempty"`
 	// Template describing the types of source changes to trigger a build.
 	//
 	// Branch and tag names in trigger templates are interpreted as regular
 	// expressions. Any branch or tag change that matches that regular expression
 	// will trigger a build.
-	TriggerTemplate *RepoSource `protobuf:"bytes,7,opt,name=trigger_template,json=triggerTemplate" json:"trigger_template,omitempty"`
+	TriggerTemplate *RepoSource `protobuf:"bytes,7,opt,name=trigger_template,json=triggerTemplate,proto3" json:"trigger_template,omitempty"`
 	// Template describing the Build request to make when the trigger is matched.
 	//
 	// Types that are valid to be assigned to BuildTemplate:
 	//	*BuildTrigger_Build
 	//	*BuildTrigger_Filename
 	BuildTemplate isBuildTrigger_BuildTemplate `protobuf_oneof:"build_template"`
-	// Time when the trigger was created.
-	//
-	// @OutputOnly
-	CreateTime *google_protobuf5.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	// Output only. Time when the trigger was created.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// If true, the trigger will never result in a build.
-	Disabled bool `protobuf:"varint,9,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled bool `protobuf:"varint,9,opt,name=disabled,proto3" json:"disabled,omitempty"`
 	// Substitutions data for Build resource.
-	Substitutions map[string]string `protobuf:"bytes,11,rep,name=substitutions" json:"substitutions,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Substitutions        map[string]string `protobuf:"bytes,11,rep,name=substitutions,proto3" json:"substitutions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *BuildTrigger) Reset()                    { *m = BuildTrigger{} }
-func (m *BuildTrigger) String() string            { return proto.CompactTextString(m) }
-func (*BuildTrigger) ProtoMessage()               {}
-func (*BuildTrigger) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
-
-type isBuildTrigger_BuildTemplate interface {
-	isBuildTrigger_BuildTemplate()
+func (m *BuildTrigger) Reset()         { *m = BuildTrigger{} }
+func (m *BuildTrigger) String() string { return proto.CompactTextString(m) }
+func (*BuildTrigger) ProtoMessage()    {}
+func (*BuildTrigger) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{23}
 }
-
-type BuildTrigger_Build struct {
-	Build *Build `protobuf:"bytes,4,opt,name=build,oneof"`
+func (m *BuildTrigger) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildTrigger.Unmarshal(m, b)
 }
-type BuildTrigger_Filename struct {
-	Filename string `protobuf:"bytes,8,opt,name=filename,oneof"`
+func (m *BuildTrigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildTrigger.Marshal(b, m, deterministic)
 }
-
-func (*BuildTrigger_Build) isBuildTrigger_BuildTemplate()    {}
-func (*BuildTrigger_Filename) isBuildTrigger_BuildTemplate() {}
-
-func (m *BuildTrigger) GetBuildTemplate() isBuildTrigger_BuildTemplate {
-	if m != nil {
-		return m.BuildTemplate
-	}
-	return nil
+func (dst *BuildTrigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildTrigger.Merge(dst, src)
 }
+func (m *BuildTrigger) XXX_Size() int {
+	return xxx_messageInfo_BuildTrigger.Size(m)
+}
+func (m *BuildTrigger) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildTrigger.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildTrigger proto.InternalMessageInfo
 
 func (m *BuildTrigger) GetId() string {
 	if m != nil {
@@ -1543,6 +2219,29 @@ func (m *BuildTrigger) GetTriggerTemplate() *RepoSource {
 	return nil
 }
 
+type isBuildTrigger_BuildTemplate interface {
+	isBuildTrigger_BuildTemplate()
+}
+
+type BuildTrigger_Build struct {
+	Build *Build `protobuf:"bytes,4,opt,name=build,proto3,oneof"`
+}
+
+type BuildTrigger_Filename struct {
+	Filename string `protobuf:"bytes,8,opt,name=filename,proto3,oneof"`
+}
+
+func (*BuildTrigger_Build) isBuildTrigger_BuildTemplate() {}
+
+func (*BuildTrigger_Filename) isBuildTrigger_BuildTemplate() {}
+
+func (m *BuildTrigger) GetBuildTemplate() isBuildTrigger_BuildTemplate {
+	if m != nil {
+		return m.BuildTemplate
+	}
+	return nil
+}
+
 func (m *BuildTrigger) GetBuild() *Build {
 	if x, ok := m.GetBuildTemplate().(*BuildTrigger_Build); ok {
 		return x.Build
@@ -1557,7 +2256,7 @@ func (m *BuildTrigger) GetFilename() string {
 	return ""
 }
 
-func (m *BuildTrigger) GetCreateTime() *google_protobuf5.Timestamp {
+func (m *BuildTrigger) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
@@ -1634,11 +2333,11 @@ func _BuildTrigger_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.BuildTemplate.(type) {
 	case *BuildTrigger_Build:
 		s := proto.Size(x.Build)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BuildTrigger_Filename:
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Filename)))
 		n += len(x.Filename)
 	case nil:
@@ -1648,18 +2347,40 @@ func _BuildTrigger_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
-// Request to create a new BuildTrigger.
+// Request to create a new `BuildTrigger`.
 type CreateBuildTriggerRequest struct {
 	// ID of the project for which to configure automatic builds.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// BuildTrigger to create.
-	Trigger *BuildTrigger `protobuf:"bytes,2,opt,name=trigger" json:"trigger,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// `BuildTrigger` to create.
+	Trigger              *BuildTrigger `protobuf:"bytes,2,opt,name=trigger,proto3" json:"trigger,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *CreateBuildTriggerRequest) Reset()         { *m = CreateBuildTriggerRequest{} }
+func (m *CreateBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateBuildTriggerRequest) ProtoMessage()    {}
+func (*CreateBuildTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{24}
+}
+func (m *CreateBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateBuildTriggerRequest.Unmarshal(m, b)
+}
+func (m *CreateBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateBuildTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBuildTriggerRequest.Merge(dst, src)
+}
+func (m *CreateBuildTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateBuildTriggerRequest.Size(m)
+}
+func (m *CreateBuildTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateBuildTriggerRequest.DiscardUnknown(m)
 }
 
-func (m *CreateBuildTriggerRequest) Reset()                    { *m = CreateBuildTriggerRequest{} }
-func (m *CreateBuildTriggerRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateBuildTriggerRequest) ProtoMessage()               {}
-func (*CreateBuildTriggerRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+var xxx_messageInfo_CreateBuildTriggerRequest proto.InternalMessageInfo
 
 func (m *CreateBuildTriggerRequest) GetProjectId() string {
 	if m != nil {
@@ -1675,18 +2396,40 @@ func (m *CreateBuildTriggerRequest) GetTrigger() *BuildTrigger {
 	return nil
 }
 
-// Returns the BuildTrigger with the specified ID.
+// Returns the `BuildTrigger` with the specified ID.
 type GetBuildTriggerRequest struct {
 	// ID of the project that owns the trigger.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// ID of the BuildTrigger to get.
-	TriggerId string `protobuf:"bytes,2,opt,name=trigger_id,json=triggerId" json:"trigger_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// ID of the `BuildTrigger` to get.
+	TriggerId            string   `protobuf:"bytes,2,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetBuildTriggerRequest) Reset()                    { *m = GetBuildTriggerRequest{} }
-func (m *GetBuildTriggerRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetBuildTriggerRequest) ProtoMessage()               {}
-func (*GetBuildTriggerRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+func (m *GetBuildTriggerRequest) Reset()         { *m = GetBuildTriggerRequest{} }
+func (m *GetBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*GetBuildTriggerRequest) ProtoMessage()    {}
+func (*GetBuildTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{25}
+}
+func (m *GetBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetBuildTriggerRequest.Unmarshal(m, b)
+}
+func (m *GetBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetBuildTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBuildTriggerRequest.Merge(dst, src)
+}
+func (m *GetBuildTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_GetBuildTriggerRequest.Size(m)
+}
+func (m *GetBuildTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetBuildTriggerRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetBuildTriggerRequest proto.InternalMessageInfo
 
 func (m *GetBuildTriggerRequest) GetProjectId() string {
 	if m != nil {
@@ -1702,16 +2445,38 @@ func (m *GetBuildTriggerRequest) GetTriggerId() string {
 	return ""
 }
 
-// Request to list existing BuildTriggers.
+// Request to list existing `BuildTriggers`.
 type ListBuildTriggersRequest struct {
 	// ID of the project for which to list BuildTriggers.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId            string   `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListBuildTriggersRequest) Reset()                    { *m = ListBuildTriggersRequest{} }
-func (m *ListBuildTriggersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListBuildTriggersRequest) ProtoMessage()               {}
-func (*ListBuildTriggersRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
+func (m *ListBuildTriggersRequest) Reset()         { *m = ListBuildTriggersRequest{} }
+func (m *ListBuildTriggersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListBuildTriggersRequest) ProtoMessage()    {}
+func (*ListBuildTriggersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{26}
+}
+func (m *ListBuildTriggersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBuildTriggersRequest.Unmarshal(m, b)
+}
+func (m *ListBuildTriggersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBuildTriggersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListBuildTriggersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBuildTriggersRequest.Merge(dst, src)
+}
+func (m *ListBuildTriggersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListBuildTriggersRequest.Size(m)
+}
+func (m *ListBuildTriggersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBuildTriggersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListBuildTriggersRequest proto.InternalMessageInfo
 
 func (m *ListBuildTriggersRequest) GetProjectId() string {
 	if m != nil {
@@ -1720,16 +2485,38 @@ func (m *ListBuildTriggersRequest) GetProjectId() string {
 	return ""
 }
 
-// Response containing existing BuildTriggers.
+// Response containing existing `BuildTriggers`.
 type ListBuildTriggersResponse struct {
-	// BuildTriggers for the project, sorted by create_time descending.
-	Triggers []*BuildTrigger `protobuf:"bytes,1,rep,name=triggers" json:"triggers,omitempty"`
+	// `BuildTriggers` for the project, sorted by `create_time` descending.
+	Triggers             []*BuildTrigger `protobuf:"bytes,1,rep,name=triggers,proto3" json:"triggers,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *ListBuildTriggersResponse) Reset()         { *m = ListBuildTriggersResponse{} }
+func (m *ListBuildTriggersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListBuildTriggersResponse) ProtoMessage()    {}
+func (*ListBuildTriggersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{27}
+}
+func (m *ListBuildTriggersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBuildTriggersResponse.Unmarshal(m, b)
+}
+func (m *ListBuildTriggersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBuildTriggersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListBuildTriggersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBuildTriggersResponse.Merge(dst, src)
+}
+func (m *ListBuildTriggersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListBuildTriggersResponse.Size(m)
+}
+func (m *ListBuildTriggersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBuildTriggersResponse.DiscardUnknown(m)
 }
 
-func (m *ListBuildTriggersResponse) Reset()                    { *m = ListBuildTriggersResponse{} }
-func (m *ListBuildTriggersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListBuildTriggersResponse) ProtoMessage()               {}
-func (*ListBuildTriggersResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
+var xxx_messageInfo_ListBuildTriggersResponse proto.InternalMessageInfo
 
 func (m *ListBuildTriggersResponse) GetTriggers() []*BuildTrigger {
 	if m != nil {
@@ -1738,18 +2525,40 @@ func (m *ListBuildTriggersResponse) GetTriggers() []*BuildTrigger {
 	return nil
 }
 
-// Request to delete a BuildTrigger.
+// Request to delete a `BuildTrigger`.
 type DeleteBuildTriggerRequest struct {
 	// ID of the project that owns the trigger.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// ID of the BuildTrigger to delete.
-	TriggerId string `protobuf:"bytes,2,opt,name=trigger_id,json=triggerId" json:"trigger_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// ID of the `BuildTrigger` to delete.
+	TriggerId            string   `protobuf:"bytes,2,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteBuildTriggerRequest) Reset()                    { *m = DeleteBuildTriggerRequest{} }
-func (m *DeleteBuildTriggerRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteBuildTriggerRequest) ProtoMessage()               {}
-func (*DeleteBuildTriggerRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
+func (m *DeleteBuildTriggerRequest) Reset()         { *m = DeleteBuildTriggerRequest{} }
+func (m *DeleteBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteBuildTriggerRequest) ProtoMessage()    {}
+func (*DeleteBuildTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{28}
+}
+func (m *DeleteBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteBuildTriggerRequest.Unmarshal(m, b)
+}
+func (m *DeleteBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteBuildTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteBuildTriggerRequest.Merge(dst, src)
+}
+func (m *DeleteBuildTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteBuildTriggerRequest.Size(m)
+}
+func (m *DeleteBuildTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteBuildTriggerRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteBuildTriggerRequest proto.InternalMessageInfo
 
 func (m *DeleteBuildTriggerRequest) GetProjectId() string {
 	if m != nil {
@@ -1765,20 +2574,42 @@ func (m *DeleteBuildTriggerRequest) GetTriggerId() string {
 	return ""
 }
 
-// Request to update an existing BuildTrigger.
+// Request to update an existing `BuildTrigger`.
 type UpdateBuildTriggerRequest struct {
 	// ID of the project that owns the trigger.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// ID of the BuildTrigger to update.
-	TriggerId string `protobuf:"bytes,2,opt,name=trigger_id,json=triggerId" json:"trigger_id,omitempty"`
-	// BuildTrigger to update.
-	Trigger *BuildTrigger `protobuf:"bytes,3,opt,name=trigger" json:"trigger,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// ID of the `BuildTrigger` to update.
+	TriggerId string `protobuf:"bytes,2,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"`
+	// `BuildTrigger` to update.
+	Trigger              *BuildTrigger `protobuf:"bytes,3,opt,name=trigger,proto3" json:"trigger,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *UpdateBuildTriggerRequest) Reset()         { *m = UpdateBuildTriggerRequest{} }
+func (m *UpdateBuildTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateBuildTriggerRequest) ProtoMessage()    {}
+func (*UpdateBuildTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{29}
+}
+func (m *UpdateBuildTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateBuildTriggerRequest.Unmarshal(m, b)
+}
+func (m *UpdateBuildTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateBuildTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateBuildTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateBuildTriggerRequest.Merge(dst, src)
+}
+func (m *UpdateBuildTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateBuildTriggerRequest.Size(m)
+}
+func (m *UpdateBuildTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateBuildTriggerRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateBuildTriggerRequest) Reset()                    { *m = UpdateBuildTriggerRequest{} }
-func (m *UpdateBuildTriggerRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateBuildTriggerRequest) ProtoMessage()               {}
-func (*UpdateBuildTriggerRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
+var xxx_messageInfo_UpdateBuildTriggerRequest proto.InternalMessageInfo
 
 func (m *UpdateBuildTriggerRequest) GetProjectId() string {
 	if m != nil {
@@ -1804,29 +2635,52 @@ func (m *UpdateBuildTriggerRequest) GetTrigger() *BuildTrigger {
 // Optional arguments to enable specific features of builds.
 type BuildOptions struct {
 	// Requested hash for SourceProvenance.
-	SourceProvenanceHash []Hash_HashType `protobuf:"varint,1,rep,packed,name=source_provenance_hash,json=sourceProvenanceHash,enum=google.devtools.cloudbuild.v1.Hash_HashType" json:"source_provenance_hash,omitempty"`
+	SourceProvenanceHash []Hash_HashType `protobuf:"varint,1,rep,packed,name=source_provenance_hash,json=sourceProvenanceHash,proto3,enum=google.devtools.cloudbuild.v1.Hash_HashType" json:"source_provenance_hash,omitempty"`
 	// Requested verifiability options.
-	RequestedVerifyOption BuildOptions_VerifyOption `protobuf:"varint,2,opt,name=requested_verify_option,json=requestedVerifyOption,enum=google.devtools.cloudbuild.v1.BuildOptions_VerifyOption" json:"requested_verify_option,omitempty"`
-	// GCE VM size to run the build on.
-	MachineType BuildOptions_MachineType `protobuf:"varint,3,opt,name=machine_type,json=machineType,enum=google.devtools.cloudbuild.v1.BuildOptions_MachineType" json:"machine_type,omitempty"`
+	RequestedVerifyOption BuildOptions_VerifyOption `protobuf:"varint,2,opt,name=requested_verify_option,json=requestedVerifyOption,proto3,enum=google.devtools.cloudbuild.v1.BuildOptions_VerifyOption" json:"requested_verify_option,omitempty"`
+	// Compute Engine machine type on which to run the build.
+	MachineType BuildOptions_MachineType `protobuf:"varint,3,opt,name=machine_type,json=machineType,proto3,enum=google.devtools.cloudbuild.v1.BuildOptions_MachineType" json:"machine_type,omitempty"`
 	// Requested disk size for the VM that runs the build. Note that this is *NOT*
 	// "disk free"; some of the space will be used by the operating system and
 	// build utilities. Also note that this is the minimum disk size that will be
 	// allocated for the build -- the build may run with a larger disk than
 	// requested. At present, the maximum disk size is 1000GB; builds that request
 	// more than the maximum are rejected with an error.
-	DiskSizeGb int64 `protobuf:"varint,6,opt,name=disk_size_gb,json=diskSizeGb" json:"disk_size_gb,omitempty"`
-	// SubstitutionOption to allow unmatch substitutions.
-	SubstitutionOption BuildOptions_SubstitutionOption `protobuf:"varint,4,opt,name=substitution_option,json=substitutionOption,enum=google.devtools.cloudbuild.v1.BuildOptions_SubstitutionOption" json:"substitution_option,omitempty"`
-	// LogStreamingOption to define build log streaming behavior to Google Cloud
+	DiskSizeGb int64 `protobuf:"varint,6,opt,name=disk_size_gb,json=diskSizeGb,proto3" json:"disk_size_gb,omitempty"`
+	// Option to specify behavior when there is an error in the substitution
+	// checks.
+	SubstitutionOption BuildOptions_SubstitutionOption `protobuf:"varint,4,opt,name=substitution_option,json=substitutionOption,proto3,enum=google.devtools.cloudbuild.v1.BuildOptions_SubstitutionOption" json:"substitution_option,omitempty"`
+	// Option to define build log streaming behavior to Google Cloud
 	// Storage.
-	LogStreamingOption BuildOptions_LogStreamingOption `protobuf:"varint,5,opt,name=log_streaming_option,json=logStreamingOption,enum=google.devtools.cloudbuild.v1.BuildOptions_LogStreamingOption" json:"log_streaming_option,omitempty"`
+	LogStreamingOption   BuildOptions_LogStreamingOption `protobuf:"varint,5,opt,name=log_streaming_option,json=logStreamingOption,proto3,enum=google.devtools.cloudbuild.v1.BuildOptions_LogStreamingOption" json:"log_streaming_option,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
+}
+
+func (m *BuildOptions) Reset()         { *m = BuildOptions{} }
+func (m *BuildOptions) String() string { return proto.CompactTextString(m) }
+func (*BuildOptions) ProtoMessage()    {}
+func (*BuildOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cloudbuild_953822d6e0430e8d, []int{30}
+}
+func (m *BuildOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildOptions.Unmarshal(m, b)
+}
+func (m *BuildOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildOptions.Marshal(b, m, deterministic)
+}
+func (dst *BuildOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildOptions.Merge(dst, src)
+}
+func (m *BuildOptions) XXX_Size() int {
+	return xxx_messageInfo_BuildOptions.Size(m)
+}
+func (m *BuildOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildOptions.DiscardUnknown(m)
 }
 
-func (m *BuildOptions) Reset()                    { *m = BuildOptions{} }
-func (m *BuildOptions) String() string            { return proto.CompactTextString(m) }
-func (*BuildOptions) ProtoMessage()               {}
-func (*BuildOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
+var xxx_messageInfo_BuildOptions proto.InternalMessageInfo
 
 func (m *BuildOptions) GetSourceProvenanceHash() []Hash_HashType {
 	if m != nil {
@@ -1880,19 +2734,27 @@ func init() {
 	proto.RegisterType((*BuildStep)(nil), "google.devtools.cloudbuild.v1.BuildStep")
 	proto.RegisterType((*Volume)(nil), "google.devtools.cloudbuild.v1.Volume")
 	proto.RegisterType((*Results)(nil), "google.devtools.cloudbuild.v1.Results")
+	proto.RegisterType((*ArtifactResult)(nil), "google.devtools.cloudbuild.v1.ArtifactResult")
 	proto.RegisterType((*Build)(nil), "google.devtools.cloudbuild.v1.Build")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.cloudbuild.v1.Build.SubstitutionsEntry")
+	proto.RegisterMapType((map[string]*TimeSpan)(nil), "google.devtools.cloudbuild.v1.Build.TimingEntry")
+	proto.RegisterType((*Artifacts)(nil), "google.devtools.cloudbuild.v1.Artifacts")
+	proto.RegisterType((*Artifacts_ArtifactObjects)(nil), "google.devtools.cloudbuild.v1.Artifacts.ArtifactObjects")
 	proto.RegisterType((*TimeSpan)(nil), "google.devtools.cloudbuild.v1.TimeSpan")
 	proto.RegisterType((*BuildOperationMetadata)(nil), "google.devtools.cloudbuild.v1.BuildOperationMetadata")
 	proto.RegisterType((*SourceProvenance)(nil), "google.devtools.cloudbuild.v1.SourceProvenance")
+	proto.RegisterMapType((map[string]*FileHashes)(nil), "google.devtools.cloudbuild.v1.SourceProvenance.FileHashesEntry")
 	proto.RegisterType((*FileHashes)(nil), "google.devtools.cloudbuild.v1.FileHashes")
 	proto.RegisterType((*Hash)(nil), "google.devtools.cloudbuild.v1.Hash")
 	proto.RegisterType((*Secret)(nil), "google.devtools.cloudbuild.v1.Secret")
+	proto.RegisterMapType((map[string][]byte)(nil), "google.devtools.cloudbuild.v1.Secret.SecretEnvEntry")
 	proto.RegisterType((*CreateBuildRequest)(nil), "google.devtools.cloudbuild.v1.CreateBuildRequest")
 	proto.RegisterType((*GetBuildRequest)(nil), "google.devtools.cloudbuild.v1.GetBuildRequest")
 	proto.RegisterType((*ListBuildsRequest)(nil), "google.devtools.cloudbuild.v1.ListBuildsRequest")
 	proto.RegisterType((*ListBuildsResponse)(nil), "google.devtools.cloudbuild.v1.ListBuildsResponse")
 	proto.RegisterType((*CancelBuildRequest)(nil), "google.devtools.cloudbuild.v1.CancelBuildRequest")
 	proto.RegisterType((*BuildTrigger)(nil), "google.devtools.cloudbuild.v1.BuildTrigger")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.cloudbuild.v1.BuildTrigger.SubstitutionsEntry")
 	proto.RegisterType((*CreateBuildTriggerRequest)(nil), "google.devtools.cloudbuild.v1.CreateBuildTriggerRequest")
 	proto.RegisterType((*GetBuildTriggerRequest)(nil), "google.devtools.cloudbuild.v1.GetBuildTriggerRequest")
 	proto.RegisterType((*ListBuildTriggersRequest)(nil), "google.devtools.cloudbuild.v1.ListBuildTriggersRequest")
@@ -1916,38 +2778,39 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for CloudBuild service
-
+// CloudBuildClient is the client API for CloudBuild service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type CloudBuildClient interface {
 	// Starts a build with the specified configuration.
 	//
-	// The long-running Operation returned by this method will include the ID of
-	// the build, which can be passed to GetBuild to determine its status (e.g.,
-	// success or failure).
-	CreateBuild(ctx context.Context, in *CreateBuildRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	// This method returns a long-running `Operation`, which includes the build
+	// ID. Pass the build ID to `GetBuild` to determine the build status (such as
+	// `SUCCESS` or `FAILURE`).
+	CreateBuild(ctx context.Context, in *CreateBuildRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Returns information about a previously requested build.
 	//
-	// The Build that is returned includes its status (e.g., success or failure,
-	// or in-progress), and timing information.
+	// The `Build` that is returned includes its status (such as `SUCCESS`,
+	// `FAILURE`, or `WORKING`), and timing information.
 	GetBuild(ctx context.Context, in *GetBuildRequest, opts ...grpc.CallOption) (*Build, error)
 	// Lists previously requested builds.
 	//
 	// Previously requested builds may still be in-progress, or may have finished
 	// successfully or unsuccessfully.
 	ListBuilds(ctx context.Context, in *ListBuildsRequest, opts ...grpc.CallOption) (*ListBuildsResponse, error)
-	// Cancels a requested build in progress.
+	// Cancels a build in progress.
 	CancelBuild(ctx context.Context, in *CancelBuildRequest, opts ...grpc.CallOption) (*Build, error)
-	// Creates a new build based on the given build.
+	// Creates a new build based on the specified build.
 	//
-	// This API creates a new build using the original build request,  which may
+	// This method creates a new build using the original build request, which may
 	// or may not result in an identical build.
 	//
 	// For triggered builds:
 	//
-	// * Triggered builds resolve to a precise revision, so a retry of a triggered
-	// build will result in a build that uses the same revision.
+	// * Triggered builds resolve to a precise revision; therefore a retry of a
+	// triggered build will result in a build that uses the same revision.
 	//
-	// For non-triggered builds that specify RepoSource:
+	// For non-triggered builds that specify `RepoSource`:
 	//
 	// * If the original build built from the tip of a branch, the retried build
 	// will build from the tip of that branch, which may not be the same revision
@@ -1955,38 +2818,38 @@ type CloudBuildClient interface {
 	// * If the original build specified a commit sha or revision ID, the retried
 	// build will use the identical source.
 	//
-	// For builds that specify StorageSource:
+	// For builds that specify `StorageSource`:
 	//
-	// * If the original build pulled source from Cloud Storage without specifying
-	// the generation of the object, the new build will use the current object,
-	// which may be different from the original build source.
+	// * If the original build pulled source from Google Cloud Storage without
+	// specifying the generation of the object, the new build will use the current
+	// object, which may be different from the original build source.
 	// * If the original build pulled source from Cloud Storage and specified the
 	// generation of the object, the new build will attempt to use the same
 	// object, which may or may not be available depending on the bucket's
 	// lifecycle management settings.
-	RetryBuild(ctx context.Context, in *RetryBuildRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// Creates a new BuildTrigger.
+	RetryBuild(ctx context.Context, in *RetryBuildRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Creates a new `BuildTrigger`.
 	//
 	// This API is experimental.
 	CreateBuildTrigger(ctx context.Context, in *CreateBuildTriggerRequest, opts ...grpc.CallOption) (*BuildTrigger, error)
-	// Gets information about a BuildTrigger.
+	// Returns information about a `BuildTrigger`.
 	//
 	// This API is experimental.
 	GetBuildTrigger(ctx context.Context, in *GetBuildTriggerRequest, opts ...grpc.CallOption) (*BuildTrigger, error)
-	// Lists existing BuildTrigger.
+	// Lists existing `BuildTrigger`s.
 	//
 	// This API is experimental.
 	ListBuildTriggers(ctx context.Context, in *ListBuildTriggersRequest, opts ...grpc.CallOption) (*ListBuildTriggersResponse, error)
-	// Deletes an BuildTrigger by its project ID and trigger ID.
+	// Deletes a `BuildTrigger` by its project ID and trigger ID.
 	//
 	// This API is experimental.
-	DeleteBuildTrigger(ctx context.Context, in *DeleteBuildTriggerRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
-	// Updates an BuildTrigger by its project ID and trigger ID.
+	DeleteBuildTrigger(ctx context.Context, in *DeleteBuildTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Updates a `BuildTrigger` by its project ID and trigger ID.
 	//
 	// This API is experimental.
 	UpdateBuildTrigger(ctx context.Context, in *UpdateBuildTriggerRequest, opts ...grpc.CallOption) (*BuildTrigger, error)
-	// Runs a BuildTrigger at a particular source revision.
-	RunBuildTrigger(ctx context.Context, in *RunBuildTriggerRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	// Runs a `BuildTrigger` at a particular source revision.
+	RunBuildTrigger(ctx context.Context, in *RunBuildTriggerRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type cloudBuildClient struct {
@@ -1997,9 +2860,9 @@ func NewCloudBuildClient(cc *grpc.ClientConn) CloudBuildClient {
 	return &cloudBuildClient{cc}
 }
 
-func (c *cloudBuildClient) CreateBuild(ctx context.Context, in *CreateBuildRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/CreateBuild", in, out, c.cc, opts...)
+func (c *cloudBuildClient) CreateBuild(ctx context.Context, in *CreateBuildRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/CreateBuild", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2008,7 +2871,7 @@ func (c *cloudBuildClient) CreateBuild(ctx context.Context, in *CreateBuildReque
 
 func (c *cloudBuildClient) GetBuild(ctx context.Context, in *GetBuildRequest, opts ...grpc.CallOption) (*Build, error) {
 	out := new(Build)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/GetBuild", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/GetBuild", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2017,7 +2880,7 @@ func (c *cloudBuildClient) GetBuild(ctx context.Context, in *GetBuildRequest, op
 
 func (c *cloudBuildClient) ListBuilds(ctx context.Context, in *ListBuildsRequest, opts ...grpc.CallOption) (*ListBuildsResponse, error) {
 	out := new(ListBuildsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/ListBuilds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/ListBuilds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2026,16 +2889,16 @@ func (c *cloudBuildClient) ListBuilds(ctx context.Context, in *ListBuildsRequest
 
 func (c *cloudBuildClient) CancelBuild(ctx context.Context, in *CancelBuildRequest, opts ...grpc.CallOption) (*Build, error) {
 	out := new(Build)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/CancelBuild", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/CancelBuild", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudBuildClient) RetryBuild(ctx context.Context, in *RetryBuildRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/RetryBuild", in, out, c.cc, opts...)
+func (c *cloudBuildClient) RetryBuild(ctx context.Context, in *RetryBuildRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/RetryBuild", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2044,7 +2907,7 @@ func (c *cloudBuildClient) RetryBuild(ctx context.Context, in *RetryBuildRequest
 
 func (c *cloudBuildClient) CreateBuildTrigger(ctx context.Context, in *CreateBuildTriggerRequest, opts ...grpc.CallOption) (*BuildTrigger, error) {
 	out := new(BuildTrigger)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/CreateBuildTrigger", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/CreateBuildTrigger", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2053,7 +2916,7 @@ func (c *cloudBuildClient) CreateBuildTrigger(ctx context.Context, in *CreateBui
 
 func (c *cloudBuildClient) GetBuildTrigger(ctx context.Context, in *GetBuildTriggerRequest, opts ...grpc.CallOption) (*BuildTrigger, error) {
 	out := new(BuildTrigger)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/GetBuildTrigger", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/GetBuildTrigger", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2062,16 +2925,16 @@ func (c *cloudBuildClient) GetBuildTrigger(ctx context.Context, in *GetBuildTrig
 
 func (c *cloudBuildClient) ListBuildTriggers(ctx context.Context, in *ListBuildTriggersRequest, opts ...grpc.CallOption) (*ListBuildTriggersResponse, error) {
 	out := new(ListBuildTriggersResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/ListBuildTriggers", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/ListBuildTriggers", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudBuildClient) DeleteBuildTrigger(ctx context.Context, in *DeleteBuildTriggerRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/DeleteBuildTrigger", in, out, c.cc, opts...)
+func (c *cloudBuildClient) DeleteBuildTrigger(ctx context.Context, in *DeleteBuildTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/DeleteBuildTrigger", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2080,54 +2943,53 @@ func (c *cloudBuildClient) DeleteBuildTrigger(ctx context.Context, in *DeleteBui
 
 func (c *cloudBuildClient) UpdateBuildTrigger(ctx context.Context, in *UpdateBuildTriggerRequest, opts ...grpc.CallOption) (*BuildTrigger, error) {
 	out := new(BuildTrigger)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/UpdateBuildTrigger", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/UpdateBuildTrigger", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *cloudBuildClient) RunBuildTrigger(ctx context.Context, in *RunBuildTriggerRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/RunBuildTrigger", in, out, c.cc, opts...)
+func (c *cloudBuildClient) RunBuildTrigger(ctx context.Context, in *RunBuildTriggerRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/RunBuildTrigger", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for CloudBuild service
-
+// CloudBuildServer is the server API for CloudBuild service.
 type CloudBuildServer interface {
 	// Starts a build with the specified configuration.
 	//
-	// The long-running Operation returned by this method will include the ID of
-	// the build, which can be passed to GetBuild to determine its status (e.g.,
-	// success or failure).
-	CreateBuild(context.Context, *CreateBuildRequest) (*google_longrunning.Operation, error)
+	// This method returns a long-running `Operation`, which includes the build
+	// ID. Pass the build ID to `GetBuild` to determine the build status (such as
+	// `SUCCESS` or `FAILURE`).
+	CreateBuild(context.Context, *CreateBuildRequest) (*longrunning.Operation, error)
 	// Returns information about a previously requested build.
 	//
-	// The Build that is returned includes its status (e.g., success or failure,
-	// or in-progress), and timing information.
+	// The `Build` that is returned includes its status (such as `SUCCESS`,
+	// `FAILURE`, or `WORKING`), and timing information.
 	GetBuild(context.Context, *GetBuildRequest) (*Build, error)
 	// Lists previously requested builds.
 	//
 	// Previously requested builds may still be in-progress, or may have finished
 	// successfully or unsuccessfully.
 	ListBuilds(context.Context, *ListBuildsRequest) (*ListBuildsResponse, error)
-	// Cancels a requested build in progress.
+	// Cancels a build in progress.
 	CancelBuild(context.Context, *CancelBuildRequest) (*Build, error)
-	// Creates a new build based on the given build.
+	// Creates a new build based on the specified build.
 	//
-	// This API creates a new build using the original build request,  which may
+	// This method creates a new build using the original build request, which may
 	// or may not result in an identical build.
 	//
 	// For triggered builds:
 	//
-	// * Triggered builds resolve to a precise revision, so a retry of a triggered
-	// build will result in a build that uses the same revision.
+	// * Triggered builds resolve to a precise revision; therefore a retry of a
+	// triggered build will result in a build that uses the same revision.
 	//
-	// For non-triggered builds that specify RepoSource:
+	// For non-triggered builds that specify `RepoSource`:
 	//
 	// * If the original build built from the tip of a branch, the retried build
 	// will build from the tip of that branch, which may not be the same revision
@@ -2135,38 +2997,38 @@ type CloudBuildServer interface {
 	// * If the original build specified a commit sha or revision ID, the retried
 	// build will use the identical source.
 	//
-	// For builds that specify StorageSource:
+	// For builds that specify `StorageSource`:
 	//
-	// * If the original build pulled source from Cloud Storage without specifying
-	// the generation of the object, the new build will use the current object,
-	// which may be different from the original build source.
+	// * If the original build pulled source from Google Cloud Storage without
+	// specifying the generation of the object, the new build will use the current
+	// object, which may be different from the original build source.
 	// * If the original build pulled source from Cloud Storage and specified the
 	// generation of the object, the new build will attempt to use the same
 	// object, which may or may not be available depending on the bucket's
 	// lifecycle management settings.
-	RetryBuild(context.Context, *RetryBuildRequest) (*google_longrunning.Operation, error)
-	// Creates a new BuildTrigger.
+	RetryBuild(context.Context, *RetryBuildRequest) (*longrunning.Operation, error)
+	// Creates a new `BuildTrigger`.
 	//
 	// This API is experimental.
 	CreateBuildTrigger(context.Context, *CreateBuildTriggerRequest) (*BuildTrigger, error)
-	// Gets information about a BuildTrigger.
+	// Returns information about a `BuildTrigger`.
 	//
 	// This API is experimental.
 	GetBuildTrigger(context.Context, *GetBuildTriggerRequest) (*BuildTrigger, error)
-	// Lists existing BuildTrigger.
+	// Lists existing `BuildTrigger`s.
 	//
 	// This API is experimental.
 	ListBuildTriggers(context.Context, *ListBuildTriggersRequest) (*ListBuildTriggersResponse, error)
-	// Deletes an BuildTrigger by its project ID and trigger ID.
+	// Deletes a `BuildTrigger` by its project ID and trigger ID.
 	//
 	// This API is experimental.
-	DeleteBuildTrigger(context.Context, *DeleteBuildTriggerRequest) (*google_protobuf3.Empty, error)
-	// Updates an BuildTrigger by its project ID and trigger ID.
+	DeleteBuildTrigger(context.Context, *DeleteBuildTriggerRequest) (*empty.Empty, error)
+	// Updates a `BuildTrigger` by its project ID and trigger ID.
 	//
 	// This API is experimental.
 	UpdateBuildTrigger(context.Context, *UpdateBuildTriggerRequest) (*BuildTrigger, error)
-	// Runs a BuildTrigger at a particular source revision.
-	RunBuildTrigger(context.Context, *RunBuildTriggerRequest) (*google_longrunning.Operation, error)
+	// Runs a `BuildTrigger` at a particular source revision.
+	RunBuildTrigger(context.Context, *RunBuildTriggerRequest) (*longrunning.Operation, error)
 }
 
 func RegisterCloudBuildServer(s *grpc.Server, srv CloudBuildServer) {
@@ -2424,169 +3286,183 @@ var _CloudBuild_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/cloudbuild/v1/cloudbuild.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/cloudbuild/v1/cloudbuild.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 2567 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0x5b, 0x73, 0xdb, 0xc6,
-	0x15, 0x16, 0x48, 0x8a, 0x97, 0x43, 0x5d, 0xe0, 0x8d, 0xa3, 0x40, 0x74, 0x1c, 0x2b, 0xc8, 0x4d,
-	0x71, 0x12, 0x32, 0x92, 0xeb, 0xd8, 0x51, 0x2e, 0xb6, 0x44, 0x51, 0x97, 0x89, 0x4c, 0xb9, 0x20,
-	0xe9, 0x4c, 0xd3, 0x76, 0x50, 0x90, 0x58, 0x43, 0xa8, 0x40, 0x00, 0x05, 0x96, 0x6c, 0x94, 0xd4,
-	0xd3, 0x36, 0x33, 0xed, 0x6b, 0xdb, 0xe9, 0xf4, 0xa1, 0xd3, 0x87, 0x5e, 0x9e, 0x3b, 0x9d, 0x4e,
-	0xfb, 0xd0, 0x99, 0xce, 0xe4, 0xa9, 0x0f, 0xfd, 0x01, 0xfd, 0x0b, 0xfd, 0x21, 0x9d, 0xbd, 0x80,
-	0x04, 0x49, 0xbb, 0x20, 0xe2, 0xf6, 0x45, 0xe6, 0x9e, 0xdd, 0xef, 0xec, 0xd9, 0x73, 0xdb, 0x6f,
-	0x49, 0x43, 0xd5, 0xf2, 0x3c, 0xcb, 0xc1, 0x35, 0x13, 0x0f, 0x89, 0xe7, 0x39, 0x61, 0xad, 0xe7,
-	0x78, 0x03, 0xb3, 0x3b, 0xb0, 0x1d, 0xb3, 0x36, 0xdc, 0x8a, 0x8d, 0xaa, 0x7e, 0xe0, 0x11, 0x0f,
-	0x5d, 0xe5, 0xeb, 0xab, 0xd1, 0xfa, 0x6a, 0x6c, 0xc5, 0x70, 0xab, 0xf2, 0xbc, 0x50, 0x67, 0xf8,
-	0x76, 0xcd, 0x70, 0x5d, 0x8f, 0x18, 0xc4, 0xf6, 0xdc, 0x90, 0x83, 0x2b, 0xaa, 0x98, 0x65, 0x98,
-	0x9a, 0x31, 0x30, 0x6d, 0xc2, 0xff, 0xea, 0x8e, 0x67, 0x89, 0x35, 0x2f, 0x89, 0x35, 0x8e, 0xe7,
-	0x5a, 0xc1, 0xc0, 0x75, 0x6d, 0xd7, 0xaa, 0x79, 0x3e, 0x0e, 0x26, 0x14, 0xbd, 0x20, 0x16, 0xb1,
-	0x51, 0x77, 0xf0, 0xb0, 0x66, 0x0e, 0xf8, 0x02, 0x31, 0x7f, 0x65, 0x7a, 0x1e, 0xf7, 0x7d, 0x72,
-	0x21, 0x26, 0xaf, 0x4d, 0x4f, 0x12, 0xbb, 0x8f, 0x43, 0x62, 0xf4, 0x7d, 0xbe, 0x40, 0xdd, 0x83,
-	0x4b, 0x1a, 0x26, 0xc1, 0xc5, 0x1e, 0x3d, 0x95, 0x86, 0xbf, 0x37, 0xc0, 0x21, 0x41, 0x57, 0x01,
-	0xfc, 0xc0, 0xfb, 0x2e, 0xee, 0x11, 0xdd, 0x36, 0x15, 0x69, 0x43, 0xda, 0x2c, 0x69, 0x25, 0x21,
-	0x39, 0x36, 0xd1, 0x0a, 0x64, 0x6c, 0x53, 0xc9, 0x30, 0x71, 0xc6, 0x36, 0xd5, 0x5f, 0x4b, 0xb0,
-	0xa6, 0x0d, 0x5c, 0xa6, 0xa2, 0x1d, 0xd8, 0x96, 0x85, 0x83, 0x39, 0x35, 0x5d, 0x05, 0x20, 0x1c,
-	0xa0, 0x8f, 0x34, 0x96, 0x84, 0xe4, 0xd8, 0x44, 0xbb, 0x90, 0x0f, 0xbd, 0x41, 0xd0, 0xc3, 0x4a,
-	0x76, 0x43, 0xda, 0x2c, 0x6f, 0xbf, 0x5e, 0xfd, 0xaf, 0x11, 0xa9, 0x6a, 0xd8, 0xf7, 0x5a, 0x0c,
-	0xa0, 0x09, 0xa0, 0xaa, 0xc3, 0x72, 0x8b, 0x78, 0x81, 0x61, 0x61, 0x3e, 0x81, 0xd6, 0x20, 0xdf,
-	0x1d, 0xf4, 0xce, 0x31, 0x11, 0xd6, 0x88, 0x11, 0x95, 0x7b, 0x5d, 0x6a, 0x96, 0x30, 0x43, 0x8c,
-	0xd0, 0x0b, 0x00, 0x16, 0x76, 0x45, 0x4c, 0x98, 0x1d, 0x59, 0x2d, 0x26, 0x51, 0xff, 0x29, 0x01,
-	0x8c, 0xf7, 0x4d, 0x3a, 0xf0, 0x15, 0x28, 0x05, 0xd8, 0xf7, 0x74, 0xd7, 0xe8, 0x63, 0xb1, 0x51,
-	0x91, 0x0a, 0x9a, 0x46, 0x1f, 0xa3, 0x17, 0xa1, 0xdc, 0x0d, 0x0c, 0xb7, 0x77, 0xc6, 0xa7, 0xe9,
-	0x5e, 0xa5, 0xa3, 0x05, 0x0d, 0xb8, 0x90, 0x2d, 0xb9, 0x02, 0x45, 0x62, 0x58, 0x7c, 0x3e, 0x27,
-	0xe6, 0x0b, 0xc4, 0xb0, 0xd8, 0xe4, 0x35, 0x80, 0x9e, 0xd7, 0xef, 0xdb, 0x44, 0x0f, 0xcf, 0x0c,
-	0x65, 0x51, 0x4c, 0x97, 0xb8, 0xac, 0x75, 0x66, 0x20, 0x19, 0xb2, 0xa6, 0x1d, 0x28, 0x05, 0xb6,
-	0x2f, 0xfd, 0xb8, 0x07, 0x50, 0x0c, 0xf0, 0xd0, 0x0e, 0xe9, 0x49, 0xfe, 0x26, 0x41, 0x5e, 0x9c,
-	0xa2, 0x03, 0x2b, 0x21, 0xf7, 0x9a, 0x2e, 0x02, 0x90, 0x61, 0x01, 0x78, 0x33, 0x21, 0x00, 0x13,
-	0xae, 0x3e, 0x5a, 0xd0, 0x96, 0xc3, 0x09, 0xdf, 0x9f, 0x40, 0x99, 0x9d, 0xfe, 0x2b, 0x06, 0x95,
-	0xfa, 0x22, 0x18, 0x8d, 0xf6, 0x8a, 0x51, 0x76, 0xa8, 0x5f, 0x48, 0x00, 0x34, 0xfb, 0xc8, 0x71,
-	0xdf, 0xb0, 0x30, 0x42, 0x90, 0x63, 0x0e, 0xe2, 0xde, 0x67, 0x9f, 0x69, 0x78, 0x4d, 0xdb, 0xc2,
-	0x21, 0xe1, 0x6e, 0xd5, 0xc4, 0x08, 0x1d, 0x41, 0xd9, 0x1f, 0x84, 0x67, 0x3a, 0xb1, 0xfb, 0xb6,
-	0x6b, 0x31, 0x9f, 0x96, 0xb7, 0x5f, 0x4b, 0x30, 0xa9, 0x6d, 0xf7, 0x71, 0xcb, 0x37, 0x5c, 0x0d,
-	0x28, 0xb6, 0xcd, 0xa0, 0xea, 0x3f, 0x32, 0x50, 0x62, 0x25, 0xd0, 0x22, 0xd8, 0x7f, 0xac, 0x0d,
-	0x32, 0x64, 0xb1, 0x3b, 0x54, 0x32, 0x1b, 0x59, 0xea, 0x7e, 0xec, 0x0e, 0xe9, 0x2a, 0x23, 0xb0,
-	0x42, 0x25, 0xcb, 0x44, 0xec, 0x73, 0x14, 0xa4, 0xdc, 0x28, 0x48, 0xa2, 0xde, 0x16, 0xa3, 0x7a,
-	0x43, 0xeb, 0x50, 0xfc, 0xbe, 0x61, 0x13, 0xfd, 0xa1, 0x17, 0x28, 0x79, 0x86, 0x2c, 0xd0, 0xf1,
-	0x81, 0x17, 0xd0, 0x6c, 0xc5, 0x2e, 0x09, 0x2e, 0x7c, 0xcf, 0x76, 0x89, 0x08, 0x74, 0x4c, 0x42,
-	0xd3, 0x33, 0xc4, 0xbd, 0x00, 0x13, 0x9d, 0x5a, 0x52, 0x64, 0xe0, 0x12, 0x97, 0x34, 0xdc, 0x21,
-	0xba, 0x03, 0x85, 0xa1, 0xe7, 0x0c, 0xfa, 0x38, 0x54, 0x4a, 0x1b, 0xd9, 0xcd, 0xf2, 0xf6, 0x2b,
-	0x09, 0x9e, 0x78, 0xc0, 0x56, 0x6b, 0x11, 0x0a, 0xdd, 0x81, 0xbc, 0xf0, 0x24, 0xa4, 0xf3, 0xa4,
-	0x80, 0xa9, 0x6f, 0x43, 0x9e, 0xeb, 0x7c, 0xac, 0x07, 0x11, 0xe4, 0x7c, 0x83, 0x9c, 0x89, 0xca,
-	0x61, 0x9f, 0xd5, 0x4f, 0xa1, 0xa0, 0xe1, 0x70, 0xe0, 0x90, 0x90, 0xf6, 0x0b, 0x9b, 0x66, 0x40,
-	0xc8, 0x7c, 0x9c, 0x9c, 0x5a, 0xe3, 0x9c, 0xd1, 0x04, 0x10, 0x5d, 0x87, 0x4b, 0x6c, 0x5a, 0x0f,
-	0x09, 0xf6, 0x75, 0xa1, 0x8d, 0x87, 0x67, 0xb5, 0x1b, 0x45, 0x97, 0x41, 0x42, 0xf5, 0x17, 0x65,
-	0x58, 0x64, 0x11, 0x17, 0x11, 0x92, 0x46, 0x11, 0x9a, 0xec, 0x02, 0xf2, 0x74, 0x17, 0xa8, 0x43,
-	0x3e, 0x24, 0x06, 0x19, 0x84, 0xec, 0x20, 0x2b, 0xdb, 0x6f, 0xcc, 0x61, 0xa7, 0x59, 0x6d, 0x31,
-	0x88, 0x26, 0xa0, 0xe8, 0x25, 0x58, 0xe6, 0x9f, 0x74, 0x13, 0x13, 0xc3, 0x76, 0x14, 0x85, 0x6d,
-	0xb3, 0xc4, 0x85, 0xfb, 0x4c, 0x86, 0x3e, 0x98, 0xea, 0xa0, 0x49, 0xf1, 0x9c, 0xec, 0x9e, 0xe8,
-	0x43, 0x58, 0xa4, 0x7e, 0x08, 0x95, 0x32, 0xf3, 0xe7, 0xe6, 0x3c, 0x76, 0x52, 0x07, 0x69, 0x1c,
-	0x86, 0xee, 0x42, 0x21, 0xe0, 0xb1, 0x11, 0xf9, 0xf0, 0x6a, 0x62, 0xb1, 0xb3, 0xd5, 0x5a, 0x04,
-	0x43, 0xef, 0x41, 0xb9, 0x17, 0x60, 0x83, 0x60, 0x5a, 0xa1, 0x58, 0xc9, 0x33, 0x2d, 0x95, 0x48,
-	0x4b, 0x74, 0xad, 0xb1, 0x3c, 0x62, 0xd7, 0x9a, 0x06, 0x7c, 0x39, 0x15, 0xa0, 0x77, 0x01, 0x42,
-	0x62, 0x04, 0x84, 0x63, 0x0b, 0x89, 0xd8, 0x12, 0x5b, 0xcd, 0xa0, 0xef, 0x41, 0xf9, 0xa1, 0xed,
-	0xda, 0xbc, 0x33, 0x60, 0xa5, 0x98, 0xbc, 0x2f, 0x5f, 0xce, 0xc0, 0x37, 0xa0, 0x40, 0x51, 0xde,
-	0x80, 0x28, 0x4b, 0x0c, 0xb8, 0x3e, 0x03, 0xdc, 0x17, 0x97, 0xb8, 0x16, 0xad, 0xa4, 0x1d, 0x4a,
-	0xa4, 0xdb, 0x32, 0x4b, 0xb7, 0x28, 0x23, 0xaf, 0x41, 0xd9, 0xf1, 0xac, 0x50, 0x17, 0xb7, 0xd6,
-	0x33, 0xbc, 0xa6, 0xa9, 0x68, 0x8f, 0xdf, 0x5c, 0xdf, 0x82, 0x4b, 0x3c, 0x5c, 0xba, 0x1f, 0x78,
-	0x43, 0xec, 0x1a, 0x6e, 0x0f, 0x2b, 0xcf, 0xb2, 0x7d, 0x6b, 0x73, 0x85, 0xfb, 0xfe, 0x08, 0xa6,
-	0xc9, 0xe1, 0x94, 0x04, 0x6d, 0x82, 0xcc, 0x0b, 0x22, 0x76, 0x51, 0xaf, 0x31, 0x1b, 0x56, 0xba,
-	0xb1, 0x0b, 0xff, 0xd8, 0x44, 0x0d, 0x28, 0x78, 0x3e, 0x63, 0x2e, 0xca, 0x73, 0x6c, 0xf7, 0xb9,
-	0xd2, 0xfa, 0x94, 0x43, 0xb4, 0x08, 0x8b, 0x9e, 0x83, 0x82, 0xe3, 0x59, 0xfa, 0x20, 0x70, 0x94,
-	0x75, 0xde, 0xaa, 0x1d, 0xcf, 0xea, 0x04, 0x0e, 0xfa, 0x36, 0x2c, 0x87, 0x83, 0x6e, 0x48, 0x6c,
-	0x32, 0xe0, 0xbb, 0x5c, 0x65, 0x49, 0x79, 0x6b, 0xbe, 0xe2, 0x89, 0x23, 0x1b, 0xb4, 0x21, 0x6a,
-	0x93, 0xda, 0x68, 0x6f, 0x21, 0x86, 0x15, 0x2a, 0xd7, 0x78, 0x2f, 0xa6, 0x9f, 0x69, 0x3f, 0xe4,
-	0xcd, 0x31, 0x54, 0x36, 0xe6, 0xea, 0x87, 0x2d, 0xb6, 0x5a, 0x8b, 0x50, 0xe8, 0x68, 0xd4, 0x0f,
-	0x5f, 0x64, 0xf8, 0xb7, 0xe7, 0x32, 0x96, 0xdf, 0x28, 0xdc, 0x4a, 0x81, 0xaf, 0xdc, 0x05, 0x34,
-	0x7b, 0x06, 0x7a, 0x59, 0x9c, 0xe3, 0x0b, 0xd1, 0x79, 0xe8, 0x47, 0x74, 0x19, 0x16, 0x87, 0x86,
-	0x33, 0x88, 0xd8, 0x05, 0x1f, 0xec, 0x64, 0x6e, 0x4b, 0x95, 0x2e, 0x94, 0x63, 0x8a, 0x1f, 0x03,
-	0xfd, 0x20, 0x0e, 0x4d, 0xd1, 0xbb, 0xc7, 0x7b, 0xa8, 0x3f, 0x84, 0x3c, 0x6f, 0x53, 0x08, 0xc1,
-	0x4a, 0xab, 0xbd, 0xdb, 0xee, 0xb4, 0xf4, 0x4e, 0xf3, 0xa3, 0xe6, 0xe9, 0xc7, 0x4d, 0x79, 0x01,
-	0x01, 0xe4, 0xbf, 0xde, 0x69, 0x74, 0x1a, 0xfb, 0xb2, 0x84, 0xca, 0x50, 0xf8, 0xf8, 0x54, 0xfb,
-	0xe8, 0xb8, 0x79, 0x28, 0x67, 0xe8, 0xa0, 0xd5, 0xa9, 0xd7, 0x1b, 0xad, 0x96, 0x9c, 0xa5, 0x83,
-	0x83, 0xdd, 0xe3, 0x93, 0x8e, 0xd6, 0x90, 0x73, 0x54, 0xcd, 0x71, 0xb3, 0xdd, 0xd0, 0x9a, 0xbb,
-	0x27, 0x7a, 0x43, 0xd3, 0x4e, 0x35, 0x79, 0x91, 0x2e, 0x68, 0x1f, 0xdf, 0x6b, 0x9c, 0x76, 0xda,
-	0x72, 0x1e, 0x2d, 0x43, 0xa9, 0xbe, 0xdb, 0xac, 0x37, 0x4e, 0x4e, 0x1a, 0xfb, 0x72, 0x41, 0xfd,
-	0x01, 0x14, 0x23, 0xbb, 0xa6, 0xca, 0x5f, 0x4a, 0x53, 0xfe, 0x37, 0xa1, 0x88, 0x5d, 0x93, 0x03,
-	0x33, 0x89, 0xc0, 0x02, 0x76, 0x4d, 0x3a, 0x52, 0xdb, 0xb0, 0x26, 0x92, 0x5a, 0xd0, 0xc3, 0x7b,
-	0x98, 0x18, 0xa6, 0x41, 0x0c, 0xb4, 0x03, 0x8b, 0xcc, 0x71, 0xc2, 0x8c, 0x97, 0xe7, 0xc9, 0x03,
-	0x8d, 0x43, 0xd4, 0xdf, 0x67, 0x41, 0x9e, 0xae, 0x54, 0x64, 0xc2, 0x73, 0x01, 0x0e, 0x3d, 0x67,
-	0x88, 0xe9, 0x5d, 0x35, 0xc1, 0xd5, 0xb2, 0xe9, 0xb9, 0x9a, 0xf6, 0x6c, 0xa4, 0x6c, 0x92, 0x2d,
-	0x7f, 0x13, 0x2e, 0x8f, 0x76, 0x89, 0x53, 0xb7, 0x7c, 0x5a, 0x3e, 0x8e, 0x22, 0x35, 0x31, 0xae,
-	0xfc, 0x1d, 0xda, 0x63, 0x1d, 0xac, 0x9f, 0x19, 0xe1, 0x19, 0x0e, 0x95, 0x1c, 0xab, 0x90, 0x3b,
-	0x29, 0x5b, 0x56, 0xf5, 0xc0, 0x76, 0xf0, 0x11, 0xd3, 0xc0, 0x0b, 0x06, 0x1e, 0x8e, 0x04, 0x95,
-	0x33, 0x58, 0x9d, 0x9a, 0x7e, 0x4c, 0xda, 0xdf, 0x99, 0x4c, 0xfb, 0xa4, 0x43, 0x8d, 0x15, 0xc6,
-	0x13, 0xbf, 0x09, 0x30, 0x9e, 0x40, 0x77, 0xa1, 0x34, 0x3a, 0x99, 0x22, 0xb1, 0x73, 0xbd, 0x94,
-	0xa0, 0x96, 0x22, 0xb5, 0x62, 0x64, 0xbb, 0xfa, 0x23, 0x09, 0x72, 0xf4, 0x03, 0xba, 0x0b, 0x39,
-	0x72, 0xe1, 0xf3, 0xf4, 0x5d, 0x49, 0x0c, 0x2a, 0x85, 0xb0, 0x3f, 0xed, 0x0b, 0x1f, 0x6b, 0x0c,
-	0x39, 0xd9, 0x11, 0x96, 0x84, 0xd1, 0xea, 0x06, 0x14, 0xa3, 0x75, 0xa8, 0x08, 0xb9, 0xe6, 0x69,
-	0xb3, 0xc1, 0x2b, 0xb4, 0x75, 0xb4, 0xbb, 0x7d, 0xf3, 0x1d, 0x59, 0x52, 0xbf, 0xa4, 0xef, 0x01,
-	0xd6, 0xc7, 0xd0, 0x06, 0x2c, 0x9d, 0xf7, 0x43, 0xfd, 0x1c, 0x5f, 0xe8, 0x31, 0x4e, 0x06, 0xe7,
-	0xfd, 0xf0, 0x23, 0x7c, 0xc1, 0xde, 0x1e, 0xad, 0x09, 0x62, 0x99, 0x65, 0x47, 0xfe, 0xda, 0x5c,
-	0xcd, 0x52, 0xfc, 0xd3, 0x70, 0x87, 0x3c, 0x7e, 0x63, 0x3a, 0x5a, 0x79, 0x1f, 0x56, 0x26, 0x27,
-	0x93, 0xfa, 0xdd, 0x52, 0x3c, 0x24, 0x1e, 0xa0, 0x3a, 0xe3, 0x02, 0x69, 0xde, 0xb6, 0xa3, 0x3a,
-	0xcd, 0xa4, 0xaf, 0xd3, 0xbb, 0xb0, 0x7a, 0x88, 0xc9, 0xd3, 0xbc, 0xa4, 0x7f, 0x2a, 0xc1, 0xa5,
-	0x13, 0x3b, 0xe4, 0x3a, 0xc2, 0x39, 0x95, 0x5c, 0x81, 0x92, 0xcf, 0xaa, 0xdf, 0xfe, 0x8c, 0x7b,
-	0x61, 0x51, 0x2b, 0x52, 0x41, 0xcb, 0xfe, 0x8c, 0xbf, 0x47, 0xe9, 0x24, 0xf1, 0xce, 0xb1, 0x2b,
-	0xde, 0x3e, 0x6c, 0x79, 0x9b, 0x0a, 0x28, 0xe9, 0x78, 0x68, 0x3b, 0x04, 0x07, 0x8c, 0xe1, 0x94,
-	0x34, 0x31, 0x52, 0x3f, 0x03, 0x14, 0xb7, 0x23, 0xf4, 0x3d, 0x37, 0xc4, 0xe8, 0x7d, 0xfa, 0x76,
-	0xa6, 0x12, 0x91, 0xd3, 0xf3, 0x79, 0x47, 0x60, 0xd0, 0xab, 0xb0, 0xea, 0xe2, 0x4f, 0x89, 0x1e,
-	0xb3, 0x87, 0x9f, 0x7c, 0x99, 0x8a, 0xef, 0x47, 0x36, 0xa9, 0x75, 0x40, 0x75, 0x5a, 0xd9, 0xce,
-	0xd3, 0x78, 0xf2, 0x27, 0x39, 0x58, 0x8a, 0x7f, 0x21, 0x31, 0x43, 0xd1, 0x37, 0xa0, 0x6c, 0xe2,
-	0xb0, 0x17, 0xd8, 0x8c, 0x76, 0x30, 0x7a, 0x5a, 0xd2, 0xe2, 0x22, 0xd4, 0x06, 0x39, 0xe2, 0x3c,
-	0x04, 0xf7, 0x7d, 0xc7, 0x20, 0x11, 0x87, 0x4c, 0xd1, 0xf7, 0x56, 0x85, 0x8a, 0xb6, 0xd0, 0x80,
-	0xde, 0x8f, 0x12, 0x2c, 0x37, 0x7f, 0x82, 0x1d, 0x2d, 0x88, 0x14, 0x43, 0xcf, 0x03, 0x6b, 0x11,
-	0xac, 0x08, 0x8b, 0xe2, 0x81, 0x3f, 0x92, 0x4c, 0x93, 0xe5, 0xc5, 0x54, 0x64, 0xb9, 0x02, 0x45,
-	0xd3, 0x0e, 0x8d, 0xae, 0x83, 0x4d, 0xa5, 0xb4, 0x21, 0x6d, 0x16, 0xb5, 0xd1, 0x18, 0x99, 0xd3,
-	0xd4, 0x8b, 0xbf, 0x07, 0x3e, 0x9c, 0xc7, 0x78, 0x11, 0x80, 0x64, 0x06, 0xf6, 0xf4, 0x14, 0x67,
-	0x4f, 0x86, 0x15, 0x41, 0x56, 0x85, 0xbb, 0xd5, 0x1f, 0x4b, 0xb0, 0x1e, 0xeb, 0x02, 0xe9, 0xbe,
-	0x9e, 0x6a, 0x40, 0x41, 0x84, 0x4f, 0xb4, 0x83, 0x37, 0x52, 0x1c, 0x58, 0x8b, 0xb0, 0xea, 0x03,
-	0x58, 0x8b, 0xfa, 0xc2, 0xff, 0xf2, 0xeb, 0x31, 0xf5, 0x5d, 0x50, 0x46, 0x45, 0x2a, 0x14, 0xcf,
-	0xd9, 0x33, 0x54, 0x13, 0xd6, 0x1f, 0x03, 0x15, 0x65, 0x7e, 0x08, 0x45, 0xb1, 0x49, 0x54, 0xe8,
-	0xa9, 0xce, 0x3d, 0x02, 0xab, 0xdf, 0x80, 0xf5, 0x7d, 0xec, 0xe0, 0xaf, 0xe4, 0xfb, 0x84, 0xb3,
-	0xff, 0x4e, 0x82, 0xf5, 0x8e, 0x6f, 0x1a, 0xff, 0x07, 0xdd, 0xf1, 0xb0, 0x67, 0x9f, 0x22, 0xec,
-	0x7f, 0xcf, 0x8b, 0x16, 0x24, 0x9e, 0x38, 0xa8, 0x0b, 0x6b, 0x33, 0x0f, 0xb5, 0x31, 0x45, 0x48,
-	0x7b, 0xb9, 0x5f, 0x9e, 0x7e, 0xaa, 0x31, 0xba, 0xe0, 0x53, 0x5a, 0xc8, 0x9c, 0x80, 0x4d, 0x7d,
-	0x88, 0x03, 0xfb, 0xe1, 0x85, 0xce, 0x5f, 0x56, 0xe2, 0xbb, 0x86, 0xdb, 0x29, 0x1e, 0x65, 0xd5,
-	0x07, 0x4c, 0x01, 0x1f, 0x51, 0x8a, 0x28, 0x14, 0xc7, 0xc5, 0xe8, 0x13, 0x58, 0xea, 0x1b, 0xbd,
-	0x33, 0xdb, 0xc5, 0x3a, 0x23, 0x2a, 0x59, 0xb6, 0xcd, 0xad, 0x34, 0xdb, 0xdc, 0xe3, 0x78, 0x76,
-	0xac, 0x72, 0x7f, 0x3c, 0xa0, 0xbc, 0xc3, 0xb4, 0xc3, 0x73, 0x76, 0xb5, 0xe9, 0x56, 0x97, 0xd1,
-	0xce, 0xac, 0x06, 0x54, 0x46, 0x6f, 0xb7, 0xc3, 0x2e, 0xf2, 0xe0, 0x99, 0x78, 0x13, 0x89, 0xce,
-	0x9a, 0x63, 0x46, 0x7c, 0x98, 0xc6, 0x88, 0x78, 0xeb, 0x11, 0x27, 0x46, 0xe1, 0x8c, 0x0c, 0xf9,
-	0x70, 0x99, 0x3e, 0x4f, 0x43, 0x12, 0x60, 0x83, 0x3e, 0xa6, 0xa2, 0x1d, 0x17, 0xd3, 0xef, 0x78,
-	0xe2, 0x59, 0xad, 0x48, 0x4d, 0xb4, 0xa3, 0x33, 0x23, 0x53, 0xab, 0xb0, 0x34, 0xe1, 0x70, 0x19,
-	0x96, 0x9a, 0xa7, 0x6d, 0xfd, 0x41, 0x43, 0x3b, 0x3e, 0x38, 0x6e, 0xec, 0xcb, 0x0b, 0x68, 0x09,
-	0x8a, 0xa3, 0x91, 0xa4, 0xd6, 0xa1, 0x1c, 0x73, 0x28, 0x5a, 0x85, 0x72, 0xa7, 0xd9, 0xba, 0xdf,
-	0xa8, 0x47, 0xab, 0x29, 0x7e, 0x4b, 0x3f, 0x3a, 0x3e, 0x3c, 0xaa, 0xdf, 0xef, 0xe8, 0xb7, 0x65,
-	0x09, 0x5d, 0x82, 0xe5, 0x98, 0xe4, 0xc6, 0xb6, 0x9c, 0x51, 0x6f, 0x4e, 0xf6, 0x62, 0xb1, 0xf5,
-	0x0a, 0xc0, 0xbd, 0x4e, 0xab, 0xad, 0xdf, 0xdb, 0x6d, 0xd7, 0x8f, 0xe4, 0x05, 0xaa, 0x7b, 0xf7,
-	0xe4, 0xe4, 0xf4, 0x63, 0xfd, 0xe4, 0xf4, 0xb4, 0xd5, 0x90, 0x25, 0xf5, 0x10, 0xd0, 0xec, 0xa9,
-	0xf8, 0x5b, 0x50, 0x6b, 0xec, 0xde, 0xd3, 0xf7, 0x1b, 0x07, 0xbb, 0x9d, 0x93, 0xb6, 0xbc, 0x40,
-	0xdf, 0x6d, 0x42, 0x76, 0xda, 0x94, 0x25, 0xaa, 0x39, 0x1a, 0x1e, 0x1c, 0xc8, 0x99, 0xed, 0xbf,
-	0xae, 0x00, 0xd4, 0xa9, 0xeb, 0xf8, 0x17, 0x6c, 0x3f, 0x97, 0xa0, 0x1c, 0x6b, 0xe3, 0x68, 0x2b,
-	0xc1, 0xcf, 0xb3, 0xc4, 0xaf, 0x72, 0x35, 0x82, 0xc4, 0x7e, 0x6d, 0xa9, 0x8e, 0x1e, 0x6a, 0x6a,
-	0xed, 0x8b, 0x7f, 0xfd, 0xfb, 0x97, 0x99, 0xd7, 0xd5, 0x8d, 0xda, 0x70, 0xab, 0x26, 0x5a, 0x45,
-	0x58, 0xfb, 0x7c, 0xdc, 0x46, 0x1e, 0xd5, 0x38, 0x8f, 0xd9, 0x11, 0x57, 0xf1, 0xcf, 0x24, 0x28,
-	0x46, 0x6d, 0x1d, 0x55, 0x13, 0xec, 0x99, 0xe2, 0x85, 0x95, 0xb9, 0xae, 0x7d, 0xf5, 0x2d, 0x66,
-	0xd3, 0x6b, 0xe8, 0x95, 0x24, 0x9b, 0x6a, 0x9f, 0xdb, 0xe6, 0x23, 0xf4, 0x1b, 0x09, 0x60, 0xcc,
-	0xda, 0x50, 0xd2, 0x77, 0x0d, 0x33, 0x44, 0xb3, 0xb2, 0x95, 0x02, 0xc1, 0xef, 0x0a, 0x75, 0x93,
-	0x99, 0xa8, 0xa2, 0x44, 0xb7, 0xa1, 0xdf, 0xd2, 0x10, 0x8e, 0x79, 0x5d, 0x72, 0x08, 0x67, 0x38,
-	0xe0, 0x9c, 0x5e, 0xbb, 0xc5, 0x4c, 0xda, 0x52, 0xdf, 0x9c, 0xcb, 0x6b, 0x3b, 0x3d, 0xb6, 0xcf,
-	0x8e, 0x74, 0x1d, 0xfd, 0x8a, 0xfd, 0x94, 0x13, 0xfd, 0x18, 0x96, 0xe8, 0xbf, 0x99, 0xdf, 0xcd,
-	0x92, 0x52, 0xec, 0x1d, 0x66, 0xd8, 0xdb, 0xea, 0x1b, 0xf3, 0x19, 0x16, 0x50, 0xfd, 0xd4, 0xae,
-	0x3f, 0x4b, 0x13, 0x2f, 0x99, 0x88, 0xd1, 0xde, 0x9e, 0xbf, 0x06, 0x26, 0xaf, 0xc7, 0x4a, 0x9a,
-	0xfb, 0x4c, 0xbd, 0xc1, 0xac, 0x7e, 0x4b, 0x55, 0x9f, 0x6c, 0x75, 0x74, 0xe1, 0xef, 0x44, 0x77,
-	0x1f, 0xfa, 0x93, 0x34, 0x7e, 0x0b, 0x45, 0xf6, 0xde, 0x9c, 0xb3, 0x46, 0x9e, 0xc6, 0x58, 0x11,
-	0x7b, 0x54, 0x4b, 0x36, 0xb6, 0xf6, 0xf9, 0x98, 0x03, 0x3c, 0x42, 0x7f, 0x89, 0xbf, 0xbc, 0x22,
-	0x46, 0x84, 0x6e, 0xcd, 0x5b, 0x10, 0x53, 0xf4, 0xab, 0x72, 0x3b, 0x3d, 0x50, 0x14, 0xd4, 0x75,
-	0x76, 0x82, 0x97, 0xd1, 0x1c, 0xee, 0xa6, 0x25, 0x85, 0x66, 0x09, 0x56, 0x62, 0x62, 0x3c, 0x91,
-	0x93, 0x55, 0xd6, 0x66, 0xde, 0x0a, 0x8d, 0xbe, 0x4f, 0x2e, 0x22, 0xb7, 0x5e, 0x4f, 0xed, 0xd6,
-	0x2f, 0x25, 0x40, 0xb3, 0x34, 0x2d, 0xd1, 0xc2, 0x27, 0x32, 0xbb, 0x74, 0xd9, 0x70, 0x97, 0x99,
-	0xbd, 0xb3, 0x9d, 0xd6, 0xec, 0x71, 0x1e, 0xff, 0x51, 0x82, 0xd5, 0xa9, 0x9f, 0xb6, 0x13, 0xf3,
-	0xf8, 0xf1, 0x3f, 0x85, 0x27, 0x35, 0x87, 0x3a, 0xb3, 0xf5, 0x03, 0xf5, 0x46, 0x5a, 0x5b, 0x83,
-	0x81, 0xbb, 0x23, 0x7e, 0xaf, 0xd9, 0x3b, 0x07, 0xa5, 0xe7, 0xf5, 0xa3, 0x8d, 0x26, 0xcc, 0xba,
-	0x2f, 0x7d, 0x72, 0x28, 0xe4, 0x96, 0xe7, 0x18, 0xae, 0x55, 0xf5, 0x02, 0xab, 0x66, 0x61, 0x97,
-	0x85, 0xba, 0xc6, 0xa7, 0x0c, 0xdf, 0x0e, 0x9f, 0xf0, 0xdf, 0x23, 0xde, 0x1b, 0x8f, 0xfe, 0x90,
-	0xc9, 0x1e, 0xd6, 0xf7, 0xba, 0x79, 0x86, 0xbc, 0xf1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17,
-	0x08, 0x55, 0x51, 0x57, 0x21, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/devtools/cloudbuild/v1/cloudbuild.proto", fileDescriptor_cloudbuild_953822d6e0430e8d)
+}
+
+var fileDescriptor_cloudbuild_953822d6e0430e8d = []byte{
+	// 2755 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xdb, 0x6f, 0x23, 0x57,
+	0x19, 0xdf, 0xb1, 0x13, 0x5f, 0x3e, 0xe7, 0x32, 0x7b, 0xba, 0x4d, 0x1d, 0x6f, 0xb7, 0x9b, 0x4e,
+	0x6f, 0xe9, 0x6e, 0x6b, 0x37, 0x59, 0xb6, 0xbb, 0x4d, 0x2f, 0xbb, 0x89, 0xe3, 0x5c, 0xd4, 0xc4,
+	0x59, 0xc6, 0xf6, 0x56, 0x14, 0xd0, 0x30, 0xf6, 0x9c, 0x38, 0x43, 0xc6, 0x33, 0xc3, 0x9c, 0x63,
+	0x43, 0x5a, 0x2a, 0x44, 0x05, 0x48, 0x3c, 0x81, 0x84, 0x78, 0x40, 0x3c, 0x70, 0x79, 0x46, 0x08,
+	0xc1, 0x03, 0x12, 0x52, 0x9f, 0x91, 0x78, 0xe5, 0x89, 0x77, 0xfe, 0x0e, 0x84, 0xce, 0x65, 0xec,
+	0xb1, 0xbd, 0xdb, 0xf1, 0xec, 0xc2, 0x4b, 0x32, 0xe7, 0x3b, 0xe7, 0xfb, 0xce, 0x77, 0xbe, 0xdb,
+	0xf9, 0x7d, 0x33, 0x86, 0x72, 0xd7, 0xf3, 0xba, 0x0e, 0xae, 0x58, 0x78, 0x40, 0x3d, 0xcf, 0x21,
+	0x95, 0x8e, 0xe3, 0xf5, 0xad, 0x76, 0xdf, 0x76, 0xac, 0xca, 0x60, 0x23, 0x32, 0x2a, 0xfb, 0x81,
+	0x47, 0x3d, 0x74, 0x4d, 0xac, 0x2f, 0x87, 0xeb, 0xcb, 0x91, 0x15, 0x83, 0x8d, 0xd2, 0xf3, 0x52,
+	0x9c, 0xe9, 0xdb, 0x15, 0xd3, 0x75, 0x3d, 0x6a, 0x52, 0xdb, 0x73, 0x89, 0x60, 0x2e, 0xad, 0x46,
+	0x66, 0xcf, 0x28, 0xf5, 0xdb, 0x9e, 0x75, 0x21, 0xa7, 0x34, 0x39, 0xc5, 0xc5, 0x55, 0xcc, 0xbe,
+	0x65, 0x53, 0xf1, 0xd7, 0x70, 0xbc, 0xae, 0x5c, 0xf3, 0x92, 0x5c, 0xe3, 0x78, 0x6e, 0x37, 0xe8,
+	0xbb, 0xae, 0xed, 0x76, 0x2b, 0x9e, 0x8f, 0x83, 0xb1, 0x3d, 0x5e, 0x90, 0x8b, 0xf8, 0xa8, 0xdd,
+	0x3f, 0xad, 0x58, 0x7d, 0xb1, 0x40, 0xce, 0x5f, 0x9d, 0x9c, 0xc7, 0x3d, 0x9f, 0x86, 0x5a, 0x5c,
+	0x9f, 0x9c, 0xa4, 0x76, 0x0f, 0x13, 0x6a, 0xf6, 0x7c, 0xb1, 0x40, 0xdb, 0x81, 0xcb, 0x3a, 0xa6,
+	0xc1, 0xc5, 0x0e, 0x3b, 0xb0, 0x8e, 0xbf, 0xd3, 0xc7, 0x84, 0xa2, 0x6b, 0x00, 0x7e, 0xe0, 0x7d,
+	0x1b, 0x77, 0xa8, 0x61, 0x5b, 0x45, 0x65, 0x4d, 0x59, 0xcf, 0xeb, 0x79, 0x49, 0x39, 0xb4, 0xd0,
+	0x12, 0xa4, 0x6c, 0xab, 0x98, 0xe2, 0xe4, 0x94, 0x6d, 0x69, 0xbf, 0x52, 0x60, 0x45, 0xef, 0xbb,
+	0x5c, 0x44, 0x33, 0xb0, 0xbb, 0x5d, 0x1c, 0xcc, 0x28, 0xe9, 0x1a, 0x00, 0x15, 0x0c, 0xc6, 0x50,
+	0x62, 0x5e, 0x52, 0x0e, 0x2d, 0xb4, 0x0d, 0x19, 0xe2, 0xf5, 0x83, 0x0e, 0x2e, 0xa6, 0xd7, 0x94,
+	0xf5, 0xc2, 0xe6, 0xeb, 0xe5, 0x2f, 0x75, 0x56, 0x59, 0xc7, 0xbe, 0xd7, 0xe0, 0x0c, 0xba, 0x64,
+	0xd4, 0x0c, 0x58, 0x6c, 0x50, 0x2f, 0x30, 0xbb, 0x58, 0x4c, 0xa0, 0x15, 0xc8, 0xb4, 0xfb, 0x9d,
+	0x73, 0x4c, 0xa5, 0x36, 0x72, 0xc4, 0xe8, 0x5e, 0x9b, 0xa9, 0x25, 0xd5, 0x90, 0x23, 0xf4, 0x02,
+	0x40, 0x17, 0xbb, 0xd2, 0x27, 0x5c, 0x8f, 0xb4, 0x1e, 0xa1, 0x68, 0x7f, 0x57, 0x00, 0x46, 0xfb,
+	0xc6, 0x1d, 0xf8, 0x2a, 0xe4, 0x03, 0xec, 0x7b, 0x86, 0x6b, 0xf6, 0xb0, 0xdc, 0x28, 0xc7, 0x08,
+	0x75, 0xb3, 0x87, 0xd1, 0x8b, 0x50, 0x68, 0x07, 0xa6, 0xdb, 0x39, 0x13, 0xd3, 0x6c, 0xaf, 0xfc,
+	0xc1, 0x25, 0x1d, 0x04, 0x91, 0x2f, 0xb9, 0x0a, 0x39, 0x6a, 0x76, 0xc5, 0xfc, 0x9c, 0x9c, 0xcf,
+	0x52, 0xb3, 0xcb, 0x27, 0xaf, 0x03, 0x74, 0xbc, 0x5e, 0xcf, 0xa6, 0x06, 0x39, 0x33, 0x8b, 0xf3,
+	0x72, 0x3a, 0x2f, 0x68, 0x8d, 0x33, 0x13, 0xa9, 0x90, 0xb6, 0xec, 0xa0, 0x98, 0xe5, 0xfb, 0xb2,
+	0xc7, 0x1d, 0x80, 0x5c, 0x80, 0x07, 0x36, 0x61, 0x27, 0xf9, 0xab, 0x02, 0x19, 0x79, 0x8a, 0x16,
+	0x2c, 0x11, 0x61, 0x35, 0x43, 0x3a, 0x20, 0xc5, 0x1d, 0xf0, 0x46, 0x8c, 0x03, 0xc6, 0x4c, 0x7d,
+	0x70, 0x49, 0x5f, 0x24, 0x63, 0xb6, 0x3f, 0x82, 0x02, 0x3f, 0xfd, 0x13, 0x3a, 0x95, 0xd9, 0x22,
+	0x18, 0x8e, 0x76, 0x72, 0x61, 0x74, 0x68, 0x9f, 0x2b, 0x00, 0x2c, 0xfa, 0xe8, 0x61, 0xcf, 0xec,
+	0x62, 0x84, 0x60, 0x8e, 0x1b, 0x48, 0x58, 0x9f, 0x3f, 0x33, 0xf7, 0x5a, 0x76, 0x17, 0x13, 0x2a,
+	0xcc, 0xaa, 0xcb, 0x11, 0x3a, 0x80, 0x82, 0xdf, 0x27, 0x67, 0x06, 0xb5, 0x7b, 0xb6, 0xdb, 0xe5,
+	0x36, 0x2d, 0x6c, 0xbe, 0x16, 0xa3, 0x52, 0xd3, 0xee, 0xe1, 0x86, 0x6f, 0xba, 0x3a, 0x30, 0xde,
+	0x26, 0x67, 0xd5, 0xbe, 0x48, 0x43, 0x9e, 0xa7, 0x40, 0x83, 0x62, 0xff, 0x91, 0x3a, 0xa8, 0x90,
+	0xc6, 0xee, 0xa0, 0x98, 0x5a, 0x4b, 0x33, 0xf3, 0x63, 0x77, 0xc0, 0x56, 0x99, 0x41, 0x97, 0x14,
+	0xd3, 0x9c, 0xc4, 0x9f, 0x43, 0x27, 0xcd, 0x0d, 0x9d, 0x24, 0xf3, 0x6d, 0x3e, 0xcc, 0x37, 0xb4,
+	0x0a, 0xb9, 0xef, 0x9a, 0x36, 0x35, 0x4e, 0xbd, 0xa0, 0x98, 0xe1, 0x9c, 0x59, 0x36, 0xde, 0xf3,
+	0x02, 0x16, 0xad, 0xd8, 0xa5, 0xc1, 0x85, 0xef, 0xd9, 0x2e, 0x95, 0x8e, 0x8e, 0x50, 0x58, 0x78,
+	0x12, 0xdc, 0x09, 0x30, 0x35, 0x98, 0x26, 0x39, 0xce, 0x9c, 0x17, 0x94, 0x9a, 0x3b, 0x40, 0xf7,
+	0x20, 0x3b, 0xf0, 0x9c, 0x7e, 0x0f, 0x93, 0x62, 0x7e, 0x2d, 0xbd, 0x5e, 0xd8, 0x7c, 0x25, 0xc6,
+	0x12, 0x0f, 0xf9, 0x6a, 0x3d, 0xe4, 0x42, 0xf7, 0x20, 0x23, 0x2d, 0x09, 0xc9, 0x2c, 0x29, 0xd9,
+	0xd0, 0x2d, 0xc8, 0xb2, 0x12, 0xe5, 0xf5, 0x69, 0xb1, 0xc0, 0x25, 0xac, 0x86, 0x12, 0xc2, 0x12,
+	0x56, 0xde, 0x95, 0xf5, 0x4f, 0x0f, 0x57, 0xa2, 0x2a, 0x64, 0x08, 0x35, 0x69, 0x9f, 0x14, 0x17,
+	0xd6, 0x94, 0xf5, 0xa5, 0xcd, 0x9b, 0x31, 0xbb, 0x72, 0x37, 0x95, 0x1b, 0x9c, 0x45, 0x97, 0xac,
+	0xda, 0x5b, 0x90, 0x11, 0xa7, 0x79, 0xa4, 0xef, 0x10, 0xcc, 0xf9, 0x26, 0x3d, 0x93, 0x39, 0xcb,
+	0x9f, 0xb5, 0x7f, 0x28, 0x90, 0xd5, 0x31, 0xe9, 0x3b, 0x94, 0xb0, 0x52, 0x65, 0xb3, 0xe0, 0x23,
+	0xdc, 0xbd, 0xf1, 0x51, 0x3d, 0x0a, 0x57, 0x5d, 0x32, 0xa2, 0x1b, 0x70, 0x99, 0x4f, 0x1b, 0x84,
+	0x62, 0xdf, 0x90, 0xd2, 0x44, 0x64, 0x2c, 0xb7, 0xc3, 0xc0, 0x3a, 0x14, 0x6b, 0x6f, 0xc2, 0x65,
+	0x33, 0xa0, 0xf6, 0xa9, 0xd9, 0xa1, 0x46, 0xcf, 0x74, 0xed, 0x53, 0x16, 0xd9, 0x22, 0x64, 0xd4,
+	0x70, 0xe2, 0x58, 0xd2, 0xd1, 0x4b, 0xb0, 0xe8, 0xf6, 0x7b, 0x46, 0x48, 0x27, 0x3c, 0x94, 0xd2,
+	0xfa, 0x82, 0xdb, 0xef, 0x6d, 0x87, 0x34, 0x8d, 0xc2, 0x52, 0x38, 0x10, 0x67, 0x42, 0x25, 0xc8,
+	0x39, 0x5e, 0x47, 0xd4, 0x3d, 0x61, 0x8a, 0xe1, 0x18, 0xed, 0x41, 0xfe, 0xd4, 0x76, 0xb0, 0x71,
+	0x66, 0x92, 0xb3, 0x19, 0x4f, 0xbc, 0x67, 0x3b, 0xf8, 0xc0, 0x24, 0x67, 0x98, 0xe8, 0xb9, 0x53,
+	0xf9, 0xac, 0xfd, 0xab, 0x00, 0xf3, 0xdc, 0x1b, 0x32, 0xc8, 0x95, 0x61, 0x90, 0x8f, 0x17, 0x52,
+	0x75, 0xb2, 0x90, 0x8e, 0x5c, 0x9e, 0x7a, 0x62, 0x97, 0x33, 0xc3, 0x88, 0x27, 0xc3, 0xc2, 0xd4,
+	0xb4, 0x9d, 0x62, 0x91, 0x6f, 0xb3, 0x20, 0x88, 0xbb, 0x9c, 0x86, 0xde, 0x9f, 0xb8, 0x84, 0xe2,
+	0x52, 0x62, 0xfc, 0x02, 0x42, 0x1f, 0xc0, 0x3c, 0xf3, 0x27, 0x29, 0x16, 0xb8, 0x95, 0xd6, 0x67,
+	0xd1, 0x93, 0x39, 0x5a, 0x17, 0x6c, 0xe8, 0x3e, 0x64, 0x03, 0x11, 0x63, 0x32, 0xa5, 0x5e, 0x8d,
+	0xad, 0x97, 0x7c, 0xb5, 0x1e, 0xb2, 0xa1, 0x77, 0xa1, 0xd0, 0x09, 0xb0, 0x49, 0x31, 0x2b, 0x72,
+	0xb8, 0x98, 0xe1, 0x52, 0x4a, 0x53, 0x69, 0xd5, 0x0c, 0x91, 0x81, 0x0e, 0x62, 0x39, 0x23, 0xa0,
+	0x77, 0x00, 0x08, 0x35, 0x03, 0x2a, 0x78, 0xb3, 0xb1, 0xbc, 0x79, 0xbe, 0x9a, 0xb3, 0xbe, 0x0b,
+	0x85, 0x53, 0xdb, 0xb5, 0x45, 0x71, 0xc5, 0xc5, 0x5c, 0xfc, 0xbe, 0x62, 0x39, 0x67, 0x8e, 0xd4,
+	0x81, 0x85, 0x99, 0xeb, 0xc0, 0xca, 0x30, 0x09, 0x17, 0x79, 0xda, 0x84, 0x99, 0xb5, 0x07, 0xf9,
+	0x51, 0xf0, 0xbf, 0xc2, 0xc5, 0xc5, 0xf9, 0x61, 0x98, 0x18, 0xfa, 0x88, 0x15, 0x5d, 0x87, 0x82,
+	0xe3, 0x75, 0x89, 0x21, 0x01, 0xc4, 0x33, 0xa2, 0xbc, 0x32, 0xd2, 0x8e, 0x00, 0x11, 0xdf, 0x80,
+	0xcb, 0xc2, 0xed, 0x86, 0x1f, 0x78, 0x03, 0xec, 0x9a, 0x6e, 0x07, 0x17, 0x9f, 0xe5, 0x1b, 0x56,
+	0x66, 0x0a, 0x9b, 0x07, 0x43, 0x36, 0x5d, 0x25, 0x13, 0x14, 0xb4, 0x0e, 0xaa, 0x28, 0x10, 0x11,
+	0xcc, 0xb4, 0xc2, 0x75, 0x58, 0x6a, 0x47, 0xb0, 0xd7, 0xa1, 0x85, 0x6a, 0x90, 0xf5, 0x7c, 0x0e,
+	0x22, 0x8b, 0xcf, 0xf1, 0xdd, 0x67, 0x4a, 0x8f, 0x13, 0xc1, 0xa2, 0x87, 0xbc, 0xe8, 0x39, 0xc8,
+	0x3a, 0x5e, 0xd7, 0xe8, 0x07, 0x4e, 0x71, 0x55, 0xdc, 0x9a, 0x8e, 0xd7, 0x6d, 0x05, 0x0e, 0xfa,
+	0x26, 0x2c, 0x92, 0x7e, 0x9b, 0x50, 0x9b, 0xf6, 0xc5, 0x2e, 0xd7, 0x78, 0x70, 0xdf, 0x99, 0x2d,
+	0x09, 0xa3, 0x9c, 0x35, 0x76, 0x37, 0xe9, 0xe3, 0xd2, 0x58, 0xb1, 0xa5, 0x66, 0x97, 0x14, 0xaf,
+	0x8b, 0x6b, 0x91, 0x3d, 0xb3, 0xab, 0x49, 0xdc, 0x53, 0xa4, 0xb8, 0x36, 0xd3, 0xd5, 0xd4, 0xe0,
+	0xab, 0xf5, 0x90, 0x0b, 0x1d, 0x0c, 0xaf, 0xa6, 0x17, 0x39, 0xff, 0x5b, 0x33, 0x29, 0x2b, 0x2e,
+	0x77, 0xa1, 0xa5, 0xe4, 0x2f, 0xdd, 0x07, 0x34, 0x7d, 0x06, 0x76, 0x6f, 0x9f, 0xe3, 0x0b, 0x59,
+	0xc1, 0xd8, 0x23, 0xba, 0x02, 0xf3, 0x03, 0xd3, 0xe9, 0x87, 0x40, 0x4f, 0x0c, 0xb6, 0x52, 0x77,
+	0x95, 0x52, 0x1b, 0x0a, 0x11, 0xc1, 0x8f, 0x60, 0x7d, 0x3f, 0xca, 0x9a, 0xe0, 0x1a, 0x1d, 0xed,
+	0xa1, 0xfd, 0x00, 0x32, 0xa2, 0xdc, 0x21, 0x04, 0x4b, 0x8d, 0xe6, 0x76, 0xb3, 0xd5, 0x30, 0x5a,
+	0xf5, 0x0f, 0xeb, 0x27, 0x1f, 0xd5, 0xd5, 0x4b, 0x08, 0x20, 0xf3, 0xd5, 0x56, 0xad, 0x55, 0xdb,
+	0x55, 0x15, 0x54, 0x80, 0xec, 0x47, 0x27, 0xfa, 0x87, 0x87, 0xf5, 0x7d, 0x35, 0xc5, 0x06, 0x8d,
+	0x56, 0xb5, 0x5a, 0x6b, 0x34, 0xd4, 0x34, 0x1b, 0xec, 0x6d, 0x1f, 0x1e, 0xb5, 0xf4, 0x9a, 0x3a,
+	0xc7, 0xc4, 0x1c, 0xd6, 0x9b, 0x35, 0xbd, 0xbe, 0x7d, 0x64, 0xd4, 0x74, 0xfd, 0x44, 0x57, 0xe7,
+	0xd9, 0x82, 0xe6, 0xe1, 0x71, 0xed, 0xa4, 0xd5, 0x54, 0x33, 0x68, 0x11, 0xf2, 0xd5, 0xed, 0x7a,
+	0xb5, 0x76, 0x74, 0x54, 0xdb, 0x55, 0xb3, 0xda, 0x7f, 0x14, 0xc8, 0x0f, 0xd3, 0x28, 0x92, 0x9b,
+	0xca, 0x58, 0x6e, 0xea, 0x90, 0x15, 0x48, 0x9b, 0xc8, 0xb3, 0xde, 0x9d, 0x35, 0x33, 0x87, 0x4f,
+	0x27, 0x82, 0x5f, 0x0f, 0x05, 0x95, 0x7e, 0xa4, 0xc0, 0xf2, 0xc4, 0xe4, 0x97, 0xde, 0x66, 0x57,
+	0x60, 0x9e, 0x5d, 0xe8, 0x44, 0x42, 0x33, 0x31, 0x88, 0x60, 0x99, 0xf4, 0x13, 0x61, 0x19, 0xed,
+	0xfb, 0x90, 0x0b, 0x69, 0x13, 0x75, 0x54, 0x49, 0x52, 0x47, 0x6f, 0x43, 0x0e, 0xbb, 0x96, 0x60,
+	0x4c, 0xc5, 0x32, 0x66, 0xb1, 0x6b, 0xb1, 0x91, 0xd6, 0x84, 0x15, 0x99, 0xd5, 0xb2, 0x55, 0x39,
+	0xc6, 0xd4, 0xb4, 0x4c, 0x6a, 0xa2, 0x2d, 0x98, 0xe7, 0x4a, 0x4b, 0x35, 0x5e, 0x9e, 0x25, 0x11,
+	0x74, 0xc1, 0xa2, 0xfd, 0x2e, 0x0d, 0xea, 0x64, 0xa9, 0x42, 0x16, 0x3c, 0x17, 0x60, 0xe2, 0x39,
+	0x03, 0xcc, 0xc0, 0xcb, 0x58, 0xdf, 0x90, 0x4e, 0xde, 0x37, 0xe8, 0xcf, 0x86, 0xc2, 0xc6, 0x3b,
+	0xb7, 0xaf, 0xc3, 0x95, 0xe1, 0x2e, 0xd1, 0x36, 0x22, 0x93, 0xb4, 0x37, 0x44, 0xa1, 0x98, 0x48,
+	0xdf, 0xf6, 0x2d, 0x76, 0x59, 0x49, 0x40, 0x83, 0x49, 0x71, 0x8e, 0x97, 0x88, 0x7b, 0x09, 0x6b,
+	0x76, 0x04, 0xe3, 0x88, 0x8a, 0x01, 0xa7, 0x43, 0x42, 0xe9, 0x0c, 0x96, 0x27, 0xa6, 0x1f, 0x91,
+	0xf7, 0xf7, 0xc6, 0xf3, 0x3e, 0x01, 0xa6, 0x8a, 0x64, 0x7e, 0x1d, 0x60, 0x34, 0x81, 0xee, 0x47,
+	0xa1, 0x9a, 0xc2, 0xcf, 0xf5, 0x52, 0x8c, 0x58, 0xc6, 0x19, 0x01, 0x69, 0x3f, 0x55, 0x60, 0x8e,
+	0x3d, 0xa0, 0xfb, 0x30, 0x47, 0x2f, 0x7c, 0x11, 0xbe, 0x4b, 0xb1, 0x4e, 0x65, 0x2c, 0xfc, 0x4f,
+	0xf3, 0xc2, 0xc7, 0x3a, 0xe7, 0x1c, 0x2f, 0x89, 0x0b, 0x52, 0x69, 0xed, 0x75, 0xc8, 0x85, 0xeb,
+	0x50, 0x0e, 0xe6, 0xea, 0x27, 0xf5, 0x9a, 0x28, 0x51, 0x8d, 0x83, 0xed, 0xcd, 0xdb, 0x6f, 0xab,
+	0x0a, 0xca, 0x42, 0xfa, 0x78, 0xf7, 0xb6, 0x9a, 0xd2, 0xbe, 0x60, 0x4d, 0x2a, 0xaf, 0xe8, 0x68,
+	0x0d, 0x16, 0xce, 0x7b, 0xc4, 0x38, 0xc7, 0x17, 0x46, 0x04, 0xae, 0xc3, 0x79, 0x8f, 0x7c, 0x88,
+	0x2f, 0x78, 0x43, 0xdc, 0x18, 0xeb, 0x76, 0xd2, 0xfc, 0xec, 0x5f, 0x99, 0xe9, 0xda, 0x90, 0xff,
+	0x6a, 0xee, 0x40, 0x38, 0x72, 0xd4, 0x23, 0x95, 0xde, 0x83, 0xa5, 0xf1, 0xc9, 0xb8, 0xca, 0xbf,
+	0x10, 0xf5, 0x8d, 0x07, 0xa8, 0xca, 0xd1, 0x55, 0x92, 0x17, 0x2e, 0xc3, 0x84, 0x4d, 0x25, 0x4f,
+	0xd8, 0xfb, 0xb0, 0xbc, 0x8f, 0xe9, 0xd3, 0xbc, 0xde, 0xf9, 0x89, 0x02, 0x97, 0x8f, 0x6c, 0x22,
+	0x64, 0x90, 0x19, 0x85, 0x5c, 0x85, 0xbc, 0xcf, 0xcb, 0x80, 0xfd, 0x89, 0xb0, 0xc2, 0xbc, 0x9e,
+	0x63, 0x84, 0x86, 0xfd, 0x89, 0x78, 0x49, 0xc2, 0x26, 0xa9, 0x77, 0x8e, 0x5d, 0xd9, 0x90, 0xf3,
+	0xe5, 0x4d, 0x46, 0x60, 0x57, 0xc5, 0xa9, 0xed, 0x50, 0x1c, 0x70, 0xcc, 0x98, 0xd7, 0xe5, 0x48,
+	0xfb, 0x04, 0x50, 0x54, 0x0f, 0xe2, 0x7b, 0x2e, 0xc1, 0xe8, 0x3d, 0xc8, 0xf0, 0x93, 0x12, 0x19,
+	0xdc, 0xb3, 0x59, 0x47, 0xf2, 0xa0, 0x57, 0x61, 0xd9, 0xc5, 0xdf, 0xa3, 0x46, 0x44, 0x1f, 0x71,
+	0xf2, 0x45, 0x46, 0x7e, 0x10, 0xea, 0xa4, 0x55, 0x01, 0x55, 0x59, 0x8a, 0x3b, 0x4f, 0x63, 0xc9,
+	0x1f, 0xcf, 0xc1, 0x42, 0xf4, 0x2d, 0xd9, 0x54, 0xd3, 0xb3, 0x06, 0x05, 0x0b, 0x93, 0x4e, 0x60,
+	0x73, 0x00, 0xc6, 0x01, 0x7f, 0x5e, 0x8f, 0x92, 0x50, 0x13, 0xd4, 0x10, 0xfd, 0x51, 0xdc, 0xf3,
+	0x1d, 0x93, 0x86, 0xa8, 0x3c, 0x41, 0x01, 0x5c, 0x96, 0x22, 0x9a, 0x52, 0x02, 0x7a, 0x2f, 0x0c,
+	0xb0, 0xb9, 0xd9, 0x03, 0xec, 0xe0, 0x92, 0x0c, 0x31, 0xf4, 0x3c, 0xf0, 0x5a, 0xc1, 0x93, 0x30,
+	0x27, 0xdf, 0x3a, 0x0d, 0x29, 0x93, 0xed, 0xc7, 0x7c, 0xa2, 0xf6, 0xa3, 0x04, 0x39, 0xcb, 0x26,
+	0x66, 0xdb, 0xc1, 0x56, 0x31, 0xbf, 0xa6, 0xac, 0xe7, 0xf4, 0xe1, 0x18, 0x59, 0x93, 0x20, 0x54,
+	0x74, 0x58, 0x1f, 0xcc, 0xa2, 0xbc, 0x74, 0x40, 0x3c, 0x16, 0x7d, 0x7a, 0xb0, 0xb7, 0xa3, 0xc2,
+	0x92, 0x84, 0xed, 0xd2, 0xdc, 0xda, 0x0f, 0x15, 0x58, 0x8d, 0x54, 0x81, 0x64, 0xef, 0x4c, 0x6b,
+	0x90, 0x95, 0xee, 0x93, 0xe5, 0xe0, 0x66, 0x82, 0x03, 0xeb, 0x21, 0xaf, 0xf6, 0x10, 0x56, 0xc2,
+	0xba, 0xf0, 0xbf, 0x7c, 0x67, 0xab, 0xbd, 0x03, 0xc5, 0x61, 0x92, 0x4a, 0xc1, 0x33, 0xd6, 0x0c,
+	0xcd, 0x82, 0xd5, 0x47, 0xb0, 0xca, 0x34, 0xdf, 0x87, 0x9c, 0xdc, 0x24, 0x4c, 0xf4, 0x44, 0xe7,
+	0x1e, 0x32, 0x6b, 0x5f, 0x83, 0xd5, 0x5d, 0xec, 0xe0, 0x27, 0xb2, 0x7d, 0xcc, 0xd9, 0x7f, 0xab,
+	0xc0, 0x6a, 0xcb, 0xb7, 0xcc, 0xff, 0x83, 0xec, 0xa8, 0xdb, 0xd3, 0x4f, 0xe1, 0xf6, 0xbf, 0x65,
+	0x64, 0x09, 0x92, 0xcd, 0x1e, 0x6a, 0xc3, 0xca, 0x54, 0xcb, 0x3a, 0xc2, 0x0a, 0x49, 0x6f, 0xf9,
+	0x2b, 0x93, 0x4d, 0x2b, 0xc7, 0x0d, 0x3e, 0xc3, 0x87, 0xdc, 0x08, 0xd8, 0x32, 0x06, 0x38, 0xb0,
+	0x4f, 0x2f, 0x0c, 0xd1, 0x63, 0xca, 0xb7, 0x37, 0x77, 0x13, 0xb4, 0xa7, 0xe5, 0x87, 0x5c, 0x80,
+	0x18, 0x31, 0xac, 0x28, 0x05, 0x47, 0xc9, 0xe8, 0x63, 0x58, 0xe8, 0x99, 0x9d, 0x33, 0xdb, 0xc5,
+	0x06, 0x47, 0x2c, 0x69, 0xbe, 0xcd, 0x9d, 0x24, 0xdb, 0x1c, 0x0b, 0x7e, 0x7e, 0xac, 0x42, 0x6f,
+	0x34, 0x60, 0xb8, 0xc3, 0xb2, 0xc9, 0x39, 0xbf, 0xda, 0x8c, 0x6e, 0x9b, 0xe3, 0xcf, 0xb4, 0x0e,
+	0x8c, 0xc6, 0x6e, 0xb7, 0xfd, 0x36, 0xf2, 0xe0, 0x99, 0x68, 0x11, 0x09, 0xcf, 0x3a, 0xc7, 0x95,
+	0xf8, 0x20, 0x89, 0x12, 0xd1, 0xd2, 0x23, 0x4f, 0x8c, 0xc8, 0x14, 0x0d, 0xf9, 0x70, 0x85, 0x35,
+	0xea, 0x84, 0x06, 0xd8, 0x64, 0xad, 0x47, 0xb8, 0xe3, 0x7c, 0xf2, 0x1d, 0x8f, 0xbc, 0x6e, 0x23,
+	0x14, 0x13, 0xee, 0xe8, 0x4c, 0xd1, 0xb4, 0x32, 0x2c, 0x8c, 0x19, 0x5c, 0x85, 0x85, 0xfa, 0x49,
+	0xd3, 0x78, 0x58, 0xd3, 0x0f, 0xf7, 0x0e, 0x6b, 0xbb, 0xea, 0x25, 0xb4, 0x00, 0xb9, 0xe1, 0x48,
+	0xd1, 0xaa, 0x50, 0x88, 0x18, 0x14, 0x2d, 0x43, 0xa1, 0x55, 0x6f, 0x3c, 0xa8, 0x55, 0xc3, 0xd5,
+	0x8c, 0x7f, 0xc3, 0x38, 0x38, 0xdc, 0x3f, 0xa8, 0x3e, 0x68, 0x19, 0x77, 0x55, 0x05, 0x5d, 0x86,
+	0xc5, 0x08, 0xe5, 0xd6, 0xa6, 0x9a, 0xd2, 0x6e, 0x8f, 0xd7, 0x62, 0xb9, 0xf5, 0x12, 0xc0, 0x71,
+	0xab, 0xd1, 0x34, 0x8e, 0xb7, 0x9b, 0xd5, 0x03, 0xf5, 0x12, 0x93, 0xbd, 0x7d, 0x74, 0x74, 0xf2,
+	0x91, 0x71, 0x74, 0x72, 0xd2, 0xa8, 0xa9, 0x8a, 0xb6, 0x0f, 0x68, 0xfa, 0x54, 0xa2, 0x2b, 0xd6,
+	0x6b, 0xdb, 0xc7, 0xc6, 0x6e, 0x6d, 0x6f, 0xbb, 0x75, 0xd4, 0x54, 0x2f, 0xb1, 0x0e, 0x56, 0xd2,
+	0x4e, 0xea, 0xaa, 0xc2, 0x24, 0x87, 0xc3, 0xbd, 0x3d, 0x35, 0xb5, 0xf9, 0x97, 0x25, 0x80, 0x2a,
+	0x33, 0x9d, 0x78, 0x65, 0xf9, 0x73, 0x05, 0x0a, 0x91, 0x32, 0x8e, 0x36, 0x62, 0xec, 0x3c, 0x0d,
+	0xfc, 0x4a, 0xd7, 0x42, 0x96, 0xc8, 0x27, 0xc0, 0xf2, 0xb0, 0x63, 0xd3, 0x2a, 0x9f, 0xff, 0xf3,
+	0xdf, 0xbf, 0x48, 0xbd, 0xae, 0xad, 0x55, 0x06, 0x1b, 0x15, 0x59, 0x2a, 0x48, 0xe5, 0xd3, 0x51,
+	0x19, 0xf9, 0xac, 0x22, 0x70, 0xcc, 0x96, 0xbc, 0x8a, 0x7f, 0xa6, 0x40, 0x2e, 0x2c, 0xeb, 0xa8,
+	0x1c, 0xa3, 0xcf, 0x04, 0x2e, 0x2c, 0xcd, 0x74, 0xed, 0x6b, 0x6f, 0x72, 0x9d, 0x5e, 0x43, 0xaf,
+	0xc4, 0xe9, 0x54, 0xf9, 0xd4, 0xb6, 0x3e, 0x43, 0xbf, 0x56, 0x00, 0x46, 0xa8, 0x0d, 0xc5, 0xbd,
+	0x75, 0x99, 0x02, 0x9a, 0xa5, 0x8d, 0x04, 0x1c, 0xe2, 0xae, 0xd0, 0xd6, 0xb9, 0x8a, 0x1a, 0x8a,
+	0x35, 0x1b, 0xfa, 0x0d, 0x73, 0xe1, 0x08, 0xd7, 0xc5, 0xbb, 0x70, 0x0a, 0x03, 0xce, 0x68, 0xb5,
+	0x3b, 0x5c, 0xa5, 0x0d, 0xed, 0x8d, 0x99, 0xac, 0xb6, 0xd5, 0xe1, 0xfb, 0x6c, 0x29, 0x37, 0xd0,
+	0x2f, 0xf9, 0xf7, 0xc5, 0xf0, 0x0b, 0x6d, 0xac, 0xfd, 0xa6, 0x3e, 0xe6, 0xc6, 0x85, 0xd8, 0xdb,
+	0x5c, 0xb1, 0xb7, 0xb4, 0x9b, 0xb3, 0x29, 0x16, 0x30, 0xf9, 0x4c, 0xaf, 0x3f, 0x29, 0x63, 0x9d,
+	0x4c, 0x88, 0x68, 0xef, 0xce, 0x9e, 0x03, 0xe3, 0xd7, 0x63, 0x29, 0xc9, 0x7d, 0xa6, 0xdd, 0xe2,
+	0x5a, 0xbf, 0xa9, 0x69, 0x8f, 0xd7, 0x3a, 0xbc, 0xf0, 0xb7, 0xc2, 0xbb, 0x0f, 0xfd, 0x51, 0x19,
+	0xf5, 0x42, 0xa1, 0xbe, 0xb7, 0x67, 0xcc, 0x91, 0xa7, 0x51, 0x56, 0xfa, 0x1e, 0x55, 0xe2, 0x95,
+	0xad, 0x7c, 0x3a, 0xc2, 0x00, 0x9f, 0xa1, 0x3f, 0x47, 0x3b, 0xaf, 0x10, 0x11, 0xa1, 0x3b, 0xb3,
+	0x26, 0xc4, 0x04, 0xfc, 0x2a, 0xdd, 0x4d, 0xce, 0x28, 0x13, 0xea, 0x06, 0x3f, 0xc1, 0xcb, 0x68,
+	0x06, 0x73, 0xb3, 0x94, 0x42, 0xd3, 0x00, 0x2b, 0x36, 0x30, 0x1e, 0x8b, 0xc9, 0x4a, 0x2b, 0x53,
+	0xbd, 0x42, 0xad, 0xe7, 0xd3, 0x8b, 0xd0, 0xac, 0x37, 0x12, 0x9b, 0xf5, 0x0b, 0x05, 0xd0, 0x34,
+	0x4c, 0x8b, 0xd5, 0xf0, 0xb1, 0xc8, 0x2e, 0x59, 0x34, 0xdc, 0xe7, 0x6a, 0x6f, 0x6d, 0x26, 0x55,
+	0x7b, 0x14, 0xc7, 0x7f, 0x50, 0x60, 0x79, 0xe2, 0xf7, 0x16, 0xb1, 0x71, 0xfc, 0xe8, 0xdf, 0x67,
+	0xc4, 0x15, 0x87, 0x2a, 0xd7, 0xf5, 0x7d, 0xed, 0x56, 0x52, 0x5d, 0x83, 0xbe, 0xbb, 0x25, 0xbf,
+	0x80, 0xed, 0x9c, 0x43, 0xb1, 0xe3, 0xf5, 0xc2, 0x8d, 0xc6, 0xd4, 0x7a, 0xa0, 0x7c, 0xbc, 0x2f,
+	0xe9, 0x5d, 0xcf, 0x31, 0xdd, 0x6e, 0xd9, 0x0b, 0xba, 0x95, 0x2e, 0x76, 0xb9, 0xab, 0x2b, 0x62,
+	0xca, 0xf4, 0x6d, 0xf2, 0x98, 0x9f, 0xf3, 0xbc, 0x3b, 0x1a, 0xfd, 0x3e, 0x95, 0xde, 0xaf, 0xee,
+	0xb4, 0x33, 0x9c, 0xf3, 0xd6, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x25, 0xf1, 0x0e, 0xc9, 0x07,
+	0x24, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/controller.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/controller.pb.go
index 558f6fb4..bd511e1e 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/controller.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/controller.pb.go
@@ -1,45 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/controller.proto
 
-/*
-Package clouddebugger is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/clouddebugger/v2/controller.proto
-	google/devtools/clouddebugger/v2/data.proto
-	google/devtools/clouddebugger/v2/debugger.proto
-
-It has these top-level messages:
-	RegisterDebuggeeRequest
-	RegisterDebuggeeResponse
-	ListActiveBreakpointsRequest
-	ListActiveBreakpointsResponse
-	UpdateActiveBreakpointRequest
-	UpdateActiveBreakpointResponse
-	FormatMessage
-	StatusMessage
-	SourceLocation
-	Variable
-	StackFrame
-	Breakpoint
-	Debuggee
-	SetBreakpointRequest
-	SetBreakpointResponse
-	GetBreakpointRequest
-	GetBreakpointResponse
-	DeleteBreakpointRequest
-	ListBreakpointsRequest
-	ListBreakpointsResponse
-	ListDebuggeesRequest
-	ListDebuggeesResponse
-*/
-package clouddebugger
+package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "github.com/golang/protobuf/ptypes/empty"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
 
 import (
 	context "golang.org/x/net/context"
@@ -62,13 +30,35 @@ type RegisterDebuggeeRequest struct {
 	// Debuggee information to register.
 	// The fields `project`, `uniquifier`, `description` and `agent_version`
 	// of the debuggee must be set.
-	Debuggee *Debuggee `protobuf:"bytes,1,opt,name=debuggee" json:"debuggee,omitempty"`
+	Debuggee             *Debuggee `protobuf:"bytes,1,opt,name=debuggee,proto3" json:"debuggee,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *RegisterDebuggeeRequest) Reset()         { *m = RegisterDebuggeeRequest{} }
+func (m *RegisterDebuggeeRequest) String() string { return proto.CompactTextString(m) }
+func (*RegisterDebuggeeRequest) ProtoMessage()    {}
+func (*RegisterDebuggeeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_controller_ba9f5f8b4f070828, []int{0}
+}
+func (m *RegisterDebuggeeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RegisterDebuggeeRequest.Unmarshal(m, b)
+}
+func (m *RegisterDebuggeeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RegisterDebuggeeRequest.Marshal(b, m, deterministic)
+}
+func (dst *RegisterDebuggeeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegisterDebuggeeRequest.Merge(dst, src)
+}
+func (m *RegisterDebuggeeRequest) XXX_Size() int {
+	return xxx_messageInfo_RegisterDebuggeeRequest.Size(m)
+}
+func (m *RegisterDebuggeeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RegisterDebuggeeRequest.DiscardUnknown(m)
 }
 
-func (m *RegisterDebuggeeRequest) Reset()                    { *m = RegisterDebuggeeRequest{} }
-func (m *RegisterDebuggeeRequest) String() string            { return proto.CompactTextString(m) }
-func (*RegisterDebuggeeRequest) ProtoMessage()               {}
-func (*RegisterDebuggeeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_RegisterDebuggeeRequest proto.InternalMessageInfo
 
 func (m *RegisterDebuggeeRequest) GetDebuggee() *Debuggee {
 	if m != nil {
@@ -84,13 +74,35 @@ type RegisterDebuggeeResponse struct {
 	// If the field `is_disabled` is set to `true`, the agent should disable
 	// itself by removing all breakpoints and detaching from the application.
 	// It should however continue to poll `RegisterDebuggee` until reenabled.
-	Debuggee *Debuggee `protobuf:"bytes,1,opt,name=debuggee" json:"debuggee,omitempty"`
+	Debuggee             *Debuggee `protobuf:"bytes,1,opt,name=debuggee,proto3" json:"debuggee,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *RegisterDebuggeeResponse) Reset()         { *m = RegisterDebuggeeResponse{} }
+func (m *RegisterDebuggeeResponse) String() string { return proto.CompactTextString(m) }
+func (*RegisterDebuggeeResponse) ProtoMessage()    {}
+func (*RegisterDebuggeeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_controller_ba9f5f8b4f070828, []int{1}
+}
+func (m *RegisterDebuggeeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RegisterDebuggeeResponse.Unmarshal(m, b)
+}
+func (m *RegisterDebuggeeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RegisterDebuggeeResponse.Marshal(b, m, deterministic)
+}
+func (dst *RegisterDebuggeeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RegisterDebuggeeResponse.Merge(dst, src)
+}
+func (m *RegisterDebuggeeResponse) XXX_Size() int {
+	return xxx_messageInfo_RegisterDebuggeeResponse.Size(m)
+}
+func (m *RegisterDebuggeeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RegisterDebuggeeResponse.DiscardUnknown(m)
 }
 
-func (m *RegisterDebuggeeResponse) Reset()                    { *m = RegisterDebuggeeResponse{} }
-func (m *RegisterDebuggeeResponse) String() string            { return proto.CompactTextString(m) }
-func (*RegisterDebuggeeResponse) ProtoMessage()               {}
-func (*RegisterDebuggeeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_RegisterDebuggeeResponse proto.InternalMessageInfo
 
 func (m *RegisterDebuggeeResponse) GetDebuggee() *Debuggee {
 	if m != nil {
@@ -102,25 +114,47 @@ func (m *RegisterDebuggeeResponse) GetDebuggee() *Debuggee {
 // Request to list active breakpoints.
 type ListActiveBreakpointsRequest struct {
 	// Identifies the debuggee.
-	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId" json:"debuggee_id,omitempty"`
+	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId,proto3" json:"debuggee_id,omitempty"`
 	// A token that, if specified, blocks the method call until the list
 	// of active breakpoints has changed, or a server-selected timeout has
 	// expired. The value should be set from the `next_wait_token` field in
 	// the last response. The initial value should be set to `"init"`.
-	WaitToken string `protobuf:"bytes,2,opt,name=wait_token,json=waitToken" json:"wait_token,omitempty"`
+	WaitToken string `protobuf:"bytes,2,opt,name=wait_token,json=waitToken,proto3" json:"wait_token,omitempty"`
 	// If set to `true` (recommended), returns `google.rpc.Code.OK` status and
 	// sets the `wait_expired` response field to `true` when the server-selected
 	// timeout has expired.
 	//
 	// If set to `false` (deprecated), returns `google.rpc.Code.ABORTED` status
 	// when the server-selected timeout has expired.
-	SuccessOnTimeout bool `protobuf:"varint,3,opt,name=success_on_timeout,json=successOnTimeout" json:"success_on_timeout,omitempty"`
+	SuccessOnTimeout     bool     `protobuf:"varint,3,opt,name=success_on_timeout,json=successOnTimeout,proto3" json:"success_on_timeout,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListActiveBreakpointsRequest) Reset()         { *m = ListActiveBreakpointsRequest{} }
+func (m *ListActiveBreakpointsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListActiveBreakpointsRequest) ProtoMessage()    {}
+func (*ListActiveBreakpointsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_controller_ba9f5f8b4f070828, []int{2}
+}
+func (m *ListActiveBreakpointsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListActiveBreakpointsRequest.Unmarshal(m, b)
+}
+func (m *ListActiveBreakpointsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListActiveBreakpointsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListActiveBreakpointsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActiveBreakpointsRequest.Merge(dst, src)
+}
+func (m *ListActiveBreakpointsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListActiveBreakpointsRequest.Size(m)
+}
+func (m *ListActiveBreakpointsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListActiveBreakpointsRequest.DiscardUnknown(m)
 }
 
-func (m *ListActiveBreakpointsRequest) Reset()                    { *m = ListActiveBreakpointsRequest{} }
-func (m *ListActiveBreakpointsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListActiveBreakpointsRequest) ProtoMessage()               {}
-func (*ListActiveBreakpointsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_ListActiveBreakpointsRequest proto.InternalMessageInfo
 
 func (m *ListActiveBreakpointsRequest) GetDebuggeeId() string {
 	if m != nil {
@@ -147,20 +181,42 @@ func (m *ListActiveBreakpointsRequest) GetSuccessOnTimeout() bool {
 type ListActiveBreakpointsResponse struct {
 	// List of all active breakpoints.
 	// The fields `id` and `location` are guaranteed to be set on each breakpoint.
-	Breakpoints []*Breakpoint `protobuf:"bytes,1,rep,name=breakpoints" json:"breakpoints,omitempty"`
+	Breakpoints []*Breakpoint `protobuf:"bytes,1,rep,name=breakpoints,proto3" json:"breakpoints,omitempty"`
 	// A token that can be used in the next method call to block until
 	// the list of breakpoints changes.
-	NextWaitToken string `protobuf:"bytes,2,opt,name=next_wait_token,json=nextWaitToken" json:"next_wait_token,omitempty"`
+	NextWaitToken string `protobuf:"bytes,2,opt,name=next_wait_token,json=nextWaitToken,proto3" json:"next_wait_token,omitempty"`
 	// If set to `true`, indicates that there is no change to the
 	// list of active breakpoints and the server-selected timeout has expired.
 	// The `breakpoints` field would be empty and should be ignored.
-	WaitExpired bool `protobuf:"varint,3,opt,name=wait_expired,json=waitExpired" json:"wait_expired,omitempty"`
+	WaitExpired          bool     `protobuf:"varint,3,opt,name=wait_expired,json=waitExpired,proto3" json:"wait_expired,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListActiveBreakpointsResponse) Reset()         { *m = ListActiveBreakpointsResponse{} }
+func (m *ListActiveBreakpointsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListActiveBreakpointsResponse) ProtoMessage()    {}
+func (*ListActiveBreakpointsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_controller_ba9f5f8b4f070828, []int{3}
+}
+func (m *ListActiveBreakpointsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListActiveBreakpointsResponse.Unmarshal(m, b)
+}
+func (m *ListActiveBreakpointsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListActiveBreakpointsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListActiveBreakpointsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActiveBreakpointsResponse.Merge(dst, src)
+}
+func (m *ListActiveBreakpointsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListActiveBreakpointsResponse.Size(m)
+}
+func (m *ListActiveBreakpointsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListActiveBreakpointsResponse.DiscardUnknown(m)
 }
 
-func (m *ListActiveBreakpointsResponse) Reset()                    { *m = ListActiveBreakpointsResponse{} }
-func (m *ListActiveBreakpointsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListActiveBreakpointsResponse) ProtoMessage()               {}
-func (*ListActiveBreakpointsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_ListActiveBreakpointsResponse proto.InternalMessageInfo
 
 func (m *ListActiveBreakpointsResponse) GetBreakpoints() []*Breakpoint {
 	if m != nil {
@@ -186,17 +242,39 @@ func (m *ListActiveBreakpointsResponse) GetWaitExpired() bool {
 // Request to update an active breakpoint.
 type UpdateActiveBreakpointRequest struct {
 	// Identifies the debuggee being debugged.
-	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId" json:"debuggee_id,omitempty"`
+	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId,proto3" json:"debuggee_id,omitempty"`
 	// Updated breakpoint information.
 	// The field `id` must be set.
 	// The agent must echo all Breakpoint specification fields in the update.
-	Breakpoint *Breakpoint `protobuf:"bytes,2,opt,name=breakpoint" json:"breakpoint,omitempty"`
+	Breakpoint           *Breakpoint `protobuf:"bytes,2,opt,name=breakpoint,proto3" json:"breakpoint,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *UpdateActiveBreakpointRequest) Reset()         { *m = UpdateActiveBreakpointRequest{} }
+func (m *UpdateActiveBreakpointRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateActiveBreakpointRequest) ProtoMessage()    {}
+func (*UpdateActiveBreakpointRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_controller_ba9f5f8b4f070828, []int{4}
+}
+func (m *UpdateActiveBreakpointRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateActiveBreakpointRequest.Unmarshal(m, b)
+}
+func (m *UpdateActiveBreakpointRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateActiveBreakpointRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateActiveBreakpointRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateActiveBreakpointRequest.Merge(dst, src)
+}
+func (m *UpdateActiveBreakpointRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateActiveBreakpointRequest.Size(m)
+}
+func (m *UpdateActiveBreakpointRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateActiveBreakpointRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateActiveBreakpointRequest) Reset()                    { *m = UpdateActiveBreakpointRequest{} }
-func (m *UpdateActiveBreakpointRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateActiveBreakpointRequest) ProtoMessage()               {}
-func (*UpdateActiveBreakpointRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_UpdateActiveBreakpointRequest proto.InternalMessageInfo
 
 func (m *UpdateActiveBreakpointRequest) GetDebuggeeId() string {
 	if m != nil {
@@ -215,12 +293,34 @@ func (m *UpdateActiveBreakpointRequest) GetBreakpoint() *Breakpoint {
 // Response for updating an active breakpoint.
 // The message is defined to allow future extensions.
 type UpdateActiveBreakpointResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateActiveBreakpointResponse) Reset()         { *m = UpdateActiveBreakpointResponse{} }
+func (m *UpdateActiveBreakpointResponse) String() string { return proto.CompactTextString(m) }
+func (*UpdateActiveBreakpointResponse) ProtoMessage()    {}
+func (*UpdateActiveBreakpointResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_controller_ba9f5f8b4f070828, []int{5}
+}
+func (m *UpdateActiveBreakpointResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateActiveBreakpointResponse.Unmarshal(m, b)
+}
+func (m *UpdateActiveBreakpointResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateActiveBreakpointResponse.Marshal(b, m, deterministic)
+}
+func (dst *UpdateActiveBreakpointResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateActiveBreakpointResponse.Merge(dst, src)
+}
+func (m *UpdateActiveBreakpointResponse) XXX_Size() int {
+	return xxx_messageInfo_UpdateActiveBreakpointResponse.Size(m)
+}
+func (m *UpdateActiveBreakpointResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateActiveBreakpointResponse.DiscardUnknown(m)
 }
 
-func (m *UpdateActiveBreakpointResponse) Reset()                    { *m = UpdateActiveBreakpointResponse{} }
-func (m *UpdateActiveBreakpointResponse) String() string            { return proto.CompactTextString(m) }
-func (*UpdateActiveBreakpointResponse) ProtoMessage()               {}
-func (*UpdateActiveBreakpointResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_UpdateActiveBreakpointResponse proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*RegisterDebuggeeRequest)(nil), "google.devtools.clouddebugger.v2.RegisterDebuggeeRequest")
@@ -239,8 +339,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Controller2 service
-
+// Controller2Client is the client API for Controller2 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type Controller2Client interface {
 	// Registers the debuggee with the controller service.
 	//
@@ -288,7 +389,7 @@ func NewController2Client(cc *grpc.ClientConn) Controller2Client {
 
 func (c *controller2Client) RegisterDebuggee(ctx context.Context, in *RegisterDebuggeeRequest, opts ...grpc.CallOption) (*RegisterDebuggeeResponse, error) {
 	out := new(RegisterDebuggeeResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Controller2/RegisterDebuggee", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Controller2/RegisterDebuggee", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -297,7 +398,7 @@ func (c *controller2Client) RegisterDebuggee(ctx context.Context, in *RegisterDe
 
 func (c *controller2Client) ListActiveBreakpoints(ctx context.Context, in *ListActiveBreakpointsRequest, opts ...grpc.CallOption) (*ListActiveBreakpointsResponse, error) {
 	out := new(ListActiveBreakpointsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Controller2/ListActiveBreakpoints", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Controller2/ListActiveBreakpoints", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -306,15 +407,14 @@ func (c *controller2Client) ListActiveBreakpoints(ctx context.Context, in *ListA
 
 func (c *controller2Client) UpdateActiveBreakpoint(ctx context.Context, in *UpdateActiveBreakpointRequest, opts ...grpc.CallOption) (*UpdateActiveBreakpointResponse, error) {
 	out := new(UpdateActiveBreakpointResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Controller2/UpdateActiveBreakpoint", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Controller2/UpdateActiveBreakpoint", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Controller2 service
-
+// Controller2Server is the server API for Controller2 service.
 type Controller2Server interface {
 	// Registers the debuggee with the controller service.
 	//
@@ -431,9 +531,11 @@ var _Controller2_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/clouddebugger/v2/controller.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/clouddebugger/v2/controller.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/devtools/clouddebugger/v2/controller.proto", fileDescriptor_controller_ba9f5f8b4f070828)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_controller_ba9f5f8b4f070828 = []byte{
 	// 602 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdd, 0x6a, 0xd4, 0x40,
 	0x14, 0x66, 0x5a, 0x94, 0x76, 0xa2, 0xb4, 0x0c, 0xa8, 0x21, 0xb6, 0xba, 0x0d, 0x52, 0x96, 0x75,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/data.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/data.pb.go
index b280628d..3942ff69 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/data.pb.go
@@ -1,21 +1,27 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/data.proto
 
-package clouddebugger
+package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_devtools_source_v1 "google.golang.org/genproto/googleapis/devtools/source/v1"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/wrappers"
+import v1 "google.golang.org/genproto/googleapis/devtools/source/v1"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Enumerates references to which the message applies.
 type StatusMessage_Reference int32
 
@@ -58,7 +64,9 @@ var StatusMessage_Reference_value = map[string]int32{
 func (x StatusMessage_Reference) String() string {
 	return proto.EnumName(StatusMessage_Reference_name, int32(x))
 }
-func (StatusMessage_Reference) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} }
+func (StatusMessage_Reference) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{1, 0}
+}
 
 // Actions that can be taken when a breakpoint hits.
 // Agents should reject breakpoints with unsupported or unknown action values.
@@ -86,7 +94,9 @@ var Breakpoint_Action_value = map[string]int32{
 func (x Breakpoint_Action) String() string {
 	return proto.EnumName(Breakpoint_Action_name, int32(x))
 }
-func (Breakpoint_Action) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{5, 0} }
+func (Breakpoint_Action) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{5, 0}
+}
 
 // Log severity levels.
 type Breakpoint_LogLevel int32
@@ -114,7 +124,9 @@ var Breakpoint_LogLevel_value = map[string]int32{
 func (x Breakpoint_LogLevel) String() string {
 	return proto.EnumName(Breakpoint_LogLevel_name, int32(x))
 }
-func (Breakpoint_LogLevel) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{5, 1} }
+func (Breakpoint_LogLevel) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{5, 1}
+}
 
 // Represents a message with parameters.
 type FormatMessage struct {
@@ -127,15 +139,37 @@ type FormatMessage struct {
 	// *   `Failed to load '$0' which helps debug $1 the first time it
 	//     is loaded.  Again, $0 is very important.`
 	// *   `Please pay $$10 to use $0 instead of $1.`
-	Format string `protobuf:"bytes,1,opt,name=format" json:"format,omitempty"`
+	Format string `protobuf:"bytes,1,opt,name=format,proto3" json:"format,omitempty"`
 	// Optional parameters to be embedded into the message.
-	Parameters []string `protobuf:"bytes,2,rep,name=parameters" json:"parameters,omitempty"`
+	Parameters           []string `protobuf:"bytes,2,rep,name=parameters,proto3" json:"parameters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FormatMessage) Reset()         { *m = FormatMessage{} }
+func (m *FormatMessage) String() string { return proto.CompactTextString(m) }
+func (*FormatMessage) ProtoMessage()    {}
+func (*FormatMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{0}
+}
+func (m *FormatMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FormatMessage.Unmarshal(m, b)
+}
+func (m *FormatMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FormatMessage.Marshal(b, m, deterministic)
+}
+func (dst *FormatMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FormatMessage.Merge(dst, src)
+}
+func (m *FormatMessage) XXX_Size() int {
+	return xxx_messageInfo_FormatMessage.Size(m)
+}
+func (m *FormatMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_FormatMessage.DiscardUnknown(m)
 }
 
-func (m *FormatMessage) Reset()                    { *m = FormatMessage{} }
-func (m *FormatMessage) String() string            { return proto.CompactTextString(m) }
-func (*FormatMessage) ProtoMessage()               {}
-func (*FormatMessage) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_FormatMessage proto.InternalMessageInfo
 
 func (m *FormatMessage) GetFormat() string {
 	if m != nil {
@@ -158,17 +192,39 @@ func (m *FormatMessage) GetParameters() []string {
 // to the `BREAKPOINT_SOURCE_LOCATION` with the message `Location not found`.
 type StatusMessage struct {
 	// Distinguishes errors from informational messages.
-	IsError bool `protobuf:"varint,1,opt,name=is_error,json=isError" json:"is_error,omitempty"`
+	IsError bool `protobuf:"varint,1,opt,name=is_error,json=isError,proto3" json:"is_error,omitempty"`
 	// Reference to which the message applies.
-	RefersTo StatusMessage_Reference `protobuf:"varint,2,opt,name=refers_to,json=refersTo,enum=google.devtools.clouddebugger.v2.StatusMessage_Reference" json:"refers_to,omitempty"`
+	RefersTo StatusMessage_Reference `protobuf:"varint,2,opt,name=refers_to,json=refersTo,proto3,enum=google.devtools.clouddebugger.v2.StatusMessage_Reference" json:"refers_to,omitempty"`
 	// Status message text.
-	Description *FormatMessage `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description          *FormatMessage `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *StatusMessage) Reset()         { *m = StatusMessage{} }
+func (m *StatusMessage) String() string { return proto.CompactTextString(m) }
+func (*StatusMessage) ProtoMessage()    {}
+func (*StatusMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{1}
+}
+func (m *StatusMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StatusMessage.Unmarshal(m, b)
+}
+func (m *StatusMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StatusMessage.Marshal(b, m, deterministic)
+}
+func (dst *StatusMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatusMessage.Merge(dst, src)
+}
+func (m *StatusMessage) XXX_Size() int {
+	return xxx_messageInfo_StatusMessage.Size(m)
+}
+func (m *StatusMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_StatusMessage.DiscardUnknown(m)
 }
 
-func (m *StatusMessage) Reset()                    { *m = StatusMessage{} }
-func (m *StatusMessage) String() string            { return proto.CompactTextString(m) }
-func (*StatusMessage) ProtoMessage()               {}
-func (*StatusMessage) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_StatusMessage proto.InternalMessageInfo
 
 func (m *StatusMessage) GetIsError() bool {
 	if m != nil {
@@ -194,15 +250,37 @@ func (m *StatusMessage) GetDescription() *FormatMessage {
 // Represents a location in the source code.
 type SourceLocation struct {
 	// Path to the source file within the source context of the target binary.
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// Line inside the file. The first line in the file has the value `1`.
-	Line int32 `protobuf:"varint,2,opt,name=line" json:"line,omitempty"`
+	Line                 int32    `protobuf:"varint,2,opt,name=line,proto3" json:"line,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SourceLocation) Reset()         { *m = SourceLocation{} }
+func (m *SourceLocation) String() string { return proto.CompactTextString(m) }
+func (*SourceLocation) ProtoMessage()    {}
+func (*SourceLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{2}
+}
+func (m *SourceLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceLocation.Unmarshal(m, b)
+}
+func (m *SourceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceLocation.Marshal(b, m, deterministic)
+}
+func (dst *SourceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceLocation.Merge(dst, src)
+}
+func (m *SourceLocation) XXX_Size() int {
+	return xxx_messageInfo_SourceLocation.Size(m)
+}
+func (m *SourceLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceLocation.DiscardUnknown(m)
 }
 
-func (m *SourceLocation) Reset()                    { *m = SourceLocation{} }
-func (m *SourceLocation) String() string            { return proto.CompactTextString(m) }
-func (*SourceLocation) ProtoMessage()               {}
-func (*SourceLocation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_SourceLocation proto.InternalMessageInfo
 
 func (m *SourceLocation) GetPath() string {
 	if m != nil {
@@ -329,20 +407,20 @@ func (m *SourceLocation) GetLine() int32 {
 // The type field is optional. The debugger agent may or may not support it.
 type Variable struct {
 	// Name of the variable, if any.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Simple value of the variable.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// Variable type (e.g. `MyClass`). If the variable is split with
 	// `var_table_index`, `type` goes next to `value`. The interpretation of
 	// a type is agent specific. It is recommended to include the dynamic type
 	// rather than a static type of an object.
-	Type string `protobuf:"bytes,6,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,6,opt,name=type,proto3" json:"type,omitempty"`
 	// Members contained or pointed to by the variable.
-	Members []*Variable `protobuf:"bytes,3,rep,name=members" json:"members,omitempty"`
+	Members []*Variable `protobuf:"bytes,3,rep,name=members,proto3" json:"members,omitempty"`
 	// Reference to a variable in the shared variable table. More than
 	// one variable can reference the same variable in the table. The
 	// `var_table_index` field is an index into `variable_table` in Breakpoint.
-	VarTableIndex *google_protobuf2.Int32Value `protobuf:"bytes,4,opt,name=var_table_index,json=varTableIndex" json:"var_table_index,omitempty"`
+	VarTableIndex *wrappers.Int32Value `protobuf:"bytes,4,opt,name=var_table_index,json=varTableIndex,proto3" json:"var_table_index,omitempty"`
 	// Status associated with the variable. This field will usually stay
 	// unset. A status of a single variable only applies to that variable or
 	// expression. The rest of breakpoint data still remains valid. Variables
@@ -362,13 +440,35 @@ type Variable struct {
 	// *   `Malformed string`,
 	// *   `Field f not found in class C`
 	// *   `Null pointer dereference`
-	Status *StatusMessage `protobuf:"bytes,5,opt,name=status" json:"status,omitempty"`
+	Status               *StatusMessage `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *Variable) Reset()                    { *m = Variable{} }
-func (m *Variable) String() string            { return proto.CompactTextString(m) }
-func (*Variable) ProtoMessage()               {}
-func (*Variable) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *Variable) Reset()         { *m = Variable{} }
+func (m *Variable) String() string { return proto.CompactTextString(m) }
+func (*Variable) ProtoMessage()    {}
+func (*Variable) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{3}
+}
+func (m *Variable) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Variable.Unmarshal(m, b)
+}
+func (m *Variable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Variable.Marshal(b, m, deterministic)
+}
+func (dst *Variable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Variable.Merge(dst, src)
+}
+func (m *Variable) XXX_Size() int {
+	return xxx_messageInfo_Variable.Size(m)
+}
+func (m *Variable) XXX_DiscardUnknown() {
+	xxx_messageInfo_Variable.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Variable proto.InternalMessageInfo
 
 func (m *Variable) GetName() string {
 	if m != nil {
@@ -398,7 +498,7 @@ func (m *Variable) GetMembers() []*Variable {
 	return nil
 }
 
-func (m *Variable) GetVarTableIndex() *google_protobuf2.Int32Value {
+func (m *Variable) GetVarTableIndex() *wrappers.Int32Value {
 	if m != nil {
 		return m.VarTableIndex
 	}
@@ -415,21 +515,43 @@ func (m *Variable) GetStatus() *StatusMessage {
 // Represents a stack frame context.
 type StackFrame struct {
 	// Demangled function name at the call site.
-	Function string `protobuf:"bytes,1,opt,name=function" json:"function,omitempty"`
+	Function string `protobuf:"bytes,1,opt,name=function,proto3" json:"function,omitempty"`
 	// Source location of the call site.
-	Location *SourceLocation `protobuf:"bytes,2,opt,name=location" json:"location,omitempty"`
+	Location *SourceLocation `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"`
 	// Set of arguments passed to this function.
 	// Note that this might not be populated for all stack frames.
-	Arguments []*Variable `protobuf:"bytes,3,rep,name=arguments" json:"arguments,omitempty"`
+	Arguments []*Variable `protobuf:"bytes,3,rep,name=arguments,proto3" json:"arguments,omitempty"`
 	// Set of local variables at the stack frame location.
 	// Note that this might not be populated for all stack frames.
-	Locals []*Variable `protobuf:"bytes,4,rep,name=locals" json:"locals,omitempty"`
+	Locals               []*Variable `protobuf:"bytes,4,rep,name=locals,proto3" json:"locals,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *StackFrame) Reset()         { *m = StackFrame{} }
+func (m *StackFrame) String() string { return proto.CompactTextString(m) }
+func (*StackFrame) ProtoMessage()    {}
+func (*StackFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{4}
+}
+func (m *StackFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StackFrame.Unmarshal(m, b)
+}
+func (m *StackFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StackFrame.Marshal(b, m, deterministic)
+}
+func (dst *StackFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StackFrame.Merge(dst, src)
+}
+func (m *StackFrame) XXX_Size() int {
+	return xxx_messageInfo_StackFrame.Size(m)
+}
+func (m *StackFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_StackFrame.DiscardUnknown(m)
 }
 
-func (m *StackFrame) Reset()                    { *m = StackFrame{} }
-func (m *StackFrame) String() string            { return proto.CompactTextString(m) }
-func (*StackFrame) ProtoMessage()               {}
-func (*StackFrame) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_StackFrame proto.InternalMessageInfo
 
 func (m *StackFrame) GetFunction() string {
 	if m != nil {
@@ -462,21 +584,21 @@ func (m *StackFrame) GetLocals() []*Variable {
 // Represents the breakpoint specification, status and results.
 type Breakpoint struct {
 	// Breakpoint identifier, unique in the scope of the debuggee.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// Action that the agent should perform when the code at the
 	// breakpoint location is hit.
-	Action Breakpoint_Action `protobuf:"varint,13,opt,name=action,enum=google.devtools.clouddebugger.v2.Breakpoint_Action" json:"action,omitempty"`
+	Action Breakpoint_Action `protobuf:"varint,13,opt,name=action,proto3,enum=google.devtools.clouddebugger.v2.Breakpoint_Action" json:"action,omitempty"`
 	// Breakpoint source location.
-	Location *SourceLocation `protobuf:"bytes,2,opt,name=location" json:"location,omitempty"`
+	Location *SourceLocation `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"`
 	// Condition that triggers the breakpoint.
 	// The condition is a compound boolean expression composed using expressions
 	// in a programming language at the source location.
-	Condition string `protobuf:"bytes,3,opt,name=condition" json:"condition,omitempty"`
+	Condition string `protobuf:"bytes,3,opt,name=condition,proto3" json:"condition,omitempty"`
 	// List of read-only expressions to evaluate at the breakpoint location.
 	// The expressions are composed using expressions in the programming language
 	// at the source location. If the breakpoint action is `LOG`, the evaluated
 	// expressions are included in log statements.
-	Expressions []string `protobuf:"bytes,4,rep,name=expressions" json:"expressions,omitempty"`
+	Expressions []string `protobuf:"bytes,4,rep,name=expressions,proto3" json:"expressions,omitempty"`
 	// Only relevant when action is `LOG`. Defines the message to log when
 	// the breakpoint hits. The message may include parameter placeholders `$0`,
 	// `$1`, etc. These placeholders are replaced with the evaluated value
@@ -485,19 +607,19 @@ type Breakpoint struct {
 	//
 	// Example: `Message received, id = $0, count = $1` with
 	// `expressions` = `[ message.id, message.count ]`.
-	LogMessageFormat string `protobuf:"bytes,14,opt,name=log_message_format,json=logMessageFormat" json:"log_message_format,omitempty"`
+	LogMessageFormat string `protobuf:"bytes,14,opt,name=log_message_format,json=logMessageFormat,proto3" json:"log_message_format,omitempty"`
 	// Indicates the severity of the log. Only relevant when action is `LOG`.
-	LogLevel Breakpoint_LogLevel `protobuf:"varint,15,opt,name=log_level,json=logLevel,enum=google.devtools.clouddebugger.v2.Breakpoint_LogLevel" json:"log_level,omitempty"`
+	LogLevel Breakpoint_LogLevel `protobuf:"varint,15,opt,name=log_level,json=logLevel,proto3,enum=google.devtools.clouddebugger.v2.Breakpoint_LogLevel" json:"log_level,omitempty"`
 	// When true, indicates that this is a final result and the
 	// breakpoint state will not change from here on.
-	IsFinalState bool `protobuf:"varint,5,opt,name=is_final_state,json=isFinalState" json:"is_final_state,omitempty"`
+	IsFinalState bool `protobuf:"varint,5,opt,name=is_final_state,json=isFinalState,proto3" json:"is_final_state,omitempty"`
 	// Time this breakpoint was created by the server in seconds resolution.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time this breakpoint was finalized as seen by the server in seconds
 	// resolution.
-	FinalTime *google_protobuf1.Timestamp `protobuf:"bytes,12,opt,name=final_time,json=finalTime" json:"final_time,omitempty"`
+	FinalTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=final_time,json=finalTime,proto3" json:"final_time,omitempty"`
 	// E-mail address of the user that created this breakpoint
-	UserEmail string `protobuf:"bytes,16,opt,name=user_email,json=userEmail" json:"user_email,omitempty"`
+	UserEmail string `protobuf:"bytes,16,opt,name=user_email,json=userEmail,proto3" json:"user_email,omitempty"`
 	// Breakpoint status.
 	//
 	// The status includes an error flag and a human readable message.
@@ -513,9 +635,9 @@ type Breakpoint struct {
 	//
 	// *   `Invalid line number` referring to location
 	// *   `Field f not found in class C` referring to condition
-	Status *StatusMessage `protobuf:"bytes,10,opt,name=status" json:"status,omitempty"`
+	Status *StatusMessage `protobuf:"bytes,10,opt,name=status,proto3" json:"status,omitempty"`
 	// The stack at breakpoint time.
-	StackFrames []*StackFrame `protobuf:"bytes,7,rep,name=stack_frames,json=stackFrames" json:"stack_frames,omitempty"`
+	StackFrames []*StackFrame `protobuf:"bytes,7,rep,name=stack_frames,json=stackFrames,proto3" json:"stack_frames,omitempty"`
 	// Values of evaluated expressions at breakpoint time.
 	// The evaluated expressions appear in exactly the same order they
 	// are listed in the `expressions` field.
@@ -523,7 +645,7 @@ type Breakpoint struct {
 	// `members` field holds the result of the evaluated expression.
 	// If the expression cannot be evaluated, the `status` inside the `Variable`
 	// will indicate an error and contain the error text.
-	EvaluatedExpressions []*Variable `protobuf:"bytes,8,rep,name=evaluated_expressions,json=evaluatedExpressions" json:"evaluated_expressions,omitempty"`
+	EvaluatedExpressions []*Variable `protobuf:"bytes,8,rep,name=evaluated_expressions,json=evaluatedExpressions,proto3" json:"evaluated_expressions,omitempty"`
 	// The `variable_table` exists to aid with computation, memory and network
 	// traffic optimization.  It enables storing a variable once and reference
 	// it from multiple variables, including variables stored in the
@@ -536,16 +658,38 @@ type Breakpoint struct {
 	// The stored objects are nameless and get their name from the referencing
 	// variable. The effective variable is a merge of the referencing variable
 	// and the referenced variable.
-	VariableTable []*Variable `protobuf:"bytes,9,rep,name=variable_table,json=variableTable" json:"variable_table,omitempty"`
+	VariableTable []*Variable `protobuf:"bytes,9,rep,name=variable_table,json=variableTable,proto3" json:"variable_table,omitempty"`
 	// A set of custom breakpoint properties, populated by the agent, to be
 	// displayed to the user.
-	Labels map[string]string `protobuf:"bytes,17,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,17,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *Breakpoint) Reset()                    { *m = Breakpoint{} }
-func (m *Breakpoint) String() string            { return proto.CompactTextString(m) }
-func (*Breakpoint) ProtoMessage()               {}
-func (*Breakpoint) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *Breakpoint) Reset()         { *m = Breakpoint{} }
+func (m *Breakpoint) String() string { return proto.CompactTextString(m) }
+func (*Breakpoint) ProtoMessage()    {}
+func (*Breakpoint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{5}
+}
+func (m *Breakpoint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Breakpoint.Unmarshal(m, b)
+}
+func (m *Breakpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Breakpoint.Marshal(b, m, deterministic)
+}
+func (dst *Breakpoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Breakpoint.Merge(dst, src)
+}
+func (m *Breakpoint) XXX_Size() int {
+	return xxx_messageInfo_Breakpoint.Size(m)
+}
+func (m *Breakpoint) XXX_DiscardUnknown() {
+	xxx_messageInfo_Breakpoint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Breakpoint proto.InternalMessageInfo
 
 func (m *Breakpoint) GetId() string {
 	if m != nil {
@@ -603,14 +747,14 @@ func (m *Breakpoint) GetIsFinalState() bool {
 	return false
 }
 
-func (m *Breakpoint) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *Breakpoint) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Breakpoint) GetFinalTime() *google_protobuf1.Timestamp {
+func (m *Breakpoint) GetFinalTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinalTime
 	}
@@ -666,52 +810,74 @@ func (m *Breakpoint) GetLabels() map[string]string {
 // exactly the same Debuggee message value when registering.
 type Debuggee struct {
 	// Unique identifier for the debuggee generated by the controller service.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// Project the debuggee is associated with.
 	// Use project number or id when registering a Google Cloud Platform project.
-	Project string `protobuf:"bytes,2,opt,name=project" json:"project,omitempty"`
+	Project string `protobuf:"bytes,2,opt,name=project,proto3" json:"project,omitempty"`
 	// Uniquifier to further distiguish the application.
 	// It is possible that different applications might have identical values in
 	// the debuggee message, thus, incorrectly identified as a single application
 	// by the Controller service. This field adds salt to further distiguish the
 	// application. Agents should consider seeding this field with value that
 	// identifies the code, binary, configuration and environment.
-	Uniquifier string `protobuf:"bytes,3,opt,name=uniquifier" json:"uniquifier,omitempty"`
+	Uniquifier string `protobuf:"bytes,3,opt,name=uniquifier,proto3" json:"uniquifier,omitempty"`
 	// Human readable description of the debuggee.
 	// Including a human-readable project name, environment name and version
 	// information is recommended.
-	Description string `protobuf:"bytes,4,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
 	// If set to `true`, indicates that Controller service does not detect any
 	// activity from the debuggee agents and the application is possibly stopped.
-	IsInactive bool `protobuf:"varint,5,opt,name=is_inactive,json=isInactive" json:"is_inactive,omitempty"`
+	IsInactive bool `protobuf:"varint,5,opt,name=is_inactive,json=isInactive,proto3" json:"is_inactive,omitempty"`
 	// Version ID of the agent.
 	// Schema: `domain/language-platform/vmajor.minor` (for example
 	// `google.com/java-gcp/v1.1`).
-	AgentVersion string `protobuf:"bytes,6,opt,name=agent_version,json=agentVersion" json:"agent_version,omitempty"`
+	AgentVersion string `protobuf:"bytes,6,opt,name=agent_version,json=agentVersion,proto3" json:"agent_version,omitempty"`
 	// If set to `true`, indicates that the agent should disable itself and
 	// detach from the debuggee.
-	IsDisabled bool `protobuf:"varint,7,opt,name=is_disabled,json=isDisabled" json:"is_disabled,omitempty"`
+	IsDisabled bool `protobuf:"varint,7,opt,name=is_disabled,json=isDisabled,proto3" json:"is_disabled,omitempty"`
 	// Human readable message to be displayed to the user about this debuggee.
 	// Absence of this field indicates no status. The message can be either
 	// informational or an error status.
-	Status *StatusMessage `protobuf:"bytes,8,opt,name=status" json:"status,omitempty"`
+	Status *StatusMessage `protobuf:"bytes,8,opt,name=status,proto3" json:"status,omitempty"`
 	// References to the locations and revisions of the source code used in the
 	// deployed application.
-	SourceContexts []*google_devtools_source_v1.SourceContext `protobuf:"bytes,9,rep,name=source_contexts,json=sourceContexts" json:"source_contexts,omitempty"`
+	SourceContexts []*v1.SourceContext `protobuf:"bytes,9,rep,name=source_contexts,json=sourceContexts,proto3" json:"source_contexts,omitempty"`
 	// References to the locations and revisions of the source code used in the
 	// deployed application.
 	//
 	// NOTE: this field is experimental and can be ignored.
-	ExtSourceContexts []*google_devtools_source_v1.ExtendedSourceContext `protobuf:"bytes,13,rep,name=ext_source_contexts,json=extSourceContexts" json:"ext_source_contexts,omitempty"`
+	ExtSourceContexts []*v1.ExtendedSourceContext `protobuf:"bytes,13,rep,name=ext_source_contexts,json=extSourceContexts,proto3" json:"ext_source_contexts,omitempty"`
 	// A set of custom debuggee properties, populated by the agent, to be
 	// displayed to the user.
-	Labels map[string]string `protobuf:"bytes,11,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,11,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *Debuggee) Reset()                    { *m = Debuggee{} }
-func (m *Debuggee) String() string            { return proto.CompactTextString(m) }
-func (*Debuggee) ProtoMessage()               {}
-func (*Debuggee) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *Debuggee) Reset()         { *m = Debuggee{} }
+func (m *Debuggee) String() string { return proto.CompactTextString(m) }
+func (*Debuggee) ProtoMessage()    {}
+func (*Debuggee) Descriptor() ([]byte, []int) {
+	return fileDescriptor_data_03347f8b18bb29e5, []int{6}
+}
+func (m *Debuggee) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Debuggee.Unmarshal(m, b)
+}
+func (m *Debuggee) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Debuggee.Marshal(b, m, deterministic)
+}
+func (dst *Debuggee) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Debuggee.Merge(dst, src)
+}
+func (m *Debuggee) XXX_Size() int {
+	return xxx_messageInfo_Debuggee.Size(m)
+}
+func (m *Debuggee) XXX_DiscardUnknown() {
+	xxx_messageInfo_Debuggee.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Debuggee proto.InternalMessageInfo
 
 func (m *Debuggee) GetId() string {
 	if m != nil {
@@ -769,14 +935,14 @@ func (m *Debuggee) GetStatus() *StatusMessage {
 	return nil
 }
 
-func (m *Debuggee) GetSourceContexts() []*google_devtools_source_v1.SourceContext {
+func (m *Debuggee) GetSourceContexts() []*v1.SourceContext {
 	if m != nil {
 		return m.SourceContexts
 	}
 	return nil
 }
 
-func (m *Debuggee) GetExtSourceContexts() []*google_devtools_source_v1.ExtendedSourceContext {
+func (m *Debuggee) GetExtSourceContexts() []*v1.ExtendedSourceContext {
 	if m != nil {
 		return m.ExtSourceContexts
 	}
@@ -797,15 +963,19 @@ func init() {
 	proto.RegisterType((*Variable)(nil), "google.devtools.clouddebugger.v2.Variable")
 	proto.RegisterType((*StackFrame)(nil), "google.devtools.clouddebugger.v2.StackFrame")
 	proto.RegisterType((*Breakpoint)(nil), "google.devtools.clouddebugger.v2.Breakpoint")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.clouddebugger.v2.Breakpoint.LabelsEntry")
 	proto.RegisterType((*Debuggee)(nil), "google.devtools.clouddebugger.v2.Debuggee")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.clouddebugger.v2.Debuggee.LabelsEntry")
 	proto.RegisterEnum("google.devtools.clouddebugger.v2.StatusMessage_Reference", StatusMessage_Reference_name, StatusMessage_Reference_value)
 	proto.RegisterEnum("google.devtools.clouddebugger.v2.Breakpoint_Action", Breakpoint_Action_name, Breakpoint_Action_value)
 	proto.RegisterEnum("google.devtools.clouddebugger.v2.Breakpoint_LogLevel", Breakpoint_LogLevel_name, Breakpoint_LogLevel_value)
 }
 
-func init() { proto.RegisterFile("google/devtools/clouddebugger/v2/data.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/devtools/clouddebugger/v2/data.proto", fileDescriptor_data_03347f8b18bb29e5)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_data_03347f8b18bb29e5 = []byte{
 	// 1270 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x5d, 0x92, 0xda, 0xc6,
 	0x16, 0x36, 0x3f, 0x03, 0xd2, 0x61, 0x60, 0x70, 0x5f, 0xfb, 0x96, 0x3c, 0xd7, 0x77, 0x4c, 0x71,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/debugger.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/debugger.pb.go
index 40bf0efe..40bd07ed 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/debugger.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2/debugger.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouddebugger/v2/debugger.proto
 
-package clouddebugger
+package clouddebugger // import "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -19,22 +19,50 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Request to set a breakpoint
 type SetBreakpointRequest struct {
 	// ID of the debuggee where the breakpoint is to be set.
-	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId" json:"debuggee_id,omitempty"`
+	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId,proto3" json:"debuggee_id,omitempty"`
 	// Breakpoint specification to set.
 	// The field `location` of the breakpoint must be set.
-	Breakpoint *Breakpoint `protobuf:"bytes,2,opt,name=breakpoint" json:"breakpoint,omitempty"`
+	Breakpoint *Breakpoint `protobuf:"bytes,2,opt,name=breakpoint,proto3" json:"breakpoint,omitempty"`
 	// The client version making the call.
 	// Schema: `domain/type/version` (e.g., `google.com/intellij/v1`).
-	ClientVersion string `protobuf:"bytes,4,opt,name=client_version,json=clientVersion" json:"client_version,omitempty"`
+	ClientVersion        string   `protobuf:"bytes,4,opt,name=client_version,json=clientVersion,proto3" json:"client_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SetBreakpointRequest) Reset()         { *m = SetBreakpointRequest{} }
+func (m *SetBreakpointRequest) String() string { return proto.CompactTextString(m) }
+func (*SetBreakpointRequest) ProtoMessage()    {}
+func (*SetBreakpointRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{0}
+}
+func (m *SetBreakpointRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetBreakpointRequest.Unmarshal(m, b)
+}
+func (m *SetBreakpointRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetBreakpointRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetBreakpointRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetBreakpointRequest.Merge(dst, src)
+}
+func (m *SetBreakpointRequest) XXX_Size() int {
+	return xxx_messageInfo_SetBreakpointRequest.Size(m)
+}
+func (m *SetBreakpointRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetBreakpointRequest.DiscardUnknown(m)
 }
 
-func (m *SetBreakpointRequest) Reset()                    { *m = SetBreakpointRequest{} }
-func (m *SetBreakpointRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetBreakpointRequest) ProtoMessage()               {}
-func (*SetBreakpointRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_SetBreakpointRequest proto.InternalMessageInfo
 
 func (m *SetBreakpointRequest) GetDebuggeeId() string {
 	if m != nil {
@@ -61,13 +89,35 @@ func (m *SetBreakpointRequest) GetClientVersion() string {
 type SetBreakpointResponse struct {
 	// Breakpoint resource.
 	// The field `id` is guaranteed to be set (in addition to the echoed fileds).
-	Breakpoint *Breakpoint `protobuf:"bytes,1,opt,name=breakpoint" json:"breakpoint,omitempty"`
+	Breakpoint           *Breakpoint `protobuf:"bytes,1,opt,name=breakpoint,proto3" json:"breakpoint,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *SetBreakpointResponse) Reset()                    { *m = SetBreakpointResponse{} }
-func (m *SetBreakpointResponse) String() string            { return proto.CompactTextString(m) }
-func (*SetBreakpointResponse) ProtoMessage()               {}
-func (*SetBreakpointResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (m *SetBreakpointResponse) Reset()         { *m = SetBreakpointResponse{} }
+func (m *SetBreakpointResponse) String() string { return proto.CompactTextString(m) }
+func (*SetBreakpointResponse) ProtoMessage()    {}
+func (*SetBreakpointResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{1}
+}
+func (m *SetBreakpointResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetBreakpointResponse.Unmarshal(m, b)
+}
+func (m *SetBreakpointResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetBreakpointResponse.Marshal(b, m, deterministic)
+}
+func (dst *SetBreakpointResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetBreakpointResponse.Merge(dst, src)
+}
+func (m *SetBreakpointResponse) XXX_Size() int {
+	return xxx_messageInfo_SetBreakpointResponse.Size(m)
+}
+func (m *SetBreakpointResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetBreakpointResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetBreakpointResponse proto.InternalMessageInfo
 
 func (m *SetBreakpointResponse) GetBreakpoint() *Breakpoint {
 	if m != nil {
@@ -79,18 +129,40 @@ func (m *SetBreakpointResponse) GetBreakpoint() *Breakpoint {
 // Request to get breakpoint information.
 type GetBreakpointRequest struct {
 	// ID of the debuggee whose breakpoint to get.
-	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId" json:"debuggee_id,omitempty"`
+	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId,proto3" json:"debuggee_id,omitempty"`
 	// ID of the breakpoint to get.
-	BreakpointId string `protobuf:"bytes,2,opt,name=breakpoint_id,json=breakpointId" json:"breakpoint_id,omitempty"`
+	BreakpointId string `protobuf:"bytes,2,opt,name=breakpoint_id,json=breakpointId,proto3" json:"breakpoint_id,omitempty"`
 	// The client version making the call.
 	// Schema: `domain/type/version` (e.g., `google.com/intellij/v1`).
-	ClientVersion string `protobuf:"bytes,4,opt,name=client_version,json=clientVersion" json:"client_version,omitempty"`
+	ClientVersion        string   `protobuf:"bytes,4,opt,name=client_version,json=clientVersion,proto3" json:"client_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetBreakpointRequest) Reset()         { *m = GetBreakpointRequest{} }
+func (m *GetBreakpointRequest) String() string { return proto.CompactTextString(m) }
+func (*GetBreakpointRequest) ProtoMessage()    {}
+func (*GetBreakpointRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{2}
+}
+func (m *GetBreakpointRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetBreakpointRequest.Unmarshal(m, b)
+}
+func (m *GetBreakpointRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetBreakpointRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetBreakpointRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBreakpointRequest.Merge(dst, src)
+}
+func (m *GetBreakpointRequest) XXX_Size() int {
+	return xxx_messageInfo_GetBreakpointRequest.Size(m)
+}
+func (m *GetBreakpointRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetBreakpointRequest.DiscardUnknown(m)
 }
 
-func (m *GetBreakpointRequest) Reset()                    { *m = GetBreakpointRequest{} }
-func (m *GetBreakpointRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetBreakpointRequest) ProtoMessage()               {}
-func (*GetBreakpointRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_GetBreakpointRequest proto.InternalMessageInfo
 
 func (m *GetBreakpointRequest) GetDebuggeeId() string {
 	if m != nil {
@@ -117,13 +189,35 @@ func (m *GetBreakpointRequest) GetClientVersion() string {
 type GetBreakpointResponse struct {
 	// Complete breakpoint state.
 	// The fields `id` and `location` are guaranteed to be set.
-	Breakpoint *Breakpoint `protobuf:"bytes,1,opt,name=breakpoint" json:"breakpoint,omitempty"`
+	Breakpoint           *Breakpoint `protobuf:"bytes,1,opt,name=breakpoint,proto3" json:"breakpoint,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *GetBreakpointResponse) Reset()                    { *m = GetBreakpointResponse{} }
-func (m *GetBreakpointResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetBreakpointResponse) ProtoMessage()               {}
-func (*GetBreakpointResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+func (m *GetBreakpointResponse) Reset()         { *m = GetBreakpointResponse{} }
+func (m *GetBreakpointResponse) String() string { return proto.CompactTextString(m) }
+func (*GetBreakpointResponse) ProtoMessage()    {}
+func (*GetBreakpointResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{3}
+}
+func (m *GetBreakpointResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetBreakpointResponse.Unmarshal(m, b)
+}
+func (m *GetBreakpointResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetBreakpointResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetBreakpointResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBreakpointResponse.Merge(dst, src)
+}
+func (m *GetBreakpointResponse) XXX_Size() int {
+	return xxx_messageInfo_GetBreakpointResponse.Size(m)
+}
+func (m *GetBreakpointResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetBreakpointResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetBreakpointResponse proto.InternalMessageInfo
 
 func (m *GetBreakpointResponse) GetBreakpoint() *Breakpoint {
 	if m != nil {
@@ -135,18 +229,40 @@ func (m *GetBreakpointResponse) GetBreakpoint() *Breakpoint {
 // Request to delete a breakpoint.
 type DeleteBreakpointRequest struct {
 	// ID of the debuggee whose breakpoint to delete.
-	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId" json:"debuggee_id,omitempty"`
+	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId,proto3" json:"debuggee_id,omitempty"`
 	// ID of the breakpoint to delete.
-	BreakpointId string `protobuf:"bytes,2,opt,name=breakpoint_id,json=breakpointId" json:"breakpoint_id,omitempty"`
+	BreakpointId string `protobuf:"bytes,2,opt,name=breakpoint_id,json=breakpointId,proto3" json:"breakpoint_id,omitempty"`
 	// The client version making the call.
 	// Schema: `domain/type/version` (e.g., `google.com/intellij/v1`).
-	ClientVersion string `protobuf:"bytes,3,opt,name=client_version,json=clientVersion" json:"client_version,omitempty"`
+	ClientVersion        string   `protobuf:"bytes,3,opt,name=client_version,json=clientVersion,proto3" json:"client_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteBreakpointRequest) Reset()                    { *m = DeleteBreakpointRequest{} }
-func (m *DeleteBreakpointRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteBreakpointRequest) ProtoMessage()               {}
-func (*DeleteBreakpointRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+func (m *DeleteBreakpointRequest) Reset()         { *m = DeleteBreakpointRequest{} }
+func (m *DeleteBreakpointRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteBreakpointRequest) ProtoMessage()    {}
+func (*DeleteBreakpointRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{4}
+}
+func (m *DeleteBreakpointRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteBreakpointRequest.Unmarshal(m, b)
+}
+func (m *DeleteBreakpointRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteBreakpointRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteBreakpointRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteBreakpointRequest.Merge(dst, src)
+}
+func (m *DeleteBreakpointRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteBreakpointRequest.Size(m)
+}
+func (m *DeleteBreakpointRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteBreakpointRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteBreakpointRequest proto.InternalMessageInfo
 
 func (m *DeleteBreakpointRequest) GetDebuggeeId() string {
 	if m != nil {
@@ -172,33 +288,55 @@ func (m *DeleteBreakpointRequest) GetClientVersion() string {
 // Request to list breakpoints.
 type ListBreakpointsRequest struct {
 	// ID of the debuggee whose breakpoints to list.
-	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId" json:"debuggee_id,omitempty"`
+	DebuggeeId string `protobuf:"bytes,1,opt,name=debuggee_id,json=debuggeeId,proto3" json:"debuggee_id,omitempty"`
 	// When set to `true`, the response includes the list of breakpoints set by
 	// any user. Otherwise, it includes only breakpoints set by the caller.
-	IncludeAllUsers bool `protobuf:"varint,2,opt,name=include_all_users,json=includeAllUsers" json:"include_all_users,omitempty"`
+	IncludeAllUsers bool `protobuf:"varint,2,opt,name=include_all_users,json=includeAllUsers,proto3" json:"include_all_users,omitempty"`
 	// When set to `true`, the response includes active and inactive
 	// breakpoints. Otherwise, it includes only active breakpoints.
-	IncludeInactive bool `protobuf:"varint,3,opt,name=include_inactive,json=includeInactive" json:"include_inactive,omitempty"`
+	IncludeInactive bool `protobuf:"varint,3,opt,name=include_inactive,json=includeInactive,proto3" json:"include_inactive,omitempty"`
 	// When set, the response includes only breakpoints with the specified action.
-	Action *ListBreakpointsRequest_BreakpointActionValue `protobuf:"bytes,4,opt,name=action" json:"action,omitempty"`
+	Action *ListBreakpointsRequest_BreakpointActionValue `protobuf:"bytes,4,opt,name=action,proto3" json:"action,omitempty"`
 	// This field is deprecated. The following fields are always stripped out of
 	// the result: `stack_frames`, `evaluated_expressions` and `variable_table`.
-	StripResults bool `protobuf:"varint,5,opt,name=strip_results,json=stripResults" json:"strip_results,omitempty"`
+	StripResults bool `protobuf:"varint,5,opt,name=strip_results,json=stripResults,proto3" json:"strip_results,omitempty"`
 	// A wait token that, if specified, blocks the call until the breakpoints
 	// list has changed, or a server selected timeout has expired.  The value
 	// should be set from the last response. The error code
 	// `google.rpc.Code.ABORTED` (RPC) is returned on wait timeout, which
 	// should be called again with the same `wait_token`.
-	WaitToken string `protobuf:"bytes,6,opt,name=wait_token,json=waitToken" json:"wait_token,omitempty"`
+	WaitToken string `protobuf:"bytes,6,opt,name=wait_token,json=waitToken,proto3" json:"wait_token,omitempty"`
 	// The client version making the call.
 	// Schema: `domain/type/version` (e.g., `google.com/intellij/v1`).
-	ClientVersion string `protobuf:"bytes,8,opt,name=client_version,json=clientVersion" json:"client_version,omitempty"`
+	ClientVersion        string   `protobuf:"bytes,8,opt,name=client_version,json=clientVersion,proto3" json:"client_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListBreakpointsRequest) Reset()                    { *m = ListBreakpointsRequest{} }
-func (m *ListBreakpointsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListBreakpointsRequest) ProtoMessage()               {}
-func (*ListBreakpointsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+func (m *ListBreakpointsRequest) Reset()         { *m = ListBreakpointsRequest{} }
+func (m *ListBreakpointsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListBreakpointsRequest) ProtoMessage()    {}
+func (*ListBreakpointsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{5}
+}
+func (m *ListBreakpointsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBreakpointsRequest.Unmarshal(m, b)
+}
+func (m *ListBreakpointsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBreakpointsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListBreakpointsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBreakpointsRequest.Merge(dst, src)
+}
+func (m *ListBreakpointsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListBreakpointsRequest.Size(m)
+}
+func (m *ListBreakpointsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBreakpointsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListBreakpointsRequest proto.InternalMessageInfo
 
 func (m *ListBreakpointsRequest) GetDebuggeeId() string {
 	if m != nil {
@@ -253,7 +391,10 @@ func (m *ListBreakpointsRequest) GetClientVersion() string {
 // field of breakpoints.
 type ListBreakpointsRequest_BreakpointActionValue struct {
 	// Only breakpoints with the specified action will pass the filter.
-	Value Breakpoint_Action `protobuf:"varint,1,opt,name=value,enum=google.devtools.clouddebugger.v2.Breakpoint_Action" json:"value,omitempty"`
+	Value                Breakpoint_Action `protobuf:"varint,1,opt,name=value,proto3,enum=google.devtools.clouddebugger.v2.Breakpoint_Action" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *ListBreakpointsRequest_BreakpointActionValue) Reset() {
@@ -264,8 +405,25 @@ func (m *ListBreakpointsRequest_BreakpointActionValue) String() string {
 }
 func (*ListBreakpointsRequest_BreakpointActionValue) ProtoMessage() {}
 func (*ListBreakpointsRequest_BreakpointActionValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{5, 0}
+	return fileDescriptor_debugger_04096ebac35efe72, []int{5, 0}
+}
+func (m *ListBreakpointsRequest_BreakpointActionValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Unmarshal(m, b)
+}
+func (m *ListBreakpointsRequest_BreakpointActionValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Marshal(b, m, deterministic)
+}
+func (dst *ListBreakpointsRequest_BreakpointActionValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Merge(dst, src)
+}
+func (m *ListBreakpointsRequest_BreakpointActionValue) XXX_Size() int {
+	return xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.Size(m)
 }
+func (m *ListBreakpointsRequest_BreakpointActionValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListBreakpointsRequest_BreakpointActionValue proto.InternalMessageInfo
 
 func (m *ListBreakpointsRequest_BreakpointActionValue) GetValue() Breakpoint_Action {
 	if m != nil {
@@ -280,16 +438,38 @@ type ListBreakpointsResponse struct {
 	// The fields `id` and `location` are guaranteed to be set on each breakpoint.
 	// The fields: `stack_frames`, `evaluated_expressions` and `variable_table`
 	// are cleared on each breakpoint regardless of its status.
-	Breakpoints []*Breakpoint `protobuf:"bytes,1,rep,name=breakpoints" json:"breakpoints,omitempty"`
+	Breakpoints []*Breakpoint `protobuf:"bytes,1,rep,name=breakpoints,proto3" json:"breakpoints,omitempty"`
 	// A wait token that can be used in the next call to `list` (REST) or
 	// `ListBreakpoints` (RPC) to block until the list of breakpoints has changes.
-	NextWaitToken string `protobuf:"bytes,2,opt,name=next_wait_token,json=nextWaitToken" json:"next_wait_token,omitempty"`
+	NextWaitToken        string   `protobuf:"bytes,2,opt,name=next_wait_token,json=nextWaitToken,proto3" json:"next_wait_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListBreakpointsResponse) Reset()         { *m = ListBreakpointsResponse{} }
+func (m *ListBreakpointsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListBreakpointsResponse) ProtoMessage()    {}
+func (*ListBreakpointsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{6}
+}
+func (m *ListBreakpointsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBreakpointsResponse.Unmarshal(m, b)
+}
+func (m *ListBreakpointsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBreakpointsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListBreakpointsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBreakpointsResponse.Merge(dst, src)
+}
+func (m *ListBreakpointsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListBreakpointsResponse.Size(m)
+}
+func (m *ListBreakpointsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBreakpointsResponse.DiscardUnknown(m)
 }
 
-func (m *ListBreakpointsResponse) Reset()                    { *m = ListBreakpointsResponse{} }
-func (m *ListBreakpointsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListBreakpointsResponse) ProtoMessage()               {}
-func (*ListBreakpointsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+var xxx_messageInfo_ListBreakpointsResponse proto.InternalMessageInfo
 
 func (m *ListBreakpointsResponse) GetBreakpoints() []*Breakpoint {
 	if m != nil {
@@ -308,19 +488,41 @@ func (m *ListBreakpointsResponse) GetNextWaitToken() string {
 // Request to list debuggees.
 type ListDebuggeesRequest struct {
 	// Project number of a Google Cloud project whose debuggees to list.
-	Project string `protobuf:"bytes,2,opt,name=project" json:"project,omitempty"`
+	Project string `protobuf:"bytes,2,opt,name=project,proto3" json:"project,omitempty"`
 	// When set to `true`, the result includes all debuggees. Otherwise, the
 	// result includes only debuggees that are active.
-	IncludeInactive bool `protobuf:"varint,3,opt,name=include_inactive,json=includeInactive" json:"include_inactive,omitempty"`
+	IncludeInactive bool `protobuf:"varint,3,opt,name=include_inactive,json=includeInactive,proto3" json:"include_inactive,omitempty"`
 	// The client version making the call.
 	// Schema: `domain/type/version` (e.g., `google.com/intellij/v1`).
-	ClientVersion string `protobuf:"bytes,4,opt,name=client_version,json=clientVersion" json:"client_version,omitempty"`
+	ClientVersion        string   `protobuf:"bytes,4,opt,name=client_version,json=clientVersion,proto3" json:"client_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDebuggeesRequest) Reset()                    { *m = ListDebuggeesRequest{} }
-func (m *ListDebuggeesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDebuggeesRequest) ProtoMessage()               {}
-func (*ListDebuggeesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+func (m *ListDebuggeesRequest) Reset()         { *m = ListDebuggeesRequest{} }
+func (m *ListDebuggeesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDebuggeesRequest) ProtoMessage()    {}
+func (*ListDebuggeesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{7}
+}
+func (m *ListDebuggeesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDebuggeesRequest.Unmarshal(m, b)
+}
+func (m *ListDebuggeesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDebuggeesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDebuggeesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDebuggeesRequest.Merge(dst, src)
+}
+func (m *ListDebuggeesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDebuggeesRequest.Size(m)
+}
+func (m *ListDebuggeesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDebuggeesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDebuggeesRequest proto.InternalMessageInfo
 
 func (m *ListDebuggeesRequest) GetProject() string {
 	if m != nil {
@@ -349,13 +551,35 @@ type ListDebuggeesResponse struct {
 	// The fields `debuggee.id` and `description` are guaranteed to be set.
 	// The `description` field is a human readable field provided by agents and
 	// can be displayed to users.
-	Debuggees []*Debuggee `protobuf:"bytes,1,rep,name=debuggees" json:"debuggees,omitempty"`
+	Debuggees            []*Debuggee `protobuf:"bytes,1,rep,name=debuggees,proto3" json:"debuggees,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *ListDebuggeesResponse) Reset()         { *m = ListDebuggeesResponse{} }
+func (m *ListDebuggeesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDebuggeesResponse) ProtoMessage()    {}
+func (*ListDebuggeesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_debugger_04096ebac35efe72, []int{8}
+}
+func (m *ListDebuggeesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDebuggeesResponse.Unmarshal(m, b)
+}
+func (m *ListDebuggeesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDebuggeesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDebuggeesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDebuggeesResponse.Merge(dst, src)
+}
+func (m *ListDebuggeesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDebuggeesResponse.Size(m)
+}
+func (m *ListDebuggeesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDebuggeesResponse.DiscardUnknown(m)
 }
 
-func (m *ListDebuggeesResponse) Reset()                    { *m = ListDebuggeesResponse{} }
-func (m *ListDebuggeesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDebuggeesResponse) ProtoMessage()               {}
-func (*ListDebuggeesResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+var xxx_messageInfo_ListDebuggeesResponse proto.InternalMessageInfo
 
 func (m *ListDebuggeesResponse) GetDebuggees() []*Debuggee {
 	if m != nil {
@@ -385,15 +609,16 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Debugger2 service
-
+// Debugger2Client is the client API for Debugger2 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type Debugger2Client interface {
 	// Sets the breakpoint to the debuggee.
 	SetBreakpoint(ctx context.Context, in *SetBreakpointRequest, opts ...grpc.CallOption) (*SetBreakpointResponse, error)
 	// Gets breakpoint information.
 	GetBreakpoint(ctx context.Context, in *GetBreakpointRequest, opts ...grpc.CallOption) (*GetBreakpointResponse, error)
 	// Deletes the breakpoint from the debuggee.
-	DeleteBreakpoint(ctx context.Context, in *DeleteBreakpointRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
+	DeleteBreakpoint(ctx context.Context, in *DeleteBreakpointRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Lists all breakpoints for the debuggee.
 	ListBreakpoints(ctx context.Context, in *ListBreakpointsRequest, opts ...grpc.CallOption) (*ListBreakpointsResponse, error)
 	// Lists all the debuggees that the user has access to.
@@ -410,7 +635,7 @@ func NewDebugger2Client(cc *grpc.ClientConn) Debugger2Client {
 
 func (c *debugger2Client) SetBreakpoint(ctx context.Context, in *SetBreakpointRequest, opts ...grpc.CallOption) (*SetBreakpointResponse, error) {
 	out := new(SetBreakpointResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/SetBreakpoint", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/SetBreakpoint", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -419,16 +644,16 @@ func (c *debugger2Client) SetBreakpoint(ctx context.Context, in *SetBreakpointRe
 
 func (c *debugger2Client) GetBreakpoint(ctx context.Context, in *GetBreakpointRequest, opts ...grpc.CallOption) (*GetBreakpointResponse, error) {
 	out := new(GetBreakpointResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/GetBreakpoint", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/GetBreakpoint", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *debugger2Client) DeleteBreakpoint(ctx context.Context, in *DeleteBreakpointRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/DeleteBreakpoint", in, out, c.cc, opts...)
+func (c *debugger2Client) DeleteBreakpoint(ctx context.Context, in *DeleteBreakpointRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/DeleteBreakpoint", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -437,7 +662,7 @@ func (c *debugger2Client) DeleteBreakpoint(ctx context.Context, in *DeleteBreakp
 
 func (c *debugger2Client) ListBreakpoints(ctx context.Context, in *ListBreakpointsRequest, opts ...grpc.CallOption) (*ListBreakpointsResponse, error) {
 	out := new(ListBreakpointsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/ListBreakpoints", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/ListBreakpoints", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -446,22 +671,21 @@ func (c *debugger2Client) ListBreakpoints(ctx context.Context, in *ListBreakpoin
 
 func (c *debugger2Client) ListDebuggees(ctx context.Context, in *ListDebuggeesRequest, opts ...grpc.CallOption) (*ListDebuggeesResponse, error) {
 	out := new(ListDebuggeesResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/ListDebuggees", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/ListDebuggees", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Debugger2 service
-
+// Debugger2Server is the server API for Debugger2 service.
 type Debugger2Server interface {
 	// Sets the breakpoint to the debuggee.
 	SetBreakpoint(context.Context, *SetBreakpointRequest) (*SetBreakpointResponse, error)
 	// Gets breakpoint information.
 	GetBreakpoint(context.Context, *GetBreakpointRequest) (*GetBreakpointResponse, error)
 	// Deletes the breakpoint from the debuggee.
-	DeleteBreakpoint(context.Context, *DeleteBreakpointRequest) (*google_protobuf3.Empty, error)
+	DeleteBreakpoint(context.Context, *DeleteBreakpointRequest) (*empty.Empty, error)
 	// Lists all breakpoints for the debuggee.
 	ListBreakpoints(context.Context, *ListBreakpointsRequest) (*ListBreakpointsResponse, error)
 	// Lists all the debuggees that the user has access to.
@@ -591,9 +815,11 @@ var _Debugger2_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/clouddebugger/v2/debugger.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/clouddebugger/v2/debugger.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/devtools/clouddebugger/v2/debugger.proto", fileDescriptor_debugger_04096ebac35efe72)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_debugger_04096ebac35efe72 = []byte{
 	// 797 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6a, 0xdb, 0x48,
 	0x14, 0x66, 0x9c, 0xcd, 0x8f, 0x8f, 0xe3, 0x24, 0x3b, 0xe4, 0x47, 0x78, 0xff, 0x8c, 0xf6, 0x87,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
index 2d4317dc..e2309193 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/common.pb.go
@@ -1,47 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/common.proto
 
-/*
-Package clouderrorreporting is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/clouderrorreporting/v1beta1/common.proto
-	google/devtools/clouderrorreporting/v1beta1/error_group_service.proto
-	google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto
-	google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto
-
-It has these top-level messages:
-	ErrorGroup
-	TrackingIssue
-	ErrorEvent
-	ServiceContext
-	ErrorContext
-	HttpRequestContext
-	SourceLocation
-	GetGroupRequest
-	UpdateGroupRequest
-	ListGroupStatsRequest
-	ListGroupStatsResponse
-	ErrorGroupStats
-	TimedCount
-	ListEventsRequest
-	ListEventsResponse
-	QueryTimeRange
-	ServiceContextFilter
-	DeleteEventsRequest
-	DeleteEventsResponse
-	ReportErrorEventRequest
-	ReportErrorEventResponse
-	ReportedErrorEvent
-*/
-package clouderrorreporting
+package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
 import _ "google.golang.org/genproto/googleapis/api/monitoredres"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -58,18 +25,40 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type ErrorGroup struct {
 	// The group resource name.
 	// Example: <code>projects/my-project-123/groups/my-groupid</code>
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Group IDs are unique for a given project. If the same kind of error
 	// occurs in different service contexts, it will receive the same group ID.
-	GroupId string `protobuf:"bytes,2,opt,name=group_id,json=groupId" json:"group_id,omitempty"`
+	GroupId string `protobuf:"bytes,2,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
 	// Associated tracking issues.
-	TrackingIssues []*TrackingIssue `protobuf:"bytes,3,rep,name=tracking_issues,json=trackingIssues" json:"tracking_issues,omitempty"`
+	TrackingIssues       []*TrackingIssue `protobuf:"bytes,3,rep,name=tracking_issues,json=trackingIssues,proto3" json:"tracking_issues,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *ErrorGroup) Reset()                    { *m = ErrorGroup{} }
-func (m *ErrorGroup) String() string            { return proto.CompactTextString(m) }
-func (*ErrorGroup) ProtoMessage()               {}
-func (*ErrorGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *ErrorGroup) Reset()         { *m = ErrorGroup{} }
+func (m *ErrorGroup) String() string { return proto.CompactTextString(m) }
+func (*ErrorGroup) ProtoMessage()    {}
+func (*ErrorGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_dcadb19d8ee67f84, []int{0}
+}
+func (m *ErrorGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErrorGroup.Unmarshal(m, b)
+}
+func (m *ErrorGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErrorGroup.Marshal(b, m, deterministic)
+}
+func (dst *ErrorGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorGroup.Merge(dst, src)
+}
+func (m *ErrorGroup) XXX_Size() int {
+	return xxx_messageInfo_ErrorGroup.Size(m)
+}
+func (m *ErrorGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErrorGroup.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ErrorGroup proto.InternalMessageInfo
 
 func (m *ErrorGroup) GetName() string {
 	if m != nil {
@@ -96,13 +85,35 @@ func (m *ErrorGroup) GetTrackingIssues() []*TrackingIssue {
 type TrackingIssue struct {
 	// A URL pointing to a related entry in an issue tracking system.
 	// Example: https://github.com/user/project/issues/4
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url                  string   `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TrackingIssue) Reset()                    { *m = TrackingIssue{} }
-func (m *TrackingIssue) String() string            { return proto.CompactTextString(m) }
-func (*TrackingIssue) ProtoMessage()               {}
-func (*TrackingIssue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *TrackingIssue) Reset()         { *m = TrackingIssue{} }
+func (m *TrackingIssue) String() string { return proto.CompactTextString(m) }
+func (*TrackingIssue) ProtoMessage()    {}
+func (*TrackingIssue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_dcadb19d8ee67f84, []int{1}
+}
+func (m *TrackingIssue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TrackingIssue.Unmarshal(m, b)
+}
+func (m *TrackingIssue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TrackingIssue.Marshal(b, m, deterministic)
+}
+func (dst *TrackingIssue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TrackingIssue.Merge(dst, src)
+}
+func (m *TrackingIssue) XXX_Size() int {
+	return xxx_messageInfo_TrackingIssue.Size(m)
+}
+func (m *TrackingIssue) XXX_DiscardUnknown() {
+	xxx_messageInfo_TrackingIssue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TrackingIssue proto.InternalMessageInfo
 
 func (m *TrackingIssue) GetUrl() string {
 	if m != nil {
@@ -116,21 +127,43 @@ type ErrorEvent struct {
 	// Time when the event occurred as provided in the error report.
 	// If the report did not contain a timestamp, the time the error was received
 	// by the Error Reporting system is used.
-	EventTime *google_protobuf1.Timestamp `protobuf:"bytes,1,opt,name=event_time,json=eventTime" json:"event_time,omitempty"`
+	EventTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
 	// The `ServiceContext` for which this error was reported.
-	ServiceContext *ServiceContext `protobuf:"bytes,2,opt,name=service_context,json=serviceContext" json:"service_context,omitempty"`
+	ServiceContext *ServiceContext `protobuf:"bytes,2,opt,name=service_context,json=serviceContext,proto3" json:"service_context,omitempty"`
 	// The stack trace that was reported or logged by the service.
-	Message string `protobuf:"bytes,3,opt,name=message" json:"message,omitempty"`
+	Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
 	// Data about the context in which the error occurred.
-	Context *ErrorContext `protobuf:"bytes,5,opt,name=context" json:"context,omitempty"`
+	Context              *ErrorContext `protobuf:"bytes,5,opt,name=context,proto3" json:"context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ErrorEvent) Reset()         { *m = ErrorEvent{} }
+func (m *ErrorEvent) String() string { return proto.CompactTextString(m) }
+func (*ErrorEvent) ProtoMessage()    {}
+func (*ErrorEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_dcadb19d8ee67f84, []int{2}
+}
+func (m *ErrorEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErrorEvent.Unmarshal(m, b)
+}
+func (m *ErrorEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErrorEvent.Marshal(b, m, deterministic)
+}
+func (dst *ErrorEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorEvent.Merge(dst, src)
+}
+func (m *ErrorEvent) XXX_Size() int {
+	return xxx_messageInfo_ErrorEvent.Size(m)
+}
+func (m *ErrorEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErrorEvent.DiscardUnknown(m)
 }
 
-func (m *ErrorEvent) Reset()                    { *m = ErrorEvent{} }
-func (m *ErrorEvent) String() string            { return proto.CompactTextString(m) }
-func (*ErrorEvent) ProtoMessage()               {}
-func (*ErrorEvent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_ErrorEvent proto.InternalMessageInfo
 
-func (m *ErrorEvent) GetEventTime() *google_protobuf1.Timestamp {
+func (m *ErrorEvent) GetEventTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EventTime
 	}
@@ -168,22 +201,44 @@ type ServiceContext struct {
 	//
 	// Contains the service name for error reports extracted from Google
 	// App Engine logs or `default` if the App Engine default service is used.
-	Service string `protobuf:"bytes,2,opt,name=service" json:"service,omitempty"`
+	Service string `protobuf:"bytes,2,opt,name=service,proto3" json:"service,omitempty"`
 	// Represents the source code version that the developer provided,
 	// which could represent a version label or a Git SHA-1 hash, for example.
-	Version string `protobuf:"bytes,3,opt,name=version" json:"version,omitempty"`
+	Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
 	// Type of the MonitoredResource. List of possible values:
 	// https://cloud.google.com/monitoring/api/resources
 	//
 	// Value is set automatically for incoming errors and must not be set when
 	// reporting errors.
-	ResourceType string `protobuf:"bytes,4,opt,name=resource_type,json=resourceType" json:"resource_type,omitempty"`
+	ResourceType         string   `protobuf:"bytes,4,opt,name=resource_type,json=resourceType,proto3" json:"resource_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ServiceContext) Reset()                    { *m = ServiceContext{} }
-func (m *ServiceContext) String() string            { return proto.CompactTextString(m) }
-func (*ServiceContext) ProtoMessage()               {}
-func (*ServiceContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ServiceContext) Reset()         { *m = ServiceContext{} }
+func (m *ServiceContext) String() string { return proto.CompactTextString(m) }
+func (*ServiceContext) ProtoMessage()    {}
+func (*ServiceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_dcadb19d8ee67f84, []int{3}
+}
+func (m *ServiceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceContext.Unmarshal(m, b)
+}
+func (m *ServiceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceContext.Marshal(b, m, deterministic)
+}
+func (dst *ServiceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceContext.Merge(dst, src)
+}
+func (m *ServiceContext) XXX_Size() int {
+	return xxx_messageInfo_ServiceContext.Size(m)
+}
+func (m *ServiceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServiceContext proto.InternalMessageInfo
 
 func (m *ServiceContext) GetService() string {
 	if m != nil {
@@ -213,7 +268,7 @@ func (m *ServiceContext) GetResourceType() string {
 type ErrorContext struct {
 	// The HTTP request which was processed when the error was
 	// triggered.
-	HttpRequest *HttpRequestContext `protobuf:"bytes,1,opt,name=http_request,json=httpRequest" json:"http_request,omitempty"`
+	HttpRequest *HttpRequestContext `protobuf:"bytes,1,opt,name=http_request,json=httpRequest,proto3" json:"http_request,omitempty"`
 	// The user who caused or was affected by the crash.
 	// This can be a user ID, an email address, or an arbitrary token that
 	// uniquely identifies the user.
@@ -222,20 +277,42 @@ type ErrorContext struct {
 	// Error Reporting system will use other data, such as remote IP address, to
 	// distinguish affected users. See `affected_users_count` in
 	// `ErrorGroupStats`.
-	User string `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"`
+	User string `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"`
 	// The location in the source code where the decision was made to
 	// report the error, usually the place where it was logged.
 	// For a logged exception this would be the source line where the
 	// exception is logged, usually close to the place where it was
 	// caught. This value is in contrast to `Exception.cause_location`,
 	// which describes the source line where the exception was thrown.
-	ReportLocation *SourceLocation `protobuf:"bytes,3,opt,name=report_location,json=reportLocation" json:"report_location,omitempty"`
+	ReportLocation       *SourceLocation `protobuf:"bytes,3,opt,name=report_location,json=reportLocation,proto3" json:"report_location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *ErrorContext) Reset()         { *m = ErrorContext{} }
+func (m *ErrorContext) String() string { return proto.CompactTextString(m) }
+func (*ErrorContext) ProtoMessage()    {}
+func (*ErrorContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_dcadb19d8ee67f84, []int{4}
+}
+func (m *ErrorContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErrorContext.Unmarshal(m, b)
+}
+func (m *ErrorContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErrorContext.Marshal(b, m, deterministic)
+}
+func (dst *ErrorContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorContext.Merge(dst, src)
+}
+func (m *ErrorContext) XXX_Size() int {
+	return xxx_messageInfo_ErrorContext.Size(m)
+}
+func (m *ErrorContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErrorContext.DiscardUnknown(m)
 }
 
-func (m *ErrorContext) Reset()                    { *m = ErrorContext{} }
-func (m *ErrorContext) String() string            { return proto.CompactTextString(m) }
-func (*ErrorContext) ProtoMessage()               {}
-func (*ErrorContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ErrorContext proto.InternalMessageInfo
 
 func (m *ErrorContext) GetHttpRequest() *HttpRequestContext {
 	if m != nil {
@@ -264,26 +341,48 @@ func (m *ErrorContext) GetReportLocation() *SourceLocation {
 // error report has been generated automatically from Google App Engine logs.
 type HttpRequestContext struct {
 	// The type of HTTP request, such as `GET`, `POST`, etc.
-	Method string `protobuf:"bytes,1,opt,name=method" json:"method,omitempty"`
+	Method string `protobuf:"bytes,1,opt,name=method,proto3" json:"method,omitempty"`
 	// The URL of the request.
-	Url string `protobuf:"bytes,2,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"`
 	// The user agent information that is provided with the request.
-	UserAgent string `protobuf:"bytes,3,opt,name=user_agent,json=userAgent" json:"user_agent,omitempty"`
+	UserAgent string `protobuf:"bytes,3,opt,name=user_agent,json=userAgent,proto3" json:"user_agent,omitempty"`
 	// The referrer information that is provided with the request.
-	Referrer string `protobuf:"bytes,4,opt,name=referrer" json:"referrer,omitempty"`
+	Referrer string `protobuf:"bytes,4,opt,name=referrer,proto3" json:"referrer,omitempty"`
 	// The HTTP response status code for the request.
-	ResponseStatusCode int32 `protobuf:"varint,5,opt,name=response_status_code,json=responseStatusCode" json:"response_status_code,omitempty"`
+	ResponseStatusCode int32 `protobuf:"varint,5,opt,name=response_status_code,json=responseStatusCode,proto3" json:"response_status_code,omitempty"`
 	// The IP address from which the request originated.
 	// This can be IPv4, IPv6, or a token which is derived from the
 	// IP address, depending on the data that has been provided
 	// in the error report.
-	RemoteIp string `protobuf:"bytes,6,opt,name=remote_ip,json=remoteIp" json:"remote_ip,omitempty"`
+	RemoteIp             string   `protobuf:"bytes,6,opt,name=remote_ip,json=remoteIp,proto3" json:"remote_ip,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HttpRequestContext) Reset()         { *m = HttpRequestContext{} }
+func (m *HttpRequestContext) String() string { return proto.CompactTextString(m) }
+func (*HttpRequestContext) ProtoMessage()    {}
+func (*HttpRequestContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_dcadb19d8ee67f84, []int{5}
+}
+func (m *HttpRequestContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpRequestContext.Unmarshal(m, b)
+}
+func (m *HttpRequestContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpRequestContext.Marshal(b, m, deterministic)
+}
+func (dst *HttpRequestContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpRequestContext.Merge(dst, src)
+}
+func (m *HttpRequestContext) XXX_Size() int {
+	return xxx_messageInfo_HttpRequestContext.Size(m)
+}
+func (m *HttpRequestContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpRequestContext.DiscardUnknown(m)
 }
 
-func (m *HttpRequestContext) Reset()                    { *m = HttpRequestContext{} }
-func (m *HttpRequestContext) String() string            { return proto.CompactTextString(m) }
-func (*HttpRequestContext) ProtoMessage()               {}
-func (*HttpRequestContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_HttpRequestContext proto.InternalMessageInfo
 
 func (m *HttpRequestContext) GetMethod() string {
 	if m != nil {
@@ -335,19 +434,41 @@ func (m *HttpRequestContext) GetRemoteIp() string {
 type SourceLocation struct {
 	// The source code filename, which can include a truncated relative
 	// path, or a full path from a production machine.
-	FilePath string `protobuf:"bytes,1,opt,name=file_path,json=filePath" json:"file_path,omitempty"`
+	FilePath string `protobuf:"bytes,1,opt,name=file_path,json=filePath,proto3" json:"file_path,omitempty"`
 	// 1-based. 0 indicates that the line number is unknown.
-	LineNumber int32 `protobuf:"varint,2,opt,name=line_number,json=lineNumber" json:"line_number,omitempty"`
+	LineNumber int32 `protobuf:"varint,2,opt,name=line_number,json=lineNumber,proto3" json:"line_number,omitempty"`
 	// Human-readable name of a function or method.
 	// The value can include optional context like the class or package name.
 	// For example, `my.package.MyClass.method` in case of Java.
-	FunctionName string `protobuf:"bytes,4,opt,name=function_name,json=functionName" json:"function_name,omitempty"`
+	FunctionName         string   `protobuf:"bytes,4,opt,name=function_name,json=functionName,proto3" json:"function_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SourceLocation) Reset()         { *m = SourceLocation{} }
+func (m *SourceLocation) String() string { return proto.CompactTextString(m) }
+func (*SourceLocation) ProtoMessage()    {}
+func (*SourceLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_dcadb19d8ee67f84, []int{6}
+}
+func (m *SourceLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceLocation.Unmarshal(m, b)
+}
+func (m *SourceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceLocation.Marshal(b, m, deterministic)
+}
+func (dst *SourceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceLocation.Merge(dst, src)
+}
+func (m *SourceLocation) XXX_Size() int {
+	return xxx_messageInfo_SourceLocation.Size(m)
+}
+func (m *SourceLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceLocation.DiscardUnknown(m)
 }
 
-func (m *SourceLocation) Reset()                    { *m = SourceLocation{} }
-func (m *SourceLocation) String() string            { return proto.CompactTextString(m) }
-func (*SourceLocation) ProtoMessage()               {}
-func (*SourceLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_SourceLocation proto.InternalMessageInfo
 
 func (m *SourceLocation) GetFilePath() string {
 	if m != nil {
@@ -381,10 +502,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/common.proto", fileDescriptor0)
+	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/common.proto", fileDescriptor_common_dcadb19d8ee67f84)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_common_dcadb19d8ee67f84 = []byte{
 	// 705 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0x13, 0x31,
 	0x10, 0x56, 0x92, 0xfe, 0xc5, 0x69, 0x53, 0x64, 0x21, 0x14, 0x02, 0xa8, 0x25, 0xbd, 0x54, 0x42,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
index 3ac9e4d7..1e8d26c8 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/error_group_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/error_group_service.proto
 
-package clouderrorreporting
+package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -18,6 +18,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A request to return an individual group.
 type GetGroupRequest struct {
 	// [Required] The group resource name. Written as
@@ -28,13 +34,35 @@ type GetGroupRequest struct {
 	// this project.
 	//
 	// Example: <code>projects/my-project-123/groups/my-group</code>
-	GroupName string `protobuf:"bytes,1,opt,name=group_name,json=groupName" json:"group_name,omitempty"`
+	GroupName            string   `protobuf:"bytes,1,opt,name=group_name,json=groupName,proto3" json:"group_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetGroupRequest) Reset()         { *m = GetGroupRequest{} }
+func (m *GetGroupRequest) String() string { return proto.CompactTextString(m) }
+func (*GetGroupRequest) ProtoMessage()    {}
+func (*GetGroupRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_group_service_bac55f35b4462f66, []int{0}
+}
+func (m *GetGroupRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetGroupRequest.Unmarshal(m, b)
+}
+func (m *GetGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetGroupRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGroupRequest.Merge(dst, src)
+}
+func (m *GetGroupRequest) XXX_Size() int {
+	return xxx_messageInfo_GetGroupRequest.Size(m)
+}
+func (m *GetGroupRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetGroupRequest.DiscardUnknown(m)
 }
 
-func (m *GetGroupRequest) Reset()                    { *m = GetGroupRequest{} }
-func (m *GetGroupRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetGroupRequest) ProtoMessage()               {}
-func (*GetGroupRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_GetGroupRequest proto.InternalMessageInfo
 
 func (m *GetGroupRequest) GetGroupName() string {
 	if m != nil {
@@ -46,13 +74,35 @@ func (m *GetGroupRequest) GetGroupName() string {
 // A request to replace the existing data for the given group.
 type UpdateGroupRequest struct {
 	// [Required] The group which replaces the resource on the server.
-	Group *ErrorGroup `protobuf:"bytes,1,opt,name=group" json:"group,omitempty"`
+	Group                *ErrorGroup `protobuf:"bytes,1,opt,name=group,proto3" json:"group,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *UpdateGroupRequest) Reset()                    { *m = UpdateGroupRequest{} }
-func (m *UpdateGroupRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateGroupRequest) ProtoMessage()               {}
-func (*UpdateGroupRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *UpdateGroupRequest) Reset()         { *m = UpdateGroupRequest{} }
+func (m *UpdateGroupRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateGroupRequest) ProtoMessage()    {}
+func (*UpdateGroupRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_group_service_bac55f35b4462f66, []int{1}
+}
+func (m *UpdateGroupRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateGroupRequest.Unmarshal(m, b)
+}
+func (m *UpdateGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateGroupRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateGroupRequest.Merge(dst, src)
+}
+func (m *UpdateGroupRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateGroupRequest.Size(m)
+}
+func (m *UpdateGroupRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateGroupRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateGroupRequest proto.InternalMessageInfo
 
 func (m *UpdateGroupRequest) GetGroup() *ErrorGroup {
 	if m != nil {
@@ -74,8 +124,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ErrorGroupService service
-
+// ErrorGroupServiceClient is the client API for ErrorGroupService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ErrorGroupServiceClient interface {
 	// Get the specified group.
 	GetGroup(ctx context.Context, in *GetGroupRequest, opts ...grpc.CallOption) (*ErrorGroup, error)
@@ -94,7 +145,7 @@ func NewErrorGroupServiceClient(cc *grpc.ClientConn) ErrorGroupServiceClient {
 
 func (c *errorGroupServiceClient) GetGroup(ctx context.Context, in *GetGroupRequest, opts ...grpc.CallOption) (*ErrorGroup, error) {
 	out := new(ErrorGroup)
-	err := grpc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorGroupService/GetGroup", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorGroupService/GetGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -103,15 +154,14 @@ func (c *errorGroupServiceClient) GetGroup(ctx context.Context, in *GetGroupRequ
 
 func (c *errorGroupServiceClient) UpdateGroup(ctx context.Context, in *UpdateGroupRequest, opts ...grpc.CallOption) (*ErrorGroup, error) {
 	out := new(ErrorGroup)
-	err := grpc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorGroupService/UpdateGroup", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorGroupService/UpdateGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ErrorGroupService service
-
+// ErrorGroupServiceServer is the server API for ErrorGroupService service.
 type ErrorGroupServiceServer interface {
 	// Get the specified group.
 	GetGroup(context.Context, *GetGroupRequest) (*ErrorGroup, error)
@@ -178,10 +228,10 @@ var _ErrorGroupService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/error_group_service.proto", fileDescriptor1)
+	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/error_group_service.proto", fileDescriptor_error_group_service_bac55f35b4462f66)
 }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_error_group_service_bac55f35b4462f66 = []byte{
 	// 398 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcb, 0x4a, 0x23, 0x41,
 	0x14, 0x86, 0xe9, 0x0c, 0x33, 0x4c, 0x2a, 0x8b, 0x61, 0x6a, 0x31, 0x0c, 0xcd, 0x0c, 0x48, 0xdc,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
index f1b2544d..bc1bfe8d 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/error_stats_service.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto
 
-package clouderrorreporting
+package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 import (
 	context "golang.org/x/net/context"
@@ -20,6 +20,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Specifies how the time periods of error group counts are aligned.
 type TimedCountAlignment int32
 
@@ -56,7 +62,9 @@ var TimedCountAlignment_value = map[string]int32{
 func (x TimedCountAlignment) String() string {
 	return proto.EnumName(TimedCountAlignment_name, int32(x))
 }
-func (TimedCountAlignment) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (TimedCountAlignment) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{0}
+}
 
 // A sorting order of error groups.
 type ErrorGroupOrder int32
@@ -93,7 +101,9 @@ var ErrorGroupOrder_value = map[string]int32{
 func (x ErrorGroupOrder) String() string {
 	return proto.EnumName(ErrorGroupOrder_name, int32(x))
 }
-func (ErrorGroupOrder) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (ErrorGroupOrder) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{1}
+}
 
 // The supported time ranges.
 type QueryTimeRange_Period int32
@@ -138,7 +148,9 @@ var QueryTimeRange_Period_value = map[string]int32{
 func (x QueryTimeRange_Period) String() string {
 	return proto.EnumName(QueryTimeRange_Period_name, int32(x))
 }
-func (QueryTimeRange_Period) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{6, 0} }
+func (QueryTimeRange_Period) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{6, 0}
+}
 
 // Specifies a set of `ErrorGroupStats` to return.
 type ListGroupStatsRequest struct {
@@ -148,13 +160,13 @@ type ListGroupStatsRequest struct {
 	// Platform project ID</a>.
 	//
 	// Example: <code>projects/my-project-123</code>.
-	ProjectName string `protobuf:"bytes,1,opt,name=project_name,json=projectName" json:"project_name,omitempty"`
+	ProjectName string `protobuf:"bytes,1,opt,name=project_name,json=projectName,proto3" json:"project_name,omitempty"`
 	// [Optional] List all <code>ErrorGroupStats</code> with these IDs.
-	GroupId []string `protobuf:"bytes,2,rep,name=group_id,json=groupId" json:"group_id,omitempty"`
+	GroupId []string `protobuf:"bytes,2,rep,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
 	// [Optional] List only <code>ErrorGroupStats</code> which belong to a service
 	// context that matches the filter.
 	// Data for all service contexts is returned if this field is not specified.
-	ServiceFilter *ServiceContextFilter `protobuf:"bytes,3,opt,name=service_filter,json=serviceFilter" json:"service_filter,omitempty"`
+	ServiceFilter *ServiceContextFilter `protobuf:"bytes,3,opt,name=service_filter,json=serviceFilter,proto3" json:"service_filter,omitempty"`
 	// [Optional] List data for the given time range.
 	// If not set a default time range is used. The field time_range_begin
 	// in the response will specify the beginning of this time range.
@@ -162,32 +174,54 @@ type ListGroupStatsRequest struct {
 	// range are returned, unless the request contains an explicit group_id list.
 	// If a group_id list is given, also <code>ErrorGroupStats</code> with zero
 	// occurrences are returned.
-	TimeRange *QueryTimeRange `protobuf:"bytes,5,opt,name=time_range,json=timeRange" json:"time_range,omitempty"`
+	TimeRange *QueryTimeRange `protobuf:"bytes,5,opt,name=time_range,json=timeRange,proto3" json:"time_range,omitempty"`
 	// [Optional] The preferred duration for a single returned `TimedCount`.
 	// If not set, no timed counts are returned.
-	TimedCountDuration *google_protobuf2.Duration `protobuf:"bytes,6,opt,name=timed_count_duration,json=timedCountDuration" json:"timed_count_duration,omitempty"`
+	TimedCountDuration *duration.Duration `protobuf:"bytes,6,opt,name=timed_count_duration,json=timedCountDuration,proto3" json:"timed_count_duration,omitempty"`
 	// [Optional] The alignment of the timed counts to be returned.
 	// Default is `ALIGNMENT_EQUAL_AT_END`.
-	Alignment TimedCountAlignment `protobuf:"varint,7,opt,name=alignment,enum=google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment" json:"alignment,omitempty"`
+	Alignment TimedCountAlignment `protobuf:"varint,7,opt,name=alignment,proto3,enum=google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment" json:"alignment,omitempty"`
 	// [Optional] Time where the timed counts shall be aligned if rounded
 	// alignment is chosen. Default is 00:00 UTC.
-	AlignmentTime *google_protobuf1.Timestamp `protobuf:"bytes,8,opt,name=alignment_time,json=alignmentTime" json:"alignment_time,omitempty"`
+	AlignmentTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=alignment_time,json=alignmentTime,proto3" json:"alignment_time,omitempty"`
 	// [Optional] The sort order in which the results are returned.
 	// Default is `COUNT_DESC`.
-	Order ErrorGroupOrder `protobuf:"varint,9,opt,name=order,enum=google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder" json:"order,omitempty"`
+	Order ErrorGroupOrder `protobuf:"varint,9,opt,name=order,proto3,enum=google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder" json:"order,omitempty"`
 	// [Optional] The maximum number of results to return per response.
 	// Default is 20.
-	PageSize int32 `protobuf:"varint,11,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,11,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// [Optional] A `next_page_token` provided by a previous response. To view
 	// additional results, pass this token along with the identical query
 	// parameters as the first request.
-	PageToken string `protobuf:"bytes,12,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,12,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListGroupStatsRequest) Reset()         { *m = ListGroupStatsRequest{} }
+func (m *ListGroupStatsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListGroupStatsRequest) ProtoMessage()    {}
+func (*ListGroupStatsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{0}
+}
+func (m *ListGroupStatsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListGroupStatsRequest.Unmarshal(m, b)
+}
+func (m *ListGroupStatsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListGroupStatsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListGroupStatsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupStatsRequest.Merge(dst, src)
+}
+func (m *ListGroupStatsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListGroupStatsRequest.Size(m)
+}
+func (m *ListGroupStatsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListGroupStatsRequest.DiscardUnknown(m)
 }
 
-func (m *ListGroupStatsRequest) Reset()                    { *m = ListGroupStatsRequest{} }
-func (m *ListGroupStatsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListGroupStatsRequest) ProtoMessage()               {}
-func (*ListGroupStatsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_ListGroupStatsRequest proto.InternalMessageInfo
 
 func (m *ListGroupStatsRequest) GetProjectName() string {
 	if m != nil {
@@ -217,7 +251,7 @@ func (m *ListGroupStatsRequest) GetTimeRange() *QueryTimeRange {
 	return nil
 }
 
-func (m *ListGroupStatsRequest) GetTimedCountDuration() *google_protobuf2.Duration {
+func (m *ListGroupStatsRequest) GetTimedCountDuration() *duration.Duration {
 	if m != nil {
 		return m.TimedCountDuration
 	}
@@ -231,7 +265,7 @@ func (m *ListGroupStatsRequest) GetAlignment() TimedCountAlignment {
 	return TimedCountAlignment_ERROR_COUNT_ALIGNMENT_UNSPECIFIED
 }
 
-func (m *ListGroupStatsRequest) GetAlignmentTime() *google_protobuf1.Timestamp {
+func (m *ListGroupStatsRequest) GetAlignmentTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.AlignmentTime
 	}
@@ -262,22 +296,44 @@ func (m *ListGroupStatsRequest) GetPageToken() string {
 // Contains a set of requested error group stats.
 type ListGroupStatsResponse struct {
 	// The error group stats which match the given request.
-	ErrorGroupStats []*ErrorGroupStats `protobuf:"bytes,1,rep,name=error_group_stats,json=errorGroupStats" json:"error_group_stats,omitempty"`
+	ErrorGroupStats []*ErrorGroupStats `protobuf:"bytes,1,rep,name=error_group_stats,json=errorGroupStats,proto3" json:"error_group_stats,omitempty"`
 	// If non-empty, more results are available.
 	// Pass this token, along with the same query parameters as the first
 	// request, to view the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
 	// The timestamp specifies the start time to which the request was restricted.
 	// The start time is set based on the requested time range. It may be adjusted
 	// to a later time if a project has exceeded the storage quota and older data
 	// has been deleted.
-	TimeRangeBegin *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=time_range_begin,json=timeRangeBegin" json:"time_range_begin,omitempty"`
+	TimeRangeBegin       *timestamp.Timestamp `protobuf:"bytes,4,opt,name=time_range_begin,json=timeRangeBegin,proto3" json:"time_range_begin,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *ListGroupStatsResponse) Reset()         { *m = ListGroupStatsResponse{} }
+func (m *ListGroupStatsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListGroupStatsResponse) ProtoMessage()    {}
+func (*ListGroupStatsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{1}
+}
+func (m *ListGroupStatsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListGroupStatsResponse.Unmarshal(m, b)
+}
+func (m *ListGroupStatsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListGroupStatsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListGroupStatsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupStatsResponse.Merge(dst, src)
+}
+func (m *ListGroupStatsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListGroupStatsResponse.Size(m)
+}
+func (m *ListGroupStatsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListGroupStatsResponse.DiscardUnknown(m)
 }
 
-func (m *ListGroupStatsResponse) Reset()                    { *m = ListGroupStatsResponse{} }
-func (m *ListGroupStatsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListGroupStatsResponse) ProtoMessage()               {}
-func (*ListGroupStatsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_ListGroupStatsResponse proto.InternalMessageInfo
 
 func (m *ListGroupStatsResponse) GetErrorGroupStats() []*ErrorGroupStats {
 	if m != nil {
@@ -293,7 +349,7 @@ func (m *ListGroupStatsResponse) GetNextPageToken() string {
 	return ""
 }
 
-func (m *ListGroupStatsResponse) GetTimeRangeBegin() *google_protobuf1.Timestamp {
+func (m *ListGroupStatsResponse) GetTimeRangeBegin() *timestamp.Timestamp {
 	if m != nil {
 		return m.TimeRangeBegin
 	}
@@ -304,10 +360,10 @@ func (m *ListGroupStatsResponse) GetTimeRangeBegin() *google_protobuf1.Timestamp
 // such as a given time period and/or service filter.
 type ErrorGroupStats struct {
 	// Group data that is independent of the filter criteria.
-	Group *ErrorGroup `protobuf:"bytes,1,opt,name=group" json:"group,omitempty"`
+	Group *ErrorGroup `protobuf:"bytes,1,opt,name=group,proto3" json:"group,omitempty"`
 	// Approximate total number of events in the given group that match
 	// the filter criteria.
-	Count int64 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
+	Count int64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
 	// Approximate number of affected users in the given group that
 	// match the filter criteria.
 	// Users are distinguished by data in the `ErrorContext` of the
@@ -320,41 +376,63 @@ type ErrorGroupStats struct {
 	// context that was provided in the error report. If more users are
 	// implicitly affected, such as due to a crash of the whole service,
 	// this is not reflected here.
-	AffectedUsersCount int64 `protobuf:"varint,3,opt,name=affected_users_count,json=affectedUsersCount" json:"affected_users_count,omitempty"`
+	AffectedUsersCount int64 `protobuf:"varint,3,opt,name=affected_users_count,json=affectedUsersCount,proto3" json:"affected_users_count,omitempty"`
 	// Approximate number of occurrences over time.
 	// Timed counts returned by ListGroups are guaranteed to be:
 	//
 	// - Inside the requested time interval
 	// - Non-overlapping, and
 	// - Ordered by ascending time.
-	TimedCounts []*TimedCount `protobuf:"bytes,4,rep,name=timed_counts,json=timedCounts" json:"timed_counts,omitempty"`
+	TimedCounts []*TimedCount `protobuf:"bytes,4,rep,name=timed_counts,json=timedCounts,proto3" json:"timed_counts,omitempty"`
 	// Approximate first occurrence that was ever seen for this group
 	// and which matches the given filter criteria, ignoring the
 	// time_range that was specified in the request.
-	FirstSeenTime *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=first_seen_time,json=firstSeenTime" json:"first_seen_time,omitempty"`
+	FirstSeenTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=first_seen_time,json=firstSeenTime,proto3" json:"first_seen_time,omitempty"`
 	// Approximate last occurrence that was ever seen for this group and
 	// which matches the given filter criteria, ignoring the time_range
 	// that was specified in the request.
-	LastSeenTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=last_seen_time,json=lastSeenTime" json:"last_seen_time,omitempty"`
+	LastSeenTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=last_seen_time,json=lastSeenTime,proto3" json:"last_seen_time,omitempty"`
 	// Service contexts with a non-zero error count for the given filter
 	// criteria. This list can be truncated if multiple services are affected.
 	// Refer to `num_affected_services` for the total count.
-	AffectedServices []*ServiceContext `protobuf:"bytes,7,rep,name=affected_services,json=affectedServices" json:"affected_services,omitempty"`
+	AffectedServices []*ServiceContext `protobuf:"bytes,7,rep,name=affected_services,json=affectedServices,proto3" json:"affected_services,omitempty"`
 	// The total number of services with a non-zero error count for the given
 	// filter criteria.
-	NumAffectedServices int32 `protobuf:"varint,8,opt,name=num_affected_services,json=numAffectedServices" json:"num_affected_services,omitempty"`
+	NumAffectedServices int32 `protobuf:"varint,8,opt,name=num_affected_services,json=numAffectedServices,proto3" json:"num_affected_services,omitempty"`
 	// An arbitrary event that is chosen as representative for the whole group.
 	// The representative event is intended to be used as a quick preview for
 	// the whole group. Events in the group are usually sufficiently similar
 	// to each other such that showing an arbitrary representative provides
 	// insight into the characteristics of the group as a whole.
-	Representative *ErrorEvent `protobuf:"bytes,9,opt,name=representative" json:"representative,omitempty"`
+	Representative       *ErrorEvent `protobuf:"bytes,9,opt,name=representative,proto3" json:"representative,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *ErrorGroupStats) Reset()                    { *m = ErrorGroupStats{} }
-func (m *ErrorGroupStats) String() string            { return proto.CompactTextString(m) }
-func (*ErrorGroupStats) ProtoMessage()               {}
-func (*ErrorGroupStats) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+func (m *ErrorGroupStats) Reset()         { *m = ErrorGroupStats{} }
+func (m *ErrorGroupStats) String() string { return proto.CompactTextString(m) }
+func (*ErrorGroupStats) ProtoMessage()    {}
+func (*ErrorGroupStats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{2}
+}
+func (m *ErrorGroupStats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErrorGroupStats.Unmarshal(m, b)
+}
+func (m *ErrorGroupStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErrorGroupStats.Marshal(b, m, deterministic)
+}
+func (dst *ErrorGroupStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorGroupStats.Merge(dst, src)
+}
+func (m *ErrorGroupStats) XXX_Size() int {
+	return xxx_messageInfo_ErrorGroupStats.Size(m)
+}
+func (m *ErrorGroupStats) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErrorGroupStats.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ErrorGroupStats proto.InternalMessageInfo
 
 func (m *ErrorGroupStats) GetGroup() *ErrorGroup {
 	if m != nil {
@@ -384,14 +462,14 @@ func (m *ErrorGroupStats) GetTimedCounts() []*TimedCount {
 	return nil
 }
 
-func (m *ErrorGroupStats) GetFirstSeenTime() *google_protobuf1.Timestamp {
+func (m *ErrorGroupStats) GetFirstSeenTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FirstSeenTime
 	}
 	return nil
 }
 
-func (m *ErrorGroupStats) GetLastSeenTime() *google_protobuf1.Timestamp {
+func (m *ErrorGroupStats) GetLastSeenTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastSeenTime
 	}
@@ -424,17 +502,39 @@ func (m *ErrorGroupStats) GetRepresentative() *ErrorEvent {
 // before counting them.
 type TimedCount struct {
 	// Approximate number of occurrences in the given time period.
-	Count int64 `protobuf:"varint,1,opt,name=count" json:"count,omitempty"`
+	Count int64 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
 	// Start of the time period to which `count` refers (included).
-	StartTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End of the time period to which `count` refers (excluded).
-	EndTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *TimedCount) Reset()                    { *m = TimedCount{} }
-func (m *TimedCount) String() string            { return proto.CompactTextString(m) }
-func (*TimedCount) ProtoMessage()               {}
-func (*TimedCount) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+func (m *TimedCount) Reset()         { *m = TimedCount{} }
+func (m *TimedCount) String() string { return proto.CompactTextString(m) }
+func (*TimedCount) ProtoMessage()    {}
+func (*TimedCount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{3}
+}
+func (m *TimedCount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimedCount.Unmarshal(m, b)
+}
+func (m *TimedCount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimedCount.Marshal(b, m, deterministic)
+}
+func (dst *TimedCount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimedCount.Merge(dst, src)
+}
+func (m *TimedCount) XXX_Size() int {
+	return xxx_messageInfo_TimedCount.Size(m)
+}
+func (m *TimedCount) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimedCount.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TimedCount proto.InternalMessageInfo
 
 func (m *TimedCount) GetCount() int64 {
 	if m != nil {
@@ -443,14 +543,14 @@ func (m *TimedCount) GetCount() int64 {
 	return 0
 }
 
-func (m *TimedCount) GetStartTime() *google_protobuf1.Timestamp {
+func (m *TimedCount) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *TimedCount) GetEndTime() *google_protobuf1.Timestamp {
+func (m *TimedCount) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -464,27 +564,49 @@ type ListEventsRequest struct {
 	// [Google Cloud Platform project
 	// ID](https://support.google.com/cloud/answer/6158840).
 	// Example: `projects/my-project-123`.
-	ProjectName string `protobuf:"bytes,1,opt,name=project_name,json=projectName" json:"project_name,omitempty"`
+	ProjectName string `protobuf:"bytes,1,opt,name=project_name,json=projectName,proto3" json:"project_name,omitempty"`
 	// [Required] The group for which events shall be returned.
-	GroupId string `protobuf:"bytes,2,opt,name=group_id,json=groupId" json:"group_id,omitempty"`
+	GroupId string `protobuf:"bytes,2,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
 	// [Optional] List only ErrorGroups which belong to a service context that
 	// matches the filter.
 	// Data for all service contexts is returned if this field is not specified.
-	ServiceFilter *ServiceContextFilter `protobuf:"bytes,3,opt,name=service_filter,json=serviceFilter" json:"service_filter,omitempty"`
+	ServiceFilter *ServiceContextFilter `protobuf:"bytes,3,opt,name=service_filter,json=serviceFilter,proto3" json:"service_filter,omitempty"`
 	// [Optional] List only data for the given time range.
 	// If not set a default time range is used. The field time_range_begin
 	// in the response will specify the beginning of this time range.
-	TimeRange *QueryTimeRange `protobuf:"bytes,4,opt,name=time_range,json=timeRange" json:"time_range,omitempty"`
+	TimeRange *QueryTimeRange `protobuf:"bytes,4,opt,name=time_range,json=timeRange,proto3" json:"time_range,omitempty"`
 	// [Optional] The maximum number of results to return per response.
-	PageSize int32 `protobuf:"varint,6,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,6,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// [Optional] A `next_page_token` provided by a previous response.
-	PageToken string `protobuf:"bytes,7,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,7,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListEventsRequest) Reset()                    { *m = ListEventsRequest{} }
-func (m *ListEventsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListEventsRequest) ProtoMessage()               {}
-func (*ListEventsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+func (m *ListEventsRequest) Reset()         { *m = ListEventsRequest{} }
+func (m *ListEventsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListEventsRequest) ProtoMessage()    {}
+func (*ListEventsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{4}
+}
+func (m *ListEventsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListEventsRequest.Unmarshal(m, b)
+}
+func (m *ListEventsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListEventsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListEventsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEventsRequest.Merge(dst, src)
+}
+func (m *ListEventsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListEventsRequest.Size(m)
+}
+func (m *ListEventsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListEventsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListEventsRequest proto.InternalMessageInfo
 
 func (m *ListEventsRequest) GetProjectName() string {
 	if m != nil {
@@ -531,19 +653,41 @@ func (m *ListEventsRequest) GetPageToken() string {
 // Contains a set of requested error events.
 type ListEventsResponse struct {
 	// The error events which match the given request.
-	ErrorEvents []*ErrorEvent `protobuf:"bytes,1,rep,name=error_events,json=errorEvents" json:"error_events,omitempty"`
+	ErrorEvents []*ErrorEvent `protobuf:"bytes,1,rep,name=error_events,json=errorEvents,proto3" json:"error_events,omitempty"`
 	// If non-empty, more results are available.
 	// Pass this token, along with the same query parameters as the first
 	// request, to view the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
 	// The timestamp specifies the start time to which the request was restricted.
-	TimeRangeBegin *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=time_range_begin,json=timeRangeBegin" json:"time_range_begin,omitempty"`
+	TimeRangeBegin       *timestamp.Timestamp `protobuf:"bytes,4,opt,name=time_range_begin,json=timeRangeBegin,proto3" json:"time_range_begin,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *ListEventsResponse) Reset()         { *m = ListEventsResponse{} }
+func (m *ListEventsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListEventsResponse) ProtoMessage()    {}
+func (*ListEventsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{5}
+}
+func (m *ListEventsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListEventsResponse.Unmarshal(m, b)
+}
+func (m *ListEventsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListEventsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListEventsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListEventsResponse.Merge(dst, src)
+}
+func (m *ListEventsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListEventsResponse.Size(m)
+}
+func (m *ListEventsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListEventsResponse.DiscardUnknown(m)
 }
 
-func (m *ListEventsResponse) Reset()                    { *m = ListEventsResponse{} }
-func (m *ListEventsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListEventsResponse) ProtoMessage()               {}
-func (*ListEventsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_ListEventsResponse proto.InternalMessageInfo
 
 func (m *ListEventsResponse) GetErrorEvents() []*ErrorEvent {
 	if m != nil {
@@ -559,7 +703,7 @@ func (m *ListEventsResponse) GetNextPageToken() string {
 	return ""
 }
 
-func (m *ListEventsResponse) GetTimeRangeBegin() *google_protobuf1.Timestamp {
+func (m *ListEventsResponse) GetTimeRangeBegin() *timestamp.Timestamp {
 	if m != nil {
 		return m.TimeRangeBegin
 	}
@@ -570,13 +714,35 @@ func (m *ListEventsResponse) GetTimeRangeBegin() *google_protobuf1.Timestamp {
 // adjusted for lower durations.
 type QueryTimeRange struct {
 	// Restricts the query to the specified time range.
-	Period QueryTimeRange_Period `protobuf:"varint,1,opt,name=period,enum=google.devtools.clouderrorreporting.v1beta1.QueryTimeRange_Period" json:"period,omitempty"`
+	Period               QueryTimeRange_Period `protobuf:"varint,1,opt,name=period,proto3,enum=google.devtools.clouderrorreporting.v1beta1.QueryTimeRange_Period" json:"period,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *QueryTimeRange) Reset()                    { *m = QueryTimeRange{} }
-func (m *QueryTimeRange) String() string            { return proto.CompactTextString(m) }
-func (*QueryTimeRange) ProtoMessage()               {}
-func (*QueryTimeRange) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+func (m *QueryTimeRange) Reset()         { *m = QueryTimeRange{} }
+func (m *QueryTimeRange) String() string { return proto.CompactTextString(m) }
+func (*QueryTimeRange) ProtoMessage()    {}
+func (*QueryTimeRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{6}
+}
+func (m *QueryTimeRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryTimeRange.Unmarshal(m, b)
+}
+func (m *QueryTimeRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryTimeRange.Marshal(b, m, deterministic)
+}
+func (dst *QueryTimeRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryTimeRange.Merge(dst, src)
+}
+func (m *QueryTimeRange) XXX_Size() int {
+	return xxx_messageInfo_QueryTimeRange.Size(m)
+}
+func (m *QueryTimeRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryTimeRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryTimeRange proto.InternalMessageInfo
 
 func (m *QueryTimeRange) GetPeriod() QueryTimeRange_Period {
 	if m != nil {
@@ -592,19 +758,41 @@ func (m *QueryTimeRange) GetPeriod() QueryTimeRange_Period {
 type ServiceContextFilter struct {
 	// [Optional] The exact value to match against
 	// [`ServiceContext.service`](/error-reporting/reference/rest/v1beta1/ServiceContext#FIELDS.service).
-	Service string `protobuf:"bytes,2,opt,name=service" json:"service,omitempty"`
+	Service string `protobuf:"bytes,2,opt,name=service,proto3" json:"service,omitempty"`
 	// [Optional] The exact value to match against
 	// [`ServiceContext.version`](/error-reporting/reference/rest/v1beta1/ServiceContext#FIELDS.version).
-	Version string `protobuf:"bytes,3,opt,name=version" json:"version,omitempty"`
+	Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
 	// [Optional] The exact value to match against
 	// [`ServiceContext.resource_type`](/error-reporting/reference/rest/v1beta1/ServiceContext#FIELDS.resource_type).
-	ResourceType string `protobuf:"bytes,4,opt,name=resource_type,json=resourceType" json:"resource_type,omitempty"`
+	ResourceType         string   `protobuf:"bytes,4,opt,name=resource_type,json=resourceType,proto3" json:"resource_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ServiceContextFilter) Reset()         { *m = ServiceContextFilter{} }
+func (m *ServiceContextFilter) String() string { return proto.CompactTextString(m) }
+func (*ServiceContextFilter) ProtoMessage()    {}
+func (*ServiceContextFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{7}
+}
+func (m *ServiceContextFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceContextFilter.Unmarshal(m, b)
+}
+func (m *ServiceContextFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceContextFilter.Marshal(b, m, deterministic)
+}
+func (dst *ServiceContextFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceContextFilter.Merge(dst, src)
+}
+func (m *ServiceContextFilter) XXX_Size() int {
+	return xxx_messageInfo_ServiceContextFilter.Size(m)
+}
+func (m *ServiceContextFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceContextFilter.DiscardUnknown(m)
 }
 
-func (m *ServiceContextFilter) Reset()                    { *m = ServiceContextFilter{} }
-func (m *ServiceContextFilter) String() string            { return proto.CompactTextString(m) }
-func (*ServiceContextFilter) ProtoMessage()               {}
-func (*ServiceContextFilter) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+var xxx_messageInfo_ServiceContextFilter proto.InternalMessageInfo
 
 func (m *ServiceContextFilter) GetService() string {
 	if m != nil {
@@ -634,13 +822,35 @@ type DeleteEventsRequest struct {
 	// [Google Cloud Platform project
 	// ID](https://support.google.com/cloud/answer/6158840).
 	// Example: `projects/my-project-123`.
-	ProjectName string `protobuf:"bytes,1,opt,name=project_name,json=projectName" json:"project_name,omitempty"`
+	ProjectName          string   `protobuf:"bytes,1,opt,name=project_name,json=projectName,proto3" json:"project_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteEventsRequest) Reset()         { *m = DeleteEventsRequest{} }
+func (m *DeleteEventsRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteEventsRequest) ProtoMessage()    {}
+func (*DeleteEventsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{8}
+}
+func (m *DeleteEventsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteEventsRequest.Unmarshal(m, b)
+}
+func (m *DeleteEventsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteEventsRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteEventsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteEventsRequest.Merge(dst, src)
+}
+func (m *DeleteEventsRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteEventsRequest.Size(m)
+}
+func (m *DeleteEventsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteEventsRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteEventsRequest) Reset()                    { *m = DeleteEventsRequest{} }
-func (m *DeleteEventsRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteEventsRequest) ProtoMessage()               {}
-func (*DeleteEventsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+var xxx_messageInfo_DeleteEventsRequest proto.InternalMessageInfo
 
 func (m *DeleteEventsRequest) GetProjectName() string {
 	if m != nil {
@@ -651,12 +861,34 @@ func (m *DeleteEventsRequest) GetProjectName() string {
 
 // Response message for deleting error events.
 type DeleteEventsResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteEventsResponse) Reset()                    { *m = DeleteEventsResponse{} }
-func (m *DeleteEventsResponse) String() string            { return proto.CompactTextString(m) }
-func (*DeleteEventsResponse) ProtoMessage()               {}
-func (*DeleteEventsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+func (m *DeleteEventsResponse) Reset()         { *m = DeleteEventsResponse{} }
+func (m *DeleteEventsResponse) String() string { return proto.CompactTextString(m) }
+func (*DeleteEventsResponse) ProtoMessage()    {}
+func (*DeleteEventsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_stats_service_e8c4e88969c09e61, []int{9}
+}
+func (m *DeleteEventsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteEventsResponse.Unmarshal(m, b)
+}
+func (m *DeleteEventsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteEventsResponse.Marshal(b, m, deterministic)
+}
+func (dst *DeleteEventsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteEventsResponse.Merge(dst, src)
+}
+func (m *DeleteEventsResponse) XXX_Size() int {
+	return xxx_messageInfo_DeleteEventsResponse.Size(m)
+}
+func (m *DeleteEventsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteEventsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteEventsResponse proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*ListGroupStatsRequest)(nil), "google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest")
@@ -682,8 +914,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ErrorStatsService service
-
+// ErrorStatsServiceClient is the client API for ErrorStatsService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ErrorStatsServiceClient interface {
 	// Lists the specified groups.
 	ListGroupStats(ctx context.Context, in *ListGroupStatsRequest, opts ...grpc.CallOption) (*ListGroupStatsResponse, error)
@@ -703,7 +936,7 @@ func NewErrorStatsServiceClient(cc *grpc.ClientConn) ErrorStatsServiceClient {
 
 func (c *errorStatsServiceClient) ListGroupStats(ctx context.Context, in *ListGroupStatsRequest, opts ...grpc.CallOption) (*ListGroupStatsResponse, error) {
 	out := new(ListGroupStatsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorStatsService/ListGroupStats", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorStatsService/ListGroupStats", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -712,7 +945,7 @@ func (c *errorStatsServiceClient) ListGroupStats(ctx context.Context, in *ListGr
 
 func (c *errorStatsServiceClient) ListEvents(ctx context.Context, in *ListEventsRequest, opts ...grpc.CallOption) (*ListEventsResponse, error) {
 	out := new(ListEventsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorStatsService/ListEvents", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorStatsService/ListEvents", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -721,15 +954,14 @@ func (c *errorStatsServiceClient) ListEvents(ctx context.Context, in *ListEvents
 
 func (c *errorStatsServiceClient) DeleteEvents(ctx context.Context, in *DeleteEventsRequest, opts ...grpc.CallOption) (*DeleteEventsResponse, error) {
 	out := new(DeleteEventsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorStatsService/DeleteEvents", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ErrorStatsService/DeleteEvents", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ErrorStatsService service
-
+// ErrorStatsServiceServer is the server API for ErrorStatsService service.
 type ErrorStatsServiceServer interface {
 	// Lists the specified groups.
 	ListGroupStats(context.Context, *ListGroupStatsRequest) (*ListGroupStatsResponse, error)
@@ -819,10 +1051,10 @@ var _ErrorStatsService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto", fileDescriptor2)
+	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto", fileDescriptor_error_stats_service_e8c4e88969c09e61)
 }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_error_stats_service_e8c4e88969c09e61 = []byte{
 	// 1328 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcd, 0x6f, 0x1b, 0x45,
 	0x14, 0x67, 0xed, 0x38, 0x89, 0x9f, 0x1d, 0xc7, 0x99, 0xa4, 0xe9, 0xd6, 0xe5, 0x23, 0x75, 0x05,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
index 326ee8f3..ea75ba13 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1/report_errors_service.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto
 
-package clouderrorreporting
+package clouderrorreporting // import "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 import (
 	context "golang.org/x/net/context"
@@ -19,21 +19,49 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A request for reporting an individual error event.
 type ReportErrorEventRequest struct {
 	// [Required] The resource name of the Google Cloud Platform project. Written
 	// as `projects/` plus the
 	// [Google Cloud Platform project ID](https://support.google.com/cloud/answer/6158840).
 	// Example: `projects/my-project-123`.
-	ProjectName string `protobuf:"bytes,1,opt,name=project_name,json=projectName" json:"project_name,omitempty"`
+	ProjectName string `protobuf:"bytes,1,opt,name=project_name,json=projectName,proto3" json:"project_name,omitempty"`
 	// [Required] The error event to be reported.
-	Event *ReportedErrorEvent `protobuf:"bytes,2,opt,name=event" json:"event,omitempty"`
+	Event                *ReportedErrorEvent `protobuf:"bytes,2,opt,name=event,proto3" json:"event,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *ReportErrorEventRequest) Reset()                    { *m = ReportErrorEventRequest{} }
-func (m *ReportErrorEventRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReportErrorEventRequest) ProtoMessage()               {}
-func (*ReportErrorEventRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (m *ReportErrorEventRequest) Reset()         { *m = ReportErrorEventRequest{} }
+func (m *ReportErrorEventRequest) String() string { return proto.CompactTextString(m) }
+func (*ReportErrorEventRequest) ProtoMessage()    {}
+func (*ReportErrorEventRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_report_errors_service_7b4a77afec65ac92, []int{0}
+}
+func (m *ReportErrorEventRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportErrorEventRequest.Unmarshal(m, b)
+}
+func (m *ReportErrorEventRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportErrorEventRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReportErrorEventRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportErrorEventRequest.Merge(dst, src)
+}
+func (m *ReportErrorEventRequest) XXX_Size() int {
+	return xxx_messageInfo_ReportErrorEventRequest.Size(m)
+}
+func (m *ReportErrorEventRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportErrorEventRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReportErrorEventRequest proto.InternalMessageInfo
 
 func (m *ReportErrorEventRequest) GetProjectName() string {
 	if m != nil {
@@ -52,36 +80,80 @@ func (m *ReportErrorEventRequest) GetEvent() *ReportedErrorEvent {
 // Response for reporting an individual error event.
 // Data may be added to this message in the future.
 type ReportErrorEventResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ReportErrorEventResponse) Reset()                    { *m = ReportErrorEventResponse{} }
-func (m *ReportErrorEventResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReportErrorEventResponse) ProtoMessage()               {}
-func (*ReportErrorEventResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+func (m *ReportErrorEventResponse) Reset()         { *m = ReportErrorEventResponse{} }
+func (m *ReportErrorEventResponse) String() string { return proto.CompactTextString(m) }
+func (*ReportErrorEventResponse) ProtoMessage()    {}
+func (*ReportErrorEventResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_report_errors_service_7b4a77afec65ac92, []int{1}
+}
+func (m *ReportErrorEventResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportErrorEventResponse.Unmarshal(m, b)
+}
+func (m *ReportErrorEventResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportErrorEventResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReportErrorEventResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportErrorEventResponse.Merge(dst, src)
+}
+func (m *ReportErrorEventResponse) XXX_Size() int {
+	return xxx_messageInfo_ReportErrorEventResponse.Size(m)
+}
+func (m *ReportErrorEventResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportErrorEventResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReportErrorEventResponse proto.InternalMessageInfo
 
 // An error event which is reported to the Error Reporting system.
 type ReportedErrorEvent struct {
 	// [Optional] Time when the event occurred.
 	// If not provided, the time when the event was received by the
 	// Error Reporting system will be used.
-	EventTime *google_protobuf1.Timestamp `protobuf:"bytes,1,opt,name=event_time,json=eventTime" json:"event_time,omitempty"`
+	EventTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
 	// [Required] The service context in which this error has occurred.
-	ServiceContext *ServiceContext `protobuf:"bytes,2,opt,name=service_context,json=serviceContext" json:"service_context,omitempty"`
+	ServiceContext *ServiceContext `protobuf:"bytes,2,opt,name=service_context,json=serviceContext,proto3" json:"service_context,omitempty"`
 	// [Required] A message describing the error. The message can contain an
 	// exception stack in one of the supported programming languages and formats.
 	// In that case, the message is parsed and detailed exception information
 	// is returned when retrieving the error event again.
-	Message string `protobuf:"bytes,3,opt,name=message" json:"message,omitempty"`
+	Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
 	// [Optional] A description of the context in which the error occurred.
-	Context *ErrorContext `protobuf:"bytes,4,opt,name=context" json:"context,omitempty"`
+	Context              *ErrorContext `protobuf:"bytes,4,opt,name=context,proto3" json:"context,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ReportedErrorEvent) Reset()         { *m = ReportedErrorEvent{} }
+func (m *ReportedErrorEvent) String() string { return proto.CompactTextString(m) }
+func (*ReportedErrorEvent) ProtoMessage()    {}
+func (*ReportedErrorEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_report_errors_service_7b4a77afec65ac92, []int{2}
+}
+func (m *ReportedErrorEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportedErrorEvent.Unmarshal(m, b)
+}
+func (m *ReportedErrorEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportedErrorEvent.Marshal(b, m, deterministic)
+}
+func (dst *ReportedErrorEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportedErrorEvent.Merge(dst, src)
+}
+func (m *ReportedErrorEvent) XXX_Size() int {
+	return xxx_messageInfo_ReportedErrorEvent.Size(m)
+}
+func (m *ReportedErrorEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportedErrorEvent.DiscardUnknown(m)
 }
 
-func (m *ReportedErrorEvent) Reset()                    { *m = ReportedErrorEvent{} }
-func (m *ReportedErrorEvent) String() string            { return proto.CompactTextString(m) }
-func (*ReportedErrorEvent) ProtoMessage()               {}
-func (*ReportedErrorEvent) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
+var xxx_messageInfo_ReportedErrorEvent proto.InternalMessageInfo
 
-func (m *ReportedErrorEvent) GetEventTime() *google_protobuf1.Timestamp {
+func (m *ReportedErrorEvent) GetEventTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EventTime
 	}
@@ -123,8 +195,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ReportErrorsService service
-
+// ReportErrorsServiceClient is the client API for ReportErrorsService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ReportErrorsServiceClient interface {
 	// Report an individual error event.
 	//
@@ -147,15 +220,14 @@ func NewReportErrorsServiceClient(cc *grpc.ClientConn) ReportErrorsServiceClient
 
 func (c *reportErrorsServiceClient) ReportErrorEvent(ctx context.Context, in *ReportErrorEventRequest, opts ...grpc.CallOption) (*ReportErrorEventResponse, error) {
 	out := new(ReportErrorEventResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ReportErrorsService/ReportErrorEvent", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.clouderrorreporting.v1beta1.ReportErrorsService/ReportErrorEvent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ReportErrorsService service
-
+// ReportErrorsServiceServer is the server API for ReportErrorsService service.
 type ReportErrorsServiceServer interface {
 	// Report an individual error event.
 	//
@@ -204,10 +276,10 @@ var _ReportErrorsService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto", fileDescriptor3)
+	proto.RegisterFile("google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto", fileDescriptor_report_errors_service_7b4a77afec65ac92)
 }
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_report_errors_service_7b4a77afec65ac92 = []byte{
 	// 490 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xcd, 0x8a, 0x13, 0x41,
 	0x10, 0xc7, 0x99, 0xf8, 0xb1, 0x6c, 0x47, 0x54, 0xda, 0x83, 0xc3, 0x20, 0xb8, 0xc6, 0xcb, 0xa2,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2/profiler.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
index 01450fe7..d4630701 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2/profiler.pb.go
@@ -1,26 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudprofiler/v2/profiler.proto
 
-/*
-Package cloudprofiler is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/cloudprofiler/v2/profiler.proto
-
-It has these top-level messages:
-	CreateProfileRequest
-	UpdateProfileRequest
-	Profile
-	Deployment
-*/
-package cloudprofiler
+package cloudprofiler // import "google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
+import duration "github.com/golang/protobuf/ptypes/duration"
 import _ "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -50,12 +39,22 @@ const (
 	ProfileType_CPU ProfileType = 1
 	// Wallclock time sampling. More expensive as stops all threads.
 	ProfileType_WALL ProfileType = 2
-	// Heap allocation sampling.
+	// In-use heap profile. Represents a snapshot of the allocations that are
+	// live at the time of the profiling.
 	ProfileType_HEAP ProfileType = 3
 	// Single-shot collection of all thread stacks.
 	ProfileType_THREADS ProfileType = 4
 	// Synchronization contention profile.
 	ProfileType_CONTENTION ProfileType = 5
+	// Peak heap profile.
+	ProfileType_PEAK_HEAP ProfileType = 6
+	// Heap allocation profile. It represents the aggregation of all allocations
+	// made over the duration of the profile. All allocations are included,
+	// including those that might have been freed by the end of the profiling
+	// interval. The profile is in particular useful for garbage collecting
+	// languages to understand which parts of the code create most of the garbage
+	// collection pressure to see if those can be optimized.
+	ProfileType_HEAP_ALLOC ProfileType = 7
 )
 
 var ProfileType_name = map[int32]string{
@@ -65,6 +64,8 @@ var ProfileType_name = map[int32]string{
 	3: "HEAP",
 	4: "THREADS",
 	5: "CONTENTION",
+	6: "PEAK_HEAP",
+	7: "HEAP_ALLOC",
 }
 var ProfileType_value = map[string]int32{
 	"PROFILE_TYPE_UNSPECIFIED": 0,
@@ -73,34 +74,63 @@ var ProfileType_value = map[string]int32{
 	"HEAP":       3,
 	"THREADS":    4,
 	"CONTENTION": 5,
+	"PEAK_HEAP":  6,
+	"HEAP_ALLOC": 7,
 }
 
 func (x ProfileType) String() string {
 	return proto.EnumName(ProfileType_name, int32(x))
 }
-func (ProfileType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (ProfileType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_profiler_24c6f5803c16363e, []int{0}
+}
 
-// CreateProfileRequest describes a profile resource creation request.
-// Deployment field must be populated for both online and offline modes.
-// For the online mode, profile field is not set and the profile_type specifies
-// the list of profile types supported by the agent. The creation call will hang
-// until a profile of one of these types needs to be collected. For offline
-// mode, profile field must be set, profile_type must be empty, and deployment
-// field must be identical to the deployment in the profile.
+// CreateProfileRequest describes a profile resource online creation request.
+// The deployment field must be populated. The profile_type specifies the list
+// of profile types supported by the agent. The creation call will hang until a
+// profile of one of these types needs to be collected.
 type CreateProfileRequest struct {
+	// Parent project to create the profile in.
+	Parent string `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Deployment details.
-	Deployment *Deployment `protobuf:"bytes,1,opt,name=deployment" json:"deployment,omitempty"`
-	// Online mode: One or more profile types that the agent is capable of
-	// providing.
-	ProfileType []ProfileType `protobuf:"varint,2,rep,packed,name=profile_type,json=profileType,enum=google.devtools.cloudprofiler.v2.ProfileType" json:"profile_type,omitempty"`
-	// Offline mode: Contents of the profile to create.
-	Profile *Profile `protobuf:"bytes,3,opt,name=profile" json:"profile,omitempty"`
+	Deployment *Deployment `protobuf:"bytes,1,opt,name=deployment,proto3" json:"deployment,omitempty"`
+	// One or more profile types that the agent is capable of providing.
+	ProfileType          []ProfileType `protobuf:"varint,2,rep,packed,name=profile_type,json=profileType,proto3,enum=google.devtools.cloudprofiler.v2.ProfileType" json:"profile_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *CreateProfileRequest) Reset()                    { *m = CreateProfileRequest{} }
-func (m *CreateProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateProfileRequest) ProtoMessage()               {}
-func (*CreateProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *CreateProfileRequest) Reset()         { *m = CreateProfileRequest{} }
+func (m *CreateProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateProfileRequest) ProtoMessage()    {}
+func (*CreateProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_profiler_24c6f5803c16363e, []int{0}
+}
+func (m *CreateProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateProfileRequest.Unmarshal(m, b)
+}
+func (m *CreateProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateProfileRequest.Merge(dst, src)
+}
+func (m *CreateProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateProfileRequest.Size(m)
+}
+func (m *CreateProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateProfileRequest proto.InternalMessageInfo
+
+func (m *CreateProfileRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
 
 func (m *CreateProfileRequest) GetDeployment() *Deployment {
 	if m != nil {
@@ -116,7 +146,50 @@ func (m *CreateProfileRequest) GetProfileType() []ProfileType {
 	return nil
 }
 
-func (m *CreateProfileRequest) GetProfile() *Profile {
+// CreateOfflineProfileRequest describes a profile resource offline creation
+// request. Profile field must be set.
+type CreateOfflineProfileRequest struct {
+	// Parent project to create the profile in.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Contents of the profile to create.
+	Profile              *Profile `protobuf:"bytes,2,opt,name=profile,proto3" json:"profile,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateOfflineProfileRequest) Reset()         { *m = CreateOfflineProfileRequest{} }
+func (m *CreateOfflineProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateOfflineProfileRequest) ProtoMessage()    {}
+func (*CreateOfflineProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_profiler_24c6f5803c16363e, []int{1}
+}
+func (m *CreateOfflineProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateOfflineProfileRequest.Unmarshal(m, b)
+}
+func (m *CreateOfflineProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateOfflineProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateOfflineProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateOfflineProfileRequest.Merge(dst, src)
+}
+func (m *CreateOfflineProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateOfflineProfileRequest.Size(m)
+}
+func (m *CreateOfflineProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateOfflineProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateOfflineProfileRequest proto.InternalMessageInfo
+
+func (m *CreateOfflineProfileRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateOfflineProfileRequest) GetProfile() *Profile {
 	if m != nil {
 		return m.Profile
 	}
@@ -126,13 +199,40 @@ func (m *CreateProfileRequest) GetProfile() *Profile {
 // UpdateProfileRequest contains the profile to update.
 type UpdateProfileRequest struct {
 	// Profile to update
-	Profile *Profile `protobuf:"bytes,1,opt,name=profile" json:"profile,omitempty"`
+	Profile *Profile `protobuf:"bytes,1,opt,name=profile,proto3" json:"profile,omitempty"`
+	// Field mask used to specify the fields to be overwritten. Currently only
+	// profile_bytes and labels fields are supported by UpdateProfile, so only
+	// those fields can be specified in the mask. When no mask is provided, all
+	// fields are overwritten.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateProfileRequest) Reset()                    { *m = UpdateProfileRequest{} }
-func (m *UpdateProfileRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateProfileRequest) ProtoMessage()               {}
-func (*UpdateProfileRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *UpdateProfileRequest) Reset()         { *m = UpdateProfileRequest{} }
+func (m *UpdateProfileRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateProfileRequest) ProtoMessage()    {}
+func (*UpdateProfileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_profiler_24c6f5803c16363e, []int{2}
+}
+func (m *UpdateProfileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateProfileRequest.Unmarshal(m, b)
+}
+func (m *UpdateProfileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateProfileRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateProfileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateProfileRequest.Merge(dst, src)
+}
+func (m *UpdateProfileRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateProfileRequest.Size(m)
+}
+func (m *UpdateProfileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateProfileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateProfileRequest proto.InternalMessageInfo
 
 func (m *UpdateProfileRequest) GetProfile() *Profile {
 	if m != nil {
@@ -141,37 +241,65 @@ func (m *UpdateProfileRequest) GetProfile() *Profile {
 	return nil
 }
 
+func (m *UpdateProfileRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
 // Profile resource.
 type Profile struct {
-	// Opaque, server-assigned, unique ID for this profile.
-	// Output only.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// Output only. Opaque, server-assigned, unique ID for this profile.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Type of profile.
-	// Input (for the offline mode) or output (for the online mode).
-	ProfileType ProfileType `protobuf:"varint,2,opt,name=profile_type,json=profileType,enum=google.devtools.cloudprofiler.v2.ProfileType" json:"profile_type,omitempty"`
+	// For offline mode, this must be specified when creating the profile. For
+	// online mode it is assigned and returned by the server.
+	ProfileType ProfileType `protobuf:"varint,2,opt,name=profile_type,json=profileType,proto3,enum=google.devtools.cloudprofiler.v2.ProfileType" json:"profile_type,omitempty"`
 	// Deployment this profile corresponds to.
-	Deployment *Deployment `protobuf:"bytes,3,opt,name=deployment" json:"deployment,omitempty"`
+	Deployment *Deployment `protobuf:"bytes,3,opt,name=deployment,proto3" json:"deployment,omitempty"`
 	// Duration of the profiling session.
 	// Input (for the offline mode) or output (for the online mode).
 	// The field represents requested profiling duration. It may slightly differ
 	// from the effective profiling duration, which is recorded in the profile
 	// data, in case the profiling can't be stopped immediately (e.g. in case
 	// stopping the profiling is handled asynchronously).
-	Duration *google_protobuf1.Duration `protobuf:"bytes,4,opt,name=duration" json:"duration,omitempty"`
-	// Profile bytes, as a gzip compressed serialized proto, the format is
-	// https://github.com/google/pprof/blob/master/proto/profile.proto.
+	Duration *duration.Duration `protobuf:"bytes,4,opt,name=duration,proto3" json:"duration,omitempty"`
+	// Input only. Profile bytes, as a gzip compressed serialized proto, the
+	// format is https://github.com/google/pprof/blob/master/proto/profile.proto.
 	ProfileBytes []byte `protobuf:"bytes,5,opt,name=profile_bytes,json=profileBytes,proto3" json:"profile_bytes,omitempty"`
-	// Labels associated to this specific profile. These labels will get merged
-	// with the deployment labels for the final data set.
-	// See documentation on deployment labels for validation rules and limits.
-	// Input only, will not be populated on responses.
-	Labels map[string]string `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// Input only. Labels associated to this specific profile. These labels will
+	// get merged with the deployment labels for the final data set.  See
+	// documentation on deployment labels for validation rules and limits.
+	Labels               map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *Profile) Reset()                    { *m = Profile{} }
-func (m *Profile) String() string            { return proto.CompactTextString(m) }
-func (*Profile) ProtoMessage()               {}
-func (*Profile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Profile) Reset()         { *m = Profile{} }
+func (m *Profile) String() string { return proto.CompactTextString(m) }
+func (*Profile) ProtoMessage()    {}
+func (*Profile) Descriptor() ([]byte, []int) {
+	return fileDescriptor_profiler_24c6f5803c16363e, []int{3}
+}
+func (m *Profile) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Profile.Unmarshal(m, b)
+}
+func (m *Profile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Profile.Marshal(b, m, deterministic)
+}
+func (dst *Profile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Profile.Merge(dst, src)
+}
+func (m *Profile) XXX_Size() int {
+	return xxx_messageInfo_Profile.Size(m)
+}
+func (m *Profile) XXX_DiscardUnknown() {
+	xxx_messageInfo_Profile.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Profile proto.InternalMessageInfo
 
 func (m *Profile) GetName() string {
 	if m != nil {
@@ -194,7 +322,7 @@ func (m *Profile) GetDeployment() *Deployment {
 	return nil
 }
 
-func (m *Profile) GetDuration() *google_protobuf1.Duration {
+func (m *Profile) GetDuration() *duration.Duration {
 	if m != nil {
 		return m.Duration
 	}
@@ -219,14 +347,14 @@ func (m *Profile) GetLabels() map[string]string {
 type Deployment struct {
 	// Project ID is the ID of a cloud project.
 	// Validation regex: `^[a-z][-a-z0-9:.]{4,61}[a-z0-9]$`.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Target is the service name used to group related deployments:
 	// * Service name for GAE Flex / Standard.
 	// * Cluster and container name for GKE.
 	// * User-specified string for direct GCE profiling (e.g. Java).
 	// * Job name for Dataflow.
 	// Validation regex: `^[a-z]([-a-z0-9_.]{0,253}[a-z0-9])?$`.
-	Target string `protobuf:"bytes,2,opt,name=target" json:"target,omitempty"`
+	Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"`
 	// Labels identify the deployment within the user universe and same target.
 	// Validation regex for label names: `^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$`.
 	// Value for an individual label must be <= 512 bytes, the total
@@ -240,13 +368,35 @@ type Deployment struct {
 	// should be present describing the deployment location. An example of a zone
 	// is "us-central1-a", an example of a region is "us-central1" or
 	// "us-central".
-	Labels map[string]string `protobuf:"bytes,3,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *Deployment) Reset()                    { *m = Deployment{} }
-func (m *Deployment) String() string            { return proto.CompactTextString(m) }
-func (*Deployment) ProtoMessage()               {}
-func (*Deployment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *Deployment) Reset()         { *m = Deployment{} }
+func (m *Deployment) String() string { return proto.CompactTextString(m) }
+func (*Deployment) ProtoMessage()    {}
+func (*Deployment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_profiler_24c6f5803c16363e, []int{4}
+}
+func (m *Deployment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Deployment.Unmarshal(m, b)
+}
+func (m *Deployment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Deployment.Marshal(b, m, deterministic)
+}
+func (dst *Deployment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployment.Merge(dst, src)
+}
+func (m *Deployment) XXX_Size() int {
+	return xxx_messageInfo_Deployment.Size(m)
+}
+func (m *Deployment) XXX_DiscardUnknown() {
+	xxx_messageInfo_Deployment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Deployment proto.InternalMessageInfo
 
 func (m *Deployment) GetProjectId() string {
 	if m != nil {
@@ -271,9 +421,12 @@ func (m *Deployment) GetLabels() map[string]string {
 
 func init() {
 	proto.RegisterType((*CreateProfileRequest)(nil), "google.devtools.cloudprofiler.v2.CreateProfileRequest")
+	proto.RegisterType((*CreateOfflineProfileRequest)(nil), "google.devtools.cloudprofiler.v2.CreateOfflineProfileRequest")
 	proto.RegisterType((*UpdateProfileRequest)(nil), "google.devtools.cloudprofiler.v2.UpdateProfileRequest")
 	proto.RegisterType((*Profile)(nil), "google.devtools.cloudprofiler.v2.Profile")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.cloudprofiler.v2.Profile.LabelsEntry")
 	proto.RegisterType((*Deployment)(nil), "google.devtools.cloudprofiler.v2.Deployment")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.cloudprofiler.v2.Deployment.LabelsEntry")
 	proto.RegisterEnum("google.devtools.cloudprofiler.v2.ProfileType", ProfileType_name, ProfileType_value)
 }
 
@@ -285,29 +438,32 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ProfilerService service
-
+// ProfilerServiceClient is the client API for ProfilerService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ProfilerServiceClient interface {
-	// CreateProfile creates a new profile resource.
+	// CreateProfile creates a new profile resource in the online mode.
 	//
-	// In the online creation mode:
-	// * The server ensures that the new profiles are created at a constant rate
-	//   per deployment, so the creation request may hang for some time until the
-	//   next profile session is available.
-	// * The request may fail with ABORTED error if the creation is not
-	//   available within ~1m, the response will indicate the duration of the
-	//   backoff the client should take before attempting creating a profile
-	//   again. The backoff duration is returned in google.rpc.RetryInfo extension
-	//   on the response status. To a gRPC client, the extension will be return as
-	//   a binary-serialized proto in the trailing metadata item named
-	//   "google.rpc.retryinfo-bin".
+	// The server ensures that the new profiles are created at a constant rate per
+	// deployment, so the creation request may hang for some time until the next
+	// profile session is available.
 	//
-	// In the offline creation mode:
-	// * The client provides the profile to create along with the profile bytes,
-	//   the server records it.
+	// The request may fail with ABORTED error if the creation is not available
+	// within ~1m, the response will indicate the duration of the backoff the
+	// client should take before attempting creating a profile again. The backoff
+	// duration is returned in google.rpc.RetryInfo extension on the response
+	// status. To a gRPC client, the extension will be return as a
+	// binary-serialized proto in the trailing metadata item named
+	// "google.rpc.retryinfo-bin".
 	CreateProfile(ctx context.Context, in *CreateProfileRequest, opts ...grpc.CallOption) (*Profile, error)
+	// CreateOfflineProfile creates a new profile resource in the offline mode.
+	// The client provides the profile to create along with the profile bytes, the
+	// server records it.
+	CreateOfflineProfile(ctx context.Context, in *CreateOfflineProfileRequest, opts ...grpc.CallOption) (*Profile, error)
 	// UpdateProfile updates the profile bytes and labels on the profile resource
-	// created in the online mode.
+	// created in the online mode. Updating the bytes for profiles created in the
+	// offline mode is currently not supported: the profile content must be
+	// provided at the time of the profile creation.
 	UpdateProfile(ctx context.Context, in *UpdateProfileRequest, opts ...grpc.CallOption) (*Profile, error)
 }
 
@@ -321,45 +477,55 @@ func NewProfilerServiceClient(cc *grpc.ClientConn) ProfilerServiceClient {
 
 func (c *profilerServiceClient) CreateProfile(ctx context.Context, in *CreateProfileRequest, opts ...grpc.CallOption) (*Profile, error) {
 	out := new(Profile)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudprofiler.v2.ProfilerService/CreateProfile", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudprofiler.v2.ProfilerService/CreateProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *profilerServiceClient) UpdateProfile(ctx context.Context, in *UpdateProfileRequest, opts ...grpc.CallOption) (*Profile, error) {
+func (c *profilerServiceClient) CreateOfflineProfile(ctx context.Context, in *CreateOfflineProfileRequest, opts ...grpc.CallOption) (*Profile, error) {
 	out := new(Profile)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudprofiler.v2.ProfilerService/UpdateProfile", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudprofiler.v2.ProfilerService/CreateOfflineProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ProfilerService service
+func (c *profilerServiceClient) UpdateProfile(ctx context.Context, in *UpdateProfileRequest, opts ...grpc.CallOption) (*Profile, error) {
+	out := new(Profile)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudprofiler.v2.ProfilerService/UpdateProfile", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
 
+// ProfilerServiceServer is the server API for ProfilerService service.
 type ProfilerServiceServer interface {
-	// CreateProfile creates a new profile resource.
+	// CreateProfile creates a new profile resource in the online mode.
 	//
-	// In the online creation mode:
-	// * The server ensures that the new profiles are created at a constant rate
-	//   per deployment, so the creation request may hang for some time until the
-	//   next profile session is available.
-	// * The request may fail with ABORTED error if the creation is not
-	//   available within ~1m, the response will indicate the duration of the
-	//   backoff the client should take before attempting creating a profile
-	//   again. The backoff duration is returned in google.rpc.RetryInfo extension
-	//   on the response status. To a gRPC client, the extension will be return as
-	//   a binary-serialized proto in the trailing metadata item named
-	//   "google.rpc.retryinfo-bin".
+	// The server ensures that the new profiles are created at a constant rate per
+	// deployment, so the creation request may hang for some time until the next
+	// profile session is available.
 	//
-	// In the offline creation mode:
-	// * The client provides the profile to create along with the profile bytes,
-	//   the server records it.
+	// The request may fail with ABORTED error if the creation is not available
+	// within ~1m, the response will indicate the duration of the backoff the
+	// client should take before attempting creating a profile again. The backoff
+	// duration is returned in google.rpc.RetryInfo extension on the response
+	// status. To a gRPC client, the extension will be return as a
+	// binary-serialized proto in the trailing metadata item named
+	// "google.rpc.retryinfo-bin".
 	CreateProfile(context.Context, *CreateProfileRequest) (*Profile, error)
+	// CreateOfflineProfile creates a new profile resource in the offline mode.
+	// The client provides the profile to create along with the profile bytes, the
+	// server records it.
+	CreateOfflineProfile(context.Context, *CreateOfflineProfileRequest) (*Profile, error)
 	// UpdateProfile updates the profile bytes and labels on the profile resource
-	// created in the online mode.
+	// created in the online mode. Updating the bytes for profiles created in the
+	// offline mode is currently not supported: the profile content must be
+	// provided at the time of the profile creation.
 	UpdateProfile(context.Context, *UpdateProfileRequest) (*Profile, error)
 }
 
@@ -385,6 +551,24 @@ func _ProfilerService_CreateProfile_Handler(srv interface{}, ctx context.Context
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ProfilerService_CreateOfflineProfile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateOfflineProfileRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ProfilerServiceServer).CreateOfflineProfile(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.cloudprofiler.v2.ProfilerService/CreateOfflineProfile",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ProfilerServiceServer).CreateOfflineProfile(ctx, req.(*CreateOfflineProfileRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _ProfilerService_UpdateProfile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(UpdateProfileRequest)
 	if err := dec(in); err != nil {
@@ -411,6 +595,10 @@ var _ProfilerService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "CreateProfile",
 			Handler:    _ProfilerService_CreateProfile_Handler,
 		},
+		{
+			MethodName: "CreateOfflineProfile",
+			Handler:    _ProfilerService_CreateOfflineProfile_Handler,
+		},
 		{
 			MethodName: "UpdateProfile",
 			Handler:    _ProfilerService_UpdateProfile_Handler,
@@ -420,50 +608,60 @@ var _ProfilerService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/cloudprofiler/v2/profiler.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/cloudprofiler/v2/profiler.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 661 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0x66, 0xe3, 0x34, 0x69, 0x27, 0x6d, 0xb1, 0x56, 0x15, 0x32, 0x51, 0x81, 0x28, 0x5c, 0x42,
-	0x44, 0x6d, 0xc9, 0x55, 0x51, 0x5b, 0xc4, 0xa1, 0x4d, 0x5c, 0x35, 0x52, 0x9a, 0x58, 0x6e, 0x2a,
-	0x04, 0x1c, 0x22, 0xa7, 0xde, 0x5a, 0x06, 0xc7, 0x6b, 0xec, 0x4d, 0xa4, 0xa8, 0xea, 0x85, 0x57,
-	0xe0, 0x11, 0xb8, 0xc2, 0xbb, 0x20, 0xf1, 0x0a, 0x3c, 0x00, 0x77, 0x2e, 0xc8, 0xf6, 0x3a, 0x3f,
-	0x50, 0x94, 0x94, 0x72, 0xdb, 0x99, 0x9d, 0xef, 0xdb, 0x6f, 0x66, 0xd7, 0x9f, 0x41, 0xb1, 0x29,
-	0xb5, 0x5d, 0xa2, 0x58, 0x64, 0xc8, 0x28, 0x75, 0x43, 0xe5, 0xdc, 0xa5, 0x03, 0xcb, 0x0f, 0xe8,
-	0x85, 0xe3, 0x92, 0x40, 0x19, 0xaa, 0x4a, 0xba, 0x96, 0xfd, 0x80, 0x32, 0x8a, 0x4b, 0x09, 0x40,
-	0x4e, 0x01, 0xf2, 0x0c, 0x40, 0x1e, 0xaa, 0xc5, 0x4d, 0x4e, 0x69, 0xfa, 0x8e, 0x62, 0x7a, 0x1e,
-	0x65, 0x26, 0x73, 0xa8, 0x17, 0x26, 0xf8, 0xe2, 0x43, 0xbe, 0x1b, 0x47, 0xbd, 0xc1, 0x85, 0x62,
-	0x0d, 0x82, 0xb8, 0x80, 0xef, 0x3f, 0xfa, 0x7d, 0x9f, 0x39, 0x7d, 0x12, 0x32, 0xb3, 0xef, 0x27,
-	0x05, 0xe5, 0x9f, 0x08, 0x36, 0x6a, 0x01, 0x31, 0x19, 0xd1, 0x93, 0x43, 0x0d, 0xf2, 0x7e, 0x40,
-	0x42, 0x86, 0x9b, 0x00, 0x16, 0xf1, 0x5d, 0x3a, 0xea, 0x13, 0x8f, 0x49, 0xa8, 0x84, 0x2a, 0x05,
-	0xf5, 0xa9, 0x3c, 0x4f, 0xae, 0x5c, 0x1f, 0x63, 0x8c, 0x29, 0x3c, 0xd6, 0x61, 0x95, 0x57, 0x75,
-	0xd9, 0xc8, 0x27, 0x52, 0xa6, 0x24, 0x54, 0xd6, 0xd5, 0xad, 0xf9, 0x7c, 0x5c, 0x55, 0x67, 0xe4,
-	0x13, 0xa3, 0xe0, 0x4f, 0x02, 0x5c, 0x83, 0x3c, 0x0f, 0x25, 0x21, 0x16, 0xf7, 0x64, 0x61, 0x32,
-	0x23, 0x45, 0x96, 0xdf, 0xc0, 0xc6, 0x99, 0x6f, 0xfd, 0xd9, 0xfc, 0x14, 0x39, 0xfa, 0x67, 0xf2,
-	0x4f, 0x02, 0xe4, 0x79, 0x12, 0x63, 0xc8, 0x7a, 0x66, 0x3f, 0x61, 0x5b, 0x31, 0xe2, 0xf5, 0x35,
-	0x33, 0x41, 0xb7, 0x9c, 0xc9, 0xec, 0x9d, 0x09, 0xb7, 0xbc, 0xb3, 0x1d, 0x58, 0x4e, 0x5f, 0x93,
-	0x94, 0x8d, 0xb9, 0xee, 0xa7, 0x5c, 0xe9, 0x73, 0x92, 0xeb, 0xbc, 0xc0, 0x18, 0x97, 0xe2, 0xc7,
-	0xb0, 0x96, 0xb6, 0xd5, 0x1b, 0x31, 0x12, 0x4a, 0x4b, 0x25, 0x54, 0x59, 0x35, 0xd2, 0x5e, 0x0f,
-	0xa3, 0x1c, 0x3e, 0x81, 0x9c, 0x6b, 0xf6, 0x88, 0x1b, 0x4a, 0xb9, 0x92, 0x50, 0x29, 0xa8, 0x3b,
-	0x0b, 0x77, 0x2d, 0x37, 0x63, 0x9c, 0xe6, 0xb1, 0x60, 0x64, 0x70, 0x92, 0xe2, 0x1e, 0x14, 0xa6,
-	0xd2, 0x58, 0x04, 0xe1, 0x1d, 0x19, 0xf1, 0x61, 0x47, 0x4b, 0xbc, 0x01, 0x4b, 0x43, 0xd3, 0x1d,
-	0x24, 0x43, 0x5e, 0x31, 0x92, 0x60, 0x3f, 0xb3, 0x8b, 0xca, 0x5f, 0x11, 0xc0, 0x64, 0x00, 0xf8,
-	0x01, 0x80, 0x1f, 0xd0, 0xb7, 0xe4, 0x9c, 0x75, 0x1d, 0x8b, 0x33, 0xac, 0xf0, 0x4c, 0xc3, 0xc2,
-	0xf7, 0x20, 0xc7, 0xcc, 0xc0, 0x26, 0x8c, 0x13, 0xf1, 0x08, 0xeb, 0xe3, 0x7e, 0x84, 0xb8, 0x9f,
-	0xdd, 0x9b, 0x4c, 0xfd, 0x3f, 0xb7, 0x54, 0x25, 0x50, 0x98, 0x7a, 0x22, 0x78, 0x13, 0x24, 0xdd,
-	0x68, 0x1f, 0x35, 0x9a, 0x5a, 0xb7, 0xf3, 0x4a, 0xd7, 0xba, 0x67, 0xad, 0x53, 0x5d, 0xab, 0x35,
-	0x8e, 0x1a, 0x5a, 0x5d, 0xbc, 0x83, 0xf3, 0x20, 0xd4, 0xf4, 0x33, 0x11, 0xe1, 0x65, 0xc8, 0xbe,
-	0x3c, 0x68, 0x36, 0xc5, 0x4c, 0xb4, 0x3a, 0xd6, 0x0e, 0x74, 0x51, 0xc0, 0x05, 0xc8, 0x77, 0x8e,
-	0x0d, 0xed, 0xa0, 0x7e, 0x2a, 0x66, 0xf1, 0x3a, 0x40, 0xad, 0xdd, 0xea, 0x68, 0xad, 0x4e, 0xa3,
-	0xdd, 0x12, 0x97, 0xd4, 0x1f, 0x19, 0xb8, 0xcb, 0xcf, 0x09, 0x4e, 0x49, 0x30, 0x74, 0xce, 0x09,
-	0xfe, 0x8c, 0x60, 0x6d, 0xc6, 0x4e, 0xf0, 0xb3, 0xf9, 0x93, 0xb8, 0xce, 0x7f, 0x8a, 0x8b, 0x7f,
-	0x71, 0xe5, 0xdd, 0x0f, 0xdf, 0xbe, 0x7f, 0xcc, 0xa8, 0xe5, 0x2d, 0x6e, 0xb0, 0xd1, 0x5d, 0x85,
-	0xca, 0xe5, 0xe4, 0x29, 0xcb, 0x93, 0x2b, 0xbd, 0x4a, 0x1d, 0x38, 0xdc, 0x47, 0x55, 0xfc, 0x05,
-	0xc1, 0xda, 0x8c, 0x01, 0x2c, 0x22, 0xf7, 0x3a, 0xc7, 0xb8, 0x89, 0xdc, 0xbd, 0x58, 0xee, 0xb6,
-	0x5a, 0x89, 0xe4, 0x5e, 0xf2, 0x0a, 0x39, 0xb2, 0x84, 0x17, 0x63, 0xf1, 0xd5, 0xb1, 0x4c, 0xa5,
-	0x7a, 0xb5, 0x9f, 0x5a, 0xca, 0x61, 0xfb, 0xf5, 0x09, 0x3f, 0xc6, 0xa6, 0xae, 0xe9, 0xd9, 0x32,
-	0x0d, 0x6c, 0xc5, 0x26, 0x5e, 0xfc, 0x3d, 0xf2, 0x9f, 0x8f, 0xe9, 0x3b, 0xe1, 0xdf, 0x7f, 0x40,
-	0xcf, 0x67, 0x12, 0xbd, 0x5c, 0x8c, 0xdc, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, 0x83, 0x3f, 0xa6,
-	0xd9, 0xb9, 0x06, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/devtools/cloudprofiler/v2/profiler.proto", fileDescriptor_profiler_24c6f5803c16363e)
+}
+
+var fileDescriptor_profiler_24c6f5803c16363e = []byte{
+	// 786 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5f, 0x6f, 0xda, 0x56,
+	0x14, 0xdf, 0xc5, 0x04, 0xc2, 0x71, 0xc8, 0xac, 0xab, 0x68, 0x62, 0x2c, 0xdb, 0x2c, 0x4f, 0x93,
+	0x18, 0xdb, 0x6c, 0xc9, 0x51, 0xa6, 0xfc, 0x51, 0x34, 0x11, 0x70, 0x14, 0x34, 0x02, 0x96, 0x43,
+	0x34, 0x6d, 0x2f, 0xc8, 0xe0, 0x0b, 0x72, 0x63, 0x6c, 0xd7, 0x36, 0x48, 0xb4, 0xca, 0x4b, 0xd5,
+	0x6f, 0xd0, 0x97, 0xbe, 0xf5, 0xa1, 0x0f, 0x7d, 0xea, 0x87, 0xe8, 0x17, 0xa8, 0x2a, 0xf5, 0x2b,
+	0xf4, 0x83, 0x54, 0xb6, 0xaf, 0x09, 0x24, 0x44, 0x90, 0xa6, 0x6f, 0xe7, 0xde, 0x7b, 0xce, 0xcf,
+	0xbf, 0xdf, 0xb9, 0xc7, 0x3f, 0x1b, 0xa4, 0x81, 0xe3, 0x0c, 0x2c, 0x22, 0x19, 0x64, 0x1c, 0x38,
+	0x8e, 0xe5, 0x4b, 0x3d, 0xcb, 0x19, 0x19, 0xae, 0xe7, 0xf4, 0x4d, 0x8b, 0x78, 0xd2, 0x58, 0x96,
+	0x92, 0x58, 0x74, 0x3d, 0x27, 0x70, 0x30, 0x1f, 0x17, 0x88, 0x49, 0x81, 0x38, 0x57, 0x20, 0x8e,
+	0xe5, 0xe2, 0x36, 0x85, 0xd4, 0x5d, 0x53, 0xd2, 0x6d, 0xdb, 0x09, 0xf4, 0xc0, 0x74, 0x6c, 0x3f,
+	0xae, 0x2f, 0xfe, 0x44, 0x4f, 0xa3, 0x55, 0x77, 0xd4, 0x97, 0x8c, 0x91, 0x17, 0x25, 0xd0, 0x73,
+	0xfe, 0xe6, 0x79, 0xdf, 0x24, 0x96, 0xd1, 0x19, 0xea, 0xfe, 0x25, 0xcd, 0xf8, 0xf9, 0x66, 0x46,
+	0x60, 0x0e, 0x89, 0x1f, 0xe8, 0x43, 0x37, 0x4e, 0x10, 0xde, 0x23, 0xd8, 0xaa, 0x7a, 0x44, 0x0f,
+	0x88, 0x1a, 0xd3, 0xd2, 0xc8, 0xe3, 0x11, 0xf1, 0x03, 0xfc, 0x1d, 0x64, 0x5c, 0xdd, 0x23, 0x76,
+	0x50, 0x48, 0xf3, 0xa8, 0x94, 0xd3, 0xe8, 0x0a, 0x37, 0x00, 0x0c, 0xe2, 0x5a, 0xce, 0x64, 0x18,
+	0x9e, 0x21, 0x1e, 0x95, 0x58, 0xf9, 0x0f, 0x71, 0x99, 0x50, 0xb1, 0x36, 0xad, 0xd1, 0x66, 0xea,
+	0xb1, 0x0a, 0x1b, 0x34, 0xab, 0x13, 0x4c, 0x5c, 0x52, 0x48, 0xf1, 0x4c, 0x69, 0x53, 0xfe, 0x73,
+	0x39, 0x1e, 0x65, 0xdb, 0x9e, 0xb8, 0x44, 0x63, 0xdd, 0xeb, 0x85, 0xf0, 0x04, 0x7e, 0x88, 0xf5,
+	0xb4, 0xfa, 0x7d, 0xcb, 0xb4, 0xef, 0x96, 0x85, 0xe6, 0x64, 0x55, 0x21, 0x4b, 0x51, 0x0a, 0xa9,
+	0x48, 0xd3, 0x6f, 0x2b, 0x73, 0xd0, 0x92, 0x4a, 0xe1, 0x25, 0x82, 0xad, 0x0b, 0xd7, 0xb8, 0xdd,
+	0xcc, 0x19, 0x74, 0xf4, 0xa5, 0xe8, 0xf8, 0x10, 0xd8, 0x51, 0x04, 0x1e, 0x5d, 0x30, 0xa5, 0x59,
+	0x4c, 0x80, 0x92, 0x1b, 0x16, 0x4f, 0xc2, 0x19, 0x38, 0xd3, 0xfd, 0x4b, 0x0d, 0xe2, 0xf4, 0x30,
+	0x16, 0x5e, 0x33, 0x90, 0xa5, 0x88, 0x18, 0x43, 0xda, 0xd6, 0x87, 0x84, 0x76, 0x20, 0x8a, 0x17,
+	0x5c, 0x04, 0x7a, 0xd8, 0x45, 0xdc, 0x18, 0x14, 0xe6, 0x81, 0x83, 0xb2, 0x0b, 0xeb, 0xc9, 0xf0,
+	0x47, 0x03, 0xc9, 0xca, 0xdf, 0xdf, 0x52, 0x5e, 0xa3, 0x09, 0xda, 0x34, 0x15, 0xff, 0x02, 0xf9,
+	0x44, 0x56, 0x77, 0x12, 0x10, 0xbf, 0xb0, 0xc6, 0xa3, 0xd2, 0x86, 0x96, 0x68, 0x3d, 0x0e, 0xf7,
+	0xf0, 0x19, 0x64, 0x2c, 0xbd, 0x4b, 0x2c, 0xbf, 0x90, 0xe1, 0x99, 0x12, 0x2b, 0xef, 0xae, 0xac,
+	0x5a, 0x6c, 0x44, 0x75, 0x8a, 0x1d, 0x78, 0x13, 0x8d, 0x82, 0x14, 0xf7, 0x81, 0x9d, 0xd9, 0xc6,
+	0x1c, 0x30, 0x97, 0x64, 0x42, 0x9b, 0x1d, 0x86, 0x78, 0x0b, 0xd6, 0xc6, 0xba, 0x35, 0x8a, 0x9b,
+	0x9c, 0xd3, 0xe2, 0xc5, 0x41, 0x6a, 0x0f, 0x09, 0x1f, 0x10, 0xc0, 0x75, 0x03, 0xf0, 0x8f, 0x00,
+	0xae, 0xe7, 0x3c, 0x22, 0xbd, 0xa0, 0x63, 0x1a, 0x14, 0x21, 0x47, 0x77, 0xea, 0x46, 0x38, 0xcb,
+	0x81, 0xee, 0x0d, 0x48, 0x40, 0x81, 0xe8, 0x0a, 0xab, 0x53, 0x3d, 0x4c, 0xa4, 0x67, 0xef, 0x3e,
+	0x5d, 0xff, 0xca, 0x92, 0xca, 0xcf, 0x11, 0xb0, 0x33, 0x33, 0x82, 0xb7, 0xa1, 0xa0, 0x6a, 0xad,
+	0x93, 0x7a, 0x43, 0xe9, 0xb4, 0xff, 0x53, 0x95, 0xce, 0x45, 0xf3, 0x5c, 0x55, 0xaa, 0xf5, 0x93,
+	0xba, 0x52, 0xe3, 0xbe, 0xc1, 0x59, 0x60, 0xaa, 0xea, 0x05, 0x87, 0xf0, 0x3a, 0xa4, 0xff, 0xad,
+	0x34, 0x1a, 0x5c, 0x2a, 0x8c, 0x4e, 0x95, 0x8a, 0xca, 0x31, 0x98, 0x85, 0x6c, 0xfb, 0x54, 0x53,
+	0x2a, 0xb5, 0x73, 0x2e, 0x8d, 0x37, 0x01, 0xaa, 0xad, 0x66, 0x5b, 0x69, 0xb6, 0xeb, 0xad, 0x26,
+	0xb7, 0x86, 0xf3, 0x90, 0x53, 0x95, 0xca, 0x3f, 0x9d, 0x28, 0x37, 0x13, 0x1e, 0x87, 0x51, 0xa7,
+	0xd2, 0x68, 0xb4, 0xaa, 0x5c, 0x56, 0x7e, 0x93, 0x86, 0x6f, 0x29, 0x0d, 0xef, 0x9c, 0x78, 0x63,
+	0xb3, 0x47, 0xf0, 0x2b, 0x04, 0xf9, 0x39, 0xef, 0xc3, 0x7f, 0x2d, 0xef, 0xd4, 0x22, 0xb3, 0x2c,
+	0xae, 0xfe, 0x3a, 0x0b, 0xbf, 0x3f, 0xfb, 0xf8, 0xe9, 0x45, 0xea, 0x57, 0x81, 0x0f, 0xbf, 0x17,
+	0x4f, 0x63, 0xf7, 0x39, 0xa2, 0x77, 0xea, 0x4b, 0xe5, 0xab, 0xe4, 0x1b, 0xe2, 0x1f, 0xa0, 0x32,
+	0x7e, 0x37, 0x75, 0xe7, 0x79, 0x37, 0xc3, 0x47, 0xab, 0x12, 0x5d, 0xe8, 0x82, 0xf7, 0xe1, 0xfb,
+	0x77, 0xc4, 0x77, 0x5f, 0x10, 0x97, 0xf2, 0xed, 0xcd, 0x3e, 0xf0, 0x60, 0x6a, 0x5b, 0x6f, 0x11,
+	0xe4, 0xe7, 0x4c, 0x71, 0x95, 0x2e, 0x2f, 0x72, 0xd1, 0xfb, 0xb0, 0xde, 0x8f, 0x58, 0xef, 0xc8,
+	0xa5, 0x98, 0x35, 0x7d, 0x5b, 0x43, 0xa7, 0x9b, 0xe1, 0x3e, 0xa5, 0x2e, 0x95, 0xaf, 0xa6, 0x7c,
+	0x8f, 0x5b, 0xff, 0x9f, 0xd1, 0xc7, 0x0c, 0x1c, 0x4b, 0xb7, 0x07, 0xa2, 0xe3, 0x0d, 0xa4, 0x01,
+	0xb1, 0x23, 0x9b, 0xa1, 0xbf, 0x00, 0xba, 0x6b, 0xfa, 0x77, 0xff, 0x06, 0x1c, 0xce, 0x6d, 0x74,
+	0x33, 0x51, 0xe5, 0xce, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x08, 0x2b, 0x60, 0x3f, 0x08,
+	0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v1/trace.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v1/trace.pb.go
index cc15feed..63d74102 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v1/trace.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v1/trace.pb.go
@@ -1,29 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v1/trace.proto
 
-/*
-Package cloudtrace is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/cloudtrace/v1/trace.proto
-
-It has these top-level messages:
-	Trace
-	Traces
-	TraceSpan
-	ListTracesRequest
-	ListTracesResponse
-	GetTraceRequest
-	PatchTracesRequest
-*/
-package cloudtrace
+package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
 
 import (
 	context "golang.org/x/net/context"
@@ -70,7 +55,9 @@ var TraceSpan_SpanKind_value = map[string]int32{
 func (x TraceSpan_SpanKind) String() string {
 	return proto.EnumName(TraceSpan_SpanKind_name, int32(x))
 }
-func (TraceSpan_SpanKind) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (TraceSpan_SpanKind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{2, 0}
+}
 
 // Type of data returned for traces in the list.
 type ListTracesRequest_ViewType int32
@@ -107,7 +94,7 @@ func (x ListTracesRequest_ViewType) String() string {
 	return proto.EnumName(ListTracesRequest_ViewType_name, int32(x))
 }
 func (ListTracesRequest_ViewType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{3, 0}
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{3, 0}
 }
 
 // A trace describes how long it takes for an application to perform an
@@ -115,18 +102,40 @@ func (ListTracesRequest_ViewType) EnumDescriptor() ([]byte, []int) {
 // timed event within the operation.
 type Trace struct {
 	// Project ID of the Cloud project where the trace data is stored.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Globally unique identifier for the trace. This identifier is a 128-bit
 	// numeric value formatted as a 32-byte hex string.
-	TraceId string `protobuf:"bytes,2,opt,name=trace_id,json=traceId" json:"trace_id,omitempty"`
+	TraceId string `protobuf:"bytes,2,opt,name=trace_id,json=traceId,proto3" json:"trace_id,omitempty"`
 	// Collection of spans in the trace.
-	Spans []*TraceSpan `protobuf:"bytes,3,rep,name=spans" json:"spans,omitempty"`
+	Spans                []*TraceSpan `protobuf:"bytes,3,rep,name=spans,proto3" json:"spans,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Trace) Reset()         { *m = Trace{} }
+func (m *Trace) String() string { return proto.CompactTextString(m) }
+func (*Trace) ProtoMessage()    {}
+func (*Trace) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{0}
+}
+func (m *Trace) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Trace.Unmarshal(m, b)
+}
+func (m *Trace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Trace.Marshal(b, m, deterministic)
+}
+func (dst *Trace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Trace.Merge(dst, src)
+}
+func (m *Trace) XXX_Size() int {
+	return xxx_messageInfo_Trace.Size(m)
+}
+func (m *Trace) XXX_DiscardUnknown() {
+	xxx_messageInfo_Trace.DiscardUnknown(m)
 }
 
-func (m *Trace) Reset()                    { *m = Trace{} }
-func (m *Trace) String() string            { return proto.CompactTextString(m) }
-func (*Trace) ProtoMessage()               {}
-func (*Trace) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Trace proto.InternalMessageInfo
 
 func (m *Trace) GetProjectId() string {
 	if m != nil {
@@ -152,13 +161,35 @@ func (m *Trace) GetSpans() []*TraceSpan {
 // List of new or updated traces.
 type Traces struct {
 	// List of traces.
-	Traces []*Trace `protobuf:"bytes,1,rep,name=traces" json:"traces,omitempty"`
+	Traces               []*Trace `protobuf:"bytes,1,rep,name=traces,proto3" json:"traces,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Traces) Reset()                    { *m = Traces{} }
-func (m *Traces) String() string            { return proto.CompactTextString(m) }
-func (*Traces) ProtoMessage()               {}
-func (*Traces) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Traces) Reset()         { *m = Traces{} }
+func (m *Traces) String() string { return proto.CompactTextString(m) }
+func (*Traces) ProtoMessage()    {}
+func (*Traces) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{1}
+}
+func (m *Traces) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Traces.Unmarshal(m, b)
+}
+func (m *Traces) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Traces.Marshal(b, m, deterministic)
+}
+func (dst *Traces) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Traces.Merge(dst, src)
+}
+func (m *Traces) XXX_Size() int {
+	return xxx_messageInfo_Traces.Size(m)
+}
+func (m *Traces) XXX_DiscardUnknown() {
+	xxx_messageInfo_Traces.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Traces proto.InternalMessageInfo
 
 func (m *Traces) GetTraces() []*Trace {
 	if m != nil {
@@ -175,11 +206,11 @@ func (m *Traces) GetTraces() []*Trace {
 type TraceSpan struct {
 	// Identifier for the span. Must be a 64-bit integer other than 0 and
 	// unique within a trace.
-	SpanId uint64 `protobuf:"fixed64,1,opt,name=span_id,json=spanId" json:"span_id,omitempty"`
+	SpanId uint64 `protobuf:"fixed64,1,opt,name=span_id,json=spanId,proto3" json:"span_id,omitempty"`
 	// Distinguishes between spans generated in a particular context. For example,
 	// two spans with the same name may be distinguished using `RPC_CLIENT`
 	// and `RPC_SERVER` to identify queueing latency associated with the span.
-	Kind TraceSpan_SpanKind `protobuf:"varint,2,opt,name=kind,enum=google.devtools.cloudtrace.v1.TraceSpan_SpanKind" json:"kind,omitempty"`
+	Kind TraceSpan_SpanKind `protobuf:"varint,2,opt,name=kind,proto3,enum=google.devtools.cloudtrace.v1.TraceSpan_SpanKind" json:"kind,omitempty"`
 	// Name of the span. Must be less than 128 bytes. The span name is sanitized
 	// and displayed in the Stackdriver Trace tool in the
 	// {% dynamic print site_values.console_name %}.
@@ -187,13 +218,13 @@ type TraceSpan struct {
 	// For the same executable and the same call point, a best practice is
 	// to use a consistent name, which makes it easier to correlate
 	// cross-trace spans.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// Start time of the span in nanoseconds from the UNIX epoch.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of the span in nanoseconds from the UNIX epoch.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// ID of the parent span, if any. Optional.
-	ParentSpanId uint64 `protobuf:"fixed64,6,opt,name=parent_span_id,json=parentSpanId" json:"parent_span_id,omitempty"`
+	ParentSpanId uint64 `protobuf:"fixed64,6,opt,name=parent_span_id,json=parentSpanId,proto3" json:"parent_span_id,omitempty"`
 	// Collection of labels associated with the span. Label keys must be less than
 	// 128 bytes. Label values must be less than 16 kilobytes (10MB for
 	// `/stacktrace` values).
@@ -218,22 +249,46 @@ type TraceSpan struct {
 	// *   `/http/client_region`
 	// *   `/http/host`
 	// *   `/http/method`
+	// *   `/http/path`
 	// *   `/http/redirected_url`
 	// *   `/http/request/size`
 	// *   `/http/response/size`
+	// *   `/http/route`
 	// *   `/http/status_code`
 	// *   `/http/url`
 	// *   `/http/user_agent`
 	// *   `/pid`
 	// *   `/stacktrace`
 	// *   `/tid`
-	Labels map[string]string `protobuf:"bytes,7,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,7,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *TraceSpan) Reset()                    { *m = TraceSpan{} }
-func (m *TraceSpan) String() string            { return proto.CompactTextString(m) }
-func (*TraceSpan) ProtoMessage()               {}
-func (*TraceSpan) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *TraceSpan) Reset()         { *m = TraceSpan{} }
+func (m *TraceSpan) String() string { return proto.CompactTextString(m) }
+func (*TraceSpan) ProtoMessage()    {}
+func (*TraceSpan) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{2}
+}
+func (m *TraceSpan) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TraceSpan.Unmarshal(m, b)
+}
+func (m *TraceSpan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TraceSpan.Marshal(b, m, deterministic)
+}
+func (dst *TraceSpan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TraceSpan.Merge(dst, src)
+}
+func (m *TraceSpan) XXX_Size() int {
+	return xxx_messageInfo_TraceSpan.Size(m)
+}
+func (m *TraceSpan) XXX_DiscardUnknown() {
+	xxx_messageInfo_TraceSpan.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TraceSpan proto.InternalMessageInfo
 
 func (m *TraceSpan) GetSpanId() uint64 {
 	if m != nil {
@@ -256,14 +311,14 @@ func (m *TraceSpan) GetName() string {
 	return ""
 }
 
-func (m *TraceSpan) GetStartTime() *google_protobuf2.Timestamp {
+func (m *TraceSpan) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *TraceSpan) GetEndTime() *google_protobuf2.Timestamp {
+func (m *TraceSpan) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -288,23 +343,23 @@ func (m *TraceSpan) GetLabels() map[string]string {
 // unless specified.
 type ListTracesRequest struct {
 	// ID of the Cloud project where the trace data is stored.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Type of data returned for traces in the list. Optional. Default is
 	// `MINIMAL`.
-	View ListTracesRequest_ViewType `protobuf:"varint,2,opt,name=view,enum=google.devtools.cloudtrace.v1.ListTracesRequest_ViewType" json:"view,omitempty"`
+	View ListTracesRequest_ViewType `protobuf:"varint,2,opt,name=view,proto3,enum=google.devtools.cloudtrace.v1.ListTracesRequest_ViewType" json:"view,omitempty"`
 	// Maximum number of traces to return. If not specified or <= 0, the
 	// implementation selects a reasonable value.  The implementation may
 	// return fewer traces than the requested page size. Optional.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Token identifying the page of results to return. If provided, use the
 	// value of the `next_page_token` field from a previous request. Optional.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Start of the time interval (inclusive) during which the trace data was
 	// collected from the application.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End of the time interval (inclusive) during which the trace data was
 	// collected from the application.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// An optional filter against labels for the request.
 	//
 	// By default, searches use prefix matching. To specify exact match, prepend
@@ -335,7 +390,7 @@ type ListTracesRequest struct {
 	//     specified.
 	// *   `method:VALUE`: Equivalent to `/http/method:VALUE`.
 	// *   `url:VALUE`: Equivalent to `/http/url:VALUE`.
-	Filter string `protobuf:"bytes,7,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Field used to sort the returned traces. Optional.
 	// Can be one of the following:
 	//
@@ -349,13 +404,35 @@ type ListTracesRequest struct {
 	// (for example, `name desc`).
 	//
 	// Only one sort field is permitted.
-	OrderBy string `protobuf:"bytes,8,opt,name=order_by,json=orderBy" json:"order_by,omitempty"`
+	OrderBy              string   `protobuf:"bytes,8,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTracesRequest) Reset()         { *m = ListTracesRequest{} }
+func (m *ListTracesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTracesRequest) ProtoMessage()    {}
+func (*ListTracesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{3}
+}
+func (m *ListTracesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTracesRequest.Unmarshal(m, b)
+}
+func (m *ListTracesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTracesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTracesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTracesRequest.Merge(dst, src)
+}
+func (m *ListTracesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTracesRequest.Size(m)
+}
+func (m *ListTracesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTracesRequest.DiscardUnknown(m)
 }
 
-func (m *ListTracesRequest) Reset()                    { *m = ListTracesRequest{} }
-func (m *ListTracesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTracesRequest) ProtoMessage()               {}
-func (*ListTracesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_ListTracesRequest proto.InternalMessageInfo
 
 func (m *ListTracesRequest) GetProjectId() string {
 	if m != nil {
@@ -385,14 +462,14 @@ func (m *ListTracesRequest) GetPageToken() string {
 	return ""
 }
 
-func (m *ListTracesRequest) GetStartTime() *google_protobuf2.Timestamp {
+func (m *ListTracesRequest) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *ListTracesRequest) GetEndTime() *google_protobuf2.Timestamp {
+func (m *ListTracesRequest) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -416,17 +493,39 @@ func (m *ListTracesRequest) GetOrderBy() string {
 // The response message for the `ListTraces` method.
 type ListTracesResponse struct {
 	// List of trace records returned.
-	Traces []*Trace `protobuf:"bytes,1,rep,name=traces" json:"traces,omitempty"`
+	Traces []*Trace `protobuf:"bytes,1,rep,name=traces,proto3" json:"traces,omitempty"`
 	// If defined, indicates that there are more traces that match the request
 	// and that this value should be passed to the next request to continue
 	// retrieving additional traces.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTracesResponse) Reset()         { *m = ListTracesResponse{} }
+func (m *ListTracesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTracesResponse) ProtoMessage()    {}
+func (*ListTracesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{4}
+}
+func (m *ListTracesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTracesResponse.Unmarshal(m, b)
+}
+func (m *ListTracesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTracesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTracesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTracesResponse.Merge(dst, src)
+}
+func (m *ListTracesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTracesResponse.Size(m)
+}
+func (m *ListTracesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTracesResponse.DiscardUnknown(m)
 }
 
-func (m *ListTracesResponse) Reset()                    { *m = ListTracesResponse{} }
-func (m *ListTracesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTracesResponse) ProtoMessage()               {}
-func (*ListTracesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ListTracesResponse proto.InternalMessageInfo
 
 func (m *ListTracesResponse) GetTraces() []*Trace {
 	if m != nil {
@@ -445,15 +544,37 @@ func (m *ListTracesResponse) GetNextPageToken() string {
 // The request message for the `GetTrace` method.
 type GetTraceRequest struct {
 	// ID of the Cloud project where the trace data is stored.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// ID of the trace to return.
-	TraceId string `protobuf:"bytes,2,opt,name=trace_id,json=traceId" json:"trace_id,omitempty"`
+	TraceId              string   `protobuf:"bytes,2,opt,name=trace_id,json=traceId,proto3" json:"trace_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetTraceRequest) Reset()                    { *m = GetTraceRequest{} }
-func (m *GetTraceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTraceRequest) ProtoMessage()               {}
-func (*GetTraceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *GetTraceRequest) Reset()         { *m = GetTraceRequest{} }
+func (m *GetTraceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTraceRequest) ProtoMessage()    {}
+func (*GetTraceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{5}
+}
+func (m *GetTraceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTraceRequest.Unmarshal(m, b)
+}
+func (m *GetTraceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTraceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTraceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTraceRequest.Merge(dst, src)
+}
+func (m *GetTraceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTraceRequest.Size(m)
+}
+func (m *GetTraceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTraceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetTraceRequest proto.InternalMessageInfo
 
 func (m *GetTraceRequest) GetProjectId() string {
 	if m != nil {
@@ -472,15 +593,37 @@ func (m *GetTraceRequest) GetTraceId() string {
 // The request message for the `PatchTraces` method.
 type PatchTracesRequest struct {
 	// ID of the Cloud project where the trace data is stored.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The body of the message.
-	Traces *Traces `protobuf:"bytes,2,opt,name=traces" json:"traces,omitempty"`
+	Traces               *Traces  `protobuf:"bytes,2,opt,name=traces,proto3" json:"traces,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PatchTracesRequest) Reset()                    { *m = PatchTracesRequest{} }
-func (m *PatchTracesRequest) String() string            { return proto.CompactTextString(m) }
-func (*PatchTracesRequest) ProtoMessage()               {}
-func (*PatchTracesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *PatchTracesRequest) Reset()         { *m = PatchTracesRequest{} }
+func (m *PatchTracesRequest) String() string { return proto.CompactTextString(m) }
+func (*PatchTracesRequest) ProtoMessage()    {}
+func (*PatchTracesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_98dc85cc2ea3983c, []int{6}
+}
+func (m *PatchTracesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PatchTracesRequest.Unmarshal(m, b)
+}
+func (m *PatchTracesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PatchTracesRequest.Marshal(b, m, deterministic)
+}
+func (dst *PatchTracesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PatchTracesRequest.Merge(dst, src)
+}
+func (m *PatchTracesRequest) XXX_Size() int {
+	return xxx_messageInfo_PatchTracesRequest.Size(m)
+}
+func (m *PatchTracesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PatchTracesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PatchTracesRequest proto.InternalMessageInfo
 
 func (m *PatchTracesRequest) GetProjectId() string {
 	if m != nil {
@@ -500,6 +643,7 @@ func init() {
 	proto.RegisterType((*Trace)(nil), "google.devtools.cloudtrace.v1.Trace")
 	proto.RegisterType((*Traces)(nil), "google.devtools.cloudtrace.v1.Traces")
 	proto.RegisterType((*TraceSpan)(nil), "google.devtools.cloudtrace.v1.TraceSpan")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.cloudtrace.v1.TraceSpan.LabelsEntry")
 	proto.RegisterType((*ListTracesRequest)(nil), "google.devtools.cloudtrace.v1.ListTracesRequest")
 	proto.RegisterType((*ListTracesResponse)(nil), "google.devtools.cloudtrace.v1.ListTracesResponse")
 	proto.RegisterType((*GetTraceRequest)(nil), "google.devtools.cloudtrace.v1.GetTraceRequest")
@@ -516,8 +660,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for TraceService service
-
+// TraceServiceClient is the client API for TraceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type TraceServiceClient interface {
 	// Returns of a list of traces that match the specified filter conditions.
 	ListTraces(ctx context.Context, in *ListTracesRequest, opts ...grpc.CallOption) (*ListTracesResponse, error)
@@ -528,7 +673,7 @@ type TraceServiceClient interface {
 	// in the existing trace and its spans are overwritten by the provided values,
 	// and any new fields provided are merged with the existing trace data. If the
 	// ID does not match, a new trace is created.
-	PatchTraces(ctx context.Context, in *PatchTracesRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	PatchTraces(ctx context.Context, in *PatchTracesRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type traceServiceClient struct {
@@ -541,7 +686,7 @@ func NewTraceServiceClient(cc *grpc.ClientConn) TraceServiceClient {
 
 func (c *traceServiceClient) ListTraces(ctx context.Context, in *ListTracesRequest, opts ...grpc.CallOption) (*ListTracesResponse, error) {
 	out := new(ListTracesResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudtrace.v1.TraceService/ListTraces", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudtrace.v1.TraceService/ListTraces", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -550,24 +695,23 @@ func (c *traceServiceClient) ListTraces(ctx context.Context, in *ListTracesReque
 
 func (c *traceServiceClient) GetTrace(ctx context.Context, in *GetTraceRequest, opts ...grpc.CallOption) (*Trace, error) {
 	out := new(Trace)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudtrace.v1.TraceService/GetTrace", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudtrace.v1.TraceService/GetTrace", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *traceServiceClient) PatchTraces(ctx context.Context, in *PatchTracesRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudtrace.v1.TraceService/PatchTraces", in, out, c.cc, opts...)
+func (c *traceServiceClient) PatchTraces(ctx context.Context, in *PatchTracesRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudtrace.v1.TraceService/PatchTraces", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for TraceService service
-
+// TraceServiceServer is the server API for TraceService service.
 type TraceServiceServer interface {
 	// Returns of a list of traces that match the specified filter conditions.
 	ListTraces(context.Context, *ListTracesRequest) (*ListTracesResponse, error)
@@ -578,7 +722,7 @@ type TraceServiceServer interface {
 	// in the existing trace and its spans are overwritten by the provided values,
 	// and any new fields provided are merged with the existing trace data. If the
 	// ID does not match, a new trace is created.
-	PatchTraces(context.Context, *PatchTracesRequest) (*google_protobuf1.Empty, error)
+	PatchTraces(context.Context, *PatchTracesRequest) (*empty.Empty, error)
 }
 
 func RegisterTraceServiceServer(s *grpc.Server, srv TraceServiceServer) {
@@ -660,9 +804,11 @@ var _TraceService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/cloudtrace/v1/trace.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/cloudtrace/v1/trace.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/devtools/cloudtrace/v1/trace.proto", fileDescriptor_trace_98dc85cc2ea3983c)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_trace_98dc85cc2ea3983c = []byte{
 	// 898 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0x1b, 0x45,
 	0x14, 0x66, 0xed, 0x78, 0x6d, 0x1f, 0x87, 0xd4, 0x8c, 0x68, 0x71, 0x5d, 0x2a, 0xc2, 0xaa, 0x20,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/trace.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/trace.pb.go
index 21bb28dc..d07082ed 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/trace.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/trace.pb.go
@@ -1,30 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v2/trace.proto
 
-/*
-Package cloudtrace is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/cloudtrace/v2/trace.proto
-	google/devtools/cloudtrace/v2/tracing.proto
-
-It has these top-level messages:
-	Span
-	AttributeValue
-	StackTrace
-	Module
-	TruncatableString
-	BatchWriteSpansRequest
-*/
-package cloudtrace
+package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/wrappers"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -64,7 +49,7 @@ func (x Span_TimeEvent_MessageEvent_Type) String() string {
 	return proto.EnumName(Span_TimeEvent_MessageEvent_Type_name, int32(x))
 }
 func (Span_TimeEvent_MessageEvent_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 1, 1, 0}
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 1, 1, 0}
 }
 
 // The relationship of the current span relative to the linked span: child,
@@ -94,7 +79,9 @@ var Span_Link_Type_value = map[string]int32{
 func (x Span_Link_Type) String() string {
 	return proto.EnumName(Span_Link_Type_name, int32(x))
 }
-func (Span_Link_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 3, 0} }
+func (Span_Link_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 3, 0}
+}
 
 // A span represents a single operation within a trace. Spans can be
 // nested to form a trace tree. Often, a trace contains a root span
@@ -112,12 +99,12 @@ type Span struct {
 	//
 	// [SPAN_ID] is a unique identifier for a span within a trace; it
 	// is a 16-character hexadecimal encoding of an 8-byte array.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The [SPAN_ID] portion of the span's resource name.
-	SpanId string `protobuf:"bytes,2,opt,name=span_id,json=spanId" json:"span_id,omitempty"`
+	SpanId string `protobuf:"bytes,2,opt,name=span_id,json=spanId,proto3" json:"span_id,omitempty"`
 	// The [SPAN_ID] of this span's parent span. If this is a root span,
 	// then this field must be empty.
-	ParentSpanId string `protobuf:"bytes,3,opt,name=parent_span_id,json=parentSpanId" json:"parent_span_id,omitempty"`
+	ParentSpanId string `protobuf:"bytes,3,opt,name=parent_span_id,json=parentSpanId,proto3" json:"parent_span_id,omitempty"`
 	// A description of the span's operation (up to 128 bytes).
 	// Stackdriver Trace displays the description in the
 	// {% dynamic print site_values.console_name %}.
@@ -125,41 +112,63 @@ type Span struct {
 	// and a line number where the operation is called. A best practice is to use
 	// the same display name within an application and at the same call point.
 	// This makes it easier to correlate spans in different traces.
-	DisplayName *TruncatableString `protobuf:"bytes,4,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName *TruncatableString `protobuf:"bytes,4,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// The start time of the span. On the client side, this is the time kept by
 	// the local machine where the span execution starts. On the server side, this
 	// is the time when the server's application handler starts running.
-	StartTime *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The end time of the span. On the client side, this is the time kept by
 	// the local machine where the span execution ends. On the server side, this
 	// is the time when the server application handler stops running.
-	EndTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// A set of attributes on the span. You can have up to 32 attributes per
 	// span.
-	Attributes *Span_Attributes `protobuf:"bytes,7,opt,name=attributes" json:"attributes,omitempty"`
+	Attributes *Span_Attributes `protobuf:"bytes,7,opt,name=attributes,proto3" json:"attributes,omitempty"`
 	// Stack trace captured at the start of the span.
-	StackTrace *StackTrace `protobuf:"bytes,8,opt,name=stack_trace,json=stackTrace" json:"stack_trace,omitempty"`
+	StackTrace *StackTrace `protobuf:"bytes,8,opt,name=stack_trace,json=stackTrace,proto3" json:"stack_trace,omitempty"`
 	// A set of time events. You can have up to 32 annotations and 128 message
 	// events per span.
-	TimeEvents *Span_TimeEvents `protobuf:"bytes,9,opt,name=time_events,json=timeEvents" json:"time_events,omitempty"`
+	TimeEvents *Span_TimeEvents `protobuf:"bytes,9,opt,name=time_events,json=timeEvents,proto3" json:"time_events,omitempty"`
 	// Links associated with the span. You can have up to 128 links per Span.
-	Links *Span_Links `protobuf:"bytes,10,opt,name=links" json:"links,omitempty"`
+	Links *Span_Links `protobuf:"bytes,10,opt,name=links,proto3" json:"links,omitempty"`
 	// An optional final status for this span.
-	Status *google_rpc.Status `protobuf:"bytes,11,opt,name=status" json:"status,omitempty"`
+	Status *status.Status `protobuf:"bytes,11,opt,name=status,proto3" json:"status,omitempty"`
 	// (Optional) Set this parameter to indicate whether this span is in
 	// the same process as its parent. If you do not set this parameter,
 	// Stackdriver Trace is unable to take advantage of this helpful
 	// information.
-	SameProcessAsParentSpan *google_protobuf2.BoolValue `protobuf:"bytes,12,opt,name=same_process_as_parent_span,json=sameProcessAsParentSpan" json:"same_process_as_parent_span,omitempty"`
+	SameProcessAsParentSpan *wrappers.BoolValue `protobuf:"bytes,12,opt,name=same_process_as_parent_span,json=sameProcessAsParentSpan,proto3" json:"same_process_as_parent_span,omitempty"`
 	// An optional number of child spans that were generated while this span
 	// was active. If set, allows implementation to detect missing child spans.
-	ChildSpanCount *google_protobuf2.Int32Value `protobuf:"bytes,13,opt,name=child_span_count,json=childSpanCount" json:"child_span_count,omitempty"`
+	ChildSpanCount       *wrappers.Int32Value `protobuf:"bytes,13,opt,name=child_span_count,json=childSpanCount,proto3" json:"child_span_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Span) Reset()         { *m = Span{} }
+func (m *Span) String() string { return proto.CompactTextString(m) }
+func (*Span) ProtoMessage()    {}
+func (*Span) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0}
+}
+func (m *Span) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Span.Unmarshal(m, b)
+}
+func (m *Span) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Span.Marshal(b, m, deterministic)
+}
+func (dst *Span) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span.Merge(dst, src)
+}
+func (m *Span) XXX_Size() int {
+	return xxx_messageInfo_Span.Size(m)
+}
+func (m *Span) XXX_DiscardUnknown() {
+	xxx_messageInfo_Span.DiscardUnknown(m)
 }
 
-func (m *Span) Reset()                    { *m = Span{} }
-func (m *Span) String() string            { return proto.CompactTextString(m) }
-func (*Span) ProtoMessage()               {}
-func (*Span) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Span proto.InternalMessageInfo
 
 func (m *Span) GetName() string {
 	if m != nil {
@@ -189,14 +198,14 @@ func (m *Span) GetDisplayName() *TruncatableString {
 	return nil
 }
 
-func (m *Span) GetStartTime() *google_protobuf1.Timestamp {
+func (m *Span) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *Span) GetEndTime() *google_protobuf1.Timestamp {
+func (m *Span) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -231,21 +240,21 @@ func (m *Span) GetLinks() *Span_Links {
 	return nil
 }
 
-func (m *Span) GetStatus() *google_rpc.Status {
+func (m *Span) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
 	return nil
 }
 
-func (m *Span) GetSameProcessAsParentSpan() *google_protobuf2.BoolValue {
+func (m *Span) GetSameProcessAsParentSpan() *wrappers.BoolValue {
 	if m != nil {
 		return m.SameProcessAsParentSpan
 	}
 	return nil
 }
 
-func (m *Span) GetChildSpanCount() *google_protobuf2.Int32Value {
+func (m *Span) GetChildSpanCount() *wrappers.Int32Value {
 	if m != nil {
 		return m.ChildSpanCount
 	}
@@ -262,17 +271,39 @@ type Span_Attributes struct {
 	//     "/http/user_agent": ""
 	//     "/http/request_bytes": 300
 	//     "abc.com/myattribute": true
-	AttributeMap map[string]*AttributeValue `protobuf:"bytes,1,rep,name=attribute_map,json=attributeMap" json:"attribute_map,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	AttributeMap map[string]*AttributeValue `protobuf:"bytes,1,rep,name=attribute_map,json=attributeMap,proto3" json:"attribute_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The number of attributes that were discarded. Attributes can be discarded
 	// because their keys are too long or because there are too many attributes.
 	// If this value is 0 then all attributes are valid.
-	DroppedAttributesCount int32 `protobuf:"varint,2,opt,name=dropped_attributes_count,json=droppedAttributesCount" json:"dropped_attributes_count,omitempty"`
+	DroppedAttributesCount int32    `protobuf:"varint,2,opt,name=dropped_attributes_count,json=droppedAttributesCount,proto3" json:"dropped_attributes_count,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
+}
+
+func (m *Span_Attributes) Reset()         { *m = Span_Attributes{} }
+func (m *Span_Attributes) String() string { return proto.CompactTextString(m) }
+func (*Span_Attributes) ProtoMessage()    {}
+func (*Span_Attributes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 0}
+}
+func (m *Span_Attributes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Span_Attributes.Unmarshal(m, b)
+}
+func (m *Span_Attributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Span_Attributes.Marshal(b, m, deterministic)
+}
+func (dst *Span_Attributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_Attributes.Merge(dst, src)
+}
+func (m *Span_Attributes) XXX_Size() int {
+	return xxx_messageInfo_Span_Attributes.Size(m)
+}
+func (m *Span_Attributes) XXX_DiscardUnknown() {
+	xxx_messageInfo_Span_Attributes.DiscardUnknown(m)
 }
 
-func (m *Span_Attributes) Reset()                    { *m = Span_Attributes{} }
-func (m *Span_Attributes) String() string            { return proto.CompactTextString(m) }
-func (*Span_Attributes) ProtoMessage()               {}
-func (*Span_Attributes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+var xxx_messageInfo_Span_Attributes proto.InternalMessageInfo
 
 func (m *Span_Attributes) GetAttributeMap() map[string]*AttributeValue {
 	if m != nil {
@@ -291,33 +322,64 @@ func (m *Span_Attributes) GetDroppedAttributesCount() int32 {
 // A time-stamped annotation or message event in the Span.
 type Span_TimeEvent struct {
 	// The timestamp indicating the time the event occurred.
-	Time *google_protobuf1.Timestamp `protobuf:"bytes,1,opt,name=time" json:"time,omitempty"`
+	Time *timestamp.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
 	// A `TimeEvent` can contain either an `Annotation` object or a
 	// `MessageEvent` object, but not both.
 	//
 	// Types that are valid to be assigned to Value:
 	//	*Span_TimeEvent_Annotation_
 	//	*Span_TimeEvent_MessageEvent_
-	Value isSpan_TimeEvent_Value `protobuf_oneof:"value"`
+	Value                isSpan_TimeEvent_Value `protobuf_oneof:"value"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
-func (m *Span_TimeEvent) Reset()                    { *m = Span_TimeEvent{} }
-func (m *Span_TimeEvent) String() string            { return proto.CompactTextString(m) }
-func (*Span_TimeEvent) ProtoMessage()               {}
-func (*Span_TimeEvent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 1} }
+func (m *Span_TimeEvent) Reset()         { *m = Span_TimeEvent{} }
+func (m *Span_TimeEvent) String() string { return proto.CompactTextString(m) }
+func (*Span_TimeEvent) ProtoMessage()    {}
+func (*Span_TimeEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 1}
+}
+func (m *Span_TimeEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Span_TimeEvent.Unmarshal(m, b)
+}
+func (m *Span_TimeEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Span_TimeEvent.Marshal(b, m, deterministic)
+}
+func (dst *Span_TimeEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_TimeEvent.Merge(dst, src)
+}
+func (m *Span_TimeEvent) XXX_Size() int {
+	return xxx_messageInfo_Span_TimeEvent.Size(m)
+}
+func (m *Span_TimeEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_Span_TimeEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Span_TimeEvent proto.InternalMessageInfo
+
+func (m *Span_TimeEvent) GetTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.Time
+	}
+	return nil
+}
 
 type isSpan_TimeEvent_Value interface {
 	isSpan_TimeEvent_Value()
 }
 
 type Span_TimeEvent_Annotation_ struct {
-	Annotation *Span_TimeEvent_Annotation `protobuf:"bytes,2,opt,name=annotation,oneof"`
+	Annotation *Span_TimeEvent_Annotation `protobuf:"bytes,2,opt,name=annotation,proto3,oneof"`
 }
+
 type Span_TimeEvent_MessageEvent_ struct {
-	MessageEvent *Span_TimeEvent_MessageEvent `protobuf:"bytes,3,opt,name=message_event,json=messageEvent,oneof"`
+	MessageEvent *Span_TimeEvent_MessageEvent `protobuf:"bytes,3,opt,name=message_event,json=messageEvent,proto3,oneof"`
 }
 
-func (*Span_TimeEvent_Annotation_) isSpan_TimeEvent_Value()   {}
+func (*Span_TimeEvent_Annotation_) isSpan_TimeEvent_Value() {}
+
 func (*Span_TimeEvent_MessageEvent_) isSpan_TimeEvent_Value() {}
 
 func (m *Span_TimeEvent) GetValue() isSpan_TimeEvent_Value {
@@ -327,13 +389,6 @@ func (m *Span_TimeEvent) GetValue() isSpan_TimeEvent_Value {
 	return nil
 }
 
-func (m *Span_TimeEvent) GetTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.Time
-	}
-	return nil
-}
-
 func (m *Span_TimeEvent) GetAnnotation() *Span_TimeEvent_Annotation {
 	if x, ok := m.GetValue().(*Span_TimeEvent_Annotation_); ok {
 		return x.Annotation
@@ -407,12 +462,12 @@ func _Span_TimeEvent_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Value.(type) {
 	case *Span_TimeEvent_Annotation_:
 		s := proto.Size(x.Annotation)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Span_TimeEvent_MessageEvent_:
 		s := proto.Size(x.MessageEvent)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -426,16 +481,38 @@ func _Span_TimeEvent_OneofSizer(msg proto.Message) (n int) {
 type Span_TimeEvent_Annotation struct {
 	// A user-supplied message describing the event. The maximum length for
 	// the description is 256 bytes.
-	Description *TruncatableString `protobuf:"bytes,1,opt,name=description" json:"description,omitempty"`
+	Description *TruncatableString `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
 	// A set of attributes on the annotation. You can have up to 4 attributes
 	// per Annotation.
-	Attributes *Span_Attributes `protobuf:"bytes,2,opt,name=attributes" json:"attributes,omitempty"`
+	Attributes           *Span_Attributes `protobuf:"bytes,2,opt,name=attributes,proto3" json:"attributes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *Span_TimeEvent_Annotation) Reset()                    { *m = Span_TimeEvent_Annotation{} }
-func (m *Span_TimeEvent_Annotation) String() string            { return proto.CompactTextString(m) }
-func (*Span_TimeEvent_Annotation) ProtoMessage()               {}
-func (*Span_TimeEvent_Annotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 1, 0} }
+func (m *Span_TimeEvent_Annotation) Reset()         { *m = Span_TimeEvent_Annotation{} }
+func (m *Span_TimeEvent_Annotation) String() string { return proto.CompactTextString(m) }
+func (*Span_TimeEvent_Annotation) ProtoMessage()    {}
+func (*Span_TimeEvent_Annotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 1, 0}
+}
+func (m *Span_TimeEvent_Annotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Span_TimeEvent_Annotation.Unmarshal(m, b)
+}
+func (m *Span_TimeEvent_Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Span_TimeEvent_Annotation.Marshal(b, m, deterministic)
+}
+func (dst *Span_TimeEvent_Annotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_TimeEvent_Annotation.Merge(dst, src)
+}
+func (m *Span_TimeEvent_Annotation) XXX_Size() int {
+	return xxx_messageInfo_Span_TimeEvent_Annotation.Size(m)
+}
+func (m *Span_TimeEvent_Annotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Span_TimeEvent_Annotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Span_TimeEvent_Annotation proto.InternalMessageInfo
 
 func (m *Span_TimeEvent_Annotation) GetDescription() *TruncatableString {
 	if m != nil {
@@ -455,24 +532,44 @@ func (m *Span_TimeEvent_Annotation) GetAttributes() *Span_Attributes {
 type Span_TimeEvent_MessageEvent struct {
 	// Type of MessageEvent. Indicates whether the message was sent or
 	// received.
-	Type Span_TimeEvent_MessageEvent_Type `protobuf:"varint,1,opt,name=type,enum=google.devtools.cloudtrace.v2.Span_TimeEvent_MessageEvent_Type" json:"type,omitempty"`
+	Type Span_TimeEvent_MessageEvent_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.devtools.cloudtrace.v2.Span_TimeEvent_MessageEvent_Type" json:"type,omitempty"`
 	// An identifier for the MessageEvent's message that can be used to match
 	// SENT and RECEIVED MessageEvents. It is recommended to be unique within
 	// a Span.
-	Id int64 `protobuf:"varint,2,opt,name=id" json:"id,omitempty"`
+	Id int64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
 	// The number of uncompressed bytes sent or received.
-	UncompressedSizeBytes int64 `protobuf:"varint,3,opt,name=uncompressed_size_bytes,json=uncompressedSizeBytes" json:"uncompressed_size_bytes,omitempty"`
+	UncompressedSizeBytes int64 `protobuf:"varint,3,opt,name=uncompressed_size_bytes,json=uncompressedSizeBytes,proto3" json:"uncompressed_size_bytes,omitempty"`
 	// The number of compressed bytes sent or received. If missing assumed to
 	// be the same size as uncompressed.
-	CompressedSizeBytes int64 `protobuf:"varint,4,opt,name=compressed_size_bytes,json=compressedSizeBytes" json:"compressed_size_bytes,omitempty"`
+	CompressedSizeBytes  int64    `protobuf:"varint,4,opt,name=compressed_size_bytes,json=compressedSizeBytes,proto3" json:"compressed_size_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *Span_TimeEvent_MessageEvent) Reset()         { *m = Span_TimeEvent_MessageEvent{} }
 func (m *Span_TimeEvent_MessageEvent) String() string { return proto.CompactTextString(m) }
 func (*Span_TimeEvent_MessageEvent) ProtoMessage()    {}
 func (*Span_TimeEvent_MessageEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 1, 1}
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 1, 1}
+}
+func (m *Span_TimeEvent_MessageEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Span_TimeEvent_MessageEvent.Unmarshal(m, b)
+}
+func (m *Span_TimeEvent_MessageEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Span_TimeEvent_MessageEvent.Marshal(b, m, deterministic)
 }
+func (dst *Span_TimeEvent_MessageEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_TimeEvent_MessageEvent.Merge(dst, src)
+}
+func (m *Span_TimeEvent_MessageEvent) XXX_Size() int {
+	return xxx_messageInfo_Span_TimeEvent_MessageEvent.Size(m)
+}
+func (m *Span_TimeEvent_MessageEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_Span_TimeEvent_MessageEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Span_TimeEvent_MessageEvent proto.InternalMessageInfo
 
 func (m *Span_TimeEvent_MessageEvent) GetType() Span_TimeEvent_MessageEvent_Type {
 	if m != nil {
@@ -507,19 +604,41 @@ func (m *Span_TimeEvent_MessageEvent) GetCompressedSizeBytes() int64 {
 // details of a message sent/received between Spans.
 type Span_TimeEvents struct {
 	// A collection of `TimeEvent`s.
-	TimeEvent []*Span_TimeEvent `protobuf:"bytes,1,rep,name=time_event,json=timeEvent" json:"time_event,omitempty"`
+	TimeEvent []*Span_TimeEvent `protobuf:"bytes,1,rep,name=time_event,json=timeEvent,proto3" json:"time_event,omitempty"`
 	// The number of dropped annotations in all the included time events.
 	// If the value is 0, then no annotations were dropped.
-	DroppedAnnotationsCount int32 `protobuf:"varint,2,opt,name=dropped_annotations_count,json=droppedAnnotationsCount" json:"dropped_annotations_count,omitempty"`
+	DroppedAnnotationsCount int32 `protobuf:"varint,2,opt,name=dropped_annotations_count,json=droppedAnnotationsCount,proto3" json:"dropped_annotations_count,omitempty"`
 	// The number of dropped message events in all the included time events.
 	// If the value is 0, then no message events were dropped.
-	DroppedMessageEventsCount int32 `protobuf:"varint,3,opt,name=dropped_message_events_count,json=droppedMessageEventsCount" json:"dropped_message_events_count,omitempty"`
+	DroppedMessageEventsCount int32    `protobuf:"varint,3,opt,name=dropped_message_events_count,json=droppedMessageEventsCount,proto3" json:"dropped_message_events_count,omitempty"`
+	XXX_NoUnkeyedLiteral      struct{} `json:"-"`
+	XXX_unrecognized          []byte   `json:"-"`
+	XXX_sizecache             int32    `json:"-"`
+}
+
+func (m *Span_TimeEvents) Reset()         { *m = Span_TimeEvents{} }
+func (m *Span_TimeEvents) String() string { return proto.CompactTextString(m) }
+func (*Span_TimeEvents) ProtoMessage()    {}
+func (*Span_TimeEvents) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 2}
+}
+func (m *Span_TimeEvents) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Span_TimeEvents.Unmarshal(m, b)
+}
+func (m *Span_TimeEvents) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Span_TimeEvents.Marshal(b, m, deterministic)
+}
+func (dst *Span_TimeEvents) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_TimeEvents.Merge(dst, src)
+}
+func (m *Span_TimeEvents) XXX_Size() int {
+	return xxx_messageInfo_Span_TimeEvents.Size(m)
+}
+func (m *Span_TimeEvents) XXX_DiscardUnknown() {
+	xxx_messageInfo_Span_TimeEvents.DiscardUnknown(m)
 }
 
-func (m *Span_TimeEvents) Reset()                    { *m = Span_TimeEvents{} }
-func (m *Span_TimeEvents) String() string            { return proto.CompactTextString(m) }
-func (*Span_TimeEvents) ProtoMessage()               {}
-func (*Span_TimeEvents) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 2} }
+var xxx_messageInfo_Span_TimeEvents proto.InternalMessageInfo
 
 func (m *Span_TimeEvents) GetTimeEvent() []*Span_TimeEvent {
 	if m != nil {
@@ -548,20 +667,42 @@ func (m *Span_TimeEvents) GetDroppedMessageEventsCount() int32 {
 // traces or when the handler receives a request from a different project.
 type Span_Link struct {
 	// The [TRACE_ID] for a trace within a project.
-	TraceId string `protobuf:"bytes,1,opt,name=trace_id,json=traceId" json:"trace_id,omitempty"`
+	TraceId string `protobuf:"bytes,1,opt,name=trace_id,json=traceId,proto3" json:"trace_id,omitempty"`
 	// The [SPAN_ID] for a span within a trace.
-	SpanId string `protobuf:"bytes,2,opt,name=span_id,json=spanId" json:"span_id,omitempty"`
+	SpanId string `protobuf:"bytes,2,opt,name=span_id,json=spanId,proto3" json:"span_id,omitempty"`
 	// The relationship of the current span relative to the linked span.
-	Type Span_Link_Type `protobuf:"varint,3,opt,name=type,enum=google.devtools.cloudtrace.v2.Span_Link_Type" json:"type,omitempty"`
+	Type Span_Link_Type `protobuf:"varint,3,opt,name=type,proto3,enum=google.devtools.cloudtrace.v2.Span_Link_Type" json:"type,omitempty"`
 	// A set of attributes on the link. You have have up to  32 attributes per
 	// link.
-	Attributes *Span_Attributes `protobuf:"bytes,4,opt,name=attributes" json:"attributes,omitempty"`
+	Attributes           *Span_Attributes `protobuf:"bytes,4,opt,name=attributes,proto3" json:"attributes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *Span_Link) Reset()         { *m = Span_Link{} }
+func (m *Span_Link) String() string { return proto.CompactTextString(m) }
+func (*Span_Link) ProtoMessage()    {}
+func (*Span_Link) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 3}
+}
+func (m *Span_Link) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Span_Link.Unmarshal(m, b)
+}
+func (m *Span_Link) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Span_Link.Marshal(b, m, deterministic)
+}
+func (dst *Span_Link) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_Link.Merge(dst, src)
+}
+func (m *Span_Link) XXX_Size() int {
+	return xxx_messageInfo_Span_Link.Size(m)
+}
+func (m *Span_Link) XXX_DiscardUnknown() {
+	xxx_messageInfo_Span_Link.DiscardUnknown(m)
 }
 
-func (m *Span_Link) Reset()                    { *m = Span_Link{} }
-func (m *Span_Link) String() string            { return proto.CompactTextString(m) }
-func (*Span_Link) ProtoMessage()               {}
-func (*Span_Link) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 3} }
+var xxx_messageInfo_Span_Link proto.InternalMessageInfo
 
 func (m *Span_Link) GetTraceId() string {
 	if m != nil {
@@ -595,16 +736,38 @@ func (m *Span_Link) GetAttributes() *Span_Attributes {
 // in the same or different trace.
 type Span_Links struct {
 	// A collection of links.
-	Link []*Span_Link `protobuf:"bytes,1,rep,name=link" json:"link,omitempty"`
+	Link []*Span_Link `protobuf:"bytes,1,rep,name=link,proto3" json:"link,omitempty"`
 	// The number of dropped links after the maximum size was enforced. If
 	// this value is 0, then no links were dropped.
-	DroppedLinksCount int32 `protobuf:"varint,2,opt,name=dropped_links_count,json=droppedLinksCount" json:"dropped_links_count,omitempty"`
+	DroppedLinksCount    int32    `protobuf:"varint,2,opt,name=dropped_links_count,json=droppedLinksCount,proto3" json:"dropped_links_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Span_Links) Reset()                    { *m = Span_Links{} }
-func (m *Span_Links) String() string            { return proto.CompactTextString(m) }
-func (*Span_Links) ProtoMessage()               {}
-func (*Span_Links) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 4} }
+func (m *Span_Links) Reset()         { *m = Span_Links{} }
+func (m *Span_Links) String() string { return proto.CompactTextString(m) }
+func (*Span_Links) ProtoMessage()    {}
+func (*Span_Links) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 4}
+}
+func (m *Span_Links) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Span_Links.Unmarshal(m, b)
+}
+func (m *Span_Links) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Span_Links.Marshal(b, m, deterministic)
+}
+func (dst *Span_Links) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Span_Links.Merge(dst, src)
+}
+func (m *Span_Links) XXX_Size() int {
+	return xxx_messageInfo_Span_Links.Size(m)
+}
+func (m *Span_Links) XXX_DiscardUnknown() {
+	xxx_messageInfo_Span_Links.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Span_Links proto.InternalMessageInfo
 
 func (m *Span_Links) GetLink() []*Span_Link {
 	if m != nil {
@@ -628,31 +791,57 @@ type AttributeValue struct {
 	//	*AttributeValue_StringValue
 	//	*AttributeValue_IntValue
 	//	*AttributeValue_BoolValue
-	Value isAttributeValue_Value `protobuf_oneof:"value"`
+	Value                isAttributeValue_Value `protobuf_oneof:"value"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *AttributeValue) Reset()         { *m = AttributeValue{} }
+func (m *AttributeValue) String() string { return proto.CompactTextString(m) }
+func (*AttributeValue) ProtoMessage()    {}
+func (*AttributeValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{1}
+}
+func (m *AttributeValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AttributeValue.Unmarshal(m, b)
+}
+func (m *AttributeValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AttributeValue.Marshal(b, m, deterministic)
+}
+func (dst *AttributeValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttributeValue.Merge(dst, src)
+}
+func (m *AttributeValue) XXX_Size() int {
+	return xxx_messageInfo_AttributeValue.Size(m)
+}
+func (m *AttributeValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_AttributeValue.DiscardUnknown(m)
 }
 
-func (m *AttributeValue) Reset()                    { *m = AttributeValue{} }
-func (m *AttributeValue) String() string            { return proto.CompactTextString(m) }
-func (*AttributeValue) ProtoMessage()               {}
-func (*AttributeValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_AttributeValue proto.InternalMessageInfo
 
 type isAttributeValue_Value interface {
 	isAttributeValue_Value()
 }
 
 type AttributeValue_StringValue struct {
-	StringValue *TruncatableString `protobuf:"bytes,1,opt,name=string_value,json=stringValue,oneof"`
+	StringValue *TruncatableString `protobuf:"bytes,1,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
+
 type AttributeValue_IntValue struct {
-	IntValue int64 `protobuf:"varint,2,opt,name=int_value,json=intValue,oneof"`
+	IntValue int64 `protobuf:"varint,2,opt,name=int_value,json=intValue,proto3,oneof"`
 }
+
 type AttributeValue_BoolValue struct {
-	BoolValue bool `protobuf:"varint,3,opt,name=bool_value,json=boolValue,oneof"`
+	BoolValue bool `protobuf:"varint,3,opt,name=bool_value,json=boolValue,proto3,oneof"`
 }
 
 func (*AttributeValue_StringValue) isAttributeValue_Value() {}
-func (*AttributeValue_IntValue) isAttributeValue_Value()    {}
-func (*AttributeValue_BoolValue) isAttributeValue_Value()   {}
+
+func (*AttributeValue_IntValue) isAttributeValue_Value() {}
+
+func (*AttributeValue_BoolValue) isAttributeValue_Value() {}
 
 func (m *AttributeValue) GetValue() isAttributeValue_Value {
 	if m != nil {
@@ -753,14 +942,14 @@ func _AttributeValue_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Value.(type) {
 	case *AttributeValue_StringValue:
 		s := proto.Size(x.StringValue)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *AttributeValue_IntValue:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.IntValue))
 	case *AttributeValue_BoolValue:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case nil:
 	default:
@@ -772,7 +961,7 @@ func _AttributeValue_OneofSizer(msg proto.Message) (n int) {
 // A call stack appearing in a trace.
 type StackTrace struct {
 	// Stack frames in this stack trace. A maximum of 128 frames are allowed.
-	StackFrames *StackTrace_StackFrames `protobuf:"bytes,1,opt,name=stack_frames,json=stackFrames" json:"stack_frames,omitempty"`
+	StackFrames *StackTrace_StackFrames `protobuf:"bytes,1,opt,name=stack_frames,json=stackFrames,proto3" json:"stack_frames,omitempty"`
 	// The hash ID is used to conserve network bandwidth for duplicate
 	// stack traces within a single trace.
 	//
@@ -782,13 +971,35 @@ type StackTrace struct {
 	//
 	// Subsequent spans within the same request can refer
 	// to that stack trace by only setting `stackTraceHashId`.
-	StackTraceHashId int64 `protobuf:"varint,2,opt,name=stack_trace_hash_id,json=stackTraceHashId" json:"stack_trace_hash_id,omitempty"`
+	StackTraceHashId     int64    `protobuf:"varint,2,opt,name=stack_trace_hash_id,json=stackTraceHashId,proto3" json:"stack_trace_hash_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StackTrace) Reset()                    { *m = StackTrace{} }
-func (m *StackTrace) String() string            { return proto.CompactTextString(m) }
-func (*StackTrace) ProtoMessage()               {}
-func (*StackTrace) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *StackTrace) Reset()         { *m = StackTrace{} }
+func (m *StackTrace) String() string { return proto.CompactTextString(m) }
+func (*StackTrace) ProtoMessage()    {}
+func (*StackTrace) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{2}
+}
+func (m *StackTrace) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StackTrace.Unmarshal(m, b)
+}
+func (m *StackTrace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StackTrace.Marshal(b, m, deterministic)
+}
+func (dst *StackTrace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StackTrace.Merge(dst, src)
+}
+func (m *StackTrace) XXX_Size() int {
+	return xxx_messageInfo_StackTrace.Size(m)
+}
+func (m *StackTrace) XXX_DiscardUnknown() {
+	xxx_messageInfo_StackTrace.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StackTrace proto.InternalMessageInfo
 
 func (m *StackTrace) GetStackFrames() *StackTrace_StackFrames {
 	if m != nil {
@@ -808,29 +1019,51 @@ func (m *StackTrace) GetStackTraceHashId() int64 {
 type StackTrace_StackFrame struct {
 	// The fully-qualified name that uniquely identifies the function or
 	// method that is active in this frame (up to 1024 bytes).
-	FunctionName *TruncatableString `protobuf:"bytes,1,opt,name=function_name,json=functionName" json:"function_name,omitempty"`
+	FunctionName *TruncatableString `protobuf:"bytes,1,opt,name=function_name,json=functionName,proto3" json:"function_name,omitempty"`
 	// An un-mangled function name, if `function_name` is
 	// [mangled](http://www.avabodh.com/cxxin/namemangling.html). The name can
 	// be fully-qualified (up to 1024 bytes).
-	OriginalFunctionName *TruncatableString `protobuf:"bytes,2,opt,name=original_function_name,json=originalFunctionName" json:"original_function_name,omitempty"`
+	OriginalFunctionName *TruncatableString `protobuf:"bytes,2,opt,name=original_function_name,json=originalFunctionName,proto3" json:"original_function_name,omitempty"`
 	// The name of the source file where the function call appears (up to 256
 	// bytes).
-	FileName *TruncatableString `protobuf:"bytes,3,opt,name=file_name,json=fileName" json:"file_name,omitempty"`
+	FileName *TruncatableString `protobuf:"bytes,3,opt,name=file_name,json=fileName,proto3" json:"file_name,omitempty"`
 	// The line number in `file_name` where the function call appears.
-	LineNumber int64 `protobuf:"varint,4,opt,name=line_number,json=lineNumber" json:"line_number,omitempty"`
+	LineNumber int64 `protobuf:"varint,4,opt,name=line_number,json=lineNumber,proto3" json:"line_number,omitempty"`
 	// The column number where the function call appears, if available.
 	// This is important in JavaScript because of its anonymous functions.
-	ColumnNumber int64 `protobuf:"varint,5,opt,name=column_number,json=columnNumber" json:"column_number,omitempty"`
+	ColumnNumber int64 `protobuf:"varint,5,opt,name=column_number,json=columnNumber,proto3" json:"column_number,omitempty"`
 	// The binary module from where the code was loaded.
-	LoadModule *Module `protobuf:"bytes,6,opt,name=load_module,json=loadModule" json:"load_module,omitempty"`
+	LoadModule *Module `protobuf:"bytes,6,opt,name=load_module,json=loadModule,proto3" json:"load_module,omitempty"`
 	// The version of the deployed source code (up to 128 bytes).
-	SourceVersion *TruncatableString `protobuf:"bytes,7,opt,name=source_version,json=sourceVersion" json:"source_version,omitempty"`
+	SourceVersion        *TruncatableString `protobuf:"bytes,7,opt,name=source_version,json=sourceVersion,proto3" json:"source_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *StackTrace_StackFrame) Reset()                    { *m = StackTrace_StackFrame{} }
-func (m *StackTrace_StackFrame) String() string            { return proto.CompactTextString(m) }
-func (*StackTrace_StackFrame) ProtoMessage()               {}
-func (*StackTrace_StackFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (m *StackTrace_StackFrame) Reset()         { *m = StackTrace_StackFrame{} }
+func (m *StackTrace_StackFrame) String() string { return proto.CompactTextString(m) }
+func (*StackTrace_StackFrame) ProtoMessage()    {}
+func (*StackTrace_StackFrame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{2, 0}
+}
+func (m *StackTrace_StackFrame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StackTrace_StackFrame.Unmarshal(m, b)
+}
+func (m *StackTrace_StackFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StackTrace_StackFrame.Marshal(b, m, deterministic)
+}
+func (dst *StackTrace_StackFrame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StackTrace_StackFrame.Merge(dst, src)
+}
+func (m *StackTrace_StackFrame) XXX_Size() int {
+	return xxx_messageInfo_StackTrace_StackFrame.Size(m)
+}
+func (m *StackTrace_StackFrame) XXX_DiscardUnknown() {
+	xxx_messageInfo_StackTrace_StackFrame.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StackTrace_StackFrame proto.InternalMessageInfo
 
 func (m *StackTrace_StackFrame) GetFunctionName() *TruncatableString {
 	if m != nil {
@@ -884,17 +1117,39 @@ func (m *StackTrace_StackFrame) GetSourceVersion() *TruncatableString {
 // A collection of stack frames, which can be truncated.
 type StackTrace_StackFrames struct {
 	// Stack frames in this call stack.
-	Frame []*StackTrace_StackFrame `protobuf:"bytes,1,rep,name=frame" json:"frame,omitempty"`
+	Frame []*StackTrace_StackFrame `protobuf:"bytes,1,rep,name=frame,proto3" json:"frame,omitempty"`
 	// The number of stack frames that were dropped because there
 	// were too many stack frames.
 	// If this value is 0, then no stack frames were dropped.
-	DroppedFramesCount int32 `protobuf:"varint,2,opt,name=dropped_frames_count,json=droppedFramesCount" json:"dropped_frames_count,omitempty"`
+	DroppedFramesCount   int32    `protobuf:"varint,2,opt,name=dropped_frames_count,json=droppedFramesCount,proto3" json:"dropped_frames_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StackTrace_StackFrames) Reset()                    { *m = StackTrace_StackFrames{} }
-func (m *StackTrace_StackFrames) String() string            { return proto.CompactTextString(m) }
-func (*StackTrace_StackFrames) ProtoMessage()               {}
-func (*StackTrace_StackFrames) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
+func (m *StackTrace_StackFrames) Reset()         { *m = StackTrace_StackFrames{} }
+func (m *StackTrace_StackFrames) String() string { return proto.CompactTextString(m) }
+func (*StackTrace_StackFrames) ProtoMessage()    {}
+func (*StackTrace_StackFrames) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{2, 1}
+}
+func (m *StackTrace_StackFrames) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StackTrace_StackFrames.Unmarshal(m, b)
+}
+func (m *StackTrace_StackFrames) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StackTrace_StackFrames.Marshal(b, m, deterministic)
+}
+func (dst *StackTrace_StackFrames) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StackTrace_StackFrames.Merge(dst, src)
+}
+func (m *StackTrace_StackFrames) XXX_Size() int {
+	return xxx_messageInfo_StackTrace_StackFrames.Size(m)
+}
+func (m *StackTrace_StackFrames) XXX_DiscardUnknown() {
+	xxx_messageInfo_StackTrace_StackFrames.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StackTrace_StackFrames proto.InternalMessageInfo
 
 func (m *StackTrace_StackFrames) GetFrame() []*StackTrace_StackFrame {
 	if m != nil {
@@ -914,16 +1169,38 @@ func (m *StackTrace_StackFrames) GetDroppedFramesCount() int32 {
 type Module struct {
 	// For example: main binary, kernel modules, and dynamic libraries
 	// such as libc.so, sharedlib.so (up to 256 bytes).
-	Module *TruncatableString `protobuf:"bytes,1,opt,name=module" json:"module,omitempty"`
+	Module *TruncatableString `protobuf:"bytes,1,opt,name=module,proto3" json:"module,omitempty"`
 	// A unique identifier for the module, usually a hash of its
 	// contents (up to 128 bytes).
-	BuildId *TruncatableString `protobuf:"bytes,2,opt,name=build_id,json=buildId" json:"build_id,omitempty"`
+	BuildId              *TruncatableString `protobuf:"bytes,2,opt,name=build_id,json=buildId,proto3" json:"build_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *Module) Reset()                    { *m = Module{} }
-func (m *Module) String() string            { return proto.CompactTextString(m) }
-func (*Module) ProtoMessage()               {}
-func (*Module) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *Module) Reset()         { *m = Module{} }
+func (m *Module) String() string { return proto.CompactTextString(m) }
+func (*Module) ProtoMessage()    {}
+func (*Module) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{3}
+}
+func (m *Module) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Module.Unmarshal(m, b)
+}
+func (m *Module) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Module.Marshal(b, m, deterministic)
+}
+func (dst *Module) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Module.Merge(dst, src)
+}
+func (m *Module) XXX_Size() int {
+	return xxx_messageInfo_Module.Size(m)
+}
+func (m *Module) XXX_DiscardUnknown() {
+	xxx_messageInfo_Module.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Module proto.InternalMessageInfo
 
 func (m *Module) GetModule() *TruncatableString {
 	if m != nil {
@@ -948,16 +1225,38 @@ type TruncatableString struct {
 	// Truncation always happens on a UTF8 character boundary. If there
 	// are multi-byte characters in the string, then the length of the
 	// shortened string might be less than the size limit.
-	Value string `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 	// The number of bytes removed from the original string. If this
 	// value is 0, then the string was not shortened.
-	TruncatedByteCount int32 `protobuf:"varint,2,opt,name=truncated_byte_count,json=truncatedByteCount" json:"truncated_byte_count,omitempty"`
+	TruncatedByteCount   int32    `protobuf:"varint,2,opt,name=truncated_byte_count,json=truncatedByteCount,proto3" json:"truncated_byte_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TruncatableString) Reset()         { *m = TruncatableString{} }
+func (m *TruncatableString) String() string { return proto.CompactTextString(m) }
+func (*TruncatableString) ProtoMessage()    {}
+func (*TruncatableString) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_fa9cb54dc45915f9, []int{4}
+}
+func (m *TruncatableString) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TruncatableString.Unmarshal(m, b)
+}
+func (m *TruncatableString) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TruncatableString.Marshal(b, m, deterministic)
+}
+func (dst *TruncatableString) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TruncatableString.Merge(dst, src)
+}
+func (m *TruncatableString) XXX_Size() int {
+	return xxx_messageInfo_TruncatableString.Size(m)
+}
+func (m *TruncatableString) XXX_DiscardUnknown() {
+	xxx_messageInfo_TruncatableString.DiscardUnknown(m)
 }
 
-func (m *TruncatableString) Reset()                    { *m = TruncatableString{} }
-func (m *TruncatableString) String() string            { return proto.CompactTextString(m) }
-func (*TruncatableString) ProtoMessage()               {}
-func (*TruncatableString) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_TruncatableString proto.InternalMessageInfo
 
 func (m *TruncatableString) GetValue() string {
 	if m != nil {
@@ -976,6 +1275,7 @@ func (m *TruncatableString) GetTruncatedByteCount() int32 {
 func init() {
 	proto.RegisterType((*Span)(nil), "google.devtools.cloudtrace.v2.Span")
 	proto.RegisterType((*Span_Attributes)(nil), "google.devtools.cloudtrace.v2.Span.Attributes")
+	proto.RegisterMapType((map[string]*AttributeValue)(nil), "google.devtools.cloudtrace.v2.Span.Attributes.AttributeMapEntry")
 	proto.RegisterType((*Span_TimeEvent)(nil), "google.devtools.cloudtrace.v2.Span.TimeEvent")
 	proto.RegisterType((*Span_TimeEvent_Annotation)(nil), "google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation")
 	proto.RegisterType((*Span_TimeEvent_MessageEvent)(nil), "google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent")
@@ -992,9 +1292,11 @@ func init() {
 	proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_Link_Type", Span_Link_Type_name, Span_Link_Type_value)
 }
 
-func init() { proto.RegisterFile("google/devtools/cloudtrace/v2/trace.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/devtools/cloudtrace/v2/trace.proto", fileDescriptor_trace_fa9cb54dc45915f9)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_trace_fa9cb54dc45915f9 = []byte{
 	// 1425 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4b, 0x6f, 0xdb, 0xc6,
 	0x16, 0x36, 0xf5, 0xd6, 0x91, 0x6c, 0xc8, 0x13, 0x3b, 0x56, 0x94, 0xe4, 0x26, 0xd7, 0xf7, 0x16,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/tracing.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/tracing.pb.go
index 889400e3..6e6925ca 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/tracing.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/tracing.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/cloudtrace/v2/tracing.proto
 
-package cloudtrace
+package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/empty"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
 
 import (
 	context "golang.org/x/net/context"
@@ -20,20 +20,48 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The request message for the `BatchWriteSpans` method.
 type BatchWriteSpansRequest struct {
 	// Required. The name of the project where the spans belong. The format is
 	// `projects/[PROJECT_ID]`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A list of new spans. The span names must not match existing
 	// spans, or the results are undefined.
-	Spans []*Span `protobuf:"bytes,2,rep,name=spans" json:"spans,omitempty"`
+	Spans                []*Span  `protobuf:"bytes,2,rep,name=spans,proto3" json:"spans,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BatchWriteSpansRequest) Reset()                    { *m = BatchWriteSpansRequest{} }
-func (m *BatchWriteSpansRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchWriteSpansRequest) ProtoMessage()               {}
-func (*BatchWriteSpansRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *BatchWriteSpansRequest) Reset()         { *m = BatchWriteSpansRequest{} }
+func (m *BatchWriteSpansRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchWriteSpansRequest) ProtoMessage()    {}
+func (*BatchWriteSpansRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_tracing_18786c49399bd83d, []int{0}
+}
+func (m *BatchWriteSpansRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchWriteSpansRequest.Unmarshal(m, b)
+}
+func (m *BatchWriteSpansRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchWriteSpansRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchWriteSpansRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchWriteSpansRequest.Merge(dst, src)
+}
+func (m *BatchWriteSpansRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchWriteSpansRequest.Size(m)
+}
+func (m *BatchWriteSpansRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchWriteSpansRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchWriteSpansRequest proto.InternalMessageInfo
 
 func (m *BatchWriteSpansRequest) GetName() string {
 	if m != nil {
@@ -61,12 +89,13 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for TraceService service
-
+// TraceServiceClient is the client API for TraceService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type TraceServiceClient interface {
 	// Sends new spans to new or existing traces. You cannot update
 	// existing spans.
-	BatchWriteSpans(ctx context.Context, in *BatchWriteSpansRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	BatchWriteSpans(ctx context.Context, in *BatchWriteSpansRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Creates a new span.
 	CreateSpan(ctx context.Context, in *Span, opts ...grpc.CallOption) (*Span, error)
 }
@@ -79,9 +108,9 @@ func NewTraceServiceClient(cc *grpc.ClientConn) TraceServiceClient {
 	return &traceServiceClient{cc}
 }
 
-func (c *traceServiceClient) BatchWriteSpans(ctx context.Context, in *BatchWriteSpansRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudtrace.v2.TraceService/BatchWriteSpans", in, out, c.cc, opts...)
+func (c *traceServiceClient) BatchWriteSpans(ctx context.Context, in *BatchWriteSpansRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudtrace.v2.TraceService/BatchWriteSpans", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -90,19 +119,18 @@ func (c *traceServiceClient) BatchWriteSpans(ctx context.Context, in *BatchWrite
 
 func (c *traceServiceClient) CreateSpan(ctx context.Context, in *Span, opts ...grpc.CallOption) (*Span, error) {
 	out := new(Span)
-	err := grpc.Invoke(ctx, "/google.devtools.cloudtrace.v2.TraceService/CreateSpan", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.cloudtrace.v2.TraceService/CreateSpan", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for TraceService service
-
+// TraceServiceServer is the server API for TraceService service.
 type TraceServiceServer interface {
 	// Sends new spans to new or existing traces. You cannot update
 	// existing spans.
-	BatchWriteSpans(context.Context, *BatchWriteSpansRequest) (*google_protobuf4.Empty, error)
+	BatchWriteSpans(context.Context, *BatchWriteSpansRequest) (*empty.Empty, error)
 	// Creates a new span.
 	CreateSpan(context.Context, *Span) (*Span, error)
 }
@@ -164,9 +192,11 @@ var _TraceService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/cloudtrace/v2/tracing.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/cloudtrace/v2/tracing.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/devtools/cloudtrace/v2/tracing.proto", fileDescriptor_tracing_18786c49399bd83d)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_tracing_18786c49399bd83d = []byte{
 	// 404 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xdd, 0x6a, 0xdb, 0x30,
 	0x14, 0x46, 0xde, 0x0f, 0x4c, 0x1b, 0x0c, 0x04, 0x0b, 0xc1, 0xdb, 0x58, 0xe6, 0x0d, 0x96, 0x64,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
index 9773761d..6371cda0 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/bill_of_materials.pb.go
@@ -1,63 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/bill_of_materials.proto
 
-/*
-Package containeranalysis is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/containeranalysis/v1alpha1/bill_of_materials.proto
-	google/devtools/containeranalysis/v1alpha1/containeranalysis.proto
-	google/devtools/containeranalysis/v1alpha1/image_basis.proto
-	google/devtools/containeranalysis/v1alpha1/package_vulnerability.proto
-	google/devtools/containeranalysis/v1alpha1/provenance.proto
-	google/devtools/containeranalysis/v1alpha1/source_context.proto
-
-It has these top-level messages:
-	PackageManager
-	Occurrence
-	Note
-	Deployable
-	Discovery
-	BuildType
-	BuildSignature
-	BuildDetails
-	GetOccurrenceRequest
-	ListOccurrencesRequest
-	ListOccurrencesResponse
-	DeleteOccurrenceRequest
-	CreateOccurrenceRequest
-	UpdateOccurrenceRequest
-	GetNoteRequest
-	GetOccurrenceNoteRequest
-	ListNotesRequest
-	ListNotesResponse
-	DeleteNoteRequest
-	CreateNoteRequest
-	UpdateNoteRequest
-	ListNoteOccurrencesRequest
-	ListNoteOccurrencesResponse
-	OperationMetadata
-	GetVulnzOccurrencesSummaryRequest
-	GetVulnzOccurrencesSummaryResponse
-	DockerImage
-	VulnerabilityType
-	BuildProvenance
-	Source
-	FileHashes
-	Hash
-	StorageSource
-	RepoSource
-	Command
-	Artifact
-	SourceContext
-	AliasContext
-	CloudRepoSourceContext
-	GerritSourceContext
-	GitSourceContext
-	RepoId
-	ProjectRepoId
-*/
-package containeranalysis
+package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -102,42 +46,86 @@ func (x PackageManager_Architecture) String() string {
 	return proto.EnumName(PackageManager_Architecture_name, int32(x))
 }
 func (PackageManager_Architecture) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 0}
+	return fileDescriptor_bill_of_materials_27661a0342dc8703, []int{0, 0}
 }
 
 // PackageManager provides metadata about available / installed packages.
 type PackageManager struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PackageManager) Reset()                    { *m = PackageManager{} }
-func (m *PackageManager) String() string            { return proto.CompactTextString(m) }
-func (*PackageManager) ProtoMessage()               {}
-func (*PackageManager) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *PackageManager) Reset()         { *m = PackageManager{} }
+func (m *PackageManager) String() string { return proto.CompactTextString(m) }
+func (*PackageManager) ProtoMessage()    {}
+func (*PackageManager) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bill_of_materials_27661a0342dc8703, []int{0}
+}
+func (m *PackageManager) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PackageManager.Unmarshal(m, b)
+}
+func (m *PackageManager) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PackageManager.Marshal(b, m, deterministic)
+}
+func (dst *PackageManager) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager.Merge(dst, src)
+}
+func (m *PackageManager) XXX_Size() int {
+	return xxx_messageInfo_PackageManager.Size(m)
+}
+func (m *PackageManager) XXX_DiscardUnknown() {
+	xxx_messageInfo_PackageManager.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PackageManager proto.InternalMessageInfo
 
 // This represents a particular channel of distribution for a given package.
 // e.g. Debian's jessie-backports dpkg mirror
 type PackageManager_Distribution struct {
 	// The cpe_uri in [cpe format](https://cpe.mitre.org/specification/)
 	// denoting the package manager version distributing a package.
-	CpeUri string `protobuf:"bytes,1,opt,name=cpe_uri,json=cpeUri" json:"cpe_uri,omitempty"`
+	CpeUri string `protobuf:"bytes,1,opt,name=cpe_uri,json=cpeUri,proto3" json:"cpe_uri,omitempty"`
 	// The CPU architecture for which packages in this distribution
 	// channel were built
-	Architecture PackageManager_Architecture `protobuf:"varint,2,opt,name=architecture,enum=google.devtools.containeranalysis.v1alpha1.PackageManager_Architecture" json:"architecture,omitempty"`
+	Architecture PackageManager_Architecture `protobuf:"varint,2,opt,name=architecture,proto3,enum=google.devtools.containeranalysis.v1alpha1.PackageManager_Architecture" json:"architecture,omitempty"`
 	// The latest available version of this package in
 	// this distribution channel.
-	LatestVersion *VulnerabilityType_Version `protobuf:"bytes,3,opt,name=latest_version,json=latestVersion" json:"latest_version,omitempty"`
+	LatestVersion *VulnerabilityType_Version `protobuf:"bytes,3,opt,name=latest_version,json=latestVersion,proto3" json:"latest_version,omitempty"`
 	// A freeform string denoting the maintainer of this package.
-	Maintainer string `protobuf:"bytes,4,opt,name=maintainer" json:"maintainer,omitempty"`
+	Maintainer string `protobuf:"bytes,4,opt,name=maintainer,proto3" json:"maintainer,omitempty"`
 	// The distribution channel-specific homepage for this package.
-	Url string `protobuf:"bytes,6,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,6,opt,name=url,proto3" json:"url,omitempty"`
 	// The distribution channel-specific description of this package.
-	Description string `protobuf:"bytes,7,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,7,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PackageManager_Distribution) Reset()         { *m = PackageManager_Distribution{} }
+func (m *PackageManager_Distribution) String() string { return proto.CompactTextString(m) }
+func (*PackageManager_Distribution) ProtoMessage()    {}
+func (*PackageManager_Distribution) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bill_of_materials_27661a0342dc8703, []int{0, 0}
+}
+func (m *PackageManager_Distribution) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PackageManager_Distribution.Unmarshal(m, b)
+}
+func (m *PackageManager_Distribution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PackageManager_Distribution.Marshal(b, m, deterministic)
+}
+func (dst *PackageManager_Distribution) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager_Distribution.Merge(dst, src)
+}
+func (m *PackageManager_Distribution) XXX_Size() int {
+	return xxx_messageInfo_PackageManager_Distribution.Size(m)
+}
+func (m *PackageManager_Distribution) XXX_DiscardUnknown() {
+	xxx_messageInfo_PackageManager_Distribution.DiscardUnknown(m)
 }
 
-func (m *PackageManager_Distribution) Reset()                    { *m = PackageManager_Distribution{} }
-func (m *PackageManager_Distribution) String() string            { return proto.CompactTextString(m) }
-func (*PackageManager_Distribution) ProtoMessage()               {}
-func (*PackageManager_Distribution) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+var xxx_messageInfo_PackageManager_Distribution proto.InternalMessageInfo
 
 func (m *PackageManager_Distribution) GetCpeUri() string {
 	if m != nil {
@@ -187,17 +175,39 @@ func (m *PackageManager_Distribution) GetDescription() string {
 type PackageManager_Location struct {
 	// The cpe_uri in [cpe format](https://cpe.mitre.org/specification/)
 	// denoting the package manager version distributing a package.
-	CpeUri string `protobuf:"bytes,1,opt,name=cpe_uri,json=cpeUri" json:"cpe_uri,omitempty"`
+	CpeUri string `protobuf:"bytes,1,opt,name=cpe_uri,json=cpeUri,proto3" json:"cpe_uri,omitempty"`
 	// The version installed at this location.
-	Version *VulnerabilityType_Version `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
+	Version *VulnerabilityType_Version `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
 	// The path from which we gathered that this package/version is installed.
-	Path string `protobuf:"bytes,3,opt,name=path" json:"path,omitempty"`
+	Path                 string   `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PackageManager_Location) Reset()                    { *m = PackageManager_Location{} }
-func (m *PackageManager_Location) String() string            { return proto.CompactTextString(m) }
-func (*PackageManager_Location) ProtoMessage()               {}
-func (*PackageManager_Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 1} }
+func (m *PackageManager_Location) Reset()         { *m = PackageManager_Location{} }
+func (m *PackageManager_Location) String() string { return proto.CompactTextString(m) }
+func (*PackageManager_Location) ProtoMessage()    {}
+func (*PackageManager_Location) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bill_of_materials_27661a0342dc8703, []int{0, 1}
+}
+func (m *PackageManager_Location) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PackageManager_Location.Unmarshal(m, b)
+}
+func (m *PackageManager_Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PackageManager_Location.Marshal(b, m, deterministic)
+}
+func (dst *PackageManager_Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager_Location.Merge(dst, src)
+}
+func (m *PackageManager_Location) XXX_Size() int {
+	return xxx_messageInfo_PackageManager_Location.Size(m)
+}
+func (m *PackageManager_Location) XXX_DiscardUnknown() {
+	xxx_messageInfo_PackageManager_Location.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PackageManager_Location proto.InternalMessageInfo
 
 func (m *PackageManager_Location) GetCpeUri() string {
 	if m != nil {
@@ -225,15 +235,37 @@ func (m *PackageManager_Location) GetPath() string {
 // e.g. glibc (aka libc6) is distributed by many, at various versions.
 type PackageManager_Package struct {
 	// The name of the package.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The various channels by which a package is distributed.
-	Distribution []*PackageManager_Distribution `protobuf:"bytes,10,rep,name=distribution" json:"distribution,omitempty"`
+	Distribution         []*PackageManager_Distribution `protobuf:"bytes,10,rep,name=distribution,proto3" json:"distribution,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
 }
 
-func (m *PackageManager_Package) Reset()                    { *m = PackageManager_Package{} }
-func (m *PackageManager_Package) String() string            { return proto.CompactTextString(m) }
-func (*PackageManager_Package) ProtoMessage()               {}
-func (*PackageManager_Package) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 2} }
+func (m *PackageManager_Package) Reset()         { *m = PackageManager_Package{} }
+func (m *PackageManager_Package) String() string { return proto.CompactTextString(m) }
+func (*PackageManager_Package) ProtoMessage()    {}
+func (*PackageManager_Package) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bill_of_materials_27661a0342dc8703, []int{0, 2}
+}
+func (m *PackageManager_Package) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PackageManager_Package.Unmarshal(m, b)
+}
+func (m *PackageManager_Package) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PackageManager_Package.Marshal(b, m, deterministic)
+}
+func (dst *PackageManager_Package) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager_Package.Merge(dst, src)
+}
+func (m *PackageManager_Package) XXX_Size() int {
+	return xxx_messageInfo_PackageManager_Package.Size(m)
+}
+func (m *PackageManager_Package) XXX_DiscardUnknown() {
+	xxx_messageInfo_PackageManager_Package.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PackageManager_Package proto.InternalMessageInfo
 
 func (m *PackageManager_Package) GetName() string {
 	if m != nil {
@@ -253,16 +285,38 @@ func (m *PackageManager_Package) GetDistribution() []*PackageManager_Distributio
 // a system.
 type PackageManager_Installation struct {
 	// Output only. The name of the installed package.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// All of the places within the filesystem versions of this package
 	// have been found.
-	Location []*PackageManager_Location `protobuf:"bytes,2,rep,name=location" json:"location,omitempty"`
+	Location             []*PackageManager_Location `protobuf:"bytes,2,rep,name=location,proto3" json:"location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *PackageManager_Installation) Reset()         { *m = PackageManager_Installation{} }
+func (m *PackageManager_Installation) String() string { return proto.CompactTextString(m) }
+func (*PackageManager_Installation) ProtoMessage()    {}
+func (*PackageManager_Installation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bill_of_materials_27661a0342dc8703, []int{0, 3}
+}
+func (m *PackageManager_Installation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PackageManager_Installation.Unmarshal(m, b)
+}
+func (m *PackageManager_Installation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PackageManager_Installation.Marshal(b, m, deterministic)
+}
+func (dst *PackageManager_Installation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageManager_Installation.Merge(dst, src)
+}
+func (m *PackageManager_Installation) XXX_Size() int {
+	return xxx_messageInfo_PackageManager_Installation.Size(m)
+}
+func (m *PackageManager_Installation) XXX_DiscardUnknown() {
+	xxx_messageInfo_PackageManager_Installation.DiscardUnknown(m)
 }
 
-func (m *PackageManager_Installation) Reset()                    { *m = PackageManager_Installation{} }
-func (m *PackageManager_Installation) String() string            { return proto.CompactTextString(m) }
-func (*PackageManager_Installation) ProtoMessage()               {}
-func (*PackageManager_Installation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 3} }
+var xxx_messageInfo_PackageManager_Installation proto.InternalMessageInfo
 
 func (m *PackageManager_Installation) GetName() string {
 	if m != nil {
@@ -288,10 +342,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/bill_of_materials.proto", fileDescriptor0)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/bill_of_materials.proto", fileDescriptor_bill_of_materials_27661a0342dc8703)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_bill_of_materials_27661a0342dc8703 = []byte{
 	// 522 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xd1, 0x8a, 0xd3, 0x4e,
 	0x14, 0xc6, 0xff, 0x49, 0x97, 0x76, 0xf7, 0xb4, 0xff, 0x52, 0xe6, 0xc6, 0x10, 0x16, 0x29, 0x0b,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
index 5c051b34..2d77e979 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/containeranalysis.pb.go
@@ -1,19 +1,19 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/containeranalysis.proto
 
-package containeranalysis
+package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
 import _ "github.com/golang/protobuf/ptypes/any"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf4 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -25,6 +25,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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 must be 1:1 with members of our oneofs, it can be used for filtering
 // Note and Occurrence on their kind.
 type Note_Kind int32
@@ -44,6 +50,8 @@ const (
 	Note_DEPLOYABLE Note_Kind = 6
 	// The note and occurrence track the initial discovery status of a resource.
 	Note_DISCOVERY Note_Kind = 7
+	// This represents a logical "role" that can attest to artifacts.
+	Note_ATTESTATION_AUTHORITY Note_Kind = 8
 )
 
 var Note_Kind_name = map[int32]string{
@@ -54,6 +62,7 @@ var Note_Kind_name = map[int32]string{
 	5: "PACKAGE_MANAGER",
 	6: "DEPLOYABLE",
 	7: "DISCOVERY",
+	8: "ATTESTATION_AUTHORITY",
 }
 var Note_Kind_value = map[string]int32{
 	"KIND_UNSPECIFIED":      0,
@@ -63,12 +72,15 @@ var Note_Kind_value = map[string]int32{
 	"PACKAGE_MANAGER":       5,
 	"DEPLOYABLE":            6,
 	"DISCOVERY":             7,
+	"ATTESTATION_AUTHORITY": 8,
 }
 
 func (x Note_Kind) String() string {
 	return proto.EnumName(Note_Kind_name, int32(x))
 }
-func (Note_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} }
+func (Note_Kind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{2, 0}
+}
 
 // Types of platforms.
 type Deployable_Deployment_Platform int32
@@ -101,7 +113,50 @@ func (x Deployable_Deployment_Platform) String() string {
 	return proto.EnumName(Deployable_Deployment_Platform_name, int32(x))
 }
 func (Deployable_Deployment_Platform) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{2, 0, 0}
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{3, 0, 0}
+}
+
+// Analysis status for a resource.
+type Discovery_Discovered_AnalysisStatus int32
+
+const (
+	// Unknown
+	Discovery_Discovered_ANALYSIS_STATUS_UNSPECIFIED Discovery_Discovered_AnalysisStatus = 0
+	// Resource is known but no action has been taken yet.
+	Discovery_Discovered_PENDING Discovery_Discovered_AnalysisStatus = 1
+	// Resource is being analyzed.
+	Discovery_Discovered_SCANNING Discovery_Discovered_AnalysisStatus = 2
+	// Analysis has finished successfully.
+	Discovery_Discovered_FINISHED_SUCCESS Discovery_Discovered_AnalysisStatus = 3
+	// Analysis has finished unsuccessfully, the analysis itself is in a bad
+	// state.
+	Discovery_Discovered_FINISHED_FAILED Discovery_Discovered_AnalysisStatus = 4
+	// Analysis will not happen, the resource is not supported.
+	Discovery_Discovered_UNSUPPORTED_RESOURCE Discovery_Discovered_AnalysisStatus = 5
+)
+
+var Discovery_Discovered_AnalysisStatus_name = map[int32]string{
+	0: "ANALYSIS_STATUS_UNSPECIFIED",
+	1: "PENDING",
+	2: "SCANNING",
+	3: "FINISHED_SUCCESS",
+	4: "FINISHED_FAILED",
+	5: "UNSUPPORTED_RESOURCE",
+}
+var Discovery_Discovered_AnalysisStatus_value = map[string]int32{
+	"ANALYSIS_STATUS_UNSPECIFIED": 0,
+	"PENDING":                     1,
+	"SCANNING":                    2,
+	"FINISHED_SUCCESS":            3,
+	"FINISHED_FAILED":             4,
+	"UNSUPPORTED_RESOURCE":        5,
+}
+
+func (x Discovery_Discovered_AnalysisStatus) String() string {
+	return proto.EnumName(Discovery_Discovered_AnalysisStatus_name, int32(x))
+}
+func (Discovery_Discovered_AnalysisStatus) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{4, 0, 0}
 }
 
 // Public key formats
@@ -130,24 +185,57 @@ var BuildSignature_KeyType_value = map[string]int32{
 func (x BuildSignature_KeyType) String() string {
 	return proto.EnumName(BuildSignature_KeyType_name, int32(x))
 }
-func (BuildSignature_KeyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{5, 0} }
+func (BuildSignature_KeyType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{6, 0}
+}
+
+// Type (for example schema) of the attestation payload that was signed.
+type PgpSignedAttestation_ContentType int32
+
+const (
+	// `ContentType` is not set.
+	PgpSignedAttestation_CONTENT_TYPE_UNSPECIFIED PgpSignedAttestation_ContentType = 0
+	// Atomic format attestation signature. See
+	// https://github.com/containers/image/blob/8a5d2f82a6e3263290c8e0276c3e0f64e77723e7/docs/atomic-signature.md
+	// The payload extracted from `signature` is a JSON blob conforming to the
+	// linked schema.
+	PgpSignedAttestation_SIMPLE_SIGNING_JSON PgpSignedAttestation_ContentType = 1
+)
+
+var PgpSignedAttestation_ContentType_name = map[int32]string{
+	0: "CONTENT_TYPE_UNSPECIFIED",
+	1: "SIMPLE_SIGNING_JSON",
+}
+var PgpSignedAttestation_ContentType_value = map[string]int32{
+	"CONTENT_TYPE_UNSPECIFIED": 0,
+	"SIMPLE_SIGNING_JSON":      1,
+}
+
+func (x PgpSignedAttestation_ContentType) String() string {
+	return proto.EnumName(PgpSignedAttestation_ContentType_name, int32(x))
+}
+func (PgpSignedAttestation_ContentType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{7, 0}
+}
 
 // `Occurrence` includes information about analysis occurrences for an image.
 type Occurrence struct {
 	// Output only. The name of the `Occurrence` in the form
 	// "projects/{project_id}/occurrences/{OCCURRENCE_ID}"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The unique URL of the image or the container for which the `Occurrence`
 	// applies. For example, https://gcr.io/project/image@sha256:foo This field
 	// can be used as a filter in list requests.
-	ResourceUrl string `protobuf:"bytes,2,opt,name=resource_url,json=resourceUrl" json:"resource_url,omitempty"`
+	ResourceUrl string `protobuf:"bytes,2,opt,name=resource_url,json=resourceUrl,proto3" json:"resource_url,omitempty"`
+	// The resource for which the `Occurrence` applies.
+	Resource *Resource `protobuf:"bytes,17,opt,name=resource,proto3" json:"resource,omitempty"`
 	// An analysis note associated with this image, in the form
 	// "providers/{provider_id}/notes/{NOTE_ID}"
 	// This field can be used as a filter in list requests.
-	NoteName string `protobuf:"bytes,3,opt,name=note_name,json=noteName" json:"note_name,omitempty"`
+	NoteName string `protobuf:"bytes,3,opt,name=note_name,json=noteName,proto3" json:"note_name,omitempty"`
 	// Output only. This explicitly denotes which of the `Occurrence` details are
 	// specified. This field can be used as a filter in list requests.
-	Kind Note_Kind `protobuf:"varint,6,opt,name=kind,enum=google.devtools.containeranalysis.v1alpha1.Note_Kind" json:"kind,omitempty"`
+	Kind Note_Kind `protobuf:"varint,6,opt,name=kind,proto3,enum=google.devtools.containeranalysis.v1alpha1.Note_Kind" json:"kind,omitempty"`
 	// Describes the details of the vulnerability `Note` found in this resource.
 	//
 	// Types that are valid to be assigned to Details:
@@ -157,56 +245,42 @@ type Occurrence struct {
 	//	*Occurrence_Installation
 	//	*Occurrence_Deployment
 	//	*Occurrence_Discovered
+	//	*Occurrence_Attestation
 	Details isOccurrence_Details `protobuf_oneof:"details"`
 	// A description of actions that can be taken to remedy the `Note`
-	Remediation string `protobuf:"bytes,5,opt,name=remediation" json:"remediation,omitempty"`
+	Remediation string `protobuf:"bytes,5,opt,name=remediation,proto3" json:"remediation,omitempty"`
 	// Output only. The time this `Occurrence` was created.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time this `Occurrence` was last updated.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
-}
-
-func (m *Occurrence) Reset()                    { *m = Occurrence{} }
-func (m *Occurrence) String() string            { return proto.CompactTextString(m) }
-func (*Occurrence) ProtoMessage()               {}
-func (*Occurrence) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-type isOccurrence_Details interface {
-	isOccurrence_Details()
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-type Occurrence_VulnerabilityDetails struct {
-	VulnerabilityDetails *VulnerabilityType_VulnerabilityDetails `protobuf:"bytes,8,opt,name=vulnerability_details,json=vulnerabilityDetails,oneof"`
+func (m *Occurrence) Reset()         { *m = Occurrence{} }
+func (m *Occurrence) String() string { return proto.CompactTextString(m) }
+func (*Occurrence) ProtoMessage()    {}
+func (*Occurrence) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{0}
 }
-type Occurrence_BuildDetails struct {
-	BuildDetails *BuildDetails `protobuf:"bytes,7,opt,name=build_details,json=buildDetails,oneof"`
+func (m *Occurrence) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Occurrence.Unmarshal(m, b)
 }
-type Occurrence_DerivedImage struct {
-	DerivedImage *DockerImage_Derived `protobuf:"bytes,11,opt,name=derived_image,json=derivedImage,oneof"`
+func (m *Occurrence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Occurrence.Marshal(b, m, deterministic)
 }
-type Occurrence_Installation struct {
-	Installation *PackageManager_Installation `protobuf:"bytes,12,opt,name=installation,oneof"`
+func (dst *Occurrence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Occurrence.Merge(dst, src)
 }
-type Occurrence_Deployment struct {
-	Deployment *Deployable_Deployment `protobuf:"bytes,14,opt,name=deployment,oneof"`
+func (m *Occurrence) XXX_Size() int {
+	return xxx_messageInfo_Occurrence.Size(m)
 }
-type Occurrence_Discovered struct {
-	Discovered *Discovery_Discovered `protobuf:"bytes,15,opt,name=discovered,oneof"`
+func (m *Occurrence) XXX_DiscardUnknown() {
+	xxx_messageInfo_Occurrence.DiscardUnknown(m)
 }
 
-func (*Occurrence_VulnerabilityDetails) isOccurrence_Details() {}
-func (*Occurrence_BuildDetails) isOccurrence_Details()         {}
-func (*Occurrence_DerivedImage) isOccurrence_Details()         {}
-func (*Occurrence_Installation) isOccurrence_Details()         {}
-func (*Occurrence_Deployment) isOccurrence_Details()           {}
-func (*Occurrence_Discovered) isOccurrence_Details()           {}
-
-func (m *Occurrence) GetDetails() isOccurrence_Details {
-	if m != nil {
-		return m.Details
-	}
-	return nil
-}
+var xxx_messageInfo_Occurrence proto.InternalMessageInfo
 
 func (m *Occurrence) GetName() string {
 	if m != nil {
@@ -222,6 +296,13 @@ func (m *Occurrence) GetResourceUrl() string {
 	return ""
 }
 
+func (m *Occurrence) GetResource() *Resource {
+	if m != nil {
+		return m.Resource
+	}
+	return nil
+}
+
 func (m *Occurrence) GetNoteName() string {
 	if m != nil {
 		return m.NoteName
@@ -236,6 +317,59 @@ func (m *Occurrence) GetKind() Note_Kind {
 	return Note_KIND_UNSPECIFIED
 }
 
+type isOccurrence_Details interface {
+	isOccurrence_Details()
+}
+
+type Occurrence_VulnerabilityDetails struct {
+	VulnerabilityDetails *VulnerabilityType_VulnerabilityDetails `protobuf:"bytes,8,opt,name=vulnerability_details,json=vulnerabilityDetails,proto3,oneof"`
+}
+
+type Occurrence_BuildDetails struct {
+	BuildDetails *BuildDetails `protobuf:"bytes,7,opt,name=build_details,json=buildDetails,proto3,oneof"`
+}
+
+type Occurrence_DerivedImage struct {
+	DerivedImage *DockerImage_Derived `protobuf:"bytes,11,opt,name=derived_image,json=derivedImage,proto3,oneof"`
+}
+
+type Occurrence_Installation struct {
+	Installation *PackageManager_Installation `protobuf:"bytes,12,opt,name=installation,proto3,oneof"`
+}
+
+type Occurrence_Deployment struct {
+	Deployment *Deployable_Deployment `protobuf:"bytes,14,opt,name=deployment,proto3,oneof"`
+}
+
+type Occurrence_Discovered struct {
+	Discovered *Discovery_Discovered `protobuf:"bytes,15,opt,name=discovered,proto3,oneof"`
+}
+
+type Occurrence_Attestation struct {
+	Attestation *AttestationAuthority_Attestation `protobuf:"bytes,16,opt,name=attestation,proto3,oneof"`
+}
+
+func (*Occurrence_VulnerabilityDetails) isOccurrence_Details() {}
+
+func (*Occurrence_BuildDetails) isOccurrence_Details() {}
+
+func (*Occurrence_DerivedImage) isOccurrence_Details() {}
+
+func (*Occurrence_Installation) isOccurrence_Details() {}
+
+func (*Occurrence_Deployment) isOccurrence_Details() {}
+
+func (*Occurrence_Discovered) isOccurrence_Details() {}
+
+func (*Occurrence_Attestation) isOccurrence_Details() {}
+
+func (m *Occurrence) GetDetails() isOccurrence_Details {
+	if m != nil {
+		return m.Details
+	}
+	return nil
+}
+
 func (m *Occurrence) GetVulnerabilityDetails() *VulnerabilityType_VulnerabilityDetails {
 	if x, ok := m.GetDetails().(*Occurrence_VulnerabilityDetails); ok {
 		return x.VulnerabilityDetails
@@ -278,6 +412,13 @@ func (m *Occurrence) GetDiscovered() *Discovery_Discovered {
 	return nil
 }
 
+func (m *Occurrence) GetAttestation() *AttestationAuthority_Attestation {
+	if x, ok := m.GetDetails().(*Occurrence_Attestation); ok {
+		return x.Attestation
+	}
+	return nil
+}
+
 func (m *Occurrence) GetRemediation() string {
 	if m != nil {
 		return m.Remediation
@@ -285,14 +426,14 @@ func (m *Occurrence) GetRemediation() string {
 	return ""
 }
 
-func (m *Occurrence) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *Occurrence) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Occurrence) GetUpdateTime() *google_protobuf1.Timestamp {
+func (m *Occurrence) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -308,6 +449,7 @@ func (*Occurrence) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 		(*Occurrence_Installation)(nil),
 		(*Occurrence_Deployment)(nil),
 		(*Occurrence_Discovered)(nil),
+		(*Occurrence_Attestation)(nil),
 	}
 }
 
@@ -345,6 +487,11 @@ func _Occurrence_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 		if err := b.EncodeMessage(x.Discovered); err != nil {
 			return err
 		}
+	case *Occurrence_Attestation:
+		b.EncodeVarint(16<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Attestation); err != nil {
+			return err
+		}
 	case nil:
 	default:
 		return fmt.Errorf("Occurrence.Details has unexpected type %T", x)
@@ -403,6 +550,14 @@ func _Occurrence_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buf
 		err := b.DecodeMessage(msg)
 		m.Details = &Occurrence_Discovered{msg}
 		return true, err
+	case 16: // details.attestation
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AttestationAuthority_Attestation)
+		err := b.DecodeMessage(msg)
+		m.Details = &Occurrence_Attestation{msg}
+		return true, err
 	default:
 		return false, nil
 	}
@@ -414,32 +569,37 @@ func _Occurrence_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Details.(type) {
 	case *Occurrence_VulnerabilityDetails:
 		s := proto.Size(x.VulnerabilityDetails)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Occurrence_BuildDetails:
 		s := proto.Size(x.BuildDetails)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Occurrence_DerivedImage:
 		s := proto.Size(x.DerivedImage)
-		n += proto.SizeVarint(11<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Occurrence_Installation:
 		s := proto.Size(x.Installation)
-		n += proto.SizeVarint(12<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Occurrence_Deployment:
 		s := proto.Size(x.Deployment)
-		n += proto.SizeVarint(14<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Occurrence_Discovered:
 		s := proto.Size(x.Discovered)
-		n += proto.SizeVarint(15<<3 | proto.WireBytes)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Occurrence_Attestation:
+		s := proto.Size(x.Attestation)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -449,18 +609,77 @@ func _Occurrence_OneofSizer(msg proto.Message) (n int) {
 	return n
 }
 
+// Resource is an entity that can have metadata. E.g., a Docker image.
+type Resource struct {
+	// The name of the resource. E.g., the name of a Docker image - "Debian".
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The unique URI of the resource. E.g.,
+	// "https://gcr.io/project/image@sha256:foo" for a Docker image.
+	Uri string `protobuf:"bytes,2,opt,name=uri,proto3" json:"uri,omitempty"`
+	// The hash of the resource content. E.g., the Docker digest.
+	ContentHash          *Hash    `protobuf:"bytes,3,opt,name=content_hash,json=contentHash,proto3" json:"content_hash,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Resource) Reset()         { *m = Resource{} }
+func (m *Resource) String() string { return proto.CompactTextString(m) }
+func (*Resource) ProtoMessage()    {}
+func (*Resource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{1}
+}
+func (m *Resource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Resource.Unmarshal(m, b)
+}
+func (m *Resource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Resource.Marshal(b, m, deterministic)
+}
+func (dst *Resource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resource.Merge(dst, src)
+}
+func (m *Resource) XXX_Size() int {
+	return xxx_messageInfo_Resource.Size(m)
+}
+func (m *Resource) XXX_DiscardUnknown() {
+	xxx_messageInfo_Resource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Resource proto.InternalMessageInfo
+
+func (m *Resource) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Resource) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+func (m *Resource) GetContentHash() *Hash {
+	if m != nil {
+		return m.ContentHash
+	}
+	return nil
+}
+
 // Provides a detailed description of a `Note`.
 type Note struct {
 	// The name of the note in the form
 	// "providers/{provider_id}/notes/{NOTE_ID}"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A one sentence description of this `Note`.
-	ShortDescription string `protobuf:"bytes,3,opt,name=short_description,json=shortDescription" json:"short_description,omitempty"`
+	ShortDescription string `protobuf:"bytes,3,opt,name=short_description,json=shortDescription,proto3" json:"short_description,omitempty"`
 	// A detailed description of this `Note`.
-	LongDescription string `protobuf:"bytes,4,opt,name=long_description,json=longDescription" json:"long_description,omitempty"`
+	LongDescription string `protobuf:"bytes,4,opt,name=long_description,json=longDescription,proto3" json:"long_description,omitempty"`
 	// Output only. This explicitly denotes which kind of note is specified. This
 	// field can be used as a filter in list requests.
-	Kind Note_Kind `protobuf:"varint,9,opt,name=kind,enum=google.devtools.containeranalysis.v1alpha1.Note_Kind" json:"kind,omitempty"`
+	Kind Note_Kind `protobuf:"varint,9,opt,name=kind,proto3,enum=google.devtools.containeranalysis.v1alpha1.Note_Kind" json:"kind,omitempty"`
 	// The type of note.
 	//
 	// Types that are valid to be assigned to NoteType:
@@ -470,60 +689,46 @@ type Note struct {
 	//	*Note_Package
 	//	*Note_Deployable
 	//	*Note_Discovery
+	//	*Note_AttestationAuthority
 	NoteType isNote_NoteType `protobuf_oneof:"note_type"`
 	// URLs associated with this note
-	RelatedUrl []*Note_RelatedUrl `protobuf:"bytes,7,rep,name=related_url,json=relatedUrl" json:"related_url,omitempty"`
+	RelatedUrl []*Note_RelatedUrl `protobuf:"bytes,7,rep,name=related_url,json=relatedUrl,proto3" json:"related_url,omitempty"`
 	// Time of expiration for this note, null if note does not expire.
-	ExpirationTime *google_protobuf1.Timestamp `protobuf:"bytes,10,opt,name=expiration_time,json=expirationTime" json:"expiration_time,omitempty"`
+	ExpirationTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
 	// Output only. The time this note was created. This field can be used as a
 	// filter in list requests.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time this note was last updated. This field can be used as
 	// a filter in list requests.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
-}
-
-func (m *Note) Reset()                    { *m = Note{} }
-func (m *Note) String() string            { return proto.CompactTextString(m) }
-func (*Note) ProtoMessage()               {}
-func (*Note) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
-
-type isNote_NoteType interface {
-	isNote_NoteType()
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-type Note_VulnerabilityType struct {
-	VulnerabilityType *VulnerabilityType `protobuf:"bytes,6,opt,name=vulnerability_type,json=vulnerabilityType,oneof"`
+func (m *Note) Reset()         { *m = Note{} }
+func (m *Note) String() string { return proto.CompactTextString(m) }
+func (*Note) ProtoMessage()    {}
+func (*Note) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{2}
 }
-type Note_BuildType struct {
-	BuildType *BuildType `protobuf:"bytes,8,opt,name=build_type,json=buildType,oneof"`
+func (m *Note) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Note.Unmarshal(m, b)
 }
-type Note_BaseImage struct {
-	BaseImage *DockerImage_Basis `protobuf:"bytes,13,opt,name=base_image,json=baseImage,oneof"`
+func (m *Note) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Note.Marshal(b, m, deterministic)
 }
-type Note_Package struct {
-	Package *PackageManager_Package `protobuf:"bytes,14,opt,name=package,oneof"`
+func (dst *Note) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Note.Merge(dst, src)
 }
-type Note_Deployable struct {
-	Deployable *Deployable `protobuf:"bytes,17,opt,name=deployable,oneof"`
+func (m *Note) XXX_Size() int {
+	return xxx_messageInfo_Note.Size(m)
 }
-type Note_Discovery struct {
-	Discovery *Discovery `protobuf:"bytes,18,opt,name=discovery,oneof"`
+func (m *Note) XXX_DiscardUnknown() {
+	xxx_messageInfo_Note.DiscardUnknown(m)
 }
 
-func (*Note_VulnerabilityType) isNote_NoteType() {}
-func (*Note_BuildType) isNote_NoteType()         {}
-func (*Note_BaseImage) isNote_NoteType()         {}
-func (*Note_Package) isNote_NoteType()           {}
-func (*Note_Deployable) isNote_NoteType()        {}
-func (*Note_Discovery) isNote_NoteType()         {}
-
-func (m *Note) GetNoteType() isNote_NoteType {
-	if m != nil {
-		return m.NoteType
-	}
-	return nil
-}
+var xxx_messageInfo_Note proto.InternalMessageInfo
 
 func (m *Note) GetName() string {
 	if m != nil {
@@ -553,6 +758,59 @@ func (m *Note) GetKind() Note_Kind {
 	return Note_KIND_UNSPECIFIED
 }
 
+type isNote_NoteType interface {
+	isNote_NoteType()
+}
+
+type Note_VulnerabilityType struct {
+	VulnerabilityType *VulnerabilityType `protobuf:"bytes,6,opt,name=vulnerability_type,json=vulnerabilityType,proto3,oneof"`
+}
+
+type Note_BuildType struct {
+	BuildType *BuildType `protobuf:"bytes,8,opt,name=build_type,json=buildType,proto3,oneof"`
+}
+
+type Note_BaseImage struct {
+	BaseImage *DockerImage_Basis `protobuf:"bytes,13,opt,name=base_image,json=baseImage,proto3,oneof"`
+}
+
+type Note_Package struct {
+	Package *PackageManager_Package `protobuf:"bytes,14,opt,name=package,proto3,oneof"`
+}
+
+type Note_Deployable struct {
+	Deployable *Deployable `protobuf:"bytes,17,opt,name=deployable,proto3,oneof"`
+}
+
+type Note_Discovery struct {
+	Discovery *Discovery `protobuf:"bytes,18,opt,name=discovery,proto3,oneof"`
+}
+
+type Note_AttestationAuthority struct {
+	AttestationAuthority *AttestationAuthority `protobuf:"bytes,19,opt,name=attestation_authority,json=attestationAuthority,proto3,oneof"`
+}
+
+func (*Note_VulnerabilityType) isNote_NoteType() {}
+
+func (*Note_BuildType) isNote_NoteType() {}
+
+func (*Note_BaseImage) isNote_NoteType() {}
+
+func (*Note_Package) isNote_NoteType() {}
+
+func (*Note_Deployable) isNote_NoteType() {}
+
+func (*Note_Discovery) isNote_NoteType() {}
+
+func (*Note_AttestationAuthority) isNote_NoteType() {}
+
+func (m *Note) GetNoteType() isNote_NoteType {
+	if m != nil {
+		return m.NoteType
+	}
+	return nil
+}
+
 func (m *Note) GetVulnerabilityType() *VulnerabilityType {
 	if x, ok := m.GetNoteType().(*Note_VulnerabilityType); ok {
 		return x.VulnerabilityType
@@ -595,6 +853,13 @@ func (m *Note) GetDiscovery() *Discovery {
 	return nil
 }
 
+func (m *Note) GetAttestationAuthority() *AttestationAuthority {
+	if x, ok := m.GetNoteType().(*Note_AttestationAuthority); ok {
+		return x.AttestationAuthority
+	}
+	return nil
+}
+
 func (m *Note) GetRelatedUrl() []*Note_RelatedUrl {
 	if m != nil {
 		return m.RelatedUrl
@@ -602,21 +867,21 @@ func (m *Note) GetRelatedUrl() []*Note_RelatedUrl {
 	return nil
 }
 
-func (m *Note) GetExpirationTime() *google_protobuf1.Timestamp {
+func (m *Note) GetExpirationTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ExpirationTime
 	}
 	return nil
 }
 
-func (m *Note) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *Note) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Note) GetUpdateTime() *google_protobuf1.Timestamp {
+func (m *Note) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -632,6 +897,7 @@ func (*Note) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, f
 		(*Note_Package)(nil),
 		(*Note_Deployable)(nil),
 		(*Note_Discovery)(nil),
+		(*Note_AttestationAuthority)(nil),
 	}
 }
 
@@ -669,6 +935,11 @@ func _Note_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 		if err := b.EncodeMessage(x.Discovery); err != nil {
 			return err
 		}
+	case *Note_AttestationAuthority:
+		b.EncodeVarint(19<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.AttestationAuthority); err != nil {
+			return err
+		}
 	case nil:
 	default:
 		return fmt.Errorf("Note.NoteType has unexpected type %T", x)
@@ -727,6 +998,14 @@ func _Note_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (
 		err := b.DecodeMessage(msg)
 		m.NoteType = &Note_Discovery{msg}
 		return true, err
+	case 19: // note_type.attestation_authority
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AttestationAuthority)
+		err := b.DecodeMessage(msg)
+		m.NoteType = &Note_AttestationAuthority{msg}
+		return true, err
 	default:
 		return false, nil
 	}
@@ -738,32 +1017,37 @@ func _Note_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.NoteType.(type) {
 	case *Note_VulnerabilityType:
 		s := proto.Size(x.VulnerabilityType)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Note_BuildType:
 		s := proto.Size(x.BuildType)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Note_BaseImage:
 		s := proto.Size(x.BaseImage)
-		n += proto.SizeVarint(13<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Note_Package:
 		s := proto.Size(x.Package)
-		n += proto.SizeVarint(14<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Note_Deployable:
 		s := proto.Size(x.Deployable)
-		n += proto.SizeVarint(17<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Note_Discovery:
 		s := proto.Size(x.Discovery)
-		n += proto.SizeVarint(18<<3 | proto.WireBytes)
+		n += 2 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Note_AttestationAuthority:
+		s := proto.Size(x.AttestationAuthority)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -776,15 +1060,37 @@ func _Note_OneofSizer(msg proto.Message) (n int) {
 // Metadata for any related URL information
 type Note_RelatedUrl struct {
 	// Specific URL to associate with the note
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// Label to describe usage of the URL
-	Label string `protobuf:"bytes,2,opt,name=label" json:"label,omitempty"`
+	Label                string   `protobuf:"bytes,2,opt,name=label,proto3" json:"label,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Note_RelatedUrl) Reset()                    { *m = Note_RelatedUrl{} }
-func (m *Note_RelatedUrl) String() string            { return proto.CompactTextString(m) }
-func (*Note_RelatedUrl) ProtoMessage()               {}
-func (*Note_RelatedUrl) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} }
+func (m *Note_RelatedUrl) Reset()         { *m = Note_RelatedUrl{} }
+func (m *Note_RelatedUrl) String() string { return proto.CompactTextString(m) }
+func (*Note_RelatedUrl) ProtoMessage()    {}
+func (*Note_RelatedUrl) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{2, 0}
+}
+func (m *Note_RelatedUrl) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Note_RelatedUrl.Unmarshal(m, b)
+}
+func (m *Note_RelatedUrl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Note_RelatedUrl.Marshal(b, m, deterministic)
+}
+func (dst *Note_RelatedUrl) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Note_RelatedUrl.Merge(dst, src)
+}
+func (m *Note_RelatedUrl) XXX_Size() int {
+	return xxx_messageInfo_Note_RelatedUrl.Size(m)
+}
+func (m *Note_RelatedUrl) XXX_DiscardUnknown() {
+	xxx_messageInfo_Note_RelatedUrl.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Note_RelatedUrl proto.InternalMessageInfo
 
 func (m *Note_RelatedUrl) GetUrl() string {
 	if m != nil {
@@ -803,13 +1109,35 @@ func (m *Note_RelatedUrl) GetLabel() string {
 // An artifact that can be deployed in some runtime.
 type Deployable struct {
 	// Resource URI for the artifact being deployed.
-	ResourceUri []string `protobuf:"bytes,1,rep,name=resource_uri,json=resourceUri" json:"resource_uri,omitempty"`
+	ResourceUri          []string `protobuf:"bytes,1,rep,name=resource_uri,json=resourceUri,proto3" json:"resource_uri,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Deployable) Reset()         { *m = Deployable{} }
+func (m *Deployable) String() string { return proto.CompactTextString(m) }
+func (*Deployable) ProtoMessage()    {}
+func (*Deployable) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{3}
+}
+func (m *Deployable) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Deployable.Unmarshal(m, b)
+}
+func (m *Deployable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Deployable.Marshal(b, m, deterministic)
+}
+func (dst *Deployable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployable.Merge(dst, src)
+}
+func (m *Deployable) XXX_Size() int {
+	return xxx_messageInfo_Deployable.Size(m)
+}
+func (m *Deployable) XXX_DiscardUnknown() {
+	xxx_messageInfo_Deployable.DiscardUnknown(m)
 }
 
-func (m *Deployable) Reset()                    { *m = Deployable{} }
-func (m *Deployable) String() string            { return proto.CompactTextString(m) }
-func (*Deployable) ProtoMessage()               {}
-func (*Deployable) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_Deployable proto.InternalMessageInfo
 
 func (m *Deployable) GetResourceUri() []string {
 	if m != nil {
@@ -821,26 +1149,48 @@ func (m *Deployable) GetResourceUri() []string {
 // The period during which some deployable was active in a runtime.
 type Deployable_Deployment struct {
 	// Identity of the user that triggered this deployment.
-	UserEmail string `protobuf:"bytes,1,opt,name=user_email,json=userEmail" json:"user_email,omitempty"`
+	UserEmail string `protobuf:"bytes,1,opt,name=user_email,json=userEmail,proto3" json:"user_email,omitempty"`
 	// Beginning of the lifetime of this deployment.
-	DeployTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=deploy_time,json=deployTime" json:"deploy_time,omitempty"`
+	DeployTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=deploy_time,json=deployTime,proto3" json:"deploy_time,omitempty"`
 	// End of the lifetime of this deployment.
-	UndeployTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=undeploy_time,json=undeployTime" json:"undeploy_time,omitempty"`
+	UndeployTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=undeploy_time,json=undeployTime,proto3" json:"undeploy_time,omitempty"`
 	// Configuration used to create this deployment.
-	Config string `protobuf:"bytes,8,opt,name=config" json:"config,omitempty"`
+	Config string `protobuf:"bytes,8,opt,name=config,proto3" json:"config,omitempty"`
 	// Address of the runtime element hosting this deployment.
-	Address string `protobuf:"bytes,5,opt,name=address" json:"address,omitempty"`
+	Address string `protobuf:"bytes,5,opt,name=address,proto3" json:"address,omitempty"`
 	// Output only. Resource URI for the artifact being deployed taken from the
 	// deployable field with the same name.
-	ResourceUri []string `protobuf:"bytes,6,rep,name=resource_uri,json=resourceUri" json:"resource_uri,omitempty"`
+	ResourceUri []string `protobuf:"bytes,6,rep,name=resource_uri,json=resourceUri,proto3" json:"resource_uri,omitempty"`
 	// Platform hosting this deployment.
-	Platform Deployable_Deployment_Platform `protobuf:"varint,7,opt,name=platform,enum=google.devtools.containeranalysis.v1alpha1.Deployable_Deployment_Platform" json:"platform,omitempty"`
+	Platform             Deployable_Deployment_Platform `protobuf:"varint,7,opt,name=platform,proto3,enum=google.devtools.containeranalysis.v1alpha1.Deployable_Deployment_Platform" json:"platform,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *Deployable_Deployment) Reset()         { *m = Deployable_Deployment{} }
+func (m *Deployable_Deployment) String() string { return proto.CompactTextString(m) }
+func (*Deployable_Deployment) ProtoMessage()    {}
+func (*Deployable_Deployment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{3, 0}
+}
+func (m *Deployable_Deployment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Deployable_Deployment.Unmarshal(m, b)
+}
+func (m *Deployable_Deployment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Deployable_Deployment.Marshal(b, m, deterministic)
+}
+func (dst *Deployable_Deployment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Deployable_Deployment.Merge(dst, src)
+}
+func (m *Deployable_Deployment) XXX_Size() int {
+	return xxx_messageInfo_Deployable_Deployment.Size(m)
+}
+func (m *Deployable_Deployment) XXX_DiscardUnknown() {
+	xxx_messageInfo_Deployable_Deployment.DiscardUnknown(m)
 }
 
-func (m *Deployable_Deployment) Reset()                    { *m = Deployable_Deployment{} }
-func (m *Deployable_Deployment) String() string            { return proto.CompactTextString(m) }
-func (*Deployable_Deployment) ProtoMessage()               {}
-func (*Deployable_Deployment) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2, 0} }
+var xxx_messageInfo_Deployable_Deployment proto.InternalMessageInfo
 
 func (m *Deployable_Deployment) GetUserEmail() string {
 	if m != nil {
@@ -849,14 +1199,14 @@ func (m *Deployable_Deployment) GetUserEmail() string {
 	return ""
 }
 
-func (m *Deployable_Deployment) GetDeployTime() *google_protobuf1.Timestamp {
+func (m *Deployable_Deployment) GetDeployTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.DeployTime
 	}
 	return nil
 }
 
-func (m *Deployable_Deployment) GetUndeployTime() *google_protobuf1.Timestamp {
+func (m *Deployable_Deployment) GetUndeployTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UndeployTime
 	}
@@ -898,13 +1248,35 @@ func (m *Deployable_Deployment) GetPlatform() Deployable_Deployment_Platform {
 // note for a resource indicates that analysis hasn't started.
 type Discovery struct {
 	// The kind of analysis that is handled by this discovery.
-	AnalysisKind Note_Kind `protobuf:"varint,1,opt,name=analysis_kind,json=analysisKind,enum=google.devtools.containeranalysis.v1alpha1.Note_Kind" json:"analysis_kind,omitempty"`
+	AnalysisKind         Note_Kind `protobuf:"varint,1,opt,name=analysis_kind,json=analysisKind,proto3,enum=google.devtools.containeranalysis.v1alpha1.Note_Kind" json:"analysis_kind,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *Discovery) Reset()         { *m = Discovery{} }
+func (m *Discovery) String() string { return proto.CompactTextString(m) }
+func (*Discovery) ProtoMessage()    {}
+func (*Discovery) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{4}
+}
+func (m *Discovery) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Discovery.Unmarshal(m, b)
+}
+func (m *Discovery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Discovery.Marshal(b, m, deterministic)
+}
+func (dst *Discovery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Discovery.Merge(dst, src)
+}
+func (m *Discovery) XXX_Size() int {
+	return xxx_messageInfo_Discovery.Size(m)
+}
+func (m *Discovery) XXX_DiscardUnknown() {
+	xxx_messageInfo_Discovery.DiscardUnknown(m)
 }
 
-func (m *Discovery) Reset()                    { *m = Discovery{} }
-func (m *Discovery) String() string            { return proto.CompactTextString(m) }
-func (*Discovery) ProtoMessage()               {}
-func (*Discovery) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_Discovery proto.InternalMessageInfo
 
 func (m *Discovery) GetAnalysisKind() Note_Kind {
 	if m != nil {
@@ -916,35 +1288,99 @@ func (m *Discovery) GetAnalysisKind() Note_Kind {
 // Provides information about the scan status of a discovered resource.
 type Discovery_Discovered struct {
 	// Output only. An operation that indicates the status of the current scan.
-	Operation *google_longrunning.Operation `protobuf:"bytes,1,opt,name=operation" json:"operation,omitempty"`
+	Operation *longrunning.Operation `protobuf:"bytes,1,opt,name=operation,proto3" json:"operation,omitempty"`
+	// The status of discovery for the resource.
+	AnalysisStatus Discovery_Discovered_AnalysisStatus `protobuf:"varint,5,opt,name=analysis_status,json=analysisStatus,proto3,enum=google.devtools.containeranalysis.v1alpha1.Discovery_Discovered_AnalysisStatus" json:"analysis_status,omitempty"`
+	// When an error is encountered this will contain a LocalizedMessage under
+	// details to show to the user. The LocalizedMessage output only and
+	// populated by the API.
+	AnalysisStatusError  *status.Status `protobuf:"bytes,6,opt,name=analysis_status_error,json=analysisStatusError,proto3" json:"analysis_status_error,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *Discovery_Discovered) Reset()         { *m = Discovery_Discovered{} }
+func (m *Discovery_Discovered) String() string { return proto.CompactTextString(m) }
+func (*Discovery_Discovered) ProtoMessage()    {}
+func (*Discovery_Discovered) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{4, 0}
+}
+func (m *Discovery_Discovered) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Discovery_Discovered.Unmarshal(m, b)
+}
+func (m *Discovery_Discovered) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Discovery_Discovered.Marshal(b, m, deterministic)
+}
+func (dst *Discovery_Discovered) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Discovery_Discovered.Merge(dst, src)
+}
+func (m *Discovery_Discovered) XXX_Size() int {
+	return xxx_messageInfo_Discovery_Discovered.Size(m)
+}
+func (m *Discovery_Discovered) XXX_DiscardUnknown() {
+	xxx_messageInfo_Discovery_Discovered.DiscardUnknown(m)
 }
 
-func (m *Discovery_Discovered) Reset()                    { *m = Discovery_Discovered{} }
-func (m *Discovery_Discovered) String() string            { return proto.CompactTextString(m) }
-func (*Discovery_Discovered) ProtoMessage()               {}
-func (*Discovery_Discovered) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3, 0} }
+var xxx_messageInfo_Discovery_Discovered proto.InternalMessageInfo
 
-func (m *Discovery_Discovered) GetOperation() *google_longrunning.Operation {
+func (m *Discovery_Discovered) GetOperation() *longrunning.Operation {
 	if m != nil {
 		return m.Operation
 	}
 	return nil
 }
 
+func (m *Discovery_Discovered) GetAnalysisStatus() Discovery_Discovered_AnalysisStatus {
+	if m != nil {
+		return m.AnalysisStatus
+	}
+	return Discovery_Discovered_ANALYSIS_STATUS_UNSPECIFIED
+}
+
+func (m *Discovery_Discovered) GetAnalysisStatusError() *status.Status {
+	if m != nil {
+		return m.AnalysisStatusError
+	}
+	return nil
+}
+
 // Note holding the version of the provider's builder and the signature of
 // the provenance message in linked BuildDetails.
 type BuildType struct {
 	// Version of the builder which produced this Note.
-	BuilderVersion string `protobuf:"bytes,1,opt,name=builder_version,json=builderVersion" json:"builder_version,omitempty"`
+	BuilderVersion string `protobuf:"bytes,1,opt,name=builder_version,json=builderVersion,proto3" json:"builder_version,omitempty"`
 	// Signature of the build in Occurrences pointing to the Note containing this
 	// `BuilderDetails`.
-	Signature *BuildSignature `protobuf:"bytes,2,opt,name=signature" json:"signature,omitempty"`
+	Signature            *BuildSignature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *BuildType) Reset()         { *m = BuildType{} }
+func (m *BuildType) String() string { return proto.CompactTextString(m) }
+func (*BuildType) ProtoMessage()    {}
+func (*BuildType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{5}
+}
+func (m *BuildType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildType.Unmarshal(m, b)
+}
+func (m *BuildType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildType.Marshal(b, m, deterministic)
+}
+func (dst *BuildType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildType.Merge(dst, src)
+}
+func (m *BuildType) XXX_Size() int {
+	return xxx_messageInfo_BuildType.Size(m)
+}
+func (m *BuildType) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildType.DiscardUnknown(m)
 }
 
-func (m *BuildType) Reset()                    { *m = BuildType{} }
-func (m *BuildType) String() string            { return proto.CompactTextString(m) }
-func (*BuildType) ProtoMessage()               {}
-func (*BuildType) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_BuildType proto.InternalMessageInfo
 
 func (m *BuildType) GetBuilderVersion() string {
 	if m != nil {
@@ -968,35 +1404,57 @@ type BuildSignature struct {
 	//
 	// This field may be empty if `key_id` references an external key.
 	//
-	// For Cloud Container Builder based signatures, this is a PEM encoded public
-	// key. To verify the Cloud Container Builder signature, place the contents of
+	// For Cloud Build based signatures, this is a PEM encoded public
+	// key. To verify the Cloud Build signature, place the contents of
 	// this field into a file (public.pem). The signature field is base64-decoded
 	// into its binary representation in signature.bin, and the provenance bytes
 	// from `BuildDetails` are base64-decoded into a binary representation in
 	// signed.bin. OpenSSL can then verify the signature:
 	// `openssl sha256 -verify public.pem -signature signature.bin signed.bin`
-	PublicKey string `protobuf:"bytes,1,opt,name=public_key,json=publicKey" json:"public_key,omitempty"`
+	PublicKey string `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"`
 	// Signature of the related `BuildProvenance`, encoded in a base64 string.
-	Signature string `protobuf:"bytes,2,opt,name=signature" json:"signature,omitempty"`
+	Signature string `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
 	// An Id for the key used to sign. This could be either an Id for the key
 	// stored in `public_key` (such as the Id or fingerprint for a PGP key, or the
 	// CN for a cert), or a reference to an external key (such as a reference to a
 	// key in Cloud Key Management Service).
-	KeyId string `protobuf:"bytes,3,opt,name=key_id,json=keyId" json:"key_id,omitempty"`
+	KeyId string `protobuf:"bytes,3,opt,name=key_id,json=keyId,proto3" json:"key_id,omitempty"`
 	// The type of the key, either stored in `public_key` or referenced in
 	// `key_id`
-	KeyType BuildSignature_KeyType `protobuf:"varint,4,opt,name=key_type,json=keyType,enum=google.devtools.containeranalysis.v1alpha1.BuildSignature_KeyType" json:"key_type,omitempty"`
+	KeyType              BuildSignature_KeyType `protobuf:"varint,4,opt,name=key_type,json=keyType,proto3,enum=google.devtools.containeranalysis.v1alpha1.BuildSignature_KeyType" json:"key_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
-func (m *BuildSignature) Reset()                    { *m = BuildSignature{} }
-func (m *BuildSignature) String() string            { return proto.CompactTextString(m) }
-func (*BuildSignature) ProtoMessage()               {}
-func (*BuildSignature) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
-
-func (m *BuildSignature) GetPublicKey() string {
-	if m != nil {
-		return m.PublicKey
-	}
+func (m *BuildSignature) Reset()         { *m = BuildSignature{} }
+func (m *BuildSignature) String() string { return proto.CompactTextString(m) }
+func (*BuildSignature) ProtoMessage()    {}
+func (*BuildSignature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{6}
+}
+func (m *BuildSignature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildSignature.Unmarshal(m, b)
+}
+func (m *BuildSignature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildSignature.Marshal(b, m, deterministic)
+}
+func (dst *BuildSignature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildSignature.Merge(dst, src)
+}
+func (m *BuildSignature) XXX_Size() int {
+	return xxx_messageInfo_BuildSignature.Size(m)
+}
+func (m *BuildSignature) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildSignature.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildSignature proto.InternalMessageInfo
+
+func (m *BuildSignature) GetPublicKey() string {
+	if m != nil {
+		return m.PublicKey
+	}
 	return ""
 }
 
@@ -1021,10 +1479,380 @@ func (m *BuildSignature) GetKeyType() BuildSignature_KeyType {
 	return BuildSignature_KEY_TYPE_UNSPECIFIED
 }
 
+// An attestation wrapper with a PGP-compatible signature.
+// This message only supports `ATTACHED` signatures, where the payload that is
+// signed is included alongside the signature itself in the same file.
+type PgpSignedAttestation struct {
+	// The raw content of the signature, as output by GNU Privacy Guard (GPG) or
+	// equivalent.  Since this message only supports attached signatures, the
+	// payload that was signed must be attached. While the signature format
+	// supported is dependent on the verification implementation, currently only
+	// ASCII-armored (`--armor` to gpg), non-clearsigned (`--sign` rather than
+	// `--clearsign` to gpg) are supported. Concretely, `gpg --sign --armor
+	// --output=signature.gpg payload.json` will create the signature content
+	// expected in this field in `signature.gpg` for the `payload.json`
+	// attestation payload.
+	Signature string `protobuf:"bytes,1,opt,name=signature,proto3" json:"signature,omitempty"`
+	// Type (for example schema) of the attestation payload that was signed.
+	// The verifier must ensure that the provided type is one that the verifier
+	// supports, and that the attestation payload is a valid instantiation of that
+	// type (for example by validating a JSON schema).
+	ContentType PgpSignedAttestation_ContentType `protobuf:"varint,3,opt,name=content_type,json=contentType,proto3,enum=google.devtools.containeranalysis.v1alpha1.PgpSignedAttestation_ContentType" json:"content_type,omitempty"`
+	// This field is used by verifiers to select the public key used to validate
+	// the signature.  Note that the policy of the verifier ultimately determines
+	// which public keys verify a signature based on the context of the
+	// verification.  There is no guarantee validation will succeed if the
+	// verifier has no key matching this ID, even if it has a key under a
+	// different ID that would verify the signature. Note that this ID should also
+	// be present in the signature content above, but that is not expected to be
+	// used by the verifier.
+	//
+	// Types that are valid to be assigned to KeyId:
+	//	*PgpSignedAttestation_PgpKeyId
+	KeyId                isPgpSignedAttestation_KeyId `protobuf_oneof:"key_id"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *PgpSignedAttestation) Reset()         { *m = PgpSignedAttestation{} }
+func (m *PgpSignedAttestation) String() string { return proto.CompactTextString(m) }
+func (*PgpSignedAttestation) ProtoMessage()    {}
+func (*PgpSignedAttestation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{7}
+}
+func (m *PgpSignedAttestation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PgpSignedAttestation.Unmarshal(m, b)
+}
+func (m *PgpSignedAttestation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PgpSignedAttestation.Marshal(b, m, deterministic)
+}
+func (dst *PgpSignedAttestation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PgpSignedAttestation.Merge(dst, src)
+}
+func (m *PgpSignedAttestation) XXX_Size() int {
+	return xxx_messageInfo_PgpSignedAttestation.Size(m)
+}
+func (m *PgpSignedAttestation) XXX_DiscardUnknown() {
+	xxx_messageInfo_PgpSignedAttestation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PgpSignedAttestation proto.InternalMessageInfo
+
+func (m *PgpSignedAttestation) GetSignature() string {
+	if m != nil {
+		return m.Signature
+	}
+	return ""
+}
+
+func (m *PgpSignedAttestation) GetContentType() PgpSignedAttestation_ContentType {
+	if m != nil {
+		return m.ContentType
+	}
+	return PgpSignedAttestation_CONTENT_TYPE_UNSPECIFIED
+}
+
+type isPgpSignedAttestation_KeyId interface {
+	isPgpSignedAttestation_KeyId()
+}
+
+type PgpSignedAttestation_PgpKeyId struct {
+	PgpKeyId string `protobuf:"bytes,2,opt,name=pgp_key_id,json=pgpKeyId,proto3,oneof"`
+}
+
+func (*PgpSignedAttestation_PgpKeyId) isPgpSignedAttestation_KeyId() {}
+
+func (m *PgpSignedAttestation) GetKeyId() isPgpSignedAttestation_KeyId {
+	if m != nil {
+		return m.KeyId
+	}
+	return nil
+}
+
+func (m *PgpSignedAttestation) GetPgpKeyId() string {
+	if x, ok := m.GetKeyId().(*PgpSignedAttestation_PgpKeyId); ok {
+		return x.PgpKeyId
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*PgpSignedAttestation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _PgpSignedAttestation_OneofMarshaler, _PgpSignedAttestation_OneofUnmarshaler, _PgpSignedAttestation_OneofSizer, []interface{}{
+		(*PgpSignedAttestation_PgpKeyId)(nil),
+	}
+}
+
+func _PgpSignedAttestation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*PgpSignedAttestation)
+	// key_id
+	switch x := m.KeyId.(type) {
+	case *PgpSignedAttestation_PgpKeyId:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.PgpKeyId)
+	case nil:
+	default:
+		return fmt.Errorf("PgpSignedAttestation.KeyId has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _PgpSignedAttestation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*PgpSignedAttestation)
+	switch tag {
+	case 2: // key_id.pgp_key_id
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.KeyId = &PgpSignedAttestation_PgpKeyId{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _PgpSignedAttestation_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*PgpSignedAttestation)
+	// key_id
+	switch x := m.KeyId.(type) {
+	case *PgpSignedAttestation_PgpKeyId:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.PgpKeyId)))
+		n += len(x.PgpKeyId)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Note kind that represents a logical attestation "role" or "authority".  For
+// example, an organization might have one `AttestationAuthority` for "QA" and
+// one for "build".  This Note is intended to act strictly as a grouping
+// mechanism for the attached Occurrences (Attestations).  This grouping
+// mechanism also provides a security boundary, since IAM ACLs gate the ability
+// for a principle to attach an Occurrence to a given Note.  It also provides a
+// single point of lookup to find all attached Attestation Occurrences, even if
+// they don't all live in the same project.
+type AttestationAuthority struct {
+	Hint                 *AttestationAuthority_AttestationAuthorityHint `protobuf:"bytes,1,opt,name=hint,proto3" json:"hint,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                       `json:"-"`
+	XXX_unrecognized     []byte                                         `json:"-"`
+	XXX_sizecache        int32                                          `json:"-"`
+}
+
+func (m *AttestationAuthority) Reset()         { *m = AttestationAuthority{} }
+func (m *AttestationAuthority) String() string { return proto.CompactTextString(m) }
+func (*AttestationAuthority) ProtoMessage()    {}
+func (*AttestationAuthority) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{8}
+}
+func (m *AttestationAuthority) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AttestationAuthority.Unmarshal(m, b)
+}
+func (m *AttestationAuthority) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AttestationAuthority.Marshal(b, m, deterministic)
+}
+func (dst *AttestationAuthority) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttestationAuthority.Merge(dst, src)
+}
+func (m *AttestationAuthority) XXX_Size() int {
+	return xxx_messageInfo_AttestationAuthority.Size(m)
+}
+func (m *AttestationAuthority) XXX_DiscardUnknown() {
+	xxx_messageInfo_AttestationAuthority.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AttestationAuthority proto.InternalMessageInfo
+
+func (m *AttestationAuthority) GetHint() *AttestationAuthority_AttestationAuthorityHint {
+	if m != nil {
+		return m.Hint
+	}
+	return nil
+}
+
+// This submessage provides human-readable hints about the purpose of the
+// AttestationAuthority.  Because the name of a Note acts as its resource
+// reference, it is important to disambiguate the canonical name of the Note
+// (which might be a UUID for security purposes) from "readable" names more
+// suitable for debug output.  Note that these hints should NOT be used to
+// look up AttestationAuthorities in security sensitive contexts, such as when
+// looking up Attestations to verify.
+type AttestationAuthority_AttestationAuthorityHint struct {
+	// The human readable name of this Attestation Authority, for example "qa".
+	HumanReadableName    string   `protobuf:"bytes,1,opt,name=human_readable_name,json=humanReadableName,proto3" json:"human_readable_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AttestationAuthority_AttestationAuthorityHint) Reset() {
+	*m = AttestationAuthority_AttestationAuthorityHint{}
+}
+func (m *AttestationAuthority_AttestationAuthorityHint) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AttestationAuthority_AttestationAuthorityHint) ProtoMessage() {}
+func (*AttestationAuthority_AttestationAuthorityHint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{8, 0}
+}
+func (m *AttestationAuthority_AttestationAuthorityHint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Unmarshal(m, b)
+}
+func (m *AttestationAuthority_AttestationAuthorityHint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Marshal(b, m, deterministic)
+}
+func (dst *AttestationAuthority_AttestationAuthorityHint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Merge(dst, src)
+}
+func (m *AttestationAuthority_AttestationAuthorityHint) XXX_Size() int {
+	return xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.Size(m)
+}
+func (m *AttestationAuthority_AttestationAuthorityHint) XXX_DiscardUnknown() {
+	xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AttestationAuthority_AttestationAuthorityHint proto.InternalMessageInfo
+
+func (m *AttestationAuthority_AttestationAuthorityHint) GetHumanReadableName() string {
+	if m != nil {
+		return m.HumanReadableName
+	}
+	return ""
+}
+
+// Occurrence that represents a single "attestation".  The authenticity of an
+// Attestation can be verified using the attached signature. If the verifier
+// trusts the public key of the signer, then verifying the signature is
+// sufficient to establish trust.  In this circumstance, the
+// AttestationAuthority to which this Attestation is attached is primarily
+// useful for look-up (how to find this Attestation if you already know the
+// Authority and artifact to be verified) and intent (which authority was this
+// attestation intended to sign for).
+type AttestationAuthority_Attestation struct {
+	// The signature, generally over the `resource_url`, that verifies this
+	// attestation.  The semantics of the signature veracity are ultimately
+	// determined by the verification engine.
+	//
+	// Types that are valid to be assigned to Signature:
+	//	*AttestationAuthority_Attestation_PgpSignedAttestation
+	Signature            isAttestationAuthority_Attestation_Signature `protobuf_oneof:"signature"`
+	XXX_NoUnkeyedLiteral struct{}                                     `json:"-"`
+	XXX_unrecognized     []byte                                       `json:"-"`
+	XXX_sizecache        int32                                        `json:"-"`
+}
+
+func (m *AttestationAuthority_Attestation) Reset()         { *m = AttestationAuthority_Attestation{} }
+func (m *AttestationAuthority_Attestation) String() string { return proto.CompactTextString(m) }
+func (*AttestationAuthority_Attestation) ProtoMessage()    {}
+func (*AttestationAuthority_Attestation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{8, 1}
+}
+func (m *AttestationAuthority_Attestation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AttestationAuthority_Attestation.Unmarshal(m, b)
+}
+func (m *AttestationAuthority_Attestation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AttestationAuthority_Attestation.Marshal(b, m, deterministic)
+}
+func (dst *AttestationAuthority_Attestation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AttestationAuthority_Attestation.Merge(dst, src)
+}
+func (m *AttestationAuthority_Attestation) XXX_Size() int {
+	return xxx_messageInfo_AttestationAuthority_Attestation.Size(m)
+}
+func (m *AttestationAuthority_Attestation) XXX_DiscardUnknown() {
+	xxx_messageInfo_AttestationAuthority_Attestation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AttestationAuthority_Attestation proto.InternalMessageInfo
+
+type isAttestationAuthority_Attestation_Signature interface {
+	isAttestationAuthority_Attestation_Signature()
+}
+
+type AttestationAuthority_Attestation_PgpSignedAttestation struct {
+	PgpSignedAttestation *PgpSignedAttestation `protobuf:"bytes,1,opt,name=pgp_signed_attestation,json=pgpSignedAttestation,proto3,oneof"`
+}
+
+func (*AttestationAuthority_Attestation_PgpSignedAttestation) isAttestationAuthority_Attestation_Signature() {
+}
+
+func (m *AttestationAuthority_Attestation) GetSignature() isAttestationAuthority_Attestation_Signature {
+	if m != nil {
+		return m.Signature
+	}
+	return nil
+}
+
+func (m *AttestationAuthority_Attestation) GetPgpSignedAttestation() *PgpSignedAttestation {
+	if x, ok := m.GetSignature().(*AttestationAuthority_Attestation_PgpSignedAttestation); ok {
+		return x.PgpSignedAttestation
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*AttestationAuthority_Attestation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _AttestationAuthority_Attestation_OneofMarshaler, _AttestationAuthority_Attestation_OneofUnmarshaler, _AttestationAuthority_Attestation_OneofSizer, []interface{}{
+		(*AttestationAuthority_Attestation_PgpSignedAttestation)(nil),
+	}
+}
+
+func _AttestationAuthority_Attestation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*AttestationAuthority_Attestation)
+	// signature
+	switch x := m.Signature.(type) {
+	case *AttestationAuthority_Attestation_PgpSignedAttestation:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.PgpSignedAttestation); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("AttestationAuthority_Attestation.Signature has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _AttestationAuthority_Attestation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*AttestationAuthority_Attestation)
+	switch tag {
+	case 1: // signature.pgp_signed_attestation
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PgpSignedAttestation)
+		err := b.DecodeMessage(msg)
+		m.Signature = &AttestationAuthority_Attestation_PgpSignedAttestation{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _AttestationAuthority_Attestation_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*AttestationAuthority_Attestation)
+	// signature
+	switch x := m.Signature.(type) {
+	case *AttestationAuthority_Attestation_PgpSignedAttestation:
+		s := proto.Size(x.PgpSignedAttestation)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
 // Message encapsulating build provenance details.
 type BuildDetails struct {
 	// The actual provenance
-	Provenance *BuildProvenance `protobuf:"bytes,1,opt,name=provenance" json:"provenance,omitempty"`
+	Provenance *BuildProvenance `protobuf:"bytes,1,opt,name=provenance,proto3" json:"provenance,omitempty"`
 	// Serialized JSON representation of the provenance, used in generating the
 	// `BuildSignature` in the corresponding Result. After verifying the
 	// signature, `provenance_bytes` can be unmarshalled and compared to the
@@ -1036,13 +1864,35 @@ type BuildDetails struct {
 	// The serialized form is captured both to avoid ambiguity in how the
 	// provenance is marshalled to json as well to prevent incompatibilities with
 	// future changes.
-	ProvenanceBytes string `protobuf:"bytes,2,opt,name=provenance_bytes,json=provenanceBytes" json:"provenance_bytes,omitempty"`
+	ProvenanceBytes      string   `protobuf:"bytes,2,opt,name=provenance_bytes,json=provenanceBytes,proto3" json:"provenance_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BuildDetails) Reset()                    { *m = BuildDetails{} }
-func (m *BuildDetails) String() string            { return proto.CompactTextString(m) }
-func (*BuildDetails) ProtoMessage()               {}
-func (*BuildDetails) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *BuildDetails) Reset()         { *m = BuildDetails{} }
+func (m *BuildDetails) String() string { return proto.CompactTextString(m) }
+func (*BuildDetails) ProtoMessage()    {}
+func (*BuildDetails) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{9}
+}
+func (m *BuildDetails) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildDetails.Unmarshal(m, b)
+}
+func (m *BuildDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildDetails.Marshal(b, m, deterministic)
+}
+func (dst *BuildDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildDetails.Merge(dst, src)
+}
+func (m *BuildDetails) XXX_Size() int {
+	return xxx_messageInfo_BuildDetails.Size(m)
+}
+func (m *BuildDetails) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildDetails.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildDetails proto.InternalMessageInfo
 
 func (m *BuildDetails) GetProvenance() *BuildProvenance {
 	if m != nil {
@@ -1058,17 +1908,98 @@ func (m *BuildDetails) GetProvenanceBytes() string {
 	return ""
 }
 
+// Indicates various scans and whether they are turned on or off.
+type ScanConfig struct {
+	// Output only. The name of the ScanConfig in the form
+	// “projects/{project_id}/ScanConfigs/{ScanConfig_id}".
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Output only. A human-readable description of what the `ScanConfig` does.
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	// Indicates whether the Scan is enabled.
+	Enabled              bool     `protobuf:"varint,3,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ScanConfig) Reset()         { *m = ScanConfig{} }
+func (m *ScanConfig) String() string { return proto.CompactTextString(m) }
+func (*ScanConfig) ProtoMessage()    {}
+func (*ScanConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{10}
+}
+func (m *ScanConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ScanConfig.Unmarshal(m, b)
+}
+func (m *ScanConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ScanConfig.Marshal(b, m, deterministic)
+}
+func (dst *ScanConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ScanConfig.Merge(dst, src)
+}
+func (m *ScanConfig) XXX_Size() int {
+	return xxx_messageInfo_ScanConfig.Size(m)
+}
+func (m *ScanConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ScanConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ScanConfig proto.InternalMessageInfo
+
+func (m *ScanConfig) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ScanConfig) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *ScanConfig) GetEnabled() bool {
+	if m != nil {
+		return m.Enabled
+	}
+	return false
+}
+
 // Request to get a Occurrence.
 type GetOccurrenceRequest struct {
 	// The name of the occurrence of the form
 	// "projects/{project_id}/occurrences/{OCCURRENCE_ID}"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetOccurrenceRequest) Reset()         { *m = GetOccurrenceRequest{} }
+func (m *GetOccurrenceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetOccurrenceRequest) ProtoMessage()    {}
+func (*GetOccurrenceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{11}
+}
+func (m *GetOccurrenceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetOccurrenceRequest.Unmarshal(m, b)
+}
+func (m *GetOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetOccurrenceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOccurrenceRequest.Merge(dst, src)
+}
+func (m *GetOccurrenceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetOccurrenceRequest.Size(m)
+}
+func (m *GetOccurrenceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetOccurrenceRequest.DiscardUnknown(m)
 }
 
-func (m *GetOccurrenceRequest) Reset()                    { *m = GetOccurrenceRequest{} }
-func (m *GetOccurrenceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetOccurrenceRequest) ProtoMessage()               {}
-func (*GetOccurrenceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_GetOccurrenceRequest proto.InternalMessageInfo
 
 func (m *GetOccurrenceRequest) GetName() string {
 	if m != nil {
@@ -1082,21 +2013,45 @@ type ListOccurrencesRequest struct {
 	// The name field contains the project Id. For example:
 	// "projects/{project_id}
 	// @Deprecated
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// This contains the project Id for example: projects/{project_id}.
-	Parent string `protobuf:"bytes,5,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The filter expression.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Number of occurrences to return in the list.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Token to provide to skip to a particular spot in the list.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// The kind of occurrences to filter on.
+	Kind                 Note_Kind `protobuf:"varint,6,opt,name=kind,proto3,enum=google.devtools.containeranalysis.v1alpha1.Note_Kind" json:"kind,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *ListOccurrencesRequest) Reset()         { *m = ListOccurrencesRequest{} }
+func (m *ListOccurrencesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListOccurrencesRequest) ProtoMessage()    {}
+func (*ListOccurrencesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{12}
+}
+func (m *ListOccurrencesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOccurrencesRequest.Unmarshal(m, b)
+}
+func (m *ListOccurrencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOccurrencesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListOccurrencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOccurrencesRequest.Merge(dst, src)
+}
+func (m *ListOccurrencesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListOccurrencesRequest.Size(m)
+}
+func (m *ListOccurrencesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOccurrencesRequest.DiscardUnknown(m)
 }
 
-func (m *ListOccurrencesRequest) Reset()                    { *m = ListOccurrencesRequest{} }
-func (m *ListOccurrencesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListOccurrencesRequest) ProtoMessage()               {}
-func (*ListOccurrencesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+var xxx_messageInfo_ListOccurrencesRequest proto.InternalMessageInfo
 
 func (m *ListOccurrencesRequest) GetName() string {
 	if m != nil {
@@ -1133,20 +2088,49 @@ func (m *ListOccurrencesRequest) GetPageToken() string {
 	return ""
 }
 
+func (m *ListOccurrencesRequest) GetKind() Note_Kind {
+	if m != nil {
+		return m.Kind
+	}
+	return Note_KIND_UNSPECIFIED
+}
+
 // Response including listed active occurrences.
 type ListOccurrencesResponse struct {
 	// The occurrences requested.
-	Occurrences []*Occurrence `protobuf:"bytes,1,rep,name=occurrences" json:"occurrences,omitempty"`
+	Occurrences []*Occurrence `protobuf:"bytes,1,rep,name=occurrences,proto3" json:"occurrences,omitempty"`
 	// The next pagination token in the list response. It should be used as
 	// `page_token` for the following request. An empty value means no more
 	// results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListOccurrencesResponse) Reset()         { *m = ListOccurrencesResponse{} }
+func (m *ListOccurrencesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListOccurrencesResponse) ProtoMessage()    {}
+func (*ListOccurrencesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{13}
+}
+func (m *ListOccurrencesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOccurrencesResponse.Unmarshal(m, b)
+}
+func (m *ListOccurrencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOccurrencesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListOccurrencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOccurrencesResponse.Merge(dst, src)
+}
+func (m *ListOccurrencesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListOccurrencesResponse.Size(m)
+}
+func (m *ListOccurrencesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOccurrencesResponse.DiscardUnknown(m)
 }
 
-func (m *ListOccurrencesResponse) Reset()                    { *m = ListOccurrencesResponse{} }
-func (m *ListOccurrencesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListOccurrencesResponse) ProtoMessage()               {}
-func (*ListOccurrencesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_ListOccurrencesResponse proto.InternalMessageInfo
 
 func (m *ListOccurrencesResponse) GetOccurrences() []*Occurrence {
 	if m != nil {
@@ -1166,13 +2150,35 @@ func (m *ListOccurrencesResponse) GetNextPageToken() string {
 type DeleteOccurrenceRequest struct {
 	// The name of the occurrence in the form of
 	// "projects/{project_id}/occurrences/{OCCURRENCE_ID}"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteOccurrenceRequest) Reset()                    { *m = DeleteOccurrenceRequest{} }
-func (m *DeleteOccurrenceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteOccurrenceRequest) ProtoMessage()               {}
-func (*DeleteOccurrenceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *DeleteOccurrenceRequest) Reset()         { *m = DeleteOccurrenceRequest{} }
+func (m *DeleteOccurrenceRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteOccurrenceRequest) ProtoMessage()    {}
+func (*DeleteOccurrenceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{14}
+}
+func (m *DeleteOccurrenceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteOccurrenceRequest.Unmarshal(m, b)
+}
+func (m *DeleteOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteOccurrenceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteOccurrenceRequest.Merge(dst, src)
+}
+func (m *DeleteOccurrenceRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteOccurrenceRequest.Size(m)
+}
+func (m *DeleteOccurrenceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteOccurrenceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteOccurrenceRequest proto.InternalMessageInfo
 
 func (m *DeleteOccurrenceRequest) GetName() string {
 	if m != nil {
@@ -1185,17 +2191,39 @@ func (m *DeleteOccurrenceRequest) GetName() string {
 type CreateOccurrenceRequest struct {
 	// The name of the project.  Should be of the form "projects/{project_id}".
 	// @Deprecated
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// This field contains the project Id for example: "projects/{project_id}"
-	Parent string `protobuf:"bytes,3,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,3,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The occurrence to be inserted
-	Occurrence *Occurrence `protobuf:"bytes,2,opt,name=occurrence" json:"occurrence,omitempty"`
+	Occurrence           *Occurrence `protobuf:"bytes,2,opt,name=occurrence,proto3" json:"occurrence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *CreateOccurrenceRequest) Reset()                    { *m = CreateOccurrenceRequest{} }
-func (m *CreateOccurrenceRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateOccurrenceRequest) ProtoMessage()               {}
-func (*CreateOccurrenceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+func (m *CreateOccurrenceRequest) Reset()         { *m = CreateOccurrenceRequest{} }
+func (m *CreateOccurrenceRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateOccurrenceRequest) ProtoMessage()    {}
+func (*CreateOccurrenceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{15}
+}
+func (m *CreateOccurrenceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateOccurrenceRequest.Unmarshal(m, b)
+}
+func (m *CreateOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateOccurrenceRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateOccurrenceRequest.Merge(dst, src)
+}
+func (m *CreateOccurrenceRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateOccurrenceRequest.Size(m)
+}
+func (m *CreateOccurrenceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateOccurrenceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateOccurrenceRequest proto.InternalMessageInfo
 
 func (m *CreateOccurrenceRequest) GetName() string {
 	if m != nil {
@@ -1222,17 +2250,39 @@ func (m *CreateOccurrenceRequest) GetOccurrence() *Occurrence {
 type UpdateOccurrenceRequest struct {
 	// The name of the occurrence.
 	// Should be of the form "projects/{project_id}/occurrences/{OCCURRENCE_ID}".
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The updated occurrence.
-	Occurrence *Occurrence `protobuf:"bytes,2,opt,name=occurrence" json:"occurrence,omitempty"`
+	Occurrence *Occurrence `protobuf:"bytes,2,opt,name=occurrence,proto3" json:"occurrence,omitempty"`
 	// The fields to update.
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateOccurrenceRequest) Reset()         { *m = UpdateOccurrenceRequest{} }
+func (m *UpdateOccurrenceRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateOccurrenceRequest) ProtoMessage()    {}
+func (*UpdateOccurrenceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{16}
+}
+func (m *UpdateOccurrenceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateOccurrenceRequest.Unmarshal(m, b)
+}
+func (m *UpdateOccurrenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateOccurrenceRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateOccurrenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateOccurrenceRequest.Merge(dst, src)
+}
+func (m *UpdateOccurrenceRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateOccurrenceRequest.Size(m)
+}
+func (m *UpdateOccurrenceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateOccurrenceRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateOccurrenceRequest) Reset()                    { *m = UpdateOccurrenceRequest{} }
-func (m *UpdateOccurrenceRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateOccurrenceRequest) ProtoMessage()               {}
-func (*UpdateOccurrenceRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+var xxx_messageInfo_UpdateOccurrenceRequest proto.InternalMessageInfo
 
 func (m *UpdateOccurrenceRequest) GetName() string {
 	if m != nil {
@@ -1248,7 +2298,7 @@ func (m *UpdateOccurrenceRequest) GetOccurrence() *Occurrence {
 	return nil
 }
 
-func (m *UpdateOccurrenceRequest) GetUpdateMask() *google_protobuf4.FieldMask {
+func (m *UpdateOccurrenceRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1259,13 +2309,35 @@ func (m *UpdateOccurrenceRequest) GetUpdateMask() *google_protobuf4.FieldMask {
 type GetNoteRequest struct {
 	// The name of the note in the form of
 	// "providers/{provider_id}/notes/{NOTE_ID}"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetNoteRequest) Reset()         { *m = GetNoteRequest{} }
+func (m *GetNoteRequest) String() string { return proto.CompactTextString(m) }
+func (*GetNoteRequest) ProtoMessage()    {}
+func (*GetNoteRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{17}
+}
+func (m *GetNoteRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetNoteRequest.Unmarshal(m, b)
+}
+func (m *GetNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetNoteRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNoteRequest.Merge(dst, src)
+}
+func (m *GetNoteRequest) XXX_Size() int {
+	return xxx_messageInfo_GetNoteRequest.Size(m)
+}
+func (m *GetNoteRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetNoteRequest.DiscardUnknown(m)
 }
 
-func (m *GetNoteRequest) Reset()                    { *m = GetNoteRequest{} }
-func (m *GetNoteRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetNoteRequest) ProtoMessage()               {}
-func (*GetNoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+var xxx_messageInfo_GetNoteRequest proto.InternalMessageInfo
 
 func (m *GetNoteRequest) GetName() string {
 	if m != nil {
@@ -1278,13 +2350,35 @@ func (m *GetNoteRequest) GetName() string {
 type GetOccurrenceNoteRequest struct {
 	// The name of the occurrence in the form
 	// "projects/{project_id}/occurrences/{OCCURRENCE_ID}"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetOccurrenceNoteRequest) Reset()         { *m = GetOccurrenceNoteRequest{} }
+func (m *GetOccurrenceNoteRequest) String() string { return proto.CompactTextString(m) }
+func (*GetOccurrenceNoteRequest) ProtoMessage()    {}
+func (*GetOccurrenceNoteRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{18}
+}
+func (m *GetOccurrenceNoteRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetOccurrenceNoteRequest.Unmarshal(m, b)
+}
+func (m *GetOccurrenceNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetOccurrenceNoteRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetOccurrenceNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOccurrenceNoteRequest.Merge(dst, src)
+}
+func (m *GetOccurrenceNoteRequest) XXX_Size() int {
+	return xxx_messageInfo_GetOccurrenceNoteRequest.Size(m)
+}
+func (m *GetOccurrenceNoteRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetOccurrenceNoteRequest.DiscardUnknown(m)
 }
 
-func (m *GetOccurrenceNoteRequest) Reset()                    { *m = GetOccurrenceNoteRequest{} }
-func (m *GetOccurrenceNoteRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetOccurrenceNoteRequest) ProtoMessage()               {}
-func (*GetOccurrenceNoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
+var xxx_messageInfo_GetOccurrenceNoteRequest proto.InternalMessageInfo
 
 func (m *GetOccurrenceNoteRequest) GetName() string {
 	if m != nil {
@@ -1298,22 +2392,43 @@ type ListNotesRequest struct {
 	// The name field will contain the project Id for example:
 	// "providers/{provider_id}
 	// @Deprecated
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// This field contains the project Id for example:
-	// "project/{project_id}
-	Parent string `protobuf:"bytes,5,opt,name=parent" json:"parent,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// This field contains the project Id for example: "projects/{PROJECT_ID}".
+	Parent string `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The filter expression.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Number of notes to return in the list.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Token to provide to skip to a particular spot in the list.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListNotesRequest) Reset()                    { *m = ListNotesRequest{} }
-func (m *ListNotesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListNotesRequest) ProtoMessage()               {}
-func (*ListNotesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+func (m *ListNotesRequest) Reset()         { *m = ListNotesRequest{} }
+func (m *ListNotesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListNotesRequest) ProtoMessage()    {}
+func (*ListNotesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{19}
+}
+func (m *ListNotesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNotesRequest.Unmarshal(m, b)
+}
+func (m *ListNotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNotesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListNotesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotesRequest.Merge(dst, src)
+}
+func (m *ListNotesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListNotesRequest.Size(m)
+}
+func (m *ListNotesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNotesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNotesRequest proto.InternalMessageInfo
 
 func (m *ListNotesRequest) GetName() string {
 	if m != nil {
@@ -1353,16 +2468,38 @@ func (m *ListNotesRequest) GetPageToken() string {
 // Response including listed notes.
 type ListNotesResponse struct {
 	// The occurrences requested
-	Notes []*Note `protobuf:"bytes,1,rep,name=notes" json:"notes,omitempty"`
+	Notes []*Note `protobuf:"bytes,1,rep,name=notes,proto3" json:"notes,omitempty"`
 	// The next pagination token in the list response. It should be used as
 	// page_token for the following request. An empty value means no more result.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListNotesResponse) Reset()                    { *m = ListNotesResponse{} }
-func (m *ListNotesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListNotesResponse) ProtoMessage()               {}
-func (*ListNotesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
+func (m *ListNotesResponse) Reset()         { *m = ListNotesResponse{} }
+func (m *ListNotesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListNotesResponse) ProtoMessage()    {}
+func (*ListNotesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{20}
+}
+func (m *ListNotesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNotesResponse.Unmarshal(m, b)
+}
+func (m *ListNotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNotesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListNotesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotesResponse.Merge(dst, src)
+}
+func (m *ListNotesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListNotesResponse.Size(m)
+}
+func (m *ListNotesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNotesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNotesResponse proto.InternalMessageInfo
 
 func (m *ListNotesResponse) GetNotes() []*Note {
 	if m != nil {
@@ -1382,13 +2519,35 @@ func (m *ListNotesResponse) GetNextPageToken() string {
 type DeleteNoteRequest struct {
 	// The name of the note in the form of
 	// "providers/{provider_id}/notes/{NOTE_ID}"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteNoteRequest) Reset()                    { *m = DeleteNoteRequest{} }
-func (m *DeleteNoteRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteNoteRequest) ProtoMessage()               {}
-func (*DeleteNoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
+func (m *DeleteNoteRequest) Reset()         { *m = DeleteNoteRequest{} }
+func (m *DeleteNoteRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteNoteRequest) ProtoMessage()    {}
+func (*DeleteNoteRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{21}
+}
+func (m *DeleteNoteRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteNoteRequest.Unmarshal(m, b)
+}
+func (m *DeleteNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteNoteRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNoteRequest.Merge(dst, src)
+}
+func (m *DeleteNoteRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteNoteRequest.Size(m)
+}
+func (m *DeleteNoteRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteNoteRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteNoteRequest proto.InternalMessageInfo
 
 func (m *DeleteNoteRequest) GetName() string {
 	if m != nil {
@@ -1402,20 +2561,42 @@ type CreateNoteRequest struct {
 	// The name of the project.
 	// Should be of the form "providers/{provider_id}".
 	// @Deprecated
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// This field contains the project Id for example:
-	// "project/{project_id}
-	Parent string `protobuf:"bytes,4,opt,name=parent" json:"parent,omitempty"`
+	// "projects/{project_id}
+	Parent string `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The ID to use for this note.
-	NoteId string `protobuf:"bytes,2,opt,name=note_id,json=noteId" json:"note_id,omitempty"`
+	NoteId string `protobuf:"bytes,2,opt,name=note_id,json=noteId,proto3" json:"note_id,omitempty"`
 	// The Note to be inserted
-	Note *Note `protobuf:"bytes,3,opt,name=note" json:"note,omitempty"`
+	Note                 *Note    `protobuf:"bytes,3,opt,name=note,proto3" json:"note,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateNoteRequest) Reset()         { *m = CreateNoteRequest{} }
+func (m *CreateNoteRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateNoteRequest) ProtoMessage()    {}
+func (*CreateNoteRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{22}
+}
+func (m *CreateNoteRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateNoteRequest.Unmarshal(m, b)
+}
+func (m *CreateNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateNoteRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNoteRequest.Merge(dst, src)
+}
+func (m *CreateNoteRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateNoteRequest.Size(m)
+}
+func (m *CreateNoteRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateNoteRequest.DiscardUnknown(m)
 }
 
-func (m *CreateNoteRequest) Reset()                    { *m = CreateNoteRequest{} }
-func (m *CreateNoteRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateNoteRequest) ProtoMessage()               {}
-func (*CreateNoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{18} }
+var xxx_messageInfo_CreateNoteRequest proto.InternalMessageInfo
 
 func (m *CreateNoteRequest) GetName() string {
 	if m != nil {
@@ -1449,17 +2630,39 @@ func (m *CreateNoteRequest) GetNote() *Note {
 type UpdateNoteRequest struct {
 	// The name of the note.
 	// Should be of the form "projects/{provider_id}/notes/{note_id}".
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The updated note.
-	Note *Note `protobuf:"bytes,2,opt,name=note" json:"note,omitempty"`
+	Note *Note `protobuf:"bytes,2,opt,name=note,proto3" json:"note,omitempty"`
 	// The fields to update.
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateNoteRequest) Reset()         { *m = UpdateNoteRequest{} }
+func (m *UpdateNoteRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateNoteRequest) ProtoMessage()    {}
+func (*UpdateNoteRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{23}
+}
+func (m *UpdateNoteRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateNoteRequest.Unmarshal(m, b)
+}
+func (m *UpdateNoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateNoteRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateNoteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNoteRequest.Merge(dst, src)
+}
+func (m *UpdateNoteRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateNoteRequest.Size(m)
+}
+func (m *UpdateNoteRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateNoteRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateNoteRequest) Reset()                    { *m = UpdateNoteRequest{} }
-func (m *UpdateNoteRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateNoteRequest) ProtoMessage()               {}
-func (*UpdateNoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{19} }
+var xxx_messageInfo_UpdateNoteRequest proto.InternalMessageInfo
 
 func (m *UpdateNoteRequest) GetName() string {
 	if m != nil {
@@ -1475,7 +2678,7 @@ func (m *UpdateNoteRequest) GetNote() *Note {
 	return nil
 }
 
-func (m *UpdateNoteRequest) GetUpdateMask() *google_protobuf4.FieldMask {
+func (m *UpdateNoteRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1486,19 +2689,41 @@ func (m *UpdateNoteRequest) GetUpdateMask() *google_protobuf4.FieldMask {
 type ListNoteOccurrencesRequest struct {
 	// The name field will contain the note name for example:
 	//   "provider/{provider_id}/notes/{note_id}"
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The filter expression.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Number of notes to return in the list.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Token to provide to skip to a particular spot in the list.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListNoteOccurrencesRequest) Reset()         { *m = ListNoteOccurrencesRequest{} }
+func (m *ListNoteOccurrencesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListNoteOccurrencesRequest) ProtoMessage()    {}
+func (*ListNoteOccurrencesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{24}
+}
+func (m *ListNoteOccurrencesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNoteOccurrencesRequest.Unmarshal(m, b)
+}
+func (m *ListNoteOccurrencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNoteOccurrencesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListNoteOccurrencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNoteOccurrencesRequest.Merge(dst, src)
+}
+func (m *ListNoteOccurrencesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListNoteOccurrencesRequest.Size(m)
+}
+func (m *ListNoteOccurrencesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNoteOccurrencesRequest.DiscardUnknown(m)
 }
 
-func (m *ListNoteOccurrencesRequest) Reset()                    { *m = ListNoteOccurrencesRequest{} }
-func (m *ListNoteOccurrencesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListNoteOccurrencesRequest) ProtoMessage()               {}
-func (*ListNoteOccurrencesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{20} }
+var xxx_messageInfo_ListNoteOccurrencesRequest proto.InternalMessageInfo
 
 func (m *ListNoteOccurrencesRequest) GetName() string {
 	if m != nil {
@@ -1513,70 +2738,230 @@ func (m *ListNoteOccurrencesRequest) GetFilter() string {
 	}
 	return ""
 }
-
-func (m *ListNoteOccurrencesRequest) GetPageSize() int32 {
-	if m != nil {
-		return m.PageSize
-	}
-	return 0
+
+func (m *ListNoteOccurrencesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListNoteOccurrencesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response including listed occurrences for a note.
+type ListNoteOccurrencesResponse struct {
+	// The occurrences attached to the specified note.
+	Occurrences []*Occurrence `protobuf:"bytes,1,rep,name=occurrences,proto3" json:"occurrences,omitempty"`
+	// Token to receive the next page of notes.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListNoteOccurrencesResponse) Reset()         { *m = ListNoteOccurrencesResponse{} }
+func (m *ListNoteOccurrencesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListNoteOccurrencesResponse) ProtoMessage()    {}
+func (*ListNoteOccurrencesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{25}
+}
+func (m *ListNoteOccurrencesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNoteOccurrencesResponse.Unmarshal(m, b)
+}
+func (m *ListNoteOccurrencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNoteOccurrencesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListNoteOccurrencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNoteOccurrencesResponse.Merge(dst, src)
+}
+func (m *ListNoteOccurrencesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListNoteOccurrencesResponse.Size(m)
+}
+func (m *ListNoteOccurrencesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNoteOccurrencesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNoteOccurrencesResponse proto.InternalMessageInfo
+
+func (m *ListNoteOccurrencesResponse) GetOccurrences() []*Occurrence {
+	if m != nil {
+		return m.Occurrences
+	}
+	return nil
+}
+
+func (m *ListNoteOccurrencesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request for creating an operation
+type CreateOperationRequest struct {
+	// The project Id that this operation should be created under.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The ID to use for this operation.
+	OperationId string `protobuf:"bytes,2,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
+	// The operation to create.
+	Operation            *longrunning.Operation `protobuf:"bytes,3,opt,name=operation,proto3" json:"operation,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *CreateOperationRequest) Reset()         { *m = CreateOperationRequest{} }
+func (m *CreateOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateOperationRequest) ProtoMessage()    {}
+func (*CreateOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{26}
+}
+func (m *CreateOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateOperationRequest.Unmarshal(m, b)
+}
+func (m *CreateOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateOperationRequest.Merge(dst, src)
+}
+func (m *CreateOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateOperationRequest.Size(m)
+}
+func (m *CreateOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateOperationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateOperationRequest proto.InternalMessageInfo
+
+func (m *CreateOperationRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateOperationRequest) GetOperationId() string {
+	if m != nil {
+		return m.OperationId
+	}
+	return ""
+}
+
+func (m *CreateOperationRequest) GetOperation() *longrunning.Operation {
+	if m != nil {
+		return m.Operation
+	}
+	return nil
+}
+
+// Request for updating an existing operation
+type UpdateOperationRequest struct {
+	// The name of the Operation.
+	// Should be of the form "projects/{provider_id}/operations/{operation_id}".
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The operation to create.
+	Operation            *longrunning.Operation `protobuf:"bytes,3,opt,name=operation,proto3" json:"operation,omitempty"`
+	UpdateMask           *field_mask.FieldMask  `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *UpdateOperationRequest) Reset()         { *m = UpdateOperationRequest{} }
+func (m *UpdateOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateOperationRequest) ProtoMessage()    {}
+func (*UpdateOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{27}
+}
+func (m *UpdateOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateOperationRequest.Unmarshal(m, b)
+}
+func (m *UpdateOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateOperationRequest.Merge(dst, src)
+}
+func (m *UpdateOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateOperationRequest.Size(m)
+}
+func (m *UpdateOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateOperationRequest.DiscardUnknown(m)
 }
 
-func (m *ListNoteOccurrencesRequest) GetPageToken() string {
+var xxx_messageInfo_UpdateOperationRequest proto.InternalMessageInfo
+
+func (m *UpdateOperationRequest) GetName() string {
 	if m != nil {
-		return m.PageToken
+		return m.Name
 	}
 	return ""
 }
 
-// Response including listed occurrences for a note.
-type ListNoteOccurrencesResponse struct {
-	// The occurrences attached to the specified note.
-	Occurrences []*Occurrence `protobuf:"bytes,1,rep,name=occurrences" json:"occurrences,omitempty"`
-	// Token to receive the next page of notes.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
-}
-
-func (m *ListNoteOccurrencesResponse) Reset()                    { *m = ListNoteOccurrencesResponse{} }
-func (m *ListNoteOccurrencesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListNoteOccurrencesResponse) ProtoMessage()               {}
-func (*ListNoteOccurrencesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{21} }
-
-func (m *ListNoteOccurrencesResponse) GetOccurrences() []*Occurrence {
+func (m *UpdateOperationRequest) GetOperation() *longrunning.Operation {
 	if m != nil {
-		return m.Occurrences
+		return m.Operation
 	}
 	return nil
 }
 
-func (m *ListNoteOccurrencesResponse) GetNextPageToken() string {
+func (m *UpdateOperationRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
-		return m.NextPageToken
+		return m.UpdateMask
 	}
-	return ""
+	return nil
 }
 
 // Metadata for all operations used and required for all operations
 // that created by Container Analysis Providers
 type OperationMetadata struct {
 	// Output only. The time this operation was created.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time that this operation was marked completed or failed.
-	EndTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
+func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata) ProtoMessage()    {}
+func (*OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{28}
+}
+func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
+}
+func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+}
+func (m *OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata.Size(m)
+}
+func (m *OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata.DiscardUnknown(m)
 }
 
-func (m *OperationMetadata) Reset()                    { *m = OperationMetadata{} }
-func (m *OperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*OperationMetadata) ProtoMessage()               {}
-func (*OperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{22} }
+var xxx_messageInfo_OperationMetadata proto.InternalMessageInfo
 
-func (m *OperationMetadata) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *OperationMetadata) GetEndTime() *google_protobuf1.Timestamp {
+func (m *OperationMetadata) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -1586,17 +2971,37 @@ func (m *OperationMetadata) GetEndTime() *google_protobuf1.Timestamp {
 // Request to get the vulnz summary for some set of vulnerability Occurrences.
 type GetVulnzOccurrencesSummaryRequest struct {
 	// This contains the project Id for example: projects/{project_id}
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The filter expression.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter               string   `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *GetVulnzOccurrencesSummaryRequest) Reset()         { *m = GetVulnzOccurrencesSummaryRequest{} }
 func (m *GetVulnzOccurrencesSummaryRequest) String() string { return proto.CompactTextString(m) }
 func (*GetVulnzOccurrencesSummaryRequest) ProtoMessage()    {}
 func (*GetVulnzOccurrencesSummaryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{23}
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{29}
+}
+func (m *GetVulnzOccurrencesSummaryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Unmarshal(m, b)
+}
+func (m *GetVulnzOccurrencesSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Marshal(b, m, deterministic)
 }
+func (dst *GetVulnzOccurrencesSummaryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Merge(dst, src)
+}
+func (m *GetVulnzOccurrencesSummaryRequest) XXX_Size() int {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.Size(m)
+}
+func (m *GetVulnzOccurrencesSummaryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetVulnzOccurrencesSummaryRequest proto.InternalMessageInfo
 
 func (m *GetVulnzOccurrencesSummaryRequest) GetParent() string {
 	if m != nil {
@@ -1617,15 +3022,35 @@ func (m *GetVulnzOccurrencesSummaryRequest) GetFilter() string {
 // like this.
 type GetVulnzOccurrencesSummaryResponse struct {
 	// A map of how many occurrences were found for each severity.
-	Counts []*GetVulnzOccurrencesSummaryResponse_SeverityCount `protobuf:"bytes,1,rep,name=counts" json:"counts,omitempty"`
+	Counts               []*GetVulnzOccurrencesSummaryResponse_SeverityCount `protobuf:"bytes,1,rep,name=counts,proto3" json:"counts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                            `json:"-"`
+	XXX_unrecognized     []byte                                              `json:"-"`
+	XXX_sizecache        int32                                               `json:"-"`
 }
 
 func (m *GetVulnzOccurrencesSummaryResponse) Reset()         { *m = GetVulnzOccurrencesSummaryResponse{} }
 func (m *GetVulnzOccurrencesSummaryResponse) String() string { return proto.CompactTextString(m) }
 func (*GetVulnzOccurrencesSummaryResponse) ProtoMessage()    {}
 func (*GetVulnzOccurrencesSummaryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{24}
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{30}
 }
+func (m *GetVulnzOccurrencesSummaryResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Unmarshal(m, b)
+}
+func (m *GetVulnzOccurrencesSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetVulnzOccurrencesSummaryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Merge(dst, src)
+}
+func (m *GetVulnzOccurrencesSummaryResponse) XXX_Size() int {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.Size(m)
+}
+func (m *GetVulnzOccurrencesSummaryResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetVulnzOccurrencesSummaryResponse proto.InternalMessageInfo
 
 func (m *GetVulnzOccurrencesSummaryResponse) GetCounts() []*GetVulnzOccurrencesSummaryResponse_SeverityCount {
 	if m != nil {
@@ -1637,9 +3062,12 @@ func (m *GetVulnzOccurrencesSummaryResponse) GetCounts() []*GetVulnzOccurrencesS
 // The number of occurrences created for a specific severity.
 type GetVulnzOccurrencesSummaryResponse_SeverityCount struct {
 	// The severity of the occurrences.
-	Severity VulnerabilityType_Severity `protobuf:"varint,1,opt,name=severity,enum=google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Severity" json:"severity,omitempty"`
+	Severity VulnerabilityType_Severity `protobuf:"varint,1,opt,name=severity,proto3,enum=google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Severity" json:"severity,omitempty"`
 	// The number of occurrences with the severity.
-	Count int64 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
+	Count                int64    `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) Reset() {
@@ -1650,8 +3078,25 @@ func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) String() string {
 }
 func (*GetVulnzOccurrencesSummaryResponse_SeverityCount) ProtoMessage() {}
 func (*GetVulnzOccurrencesSummaryResponse_SeverityCount) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{24, 0}
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{30, 0}
+}
+func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Unmarshal(m, b)
+}
+func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Marshal(b, m, deterministic)
 }
+func (dst *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Merge(dst, src)
+}
+func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_Size() int {
+	return xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.Size(m)
+}
+func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetVulnzOccurrencesSummaryResponse_SeverityCount proto.InternalMessageInfo
 
 func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) GetSeverity() VulnerabilityType_Severity {
 	if m != nil {
@@ -1667,8 +3112,227 @@ func (m *GetVulnzOccurrencesSummaryResponse_SeverityCount) GetCount() int64 {
 	return 0
 }
 
+// Request to get a ScanConfig.
+type GetScanConfigRequest struct {
+	// The name of the ScanConfig in the form
+	// projects/{project_id}/scan_configs/{ScanConfig_id}
+	// instead.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetScanConfigRequest) Reset()         { *m = GetScanConfigRequest{} }
+func (m *GetScanConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetScanConfigRequest) ProtoMessage()    {}
+func (*GetScanConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{31}
+}
+func (m *GetScanConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetScanConfigRequest.Unmarshal(m, b)
+}
+func (m *GetScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetScanConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetScanConfigRequest.Merge(dst, src)
+}
+func (m *GetScanConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetScanConfigRequest.Size(m)
+}
+func (m *GetScanConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetScanConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetScanConfigRequest proto.InternalMessageInfo
+
+func (m *GetScanConfigRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request to list the available scan configurations.
+type ListScanConfigsRequest struct {
+	// This containers the project Id i.e.: projects/{project_id}
+	// instead.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The filter expression.
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
+	// The number of items to return.
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// The page token to use for the next request.
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListScanConfigsRequest) Reset()         { *m = ListScanConfigsRequest{} }
+func (m *ListScanConfigsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListScanConfigsRequest) ProtoMessage()    {}
+func (*ListScanConfigsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{32}
+}
+func (m *ListScanConfigsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListScanConfigsRequest.Unmarshal(m, b)
+}
+func (m *ListScanConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListScanConfigsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListScanConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsRequest.Merge(dst, src)
+}
+func (m *ListScanConfigsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListScanConfigsRequest.Size(m)
+}
+func (m *ListScanConfigsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListScanConfigsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListScanConfigsRequest proto.InternalMessageInfo
+
+func (m *ListScanConfigsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListScanConfigsRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListScanConfigsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListScanConfigsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// A list of ScanConfigs for the project.
+type ListScanConfigsResponse struct {
+	// The set of scan configs
+	ScanConfigs []*ScanConfig `protobuf:"bytes,1,rep,name=scan_configs,json=scanConfigs,proto3" json:"scan_configs,omitempty"`
+	// A page token to pass in order to get more scans.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListScanConfigsResponse) Reset()         { *m = ListScanConfigsResponse{} }
+func (m *ListScanConfigsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListScanConfigsResponse) ProtoMessage()    {}
+func (*ListScanConfigsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{33}
+}
+func (m *ListScanConfigsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListScanConfigsResponse.Unmarshal(m, b)
+}
+func (m *ListScanConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListScanConfigsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListScanConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListScanConfigsResponse.Merge(dst, src)
+}
+func (m *ListScanConfigsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListScanConfigsResponse.Size(m)
+}
+func (m *ListScanConfigsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListScanConfigsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListScanConfigsResponse proto.InternalMessageInfo
+
+func (m *ListScanConfigsResponse) GetScanConfigs() []*ScanConfig {
+	if m != nil {
+		return m.ScanConfigs
+	}
+	return nil
+}
+
+func (m *ListScanConfigsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// A request to update a ScanConfig.
+type UpdateScanConfigRequest struct {
+	// The scan config to update of the form
+	// projects/{project_id}/scan_configs/{ScanConfig_id}
+	// instead.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The new scan configuration
+	ScanConfig           *ScanConfig           `protobuf:"bytes,2,opt,name=scan_config,json=scanConfig,proto3" json:"scan_config,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateScanConfigRequest) Reset()         { *m = UpdateScanConfigRequest{} }
+func (m *UpdateScanConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateScanConfigRequest) ProtoMessage()    {}
+func (*UpdateScanConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_containeranalysis_7302a99efbbe81f1, []int{34}
+}
+func (m *UpdateScanConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateScanConfigRequest.Unmarshal(m, b)
+}
+func (m *UpdateScanConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateScanConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateScanConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateScanConfigRequest.Merge(dst, src)
+}
+func (m *UpdateScanConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateScanConfigRequest.Size(m)
+}
+func (m *UpdateScanConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateScanConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateScanConfigRequest proto.InternalMessageInfo
+
+func (m *UpdateScanConfigRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *UpdateScanConfigRequest) GetScanConfig() *ScanConfig {
+	if m != nil {
+		return m.ScanConfig
+	}
+	return nil
+}
+
+func (m *UpdateScanConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*Occurrence)(nil), "google.devtools.containeranalysis.v1alpha1.Occurrence")
+	proto.RegisterType((*Resource)(nil), "google.devtools.containeranalysis.v1alpha1.Resource")
 	proto.RegisterType((*Note)(nil), "google.devtools.containeranalysis.v1alpha1.Note")
 	proto.RegisterType((*Note_RelatedUrl)(nil), "google.devtools.containeranalysis.v1alpha1.Note.RelatedUrl")
 	proto.RegisterType((*Deployable)(nil), "google.devtools.containeranalysis.v1alpha1.Deployable")
@@ -1677,7 +3341,12 @@ func init() {
 	proto.RegisterType((*Discovery_Discovered)(nil), "google.devtools.containeranalysis.v1alpha1.Discovery.Discovered")
 	proto.RegisterType((*BuildType)(nil), "google.devtools.containeranalysis.v1alpha1.BuildType")
 	proto.RegisterType((*BuildSignature)(nil), "google.devtools.containeranalysis.v1alpha1.BuildSignature")
+	proto.RegisterType((*PgpSignedAttestation)(nil), "google.devtools.containeranalysis.v1alpha1.PgpSignedAttestation")
+	proto.RegisterType((*AttestationAuthority)(nil), "google.devtools.containeranalysis.v1alpha1.AttestationAuthority")
+	proto.RegisterType((*AttestationAuthority_AttestationAuthorityHint)(nil), "google.devtools.containeranalysis.v1alpha1.AttestationAuthority.AttestationAuthorityHint")
+	proto.RegisterType((*AttestationAuthority_Attestation)(nil), "google.devtools.containeranalysis.v1alpha1.AttestationAuthority.Attestation")
 	proto.RegisterType((*BuildDetails)(nil), "google.devtools.containeranalysis.v1alpha1.BuildDetails")
+	proto.RegisterType((*ScanConfig)(nil), "google.devtools.containeranalysis.v1alpha1.ScanConfig")
 	proto.RegisterType((*GetOccurrenceRequest)(nil), "google.devtools.containeranalysis.v1alpha1.GetOccurrenceRequest")
 	proto.RegisterType((*ListOccurrencesRequest)(nil), "google.devtools.containeranalysis.v1alpha1.ListOccurrencesRequest")
 	proto.RegisterType((*ListOccurrencesResponse)(nil), "google.devtools.containeranalysis.v1alpha1.ListOccurrencesResponse")
@@ -1693,13 +3362,21 @@ func init() {
 	proto.RegisterType((*UpdateNoteRequest)(nil), "google.devtools.containeranalysis.v1alpha1.UpdateNoteRequest")
 	proto.RegisterType((*ListNoteOccurrencesRequest)(nil), "google.devtools.containeranalysis.v1alpha1.ListNoteOccurrencesRequest")
 	proto.RegisterType((*ListNoteOccurrencesResponse)(nil), "google.devtools.containeranalysis.v1alpha1.ListNoteOccurrencesResponse")
+	proto.RegisterType((*CreateOperationRequest)(nil), "google.devtools.containeranalysis.v1alpha1.CreateOperationRequest")
+	proto.RegisterType((*UpdateOperationRequest)(nil), "google.devtools.containeranalysis.v1alpha1.UpdateOperationRequest")
 	proto.RegisterType((*OperationMetadata)(nil), "google.devtools.containeranalysis.v1alpha1.OperationMetadata")
 	proto.RegisterType((*GetVulnzOccurrencesSummaryRequest)(nil), "google.devtools.containeranalysis.v1alpha1.GetVulnzOccurrencesSummaryRequest")
 	proto.RegisterType((*GetVulnzOccurrencesSummaryResponse)(nil), "google.devtools.containeranalysis.v1alpha1.GetVulnzOccurrencesSummaryResponse")
 	proto.RegisterType((*GetVulnzOccurrencesSummaryResponse_SeverityCount)(nil), "google.devtools.containeranalysis.v1alpha1.GetVulnzOccurrencesSummaryResponse.SeverityCount")
+	proto.RegisterType((*GetScanConfigRequest)(nil), "google.devtools.containeranalysis.v1alpha1.GetScanConfigRequest")
+	proto.RegisterType((*ListScanConfigsRequest)(nil), "google.devtools.containeranalysis.v1alpha1.ListScanConfigsRequest")
+	proto.RegisterType((*ListScanConfigsResponse)(nil), "google.devtools.containeranalysis.v1alpha1.ListScanConfigsResponse")
+	proto.RegisterType((*UpdateScanConfigRequest)(nil), "google.devtools.containeranalysis.v1alpha1.UpdateScanConfigRequest")
 	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Note_Kind", Note_Kind_name, Note_Kind_value)
 	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Deployable_Deployment_Platform", Deployable_Deployment_Platform_name, Deployable_Deployment_Platform_value)
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.Discovery_Discovered_AnalysisStatus", Discovery_Discovered_AnalysisStatus_name, Discovery_Discovered_AnalysisStatus_value)
 	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.BuildSignature_KeyType", BuildSignature_KeyType_name, BuildSignature_KeyType_value)
+	proto.RegisterEnum("google.devtools.containeranalysis.v1alpha1.PgpSignedAttestation_ContentType", PgpSignedAttestation_ContentType_name, PgpSignedAttestation_ContentType_value)
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1710,8 +3387,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ContainerAnalysis service
-
+// ContainerAnalysisClient is the client API for ContainerAnalysis service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ContainerAnalysisClient interface {
 	// Returns the requested `Occurrence`.
 	GetOccurrence(ctx context.Context, in *GetOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error)
@@ -1719,7 +3397,7 @@ type ContainerAnalysisClient interface {
 	ListOccurrences(ctx context.Context, in *ListOccurrencesRequest, opts ...grpc.CallOption) (*ListOccurrencesResponse, error)
 	// Deletes the given `Occurrence` from the system. Use this when
 	// an `Occurrence` is no longer applicable for the given resource.
-	DeleteOccurrence(ctx context.Context, in *DeleteOccurrenceRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
+	DeleteOccurrence(ctx context.Context, in *DeleteOccurrenceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Creates a new `Occurrence`. Use this method to create `Occurrences`
 	// for a resource.
 	CreateOccurrence(ctx context.Context, in *CreateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error)
@@ -1732,7 +3410,7 @@ type ContainerAnalysisClient interface {
 	// Lists all `Notes` for a given project.
 	ListNotes(ctx context.Context, in *ListNotesRequest, opts ...grpc.CallOption) (*ListNotesResponse, error)
 	// Deletes the given `Note` from the system.
-	DeleteNote(ctx context.Context, in *DeleteNoteRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
+	DeleteNote(ctx context.Context, in *DeleteNoteRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Creates a new `Note`.
 	CreateNote(ctx context.Context, in *CreateNoteRequest, opts ...grpc.CallOption) (*Note, error)
 	// Updates an existing `Note`.
@@ -1755,7 +3433,7 @@ type ContainerAnalysisClient interface {
 	// a `PERMISSION_DENIED` error otherwise. The resource takes the following
 	// formats: `projects/{projectid}/occurrences/{occurrenceid}` for occurrences
 	// and projects/{projectid}/notes/{noteid} for notes
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Gets the access control policy for a note or an `Occurrence` resource.
 	// Requires `containeranalysis.notes.setIamPolicy` or
 	// `containeranalysis.occurrences.setIamPolicy` permission if the resource is
@@ -1767,7 +3445,7 @@ type ContainerAnalysisClient interface {
 	// error otherwise. The resource takes the following formats:
 	// `projects/{PROJECT_ID}/occurrences/{OCCURRENCE_ID}` for occurrences and
 	// projects/{PROJECT_ID}/notes/{NOTE_ID} for notes
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Returns the permissions that a caller has on the specified note or
 	// occurrence resource. Requires list permission on the project (for example,
 	// "storage.objects.list" on the containing bucket for testing permission of
@@ -1776,7 +3454,19 @@ type ContainerAnalysisClient interface {
 	// project, or a `PERMISSION_DENIED` error otherwise. The resource takes the
 	// following formats: `projects/{PROJECT_ID}/occurrences/{OCCURRENCE_ID}` for
 	// `Occurrences` and `projects/{PROJECT_ID}/notes/{NOTE_ID}` for `Notes`
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
+	// Creates a new `Operation`.
+	CreateOperation(ctx context.Context, in *CreateOperationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Updates an existing operation returns an error if operation
+	//  does not exist. The only valid operations are to update mark the done bit
+	// change the result.
+	UpdateOperation(ctx context.Context, in *UpdateOperationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
+	// Gets a specific scan configuration for a project.
+	GetScanConfig(ctx context.Context, in *GetScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
+	// Lists scan configurations for a project.
+	ListScanConfigs(ctx context.Context, in *ListScanConfigsRequest, opts ...grpc.CallOption) (*ListScanConfigsResponse, error)
+	// Updates the scan configuration to a new value.
+	UpdateScanConfig(ctx context.Context, in *UpdateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
 }
 
 type containerAnalysisClient struct {
@@ -1789,7 +3479,7 @@ func NewContainerAnalysisClient(cc *grpc.ClientConn) ContainerAnalysisClient {
 
 func (c *containerAnalysisClient) GetOccurrence(ctx context.Context, in *GetOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
 	out := new(Occurrence)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetOccurrence", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetOccurrence", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1798,16 +3488,16 @@ func (c *containerAnalysisClient) GetOccurrence(ctx context.Context, in *GetOccu
 
 func (c *containerAnalysisClient) ListOccurrences(ctx context.Context, in *ListOccurrencesRequest, opts ...grpc.CallOption) (*ListOccurrencesResponse, error) {
 	out := new(ListOccurrencesResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListOccurrences", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListOccurrences", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *containerAnalysisClient) DeleteOccurrence(ctx context.Context, in *DeleteOccurrenceRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/DeleteOccurrence", in, out, c.cc, opts...)
+func (c *containerAnalysisClient) DeleteOccurrence(ctx context.Context, in *DeleteOccurrenceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/DeleteOccurrence", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1816,7 +3506,7 @@ func (c *containerAnalysisClient) DeleteOccurrence(ctx context.Context, in *Dele
 
 func (c *containerAnalysisClient) CreateOccurrence(ctx context.Context, in *CreateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
 	out := new(Occurrence)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/CreateOccurrence", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/CreateOccurrence", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1825,7 +3515,7 @@ func (c *containerAnalysisClient) CreateOccurrence(ctx context.Context, in *Crea
 
 func (c *containerAnalysisClient) UpdateOccurrence(ctx context.Context, in *UpdateOccurrenceRequest, opts ...grpc.CallOption) (*Occurrence, error) {
 	out := new(Occurrence)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateOccurrence", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateOccurrence", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1834,7 +3524,7 @@ func (c *containerAnalysisClient) UpdateOccurrence(ctx context.Context, in *Upda
 
 func (c *containerAnalysisClient) GetOccurrenceNote(ctx context.Context, in *GetOccurrenceNoteRequest, opts ...grpc.CallOption) (*Note, error) {
 	out := new(Note)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetOccurrenceNote", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetOccurrenceNote", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1843,7 +3533,7 @@ func (c *containerAnalysisClient) GetOccurrenceNote(ctx context.Context, in *Get
 
 func (c *containerAnalysisClient) GetNote(ctx context.Context, in *GetNoteRequest, opts ...grpc.CallOption) (*Note, error) {
 	out := new(Note)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetNote", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetNote", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1852,16 +3542,16 @@ func (c *containerAnalysisClient) GetNote(ctx context.Context, in *GetNoteReques
 
 func (c *containerAnalysisClient) ListNotes(ctx context.Context, in *ListNotesRequest, opts ...grpc.CallOption) (*ListNotesResponse, error) {
 	out := new(ListNotesResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListNotes", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListNotes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *containerAnalysisClient) DeleteNote(ctx context.Context, in *DeleteNoteRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/DeleteNote", in, out, c.cc, opts...)
+func (c *containerAnalysisClient) DeleteNote(ctx context.Context, in *DeleteNoteRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/DeleteNote", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1870,7 +3560,7 @@ func (c *containerAnalysisClient) DeleteNote(ctx context.Context, in *DeleteNote
 
 func (c *containerAnalysisClient) CreateNote(ctx context.Context, in *CreateNoteRequest, opts ...grpc.CallOption) (*Note, error) {
 	out := new(Note)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/CreateNote", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/CreateNote", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1879,7 +3569,7 @@ func (c *containerAnalysisClient) CreateNote(ctx context.Context, in *CreateNote
 
 func (c *containerAnalysisClient) UpdateNote(ctx context.Context, in *UpdateNoteRequest, opts ...grpc.CallOption) (*Note, error) {
 	out := new(Note)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateNote", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateNote", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1888,7 +3578,7 @@ func (c *containerAnalysisClient) UpdateNote(ctx context.Context, in *UpdateNote
 
 func (c *containerAnalysisClient) ListNoteOccurrences(ctx context.Context, in *ListNoteOccurrencesRequest, opts ...grpc.CallOption) (*ListNoteOccurrencesResponse, error) {
 	out := new(ListNoteOccurrencesResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListNoteOccurrences", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListNoteOccurrences", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1897,42 +3587,86 @@ func (c *containerAnalysisClient) ListNoteOccurrences(ctx context.Context, in *L
 
 func (c *containerAnalysisClient) GetVulnzOccurrencesSummary(ctx context.Context, in *GetVulnzOccurrencesSummaryRequest, opts ...grpc.CallOption) (*GetVulnzOccurrencesSummaryResponse, error) {
 	out := new(GetVulnzOccurrencesSummaryResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetVulnzOccurrencesSummary", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetVulnzOccurrencesSummary", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/SetIamPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetIamPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/TestIamPermissions", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *containerAnalysisClient) CreateOperation(ctx context.Context, in *CreateOperationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/CreateOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *containerAnalysisClient) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/SetIamPolicy", in, out, c.cc, opts...)
+func (c *containerAnalysisClient) UpdateOperation(ctx context.Context, in *UpdateOperationRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *containerAnalysisClient) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetIamPolicy", in, out, c.cc, opts...)
+func (c *containerAnalysisClient) GetScanConfig(ctx context.Context, in *GetScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error) {
+	out := new(ScanConfig)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetScanConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *containerAnalysisClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/TestIamPermissions", in, out, c.cc, opts...)
+func (c *containerAnalysisClient) ListScanConfigs(ctx context.Context, in *ListScanConfigsRequest, opts ...grpc.CallOption) (*ListScanConfigsResponse, error) {
+	out := new(ListScanConfigsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListScanConfigs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ContainerAnalysis service
+func (c *containerAnalysisClient) UpdateScanConfig(ctx context.Context, in *UpdateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error) {
+	out := new(ScanConfig)
+	err := c.cc.Invoke(ctx, "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateScanConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
 
+// ContainerAnalysisServer is the server API for ContainerAnalysis service.
 type ContainerAnalysisServer interface {
 	// Returns the requested `Occurrence`.
 	GetOccurrence(context.Context, *GetOccurrenceRequest) (*Occurrence, error)
@@ -1940,7 +3674,7 @@ type ContainerAnalysisServer interface {
 	ListOccurrences(context.Context, *ListOccurrencesRequest) (*ListOccurrencesResponse, error)
 	// Deletes the given `Occurrence` from the system. Use this when
 	// an `Occurrence` is no longer applicable for the given resource.
-	DeleteOccurrence(context.Context, *DeleteOccurrenceRequest) (*google_protobuf3.Empty, error)
+	DeleteOccurrence(context.Context, *DeleteOccurrenceRequest) (*empty.Empty, error)
 	// Creates a new `Occurrence`. Use this method to create `Occurrences`
 	// for a resource.
 	CreateOccurrence(context.Context, *CreateOccurrenceRequest) (*Occurrence, error)
@@ -1953,7 +3687,7 @@ type ContainerAnalysisServer interface {
 	// Lists all `Notes` for a given project.
 	ListNotes(context.Context, *ListNotesRequest) (*ListNotesResponse, error)
 	// Deletes the given `Note` from the system.
-	DeleteNote(context.Context, *DeleteNoteRequest) (*google_protobuf3.Empty, error)
+	DeleteNote(context.Context, *DeleteNoteRequest) (*empty.Empty, error)
 	// Creates a new `Note`.
 	CreateNote(context.Context, *CreateNoteRequest) (*Note, error)
 	// Updates an existing `Note`.
@@ -1976,7 +3710,7 @@ type ContainerAnalysisServer interface {
 	// a `PERMISSION_DENIED` error otherwise. The resource takes the following
 	// formats: `projects/{projectid}/occurrences/{occurrenceid}` for occurrences
 	// and projects/{projectid}/notes/{noteid} for notes
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Gets the access control policy for a note or an `Occurrence` resource.
 	// Requires `containeranalysis.notes.setIamPolicy` or
 	// `containeranalysis.occurrences.setIamPolicy` permission if the resource is
@@ -1988,7 +3722,7 @@ type ContainerAnalysisServer interface {
 	// error otherwise. The resource takes the following formats:
 	// `projects/{PROJECT_ID}/occurrences/{OCCURRENCE_ID}` for occurrences and
 	// projects/{PROJECT_ID}/notes/{NOTE_ID} for notes
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Returns the permissions that a caller has on the specified note or
 	// occurrence resource. Requires list permission on the project (for example,
 	// "storage.objects.list" on the containing bucket for testing permission of
@@ -1997,7 +3731,19 @@ type ContainerAnalysisServer interface {
 	// project, or a `PERMISSION_DENIED` error otherwise. The resource takes the
 	// following formats: `projects/{PROJECT_ID}/occurrences/{OCCURRENCE_ID}` for
 	// `Occurrences` and `projects/{PROJECT_ID}/notes/{NOTE_ID}` for `Notes`
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
+	// Creates a new `Operation`.
+	CreateOperation(context.Context, *CreateOperationRequest) (*longrunning.Operation, error)
+	// Updates an existing operation returns an error if operation
+	//  does not exist. The only valid operations are to update mark the done bit
+	// change the result.
+	UpdateOperation(context.Context, *UpdateOperationRequest) (*longrunning.Operation, error)
+	// Gets a specific scan configuration for a project.
+	GetScanConfig(context.Context, *GetScanConfigRequest) (*ScanConfig, error)
+	// Lists scan configurations for a project.
+	ListScanConfigs(context.Context, *ListScanConfigsRequest) (*ListScanConfigsResponse, error)
+	// Updates the scan configuration to a new value.
+	UpdateScanConfig(context.Context, *UpdateScanConfigRequest) (*ScanConfig, error)
 }
 
 func RegisterContainerAnalysisServer(s *grpc.Server, srv ContainerAnalysisServer) {
@@ -2239,7 +3985,7 @@ func _ContainerAnalysis_GetVulnzOccurrencesSummary_Handler(srv interface{}, ctx
 }
 
 func _ContainerAnalysis_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2251,13 +3997,13 @@ func _ContainerAnalysis_SetIamPolicy_Handler(srv interface{}, ctx context.Contex
 		FullMethod: "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ContainerAnalysisServer).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(ContainerAnalysisServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _ContainerAnalysis_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2269,13 +4015,13 @@ func _ContainerAnalysis_GetIamPolicy_Handler(srv interface{}, ctx context.Contex
 		FullMethod: "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ContainerAnalysisServer).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(ContainerAnalysisServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _ContainerAnalysis_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2287,7 +4033,97 @@ func _ContainerAnalysis_TestIamPermissions_Handler(srv interface{}, ctx context.
 		FullMethod: "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ContainerAnalysisServer).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(ContainerAnalysisServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ContainerAnalysis_CreateOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateOperationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContainerAnalysisServer).CreateOperation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/CreateOperation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContainerAnalysisServer).CreateOperation(ctx, req.(*CreateOperationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ContainerAnalysis_UpdateOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateOperationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContainerAnalysisServer).UpdateOperation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateOperation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContainerAnalysisServer).UpdateOperation(ctx, req.(*UpdateOperationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ContainerAnalysis_GetScanConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetScanConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContainerAnalysisServer).GetScanConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/GetScanConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContainerAnalysisServer).GetScanConfig(ctx, req.(*GetScanConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ContainerAnalysis_ListScanConfigs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListScanConfigsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContainerAnalysisServer).ListScanConfigs(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/ListScanConfigs",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContainerAnalysisServer).ListScanConfigs(ctx, req.(*ListScanConfigsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ContainerAnalysis_UpdateScanConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateScanConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ContainerAnalysisServer).UpdateScanConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.containeranalysis.v1alpha1.ContainerAnalysis/UpdateScanConfig",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ContainerAnalysisServer).UpdateScanConfig(ctx, req.(*UpdateScanConfigRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -2360,167 +4196,239 @@ var _ContainerAnalysis_serviceDesc = grpc.ServiceDesc{
 			MethodName: "TestIamPermissions",
 			Handler:    _ContainerAnalysis_TestIamPermissions_Handler,
 		},
+		{
+			MethodName: "CreateOperation",
+			Handler:    _ContainerAnalysis_CreateOperation_Handler,
+		},
+		{
+			MethodName: "UpdateOperation",
+			Handler:    _ContainerAnalysis_UpdateOperation_Handler,
+		},
+		{
+			MethodName: "GetScanConfig",
+			Handler:    _ContainerAnalysis_GetScanConfig_Handler,
+		},
+		{
+			MethodName: "ListScanConfigs",
+			Handler:    _ContainerAnalysis_ListScanConfigs_Handler,
+		},
+		{
+			MethodName: "UpdateScanConfig",
+			Handler:    _ContainerAnalysis_UpdateScanConfig_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/devtools/containeranalysis/v1alpha1/containeranalysis.proto",
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/containeranalysis.proto", fileDescriptor1)
-}
-
-var fileDescriptor1 = []byte{
-	// 2432 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xdd, 0x6f, 0x23, 0x57,
-	0x15, 0xdf, 0x89, 0x93, 0x38, 0x3e, 0xce, 0x87, 0x7d, 0xbb, 0xdb, 0xb8, 0x6e, 0x0b, 0xe9, 0x94,
-	0xd2, 0x6d, 0x16, 0x6c, 0x12, 0xba, 0x14, 0x92, 0xae, 0xb6, 0xfe, 0x8a, 0xd7, 0xe4, 0xcb, 0x1a,
-	0x27, 0xd1, 0x6e, 0x5b, 0x3a, 0xba, 0xf6, 0xdc, 0xb8, 0x83, 0xc7, 0x33, 0xc3, 0xcc, 0xd8, 0xaa,
-	0x17, 0xf5, 0x05, 0x90, 0x50, 0x11, 0x5f, 0x02, 0x09, 0x21, 0x21, 0x40, 0xaa, 0x10, 0x12, 0xf0,
-	0x52, 0x21, 0xf1, 0xc6, 0x13, 0xe2, 0x15, 0x5e, 0x78, 0x46, 0x7d, 0xe1, 0x81, 0x37, 0xfe, 0x05,
-	0x74, 0xef, 0xdc, 0x6b, 0x8f, 0x3f, 0x92, 0x78, 0xe2, 0xad, 0xd4, 0xa7, 0x9d, 0x7b, 0xee, 0xb9,
-	0xbf, 0x73, 0xee, 0x99, 0xf3, 0xf1, 0x9b, 0xac, 0x21, 0xdf, 0xb4, 0xac, 0xa6, 0x41, 0xb2, 0x1a,
-	0xe9, 0x7a, 0x96, 0x65, 0xb8, 0xd9, 0x86, 0x65, 0x7a, 0x58, 0x37, 0x89, 0x83, 0x4d, 0x6c, 0xf4,
-	0x5c, 0xdd, 0xcd, 0x76, 0xb7, 0xb0, 0x61, 0xbf, 0x8b, 0xb7, 0xc6, 0xb7, 0x32, 0xb6, 0x63, 0x79,
-	0x16, 0xda, 0xf4, 0x31, 0x32, 0x02, 0x23, 0x33, 0xae, 0x28, 0x30, 0xd2, 0xcf, 0x71, 0x7b, 0xd8,
-	0xd6, 0xb3, 0xd8, 0x34, 0x2d, 0x0f, 0x7b, 0xba, 0x65, 0x72, 0xa4, 0x74, 0x18, 0x6f, 0xea, 0xba,
-	0x61, 0xa8, 0xd6, 0xb9, 0xda, 0xc6, 0x1e, 0x71, 0x74, 0x6c, 0x08, 0x8c, 0xd7, 0x43, 0x60, 0xe8,
-	0x6d, 0xdc, 0x24, 0x6a, 0x1d, 0xf7, 0xef, 0x92, 0xde, 0x0b, 0x71, 0xda, 0xc6, 0x8d, 0x16, 0x3d,
-	0xdf, 0xed, 0x18, 0x74, 0xbf, 0xae, 0x1b, 0xba, 0xd7, 0xe3, 0x38, 0xbb, 0x61, 0x70, 0x1c, 0xab,
-	0x4b, 0x4c, 0x6c, 0x36, 0x08, 0x3f, 0xfc, 0x19, 0x7e, 0x58, 0xc7, 0xed, 0x6c, 0x77, 0x8b, 0xfe,
-	0xa3, 0xda, 0x96, 0xa1, 0x37, 0x04, 0x78, 0x7a, 0x78, 0x7f, 0x68, 0xef, 0x45, 0xbe, 0x67, 0x58,
-	0x66, 0xd3, 0xe9, 0x98, 0xa6, 0x6e, 0x36, 0xb3, 0x96, 0x4d, 0x9c, 0xa1, 0x38, 0x3f, 0xc3, 0x95,
-	0xd8, 0xaa, 0xde, 0x39, 0xcf, 0x62, 0x53, 0x9c, 0x7f, 0x76, 0x74, 0x8b, 0xb4, 0xed, 0xfe, 0xad,
-	0x36, 0x46, 0x37, 0xcf, 0x75, 0x62, 0x68, 0x6a, 0x1b, 0xbb, 0x2d, 0xae, 0xf1, 0xd9, 0x51, 0x0d,
-	0x4f, 0x6f, 0x13, 0xd7, 0xc3, 0x6d, 0xdb, 0x57, 0x90, 0x3f, 0x8e, 0x02, 0x1c, 0x37, 0x1a, 0x1d,
-	0xc7, 0x21, 0x66, 0x83, 0x20, 0x04, 0xf3, 0x26, 0x6e, 0x93, 0x94, 0xb4, 0x21, 0xdd, 0x8e, 0x29,
-	0xec, 0x19, 0xbd, 0x00, 0xcb, 0x0e, 0x71, 0xad, 0x8e, 0xd3, 0x20, 0x6a, 0xc7, 0x31, 0x52, 0x73,
-	0x6c, 0x2f, 0x2e, 0x64, 0xa7, 0x8e, 0x81, 0x9e, 0x85, 0x98, 0x69, 0x79, 0x44, 0x65, 0x67, 0x23,
-	0x6c, 0x7f, 0x89, 0x0a, 0x8e, 0xe8, 0xf9, 0x0a, 0xcc, 0xb7, 0x74, 0x53, 0x4b, 0x2d, 0x6e, 0x48,
-	0xb7, 0x57, 0xb7, 0xef, 0x66, 0xa6, 0x4f, 0xcf, 0xcc, 0x91, 0xe5, 0x91, 0xcc, 0xbe, 0x6e, 0x6a,
-	0x0a, 0x83, 0x40, 0x1f, 0x48, 0x70, 0x6b, 0xe8, 0xf5, 0xaa, 0x1a, 0xf1, 0xb0, 0x6e, 0xb8, 0xa9,
-	0xa5, 0x0d, 0xe9, 0x76, 0x7c, 0x5b, 0x09, 0x03, 0x7e, 0x16, 0x04, 0x3a, 0xe9, 0xd9, 0x64, 0x58,
-	0x52, 0xf4, 0x91, 0x1f, 0xdc, 0x50, 0x6e, 0x76, 0x27, 0xc8, 0x91, 0x0a, 0x2b, 0xf5, 0x8e, 0x6e,
-	0x68, 0x7d, 0x17, 0xa2, 0xcc, 0x85, 0xaf, 0x86, 0x71, 0x21, 0x4f, 0x01, 0x06, 0x86, 0x96, 0xeb,
-	0x81, 0x35, 0x3a, 0x87, 0x15, 0x8d, 0x38, 0x7a, 0x97, 0x68, 0x2a, 0x2b, 0x8c, 0x54, 0x9c, 0x19,
-	0xb8, 0x1f, 0xc6, 0x40, 0xd1, 0x6a, 0xb4, 0x88, 0x53, 0xa1, 0xc7, 0x33, 0x45, 0x1f, 0x8c, 0xda,
-	0xe1, 0xb8, 0x4c, 0x8e, 0xda, 0xb0, 0xac, 0x9b, 0xae, 0x87, 0x0d, 0x83, 0x25, 0x65, 0x6a, 0x99,
-	0x99, 0x29, 0x87, 0x31, 0x53, 0xf5, 0x4b, 0xef, 0x10, 0x9b, 0xb8, 0x49, 0x9c, 0x4c, 0x25, 0x00,
-	0x47, 0xcd, 0x05, 0xe1, 0x51, 0x03, 0x40, 0x23, 0xb6, 0x61, 0xf5, 0xda, 0xc4, 0xf4, 0x52, 0xab,
-	0xcc, 0x58, 0x2e, 0xd4, 0x9d, 0xd8, 0x69, 0x5c, 0x37, 0x08, 0x7f, 0xa4, 0x40, 0x0f, 0x6e, 0x28,
-	0x01, 0x58, 0x54, 0x07, 0xd0, 0x74, 0xb7, 0x61, 0x75, 0x89, 0x43, 0xb4, 0xd4, 0x1a, 0x33, 0xf2,
-	0x46, 0x28, 0x23, 0xfc, 0x74, 0xaf, 0xff, 0xc4, 0x22, 0x17, 0x40, 0x45, 0x1b, 0x10, 0x77, 0x48,
-	0x9b, 0x68, 0xba, 0x1f, 0xb6, 0x05, 0x51, 0x16, 0x7d, 0x11, 0xda, 0x85, 0x78, 0xc3, 0x21, 0xd8,
-	0x23, 0x2a, 0x2d, 0xbb, 0x54, 0x8c, 0xb9, 0x91, 0x16, 0x6e, 0x88, 0x9a, 0xcc, 0x9c, 0x88, 0x9a,
-	0x54, 0xc0, 0x57, 0xa7, 0x02, 0x7a, 0xb8, 0x63, 0x6b, 0xfd, 0xc3, 0x70, 0xf5, 0x61, 0x5f, 0x9d,
-	0x0a, 0xf2, 0x31, 0x88, 0xf2, 0xb4, 0x94, 0xff, 0x1b, 0x83, 0x79, 0x5a, 0x47, 0x13, 0x6b, 0xfb,
-	0x0e, 0x24, 0xdd, 0x77, 0x2d, 0xc7, 0x53, 0x35, 0xe2, 0x36, 0x1c, 0xdd, 0x66, 0x37, 0xf1, 0x0b,
-	0x38, 0xc1, 0x36, 0x8a, 0x03, 0x39, 0x7a, 0x05, 0x12, 0xb4, 0x8d, 0x0d, 0xe9, 0xce, 0x33, 0xdd,
-	0x35, 0x2a, 0x0f, 0xaa, 0x8a, 0x9a, 0x8f, 0xcd, 0x5e, 0xf3, 0x26, 0xa0, 0xe1, 0x92, 0xf7, 0x7a,
-	0x36, 0x61, 0xcd, 0x24, 0xbe, 0x7d, 0x6f, 0xa6, 0x7a, 0x7f, 0x70, 0x43, 0x49, 0x76, 0x47, 0x85,
-	0xe8, 0x0c, 0xc0, 0xaf, 0x6b, 0x66, 0xc7, 0xef, 0x2b, 0x77, 0x43, 0x17, 0x35, 0xc7, 0x8f, 0xd5,
-	0xc5, 0x02, 0xbd, 0x03, 0x50, 0xc7, 0x2e, 0xe1, 0xb5, 0xbc, 0x12, 0xde, 0xff, 0x60, 0x2d, 0xe7,
-	0xe9, 0x8c, 0x64, 0xf8, 0xd8, 0x25, 0x7e, 0x19, 0xbf, 0x03, 0x51, 0x3e, 0x01, 0x79, 0x51, 0xe5,
-	0x67, 0xa8, 0x60, 0xbe, 0x7c, 0x70, 0x43, 0x11, 0xa0, 0xe8, 0xa1, 0xa8, 0x5b, 0x5a, 0x79, 0xa9,
-	0x24, 0x33, 0xf1, 0x95, 0xeb, 0xd5, 0xed, 0xa0, 0x58, 0xe9, 0x0a, 0x9d, 0x42, 0x4c, 0x94, 0x55,
-	0x2f, 0x85, 0xc2, 0x07, 0xbc, 0x5f, 0xab, 0x34, 0x20, 0x7d, 0x24, 0xf4, 0x36, 0xad, 0x4f, 0x03,
-	0x7b, 0x44, 0x63, 0x63, 0x2b, 0xba, 0x11, 0xb9, 0x1d, 0xdf, 0xde, 0x0d, 0x9d, 0x8a, 0x8a, 0x8f,
-	0x71, 0xea, 0x18, 0x0a, 0x38, 0xfd, 0x67, 0x54, 0x80, 0x35, 0xf2, 0x9e, 0xad, 0xfb, 0x83, 0x7c,
-	0xda, 0x12, 0x5d, 0x1d, 0x1c, 0x11, 0x35, 0x1e, 0x6c, 0x10, 0xf1, 0x59, 0x1a, 0xc4, 0x72, 0x98,
-	0x06, 0x91, 0x7e, 0x15, 0x60, 0x70, 0x31, 0x94, 0x80, 0x08, 0x0d, 0x91, 0xdf, 0x19, 0xe8, 0x23,
-	0xba, 0x09, 0x0b, 0x06, 0xae, 0x13, 0x31, 0xed, 0xfd, 0x85, 0xfc, 0x13, 0x09, 0xe6, 0x69, 0x69,
-	0xa2, 0x9b, 0x90, 0xd8, 0xaf, 0x1c, 0x15, 0xd5, 0xd3, 0xa3, 0x5a, 0xb5, 0x54, 0xa8, 0xec, 0x55,
-	0x4a, 0xc5, 0xc4, 0x0d, 0xf4, 0x0c, 0xdc, 0xaa, 0xe6, 0x0a, 0xfb, 0xb9, 0x72, 0x49, 0x3d, 0x3b,
-	0x3d, 0x38, 0x2a, 0x29, 0xb9, 0x7c, 0xe5, 0xa0, 0x72, 0xf2, 0x28, 0x31, 0x87, 0x92, 0xb0, 0x92,
-	0x3f, 0xad, 0x1c, 0x14, 0xd5, 0x62, 0xe9, 0x24, 0x57, 0x39, 0xa8, 0x25, 0x22, 0x68, 0x0d, 0xe2,
-	0x95, 0x43, 0xaa, 0x9b, 0xcf, 0xd5, 0x2a, 0xb5, 0xc4, 0x3c, 0x7a, 0x0a, 0xd6, 0xc4, 0xf1, 0xc3,
-	0xdc, 0x51, 0xae, 0x5c, 0x52, 0x12, 0x0b, 0x68, 0x15, 0xa0, 0x58, 0xaa, 0x1e, 0x1c, 0x3f, 0xca,
-	0xe5, 0x0f, 0x4a, 0x89, 0x45, 0xb4, 0x02, 0xb1, 0x62, 0xa5, 0x56, 0x38, 0x3e, 0x2b, 0x29, 0x8f,
-	0x12, 0xd1, 0x7c, 0x9c, 0x33, 0x0f, 0x5a, 0xac, 0xf2, 0xbf, 0x23, 0x00, 0x83, 0x2c, 0x1b, 0x21,
-	0x2e, 0x7a, 0x4a, 0xda, 0x88, 0x0c, 0x13, 0x17, 0x3d, 0xfd, 0xa7, 0xfe, 0x09, 0x36, 0x36, 0x9e,
-	0x07, 0xe8, 0xb8, 0xc4, 0x51, 0x49, 0x1b, 0xeb, 0x22, 0x1c, 0x31, 0x2a, 0x29, 0x51, 0x01, 0x8d,
-	0xb8, 0x9f, 0xb6, 0x7e, 0xc4, 0xe7, 0xae, 0x8e, 0xb8, 0xaf, 0xce, 0x5e, 0xd7, 0x7d, 0x58, 0xe9,
-	0x98, 0xc1, 0xe3, 0x91, 0x2b, 0x8f, 0x2f, 0x8b, 0x03, 0x0c, 0xe0, 0x69, 0x58, 0x6c, 0x58, 0xe6,
-	0xb9, 0xde, 0x64, 0x4d, 0x29, 0xa6, 0xf0, 0x15, 0x4a, 0x41, 0x14, 0x6b, 0x9a, 0x43, 0x5c, 0x97,
-	0xcf, 0x20, 0xb1, 0x1c, 0x0b, 0xc0, 0xe2, 0x58, 0x00, 0xd0, 0x39, 0x2c, 0xd9, 0x06, 0xf6, 0xce,
-	0x2d, 0xa7, 0xcd, 0x08, 0xcc, 0xea, 0xf6, 0xd7, 0x67, 0x9e, 0xc5, 0x99, 0x2a, 0x47, 0x54, 0xfa,
-	0xd8, 0x72, 0x01, 0x96, 0x84, 0x14, 0xa5, 0xe0, 0x66, 0xf5, 0x20, 0x77, 0xb2, 0x77, 0xac, 0x1c,
-	0x8e, 0x24, 0x50, 0x14, 0x22, 0xe5, 0xfd, 0x52, 0x42, 0x42, 0x4b, 0x30, 0xbf, 0x77, 0x50, 0x7a,
-	0x98, 0x98, 0x43, 0x00, 0x8b, 0x85, 0xd3, 0xda, 0xc9, 0xf1, 0x61, 0x22, 0x22, 0xff, 0x59, 0x82,
-	0x58, 0xbf, 0xd8, 0xd1, 0x9b, 0xb0, 0x22, 0x1c, 0x52, 0xd9, 0xb0, 0x91, 0x66, 0x19, 0x36, 0xcb,
-	0x62, 0x93, 0xae, 0xd2, 0x15, 0x80, 0xc1, 0xdc, 0x47, 0xbb, 0x10, 0xeb, 0x73, 0x76, 0x66, 0x25,
-	0xbe, 0xfd, 0xbc, 0xb0, 0x12, 0x20, 0xf6, 0x99, 0x63, 0xa1, 0xa4, 0x0c, 0xf4, 0xe5, 0x1f, 0x4b,
-	0x10, 0xeb, 0x8f, 0x04, 0xf4, 0x32, 0xac, 0xb1, 0x91, 0x40, 0x1c, 0xb5, 0x4b, 0x1c, 0x57, 0x00,
-	0xc6, 0x94, 0x55, 0x2e, 0x3e, 0xf3, 0xa5, 0xe8, 0x21, 0xc4, 0x5c, 0xbd, 0x69, 0x62, 0xaf, 0xe3,
-	0x88, 0x4c, 0xdb, 0x09, 0x3d, 0x85, 0x6a, 0x02, 0x41, 0x19, 0x80, 0xc9, 0x3f, 0x9a, 0x83, 0xd5,
-	0xe1, 0x5d, 0x9a, 0xf7, 0x76, 0xa7, 0x6e, 0xe8, 0x0d, 0xb5, 0x45, 0x7a, 0x22, 0xef, 0x7d, 0xc9,
-	0x3e, 0xe9, 0xa1, 0xe7, 0x46, 0x7d, 0x89, 0x05, 0xf0, 0xd0, 0x2d, 0x58, 0x6c, 0x91, 0x9e, 0xaa,
-	0x6b, 0x9c, 0x38, 0x2c, 0xb4, 0x48, 0xaf, 0xa2, 0xa1, 0x6f, 0xc0, 0x12, 0x15, 0xb3, 0x29, 0x3a,
-	0xcf, 0xde, 0x4c, 0xfe, 0xfa, 0xfe, 0x67, 0xf6, 0x09, 0x9b, 0xce, 0x4a, 0xb4, 0xe5, 0x3f, 0xc8,
-	0x0f, 0x20, 0xca, 0x65, 0x34, 0x9f, 0xf6, 0x4b, 0x8f, 0xd4, 0x93, 0x47, 0xd5, 0xd2, 0x48, 0x3e,
-	0xdd, 0x82, 0x64, 0xb5, 0x5c, 0x55, 0x73, 0xb5, 0x42, 0xa5, 0xa2, 0xe6, 0x94, 0xc3, 0x63, 0xa5,
-	0x54, 0x4c, 0x48, 0x68, 0x19, 0x96, 0xaa, 0xfb, 0x95, 0x87, 0x6a, 0xb5, 0x74, 0x98, 0x98, 0x93,
-	0x7f, 0x21, 0xc1, 0x72, 0x90, 0x88, 0xa3, 0xb7, 0x00, 0x06, 0xdf, 0x80, 0xfc, 0x7d, 0xef, 0x86,
-	0xf6, 0xbd, 0xda, 0x87, 0x50, 0x02, 0x70, 0x94, 0x44, 0x0d, 0x56, 0x6a, 0xbd, 0xe7, 0x11, 0x97,
-	0x87, 0x74, 0x6d, 0x20, 0xcf, 0x53, 0xb1, 0xbc, 0x09, 0x37, 0xcb, 0xc4, 0x1b, 0x7c, 0x9d, 0x29,
-	0xe4, 0x5b, 0x1d, 0xe2, 0x7a, 0x93, 0x88, 0x9c, 0xfc, 0x4b, 0x09, 0x9e, 0x3e, 0xd0, 0xdd, 0x80,
-	0xb6, 0x7b, 0x89, 0x3a, 0xed, 0x25, 0x36, 0x76, 0x28, 0x01, 0xf7, 0x5b, 0x06, 0x5f, 0x51, 0xf9,
-	0xb9, 0x6e, 0x78, 0xc4, 0xe1, 0x3e, 0xf1, 0x15, 0xfd, 0xc0, 0xb3, 0xe9, 0xb7, 0xb5, 0xab, 0x3f,
-	0xf6, 0x1b, 0xd7, 0x82, 0xb2, 0x44, 0x05, 0x35, 0xfd, 0xb1, 0x9f, 0x3d, 0x74, 0xd3, 0xb3, 0x5a,
-	0x44, 0x30, 0x42, 0xa6, 0x7e, 0x42, 0x05, 0xf2, 0xaf, 0x24, 0x58, 0x1f, 0x73, 0xcd, 0xb5, 0x2d,
-	0xd3, 0xa5, 0xa4, 0x22, 0x6e, 0x0d, 0xc4, 0xac, 0x43, 0x87, 0x64, 0x15, 0x81, 0xf0, 0x04, 0xa1,
-	0xd0, 0xe7, 0x61, 0xcd, 0x24, 0xef, 0x79, 0x6a, 0xc0, 0x33, 0xff, 0x4a, 0x2b, 0x54, 0x5c, 0xed,
-	0x7b, 0xf7, 0x45, 0x58, 0x2f, 0x12, 0x83, 0x78, 0x64, 0xba, 0x38, 0xff, 0x5a, 0x82, 0xf5, 0x02,
-	0x9b, 0xc1, 0x53, 0xe9, 0x07, 0x02, 0x1d, 0x19, 0x0a, 0xf4, 0x19, 0xc0, 0xc0, 0x5b, 0x5e, 0xdf,
-	0xd7, 0xbd, 0x77, 0x00, 0x49, 0xfe, 0x9b, 0x04, 0xeb, 0xa7, 0x6c, 0xcc, 0x4f, 0xe7, 0xdf, 0x27,
-	0xe4, 0x47, 0x80, 0x9c, 0xb4, 0xb1, 0xdb, 0xba, 0x70, 0xd6, 0xed, 0xe9, 0xc4, 0xd0, 0x0e, 0xb1,
-	0xdb, 0x12, 0xe4, 0x84, 0x3e, 0xcb, 0x9f, 0x83, 0xd5, 0x32, 0xf1, 0x68, 0x6f, 0xbe, 0xec, 0x55,
-	0x64, 0x20, 0x35, 0x54, 0x1e, 0x57, 0xe9, 0xff, 0x4c, 0x82, 0x04, 0xcd, 0x43, 0xaa, 0xf7, 0xa9,
-	0x29, 0x8e, 0xef, 0x4a, 0x90, 0x0c, 0x38, 0xc5, 0xcb, 0x62, 0x0f, 0x16, 0x28, 0xab, 0x11, 0x05,
-	0xf1, 0xa5, 0xb0, 0x23, 0x4d, 0xf1, 0x8f, 0x4f, 0x5d, 0x04, 0x2f, 0x43, 0xd2, 0x2f, 0x82, 0xab,
-	0x62, 0xf8, 0x1b, 0x09, 0x92, 0x7e, 0xfa, 0x5f, 0xa1, 0x19, 0x08, 0xe2, 0xfc, 0x50, 0x10, 0xd7,
-	0x21, 0xca, 0x08, 0x9b, 0xae, 0x89, 0x28, 0xd2, 0x65, 0x45, 0x43, 0x45, 0x98, 0xa7, 0x4f, 0x3c,
-	0x55, 0xc2, 0x5f, 0x99, 0x9d, 0x96, 0xff, 0x28, 0x41, 0xd2, 0xcf, 0xff, 0xab, 0x1c, 0x14, 0xf6,
-	0xe6, 0x66, 0xb1, 0x37, 0x5b, 0x9e, 0x7f, 0x4f, 0x82, 0xb4, 0x78, 0xf9, 0xd3, 0x37, 0xee, 0x27,
-	0x9e, 0x83, 0xbf, 0x95, 0xe0, 0xd9, 0x89, 0x6e, 0x7c, 0x6a, 0x9a, 0xf4, 0xf7, 0x25, 0x48, 0xf6,
-	0xc9, 0xd5, 0x21, 0xf1, 0xb0, 0x86, 0x3d, 0x3c, 0xfa, 0xf5, 0x24, 0x85, 0xfa, 0x7a, 0xba, 0x0b,
-	0x4b, 0xc4, 0xd4, 0xa6, 0x25, 0xf2, 0x51, 0x62, 0x6a, 0x74, 0x25, 0xd7, 0xe0, 0x85, 0x32, 0xf1,
-	0xce, 0x3a, 0x86, 0xf9, 0x38, 0x10, 0xaa, 0x5a, 0xa7, 0xdd, 0xc6, 0x4e, 0x4f, 0xbc, 0xb8, 0x41,
-	0xee, 0x4b, 0xd3, 0x34, 0x10, 0xf9, 0xf7, 0x73, 0x20, 0x5f, 0x86, 0xca, 0xdf, 0x83, 0x47, 0x3f,
-	0x00, 0x3a, 0xa6, 0x27, 0x5e, 0xc1, 0xdb, 0x61, 0x5e, 0xc1, 0xd5, 0xf8, 0x99, 0x1a, 0xe9, 0x12,
-	0x47, 0xf7, 0x7a, 0x05, 0x6a, 0x44, 0xe1, 0xb6, 0xd2, 0x1f, 0x48, 0xb0, 0x32, 0xb4, 0x83, 0xea,
-	0xb0, 0xe4, 0x72, 0x01, 0xe7, 0xdc, 0x7b, 0xb3, 0xfd, 0xdd, 0x55, 0xc0, 0x2b, 0x7d, 0x5c, 0xfa,
-	0xfd, 0xc9, 0xec, 0xb3, 0x48, 0x45, 0x14, 0x7f, 0xb1, 0xfd, 0x87, 0x75, 0x48, 0x16, 0x04, 0x72,
-	0x8e, 0x23, 0xa3, 0xbf, 0x4a, 0xb0, 0x32, 0x34, 0x09, 0xd0, 0x1b, 0x21, 0x23, 0x33, 0x36, 0x2b,
-	0xd3, 0xd7, 0x4c, 0x6f, 0x79, 0xeb, 0x3b, 0xff, 0xfa, 0xcf, 0xcf, 0xe7, 0xee, 0xa0, 0x57, 0x06,
-	0xff, 0x9f, 0xf0, 0x6d, 0x5a, 0xb8, 0xf7, 0x6c, 0xc7, 0xfa, 0x26, 0x69, 0x78, 0x6e, 0x76, 0x33,
-	0x1b, 0xa8, 0x80, 0xec, 0xe6, 0xfb, 0xe8, 0x1f, 0x12, 0xac, 0x8d, 0xf0, 0x23, 0x14, 0x8a, 0x2a,
-	0x4f, 0xe6, 0x7d, 0xe9, 0xc2, 0x4c, 0x18, 0x7e, 0x4e, 0x4c, 0xbc, 0x8f, 0x9f, 0xcd, 0x81, 0x1b,
-	0xbd, 0x1f, 0xbc, 0x12, 0xfa, 0x50, 0x82, 0xc4, 0x28, 0xa5, 0x42, 0x85, 0x70, 0x5f, 0x95, 0x13,
-	0x09, 0x59, 0xfa, 0xe9, 0xb1, 0x0a, 0x2d, 0xb5, 0x6d, 0xaf, 0x27, 0x9c, 0xdc, 0x0c, 0x11, 0xf4,
-	0x7f, 0x4a, 0x90, 0x18, 0xe5, 0x71, 0xe1, 0x9c, 0xbc, 0x80, 0x05, 0x5e, 0x3b, 0x73, 0xee, 0xb1,
-	0x4b, 0xbc, 0x26, 0x4f, 0x1f, 0xe9, 0x9d, 0x20, 0xe1, 0xa2, 0x17, 0x1a, 0x25, 0x7e, 0xe1, 0x2e,
-	0x74, 0x01, 0x6d, 0x9c, 0xf5, 0x42, 0xdb, 0xd3, 0xbf, 0x95, 0xa1, 0x0b, 0xfd, 0x5d, 0x82, 0xe4,
-	0x18, 0xbf, 0x43, 0xc5, 0x6b, 0x57, 0x76, 0x80, 0x0f, 0xa4, 0x43, 0x4f, 0x7b, 0xf9, 0x35, 0x76,
-	0x99, 0x2d, 0x94, 0x9d, 0xfa, 0x32, 0x59, 0x9f, 0x82, 0xfd, 0x4e, 0x82, 0x28, 0x27, 0xb3, 0x68,
-	0x27, 0xa4, 0xf3, 0xb3, 0xb9, 0x7c, 0x87, 0xb9, 0xfc, 0x12, 0x7a, 0xf1, 0x12, 0x97, 0x99, 0x8f,
-	0xb4, 0x1e, 0xfe, 0x22, 0x41, 0xac, 0xcf, 0x43, 0xd1, 0xeb, 0x61, 0x5b, 0x47, 0x90, 0x53, 0xa7,
-	0xef, 0x5d, 0xf3, 0x34, 0x6f, 0x39, 0x93, 0xfc, 0x9e, 0x50, 0x08, 0x7e, 0x78, 0x7f, 0x2a, 0x01,
-	0x0c, 0xa8, 0x2b, 0xba, 0x17, 0xbe, 0xcd, 0x04, 0x83, 0x7c, 0x51, 0x83, 0xe1, 0x2e, 0x6d, 0x4e,
-	0x15, 0xca, 0x8f, 0x24, 0x80, 0x01, 0x47, 0x0e, 0xe7, 0xd2, 0x18, 0xb7, 0xbe, 0xc6, 0x7b, 0xe7,
-	0xdd, 0x50, 0x9e, 0x26, 0x7e, 0x3b, 0x3e, 0x8b, 0xa5, 0x2e, 0x0f, 0x58, 0x73, 0x38, 0x97, 0xc7,
-	0xd8, 0xf6, 0xf5, 0x5d, 0xde, 0x9e, 0x26, 0xbe, 0xdc, 0xe5, 0x8f, 0x25, 0x78, 0x6a, 0x02, 0x69,
-	0x45, 0x7b, 0xd7, 0x49, 0xbe, 0x09, 0xd3, 0xb3, 0x3c, 0x33, 0x0e, 0x4f, 0xe7, 0x69, 0x3a, 0x87,
-	0xb8, 0xdb, 0xd0, 0x1c, 0xfd, 0x9f, 0x04, 0xe9, 0x8b, 0x59, 0x1b, 0x3a, 0x7c, 0x52, 0xec, 0xcf,
-	0xbf, 0xef, 0xd1, 0x93, 0x25, 0x93, 0xf2, 0x36, 0xbb, 0xf6, 0x17, 0xd0, 0xe6, 0xe5, 0x59, 0xd8,
-	0xa5, 0x30, 0x2e, 0xbf, 0xd2, 0x0f, 0x24, 0x58, 0xae, 0x11, 0xaf, 0x82, 0xdb, 0x55, 0xf6, 0x1b,
-	0x0a, 0x24, 0x0b, 0xa7, 0x74, 0xdc, 0xce, 0x74, 0xb7, 0x32, 0xc1, 0x4d, 0xe1, 0xf8, 0xad, 0x11,
-	0x1d, 0x7f, 0x57, 0xbe, 0xcf, 0xec, 0x7f, 0x4d, 0x7e, 0x35, 0x60, 0x5f, 0xfc, 0xe1, 0x7b, 0x62,
-	0x5a, 0xb9, 0x01, 0xec, 0x1d, 0x69, 0x93, 0x39, 0x53, 0xbe, 0xcc, 0x99, 0xf2, 0x27, 0xe8, 0x4c,
-	0x73, 0xc4, 0x99, 0x8f, 0x24, 0x40, 0x27, 0xc4, 0x65, 0x42, 0xe2, 0xb4, 0x75, 0xd7, 0xd5, 0x2d,
-	0xd3, 0x45, 0xb7, 0x47, 0xcc, 0x8d, 0xab, 0x08, 0xc7, 0x5e, 0x99, 0x42, 0x93, 0xbf, 0xb9, 0x12,
-	0x73, 0xf6, 0xbe, 0xbc, 0x33, 0xad, 0xb3, 0xde, 0x18, 0xd6, 0x8e, 0xb4, 0x99, 0xff, 0xa1, 0x04,
-	0x2f, 0x35, 0xac, 0xb6, 0xb0, 0x7b, 0x71, 0x36, 0x55, 0xa5, 0x37, 0xdf, 0xe2, 0x4a, 0x4d, 0xcb,
-	0xc0, 0x66, 0x33, 0x63, 0x39, 0xcd, 0x6c, 0x93, 0x98, 0xac, 0x09, 0x67, 0xfd, 0x2d, 0x6c, 0xeb,
-	0xee, 0x34, 0xbf, 0xde, 0xd9, 0x1d, 0xdb, 0xfa, 0x70, 0x2e, 0x52, 0x2e, 0xe4, 0xea, 0x8b, 0x0c,
-	0xed, 0xcb, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x50, 0x37, 0x6f, 0x01, 0x62, 0x25, 0x00, 0x00,
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/containeranalysis.proto", fileDescriptor_containeranalysis_7302a99efbbe81f1)
+}
+
+var fileDescriptor_containeranalysis_7302a99efbbe81f1 = []byte{
+	// 3256 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5b, 0xdb, 0x6f, 0x23, 0x57,
+	0x19, 0xdf, 0xc9, 0xd5, 0xfe, 0x9c, 0x8b, 0x73, 0x36, 0xbb, 0xeb, 0x7a, 0x7b, 0x49, 0xa7, 0x94,
+	0x6e, 0x53, 0x6a, 0x77, 0xd3, 0x96, 0xc2, 0x6e, 0x97, 0x5d, 0xc7, 0x76, 0x12, 0x37, 0x89, 0x63,
+	0xcd, 0x38, 0x61, 0xd3, 0x96, 0x8e, 0xc6, 0xf6, 0x89, 0x33, 0x64, 0x3c, 0x33, 0xcc, 0x8c, 0xc3,
+	0x66, 0x51, 0x25, 0x44, 0x0b, 0xa8, 0x12, 0x45, 0xe5, 0xfa, 0xc2, 0xa5, 0x52, 0x41, 0x95, 0x80,
+	0x17, 0x5e, 0x78, 0x83, 0x17, 0x40, 0x3c, 0x01, 0x42, 0xe2, 0x19, 0xf1, 0x00, 0x0f, 0xfc, 0x0b,
+	0x48, 0x3c, 0xa0, 0x73, 0xe6, 0x9c, 0x99, 0xf1, 0x25, 0x89, 0xc7, 0xde, 0x4a, 0x7d, 0xda, 0x39,
+	0xdf, 0xf9, 0xce, 0x77, 0x3b, 0xdf, 0xf9, 0x9d, 0xef, 0x3b, 0xf1, 0xc2, 0x6a, 0xd3, 0x34, 0x9b,
+	0x3a, 0xce, 0x36, 0xf0, 0xb1, 0x6b, 0x9a, 0xba, 0x93, 0xad, 0x9b, 0x86, 0xab, 0x6a, 0x06, 0xb6,
+	0x55, 0x43, 0xd5, 0x4f, 0x1c, 0xcd, 0xc9, 0x1e, 0x5f, 0x57, 0x75, 0xeb, 0x50, 0xbd, 0xde, 0x3b,
+	0x95, 0xb1, 0x6c, 0xd3, 0x35, 0xd1, 0xb2, 0x27, 0x23, 0xc3, 0x65, 0x64, 0x7a, 0x19, 0xb9, 0x8c,
+	0xf4, 0xc3, 0x4c, 0x9f, 0x6a, 0x69, 0x59, 0xd5, 0x30, 0x4c, 0x57, 0x75, 0x35, 0xd3, 0x60, 0x92,
+	0xd2, 0x51, 0xac, 0xa9, 0x69, 0xba, 0xae, 0x98, 0x07, 0x4a, 0x4b, 0x75, 0xb1, 0xad, 0xa9, 0x3a,
+	0x97, 0xf1, 0x72, 0x04, 0x19, 0x5a, 0x4b, 0x6d, 0x62, 0xa5, 0xa6, 0xfa, 0xbe, 0xa4, 0xd7, 0x22,
+	0xac, 0xb6, 0xd4, 0xfa, 0x11, 0x59, 0x7f, 0xdc, 0xd6, 0xc9, 0x7c, 0x4d, 0xd3, 0x35, 0xf7, 0x84,
+	0xc9, 0xb9, 0x19, 0x45, 0x8e, 0x6d, 0x1e, 0x63, 0x43, 0x35, 0xea, 0x98, 0x2d, 0x7e, 0x94, 0x2d,
+	0xd6, 0xd4, 0x56, 0xf6, 0xf8, 0x3a, 0xf9, 0x47, 0xb1, 0x4c, 0x5d, 0xab, 0x73, 0xe1, 0xe9, 0xce,
+	0xf9, 0x8e, 0xb9, 0x27, 0xd8, 0x9c, 0x6e, 0x1a, 0x4d, 0xbb, 0x6d, 0x18, 0x9a, 0xd1, 0xcc, 0x9a,
+	0x16, 0xb6, 0x3b, 0xe2, 0xfc, 0x10, 0x63, 0xa2, 0xa3, 0x5a, 0xfb, 0x20, 0xab, 0x1a, 0x7c, 0xfd,
+	0xd5, 0xee, 0x29, 0xdc, 0xb2, 0x7c, 0xaf, 0x96, 0xba, 0x27, 0x0f, 0x34, 0xac, 0x37, 0x94, 0x96,
+	0xea, 0x1c, 0x31, 0x8e, 0xc7, 0xba, 0x39, 0x5c, 0xad, 0x85, 0x1d, 0x57, 0x6d, 0x59, 0x8c, 0xe1,
+	0x0a, 0x63, 0xb0, 0xad, 0x7a, 0xd6, 0x71, 0x55, 0xb7, 0xcd, 0x6c, 0x12, 0x7f, 0x16, 0x07, 0xd8,
+	0xa9, 0xd7, 0xdb, 0xb6, 0x8d, 0x8d, 0x3a, 0x46, 0x08, 0x26, 0x0c, 0xb5, 0x85, 0x53, 0xc2, 0x92,
+	0x70, 0x2d, 0x2e, 0xd1, 0x6f, 0xf4, 0x38, 0xcc, 0xd8, 0xd8, 0x31, 0xdb, 0x76, 0x1d, 0x2b, 0x6d,
+	0x5b, 0x4f, 0x8d, 0xd1, 0xb9, 0x04, 0xa7, 0xed, 0xda, 0x3a, 0xaa, 0x40, 0x8c, 0x0f, 0x53, 0x0b,
+	0x4b, 0xc2, 0xb5, 0xc4, 0xca, 0x0b, 0x99, 0xc1, 0xd3, 0x33, 0x23, 0xb1, 0xb5, 0x92, 0x2f, 0x05,
+	0x5d, 0x85, 0xb8, 0x61, 0xba, 0x58, 0xa1, 0xd6, 0x8c, 0x53, 0x8d, 0x31, 0x42, 0x28, 0x13, 0x8b,
+	0x4a, 0x30, 0x71, 0xa4, 0x19, 0x8d, 0xd4, 0xd4, 0x92, 0x70, 0x6d, 0x6e, 0xe5, 0xc5, 0x28, 0xaa,
+	0xca, 0xa6, 0x8b, 0x33, 0x9b, 0x9a, 0xd1, 0x90, 0xa8, 0x08, 0xf4, 0x8e, 0x00, 0x97, 0x3a, 0x32,
+	0x49, 0x69, 0x60, 0x57, 0xd5, 0x74, 0x27, 0x15, 0xa3, 0x7e, 0x48, 0x51, 0x84, 0xef, 0x85, 0x05,
+	0x55, 0x4f, 0x2c, 0xdc, 0x49, 0x29, 0x78, 0x92, 0x37, 0x2e, 0x48, 0x8b, 0xc7, 0x7d, 0xe8, 0x48,
+	0x81, 0xd9, 0x5a, 0x5b, 0xd3, 0x1b, 0xbe, 0x09, 0xd3, 0xd4, 0x84, 0xcf, 0x44, 0x31, 0x61, 0x95,
+	0x08, 0x08, 0x14, 0xcd, 0xd4, 0x42, 0x63, 0x74, 0x00, 0xb3, 0x0d, 0x6c, 0x6b, 0xc7, 0xb8, 0xa1,
+	0xd0, 0x33, 0x98, 0x4a, 0x50, 0x05, 0xb7, 0xa3, 0x28, 0x28, 0x98, 0xf5, 0x23, 0x6c, 0x97, 0xc8,
+	0xf2, 0x4c, 0xc1, 0x13, 0x46, 0xf4, 0x30, 0xb9, 0x94, 0x8e, 0x5a, 0x30, 0xa3, 0x19, 0x8e, 0xab,
+	0xea, 0x3a, 0xcd, 0xff, 0xd4, 0x0c, 0x55, 0xb3, 0x1e, 0x45, 0x4d, 0xc5, 0x3b, 0xe5, 0xdb, 0xaa,
+	0xa1, 0x36, 0xb1, 0x9d, 0x29, 0x85, 0xc4, 0x11, 0x75, 0x61, 0xf1, 0xa8, 0x0e, 0xd0, 0xc0, 0x96,
+	0x6e, 0x9e, 0xb4, 0xb0, 0xe1, 0xa6, 0xe6, 0xa8, 0xb2, 0x5c, 0x24, 0x9f, 0xe8, 0x6a, 0xb5, 0xa6,
+	0x63, 0xf6, 0x49, 0x04, 0x6d, 0x5c, 0x90, 0x42, 0x62, 0x51, 0x0d, 0xa0, 0xa1, 0x39, 0x75, 0xf3,
+	0x18, 0xdb, 0xb8, 0x91, 0x9a, 0xa7, 0x4a, 0xee, 0x44, 0x52, 0xc2, 0x56, 0x9f, 0xf8, 0x5f, 0x34,
+	0x72, 0x21, 0xa9, 0xc8, 0x82, 0x84, 0xea, 0xba, 0xe4, 0xe0, 0xd2, 0xb0, 0x25, 0xa9, 0x92, 0xad,
+	0x28, 0x4a, 0x72, 0xc1, 0xf2, 0x5c, 0xdb, 0x3d, 0x34, 0x6d, 0x82, 0x8d, 0x21, 0xe2, 0xc6, 0x05,
+	0x29, 0xac, 0x02, 0x2d, 0x41, 0xc2, 0xc6, 0x2d, 0xdc, 0xd0, 0x3c, 0x8d, 0x93, 0xfc, 0x68, 0xfb,
+	0x24, 0x74, 0x13, 0x12, 0x75, 0x1b, 0xab, 0x2e, 0x56, 0x08, 0xa6, 0xa4, 0xe2, 0xd4, 0xa6, 0x34,
+	0xb7, 0x89, 0x03, 0x4e, 0xa6, 0xca, 0x01, 0x47, 0x02, 0x8f, 0x9d, 0x10, 0xc8, 0xe2, 0xb6, 0xd5,
+	0xf0, 0x17, 0xc3, 0xf9, 0x8b, 0x3d, 0x76, 0x42, 0x58, 0x8d, 0xc3, 0x34, 0x3b, 0x08, 0xe2, 0xd7,
+	0x05, 0x88, 0x71, 0x90, 0xe8, 0x8b, 0x51, 0x49, 0x18, 0x6f, 0xdb, 0x1a, 0x83, 0x26, 0xf2, 0x89,
+	0x64, 0x98, 0x21, 0x71, 0xc2, 0x86, 0xab, 0x1c, 0xaa, 0xce, 0x21, 0xc5, 0x90, 0xc4, 0xca, 0x73,
+	0x51, 0x82, 0xb9, 0xa1, 0x3a, 0x87, 0x52, 0x82, 0x49, 0x21, 0x03, 0xf1, 0x7f, 0x00, 0x13, 0x04,
+	0x41, 0xfa, 0xda, 0xf0, 0x0c, 0x2c, 0x38, 0x87, 0xa6, 0xed, 0x2a, 0x0d, 0xec, 0xd4, 0x6d, 0xcd,
+	0xa2, 0x11, 0xf5, 0xa0, 0x2b, 0x49, 0x27, 0x0a, 0x01, 0x1d, 0x3d, 0x0d, 0x49, 0x72, 0x57, 0x74,
+	0xf0, 0x4e, 0x50, 0xde, 0x79, 0x42, 0x0f, 0xb3, 0x72, 0xb4, 0x8b, 0x8f, 0x8e, 0x76, 0x06, 0xa0,
+	0x4e, 0xb0, 0x73, 0x4f, 0x2c, 0x4c, 0x61, 0x34, 0xb1, 0x72, 0x6b, 0x24, 0xa4, 0xdb, 0xb8, 0x20,
+	0x2d, 0x1c, 0x77, 0x13, 0xd1, 0x1e, 0x80, 0x87, 0x68, 0x54, 0x8f, 0x87, 0xa8, 0x2f, 0x46, 0x86,
+	0x33, 0x26, 0x3f, 0x5e, 0xe3, 0x03, 0xf4, 0x06, 0x40, 0x4d, 0x75, 0x30, 0x43, 0xb1, 0xd9, 0xe8,
+	0xf6, 0x87, 0x51, 0x6c, 0x95, 0x14, 0x22, 0x54, 0xbe, 0xea, 0x60, 0x0f, 0xc0, 0xde, 0x80, 0x69,
+	0x56, 0x66, 0x30, 0x38, 0x59, 0x1d, 0x01, 0xbb, 0xd8, 0x70, 0xe3, 0x82, 0xc4, 0x85, 0xa2, 0xbb,
+	0x1c, 0xb1, 0x08, 0xe6, 0xb0, 0x1b, 0xf3, 0xd3, 0xc3, 0x21, 0x56, 0x00, 0x53, 0x64, 0x84, 0x76,
+	0x21, 0xce, 0x01, 0xe5, 0x24, 0x85, 0xa2, 0x07, 0xdc, 0x47, 0x29, 0x12, 0x10, 0x5f, 0x12, 0xfa,
+	0x32, 0x5c, 0x0a, 0xc1, 0x86, 0xa2, 0x72, 0x6c, 0x49, 0x5d, 0x8c, 0x0e, 0x84, 0xfd, 0x30, 0x8a,
+	0xdc, 0x89, 0x6a, 0x1f, 0x3a, 0x7a, 0x9d, 0x00, 0x94, 0xae, 0xba, 0xb8, 0x41, 0x6b, 0x8f, 0xe9,
+	0xa5, 0xf1, 0x6b, 0x89, 0x95, 0x9b, 0x91, 0xcf, 0x80, 0xe4, 0xc9, 0xd8, 0xb5, 0x75, 0x09, 0x6c,
+	0xff, 0x1b, 0xe5, 0x61, 0x1e, 0xdf, 0xb3, 0x34, 0xaf, 0x4c, 0x1b, 0x14, 0xa3, 0xe6, 0x82, 0x25,
+	0x1c, 0xe4, 0xc2, 0x08, 0x99, 0x18, 0x05, 0x21, 0x67, 0xa2, 0x20, 0x64, 0xfa, 0x05, 0x80, 0xc0,
+	0x31, 0x0f, 0x03, 0x75, 0x06, 0x49, 0xe4, 0x13, 0x2d, 0xc2, 0xa4, 0xae, 0xd6, 0x30, 0x2f, 0xd9,
+	0xbc, 0x81, 0xf8, 0x4b, 0x01, 0x26, 0x08, 0x26, 0xa0, 0x45, 0x48, 0x6e, 0x96, 0xca, 0x05, 0x65,
+	0xb7, 0x2c, 0x57, 0x8a, 0xf9, 0xd2, 0x5a, 0xa9, 0x58, 0x48, 0x5e, 0x40, 0x0f, 0xc1, 0xa5, 0x4a,
+	0x2e, 0xbf, 0x99, 0x5b, 0x2f, 0x2a, 0x7b, 0xbb, 0x5b, 0xe5, 0xa2, 0x94, 0x5b, 0x2d, 0x6d, 0x95,
+	0xaa, 0xfb, 0xc9, 0x31, 0xb4, 0x00, 0xb3, 0xab, 0xbb, 0xa5, 0xad, 0x82, 0x52, 0x28, 0x56, 0x73,
+	0xa5, 0x2d, 0x39, 0x39, 0x8e, 0xe6, 0x21, 0x51, 0xda, 0x26, 0xbc, 0xab, 0x39, 0xb9, 0x24, 0x27,
+	0x27, 0xd0, 0x45, 0x98, 0xe7, 0xcb, 0xb7, 0x73, 0xe5, 0xdc, 0x7a, 0x51, 0x4a, 0x4e, 0xa2, 0x39,
+	0x80, 0x42, 0xb1, 0xb2, 0xb5, 0xb3, 0x9f, 0x5b, 0xdd, 0x2a, 0x26, 0xa7, 0xd0, 0x2c, 0xc4, 0x0b,
+	0x25, 0x39, 0xbf, 0xb3, 0x57, 0x94, 0xf6, 0x93, 0xd3, 0x44, 0x65, 0xae, 0x5a, 0x2d, 0xca, 0xd5,
+	0x5c, 0xb5, 0xb4, 0x53, 0x56, 0x72, 0xbb, 0xd5, 0x8d, 0x1d, 0x89, 0xa8, 0x8c, 0xad, 0x26, 0x58,
+	0x1d, 0x48, 0x00, 0x44, 0xfc, 0xc7, 0x38, 0x40, 0x90, 0xf9, 0x5d, 0x85, 0xa9, 0x96, 0x12, 0x96,
+	0xc6, 0x3b, 0x0b, 0x53, 0x2d, 0xfd, 0x2b, 0x7f, 0x05, 0xbd, 0xc4, 0x1f, 0x01, 0x68, 0x3b, 0xd8,
+	0x56, 0x70, 0x4b, 0xd5, 0x78, 0xa4, 0xe2, 0x84, 0x52, 0x24, 0x04, 0xb2, 0x19, 0xde, 0x51, 0xf2,
+	0x36, 0x63, 0xec, 0xfc, 0xcd, 0xf0, 0xd8, 0xe9, 0x4e, 0xde, 0x86, 0xd9, 0xb6, 0x11, 0x5e, 0x3e,
+	0x7e, 0xee, 0xf2, 0x19, 0xbe, 0x80, 0x0a, 0xb8, 0x0c, 0x53, 0x75, 0xd3, 0x38, 0xd0, 0x9a, 0x14,
+	0x28, 0xe3, 0x12, 0x1b, 0xa1, 0x14, 0x4c, 0xab, 0x8d, 0x86, 0x8d, 0x1d, 0x87, 0xdd, 0xcf, 0x7c,
+	0xd8, 0x13, 0x80, 0xa9, 0x9e, 0x00, 0xa0, 0x03, 0x88, 0x59, 0xba, 0xea, 0x1e, 0x98, 0x76, 0x8b,
+	0x96, 0x93, 0x73, 0x2b, 0xaf, 0x8c, 0x5c, 0x19, 0x65, 0x2a, 0x4c, 0xa2, 0xe4, 0xcb, 0x16, 0xf3,
+	0x10, 0xe3, 0x54, 0x94, 0x82, 0xc5, 0xca, 0x56, 0xae, 0xba, 0xb6, 0x23, 0x6d, 0x77, 0xe5, 0xd6,
+	0x34, 0x8c, 0xaf, 0x6f, 0x16, 0x93, 0x02, 0x8a, 0xc1, 0xc4, 0xda, 0x56, 0xf1, 0x6e, 0x72, 0x0c,
+	0x01, 0x4c, 0xe5, 0x77, 0xe5, 0xea, 0xce, 0x76, 0x72, 0x5c, 0x7c, 0x67, 0x02, 0xe2, 0x3e, 0x00,
+	0xa1, 0x57, 0x61, 0x96, 0x1b, 0xa4, 0xd0, 0x0b, 0x50, 0x18, 0xe5, 0x02, 0x9c, 0xe1, 0x93, 0x64,
+	0x94, 0x7e, 0x9f, 0xe4, 0x45, 0x50, 0x78, 0xdd, 0x84, 0xb8, 0xdf, 0xad, 0x51, 0x35, 0x89, 0x95,
+	0x47, 0xb8, 0x9a, 0x50, 0x4b, 0x97, 0xd9, 0xe1, 0x4c, 0x52, 0xc0, 0x8f, 0xee, 0xc1, 0xbc, 0x6f,
+	0xa7, 0xd7, 0x5b, 0xd1, 0x7d, 0x9a, 0x5b, 0xd9, 0x19, 0xb5, 0x3c, 0xcc, 0xe4, 0x18, 0x9b, 0x4c,
+	0xc5, 0x4a, 0x73, 0x6a, 0xc7, 0x18, 0xad, 0xc1, 0xa5, 0x2e, 0xcd, 0x0a, 0xb6, 0x6d, 0xd3, 0x66,
+	0x37, 0x3a, 0xe2, 0xfa, 0x6d, 0xab, 0x9e, 0x61, 0x22, 0x2e, 0x76, 0x8a, 0x28, 0x12, 0x76, 0xf1,
+	0x3b, 0x02, 0xcc, 0x75, 0xaa, 0x42, 0x8f, 0xc1, 0xd5, 0x5c, 0x39, 0xb7, 0xb5, 0x2f, 0x97, 0x64,
+	0x85, 0x9c, 0xcb, 0x5d, 0xb9, 0x6b, 0x2b, 0x13, 0x30, 0x5d, 0x29, 0x96, 0x0b, 0xa5, 0xf2, 0x7a,
+	0x52, 0x40, 0x33, 0x10, 0x93, 0xf3, 0xb9, 0x72, 0x99, 0x8c, 0xc6, 0x08, 0xae, 0xac, 0x95, 0xca,
+	0x25, 0x79, 0xa3, 0x58, 0x50, 0xe4, 0xdd, 0x7c, 0xbe, 0x28, 0x13, 0xa4, 0xb8, 0x08, 0xf3, 0x3e,
+	0x75, 0x2d, 0x57, 0xda, 0x2a, 0x16, 0x92, 0x13, 0x24, 0x55, 0x76, 0xcb, 0xf2, 0x6e, 0xa5, 0xb2,
+	0x23, 0x55, 0x8b, 0x05, 0x45, 0x2a, 0xca, 0x3b, 0xbb, 0x52, 0xbe, 0x98, 0x9c, 0x14, 0xbf, 0x2d,
+	0x40, 0xdc, 0xbf, 0xfd, 0xd1, 0x53, 0x30, 0x4f, 0x6f, 0x7f, 0x6c, 0x2b, 0xc7, 0xd8, 0x76, 0xf8,
+	0x36, 0xc5, 0xa5, 0x39, 0x46, 0xde, 0xf3, 0xa8, 0xe8, 0x2e, 0xc4, 0x1d, 0xad, 0x69, 0xa8, 0x6e,
+	0xdb, 0xe6, 0x07, 0xf8, 0x46, 0xe4, 0x82, 0x43, 0xe6, 0x12, 0xa4, 0x40, 0x98, 0xf8, 0xee, 0x18,
+	0xcc, 0x75, 0xce, 0x12, 0x38, 0xb1, 0xda, 0x35, 0x5d, 0xab, 0x2b, 0x47, 0xf8, 0x84, 0xc3, 0x89,
+	0x47, 0xd9, 0xc4, 0x27, 0xe8, 0xe1, 0x6e, 0x5b, 0xe2, 0x21, 0x79, 0xe8, 0x12, 0x4c, 0x1d, 0xe1,
+	0x13, 0x45, 0x6b, 0xb0, 0x1a, 0x71, 0xf2, 0x08, 0x9f, 0x94, 0x1a, 0xe8, 0x0b, 0x10, 0x23, 0x64,
+	0x5a, 0x30, 0x4d, 0xd0, 0x34, 0x5a, 0x1d, 0xde, 0xfe, 0xcc, 0x26, 0xa6, 0x85, 0x98, 0x34, 0x7d,
+	0xe4, 0x7d, 0x88, 0x1b, 0x30, 0xcd, 0x68, 0x24, 0xf6, 0x9b, 0xc5, 0x7d, 0xa5, 0xba, 0x5f, 0x29,
+	0x76, 0xed, 0xed, 0x25, 0x58, 0xa8, 0xac, 0x57, 0x94, 0x9c, 0x9c, 0x2f, 0x95, 0x94, 0x9c, 0xb4,
+	0xbd, 0x23, 0x15, 0x0b, 0xde, 0x2e, 0x57, 0x36, 0x4b, 0x77, 0x95, 0x4a, 0x71, 0x3b, 0x39, 0x26,
+	0xfe, 0x60, 0x0c, 0x16, 0x2b, 0x4d, 0x8b, 0xe8, 0xc2, 0x8d, 0xd0, 0x9d, 0xde, 0xe9, 0xb6, 0xd0,
+	0xed, 0xb6, 0x19, 0xd4, 0xe5, 0xd4, 0xc7, 0x71, 0xea, 0x63, 0xa4, 0x26, 0xa7, 0x9f, 0xd6, 0x4c,
+	0xde, 0x13, 0x4a, 0xbd, 0xe5, 0x35, 0x3b, 0x75, 0xf3, 0x51, 0x00, 0xab, 0x69, 0x29, 0x2c, 0xd6,
+	0x74, 0x1b, 0x36, 0x2e, 0x48, 0x31, 0xab, 0x69, 0x6d, 0x92, 0x80, 0x8b, 0x05, 0x48, 0x84, 0xd6,
+	0xa2, 0x87, 0x21, 0x95, 0xdf, 0x29, 0x57, 0x8b, 0xe5, 0x6a, 0xbf, 0xc8, 0x5c, 0x81, 0x8b, 0x72,
+	0x69, 0xbb, 0xb2, 0x55, 0x54, 0xe4, 0xd2, 0x3a, 0x49, 0x77, 0xe5, 0x15, 0x79, 0xa7, 0x9c, 0x14,
+	0x56, 0x63, 0x7c, 0x37, 0xc5, 0xff, 0x8c, 0xc1, 0x62, 0xbf, 0x12, 0x07, 0xb5, 0x60, 0xe2, 0x50,
+	0x33, 0x5c, 0x86, 0x2f, 0xfb, 0x0f, 0xb2, 0xad, 0x0b, 0xea, 0x28, 0xcd, 0x70, 0x25, 0xaa, 0x26,
+	0xfd, 0x0a, 0xa4, 0x4e, 0xe3, 0x40, 0x19, 0xb8, 0x78, 0xd8, 0x6e, 0xa9, 0x86, 0x62, 0x63, 0xb5,
+	0x41, 0xd0, 0x5d, 0x09, 0x75, 0x33, 0x0b, 0x74, 0x4a, 0x62, 0x33, 0x65, 0xb5, 0x85, 0xd3, 0xdf,
+	0x17, 0x20, 0x11, 0xde, 0xe2, 0x7b, 0x70, 0x99, 0xc4, 0xd4, 0xa1, 0xbb, 0xa0, 0x84, 0x7b, 0x56,
+	0x21, 0x7a, 0x3d, 0xd8, 0x6f, 0x3b, 0x49, 0x3d, 0x68, 0xf5, 0xa1, 0x93, 0x7a, 0x20, 0x38, 0x92,
+	0x3f, 0x14, 0x60, 0x26, 0xfc, 0xe0, 0x81, 0x5e, 0x03, 0x08, 0x9e, 0xf5, 0x98, 0x2d, 0x37, 0x23,
+	0x1f, 0x9f, 0x8a, 0x2f, 0x42, 0x0a, 0x89, 0x23, 0x2d, 0x5b, 0x30, 0x52, 0x6a, 0x27, 0x2e, 0x76,
+	0xd8, 0xa9, 0x9e, 0x0f, 0xe8, 0xab, 0x84, 0x2c, 0xbe, 0x0e, 0x20, 0xd7, 0x55, 0x23, 0xef, 0x5d,
+	0xe0, 0xfd, 0x9a, 0xc5, 0x25, 0x52, 0x6a, 0x04, 0xad, 0x1f, 0x7b, 0x53, 0x0b, 0x91, 0xc8, 0xb5,
+	0x8f, 0x0d, 0xb2, 0x03, 0x1e, 0x40, 0xc4, 0x24, 0x3e, 0x14, 0x97, 0x61, 0x71, 0x1d, 0xbb, 0xc1,
+	0xab, 0x9d, 0x84, 0xbf, 0xd4, 0xc6, 0x8e, 0xdb, 0x4f, 0x8f, 0xf8, 0x2f, 0x01, 0x2e, 0x6f, 0x69,
+	0x4e, 0x88, 0xdb, 0x39, 0x83, 0x9d, 0xd4, 0x20, 0x96, 0x6a, 0x63, 0xc3, 0x65, 0xa5, 0x06, 0x1b,
+	0x11, 0xfa, 0x81, 0xa6, 0xbb, 0xd8, 0x66, 0x96, 0xb2, 0x11, 0xba, 0x0a, 0x71, 0x4b, 0x6d, 0x62,
+	0xc5, 0xd1, 0xee, 0x7b, 0x47, 0x79, 0x52, 0x8a, 0x11, 0x82, 0xac, 0xdd, 0xf7, 0xe0, 0x91, 0x4c,
+	0xba, 0xe6, 0x11, 0xe6, 0xdd, 0x2d, 0x65, 0xaf, 0x12, 0xc2, 0x03, 0x7c, 0xc5, 0x13, 0x7f, 0x24,
+	0xc0, 0x95, 0x1e, 0x2f, 0x1d, 0xcb, 0x34, 0x1c, 0xd2, 0x6b, 0x25, 0xcc, 0x80, 0x4c, 0x8b, 0xc4,
+	0x88, 0xcd, 0x56, 0x28, 0xd2, 0x61, 0x51, 0xe8, 0x93, 0x30, 0x6f, 0xe0, 0x7b, 0xae, 0x12, 0x72,
+	0xd2, 0x8b, 0xce, 0x2c, 0x21, 0x57, 0xb8, 0xa3, 0xe2, 0xb3, 0x70, 0xa5, 0x80, 0x75, 0xec, 0xe2,
+	0xc1, 0xb6, 0xec, 0x27, 0x02, 0x5c, 0xc9, 0xd3, 0x0e, 0x61, 0x20, 0xfe, 0xd0, 0x9e, 0x8d, 0x77,
+	0xec, 0xd9, 0x1e, 0x40, 0x60, 0x2d, 0xbb, 0x0b, 0x87, 0xf5, 0x3b, 0x24, 0x49, 0xfc, 0xbd, 0x00,
+	0x57, 0x76, 0x69, 0x13, 0x32, 0x98, 0x7d, 0x1f, 0x91, 0x1d, 0xa1, 0xd6, 0xa9, 0xa5, 0x3a, 0x47,
+	0xa7, 0x96, 0xdb, 0x6b, 0x1a, 0xd6, 0x1b, 0xdb, 0xaa, 0x73, 0xc4, 0x5b, 0x27, 0xf2, 0x2d, 0x7e,
+	0x02, 0xe6, 0xd6, 0xb1, 0x4b, 0xf2, 0xe8, 0xac, 0xad, 0xc8, 0x40, 0xaa, 0xe3, 0xa4, 0x9d, 0xc7,
+	0xff, 0x5d, 0x01, 0x92, 0x24, 0x0f, 0x09, 0xdf, 0xc7, 0xe5, 0x9c, 0x89, 0x6f, 0x09, 0xb0, 0x10,
+	0x32, 0x8a, 0x1d, 0x8b, 0x35, 0x98, 0x24, 0x8d, 0x15, 0x3f, 0x10, 0xcf, 0x45, 0x3d, 0x7e, 0x92,
+	0xb7, 0x7c, 0xe0, 0x43, 0xf0, 0x14, 0x2c, 0x78, 0x87, 0xe0, 0xbc, 0x18, 0xfe, 0x54, 0x80, 0x05,
+	0x2f, 0xfd, 0xcf, 0xe1, 0x0c, 0x05, 0x71, 0xa2, 0x23, 0x88, 0x57, 0x60, 0x9a, 0xf6, 0x8c, 0xfc,
+	0xba, 0x97, 0xa6, 0xc8, 0xb0, 0xd4, 0x40, 0x05, 0x98, 0x20, 0x5f, 0xc3, 0xbc, 0x05, 0x52, 0x5b,
+	0xe8, 0x6a, 0xd2, 0x3f, 0x2f, 0x78, 0xf9, 0x7f, 0x9e, 0x81, 0x5c, 0xdf, 0xd8, 0x28, 0xfa, 0x46,
+	0xcb, 0xf3, 0xb7, 0x05, 0x48, 0xf3, 0xcd, 0x1f, 0xfc, 0x0e, 0x78, 0xe0, 0x39, 0xf8, 0xbe, 0x00,
+	0x57, 0xfb, 0x9a, 0xf1, 0xb1, 0x01, 0xe9, 0xf7, 0x04, 0xb8, 0xcc, 0x50, 0xd7, 0x6f, 0xf2, 0x58,
+	0x90, 0x82, 0x3c, 0x13, 0x3a, 0xf2, 0xec, 0x71, 0x98, 0xf1, 0xbb, 0xc0, 0x20, 0xd9, 0x12, 0x3e,
+	0xad, 0xd4, 0xd5, 0x58, 0x8e, 0x47, 0x6b, 0x2c, 0xc5, 0x0f, 0x05, 0xb8, 0xcc, 0x80, 0xb6, 0xdb,
+	0xa4, 0x7e, 0xfb, 0x36, 0x8a, 0xae, 0xee, 0x24, 0x9b, 0x88, 0x94, 0x64, 0xdf, 0x14, 0x60, 0xc1,
+	0x97, 0xba, 0x8d, 0x5d, 0xb5, 0xa1, 0xba, 0x6a, 0xf7, 0xbb, 0x98, 0x10, 0xe9, 0x5d, 0xec, 0x45,
+	0x88, 0x61, 0xa3, 0x31, 0xe8, 0x3b, 0xcc, 0x34, 0x36, 0x1a, 0x64, 0x24, 0xca, 0xf0, 0xf8, 0x3a,
+	0x76, 0xf7, 0xda, 0xba, 0x71, 0x3f, 0x94, 0x66, 0x72, 0xbb, 0xd5, 0x52, 0xed, 0x93, 0xf3, 0xf6,
+	0xf3, 0x94, 0xc4, 0x17, 0x3f, 0x1c, 0x03, 0xf1, 0x2c, 0xa9, 0x2c, 0x87, 0x5d, 0x98, 0xaa, 0x9b,
+	0x6d, 0xc3, 0xe5, 0xe9, 0xfb, 0x7a, 0x94, 0xf4, 0x3d, 0x5f, 0x7e, 0x46, 0xc6, 0xc7, 0x98, 0x54,
+	0xf0, 0x79, 0xa2, 0x44, 0x62, 0xba, 0xd2, 0xef, 0x08, 0x30, 0xdb, 0x31, 0x83, 0x6a, 0x10, 0x73,
+	0x18, 0x81, 0x3d, 0x99, 0xac, 0x8d, 0xf6, 0x47, 0x4c, 0x2e, 0x5e, 0xf2, 0xe5, 0xa2, 0x45, 0x98,
+	0xa4, 0xfa, 0x69, 0xa4, 0xc6, 0x25, 0x6f, 0xc0, 0x0a, 0xd3, 0xa0, 0xf2, 0x3d, 0x0b, 0xe6, 0xdf,
+	0x66, 0x85, 0x69, 0xc0, 0xed, 0x0c, 0xb9, 0x3f, 0x23, 0x01, 0xd3, 0x8f, 0x59, 0xe5, 0xd8, 0x61,
+	0x06, 0xdb, 0xd0, 0x7d, 0x98, 0x71, 0xea, 0xaa, 0xa1, 0x78, 0xef, 0x70, 0x43, 0xa1, 0x52, 0x28,
+	0x16, 0x09, 0x27, 0x50, 0x31, 0x30, 0x2a, 0xfd, 0xc1, 0xaf, 0xb5, 0x06, 0x8a, 0x2a, 0xfa, 0x3c,
+	0x24, 0x42, 0x26, 0x0f, 0x53, 0x6c, 0x85, 0xf4, 0x40, 0x60, 0xf1, 0x48, 0x97, 0xd0, 0xca, 0x9f,
+	0x96, 0x60, 0x21, 0xcf, 0x55, 0xf2, 0x87, 0x26, 0xf4, 0x5b, 0x01, 0x66, 0x3b, 0xaa, 0x2b, 0x74,
+	0x27, 0xe2, 0x89, 0xe9, 0xa9, 0x3f, 0xd3, 0x43, 0x5e, 0x19, 0xe2, 0xf5, 0xaf, 0xfd, 0xfd, 0xdf,
+	0xdf, 0x1b, 0x7b, 0x06, 0x3d, 0x1d, 0xfc, 0x3e, 0xe4, 0x2b, 0x24, 0xa0, 0xb7, 0x2c, 0xdb, 0xfc,
+	0x22, 0xae, 0xbb, 0x4e, 0x76, 0x39, 0x1b, 0xba, 0x55, 0xb2, 0xcb, 0x6f, 0xa2, 0xbf, 0x08, 0x30,
+	0xdf, 0xd5, 0x73, 0xa0, 0x48, 0x4f, 0x35, 0xfd, 0xdb, 0xb2, 0x74, 0x7e, 0x24, 0x19, 0x5e, 0xea,
+	0xf6, 0xf5, 0xc7, 0x3b, 0x45, 0x21, 0x8f, 0xde, 0x0c, 0xbb, 0x84, 0x3e, 0x10, 0x20, 0xd9, 0xdd,
+	0xa6, 0xa0, 0x7c, 0xb4, 0xc7, 0xe2, 0xbe, 0x4d, 0x4e, 0xfa, 0x72, 0x4f, 0x9a, 0x14, 0x5b, 0x96,
+	0x7b, 0xc2, 0x8d, 0x5c, 0x8e, 0x10, 0xf4, 0xbf, 0x0a, 0x90, 0xec, 0xee, 0x8d, 0xa2, 0x19, 0x79,
+	0x4a, 0x67, 0x35, 0x74, 0xe6, 0xdc, 0xa2, 0x4e, 0xbc, 0x24, 0x0e, 0x1e, 0xe9, 0x1b, 0xe1, 0x26,
+	0x86, 0x38, 0xd4, 0xdd, 0x4c, 0x45, 0x73, 0xe8, 0x94, 0x56, 0x6c, 0x54, 0x87, 0x56, 0x06, 0xdf,
+	0x95, 0x0e, 0x87, 0xfe, 0x28, 0xc0, 0x42, 0x4f, 0xcf, 0x84, 0x0a, 0x43, 0x9f, 0xec, 0x50, 0x8d,
+	0x9d, 0x8e, 0x5c, 0x41, 0x8b, 0x2f, 0x51, 0x67, 0xae, 0xa3, 0xec, 0xc0, 0xce, 0x64, 0xbd, 0xb6,
+	0xe6, 0xe7, 0x02, 0x4c, 0xb3, 0x06, 0x11, 0xdd, 0x88, 0x68, 0xfc, 0x68, 0x26, 0x3f, 0x43, 0x4d,
+	0x7e, 0x12, 0x3d, 0x71, 0x86, 0xc9, 0xd4, 0x46, 0x72, 0x1e, 0x7e, 0x23, 0x40, 0xdc, 0xef, 0xed,
+	0xd0, 0xcb, 0x51, 0xa1, 0x23, 0xdc, 0xa7, 0xa6, 0x6f, 0x0d, 0xb9, 0x9a, 0x41, 0x4e, 0x3f, 0xbb,
+	0xfb, 0x1c, 0x04, 0x2f, 0xbc, 0xef, 0x09, 0x00, 0x41, 0x3b, 0x88, 0x6e, 0x45, 0x87, 0x99, 0x70,
+	0x90, 0x4f, 0x03, 0x18, 0x66, 0xd2, 0xf2, 0x40, 0xa1, 0xfc, 0xb5, 0x00, 0x10, 0xf4, 0x9d, 0xd1,
+	0x4c, 0xea, 0xe9, 0x57, 0x87, 0xd8, 0x77, 0x86, 0x86, 0xe2, 0x20, 0xf1, 0xbb, 0xe1, 0x75, 0x86,
+	0xc4, 0xe4, 0xa0, 0x13, 0x8d, 0x66, 0x72, 0x4f, 0x07, 0x3b, 0xbc, 0xc9, 0x2b, 0x83, 0xc4, 0x97,
+	0x99, 0xfc, 0x4f, 0x01, 0x2e, 0xf6, 0x69, 0x04, 0xd1, 0xda, 0x30, 0xc9, 0xd7, 0xe7, 0xf6, 0x5c,
+	0x1f, 0x59, 0x0e, 0x4b, 0xe7, 0x41, 0x90, 0x83, 0xfb, 0xd6, 0x71, 0x8f, 0xbe, 0x35, 0x06, 0xe9,
+	0xd3, 0xab, 0x79, 0xb4, 0xfd, 0xa0, 0xba, 0x02, 0xcf, 0xdf, 0xf2, 0x83, 0x6d, 0x32, 0xc4, 0x35,
+	0xea, 0xf6, 0x1d, 0xf4, 0xb9, 0xc1, 0xaf, 0xb3, 0x8e, 0x9f, 0xfd, 0x70, 0x37, 0xff, 0x2c, 0xc0,
+	0x8c, 0x8c, 0xdd, 0x92, 0xda, 0xaa, 0xd0, 0xdf, 0xc9, 0x22, 0x91, 0x1b, 0xaa, 0xa9, 0xad, 0xcc,
+	0xf1, 0xf5, 0x4c, 0x78, 0x92, 0x3b, 0x73, 0xa9, 0x8b, 0xc7, 0x9b, 0x15, 0xbf, 0x2a, 0x50, 0xa3,
+	0xee, 0x8b, 0x2f, 0x84, 0x8c, 0xe2, 0x7f, 0xe4, 0xee, 0x9b, 0x6b, 0x4e, 0x48, 0xf8, 0x0d, 0x61,
+	0xf9, 0xd5, 0xdb, 0xe2, 0x8d, 0x73, 0x96, 0x76, 0xdd, 0x68, 0x5d, 0x02, 0xa8, 0x3b, 0xeb, 0x67,
+	0xb9, 0xb3, 0xfe, 0x51, 0xba, 0xd3, 0x1c, 0xd5, 0x9d, 0x2e, 0x01, 0xe8, 0xbf, 0x02, 0xa0, 0x2a,
+	0x76, 0x28, 0x11, 0xdb, 0x2d, 0xcd, 0x71, 0x34, 0xd3, 0x70, 0xd0, 0xb5, 0x2e, 0x83, 0x7b, 0x59,
+	0xb8, 0x6b, 0x4f, 0x0f, 0xc0, 0xc9, 0x32, 0xea, 0x5d, 0xcf, 0xdd, 0x6f, 0x08, 0xe7, 0x1a, 0xed,
+	0xfb, 0xeb, 0xf6, 0x48, 0x23, 0x5e, 0x17, 0xc5, 0x3b, 0xd1, 0xbc, 0xee, 0x2b, 0x06, 0xfd, 0x42,
+	0x80, 0xf9, 0xae, 0x87, 0x9e, 0x68, 0x75, 0x7b, 0xff, 0x57, 0xa2, 0xf4, 0xd9, 0x6f, 0x2d, 0xe2,
+	0xf3, 0x34, 0x0a, 0xcf, 0x8a, 0xd7, 0xce, 0x39, 0x58, 0xfe, 0x8f, 0xc6, 0xb9, 0xad, 0x5d, 0x2f,
+	0x40, 0xd1, 0x6c, 0xed, 0xff, 0x7c, 0x34, 0xa0, 0xad, 0x2b, 0xd7, 0xce, 0xaa, 0x9a, 0x7c, 0x43,
+	0x49, 0xa8, 0x85, 0x65, 0xf4, 0x3b, 0xaf, 0x9d, 0x0b, 0xfd, 0xdd, 0x2b, 0x6a, 0x3b, 0xd7, 0xd3,
+	0xe2, 0xa6, 0x87, 0xec, 0x5c, 0xc5, 0x15, 0xea, 0xc0, 0xa7, 0xd0, 0xf2, 0x19, 0x0e, 0x84, 0x5b,
+	0x7b, 0xd6, 0x5a, 0xcc, 0x77, 0xbd, 0x04, 0x44, 0xef, 0xe7, 0x7a, 0x5f, 0x33, 0xa2, 0xf7, 0x73,
+	0x7d, 0x9e, 0x22, 0xfa, 0x3a, 0xd4, 0x27, 0x7b, 0xc2, 0x3e, 0xa1, 0xbf, 0xf9, 0xad, 0x45, 0x68,
+	0x4f, 0x86, 0x68, 0x2d, 0x1e, 0xdc, 0xb6, 0xdc, 0xa6, 0x5e, 0x7c, 0x76, 0x25, 0xc2, 0xb6, 0xdc,
+	0x08, 0xbf, 0x67, 0xac, 0x7e, 0x4b, 0x80, 0x27, 0xeb, 0x66, 0x8b, 0xab, 0x3f, 0x5d, 0x6b, 0x45,
+	0x78, 0xf5, 0x35, 0xc6, 0xd4, 0x34, 0x75, 0xd5, 0x68, 0x66, 0x4c, 0xbb, 0x99, 0x6d, 0x62, 0x83,
+	0x56, 0x88, 0x59, 0x6f, 0x4a, 0xb5, 0x34, 0x67, 0x90, 0xff, 0x2a, 0x72, 0xb3, 0x67, 0xea, 0x83,
+	0xb1, 0xf1, 0xf5, 0x7c, 0xae, 0x36, 0x45, 0xa5, 0x3d, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xb3, 0xe0, 0xe0, 0x39, 0xcf, 0x33, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
index fbafe4cf..3bb42872 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/image_basis.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/image_basis.proto
 
-package containeranalysis
+package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Instructions from dockerfile
 type DockerImage_Layer_Directive int32
 
@@ -100,31 +106,75 @@ func (x DockerImage_Layer_Directive) String() string {
 	return proto.EnumName(DockerImage_Layer_Directive_name, int32(x))
 }
 func (DockerImage_Layer_Directive) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{0, 0, 0}
+	return fileDescriptor_image_basis_f0f54fd9664d71be, []int{0, 0, 0}
 }
 
 // DockerImage holds types defining base image notes
 // and derived image occurrences.
 type DockerImage struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DockerImage) Reset()         { *m = DockerImage{} }
+func (m *DockerImage) String() string { return proto.CompactTextString(m) }
+func (*DockerImage) ProtoMessage()    {}
+func (*DockerImage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_basis_f0f54fd9664d71be, []int{0}
+}
+func (m *DockerImage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DockerImage.Unmarshal(m, b)
+}
+func (m *DockerImage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DockerImage.Marshal(b, m, deterministic)
+}
+func (dst *DockerImage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage.Merge(dst, src)
+}
+func (m *DockerImage) XXX_Size() int {
+	return xxx_messageInfo_DockerImage.Size(m)
+}
+func (m *DockerImage) XXX_DiscardUnknown() {
+	xxx_messageInfo_DockerImage.DiscardUnknown(m)
 }
 
-func (m *DockerImage) Reset()                    { *m = DockerImage{} }
-func (m *DockerImage) String() string            { return proto.CompactTextString(m) }
-func (*DockerImage) ProtoMessage()               {}
-func (*DockerImage) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_DockerImage proto.InternalMessageInfo
 
 // Layer holds metadata specific to a layer of a Docker image.
 type DockerImage_Layer struct {
 	// The recovered Dockerfile directive used to construct this layer.
-	Directive DockerImage_Layer_Directive `protobuf:"varint,1,opt,name=directive,enum=google.devtools.containeranalysis.v1alpha1.DockerImage_Layer_Directive" json:"directive,omitempty"`
+	Directive DockerImage_Layer_Directive `protobuf:"varint,1,opt,name=directive,proto3,enum=google.devtools.containeranalysis.v1alpha1.DockerImage_Layer_Directive" json:"directive,omitempty"`
 	// The recovered arguments to the Dockerfile directive.
-	Arguments string `protobuf:"bytes,2,opt,name=arguments" json:"arguments,omitempty"`
+	Arguments            string   `protobuf:"bytes,2,opt,name=arguments,proto3" json:"arguments,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DockerImage_Layer) Reset()                    { *m = DockerImage_Layer{} }
-func (m *DockerImage_Layer) String() string            { return proto.CompactTextString(m) }
-func (*DockerImage_Layer) ProtoMessage()               {}
-func (*DockerImage_Layer) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (m *DockerImage_Layer) Reset()         { *m = DockerImage_Layer{} }
+func (m *DockerImage_Layer) String() string { return proto.CompactTextString(m) }
+func (*DockerImage_Layer) ProtoMessage()    {}
+func (*DockerImage_Layer) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_basis_f0f54fd9664d71be, []int{0, 0}
+}
+func (m *DockerImage_Layer) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DockerImage_Layer.Unmarshal(m, b)
+}
+func (m *DockerImage_Layer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DockerImage_Layer.Marshal(b, m, deterministic)
+}
+func (dst *DockerImage_Layer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage_Layer.Merge(dst, src)
+}
+func (m *DockerImage_Layer) XXX_Size() int {
+	return xxx_messageInfo_DockerImage_Layer.Size(m)
+}
+func (m *DockerImage_Layer) XXX_DiscardUnknown() {
+	xxx_messageInfo_DockerImage_Layer.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DockerImage_Layer proto.InternalMessageInfo
 
 func (m *DockerImage_Layer) GetDirective() DockerImage_Layer_Directive {
 	if m != nil {
@@ -145,21 +195,43 @@ type DockerImage_Fingerprint struct {
 	// The layer-id of the final layer in the Docker image's v1
 	// representation.
 	// This field can be used as a filter in list requests.
-	V1Name string `protobuf:"bytes,1,opt,name=v1_name,json=v1Name" json:"v1_name,omitempty"`
+	V1Name string `protobuf:"bytes,1,opt,name=v1_name,json=v1Name,proto3" json:"v1_name,omitempty"`
 	// The ordered list of v2 blobs that represent a given image.
-	V2Blob []string `protobuf:"bytes,2,rep,name=v2_blob,json=v2Blob" json:"v2_blob,omitempty"`
+	V2Blob []string `protobuf:"bytes,2,rep,name=v2_blob,json=v2Blob,proto3" json:"v2_blob,omitempty"`
 	// Output only. The name of the image's v2 blobs computed via:
 	//   [bottom] := v2_blob[bottom]
 	//   [N] := sha256(v2_blob[N] + " " + v2_name[N+1])
 	// Only the name of the final blob is kept.
 	// This field can be used as a filter in list requests.
-	V2Name string `protobuf:"bytes,3,opt,name=v2_name,json=v2Name" json:"v2_name,omitempty"`
+	V2Name               string   `protobuf:"bytes,3,opt,name=v2_name,json=v2Name,proto3" json:"v2_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DockerImage_Fingerprint) Reset()         { *m = DockerImage_Fingerprint{} }
+func (m *DockerImage_Fingerprint) String() string { return proto.CompactTextString(m) }
+func (*DockerImage_Fingerprint) ProtoMessage()    {}
+func (*DockerImage_Fingerprint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_basis_f0f54fd9664d71be, []int{0, 1}
+}
+func (m *DockerImage_Fingerprint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DockerImage_Fingerprint.Unmarshal(m, b)
+}
+func (m *DockerImage_Fingerprint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DockerImage_Fingerprint.Marshal(b, m, deterministic)
+}
+func (dst *DockerImage_Fingerprint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage_Fingerprint.Merge(dst, src)
+}
+func (m *DockerImage_Fingerprint) XXX_Size() int {
+	return xxx_messageInfo_DockerImage_Fingerprint.Size(m)
+}
+func (m *DockerImage_Fingerprint) XXX_DiscardUnknown() {
+	xxx_messageInfo_DockerImage_Fingerprint.DiscardUnknown(m)
 }
 
-func (m *DockerImage_Fingerprint) Reset()                    { *m = DockerImage_Fingerprint{} }
-func (m *DockerImage_Fingerprint) String() string            { return proto.CompactTextString(m) }
-func (*DockerImage_Fingerprint) ProtoMessage()               {}
-func (*DockerImage_Fingerprint) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 1} }
+var xxx_messageInfo_DockerImage_Fingerprint proto.InternalMessageInfo
 
 func (m *DockerImage_Fingerprint) GetV1Name() string {
 	if m != nil {
@@ -190,15 +262,37 @@ func (m *DockerImage_Fingerprint) GetV2Name() string {
 type DockerImage_Basis struct {
 	// The resource_url for the resource representing the basis of
 	// associated occurrence images.
-	ResourceUrl string `protobuf:"bytes,1,opt,name=resource_url,json=resourceUrl" json:"resource_url,omitempty"`
-	// The fingerprint of the base image
-	Fingerprint *DockerImage_Fingerprint `protobuf:"bytes,2,opt,name=fingerprint" json:"fingerprint,omitempty"`
+	ResourceUrl string `protobuf:"bytes,1,opt,name=resource_url,json=resourceUrl,proto3" json:"resource_url,omitempty"`
+	// The fingerprint of the base image.
+	Fingerprint          *DockerImage_Fingerprint `protobuf:"bytes,2,opt,name=fingerprint,proto3" json:"fingerprint,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *DockerImage_Basis) Reset()         { *m = DockerImage_Basis{} }
+func (m *DockerImage_Basis) String() string { return proto.CompactTextString(m) }
+func (*DockerImage_Basis) ProtoMessage()    {}
+func (*DockerImage_Basis) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_basis_f0f54fd9664d71be, []int{0, 2}
+}
+func (m *DockerImage_Basis) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DockerImage_Basis.Unmarshal(m, b)
+}
+func (m *DockerImage_Basis) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DockerImage_Basis.Marshal(b, m, deterministic)
+}
+func (dst *DockerImage_Basis) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage_Basis.Merge(dst, src)
+}
+func (m *DockerImage_Basis) XXX_Size() int {
+	return xxx_messageInfo_DockerImage_Basis.Size(m)
+}
+func (m *DockerImage_Basis) XXX_DiscardUnknown() {
+	xxx_messageInfo_DockerImage_Basis.DiscardUnknown(m)
 }
 
-func (m *DockerImage_Basis) Reset()                    { *m = DockerImage_Basis{} }
-func (m *DockerImage_Basis) String() string            { return proto.CompactTextString(m) }
-func (*DockerImage_Basis) ProtoMessage()               {}
-func (*DockerImage_Basis) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 2} }
+var xxx_messageInfo_DockerImage_Basis proto.InternalMessageInfo
 
 func (m *DockerImage_Basis) GetResourceUrl() string {
 	if m != nil {
@@ -218,25 +312,46 @@ func (m *DockerImage_Basis) GetFingerprint() *DockerImage_Fingerprint {
 // DockerImage relationship.  This image would be produced from a Dockerfile
 // with FROM <DockerImage.Basis in attached Note>.
 type DockerImage_Derived struct {
-	// The fingerprint of the derived image
-	Fingerprint *DockerImage_Fingerprint `protobuf:"bytes,1,opt,name=fingerprint" json:"fingerprint,omitempty"`
-	// Output only. The number of layers by which this image differs from
-	// the associated image basis.
-	Distance uint32 `protobuf:"varint,2,opt,name=distance" json:"distance,omitempty"`
-	// This contains layer-specific metadata, if populated it
-	// has length "distance" and is ordered with [distance] being the
-	// layer immediately following the base image and [1]
-	// being the final layer.
-	LayerInfo []*DockerImage_Layer `protobuf:"bytes,3,rep,name=layer_info,json=layerInfo" json:"layer_info,omitempty"`
-	// Output only.This contains the base image url for the derived image
-	// Occurrence
-	BaseResourceUrl string `protobuf:"bytes,4,opt,name=base_resource_url,json=baseResourceUrl" json:"base_resource_url,omitempty"`
-}
-
-func (m *DockerImage_Derived) Reset()                    { *m = DockerImage_Derived{} }
-func (m *DockerImage_Derived) String() string            { return proto.CompactTextString(m) }
-func (*DockerImage_Derived) ProtoMessage()               {}
-func (*DockerImage_Derived) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 3} }
+	// The fingerprint of the derived image.
+	Fingerprint *DockerImage_Fingerprint `protobuf:"bytes,1,opt,name=fingerprint,proto3" json:"fingerprint,omitempty"`
+	// Output only. The number of layers by which this image differs from the
+	// associated image basis.
+	Distance uint32 `protobuf:"varint,2,opt,name=distance,proto3" json:"distance,omitempty"`
+	// This contains layer-specific metadata, if populated it has length
+	// "distance" and is ordered with [distance] being the layer immediately
+	// following the base image and [1] being the final layer.
+	LayerInfo []*DockerImage_Layer `protobuf:"bytes,3,rep,name=layer_info,json=layerInfo,proto3" json:"layer_info,omitempty"`
+	// Output only. This contains the base image URL for the derived image
+	// occurrence.
+	BaseResourceUrl      string   `protobuf:"bytes,4,opt,name=base_resource_url,json=baseResourceUrl,proto3" json:"base_resource_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DockerImage_Derived) Reset()         { *m = DockerImage_Derived{} }
+func (m *DockerImage_Derived) String() string { return proto.CompactTextString(m) }
+func (*DockerImage_Derived) ProtoMessage()    {}
+func (*DockerImage_Derived) Descriptor() ([]byte, []int) {
+	return fileDescriptor_image_basis_f0f54fd9664d71be, []int{0, 3}
+}
+func (m *DockerImage_Derived) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DockerImage_Derived.Unmarshal(m, b)
+}
+func (m *DockerImage_Derived) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DockerImage_Derived.Marshal(b, m, deterministic)
+}
+func (dst *DockerImage_Derived) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerImage_Derived.Merge(dst, src)
+}
+func (m *DockerImage_Derived) XXX_Size() int {
+	return xxx_messageInfo_DockerImage_Derived.Size(m)
+}
+func (m *DockerImage_Derived) XXX_DiscardUnknown() {
+	xxx_messageInfo_DockerImage_Derived.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DockerImage_Derived proto.InternalMessageInfo
 
 func (m *DockerImage_Derived) GetFingerprint() *DockerImage_Fingerprint {
 	if m != nil {
@@ -276,10 +391,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/image_basis.proto", fileDescriptor2)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/image_basis.proto", fileDescriptor_image_basis_f0f54fd9664d71be)
 }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_image_basis_f0f54fd9664d71be = []byte{
 	// 627 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xdf, 0x6e, 0xda, 0x30,
 	0x14, 0xc6, 0x17, 0x28, 0xd0, 0x9c, 0xf4, 0x8f, 0x6b, 0x69, 0x1a, 0x43, 0xbd, 0x60, 0x95, 0x26,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
index 20a81674..180be411 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/package_vulnerability.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/package_vulnerability.proto
 
-package containeranalysis
+package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Note provider-assigned severity/impact ranking
 type VulnerabilityType_Severity int32
 
@@ -52,7 +58,7 @@ func (x VulnerabilityType_Severity) String() string {
 	return proto.EnumName(VulnerabilityType_Severity_name, int32(x))
 }
 func (VulnerabilityType_Severity) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 0}
+	return fileDescriptor_package_vulnerability_9e58f6e1392a878c, []int{0, 0}
 }
 
 // Whether this is an ordinary package version or a
@@ -85,25 +91,47 @@ func (x VulnerabilityType_Version_VersionKind) String() string {
 	return proto.EnumName(VulnerabilityType_Version_VersionKind_name, int32(x))
 }
 func (VulnerabilityType_Version_VersionKind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 0, 0}
+	return fileDescriptor_package_vulnerability_9e58f6e1392a878c, []int{0, 0, 0}
 }
 
 // VulnerabilityType provides metadata about a security vulnerability.
 type VulnerabilityType struct {
 	// The CVSS score for this Vulnerability.
-	CvssScore float32 `protobuf:"fixed32,2,opt,name=cvss_score,json=cvssScore" json:"cvss_score,omitempty"`
+	CvssScore float32 `protobuf:"fixed32,2,opt,name=cvss_score,json=cvssScore,proto3" json:"cvss_score,omitempty"`
 	// Note provider assigned impact of the vulnerability
-	Severity VulnerabilityType_Severity `protobuf:"varint,3,opt,name=severity,enum=google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Severity" json:"severity,omitempty"`
+	Severity VulnerabilityType_Severity `protobuf:"varint,3,opt,name=severity,proto3,enum=google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Severity" json:"severity,omitempty"`
 	// All information about the package to specifically identify this
 	// vulnerability. One entry per (version range and cpe_uri) the
 	// package vulnerability has manifested in.
-	Details []*VulnerabilityType_Detail `protobuf:"bytes,4,rep,name=details" json:"details,omitempty"`
+	Details              []*VulnerabilityType_Detail `protobuf:"bytes,4,rep,name=details,proto3" json:"details,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
-func (m *VulnerabilityType) Reset()                    { *m = VulnerabilityType{} }
-func (m *VulnerabilityType) String() string            { return proto.CompactTextString(m) }
-func (*VulnerabilityType) ProtoMessage()               {}
-func (*VulnerabilityType) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (m *VulnerabilityType) Reset()         { *m = VulnerabilityType{} }
+func (m *VulnerabilityType) String() string { return proto.CompactTextString(m) }
+func (*VulnerabilityType) ProtoMessage()    {}
+func (*VulnerabilityType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_package_vulnerability_9e58f6e1392a878c, []int{0}
+}
+func (m *VulnerabilityType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VulnerabilityType.Unmarshal(m, b)
+}
+func (m *VulnerabilityType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VulnerabilityType.Marshal(b, m, deterministic)
+}
+func (dst *VulnerabilityType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType.Merge(dst, src)
+}
+func (m *VulnerabilityType) XXX_Size() int {
+	return xxx_messageInfo_VulnerabilityType.Size(m)
+}
+func (m *VulnerabilityType) XXX_DiscardUnknown() {
+	xxx_messageInfo_VulnerabilityType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VulnerabilityType proto.InternalMessageInfo
 
 func (m *VulnerabilityType) GetCvssScore() float32 {
 	if m != nil {
@@ -133,20 +161,42 @@ func (m *VulnerabilityType) GetDetails() []*VulnerabilityType_Detail {
 // http://blog.jasonantman.com/2014/07/how-yum-and-rpm-compare-versions/
 type VulnerabilityType_Version struct {
 	// Used to correct mistakes in the version numbering scheme.
-	Epoch int32 `protobuf:"varint,1,opt,name=epoch" json:"epoch,omitempty"`
+	Epoch int32 `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty"`
 	// The main part of the version name.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// The iteration of the package build from the above version.
-	Revision string `protobuf:"bytes,3,opt,name=revision" json:"revision,omitempty"`
+	Revision string `protobuf:"bytes,3,opt,name=revision,proto3" json:"revision,omitempty"`
 	// Distinguish between sentinel MIN/MAX versions and normal versions.
 	// If kind is not NORMAL, then the other fields are ignored.
-	Kind VulnerabilityType_Version_VersionKind `protobuf:"varint,5,opt,name=kind,enum=google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Version_VersionKind" json:"kind,omitempty"`
+	Kind                 VulnerabilityType_Version_VersionKind `protobuf:"varint,5,opt,name=kind,proto3,enum=google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Version_VersionKind" json:"kind,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
+}
+
+func (m *VulnerabilityType_Version) Reset()         { *m = VulnerabilityType_Version{} }
+func (m *VulnerabilityType_Version) String() string { return proto.CompactTextString(m) }
+func (*VulnerabilityType_Version) ProtoMessage()    {}
+func (*VulnerabilityType_Version) Descriptor() ([]byte, []int) {
+	return fileDescriptor_package_vulnerability_9e58f6e1392a878c, []int{0, 0}
+}
+func (m *VulnerabilityType_Version) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VulnerabilityType_Version.Unmarshal(m, b)
+}
+func (m *VulnerabilityType_Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VulnerabilityType_Version.Marshal(b, m, deterministic)
+}
+func (dst *VulnerabilityType_Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_Version.Merge(dst, src)
+}
+func (m *VulnerabilityType_Version) XXX_Size() int {
+	return xxx_messageInfo_VulnerabilityType_Version.Size(m)
+}
+func (m *VulnerabilityType_Version) XXX_DiscardUnknown() {
+	xxx_messageInfo_VulnerabilityType_Version.DiscardUnknown(m)
 }
 
-func (m *VulnerabilityType_Version) Reset()                    { *m = VulnerabilityType_Version{} }
-func (m *VulnerabilityType_Version) String() string            { return proto.CompactTextString(m) }
-func (*VulnerabilityType_Version) ProtoMessage()               {}
-func (*VulnerabilityType_Version) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+var xxx_messageInfo_VulnerabilityType_Version proto.InternalMessageInfo
 
 func (m *VulnerabilityType_Version) GetEpoch() int32 {
 	if m != nil {
@@ -184,30 +234,55 @@ type VulnerabilityType_Detail struct {
 	// which the vulnerability manifests.  Examples include distro or storage
 	// location for vulnerable jar.
 	// This field can be used as a filter in list requests.
-	CpeUri string `protobuf:"bytes,1,opt,name=cpe_uri,json=cpeUri" json:"cpe_uri,omitempty"`
+	CpeUri string `protobuf:"bytes,1,opt,name=cpe_uri,json=cpeUri,proto3" json:"cpe_uri,omitempty"`
 	// The name of the package where the vulnerability was found.
 	// This field can be used as a filter in list requests.
-	Package string `protobuf:"bytes,8,opt,name=package" json:"package,omitempty"`
+	Package string `protobuf:"bytes,8,opt,name=package,proto3" json:"package,omitempty"`
 	// The min version of the package in which the vulnerability exists.
-	MinAffectedVersion *VulnerabilityType_Version `protobuf:"bytes,6,opt,name=min_affected_version,json=minAffectedVersion" json:"min_affected_version,omitempty"`
+	MinAffectedVersion *VulnerabilityType_Version `protobuf:"bytes,6,opt,name=min_affected_version,json=minAffectedVersion,proto3" json:"min_affected_version,omitempty"`
 	// The max version of the package in which the vulnerability exists.
 	// This field can be used as a filter in list requests.
-	MaxAffectedVersion *VulnerabilityType_Version `protobuf:"bytes,7,opt,name=max_affected_version,json=maxAffectedVersion" json:"max_affected_version,omitempty"`
+	MaxAffectedVersion *VulnerabilityType_Version `protobuf:"bytes,7,opt,name=max_affected_version,json=maxAffectedVersion,proto3" json:"max_affected_version,omitempty"`
 	// The severity (eg: distro assigned severity) for this vulnerability.
-	SeverityName string `protobuf:"bytes,4,opt,name=severity_name,json=severityName" json:"severity_name,omitempty"`
+	SeverityName string `protobuf:"bytes,4,opt,name=severity_name,json=severityName,proto3" json:"severity_name,omitempty"`
 	// A vendor-specific description of this note.
-	Description string `protobuf:"bytes,9,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,9,opt,name=description,proto3" json:"description,omitempty"`
 	// The fix for this specific package version.
-	FixedLocation *VulnerabilityType_VulnerabilityLocation `protobuf:"bytes,5,opt,name=fixed_location,json=fixedLocation" json:"fixed_location,omitempty"`
+	FixedLocation *VulnerabilityType_VulnerabilityLocation `protobuf:"bytes,5,opt,name=fixed_location,json=fixedLocation,proto3" json:"fixed_location,omitempty"`
 	// The type of package; whether native or non native(ruby gems,
 	// node.js packages etc)
-	PackageType string `protobuf:"bytes,10,opt,name=package_type,json=packageType" json:"package_type,omitempty"`
+	PackageType string `protobuf:"bytes,10,opt,name=package_type,json=packageType,proto3" json:"package_type,omitempty"`
+	// Whether this Detail is obsolete. Occurrences are expected not to point to
+	// obsolete details.
+	IsObsolete           bool     `protobuf:"varint,11,opt,name=is_obsolete,json=isObsolete,proto3" json:"is_obsolete,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *VulnerabilityType_Detail) Reset()         { *m = VulnerabilityType_Detail{} }
+func (m *VulnerabilityType_Detail) String() string { return proto.CompactTextString(m) }
+func (*VulnerabilityType_Detail) ProtoMessage()    {}
+func (*VulnerabilityType_Detail) Descriptor() ([]byte, []int) {
+	return fileDescriptor_package_vulnerability_9e58f6e1392a878c, []int{0, 1}
+}
+func (m *VulnerabilityType_Detail) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VulnerabilityType_Detail.Unmarshal(m, b)
+}
+func (m *VulnerabilityType_Detail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VulnerabilityType_Detail.Marshal(b, m, deterministic)
+}
+func (dst *VulnerabilityType_Detail) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_Detail.Merge(dst, src)
+}
+func (m *VulnerabilityType_Detail) XXX_Size() int {
+	return xxx_messageInfo_VulnerabilityType_Detail.Size(m)
+}
+func (m *VulnerabilityType_Detail) XXX_DiscardUnknown() {
+	xxx_messageInfo_VulnerabilityType_Detail.DiscardUnknown(m)
 }
 
-func (m *VulnerabilityType_Detail) Reset()                    { *m = VulnerabilityType_Detail{} }
-func (m *VulnerabilityType_Detail) String() string            { return proto.CompactTextString(m) }
-func (*VulnerabilityType_Detail) ProtoMessage()               {}
-func (*VulnerabilityType_Detail) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 1} }
+var xxx_messageInfo_VulnerabilityType_Detail proto.InternalMessageInfo
 
 func (m *VulnerabilityType_Detail) GetCpeUri() string {
 	if m != nil {
@@ -265,21 +340,31 @@ func (m *VulnerabilityType_Detail) GetPackageType() string {
 	return ""
 }
 
+func (m *VulnerabilityType_Detail) GetIsObsolete() bool {
+	if m != nil {
+		return m.IsObsolete
+	}
+	return false
+}
+
 // Used by Occurrence to point to where the vulnerability exists and how
 // to fix it.
 type VulnerabilityType_VulnerabilityDetails struct {
 	// The type of package; whether native or non native(ruby gems,
 	// node.js packages etc)
-	Type string `protobuf:"bytes,3,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
 	// Output only. The note provider assigned Severity of the vulnerability.
-	Severity VulnerabilityType_Severity `protobuf:"varint,4,opt,name=severity,enum=google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Severity" json:"severity,omitempty"`
+	Severity VulnerabilityType_Severity `protobuf:"varint,4,opt,name=severity,proto3,enum=google.devtools.containeranalysis.v1alpha1.VulnerabilityType_Severity" json:"severity,omitempty"`
 	// Output only. The CVSS score of this vulnerability. CVSS score is on a
 	// scale of 0-10 where 0 indicates low severity and 10 indicates high
 	// severity.
-	CvssScore float32 `protobuf:"fixed32,5,opt,name=cvss_score,json=cvssScore" json:"cvss_score,omitempty"`
+	CvssScore float32 `protobuf:"fixed32,5,opt,name=cvss_score,json=cvssScore,proto3" json:"cvss_score,omitempty"`
 	// The set of affected locations and their fixes (if available) within
 	// the associated resource.
-	PackageIssue []*VulnerabilityType_PackageIssue `protobuf:"bytes,6,rep,name=package_issue,json=packageIssue" json:"package_issue,omitempty"`
+	PackageIssue         []*VulnerabilityType_PackageIssue `protobuf:"bytes,6,rep,name=package_issue,json=packageIssue,proto3" json:"package_issue,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
 }
 
 func (m *VulnerabilityType_VulnerabilityDetails) Reset() {
@@ -288,9 +373,26 @@ func (m *VulnerabilityType_VulnerabilityDetails) Reset() {
 func (m *VulnerabilityType_VulnerabilityDetails) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType_VulnerabilityDetails) ProtoMessage()    {}
 func (*VulnerabilityType_VulnerabilityDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2}
+	return fileDescriptor_package_vulnerability_9e58f6e1392a878c, []int{0, 2}
+}
+func (m *VulnerabilityType_VulnerabilityDetails) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Unmarshal(m, b)
+}
+func (m *VulnerabilityType_VulnerabilityDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Marshal(b, m, deterministic)
+}
+func (dst *VulnerabilityType_VulnerabilityDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Merge(dst, src)
+}
+func (m *VulnerabilityType_VulnerabilityDetails) XXX_Size() int {
+	return xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.Size(m)
+}
+func (m *VulnerabilityType_VulnerabilityDetails) XXX_DiscardUnknown() {
+	xxx_messageInfo_VulnerabilityType_VulnerabilityDetails.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_VulnerabilityType_VulnerabilityDetails proto.InternalMessageInfo
+
 func (m *VulnerabilityType_VulnerabilityDetails) GetType() string {
 	if m != nil {
 		return m.Type
@@ -323,19 +425,39 @@ func (m *VulnerabilityType_VulnerabilityDetails) GetPackageIssue() []*Vulnerabil
 // associated fix (if one is available).
 type VulnerabilityType_PackageIssue struct {
 	// The location of the vulnerability.
-	AffectedLocation *VulnerabilityType_VulnerabilityLocation `protobuf:"bytes,1,opt,name=affected_location,json=affectedLocation" json:"affected_location,omitempty"`
+	AffectedLocation *VulnerabilityType_VulnerabilityLocation `protobuf:"bytes,1,opt,name=affected_location,json=affectedLocation,proto3" json:"affected_location,omitempty"`
 	// The location of the available fix for vulnerability.
-	FixedLocation *VulnerabilityType_VulnerabilityLocation `protobuf:"bytes,2,opt,name=fixed_location,json=fixedLocation" json:"fixed_location,omitempty"`
+	FixedLocation *VulnerabilityType_VulnerabilityLocation `protobuf:"bytes,2,opt,name=fixed_location,json=fixedLocation,proto3" json:"fixed_location,omitempty"`
 	// The severity (eg: distro assigned severity) for this vulnerability.
-	SeverityName string `protobuf:"bytes,3,opt,name=severity_name,json=severityName" json:"severity_name,omitempty"`
+	SeverityName         string   `protobuf:"bytes,3,opt,name=severity_name,json=severityName,proto3" json:"severity_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *VulnerabilityType_PackageIssue) Reset()         { *m = VulnerabilityType_PackageIssue{} }
 func (m *VulnerabilityType_PackageIssue) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType_PackageIssue) ProtoMessage()    {}
 func (*VulnerabilityType_PackageIssue) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 3}
+	return fileDescriptor_package_vulnerability_9e58f6e1392a878c, []int{0, 3}
+}
+func (m *VulnerabilityType_PackageIssue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VulnerabilityType_PackageIssue.Unmarshal(m, b)
 }
+func (m *VulnerabilityType_PackageIssue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VulnerabilityType_PackageIssue.Marshal(b, m, deterministic)
+}
+func (dst *VulnerabilityType_PackageIssue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_PackageIssue.Merge(dst, src)
+}
+func (m *VulnerabilityType_PackageIssue) XXX_Size() int {
+	return xxx_messageInfo_VulnerabilityType_PackageIssue.Size(m)
+}
+func (m *VulnerabilityType_PackageIssue) XXX_DiscardUnknown() {
+	xxx_messageInfo_VulnerabilityType_PackageIssue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VulnerabilityType_PackageIssue proto.InternalMessageInfo
 
 func (m *VulnerabilityType_PackageIssue) GetAffectedLocation() *VulnerabilityType_VulnerabilityLocation {
 	if m != nil {
@@ -363,12 +485,15 @@ type VulnerabilityType_VulnerabilityLocation struct {
 	// The cpe_uri in [cpe format] (https://cpe.mitre.org/specification/)
 	// format. Examples include distro or storage location for vulnerable jar.
 	// This field can be used as a filter in list requests.
-	CpeUri string `protobuf:"bytes,1,opt,name=cpe_uri,json=cpeUri" json:"cpe_uri,omitempty"`
+	CpeUri string `protobuf:"bytes,1,opt,name=cpe_uri,json=cpeUri,proto3" json:"cpe_uri,omitempty"`
 	// The package being described.
-	Package string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"`
+	Package string `protobuf:"bytes,2,opt,name=package,proto3" json:"package,omitempty"`
 	// The version of the package being described.
 	// This field can be used as a filter in list requests.
-	Version *VulnerabilityType_Version `protobuf:"bytes,4,opt,name=version" json:"version,omitempty"`
+	Version              *VulnerabilityType_Version `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
 }
 
 func (m *VulnerabilityType_VulnerabilityLocation) Reset() {
@@ -377,8 +502,25 @@ func (m *VulnerabilityType_VulnerabilityLocation) Reset() {
 func (m *VulnerabilityType_VulnerabilityLocation) String() string { return proto.CompactTextString(m) }
 func (*VulnerabilityType_VulnerabilityLocation) ProtoMessage()    {}
 func (*VulnerabilityType_VulnerabilityLocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 4}
+	return fileDescriptor_package_vulnerability_9e58f6e1392a878c, []int{0, 4}
+}
+func (m *VulnerabilityType_VulnerabilityLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Unmarshal(m, b)
 }
+func (m *VulnerabilityType_VulnerabilityLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Marshal(b, m, deterministic)
+}
+func (dst *VulnerabilityType_VulnerabilityLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Merge(dst, src)
+}
+func (m *VulnerabilityType_VulnerabilityLocation) XXX_Size() int {
+	return xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.Size(m)
+}
+func (m *VulnerabilityType_VulnerabilityLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_VulnerabilityType_VulnerabilityLocation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VulnerabilityType_VulnerabilityLocation proto.InternalMessageInfo
 
 func (m *VulnerabilityType_VulnerabilityLocation) GetCpeUri() string {
 	if m != nil {
@@ -413,56 +555,58 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/package_vulnerability.proto", fileDescriptor3)
-}
-
-var fileDescriptor3 = []byte{
-	// 750 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6e, 0xda, 0x4c,
-	0x10, 0xff, 0x6c, 0x0c, 0x86, 0x81, 0x44, 0xce, 0x8a, 0x4f, 0x9f, 0x85, 0xbe, 0x4a, 0x34, 0x55,
-	0x25, 0xd4, 0x83, 0x51, 0xc8, 0xb1, 0x27, 0x0a, 0x24, 0x71, 0x0b, 0x24, 0x35, 0x21, 0xfd, 0x27,
-	0xc5, 0xda, 0x98, 0x0d, 0x59, 0xc5, 0x78, 0x2d, 0xdb, 0xa1, 0xa1, 0xa7, 0x3e, 0x40, 0x6f, 0xbd,
-	0xf7, 0xd0, 0x6b, 0x6f, 0x7d, 0xa0, 0xbe, 0x40, 0x5f, 0xa2, 0xf2, 0xda, 0x8b, 0x20, 0xb4, 0x52,
-	0x24, 0x92, 0x9e, 0xf0, 0xcc, 0x78, 0x7f, 0xbf, 0x99, 0x9d, 0xdf, 0x0c, 0x86, 0xbd, 0x31, 0x63,
-	0x63, 0x97, 0xd4, 0x47, 0x64, 0x1a, 0x31, 0xe6, 0x86, 0x75, 0x87, 0x79, 0x11, 0xa6, 0x1e, 0x09,
-	0xb0, 0x87, 0xdd, 0x59, 0x48, 0xc3, 0xfa, 0x74, 0x07, 0xbb, 0xfe, 0x05, 0xde, 0xa9, 0xfb, 0xd8,
-	0xb9, 0xc4, 0x63, 0x62, 0x4f, 0xaf, 0xdc, 0x38, 0x7e, 0x46, 0x5d, 0x1a, 0xcd, 0x0c, 0x3f, 0x60,
-	0x11, 0x43, 0x4f, 0x12, 0x1c, 0x43, 0xe0, 0x18, 0x2b, 0x38, 0x86, 0xc0, 0xa9, 0xfc, 0x9f, 0x72,
-	0x62, 0x9f, 0xd6, 0xb1, 0xe7, 0xb1, 0x08, 0x47, 0x94, 0x79, 0x61, 0x82, 0xb4, 0xfd, 0x63, 0x13,
-	0xb6, 0x4e, 0x16, 0x19, 0x8e, 0x67, 0x3e, 0x41, 0x0f, 0x00, 0x9c, 0x69, 0x18, 0xda, 0xa1, 0xc3,
-	0x02, 0xa2, 0xcb, 0x55, 0xa9, 0x26, 0x5b, 0x85, 0xd8, 0x33, 0x88, 0x1d, 0xe8, 0x0c, 0xf2, 0x21,
-	0x99, 0x92, 0x80, 0x46, 0x33, 0x3d, 0x53, 0x95, 0x6a, 0x9b, 0x8d, 0x3d, 0xe3, 0xf6, 0x19, 0x19,
-	0x2b, 0x7c, 0xc6, 0x20, 0x45, 0xb3, 0xe6, 0xb8, 0xe8, 0x14, 0xd4, 0x11, 0x89, 0x30, 0x75, 0x43,
-	0x5d, 0xa9, 0x66, 0x6a, 0xc5, 0x46, 0x7b, 0x3d, 0x8a, 0x36, 0x07, 0xb3, 0x04, 0x68, 0xe5, 0xa7,
-	0x04, 0xea, 0x09, 0x09, 0x42, 0xca, 0x3c, 0x54, 0x86, 0x2c, 0xf1, 0x99, 0x73, 0xa1, 0x4b, 0x55,
-	0xa9, 0x96, 0xb5, 0x12, 0x03, 0x21, 0x50, 0x3c, 0x3c, 0x49, 0xca, 0x2f, 0x58, 0xfc, 0x19, 0x55,
-	0x20, 0x1f, 0x90, 0x29, 0x8d, 0x4f, 0xf1, 0xca, 0x0b, 0xd6, 0xdc, 0x46, 0x04, 0x94, 0x4b, 0xea,
-	0x8d, 0xf4, 0x2c, 0xbf, 0x91, 0x97, 0xeb, 0xa5, 0x9b, 0xa6, 0x26, 0x7e, 0x5f, 0x50, 0x6f, 0x64,
-	0x71, 0xf8, 0xed, 0x5d, 0x28, 0x2e, 0x38, 0x11, 0x40, 0xae, 0x7f, 0x68, 0xf5, 0x9a, 0x5d, 0xed,
-	0x1f, 0x54, 0x04, 0xb5, 0x67, 0xf6, 0xcd, 0xde, 0xb0, 0xa7, 0x49, 0xdc, 0x68, 0xbe, 0xe6, 0x86,
-	0x5c, 0xf9, 0xac, 0x40, 0x2e, 0xb9, 0x01, 0xf4, 0x1f, 0xa8, 0x8e, 0x4f, 0xec, 0xab, 0x80, 0xf2,
-	0x72, 0x0b, 0x56, 0xce, 0xf1, 0xc9, 0x30, 0xa0, 0x48, 0x07, 0x35, 0xd5, 0x9c, 0x9e, 0xe7, 0x01,
-	0x61, 0xa2, 0xf7, 0x50, 0x9e, 0x50, 0xcf, 0xc6, 0xe7, 0xe7, 0xc4, 0x89, 0xc8, 0xc8, 0x9e, 0x26,
-	0xfc, 0x7a, 0xae, 0x2a, 0xd5, 0x8a, 0x8d, 0xce, 0x9d, 0x54, 0x6a, 0xa1, 0x09, 0xf5, 0x9a, 0x29,
-	0x83, 0x68, 0x4c, 0x4c, 0x8c, 0xaf, 0x57, 0x89, 0xd5, 0xbb, 0x25, 0xc6, 0xd7, 0x37, 0x89, 0x1f,
-	0xc1, 0x86, 0x50, 0xa2, 0xcd, 0x45, 0xa0, 0xf0, 0x1b, 0x29, 0x09, 0x67, 0x3f, 0x16, 0x43, 0x15,
-	0x8a, 0x23, 0x12, 0x3a, 0x01, 0xf5, 0xe3, 0x89, 0xd2, 0x0b, 0xfc, 0x95, 0x45, 0x17, 0xfa, 0x00,
-	0x9b, 0xe7, 0xf4, 0x9a, 0x8c, 0x6c, 0x97, 0x39, 0x7c, 0xec, 0xb8, 0x38, 0x8a, 0x8d, 0xc1, 0x9a,
-	0x99, 0x2f, 0x7a, 0xba, 0x29, 0xb4, 0xb5, 0xc1, 0xa9, 0x84, 0x89, 0x1e, 0x42, 0x49, 0xac, 0x90,
-	0x68, 0xe6, 0x13, 0x1d, 0x92, 0xf4, 0x52, 0x5f, 0x8c, 0x53, 0xf9, 0x22, 0x43, 0x79, 0x09, 0x2b,
-	0x91, 0x48, 0x18, 0x4b, 0x9f, 0x9f, 0x49, 0x24, 0xce, 0x9f, 0x97, 0x86, 0x5e, 0xb9, 0xa7, 0xa1,
-	0x5f, 0xde, 0x3b, 0xd9, 0x9b, 0x7b, 0x87, 0xc1, 0x86, 0x28, 0x89, 0x86, 0xe1, 0x15, 0xd1, 0x73,
-	0x7c, 0x33, 0x3c, 0x5f, 0x2f, 0x8f, 0xa3, 0x04, 0xd2, 0x8c, 0x11, 0x2d, 0x71, 0x67, 0xdc, 0xaa,
-	0x7c, 0x97, 0xa1, 0xb4, 0x18, 0x46, 0x1f, 0x25, 0xd8, 0x9a, 0xab, 0x71, 0xde, 0x54, 0xe9, 0xfe,
-	0x9a, 0xaa, 0x09, 0xb6, 0x79, 0x5f, 0x57, 0x35, 0x25, 0xff, 0x35, 0x4d, 0xad, 0x8c, 0x45, 0x66,
-	0x75, 0x2c, 0x2a, 0xdf, 0x24, 0xf8, 0xf7, 0xb7, 0x68, 0xb7, 0x5a, 0x3d, 0xf2, 0xf2, 0xea, 0xb1,
-	0x41, 0x15, 0x43, 0xaf, 0xdc, 0xe5, 0xd0, 0x0b, 0xd4, 0xed, 0x53, 0xc8, 0x0b, 0x21, 0x22, 0x1d,
-	0xca, 0x83, 0xce, 0x49, 0xc7, 0x32, 0x8f, 0xdf, 0xd8, 0xc3, 0xfe, 0xe0, 0xa8, 0xd3, 0x32, 0xf7,
-	0xcc, 0x4e, 0x7b, 0x61, 0xb3, 0x36, 0xbb, 0x9a, 0x84, 0x54, 0xc8, 0x74, 0x0f, 0x5f, 0x69, 0x72,
-	0xbc, 0x7b, 0x7b, 0x9d, 0xb6, 0x39, 0xec, 0x69, 0x19, 0x94, 0x07, 0xe5, 0xc0, 0xdc, 0x3f, 0xd0,
-	0x14, 0x54, 0x82, 0x7c, 0xcb, 0x32, 0x8f, 0xcd, 0x56, 0xb3, 0xab, 0x65, 0x9f, 0x7d, 0x92, 0xe0,
-	0xb1, 0xc3, 0x26, 0x22, 0xeb, 0x3f, 0x27, 0x7b, 0x24, 0xbd, 0x7d, 0x97, 0xbe, 0x34, 0x66, 0x2e,
-	0xf6, 0xc6, 0x06, 0x0b, 0xc6, 0xf5, 0x31, 0xf1, 0xf8, 0x1f, 0x75, 0x3d, 0x09, 0x61, 0x9f, 0x86,
-	0xb7, 0xf9, 0x7a, 0x78, 0xba, 0x12, 0xfa, 0x2a, 0x67, 0xf6, 0x5b, 0xcd, 0xb3, 0x1c, 0x47, 0xdb,
-	0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xe7, 0xb7, 0xf5, 0x8a, 0x08, 0x00, 0x00,
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/package_vulnerability.proto", fileDescriptor_package_vulnerability_9e58f6e1392a878c)
+}
+
+var fileDescriptor_package_vulnerability_9e58f6e1392a878c = []byte{
+	// 769 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6e, 0xfa, 0x46,
+	0x10, 0xae, 0x8d, 0xc1, 0x30, 0x26, 0x91, 0xb3, 0xa2, 0xaa, 0x85, 0x5a, 0x95, 0xa6, 0xaa, 0x84,
+	0x7a, 0x30, 0x0a, 0x39, 0xf6, 0x44, 0x81, 0x24, 0x6e, 0x81, 0xa4, 0x26, 0xa4, 0xff, 0xa4, 0x58,
+	0x8b, 0xd9, 0x90, 0x55, 0x8c, 0xd7, 0xf2, 0x3a, 0x34, 0xf4, 0xd4, 0x07, 0xe8, 0x33, 0xf4, 0xd0,
+	0x6b, 0x6f, 0x55, 0xdf, 0xaa, 0x0f, 0xd1, 0xca, 0x6b, 0x2f, 0x82, 0xd0, 0x4a, 0x91, 0x48, 0x7e,
+	0x27, 0x3c, 0x33, 0xe6, 0xfb, 0x66, 0x76, 0xbf, 0xf9, 0x00, 0xce, 0xe6, 0x8c, 0xcd, 0x03, 0xd2,
+	0x9a, 0x91, 0x65, 0xc2, 0x58, 0xc0, 0x5b, 0x3e, 0x0b, 0x13, 0x4c, 0x43, 0x12, 0xe3, 0x10, 0x07,
+	0x2b, 0x4e, 0x79, 0x6b, 0x79, 0x82, 0x83, 0xe8, 0x1e, 0x9f, 0xb4, 0x22, 0xec, 0x3f, 0xe0, 0x39,
+	0xf1, 0x96, 0x8f, 0x41, 0x5a, 0x9f, 0xd2, 0x80, 0x26, 0x2b, 0x3b, 0x8a, 0x59, 0xc2, 0xd0, 0xe7,
+	0x19, 0x8e, 0x2d, 0x71, 0xec, 0x1d, 0x1c, 0x5b, 0xe2, 0xd4, 0x3f, 0xcc, 0x39, 0x71, 0x44, 0x5b,
+	0x38, 0x0c, 0x59, 0x82, 0x13, 0xca, 0x42, 0x9e, 0x21, 0x1d, 0xff, 0x73, 0x08, 0x47, 0x37, 0x9b,
+	0x0c, 0xd7, 0xab, 0x88, 0xa0, 0x8f, 0x00, 0xfc, 0x25, 0xe7, 0x1e, 0xf7, 0x59, 0x4c, 0x2c, 0xb5,
+	0xa1, 0x34, 0x55, 0xb7, 0x92, 0x66, 0xc6, 0x69, 0x02, 0x4d, 0xa1, 0xcc, 0xc9, 0x92, 0xc4, 0x34,
+	0x59, 0x59, 0x85, 0x86, 0xd2, 0x3c, 0x6c, 0x9f, 0xd9, 0x2f, 0xef, 0xc8, 0xde, 0xe1, 0xb3, 0xc7,
+	0x39, 0x9a, 0xbb, 0xc6, 0x45, 0xb7, 0xa0, 0xcf, 0x48, 0x82, 0x69, 0xc0, 0x2d, 0xad, 0x51, 0x68,
+	0x1a, 0xed, 0xde, 0x7e, 0x14, 0x3d, 0x01, 0xe6, 0x4a, 0xd0, 0xfa, 0xdf, 0x0a, 0xe8, 0x37, 0x24,
+	0xe6, 0x94, 0x85, 0xa8, 0x06, 0x45, 0x12, 0x31, 0xff, 0xde, 0x52, 0x1a, 0x4a, 0xb3, 0xe8, 0x66,
+	0x01, 0x42, 0xa0, 0x85, 0x78, 0x91, 0x8d, 0x5f, 0x71, 0xc5, 0x33, 0xaa, 0x43, 0x39, 0x26, 0x4b,
+	0x9a, 0x7e, 0x4b, 0x4c, 0x5e, 0x71, 0xd7, 0x31, 0x22, 0xa0, 0x3d, 0xd0, 0x70, 0x66, 0x15, 0xc5,
+	0x89, 0x7c, 0xb3, 0x5f, 0xbb, 0x79, 0x6b, 0xf2, 0xf3, 0x6b, 0x1a, 0xce, 0x5c, 0x01, 0x7f, 0x7c,
+	0x0a, 0xc6, 0x46, 0x12, 0x01, 0x94, 0x46, 0x97, 0xee, 0xb0, 0x33, 0x30, 0xdf, 0x43, 0x06, 0xe8,
+	0x43, 0x67, 0xe4, 0x0c, 0x27, 0x43, 0x53, 0x11, 0x41, 0xe7, 0x3b, 0x11, 0xa8, 0xf5, 0xbf, 0x34,
+	0x28, 0x65, 0x27, 0x80, 0x3e, 0x00, 0xdd, 0x8f, 0x88, 0xf7, 0x18, 0x53, 0x31, 0x6e, 0xc5, 0x2d,
+	0xf9, 0x11, 0x99, 0xc4, 0x14, 0x59, 0xa0, 0xe7, 0x9a, 0xb3, 0xca, 0xa2, 0x20, 0x43, 0xf4, 0x13,
+	0xd4, 0x16, 0x34, 0xf4, 0xf0, 0xdd, 0x1d, 0xf1, 0x13, 0x32, 0xf3, 0x96, 0x19, 0xbf, 0x55, 0x6a,
+	0x28, 0x4d, 0xa3, 0xdd, 0x7f, 0x95, 0x49, 0x5d, 0xb4, 0xa0, 0x61, 0x27, 0x67, 0x90, 0x17, 0x93,
+	0x12, 0xe3, 0xa7, 0x5d, 0x62, 0xfd, 0x75, 0x89, 0xf1, 0xd3, 0x73, 0xe2, 0x4f, 0xe1, 0x40, 0x2a,
+	0xd1, 0x13, 0x22, 0xd0, 0xc4, 0x89, 0x54, 0x65, 0x72, 0x94, 0x8a, 0xa1, 0x01, 0xc6, 0x8c, 0x70,
+	0x3f, 0xa6, 0x51, 0xba, 0x51, 0x56, 0x45, 0xbc, 0xb2, 0x99, 0x42, 0x3f, 0xc3, 0xe1, 0x1d, 0x7d,
+	0x22, 0x33, 0x2f, 0x60, 0xbe, 0x58, 0x3b, 0x21, 0x0e, 0xa3, 0x3d, 0xde, 0xb3, 0xf3, 0xcd, 0xcc,
+	0x20, 0x87, 0x76, 0x0f, 0x04, 0x95, 0x0c, 0xd1, 0x27, 0x50, 0x95, 0x16, 0x92, 0xac, 0x22, 0x62,
+	0x41, 0xd6, 0x5e, 0x9e, 0x13, 0x6b, 0xfe, 0x31, 0x18, 0x94, 0x7b, 0x6c, 0xca, 0x59, 0x40, 0x12,
+	0x62, 0x19, 0x0d, 0xa5, 0x59, 0x76, 0x81, 0xf2, 0xcb, 0x3c, 0x53, 0xff, 0x4d, 0x85, 0xda, 0x16,
+	0x59, 0xa6, 0x21, 0x9e, 0xee, 0x86, 0x00, 0xcd, 0x76, 0x40, 0x3c, 0x6f, 0xb9, 0x82, 0xf6, 0x46,
+	0xae, 0xb0, 0x6d, 0x4c, 0xc5, 0xe7, 0xc6, 0xc4, 0xe0, 0x40, 0xce, 0x4c, 0x39, 0x7f, 0x24, 0x56,
+	0x49, 0x58, 0xc7, 0x57, 0xfb, 0xf5, 0x71, 0x95, 0x41, 0x3a, 0x29, 0xa2, 0x2b, 0x0f, 0x55, 0x44,
+	0xf5, 0x3f, 0x55, 0xa8, 0x6e, 0x96, 0xd1, 0x2f, 0x0a, 0x1c, 0xad, 0xe5, 0xba, 0xbe, 0x75, 0xe5,
+	0xed, 0x6e, 0xdd, 0x94, 0x6c, 0xeb, 0x8b, 0xdf, 0x15, 0x9d, 0xfa, 0xce, 0x44, 0xb7, 0xb3, 0x37,
+	0x85, 0xdd, 0xbd, 0xa9, 0xff, 0xa1, 0xc0, 0xfb, 0xff, 0x89, 0xf6, 0x22, 0x6f, 0x52, 0xb7, 0xbd,
+	0xc9, 0x03, 0x5d, 0xba, 0x82, 0xf6, 0x9a, 0xae, 0x20, 0x51, 0x8f, 0x6f, 0xa1, 0x2c, 0x85, 0x88,
+	0x2c, 0xa8, 0x8d, 0xfb, 0x37, 0x7d, 0xd7, 0xb9, 0xfe, 0xde, 0x9b, 0x8c, 0xc6, 0x57, 0xfd, 0xae,
+	0x73, 0xe6, 0xf4, 0x7b, 0x1b, 0xd6, 0xdb, 0x19, 0x98, 0x0a, 0xd2, 0xa1, 0x30, 0xb8, 0xfc, 0xd6,
+	0x54, 0x53, 0x73, 0x1e, 0xf6, 0x7b, 0xce, 0x64, 0x68, 0x16, 0x50, 0x19, 0xb4, 0x0b, 0xe7, 0xfc,
+	0xc2, 0xd4, 0x50, 0x15, 0xca, 0x5d, 0xd7, 0xb9, 0x76, 0xba, 0x9d, 0x81, 0x59, 0xfc, 0xf2, 0x57,
+	0x05, 0x3e, 0xf3, 0xd9, 0x42, 0x76, 0xfd, 0xff, 0xcd, 0x5e, 0x29, 0x3f, 0xfc, 0x98, 0xbf, 0x34,
+	0x67, 0x01, 0x0e, 0xe7, 0x36, 0x8b, 0xe7, 0xad, 0x39, 0x09, 0xc5, 0x2f, 0x79, 0x2b, 0x2b, 0xe1,
+	0x88, 0xf2, 0x97, 0xfc, 0xbd, 0xf8, 0x62, 0xa7, 0xf4, 0xbb, 0x5a, 0x38, 0xef, 0x76, 0xa6, 0x25,
+	0x81, 0x76, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x66, 0xf8, 0xb7, 0x2f, 0xab, 0x08, 0x00,
+	0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
index fa3e9b8c..57f59e13 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/provenance.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/provenance.proto
 
-package containeranalysis
+package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Specifies the hash algorithm, if any.
 type Hash_HashType int32
 
@@ -36,46 +42,70 @@ var Hash_HashType_value = map[string]int32{
 func (x Hash_HashType) String() string {
 	return proto.EnumName(Hash_HashType_name, int32(x))
 }
-func (Hash_HashType) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{3, 0} }
+func (Hash_HashType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{3, 0}
+}
 
 // Provenance of a build. Contains all information needed to verify the full
 // details about the build from source to completion.
 type BuildProvenance struct {
 	// Unique identifier of the build.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// ID of the project.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Commands requested by the build.
-	Commands []*Command `protobuf:"bytes,5,rep,name=commands" json:"commands,omitempty"`
+	Commands []*Command `protobuf:"bytes,5,rep,name=commands,proto3" json:"commands,omitempty"`
 	// Output of the build.
-	BuiltArtifacts []*Artifact `protobuf:"bytes,6,rep,name=built_artifacts,json=builtArtifacts" json:"built_artifacts,omitempty"`
+	BuiltArtifacts []*Artifact `protobuf:"bytes,6,rep,name=built_artifacts,json=builtArtifacts,proto3" json:"built_artifacts,omitempty"`
 	// Time at which the build was created.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time at which execution of the build was started.
-	StartTime *google_protobuf1.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time at which execution of the build was finished.
-	FinishTime *google_protobuf1.Timestamp `protobuf:"bytes,9,opt,name=finish_time,json=finishTime" json:"finish_time,omitempty"`
+	FinishTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
 	// E-mail address of the user who initiated this build. Note that this was the
 	// user's e-mail address at the time the build was initiated; this address may
 	// not represent the same end-user for all time.
-	Creator string `protobuf:"bytes,11,opt,name=creator" json:"creator,omitempty"`
+	Creator string `protobuf:"bytes,11,opt,name=creator,proto3" json:"creator,omitempty"`
 	// Google Cloud Storage bucket where logs were written.
-	LogsBucket string `protobuf:"bytes,13,opt,name=logs_bucket,json=logsBucket" json:"logs_bucket,omitempty"`
+	LogsBucket string `protobuf:"bytes,13,opt,name=logs_bucket,json=logsBucket,proto3" json:"logs_bucket,omitempty"`
 	// Details of the Source input to the build.
-	SourceProvenance *Source `protobuf:"bytes,14,opt,name=source_provenance,json=sourceProvenance" json:"source_provenance,omitempty"`
+	SourceProvenance *Source `protobuf:"bytes,14,opt,name=source_provenance,json=sourceProvenance,proto3" json:"source_provenance,omitempty"`
 	// Trigger identifier if the build was triggered automatically; empty if not.
-	TriggerId string `protobuf:"bytes,15,opt,name=trigger_id,json=triggerId" json:"trigger_id,omitempty"`
+	TriggerId string `protobuf:"bytes,15,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"`
 	// Special options applied to this build. This is a catch-all field where
 	// build providers can enter any desired additional details.
-	BuildOptions map[string]string `protobuf:"bytes,16,rep,name=build_options,json=buildOptions" json:"build_options,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	BuildOptions map[string]string `protobuf:"bytes,16,rep,name=build_options,json=buildOptions,proto3" json:"build_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Version string of the builder at the time this build was executed.
-	BuilderVersion string `protobuf:"bytes,17,opt,name=builder_version,json=builderVersion" json:"builder_version,omitempty"`
+	BuilderVersion       string   `protobuf:"bytes,17,opt,name=builder_version,json=builderVersion,proto3" json:"builder_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BuildProvenance) Reset()         { *m = BuildProvenance{} }
+func (m *BuildProvenance) String() string { return proto.CompactTextString(m) }
+func (*BuildProvenance) ProtoMessage()    {}
+func (*BuildProvenance) Descriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{0}
+}
+func (m *BuildProvenance) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildProvenance.Unmarshal(m, b)
+}
+func (m *BuildProvenance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildProvenance.Marshal(b, m, deterministic)
+}
+func (dst *BuildProvenance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildProvenance.Merge(dst, src)
+}
+func (m *BuildProvenance) XXX_Size() int {
+	return xxx_messageInfo_BuildProvenance.Size(m)
+}
+func (m *BuildProvenance) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildProvenance.DiscardUnknown(m)
 }
 
-func (m *BuildProvenance) Reset()                    { *m = BuildProvenance{} }
-func (m *BuildProvenance) String() string            { return proto.CompactTextString(m) }
-func (*BuildProvenance) ProtoMessage()               {}
-func (*BuildProvenance) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_BuildProvenance proto.InternalMessageInfo
 
 func (m *BuildProvenance) GetId() string {
 	if m != nil {
@@ -105,21 +135,21 @@ func (m *BuildProvenance) GetBuiltArtifacts() []*Artifact {
 	return nil
 }
 
-func (m *BuildProvenance) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *BuildProvenance) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *BuildProvenance) GetStartTime() *google_protobuf1.Timestamp {
+func (m *BuildProvenance) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *BuildProvenance) GetFinishTime() *google_protobuf1.Timestamp {
+func (m *BuildProvenance) GetFinishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.FinishTime
 	}
@@ -178,7 +208,7 @@ type Source struct {
 	Source isSource_Source `protobuf_oneof:"source"`
 	// If provided, the input binary artifacts for the build came from this
 	// location.
-	ArtifactStorageSource *StorageSource `protobuf:"bytes,4,opt,name=artifact_storage_source,json=artifactStorageSource" json:"artifact_storage_source,omitempty"`
+	ArtifactStorageSource *StorageSource `protobuf:"bytes,4,opt,name=artifact_storage_source,json=artifactStorageSource,proto3" json:"artifact_storage_source,omitempty"`
 	// Hash(es) of the build source, which can be used to verify that the original
 	// source integrity was maintained in the build.
 	//
@@ -187,34 +217,58 @@ type Source struct {
 	//
 	// If the build source came in a single package such as a gzipped tarfile
 	// (.tar.gz), the FileHash will be for the single path to that file.
-	FileHashes map[string]*FileHashes `protobuf:"bytes,3,rep,name=file_hashes,json=fileHashes" json:"file_hashes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	FileHashes map[string]*FileHashes `protobuf:"bytes,3,rep,name=file_hashes,json=fileHashes,proto3" json:"file_hashes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// If provided, the source code used for the build came from this location.
-	Context *SourceContext `protobuf:"bytes,7,opt,name=context" json:"context,omitempty"`
+	Context *SourceContext `protobuf:"bytes,7,opt,name=context,proto3" json:"context,omitempty"`
 	// If provided, some of the source code used for the build may be found in
 	// these locations, in the case where the source repository had multiple
 	// remotes or submodules. This list will not include the context specified in
 	// the context field.
-	AdditionalContexts []*SourceContext `protobuf:"bytes,8,rep,name=additional_contexts,json=additionalContexts" json:"additional_contexts,omitempty"`
+	AdditionalContexts   []*SourceContext `protobuf:"bytes,8,rep,name=additional_contexts,json=additionalContexts,proto3" json:"additional_contexts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *Source) Reset()                    { *m = Source{} }
-func (m *Source) String() string            { return proto.CompactTextString(m) }
-func (*Source) ProtoMessage()               {}
-func (*Source) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+func (m *Source) Reset()         { *m = Source{} }
+func (m *Source) String() string { return proto.CompactTextString(m) }
+func (*Source) ProtoMessage()    {}
+func (*Source) Descriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{1}
+}
+func (m *Source) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Source.Unmarshal(m, b)
+}
+func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
+}
+func (dst *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(dst, src)
+}
+func (m *Source) XXX_Size() int {
+	return xxx_messageInfo_Source.Size(m)
+}
+func (m *Source) XXX_DiscardUnknown() {
+	xxx_messageInfo_Source.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Source proto.InternalMessageInfo
 
 type isSource_Source interface {
 	isSource_Source()
 }
 
 type Source_StorageSource struct {
-	StorageSource *StorageSource `protobuf:"bytes,1,opt,name=storage_source,json=storageSource,oneof"`
+	StorageSource *StorageSource `protobuf:"bytes,1,opt,name=storage_source,json=storageSource,proto3,oneof"`
 }
+
 type Source_RepoSource struct {
-	RepoSource *RepoSource `protobuf:"bytes,2,opt,name=repo_source,json=repoSource,oneof"`
+	RepoSource *RepoSource `protobuf:"bytes,2,opt,name=repo_source,json=repoSource,proto3,oneof"`
 }
 
 func (*Source_StorageSource) isSource_Source() {}
-func (*Source_RepoSource) isSource_Source()    {}
+
+func (*Source_RepoSource) isSource_Source() {}
 
 func (m *Source) GetSource() isSource_Source {
 	if m != nil {
@@ -324,12 +378,12 @@ func _Source_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Source.(type) {
 	case *Source_StorageSource:
 		s := proto.Size(x.StorageSource)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Source_RepoSource:
 		s := proto.Size(x.RepoSource)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -343,13 +397,35 @@ func _Source_OneofSizer(msg proto.Message) (n int) {
 // messages to verify integrity of source input to the build.
 type FileHashes struct {
 	// Collection of file hashes.
-	FileHash []*Hash `protobuf:"bytes,1,rep,name=file_hash,json=fileHash" json:"file_hash,omitempty"`
+	FileHash             []*Hash  `protobuf:"bytes,1,rep,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FileHashes) Reset()         { *m = FileHashes{} }
+func (m *FileHashes) String() string { return proto.CompactTextString(m) }
+func (*FileHashes) ProtoMessage()    {}
+func (*FileHashes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{2}
+}
+func (m *FileHashes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileHashes.Unmarshal(m, b)
+}
+func (m *FileHashes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileHashes.Marshal(b, m, deterministic)
+}
+func (dst *FileHashes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileHashes.Merge(dst, src)
+}
+func (m *FileHashes) XXX_Size() int {
+	return xxx_messageInfo_FileHashes.Size(m)
+}
+func (m *FileHashes) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileHashes.DiscardUnknown(m)
 }
 
-func (m *FileHashes) Reset()                    { *m = FileHashes{} }
-func (m *FileHashes) String() string            { return proto.CompactTextString(m) }
-func (*FileHashes) ProtoMessage()               {}
-func (*FileHashes) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
+var xxx_messageInfo_FileHashes proto.InternalMessageInfo
 
 func (m *FileHashes) GetFileHash() []*Hash {
 	if m != nil {
@@ -361,15 +437,37 @@ func (m *FileHashes) GetFileHash() []*Hash {
 // Container message for hash values.
 type Hash struct {
 	// The type of hash that was performed.
-	Type Hash_HashType `protobuf:"varint,1,opt,name=type,enum=google.devtools.containeranalysis.v1alpha1.Hash_HashType" json:"type,omitempty"`
+	Type Hash_HashType `protobuf:"varint,1,opt,name=type,proto3,enum=google.devtools.containeranalysis.v1alpha1.Hash_HashType" json:"type,omitempty"`
 	// The hash value.
-	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	Value                []byte   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Hash) Reset()         { *m = Hash{} }
+func (m *Hash) String() string { return proto.CompactTextString(m) }
+func (*Hash) ProtoMessage()    {}
+func (*Hash) Descriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{3}
+}
+func (m *Hash) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Hash.Unmarshal(m, b)
+}
+func (m *Hash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Hash.Marshal(b, m, deterministic)
+}
+func (dst *Hash) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Hash.Merge(dst, src)
+}
+func (m *Hash) XXX_Size() int {
+	return xxx_messageInfo_Hash.Size(m)
+}
+func (m *Hash) XXX_DiscardUnknown() {
+	xxx_messageInfo_Hash.DiscardUnknown(m)
 }
 
-func (m *Hash) Reset()                    { *m = Hash{} }
-func (m *Hash) String() string            { return proto.CompactTextString(m) }
-func (*Hash) ProtoMessage()               {}
-func (*Hash) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+var xxx_messageInfo_Hash proto.InternalMessageInfo
 
 func (m *Hash) GetType() Hash_HashType {
 	if m != nil {
@@ -391,17 +489,39 @@ type StorageSource struct {
 	// Google Cloud Storage bucket containing source (see [Bucket Name
 	// Requirements]
 	// (https://cloud.google.com/storage/docs/bucket-naming#requirements)).
-	Bucket string `protobuf:"bytes,1,opt,name=bucket" json:"bucket,omitempty"`
+	Bucket string `protobuf:"bytes,1,opt,name=bucket,proto3" json:"bucket,omitempty"`
 	// Google Cloud Storage object containing source.
-	Object string `protobuf:"bytes,2,opt,name=object" json:"object,omitempty"`
+	Object string `protobuf:"bytes,2,opt,name=object,proto3" json:"object,omitempty"`
 	// Google Cloud Storage generation for the object.
-	Generation int64 `protobuf:"varint,3,opt,name=generation" json:"generation,omitempty"`
+	Generation           int64    `protobuf:"varint,3,opt,name=generation,proto3" json:"generation,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StorageSource) Reset()                    { *m = StorageSource{} }
-func (m *StorageSource) String() string            { return proto.CompactTextString(m) }
-func (*StorageSource) ProtoMessage()               {}
-func (*StorageSource) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
+func (m *StorageSource) Reset()         { *m = StorageSource{} }
+func (m *StorageSource) String() string { return proto.CompactTextString(m) }
+func (*StorageSource) ProtoMessage()    {}
+func (*StorageSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{4}
+}
+func (m *StorageSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StorageSource.Unmarshal(m, b)
+}
+func (m *StorageSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StorageSource.Marshal(b, m, deterministic)
+}
+func (dst *StorageSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StorageSource.Merge(dst, src)
+}
+func (m *StorageSource) XXX_Size() int {
+	return xxx_messageInfo_StorageSource.Size(m)
+}
+func (m *StorageSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_StorageSource.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StorageSource proto.InternalMessageInfo
 
 func (m *StorageSource) GetBucket() string {
 	if m != nil {
@@ -428,9 +548,9 @@ func (m *StorageSource) GetGeneration() int64 {
 // Repository.
 type RepoSource struct {
 	// ID of the project that owns the repo.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Name of the repo.
-	RepoName string `protobuf:"bytes,2,opt,name=repo_name,json=repoName" json:"repo_name,omitempty"`
+	RepoName string `protobuf:"bytes,2,opt,name=repo_name,json=repoName,proto3" json:"repo_name,omitempty"`
 	// A revision within the source repository must be specified in
 	// one of these ways.
 	//
@@ -438,31 +558,71 @@ type RepoSource struct {
 	//	*RepoSource_BranchName
 	//	*RepoSource_TagName
 	//	*RepoSource_CommitSha
-	Revision isRepoSource_Revision `protobuf_oneof:"revision"`
+	Revision             isRepoSource_Revision `protobuf_oneof:"revision"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *RepoSource) Reset()         { *m = RepoSource{} }
+func (m *RepoSource) String() string { return proto.CompactTextString(m) }
+func (*RepoSource) ProtoMessage()    {}
+func (*RepoSource) Descriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{5}
+}
+func (m *RepoSource) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RepoSource.Unmarshal(m, b)
+}
+func (m *RepoSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RepoSource.Marshal(b, m, deterministic)
+}
+func (dst *RepoSource) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoSource.Merge(dst, src)
+}
+func (m *RepoSource) XXX_Size() int {
+	return xxx_messageInfo_RepoSource.Size(m)
+}
+func (m *RepoSource) XXX_DiscardUnknown() {
+	xxx_messageInfo_RepoSource.DiscardUnknown(m)
 }
 
-func (m *RepoSource) Reset()                    { *m = RepoSource{} }
-func (m *RepoSource) String() string            { return proto.CompactTextString(m) }
-func (*RepoSource) ProtoMessage()               {}
-func (*RepoSource) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
+var xxx_messageInfo_RepoSource proto.InternalMessageInfo
+
+func (m *RepoSource) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+func (m *RepoSource) GetRepoName() string {
+	if m != nil {
+		return m.RepoName
+	}
+	return ""
+}
 
 type isRepoSource_Revision interface {
 	isRepoSource_Revision()
 }
 
 type RepoSource_BranchName struct {
-	BranchName string `protobuf:"bytes,3,opt,name=branch_name,json=branchName,oneof"`
+	BranchName string `protobuf:"bytes,3,opt,name=branch_name,json=branchName,proto3,oneof"`
 }
+
 type RepoSource_TagName struct {
-	TagName string `protobuf:"bytes,4,opt,name=tag_name,json=tagName,oneof"`
+	TagName string `protobuf:"bytes,4,opt,name=tag_name,json=tagName,proto3,oneof"`
 }
+
 type RepoSource_CommitSha struct {
-	CommitSha string `protobuf:"bytes,5,opt,name=commit_sha,json=commitSha,oneof"`
+	CommitSha string `protobuf:"bytes,5,opt,name=commit_sha,json=commitSha,proto3,oneof"`
 }
 
 func (*RepoSource_BranchName) isRepoSource_Revision() {}
-func (*RepoSource_TagName) isRepoSource_Revision()    {}
-func (*RepoSource_CommitSha) isRepoSource_Revision()  {}
+
+func (*RepoSource_TagName) isRepoSource_Revision() {}
+
+func (*RepoSource_CommitSha) isRepoSource_Revision() {}
 
 func (m *RepoSource) GetRevision() isRepoSource_Revision {
 	if m != nil {
@@ -471,20 +631,6 @@ func (m *RepoSource) GetRevision() isRepoSource_Revision {
 	return nil
 }
 
-func (m *RepoSource) GetProjectId() string {
-	if m != nil {
-		return m.ProjectId
-	}
-	return ""
-}
-
-func (m *RepoSource) GetRepoName() string {
-	if m != nil {
-		return m.RepoName
-	}
-	return ""
-}
-
 func (m *RepoSource) GetBranchName() string {
 	if x, ok := m.GetRevision().(*RepoSource_BranchName); ok {
 		return x.BranchName
@@ -569,15 +715,15 @@ func _RepoSource_OneofSizer(msg proto.Message) (n int) {
 	// revision
 	switch x := m.Revision.(type) {
 	case *RepoSource_BranchName:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.BranchName)))
 		n += len(x.BranchName)
 	case *RepoSource_TagName:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.TagName)))
 		n += len(x.TagName)
 	case *RepoSource_CommitSha:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.CommitSha)))
 		n += len(x.CommitSha)
 	case nil:
@@ -591,25 +737,47 @@ func _RepoSource_OneofSizer(msg proto.Message) (n int) {
 type Command struct {
 	// Name of the command, as presented on the command line, or if the command is
 	// packaged as a Docker container, as presented to `docker pull`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Environment variables set before running this Command.
-	Env []string `protobuf:"bytes,2,rep,name=env" json:"env,omitempty"`
+	Env []string `protobuf:"bytes,2,rep,name=env,proto3" json:"env,omitempty"`
 	// Command-line arguments used when executing this Command.
-	Args []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
+	Args []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
 	// Working directory (relative to project source root) used when running
 	// this Command.
-	Dir string `protobuf:"bytes,4,opt,name=dir" json:"dir,omitempty"`
+	Dir string `protobuf:"bytes,4,opt,name=dir,proto3" json:"dir,omitempty"`
 	// Optional unique identifier for this Command, used in wait_for to reference
 	// this Command as a dependency.
-	Id string `protobuf:"bytes,5,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,5,opt,name=id,proto3" json:"id,omitempty"`
 	// The ID(s) of the Command(s) that this Command depends on.
-	WaitFor []string `protobuf:"bytes,6,rep,name=wait_for,json=waitFor" json:"wait_for,omitempty"`
+	WaitFor              []string `protobuf:"bytes,6,rep,name=wait_for,json=waitFor,proto3" json:"wait_for,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Command) Reset()                    { *m = Command{} }
-func (m *Command) String() string            { return proto.CompactTextString(m) }
-func (*Command) ProtoMessage()               {}
-func (*Command) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
+func (m *Command) Reset()         { *m = Command{} }
+func (m *Command) String() string { return proto.CompactTextString(m) }
+func (*Command) ProtoMessage()    {}
+func (*Command) Descriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{6}
+}
+func (m *Command) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Command.Unmarshal(m, b)
+}
+func (m *Command) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Command.Marshal(b, m, deterministic)
+}
+func (dst *Command) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Command.Merge(dst, src)
+}
+func (m *Command) XXX_Size() int {
+	return xxx_messageInfo_Command.Size(m)
+}
+func (m *Command) XXX_DiscardUnknown() {
+	xxx_messageInfo_Command.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Command proto.InternalMessageInfo
 
 func (m *Command) GetName() string {
 	if m != nil {
@@ -663,25 +831,47 @@ type Artifact struct {
 	// to exist here to allow existing BuildProvenance serialized to json in
 	// google.devtools.containeranalysis.v1alpha1.BuildDetails.provenance_bytes to
 	// deserialize back into proto.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Hash or checksum value of a binary, or Docker Registry 2.0 digest of a
 	// container.
-	Checksum string `protobuf:"bytes,2,opt,name=checksum" json:"checksum,omitempty"`
+	Checksum string `protobuf:"bytes,2,opt,name=checksum,proto3" json:"checksum,omitempty"`
 	// Artifact ID, if any; for container images, this will be a URL by digest
 	// like gcr.io/projectID/imagename@sha256:123456
-	Id string `protobuf:"bytes,3,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
 	// Related artifact names. This may be the path to a binary or jar file, or in
 	// the case of a container build, the name used to push the container image to
 	// Google Container Registry, as presented to `docker push`. Note that a
 	// single Artifact ID can have multiple names, for example if two tags are
 	// applied to one image.
-	Names []string `protobuf:"bytes,4,rep,name=names" json:"names,omitempty"`
+	Names                []string `protobuf:"bytes,4,rep,name=names,proto3" json:"names,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Artifact) Reset()         { *m = Artifact{} }
+func (m *Artifact) String() string { return proto.CompactTextString(m) }
+func (*Artifact) ProtoMessage()    {}
+func (*Artifact) Descriptor() ([]byte, []int) {
+	return fileDescriptor_provenance_ae080c06fe939617, []int{7}
+}
+func (m *Artifact) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Artifact.Unmarshal(m, b)
+}
+func (m *Artifact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Artifact.Marshal(b, m, deterministic)
+}
+func (dst *Artifact) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Artifact.Merge(dst, src)
+}
+func (m *Artifact) XXX_Size() int {
+	return xxx_messageInfo_Artifact.Size(m)
+}
+func (m *Artifact) XXX_DiscardUnknown() {
+	xxx_messageInfo_Artifact.DiscardUnknown(m)
 }
 
-func (m *Artifact) Reset()                    { *m = Artifact{} }
-func (m *Artifact) String() string            { return proto.CompactTextString(m) }
-func (*Artifact) ProtoMessage()               {}
-func (*Artifact) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{7} }
+var xxx_messageInfo_Artifact proto.InternalMessageInfo
 
 func (m *Artifact) GetName() string {
 	if m != nil {
@@ -713,7 +903,9 @@ func (m *Artifact) GetNames() []string {
 
 func init() {
 	proto.RegisterType((*BuildProvenance)(nil), "google.devtools.containeranalysis.v1alpha1.BuildProvenance")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.containeranalysis.v1alpha1.BuildProvenance.BuildOptionsEntry")
 	proto.RegisterType((*Source)(nil), "google.devtools.containeranalysis.v1alpha1.Source")
+	proto.RegisterMapType((map[string]*FileHashes)(nil), "google.devtools.containeranalysis.v1alpha1.Source.FileHashesEntry")
 	proto.RegisterType((*FileHashes)(nil), "google.devtools.containeranalysis.v1alpha1.FileHashes")
 	proto.RegisterType((*Hash)(nil), "google.devtools.containeranalysis.v1alpha1.Hash")
 	proto.RegisterType((*StorageSource)(nil), "google.devtools.containeranalysis.v1alpha1.StorageSource")
@@ -724,10 +916,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/provenance.proto", fileDescriptor4)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/provenance.proto", fileDescriptor_provenance_ae080c06fe939617)
 }
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_provenance_ae080c06fe939617 = []byte{
 	// 1026 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0x1b, 0x45,
 	0x14, 0xee, 0xfa, 0x77, 0xf7, 0xb8, 0x71, 0x92, 0xa1, 0xc0, 0xe2, 0x52, 0x62, 0x2c, 0x21, 0x22,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
index 3ab29ad9..e481702d 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1/source_context.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/containeranalysis/v1alpha1/source_context.proto
 
-package containeranalysis
+package containeranalysis // import "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1alpha1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The type of an alias.
 type AliasContext_Kind int32
 
@@ -44,7 +50,9 @@ var AliasContext_Kind_value = map[string]int32{
 func (x AliasContext_Kind) String() string {
 	return proto.EnumName(AliasContext_Kind_name, int32(x))
 }
-func (AliasContext_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{1, 0} }
+func (AliasContext_Kind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_78f437f8b7f72e1b, []int{1, 0}
+}
 
 // A SourceContext is a reference to a tree of files. A SourceContext together
 // with a path point to a unique revision of a single file or directory.
@@ -57,31 +65,57 @@ type SourceContext struct {
 	//	*SourceContext_Git
 	Context isSourceContext_Context `protobuf_oneof:"context"`
 	// Labels with user defined metadata.
-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *SourceContext) Reset()                    { *m = SourceContext{} }
-func (m *SourceContext) String() string            { return proto.CompactTextString(m) }
-func (*SourceContext) ProtoMessage()               {}
-func (*SourceContext) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+func (m *SourceContext) Reset()         { *m = SourceContext{} }
+func (m *SourceContext) String() string { return proto.CompactTextString(m) }
+func (*SourceContext) ProtoMessage()    {}
+func (*SourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_78f437f8b7f72e1b, []int{0}
+}
+func (m *SourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceContext.Unmarshal(m, b)
+}
+func (m *SourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic)
+}
+func (dst *SourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceContext.Merge(dst, src)
+}
+func (m *SourceContext) XXX_Size() int {
+	return xxx_messageInfo_SourceContext.Size(m)
+}
+func (m *SourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SourceContext proto.InternalMessageInfo
 
 type isSourceContext_Context interface {
 	isSourceContext_Context()
 }
 
 type SourceContext_CloudRepo struct {
-	CloudRepo *CloudRepoSourceContext `protobuf:"bytes,1,opt,name=cloud_repo,json=cloudRepo,oneof"`
+	CloudRepo *CloudRepoSourceContext `protobuf:"bytes,1,opt,name=cloud_repo,json=cloudRepo,proto3,oneof"`
 }
+
 type SourceContext_Gerrit struct {
-	Gerrit *GerritSourceContext `protobuf:"bytes,2,opt,name=gerrit,oneof"`
+	Gerrit *GerritSourceContext `protobuf:"bytes,2,opt,name=gerrit,proto3,oneof"`
 }
+
 type SourceContext_Git struct {
-	Git *GitSourceContext `protobuf:"bytes,3,opt,name=git,oneof"`
+	Git *GitSourceContext `protobuf:"bytes,3,opt,name=git,proto3,oneof"`
 }
 
 func (*SourceContext_CloudRepo) isSourceContext_Context() {}
-func (*SourceContext_Gerrit) isSourceContext_Context()    {}
-func (*SourceContext_Git) isSourceContext_Context()       {}
+
+func (*SourceContext_Gerrit) isSourceContext_Context() {}
+
+func (*SourceContext_Git) isSourceContext_Context() {}
 
 func (m *SourceContext) GetContext() isSourceContext_Context {
 	if m != nil {
@@ -191,17 +225,17 @@ func _SourceContext_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Context.(type) {
 	case *SourceContext_CloudRepo:
 		s := proto.Size(x.CloudRepo)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *SourceContext_Gerrit:
 		s := proto.Size(x.Gerrit)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *SourceContext_Git:
 		s := proto.Size(x.Git)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -214,15 +248,37 @@ func _SourceContext_OneofSizer(msg proto.Message) (n int) {
 // An alias to a repo revision.
 type AliasContext struct {
 	// The alias kind.
-	Kind AliasContext_Kind `protobuf:"varint,1,opt,name=kind,enum=google.devtools.containeranalysis.v1alpha1.AliasContext_Kind" json:"kind,omitempty"`
+	Kind AliasContext_Kind `protobuf:"varint,1,opt,name=kind,proto3,enum=google.devtools.containeranalysis.v1alpha1.AliasContext_Kind" json:"kind,omitempty"`
 	// The alias name.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AliasContext) Reset()                    { *m = AliasContext{} }
-func (m *AliasContext) String() string            { return proto.CompactTextString(m) }
-func (*AliasContext) ProtoMessage()               {}
-func (*AliasContext) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
+func (m *AliasContext) Reset()         { *m = AliasContext{} }
+func (m *AliasContext) String() string { return proto.CompactTextString(m) }
+func (*AliasContext) ProtoMessage()    {}
+func (*AliasContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_78f437f8b7f72e1b, []int{1}
+}
+func (m *AliasContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AliasContext.Unmarshal(m, b)
+}
+func (m *AliasContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AliasContext.Marshal(b, m, deterministic)
+}
+func (dst *AliasContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AliasContext.Merge(dst, src)
+}
+func (m *AliasContext) XXX_Size() int {
+	return xxx_messageInfo_AliasContext.Size(m)
+}
+func (m *AliasContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_AliasContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AliasContext proto.InternalMessageInfo
 
 func (m *AliasContext) GetKind() AliasContext_Kind {
 	if m != nil {
@@ -242,33 +298,64 @@ func (m *AliasContext) GetName() string {
 // Source Repo.
 type CloudRepoSourceContext struct {
 	// The ID of the repo.
-	RepoId *RepoId `protobuf:"bytes,1,opt,name=repo_id,json=repoId" json:"repo_id,omitempty"`
+	RepoId *RepoId `protobuf:"bytes,1,opt,name=repo_id,json=repoId,proto3" json:"repo_id,omitempty"`
 	// A revision in a Cloud Repo can be identified by either its revision ID or
 	// its alias.
 	//
 	// Types that are valid to be assigned to Revision:
 	//	*CloudRepoSourceContext_RevisionId
 	//	*CloudRepoSourceContext_AliasContext
-	Revision isCloudRepoSourceContext_Revision `protobuf_oneof:"revision"`
+	Revision             isCloudRepoSourceContext_Revision `protobuf_oneof:"revision"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *CloudRepoSourceContext) Reset()         { *m = CloudRepoSourceContext{} }
+func (m *CloudRepoSourceContext) String() string { return proto.CompactTextString(m) }
+func (*CloudRepoSourceContext) ProtoMessage()    {}
+func (*CloudRepoSourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_78f437f8b7f72e1b, []int{2}
+}
+func (m *CloudRepoSourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CloudRepoSourceContext.Unmarshal(m, b)
+}
+func (m *CloudRepoSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CloudRepoSourceContext.Marshal(b, m, deterministic)
+}
+func (dst *CloudRepoSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudRepoSourceContext.Merge(dst, src)
+}
+func (m *CloudRepoSourceContext) XXX_Size() int {
+	return xxx_messageInfo_CloudRepoSourceContext.Size(m)
+}
+func (m *CloudRepoSourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_CloudRepoSourceContext.DiscardUnknown(m)
 }
 
-func (m *CloudRepoSourceContext) Reset()                    { *m = CloudRepoSourceContext{} }
-func (m *CloudRepoSourceContext) String() string            { return proto.CompactTextString(m) }
-func (*CloudRepoSourceContext) ProtoMessage()               {}
-func (*CloudRepoSourceContext) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} }
+var xxx_messageInfo_CloudRepoSourceContext proto.InternalMessageInfo
+
+func (m *CloudRepoSourceContext) GetRepoId() *RepoId {
+	if m != nil {
+		return m.RepoId
+	}
+	return nil
+}
 
 type isCloudRepoSourceContext_Revision interface {
 	isCloudRepoSourceContext_Revision()
 }
 
 type CloudRepoSourceContext_RevisionId struct {
-	RevisionId string `protobuf:"bytes,2,opt,name=revision_id,json=revisionId,oneof"`
+	RevisionId string `protobuf:"bytes,2,opt,name=revision_id,json=revisionId,proto3,oneof"`
 }
+
 type CloudRepoSourceContext_AliasContext struct {
-	AliasContext *AliasContext `protobuf:"bytes,3,opt,name=alias_context,json=aliasContext,oneof"`
+	AliasContext *AliasContext `protobuf:"bytes,3,opt,name=alias_context,json=aliasContext,proto3,oneof"`
 }
 
-func (*CloudRepoSourceContext_RevisionId) isCloudRepoSourceContext_Revision()   {}
+func (*CloudRepoSourceContext_RevisionId) isCloudRepoSourceContext_Revision() {}
+
 func (*CloudRepoSourceContext_AliasContext) isCloudRepoSourceContext_Revision() {}
 
 func (m *CloudRepoSourceContext) GetRevision() isCloudRepoSourceContext_Revision {
@@ -278,13 +365,6 @@ func (m *CloudRepoSourceContext) GetRevision() isCloudRepoSourceContext_Revision
 	return nil
 }
 
-func (m *CloudRepoSourceContext) GetRepoId() *RepoId {
-	if m != nil {
-		return m.RepoId
-	}
-	return nil
-}
-
 func (m *CloudRepoSourceContext) GetRevisionId() string {
 	if x, ok := m.GetRevision().(*CloudRepoSourceContext_RevisionId); ok {
 		return x.RevisionId
@@ -354,12 +434,12 @@ func _CloudRepoSourceContext_OneofSizer(msg proto.Message) (n int) {
 	// revision
 	switch x := m.Revision.(type) {
 	case *CloudRepoSourceContext_RevisionId:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RevisionId)))
 		n += len(x.RevisionId)
 	case *CloudRepoSourceContext_AliasContext:
 		s := proto.Size(x.AliasContext)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -372,46 +452,47 @@ func _CloudRepoSourceContext_OneofSizer(msg proto.Message) (n int) {
 // A SourceContext referring to a Gerrit project.
 type GerritSourceContext struct {
 	// The URI of a running Gerrit instance.
-	HostUri string `protobuf:"bytes,1,opt,name=host_uri,json=hostUri" json:"host_uri,omitempty"`
+	HostUri string `protobuf:"bytes,1,opt,name=host_uri,json=hostUri,proto3" json:"host_uri,omitempty"`
 	// The full project name within the host. Projects may be nested, so
 	// "project/subproject" is a valid project name. The "repo name" is
 	// the hostURI/project.
-	GerritProject string `protobuf:"bytes,2,opt,name=gerrit_project,json=gerritProject" json:"gerrit_project,omitempty"`
+	GerritProject string `protobuf:"bytes,2,opt,name=gerrit_project,json=gerritProject,proto3" json:"gerrit_project,omitempty"`
 	// A revision in a Gerrit project can be identified by either its revision ID
 	// or its alias.
 	//
 	// Types that are valid to be assigned to Revision:
 	//	*GerritSourceContext_RevisionId
 	//	*GerritSourceContext_AliasContext
-	Revision isGerritSourceContext_Revision `protobuf_oneof:"revision"`
+	Revision             isGerritSourceContext_Revision `protobuf_oneof:"revision"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
 }
 
-func (m *GerritSourceContext) Reset()                    { *m = GerritSourceContext{} }
-func (m *GerritSourceContext) String() string            { return proto.CompactTextString(m) }
-func (*GerritSourceContext) ProtoMessage()               {}
-func (*GerritSourceContext) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{3} }
-
-type isGerritSourceContext_Revision interface {
-	isGerritSourceContext_Revision()
+func (m *GerritSourceContext) Reset()         { *m = GerritSourceContext{} }
+func (m *GerritSourceContext) String() string { return proto.CompactTextString(m) }
+func (*GerritSourceContext) ProtoMessage()    {}
+func (*GerritSourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_78f437f8b7f72e1b, []int{3}
 }
-
-type GerritSourceContext_RevisionId struct {
-	RevisionId string `protobuf:"bytes,3,opt,name=revision_id,json=revisionId,oneof"`
+func (m *GerritSourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GerritSourceContext.Unmarshal(m, b)
 }
-type GerritSourceContext_AliasContext struct {
-	AliasContext *AliasContext `protobuf:"bytes,4,opt,name=alias_context,json=aliasContext,oneof"`
+func (m *GerritSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GerritSourceContext.Marshal(b, m, deterministic)
 }
-
-func (*GerritSourceContext_RevisionId) isGerritSourceContext_Revision()   {}
-func (*GerritSourceContext_AliasContext) isGerritSourceContext_Revision() {}
-
-func (m *GerritSourceContext) GetRevision() isGerritSourceContext_Revision {
-	if m != nil {
-		return m.Revision
-	}
-	return nil
+func (dst *GerritSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GerritSourceContext.Merge(dst, src)
+}
+func (m *GerritSourceContext) XXX_Size() int {
+	return xxx_messageInfo_GerritSourceContext.Size(m)
+}
+func (m *GerritSourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_GerritSourceContext.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_GerritSourceContext proto.InternalMessageInfo
+
 func (m *GerritSourceContext) GetHostUri() string {
 	if m != nil {
 		return m.HostUri
@@ -426,6 +507,29 @@ func (m *GerritSourceContext) GetGerritProject() string {
 	return ""
 }
 
+type isGerritSourceContext_Revision interface {
+	isGerritSourceContext_Revision()
+}
+
+type GerritSourceContext_RevisionId struct {
+	RevisionId string `protobuf:"bytes,3,opt,name=revision_id,json=revisionId,proto3,oneof"`
+}
+
+type GerritSourceContext_AliasContext struct {
+	AliasContext *AliasContext `protobuf:"bytes,4,opt,name=alias_context,json=aliasContext,proto3,oneof"`
+}
+
+func (*GerritSourceContext_RevisionId) isGerritSourceContext_Revision() {}
+
+func (*GerritSourceContext_AliasContext) isGerritSourceContext_Revision() {}
+
+func (m *GerritSourceContext) GetRevision() isGerritSourceContext_Revision {
+	if m != nil {
+		return m.Revision
+	}
+	return nil
+}
+
 func (m *GerritSourceContext) GetRevisionId() string {
 	if x, ok := m.GetRevision().(*GerritSourceContext_RevisionId); ok {
 		return x.RevisionId
@@ -495,12 +599,12 @@ func _GerritSourceContext_OneofSizer(msg proto.Message) (n int) {
 	// revision
 	switch x := m.Revision.(type) {
 	case *GerritSourceContext_RevisionId:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RevisionId)))
 		n += len(x.RevisionId)
 	case *GerritSourceContext_AliasContext:
 		s := proto.Size(x.AliasContext)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -514,16 +618,38 @@ func _GerritSourceContext_OneofSizer(msg proto.Message) (n int) {
 // repository (e.g., GitHub).
 type GitSourceContext struct {
 	// Git repository URL.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// Required.
 	// Git commit hash.
-	RevisionId string `protobuf:"bytes,2,opt,name=revision_id,json=revisionId" json:"revision_id,omitempty"`
+	RevisionId           string   `protobuf:"bytes,2,opt,name=revision_id,json=revisionId,proto3" json:"revision_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GitSourceContext) Reset()                    { *m = GitSourceContext{} }
-func (m *GitSourceContext) String() string            { return proto.CompactTextString(m) }
-func (*GitSourceContext) ProtoMessage()               {}
-func (*GitSourceContext) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{4} }
+func (m *GitSourceContext) Reset()         { *m = GitSourceContext{} }
+func (m *GitSourceContext) String() string { return proto.CompactTextString(m) }
+func (*GitSourceContext) ProtoMessage()    {}
+func (*GitSourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_78f437f8b7f72e1b, []int{4}
+}
+func (m *GitSourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GitSourceContext.Unmarshal(m, b)
+}
+func (m *GitSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GitSourceContext.Marshal(b, m, deterministic)
+}
+func (dst *GitSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GitSourceContext.Merge(dst, src)
+}
+func (m *GitSourceContext) XXX_Size() int {
+	return xxx_messageInfo_GitSourceContext.Size(m)
+}
+func (m *GitSourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_GitSourceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GitSourceContext proto.InternalMessageInfo
 
 func (m *GitSourceContext) GetUrl() string {
 	if m != nil {
@@ -547,27 +673,51 @@ type RepoId struct {
 	// Types that are valid to be assigned to Id:
 	//	*RepoId_ProjectRepoId
 	//	*RepoId_Uid
-	Id isRepoId_Id `protobuf_oneof:"id"`
+	Id                   isRepoId_Id `protobuf_oneof:"id"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *RepoId) Reset()                    { *m = RepoId{} }
-func (m *RepoId) String() string            { return proto.CompactTextString(m) }
-func (*RepoId) ProtoMessage()               {}
-func (*RepoId) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{5} }
+func (m *RepoId) Reset()         { *m = RepoId{} }
+func (m *RepoId) String() string { return proto.CompactTextString(m) }
+func (*RepoId) ProtoMessage()    {}
+func (*RepoId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_78f437f8b7f72e1b, []int{5}
+}
+func (m *RepoId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RepoId.Unmarshal(m, b)
+}
+func (m *RepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RepoId.Marshal(b, m, deterministic)
+}
+func (dst *RepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoId.Merge(dst, src)
+}
+func (m *RepoId) XXX_Size() int {
+	return xxx_messageInfo_RepoId.Size(m)
+}
+func (m *RepoId) XXX_DiscardUnknown() {
+	xxx_messageInfo_RepoId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RepoId proto.InternalMessageInfo
 
 type isRepoId_Id interface {
 	isRepoId_Id()
 }
 
 type RepoId_ProjectRepoId struct {
-	ProjectRepoId *ProjectRepoId `protobuf:"bytes,1,opt,name=project_repo_id,json=projectRepoId,oneof"`
+	ProjectRepoId *ProjectRepoId `protobuf:"bytes,1,opt,name=project_repo_id,json=projectRepoId,proto3,oneof"`
 }
+
 type RepoId_Uid struct {
-	Uid string `protobuf:"bytes,2,opt,name=uid,oneof"`
+	Uid string `protobuf:"bytes,2,opt,name=uid,proto3,oneof"`
 }
 
 func (*RepoId_ProjectRepoId) isRepoId_Id() {}
-func (*RepoId_Uid) isRepoId_Id()           {}
+
+func (*RepoId_Uid) isRepoId_Id() {}
 
 func (m *RepoId) GetId() isRepoId_Id {
 	if m != nil {
@@ -646,11 +796,11 @@ func _RepoId_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Id.(type) {
 	case *RepoId_ProjectRepoId:
 		s := proto.Size(x.ProjectRepoId)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RepoId_Uid:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Uid)))
 		n += len(x.Uid)
 	case nil:
@@ -664,15 +814,37 @@ func _RepoId_OneofSizer(msg proto.Message) (n int) {
 // winged-cargo-31) and a repo name within that project.
 type ProjectRepoId struct {
 	// The ID of the project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the repo. Leave empty for the default repo.
-	RepoName string `protobuf:"bytes,2,opt,name=repo_name,json=repoName" json:"repo_name,omitempty"`
+	RepoName             string   `protobuf:"bytes,2,opt,name=repo_name,json=repoName,proto3" json:"repo_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ProjectRepoId) Reset()         { *m = ProjectRepoId{} }
+func (m *ProjectRepoId) String() string { return proto.CompactTextString(m) }
+func (*ProjectRepoId) ProtoMessage()    {}
+func (*ProjectRepoId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_78f437f8b7f72e1b, []int{6}
+}
+func (m *ProjectRepoId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProjectRepoId.Unmarshal(m, b)
+}
+func (m *ProjectRepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProjectRepoId.Marshal(b, m, deterministic)
+}
+func (dst *ProjectRepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectRepoId.Merge(dst, src)
+}
+func (m *ProjectRepoId) XXX_Size() int {
+	return xxx_messageInfo_ProjectRepoId.Size(m)
+}
+func (m *ProjectRepoId) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProjectRepoId.DiscardUnknown(m)
 }
 
-func (m *ProjectRepoId) Reset()                    { *m = ProjectRepoId{} }
-func (m *ProjectRepoId) String() string            { return proto.CompactTextString(m) }
-func (*ProjectRepoId) ProtoMessage()               {}
-func (*ProjectRepoId) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{6} }
+var xxx_messageInfo_ProjectRepoId proto.InternalMessageInfo
 
 func (m *ProjectRepoId) GetProjectId() string {
 	if m != nil {
@@ -690,6 +862,7 @@ func (m *ProjectRepoId) GetRepoName() string {
 
 func init() {
 	proto.RegisterType((*SourceContext)(nil), "google.devtools.containeranalysis.v1alpha1.SourceContext")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.containeranalysis.v1alpha1.SourceContext.LabelsEntry")
 	proto.RegisterType((*AliasContext)(nil), "google.devtools.containeranalysis.v1alpha1.AliasContext")
 	proto.RegisterType((*CloudRepoSourceContext)(nil), "google.devtools.containeranalysis.v1alpha1.CloudRepoSourceContext")
 	proto.RegisterType((*GerritSourceContext)(nil), "google.devtools.containeranalysis.v1alpha1.GerritSourceContext")
@@ -700,10 +873,10 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/source_context.proto", fileDescriptor5)
+	proto.RegisterFile("google/devtools/containeranalysis/v1alpha1/source_context.proto", fileDescriptor_source_context_78f437f8b7f72e1b)
 }
 
-var fileDescriptor5 = []byte{
+var fileDescriptor_source_context_78f437f8b7f72e1b = []byte{
 	// 675 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0x5d, 0x4e, 0xdb, 0x4a,
 	0x14, 0xc7, 0xe3, 0x38, 0x24, 0xf8, 0x84, 0x70, 0xa3, 0xb9, 0xe8, 0x2a, 0x97, 0x7b, 0xab, 0x52,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
index 21fe781b..e48f914a 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/remoteexecution/v1test/remote_execution.pb.go
@@ -1,49 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteexecution/v1test/remote_execution.proto
 
-/*
-Package remoteexecution is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/remoteexecution/v1test/remote_execution.proto
-
-It has these top-level messages:
-	Action
-	Command
-	Platform
-	Directory
-	FileNode
-	DirectoryNode
-	Digest
-	ActionResult
-	OutputFile
-	Tree
-	OutputDirectory
-	ExecuteRequest
-	LogFile
-	ExecuteResponse
-	ExecuteOperationMetadata
-	GetActionResultRequest
-	UpdateActionResultRequest
-	FindMissingBlobsRequest
-	FindMissingBlobsResponse
-	UpdateBlobRequest
-	BatchUpdateBlobsRequest
-	BatchUpdateBlobsResponse
-	GetTreeRequest
-	GetTreeResponse
-	ToolDetails
-	RequestMetadata
-*/
-package remoteexecution
+package remoteexecution // import "google.golang.org/genproto/googleapis/devtools/remoteexecution/v1test"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -95,7 +61,7 @@ func (x ExecuteOperationMetadata_Stage) String() string {
 	return proto.EnumName(ExecuteOperationMetadata_Stage_name, int32(x))
 }
 func (ExecuteOperationMetadata_Stage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{14, 0}
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{14, 0}
 }
 
 // An `Action` captures all the information about an execution which is required
@@ -121,7 +87,7 @@ type Action struct {
 	// The digest of the [Command][google.devtools.remoteexecution.v1test.Command]
 	// to run, which MUST be present in the
 	// [ContentAddressableStorage][google.devtools.remoteexecution.v1test.ContentAddressableStorage].
-	CommandDigest *Digest `protobuf:"bytes,1,opt,name=command_digest,json=commandDigest" json:"command_digest,omitempty"`
+	CommandDigest *Digest `protobuf:"bytes,1,opt,name=command_digest,json=commandDigest,proto3" json:"command_digest,omitempty"`
 	// The digest of the root
 	// [Directory][google.devtools.remoteexecution.v1test.Directory] for the input
 	// files. The files in the directory tree are available in the correct
@@ -129,41 +95,45 @@ type Action struct {
 	// directory, as well as every subdirectory and content blob referred to, MUST
 	// be in the
 	// [ContentAddressableStorage][google.devtools.remoteexecution.v1test.ContentAddressableStorage].
-	InputRootDigest *Digest `protobuf:"bytes,2,opt,name=input_root_digest,json=inputRootDigest" json:"input_root_digest,omitempty"`
+	InputRootDigest *Digest `protobuf:"bytes,2,opt,name=input_root_digest,json=inputRootDigest,proto3" json:"input_root_digest,omitempty"`
 	// A list of the output files that the client expects to retrieve from the
 	// action. Only the listed files, as well as directories listed in
 	// `output_directories`, will be returned to the client as output.
 	// Other files that may be created during command execution are discarded.
 	//
-	// The paths are specified using forward slashes (`/`) as path separators,
-	// even if the execution platform natively uses a different separator. The
-	// path MUST NOT include a trailing slash.
+	// The paths are relative to the working directory of the action execution.
+	// The paths are specified using a single forward slash (`/`) as a path
+	// separator, even if the execution platform natively uses a different
+	// separator. The path MUST NOT include a trailing slash, nor a leading slash,
+	// being a relative path.
 	//
 	// In order to ensure consistent hashing of the same Action, the output paths
 	// MUST be sorted lexicographically by code point (or, equivalently, by UTF-8
 	// bytes).
-	OutputFiles []string `protobuf:"bytes,3,rep,name=output_files,json=outputFiles" json:"output_files,omitempty"`
+	OutputFiles []string `protobuf:"bytes,3,rep,name=output_files,json=outputFiles,proto3" json:"output_files,omitempty"`
 	// A list of the output directories that the client expects to retrieve from
 	// the action. Only the contents of the indicated directories (recursively
 	// including the contents of their subdirectories) will be
 	// returned, as well as files listed in `output_files`. Other files that may
 	// be created during command execution are discarded.
 	//
-	// The paths are specified using forward slashes (`/`) as path separators,
-	// even if the execution platform natively uses a different separator. The
-	// path MUST NOT include a trailing slash, unless the path is `"/"` (which,
-	// although not recommended, can be used to capture the entire working
-	// directory tree, including inputs).
+	// The paths are relative to the working directory of the action execution.
+	// The paths are specified using a single forward slash (`/`) as a path
+	// separator, even if the execution platform natively uses a different
+	// separator. The path MUST NOT include a trailing slash, nor a leading slash,
+	// being a relative path.
+	// The special value of empty string is allowed, although not recommended, and
+	// can be used to capture the entire working directory tree, including inputs.
 	//
 	// In order to ensure consistent hashing of the same Action, the output paths
 	// MUST be sorted lexicographically by code point (or, equivalently, by UTF-8
 	// bytes).
-	OutputDirectories []string `protobuf:"bytes,4,rep,name=output_directories,json=outputDirectories" json:"output_directories,omitempty"`
+	OutputDirectories []string `protobuf:"bytes,4,rep,name=output_directories,json=outputDirectories,proto3" json:"output_directories,omitempty"`
 	// The platform requirements for the execution environment. The server MAY
 	// choose to execute the action on any worker satisfying the requirements, so
 	// the client SHOULD ensure that running the action on any such worker will
 	// have the same result.
-	Platform *Platform `protobuf:"bytes,5,opt,name=platform" json:"platform,omitempty"`
+	Platform *Platform `protobuf:"bytes,5,opt,name=platform,proto3" json:"platform,omitempty"`
 	// A timeout after which the execution should be killed. If the timeout is
 	// absent, then the client is specifying that the execution should continue
 	// as long as the server will let it. The server SHOULD impose a timeout if
@@ -180,15 +150,37 @@ type Action struct {
 	// timeout is too short. By encoding it directly in the `Action`, a lower
 	// timeout will result in a cache miss and the execution timeout will fail
 	// immediately, rather than whenever the cache entry gets evicted.
-	Timeout *google_protobuf3.Duration `protobuf:"bytes,6,opt,name=timeout" json:"timeout,omitempty"`
+	Timeout *duration.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// If true, then the `Action`'s result cannot be cached.
-	DoNotCache bool `protobuf:"varint,7,opt,name=do_not_cache,json=doNotCache" json:"do_not_cache,omitempty"`
+	DoNotCache           bool     `protobuf:"varint,7,opt,name=do_not_cache,json=doNotCache,proto3" json:"do_not_cache,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Action) Reset()                    { *m = Action{} }
-func (m *Action) String() string            { return proto.CompactTextString(m) }
-func (*Action) ProtoMessage()               {}
-func (*Action) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Action) Reset()         { *m = Action{} }
+func (m *Action) String() string { return proto.CompactTextString(m) }
+func (*Action) ProtoMessage()    {}
+func (*Action) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{0}
+}
+func (m *Action) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Action.Unmarshal(m, b)
+}
+func (m *Action) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Action.Marshal(b, m, deterministic)
+}
+func (dst *Action) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action.Merge(dst, src)
+}
+func (m *Action) XXX_Size() int {
+	return xxx_messageInfo_Action.Size(m)
+}
+func (m *Action) XXX_DiscardUnknown() {
+	xxx_messageInfo_Action.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Action proto.InternalMessageInfo
 
 func (m *Action) GetCommandDigest() *Digest {
 	if m != nil {
@@ -225,7 +217,7 @@ func (m *Action) GetPlatform() *Platform {
 	return nil
 }
 
-func (m *Action) GetTimeout() *google_protobuf3.Duration {
+func (m *Action) GetTimeout() *duration.Duration {
 	if m != nil {
 		return m.Timeout
 	}
@@ -248,12 +240,10 @@ func (m *Action) GetDoNotCache() bool {
 type Command struct {
 	// The arguments to the command. The first argument must be the path to the
 	// executable, which must be either a relative path, in which case it is
-	// evaluated with respect to the input root, or an absolute path. The `PATH`
-	// environment variable, or similar functionality on other systems, is not
-	// used to determine which executable to run.
+	// evaluated with respect to the input root, or an absolute path.
 	//
 	// The working directory will always be the input root.
-	Arguments []string `protobuf:"bytes,1,rep,name=arguments" json:"arguments,omitempty"`
+	Arguments []string `protobuf:"bytes,1,rep,name=arguments,proto3" json:"arguments,omitempty"`
 	// The environment variables to set when running the program. The worker may
 	// provide its own default environment variables; these defaults can be
 	// overridden using this field. Additional variables can also be specified.
@@ -261,13 +251,35 @@ type Command struct {
 	// In order to ensure that equivalent `Command`s always hash to the same
 	// value, the environment variables MUST be lexicographically sorted by name.
 	// Sorting of strings is done by code point, equivalently, by the UTF-8 bytes.
-	EnvironmentVariables []*Command_EnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=environmentVariables" json:"environment_variables,omitempty"`
+	EnvironmentVariables []*Command_EnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=environmentVariables,proto3" json:"environment_variables,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *Command) Reset()         { *m = Command{} }
+func (m *Command) String() string { return proto.CompactTextString(m) }
+func (*Command) ProtoMessage()    {}
+func (*Command) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{1}
+}
+func (m *Command) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Command.Unmarshal(m, b)
+}
+func (m *Command) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Command.Marshal(b, m, deterministic)
+}
+func (dst *Command) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Command.Merge(dst, src)
+}
+func (m *Command) XXX_Size() int {
+	return xxx_messageInfo_Command.Size(m)
+}
+func (m *Command) XXX_DiscardUnknown() {
+	xxx_messageInfo_Command.DiscardUnknown(m)
 }
 
-func (m *Command) Reset()                    { *m = Command{} }
-func (m *Command) String() string            { return proto.CompactTextString(m) }
-func (*Command) ProtoMessage()               {}
-func (*Command) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Command proto.InternalMessageInfo
 
 func (m *Command) GetArguments() []string {
 	if m != nil {
@@ -287,15 +299,37 @@ func (m *Command) GetEnvironmentVariables() []*Command_EnvironmentVariable {
 // environment.
 type Command_EnvironmentVariable struct {
 	// The variable name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The variable value.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value                string   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Command_EnvironmentVariable) Reset()                    { *m = Command_EnvironmentVariable{} }
-func (m *Command_EnvironmentVariable) String() string            { return proto.CompactTextString(m) }
-func (*Command_EnvironmentVariable) ProtoMessage()               {}
-func (*Command_EnvironmentVariable) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (m *Command_EnvironmentVariable) Reset()         { *m = Command_EnvironmentVariable{} }
+func (m *Command_EnvironmentVariable) String() string { return proto.CompactTextString(m) }
+func (*Command_EnvironmentVariable) ProtoMessage()    {}
+func (*Command_EnvironmentVariable) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{1, 0}
+}
+func (m *Command_EnvironmentVariable) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Command_EnvironmentVariable.Unmarshal(m, b)
+}
+func (m *Command_EnvironmentVariable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Command_EnvironmentVariable.Marshal(b, m, deterministic)
+}
+func (dst *Command_EnvironmentVariable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Command_EnvironmentVariable.Merge(dst, src)
+}
+func (m *Command_EnvironmentVariable) XXX_Size() int {
+	return xxx_messageInfo_Command_EnvironmentVariable.Size(m)
+}
+func (m *Command_EnvironmentVariable) XXX_DiscardUnknown() {
+	xxx_messageInfo_Command_EnvironmentVariable.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Command_EnvironmentVariable proto.InternalMessageInfo
 
 func (m *Command_EnvironmentVariable) GetName() string {
 	if m != nil {
@@ -324,13 +358,35 @@ type Platform struct {
 	// equivalent `Platform`s always hash to the same value, the properties MUST
 	// be lexicographically sorted by name, and then by value. Sorting of strings
 	// is done by code point, equivalently, by the UTF-8 bytes.
-	Properties []*Platform_Property `protobuf:"bytes,1,rep,name=properties" json:"properties,omitempty"`
+	Properties           []*Platform_Property `protobuf:"bytes,1,rep,name=properties,proto3" json:"properties,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *Platform) Reset()                    { *m = Platform{} }
-func (m *Platform) String() string            { return proto.CompactTextString(m) }
-func (*Platform) ProtoMessage()               {}
-func (*Platform) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Platform) Reset()         { *m = Platform{} }
+func (m *Platform) String() string { return proto.CompactTextString(m) }
+func (*Platform) ProtoMessage()    {}
+func (*Platform) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{2}
+}
+func (m *Platform) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Platform.Unmarshal(m, b)
+}
+func (m *Platform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Platform.Marshal(b, m, deterministic)
+}
+func (dst *Platform) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Platform.Merge(dst, src)
+}
+func (m *Platform) XXX_Size() int {
+	return xxx_messageInfo_Platform.Size(m)
+}
+func (m *Platform) XXX_DiscardUnknown() {
+	xxx_messageInfo_Platform.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Platform proto.InternalMessageInfo
 
 func (m *Platform) GetProperties() []*Platform_Property {
 	if m != nil {
@@ -358,15 +414,37 @@ func (m *Platform) GetProperties() []*Platform_Property {
 // files available to the worker.
 type Platform_Property struct {
 	// The property name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The property value.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value                string   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Platform_Property) Reset()                    { *m = Platform_Property{} }
-func (m *Platform_Property) String() string            { return proto.CompactTextString(m) }
-func (*Platform_Property) ProtoMessage()               {}
-func (*Platform_Property) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (m *Platform_Property) Reset()         { *m = Platform_Property{} }
+func (m *Platform_Property) String() string { return proto.CompactTextString(m) }
+func (*Platform_Property) ProtoMessage()    {}
+func (*Platform_Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{2, 0}
+}
+func (m *Platform_Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Platform_Property.Unmarshal(m, b)
+}
+func (m *Platform_Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Platform_Property.Marshal(b, m, deterministic)
+}
+func (dst *Platform_Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Platform_Property.Merge(dst, src)
+}
+func (m *Platform_Property) XXX_Size() int {
+	return xxx_messageInfo_Platform_Property.Size(m)
+}
+func (m *Platform_Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Platform_Property.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Platform_Property proto.InternalMessageInfo
 
 func (m *Platform_Property) GetName() string {
 	if m != nil {
@@ -444,15 +522,37 @@ func (m *Platform_Property) GetValue() string {
 // ```
 type Directory struct {
 	// The files in the directory.
-	Files []*FileNode `protobuf:"bytes,1,rep,name=files" json:"files,omitempty"`
+	Files []*FileNode `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"`
 	// The subdirectories in the directory.
-	Directories []*DirectoryNode `protobuf:"bytes,2,rep,name=directories" json:"directories,omitempty"`
+	Directories          []*DirectoryNode `protobuf:"bytes,2,rep,name=directories,proto3" json:"directories,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *Directory) Reset()         { *m = Directory{} }
+func (m *Directory) String() string { return proto.CompactTextString(m) }
+func (*Directory) ProtoMessage()    {}
+func (*Directory) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{3}
+}
+func (m *Directory) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Directory.Unmarshal(m, b)
+}
+func (m *Directory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Directory.Marshal(b, m, deterministic)
+}
+func (dst *Directory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Directory.Merge(dst, src)
+}
+func (m *Directory) XXX_Size() int {
+	return xxx_messageInfo_Directory.Size(m)
+}
+func (m *Directory) XXX_DiscardUnknown() {
+	xxx_messageInfo_Directory.DiscardUnknown(m)
 }
 
-func (m *Directory) Reset()                    { *m = Directory{} }
-func (m *Directory) String() string            { return proto.CompactTextString(m) }
-func (*Directory) ProtoMessage()               {}
-func (*Directory) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_Directory proto.InternalMessageInfo
 
 func (m *Directory) GetFiles() []*FileNode {
 	if m != nil {
@@ -471,17 +571,39 @@ func (m *Directory) GetDirectories() []*DirectoryNode {
 // A `FileNode` represents a single file and associated metadata.
 type FileNode struct {
 	// The name of the file.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The digest of the file's content.
-	Digest *Digest `protobuf:"bytes,2,opt,name=digest" json:"digest,omitempty"`
+	Digest *Digest `protobuf:"bytes,2,opt,name=digest,proto3" json:"digest,omitempty"`
 	// True if file is executable, false otherwise.
-	IsExecutable bool `protobuf:"varint,4,opt,name=is_executable,json=isExecutable" json:"is_executable,omitempty"`
+	IsExecutable         bool     `protobuf:"varint,4,opt,name=is_executable,json=isExecutable,proto3" json:"is_executable,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FileNode) Reset()                    { *m = FileNode{} }
-func (m *FileNode) String() string            { return proto.CompactTextString(m) }
-func (*FileNode) ProtoMessage()               {}
-func (*FileNode) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *FileNode) Reset()         { *m = FileNode{} }
+func (m *FileNode) String() string { return proto.CompactTextString(m) }
+func (*FileNode) ProtoMessage()    {}
+func (*FileNode) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{4}
+}
+func (m *FileNode) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileNode.Unmarshal(m, b)
+}
+func (m *FileNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileNode.Marshal(b, m, deterministic)
+}
+func (dst *FileNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileNode.Merge(dst, src)
+}
+func (m *FileNode) XXX_Size() int {
+	return xxx_messageInfo_FileNode.Size(m)
+}
+func (m *FileNode) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileNode.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileNode proto.InternalMessageInfo
 
 func (m *FileNode) GetName() string {
 	if m != nil {
@@ -509,18 +631,40 @@ func (m *FileNode) GetIsExecutable() bool {
 // a `Directory` and its associated metadata.
 type DirectoryNode struct {
 	// The name of the directory.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The digest of the
 	// [Directory][google.devtools.remoteexecution.v1test.Directory] object
 	// represented. See [Digest][google.devtools.remoteexecution.v1test.Digest]
 	// for information about how to take the digest of a proto message.
-	Digest *Digest `protobuf:"bytes,2,opt,name=digest" json:"digest,omitempty"`
+	Digest               *Digest  `protobuf:"bytes,2,opt,name=digest,proto3" json:"digest,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DirectoryNode) Reset()         { *m = DirectoryNode{} }
+func (m *DirectoryNode) String() string { return proto.CompactTextString(m) }
+func (*DirectoryNode) ProtoMessage()    {}
+func (*DirectoryNode) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{5}
+}
+func (m *DirectoryNode) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DirectoryNode.Unmarshal(m, b)
+}
+func (m *DirectoryNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DirectoryNode.Marshal(b, m, deterministic)
+}
+func (dst *DirectoryNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DirectoryNode.Merge(dst, src)
+}
+func (m *DirectoryNode) XXX_Size() int {
+	return xxx_messageInfo_DirectoryNode.Size(m)
+}
+func (m *DirectoryNode) XXX_DiscardUnknown() {
+	xxx_messageInfo_DirectoryNode.DiscardUnknown(m)
 }
 
-func (m *DirectoryNode) Reset()                    { *m = DirectoryNode{} }
-func (m *DirectoryNode) String() string            { return proto.CompactTextString(m) }
-func (*DirectoryNode) ProtoMessage()               {}
-func (*DirectoryNode) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_DirectoryNode proto.InternalMessageInfo
 
 func (m *DirectoryNode) GetName() string {
 	if m != nil {
@@ -570,15 +714,37 @@ func (m *DirectoryNode) GetDigest() *Digest {
 type Digest struct {
 	// The hash. In the case of SHA-256, it will always be a lowercase hex string
 	// exactly 64 characters long.
-	Hash string `protobuf:"bytes,1,opt,name=hash" json:"hash,omitempty"`
+	Hash string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
 	// The size of the blob, in bytes.
-	SizeBytes int64 `protobuf:"varint,2,opt,name=size_bytes,json=sizeBytes" json:"size_bytes,omitempty"`
+	SizeBytes            int64    `protobuf:"varint,2,opt,name=size_bytes,json=sizeBytes,proto3" json:"size_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Digest) Reset()         { *m = Digest{} }
+func (m *Digest) String() string { return proto.CompactTextString(m) }
+func (*Digest) ProtoMessage()    {}
+func (*Digest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{6}
+}
+func (m *Digest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Digest.Unmarshal(m, b)
+}
+func (m *Digest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Digest.Marshal(b, m, deterministic)
+}
+func (dst *Digest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Digest.Merge(dst, src)
+}
+func (m *Digest) XXX_Size() int {
+	return xxx_messageInfo_Digest.Size(m)
+}
+func (m *Digest) XXX_DiscardUnknown() {
+	xxx_messageInfo_Digest.DiscardUnknown(m)
 }
 
-func (m *Digest) Reset()                    { *m = Digest{} }
-func (m *Digest) String() string            { return proto.CompactTextString(m) }
-func (*Digest) ProtoMessage()               {}
-func (*Digest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_Digest proto.InternalMessageInfo
 
 func (m *Digest) GetHash() string {
 	if m != nil {
@@ -597,23 +763,76 @@ func (m *Digest) GetSizeBytes() int64 {
 // An ActionResult represents the result of an
 // [Action][google.devtools.remoteexecution.v1test.Action] being run.
 type ActionResult struct {
-	// The output files of the action. For each output file requested, if the
-	// corresponding file existed after the action completed, a single entry will
-	// be present in the output list.
+	// The output files of the action. For each output file requested in the
+	// `output_files` field of the Action, if the corresponding file existed after
+	// the action completed, a single entry will be present in the output list.
 	//
 	// If the action does not produce the requested output, or produces a
 	// directory where a regular file is expected or vice versa, then that output
 	// will be omitted from the list. The server is free to arrange the output
 	// list as desired; clients MUST NOT assume that the output list is sorted.
-	OutputFiles []*OutputFile `protobuf:"bytes,2,rep,name=output_files,json=outputFiles" json:"output_files,omitempty"`
-	// The output directories of the action. For each output directory requested,
-	// if the corresponding directory existed after the action completed, a single
-	// entry will be present in the output list, which will contain the digest of
-	// a [Tree][google.devtools.remoteexecution.v1.test.Tree] message containing
-	// the directory tree.
-	OutputDirectories []*OutputDirectory `protobuf:"bytes,3,rep,name=output_directories,json=outputDirectories" json:"output_directories,omitempty"`
+	OutputFiles []*OutputFile `protobuf:"bytes,2,rep,name=output_files,json=outputFiles,proto3" json:"output_files,omitempty"`
+	// The output directories of the action. For each output directory requested
+	// in the `output_directories` field of the Action, if the corresponding
+	// directory existed after the action completed, a single entry will be
+	// present in the output list, which will contain the digest of
+	// a [Tree][google.devtools.remoteexecution.v1test.Tree] message containing
+	// the directory tree, and the path equal exactly to the corresponding Action
+	// output_directories member.
+	// As an example, suppose the Action had an output directory `a/b/dir` and the
+	// execution produced the following contents in `a/b/dir`: a file named `bar`
+	// and a directory named `foo` with an executable file named `baz`. Then,
+	// output_directory will contain (hashes shortened for readability):
+	//
+	// ```json
+	// // OutputDirectory proto:
+	// {
+	//   path: "a/b/dir"
+	//   tree_digest: {
+	//     hash: "4a73bc9d03...",
+	//     size: 55
+	//   }
+	// }
+	// // Tree proto with hash "4a73bc9d03..." and size 55:
+	// {
+	//   root: {
+	//     files: [
+	//       {
+	//         name: "bar",
+	//         digest: {
+	//           hash: "4a73bc9d03...",
+	//           size: 65534
+	//         }
+	//       }
+	//     ],
+	//     directories: [
+	//       {
+	//         name: "foo",
+	//         digest: {
+	//           hash: "4cf2eda940...",
+	//           size: 43
+	//         }
+	//       }
+	//     ]
+	//   }
+	//   children : {
+	//     // (Directory proto with hash "4cf2eda940..." and size 43)
+	//     files: [
+	//       {
+	//         name: "baz",
+	//         digest: {
+	//           hash: "b2c941073e...",
+	//           size: 1294,
+	//         },
+	//         is_executable: true
+	//       }
+	//     ]
+	//   }
+	// }
+	// ```
+	OutputDirectories []*OutputDirectory `protobuf:"bytes,3,rep,name=output_directories,json=outputDirectories,proto3" json:"output_directories,omitempty"`
 	// The exit code of the command.
-	ExitCode int32 `protobuf:"varint,4,opt,name=exit_code,json=exitCode" json:"exit_code,omitempty"`
+	ExitCode int32 `protobuf:"varint,4,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"`
 	// The standard output buffer of the action. The server will determine, based
 	// on the size of the buffer, whether to return it in raw form or to return
 	// a digest in `stdout_digest` that points to the buffer. If neither is set,
@@ -625,7 +844,7 @@ type ActionResult struct {
 	// can be retrieved from the
 	// [ContentAddressableStorage][google.devtools.remoteexecution.v1test.ContentAddressableStorage].
 	// See `stdout_raw` for when this will be set.
-	StdoutDigest *Digest `protobuf:"bytes,6,opt,name=stdout_digest,json=stdoutDigest" json:"stdout_digest,omitempty"`
+	StdoutDigest *Digest `protobuf:"bytes,6,opt,name=stdout_digest,json=stdoutDigest,proto3" json:"stdout_digest,omitempty"`
 	// The standard error buffer of the action. The server will determine, based
 	// on the size of the buffer, whether to return it in raw form or to return
 	// a digest in `stderr_digest` that points to the buffer. If neither is set,
@@ -637,13 +856,35 @@ type ActionResult struct {
 	// can be retrieved from the
 	// [ContentAddressableStorage][google.devtools.remoteexecution.v1test.ContentAddressableStorage].
 	// See `stderr_raw` for when this will be set.
-	StderrDigest *Digest `protobuf:"bytes,8,opt,name=stderr_digest,json=stderrDigest" json:"stderr_digest,omitempty"`
+	StderrDigest         *Digest  `protobuf:"bytes,8,opt,name=stderr_digest,json=stderrDigest,proto3" json:"stderr_digest,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ActionResult) Reset()                    { *m = ActionResult{} }
-func (m *ActionResult) String() string            { return proto.CompactTextString(m) }
-func (*ActionResult) ProtoMessage()               {}
-func (*ActionResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *ActionResult) Reset()         { *m = ActionResult{} }
+func (m *ActionResult) String() string { return proto.CompactTextString(m) }
+func (*ActionResult) ProtoMessage()    {}
+func (*ActionResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{7}
+}
+func (m *ActionResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ActionResult.Unmarshal(m, b)
+}
+func (m *ActionResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ActionResult.Marshal(b, m, deterministic)
+}
+func (dst *ActionResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ActionResult.Merge(dst, src)
+}
+func (m *ActionResult) XXX_Size() int {
+	return xxx_messageInfo_ActionResult.Size(m)
+}
+func (m *ActionResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_ActionResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ActionResult proto.InternalMessageInfo
 
 func (m *ActionResult) GetOutputFiles() []*OutputFile {
 	if m != nil {
@@ -702,10 +943,11 @@ func (m *ActionResult) GetStderrDigest() *Digest {
 // `OutputFile` is binary-compatible with `FileNode`.
 type OutputFile struct {
 	// The full path of the file relative to the input root, including the
-	// filename. The path separator is a forward slash `/`.
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	// filename. The path separator is a forward slash `/`. Since this is a
+	// relative path, it MUST NOT begin with a leading forward slash.
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// The digest of the file's content.
-	Digest *Digest `protobuf:"bytes,2,opt,name=digest" json:"digest,omitempty"`
+	Digest *Digest `protobuf:"bytes,2,opt,name=digest,proto3" json:"digest,omitempty"`
 	// The raw content of the file.
 	//
 	// This field may be used by the server to provide the content of a file
@@ -718,13 +960,35 @@ type OutputFile struct {
 	// and always be prepared to retrieve it via `digest`.
 	Content []byte `protobuf:"bytes,3,opt,name=content,proto3" json:"content,omitempty"`
 	// True if file is executable, false otherwise.
-	IsExecutable bool `protobuf:"varint,4,opt,name=is_executable,json=isExecutable" json:"is_executable,omitempty"`
+	IsExecutable         bool     `protobuf:"varint,4,opt,name=is_executable,json=isExecutable,proto3" json:"is_executable,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *OutputFile) Reset()                    { *m = OutputFile{} }
-func (m *OutputFile) String() string            { return proto.CompactTextString(m) }
-func (*OutputFile) ProtoMessage()               {}
-func (*OutputFile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *OutputFile) Reset()         { *m = OutputFile{} }
+func (m *OutputFile) String() string { return proto.CompactTextString(m) }
+func (*OutputFile) ProtoMessage()    {}
+func (*OutputFile) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{8}
+}
+func (m *OutputFile) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputFile.Unmarshal(m, b)
+}
+func (m *OutputFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputFile.Marshal(b, m, deterministic)
+}
+func (dst *OutputFile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputFile.Merge(dst, src)
+}
+func (m *OutputFile) XXX_Size() int {
+	return xxx_messageInfo_OutputFile.Size(m)
+}
+func (m *OutputFile) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputFile.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutputFile proto.InternalMessageInfo
 
 func (m *OutputFile) GetPath() string {
 	if m != nil {
@@ -759,18 +1023,40 @@ func (m *OutputFile) GetIsExecutable() bool {
 // single directory Merkle tree, compressed into one message.
 type Tree struct {
 	// The root directory in the tree.
-	Root *Directory `protobuf:"bytes,1,opt,name=root" json:"root,omitempty"`
+	Root *Directory `protobuf:"bytes,1,opt,name=root,proto3" json:"root,omitempty"`
 	// All the child directories: the directories referred to by the root and,
 	// recursively, all its children. In order to reconstruct the directory tree,
 	// the client must take the digests of each of the child directories and then
 	// build up a tree starting from the `root`.
-	Children []*Directory `protobuf:"bytes,2,rep,name=children" json:"children,omitempty"`
+	Children             []*Directory `protobuf:"bytes,2,rep,name=children,proto3" json:"children,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *Tree) Reset()                    { *m = Tree{} }
-func (m *Tree) String() string            { return proto.CompactTextString(m) }
-func (*Tree) ProtoMessage()               {}
-func (*Tree) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *Tree) Reset()         { *m = Tree{} }
+func (m *Tree) String() string { return proto.CompactTextString(m) }
+func (*Tree) ProtoMessage()    {}
+func (*Tree) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{9}
+}
+func (m *Tree) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Tree.Unmarshal(m, b)
+}
+func (m *Tree) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Tree.Marshal(b, m, deterministic)
+}
+func (dst *Tree) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Tree.Merge(dst, src)
+}
+func (m *Tree) XXX_Size() int {
+	return xxx_messageInfo_Tree.Size(m)
+}
+func (m *Tree) XXX_DiscardUnknown() {
+	xxx_messageInfo_Tree.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Tree proto.InternalMessageInfo
 
 func (m *Tree) GetRoot() *Directory {
 	if m != nil {
@@ -789,21 +1075,45 @@ func (m *Tree) GetChildren() []*Directory {
 // An `OutputDirectory` is the output in an `ActionResult` corresponding to a
 // directory's full contents rather than a single file.
 type OutputDirectory struct {
-	// The full path of the directory relative to the input root, including the
-	// filename. The path separator is a forward slash `/`.
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	// The full path of the directory relative to the working directory. The path
+	// separator is a forward slash `/`. Since this is a relative path, it MUST
+	// NOT begin with a leading forward slash. The empty string value is allowed,
+	// and it denotes the entire working directory.
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// DEPRECATED: This field is deprecated and should no longer be used.
-	Digest *Digest `protobuf:"bytes,2,opt,name=digest" json:"digest,omitempty"`
+	Digest *Digest `protobuf:"bytes,2,opt,name=digest,proto3" json:"digest,omitempty"`
 	// The digest of the encoded
 	// [Tree][google.devtools.remoteexecution.v1test.Tree] proto containing the
 	// directory's contents.
-	TreeDigest *Digest `protobuf:"bytes,3,opt,name=tree_digest,json=treeDigest" json:"tree_digest,omitempty"`
+	TreeDigest           *Digest  `protobuf:"bytes,3,opt,name=tree_digest,json=treeDigest,proto3" json:"tree_digest,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *OutputDirectory) Reset()                    { *m = OutputDirectory{} }
-func (m *OutputDirectory) String() string            { return proto.CompactTextString(m) }
-func (*OutputDirectory) ProtoMessage()               {}
-func (*OutputDirectory) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *OutputDirectory) Reset()         { *m = OutputDirectory{} }
+func (m *OutputDirectory) String() string { return proto.CompactTextString(m) }
+func (*OutputDirectory) ProtoMessage()    {}
+func (*OutputDirectory) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{10}
+}
+func (m *OutputDirectory) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputDirectory.Unmarshal(m, b)
+}
+func (m *OutputDirectory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputDirectory.Marshal(b, m, deterministic)
+}
+func (dst *OutputDirectory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputDirectory.Merge(dst, src)
+}
+func (m *OutputDirectory) XXX_Size() int {
+	return xxx_messageInfo_OutputDirectory.Size(m)
+}
+func (m *OutputDirectory) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputDirectory.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutputDirectory proto.InternalMessageInfo
 
 func (m *OutputDirectory) GetPath() string {
 	if m != nil {
@@ -834,25 +1144,47 @@ type ExecuteRequest struct {
 	// storage, caches, etc.). The server MAY require use of this field to select
 	// between them in an implementation-defined fashion, otherwise it can be
 	// omitted.
-	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName" json:"instance_name,omitempty"`
+	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName,proto3" json:"instance_name,omitempty"`
 	// The action to be performed.
-	Action *Action `protobuf:"bytes,2,opt,name=action" json:"action,omitempty"`
+	Action *Action `protobuf:"bytes,2,opt,name=action,proto3" json:"action,omitempty"`
 	// If true, the action will be executed anew even if its result was already
 	// present in the cache. If false, the result may be served from the
 	// [ActionCache][google.devtools.remoteexecution.v1test.ActionCache].
-	SkipCacheLookup bool `protobuf:"varint,3,opt,name=skip_cache_lookup,json=skipCacheLookup" json:"skip_cache_lookup,omitempty"`
+	SkipCacheLookup bool `protobuf:"varint,3,opt,name=skip_cache_lookup,json=skipCacheLookup,proto3" json:"skip_cache_lookup,omitempty"`
 	// DEPRECATED: This field should be ignored by clients and servers and will be
 	// removed.
-	TotalInputFileCount int32 `protobuf:"varint,4,opt,name=total_input_file_count,json=totalInputFileCount" json:"total_input_file_count,omitempty"`
+	TotalInputFileCount int32 `protobuf:"varint,4,opt,name=total_input_file_count,json=totalInputFileCount,proto3" json:"total_input_file_count,omitempty"`
 	// DEPRECATED: This field should be ignored by clients and servers and will be
 	// removed.
-	TotalInputFileBytes int64 `protobuf:"varint,5,opt,name=total_input_file_bytes,json=totalInputFileBytes" json:"total_input_file_bytes,omitempty"`
+	TotalInputFileBytes  int64    `protobuf:"varint,5,opt,name=total_input_file_bytes,json=totalInputFileBytes,proto3" json:"total_input_file_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExecuteRequest) Reset()         { *m = ExecuteRequest{} }
+func (m *ExecuteRequest) String() string { return proto.CompactTextString(m) }
+func (*ExecuteRequest) ProtoMessage()    {}
+func (*ExecuteRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{11}
+}
+func (m *ExecuteRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExecuteRequest.Unmarshal(m, b)
+}
+func (m *ExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExecuteRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExecuteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteRequest.Merge(dst, src)
+}
+func (m *ExecuteRequest) XXX_Size() int {
+	return xxx_messageInfo_ExecuteRequest.Size(m)
+}
+func (m *ExecuteRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExecuteRequest.DiscardUnknown(m)
 }
 
-func (m *ExecuteRequest) Reset()                    { *m = ExecuteRequest{} }
-func (m *ExecuteRequest) String() string            { return proto.CompactTextString(m) }
-func (*ExecuteRequest) ProtoMessage()               {}
-func (*ExecuteRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_ExecuteRequest proto.InternalMessageInfo
 
 func (m *ExecuteRequest) GetInstanceName() string {
 	if m != nil {
@@ -892,19 +1224,41 @@ func (m *ExecuteRequest) GetTotalInputFileBytes() int64 {
 // A `LogFile` is a log stored in the CAS.
 type LogFile struct {
 	// The digest of the log contents.
-	Digest *Digest `protobuf:"bytes,1,opt,name=digest" json:"digest,omitempty"`
+	Digest *Digest `protobuf:"bytes,1,opt,name=digest,proto3" json:"digest,omitempty"`
 	// This is a hint as to the purpose of the log, and is set to true if the log
 	// is human-readable text that can be usefully displayed to a user, and false
 	// otherwise. For instance, if a command-line client wishes to print the
 	// server logs to the terminal for a failed action, this allows it to avoid
 	// displaying a binary file.
-	HumanReadable bool `protobuf:"varint,2,opt,name=human_readable,json=humanReadable" json:"human_readable,omitempty"`
+	HumanReadable        bool     `protobuf:"varint,2,opt,name=human_readable,json=humanReadable,proto3" json:"human_readable,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LogFile) Reset()         { *m = LogFile{} }
+func (m *LogFile) String() string { return proto.CompactTextString(m) }
+func (*LogFile) ProtoMessage()    {}
+func (*LogFile) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{12}
+}
+func (m *LogFile) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogFile.Unmarshal(m, b)
+}
+func (m *LogFile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogFile.Marshal(b, m, deterministic)
+}
+func (dst *LogFile) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogFile.Merge(dst, src)
+}
+func (m *LogFile) XXX_Size() int {
+	return xxx_messageInfo_LogFile.Size(m)
+}
+func (m *LogFile) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogFile.DiscardUnknown(m)
 }
 
-func (m *LogFile) Reset()                    { *m = LogFile{} }
-func (m *LogFile) String() string            { return proto.CompactTextString(m) }
-func (*LogFile) ProtoMessage()               {}
-func (*LogFile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_LogFile proto.InternalMessageInfo
 
 func (m *LogFile) GetDigest() *Digest {
 	if m != nil {
@@ -927,9 +1281,9 @@ func (m *LogFile) GetHumanReadable() bool {
 // [Operation][google.longrunning.Operation].
 type ExecuteResponse struct {
 	// The result of the action.
-	Result *ActionResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
+	Result *ActionResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
 	// True if the result was served from cache, false if it was executed.
-	CachedResult bool `protobuf:"varint,2,opt,name=cached_result,json=cachedResult" json:"cached_result,omitempty"`
+	CachedResult bool `protobuf:"varint,2,opt,name=cached_result,json=cachedResult,proto3" json:"cached_result,omitempty"`
 	// If the status has a code other than `OK`, it indicates that the action did
 	// not finish execution. For example, if the operation times out during
 	// execution, the status will have a `DEADLINE_EXCEEDED` code. Servers MUST
@@ -940,7 +1294,7 @@ type ExecuteResponse struct {
 	// For an error status, the `result` field is optional; the server may
 	// populate the output-, stdout-, and stderr-related fields if it has any
 	// information available, such as the stdout and stderr of a timed-out action.
-	Status *google_rpc.Status `protobuf:"bytes,3,opt,name=status" json:"status,omitempty"`
+	Status *status.Status `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"`
 	// An optional list of additional log outputs the server wishes to provide. A
 	// server can use this to return execution-specific logs however it wishes.
 	// This is intended primarily to make it easier for users to debug issues that
@@ -948,13 +1302,35 @@ type ExecuteResponse struct {
 	// worker executing the action or by providing logs from the worker's setup
 	// phase. The keys SHOULD be human readable so that a client can display them
 	// to a user.
-	ServerLogs map[string]*LogFile `protobuf:"bytes,4,rep,name=server_logs,json=serverLogs" json:"server_logs,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ServerLogs           map[string]*LogFile `protobuf:"bytes,4,rep,name=server_logs,json=serverLogs,proto3" json:"server_logs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *ExecuteResponse) Reset()                    { *m = ExecuteResponse{} }
-func (m *ExecuteResponse) String() string            { return proto.CompactTextString(m) }
-func (*ExecuteResponse) ProtoMessage()               {}
-func (*ExecuteResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *ExecuteResponse) Reset()         { *m = ExecuteResponse{} }
+func (m *ExecuteResponse) String() string { return proto.CompactTextString(m) }
+func (*ExecuteResponse) ProtoMessage()    {}
+func (*ExecuteResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{13}
+}
+func (m *ExecuteResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExecuteResponse.Unmarshal(m, b)
+}
+func (m *ExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExecuteResponse.Marshal(b, m, deterministic)
+}
+func (dst *ExecuteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteResponse.Merge(dst, src)
+}
+func (m *ExecuteResponse) XXX_Size() int {
+	return xxx_messageInfo_ExecuteResponse.Size(m)
+}
+func (m *ExecuteResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExecuteResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExecuteResponse proto.InternalMessageInfo
 
 func (m *ExecuteResponse) GetResult() *ActionResult {
 	if m != nil {
@@ -970,7 +1346,7 @@ func (m *ExecuteResponse) GetCachedResult() bool {
 	return false
 }
 
-func (m *ExecuteResponse) GetStatus() *google_rpc.Status {
+func (m *ExecuteResponse) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -990,24 +1366,46 @@ func (m *ExecuteResponse) GetServerLogs() map[string]*LogFile {
 // field][google.longrunning.Operation.response] of the
 // [Operation][google.longrunning.Operation].
 type ExecuteOperationMetadata struct {
-	Stage ExecuteOperationMetadata_Stage `protobuf:"varint,1,opt,name=stage,enum=google.devtools.remoteexecution.v1test.ExecuteOperationMetadata_Stage" json:"stage,omitempty"`
+	Stage ExecuteOperationMetadata_Stage `protobuf:"varint,1,opt,name=stage,proto3,enum=google.devtools.remoteexecution.v1test.ExecuteOperationMetadata_Stage" json:"stage,omitempty"`
 	// The digest of the [Action][google.devtools.remoteexecution.v1test.Action]
 	// being executed.
-	ActionDigest *Digest `protobuf:"bytes,2,opt,name=action_digest,json=actionDigest" json:"action_digest,omitempty"`
+	ActionDigest *Digest `protobuf:"bytes,2,opt,name=action_digest,json=actionDigest,proto3" json:"action_digest,omitempty"`
 	// If set, the client can use this name with
 	// [ByteStream.Read][google.bytestream.ByteStream.Read] to stream the
 	// standard output.
-	StdoutStreamName string `protobuf:"bytes,3,opt,name=stdout_stream_name,json=stdoutStreamName" json:"stdout_stream_name,omitempty"`
+	StdoutStreamName string `protobuf:"bytes,3,opt,name=stdout_stream_name,json=stdoutStreamName,proto3" json:"stdout_stream_name,omitempty"`
 	// If set, the client can use this name with
 	// [ByteStream.Read][google.bytestream.ByteStream.Read] to stream the
 	// standard error.
-	StderrStreamName string `protobuf:"bytes,4,opt,name=stderr_stream_name,json=stderrStreamName" json:"stderr_stream_name,omitempty"`
+	StderrStreamName     string   `protobuf:"bytes,4,opt,name=stderr_stream_name,json=stderrStreamName,proto3" json:"stderr_stream_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExecuteOperationMetadata) Reset()         { *m = ExecuteOperationMetadata{} }
+func (m *ExecuteOperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*ExecuteOperationMetadata) ProtoMessage()    {}
+func (*ExecuteOperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{14}
+}
+func (m *ExecuteOperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExecuteOperationMetadata.Unmarshal(m, b)
+}
+func (m *ExecuteOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExecuteOperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ExecuteOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteOperationMetadata.Merge(dst, src)
+}
+func (m *ExecuteOperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_ExecuteOperationMetadata.Size(m)
+}
+func (m *ExecuteOperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExecuteOperationMetadata.DiscardUnknown(m)
 }
 
-func (m *ExecuteOperationMetadata) Reset()                    { *m = ExecuteOperationMetadata{} }
-func (m *ExecuteOperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*ExecuteOperationMetadata) ProtoMessage()               {}
-func (*ExecuteOperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_ExecuteOperationMetadata proto.InternalMessageInfo
 
 func (m *ExecuteOperationMetadata) GetStage() ExecuteOperationMetadata_Stage {
 	if m != nil {
@@ -1045,16 +1443,38 @@ type GetActionResultRequest struct {
 	// storage, caches, etc.). The server MAY require use of this field to select
 	// between them in an implementation-defined fashion, otherwise it can be
 	// omitted.
-	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName" json:"instance_name,omitempty"`
+	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName,proto3" json:"instance_name,omitempty"`
 	// The digest of the [Action][google.devtools.remoteexecution.v1test.Action]
 	// whose result is requested.
-	ActionDigest *Digest `protobuf:"bytes,2,opt,name=action_digest,json=actionDigest" json:"action_digest,omitempty"`
+	ActionDigest         *Digest  `protobuf:"bytes,2,opt,name=action_digest,json=actionDigest,proto3" json:"action_digest,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetActionResultRequest) Reset()                    { *m = GetActionResultRequest{} }
-func (m *GetActionResultRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetActionResultRequest) ProtoMessage()               {}
-func (*GetActionResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *GetActionResultRequest) Reset()         { *m = GetActionResultRequest{} }
+func (m *GetActionResultRequest) String() string { return proto.CompactTextString(m) }
+func (*GetActionResultRequest) ProtoMessage()    {}
+func (*GetActionResultRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{15}
+}
+func (m *GetActionResultRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetActionResultRequest.Unmarshal(m, b)
+}
+func (m *GetActionResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetActionResultRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetActionResultRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetActionResultRequest.Merge(dst, src)
+}
+func (m *GetActionResultRequest) XXX_Size() int {
+	return xxx_messageInfo_GetActionResultRequest.Size(m)
+}
+func (m *GetActionResultRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetActionResultRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetActionResultRequest proto.InternalMessageInfo
 
 func (m *GetActionResultRequest) GetInstanceName() string {
 	if m != nil {
@@ -1078,19 +1498,41 @@ type UpdateActionResultRequest struct {
 	// storage, caches, etc.). The server MAY require use of this field to select
 	// between them in an implementation-defined fashion, otherwise it can be
 	// omitted.
-	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName" json:"instance_name,omitempty"`
+	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName,proto3" json:"instance_name,omitempty"`
 	// The digest of the [Action][google.devtools.remoteexecution.v1test.Action]
 	// whose result is being uploaded.
-	ActionDigest *Digest `protobuf:"bytes,2,opt,name=action_digest,json=actionDigest" json:"action_digest,omitempty"`
+	ActionDigest *Digest `protobuf:"bytes,2,opt,name=action_digest,json=actionDigest,proto3" json:"action_digest,omitempty"`
 	// The [ActionResult][google.devtools.remoteexecution.v1test.ActionResult]
 	// to store in the cache.
-	ActionResult *ActionResult `protobuf:"bytes,3,opt,name=action_result,json=actionResult" json:"action_result,omitempty"`
+	ActionResult         *ActionResult `protobuf:"bytes,3,opt,name=action_result,json=actionResult,proto3" json:"action_result,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *UpdateActionResultRequest) Reset()                    { *m = UpdateActionResultRequest{} }
-func (m *UpdateActionResultRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateActionResultRequest) ProtoMessage()               {}
-func (*UpdateActionResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *UpdateActionResultRequest) Reset()         { *m = UpdateActionResultRequest{} }
+func (m *UpdateActionResultRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateActionResultRequest) ProtoMessage()    {}
+func (*UpdateActionResultRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{16}
+}
+func (m *UpdateActionResultRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateActionResultRequest.Unmarshal(m, b)
+}
+func (m *UpdateActionResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateActionResultRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateActionResultRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateActionResultRequest.Merge(dst, src)
+}
+func (m *UpdateActionResultRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateActionResultRequest.Size(m)
+}
+func (m *UpdateActionResultRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateActionResultRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateActionResultRequest proto.InternalMessageInfo
 
 func (m *UpdateActionResultRequest) GetInstanceName() string {
 	if m != nil {
@@ -1121,15 +1563,37 @@ type FindMissingBlobsRequest struct {
 	// storage, caches, etc.). The server MAY require use of this field to select
 	// between them in an implementation-defined fashion, otherwise it can be
 	// omitted.
-	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName" json:"instance_name,omitempty"`
+	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName,proto3" json:"instance_name,omitempty"`
 	// A list of the blobs to check.
-	BlobDigests []*Digest `protobuf:"bytes,2,rep,name=blob_digests,json=blobDigests" json:"blob_digests,omitempty"`
+	BlobDigests          []*Digest `protobuf:"bytes,2,rep,name=blob_digests,json=blobDigests,proto3" json:"blob_digests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *FindMissingBlobsRequest) Reset()                    { *m = FindMissingBlobsRequest{} }
-func (m *FindMissingBlobsRequest) String() string            { return proto.CompactTextString(m) }
-func (*FindMissingBlobsRequest) ProtoMessage()               {}
-func (*FindMissingBlobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *FindMissingBlobsRequest) Reset()         { *m = FindMissingBlobsRequest{} }
+func (m *FindMissingBlobsRequest) String() string { return proto.CompactTextString(m) }
+func (*FindMissingBlobsRequest) ProtoMessage()    {}
+func (*FindMissingBlobsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{17}
+}
+func (m *FindMissingBlobsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FindMissingBlobsRequest.Unmarshal(m, b)
+}
+func (m *FindMissingBlobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FindMissingBlobsRequest.Marshal(b, m, deterministic)
+}
+func (dst *FindMissingBlobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FindMissingBlobsRequest.Merge(dst, src)
+}
+func (m *FindMissingBlobsRequest) XXX_Size() int {
+	return xxx_messageInfo_FindMissingBlobsRequest.Size(m)
+}
+func (m *FindMissingBlobsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_FindMissingBlobsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FindMissingBlobsRequest proto.InternalMessageInfo
 
 func (m *FindMissingBlobsRequest) GetInstanceName() string {
 	if m != nil {
@@ -1149,13 +1613,35 @@ func (m *FindMissingBlobsRequest) GetBlobDigests() []*Digest {
 // [ContentAddressableStorage.FindMissingBlobs][google.devtools.remoteexecution.v1test.ContentAddressableStorage.FindMissingBlobs].
 type FindMissingBlobsResponse struct {
 	// A list of the blobs requested *not* present in the storage.
-	MissingBlobDigests []*Digest `protobuf:"bytes,2,rep,name=missing_blob_digests,json=missingBlobDigests" json:"missing_blob_digests,omitempty"`
+	MissingBlobDigests   []*Digest `protobuf:"bytes,2,rep,name=missing_blob_digests,json=missingBlobDigests,proto3" json:"missing_blob_digests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *FindMissingBlobsResponse) Reset()         { *m = FindMissingBlobsResponse{} }
+func (m *FindMissingBlobsResponse) String() string { return proto.CompactTextString(m) }
+func (*FindMissingBlobsResponse) ProtoMessage()    {}
+func (*FindMissingBlobsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{18}
+}
+func (m *FindMissingBlobsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FindMissingBlobsResponse.Unmarshal(m, b)
+}
+func (m *FindMissingBlobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FindMissingBlobsResponse.Marshal(b, m, deterministic)
+}
+func (dst *FindMissingBlobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FindMissingBlobsResponse.Merge(dst, src)
+}
+func (m *FindMissingBlobsResponse) XXX_Size() int {
+	return xxx_messageInfo_FindMissingBlobsResponse.Size(m)
+}
+func (m *FindMissingBlobsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_FindMissingBlobsResponse.DiscardUnknown(m)
 }
 
-func (m *FindMissingBlobsResponse) Reset()                    { *m = FindMissingBlobsResponse{} }
-func (m *FindMissingBlobsResponse) String() string            { return proto.CompactTextString(m) }
-func (*FindMissingBlobsResponse) ProtoMessage()               {}
-func (*FindMissingBlobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_FindMissingBlobsResponse proto.InternalMessageInfo
 
 func (m *FindMissingBlobsResponse) GetMissingBlobDigests() []*Digest {
 	if m != nil {
@@ -1168,15 +1654,37 @@ func (m *FindMissingBlobsResponse) GetMissingBlobDigests() []*Digest {
 // [ContentAddressableStorage.BatchUpdateBlobs][google.devtools.remoteexecution.v1test.ContentAddressableStorage.BatchUpdateBlobs].
 type UpdateBlobRequest struct {
 	// The digest of the blob. This MUST be the digest of `data`.
-	ContentDigest *Digest `protobuf:"bytes,1,opt,name=content_digest,json=contentDigest" json:"content_digest,omitempty"`
+	ContentDigest *Digest `protobuf:"bytes,1,opt,name=content_digest,json=contentDigest,proto3" json:"content_digest,omitempty"`
 	// The raw binary data.
-	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	Data                 []byte   `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UpdateBlobRequest) Reset()                    { *m = UpdateBlobRequest{} }
-func (m *UpdateBlobRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateBlobRequest) ProtoMessage()               {}
-func (*UpdateBlobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+func (m *UpdateBlobRequest) Reset()         { *m = UpdateBlobRequest{} }
+func (m *UpdateBlobRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateBlobRequest) ProtoMessage()    {}
+func (*UpdateBlobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{19}
+}
+func (m *UpdateBlobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateBlobRequest.Unmarshal(m, b)
+}
+func (m *UpdateBlobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateBlobRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateBlobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateBlobRequest.Merge(dst, src)
+}
+func (m *UpdateBlobRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateBlobRequest.Size(m)
+}
+func (m *UpdateBlobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateBlobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateBlobRequest proto.InternalMessageInfo
 
 func (m *UpdateBlobRequest) GetContentDigest() *Digest {
 	if m != nil {
@@ -1200,15 +1708,37 @@ type BatchUpdateBlobsRequest struct {
 	// storage, caches, etc.). The server MAY require use of this field to select
 	// between them in an implementation-defined fashion, otherwise it can be
 	// omitted.
-	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName" json:"instance_name,omitempty"`
+	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName,proto3" json:"instance_name,omitempty"`
 	// The individual upload requests.
-	Requests []*UpdateBlobRequest `protobuf:"bytes,2,rep,name=requests" json:"requests,omitempty"`
+	Requests             []*UpdateBlobRequest `protobuf:"bytes,2,rep,name=requests,proto3" json:"requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *BatchUpdateBlobsRequest) Reset()         { *m = BatchUpdateBlobsRequest{} }
+func (m *BatchUpdateBlobsRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateBlobsRequest) ProtoMessage()    {}
+func (*BatchUpdateBlobsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{20}
+}
+func (m *BatchUpdateBlobsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateBlobsRequest.Unmarshal(m, b)
+}
+func (m *BatchUpdateBlobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateBlobsRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateBlobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateBlobsRequest.Merge(dst, src)
+}
+func (m *BatchUpdateBlobsRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateBlobsRequest.Size(m)
+}
+func (m *BatchUpdateBlobsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateBlobsRequest.DiscardUnknown(m)
 }
 
-func (m *BatchUpdateBlobsRequest) Reset()                    { *m = BatchUpdateBlobsRequest{} }
-func (m *BatchUpdateBlobsRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdateBlobsRequest) ProtoMessage()               {}
-func (*BatchUpdateBlobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+var xxx_messageInfo_BatchUpdateBlobsRequest proto.InternalMessageInfo
 
 func (m *BatchUpdateBlobsRequest) GetInstanceName() string {
 	if m != nil {
@@ -1228,13 +1758,35 @@ func (m *BatchUpdateBlobsRequest) GetRequests() []*UpdateBlobRequest {
 // [ContentAddressableStorage.BatchUpdateBlobs][google.devtools.remoteexecution.v1test.ContentAddressableStorage.BatchUpdateBlobs].
 type BatchUpdateBlobsResponse struct {
 	// The responses to the requests.
-	Responses []*BatchUpdateBlobsResponse_Response `protobuf:"bytes,1,rep,name=responses" json:"responses,omitempty"`
+	Responses            []*BatchUpdateBlobsResponse_Response `protobuf:"bytes,1,rep,name=responses,proto3" json:"responses,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                             `json:"-"`
+	XXX_unrecognized     []byte                               `json:"-"`
+	XXX_sizecache        int32                                `json:"-"`
+}
+
+func (m *BatchUpdateBlobsResponse) Reset()         { *m = BatchUpdateBlobsResponse{} }
+func (m *BatchUpdateBlobsResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdateBlobsResponse) ProtoMessage()    {}
+func (*BatchUpdateBlobsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{21}
+}
+func (m *BatchUpdateBlobsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateBlobsResponse.Unmarshal(m, b)
+}
+func (m *BatchUpdateBlobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateBlobsResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateBlobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateBlobsResponse.Merge(dst, src)
+}
+func (m *BatchUpdateBlobsResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateBlobsResponse.Size(m)
+}
+func (m *BatchUpdateBlobsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateBlobsResponse.DiscardUnknown(m)
 }
 
-func (m *BatchUpdateBlobsResponse) Reset()                    { *m = BatchUpdateBlobsResponse{} }
-func (m *BatchUpdateBlobsResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdateBlobsResponse) ProtoMessage()               {}
-func (*BatchUpdateBlobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+var xxx_messageInfo_BatchUpdateBlobsResponse proto.InternalMessageInfo
 
 func (m *BatchUpdateBlobsResponse) GetResponses() []*BatchUpdateBlobsResponse_Response {
 	if m != nil {
@@ -1246,17 +1798,37 @@ func (m *BatchUpdateBlobsResponse) GetResponses() []*BatchUpdateBlobsResponse_Re
 // A response corresponding to a single blob that the client tried to upload.
 type BatchUpdateBlobsResponse_Response struct {
 	// The digest to which this response corresponds.
-	BlobDigest *Digest `protobuf:"bytes,1,opt,name=blob_digest,json=blobDigest" json:"blob_digest,omitempty"`
+	BlobDigest *Digest `protobuf:"bytes,1,opt,name=blob_digest,json=blobDigest,proto3" json:"blob_digest,omitempty"`
 	// The result of attempting to upload that blob.
-	Status *google_rpc.Status `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"`
+	Status               *status.Status `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
 func (m *BatchUpdateBlobsResponse_Response) Reset()         { *m = BatchUpdateBlobsResponse_Response{} }
 func (m *BatchUpdateBlobsResponse_Response) String() string { return proto.CompactTextString(m) }
 func (*BatchUpdateBlobsResponse_Response) ProtoMessage()    {}
 func (*BatchUpdateBlobsResponse_Response) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{21, 0}
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{21, 0}
+}
+func (m *BatchUpdateBlobsResponse_Response) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdateBlobsResponse_Response.Unmarshal(m, b)
+}
+func (m *BatchUpdateBlobsResponse_Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdateBlobsResponse_Response.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdateBlobsResponse_Response) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdateBlobsResponse_Response.Merge(dst, src)
+}
+func (m *BatchUpdateBlobsResponse_Response) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdateBlobsResponse_Response.Size(m)
 }
+func (m *BatchUpdateBlobsResponse_Response) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdateBlobsResponse_Response.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchUpdateBlobsResponse_Response proto.InternalMessageInfo
 
 func (m *BatchUpdateBlobsResponse_Response) GetBlobDigest() *Digest {
 	if m != nil {
@@ -1265,7 +1837,7 @@ func (m *BatchUpdateBlobsResponse_Response) GetBlobDigest() *Digest {
 	return nil
 }
 
-func (m *BatchUpdateBlobsResponse_Response) GetStatus() *google_rpc.Status {
+func (m *BatchUpdateBlobsResponse_Response) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -1280,27 +1852,49 @@ type GetTreeRequest struct {
 	// storage, caches, etc.). The server MAY require use of this field to select
 	// between them in an implementation-defined fashion, otherwise it can be
 	// omitted.
-	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName" json:"instance_name,omitempty"`
+	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName,proto3" json:"instance_name,omitempty"`
 	// The digest of the root, which must be an encoded
 	// [Directory][google.devtools.remoteexecution.v1test.Directory] message
 	// stored in the
 	// [ContentAddressableStorage][google.devtools.remoteexecution.v1test.ContentAddressableStorage].
-	RootDigest *Digest `protobuf:"bytes,2,opt,name=root_digest,json=rootDigest" json:"root_digest,omitempty"`
+	RootDigest *Digest `protobuf:"bytes,2,opt,name=root_digest,json=rootDigest,proto3" json:"root_digest,omitempty"`
 	// A maximum page size to request. If present, the server will request no more
 	// than this many items. Regardless of whether a page size is specified, the
 	// server may place its own limit on the number of items to be returned and
 	// require the client to retrieve more items using a subsequent request.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A page token, which must be a value received in a previous
 	// [GetTreeResponse][google.devtools.remoteexecution.v1test.GetTreeResponse].
 	// If present, the server will use it to return the following page of results.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetTreeRequest) Reset()                    { *m = GetTreeRequest{} }
-func (m *GetTreeRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTreeRequest) ProtoMessage()               {}
-func (*GetTreeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+func (m *GetTreeRequest) Reset()         { *m = GetTreeRequest{} }
+func (m *GetTreeRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTreeRequest) ProtoMessage()    {}
+func (*GetTreeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{22}
+}
+func (m *GetTreeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTreeRequest.Unmarshal(m, b)
+}
+func (m *GetTreeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTreeRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTreeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTreeRequest.Merge(dst, src)
+}
+func (m *GetTreeRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTreeRequest.Size(m)
+}
+func (m *GetTreeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTreeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetTreeRequest proto.InternalMessageInfo
 
 func (m *GetTreeRequest) GetInstanceName() string {
 	if m != nil {
@@ -1334,18 +1928,40 @@ func (m *GetTreeRequest) GetPageToken() string {
 // [ContentAddressableStorage.GetTree][google.devtools.remoteexecution.v1test.ContentAddressableStorage.GetTree].
 type GetTreeResponse struct {
 	// The directories descended from the requested root.
-	Directories []*Directory `protobuf:"bytes,1,rep,name=directories" json:"directories,omitempty"`
+	Directories []*Directory `protobuf:"bytes,1,rep,name=directories,proto3" json:"directories,omitempty"`
 	// If present, signifies that there are more results which the client can
 	// retrieve by passing this as the page_token in a subsequent
 	// [request][google.devtools.remoteexecution.v1test.GetTreeRequest].
 	// If empty, signifies that this is the last page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetTreeResponse) Reset()                    { *m = GetTreeResponse{} }
-func (m *GetTreeResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetTreeResponse) ProtoMessage()               {}
-func (*GetTreeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+func (m *GetTreeResponse) Reset()         { *m = GetTreeResponse{} }
+func (m *GetTreeResponse) String() string { return proto.CompactTextString(m) }
+func (*GetTreeResponse) ProtoMessage()    {}
+func (*GetTreeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{23}
+}
+func (m *GetTreeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTreeResponse.Unmarshal(m, b)
+}
+func (m *GetTreeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTreeResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetTreeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTreeResponse.Merge(dst, src)
+}
+func (m *GetTreeResponse) XXX_Size() int {
+	return xxx_messageInfo_GetTreeResponse.Size(m)
+}
+func (m *GetTreeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTreeResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetTreeResponse proto.InternalMessageInfo
 
 func (m *GetTreeResponse) GetDirectories() []*Directory {
 	if m != nil {
@@ -1364,15 +1980,37 @@ func (m *GetTreeResponse) GetNextPageToken() string {
 // Details for the tool used to call the API.
 type ToolDetails struct {
 	// Name of the tool, e.g. bazel.
-	ToolName string `protobuf:"bytes,1,opt,name=tool_name,json=toolName" json:"tool_name,omitempty"`
+	ToolName string `protobuf:"bytes,1,opt,name=tool_name,json=toolName,proto3" json:"tool_name,omitempty"`
 	// Version of the tool used for the request, e.g. 5.0.3.
-	ToolVersion string `protobuf:"bytes,2,opt,name=tool_version,json=toolVersion" json:"tool_version,omitempty"`
+	ToolVersion          string   `protobuf:"bytes,2,opt,name=tool_version,json=toolVersion,proto3" json:"tool_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ToolDetails) Reset()                    { *m = ToolDetails{} }
-func (m *ToolDetails) String() string            { return proto.CompactTextString(m) }
-func (*ToolDetails) ProtoMessage()               {}
-func (*ToolDetails) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
+func (m *ToolDetails) Reset()         { *m = ToolDetails{} }
+func (m *ToolDetails) String() string { return proto.CompactTextString(m) }
+func (*ToolDetails) ProtoMessage()    {}
+func (*ToolDetails) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{24}
+}
+func (m *ToolDetails) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ToolDetails.Unmarshal(m, b)
+}
+func (m *ToolDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ToolDetails.Marshal(b, m, deterministic)
+}
+func (dst *ToolDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ToolDetails.Merge(dst, src)
+}
+func (m *ToolDetails) XXX_Size() int {
+	return xxx_messageInfo_ToolDetails.Size(m)
+}
+func (m *ToolDetails) XXX_DiscardUnknown() {
+	xxx_messageInfo_ToolDetails.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ToolDetails proto.InternalMessageInfo
 
 func (m *ToolDetails) GetToolName() string {
 	if m != nil {
@@ -1396,23 +2034,45 @@ func (m *ToolDetails) GetToolVersion() string {
 // contents: the base64 encoded binary RequestMetadata message.
 type RequestMetadata struct {
 	// The details for the tool invoking the requests.
-	ToolDetails *ToolDetails `protobuf:"bytes,1,opt,name=tool_details,json=toolDetails" json:"tool_details,omitempty"`
+	ToolDetails *ToolDetails `protobuf:"bytes,1,opt,name=tool_details,json=toolDetails,proto3" json:"tool_details,omitempty"`
 	// An identifier that ties multiple requests to the same action.
 	// For example, multiple requests to the CAS, Action Cache, and Execution
 	// API are used in order to compile foo.cc.
-	ActionId string `protobuf:"bytes,2,opt,name=action_id,json=actionId" json:"action_id,omitempty"`
+	ActionId string `protobuf:"bytes,2,opt,name=action_id,json=actionId,proto3" json:"action_id,omitempty"`
 	// An identifier that ties multiple actions together to a final result.
 	// For example, multiple actions are required to build and run foo_test.
-	ToolInvocationId string `protobuf:"bytes,3,opt,name=tool_invocation_id,json=toolInvocationId" json:"tool_invocation_id,omitempty"`
+	ToolInvocationId string `protobuf:"bytes,3,opt,name=tool_invocation_id,json=toolInvocationId,proto3" json:"tool_invocation_id,omitempty"`
 	// An identifier to tie multiple tool invocations together. For example,
 	// runs of foo_test, bar_test and baz_test on a post-submit of a given patch.
-	CorrelatedInvocationsId string `protobuf:"bytes,4,opt,name=correlated_invocations_id,json=correlatedInvocationsId" json:"correlated_invocations_id,omitempty"`
+	CorrelatedInvocationsId string   `protobuf:"bytes,4,opt,name=correlated_invocations_id,json=correlatedInvocationsId,proto3" json:"correlated_invocations_id,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
+	XXX_unrecognized        []byte   `json:"-"`
+	XXX_sizecache           int32    `json:"-"`
+}
+
+func (m *RequestMetadata) Reset()         { *m = RequestMetadata{} }
+func (m *RequestMetadata) String() string { return proto.CompactTextString(m) }
+func (*RequestMetadata) ProtoMessage()    {}
+func (*RequestMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_remote_execution_2379da344af471dd, []int{25}
+}
+func (m *RequestMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RequestMetadata.Unmarshal(m, b)
+}
+func (m *RequestMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RequestMetadata.Marshal(b, m, deterministic)
+}
+func (dst *RequestMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestMetadata.Merge(dst, src)
+}
+func (m *RequestMetadata) XXX_Size() int {
+	return xxx_messageInfo_RequestMetadata.Size(m)
+}
+func (m *RequestMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_RequestMetadata.DiscardUnknown(m)
 }
 
-func (m *RequestMetadata) Reset()                    { *m = RequestMetadata{} }
-func (m *RequestMetadata) String() string            { return proto.CompactTextString(m) }
-func (*RequestMetadata) ProtoMessage()               {}
-func (*RequestMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
+var xxx_messageInfo_RequestMetadata proto.InternalMessageInfo
 
 func (m *RequestMetadata) GetToolDetails() *ToolDetails {
 	if m != nil {
@@ -1459,6 +2119,7 @@ func init() {
 	proto.RegisterType((*ExecuteRequest)(nil), "google.devtools.remoteexecution.v1test.ExecuteRequest")
 	proto.RegisterType((*LogFile)(nil), "google.devtools.remoteexecution.v1test.LogFile")
 	proto.RegisterType((*ExecuteResponse)(nil), "google.devtools.remoteexecution.v1test.ExecuteResponse")
+	proto.RegisterMapType((map[string]*LogFile)(nil), "google.devtools.remoteexecution.v1test.ExecuteResponse.ServerLogsEntry")
 	proto.RegisterType((*ExecuteOperationMetadata)(nil), "google.devtools.remoteexecution.v1test.ExecuteOperationMetadata")
 	proto.RegisterType((*GetActionResultRequest)(nil), "google.devtools.remoteexecution.v1test.GetActionResultRequest")
 	proto.RegisterType((*UpdateActionResultRequest)(nil), "google.devtools.remoteexecution.v1test.UpdateActionResultRequest")
@@ -1483,8 +2144,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Execution service
-
+// ExecutionClient is the client API for Execution service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ExecutionClient interface {
 	// Execute an action remotely.
 	//
@@ -1549,7 +2211,7 @@ type ExecutionClient interface {
 	// where, for each requested blob not present in the CAS, there is a
 	// `Violation` with a `type` of `MISSING` and a `subject` of
 	// `"blobs/{hash}/{size}"` indicating the digest of the missing blob.
-	Execute(ctx context.Context, in *ExecuteRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	Execute(ctx context.Context, in *ExecuteRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 }
 
 type executionClient struct {
@@ -1560,17 +2222,16 @@ func NewExecutionClient(cc *grpc.ClientConn) ExecutionClient {
 	return &executionClient{cc}
 }
 
-func (c *executionClient) Execute(ctx context.Context, in *ExecuteRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.Execution/Execute", in, out, c.cc, opts...)
+func (c *executionClient) Execute(ctx context.Context, in *ExecuteRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.Execution/Execute", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Execution service
-
+// ExecutionServer is the server API for Execution service.
 type ExecutionServer interface {
 	// Execute an action remotely.
 	//
@@ -1635,7 +2296,7 @@ type ExecutionServer interface {
 	// where, for each requested blob not present in the CAS, there is a
 	// `Violation` with a `type` of `MISSING` and a `subject` of
 	// `"blobs/{hash}/{size}"` indicating the digest of the missing blob.
-	Execute(context.Context, *ExecuteRequest) (*google_longrunning.Operation, error)
+	Execute(context.Context, *ExecuteRequest) (*longrunning.Operation, error)
 }
 
 func RegisterExecutionServer(s *grpc.Server, srv ExecutionServer) {
@@ -1673,8 +2334,9 @@ var _Execution_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/remoteexecution/v1test/remote_execution.proto",
 }
 
-// Client API for ActionCache service
-
+// ActionCacheClient is the client API for ActionCache service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ActionCacheClient interface {
 	// Retrieve a cached execution result.
 	//
@@ -1705,7 +2367,7 @@ func NewActionCacheClient(cc *grpc.ClientConn) ActionCacheClient {
 
 func (c *actionCacheClient) GetActionResult(ctx context.Context, in *GetActionResultRequest, opts ...grpc.CallOption) (*ActionResult, error) {
 	out := new(ActionResult)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ActionCache/GetActionResult", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ActionCache/GetActionResult", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1714,15 +2376,14 @@ func (c *actionCacheClient) GetActionResult(ctx context.Context, in *GetActionRe
 
 func (c *actionCacheClient) UpdateActionResult(ctx context.Context, in *UpdateActionResultRequest, opts ...grpc.CallOption) (*ActionResult, error) {
 	out := new(ActionResult)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ActionCache/UpdateActionResult", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ActionCache/UpdateActionResult", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ActionCache service
-
+// ActionCacheServer is the server API for ActionCache service.
 type ActionCacheServer interface {
 	// Retrieve a cached execution result.
 	//
@@ -1800,8 +2461,9 @@ var _ActionCache_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/remoteexecution/v1test/remote_execution.proto",
 }
 
-// Client API for ContentAddressableStorage service
-
+// ContentAddressableStorageClient is the client API for ContentAddressableStorage service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ContentAddressableStorageClient interface {
 	// Determine if blobs are present in the CAS.
 	//
@@ -1858,7 +2520,7 @@ func NewContentAddressableStorageClient(cc *grpc.ClientConn) ContentAddressableS
 
 func (c *contentAddressableStorageClient) FindMissingBlobs(ctx context.Context, in *FindMissingBlobsRequest, opts ...grpc.CallOption) (*FindMissingBlobsResponse, error) {
 	out := new(FindMissingBlobsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ContentAddressableStorage/FindMissingBlobs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ContentAddressableStorage/FindMissingBlobs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1867,7 +2529,7 @@ func (c *contentAddressableStorageClient) FindMissingBlobs(ctx context.Context,
 
 func (c *contentAddressableStorageClient) BatchUpdateBlobs(ctx context.Context, in *BatchUpdateBlobsRequest, opts ...grpc.CallOption) (*BatchUpdateBlobsResponse, error) {
 	out := new(BatchUpdateBlobsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ContentAddressableStorage/BatchUpdateBlobs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ContentAddressableStorage/BatchUpdateBlobs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1876,15 +2538,14 @@ func (c *contentAddressableStorageClient) BatchUpdateBlobs(ctx context.Context,
 
 func (c *contentAddressableStorageClient) GetTree(ctx context.Context, in *GetTreeRequest, opts ...grpc.CallOption) (*GetTreeResponse, error) {
 	out := new(GetTreeResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ContentAddressableStorage/GetTree", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteexecution.v1test.ContentAddressableStorage/GetTree", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ContentAddressableStorage service
-
+// ContentAddressableStorageServer is the server API for ContentAddressableStorage service.
 type ContentAddressableStorageServer interface {
 	// Determine if blobs are present in the CAS.
 	//
@@ -2011,10 +2672,10 @@ var _ContentAddressableStorage_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/remoteexecution/v1test/remote_execution.proto", fileDescriptor0)
+	proto.RegisterFile("google/devtools/remoteexecution/v1test/remote_execution.proto", fileDescriptor_remote_execution_2379da344af471dd)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_remote_execution_2379da344af471dd = []byte{
 	// 2025 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xdd, 0x6f, 0x23, 0x57,
 	0x15, 0x67, 0xec, 0x24, 0xb6, 0x8f, 0x9d, 0x75, 0xf6, 0x76, 0xe9, 0x7a, 0xdd, 0x2e, 0x4a, 0xa7,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/bots.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
index 604399a1..6cfdf49c 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/bots.pb.go
@@ -1,48 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/bots.proto
 
-/*
-Package remoteworkers is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/remoteworkers/v1test2/bots.proto
-	google/devtools/remoteworkers/v1test2/command.proto
-	google/devtools/remoteworkers/v1test2/tasks.proto
-
-It has these top-level messages:
-	BotSession
-	Lease
-	Worker
-	Device
-	AdminTemp
-	CreateBotSessionRequest
-	UpdateBotSessionRequest
-	PostBotEventTempRequest
-	CommandTask
-	CommandOutputs
-	CommandOverhead
-	FileMetadata
-	DirectoryMetadata
-	Digest
-	Directory
-	Task
-	TaskResult
-	GetTaskRequest
-	UpdateTaskResultRequest
-	AddTaskLogRequest
-	AddTaskLogResponse
-*/
-package remoteworkers
+package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -105,7 +74,9 @@ var BotStatus_value = map[string]int32{
 func (x BotStatus) String() string {
 	return proto.EnumName(BotStatus_name, int32(x))
 }
-func (BotStatus) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (BotStatus) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{0}
+}
 
 // The state of the lease. All leases start in the PENDING state. A bot can
 // change PENDING to ACTIVE or (in the case of an error) COMPLETED, or from
@@ -148,7 +119,9 @@ var LeaseState_value = map[string]int32{
 func (x LeaseState) String() string {
 	return proto.EnumName(LeaseState_name, int32(x))
 }
-func (LeaseState) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (LeaseState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{1}
+}
 
 // Possible administration actions.
 type AdminTemp_Command int32
@@ -188,7 +161,9 @@ var AdminTemp_Command_value = map[string]int32{
 func (x AdminTemp_Command) String() string {
 	return proto.EnumName(AdminTemp_Command_name, int32(x))
 }
-func (AdminTemp_Command) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
+func (AdminTemp_Command) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{2, 0}
+}
 
 // Types of bot events.
 type PostBotEventTempRequest_Type int32
@@ -217,7 +192,7 @@ func (x PostBotEventTempRequest_Type) String() string {
 	return proto.EnumName(PostBotEventTempRequest_Type_name, int32(x))
 }
 func (PostBotEventTempRequest_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{7, 0}
+	return fileDescriptor_bots_a76feaae86db3e89, []int{5, 0}
 }
 
 // A bot session represents the state of a bot while in continuous contact with
@@ -230,7 +205,7 @@ func (PostBotEventTempRequest_Type) EnumDescriptor() ([]byte, []int) {
 type BotSession struct {
 	// The bot session name, as selected by the server. Output only during a call
 	// to CreateBotSession.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A unique bot ID within the farm used to persistently identify this bot over
 	// time (i.e., over multiple sessions). This ID must be unique within a
 	// farm. Typically, the bot ID will be the same as the name of the primary
@@ -245,10 +220,10 @@ type BotSession struct {
 	// invalid session, the server must reject that request, and may also
 	// quarantine the other bot with the same bot IDs (ie, stop sending it new
 	// leases and alert an admin).
-	BotId string `protobuf:"bytes,2,opt,name=bot_id,json=botId" json:"bot_id,omitempty"`
+	BotId string `protobuf:"bytes,2,opt,name=bot_id,json=botId,proto3" json:"bot_id,omitempty"`
 	// The status of the bot. This must be populated in every call to
 	// UpdateBotSession.
-	Status BotStatus `protobuf:"varint,3,opt,name=status,enum=google.devtools.remoteworkers.v1test2.BotStatus" json:"status,omitempty"`
+	Status BotStatus `protobuf:"varint,3,opt,name=status,proto3,enum=google.devtools.remoteworkers.v1test2.BotStatus" json:"status,omitempty"`
 	// A description of the worker hosting this bot. The Worker message is used
 	// here in the Status context (see Worker for more information).  If multiple
 	// bots are running on the worker, this field should only describe the
@@ -257,22 +232,44 @@ type BotSession struct {
 	// During the call to CreateBotSession, the server may make arbitrary changes
 	// to the worker's `server_properties` field (see that field for more
 	// information). Otherwise, this field is input-only.
-	Worker *Worker `protobuf:"bytes,4,opt,name=worker" json:"worker,omitempty"`
+	Worker *Worker `protobuf:"bytes,4,opt,name=worker,proto3" json:"worker,omitempty"`
 	// A list of all leases that are a part of this session. See the Lease message
 	// for details.
-	Leases []*Lease `protobuf:"bytes,5,rep,name=leases" json:"leases,omitempty"`
+	Leases []*Lease `protobuf:"bytes,5,rep,name=leases,proto3" json:"leases,omitempty"`
 	// The time at which this bot session will expire, unless the bot calls
 	// UpdateBotSession again. Output only.
-	ExpireTime *google_protobuf4.Timestamp `protobuf:"bytes,6,opt,name=expire_time,json=expireTime" json:"expire_time,omitempty"`
+	ExpireTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// The version of the bot code currently running. The server may use this
 	// information to issue an admin action to tell the bot to update itself.
-	Version string `protobuf:"bytes,7,opt,name=version" json:"version,omitempty"`
+	Version              string   `protobuf:"bytes,7,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BotSession) Reset()         { *m = BotSession{} }
+func (m *BotSession) String() string { return proto.CompactTextString(m) }
+func (*BotSession) ProtoMessage()    {}
+func (*BotSession) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{0}
+}
+func (m *BotSession) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BotSession.Unmarshal(m, b)
+}
+func (m *BotSession) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BotSession.Marshal(b, m, deterministic)
+}
+func (dst *BotSession) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BotSession.Merge(dst, src)
+}
+func (m *BotSession) XXX_Size() int {
+	return xxx_messageInfo_BotSession.Size(m)
+}
+func (m *BotSession) XXX_DiscardUnknown() {
+	xxx_messageInfo_BotSession.DiscardUnknown(m)
 }
 
-func (m *BotSession) Reset()                    { *m = BotSession{} }
-func (m *BotSession) String() string            { return proto.CompactTextString(m) }
-func (*BotSession) ProtoMessage()               {}
-func (*BotSession) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_BotSession proto.InternalMessageInfo
 
 func (m *BotSession) GetName() string {
 	if m != nil {
@@ -309,7 +306,7 @@ func (m *BotSession) GetLeases() []*Lease {
 	return nil
 }
 
-func (m *BotSession) GetExpireTime() *google_protobuf4.Timestamp {
+func (m *BotSession) GetExpireTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ExpireTime
 	}
@@ -342,289 +339,133 @@ func (m *BotSession) GetVersion() string {
 // bot shouldn't report on them any more (the server will ignore superfluous
 // COMPLETED records).
 type Lease struct {
-	// The assignment, which is typically a resource that can be accessed through
-	// some other services. The assignment must be meaningful to the bot based
-	// solely on this name, either because the bot only understands one type of
-	// assignment (e.g., tasks served through the Tasks interface) or through some
-	// implementation-defined schema.
-	//
-	// For example, if the worker is executing a Task as defined by the Tasks
-	// interface, this field might be projects/{projectid}/tasks/{taskid}.
-	// However, it the worker is being assigned pull from a *queue* of tasks, the
-	// resource would be the name of the queue, something like
-	// projects/{projectid}/locations/{locationid}/queues/{queueid}. That queue
-	// may then provide the bot with tasks through another interface, which the
-	// bot then processes through the [Tasks]
-	// [google.devtools.remoteworkers.v1test2.Tasks] interface.
-	//
-	// Note that the assignment may be a [full resource name]
-	// [https://cloud.google.com/apis/design/resource_names#full_resource_name] if
-	// it should be accessed through an endpoint that is not already known to the
-	// bot.
-	Assignment string `protobuf:"bytes,1,opt,name=assignment" json:"assignment,omitempty"`
+	// A short string uniquely identifing the lease within this bot session.
+	Id string `protobuf:"bytes,7,opt,name=id,proto3" json:"id,omitempty"`
+	// The actual work to be performed, if any. May be omitted by the server if
+	// the lease is not in the `PENDING` state. The message must be meaningful to
+	// the bot. Output only (must only be set by the server).
+	Payload *any.Any `protobuf:"bytes,8,opt,name=payload,proto3" json:"payload,omitempty"`
+	// Any result the bot wishes to provide about the lease. Must not be changed
+	// after the first call with the lease in the `COMPLETED` or `CANCELLED`
+	// state. Input only (must only be set by the bot, will not be echoed by the
+	// server).
+	Result *any.Any `protobuf:"bytes,9,opt,name=result,proto3" json:"result,omitempty"`
 	// The state of the lease. See LeaseState for more information.
-	State LeaseState `protobuf:"varint,2,opt,name=state,enum=google.devtools.remoteworkers.v1test2.LeaseState" json:"state,omitempty"`
+	State LeaseState `protobuf:"varint,2,opt,name=state,proto3,enum=google.devtools.remoteworkers.v1test2.LeaseState" json:"state,omitempty"`
 	// The final status of the lease (should be populated by the bot if the state
 	// is completed). This is the status of the lease, not of any task represented
 	// by the lease. For example, if the bot could not accept the lease because it
 	// asked for some resource the bot didn't have, this status will be
 	// FAILED_PRECONDITION. But if the assignment in the lease didn't execute
 	// correctly, this field will be `OK` while the failure of the assignment must
-	// be tracked elsewhere (e.g., through the Tasks interface).
-	Status *google_rpc.Status `protobuf:"bytes,3,opt,name=status" json:"status,omitempty"`
+	// communicated via the `result` field.
+	Status *status.Status `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"`
 	// The requirements that are being claimed by this lease. This field may be
 	// omitted by the server if the lease is not pending.
-	Requirements *Worker `protobuf:"bytes,4,opt,name=requirements" json:"requirements,omitempty"`
+	Requirements *Worker `protobuf:"bytes,4,opt,name=requirements,proto3" json:"requirements,omitempty"`
 	// The time at which this lease expires. The server *may* extend this over
 	// time, but due to race conditions, the bot is not *required* to respect any
 	// expiry date except the first one.
-	ExpireTime *google_protobuf4.Timestamp `protobuf:"bytes,5,opt,name=expire_time,json=expireTime" json:"expire_time,omitempty"`
-	// While the `assignment` field is a resource name that allows the bot to
-	// get the actual assignment, the server can also optionally include the
-	// assignment itself inline in order to save a round trip to the server.
-	//
-	// This doesn't necessarily need to be the resource pointed to by
-	// `assignment`. For example, if the assignment is a task, this field could
-	// be task.description, not the entire task, since that's all the bot needs
-	// to know to get started. As with `assignment` itself, all that's necessary
-	// is that the bot knows how to handle the type of message received here.
-	//
-	// This field may be omitted by the server if the lease is not in the
-	// `PENDING` state.
-	InlineAssignment *google_protobuf1.Any `protobuf:"bytes,6,opt,name=inline_assignment,json=inlineAssignment" json:"inline_assignment,omitempty"`
+	ExpireTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	// DEPRECATED. The assignment should be provided to the bot via the `payload`
+	// field. Clients that wish to use a simple name (such as a queue of work
+	// provided elsewhere) should define a custom message type and encode it into
+	// `payload`.
+	Assignment string `protobuf:"bytes,1,opt,name=assignment,proto3" json:"assignment,omitempty"` // Deprecated: Do not use.
+	// DEPRECATED. Use `payload` instead.
+	InlineAssignment     *any.Any `protobuf:"bytes,6,opt,name=inline_assignment,json=inlineAssignment,proto3" json:"inline_assignment,omitempty"` // Deprecated: Do not use.
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Lease) Reset()                    { *m = Lease{} }
-func (m *Lease) String() string            { return proto.CompactTextString(m) }
-func (*Lease) ProtoMessage()               {}
-func (*Lease) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *Lease) GetAssignment() string {
-	if m != nil {
-		return m.Assignment
-	}
-	return ""
+func (m *Lease) Reset()         { *m = Lease{} }
+func (m *Lease) String() string { return proto.CompactTextString(m) }
+func (*Lease) ProtoMessage()    {}
+func (*Lease) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{1}
 }
-
-func (m *Lease) GetState() LeaseState {
-	if m != nil {
-		return m.State
-	}
-	return LeaseState_LEASE_STATE_UNSPECIFIED
+func (m *Lease) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Lease.Unmarshal(m, b)
 }
-
-func (m *Lease) GetStatus() *google_rpc.Status {
-	if m != nil {
-		return m.Status
-	}
-	return nil
+func (m *Lease) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Lease.Marshal(b, m, deterministic)
 }
-
-func (m *Lease) GetRequirements() *Worker {
-	if m != nil {
-		return m.Requirements
-	}
-	return nil
+func (dst *Lease) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Lease.Merge(dst, src)
 }
-
-func (m *Lease) GetExpireTime() *google_protobuf4.Timestamp {
-	if m != nil {
-		return m.ExpireTime
-	}
-	return nil
+func (m *Lease) XXX_Size() int {
+	return xxx_messageInfo_Lease.Size(m)
+}
+func (m *Lease) XXX_DiscardUnknown() {
+	xxx_messageInfo_Lease.DiscardUnknown(m)
 }
 
-func (m *Lease) GetInlineAssignment() *google_protobuf1.Any {
+var xxx_messageInfo_Lease proto.InternalMessageInfo
+
+func (m *Lease) GetId() string {
 	if m != nil {
-		return m.InlineAssignment
+		return m.Id
 	}
-	return nil
-}
-
-// Describes a worker, which is a list of one or more devices and the
-// connections between them. A device could be a computer, a phone, or even an
-// accelerator like a GPU; it's up to the farm administrator to decide how to
-// model their farm. For example, if a farm only has one type of GPU, the GPU
-// could be modelled as a "has_gpu" property on its host computer; if it has
-// many subproperties itself, it might be better to model it as a separate
-// device.
-//
-// The first device in the worker is the "primary device" - that is, the device
-// running a bot and which is responsible for actually executing commands. All
-// other devices are considered to be attached devices, and must be controllable
-// by the primary device.
-//
-// This message (and all its submessages) can be used in two contexts:
-//
-// * Status: sent by the bot to report the current capabilities of the device to
-// allow reservation matching.
-// * Request: sent by a client to request a device with certain capabilities in
-// a reservation.
-//
-// Several of the fields in this message have different semantics depending on
-// which of which of these contexts it is used. These semantics are described
-// below.
-//
-// Several messages in Worker and its submessages have the concept of keys and
-// values, such as `Worker.Property` and `Device.Property`. All keys are simple
-// strings, but certain keys are "standard" keys and should be broadly supported
-// across farms and implementations; these are listed below each relevant
-// message. Bot implementations or farm admins may add *additional* keys, but
-// these SHOULD all begin with an underscore so they do not conflict with
-// standard keys that may be added in the future.
-//
-// Keys are not context sensitive.
-//
-// See http://goo.gl/NurY8g for more information on the Worker message.
-type Worker struct {
-	// A list of devices; the first device is the primary device. See the `Device`
-	// message for more information.
-	Devices []*Device `protobuf:"bytes,1,rep,name=devices" json:"devices,omitempty"`
-	// A worker may contain "global" properties. For example, certain machines
-	// might be reserved for certain types of jobs, like short-running compilation
-	// versus long-running integration tests. This property is known as a "pool"
-	// and is not related to any one device within the worker; rather, it applies
-	// to the worker as a whole.
-	//
-	// The behaviour of repeated keys is identical to that of Device.Property.
-	Properties []*Worker_Property `protobuf:"bytes,2,rep,name=properties" json:"properties,omitempty"`
+	return ""
 }
 
-func (m *Worker) Reset()                    { *m = Worker{} }
-func (m *Worker) String() string            { return proto.CompactTextString(m) }
-func (*Worker) ProtoMessage()               {}
-func (*Worker) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *Worker) GetDevices() []*Device {
+func (m *Lease) GetPayload() *any.Any {
 	if m != nil {
-		return m.Devices
+		return m.Payload
 	}
 	return nil
 }
 
-func (m *Worker) GetProperties() []*Worker_Property {
+func (m *Lease) GetResult() *any.Any {
 	if m != nil {
-		return m.Properties
+		return m.Result
 	}
 	return nil
 }
 
-// A global property; see the `properties` field for more information.
-type Worker_Property struct {
-	// For general information on keys, see the documentation to `Worker`.
-	//
-	// The current set of standard keys are:
-	//
-	// * pool: different workers can be reserved for different purposes. For
-	// example, an admin might want to segregate long-running integration tests
-	// from short-running unit tests, so unit tests will always get some
-	// throughput. To support this, the server can assign different values for
-	// `pool` (such as "itest" and "utest") to different workers, and then have
-	// jobs request workers from those pools.
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	// The property's value.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *Worker_Property) Reset()                    { *m = Worker_Property{} }
-func (m *Worker_Property) String() string            { return proto.CompactTextString(m) }
-func (*Worker_Property) ProtoMessage()               {}
-func (*Worker_Property) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-func (m *Worker_Property) GetKey() string {
+func (m *Lease) GetState() LeaseState {
 	if m != nil {
-		return m.Key
+		return m.State
 	}
-	return ""
+	return LeaseState_LEASE_STATE_UNSPECIFIED
 }
 
-func (m *Worker_Property) GetValue() string {
+func (m *Lease) GetStatus() *status.Status {
 	if m != nil {
-		return m.Value
+		return m.Status
 	}
-	return ""
-}
-
-// Any device, including computers, phones, accelerators (e.g. GPUs), etc. All
-// names must be unique.
-type Device struct {
-	// The handle can be thought of as the "name" of the device, and must be
-	// unique within a Worker.
-	//
-	// In the Status context, the handle should be some human-understandable name,
-	// perhaps corresponding to a label physically written on the device to make
-	// it easy to locate. In the Request context, the name should be the
-	// *logical* name expected by the task. The bot is responsible for mapping the
-	// logical name expected by the task to a machine-readable name that the task
-	// can actually use, such as a USB address. The method by which this mapping
-	// is communicated to the task is not covered in this API.
-	Handle string `protobuf:"bytes,1,opt,name=handle" json:"handle,omitempty"`
-	// Properties of this device that don't change based on the tasks that are
-	// running on it, e.g. OS, CPU architecture, etc.
-	//
-	// Keys may be repeated, and have the following interpretation:
-	//
-	//    * Status context: the device can support *any* the listed values. For
-	//    example, an "ISA" property might include "x86", "x86-64" and "sse4".
-	//
-	//    * Request context: the device *must* support *all* of the listed values.
-	Properties []*Device_Property `protobuf:"bytes,2,rep,name=properties" json:"properties,omitempty"`
+	return nil
 }
 
-func (m *Device) Reset()                    { *m = Device{} }
-func (m *Device) String() string            { return proto.CompactTextString(m) }
-func (*Device) ProtoMessage()               {}
-func (*Device) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *Device) GetHandle() string {
+func (m *Lease) GetRequirements() *Worker {
 	if m != nil {
-		return m.Handle
+		return m.Requirements
 	}
-	return ""
+	return nil
 }
 
-func (m *Device) GetProperties() []*Device_Property {
+func (m *Lease) GetExpireTime() *timestamp.Timestamp {
 	if m != nil {
-		return m.Properties
+		return m.ExpireTime
 	}
 	return nil
 }
 
-// A device property; see `properties` for more information.
-type Device_Property struct {
-	// For general information on keys, see the documentation to `Worker`.
-	//
-	// The current set of standard keys are:
-	//
-	// * os: a human-readable description of the OS. Examples include `linux`,
-	// `ubuntu` and `ubuntu 14.04` (note that a bot may advertise itself as more
-	// than one). This will be replaced in the future by more well-structured
-	// keys and values to represent OS variants.
-	//
-	// * has-docker: "true" if the bot has Docker installed. This will be
-	// replaced in the future by a more structured message for Docker support.
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	// The property's value.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *Device_Property) Reset()                    { *m = Device_Property{} }
-func (m *Device_Property) String() string            { return proto.CompactTextString(m) }
-func (*Device_Property) ProtoMessage()               {}
-func (*Device_Property) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 0} }
-
-func (m *Device_Property) GetKey() string {
+// Deprecated: Do not use.
+func (m *Lease) GetAssignment() string {
 	if m != nil {
-		return m.Key
+		return m.Assignment
 	}
 	return ""
 }
 
-func (m *Device_Property) GetValue() string {
+// Deprecated: Do not use.
+func (m *Lease) GetInlineAssignment() *any.Any {
 	if m != nil {
-		return m.Value
+		return m.InlineAssignment
 	}
-	return ""
+	return nil
 }
 
 // AdminTemp is a prelimiary set of administration tasks. It's called "Temp"
@@ -641,15 +482,37 @@ func (m *Device_Property) GetValue() string {
 // project (http://github.com/luci/luci-py/appengine/swarming).
 type AdminTemp struct {
 	// The admin action; see `Command` for legal values.
-	Command AdminTemp_Command `protobuf:"varint,1,opt,name=command,enum=google.devtools.remoteworkers.v1test2.AdminTemp_Command" json:"command,omitempty"`
+	Command AdminTemp_Command `protobuf:"varint,1,opt,name=command,proto3,enum=google.devtools.remoteworkers.v1test2.AdminTemp_Command" json:"command,omitempty"`
 	// The argument to the admin action; see `Command` for semantics.
-	Arg string `protobuf:"bytes,2,opt,name=arg" json:"arg,omitempty"`
+	Arg                  string   `protobuf:"bytes,2,opt,name=arg,proto3" json:"arg,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *AdminTemp) Reset()                    { *m = AdminTemp{} }
-func (m *AdminTemp) String() string            { return proto.CompactTextString(m) }
-func (*AdminTemp) ProtoMessage()               {}
-func (*AdminTemp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *AdminTemp) Reset()         { *m = AdminTemp{} }
+func (m *AdminTemp) String() string { return proto.CompactTextString(m) }
+func (*AdminTemp) ProtoMessage()    {}
+func (*AdminTemp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{2}
+}
+func (m *AdminTemp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AdminTemp.Unmarshal(m, b)
+}
+func (m *AdminTemp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AdminTemp.Marshal(b, m, deterministic)
+}
+func (dst *AdminTemp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdminTemp.Merge(dst, src)
+}
+func (m *AdminTemp) XXX_Size() int {
+	return xxx_messageInfo_AdminTemp.Size(m)
+}
+func (m *AdminTemp) XXX_DiscardUnknown() {
+	xxx_messageInfo_AdminTemp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AdminTemp proto.InternalMessageInfo
 
 func (m *AdminTemp) GetCommand() AdminTemp_Command {
 	if m != nil {
@@ -668,15 +531,37 @@ func (m *AdminTemp) GetArg() string {
 // Request message for CreateBotSession.
 type CreateBotSessionRequest struct {
 	// The farm resource.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The bot session to create. Server-assigned fields like name must be unset.
-	BotSession *BotSession `protobuf:"bytes,2,opt,name=bot_session,json=botSession" json:"bot_session,omitempty"`
+	BotSession           *BotSession `protobuf:"bytes,2,opt,name=bot_session,json=botSession,proto3" json:"bot_session,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *CreateBotSessionRequest) Reset()                    { *m = CreateBotSessionRequest{} }
-func (m *CreateBotSessionRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateBotSessionRequest) ProtoMessage()               {}
-func (*CreateBotSessionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *CreateBotSessionRequest) Reset()         { *m = CreateBotSessionRequest{} }
+func (m *CreateBotSessionRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateBotSessionRequest) ProtoMessage()    {}
+func (*CreateBotSessionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{3}
+}
+func (m *CreateBotSessionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateBotSessionRequest.Unmarshal(m, b)
+}
+func (m *CreateBotSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateBotSessionRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateBotSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBotSessionRequest.Merge(dst, src)
+}
+func (m *CreateBotSessionRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateBotSessionRequest.Size(m)
+}
+func (m *CreateBotSessionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateBotSessionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateBotSessionRequest proto.InternalMessageInfo
 
 func (m *CreateBotSessionRequest) GetParent() string {
 	if m != nil {
@@ -695,18 +580,40 @@ func (m *CreateBotSessionRequest) GetBotSession() *BotSession {
 // Request message for UpdateBotSession.
 type UpdateBotSessionRequest struct {
 	// The bot session name. Must match bot_session.name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The bot session resource to update.
-	BotSession *BotSession `protobuf:"bytes,2,opt,name=bot_session,json=botSession" json:"bot_session,omitempty"`
+	BotSession *BotSession `protobuf:"bytes,2,opt,name=bot_session,json=botSession,proto3" json:"bot_session,omitempty"`
 	// The fields on the bot that should be updated. See the BotSession resource
 	// for which fields are updatable by which caller.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateBotSessionRequest) Reset()         { *m = UpdateBotSessionRequest{} }
+func (m *UpdateBotSessionRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateBotSessionRequest) ProtoMessage()    {}
+func (*UpdateBotSessionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{4}
+}
+func (m *UpdateBotSessionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateBotSessionRequest.Unmarshal(m, b)
+}
+func (m *UpdateBotSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateBotSessionRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateBotSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateBotSessionRequest.Merge(dst, src)
+}
+func (m *UpdateBotSessionRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateBotSessionRequest.Size(m)
+}
+func (m *UpdateBotSessionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateBotSessionRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateBotSessionRequest) Reset()                    { *m = UpdateBotSessionRequest{} }
-func (m *UpdateBotSessionRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateBotSessionRequest) ProtoMessage()               {}
-func (*UpdateBotSessionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_UpdateBotSessionRequest proto.InternalMessageInfo
 
 func (m *UpdateBotSessionRequest) GetName() string {
 	if m != nil {
@@ -722,7 +629,7 @@ func (m *UpdateBotSessionRequest) GetBotSession() *BotSession {
 	return nil
 }
 
-func (m *UpdateBotSessionRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateBotSessionRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -732,17 +639,39 @@ func (m *UpdateBotSessionRequest) GetUpdateMask() *google_protobuf3.FieldMask {
 // Request message for PostBotEventTemp
 type PostBotEventTempRequest struct {
 	// The bot session name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The type of bot event.
-	Type PostBotEventTempRequest_Type `protobuf:"varint,2,opt,name=type,enum=google.devtools.remoteworkers.v1test2.PostBotEventTempRequest_Type" json:"type,omitempty"`
+	Type PostBotEventTempRequest_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.devtools.remoteworkers.v1test2.PostBotEventTempRequest_Type" json:"type,omitempty"`
 	// A human-readable message.
-	Msg string `protobuf:"bytes,3,opt,name=msg" json:"msg,omitempty"`
+	Msg                  string   `protobuf:"bytes,3,opt,name=msg,proto3" json:"msg,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PostBotEventTempRequest) Reset()                    { *m = PostBotEventTempRequest{} }
-func (m *PostBotEventTempRequest) String() string            { return proto.CompactTextString(m) }
-func (*PostBotEventTempRequest) ProtoMessage()               {}
-func (*PostBotEventTempRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *PostBotEventTempRequest) Reset()         { *m = PostBotEventTempRequest{} }
+func (m *PostBotEventTempRequest) String() string { return proto.CompactTextString(m) }
+func (*PostBotEventTempRequest) ProtoMessage()    {}
+func (*PostBotEventTempRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bots_a76feaae86db3e89, []int{5}
+}
+func (m *PostBotEventTempRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PostBotEventTempRequest.Unmarshal(m, b)
+}
+func (m *PostBotEventTempRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PostBotEventTempRequest.Marshal(b, m, deterministic)
+}
+func (dst *PostBotEventTempRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PostBotEventTempRequest.Merge(dst, src)
+}
+func (m *PostBotEventTempRequest) XXX_Size() int {
+	return xxx_messageInfo_PostBotEventTempRequest.Size(m)
+}
+func (m *PostBotEventTempRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PostBotEventTempRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PostBotEventTempRequest proto.InternalMessageInfo
 
 func (m *PostBotEventTempRequest) GetName() string {
 	if m != nil {
@@ -768,10 +697,6 @@ func (m *PostBotEventTempRequest) GetMsg() string {
 func init() {
 	proto.RegisterType((*BotSession)(nil), "google.devtools.remoteworkers.v1test2.BotSession")
 	proto.RegisterType((*Lease)(nil), "google.devtools.remoteworkers.v1test2.Lease")
-	proto.RegisterType((*Worker)(nil), "google.devtools.remoteworkers.v1test2.Worker")
-	proto.RegisterType((*Worker_Property)(nil), "google.devtools.remoteworkers.v1test2.Worker.Property")
-	proto.RegisterType((*Device)(nil), "google.devtools.remoteworkers.v1test2.Device")
-	proto.RegisterType((*Device_Property)(nil), "google.devtools.remoteworkers.v1test2.Device.Property")
 	proto.RegisterType((*AdminTemp)(nil), "google.devtools.remoteworkers.v1test2.AdminTemp")
 	proto.RegisterType((*CreateBotSessionRequest)(nil), "google.devtools.remoteworkers.v1test2.CreateBotSessionRequest")
 	proto.RegisterType((*UpdateBotSessionRequest)(nil), "google.devtools.remoteworkers.v1test2.UpdateBotSessionRequest")
@@ -790,8 +715,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Bots service
-
+// BotsClient is the client API for Bots service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type BotsClient interface {
 	// CreateBotSession is called when the bot first joins the farm, and
 	// establishes a session ID to ensure that multiple machines do not register
@@ -805,7 +731,7 @@ type BotsClient interface {
 	// event has occurred. This method is subject to change or removal in future
 	// revisions of this API; we may simply want to replace it with StackDriver or
 	// some other common interface.
-	PostBotEventTemp(ctx context.Context, in *PostBotEventTempRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	PostBotEventTemp(ctx context.Context, in *PostBotEventTempRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type botsClient struct {
@@ -818,7 +744,7 @@ func NewBotsClient(cc *grpc.ClientConn) BotsClient {
 
 func (c *botsClient) CreateBotSession(ctx context.Context, in *CreateBotSessionRequest, opts ...grpc.CallOption) (*BotSession, error) {
 	out := new(BotSession)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Bots/CreateBotSession", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Bots/CreateBotSession", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -827,24 +753,23 @@ func (c *botsClient) CreateBotSession(ctx context.Context, in *CreateBotSessionR
 
 func (c *botsClient) UpdateBotSession(ctx context.Context, in *UpdateBotSessionRequest, opts ...grpc.CallOption) (*BotSession, error) {
 	out := new(BotSession)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Bots/UpdateBotSession", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Bots/UpdateBotSession", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *botsClient) PostBotEventTemp(ctx context.Context, in *PostBotEventTempRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Bots/PostBotEventTemp", in, out, c.cc, opts...)
+func (c *botsClient) PostBotEventTemp(ctx context.Context, in *PostBotEventTempRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Bots/PostBotEventTemp", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Bots service
-
+// BotsServer is the server API for Bots service.
 type BotsServer interface {
 	// CreateBotSession is called when the bot first joins the farm, and
 	// establishes a session ID to ensure that multiple machines do not register
@@ -858,7 +783,7 @@ type BotsServer interface {
 	// event has occurred. This method is subject to change or removal in future
 	// revisions of this API; we may simply want to replace it with StackDriver or
 	// some other common interface.
-	PostBotEventTemp(context.Context, *PostBotEventTempRequest) (*google_protobuf2.Empty, error)
+	PostBotEventTemp(context.Context, *PostBotEventTempRequest) (*empty.Empty, error)
 }
 
 func RegisterBotsServer(s *grpc.Server, srv BotsServer) {
@@ -940,76 +865,78 @@ var _Bots_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/remoteworkers/v1test2/bots.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/remoteworkers/v1test2/bots.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/devtools/remoteworkers/v1test2/bots.proto", fileDescriptor_bots_a76feaae86db3e89)
+}
 
-var fileDescriptor0 = []byte{
-	// 1083 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_bots_a76feaae86db3e89 = []byte{
+	// 1075 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x8e, 0xdb, 0x44,
-	0x14, 0xc6, 0xd9, 0xc4, 0x69, 0x4e, 0xda, 0xad, 0x3b, 0x94, 0x6e, 0x48, 0x11, 0x44, 0x96, 0x90,
-	0x56, 0x51, 0xb1, 0xdb, 0x20, 0x10, 0x6a, 0x55, 0x24, 0x27, 0xf1, 0xee, 0x46, 0x64, 0x93, 0x30,
-	0xf1, 0xb6, 0x82, 0x9b, 0xd4, 0xd9, 0x4c, 0x83, 0xb5, 0xb1, 0xc7, 0xf5, 0x4c, 0x02, 0x11, 0xea,
-	0x0d, 0x12, 0x4f, 0xc0, 0x13, 0x70, 0xc7, 0x05, 0x8f, 0x80, 0xb8, 0xe4, 0x05, 0x7a, 0xcd, 0x1d,
-	0x5c, 0xf3, 0x0a, 0x68, 0xc6, 0x76, 0xfe, 0xb6, 0x4b, 0xb3, 0x14, 0xee, 0xe6, 0xe7, 0x7c, 0xdf,
-	0xf9, 0xfc, 0xcd, 0x39, 0xe3, 0x81, 0xbb, 0x63, 0x4a, 0xc7, 0x13, 0x62, 0x8e, 0xc8, 0x8c, 0x53,
-	0x3a, 0x61, 0x66, 0x44, 0x7c, 0xca, 0xc9, 0xd7, 0x34, 0x3a, 0x23, 0x11, 0x33, 0x67, 0xf7, 0x38,
-	0x61, 0xbc, 0x66, 0x0e, 0x29, 0x67, 0x46, 0x18, 0x51, 0x4e, 0xd1, 0xfb, 0x31, 0xc2, 0x48, 0x11,
-	0xc6, 0x1a, 0xc2, 0x48, 0x10, 0xe5, 0x77, 0x12, 0x62, 0x37, 0xf4, 0x4c, 0x37, 0x08, 0x28, 0x77,
-	0xb9, 0x47, 0x83, 0x84, 0xa4, 0xfc, 0x76, 0xb2, 0x2b, 0x67, 0xc3, 0xe9, 0x53, 0xd3, 0x0d, 0xe6,
-	0xc9, 0xd6, 0xed, 0xcd, 0x2d, 0xe2, 0x87, 0x3c, 0xdd, 0xac, 0x6c, 0x6e, 0x3e, 0xf5, 0xc8, 0x64,
-	0x34, 0xf0, 0x5d, 0x76, 0x96, 0x44, 0xbc, 0xb7, 0x19, 0xc1, 0x3d, 0x9f, 0x30, 0xee, 0xfa, 0x61,
-	0x12, 0xb0, 0x97, 0x04, 0x44, 0xe1, 0xa9, 0xc9, 0xb8, 0xcb, 0xa7, 0x89, 0x26, 0xfd, 0xcf, 0x0c,
-	0x40, 0x9d, 0xf2, 0x3e, 0x61, 0xcc, 0xa3, 0x01, 0x42, 0x90, 0x0d, 0x5c, 0x9f, 0x94, 0x94, 0x8a,
-	0xb2, 0x5f, 0xc0, 0x72, 0x8c, 0xde, 0x02, 0x75, 0x48, 0xf9, 0xc0, 0x1b, 0x95, 0x32, 0x72, 0x35,
-	0x37, 0xa4, 0xbc, 0x35, 0x42, 0x47, 0xa0, 0xc6, 0x4c, 0xa5, 0x9d, 0x8a, 0xb2, 0xbf, 0x5b, 0xbb,
-	0x6b, 0x6c, 0xe5, 0x91, 0x21, 0xb2, 0x49, 0x1c, 0x4e, 0xf0, 0xc8, 0x06, 0x35, 0x0e, 0x2a, 0x65,
-	0x2b, 0xca, 0x7e, 0xb1, 0xf6, 0xc1, 0x96, 0x4c, 0x8f, 0xe5, 0x1c, 0x27, 0x60, 0xd4, 0x04, 0x75,
-	0x42, 0x5c, 0x46, 0x58, 0x29, 0x57, 0xd9, 0xd9, 0x2f, 0xd6, 0xee, 0x6c, 0x49, 0xd3, 0x16, 0x20,
-	0x9c, 0x60, 0xd1, 0x03, 0x28, 0x92, 0x6f, 0x42, 0x2f, 0x22, 0x03, 0xe1, 0x61, 0x49, 0x95, 0x8a,
-	0xca, 0x29, 0x55, 0x6a, 0xb0, 0xe1, 0xa4, 0x06, 0x63, 0x88, 0xc3, 0xc5, 0x02, 0x2a, 0x41, 0x7e,
-	0x46, 0x22, 0xe1, 0x64, 0x29, 0x2f, 0xbd, 0x4a, 0xa7, 0xfa, 0x5f, 0x19, 0xc8, 0xc9, 0x44, 0xe8,
-	0x5d, 0x00, 0x97, 0x31, 0x6f, 0x1c, 0xf8, 0x24, 0xe0, 0x89, 0xd1, 0x2b, 0x2b, 0xe8, 0x10, 0x72,
-	0xc2, 0x17, 0x22, 0xdd, 0xde, 0xad, 0xdd, 0xbb, 0xcc, 0x57, 0x08, 0x63, 0x09, 0x8e, 0xf1, 0xa8,
-	0xba, 0x76, 0x40, 0xc5, 0x1a, 0x4a, 0x99, 0xa2, 0xf0, 0xd4, 0xd8, 0x38, 0x82, 0xcf, 0xe1, 0x6a,
-	0x44, 0x9e, 0x4d, 0xbd, 0x88, 0x08, 0x0d, 0xec, 0xdf, 0x1d, 0xc4, 0x1a, 0xc5, 0xa6, 0x91, 0xb9,
-	0x4b, 0x19, 0x69, 0xc1, 0x0d, 0x2f, 0x98, 0x78, 0x01, 0x19, 0xac, 0x78, 0x15, 0x9f, 0xc5, 0xcd,
-	0x73, 0x14, 0x56, 0x30, 0xc7, 0x5a, 0x1c, 0x6e, 0x2d, 0xa2, 0xf5, 0xdf, 0x15, 0x50, 0x63, 0x61,
-	0xe8, 0x10, 0xf2, 0x23, 0x32, 0xf3, 0x4e, 0x09, 0x2b, 0x29, 0xb2, 0x34, 0xb6, 0xfd, 0xb0, 0xa6,
-	0x44, 0xe1, 0x14, 0x8d, 0x1e, 0x01, 0x84, 0x11, 0x0d, 0x49, 0xc4, 0x3d, 0xc2, 0x4a, 0x19, 0xc9,
-	0xf5, 0xf1, 0xa5, 0x4c, 0x32, 0x7a, 0x31, 0x7e, 0x8e, 0x57, 0x98, 0xca, 0x35, 0xb8, 0x92, 0xae,
-	0x23, 0x0d, 0x76, 0xce, 0xc8, 0x3c, 0x29, 0x0c, 0x31, 0x44, 0x37, 0x21, 0x37, 0x73, 0x27, 0x53,
-	0x92, 0xf6, 0x9f, 0x9c, 0xe8, 0x3f, 0x2b, 0xa0, 0xc6, 0xfa, 0xd0, 0x2d, 0x50, 0xbf, 0x72, 0x83,
-	0xd1, 0x24, 0xed, 0xdb, 0x64, 0xf6, 0x5a, 0x72, 0x63, 0xea, 0xff, 0x4e, 0xee, 0x0b, 0x05, 0x0a,
-	0xd6, 0xc8, 0xf7, 0x02, 0x87, 0xf8, 0x21, 0xc2, 0x90, 0x3f, 0xa5, 0xbe, 0xef, 0x06, 0x23, 0x89,
-	0xdc, 0xad, 0x7d, 0xb2, 0xa5, 0xac, 0x05, 0x85, 0xd1, 0x88, 0xf1, 0x38, 0x25, 0x12, 0x4a, 0xdc,
-	0x68, 0x9c, 0x64, 0x15, 0x43, 0xfd, 0x09, 0xe4, 0x93, 0x28, 0x74, 0x1d, 0x8a, 0x27, 0x9d, 0x7e,
-	0xcf, 0x6e, 0xb4, 0x0e, 0x5a, 0x76, 0x53, 0x7b, 0x03, 0xed, 0x02, 0xd4, 0xbb, 0xce, 0xe0, 0xa4,
-	0xd7, 0xb4, 0x1c, 0x5b, 0x53, 0x44, 0x80, 0x98, 0x63, 0xbb, 0xef, 0x58, 0xd8, 0xd1, 0x32, 0xe8,
-	0x06, 0x5c, 0x13, 0x0b, 0x8e, 0x8d, 0x8f, 0x5b, 0x1d, 0x11, 0xb3, 0x83, 0x34, 0xb8, 0x7a, 0xd4,
-	0xed, 0x2f, 0x83, 0xb2, 0xfa, 0xf7, 0x0a, 0xec, 0x35, 0x22, 0xe2, 0x72, 0xb2, 0xbc, 0x44, 0x31,
-	0x79, 0x36, 0x25, 0x8c, 0x8b, 0x53, 0x09, 0xdd, 0x68, 0xd9, 0xe4, 0xc9, 0x0c, 0x61, 0x28, 0x8a,
-	0xfb, 0x94, 0xc5, 0xd1, 0x52, 0x6f, 0x71, 0xeb, 0x36, 0x5f, 0x49, 0x03, 0xc3, 0xc5, 0x58, 0xff,
-	0x55, 0x81, 0xbd, 0x93, 0x70, 0xf4, 0x52, 0x1d, 0x2f, 0xbb, 0xd3, 0xff, 0x07, 0x0d, 0xa2, 0xe1,
-	0xa7, 0x52, 0x82, 0xfc, 0x33, 0x25, 0x97, 0xce, 0xf9, 0x86, 0x3f, 0x10, 0x3f, 0xaf, 0x63, 0x97,
-	0x9d, 0x61, 0x88, 0xc3, 0xc5, 0x58, 0xff, 0x4d, 0x81, 0xbd, 0x1e, 0x65, 0xbc, 0x4e, 0xb9, 0x3d,
-	0x23, 0x01, 0x17, 0x47, 0xfc, 0x4f, 0x1f, 0xf0, 0x18, 0xb2, 0x7c, 0x1e, 0xa6, 0x97, 0x64, 0x63,
-	0x4b, 0xe5, 0x17, 0x64, 0x30, 0x9c, 0x79, 0x48, 0xb0, 0x24, 0x14, 0x55, 0xe4, 0xb3, 0xb1, 0x54,
-	0x5f, 0xc0, 0x62, 0xa8, 0xdf, 0x81, 0xac, 0xd8, 0x3f, 0x5f, 0x42, 0x57, 0x20, 0xdb, 0xea, 0x1c,
-	0x74, 0x35, 0x05, 0x15, 0x20, 0x67, 0x63, 0xdc, 0xc5, 0x5a, 0xa6, 0x3a, 0x86, 0xc2, 0xe2, 0x0f,
-	0x87, 0xca, 0x70, 0x4b, 0xd4, 0x50, 0xdf, 0xb1, 0x9c, 0x93, 0xfe, 0x60, 0x1d, 0xad, 0x42, 0xa6,
-	0xfb, 0x99, 0xa6, 0xa0, 0x6b, 0x50, 0x38, 0xe9, 0x1c, 0xd9, 0x56, 0xdb, 0x39, 0xfa, 0x42, 0xcb,
-	0x20, 0x04, 0xbb, 0x49, 0x8d, 0xd5, 0xbb, 0x5d, 0xa7, 0xd5, 0x39, 0xd4, 0x76, 0xd0, 0x9b, 0x70,
-	0x7d, 0xb5, 0x14, 0xc5, 0x62, 0xb6, 0xfa, 0x04, 0x60, 0x79, 0xe7, 0xa3, 0xdb, 0xb0, 0xd7, 0xb6,
-	0xad, 0xbe, 0x2d, 0x73, 0xd9, 0x1b, 0xa9, 0x8a, 0x90, 0xef, 0xd9, 0x9d, 0xa6, 0xc0, 0x29, 0x08,
-	0x40, 0xb5, 0x1a, 0x4e, 0xeb, 0x91, 0xad, 0x65, 0x44, 0xee, 0x46, 0xf7, 0xb8, 0xd7, 0xb6, 0x1d,
-	0xbb, 0xa9, 0x65, 0xe5, 0xd4, 0xea, 0x34, 0xec, 0x76, 0xdb, 0x6e, 0x6a, 0xb9, 0xda, 0x4f, 0x59,
-	0xc8, 0xd6, 0x29, 0x67, 0xe8, 0x17, 0x05, 0xb4, 0xcd, 0x2a, 0x47, 0x9f, 0x6e, 0xe9, 0xf9, 0x05,
-	0xed, 0x51, 0xbe, 0x7c, 0xb5, 0xe9, 0x1f, 0x7d, 0xf7, 0xe2, 0x8f, 0x1f, 0x32, 0xa6, 0x5e, 0x59,
-	0x3c, 0xd1, 0xbe, 0x8d, 0x7b, 0xea, 0x61, 0xb5, 0xfa, 0xdc, 0x5c, 0x96, 0x22, 0xbb, 0xbf, 0x5a,
-	0xdd, 0x52, 0xfe, 0x66, 0x73, 0x6c, 0x2d, 0xff, 0x82, 0xae, 0x7a, 0x0d, 0xf9, 0xb5, 0x15, 0xf9,
-	0xa2, 0x96, 0x1f, 0x56, 0xab, 0xab, 0xda, 0xcd, 0xea, 0xf3, 0x75, 0xf9, 0x3f, 0x2a, 0xa0, 0x6d,
-	0x16, 0xee, 0xd6, 0xf2, 0x2f, 0xa8, 0xf8, 0xf2, 0xad, 0x73, 0x7d, 0x69, 0x8b, 0x17, 0xe7, 0xc2,
-	0xe2, 0xea, 0x2b, 0x35, 0x86, 0x94, 0xc5, 0xb4, 0xf7, 0x95, 0x6a, 0xdd, 0xf9, 0x12, 0x27, 0x7c,
-	0x63, 0x3a, 0x71, 0x83, 0xb1, 0x41, 0xa3, 0xb1, 0x39, 0x26, 0x81, 0x64, 0x37, 0xe3, 0x2d, 0x37,
-	0xf4, 0xd8, 0x2b, 0x9e, 0xdc, 0x0f, 0xd6, 0x56, 0x87, 0xaa, 0x84, 0x7f, 0xf8, 0x77, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x7c, 0xc5, 0x7e, 0x38, 0xb0, 0x0b, 0x00, 0x00,
+	0x14, 0xc6, 0xce, 0x5f, 0x73, 0xd2, 0xa6, 0xee, 0x00, 0x5d, 0x93, 0x22, 0x11, 0x59, 0xaa, 0xb4,
+	0x44, 0x8b, 0xdd, 0x0d, 0x42, 0x42, 0xad, 0x8a, 0x94, 0x1f, 0xef, 0x6e, 0x44, 0x36, 0x09, 0x13,
+	0x6f, 0x57, 0x70, 0x93, 0x3a, 0x9b, 0x69, 0x64, 0x6d, 0xec, 0x71, 0x3d, 0x93, 0x85, 0x15, 0xea,
+	0x0d, 0x12, 0x4f, 0xc0, 0x13, 0xc0, 0x15, 0xe2, 0x19, 0x10, 0x12, 0x37, 0xbc, 0x40, 0x5f, 0x81,
+	0xbe, 0x07, 0x9a, 0xb1, 0x93, 0x4d, 0xb2, 0xdd, 0xd6, 0x0b, 0xe2, 0x6e, 0x7e, 0xbe, 0xef, 0x9c,
+	0x2f, 0xe7, 0x7c, 0x67, 0x62, 0x78, 0x30, 0xa5, 0x74, 0x3a, 0x23, 0xd6, 0x84, 0x9c, 0x71, 0x4a,
+	0x67, 0xcc, 0x8a, 0x88, 0x4f, 0x39, 0xf9, 0x96, 0x46, 0xa7, 0x24, 0x62, 0xd6, 0xd9, 0x2e, 0x27,
+	0x8c, 0xd7, 0xad, 0x31, 0xe5, 0xcc, 0x0c, 0x23, 0xca, 0x29, 0xba, 0x1f, 0x33, 0xcc, 0x05, 0xc3,
+	0x5c, 0x63, 0x98, 0x09, 0xa3, 0xf2, 0x61, 0x12, 0xd8, 0x0d, 0x3d, 0xcb, 0x0d, 0x02, 0xca, 0x5d,
+	0xee, 0xd1, 0x20, 0x09, 0x52, 0xa9, 0xa7, 0x4b, 0x1b, 0xef, 0x13, 0xce, 0x07, 0x09, 0x47, 0xee,
+	0xc6, 0xf3, 0x67, 0x96, 0x1b, 0x9c, 0x27, 0x57, 0xf7, 0x36, 0xaf, 0x88, 0x1f, 0xf2, 0xc5, 0x65,
+	0x75, 0xf3, 0xf2, 0x99, 0x47, 0x66, 0x93, 0x91, 0xef, 0xb2, 0xd3, 0x04, 0xf1, 0xd1, 0x26, 0x82,
+	0x7b, 0x3e, 0x61, 0xdc, 0xf5, 0xc3, 0x04, 0xb0, 0x95, 0x00, 0xa2, 0xf0, 0xc4, 0x62, 0xdc, 0xe5,
+	0xf3, 0xe4, 0x77, 0x18, 0xaf, 0x54, 0x80, 0x26, 0xe5, 0x43, 0xc2, 0x98, 0x47, 0x03, 0x84, 0x20,
+	0x1b, 0xb8, 0x3e, 0xd1, 0x95, 0xaa, 0xb2, 0x5d, 0xc4, 0x72, 0x8d, 0xde, 0x87, 0xfc, 0x98, 0xf2,
+	0x91, 0x37, 0xd1, 0x55, 0x79, 0x9a, 0x1b, 0x53, 0xde, 0x99, 0xa0, 0x03, 0xc8, 0xc7, 0x91, 0xf4,
+	0x4c, 0x55, 0xd9, 0x2e, 0xd7, 0x1f, 0x98, 0xa9, 0xea, 0x6a, 0x8a, 0x6c, 0x92, 0x87, 0x13, 0x3e,
+	0xb2, 0x21, 0x1f, 0x83, 0xf4, 0x6c, 0x55, 0xd9, 0x2e, 0xd5, 0x3f, 0x49, 0x19, 0xe9, 0x58, 0xee,
+	0x71, 0x42, 0x46, 0x6d, 0xc8, 0xcf, 0x88, 0xcb, 0x08, 0xd3, 0x73, 0xd5, 0xcc, 0x76, 0xa9, 0xbe,
+	0x93, 0x32, 0x4c, 0x57, 0x90, 0x70, 0xc2, 0x45, 0x8f, 0xa0, 0x44, 0xbe, 0x0b, 0xbd, 0x88, 0x8c,
+	0x44, 0x0d, 0xf5, 0xbc, 0x54, 0x54, 0x59, 0x84, 0x5a, 0x14, 0xd8, 0x74, 0x16, 0x05, 0xc6, 0x10,
+	0xc3, 0xc5, 0x01, 0xd2, 0xa1, 0x70, 0x46, 0x22, 0x51, 0x49, 0xbd, 0x20, 0x6b, 0xb5, 0xd8, 0x1a,
+	0xaf, 0x32, 0x90, 0x93, 0x89, 0x50, 0x19, 0x54, 0x6f, 0x92, 0x5c, 0xab, 0xde, 0x04, 0x99, 0x50,
+	0x08, 0xdd, 0xf3, 0x19, 0x75, 0x27, 0xfa, 0x0d, 0x99, 0xec, 0xbd, 0x4b, 0xc9, 0x1a, 0xc1, 0x39,
+	0x5e, 0x80, 0xd0, 0x0e, 0xe4, 0x23, 0xc2, 0xe6, 0x33, 0xae, 0x17, 0xdf, 0x00, 0x4f, 0x30, 0x68,
+	0x1f, 0x72, 0xa2, 0xca, 0x44, 0xf6, 0xae, 0x5c, 0xdf, 0xbd, 0x4e, 0x4d, 0x44, 0x9b, 0x08, 0x8e,
+	0xf9, 0xa8, 0xb6, 0xd6, 0xee, 0x52, 0x1d, 0x2d, 0x22, 0x45, 0xe1, 0x89, 0xb9, 0xd1, 0xd0, 0xaf,
+	0xe0, 0x66, 0x44, 0x9e, 0xcf, 0xbd, 0x88, 0xf8, 0x24, 0xe0, 0xec, 0xdf, 0xb5, 0x75, 0x2d, 0xc4,
+	0x66, 0x5b, 0x72, 0xd7, 0x6a, 0x8b, 0x01, 0xe0, 0x32, 0xe6, 0x4d, 0x03, 0x11, 0x2b, 0xf6, 0x76,
+	0x53, 0xd5, 0x15, 0xbc, 0x72, 0x8a, 0x6c, 0xb8, 0xe3, 0x05, 0x33, 0x2f, 0x20, 0xa3, 0x15, 0x68,
+	0xfe, 0xea, 0x0a, 0xcb, 0x00, 0x5a, 0x4c, 0x69, 0x2c, 0x19, 0xc6, 0x4b, 0x05, 0x8a, 0x8d, 0x89,
+	0xef, 0x05, 0x0e, 0xf1, 0x43, 0x84, 0xa1, 0x70, 0x42, 0x7d, 0xdf, 0x0d, 0x26, 0x32, 0x6b, 0xb9,
+	0xfe, 0x79, 0xca, 0x1a, 0x2c, 0x43, 0x98, 0xad, 0x98, 0x8f, 0x17, 0x81, 0x90, 0x06, 0x19, 0x37,
+	0x9a, 0x26, 0xb3, 0x28, 0x96, 0xc6, 0x53, 0x28, 0x24, 0x28, 0x74, 0x1b, 0x4a, 0x47, 0xbd, 0xe1,
+	0xc0, 0x6e, 0x75, 0xf6, 0x3a, 0x76, 0x5b, 0x7b, 0x07, 0x95, 0x01, 0x9a, 0x7d, 0x67, 0x74, 0x34,
+	0x68, 0x37, 0x1c, 0x5b, 0x53, 0x04, 0x40, 0xec, 0xb1, 0x3d, 0x74, 0x1a, 0xd8, 0xd1, 0x54, 0x74,
+	0x07, 0x6e, 0x89, 0x03, 0xc7, 0xc6, 0x87, 0x9d, 0x9e, 0xc0, 0x64, 0x90, 0x06, 0x37, 0x0f, 0xfa,
+	0xc3, 0x0b, 0x50, 0xd6, 0xf8, 0x51, 0x81, 0xad, 0x56, 0x44, 0x5c, 0x4e, 0x2e, 0xde, 0x0a, 0x4c,
+	0x9e, 0xcf, 0x09, 0xe3, 0xe8, 0x2e, 0xe4, 0x43, 0x37, 0x5a, 0x16, 0x16, 0x27, 0x3b, 0x84, 0xa1,
+	0x24, 0x9e, 0x0d, 0x16, 0xa3, 0xa5, 0xde, 0x52, 0x6a, 0xff, 0xad, 0xa4, 0x81, 0xf1, 0x72, 0x6d,
+	0xfc, 0xa1, 0xc0, 0xd6, 0x51, 0x38, 0x79, 0xad, 0x8e, 0xd7, 0x3d, 0x5d, 0xff, 0x83, 0x06, 0xe1,
+	0xc4, 0xb9, 0x94, 0x20, 0x1f, 0xe0, 0x64, 0x1a, 0x2e, 0x3b, 0x71, 0x4f, 0xbc, 0xd1, 0x87, 0x2e,
+	0x3b, 0xc5, 0x10, 0xc3, 0xc5, 0xda, 0xf8, 0x4b, 0x81, 0xad, 0x01, 0x65, 0xbc, 0x49, 0xb9, 0x7d,
+	0x46, 0x02, 0x2e, 0x5a, 0xfc, 0xa6, 0x1f, 0x70, 0x0c, 0x59, 0x7e, 0x1e, 0x2e, 0xa6, 0xb7, 0x95,
+	0x52, 0xf9, 0x15, 0x19, 0x4c, 0xe7, 0x3c, 0x24, 0x58, 0x06, 0x14, 0x2e, 0xf2, 0xd9, 0x54, 0xaa,
+	0x2f, 0x62, 0xb1, 0x34, 0x76, 0x20, 0x2b, 0xee, 0x2f, 0x5b, 0xe8, 0x06, 0x64, 0x3b, 0xbd, 0xbd,
+	0xbe, 0xa6, 0xa0, 0x22, 0xe4, 0x6c, 0x8c, 0xfb, 0x58, 0x53, 0x6b, 0x53, 0x28, 0x2e, 0x1f, 0x72,
+	0x54, 0x81, 0xbb, 0xc2, 0x43, 0x43, 0xa7, 0xe1, 0x1c, 0x0d, 0x47, 0xeb, 0xec, 0x3c, 0xa8, 0xfd,
+	0x2f, 0x35, 0x05, 0xdd, 0x82, 0xe2, 0x51, 0xef, 0xc0, 0x6e, 0x74, 0x9d, 0x83, 0xaf, 0x35, 0x15,
+	0x21, 0x28, 0x27, 0x1e, 0x6b, 0xf6, 0xfb, 0x4e, 0xa7, 0xb7, 0xaf, 0x65, 0xd0, 0xbb, 0x70, 0x7b,
+	0xd5, 0x8a, 0xe2, 0x30, 0x5b, 0x7b, 0x0a, 0x70, 0xf1, 0x18, 0xa1, 0x7b, 0xb0, 0xd5, 0xb5, 0x1b,
+	0x43, 0x5b, 0xe6, 0xb2, 0x37, 0x52, 0x95, 0xa0, 0x30, 0xb0, 0x7b, 0x6d, 0xc1, 0x53, 0x10, 0x40,
+	0xbe, 0xd1, 0x72, 0x3a, 0x4f, 0x6c, 0x4d, 0x15, 0xb9, 0x5b, 0xfd, 0xc3, 0x41, 0xd7, 0x76, 0xec,
+	0xb6, 0x96, 0x95, 0xdb, 0x46, 0xaf, 0x65, 0x77, 0xbb, 0x76, 0x5b, 0xcb, 0xd5, 0x7f, 0xcd, 0x42,
+	0xb6, 0x49, 0x39, 0x43, 0xbf, 0x2b, 0xa0, 0x6d, 0xba, 0x1c, 0x7d, 0x91, 0xb2, 0xe6, 0x57, 0x8c,
+	0x47, 0xe5, 0xfa, 0x6e, 0x33, 0x3e, 0xfb, 0xe1, 0xe5, 0xdf, 0x3f, 0xa9, 0x96, 0x51, 0x5d, 0x7e,
+	0x46, 0x7c, 0x1f, 0xcf, 0xd4, 0xe3, 0x5a, 0xed, 0x85, 0x75, 0x61, 0x45, 0xf6, 0x70, 0xd5, 0xdd,
+	0x52, 0xfe, 0xe6, 0x70, 0xa4, 0x96, 0x7f, 0xc5, 0x54, 0xfd, 0x07, 0xf9, 0xf5, 0x15, 0xf9, 0xc2,
+	0xcb, 0x8f, 0x6b, 0xb5, 0x55, 0xed, 0x56, 0xed, 0xc5, 0xba, 0xfc, 0x9f, 0x15, 0xd0, 0x36, 0x8d,
+	0x9b, 0x5a, 0xfe, 0x15, 0x8e, 0xaf, 0xdc, 0xbd, 0x34, 0x97, 0xb6, 0xf8, 0xb0, 0x5a, 0x96, 0xb8,
+	0xf6, 0x56, 0x8d, 0x21, 0x65, 0x71, 0xd8, 0x87, 0x4a, 0xad, 0xf9, 0xa7, 0x02, 0x1f, 0x9f, 0x50,
+	0x3f, 0x9d, 0xa8, 0xe6, 0x1d, 0x2c, 0x8f, 0xe3, 0xff, 0x33, 0x26, 0x2c, 0x36, 0x50, 0xbe, 0xc1,
+	0x09, 0x77, 0x4a, 0x67, 0x6e, 0x30, 0x35, 0x69, 0x34, 0xb5, 0xa6, 0x24, 0x90, 0xf2, 0xac, 0xf8,
+	0xca, 0x0d, 0x3d, 0xf6, 0x96, 0xef, 0xca, 0x47, 0x6b, 0xa7, 0xbf, 0xa8, 0x2a, 0x3e, 0xfe, 0x4d,
+	0xbd, 0xbf, 0x1f, 0x47, 0x6e, 0x93, 0x33, 0x47, 0xaa, 0x5a, 0x4b, 0x6f, 0x3e, 0xd9, 0x75, 0x04,
+	0x75, 0x9c, 0x97, 0xb9, 0x3e, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x75, 0x00, 0xcd, 0xd5, 0x39,
+	0x0b, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/command.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/command.pb.go
index f5b50095..d027d8c5 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/command.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/command.pb.go
@@ -1,32 +1,63 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/command.proto
 
-package remoteworkers
+package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/duration"
+import any "github.com/golang/protobuf/ptypes/any"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
-// Describes a shell-style task to execute.
+// 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
+
+// Describes a shell-style task to execute, suitable for providing as the Bots
+// interface's `Lease.payload` field.
 type CommandTask struct {
 	// The inputs to the task.
-	Inputs *CommandTask_Inputs `protobuf:"bytes,1,opt,name=inputs" json:"inputs,omitempty"`
+	Inputs *CommandTask_Inputs `protobuf:"bytes,1,opt,name=inputs,proto3" json:"inputs,omitempty"`
 	// The expected outputs from the task.
-	ExpectedOutputs *CommandTask_Outputs `protobuf:"bytes,4,opt,name=expected_outputs,json=expectedOutputs" json:"expected_outputs,omitempty"`
+	ExpectedOutputs *CommandTask_Outputs `protobuf:"bytes,4,opt,name=expected_outputs,json=expectedOutputs,proto3" json:"expected_outputs,omitempty"`
 	// The timeouts of this task.
-	Timeouts *CommandTask_Timeouts `protobuf:"bytes,5,opt,name=timeouts" json:"timeouts,omitempty"`
+	Timeouts             *CommandTask_Timeouts `protobuf:"bytes,5,opt,name=timeouts,proto3" json:"timeouts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *CommandTask) Reset()                    { *m = CommandTask{} }
-func (m *CommandTask) String() string            { return proto.CompactTextString(m) }
-func (*CommandTask) ProtoMessage()               {}
-func (*CommandTask) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *CommandTask) Reset()         { *m = CommandTask{} }
+func (m *CommandTask) String() string { return proto.CompactTextString(m) }
+func (*CommandTask) ProtoMessage()    {}
+func (*CommandTask) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{0}
+}
+func (m *CommandTask) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandTask.Unmarshal(m, b)
+}
+func (m *CommandTask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandTask.Marshal(b, m, deterministic)
+}
+func (dst *CommandTask) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask.Merge(dst, src)
+}
+func (m *CommandTask) XXX_Size() int {
+	return xxx_messageInfo_CommandTask.Size(m)
+}
+func (m *CommandTask) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandTask.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommandTask proto.InternalMessageInfo
 
 func (m *CommandTask) GetInputs() *CommandTask_Inputs {
 	if m != nil {
@@ -51,8 +82,17 @@ func (m *CommandTask) GetTimeouts() *CommandTask_Timeouts {
 
 // Describes the inputs to a shell-style task.
 type CommandTask_Inputs struct {
-	// The command itself to run (e.g., argv)
-	Arguments []string `protobuf:"bytes,1,rep,name=arguments" json:"arguments,omitempty"`
+	// The command itself to run (e.g., argv).
+	//
+	// This field should be passed directly to the underlying operating system,
+	// and so it must be sensible to that operating system. For example, on
+	// Windows, the first argument might be "C:\Windows\System32\ping.exe" -
+	// that is, using drive letters and backslashes. A command for a *nix
+	// system, on the other hand, would use forward slashes.
+	//
+	// All other fields in the RWAPI must consistently use forward slashes,
+	// since those fields may be interpretted by both the service and the bot.
+	Arguments []string `protobuf:"bytes,1,rep,name=arguments,proto3" json:"arguments,omitempty"`
 	// The input filesystem to be set up prior to the task beginning. The
 	// contents should be a repeated set of FileMetadata messages though other
 	// formats are allowed if better for the implementation (eg, a LUCI-style
@@ -62,15 +102,37 @@ type CommandTask_Inputs struct {
 	// metadata, in which case it may be useful to break up portions of the
 	// filesystem that change frequently (eg, specific input files) from those
 	// that don't (eg, standard header files).
-	Files []*Digest `protobuf:"bytes,2,rep,name=files" json:"files,omitempty"`
+	Files []*Digest `protobuf:"bytes,2,rep,name=files,proto3" json:"files,omitempty"`
 	// All environment variables required by the task.
-	EnvironmentVariables []*CommandTask_Inputs_EnvironmentVariable `protobuf:"bytes,3,rep,name=environment_variables,json=environmentVariables" json:"environment_variables,omitempty"`
+	EnvironmentVariables []*CommandTask_Inputs_EnvironmentVariable `protobuf:"bytes,3,rep,name=environment_variables,json=environmentVariables,proto3" json:"environment_variables,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                  `json:"-"`
+	XXX_unrecognized     []byte                                    `json:"-"`
+	XXX_sizecache        int32                                     `json:"-"`
 }
 
-func (m *CommandTask_Inputs) Reset()                    { *m = CommandTask_Inputs{} }
-func (m *CommandTask_Inputs) String() string            { return proto.CompactTextString(m) }
-func (*CommandTask_Inputs) ProtoMessage()               {}
-func (*CommandTask_Inputs) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (m *CommandTask_Inputs) Reset()         { *m = CommandTask_Inputs{} }
+func (m *CommandTask_Inputs) String() string { return proto.CompactTextString(m) }
+func (*CommandTask_Inputs) ProtoMessage()    {}
+func (*CommandTask_Inputs) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{0, 0}
+}
+func (m *CommandTask_Inputs) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandTask_Inputs.Unmarshal(m, b)
+}
+func (m *CommandTask_Inputs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandTask_Inputs.Marshal(b, m, deterministic)
+}
+func (dst *CommandTask_Inputs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask_Inputs.Merge(dst, src)
+}
+func (m *CommandTask_Inputs) XXX_Size() int {
+	return xxx_messageInfo_CommandTask_Inputs.Size(m)
+}
+func (m *CommandTask_Inputs) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandTask_Inputs.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommandTask_Inputs proto.InternalMessageInfo
 
 func (m *CommandTask_Inputs) GetArguments() []string {
 	if m != nil {
@@ -96,9 +158,12 @@ func (m *CommandTask_Inputs) GetEnvironmentVariables() []*CommandTask_Inputs_Env
 // An environment variable required by this task.
 type CommandTask_Inputs_EnvironmentVariable struct {
 	// The envvar name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The envvar value.
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value                string   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *CommandTask_Inputs_EnvironmentVariable) Reset() {
@@ -107,8 +172,25 @@ func (m *CommandTask_Inputs_EnvironmentVariable) Reset() {
 func (m *CommandTask_Inputs_EnvironmentVariable) String() string { return proto.CompactTextString(m) }
 func (*CommandTask_Inputs_EnvironmentVariable) ProtoMessage()    {}
 func (*CommandTask_Inputs_EnvironmentVariable) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{0, 0, 0}
+	return fileDescriptor_command_56eedbbbc833397d, []int{0, 0, 0}
+}
+func (m *CommandTask_Inputs_EnvironmentVariable) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Unmarshal(m, b)
 }
+func (m *CommandTask_Inputs_EnvironmentVariable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Marshal(b, m, deterministic)
+}
+func (dst *CommandTask_Inputs_EnvironmentVariable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Merge(dst, src)
+}
+func (m *CommandTask_Inputs_EnvironmentVariable) XXX_Size() int {
+	return xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.Size(m)
+}
+func (m *CommandTask_Inputs_EnvironmentVariable) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommandTask_Inputs_EnvironmentVariable proto.InternalMessageInfo
 
 func (m *CommandTask_Inputs_EnvironmentVariable) GetName() string {
 	if m != nil {
@@ -126,16 +208,52 @@ func (m *CommandTask_Inputs_EnvironmentVariable) GetValue() string {
 
 // Describes the expected outputs of the command.
 type CommandTask_Outputs struct {
-	// A list of expected files, relative to the execution root.
-	Files []string `protobuf:"bytes,1,rep,name=files" json:"files,omitempty"`
-	// A list of expected directories, relative to the execution root.
-	Directories []string `protobuf:"bytes,2,rep,name=directories" json:"directories,omitempty"`
-}
-
-func (m *CommandTask_Outputs) Reset()                    { *m = CommandTask_Outputs{} }
-func (m *CommandTask_Outputs) String() string            { return proto.CompactTextString(m) }
-func (*CommandTask_Outputs) ProtoMessage()               {}
-func (*CommandTask_Outputs) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 1} }
+	// A list of expected files, relative to the execution root. All paths
+	// MUST be delimited by forward slashes.
+	Files []string `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"`
+	// A list of expected directories, relative to the execution root. All paths
+	// MUST be delimited by forward slashes.
+	Directories []string `protobuf:"bytes,2,rep,name=directories,proto3" json:"directories,omitempty"`
+	// The destination to which any stdout should be sent. The method by which
+	// the bot should send the stream contents to that destination is not
+	// defined in this API. As examples, the destination could be a file
+	// referenced in the `files` field in this message, or it could be a URI
+	// that must be written via the ByteStream API.
+	StdoutDestination string `protobuf:"bytes,3,opt,name=stdout_destination,json=stdoutDestination,proto3" json:"stdout_destination,omitempty"`
+	// The destination to which any stderr should be sent. The method by which
+	// the bot should send the stream contents to that destination is not
+	// defined in this API. As examples, the destination could be a file
+	// referenced in the `files` field in this message, or it could be a URI
+	// that must be written via the ByteStream API.
+	StderrDestination    string   `protobuf:"bytes,4,opt,name=stderr_destination,json=stderrDestination,proto3" json:"stderr_destination,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CommandTask_Outputs) Reset()         { *m = CommandTask_Outputs{} }
+func (m *CommandTask_Outputs) String() string { return proto.CompactTextString(m) }
+func (*CommandTask_Outputs) ProtoMessage()    {}
+func (*CommandTask_Outputs) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{0, 1}
+}
+func (m *CommandTask_Outputs) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandTask_Outputs.Unmarshal(m, b)
+}
+func (m *CommandTask_Outputs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandTask_Outputs.Marshal(b, m, deterministic)
+}
+func (dst *CommandTask_Outputs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask_Outputs.Merge(dst, src)
+}
+func (m *CommandTask_Outputs) XXX_Size() int {
+	return xxx_messageInfo_CommandTask_Outputs.Size(m)
+}
+func (m *CommandTask_Outputs) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandTask_Outputs.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommandTask_Outputs proto.InternalMessageInfo
 
 func (m *CommandTask_Outputs) GetFiles() []string {
 	if m != nil {
@@ -151,70 +269,129 @@ func (m *CommandTask_Outputs) GetDirectories() []string {
 	return nil
 }
 
+func (m *CommandTask_Outputs) GetStdoutDestination() string {
+	if m != nil {
+		return m.StdoutDestination
+	}
+	return ""
+}
+
+func (m *CommandTask_Outputs) GetStderrDestination() string {
+	if m != nil {
+		return m.StderrDestination
+	}
+	return ""
+}
+
 // Describes the timeouts associated with this task.
 type CommandTask_Timeouts struct {
 	// This specifies the maximum time that the task can run, excluding the
 	// time required to download inputs or upload outputs. That is, the worker
 	// will terminate the task if it runs longer than this.
-	Execution *google_protobuf5.Duration `protobuf:"bytes,1,opt,name=execution" json:"execution,omitempty"`
+	Execution *duration.Duration `protobuf:"bytes,1,opt,name=execution,proto3" json:"execution,omitempty"`
 	// This specifies the maximum amount of time the task can be idle - that is,
 	// go without generating some output in either stdout or stderr. If the
 	// process is silent for more than the specified time, the worker will
 	// terminate the task.
-	Idle *google_protobuf5.Duration `protobuf:"bytes,2,opt,name=idle" json:"idle,omitempty"`
+	Idle *duration.Duration `protobuf:"bytes,2,opt,name=idle,proto3" json:"idle,omitempty"`
 	// If the execution or IO timeouts are exceeded, the worker will try to
 	// gracefully terminate the task and return any existing logs. However,
 	// tasks may be hard-frozen in which case this process will fail. This
 	// timeout specifies how long to wait for a terminated task to shut down
 	// gracefully (e.g. via SIGTERM) before we bring down the hammer (e.g.
 	// SIGKILL on *nix, CTRL_BREAK_EVENT on Windows).
-	Shutdown *google_protobuf5.Duration `protobuf:"bytes,3,opt,name=shutdown" json:"shutdown,omitempty"`
+	Shutdown             *duration.Duration `protobuf:"bytes,3,opt,name=shutdown,proto3" json:"shutdown,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *CommandTask_Timeouts) Reset()                    { *m = CommandTask_Timeouts{} }
-func (m *CommandTask_Timeouts) String() string            { return proto.CompactTextString(m) }
-func (*CommandTask_Timeouts) ProtoMessage()               {}
-func (*CommandTask_Timeouts) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 2} }
+func (m *CommandTask_Timeouts) Reset()         { *m = CommandTask_Timeouts{} }
+func (m *CommandTask_Timeouts) String() string { return proto.CompactTextString(m) }
+func (*CommandTask_Timeouts) ProtoMessage()    {}
+func (*CommandTask_Timeouts) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{0, 2}
+}
+func (m *CommandTask_Timeouts) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandTask_Timeouts.Unmarshal(m, b)
+}
+func (m *CommandTask_Timeouts) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandTask_Timeouts.Marshal(b, m, deterministic)
+}
+func (dst *CommandTask_Timeouts) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandTask_Timeouts.Merge(dst, src)
+}
+func (m *CommandTask_Timeouts) XXX_Size() int {
+	return xxx_messageInfo_CommandTask_Timeouts.Size(m)
+}
+func (m *CommandTask_Timeouts) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandTask_Timeouts.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommandTask_Timeouts proto.InternalMessageInfo
 
-func (m *CommandTask_Timeouts) GetExecution() *google_protobuf5.Duration {
+func (m *CommandTask_Timeouts) GetExecution() *duration.Duration {
 	if m != nil {
 		return m.Execution
 	}
 	return nil
 }
 
-func (m *CommandTask_Timeouts) GetIdle() *google_protobuf5.Duration {
+func (m *CommandTask_Timeouts) GetIdle() *duration.Duration {
 	if m != nil {
 		return m.Idle
 	}
 	return nil
 }
 
-func (m *CommandTask_Timeouts) GetShutdown() *google_protobuf5.Duration {
+func (m *CommandTask_Timeouts) GetShutdown() *duration.Duration {
 	if m != nil {
 		return m.Shutdown
 	}
 	return nil
 }
 
+// DEPRECATED - use CommandResult instead.
 // Describes the actual outputs from the task.
 type CommandOutputs struct {
 	// exit_code is only fully reliable if the status' code is OK. If the task
 	// exceeded its deadline or was cancelled, the process may still produce an
 	// exit code as it is cancelled, and this will be populated, but a successful
 	// (zero) is unlikely to be correct unless the status code is OK.
-	ExitCode int32 `protobuf:"varint,1,opt,name=exit_code,json=exitCode" json:"exit_code,omitempty"`
+	ExitCode int32 `protobuf:"varint,1,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"`
 	// The output files. The blob referenced by the digest should contain
 	// one of the following (implementation-dependent):
 	//    * A marshalled DirectoryMetadata of the returned filesystem
 	//    * A LUCI-style .isolated file
-	Outputs *Digest `protobuf:"bytes,2,opt,name=outputs" json:"outputs,omitempty"`
+	Outputs              *Digest  `protobuf:"bytes,2,opt,name=outputs,proto3" json:"outputs,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CommandOutputs) Reset()                    { *m = CommandOutputs{} }
-func (m *CommandOutputs) String() string            { return proto.CompactTextString(m) }
-func (*CommandOutputs) ProtoMessage()               {}
-func (*CommandOutputs) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *CommandOutputs) Reset()         { *m = CommandOutputs{} }
+func (m *CommandOutputs) String() string { return proto.CompactTextString(m) }
+func (*CommandOutputs) ProtoMessage()    {}
+func (*CommandOutputs) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{1}
+}
+func (m *CommandOutputs) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandOutputs.Unmarshal(m, b)
+}
+func (m *CommandOutputs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandOutputs.Marshal(b, m, deterministic)
+}
+func (dst *CommandOutputs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandOutputs.Merge(dst, src)
+}
+func (m *CommandOutputs) XXX_Size() int {
+	return xxx_messageInfo_CommandOutputs.Size(m)
+}
+func (m *CommandOutputs) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandOutputs.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommandOutputs proto.InternalMessageInfo
 
 func (m *CommandOutputs) GetExitCode() int32 {
 	if m != nil {
@@ -230,60 +407,207 @@ func (m *CommandOutputs) GetOutputs() *Digest {
 	return nil
 }
 
+// DEPRECATED - use CommandResult instead.
 // Can be used as part of CompleteRequest.metadata, or are part of a more
 // sophisticated message.
 type CommandOverhead struct {
 	// The elapsed time between calling Accept and Complete. The server will also
 	// have its own idea of what this should be, but this excludes the overhead of
 	// the RPCs and the bot response time.
-	Duration *google_protobuf5.Duration `protobuf:"bytes,1,opt,name=duration" json:"duration,omitempty"`
+	Duration *duration.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
 	// The amount of time *not* spent executing the command (ie
 	// uploading/downloading files).
-	Overhead *google_protobuf5.Duration `protobuf:"bytes,2,opt,name=overhead" json:"overhead,omitempty"`
+	Overhead             *duration.Duration `protobuf:"bytes,2,opt,name=overhead,proto3" json:"overhead,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *CommandOverhead) Reset()         { *m = CommandOverhead{} }
+func (m *CommandOverhead) String() string { return proto.CompactTextString(m) }
+func (*CommandOverhead) ProtoMessage()    {}
+func (*CommandOverhead) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{2}
+}
+func (m *CommandOverhead) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandOverhead.Unmarshal(m, b)
+}
+func (m *CommandOverhead) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandOverhead.Marshal(b, m, deterministic)
+}
+func (dst *CommandOverhead) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandOverhead.Merge(dst, src)
+}
+func (m *CommandOverhead) XXX_Size() int {
+	return xxx_messageInfo_CommandOverhead.Size(m)
+}
+func (m *CommandOverhead) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandOverhead.DiscardUnknown(m)
 }
 
-func (m *CommandOverhead) Reset()                    { *m = CommandOverhead{} }
-func (m *CommandOverhead) String() string            { return proto.CompactTextString(m) }
-func (*CommandOverhead) ProtoMessage()               {}
-func (*CommandOverhead) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_CommandOverhead proto.InternalMessageInfo
 
-func (m *CommandOverhead) GetDuration() *google_protobuf5.Duration {
+func (m *CommandOverhead) GetDuration() *duration.Duration {
 	if m != nil {
 		return m.Duration
 	}
 	return nil
 }
 
-func (m *CommandOverhead) GetOverhead() *google_protobuf5.Duration {
+func (m *CommandOverhead) GetOverhead() *duration.Duration {
 	if m != nil {
 		return m.Overhead
 	}
 	return nil
 }
 
+// All information about the execution of a command, suitable for providing as
+// the Bots interface's `Lease.result` field.
+type CommandResult struct {
+	// An overall status for the command. For example, if the command timed out,
+	// this might have a code of DEADLINE_EXCEEDED; if it was killed by the OS for
+	// memory exhaustion, it might have a code of RESOURCE_EXHAUSTED.
+	Status *status.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
+	// The exit code of the process. An exit code of "0" should only be trusted if
+	// `status` has a code of OK (otherwise it may simply be unset).
+	ExitCode int32 `protobuf:"varint,2,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"`
+	// The output files. The blob referenced by the digest should contain
+	// one of the following (implementation-dependent):
+	//    * A marshalled DirectoryMetadata of the returned filesystem
+	//    * A LUCI-style .isolated file
+	Outputs *Digest `protobuf:"bytes,3,opt,name=outputs,proto3" json:"outputs,omitempty"`
+	// The elapsed time between calling Accept and Complete. The server will also
+	// have its own idea of what this should be, but this excludes the overhead of
+	// the RPCs and the bot response time.
+	Duration *duration.Duration `protobuf:"bytes,4,opt,name=duration,proto3" json:"duration,omitempty"` // Deprecated: Do not use.
+	// The amount of time *not* spent executing the command (ie
+	// uploading/downloading files).
+	Overhead *duration.Duration `protobuf:"bytes,5,opt,name=overhead,proto3" json:"overhead,omitempty"` // Deprecated: Do not use.
+	// Implementation-dependent statistics about the task. Both servers and bots
+	// may define messages which can be encoded here; bots are free to provide
+	// statistics in multiple formats, and servers are free to choose one or more
+	// of the values to process and ignore others. In particular, it is *not*
+	// considered an error for the bot to provide the server with a field that it
+	// doesn't know about.
+	Statistics           []*any.Any `protobuf:"bytes,6,rep,name=statistics,proto3" json:"statistics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *CommandResult) Reset()         { *m = CommandResult{} }
+func (m *CommandResult) String() string { return proto.CompactTextString(m) }
+func (*CommandResult) ProtoMessage()    {}
+func (*CommandResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{3}
+}
+func (m *CommandResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandResult.Unmarshal(m, b)
+}
+func (m *CommandResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandResult.Marshal(b, m, deterministic)
+}
+func (dst *CommandResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandResult.Merge(dst, src)
+}
+func (m *CommandResult) XXX_Size() int {
+	return xxx_messageInfo_CommandResult.Size(m)
+}
+func (m *CommandResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommandResult proto.InternalMessageInfo
+
+func (m *CommandResult) GetStatus() *status.Status {
+	if m != nil {
+		return m.Status
+	}
+	return nil
+}
+
+func (m *CommandResult) GetExitCode() int32 {
+	if m != nil {
+		return m.ExitCode
+	}
+	return 0
+}
+
+func (m *CommandResult) GetOutputs() *Digest {
+	if m != nil {
+		return m.Outputs
+	}
+	return nil
+}
+
+// Deprecated: Do not use.
+func (m *CommandResult) GetDuration() *duration.Duration {
+	if m != nil {
+		return m.Duration
+	}
+	return nil
+}
+
+// Deprecated: Do not use.
+func (m *CommandResult) GetOverhead() *duration.Duration {
+	if m != nil {
+		return m.Overhead
+	}
+	return nil
+}
+
+func (m *CommandResult) GetStatistics() []*any.Any {
+	if m != nil {
+		return m.Statistics
+	}
+	return nil
+}
+
 // The metadata for a file. Similar to the equivalent message in the Remote
 // Execution API.
 type FileMetadata struct {
 	// The path of this file. If this message is part of the
-	// CommandResult.output_files fields, the path is relative to the execution
-	// root and must correspond to an entry in CommandTask.outputs.files. If this
+	// CommandOutputs.outputs fields, the path is relative to the execution root
+	// and must correspond to an entry in CommandTask.outputs.files. If this
 	// message is part of a Directory message, then the path is relative to the
-	// root of that directory.
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	// root of that directory. All paths MUST be delimited by forward slashes.
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// A pointer to the contents of the file. The method by which a client
 	// retrieves the contents from a CAS system is not defined here.
-	Digest *Digest `protobuf:"bytes,2,opt,name=digest" json:"digest,omitempty"`
+	Digest *Digest `protobuf:"bytes,2,opt,name=digest,proto3" json:"digest,omitempty"`
 	// If the file is small enough, its contents may also or alternatively be
 	// listed here.
 	Contents []byte `protobuf:"bytes,3,opt,name=contents,proto3" json:"contents,omitempty"`
 	// Properties of the file
-	IsExecutable bool `protobuf:"varint,4,opt,name=is_executable,json=isExecutable" json:"is_executable,omitempty"`
+	IsExecutable         bool     `protobuf:"varint,4,opt,name=is_executable,json=isExecutable,proto3" json:"is_executable,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FileMetadata) Reset()                    { *m = FileMetadata{} }
-func (m *FileMetadata) String() string            { return proto.CompactTextString(m) }
-func (*FileMetadata) ProtoMessage()               {}
-func (*FileMetadata) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *FileMetadata) Reset()         { *m = FileMetadata{} }
+func (m *FileMetadata) String() string { return proto.CompactTextString(m) }
+func (*FileMetadata) ProtoMessage()    {}
+func (*FileMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{4}
+}
+func (m *FileMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileMetadata.Unmarshal(m, b)
+}
+func (m *FileMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileMetadata.Marshal(b, m, deterministic)
+}
+func (dst *FileMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileMetadata.Merge(dst, src)
+}
+func (m *FileMetadata) XXX_Size() int {
+	return xxx_messageInfo_FileMetadata.Size(m)
+}
+func (m *FileMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileMetadata proto.InternalMessageInfo
 
 func (m *FileMetadata) GetPath() string {
 	if m != nil {
@@ -317,16 +641,38 @@ func (m *FileMetadata) GetIsExecutable() bool {
 // Execution API.
 type DirectoryMetadata struct {
 	// The path of the directory, as in [FileMetadata.path][google.devtools.remoteworkers.v1test2.FileMetadata.path].
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// A pointer to the contents of the directory, in the form of a marshalled
 	// Directory message.
-	Digest *Digest `protobuf:"bytes,2,opt,name=digest" json:"digest,omitempty"`
+	Digest               *Digest  `protobuf:"bytes,2,opt,name=digest,proto3" json:"digest,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DirectoryMetadata) Reset()         { *m = DirectoryMetadata{} }
+func (m *DirectoryMetadata) String() string { return proto.CompactTextString(m) }
+func (*DirectoryMetadata) ProtoMessage()    {}
+func (*DirectoryMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{5}
+}
+func (m *DirectoryMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DirectoryMetadata.Unmarshal(m, b)
+}
+func (m *DirectoryMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DirectoryMetadata.Marshal(b, m, deterministic)
+}
+func (dst *DirectoryMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DirectoryMetadata.Merge(dst, src)
+}
+func (m *DirectoryMetadata) XXX_Size() int {
+	return xxx_messageInfo_DirectoryMetadata.Size(m)
+}
+func (m *DirectoryMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_DirectoryMetadata.DiscardUnknown(m)
 }
 
-func (m *DirectoryMetadata) Reset()                    { *m = DirectoryMetadata{} }
-func (m *DirectoryMetadata) String() string            { return proto.CompactTextString(m) }
-func (*DirectoryMetadata) ProtoMessage()               {}
-func (*DirectoryMetadata) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_DirectoryMetadata proto.InternalMessageInfo
 
 func (m *DirectoryMetadata) GetPath() string {
 	if m != nil {
@@ -342,24 +688,52 @@ func (m *DirectoryMetadata) GetDigest() *Digest {
 	return nil
 }
 
-// A reference to the contents of a file or a directory. If the latter, the has
-// refers to the hash of a marshalled Directory message. Similar to the
-// equivalent message in the Remote Execution API.
+// The CommandTask and CommandResult messages assume the existence of a service
+// that can serve blobs of content, identified by a hash and size known as a
+// "digest." The method by which these blobs may be retrieved is not specified
+// here, but a model implementation is in the Remote Execution API's
+// "ContentAddressibleStorage" interface.
+//
+// In the context of the RWAPI, a Digest will virtually always refer to the
+// contents of a file or a directory. The latter is represented by the
+// byte-encoded Directory message.
 type Digest struct {
 	// A string-encoded hash (eg "1a2b3c", not the byte array [0x1a, 0x2b, 0x3c])
 	// using an implementation-defined hash algorithm (eg SHA-256).
-	Hash string `protobuf:"bytes,1,opt,name=hash" json:"hash,omitempty"`
+	Hash string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
 	// The size of the contents. While this is not strictly required as part of an
 	// identifier (after all, any given hash will have exactly one canonical
 	// size), it's useful in almost all cases when one might want to send or
 	// retrieve blobs of content and is included here for this reason.
-	SizeBytes int64 `protobuf:"varint,2,opt,name=size_bytes,json=sizeBytes" json:"size_bytes,omitempty"`
+	SizeBytes            int64    `protobuf:"varint,2,opt,name=size_bytes,json=sizeBytes,proto3" json:"size_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Digest) Reset()                    { *m = Digest{} }
-func (m *Digest) String() string            { return proto.CompactTextString(m) }
-func (*Digest) ProtoMessage()               {}
-func (*Digest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *Digest) Reset()         { *m = Digest{} }
+func (m *Digest) String() string { return proto.CompactTextString(m) }
+func (*Digest) ProtoMessage()    {}
+func (*Digest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{6}
+}
+func (m *Digest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Digest.Unmarshal(m, b)
+}
+func (m *Digest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Digest.Marshal(b, m, deterministic)
+}
+func (dst *Digest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Digest.Merge(dst, src)
+}
+func (m *Digest) XXX_Size() int {
+	return xxx_messageInfo_Digest.Size(m)
+}
+func (m *Digest) XXX_DiscardUnknown() {
+	xxx_messageInfo_Digest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Digest proto.InternalMessageInfo
 
 func (m *Digest) GetHash() string {
 	if m != nil {
@@ -379,15 +753,37 @@ func (m *Digest) GetSizeBytes() int64 {
 // Execution API.
 type Directory struct {
 	// The files in this directory
-	Files []*FileMetadata `protobuf:"bytes,1,rep,name=files" json:"files,omitempty"`
+	Files []*FileMetadata `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"`
 	// Any subdirectories
-	Directories []*DirectoryMetadata `protobuf:"bytes,2,rep,name=directories" json:"directories,omitempty"`
+	Directories          []*DirectoryMetadata `protobuf:"bytes,2,rep,name=directories,proto3" json:"directories,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Directory) Reset()         { *m = Directory{} }
+func (m *Directory) String() string { return proto.CompactTextString(m) }
+func (*Directory) ProtoMessage()    {}
+func (*Directory) Descriptor() ([]byte, []int) {
+	return fileDescriptor_command_56eedbbbc833397d, []int{7}
+}
+func (m *Directory) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Directory.Unmarshal(m, b)
+}
+func (m *Directory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Directory.Marshal(b, m, deterministic)
+}
+func (dst *Directory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Directory.Merge(dst, src)
+}
+func (m *Directory) XXX_Size() int {
+	return xxx_messageInfo_Directory.Size(m)
+}
+func (m *Directory) XXX_DiscardUnknown() {
+	xxx_messageInfo_Directory.DiscardUnknown(m)
 }
 
-func (m *Directory) Reset()                    { *m = Directory{} }
-func (m *Directory) String() string            { return proto.CompactTextString(m) }
-func (*Directory) ProtoMessage()               {}
-func (*Directory) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_Directory proto.InternalMessageInfo
 
 func (m *Directory) GetFiles() []*FileMetadata {
 	if m != nil {
@@ -411,6 +807,7 @@ func init() {
 	proto.RegisterType((*CommandTask_Timeouts)(nil), "google.devtools.remoteworkers.v1test2.CommandTask.Timeouts")
 	proto.RegisterType((*CommandOutputs)(nil), "google.devtools.remoteworkers.v1test2.CommandOutputs")
 	proto.RegisterType((*CommandOverhead)(nil), "google.devtools.remoteworkers.v1test2.CommandOverhead")
+	proto.RegisterType((*CommandResult)(nil), "google.devtools.remoteworkers.v1test2.CommandResult")
 	proto.RegisterType((*FileMetadata)(nil), "google.devtools.remoteworkers.v1test2.FileMetadata")
 	proto.RegisterType((*DirectoryMetadata)(nil), "google.devtools.remoteworkers.v1test2.DirectoryMetadata")
 	proto.RegisterType((*Digest)(nil), "google.devtools.remoteworkers.v1test2.Digest")
@@ -418,51 +815,63 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("google/devtools/remoteworkers/v1test2/command.proto", fileDescriptor1)
-}
-
-var fileDescriptor1 = []byte{
-	// 665 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcb, 0x6e, 0x13, 0x49,
-	0x14, 0x86, 0xe5, 0x38, 0x76, 0xec, 0xe3, 0xcc, 0x64, 0xa6, 0x26, 0x23, 0x19, 0x73, 0x51, 0x64,
-	0x84, 0x94, 0x4d, 0xba, 0x85, 0x23, 0xc4, 0x25, 0x0b, 0x44, 0x2e, 0xa0, 0x2c, 0x22, 0x44, 0x29,
-	0x02, 0x29, 0x1b, 0xab, 0xec, 0x3e, 0x69, 0x97, 0xd2, 0xee, 0xb2, 0xba, 0xaa, 0x3b, 0x09, 0x1b,
-	0x24, 0xde, 0x06, 0x76, 0xf0, 0x0a, 0xbc, 0x18, 0xaa, 0x5b, 0xc7, 0x21, 0x08, 0x1b, 0x2f, 0xd8,
-	0x55, 0x9f, 0xd4, 0xff, 0xd5, 0xb9, 0xfc, 0x27, 0x86, 0xed, 0x58, 0x88, 0x38, 0xc1, 0x30, 0xc2,
-	0x42, 0x09, 0x91, 0xc8, 0x30, 0xc3, 0xb1, 0x50, 0x78, 0x2e, 0xb2, 0x33, 0xcc, 0x64, 0x58, 0x3c,
-	0x54, 0x28, 0x55, 0x2f, 0x1c, 0x8a, 0xf1, 0x98, 0xa5, 0x51, 0x30, 0xc9, 0x84, 0x12, 0xe4, 0x81,
-	0x15, 0x05, 0x5e, 0x14, 0x5c, 0x13, 0x05, 0x4e, 0xd4, 0xb9, 0xe7, 0xd8, 0x46, 0x34, 0xc8, 0x4f,
-	0xc3, 0x28, 0xcf, 0x98, 0xe2, 0x22, 0xb5, 0x98, 0xee, 0xb7, 0x3a, 0xb4, 0xf6, 0x2c, 0xf8, 0x98,
-	0xc9, 0x33, 0xf2, 0x06, 0xea, 0x3c, 0x9d, 0xe4, 0x4a, 0xb6, 0x2b, 0x1b, 0x95, 0xcd, 0x56, 0xef,
-	0x69, 0x30, 0xd7, 0x3b, 0xc1, 0x14, 0x23, 0x38, 0x34, 0x00, 0xea, 0x40, 0x04, 0xe1, 0x1f, 0xbc,
-	0x98, 0xe0, 0x50, 0x61, 0xd4, 0x17, 0xb9, 0x32, 0xf0, 0x65, 0x03, 0x7f, 0xb6, 0x00, 0xfc, 0xb5,
-	0x25, 0xd0, 0x35, 0xcf, 0x74, 0x01, 0xf2, 0x0e, 0x1a, 0x8a, 0x8f, 0x51, 0x68, 0x7c, 0xcd, 0xe0,
-	0x77, 0x16, 0xc0, 0x1f, 0x3b, 0x04, 0x2d, 0x61, 0x9d, 0x2f, 0x4b, 0x50, 0xb7, 0x25, 0x91, 0x3b,
-	0xd0, 0x64, 0x59, 0x9c, 0x8f, 0x31, 0x35, 0x0d, 0xaa, 0x6e, 0x36, 0xe9, 0x55, 0x80, 0xec, 0x41,
-	0xed, 0x94, 0x27, 0x28, 0xdb, 0x4b, 0x1b, 0xd5, 0xcd, 0x56, 0x6f, 0x6b, 0xce, 0xe7, 0xf7, 0x79,
-	0x8c, 0x52, 0x51, 0xab, 0x25, 0x1f, 0x2b, 0xf0, 0x3f, 0xa6, 0x05, 0xcf, 0x44, 0xaa, 0xa9, 0xfd,
-	0x82, 0x65, 0x9c, 0x0d, 0x34, 0xb5, 0x6a, 0xa8, 0x47, 0x0b, 0x0f, 0x24, 0x38, 0xb8, 0xc2, 0xbe,
-	0x75, 0x54, 0xba, 0x8e, 0x37, 0x83, 0xb2, 0xf3, 0x1c, 0xfe, 0xfb, 0xc9, 0x65, 0x42, 0x60, 0x39,
-	0x65, 0x63, 0x34, 0xd6, 0x68, 0x52, 0x73, 0x26, 0xeb, 0x50, 0x2b, 0x58, 0x92, 0x63, 0x7b, 0xc9,
-	0x04, 0xed, 0x47, 0xe7, 0x05, 0xac, 0xf8, 0xb9, 0xac, 0xfb, 0xae, 0xd8, 0x7e, 0xb9, 0x32, 0x37,
-	0xa0, 0x15, 0xf1, 0x0c, 0x87, 0x4a, 0x64, 0xdc, 0x75, 0xac, 0x49, 0xa7, 0x43, 0x9d, 0x4f, 0x15,
-	0x68, 0xf8, 0x69, 0x90, 0xc7, 0xd0, 0xc4, 0x0b, 0x1c, 0xe6, 0xda, 0xb9, 0xce, 0x99, 0xb7, 0x7c,
-	0x23, 0xbc, 0xb5, 0x83, 0x7d, 0x67, 0x6d, 0x7a, 0x75, 0x97, 0x6c, 0xc1, 0x32, 0x8f, 0x12, 0x9b,
-	0xdd, 0x2f, 0x35, 0xe6, 0x1a, 0x79, 0x04, 0x0d, 0x39, 0xca, 0x55, 0x24, 0xce, 0xd3, 0x76, 0x75,
-	0x96, 0xa4, 0xbc, 0xda, 0x2d, 0xe0, 0x6f, 0xd7, 0x6f, 0x5f, 0xf5, 0x6d, 0x9d, 0x30, 0x57, 0xfd,
-	0xa1, 0x88, 0x6c, 0xbf, 0x6a, 0xb4, 0xa1, 0x03, 0x7b, 0x22, 0x42, 0xf2, 0x0a, 0x56, 0xfc, 0x22,
-	0xd8, 0xbc, 0x7e, 0xd3, 0x2a, 0x5e, 0xdd, 0xfd, 0x00, 0x6b, 0xfe, 0xdd, 0x02, 0xb3, 0x11, 0xb2,
-	0x48, 0x57, 0xe0, 0x57, 0x7c, 0x76, 0xa3, 0xca, 0xab, 0x5a, 0x26, 0x1c, 0x62, 0x76, 0xaf, 0xca,
-	0xab, 0xdd, 0xcf, 0x15, 0x58, 0x7d, 0xc9, 0x13, 0x3c, 0x42, 0xc5, 0x22, 0xa6, 0x98, 0xb6, 0xc8,
-	0x84, 0xa9, 0x91, 0xb7, 0x88, 0x3e, 0x93, 0x03, 0xa8, 0x47, 0x26, 0xf1, 0xc5, 0xaa, 0x75, 0x62,
-	0xd2, 0x81, 0xc6, 0x50, 0xa4, 0xca, 0xec, 0x9e, 0x9e, 0xcd, 0x2a, 0x2d, 0xbf, 0xc9, 0x7d, 0xf8,
-	0x8b, 0xcb, 0xbe, 0x1d, 0xbb, 0xb6, 0xaa, 0xf9, 0x07, 0xd3, 0xa0, 0xab, 0x5c, 0x1e, 0x94, 0xb1,
-	0x6e, 0x0a, 0xff, 0xee, 0x3b, 0x83, 0x5d, 0xfe, 0x81, 0x84, 0xbb, 0x3b, 0x50, 0xb7, 0x11, 0xfd,
-	0xc8, 0x88, 0xc9, 0xf2, 0x11, 0x7d, 0x26, 0x77, 0x01, 0x24, 0x7f, 0x8f, 0xfd, 0xc1, 0xa5, 0x42,
-	0xeb, 0x83, 0x2a, 0x6d, 0xea, 0xc8, 0xae, 0x0e, 0x74, 0xbf, 0x56, 0xa0, 0x59, 0x66, 0x4b, 0x0e,
-	0xa7, 0x97, 0xa8, 0xd5, 0xdb, 0x9e, 0x33, 0xa1, 0xe9, 0xd1, 0xf8, 0xcd, 0x3b, 0xb9, 0xb9, 0x79,
-	0xad, 0xde, 0x93, 0xb9, 0x2b, 0xfc, 0xa1, 0x7f, 0xd7, 0x76, 0x76, 0xf7, 0xf8, 0x84, 0x3a, 0x4e,
-	0x2c, 0x12, 0x96, 0xc6, 0x81, 0xc8, 0xe2, 0x30, 0xc6, 0xd4, 0x58, 0x28, 0xb4, 0x7f, 0x62, 0x13,
-	0x2e, 0x67, 0xfc, 0xd4, 0xed, 0x5c, 0x8b, 0x0e, 0xea, 0x46, 0xbe, 0xfd, 0x3d, 0x00, 0x00, 0xff,
-	0xff, 0x1c, 0x77, 0x2c, 0xa3, 0x28, 0x07, 0x00, 0x00,
+	proto.RegisterFile("google/devtools/remoteworkers/v1test2/command.proto", fileDescriptor_command_56eedbbbc833397d)
+}
+
+var fileDescriptor_command_56eedbbbc833397d = []byte{
+	// 852 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x5d, 0x6f, 0x1b, 0x45,
+	0x14, 0xd5, 0xae, 0x3f, 0x62, 0x5f, 0xa7, 0x94, 0x0e, 0xa9, 0x70, 0xcd, 0x87, 0x22, 0xa3, 0x4a,
+	0x01, 0x29, 0x6b, 0xd5, 0x01, 0x41, 0xc8, 0x03, 0x22, 0x71, 0xa8, 0xfa, 0x50, 0x01, 0x43, 0xd4,
+	0x48, 0x7d, 0xb1, 0x26, 0xbb, 0xb7, 0xce, 0xa8, 0xf6, 0x8e, 0x35, 0x33, 0xeb, 0x36, 0xbc, 0x20,
+	0xf1, 0x47, 0x90, 0xfa, 0x46, 0xdf, 0xe0, 0x3f, 0xf0, 0xc8, 0x7f, 0x42, 0xf3, 0xb5, 0x59, 0x37,
+	0x90, 0x18, 0x23, 0xf1, 0xb6, 0xbe, 0xf7, 0x9c, 0x33, 0xf7, 0x9e, 0x99, 0x7b, 0x65, 0xd8, 0x9b,
+	0x08, 0x31, 0x99, 0xe2, 0x20, 0xc3, 0x85, 0x16, 0x62, 0xaa, 0x06, 0x12, 0x67, 0x42, 0xe3, 0x0b,
+	0x21, 0x9f, 0xa3, 0x54, 0x83, 0xc5, 0x03, 0x8d, 0x4a, 0x0f, 0x07, 0xa9, 0x98, 0xcd, 0x58, 0x9e,
+	0x25, 0x73, 0x29, 0xb4, 0x20, 0xf7, 0x1d, 0x29, 0x09, 0xa4, 0x64, 0x89, 0x94, 0x78, 0x52, 0xef,
+	0x9e, 0xd7, 0xb6, 0xa4, 0xb3, 0xe2, 0xd9, 0x80, 0xe5, 0x17, 0x4e, 0xa1, 0xf7, 0xe1, 0x9b, 0xa9,
+	0xac, 0x90, 0x4c, 0x73, 0x91, 0xfb, 0xfc, 0xbb, 0x3e, 0x2f, 0xe7, 0xe9, 0x40, 0x69, 0xa6, 0x0b,
+	0xe5, 0x12, 0xfd, 0x57, 0x1b, 0xd0, 0x39, 0x72, 0xc5, 0x9c, 0x30, 0xf5, 0x9c, 0x7c, 0x0f, 0x4d,
+	0x9e, 0xcf, 0x0b, 0xad, 0xba, 0xd1, 0x76, 0xb4, 0xd3, 0x19, 0xee, 0x27, 0x2b, 0xd5, 0x96, 0x54,
+	0x34, 0x92, 0x47, 0x56, 0x80, 0x7a, 0x21, 0x82, 0xf0, 0x36, 0xbe, 0x9c, 0x63, 0xaa, 0x31, 0x1b,
+	0x8b, 0x42, 0x5b, 0xf1, 0xba, 0x15, 0xff, 0x72, 0x0d, 0xf1, 0x6f, 0x9d, 0x02, 0xbd, 0x1d, 0x34,
+	0x7d, 0x80, 0x9c, 0x42, 0x4b, 0xf3, 0x19, 0x0a, 0x23, 0xdf, 0xb0, 0xf2, 0x07, 0x6b, 0xc8, 0x9f,
+	0x78, 0x09, 0x5a, 0x8a, 0xf5, 0x7e, 0x8b, 0xa1, 0xe9, 0x5a, 0x22, 0xef, 0x43, 0x9b, 0xc9, 0x49,
+	0x31, 0xc3, 0xdc, 0x1a, 0x54, 0xdb, 0x69, 0xd3, 0xcb, 0x00, 0x39, 0x82, 0xc6, 0x33, 0x3e, 0x45,
+	0xd5, 0x8d, 0xb7, 0x6b, 0x3b, 0x9d, 0xe1, 0xee, 0x8a, 0xc7, 0x8f, 0xf8, 0x04, 0x95, 0xa6, 0x8e,
+	0x4b, 0x7e, 0x8e, 0xe0, 0x2e, 0xe6, 0x0b, 0x2e, 0x45, 0x6e, 0x54, 0xc7, 0x0b, 0x26, 0x39, 0x3b,
+	0x33, 0xaa, 0x35, 0xab, 0xfa, 0x78, 0xed, 0x0b, 0x49, 0x8e, 0x2f, 0x65, 0x9f, 0x78, 0x55, 0xba,
+	0x85, 0x57, 0x83, 0xaa, 0xf7, 0x15, 0xbc, 0xf3, 0x37, 0x60, 0x42, 0xa0, 0x9e, 0xb3, 0x19, 0xda,
+	0xa7, 0xd1, 0xa6, 0xf6, 0x9b, 0x6c, 0x41, 0x63, 0xc1, 0xa6, 0x05, 0x76, 0x63, 0x1b, 0x74, 0x3f,
+	0x7a, 0xbf, 0x44, 0xb0, 0x11, 0x2e, 0x66, 0x2b, 0xd8, 0xe2, 0x0c, 0xf3, 0x7d, 0x6e, 0x43, 0x27,
+	0xe3, 0x12, 0x53, 0x2d, 0x24, 0xf7, 0x96, 0xb5, 0x69, 0x35, 0x44, 0x76, 0x81, 0x28, 0x9d, 0x89,
+	0x42, 0x8f, 0x33, 0x54, 0x9a, 0xe7, 0xf6, 0x3d, 0x77, 0x6b, 0xf6, 0x98, 0x3b, 0x2e, 0x33, 0xba,
+	0x4c, 0x78, 0x38, 0x4a, 0xb9, 0x04, 0xaf, 0x97, 0x70, 0x94, 0xb2, 0x02, 0xef, 0xfd, 0x1a, 0x41,
+	0x2b, 0x5c, 0x36, 0xf9, 0x1c, 0xda, 0xf8, 0x12, 0xd3, 0xc2, 0x52, 0xdc, 0xc3, 0xbf, 0x17, 0x7c,
+	0x0e, 0x23, 0x95, 0x8c, 0xfc, 0x48, 0xd1, 0x4b, 0x2c, 0xd9, 0x85, 0x3a, 0xcf, 0xa6, 0xae, 0xf9,
+	0x6b, 0x39, 0x16, 0x46, 0x3e, 0x83, 0x96, 0x3a, 0x2f, 0x74, 0x26, 0x5e, 0xb8, 0x46, 0xae, 0xa5,
+	0x94, 0xd0, 0xfe, 0x02, 0xde, 0xf2, 0xd7, 0x19, 0x3c, 0x7d, 0xcf, 0x14, 0xcc, 0xf5, 0x38, 0x15,
+	0x99, 0xbb, 0x8e, 0x06, 0x6d, 0x99, 0xc0, 0x91, 0xc8, 0x90, 0x3c, 0x84, 0x8d, 0x30, 0x67, 0xae,
+	0xae, 0x7f, 0xf9, 0x12, 0x03, 0xbb, 0xff, 0x13, 0xdc, 0x0e, 0xe7, 0x2e, 0x50, 0x9e, 0x23, 0xcb,
+	0x4c, 0x07, 0x61, 0xb5, 0xdc, 0x6c, 0x54, 0x09, 0x35, 0x34, 0xe1, 0x25, 0x6e, 0xf6, 0xaa, 0x84,
+	0xf6, 0xff, 0x8c, 0xe1, 0x96, 0xaf, 0x80, 0xa2, 0x2a, 0xa6, 0x9a, 0x7c, 0x02, 0x4d, 0xb7, 0xbf,
+	0xfc, 0xe9, 0x24, 0xc8, 0xc8, 0x79, 0x9a, 0xfc, 0x60, 0x33, 0xd4, 0x23, 0x96, 0x4d, 0x8a, 0xff,
+	0xd9, 0xa4, 0xda, 0x7f, 0x31, 0x89, 0xec, 0x57, 0x1c, 0xa9, 0xdf, 0xd0, 0xda, 0x61, 0xdc, 0x8d,
+	0x2a, 0xae, 0xec, 0x57, 0x5c, 0x69, 0xac, 0x44, 0x0d, 0x70, 0xf2, 0x29, 0x80, 0xe9, 0x92, 0x2b,
+	0xcd, 0x53, 0xd5, 0x6d, 0xda, 0xd5, 0xb0, 0x75, 0x85, 0xfc, 0x75, 0x7e, 0x41, 0x2b, 0xb8, 0xfe,
+	0xeb, 0x08, 0x36, 0xbf, 0xe1, 0x53, 0x7c, 0x8c, 0x9a, 0x65, 0x4c, 0x33, 0x33, 0xd1, 0x73, 0xa6,
+	0xcf, 0xc3, 0x44, 0x9b, 0x6f, 0x72, 0x0c, 0xcd, 0xcc, 0xf6, 0xb8, 0xde, 0xeb, 0xf1, 0x64, 0xd2,
+	0x83, 0x56, 0x2a, 0x72, 0x6d, 0x57, 0xa5, 0x71, 0x78, 0x93, 0x96, 0xbf, 0xc9, 0x47, 0x70, 0x8b,
+	0xab, 0xb1, 0x1b, 0x23, 0xb3, 0x59, 0xac, 0x71, 0x2d, 0xba, 0xc9, 0xd5, 0x71, 0x19, 0xeb, 0xe7,
+	0x70, 0x67, 0xe4, 0xd7, 0xc1, 0xc5, 0xff, 0x50, 0x70, 0xff, 0x00, 0x9a, 0x2e, 0x62, 0x0e, 0x39,
+	0x67, 0xaa, 0x3c, 0xc4, 0x7c, 0x93, 0x0f, 0x00, 0x14, 0xff, 0x11, 0xc7, 0x67, 0x17, 0x1a, 0xdd,
+	0x5c, 0xd5, 0x68, 0xdb, 0x44, 0x0e, 0x4d, 0xa0, 0xff, 0x7b, 0x04, 0xed, 0xb2, 0x5a, 0xf2, 0xa8,
+	0xba, 0xf2, 0x3a, 0xc3, 0xbd, 0x15, 0x0b, 0xaa, 0x5e, 0x4d, 0xd8, 0x93, 0x4f, 0xaf, 0xee, 0xc9,
+	0xce, 0xf0, 0x8b, 0x95, 0x3b, 0x7c, 0xc3, 0xbf, 0xa5, 0x0d, 0x7b, 0xf8, 0x47, 0x04, 0x1f, 0xa7,
+	0x62, 0xb6, 0x9a, 0xd8, 0xe1, 0x5d, 0x6a, 0xc3, 0xa7, 0x2e, 0xec, 0xc7, 0x52, 0x7d, 0x17, 0x3d,
+	0xa5, 0x9e, 0x3f, 0x11, 0x53, 0x96, 0x4f, 0x12, 0x21, 0x27, 0x83, 0x09, 0xe6, 0xf6, 0x11, 0x0e,
+	0x5c, 0x8a, 0xcd, 0xb9, 0xba, 0xe1, 0x2f, 0xd1, 0xc1, 0x52, 0xf4, 0x55, 0x1c, 0xd3, 0xd3, 0xd7,
+	0xf1, 0xfd, 0x87, 0x4e, 0x79, 0x84, 0x8b, 0x13, 0x5b, 0xd9, 0x52, 0x09, 0xc9, 0x93, 0x07, 0x27,
+	0x86, 0x7a, 0xd6, 0xb4, 0x67, 0xed, 0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x52, 0xfa, 0x6a,
+	0x7d, 0x09, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
index 03136656..ca014f95 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/tasks.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/remoteworkers/v1test2/tasks.proto
 
-package remoteworkers
+package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,13 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
+// DEPRECATED - use Lease.payload instead.
 // A Task represents a unit of work. Its result and logs are defined as
 // subresources.
 //
@@ -32,23 +39,45 @@ var _ = math.Inf
 // overhead.
 type Task struct {
 	// The name of this task. Output only.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The actual task to perform. For example, this could be CommandTask to run a
 	// command line.
-	Description *google_protobuf1.Any `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description *any.Any `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Handles to logs. The key is a human-readable name like `stdout`, and the
 	// handle is a resource name that can be passed to ByteStream or other
 	// accessors.
 	//
 	// An implementation may define some logs by default (like `stdout`), and may
 	// allow clients to add new logs via AddTaskLog.
-	Logs map[string]string `protobuf:"bytes,3,rep,name=logs" json:"logs,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Logs                 map[string]string `protobuf:"bytes,3,rep,name=logs,proto3" json:"logs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Task) Reset()         { *m = Task{} }
+func (m *Task) String() string { return proto.CompactTextString(m) }
+func (*Task) ProtoMessage()    {}
+func (*Task) Descriptor() ([]byte, []int) {
+	return fileDescriptor_tasks_667ae2bf8892e2d4, []int{0}
+}
+func (m *Task) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Task.Unmarshal(m, b)
+}
+func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Task.Marshal(b, m, deterministic)
+}
+func (dst *Task) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Task.Merge(dst, src)
+}
+func (m *Task) XXX_Size() int {
+	return xxx_messageInfo_Task.Size(m)
+}
+func (m *Task) XXX_DiscardUnknown() {
+	xxx_messageInfo_Task.DiscardUnknown(m)
 }
 
-func (m *Task) Reset()                    { *m = Task{} }
-func (m *Task) String() string            { return proto.CompactTextString(m) }
-func (*Task) ProtoMessage()               {}
-func (*Task) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_Task proto.InternalMessageInfo
 
 func (m *Task) GetName() string {
 	if m != nil {
@@ -57,7 +86,7 @@ func (m *Task) GetName() string {
 	return ""
 }
 
-func (m *Task) GetDescription() *google_protobuf1.Any {
+func (m *Task) GetDescription() *any.Any {
 	if m != nil {
 		return m.Description
 	}
@@ -71,11 +100,12 @@ func (m *Task) GetLogs() map[string]string {
 	return nil
 }
 
+// DEPRECATED - use Lease.assignment_result instead.
 // The result and metadata of the task.
 type TaskResult struct {
 	// The name of the task result; must be a name of a `Task` followed by
 	// `/result`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The result may be updated several times; the client must only set
 	// `complete` to true to indicate that no further updates are allowed.
 	// If this is not true, the `status` field must not be examined since its zero
@@ -83,23 +113,45 @@ type TaskResult struct {
 	//
 	// Once a task is completed, it must not be updated with further results,
 	// though the implementation may choose to continue to receive logs.
-	Complete bool `protobuf:"varint,2,opt,name=complete" json:"complete,omitempty"`
+	Complete bool `protobuf:"varint,2,opt,name=complete,proto3" json:"complete,omitempty"`
 	// The final status of the task itself. For example, if task.description
 	// included a timeout which was violated, status.code may be
 	// DEADLINE_EXCEEDED. This field can only be read if `complete` is true.
-	Status *google_rpc.Status `protobuf:"bytes,3,opt,name=status" json:"status,omitempty"`
+	Status *status.Status `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"`
 	// Any non-log output, such as output files and exit codes. See
 	// CommandResult as an example.
-	Output *google_protobuf1.Any `protobuf:"bytes,4,opt,name=output" json:"output,omitempty"`
+	Output *any.Any `protobuf:"bytes,4,opt,name=output,proto3" json:"output,omitempty"`
 	// Any information about how the command was executed, eg runtime. See
 	// CommandOverhead as an example.
-	Meta *google_protobuf1.Any `protobuf:"bytes,5,opt,name=meta" json:"meta,omitempty"`
+	Meta                 *any.Any `protobuf:"bytes,5,opt,name=meta,proto3" json:"meta,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TaskResult) Reset()         { *m = TaskResult{} }
+func (m *TaskResult) String() string { return proto.CompactTextString(m) }
+func (*TaskResult) ProtoMessage()    {}
+func (*TaskResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_tasks_667ae2bf8892e2d4, []int{1}
+}
+func (m *TaskResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TaskResult.Unmarshal(m, b)
+}
+func (m *TaskResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TaskResult.Marshal(b, m, deterministic)
+}
+func (dst *TaskResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TaskResult.Merge(dst, src)
+}
+func (m *TaskResult) XXX_Size() int {
+	return xxx_messageInfo_TaskResult.Size(m)
+}
+func (m *TaskResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_TaskResult.DiscardUnknown(m)
 }
 
-func (m *TaskResult) Reset()                    { *m = TaskResult{} }
-func (m *TaskResult) String() string            { return proto.CompactTextString(m) }
-func (*TaskResult) ProtoMessage()               {}
-func (*TaskResult) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_TaskResult proto.InternalMessageInfo
 
 func (m *TaskResult) GetName() string {
 	if m != nil {
@@ -115,21 +167,21 @@ func (m *TaskResult) GetComplete() bool {
 	return false
 }
 
-func (m *TaskResult) GetStatus() *google_rpc.Status {
+func (m *TaskResult) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
 	return nil
 }
 
-func (m *TaskResult) GetOutput() *google_protobuf1.Any {
+func (m *TaskResult) GetOutput() *any.Any {
 	if m != nil {
 		return m.Output
 	}
 	return nil
 }
 
-func (m *TaskResult) GetMeta() *google_protobuf1.Any {
+func (m *TaskResult) GetMeta() *any.Any {
 	if m != nil {
 		return m.Meta
 	}
@@ -139,13 +191,35 @@ func (m *TaskResult) GetMeta() *google_protobuf1.Any {
 // Request message for `GetTask`.
 type GetTaskRequest struct {
 	// The task name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTaskRequest) Reset()         { *m = GetTaskRequest{} }
+func (m *GetTaskRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTaskRequest) ProtoMessage()    {}
+func (*GetTaskRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_tasks_667ae2bf8892e2d4, []int{2}
+}
+func (m *GetTaskRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTaskRequest.Unmarshal(m, b)
+}
+func (m *GetTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTaskRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTaskRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTaskRequest.Merge(dst, src)
+}
+func (m *GetTaskRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTaskRequest.Size(m)
+}
+func (m *GetTaskRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTaskRequest.DiscardUnknown(m)
 }
 
-func (m *GetTaskRequest) Reset()                    { *m = GetTaskRequest{} }
-func (m *GetTaskRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTaskRequest) ProtoMessage()               {}
-func (*GetTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_GetTaskRequest proto.InternalMessageInfo
 
 func (m *GetTaskRequest) GetName() string {
 	if m != nil {
@@ -157,21 +231,43 @@ func (m *GetTaskRequest) GetName() string {
 // Request message for `UpdateTaskResult`.
 type UpdateTaskResultRequest struct {
 	// The task result name; must match `result.name`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The result being updated.
-	Result *TaskResult `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
+	Result *TaskResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	// The fields within `result` that are specified.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// If this is being updated by a bot from BotManager, the source should be
 	// bot.session_id. That way, if two bots accidentally get the same name, we'll
 	// know to reject updates from the older one.
-	Source string `protobuf:"bytes,4,opt,name=source" json:"source,omitempty"`
+	Source               string   `protobuf:"bytes,4,opt,name=source,proto3" json:"source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateTaskResultRequest) Reset()         { *m = UpdateTaskResultRequest{} }
+func (m *UpdateTaskResultRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateTaskResultRequest) ProtoMessage()    {}
+func (*UpdateTaskResultRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_tasks_667ae2bf8892e2d4, []int{3}
+}
+func (m *UpdateTaskResultRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateTaskResultRequest.Unmarshal(m, b)
+}
+func (m *UpdateTaskResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateTaskResultRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateTaskResultRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTaskResultRequest.Merge(dst, src)
+}
+func (m *UpdateTaskResultRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateTaskResultRequest.Size(m)
+}
+func (m *UpdateTaskResultRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateTaskResultRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateTaskResultRequest) Reset()                    { *m = UpdateTaskResultRequest{} }
-func (m *UpdateTaskResultRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateTaskResultRequest) ProtoMessage()               {}
-func (*UpdateTaskResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_UpdateTaskResultRequest proto.InternalMessageInfo
 
 func (m *UpdateTaskResultRequest) GetName() string {
 	if m != nil {
@@ -187,7 +283,7 @@ func (m *UpdateTaskResultRequest) GetResult() *TaskResult {
 	return nil
 }
 
-func (m *UpdateTaskResultRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateTaskResultRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -204,15 +300,37 @@ func (m *UpdateTaskResultRequest) GetSource() string {
 // Request message for `AddTaskLog`.
 type AddTaskLogRequest struct {
 	// The name of the task that will own the new log.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The human-readable name of the log, like `stdout` or a relative file path.
-	LogId string `protobuf:"bytes,2,opt,name=log_id,json=logId" json:"log_id,omitempty"`
+	LogId                string   `protobuf:"bytes,2,opt,name=log_id,json=logId,proto3" json:"log_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AddTaskLogRequest) Reset()         { *m = AddTaskLogRequest{} }
+func (m *AddTaskLogRequest) String() string { return proto.CompactTextString(m) }
+func (*AddTaskLogRequest) ProtoMessage()    {}
+func (*AddTaskLogRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_tasks_667ae2bf8892e2d4, []int{4}
+}
+func (m *AddTaskLogRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AddTaskLogRequest.Unmarshal(m, b)
+}
+func (m *AddTaskLogRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AddTaskLogRequest.Marshal(b, m, deterministic)
+}
+func (dst *AddTaskLogRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddTaskLogRequest.Merge(dst, src)
+}
+func (m *AddTaskLogRequest) XXX_Size() int {
+	return xxx_messageInfo_AddTaskLogRequest.Size(m)
+}
+func (m *AddTaskLogRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AddTaskLogRequest.DiscardUnknown(m)
 }
 
-func (m *AddTaskLogRequest) Reset()                    { *m = AddTaskLogRequest{} }
-func (m *AddTaskLogRequest) String() string            { return proto.CompactTextString(m) }
-func (*AddTaskLogRequest) ProtoMessage()               {}
-func (*AddTaskLogRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_AddTaskLogRequest proto.InternalMessageInfo
 
 func (m *AddTaskLogRequest) GetName() string {
 	if m != nil {
@@ -231,13 +349,35 @@ func (m *AddTaskLogRequest) GetLogId() string {
 // Response message for `AddTaskLog`.
 type AddTaskLogResponse struct {
 	// The handle for the new log, as would be returned in Task.logs.
-	Handle string `protobuf:"bytes,1,opt,name=handle" json:"handle,omitempty"`
+	Handle               string   `protobuf:"bytes,1,opt,name=handle,proto3" json:"handle,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AddTaskLogResponse) Reset()         { *m = AddTaskLogResponse{} }
+func (m *AddTaskLogResponse) String() string { return proto.CompactTextString(m) }
+func (*AddTaskLogResponse) ProtoMessage()    {}
+func (*AddTaskLogResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_tasks_667ae2bf8892e2d4, []int{5}
+}
+func (m *AddTaskLogResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AddTaskLogResponse.Unmarshal(m, b)
+}
+func (m *AddTaskLogResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AddTaskLogResponse.Marshal(b, m, deterministic)
+}
+func (dst *AddTaskLogResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AddTaskLogResponse.Merge(dst, src)
+}
+func (m *AddTaskLogResponse) XXX_Size() int {
+	return xxx_messageInfo_AddTaskLogResponse.Size(m)
+}
+func (m *AddTaskLogResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_AddTaskLogResponse.DiscardUnknown(m)
 }
 
-func (m *AddTaskLogResponse) Reset()                    { *m = AddTaskLogResponse{} }
-func (m *AddTaskLogResponse) String() string            { return proto.CompactTextString(m) }
-func (*AddTaskLogResponse) ProtoMessage()               {}
-func (*AddTaskLogResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_AddTaskLogResponse proto.InternalMessageInfo
 
 func (m *AddTaskLogResponse) GetHandle() string {
 	if m != nil {
@@ -248,6 +388,7 @@ func (m *AddTaskLogResponse) GetHandle() string {
 
 func init() {
 	proto.RegisterType((*Task)(nil), "google.devtools.remoteworkers.v1test2.Task")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.remoteworkers.v1test2.Task.LogsEntry")
 	proto.RegisterType((*TaskResult)(nil), "google.devtools.remoteworkers.v1test2.TaskResult")
 	proto.RegisterType((*GetTaskRequest)(nil), "google.devtools.remoteworkers.v1test2.GetTaskRequest")
 	proto.RegisterType((*UpdateTaskResultRequest)(nil), "google.devtools.remoteworkers.v1test2.UpdateTaskResultRequest")
@@ -263,15 +404,19 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Tasks service
-
+// TasksClient is the client API for Tasks service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type TasksClient interface {
+	// DEPRECATED - use Lease.payload instead.
 	// GetTask reads the current state of the task. Tasks must be created through
 	// some other interface, and should be immutable once created and exposed to
 	// the bots.
 	GetTask(ctx context.Context, in *GetTaskRequest, opts ...grpc.CallOption) (*Task, error)
+	// DEPRECATED - use Lease.result instead.
 	// UpdateTaskResult updates the result.
 	UpdateTaskResult(ctx context.Context, in *UpdateTaskResultRequest, opts ...grpc.CallOption) (*TaskResult, error)
+	// DEPRECATED - precreate logs prior to sending to bot.
 	// AddTaskLog creates a new streaming log. The log is streamed and marked as
 	// completed through other interfaces (i.e., ByteStream). This can be called
 	// by the bot if it wants to create a new log; the server can also predefine
@@ -289,7 +434,7 @@ func NewTasksClient(cc *grpc.ClientConn) TasksClient {
 
 func (c *tasksClient) GetTask(ctx context.Context, in *GetTaskRequest, opts ...grpc.CallOption) (*Task, error) {
 	out := new(Task)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Tasks/GetTask", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Tasks/GetTask", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -298,7 +443,7 @@ func (c *tasksClient) GetTask(ctx context.Context, in *GetTaskRequest, opts ...g
 
 func (c *tasksClient) UpdateTaskResult(ctx context.Context, in *UpdateTaskResultRequest, opts ...grpc.CallOption) (*TaskResult, error) {
 	out := new(TaskResult)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Tasks/UpdateTaskResult", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Tasks/UpdateTaskResult", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -307,22 +452,24 @@ func (c *tasksClient) UpdateTaskResult(ctx context.Context, in *UpdateTaskResult
 
 func (c *tasksClient) AddTaskLog(ctx context.Context, in *AddTaskLogRequest, opts ...grpc.CallOption) (*AddTaskLogResponse, error) {
 	out := new(AddTaskLogResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Tasks/AddTaskLog", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.remoteworkers.v1test2.Tasks/AddTaskLog", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Tasks service
-
+// TasksServer is the server API for Tasks service.
 type TasksServer interface {
+	// DEPRECATED - use Lease.payload instead.
 	// GetTask reads the current state of the task. Tasks must be created through
 	// some other interface, and should be immutable once created and exposed to
 	// the bots.
 	GetTask(context.Context, *GetTaskRequest) (*Task, error)
+	// DEPRECATED - use Lease.result instead.
 	// UpdateTaskResult updates the result.
 	UpdateTaskResult(context.Context, *UpdateTaskResultRequest) (*TaskResult, error)
+	// DEPRECATED - precreate logs prior to sending to bot.
 	// AddTaskLog creates a new streaming log. The log is streamed and marked as
 	// completed through other interfaces (i.e., ByteStream). This can be called
 	// by the bot if it wants to create a new log; the server can also predefine
@@ -409,48 +556,53 @@ var _Tasks_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/remoteworkers/v1test2/tasks.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/remoteworkers/v1test2/tasks.proto", fileDescriptor2) }
-
-var fileDescriptor2 = []byte{
-	// 634 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x95, 0x13, 0xc7, 0x34, 0x13, 0x09, 0x95, 0x55, 0xa1, 0xc6, 0xea, 0x21, 0x58, 0x80, 0xa2,
-	0x34, 0xb2, 0x95, 0x20, 0xa0, 0xa4, 0xa2, 0x52, 0x91, 0x00, 0x45, 0x0a, 0x17, 0x53, 0x2e, 0x5c,
-	0xaa, 0x6d, 0xbc, 0x5d, 0xac, 0x38, 0x5e, 0xe3, 0x5d, 0x07, 0x45, 0x28, 0x17, 0x4e, 0x5c, 0x11,
-	0x1f, 0xc2, 0x95, 0x23, 0x3f, 0xc0, 0x09, 0x89, 0x2f, 0xe0, 0x43, 0x90, 0xd7, 0xeb, 0xb4, 0x69,
-	0x9b, 0x90, 0x70, 0xf3, 0x78, 0xde, 0x9b, 0x99, 0x37, 0x6f, 0xb4, 0xd0, 0xa6, 0x8c, 0xd1, 0x90,
-	0xb8, 0x3e, 0x19, 0x0b, 0xc6, 0x42, 0xee, 0x26, 0x64, 0xc4, 0x04, 0xf9, 0xc0, 0x92, 0x21, 0x49,
-	0xb8, 0x3b, 0x6e, 0x0b, 0xc2, 0x45, 0xc7, 0x15, 0x98, 0x0f, 0xb9, 0x13, 0x27, 0x4c, 0x30, 0x74,
-	0x2f, 0xa7, 0x38, 0x05, 0xc5, 0x99, 0xa3, 0x38, 0x8a, 0x62, 0xed, 0xa8, 0xca, 0x38, 0x0e, 0x5c,
-	0x1c, 0x45, 0x4c, 0x60, 0x11, 0xb0, 0x48, 0x15, 0xb1, 0x6e, 0xab, 0xac, 0x8c, 0x4e, 0xd2, 0x53,
-	0x17, 0x47, 0x13, 0x95, 0xaa, 0x5f, 0x4c, 0x9d, 0x06, 0x24, 0xf4, 0x8f, 0x47, 0x98, 0x0f, 0x15,
-	0x62, 0x5b, 0x21, 0x92, 0x78, 0xe0, 0x72, 0x81, 0x45, 0xaa, 0xaa, 0xda, 0xbf, 0x35, 0xd0, 0x8f,
-	0x30, 0x1f, 0x22, 0x04, 0x7a, 0x84, 0x47, 0xc4, 0xd4, 0xea, 0x5a, 0xa3, 0xea, 0xc9, 0x6f, 0xf4,
-	0x08, 0x6a, 0x3e, 0xe1, 0x83, 0x24, 0x88, 0xb3, 0x41, 0xcc, 0x52, 0x5d, 0x6b, 0xd4, 0x3a, 0x5b,
-	0x8e, 0x52, 0x53, 0x74, 0x73, 0x0e, 0xa3, 0x89, 0x77, 0x1e, 0x88, 0x7a, 0xa0, 0x87, 0x8c, 0x72,
-	0xb3, 0x5c, 0x2f, 0x37, 0x6a, 0x9d, 0x87, 0xce, 0x4a, 0xf2, 0x9d, 0x6c, 0x0c, 0xa7, 0xcf, 0x28,
-	0x7f, 0x1e, 0x89, 0x64, 0xe2, 0xc9, 0x12, 0xd6, 0x63, 0xa8, 0xce, 0x7e, 0xa1, 0x4d, 0x28, 0x0f,
-	0xc9, 0x44, 0x8d, 0x98, 0x7d, 0xa2, 0x2d, 0xa8, 0x8c, 0x71, 0x98, 0x12, 0x39, 0x5b, 0xd5, 0xcb,
-	0x83, 0x6e, 0x69, 0x4f, 0xb3, 0x7f, 0x68, 0x00, 0x59, 0x45, 0x8f, 0xf0, 0x34, 0x14, 0x57, 0xca,
-	0xb3, 0x60, 0x63, 0xc0, 0x46, 0x71, 0x48, 0x44, 0xce, 0xdf, 0xf0, 0x66, 0x31, 0x6a, 0x82, 0x91,
-	0xef, 0xc9, 0x2c, 0x4b, 0xd5, 0xa8, 0x10, 0x91, 0xc4, 0x03, 0xe7, 0xb5, 0xcc, 0x78, 0x0a, 0x81,
-	0x5a, 0x60, 0xb0, 0x54, 0xc4, 0xa9, 0x30, 0xf5, 0x25, 0x1b, 0x52, 0x18, 0xd4, 0x00, 0x7d, 0x44,
-	0x04, 0x36, 0x2b, 0x4b, 0xb0, 0x12, 0x61, 0xdf, 0x85, 0xeb, 0x2f, 0x89, 0xc8, 0x45, 0xbc, 0x4f,
-	0x09, 0xbf, 0x52, 0x85, 0xfd, 0x53, 0x83, 0xed, 0x37, 0xb1, 0x8f, 0x05, 0x39, 0x93, 0xbb, 0x04,
-	0x8f, 0x7a, 0x60, 0x24, 0x12, 0xa4, 0xfc, 0x6c, 0xaf, 0x61, 0x8f, 0xaa, 0xae, 0x0a, 0xa0, 0x7d,
-	0xa8, 0xa5, 0xb2, 0xb3, 0x3c, 0x35, 0xb5, 0x29, 0xeb, 0x92, 0xa2, 0x17, 0xd9, 0x35, 0xbe, 0xca,
-	0xe8, 0x90, 0xc3, 0xb3, 0x6f, 0x74, 0x0b, 0x0c, 0xce, 0xd2, 0x64, 0x40, 0xe4, 0xd6, 0xaa, 0x9e,
-	0x8a, 0xec, 0x03, 0xb8, 0x71, 0xe8, 0xfb, 0x59, 0xb7, 0x3e, 0xa3, 0xcb, 0x84, 0xdc, 0x04, 0x23,
-	0x64, 0xf4, 0x38, 0xf0, 0x0b, 0xf3, 0x43, 0x46, 0x7b, 0xbe, 0xdd, 0x02, 0x74, 0x9e, 0xcf, 0x63,
-	0x16, 0x71, 0x92, 0x75, 0x7b, 0x87, 0x23, 0x3f, 0x2c, 0x4a, 0xa8, 0xa8, 0xf3, 0x59, 0x87, 0x4a,
-	0x86, 0xe5, 0xe8, 0x8b, 0x06, 0xd7, 0xd4, 0xba, 0xd1, 0xaa, 0x27, 0x3b, 0x6f, 0x8f, 0xb5, 0xbb,
-	0xc6, 0x2a, 0x6d, 0xfb, 0xd3, 0xaf, 0x3f, 0x5f, 0x4b, 0x3b, 0xc8, 0x9a, 0x3d, 0x19, 0x1f, 0x33,
-	0x59, 0x4f, 0x9b, 0xcd, 0xfc, 0xed, 0x70, 0x9b, 0x53, 0xf4, 0x5d, 0x83, 0xcd, 0x8b, 0xde, 0xa2,
-	0x83, 0x15, 0xbb, 0x2c, 0x38, 0x0a, 0x6b, 0x7d, 0xc3, 0xed, 0xb6, 0x9c, 0x75, 0xb7, 0x73, 0x67,
-	0xe1, 0xac, 0x6e, 0x7e, 0x12, 0xd3, 0x6e, 0x71, 0x1b, 0xdf, 0x34, 0x80, 0x33, 0x1f, 0xd0, 0xde,
-	0x8a, 0x4d, 0x2f, 0x59, 0x6f, 0x3d, 0xf9, 0x0f, 0x66, 0x6e, 0xba, 0xdd, 0x92, 0x63, 0xdf, 0xb7,
-	0x17, 0x8f, 0x3d, 0xed, 0x62, 0xdf, 0xef, 0x33, 0xda, 0xd5, 0x9a, 0xcf, 0x8e, 0xde, 0x7a, 0xaa,
-	0x13, 0x65, 0x21, 0x8e, 0xa8, 0xc3, 0x12, 0xea, 0x52, 0x12, 0xc9, 0x3b, 0x76, 0xf3, 0x14, 0x8e,
-	0x03, 0xfe, 0x8f, 0x97, 0x7f, 0x7f, 0xee, 0xef, 0x89, 0x21, 0xe9, 0x0f, 0xfe, 0x06, 0x00, 0x00,
-	0xff, 0xff, 0xb8, 0x8f, 0xed, 0xe0, 0x37, 0x06, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/devtools/remoteworkers/v1test2/tasks.proto", fileDescriptor_tasks_667ae2bf8892e2d4)
+}
+
+var fileDescriptor_tasks_667ae2bf8892e2d4 = []byte{
+	// 682 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6b, 0x13, 0x41,
+	0x14, 0x66, 0x92, 0x34, 0x36, 0x2f, 0x20, 0x75, 0xa8, 0x36, 0x2e, 0x3d, 0xc4, 0xc5, 0x4a, 0x4c,
+	0xcb, 0x2e, 0x89, 0xa8, 0x35, 0xc5, 0x42, 0x8b, 0x5a, 0x0a, 0x15, 0x64, 0xad, 0x16, 0xbc, 0x94,
+	0x69, 0x76, 0x3a, 0x86, 0x6c, 0x76, 0xd6, 0x9d, 0xd9, 0x48, 0x90, 0x5e, 0x3c, 0x79, 0x15, 0xff,
+	0x03, 0x8f, 0x5e, 0xbc, 0x7a, 0x14, 0xef, 0x9e, 0x04, 0xff, 0x02, 0xff, 0x10, 0x99, 0x1f, 0x69,
+	0x9b, 0xfe, 0x88, 0xa9, 0xb7, 0x99, 0x79, 0xdf, 0xf7, 0xde, 0xfb, 0xde, 0xf7, 0xb2, 0x81, 0x06,
+	0xe3, 0x9c, 0x45, 0xd4, 0x0f, 0x69, 0x5f, 0x72, 0x1e, 0x09, 0x3f, 0xa5, 0x3d, 0x2e, 0xe9, 0x5b,
+	0x9e, 0x76, 0x69, 0x2a, 0xfc, 0x7e, 0x43, 0x52, 0x21, 0x9b, 0xbe, 0x24, 0xa2, 0x2b, 0xbc, 0x24,
+	0xe5, 0x92, 0xe3, 0x05, 0x43, 0xf1, 0x86, 0x14, 0x6f, 0x84, 0xe2, 0x59, 0x8a, 0x33, 0x6f, 0x33,
+	0x93, 0xa4, 0xe3, 0x93, 0x38, 0xe6, 0x92, 0xc8, 0x0e, 0x8f, 0x6d, 0x12, 0xe7, 0xba, 0x8d, 0xea,
+	0xdb, 0x5e, 0xb6, 0xef, 0x93, 0x78, 0x60, 0x43, 0xd5, 0x93, 0xa1, 0xfd, 0x0e, 0x8d, 0xc2, 0xdd,
+	0x1e, 0x11, 0x5d, 0x8b, 0x98, 0xb3, 0x88, 0x34, 0x69, 0xfb, 0x42, 0x12, 0x99, 0xd9, 0xac, 0xee,
+	0x6f, 0x04, 0x85, 0x6d, 0x22, 0xba, 0x18, 0x43, 0x21, 0x26, 0x3d, 0x5a, 0x41, 0x55, 0x54, 0x2b,
+	0x05, 0xfa, 0x8c, 0xef, 0x41, 0x39, 0xa4, 0xa2, 0x9d, 0x76, 0x12, 0xd5, 0x48, 0x25, 0x57, 0x45,
+	0xb5, 0x72, 0x73, 0xd6, 0xb3, 0x6a, 0x86, 0xd5, 0xbc, 0xb5, 0x78, 0x10, 0x1c, 0x07, 0xe2, 0x4d,
+	0x28, 0x44, 0x9c, 0x89, 0x4a, 0xbe, 0x9a, 0xaf, 0x95, 0x9b, 0x77, 0xbd, 0x89, 0xe4, 0x7b, 0xaa,
+	0x0d, 0x6f, 0x8b, 0x33, 0xf1, 0x38, 0x96, 0xe9, 0x20, 0xd0, 0x29, 0x9c, 0xfb, 0x50, 0x3a, 0x7c,
+	0xc2, 0x33, 0x90, 0xef, 0xd2, 0x81, 0x6d, 0x51, 0x1d, 0xf1, 0x2c, 0x4c, 0xf5, 0x49, 0x94, 0x51,
+	0xdd, 0x5b, 0x29, 0x30, 0x97, 0x56, 0x6e, 0x19, 0xb9, 0xdf, 0x11, 0x80, 0xca, 0x18, 0x50, 0x91,
+	0x45, 0xf2, 0x4c, 0x79, 0x0e, 0x4c, 0xb7, 0x79, 0x2f, 0x89, 0xa8, 0x34, 0xfc, 0xe9, 0xe0, 0xf0,
+	0x8e, 0xeb, 0x50, 0x34, 0x73, 0xaa, 0xe4, 0xb5, 0x6a, 0x3c, 0x14, 0x91, 0x26, 0x6d, 0xef, 0xb9,
+	0x8e, 0x04, 0x16, 0x81, 0x97, 0xa0, 0xc8, 0x33, 0x99, 0x64, 0xb2, 0x52, 0x18, 0x33, 0x21, 0x8b,
+	0xc1, 0x35, 0x28, 0xf4, 0xa8, 0x24, 0x95, 0xa9, 0x31, 0x58, 0x8d, 0x70, 0x6f, 0xc2, 0xe5, 0x0d,
+	0x2a, 0x8d, 0x88, 0x37, 0x19, 0x15, 0x67, 0xaa, 0x70, 0x7f, 0x22, 0x98, 0x7b, 0x91, 0x84, 0x44,
+	0xd2, 0x23, 0xb9, 0x63, 0xf0, 0x78, 0x13, 0x8a, 0xa9, 0x06, 0x59, 0x3f, 0x1b, 0x17, 0xb0, 0xc7,
+	0x66, 0xb7, 0x09, 0xf0, 0x0a, 0x94, 0x33, 0x5d, 0x59, 0xaf, 0x9a, 0x9d, 0x94, 0x73, 0x4a, 0xd1,
+	0x13, 0xb5, 0x8d, 0x4f, 0x15, 0x1d, 0x0c, 0x5c, 0x9d, 0xf1, 0x35, 0x28, 0x0a, 0x9e, 0xa5, 0x6d,
+	0xaa, 0xa7, 0x56, 0x0a, 0xec, 0xcd, 0x5d, 0x85, 0x2b, 0x6b, 0x61, 0xa8, 0xaa, 0x6d, 0x71, 0x36,
+	0x4e, 0xc8, 0x55, 0x28, 0x46, 0x9c, 0xed, 0x76, 0xc2, 0xa1, 0xf9, 0x11, 0x67, 0x9b, 0xa1, 0xbb,
+	0x04, 0xf8, 0x38, 0x5f, 0x24, 0x3c, 0x16, 0x54, 0x55, 0x7b, 0x4d, 0xe2, 0x30, 0x1a, 0xa6, 0xb0,
+	0xb7, 0xe6, 0x87, 0x02, 0x4c, 0x29, 0xac, 0xc0, 0x1f, 0x11, 0x5c, 0xb2, 0xe3, 0xc6, 0x93, 0xae,
+	0xec, 0xa8, 0x3d, 0xce, 0xe2, 0x05, 0x46, 0xe9, 0xba, 0xef, 0x7f, 0xfd, 0xf9, 0x94, 0x9b, 0xc7,
+	0xce, 0xe1, 0x27, 0xe3, 0x9d, 0x92, 0xf5, 0xb0, 0x5e, 0x37, 0xdf, 0x0e, 0xbf, 0x7e, 0x80, 0xbf,
+	0x21, 0x98, 0x39, 0xe9, 0x2d, 0x5e, 0x9d, 0xb0, 0xca, 0x39, 0x4b, 0xe1, 0x5c, 0xdc, 0x70, 0xb7,
+	0xa1, 0x7b, 0x5d, 0x6c, 0xde, 0x38, 0xb7, 0x57, 0xdf, 0xac, 0xc4, 0x41, 0x6b, 0xb8, 0x1b, 0x5f,
+	0x11, 0xc0, 0x91, 0x0f, 0x78, 0x79, 0xc2, 0xa2, 0xa7, 0xac, 0x77, 0x1e, 0xfc, 0x07, 0xd3, 0x98,
+	0xee, 0x2e, 0xe9, 0xb6, 0x6f, 0xb9, 0xe7, 0xb7, 0x7d, 0xd0, 0x22, 0x61, 0xb8, 0xc5, 0x59, 0x0b,
+	0xd5, 0xd7, 0x7f, 0x20, 0xb8, 0xdd, 0xe6, 0xbd, 0xc9, 0xca, 0xad, 0xe3, 0x40, 0x3f, 0xef, 0x98,
+	0x67, 0xbd, 0x42, 0xcf, 0xd0, 0xab, 0xc0, 0x92, 0x19, 0x8f, 0x48, 0xcc, 0x3c, 0x9e, 0x32, 0x9f,
+	0xd1, 0x58, 0xff, 0x12, 0x7c, 0x13, 0x22, 0x49, 0x47, 0xfc, 0xe3, 0xbf, 0x63, 0x65, 0xe4, 0xf5,
+	0x73, 0x2e, 0x17, 0xec, 0x7c, 0xc9, 0x2d, 0x6c, 0x98, 0xcc, 0x8f, 0x68, 0x7f, 0x5b, 0xb7, 0x35,
+	0x52, 0xdf, 0x7b, 0xd9, 0xd8, 0x56, 0xd4, 0xbd, 0xa2, 0xae, 0x75, 0xe7, 0x6f, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xbb, 0x4a, 0x2c, 0x76, 0xa6, 0x06, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/worker.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/worker.pb.go
new file mode 100644
index 00000000..92b0a7bb
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2/worker.pb.go
@@ -0,0 +1,412 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/remoteworkers/v1test2/worker.proto
+
+package remoteworkers // import "google.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Describes a worker, which is a list of one or more devices and the
+// connections between them. A device could be a computer, a phone, or even an
+// accelerator like a GPU; it's up to the farm administrator to decide how to
+// model their farm. For example, if a farm only has one type of GPU, the GPU
+// could be modelled as a "has_gpu" property on its host computer; if it has
+// many subproperties itself, it might be better to model it as a separate
+// device.
+//
+// The first device in the worker is the "primary device" - that is, the device
+// running a bot and which is responsible for actually executing commands. All
+// other devices are considered to be attached devices, and must be controllable
+// by the primary device.
+//
+// This message (and all its submessages) can be used in two contexts:
+//
+// * Status: sent by the bot to report the current capabilities of the device to
+// allow reservation matching.
+// * Request: sent by a client to request a device with certain capabilities in
+// a reservation.
+//
+// Several of the fields in this message have different semantics depending on
+// which of which of these contexts it is used. These semantics are described
+// below.
+//
+// Several messages in Worker and its submessages have the concept of keys and
+// values, such as `Worker.Property` and `Device.Property`. All keys are simple
+// strings, but certain keys are "standard" keys and should be broadly supported
+// across farms and implementations; these are listed below each relevant
+// message. Bot implementations or farm admins may add *additional* keys, but
+// these SHOULD all begin with an underscore so they do not conflict with
+// standard keys that may be added in the future.
+//
+// Keys are not context sensitive.
+//
+// See http://goo.gl/NurY8g for more information on the Worker message.
+type Worker struct {
+	// A list of devices; the first device is the primary device. See the `Device`
+	// message for more information.
+	Devices []*Device `protobuf:"bytes,1,rep,name=devices,proto3" json:"devices,omitempty"`
+	// A worker may contain "global" properties. For example, certain machines
+	// might be reserved for certain types of jobs, like short-running compilation
+	// versus long-running integration tests. This property is known as a "pool"
+	// and is not related to any one device within the worker; rather, it applies
+	// to the worker as a whole.
+	//
+	// The behaviour of repeated keys is identical to that of Device.Property.
+	Properties []*Worker_Property `protobuf:"bytes,2,rep,name=properties,proto3" json:"properties,omitempty"`
+	// Bots can be configured in certain ways when accepting leases. For example,
+	// many leases are executed inside a Docker container. To support this, the
+	// bot needs to be able to report that it has Docker installed (and knows how
+	// to execute something inside a container), and the task submitter needs to
+	// specify which image should be used to start the container. Similarly, a
+	// lease may be able to run as one of several users on the worker; in such
+	// cases, the bot needs to report what users are available, and the submitter
+	// needs to choose one.
+	//
+	// Therefore, when this message is reported by the bot to the service, each
+	// key represents a *type* of configuration that the bot knows how to set,
+	// while each *value* represents a legal value for that configuration (the
+	// empty string is interpretted as a wildcard, such as for Docker images).
+	// When this message is sent by the server to the bot in the context of a
+	// lease, it represents a command to the bot to apply the setting. Keys may
+	// be repeated during reporting but not in a lease.
+	Configs              []*Worker_Config `protobuf:"bytes,3,rep,name=configs,proto3" json:"configs,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *Worker) Reset()         { *m = Worker{} }
+func (m *Worker) String() string { return proto.CompactTextString(m) }
+func (*Worker) ProtoMessage()    {}
+func (*Worker) Descriptor() ([]byte, []int) {
+	return fileDescriptor_worker_52520c784d3d1f3d, []int{0}
+}
+func (m *Worker) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Worker.Unmarshal(m, b)
+}
+func (m *Worker) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Worker.Marshal(b, m, deterministic)
+}
+func (dst *Worker) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Worker.Merge(dst, src)
+}
+func (m *Worker) XXX_Size() int {
+	return xxx_messageInfo_Worker.Size(m)
+}
+func (m *Worker) XXX_DiscardUnknown() {
+	xxx_messageInfo_Worker.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Worker proto.InternalMessageInfo
+
+func (m *Worker) GetDevices() []*Device {
+	if m != nil {
+		return m.Devices
+	}
+	return nil
+}
+
+func (m *Worker) GetProperties() []*Worker_Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+func (m *Worker) GetConfigs() []*Worker_Config {
+	if m != nil {
+		return m.Configs
+	}
+	return nil
+}
+
+// A global property; see the `properties` field for more information.
+type Worker_Property struct {
+	// For general information on keys, see the documentation to `Worker`.
+	//
+	// The current set of standard keys are:
+	//
+	// * pool: different workers can be reserved for different purposes. For
+	// example, an admin might want to segregate long-running integration tests
+	// from short-running unit tests, so unit tests will always get some
+	// throughput. To support this, the server can assign different values for
+	// `pool` (such as "itest" and "utest") to different workers, and then have
+	// jobs request workers from those pools.
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// The property's value.
+	Value                string   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Worker_Property) Reset()         { *m = Worker_Property{} }
+func (m *Worker_Property) String() string { return proto.CompactTextString(m) }
+func (*Worker_Property) ProtoMessage()    {}
+func (*Worker_Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_worker_52520c784d3d1f3d, []int{0, 0}
+}
+func (m *Worker_Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Worker_Property.Unmarshal(m, b)
+}
+func (m *Worker_Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Worker_Property.Marshal(b, m, deterministic)
+}
+func (dst *Worker_Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Worker_Property.Merge(dst, src)
+}
+func (m *Worker_Property) XXX_Size() int {
+	return xxx_messageInfo_Worker_Property.Size(m)
+}
+func (m *Worker_Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Worker_Property.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Worker_Property proto.InternalMessageInfo
+
+func (m *Worker_Property) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *Worker_Property) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+// A configuration request or report; see the `configs` field for more
+// information.
+type Worker_Config struct {
+	// For general information on keys, see the documentation to `Worker`.
+	//
+	// The current set of standard keys are:
+	//
+	// * DockerImage: the image of the container. When being reported by the
+	// bot, the empty value should always be included if the bot is able to pull
+	// its own images; the bot may optionally *also* report images that are
+	// present in its cache. When being requested in a lease, the value is the
+	// URI of the image (eg `gcr.io/user/image@sha256:hash`).
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// The configuration's value.
+	Value                string   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Worker_Config) Reset()         { *m = Worker_Config{} }
+func (m *Worker_Config) String() string { return proto.CompactTextString(m) }
+func (*Worker_Config) ProtoMessage()    {}
+func (*Worker_Config) Descriptor() ([]byte, []int) {
+	return fileDescriptor_worker_52520c784d3d1f3d, []int{0, 1}
+}
+func (m *Worker_Config) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Worker_Config.Unmarshal(m, b)
+}
+func (m *Worker_Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Worker_Config.Marshal(b, m, deterministic)
+}
+func (dst *Worker_Config) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Worker_Config.Merge(dst, src)
+}
+func (m *Worker_Config) XXX_Size() int {
+	return xxx_messageInfo_Worker_Config.Size(m)
+}
+func (m *Worker_Config) XXX_DiscardUnknown() {
+	xxx_messageInfo_Worker_Config.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Worker_Config proto.InternalMessageInfo
+
+func (m *Worker_Config) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *Worker_Config) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+// Any device, including computers, phones, accelerators (e.g. GPUs), etc. All
+// names must be unique.
+type Device struct {
+	// The handle can be thought of as the "name" of the device, and must be
+	// unique within a Worker.
+	//
+	// In the Status context, the handle should be some human-understandable name,
+	// perhaps corresponding to a label physically written on the device to make
+	// it easy to locate. In the Request context, the name should be the
+	// *logical* name expected by the task. The bot is responsible for mapping the
+	// logical name expected by the task to a machine-readable name that the task
+	// can actually use, such as a USB address. The method by which this mapping
+	// is communicated to the task is not covered in this API.
+	Handle string `protobuf:"bytes,1,opt,name=handle,proto3" json:"handle,omitempty"`
+	// Properties of this device that don't change based on the tasks that are
+	// running on it, e.g. OS, CPU architecture, etc.
+	//
+	// Keys may be repeated, and have the following interpretation:
+	//
+	//    * Status context: the device can support *any* the listed values. For
+	//    example, an "ISA" property might include "x86", "x86-64" and "sse4".
+	//
+	//    * Request context: the device *must* support *all* of the listed values.
+	Properties           []*Device_Property `protobuf:"bytes,2,rep,name=properties,proto3" json:"properties,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Device) Reset()         { *m = Device{} }
+func (m *Device) String() string { return proto.CompactTextString(m) }
+func (*Device) ProtoMessage()    {}
+func (*Device) Descriptor() ([]byte, []int) {
+	return fileDescriptor_worker_52520c784d3d1f3d, []int{1}
+}
+func (m *Device) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Device.Unmarshal(m, b)
+}
+func (m *Device) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Device.Marshal(b, m, deterministic)
+}
+func (dst *Device) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Device.Merge(dst, src)
+}
+func (m *Device) XXX_Size() int {
+	return xxx_messageInfo_Device.Size(m)
+}
+func (m *Device) XXX_DiscardUnknown() {
+	xxx_messageInfo_Device.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Device proto.InternalMessageInfo
+
+func (m *Device) GetHandle() string {
+	if m != nil {
+		return m.Handle
+	}
+	return ""
+}
+
+func (m *Device) GetProperties() []*Device_Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+// A device property; see `properties` for more information.
+type Device_Property struct {
+	// For general information on keys, see the documentation to `Worker`.
+	//
+	// The current set of standard keys are:
+	//
+	// * os: a human-readable description of the OS. Examples include `linux`,
+	// `ubuntu` and `ubuntu 14.04` (note that a bot may advertise itself as more
+	// than one). This will be replaced in the future by more well-structured
+	// keys and values to represent OS variants.
+	//
+	// * has-docker: "true" if the bot has Docker installed. This will be
+	// replaced in the future by a more structured message for Docker support.
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// The property's value.
+	Value                string   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Device_Property) Reset()         { *m = Device_Property{} }
+func (m *Device_Property) String() string { return proto.CompactTextString(m) }
+func (*Device_Property) ProtoMessage()    {}
+func (*Device_Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_worker_52520c784d3d1f3d, []int{1, 0}
+}
+func (m *Device_Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Device_Property.Unmarshal(m, b)
+}
+func (m *Device_Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Device_Property.Marshal(b, m, deterministic)
+}
+func (dst *Device_Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Device_Property.Merge(dst, src)
+}
+func (m *Device_Property) XXX_Size() int {
+	return xxx_messageInfo_Device_Property.Size(m)
+}
+func (m *Device_Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Device_Property.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Device_Property proto.InternalMessageInfo
+
+func (m *Device_Property) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *Device_Property) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Worker)(nil), "google.devtools.remoteworkers.v1test2.Worker")
+	proto.RegisterType((*Worker_Property)(nil), "google.devtools.remoteworkers.v1test2.Worker.Property")
+	proto.RegisterType((*Worker_Config)(nil), "google.devtools.remoteworkers.v1test2.Worker.Config")
+	proto.RegisterType((*Device)(nil), "google.devtools.remoteworkers.v1test2.Device")
+	proto.RegisterType((*Device_Property)(nil), "google.devtools.remoteworkers.v1test2.Device.Property")
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/remoteworkers/v1test2/worker.proto", fileDescriptor_worker_52520c784d3d1f3d)
+}
+
+var fileDescriptor_worker_52520c784d3d1f3d = []byte{
+	// 332 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xc1, 0x4a, 0xf3, 0x40,
+	0x10, 0xc7, 0x49, 0xca, 0x97, 0x7e, 0x8e, 0x17, 0x59, 0x45, 0x42, 0x4f, 0xa5, 0x50, 0xa8, 0x07,
+	0x37, 0x36, 0x8a, 0x17, 0x6f, 0xb5, 0xd0, 0x9b, 0x94, 0xa5, 0xb4, 0xe0, 0x2d, 0xb6, 0xe3, 0x1a,
+	0x9a, 0x66, 0xc2, 0x6e, 0x8c, 0xf4, 0x75, 0x3c, 0x8a, 0x6f, 0xe1, 0x83, 0xf8, 0x2a, 0xd2, 0xdd,
+	0x04, 0x0c, 0x08, 0x46, 0x3d, 0x25, 0x33, 0xe1, 0xf7, 0x9b, 0xc9, 0x9f, 0x81, 0x50, 0x12, 0xc9,
+	0x04, 0x83, 0x15, 0x16, 0x39, 0x51, 0xa2, 0x03, 0x85, 0x1b, 0xca, 0xf1, 0x89, 0xd4, 0x1a, 0x95,
+	0x0e, 0x8a, 0x61, 0x8e, 0x3a, 0x0f, 0x03, 0x5b, 0xf3, 0x4c, 0x51, 0x4e, 0xac, 0x6f, 0x19, 0x5e,
+	0x31, 0xbc, 0xc6, 0xf0, 0x92, 0xe9, 0xbd, 0xbb, 0xe0, 0x2d, 0x4c, 0x8f, 0x4d, 0xa0, 0xbd, 0xc2,
+	0x22, 0x5e, 0xa2, 0xf6, 0x9d, 0x6e, 0x6b, 0xb0, 0x1f, 0x9e, 0xf2, 0x46, 0x0e, 0x3e, 0x36, 0x94,
+	0xa8, 0x68, 0x36, 0x07, 0xc8, 0x14, 0x65, 0xa8, 0xf2, 0x18, 0xb5, 0xef, 0x1a, 0xd7, 0x65, 0x43,
+	0x97, 0xdd, 0x85, 0x4f, 0x2d, 0xbf, 0x15, 0x9f, 0x4c, 0xec, 0x06, 0xda, 0x4b, 0x4a, 0xef, 0x63,
+	0xa9, 0xfd, 0x96, 0x91, 0x5e, 0xfc, 0x4c, 0x7a, 0x6d, 0x60, 0x51, 0x49, 0x3a, 0x21, 0xfc, 0xaf,
+	0xe6, 0xb0, 0x03, 0x68, 0xad, 0x71, 0xeb, 0x3b, 0x5d, 0x67, 0xb0, 0x27, 0x76, 0xaf, 0xec, 0x08,
+	0xfe, 0x15, 0x51, 0xf2, 0x88, 0xbe, 0x6b, 0x7a, 0xb6, 0xe8, 0x9c, 0x81, 0x67, 0x35, 0x4d, 0x89,
+	0xde, 0xab, 0x03, 0x9e, 0x4d, 0x88, 0x1d, 0x83, 0xf7, 0x10, 0xa5, 0xab, 0x04, 0x4b, 0xaa, 0xac,
+	0xfe, 0x14, 0x98, 0x55, 0x7f, 0x19, 0xd8, 0x6f, 0x7e, 0x70, 0xf4, 0xe6, 0xc0, 0xc9, 0x92, 0x36,
+	0xcd, 0xa6, 0x8f, 0x0e, 0x85, 0x69, 0xdb, 0x80, 0xb5, 0x7d, 0x4c, 0x9d, 0x5b, 0x51, 0xd2, 0x92,
+	0x92, 0x28, 0x95, 0x9c, 0x94, 0x0c, 0x24, 0xa6, 0xe6, 0x30, 0x03, 0xfb, 0x29, 0xca, 0x62, 0xfd,
+	0xcd, 0x3d, 0x5f, 0xd5, 0xba, 0xcf, 0xae, 0x2b, 0x16, 0x2f, 0x6e, 0x7f, 0x62, 0xcd, 0x63, 0x2c,
+	0x66, 0x66, 0xaf, 0xda, 0x02, 0x7c, 0x3e, 0x9c, 0xed, 0xd0, 0x3b, 0xcf, 0xcc, 0x3a, 0xff, 0x08,
+	0x00, 0x00, 0xff, 0xff, 0x4e, 0x67, 0x96, 0xee, 0x3a, 0x03, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/action.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/action.pb.go
new file mode 100644
index 00000000..e76f1b73
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/action.pb.go
@@ -0,0 +1,1450 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/action.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Indicates how/where this Action was executed.
+type ExecutionStrategy int32
+
+const (
+	// The action did not indicate how it was executed.
+	ExecutionStrategy_EXECUTION_STRATEGY_UNSPECIFIED ExecutionStrategy = 0
+	// The action was executed in some other form.
+	ExecutionStrategy_OTHER_ENVIRONMENT ExecutionStrategy = 1
+	// The action used a remote build service.
+	ExecutionStrategy_REMOTE_SERVICE ExecutionStrategy = 2
+	// The action was executed locally, in parallel with other actions.
+	ExecutionStrategy_LOCAL_PARALLEL ExecutionStrategy = 3
+	// The action was executed locally, without parallelism.
+	ExecutionStrategy_LOCAL_SEQUENTIAL ExecutionStrategy = 4
+)
+
+var ExecutionStrategy_name = map[int32]string{
+	0: "EXECUTION_STRATEGY_UNSPECIFIED",
+	1: "OTHER_ENVIRONMENT",
+	2: "REMOTE_SERVICE",
+	3: "LOCAL_PARALLEL",
+	4: "LOCAL_SEQUENTIAL",
+}
+var ExecutionStrategy_value = map[string]int32{
+	"EXECUTION_STRATEGY_UNSPECIFIED": 0,
+	"OTHER_ENVIRONMENT":              1,
+	"REMOTE_SERVICE":                 2,
+	"LOCAL_PARALLEL":                 3,
+	"LOCAL_SEQUENTIAL":               4,
+}
+
+func (x ExecutionStrategy) String() string {
+	return proto.EnumName(ExecutionStrategy_name, int32(x))
+}
+func (ExecutionStrategy) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{0}
+}
+
+// Most build systems cache build results to speed up incremental builds.
+// Some also cache test results too. This indicates whether the test results
+// were found in a cache, and where that cache was located.
+type TestCaching int32
+
+const (
+	// The implicit default enum value. Should never be set.
+	TestCaching_TEST_CACHING_UNSPECIFIED TestCaching = 0
+	// The test result was found in a local cache, so it wasn't run again.
+	TestCaching_LOCAL_CACHE_HIT TestCaching = 1
+	// The test result was found in a remote cache, so it wasn't run again.
+	TestCaching_REMOTE_CACHE_HIT TestCaching = 2
+	// The test result was not found in any cache, so it had to be run again.
+	TestCaching_CACHE_MISS TestCaching = 3
+)
+
+var TestCaching_name = map[int32]string{
+	0: "TEST_CACHING_UNSPECIFIED",
+	1: "LOCAL_CACHE_HIT",
+	2: "REMOTE_CACHE_HIT",
+	3: "CACHE_MISS",
+}
+var TestCaching_value = map[string]int32{
+	"TEST_CACHING_UNSPECIFIED": 0,
+	"LOCAL_CACHE_HIT":          1,
+	"REMOTE_CACHE_HIT":         2,
+	"CACHE_MISS":               3,
+}
+
+func (x TestCaching) String() string {
+	return proto.EnumName(TestCaching_name, int32(x))
+}
+func (TestCaching) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{1}
+}
+
+// Errors in file post-processing are categorized using this enum.
+type FileProcessingErrorType int32
+
+const (
+	// Type unspecified or not listed here.
+	FileProcessingErrorType_FILE_PROCESSING_ERROR_TYPE_UNSPECIFIED FileProcessingErrorType = 0
+	// A read error occurred trying to read the file.
+	FileProcessingErrorType_GENERIC_READ_ERROR FileProcessingErrorType = 1
+	// There was an error trying to parse the file.
+	FileProcessingErrorType_GENERIC_PARSE_ERROR FileProcessingErrorType = 2
+	// File is exceeds size limit.
+	FileProcessingErrorType_FILE_TOO_LARGE FileProcessingErrorType = 3
+	// The result of parsing the file exceeded size limit.
+	FileProcessingErrorType_OUTPUT_TOO_LARGE FileProcessingErrorType = 4
+	// Read access to the file was denied by file system.
+	FileProcessingErrorType_ACCESS_DENIED FileProcessingErrorType = 5
+	// Deadline exceeded trying to read the file.
+	FileProcessingErrorType_DEADLINE_EXCEEDED FileProcessingErrorType = 6
+	// File not found.
+	FileProcessingErrorType_NOT_FOUND FileProcessingErrorType = 7
+)
+
+var FileProcessingErrorType_name = map[int32]string{
+	0: "FILE_PROCESSING_ERROR_TYPE_UNSPECIFIED",
+	1: "GENERIC_READ_ERROR",
+	2: "GENERIC_PARSE_ERROR",
+	3: "FILE_TOO_LARGE",
+	4: "OUTPUT_TOO_LARGE",
+	5: "ACCESS_DENIED",
+	6: "DEADLINE_EXCEEDED",
+	7: "NOT_FOUND",
+}
+var FileProcessingErrorType_value = map[string]int32{
+	"FILE_PROCESSING_ERROR_TYPE_UNSPECIFIED": 0,
+	"GENERIC_READ_ERROR":                     1,
+	"GENERIC_PARSE_ERROR":                    2,
+	"FILE_TOO_LARGE":                         3,
+	"OUTPUT_TOO_LARGE":                       4,
+	"ACCESS_DENIED":                          5,
+	"DEADLINE_EXCEEDED":                      6,
+	"NOT_FOUND":                              7,
+}
+
+func (x FileProcessingErrorType) String() string {
+	return proto.EnumName(FileProcessingErrorType_name, int32(x))
+}
+func (FileProcessingErrorType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{2}
+}
+
+// An action that happened as part of a configured target. This action could be
+// a build, a test, or another type of action.
+// Each parent ConfiguredTarget resource should have at least one Action as its
+// child resource before the invocation is finalized. ResultStore is a tool to
+// store build & test results. ConfiguredTarget proto by itself does not contain
+// enough fields to fully represent such results. For a simple build, at least
+// one build action is required to represent the build result.
+type Action struct {
+	// The resource name.  Its format must be:
+	// invocations/${INVOCATION_ID}/targets/${TARGET_ID}/configuredTargets/${CONFIG_ID}/actions/${ACTION_ID}
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The resource ID components that identify the Action. They must match the
+	// resource name after proper encoding.
+	Id *Action_Id `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	// The status of the action.
+	StatusAttributes *StatusAttributes `protobuf:"bytes,3,opt,name=status_attributes,json=statusAttributes,proto3" json:"status_attributes,omitempty"`
+	// The timing of the whole action. For TestActions, the start time may be
+	// before the test actually started, and the duration may last until after the
+	// test actually finished.
+	Timing *Timing `protobuf:"bytes,4,opt,name=timing,proto3" json:"timing,omitempty"`
+	// The type of the action. The type of an action may not change over the
+	// lifetime of the invocation. If one of these fields is to be set, it must be
+	// set in the CreateAction method. It may be set to an empty message that is
+	// populated in later methods or post-processing. A generic "untyped" action
+	// can be created by not setting any of these fields. An untyped action will
+	// be untyped for the lifetime of the invocation.
+	//
+	// Types that are valid to be assigned to ActionType:
+	//	*Action_BuildAction
+	//	*Action_TestAction
+	ActionType isAction_ActionType `protobuf_oneof:"action_type"`
+	// General attributes of the action.
+	ActionAttributes *ActionAttributes `protobuf:"bytes,5,opt,name=action_attributes,json=actionAttributes,proto3" json:"action_attributes,omitempty"`
+	// A list of resources that this action depended upon. May be used to provide
+	// the cause of a build failure in the case of a failed build action.
+	ActionDependencies []*Dependency `protobuf:"bytes,14,rep,name=action_dependencies,json=actionDependencies,proto3" json:"action_dependencies,omitempty"`
+	// Arbitrary name-value pairs.
+	// This is implemented as a multi-map. Multiple properties are allowed with
+	// the same key. Properties will be returned in lexicographical order by key.
+	Properties []*Property `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty"`
+	// A list of file references for action level files.
+	// The file IDs must be unique within this list. Duplicate file IDs will
+	// result in an error. Files will be returned in lexicographical order by ID.
+	// Files with the following reserved file IDs cause specific post-processing
+	// or have special handling:
+	//
+	// For build actions:
+	// stdout: The stdout of the action
+	// stderr: The stderr of the action
+	// baseline.lcov: Baseline coverage file to be parsed by the server. This
+	//     uses a stripped down implementation of the LCOV standard.
+	//     http://ltp.sourceforge.net/coverage/lcov/geninfo.1.php
+	//
+	// For test actions:
+	// test.xml: The test suite / test case data in XML format.
+	// test.log: The combined stdout and stderr of the test process.
+	// test.lcov: Coverage file to be parsed by the server. This uses a stripped
+	//     down implementation of the LCOV standard.
+	//     http://ltp.sourceforge.net/coverage/lcov/geninfo.1.php
+	Files []*File `protobuf:"bytes,8,rep,name=files,proto3" json:"files,omitempty"`
+	// Coverage data was collected while running the build or test action. This
+	// usually includes line coverage, and may also include branch coverage.
+	// For test actions, this is usually only for the source files which were
+	// actually executed by that particular action.
+	// For build actions, this is the baseline coverage, which captures the
+	// instrumented files and lines, without any lines being executed. This
+	// ensures files that are never covered at all are included.
+	Coverage *ActionCoverage `protobuf:"bytes,11,opt,name=coverage,proto3" json:"coverage,omitempty"`
+	// Summary of aggregate coverage across all files for this action in. The
+	// server populates this for you in the post-processing phase.
+	CoverageSummaries []*LanguageCoverageSummary `protobuf:"bytes,12,rep,name=coverage_summaries,json=coverageSummaries,proto3" json:"coverage_summaries,omitempty"`
+	// ResultStore will read and parse Files with reserved IDs listed above. Read
+	// and parse errors for all these Files are reported here.
+	// This is implemented as a map, with one FileProcessingErrors for each file.
+	// Typically produced when parsing Files, but may also be provided directly
+	// by clients.
+	FileProcessingErrors []*FileProcessingErrors `protobuf:"bytes,13,rep,name=file_processing_errors,json=fileProcessingErrors,proto3" json:"file_processing_errors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *Action) Reset()         { *m = Action{} }
+func (m *Action) String() string { return proto.CompactTextString(m) }
+func (*Action) ProtoMessage()    {}
+func (*Action) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{0}
+}
+func (m *Action) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Action.Unmarshal(m, b)
+}
+func (m *Action) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Action.Marshal(b, m, deterministic)
+}
+func (dst *Action) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action.Merge(dst, src)
+}
+func (m *Action) XXX_Size() int {
+	return xxx_messageInfo_Action.Size(m)
+}
+func (m *Action) XXX_DiscardUnknown() {
+	xxx_messageInfo_Action.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Action proto.InternalMessageInfo
+
+func (m *Action) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Action) GetId() *Action_Id {
+	if m != nil {
+		return m.Id
+	}
+	return nil
+}
+
+func (m *Action) GetStatusAttributes() *StatusAttributes {
+	if m != nil {
+		return m.StatusAttributes
+	}
+	return nil
+}
+
+func (m *Action) GetTiming() *Timing {
+	if m != nil {
+		return m.Timing
+	}
+	return nil
+}
+
+type isAction_ActionType interface {
+	isAction_ActionType()
+}
+
+type Action_BuildAction struct {
+	BuildAction *BuildAction `protobuf:"bytes,9,opt,name=build_action,json=buildAction,proto3,oneof"`
+}
+
+type Action_TestAction struct {
+	TestAction *TestAction `protobuf:"bytes,10,opt,name=test_action,json=testAction,proto3,oneof"`
+}
+
+func (*Action_BuildAction) isAction_ActionType() {}
+
+func (*Action_TestAction) isAction_ActionType() {}
+
+func (m *Action) GetActionType() isAction_ActionType {
+	if m != nil {
+		return m.ActionType
+	}
+	return nil
+}
+
+func (m *Action) GetBuildAction() *BuildAction {
+	if x, ok := m.GetActionType().(*Action_BuildAction); ok {
+		return x.BuildAction
+	}
+	return nil
+}
+
+func (m *Action) GetTestAction() *TestAction {
+	if x, ok := m.GetActionType().(*Action_TestAction); ok {
+		return x.TestAction
+	}
+	return nil
+}
+
+func (m *Action) GetActionAttributes() *ActionAttributes {
+	if m != nil {
+		return m.ActionAttributes
+	}
+	return nil
+}
+
+func (m *Action) GetActionDependencies() []*Dependency {
+	if m != nil {
+		return m.ActionDependencies
+	}
+	return nil
+}
+
+func (m *Action) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+func (m *Action) GetFiles() []*File {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+func (m *Action) GetCoverage() *ActionCoverage {
+	if m != nil {
+		return m.Coverage
+	}
+	return nil
+}
+
+func (m *Action) GetCoverageSummaries() []*LanguageCoverageSummary {
+	if m != nil {
+		return m.CoverageSummaries
+	}
+	return nil
+}
+
+func (m *Action) GetFileProcessingErrors() []*FileProcessingErrors {
+	if m != nil {
+		return m.FileProcessingErrors
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Action) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Action_OneofMarshaler, _Action_OneofUnmarshaler, _Action_OneofSizer, []interface{}{
+		(*Action_BuildAction)(nil),
+		(*Action_TestAction)(nil),
+	}
+}
+
+func _Action_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Action)
+	// action_type
+	switch x := m.ActionType.(type) {
+	case *Action_BuildAction:
+		b.EncodeVarint(9<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.BuildAction); err != nil {
+			return err
+		}
+	case *Action_TestAction:
+		b.EncodeVarint(10<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TestAction); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Action.ActionType has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Action_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Action)
+	switch tag {
+	case 9: // action_type.build_action
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(BuildAction)
+		err := b.DecodeMessage(msg)
+		m.ActionType = &Action_BuildAction{msg}
+		return true, err
+	case 10: // action_type.test_action
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TestAction)
+		err := b.DecodeMessage(msg)
+		m.ActionType = &Action_TestAction{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Action_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Action)
+	// action_type
+	switch x := m.ActionType.(type) {
+	case *Action_BuildAction:
+		s := proto.Size(x.BuildAction)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Action_TestAction:
+		s := proto.Size(x.TestAction)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The resource ID components that identify the Action.
+type Action_Id struct {
+	// The Invocation ID.
+	InvocationId string `protobuf:"bytes,1,opt,name=invocation_id,json=invocationId,proto3" json:"invocation_id,omitempty"`
+	// The Target ID.
+	TargetId string `protobuf:"bytes,2,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"`
+	// The Configuration ID.
+	ConfigurationId string `protobuf:"bytes,3,opt,name=configuration_id,json=configurationId,proto3" json:"configuration_id,omitempty"`
+	// The Action ID.
+	ActionId             string   `protobuf:"bytes,4,opt,name=action_id,json=actionId,proto3" json:"action_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Action_Id) Reset()         { *m = Action_Id{} }
+func (m *Action_Id) String() string { return proto.CompactTextString(m) }
+func (*Action_Id) ProtoMessage()    {}
+func (*Action_Id) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{0, 0}
+}
+func (m *Action_Id) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Action_Id.Unmarshal(m, b)
+}
+func (m *Action_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Action_Id.Marshal(b, m, deterministic)
+}
+func (dst *Action_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_Id.Merge(dst, src)
+}
+func (m *Action_Id) XXX_Size() int {
+	return xxx_messageInfo_Action_Id.Size(m)
+}
+func (m *Action_Id) XXX_DiscardUnknown() {
+	xxx_messageInfo_Action_Id.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Action_Id proto.InternalMessageInfo
+
+func (m *Action_Id) GetInvocationId() string {
+	if m != nil {
+		return m.InvocationId
+	}
+	return ""
+}
+
+func (m *Action_Id) GetTargetId() string {
+	if m != nil {
+		return m.TargetId
+	}
+	return ""
+}
+
+func (m *Action_Id) GetConfigurationId() string {
+	if m != nil {
+		return m.ConfigurationId
+	}
+	return ""
+}
+
+func (m *Action_Id) GetActionId() string {
+	if m != nil {
+		return m.ActionId
+	}
+	return ""
+}
+
+// A build action, such as building a java library.
+type BuildAction struct {
+	// The type of the action.  This is intended to be a clue as to how the output
+	// of the action should be parsed. For example "javac" for a Java compile
+	// action.
+	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	// The "primary" input artifact processed by this action.  E.g., the .cc file
+	// of a C++ compile action.  Empty string ("") if the action has no input
+	// artifacts or no "primary" input artifact.
+	PrimaryInputPath string `protobuf:"bytes,2,opt,name=primary_input_path,json=primaryInputPath,proto3" json:"primary_input_path,omitempty"`
+	// The "primary" output artifact processed by this action.  E.g., the .o file
+	// of a C++ compile action.  Empty string ("") if the action has no output
+	// artifacts or no "primary" output artifact.
+	PrimaryOutputPath    string   `protobuf:"bytes,3,opt,name=primary_output_path,json=primaryOutputPath,proto3" json:"primary_output_path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BuildAction) Reset()         { *m = BuildAction{} }
+func (m *BuildAction) String() string { return proto.CompactTextString(m) }
+func (*BuildAction) ProtoMessage()    {}
+func (*BuildAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{1}
+}
+func (m *BuildAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BuildAction.Unmarshal(m, b)
+}
+func (m *BuildAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BuildAction.Marshal(b, m, deterministic)
+}
+func (dst *BuildAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BuildAction.Merge(dst, src)
+}
+func (m *BuildAction) XXX_Size() int {
+	return xxx_messageInfo_BuildAction.Size(m)
+}
+func (m *BuildAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_BuildAction.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuildAction proto.InternalMessageInfo
+
+func (m *BuildAction) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *BuildAction) GetPrimaryInputPath() string {
+	if m != nil {
+		return m.PrimaryInputPath
+	}
+	return ""
+}
+
+func (m *BuildAction) GetPrimaryOutputPath() string {
+	if m != nil {
+		return m.PrimaryOutputPath
+	}
+	return ""
+}
+
+// A test action, such as running a JUnit4 test binary.
+type TestAction struct {
+	// Timing data for execution of the test action.
+	TestTiming *TestTiming `protobuf:"bytes,1,opt,name=test_timing,json=testTiming,proto3" json:"test_timing,omitempty"`
+	// If the test is divided up into shards to improve performance, set this to
+	// indicate which shard this test action is for. Value must be in interval
+	// [0, total_shard_count). Defaults to 0, which is appropriate if all test
+	// cases are run in the same process.
+	ShardNumber int32 `protobuf:"varint,2,opt,name=shard_number,json=shardNumber,proto3" json:"shard_number,omitempty"`
+	// If the user requested that every test be run multiple times, as is often
+	// done to measure flakiness, set this to indicate which run this test action
+	// is for. Value must be in interval [0, total_run_count). Defaults to 0,
+	// which is appropriate if multiple runs were not requested.
+	RunNumber int32 `protobuf:"varint,3,opt,name=run_number,json=runNumber,proto3" json:"run_number,omitempty"`
+	// If flaky tests are automatically retried, set this to indicate which
+	// attempt this test action is for. (e.g. 0 for the first attempt, 1 for
+	// second, and so on). Defaults to 0, which is appropriate if this is only
+	// attempt.
+	AttemptNumber int32 `protobuf:"varint,4,opt,name=attempt_number,json=attemptNumber,proto3" json:"attempt_number,omitempty"`
+	// A tree of test suites and test cases that were run by this test action.
+	// Each test case has its own status information, including stack traces.
+	// Typically produced by parsing an XML Log, but may also be provided directly
+	// by clients.
+	TestSuite *TestSuite `protobuf:"bytes,5,opt,name=test_suite,json=testSuite,proto3" json:"test_suite,omitempty"`
+	// Warnings for this test action.
+	Warnings []*TestWarning `protobuf:"bytes,8,rep,name=warnings,proto3" json:"warnings,omitempty"`
+	// Estimated memory consumption of the test action, in bytes. A default value
+	// of 0 means there is no memory consumption estimate specified.
+	EstimatedMemoryBytes int64    `protobuf:"varint,10,opt,name=estimated_memory_bytes,json=estimatedMemoryBytes,proto3" json:"estimated_memory_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestAction) Reset()         { *m = TestAction{} }
+func (m *TestAction) String() string { return proto.CompactTextString(m) }
+func (*TestAction) ProtoMessage()    {}
+func (*TestAction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{2}
+}
+func (m *TestAction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestAction.Unmarshal(m, b)
+}
+func (m *TestAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestAction.Marshal(b, m, deterministic)
+}
+func (dst *TestAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestAction.Merge(dst, src)
+}
+func (m *TestAction) XXX_Size() int {
+	return xxx_messageInfo_TestAction.Size(m)
+}
+func (m *TestAction) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestAction.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestAction proto.InternalMessageInfo
+
+func (m *TestAction) GetTestTiming() *TestTiming {
+	if m != nil {
+		return m.TestTiming
+	}
+	return nil
+}
+
+func (m *TestAction) GetShardNumber() int32 {
+	if m != nil {
+		return m.ShardNumber
+	}
+	return 0
+}
+
+func (m *TestAction) GetRunNumber() int32 {
+	if m != nil {
+		return m.RunNumber
+	}
+	return 0
+}
+
+func (m *TestAction) GetAttemptNumber() int32 {
+	if m != nil {
+		return m.AttemptNumber
+	}
+	return 0
+}
+
+func (m *TestAction) GetTestSuite() *TestSuite {
+	if m != nil {
+		return m.TestSuite
+	}
+	return nil
+}
+
+func (m *TestAction) GetWarnings() []*TestWarning {
+	if m != nil {
+		return m.Warnings
+	}
+	return nil
+}
+
+func (m *TestAction) GetEstimatedMemoryBytes() int64 {
+	if m != nil {
+		return m.EstimatedMemoryBytes
+	}
+	return 0
+}
+
+// General attributes of an action
+type ActionAttributes struct {
+	// Strategy used for executing the action.
+	ExecutionStrategy ExecutionStrategy `protobuf:"varint,1,opt,name=execution_strategy,json=executionStrategy,proto3,enum=google.devtools.resultstore.v2.ExecutionStrategy" json:"execution_strategy,omitempty"`
+	// Exit code of the process that ran the action. A non-zero value means
+	// failure.
+	ExitCode int32 `protobuf:"varint,2,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"`
+	// Where the action was run.
+	Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	// Information about the input files used in all actions under this configured
+	// target.
+	InputFileInfo        *InputFileInfo `protobuf:"bytes,4,opt,name=input_file_info,json=inputFileInfo,proto3" json:"input_file_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *ActionAttributes) Reset()         { *m = ActionAttributes{} }
+func (m *ActionAttributes) String() string { return proto.CompactTextString(m) }
+func (*ActionAttributes) ProtoMessage()    {}
+func (*ActionAttributes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{3}
+}
+func (m *ActionAttributes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ActionAttributes.Unmarshal(m, b)
+}
+func (m *ActionAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ActionAttributes.Marshal(b, m, deterministic)
+}
+func (dst *ActionAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ActionAttributes.Merge(dst, src)
+}
+func (m *ActionAttributes) XXX_Size() int {
+	return xxx_messageInfo_ActionAttributes.Size(m)
+}
+func (m *ActionAttributes) XXX_DiscardUnknown() {
+	xxx_messageInfo_ActionAttributes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ActionAttributes proto.InternalMessageInfo
+
+func (m *ActionAttributes) GetExecutionStrategy() ExecutionStrategy {
+	if m != nil {
+		return m.ExecutionStrategy
+	}
+	return ExecutionStrategy_EXECUTION_STRATEGY_UNSPECIFIED
+}
+
+func (m *ActionAttributes) GetExitCode() int32 {
+	if m != nil {
+		return m.ExitCode
+	}
+	return 0
+}
+
+func (m *ActionAttributes) GetHostname() string {
+	if m != nil {
+		return m.Hostname
+	}
+	return ""
+}
+
+func (m *ActionAttributes) GetInputFileInfo() *InputFileInfo {
+	if m != nil {
+		return m.InputFileInfo
+	}
+	return nil
+}
+
+// File count and size information for the input files to a configured target.
+type InputFileInfo struct {
+	// The number of input files (counting every file, even if a duplicate).
+	Count int64 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
+	// The number of distinct input files.
+	DistinctCount int64 `protobuf:"varint,2,opt,name=distinct_count,json=distinctCount,proto3" json:"distinct_count,omitempty"`
+	// The max number of input files allowed by the build system (counting every
+	// file, even if a duplicate).
+	CountLimit int64 `protobuf:"varint,3,opt,name=count_limit,json=countLimit,proto3" json:"count_limit,omitempty"`
+	// The total size of the distinct input files.
+	DistinctBytes int64 `protobuf:"varint,4,opt,name=distinct_bytes,json=distinctBytes,proto3" json:"distinct_bytes,omitempty"`
+	// The max allowed total size of the distinct input files.
+	DistinctByteLimit    int64    `protobuf:"varint,5,opt,name=distinct_byte_limit,json=distinctByteLimit,proto3" json:"distinct_byte_limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InputFileInfo) Reset()         { *m = InputFileInfo{} }
+func (m *InputFileInfo) String() string { return proto.CompactTextString(m) }
+func (*InputFileInfo) ProtoMessage()    {}
+func (*InputFileInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{4}
+}
+func (m *InputFileInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InputFileInfo.Unmarshal(m, b)
+}
+func (m *InputFileInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InputFileInfo.Marshal(b, m, deterministic)
+}
+func (dst *InputFileInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputFileInfo.Merge(dst, src)
+}
+func (m *InputFileInfo) XXX_Size() int {
+	return xxx_messageInfo_InputFileInfo.Size(m)
+}
+func (m *InputFileInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_InputFileInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InputFileInfo proto.InternalMessageInfo
+
+func (m *InputFileInfo) GetCount() int64 {
+	if m != nil {
+		return m.Count
+	}
+	return 0
+}
+
+func (m *InputFileInfo) GetDistinctCount() int64 {
+	if m != nil {
+		return m.DistinctCount
+	}
+	return 0
+}
+
+func (m *InputFileInfo) GetCountLimit() int64 {
+	if m != nil {
+		return m.CountLimit
+	}
+	return 0
+}
+
+func (m *InputFileInfo) GetDistinctBytes() int64 {
+	if m != nil {
+		return m.DistinctBytes
+	}
+	return 0
+}
+
+func (m *InputFileInfo) GetDistinctByteLimit() int64 {
+	if m != nil {
+		return m.DistinctByteLimit
+	}
+	return 0
+}
+
+// Timing data for tests executed locally on the machine running the build.
+type LocalTestTiming struct {
+	// Time taken by the test process, typically surrounded by a small wrapper
+	// script.
+	TestProcessDuration  *duration.Duration `protobuf:"bytes,1,opt,name=test_process_duration,json=testProcessDuration,proto3" json:"test_process_duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *LocalTestTiming) Reset()         { *m = LocalTestTiming{} }
+func (m *LocalTestTiming) String() string { return proto.CompactTextString(m) }
+func (*LocalTestTiming) ProtoMessage()    {}
+func (*LocalTestTiming) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{5}
+}
+func (m *LocalTestTiming) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocalTestTiming.Unmarshal(m, b)
+}
+func (m *LocalTestTiming) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocalTestTiming.Marshal(b, m, deterministic)
+}
+func (dst *LocalTestTiming) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalTestTiming.Merge(dst, src)
+}
+func (m *LocalTestTiming) XXX_Size() int {
+	return xxx_messageInfo_LocalTestTiming.Size(m)
+}
+func (m *LocalTestTiming) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocalTestTiming.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LocalTestTiming proto.InternalMessageInfo
+
+func (m *LocalTestTiming) GetTestProcessDuration() *duration.Duration {
+	if m != nil {
+		return m.TestProcessDuration
+	}
+	return nil
+}
+
+// Timing data for one attempt to execute a test action remotely.
+type RemoteTestAttemptTiming struct {
+	// Idle period before the test process is invoked on the remote machine.
+	QueueDuration *duration.Duration `protobuf:"bytes,1,opt,name=queue_duration,json=queueDuration,proto3" json:"queue_duration,omitempty"`
+	// Time to upload data dependencies from the local machine to the remote
+	// machine running the test, or to the distributed cache.
+	UploadDuration *duration.Duration `protobuf:"bytes,2,opt,name=upload_duration,json=uploadDuration,proto3" json:"upload_duration,omitempty"`
+	// Time to set up the remote machine.
+	// Not to be confused with setup time in
+	// xUnit test frameworks, which falls within the test_process_time.
+	MachineSetupDuration *duration.Duration `protobuf:"bytes,3,opt,name=machine_setup_duration,json=machineSetupDuration,proto3" json:"machine_setup_duration,omitempty"`
+	// Time taken by the test process, typically surrounded by a small wrapper
+	// script.
+	// For Java tests, this includes JVM setup, flag parsing, class path setup,
+	// parsing files to setup the suite, and finally running your test methods.
+	// In many cases, only a small fraction of the test process time is spent
+	// running the test methods.
+	TestProcessDuration *duration.Duration `protobuf:"bytes,4,opt,name=test_process_duration,json=testProcessDuration,proto3" json:"test_process_duration,omitempty"`
+	// Time spent retrieving test logs and any other test outputs, back to the
+	// local machine.
+	DownloadDuration     *duration.Duration `protobuf:"bytes,5,opt,name=download_duration,json=downloadDuration,proto3" json:"download_duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *RemoteTestAttemptTiming) Reset()         { *m = RemoteTestAttemptTiming{} }
+func (m *RemoteTestAttemptTiming) String() string { return proto.CompactTextString(m) }
+func (*RemoteTestAttemptTiming) ProtoMessage()    {}
+func (*RemoteTestAttemptTiming) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{6}
+}
+func (m *RemoteTestAttemptTiming) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RemoteTestAttemptTiming.Unmarshal(m, b)
+}
+func (m *RemoteTestAttemptTiming) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RemoteTestAttemptTiming.Marshal(b, m, deterministic)
+}
+func (dst *RemoteTestAttemptTiming) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoteTestAttemptTiming.Merge(dst, src)
+}
+func (m *RemoteTestAttemptTiming) XXX_Size() int {
+	return xxx_messageInfo_RemoteTestAttemptTiming.Size(m)
+}
+func (m *RemoteTestAttemptTiming) XXX_DiscardUnknown() {
+	xxx_messageInfo_RemoteTestAttemptTiming.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RemoteTestAttemptTiming proto.InternalMessageInfo
+
+func (m *RemoteTestAttemptTiming) GetQueueDuration() *duration.Duration {
+	if m != nil {
+		return m.QueueDuration
+	}
+	return nil
+}
+
+func (m *RemoteTestAttemptTiming) GetUploadDuration() *duration.Duration {
+	if m != nil {
+		return m.UploadDuration
+	}
+	return nil
+}
+
+func (m *RemoteTestAttemptTiming) GetMachineSetupDuration() *duration.Duration {
+	if m != nil {
+		return m.MachineSetupDuration
+	}
+	return nil
+}
+
+func (m *RemoteTestAttemptTiming) GetTestProcessDuration() *duration.Duration {
+	if m != nil {
+		return m.TestProcessDuration
+	}
+	return nil
+}
+
+func (m *RemoteTestAttemptTiming) GetDownloadDuration() *duration.Duration {
+	if m != nil {
+		return m.DownloadDuration
+	}
+	return nil
+}
+
+// Timing data for the part of the test execution that is done remotely.
+type RemoteTestTiming struct {
+	// Time taken locally to determine what to do.
+	LocalAnalysisDuration *duration.Duration `protobuf:"bytes,1,opt,name=local_analysis_duration,json=localAnalysisDuration,proto3" json:"local_analysis_duration,omitempty"`
+	// Normally there is only one attempt, but the system may retry on internal
+	// errors, leading to multiple attempts.
+	Attempts             []*RemoteTestAttemptTiming `protobuf:"bytes,2,rep,name=attempts,proto3" json:"attempts,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *RemoteTestTiming) Reset()         { *m = RemoteTestTiming{} }
+func (m *RemoteTestTiming) String() string { return proto.CompactTextString(m) }
+func (*RemoteTestTiming) ProtoMessage()    {}
+func (*RemoteTestTiming) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{7}
+}
+func (m *RemoteTestTiming) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RemoteTestTiming.Unmarshal(m, b)
+}
+func (m *RemoteTestTiming) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RemoteTestTiming.Marshal(b, m, deterministic)
+}
+func (dst *RemoteTestTiming) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RemoteTestTiming.Merge(dst, src)
+}
+func (m *RemoteTestTiming) XXX_Size() int {
+	return xxx_messageInfo_RemoteTestTiming.Size(m)
+}
+func (m *RemoteTestTiming) XXX_DiscardUnknown() {
+	xxx_messageInfo_RemoteTestTiming.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RemoteTestTiming proto.InternalMessageInfo
+
+func (m *RemoteTestTiming) GetLocalAnalysisDuration() *duration.Duration {
+	if m != nil {
+		return m.LocalAnalysisDuration
+	}
+	return nil
+}
+
+func (m *RemoteTestTiming) GetAttempts() []*RemoteTestAttemptTiming {
+	if m != nil {
+		return m.Attempts
+	}
+	return nil
+}
+
+// Timing data for execution of a test action. The action may be performed
+// locally, on the machine running the build, or remotely.
+type TestTiming struct {
+	// Test timing for either a local or remote execution.
+	//
+	// Types that are valid to be assigned to Location:
+	//	*TestTiming_Local
+	//	*TestTiming_Remote
+	Location isTestTiming_Location `protobuf_oneof:"location"`
+	// The amount of CPU time spent by the test process executing system calls
+	// within the kernel, as opposed to library code. Time the test process spent
+	// blocked does not count towards this figure.
+	SystemTimeDuration *duration.Duration `protobuf:"bytes,3,opt,name=system_time_duration,json=systemTimeDuration,proto3" json:"system_time_duration,omitempty"`
+	// The amount of CPU time spent by the test process executing user-mode code
+	// outside the kernel, as opposed to library code. Time the test process
+	// spent blocked does not count towards this figure. You can add user_time to
+	// system_time to get total CPU time taken by the test process.
+	UserTimeDuration *duration.Duration `protobuf:"bytes,4,opt,name=user_time_duration,json=userTimeDuration,proto3" json:"user_time_duration,omitempty"`
+	// Most build systems cache build results to speed up incremental builds.
+	// Some also cache test results too. This indicates whether the test results
+	// were found in a cache, and where that cache was located.
+	TestCaching          TestCaching `protobuf:"varint,5,opt,name=test_caching,json=testCaching,proto3,enum=google.devtools.resultstore.v2.TestCaching" json:"test_caching,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *TestTiming) Reset()         { *m = TestTiming{} }
+func (m *TestTiming) String() string { return proto.CompactTextString(m) }
+func (*TestTiming) ProtoMessage()    {}
+func (*TestTiming) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{8}
+}
+func (m *TestTiming) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestTiming.Unmarshal(m, b)
+}
+func (m *TestTiming) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestTiming.Marshal(b, m, deterministic)
+}
+func (dst *TestTiming) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestTiming.Merge(dst, src)
+}
+func (m *TestTiming) XXX_Size() int {
+	return xxx_messageInfo_TestTiming.Size(m)
+}
+func (m *TestTiming) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestTiming.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestTiming proto.InternalMessageInfo
+
+type isTestTiming_Location interface {
+	isTestTiming_Location()
+}
+
+type TestTiming_Local struct {
+	Local *LocalTestTiming `protobuf:"bytes,1,opt,name=local,proto3,oneof"`
+}
+
+type TestTiming_Remote struct {
+	Remote *RemoteTestTiming `protobuf:"bytes,2,opt,name=remote,proto3,oneof"`
+}
+
+func (*TestTiming_Local) isTestTiming_Location() {}
+
+func (*TestTiming_Remote) isTestTiming_Location() {}
+
+func (m *TestTiming) GetLocation() isTestTiming_Location {
+	if m != nil {
+		return m.Location
+	}
+	return nil
+}
+
+func (m *TestTiming) GetLocal() *LocalTestTiming {
+	if x, ok := m.GetLocation().(*TestTiming_Local); ok {
+		return x.Local
+	}
+	return nil
+}
+
+func (m *TestTiming) GetRemote() *RemoteTestTiming {
+	if x, ok := m.GetLocation().(*TestTiming_Remote); ok {
+		return x.Remote
+	}
+	return nil
+}
+
+func (m *TestTiming) GetSystemTimeDuration() *duration.Duration {
+	if m != nil {
+		return m.SystemTimeDuration
+	}
+	return nil
+}
+
+func (m *TestTiming) GetUserTimeDuration() *duration.Duration {
+	if m != nil {
+		return m.UserTimeDuration
+	}
+	return nil
+}
+
+func (m *TestTiming) GetTestCaching() TestCaching {
+	if m != nil {
+		return m.TestCaching
+	}
+	return TestCaching_TEST_CACHING_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*TestTiming) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _TestTiming_OneofMarshaler, _TestTiming_OneofUnmarshaler, _TestTiming_OneofSizer, []interface{}{
+		(*TestTiming_Local)(nil),
+		(*TestTiming_Remote)(nil),
+	}
+}
+
+func _TestTiming_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*TestTiming)
+	// location
+	switch x := m.Location.(type) {
+	case *TestTiming_Local:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Local); err != nil {
+			return err
+		}
+	case *TestTiming_Remote:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Remote); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("TestTiming.Location has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _TestTiming_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*TestTiming)
+	switch tag {
+	case 1: // location.local
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(LocalTestTiming)
+		err := b.DecodeMessage(msg)
+		m.Location = &TestTiming_Local{msg}
+		return true, err
+	case 2: // location.remote
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(RemoteTestTiming)
+		err := b.DecodeMessage(msg)
+		m.Location = &TestTiming_Remote{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _TestTiming_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*TestTiming)
+	// location
+	switch x := m.Location.(type) {
+	case *TestTiming_Local:
+		s := proto.Size(x.Local)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *TestTiming_Remote:
+		s := proto.Size(x.Remote)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// A warning from a test execution.
+type TestWarning struct {
+	// Contains the message detailing the warning.
+	WarningMessage       string   `protobuf:"bytes,1,opt,name=warning_message,json=warningMessage,proto3" json:"warning_message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestWarning) Reset()         { *m = TestWarning{} }
+func (m *TestWarning) String() string { return proto.CompactTextString(m) }
+func (*TestWarning) ProtoMessage()    {}
+func (*TestWarning) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{9}
+}
+func (m *TestWarning) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestWarning.Unmarshal(m, b)
+}
+func (m *TestWarning) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestWarning.Marshal(b, m, deterministic)
+}
+func (dst *TestWarning) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestWarning.Merge(dst, src)
+}
+func (m *TestWarning) XXX_Size() int {
+	return xxx_messageInfo_TestWarning.Size(m)
+}
+func (m *TestWarning) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestWarning.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestWarning proto.InternalMessageInfo
+
+func (m *TestWarning) GetWarningMessage() string {
+	if m != nil {
+		return m.WarningMessage
+	}
+	return ""
+}
+
+// Stores errors reading or parsing a file during post-processing.
+type FileProcessingErrors struct {
+	// The uid of the File being read or parsed.
+	FileUid string `protobuf:"bytes,1,opt,name=file_uid,json=fileUid,proto3" json:"file_uid,omitempty"`
+	// What went wrong.
+	FileProcessingErrors []*FileProcessingError `protobuf:"bytes,3,rep,name=file_processing_errors,json=fileProcessingErrors,proto3" json:"file_processing_errors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *FileProcessingErrors) Reset()         { *m = FileProcessingErrors{} }
+func (m *FileProcessingErrors) String() string { return proto.CompactTextString(m) }
+func (*FileProcessingErrors) ProtoMessage()    {}
+func (*FileProcessingErrors) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{10}
+}
+func (m *FileProcessingErrors) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileProcessingErrors.Unmarshal(m, b)
+}
+func (m *FileProcessingErrors) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileProcessingErrors.Marshal(b, m, deterministic)
+}
+func (dst *FileProcessingErrors) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileProcessingErrors.Merge(dst, src)
+}
+func (m *FileProcessingErrors) XXX_Size() int {
+	return xxx_messageInfo_FileProcessingErrors.Size(m)
+}
+func (m *FileProcessingErrors) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileProcessingErrors.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileProcessingErrors proto.InternalMessageInfo
+
+func (m *FileProcessingErrors) GetFileUid() string {
+	if m != nil {
+		return m.FileUid
+	}
+	return ""
+}
+
+func (m *FileProcessingErrors) GetFileProcessingErrors() []*FileProcessingError {
+	if m != nil {
+		return m.FileProcessingErrors
+	}
+	return nil
+}
+
+// Stores an error reading or parsing a file during post-processing.
+type FileProcessingError struct {
+	// The type of error that occurred.
+	Type FileProcessingErrorType `protobuf:"varint,1,opt,name=type,proto3,enum=google.devtools.resultstore.v2.FileProcessingErrorType" json:"type,omitempty"`
+	// Error message describing the problem.
+	Message              string   `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FileProcessingError) Reset()         { *m = FileProcessingError{} }
+func (m *FileProcessingError) String() string { return proto.CompactTextString(m) }
+func (*FileProcessingError) ProtoMessage()    {}
+func (*FileProcessingError) Descriptor() ([]byte, []int) {
+	return fileDescriptor_action_3d39b774c5b44bf6, []int{11}
+}
+func (m *FileProcessingError) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileProcessingError.Unmarshal(m, b)
+}
+func (m *FileProcessingError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileProcessingError.Marshal(b, m, deterministic)
+}
+func (dst *FileProcessingError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileProcessingError.Merge(dst, src)
+}
+func (m *FileProcessingError) XXX_Size() int {
+	return xxx_messageInfo_FileProcessingError.Size(m)
+}
+func (m *FileProcessingError) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileProcessingError.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileProcessingError proto.InternalMessageInfo
+
+func (m *FileProcessingError) GetType() FileProcessingErrorType {
+	if m != nil {
+		return m.Type
+	}
+	return FileProcessingErrorType_FILE_PROCESSING_ERROR_TYPE_UNSPECIFIED
+}
+
+func (m *FileProcessingError) GetMessage() string {
+	if m != nil {
+		return m.Message
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Action)(nil), "google.devtools.resultstore.v2.Action")
+	proto.RegisterType((*Action_Id)(nil), "google.devtools.resultstore.v2.Action.Id")
+	proto.RegisterType((*BuildAction)(nil), "google.devtools.resultstore.v2.BuildAction")
+	proto.RegisterType((*TestAction)(nil), "google.devtools.resultstore.v2.TestAction")
+	proto.RegisterType((*ActionAttributes)(nil), "google.devtools.resultstore.v2.ActionAttributes")
+	proto.RegisterType((*InputFileInfo)(nil), "google.devtools.resultstore.v2.InputFileInfo")
+	proto.RegisterType((*LocalTestTiming)(nil), "google.devtools.resultstore.v2.LocalTestTiming")
+	proto.RegisterType((*RemoteTestAttemptTiming)(nil), "google.devtools.resultstore.v2.RemoteTestAttemptTiming")
+	proto.RegisterType((*RemoteTestTiming)(nil), "google.devtools.resultstore.v2.RemoteTestTiming")
+	proto.RegisterType((*TestTiming)(nil), "google.devtools.resultstore.v2.TestTiming")
+	proto.RegisterType((*TestWarning)(nil), "google.devtools.resultstore.v2.TestWarning")
+	proto.RegisterType((*FileProcessingErrors)(nil), "google.devtools.resultstore.v2.FileProcessingErrors")
+	proto.RegisterType((*FileProcessingError)(nil), "google.devtools.resultstore.v2.FileProcessingError")
+	proto.RegisterEnum("google.devtools.resultstore.v2.ExecutionStrategy", ExecutionStrategy_name, ExecutionStrategy_value)
+	proto.RegisterEnum("google.devtools.resultstore.v2.TestCaching", TestCaching_name, TestCaching_value)
+	proto.RegisterEnum("google.devtools.resultstore.v2.FileProcessingErrorType", FileProcessingErrorType_name, FileProcessingErrorType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/action.proto", fileDescriptor_action_3d39b774c5b44bf6)
+}
+
+var fileDescriptor_action_3d39b774c5b44bf6 = []byte{
+	// 1658 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x5f, 0x6f, 0x23, 0x49,
+	0x11, 0x5f, 0xdb, 0x49, 0xd6, 0x2e, 0xc7, 0xce, 0xb8, 0x93, 0xdd, 0xf5, 0x2d, 0x70, 0x2c, 0x06,
+	0x8e, 0xdd, 0x2c, 0x67, 0x1f, 0x7b, 0x07, 0x08, 0x90, 0x10, 0x8e, 0xdd, 0x49, 0xe6, 0xd6, 0xb1,
+	0x7d, 0xed, 0xc9, 0x71, 0x07, 0x42, 0x7d, 0x13, 0x4f, 0xc7, 0x69, 0xe4, 0x99, 0xf1, 0xcd, 0xf4,
+	0xe4, 0xce, 0x12, 0x12, 0x2f, 0x48, 0x3c, 0x80, 0x78, 0xe1, 0x09, 0x89, 0x4f, 0xc2, 0x33, 0x5f,
+	0x82, 0x6f, 0x83, 0xfa, 0xcf, 0xf8, 0x1f, 0x09, 0xe3, 0xdd, 0x37, 0x77, 0xd5, 0xef, 0xf7, 0xeb,
+	0x9a, 0xea, 0xaa, 0xea, 0x96, 0xe1, 0xe5, 0x24, 0x0c, 0x27, 0x53, 0xd6, 0xf2, 0xd8, 0xad, 0x08,
+	0xc3, 0x69, 0xdc, 0x8a, 0x58, 0x9c, 0x4c, 0x45, 0x2c, 0xc2, 0x88, 0xb5, 0x6e, 0x5f, 0xb5, 0xdc,
+	0xb1, 0xe0, 0x61, 0xd0, 0x9c, 0x45, 0xa1, 0x08, 0xd1, 0xbb, 0x1a, 0xdc, 0x4c, 0xc1, 0xcd, 0x15,
+	0x70, 0xf3, 0xf6, 0xd5, 0xd3, 0x2c, 0xb1, 0x71, 0xe8, 0xfb, 0xa9, 0xd8, 0xd3, 0xf7, 0x33, 0xc1,
+	0xb7, 0x2c, 0x72, 0x27, 0xcc, 0xc0, 0x7f, 0xbc, 0x25, 0x9c, 0xc6, 0x89, 0xef, 0xbb, 0xd1, 0xdc,
+	0xd0, 0x5e, 0x64, 0xd0, 0xae, 0xf9, 0x34, 0xdd, 0xa1, 0x95, 0x01, 0x15, 0x2c, 0x16, 0x34, 0x4e,
+	0xb8, 0x48, 0x09, 0x26, 0x1d, 0x2d, 0xb5, 0xba, 0x4a, 0xae, 0x5b, 0x5e, 0x12, 0xb9, 0xcb, 0x74,
+	0x35, 0xfe, 0x51, 0x82, 0xbd, 0xb6, 0xca, 0x1f, 0x42, 0xb0, 0x13, 0xb8, 0x3e, 0xab, 0xe7, 0x9e,
+	0xe5, 0x9e, 0x97, 0x88, 0xfa, 0x8d, 0x7e, 0x06, 0x79, 0xee, 0xd5, 0xf3, 0xcf, 0x72, 0xcf, 0xcb,
+	0xaf, 0x5e, 0x34, 0xff, 0x7f, 0x6a, 0x9b, 0x5a, 0xa7, 0x69, 0x7b, 0x24, 0xcf, 0x3d, 0xf4, 0x3b,
+	0xa8, 0xc5, 0xc2, 0x15, 0x49, 0x4c, 0x5d, 0x21, 0x22, 0x7e, 0x95, 0x08, 0x16, 0xd7, 0x0b, 0x4a,
+	0xe9, 0x83, 0x2c, 0xa5, 0x91, 0x22, 0xb6, 0x17, 0x3c, 0x62, 0xc5, 0x1b, 0x16, 0xf4, 0x4b, 0xd8,
+	0x13, 0xdc, 0xe7, 0xc1, 0xa4, 0xbe, 0xa3, 0x34, 0xdf, 0xcb, 0xd2, 0x74, 0x14, 0x9a, 0x18, 0x16,
+	0x1a, 0xc2, 0xfe, 0x55, 0xc2, 0xa7, 0x1e, 0xd5, 0xd5, 0x53, 0x2f, 0x29, 0x95, 0x97, 0x59, 0x2a,
+	0x27, 0x92, 0xa3, 0x3f, 0xf4, 0xfc, 0x01, 0x29, 0x5f, 0x2d, 0x97, 0xe8, 0x02, 0xca, 0x2a, 0xfd,
+	0x46, 0x10, 0x94, 0xe0, 0x71, 0x66, 0x58, 0x2c, 0x16, 0x0b, 0x3d, 0x10, 0x8b, 0x95, 0xcc, 0x9f,
+	0x56, 0x5a, 0xcd, 0xdf, 0xee, 0x76, 0xf9, 0xd3, 0x12, 0xab, 0xf9, 0x73, 0x37, 0x2c, 0xe8, 0xb7,
+	0x70, 0x68, 0xe4, 0x3d, 0x36, 0x63, 0x81, 0xc7, 0x82, 0x31, 0x67, 0x71, 0xbd, 0xfa, 0xac, 0xb0,
+	0x4d, 0xd4, 0xdd, 0x94, 0x33, 0x27, 0x48, 0xcb, 0x74, 0x57, 0x54, 0xd0, 0x39, 0xc0, 0x2c, 0x0a,
+	0x67, 0x2c, 0x12, 0x52, 0xf3, 0xa1, 0xd2, 0x7c, 0x9e, 0xa5, 0x39, 0xd4, 0x8c, 0x39, 0x59, 0xe1,
+	0xa2, 0x9f, 0xc3, 0xae, 0x2c, 0xff, 0xb8, 0x5e, 0x54, 0x22, 0xdf, 0xcb, 0x12, 0x39, 0xe5, 0x53,
+	0x46, 0x34, 0x05, 0x7d, 0x0c, 0xc5, 0xb4, 0xe3, 0xea, 0x65, 0x95, 0xb8, 0xe6, 0x76, 0x89, 0xeb,
+	0x18, 0x16, 0x59, 0xf0, 0xd1, 0x35, 0xa0, 0x8d, 0xee, 0x95, 0x5f, 0xb6, 0xaf, 0x82, 0xfa, 0x69,
+	0x96, 0x6a, 0xcf, 0x0d, 0x26, 0x89, 0x3b, 0x61, 0xa9, 0xee, 0x48, 0xb7, 0x3f, 0xa9, 0x8d, 0xd7,
+	0x0c, 0xf2, 0x7b, 0x7f, 0x0f, 0x8f, 0x65, 0xf0, 0x74, 0x16, 0x85, 0x63, 0x16, 0xc7, 0x3c, 0x98,
+	0x50, 0x16, 0x45, 0x61, 0x14, 0xd7, 0x2b, 0x6a, 0xaf, 0x8f, 0xb6, 0x49, 0xc0, 0x70, 0x41, 0xc6,
+	0x8a, 0x4b, 0x8e, 0xae, 0xef, 0xb0, 0x3e, 0xfd, 0x5b, 0x0e, 0xf2, 0xb6, 0x87, 0xbe, 0x0b, 0x15,
+	0x1e, 0xdc, 0x86, 0x63, 0x35, 0x16, 0x28, 0xf7, 0xcc, 0x00, 0xd8, 0x5f, 0x1a, 0x6d, 0x0f, 0x7d,
+	0x03, 0x4a, 0xc2, 0x8d, 0x26, 0x4c, 0x50, 0x33, 0x0f, 0x4a, 0xa4, 0xa8, 0x0d, 0xb6, 0x87, 0x5e,
+	0x80, 0x35, 0x0e, 0x83, 0x6b, 0x3e, 0x31, 0xb3, 0x45, 0x62, 0x0a, 0x0a, 0x73, 0xb0, 0x66, 0xd7,
+	0x3a, 0xa6, 0xec, 0xb8, 0xa7, 0x3a, 0xb7, 0x44, 0x8a, 0xda, 0x60, 0x7b, 0x27, 0x15, 0x28, 0x1b,
+	0xa7, 0x98, 0xcf, 0x58, 0xe3, 0x8f, 0x50, 0x5e, 0x69, 0x37, 0x39, 0x9f, 0xa4, 0x39, 0x9d, 0x4f,
+	0xf2, 0x37, 0xfa, 0x21, 0xa0, 0x59, 0xc4, 0x65, 0x32, 0x29, 0x0f, 0x66, 0x89, 0xa0, 0x33, 0x57,
+	0xdc, 0x98, 0xf8, 0x2c, 0xe3, 0xb1, 0xa5, 0x63, 0xe8, 0x8a, 0x1b, 0xd4, 0x84, 0xc3, 0x14, 0x1d,
+	0x26, 0x62, 0x01, 0xd7, 0xa1, 0xd6, 0x8c, 0x6b, 0xa0, 0x3c, 0x12, 0xdf, 0xf8, 0x4b, 0x01, 0x60,
+	0xd9, 0x9f, 0xe8, 0xb5, 0x69, 0x70, 0x33, 0x77, 0x72, 0xdb, 0x37, 0xb8, 0x99, 0x3d, 0xaa, 0xbd,
+	0xf5, 0x6f, 0xf4, 0x1d, 0xd8, 0x8f, 0x6f, 0xdc, 0xc8, 0xa3, 0x41, 0xe2, 0x5f, 0xb1, 0x48, 0xc5,
+	0xbc, 0x4b, 0xca, 0xca, 0xd6, 0x57, 0x26, 0xf4, 0x2d, 0x80, 0x28, 0x09, 0x52, 0x40, 0x41, 0x01,
+	0x4a, 0x51, 0x12, 0x18, 0xf7, 0xf7, 0xa1, 0xea, 0x0a, 0xc1, 0xfc, 0x99, 0x48, 0x21, 0x3b, 0x0a,
+	0x52, 0x31, 0x56, 0x03, 0x3b, 0x07, 0x58, 0xde, 0x0a, 0x66, 0x80, 0xbc, 0xd8, 0x26, 0xe8, 0x91,
+	0x24, 0x90, 0x92, 0x48, 0x7f, 0xa2, 0x33, 0x28, 0x7e, 0xe5, 0x46, 0x01, 0x0f, 0x26, 0x69, 0x3b,
+	0xbe, 0xdc, 0x46, 0xe7, 0xd7, 0x9a, 0x43, 0x16, 0x64, 0xf4, 0x11, 0x3c, 0x66, 0xb1, 0xe0, 0xbe,
+	0x2b, 0x98, 0x47, 0x7d, 0xe6, 0x87, 0xd1, 0x9c, 0x5e, 0xcd, 0xe5, 0x7c, 0x93, 0x43, 0xb3, 0x40,
+	0x8e, 0x16, 0xde, 0x0b, 0xe5, 0x3c, 0x91, 0xbe, 0xc6, 0x9f, 0xf2, 0x60, 0x6d, 0x0e, 0x36, 0xf4,
+	0x05, 0x20, 0xf6, 0x35, 0x1b, 0x27, 0xaa, 0x6a, 0x62, 0x11, 0xb9, 0x82, 0x4d, 0xe6, 0xea, 0x68,
+	0xaa, 0xaf, 0x7e, 0x94, 0x15, 0x1d, 0x4e, 0x99, 0x23, 0x43, 0x24, 0x35, 0xb6, 0x69, 0x92, 0x15,
+	0xcb, 0xbe, 0xe6, 0x82, 0x8e, 0x43, 0x8f, 0x99, 0x53, 0x2a, 0x4a, 0x43, 0x27, 0xf4, 0x18, 0x7a,
+	0x0a, 0xc5, 0x9b, 0x30, 0x16, 0xea, 0xde, 0xd4, 0x65, 0xb4, 0x58, 0xa3, 0x4b, 0x38, 0xd0, 0x35,
+	0xa9, 0x1a, 0x9a, 0x07, 0xd7, 0xa1, 0xb9, 0xaa, 0xde, 0xcf, 0x8a, 0x4b, 0x55, 0xac, 0x6c, 0x64,
+	0x3b, 0xb8, 0x0e, 0x49, 0x85, 0xaf, 0x2e, 0x1b, 0xff, 0xce, 0x41, 0x65, 0x0d, 0x80, 0x8e, 0x60,
+	0x77, 0x1c, 0x26, 0x81, 0x50, 0x9f, 0x5d, 0x20, 0x7a, 0x21, 0xcb, 0xc3, 0xe3, 0xb1, 0xe0, 0xc1,
+	0x58, 0xc6, 0x2e, 0xdd, 0x79, 0xe5, 0xae, 0xa4, 0xd6, 0x8e, 0x82, 0x7d, 0x1b, 0xca, 0xca, 0x4b,
+	0xa7, 0xdc, 0xe7, 0x42, 0x7d, 0x44, 0x81, 0x80, 0x32, 0xf5, 0xa4, 0x65, 0x4d, 0x47, 0x1f, 0xd2,
+	0xce, 0xba, 0x8e, 0x3a, 0x1d, 0xd9, 0x5b, 0x6b, 0x30, 0xa3, 0xb7, 0xab, 0xb0, 0xb5, 0x55, 0xac,
+	0x92, 0x6d, 0x7c, 0x01, 0x07, 0xbd, 0x70, 0xec, 0x4e, 0x97, 0xed, 0x81, 0x2e, 0xe0, 0x91, 0xaa,
+	0x54, 0x33, 0xfb, 0x68, 0xfa, 0x54, 0x31, 0x9d, 0xf6, 0x4e, 0x9a, 0xb6, 0xf4, 0x2d, 0xd3, 0xec,
+	0x1a, 0x00, 0x39, 0x94, 0x3c, 0x33, 0xdf, 0x52, 0x63, 0xe3, 0xcf, 0x05, 0x78, 0x42, 0x98, 0x1f,
+	0x0a, 0xa6, 0x7a, 0x58, 0x37, 0x85, 0xd9, 0xea, 0x57, 0x50, 0xfd, 0x32, 0x61, 0x09, 0x7b, 0x83,
+	0x3d, 0x2a, 0x8a, 0x90, 0x2e, 0xd1, 0x09, 0x1c, 0x24, 0xb3, 0x69, 0xe8, 0x7a, 0x4b, 0x89, 0x7c,
+	0x96, 0x44, 0x55, 0x33, 0x16, 0x1a, 0x03, 0x78, 0xec, 0xbb, 0xe3, 0x1b, 0x1e, 0x30, 0x1a, 0x33,
+	0x91, 0xcc, 0x96, 0x52, 0x85, 0x2c, 0xa9, 0x23, 0x43, 0x1c, 0x49, 0xde, 0x42, 0xf0, 0xde, 0x0c,
+	0xee, 0xbc, 0x4d, 0x06, 0xd1, 0x29, 0xd4, 0xbc, 0xf0, 0xab, 0x60, 0xfd, 0x2b, 0x77, 0xb3, 0xa4,
+	0xac, 0x94, 0xb3, 0x38, 0x89, 0x7f, 0xe5, 0xc0, 0x5a, 0x9e, 0x84, 0x39, 0x82, 0x4f, 0xe0, 0xc9,
+	0x54, 0x16, 0x00, 0x75, 0x03, 0x77, 0x3a, 0x8f, 0xf9, 0x9b, 0x9c, 0xf7, 0x23, 0xc5, 0x6c, 0x1b,
+	0xe2, 0x22, 0xde, 0x11, 0x14, 0xcd, 0xec, 0x8b, 0xeb, 0xf9, 0xed, 0xae, 0xe6, 0x7b, 0x0a, 0x84,
+	0x2c, 0x84, 0x1a, 0x7f, 0x37, 0x97, 0x80, 0x09, 0xfb, 0x0c, 0x76, 0xd5, 0xe6, 0x26, 0xc8, 0x56,
+	0xe6, 0xdd, 0xbf, 0x5e, 0xe4, 0xe7, 0x0f, 0x88, 0xe6, 0xa3, 0x8f, 0x61, 0x2f, 0x52, 0x9b, 0x9b,
+	0xba, 0xf9, 0x60, 0xfb, 0x50, 0x17, 0x52, 0x46, 0x01, 0xbd, 0x86, 0xa3, 0x78, 0x1e, 0x0b, 0xe6,
+	0xcb, 0xbb, 0x89, 0xbd, 0x41, 0x19, 0x21, 0x4d, 0x73, 0xb8, 0xbf, 0xac, 0xec, 0x33, 0x40, 0x49,
+	0xcc, 0xa2, 0x0d, 0xa9, 0xcc, 0x0a, 0xb2, 0x24, 0x69, 0x4d, 0xa8, 0x0f, 0xfb, 0xaa, 0x1a, 0xc7,
+	0xaa, 0x54, 0x27, 0xaa, 0x72, 0xaa, 0xdb, 0xdd, 0x19, 0x1d, 0x4d, 0x21, 0xea, 0xc2, 0x35, 0x8b,
+	0x13, 0x80, 0xe2, 0xd4, 0xbc, 0x48, 0x1a, 0x3f, 0x81, 0xf2, 0xca, 0xdd, 0x82, 0x7e, 0x00, 0x07,
+	0xe6, 0x76, 0xa1, 0x3e, 0x8b, 0x63, 0xf9, 0xe2, 0xd3, 0xcf, 0x84, 0xaa, 0x31, 0x5f, 0x68, 0x6b,
+	0xe3, 0x9f, 0x39, 0x38, 0xba, 0xeb, 0x89, 0x84, 0xde, 0x81, 0xa2, 0x9a, 0xd3, 0xc9, 0xe2, 0x01,
+	0xf4, 0x50, 0xae, 0x2f, 0xb9, 0x87, 0xf8, 0xbd, 0x6f, 0xb2, 0x82, 0x2a, 0xb2, 0x0f, 0xdf, 0xe2,
+	0x4d, 0x76, 0xf7, 0x93, 0xac, 0xf1, 0x07, 0x38, 0xbc, 0x03, 0x8c, 0x5e, 0xaf, 0x3c, 0x7d, 0xaa,
+	0xd9, 0x45, 0x7d, 0x87, 0x84, 0x33, 0x9f, 0x31, 0xf3, 0x66, 0xaa, 0xc3, 0xc3, 0x34, 0x47, 0xfa,
+	0xa1, 0x94, 0x2e, 0x8f, 0xff, 0x9a, 0x83, 0xda, 0xff, 0xdc, 0x89, 0xa8, 0x01, 0xef, 0xe2, 0xcf,
+	0x70, 0xe7, 0xd2, 0xb1, 0x07, 0x7d, 0x3a, 0x72, 0x48, 0xdb, 0xc1, 0x67, 0x9f, 0xd3, 0xcb, 0xfe,
+	0x68, 0x88, 0x3b, 0xf6, 0xa9, 0x8d, 0xbb, 0xd6, 0x03, 0xf4, 0x08, 0x6a, 0x03, 0xe7, 0x1c, 0x13,
+	0x8a, 0xfb, 0x9f, 0xda, 0x64, 0xd0, 0xbf, 0xc0, 0x7d, 0xc7, 0xca, 0x21, 0x04, 0x55, 0x82, 0x2f,
+	0x06, 0x0e, 0xa6, 0x23, 0x4c, 0x3e, 0xb5, 0x3b, 0xd8, 0xca, 0x4b, 0x5b, 0x6f, 0xd0, 0x69, 0xf7,
+	0xe8, 0xb0, 0x4d, 0xda, 0xbd, 0x1e, 0xee, 0x59, 0x05, 0x74, 0x04, 0x96, 0xb6, 0x8d, 0xf0, 0x27,
+	0x97, 0xb8, 0xef, 0xd8, 0xed, 0x9e, 0xb5, 0x73, 0x7c, 0xad, 0xcf, 0xd8, 0x1c, 0x3f, 0xfa, 0x26,
+	0xd4, 0x1d, 0x3c, 0x72, 0x68, 0xa7, 0xdd, 0x39, 0xb7, 0xfb, 0x67, 0x1b, 0x11, 0x1c, 0xc2, 0x81,
+	0x96, 0x90, 0x6e, 0x4c, 0xcf, 0x6d, 0xb9, 0xff, 0x11, 0x58, 0x66, 0xff, 0xa5, 0x35, 0x8f, 0xaa,
+	0x00, 0x7a, 0x79, 0x61, 0x8f, 0x46, 0x56, 0xe1, 0xf8, 0x3f, 0x39, 0x78, 0x72, 0x4f, 0xca, 0xd0,
+	0x31, 0xbc, 0x77, 0x6a, 0xf7, 0x30, 0x1d, 0x92, 0x41, 0x07, 0x8f, 0x46, 0x72, 0x5f, 0x4c, 0xc8,
+	0x80, 0x50, 0xe7, 0xf3, 0x21, 0xde, 0x08, 0xe1, 0x31, 0xa0, 0x33, 0xdc, 0xc7, 0xc4, 0xee, 0x50,
+	0x82, 0xdb, 0x5d, 0x0d, 0xb4, 0x72, 0xe8, 0x09, 0x1c, 0xa6, 0xf6, 0x61, 0x9b, 0x8c, 0xb0, 0x71,
+	0xa8, 0x54, 0x28, 0x71, 0x67, 0x30, 0xa0, 0xbd, 0x36, 0x39, 0xc3, 0x3a, 0x15, 0x83, 0x4b, 0x67,
+	0x78, 0xe9, 0xac, 0x58, 0x77, 0x50, 0x0d, 0x2a, 0xed, 0x8e, 0x0c, 0x80, 0x76, 0x71, 0x5f, 0xee,
+	0xb6, 0x2b, 0x53, 0xde, 0xc5, 0xed, 0x6e, 0xcf, 0xee, 0x63, 0x8a, 0x3f, 0xeb, 0x60, 0xdc, 0xc5,
+	0x5d, 0x6b, 0x0f, 0x55, 0xa0, 0xd4, 0x1f, 0x38, 0xf4, 0x74, 0x70, 0xd9, 0xef, 0x5a, 0x0f, 0x4f,
+	0xbe, 0x84, 0xc6, 0x38, 0xf4, 0x33, 0x0a, 0x66, 0x98, 0xfb, 0x8d, 0x6d, 0x10, 0x93, 0x70, 0xea,
+	0x06, 0x93, 0x66, 0x18, 0x4d, 0x5a, 0x13, 0x16, 0xa8, 0x2e, 0x37, 0xff, 0x39, 0xb8, 0x33, 0x1e,
+	0xdf, 0xf7, 0xbf, 0xc3, 0x2f, 0x56, 0x96, 0x57, 0x7b, 0x8a, 0xf5, 0xe1, 0x7f, 0x03, 0x00, 0x00,
+	0xff, 0xff, 0xef, 0xcf, 0x51, 0x38, 0xb7, 0x11, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/common.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/common.pb.go
new file mode 100644
index 00000000..474db879
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/common.pb.go
@@ -0,0 +1,592 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/common.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// These correspond to the prefix of the rule name. Eg cc_test has language CC.
+type Language int32
+
+const (
+	// Language unspecified or not listed here.
+	Language_LANGUAGE_UNSPECIFIED Language = 0
+	// Not related to any particular language
+	Language_NONE Language = 1
+	// Android
+	Language_ANDROID Language = 2
+	// ActionScript (Flash)
+	Language_AS Language = 3
+	// C++ or C
+	Language_CC Language = 4
+	// Cascading-Style-Sheets
+	Language_CSS Language = 5
+	// Dart
+	Language_DART Language = 6
+	// Go
+	Language_GO Language = 7
+	// Google-Web-Toolkit
+	Language_GWT Language = 8
+	// Haskell
+	Language_HASKELL Language = 9
+	// Java
+	Language_JAVA Language = 10
+	// Javascript
+	Language_JS Language = 11
+	// Lisp
+	Language_LISP Language = 12
+	// Objective-C
+	Language_OBJC Language = 13
+	// Python
+	Language_PY Language = 14
+	// Shell (Typically Bash)
+	Language_SH Language = 15
+	// Swift
+	Language_SWIFT Language = 16
+	// Typescript
+	Language_TS Language = 18
+	// Webtesting
+	Language_WEB Language = 19
+)
+
+var Language_name = map[int32]string{
+	0:  "LANGUAGE_UNSPECIFIED",
+	1:  "NONE",
+	2:  "ANDROID",
+	3:  "AS",
+	4:  "CC",
+	5:  "CSS",
+	6:  "DART",
+	7:  "GO",
+	8:  "GWT",
+	9:  "HASKELL",
+	10: "JAVA",
+	11: "JS",
+	12: "LISP",
+	13: "OBJC",
+	14: "PY",
+	15: "SH",
+	16: "SWIFT",
+	18: "TS",
+	19: "WEB",
+}
+var Language_value = map[string]int32{
+	"LANGUAGE_UNSPECIFIED": 0,
+	"NONE":                 1,
+	"ANDROID":              2,
+	"AS":                   3,
+	"CC":                   4,
+	"CSS":                  5,
+	"DART":                 6,
+	"GO":                   7,
+	"GWT":                  8,
+	"HASKELL":              9,
+	"JAVA":                 10,
+	"JS":                   11,
+	"LISP":                 12,
+	"OBJC":                 13,
+	"PY":                   14,
+	"SH":                   15,
+	"SWIFT":                16,
+	"TS":                   18,
+	"WEB":                  19,
+}
+
+func (x Language) String() string {
+	return proto.EnumName(Language_name, int32(x))
+}
+func (Language) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_2f402f211e3e1d93, []int{0}
+}
+
+// Status of a resource.
+type Status int32
+
+const (
+	// The implicit default enum value. Should never be set.
+	Status_STATUS_UNSPECIFIED Status = 0
+	// Displays as "Building". Means the target is compiling, linking, etc.
+	Status_BUILDING Status = 1
+	// Displays as "Built". Means the target was built successfully.
+	// If testing was requested, it should never reach this status: it should go
+	// straight from BUILDING to TESTING.
+	Status_BUILT Status = 2
+	// Displays as "Broken". Means build failure such as compile error.
+	Status_FAILED_TO_BUILD Status = 3
+	// Displays as "Testing". Means the test is running.
+	Status_TESTING Status = 4
+	// Displays as "Passed". Means the test was run and passed.
+	Status_PASSED Status = 5
+	// Displays as "Failed". Means the test was run and failed.
+	Status_FAILED Status = 6
+	// Displays as "Timed out". Means the test didn't finish in time.
+	Status_TIMED_OUT Status = 7
+	// Displays as "Cancelled". Means the build or test was cancelled.
+	// E.g. User hit control-C.
+	Status_CANCELLED Status = 8
+	// Displays as "Tool Failed". Means the build or test had internal tool
+	// failure.
+	Status_TOOL_FAILED Status = 9
+	// Displays as "Incomplete". Means the build or test did not complete.  This
+	// might happen when a build breakage or test failure causes the tool to stop
+	// trying to build anything more or run any more tests, with the default
+	// bazel --nokeep_going option or the --notest_keep_going option.
+	Status_INCOMPLETE Status = 10
+	// Displays as "Flaky". Means the aggregate status contains some runs that
+	// were successful, and some that were not.
+	Status_FLAKY Status = 11
+	// Displays as "Unknown". Means the tool uploading to the server died
+	// mid-upload or does not know the state.
+	Status_UNKNOWN Status = 12
+	// Displays as "Skipped". Means building and testing were skipped.
+	// (E.g. Restricted to a different configuration.)
+	Status_SKIPPED Status = 13
+)
+
+var Status_name = map[int32]string{
+	0:  "STATUS_UNSPECIFIED",
+	1:  "BUILDING",
+	2:  "BUILT",
+	3:  "FAILED_TO_BUILD",
+	4:  "TESTING",
+	5:  "PASSED",
+	6:  "FAILED",
+	7:  "TIMED_OUT",
+	8:  "CANCELLED",
+	9:  "TOOL_FAILED",
+	10: "INCOMPLETE",
+	11: "FLAKY",
+	12: "UNKNOWN",
+	13: "SKIPPED",
+}
+var Status_value = map[string]int32{
+	"STATUS_UNSPECIFIED": 0,
+	"BUILDING":           1,
+	"BUILT":              2,
+	"FAILED_TO_BUILD":    3,
+	"TESTING":            4,
+	"PASSED":             5,
+	"FAILED":             6,
+	"TIMED_OUT":          7,
+	"CANCELLED":          8,
+	"TOOL_FAILED":        9,
+	"INCOMPLETE":         10,
+	"FLAKY":              11,
+	"UNKNOWN":            12,
+	"SKIPPED":            13,
+}
+
+func (x Status) String() string {
+	return proto.EnumName(Status_name, int32(x))
+}
+func (Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_2f402f211e3e1d93, []int{1}
+}
+
+// Describes the status of a resource in both enum and string form.
+// Only use description when conveying additional info not captured in the enum
+// name.
+type StatusAttributes struct {
+	// Enum representation of the status.
+	Status Status `protobuf:"varint,1,opt,name=status,proto3,enum=google.devtools.resultstore.v2.Status" json:"status,omitempty"`
+	// A longer description about the status.
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StatusAttributes) Reset()         { *m = StatusAttributes{} }
+func (m *StatusAttributes) String() string { return proto.CompactTextString(m) }
+func (*StatusAttributes) ProtoMessage()    {}
+func (*StatusAttributes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_2f402f211e3e1d93, []int{0}
+}
+func (m *StatusAttributes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StatusAttributes.Unmarshal(m, b)
+}
+func (m *StatusAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StatusAttributes.Marshal(b, m, deterministic)
+}
+func (dst *StatusAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatusAttributes.Merge(dst, src)
+}
+func (m *StatusAttributes) XXX_Size() int {
+	return xxx_messageInfo_StatusAttributes.Size(m)
+}
+func (m *StatusAttributes) XXX_DiscardUnknown() {
+	xxx_messageInfo_StatusAttributes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StatusAttributes proto.InternalMessageInfo
+
+func (m *StatusAttributes) GetStatus() Status {
+	if m != nil {
+		return m.Status
+	}
+	return Status_STATUS_UNSPECIFIED
+}
+
+func (m *StatusAttributes) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+// A generic key-value property definition.
+type Property struct {
+	// The key.
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// The value.
+	Value                string   `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Property) Reset()         { *m = Property{} }
+func (m *Property) String() string { return proto.CompactTextString(m) }
+func (*Property) ProtoMessage()    {}
+func (*Property) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_2f402f211e3e1d93, []int{1}
+}
+func (m *Property) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Property.Unmarshal(m, b)
+}
+func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
+}
+func (dst *Property) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Property.Merge(dst, src)
+}
+func (m *Property) XXX_Size() int {
+	return xxx_messageInfo_Property.Size(m)
+}
+func (m *Property) XXX_DiscardUnknown() {
+	xxx_messageInfo_Property.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Property proto.InternalMessageInfo
+
+func (m *Property) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *Property) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+// The timing of a particular Invocation, Action, etc. The start_time is
+// specified, stop time can be calculated by adding duration to start_time.
+type Timing struct {
+	// The time the resource started running. This is in UTC Epoch time.
+	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// The duration for which the resource ran.
+	Duration             *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Timing) Reset()         { *m = Timing{} }
+func (m *Timing) String() string { return proto.CompactTextString(m) }
+func (*Timing) ProtoMessage()    {}
+func (*Timing) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_2f402f211e3e1d93, []int{2}
+}
+func (m *Timing) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Timing.Unmarshal(m, b)
+}
+func (m *Timing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Timing.Marshal(b, m, deterministic)
+}
+func (dst *Timing) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Timing.Merge(dst, src)
+}
+func (m *Timing) XXX_Size() int {
+	return xxx_messageInfo_Timing.Size(m)
+}
+func (m *Timing) XXX_DiscardUnknown() {
+	xxx_messageInfo_Timing.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Timing proto.InternalMessageInfo
+
+func (m *Timing) GetStartTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.StartTime
+	}
+	return nil
+}
+
+func (m *Timing) GetDuration() *duration.Duration {
+	if m != nil {
+		return m.Duration
+	}
+	return nil
+}
+
+// Represents a dependency of a resource on another resource. This can be used
+// to define a graph or a workflow paradigm through resources.
+type Dependency struct {
+	// The resource depended upon. It may be a Target, ConfiguredTarget, or
+	// Action.
+	//
+	// Types that are valid to be assigned to Resource:
+	//	*Dependency_Target
+	//	*Dependency_ConfiguredTarget
+	//	*Dependency_Action
+	Resource isDependency_Resource `protobuf_oneof:"resource"`
+	// A label describing this dependency.
+	// The label "Root Cause" is handled specially. It is used to point to the
+	// exact resource that caused a resource to fail.
+	Label                string   `protobuf:"bytes,4,opt,name=label,proto3" json:"label,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Dependency) Reset()         { *m = Dependency{} }
+func (m *Dependency) String() string { return proto.CompactTextString(m) }
+func (*Dependency) ProtoMessage()    {}
+func (*Dependency) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_2f402f211e3e1d93, []int{3}
+}
+func (m *Dependency) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Dependency.Unmarshal(m, b)
+}
+func (m *Dependency) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Dependency.Marshal(b, m, deterministic)
+}
+func (dst *Dependency) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dependency.Merge(dst, src)
+}
+func (m *Dependency) XXX_Size() int {
+	return xxx_messageInfo_Dependency.Size(m)
+}
+func (m *Dependency) XXX_DiscardUnknown() {
+	xxx_messageInfo_Dependency.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Dependency proto.InternalMessageInfo
+
+type isDependency_Resource interface {
+	isDependency_Resource()
+}
+
+type Dependency_Target struct {
+	Target string `protobuf:"bytes,1,opt,name=target,proto3,oneof"`
+}
+
+type Dependency_ConfiguredTarget struct {
+	ConfiguredTarget string `protobuf:"bytes,2,opt,name=configured_target,json=configuredTarget,proto3,oneof"`
+}
+
+type Dependency_Action struct {
+	Action string `protobuf:"bytes,3,opt,name=action,proto3,oneof"`
+}
+
+func (*Dependency_Target) isDependency_Resource() {}
+
+func (*Dependency_ConfiguredTarget) isDependency_Resource() {}
+
+func (*Dependency_Action) isDependency_Resource() {}
+
+func (m *Dependency) GetResource() isDependency_Resource {
+	if m != nil {
+		return m.Resource
+	}
+	return nil
+}
+
+func (m *Dependency) GetTarget() string {
+	if x, ok := m.GetResource().(*Dependency_Target); ok {
+		return x.Target
+	}
+	return ""
+}
+
+func (m *Dependency) GetConfiguredTarget() string {
+	if x, ok := m.GetResource().(*Dependency_ConfiguredTarget); ok {
+		return x.ConfiguredTarget
+	}
+	return ""
+}
+
+func (m *Dependency) GetAction() string {
+	if x, ok := m.GetResource().(*Dependency_Action); ok {
+		return x.Action
+	}
+	return ""
+}
+
+func (m *Dependency) GetLabel() string {
+	if m != nil {
+		return m.Label
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Dependency) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Dependency_OneofMarshaler, _Dependency_OneofUnmarshaler, _Dependency_OneofSizer, []interface{}{
+		(*Dependency_Target)(nil),
+		(*Dependency_ConfiguredTarget)(nil),
+		(*Dependency_Action)(nil),
+	}
+}
+
+func _Dependency_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Dependency)
+	// resource
+	switch x := m.Resource.(type) {
+	case *Dependency_Target:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Target)
+	case *Dependency_ConfiguredTarget:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.ConfiguredTarget)
+	case *Dependency_Action:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Action)
+	case nil:
+	default:
+		return fmt.Errorf("Dependency.Resource has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Dependency_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Dependency)
+	switch tag {
+	case 1: // resource.target
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Resource = &Dependency_Target{x}
+		return true, err
+	case 2: // resource.configured_target
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Resource = &Dependency_ConfiguredTarget{x}
+		return true, err
+	case 3: // resource.action
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Resource = &Dependency_Action{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Dependency_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Dependency)
+	// resource
+	switch x := m.Resource.(type) {
+	case *Dependency_Target:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Target)))
+		n += len(x.Target)
+	case *Dependency_ConfiguredTarget:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.ConfiguredTarget)))
+		n += len(x.ConfiguredTarget)
+	case *Dependency_Action:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Action)))
+		n += len(x.Action)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+func init() {
+	proto.RegisterType((*StatusAttributes)(nil), "google.devtools.resultstore.v2.StatusAttributes")
+	proto.RegisterType((*Property)(nil), "google.devtools.resultstore.v2.Property")
+	proto.RegisterType((*Timing)(nil), "google.devtools.resultstore.v2.Timing")
+	proto.RegisterType((*Dependency)(nil), "google.devtools.resultstore.v2.Dependency")
+	proto.RegisterEnum("google.devtools.resultstore.v2.Language", Language_name, Language_value)
+	proto.RegisterEnum("google.devtools.resultstore.v2.Status", Status_name, Status_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/common.proto", fileDescriptor_common_2f402f211e3e1d93)
+}
+
+var fileDescriptor_common_2f402f211e3e1d93 = []byte{
+	// 690 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xcd, 0x8e, 0xe3, 0x44,
+	0x10, 0xc7, 0xd7, 0xf9, 0x70, 0x9c, 0xca, 0x7c, 0x14, 0xbd, 0x2b, 0x14, 0xe6, 0x00, 0xa3, 0x1c,
+	0xd0, 0x6a, 0x11, 0xb6, 0x14, 0xc4, 0x01, 0x21, 0x21, 0x39, 0xb6, 0x93, 0xf1, 0xc4, 0x6b, 0x5b,
+	0xee, 0x0e, 0xd1, 0x72, 0x89, 0x9c, 0xa4, 0xd7, 0xb2, 0x48, 0xec, 0x60, 0xb7, 0x23, 0x0d, 0x6f,
+	0xc1, 0x8b, 0x71, 0xe5, 0x75, 0x50, 0xdb, 0x0e, 0x8c, 0x06, 0x01, 0xa7, 0xee, 0x7f, 0xfd, 0x7f,
+	0x55, 0x5d, 0xd5, 0x6a, 0x1b, 0xbe, 0x4a, 0xf2, 0x3c, 0x39, 0x70, 0x63, 0xcf, 0xcf, 0x22, 0xcf,
+	0x0f, 0xa5, 0x51, 0xf0, 0xb2, 0x3a, 0x88, 0x52, 0xe4, 0x05, 0x37, 0xce, 0x53, 0x63, 0x97, 0x1f,
+	0x8f, 0x79, 0xa6, 0x9f, 0x8a, 0x5c, 0xe4, 0xe4, 0xf3, 0x06, 0xd6, 0x2f, 0xb0, 0xfe, 0x0c, 0xd6,
+	0xcf, 0xd3, 0xbb, 0xd6, 0x37, 0x6a, 0x7a, 0x5b, 0x7d, 0x34, 0xf6, 0x55, 0x11, 0x8b, 0xf4, 0x92,
+	0x7f, 0xf7, 0xc5, 0x4b, 0x5f, 0xa4, 0x47, 0x5e, 0x8a, 0xf8, 0x78, 0x6a, 0x80, 0x89, 0x00, 0xa4,
+	0x22, 0x16, 0x55, 0x69, 0x0a, 0x51, 0xa4, 0xdb, 0x4a, 0xf0, 0x92, 0xfc, 0x00, 0x6a, 0x59, 0xc7,
+	0xc6, 0xca, 0xbd, 0xf2, 0xf6, 0x66, 0xfa, 0xa5, 0xfe, 0xdf, 0x5d, 0xe8, 0x4d, 0x85, 0xa8, 0xcd,
+	0x22, 0xf7, 0x30, 0xda, 0xf3, 0x72, 0x57, 0xa4, 0x27, 0xd9, 0xc9, 0xb8, 0x73, 0xaf, 0xbc, 0x1d,
+	0x46, 0xcf, 0x43, 0x93, 0x29, 0x68, 0x61, 0x91, 0x9f, 0x78, 0x21, 0x9e, 0x08, 0x42, 0xf7, 0x67,
+	0xfe, 0x54, 0x1f, 0x35, 0x8c, 0xe4, 0x96, 0xbc, 0x81, 0xfe, 0x39, 0x3e, 0x54, 0xbc, 0xcd, 0x6c,
+	0xc4, 0xe4, 0x57, 0x50, 0x59, 0x7a, 0x4c, 0xb3, 0x84, 0x7c, 0x07, 0x50, 0x8a, 0xb8, 0x10, 0x1b,
+	0x39, 0x4c, 0x9d, 0x38, 0x9a, 0xde, 0x5d, 0x7a, 0xbc, 0x4c, 0xaa, 0xb3, 0xcb, 0xa4, 0xd1, 0xb0,
+	0xa6, 0xa5, 0x26, 0xdf, 0x82, 0x76, 0xb9, 0xa1, 0xba, 0xfa, 0x68, 0xfa, 0xd9, 0x3f, 0x12, 0xed,
+	0x16, 0x88, 0xfe, 0x42, 0x27, 0xbf, 0x29, 0x00, 0x36, 0x3f, 0xf1, 0x6c, 0xcf, 0xb3, 0xdd, 0x13,
+	0x19, 0x83, 0x2a, 0xe2, 0x22, 0xe1, 0xa2, 0xe9, 0xfa, 0xe1, 0x55, 0xd4, 0x6a, 0xf2, 0x35, 0x7c,
+	0xb2, 0xcb, 0xb3, 0x8f, 0x69, 0x52, 0x15, 0x7c, 0xbf, 0x69, 0xa1, 0x4e, 0x0b, 0xe1, 0xdf, 0x16,
+	0x6b, 0xf0, 0x31, 0xa8, 0xf1, 0xae, 0x6e, 0xa6, 0x7b, 0x29, 0xd4, 0x68, 0x79, 0x07, 0x87, 0x78,
+	0xcb, 0x0f, 0xe3, 0x5e, 0x73, 0x07, 0xb5, 0x98, 0x01, 0x68, 0x05, 0x2f, 0xf3, 0xaa, 0xd8, 0xf1,
+	0x77, 0xbf, 0x2b, 0xa0, 0x79, 0x71, 0x96, 0x54, 0x71, 0xc2, 0xc9, 0x18, 0xde, 0x78, 0xa6, 0xbf,
+	0x58, 0x99, 0x0b, 0x67, 0xb3, 0xf2, 0x69, 0xe8, 0x58, 0xee, 0xdc, 0x75, 0x6c, 0x7c, 0x45, 0x34,
+	0xe8, 0xf9, 0x81, 0xef, 0xa0, 0x42, 0x46, 0x30, 0x30, 0x7d, 0x3b, 0x0a, 0x5c, 0x1b, 0x3b, 0x44,
+	0x85, 0x8e, 0x49, 0xb1, 0x2b, 0x57, 0xcb, 0xc2, 0x1e, 0x19, 0x40, 0xd7, 0xa2, 0x14, 0xfb, 0x92,
+	0xb7, 0xcd, 0x88, 0xa1, 0x2a, 0xad, 0x45, 0x80, 0x03, 0x69, 0x2d, 0xd6, 0x0c, 0x35, 0x59, 0xe0,
+	0xc1, 0xa4, 0x4b, 0xc7, 0xf3, 0x70, 0x28, 0xb9, 0x47, 0xf3, 0x47, 0x13, 0x41, 0x72, 0x8f, 0x14,
+	0x47, 0x32, 0xe2, 0xb9, 0x34, 0xc4, 0x2b, 0xb9, 0x0b, 0x66, 0x8f, 0x16, 0x5e, 0x4b, 0x2f, 0xfc,
+	0x80, 0x37, 0x72, 0xa5, 0x0f, 0x78, 0x4b, 0x86, 0xd0, 0xa7, 0x6b, 0x77, 0xce, 0x10, 0x65, 0x88,
+	0x51, 0x24, 0xb2, 0xfc, 0xda, 0x99, 0xe1, 0xeb, 0x77, 0x7f, 0x28, 0xa0, 0x36, 0x2f, 0x89, 0x7c,
+	0x0a, 0x84, 0x32, 0x93, 0xad, 0xe8, 0x8b, 0x61, 0xae, 0x40, 0x9b, 0xad, 0x5c, 0xcf, 0x76, 0xfd,
+	0x05, 0x2a, 0xb2, 0x98, 0x54, 0x0c, 0x3b, 0xe4, 0x35, 0xdc, 0xce, 0x4d, 0xd7, 0x73, 0xec, 0x0d,
+	0x0b, 0x36, 0x35, 0x82, 0x5d, 0xd9, 0x2f, 0x73, 0x28, 0x93, 0x70, 0x8f, 0x00, 0xa8, 0xa1, 0x49,
+	0xa9, 0x63, 0x63, 0x5f, 0xee, 0x1b, 0x1a, 0x55, 0x72, 0x0d, 0x43, 0xe6, 0xbe, 0x77, 0xec, 0x4d,
+	0xb0, 0x62, 0x38, 0x90, 0xd2, 0x32, 0x7d, 0xcb, 0xf1, 0xa4, 0xab, 0x91, 0x5b, 0x18, 0xb1, 0x20,
+	0xf0, 0x36, 0x2d, 0x3e, 0x24, 0x37, 0x00, 0xae, 0x6f, 0x05, 0xef, 0x43, 0xcf, 0x61, 0x0e, 0x82,
+	0xec, 0x61, 0xee, 0x99, 0xcb, 0x0f, 0x38, 0x92, 0xc7, 0xad, 0xfc, 0xa5, 0x1f, 0xac, 0x7d, 0xbc,
+	0x92, 0x82, 0x2e, 0xdd, 0x30, 0x74, 0x6c, 0xbc, 0x9e, 0xfd, 0x02, 0x93, 0x5d, 0x7e, 0xfc, 0x9f,
+	0xaf, 0x28, 0x54, 0x7e, 0x72, 0x5b, 0x22, 0xc9, 0x0f, 0x71, 0x96, 0xe8, 0x79, 0x91, 0x18, 0x09,
+	0xcf, 0xea, 0x87, 0x69, 0x34, 0x56, 0x7c, 0x4a, 0xcb, 0x7f, 0xfb, 0x73, 0x7c, 0xff, 0x4c, 0x6e,
+	0xd5, 0x3a, 0xeb, 0x9b, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xdb, 0xae, 0x2d, 0xfb, 0x6e, 0x04,
+	0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/configuration.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/configuration.pb.go
new file mode 100644
index 00000000..84ae6559
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/configuration.pb.go
@@ -0,0 +1,227 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/configuration.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Represents a configuration within an Invocation associated with one or more
+// ConfiguredTargets. It captures the environment and other settings that
+// were used.
+type Configuration struct {
+	// The format of this Configuration resource name must be:
+	// invocations/${INVOCATION_ID}/configs/${CONFIG_ID}
+	// The configuration ID of "default" should be preferred for the default
+	// configuration in a single-config invocation.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The resource ID components that identify the Configuration. They must match
+	// the resource name after proper encoding.
+	Id *Configuration_Id `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	// The aggregate status for this configuration.
+	StatusAttributes *StatusAttributes `protobuf:"bytes,3,opt,name=status_attributes,json=statusAttributes,proto3" json:"status_attributes,omitempty"`
+	// Attributes that apply only to this configuration.
+	ConfigurationAttributes *ConfigurationAttributes `protobuf:"bytes,5,opt,name=configuration_attributes,json=configurationAttributes,proto3" json:"configuration_attributes,omitempty"`
+	// Arbitrary name-value pairs.
+	// This is implemented as a multi-map. Multiple properties are allowed with
+	// the same key. Properties will be returned in lexicographical order by key.
+	Properties           []*Property `protobuf:"bytes,6,rep,name=properties,proto3" json:"properties,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *Configuration) Reset()         { *m = Configuration{} }
+func (m *Configuration) String() string { return proto.CompactTextString(m) }
+func (*Configuration) ProtoMessage()    {}
+func (*Configuration) Descriptor() ([]byte, []int) {
+	return fileDescriptor_configuration_2bcc63e0499c6772, []int{0}
+}
+func (m *Configuration) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Configuration.Unmarshal(m, b)
+}
+func (m *Configuration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Configuration.Marshal(b, m, deterministic)
+}
+func (dst *Configuration) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Configuration.Merge(dst, src)
+}
+func (m *Configuration) XXX_Size() int {
+	return xxx_messageInfo_Configuration.Size(m)
+}
+func (m *Configuration) XXX_DiscardUnknown() {
+	xxx_messageInfo_Configuration.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Configuration proto.InternalMessageInfo
+
+func (m *Configuration) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Configuration) GetId() *Configuration_Id {
+	if m != nil {
+		return m.Id
+	}
+	return nil
+}
+
+func (m *Configuration) GetStatusAttributes() *StatusAttributes {
+	if m != nil {
+		return m.StatusAttributes
+	}
+	return nil
+}
+
+func (m *Configuration) GetConfigurationAttributes() *ConfigurationAttributes {
+	if m != nil {
+		return m.ConfigurationAttributes
+	}
+	return nil
+}
+
+func (m *Configuration) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+// The resource ID components that identify the Configuration.
+type Configuration_Id struct {
+	// The Invocation ID.
+	InvocationId string `protobuf:"bytes,1,opt,name=invocation_id,json=invocationId,proto3" json:"invocation_id,omitempty"`
+	// The Configuration ID.
+	ConfigurationId      string   `protobuf:"bytes,2,opt,name=configuration_id,json=configurationId,proto3" json:"configuration_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Configuration_Id) Reset()         { *m = Configuration_Id{} }
+func (m *Configuration_Id) String() string { return proto.CompactTextString(m) }
+func (*Configuration_Id) ProtoMessage()    {}
+func (*Configuration_Id) Descriptor() ([]byte, []int) {
+	return fileDescriptor_configuration_2bcc63e0499c6772, []int{0, 0}
+}
+func (m *Configuration_Id) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Configuration_Id.Unmarshal(m, b)
+}
+func (m *Configuration_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Configuration_Id.Marshal(b, m, deterministic)
+}
+func (dst *Configuration_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Configuration_Id.Merge(dst, src)
+}
+func (m *Configuration_Id) XXX_Size() int {
+	return xxx_messageInfo_Configuration_Id.Size(m)
+}
+func (m *Configuration_Id) XXX_DiscardUnknown() {
+	xxx_messageInfo_Configuration_Id.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Configuration_Id proto.InternalMessageInfo
+
+func (m *Configuration_Id) GetInvocationId() string {
+	if m != nil {
+		return m.InvocationId
+	}
+	return ""
+}
+
+func (m *Configuration_Id) GetConfigurationId() string {
+	if m != nil {
+		return m.ConfigurationId
+	}
+	return ""
+}
+
+// Attributes that apply only to the configuration.
+type ConfigurationAttributes struct {
+	// The type of cpu. (e.g. "x86", "powerpc")
+	Cpu                  string   `protobuf:"bytes,1,opt,name=cpu,proto3" json:"cpu,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ConfigurationAttributes) Reset()         { *m = ConfigurationAttributes{} }
+func (m *ConfigurationAttributes) String() string { return proto.CompactTextString(m) }
+func (*ConfigurationAttributes) ProtoMessage()    {}
+func (*ConfigurationAttributes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_configuration_2bcc63e0499c6772, []int{1}
+}
+func (m *ConfigurationAttributes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConfigurationAttributes.Unmarshal(m, b)
+}
+func (m *ConfigurationAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConfigurationAttributes.Marshal(b, m, deterministic)
+}
+func (dst *ConfigurationAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfigurationAttributes.Merge(dst, src)
+}
+func (m *ConfigurationAttributes) XXX_Size() int {
+	return xxx_messageInfo_ConfigurationAttributes.Size(m)
+}
+func (m *ConfigurationAttributes) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConfigurationAttributes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConfigurationAttributes proto.InternalMessageInfo
+
+func (m *ConfigurationAttributes) GetCpu() string {
+	if m != nil {
+		return m.Cpu
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Configuration)(nil), "google.devtools.resultstore.v2.Configuration")
+	proto.RegisterType((*Configuration_Id)(nil), "google.devtools.resultstore.v2.Configuration.Id")
+	proto.RegisterType((*ConfigurationAttributes)(nil), "google.devtools.resultstore.v2.ConfigurationAttributes")
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/configuration.proto", fileDescriptor_configuration_2bcc63e0499c6772)
+}
+
+var fileDescriptor_configuration_2bcc63e0499c6772 = []byte{
+	// 335 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x4f, 0xb3, 0x40,
+	0x10, 0xc6, 0x03, 0xbc, 0x6f, 0x93, 0x4e, 0x6d, 0xac, 0x7b, 0x29, 0xe9, 0xc1, 0x34, 0xf5, 0x82,
+	0x69, 0xb2, 0x18, 0x3c, 0x78, 0xf0, 0xe2, 0x9f, 0x8b, 0xdc, 0x1a, 0xf4, 0x64, 0x62, 0x0c, 0x65,
+	0xd7, 0xcd, 0x26, 0xc0, 0xe0, 0xee, 0x42, 0xe2, 0x37, 0xf5, 0xe3, 0x18, 0x81, 0x2a, 0x18, 0x6b,
+	0xf5, 0x36, 0xcc, 0xf0, 0x7b, 0x9e, 0x99, 0x9d, 0x81, 0x40, 0x20, 0x8a, 0x94, 0xfb, 0x8c, 0x57,
+	0x06, 0x31, 0xd5, 0xbe, 0xe2, 0xba, 0x4c, 0x8d, 0x36, 0xa8, 0xb8, 0x5f, 0x05, 0x7e, 0x82, 0xf9,
+	0x93, 0x14, 0xa5, 0x8a, 0x8d, 0xc4, 0x9c, 0x16, 0x0a, 0x0d, 0x92, 0xc3, 0x86, 0xa1, 0x1b, 0x86,
+	0x76, 0x18, 0x5a, 0x05, 0xb3, 0xe5, 0x4e, 0xcd, 0x2c, 0xdb, 0x88, 0x2d, 0x5e, 0x1d, 0x18, 0x5f,
+	0x77, 0x4d, 0x08, 0x81, 0x7f, 0x79, 0x9c, 0x71, 0xd7, 0x9a, 0x5b, 0xde, 0x30, 0xaa, 0x63, 0x72,
+	0x01, 0xb6, 0x64, 0xae, 0x3d, 0xb7, 0xbc, 0x51, 0x70, 0x42, 0x7f, 0xf6, 0xa7, 0x3d, 0x39, 0x1a,
+	0xb2, 0xc8, 0x96, 0x8c, 0x3c, 0xc0, 0x81, 0x36, 0xb1, 0x29, 0xf5, 0x63, 0x6c, 0x8c, 0x92, 0xeb,
+	0xd2, 0x70, 0xed, 0x3a, 0xbf, 0x13, 0xbc, 0xad, 0xc1, 0xcb, 0x0f, 0x2e, 0x9a, 0xe8, 0x2f, 0x19,
+	0xa2, 0xc0, 0xed, 0x3d, 0x55, 0xd7, 0xe5, 0x7f, 0xed, 0x72, 0xf6, 0xa7, 0xb6, 0x3b, 0x66, 0xd3,
+	0xe4, 0xfb, 0x02, 0xb9, 0x01, 0x28, 0x14, 0x16, 0x5c, 0x19, 0xc9, 0xb5, 0x3b, 0x98, 0x3b, 0xde,
+	0x28, 0xf0, 0x76, 0xb9, 0xac, 0x1a, 0xe2, 0x25, 0xea, 0xb0, 0xb3, 0x3b, 0xb0, 0x43, 0x46, 0x8e,
+	0x60, 0x2c, 0xf3, 0x0a, 0x93, 0x66, 0x00, 0xc9, 0xda, 0x0d, 0xec, 0x7d, 0x26, 0x43, 0x46, 0x8e,
+	0x61, 0xd2, 0x1f, 0xb4, 0xdd, 0xcb, 0x30, 0xda, 0xef, 0xe5, 0x43, 0xb6, 0x58, 0xc2, 0x74, 0xcb,
+	0x4c, 0x64, 0x02, 0x4e, 0x52, 0x94, 0xad, 0xc1, 0x7b, 0x78, 0xf5, 0x0c, 0x8b, 0x04, 0xb3, 0x1d,
+	0xdd, 0xaf, 0xac, 0xfb, 0xb0, 0xfd, 0x43, 0x60, 0x1a, 0xe7, 0x82, 0xa2, 0x12, 0xbe, 0xe0, 0x79,
+	0x7d, 0x4b, 0x7e, 0x53, 0x8a, 0x0b, 0xa9, 0xb7, 0xdd, 0xde, 0x79, 0xe7, 0x73, 0x3d, 0xa8, 0xa9,
+	0xd3, 0xb7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0xea, 0x27, 0xe2, 0x04, 0x03, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/configured_target.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/configured_target.pb.go
new file mode 100644
index 00000000..5e6e2173
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/configured_target.pb.go
@@ -0,0 +1,304 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/configured_target.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Each ConfiguredTarget represents data for a given configuration of a given
+// target in a given Invocation.
+// Every ConfiguredTarget should have at least one Action as a child resource
+// before the invocation is finalized. Refer to the Action's documentation for
+// more info on this.
+type ConfiguredTarget struct {
+	// The resource name.  Its format must be:
+	// invocations/${INVOCATION_ID}/targets/${TARGET_ID}/configuredTargets/${CONFIG_ID}
+	// where ${CONFIG_ID} must match the ID of an existing Configuration under
+	// this Invocation.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The resource ID components that identify the ConfiguredTarget. They must
+	// match the resource name after proper encoding.
+	Id *ConfiguredTarget_Id `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	// The aggregate status for this configuration of this target. If testing
+	// was not requested, set this to the build status (e.g. BUILT or
+	// FAILED_TO_BUILD).
+	StatusAttributes *StatusAttributes `protobuf:"bytes,3,opt,name=status_attributes,json=statusAttributes,proto3" json:"status_attributes,omitempty"`
+	// Captures the start time and duration of this configured target.
+	Timing *Timing `protobuf:"bytes,4,opt,name=timing,proto3" json:"timing,omitempty"`
+	// Test specific attributes for this ConfiguredTarget.
+	TestAttributes *ConfiguredTestAttributes `protobuf:"bytes,6,opt,name=test_attributes,json=testAttributes,proto3" json:"test_attributes,omitempty"`
+	// Arbitrary name-value pairs.
+	// This is implemented as a multi-map. Multiple properties are allowed with
+	// the same key. Properties will be returned in lexicographical order by key.
+	Properties []*Property `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty"`
+	// A list of file references for configured target level files.
+	// The file IDs must be unique within this list. Duplicate file IDs will
+	// result in an error. Files will be returned in lexicographical order by ID.
+	Files []*File `protobuf:"bytes,8,rep,name=files,proto3" json:"files,omitempty"`
+	// Summary of aggregate coverage across all test actions for this target in
+	// this configuration. The server populates this for you in the
+	// post-processing phase.
+	CoverageSummaries    []*LanguageCoverageSummary `protobuf:"bytes,9,rep,name=coverage_summaries,json=coverageSummaries,proto3" json:"coverage_summaries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *ConfiguredTarget) Reset()         { *m = ConfiguredTarget{} }
+func (m *ConfiguredTarget) String() string { return proto.CompactTextString(m) }
+func (*ConfiguredTarget) ProtoMessage()    {}
+func (*ConfiguredTarget) Descriptor() ([]byte, []int) {
+	return fileDescriptor_configured_target_48a4f73ce345d3e8, []int{0}
+}
+func (m *ConfiguredTarget) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConfiguredTarget.Unmarshal(m, b)
+}
+func (m *ConfiguredTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConfiguredTarget.Marshal(b, m, deterministic)
+}
+func (dst *ConfiguredTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfiguredTarget.Merge(dst, src)
+}
+func (m *ConfiguredTarget) XXX_Size() int {
+	return xxx_messageInfo_ConfiguredTarget.Size(m)
+}
+func (m *ConfiguredTarget) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConfiguredTarget.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConfiguredTarget proto.InternalMessageInfo
+
+func (m *ConfiguredTarget) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ConfiguredTarget) GetId() *ConfiguredTarget_Id {
+	if m != nil {
+		return m.Id
+	}
+	return nil
+}
+
+func (m *ConfiguredTarget) GetStatusAttributes() *StatusAttributes {
+	if m != nil {
+		return m.StatusAttributes
+	}
+	return nil
+}
+
+func (m *ConfiguredTarget) GetTiming() *Timing {
+	if m != nil {
+		return m.Timing
+	}
+	return nil
+}
+
+func (m *ConfiguredTarget) GetTestAttributes() *ConfiguredTestAttributes {
+	if m != nil {
+		return m.TestAttributes
+	}
+	return nil
+}
+
+func (m *ConfiguredTarget) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+func (m *ConfiguredTarget) GetFiles() []*File {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+func (m *ConfiguredTarget) GetCoverageSummaries() []*LanguageCoverageSummary {
+	if m != nil {
+		return m.CoverageSummaries
+	}
+	return nil
+}
+
+// The resource ID components that identify the ConfiguredTarget.
+type ConfiguredTarget_Id struct {
+	// The Invocation ID.
+	InvocationId string `protobuf:"bytes,1,opt,name=invocation_id,json=invocationId,proto3" json:"invocation_id,omitempty"`
+	// The Target ID.
+	TargetId string `protobuf:"bytes,2,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"`
+	// The Configuration ID.
+	ConfigurationId      string   `protobuf:"bytes,3,opt,name=configuration_id,json=configurationId,proto3" json:"configuration_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ConfiguredTarget_Id) Reset()         { *m = ConfiguredTarget_Id{} }
+func (m *ConfiguredTarget_Id) String() string { return proto.CompactTextString(m) }
+func (*ConfiguredTarget_Id) ProtoMessage()    {}
+func (*ConfiguredTarget_Id) Descriptor() ([]byte, []int) {
+	return fileDescriptor_configured_target_48a4f73ce345d3e8, []int{0, 0}
+}
+func (m *ConfiguredTarget_Id) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConfiguredTarget_Id.Unmarshal(m, b)
+}
+func (m *ConfiguredTarget_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConfiguredTarget_Id.Marshal(b, m, deterministic)
+}
+func (dst *ConfiguredTarget_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfiguredTarget_Id.Merge(dst, src)
+}
+func (m *ConfiguredTarget_Id) XXX_Size() int {
+	return xxx_messageInfo_ConfiguredTarget_Id.Size(m)
+}
+func (m *ConfiguredTarget_Id) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConfiguredTarget_Id.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConfiguredTarget_Id proto.InternalMessageInfo
+
+func (m *ConfiguredTarget_Id) GetInvocationId() string {
+	if m != nil {
+		return m.InvocationId
+	}
+	return ""
+}
+
+func (m *ConfiguredTarget_Id) GetTargetId() string {
+	if m != nil {
+		return m.TargetId
+	}
+	return ""
+}
+
+func (m *ConfiguredTarget_Id) GetConfigurationId() string {
+	if m != nil {
+		return m.ConfigurationId
+	}
+	return ""
+}
+
+// Attributes that apply only to test actions under this configured target.
+type ConfiguredTestAttributes struct {
+	// Total number of test runs. For example, in bazel this is specified with
+	// --runs_per_test. Zero if runs_per_test is not used.
+	TotalRunCount int32 `protobuf:"varint,2,opt,name=total_run_count,json=totalRunCount,proto3" json:"total_run_count,omitempty"`
+	// Total number of test shards. Zero if shard count was not specified.
+	TotalShardCount int32 `protobuf:"varint,3,opt,name=total_shard_count,json=totalShardCount,proto3" json:"total_shard_count,omitempty"`
+	// How long test is allowed to run.
+	TimeoutDuration      *duration.Duration `protobuf:"bytes,5,opt,name=timeout_duration,json=timeoutDuration,proto3" json:"timeout_duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *ConfiguredTestAttributes) Reset()         { *m = ConfiguredTestAttributes{} }
+func (m *ConfiguredTestAttributes) String() string { return proto.CompactTextString(m) }
+func (*ConfiguredTestAttributes) ProtoMessage()    {}
+func (*ConfiguredTestAttributes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_configured_target_48a4f73ce345d3e8, []int{1}
+}
+func (m *ConfiguredTestAttributes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConfiguredTestAttributes.Unmarshal(m, b)
+}
+func (m *ConfiguredTestAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConfiguredTestAttributes.Marshal(b, m, deterministic)
+}
+func (dst *ConfiguredTestAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConfiguredTestAttributes.Merge(dst, src)
+}
+func (m *ConfiguredTestAttributes) XXX_Size() int {
+	return xxx_messageInfo_ConfiguredTestAttributes.Size(m)
+}
+func (m *ConfiguredTestAttributes) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConfiguredTestAttributes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConfiguredTestAttributes proto.InternalMessageInfo
+
+func (m *ConfiguredTestAttributes) GetTotalRunCount() int32 {
+	if m != nil {
+		return m.TotalRunCount
+	}
+	return 0
+}
+
+func (m *ConfiguredTestAttributes) GetTotalShardCount() int32 {
+	if m != nil {
+		return m.TotalShardCount
+	}
+	return 0
+}
+
+func (m *ConfiguredTestAttributes) GetTimeoutDuration() *duration.Duration {
+	if m != nil {
+		return m.TimeoutDuration
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*ConfiguredTarget)(nil), "google.devtools.resultstore.v2.ConfiguredTarget")
+	proto.RegisterType((*ConfiguredTarget_Id)(nil), "google.devtools.resultstore.v2.ConfiguredTarget.Id")
+	proto.RegisterType((*ConfiguredTestAttributes)(nil), "google.devtools.resultstore.v2.ConfiguredTestAttributes")
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/configured_target.proto", fileDescriptor_configured_target_48a4f73ce345d3e8)
+}
+
+var fileDescriptor_configured_target_48a4f73ce345d3e8 = []byte{
+	// 536 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdf, 0x8a, 0x13, 0x31,
+	0x14, 0xc6, 0x69, 0xbb, 0x5d, 0xb7, 0x59, 0xd7, 0xb6, 0xb9, 0x1a, 0x2b, 0x48, 0xa9, 0xb2, 0x74,
+	0x15, 0x66, 0xa4, 0x8b, 0x7f, 0x50, 0x10, 0xb4, 0x8b, 0x38, 0xe0, 0xc5, 0x32, 0xdd, 0x2b, 0x41,
+	0x86, 0xb4, 0x49, 0x63, 0x60, 0x26, 0xe9, 0x26, 0x27, 0x85, 0x7d, 0x2f, 0x9f, 0xc3, 0x67, 0x92,
+	0x26, 0x99, 0xda, 0x16, 0xd6, 0xc1, 0xbb, 0xe6, 0xeb, 0xf7, 0xfd, 0x72, 0x92, 0x9c, 0x33, 0xe8,
+	0x0d, 0x57, 0x8a, 0x17, 0x2c, 0xa1, 0x6c, 0x0d, 0x4a, 0x15, 0x26, 0xd1, 0xcc, 0xd8, 0x02, 0x0c,
+	0x28, 0xcd, 0x92, 0xf5, 0x24, 0x59, 0x28, 0xb9, 0x14, 0xdc, 0x6a, 0x46, 0x73, 0x20, 0x9a, 0x33,
+	0x88, 0x57, 0x5a, 0x81, 0xc2, 0x4f, 0x7d, 0x2e, 0xae, 0x72, 0xf1, 0x4e, 0x2e, 0x5e, 0x4f, 0x06,
+	0x2f, 0x6b, 0xb9, 0x65, 0xa9, 0xa4, 0x87, 0x0d, 0x5e, 0xd7, 0x9a, 0xd7, 0x4c, 0x13, 0xce, 0x72,
+	0x63, 0xcb, 0x92, 0xe8, 0xbb, 0x10, 0xbb, 0xa8, 0x89, 0x2d, 0x45, 0xc1, 0x82, 0x35, 0x94, 0x9b,
+	0xb8, 0xd5, 0xdc, 0x2e, 0x13, 0x6a, 0x35, 0x01, 0x51, 0x55, 0x30, 0xfa, 0xdd, 0x46, 0xbd, 0xe9,
+	0xf6, 0xa8, 0x37, 0xee, 0xa4, 0x18, 0xa3, 0x23, 0x49, 0x4a, 0x16, 0x35, 0x86, 0x8d, 0x71, 0x27,
+	0x73, 0xbf, 0xf1, 0x14, 0x35, 0x05, 0x8d, 0x9a, 0xc3, 0xc6, 0xf8, 0x74, 0x72, 0x19, 0xff, 0xfb,
+	0x12, 0xe2, 0x43, 0x62, 0x9c, 0xd2, 0xac, 0x29, 0x28, 0xfe, 0x81, 0xfa, 0x06, 0x08, 0x58, 0x93,
+	0x13, 0x00, 0x2d, 0xe6, 0x16, 0x98, 0x89, 0x5a, 0x8e, 0xf9, 0xaa, 0x8e, 0x39, 0x73, 0xc1, 0x4f,
+	0xdb, 0x5c, 0xd6, 0x33, 0x07, 0x0a, 0xfe, 0x88, 0x8e, 0x41, 0x94, 0x42, 0xf2, 0xe8, 0xc8, 0x31,
+	0xcf, 0xeb, 0x98, 0x37, 0xce, 0x9d, 0x85, 0x14, 0x26, 0xa8, 0x0b, 0xcc, 0xc0, 0x6e, 0x71, 0xc7,
+	0x0e, 0xf4, 0xee, 0x3f, 0x0e, 0xcc, 0x0c, 0xec, 0x14, 0xf9, 0x08, 0xf6, 0xd6, 0xf8, 0x2b, 0x42,
+	0x2b, 0xad, 0x56, 0x4c, 0x83, 0x60, 0x26, 0x7a, 0x30, 0x6c, 0x8d, 0x4f, 0x27, 0xe3, 0x3a, 0xfa,
+	0xb5, 0x4f, 0xdc, 0x65, 0x3b, 0x59, 0xfc, 0x1e, 0xb5, 0x37, 0xef, 0x6c, 0xa2, 0x13, 0x07, 0x79,
+	0x5e, 0x07, 0xf9, 0x22, 0x0a, 0x96, 0xf9, 0x08, 0x5e, 0x22, 0x7c, 0xd0, 0x5a, 0x9b, 0x6a, 0x3a,
+	0x0e, 0xf4, 0xb6, 0x0e, 0xf4, 0x8d, 0x48, 0x6e, 0x09, 0x67, 0xd3, 0x40, 0x98, 0xf9, 0xde, 0xcc,
+	0xfa, 0x8b, 0x3d, 0x41, 0x30, 0x33, 0xb8, 0x45, 0xcd, 0x94, 0xe2, 0x67, 0xe8, 0x4c, 0xc8, 0xb5,
+	0x5a, 0xb8, 0xbe, 0xcb, 0x05, 0x0d, 0x7d, 0xf5, 0xf0, 0xaf, 0x98, 0x52, 0xfc, 0x04, 0x75, 0xfc,
+	0x9c, 0xe5, 0xa1, 0xcd, 0x3a, 0xd9, 0x89, 0x17, 0x52, 0x8a, 0x2f, 0x50, 0xaf, 0x9a, 0xc7, 0x2d,
+	0xa4, 0xe5, 0x3c, 0xdd, 0x3d, 0x3d, 0xa5, 0xa3, 0x5f, 0x0d, 0x14, 0xdd, 0xf7, 0x1a, 0xf8, 0x1c,
+	0x75, 0x41, 0x01, 0x29, 0x72, 0x6d, 0x65, 0xbe, 0x50, 0x56, 0x82, 0xdb, 0xaa, 0x9d, 0x9d, 0x39,
+	0x39, 0xb3, 0x72, 0xba, 0x11, 0xf1, 0x0b, 0xd4, 0xf7, 0x3e, 0xf3, 0x93, 0x68, 0x1a, 0x9c, 0x2d,
+	0xe7, 0xf4, 0x80, 0xd9, 0x46, 0xf7, 0xde, 0x2b, 0xd4, 0x03, 0x51, 0x32, 0x65, 0x21, 0xaf, 0x66,
+	0x2b, 0x6a, 0xbb, 0xae, 0x79, 0x5c, 0xdd, 0x64, 0x35, 0x7c, 0xf1, 0x55, 0x30, 0x64, 0xdd, 0x10,
+	0xa9, 0x84, 0xcf, 0xb7, 0x68, 0xb4, 0x50, 0x65, 0xcd, 0xd5, 0x5f, 0x37, 0xbe, 0xa7, 0xc1, 0xc1,
+	0x55, 0x41, 0x24, 0x8f, 0x95, 0xe6, 0x09, 0x67, 0xd2, 0x6d, 0x90, 0xf8, 0xbf, 0xc8, 0x4a, 0x98,
+	0xfb, 0xbe, 0x0c, 0x1f, 0x76, 0x96, 0xf3, 0x63, 0x97, 0xba, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff,
+	0x8f, 0xb1, 0xb2, 0xc2, 0x0a, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/coverage.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/coverage.pb.go
new file mode 100644
index 00000000..7fea83e8
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/coverage.pb.go
@@ -0,0 +1,310 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/coverage.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Describes line coverage for a file
+type LineCoverage struct {
+	// Which source lines in the file represent the start of a statement that was
+	// instrumented to detect whether it was executed by the test.
+	//
+	// This is a bitfield where i-th bit corresponds to the i-th line. Divide line
+	// number by 8 to get index into byte array. Mod line number by 8 to get bit
+	// number (0 = LSB, 7 = MSB).
+	//
+	// A 1 denotes the line was instrumented.
+	// A 0 denotes the line was not instrumented.
+	InstrumentedLines []byte `protobuf:"bytes,1,opt,name=instrumented_lines,json=instrumentedLines,proto3" json:"instrumented_lines,omitempty"`
+	// Which of the instrumented source lines were executed by the test. Should
+	// include lines that were not instrumented.
+	//
+	// This is a bitfield where i-th bit corresponds to the i-th line. Divide line
+	// number by 8 to get index into byte array. Mod line number by 8 to get bit
+	// number (0 = LSB, 7 = MSB).
+	//
+	// A 1 denotes the line was executed.
+	// A 0 denotes the line was not executed.
+	ExecutedLines        []byte   `protobuf:"bytes,2,opt,name=executed_lines,json=executedLines,proto3" json:"executed_lines,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LineCoverage) Reset()         { *m = LineCoverage{} }
+func (m *LineCoverage) String() string { return proto.CompactTextString(m) }
+func (*LineCoverage) ProtoMessage()    {}
+func (*LineCoverage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_coverage_23030c42b40853e2, []int{0}
+}
+func (m *LineCoverage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LineCoverage.Unmarshal(m, b)
+}
+func (m *LineCoverage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LineCoverage.Marshal(b, m, deterministic)
+}
+func (dst *LineCoverage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LineCoverage.Merge(dst, src)
+}
+func (m *LineCoverage) XXX_Size() int {
+	return xxx_messageInfo_LineCoverage.Size(m)
+}
+func (m *LineCoverage) XXX_DiscardUnknown() {
+	xxx_messageInfo_LineCoverage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LineCoverage proto.InternalMessageInfo
+
+func (m *LineCoverage) GetInstrumentedLines() []byte {
+	if m != nil {
+		return m.InstrumentedLines
+	}
+	return nil
+}
+
+func (m *LineCoverage) GetExecutedLines() []byte {
+	if m != nil {
+		return m.ExecutedLines
+	}
+	return nil
+}
+
+// Describes branch coverage for a file
+type BranchCoverage struct {
+	// The field branch_present denotes the lines containing at least one branch.
+	//
+	// This is a bitfield where i-th bit corresponds to the i-th line. Divide line
+	// number by 8 to get index into byte array. Mod line number by 8 to get bit
+	// number (0 = LSB, 7 = MSB).
+	//
+	// A 1 denotes the line contains at least one branch.
+	// A 0 denotes the line contains no branches.
+	BranchPresent []byte `protobuf:"bytes,1,opt,name=branch_present,json=branchPresent,proto3" json:"branch_present,omitempty"`
+	// Contains the number of branches present, only for the lines which have the
+	// corresponding bit set in branch_present, in a relative order ignoring
+	// lines which do not have any branches.
+	BranchesInLine []int32 `protobuf:"varint,2,rep,packed,name=branches_in_line,json=branchesInLine,proto3" json:"branches_in_line,omitempty"`
+	// As each branch can have any one of the following three states: not
+	// executed, executed but not taken, executed and taken.
+	//
+	// This is a bitfield where i-th bit corresponds to the i-th line. Divide line
+	// number by 8 to get index into byte array. Mod line number by 8 to get bit
+	// number (0 = LSB, 7 = MSB).
+	//
+	// i-th bit of the following two byte arrays are used to denote the above
+	// mentioned states.
+	//
+	// not executed: i-th bit of executed == 0 && i-th bit of taken == 0
+	// executed but not taken: i-th bit of executed == 1 && i-th bit of taken == 0
+	// executed and taken: i-th bit of executed == 1 && i-th bit of taken == 1
+	Executed []byte `protobuf:"bytes,3,opt,name=executed,proto3" json:"executed,omitempty"`
+	// Described above.
+	Taken                []byte   `protobuf:"bytes,4,opt,name=taken,proto3" json:"taken,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BranchCoverage) Reset()         { *m = BranchCoverage{} }
+func (m *BranchCoverage) String() string { return proto.CompactTextString(m) }
+func (*BranchCoverage) ProtoMessage()    {}
+func (*BranchCoverage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_coverage_23030c42b40853e2, []int{1}
+}
+func (m *BranchCoverage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BranchCoverage.Unmarshal(m, b)
+}
+func (m *BranchCoverage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BranchCoverage.Marshal(b, m, deterministic)
+}
+func (dst *BranchCoverage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BranchCoverage.Merge(dst, src)
+}
+func (m *BranchCoverage) XXX_Size() int {
+	return xxx_messageInfo_BranchCoverage.Size(m)
+}
+func (m *BranchCoverage) XXX_DiscardUnknown() {
+	xxx_messageInfo_BranchCoverage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BranchCoverage proto.InternalMessageInfo
+
+func (m *BranchCoverage) GetBranchPresent() []byte {
+	if m != nil {
+		return m.BranchPresent
+	}
+	return nil
+}
+
+func (m *BranchCoverage) GetBranchesInLine() []int32 {
+	if m != nil {
+		return m.BranchesInLine
+	}
+	return nil
+}
+
+func (m *BranchCoverage) GetExecuted() []byte {
+	if m != nil {
+		return m.Executed
+	}
+	return nil
+}
+
+func (m *BranchCoverage) GetTaken() []byte {
+	if m != nil {
+		return m.Taken
+	}
+	return nil
+}
+
+// Describes code coverage for a particular file under test.
+type FileCoverage struct {
+	// Path of source file within the SourceContext of this Invocation.
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	// Details of lines in a file required to calculate line coverage.
+	LineCoverage *LineCoverage `protobuf:"bytes,2,opt,name=line_coverage,json=lineCoverage,proto3" json:"line_coverage,omitempty"`
+	// Details of branches in a file required to calculate branch coverage.
+	BranchCoverage       *BranchCoverage `protobuf:"bytes,3,opt,name=branch_coverage,json=branchCoverage,proto3" json:"branch_coverage,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *FileCoverage) Reset()         { *m = FileCoverage{} }
+func (m *FileCoverage) String() string { return proto.CompactTextString(m) }
+func (*FileCoverage) ProtoMessage()    {}
+func (*FileCoverage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_coverage_23030c42b40853e2, []int{2}
+}
+func (m *FileCoverage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileCoverage.Unmarshal(m, b)
+}
+func (m *FileCoverage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileCoverage.Marshal(b, m, deterministic)
+}
+func (dst *FileCoverage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileCoverage.Merge(dst, src)
+}
+func (m *FileCoverage) XXX_Size() int {
+	return xxx_messageInfo_FileCoverage.Size(m)
+}
+func (m *FileCoverage) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileCoverage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileCoverage proto.InternalMessageInfo
+
+func (m *FileCoverage) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
+func (m *FileCoverage) GetLineCoverage() *LineCoverage {
+	if m != nil {
+		return m.LineCoverage
+	}
+	return nil
+}
+
+func (m *FileCoverage) GetBranchCoverage() *BranchCoverage {
+	if m != nil {
+		return m.BranchCoverage
+	}
+	return nil
+}
+
+// Describes code coverage for a build or test Action. This is used to store
+// baseline coverage for build Actions and test coverage for test Actions.
+type ActionCoverage struct {
+	// List of coverage info for all source files that the TestResult covers.
+	FileCoverages        []*FileCoverage `protobuf:"bytes,2,rep,name=file_coverages,json=fileCoverages,proto3" json:"file_coverages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *ActionCoverage) Reset()         { *m = ActionCoverage{} }
+func (m *ActionCoverage) String() string { return proto.CompactTextString(m) }
+func (*ActionCoverage) ProtoMessage()    {}
+func (*ActionCoverage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_coverage_23030c42b40853e2, []int{3}
+}
+func (m *ActionCoverage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ActionCoverage.Unmarshal(m, b)
+}
+func (m *ActionCoverage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ActionCoverage.Marshal(b, m, deterministic)
+}
+func (dst *ActionCoverage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ActionCoverage.Merge(dst, src)
+}
+func (m *ActionCoverage) XXX_Size() int {
+	return xxx_messageInfo_ActionCoverage.Size(m)
+}
+func (m *ActionCoverage) XXX_DiscardUnknown() {
+	xxx_messageInfo_ActionCoverage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ActionCoverage proto.InternalMessageInfo
+
+func (m *ActionCoverage) GetFileCoverages() []*FileCoverage {
+	if m != nil {
+		return m.FileCoverages
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*LineCoverage)(nil), "google.devtools.resultstore.v2.LineCoverage")
+	proto.RegisterType((*BranchCoverage)(nil), "google.devtools.resultstore.v2.BranchCoverage")
+	proto.RegisterType((*FileCoverage)(nil), "google.devtools.resultstore.v2.FileCoverage")
+	proto.RegisterType((*ActionCoverage)(nil), "google.devtools.resultstore.v2.ActionCoverage")
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/coverage.proto", fileDescriptor_coverage_23030c42b40853e2)
+}
+
+var fileDescriptor_coverage_23030c42b40853e2 = []byte{
+	// 372 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x4d, 0x6b, 0xe3, 0x30,
+	0x10, 0xc5, 0xf9, 0x58, 0x76, 0x67, 0x6d, 0xef, 0xae, 0xd8, 0x83, 0xd9, 0xc3, 0x12, 0x0c, 0x81,
+	0x1c, 0x1a, 0x19, 0xd2, 0x63, 0x4f, 0x4d, 0xa1, 0x10, 0xe8, 0x21, 0x75, 0x0f, 0x85, 0x5e, 0x8c,
+	0xe3, 0x4c, 0x1c, 0x51, 0x45, 0x72, 0x25, 0xc5, 0xf4, 0x7f, 0xf4, 0x7f, 0xf5, 0x37, 0x95, 0xc8,
+	0x1f, 0x71, 0x0f, 0x6d, 0x7a, 0xd3, 0xbc, 0x79, 0xf3, 0xde, 0xcc, 0x43, 0x30, 0xcd, 0xa5, 0xcc,
+	0x39, 0x46, 0x6b, 0x2c, 0x8d, 0x94, 0x5c, 0x47, 0x0a, 0xf5, 0x9e, 0x1b, 0x6d, 0xa4, 0xc2, 0xa8,
+	0x9c, 0x45, 0x99, 0x2c, 0x51, 0xa5, 0x39, 0xd2, 0x42, 0x49, 0x23, 0xc9, 0xff, 0x8a, 0x4e, 0x1b,
+	0x3a, 0xed, 0xd0, 0x69, 0x39, 0x0b, 0xd7, 0xe0, 0xde, 0x30, 0x81, 0x57, 0xf5, 0x14, 0x99, 0x02,
+	0x61, 0x42, 0x1b, 0xb5, 0xdf, 0xa1, 0x30, 0xb8, 0x4e, 0x38, 0x13, 0xa8, 0x03, 0x67, 0xe4, 0x4c,
+	0xdc, 0xf8, 0x4f, 0xb7, 0x73, 0x98, 0xd2, 0x64, 0x0c, 0x3e, 0x3e, 0x63, 0xb6, 0x3f, 0x52, 0x7b,
+	0x96, 0xea, 0x35, 0xa8, 0xa5, 0x85, 0x2f, 0x0e, 0xf8, 0x73, 0x95, 0x8a, 0x6c, 0xdb, 0x1a, 0x8d,
+	0xc1, 0x5f, 0x59, 0x24, 0x29, 0x14, 0x6a, 0x14, 0xa6, 0x36, 0xf1, 0x2a, 0x74, 0x59, 0x81, 0x64,
+	0x02, 0xbf, 0x2b, 0x00, 0x75, 0xc2, 0x84, 0xf5, 0x08, 0x7a, 0xa3, 0xfe, 0x64, 0x18, 0xfb, 0x0d,
+	0xbe, 0x10, 0x07, 0x13, 0xf2, 0x0f, 0xbe, 0x37, 0xa6, 0x41, 0xdf, 0x4a, 0xb5, 0x35, 0xf9, 0x0b,
+	0x43, 0x93, 0x3e, 0xa2, 0x08, 0x06, 0xb6, 0x51, 0x15, 0xe1, 0xab, 0x03, 0xee, 0x35, 0xe3, 0xc7,
+	0xe3, 0x09, 0x0c, 0x8a, 0xd4, 0x6c, 0xed, 0x26, 0x3f, 0x62, 0xfb, 0x26, 0xb7, 0xe0, 0x1d, 0x4c,
+	0x93, 0x26, 0x57, 0x7b, 0xe0, 0xcf, 0xd9, 0x19, 0xfd, 0x3c, 0x58, 0xda, 0x4d, 0x35, 0x76, 0x79,
+	0x37, 0xe3, 0x7b, 0xf8, 0x55, 0x9f, 0xde, 0x8a, 0xf6, 0xad, 0x28, 0x3d, 0x25, 0xfa, 0x3e, 0xc3,
+	0x26, 0x82, 0xa6, 0x0e, 0x11, 0xfc, 0xcb, 0xcc, 0x30, 0x29, 0x5a, 0xab, 0x3b, 0xf0, 0x37, 0x8c,
+	0x1f, 0xb7, 0xd7, 0x36, 0xbc, 0x2f, 0xac, 0xdf, 0xcd, 0x25, 0xf6, 0x36, 0x9d, 0x4a, 0xcf, 0x9f,
+	0x20, 0xcc, 0xe4, 0xee, 0x84, 0xc2, 0xd2, 0x79, 0x58, 0xd4, 0x8c, 0x5c, 0xf2, 0x54, 0xe4, 0x54,
+	0xaa, 0x3c, 0xca, 0x51, 0xd8, 0x7f, 0x19, 0x55, 0xad, 0xb4, 0x60, 0xfa, 0xa3, 0x9f, 0x7c, 0xd1,
+	0x29, 0x57, 0xdf, 0xec, 0xd4, 0xf9, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x92, 0x57, 0x34,
+	0xfe, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/coverage_summary.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/coverage_summary.pb.go
new file mode 100644
index 00000000..c519f0d2
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/coverage_summary.pb.go
@@ -0,0 +1,229 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/coverage_summary.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Summary of line coverage
+type LineCoverageSummary struct {
+	// Number of lines instrumented for coverage.
+	InstrumentedLineCount int32 `protobuf:"varint,1,opt,name=instrumented_line_count,json=instrumentedLineCount,proto3" json:"instrumented_line_count,omitempty"`
+	// Number of instrumented lines that were executed by the test.
+	ExecutedLineCount    int32    `protobuf:"varint,2,opt,name=executed_line_count,json=executedLineCount,proto3" json:"executed_line_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LineCoverageSummary) Reset()         { *m = LineCoverageSummary{} }
+func (m *LineCoverageSummary) String() string { return proto.CompactTextString(m) }
+func (*LineCoverageSummary) ProtoMessage()    {}
+func (*LineCoverageSummary) Descriptor() ([]byte, []int) {
+	return fileDescriptor_coverage_summary_b55cc8729ada7d99, []int{0}
+}
+func (m *LineCoverageSummary) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LineCoverageSummary.Unmarshal(m, b)
+}
+func (m *LineCoverageSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LineCoverageSummary.Marshal(b, m, deterministic)
+}
+func (dst *LineCoverageSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LineCoverageSummary.Merge(dst, src)
+}
+func (m *LineCoverageSummary) XXX_Size() int {
+	return xxx_messageInfo_LineCoverageSummary.Size(m)
+}
+func (m *LineCoverageSummary) XXX_DiscardUnknown() {
+	xxx_messageInfo_LineCoverageSummary.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LineCoverageSummary proto.InternalMessageInfo
+
+func (m *LineCoverageSummary) GetInstrumentedLineCount() int32 {
+	if m != nil {
+		return m.InstrumentedLineCount
+	}
+	return 0
+}
+
+func (m *LineCoverageSummary) GetExecutedLineCount() int32 {
+	if m != nil {
+		return m.ExecutedLineCount
+	}
+	return 0
+}
+
+// Summary of branch coverage
+// A branch may be:
+//  * not executed.  Counted only in total.
+//  * executed but not taken.  Appears in total and executed.
+//  * executed and taken.  Appears in all three fields.
+type BranchCoverageSummary struct {
+	// The number of branches present in the file.
+	TotalBranchCount int32 `protobuf:"varint,1,opt,name=total_branch_count,json=totalBranchCount,proto3" json:"total_branch_count,omitempty"`
+	// The number of branches executed out of the total branches present.
+	// A branch is executed when its condition is evaluated.
+	// This is <= total_branch_count as not all branches are executed.
+	ExecutedBranchCount int32 `protobuf:"varint,2,opt,name=executed_branch_count,json=executedBranchCount,proto3" json:"executed_branch_count,omitempty"`
+	// The number of branches taken out of the total branches executed.
+	// A branch is taken when its condition is satisfied.
+	// This is <= executed_branch_count as not all executed branches are taken.
+	TakenBranchCount     int32    `protobuf:"varint,3,opt,name=taken_branch_count,json=takenBranchCount,proto3" json:"taken_branch_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BranchCoverageSummary) Reset()         { *m = BranchCoverageSummary{} }
+func (m *BranchCoverageSummary) String() string { return proto.CompactTextString(m) }
+func (*BranchCoverageSummary) ProtoMessage()    {}
+func (*BranchCoverageSummary) Descriptor() ([]byte, []int) {
+	return fileDescriptor_coverage_summary_b55cc8729ada7d99, []int{1}
+}
+func (m *BranchCoverageSummary) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BranchCoverageSummary.Unmarshal(m, b)
+}
+func (m *BranchCoverageSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BranchCoverageSummary.Marshal(b, m, deterministic)
+}
+func (dst *BranchCoverageSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BranchCoverageSummary.Merge(dst, src)
+}
+func (m *BranchCoverageSummary) XXX_Size() int {
+	return xxx_messageInfo_BranchCoverageSummary.Size(m)
+}
+func (m *BranchCoverageSummary) XXX_DiscardUnknown() {
+	xxx_messageInfo_BranchCoverageSummary.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BranchCoverageSummary proto.InternalMessageInfo
+
+func (m *BranchCoverageSummary) GetTotalBranchCount() int32 {
+	if m != nil {
+		return m.TotalBranchCount
+	}
+	return 0
+}
+
+func (m *BranchCoverageSummary) GetExecutedBranchCount() int32 {
+	if m != nil {
+		return m.ExecutedBranchCount
+	}
+	return 0
+}
+
+func (m *BranchCoverageSummary) GetTakenBranchCount() int32 {
+	if m != nil {
+		return m.TakenBranchCount
+	}
+	return 0
+}
+
+// Summary of coverage in each language
+type LanguageCoverageSummary struct {
+	// This summary is for all files written in this programming language.
+	Language Language `protobuf:"varint,1,opt,name=language,proto3,enum=google.devtools.resultstore.v2.Language" json:"language,omitempty"`
+	// Summary of lines covered vs instrumented.
+	LineSummary *LineCoverageSummary `protobuf:"bytes,2,opt,name=line_summary,json=lineSummary,proto3" json:"line_summary,omitempty"`
+	// Summary of branch coverage.
+	BranchSummary        *BranchCoverageSummary `protobuf:"bytes,3,opt,name=branch_summary,json=branchSummary,proto3" json:"branch_summary,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *LanguageCoverageSummary) Reset()         { *m = LanguageCoverageSummary{} }
+func (m *LanguageCoverageSummary) String() string { return proto.CompactTextString(m) }
+func (*LanguageCoverageSummary) ProtoMessage()    {}
+func (*LanguageCoverageSummary) Descriptor() ([]byte, []int) {
+	return fileDescriptor_coverage_summary_b55cc8729ada7d99, []int{2}
+}
+func (m *LanguageCoverageSummary) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LanguageCoverageSummary.Unmarshal(m, b)
+}
+func (m *LanguageCoverageSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LanguageCoverageSummary.Marshal(b, m, deterministic)
+}
+func (dst *LanguageCoverageSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LanguageCoverageSummary.Merge(dst, src)
+}
+func (m *LanguageCoverageSummary) XXX_Size() int {
+	return xxx_messageInfo_LanguageCoverageSummary.Size(m)
+}
+func (m *LanguageCoverageSummary) XXX_DiscardUnknown() {
+	xxx_messageInfo_LanguageCoverageSummary.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LanguageCoverageSummary proto.InternalMessageInfo
+
+func (m *LanguageCoverageSummary) GetLanguage() Language {
+	if m != nil {
+		return m.Language
+	}
+	return Language_LANGUAGE_UNSPECIFIED
+}
+
+func (m *LanguageCoverageSummary) GetLineSummary() *LineCoverageSummary {
+	if m != nil {
+		return m.LineSummary
+	}
+	return nil
+}
+
+func (m *LanguageCoverageSummary) GetBranchSummary() *BranchCoverageSummary {
+	if m != nil {
+		return m.BranchSummary
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*LineCoverageSummary)(nil), "google.devtools.resultstore.v2.LineCoverageSummary")
+	proto.RegisterType((*BranchCoverageSummary)(nil), "google.devtools.resultstore.v2.BranchCoverageSummary")
+	proto.RegisterType((*LanguageCoverageSummary)(nil), "google.devtools.resultstore.v2.LanguageCoverageSummary")
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/coverage_summary.proto", fileDescriptor_coverage_summary_b55cc8729ada7d99)
+}
+
+var fileDescriptor_coverage_summary_b55cc8729ada7d99 = []byte{
+	// 358 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x4b, 0xeb, 0x40,
+	0x14, 0x85, 0x49, 0xcb, 0x7b, 0x3c, 0xa6, 0xef, 0x95, 0x67, 0x4a, 0xa9, 0xb8, 0x10, 0xc9, 0xaa,
+	0xa0, 0x4c, 0x20, 0xa5, 0x6e, 0xdc, 0x55, 0x37, 0x42, 0x17, 0x12, 0xc1, 0x85, 0x08, 0x61, 0x9a,
+	0x5e, 0xc6, 0x60, 0x32, 0xb7, 0x4e, 0x26, 0x41, 0x17, 0xfe, 0x0c, 0x7f, 0x83, 0x7f, 0x53, 0x32,
+	0x33, 0x09, 0x69, 0xab, 0x66, 0x39, 0x9c, 0x7b, 0xbe, 0x73, 0x66, 0xee, 0x90, 0x39, 0x47, 0xe4,
+	0x29, 0xf8, 0x6b, 0x28, 0x15, 0x62, 0x9a, 0xfb, 0x12, 0xf2, 0x22, 0x55, 0xb9, 0x42, 0x09, 0x7e,
+	0x19, 0xf8, 0x31, 0x96, 0x20, 0x19, 0x87, 0x28, 0x2f, 0xb2, 0x8c, 0xc9, 0x57, 0xba, 0x91, 0xa8,
+	0xd0, 0x3d, 0x36, 0x36, 0x5a, 0xdb, 0x68, 0xcb, 0x46, 0xcb, 0xe0, 0xe8, 0xb4, 0x13, 0x9b, 0x65,
+	0x28, 0x0c, 0xcc, 0x7b, 0x23, 0xa3, 0x65, 0x22, 0xe0, 0xd2, 0x46, 0xdd, 0x9a, 0x24, 0xf7, 0x9c,
+	0x4c, 0x12, 0x91, 0x2b, 0x59, 0x64, 0x20, 0x14, 0xac, 0xa3, 0x34, 0x11, 0x10, 0xc5, 0x58, 0x08,
+	0x75, 0xe8, 0x9c, 0x38, 0xd3, 0x5f, 0xe1, 0xb8, 0x2d, 0x1b, 0x42, 0x21, 0x94, 0x4b, 0xc9, 0x08,
+	0x5e, 0x20, 0x2e, 0x76, 0x3c, 0x3d, 0xed, 0x39, 0xa8, 0xa5, 0x66, 0xde, 0xfb, 0x70, 0xc8, 0x78,
+	0x21, 0x99, 0x88, 0x1f, 0x77, 0x1b, 0x9c, 0x11, 0x57, 0xa1, 0x62, 0x69, 0xb4, 0xd2, 0xf2, 0x56,
+	0xf8, 0x7f, 0xad, 0xd4, 0xbe, 0x2a, 0x37, 0x20, 0xe3, 0x26, 0x77, 0xcb, 0x60, 0x92, 0x9b, 0x52,
+	0x6d, 0x4f, 0x95, 0xc0, 0x9e, 0x40, 0x6c, 0x1b, 0xfa, 0x36, 0xa1, 0x52, 0x5a, 0xd3, 0xde, 0x7b,
+	0x8f, 0x4c, 0x96, 0x4c, 0xf0, 0x82, 0xf1, 0xbd, 0xd7, 0xba, 0x22, 0x7f, 0x52, 0x2b, 0xe9, 0x86,
+	0xc3, 0x60, 0x4a, 0x7f, 0x5e, 0x12, 0xad, 0x51, 0x61, 0xe3, 0x74, 0xef, 0xc8, 0x5f, 0xfd, 0x64,
+	0x76, 0xdb, 0xba, 0xfa, 0x20, 0x98, 0x75, 0x92, 0xf6, 0xd7, 0x17, 0x0e, 0x2a, 0x50, 0xdd, 0xee,
+	0x81, 0x0c, 0xed, 0x0d, 0x6b, 0x72, 0x5f, 0x93, 0xe7, 0x5d, 0xe4, 0x2f, 0x17, 0x13, 0xfe, 0x33,
+	0x30, 0x7b, 0x5c, 0x3c, 0x13, 0x2f, 0xc6, 0xac, 0x03, 0x75, 0xe3, 0xdc, 0x5f, 0xdb, 0x09, 0x8e,
+	0xd5, 0x85, 0x29, 0x4a, 0xee, 0x73, 0x10, 0xfa, 0x13, 0xfa, 0x46, 0x62, 0x9b, 0x24, 0xff, 0xee,
+	0xd3, 0x5e, 0xb4, 0x8e, 0xab, 0xdf, 0xda, 0x35, 0xfb, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x65,
+	0x24, 0xb5, 0x40, 0x03, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/file.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/file.pb.go
new file mode 100644
index 00000000..c6912ed5
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/file.pb.go
@@ -0,0 +1,238 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/file.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The metadata for a file or an archive file entry.
+type File struct {
+	// The identifier of the file or archive entry.
+	// User-provided, must be unique for the repeated field it is in. When an
+	// Append RPC is called with a Files field populated, if a File already exists
+	// with this ID, that File will be overwritten with the new File proto.
+	Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"`
+	// The URI of a file.
+	// This could also be the URI of an entire archive.
+	// Most log data doesn't need to be stored forever, so a ttl is suggested.
+	// Note that if you ever move or delete the file at this URI, the link from
+	// the server will be broken.
+	Uri string `protobuf:"bytes,2,opt,name=uri,proto3" json:"uri,omitempty"`
+	// (Optional) The length of the file in bytes.  Allows the filesize to be
+	// shown in the UI.  Omit if file is still being written or length is
+	// not known.  This could also be the length of an entire archive.
+	Length *wrappers.Int64Value `protobuf:"bytes,3,opt,name=length,proto3" json:"length,omitempty"`
+	// (Optional) The content-type (aka MIME-type) of the file.  This is sent to
+	// the web browser so it knows how to handle the file. (e.g. text/plain,
+	// image/jpeg, text/html, etc). For zip archives, use "application/zip".
+	ContentType string `protobuf:"bytes,4,opt,name=content_type,json=contentType,proto3" json:"content_type,omitempty"`
+	// (Optional) If the above path, length, and content_type are referring to an
+	// archive, and you wish to refer to a particular entry within that archive,
+	// put the particular archive entry data here.
+	ArchiveEntry *ArchiveEntry `protobuf:"bytes,5,opt,name=archive_entry,json=archiveEntry,proto3" json:"archive_entry,omitempty"`
+	// (Optional) A url to a content display app/site for this file or archive
+	// entry.
+	ContentViewer string `protobuf:"bytes,6,opt,name=content_viewer,json=contentViewer,proto3" json:"content_viewer,omitempty"`
+	// (Optional) Whether to hide this file or archive entry in the UI.  Defaults
+	// to false. A checkbox lets users see hidden files, but they're hidden by
+	// default.
+	Hidden bool `protobuf:"varint,7,opt,name=hidden,proto3" json:"hidden,omitempty"`
+	// (Optional) A short description of what this file or archive entry
+	// contains. This description should help someone viewing the list of these
+	// files to understand the purpose of this file and what they would want to
+	// view it for.
+	Description          string   `protobuf:"bytes,8,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *File) Reset()         { *m = File{} }
+func (m *File) String() string { return proto.CompactTextString(m) }
+func (*File) ProtoMessage()    {}
+func (*File) Descriptor() ([]byte, []int) {
+	return fileDescriptor_file_164a6769e8eec974, []int{0}
+}
+func (m *File) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_File.Unmarshal(m, b)
+}
+func (m *File) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_File.Marshal(b, m, deterministic)
+}
+func (dst *File) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_File.Merge(dst, src)
+}
+func (m *File) XXX_Size() int {
+	return xxx_messageInfo_File.Size(m)
+}
+func (m *File) XXX_DiscardUnknown() {
+	xxx_messageInfo_File.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_File proto.InternalMessageInfo
+
+func (m *File) GetUid() string {
+	if m != nil {
+		return m.Uid
+	}
+	return ""
+}
+
+func (m *File) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+func (m *File) GetLength() *wrappers.Int64Value {
+	if m != nil {
+		return m.Length
+	}
+	return nil
+}
+
+func (m *File) GetContentType() string {
+	if m != nil {
+		return m.ContentType
+	}
+	return ""
+}
+
+func (m *File) GetArchiveEntry() *ArchiveEntry {
+	if m != nil {
+		return m.ArchiveEntry
+	}
+	return nil
+}
+
+func (m *File) GetContentViewer() string {
+	if m != nil {
+		return m.ContentViewer
+	}
+	return ""
+}
+
+func (m *File) GetHidden() bool {
+	if m != nil {
+		return m.Hidden
+	}
+	return false
+}
+
+func (m *File) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+// Information specific to an entry in an archive.
+type ArchiveEntry struct {
+	// The relative path of the entry within the archive.
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	// (Optional) The uncompressed length of the archive entry in bytes.  Allows
+	// the entry size to be shown in the UI.  Omit if the length is not known.
+	Length *wrappers.Int64Value `protobuf:"bytes,2,opt,name=length,proto3" json:"length,omitempty"`
+	// (Optional) The content-type (aka MIME-type) of the archive entry. (e.g.
+	// text/plain, image/jpeg, text/html, etc). This is sent to the web browser
+	// so it knows how to handle the entry.
+	ContentType          string   `protobuf:"bytes,3,opt,name=content_type,json=contentType,proto3" json:"content_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ArchiveEntry) Reset()         { *m = ArchiveEntry{} }
+func (m *ArchiveEntry) String() string { return proto.CompactTextString(m) }
+func (*ArchiveEntry) ProtoMessage()    {}
+func (*ArchiveEntry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_file_164a6769e8eec974, []int{1}
+}
+func (m *ArchiveEntry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ArchiveEntry.Unmarshal(m, b)
+}
+func (m *ArchiveEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ArchiveEntry.Marshal(b, m, deterministic)
+}
+func (dst *ArchiveEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArchiveEntry.Merge(dst, src)
+}
+func (m *ArchiveEntry) XXX_Size() int {
+	return xxx_messageInfo_ArchiveEntry.Size(m)
+}
+func (m *ArchiveEntry) XXX_DiscardUnknown() {
+	xxx_messageInfo_ArchiveEntry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ArchiveEntry proto.InternalMessageInfo
+
+func (m *ArchiveEntry) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
+func (m *ArchiveEntry) GetLength() *wrappers.Int64Value {
+	if m != nil {
+		return m.Length
+	}
+	return nil
+}
+
+func (m *ArchiveEntry) GetContentType() string {
+	if m != nil {
+		return m.ContentType
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*File)(nil), "google.devtools.resultstore.v2.File")
+	proto.RegisterType((*ArchiveEntry)(nil), "google.devtools.resultstore.v2.ArchiveEntry")
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/file.proto", fileDescriptor_file_164a6769e8eec974)
+}
+
+var fileDescriptor_file_164a6769e8eec974 = []byte{
+	// 350 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xdf, 0x4b, 0xeb, 0x30,
+	0x14, 0xa6, 0xdb, 0x6e, 0xef, 0x6e, 0xb6, 0x5d, 0x24, 0x0f, 0x12, 0x14, 0xa4, 0x0e, 0x84, 0x09,
+	0x92, 0xc0, 0x26, 0xbe, 0xf8, 0xa4, 0xa0, 0xb0, 0x37, 0x2d, 0xb2, 0x07, 0x5f, 0x46, 0xd7, 0x9e,
+	0xb5, 0x81, 0x98, 0xc4, 0x34, 0xed, 0x98, 0x7f, 0x98, 0x7f, 0x9f, 0x2c, 0xcd, 0xa0, 0x20, 0x2a,
+	0xf8, 0x76, 0xce, 0x77, 0xbe, 0x1f, 0xed, 0x47, 0xd0, 0x79, 0xae, 0x54, 0x2e, 0x80, 0x65, 0x50,
+	0x5b, 0xa5, 0x44, 0xc9, 0x0c, 0x94, 0x95, 0xb0, 0xa5, 0x55, 0x06, 0x58, 0x3d, 0x65, 0x6b, 0x2e,
+	0x80, 0x6a, 0xa3, 0xac, 0xc2, 0x27, 0x0d, 0x95, 0xee, 0xa9, 0xb4, 0x45, 0xa5, 0xf5, 0xf4, 0xc8,
+	0xdf, 0x99, 0x63, 0xaf, 0xaa, 0x35, 0xdb, 0x98, 0x44, 0x6b, 0x30, 0x65, 0xa3, 0x1f, 0xbf, 0x77,
+	0x50, 0xef, 0x9e, 0x0b, 0xc0, 0x07, 0xa8, 0x5b, 0xf1, 0x8c, 0x04, 0x51, 0x30, 0xf9, 0x17, 0xef,
+	0x46, 0x87, 0x18, 0x4e, 0x3a, 0x1e, 0x31, 0x1c, 0xcf, 0x50, 0x28, 0x40, 0xe6, 0xb6, 0x20, 0xdd,
+	0x28, 0x98, 0x0c, 0xa6, 0xc7, 0xd4, 0xa7, 0xef, 0xdd, 0xe9, 0x5c, 0xda, 0xab, 0xcb, 0x45, 0x22,
+	0x2a, 0x88, 0x3d, 0x15, 0x9f, 0xa2, 0x61, 0xaa, 0xa4, 0x05, 0x69, 0x97, 0x76, 0xab, 0x81, 0xf4,
+	0x9c, 0xdf, 0xc0, 0x63, 0x4f, 0x5b, 0x0d, 0xf8, 0x11, 0x8d, 0x12, 0x93, 0x16, 0xbc, 0x86, 0x25,
+	0x48, 0x6b, 0xb6, 0xe4, 0x8f, 0xb3, 0xbf, 0xa0, 0xdf, 0xff, 0x1c, 0xbd, 0x69, 0x44, 0x77, 0x3b,
+	0x4d, 0x3c, 0x4c, 0x5a, 0x1b, 0x3e, 0x43, 0xff, 0xf7, 0xa9, 0x35, 0x87, 0x0d, 0x18, 0x12, 0xba,
+	0xdc, 0x91, 0x47, 0x17, 0x0e, 0xc4, 0x87, 0x28, 0x2c, 0x78, 0x96, 0x81, 0x24, 0x7f, 0xa3, 0x60,
+	0xd2, 0x8f, 0xfd, 0x86, 0x23, 0x34, 0xc8, 0xa0, 0x4c, 0x0d, 0xd7, 0x96, 0x2b, 0x49, 0xfa, 0xcd,
+	0x37, 0xb7, 0xa0, 0xf1, 0x1b, 0x1a, 0xb6, 0xe3, 0x31, 0x46, 0x3d, 0x9d, 0xd8, 0xc2, 0x17, 0xe8,
+	0xe6, 0x56, 0x5f, 0x9d, 0xdf, 0xf7, 0xd5, 0xfd, 0xd4, 0xd7, 0xed, 0x2b, 0x1a, 0xa7, 0xea, 0xe5,
+	0x87, 0x76, 0x1e, 0x82, 0xe7, 0xb9, 0x67, 0xe4, 0x4a, 0x24, 0x32, 0xa7, 0xca, 0xe4, 0x2c, 0x07,
+	0xe9, 0xc2, 0x59, 0x73, 0x4a, 0x34, 0x2f, 0xbf, 0x7a, 0x66, 0xd7, 0xad, 0x75, 0x15, 0x3a, 0xd5,
+	0xec, 0x23, 0x00, 0x00, 0xff, 0xff, 0x65, 0xa9, 0x29, 0x4f, 0x9b, 0x02, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/file_set.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/file_set.pb.go
new file mode 100644
index 00000000..36bb9f73
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/file_set.pb.go
@@ -0,0 +1,169 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/file_set.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Represents a set of files within an Invocation. Can contain other file sets.
+type FileSet struct {
+	// The format of this FileSet resource name must be:
+	// invocations/${INVOCATION_ID}/fileSets/${FILE_SET_ID}
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The resource ID components that identify the file set. They must match the
+	// resource name after proper encoding.
+	Id *FileSet_Id `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	// List of names of other file sets that are referenced from this one.
+	// Each name must point to a file set under the same invocation. The name
+	// format must be: invocations/${INVOCATION_ID}/fileSets/${FILE_SET_ID}
+	FileSets []string `protobuf:"bytes,3,rep,name=file_sets,json=fileSets,proto3" json:"file_sets,omitempty"`
+	// Files that are contained within this file set.
+	Files                []*File  `protobuf:"bytes,4,rep,name=files,proto3" json:"files,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FileSet) Reset()         { *m = FileSet{} }
+func (m *FileSet) String() string { return proto.CompactTextString(m) }
+func (*FileSet) ProtoMessage()    {}
+func (*FileSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_file_set_f92ed2b2eba5ffbc, []int{0}
+}
+func (m *FileSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileSet.Unmarshal(m, b)
+}
+func (m *FileSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileSet.Marshal(b, m, deterministic)
+}
+func (dst *FileSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileSet.Merge(dst, src)
+}
+func (m *FileSet) XXX_Size() int {
+	return xxx_messageInfo_FileSet.Size(m)
+}
+func (m *FileSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileSet.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileSet proto.InternalMessageInfo
+
+func (m *FileSet) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *FileSet) GetId() *FileSet_Id {
+	if m != nil {
+		return m.Id
+	}
+	return nil
+}
+
+func (m *FileSet) GetFileSets() []string {
+	if m != nil {
+		return m.FileSets
+	}
+	return nil
+}
+
+func (m *FileSet) GetFiles() []*File {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+// The resource ID components that identify the FileSet.
+type FileSet_Id struct {
+	// The Invocation ID.
+	InvocationId string `protobuf:"bytes,1,opt,name=invocation_id,json=invocationId,proto3" json:"invocation_id,omitempty"`
+	// The FileSet ID.
+	FileSetId            string   `protobuf:"bytes,2,opt,name=file_set_id,json=fileSetId,proto3" json:"file_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FileSet_Id) Reset()         { *m = FileSet_Id{} }
+func (m *FileSet_Id) String() string { return proto.CompactTextString(m) }
+func (*FileSet_Id) ProtoMessage()    {}
+func (*FileSet_Id) Descriptor() ([]byte, []int) {
+	return fileDescriptor_file_set_f92ed2b2eba5ffbc, []int{0, 0}
+}
+func (m *FileSet_Id) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileSet_Id.Unmarshal(m, b)
+}
+func (m *FileSet_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileSet_Id.Marshal(b, m, deterministic)
+}
+func (dst *FileSet_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileSet_Id.Merge(dst, src)
+}
+func (m *FileSet_Id) XXX_Size() int {
+	return xxx_messageInfo_FileSet_Id.Size(m)
+}
+func (m *FileSet_Id) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileSet_Id.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FileSet_Id proto.InternalMessageInfo
+
+func (m *FileSet_Id) GetInvocationId() string {
+	if m != nil {
+		return m.InvocationId
+	}
+	return ""
+}
+
+func (m *FileSet_Id) GetFileSetId() string {
+	if m != nil {
+		return m.FileSetId
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*FileSet)(nil), "google.devtools.resultstore.v2.FileSet")
+	proto.RegisterType((*FileSet_Id)(nil), "google.devtools.resultstore.v2.FileSet.Id")
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/file_set.proto", fileDescriptor_file_set_f92ed2b2eba5ffbc)
+}
+
+var fileDescriptor_file_set_f92ed2b2eba5ffbc = []byte{
+	// 271 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xbb, 0x4f, 0xc3, 0x30,
+	0x10, 0x87, 0x95, 0xa4, 0x3c, 0x72, 0x81, 0xc5, 0x53, 0x54, 0xa4, 0x2a, 0x2a, 0x0c, 0x01, 0x09,
+	0x5b, 0x0a, 0x5b, 0xd9, 0x18, 0x90, 0xbc, 0xa1, 0xb0, 0xb1, 0x44, 0xa1, 0xbe, 0x5a, 0x96, 0xdc,
+	0x5c, 0x89, 0x4d, 0xfe, 0x7b, 0x24, 0x44, 0x1e, 0xa2, 0x0b, 0xb4, 0xdb, 0xd9, 0xfe, 0xee, 0x77,
+	0x9f, 0x0f, 0xee, 0x35, 0x91, 0xb6, 0x28, 0x14, 0x76, 0x9e, 0xc8, 0x3a, 0xd1, 0xa2, 0xfb, 0xb4,
+	0xde, 0x79, 0x6a, 0x51, 0x74, 0x85, 0xd8, 0x18, 0x8b, 0x95, 0x43, 0xcf, 0x77, 0x2d, 0x79, 0x62,
+	0x8b, 0x01, 0xe7, 0x13, 0xce, 0xf7, 0x70, 0xde, 0x15, 0xf3, 0xdb, 0x23, 0xe2, 0x86, 0xa8, 0xe5,
+	0x57, 0x00, 0x67, 0xcf, 0xc6, 0xe2, 0x2b, 0x7a, 0xc6, 0x60, 0xd6, 0xd4, 0x5b, 0x4c, 0x83, 0x2c,
+	0xc8, 0xe3, 0xb2, 0xaf, 0xd9, 0x0a, 0x42, 0xa3, 0xd2, 0x30, 0x0b, 0xf2, 0xa4, 0xb8, 0xe3, 0xff,
+	0xcf, 0xe5, 0x63, 0x10, 0x97, 0xaa, 0x0c, 0x8d, 0x62, 0x57, 0x10, 0x4f, 0xe2, 0x2e, 0x8d, 0xb2,
+	0x28, 0x8f, 0xcb, 0xf3, 0xcd, 0x80, 0x38, 0xb6, 0x82, 0x93, 0x9f, 0xda, 0xa5, 0xb3, 0x2c, 0xca,
+	0x93, 0xe2, 0xe6, 0x98, 0xec, 0x72, 0x68, 0x99, 0x4b, 0x08, 0xa5, 0x62, 0xd7, 0x70, 0x69, 0x9a,
+	0x8e, 0xd6, 0xb5, 0x37, 0xd4, 0x54, 0x46, 0x8d, 0xde, 0x17, 0xbf, 0x97, 0x52, 0xb1, 0x05, 0x24,
+	0x93, 0x43, 0x35, 0x7e, 0x24, 0x2e, 0xe3, 0xd1, 0x42, 0xaa, 0xa7, 0x0f, 0x58, 0xae, 0x69, 0x7b,
+	0x60, 0xf8, 0x4b, 0xf0, 0x26, 0x47, 0x42, 0x93, 0xad, 0x1b, 0xcd, 0xa9, 0xd5, 0x42, 0x63, 0xd3,
+	0xef, 0x50, 0x0c, 0x4f, 0xf5, 0xce, 0xb8, 0xbf, 0x36, 0xfe, 0xb8, 0x77, 0x7c, 0x3f, 0xed, 0xbb,
+	0x1e, 0xbe, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x67, 0xbb, 0x64, 0xf5, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/invocation.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/invocation.pb.go
new file mode 100644
index 00000000..db8400ab
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/invocation.pb.go
@@ -0,0 +1,485 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/invocation.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// An Invocation typically represents the result of running a tool. Each has a
+// unique ID, typically generated by the server. Target resources under each
+// Invocation contain the bulk of the data.
+type Invocation struct {
+	// The resource name.  Its format must be:
+	// invocations/${INVOCATION_ID}
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The resource ID components that identify the Invocation. They must match
+	// the resource name after proper encoding.
+	Id *Invocation_Id `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	// The aggregate status of the invocation.
+	StatusAttributes *StatusAttributes `protobuf:"bytes,3,opt,name=status_attributes,json=statusAttributes,proto3" json:"status_attributes,omitempty"`
+	// When this invocation started and its duration.
+	Timing *Timing `protobuf:"bytes,4,opt,name=timing,proto3" json:"timing,omitempty"`
+	// Attributes of this invocation.
+	InvocationAttributes *InvocationAttributes `protobuf:"bytes,5,opt,name=invocation_attributes,json=invocationAttributes,proto3" json:"invocation_attributes,omitempty"`
+	// The workspace the tool was run in.
+	WorkspaceInfo *WorkspaceInfo `protobuf:"bytes,6,opt,name=workspace_info,json=workspaceInfo,proto3" json:"workspace_info,omitempty"`
+	// Arbitrary name-value pairs.
+	// This is implemented as a multi-map. Multiple properties are allowed with
+	// the same key. Properties will be returned in lexicographical order by key.
+	Properties []*Property `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty"`
+	// A list of file references for invocation level files.
+	// The file IDs must be unique within this list. Duplicate file IDs will
+	// result in an error. Files will be returned in lexicographical order by ID.
+	// Use this field to specify build logs, and other invocation level logs.
+	Files []*File `protobuf:"bytes,8,rep,name=files,proto3" json:"files,omitempty"`
+	// Summary of aggregate coverage across all Actions in this Invocation.
+	// the server populates this for you in the post-processing phase.
+	CoverageSummaries    []*LanguageCoverageSummary `protobuf:"bytes,9,rep,name=coverage_summaries,json=coverageSummaries,proto3" json:"coverage_summaries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *Invocation) Reset()         { *m = Invocation{} }
+func (m *Invocation) String() string { return proto.CompactTextString(m) }
+func (*Invocation) ProtoMessage()    {}
+func (*Invocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_invocation_04b66137ff87776e, []int{0}
+}
+func (m *Invocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Invocation.Unmarshal(m, b)
+}
+func (m *Invocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Invocation.Marshal(b, m, deterministic)
+}
+func (dst *Invocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Invocation.Merge(dst, src)
+}
+func (m *Invocation) XXX_Size() int {
+	return xxx_messageInfo_Invocation.Size(m)
+}
+func (m *Invocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Invocation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Invocation proto.InternalMessageInfo
+
+func (m *Invocation) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Invocation) GetId() *Invocation_Id {
+	if m != nil {
+		return m.Id
+	}
+	return nil
+}
+
+func (m *Invocation) GetStatusAttributes() *StatusAttributes {
+	if m != nil {
+		return m.StatusAttributes
+	}
+	return nil
+}
+
+func (m *Invocation) GetTiming() *Timing {
+	if m != nil {
+		return m.Timing
+	}
+	return nil
+}
+
+func (m *Invocation) GetInvocationAttributes() *InvocationAttributes {
+	if m != nil {
+		return m.InvocationAttributes
+	}
+	return nil
+}
+
+func (m *Invocation) GetWorkspaceInfo() *WorkspaceInfo {
+	if m != nil {
+		return m.WorkspaceInfo
+	}
+	return nil
+}
+
+func (m *Invocation) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+func (m *Invocation) GetFiles() []*File {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+func (m *Invocation) GetCoverageSummaries() []*LanguageCoverageSummary {
+	if m != nil {
+		return m.CoverageSummaries
+	}
+	return nil
+}
+
+// The resource ID components that identify the Invocation.
+type Invocation_Id struct {
+	// The Invocation ID.
+	InvocationId         string   `protobuf:"bytes,1,opt,name=invocation_id,json=invocationId,proto3" json:"invocation_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Invocation_Id) Reset()         { *m = Invocation_Id{} }
+func (m *Invocation_Id) String() string { return proto.CompactTextString(m) }
+func (*Invocation_Id) ProtoMessage()    {}
+func (*Invocation_Id) Descriptor() ([]byte, []int) {
+	return fileDescriptor_invocation_04b66137ff87776e, []int{0, 0}
+}
+func (m *Invocation_Id) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Invocation_Id.Unmarshal(m, b)
+}
+func (m *Invocation_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Invocation_Id.Marshal(b, m, deterministic)
+}
+func (dst *Invocation_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Invocation_Id.Merge(dst, src)
+}
+func (m *Invocation_Id) XXX_Size() int {
+	return xxx_messageInfo_Invocation_Id.Size(m)
+}
+func (m *Invocation_Id) XXX_DiscardUnknown() {
+	xxx_messageInfo_Invocation_Id.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Invocation_Id proto.InternalMessageInfo
+
+func (m *Invocation_Id) GetInvocationId() string {
+	if m != nil {
+		return m.InvocationId
+	}
+	return ""
+}
+
+// If known, represents the state of the user/build-system workspace.
+type WorkspaceContext struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WorkspaceContext) Reset()         { *m = WorkspaceContext{} }
+func (m *WorkspaceContext) String() string { return proto.CompactTextString(m) }
+func (*WorkspaceContext) ProtoMessage()    {}
+func (*WorkspaceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_invocation_04b66137ff87776e, []int{1}
+}
+func (m *WorkspaceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WorkspaceContext.Unmarshal(m, b)
+}
+func (m *WorkspaceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WorkspaceContext.Marshal(b, m, deterministic)
+}
+func (dst *WorkspaceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkspaceContext.Merge(dst, src)
+}
+func (m *WorkspaceContext) XXX_Size() int {
+	return xxx_messageInfo_WorkspaceContext.Size(m)
+}
+func (m *WorkspaceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_WorkspaceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WorkspaceContext proto.InternalMessageInfo
+
+// Describes the workspace under which the tool was invoked, this includes
+// information that was fed into the command, the source code referenced, and
+// the tool itself.
+type WorkspaceInfo struct {
+	// Data about the workspace that might be useful for debugging.
+	WorkspaceContext *WorkspaceContext `protobuf:"bytes,1,opt,name=workspace_context,json=workspaceContext,proto3" json:"workspace_context,omitempty"`
+	// Where the tool was invoked
+	Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	// The client's working directory where the build/test was run from.
+	WorkingDirectory string `protobuf:"bytes,4,opt,name=working_directory,json=workingDirectory,proto3" json:"working_directory,omitempty"`
+	// Tools should set tool_tag to the name of the tool or use case.
+	ToolTag string `protobuf:"bytes,5,opt,name=tool_tag,json=toolTag,proto3" json:"tool_tag,omitempty"`
+	// The command lines invoked. The first command line is the one typed by the
+	// user, then each one after that should be an expansion of the previous
+	// command line.
+	CommandLines         []*CommandLine `protobuf:"bytes,7,rep,name=command_lines,json=commandLines,proto3" json:"command_lines,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *WorkspaceInfo) Reset()         { *m = WorkspaceInfo{} }
+func (m *WorkspaceInfo) String() string { return proto.CompactTextString(m) }
+func (*WorkspaceInfo) ProtoMessage()    {}
+func (*WorkspaceInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_invocation_04b66137ff87776e, []int{2}
+}
+func (m *WorkspaceInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WorkspaceInfo.Unmarshal(m, b)
+}
+func (m *WorkspaceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WorkspaceInfo.Marshal(b, m, deterministic)
+}
+func (dst *WorkspaceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WorkspaceInfo.Merge(dst, src)
+}
+func (m *WorkspaceInfo) XXX_Size() int {
+	return xxx_messageInfo_WorkspaceInfo.Size(m)
+}
+func (m *WorkspaceInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_WorkspaceInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WorkspaceInfo proto.InternalMessageInfo
+
+func (m *WorkspaceInfo) GetWorkspaceContext() *WorkspaceContext {
+	if m != nil {
+		return m.WorkspaceContext
+	}
+	return nil
+}
+
+func (m *WorkspaceInfo) GetHostname() string {
+	if m != nil {
+		return m.Hostname
+	}
+	return ""
+}
+
+func (m *WorkspaceInfo) GetWorkingDirectory() string {
+	if m != nil {
+		return m.WorkingDirectory
+	}
+	return ""
+}
+
+func (m *WorkspaceInfo) GetToolTag() string {
+	if m != nil {
+		return m.ToolTag
+	}
+	return ""
+}
+
+func (m *WorkspaceInfo) GetCommandLines() []*CommandLine {
+	if m != nil {
+		return m.CommandLines
+	}
+	return nil
+}
+
+// The command and arguments that produced this Invocation.
+type CommandLine struct {
+	// A label describing this command line.
+	Label string `protobuf:"bytes,1,opt,name=label,proto3" json:"label,omitempty"`
+	// The command-line tool that is run: argv[0].
+	Tool string `protobuf:"bytes,2,opt,name=tool,proto3" json:"tool,omitempty"`
+	// The arguments to the above tool: argv[1]...argv[N].
+	Args []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
+	// The actual command that was run with the tool.  (e.g. "build", or "test")
+	// Omit if the tool doesn't accept a command.
+	// This is a duplicate of one of the fields in args.
+	Command              string   `protobuf:"bytes,4,opt,name=command,proto3" json:"command,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CommandLine) Reset()         { *m = CommandLine{} }
+func (m *CommandLine) String() string { return proto.CompactTextString(m) }
+func (*CommandLine) ProtoMessage()    {}
+func (*CommandLine) Descriptor() ([]byte, []int) {
+	return fileDescriptor_invocation_04b66137ff87776e, []int{3}
+}
+func (m *CommandLine) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommandLine.Unmarshal(m, b)
+}
+func (m *CommandLine) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommandLine.Marshal(b, m, deterministic)
+}
+func (dst *CommandLine) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommandLine.Merge(dst, src)
+}
+func (m *CommandLine) XXX_Size() int {
+	return xxx_messageInfo_CommandLine.Size(m)
+}
+func (m *CommandLine) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommandLine.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommandLine proto.InternalMessageInfo
+
+func (m *CommandLine) GetLabel() string {
+	if m != nil {
+		return m.Label
+	}
+	return ""
+}
+
+func (m *CommandLine) GetTool() string {
+	if m != nil {
+		return m.Tool
+	}
+	return ""
+}
+
+func (m *CommandLine) GetArgs() []string {
+	if m != nil {
+		return m.Args
+	}
+	return nil
+}
+
+func (m *CommandLine) GetCommand() string {
+	if m != nil {
+		return m.Command
+	}
+	return ""
+}
+
+// Attributes that apply to all invocations.
+type InvocationAttributes struct {
+	// The project ID this invocation is associated with. This must be
+	// set in the CreateInvocation call, and can't be changed.
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// The list of users in the command chain.  The first user in this sequence
+	// is the one who instigated the first command in the chain.
+	Users []string `protobuf:"bytes,2,rep,name=users,proto3" json:"users,omitempty"`
+	// Labels to categorize this invocation.
+	// This is implemented as a set. All labels will be unique. Any duplicate
+	// labels added will be ignored. Labels will be returned in lexicographical
+	// order. Labels should be short, easy to read, and you
+	// shouldn't have more than a handful.
+	// Labels should match regex \w([- \w]*\w)?
+	// Labels should not be used for unique properties such as unique IDs.
+	// Use properties in cases that don't meet these conditions.
+	Labels               []string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InvocationAttributes) Reset()         { *m = InvocationAttributes{} }
+func (m *InvocationAttributes) String() string { return proto.CompactTextString(m) }
+func (*InvocationAttributes) ProtoMessage()    {}
+func (*InvocationAttributes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_invocation_04b66137ff87776e, []int{4}
+}
+func (m *InvocationAttributes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InvocationAttributes.Unmarshal(m, b)
+}
+func (m *InvocationAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InvocationAttributes.Marshal(b, m, deterministic)
+}
+func (dst *InvocationAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InvocationAttributes.Merge(dst, src)
+}
+func (m *InvocationAttributes) XXX_Size() int {
+	return xxx_messageInfo_InvocationAttributes.Size(m)
+}
+func (m *InvocationAttributes) XXX_DiscardUnknown() {
+	xxx_messageInfo_InvocationAttributes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InvocationAttributes proto.InternalMessageInfo
+
+func (m *InvocationAttributes) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+func (m *InvocationAttributes) GetUsers() []string {
+	if m != nil {
+		return m.Users
+	}
+	return nil
+}
+
+func (m *InvocationAttributes) GetLabels() []string {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Invocation)(nil), "google.devtools.resultstore.v2.Invocation")
+	proto.RegisterType((*Invocation_Id)(nil), "google.devtools.resultstore.v2.Invocation.Id")
+	proto.RegisterType((*WorkspaceContext)(nil), "google.devtools.resultstore.v2.WorkspaceContext")
+	proto.RegisterType((*WorkspaceInfo)(nil), "google.devtools.resultstore.v2.WorkspaceInfo")
+	proto.RegisterType((*CommandLine)(nil), "google.devtools.resultstore.v2.CommandLine")
+	proto.RegisterType((*InvocationAttributes)(nil), "google.devtools.resultstore.v2.InvocationAttributes")
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/invocation.proto", fileDescriptor_invocation_04b66137ff87776e)
+}
+
+var fileDescriptor_invocation_04b66137ff87776e = []byte{
+	// 631 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0x71, 0x6b, 0x13, 0x3f,
+	0x18, 0xc7, 0x69, 0xbb, 0x76, 0xeb, 0xb3, 0xf5, 0xc7, 0x16, 0xf6, 0x93, 0xb3, 0xa0, 0x8c, 0x2a,
+	0xd2, 0x31, 0xbc, 0x93, 0xaa, 0x08, 0x8a, 0x82, 0x4e, 0xc4, 0x83, 0xfd, 0x31, 0xb2, 0x81, 0x20,
+	0xc8, 0x91, 0xdd, 0xa5, 0x31, 0x7a, 0x97, 0xd4, 0x24, 0xd7, 0xb9, 0xf7, 0xe3, 0x8b, 0xf2, 0xe5,
+	0x48, 0x72, 0x77, 0xbd, 0x5b, 0x99, 0xde, 0xfe, 0xbb, 0xe7, 0x69, 0xbe, 0x9f, 0x3c, 0x79, 0xf2,
+	0xcd, 0x53, 0x08, 0x98, 0x94, 0x2c, 0xa5, 0x41, 0x42, 0x97, 0x46, 0xca, 0x54, 0x07, 0x8a, 0xea,
+	0x3c, 0x35, 0xda, 0x48, 0x45, 0x83, 0xe5, 0x2c, 0xe0, 0x62, 0x29, 0x63, 0x62, 0xb8, 0x14, 0xfe,
+	0x42, 0x49, 0x23, 0xd1, 0xfd, 0x42, 0xe0, 0x57, 0x02, 0xbf, 0x21, 0xf0, 0x97, 0xb3, 0xf1, 0x51,
+	0x0b, 0x30, 0x96, 0x59, 0x56, 0xc1, 0xc6, 0xcf, 0x5b, 0x17, 0x2f, 0xa9, 0x22, 0x8c, 0x46, 0x3a,
+	0xcf, 0x32, 0xa2, 0xae, 0x4a, 0xd9, 0x61, 0x8b, 0x6c, 0xce, 0x53, 0x5a, 0x2c, 0x9d, 0xfc, 0xee,
+	0x03, 0x84, 0xab, 0x33, 0x20, 0x04, 0x1b, 0x82, 0x64, 0xd4, 0xeb, 0x1c, 0x74, 0xa6, 0x43, 0xec,
+	0xbe, 0xd1, 0x6b, 0xe8, 0xf2, 0xc4, 0xeb, 0x1e, 0x74, 0xa6, 0xdb, 0xb3, 0xc7, 0xfe, 0xbf, 0x8f,
+	0xe7, 0xd7, 0x2c, 0x3f, 0x4c, 0x70, 0x97, 0x27, 0xe8, 0x0b, 0xec, 0x69, 0x43, 0x4c, 0xae, 0x23,
+	0x62, 0x8c, 0xe2, 0x17, 0xb9, 0xa1, 0xda, 0xeb, 0x39, 0xda, 0x93, 0x36, 0xda, 0x99, 0x13, 0xbe,
+	0x5d, 0xe9, 0xf0, 0xae, 0x5e, 0xcb, 0xa0, 0x37, 0x30, 0x30, 0x3c, 0xe3, 0x82, 0x79, 0x1b, 0x8e,
+	0xf9, 0xa8, 0x8d, 0x79, 0xee, 0x56, 0xe3, 0x52, 0x85, 0x38, 0xfc, 0x5f, 0xdf, 0x61, 0xb3, 0xc4,
+	0xbe, 0xc3, 0x3d, 0xbb, 0xfd, 0x81, 0x1b, 0x65, 0xee, 0xf3, 0x1b, 0xb2, 0xe8, 0x1c, 0xfe, 0xbb,
+	0x94, 0xea, 0xbb, 0x5e, 0x90, 0x98, 0x46, 0x5c, 0xcc, 0xa5, 0x37, 0xb8, 0x5d, 0x53, 0x3f, 0x55,
+	0xaa, 0x50, 0xcc, 0x25, 0x1e, 0x5d, 0x36, 0x43, 0xf4, 0x11, 0x60, 0xa1, 0xe4, 0x82, 0x2a, 0xc3,
+	0xa9, 0xf6, 0x36, 0x0f, 0x7a, 0xd3, 0xed, 0xd9, 0xb4, 0x8d, 0x78, 0x5a, 0x28, 0xae, 0x70, 0x43,
+	0x8b, 0x5e, 0x42, 0xdf, 0x3a, 0x43, 0x7b, 0x5b, 0x0e, 0xf2, 0xb0, 0x0d, 0xf2, 0x81, 0xa7, 0x14,
+	0x17, 0x12, 0x34, 0x07, 0xb4, 0x66, 0x46, 0x5b, 0xcd, 0xd0, 0x81, 0x5e, 0xb4, 0x81, 0x4e, 0x88,
+	0x60, 0x39, 0x61, 0xf4, 0xb8, 0x24, 0x9c, 0x15, 0x6e, 0xc6, 0x7b, 0xf1, 0xb5, 0x04, 0xa7, 0x7a,
+	0x7c, 0x08, 0xdd, 0x30, 0x41, 0x0f, 0x60, 0xd4, 0xb8, 0x34, 0x9e, 0x94, 0x7e, 0xdd, 0xa9, 0x93,
+	0x61, 0x32, 0x41, 0xb0, 0xbb, 0x6a, 0xdc, 0xb1, 0x14, 0x86, 0xfe, 0x34, 0x93, 0x5f, 0x5d, 0x18,
+	0x5d, 0xeb, 0xa6, 0xb5, 0x67, 0x7d, 0x29, 0x71, 0xb1, 0xcc, 0xe1, 0x6e, 0x61, 0xcf, 0x75, 0x3c,
+	0xde, 0xbd, 0x5c, 0xcb, 0xa0, 0x31, 0x6c, 0x7d, 0x95, 0xda, 0xb8, 0x47, 0xd5, 0x73, 0x45, 0xae,
+	0x62, 0x74, 0x54, 0x6c, 0xcd, 0x05, 0x8b, 0x12, 0xae, 0x68, 0x6c, 0xa4, 0xba, 0x72, 0x2e, 0x1e,
+	0x16, 0x20, 0x2e, 0xd8, 0xfb, 0x2a, 0x8f, 0xee, 0xc2, 0x96, 0xad, 0x21, 0x32, 0x84, 0x39, 0x6b,
+	0x0e, 0xf1, 0xa6, 0x8d, 0xcf, 0x09, 0x43, 0xa7, 0x30, 0xb2, 0x53, 0x83, 0x88, 0x24, 0x4a, 0xb9,
+	0x58, 0x99, 0xe0, 0xa8, 0xad, 0xfc, 0xe3, 0x42, 0x74, 0xc2, 0x05, 0xc5, 0x3b, 0x71, 0x1d, 0xe8,
+	0x09, 0x85, 0xed, 0xc6, 0x8f, 0x68, 0x1f, 0xfa, 0x29, 0xb9, 0xa0, 0x69, 0xd9, 0xe6, 0x22, 0xb0,
+	0xb3, 0xc2, 0x62, 0xdd, 0x64, 0x18, 0x62, 0xf7, 0x6d, 0x73, 0x44, 0x31, 0xfb, 0xbe, 0x7b, 0x36,
+	0x67, 0xbf, 0x91, 0x07, 0x9b, 0x25, 0xbc, 0x3c, 0x5c, 0x15, 0x4e, 0x62, 0xd8, 0xbf, 0xe9, 0xf9,
+	0xa0, 0x7b, 0xce, 0xd2, 0xdf, 0x68, 0x6c, 0xea, 0xbb, 0x1d, 0x96, 0x99, 0x30, 0xb1, 0xe5, 0xe4,
+	0x9a, 0x2a, 0xed, 0x75, 0xdd, 0x2e, 0x45, 0x80, 0xee, 0xc0, 0xc0, 0xd5, 0x55, 0x6d, 0x5e, 0x46,
+	0xef, 0x7e, 0xc0, 0x24, 0x96, 0x59, 0x4b, 0x2f, 0x4e, 0x3b, 0x9f, 0xc3, 0x72, 0x05, 0x93, 0x29,
+	0x11, 0xcc, 0x97, 0x8a, 0x05, 0x8c, 0x0a, 0x37, 0x25, 0xcb, 0x3f, 0x01, 0xb2, 0xe0, 0xfa, 0x6f,
+	0x33, 0xf5, 0x55, 0x23, 0xbc, 0x18, 0x38, 0xd5, 0xd3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfa,
+	0x5b, 0x4b, 0x30, 0x3d, 0x06, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/resultstore_download.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/resultstore_download.pb.go
new file mode 100644
index 00000000..83526d8b
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/resultstore_download.pb.go
@@ -0,0 +1,2216 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/resultstore_download.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Request passed into GetInvocation
+type GetInvocationRequest struct {
+	// The name of the invocation to retrieve. It must match this format:
+	// invocations/${INVOCATION_ID}
+	// where INVOCATION_ID must be an RFC 4122-compliant random UUID.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetInvocationRequest) Reset()         { *m = GetInvocationRequest{} }
+func (m *GetInvocationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetInvocationRequest) ProtoMessage()    {}
+func (*GetInvocationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{0}
+}
+func (m *GetInvocationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetInvocationRequest.Unmarshal(m, b)
+}
+func (m *GetInvocationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetInvocationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetInvocationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInvocationRequest.Merge(dst, src)
+}
+func (m *GetInvocationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetInvocationRequest.Size(m)
+}
+func (m *GetInvocationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetInvocationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetInvocationRequest proto.InternalMessageInfo
+
+func (m *GetInvocationRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request passed into SearchInvocations
+type SearchInvocationsRequest struct {
+	// The maximum number of items to return. Zero means all, but may be capped by
+	// the server.
+	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Options for pagination.
+	//
+	// Types that are valid to be assigned to PageStart:
+	//	*SearchInvocationsRequest_PageToken
+	//	*SearchInvocationsRequest_Offset
+	PageStart isSearchInvocationsRequest_PageStart `protobuf_oneof:"page_start"`
+	// A filtering query string.
+	Query string `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
+	// The project id to search under.
+	ProjectId            string   `protobuf:"bytes,5,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchInvocationsRequest) Reset()         { *m = SearchInvocationsRequest{} }
+func (m *SearchInvocationsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchInvocationsRequest) ProtoMessage()    {}
+func (*SearchInvocationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{1}
+}
+func (m *SearchInvocationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchInvocationsRequest.Unmarshal(m, b)
+}
+func (m *SearchInvocationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchInvocationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchInvocationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchInvocationsRequest.Merge(dst, src)
+}
+func (m *SearchInvocationsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchInvocationsRequest.Size(m)
+}
+func (m *SearchInvocationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchInvocationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchInvocationsRequest proto.InternalMessageInfo
+
+func (m *SearchInvocationsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+type isSearchInvocationsRequest_PageStart interface {
+	isSearchInvocationsRequest_PageStart()
+}
+
+type SearchInvocationsRequest_PageToken struct {
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3,oneof"`
+}
+
+type SearchInvocationsRequest_Offset struct {
+	Offset int64 `protobuf:"varint,3,opt,name=offset,proto3,oneof"`
+}
+
+func (*SearchInvocationsRequest_PageToken) isSearchInvocationsRequest_PageStart() {}
+
+func (*SearchInvocationsRequest_Offset) isSearchInvocationsRequest_PageStart() {}
+
+func (m *SearchInvocationsRequest) GetPageStart() isSearchInvocationsRequest_PageStart {
+	if m != nil {
+		return m.PageStart
+	}
+	return nil
+}
+
+func (m *SearchInvocationsRequest) GetPageToken() string {
+	if x, ok := m.GetPageStart().(*SearchInvocationsRequest_PageToken); ok {
+		return x.PageToken
+	}
+	return ""
+}
+
+func (m *SearchInvocationsRequest) GetOffset() int64 {
+	if x, ok := m.GetPageStart().(*SearchInvocationsRequest_Offset); ok {
+		return x.Offset
+	}
+	return 0
+}
+
+func (m *SearchInvocationsRequest) GetQuery() string {
+	if m != nil {
+		return m.Query
+	}
+	return ""
+}
+
+func (m *SearchInvocationsRequest) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*SearchInvocationsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _SearchInvocationsRequest_OneofMarshaler, _SearchInvocationsRequest_OneofUnmarshaler, _SearchInvocationsRequest_OneofSizer, []interface{}{
+		(*SearchInvocationsRequest_PageToken)(nil),
+		(*SearchInvocationsRequest_Offset)(nil),
+	}
+}
+
+func _SearchInvocationsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*SearchInvocationsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *SearchInvocationsRequest_PageToken:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.PageToken)
+	case *SearchInvocationsRequest_Offset:
+		b.EncodeVarint(3<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		return fmt.Errorf("SearchInvocationsRequest.PageStart has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _SearchInvocationsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*SearchInvocationsRequest)
+	switch tag {
+	case 2: // page_start.page_token
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.PageStart = &SearchInvocationsRequest_PageToken{x}
+		return true, err
+	case 3: // page_start.offset
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.PageStart = &SearchInvocationsRequest_Offset{int64(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _SearchInvocationsRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*SearchInvocationsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *SearchInvocationsRequest_PageToken:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.PageToken)))
+		n += len(x.PageToken)
+	case *SearchInvocationsRequest_Offset:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Response from calling SearchInvocations
+type SearchInvocationsResponse struct {
+	// Invocations matching the search, possibly capped at request.page_size or a
+	// server limit.
+	Invocations []*Invocation `protobuf:"bytes,1,rep,name=invocations,proto3" json:"invocations,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchInvocationsResponse) Reset()         { *m = SearchInvocationsResponse{} }
+func (m *SearchInvocationsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchInvocationsResponse) ProtoMessage()    {}
+func (*SearchInvocationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{2}
+}
+func (m *SearchInvocationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchInvocationsResponse.Unmarshal(m, b)
+}
+func (m *SearchInvocationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchInvocationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchInvocationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchInvocationsResponse.Merge(dst, src)
+}
+func (m *SearchInvocationsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchInvocationsResponse.Size(m)
+}
+func (m *SearchInvocationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchInvocationsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchInvocationsResponse proto.InternalMessageInfo
+
+func (m *SearchInvocationsResponse) GetInvocations() []*Invocation {
+	if m != nil {
+		return m.Invocations
+	}
+	return nil
+}
+
+func (m *SearchInvocationsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request passed into GetConfiguration
+type GetConfigurationRequest struct {
+	// The name of the configuration to retrieve. It must match this format:
+	// invocations/${INVOCATION_ID}/configs/${CONFIGURATION_ID}
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetConfigurationRequest) Reset()         { *m = GetConfigurationRequest{} }
+func (m *GetConfigurationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetConfigurationRequest) ProtoMessage()    {}
+func (*GetConfigurationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{3}
+}
+func (m *GetConfigurationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetConfigurationRequest.Unmarshal(m, b)
+}
+func (m *GetConfigurationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetConfigurationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetConfigurationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfigurationRequest.Merge(dst, src)
+}
+func (m *GetConfigurationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetConfigurationRequest.Size(m)
+}
+func (m *GetConfigurationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetConfigurationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetConfigurationRequest proto.InternalMessageInfo
+
+func (m *GetConfigurationRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request passed into ListConfigurations
+type ListConfigurationsRequest struct {
+	// The invocation name of the configurations to retrieve.
+	// It must match this format: invocations/${INVOCATION_ID}
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return.
+	// Zero means all, but may be capped by the server.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Options for pagination.
+	//
+	// Types that are valid to be assigned to PageStart:
+	//	*ListConfigurationsRequest_PageToken
+	//	*ListConfigurationsRequest_Offset
+	PageStart            isListConfigurationsRequest_PageStart `protobuf_oneof:"page_start"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
+}
+
+func (m *ListConfigurationsRequest) Reset()         { *m = ListConfigurationsRequest{} }
+func (m *ListConfigurationsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListConfigurationsRequest) ProtoMessage()    {}
+func (*ListConfigurationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{4}
+}
+func (m *ListConfigurationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListConfigurationsRequest.Unmarshal(m, b)
+}
+func (m *ListConfigurationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListConfigurationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListConfigurationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfigurationsRequest.Merge(dst, src)
+}
+func (m *ListConfigurationsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListConfigurationsRequest.Size(m)
+}
+func (m *ListConfigurationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListConfigurationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListConfigurationsRequest proto.InternalMessageInfo
+
+func (m *ListConfigurationsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListConfigurationsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+type isListConfigurationsRequest_PageStart interface {
+	isListConfigurationsRequest_PageStart()
+}
+
+type ListConfigurationsRequest_PageToken struct {
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3,oneof"`
+}
+
+type ListConfigurationsRequest_Offset struct {
+	Offset int64 `protobuf:"varint,4,opt,name=offset,proto3,oneof"`
+}
+
+func (*ListConfigurationsRequest_PageToken) isListConfigurationsRequest_PageStart() {}
+
+func (*ListConfigurationsRequest_Offset) isListConfigurationsRequest_PageStart() {}
+
+func (m *ListConfigurationsRequest) GetPageStart() isListConfigurationsRequest_PageStart {
+	if m != nil {
+		return m.PageStart
+	}
+	return nil
+}
+
+func (m *ListConfigurationsRequest) GetPageToken() string {
+	if x, ok := m.GetPageStart().(*ListConfigurationsRequest_PageToken); ok {
+		return x.PageToken
+	}
+	return ""
+}
+
+func (m *ListConfigurationsRequest) GetOffset() int64 {
+	if x, ok := m.GetPageStart().(*ListConfigurationsRequest_Offset); ok {
+		return x.Offset
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ListConfigurationsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ListConfigurationsRequest_OneofMarshaler, _ListConfigurationsRequest_OneofUnmarshaler, _ListConfigurationsRequest_OneofSizer, []interface{}{
+		(*ListConfigurationsRequest_PageToken)(nil),
+		(*ListConfigurationsRequest_Offset)(nil),
+	}
+}
+
+func _ListConfigurationsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ListConfigurationsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListConfigurationsRequest_PageToken:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.PageToken)
+	case *ListConfigurationsRequest_Offset:
+		b.EncodeVarint(4<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		return fmt.Errorf("ListConfigurationsRequest.PageStart has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ListConfigurationsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ListConfigurationsRequest)
+	switch tag {
+	case 3: // page_start.page_token
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.PageStart = &ListConfigurationsRequest_PageToken{x}
+		return true, err
+	case 4: // page_start.offset
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.PageStart = &ListConfigurationsRequest_Offset{int64(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ListConfigurationsRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ListConfigurationsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListConfigurationsRequest_PageToken:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.PageToken)))
+		n += len(x.PageToken)
+	case *ListConfigurationsRequest_Offset:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Response from calling ListConfigurations
+type ListConfigurationsResponse struct {
+	// Configurations matching the request invocation,
+	// possibly capped at request.page_size or a server limit.
+	Configurations []*Configuration `protobuf:"bytes,1,rep,name=configurations,proto3" json:"configurations,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListConfigurationsResponse) Reset()         { *m = ListConfigurationsResponse{} }
+func (m *ListConfigurationsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListConfigurationsResponse) ProtoMessage()    {}
+func (*ListConfigurationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{5}
+}
+func (m *ListConfigurationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListConfigurationsResponse.Unmarshal(m, b)
+}
+func (m *ListConfigurationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListConfigurationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListConfigurationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfigurationsResponse.Merge(dst, src)
+}
+func (m *ListConfigurationsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListConfigurationsResponse.Size(m)
+}
+func (m *ListConfigurationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListConfigurationsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListConfigurationsResponse proto.InternalMessageInfo
+
+func (m *ListConfigurationsResponse) GetConfigurations() []*Configuration {
+	if m != nil {
+		return m.Configurations
+	}
+	return nil
+}
+
+func (m *ListConfigurationsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request passed into GetTarget
+type GetTargetRequest struct {
+	// The name of the target to retrieve. It must match this format:
+	// invocations/${INVOCATION_ID}/targets/${TARGET_ID}
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTargetRequest) Reset()         { *m = GetTargetRequest{} }
+func (m *GetTargetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTargetRequest) ProtoMessage()    {}
+func (*GetTargetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{6}
+}
+func (m *GetTargetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTargetRequest.Unmarshal(m, b)
+}
+func (m *GetTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTargetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTargetRequest.Merge(dst, src)
+}
+func (m *GetTargetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTargetRequest.Size(m)
+}
+func (m *GetTargetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTargetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetTargetRequest proto.InternalMessageInfo
+
+func (m *GetTargetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request passed into ListTargets
+type ListTargetsRequest struct {
+	// The invocation name of the targets to retrieve. It must match this format:
+	// invocations/${INVOCATION_ID}
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return.
+	// Zero means all, but may be capped by the server.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Options for pagination.
+	//
+	// Types that are valid to be assigned to PageStart:
+	//	*ListTargetsRequest_PageToken
+	//	*ListTargetsRequest_Offset
+	PageStart            isListTargetsRequest_PageStart `protobuf_oneof:"page_start"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *ListTargetsRequest) Reset()         { *m = ListTargetsRequest{} }
+func (m *ListTargetsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTargetsRequest) ProtoMessage()    {}
+func (*ListTargetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{7}
+}
+func (m *ListTargetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTargetsRequest.Unmarshal(m, b)
+}
+func (m *ListTargetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTargetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTargetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTargetsRequest.Merge(dst, src)
+}
+func (m *ListTargetsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTargetsRequest.Size(m)
+}
+func (m *ListTargetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTargetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTargetsRequest proto.InternalMessageInfo
+
+func (m *ListTargetsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListTargetsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+type isListTargetsRequest_PageStart interface {
+	isListTargetsRequest_PageStart()
+}
+
+type ListTargetsRequest_PageToken struct {
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3,oneof"`
+}
+
+type ListTargetsRequest_Offset struct {
+	Offset int64 `protobuf:"varint,4,opt,name=offset,proto3,oneof"`
+}
+
+func (*ListTargetsRequest_PageToken) isListTargetsRequest_PageStart() {}
+
+func (*ListTargetsRequest_Offset) isListTargetsRequest_PageStart() {}
+
+func (m *ListTargetsRequest) GetPageStart() isListTargetsRequest_PageStart {
+	if m != nil {
+		return m.PageStart
+	}
+	return nil
+}
+
+func (m *ListTargetsRequest) GetPageToken() string {
+	if x, ok := m.GetPageStart().(*ListTargetsRequest_PageToken); ok {
+		return x.PageToken
+	}
+	return ""
+}
+
+func (m *ListTargetsRequest) GetOffset() int64 {
+	if x, ok := m.GetPageStart().(*ListTargetsRequest_Offset); ok {
+		return x.Offset
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ListTargetsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ListTargetsRequest_OneofMarshaler, _ListTargetsRequest_OneofUnmarshaler, _ListTargetsRequest_OneofSizer, []interface{}{
+		(*ListTargetsRequest_PageToken)(nil),
+		(*ListTargetsRequest_Offset)(nil),
+	}
+}
+
+func _ListTargetsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ListTargetsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListTargetsRequest_PageToken:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.PageToken)
+	case *ListTargetsRequest_Offset:
+		b.EncodeVarint(4<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		return fmt.Errorf("ListTargetsRequest.PageStart has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ListTargetsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ListTargetsRequest)
+	switch tag {
+	case 3: // page_start.page_token
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.PageStart = &ListTargetsRequest_PageToken{x}
+		return true, err
+	case 4: // page_start.offset
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.PageStart = &ListTargetsRequest_Offset{int64(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ListTargetsRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ListTargetsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListTargetsRequest_PageToken:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.PageToken)))
+		n += len(x.PageToken)
+	case *ListTargetsRequest_Offset:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Response from calling ListTargetsResponse
+type ListTargetsResponse struct {
+	// Targets matching the request invocation,
+	// possibly capped at request.page_size or a server limit.
+	Targets []*Target `protobuf:"bytes,1,rep,name=targets,proto3" json:"targets,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTargetsResponse) Reset()         { *m = ListTargetsResponse{} }
+func (m *ListTargetsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTargetsResponse) ProtoMessage()    {}
+func (*ListTargetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{8}
+}
+func (m *ListTargetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTargetsResponse.Unmarshal(m, b)
+}
+func (m *ListTargetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTargetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTargetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTargetsResponse.Merge(dst, src)
+}
+func (m *ListTargetsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTargetsResponse.Size(m)
+}
+func (m *ListTargetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTargetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTargetsResponse proto.InternalMessageInfo
+
+func (m *ListTargetsResponse) GetTargets() []*Target {
+	if m != nil {
+		return m.Targets
+	}
+	return nil
+}
+
+func (m *ListTargetsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request passed into GetConfiguredTarget
+type GetConfiguredTargetRequest struct {
+	// The name of the configured target to retrieve. It must match this format:
+	// invocations/${INVOCATION_ID}/targets/${TARGET_ID}/configuredTargets/${CONFIGURATION_ID}
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetConfiguredTargetRequest) Reset()         { *m = GetConfiguredTargetRequest{} }
+func (m *GetConfiguredTargetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetConfiguredTargetRequest) ProtoMessage()    {}
+func (*GetConfiguredTargetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{9}
+}
+func (m *GetConfiguredTargetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetConfiguredTargetRequest.Unmarshal(m, b)
+}
+func (m *GetConfiguredTargetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetConfiguredTargetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetConfiguredTargetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetConfiguredTargetRequest.Merge(dst, src)
+}
+func (m *GetConfiguredTargetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetConfiguredTargetRequest.Size(m)
+}
+func (m *GetConfiguredTargetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetConfiguredTargetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetConfiguredTargetRequest proto.InternalMessageInfo
+
+func (m *GetConfiguredTargetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request passed into ListConfiguredTargets
+type ListConfiguredTargetsRequest struct {
+	// The invocation and target name of the configured targets to retrieve.
+	// It must match this format:
+	// invocations/${INVOCATION_ID}/targets/${TARGET_ID}
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return.
+	// Zero means all, but may be capped by the server.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Options for pagination.
+	//
+	// Types that are valid to be assigned to PageStart:
+	//	*ListConfiguredTargetsRequest_PageToken
+	//	*ListConfiguredTargetsRequest_Offset
+	PageStart            isListConfiguredTargetsRequest_PageStart `protobuf_oneof:"page_start"`
+	XXX_NoUnkeyedLiteral struct{}                                 `json:"-"`
+	XXX_unrecognized     []byte                                   `json:"-"`
+	XXX_sizecache        int32                                    `json:"-"`
+}
+
+func (m *ListConfiguredTargetsRequest) Reset()         { *m = ListConfiguredTargetsRequest{} }
+func (m *ListConfiguredTargetsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListConfiguredTargetsRequest) ProtoMessage()    {}
+func (*ListConfiguredTargetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{10}
+}
+func (m *ListConfiguredTargetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListConfiguredTargetsRequest.Unmarshal(m, b)
+}
+func (m *ListConfiguredTargetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListConfiguredTargetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListConfiguredTargetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfiguredTargetsRequest.Merge(dst, src)
+}
+func (m *ListConfiguredTargetsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListConfiguredTargetsRequest.Size(m)
+}
+func (m *ListConfiguredTargetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListConfiguredTargetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListConfiguredTargetsRequest proto.InternalMessageInfo
+
+func (m *ListConfiguredTargetsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListConfiguredTargetsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+type isListConfiguredTargetsRequest_PageStart interface {
+	isListConfiguredTargetsRequest_PageStart()
+}
+
+type ListConfiguredTargetsRequest_PageToken struct {
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3,oneof"`
+}
+
+type ListConfiguredTargetsRequest_Offset struct {
+	Offset int64 `protobuf:"varint,4,opt,name=offset,proto3,oneof"`
+}
+
+func (*ListConfiguredTargetsRequest_PageToken) isListConfiguredTargetsRequest_PageStart() {}
+
+func (*ListConfiguredTargetsRequest_Offset) isListConfiguredTargetsRequest_PageStart() {}
+
+func (m *ListConfiguredTargetsRequest) GetPageStart() isListConfiguredTargetsRequest_PageStart {
+	if m != nil {
+		return m.PageStart
+	}
+	return nil
+}
+
+func (m *ListConfiguredTargetsRequest) GetPageToken() string {
+	if x, ok := m.GetPageStart().(*ListConfiguredTargetsRequest_PageToken); ok {
+		return x.PageToken
+	}
+	return ""
+}
+
+func (m *ListConfiguredTargetsRequest) GetOffset() int64 {
+	if x, ok := m.GetPageStart().(*ListConfiguredTargetsRequest_Offset); ok {
+		return x.Offset
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ListConfiguredTargetsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ListConfiguredTargetsRequest_OneofMarshaler, _ListConfiguredTargetsRequest_OneofUnmarshaler, _ListConfiguredTargetsRequest_OneofSizer, []interface{}{
+		(*ListConfiguredTargetsRequest_PageToken)(nil),
+		(*ListConfiguredTargetsRequest_Offset)(nil),
+	}
+}
+
+func _ListConfiguredTargetsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ListConfiguredTargetsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListConfiguredTargetsRequest_PageToken:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.PageToken)
+	case *ListConfiguredTargetsRequest_Offset:
+		b.EncodeVarint(4<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		return fmt.Errorf("ListConfiguredTargetsRequest.PageStart has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ListConfiguredTargetsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ListConfiguredTargetsRequest)
+	switch tag {
+	case 3: // page_start.page_token
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.PageStart = &ListConfiguredTargetsRequest_PageToken{x}
+		return true, err
+	case 4: // page_start.offset
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.PageStart = &ListConfiguredTargetsRequest_Offset{int64(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ListConfiguredTargetsRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ListConfiguredTargetsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListConfiguredTargetsRequest_PageToken:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.PageToken)))
+		n += len(x.PageToken)
+	case *ListConfiguredTargetsRequest_Offset:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Response from calling ListConfiguredTargets
+type ListConfiguredTargetsResponse struct {
+	// ConfiguredTargets matching the request,
+	// possibly capped at request.page_size or a server limit.
+	ConfiguredTargets []*ConfiguredTarget `protobuf:"bytes,1,rep,name=configured_targets,json=configuredTargets,proto3" json:"configured_targets,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListConfiguredTargetsResponse) Reset()         { *m = ListConfiguredTargetsResponse{} }
+func (m *ListConfiguredTargetsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListConfiguredTargetsResponse) ProtoMessage()    {}
+func (*ListConfiguredTargetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{11}
+}
+func (m *ListConfiguredTargetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListConfiguredTargetsResponse.Unmarshal(m, b)
+}
+func (m *ListConfiguredTargetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListConfiguredTargetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListConfiguredTargetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListConfiguredTargetsResponse.Merge(dst, src)
+}
+func (m *ListConfiguredTargetsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListConfiguredTargetsResponse.Size(m)
+}
+func (m *ListConfiguredTargetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListConfiguredTargetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListConfiguredTargetsResponse proto.InternalMessageInfo
+
+func (m *ListConfiguredTargetsResponse) GetConfiguredTargets() []*ConfiguredTarget {
+	if m != nil {
+		return m.ConfiguredTargets
+	}
+	return nil
+}
+
+func (m *ListConfiguredTargetsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request passed into GetAction
+type GetActionRequest struct {
+	// The name of the action to retrieve. It must match this format:
+	// invocations/${INVOCATION_ID}/targets/${TARGET_ID}/configuredTargets/${CONFIGURATION_ID}/actions/${ACTION_ID}
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetActionRequest) Reset()         { *m = GetActionRequest{} }
+func (m *GetActionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetActionRequest) ProtoMessage()    {}
+func (*GetActionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{12}
+}
+func (m *GetActionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetActionRequest.Unmarshal(m, b)
+}
+func (m *GetActionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetActionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetActionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetActionRequest.Merge(dst, src)
+}
+func (m *GetActionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetActionRequest.Size(m)
+}
+func (m *GetActionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetActionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetActionRequest proto.InternalMessageInfo
+
+func (m *GetActionRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request passed into ListActions
+type ListActionsRequest struct {
+	// The invocation, target, and configuration name of the action to retrieve.
+	// It must match this format:
+	// invocations/${INVOCATION_ID}/targets/${TARGET_ID}/configuredTargets/${CONFIGURATION_ID}
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return.
+	// Zero means all, but may be capped by the server.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Options for pagination.
+	//
+	// Types that are valid to be assigned to PageStart:
+	//	*ListActionsRequest_PageToken
+	//	*ListActionsRequest_Offset
+	PageStart            isListActionsRequest_PageStart `protobuf_oneof:"page_start"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *ListActionsRequest) Reset()         { *m = ListActionsRequest{} }
+func (m *ListActionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListActionsRequest) ProtoMessage()    {}
+func (*ListActionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{13}
+}
+func (m *ListActionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListActionsRequest.Unmarshal(m, b)
+}
+func (m *ListActionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListActionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListActionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActionsRequest.Merge(dst, src)
+}
+func (m *ListActionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListActionsRequest.Size(m)
+}
+func (m *ListActionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListActionsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListActionsRequest proto.InternalMessageInfo
+
+func (m *ListActionsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListActionsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+type isListActionsRequest_PageStart interface {
+	isListActionsRequest_PageStart()
+}
+
+type ListActionsRequest_PageToken struct {
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3,oneof"`
+}
+
+type ListActionsRequest_Offset struct {
+	Offset int64 `protobuf:"varint,4,opt,name=offset,proto3,oneof"`
+}
+
+func (*ListActionsRequest_PageToken) isListActionsRequest_PageStart() {}
+
+func (*ListActionsRequest_Offset) isListActionsRequest_PageStart() {}
+
+func (m *ListActionsRequest) GetPageStart() isListActionsRequest_PageStart {
+	if m != nil {
+		return m.PageStart
+	}
+	return nil
+}
+
+func (m *ListActionsRequest) GetPageToken() string {
+	if x, ok := m.GetPageStart().(*ListActionsRequest_PageToken); ok {
+		return x.PageToken
+	}
+	return ""
+}
+
+func (m *ListActionsRequest) GetOffset() int64 {
+	if x, ok := m.GetPageStart().(*ListActionsRequest_Offset); ok {
+		return x.Offset
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ListActionsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ListActionsRequest_OneofMarshaler, _ListActionsRequest_OneofUnmarshaler, _ListActionsRequest_OneofSizer, []interface{}{
+		(*ListActionsRequest_PageToken)(nil),
+		(*ListActionsRequest_Offset)(nil),
+	}
+}
+
+func _ListActionsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ListActionsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListActionsRequest_PageToken:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.PageToken)
+	case *ListActionsRequest_Offset:
+		b.EncodeVarint(4<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		return fmt.Errorf("ListActionsRequest.PageStart has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ListActionsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ListActionsRequest)
+	switch tag {
+	case 3: // page_start.page_token
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.PageStart = &ListActionsRequest_PageToken{x}
+		return true, err
+	case 4: // page_start.offset
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.PageStart = &ListActionsRequest_Offset{int64(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ListActionsRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ListActionsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListActionsRequest_PageToken:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.PageToken)))
+		n += len(x.PageToken)
+	case *ListActionsRequest_Offset:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Response from calling ListActions
+type ListActionsResponse struct {
+	// Actions matching the request,
+	// possibly capped at request.page_size or a server limit.
+	Actions []*Action `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListActionsResponse) Reset()         { *m = ListActionsResponse{} }
+func (m *ListActionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListActionsResponse) ProtoMessage()    {}
+func (*ListActionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{14}
+}
+func (m *ListActionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListActionsResponse.Unmarshal(m, b)
+}
+func (m *ListActionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListActionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListActionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListActionsResponse.Merge(dst, src)
+}
+func (m *ListActionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListActionsResponse.Size(m)
+}
+func (m *ListActionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListActionsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListActionsResponse proto.InternalMessageInfo
+
+func (m *ListActionsResponse) GetActions() []*Action {
+	if m != nil {
+		return m.Actions
+	}
+	return nil
+}
+
+func (m *ListActionsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request passed into GetFileSet
+type GetFileSetRequest struct {
+	// The name of the file set to retrieve. It must match this format:
+	// invocations/${INVOCATION_ID}/fileSets/${FILE_SET_ID}
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetFileSetRequest) Reset()         { *m = GetFileSetRequest{} }
+func (m *GetFileSetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetFileSetRequest) ProtoMessage()    {}
+func (*GetFileSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{15}
+}
+func (m *GetFileSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetFileSetRequest.Unmarshal(m, b)
+}
+func (m *GetFileSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetFileSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetFileSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileSetRequest.Merge(dst, src)
+}
+func (m *GetFileSetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetFileSetRequest.Size(m)
+}
+func (m *GetFileSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetFileSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetFileSetRequest proto.InternalMessageInfo
+
+func (m *GetFileSetRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request passed into ListFileSets
+type ListFileSetsRequest struct {
+	// The invocation name of the file sets to retrieve.
+	// It must match this format: invocations/${INVOCATION_ID}
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The maximum number of items to return.
+	// Zero means all, but may be capped by the server.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Options for pagination.
+	//
+	// Types that are valid to be assigned to PageStart:
+	//	*ListFileSetsRequest_PageToken
+	//	*ListFileSetsRequest_Offset
+	PageStart            isListFileSetsRequest_PageStart `protobuf_oneof:"page_start"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
+}
+
+func (m *ListFileSetsRequest) Reset()         { *m = ListFileSetsRequest{} }
+func (m *ListFileSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListFileSetsRequest) ProtoMessage()    {}
+func (*ListFileSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{16}
+}
+func (m *ListFileSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFileSetsRequest.Unmarshal(m, b)
+}
+func (m *ListFileSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFileSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListFileSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFileSetsRequest.Merge(dst, src)
+}
+func (m *ListFileSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListFileSetsRequest.Size(m)
+}
+func (m *ListFileSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFileSetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFileSetsRequest proto.InternalMessageInfo
+
+func (m *ListFileSetsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListFileSetsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+type isListFileSetsRequest_PageStart interface {
+	isListFileSetsRequest_PageStart()
+}
+
+type ListFileSetsRequest_PageToken struct {
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3,oneof"`
+}
+
+type ListFileSetsRequest_Offset struct {
+	Offset int64 `protobuf:"varint,4,opt,name=offset,proto3,oneof"`
+}
+
+func (*ListFileSetsRequest_PageToken) isListFileSetsRequest_PageStart() {}
+
+func (*ListFileSetsRequest_Offset) isListFileSetsRequest_PageStart() {}
+
+func (m *ListFileSetsRequest) GetPageStart() isListFileSetsRequest_PageStart {
+	if m != nil {
+		return m.PageStart
+	}
+	return nil
+}
+
+func (m *ListFileSetsRequest) GetPageToken() string {
+	if x, ok := m.GetPageStart().(*ListFileSetsRequest_PageToken); ok {
+		return x.PageToken
+	}
+	return ""
+}
+
+func (m *ListFileSetsRequest) GetOffset() int64 {
+	if x, ok := m.GetPageStart().(*ListFileSetsRequest_Offset); ok {
+		return x.Offset
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ListFileSetsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ListFileSetsRequest_OneofMarshaler, _ListFileSetsRequest_OneofUnmarshaler, _ListFileSetsRequest_OneofSizer, []interface{}{
+		(*ListFileSetsRequest_PageToken)(nil),
+		(*ListFileSetsRequest_Offset)(nil),
+	}
+}
+
+func _ListFileSetsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ListFileSetsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListFileSetsRequest_PageToken:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.PageToken)
+	case *ListFileSetsRequest_Offset:
+		b.EncodeVarint(4<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		return fmt.Errorf("ListFileSetsRequest.PageStart has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ListFileSetsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ListFileSetsRequest)
+	switch tag {
+	case 3: // page_start.page_token
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.PageStart = &ListFileSetsRequest_PageToken{x}
+		return true, err
+	case 4: // page_start.offset
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.PageStart = &ListFileSetsRequest_Offset{int64(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ListFileSetsRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ListFileSetsRequest)
+	// page_start
+	switch x := m.PageStart.(type) {
+	case *ListFileSetsRequest_PageToken:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.PageToken)))
+		n += len(x.PageToken)
+	case *ListFileSetsRequest_Offset:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Offset))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Response from calling ListFileSets
+type ListFileSetsResponse struct {
+	// File sets matching the request,
+	// possibly capped at request.page_size or a server limit.
+	FileSets []*FileSet `protobuf:"bytes,1,rep,name=file_sets,json=fileSets,proto3" json:"file_sets,omitempty"`
+	// Token to retrieve the next page of results, or empty if there are no
+	// more results in the list.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListFileSetsResponse) Reset()         { *m = ListFileSetsResponse{} }
+func (m *ListFileSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListFileSetsResponse) ProtoMessage()    {}
+func (*ListFileSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_download_33af6560b54fe4e6, []int{17}
+}
+func (m *ListFileSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListFileSetsResponse.Unmarshal(m, b)
+}
+func (m *ListFileSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListFileSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListFileSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListFileSetsResponse.Merge(dst, src)
+}
+func (m *ListFileSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListFileSetsResponse.Size(m)
+}
+func (m *ListFileSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListFileSetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListFileSetsResponse proto.InternalMessageInfo
+
+func (m *ListFileSetsResponse) GetFileSets() []*FileSet {
+	if m != nil {
+		return m.FileSets
+	}
+	return nil
+}
+
+func (m *ListFileSetsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*GetInvocationRequest)(nil), "google.devtools.resultstore.v2.GetInvocationRequest")
+	proto.RegisterType((*SearchInvocationsRequest)(nil), "google.devtools.resultstore.v2.SearchInvocationsRequest")
+	proto.RegisterType((*SearchInvocationsResponse)(nil), "google.devtools.resultstore.v2.SearchInvocationsResponse")
+	proto.RegisterType((*GetConfigurationRequest)(nil), "google.devtools.resultstore.v2.GetConfigurationRequest")
+	proto.RegisterType((*ListConfigurationsRequest)(nil), "google.devtools.resultstore.v2.ListConfigurationsRequest")
+	proto.RegisterType((*ListConfigurationsResponse)(nil), "google.devtools.resultstore.v2.ListConfigurationsResponse")
+	proto.RegisterType((*GetTargetRequest)(nil), "google.devtools.resultstore.v2.GetTargetRequest")
+	proto.RegisterType((*ListTargetsRequest)(nil), "google.devtools.resultstore.v2.ListTargetsRequest")
+	proto.RegisterType((*ListTargetsResponse)(nil), "google.devtools.resultstore.v2.ListTargetsResponse")
+	proto.RegisterType((*GetConfiguredTargetRequest)(nil), "google.devtools.resultstore.v2.GetConfiguredTargetRequest")
+	proto.RegisterType((*ListConfiguredTargetsRequest)(nil), "google.devtools.resultstore.v2.ListConfiguredTargetsRequest")
+	proto.RegisterType((*ListConfiguredTargetsResponse)(nil), "google.devtools.resultstore.v2.ListConfiguredTargetsResponse")
+	proto.RegisterType((*GetActionRequest)(nil), "google.devtools.resultstore.v2.GetActionRequest")
+	proto.RegisterType((*ListActionsRequest)(nil), "google.devtools.resultstore.v2.ListActionsRequest")
+	proto.RegisterType((*ListActionsResponse)(nil), "google.devtools.resultstore.v2.ListActionsResponse")
+	proto.RegisterType((*GetFileSetRequest)(nil), "google.devtools.resultstore.v2.GetFileSetRequest")
+	proto.RegisterType((*ListFileSetsRequest)(nil), "google.devtools.resultstore.v2.ListFileSetsRequest")
+	proto.RegisterType((*ListFileSetsResponse)(nil), "google.devtools.resultstore.v2.ListFileSetsResponse")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ResultStoreDownloadClient is the client API for ResultStoreDownload service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ResultStoreDownloadClient interface {
+	// Retrieves the invocation with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the invocation is not found.
+	// - If the given invocation name is badly formatted.
+	GetInvocation(ctx context.Context, in *GetInvocationRequest, opts ...grpc.CallOption) (*Invocation, error)
+	// Searches for invocations matching the given query parameters.
+	//
+	//
+	// An error will be reported in the following cases:
+	// - If a query string is not provided
+	SearchInvocations(ctx context.Context, in *SearchInvocationsRequest, opts ...grpc.CallOption) (*SearchInvocationsResponse, error)
+	// Retrieves the configuration with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the configuration or its parent invocation is not found.
+	// - If the given configuration name is badly formatted.
+	GetConfiguration(ctx context.Context, in *GetConfigurationRequest, opts ...grpc.CallOption) (*Configuration, error)
+	// Retrieves all configurations for a parent invocation.
+	// This might be limited by user or server,
+	// in which case a continuation token is provided.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent invocation is not found.
+	// - If the given parent invocation name is badly formatted.
+	ListConfigurations(ctx context.Context, in *ListConfigurationsRequest, opts ...grpc.CallOption) (*ListConfigurationsResponse, error)
+	// Retrieves the target with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the target or its parent invocation is not found.
+	// - If the given target name is badly formatted.
+	GetTarget(ctx context.Context, in *GetTargetRequest, opts ...grpc.CallOption) (*Target, error)
+	// Retrieves all targets for a parent invocation.  This might be limited by
+	// user or server, in which case a continuation token is provided.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent is not found.
+	// - If the given parent name is badly formatted.
+	ListTargets(ctx context.Context, in *ListTargetsRequest, opts ...grpc.CallOption) (*ListTargetsResponse, error)
+	// Retrieves the configured target with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the configured target is not found.
+	// - If the given name is badly formatted.
+	GetConfiguredTarget(ctx context.Context, in *GetConfiguredTargetRequest, opts ...grpc.CallOption) (*ConfiguredTarget, error)
+	// Retrieves all configured targets for a parent invocation/target.
+	// This might be limited by user or server, in which case a continuation
+	// token is provided.  Supports '-' for targetId meaning all targets.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent is not found.
+	// - If the given parent name is badly formatted.
+	ListConfiguredTargets(ctx context.Context, in *ListConfiguredTargetsRequest, opts ...grpc.CallOption) (*ListConfiguredTargetsResponse, error)
+	// Retrieves the action with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the action is not found.
+	// - If the given name is badly formatted.
+	GetAction(ctx context.Context, in *GetActionRequest, opts ...grpc.CallOption) (*Action, error)
+	// Retrieves all actions for a parent invocation/target/configuration.
+	// This might be limited by user or server, in which case a continuation
+	// token is provided.  Supports '-' for configurationId to mean all
+	// actions for all configurations for a target, or '-' for targetId and
+	// configurationId to mean all actions for all configurations and all targets.
+	// Does not support targetId '-' with a specified configuration.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent is not found.
+	// - If the given parent name is badly formatted.
+	ListActions(ctx context.Context, in *ListActionsRequest, opts ...grpc.CallOption) (*ListActionsResponse, error)
+	// Retrieves the file set with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the file set or its parent invocation is not found.
+	// - If the given file set name is badly formatted.
+	GetFileSet(ctx context.Context, in *GetFileSetRequest, opts ...grpc.CallOption) (*FileSet, error)
+	// Retrieves all file sets for a parent invocation.
+	// This might be limited by user or server,
+	// in which case a continuation token is provided.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent invocation is not found.
+	// - If the given parent invocation name is badly formatted.
+	ListFileSets(ctx context.Context, in *ListFileSetsRequest, opts ...grpc.CallOption) (*ListFileSetsResponse, error)
+}
+
+type resultStoreDownloadClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewResultStoreDownloadClient(cc *grpc.ClientConn) ResultStoreDownloadClient {
+	return &resultStoreDownloadClient{cc}
+}
+
+func (c *resultStoreDownloadClient) GetInvocation(ctx context.Context, in *GetInvocationRequest, opts ...grpc.CallOption) (*Invocation, error) {
+	out := new(Invocation)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/GetInvocation", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) SearchInvocations(ctx context.Context, in *SearchInvocationsRequest, opts ...grpc.CallOption) (*SearchInvocationsResponse, error) {
+	out := new(SearchInvocationsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/SearchInvocations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) GetConfiguration(ctx context.Context, in *GetConfigurationRequest, opts ...grpc.CallOption) (*Configuration, error) {
+	out := new(Configuration)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/GetConfiguration", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) ListConfigurations(ctx context.Context, in *ListConfigurationsRequest, opts ...grpc.CallOption) (*ListConfigurationsResponse, error) {
+	out := new(ListConfigurationsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/ListConfigurations", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) GetTarget(ctx context.Context, in *GetTargetRequest, opts ...grpc.CallOption) (*Target, error) {
+	out := new(Target)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/GetTarget", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) ListTargets(ctx context.Context, in *ListTargetsRequest, opts ...grpc.CallOption) (*ListTargetsResponse, error) {
+	out := new(ListTargetsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/ListTargets", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) GetConfiguredTarget(ctx context.Context, in *GetConfiguredTargetRequest, opts ...grpc.CallOption) (*ConfiguredTarget, error) {
+	out := new(ConfiguredTarget)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/GetConfiguredTarget", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) ListConfiguredTargets(ctx context.Context, in *ListConfiguredTargetsRequest, opts ...grpc.CallOption) (*ListConfiguredTargetsResponse, error) {
+	out := new(ListConfiguredTargetsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/ListConfiguredTargets", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) GetAction(ctx context.Context, in *GetActionRequest, opts ...grpc.CallOption) (*Action, error) {
+	out := new(Action)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/GetAction", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) ListActions(ctx context.Context, in *ListActionsRequest, opts ...grpc.CallOption) (*ListActionsResponse, error) {
+	out := new(ListActionsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/ListActions", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) GetFileSet(ctx context.Context, in *GetFileSetRequest, opts ...grpc.CallOption) (*FileSet, error) {
+	out := new(FileSet)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/GetFileSet", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *resultStoreDownloadClient) ListFileSets(ctx context.Context, in *ListFileSetsRequest, opts ...grpc.CallOption) (*ListFileSetsResponse, error) {
+	out := new(ListFileSetsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreDownload/ListFileSets", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ResultStoreDownloadServer is the server API for ResultStoreDownload service.
+type ResultStoreDownloadServer interface {
+	// Retrieves the invocation with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the invocation is not found.
+	// - If the given invocation name is badly formatted.
+	GetInvocation(context.Context, *GetInvocationRequest) (*Invocation, error)
+	// Searches for invocations matching the given query parameters.
+	//
+	//
+	// An error will be reported in the following cases:
+	// - If a query string is not provided
+	SearchInvocations(context.Context, *SearchInvocationsRequest) (*SearchInvocationsResponse, error)
+	// Retrieves the configuration with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the configuration or its parent invocation is not found.
+	// - If the given configuration name is badly formatted.
+	GetConfiguration(context.Context, *GetConfigurationRequest) (*Configuration, error)
+	// Retrieves all configurations for a parent invocation.
+	// This might be limited by user or server,
+	// in which case a continuation token is provided.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent invocation is not found.
+	// - If the given parent invocation name is badly formatted.
+	ListConfigurations(context.Context, *ListConfigurationsRequest) (*ListConfigurationsResponse, error)
+	// Retrieves the target with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the target or its parent invocation is not found.
+	// - If the given target name is badly formatted.
+	GetTarget(context.Context, *GetTargetRequest) (*Target, error)
+	// Retrieves all targets for a parent invocation.  This might be limited by
+	// user or server, in which case a continuation token is provided.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent is not found.
+	// - If the given parent name is badly formatted.
+	ListTargets(context.Context, *ListTargetsRequest) (*ListTargetsResponse, error)
+	// Retrieves the configured target with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the configured target is not found.
+	// - If the given name is badly formatted.
+	GetConfiguredTarget(context.Context, *GetConfiguredTargetRequest) (*ConfiguredTarget, error)
+	// Retrieves all configured targets for a parent invocation/target.
+	// This might be limited by user or server, in which case a continuation
+	// token is provided.  Supports '-' for targetId meaning all targets.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent is not found.
+	// - If the given parent name is badly formatted.
+	ListConfiguredTargets(context.Context, *ListConfiguredTargetsRequest) (*ListConfiguredTargetsResponse, error)
+	// Retrieves the action with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the action is not found.
+	// - If the given name is badly formatted.
+	GetAction(context.Context, *GetActionRequest) (*Action, error)
+	// Retrieves all actions for a parent invocation/target/configuration.
+	// This might be limited by user or server, in which case a continuation
+	// token is provided.  Supports '-' for configurationId to mean all
+	// actions for all configurations for a target, or '-' for targetId and
+	// configurationId to mean all actions for all configurations and all targets.
+	// Does not support targetId '-' with a specified configuration.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent is not found.
+	// - If the given parent name is badly formatted.
+	ListActions(context.Context, *ListActionsRequest) (*ListActionsResponse, error)
+	// Retrieves the file set with the given name.
+	//
+	// An error will be reported in the following cases:
+	// - If the file set or its parent invocation is not found.
+	// - If the given file set name is badly formatted.
+	GetFileSet(context.Context, *GetFileSetRequest) (*FileSet, error)
+	// Retrieves all file sets for a parent invocation.
+	// This might be limited by user or server,
+	// in which case a continuation token is provided.
+	//
+	// An error will be reported in the following cases:
+	// - If the parent invocation is not found.
+	// - If the given parent invocation name is badly formatted.
+	ListFileSets(context.Context, *ListFileSetsRequest) (*ListFileSetsResponse, error)
+}
+
+func RegisterResultStoreDownloadServer(s *grpc.Server, srv ResultStoreDownloadServer) {
+	s.RegisterService(&_ResultStoreDownload_serviceDesc, srv)
+}
+
+func _ResultStoreDownload_GetInvocation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetInvocationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).GetInvocation(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/GetInvocation",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).GetInvocation(ctx, req.(*GetInvocationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_SearchInvocations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SearchInvocationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).SearchInvocations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/SearchInvocations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).SearchInvocations(ctx, req.(*SearchInvocationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_GetConfiguration_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetConfigurationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).GetConfiguration(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/GetConfiguration",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).GetConfiguration(ctx, req.(*GetConfigurationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_ListConfigurations_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListConfigurationsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).ListConfigurations(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/ListConfigurations",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).ListConfigurations(ctx, req.(*ListConfigurationsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_GetTarget_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetTargetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).GetTarget(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/GetTarget",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).GetTarget(ctx, req.(*GetTargetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_ListTargets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListTargetsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).ListTargets(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/ListTargets",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).ListTargets(ctx, req.(*ListTargetsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_GetConfiguredTarget_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetConfiguredTargetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).GetConfiguredTarget(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/GetConfiguredTarget",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).GetConfiguredTarget(ctx, req.(*GetConfiguredTargetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_ListConfiguredTargets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListConfiguredTargetsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).ListConfiguredTargets(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/ListConfiguredTargets",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).ListConfiguredTargets(ctx, req.(*ListConfiguredTargetsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_GetAction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetActionRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).GetAction(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/GetAction",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).GetAction(ctx, req.(*GetActionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_ListActions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListActionsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).ListActions(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/ListActions",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).ListActions(ctx, req.(*ListActionsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_GetFileSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetFileSetRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).GetFileSet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/GetFileSet",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).GetFileSet(ctx, req.(*GetFileSetRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ResultStoreDownload_ListFileSets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListFileSetsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreDownloadServer).ListFileSets(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreDownload/ListFileSets",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreDownloadServer).ListFileSets(ctx, req.(*ListFileSetsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ResultStoreDownload_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.devtools.resultstore.v2.ResultStoreDownload",
+	HandlerType: (*ResultStoreDownloadServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "GetInvocation",
+			Handler:    _ResultStoreDownload_GetInvocation_Handler,
+		},
+		{
+			MethodName: "SearchInvocations",
+			Handler:    _ResultStoreDownload_SearchInvocations_Handler,
+		},
+		{
+			MethodName: "GetConfiguration",
+			Handler:    _ResultStoreDownload_GetConfiguration_Handler,
+		},
+		{
+			MethodName: "ListConfigurations",
+			Handler:    _ResultStoreDownload_ListConfigurations_Handler,
+		},
+		{
+			MethodName: "GetTarget",
+			Handler:    _ResultStoreDownload_GetTarget_Handler,
+		},
+		{
+			MethodName: "ListTargets",
+			Handler:    _ResultStoreDownload_ListTargets_Handler,
+		},
+		{
+			MethodName: "GetConfiguredTarget",
+			Handler:    _ResultStoreDownload_GetConfiguredTarget_Handler,
+		},
+		{
+			MethodName: "ListConfiguredTargets",
+			Handler:    _ResultStoreDownload_ListConfiguredTargets_Handler,
+		},
+		{
+			MethodName: "GetAction",
+			Handler:    _ResultStoreDownload_GetAction_Handler,
+		},
+		{
+			MethodName: "ListActions",
+			Handler:    _ResultStoreDownload_ListActions_Handler,
+		},
+		{
+			MethodName: "GetFileSet",
+			Handler:    _ResultStoreDownload_GetFileSet_Handler,
+		},
+		{
+			MethodName: "ListFileSets",
+			Handler:    _ResultStoreDownload_ListFileSets_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/devtools/resultstore/v2/resultstore_download.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/resultstore_download.proto", fileDescriptor_resultstore_download_33af6560b54fe4e6)
+}
+
+var fileDescriptor_resultstore_download_33af6560b54fe4e6 = []byte{
+	// 1043 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xcf, 0x6f, 0xdc, 0x44,
+	0x14, 0xc7, 0x3b, 0xf9, 0x45, 0xf7, 0xa5, 0x85, 0xe6, 0x25, 0x14, 0xd7, 0xb4, 0x25, 0x32, 0x90,
+	0x46, 0xa9, 0xb2, 0x1b, 0xb6, 0x55, 0x69, 0x03, 0x45, 0x25, 0x54, 0x24, 0x91, 0x7a, 0xa8, 0x36,
+	0xe5, 0xc2, 0x65, 0x65, 0x76, 0x67, 0x8d, 0x61, 0xe3, 0xd9, 0x78, 0x26, 0x01, 0x8a, 0x10, 0x12,
+	0xe2, 0x1f, 0x28, 0x11, 0x07, 0x04, 0x27, 0x0e, 0x55, 0x6e, 0x9c, 0x10, 0x57, 0x24, 0xc4, 0x5f,
+	0x00, 0x7f, 0x02, 0x7f, 0x08, 0xf2, 0x78, 0x66, 0xe3, 0x71, 0xbc, 0xeb, 0x71, 0x4e, 0xb9, 0xc5,
+	0xde, 0xf7, 0x9d, 0x79, 0xef, 0x33, 0x5f, 0xfb, 0xbd, 0x18, 0xee, 0x05, 0x8c, 0x05, 0x7d, 0xda,
+	0xe8, 0xd2, 0x03, 0xc1, 0x58, 0x9f, 0x37, 0x62, 0xca, 0xf7, 0xfb, 0x82, 0x0b, 0x16, 0xd3, 0xc6,
+	0x41, 0x33, 0x7b, 0xd9, 0xee, 0xb2, 0x2f, 0xa2, 0x3e, 0xf3, 0xbb, 0xf5, 0x41, 0xcc, 0x04, 0xc3,
+	0xeb, 0xa9, 0xb4, 0xae, 0xa5, 0xf5, 0x4c, 0x6c, 0xfd, 0xa0, 0xe9, 0x5e, 0x55, 0x4b, 0xfb, 0x83,
+	0xb0, 0xe1, 0x47, 0x11, 0x13, 0xbe, 0x08, 0x59, 0xc4, 0x53, 0xb5, 0x7b, 0xb3, 0x64, 0x63, 0xbf,
+	0x93, 0x44, 0x5b, 0x06, 0x77, 0xd8, 0xee, 0xee, 0x30, 0xb8, 0x59, 0x1a, 0x1c, 0xf5, 0xc2, 0x60,
+	0x3f, 0xf6, 0x33, 0x1b, 0xdc, 0xb1, 0xd4, 0xd0, 0x6e, 0x5b, 0xf8, 0x71, 0x40, 0x85, 0xd2, 0xad,
+	0x96, 0xe8, 0x7a, 0x61, 0x9f, 0xb6, 0xf9, 0x30, 0xbc, 0x51, 0x12, 0x1e, 0x46, 0x07, 0xac, 0xe3,
+	0x57, 0x28, 0x3c, 0x9b, 0x8c, 0xb7, 0x02, 0x0b, 0x9b, 0x54, 0x6c, 0x0f, 0xd7, 0x68, 0xd1, 0xbd,
+	0x7d, 0xca, 0x05, 0x22, 0x4c, 0x45, 0xfe, 0x2e, 0x75, 0xc8, 0x22, 0x59, 0xae, 0xb5, 0xe4, 0xdf,
+	0xde, 0xef, 0x04, 0x9c, 0x1d, 0xea, 0xc7, 0x9d, 0x4f, 0x8f, 0xe3, 0xb9, 0x16, 0xbc, 0x0a, 0xb5,
+	0x81, 0x1f, 0xd0, 0x36, 0x0f, 0x9f, 0xa6, 0xaa, 0xe9, 0xd6, 0xf9, 0xe4, 0xc6, 0x4e, 0xf8, 0x94,
+	0xe2, 0x6b, 0x00, 0xf2, 0x47, 0xc1, 0x3e, 0xa7, 0x91, 0x33, 0x91, 0xac, 0xb9, 0x75, 0xae, 0x25,
+	0x05, 0x4f, 0x92, 0x5b, 0xe8, 0xc0, 0x0c, 0xeb, 0xf5, 0x38, 0x15, 0xce, 0xe4, 0x22, 0x59, 0x9e,
+	0xdc, 0x3a, 0xd7, 0x52, 0xd7, 0xb8, 0x00, 0xd3, 0x7b, 0xfb, 0x34, 0xfe, 0xca, 0x99, 0x92, 0x99,
+	0xa4, 0x17, 0x78, 0x0d, 0x60, 0x10, 0xb3, 0xcf, 0x68, 0x47, 0xb4, 0xc3, 0xae, 0x33, 0x2d, 0x7f,
+	0xaa, 0xa9, 0x3b, 0xdb, 0xdd, 0x8d, 0x0b, 0x6a, 0x3f, 0x2e, 0xfc, 0x58, 0x78, 0xcf, 0x08, 0x5c,
+	0x29, 0xc8, 0x9b, 0x0f, 0x58, 0xc4, 0x29, 0x3e, 0x82, 0xd9, 0x63, 0x84, 0xdc, 0x21, 0x8b, 0x93,
+	0xcb, 0xb3, 0xcd, 0x95, 0xfa, 0x78, 0xa3, 0xd6, 0x33, 0xc4, 0xb2, 0x72, 0x5c, 0x82, 0x97, 0x22,
+	0xfa, 0xa5, 0x68, 0xe7, 0xcb, 0x6d, 0x5d, 0x4c, 0x6e, 0x3f, 0xd6, 0x05, 0x7b, 0xab, 0xf0, 0xca,
+	0x26, 0x15, 0x1f, 0x64, 0x6d, 0x35, 0x0e, 0xfd, 0x4f, 0x04, 0xae, 0x3c, 0x0a, 0xb9, 0x29, 0x18,
+	0xb2, 0xbf, 0x0c, 0x33, 0x03, 0x3f, 0xa6, 0x91, 0x50, 0x1a, 0x75, 0x65, 0x9e, 0xc9, 0xc4, 0xd8,
+	0x33, 0x99, 0x1c, 0x77, 0x26, 0x53, 0xe6, 0x99, 0xe4, 0xf0, 0xfe, 0x4c, 0xc0, 0x2d, 0xca, 0x4d,
+	0xf1, 0xfd, 0x08, 0x5e, 0x34, 0x9e, 0x1e, 0x8d, 0x78, 0xb5, 0x0c, 0xb1, 0x09, 0x27, 0xb7, 0x88,
+	0x35, 0xe8, 0x25, 0xb8, 0xb4, 0x49, 0xc5, 0x13, 0xe9, 0xf9, 0x71, 0x84, 0x7f, 0x20, 0x80, 0x49,
+	0x15, 0x69, 0xe4, 0x19, 0x41, 0xfb, 0x2d, 0xcc, 0x1b, 0x39, 0x29, 0xa4, 0x0f, 0xe0, 0x85, 0xf4,
+	0x21, 0xd6, 0x2c, 0x97, 0xca, 0x58, 0xaa, 0xfa, 0xb5, 0xcc, 0x9a, 0xde, 0x1a, 0xb8, 0x19, 0x9b,
+	0xd2, 0x6e, 0x39, 0xc7, 0x5f, 0x08, 0x5c, 0xcd, 0xba, 0x41, 0x6b, 0xce, 0x08, 0xd1, 0x23, 0x02,
+	0xd7, 0x46, 0xa4, 0xa7, 0xe0, 0xb6, 0x01, 0x4f, 0xbc, 0xb9, 0x35, 0xe7, 0x35, 0x5b, 0xcf, 0x0e,
+	0x49, 0xcd, 0x75, 0xf2, 0x1b, 0x55, 0x74, 0xee, 0xfb, 0x9d, 0xb2, 0x77, 0x83, 0x76, 0x6e, 0x1a,
+	0x79, 0xb6, 0x9c, 0x3b, 0xcc, 0xe9, 0xd8, 0xb9, 0x69, 0x93, 0xb6, 0x76, 0xae, 0xaa, 0x5f, 0xcb,
+	0xac, 0xe9, 0xdd, 0x80, 0xb9, 0x4d, 0x2a, 0x3e, 0x0c, 0xfb, 0x74, 0x67, 0xbc, 0x61, 0x0f, 0x49,
+	0x9a, 0xaa, 0x0a, 0x3d, 0x23, 0xfc, 0xbe, 0x27, 0xb0, 0x60, 0x66, 0xa5, 0x08, 0x3e, 0x84, 0x9a,
+	0x1e, 0x10, 0x34, 0xc3, 0x1b, 0x65, 0x0c, 0x35, 0x85, 0xf3, 0x3d, 0xb5, 0x9a, 0x2d, 0xc5, 0xe6,
+	0xdf, 0x97, 0x60, 0xbe, 0x25, 0x17, 0xdb, 0x49, 0x16, 0x7b, 0xa8, 0xa6, 0x39, 0x3c, 0x24, 0x70,
+	0xd1, 0x98, 0x1b, 0xf0, 0x76, 0x59, 0x12, 0x45, 0x63, 0x86, 0x5b, 0xa1, 0xcf, 0x7a, 0x8b, 0xdf,
+	0xfd, 0xf3, 0xdf, 0xe1, 0x84, 0x8b, 0x4e, 0x32, 0xc4, 0x7c, 0x9d, 0x9c, 0xdd, 0xfd, 0x4c, 0xe7,
+	0x6d, 0xac, 0x7c, 0x83, 0x47, 0x04, 0xe6, 0x4e, 0x34, 0x7a, 0xbc, 0x5b, 0xb6, 0xc7, 0xa8, 0x99,
+	0xc6, 0xbd, 0x77, 0x0a, 0x65, 0x7a, 0x4c, 0xde, 0x75, 0x99, 0xac, 0x83, 0x97, 0xcd, 0x11, 0x8d,
+	0xaf, 0x73, 0x29, 0xc1, 0xe7, 0x44, 0x3e, 0xdd, 0x46, 0x8f, 0xc3, 0xb7, 0x2d, 0x18, 0x16, 0x8d,
+	0x0c, 0x6e, 0xb5, 0x5e, 0xea, 0xad, 0xc8, 0xe4, 0xde, 0x40, 0x6f, 0x04, 0x49, 0x35, 0xba, 0x4a,
+	0xa6, 0x7f, 0xa8, 0xb7, 0x8b, 0xd9, 0xdd, 0xb1, 0x14, 0xcd, 0xc8, 0x69, 0xc5, 0x5d, 0x3f, 0x8d,
+	0x54, 0x61, 0x35, 0x33, 0x4f, 0x9f, 0xc8, 0x9c, 0x0b, 0x74, 0xf2, 0xf8, 0x8c, 0x40, 0x6d, 0xd8,
+	0xfa, 0x71, 0xcd, 0x82, 0xad, 0xd1, 0xdd, 0x5c, 0xcb, 0xa6, 0x5a, 0x4e, 0x53, 0xf5, 0x90, 0x84,
+	0xe6, 0xaf, 0x04, 0x66, 0x33, 0x1d, 0x1d, 0x9b, 0x36, 0x2c, 0xcc, 0x06, 0xea, 0xde, 0xaa, 0xa4,
+	0xa9, 0x00, 0x4e, 0x0f, 0x07, 0x7f, 0x11, 0x98, 0x2f, 0xe8, 0xfa, 0xb8, 0x5e, 0xc1, 0x9e, 0xb9,
+	0x51, 0xc1, 0xad, 0xdc, 0x39, 0xbd, 0xf7, 0x64, 0xc6, 0x77, 0xf1, 0x4e, 0x29, 0xd6, 0xc6, 0x89,
+	0x1e, 0x9b, 0xa0, 0xfe, 0x97, 0xc0, 0xcb, 0x85, 0x9d, 0x1e, 0xdf, 0xad, 0x62, 0xc0, 0xfc, 0xfc,
+	0xe2, 0xde, 0x3f, 0xa5, 0x5a, 0x1d, 0x84, 0x59, 0x56, 0xd1, 0x41, 0x64, 0xfc, 0x72, 0xb2, 0x32,
+	0xfc, 0x2d, 0x75, 0x75, 0xda, 0x16, 0xad, 0x5c, 0x6d, 0x4c, 0x10, 0xae, 0x65, 0xc3, 0xf5, 0xb6,
+	0x64, 0x9e, 0x1b, 0xf8, 0xe0, 0x54, 0xf8, 0xd5, 0xbf, 0xe2, 0xf2, 0x20, 0xfe, 0x54, 0x9e, 0x57,
+	0xb3, 0x80, 0x9d, 0xe7, 0xcd, 0x61, 0xc6, 0xce, 0xf3, 0xb9, 0x61, 0x23, 0x57, 0xc2, 0x78, 0xd4,
+	0x85, 0x1e, 0xd2, 0x55, 0xe0, 0x8f, 0x04, 0xe0, 0x78, 0x9a, 0xc0, 0xb7, 0x2c, 0xa8, 0x9b, 0x93,
+	0x87, 0x6b, 0xdb, 0xa3, 0xbd, 0x9b, 0x32, 0xe9, 0x37, 0xf1, 0xf5, 0x51, 0xdc, 0x75, 0x0f, 0x4f,
+	0xd0, 0x3e, 0x27, 0x70, 0x21, 0x3b, 0x25, 0xa0, 0x15, 0xa7, 0xdc, 0xa4, 0xe3, 0xde, 0xae, 0x26,
+	0x52, 0x74, 0xcd, 0x44, 0x8b, 0xdf, 0x28, 0x3a, 0xd7, 0x8d, 0x3d, 0xf0, 0x3a, 0x6c, 0xb7, 0x64,
+	0x9f, 0xc7, 0xe4, 0xe3, 0x6d, 0x15, 0x11, 0xb0, 0xbe, 0x1f, 0x05, 0x75, 0x16, 0x07, 0x8d, 0x80,
+	0x46, 0xf2, 0x53, 0x85, 0xfa, 0x0e, 0xe2, 0x0f, 0x42, 0x3e, 0xea, 0xd3, 0xc6, 0x3b, 0x99, 0xcb,
+	0x4f, 0x66, 0xa4, 0xea, 0xd6, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x69, 0xe0, 0x2a, 0x9a, 0xae,
+	0x12, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go
new file mode 100644
index 00000000..ec6dc46c
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/resultstore_file_download.pb.go
@@ -0,0 +1,433 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/resultstore_file_download.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Request object for GetFile
+type GetFileRequest struct {
+	// This corresponds to the uri field in the File message.
+	Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	// The offset for the first byte to return in the read, relative to the start
+	// of the resource.
+	//
+	// A `read_offset` that is negative or greater than the size of the resource
+	// will cause an `OUT_OF_RANGE` error.
+	ReadOffset int64 `protobuf:"varint,2,opt,name=read_offset,json=readOffset,proto3" json:"read_offset,omitempty"`
+	// The maximum number of `data` bytes the server is allowed to return in the
+	// sum of all `ReadResponse` messages. A `read_limit` of zero indicates that
+	// there is no limit, and a negative `read_limit` will cause an error.
+	//
+	// If the stream returns fewer bytes than allowed by the `read_limit` and no
+	// error occurred, the stream includes all data from the `read_offset` to the
+	// end of the resource.
+	ReadLimit            int64    `protobuf:"varint,3,opt,name=read_limit,json=readLimit,proto3" json:"read_limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetFileRequest) Reset()         { *m = GetFileRequest{} }
+func (m *GetFileRequest) String() string { return proto.CompactTextString(m) }
+func (*GetFileRequest) ProtoMessage()    {}
+func (*GetFileRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_file_download_7c120db11270c429, []int{0}
+}
+func (m *GetFileRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetFileRequest.Unmarshal(m, b)
+}
+func (m *GetFileRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetFileRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetFileRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileRequest.Merge(dst, src)
+}
+func (m *GetFileRequest) XXX_Size() int {
+	return xxx_messageInfo_GetFileRequest.Size(m)
+}
+func (m *GetFileRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetFileRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetFileRequest proto.InternalMessageInfo
+
+func (m *GetFileRequest) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+func (m *GetFileRequest) GetReadOffset() int64 {
+	if m != nil {
+		return m.ReadOffset
+	}
+	return 0
+}
+
+func (m *GetFileRequest) GetReadLimit() int64 {
+	if m != nil {
+		return m.ReadLimit
+	}
+	return 0
+}
+
+// Response object for GetFile
+type GetFileResponse struct {
+	// The file data.
+	Data                 []byte   `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetFileResponse) Reset()         { *m = GetFileResponse{} }
+func (m *GetFileResponse) String() string { return proto.CompactTextString(m) }
+func (*GetFileResponse) ProtoMessage()    {}
+func (*GetFileResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_file_download_7c120db11270c429, []int{1}
+}
+func (m *GetFileResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetFileResponse.Unmarshal(m, b)
+}
+func (m *GetFileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetFileResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetFileResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileResponse.Merge(dst, src)
+}
+func (m *GetFileResponse) XXX_Size() int {
+	return xxx_messageInfo_GetFileResponse.Size(m)
+}
+func (m *GetFileResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetFileResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetFileResponse proto.InternalMessageInfo
+
+func (m *GetFileResponse) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+// Request object for GetFileTail
+type GetFileTailRequest struct {
+	// This corresponds to the uri field in the File message.
+	Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
+	// The offset for the first byte to return in the read, relative to the end
+	// of the resource.
+	//
+	// A `read_offset` that is negative or greater than the size of the resource
+	// will cause an `OUT_OF_RANGE` error.
+	ReadOffset int64 `protobuf:"varint,2,opt,name=read_offset,json=readOffset,proto3" json:"read_offset,omitempty"`
+	// The maximum number of `data` bytes the server is allowed to return. The
+	// server will return bytes starting from the tail of the file.
+	//
+	// A `read_limit` of zero indicates that there is no limit, and a negative
+	// `read_limit` will cause an error.
+	ReadLimit            int64    `protobuf:"varint,3,opt,name=read_limit,json=readLimit,proto3" json:"read_limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetFileTailRequest) Reset()         { *m = GetFileTailRequest{} }
+func (m *GetFileTailRequest) String() string { return proto.CompactTextString(m) }
+func (*GetFileTailRequest) ProtoMessage()    {}
+func (*GetFileTailRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_file_download_7c120db11270c429, []int{2}
+}
+func (m *GetFileTailRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetFileTailRequest.Unmarshal(m, b)
+}
+func (m *GetFileTailRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetFileTailRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetFileTailRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileTailRequest.Merge(dst, src)
+}
+func (m *GetFileTailRequest) XXX_Size() int {
+	return xxx_messageInfo_GetFileTailRequest.Size(m)
+}
+func (m *GetFileTailRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetFileTailRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetFileTailRequest proto.InternalMessageInfo
+
+func (m *GetFileTailRequest) GetUri() string {
+	if m != nil {
+		return m.Uri
+	}
+	return ""
+}
+
+func (m *GetFileTailRequest) GetReadOffset() int64 {
+	if m != nil {
+		return m.ReadOffset
+	}
+	return 0
+}
+
+func (m *GetFileTailRequest) GetReadLimit() int64 {
+	if m != nil {
+		return m.ReadLimit
+	}
+	return 0
+}
+
+// Response object for GetFileTail
+type GetFileTailResponse struct {
+	// The file data, encoded with UTF-8.
+	Data                 []byte   `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetFileTailResponse) Reset()         { *m = GetFileTailResponse{} }
+func (m *GetFileTailResponse) String() string { return proto.CompactTextString(m) }
+func (*GetFileTailResponse) ProtoMessage()    {}
+func (*GetFileTailResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resultstore_file_download_7c120db11270c429, []int{3}
+}
+func (m *GetFileTailResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetFileTailResponse.Unmarshal(m, b)
+}
+func (m *GetFileTailResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetFileTailResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetFileTailResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetFileTailResponse.Merge(dst, src)
+}
+func (m *GetFileTailResponse) XXX_Size() int {
+	return xxx_messageInfo_GetFileTailResponse.Size(m)
+}
+func (m *GetFileTailResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetFileTailResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetFileTailResponse proto.InternalMessageInfo
+
+func (m *GetFileTailResponse) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*GetFileRequest)(nil), "google.devtools.resultstore.v2.GetFileRequest")
+	proto.RegisterType((*GetFileResponse)(nil), "google.devtools.resultstore.v2.GetFileResponse")
+	proto.RegisterType((*GetFileTailRequest)(nil), "google.devtools.resultstore.v2.GetFileTailRequest")
+	proto.RegisterType((*GetFileTailResponse)(nil), "google.devtools.resultstore.v2.GetFileTailResponse")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ResultStoreFileDownloadClient is the client API for ResultStoreFileDownload service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ResultStoreFileDownloadClient interface {
+	// Retrieves the File with the given uri.
+	// returns a stream of bytes to be stitched together in order.
+	//
+	// An error will be reported in the following cases:
+	// - If the File is not found.
+	// - If the given File uri is badly formatted.
+	GetFile(ctx context.Context, in *GetFileRequest, opts ...grpc.CallOption) (ResultStoreFileDownload_GetFileClient, error)
+	// Retrieves the tail of a File with the given uri.
+	//
+	// An error will be reported in the following cases:
+	// - If the File is not found.
+	// - If the given File uri is badly formatted.
+	GetFileTail(ctx context.Context, in *GetFileTailRequest, opts ...grpc.CallOption) (*GetFileTailResponse, error)
+}
+
+type resultStoreFileDownloadClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewResultStoreFileDownloadClient(cc *grpc.ClientConn) ResultStoreFileDownloadClient {
+	return &resultStoreFileDownloadClient{cc}
+}
+
+func (c *resultStoreFileDownloadClient) GetFile(ctx context.Context, in *GetFileRequest, opts ...grpc.CallOption) (ResultStoreFileDownload_GetFileClient, error) {
+	stream, err := c.cc.NewStream(ctx, &_ResultStoreFileDownload_serviceDesc.Streams[0], "/google.devtools.resultstore.v2.ResultStoreFileDownload/GetFile", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &resultStoreFileDownloadGetFileClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type ResultStoreFileDownload_GetFileClient interface {
+	Recv() (*GetFileResponse, error)
+	grpc.ClientStream
+}
+
+type resultStoreFileDownloadGetFileClient struct {
+	grpc.ClientStream
+}
+
+func (x *resultStoreFileDownloadGetFileClient) Recv() (*GetFileResponse, error) {
+	m := new(GetFileResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *resultStoreFileDownloadClient) GetFileTail(ctx context.Context, in *GetFileTailRequest, opts ...grpc.CallOption) (*GetFileTailResponse, error) {
+	out := new(GetFileTailResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.resultstore.v2.ResultStoreFileDownload/GetFileTail", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ResultStoreFileDownloadServer is the server API for ResultStoreFileDownload service.
+type ResultStoreFileDownloadServer interface {
+	// Retrieves the File with the given uri.
+	// returns a stream of bytes to be stitched together in order.
+	//
+	// An error will be reported in the following cases:
+	// - If the File is not found.
+	// - If the given File uri is badly formatted.
+	GetFile(*GetFileRequest, ResultStoreFileDownload_GetFileServer) error
+	// Retrieves the tail of a File with the given uri.
+	//
+	// An error will be reported in the following cases:
+	// - If the File is not found.
+	// - If the given File uri is badly formatted.
+	GetFileTail(context.Context, *GetFileTailRequest) (*GetFileTailResponse, error)
+}
+
+func RegisterResultStoreFileDownloadServer(s *grpc.Server, srv ResultStoreFileDownloadServer) {
+	s.RegisterService(&_ResultStoreFileDownload_serviceDesc, srv)
+}
+
+func _ResultStoreFileDownload_GetFile_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(GetFileRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(ResultStoreFileDownloadServer).GetFile(m, &resultStoreFileDownloadGetFileServer{stream})
+}
+
+type ResultStoreFileDownload_GetFileServer interface {
+	Send(*GetFileResponse) error
+	grpc.ServerStream
+}
+
+type resultStoreFileDownloadGetFileServer struct {
+	grpc.ServerStream
+}
+
+func (x *resultStoreFileDownloadGetFileServer) Send(m *GetFileResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func _ResultStoreFileDownload_GetFileTail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetFileTailRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ResultStoreFileDownloadServer).GetFileTail(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.devtools.resultstore.v2.ResultStoreFileDownload/GetFileTail",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ResultStoreFileDownloadServer).GetFileTail(ctx, req.(*GetFileTailRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _ResultStoreFileDownload_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.devtools.resultstore.v2.ResultStoreFileDownload",
+	HandlerType: (*ResultStoreFileDownloadServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "GetFileTail",
+			Handler:    _ResultStoreFileDownload_GetFileTail_Handler,
+		},
+	},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "GetFile",
+			Handler:       _ResultStoreFileDownload_GetFile_Handler,
+			ServerStreams: true,
+		},
+	},
+	Metadata: "google/devtools/resultstore/v2/resultstore_file_download.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/resultstore_file_download.proto", fileDescriptor_resultstore_file_download_7c120db11270c429)
+}
+
+var fileDescriptor_resultstore_file_download_7c120db11270c429 = []byte{
+	// 384 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xc1, 0x4a, 0xe3, 0x40,
+	0x18, 0x26, 0xed, 0xb2, 0x4b, 0xa7, 0xcb, 0x6e, 0x99, 0x65, 0x69, 0x28, 0xdb, 0xb5, 0x04, 0x84,
+	0xda, 0xc3, 0x8c, 0xa4, 0x47, 0xd1, 0x83, 0x88, 0x22, 0x08, 0x4a, 0xf4, 0xe4, 0x25, 0x4c, 0xcd,
+	0x24, 0x0c, 0x4c, 0xf3, 0xa7, 0x99, 0x49, 0x3d, 0x48, 0x2f, 0x1e, 0x7c, 0x01, 0xf1, 0x65, 0x7c,
+	0x0d, 0x5f, 0xc1, 0x07, 0x91, 0x99, 0x44, 0x49, 0x0f, 0xd5, 0x7a, 0xf0, 0x36, 0xff, 0x37, 0xff,
+	0xf7, 0xfd, 0x5f, 0xbe, 0xfc, 0x83, 0xf6, 0x12, 0x80, 0x44, 0x72, 0x1a, 0xf1, 0xb9, 0x06, 0x90,
+	0x8a, 0xe6, 0x5c, 0x15, 0x52, 0x2b, 0x0d, 0x39, 0xa7, 0x73, 0xbf, 0x5e, 0x86, 0xb1, 0x90, 0x3c,
+	0x8c, 0xe0, 0x3a, 0x95, 0xc0, 0x22, 0x92, 0xe5, 0xa0, 0x01, 0xff, 0x2f, 0xf9, 0xe4, 0x95, 0x4f,
+	0x6a, 0x04, 0x32, 0xf7, 0x7b, 0xff, 0x2a, 0x7d, 0x96, 0x09, 0xca, 0xd2, 0x14, 0x34, 0xd3, 0x02,
+	0x52, 0x55, 0xb2, 0xbd, 0x09, 0xfa, 0x75, 0xc4, 0xf5, 0xa1, 0x90, 0x3c, 0xe0, 0xb3, 0x82, 0x2b,
+	0x8d, 0x3b, 0xa8, 0x59, 0xe4, 0xc2, 0x75, 0x06, 0xce, 0xb0, 0x15, 0x98, 0x23, 0xde, 0x40, 0xed,
+	0x9c, 0xb3, 0x28, 0x84, 0x38, 0x56, 0x5c, 0xbb, 0x8d, 0x81, 0x33, 0x6c, 0x06, 0xc8, 0x40, 0xa7,
+	0x16, 0xc1, 0x7d, 0x64, 0xab, 0x50, 0x8a, 0xa9, 0xd0, 0x6e, 0xd3, 0xde, 0xb7, 0x0c, 0x72, 0x62,
+	0x00, 0x6f, 0x13, 0xfd, 0x7e, 0x9b, 0xa1, 0x32, 0x48, 0x15, 0xc7, 0x18, 0x7d, 0x8b, 0x98, 0x66,
+	0x76, 0xca, 0xcf, 0xc0, 0x9e, 0xbd, 0x18, 0xe1, 0xaa, 0xed, 0x82, 0x09, 0xf9, 0x75, 0x76, 0xb6,
+	0xd0, 0x9f, 0xa5, 0x39, 0xab, 0x2d, 0xf9, 0x8f, 0x0d, 0xd4, 0x0d, 0x6c, 0x9c, 0xe7, 0x26, 0x4e,
+	0xc3, 0x39, 0xa8, 0xd2, 0xc7, 0x77, 0x0e, 0xfa, 0x51, 0xe9, 0x60, 0x42, 0xde, 0xff, 0x09, 0x64,
+	0x39, 0xe3, 0x1e, 0x5d, 0xbb, 0xbf, 0x34, 0xe7, 0xb9, 0xb7, 0x4f, 0xcf, 0xf7, 0x0d, 0x8c, 0x3b,
+	0x66, 0x23, 0x6e, 0x8a, 0x5c, 0xec, 0x9a, 0x55, 0xa0, 0xa3, 0xc5, 0xb6, 0x83, 0x1f, 0x1c, 0xd4,
+	0xae, 0x7d, 0x10, 0xf6, 0xd7, 0x14, 0xaf, 0xa5, 0xdc, 0x1b, 0x7f, 0x8a, 0x53, 0x99, 0xea, 0x5b,
+	0x53, 0x5d, 0xfc, 0x77, 0xd9, 0x94, 0x66, 0x42, 0xd2, 0xd1, 0x62, 0x7f, 0x86, 0xbc, 0x2b, 0x98,
+	0x7e, 0x20, 0x7c, 0xe6, 0x5c, 0x1e, 0x57, 0x1d, 0x09, 0x48, 0x96, 0x26, 0x04, 0xf2, 0x84, 0x26,
+	0x3c, 0xb5, 0xeb, 0x49, 0xcb, 0x2b, 0x96, 0x09, 0xb5, 0xea, 0x7d, 0xec, 0xd4, 0xca, 0xc9, 0x77,
+	0xcb, 0x1a, 0xbf, 0x04, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x3d, 0x87, 0x5d, 0x54, 0x03, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/target.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/target.pb.go
new file mode 100644
index 00000000..4c4fdffc
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/target.pb.go
@@ -0,0 +1,434 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/target.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// These correspond to the suffix of the rule name. Eg cc_test has type TEST.
+type TargetType int32
+
+const (
+	// Unspecified by the build system.
+	TargetType_TARGET_TYPE_UNSPECIFIED TargetType = 0
+	// An application e.g. ios_application.
+	TargetType_APPLICATION TargetType = 1
+	// A binary target e.g. cc_binary.
+	TargetType_BINARY TargetType = 2
+	// A library target e.g. java_library
+	TargetType_LIBRARY TargetType = 3
+	// A package
+	TargetType_PACKAGE TargetType = 4
+	// Any test target, in bazel that means a rule with a '_test' suffix.
+	TargetType_TEST TargetType = 5
+)
+
+var TargetType_name = map[int32]string{
+	0: "TARGET_TYPE_UNSPECIFIED",
+	1: "APPLICATION",
+	2: "BINARY",
+	3: "LIBRARY",
+	4: "PACKAGE",
+	5: "TEST",
+}
+var TargetType_value = map[string]int32{
+	"TARGET_TYPE_UNSPECIFIED": 0,
+	"APPLICATION":             1,
+	"BINARY":                  2,
+	"LIBRARY":                 3,
+	"PACKAGE":                 4,
+	"TEST":                    5,
+}
+
+func (x TargetType) String() string {
+	return proto.EnumName(TargetType_name, int32(x))
+}
+func (TargetType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_target_25848505c9398e1a, []int{0}
+}
+
+// Indicates how big the user indicated the test action was.
+type TestSize int32
+
+const (
+	// Unspecified by the user.
+	TestSize_TEST_SIZE_UNSPECIFIED TestSize = 0
+	// Unit test taking less than 1 minute.
+	TestSize_SMALL TestSize = 1
+	// Integration tests taking less than 5 minutes.
+	TestSize_MEDIUM TestSize = 2
+	// End-to-end tests taking less than 15 minutes.
+	TestSize_LARGE TestSize = 3
+	// Even bigger than LARGE.
+	TestSize_ENORMOUS TestSize = 4
+	// Something that doesn't fit into the above categories.
+	TestSize_OTHER_SIZE TestSize = 5
+)
+
+var TestSize_name = map[int32]string{
+	0: "TEST_SIZE_UNSPECIFIED",
+	1: "SMALL",
+	2: "MEDIUM",
+	3: "LARGE",
+	4: "ENORMOUS",
+	5: "OTHER_SIZE",
+}
+var TestSize_value = map[string]int32{
+	"TEST_SIZE_UNSPECIFIED": 0,
+	"SMALL":                 1,
+	"MEDIUM":                2,
+	"LARGE":                 3,
+	"ENORMOUS":              4,
+	"OTHER_SIZE":            5,
+}
+
+func (x TestSize) String() string {
+	return proto.EnumName(TestSize_name, int32(x))
+}
+func (TestSize) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_target_25848505c9398e1a, []int{1}
+}
+
+// Each Target represents data for a given target in a given Invocation.
+// ConfiguredTarget and Action resources under each Target contain the bulk of
+// the data.
+type Target struct {
+	// The resource name.  Its format must be:
+	// invocations/${INVOCATION_ID}/targets/${TARGET_ID}
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The resource ID components that identify the Target. They must match the
+	// resource name after proper encoding.
+	Id *Target_Id `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	// This is the aggregate status of the target.
+	StatusAttributes *StatusAttributes `protobuf:"bytes,3,opt,name=status_attributes,json=statusAttributes,proto3" json:"status_attributes,omitempty"`
+	// When this target started and its duration.
+	Timing *Timing `protobuf:"bytes,4,opt,name=timing,proto3" json:"timing,omitempty"`
+	// Attributes that apply to all targets.
+	TargetAttributes *TargetAttributes `protobuf:"bytes,5,opt,name=target_attributes,json=targetAttributes,proto3" json:"target_attributes,omitempty"`
+	// Attributes that apply to all test actions under this target.
+	TestAttributes *TestAttributes `protobuf:"bytes,6,opt,name=test_attributes,json=testAttributes,proto3" json:"test_attributes,omitempty"`
+	// Arbitrary name-value pairs.
+	// This is implemented as a multi-map. Multiple properties are allowed with
+	// the same key. Properties will be returned in lexicographical order by key.
+	Properties []*Property `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty"`
+	// A list of file references for target level files.
+	// The file IDs must be unique within this list. Duplicate file IDs will
+	// result in an error. Files will be returned in lexicographical order by ID.
+	// Use this field to specify outputs not related to a configuration.
+	Files []*File `protobuf:"bytes,8,rep,name=files,proto3" json:"files,omitempty"`
+	// Provides a hint to clients as to whether to display the Target to users.
+	// If true then clients likely want to display the Target by default.
+	// Once set to true, this may not be set back to false.
+	IsVisible            bool     `protobuf:"varint,9,opt,name=is_visible,json=isVisible,proto3" json:"is_visible,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Target) Reset()         { *m = Target{} }
+func (m *Target) String() string { return proto.CompactTextString(m) }
+func (*Target) ProtoMessage()    {}
+func (*Target) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_25848505c9398e1a, []int{0}
+}
+func (m *Target) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Target.Unmarshal(m, b)
+}
+func (m *Target) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Target.Marshal(b, m, deterministic)
+}
+func (dst *Target) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target.Merge(dst, src)
+}
+func (m *Target) XXX_Size() int {
+	return xxx_messageInfo_Target.Size(m)
+}
+func (m *Target) XXX_DiscardUnknown() {
+	xxx_messageInfo_Target.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Target proto.InternalMessageInfo
+
+func (m *Target) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Target) GetId() *Target_Id {
+	if m != nil {
+		return m.Id
+	}
+	return nil
+}
+
+func (m *Target) GetStatusAttributes() *StatusAttributes {
+	if m != nil {
+		return m.StatusAttributes
+	}
+	return nil
+}
+
+func (m *Target) GetTiming() *Timing {
+	if m != nil {
+		return m.Timing
+	}
+	return nil
+}
+
+func (m *Target) GetTargetAttributes() *TargetAttributes {
+	if m != nil {
+		return m.TargetAttributes
+	}
+	return nil
+}
+
+func (m *Target) GetTestAttributes() *TestAttributes {
+	if m != nil {
+		return m.TestAttributes
+	}
+	return nil
+}
+
+func (m *Target) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+func (m *Target) GetFiles() []*File {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+func (m *Target) GetIsVisible() bool {
+	if m != nil {
+		return m.IsVisible
+	}
+	return false
+}
+
+// The resource ID components that identify the Target.
+type Target_Id struct {
+	// The Invocation ID.
+	InvocationId string `protobuf:"bytes,1,opt,name=invocation_id,json=invocationId,proto3" json:"invocation_id,omitempty"`
+	// The Target ID.
+	TargetId             string   `protobuf:"bytes,2,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Target_Id) Reset()         { *m = Target_Id{} }
+func (m *Target_Id) String() string { return proto.CompactTextString(m) }
+func (*Target_Id) ProtoMessage()    {}
+func (*Target_Id) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_25848505c9398e1a, []int{0, 0}
+}
+func (m *Target_Id) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Target_Id.Unmarshal(m, b)
+}
+func (m *Target_Id) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Target_Id.Marshal(b, m, deterministic)
+}
+func (dst *Target_Id) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target_Id.Merge(dst, src)
+}
+func (m *Target_Id) XXX_Size() int {
+	return xxx_messageInfo_Target_Id.Size(m)
+}
+func (m *Target_Id) XXX_DiscardUnknown() {
+	xxx_messageInfo_Target_Id.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Target_Id proto.InternalMessageInfo
+
+func (m *Target_Id) GetInvocationId() string {
+	if m != nil {
+		return m.InvocationId
+	}
+	return ""
+}
+
+func (m *Target_Id) GetTargetId() string {
+	if m != nil {
+		return m.TargetId
+	}
+	return ""
+}
+
+// Attributes that apply to all targets.
+type TargetAttributes struct {
+	// If known, indicates the type of this target.  In bazel this corresponds
+	// to the rule-suffix.
+	Type TargetType `protobuf:"varint,1,opt,name=type,proto3,enum=google.devtools.resultstore.v2.TargetType" json:"type,omitempty"`
+	// If known, the main language of this target, e.g. java, cc, python, etc.
+	Language Language `protobuf:"varint,2,opt,name=language,proto3,enum=google.devtools.resultstore.v2.Language" json:"language,omitempty"`
+	// The tags attribute of the build rule. These should be short, descriptive
+	// words, and there should only be a few of them.
+	// This is implemented as a set. All tags will be unique. Any duplicate tags
+	// will be ignored. Tags will be returned in lexicographical order.
+	Tags                 []string `protobuf:"bytes,3,rep,name=tags,proto3" json:"tags,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TargetAttributes) Reset()         { *m = TargetAttributes{} }
+func (m *TargetAttributes) String() string { return proto.CompactTextString(m) }
+func (*TargetAttributes) ProtoMessage()    {}
+func (*TargetAttributes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_25848505c9398e1a, []int{1}
+}
+func (m *TargetAttributes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TargetAttributes.Unmarshal(m, b)
+}
+func (m *TargetAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TargetAttributes.Marshal(b, m, deterministic)
+}
+func (dst *TargetAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetAttributes.Merge(dst, src)
+}
+func (m *TargetAttributes) XXX_Size() int {
+	return xxx_messageInfo_TargetAttributes.Size(m)
+}
+func (m *TargetAttributes) XXX_DiscardUnknown() {
+	xxx_messageInfo_TargetAttributes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TargetAttributes proto.InternalMessageInfo
+
+func (m *TargetAttributes) GetType() TargetType {
+	if m != nil {
+		return m.Type
+	}
+	return TargetType_TARGET_TYPE_UNSPECIFIED
+}
+
+func (m *TargetAttributes) GetLanguage() Language {
+	if m != nil {
+		return m.Language
+	}
+	return Language_LANGUAGE_UNSPECIFIED
+}
+
+func (m *TargetAttributes) GetTags() []string {
+	if m != nil {
+		return m.Tags
+	}
+	return nil
+}
+
+// Attributes that apply only to test actions under this target.
+type TestAttributes struct {
+	// Indicates how big the user indicated the test action was.
+	Size                 TestSize `protobuf:"varint,1,opt,name=size,proto3,enum=google.devtools.resultstore.v2.TestSize" json:"size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestAttributes) Reset()         { *m = TestAttributes{} }
+func (m *TestAttributes) String() string { return proto.CompactTextString(m) }
+func (*TestAttributes) ProtoMessage()    {}
+func (*TestAttributes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_target_25848505c9398e1a, []int{2}
+}
+func (m *TestAttributes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestAttributes.Unmarshal(m, b)
+}
+func (m *TestAttributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestAttributes.Marshal(b, m, deterministic)
+}
+func (dst *TestAttributes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestAttributes.Merge(dst, src)
+}
+func (m *TestAttributes) XXX_Size() int {
+	return xxx_messageInfo_TestAttributes.Size(m)
+}
+func (m *TestAttributes) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestAttributes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestAttributes proto.InternalMessageInfo
+
+func (m *TestAttributes) GetSize() TestSize {
+	if m != nil {
+		return m.Size
+	}
+	return TestSize_TEST_SIZE_UNSPECIFIED
+}
+
+func init() {
+	proto.RegisterType((*Target)(nil), "google.devtools.resultstore.v2.Target")
+	proto.RegisterType((*Target_Id)(nil), "google.devtools.resultstore.v2.Target.Id")
+	proto.RegisterType((*TargetAttributes)(nil), "google.devtools.resultstore.v2.TargetAttributes")
+	proto.RegisterType((*TestAttributes)(nil), "google.devtools.resultstore.v2.TestAttributes")
+	proto.RegisterEnum("google.devtools.resultstore.v2.TargetType", TargetType_name, TargetType_value)
+	proto.RegisterEnum("google.devtools.resultstore.v2.TestSize", TestSize_name, TestSize_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/target.proto", fileDescriptor_target_25848505c9398e1a)
+}
+
+var fileDescriptor_target_25848505c9398e1a = []byte{
+	// 634 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xed, 0x6a, 0xdb, 0x4a,
+	0x10, 0xbd, 0xb2, 0x65, 0x47, 0x1e, 0xe7, 0x3a, 0xba, 0x0b, 0x97, 0xaa, 0x09, 0x2d, 0xc6, 0x2d,
+	0xc5, 0x49, 0x41, 0x2e, 0xee, 0xaf, 0x7e, 0x10, 0x50, 0x12, 0x25, 0x11, 0xf5, 0x87, 0x58, 0x29,
+	0x2d, 0x09, 0x14, 0xa3, 0x44, 0x5b, 0xb1, 0x45, 0xd6, 0xba, 0xda, 0xb5, 0x21, 0x79, 0x95, 0xbe,
+	0x42, 0x1f, 0xb2, 0x68, 0xd7, 0x49, 0x1c, 0x43, 0xab, 0xfc, 0xdb, 0x19, 0x9d, 0x73, 0xe6, 0x68,
+	0x66, 0x76, 0xe1, 0x75, 0xc2, 0x58, 0x92, 0x92, 0x5e, 0x4c, 0x16, 0x82, 0xb1, 0x94, 0xf7, 0x72,
+	0xc2, 0xe7, 0xa9, 0xe0, 0x82, 0xe5, 0xa4, 0xb7, 0xe8, 0xf7, 0x44, 0x94, 0x27, 0x44, 0xd8, 0xb3,
+	0x9c, 0x09, 0x86, 0x9e, 0x2b, 0xb0, 0x7d, 0x0b, 0xb6, 0x57, 0xc0, 0xf6, 0xa2, 0xbf, 0x5d, 0x26,
+	0x76, 0xc5, 0xa6, 0x53, 0x96, 0x29, 0xb1, 0xed, 0xdd, 0x12, 0xf0, 0x37, 0x9a, 0x12, 0x05, 0xed,
+	0xfc, 0xac, 0x41, 0x3d, 0x94, 0x46, 0x10, 0x02, 0x3d, 0x8b, 0xa6, 0xc4, 0xd2, 0xda, 0x5a, 0xb7,
+	0x81, 0xe5, 0x19, 0xbd, 0x83, 0x0a, 0x8d, 0xad, 0x4a, 0x5b, 0xeb, 0x36, 0xfb, 0xbb, 0xf6, 0xdf,
+	0x3d, 0xda, 0x4a, 0xc7, 0xf6, 0x62, 0x5c, 0xa1, 0x31, 0xfa, 0x0a, 0xff, 0x71, 0x11, 0x89, 0x39,
+	0x9f, 0x44, 0x42, 0xe4, 0xf4, 0x72, 0x2e, 0x08, 0xb7, 0xaa, 0x52, 0xe9, 0x4d, 0x99, 0x52, 0x20,
+	0x89, 0xce, 0x1d, 0x0f, 0x9b, 0x7c, 0x2d, 0x83, 0xf6, 0xa1, 0x2e, 0xe8, 0x94, 0x66, 0x89, 0xa5,
+	0x4b, 0xcd, 0x57, 0xa5, 0xee, 0x24, 0x1a, 0x2f, 0x59, 0x85, 0x3d, 0x35, 0x80, 0x55, 0x7b, 0xb5,
+	0xc7, 0xd9, 0x53, 0x3f, 0xba, 0x6a, 0x4f, 0xac, 0x65, 0xd0, 0x17, 0xd8, 0x12, 0x84, 0x3f, 0x10,
+	0xaf, 0x4b, 0x71, 0xbb, 0x54, 0x9c, 0xf0, 0x55, 0xe9, 0x96, 0x78, 0x10, 0xa3, 0x53, 0x80, 0x59,
+	0xce, 0x66, 0x24, 0x17, 0x94, 0x70, 0x6b, 0xa3, 0x5d, 0xed, 0x36, 0xfb, 0xdd, 0x32, 0x4d, 0x5f,
+	0x31, 0xae, 0xf1, 0x0a, 0x17, 0xbd, 0x87, 0x5a, 0xb1, 0x08, 0xdc, 0x32, 0xa4, 0xc8, 0xcb, 0x32,
+	0x91, 0x63, 0x9a, 0x12, 0xac, 0x28, 0xe8, 0x19, 0x00, 0xe5, 0x93, 0x05, 0xe5, 0xf4, 0x32, 0x25,
+	0x56, 0xa3, 0xad, 0x75, 0x0d, 0xdc, 0xa0, 0xfc, 0xb3, 0x4a, 0x6c, 0x1f, 0x43, 0xc5, 0x8b, 0xd1,
+	0x0b, 0xf8, 0x97, 0x66, 0x0b, 0x76, 0x15, 0x09, 0xca, 0xb2, 0x09, 0x8d, 0x97, 0x9b, 0xb5, 0x79,
+	0x9f, 0xf4, 0x62, 0xb4, 0x03, 0x8d, 0xe5, 0x1c, 0x96, 0x8b, 0xd6, 0xc0, 0x86, 0x4a, 0x78, 0x71,
+	0xe7, 0x97, 0x06, 0xe6, 0x7a, 0xb3, 0xd1, 0x3e, 0xe8, 0xe2, 0x7a, 0xa6, 0xf6, 0xb4, 0xd5, 0xdf,
+	0x7b, 0xdc, 0xb0, 0xc2, 0xeb, 0x19, 0xc1, 0x92, 0x87, 0x8e, 0xc0, 0x48, 0xa3, 0x2c, 0x99, 0x47,
+	0x09, 0x91, 0x05, 0x5b, 0xe5, 0xfd, 0x1b, 0x2c, 0xf1, 0xf8, 0x8e, 0x59, 0xdc, 0x16, 0x11, 0x25,
+	0xc5, 0x46, 0x57, 0x8b, 0xdb, 0x52, 0x9c, 0x3b, 0x23, 0x68, 0x3d, 0x9c, 0x1e, 0xfa, 0x08, 0x3a,
+	0xa7, 0x37, 0xb7, 0x5e, 0xbb, 0x8f, 0x99, 0x7d, 0x40, 0x6f, 0x08, 0x96, 0xac, 0xbd, 0xef, 0x00,
+	0xf7, 0xee, 0xd1, 0x0e, 0x3c, 0x09, 0x1d, 0x7c, 0xe2, 0x86, 0x93, 0xf0, 0xdc, 0x77, 0x27, 0x67,
+	0xa3, 0xc0, 0x77, 0x0f, 0xbd, 0x63, 0xcf, 0x3d, 0x32, 0xff, 0x41, 0x5b, 0xd0, 0x74, 0x7c, 0x7f,
+	0xe0, 0x1d, 0x3a, 0xa1, 0x37, 0x1e, 0x99, 0x1a, 0x02, 0xa8, 0x1f, 0x78, 0x23, 0x07, 0x9f, 0x9b,
+	0x15, 0xd4, 0x84, 0x8d, 0x81, 0x77, 0x80, 0x8b, 0xa0, 0x5a, 0x04, 0xbe, 0x73, 0xf8, 0xc9, 0x39,
+	0x71, 0x4d, 0x1d, 0x19, 0xa0, 0x87, 0x6e, 0x10, 0x9a, 0xb5, 0x3d, 0x02, 0xc6, 0x6d, 0x75, 0xf4,
+	0x14, 0xfe, 0x2f, 0xb2, 0x93, 0xc0, 0xbb, 0x58, 0xaf, 0xd3, 0x80, 0x5a, 0x30, 0x74, 0x06, 0x03,
+	0x55, 0x61, 0xe8, 0x1e, 0x79, 0x67, 0x43, 0xb3, 0x52, 0xa4, 0x07, 0x85, 0x37, 0xb3, 0x8a, 0x36,
+	0xc1, 0x70, 0x47, 0x63, 0x3c, 0x1c, 0x9f, 0x05, 0xa6, 0x8e, 0x5a, 0x00, 0xe3, 0xf0, 0xd4, 0xc5,
+	0x52, 0xcb, 0xac, 0x1d, 0xfc, 0x80, 0xce, 0x15, 0x9b, 0x96, 0xf4, 0xc1, 0xd7, 0x2e, 0xbc, 0x25,
+	0x22, 0x61, 0x45, 0xc7, 0x6d, 0x96, 0x27, 0xbd, 0x84, 0x64, 0xf2, 0xcd, 0xea, 0xa9, 0x4f, 0xd1,
+	0x8c, 0xf2, 0x3f, 0xbd, 0x70, 0x1f, 0x56, 0xc2, 0xcb, 0xba, 0x64, 0xbd, 0xfd, 0x1d, 0x00, 0x00,
+	0xff, 0xff, 0xc9, 0x5f, 0x96, 0x8a, 0x90, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/test_suite.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/test_suite.pb.go
new file mode 100644
index 00000000..3bda8fd0
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/resultstore/v2/test_suite.pb.go
@@ -0,0 +1,632 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/devtools/resultstore/v2/test_suite.proto
+
+package resultstore // import "google.golang.org/genproto/googleapis/devtools/resultstore/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The result of running a test case.
+type TestCase_Result int32
+
+const (
+	// The implicit default enum value. Do not use.
+	TestCase_RESULT_UNSPECIFIED TestCase_Result = 0
+	// Test case ran to completion. Look for failures or errors to determine
+	// whether it passed, failed, or errored.
+	TestCase_COMPLETED TestCase_Result = 1
+	// Test case started but did not complete because the test harness received
+	// a signal and decided to stop running tests.
+	TestCase_INTERRUPTED TestCase_Result = 2
+	// Test case was not started because the test harness received a SIGINT or
+	// timed out.
+	TestCase_CANCELLED TestCase_Result = 3
+	// Test case was not run because the user or process running the test
+	// specified a filter that excluded this test case.
+	TestCase_FILTERED TestCase_Result = 4
+	// Test case was not run to completion because the test case decided it
+	// should not be run (eg. due to a failed assumption in a JUnit4 test).
+	// Per-test setup or tear-down may or may not have run.
+	TestCase_SKIPPED TestCase_Result = 5
+	// The test framework did not run the test case because it was labeled as
+	// suppressed.  Eg. if someone temporarily disables a failing test.
+	TestCase_SUPPRESSED TestCase_Result = 6
+)
+
+var TestCase_Result_name = map[int32]string{
+	0: "RESULT_UNSPECIFIED",
+	1: "COMPLETED",
+	2: "INTERRUPTED",
+	3: "CANCELLED",
+	4: "FILTERED",
+	5: "SKIPPED",
+	6: "SUPPRESSED",
+}
+var TestCase_Result_value = map[string]int32{
+	"RESULT_UNSPECIFIED": 0,
+	"COMPLETED":          1,
+	"INTERRUPTED":        2,
+	"CANCELLED":          3,
+	"FILTERED":           4,
+	"SKIPPED":            5,
+	"SUPPRESSED":         6,
+}
+
+func (x TestCase_Result) String() string {
+	return proto.EnumName(TestCase_Result_name, int32(x))
+}
+func (TestCase_Result) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_suite_9672634cf69bbe80, []int{2, 0}
+}
+
+// The result of running a test suite, as reported in a <testsuite> element of
+// an XML log.
+type TestSuite struct {
+	// The full name of this suite, as reported in the name attribute. For Java
+	// tests, this is normally the fully qualified class name. Eg.
+	// "com.google.common.hash.BloomFilterTest".
+	SuiteName string `protobuf:"bytes,1,opt,name=suite_name,json=suiteName,proto3" json:"suite_name,omitempty"`
+	// The results of the test cases and test suites contained in this suite,
+	// as reported in the <testcase> and <testsuite> elements contained within
+	// this <testsuite>.
+	Tests []*Test `protobuf:"bytes,2,rep,name=tests,proto3" json:"tests,omitempty"`
+	// Failures reported in <failure> elements within this <testsuite>.
+	Failures []*TestFailure `protobuf:"bytes,3,rep,name=failures,proto3" json:"failures,omitempty"`
+	// Errors reported in <error> elements within this <testsuite>.
+	Errors []*TestError `protobuf:"bytes,4,rep,name=errors,proto3" json:"errors,omitempty"`
+	// The timing for the entire TestSuite, as reported by the time attribute.
+	Timing *Timing `protobuf:"bytes,6,opt,name=timing,proto3" json:"timing,omitempty"`
+	// Arbitrary name-value pairs, as reported in custom attributes or in a
+	// <properties> element within this <testsuite>. Multiple properties are
+	// allowed with the same key. Properties will be returned in lexicographical
+	// order by key.
+	Properties []*Property `protobuf:"bytes,7,rep,name=properties,proto3" json:"properties,omitempty"`
+	// Files produced by this test suite, as reported by undeclared output
+	// annotations.
+	// The file IDs must be unique within this list. Duplicate file IDs will
+	// result in an error. Files will be returned in lexicographical order by ID.
+	Files                []*File  `protobuf:"bytes,8,rep,name=files,proto3" json:"files,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestSuite) Reset()         { *m = TestSuite{} }
+func (m *TestSuite) String() string { return proto.CompactTextString(m) }
+func (*TestSuite) ProtoMessage()    {}
+func (*TestSuite) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_suite_9672634cf69bbe80, []int{0}
+}
+func (m *TestSuite) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestSuite.Unmarshal(m, b)
+}
+func (m *TestSuite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestSuite.Marshal(b, m, deterministic)
+}
+func (dst *TestSuite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestSuite.Merge(dst, src)
+}
+func (m *TestSuite) XXX_Size() int {
+	return xxx_messageInfo_TestSuite.Size(m)
+}
+func (m *TestSuite) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestSuite.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestSuite proto.InternalMessageInfo
+
+func (m *TestSuite) GetSuiteName() string {
+	if m != nil {
+		return m.SuiteName
+	}
+	return ""
+}
+
+func (m *TestSuite) GetTests() []*Test {
+	if m != nil {
+		return m.Tests
+	}
+	return nil
+}
+
+func (m *TestSuite) GetFailures() []*TestFailure {
+	if m != nil {
+		return m.Failures
+	}
+	return nil
+}
+
+func (m *TestSuite) GetErrors() []*TestError {
+	if m != nil {
+		return m.Errors
+	}
+	return nil
+}
+
+func (m *TestSuite) GetTiming() *Timing {
+	if m != nil {
+		return m.Timing
+	}
+	return nil
+}
+
+func (m *TestSuite) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+func (m *TestSuite) GetFiles() []*File {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+// The result of running a test case or test suite. JUnit3 TestDecorators are
+// represented as a TestSuite with a single test.
+type Test struct {
+	// Either a TestCase of a TestSuite
+	//
+	// Types that are valid to be assigned to TestType:
+	//	*Test_TestCase
+	//	*Test_TestSuite
+	TestType             isTest_TestType `protobuf_oneof:"test_type"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Test) Reset()         { *m = Test{} }
+func (m *Test) String() string { return proto.CompactTextString(m) }
+func (*Test) ProtoMessage()    {}
+func (*Test) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_suite_9672634cf69bbe80, []int{1}
+}
+func (m *Test) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Test.Unmarshal(m, b)
+}
+func (m *Test) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Test.Marshal(b, m, deterministic)
+}
+func (dst *Test) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Test.Merge(dst, src)
+}
+func (m *Test) XXX_Size() int {
+	return xxx_messageInfo_Test.Size(m)
+}
+func (m *Test) XXX_DiscardUnknown() {
+	xxx_messageInfo_Test.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Test proto.InternalMessageInfo
+
+type isTest_TestType interface {
+	isTest_TestType()
+}
+
+type Test_TestCase struct {
+	TestCase *TestCase `protobuf:"bytes,1,opt,name=test_case,json=testCase,proto3,oneof"`
+}
+
+type Test_TestSuite struct {
+	TestSuite *TestSuite `protobuf:"bytes,2,opt,name=test_suite,json=testSuite,proto3,oneof"`
+}
+
+func (*Test_TestCase) isTest_TestType() {}
+
+func (*Test_TestSuite) isTest_TestType() {}
+
+func (m *Test) GetTestType() isTest_TestType {
+	if m != nil {
+		return m.TestType
+	}
+	return nil
+}
+
+func (m *Test) GetTestCase() *TestCase {
+	if x, ok := m.GetTestType().(*Test_TestCase); ok {
+		return x.TestCase
+	}
+	return nil
+}
+
+func (m *Test) GetTestSuite() *TestSuite {
+	if x, ok := m.GetTestType().(*Test_TestSuite); ok {
+		return x.TestSuite
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Test) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Test_OneofMarshaler, _Test_OneofUnmarshaler, _Test_OneofSizer, []interface{}{
+		(*Test_TestCase)(nil),
+		(*Test_TestSuite)(nil),
+	}
+}
+
+func _Test_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Test)
+	// test_type
+	switch x := m.TestType.(type) {
+	case *Test_TestCase:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TestCase); err != nil {
+			return err
+		}
+	case *Test_TestSuite:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TestSuite); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Test.TestType has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Test_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Test)
+	switch tag {
+	case 1: // test_type.test_case
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TestCase)
+		err := b.DecodeMessage(msg)
+		m.TestType = &Test_TestCase{msg}
+		return true, err
+	case 2: // test_type.test_suite
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TestSuite)
+		err := b.DecodeMessage(msg)
+		m.TestType = &Test_TestSuite{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Test_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Test)
+	// test_type
+	switch x := m.TestType.(type) {
+	case *Test_TestCase:
+		s := proto.Size(x.TestCase)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Test_TestSuite:
+		s := proto.Size(x.TestSuite)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The result of running a test case, as reported in a <testcase> element of
+// an XML log.
+type TestCase struct {
+	// The name of the test case, as reported in the name attribute. For Java,
+	// this is normally the method name. Eg. "testBasic".
+	CaseName string `protobuf:"bytes,1,opt,name=case_name,json=caseName,proto3" json:"case_name,omitempty"`
+	// The name of the class in which the test case was defined, as reported in
+	// the classname attribute. For Java, this is normally the fully qualified
+	// class name. Eg. "com.google.common.hash.BloomFilterTest".
+	ClassName string `protobuf:"bytes,2,opt,name=class_name,json=className,proto3" json:"class_name,omitempty"`
+	// An enum reported in the result attribute that is used in conjunction with
+	// failures and errors below to report the outcome.
+	Result TestCase_Result `protobuf:"varint,3,opt,name=result,proto3,enum=google.devtools.resultstore.v2.TestCase_Result" json:"result,omitempty"`
+	// Failures reported in <failure> elements within this <testcase>.
+	Failures []*TestFailure `protobuf:"bytes,4,rep,name=failures,proto3" json:"failures,omitempty"`
+	// Errors reported in <error> elements within this <testcase>.
+	Errors []*TestError `protobuf:"bytes,5,rep,name=errors,proto3" json:"errors,omitempty"`
+	// The timing for the TestCase, as reported by the time attribute.
+	Timing *Timing `protobuf:"bytes,7,opt,name=timing,proto3" json:"timing,omitempty"`
+	// Arbitrary name-value pairs, as reported in custom attributes or in a
+	// <properties> element within this <testcase>. Multiple properties are
+	// allowed with the same key. Properties will be returned in lexicographical
+	// order by key.
+	Properties []*Property `protobuf:"bytes,8,rep,name=properties,proto3" json:"properties,omitempty"`
+	// Files produced by this test case, as reported by undeclared output
+	// annotations.
+	// The file IDs must be unique within this list. Duplicate file IDs will
+	// result in an error. Files will be returned in lexicographical order by ID.
+	Files                []*File  `protobuf:"bytes,9,rep,name=files,proto3" json:"files,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `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 fileDescriptor_test_suite_9672634cf69bbe80, []int{2}
+}
+func (m *TestCase) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestCase.Unmarshal(m, b)
+}
+func (m *TestCase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestCase.Marshal(b, m, deterministic)
+}
+func (dst *TestCase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestCase.Merge(dst, src)
+}
+func (m *TestCase) XXX_Size() int {
+	return xxx_messageInfo_TestCase.Size(m)
+}
+func (m *TestCase) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestCase.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestCase proto.InternalMessageInfo
+
+func (m *TestCase) GetCaseName() string {
+	if m != nil {
+		return m.CaseName
+	}
+	return ""
+}
+
+func (m *TestCase) GetClassName() string {
+	if m != nil {
+		return m.ClassName
+	}
+	return ""
+}
+
+func (m *TestCase) GetResult() TestCase_Result {
+	if m != nil {
+		return m.Result
+	}
+	return TestCase_RESULT_UNSPECIFIED
+}
+
+func (m *TestCase) GetFailures() []*TestFailure {
+	if m != nil {
+		return m.Failures
+	}
+	return nil
+}
+
+func (m *TestCase) GetErrors() []*TestError {
+	if m != nil {
+		return m.Errors
+	}
+	return nil
+}
+
+func (m *TestCase) GetTiming() *Timing {
+	if m != nil {
+		return m.Timing
+	}
+	return nil
+}
+
+func (m *TestCase) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+func (m *TestCase) GetFiles() []*File {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+// Represents a violated assertion, as reported in a <failure> element within a
+// <testcase>. Some languages allow assertions to be made without stopping the
+// test case when they're violated, leading to multiple TestFailures. For Java,
+// multiple TestFailures are used to represent a chained exception.
+type TestFailure struct {
+	// The exception message reported in the message attribute. Typically short,
+	// but may be multi-line. Eg. "Expected 'foo' but was 'bar'".
+	FailureMessage string `protobuf:"bytes,1,opt,name=failure_message,json=failureMessage,proto3" json:"failure_message,omitempty"`
+	// The type of the exception being thrown, reported in the type attribute.
+	// Eg: "org.junit.ComparisonFailure"
+	ExceptionType string `protobuf:"bytes,2,opt,name=exception_type,json=exceptionType,proto3" json:"exception_type,omitempty"`
+	// The stack trace reported as the content of the <failure> element, often in
+	// a CDATA block. This contains one line for each stack frame, each including
+	// a method/function name, a class/file name, and a line number. Most recent
+	// call is usually first, but not for Python stack traces. May contain the
+	// exception_type and message.
+	StackTrace           string   `protobuf:"bytes,3,opt,name=stack_trace,json=stackTrace,proto3" json:"stack_trace,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestFailure) Reset()         { *m = TestFailure{} }
+func (m *TestFailure) String() string { return proto.CompactTextString(m) }
+func (*TestFailure) ProtoMessage()    {}
+func (*TestFailure) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_suite_9672634cf69bbe80, []int{3}
+}
+func (m *TestFailure) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestFailure.Unmarshal(m, b)
+}
+func (m *TestFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestFailure.Marshal(b, m, deterministic)
+}
+func (dst *TestFailure) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestFailure.Merge(dst, src)
+}
+func (m *TestFailure) XXX_Size() int {
+	return xxx_messageInfo_TestFailure.Size(m)
+}
+func (m *TestFailure) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestFailure.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestFailure proto.InternalMessageInfo
+
+func (m *TestFailure) GetFailureMessage() string {
+	if m != nil {
+		return m.FailureMessage
+	}
+	return ""
+}
+
+func (m *TestFailure) GetExceptionType() string {
+	if m != nil {
+		return m.ExceptionType
+	}
+	return ""
+}
+
+func (m *TestFailure) GetStackTrace() string {
+	if m != nil {
+		return m.StackTrace
+	}
+	return ""
+}
+
+// Represents an exception that prevented a test case from completing, as
+// reported in an <error> element within a <testcase>. For Java, multiple
+// TestErrors are used to represent a chained exception.
+type TestError struct {
+	// The exception message, as reported in the message attribute. Typically
+	// short, but may be multi-line. Eg. "argument cannot be null".
+	ErrorMessage string `protobuf:"bytes,1,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
+	// The type of the exception being thrown, reported in the type attribute.
+	// For Java, this is a fully qualified Throwable class name.
+	// Eg: "java.lang.IllegalArgumentException"
+	ExceptionType string `protobuf:"bytes,2,opt,name=exception_type,json=exceptionType,proto3" json:"exception_type,omitempty"`
+	// The stack trace reported as the content of the <error> element, often in
+	// a CDATA block. This contains one line for each stack frame, each including
+	// a method/function name, a class/file name, and a line number. Most recent
+	// call is usually first, but not for Python stack traces. May contain the
+	// exception_type and message.
+	StackTrace           string   `protobuf:"bytes,3,opt,name=stack_trace,json=stackTrace,proto3" json:"stack_trace,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestError) Reset()         { *m = TestError{} }
+func (m *TestError) String() string { return proto.CompactTextString(m) }
+func (*TestError) ProtoMessage()    {}
+func (*TestError) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_suite_9672634cf69bbe80, []int{4}
+}
+func (m *TestError) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestError.Unmarshal(m, b)
+}
+func (m *TestError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestError.Marshal(b, m, deterministic)
+}
+func (dst *TestError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestError.Merge(dst, src)
+}
+func (m *TestError) XXX_Size() int {
+	return xxx_messageInfo_TestError.Size(m)
+}
+func (m *TestError) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestError.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestError proto.InternalMessageInfo
+
+func (m *TestError) GetErrorMessage() string {
+	if m != nil {
+		return m.ErrorMessage
+	}
+	return ""
+}
+
+func (m *TestError) GetExceptionType() string {
+	if m != nil {
+		return m.ExceptionType
+	}
+	return ""
+}
+
+func (m *TestError) GetStackTrace() string {
+	if m != nil {
+		return m.StackTrace
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*TestSuite)(nil), "google.devtools.resultstore.v2.TestSuite")
+	proto.RegisterType((*Test)(nil), "google.devtools.resultstore.v2.Test")
+	proto.RegisterType((*TestCase)(nil), "google.devtools.resultstore.v2.TestCase")
+	proto.RegisterType((*TestFailure)(nil), "google.devtools.resultstore.v2.TestFailure")
+	proto.RegisterType((*TestError)(nil), "google.devtools.resultstore.v2.TestError")
+	proto.RegisterEnum("google.devtools.resultstore.v2.TestCase_Result", TestCase_Result_name, TestCase_Result_value)
+}
+
+func init() {
+	proto.RegisterFile("google/devtools/resultstore/v2/test_suite.proto", fileDescriptor_test_suite_9672634cf69bbe80)
+}
+
+var fileDescriptor_test_suite_9672634cf69bbe80 = []byte{
+	// 641 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xdf, 0x6e, 0xd3, 0x30,
+	0x14, 0xc6, 0x97, 0xb6, 0xcb, 0x92, 0x93, 0xad, 0xab, 0x7c, 0x81, 0xa2, 0xa1, 0x41, 0x55, 0xfe,
+	0x75, 0x9a, 0x94, 0x48, 0xe5, 0x0e, 0x24, 0xa4, 0xad, 0x75, 0xb7, 0x42, 0x57, 0x22, 0x27, 0xbd,
+	0xe1, 0xa6, 0x0a, 0xc1, 0x8b, 0x22, 0x92, 0x3a, 0xc4, 0xde, 0xb4, 0x71, 0xc1, 0xf3, 0xf0, 0x08,
+	0xbc, 0x0c, 0xef, 0x82, 0x62, 0xa7, 0xa3, 0x20, 0x41, 0x8b, 0xe8, 0x5d, 0xf3, 0xd9, 0xbf, 0x73,
+	0x3e, 0xfb, 0x7c, 0xaa, 0xc1, 0x8d, 0x19, 0x8b, 0x53, 0xea, 0x7e, 0xa0, 0xd7, 0x82, 0xb1, 0x94,
+	0xbb, 0x05, 0xe5, 0x57, 0xa9, 0xe0, 0x82, 0x15, 0xd4, 0xbd, 0xee, 0xb9, 0x82, 0x72, 0x31, 0xe3,
+	0x57, 0x89, 0xa0, 0x4e, 0x5e, 0x30, 0xc1, 0xd0, 0x03, 0x05, 0x38, 0x0b, 0xc0, 0x59, 0x02, 0x9c,
+	0xeb, 0xde, 0xc1, 0xf1, 0x8a, 0x82, 0x11, 0xcb, 0x32, 0x36, 0x57, 0xc5, 0x0e, 0x8e, 0x56, 0x6c,
+	0xbe, 0x4c, 0xd2, 0xaa, 0x6f, 0xe7, 0x5b, 0x1d, 0xcc, 0x80, 0x72, 0xe1, 0x97, 0x5e, 0xd0, 0x21,
+	0x80, 0x34, 0x35, 0x9b, 0x87, 0x19, 0xb5, 0xb5, 0xb6, 0xd6, 0x35, 0x89, 0x29, 0x95, 0x49, 0x98,
+	0x51, 0xf4, 0x02, 0xb6, 0x4b, 0xe3, 0xdc, 0xae, 0xb5, 0xeb, 0x5d, 0xab, 0xf7, 0xd8, 0xf9, 0xbb,
+	0x69, 0xa7, 0x2c, 0x4c, 0x14, 0x82, 0xce, 0xc0, 0xb8, 0x0c, 0x93, 0xf4, 0xaa, 0xa0, 0xdc, 0xae,
+	0x4b, 0xfc, 0x78, 0x1d, 0x7c, 0xa8, 0x18, 0x72, 0x07, 0xa3, 0x13, 0xd0, 0x69, 0x51, 0xb0, 0x82,
+	0xdb, 0x0d, 0x59, 0xe6, 0x68, 0x9d, 0x32, 0xb8, 0x24, 0x48, 0x05, 0xa2, 0x57, 0xa0, 0x8b, 0x24,
+	0x4b, 0xe6, 0xb1, 0xad, 0xb7, 0xb5, 0xae, 0xd5, 0x7b, 0xba, 0xb2, 0x84, 0xdc, 0x4d, 0x2a, 0x0a,
+	0x9d, 0x03, 0xe4, 0x05, 0xcb, 0x69, 0x21, 0x12, 0xca, 0xed, 0x1d, 0x69, 0xa3, 0xbb, 0xaa, 0x86,
+	0xa7, 0x88, 0x5b, 0xb2, 0xc4, 0x96, 0x37, 0x5a, 0x0e, 0x83, 0xdb, 0xc6, 0x7a, 0x37, 0x3a, 0x4c,
+	0x52, 0x4a, 0x14, 0xd2, 0xf9, 0xaa, 0x41, 0xa3, 0x3c, 0x1b, 0x3a, 0x03, 0x53, 0xe6, 0x29, 0x0a,
+	0xb9, 0x1a, 0xda, 0x1a, 0x6e, 0x4a, 0xb0, 0x1f, 0x72, 0x7a, 0xbe, 0x45, 0x0c, 0x51, 0xfd, 0x46,
+	0xaf, 0x01, 0x7e, 0x06, 0xd3, 0xae, 0xc9, 0x4a, 0x6b, 0x5d, 0xaf, 0x4c, 0xcf, 0xf9, 0x16, 0x91,
+	0x3e, 0xe4, 0xc7, 0xa9, 0x55, 0x99, 0x12, 0xb7, 0x39, 0xed, 0x7c, 0x6f, 0x80, 0xb1, 0xe8, 0x88,
+	0xee, 0x83, 0x59, 0x3a, 0x5d, 0xce, 0x98, 0x51, 0x0a, 0x32, 0x62, 0x87, 0x00, 0x51, 0x1a, 0x72,
+	0xae, 0x56, 0x6b, 0x2a, 0x81, 0x52, 0x91, 0xcb, 0x67, 0xa0, 0xab, 0xf6, 0x76, 0xbd, 0xad, 0x75,
+	0x9b, 0x3d, 0x77, 0xdd, 0x73, 0x3a, 0x44, 0xea, 0xa4, 0xc2, 0x7f, 0x89, 0x63, 0x63, 0x33, 0x71,
+	0xdc, 0xfe, 0xff, 0x38, 0xee, 0x6c, 0x20, 0x8e, 0xc6, 0x26, 0xe2, 0x68, 0xfe, 0x7b, 0x1c, 0x3f,
+	0x83, 0xae, 0xee, 0x18, 0xdd, 0x03, 0x44, 0xb0, 0x3f, 0x1d, 0x07, 0xb3, 0xe9, 0xc4, 0xf7, 0x70,
+	0x7f, 0x34, 0x1c, 0xe1, 0x41, 0x6b, 0x0b, 0xed, 0x81, 0xd9, 0x7f, 0x7b, 0xe1, 0x8d, 0x71, 0x80,
+	0x07, 0x2d, 0x0d, 0xed, 0x83, 0x35, 0x9a, 0x04, 0x98, 0x90, 0xa9, 0x57, 0x0a, 0x35, 0xb9, 0x7e,
+	0x32, 0xe9, 0xe3, 0xf1, 0x18, 0x0f, 0x5a, 0x75, 0xb4, 0x0b, 0xc6, 0x70, 0x34, 0x0e, 0x30, 0xc1,
+	0x83, 0x56, 0x03, 0x59, 0xb0, 0xe3, 0xbf, 0x19, 0x79, 0x1e, 0x1e, 0xb4, 0xb6, 0x51, 0x13, 0xc0,
+	0x9f, 0x7a, 0x1e, 0xc1, 0xbe, 0x8f, 0x07, 0x2d, 0xbd, 0xf3, 0x05, 0xac, 0xa5, 0xe9, 0xa0, 0x67,
+	0xb0, 0x5f, 0xcd, 0x67, 0x96, 0x51, 0xce, 0xc3, 0x78, 0x91, 0xb3, 0x66, 0x25, 0x5f, 0x28, 0x15,
+	0x3d, 0x81, 0x26, 0xbd, 0x89, 0x68, 0x2e, 0x12, 0x36, 0x97, 0x49, 0xad, 0x12, 0xb7, 0x77, 0xa7,
+	0x06, 0xb7, 0x39, 0x45, 0x0f, 0xc1, 0xe2, 0x22, 0x8c, 0x3e, 0xce, 0x44, 0x11, 0x46, 0x54, 0x46,
+	0xcf, 0x24, 0x20, 0xa5, 0xa0, 0x54, 0x3a, 0x37, 0xea, 0x4f, 0x54, 0x8e, 0x15, 0x3d, 0x82, 0x3d,
+	0x39, 0xd8, 0xdf, 0x7a, 0xef, 0x4a, 0x71, 0xc3, 0x9d, 0x4f, 0x3f, 0x41, 0x27, 0x62, 0xd9, 0x8a,
+	0x39, 0x79, 0xda, 0xbb, 0x51, 0xb5, 0x23, 0x66, 0x69, 0x38, 0x8f, 0x1d, 0x56, 0xc4, 0x6e, 0x4c,
+	0xe7, 0xf2, 0x0d, 0xa8, 0xde, 0xaa, 0x30, 0x4f, 0xf8, 0x9f, 0x5e, 0x8c, 0x97, 0x4b, 0x9f, 0xef,
+	0x75, 0x49, 0x3d, 0xff, 0x11, 0x00, 0x00, 0xff, 0xff, 0x38, 0x57, 0x5a, 0x20, 0xe4, 0x06, 0x00,
+	0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/source/v1/source_context.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/source/v1/source_context.pb.go
index 81829f62..64036c27 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/source/v1/source_context.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/source/v1/source_context.pb.go
@@ -1,25 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/source/v1/source_context.proto
 
-/*
-Package source is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/source/v1/source_context.proto
-
-It has these top-level messages:
-	SourceContext
-	ExtendedSourceContext
-	AliasContext
-	CloudRepoSourceContext
-	CloudWorkspaceSourceContext
-	GerritSourceContext
-	GitSourceContext
-	RepoId
-	ProjectRepoId
-	CloudWorkspaceId
-*/
-package source
+package source // import "google.golang.org/genproto/googleapis/devtools/source/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -69,7 +51,9 @@ var AliasContext_Kind_value = map[string]int32{
 func (x AliasContext_Kind) String() string {
 	return proto.EnumName(AliasContext_Kind_name, int32(x))
 }
-func (AliasContext_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (AliasContext_Kind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{2, 0}
+}
 
 // A SourceContext is a reference to a tree of files. A SourceContext together
 // with a path point to a unique revision of a single file or directory.
@@ -81,35 +65,63 @@ type SourceContext struct {
 	//	*SourceContext_CloudWorkspace
 	//	*SourceContext_Gerrit
 	//	*SourceContext_Git
-	Context isSourceContext_Context `protobuf_oneof:"context"`
+	Context              isSourceContext_Context `protobuf_oneof:"context"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
 }
 
-func (m *SourceContext) Reset()                    { *m = SourceContext{} }
-func (m *SourceContext) String() string            { return proto.CompactTextString(m) }
-func (*SourceContext) ProtoMessage()               {}
-func (*SourceContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *SourceContext) Reset()         { *m = SourceContext{} }
+func (m *SourceContext) String() string { return proto.CompactTextString(m) }
+func (*SourceContext) ProtoMessage()    {}
+func (*SourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{0}
+}
+func (m *SourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceContext.Unmarshal(m, b)
+}
+func (m *SourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic)
+}
+func (dst *SourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceContext.Merge(dst, src)
+}
+func (m *SourceContext) XXX_Size() int {
+	return xxx_messageInfo_SourceContext.Size(m)
+}
+func (m *SourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SourceContext proto.InternalMessageInfo
 
 type isSourceContext_Context interface {
 	isSourceContext_Context()
 }
 
 type SourceContext_CloudRepo struct {
-	CloudRepo *CloudRepoSourceContext `protobuf:"bytes,1,opt,name=cloud_repo,json=cloudRepo,oneof"`
+	CloudRepo *CloudRepoSourceContext `protobuf:"bytes,1,opt,name=cloud_repo,json=cloudRepo,proto3,oneof"`
 }
+
 type SourceContext_CloudWorkspace struct {
-	CloudWorkspace *CloudWorkspaceSourceContext `protobuf:"bytes,2,opt,name=cloud_workspace,json=cloudWorkspace,oneof"`
+	CloudWorkspace *CloudWorkspaceSourceContext `protobuf:"bytes,2,opt,name=cloud_workspace,json=cloudWorkspace,proto3,oneof"`
 }
+
 type SourceContext_Gerrit struct {
-	Gerrit *GerritSourceContext `protobuf:"bytes,3,opt,name=gerrit,oneof"`
+	Gerrit *GerritSourceContext `protobuf:"bytes,3,opt,name=gerrit,proto3,oneof"`
 }
+
 type SourceContext_Git struct {
-	Git *GitSourceContext `protobuf:"bytes,6,opt,name=git,oneof"`
+	Git *GitSourceContext `protobuf:"bytes,6,opt,name=git,proto3,oneof"`
 }
 
-func (*SourceContext_CloudRepo) isSourceContext_Context()      {}
+func (*SourceContext_CloudRepo) isSourceContext_Context() {}
+
 func (*SourceContext_CloudWorkspace) isSourceContext_Context() {}
-func (*SourceContext_Gerrit) isSourceContext_Context()         {}
-func (*SourceContext_Git) isSourceContext_Context()            {}
+
+func (*SourceContext_Gerrit) isSourceContext_Context() {}
+
+func (*SourceContext_Git) isSourceContext_Context() {}
 
 func (m *SourceContext) GetContext() isSourceContext_Context {
 	if m != nil {
@@ -233,22 +245,22 @@ func _SourceContext_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Context.(type) {
 	case *SourceContext_CloudRepo:
 		s := proto.Size(x.CloudRepo)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *SourceContext_CloudWorkspace:
 		s := proto.Size(x.CloudWorkspace)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *SourceContext_Gerrit:
 		s := proto.Size(x.Gerrit)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *SourceContext_Git:
 		s := proto.Size(x.Git)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -262,15 +274,37 @@ func _SourceContext_OneofSizer(msg proto.Message) (n int) {
 // details describing the context.
 type ExtendedSourceContext struct {
 	// Any source context.
-	Context *SourceContext `protobuf:"bytes,1,opt,name=context" json:"context,omitempty"`
+	Context *SourceContext `protobuf:"bytes,1,opt,name=context,proto3" json:"context,omitempty"`
 	// Labels with user defined metadata.
-	Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *ExtendedSourceContext) Reset()                    { *m = ExtendedSourceContext{} }
-func (m *ExtendedSourceContext) String() string            { return proto.CompactTextString(m) }
-func (*ExtendedSourceContext) ProtoMessage()               {}
-func (*ExtendedSourceContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ExtendedSourceContext) Reset()         { *m = ExtendedSourceContext{} }
+func (m *ExtendedSourceContext) String() string { return proto.CompactTextString(m) }
+func (*ExtendedSourceContext) ProtoMessage()    {}
+func (*ExtendedSourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{1}
+}
+func (m *ExtendedSourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExtendedSourceContext.Unmarshal(m, b)
+}
+func (m *ExtendedSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExtendedSourceContext.Marshal(b, m, deterministic)
+}
+func (dst *ExtendedSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtendedSourceContext.Merge(dst, src)
+}
+func (m *ExtendedSourceContext) XXX_Size() int {
+	return xxx_messageInfo_ExtendedSourceContext.Size(m)
+}
+func (m *ExtendedSourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExtendedSourceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExtendedSourceContext proto.InternalMessageInfo
 
 func (m *ExtendedSourceContext) GetContext() *SourceContext {
 	if m != nil {
@@ -289,15 +323,37 @@ func (m *ExtendedSourceContext) GetLabels() map[string]string {
 // An alias to a repo revision.
 type AliasContext struct {
 	// The alias kind.
-	Kind AliasContext_Kind `protobuf:"varint,1,opt,name=kind,enum=google.devtools.source.v1.AliasContext_Kind" json:"kind,omitempty"`
+	Kind AliasContext_Kind `protobuf:"varint,1,opt,name=kind,proto3,enum=google.devtools.source.v1.AliasContext_Kind" json:"kind,omitempty"`
 	// The alias name.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AliasContext) Reset()         { *m = AliasContext{} }
+func (m *AliasContext) String() string { return proto.CompactTextString(m) }
+func (*AliasContext) ProtoMessage()    {}
+func (*AliasContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{2}
+}
+func (m *AliasContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AliasContext.Unmarshal(m, b)
+}
+func (m *AliasContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AliasContext.Marshal(b, m, deterministic)
+}
+func (dst *AliasContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AliasContext.Merge(dst, src)
+}
+func (m *AliasContext) XXX_Size() int {
+	return xxx_messageInfo_AliasContext.Size(m)
+}
+func (m *AliasContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_AliasContext.DiscardUnknown(m)
 }
 
-func (m *AliasContext) Reset()                    { *m = AliasContext{} }
-func (m *AliasContext) String() string            { return proto.CompactTextString(m) }
-func (*AliasContext) ProtoMessage()               {}
-func (*AliasContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_AliasContext proto.InternalMessageInfo
 
 func (m *AliasContext) GetKind() AliasContext_Kind {
 	if m != nil {
@@ -317,7 +373,7 @@ func (m *AliasContext) GetName() string {
 // repo (a repo hosted by the Google Cloud Platform).
 type CloudRepoSourceContext struct {
 	// The ID of the repo.
-	RepoId *RepoId `protobuf:"bytes,1,opt,name=repo_id,json=repoId" json:"repo_id,omitempty"`
+	RepoId *RepoId `protobuf:"bytes,1,opt,name=repo_id,json=repoId,proto3" json:"repo_id,omitempty"`
 	// A revision in a cloud repository can be identified by either its revision
 	// ID or its Alias.
 	//
@@ -325,30 +381,63 @@ type CloudRepoSourceContext struct {
 	//	*CloudRepoSourceContext_RevisionId
 	//	*CloudRepoSourceContext_AliasName
 	//	*CloudRepoSourceContext_AliasContext
-	Revision isCloudRepoSourceContext_Revision `protobuf_oneof:"revision"`
+	Revision             isCloudRepoSourceContext_Revision `protobuf_oneof:"revision"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *CloudRepoSourceContext) Reset()         { *m = CloudRepoSourceContext{} }
+func (m *CloudRepoSourceContext) String() string { return proto.CompactTextString(m) }
+func (*CloudRepoSourceContext) ProtoMessage()    {}
+func (*CloudRepoSourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{3}
+}
+func (m *CloudRepoSourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CloudRepoSourceContext.Unmarshal(m, b)
+}
+func (m *CloudRepoSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CloudRepoSourceContext.Marshal(b, m, deterministic)
+}
+func (dst *CloudRepoSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudRepoSourceContext.Merge(dst, src)
 }
+func (m *CloudRepoSourceContext) XXX_Size() int {
+	return xxx_messageInfo_CloudRepoSourceContext.Size(m)
+}
+func (m *CloudRepoSourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_CloudRepoSourceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CloudRepoSourceContext proto.InternalMessageInfo
 
-func (m *CloudRepoSourceContext) Reset()                    { *m = CloudRepoSourceContext{} }
-func (m *CloudRepoSourceContext) String() string            { return proto.CompactTextString(m) }
-func (*CloudRepoSourceContext) ProtoMessage()               {}
-func (*CloudRepoSourceContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *CloudRepoSourceContext) GetRepoId() *RepoId {
+	if m != nil {
+		return m.RepoId
+	}
+	return nil
+}
 
 type isCloudRepoSourceContext_Revision interface {
 	isCloudRepoSourceContext_Revision()
 }
 
 type CloudRepoSourceContext_RevisionId struct {
-	RevisionId string `protobuf:"bytes,2,opt,name=revision_id,json=revisionId,oneof"`
+	RevisionId string `protobuf:"bytes,2,opt,name=revision_id,json=revisionId,proto3,oneof"`
 }
+
 type CloudRepoSourceContext_AliasName struct {
-	AliasName string `protobuf:"bytes,3,opt,name=alias_name,json=aliasName,oneof"`
+	AliasName string `protobuf:"bytes,3,opt,name=alias_name,json=aliasName,proto3,oneof"`
 }
+
 type CloudRepoSourceContext_AliasContext struct {
-	AliasContext *AliasContext `protobuf:"bytes,4,opt,name=alias_context,json=aliasContext,oneof"`
+	AliasContext *AliasContext `protobuf:"bytes,4,opt,name=alias_context,json=aliasContext,proto3,oneof"`
 }
 
-func (*CloudRepoSourceContext_RevisionId) isCloudRepoSourceContext_Revision()   {}
-func (*CloudRepoSourceContext_AliasName) isCloudRepoSourceContext_Revision()    {}
+func (*CloudRepoSourceContext_RevisionId) isCloudRepoSourceContext_Revision() {}
+
+func (*CloudRepoSourceContext_AliasName) isCloudRepoSourceContext_Revision() {}
+
 func (*CloudRepoSourceContext_AliasContext) isCloudRepoSourceContext_Revision() {}
 
 func (m *CloudRepoSourceContext) GetRevision() isCloudRepoSourceContext_Revision {
@@ -358,13 +447,6 @@ func (m *CloudRepoSourceContext) GetRevision() isCloudRepoSourceContext_Revision
 	return nil
 }
 
-func (m *CloudRepoSourceContext) GetRepoId() *RepoId {
-	if m != nil {
-		return m.RepoId
-	}
-	return nil
-}
-
 func (m *CloudRepoSourceContext) GetRevisionId() string {
 	if x, ok := m.GetRevision().(*CloudRepoSourceContext_RevisionId); ok {
 		return x.RevisionId
@@ -452,16 +534,16 @@ func _CloudRepoSourceContext_OneofSizer(msg proto.Message) (n int) {
 	// revision
 	switch x := m.Revision.(type) {
 	case *CloudRepoSourceContext_RevisionId:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RevisionId)))
 		n += len(x.RevisionId)
 	case *CloudRepoSourceContext_AliasName:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AliasName)))
 		n += len(x.AliasName)
 	case *CloudRepoSourceContext_AliasContext:
 		s := proto.Size(x.AliasContext)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -474,16 +556,38 @@ func _CloudRepoSourceContext_OneofSizer(msg proto.Message) (n int) {
 // A CloudWorkspaceSourceContext denotes a workspace at a particular snapshot.
 type CloudWorkspaceSourceContext struct {
 	// The ID of the workspace.
-	WorkspaceId *CloudWorkspaceId `protobuf:"bytes,1,opt,name=workspace_id,json=workspaceId" json:"workspace_id,omitempty"`
+	WorkspaceId *CloudWorkspaceId `protobuf:"bytes,1,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
 	// The ID of the snapshot.
 	// An empty snapshot_id refers to the most recent snapshot.
-	SnapshotId string `protobuf:"bytes,2,opt,name=snapshot_id,json=snapshotId" json:"snapshot_id,omitempty"`
+	SnapshotId           string   `protobuf:"bytes,2,opt,name=snapshot_id,json=snapshotId,proto3" json:"snapshot_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CloudWorkspaceSourceContext) Reset()         { *m = CloudWorkspaceSourceContext{} }
+func (m *CloudWorkspaceSourceContext) String() string { return proto.CompactTextString(m) }
+func (*CloudWorkspaceSourceContext) ProtoMessage()    {}
+func (*CloudWorkspaceSourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{4}
+}
+func (m *CloudWorkspaceSourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CloudWorkspaceSourceContext.Unmarshal(m, b)
+}
+func (m *CloudWorkspaceSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CloudWorkspaceSourceContext.Marshal(b, m, deterministic)
+}
+func (dst *CloudWorkspaceSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudWorkspaceSourceContext.Merge(dst, src)
+}
+func (m *CloudWorkspaceSourceContext) XXX_Size() int {
+	return xxx_messageInfo_CloudWorkspaceSourceContext.Size(m)
+}
+func (m *CloudWorkspaceSourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_CloudWorkspaceSourceContext.DiscardUnknown(m)
 }
 
-func (m *CloudWorkspaceSourceContext) Reset()                    { *m = CloudWorkspaceSourceContext{} }
-func (m *CloudWorkspaceSourceContext) String() string            { return proto.CompactTextString(m) }
-func (*CloudWorkspaceSourceContext) ProtoMessage()               {}
-func (*CloudWorkspaceSourceContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_CloudWorkspaceSourceContext proto.InternalMessageInfo
 
 func (m *CloudWorkspaceSourceContext) GetWorkspaceId() *CloudWorkspaceId {
 	if m != nil {
@@ -502,11 +606,11 @@ func (m *CloudWorkspaceSourceContext) GetSnapshotId() string {
 // A SourceContext referring to a Gerrit project.
 type GerritSourceContext struct {
 	// The URI of a running Gerrit instance.
-	HostUri string `protobuf:"bytes,1,opt,name=host_uri,json=hostUri" json:"host_uri,omitempty"`
+	HostUri string `protobuf:"bytes,1,opt,name=host_uri,json=hostUri,proto3" json:"host_uri,omitempty"`
 	// The full project name within the host. Projects may be nested, so
 	// "project/subproject" is a valid project name.
 	// The "repo name" is hostURI/project.
-	GerritProject string `protobuf:"bytes,2,opt,name=gerrit_project,json=gerritProject" json:"gerrit_project,omitempty"`
+	GerritProject string `protobuf:"bytes,2,opt,name=gerrit_project,json=gerritProject,proto3" json:"gerrit_project,omitempty"`
 	// A revision in a Gerrit project can be identified by either its revision ID
 	// or its alias.
 	//
@@ -514,30 +618,70 @@ type GerritSourceContext struct {
 	//	*GerritSourceContext_RevisionId
 	//	*GerritSourceContext_AliasName
 	//	*GerritSourceContext_AliasContext
-	Revision isGerritSourceContext_Revision `protobuf_oneof:"revision"`
+	Revision             isGerritSourceContext_Revision `protobuf_oneof:"revision"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
 }
 
-func (m *GerritSourceContext) Reset()                    { *m = GerritSourceContext{} }
-func (m *GerritSourceContext) String() string            { return proto.CompactTextString(m) }
-func (*GerritSourceContext) ProtoMessage()               {}
-func (*GerritSourceContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *GerritSourceContext) Reset()         { *m = GerritSourceContext{} }
+func (m *GerritSourceContext) String() string { return proto.CompactTextString(m) }
+func (*GerritSourceContext) ProtoMessage()    {}
+func (*GerritSourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{5}
+}
+func (m *GerritSourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GerritSourceContext.Unmarshal(m, b)
+}
+func (m *GerritSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GerritSourceContext.Marshal(b, m, deterministic)
+}
+func (dst *GerritSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GerritSourceContext.Merge(dst, src)
+}
+func (m *GerritSourceContext) XXX_Size() int {
+	return xxx_messageInfo_GerritSourceContext.Size(m)
+}
+func (m *GerritSourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_GerritSourceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GerritSourceContext proto.InternalMessageInfo
+
+func (m *GerritSourceContext) GetHostUri() string {
+	if m != nil {
+		return m.HostUri
+	}
+	return ""
+}
+
+func (m *GerritSourceContext) GetGerritProject() string {
+	if m != nil {
+		return m.GerritProject
+	}
+	return ""
+}
 
 type isGerritSourceContext_Revision interface {
 	isGerritSourceContext_Revision()
 }
 
 type GerritSourceContext_RevisionId struct {
-	RevisionId string `protobuf:"bytes,3,opt,name=revision_id,json=revisionId,oneof"`
+	RevisionId string `protobuf:"bytes,3,opt,name=revision_id,json=revisionId,proto3,oneof"`
 }
+
 type GerritSourceContext_AliasName struct {
-	AliasName string `protobuf:"bytes,4,opt,name=alias_name,json=aliasName,oneof"`
+	AliasName string `protobuf:"bytes,4,opt,name=alias_name,json=aliasName,proto3,oneof"`
 }
+
 type GerritSourceContext_AliasContext struct {
-	AliasContext *AliasContext `protobuf:"bytes,5,opt,name=alias_context,json=aliasContext,oneof"`
+	AliasContext *AliasContext `protobuf:"bytes,5,opt,name=alias_context,json=aliasContext,proto3,oneof"`
 }
 
-func (*GerritSourceContext_RevisionId) isGerritSourceContext_Revision()   {}
-func (*GerritSourceContext_AliasName) isGerritSourceContext_Revision()    {}
+func (*GerritSourceContext_RevisionId) isGerritSourceContext_Revision() {}
+
+func (*GerritSourceContext_AliasName) isGerritSourceContext_Revision() {}
+
 func (*GerritSourceContext_AliasContext) isGerritSourceContext_Revision() {}
 
 func (m *GerritSourceContext) GetRevision() isGerritSourceContext_Revision {
@@ -547,20 +691,6 @@ func (m *GerritSourceContext) GetRevision() isGerritSourceContext_Revision {
 	return nil
 }
 
-func (m *GerritSourceContext) GetHostUri() string {
-	if m != nil {
-		return m.HostUri
-	}
-	return ""
-}
-
-func (m *GerritSourceContext) GetGerritProject() string {
-	if m != nil {
-		return m.GerritProject
-	}
-	return ""
-}
-
 func (m *GerritSourceContext) GetRevisionId() string {
 	if x, ok := m.GetRevision().(*GerritSourceContext_RevisionId); ok {
 		return x.RevisionId
@@ -648,16 +778,16 @@ func _GerritSourceContext_OneofSizer(msg proto.Message) (n int) {
 	// revision
 	switch x := m.Revision.(type) {
 	case *GerritSourceContext_RevisionId:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.RevisionId)))
 		n += len(x.RevisionId)
 	case *GerritSourceContext_AliasName:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AliasName)))
 		n += len(x.AliasName)
 	case *GerritSourceContext_AliasContext:
 		s := proto.Size(x.AliasContext)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -671,16 +801,38 @@ func _GerritSourceContext_OneofSizer(msg proto.Message) (n int) {
 // repository (e.g. GitHub).
 type GitSourceContext struct {
 	// Git repository URL.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// Git commit hash.
 	// required.
-	RevisionId string `protobuf:"bytes,2,opt,name=revision_id,json=revisionId" json:"revision_id,omitempty"`
+	RevisionId           string   `protobuf:"bytes,2,opt,name=revision_id,json=revisionId,proto3" json:"revision_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GitSourceContext) Reset()                    { *m = GitSourceContext{} }
-func (m *GitSourceContext) String() string            { return proto.CompactTextString(m) }
-func (*GitSourceContext) ProtoMessage()               {}
-func (*GitSourceContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *GitSourceContext) Reset()         { *m = GitSourceContext{} }
+func (m *GitSourceContext) String() string { return proto.CompactTextString(m) }
+func (*GitSourceContext) ProtoMessage()    {}
+func (*GitSourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{6}
+}
+func (m *GitSourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GitSourceContext.Unmarshal(m, b)
+}
+func (m *GitSourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GitSourceContext.Marshal(b, m, deterministic)
+}
+func (dst *GitSourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GitSourceContext.Merge(dst, src)
+}
+func (m *GitSourceContext) XXX_Size() int {
+	return xxx_messageInfo_GitSourceContext.Size(m)
+}
+func (m *GitSourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_GitSourceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GitSourceContext proto.InternalMessageInfo
 
 func (m *GitSourceContext) GetUrl() string {
 	if m != nil {
@@ -704,27 +856,51 @@ type RepoId struct {
 	// Types that are valid to be assigned to Id:
 	//	*RepoId_ProjectRepoId
 	//	*RepoId_Uid
-	Id isRepoId_Id `protobuf_oneof:"id"`
+	Id                   isRepoId_Id `protobuf_oneof:"id"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *RepoId) Reset()         { *m = RepoId{} }
+func (m *RepoId) String() string { return proto.CompactTextString(m) }
+func (*RepoId) ProtoMessage()    {}
+func (*RepoId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{7}
+}
+func (m *RepoId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RepoId.Unmarshal(m, b)
+}
+func (m *RepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RepoId.Marshal(b, m, deterministic)
+}
+func (dst *RepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RepoId.Merge(dst, src)
+}
+func (m *RepoId) XXX_Size() int {
+	return xxx_messageInfo_RepoId.Size(m)
+}
+func (m *RepoId) XXX_DiscardUnknown() {
+	xxx_messageInfo_RepoId.DiscardUnknown(m)
 }
 
-func (m *RepoId) Reset()                    { *m = RepoId{} }
-func (m *RepoId) String() string            { return proto.CompactTextString(m) }
-func (*RepoId) ProtoMessage()               {}
-func (*RepoId) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_RepoId proto.InternalMessageInfo
 
 type isRepoId_Id interface {
 	isRepoId_Id()
 }
 
 type RepoId_ProjectRepoId struct {
-	ProjectRepoId *ProjectRepoId `protobuf:"bytes,1,opt,name=project_repo_id,json=projectRepoId,oneof"`
+	ProjectRepoId *ProjectRepoId `protobuf:"bytes,1,opt,name=project_repo_id,json=projectRepoId,proto3,oneof"`
 }
+
 type RepoId_Uid struct {
-	Uid string `protobuf:"bytes,2,opt,name=uid,oneof"`
+	Uid string `protobuf:"bytes,2,opt,name=uid,proto3,oneof"`
 }
 
 func (*RepoId_ProjectRepoId) isRepoId_Id() {}
-func (*RepoId_Uid) isRepoId_Id()           {}
+
+func (*RepoId_Uid) isRepoId_Id() {}
 
 func (m *RepoId) GetId() isRepoId_Id {
 	if m != nil {
@@ -803,11 +979,11 @@ func _RepoId_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Id.(type) {
 	case *RepoId_ProjectRepoId:
 		s := proto.Size(x.ProjectRepoId)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RepoId_Uid:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Uid)))
 		n += len(x.Uid)
 	case nil:
@@ -821,15 +997,37 @@ func _RepoId_OneofSizer(msg proto.Message) (n int) {
 // (e.g. winged-cargo-31) and a repo name within that project.
 type ProjectRepoId struct {
 	// The ID of the project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The name of the repo. Leave empty for the default repo.
-	RepoName string `protobuf:"bytes,2,opt,name=repo_name,json=repoName" json:"repo_name,omitempty"`
+	RepoName             string   `protobuf:"bytes,2,opt,name=repo_name,json=repoName,proto3" json:"repo_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ProjectRepoId) Reset()                    { *m = ProjectRepoId{} }
-func (m *ProjectRepoId) String() string            { return proto.CompactTextString(m) }
-func (*ProjectRepoId) ProtoMessage()               {}
-func (*ProjectRepoId) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *ProjectRepoId) Reset()         { *m = ProjectRepoId{} }
+func (m *ProjectRepoId) String() string { return proto.CompactTextString(m) }
+func (*ProjectRepoId) ProtoMessage()    {}
+func (*ProjectRepoId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{8}
+}
+func (m *ProjectRepoId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ProjectRepoId.Unmarshal(m, b)
+}
+func (m *ProjectRepoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ProjectRepoId.Marshal(b, m, deterministic)
+}
+func (dst *ProjectRepoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ProjectRepoId.Merge(dst, src)
+}
+func (m *ProjectRepoId) XXX_Size() int {
+	return xxx_messageInfo_ProjectRepoId.Size(m)
+}
+func (m *ProjectRepoId) XXX_DiscardUnknown() {
+	xxx_messageInfo_ProjectRepoId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ProjectRepoId proto.InternalMessageInfo
 
 func (m *ProjectRepoId) GetProjectId() string {
 	if m != nil {
@@ -850,16 +1048,38 @@ func (m *ProjectRepoId) GetRepoName() string {
 // can be stored before they are committed.
 type CloudWorkspaceId struct {
 	// The ID of the repo containing the workspace.
-	RepoId *RepoId `protobuf:"bytes,1,opt,name=repo_id,json=repoId" json:"repo_id,omitempty"`
+	RepoId *RepoId `protobuf:"bytes,1,opt,name=repo_id,json=repoId,proto3" json:"repo_id,omitempty"`
 	// The unique name of the workspace within the repo.  This is the name
 	// chosen by the client in the Source API's CreateWorkspace method.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CloudWorkspaceId) Reset()         { *m = CloudWorkspaceId{} }
+func (m *CloudWorkspaceId) String() string { return proto.CompactTextString(m) }
+func (*CloudWorkspaceId) ProtoMessage()    {}
+func (*CloudWorkspaceId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_a972181f110f4ce5, []int{9}
+}
+func (m *CloudWorkspaceId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CloudWorkspaceId.Unmarshal(m, b)
+}
+func (m *CloudWorkspaceId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CloudWorkspaceId.Marshal(b, m, deterministic)
+}
+func (dst *CloudWorkspaceId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudWorkspaceId.Merge(dst, src)
+}
+func (m *CloudWorkspaceId) XXX_Size() int {
+	return xxx_messageInfo_CloudWorkspaceId.Size(m)
+}
+func (m *CloudWorkspaceId) XXX_DiscardUnknown() {
+	xxx_messageInfo_CloudWorkspaceId.DiscardUnknown(m)
 }
 
-func (m *CloudWorkspaceId) Reset()                    { *m = CloudWorkspaceId{} }
-func (m *CloudWorkspaceId) String() string            { return proto.CompactTextString(m) }
-func (*CloudWorkspaceId) ProtoMessage()               {}
-func (*CloudWorkspaceId) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_CloudWorkspaceId proto.InternalMessageInfo
 
 func (m *CloudWorkspaceId) GetRepoId() *RepoId {
 	if m != nil {
@@ -878,6 +1098,7 @@ func (m *CloudWorkspaceId) GetName() string {
 func init() {
 	proto.RegisterType((*SourceContext)(nil), "google.devtools.source.v1.SourceContext")
 	proto.RegisterType((*ExtendedSourceContext)(nil), "google.devtools.source.v1.ExtendedSourceContext")
+	proto.RegisterMapType((map[string]string)(nil), "google.devtools.source.v1.ExtendedSourceContext.LabelsEntry")
 	proto.RegisterType((*AliasContext)(nil), "google.devtools.source.v1.AliasContext")
 	proto.RegisterType((*CloudRepoSourceContext)(nil), "google.devtools.source.v1.CloudRepoSourceContext")
 	proto.RegisterType((*CloudWorkspaceSourceContext)(nil), "google.devtools.source.v1.CloudWorkspaceSourceContext")
@@ -889,9 +1110,11 @@ func init() {
 	proto.RegisterEnum("google.devtools.source.v1.AliasContext_Kind", AliasContext_Kind_name, AliasContext_Kind_value)
 }
 
-func init() { proto.RegisterFile("google/devtools/source/v1/source_context.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/devtools/source/v1/source_context.proto", fileDescriptor_source_context_a972181f110f4ce5)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_source_context_a972181f110f4ce5 = []byte{
 	// 800 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x4e, 0xdb, 0x48,
 	0x14, 0x8e, 0xe3, 0x90, 0xe0, 0x13, 0x02, 0xd1, 0xec, 0x8f, 0x02, 0x2c, 0x02, 0x2c, 0xad, 0x16,
diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
index 47994ed9..41d0474c 100644
--- a/vendor/google.golang.org/genproto/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/devtools/sourcerepo/v1/sourcerepo.pb.go
@@ -1,30 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/devtools/sourcerepo/v1/sourcerepo.proto
 
-/*
-Package sourcerepo is a generated protocol buffer package.
-
-It is generated from these files:
-	google/devtools/sourcerepo/v1/sourcerepo.proto
-
-It has these top-level messages:
-	Repo
-	MirrorConfig
-	GetRepoRequest
-	ListReposRequest
-	ListReposResponse
-	CreateRepoRequest
-	DeleteRepoRequest
-*/
-package sourcerepo
+package sourcerepo // import "google.golang.org/genproto/googleapis/devtools/sourcerepo/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
 
 import (
 	context "golang.org/x/net/context"
@@ -47,22 +31,44 @@ type Repo struct {
 	// Resource name of the repository, of the form
 	// `projects/<project>/repos/<repo>`.  The repo name may contain slashes.
 	// eg, `projects/myproject/repos/name/with/slash`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The disk usage of the repo, in bytes. Read-only field. Size is only
 	// returned by GetRepo.
-	Size int64 `protobuf:"varint,2,opt,name=size" json:"size,omitempty"`
+	Size int64 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"`
 	// URL to clone the repository from Google Cloud Source Repositories.
 	// Read-only field.
-	Url string `protobuf:"bytes,3,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"`
 	// How this repository mirrors a repository managed by another service.
 	// Read-only field.
-	MirrorConfig *MirrorConfig `protobuf:"bytes,4,opt,name=mirror_config,json=mirrorConfig" json:"mirror_config,omitempty"`
+	MirrorConfig         *MirrorConfig `protobuf:"bytes,4,opt,name=mirror_config,json=mirrorConfig,proto3" json:"mirror_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *Repo) Reset()                    { *m = Repo{} }
-func (m *Repo) String() string            { return proto.CompactTextString(m) }
-func (*Repo) ProtoMessage()               {}
-func (*Repo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Repo) Reset()         { *m = Repo{} }
+func (m *Repo) String() string { return proto.CompactTextString(m) }
+func (*Repo) ProtoMessage()    {}
+func (*Repo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_sourcerepo_c3970ced7dbc10e1, []int{0}
+}
+func (m *Repo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Repo.Unmarshal(m, b)
+}
+func (m *Repo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Repo.Marshal(b, m, deterministic)
+}
+func (dst *Repo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Repo.Merge(dst, src)
+}
+func (m *Repo) XXX_Size() int {
+	return xxx_messageInfo_Repo.Size(m)
+}
+func (m *Repo) XXX_DiscardUnknown() {
+	xxx_messageInfo_Repo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Repo proto.InternalMessageInfo
 
 func (m *Repo) GetName() string {
 	if m != nil {
@@ -96,22 +102,44 @@ func (m *Repo) GetMirrorConfig() *MirrorConfig {
 // hosting service, for example GitHub or BitBucket.
 type MirrorConfig struct {
 	// URL of the main repository at the other hosting service.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// ID of the webhook listening to updates to trigger mirroring.
 	// Removing this webhook from the other hosting service will stop
 	// Google Cloud Source Repositories from receiving notifications,
 	// and thereby disabling mirroring.
-	WebhookId string `protobuf:"bytes,2,opt,name=webhook_id,json=webhookId" json:"webhook_id,omitempty"`
+	WebhookId string `protobuf:"bytes,2,opt,name=webhook_id,json=webhookId,proto3" json:"webhook_id,omitempty"`
 	// ID of the SSH deploy key at the other hosting service.
 	// Removing this key from the other service would deauthorize
 	// Google Cloud Source Repositories from mirroring.
-	DeployKeyId string `protobuf:"bytes,3,opt,name=deploy_key_id,json=deployKeyId" json:"deploy_key_id,omitempty"`
+	DeployKeyId          string   `protobuf:"bytes,3,opt,name=deploy_key_id,json=deployKeyId,proto3" json:"deploy_key_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MirrorConfig) Reset()         { *m = MirrorConfig{} }
+func (m *MirrorConfig) String() string { return proto.CompactTextString(m) }
+func (*MirrorConfig) ProtoMessage()    {}
+func (*MirrorConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_sourcerepo_c3970ced7dbc10e1, []int{1}
+}
+func (m *MirrorConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MirrorConfig.Unmarshal(m, b)
+}
+func (m *MirrorConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MirrorConfig.Marshal(b, m, deterministic)
+}
+func (dst *MirrorConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MirrorConfig.Merge(dst, src)
+}
+func (m *MirrorConfig) XXX_Size() int {
+	return xxx_messageInfo_MirrorConfig.Size(m)
+}
+func (m *MirrorConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_MirrorConfig.DiscardUnknown(m)
 }
 
-func (m *MirrorConfig) Reset()                    { *m = MirrorConfig{} }
-func (m *MirrorConfig) String() string            { return proto.CompactTextString(m) }
-func (*MirrorConfig) ProtoMessage()               {}
-func (*MirrorConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_MirrorConfig proto.InternalMessageInfo
 
 func (m *MirrorConfig) GetUrl() string {
 	if m != nil {
@@ -138,13 +166,35 @@ func (m *MirrorConfig) GetDeployKeyId() string {
 type GetRepoRequest struct {
 	// The name of the requested repository. Values are of the form
 	// `projects/<project>/repos/<repo>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetRepoRequest) Reset()                    { *m = GetRepoRequest{} }
-func (m *GetRepoRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetRepoRequest) ProtoMessage()               {}
-func (*GetRepoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *GetRepoRequest) Reset()         { *m = GetRepoRequest{} }
+func (m *GetRepoRequest) String() string { return proto.CompactTextString(m) }
+func (*GetRepoRequest) ProtoMessage()    {}
+func (*GetRepoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_sourcerepo_c3970ced7dbc10e1, []int{2}
+}
+func (m *GetRepoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetRepoRequest.Unmarshal(m, b)
+}
+func (m *GetRepoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetRepoRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetRepoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetRepoRequest.Merge(dst, src)
+}
+func (m *GetRepoRequest) XXX_Size() int {
+	return xxx_messageInfo_GetRepoRequest.Size(m)
+}
+func (m *GetRepoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetRepoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetRepoRequest proto.InternalMessageInfo
 
 func (m *GetRepoRequest) GetName() string {
 	if m != nil {
@@ -157,20 +207,42 @@ func (m *GetRepoRequest) GetName() string {
 type ListReposRequest struct {
 	// The project ID whose repos should be listed. Values are of the form
 	// `projects/<project>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Maximum number of repositories to return; between 1 and 500.
 	// If not set or zero, defaults to 100 at the server.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Resume listing repositories where a prior ListReposResponse
 	// left off. This is an opaque token that must be obtained from
 	// a recent, prior ListReposResponse's next_page_token field.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListReposRequest) Reset()                    { *m = ListReposRequest{} }
-func (m *ListReposRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListReposRequest) ProtoMessage()               {}
-func (*ListReposRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ListReposRequest) Reset()         { *m = ListReposRequest{} }
+func (m *ListReposRequest) String() string { return proto.CompactTextString(m) }
+func (*ListReposRequest) ProtoMessage()    {}
+func (*ListReposRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_sourcerepo_c3970ced7dbc10e1, []int{3}
+}
+func (m *ListReposRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListReposRequest.Unmarshal(m, b)
+}
+func (m *ListReposRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListReposRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListReposRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReposRequest.Merge(dst, src)
+}
+func (m *ListReposRequest) XXX_Size() int {
+	return xxx_messageInfo_ListReposRequest.Size(m)
+}
+func (m *ListReposRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListReposRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListReposRequest proto.InternalMessageInfo
 
 func (m *ListReposRequest) GetName() string {
 	if m != nil {
@@ -196,17 +268,39 @@ func (m *ListReposRequest) GetPageToken() string {
 // Response for ListRepos.  The size is not set in the returned repositories.
 type ListReposResponse struct {
 	// The listed repos.
-	Repos []*Repo `protobuf:"bytes,1,rep,name=repos" json:"repos,omitempty"`
+	Repos []*Repo `protobuf:"bytes,1,rep,name=repos,proto3" json:"repos,omitempty"`
 	// If non-empty, additional repositories exist within the project. These
 	// can be retrieved by including this value in the next ListReposRequest's
 	// page_token field.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListReposResponse) Reset()                    { *m = ListReposResponse{} }
-func (m *ListReposResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListReposResponse) ProtoMessage()               {}
-func (*ListReposResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ListReposResponse) Reset()         { *m = ListReposResponse{} }
+func (m *ListReposResponse) String() string { return proto.CompactTextString(m) }
+func (*ListReposResponse) ProtoMessage()    {}
+func (*ListReposResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_sourcerepo_c3970ced7dbc10e1, []int{4}
+}
+func (m *ListReposResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListReposResponse.Unmarshal(m, b)
+}
+func (m *ListReposResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListReposResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListReposResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListReposResponse.Merge(dst, src)
+}
+func (m *ListReposResponse) XXX_Size() int {
+	return xxx_messageInfo_ListReposResponse.Size(m)
+}
+func (m *ListReposResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListReposResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListReposResponse proto.InternalMessageInfo
 
 func (m *ListReposResponse) GetRepos() []*Repo {
 	if m != nil {
@@ -226,16 +320,38 @@ func (m *ListReposResponse) GetNextPageToken() string {
 type CreateRepoRequest struct {
 	// The project in which to create the repo. Values are of the form
 	// `projects/<project>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The repo to create.  Only name should be set; setting other fields
 	// is an error.  The project in the name should match the parent field.
-	Repo *Repo `protobuf:"bytes,2,opt,name=repo" json:"repo,omitempty"`
+	Repo                 *Repo    `protobuf:"bytes,2,opt,name=repo,proto3" json:"repo,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateRepoRequest) Reset()         { *m = CreateRepoRequest{} }
+func (m *CreateRepoRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateRepoRequest) ProtoMessage()    {}
+func (*CreateRepoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_sourcerepo_c3970ced7dbc10e1, []int{5}
+}
+func (m *CreateRepoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateRepoRequest.Unmarshal(m, b)
+}
+func (m *CreateRepoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateRepoRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateRepoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateRepoRequest.Merge(dst, src)
+}
+func (m *CreateRepoRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateRepoRequest.Size(m)
+}
+func (m *CreateRepoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateRepoRequest.DiscardUnknown(m)
 }
 
-func (m *CreateRepoRequest) Reset()                    { *m = CreateRepoRequest{} }
-func (m *CreateRepoRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateRepoRequest) ProtoMessage()               {}
-func (*CreateRepoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_CreateRepoRequest proto.InternalMessageInfo
 
 func (m *CreateRepoRequest) GetParent() string {
 	if m != nil {
@@ -255,13 +371,35 @@ func (m *CreateRepoRequest) GetRepo() *Repo {
 type DeleteRepoRequest struct {
 	// The name of the repo to delete. Values are of the form
 	// `projects/<project>/repos/<repo>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteRepoRequest) Reset()                    { *m = DeleteRepoRequest{} }
-func (m *DeleteRepoRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteRepoRequest) ProtoMessage()               {}
-func (*DeleteRepoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *DeleteRepoRequest) Reset()         { *m = DeleteRepoRequest{} }
+func (m *DeleteRepoRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteRepoRequest) ProtoMessage()    {}
+func (*DeleteRepoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_sourcerepo_c3970ced7dbc10e1, []int{6}
+}
+func (m *DeleteRepoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteRepoRequest.Unmarshal(m, b)
+}
+func (m *DeleteRepoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteRepoRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteRepoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteRepoRequest.Merge(dst, src)
+}
+func (m *DeleteRepoRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteRepoRequest.Size(m)
+}
+func (m *DeleteRepoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteRepoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteRepoRequest proto.InternalMessageInfo
 
 func (m *DeleteRepoRequest) GetName() string {
 	if m != nil {
@@ -288,8 +426,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for SourceRepo service
-
+// SourceRepoClient is the client API for SourceRepo service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SourceRepoClient interface {
 	// Returns all repos belonging to a project. The sizes of the repos are
 	// not set by ListRepos.  To get the size of a repo, use GetRepo.
@@ -302,18 +441,18 @@ type SourceRepoClient interface {
 	// `ALREADY_EXISTS`.
 	CreateRepo(ctx context.Context, in *CreateRepoRequest, opts ...grpc.CallOption) (*Repo, error)
 	// Deletes a repo.
-	DeleteRepo(ctx context.Context, in *DeleteRepoRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteRepo(ctx context.Context, in *DeleteRepoRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Sets the access control policy on the specified resource. Replaces any
 	// existing policy.
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Gets the access control policy for a resource.
 	// Returns an empty policy if the resource exists and does not have a policy
 	// set.
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Returns permissions that a caller has on the specified resource.
 	// If the resource does not exist, this will return an empty set of
 	// permissions, not a NOT_FOUND error.
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
 }
 
 type sourceRepoClient struct {
@@ -326,7 +465,7 @@ func NewSourceRepoClient(cc *grpc.ClientConn) SourceRepoClient {
 
 func (c *sourceRepoClient) ListRepos(ctx context.Context, in *ListReposRequest, opts ...grpc.CallOption) (*ListReposResponse, error) {
 	out := new(ListReposResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/ListRepos", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/ListRepos", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -335,7 +474,7 @@ func (c *sourceRepoClient) ListRepos(ctx context.Context, in *ListReposRequest,
 
 func (c *sourceRepoClient) GetRepo(ctx context.Context, in *GetRepoRequest, opts ...grpc.CallOption) (*Repo, error) {
 	out := new(Repo)
-	err := grpc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/GetRepo", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/GetRepo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -344,51 +483,50 @@ func (c *sourceRepoClient) GetRepo(ctx context.Context, in *GetRepoRequest, opts
 
 func (c *sourceRepoClient) CreateRepo(ctx context.Context, in *CreateRepoRequest, opts ...grpc.CallOption) (*Repo, error) {
 	out := new(Repo)
-	err := grpc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/CreateRepo", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/CreateRepo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *sourceRepoClient) DeleteRepo(ctx context.Context, in *DeleteRepoRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/DeleteRepo", in, out, c.cc, opts...)
+func (c *sourceRepoClient) DeleteRepo(ctx context.Context, in *DeleteRepoRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/DeleteRepo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *sourceRepoClient) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/SetIamPolicy", in, out, c.cc, opts...)
+func (c *sourceRepoClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *sourceRepoClient) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/GetIamPolicy", in, out, c.cc, opts...)
+func (c *sourceRepoClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *sourceRepoClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/TestIamPermissions", in, out, c.cc, opts...)
+func (c *sourceRepoClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.devtools.sourcerepo.v1.SourceRepo/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for SourceRepo service
-
+// SourceRepoServer is the server API for SourceRepo service.
 type SourceRepoServer interface {
 	// Returns all repos belonging to a project. The sizes of the repos are
 	// not set by ListRepos.  To get the size of a repo, use GetRepo.
@@ -401,18 +539,18 @@ type SourceRepoServer interface {
 	// `ALREADY_EXISTS`.
 	CreateRepo(context.Context, *CreateRepoRequest) (*Repo, error)
 	// Deletes a repo.
-	DeleteRepo(context.Context, *DeleteRepoRequest) (*google_protobuf1.Empty, error)
+	DeleteRepo(context.Context, *DeleteRepoRequest) (*empty.Empty, error)
 	// Sets the access control policy on the specified resource. Replaces any
 	// existing policy.
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Gets the access control policy for a resource.
 	// Returns an empty policy if the resource exists and does not have a policy
 	// set.
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Returns permissions that a caller has on the specified resource.
 	// If the resource does not exist, this will return an empty set of
 	// permissions, not a NOT_FOUND error.
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
 }
 
 func RegisterSourceRepoServer(s *grpc.Server, srv SourceRepoServer) {
@@ -492,7 +630,7 @@ func _SourceRepo_DeleteRepo_Handler(srv interface{}, ctx context.Context, dec fu
 }
 
 func _SourceRepo_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -504,13 +642,13 @@ func _SourceRepo_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec
 		FullMethod: "/google.devtools.sourcerepo.v1.SourceRepo/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SourceRepoServer).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(SourceRepoServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _SourceRepo_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -522,13 +660,13 @@ func _SourceRepo_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec
 		FullMethod: "/google.devtools.sourcerepo.v1.SourceRepo/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SourceRepoServer).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(SourceRepoServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _SourceRepo_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -540,7 +678,7 @@ func _SourceRepo_TestIamPermissions_Handler(srv interface{}, ctx context.Context
 		FullMethod: "/google.devtools.sourcerepo.v1.SourceRepo/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SourceRepoServer).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(SourceRepoServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -582,9 +720,11 @@ var _SourceRepo_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/devtools/sourcerepo/v1/sourcerepo.proto",
 }
 
-func init() { proto.RegisterFile("google/devtools/sourcerepo/v1/sourcerepo.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/devtools/sourcerepo/v1/sourcerepo.proto", fileDescriptor_sourcerepo_c3970ced7dbc10e1)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_sourcerepo_c3970ced7dbc10e1 = []byte{
 	// 743 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd1, 0x6e, 0xd3, 0x4a,
 	0x10, 0xd5, 0x36, 0x69, 0x7b, 0x33, 0x4d, 0x6f, 0xdb, 0x95, 0x6e, 0x15, 0xa5, 0x37, 0x55, 0xae,
diff --git a/vendor/google.golang.org/genproto/googleapis/example/library/v1/library.pb.go b/vendor/google.golang.org/genproto/googleapis/example/library/v1/library.pb.go
index 5fa99752..25c48763 100644
--- a/vendor/google.golang.org/genproto/googleapis/example/library/v1/library.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/example/library/v1/library.pb.go
@@ -1,36 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/example/library/v1/library.proto
 
-/*
-Package library is a generated protocol buffer package.
-
-It is generated from these files:
-	google/example/library/v1/library.proto
-
-It has these top-level messages:
-	Book
-	Shelf
-	CreateShelfRequest
-	GetShelfRequest
-	ListShelvesRequest
-	ListShelvesResponse
-	DeleteShelfRequest
-	MergeShelvesRequest
-	CreateBookRequest
-	GetBookRequest
-	ListBooksRequest
-	ListBooksResponse
-	UpdateBookRequest
-	DeleteBookRequest
-	MoveBookRequest
-*/
-package library
+package library // import "google.golang.org/genproto/googleapis/example/library/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -53,19 +30,41 @@ type Book struct {
 	// The resource name of the book.
 	// Book names have the form `shelves/{shelf_id}/books/{book_id}`.
 	// The name is ignored when creating a book.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the book author.
-	Author string `protobuf:"bytes,2,opt,name=author" json:"author,omitempty"`
+	Author string `protobuf:"bytes,2,opt,name=author,proto3" json:"author,omitempty"`
 	// The title of the book.
-	Title string `protobuf:"bytes,3,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,3,opt,name=title,proto3" json:"title,omitempty"`
 	// Value indicating whether the book has been read.
-	Read bool `protobuf:"varint,4,opt,name=read" json:"read,omitempty"`
+	Read                 bool     `protobuf:"varint,4,opt,name=read,proto3" json:"read,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Book) Reset()                    { *m = Book{} }
-func (m *Book) String() string            { return proto.CompactTextString(m) }
-func (*Book) ProtoMessage()               {}
-func (*Book) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Book) Reset()         { *m = Book{} }
+func (m *Book) String() string { return proto.CompactTextString(m) }
+func (*Book) ProtoMessage()    {}
+func (*Book) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{0}
+}
+func (m *Book) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Book.Unmarshal(m, b)
+}
+func (m *Book) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Book.Marshal(b, m, deterministic)
+}
+func (dst *Book) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Book.Merge(dst, src)
+}
+func (m *Book) XXX_Size() int {
+	return xxx_messageInfo_Book.Size(m)
+}
+func (m *Book) XXX_DiscardUnknown() {
+	xxx_messageInfo_Book.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Book proto.InternalMessageInfo
 
 func (m *Book) GetName() string {
 	if m != nil {
@@ -100,15 +99,37 @@ type Shelf struct {
 	// The resource name of the shelf.
 	// Shelf names have the form `shelves/{shelf_id}`.
 	// The name is ignored when creating a shelf.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The theme of the shelf
-	Theme string `protobuf:"bytes,2,opt,name=theme" json:"theme,omitempty"`
+	Theme                string   `protobuf:"bytes,2,opt,name=theme,proto3" json:"theme,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Shelf) Reset()         { *m = Shelf{} }
+func (m *Shelf) String() string { return proto.CompactTextString(m) }
+func (*Shelf) ProtoMessage()    {}
+func (*Shelf) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{1}
+}
+func (m *Shelf) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Shelf.Unmarshal(m, b)
+}
+func (m *Shelf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Shelf.Marshal(b, m, deterministic)
+}
+func (dst *Shelf) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Shelf.Merge(dst, src)
+}
+func (m *Shelf) XXX_Size() int {
+	return xxx_messageInfo_Shelf.Size(m)
+}
+func (m *Shelf) XXX_DiscardUnknown() {
+	xxx_messageInfo_Shelf.DiscardUnknown(m)
 }
 
-func (m *Shelf) Reset()                    { *m = Shelf{} }
-func (m *Shelf) String() string            { return proto.CompactTextString(m) }
-func (*Shelf) ProtoMessage()               {}
-func (*Shelf) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Shelf proto.InternalMessageInfo
 
 func (m *Shelf) GetName() string {
 	if m != nil {
@@ -127,13 +148,35 @@ func (m *Shelf) GetTheme() string {
 // Request message for LibraryService.CreateShelf.
 type CreateShelfRequest struct {
 	// The shelf to create.
-	Shelf *Shelf `protobuf:"bytes,1,opt,name=shelf" json:"shelf,omitempty"`
+	Shelf                *Shelf   `protobuf:"bytes,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateShelfRequest) Reset()                    { *m = CreateShelfRequest{} }
-func (m *CreateShelfRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateShelfRequest) ProtoMessage()               {}
-func (*CreateShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *CreateShelfRequest) Reset()         { *m = CreateShelfRequest{} }
+func (m *CreateShelfRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateShelfRequest) ProtoMessage()    {}
+func (*CreateShelfRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{2}
+}
+func (m *CreateShelfRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateShelfRequest.Unmarshal(m, b)
+}
+func (m *CreateShelfRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateShelfRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateShelfRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateShelfRequest.Merge(dst, src)
+}
+func (m *CreateShelfRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateShelfRequest.Size(m)
+}
+func (m *CreateShelfRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateShelfRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateShelfRequest proto.InternalMessageInfo
 
 func (m *CreateShelfRequest) GetShelf() *Shelf {
 	if m != nil {
@@ -145,13 +188,35 @@ func (m *CreateShelfRequest) GetShelf() *Shelf {
 // Request message for LibraryService.GetShelf.
 type GetShelfRequest struct {
 	// The name of the shelf to retrieve.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetShelfRequest) Reset()         { *m = GetShelfRequest{} }
+func (m *GetShelfRequest) String() string { return proto.CompactTextString(m) }
+func (*GetShelfRequest) ProtoMessage()    {}
+func (*GetShelfRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{3}
+}
+func (m *GetShelfRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetShelfRequest.Unmarshal(m, b)
+}
+func (m *GetShelfRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetShelfRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetShelfRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetShelfRequest.Merge(dst, src)
+}
+func (m *GetShelfRequest) XXX_Size() int {
+	return xxx_messageInfo_GetShelfRequest.Size(m)
+}
+func (m *GetShelfRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetShelfRequest.DiscardUnknown(m)
 }
 
-func (m *GetShelfRequest) Reset()                    { *m = GetShelfRequest{} }
-func (m *GetShelfRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetShelfRequest) ProtoMessage()               {}
-func (*GetShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_GetShelfRequest proto.InternalMessageInfo
 
 func (m *GetShelfRequest) GetName() string {
 	if m != nil {
@@ -164,18 +229,40 @@ func (m *GetShelfRequest) GetName() string {
 type ListShelvesRequest struct {
 	// Requested page size. Server may return fewer shelves than requested.
 	// If unspecified, server will pick an appropriate default.
-	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A token identifying a page of results the server should return.
 	// Typically, this is the value of
 	// [ListShelvesResponse.next_page_token][google.example.library.v1.ListShelvesResponse.next_page_token]
 	// returned from the previous call to `ListShelves` method.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListShelvesRequest) Reset()                    { *m = ListShelvesRequest{} }
-func (m *ListShelvesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListShelvesRequest) ProtoMessage()               {}
-func (*ListShelvesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ListShelvesRequest) Reset()         { *m = ListShelvesRequest{} }
+func (m *ListShelvesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListShelvesRequest) ProtoMessage()    {}
+func (*ListShelvesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{4}
+}
+func (m *ListShelvesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListShelvesRequest.Unmarshal(m, b)
+}
+func (m *ListShelvesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListShelvesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListShelvesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListShelvesRequest.Merge(dst, src)
+}
+func (m *ListShelvesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListShelvesRequest.Size(m)
+}
+func (m *ListShelvesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListShelvesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListShelvesRequest proto.InternalMessageInfo
 
 func (m *ListShelvesRequest) GetPageSize() int32 {
 	if m != nil {
@@ -194,19 +281,41 @@ func (m *ListShelvesRequest) GetPageToken() string {
 // Response message for LibraryService.ListShelves.
 type ListShelvesResponse struct {
 	// The list of shelves.
-	Shelves []*Shelf `protobuf:"bytes,1,rep,name=shelves" json:"shelves,omitempty"`
+	Shelves []*Shelf `protobuf:"bytes,1,rep,name=shelves,proto3" json:"shelves,omitempty"`
 	// A token to retrieve next page of results.
 	// Pass this value in the
 	// [ListShelvesRequest.page_token][google.example.library.v1.ListShelvesRequest.page_token]
 	// field in the subsequent call to `ListShelves` method to retrieve the next
 	// page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListShelvesResponse) Reset()         { *m = ListShelvesResponse{} }
+func (m *ListShelvesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListShelvesResponse) ProtoMessage()    {}
+func (*ListShelvesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{5}
+}
+func (m *ListShelvesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListShelvesResponse.Unmarshal(m, b)
+}
+func (m *ListShelvesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListShelvesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListShelvesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListShelvesResponse.Merge(dst, src)
+}
+func (m *ListShelvesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListShelvesResponse.Size(m)
+}
+func (m *ListShelvesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListShelvesResponse.DiscardUnknown(m)
 }
 
-func (m *ListShelvesResponse) Reset()                    { *m = ListShelvesResponse{} }
-func (m *ListShelvesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListShelvesResponse) ProtoMessage()               {}
-func (*ListShelvesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_ListShelvesResponse proto.InternalMessageInfo
 
 func (m *ListShelvesResponse) GetShelves() []*Shelf {
 	if m != nil {
@@ -225,13 +334,35 @@ func (m *ListShelvesResponse) GetNextPageToken() string {
 // Request message for LibraryService.DeleteShelf.
 type DeleteShelfRequest struct {
 	// The name of the shelf to delete.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteShelfRequest) Reset()                    { *m = DeleteShelfRequest{} }
-func (m *DeleteShelfRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteShelfRequest) ProtoMessage()               {}
-func (*DeleteShelfRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *DeleteShelfRequest) Reset()         { *m = DeleteShelfRequest{} }
+func (m *DeleteShelfRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteShelfRequest) ProtoMessage()    {}
+func (*DeleteShelfRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{6}
+}
+func (m *DeleteShelfRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteShelfRequest.Unmarshal(m, b)
+}
+func (m *DeleteShelfRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteShelfRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteShelfRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteShelfRequest.Merge(dst, src)
+}
+func (m *DeleteShelfRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteShelfRequest.Size(m)
+}
+func (m *DeleteShelfRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteShelfRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteShelfRequest proto.InternalMessageInfo
 
 func (m *DeleteShelfRequest) GetName() string {
 	if m != nil {
@@ -244,15 +375,37 @@ func (m *DeleteShelfRequest) GetName() string {
 // (name) in this merge.
 type MergeShelvesRequest struct {
 	// The name of the shelf we're adding books to.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the shelf we're removing books from and deleting.
-	OtherShelfName string `protobuf:"bytes,2,opt,name=other_shelf_name,json=otherShelfName" json:"other_shelf_name,omitempty"`
+	OtherShelfName       string   `protobuf:"bytes,2,opt,name=other_shelf_name,json=otherShelfName,proto3" json:"other_shelf_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *MergeShelvesRequest) Reset()                    { *m = MergeShelvesRequest{} }
-func (m *MergeShelvesRequest) String() string            { return proto.CompactTextString(m) }
-func (*MergeShelvesRequest) ProtoMessage()               {}
-func (*MergeShelvesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *MergeShelvesRequest) Reset()         { *m = MergeShelvesRequest{} }
+func (m *MergeShelvesRequest) String() string { return proto.CompactTextString(m) }
+func (*MergeShelvesRequest) ProtoMessage()    {}
+func (*MergeShelvesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{7}
+}
+func (m *MergeShelvesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MergeShelvesRequest.Unmarshal(m, b)
+}
+func (m *MergeShelvesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MergeShelvesRequest.Marshal(b, m, deterministic)
+}
+func (dst *MergeShelvesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MergeShelvesRequest.Merge(dst, src)
+}
+func (m *MergeShelvesRequest) XXX_Size() int {
+	return xxx_messageInfo_MergeShelvesRequest.Size(m)
+}
+func (m *MergeShelvesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MergeShelvesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MergeShelvesRequest proto.InternalMessageInfo
 
 func (m *MergeShelvesRequest) GetName() string {
 	if m != nil {
@@ -271,15 +424,37 @@ func (m *MergeShelvesRequest) GetOtherShelfName() string {
 // Request message for LibraryService.CreateBook.
 type CreateBookRequest struct {
 	// The name of the shelf in which the book is created.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The book to create.
-	Book *Book `protobuf:"bytes,2,opt,name=book" json:"book,omitempty"`
+	Book                 *Book    `protobuf:"bytes,2,opt,name=book,proto3" json:"book,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateBookRequest) Reset()         { *m = CreateBookRequest{} }
+func (m *CreateBookRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateBookRequest) ProtoMessage()    {}
+func (*CreateBookRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{8}
+}
+func (m *CreateBookRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateBookRequest.Unmarshal(m, b)
+}
+func (m *CreateBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateBookRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateBookRequest.Merge(dst, src)
+}
+func (m *CreateBookRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateBookRequest.Size(m)
+}
+func (m *CreateBookRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateBookRequest.DiscardUnknown(m)
 }
 
-func (m *CreateBookRequest) Reset()                    { *m = CreateBookRequest{} }
-func (m *CreateBookRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateBookRequest) ProtoMessage()               {}
-func (*CreateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_CreateBookRequest proto.InternalMessageInfo
 
 func (m *CreateBookRequest) GetName() string {
 	if m != nil {
@@ -298,13 +473,35 @@ func (m *CreateBookRequest) GetBook() *Book {
 // Request message for LibraryService.GetBook.
 type GetBookRequest struct {
 	// The name of the book to retrieve.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetBookRequest) Reset()                    { *m = GetBookRequest{} }
-func (m *GetBookRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetBookRequest) ProtoMessage()               {}
-func (*GetBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *GetBookRequest) Reset()         { *m = GetBookRequest{} }
+func (m *GetBookRequest) String() string { return proto.CompactTextString(m) }
+func (*GetBookRequest) ProtoMessage()    {}
+func (*GetBookRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{9}
+}
+func (m *GetBookRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetBookRequest.Unmarshal(m, b)
+}
+func (m *GetBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetBookRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetBookRequest.Merge(dst, src)
+}
+func (m *GetBookRequest) XXX_Size() int {
+	return xxx_messageInfo_GetBookRequest.Size(m)
+}
+func (m *GetBookRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetBookRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetBookRequest proto.InternalMessageInfo
 
 func (m *GetBookRequest) GetName() string {
 	if m != nil {
@@ -316,21 +513,43 @@ func (m *GetBookRequest) GetName() string {
 // Request message for LibraryService.ListBooks.
 type ListBooksRequest struct {
 	// The name of the shelf whose books we'd like to list.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Requested page size. Server may return fewer books than requested.
 	// If unspecified, server will pick an appropriate default.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A token identifying a page of results the server should return.
 	// Typically, this is the value of
 	// [ListBooksResponse.next_page_token][google.example.library.v1.ListBooksResponse.next_page_token].
 	// returned from the previous call to `ListBooks` method.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListBooksRequest) Reset()                    { *m = ListBooksRequest{} }
-func (m *ListBooksRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListBooksRequest) ProtoMessage()               {}
-func (*ListBooksRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *ListBooksRequest) Reset()         { *m = ListBooksRequest{} }
+func (m *ListBooksRequest) String() string { return proto.CompactTextString(m) }
+func (*ListBooksRequest) ProtoMessage()    {}
+func (*ListBooksRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{10}
+}
+func (m *ListBooksRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBooksRequest.Unmarshal(m, b)
+}
+func (m *ListBooksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBooksRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListBooksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBooksRequest.Merge(dst, src)
+}
+func (m *ListBooksRequest) XXX_Size() int {
+	return xxx_messageInfo_ListBooksRequest.Size(m)
+}
+func (m *ListBooksRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBooksRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListBooksRequest proto.InternalMessageInfo
 
 func (m *ListBooksRequest) GetName() string {
 	if m != nil {
@@ -356,19 +575,41 @@ func (m *ListBooksRequest) GetPageToken() string {
 // Response message for LibraryService.ListBooks.
 type ListBooksResponse struct {
 	// The list of books.
-	Books []*Book `protobuf:"bytes,1,rep,name=books" json:"books,omitempty"`
+	Books []*Book `protobuf:"bytes,1,rep,name=books,proto3" json:"books,omitempty"`
 	// A token to retrieve next page of results.
 	// Pass this value in the
 	// [ListBooksRequest.page_token][google.example.library.v1.ListBooksRequest.page_token]
 	// field in the subsequent call to `ListBooks` method to retrieve the next
 	// page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListBooksResponse) Reset()         { *m = ListBooksResponse{} }
+func (m *ListBooksResponse) String() string { return proto.CompactTextString(m) }
+func (*ListBooksResponse) ProtoMessage()    {}
+func (*ListBooksResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{11}
+}
+func (m *ListBooksResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBooksResponse.Unmarshal(m, b)
+}
+func (m *ListBooksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBooksResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListBooksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBooksResponse.Merge(dst, src)
+}
+func (m *ListBooksResponse) XXX_Size() int {
+	return xxx_messageInfo_ListBooksResponse.Size(m)
+}
+func (m *ListBooksResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBooksResponse.DiscardUnknown(m)
 }
 
-func (m *ListBooksResponse) Reset()                    { *m = ListBooksResponse{} }
-func (m *ListBooksResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListBooksResponse) ProtoMessage()               {}
-func (*ListBooksResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_ListBooksResponse proto.InternalMessageInfo
 
 func (m *ListBooksResponse) GetBooks() []*Book {
 	if m != nil {
@@ -387,15 +628,37 @@ func (m *ListBooksResponse) GetNextPageToken() string {
 // Request message for LibraryService.UpdateBook.
 type UpdateBookRequest struct {
 	// The name of the book to update.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The book to update with. The name must match or be empty.
-	Book *Book `protobuf:"bytes,2,opt,name=book" json:"book,omitempty"`
+	Book                 *Book    `protobuf:"bytes,2,opt,name=book,proto3" json:"book,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateBookRequest) Reset()         { *m = UpdateBookRequest{} }
+func (m *UpdateBookRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateBookRequest) ProtoMessage()    {}
+func (*UpdateBookRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{12}
+}
+func (m *UpdateBookRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateBookRequest.Unmarshal(m, b)
+}
+func (m *UpdateBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateBookRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateBookRequest.Merge(dst, src)
+}
+func (m *UpdateBookRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateBookRequest.Size(m)
+}
+func (m *UpdateBookRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateBookRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateBookRequest) Reset()                    { *m = UpdateBookRequest{} }
-func (m *UpdateBookRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateBookRequest) ProtoMessage()               {}
-func (*UpdateBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_UpdateBookRequest proto.InternalMessageInfo
 
 func (m *UpdateBookRequest) GetName() string {
 	if m != nil {
@@ -414,13 +677,35 @@ func (m *UpdateBookRequest) GetBook() *Book {
 // Request message for LibraryService.DeleteBook.
 type DeleteBookRequest struct {
 	// The name of the book to delete.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteBookRequest) Reset()                    { *m = DeleteBookRequest{} }
-func (m *DeleteBookRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteBookRequest) ProtoMessage()               {}
-func (*DeleteBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *DeleteBookRequest) Reset()         { *m = DeleteBookRequest{} }
+func (m *DeleteBookRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteBookRequest) ProtoMessage()    {}
+func (*DeleteBookRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{13}
+}
+func (m *DeleteBookRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteBookRequest.Unmarshal(m, b)
+}
+func (m *DeleteBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteBookRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteBookRequest.Merge(dst, src)
+}
+func (m *DeleteBookRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteBookRequest.Size(m)
+}
+func (m *DeleteBookRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteBookRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteBookRequest proto.InternalMessageInfo
 
 func (m *DeleteBookRequest) GetName() string {
 	if m != nil {
@@ -433,15 +718,37 @@ func (m *DeleteBookRequest) GetName() string {
 // to (other_shelf_name).
 type MoveBookRequest struct {
 	// The name of the book to move.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the destination shelf.
-	OtherShelfName string `protobuf:"bytes,2,opt,name=other_shelf_name,json=otherShelfName" json:"other_shelf_name,omitempty"`
+	OtherShelfName       string   `protobuf:"bytes,2,opt,name=other_shelf_name,json=otherShelfName,proto3" json:"other_shelf_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *MoveBookRequest) Reset()                    { *m = MoveBookRequest{} }
-func (m *MoveBookRequest) String() string            { return proto.CompactTextString(m) }
-func (*MoveBookRequest) ProtoMessage()               {}
-func (*MoveBookRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *MoveBookRequest) Reset()         { *m = MoveBookRequest{} }
+func (m *MoveBookRequest) String() string { return proto.CompactTextString(m) }
+func (*MoveBookRequest) ProtoMessage()    {}
+func (*MoveBookRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_library_e1452ae13084213f, []int{14}
+}
+func (m *MoveBookRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MoveBookRequest.Unmarshal(m, b)
+}
+func (m *MoveBookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MoveBookRequest.Marshal(b, m, deterministic)
+}
+func (dst *MoveBookRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MoveBookRequest.Merge(dst, src)
+}
+func (m *MoveBookRequest) XXX_Size() int {
+	return xxx_messageInfo_MoveBookRequest.Size(m)
+}
+func (m *MoveBookRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MoveBookRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MoveBookRequest proto.InternalMessageInfo
 
 func (m *MoveBookRequest) GetName() string {
 	if m != nil {
@@ -483,8 +790,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for LibraryService service
-
+// LibraryServiceClient is the client API for LibraryService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type LibraryServiceClient interface {
 	// Creates a shelf, and returns the new Shelf.
 	CreateShelf(ctx context.Context, in *CreateShelfRequest, opts ...grpc.CallOption) (*Shelf, error)
@@ -494,7 +802,7 @@ type LibraryServiceClient interface {
 	// shelves will not necessarily be added to the end of this list.
 	ListShelves(ctx context.Context, in *ListShelvesRequest, opts ...grpc.CallOption) (*ListShelvesResponse, error)
 	// Deletes a shelf. Returns NOT_FOUND if the shelf does not exist.
-	DeleteShelf(ctx context.Context, in *DeleteShelfRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteShelf(ctx context.Context, in *DeleteShelfRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Merges two shelves by adding all books from the shelf named
 	// `other_shelf_name` to shelf `name`, and deletes
 	// `other_shelf_name`. Returns the updated shelf.
@@ -512,7 +820,7 @@ type LibraryServiceClient interface {
 	// Returns NOT_FOUND if the shelf does not exist.
 	ListBooks(ctx context.Context, in *ListBooksRequest, opts ...grpc.CallOption) (*ListBooksResponse, error)
 	// Deletes a book. Returns NOT_FOUND if the book does not exist.
-	DeleteBook(ctx context.Context, in *DeleteBookRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteBook(ctx context.Context, in *DeleteBookRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Updates a book. Returns INVALID_ARGUMENT if the name of the book
 	// is non-empty and does equal the previous name.
 	UpdateBook(ctx context.Context, in *UpdateBookRequest, opts ...grpc.CallOption) (*Book, error)
@@ -531,7 +839,7 @@ func NewLibraryServiceClient(cc *grpc.ClientConn) LibraryServiceClient {
 
 func (c *libraryServiceClient) CreateShelf(ctx context.Context, in *CreateShelfRequest, opts ...grpc.CallOption) (*Shelf, error) {
 	out := new(Shelf)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/CreateShelf", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/CreateShelf", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -540,7 +848,7 @@ func (c *libraryServiceClient) CreateShelf(ctx context.Context, in *CreateShelfR
 
 func (c *libraryServiceClient) GetShelf(ctx context.Context, in *GetShelfRequest, opts ...grpc.CallOption) (*Shelf, error) {
 	out := new(Shelf)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/GetShelf", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/GetShelf", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -549,16 +857,16 @@ func (c *libraryServiceClient) GetShelf(ctx context.Context, in *GetShelfRequest
 
 func (c *libraryServiceClient) ListShelves(ctx context.Context, in *ListShelvesRequest, opts ...grpc.CallOption) (*ListShelvesResponse, error) {
 	out := new(ListShelvesResponse)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/ListShelves", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/ListShelves", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *libraryServiceClient) DeleteShelf(ctx context.Context, in *DeleteShelfRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/DeleteShelf", in, out, c.cc, opts...)
+func (c *libraryServiceClient) DeleteShelf(ctx context.Context, in *DeleteShelfRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/DeleteShelf", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -567,7 +875,7 @@ func (c *libraryServiceClient) DeleteShelf(ctx context.Context, in *DeleteShelfR
 
 func (c *libraryServiceClient) MergeShelves(ctx context.Context, in *MergeShelvesRequest, opts ...grpc.CallOption) (*Shelf, error) {
 	out := new(Shelf)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/MergeShelves", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/MergeShelves", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -576,7 +884,7 @@ func (c *libraryServiceClient) MergeShelves(ctx context.Context, in *MergeShelve
 
 func (c *libraryServiceClient) CreateBook(ctx context.Context, in *CreateBookRequest, opts ...grpc.CallOption) (*Book, error) {
 	out := new(Book)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/CreateBook", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/CreateBook", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -585,7 +893,7 @@ func (c *libraryServiceClient) CreateBook(ctx context.Context, in *CreateBookReq
 
 func (c *libraryServiceClient) GetBook(ctx context.Context, in *GetBookRequest, opts ...grpc.CallOption) (*Book, error) {
 	out := new(Book)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/GetBook", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/GetBook", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -594,16 +902,16 @@ func (c *libraryServiceClient) GetBook(ctx context.Context, in *GetBookRequest,
 
 func (c *libraryServiceClient) ListBooks(ctx context.Context, in *ListBooksRequest, opts ...grpc.CallOption) (*ListBooksResponse, error) {
 	out := new(ListBooksResponse)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/ListBooks", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/ListBooks", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *libraryServiceClient) DeleteBook(ctx context.Context, in *DeleteBookRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/DeleteBook", in, out, c.cc, opts...)
+func (c *libraryServiceClient) DeleteBook(ctx context.Context, in *DeleteBookRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/DeleteBook", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -612,7 +920,7 @@ func (c *libraryServiceClient) DeleteBook(ctx context.Context, in *DeleteBookReq
 
 func (c *libraryServiceClient) UpdateBook(ctx context.Context, in *UpdateBookRequest, opts ...grpc.CallOption) (*Book, error) {
 	out := new(Book)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/UpdateBook", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/UpdateBook", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -621,15 +929,14 @@ func (c *libraryServiceClient) UpdateBook(ctx context.Context, in *UpdateBookReq
 
 func (c *libraryServiceClient) MoveBook(ctx context.Context, in *MoveBookRequest, opts ...grpc.CallOption) (*Book, error) {
 	out := new(Book)
-	err := grpc.Invoke(ctx, "/google.example.library.v1.LibraryService/MoveBook", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.example.library.v1.LibraryService/MoveBook", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for LibraryService service
-
+// LibraryServiceServer is the server API for LibraryService service.
 type LibraryServiceServer interface {
 	// Creates a shelf, and returns the new Shelf.
 	CreateShelf(context.Context, *CreateShelfRequest) (*Shelf, error)
@@ -639,7 +946,7 @@ type LibraryServiceServer interface {
 	// shelves will not necessarily be added to the end of this list.
 	ListShelves(context.Context, *ListShelvesRequest) (*ListShelvesResponse, error)
 	// Deletes a shelf. Returns NOT_FOUND if the shelf does not exist.
-	DeleteShelf(context.Context, *DeleteShelfRequest) (*google_protobuf1.Empty, error)
+	DeleteShelf(context.Context, *DeleteShelfRequest) (*empty.Empty, error)
 	// Merges two shelves by adding all books from the shelf named
 	// `other_shelf_name` to shelf `name`, and deletes
 	// `other_shelf_name`. Returns the updated shelf.
@@ -657,7 +964,7 @@ type LibraryServiceServer interface {
 	// Returns NOT_FOUND if the shelf does not exist.
 	ListBooks(context.Context, *ListBooksRequest) (*ListBooksResponse, error)
 	// Deletes a book. Returns NOT_FOUND if the book does not exist.
-	DeleteBook(context.Context, *DeleteBookRequest) (*google_protobuf1.Empty, error)
+	DeleteBook(context.Context, *DeleteBookRequest) (*empty.Empty, error)
 	// Updates a book. Returns INVALID_ARGUMENT if the name of the book
 	// is non-empty and does equal the previous name.
 	UpdateBook(context.Context, *UpdateBookRequest) (*Book, error)
@@ -921,9 +1228,11 @@ var _LibraryService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/example/library/v1/library.proto",
 }
 
-func init() { proto.RegisterFile("google/example/library/v1/library.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/example/library/v1/library.proto", fileDescriptor_library_e1452ae13084213f)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_library_e1452ae13084213f = []byte{
 	// 838 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdb, 0x4e, 0xdb, 0x48,
 	0x18, 0x96, 0x21, 0x81, 0xf0, 0x87, 0x53, 0x06, 0x84, 0xb2, 0x26, 0x2c, 0xd9, 0x11, 0x87, 0x6c,
diff --git a/vendor/google.golang.org/genproto/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go b/vendor/google.golang.org/genproto/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
index 13914e22..9dcef66f 100644
--- a/vendor/google.golang.org/genproto/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/firestore/admin/v1beta1/firestore_admin.pb.go
@@ -1,33 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta1/firestore_admin.proto
 
-/*
-Package admin is a generated protocol buffer package.
-
-It is generated from these files:
-	google/firestore/admin/v1beta1/firestore_admin.proto
-	google/firestore/admin/v1beta1/index.proto
-
-It has these top-level messages:
-	IndexOperationMetadata
-	Progress
-	CreateIndexRequest
-	GetIndexRequest
-	ListIndexesRequest
-	DeleteIndexRequest
-	ListIndexesResponse
-	IndexField
-	Index
-*/
-package admin
+package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -68,43 +50,65 @@ func (x IndexOperationMetadata_OperationType) String() string {
 	return proto.EnumName(IndexOperationMetadata_OperationType_name, int32(x))
 }
 func (IndexOperationMetadata_OperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 0}
+	return fileDescriptor_firestore_admin_4aed9459ad95e423, []int{0, 0}
 }
 
 // Metadata for index operations. This metadata populates
 // the metadata field of [google.longrunning.Operation][google.longrunning.Operation].
 type IndexOperationMetadata struct {
 	// The time that work began on the operation.
-	StartTime *google_protobuf3.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time the operation ended, either successfully or otherwise. Unset if
 	// the operation is still active.
-	EndTime *google_protobuf3.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The index resource that this operation is acting on. For example:
 	// `projects/{project_id}/databases/{database_id}/indexes/{index_id}`
-	Index string `protobuf:"bytes,3,opt,name=index" json:"index,omitempty"`
+	Index string `protobuf:"bytes,3,opt,name=index,proto3" json:"index,omitempty"`
 	// The type of index operation.
-	OperationType IndexOperationMetadata_OperationType `protobuf:"varint,4,opt,name=operation_type,json=operationType,enum=google.firestore.admin.v1beta1.IndexOperationMetadata_OperationType" json:"operation_type,omitempty"`
+	OperationType IndexOperationMetadata_OperationType `protobuf:"varint,4,opt,name=operation_type,json=operationType,proto3,enum=google.firestore.admin.v1beta1.IndexOperationMetadata_OperationType" json:"operation_type,omitempty"`
 	// True if the [google.longrunning.Operation] was cancelled. If the
 	// cancellation is in progress, cancelled will be true but
 	// [google.longrunning.Operation.done][google.longrunning.Operation.done] will be false.
-	Cancelled bool `protobuf:"varint,5,opt,name=cancelled" json:"cancelled,omitempty"`
+	Cancelled bool `protobuf:"varint,5,opt,name=cancelled,proto3" json:"cancelled,omitempty"`
 	// Progress of the existing operation, measured in number of documents.
-	DocumentProgress *Progress `protobuf:"bytes,6,opt,name=document_progress,json=documentProgress" json:"document_progress,omitempty"`
+	DocumentProgress     *Progress `protobuf:"bytes,6,opt,name=document_progress,json=documentProgress,proto3" json:"document_progress,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *IndexOperationMetadata) Reset()                    { *m = IndexOperationMetadata{} }
-func (m *IndexOperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*IndexOperationMetadata) ProtoMessage()               {}
-func (*IndexOperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *IndexOperationMetadata) Reset()         { *m = IndexOperationMetadata{} }
+func (m *IndexOperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*IndexOperationMetadata) ProtoMessage()    {}
+func (*IndexOperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_admin_4aed9459ad95e423, []int{0}
+}
+func (m *IndexOperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IndexOperationMetadata.Unmarshal(m, b)
+}
+func (m *IndexOperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IndexOperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *IndexOperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IndexOperationMetadata.Merge(dst, src)
+}
+func (m *IndexOperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_IndexOperationMetadata.Size(m)
+}
+func (m *IndexOperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_IndexOperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_IndexOperationMetadata proto.InternalMessageInfo
 
-func (m *IndexOperationMetadata) GetStartTime() *google_protobuf3.Timestamp {
+func (m *IndexOperationMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *IndexOperationMetadata) GetEndTime() *google_protobuf3.Timestamp {
+func (m *IndexOperationMetadata) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -143,16 +147,38 @@ func (m *IndexOperationMetadata) GetDocumentProgress() *Progress {
 type Progress struct {
 	// An estimate of how much work has been completed. Note that this may be
 	// greater than `work_estimated`.
-	WorkCompleted int64 `protobuf:"varint,1,opt,name=work_completed,json=workCompleted" json:"work_completed,omitempty"`
+	WorkCompleted int64 `protobuf:"varint,1,opt,name=work_completed,json=workCompleted,proto3" json:"work_completed,omitempty"`
 	// An estimate of how much work needs to be performed. Zero if the
 	// work estimate is unavailable. May change as work progresses.
-	WorkEstimated int64 `protobuf:"varint,2,opt,name=work_estimated,json=workEstimated" json:"work_estimated,omitempty"`
+	WorkEstimated        int64    `protobuf:"varint,2,opt,name=work_estimated,json=workEstimated,proto3" json:"work_estimated,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Progress) Reset()         { *m = Progress{} }
+func (m *Progress) String() string { return proto.CompactTextString(m) }
+func (*Progress) ProtoMessage()    {}
+func (*Progress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_admin_4aed9459ad95e423, []int{1}
+}
+func (m *Progress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Progress.Unmarshal(m, b)
+}
+func (m *Progress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Progress.Marshal(b, m, deterministic)
+}
+func (dst *Progress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Progress.Merge(dst, src)
+}
+func (m *Progress) XXX_Size() int {
+	return xxx_messageInfo_Progress.Size(m)
+}
+func (m *Progress) XXX_DiscardUnknown() {
+	xxx_messageInfo_Progress.DiscardUnknown(m)
 }
 
-func (m *Progress) Reset()                    { *m = Progress{} }
-func (m *Progress) String() string            { return proto.CompactTextString(m) }
-func (*Progress) ProtoMessage()               {}
-func (*Progress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Progress proto.InternalMessageInfo
 
 func (m *Progress) GetWorkCompleted() int64 {
 	if m != nil {
@@ -172,16 +198,38 @@ func (m *Progress) GetWorkEstimated() int64 {
 type CreateIndexRequest struct {
 	// The name of the database this index will apply to. For example:
 	// `projects/{project_id}/databases/{database_id}`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The index to create. The name and state fields are output only and will be
 	// ignored. Certain single field indexes cannot be created or deleted.
-	Index *Index `protobuf:"bytes,2,opt,name=index" json:"index,omitempty"`
+	Index                *Index   `protobuf:"bytes,2,opt,name=index,proto3" json:"index,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateIndexRequest) Reset()                    { *m = CreateIndexRequest{} }
-func (m *CreateIndexRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateIndexRequest) ProtoMessage()               {}
-func (*CreateIndexRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *CreateIndexRequest) Reset()         { *m = CreateIndexRequest{} }
+func (m *CreateIndexRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateIndexRequest) ProtoMessage()    {}
+func (*CreateIndexRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_admin_4aed9459ad95e423, []int{2}
+}
+func (m *CreateIndexRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateIndexRequest.Unmarshal(m, b)
+}
+func (m *CreateIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateIndexRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateIndexRequest.Merge(dst, src)
+}
+func (m *CreateIndexRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateIndexRequest.Size(m)
+}
+func (m *CreateIndexRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateIndexRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateIndexRequest proto.InternalMessageInfo
 
 func (m *CreateIndexRequest) GetParent() string {
 	if m != nil {
@@ -201,13 +249,35 @@ func (m *CreateIndexRequest) GetIndex() *Index {
 type GetIndexRequest struct {
 	// The name of the index. For example:
 	// `projects/{project_id}/databases/{database_id}/indexes/{index_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetIndexRequest) Reset()                    { *m = GetIndexRequest{} }
-func (m *GetIndexRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetIndexRequest) ProtoMessage()               {}
-func (*GetIndexRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *GetIndexRequest) Reset()         { *m = GetIndexRequest{} }
+func (m *GetIndexRequest) String() string { return proto.CompactTextString(m) }
+func (*GetIndexRequest) ProtoMessage()    {}
+func (*GetIndexRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_admin_4aed9459ad95e423, []int{3}
+}
+func (m *GetIndexRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetIndexRequest.Unmarshal(m, b)
+}
+func (m *GetIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetIndexRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIndexRequest.Merge(dst, src)
+}
+func (m *GetIndexRequest) XXX_Size() int {
+	return xxx_messageInfo_GetIndexRequest.Size(m)
+}
+func (m *GetIndexRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetIndexRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetIndexRequest proto.InternalMessageInfo
 
 func (m *GetIndexRequest) GetName() string {
 	if m != nil {
@@ -220,18 +290,40 @@ func (m *GetIndexRequest) GetName() string {
 type ListIndexesRequest struct {
 	// The database name. For example:
 	// `projects/{project_id}/databases/{database_id}`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The standard List page size.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The standard List page token.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListIndexesRequest) Reset()                    { *m = ListIndexesRequest{} }
-func (m *ListIndexesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListIndexesRequest) ProtoMessage()               {}
-func (*ListIndexesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ListIndexesRequest) Reset()         { *m = ListIndexesRequest{} }
+func (m *ListIndexesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListIndexesRequest) ProtoMessage()    {}
+func (*ListIndexesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_admin_4aed9459ad95e423, []int{4}
+}
+func (m *ListIndexesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListIndexesRequest.Unmarshal(m, b)
+}
+func (m *ListIndexesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListIndexesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListIndexesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesRequest.Merge(dst, src)
+}
+func (m *ListIndexesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListIndexesRequest.Size(m)
+}
+func (m *ListIndexesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListIndexesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListIndexesRequest proto.InternalMessageInfo
 
 func (m *ListIndexesRequest) GetParent() string {
 	if m != nil {
@@ -265,13 +357,35 @@ func (m *ListIndexesRequest) GetPageToken() string {
 type DeleteIndexRequest struct {
 	// The index name. For example:
 	// `projects/{project_id}/databases/{database_id}/indexes/{index_id}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteIndexRequest) Reset()                    { *m = DeleteIndexRequest{} }
-func (m *DeleteIndexRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteIndexRequest) ProtoMessage()               {}
-func (*DeleteIndexRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *DeleteIndexRequest) Reset()         { *m = DeleteIndexRequest{} }
+func (m *DeleteIndexRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteIndexRequest) ProtoMessage()    {}
+func (*DeleteIndexRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_admin_4aed9459ad95e423, []int{5}
+}
+func (m *DeleteIndexRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteIndexRequest.Unmarshal(m, b)
+}
+func (m *DeleteIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteIndexRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteIndexRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteIndexRequest.Merge(dst, src)
+}
+func (m *DeleteIndexRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteIndexRequest.Size(m)
+}
+func (m *DeleteIndexRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteIndexRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteIndexRequest proto.InternalMessageInfo
 
 func (m *DeleteIndexRequest) GetName() string {
 	if m != nil {
@@ -283,15 +397,37 @@ func (m *DeleteIndexRequest) GetName() string {
 // The response for [FirestoreAdmin.ListIndexes][google.firestore.admin.v1beta1.FirestoreAdmin.ListIndexes].
 type ListIndexesResponse struct {
 	// The indexes.
-	Indexes []*Index `protobuf:"bytes,1,rep,name=indexes" json:"indexes,omitempty"`
+	Indexes []*Index `protobuf:"bytes,1,rep,name=indexes,proto3" json:"indexes,omitempty"`
 	// The standard List next-page token.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListIndexesResponse) Reset()         { *m = ListIndexesResponse{} }
+func (m *ListIndexesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListIndexesResponse) ProtoMessage()    {}
+func (*ListIndexesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_admin_4aed9459ad95e423, []int{6}
+}
+func (m *ListIndexesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListIndexesResponse.Unmarshal(m, b)
+}
+func (m *ListIndexesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListIndexesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListIndexesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListIndexesResponse.Merge(dst, src)
+}
+func (m *ListIndexesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListIndexesResponse.Size(m)
+}
+func (m *ListIndexesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListIndexesResponse.DiscardUnknown(m)
 }
 
-func (m *ListIndexesResponse) Reset()                    { *m = ListIndexesResponse{} }
-func (m *ListIndexesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListIndexesResponse) ProtoMessage()               {}
-func (*ListIndexesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ListIndexesResponse proto.InternalMessageInfo
 
 func (m *ListIndexesResponse) GetIndexes() []*Index {
 	if m != nil {
@@ -326,8 +462,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for FirestoreAdmin service
-
+// FirestoreAdminClient is the client API for FirestoreAdmin service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type FirestoreAdminClient interface {
 	// Creates the specified index.
 	// A newly created index's initial state is `CREATING`. On completion of the
@@ -342,13 +479,13 @@ type FirestoreAdminClient interface {
 	// [create][google.firestore.admin.v1beta1.FirestoreAdmin.CreateIndex].
 	//
 	// Indexes with a single field cannot be created.
-	CreateIndex(ctx context.Context, in *CreateIndexRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateIndex(ctx context.Context, in *CreateIndexRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Lists the indexes that match the specified filters.
 	ListIndexes(ctx context.Context, in *ListIndexesRequest, opts ...grpc.CallOption) (*ListIndexesResponse, error)
 	// Gets an index.
 	GetIndex(ctx context.Context, in *GetIndexRequest, opts ...grpc.CallOption) (*Index, error)
 	// Deletes an index.
-	DeleteIndex(ctx context.Context, in *DeleteIndexRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteIndex(ctx context.Context, in *DeleteIndexRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type firestoreAdminClient struct {
@@ -359,9 +496,9 @@ func NewFirestoreAdminClient(cc *grpc.ClientConn) FirestoreAdminClient {
 	return &firestoreAdminClient{cc}
 }
 
-func (c *firestoreAdminClient) CreateIndex(ctx context.Context, in *CreateIndexRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.firestore.admin.v1beta1.FirestoreAdmin/CreateIndex", in, out, c.cc, opts...)
+func (c *firestoreAdminClient) CreateIndex(ctx context.Context, in *CreateIndexRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.firestore.admin.v1beta1.FirestoreAdmin/CreateIndex", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -370,7 +507,7 @@ func (c *firestoreAdminClient) CreateIndex(ctx context.Context, in *CreateIndexR
 
 func (c *firestoreAdminClient) ListIndexes(ctx context.Context, in *ListIndexesRequest, opts ...grpc.CallOption) (*ListIndexesResponse, error) {
 	out := new(ListIndexesResponse)
-	err := grpc.Invoke(ctx, "/google.firestore.admin.v1beta1.FirestoreAdmin/ListIndexes", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.admin.v1beta1.FirestoreAdmin/ListIndexes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -379,24 +516,23 @@ func (c *firestoreAdminClient) ListIndexes(ctx context.Context, in *ListIndexesR
 
 func (c *firestoreAdminClient) GetIndex(ctx context.Context, in *GetIndexRequest, opts ...grpc.CallOption) (*Index, error) {
 	out := new(Index)
-	err := grpc.Invoke(ctx, "/google.firestore.admin.v1beta1.FirestoreAdmin/GetIndex", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.admin.v1beta1.FirestoreAdmin/GetIndex", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *firestoreAdminClient) DeleteIndex(ctx context.Context, in *DeleteIndexRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.firestore.admin.v1beta1.FirestoreAdmin/DeleteIndex", in, out, c.cc, opts...)
+func (c *firestoreAdminClient) DeleteIndex(ctx context.Context, in *DeleteIndexRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.firestore.admin.v1beta1.FirestoreAdmin/DeleteIndex", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for FirestoreAdmin service
-
+// FirestoreAdminServer is the server API for FirestoreAdmin service.
 type FirestoreAdminServer interface {
 	// Creates the specified index.
 	// A newly created index's initial state is `CREATING`. On completion of the
@@ -411,13 +547,13 @@ type FirestoreAdminServer interface {
 	// [create][google.firestore.admin.v1beta1.FirestoreAdmin.CreateIndex].
 	//
 	// Indexes with a single field cannot be created.
-	CreateIndex(context.Context, *CreateIndexRequest) (*google_longrunning.Operation, error)
+	CreateIndex(context.Context, *CreateIndexRequest) (*longrunning.Operation, error)
 	// Lists the indexes that match the specified filters.
 	ListIndexes(context.Context, *ListIndexesRequest) (*ListIndexesResponse, error)
 	// Gets an index.
 	GetIndex(context.Context, *GetIndexRequest) (*Index, error)
 	// Deletes an index.
-	DeleteIndex(context.Context, *DeleteIndexRequest) (*google_protobuf2.Empty, error)
+	DeleteIndex(context.Context, *DeleteIndexRequest) (*empty.Empty, error)
 }
 
 func RegisterFirestoreAdminServer(s *grpc.Server, srv FirestoreAdminServer) {
@@ -522,10 +658,10 @@ var _FirestoreAdmin_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/firestore/admin/v1beta1/firestore_admin.proto", fileDescriptor0)
+	proto.RegisterFile("google/firestore/admin/v1beta1/firestore_admin.proto", fileDescriptor_firestore_admin_4aed9459ad95e423)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_firestore_admin_4aed9459ad95e423 = []byte{
 	// 841 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0xc6, 0xe9, 0xcf, 0x26, 0xa7, 0x6a, 0xb6, 0xcc, 0xa2, 0x2a, 0xf2, 0xfe, 0x10, 0x19, 0x8a,
diff --git a/vendor/google.golang.org/genproto/googleapis/firestore/admin/v1beta1/index.pb.go b/vendor/google.golang.org/genproto/googleapis/firestore/admin/v1beta1/index.pb.go
index 609b679c..c75a0cf3 100644
--- a/vendor/google.golang.org/genproto/googleapis/firestore/admin/v1beta1/index.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/firestore/admin/v1beta1/index.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/admin/v1beta1/index.proto
 
-package admin
+package admin // import "google.golang.org/genproto/googleapis/firestore/admin/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The mode determines how a field is indexed.
 type IndexField_Mode int32
 
@@ -41,7 +47,9 @@ var IndexField_Mode_value = map[string]int32{
 func (x IndexField_Mode) String() string {
 	return proto.EnumName(IndexField_Mode_name, int32(x))
 }
-func (IndexField_Mode) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (IndexField_Mode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_index_8502697994912cbb, []int{0, 0}
+}
 
 // The state of an index. During index creation, an index will be in the
 // `CREATING` state. If the index is created successfully, it will transition
@@ -85,7 +93,9 @@ var Index_State_value = map[string]int32{
 func (x Index_State) String() string {
 	return proto.EnumName(Index_State_name, int32(x))
 }
-func (Index_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} }
+func (Index_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_index_8502697994912cbb, []int{1, 0}
+}
 
 // A field of an index.
 type IndexField struct {
@@ -93,15 +103,37 @@ type IndexField struct {
 	// by [google.firestore.v1beta1.Document.fields][fields].
 	// Special field path `__name__` may be used by itself or at the end of a
 	// path. `__type__` may be used only at the end of path.
-	FieldPath string `protobuf:"bytes,1,opt,name=field_path,json=fieldPath" json:"field_path,omitempty"`
+	FieldPath string `protobuf:"bytes,1,opt,name=field_path,json=fieldPath,proto3" json:"field_path,omitempty"`
 	// The field's mode.
-	Mode IndexField_Mode `protobuf:"varint,2,opt,name=mode,enum=google.firestore.admin.v1beta1.IndexField_Mode" json:"mode,omitempty"`
+	Mode                 IndexField_Mode `protobuf:"varint,2,opt,name=mode,proto3,enum=google.firestore.admin.v1beta1.IndexField_Mode" json:"mode,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *IndexField) Reset()         { *m = IndexField{} }
+func (m *IndexField) String() string { return proto.CompactTextString(m) }
+func (*IndexField) ProtoMessage()    {}
+func (*IndexField) Descriptor() ([]byte, []int) {
+	return fileDescriptor_index_8502697994912cbb, []int{0}
+}
+func (m *IndexField) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_IndexField.Unmarshal(m, b)
+}
+func (m *IndexField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_IndexField.Marshal(b, m, deterministic)
+}
+func (dst *IndexField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IndexField.Merge(dst, src)
+}
+func (m *IndexField) XXX_Size() int {
+	return xxx_messageInfo_IndexField.Size(m)
+}
+func (m *IndexField) XXX_DiscardUnknown() {
+	xxx_messageInfo_IndexField.DiscardUnknown(m)
 }
 
-func (m *IndexField) Reset()                    { *m = IndexField{} }
-func (m *IndexField) String() string            { return proto.CompactTextString(m) }
-func (*IndexField) ProtoMessage()               {}
-func (*IndexField) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_IndexField proto.InternalMessageInfo
 
 func (m *IndexField) GetFieldPath() string {
 	if m != nil {
@@ -121,20 +153,42 @@ func (m *IndexField) GetMode() IndexField_Mode {
 type Index struct {
 	// The resource name of the index.
 	// Output only.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The collection ID to which this index applies. Required.
-	CollectionId string `protobuf:"bytes,2,opt,name=collection_id,json=collectionId" json:"collection_id,omitempty"`
+	CollectionId string `protobuf:"bytes,2,opt,name=collection_id,json=collectionId,proto3" json:"collection_id,omitempty"`
 	// The fields to index.
-	Fields []*IndexField `protobuf:"bytes,3,rep,name=fields" json:"fields,omitempty"`
+	Fields []*IndexField `protobuf:"bytes,3,rep,name=fields,proto3" json:"fields,omitempty"`
 	// The state of the index.
 	// Output only.
-	State Index_State `protobuf:"varint,6,opt,name=state,enum=google.firestore.admin.v1beta1.Index_State" json:"state,omitempty"`
+	State                Index_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.firestore.admin.v1beta1.Index_State" json:"state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *Index) Reset()                    { *m = Index{} }
-func (m *Index) String() string            { return proto.CompactTextString(m) }
-func (*Index) ProtoMessage()               {}
-func (*Index) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *Index) Reset()         { *m = Index{} }
+func (m *Index) String() string { return proto.CompactTextString(m) }
+func (*Index) ProtoMessage()    {}
+func (*Index) Descriptor() ([]byte, []int) {
+	return fileDescriptor_index_8502697994912cbb, []int{1}
+}
+func (m *Index) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Index.Unmarshal(m, b)
+}
+func (m *Index) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Index.Marshal(b, m, deterministic)
+}
+func (dst *Index) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Index.Merge(dst, src)
+}
+func (m *Index) XXX_Size() int {
+	return xxx_messageInfo_Index.Size(m)
+}
+func (m *Index) XXX_DiscardUnknown() {
+	xxx_messageInfo_Index.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Index proto.InternalMessageInfo
 
 func (m *Index) GetName() string {
 	if m != nil {
@@ -171,9 +225,11 @@ func init() {
 	proto.RegisterEnum("google.firestore.admin.v1beta1.Index_State", Index_State_name, Index_State_value)
 }
 
-func init() { proto.RegisterFile("google/firestore/admin/v1beta1/index.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/firestore/admin/v1beta1/index.proto", fileDescriptor_index_8502697994912cbb)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_index_8502697994912cbb = []byte{
 	// 422 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x4f, 0x8b, 0x13, 0x31,
 	0x1c, 0x75, 0xa6, 0x9d, 0xe2, 0xfc, 0xdc, 0x5d, 0xc6, 0xa0, 0x50, 0x44, 0xa5, 0x8c, 0x1e, 0xca,
diff --git a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/common.pb.go b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/common.pb.go
index 51b0b903..268efd47 100644
--- a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/common.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/common.pb.go
@@ -1,64 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/common.proto
 
-/*
-Package firestore is a generated protocol buffer package.
-
-It is generated from these files:
-	google/firestore/v1beta1/common.proto
-	google/firestore/v1beta1/document.proto
-	google/firestore/v1beta1/firestore.proto
-	google/firestore/v1beta1/query.proto
-	google/firestore/v1beta1/write.proto
-
-It has these top-level messages:
-	DocumentMask
-	Precondition
-	TransactionOptions
-	Document
-	Value
-	ArrayValue
-	MapValue
-	GetDocumentRequest
-	ListDocumentsRequest
-	ListDocumentsResponse
-	CreateDocumentRequest
-	UpdateDocumentRequest
-	DeleteDocumentRequest
-	BatchGetDocumentsRequest
-	BatchGetDocumentsResponse
-	BeginTransactionRequest
-	BeginTransactionResponse
-	CommitRequest
-	CommitResponse
-	RollbackRequest
-	RunQueryRequest
-	RunQueryResponse
-	WriteRequest
-	WriteResponse
-	ListenRequest
-	ListenResponse
-	Target
-	TargetChange
-	ListCollectionIdsRequest
-	ListCollectionIdsResponse
-	StructuredQuery
-	Cursor
-	Write
-	DocumentTransform
-	WriteResult
-	DocumentChange
-	DocumentDelete
-	DocumentRemove
-	ExistenceFilter
-*/
-package firestore
+package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -79,13 +28,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type DocumentMask struct {
 	// The list of field paths in the mask. See [Document.fields][google.firestore.v1beta1.Document.fields] for a field
 	// path syntax reference.
-	FieldPaths []string `protobuf:"bytes,1,rep,name=field_paths,json=fieldPaths" json:"field_paths,omitempty"`
+	FieldPaths           []string `protobuf:"bytes,1,rep,name=field_paths,json=fieldPaths,proto3" json:"field_paths,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DocumentMask) Reset()                    { *m = DocumentMask{} }
-func (m *DocumentMask) String() string            { return proto.CompactTextString(m) }
-func (*DocumentMask) ProtoMessage()               {}
-func (*DocumentMask) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *DocumentMask) Reset()         { *m = DocumentMask{} }
+func (m *DocumentMask) String() string { return proto.CompactTextString(m) }
+func (*DocumentMask) ProtoMessage()    {}
+func (*DocumentMask) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_0837eaa712bfb362, []int{0}
+}
+func (m *DocumentMask) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DocumentMask.Unmarshal(m, b)
+}
+func (m *DocumentMask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DocumentMask.Marshal(b, m, deterministic)
+}
+func (dst *DocumentMask) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentMask.Merge(dst, src)
+}
+func (m *DocumentMask) XXX_Size() int {
+	return xxx_messageInfo_DocumentMask.Size(m)
+}
+func (m *DocumentMask) XXX_DiscardUnknown() {
+	xxx_messageInfo_DocumentMask.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DocumentMask proto.InternalMessageInfo
 
 func (m *DocumentMask) GetFieldPaths() []string {
 	if m != nil {
@@ -101,26 +72,50 @@ type Precondition struct {
 	// Types that are valid to be assigned to ConditionType:
 	//	*Precondition_Exists
 	//	*Precondition_UpdateTime
-	ConditionType isPrecondition_ConditionType `protobuf_oneof:"condition_type"`
+	ConditionType        isPrecondition_ConditionType `protobuf_oneof:"condition_type"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
 }
 
-func (m *Precondition) Reset()                    { *m = Precondition{} }
-func (m *Precondition) String() string            { return proto.CompactTextString(m) }
-func (*Precondition) ProtoMessage()               {}
-func (*Precondition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Precondition) Reset()         { *m = Precondition{} }
+func (m *Precondition) String() string { return proto.CompactTextString(m) }
+func (*Precondition) ProtoMessage()    {}
+func (*Precondition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_0837eaa712bfb362, []int{1}
+}
+func (m *Precondition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Precondition.Unmarshal(m, b)
+}
+func (m *Precondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Precondition.Marshal(b, m, deterministic)
+}
+func (dst *Precondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Precondition.Merge(dst, src)
+}
+func (m *Precondition) XXX_Size() int {
+	return xxx_messageInfo_Precondition.Size(m)
+}
+func (m *Precondition) XXX_DiscardUnknown() {
+	xxx_messageInfo_Precondition.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Precondition proto.InternalMessageInfo
 
 type isPrecondition_ConditionType interface {
 	isPrecondition_ConditionType()
 }
 
 type Precondition_Exists struct {
-	Exists bool `protobuf:"varint,1,opt,name=exists,oneof"`
+	Exists bool `protobuf:"varint,1,opt,name=exists,proto3,oneof"`
 }
+
 type Precondition_UpdateTime struct {
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,oneof"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3,oneof"`
 }
 
-func (*Precondition_Exists) isPrecondition_ConditionType()     {}
+func (*Precondition_Exists) isPrecondition_ConditionType() {}
+
 func (*Precondition_UpdateTime) isPrecondition_ConditionType() {}
 
 func (m *Precondition) GetConditionType() isPrecondition_ConditionType {
@@ -137,7 +132,7 @@ func (m *Precondition) GetExists() bool {
 	return false
 }
 
-func (m *Precondition) GetUpdateTime() *google_protobuf1.Timestamp {
+func (m *Precondition) GetUpdateTime() *timestamp.Timestamp {
 	if x, ok := m.GetConditionType().(*Precondition_UpdateTime); ok {
 		return x.UpdateTime
 	}
@@ -189,7 +184,7 @@ func _Precondition_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.B
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ConditionType = &Precondition_UpdateTime{msg}
 		return true, err
@@ -203,11 +198,11 @@ func _Precondition_OneofSizer(msg proto.Message) (n int) {
 	// condition_type
 	switch x := m.ConditionType.(type) {
 	case *Precondition_Exists:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *Precondition_UpdateTime:
 		s := proto.Size(x.UpdateTime)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -224,26 +219,50 @@ type TransactionOptions struct {
 	// Types that are valid to be assigned to Mode:
 	//	*TransactionOptions_ReadOnly_
 	//	*TransactionOptions_ReadWrite_
-	Mode isTransactionOptions_Mode `protobuf_oneof:"mode"`
+	Mode                 isTransactionOptions_Mode `protobuf_oneof:"mode"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *TransactionOptions) Reset()                    { *m = TransactionOptions{} }
-func (m *TransactionOptions) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions) ProtoMessage()               {}
-func (*TransactionOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
+func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions) ProtoMessage()    {}
+func (*TransactionOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_0837eaa712bfb362, []int{2}
+}
+func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
+}
+func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+}
+func (m *TransactionOptions) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions.Size(m)
+}
+func (m *TransactionOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransactionOptions proto.InternalMessageInfo
 
 type isTransactionOptions_Mode interface {
 	isTransactionOptions_Mode()
 }
 
 type TransactionOptions_ReadOnly_ struct {
-	ReadOnly *TransactionOptions_ReadOnly `protobuf:"bytes,2,opt,name=read_only,json=readOnly,oneof"`
+	ReadOnly *TransactionOptions_ReadOnly `protobuf:"bytes,2,opt,name=read_only,json=readOnly,proto3,oneof"`
 }
+
 type TransactionOptions_ReadWrite_ struct {
-	ReadWrite *TransactionOptions_ReadWrite `protobuf:"bytes,3,opt,name=read_write,json=readWrite,oneof"`
+	ReadWrite *TransactionOptions_ReadWrite `protobuf:"bytes,3,opt,name=read_write,json=readWrite,proto3,oneof"`
 }
 
-func (*TransactionOptions_ReadOnly_) isTransactionOptions_Mode()  {}
+func (*TransactionOptions_ReadOnly_) isTransactionOptions_Mode() {}
+
 func (*TransactionOptions_ReadWrite_) isTransactionOptions_Mode() {}
 
 func (m *TransactionOptions) GetMode() isTransactionOptions_Mode {
@@ -326,12 +345,12 @@ func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Mode.(type) {
 	case *TransactionOptions_ReadOnly_:
 		s := proto.Size(x.ReadOnly)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransactionOptions_ReadWrite_:
 		s := proto.Size(x.ReadWrite)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -344,13 +363,35 @@ func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
 // Options for a transaction that can be used to read and write documents.
 type TransactionOptions_ReadWrite struct {
 	// An optional transaction to retry.
-	RetryTransaction []byte `protobuf:"bytes,1,opt,name=retry_transaction,json=retryTransaction,proto3" json:"retry_transaction,omitempty"`
+	RetryTransaction     []byte   `protobuf:"bytes,1,opt,name=retry_transaction,json=retryTransaction,proto3" json:"retry_transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions_ReadWrite{} }
+func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
+func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_0837eaa712bfb362, []int{2, 0}
+}
+func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
+}
+func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+}
+func (m *TransactionOptions_ReadWrite) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
+}
+func (m *TransactionOptions_ReadWrite) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions_ReadWrite.DiscardUnknown(m)
 }
 
-func (m *TransactionOptions_ReadWrite) Reset()                    { *m = TransactionOptions_ReadWrite{} }
-func (m *TransactionOptions_ReadWrite) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions_ReadWrite) ProtoMessage()               {}
-func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+var xxx_messageInfo_TransactionOptions_ReadWrite proto.InternalMessageInfo
 
 func (m *TransactionOptions_ReadWrite) GetRetryTransaction() []byte {
 	if m != nil {
@@ -366,20 +407,42 @@ type TransactionOptions_ReadOnly struct {
 	//
 	// Types that are valid to be assigned to ConsistencySelector:
 	//	*TransactionOptions_ReadOnly_ReadTime
-	ConsistencySelector isTransactionOptions_ReadOnly_ConsistencySelector `protobuf_oneof:"consistency_selector"`
+	ConsistencySelector  isTransactionOptions_ReadOnly_ConsistencySelector `protobuf_oneof:"consistency_selector"`
+	XXX_NoUnkeyedLiteral struct{}                                          `json:"-"`
+	XXX_unrecognized     []byte                                            `json:"-"`
+	XXX_sizecache        int32                                             `json:"-"`
+}
+
+func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_ReadOnly{} }
+func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
+func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_0837eaa712bfb362, []int{2, 1}
+}
+func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
+}
+func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+}
+func (m *TransactionOptions_ReadOnly) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
+}
+func (m *TransactionOptions_ReadOnly) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions_ReadOnly.DiscardUnknown(m)
 }
 
-func (m *TransactionOptions_ReadOnly) Reset()                    { *m = TransactionOptions_ReadOnly{} }
-func (m *TransactionOptions_ReadOnly) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions_ReadOnly) ProtoMessage()               {}
-func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
+var xxx_messageInfo_TransactionOptions_ReadOnly proto.InternalMessageInfo
 
 type isTransactionOptions_ReadOnly_ConsistencySelector interface {
 	isTransactionOptions_ReadOnly_ConsistencySelector()
 }
 
 type TransactionOptions_ReadOnly_ReadTime struct {
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,oneof"`
+	ReadTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3,oneof"`
 }
 
 func (*TransactionOptions_ReadOnly_ReadTime) isTransactionOptions_ReadOnly_ConsistencySelector() {}
@@ -391,7 +454,7 @@ func (m *TransactionOptions_ReadOnly) GetConsistencySelector() isTransactionOpti
 	return nil
 }
 
-func (m *TransactionOptions_ReadOnly) GetReadTime() *google_protobuf1.Timestamp {
+func (m *TransactionOptions_ReadOnly) GetReadTime() *timestamp.Timestamp {
 	if x, ok := m.GetConsistencySelector().(*TransactionOptions_ReadOnly_ReadTime); ok {
 		return x.ReadTime
 	}
@@ -428,7 +491,7 @@ func _TransactionOptions_ReadOnly_OneofUnmarshaler(msg proto.Message, tag, wire
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ConsistencySelector = &TransactionOptions_ReadOnly_ReadTime{msg}
 		return true, err
@@ -443,7 +506,7 @@ func _TransactionOptions_ReadOnly_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.ConsistencySelector.(type) {
 	case *TransactionOptions_ReadOnly_ReadTime:
 		s := proto.Size(x.ReadTime)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -461,9 +524,11 @@ func init() {
 	proto.RegisterType((*TransactionOptions_ReadOnly)(nil), "google.firestore.v1beta1.TransactionOptions.ReadOnly")
 }
 
-func init() { proto.RegisterFile("google/firestore/v1beta1/common.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/firestore/v1beta1/common.proto", fileDescriptor_common_0837eaa712bfb362)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_common_0837eaa712bfb362 = []byte{
 	// 468 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xef, 0x8a, 0xd3, 0x40,
 	0x10, 0x6f, 0x7a, 0xc7, 0xd1, 0x4e, 0x8b, 0x9c, 0x41, 0x24, 0x84, 0xc3, 0x3b, 0x0a, 0x42, 0x41,
diff --git a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/document.pb.go b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/document.pb.go
index d30f25a2..6375229b 100644
--- a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/document.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/document.pb.go
@@ -1,28 +1,34 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/document.proto
 
-package firestore
+package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
-import google_type "google.golang.org/genproto/googleapis/type/latlng"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A Firestore document.
 //
 // Must not exceed 1 MiB - 4 bytes.
 type Document struct {
 	// The resource name of the document, for example
 	// `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The document's fields.
 	//
 	// The map keys represent field names.
@@ -47,25 +53,47 @@ type Document struct {
 	// may contain any character. Some characters, including `` ` ``, must be
 	// escaped using a `\`. For example, `` `x&y` `` represents `x&y` and
 	// `` `bak\`tik` `` represents `` bak`tik ``.
-	Fields map[string]*Value `protobuf:"bytes,2,rep,name=fields" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Fields map[string]*Value `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. The time at which the document was created.
 	//
 	// This value increases monotonically when a document is deleted then
 	// recreated. It can also be compared to values from other documents and
 	// the `read_time` of a query.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which the document was last changed.
 	//
 	// This value is initally set to the `create_time` then increases
 	// monotonically with each change to the document. It can also be
 	// compared to values from other documents and the `read_time` of a query.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *Document) Reset()                    { *m = Document{} }
-func (m *Document) String() string            { return proto.CompactTextString(m) }
-func (*Document) ProtoMessage()               {}
-func (*Document) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *Document) Reset()         { *m = Document{} }
+func (m *Document) String() string { return proto.CompactTextString(m) }
+func (*Document) ProtoMessage()    {}
+func (*Document) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_0cab453ff2a9f3d2, []int{0}
+}
+func (m *Document) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Document.Unmarshal(m, b)
+}
+func (m *Document) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Document.Marshal(b, m, deterministic)
+}
+func (dst *Document) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Document.Merge(dst, src)
+}
+func (m *Document) XXX_Size() int {
+	return xxx_messageInfo_Document.Size(m)
+}
+func (m *Document) XXX_DiscardUnknown() {
+	xxx_messageInfo_Document.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Document proto.InternalMessageInfo
 
 func (m *Document) GetName() string {
 	if m != nil {
@@ -81,14 +109,14 @@ func (m *Document) GetFields() map[string]*Value {
 	return nil
 }
 
-func (m *Document) GetCreateTime() *google_protobuf1.Timestamp {
+func (m *Document) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Document) GetUpdateTime() *google_protobuf1.Timestamp {
+func (m *Document) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -111,63 +139,105 @@ type Value struct {
 	//	*Value_GeoPointValue
 	//	*Value_ArrayValue
 	//	*Value_MapValue
-	ValueType isValue_ValueType `protobuf_oneof:"value_type"`
+	ValueType            isValue_ValueType `protobuf_oneof:"value_type"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Value) Reset()         { *m = Value{} }
+func (m *Value) String() string { return proto.CompactTextString(m) }
+func (*Value) ProtoMessage()    {}
+func (*Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_0cab453ff2a9f3d2, []int{1}
+}
+func (m *Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Value.Unmarshal(m, b)
+}
+func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
+}
+func (dst *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(dst, src)
+}
+func (m *Value) XXX_Size() int {
+	return xxx_messageInfo_Value.Size(m)
+}
+func (m *Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_Value.DiscardUnknown(m)
 }
 
-func (m *Value) Reset()                    { *m = Value{} }
-func (m *Value) String() string            { return proto.CompactTextString(m) }
-func (*Value) ProtoMessage()               {}
-func (*Value) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_Value proto.InternalMessageInfo
 
 type isValue_ValueType interface {
 	isValue_ValueType()
 }
 
 type Value_NullValue struct {
-	NullValue google_protobuf2.NullValue `protobuf:"varint,11,opt,name=null_value,json=nullValue,enum=google.protobuf.NullValue,oneof"`
+	NullValue _struct.NullValue `protobuf:"varint,11,opt,name=null_value,json=nullValue,proto3,enum=google.protobuf.NullValue,oneof"`
 }
+
 type Value_BooleanValue struct {
-	BooleanValue bool `protobuf:"varint,1,opt,name=boolean_value,json=booleanValue,oneof"`
+	BooleanValue bool `protobuf:"varint,1,opt,name=boolean_value,json=booleanValue,proto3,oneof"`
 }
+
 type Value_IntegerValue struct {
-	IntegerValue int64 `protobuf:"varint,2,opt,name=integer_value,json=integerValue,oneof"`
+	IntegerValue int64 `protobuf:"varint,2,opt,name=integer_value,json=integerValue,proto3,oneof"`
 }
+
 type Value_DoubleValue struct {
-	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,oneof"`
+	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,proto3,oneof"`
 }
+
 type Value_TimestampValue struct {
-	TimestampValue *google_protobuf1.Timestamp `protobuf:"bytes,10,opt,name=timestamp_value,json=timestampValue,oneof"`
+	TimestampValue *timestamp.Timestamp `protobuf:"bytes,10,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
 }
+
 type Value_StringValue struct {
-	StringValue string `protobuf:"bytes,17,opt,name=string_value,json=stringValue,oneof"`
+	StringValue string `protobuf:"bytes,17,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
+
 type Value_BytesValue struct {
 	BytesValue []byte `protobuf:"bytes,18,opt,name=bytes_value,json=bytesValue,proto3,oneof"`
 }
+
 type Value_ReferenceValue struct {
-	ReferenceValue string `protobuf:"bytes,5,opt,name=reference_value,json=referenceValue,oneof"`
+	ReferenceValue string `protobuf:"bytes,5,opt,name=reference_value,json=referenceValue,proto3,oneof"`
 }
+
 type Value_GeoPointValue struct {
-	GeoPointValue *google_type.LatLng `protobuf:"bytes,8,opt,name=geo_point_value,json=geoPointValue,oneof"`
+	GeoPointValue *latlng.LatLng `protobuf:"bytes,8,opt,name=geo_point_value,json=geoPointValue,proto3,oneof"`
 }
+
 type Value_ArrayValue struct {
-	ArrayValue *ArrayValue `protobuf:"bytes,9,opt,name=array_value,json=arrayValue,oneof"`
+	ArrayValue *ArrayValue `protobuf:"bytes,9,opt,name=array_value,json=arrayValue,proto3,oneof"`
 }
+
 type Value_MapValue struct {
-	MapValue *MapValue `protobuf:"bytes,6,opt,name=map_value,json=mapValue,oneof"`
+	MapValue *MapValue `protobuf:"bytes,6,opt,name=map_value,json=mapValue,proto3,oneof"`
 }
 
-func (*Value_NullValue) isValue_ValueType()      {}
-func (*Value_BooleanValue) isValue_ValueType()   {}
-func (*Value_IntegerValue) isValue_ValueType()   {}
-func (*Value_DoubleValue) isValue_ValueType()    {}
+func (*Value_NullValue) isValue_ValueType() {}
+
+func (*Value_BooleanValue) isValue_ValueType() {}
+
+func (*Value_IntegerValue) isValue_ValueType() {}
+
+func (*Value_DoubleValue) isValue_ValueType() {}
+
 func (*Value_TimestampValue) isValue_ValueType() {}
-func (*Value_StringValue) isValue_ValueType()    {}
-func (*Value_BytesValue) isValue_ValueType()     {}
+
+func (*Value_StringValue) isValue_ValueType() {}
+
+func (*Value_BytesValue) isValue_ValueType() {}
+
 func (*Value_ReferenceValue) isValue_ValueType() {}
-func (*Value_GeoPointValue) isValue_ValueType()  {}
-func (*Value_ArrayValue) isValue_ValueType()     {}
-func (*Value_MapValue) isValue_ValueType()       {}
+
+func (*Value_GeoPointValue) isValue_ValueType() {}
+
+func (*Value_ArrayValue) isValue_ValueType() {}
+
+func (*Value_MapValue) isValue_ValueType() {}
 
 func (m *Value) GetValueType() isValue_ValueType {
 	if m != nil {
@@ -176,11 +246,11 @@ func (m *Value) GetValueType() isValue_ValueType {
 	return nil
 }
 
-func (m *Value) GetNullValue() google_protobuf2.NullValue {
+func (m *Value) GetNullValue() _struct.NullValue {
 	if x, ok := m.GetValueType().(*Value_NullValue); ok {
 		return x.NullValue
 	}
-	return google_protobuf2.NullValue_NULL_VALUE
+	return _struct.NullValue_NULL_VALUE
 }
 
 func (m *Value) GetBooleanValue() bool {
@@ -204,7 +274,7 @@ func (m *Value) GetDoubleValue() float64 {
 	return 0
 }
 
-func (m *Value) GetTimestampValue() *google_protobuf1.Timestamp {
+func (m *Value) GetTimestampValue() *timestamp.Timestamp {
 	if x, ok := m.GetValueType().(*Value_TimestampValue); ok {
 		return x.TimestampValue
 	}
@@ -232,7 +302,7 @@ func (m *Value) GetReferenceValue() string {
 	return ""
 }
 
-func (m *Value) GetGeoPointValue() *google_type.LatLng {
+func (m *Value) GetGeoPointValue() *latlng.LatLng {
 	if x, ok := m.GetValueType().(*Value_GeoPointValue); ok {
 		return x.GeoPointValue
 	}
@@ -334,7 +404,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 			return true, proto.ErrInternalBadWireType
 		}
 		x, err := b.DecodeVarint()
-		m.ValueType = &Value_NullValue{google_protobuf2.NullValue(x)}
+		m.ValueType = &Value_NullValue{_struct.NullValue(x)}
 		return true, err
 	case 1: // value_type.boolean_value
 		if wire != proto.WireVarint {
@@ -361,7 +431,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ValueType = &Value_TimestampValue{msg}
 		return true, err
@@ -390,7 +460,7 @@ func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_type.LatLng)
+		msg := new(latlng.LatLng)
 		err := b.DecodeMessage(msg)
 		m.ValueType = &Value_GeoPointValue{msg}
 		return true, err
@@ -420,47 +490,47 @@ func _Value_OneofSizer(msg proto.Message) (n int) {
 	// value_type
 	switch x := m.ValueType.(type) {
 	case *Value_NullValue:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.NullValue))
 	case *Value_BooleanValue:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *Value_IntegerValue:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.IntegerValue))
 	case *Value_DoubleValue:
-		n += proto.SizeVarint(3<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *Value_TimestampValue:
 		s := proto.Size(x.TimestampValue)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_StringValue:
-		n += proto.SizeVarint(17<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StringValue)))
 		n += len(x.StringValue)
 	case *Value_BytesValue:
-		n += proto.SizeVarint(18<<3 | proto.WireBytes)
+		n += 2 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.BytesValue)))
 		n += len(x.BytesValue)
 	case *Value_ReferenceValue:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ReferenceValue)))
 		n += len(x.ReferenceValue)
 	case *Value_GeoPointValue:
 		s := proto.Size(x.GeoPointValue)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_ArrayValue:
 		s := proto.Size(x.ArrayValue)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Value_MapValue:
 		s := proto.Size(x.MapValue)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -473,13 +543,35 @@ func _Value_OneofSizer(msg proto.Message) (n int) {
 // An array value.
 type ArrayValue struct {
 	// Values in the array.
-	Values []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
+	Values               []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ArrayValue) Reset()                    { *m = ArrayValue{} }
-func (m *ArrayValue) String() string            { return proto.CompactTextString(m) }
-func (*ArrayValue) ProtoMessage()               {}
-func (*ArrayValue) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *ArrayValue) Reset()         { *m = ArrayValue{} }
+func (m *ArrayValue) String() string { return proto.CompactTextString(m) }
+func (*ArrayValue) ProtoMessage()    {}
+func (*ArrayValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_0cab453ff2a9f3d2, []int{2}
+}
+func (m *ArrayValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ArrayValue.Unmarshal(m, b)
+}
+func (m *ArrayValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ArrayValue.Marshal(b, m, deterministic)
+}
+func (dst *ArrayValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ArrayValue.Merge(dst, src)
+}
+func (m *ArrayValue) XXX_Size() int {
+	return xxx_messageInfo_ArrayValue.Size(m)
+}
+func (m *ArrayValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_ArrayValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ArrayValue proto.InternalMessageInfo
 
 func (m *ArrayValue) GetValues() []*Value {
 	if m != nil {
@@ -496,13 +588,35 @@ type MapValue struct {
 	// expression `__.*__` are reserved. Reserved field names are forbidden except
 	// in certain documented contexts. The map keys, represented as UTF-8, must
 	// not exceed 1,500 bytes and cannot be empty.
-	Fields map[string]*Value `protobuf:"bytes,1,rep,name=fields" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Fields               map[string]*Value `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *MapValue) Reset()         { *m = MapValue{} }
+func (m *MapValue) String() string { return proto.CompactTextString(m) }
+func (*MapValue) ProtoMessage()    {}
+func (*MapValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_document_0cab453ff2a9f3d2, []int{3}
+}
+func (m *MapValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MapValue.Unmarshal(m, b)
+}
+func (m *MapValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MapValue.Marshal(b, m, deterministic)
+}
+func (dst *MapValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapValue.Merge(dst, src)
+}
+func (m *MapValue) XXX_Size() int {
+	return xxx_messageInfo_MapValue.Size(m)
+}
+func (m *MapValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_MapValue.DiscardUnknown(m)
 }
 
-func (m *MapValue) Reset()                    { *m = MapValue{} }
-func (m *MapValue) String() string            { return proto.CompactTextString(m) }
-func (*MapValue) ProtoMessage()               {}
-func (*MapValue) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_MapValue proto.InternalMessageInfo
 
 func (m *MapValue) GetFields() map[string]*Value {
 	if m != nil {
@@ -513,14 +627,18 @@ func (m *MapValue) GetFields() map[string]*Value {
 
 func init() {
 	proto.RegisterType((*Document)(nil), "google.firestore.v1beta1.Document")
+	proto.RegisterMapType((map[string]*Value)(nil), "google.firestore.v1beta1.Document.FieldsEntry")
 	proto.RegisterType((*Value)(nil), "google.firestore.v1beta1.Value")
 	proto.RegisterType((*ArrayValue)(nil), "google.firestore.v1beta1.ArrayValue")
 	proto.RegisterType((*MapValue)(nil), "google.firestore.v1beta1.MapValue")
+	proto.RegisterMapType((map[string]*Value)(nil), "google.firestore.v1beta1.MapValue.FieldsEntry")
 }
 
-func init() { proto.RegisterFile("google/firestore/v1beta1/document.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/firestore/v1beta1/document.proto", fileDescriptor_document_0cab453ff2a9f3d2)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_document_0cab453ff2a9f3d2 = []byte{
 	// 655 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xd3, 0x4c,
 	0x14, 0xc5, 0xe3, 0x24, 0x8d, 0x92, 0xeb, 0xb4, 0xfd, 0x3e, 0xb3, 0x89, 0xa2, 0x8a, 0x86, 0x00,
diff --git a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/firestore.pb.go b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/firestore.pb.go
index bd7b520c..826d407c 100644
--- a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/firestore.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/firestore.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/firestore.proto
 
-package firestore
+package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The type of change.
 type TargetChange_TargetChangeType int32
 
@@ -67,32 +73,68 @@ func (x TargetChange_TargetChangeType) String() string {
 	return proto.EnumName(TargetChange_TargetChangeType_name, int32(x))
 }
 func (TargetChange_TargetChangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor2, []int{20, 0}
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{20, 0}
 }
 
 // The request for [Firestore.GetDocument][google.firestore.v1beta1.Firestore.GetDocument].
 type GetDocumentRequest struct {
 	// The resource name of the Document to get. In the format:
 	// `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The fields to return. If not set, returns all fields.
 	//
 	// If the document has a field that is not present in this mask, that field
 	// will not be returned in the response.
-	Mask *DocumentMask `protobuf:"bytes,2,opt,name=mask" json:"mask,omitempty"`
+	Mask *DocumentMask `protobuf:"bytes,2,opt,name=mask,proto3" json:"mask,omitempty"`
 	// The consistency mode for this transaction.
 	// If not set, defaults to strong consistency.
 	//
 	// Types that are valid to be assigned to ConsistencySelector:
 	//	*GetDocumentRequest_Transaction
 	//	*GetDocumentRequest_ReadTime
-	ConsistencySelector isGetDocumentRequest_ConsistencySelector `protobuf_oneof:"consistency_selector"`
+	ConsistencySelector  isGetDocumentRequest_ConsistencySelector `protobuf_oneof:"consistency_selector"`
+	XXX_NoUnkeyedLiteral struct{}                                 `json:"-"`
+	XXX_unrecognized     []byte                                   `json:"-"`
+	XXX_sizecache        int32                                    `json:"-"`
+}
+
+func (m *GetDocumentRequest) Reset()         { *m = GetDocumentRequest{} }
+func (m *GetDocumentRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDocumentRequest) ProtoMessage()    {}
+func (*GetDocumentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{0}
+}
+func (m *GetDocumentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDocumentRequest.Unmarshal(m, b)
+}
+func (m *GetDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDocumentRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDocumentRequest.Merge(dst, src)
+}
+func (m *GetDocumentRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDocumentRequest.Size(m)
+}
+func (m *GetDocumentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDocumentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDocumentRequest proto.InternalMessageInfo
+
+func (m *GetDocumentRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
 }
 
-func (m *GetDocumentRequest) Reset()                    { *m = GetDocumentRequest{} }
-func (m *GetDocumentRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDocumentRequest) ProtoMessage()               {}
-func (*GetDocumentRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (m *GetDocumentRequest) GetMask() *DocumentMask {
+	if m != nil {
+		return m.Mask
+	}
+	return nil
+}
 
 type isGetDocumentRequest_ConsistencySelector interface {
 	isGetDocumentRequest_ConsistencySelector()
@@ -101,12 +143,14 @@ type isGetDocumentRequest_ConsistencySelector interface {
 type GetDocumentRequest_Transaction struct {
 	Transaction []byte `protobuf:"bytes,3,opt,name=transaction,proto3,oneof"`
 }
+
 type GetDocumentRequest_ReadTime struct {
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=read_time,json=readTime,oneof"`
+	ReadTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=read_time,json=readTime,proto3,oneof"`
 }
 
 func (*GetDocumentRequest_Transaction) isGetDocumentRequest_ConsistencySelector() {}
-func (*GetDocumentRequest_ReadTime) isGetDocumentRequest_ConsistencySelector()    {}
+
+func (*GetDocumentRequest_ReadTime) isGetDocumentRequest_ConsistencySelector() {}
 
 func (m *GetDocumentRequest) GetConsistencySelector() isGetDocumentRequest_ConsistencySelector {
 	if m != nil {
@@ -115,20 +159,6 @@ func (m *GetDocumentRequest) GetConsistencySelector() isGetDocumentRequest_Consi
 	return nil
 }
 
-func (m *GetDocumentRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *GetDocumentRequest) GetMask() *DocumentMask {
-	if m != nil {
-		return m.Mask
-	}
-	return nil
-}
-
 func (m *GetDocumentRequest) GetTransaction() []byte {
 	if x, ok := m.GetConsistencySelector().(*GetDocumentRequest_Transaction); ok {
 		return x.Transaction
@@ -136,7 +166,7 @@ func (m *GetDocumentRequest) GetTransaction() []byte {
 	return nil
 }
 
-func (m *GetDocumentRequest) GetReadTime() *google_protobuf1.Timestamp {
+func (m *GetDocumentRequest) GetReadTime() *timestamp.Timestamp {
 	if x, ok := m.GetConsistencySelector().(*GetDocumentRequest_ReadTime); ok {
 		return x.ReadTime
 	}
@@ -184,7 +214,7 @@ func _GetDocumentRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *p
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ConsistencySelector = &GetDocumentRequest_ReadTime{msg}
 		return true, err
@@ -198,12 +228,12 @@ func _GetDocumentRequest_OneofSizer(msg proto.Message) (n int) {
 	// consistency_selector
 	switch x := m.ConsistencySelector.(type) {
 	case *GetDocumentRequest_Transaction:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Transaction)))
 		n += len(x.Transaction)
 	case *GetDocumentRequest_ReadTime:
 		s := proto.Size(x.ReadTime)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -221,21 +251,21 @@ type ListDocumentsRequest struct {
 	// For example:
 	// `projects/my-project/databases/my-database/documents` or
 	// `projects/my-project/databases/my-database/documents/chatrooms/my-chatroom`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The collection ID, relative to `parent`, to list. For example: `chatrooms`
 	// or `messages`.
-	CollectionId string `protobuf:"bytes,2,opt,name=collection_id,json=collectionId" json:"collection_id,omitempty"`
+	CollectionId string `protobuf:"bytes,2,opt,name=collection_id,json=collectionId,proto3" json:"collection_id,omitempty"`
 	// The maximum number of documents to return.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The `next_page_token` value returned from a previous List request, if any.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The order to sort results by. For example: `priority desc, name`.
-	OrderBy string `protobuf:"bytes,6,opt,name=order_by,json=orderBy" json:"order_by,omitempty"`
+	OrderBy string `protobuf:"bytes,6,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
 	// The fields to return. If not set, returns all fields.
 	//
 	// If a document has a field that is not present in this mask, that field
 	// will not be returned in the response.
-	Mask *DocumentMask `protobuf:"bytes,7,opt,name=mask" json:"mask,omitempty"`
+	Mask *DocumentMask `protobuf:"bytes,7,opt,name=mask,proto3" json:"mask,omitempty"`
 	// The consistency mode for this transaction.
 	// If not set, defaults to strong consistency.
 	//
@@ -250,35 +280,36 @@ type ListDocumentsRequest struct {
 	//
 	// Requests with `show_missing` may not specify `where` or
 	// `order_by`.
-	ShowMissing bool `protobuf:"varint,12,opt,name=show_missing,json=showMissing" json:"show_missing,omitempty"`
+	ShowMissing          bool     `protobuf:"varint,12,opt,name=show_missing,json=showMissing,proto3" json:"show_missing,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDocumentsRequest) Reset()                    { *m = ListDocumentsRequest{} }
-func (m *ListDocumentsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDocumentsRequest) ProtoMessage()               {}
-func (*ListDocumentsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
-
-type isListDocumentsRequest_ConsistencySelector interface {
-	isListDocumentsRequest_ConsistencySelector()
+func (m *ListDocumentsRequest) Reset()         { *m = ListDocumentsRequest{} }
+func (m *ListDocumentsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDocumentsRequest) ProtoMessage()    {}
+func (*ListDocumentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{1}
 }
-
-type ListDocumentsRequest_Transaction struct {
-	Transaction []byte `protobuf:"bytes,8,opt,name=transaction,proto3,oneof"`
+func (m *ListDocumentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDocumentsRequest.Unmarshal(m, b)
 }
-type ListDocumentsRequest_ReadTime struct {
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,10,opt,name=read_time,json=readTime,oneof"`
+func (m *ListDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDocumentsRequest.Marshal(b, m, deterministic)
 }
-
-func (*ListDocumentsRequest_Transaction) isListDocumentsRequest_ConsistencySelector() {}
-func (*ListDocumentsRequest_ReadTime) isListDocumentsRequest_ConsistencySelector()    {}
-
-func (m *ListDocumentsRequest) GetConsistencySelector() isListDocumentsRequest_ConsistencySelector {
-	if m != nil {
-		return m.ConsistencySelector
-	}
-	return nil
+func (dst *ListDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsRequest.Merge(dst, src)
+}
+func (m *ListDocumentsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDocumentsRequest.Size(m)
+}
+func (m *ListDocumentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDocumentsRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ListDocumentsRequest proto.InternalMessageInfo
+
 func (m *ListDocumentsRequest) GetParent() string {
 	if m != nil {
 		return m.Parent
@@ -321,6 +352,29 @@ func (m *ListDocumentsRequest) GetMask() *DocumentMask {
 	return nil
 }
 
+type isListDocumentsRequest_ConsistencySelector interface {
+	isListDocumentsRequest_ConsistencySelector()
+}
+
+type ListDocumentsRequest_Transaction struct {
+	Transaction []byte `protobuf:"bytes,8,opt,name=transaction,proto3,oneof"`
+}
+
+type ListDocumentsRequest_ReadTime struct {
+	ReadTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=read_time,json=readTime,proto3,oneof"`
+}
+
+func (*ListDocumentsRequest_Transaction) isListDocumentsRequest_ConsistencySelector() {}
+
+func (*ListDocumentsRequest_ReadTime) isListDocumentsRequest_ConsistencySelector() {}
+
+func (m *ListDocumentsRequest) GetConsistencySelector() isListDocumentsRequest_ConsistencySelector {
+	if m != nil {
+		return m.ConsistencySelector
+	}
+	return nil
+}
+
 func (m *ListDocumentsRequest) GetTransaction() []byte {
 	if x, ok := m.GetConsistencySelector().(*ListDocumentsRequest_Transaction); ok {
 		return x.Transaction
@@ -328,7 +382,7 @@ func (m *ListDocumentsRequest) GetTransaction() []byte {
 	return nil
 }
 
-func (m *ListDocumentsRequest) GetReadTime() *google_protobuf1.Timestamp {
+func (m *ListDocumentsRequest) GetReadTime() *timestamp.Timestamp {
 	if x, ok := m.GetConsistencySelector().(*ListDocumentsRequest_ReadTime); ok {
 		return x.ReadTime
 	}
@@ -383,7 +437,7 @@ func _ListDocumentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ConsistencySelector = &ListDocumentsRequest_ReadTime{msg}
 		return true, err
@@ -397,12 +451,12 @@ func _ListDocumentsRequest_OneofSizer(msg proto.Message) (n int) {
 	// consistency_selector
 	switch x := m.ConsistencySelector.(type) {
 	case *ListDocumentsRequest_Transaction:
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Transaction)))
 		n += len(x.Transaction)
 	case *ListDocumentsRequest_ReadTime:
 		s := proto.Size(x.ReadTime)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -415,15 +469,37 @@ func _ListDocumentsRequest_OneofSizer(msg proto.Message) (n int) {
 // The response for [Firestore.ListDocuments][google.firestore.v1beta1.Firestore.ListDocuments].
 type ListDocumentsResponse struct {
 	// The Documents found.
-	Documents []*Document `protobuf:"bytes,1,rep,name=documents" json:"documents,omitempty"`
+	Documents []*Document `protobuf:"bytes,1,rep,name=documents,proto3" json:"documents,omitempty"`
 	// The next page token.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDocumentsResponse) Reset()                    { *m = ListDocumentsResponse{} }
-func (m *ListDocumentsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDocumentsResponse) ProtoMessage()               {}
-func (*ListDocumentsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+func (m *ListDocumentsResponse) Reset()         { *m = ListDocumentsResponse{} }
+func (m *ListDocumentsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDocumentsResponse) ProtoMessage()    {}
+func (*ListDocumentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{2}
+}
+func (m *ListDocumentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDocumentsResponse.Unmarshal(m, b)
+}
+func (m *ListDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDocumentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDocumentsResponse.Merge(dst, src)
+}
+func (m *ListDocumentsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDocumentsResponse.Size(m)
+}
+func (m *ListDocumentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDocumentsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDocumentsResponse proto.InternalMessageInfo
 
 func (m *ListDocumentsResponse) GetDocuments() []*Document {
 	if m != nil {
@@ -444,26 +520,48 @@ type CreateDocumentRequest struct {
 	// The parent resource. For example:
 	// `projects/{project_id}/databases/{database_id}/documents` or
 	// `projects/{project_id}/databases/{database_id}/documents/chatrooms/{chatroom_id}`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The collection ID, relative to `parent`, to list. For example: `chatrooms`.
-	CollectionId string `protobuf:"bytes,2,opt,name=collection_id,json=collectionId" json:"collection_id,omitempty"`
+	CollectionId string `protobuf:"bytes,2,opt,name=collection_id,json=collectionId,proto3" json:"collection_id,omitempty"`
 	// The client-assigned document ID to use for this document.
 	//
 	// Optional. If not specified, an ID will be assigned by the service.
-	DocumentId string `protobuf:"bytes,3,opt,name=document_id,json=documentId" json:"document_id,omitempty"`
+	DocumentId string `protobuf:"bytes,3,opt,name=document_id,json=documentId,proto3" json:"document_id,omitempty"`
 	// The document to create. `name` must not be set.
-	Document *Document `protobuf:"bytes,4,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,4,opt,name=document,proto3" json:"document,omitempty"`
 	// The fields to return. If not set, returns all fields.
 	//
 	// If the document has a field that is not present in this mask, that field
 	// will not be returned in the response.
-	Mask *DocumentMask `protobuf:"bytes,5,opt,name=mask" json:"mask,omitempty"`
+	Mask                 *DocumentMask `protobuf:"bytes,5,opt,name=mask,proto3" json:"mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *CreateDocumentRequest) Reset()                    { *m = CreateDocumentRequest{} }
-func (m *CreateDocumentRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateDocumentRequest) ProtoMessage()               {}
-func (*CreateDocumentRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+func (m *CreateDocumentRequest) Reset()         { *m = CreateDocumentRequest{} }
+func (m *CreateDocumentRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDocumentRequest) ProtoMessage()    {}
+func (*CreateDocumentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{3}
+}
+func (m *CreateDocumentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDocumentRequest.Unmarshal(m, b)
+}
+func (m *CreateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDocumentRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDocumentRequest.Merge(dst, src)
+}
+func (m *CreateDocumentRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDocumentRequest.Size(m)
+}
+func (m *CreateDocumentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDocumentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateDocumentRequest proto.InternalMessageInfo
 
 func (m *CreateDocumentRequest) GetParent() string {
 	if m != nil {
@@ -504,7 +602,7 @@ func (m *CreateDocumentRequest) GetMask() *DocumentMask {
 type UpdateDocumentRequest struct {
 	// The updated document.
 	// Creates the document if it does not already exist.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The fields to update.
 	// None of the field paths in the mask may contain a reserved name.
 	//
@@ -512,21 +610,43 @@ type UpdateDocumentRequest struct {
 	// mask, they are left unchanged.
 	// Fields referenced in the mask, but not present in the input document, are
 	// deleted from the document on the server.
-	UpdateMask *DocumentMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask *DocumentMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// The fields to return. If not set, returns all fields.
 	//
 	// If the document has a field that is not present in this mask, that field
 	// will not be returned in the response.
-	Mask *DocumentMask `protobuf:"bytes,3,opt,name=mask" json:"mask,omitempty"`
+	Mask *DocumentMask `protobuf:"bytes,3,opt,name=mask,proto3" json:"mask,omitempty"`
 	// An optional precondition on the document.
 	// The request will fail if this is set and not met by the target document.
-	CurrentDocument *Precondition `protobuf:"bytes,4,opt,name=current_document,json=currentDocument" json:"current_document,omitempty"`
+	CurrentDocument      *Precondition `protobuf:"bytes,4,opt,name=current_document,json=currentDocument,proto3" json:"current_document,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *UpdateDocumentRequest) Reset()         { *m = UpdateDocumentRequest{} }
+func (m *UpdateDocumentRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateDocumentRequest) ProtoMessage()    {}
+func (*UpdateDocumentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{4}
+}
+func (m *UpdateDocumentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateDocumentRequest.Unmarshal(m, b)
+}
+func (m *UpdateDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateDocumentRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDocumentRequest.Merge(dst, src)
+}
+func (m *UpdateDocumentRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateDocumentRequest.Size(m)
+}
+func (m *UpdateDocumentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateDocumentRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateDocumentRequest) Reset()                    { *m = UpdateDocumentRequest{} }
-func (m *UpdateDocumentRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateDocumentRequest) ProtoMessage()               {}
-func (*UpdateDocumentRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_UpdateDocumentRequest proto.InternalMessageInfo
 
 func (m *UpdateDocumentRequest) GetDocument() *Document {
 	if m != nil {
@@ -560,16 +680,38 @@ func (m *UpdateDocumentRequest) GetCurrentDocument() *Precondition {
 type DeleteDocumentRequest struct {
 	// The resource name of the Document to delete. In the format:
 	// `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional precondition on the document.
 	// The request will fail if this is set and not met by the target document.
-	CurrentDocument *Precondition `protobuf:"bytes,2,opt,name=current_document,json=currentDocument" json:"current_document,omitempty"`
+	CurrentDocument      *Precondition `protobuf:"bytes,2,opt,name=current_document,json=currentDocument,proto3" json:"current_document,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *DeleteDocumentRequest) Reset()         { *m = DeleteDocumentRequest{} }
+func (m *DeleteDocumentRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteDocumentRequest) ProtoMessage()    {}
+func (*DeleteDocumentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{5}
+}
+func (m *DeleteDocumentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteDocumentRequest.Unmarshal(m, b)
+}
+func (m *DeleteDocumentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteDocumentRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteDocumentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDocumentRequest.Merge(dst, src)
+}
+func (m *DeleteDocumentRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteDocumentRequest.Size(m)
+}
+func (m *DeleteDocumentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteDocumentRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteDocumentRequest) Reset()                    { *m = DeleteDocumentRequest{} }
-func (m *DeleteDocumentRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteDocumentRequest) ProtoMessage()               {}
-func (*DeleteDocumentRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_DeleteDocumentRequest proto.InternalMessageInfo
 
 func (m *DeleteDocumentRequest) GetName() string {
 	if m != nil {
@@ -589,17 +731,17 @@ func (m *DeleteDocumentRequest) GetCurrentDocument() *Precondition {
 type BatchGetDocumentsRequest struct {
 	// The database name. In the format:
 	// `projects/{project_id}/databases/{database_id}`.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// The names of the documents to retrieve. In the format:
 	// `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
 	// The request will fail if any of the document is not a child resource of the
 	// given `database`. Duplicate names will be elided.
-	Documents []string `protobuf:"bytes,2,rep,name=documents" json:"documents,omitempty"`
+	Documents []string `protobuf:"bytes,2,rep,name=documents,proto3" json:"documents,omitempty"`
 	// The fields to return. If not set, returns all fields.
 	//
 	// If a document has a field that is not present in this mask, that field will
 	// not be returned in the response.
-	Mask *DocumentMask `protobuf:"bytes,3,opt,name=mask" json:"mask,omitempty"`
+	Mask *DocumentMask `protobuf:"bytes,3,opt,name=mask,proto3" json:"mask,omitempty"`
 	// The consistency mode for this transaction.
 	// If not set, defaults to strong consistency.
 	//
@@ -607,39 +749,36 @@ type BatchGetDocumentsRequest struct {
 	//	*BatchGetDocumentsRequest_Transaction
 	//	*BatchGetDocumentsRequest_NewTransaction
 	//	*BatchGetDocumentsRequest_ReadTime
-	ConsistencySelector isBatchGetDocumentsRequest_ConsistencySelector `protobuf_oneof:"consistency_selector"`
+	ConsistencySelector  isBatchGetDocumentsRequest_ConsistencySelector `protobuf_oneof:"consistency_selector"`
+	XXX_NoUnkeyedLiteral struct{}                                       `json:"-"`
+	XXX_unrecognized     []byte                                         `json:"-"`
+	XXX_sizecache        int32                                          `json:"-"`
 }
 
-func (m *BatchGetDocumentsRequest) Reset()                    { *m = BatchGetDocumentsRequest{} }
-func (m *BatchGetDocumentsRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchGetDocumentsRequest) ProtoMessage()               {}
-func (*BatchGetDocumentsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
-
-type isBatchGetDocumentsRequest_ConsistencySelector interface {
-	isBatchGetDocumentsRequest_ConsistencySelector()
+func (m *BatchGetDocumentsRequest) Reset()         { *m = BatchGetDocumentsRequest{} }
+func (m *BatchGetDocumentsRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchGetDocumentsRequest) ProtoMessage()    {}
+func (*BatchGetDocumentsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{6}
 }
-
-type BatchGetDocumentsRequest_Transaction struct {
-	Transaction []byte `protobuf:"bytes,4,opt,name=transaction,proto3,oneof"`
+func (m *BatchGetDocumentsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchGetDocumentsRequest.Unmarshal(m, b)
 }
-type BatchGetDocumentsRequest_NewTransaction struct {
-	NewTransaction *TransactionOptions `protobuf:"bytes,5,opt,name=new_transaction,json=newTransaction,oneof"`
+func (m *BatchGetDocumentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchGetDocumentsRequest.Marshal(b, m, deterministic)
 }
-type BatchGetDocumentsRequest_ReadTime struct {
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,7,opt,name=read_time,json=readTime,oneof"`
+func (dst *BatchGetDocumentsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetDocumentsRequest.Merge(dst, src)
 }
-
-func (*BatchGetDocumentsRequest_Transaction) isBatchGetDocumentsRequest_ConsistencySelector()    {}
-func (*BatchGetDocumentsRequest_NewTransaction) isBatchGetDocumentsRequest_ConsistencySelector() {}
-func (*BatchGetDocumentsRequest_ReadTime) isBatchGetDocumentsRequest_ConsistencySelector()       {}
-
-func (m *BatchGetDocumentsRequest) GetConsistencySelector() isBatchGetDocumentsRequest_ConsistencySelector {
-	if m != nil {
-		return m.ConsistencySelector
-	}
-	return nil
+func (m *BatchGetDocumentsRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchGetDocumentsRequest.Size(m)
+}
+func (m *BatchGetDocumentsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchGetDocumentsRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_BatchGetDocumentsRequest proto.InternalMessageInfo
+
 func (m *BatchGetDocumentsRequest) GetDatabase() string {
 	if m != nil {
 		return m.Database
@@ -661,6 +800,35 @@ func (m *BatchGetDocumentsRequest) GetMask() *DocumentMask {
 	return nil
 }
 
+type isBatchGetDocumentsRequest_ConsistencySelector interface {
+	isBatchGetDocumentsRequest_ConsistencySelector()
+}
+
+type BatchGetDocumentsRequest_Transaction struct {
+	Transaction []byte `protobuf:"bytes,4,opt,name=transaction,proto3,oneof"`
+}
+
+type BatchGetDocumentsRequest_NewTransaction struct {
+	NewTransaction *TransactionOptions `protobuf:"bytes,5,opt,name=new_transaction,json=newTransaction,proto3,oneof"`
+}
+
+type BatchGetDocumentsRequest_ReadTime struct {
+	ReadTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=read_time,json=readTime,proto3,oneof"`
+}
+
+func (*BatchGetDocumentsRequest_Transaction) isBatchGetDocumentsRequest_ConsistencySelector() {}
+
+func (*BatchGetDocumentsRequest_NewTransaction) isBatchGetDocumentsRequest_ConsistencySelector() {}
+
+func (*BatchGetDocumentsRequest_ReadTime) isBatchGetDocumentsRequest_ConsistencySelector() {}
+
+func (m *BatchGetDocumentsRequest) GetConsistencySelector() isBatchGetDocumentsRequest_ConsistencySelector {
+	if m != nil {
+		return m.ConsistencySelector
+	}
+	return nil
+}
+
 func (m *BatchGetDocumentsRequest) GetTransaction() []byte {
 	if x, ok := m.GetConsistencySelector().(*BatchGetDocumentsRequest_Transaction); ok {
 		return x.Transaction
@@ -675,7 +843,7 @@ func (m *BatchGetDocumentsRequest) GetNewTransaction() *TransactionOptions {
 	return nil
 }
 
-func (m *BatchGetDocumentsRequest) GetReadTime() *google_protobuf1.Timestamp {
+func (m *BatchGetDocumentsRequest) GetReadTime() *timestamp.Timestamp {
 	if x, ok := m.GetConsistencySelector().(*BatchGetDocumentsRequest_ReadTime); ok {
 		return x.ReadTime
 	}
@@ -737,7 +905,7 @@ func _BatchGetDocumentsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ConsistencySelector = &BatchGetDocumentsRequest_ReadTime{msg}
 		return true, err
@@ -751,17 +919,17 @@ func _BatchGetDocumentsRequest_OneofSizer(msg proto.Message) (n int) {
 	// consistency_selector
 	switch x := m.ConsistencySelector.(type) {
 	case *BatchGetDocumentsRequest_Transaction:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Transaction)))
 		n += len(x.Transaction)
 	case *BatchGetDocumentsRequest_NewTransaction:
 		s := proto.Size(x.NewTransaction)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BatchGetDocumentsRequest_ReadTime:
 		s := proto.Size(x.ReadTime)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -788,26 +956,50 @@ type BatchGetDocumentsResponse struct {
 	// This may be monotically increasing, in this case the previous documents in
 	// the result stream are guaranteed not to have changed between their
 	// read_time and this one.
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime" json:"read_time,omitempty"`
+	ReadTime             *timestamp.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *BatchGetDocumentsResponse) Reset()                    { *m = BatchGetDocumentsResponse{} }
-func (m *BatchGetDocumentsResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchGetDocumentsResponse) ProtoMessage()               {}
-func (*BatchGetDocumentsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+func (m *BatchGetDocumentsResponse) Reset()         { *m = BatchGetDocumentsResponse{} }
+func (m *BatchGetDocumentsResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchGetDocumentsResponse) ProtoMessage()    {}
+func (*BatchGetDocumentsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{7}
+}
+func (m *BatchGetDocumentsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchGetDocumentsResponse.Unmarshal(m, b)
+}
+func (m *BatchGetDocumentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchGetDocumentsResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchGetDocumentsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetDocumentsResponse.Merge(dst, src)
+}
+func (m *BatchGetDocumentsResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchGetDocumentsResponse.Size(m)
+}
+func (m *BatchGetDocumentsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchGetDocumentsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchGetDocumentsResponse proto.InternalMessageInfo
 
 type isBatchGetDocumentsResponse_Result interface {
 	isBatchGetDocumentsResponse_Result()
 }
 
 type BatchGetDocumentsResponse_Found struct {
-	Found *Document `protobuf:"bytes,1,opt,name=found,oneof"`
+	Found *Document `protobuf:"bytes,1,opt,name=found,proto3,oneof"`
 }
+
 type BatchGetDocumentsResponse_Missing struct {
-	Missing string `protobuf:"bytes,2,opt,name=missing,oneof"`
+	Missing string `protobuf:"bytes,2,opt,name=missing,proto3,oneof"`
 }
 
-func (*BatchGetDocumentsResponse_Found) isBatchGetDocumentsResponse_Result()   {}
+func (*BatchGetDocumentsResponse_Found) isBatchGetDocumentsResponse_Result() {}
+
 func (*BatchGetDocumentsResponse_Missing) isBatchGetDocumentsResponse_Result() {}
 
 func (m *BatchGetDocumentsResponse) GetResult() isBatchGetDocumentsResponse_Result {
@@ -838,7 +1030,7 @@ func (m *BatchGetDocumentsResponse) GetTransaction() []byte {
 	return nil
 }
 
-func (m *BatchGetDocumentsResponse) GetReadTime() *google_protobuf1.Timestamp {
+func (m *BatchGetDocumentsResponse) GetReadTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ReadTime
 	}
@@ -901,11 +1093,11 @@ func _BatchGetDocumentsResponse_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Result.(type) {
 	case *BatchGetDocumentsResponse_Found:
 		s := proto.Size(x.Found)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *BatchGetDocumentsResponse_Missing:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Missing)))
 		n += len(x.Missing)
 	case nil:
@@ -919,16 +1111,38 @@ func _BatchGetDocumentsResponse_OneofSizer(msg proto.Message) (n int) {
 type BeginTransactionRequest struct {
 	// The database name. In the format:
 	// `projects/{project_id}/databases/{database_id}`.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// The options for the transaction.
 	// Defaults to a read-write transaction.
-	Options *TransactionOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
+	Options              *TransactionOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *BeginTransactionRequest) Reset()                    { *m = BeginTransactionRequest{} }
-func (m *BeginTransactionRequest) String() string            { return proto.CompactTextString(m) }
-func (*BeginTransactionRequest) ProtoMessage()               {}
-func (*BeginTransactionRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest{} }
+func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
+func (*BeginTransactionRequest) ProtoMessage()    {}
+func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{8}
+}
+func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
+}
+func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
+}
+func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+}
+func (m *BeginTransactionRequest) XXX_Size() int {
+	return xxx_messageInfo_BeginTransactionRequest.Size(m)
+}
+func (m *BeginTransactionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BeginTransactionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BeginTransactionRequest proto.InternalMessageInfo
 
 func (m *BeginTransactionRequest) GetDatabase() string {
 	if m != nil {
@@ -947,13 +1161,35 @@ func (m *BeginTransactionRequest) GetOptions() *TransactionOptions {
 // The response for [Firestore.BeginTransaction][google.firestore.v1beta1.Firestore.BeginTransaction].
 type BeginTransactionResponse struct {
 	// The transaction that was started.
-	Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	Transaction          []byte   `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BeginTransactionResponse) Reset()         { *m = BeginTransactionResponse{} }
+func (m *BeginTransactionResponse) String() string { return proto.CompactTextString(m) }
+func (*BeginTransactionResponse) ProtoMessage()    {}
+func (*BeginTransactionResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{9}
+}
+func (m *BeginTransactionResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BeginTransactionResponse.Unmarshal(m, b)
+}
+func (m *BeginTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BeginTransactionResponse.Marshal(b, m, deterministic)
+}
+func (dst *BeginTransactionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionResponse.Merge(dst, src)
+}
+func (m *BeginTransactionResponse) XXX_Size() int {
+	return xxx_messageInfo_BeginTransactionResponse.Size(m)
+}
+func (m *BeginTransactionResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BeginTransactionResponse.DiscardUnknown(m)
 }
 
-func (m *BeginTransactionResponse) Reset()                    { *m = BeginTransactionResponse{} }
-func (m *BeginTransactionResponse) String() string            { return proto.CompactTextString(m) }
-func (*BeginTransactionResponse) ProtoMessage()               {}
-func (*BeginTransactionResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+var xxx_messageInfo_BeginTransactionResponse proto.InternalMessageInfo
 
 func (m *BeginTransactionResponse) GetTransaction() []byte {
 	if m != nil {
@@ -966,19 +1202,41 @@ func (m *BeginTransactionResponse) GetTransaction() []byte {
 type CommitRequest struct {
 	// The database name. In the format:
 	// `projects/{project_id}/databases/{database_id}`.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// The writes to apply.
 	//
 	// Always executed atomically and in order.
-	Writes []*Write `protobuf:"bytes,2,rep,name=writes" json:"writes,omitempty"`
+	Writes []*Write `protobuf:"bytes,2,rep,name=writes,proto3" json:"writes,omitempty"`
 	// If set, applies all writes in this transaction, and commits it.
-	Transaction []byte `protobuf:"bytes,3,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	Transaction          []byte   `protobuf:"bytes,3,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CommitRequest) Reset()                    { *m = CommitRequest{} }
-func (m *CommitRequest) String() string            { return proto.CompactTextString(m) }
-func (*CommitRequest) ProtoMessage()               {}
-func (*CommitRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} }
+func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
+func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
+func (*CommitRequest) ProtoMessage()    {}
+func (*CommitRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{10}
+}
+func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
+}
+func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
+}
+func (dst *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(dst, src)
+}
+func (m *CommitRequest) XXX_Size() int {
+	return xxx_messageInfo_CommitRequest.Size(m)
+}
+func (m *CommitRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommitRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommitRequest proto.InternalMessageInfo
 
 func (m *CommitRequest) GetDatabase() string {
 	if m != nil {
@@ -1007,15 +1265,37 @@ type CommitResponse struct {
 	//
 	// This i-th write result corresponds to the i-th write in the
 	// request.
-	WriteResults []*WriteResult `protobuf:"bytes,1,rep,name=write_results,json=writeResults" json:"write_results,omitempty"`
+	WriteResults []*WriteResult `protobuf:"bytes,1,rep,name=write_results,json=writeResults,proto3" json:"write_results,omitempty"`
 	// The time at which the commit occurred.
-	CommitTime *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=commit_time,json=commitTime" json:"commit_time,omitempty"`
+	CommitTime           *timestamp.Timestamp `protobuf:"bytes,2,opt,name=commit_time,json=commitTime,proto3" json:"commit_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *CommitResponse) Reset()                    { *m = CommitResponse{} }
-func (m *CommitResponse) String() string            { return proto.CompactTextString(m) }
-func (*CommitResponse) ProtoMessage()               {}
-func (*CommitResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} }
+func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
+func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
+func (*CommitResponse) ProtoMessage()    {}
+func (*CommitResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{11}
+}
+func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
+}
+func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
+}
+func (dst *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(dst, src)
+}
+func (m *CommitResponse) XXX_Size() int {
+	return xxx_messageInfo_CommitResponse.Size(m)
+}
+func (m *CommitResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommitResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommitResponse proto.InternalMessageInfo
 
 func (m *CommitResponse) GetWriteResults() []*WriteResult {
 	if m != nil {
@@ -1024,7 +1304,7 @@ func (m *CommitResponse) GetWriteResults() []*WriteResult {
 	return nil
 }
 
-func (m *CommitResponse) GetCommitTime() *google_protobuf1.Timestamp {
+func (m *CommitResponse) GetCommitTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CommitTime
 	}
@@ -1035,15 +1315,37 @@ func (m *CommitResponse) GetCommitTime() *google_protobuf1.Timestamp {
 type RollbackRequest struct {
 	// The database name. In the format:
 	// `projects/{project_id}/databases/{database_id}`.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// The transaction to roll back.
-	Transaction []byte `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	Transaction          []byte   `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RollbackRequest) Reset()                    { *m = RollbackRequest{} }
-func (m *RollbackRequest) String() string            { return proto.CompactTextString(m) }
-func (*RollbackRequest) ProtoMessage()               {}
-func (*RollbackRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{12} }
+func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
+func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
+func (*RollbackRequest) ProtoMessage()    {}
+func (*RollbackRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{12}
+}
+func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
+}
+func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
+}
+func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+}
+func (m *RollbackRequest) XXX_Size() int {
+	return xxx_messageInfo_RollbackRequest.Size(m)
+}
+func (m *RollbackRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RollbackRequest proto.InternalMessageInfo
 
 func (m *RollbackRequest) GetDatabase() string {
 	if m != nil {
@@ -1067,7 +1369,7 @@ type RunQueryRequest struct {
 	// For example:
 	// `projects/my-project/databases/my-database/documents` or
 	// `projects/my-project/databases/my-database/documents/chatrooms/my-chatroom`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The query to run.
 	//
 	// Types that are valid to be assigned to QueryType:
@@ -1080,38 +1382,52 @@ type RunQueryRequest struct {
 	//	*RunQueryRequest_Transaction
 	//	*RunQueryRequest_NewTransaction
 	//	*RunQueryRequest_ReadTime
-	ConsistencySelector isRunQueryRequest_ConsistencySelector `protobuf_oneof:"consistency_selector"`
+	ConsistencySelector  isRunQueryRequest_ConsistencySelector `protobuf_oneof:"consistency_selector"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
+}
+
+func (m *RunQueryRequest) Reset()         { *m = RunQueryRequest{} }
+func (m *RunQueryRequest) String() string { return proto.CompactTextString(m) }
+func (*RunQueryRequest) ProtoMessage()    {}
+func (*RunQueryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{13}
+}
+func (m *RunQueryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunQueryRequest.Unmarshal(m, b)
+}
+func (m *RunQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunQueryRequest.Marshal(b, m, deterministic)
+}
+func (dst *RunQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryRequest.Merge(dst, src)
 }
+func (m *RunQueryRequest) XXX_Size() int {
+	return xxx_messageInfo_RunQueryRequest.Size(m)
+}
+func (m *RunQueryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunQueryRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RunQueryRequest proto.InternalMessageInfo
 
-func (m *RunQueryRequest) Reset()                    { *m = RunQueryRequest{} }
-func (m *RunQueryRequest) String() string            { return proto.CompactTextString(m) }
-func (*RunQueryRequest) ProtoMessage()               {}
-func (*RunQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{13} }
+func (m *RunQueryRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
 
 type isRunQueryRequest_QueryType interface {
 	isRunQueryRequest_QueryType()
 }
-type isRunQueryRequest_ConsistencySelector interface {
-	isRunQueryRequest_ConsistencySelector()
-}
 
 type RunQueryRequest_StructuredQuery struct {
-	StructuredQuery *StructuredQuery `protobuf:"bytes,2,opt,name=structured_query,json=structuredQuery,oneof"`
-}
-type RunQueryRequest_Transaction struct {
-	Transaction []byte `protobuf:"bytes,5,opt,name=transaction,proto3,oneof"`
-}
-type RunQueryRequest_NewTransaction struct {
-	NewTransaction *TransactionOptions `protobuf:"bytes,6,opt,name=new_transaction,json=newTransaction,oneof"`
-}
-type RunQueryRequest_ReadTime struct {
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,7,opt,name=read_time,json=readTime,oneof"`
+	StructuredQuery *StructuredQuery `protobuf:"bytes,2,opt,name=structured_query,json=structuredQuery,proto3,oneof"`
 }
 
-func (*RunQueryRequest_StructuredQuery) isRunQueryRequest_QueryType()          {}
-func (*RunQueryRequest_Transaction) isRunQueryRequest_ConsistencySelector()    {}
-func (*RunQueryRequest_NewTransaction) isRunQueryRequest_ConsistencySelector() {}
-func (*RunQueryRequest_ReadTime) isRunQueryRequest_ConsistencySelector()       {}
+func (*RunQueryRequest_StructuredQuery) isRunQueryRequest_QueryType() {}
 
 func (m *RunQueryRequest) GetQueryType() isRunQueryRequest_QueryType {
 	if m != nil {
@@ -1119,23 +1435,39 @@ func (m *RunQueryRequest) GetQueryType() isRunQueryRequest_QueryType {
 	}
 	return nil
 }
-func (m *RunQueryRequest) GetConsistencySelector() isRunQueryRequest_ConsistencySelector {
-	if m != nil {
-		return m.ConsistencySelector
+
+func (m *RunQueryRequest) GetStructuredQuery() *StructuredQuery {
+	if x, ok := m.GetQueryType().(*RunQueryRequest_StructuredQuery); ok {
+		return x.StructuredQuery
 	}
 	return nil
 }
 
-func (m *RunQueryRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
+type isRunQueryRequest_ConsistencySelector interface {
+	isRunQueryRequest_ConsistencySelector()
 }
 
-func (m *RunQueryRequest) GetStructuredQuery() *StructuredQuery {
-	if x, ok := m.GetQueryType().(*RunQueryRequest_StructuredQuery); ok {
-		return x.StructuredQuery
+type RunQueryRequest_Transaction struct {
+	Transaction []byte `protobuf:"bytes,5,opt,name=transaction,proto3,oneof"`
+}
+
+type RunQueryRequest_NewTransaction struct {
+	NewTransaction *TransactionOptions `protobuf:"bytes,6,opt,name=new_transaction,json=newTransaction,proto3,oneof"`
+}
+
+type RunQueryRequest_ReadTime struct {
+	ReadTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=read_time,json=readTime,proto3,oneof"`
+}
+
+func (*RunQueryRequest_Transaction) isRunQueryRequest_ConsistencySelector() {}
+
+func (*RunQueryRequest_NewTransaction) isRunQueryRequest_ConsistencySelector() {}
+
+func (*RunQueryRequest_ReadTime) isRunQueryRequest_ConsistencySelector() {}
+
+func (m *RunQueryRequest) GetConsistencySelector() isRunQueryRequest_ConsistencySelector {
+	if m != nil {
+		return m.ConsistencySelector
 	}
 	return nil
 }
@@ -1154,7 +1486,7 @@ func (m *RunQueryRequest) GetNewTransaction() *TransactionOptions {
 	return nil
 }
 
-func (m *RunQueryRequest) GetReadTime() *google_protobuf1.Timestamp {
+func (m *RunQueryRequest) GetReadTime() *timestamp.Timestamp {
 	if x, ok := m.GetConsistencySelector().(*RunQueryRequest_ReadTime); ok {
 		return x.ReadTime
 	}
@@ -1236,7 +1568,7 @@ func _RunQueryRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *prot
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ConsistencySelector = &RunQueryRequest_ReadTime{msg}
 		return true, err
@@ -1251,7 +1583,7 @@ func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.QueryType.(type) {
 	case *RunQueryRequest_StructuredQuery:
 		s := proto.Size(x.StructuredQuery)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1261,17 +1593,17 @@ func _RunQueryRequest_OneofSizer(msg proto.Message) (n int) {
 	// consistency_selector
 	switch x := m.ConsistencySelector.(type) {
 	case *RunQueryRequest_Transaction:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Transaction)))
 		n += len(x.Transaction)
 	case *RunQueryRequest_NewTransaction:
 		s := proto.Size(x.NewTransaction)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *RunQueryRequest_ReadTime:
 		s := proto.Size(x.ReadTime)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1290,7 +1622,7 @@ type RunQueryResponse struct {
 	Transaction []byte `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
 	// A query result.
 	// Not set when reporting partial progress.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The time at which the document was read. This may be monotonically
 	// increasing; in this case, the previous documents in the result stream are
 	// guaranteed not to have changed between their `read_time` and this one.
@@ -1298,16 +1630,38 @@ type RunQueryResponse struct {
 	// If the query returns no results, a response with `read_time` and no
 	// `document` will be sent, and this represents the time at which the query
 	// was run.
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,3,opt,name=read_time,json=readTime" json:"read_time,omitempty"`
+	ReadTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// The number of results that have been skipped due to an offset between
 	// the last response and the current response.
-	SkippedResults int32 `protobuf:"varint,4,opt,name=skipped_results,json=skippedResults" json:"skipped_results,omitempty"`
+	SkippedResults       int32    `protobuf:"varint,4,opt,name=skipped_results,json=skippedResults,proto3" json:"skipped_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RunQueryResponse) Reset()                    { *m = RunQueryResponse{} }
-func (m *RunQueryResponse) String() string            { return proto.CompactTextString(m) }
-func (*RunQueryResponse) ProtoMessage()               {}
-func (*RunQueryResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{14} }
+func (m *RunQueryResponse) Reset()         { *m = RunQueryResponse{} }
+func (m *RunQueryResponse) String() string { return proto.CompactTextString(m) }
+func (*RunQueryResponse) ProtoMessage()    {}
+func (*RunQueryResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{14}
+}
+func (m *RunQueryResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunQueryResponse.Unmarshal(m, b)
+}
+func (m *RunQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunQueryResponse.Marshal(b, m, deterministic)
+}
+func (dst *RunQueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunQueryResponse.Merge(dst, src)
+}
+func (m *RunQueryResponse) XXX_Size() int {
+	return xxx_messageInfo_RunQueryResponse.Size(m)
+}
+func (m *RunQueryResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunQueryResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RunQueryResponse proto.InternalMessageInfo
 
 func (m *RunQueryResponse) GetTransaction() []byte {
 	if m != nil {
@@ -1323,7 +1677,7 @@ func (m *RunQueryResponse) GetDocument() *Document {
 	return nil
 }
 
-func (m *RunQueryResponse) GetReadTime() *google_protobuf1.Timestamp {
+func (m *RunQueryResponse) GetReadTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ReadTime
 	}
@@ -1351,18 +1705,18 @@ type WriteRequest struct {
 	// The database name. In the format:
 	// `projects/{project_id}/databases/{database_id}`.
 	// This is only required in the first message.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// The ID of the write stream to resume.
 	// This may only be set in the first message. When left empty, a new write
 	// stream will be created.
-	StreamId string `protobuf:"bytes,2,opt,name=stream_id,json=streamId" json:"stream_id,omitempty"`
+	StreamId string `protobuf:"bytes,2,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"`
 	// The writes to apply.
 	//
 	// Always executed atomically and in order.
 	// This must be empty on the first request.
 	// This may be empty on the last request.
 	// This must not be empty on all other requests.
-	Writes []*Write `protobuf:"bytes,3,rep,name=writes" json:"writes,omitempty"`
+	Writes []*Write `protobuf:"bytes,3,rep,name=writes,proto3" json:"writes,omitempty"`
 	// A stream token that was previously sent by the server.
 	//
 	// The client should set this field to the token from the most recent
@@ -1379,13 +1733,35 @@ type WriteRequest struct {
 	// Leave this field unset when creating a new stream.
 	StreamToken []byte `protobuf:"bytes,4,opt,name=stream_token,json=streamToken,proto3" json:"stream_token,omitempty"`
 	// Labels associated with this write request.
-	Labels map[string]string `protobuf:"bytes,5,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *WriteRequest) Reset()                    { *m = WriteRequest{} }
-func (m *WriteRequest) String() string            { return proto.CompactTextString(m) }
-func (*WriteRequest) ProtoMessage()               {}
-func (*WriteRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{15} }
+func (m *WriteRequest) Reset()         { *m = WriteRequest{} }
+func (m *WriteRequest) String() string { return proto.CompactTextString(m) }
+func (*WriteRequest) ProtoMessage()    {}
+func (*WriteRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{15}
+}
+func (m *WriteRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteRequest.Unmarshal(m, b)
+}
+func (m *WriteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteRequest.Marshal(b, m, deterministic)
+}
+func (dst *WriteRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteRequest.Merge(dst, src)
+}
+func (m *WriteRequest) XXX_Size() int {
+	return xxx_messageInfo_WriteRequest.Size(m)
+}
+func (m *WriteRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WriteRequest proto.InternalMessageInfo
 
 func (m *WriteRequest) GetDatabase() string {
 	if m != nil {
@@ -1426,7 +1802,7 @@ func (m *WriteRequest) GetLabels() map[string]string {
 type WriteResponse struct {
 	// The ID of the stream.
 	// Only set on the first message, when a new stream was created.
-	StreamId string `protobuf:"bytes,1,opt,name=stream_id,json=streamId" json:"stream_id,omitempty"`
+	StreamId string `protobuf:"bytes,1,opt,name=stream_id,json=streamId,proto3" json:"stream_id,omitempty"`
 	// A token that represents the position of this response in the stream.
 	// This can be used by a client to resume the stream at this point.
 	//
@@ -1436,15 +1812,37 @@ type WriteResponse struct {
 	//
 	// This i-th write result corresponds to the i-th write in the
 	// request.
-	WriteResults []*WriteResult `protobuf:"bytes,3,rep,name=write_results,json=writeResults" json:"write_results,omitempty"`
+	WriteResults []*WriteResult `protobuf:"bytes,3,rep,name=write_results,json=writeResults,proto3" json:"write_results,omitempty"`
 	// The time at which the commit occurred.
-	CommitTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=commit_time,json=commitTime" json:"commit_time,omitempty"`
+	CommitTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=commit_time,json=commitTime,proto3" json:"commit_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *WriteResponse) Reset()         { *m = WriteResponse{} }
+func (m *WriteResponse) String() string { return proto.CompactTextString(m) }
+func (*WriteResponse) ProtoMessage()    {}
+func (*WriteResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{16}
+}
+func (m *WriteResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteResponse.Unmarshal(m, b)
+}
+func (m *WriteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteResponse.Marshal(b, m, deterministic)
+}
+func (dst *WriteResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteResponse.Merge(dst, src)
+}
+func (m *WriteResponse) XXX_Size() int {
+	return xxx_messageInfo_WriteResponse.Size(m)
+}
+func (m *WriteResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteResponse.DiscardUnknown(m)
 }
 
-func (m *WriteResponse) Reset()                    { *m = WriteResponse{} }
-func (m *WriteResponse) String() string            { return proto.CompactTextString(m) }
-func (*WriteResponse) ProtoMessage()               {}
-func (*WriteResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{16} }
+var xxx_messageInfo_WriteResponse proto.InternalMessageInfo
 
 func (m *WriteResponse) GetStreamId() string {
 	if m != nil {
@@ -1467,7 +1865,7 @@ func (m *WriteResponse) GetWriteResults() []*WriteResult {
 	return nil
 }
 
-func (m *WriteResponse) GetCommitTime() *google_protobuf1.Timestamp {
+func (m *WriteResponse) GetCommitTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CommitTime
 	}
@@ -1478,7 +1876,7 @@ func (m *WriteResponse) GetCommitTime() *google_protobuf1.Timestamp {
 type ListenRequest struct {
 	// The database name. In the format:
 	// `projects/{project_id}/databases/{database_id}`.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// The supported target changes.
 	//
 	// Types that are valid to be assigned to TargetChange:
@@ -1486,26 +1884,57 @@ type ListenRequest struct {
 	//	*ListenRequest_RemoveTarget
 	TargetChange isListenRequest_TargetChange `protobuf_oneof:"target_change"`
 	// Labels associated with this target change.
-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *ListenRequest) Reset()                    { *m = ListenRequest{} }
-func (m *ListenRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListenRequest) ProtoMessage()               {}
-func (*ListenRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{17} }
+func (m *ListenRequest) Reset()         { *m = ListenRequest{} }
+func (m *ListenRequest) String() string { return proto.CompactTextString(m) }
+func (*ListenRequest) ProtoMessage()    {}
+func (*ListenRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{17}
+}
+func (m *ListenRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListenRequest.Unmarshal(m, b)
+}
+func (m *ListenRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListenRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListenRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListenRequest.Merge(dst, src)
+}
+func (m *ListenRequest) XXX_Size() int {
+	return xxx_messageInfo_ListenRequest.Size(m)
+}
+func (m *ListenRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListenRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListenRequest proto.InternalMessageInfo
+
+func (m *ListenRequest) GetDatabase() string {
+	if m != nil {
+		return m.Database
+	}
+	return ""
+}
 
 type isListenRequest_TargetChange interface {
 	isListenRequest_TargetChange()
 }
 
 type ListenRequest_AddTarget struct {
-	AddTarget *Target `protobuf:"bytes,2,opt,name=add_target,json=addTarget,oneof"`
+	AddTarget *Target `protobuf:"bytes,2,opt,name=add_target,json=addTarget,proto3,oneof"`
 }
+
 type ListenRequest_RemoveTarget struct {
-	RemoveTarget int32 `protobuf:"varint,3,opt,name=remove_target,json=removeTarget,oneof"`
+	RemoveTarget int32 `protobuf:"varint,3,opt,name=remove_target,json=removeTarget,proto3,oneof"`
 }
 
-func (*ListenRequest_AddTarget) isListenRequest_TargetChange()    {}
+func (*ListenRequest_AddTarget) isListenRequest_TargetChange() {}
+
 func (*ListenRequest_RemoveTarget) isListenRequest_TargetChange() {}
 
 func (m *ListenRequest) GetTargetChange() isListenRequest_TargetChange {
@@ -1515,13 +1944,6 @@ func (m *ListenRequest) GetTargetChange() isListenRequest_TargetChange {
 	return nil
 }
 
-func (m *ListenRequest) GetDatabase() string {
-	if m != nil {
-		return m.Database
-	}
-	return ""
-}
-
 func (m *ListenRequest) GetAddTarget() *Target {
 	if x, ok := m.GetTargetChange().(*ListenRequest_AddTarget); ok {
 		return x.AddTarget
@@ -1599,11 +2021,11 @@ func _ListenRequest_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.TargetChange.(type) {
 	case *ListenRequest_AddTarget:
 		s := proto.Size(x.AddTarget)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ListenRequest_RemoveTarget:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.RemoveTarget))
 	case nil:
 	default:
@@ -1622,39 +2044,69 @@ type ListenResponse struct {
 	//	*ListenResponse_DocumentDelete
 	//	*ListenResponse_DocumentRemove
 	//	*ListenResponse_Filter
-	ResponseType isListenResponse_ResponseType `protobuf_oneof:"response_type"`
+	ResponseType         isListenResponse_ResponseType `protobuf_oneof:"response_type"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *ListenResponse) Reset()         { *m = ListenResponse{} }
+func (m *ListenResponse) String() string { return proto.CompactTextString(m) }
+func (*ListenResponse) ProtoMessage()    {}
+func (*ListenResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{18}
+}
+func (m *ListenResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListenResponse.Unmarshal(m, b)
+}
+func (m *ListenResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListenResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListenResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListenResponse.Merge(dst, src)
+}
+func (m *ListenResponse) XXX_Size() int {
+	return xxx_messageInfo_ListenResponse.Size(m)
+}
+func (m *ListenResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListenResponse.DiscardUnknown(m)
 }
 
-func (m *ListenResponse) Reset()                    { *m = ListenResponse{} }
-func (m *ListenResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListenResponse) ProtoMessage()               {}
-func (*ListenResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{18} }
+var xxx_messageInfo_ListenResponse proto.InternalMessageInfo
 
 type isListenResponse_ResponseType interface {
 	isListenResponse_ResponseType()
 }
 
 type ListenResponse_TargetChange struct {
-	TargetChange *TargetChange `protobuf:"bytes,2,opt,name=target_change,json=targetChange,oneof"`
+	TargetChange *TargetChange `protobuf:"bytes,2,opt,name=target_change,json=targetChange,proto3,oneof"`
 }
+
 type ListenResponse_DocumentChange struct {
-	DocumentChange *DocumentChange `protobuf:"bytes,3,opt,name=document_change,json=documentChange,oneof"`
+	DocumentChange *DocumentChange `protobuf:"bytes,3,opt,name=document_change,json=documentChange,proto3,oneof"`
 }
+
 type ListenResponse_DocumentDelete struct {
-	DocumentDelete *DocumentDelete `protobuf:"bytes,4,opt,name=document_delete,json=documentDelete,oneof"`
+	DocumentDelete *DocumentDelete `protobuf:"bytes,4,opt,name=document_delete,json=documentDelete,proto3,oneof"`
 }
+
 type ListenResponse_DocumentRemove struct {
-	DocumentRemove *DocumentRemove `protobuf:"bytes,6,opt,name=document_remove,json=documentRemove,oneof"`
+	DocumentRemove *DocumentRemove `protobuf:"bytes,6,opt,name=document_remove,json=documentRemove,proto3,oneof"`
 }
+
 type ListenResponse_Filter struct {
-	Filter *ExistenceFilter `protobuf:"bytes,5,opt,name=filter,oneof"`
+	Filter *ExistenceFilter `protobuf:"bytes,5,opt,name=filter,proto3,oneof"`
 }
 
-func (*ListenResponse_TargetChange) isListenResponse_ResponseType()   {}
+func (*ListenResponse_TargetChange) isListenResponse_ResponseType() {}
+
 func (*ListenResponse_DocumentChange) isListenResponse_ResponseType() {}
+
 func (*ListenResponse_DocumentDelete) isListenResponse_ResponseType() {}
+
 func (*ListenResponse_DocumentRemove) isListenResponse_ResponseType() {}
-func (*ListenResponse_Filter) isListenResponse_ResponseType()         {}
+
+func (*ListenResponse_Filter) isListenResponse_ResponseType() {}
 
 func (m *ListenResponse) GetResponseType() isListenResponse_ResponseType {
 	if m != nil {
@@ -1799,27 +2251,27 @@ func _ListenResponse_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.ResponseType.(type) {
 	case *ListenResponse_TargetChange:
 		s := proto.Size(x.TargetChange)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ListenResponse_DocumentChange:
 		s := proto.Size(x.DocumentChange)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ListenResponse_DocumentDelete:
 		s := proto.Size(x.DocumentDelete)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ListenResponse_DocumentRemove:
 		s := proto.Size(x.DocumentRemove)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ListenResponse_Filter:
 		s := proto.Size(x.Filter)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -1854,40 +2306,53 @@ type Target struct {
 	// client-assigned or be server-assigned in a previous stream. All targets
 	// with client provided IDs must be added before adding a target that needs
 	// a server-assigned id.
-	TargetId int32 `protobuf:"varint,5,opt,name=target_id,json=targetId" json:"target_id,omitempty"`
+	TargetId int32 `protobuf:"varint,5,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"`
 	// If the target should be removed once it is current and consistent.
-	Once bool `protobuf:"varint,6,opt,name=once" json:"once,omitempty"`
+	Once                 bool     `protobuf:"varint,6,opt,name=once,proto3" json:"once,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Target) Reset()                    { *m = Target{} }
-func (m *Target) String() string            { return proto.CompactTextString(m) }
-func (*Target) ProtoMessage()               {}
-func (*Target) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{19} }
+func (m *Target) Reset()         { *m = Target{} }
+func (m *Target) String() string { return proto.CompactTextString(m) }
+func (*Target) ProtoMessage()    {}
+func (*Target) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{19}
+}
+func (m *Target) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Target.Unmarshal(m, b)
+}
+func (m *Target) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Target.Marshal(b, m, deterministic)
+}
+func (dst *Target) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target.Merge(dst, src)
+}
+func (m *Target) XXX_Size() int {
+	return xxx_messageInfo_Target.Size(m)
+}
+func (m *Target) XXX_DiscardUnknown() {
+	xxx_messageInfo_Target.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Target proto.InternalMessageInfo
 
 type isTarget_TargetType interface {
 	isTarget_TargetType()
 }
-type isTarget_ResumeType interface {
-	isTarget_ResumeType()
-}
 
 type Target_Query struct {
-	Query *Target_QueryTarget `protobuf:"bytes,2,opt,name=query,oneof"`
+	Query *Target_QueryTarget `protobuf:"bytes,2,opt,name=query,proto3,oneof"`
 }
+
 type Target_Documents struct {
-	Documents *Target_DocumentsTarget `protobuf:"bytes,3,opt,name=documents,oneof"`
-}
-type Target_ResumeToken struct {
-	ResumeToken []byte `protobuf:"bytes,4,opt,name=resume_token,json=resumeToken,proto3,oneof"`
-}
-type Target_ReadTime struct {
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,11,opt,name=read_time,json=readTime,oneof"`
+	Documents *Target_DocumentsTarget `protobuf:"bytes,3,opt,name=documents,proto3,oneof"`
 }
 
-func (*Target_Query) isTarget_TargetType()       {}
-func (*Target_Documents) isTarget_TargetType()   {}
-func (*Target_ResumeToken) isTarget_ResumeType() {}
-func (*Target_ReadTime) isTarget_ResumeType()    {}
+func (*Target_Query) isTarget_TargetType() {}
+
+func (*Target_Documents) isTarget_TargetType() {}
 
 func (m *Target) GetTargetType() isTarget_TargetType {
 	if m != nil {
@@ -1895,12 +2360,6 @@ func (m *Target) GetTargetType() isTarget_TargetType {
 	}
 	return nil
 }
-func (m *Target) GetResumeType() isTarget_ResumeType {
-	if m != nil {
-		return m.ResumeType
-	}
-	return nil
-}
 
 func (m *Target) GetQuery() *Target_QueryTarget {
 	if x, ok := m.GetTargetType().(*Target_Query); ok {
@@ -1916,6 +2375,29 @@ func (m *Target) GetDocuments() *Target_DocumentsTarget {
 	return nil
 }
 
+type isTarget_ResumeType interface {
+	isTarget_ResumeType()
+}
+
+type Target_ResumeToken struct {
+	ResumeToken []byte `protobuf:"bytes,4,opt,name=resume_token,json=resumeToken,proto3,oneof"`
+}
+
+type Target_ReadTime struct {
+	ReadTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=read_time,json=readTime,proto3,oneof"`
+}
+
+func (*Target_ResumeToken) isTarget_ResumeType() {}
+
+func (*Target_ReadTime) isTarget_ResumeType() {}
+
+func (m *Target) GetResumeType() isTarget_ResumeType {
+	if m != nil {
+		return m.ResumeType
+	}
+	return nil
+}
+
 func (m *Target) GetResumeToken() []byte {
 	if x, ok := m.GetResumeType().(*Target_ResumeToken); ok {
 		return x.ResumeToken
@@ -1923,7 +2405,7 @@ func (m *Target) GetResumeToken() []byte {
 	return nil
 }
 
-func (m *Target) GetReadTime() *google_protobuf1.Timestamp {
+func (m *Target) GetReadTime() *timestamp.Timestamp {
 	if x, ok := m.GetResumeType().(*Target_ReadTime); ok {
 		return x.ReadTime
 	}
@@ -2019,7 +2501,7 @@ func _Target_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer)
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.ResumeType = &Target_ReadTime{msg}
 		return true, err
@@ -2034,12 +2516,12 @@ func _Target_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.TargetType.(type) {
 	case *Target_Query:
 		s := proto.Size(x.Query)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Target_Documents:
 		s := proto.Size(x.Documents)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -2049,12 +2531,12 @@ func _Target_OneofSizer(msg proto.Message) (n int) {
 	// resume_type
 	switch x := m.ResumeType.(type) {
 	case *Target_ResumeToken:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ResumeToken)))
 		n += len(x.ResumeToken)
 	case *Target_ReadTime:
 		s := proto.Size(x.ReadTime)
-		n += proto.SizeVarint(11<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -2070,13 +2552,35 @@ type Target_DocumentsTarget struct {
 	// `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
 	// The request will fail if any of the document is not a child resource of
 	// the given `database`. Duplicate names will be elided.
-	Documents []string `protobuf:"bytes,2,rep,name=documents" json:"documents,omitempty"`
+	Documents            []string `protobuf:"bytes,2,rep,name=documents,proto3" json:"documents,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Target_DocumentsTarget) Reset()                    { *m = Target_DocumentsTarget{} }
-func (m *Target_DocumentsTarget) String() string            { return proto.CompactTextString(m) }
-func (*Target_DocumentsTarget) ProtoMessage()               {}
-func (*Target_DocumentsTarget) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{19, 0} }
+func (m *Target_DocumentsTarget) Reset()         { *m = Target_DocumentsTarget{} }
+func (m *Target_DocumentsTarget) String() string { return proto.CompactTextString(m) }
+func (*Target_DocumentsTarget) ProtoMessage()    {}
+func (*Target_DocumentsTarget) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{19, 0}
+}
+func (m *Target_DocumentsTarget) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Target_DocumentsTarget.Unmarshal(m, b)
+}
+func (m *Target_DocumentsTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Target_DocumentsTarget.Marshal(b, m, deterministic)
+}
+func (dst *Target_DocumentsTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target_DocumentsTarget.Merge(dst, src)
+}
+func (m *Target_DocumentsTarget) XXX_Size() int {
+	return xxx_messageInfo_Target_DocumentsTarget.Size(m)
+}
+func (m *Target_DocumentsTarget) XXX_DiscardUnknown() {
+	xxx_messageInfo_Target_DocumentsTarget.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Target_DocumentsTarget proto.InternalMessageInfo
 
 func (m *Target_DocumentsTarget) GetDocuments() []string {
 	if m != nil {
@@ -2093,25 +2597,54 @@ type Target_QueryTarget struct {
 	// For example:
 	// `projects/my-project/databases/my-database/documents` or
 	// `projects/my-project/databases/my-database/documents/chatrooms/my-chatroom`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The query to run.
 	//
 	// Types that are valid to be assigned to QueryType:
 	//	*Target_QueryTarget_StructuredQuery
-	QueryType isTarget_QueryTarget_QueryType `protobuf_oneof:"query_type"`
+	QueryType            isTarget_QueryTarget_QueryType `protobuf_oneof:"query_type"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
 }
 
-func (m *Target_QueryTarget) Reset()                    { *m = Target_QueryTarget{} }
-func (m *Target_QueryTarget) String() string            { return proto.CompactTextString(m) }
-func (*Target_QueryTarget) ProtoMessage()               {}
-func (*Target_QueryTarget) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{19, 1} }
+func (m *Target_QueryTarget) Reset()         { *m = Target_QueryTarget{} }
+func (m *Target_QueryTarget) String() string { return proto.CompactTextString(m) }
+func (*Target_QueryTarget) ProtoMessage()    {}
+func (*Target_QueryTarget) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{19, 1}
+}
+func (m *Target_QueryTarget) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Target_QueryTarget.Unmarshal(m, b)
+}
+func (m *Target_QueryTarget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Target_QueryTarget.Marshal(b, m, deterministic)
+}
+func (dst *Target_QueryTarget) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Target_QueryTarget.Merge(dst, src)
+}
+func (m *Target_QueryTarget) XXX_Size() int {
+	return xxx_messageInfo_Target_QueryTarget.Size(m)
+}
+func (m *Target_QueryTarget) XXX_DiscardUnknown() {
+	xxx_messageInfo_Target_QueryTarget.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Target_QueryTarget proto.InternalMessageInfo
+
+func (m *Target_QueryTarget) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
 
 type isTarget_QueryTarget_QueryType interface {
 	isTarget_QueryTarget_QueryType()
 }
 
 type Target_QueryTarget_StructuredQuery struct {
-	StructuredQuery *StructuredQuery `protobuf:"bytes,2,opt,name=structured_query,json=structuredQuery,oneof"`
+	StructuredQuery *StructuredQuery `protobuf:"bytes,2,opt,name=structured_query,json=structuredQuery,proto3,oneof"`
 }
 
 func (*Target_QueryTarget_StructuredQuery) isTarget_QueryTarget_QueryType() {}
@@ -2123,13 +2656,6 @@ func (m *Target_QueryTarget) GetQueryType() isTarget_QueryTarget_QueryType {
 	return nil
 }
 
-func (m *Target_QueryTarget) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
 func (m *Target_QueryTarget) GetStructuredQuery() *StructuredQuery {
 	if x, ok := m.GetQueryType().(*Target_QueryTarget_StructuredQuery); ok {
 		return x.StructuredQuery
@@ -2182,7 +2708,7 @@ func _Target_QueryTarget_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.QueryType.(type) {
 	case *Target_QueryTarget_StructuredQuery:
 		s := proto.Size(x.StructuredQuery)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -2195,7 +2721,7 @@ func _Target_QueryTarget_OneofSizer(msg proto.Message) (n int) {
 // Targets being watched have changed.
 type TargetChange struct {
 	// The type of change that occurred.
-	TargetChangeType TargetChange_TargetChangeType `protobuf:"varint,1,opt,name=target_change_type,json=targetChangeType,enum=google.firestore.v1beta1.TargetChange_TargetChangeType" json:"target_change_type,omitempty"`
+	TargetChangeType TargetChange_TargetChangeType `protobuf:"varint,1,opt,name=target_change_type,json=targetChangeType,proto3,enum=google.firestore.v1beta1.TargetChange_TargetChangeType" json:"target_change_type,omitempty"`
 	// The target IDs of targets that have changed.
 	//
 	// If empty, the change applies to all targets.
@@ -2205,9 +2731,9 @@ type TargetChange struct {
 	// associate server-assigned target IDs with added targets.
 	//
 	// For other states, the order of the target IDs is not defined.
-	TargetIds []int32 `protobuf:"varint,2,rep,packed,name=target_ids,json=targetIds" json:"target_ids,omitempty"`
+	TargetIds []int32 `protobuf:"varint,2,rep,packed,name=target_ids,json=targetIds,proto3" json:"target_ids,omitempty"`
 	// The error that resulted in this change, if applicable.
-	Cause *google_rpc.Status `protobuf:"bytes,3,opt,name=cause" json:"cause,omitempty"`
+	Cause *status.Status `protobuf:"bytes,3,opt,name=cause,proto3" json:"cause,omitempty"`
 	// A token that can be used to resume the stream for the given `target_ids`,
 	// or all targets if `target_ids` is empty.
 	//
@@ -2223,13 +2749,35 @@ type TargetChange struct {
 	//
 	// For a given stream, `read_time` is guaranteed to be monotonically
 	// increasing.
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=read_time,json=readTime" json:"read_time,omitempty"`
+	ReadTime             *timestamp.Timestamp `protobuf:"bytes,6,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *TargetChange) Reset()                    { *m = TargetChange{} }
-func (m *TargetChange) String() string            { return proto.CompactTextString(m) }
-func (*TargetChange) ProtoMessage()               {}
-func (*TargetChange) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{20} }
+func (m *TargetChange) Reset()         { *m = TargetChange{} }
+func (m *TargetChange) String() string { return proto.CompactTextString(m) }
+func (*TargetChange) ProtoMessage()    {}
+func (*TargetChange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{20}
+}
+func (m *TargetChange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TargetChange.Unmarshal(m, b)
+}
+func (m *TargetChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TargetChange.Marshal(b, m, deterministic)
+}
+func (dst *TargetChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TargetChange.Merge(dst, src)
+}
+func (m *TargetChange) XXX_Size() int {
+	return xxx_messageInfo_TargetChange.Size(m)
+}
+func (m *TargetChange) XXX_DiscardUnknown() {
+	xxx_messageInfo_TargetChange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TargetChange proto.InternalMessageInfo
 
 func (m *TargetChange) GetTargetChangeType() TargetChange_TargetChangeType {
 	if m != nil {
@@ -2245,7 +2793,7 @@ func (m *TargetChange) GetTargetIds() []int32 {
 	return nil
 }
 
-func (m *TargetChange) GetCause() *google_rpc.Status {
+func (m *TargetChange) GetCause() *status.Status {
 	if m != nil {
 		return m.Cause
 	}
@@ -2259,7 +2807,7 @@ func (m *TargetChange) GetResumeToken() []byte {
 	return nil
 }
 
-func (m *TargetChange) GetReadTime() *google_protobuf1.Timestamp {
+func (m *TargetChange) GetReadTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ReadTime
 	}
@@ -2272,18 +2820,40 @@ type ListCollectionIdsRequest struct {
 	// `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
 	// For example:
 	// `projects/my-project/databases/my-database/documents/chatrooms/my-chatroom`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The maximum number of results to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// A page token. Must be a value from
 	// [ListCollectionIdsResponse][google.firestore.v1beta1.ListCollectionIdsResponse].
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCollectionIdsRequest) Reset()         { *m = ListCollectionIdsRequest{} }
+func (m *ListCollectionIdsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListCollectionIdsRequest) ProtoMessage()    {}
+func (*ListCollectionIdsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{21}
+}
+func (m *ListCollectionIdsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCollectionIdsRequest.Unmarshal(m, b)
+}
+func (m *ListCollectionIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCollectionIdsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListCollectionIdsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCollectionIdsRequest.Merge(dst, src)
+}
+func (m *ListCollectionIdsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListCollectionIdsRequest.Size(m)
+}
+func (m *ListCollectionIdsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCollectionIdsRequest.DiscardUnknown(m)
 }
 
-func (m *ListCollectionIdsRequest) Reset()                    { *m = ListCollectionIdsRequest{} }
-func (m *ListCollectionIdsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListCollectionIdsRequest) ProtoMessage()               {}
-func (*ListCollectionIdsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{21} }
+var xxx_messageInfo_ListCollectionIdsRequest proto.InternalMessageInfo
 
 func (m *ListCollectionIdsRequest) GetParent() string {
 	if m != nil {
@@ -2309,15 +2879,37 @@ func (m *ListCollectionIdsRequest) GetPageToken() string {
 // The response from [Firestore.ListCollectionIds][google.firestore.v1beta1.Firestore.ListCollectionIds].
 type ListCollectionIdsResponse struct {
 	// The collection ids.
-	CollectionIds []string `protobuf:"bytes,1,rep,name=collection_ids,json=collectionIds" json:"collection_ids,omitempty"`
+	CollectionIds []string `protobuf:"bytes,1,rep,name=collection_ids,json=collectionIds,proto3" json:"collection_ids,omitempty"`
 	// A page token that may be used to continue the list.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListCollectionIdsResponse) Reset()                    { *m = ListCollectionIdsResponse{} }
-func (m *ListCollectionIdsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListCollectionIdsResponse) ProtoMessage()               {}
-func (*ListCollectionIdsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{22} }
+func (m *ListCollectionIdsResponse) Reset()         { *m = ListCollectionIdsResponse{} }
+func (m *ListCollectionIdsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListCollectionIdsResponse) ProtoMessage()    {}
+func (*ListCollectionIdsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_firestore_2eafd6d2fedf882a, []int{22}
+}
+func (m *ListCollectionIdsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCollectionIdsResponse.Unmarshal(m, b)
+}
+func (m *ListCollectionIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCollectionIdsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListCollectionIdsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCollectionIdsResponse.Merge(dst, src)
+}
+func (m *ListCollectionIdsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListCollectionIdsResponse.Size(m)
+}
+func (m *ListCollectionIdsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCollectionIdsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListCollectionIdsResponse proto.InternalMessageInfo
 
 func (m *ListCollectionIdsResponse) GetCollectionIds() []string {
 	if m != nil {
@@ -2350,8 +2942,10 @@ func init() {
 	proto.RegisterType((*RunQueryRequest)(nil), "google.firestore.v1beta1.RunQueryRequest")
 	proto.RegisterType((*RunQueryResponse)(nil), "google.firestore.v1beta1.RunQueryResponse")
 	proto.RegisterType((*WriteRequest)(nil), "google.firestore.v1beta1.WriteRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.firestore.v1beta1.WriteRequest.LabelsEntry")
 	proto.RegisterType((*WriteResponse)(nil), "google.firestore.v1beta1.WriteResponse")
 	proto.RegisterType((*ListenRequest)(nil), "google.firestore.v1beta1.ListenRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.firestore.v1beta1.ListenRequest.LabelsEntry")
 	proto.RegisterType((*ListenResponse)(nil), "google.firestore.v1beta1.ListenResponse")
 	proto.RegisterType((*Target)(nil), "google.firestore.v1beta1.Target")
 	proto.RegisterType((*Target_DocumentsTarget)(nil), "google.firestore.v1beta1.Target.DocumentsTarget")
@@ -2370,8 +2964,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Firestore service
-
+// FirestoreClient is the client API for Firestore service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type FirestoreClient interface {
 	// Gets a single document.
 	GetDocument(ctx context.Context, in *GetDocumentRequest, opts ...grpc.CallOption) (*Document, error)
@@ -2382,7 +2977,7 @@ type FirestoreClient interface {
 	// Updates or inserts a document.
 	UpdateDocument(ctx context.Context, in *UpdateDocumentRequest, opts ...grpc.CallOption) (*Document, error)
 	// Deletes a document.
-	DeleteDocument(ctx context.Context, in *DeleteDocumentRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeleteDocument(ctx context.Context, in *DeleteDocumentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Gets multiple documents.
 	//
 	// Documents returned by this method are not guaranteed to be returned in the
@@ -2393,7 +2988,7 @@ type FirestoreClient interface {
 	// Commits a transaction, while optionally updating documents.
 	Commit(ctx context.Context, in *CommitRequest, opts ...grpc.CallOption) (*CommitResponse, error)
 	// Rolls back a transaction.
-	Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Runs a query.
 	RunQuery(ctx context.Context, in *RunQueryRequest, opts ...grpc.CallOption) (Firestore_RunQueryClient, error)
 	// Streams batches of document updates and deletes, in order.
@@ -2414,7 +3009,7 @@ func NewFirestoreClient(cc *grpc.ClientConn) FirestoreClient {
 
 func (c *firestoreClient) GetDocument(ctx context.Context, in *GetDocumentRequest, opts ...grpc.CallOption) (*Document, error) {
 	out := new(Document)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/GetDocument", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/GetDocument", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2423,7 +3018,7 @@ func (c *firestoreClient) GetDocument(ctx context.Context, in *GetDocumentReques
 
 func (c *firestoreClient) ListDocuments(ctx context.Context, in *ListDocumentsRequest, opts ...grpc.CallOption) (*ListDocumentsResponse, error) {
 	out := new(ListDocumentsResponse)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/ListDocuments", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/ListDocuments", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2432,7 +3027,7 @@ func (c *firestoreClient) ListDocuments(ctx context.Context, in *ListDocumentsRe
 
 func (c *firestoreClient) CreateDocument(ctx context.Context, in *CreateDocumentRequest, opts ...grpc.CallOption) (*Document, error) {
 	out := new(Document)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/CreateDocument", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/CreateDocument", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2441,16 +3036,16 @@ func (c *firestoreClient) CreateDocument(ctx context.Context, in *CreateDocument
 
 func (c *firestoreClient) UpdateDocument(ctx context.Context, in *UpdateDocumentRequest, opts ...grpc.CallOption) (*Document, error) {
 	out := new(Document)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/UpdateDocument", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/UpdateDocument", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *firestoreClient) DeleteDocument(ctx context.Context, in *DeleteDocumentRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/DeleteDocument", in, out, c.cc, opts...)
+func (c *firestoreClient) DeleteDocument(ctx context.Context, in *DeleteDocumentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/DeleteDocument", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2458,7 +3053,7 @@ func (c *firestoreClient) DeleteDocument(ctx context.Context, in *DeleteDocument
 }
 
 func (c *firestoreClient) BatchGetDocuments(ctx context.Context, in *BatchGetDocumentsRequest, opts ...grpc.CallOption) (Firestore_BatchGetDocumentsClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Firestore_serviceDesc.Streams[0], c.cc, "/google.firestore.v1beta1.Firestore/BatchGetDocuments", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Firestore_serviceDesc.Streams[0], "/google.firestore.v1beta1.Firestore/BatchGetDocuments", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2491,7 +3086,7 @@ func (x *firestoreBatchGetDocumentsClient) Recv() (*BatchGetDocumentsResponse, e
 
 func (c *firestoreClient) BeginTransaction(ctx context.Context, in *BeginTransactionRequest, opts ...grpc.CallOption) (*BeginTransactionResponse, error) {
 	out := new(BeginTransactionResponse)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/BeginTransaction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/BeginTransaction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2500,16 +3095,16 @@ func (c *firestoreClient) BeginTransaction(ctx context.Context, in *BeginTransac
 
 func (c *firestoreClient) Commit(ctx context.Context, in *CommitRequest, opts ...grpc.CallOption) (*CommitResponse, error) {
 	out := new(CommitResponse)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/Commit", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/Commit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *firestoreClient) Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/Rollback", in, out, c.cc, opts...)
+func (c *firestoreClient) Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/Rollback", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2517,7 +3112,7 @@ func (c *firestoreClient) Rollback(ctx context.Context, in *RollbackRequest, opt
 }
 
 func (c *firestoreClient) RunQuery(ctx context.Context, in *RunQueryRequest, opts ...grpc.CallOption) (Firestore_RunQueryClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Firestore_serviceDesc.Streams[1], c.cc, "/google.firestore.v1beta1.Firestore/RunQuery", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Firestore_serviceDesc.Streams[1], "/google.firestore.v1beta1.Firestore/RunQuery", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2549,7 +3144,7 @@ func (x *firestoreRunQueryClient) Recv() (*RunQueryResponse, error) {
 }
 
 func (c *firestoreClient) Write(ctx context.Context, opts ...grpc.CallOption) (Firestore_WriteClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Firestore_serviceDesc.Streams[2], c.cc, "/google.firestore.v1beta1.Firestore/Write", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Firestore_serviceDesc.Streams[2], "/google.firestore.v1beta1.Firestore/Write", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2580,7 +3175,7 @@ func (x *firestoreWriteClient) Recv() (*WriteResponse, error) {
 }
 
 func (c *firestoreClient) Listen(ctx context.Context, opts ...grpc.CallOption) (Firestore_ListenClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Firestore_serviceDesc.Streams[3], c.cc, "/google.firestore.v1beta1.Firestore/Listen", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Firestore_serviceDesc.Streams[3], "/google.firestore.v1beta1.Firestore/Listen", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2612,15 +3207,14 @@ func (x *firestoreListenClient) Recv() (*ListenResponse, error) {
 
 func (c *firestoreClient) ListCollectionIds(ctx context.Context, in *ListCollectionIdsRequest, opts ...grpc.CallOption) (*ListCollectionIdsResponse, error) {
 	out := new(ListCollectionIdsResponse)
-	err := grpc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/ListCollectionIds", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.firestore.v1beta1.Firestore/ListCollectionIds", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Firestore service
-
+// FirestoreServer is the server API for Firestore service.
 type FirestoreServer interface {
 	// Gets a single document.
 	GetDocument(context.Context, *GetDocumentRequest) (*Document, error)
@@ -2631,7 +3225,7 @@ type FirestoreServer interface {
 	// Updates or inserts a document.
 	UpdateDocument(context.Context, *UpdateDocumentRequest) (*Document, error)
 	// Deletes a document.
-	DeleteDocument(context.Context, *DeleteDocumentRequest) (*google_protobuf4.Empty, error)
+	DeleteDocument(context.Context, *DeleteDocumentRequest) (*empty.Empty, error)
 	// Gets multiple documents.
 	//
 	// Documents returned by this method are not guaranteed to be returned in the
@@ -2642,7 +3236,7 @@ type FirestoreServer interface {
 	// Commits a transaction, while optionally updating documents.
 	Commit(context.Context, *CommitRequest) (*CommitResponse, error)
 	// Rolls back a transaction.
-	Rollback(context.Context, *RollbackRequest) (*google_protobuf4.Empty, error)
+	Rollback(context.Context, *RollbackRequest) (*empty.Empty, error)
 	// Runs a query.
 	RunQuery(*RunQueryRequest, Firestore_RunQueryServer) error
 	// Streams batches of document updates and deletes, in order.
@@ -2981,9 +3575,11 @@ var _Firestore_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/firestore/v1beta1/firestore.proto",
 }
 
-func init() { proto.RegisterFile("google/firestore/v1beta1/firestore.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/firestore/v1beta1/firestore.proto", fileDescriptor_firestore_2eafd6d2fedf882a)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_firestore_2eafd6d2fedf882a = []byte{
 	// 2180 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x8f, 0x1b, 0x49,
 	0x15, 0x77, 0xf9, 0x6b, 0xec, 0xe7, 0x8f, 0xf1, 0x96, 0x92, 0xac, 0xe3, 0x64, 0xc9, 0xd0, 0x4b,
diff --git a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/query.pb.go b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/query.pb.go
index 98e5e207..16515757 100644
--- a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/query.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/query.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/query.proto
 
-package firestore
+package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/wrappers"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A sort direction.
 type StructuredQuery_Direction int32
 
@@ -40,7 +46,9 @@ var StructuredQuery_Direction_value = map[string]int32{
 func (x StructuredQuery_Direction) String() string {
 	return proto.EnumName(StructuredQuery_Direction_name, int32(x))
 }
-func (StructuredQuery_Direction) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+func (StructuredQuery_Direction) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 0}
+}
 
 // A composite filter operator.
 type StructuredQuery_CompositeFilter_Operator int32
@@ -65,7 +73,7 @@ func (x StructuredQuery_CompositeFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_CompositeFilter_Operator_name, int32(x))
 }
 func (StructuredQuery_CompositeFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2, 0}
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 2, 0}
 }
 
 // A field filter operator.
@@ -108,7 +116,7 @@ func (x StructuredQuery_FieldFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_FieldFilter_Operator_name, int32(x))
 }
 func (StructuredQuery_FieldFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 3, 0}
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 3, 0}
 }
 
 // A unary operator.
@@ -138,17 +146,17 @@ func (x StructuredQuery_UnaryFilter_Operator) String() string {
 	return proto.EnumName(StructuredQuery_UnaryFilter_Operator_name, int32(x))
 }
 func (StructuredQuery_UnaryFilter_Operator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 4, 0}
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 4, 0}
 }
 
 // A Firestore query.
 type StructuredQuery struct {
 	// The projection to return.
-	Select *StructuredQuery_Projection `protobuf:"bytes,1,opt,name=select" json:"select,omitempty"`
+	Select *StructuredQuery_Projection `protobuf:"bytes,1,opt,name=select,proto3" json:"select,omitempty"`
 	// The collections to query.
-	From []*StructuredQuery_CollectionSelector `protobuf:"bytes,2,rep,name=from" json:"from,omitempty"`
+	From []*StructuredQuery_CollectionSelector `protobuf:"bytes,2,rep,name=from,proto3" json:"from,omitempty"`
 	// The filter to apply.
-	Where *StructuredQuery_Filter `protobuf:"bytes,3,opt,name=where" json:"where,omitempty"`
+	Where *StructuredQuery_Filter `protobuf:"bytes,3,opt,name=where,proto3" json:"where,omitempty"`
 	// The order to apply to the query results.
 	//
 	// Firestore guarantees a stable ordering through the following rules:
@@ -167,27 +175,49 @@ type StructuredQuery struct {
 	//    `SELECT * FROM Foo ORDER BY A DESC, __name__ DESC`
 	//  * `SELECT * FROM Foo WHERE A > 1` becomes
 	//    `SELECT * FROM Foo WHERE A > 1 ORDER BY A, __name__`
-	OrderBy []*StructuredQuery_Order `protobuf:"bytes,4,rep,name=order_by,json=orderBy" json:"order_by,omitempty"`
+	OrderBy []*StructuredQuery_Order `protobuf:"bytes,4,rep,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
 	// A starting point for the query results.
-	StartAt *Cursor `protobuf:"bytes,7,opt,name=start_at,json=startAt" json:"start_at,omitempty"`
+	StartAt *Cursor `protobuf:"bytes,7,opt,name=start_at,json=startAt,proto3" json:"start_at,omitempty"`
 	// A end point for the query results.
-	EndAt *Cursor `protobuf:"bytes,8,opt,name=end_at,json=endAt" json:"end_at,omitempty"`
+	EndAt *Cursor `protobuf:"bytes,8,opt,name=end_at,json=endAt,proto3" json:"end_at,omitempty"`
 	// The number of results to skip.
 	//
 	// Applies before limit, but after all other constraints. Must be >= 0 if
 	// specified.
-	Offset int32 `protobuf:"varint,6,opt,name=offset" json:"offset,omitempty"`
+	Offset int32 `protobuf:"varint,6,opt,name=offset,proto3" json:"offset,omitempty"`
 	// The maximum number of results to return.
 	//
 	// Applies after all other constraints.
 	// Must be >= 0 if specified.
-	Limit *google_protobuf3.Int32Value `protobuf:"bytes,5,opt,name=limit" json:"limit,omitempty"`
+	Limit                *wrappers.Int32Value `protobuf:"bytes,5,opt,name=limit,proto3" json:"limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *StructuredQuery) Reset()         { *m = StructuredQuery{} }
+func (m *StructuredQuery) String() string { return proto.CompactTextString(m) }
+func (*StructuredQuery) ProtoMessage()    {}
+func (*StructuredQuery) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0}
+}
+func (m *StructuredQuery) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery.Unmarshal(m, b)
+}
+func (m *StructuredQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery.Merge(dst, src)
+}
+func (m *StructuredQuery) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery.Size(m)
+}
+func (m *StructuredQuery) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery.DiscardUnknown(m)
 }
 
-func (m *StructuredQuery) Reset()                    { *m = StructuredQuery{} }
-func (m *StructuredQuery) String() string            { return proto.CompactTextString(m) }
-func (*StructuredQuery) ProtoMessage()               {}
-func (*StructuredQuery) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_StructuredQuery proto.InternalMessageInfo
 
 func (m *StructuredQuery) GetSelect() *StructuredQuery_Projection {
 	if m != nil {
@@ -238,7 +268,7 @@ func (m *StructuredQuery) GetOffset() int32 {
 	return 0
 }
 
-func (m *StructuredQuery) GetLimit() *google_protobuf3.Int32Value {
+func (m *StructuredQuery) GetLimit() *wrappers.Int32Value {
 	if m != nil {
 		return m.Limit
 	}
@@ -249,19 +279,39 @@ func (m *StructuredQuery) GetLimit() *google_protobuf3.Int32Value {
 type StructuredQuery_CollectionSelector struct {
 	// The collection ID.
 	// When set, selects only collections with this ID.
-	CollectionId string `protobuf:"bytes,2,opt,name=collection_id,json=collectionId" json:"collection_id,omitempty"`
+	CollectionId string `protobuf:"bytes,2,opt,name=collection_id,json=collectionId,proto3" json:"collection_id,omitempty"`
 	// When false, selects only collections that are immediate children of
 	// the `parent` specified in the containing `RunQueryRequest`.
 	// When true, selects all descendant collections.
-	AllDescendants bool `protobuf:"varint,3,opt,name=all_descendants,json=allDescendants" json:"all_descendants,omitempty"`
+	AllDescendants       bool     `protobuf:"varint,3,opt,name=all_descendants,json=allDescendants,proto3" json:"all_descendants,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *StructuredQuery_CollectionSelector) Reset()         { *m = StructuredQuery_CollectionSelector{} }
 func (m *StructuredQuery_CollectionSelector) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_CollectionSelector) ProtoMessage()    {}
 func (*StructuredQuery_CollectionSelector) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 0}
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 0}
+}
+func (m *StructuredQuery_CollectionSelector) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery_CollectionSelector.Unmarshal(m, b)
+}
+func (m *StructuredQuery_CollectionSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery_CollectionSelector.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery_CollectionSelector) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_CollectionSelector.Merge(dst, src)
 }
+func (m *StructuredQuery_CollectionSelector) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery_CollectionSelector.Size(m)
+}
+func (m *StructuredQuery_CollectionSelector) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery_CollectionSelector.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StructuredQuery_CollectionSelector proto.InternalMessageInfo
 
 func (m *StructuredQuery_CollectionSelector) GetCollectionId() string {
 	if m != nil {
@@ -285,31 +335,57 @@ type StructuredQuery_Filter struct {
 	//	*StructuredQuery_Filter_CompositeFilter
 	//	*StructuredQuery_Filter_FieldFilter
 	//	*StructuredQuery_Filter_UnaryFilter
-	FilterType isStructuredQuery_Filter_FilterType `protobuf_oneof:"filter_type"`
+	FilterType           isStructuredQuery_Filter_FilterType `protobuf_oneof:"filter_type"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
 }
 
-func (m *StructuredQuery_Filter) Reset()                    { *m = StructuredQuery_Filter{} }
-func (m *StructuredQuery_Filter) String() string            { return proto.CompactTextString(m) }
-func (*StructuredQuery_Filter) ProtoMessage()               {}
-func (*StructuredQuery_Filter) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 1} }
+func (m *StructuredQuery_Filter) Reset()         { *m = StructuredQuery_Filter{} }
+func (m *StructuredQuery_Filter) String() string { return proto.CompactTextString(m) }
+func (*StructuredQuery_Filter) ProtoMessage()    {}
+func (*StructuredQuery_Filter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 1}
+}
+func (m *StructuredQuery_Filter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery_Filter.Unmarshal(m, b)
+}
+func (m *StructuredQuery_Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery_Filter.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery_Filter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Filter.Merge(dst, src)
+}
+func (m *StructuredQuery_Filter) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery_Filter.Size(m)
+}
+func (m *StructuredQuery_Filter) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery_Filter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StructuredQuery_Filter proto.InternalMessageInfo
 
 type isStructuredQuery_Filter_FilterType interface {
 	isStructuredQuery_Filter_FilterType()
 }
 
 type StructuredQuery_Filter_CompositeFilter struct {
-	CompositeFilter *StructuredQuery_CompositeFilter `protobuf:"bytes,1,opt,name=composite_filter,json=compositeFilter,oneof"`
+	CompositeFilter *StructuredQuery_CompositeFilter `protobuf:"bytes,1,opt,name=composite_filter,json=compositeFilter,proto3,oneof"`
 }
+
 type StructuredQuery_Filter_FieldFilter struct {
-	FieldFilter *StructuredQuery_FieldFilter `protobuf:"bytes,2,opt,name=field_filter,json=fieldFilter,oneof"`
+	FieldFilter *StructuredQuery_FieldFilter `protobuf:"bytes,2,opt,name=field_filter,json=fieldFilter,proto3,oneof"`
 }
+
 type StructuredQuery_Filter_UnaryFilter struct {
-	UnaryFilter *StructuredQuery_UnaryFilter `protobuf:"bytes,3,opt,name=unary_filter,json=unaryFilter,oneof"`
+	UnaryFilter *StructuredQuery_UnaryFilter `protobuf:"bytes,3,opt,name=unary_filter,json=unaryFilter,proto3,oneof"`
 }
 
 func (*StructuredQuery_Filter_CompositeFilter) isStructuredQuery_Filter_FilterType() {}
-func (*StructuredQuery_Filter_FieldFilter) isStructuredQuery_Filter_FilterType()     {}
-func (*StructuredQuery_Filter_UnaryFilter) isStructuredQuery_Filter_FilterType()     {}
+
+func (*StructuredQuery_Filter_FieldFilter) isStructuredQuery_Filter_FilterType() {}
+
+func (*StructuredQuery_Filter_UnaryFilter) isStructuredQuery_Filter_FilterType() {}
 
 func (m *StructuredQuery_Filter) GetFilterType() isStructuredQuery_Filter_FilterType {
 	if m != nil {
@@ -412,17 +488,17 @@ func _StructuredQuery_Filter_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.FilterType.(type) {
 	case *StructuredQuery_Filter_CompositeFilter:
 		s := proto.Size(x.CompositeFilter)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *StructuredQuery_Filter_FieldFilter:
 		s := proto.Size(x.FieldFilter)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *StructuredQuery_Filter_UnaryFilter:
 		s := proto.Size(x.UnaryFilter)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -435,18 +511,38 @@ func _StructuredQuery_Filter_OneofSizer(msg proto.Message) (n int) {
 // A filter that merges multiple other filters using the given operator.
 type StructuredQuery_CompositeFilter struct {
 	// The operator for combining multiple filters.
-	Op StructuredQuery_CompositeFilter_Operator `protobuf:"varint,1,opt,name=op,enum=google.firestore.v1beta1.StructuredQuery_CompositeFilter_Operator" json:"op,omitempty"`
+	Op StructuredQuery_CompositeFilter_Operator `protobuf:"varint,1,opt,name=op,proto3,enum=google.firestore.v1beta1.StructuredQuery_CompositeFilter_Operator" json:"op,omitempty"`
 	// The list of filters to combine.
 	// Must contain at least one filter.
-	Filters []*StructuredQuery_Filter `protobuf:"bytes,2,rep,name=filters" json:"filters,omitempty"`
+	Filters              []*StructuredQuery_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
 func (m *StructuredQuery_CompositeFilter) Reset()         { *m = StructuredQuery_CompositeFilter{} }
 func (m *StructuredQuery_CompositeFilter) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_CompositeFilter) ProtoMessage()    {}
 func (*StructuredQuery_CompositeFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 2}
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 2}
+}
+func (m *StructuredQuery_CompositeFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery_CompositeFilter.Unmarshal(m, b)
+}
+func (m *StructuredQuery_CompositeFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery_CompositeFilter.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery_CompositeFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_CompositeFilter.Merge(dst, src)
 }
+func (m *StructuredQuery_CompositeFilter) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery_CompositeFilter.Size(m)
+}
+func (m *StructuredQuery_CompositeFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery_CompositeFilter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StructuredQuery_CompositeFilter proto.InternalMessageInfo
 
 func (m *StructuredQuery_CompositeFilter) GetOp() StructuredQuery_CompositeFilter_Operator {
 	if m != nil {
@@ -465,17 +561,39 @@ func (m *StructuredQuery_CompositeFilter) GetFilters() []*StructuredQuery_Filter
 // A filter on a specific field.
 type StructuredQuery_FieldFilter struct {
 	// The field to filter by.
-	Field *StructuredQuery_FieldReference `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
+	Field *StructuredQuery_FieldReference `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
 	// The operator to filter by.
-	Op StructuredQuery_FieldFilter_Operator `protobuf:"varint,2,opt,name=op,enum=google.firestore.v1beta1.StructuredQuery_FieldFilter_Operator" json:"op,omitempty"`
+	Op StructuredQuery_FieldFilter_Operator `protobuf:"varint,2,opt,name=op,proto3,enum=google.firestore.v1beta1.StructuredQuery_FieldFilter_Operator" json:"op,omitempty"`
 	// The value to compare to.
-	Value *Value `protobuf:"bytes,3,opt,name=value" json:"value,omitempty"`
+	Value                *Value   `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StructuredQuery_FieldFilter) Reset()         { *m = StructuredQuery_FieldFilter{} }
+func (m *StructuredQuery_FieldFilter) String() string { return proto.CompactTextString(m) }
+func (*StructuredQuery_FieldFilter) ProtoMessage()    {}
+func (*StructuredQuery_FieldFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 3}
+}
+func (m *StructuredQuery_FieldFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery_FieldFilter.Unmarshal(m, b)
+}
+func (m *StructuredQuery_FieldFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery_FieldFilter.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery_FieldFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_FieldFilter.Merge(dst, src)
+}
+func (m *StructuredQuery_FieldFilter) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery_FieldFilter.Size(m)
+}
+func (m *StructuredQuery_FieldFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery_FieldFilter.DiscardUnknown(m)
 }
 
-func (m *StructuredQuery_FieldFilter) Reset()                    { *m = StructuredQuery_FieldFilter{} }
-func (m *StructuredQuery_FieldFilter) String() string            { return proto.CompactTextString(m) }
-func (*StructuredQuery_FieldFilter) ProtoMessage()               {}
-func (*StructuredQuery_FieldFilter) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 3} }
+var xxx_messageInfo_StructuredQuery_FieldFilter proto.InternalMessageInfo
 
 func (m *StructuredQuery_FieldFilter) GetField() *StructuredQuery_FieldReference {
 	if m != nil {
@@ -501,25 +619,54 @@ func (m *StructuredQuery_FieldFilter) GetValue() *Value {
 // A filter with a single operand.
 type StructuredQuery_UnaryFilter struct {
 	// The unary operator to apply.
-	Op StructuredQuery_UnaryFilter_Operator `protobuf:"varint,1,opt,name=op,enum=google.firestore.v1beta1.StructuredQuery_UnaryFilter_Operator" json:"op,omitempty"`
+	Op StructuredQuery_UnaryFilter_Operator `protobuf:"varint,1,opt,name=op,proto3,enum=google.firestore.v1beta1.StructuredQuery_UnaryFilter_Operator" json:"op,omitempty"`
 	// The argument to the filter.
 	//
 	// Types that are valid to be assigned to OperandType:
 	//	*StructuredQuery_UnaryFilter_Field
-	OperandType isStructuredQuery_UnaryFilter_OperandType `protobuf_oneof:"operand_type"`
+	OperandType          isStructuredQuery_UnaryFilter_OperandType `protobuf_oneof:"operand_type"`
+	XXX_NoUnkeyedLiteral struct{}                                  `json:"-"`
+	XXX_unrecognized     []byte                                    `json:"-"`
+	XXX_sizecache        int32                                     `json:"-"`
 }
 
-func (m *StructuredQuery_UnaryFilter) Reset()                    { *m = StructuredQuery_UnaryFilter{} }
-func (m *StructuredQuery_UnaryFilter) String() string            { return proto.CompactTextString(m) }
-func (*StructuredQuery_UnaryFilter) ProtoMessage()               {}
-func (*StructuredQuery_UnaryFilter) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 4} }
+func (m *StructuredQuery_UnaryFilter) Reset()         { *m = StructuredQuery_UnaryFilter{} }
+func (m *StructuredQuery_UnaryFilter) String() string { return proto.CompactTextString(m) }
+func (*StructuredQuery_UnaryFilter) ProtoMessage()    {}
+func (*StructuredQuery_UnaryFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 4}
+}
+func (m *StructuredQuery_UnaryFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery_UnaryFilter.Unmarshal(m, b)
+}
+func (m *StructuredQuery_UnaryFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery_UnaryFilter.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery_UnaryFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_UnaryFilter.Merge(dst, src)
+}
+func (m *StructuredQuery_UnaryFilter) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery_UnaryFilter.Size(m)
+}
+func (m *StructuredQuery_UnaryFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery_UnaryFilter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StructuredQuery_UnaryFilter proto.InternalMessageInfo
+
+func (m *StructuredQuery_UnaryFilter) GetOp() StructuredQuery_UnaryFilter_Operator {
+	if m != nil {
+		return m.Op
+	}
+	return StructuredQuery_UnaryFilter_OPERATOR_UNSPECIFIED
+}
 
 type isStructuredQuery_UnaryFilter_OperandType interface {
 	isStructuredQuery_UnaryFilter_OperandType()
 }
 
 type StructuredQuery_UnaryFilter_Field struct {
-	Field *StructuredQuery_FieldReference `protobuf:"bytes,2,opt,name=field,oneof"`
+	Field *StructuredQuery_FieldReference `protobuf:"bytes,2,opt,name=field,proto3,oneof"`
 }
 
 func (*StructuredQuery_UnaryFilter_Field) isStructuredQuery_UnaryFilter_OperandType() {}
@@ -531,13 +678,6 @@ func (m *StructuredQuery_UnaryFilter) GetOperandType() isStructuredQuery_UnaryFi
 	return nil
 }
 
-func (m *StructuredQuery_UnaryFilter) GetOp() StructuredQuery_UnaryFilter_Operator {
-	if m != nil {
-		return m.Op
-	}
-	return StructuredQuery_UnaryFilter_OPERATOR_UNSPECIFIED
-}
-
 func (m *StructuredQuery_UnaryFilter) GetField() *StructuredQuery_FieldReference {
 	if x, ok := m.GetOperandType().(*StructuredQuery_UnaryFilter_Field); ok {
 		return x.Field
@@ -590,7 +730,7 @@ func _StructuredQuery_UnaryFilter_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.OperandType.(type) {
 	case *StructuredQuery_UnaryFilter_Field:
 		s := proto.Size(x.Field)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -603,15 +743,37 @@ func _StructuredQuery_UnaryFilter_OneofSizer(msg proto.Message) (n int) {
 // An order on a field.
 type StructuredQuery_Order struct {
 	// The field to order by.
-	Field *StructuredQuery_FieldReference `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
+	Field *StructuredQuery_FieldReference `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
 	// The direction to order by. Defaults to `ASCENDING`.
-	Direction StructuredQuery_Direction `protobuf:"varint,2,opt,name=direction,enum=google.firestore.v1beta1.StructuredQuery_Direction" json:"direction,omitempty"`
+	Direction            StructuredQuery_Direction `protobuf:"varint,2,opt,name=direction,proto3,enum=google.firestore.v1beta1.StructuredQuery_Direction" json:"direction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *StructuredQuery_Order) Reset()         { *m = StructuredQuery_Order{} }
+func (m *StructuredQuery_Order) String() string { return proto.CompactTextString(m) }
+func (*StructuredQuery_Order) ProtoMessage()    {}
+func (*StructuredQuery_Order) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 5}
+}
+func (m *StructuredQuery_Order) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery_Order.Unmarshal(m, b)
+}
+func (m *StructuredQuery_Order) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery_Order.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery_Order) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Order.Merge(dst, src)
+}
+func (m *StructuredQuery_Order) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery_Order.Size(m)
+}
+func (m *StructuredQuery_Order) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery_Order.DiscardUnknown(m)
 }
 
-func (m *StructuredQuery_Order) Reset()                    { *m = StructuredQuery_Order{} }
-func (m *StructuredQuery_Order) String() string            { return proto.CompactTextString(m) }
-func (*StructuredQuery_Order) ProtoMessage()               {}
-func (*StructuredQuery_Order) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 5} }
+var xxx_messageInfo_StructuredQuery_Order proto.InternalMessageInfo
 
 func (m *StructuredQuery_Order) GetField() *StructuredQuery_FieldReference {
 	if m != nil {
@@ -629,15 +791,35 @@ func (m *StructuredQuery_Order) GetDirection() StructuredQuery_Direction {
 
 // A reference to a field, such as `max(messages.time) as max_time`.
 type StructuredQuery_FieldReference struct {
-	FieldPath string `protobuf:"bytes,2,opt,name=field_path,json=fieldPath" json:"field_path,omitempty"`
+	FieldPath            string   `protobuf:"bytes,2,opt,name=field_path,json=fieldPath,proto3" json:"field_path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *StructuredQuery_FieldReference) Reset()         { *m = StructuredQuery_FieldReference{} }
 func (m *StructuredQuery_FieldReference) String() string { return proto.CompactTextString(m) }
 func (*StructuredQuery_FieldReference) ProtoMessage()    {}
 func (*StructuredQuery_FieldReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor3, []int{0, 6}
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 6}
 }
+func (m *StructuredQuery_FieldReference) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery_FieldReference.Unmarshal(m, b)
+}
+func (m *StructuredQuery_FieldReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery_FieldReference.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery_FieldReference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_FieldReference.Merge(dst, src)
+}
+func (m *StructuredQuery_FieldReference) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery_FieldReference.Size(m)
+}
+func (m *StructuredQuery_FieldReference) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery_FieldReference.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StructuredQuery_FieldReference proto.InternalMessageInfo
 
 func (m *StructuredQuery_FieldReference) GetFieldPath() string {
 	if m != nil {
@@ -652,13 +834,35 @@ type StructuredQuery_Projection struct {
 	//
 	// If empty, all fields are returned. To only return the name
 	// of the document, use `['__name__']`.
-	Fields []*StructuredQuery_FieldReference `protobuf:"bytes,2,rep,name=fields" json:"fields,omitempty"`
+	Fields               []*StructuredQuery_FieldReference `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *StructuredQuery_Projection) Reset()         { *m = StructuredQuery_Projection{} }
+func (m *StructuredQuery_Projection) String() string { return proto.CompactTextString(m) }
+func (*StructuredQuery_Projection) ProtoMessage()    {}
+func (*StructuredQuery_Projection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{0, 7}
+}
+func (m *StructuredQuery_Projection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructuredQuery_Projection.Unmarshal(m, b)
+}
+func (m *StructuredQuery_Projection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructuredQuery_Projection.Marshal(b, m, deterministic)
+}
+func (dst *StructuredQuery_Projection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructuredQuery_Projection.Merge(dst, src)
+}
+func (m *StructuredQuery_Projection) XXX_Size() int {
+	return xxx_messageInfo_StructuredQuery_Projection.Size(m)
+}
+func (m *StructuredQuery_Projection) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructuredQuery_Projection.DiscardUnknown(m)
 }
 
-func (m *StructuredQuery_Projection) Reset()                    { *m = StructuredQuery_Projection{} }
-func (m *StructuredQuery_Projection) String() string            { return proto.CompactTextString(m) }
-func (*StructuredQuery_Projection) ProtoMessage()               {}
-func (*StructuredQuery_Projection) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 7} }
+var xxx_messageInfo_StructuredQuery_Projection proto.InternalMessageInfo
 
 func (m *StructuredQuery_Projection) GetFields() []*StructuredQuery_FieldReference {
 	if m != nil {
@@ -673,16 +877,38 @@ type Cursor struct {
 	// the order by clause of a query.
 	//
 	// Can contain fewer values than specified in the order by clause.
-	Values []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
+	Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
 	// If the position is just before or just after the given values, relative
 	// to the sort order defined by the query.
-	Before bool `protobuf:"varint,2,opt,name=before" json:"before,omitempty"`
+	Before               bool     `protobuf:"varint,2,opt,name=before,proto3" json:"before,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Cursor) Reset()                    { *m = Cursor{} }
-func (m *Cursor) String() string            { return proto.CompactTextString(m) }
-func (*Cursor) ProtoMessage()               {}
-func (*Cursor) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+func (m *Cursor) Reset()         { *m = Cursor{} }
+func (m *Cursor) String() string { return proto.CompactTextString(m) }
+func (*Cursor) ProtoMessage()    {}
+func (*Cursor) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_d85ba3a0f0a37b11, []int{1}
+}
+func (m *Cursor) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Cursor.Unmarshal(m, b)
+}
+func (m *Cursor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Cursor.Marshal(b, m, deterministic)
+}
+func (dst *Cursor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Cursor.Merge(dst, src)
+}
+func (m *Cursor) XXX_Size() int {
+	return xxx_messageInfo_Cursor.Size(m)
+}
+func (m *Cursor) XXX_DiscardUnknown() {
+	xxx_messageInfo_Cursor.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Cursor proto.InternalMessageInfo
 
 func (m *Cursor) GetValues() []*Value {
 	if m != nil {
@@ -715,9 +941,11 @@ func init() {
 	proto.RegisterEnum("google.firestore.v1beta1.StructuredQuery_UnaryFilter_Operator", StructuredQuery_UnaryFilter_Operator_name, StructuredQuery_UnaryFilter_Operator_value)
 }
 
-func init() { proto.RegisterFile("google/firestore/v1beta1/query.proto", fileDescriptor3) }
+func init() {
+	proto.RegisterFile("google/firestore/v1beta1/query.proto", fileDescriptor_query_d85ba3a0f0a37b11)
+}
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_query_d85ba3a0f0a37b11 = []byte{
 	// 970 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0xc7, 0xd7, 0x4e, 0xf3, 0x75, 0xd2, 0x0f, 0x6b, 0x04, 0x2b, 0x13, 0x96, 0xa5, 0x0a, 0x48,
diff --git a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/write.pb.go b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/write.pb.go
index fca9fdd5..ae6921b4 100644
--- a/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/write.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/firestore/v1beta1/write.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/firestore/v1beta1/write.proto
 
-package firestore
+package firestore // import "google.golang.org/genproto/googleapis/firestore/v1beta1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A value that is calculated by the server.
 type DocumentTransform_FieldTransform_ServerValue int32
 
@@ -38,7 +44,7 @@ func (x DocumentTransform_FieldTransform_ServerValue) String() string {
 	return proto.EnumName(DocumentTransform_FieldTransform_ServerValue_name, int32(x))
 }
 func (DocumentTransform_FieldTransform_ServerValue) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{1, 0, 0}
+	return fileDescriptor_write_9914518038802de9, []int{1, 0, 0}
 }
 
 // A write on a document.
@@ -59,34 +65,60 @@ type Write struct {
 	// Fields referenced in the mask, but not present in the input document, are
 	// deleted from the document on the server.
 	// The field paths in this mask must not contain a reserved field name.
-	UpdateMask *DocumentMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask *DocumentMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// An optional precondition on the document.
 	//
 	// The write will fail if this is set and not met by the target document.
-	CurrentDocument *Precondition `protobuf:"bytes,4,opt,name=current_document,json=currentDocument" json:"current_document,omitempty"`
+	CurrentDocument      *Precondition `protobuf:"bytes,4,opt,name=current_document,json=currentDocument,proto3" json:"current_document,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *Write) Reset()         { *m = Write{} }
+func (m *Write) String() string { return proto.CompactTextString(m) }
+func (*Write) ProtoMessage()    {}
+func (*Write) Descriptor() ([]byte, []int) {
+	return fileDescriptor_write_9914518038802de9, []int{0}
+}
+func (m *Write) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Write.Unmarshal(m, b)
+}
+func (m *Write) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Write.Marshal(b, m, deterministic)
+}
+func (dst *Write) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Write.Merge(dst, src)
+}
+func (m *Write) XXX_Size() int {
+	return xxx_messageInfo_Write.Size(m)
+}
+func (m *Write) XXX_DiscardUnknown() {
+	xxx_messageInfo_Write.DiscardUnknown(m)
 }
 
-func (m *Write) Reset()                    { *m = Write{} }
-func (m *Write) String() string            { return proto.CompactTextString(m) }
-func (*Write) ProtoMessage()               {}
-func (*Write) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_Write proto.InternalMessageInfo
 
 type isWrite_Operation interface {
 	isWrite_Operation()
 }
 
 type Write_Update struct {
-	Update *Document `protobuf:"bytes,1,opt,name=update,oneof"`
+	Update *Document `protobuf:"bytes,1,opt,name=update,proto3,oneof"`
 }
+
 type Write_Delete struct {
-	Delete string `protobuf:"bytes,2,opt,name=delete,oneof"`
+	Delete string `protobuf:"bytes,2,opt,name=delete,proto3,oneof"`
 }
+
 type Write_Transform struct {
-	Transform *DocumentTransform `protobuf:"bytes,6,opt,name=transform,oneof"`
+	Transform *DocumentTransform `protobuf:"bytes,6,opt,name=transform,proto3,oneof"`
 }
 
-func (*Write_Update) isWrite_Operation()    {}
-func (*Write_Delete) isWrite_Operation()    {}
+func (*Write_Update) isWrite_Operation() {}
+
+func (*Write_Delete) isWrite_Operation() {}
+
 func (*Write_Transform) isWrite_Operation() {}
 
 func (m *Write) GetOperation() isWrite_Operation {
@@ -201,16 +233,16 @@ func _Write_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Operation.(type) {
 	case *Write_Update:
 		s := proto.Size(x.Update)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Write_Delete:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Delete)))
 		n += len(x.Delete)
 	case *Write_Transform:
 		s := proto.Size(x.Transform)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -223,17 +255,39 @@ func _Write_OneofSizer(msg proto.Message) (n int) {
 // A transformation of a document.
 type DocumentTransform struct {
 	// The name of the document to transform.
-	Document string `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document string `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// The list of transformations to apply to the fields of the document, in
 	// order.
 	// This must not be empty.
-	FieldTransforms []*DocumentTransform_FieldTransform `protobuf:"bytes,2,rep,name=field_transforms,json=fieldTransforms" json:"field_transforms,omitempty"`
+	FieldTransforms      []*DocumentTransform_FieldTransform `protobuf:"bytes,2,rep,name=field_transforms,json=fieldTransforms,proto3" json:"field_transforms,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
+}
+
+func (m *DocumentTransform) Reset()         { *m = DocumentTransform{} }
+func (m *DocumentTransform) String() string { return proto.CompactTextString(m) }
+func (*DocumentTransform) ProtoMessage()    {}
+func (*DocumentTransform) Descriptor() ([]byte, []int) {
+	return fileDescriptor_write_9914518038802de9, []int{1}
+}
+func (m *DocumentTransform) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DocumentTransform.Unmarshal(m, b)
+}
+func (m *DocumentTransform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DocumentTransform.Marshal(b, m, deterministic)
+}
+func (dst *DocumentTransform) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentTransform.Merge(dst, src)
+}
+func (m *DocumentTransform) XXX_Size() int {
+	return xxx_messageInfo_DocumentTransform.Size(m)
+}
+func (m *DocumentTransform) XXX_DiscardUnknown() {
+	xxx_messageInfo_DocumentTransform.DiscardUnknown(m)
 }
 
-func (m *DocumentTransform) Reset()                    { *m = DocumentTransform{} }
-func (m *DocumentTransform) String() string            { return proto.CompactTextString(m) }
-func (*DocumentTransform) ProtoMessage()               {}
-func (*DocumentTransform) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+var xxx_messageInfo_DocumentTransform proto.InternalMessageInfo
 
 func (m *DocumentTransform) GetDocument() string {
 	if m != nil {
@@ -253,19 +307,46 @@ func (m *DocumentTransform) GetFieldTransforms() []*DocumentTransform_FieldTrans
 type DocumentTransform_FieldTransform struct {
 	// The path of the field. See [Document.fields][google.firestore.v1beta1.Document.fields] for the field path syntax
 	// reference.
-	FieldPath string `protobuf:"bytes,1,opt,name=field_path,json=fieldPath" json:"field_path,omitempty"`
+	FieldPath string `protobuf:"bytes,1,opt,name=field_path,json=fieldPath,proto3" json:"field_path,omitempty"`
 	// The transformation to apply on the field.
 	//
 	// Types that are valid to be assigned to TransformType:
 	//	*DocumentTransform_FieldTransform_SetToServerValue
-	TransformType isDocumentTransform_FieldTransform_TransformType `protobuf_oneof:"transform_type"`
+	TransformType        isDocumentTransform_FieldTransform_TransformType `protobuf_oneof:"transform_type"`
+	XXX_NoUnkeyedLiteral struct{}                                         `json:"-"`
+	XXX_unrecognized     []byte                                           `json:"-"`
+	XXX_sizecache        int32                                            `json:"-"`
 }
 
 func (m *DocumentTransform_FieldTransform) Reset()         { *m = DocumentTransform_FieldTransform{} }
 func (m *DocumentTransform_FieldTransform) String() string { return proto.CompactTextString(m) }
 func (*DocumentTransform_FieldTransform) ProtoMessage()    {}
 func (*DocumentTransform_FieldTransform) Descriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{1, 0}
+	return fileDescriptor_write_9914518038802de9, []int{1, 0}
+}
+func (m *DocumentTransform_FieldTransform) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DocumentTransform_FieldTransform.Unmarshal(m, b)
+}
+func (m *DocumentTransform_FieldTransform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DocumentTransform_FieldTransform.Marshal(b, m, deterministic)
+}
+func (dst *DocumentTransform_FieldTransform) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentTransform_FieldTransform.Merge(dst, src)
+}
+func (m *DocumentTransform_FieldTransform) XXX_Size() int {
+	return xxx_messageInfo_DocumentTransform_FieldTransform.Size(m)
+}
+func (m *DocumentTransform_FieldTransform) XXX_DiscardUnknown() {
+	xxx_messageInfo_DocumentTransform_FieldTransform.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DocumentTransform_FieldTransform proto.InternalMessageInfo
+
+func (m *DocumentTransform_FieldTransform) GetFieldPath() string {
+	if m != nil {
+		return m.FieldPath
+	}
+	return ""
 }
 
 type isDocumentTransform_FieldTransform_TransformType interface {
@@ -273,7 +354,7 @@ type isDocumentTransform_FieldTransform_TransformType interface {
 }
 
 type DocumentTransform_FieldTransform_SetToServerValue struct {
-	SetToServerValue DocumentTransform_FieldTransform_ServerValue `protobuf:"varint,2,opt,name=set_to_server_value,json=setToServerValue,enum=google.firestore.v1beta1.DocumentTransform_FieldTransform_ServerValue,oneof"`
+	SetToServerValue DocumentTransform_FieldTransform_ServerValue `protobuf:"varint,2,opt,name=set_to_server_value,json=setToServerValue,proto3,enum=google.firestore.v1beta1.DocumentTransform_FieldTransform_ServerValue,oneof"`
 }
 
 func (*DocumentTransform_FieldTransform_SetToServerValue) isDocumentTransform_FieldTransform_TransformType() {
@@ -286,13 +367,6 @@ func (m *DocumentTransform_FieldTransform) GetTransformType() isDocumentTransfor
 	return nil
 }
 
-func (m *DocumentTransform_FieldTransform) GetFieldPath() string {
-	if m != nil {
-		return m.FieldPath
-	}
-	return ""
-}
-
 func (m *DocumentTransform_FieldTransform) GetSetToServerValue() DocumentTransform_FieldTransform_ServerValue {
 	if x, ok := m.GetTransformType().(*DocumentTransform_FieldTransform_SetToServerValue); ok {
 		return x.SetToServerValue
@@ -341,7 +415,7 @@ func _DocumentTransform_FieldTransform_OneofSizer(msg proto.Message) (n int) {
 	// transform_type
 	switch x := m.TransformType.(type) {
 	case *DocumentTransform_FieldTransform_SetToServerValue:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.SetToServerValue))
 	case nil:
 	default:
@@ -357,18 +431,40 @@ type WriteResult struct {
 	//
 	// If the write did not actually change the document, this will be the
 	// previous update_time.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The results of applying each [DocumentTransform.FieldTransform][google.firestore.v1beta1.DocumentTransform.FieldTransform], in the
 	// same order.
-	TransformResults []*Value `protobuf:"bytes,2,rep,name=transform_results,json=transformResults" json:"transform_results,omitempty"`
+	TransformResults     []*Value `protobuf:"bytes,2,rep,name=transform_results,json=transformResults,proto3" json:"transform_results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *WriteResult) Reset()         { *m = WriteResult{} }
+func (m *WriteResult) String() string { return proto.CompactTextString(m) }
+func (*WriteResult) ProtoMessage()    {}
+func (*WriteResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_write_9914518038802de9, []int{2}
+}
+func (m *WriteResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteResult.Unmarshal(m, b)
+}
+func (m *WriteResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteResult.Marshal(b, m, deterministic)
+}
+func (dst *WriteResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteResult.Merge(dst, src)
+}
+func (m *WriteResult) XXX_Size() int {
+	return xxx_messageInfo_WriteResult.Size(m)
+}
+func (m *WriteResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteResult.DiscardUnknown(m)
 }
 
-func (m *WriteResult) Reset()                    { *m = WriteResult{} }
-func (m *WriteResult) String() string            { return proto.CompactTextString(m) }
-func (*WriteResult) ProtoMessage()               {}
-func (*WriteResult) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
+var xxx_messageInfo_WriteResult proto.InternalMessageInfo
 
-func (m *WriteResult) GetUpdateTime() *google_protobuf1.Timestamp {
+func (m *WriteResult) GetUpdateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.UpdateTime
 	}
@@ -393,17 +489,39 @@ type DocumentChange struct {
 	// The new state of the [Document][google.firestore.v1beta1.Document].
 	//
 	// If `mask` is set, contains only fields that were updated or added.
-	Document *Document `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document *Document `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// A set of target IDs of targets that match this document.
-	TargetIds []int32 `protobuf:"varint,5,rep,packed,name=target_ids,json=targetIds" json:"target_ids,omitempty"`
+	TargetIds []int32 `protobuf:"varint,5,rep,packed,name=target_ids,json=targetIds,proto3" json:"target_ids,omitempty"`
 	// A set of target IDs for targets that no longer match this document.
-	RemovedTargetIds []int32 `protobuf:"varint,6,rep,packed,name=removed_target_ids,json=removedTargetIds" json:"removed_target_ids,omitempty"`
+	RemovedTargetIds     []int32  `protobuf:"varint,6,rep,packed,name=removed_target_ids,json=removedTargetIds,proto3" json:"removed_target_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DocumentChange) Reset()                    { *m = DocumentChange{} }
-func (m *DocumentChange) String() string            { return proto.CompactTextString(m) }
-func (*DocumentChange) ProtoMessage()               {}
-func (*DocumentChange) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+func (m *DocumentChange) Reset()         { *m = DocumentChange{} }
+func (m *DocumentChange) String() string { return proto.CompactTextString(m) }
+func (*DocumentChange) ProtoMessage()    {}
+func (*DocumentChange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_write_9914518038802de9, []int{3}
+}
+func (m *DocumentChange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DocumentChange.Unmarshal(m, b)
+}
+func (m *DocumentChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DocumentChange.Marshal(b, m, deterministic)
+}
+func (dst *DocumentChange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentChange.Merge(dst, src)
+}
+func (m *DocumentChange) XXX_Size() int {
+	return xxx_messageInfo_DocumentChange.Size(m)
+}
+func (m *DocumentChange) XXX_DiscardUnknown() {
+	xxx_messageInfo_DocumentChange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DocumentChange proto.InternalMessageInfo
 
 func (m *DocumentChange) GetDocument() *Document {
 	if m != nil {
@@ -435,19 +553,41 @@ func (m *DocumentChange) GetRemovedTargetIds() []int32 {
 // delete, if multiple targets are affected.
 type DocumentDelete struct {
 	// The resource name of the [Document][google.firestore.v1beta1.Document] that was deleted.
-	Document string `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document string `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// A set of target IDs for targets that previously matched this entity.
-	RemovedTargetIds []int32 `protobuf:"varint,6,rep,packed,name=removed_target_ids,json=removedTargetIds" json:"removed_target_ids,omitempty"`
+	RemovedTargetIds []int32 `protobuf:"varint,6,rep,packed,name=removed_target_ids,json=removedTargetIds,proto3" json:"removed_target_ids,omitempty"`
 	// The read timestamp at which the delete was observed.
 	//
 	// Greater or equal to the `commit_time` of the delete.
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime" json:"read_time,omitempty"`
+	ReadTime             *timestamp.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *DocumentDelete) Reset()         { *m = DocumentDelete{} }
+func (m *DocumentDelete) String() string { return proto.CompactTextString(m) }
+func (*DocumentDelete) ProtoMessage()    {}
+func (*DocumentDelete) Descriptor() ([]byte, []int) {
+	return fileDescriptor_write_9914518038802de9, []int{4}
+}
+func (m *DocumentDelete) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DocumentDelete.Unmarshal(m, b)
+}
+func (m *DocumentDelete) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DocumentDelete.Marshal(b, m, deterministic)
+}
+func (dst *DocumentDelete) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentDelete.Merge(dst, src)
+}
+func (m *DocumentDelete) XXX_Size() int {
+	return xxx_messageInfo_DocumentDelete.Size(m)
+}
+func (m *DocumentDelete) XXX_DiscardUnknown() {
+	xxx_messageInfo_DocumentDelete.DiscardUnknown(m)
 }
 
-func (m *DocumentDelete) Reset()                    { *m = DocumentDelete{} }
-func (m *DocumentDelete) String() string            { return proto.CompactTextString(m) }
-func (*DocumentDelete) ProtoMessage()               {}
-func (*DocumentDelete) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
+var xxx_messageInfo_DocumentDelete proto.InternalMessageInfo
 
 func (m *DocumentDelete) GetDocument() string {
 	if m != nil {
@@ -463,7 +603,7 @@ func (m *DocumentDelete) GetRemovedTargetIds() []int32 {
 	return nil
 }
 
-func (m *DocumentDelete) GetReadTime() *google_protobuf1.Timestamp {
+func (m *DocumentDelete) GetReadTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ReadTime
 	}
@@ -480,19 +620,41 @@ func (m *DocumentDelete) GetReadTime() *google_protobuf1.Timestamp {
 // write or delete, if multiple targets are affected.
 type DocumentRemove struct {
 	// The resource name of the [Document][google.firestore.v1beta1.Document] that has gone out of view.
-	Document string `protobuf:"bytes,1,opt,name=document" json:"document,omitempty"`
+	Document string `protobuf:"bytes,1,opt,name=document,proto3" json:"document,omitempty"`
 	// A set of target IDs for targets that previously matched this document.
-	RemovedTargetIds []int32 `protobuf:"varint,2,rep,packed,name=removed_target_ids,json=removedTargetIds" json:"removed_target_ids,omitempty"`
+	RemovedTargetIds []int32 `protobuf:"varint,2,rep,packed,name=removed_target_ids,json=removedTargetIds,proto3" json:"removed_target_ids,omitempty"`
 	// The read timestamp at which the remove was observed.
 	//
 	// Greater or equal to the `commit_time` of the change/delete/remove.
-	ReadTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime" json:"read_time,omitempty"`
+	ReadTime             *timestamp.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *DocumentRemove) Reset()         { *m = DocumentRemove{} }
+func (m *DocumentRemove) String() string { return proto.CompactTextString(m) }
+func (*DocumentRemove) ProtoMessage()    {}
+func (*DocumentRemove) Descriptor() ([]byte, []int) {
+	return fileDescriptor_write_9914518038802de9, []int{5}
+}
+func (m *DocumentRemove) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DocumentRemove.Unmarshal(m, b)
+}
+func (m *DocumentRemove) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DocumentRemove.Marshal(b, m, deterministic)
+}
+func (dst *DocumentRemove) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentRemove.Merge(dst, src)
+}
+func (m *DocumentRemove) XXX_Size() int {
+	return xxx_messageInfo_DocumentRemove.Size(m)
+}
+func (m *DocumentRemove) XXX_DiscardUnknown() {
+	xxx_messageInfo_DocumentRemove.DiscardUnknown(m)
 }
 
-func (m *DocumentRemove) Reset()                    { *m = DocumentRemove{} }
-func (m *DocumentRemove) String() string            { return proto.CompactTextString(m) }
-func (*DocumentRemove) ProtoMessage()               {}
-func (*DocumentRemove) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
+var xxx_messageInfo_DocumentRemove proto.InternalMessageInfo
 
 func (m *DocumentRemove) GetDocument() string {
 	if m != nil {
@@ -508,7 +670,7 @@ func (m *DocumentRemove) GetRemovedTargetIds() []int32 {
 	return nil
 }
 
-func (m *DocumentRemove) GetReadTime() *google_protobuf1.Timestamp {
+func (m *DocumentRemove) GetReadTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ReadTime
 	}
@@ -518,18 +680,40 @@ func (m *DocumentRemove) GetReadTime() *google_protobuf1.Timestamp {
 // A digest of all the documents that match a given target.
 type ExistenceFilter struct {
 	// The target ID to which this filter applies.
-	TargetId int32 `protobuf:"varint,1,opt,name=target_id,json=targetId" json:"target_id,omitempty"`
+	TargetId int32 `protobuf:"varint,1,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"`
 	// The total count of documents that match [target_id][google.firestore.v1beta1.ExistenceFilter.target_id].
 	//
 	// If different from the count of documents in the client that match, the
 	// client must manually determine which documents no longer match the target.
-	Count int32 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
+	Count                int32    `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ExistenceFilter) Reset()                    { *m = ExistenceFilter{} }
-func (m *ExistenceFilter) String() string            { return proto.CompactTextString(m) }
-func (*ExistenceFilter) ProtoMessage()               {}
-func (*ExistenceFilter) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
+func (m *ExistenceFilter) Reset()         { *m = ExistenceFilter{} }
+func (m *ExistenceFilter) String() string { return proto.CompactTextString(m) }
+func (*ExistenceFilter) ProtoMessage()    {}
+func (*ExistenceFilter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_write_9914518038802de9, []int{6}
+}
+func (m *ExistenceFilter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExistenceFilter.Unmarshal(m, b)
+}
+func (m *ExistenceFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExistenceFilter.Marshal(b, m, deterministic)
+}
+func (dst *ExistenceFilter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExistenceFilter.Merge(dst, src)
+}
+func (m *ExistenceFilter) XXX_Size() int {
+	return xxx_messageInfo_ExistenceFilter.Size(m)
+}
+func (m *ExistenceFilter) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExistenceFilter.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExistenceFilter proto.InternalMessageInfo
 
 func (m *ExistenceFilter) GetTargetId() int32 {
 	if m != nil {
@@ -557,9 +741,11 @@ func init() {
 	proto.RegisterEnum("google.firestore.v1beta1.DocumentTransform_FieldTransform_ServerValue", DocumentTransform_FieldTransform_ServerValue_name, DocumentTransform_FieldTransform_ServerValue_value)
 }
 
-func init() { proto.RegisterFile("google/firestore/v1beta1/write.proto", fileDescriptor4) }
+func init() {
+	proto.RegisterFile("google/firestore/v1beta1/write.proto", fileDescriptor_write_9914518038802de9)
+}
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_write_9914518038802de9 = []byte{
 	// 756 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x8e, 0xe3, 0x44,
 	0x10, 0x8e, 0x93, 0x49, 0x34, 0xae, 0xa0, 0x8c, 0xb7, 0xe1, 0x60, 0x85, 0x59, 0x36, 0x8a, 0xf8,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/annotations.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/annotations.pb.go
index 7f2c5348..139f7301 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/annotations.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/annotations.pb.go
@@ -1,127 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/annotations.proto
 
-/*
-Package genomics is a generated protocol buffer package.
-
-It is generated from these files:
-	google/genomics/v1/annotations.proto
-	google/genomics/v1/cigar.proto
-	google/genomics/v1/datasets.proto
-	google/genomics/v1/operations.proto
-	google/genomics/v1/position.proto
-	google/genomics/v1/range.proto
-	google/genomics/v1/readalignment.proto
-	google/genomics/v1/readgroup.proto
-	google/genomics/v1/readgroupset.proto
-	google/genomics/v1/reads.proto
-	google/genomics/v1/references.proto
-	google/genomics/v1/variants.proto
-
-It has these top-level messages:
-	AnnotationSet
-	Annotation
-	VariantAnnotation
-	Transcript
-	ExternalId
-	CreateAnnotationSetRequest
-	GetAnnotationSetRequest
-	UpdateAnnotationSetRequest
-	DeleteAnnotationSetRequest
-	SearchAnnotationSetsRequest
-	SearchAnnotationSetsResponse
-	CreateAnnotationRequest
-	BatchCreateAnnotationsRequest
-	BatchCreateAnnotationsResponse
-	GetAnnotationRequest
-	UpdateAnnotationRequest
-	DeleteAnnotationRequest
-	SearchAnnotationsRequest
-	SearchAnnotationsResponse
-	CigarUnit
-	Dataset
-	ListDatasetsRequest
-	ListDatasetsResponse
-	CreateDatasetRequest
-	UpdateDatasetRequest
-	DeleteDatasetRequest
-	UndeleteDatasetRequest
-	GetDatasetRequest
-	OperationMetadata
-	OperationEvent
-	Position
-	Range
-	LinearAlignment
-	Read
-	ReadGroup
-	ReadGroupSet
-	SearchReadGroupSetsRequest
-	SearchReadGroupSetsResponse
-	ImportReadGroupSetsRequest
-	ImportReadGroupSetsResponse
-	ExportReadGroupSetRequest
-	UpdateReadGroupSetRequest
-	DeleteReadGroupSetRequest
-	GetReadGroupSetRequest
-	ListCoverageBucketsRequest
-	CoverageBucket
-	ListCoverageBucketsResponse
-	SearchReadsRequest
-	SearchReadsResponse
-	StreamReadsRequest
-	StreamReadsResponse
-	Reference
-	ReferenceSet
-	SearchReferenceSetsRequest
-	SearchReferenceSetsResponse
-	GetReferenceSetRequest
-	SearchReferencesRequest
-	SearchReferencesResponse
-	GetReferenceRequest
-	ListBasesRequest
-	ListBasesResponse
-	VariantSetMetadata
-	VariantSet
-	Variant
-	VariantCall
-	CallSet
-	ReferenceBound
-	ImportVariantsRequest
-	ImportVariantsResponse
-	CreateVariantSetRequest
-	ExportVariantSetRequest
-	GetVariantSetRequest
-	SearchVariantSetsRequest
-	SearchVariantSetsResponse
-	DeleteVariantSetRequest
-	UpdateVariantSetRequest
-	SearchVariantsRequest
-	SearchVariantsResponse
-	CreateVariantRequest
-	UpdateVariantRequest
-	DeleteVariantRequest
-	GetVariantRequest
-	MergeVariantsRequest
-	SearchCallSetsRequest
-	SearchCallSetsResponse
-	CreateCallSetRequest
-	UpdateCallSetRequest
-	DeleteCallSetRequest
-	GetCallSetRequest
-	StreamVariantsRequest
-	StreamVariantsResponse
-*/
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/wrappers"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -180,7 +70,9 @@ var AnnotationType_value = map[string]int32{
 func (x AnnotationType) String() string {
 	return proto.EnumName(AnnotationType_name, int32(x))
 }
-func (AnnotationType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (AnnotationType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{0}
+}
 
 type VariantAnnotation_Type int32
 
@@ -230,7 +122,9 @@ var VariantAnnotation_Type_value = map[string]int32{
 func (x VariantAnnotation_Type) String() string {
 	return proto.EnumName(VariantAnnotation_Type_name, int32(x))
 }
-func (VariantAnnotation_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (VariantAnnotation_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{2, 0}
+}
 
 type VariantAnnotation_Effect int32
 
@@ -291,7 +185,9 @@ var VariantAnnotation_Effect_value = map[string]int32{
 func (x VariantAnnotation_Effect) String() string {
 	return proto.EnumName(VariantAnnotation_Effect_name, int32(x))
 }
-func (VariantAnnotation_Effect) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
+func (VariantAnnotation_Effect) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{2, 1}
+}
 
 type VariantAnnotation_ClinicalSignificance int32
 
@@ -354,7 +250,7 @@ func (x VariantAnnotation_ClinicalSignificance) String() string {
 	return proto.EnumName(VariantAnnotation_ClinicalSignificance_name, int32(x))
 }
 func (VariantAnnotation_ClinicalSignificance) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 2}
+	return fileDescriptor_annotations_22f61783ae14922a, []int{2, 2}
 }
 
 // An annotation set is a logical grouping of annotations that share consistent
@@ -362,28 +258,50 @@ func (VariantAnnotation_ClinicalSignificance) EnumDescriptor() ([]byte, []int) {
 // genes from refseq', and 'all variant annotations from ClinVar'.
 type AnnotationSet struct {
 	// The server-generated annotation set ID, unique across all annotation sets.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The dataset to which this annotation set belongs.
-	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	// The ID of the reference set that defines the coordinate space for this
 	// set's annotations.
-	ReferenceSetId string `protobuf:"bytes,3,opt,name=reference_set_id,json=referenceSetId" json:"reference_set_id,omitempty"`
+	ReferenceSetId string `protobuf:"bytes,3,opt,name=reference_set_id,json=referenceSetId,proto3" json:"reference_set_id,omitempty"`
 	// The display name for this annotation set.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	// The source URI describing the file from which this annotation set was
 	// generated, if any.
-	SourceUri string `protobuf:"bytes,5,opt,name=source_uri,json=sourceUri" json:"source_uri,omitempty"`
+	SourceUri string `protobuf:"bytes,5,opt,name=source_uri,json=sourceUri,proto3" json:"source_uri,omitempty"`
 	// The type of annotations contained within this set.
-	Type AnnotationType `protobuf:"varint,6,opt,name=type,enum=google.genomics.v1.AnnotationType" json:"type,omitempty"`
+	Type AnnotationType `protobuf:"varint,6,opt,name=type,proto3,enum=google.genomics.v1.AnnotationType" json:"type,omitempty"`
 	// A map of additional read alignment information. This must be of the form
 	// map<string, string[]> (string key mapping to a list of string values).
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,17,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info                 map[string]*_struct.ListValue `protobuf:"bytes,17,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *AnnotationSet) Reset()         { *m = AnnotationSet{} }
+func (m *AnnotationSet) String() string { return proto.CompactTextString(m) }
+func (*AnnotationSet) ProtoMessage()    {}
+func (*AnnotationSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{0}
+}
+func (m *AnnotationSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnnotationSet.Unmarshal(m, b)
+}
+func (m *AnnotationSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnnotationSet.Marshal(b, m, deterministic)
+}
+func (dst *AnnotationSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnnotationSet.Merge(dst, src)
+}
+func (m *AnnotationSet) XXX_Size() int {
+	return xxx_messageInfo_AnnotationSet.Size(m)
+}
+func (m *AnnotationSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnnotationSet.DiscardUnknown(m)
 }
 
-func (m *AnnotationSet) Reset()                    { *m = AnnotationSet{} }
-func (m *AnnotationSet) String() string            { return proto.CompactTextString(m) }
-func (*AnnotationSet) ProtoMessage()               {}
-func (*AnnotationSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_AnnotationSet proto.InternalMessageInfo
 
 func (m *AnnotationSet) GetId() string {
 	if m != nil {
@@ -427,7 +345,7 @@ func (m *AnnotationSet) GetType() AnnotationType {
 	return AnnotationType_ANNOTATION_TYPE_UNSPECIFIED
 }
 
-func (m *AnnotationSet) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *AnnotationSet) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -442,61 +360,62 @@ func (m *AnnotationSet) GetInfo() map[string]*google_protobuf3.ListValue {
 // `VARIANT`.
 type Annotation struct {
 	// The server-generated annotation ID, unique across all annotations.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The annotation set to which this annotation belongs.
-	AnnotationSetId string `protobuf:"bytes,2,opt,name=annotation_set_id,json=annotationSetId" json:"annotation_set_id,omitempty"`
+	AnnotationSetId string `protobuf:"bytes,2,opt,name=annotation_set_id,json=annotationSetId,proto3" json:"annotation_set_id,omitempty"`
 	// The display name of this annotation.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// The ID of the Google Genomics reference associated with this range.
-	ReferenceId string `protobuf:"bytes,4,opt,name=reference_id,json=referenceId" json:"reference_id,omitempty"`
+	ReferenceId string `protobuf:"bytes,4,opt,name=reference_id,json=referenceId,proto3" json:"reference_id,omitempty"`
 	// The display name corresponding to the reference specified by
 	// `referenceId`, for example `chr1`, `1`, or `chrX`.
-	ReferenceName string `protobuf:"bytes,5,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,5,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The start position of the range on the reference, 0-based inclusive.
-	Start int64 `protobuf:"varint,6,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,6,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position of the range on the reference, 0-based exclusive.
-	End int64 `protobuf:"varint,7,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,7,opt,name=end,proto3" json:"end,omitempty"`
 	// Whether this range refers to the reverse strand, as opposed to the forward
 	// strand. Note that regardless of this field, the start/end position of the
 	// range always refer to the forward strand.
-	ReverseStrand bool `protobuf:"varint,8,opt,name=reverse_strand,json=reverseStrand" json:"reverse_strand,omitempty"`
+	ReverseStrand bool `protobuf:"varint,8,opt,name=reverse_strand,json=reverseStrand,proto3" json:"reverse_strand,omitempty"`
 	// The data type for this annotation. Must match the containing annotation
 	// set's type.
-	Type AnnotationType `protobuf:"varint,9,opt,name=type,enum=google.genomics.v1.AnnotationType" json:"type,omitempty"`
+	Type AnnotationType `protobuf:"varint,9,opt,name=type,proto3,enum=google.genomics.v1.AnnotationType" json:"type,omitempty"`
 	// Types that are valid to be assigned to Value:
 	//	*Annotation_Variant
 	//	*Annotation_Transcript
 	Value isAnnotation_Value `protobuf_oneof:"value"`
 	// A map of additional read alignment information. This must be of the form
 	// map<string, string[]> (string key mapping to a list of string values).
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,12,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info                 map[string]*_struct.ListValue `protobuf:"bytes,12,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
 }
 
-func (m *Annotation) Reset()                    { *m = Annotation{} }
-func (m *Annotation) String() string            { return proto.CompactTextString(m) }
-func (*Annotation) ProtoMessage()               {}
-func (*Annotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type isAnnotation_Value interface {
-	isAnnotation_Value()
+func (m *Annotation) Reset()         { *m = Annotation{} }
+func (m *Annotation) String() string { return proto.CompactTextString(m) }
+func (*Annotation) ProtoMessage()    {}
+func (*Annotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{1}
 }
-
-type Annotation_Variant struct {
-	Variant *VariantAnnotation `protobuf:"bytes,10,opt,name=variant,oneof"`
+func (m *Annotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Annotation.Unmarshal(m, b)
 }
-type Annotation_Transcript struct {
-	Transcript *Transcript `protobuf:"bytes,11,opt,name=transcript,oneof"`
+func (m *Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Annotation.Marshal(b, m, deterministic)
 }
-
-func (*Annotation_Variant) isAnnotation_Value()    {}
-func (*Annotation_Transcript) isAnnotation_Value() {}
-
-func (m *Annotation) GetValue() isAnnotation_Value {
-	if m != nil {
-		return m.Value
-	}
-	return nil
+func (dst *Annotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Annotation.Merge(dst, src)
 }
+func (m *Annotation) XXX_Size() int {
+	return xxx_messageInfo_Annotation.Size(m)
+}
+func (m *Annotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Annotation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Annotation proto.InternalMessageInfo
 
 func (m *Annotation) GetId() string {
 	if m != nil {
@@ -561,6 +480,29 @@ func (m *Annotation) GetType() AnnotationType {
 	return AnnotationType_ANNOTATION_TYPE_UNSPECIFIED
 }
 
+type isAnnotation_Value interface {
+	isAnnotation_Value()
+}
+
+type Annotation_Variant struct {
+	Variant *VariantAnnotation `protobuf:"bytes,10,opt,name=variant,proto3,oneof"`
+}
+
+type Annotation_Transcript struct {
+	Transcript *Transcript `protobuf:"bytes,11,opt,name=transcript,proto3,oneof"`
+}
+
+func (*Annotation_Variant) isAnnotation_Value() {}
+
+func (*Annotation_Transcript) isAnnotation_Value() {}
+
+func (m *Annotation) GetValue() isAnnotation_Value {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
 func (m *Annotation) GetVariant() *VariantAnnotation {
 	if x, ok := m.GetValue().(*Annotation_Variant); ok {
 		return x.Variant
@@ -575,7 +517,7 @@ func (m *Annotation) GetTranscript() *Transcript {
 	return nil
 }
 
-func (m *Annotation) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *Annotation) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -641,12 +583,12 @@ func _Annotation_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Value.(type) {
 	case *Annotation_Variant:
 		s := proto.Size(x.Variant)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Annotation_Transcript:
 		s := proto.Size(x.Transcript)
-		n += proto.SizeVarint(11<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -658,33 +600,55 @@ func _Annotation_OneofSizer(msg proto.Message) (n int) {
 
 type VariantAnnotation struct {
 	// Type has been adapted from ClinVar's list of variant types.
-	Type VariantAnnotation_Type `protobuf:"varint,1,opt,name=type,enum=google.genomics.v1.VariantAnnotation_Type" json:"type,omitempty"`
+	Type VariantAnnotation_Type `protobuf:"varint,1,opt,name=type,proto3,enum=google.genomics.v1.VariantAnnotation_Type" json:"type,omitempty"`
 	// Effect of the variant on the coding sequence.
-	Effect VariantAnnotation_Effect `protobuf:"varint,2,opt,name=effect,enum=google.genomics.v1.VariantAnnotation_Effect" json:"effect,omitempty"`
+	Effect VariantAnnotation_Effect `protobuf:"varint,2,opt,name=effect,proto3,enum=google.genomics.v1.VariantAnnotation_Effect" json:"effect,omitempty"`
 	// The alternate allele for this variant. If multiple alternate alleles
 	// exist at this location, create a separate variant for each one, as they
 	// may represent distinct conditions.
-	AlternateBases string `protobuf:"bytes,3,opt,name=alternate_bases,json=alternateBases" json:"alternate_bases,omitempty"`
+	AlternateBases string `protobuf:"bytes,3,opt,name=alternate_bases,json=alternateBases,proto3" json:"alternate_bases,omitempty"`
 	// Google annotation ID of the gene affected by this variant. This should
 	// be provided when the variant is created.
-	GeneId string `protobuf:"bytes,4,opt,name=gene_id,json=geneId" json:"gene_id,omitempty"`
+	GeneId string `protobuf:"bytes,4,opt,name=gene_id,json=geneId,proto3" json:"gene_id,omitempty"`
 	// Google annotation IDs of the transcripts affected by this variant. These
 	// should be provided when the variant is created.
-	TranscriptIds []string `protobuf:"bytes,5,rep,name=transcript_ids,json=transcriptIds" json:"transcript_ids,omitempty"`
+	TranscriptIds []string `protobuf:"bytes,5,rep,name=transcript_ids,json=transcriptIds,proto3" json:"transcript_ids,omitempty"`
 	// The set of conditions associated with this variant.
 	// A condition describes the way a variant influences human health.
-	Conditions []*VariantAnnotation_ClinicalCondition `protobuf:"bytes,6,rep,name=conditions" json:"conditions,omitempty"`
+	Conditions []*VariantAnnotation_ClinicalCondition `protobuf:"bytes,6,rep,name=conditions,proto3" json:"conditions,omitempty"`
 	// Describes the clinical significance of a variant.
 	// It is adapted from the ClinVar controlled vocabulary for clinical
 	// significance described at:
 	// http://www.ncbi.nlm.nih.gov/clinvar/docs/clinsig/
-	ClinicalSignificance VariantAnnotation_ClinicalSignificance `protobuf:"varint,7,opt,name=clinical_significance,json=clinicalSignificance,enum=google.genomics.v1.VariantAnnotation_ClinicalSignificance" json:"clinical_significance,omitempty"`
+	ClinicalSignificance VariantAnnotation_ClinicalSignificance `protobuf:"varint,7,opt,name=clinical_significance,json=clinicalSignificance,proto3,enum=google.genomics.v1.VariantAnnotation_ClinicalSignificance" json:"clinical_significance,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                               `json:"-"`
+	XXX_unrecognized     []byte                                 `json:"-"`
+	XXX_sizecache        int32                                  `json:"-"`
+}
+
+func (m *VariantAnnotation) Reset()         { *m = VariantAnnotation{} }
+func (m *VariantAnnotation) String() string { return proto.CompactTextString(m) }
+func (*VariantAnnotation) ProtoMessage()    {}
+func (*VariantAnnotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{2}
+}
+func (m *VariantAnnotation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VariantAnnotation.Unmarshal(m, b)
+}
+func (m *VariantAnnotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VariantAnnotation.Marshal(b, m, deterministic)
+}
+func (dst *VariantAnnotation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantAnnotation.Merge(dst, src)
+}
+func (m *VariantAnnotation) XXX_Size() int {
+	return xxx_messageInfo_VariantAnnotation.Size(m)
+}
+func (m *VariantAnnotation) XXX_DiscardUnknown() {
+	xxx_messageInfo_VariantAnnotation.DiscardUnknown(m)
 }
 
-func (m *VariantAnnotation) Reset()                    { *m = VariantAnnotation{} }
-func (m *VariantAnnotation) String() string            { return proto.CompactTextString(m) }
-func (*VariantAnnotation) ProtoMessage()               {}
-func (*VariantAnnotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_VariantAnnotation proto.InternalMessageInfo
 
 func (m *VariantAnnotation) GetType() VariantAnnotation_Type {
 	if m != nil {
@@ -737,23 +701,43 @@ func (m *VariantAnnotation) GetClinicalSignificance() VariantAnnotation_Clinical
 
 type VariantAnnotation_ClinicalCondition struct {
 	// A set of names for the condition.
-	Names []string `protobuf:"bytes,1,rep,name=names" json:"names,omitempty"`
+	Names []string `protobuf:"bytes,1,rep,name=names,proto3" json:"names,omitempty"`
 	// The set of external IDs for this condition.
-	ExternalIds []*ExternalId `protobuf:"bytes,2,rep,name=external_ids,json=externalIds" json:"external_ids,omitempty"`
+	ExternalIds []*ExternalId `protobuf:"bytes,2,rep,name=external_ids,json=externalIds,proto3" json:"external_ids,omitempty"`
 	// The MedGen concept id associated with this gene.
 	// Search for these IDs at http://www.ncbi.nlm.nih.gov/medgen/
-	ConceptId string `protobuf:"bytes,3,opt,name=concept_id,json=conceptId" json:"concept_id,omitempty"`
+	ConceptId string `protobuf:"bytes,3,opt,name=concept_id,json=conceptId,proto3" json:"concept_id,omitempty"`
 	// The OMIM id for this condition.
 	// Search for these IDs at http://omim.org/
-	OmimId string `protobuf:"bytes,4,opt,name=omim_id,json=omimId" json:"omim_id,omitempty"`
+	OmimId               string   `protobuf:"bytes,4,opt,name=omim_id,json=omimId,proto3" json:"omim_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *VariantAnnotation_ClinicalCondition) Reset()         { *m = VariantAnnotation_ClinicalCondition{} }
 func (m *VariantAnnotation_ClinicalCondition) String() string { return proto.CompactTextString(m) }
 func (*VariantAnnotation_ClinicalCondition) ProtoMessage()    {}
 func (*VariantAnnotation_ClinicalCondition) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 0}
+	return fileDescriptor_annotations_22f61783ae14922a, []int{2, 0}
+}
+func (m *VariantAnnotation_ClinicalCondition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VariantAnnotation_ClinicalCondition.Unmarshal(m, b)
+}
+func (m *VariantAnnotation_ClinicalCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VariantAnnotation_ClinicalCondition.Marshal(b, m, deterministic)
+}
+func (dst *VariantAnnotation_ClinicalCondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantAnnotation_ClinicalCondition.Merge(dst, src)
 }
+func (m *VariantAnnotation_ClinicalCondition) XXX_Size() int {
+	return xxx_messageInfo_VariantAnnotation_ClinicalCondition.Size(m)
+}
+func (m *VariantAnnotation_ClinicalCondition) XXX_DiscardUnknown() {
+	xxx_messageInfo_VariantAnnotation_ClinicalCondition.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VariantAnnotation_ClinicalCondition proto.InternalMessageInfo
 
 func (m *VariantAnnotation_ClinicalCondition) GetNames() []string {
 	if m != nil {
@@ -787,7 +771,7 @@ func (m *VariantAnnotation_ClinicalCondition) GetOmimId() string {
 // reference genome may be transcribed as RNA.
 type Transcript struct {
 	// The annotation ID of the gene from which this transcript is transcribed.
-	GeneId string `protobuf:"bytes,1,opt,name=gene_id,json=geneId" json:"gene_id,omitempty"`
+	GeneId string `protobuf:"bytes,1,opt,name=gene_id,json=geneId,proto3" json:"gene_id,omitempty"`
 	// The <a href="http://en.wikipedia.org/wiki/Exon">exons</a> that compose
 	// this transcript. This field should be unset for genomes where transcript
 	// splicing does not occur, for example prokaryotes.
@@ -802,7 +786,7 @@ type Transcript struct {
 	// to coding DNA sequence.
 	//
 	// Exons are ordered by start position and may not overlap.
-	Exons []*Transcript_Exon `protobuf:"bytes,2,rep,name=exons" json:"exons,omitempty"`
+	Exons []*Transcript_Exon `protobuf:"bytes,2,rep,name=exons,proto3" json:"exons,omitempty"`
 	// The range of the coding sequence for this transcript, if any. To determine
 	// the exact ranges of coding sequence, intersect this range with those of the
 	// [exons][google.genomics.v1.Transcript.exons], if any. If there are any
@@ -816,13 +800,35 @@ type Transcript struct {
 	// [exon.frame][google.genomics.v1.Transcript.Exon.frame] will not necessarily
 	// match the expected reference reading frame and coding exon reference bases
 	// cannot necessarily be concatenated to produce the original transcript mRNA.
-	CodingSequence *Transcript_CodingSequence `protobuf:"bytes,3,opt,name=coding_sequence,json=codingSequence" json:"coding_sequence,omitempty"`
+	CodingSequence       *Transcript_CodingSequence `protobuf:"bytes,3,opt,name=coding_sequence,json=codingSequence,proto3" json:"coding_sequence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *Transcript) Reset()         { *m = Transcript{} }
+func (m *Transcript) String() string { return proto.CompactTextString(m) }
+func (*Transcript) ProtoMessage()    {}
+func (*Transcript) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{3}
+}
+func (m *Transcript) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Transcript.Unmarshal(m, b)
+}
+func (m *Transcript) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Transcript.Marshal(b, m, deterministic)
+}
+func (dst *Transcript) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transcript.Merge(dst, src)
+}
+func (m *Transcript) XXX_Size() int {
+	return xxx_messageInfo_Transcript.Size(m)
+}
+func (m *Transcript) XXX_DiscardUnknown() {
+	xxx_messageInfo_Transcript.DiscardUnknown(m)
 }
 
-func (m *Transcript) Reset()                    { *m = Transcript{} }
-func (m *Transcript) String() string            { return proto.CompactTextString(m) }
-func (*Transcript) ProtoMessage()               {}
-func (*Transcript) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_Transcript proto.InternalMessageInfo
 
 func (m *Transcript) GetGeneId() string {
 	if m != nil {
@@ -849,11 +855,11 @@ type Transcript_Exon struct {
 	// The start position of the exon on this annotation's reference sequence,
 	// 0-based inclusive. Note that this is relative to the reference start, and
 	// **not** the containing annotation start.
-	Start int64 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position of the exon on this annotation's reference sequence,
 	// 0-based exclusive. Note that this is relative to the reference start, and
 	// *not* the containing annotation start.
-	End int64 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"`
 	// The frame of this exon. Contains a value of 0, 1, or 2, which indicates
 	// the offset of the first coding base of the exon within the reading frame
 	// of the coding DNA sequence, if any. This field is dependent on the
@@ -867,13 +873,35 @@ type Transcript_Exon struct {
 	// Unset if this exon does not intersect the coding sequence. Upon creation
 	// of a transcript, the frame must be populated for all or none of the
 	// coding exons.
-	Frame *google_protobuf4.Int32Value `protobuf:"bytes,3,opt,name=frame" json:"frame,omitempty"`
+	Frame                *wrappers.Int32Value `protobuf:"bytes,3,opt,name=frame,proto3" json:"frame,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *Transcript_Exon) Reset()                    { *m = Transcript_Exon{} }
-func (m *Transcript_Exon) String() string            { return proto.CompactTextString(m) }
-func (*Transcript_Exon) ProtoMessage()               {}
-func (*Transcript_Exon) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 0} }
+func (m *Transcript_Exon) Reset()         { *m = Transcript_Exon{} }
+func (m *Transcript_Exon) String() string { return proto.CompactTextString(m) }
+func (*Transcript_Exon) ProtoMessage()    {}
+func (*Transcript_Exon) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{3, 0}
+}
+func (m *Transcript_Exon) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Transcript_Exon.Unmarshal(m, b)
+}
+func (m *Transcript_Exon) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Transcript_Exon.Marshal(b, m, deterministic)
+}
+func (dst *Transcript_Exon) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transcript_Exon.Merge(dst, src)
+}
+func (m *Transcript_Exon) XXX_Size() int {
+	return xxx_messageInfo_Transcript_Exon.Size(m)
+}
+func (m *Transcript_Exon) XXX_DiscardUnknown() {
+	xxx_messageInfo_Transcript_Exon.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Transcript_Exon proto.InternalMessageInfo
 
 func (m *Transcript_Exon) GetStart() int64 {
 	if m != nil {
@@ -889,7 +917,7 @@ func (m *Transcript_Exon) GetEnd() int64 {
 	return 0
 }
 
-func (m *Transcript_Exon) GetFrame() *google_protobuf4.Int32Value {
+func (m *Transcript_Exon) GetFrame() *wrappers.Int32Value {
 	if m != nil {
 		return m.Frame
 	}
@@ -900,17 +928,39 @@ type Transcript_CodingSequence struct {
 	// The start of the coding sequence on this annotation's reference sequence,
 	// 0-based inclusive. Note that this position is relative to the reference
 	// start, and *not* the containing annotation start.
-	Start int64 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"`
 	// The end of the coding sequence on this annotation's reference sequence,
 	// 0-based exclusive. Note that this position is relative to the reference
 	// start, and *not* the containing annotation start.
-	End int64 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	End                  int64    `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Transcript_CodingSequence) Reset()                    { *m = Transcript_CodingSequence{} }
-func (m *Transcript_CodingSequence) String() string            { return proto.CompactTextString(m) }
-func (*Transcript_CodingSequence) ProtoMessage()               {}
-func (*Transcript_CodingSequence) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 1} }
+func (m *Transcript_CodingSequence) Reset()         { *m = Transcript_CodingSequence{} }
+func (m *Transcript_CodingSequence) String() string { return proto.CompactTextString(m) }
+func (*Transcript_CodingSequence) ProtoMessage()    {}
+func (*Transcript_CodingSequence) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{3, 1}
+}
+func (m *Transcript_CodingSequence) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Transcript_CodingSequence.Unmarshal(m, b)
+}
+func (m *Transcript_CodingSequence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Transcript_CodingSequence.Marshal(b, m, deterministic)
+}
+func (dst *Transcript_CodingSequence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transcript_CodingSequence.Merge(dst, src)
+}
+func (m *Transcript_CodingSequence) XXX_Size() int {
+	return xxx_messageInfo_Transcript_CodingSequence.Size(m)
+}
+func (m *Transcript_CodingSequence) XXX_DiscardUnknown() {
+	xxx_messageInfo_Transcript_CodingSequence.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Transcript_CodingSequence proto.InternalMessageInfo
 
 func (m *Transcript_CodingSequence) GetStart() int64 {
 	if m != nil {
@@ -928,15 +978,37 @@ func (m *Transcript_CodingSequence) GetEnd() int64 {
 
 type ExternalId struct {
 	// The name of the source of this data.
-	SourceName string `protobuf:"bytes,1,opt,name=source_name,json=sourceName" json:"source_name,omitempty"`
+	SourceName string `protobuf:"bytes,1,opt,name=source_name,json=sourceName,proto3" json:"source_name,omitempty"`
 	// The id used by the source of this data.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id                   string   `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ExternalId) Reset()                    { *m = ExternalId{} }
-func (m *ExternalId) String() string            { return proto.CompactTextString(m) }
-func (*ExternalId) ProtoMessage()               {}
-func (*ExternalId) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *ExternalId) Reset()         { *m = ExternalId{} }
+func (m *ExternalId) String() string { return proto.CompactTextString(m) }
+func (*ExternalId) ProtoMessage()    {}
+func (*ExternalId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{4}
+}
+func (m *ExternalId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExternalId.Unmarshal(m, b)
+}
+func (m *ExternalId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExternalId.Marshal(b, m, deterministic)
+}
+func (dst *ExternalId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExternalId.Merge(dst, src)
+}
+func (m *ExternalId) XXX_Size() int {
+	return xxx_messageInfo_ExternalId.Size(m)
+}
+func (m *ExternalId) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExternalId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExternalId proto.InternalMessageInfo
 
 func (m *ExternalId) GetSourceName() string {
 	if m != nil {
@@ -954,13 +1026,35 @@ func (m *ExternalId) GetId() string {
 
 type CreateAnnotationSetRequest struct {
 	// The annotation set to create.
-	AnnotationSet *AnnotationSet `protobuf:"bytes,1,opt,name=annotation_set,json=annotationSet" json:"annotation_set,omitempty"`
+	AnnotationSet        *AnnotationSet `protobuf:"bytes,1,opt,name=annotation_set,json=annotationSet,proto3" json:"annotation_set,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *CreateAnnotationSetRequest) Reset()         { *m = CreateAnnotationSetRequest{} }
+func (m *CreateAnnotationSetRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateAnnotationSetRequest) ProtoMessage()    {}
+func (*CreateAnnotationSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{5}
+}
+func (m *CreateAnnotationSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateAnnotationSetRequest.Unmarshal(m, b)
+}
+func (m *CreateAnnotationSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateAnnotationSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateAnnotationSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAnnotationSetRequest.Merge(dst, src)
+}
+func (m *CreateAnnotationSetRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateAnnotationSetRequest.Size(m)
+}
+func (m *CreateAnnotationSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateAnnotationSetRequest.DiscardUnknown(m)
 }
 
-func (m *CreateAnnotationSetRequest) Reset()                    { *m = CreateAnnotationSetRequest{} }
-func (m *CreateAnnotationSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateAnnotationSetRequest) ProtoMessage()               {}
-func (*CreateAnnotationSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_CreateAnnotationSetRequest proto.InternalMessageInfo
 
 func (m *CreateAnnotationSetRequest) GetAnnotationSet() *AnnotationSet {
 	if m != nil {
@@ -971,13 +1065,35 @@ func (m *CreateAnnotationSetRequest) GetAnnotationSet() *AnnotationSet {
 
 type GetAnnotationSetRequest struct {
 	// The ID of the annotation set to be retrieved.
-	AnnotationSetId string `protobuf:"bytes,1,opt,name=annotation_set_id,json=annotationSetId" json:"annotation_set_id,omitempty"`
+	AnnotationSetId      string   `protobuf:"bytes,1,opt,name=annotation_set_id,json=annotationSetId,proto3" json:"annotation_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetAnnotationSetRequest) Reset()                    { *m = GetAnnotationSetRequest{} }
-func (m *GetAnnotationSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetAnnotationSetRequest) ProtoMessage()               {}
-func (*GetAnnotationSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *GetAnnotationSetRequest) Reset()         { *m = GetAnnotationSetRequest{} }
+func (m *GetAnnotationSetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetAnnotationSetRequest) ProtoMessage()    {}
+func (*GetAnnotationSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{6}
+}
+func (m *GetAnnotationSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetAnnotationSetRequest.Unmarshal(m, b)
+}
+func (m *GetAnnotationSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetAnnotationSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetAnnotationSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAnnotationSetRequest.Merge(dst, src)
+}
+func (m *GetAnnotationSetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetAnnotationSetRequest.Size(m)
+}
+func (m *GetAnnotationSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetAnnotationSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetAnnotationSetRequest proto.InternalMessageInfo
 
 func (m *GetAnnotationSetRequest) GetAnnotationSetId() string {
 	if m != nil {
@@ -988,21 +1104,43 @@ func (m *GetAnnotationSetRequest) GetAnnotationSetId() string {
 
 type UpdateAnnotationSetRequest struct {
 	// The ID of the annotation set to be updated.
-	AnnotationSetId string `protobuf:"bytes,1,opt,name=annotation_set_id,json=annotationSetId" json:"annotation_set_id,omitempty"`
+	AnnotationSetId string `protobuf:"bytes,1,opt,name=annotation_set_id,json=annotationSetId,proto3" json:"annotation_set_id,omitempty"`
 	// The new annotation set.
-	AnnotationSet *AnnotationSet `protobuf:"bytes,2,opt,name=annotation_set,json=annotationSet" json:"annotation_set,omitempty"`
+	AnnotationSet *AnnotationSet `protobuf:"bytes,2,opt,name=annotation_set,json=annotationSet,proto3" json:"annotation_set,omitempty"`
 	// An optional mask specifying which fields to update. Mutable fields are
 	// [name][google.genomics.v1.AnnotationSet.name],
 	// [source_uri][google.genomics.v1.AnnotationSet.source_uri], and
 	// [info][google.genomics.v1.AnnotationSet.info]. If unspecified, all
 	// mutable fields will be updated.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateAnnotationSetRequest) Reset()         { *m = UpdateAnnotationSetRequest{} }
+func (m *UpdateAnnotationSetRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateAnnotationSetRequest) ProtoMessage()    {}
+func (*UpdateAnnotationSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{7}
+}
+func (m *UpdateAnnotationSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateAnnotationSetRequest.Unmarshal(m, b)
+}
+func (m *UpdateAnnotationSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateAnnotationSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateAnnotationSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAnnotationSetRequest.Merge(dst, src)
+}
+func (m *UpdateAnnotationSetRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateAnnotationSetRequest.Size(m)
+}
+func (m *UpdateAnnotationSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateAnnotationSetRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateAnnotationSetRequest) Reset()                    { *m = UpdateAnnotationSetRequest{} }
-func (m *UpdateAnnotationSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateAnnotationSetRequest) ProtoMessage()               {}
-func (*UpdateAnnotationSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_UpdateAnnotationSetRequest proto.InternalMessageInfo
 
 func (m *UpdateAnnotationSetRequest) GetAnnotationSetId() string {
 	if m != nil {
@@ -1018,7 +1156,7 @@ func (m *UpdateAnnotationSetRequest) GetAnnotationSet() *AnnotationSet {
 	return nil
 }
 
-func (m *UpdateAnnotationSetRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateAnnotationSetRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1027,13 +1165,35 @@ func (m *UpdateAnnotationSetRequest) GetUpdateMask() *google_protobuf2.FieldMask
 
 type DeleteAnnotationSetRequest struct {
 	// The ID of the annotation set to be deleted.
-	AnnotationSetId string `protobuf:"bytes,1,opt,name=annotation_set_id,json=annotationSetId" json:"annotation_set_id,omitempty"`
+	AnnotationSetId      string   `protobuf:"bytes,1,opt,name=annotation_set_id,json=annotationSetId,proto3" json:"annotation_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteAnnotationSetRequest) Reset()         { *m = DeleteAnnotationSetRequest{} }
+func (m *DeleteAnnotationSetRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteAnnotationSetRequest) ProtoMessage()    {}
+func (*DeleteAnnotationSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{8}
+}
+func (m *DeleteAnnotationSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteAnnotationSetRequest.Unmarshal(m, b)
+}
+func (m *DeleteAnnotationSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteAnnotationSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteAnnotationSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAnnotationSetRequest.Merge(dst, src)
+}
+func (m *DeleteAnnotationSetRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteAnnotationSetRequest.Size(m)
+}
+func (m *DeleteAnnotationSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteAnnotationSetRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteAnnotationSetRequest) Reset()                    { *m = DeleteAnnotationSetRequest{} }
-func (m *DeleteAnnotationSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteAnnotationSetRequest) ProtoMessage()               {}
-func (*DeleteAnnotationSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_DeleteAnnotationSetRequest proto.InternalMessageInfo
 
 func (m *DeleteAnnotationSetRequest) GetAnnotationSetId() string {
 	if m != nil {
@@ -1045,29 +1205,51 @@ func (m *DeleteAnnotationSetRequest) GetAnnotationSetId() string {
 type SearchAnnotationSetsRequest struct {
 	// Required. The dataset IDs to search within. Caller must have `READ` access
 	// to these datasets.
-	DatasetIds []string `protobuf:"bytes,1,rep,name=dataset_ids,json=datasetIds" json:"dataset_ids,omitempty"`
+	DatasetIds []string `protobuf:"bytes,1,rep,name=dataset_ids,json=datasetIds,proto3" json:"dataset_ids,omitempty"`
 	// If specified, only annotation sets associated with the given reference set
 	// are returned.
-	ReferenceSetId string `protobuf:"bytes,2,opt,name=reference_set_id,json=referenceSetId" json:"reference_set_id,omitempty"`
+	ReferenceSetId string `protobuf:"bytes,2,opt,name=reference_set_id,json=referenceSetId,proto3" json:"reference_set_id,omitempty"`
 	// Only return annotations sets for which a substring of the name matches this
 	// string (case insensitive).
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// If specified, only annotation sets that have any of these types are
 	// returned.
-	Types []AnnotationType `protobuf:"varint,4,rep,packed,name=types,enum=google.genomics.v1.AnnotationType" json:"types,omitempty"`
+	Types []AnnotationType `protobuf:"varint,4,rep,packed,name=types,proto3,enum=google.genomics.v1.AnnotationType" json:"types,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,5,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,5,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 128. The maximum value is 1024.
-	PageSize int32 `protobuf:"varint,6,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,6,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchAnnotationSetsRequest) Reset()                    { *m = SearchAnnotationSetsRequest{} }
-func (m *SearchAnnotationSetsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchAnnotationSetsRequest) ProtoMessage()               {}
-func (*SearchAnnotationSetsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *SearchAnnotationSetsRequest) Reset()         { *m = SearchAnnotationSetsRequest{} }
+func (m *SearchAnnotationSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchAnnotationSetsRequest) ProtoMessage()    {}
+func (*SearchAnnotationSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{9}
+}
+func (m *SearchAnnotationSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchAnnotationSetsRequest.Unmarshal(m, b)
+}
+func (m *SearchAnnotationSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchAnnotationSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchAnnotationSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAnnotationSetsRequest.Merge(dst, src)
+}
+func (m *SearchAnnotationSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchAnnotationSetsRequest.Size(m)
+}
+func (m *SearchAnnotationSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchAnnotationSetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchAnnotationSetsRequest proto.InternalMessageInfo
 
 func (m *SearchAnnotationSetsRequest) GetDatasetIds() []string {
 	if m != nil {
@@ -1113,17 +1295,39 @@ func (m *SearchAnnotationSetsRequest) GetPageSize() int32 {
 
 type SearchAnnotationSetsResponse struct {
 	// The matching annotation sets.
-	AnnotationSets []*AnnotationSet `protobuf:"bytes,1,rep,name=annotation_sets,json=annotationSets" json:"annotation_sets,omitempty"`
+	AnnotationSets []*AnnotationSet `protobuf:"bytes,1,rep,name=annotation_sets,json=annotationSets,proto3" json:"annotation_sets,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchAnnotationSetsResponse) Reset()                    { *m = SearchAnnotationSetsResponse{} }
-func (m *SearchAnnotationSetsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchAnnotationSetsResponse) ProtoMessage()               {}
-func (*SearchAnnotationSetsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *SearchAnnotationSetsResponse) Reset()         { *m = SearchAnnotationSetsResponse{} }
+func (m *SearchAnnotationSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchAnnotationSetsResponse) ProtoMessage()    {}
+func (*SearchAnnotationSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{10}
+}
+func (m *SearchAnnotationSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchAnnotationSetsResponse.Unmarshal(m, b)
+}
+func (m *SearchAnnotationSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchAnnotationSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchAnnotationSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAnnotationSetsResponse.Merge(dst, src)
+}
+func (m *SearchAnnotationSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchAnnotationSetsResponse.Size(m)
+}
+func (m *SearchAnnotationSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchAnnotationSetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchAnnotationSetsResponse proto.InternalMessageInfo
 
 func (m *SearchAnnotationSetsResponse) GetAnnotationSets() []*AnnotationSet {
 	if m != nil {
@@ -1141,13 +1345,35 @@ func (m *SearchAnnotationSetsResponse) GetNextPageToken() string {
 
 type CreateAnnotationRequest struct {
 	// The annotation to be created.
-	Annotation *Annotation `protobuf:"bytes,1,opt,name=annotation" json:"annotation,omitempty"`
+	Annotation           *Annotation `protobuf:"bytes,1,opt,name=annotation,proto3" json:"annotation,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *CreateAnnotationRequest) Reset()                    { *m = CreateAnnotationRequest{} }
-func (m *CreateAnnotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateAnnotationRequest) ProtoMessage()               {}
-func (*CreateAnnotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *CreateAnnotationRequest) Reset()         { *m = CreateAnnotationRequest{} }
+func (m *CreateAnnotationRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateAnnotationRequest) ProtoMessage()    {}
+func (*CreateAnnotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{11}
+}
+func (m *CreateAnnotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateAnnotationRequest.Unmarshal(m, b)
+}
+func (m *CreateAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateAnnotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAnnotationRequest.Merge(dst, src)
+}
+func (m *CreateAnnotationRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateAnnotationRequest.Size(m)
+}
+func (m *CreateAnnotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateAnnotationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateAnnotationRequest proto.InternalMessageInfo
 
 func (m *CreateAnnotationRequest) GetAnnotation() *Annotation {
 	if m != nil {
@@ -1159,7 +1385,7 @@ func (m *CreateAnnotationRequest) GetAnnotation() *Annotation {
 type BatchCreateAnnotationsRequest struct {
 	// The annotations to be created. At most 4096 can be specified in a single
 	// request.
-	Annotations []*Annotation `protobuf:"bytes,1,rep,name=annotations" json:"annotations,omitempty"`
+	Annotations []*Annotation `protobuf:"bytes,1,rep,name=annotations,proto3" json:"annotations,omitempty"`
 	// A unique request ID which enables the server to detect duplicated requests.
 	// If provided, duplicated requests will result in the same response; if not
 	// provided, duplicated requests may result in duplicated data. For a given
@@ -1167,13 +1393,35 @@ type BatchCreateAnnotationsRequest struct {
 	// different batches of annotations - behavior in this case is undefined.
 	// A common approach is to use a UUID. For batch jobs where worker crashes are
 	// a possibility, consider using some unique variant of a worker or run ID.
-	RequestId string `protobuf:"bytes,2,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
+	RequestId            string   `protobuf:"bytes,2,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BatchCreateAnnotationsRequest) Reset()                    { *m = BatchCreateAnnotationsRequest{} }
-func (m *BatchCreateAnnotationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchCreateAnnotationsRequest) ProtoMessage()               {}
-func (*BatchCreateAnnotationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *BatchCreateAnnotationsRequest) Reset()         { *m = BatchCreateAnnotationsRequest{} }
+func (m *BatchCreateAnnotationsRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchCreateAnnotationsRequest) ProtoMessage()    {}
+func (*BatchCreateAnnotationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{12}
+}
+func (m *BatchCreateAnnotationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchCreateAnnotationsRequest.Unmarshal(m, b)
+}
+func (m *BatchCreateAnnotationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchCreateAnnotationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchCreateAnnotationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateAnnotationsRequest.Merge(dst, src)
+}
+func (m *BatchCreateAnnotationsRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchCreateAnnotationsRequest.Size(m)
+}
+func (m *BatchCreateAnnotationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchCreateAnnotationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchCreateAnnotationsRequest proto.InternalMessageInfo
 
 func (m *BatchCreateAnnotationsRequest) GetAnnotations() []*Annotation {
 	if m != nil {
@@ -1192,13 +1440,35 @@ func (m *BatchCreateAnnotationsRequest) GetRequestId() string {
 type BatchCreateAnnotationsResponse struct {
 	// The resulting per-annotation entries, ordered consistently with the
 	// original request.
-	Entries []*BatchCreateAnnotationsResponse_Entry `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty"`
+	Entries              []*BatchCreateAnnotationsResponse_Entry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                `json:"-"`
+	XXX_unrecognized     []byte                                  `json:"-"`
+	XXX_sizecache        int32                                   `json:"-"`
+}
+
+func (m *BatchCreateAnnotationsResponse) Reset()         { *m = BatchCreateAnnotationsResponse{} }
+func (m *BatchCreateAnnotationsResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchCreateAnnotationsResponse) ProtoMessage()    {}
+func (*BatchCreateAnnotationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{13}
+}
+func (m *BatchCreateAnnotationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchCreateAnnotationsResponse.Unmarshal(m, b)
+}
+func (m *BatchCreateAnnotationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchCreateAnnotationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchCreateAnnotationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateAnnotationsResponse.Merge(dst, src)
+}
+func (m *BatchCreateAnnotationsResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchCreateAnnotationsResponse.Size(m)
+}
+func (m *BatchCreateAnnotationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchCreateAnnotationsResponse.DiscardUnknown(m)
 }
 
-func (m *BatchCreateAnnotationsResponse) Reset()                    { *m = BatchCreateAnnotationsResponse{} }
-func (m *BatchCreateAnnotationsResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchCreateAnnotationsResponse) ProtoMessage()               {}
-func (*BatchCreateAnnotationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_BatchCreateAnnotationsResponse proto.InternalMessageInfo
 
 func (m *BatchCreateAnnotationsResponse) GetEntries() []*BatchCreateAnnotationsResponse_Entry {
 	if m != nil {
@@ -1209,19 +1479,39 @@ func (m *BatchCreateAnnotationsResponse) GetEntries() []*BatchCreateAnnotationsR
 
 type BatchCreateAnnotationsResponse_Entry struct {
 	// The creation status.
-	Status *google_rpc.Status `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"`
+	Status *status.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	// The created annotation, if creation was successful.
-	Annotation *Annotation `protobuf:"bytes,2,opt,name=annotation" json:"annotation,omitempty"`
+	Annotation           *Annotation `protobuf:"bytes,2,opt,name=annotation,proto3" json:"annotation,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
 func (m *BatchCreateAnnotationsResponse_Entry) Reset()         { *m = BatchCreateAnnotationsResponse_Entry{} }
 func (m *BatchCreateAnnotationsResponse_Entry) String() string { return proto.CompactTextString(m) }
 func (*BatchCreateAnnotationsResponse_Entry) ProtoMessage()    {}
 func (*BatchCreateAnnotationsResponse_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{13, 0}
+	return fileDescriptor_annotations_22f61783ae14922a, []int{13, 0}
+}
+func (m *BatchCreateAnnotationsResponse_Entry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Unmarshal(m, b)
+}
+func (m *BatchCreateAnnotationsResponse_Entry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Marshal(b, m, deterministic)
+}
+func (dst *BatchCreateAnnotationsResponse_Entry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Merge(dst, src)
+}
+func (m *BatchCreateAnnotationsResponse_Entry) XXX_Size() int {
+	return xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.Size(m)
+}
+func (m *BatchCreateAnnotationsResponse_Entry) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchCreateAnnotationsResponse_Entry.DiscardUnknown(m)
 }
 
-func (m *BatchCreateAnnotationsResponse_Entry) GetStatus() *google_rpc.Status {
+var xxx_messageInfo_BatchCreateAnnotationsResponse_Entry proto.InternalMessageInfo
+
+func (m *BatchCreateAnnotationsResponse_Entry) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -1237,13 +1527,35 @@ func (m *BatchCreateAnnotationsResponse_Entry) GetAnnotation() *Annotation {
 
 type GetAnnotationRequest struct {
 	// The ID of the annotation to be retrieved.
-	AnnotationId string `protobuf:"bytes,1,opt,name=annotation_id,json=annotationId" json:"annotation_id,omitempty"`
+	AnnotationId         string   `protobuf:"bytes,1,opt,name=annotation_id,json=annotationId,proto3" json:"annotation_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetAnnotationRequest) Reset()         { *m = GetAnnotationRequest{} }
+func (m *GetAnnotationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetAnnotationRequest) ProtoMessage()    {}
+func (*GetAnnotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{14}
+}
+func (m *GetAnnotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetAnnotationRequest.Unmarshal(m, b)
+}
+func (m *GetAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetAnnotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAnnotationRequest.Merge(dst, src)
+}
+func (m *GetAnnotationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetAnnotationRequest.Size(m)
+}
+func (m *GetAnnotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetAnnotationRequest.DiscardUnknown(m)
 }
 
-func (m *GetAnnotationRequest) Reset()                    { *m = GetAnnotationRequest{} }
-func (m *GetAnnotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetAnnotationRequest) ProtoMessage()               {}
-func (*GetAnnotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_GetAnnotationRequest proto.InternalMessageInfo
 
 func (m *GetAnnotationRequest) GetAnnotationId() string {
 	if m != nil {
@@ -1254,22 +1566,44 @@ func (m *GetAnnotationRequest) GetAnnotationId() string {
 
 type UpdateAnnotationRequest struct {
 	// The ID of the annotation to be updated.
-	AnnotationId string `protobuf:"bytes,1,opt,name=annotation_id,json=annotationId" json:"annotation_id,omitempty"`
+	AnnotationId string `protobuf:"bytes,1,opt,name=annotation_id,json=annotationId,proto3" json:"annotation_id,omitempty"`
 	// The new annotation.
-	Annotation *Annotation `protobuf:"bytes,2,opt,name=annotation" json:"annotation,omitempty"`
+	Annotation *Annotation `protobuf:"bytes,2,opt,name=annotation,proto3" json:"annotation,omitempty"`
 	// An optional mask specifying which fields to update. Mutable fields are
 	// [name][google.genomics.v1.Annotation.name],
 	// [variant][google.genomics.v1.Annotation.variant],
 	// [transcript][google.genomics.v1.Annotation.transcript], and
 	// [info][google.genomics.v1.Annotation.info]. If unspecified, all mutable
 	// fields will be updated.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateAnnotationRequest) Reset()         { *m = UpdateAnnotationRequest{} }
+func (m *UpdateAnnotationRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateAnnotationRequest) ProtoMessage()    {}
+func (*UpdateAnnotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{15}
+}
+func (m *UpdateAnnotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateAnnotationRequest.Unmarshal(m, b)
+}
+func (m *UpdateAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateAnnotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAnnotationRequest.Merge(dst, src)
+}
+func (m *UpdateAnnotationRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateAnnotationRequest.Size(m)
+}
+func (m *UpdateAnnotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateAnnotationRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateAnnotationRequest) Reset()                    { *m = UpdateAnnotationRequest{} }
-func (m *UpdateAnnotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateAnnotationRequest) ProtoMessage()               {}
-func (*UpdateAnnotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_UpdateAnnotationRequest proto.InternalMessageInfo
 
 func (m *UpdateAnnotationRequest) GetAnnotationId() string {
 	if m != nil {
@@ -1285,7 +1619,7 @@ func (m *UpdateAnnotationRequest) GetAnnotation() *Annotation {
 	return nil
 }
 
-func (m *UpdateAnnotationRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateAnnotationRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1294,13 +1628,35 @@ func (m *UpdateAnnotationRequest) GetUpdateMask() *google_protobuf2.FieldMask {
 
 type DeleteAnnotationRequest struct {
 	// The ID of the annotation to be deleted.
-	AnnotationId string `protobuf:"bytes,1,opt,name=annotation_id,json=annotationId" json:"annotation_id,omitempty"`
+	AnnotationId         string   `protobuf:"bytes,1,opt,name=annotation_id,json=annotationId,proto3" json:"annotation_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteAnnotationRequest) Reset()                    { *m = DeleteAnnotationRequest{} }
-func (m *DeleteAnnotationRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteAnnotationRequest) ProtoMessage()               {}
-func (*DeleteAnnotationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *DeleteAnnotationRequest) Reset()         { *m = DeleteAnnotationRequest{} }
+func (m *DeleteAnnotationRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteAnnotationRequest) ProtoMessage()    {}
+func (*DeleteAnnotationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{16}
+}
+func (m *DeleteAnnotationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteAnnotationRequest.Unmarshal(m, b)
+}
+func (m *DeleteAnnotationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteAnnotationRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteAnnotationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAnnotationRequest.Merge(dst, src)
+}
+func (m *DeleteAnnotationRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteAnnotationRequest.Size(m)
+}
+func (m *DeleteAnnotationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteAnnotationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteAnnotationRequest proto.InternalMessageInfo
 
 func (m *DeleteAnnotationRequest) GetAnnotationId() string {
 	if m != nil {
@@ -1313,7 +1669,7 @@ type SearchAnnotationsRequest struct {
 	// Required. The annotation sets to search within. The caller must have
 	// `READ` access to these annotation sets.
 	// All queried annotation sets must have the same type.
-	AnnotationSetIds []string `protobuf:"bytes,1,rep,name=annotation_set_ids,json=annotationSetIds" json:"annotation_set_ids,omitempty"`
+	AnnotationSetIds []string `protobuf:"bytes,1,rep,name=annotation_set_ids,json=annotationSetIds,proto3" json:"annotation_set_ids,omitempty"`
 	// Required. `reference_id` or `reference_name` must be set.
 	//
 	// Types that are valid to be assigned to Reference:
@@ -1325,38 +1681,69 @@ type SearchAnnotationsRequest struct {
 	// [referenceId][google.genomics.v1.SearchAnnotationsRequest.reference_id] or
 	// [referenceName][google.genomics.v1.SearchAnnotationsRequest.reference_name]
 	// must be specified. Defaults to 0.
-	Start int64 `protobuf:"varint,4,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,4,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position of the range on the reference, 0-based exclusive. If
 	// [referenceId][google.genomics.v1.SearchAnnotationsRequest.reference_id] or
 	// [referenceName][google.genomics.v1.SearchAnnotationsRequest.reference_name]
 	// must be specified, Defaults to the length of the reference.
-	End int64 `protobuf:"varint,5,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,5,opt,name=end,proto3" json:"end,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,6,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,6,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 256. The maximum value is 2048.
-	PageSize int32 `protobuf:"varint,7,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,7,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchAnnotationsRequest) Reset()                    { *m = SearchAnnotationsRequest{} }
-func (m *SearchAnnotationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchAnnotationsRequest) ProtoMessage()               {}
-func (*SearchAnnotationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (m *SearchAnnotationsRequest) Reset()         { *m = SearchAnnotationsRequest{} }
+func (m *SearchAnnotationsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchAnnotationsRequest) ProtoMessage()    {}
+func (*SearchAnnotationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{17}
+}
+func (m *SearchAnnotationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchAnnotationsRequest.Unmarshal(m, b)
+}
+func (m *SearchAnnotationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchAnnotationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchAnnotationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAnnotationsRequest.Merge(dst, src)
+}
+func (m *SearchAnnotationsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchAnnotationsRequest.Size(m)
+}
+func (m *SearchAnnotationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchAnnotationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchAnnotationsRequest proto.InternalMessageInfo
+
+func (m *SearchAnnotationsRequest) GetAnnotationSetIds() []string {
+	if m != nil {
+		return m.AnnotationSetIds
+	}
+	return nil
+}
 
 type isSearchAnnotationsRequest_Reference interface {
 	isSearchAnnotationsRequest_Reference()
 }
 
 type SearchAnnotationsRequest_ReferenceId struct {
-	ReferenceId string `protobuf:"bytes,2,opt,name=reference_id,json=referenceId,oneof"`
+	ReferenceId string `protobuf:"bytes,2,opt,name=reference_id,json=referenceId,proto3,oneof"`
 }
+
 type SearchAnnotationsRequest_ReferenceName struct {
-	ReferenceName string `protobuf:"bytes,3,opt,name=reference_name,json=referenceName,oneof"`
+	ReferenceName string `protobuf:"bytes,3,opt,name=reference_name,json=referenceName,proto3,oneof"`
 }
 
-func (*SearchAnnotationsRequest_ReferenceId) isSearchAnnotationsRequest_Reference()   {}
+func (*SearchAnnotationsRequest_ReferenceId) isSearchAnnotationsRequest_Reference() {}
+
 func (*SearchAnnotationsRequest_ReferenceName) isSearchAnnotationsRequest_Reference() {}
 
 func (m *SearchAnnotationsRequest) GetReference() isSearchAnnotationsRequest_Reference {
@@ -1366,13 +1753,6 @@ func (m *SearchAnnotationsRequest) GetReference() isSearchAnnotationsRequest_Ref
 	return nil
 }
 
-func (m *SearchAnnotationsRequest) GetAnnotationSetIds() []string {
-	if m != nil {
-		return m.AnnotationSetIds
-	}
-	return nil
-}
-
 func (m *SearchAnnotationsRequest) GetReferenceId() string {
 	if x, ok := m.GetReference().(*SearchAnnotationsRequest_ReferenceId); ok {
 		return x.ReferenceId
@@ -1467,11 +1847,11 @@ func _SearchAnnotationsRequest_OneofSizer(msg proto.Message) (n int) {
 	// reference
 	switch x := m.Reference.(type) {
 	case *SearchAnnotationsRequest_ReferenceId:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ReferenceId)))
 		n += len(x.ReferenceId)
 	case *SearchAnnotationsRequest_ReferenceName:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ReferenceName)))
 		n += len(x.ReferenceName)
 	case nil:
@@ -1483,17 +1863,39 @@ func _SearchAnnotationsRequest_OneofSizer(msg proto.Message) (n int) {
 
 type SearchAnnotationsResponse struct {
 	// The matching annotations.
-	Annotations []*Annotation `protobuf:"bytes,1,rep,name=annotations" json:"annotations,omitempty"`
+	Annotations []*Annotation `protobuf:"bytes,1,rep,name=annotations,proto3" json:"annotations,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchAnnotationsResponse) Reset()                    { *m = SearchAnnotationsResponse{} }
-func (m *SearchAnnotationsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchAnnotationsResponse) ProtoMessage()               {}
-func (*SearchAnnotationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *SearchAnnotationsResponse) Reset()         { *m = SearchAnnotationsResponse{} }
+func (m *SearchAnnotationsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchAnnotationsResponse) ProtoMessage()    {}
+func (*SearchAnnotationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_annotations_22f61783ae14922a, []int{18}
+}
+func (m *SearchAnnotationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchAnnotationsResponse.Unmarshal(m, b)
+}
+func (m *SearchAnnotationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchAnnotationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchAnnotationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchAnnotationsResponse.Merge(dst, src)
+}
+func (m *SearchAnnotationsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchAnnotationsResponse.Size(m)
+}
+func (m *SearchAnnotationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchAnnotationsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchAnnotationsResponse proto.InternalMessageInfo
 
 func (m *SearchAnnotationsResponse) GetAnnotations() []*Annotation {
 	if m != nil {
@@ -1511,7 +1913,9 @@ func (m *SearchAnnotationsResponse) GetNextPageToken() string {
 
 func init() {
 	proto.RegisterType((*AnnotationSet)(nil), "google.genomics.v1.AnnotationSet")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.AnnotationSet.InfoEntry")
 	proto.RegisterType((*Annotation)(nil), "google.genomics.v1.Annotation")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.Annotation.InfoEntry")
 	proto.RegisterType((*VariantAnnotation)(nil), "google.genomics.v1.VariantAnnotation")
 	proto.RegisterType((*VariantAnnotation_ClinicalCondition)(nil), "google.genomics.v1.VariantAnnotation.ClinicalCondition")
 	proto.RegisterType((*Transcript)(nil), "google.genomics.v1.Transcript")
@@ -1547,8 +1951,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for AnnotationServiceV1 service
-
+// AnnotationServiceV1Client is the client API for AnnotationServiceV1 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type AnnotationServiceV1Client interface {
 	// Creates a new annotation set. Caller must have WRITE permission for the
 	// associated dataset.
@@ -1570,7 +1975,7 @@ type AnnotationServiceV1Client interface {
 	UpdateAnnotationSet(ctx context.Context, in *UpdateAnnotationSetRequest, opts ...grpc.CallOption) (*AnnotationSet, error)
 	// Deletes an annotation set. Caller must have WRITE permission
 	// for the associated annotation set.
-	DeleteAnnotationSet(ctx context.Context, in *DeleteAnnotationSetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteAnnotationSet(ctx context.Context, in *DeleteAnnotationSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Searches for annotation sets that match the given criteria. Annotation sets
 	// are returned in an unspecified order. This order is consistent, such that
 	// two queries for the same content (regardless of page size) yield annotation
@@ -1623,7 +2028,7 @@ type AnnotationServiceV1Client interface {
 	UpdateAnnotation(ctx context.Context, in *UpdateAnnotationRequest, opts ...grpc.CallOption) (*Annotation, error)
 	// Deletes an annotation. Caller must have WRITE permission for
 	// the associated annotation set.
-	DeleteAnnotation(ctx context.Context, in *DeleteAnnotationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteAnnotation(ctx context.Context, in *DeleteAnnotationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Searches for annotations that match the given criteria. Results are
 	// ordered by genomic coordinate (by reference sequence, then position).
 	// Annotations with equivalent genomic coordinates are returned in an
@@ -1644,7 +2049,7 @@ func NewAnnotationServiceV1Client(cc *grpc.ClientConn) AnnotationServiceV1Client
 
 func (c *annotationServiceV1Client) CreateAnnotationSet(ctx context.Context, in *CreateAnnotationSetRequest, opts ...grpc.CallOption) (*AnnotationSet, error) {
 	out := new(AnnotationSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/CreateAnnotationSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/CreateAnnotationSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1653,7 +2058,7 @@ func (c *annotationServiceV1Client) CreateAnnotationSet(ctx context.Context, in
 
 func (c *annotationServiceV1Client) GetAnnotationSet(ctx context.Context, in *GetAnnotationSetRequest, opts ...grpc.CallOption) (*AnnotationSet, error) {
 	out := new(AnnotationSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/GetAnnotationSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/GetAnnotationSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1662,16 +2067,16 @@ func (c *annotationServiceV1Client) GetAnnotationSet(ctx context.Context, in *Ge
 
 func (c *annotationServiceV1Client) UpdateAnnotationSet(ctx context.Context, in *UpdateAnnotationSetRequest, opts ...grpc.CallOption) (*AnnotationSet, error) {
 	out := new(AnnotationSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/UpdateAnnotationSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/UpdateAnnotationSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *annotationServiceV1Client) DeleteAnnotationSet(ctx context.Context, in *DeleteAnnotationSetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/DeleteAnnotationSet", in, out, c.cc, opts...)
+func (c *annotationServiceV1Client) DeleteAnnotationSet(ctx context.Context, in *DeleteAnnotationSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/DeleteAnnotationSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1680,7 +2085,7 @@ func (c *annotationServiceV1Client) DeleteAnnotationSet(ctx context.Context, in
 
 func (c *annotationServiceV1Client) SearchAnnotationSets(ctx context.Context, in *SearchAnnotationSetsRequest, opts ...grpc.CallOption) (*SearchAnnotationSetsResponse, error) {
 	out := new(SearchAnnotationSetsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/SearchAnnotationSets", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/SearchAnnotationSets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1689,7 +2094,7 @@ func (c *annotationServiceV1Client) SearchAnnotationSets(ctx context.Context, in
 
 func (c *annotationServiceV1Client) CreateAnnotation(ctx context.Context, in *CreateAnnotationRequest, opts ...grpc.CallOption) (*Annotation, error) {
 	out := new(Annotation)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/CreateAnnotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/CreateAnnotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1698,7 +2103,7 @@ func (c *annotationServiceV1Client) CreateAnnotation(ctx context.Context, in *Cr
 
 func (c *annotationServiceV1Client) BatchCreateAnnotations(ctx context.Context, in *BatchCreateAnnotationsRequest, opts ...grpc.CallOption) (*BatchCreateAnnotationsResponse, error) {
 	out := new(BatchCreateAnnotationsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/BatchCreateAnnotations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/BatchCreateAnnotations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1707,7 +2112,7 @@ func (c *annotationServiceV1Client) BatchCreateAnnotations(ctx context.Context,
 
 func (c *annotationServiceV1Client) GetAnnotation(ctx context.Context, in *GetAnnotationRequest, opts ...grpc.CallOption) (*Annotation, error) {
 	out := new(Annotation)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/GetAnnotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/GetAnnotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1716,16 +2121,16 @@ func (c *annotationServiceV1Client) GetAnnotation(ctx context.Context, in *GetAn
 
 func (c *annotationServiceV1Client) UpdateAnnotation(ctx context.Context, in *UpdateAnnotationRequest, opts ...grpc.CallOption) (*Annotation, error) {
 	out := new(Annotation)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/UpdateAnnotation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/UpdateAnnotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *annotationServiceV1Client) DeleteAnnotation(ctx context.Context, in *DeleteAnnotationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/DeleteAnnotation", in, out, c.cc, opts...)
+func (c *annotationServiceV1Client) DeleteAnnotation(ctx context.Context, in *DeleteAnnotationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/DeleteAnnotation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1734,15 +2139,14 @@ func (c *annotationServiceV1Client) DeleteAnnotation(ctx context.Context, in *De
 
 func (c *annotationServiceV1Client) SearchAnnotations(ctx context.Context, in *SearchAnnotationsRequest, opts ...grpc.CallOption) (*SearchAnnotationsResponse, error) {
 	out := new(SearchAnnotationsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/SearchAnnotations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.AnnotationServiceV1/SearchAnnotations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for AnnotationServiceV1 service
-
+// AnnotationServiceV1Server is the server API for AnnotationServiceV1 service.
 type AnnotationServiceV1Server interface {
 	// Creates a new annotation set. Caller must have WRITE permission for the
 	// associated dataset.
@@ -1764,7 +2168,7 @@ type AnnotationServiceV1Server interface {
 	UpdateAnnotationSet(context.Context, *UpdateAnnotationSetRequest) (*AnnotationSet, error)
 	// Deletes an annotation set. Caller must have WRITE permission
 	// for the associated annotation set.
-	DeleteAnnotationSet(context.Context, *DeleteAnnotationSetRequest) (*google_protobuf1.Empty, error)
+	DeleteAnnotationSet(context.Context, *DeleteAnnotationSetRequest) (*empty.Empty, error)
 	// Searches for annotation sets that match the given criteria. Annotation sets
 	// are returned in an unspecified order. This order is consistent, such that
 	// two queries for the same content (regardless of page size) yield annotation
@@ -1817,7 +2221,7 @@ type AnnotationServiceV1Server interface {
 	UpdateAnnotation(context.Context, *UpdateAnnotationRequest) (*Annotation, error)
 	// Deletes an annotation. Caller must have WRITE permission for
 	// the associated annotation set.
-	DeleteAnnotation(context.Context, *DeleteAnnotationRequest) (*google_protobuf1.Empty, error)
+	DeleteAnnotation(context.Context, *DeleteAnnotationRequest) (*empty.Empty, error)
 	// Searches for annotations that match the given criteria. Results are
 	// ordered by genomic coordinate (by reference sequence, then position).
 	// Annotations with equivalent genomic coordinates are returned in an
@@ -2083,9 +2487,11 @@ var _AnnotationServiceV1_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/genomics/v1/annotations.proto",
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/annotations.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/annotations.proto", fileDescriptor_annotations_22f61783ae14922a)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_annotations_22f61783ae14922a = []byte{
 	// 2188 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x6f, 0xdb, 0xc8,
 	0x15, 0x0f, 0xf5, 0x69, 0x3f, 0xd9, 0x32, 0x3d, 0xf1, 0xda, 0x5a, 0x39, 0x1f, 0x0e, 0xf3, 0x65,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/cigar.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/cigar.pb.go
index a45daa0b..98ca5247 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/cigar.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/cigar.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/cigar.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Describes the different types of CIGAR alignment operations that exist.
 // Used wherever CIGAR alignments are used.
 type CigarUnit_Operation int32
@@ -93,24 +99,48 @@ var CigarUnit_Operation_value = map[string]int32{
 func (x CigarUnit_Operation) String() string {
 	return proto.EnumName(CigarUnit_Operation_name, int32(x))
 }
-func (CigarUnit_Operation) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (CigarUnit_Operation) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_cigar_ce8c8036b76f9461, []int{0, 0}
+}
 
 // A single CIGAR operation.
 type CigarUnit struct {
-	Operation CigarUnit_Operation `protobuf:"varint,1,opt,name=operation,enum=google.genomics.v1.CigarUnit_Operation" json:"operation,omitempty"`
+	Operation CigarUnit_Operation `protobuf:"varint,1,opt,name=operation,proto3,enum=google.genomics.v1.CigarUnit_Operation" json:"operation,omitempty"`
 	// The number of genomic bases that the operation runs for. Required.
-	OperationLength int64 `protobuf:"varint,2,opt,name=operation_length,json=operationLength" json:"operation_length,omitempty"`
+	OperationLength int64 `protobuf:"varint,2,opt,name=operation_length,json=operationLength,proto3" json:"operation_length,omitempty"`
 	// `referenceSequence` is only used at mismatches
 	// (`SEQUENCE_MISMATCH`) and deletions (`DELETE`).
 	// Filling this field replaces SAM's MD tag. If the relevant information is
 	// not available, this field is unset.
-	ReferenceSequence string `protobuf:"bytes,3,opt,name=reference_sequence,json=referenceSequence" json:"reference_sequence,omitempty"`
+	ReferenceSequence    string   `protobuf:"bytes,3,opt,name=reference_sequence,json=referenceSequence,proto3" json:"reference_sequence,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CigarUnit) Reset()                    { *m = CigarUnit{} }
-func (m *CigarUnit) String() string            { return proto.CompactTextString(m) }
-func (*CigarUnit) ProtoMessage()               {}
-func (*CigarUnit) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *CigarUnit) Reset()         { *m = CigarUnit{} }
+func (m *CigarUnit) String() string { return proto.CompactTextString(m) }
+func (*CigarUnit) ProtoMessage()    {}
+func (*CigarUnit) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cigar_ce8c8036b76f9461, []int{0}
+}
+func (m *CigarUnit) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CigarUnit.Unmarshal(m, b)
+}
+func (m *CigarUnit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CigarUnit.Marshal(b, m, deterministic)
+}
+func (dst *CigarUnit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CigarUnit.Merge(dst, src)
+}
+func (m *CigarUnit) XXX_Size() int {
+	return xxx_messageInfo_CigarUnit.Size(m)
+}
+func (m *CigarUnit) XXX_DiscardUnknown() {
+	xxx_messageInfo_CigarUnit.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CigarUnit proto.InternalMessageInfo
 
 func (m *CigarUnit) GetOperation() CigarUnit_Operation {
 	if m != nil {
@@ -138,9 +168,11 @@ func init() {
 	proto.RegisterEnum("google.genomics.v1.CigarUnit_Operation", CigarUnit_Operation_name, CigarUnit_Operation_value)
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/cigar.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/cigar.proto", fileDescriptor_cigar_ce8c8036b76f9461)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_cigar_ce8c8036b76f9461 = []byte{
 	// 367 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xcf, 0x0e, 0x93, 0x30,
 	0x1c, 0xb6, 0x63, 0x6e, 0xe3, 0x97, 0xb8, 0x75, 0x35, 0x33, 0xd3, 0x18, 0xb3, 0xec, 0xe2, 0x3c,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/datasets.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/datasets.pb.go
index a871906f..8506d460 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/datasets.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/datasets.pb.go
@@ -1,17 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/datasets.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf6 "github.com/golang/protobuf/ptypes/timestamp"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -23,25 +22,53 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A Dataset is a collection of genomic data.
 //
 // For more genomics resource definitions, see [Fundamentals of Google
 // Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
 type Dataset struct {
 	// The server-generated dataset ID, unique across all datasets.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The Google Cloud project ID that this dataset belongs to.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The dataset name.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// The time this dataset was created, in seconds from the epoch.
-	CreateTime *google_protobuf6.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime           *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Dataset) Reset()         { *m = Dataset{} }
+func (m *Dataset) String() string { return proto.CompactTextString(m) }
+func (*Dataset) ProtoMessage()    {}
+func (*Dataset) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datasets_6135563a56d7e4f8, []int{0}
+}
+func (m *Dataset) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Dataset.Unmarshal(m, b)
+}
+func (m *Dataset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Dataset.Marshal(b, m, deterministic)
+}
+func (dst *Dataset) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Dataset.Merge(dst, src)
+}
+func (m *Dataset) XXX_Size() int {
+	return xxx_messageInfo_Dataset.Size(m)
+}
+func (m *Dataset) XXX_DiscardUnknown() {
+	xxx_messageInfo_Dataset.DiscardUnknown(m)
 }
 
-func (m *Dataset) Reset()                    { *m = Dataset{} }
-func (m *Dataset) String() string            { return proto.CompactTextString(m) }
-func (*Dataset) ProtoMessage()               {}
-func (*Dataset) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_Dataset proto.InternalMessageInfo
 
 func (m *Dataset) GetId() string {
 	if m != nil {
@@ -64,7 +91,7 @@ func (m *Dataset) GetName() string {
 	return ""
 }
 
-func (m *Dataset) GetCreateTime() *google_protobuf6.Timestamp {
+func (m *Dataset) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
@@ -74,20 +101,42 @@ func (m *Dataset) GetCreateTime() *google_protobuf6.Timestamp {
 // The dataset list request.
 type ListDatasetsRequest struct {
 	// Required. The Google Cloud project ID to list datasets for.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 50. The maximum value is 1024.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDatasetsRequest) Reset()         { *m = ListDatasetsRequest{} }
+func (m *ListDatasetsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDatasetsRequest) ProtoMessage()    {}
+func (*ListDatasetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datasets_6135563a56d7e4f8, []int{1}
+}
+func (m *ListDatasetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDatasetsRequest.Unmarshal(m, b)
+}
+func (m *ListDatasetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDatasetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDatasetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsRequest.Merge(dst, src)
+}
+func (m *ListDatasetsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDatasetsRequest.Size(m)
+}
+func (m *ListDatasetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDatasetsRequest.DiscardUnknown(m)
 }
 
-func (m *ListDatasetsRequest) Reset()                    { *m = ListDatasetsRequest{} }
-func (m *ListDatasetsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDatasetsRequest) ProtoMessage()               {}
-func (*ListDatasetsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_ListDatasetsRequest proto.InternalMessageInfo
 
 func (m *ListDatasetsRequest) GetProjectId() string {
 	if m != nil {
@@ -113,17 +162,39 @@ func (m *ListDatasetsRequest) GetPageToken() string {
 // The dataset list response.
 type ListDatasetsResponse struct {
 	// The list of matching Datasets.
-	Datasets []*Dataset `protobuf:"bytes,1,rep,name=datasets" json:"datasets,omitempty"`
+	Datasets []*Dataset `protobuf:"bytes,1,rep,name=datasets,proto3" json:"datasets,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDatasetsResponse) Reset()                    { *m = ListDatasetsResponse{} }
-func (m *ListDatasetsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDatasetsResponse) ProtoMessage()               {}
-func (*ListDatasetsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+func (m *ListDatasetsResponse) Reset()         { *m = ListDatasetsResponse{} }
+func (m *ListDatasetsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDatasetsResponse) ProtoMessage()    {}
+func (*ListDatasetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datasets_6135563a56d7e4f8, []int{2}
+}
+func (m *ListDatasetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDatasetsResponse.Unmarshal(m, b)
+}
+func (m *ListDatasetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDatasetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDatasetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatasetsResponse.Merge(dst, src)
+}
+func (m *ListDatasetsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDatasetsResponse.Size(m)
+}
+func (m *ListDatasetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDatasetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDatasetsResponse proto.InternalMessageInfo
 
 func (m *ListDatasetsResponse) GetDatasets() []*Dataset {
 	if m != nil {
@@ -141,13 +212,35 @@ func (m *ListDatasetsResponse) GetNextPageToken() string {
 
 type CreateDatasetRequest struct {
 	// The dataset to be created. Must contain projectId and name.
-	Dataset *Dataset `protobuf:"bytes,1,opt,name=dataset" json:"dataset,omitempty"`
+	Dataset              *Dataset `protobuf:"bytes,1,opt,name=dataset,proto3" json:"dataset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateDatasetRequest) Reset()         { *m = CreateDatasetRequest{} }
+func (m *CreateDatasetRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDatasetRequest) ProtoMessage()    {}
+func (*CreateDatasetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datasets_6135563a56d7e4f8, []int{3}
+}
+func (m *CreateDatasetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDatasetRequest.Unmarshal(m, b)
+}
+func (m *CreateDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDatasetRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatasetRequest.Merge(dst, src)
+}
+func (m *CreateDatasetRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDatasetRequest.Size(m)
+}
+func (m *CreateDatasetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDatasetRequest.DiscardUnknown(m)
 }
 
-func (m *CreateDatasetRequest) Reset()                    { *m = CreateDatasetRequest{} }
-func (m *CreateDatasetRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateDatasetRequest) ProtoMessage()               {}
-func (*CreateDatasetRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_CreateDatasetRequest proto.InternalMessageInfo
 
 func (m *CreateDatasetRequest) GetDataset() *Dataset {
 	if m != nil {
@@ -158,20 +251,42 @@ func (m *CreateDatasetRequest) GetDataset() *Dataset {
 
 type UpdateDatasetRequest struct {
 	// The ID of the dataset to be updated.
-	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	// The new dataset data.
-	Dataset *Dataset `protobuf:"bytes,2,opt,name=dataset" json:"dataset,omitempty"`
+	Dataset *Dataset `protobuf:"bytes,2,opt,name=dataset,proto3" json:"dataset,omitempty"`
 	// An optional mask specifying which fields to update. At this time, the only
 	// mutable field is [name][google.genomics.v1.Dataset.name]. The only
 	// acceptable value is "name". If unspecified, all mutable fields will be
 	// updated.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateDatasetRequest) Reset()                    { *m = UpdateDatasetRequest{} }
-func (m *UpdateDatasetRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateDatasetRequest) ProtoMessage()               {}
-func (*UpdateDatasetRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+func (m *UpdateDatasetRequest) Reset()         { *m = UpdateDatasetRequest{} }
+func (m *UpdateDatasetRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateDatasetRequest) ProtoMessage()    {}
+func (*UpdateDatasetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datasets_6135563a56d7e4f8, []int{4}
+}
+func (m *UpdateDatasetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateDatasetRequest.Unmarshal(m, b)
+}
+func (m *UpdateDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateDatasetRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDatasetRequest.Merge(dst, src)
+}
+func (m *UpdateDatasetRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateDatasetRequest.Size(m)
+}
+func (m *UpdateDatasetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateDatasetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateDatasetRequest proto.InternalMessageInfo
 
 func (m *UpdateDatasetRequest) GetDatasetId() string {
 	if m != nil {
@@ -187,7 +302,7 @@ func (m *UpdateDatasetRequest) GetDataset() *Dataset {
 	return nil
 }
 
-func (m *UpdateDatasetRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateDatasetRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -196,13 +311,35 @@ func (m *UpdateDatasetRequest) GetUpdateMask() *google_protobuf2.FieldMask {
 
 type DeleteDatasetRequest struct {
 	// The ID of the dataset to be deleted.
-	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId            string   `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteDatasetRequest) Reset()         { *m = DeleteDatasetRequest{} }
+func (m *DeleteDatasetRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteDatasetRequest) ProtoMessage()    {}
+func (*DeleteDatasetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datasets_6135563a56d7e4f8, []int{5}
+}
+func (m *DeleteDatasetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteDatasetRequest.Unmarshal(m, b)
+}
+func (m *DeleteDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteDatasetRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDatasetRequest.Merge(dst, src)
+}
+func (m *DeleteDatasetRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteDatasetRequest.Size(m)
+}
+func (m *DeleteDatasetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteDatasetRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteDatasetRequest) Reset()                    { *m = DeleteDatasetRequest{} }
-func (m *DeleteDatasetRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteDatasetRequest) ProtoMessage()               {}
-func (*DeleteDatasetRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_DeleteDatasetRequest proto.InternalMessageInfo
 
 func (m *DeleteDatasetRequest) GetDatasetId() string {
 	if m != nil {
@@ -213,13 +350,35 @@ func (m *DeleteDatasetRequest) GetDatasetId() string {
 
 type UndeleteDatasetRequest struct {
 	// The ID of the dataset to be undeleted.
-	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId            string   `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UndeleteDatasetRequest) Reset()                    { *m = UndeleteDatasetRequest{} }
-func (m *UndeleteDatasetRequest) String() string            { return proto.CompactTextString(m) }
-func (*UndeleteDatasetRequest) ProtoMessage()               {}
-func (*UndeleteDatasetRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+func (m *UndeleteDatasetRequest) Reset()         { *m = UndeleteDatasetRequest{} }
+func (m *UndeleteDatasetRequest) String() string { return proto.CompactTextString(m) }
+func (*UndeleteDatasetRequest) ProtoMessage()    {}
+func (*UndeleteDatasetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datasets_6135563a56d7e4f8, []int{6}
+}
+func (m *UndeleteDatasetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UndeleteDatasetRequest.Unmarshal(m, b)
+}
+func (m *UndeleteDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UndeleteDatasetRequest.Marshal(b, m, deterministic)
+}
+func (dst *UndeleteDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteDatasetRequest.Merge(dst, src)
+}
+func (m *UndeleteDatasetRequest) XXX_Size() int {
+	return xxx_messageInfo_UndeleteDatasetRequest.Size(m)
+}
+func (m *UndeleteDatasetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UndeleteDatasetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UndeleteDatasetRequest proto.InternalMessageInfo
 
 func (m *UndeleteDatasetRequest) GetDatasetId() string {
 	if m != nil {
@@ -230,13 +389,35 @@ func (m *UndeleteDatasetRequest) GetDatasetId() string {
 
 type GetDatasetRequest struct {
 	// The ID of the dataset.
-	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId            string   `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetDatasetRequest) Reset()                    { *m = GetDatasetRequest{} }
-func (m *GetDatasetRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDatasetRequest) ProtoMessage()               {}
-func (*GetDatasetRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+func (m *GetDatasetRequest) Reset()         { *m = GetDatasetRequest{} }
+func (m *GetDatasetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDatasetRequest) ProtoMessage()    {}
+func (*GetDatasetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_datasets_6135563a56d7e4f8, []int{7}
+}
+func (m *GetDatasetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDatasetRequest.Unmarshal(m, b)
+}
+func (m *GetDatasetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDatasetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDatasetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatasetRequest.Merge(dst, src)
+}
+func (m *GetDatasetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDatasetRequest.Size(m)
+}
+func (m *GetDatasetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDatasetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDatasetRequest proto.InternalMessageInfo
 
 func (m *GetDatasetRequest) GetDatasetId() string {
 	if m != nil {
@@ -264,8 +445,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for DatasetServiceV1 service
-
+// DatasetServiceV1Client is the client API for DatasetServiceV1 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DatasetServiceV1Client interface {
 	// Lists datasets within a project.
 	//
@@ -303,7 +485,7 @@ type DatasetServiceV1Client interface {
 	// For the definitions of datasets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteDataset(ctx context.Context, in *DeleteDatasetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteDataset(ctx context.Context, in *DeleteDatasetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Undeletes a dataset by restoring a dataset which was deleted via this API.
 	//
 	// For the definitions of datasets and other genomics resources, see
@@ -321,7 +503,7 @@ type DatasetServiceV1Client interface {
 	//
 	// See <a href="/iam/docs/managing-policies#setting_a_policy">Setting a
 	// Policy</a> for more information.
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Gets the access control policy for the dataset. This is empty if the
 	// policy or resource does not exist.
 	//
@@ -331,7 +513,7 @@ type DatasetServiceV1Client interface {
 	// For the definitions of datasets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Returns permissions that a caller has on the specified resource.
 	// See <a href="/iam/docs/managing-policies#testing_permissions">Testing
 	// Permissions</a> for more information.
@@ -339,7 +521,7 @@ type DatasetServiceV1Client interface {
 	// For the definitions of datasets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
 }
 
 type datasetServiceV1Client struct {
@@ -352,7 +534,7 @@ func NewDatasetServiceV1Client(cc *grpc.ClientConn) DatasetServiceV1Client {
 
 func (c *datasetServiceV1Client) ListDatasets(ctx context.Context, in *ListDatasetsRequest, opts ...grpc.CallOption) (*ListDatasetsResponse, error) {
 	out := new(ListDatasetsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/ListDatasets", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/ListDatasets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -361,7 +543,7 @@ func (c *datasetServiceV1Client) ListDatasets(ctx context.Context, in *ListDatas
 
 func (c *datasetServiceV1Client) CreateDataset(ctx context.Context, in *CreateDatasetRequest, opts ...grpc.CallOption) (*Dataset, error) {
 	out := new(Dataset)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/CreateDataset", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/CreateDataset", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -370,7 +552,7 @@ func (c *datasetServiceV1Client) CreateDataset(ctx context.Context, in *CreateDa
 
 func (c *datasetServiceV1Client) GetDataset(ctx context.Context, in *GetDatasetRequest, opts ...grpc.CallOption) (*Dataset, error) {
 	out := new(Dataset)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/GetDataset", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/GetDataset", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -379,16 +561,16 @@ func (c *datasetServiceV1Client) GetDataset(ctx context.Context, in *GetDatasetR
 
 func (c *datasetServiceV1Client) UpdateDataset(ctx context.Context, in *UpdateDatasetRequest, opts ...grpc.CallOption) (*Dataset, error) {
 	out := new(Dataset)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/UpdateDataset", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/UpdateDataset", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *datasetServiceV1Client) DeleteDataset(ctx context.Context, in *DeleteDatasetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/DeleteDataset", in, out, c.cc, opts...)
+func (c *datasetServiceV1Client) DeleteDataset(ctx context.Context, in *DeleteDatasetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/DeleteDataset", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -397,42 +579,41 @@ func (c *datasetServiceV1Client) DeleteDataset(ctx context.Context, in *DeleteDa
 
 func (c *datasetServiceV1Client) UndeleteDataset(ctx context.Context, in *UndeleteDatasetRequest, opts ...grpc.CallOption) (*Dataset, error) {
 	out := new(Dataset)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/UndeleteDataset", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/UndeleteDataset", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *datasetServiceV1Client) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/SetIamPolicy", in, out, c.cc, opts...)
+func (c *datasetServiceV1Client) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *datasetServiceV1Client) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/GetIamPolicy", in, out, c.cc, opts...)
+func (c *datasetServiceV1Client) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *datasetServiceV1Client) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/TestIamPermissions", in, out, c.cc, opts...)
+func (c *datasetServiceV1Client) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.DatasetServiceV1/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for DatasetServiceV1 service
-
+// DatasetServiceV1Server is the server API for DatasetServiceV1 service.
 type DatasetServiceV1Server interface {
 	// Lists datasets within a project.
 	//
@@ -470,7 +651,7 @@ type DatasetServiceV1Server interface {
 	// For the definitions of datasets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteDataset(context.Context, *DeleteDatasetRequest) (*google_protobuf1.Empty, error)
+	DeleteDataset(context.Context, *DeleteDatasetRequest) (*empty.Empty, error)
 	// Undeletes a dataset by restoring a dataset which was deleted via this API.
 	//
 	// For the definitions of datasets and other genomics resources, see
@@ -488,7 +669,7 @@ type DatasetServiceV1Server interface {
 	//
 	// See <a href="/iam/docs/managing-policies#setting_a_policy">Setting a
 	// Policy</a> for more information.
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Gets the access control policy for the dataset. This is empty if the
 	// policy or resource does not exist.
 	//
@@ -498,7 +679,7 @@ type DatasetServiceV1Server interface {
 	// For the definitions of datasets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Returns permissions that a caller has on the specified resource.
 	// See <a href="/iam/docs/managing-policies#testing_permissions">Testing
 	// Permissions</a> for more information.
@@ -506,7 +687,7 @@ type DatasetServiceV1Server interface {
 	// For the definitions of datasets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
 }
 
 func RegisterDatasetServiceV1Server(s *grpc.Server, srv DatasetServiceV1Server) {
@@ -622,7 +803,7 @@ func _DatasetServiceV1_UndeleteDataset_Handler(srv interface{}, ctx context.Cont
 }
 
 func _DatasetServiceV1_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -634,13 +815,13 @@ func _DatasetServiceV1_SetIamPolicy_Handler(srv interface{}, ctx context.Context
 		FullMethod: "/google.genomics.v1.DatasetServiceV1/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DatasetServiceV1Server).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(DatasetServiceV1Server).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _DatasetServiceV1_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -652,13 +833,13 @@ func _DatasetServiceV1_GetIamPolicy_Handler(srv interface{}, ctx context.Context
 		FullMethod: "/google.genomics.v1.DatasetServiceV1/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DatasetServiceV1Server).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(DatasetServiceV1Server).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _DatasetServiceV1_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -670,7 +851,7 @@ func _DatasetServiceV1_TestIamPermissions_Handler(srv interface{}, ctx context.C
 		FullMethod: "/google.genomics.v1.DatasetServiceV1/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DatasetServiceV1Server).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(DatasetServiceV1Server).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -720,9 +901,11 @@ var _DatasetServiceV1_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/genomics/v1/datasets.proto",
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/datasets.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/datasets.proto", fileDescriptor_datasets_6135563a56d7e4f8)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_datasets_6135563a56d7e4f8 = []byte{
 	// 786 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xd1, 0x4e, 0x13, 0x4d,
 	0x14, 0xce, 0x16, 0xfe, 0x1f, 0x7a, 0xa0, 0xa0, 0x63, 0xc5, 0xda, 0x8a, 0x96, 0x8d, 0x42, 0xad,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/operations.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/operations.pb.go
index 194e9017..25849dbb 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/operations.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/operations.pb.go
@@ -1,52 +1,80 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/operations.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf6 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Metadata describing an [Operation][google.longrunning.Operation].
 type OperationMetadata struct {
 	// The Google Cloud Project in which the job is scoped.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The time at which the job was submitted to the Genomics service.
-	CreateTime *google_protobuf6.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time at which the job began to run.
-	StartTime *google_protobuf6.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time at which the job stopped running.
-	EndTime *google_protobuf6.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The original request that started the operation. Note that this will be in
 	// current version of the API. If the operation was started with v1beta2 API
 	// and a GetOperation is performed on v1 API, a v1 request will be returned.
-	Request *google_protobuf5.Any `protobuf:"bytes,5,opt,name=request" json:"request,omitempty"`
+	Request *any.Any `protobuf:"bytes,5,opt,name=request,proto3" json:"request,omitempty"`
 	// Optional event messages that were generated during the job's execution.
 	// This also contains any warnings that were generated during import
 	// or export.
-	Events []*OperationEvent `protobuf:"bytes,6,rep,name=events" json:"events,omitempty"`
+	Events []*OperationEvent `protobuf:"bytes,6,rep,name=events,proto3" json:"events,omitempty"`
 	// This field is deprecated. Use `labels` instead. Optionally provided by the
 	// caller when submitting the request that creates the operation.
-	ClientId string `protobuf:"bytes,7,opt,name=client_id,json=clientId" json:"client_id,omitempty"`
+	ClientId string `protobuf:"bytes,7,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// Runtime metadata on this Operation.
-	RuntimeMetadata *google_protobuf5.Any `protobuf:"bytes,8,opt,name=runtime_metadata,json=runtimeMetadata" json:"runtime_metadata,omitempty"`
+	RuntimeMetadata *any.Any `protobuf:"bytes,8,opt,name=runtime_metadata,json=runtimeMetadata,proto3" json:"runtime_metadata,omitempty"`
 	// Optionally provided by the caller when submitting the request that creates
 	// the operation.
-	Labels map[string]string `protobuf:"bytes,9,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,9,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *OperationMetadata) Reset()                    { *m = OperationMetadata{} }
-func (m *OperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*OperationMetadata) ProtoMessage()               {}
-func (*OperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (m *OperationMetadata) Reset()         { *m = OperationMetadata{} }
+func (m *OperationMetadata) String() string { return proto.CompactTextString(m) }
+func (*OperationMetadata) ProtoMessage()    {}
+func (*OperationMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_4f155d6eb213ff75, []int{0}
+}
+func (m *OperationMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationMetadata.Unmarshal(m, b)
+}
+func (m *OperationMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationMetadata.Marshal(b, m, deterministic)
+}
+func (dst *OperationMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationMetadata.Merge(dst, src)
+}
+func (m *OperationMetadata) XXX_Size() int {
+	return xxx_messageInfo_OperationMetadata.Size(m)
+}
+func (m *OperationMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationMetadata proto.InternalMessageInfo
 
 func (m *OperationMetadata) GetProjectId() string {
 	if m != nil {
@@ -55,28 +83,28 @@ func (m *OperationMetadata) GetProjectId() string {
 	return ""
 }
 
-func (m *OperationMetadata) GetCreateTime() *google_protobuf6.Timestamp {
+func (m *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *OperationMetadata) GetStartTime() *google_protobuf6.Timestamp {
+func (m *OperationMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *OperationMetadata) GetEndTime() *google_protobuf6.Timestamp {
+func (m *OperationMetadata) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
 	return nil
 }
 
-func (m *OperationMetadata) GetRequest() *google_protobuf5.Any {
+func (m *OperationMetadata) GetRequest() *any.Any {
 	if m != nil {
 		return m.Request
 	}
@@ -97,7 +125,7 @@ func (m *OperationMetadata) GetClientId() string {
 	return ""
 }
 
-func (m *OperationMetadata) GetRuntimeMetadata() *google_protobuf5.Any {
+func (m *OperationMetadata) GetRuntimeMetadata() *any.Any {
 	if m != nil {
 		return m.RuntimeMetadata
 	}
@@ -114,27 +142,49 @@ func (m *OperationMetadata) GetLabels() map[string]string {
 // An event that occurred during an [Operation][google.longrunning.Operation].
 type OperationEvent struct {
 	// Optional time of when event started.
-	StartTime *google_protobuf6.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Optional time of when event finished. An event can have a start time and no
 	// finish time. If an event has a finish time, there must be a start time.
-	EndTime *google_protobuf6.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Required description of event.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *OperationEvent) Reset()                    { *m = OperationEvent{} }
-func (m *OperationEvent) String() string            { return proto.CompactTextString(m) }
-func (*OperationEvent) ProtoMessage()               {}
-func (*OperationEvent) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+func (m *OperationEvent) Reset()         { *m = OperationEvent{} }
+func (m *OperationEvent) String() string { return proto.CompactTextString(m) }
+func (*OperationEvent) ProtoMessage()    {}
+func (*OperationEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_4f155d6eb213ff75, []int{1}
+}
+func (m *OperationEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OperationEvent.Unmarshal(m, b)
+}
+func (m *OperationEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OperationEvent.Marshal(b, m, deterministic)
+}
+func (dst *OperationEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationEvent.Merge(dst, src)
+}
+func (m *OperationEvent) XXX_Size() int {
+	return xxx_messageInfo_OperationEvent.Size(m)
+}
+func (m *OperationEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_OperationEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OperationEvent proto.InternalMessageInfo
 
-func (m *OperationEvent) GetStartTime() *google_protobuf6.Timestamp {
+func (m *OperationEvent) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *OperationEvent) GetEndTime() *google_protobuf6.Timestamp {
+func (m *OperationEvent) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -150,12 +200,15 @@ func (m *OperationEvent) GetDescription() string {
 
 func init() {
 	proto.RegisterType((*OperationMetadata)(nil), "google.genomics.v1.OperationMetadata")
+	proto.RegisterMapType((map[string]string)(nil), "google.genomics.v1.OperationMetadata.LabelsEntry")
 	proto.RegisterType((*OperationEvent)(nil), "google.genomics.v1.OperationEvent")
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/operations.proto", fileDescriptor3) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/operations.proto", fileDescriptor_operations_4f155d6eb213ff75)
+}
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_operations_4f155d6eb213ff75 = []byte{
 	// 456 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x41, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0xe5, 0x76, 0x6b, 0x9b, 0x17, 0x89, 0x0d, 0x6b, 0x42, 0xa1, 0x80, 0xa8, 0xca, 0xa5,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/position.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/position.pb.go
index 413c6844..e4f58177 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/position.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/position.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/position.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,24 +13,52 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // An abstraction for referring to a genomic position, in relation to some
 // already known reference. For now, represents a genomic position as a
 // reference name, a base number on that reference (0-based), and a
 // determination of forward or reverse strand.
 type Position struct {
 	// The name of the reference in whatever reference set is being used.
-	ReferenceName string `protobuf:"bytes,1,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,1,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The 0-based offset from the start of the forward strand for that reference.
-	Position int64 `protobuf:"varint,2,opt,name=position" json:"position,omitempty"`
+	Position int64 `protobuf:"varint,2,opt,name=position,proto3" json:"position,omitempty"`
 	// Whether this position is on the reverse strand, as opposed to the forward
 	// strand.
-	ReverseStrand bool `protobuf:"varint,3,opt,name=reverse_strand,json=reverseStrand" json:"reverse_strand,omitempty"`
+	ReverseStrand        bool     `protobuf:"varint,3,opt,name=reverse_strand,json=reverseStrand,proto3" json:"reverse_strand,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Position) Reset()         { *m = Position{} }
+func (m *Position) String() string { return proto.CompactTextString(m) }
+func (*Position) ProtoMessage()    {}
+func (*Position) Descriptor() ([]byte, []int) {
+	return fileDescriptor_position_a03b9f5830126916, []int{0}
+}
+func (m *Position) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Position.Unmarshal(m, b)
+}
+func (m *Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Position.Marshal(b, m, deterministic)
+}
+func (dst *Position) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Position.Merge(dst, src)
+}
+func (m *Position) XXX_Size() int {
+	return xxx_messageInfo_Position.Size(m)
+}
+func (m *Position) XXX_DiscardUnknown() {
+	xxx_messageInfo_Position.DiscardUnknown(m)
 }
 
-func (m *Position) Reset()                    { *m = Position{} }
-func (m *Position) String() string            { return proto.CompactTextString(m) }
-func (*Position) ProtoMessage()               {}
-func (*Position) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_Position proto.InternalMessageInfo
 
 func (m *Position) GetReferenceName() string {
 	if m != nil {
@@ -57,9 +85,11 @@ func init() {
 	proto.RegisterType((*Position)(nil), "google.genomics.v1.Position")
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/position.proto", fileDescriptor4) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/position.proto", fileDescriptor_position_a03b9f5830126916)
+}
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_position_a03b9f5830126916 = []byte{
 	// 223 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x41, 0x4b, 0x03, 0x31,
 	0x14, 0x84, 0x89, 0x05, 0x59, 0x03, 0xf5, 0xb0, 0x07, 0x59, 0x8a, 0x87, 0x55, 0x10, 0xf6, 0x94,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/range.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/range.pb.go
index 4062d6ea..90f51c61 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/range.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/range.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/range.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,21 +13,49 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A 0-based half-open genomic coordinate range for search requests.
 type Range struct {
 	// The reference sequence name, for example `chr1`,
 	// `1`, or `chrX`.
-	ReferenceName string `protobuf:"bytes,1,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,1,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The start position of the range on the reference, 0-based inclusive.
-	Start int64 `protobuf:"varint,2,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,2,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position of the range on the reference, 0-based exclusive.
-	End int64 `protobuf:"varint,3,opt,name=end" json:"end,omitempty"`
+	End                  int64    `protobuf:"varint,3,opt,name=end,proto3" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Range) Reset()         { *m = Range{} }
+func (m *Range) String() string { return proto.CompactTextString(m) }
+func (*Range) ProtoMessage()    {}
+func (*Range) Descriptor() ([]byte, []int) {
+	return fileDescriptor_range_ea4bc4104a5a55de, []int{0}
+}
+func (m *Range) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Range.Unmarshal(m, b)
+}
+func (m *Range) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Range.Marshal(b, m, deterministic)
+}
+func (dst *Range) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Range.Merge(dst, src)
+}
+func (m *Range) XXX_Size() int {
+	return xxx_messageInfo_Range.Size(m)
+}
+func (m *Range) XXX_DiscardUnknown() {
+	xxx_messageInfo_Range.DiscardUnknown(m)
 }
 
-func (m *Range) Reset()                    { *m = Range{} }
-func (m *Range) String() string            { return proto.CompactTextString(m) }
-func (*Range) ProtoMessage()               {}
-func (*Range) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+var xxx_messageInfo_Range proto.InternalMessageInfo
 
 func (m *Range) GetReferenceName() string {
 	if m != nil {
@@ -54,9 +82,11 @@ func init() {
 	proto.RegisterType((*Range)(nil), "google.genomics.v1.Range")
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/range.proto", fileDescriptor5) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/range.proto", fileDescriptor_range_ea4bc4104a5a55de)
+}
 
-var fileDescriptor5 = []byte{
+var fileDescriptor_range_ea4bc4104a5a55de = []byte{
 	// 209 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x4f, 0x4d, 0x4b, 0xc4, 0x30,
 	0x10, 0x25, 0x96, 0x15, 0x0c, 0x28, 0x12, 0x44, 0x8a, 0x88, 0x2c, 0x82, 0xb0, 0xa7, 0x84, 0xe2,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/readalignment.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/readalignment.pb.go
index f766a300..161ed64c 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/readalignment.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/readalignment.pb.go
@@ -1,39 +1,67 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readalignment.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/struct"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A linear alignment can be represented by one CIGAR string. Describes the
 // mapped position and local alignment of the read to the reference.
 type LinearAlignment struct {
 	// The position of this alignment.
-	Position *Position `protobuf:"bytes,1,opt,name=position" json:"position,omitempty"`
+	Position *Position `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
 	// The mapping quality of this alignment. Represents how likely
 	// the read maps to this position as opposed to other locations.
 	//
 	// Specifically, this is -10 log10 Pr(mapping position is wrong), rounded to
 	// the nearest integer.
-	MappingQuality int32 `protobuf:"varint,2,opt,name=mapping_quality,json=mappingQuality" json:"mapping_quality,omitempty"`
+	MappingQuality int32 `protobuf:"varint,2,opt,name=mapping_quality,json=mappingQuality,proto3" json:"mapping_quality,omitempty"`
 	// Represents the local alignment of this sequence (alignment matches, indels,
 	// etc) against the reference.
-	Cigar []*CigarUnit `protobuf:"bytes,3,rep,name=cigar" json:"cigar,omitempty"`
+	Cigar                []*CigarUnit `protobuf:"bytes,3,rep,name=cigar,proto3" json:"cigar,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *LinearAlignment) Reset()                    { *m = LinearAlignment{} }
-func (m *LinearAlignment) String() string            { return proto.CompactTextString(m) }
-func (*LinearAlignment) ProtoMessage()               {}
-func (*LinearAlignment) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+func (m *LinearAlignment) Reset()         { *m = LinearAlignment{} }
+func (m *LinearAlignment) String() string { return proto.CompactTextString(m) }
+func (*LinearAlignment) ProtoMessage()    {}
+func (*LinearAlignment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_readalignment_b0fdaef32d6e6f98, []int{0}
+}
+func (m *LinearAlignment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LinearAlignment.Unmarshal(m, b)
+}
+func (m *LinearAlignment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LinearAlignment.Marshal(b, m, deterministic)
+}
+func (dst *LinearAlignment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LinearAlignment.Merge(dst, src)
+}
+func (m *LinearAlignment) XXX_Size() int {
+	return xxx_messageInfo_LinearAlignment.Size(m)
+}
+func (m *LinearAlignment) XXX_DiscardUnknown() {
+	xxx_messageInfo_LinearAlignment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LinearAlignment proto.InternalMessageInfo
 
 func (m *LinearAlignment) GetPosition() *Position {
 	if m != nil {
@@ -141,42 +169,42 @@ func (m *LinearAlignment) GetCigar() []*CigarUnit {
 type Read struct {
 	// The server-generated read ID, unique across all reads. This is different
 	// from the `fragmentName`.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The ID of the read group this read belongs to. A read belongs to exactly
 	// one read group. This is a server-generated ID which is distinct from SAM's
 	// RG tag (for that value, see
 	// [ReadGroup.name][google.genomics.v1.ReadGroup.name]).
-	ReadGroupId string `protobuf:"bytes,2,opt,name=read_group_id,json=readGroupId" json:"read_group_id,omitempty"`
+	ReadGroupId string `protobuf:"bytes,2,opt,name=read_group_id,json=readGroupId,proto3" json:"read_group_id,omitempty"`
 	// The ID of the read group set this read belongs to. A read belongs to
 	// exactly one read group set.
-	ReadGroupSetId string `protobuf:"bytes,3,opt,name=read_group_set_id,json=readGroupSetId" json:"read_group_set_id,omitempty"`
+	ReadGroupSetId string `protobuf:"bytes,3,opt,name=read_group_set_id,json=readGroupSetId,proto3" json:"read_group_set_id,omitempty"`
 	// The fragment name. Equivalent to QNAME (query template name) in SAM.
-	FragmentName string `protobuf:"bytes,4,opt,name=fragment_name,json=fragmentName" json:"fragment_name,omitempty"`
+	FragmentName string `protobuf:"bytes,4,opt,name=fragment_name,json=fragmentName,proto3" json:"fragment_name,omitempty"`
 	// The orientation and the distance between reads from the fragment are
 	// consistent with the sequencing protocol (SAM flag 0x2).
-	ProperPlacement bool `protobuf:"varint,5,opt,name=proper_placement,json=properPlacement" json:"proper_placement,omitempty"`
+	ProperPlacement bool `protobuf:"varint,5,opt,name=proper_placement,json=properPlacement,proto3" json:"proper_placement,omitempty"`
 	// The fragment is a PCR or optical duplicate (SAM flag 0x400).
-	DuplicateFragment bool `protobuf:"varint,6,opt,name=duplicate_fragment,json=duplicateFragment" json:"duplicate_fragment,omitempty"`
+	DuplicateFragment bool `protobuf:"varint,6,opt,name=duplicate_fragment,json=duplicateFragment,proto3" json:"duplicate_fragment,omitempty"`
 	// The observed length of the fragment, equivalent to TLEN in SAM.
-	FragmentLength int32 `protobuf:"varint,7,opt,name=fragment_length,json=fragmentLength" json:"fragment_length,omitempty"`
+	FragmentLength int32 `protobuf:"varint,7,opt,name=fragment_length,json=fragmentLength,proto3" json:"fragment_length,omitempty"`
 	// The read number in sequencing. 0-based and less than numberReads. This
 	// field replaces SAM flag 0x40 and 0x80.
-	ReadNumber int32 `protobuf:"varint,8,opt,name=read_number,json=readNumber" json:"read_number,omitempty"`
+	ReadNumber int32 `protobuf:"varint,8,opt,name=read_number,json=readNumber,proto3" json:"read_number,omitempty"`
 	// The number of reads in the fragment (extension to SAM flag 0x1).
-	NumberReads int32 `protobuf:"varint,9,opt,name=number_reads,json=numberReads" json:"number_reads,omitempty"`
+	NumberReads int32 `protobuf:"varint,9,opt,name=number_reads,json=numberReads,proto3" json:"number_reads,omitempty"`
 	// Whether this read did not pass filters, such as platform or vendor quality
 	// controls (SAM flag 0x200).
-	FailedVendorQualityChecks bool `protobuf:"varint,10,opt,name=failed_vendor_quality_checks,json=failedVendorQualityChecks" json:"failed_vendor_quality_checks,omitempty"`
+	FailedVendorQualityChecks bool `protobuf:"varint,10,opt,name=failed_vendor_quality_checks,json=failedVendorQualityChecks,proto3" json:"failed_vendor_quality_checks,omitempty"`
 	// The linear alignment for this alignment record. This field is null for
 	// unmapped reads.
-	Alignment *LinearAlignment `protobuf:"bytes,11,opt,name=alignment" json:"alignment,omitempty"`
+	Alignment *LinearAlignment `protobuf:"bytes,11,opt,name=alignment,proto3" json:"alignment,omitempty"`
 	// Whether this alignment is secondary. Equivalent to SAM flag 0x100.
 	// A secondary alignment represents an alternative to the primary alignment
 	// for this read. Aligners may return secondary alignments if a read can map
 	// ambiguously to multiple coordinates in the genome. By convention, each read
 	// has one and only one alignment where both `secondaryAlignment`
 	// and `supplementaryAlignment` are false.
-	SecondaryAlignment bool `protobuf:"varint,12,opt,name=secondary_alignment,json=secondaryAlignment" json:"secondary_alignment,omitempty"`
+	SecondaryAlignment bool `protobuf:"varint,12,opt,name=secondary_alignment,json=secondaryAlignment,proto3" json:"secondary_alignment,omitempty"`
 	// Whether this alignment is supplementary. Equivalent to SAM flag 0x800.
 	// Supplementary alignments are used in the representation of a chimeric
 	// alignment. In a chimeric alignment, a read is split into multiple
@@ -188,7 +216,7 @@ type Read struct {
 	// will be hard clipped. The `alignedSequence` and
 	// `alignedQuality` fields in the alignment record will only
 	// represent the bases for its respective linear alignment.
-	SupplementaryAlignment bool `protobuf:"varint,13,opt,name=supplementary_alignment,json=supplementaryAlignment" json:"supplementary_alignment,omitempty"`
+	SupplementaryAlignment bool `protobuf:"varint,13,opt,name=supplementary_alignment,json=supplementaryAlignment,proto3" json:"supplementary_alignment,omitempty"`
 	// The bases of the read sequence contained in this alignment record,
 	// **without CIGAR operations applied** (equivalent to SEQ in SAM).
 	// `alignedSequence` and `alignedQuality` may be
@@ -196,7 +224,7 @@ type Read struct {
 	// alignment is part of a chimeric alignment, or if the read was trimmed. When
 	// this occurs, the CIGAR for this read will begin/end with a hard clip
 	// operator that will indicate the length of the excised sequence.
-	AlignedSequence string `protobuf:"bytes,14,opt,name=aligned_sequence,json=alignedSequence" json:"aligned_sequence,omitempty"`
+	AlignedSequence string `protobuf:"bytes,14,opt,name=aligned_sequence,json=alignedSequence,proto3" json:"aligned_sequence,omitempty"`
 	// The quality of the read sequence contained in this alignment record
 	// (equivalent to QUAL in SAM).
 	// `alignedSequence` and `alignedQuality` may be shorter than the full read
@@ -204,20 +232,42 @@ type Read struct {
 	// chimeric alignment, or if the read was trimmed. When this occurs, the CIGAR
 	// for this read will begin/end with a hard clip operator that will indicate
 	// the length of the excised sequence.
-	AlignedQuality []int32 `protobuf:"varint,15,rep,packed,name=aligned_quality,json=alignedQuality" json:"aligned_quality,omitempty"`
+	AlignedQuality []int32 `protobuf:"varint,15,rep,packed,name=aligned_quality,json=alignedQuality,proto3" json:"aligned_quality,omitempty"`
 	// The mapping of the primary alignment of the
 	// `(readNumber+1)%numberReads` read in the fragment. It replaces
 	// mate position and mate strand in SAM.
-	NextMatePosition *Position `protobuf:"bytes,16,opt,name=next_mate_position,json=nextMatePosition" json:"next_mate_position,omitempty"`
+	NextMatePosition *Position `protobuf:"bytes,16,opt,name=next_mate_position,json=nextMatePosition,proto3" json:"next_mate_position,omitempty"`
 	// A map of additional read alignment information. This must be of the form
 	// map<string, string[]> (string key mapping to a list of string values).
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,17,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info                 map[string]*_struct.ListValue `protobuf:"bytes,17,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
 }
 
-func (m *Read) Reset()                    { *m = Read{} }
-func (m *Read) String() string            { return proto.CompactTextString(m) }
-func (*Read) ProtoMessage()               {}
-func (*Read) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
+func (m *Read) Reset()         { *m = Read{} }
+func (m *Read) String() string { return proto.CompactTextString(m) }
+func (*Read) ProtoMessage()    {}
+func (*Read) Descriptor() ([]byte, []int) {
+	return fileDescriptor_readalignment_b0fdaef32d6e6f98, []int{1}
+}
+func (m *Read) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Read.Unmarshal(m, b)
+}
+func (m *Read) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Read.Marshal(b, m, deterministic)
+}
+func (dst *Read) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Read.Merge(dst, src)
+}
+func (m *Read) XXX_Size() int {
+	return xxx_messageInfo_Read.Size(m)
+}
+func (m *Read) XXX_DiscardUnknown() {
+	xxx_messageInfo_Read.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Read proto.InternalMessageInfo
 
 func (m *Read) GetId() string {
 	if m != nil {
@@ -331,7 +381,7 @@ func (m *Read) GetNextMatePosition() *Position {
 	return nil
 }
 
-func (m *Read) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *Read) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -341,11 +391,14 @@ func (m *Read) GetInfo() map[string]*google_protobuf3.ListValue {
 func init() {
 	proto.RegisterType((*LinearAlignment)(nil), "google.genomics.v1.LinearAlignment")
 	proto.RegisterType((*Read)(nil), "google.genomics.v1.Read")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.Read.InfoEntry")
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/readalignment.proto", fileDescriptor6) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/readalignment.proto", fileDescriptor_readalignment_b0fdaef32d6e6f98)
+}
 
-var fileDescriptor6 = []byte{
+var fileDescriptor_readalignment_b0fdaef32d6e6f98 = []byte{
 	// 683 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcd, 0x4e, 0xdb, 0x4a,
 	0x14, 0xc7, 0xe5, 0x84, 0x70, 0xc9, 0x09, 0x24, 0x61, 0xae, 0xc4, 0xf5, 0x8d, 0xb8, 0xb7, 0x21,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/readgroup.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/readgroup.pb.go
index 42f4e143..b52e6685 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/readgroup.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/readgroup.pb.go
@@ -1,54 +1,82 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readgroup.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/struct"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A read group is all the data that's processed the same way by the sequencer.
 type ReadGroup struct {
 	// The server-generated read group ID, unique for all read groups.
 	// Note: This is different than the @RG ID field in the SAM spec. For that
 	// value, see [name][google.genomics.v1.ReadGroup.name].
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The dataset to which this read group belongs.
-	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	// The read group name. This corresponds to the @RG ID field in the SAM spec.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// A free-form text description of this read group.
-	Description string `protobuf:"bytes,4,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
 	// A client-supplied sample identifier for the reads in this read group.
-	SampleId string `protobuf:"bytes,5,opt,name=sample_id,json=sampleId" json:"sample_id,omitempty"`
+	SampleId string `protobuf:"bytes,5,opt,name=sample_id,json=sampleId,proto3" json:"sample_id,omitempty"`
 	// The experiment used to generate this read group.
-	Experiment *ReadGroup_Experiment `protobuf:"bytes,6,opt,name=experiment" json:"experiment,omitempty"`
+	Experiment *ReadGroup_Experiment `protobuf:"bytes,6,opt,name=experiment,proto3" json:"experiment,omitempty"`
 	// The predicted insert size of this read group. The insert size is the length
 	// the sequenced DNA fragment from end-to-end, not including the adapters.
-	PredictedInsertSize int32 `protobuf:"varint,7,opt,name=predicted_insert_size,json=predictedInsertSize" json:"predicted_insert_size,omitempty"`
+	PredictedInsertSize int32 `protobuf:"varint,7,opt,name=predicted_insert_size,json=predictedInsertSize,proto3" json:"predicted_insert_size,omitempty"`
 	// The programs used to generate this read group. Programs are always
 	// identical for all read groups within a read group set. For this reason,
 	// only the first read group in a returned set will have this field
 	// populated.
-	Programs []*ReadGroup_Program `protobuf:"bytes,10,rep,name=programs" json:"programs,omitempty"`
+	Programs []*ReadGroup_Program `protobuf:"bytes,10,rep,name=programs,proto3" json:"programs,omitempty"`
 	// The reference set the reads in this read group are aligned to.
-	ReferenceSetId string `protobuf:"bytes,11,opt,name=reference_set_id,json=referenceSetId" json:"reference_set_id,omitempty"`
+	ReferenceSetId string `protobuf:"bytes,11,opt,name=reference_set_id,json=referenceSetId,proto3" json:"reference_set_id,omitempty"`
 	// A map of additional read group information. This must be of the form
 	// map<string, string[]> (string key mapping to a list of string values).
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,12,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info                 map[string]*_struct.ListValue `protobuf:"bytes,12,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *ReadGroup) Reset()         { *m = ReadGroup{} }
+func (m *ReadGroup) String() string { return proto.CompactTextString(m) }
+func (*ReadGroup) ProtoMessage()    {}
+func (*ReadGroup) Descriptor() ([]byte, []int) {
+	return fileDescriptor_readgroup_d1ee37f21a1efad6, []int{0}
+}
+func (m *ReadGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadGroup.Unmarshal(m, b)
+}
+func (m *ReadGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadGroup.Marshal(b, m, deterministic)
+}
+func (dst *ReadGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadGroup.Merge(dst, src)
+}
+func (m *ReadGroup) XXX_Size() int {
+	return xxx_messageInfo_ReadGroup.Size(m)
+}
+func (m *ReadGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadGroup.DiscardUnknown(m)
 }
 
-func (m *ReadGroup) Reset()                    { *m = ReadGroup{} }
-func (m *ReadGroup) String() string            { return proto.CompactTextString(m) }
-func (*ReadGroup) ProtoMessage()               {}
-func (*ReadGroup) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} }
+var xxx_messageInfo_ReadGroup proto.InternalMessageInfo
 
 func (m *ReadGroup) GetId() string {
 	if m != nil {
@@ -113,7 +141,7 @@ func (m *ReadGroup) GetReferenceSetId() string {
 	return ""
 }
 
-func (m *ReadGroup) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *ReadGroup) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -125,22 +153,44 @@ type ReadGroup_Experiment struct {
 	// fragments which have been prepared for sequencing from a sample. This
 	// field is important for quality control as error or bias can be introduced
 	// during sample preparation.
-	LibraryId string `protobuf:"bytes,1,opt,name=library_id,json=libraryId" json:"library_id,omitempty"`
+	LibraryId string `protobuf:"bytes,1,opt,name=library_id,json=libraryId,proto3" json:"library_id,omitempty"`
 	// The platform unit used as part of this experiment, for example
 	// flowcell-barcode.lane for Illumina or slide for SOLiD. Corresponds to the
 	// @RG PU field in the SAM spec.
-	PlatformUnit string `protobuf:"bytes,2,opt,name=platform_unit,json=platformUnit" json:"platform_unit,omitempty"`
+	PlatformUnit string `protobuf:"bytes,2,opt,name=platform_unit,json=platformUnit,proto3" json:"platform_unit,omitempty"`
 	// The sequencing center used as part of this experiment.
-	SequencingCenter string `protobuf:"bytes,3,opt,name=sequencing_center,json=sequencingCenter" json:"sequencing_center,omitempty"`
+	SequencingCenter string `protobuf:"bytes,3,opt,name=sequencing_center,json=sequencingCenter,proto3" json:"sequencing_center,omitempty"`
 	// The instrument model used as part of this experiment. This maps to
 	// sequencing technology in the SAM spec.
-	InstrumentModel string `protobuf:"bytes,4,opt,name=instrument_model,json=instrumentModel" json:"instrument_model,omitempty"`
+	InstrumentModel      string   `protobuf:"bytes,4,opt,name=instrument_model,json=instrumentModel,proto3" json:"instrument_model,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReadGroup_Experiment) Reset()         { *m = ReadGroup_Experiment{} }
+func (m *ReadGroup_Experiment) String() string { return proto.CompactTextString(m) }
+func (*ReadGroup_Experiment) ProtoMessage()    {}
+func (*ReadGroup_Experiment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_readgroup_d1ee37f21a1efad6, []int{0, 0}
+}
+func (m *ReadGroup_Experiment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadGroup_Experiment.Unmarshal(m, b)
+}
+func (m *ReadGroup_Experiment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadGroup_Experiment.Marshal(b, m, deterministic)
+}
+func (dst *ReadGroup_Experiment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadGroup_Experiment.Merge(dst, src)
+}
+func (m *ReadGroup_Experiment) XXX_Size() int {
+	return xxx_messageInfo_ReadGroup_Experiment.Size(m)
+}
+func (m *ReadGroup_Experiment) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadGroup_Experiment.DiscardUnknown(m)
 }
 
-func (m *ReadGroup_Experiment) Reset()                    { *m = ReadGroup_Experiment{} }
-func (m *ReadGroup_Experiment) String() string            { return proto.CompactTextString(m) }
-func (*ReadGroup_Experiment) ProtoMessage()               {}
-func (*ReadGroup_Experiment) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0, 0} }
+var xxx_messageInfo_ReadGroup_Experiment proto.InternalMessageInfo
 
 func (m *ReadGroup_Experiment) GetLibraryId() string {
 	if m != nil {
@@ -172,23 +222,45 @@ func (m *ReadGroup_Experiment) GetInstrumentModel() string {
 
 type ReadGroup_Program struct {
 	// The command line used to run this program.
-	CommandLine string `protobuf:"bytes,1,opt,name=command_line,json=commandLine" json:"command_line,omitempty"`
+	CommandLine string `protobuf:"bytes,1,opt,name=command_line,json=commandLine,proto3" json:"command_line,omitempty"`
 	// The user specified locally unique ID of the program. Used along with
 	// `prevProgramId` to define an ordering between programs.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// The display name of the program. This is typically the colloquial name of
 	// the tool used, for example 'bwa' or 'picard'.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// The ID of the program run before this one.
-	PrevProgramId string `protobuf:"bytes,4,opt,name=prev_program_id,json=prevProgramId" json:"prev_program_id,omitempty"`
+	PrevProgramId string `protobuf:"bytes,4,opt,name=prev_program_id,json=prevProgramId,proto3" json:"prev_program_id,omitempty"`
 	// The version of the program run.
-	Version string `protobuf:"bytes,5,opt,name=version" json:"version,omitempty"`
+	Version              string   `protobuf:"bytes,5,opt,name=version,proto3" json:"version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReadGroup_Program) Reset()         { *m = ReadGroup_Program{} }
+func (m *ReadGroup_Program) String() string { return proto.CompactTextString(m) }
+func (*ReadGroup_Program) ProtoMessage()    {}
+func (*ReadGroup_Program) Descriptor() ([]byte, []int) {
+	return fileDescriptor_readgroup_d1ee37f21a1efad6, []int{0, 1}
+}
+func (m *ReadGroup_Program) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadGroup_Program.Unmarshal(m, b)
+}
+func (m *ReadGroup_Program) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadGroup_Program.Marshal(b, m, deterministic)
+}
+func (dst *ReadGroup_Program) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadGroup_Program.Merge(dst, src)
+}
+func (m *ReadGroup_Program) XXX_Size() int {
+	return xxx_messageInfo_ReadGroup_Program.Size(m)
+}
+func (m *ReadGroup_Program) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadGroup_Program.DiscardUnknown(m)
 }
 
-func (m *ReadGroup_Program) Reset()                    { *m = ReadGroup_Program{} }
-func (m *ReadGroup_Program) String() string            { return proto.CompactTextString(m) }
-func (*ReadGroup_Program) ProtoMessage()               {}
-func (*ReadGroup_Program) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0, 1} }
+var xxx_messageInfo_ReadGroup_Program proto.InternalMessageInfo
 
 func (m *ReadGroup_Program) GetCommandLine() string {
 	if m != nil {
@@ -227,13 +299,16 @@ func (m *ReadGroup_Program) GetVersion() string {
 
 func init() {
 	proto.RegisterType((*ReadGroup)(nil), "google.genomics.v1.ReadGroup")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.ReadGroup.InfoEntry")
 	proto.RegisterType((*ReadGroup_Experiment)(nil), "google.genomics.v1.ReadGroup.Experiment")
 	proto.RegisterType((*ReadGroup_Program)(nil), "google.genomics.v1.ReadGroup.Program")
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/readgroup.proto", fileDescriptor7) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/readgroup.proto", fileDescriptor_readgroup_d1ee37f21a1efad6)
+}
 
-var fileDescriptor7 = []byte{
+var fileDescriptor_readgroup_d1ee37f21a1efad6 = []byte{
 	// 585 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xcb, 0x6e, 0xd4, 0x30,
 	0x14, 0x55, 0xa6, 0xcf, 0xb9, 0xd3, 0xc7, 0x60, 0x04, 0x8a, 0x06, 0x90, 0x86, 0x22, 0x60, 0x10,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/readgroupset.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/readgroupset.pb.go
index 9d623464..c2f47278 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/readgroupset.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/readgroupset.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/readgroupset.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/struct"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A read group set is a logical collection of read groups, which are
 // collections of reads produced by a sequencer. A read group set typically
 // models reads corresponding to one sample, sequenced one way, and aligned one
@@ -27,27 +33,49 @@ var _ = math.Inf
 // Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
 type ReadGroupSet struct {
 	// The server-generated read group set ID, unique for all read group sets.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The dataset to which this read group set belongs.
-	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	// The reference set to which the reads in this read group set are aligned.
-	ReferenceSetId string `protobuf:"bytes,3,opt,name=reference_set_id,json=referenceSetId" json:"reference_set_id,omitempty"`
+	ReferenceSetId string `protobuf:"bytes,3,opt,name=reference_set_id,json=referenceSetId,proto3" json:"reference_set_id,omitempty"`
 	// The read group set name. By default this will be initialized to the sample
 	// name of the sequenced data contained in this set.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	// The filename of the original source file for this read group set, if any.
-	Filename string `protobuf:"bytes,5,opt,name=filename" json:"filename,omitempty"`
+	Filename string `protobuf:"bytes,5,opt,name=filename,proto3" json:"filename,omitempty"`
 	// The read groups in this set. There are typically 1-10 read groups in a read
 	// group set.
-	ReadGroups []*ReadGroup `protobuf:"bytes,6,rep,name=read_groups,json=readGroups" json:"read_groups,omitempty"`
+	ReadGroups []*ReadGroup `protobuf:"bytes,6,rep,name=read_groups,json=readGroups,proto3" json:"read_groups,omitempty"`
 	// A map of additional read group set information.
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,7,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info                 map[string]*_struct.ListValue `protobuf:"bytes,7,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *ReadGroupSet) Reset()         { *m = ReadGroupSet{} }
+func (m *ReadGroupSet) String() string { return proto.CompactTextString(m) }
+func (*ReadGroupSet) ProtoMessage()    {}
+func (*ReadGroupSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_readgroupset_a1ee2d6c49daf62b, []int{0}
+}
+func (m *ReadGroupSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadGroupSet.Unmarshal(m, b)
+}
+func (m *ReadGroupSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadGroupSet.Marshal(b, m, deterministic)
+}
+func (dst *ReadGroupSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadGroupSet.Merge(dst, src)
+}
+func (m *ReadGroupSet) XXX_Size() int {
+	return xxx_messageInfo_ReadGroupSet.Size(m)
+}
+func (m *ReadGroupSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadGroupSet.DiscardUnknown(m)
 }
 
-func (m *ReadGroupSet) Reset()                    { *m = ReadGroupSet{} }
-func (m *ReadGroupSet) String() string            { return proto.CompactTextString(m) }
-func (*ReadGroupSet) ProtoMessage()               {}
-func (*ReadGroupSet) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{0} }
+var xxx_messageInfo_ReadGroupSet proto.InternalMessageInfo
 
 func (m *ReadGroupSet) GetId() string {
 	if m != nil {
@@ -91,7 +119,7 @@ func (m *ReadGroupSet) GetReadGroups() []*ReadGroup {
 	return nil
 }
 
-func (m *ReadGroupSet) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *ReadGroupSet) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -100,11 +128,14 @@ func (m *ReadGroupSet) GetInfo() map[string]*google_protobuf3.ListValue {
 
 func init() {
 	proto.RegisterType((*ReadGroupSet)(nil), "google.genomics.v1.ReadGroupSet")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.ReadGroupSet.InfoEntry")
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/readgroupset.proto", fileDescriptor8) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/readgroupset.proto", fileDescriptor_readgroupset_a1ee2d6c49daf62b)
+}
 
-var fileDescriptor8 = []byte{
+var fileDescriptor_readgroupset_a1ee2d6c49daf62b = []byte{
 	// 367 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x8b, 0xdb, 0x30,
 	0x10, 0xc5, 0xb1, 0xf3, 0xa7, 0xcd, 0xa4, 0x84, 0x54, 0x87, 0x62, 0x4c, 0x03, 0x21, 0x50, 0x08,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/reads.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/reads.pb.go
index 4023fd2d..eac2e202 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/reads.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/reads.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/reads.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type ImportReadGroupSetsRequest_PartitionStrategy int32
 
 const (
@@ -55,30 +61,52 @@ func (x ImportReadGroupSetsRequest_PartitionStrategy) String() string {
 	return proto.EnumName(ImportReadGroupSetsRequest_PartitionStrategy_name, int32(x))
 }
 func (ImportReadGroupSetsRequest_PartitionStrategy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor9, []int{2, 0}
+	return fileDescriptor_reads_afba1347c0c1059a, []int{2, 0}
 }
 
 // The read group set search request.
 type SearchReadGroupSetsRequest struct {
 	// Restricts this query to read group sets within the given datasets. At least
 	// one ID must be provided.
-	DatasetIds []string `protobuf:"bytes,1,rep,name=dataset_ids,json=datasetIds" json:"dataset_ids,omitempty"`
+	DatasetIds []string `protobuf:"bytes,1,rep,name=dataset_ids,json=datasetIds,proto3" json:"dataset_ids,omitempty"`
 	// Only return read group sets for which a substring of the name matches this
 	// string.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 256. The maximum value is 1024.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchReadGroupSetsRequest) Reset()                    { *m = SearchReadGroupSetsRequest{} }
-func (m *SearchReadGroupSetsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchReadGroupSetsRequest) ProtoMessage()               {}
-func (*SearchReadGroupSetsRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0} }
+func (m *SearchReadGroupSetsRequest) Reset()         { *m = SearchReadGroupSetsRequest{} }
+func (m *SearchReadGroupSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchReadGroupSetsRequest) ProtoMessage()    {}
+func (*SearchReadGroupSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{0}
+}
+func (m *SearchReadGroupSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchReadGroupSetsRequest.Unmarshal(m, b)
+}
+func (m *SearchReadGroupSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchReadGroupSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchReadGroupSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReadGroupSetsRequest.Merge(dst, src)
+}
+func (m *SearchReadGroupSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchReadGroupSetsRequest.Size(m)
+}
+func (m *SearchReadGroupSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchReadGroupSetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchReadGroupSetsRequest proto.InternalMessageInfo
 
 func (m *SearchReadGroupSetsRequest) GetDatasetIds() []string {
 	if m != nil {
@@ -111,17 +139,39 @@ func (m *SearchReadGroupSetsRequest) GetPageSize() int32 {
 // The read group set search response.
 type SearchReadGroupSetsResponse struct {
 	// The list of matching read group sets.
-	ReadGroupSets []*ReadGroupSet `protobuf:"bytes,1,rep,name=read_group_sets,json=readGroupSets" json:"read_group_sets,omitempty"`
+	ReadGroupSets []*ReadGroupSet `protobuf:"bytes,1,rep,name=read_group_sets,json=readGroupSets,proto3" json:"read_group_sets,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchReadGroupSetsResponse) Reset()                    { *m = SearchReadGroupSetsResponse{} }
-func (m *SearchReadGroupSetsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchReadGroupSetsResponse) ProtoMessage()               {}
-func (*SearchReadGroupSetsResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{1} }
+func (m *SearchReadGroupSetsResponse) Reset()         { *m = SearchReadGroupSetsResponse{} }
+func (m *SearchReadGroupSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchReadGroupSetsResponse) ProtoMessage()    {}
+func (*SearchReadGroupSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{1}
+}
+func (m *SearchReadGroupSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchReadGroupSetsResponse.Unmarshal(m, b)
+}
+func (m *SearchReadGroupSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchReadGroupSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchReadGroupSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReadGroupSetsResponse.Merge(dst, src)
+}
+func (m *SearchReadGroupSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchReadGroupSetsResponse.Size(m)
+}
+func (m *SearchReadGroupSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchReadGroupSetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchReadGroupSetsResponse proto.InternalMessageInfo
 
 func (m *SearchReadGroupSetsResponse) GetReadGroupSets() []*ReadGroupSet {
 	if m != nil {
@@ -141,12 +191,12 @@ func (m *SearchReadGroupSetsResponse) GetNextPageToken() string {
 type ImportReadGroupSetsRequest struct {
 	// Required. The ID of the dataset these read group sets will belong to. The
 	// caller must have WRITE permissions to this dataset.
-	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	// The reference set to which the imported read group sets are aligned to, if
 	// any. The reference names of this reference set must be a superset of those
 	// found in the imported file headers. If no reference set id is provided, a
 	// best effort is made to associate with a matching reference set.
-	ReferenceSetId string `protobuf:"bytes,4,opt,name=reference_set_id,json=referenceSetId" json:"reference_set_id,omitempty"`
+	ReferenceSetId string `protobuf:"bytes,4,opt,name=reference_set_id,json=referenceSetId,proto3" json:"reference_set_id,omitempty"`
 	// A list of URIs pointing at [BAM
 	// files](https://samtools.github.io/hts-specs/SAMv1.pdf)
 	// in Google Cloud Storage.
@@ -157,16 +207,38 @@ type ImportReadGroupSetsRequest struct {
 	// consistent: files added may be not be immediately visible to
 	// everyone. Thus, if using a wildcard it is preferable not to start
 	// the import immediately after the files are created.
-	SourceUris []string `protobuf:"bytes,2,rep,name=source_uris,json=sourceUris" json:"source_uris,omitempty"`
+	SourceUris []string `protobuf:"bytes,2,rep,name=source_uris,json=sourceUris,proto3" json:"source_uris,omitempty"`
 	// The partition strategy describes how read groups are partitioned into read
 	// group sets.
-	PartitionStrategy ImportReadGroupSetsRequest_PartitionStrategy `protobuf:"varint,5,opt,name=partition_strategy,json=partitionStrategy,enum=google.genomics.v1.ImportReadGroupSetsRequest_PartitionStrategy" json:"partition_strategy,omitempty"`
+	PartitionStrategy    ImportReadGroupSetsRequest_PartitionStrategy `protobuf:"varint,5,opt,name=partition_strategy,json=partitionStrategy,proto3,enum=google.genomics.v1.ImportReadGroupSetsRequest_PartitionStrategy" json:"partition_strategy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                     `json:"-"`
+	XXX_unrecognized     []byte                                       `json:"-"`
+	XXX_sizecache        int32                                        `json:"-"`
+}
+
+func (m *ImportReadGroupSetsRequest) Reset()         { *m = ImportReadGroupSetsRequest{} }
+func (m *ImportReadGroupSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportReadGroupSetsRequest) ProtoMessage()    {}
+func (*ImportReadGroupSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{2}
+}
+func (m *ImportReadGroupSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportReadGroupSetsRequest.Unmarshal(m, b)
+}
+func (m *ImportReadGroupSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportReadGroupSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportReadGroupSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportReadGroupSetsRequest.Merge(dst, src)
+}
+func (m *ImportReadGroupSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportReadGroupSetsRequest.Size(m)
+}
+func (m *ImportReadGroupSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportReadGroupSetsRequest.DiscardUnknown(m)
 }
 
-func (m *ImportReadGroupSetsRequest) Reset()                    { *m = ImportReadGroupSetsRequest{} }
-func (m *ImportReadGroupSetsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ImportReadGroupSetsRequest) ProtoMessage()               {}
-func (*ImportReadGroupSetsRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{2} }
+var xxx_messageInfo_ImportReadGroupSetsRequest proto.InternalMessageInfo
 
 func (m *ImportReadGroupSetsRequest) GetDatasetId() string {
 	if m != nil {
@@ -199,13 +271,35 @@ func (m *ImportReadGroupSetsRequest) GetPartitionStrategy() ImportReadGroupSetsR
 // The read group set import response.
 type ImportReadGroupSetsResponse struct {
 	// IDs of the read group sets that were created.
-	ReadGroupSetIds []string `protobuf:"bytes,1,rep,name=read_group_set_ids,json=readGroupSetIds" json:"read_group_set_ids,omitempty"`
+	ReadGroupSetIds      []string `protobuf:"bytes,1,rep,name=read_group_set_ids,json=readGroupSetIds,proto3" json:"read_group_set_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ImportReadGroupSetsResponse) Reset()                    { *m = ImportReadGroupSetsResponse{} }
-func (m *ImportReadGroupSetsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ImportReadGroupSetsResponse) ProtoMessage()               {}
-func (*ImportReadGroupSetsResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{3} }
+func (m *ImportReadGroupSetsResponse) Reset()         { *m = ImportReadGroupSetsResponse{} }
+func (m *ImportReadGroupSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*ImportReadGroupSetsResponse) ProtoMessage()    {}
+func (*ImportReadGroupSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{3}
+}
+func (m *ImportReadGroupSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportReadGroupSetsResponse.Unmarshal(m, b)
+}
+func (m *ImportReadGroupSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportReadGroupSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ImportReadGroupSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportReadGroupSetsResponse.Merge(dst, src)
+}
+func (m *ImportReadGroupSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_ImportReadGroupSetsResponse.Size(m)
+}
+func (m *ImportReadGroupSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportReadGroupSetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportReadGroupSetsResponse proto.InternalMessageInfo
 
 func (m *ImportReadGroupSetsResponse) GetReadGroupSetIds() []string {
 	if m != nil {
@@ -218,24 +312,46 @@ func (m *ImportReadGroupSetsResponse) GetReadGroupSetIds() []string {
 type ExportReadGroupSetRequest struct {
 	// Required. The Google Cloud project ID that owns this
 	// export. The caller must have WRITE access to this project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. A Google Cloud Storage URI for the exported BAM file.
 	// The currently authenticated user must have write access to the new file.
 	// An error will be returned if the URI already contains data.
-	ExportUri string `protobuf:"bytes,2,opt,name=export_uri,json=exportUri" json:"export_uri,omitempty"`
+	ExportUri string `protobuf:"bytes,2,opt,name=export_uri,json=exportUri,proto3" json:"export_uri,omitempty"`
 	// Required. The ID of the read group set to export. The caller must have
 	// READ access to this read group set.
-	ReadGroupSetId string `protobuf:"bytes,3,opt,name=read_group_set_id,json=readGroupSetId" json:"read_group_set_id,omitempty"`
+	ReadGroupSetId string `protobuf:"bytes,3,opt,name=read_group_set_id,json=readGroupSetId,proto3" json:"read_group_set_id,omitempty"`
 	// The reference names to export. If this is not specified, all reference
 	// sequences, including unmapped reads, are exported.
 	// Use `*` to export only unmapped reads.
-	ReferenceNames []string `protobuf:"bytes,4,rep,name=reference_names,json=referenceNames" json:"reference_names,omitempty"`
+	ReferenceNames       []string `protobuf:"bytes,4,rep,name=reference_names,json=referenceNames,proto3" json:"reference_names,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExportReadGroupSetRequest) Reset()         { *m = ExportReadGroupSetRequest{} }
+func (m *ExportReadGroupSetRequest) String() string { return proto.CompactTextString(m) }
+func (*ExportReadGroupSetRequest) ProtoMessage()    {}
+func (*ExportReadGroupSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{4}
+}
+func (m *ExportReadGroupSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportReadGroupSetRequest.Unmarshal(m, b)
+}
+func (m *ExportReadGroupSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportReadGroupSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExportReadGroupSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportReadGroupSetRequest.Merge(dst, src)
+}
+func (m *ExportReadGroupSetRequest) XXX_Size() int {
+	return xxx_messageInfo_ExportReadGroupSetRequest.Size(m)
+}
+func (m *ExportReadGroupSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportReadGroupSetRequest.DiscardUnknown(m)
 }
 
-func (m *ExportReadGroupSetRequest) Reset()                    { *m = ExportReadGroupSetRequest{} }
-func (m *ExportReadGroupSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*ExportReadGroupSetRequest) ProtoMessage()               {}
-func (*ExportReadGroupSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{4} }
+var xxx_messageInfo_ExportReadGroupSetRequest proto.InternalMessageInfo
 
 func (m *ExportReadGroupSetRequest) GetProjectId() string {
 	if m != nil {
@@ -268,10 +384,10 @@ func (m *ExportReadGroupSetRequest) GetReferenceNames() []string {
 type UpdateReadGroupSetRequest struct {
 	// The ID of the read group set to be updated. The caller must have WRITE
 	// permissions to the dataset associated with this read group set.
-	ReadGroupSetId string `protobuf:"bytes,1,opt,name=read_group_set_id,json=readGroupSetId" json:"read_group_set_id,omitempty"`
+	ReadGroupSetId string `protobuf:"bytes,1,opt,name=read_group_set_id,json=readGroupSetId,proto3" json:"read_group_set_id,omitempty"`
 	// The new read group set data. See `updateMask` for details on mutability of
 	// fields.
-	ReadGroupSet *ReadGroupSet `protobuf:"bytes,2,opt,name=read_group_set,json=readGroupSet" json:"read_group_set,omitempty"`
+	ReadGroupSet *ReadGroupSet `protobuf:"bytes,2,opt,name=read_group_set,json=readGroupSet,proto3" json:"read_group_set,omitempty"`
 	// An optional mask specifying which fields to update. Supported fields:
 	//
 	// * [name][google.genomics.v1.ReadGroupSet.name].
@@ -279,13 +395,35 @@ type UpdateReadGroupSetRequest struct {
 	//
 	// Leaving `updateMask` unset is equivalent to specifying all mutable
 	// fields.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateReadGroupSetRequest) Reset()         { *m = UpdateReadGroupSetRequest{} }
+func (m *UpdateReadGroupSetRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateReadGroupSetRequest) ProtoMessage()    {}
+func (*UpdateReadGroupSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{5}
+}
+func (m *UpdateReadGroupSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateReadGroupSetRequest.Unmarshal(m, b)
+}
+func (m *UpdateReadGroupSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateReadGroupSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateReadGroupSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateReadGroupSetRequest.Merge(dst, src)
+}
+func (m *UpdateReadGroupSetRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateReadGroupSetRequest.Size(m)
+}
+func (m *UpdateReadGroupSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateReadGroupSetRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateReadGroupSetRequest) Reset()                    { *m = UpdateReadGroupSetRequest{} }
-func (m *UpdateReadGroupSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateReadGroupSetRequest) ProtoMessage()               {}
-func (*UpdateReadGroupSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{5} }
+var xxx_messageInfo_UpdateReadGroupSetRequest proto.InternalMessageInfo
 
 func (m *UpdateReadGroupSetRequest) GetReadGroupSetId() string {
 	if m != nil {
@@ -301,7 +439,7 @@ func (m *UpdateReadGroupSetRequest) GetReadGroupSet() *ReadGroupSet {
 	return nil
 }
 
-func (m *UpdateReadGroupSetRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateReadGroupSetRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -311,13 +449,35 @@ func (m *UpdateReadGroupSetRequest) GetUpdateMask() *google_protobuf2.FieldMask
 type DeleteReadGroupSetRequest struct {
 	// The ID of the read group set to be deleted. The caller must have WRITE
 	// permissions to the dataset associated with this read group set.
-	ReadGroupSetId string `protobuf:"bytes,1,opt,name=read_group_set_id,json=readGroupSetId" json:"read_group_set_id,omitempty"`
+	ReadGroupSetId       string   `protobuf:"bytes,1,opt,name=read_group_set_id,json=readGroupSetId,proto3" json:"read_group_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteReadGroupSetRequest) Reset()         { *m = DeleteReadGroupSetRequest{} }
+func (m *DeleteReadGroupSetRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteReadGroupSetRequest) ProtoMessage()    {}
+func (*DeleteReadGroupSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{6}
+}
+func (m *DeleteReadGroupSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteReadGroupSetRequest.Unmarshal(m, b)
+}
+func (m *DeleteReadGroupSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteReadGroupSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteReadGroupSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteReadGroupSetRequest.Merge(dst, src)
+}
+func (m *DeleteReadGroupSetRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteReadGroupSetRequest.Size(m)
+}
+func (m *DeleteReadGroupSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteReadGroupSetRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteReadGroupSetRequest) Reset()                    { *m = DeleteReadGroupSetRequest{} }
-func (m *DeleteReadGroupSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteReadGroupSetRequest) ProtoMessage()               {}
-func (*DeleteReadGroupSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{6} }
+var xxx_messageInfo_DeleteReadGroupSetRequest proto.InternalMessageInfo
 
 func (m *DeleteReadGroupSetRequest) GetReadGroupSetId() string {
 	if m != nil {
@@ -328,13 +488,35 @@ func (m *DeleteReadGroupSetRequest) GetReadGroupSetId() string {
 
 type GetReadGroupSetRequest struct {
 	// The ID of the read group set.
-	ReadGroupSetId string `protobuf:"bytes,1,opt,name=read_group_set_id,json=readGroupSetId" json:"read_group_set_id,omitempty"`
+	ReadGroupSetId       string   `protobuf:"bytes,1,opt,name=read_group_set_id,json=readGroupSetId,proto3" json:"read_group_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetReadGroupSetRequest) Reset()                    { *m = GetReadGroupSetRequest{} }
-func (m *GetReadGroupSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetReadGroupSetRequest) ProtoMessage()               {}
-func (*GetReadGroupSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{7} }
+func (m *GetReadGroupSetRequest) Reset()         { *m = GetReadGroupSetRequest{} }
+func (m *GetReadGroupSetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetReadGroupSetRequest) ProtoMessage()    {}
+func (*GetReadGroupSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{7}
+}
+func (m *GetReadGroupSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetReadGroupSetRequest.Unmarshal(m, b)
+}
+func (m *GetReadGroupSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetReadGroupSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetReadGroupSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReadGroupSetRequest.Merge(dst, src)
+}
+func (m *GetReadGroupSetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetReadGroupSetRequest.Size(m)
+}
+func (m *GetReadGroupSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetReadGroupSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetReadGroupSetRequest proto.InternalMessageInfo
 
 func (m *GetReadGroupSetRequest) GetReadGroupSetId() string {
 	if m != nil {
@@ -345,17 +527,17 @@ func (m *GetReadGroupSetRequest) GetReadGroupSetId() string {
 
 type ListCoverageBucketsRequest struct {
 	// Required. The ID of the read group set over which coverage is requested.
-	ReadGroupSetId string `protobuf:"bytes,1,opt,name=read_group_set_id,json=readGroupSetId" json:"read_group_set_id,omitempty"`
+	ReadGroupSetId string `protobuf:"bytes,1,opt,name=read_group_set_id,json=readGroupSetId,proto3" json:"read_group_set_id,omitempty"`
 	// The name of the reference to query, within the reference set associated
 	// with this query. Optional.
-	ReferenceName string `protobuf:"bytes,3,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,3,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The start position of the range on the reference, 0-based inclusive. If
 	// specified, `referenceName` must also be specified. Defaults to 0.
-	Start int64 `protobuf:"varint,4,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,4,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position of the range on the reference, 0-based exclusive. If
 	// specified, `referenceName` must also be specified. If unset or 0, defaults
 	// to the length of the reference.
-	End int64 `protobuf:"varint,5,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,5,opt,name=end,proto3" json:"end,omitempty"`
 	// The desired width of each reported coverage bucket in base pairs. This
 	// will be rounded down to the nearest precomputed bucket width; the value
 	// of which is returned as `bucketWidth` in the response. Defaults
@@ -363,20 +545,42 @@ type ListCoverageBucketsRequest struct {
 	// of the target range, if specified. The smallest precomputed
 	// `bucketWidth` is currently 2048 base pairs; this is subject to
 	// change.
-	TargetBucketWidth int64 `protobuf:"varint,6,opt,name=target_bucket_width,json=targetBucketWidth" json:"target_bucket_width,omitempty"`
+	TargetBucketWidth int64 `protobuf:"varint,6,opt,name=target_bucket_width,json=targetBucketWidth,proto3" json:"target_bucket_width,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,7,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,7,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 1024. The maximum value is 2048.
-	PageSize int32 `protobuf:"varint,8,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,8,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCoverageBucketsRequest) Reset()         { *m = ListCoverageBucketsRequest{} }
+func (m *ListCoverageBucketsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListCoverageBucketsRequest) ProtoMessage()    {}
+func (*ListCoverageBucketsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{8}
+}
+func (m *ListCoverageBucketsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCoverageBucketsRequest.Unmarshal(m, b)
+}
+func (m *ListCoverageBucketsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCoverageBucketsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListCoverageBucketsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCoverageBucketsRequest.Merge(dst, src)
+}
+func (m *ListCoverageBucketsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListCoverageBucketsRequest.Size(m)
+}
+func (m *ListCoverageBucketsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCoverageBucketsRequest.DiscardUnknown(m)
 }
 
-func (m *ListCoverageBucketsRequest) Reset()                    { *m = ListCoverageBucketsRequest{} }
-func (m *ListCoverageBucketsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListCoverageBucketsRequest) ProtoMessage()               {}
-func (*ListCoverageBucketsRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{8} }
+var xxx_messageInfo_ListCoverageBucketsRequest proto.InternalMessageInfo
 
 func (m *ListCoverageBucketsRequest) GetReadGroupSetId() string {
 	if m != nil {
@@ -431,16 +635,38 @@ func (m *ListCoverageBucketsRequest) GetPageSize() int32 {
 // to a specific range of the reference sequence.
 type CoverageBucket struct {
 	// The genomic coordinate range spanned by this bucket.
-	Range *Range `protobuf:"bytes,1,opt,name=range" json:"range,omitempty"`
+	Range *Range `protobuf:"bytes,1,opt,name=range,proto3" json:"range,omitempty"`
 	// The average number of reads which are aligned to each individual
 	// reference base in this bucket.
-	MeanCoverage float32 `protobuf:"fixed32,2,opt,name=mean_coverage,json=meanCoverage" json:"mean_coverage,omitempty"`
+	MeanCoverage         float32  `protobuf:"fixed32,2,opt,name=mean_coverage,json=meanCoverage,proto3" json:"mean_coverage,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CoverageBucket) Reset()         { *m = CoverageBucket{} }
+func (m *CoverageBucket) String() string { return proto.CompactTextString(m) }
+func (*CoverageBucket) ProtoMessage()    {}
+func (*CoverageBucket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{9}
+}
+func (m *CoverageBucket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CoverageBucket.Unmarshal(m, b)
+}
+func (m *CoverageBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CoverageBucket.Marshal(b, m, deterministic)
+}
+func (dst *CoverageBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CoverageBucket.Merge(dst, src)
+}
+func (m *CoverageBucket) XXX_Size() int {
+	return xxx_messageInfo_CoverageBucket.Size(m)
+}
+func (m *CoverageBucket) XXX_DiscardUnknown() {
+	xxx_messageInfo_CoverageBucket.DiscardUnknown(m)
 }
 
-func (m *CoverageBucket) Reset()                    { *m = CoverageBucket{} }
-func (m *CoverageBucket) String() string            { return proto.CompactTextString(m) }
-func (*CoverageBucket) ProtoMessage()               {}
-func (*CoverageBucket) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{9} }
+var xxx_messageInfo_CoverageBucket proto.InternalMessageInfo
 
 func (m *CoverageBucket) GetRange() *Range {
 	if m != nil {
@@ -461,22 +687,44 @@ type ListCoverageBucketsResponse struct {
 	// end of a reference sequence may be shorter. This value is omitted if the
 	// bucket width is infinity (the default behaviour, with no range or
 	// `targetBucketWidth`).
-	BucketWidth int64 `protobuf:"varint,1,opt,name=bucket_width,json=bucketWidth" json:"bucket_width,omitempty"`
+	BucketWidth int64 `protobuf:"varint,1,opt,name=bucket_width,json=bucketWidth,proto3" json:"bucket_width,omitempty"`
 	// The coverage buckets. The list of buckets is sparse; a bucket with 0
 	// overlapping reads is not returned. A bucket never crosses more than one
 	// reference sequence. Each bucket has width `bucketWidth`, unless
 	// its end is the end of the reference sequence.
-	CoverageBuckets []*CoverageBucket `protobuf:"bytes,2,rep,name=coverage_buckets,json=coverageBuckets" json:"coverage_buckets,omitempty"`
+	CoverageBuckets []*CoverageBucket `protobuf:"bytes,2,rep,name=coverage_buckets,json=coverageBuckets,proto3" json:"coverage_buckets,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListCoverageBucketsResponse) Reset()         { *m = ListCoverageBucketsResponse{} }
+func (m *ListCoverageBucketsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListCoverageBucketsResponse) ProtoMessage()    {}
+func (*ListCoverageBucketsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{10}
+}
+func (m *ListCoverageBucketsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListCoverageBucketsResponse.Unmarshal(m, b)
+}
+func (m *ListCoverageBucketsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListCoverageBucketsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListCoverageBucketsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListCoverageBucketsResponse.Merge(dst, src)
+}
+func (m *ListCoverageBucketsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListCoverageBucketsResponse.Size(m)
+}
+func (m *ListCoverageBucketsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListCoverageBucketsResponse.DiscardUnknown(m)
 }
 
-func (m *ListCoverageBucketsResponse) Reset()                    { *m = ListCoverageBucketsResponse{} }
-func (m *ListCoverageBucketsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListCoverageBucketsResponse) ProtoMessage()               {}
-func (*ListCoverageBucketsResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{10} }
+var xxx_messageInfo_ListCoverageBucketsResponse proto.InternalMessageInfo
 
 func (m *ListCoverageBucketsResponse) GetBucketWidth() int64 {
 	if m != nil {
@@ -505,34 +753,56 @@ type SearchReadsRequest struct {
 	// specified read group sets must be aligned against a common set of reference
 	// sequences; this defines the genomic coordinates for the query. Must specify
 	// one of `readGroupSetIds` or `readGroupIds`.
-	ReadGroupSetIds []string `protobuf:"bytes,1,rep,name=read_group_set_ids,json=readGroupSetIds" json:"read_group_set_ids,omitempty"`
+	ReadGroupSetIds []string `protobuf:"bytes,1,rep,name=read_group_set_ids,json=readGroupSetIds,proto3" json:"read_group_set_ids,omitempty"`
 	// The IDs of the read groups within which to search for reads. All specified
 	// read groups must belong to the same read group sets. Must specify one of
 	// `readGroupSetIds` or `readGroupIds`.
-	ReadGroupIds []string `protobuf:"bytes,5,rep,name=read_group_ids,json=readGroupIds" json:"read_group_ids,omitempty"`
+	ReadGroupIds []string `protobuf:"bytes,5,rep,name=read_group_ids,json=readGroupIds,proto3" json:"read_group_ids,omitempty"`
 	// The reference sequence name, for example `chr1`, `1`, or `chrX`. If set to
 	// `*`, only unmapped reads are returned. If unspecified, all reads (mapped
 	// and unmapped) are returned.
-	ReferenceName string `protobuf:"bytes,7,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,7,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The start position of the range on the reference, 0-based inclusive. If
 	// specified, `referenceName` must also be specified.
-	Start int64 `protobuf:"varint,8,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,8,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position of the range on the reference, 0-based exclusive. If
 	// specified, `referenceName` must also be specified.
-	End int64 `protobuf:"varint,9,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,9,opt,name=end,proto3" json:"end,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 256. The maximum value is 2048.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchReadsRequest) Reset()         { *m = SearchReadsRequest{} }
+func (m *SearchReadsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchReadsRequest) ProtoMessage()    {}
+func (*SearchReadsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{11}
+}
+func (m *SearchReadsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchReadsRequest.Unmarshal(m, b)
+}
+func (m *SearchReadsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchReadsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchReadsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReadsRequest.Merge(dst, src)
+}
+func (m *SearchReadsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchReadsRequest.Size(m)
+}
+func (m *SearchReadsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchReadsRequest.DiscardUnknown(m)
 }
 
-func (m *SearchReadsRequest) Reset()                    { *m = SearchReadsRequest{} }
-func (m *SearchReadsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchReadsRequest) ProtoMessage()               {}
-func (*SearchReadsRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{11} }
+var xxx_messageInfo_SearchReadsRequest proto.InternalMessageInfo
 
 func (m *SearchReadsRequest) GetReadGroupSetIds() []string {
 	if m != nil {
@@ -589,17 +859,39 @@ type SearchReadsResponse struct {
 	// if any, ascending in position within the same reference. Unmapped reads,
 	// which have no position, are returned contiguously and are sorted in
 	// ascending lexicographic order by fragment name.
-	Alignments []*Read `protobuf:"bytes,1,rep,name=alignments" json:"alignments,omitempty"`
+	Alignments []*Read `protobuf:"bytes,1,rep,name=alignments,proto3" json:"alignments,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchReadsResponse) Reset()         { *m = SearchReadsResponse{} }
+func (m *SearchReadsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchReadsResponse) ProtoMessage()    {}
+func (*SearchReadsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{12}
+}
+func (m *SearchReadsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchReadsResponse.Unmarshal(m, b)
+}
+func (m *SearchReadsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchReadsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchReadsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReadsResponse.Merge(dst, src)
+}
+func (m *SearchReadsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchReadsResponse.Size(m)
+}
+func (m *SearchReadsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchReadsResponse.DiscardUnknown(m)
 }
 
-func (m *SearchReadsResponse) Reset()                    { *m = SearchReadsResponse{} }
-func (m *SearchReadsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchReadsResponse) ProtoMessage()               {}
-func (*SearchReadsResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{12} }
+var xxx_messageInfo_SearchReadsResponse proto.InternalMessageInfo
 
 func (m *SearchReadsResponse) GetAlignments() []*Read {
 	if m != nil {
@@ -620,19 +912,19 @@ type StreamReadsRequest struct {
 	// The Google Cloud project ID which will be billed
 	// for this access. The caller must have WRITE access to this project.
 	// Required.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The ID of the read group set from which to stream reads.
-	ReadGroupSetId string `protobuf:"bytes,2,opt,name=read_group_set_id,json=readGroupSetId" json:"read_group_set_id,omitempty"`
+	ReadGroupSetId string `protobuf:"bytes,2,opt,name=read_group_set_id,json=readGroupSetId,proto3" json:"read_group_set_id,omitempty"`
 	// The reference sequence name, for example `chr1`,
 	// `1`, or `chrX`. If set to *, only unmapped reads are
 	// returned.
-	ReferenceName string `protobuf:"bytes,3,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,3,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The start position of the range on the reference, 0-based inclusive. If
 	// specified, `referenceName` must also be specified.
-	Start int64 `protobuf:"varint,4,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,4,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position of the range on the reference, 0-based exclusive. If
 	// specified, `referenceName` must also be specified.
-	End int64 `protobuf:"varint,5,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,5,opt,name=end,proto3" json:"end,omitempty"`
 	// Restricts results to a shard containing approximately `1/totalShards`
 	// of the normal response payload for this query. Results from a sharded
 	// request are disjoint from those returned by all queries which differ only
@@ -640,7 +932,7 @@ type StreamReadsRequest struct {
 	// likely for large values of `totalShards`.
 	//
 	// Valid values are `[0, totalShards)`.
-	Shard int32 `protobuf:"varint,6,opt,name=shard" json:"shard,omitempty"`
+	Shard int32 `protobuf:"varint,6,opt,name=shard,proto3" json:"shard,omitempty"`
 	// Specifying `totalShards` causes a disjoint subset of the normal response
 	// payload to be returned for each query with a unique `shard` parameter
 	// specified. A best effort is made to yield equally sized shards. Sharding
@@ -653,13 +945,35 @@ type StreamReadsRequest struct {
 	// share shard boundaries. For example, streaming `shard` 2 of 5
 	// `totalShards` yields the same results as streaming `shard`s 4 and 5 of 10
 	// `totalShards`. This property can be leveraged for adaptive retries.
-	TotalShards int32 `protobuf:"varint,7,opt,name=total_shards,json=totalShards" json:"total_shards,omitempty"`
+	TotalShards          int32    `protobuf:"varint,7,opt,name=total_shards,json=totalShards,proto3" json:"total_shards,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamReadsRequest) Reset()         { *m = StreamReadsRequest{} }
+func (m *StreamReadsRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamReadsRequest) ProtoMessage()    {}
+func (*StreamReadsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{13}
+}
+func (m *StreamReadsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamReadsRequest.Unmarshal(m, b)
+}
+func (m *StreamReadsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamReadsRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamReadsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamReadsRequest.Merge(dst, src)
+}
+func (m *StreamReadsRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamReadsRequest.Size(m)
+}
+func (m *StreamReadsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamReadsRequest.DiscardUnknown(m)
 }
 
-func (m *StreamReadsRequest) Reset()                    { *m = StreamReadsRequest{} }
-func (m *StreamReadsRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamReadsRequest) ProtoMessage()               {}
-func (*StreamReadsRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{13} }
+var xxx_messageInfo_StreamReadsRequest proto.InternalMessageInfo
 
 func (m *StreamReadsRequest) GetProjectId() string {
 	if m != nil {
@@ -711,13 +1025,35 @@ func (m *StreamReadsRequest) GetTotalShards() int32 {
 }
 
 type StreamReadsResponse struct {
-	Alignments []*Read `protobuf:"bytes,1,rep,name=alignments" json:"alignments,omitempty"`
+	Alignments           []*Read  `protobuf:"bytes,1,rep,name=alignments,proto3" json:"alignments,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamReadsResponse) Reset()         { *m = StreamReadsResponse{} }
+func (m *StreamReadsResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamReadsResponse) ProtoMessage()    {}
+func (*StreamReadsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reads_afba1347c0c1059a, []int{14}
+}
+func (m *StreamReadsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamReadsResponse.Unmarshal(m, b)
+}
+func (m *StreamReadsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamReadsResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamReadsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamReadsResponse.Merge(dst, src)
+}
+func (m *StreamReadsResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamReadsResponse.Size(m)
+}
+func (m *StreamReadsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamReadsResponse.DiscardUnknown(m)
 }
 
-func (m *StreamReadsResponse) Reset()                    { *m = StreamReadsResponse{} }
-func (m *StreamReadsResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamReadsResponse) ProtoMessage()               {}
-func (*StreamReadsResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{14} }
+var xxx_messageInfo_StreamReadsResponse proto.InternalMessageInfo
 
 func (m *StreamReadsResponse) GetAlignments() []*Read {
 	if m != nil {
@@ -753,8 +1089,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for StreamingReadService service
-
+// StreamingReadServiceClient is the client API for StreamingReadService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type StreamingReadServiceClient interface {
 	// Returns a stream of all the reads matching the search request, ordered
 	// by reference name, position, and ID.
@@ -770,7 +1107,7 @@ func NewStreamingReadServiceClient(cc *grpc.ClientConn) StreamingReadServiceClie
 }
 
 func (c *streamingReadServiceClient) StreamReads(ctx context.Context, in *StreamReadsRequest, opts ...grpc.CallOption) (StreamingReadService_StreamReadsClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_StreamingReadService_serviceDesc.Streams[0], c.cc, "/google.genomics.v1.StreamingReadService/StreamReads", opts...)
+	stream, err := c.cc.NewStream(ctx, &_StreamingReadService_serviceDesc.Streams[0], "/google.genomics.v1.StreamingReadService/StreamReads", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -801,8 +1138,7 @@ func (x *streamingReadServiceStreamReadsClient) Recv() (*StreamReadsResponse, er
 	return m, nil
 }
 
-// Server API for StreamingReadService service
-
+// StreamingReadServiceServer is the server API for StreamingReadService service.
 type StreamingReadServiceServer interface {
 	// Returns a stream of all the reads matching the search request, ordered
 	// by reference name, position, and ID.
@@ -848,8 +1184,9 @@ var _StreamingReadService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/genomics/v1/reads.proto",
 }
 
-// Client API for ReadServiceV1 service
-
+// ReadServiceV1Client is the client API for ReadServiceV1 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ReadServiceV1Client interface {
 	// Creates read group sets by asynchronously importing the provided
 	// information.
@@ -869,7 +1206,7 @@ type ReadServiceV1Client interface {
 	// their qualities (also the "BQ" and "OQ" tags, if any) will be reversed
 	// - Unmapped reads will be stripped of positional information (reference name
 	// and position)
-	ImportReadGroupSets(ctx context.Context, in *ImportReadGroupSetsRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	ImportReadGroupSets(ctx context.Context, in *ImportReadGroupSetsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Exports a read group set to a BAM file in Google Cloud Storage.
 	//
 	// For the definitions of read group sets and other genomics resources, see
@@ -880,7 +1217,7 @@ type ReadServiceV1Client interface {
 	// files and the original BAM file at the time of import. See
 	// [ImportReadGroupSets][google.genomics.v1.ReadServiceV1.ImportReadGroupSets]
 	// for caveats.
-	ExportReadGroupSet(ctx context.Context, in *ExportReadGroupSetRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	ExportReadGroupSet(ctx context.Context, in *ExportReadGroupSetRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Searches for read group sets matching the criteria.
 	//
 	// For the definitions of read group sets and other genomics resources, see
@@ -903,7 +1240,7 @@ type ReadServiceV1Client interface {
 	// For the definitions of read group sets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteReadGroupSet(ctx context.Context, in *DeleteReadGroupSetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteReadGroupSet(ctx context.Context, in *DeleteReadGroupSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Gets a read group set by ID.
 	//
 	// For the definitions of read group sets and other genomics resources, see
@@ -959,18 +1296,18 @@ func NewReadServiceV1Client(cc *grpc.ClientConn) ReadServiceV1Client {
 	return &readServiceV1Client{cc}
 }
 
-func (c *readServiceV1Client) ImportReadGroupSets(ctx context.Context, in *ImportReadGroupSetsRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/ImportReadGroupSets", in, out, c.cc, opts...)
+func (c *readServiceV1Client) ImportReadGroupSets(ctx context.Context, in *ImportReadGroupSetsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/ImportReadGroupSets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *readServiceV1Client) ExportReadGroupSet(ctx context.Context, in *ExportReadGroupSetRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/ExportReadGroupSet", in, out, c.cc, opts...)
+func (c *readServiceV1Client) ExportReadGroupSet(ctx context.Context, in *ExportReadGroupSetRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/ExportReadGroupSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -979,7 +1316,7 @@ func (c *readServiceV1Client) ExportReadGroupSet(ctx context.Context, in *Export
 
 func (c *readServiceV1Client) SearchReadGroupSets(ctx context.Context, in *SearchReadGroupSetsRequest, opts ...grpc.CallOption) (*SearchReadGroupSetsResponse, error) {
 	out := new(SearchReadGroupSetsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/SearchReadGroupSets", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/SearchReadGroupSets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -988,16 +1325,16 @@ func (c *readServiceV1Client) SearchReadGroupSets(ctx context.Context, in *Searc
 
 func (c *readServiceV1Client) UpdateReadGroupSet(ctx context.Context, in *UpdateReadGroupSetRequest, opts ...grpc.CallOption) (*ReadGroupSet, error) {
 	out := new(ReadGroupSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/UpdateReadGroupSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/UpdateReadGroupSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *readServiceV1Client) DeleteReadGroupSet(ctx context.Context, in *DeleteReadGroupSetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/DeleteReadGroupSet", in, out, c.cc, opts...)
+func (c *readServiceV1Client) DeleteReadGroupSet(ctx context.Context, in *DeleteReadGroupSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/DeleteReadGroupSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1006,7 +1343,7 @@ func (c *readServiceV1Client) DeleteReadGroupSet(ctx context.Context, in *Delete
 
 func (c *readServiceV1Client) GetReadGroupSet(ctx context.Context, in *GetReadGroupSetRequest, opts ...grpc.CallOption) (*ReadGroupSet, error) {
 	out := new(ReadGroupSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/GetReadGroupSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/GetReadGroupSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1015,7 +1352,7 @@ func (c *readServiceV1Client) GetReadGroupSet(ctx context.Context, in *GetReadGr
 
 func (c *readServiceV1Client) ListCoverageBuckets(ctx context.Context, in *ListCoverageBucketsRequest, opts ...grpc.CallOption) (*ListCoverageBucketsResponse, error) {
 	out := new(ListCoverageBucketsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/ListCoverageBuckets", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/ListCoverageBuckets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1024,15 +1361,14 @@ func (c *readServiceV1Client) ListCoverageBuckets(ctx context.Context, in *ListC
 
 func (c *readServiceV1Client) SearchReads(ctx context.Context, in *SearchReadsRequest, opts ...grpc.CallOption) (*SearchReadsResponse, error) {
 	out := new(SearchReadsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/SearchReads", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReadServiceV1/SearchReads", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ReadServiceV1 service
-
+// ReadServiceV1Server is the server API for ReadServiceV1 service.
 type ReadServiceV1Server interface {
 	// Creates read group sets by asynchronously importing the provided
 	// information.
@@ -1052,7 +1388,7 @@ type ReadServiceV1Server interface {
 	// their qualities (also the "BQ" and "OQ" tags, if any) will be reversed
 	// - Unmapped reads will be stripped of positional information (reference name
 	// and position)
-	ImportReadGroupSets(context.Context, *ImportReadGroupSetsRequest) (*google_longrunning.Operation, error)
+	ImportReadGroupSets(context.Context, *ImportReadGroupSetsRequest) (*longrunning.Operation, error)
 	// Exports a read group set to a BAM file in Google Cloud Storage.
 	//
 	// For the definitions of read group sets and other genomics resources, see
@@ -1063,7 +1399,7 @@ type ReadServiceV1Server interface {
 	// files and the original BAM file at the time of import. See
 	// [ImportReadGroupSets][google.genomics.v1.ReadServiceV1.ImportReadGroupSets]
 	// for caveats.
-	ExportReadGroupSet(context.Context, *ExportReadGroupSetRequest) (*google_longrunning.Operation, error)
+	ExportReadGroupSet(context.Context, *ExportReadGroupSetRequest) (*longrunning.Operation, error)
 	// Searches for read group sets matching the criteria.
 	//
 	// For the definitions of read group sets and other genomics resources, see
@@ -1086,7 +1422,7 @@ type ReadServiceV1Server interface {
 	// For the definitions of read group sets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteReadGroupSet(context.Context, *DeleteReadGroupSetRequest) (*google_protobuf1.Empty, error)
+	DeleteReadGroupSet(context.Context, *DeleteReadGroupSetRequest) (*empty.Empty, error)
 	// Gets a read group set by ID.
 	//
 	// For the definitions of read group sets and other genomics resources, see
@@ -1323,9 +1659,11 @@ var _ReadServiceV1_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/genomics/v1/reads.proto",
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/reads.proto", fileDescriptor9) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/reads.proto", fileDescriptor_reads_afba1347c0c1059a)
+}
 
-var fileDescriptor9 = []byte{
+var fileDescriptor_reads_afba1347c0c1059a = []byte{
 	// 1333 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0x1b, 0xc5,
 	0x17, 0xff, 0x8e, 0x1d, 0xb7, 0xcd, 0x73, 0x93, 0x38, 0xe3, 0x7e, 0x8b, 0xe3, 0x90, 0x36, 0x6c,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/references.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/references.pb.go
index ef5e0e38..0a8ee62a 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/references.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/references.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/references.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -18,6 +18,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A reference is a canonical assembled DNA sequence, intended to act as a
 // reference coordinate space for other genomic annotations. A single reference
 // might represent the human chromosome 1 or mitochandrial DNA, for instance. A
@@ -27,29 +33,51 @@ var _ = math.Inf
 // Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
 type Reference struct {
 	// The server-generated reference ID, unique across all references.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The length of this reference's sequence.
-	Length int64 `protobuf:"varint,2,opt,name=length" json:"length,omitempty"`
+	Length int64 `protobuf:"varint,2,opt,name=length,proto3" json:"length,omitempty"`
 	// MD5 of the upper-case sequence excluding all whitespace characters (this
 	// is equivalent to SQ:M5 in SAM). This value is represented in lower case
 	// hexadecimal format.
-	Md5Checksum string `protobuf:"bytes,3,opt,name=md5checksum" json:"md5checksum,omitempty"`
+	Md5Checksum string `protobuf:"bytes,3,opt,name=md5checksum,proto3" json:"md5checksum,omitempty"`
 	// The name of this reference, for example `22`.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	// The URI from which the sequence was obtained. Typically specifies a FASTA
 	// format file.
-	SourceUri string `protobuf:"bytes,5,opt,name=source_uri,json=sourceUri" json:"source_uri,omitempty"`
+	SourceUri string `protobuf:"bytes,5,opt,name=source_uri,json=sourceUri,proto3" json:"source_uri,omitempty"`
 	// All known corresponding accession IDs in INSDC (GenBank/ENA/DDBJ) ideally
 	// with a version number, for example `GCF_000001405.26`.
-	SourceAccessions []string `protobuf:"bytes,6,rep,name=source_accessions,json=sourceAccessions" json:"source_accessions,omitempty"`
+	SourceAccessions []string `protobuf:"bytes,6,rep,name=source_accessions,json=sourceAccessions,proto3" json:"source_accessions,omitempty"`
 	// ID from http://www.ncbi.nlm.nih.gov/taxonomy. For example, 9606 for human.
-	NcbiTaxonId int32 `protobuf:"varint,7,opt,name=ncbi_taxon_id,json=ncbiTaxonId" json:"ncbi_taxon_id,omitempty"`
+	NcbiTaxonId          int32    `protobuf:"varint,7,opt,name=ncbi_taxon_id,json=ncbiTaxonId,proto3" json:"ncbi_taxon_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Reference) Reset()         { *m = Reference{} }
+func (m *Reference) String() string { return proto.CompactTextString(m) }
+func (*Reference) ProtoMessage()    {}
+func (*Reference) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{0}
+}
+func (m *Reference) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Reference.Unmarshal(m, b)
+}
+func (m *Reference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Reference.Marshal(b, m, deterministic)
+}
+func (dst *Reference) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Reference.Merge(dst, src)
+}
+func (m *Reference) XXX_Size() int {
+	return xxx_messageInfo_Reference.Size(m)
+}
+func (m *Reference) XXX_DiscardUnknown() {
+	xxx_messageInfo_Reference.DiscardUnknown(m)
 }
 
-func (m *Reference) Reset()                    { *m = Reference{} }
-func (m *Reference) String() string            { return proto.CompactTextString(m) }
-func (*Reference) ProtoMessage()               {}
-func (*Reference) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{0} }
+var xxx_messageInfo_Reference proto.InternalMessageInfo
 
 func (m *Reference) GetId() string {
 	if m != nil {
@@ -110,37 +138,59 @@ func (m *Reference) GetNcbiTaxonId() int32 {
 // Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
 type ReferenceSet struct {
 	// The server-generated reference set ID, unique across all reference sets.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The IDs of the reference objects that are part of this set.
 	// `Reference.md5checksum` must be unique within this set.
-	ReferenceIds []string `protobuf:"bytes,2,rep,name=reference_ids,json=referenceIds" json:"reference_ids,omitempty"`
+	ReferenceIds []string `protobuf:"bytes,2,rep,name=reference_ids,json=referenceIds,proto3" json:"reference_ids,omitempty"`
 	// Order-independent MD5 checksum which identifies this reference set. The
 	// checksum is computed by sorting all lower case hexidecimal string
 	// `reference.md5checksum` (for all reference in this set) in
 	// ascending lexicographic order, concatenating, and taking the MD5 of that
 	// value. The resulting value is represented in lower case hexadecimal format.
-	Md5Checksum string `protobuf:"bytes,3,opt,name=md5checksum" json:"md5checksum,omitempty"`
+	Md5Checksum string `protobuf:"bytes,3,opt,name=md5checksum,proto3" json:"md5checksum,omitempty"`
 	// ID from http://www.ncbi.nlm.nih.gov/taxonomy (for example, 9606 for human)
 	// indicating the species which this reference set is intended to model. Note
 	// that contained references may specify a different `ncbiTaxonId`, as
 	// assemblies may contain reference sequences which do not belong to the
 	// modeled species, for example EBV in a human reference genome.
-	NcbiTaxonId int32 `protobuf:"varint,4,opt,name=ncbi_taxon_id,json=ncbiTaxonId" json:"ncbi_taxon_id,omitempty"`
+	NcbiTaxonId int32 `protobuf:"varint,4,opt,name=ncbi_taxon_id,json=ncbiTaxonId,proto3" json:"ncbi_taxon_id,omitempty"`
 	// Free text description of this reference set.
-	Description string `protobuf:"bytes,5,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Public id of this reference set, such as `GRCh37`.
-	AssemblyId string `protobuf:"bytes,6,opt,name=assembly_id,json=assemblyId" json:"assembly_id,omitempty"`
+	AssemblyId string `protobuf:"bytes,6,opt,name=assembly_id,json=assemblyId,proto3" json:"assembly_id,omitempty"`
 	// The URI from which the references were obtained.
-	SourceUri string `protobuf:"bytes,7,opt,name=source_uri,json=sourceUri" json:"source_uri,omitempty"`
+	SourceUri string `protobuf:"bytes,7,opt,name=source_uri,json=sourceUri,proto3" json:"source_uri,omitempty"`
 	// All known corresponding accession IDs in INSDC (GenBank/ENA/DDBJ) ideally
 	// with a version number, for example `NC_000001.11`.
-	SourceAccessions []string `protobuf:"bytes,8,rep,name=source_accessions,json=sourceAccessions" json:"source_accessions,omitempty"`
+	SourceAccessions     []string `protobuf:"bytes,8,rep,name=source_accessions,json=sourceAccessions,proto3" json:"source_accessions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReferenceSet) Reset()         { *m = ReferenceSet{} }
+func (m *ReferenceSet) String() string { return proto.CompactTextString(m) }
+func (*ReferenceSet) ProtoMessage()    {}
+func (*ReferenceSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{1}
+}
+func (m *ReferenceSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReferenceSet.Unmarshal(m, b)
+}
+func (m *ReferenceSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReferenceSet.Marshal(b, m, deterministic)
+}
+func (dst *ReferenceSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReferenceSet.Merge(dst, src)
+}
+func (m *ReferenceSet) XXX_Size() int {
+	return xxx_messageInfo_ReferenceSet.Size(m)
+}
+func (m *ReferenceSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReferenceSet.DiscardUnknown(m)
 }
 
-func (m *ReferenceSet) Reset()                    { *m = ReferenceSet{} }
-func (m *ReferenceSet) String() string            { return proto.CompactTextString(m) }
-func (*ReferenceSet) ProtoMessage()               {}
-func (*ReferenceSet) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{1} }
+var xxx_messageInfo_ReferenceSet proto.InternalMessageInfo
 
 func (m *ReferenceSet) GetId() string {
 	if m != nil {
@@ -201,28 +251,50 @@ func (m *ReferenceSet) GetSourceAccessions() []string {
 type SearchReferenceSetsRequest struct {
 	// If present, return reference sets for which the
 	// [md5checksum][google.genomics.v1.ReferenceSet.md5checksum] matches exactly.
-	Md5Checksums []string `protobuf:"bytes,1,rep,name=md5checksums" json:"md5checksums,omitempty"`
+	Md5Checksums []string `protobuf:"bytes,1,rep,name=md5checksums,proto3" json:"md5checksums,omitempty"`
 	// If present, return reference sets for which a prefix of any of
 	// [sourceAccessions][google.genomics.v1.ReferenceSet.source_accessions]
 	// match any of these strings. Accession numbers typically have a main number
 	// and a version, for example `NC_000001.11`.
-	Accessions []string `protobuf:"bytes,2,rep,name=accessions" json:"accessions,omitempty"`
+	Accessions []string `protobuf:"bytes,2,rep,name=accessions,proto3" json:"accessions,omitempty"`
 	// If present, return reference sets for which a substring of their
 	// `assemblyId` matches this string (case insensitive).
-	AssemblyId string `protobuf:"bytes,3,opt,name=assembly_id,json=assemblyId" json:"assembly_id,omitempty"`
+	AssemblyId string `protobuf:"bytes,3,opt,name=assembly_id,json=assemblyId,proto3" json:"assembly_id,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 1024. The maximum value is 4096.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchReferenceSetsRequest) Reset()                    { *m = SearchReferenceSetsRequest{} }
-func (m *SearchReferenceSetsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchReferenceSetsRequest) ProtoMessage()               {}
-func (*SearchReferenceSetsRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{2} }
+func (m *SearchReferenceSetsRequest) Reset()         { *m = SearchReferenceSetsRequest{} }
+func (m *SearchReferenceSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchReferenceSetsRequest) ProtoMessage()    {}
+func (*SearchReferenceSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{2}
+}
+func (m *SearchReferenceSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchReferenceSetsRequest.Unmarshal(m, b)
+}
+func (m *SearchReferenceSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchReferenceSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchReferenceSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReferenceSetsRequest.Merge(dst, src)
+}
+func (m *SearchReferenceSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchReferenceSetsRequest.Size(m)
+}
+func (m *SearchReferenceSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchReferenceSetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchReferenceSetsRequest proto.InternalMessageInfo
 
 func (m *SearchReferenceSetsRequest) GetMd5Checksums() []string {
 	if m != nil {
@@ -261,17 +333,39 @@ func (m *SearchReferenceSetsRequest) GetPageSize() int32 {
 
 type SearchReferenceSetsResponse struct {
 	// The matching references sets.
-	ReferenceSets []*ReferenceSet `protobuf:"bytes,1,rep,name=reference_sets,json=referenceSets" json:"reference_sets,omitempty"`
+	ReferenceSets []*ReferenceSet `protobuf:"bytes,1,rep,name=reference_sets,json=referenceSets,proto3" json:"reference_sets,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchReferenceSetsResponse) Reset()         { *m = SearchReferenceSetsResponse{} }
+func (m *SearchReferenceSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchReferenceSetsResponse) ProtoMessage()    {}
+func (*SearchReferenceSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{3}
+}
+func (m *SearchReferenceSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchReferenceSetsResponse.Unmarshal(m, b)
+}
+func (m *SearchReferenceSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchReferenceSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchReferenceSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReferenceSetsResponse.Merge(dst, src)
+}
+func (m *SearchReferenceSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchReferenceSetsResponse.Size(m)
+}
+func (m *SearchReferenceSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchReferenceSetsResponse.DiscardUnknown(m)
 }
 
-func (m *SearchReferenceSetsResponse) Reset()                    { *m = SearchReferenceSetsResponse{} }
-func (m *SearchReferenceSetsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchReferenceSetsResponse) ProtoMessage()               {}
-func (*SearchReferenceSetsResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{3} }
+var xxx_messageInfo_SearchReferenceSetsResponse proto.InternalMessageInfo
 
 func (m *SearchReferenceSetsResponse) GetReferenceSets() []*ReferenceSet {
 	if m != nil {
@@ -289,13 +383,35 @@ func (m *SearchReferenceSetsResponse) GetNextPageToken() string {
 
 type GetReferenceSetRequest struct {
 	// The ID of the reference set.
-	ReferenceSetId string `protobuf:"bytes,1,opt,name=reference_set_id,json=referenceSetId" json:"reference_set_id,omitempty"`
+	ReferenceSetId       string   `protobuf:"bytes,1,opt,name=reference_set_id,json=referenceSetId,proto3" json:"reference_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetReferenceSetRequest) Reset()                    { *m = GetReferenceSetRequest{} }
-func (m *GetReferenceSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetReferenceSetRequest) ProtoMessage()               {}
-func (*GetReferenceSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{4} }
+func (m *GetReferenceSetRequest) Reset()         { *m = GetReferenceSetRequest{} }
+func (m *GetReferenceSetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetReferenceSetRequest) ProtoMessage()    {}
+func (*GetReferenceSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{4}
+}
+func (m *GetReferenceSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetReferenceSetRequest.Unmarshal(m, b)
+}
+func (m *GetReferenceSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetReferenceSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetReferenceSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReferenceSetRequest.Merge(dst, src)
+}
+func (m *GetReferenceSetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetReferenceSetRequest.Size(m)
+}
+func (m *GetReferenceSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetReferenceSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetReferenceSetRequest proto.InternalMessageInfo
 
 func (m *GetReferenceSetRequest) GetReferenceSetId() string {
 	if m != nil {
@@ -307,27 +423,49 @@ func (m *GetReferenceSetRequest) GetReferenceSetId() string {
 type SearchReferencesRequest struct {
 	// If present, return references for which the
 	// [md5checksum][google.genomics.v1.Reference.md5checksum] matches exactly.
-	Md5Checksums []string `protobuf:"bytes,1,rep,name=md5checksums" json:"md5checksums,omitempty"`
+	Md5Checksums []string `protobuf:"bytes,1,rep,name=md5checksums,proto3" json:"md5checksums,omitempty"`
 	// If present, return references for which a prefix of any of
 	// [sourceAccessions][google.genomics.v1.Reference.source_accessions] match
 	// any of these strings. Accession numbers typically have a main number and a
 	// version, for example `GCF_000001405.26`.
-	Accessions []string `protobuf:"bytes,2,rep,name=accessions" json:"accessions,omitempty"`
+	Accessions []string `protobuf:"bytes,2,rep,name=accessions,proto3" json:"accessions,omitempty"`
 	// If present, return only references which belong to this reference set.
-	ReferenceSetId string `protobuf:"bytes,3,opt,name=reference_set_id,json=referenceSetId" json:"reference_set_id,omitempty"`
+	ReferenceSetId string `protobuf:"bytes,3,opt,name=reference_set_id,json=referenceSetId,proto3" json:"reference_set_id,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 1024. The maximum value is 4096.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchReferencesRequest) Reset()                    { *m = SearchReferencesRequest{} }
-func (m *SearchReferencesRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchReferencesRequest) ProtoMessage()               {}
-func (*SearchReferencesRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{5} }
+func (m *SearchReferencesRequest) Reset()         { *m = SearchReferencesRequest{} }
+func (m *SearchReferencesRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchReferencesRequest) ProtoMessage()    {}
+func (*SearchReferencesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{5}
+}
+func (m *SearchReferencesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchReferencesRequest.Unmarshal(m, b)
+}
+func (m *SearchReferencesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchReferencesRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchReferencesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReferencesRequest.Merge(dst, src)
+}
+func (m *SearchReferencesRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchReferencesRequest.Size(m)
+}
+func (m *SearchReferencesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchReferencesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchReferencesRequest proto.InternalMessageInfo
 
 func (m *SearchReferencesRequest) GetMd5Checksums() []string {
 	if m != nil {
@@ -366,17 +504,39 @@ func (m *SearchReferencesRequest) GetPageSize() int32 {
 
 type SearchReferencesResponse struct {
 	// The matching references.
-	References []*Reference `protobuf:"bytes,1,rep,name=references" json:"references,omitempty"`
+	References []*Reference `protobuf:"bytes,1,rep,name=references,proto3" json:"references,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchReferencesResponse) Reset()                    { *m = SearchReferencesResponse{} }
-func (m *SearchReferencesResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchReferencesResponse) ProtoMessage()               {}
-func (*SearchReferencesResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{6} }
+func (m *SearchReferencesResponse) Reset()         { *m = SearchReferencesResponse{} }
+func (m *SearchReferencesResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchReferencesResponse) ProtoMessage()    {}
+func (*SearchReferencesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{6}
+}
+func (m *SearchReferencesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchReferencesResponse.Unmarshal(m, b)
+}
+func (m *SearchReferencesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchReferencesResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchReferencesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchReferencesResponse.Merge(dst, src)
+}
+func (m *SearchReferencesResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchReferencesResponse.Size(m)
+}
+func (m *SearchReferencesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchReferencesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchReferencesResponse proto.InternalMessageInfo
 
 func (m *SearchReferencesResponse) GetReferences() []*Reference {
 	if m != nil {
@@ -394,13 +554,35 @@ func (m *SearchReferencesResponse) GetNextPageToken() string {
 
 type GetReferenceRequest struct {
 	// The ID of the reference.
-	ReferenceId string `protobuf:"bytes,1,opt,name=reference_id,json=referenceId" json:"reference_id,omitempty"`
+	ReferenceId          string   `protobuf:"bytes,1,opt,name=reference_id,json=referenceId,proto3" json:"reference_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetReferenceRequest) Reset()         { *m = GetReferenceRequest{} }
+func (m *GetReferenceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetReferenceRequest) ProtoMessage()    {}
+func (*GetReferenceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{7}
+}
+func (m *GetReferenceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetReferenceRequest.Unmarshal(m, b)
+}
+func (m *GetReferenceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetReferenceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetReferenceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetReferenceRequest.Merge(dst, src)
+}
+func (m *GetReferenceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetReferenceRequest.Size(m)
+}
+func (m *GetReferenceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetReferenceRequest.DiscardUnknown(m)
 }
 
-func (m *GetReferenceRequest) Reset()                    { *m = GetReferenceRequest{} }
-func (m *GetReferenceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetReferenceRequest) ProtoMessage()               {}
-func (*GetReferenceRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{7} }
+var xxx_messageInfo_GetReferenceRequest proto.InternalMessageInfo
 
 func (m *GetReferenceRequest) GetReferenceId() string {
 	if m != nil {
@@ -411,26 +593,48 @@ func (m *GetReferenceRequest) GetReferenceId() string {
 
 type ListBasesRequest struct {
 	// The ID of the reference.
-	ReferenceId string `protobuf:"bytes,1,opt,name=reference_id,json=referenceId" json:"reference_id,omitempty"`
+	ReferenceId string `protobuf:"bytes,1,opt,name=reference_id,json=referenceId,proto3" json:"reference_id,omitempty"`
 	// The start position (0-based) of this query. Defaults to 0.
-	Start int64 `protobuf:"varint,2,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,2,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position (0-based, exclusive) of this query. Defaults to the length
 	// of this reference.
-	End int64 `protobuf:"varint,3,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,3,opt,name=end,proto3" json:"end,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of bases to return in a single page. If unspecified,
 	// defaults to 200Kbp (kilo base pairs). The maximum value is 10Mbp (mega base
 	// pairs).
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListBasesRequest) Reset()                    { *m = ListBasesRequest{} }
-func (m *ListBasesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListBasesRequest) ProtoMessage()               {}
-func (*ListBasesRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{8} }
+func (m *ListBasesRequest) Reset()         { *m = ListBasesRequest{} }
+func (m *ListBasesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListBasesRequest) ProtoMessage()    {}
+func (*ListBasesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{8}
+}
+func (m *ListBasesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBasesRequest.Unmarshal(m, b)
+}
+func (m *ListBasesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBasesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListBasesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBasesRequest.Merge(dst, src)
+}
+func (m *ListBasesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListBasesRequest.Size(m)
+}
+func (m *ListBasesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBasesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListBasesRequest proto.InternalMessageInfo
 
 func (m *ListBasesRequest) GetReferenceId() string {
 	if m != nil {
@@ -471,19 +675,41 @@ type ListBasesResponse struct {
 	// The offset position (0-based) of the given `sequence` from the
 	// start of this `Reference`. This value will differ for each page
 	// in a paginated request.
-	Offset int64 `protobuf:"varint,1,opt,name=offset" json:"offset,omitempty"`
+	Offset int64 `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"`
 	// A substring of the bases that make up this reference.
-	Sequence string `protobuf:"bytes,2,opt,name=sequence" json:"sequence,omitempty"`
+	Sequence string `protobuf:"bytes,2,opt,name=sequence,proto3" json:"sequence,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListBasesResponse) Reset()                    { *m = ListBasesResponse{} }
-func (m *ListBasesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListBasesResponse) ProtoMessage()               {}
-func (*ListBasesResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{9} }
+func (m *ListBasesResponse) Reset()         { *m = ListBasesResponse{} }
+func (m *ListBasesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListBasesResponse) ProtoMessage()    {}
+func (*ListBasesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_references_4f3354422baff2a6, []int{9}
+}
+func (m *ListBasesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListBasesResponse.Unmarshal(m, b)
+}
+func (m *ListBasesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListBasesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListBasesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListBasesResponse.Merge(dst, src)
+}
+func (m *ListBasesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListBasesResponse.Size(m)
+}
+func (m *ListBasesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListBasesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListBasesResponse proto.InternalMessageInfo
 
 func (m *ListBasesResponse) GetOffset() int64 {
 	if m != nil {
@@ -527,8 +753,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ReferenceServiceV1 service
-
+// ReferenceServiceV1Client is the client API for ReferenceServiceV1 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ReferenceServiceV1Client interface {
 	// Searches for reference sets which match the given criteria.
 	//
@@ -587,7 +814,7 @@ func NewReferenceServiceV1Client(cc *grpc.ClientConn) ReferenceServiceV1Client {
 
 func (c *referenceServiceV1Client) SearchReferenceSets(ctx context.Context, in *SearchReferenceSetsRequest, opts ...grpc.CallOption) (*SearchReferenceSetsResponse, error) {
 	out := new(SearchReferenceSetsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/SearchReferenceSets", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/SearchReferenceSets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -596,7 +823,7 @@ func (c *referenceServiceV1Client) SearchReferenceSets(ctx context.Context, in *
 
 func (c *referenceServiceV1Client) GetReferenceSet(ctx context.Context, in *GetReferenceSetRequest, opts ...grpc.CallOption) (*ReferenceSet, error) {
 	out := new(ReferenceSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/GetReferenceSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/GetReferenceSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -605,7 +832,7 @@ func (c *referenceServiceV1Client) GetReferenceSet(ctx context.Context, in *GetR
 
 func (c *referenceServiceV1Client) SearchReferences(ctx context.Context, in *SearchReferencesRequest, opts ...grpc.CallOption) (*SearchReferencesResponse, error) {
 	out := new(SearchReferencesResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/SearchReferences", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/SearchReferences", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -614,7 +841,7 @@ func (c *referenceServiceV1Client) SearchReferences(ctx context.Context, in *Sea
 
 func (c *referenceServiceV1Client) GetReference(ctx context.Context, in *GetReferenceRequest, opts ...grpc.CallOption) (*Reference, error) {
 	out := new(Reference)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/GetReference", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/GetReference", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -623,15 +850,14 @@ func (c *referenceServiceV1Client) GetReference(ctx context.Context, in *GetRefe
 
 func (c *referenceServiceV1Client) ListBases(ctx context.Context, in *ListBasesRequest, opts ...grpc.CallOption) (*ListBasesResponse, error) {
 	out := new(ListBasesResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/ListBases", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.ReferenceServiceV1/ListBases", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ReferenceServiceV1 service
-
+// ReferenceServiceV1Server is the server API for ReferenceServiceV1 service.
 type ReferenceServiceV1Server interface {
 	// Searches for reference sets which match the given criteria.
 	//
@@ -803,9 +1029,11 @@ var _ReferenceServiceV1_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/genomics/v1/references.proto",
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/references.proto", fileDescriptor10) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/references.proto", fileDescriptor_references_4f3354422baff2a6)
+}
 
-var fileDescriptor10 = []byte{
+var fileDescriptor_references_4f3354422baff2a6 = []byte{
 	// 851 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x41, 0x6f, 0x1b, 0x45,
 	0x14, 0xd6, 0x78, 0x63, 0x37, 0x7e, 0x76, 0x12, 0xf7, 0x15, 0xc2, 0xca, 0x25, 0xd4, 0x6c, 0x9a,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1/variants.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1/variants.pb.go
index 0bac56bb..7b87e5a6 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1/variants.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1/variants.pb.go
@@ -1,16 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1/variants.proto
 
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/struct"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -22,6 +22,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Operations to be performed during import on Variant info fields.
 // These operations are set for each info field in the info_merge_config
 // map of ImportVariantsRequest, which is plumbed down to the
@@ -54,7 +60,9 @@ var InfoMergeOperation_value = map[string]int32{
 func (x InfoMergeOperation) String() string {
 	return proto.EnumName(InfoMergeOperation_name, int32(x))
 }
-func (InfoMergeOperation) EnumDescriptor() ([]byte, []int) { return fileDescriptor11, []int{0} }
+func (InfoMergeOperation) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{0}
+}
 
 type VariantSetMetadata_Type int32
 
@@ -87,7 +95,9 @@ var VariantSetMetadata_Type_value = map[string]int32{
 func (x VariantSetMetadata_Type) String() string {
 	return proto.EnumName(VariantSetMetadata_Type_name, int32(x))
 }
-func (VariantSetMetadata_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor11, []int{0, 0} }
+func (VariantSetMetadata_Type) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{0, 0}
+}
 
 type ImportVariantsRequest_Format int32
 
@@ -116,7 +126,7 @@ func (x ImportVariantsRequest_Format) String() string {
 	return proto.EnumName(ImportVariantsRequest_Format_name, int32(x))
 }
 func (ImportVariantsRequest_Format) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor11, []int{6, 0}
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{6, 0}
 }
 
 type ExportVariantSetRequest_Format int32
@@ -140,7 +150,7 @@ func (x ExportVariantSetRequest_Format) String() string {
 	return proto.EnumName(ExportVariantSetRequest_Format_name, int32(x))
 }
 func (ExportVariantSetRequest_Format) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor11, []int{9, 0}
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{9, 0}
 }
 
 // Metadata describes a single piece of variant call metadata.
@@ -149,30 +159,52 @@ func (ExportVariantSetRequest_Format) EnumDescriptor() ([]byte, []int) {
 // Value and info are mutually exclusive.
 type VariantSetMetadata struct {
 	// The top-level key.
-	Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// The value field for simple metadata
-	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 	// User-provided ID field, not enforced by this API.
 	// Two or more pieces of structured metadata with identical
 	// id and key fields are considered equivalent.
-	Id string `protobuf:"bytes,4,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,4,opt,name=id,proto3" json:"id,omitempty"`
 	// The type of data. Possible types include: Integer, Float,
 	// Flag, Character, and String.
-	Type VariantSetMetadata_Type `protobuf:"varint,5,opt,name=type,enum=google.genomics.v1.VariantSetMetadata_Type" json:"type,omitempty"`
+	Type VariantSetMetadata_Type `protobuf:"varint,5,opt,name=type,proto3,enum=google.genomics.v1.VariantSetMetadata_Type" json:"type,omitempty"`
 	// The number of values that can be included in a field described by this
 	// metadata.
-	Number string `protobuf:"bytes,8,opt,name=number" json:"number,omitempty"`
+	Number string `protobuf:"bytes,8,opt,name=number,proto3" json:"number,omitempty"`
 	// A textual description of this metadata.
-	Description string `protobuf:"bytes,7,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,7,opt,name=description,proto3" json:"description,omitempty"`
 	// Remaining structured metadata key-value pairs. This must be of the form
 	// map<string, string[]> (string key mapping to a list of string values).
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,3,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info                 map[string]*_struct.ListValue `protobuf:"bytes,3,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *VariantSetMetadata) Reset()         { *m = VariantSetMetadata{} }
+func (m *VariantSetMetadata) String() string { return proto.CompactTextString(m) }
+func (*VariantSetMetadata) ProtoMessage()    {}
+func (*VariantSetMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{0}
+}
+func (m *VariantSetMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VariantSetMetadata.Unmarshal(m, b)
+}
+func (m *VariantSetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VariantSetMetadata.Marshal(b, m, deterministic)
+}
+func (dst *VariantSetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantSetMetadata.Merge(dst, src)
+}
+func (m *VariantSetMetadata) XXX_Size() int {
+	return xxx_messageInfo_VariantSetMetadata.Size(m)
+}
+func (m *VariantSetMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_VariantSetMetadata.DiscardUnknown(m)
 }
 
-func (m *VariantSetMetadata) Reset()                    { *m = VariantSetMetadata{} }
-func (m *VariantSetMetadata) String() string            { return proto.CompactTextString(m) }
-func (*VariantSetMetadata) ProtoMessage()               {}
-func (*VariantSetMetadata) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{0} }
+var xxx_messageInfo_VariantSetMetadata proto.InternalMessageInfo
 
 func (m *VariantSetMetadata) GetKey() string {
 	if m != nil {
@@ -216,7 +248,7 @@ func (m *VariantSetMetadata) GetDescription() string {
 	return ""
 }
 
-func (m *VariantSetMetadata) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *VariantSetMetadata) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -230,9 +262,9 @@ func (m *VariantSetMetadata) GetInfo() map[string]*google_protobuf3.ListValue {
 // Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
 type VariantSet struct {
 	// The dataset to which this variant set belongs.
-	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
+	DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	// The server-generated variant set ID, unique across all variant sets.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// The reference set to which the variant set is mapped. The reference set
 	// describes the alignment provenance of the variant set, while the
 	// `referenceBounds` describe the shape of the actual variant data. The
@@ -243,22 +275,44 @@ type VariantSet struct {
 	// and contains a single variant on reference 'X', `referenceBounds` would
 	// contain only an entry for 'X', while the associated reference set
 	// enumerates all possible references: '1', '2', 'X', 'Y', 'MT', etc.
-	ReferenceSetId string `protobuf:"bytes,6,opt,name=reference_set_id,json=referenceSetId" json:"reference_set_id,omitempty"`
+	ReferenceSetId string `protobuf:"bytes,6,opt,name=reference_set_id,json=referenceSetId,proto3" json:"reference_set_id,omitempty"`
 	// A list of all references used by the variants in a variant set
 	// with associated coordinate upper bounds for each one.
-	ReferenceBounds []*ReferenceBound `protobuf:"bytes,5,rep,name=reference_bounds,json=referenceBounds" json:"reference_bounds,omitempty"`
+	ReferenceBounds []*ReferenceBound `protobuf:"bytes,5,rep,name=reference_bounds,json=referenceBounds,proto3" json:"reference_bounds,omitempty"`
 	// The metadata associated with this variant set.
-	Metadata []*VariantSetMetadata `protobuf:"bytes,4,rep,name=metadata" json:"metadata,omitempty"`
+	Metadata []*VariantSetMetadata `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty"`
 	// User-specified, mutable name.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
 	// A textual description of this variant set.
-	Description string `protobuf:"bytes,8,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,8,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *VariantSet) Reset()         { *m = VariantSet{} }
+func (m *VariantSet) String() string { return proto.CompactTextString(m) }
+func (*VariantSet) ProtoMessage()    {}
+func (*VariantSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{1}
+}
+func (m *VariantSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VariantSet.Unmarshal(m, b)
+}
+func (m *VariantSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VariantSet.Marshal(b, m, deterministic)
+}
+func (dst *VariantSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantSet.Merge(dst, src)
+}
+func (m *VariantSet) XXX_Size() int {
+	return xxx_messageInfo_VariantSet.Size(m)
+}
+func (m *VariantSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_VariantSet.DiscardUnknown(m)
 }
 
-func (m *VariantSet) Reset()                    { *m = VariantSet{} }
-func (m *VariantSet) String() string            { return proto.CompactTextString(m) }
-func (*VariantSet) ProtoMessage()               {}
-func (*VariantSet) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{1} }
+var xxx_messageInfo_VariantSet proto.InternalMessageInfo
 
 func (m *VariantSet) GetDatasetId() string {
 	if m != nil {
@@ -323,47 +377,69 @@ func (m *VariantSet) GetDescription() string {
 // sample.
 type Variant struct {
 	// The ID of the variant set this variant belongs to.
-	VariantSetId string `protobuf:"bytes,15,opt,name=variant_set_id,json=variantSetId" json:"variant_set_id,omitempty"`
+	VariantSetId string `protobuf:"bytes,15,opt,name=variant_set_id,json=variantSetId,proto3" json:"variant_set_id,omitempty"`
 	// The server-generated variant ID, unique across all variants.
-	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	// Names for the variant, for example a RefSNP ID.
-	Names []string `protobuf:"bytes,3,rep,name=names" json:"names,omitempty"`
+	Names []string `protobuf:"bytes,3,rep,name=names,proto3" json:"names,omitempty"`
 	// The date this variant was created, in milliseconds from the epoch.
-	Created int64 `protobuf:"varint,12,opt,name=created" json:"created,omitempty"`
+	Created int64 `protobuf:"varint,12,opt,name=created,proto3" json:"created,omitempty"`
 	// The reference on which this variant occurs.
 	// (such as `chr20` or `X`)
-	ReferenceName string `protobuf:"bytes,14,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,14,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The position at which this variant occurs (0-based).
 	// This corresponds to the first base of the string of reference bases.
-	Start int64 `protobuf:"varint,16,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,16,opt,name=start,proto3" json:"start,omitempty"`
 	// The end position (0-based) of this variant. This corresponds to the first
 	// base after the last base in the reference allele. So, the length of
 	// the reference allele is (end - start). This is useful for variants
 	// that don't explicitly give alternate bases, for example large deletions.
-	End int64 `protobuf:"varint,13,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,13,opt,name=end,proto3" json:"end,omitempty"`
 	// The reference bases for this variant. They start at the given
 	// position.
-	ReferenceBases string `protobuf:"bytes,6,opt,name=reference_bases,json=referenceBases" json:"reference_bases,omitempty"`
+	ReferenceBases string `protobuf:"bytes,6,opt,name=reference_bases,json=referenceBases,proto3" json:"reference_bases,omitempty"`
 	// The bases that appear instead of the reference bases.
-	AlternateBases []string `protobuf:"bytes,7,rep,name=alternate_bases,json=alternateBases" json:"alternate_bases,omitempty"`
+	AlternateBases []string `protobuf:"bytes,7,rep,name=alternate_bases,json=alternateBases,proto3" json:"alternate_bases,omitempty"`
 	// A measure of how likely this variant is to be real.
 	// A higher value is better.
-	Quality float64 `protobuf:"fixed64,8,opt,name=quality" json:"quality,omitempty"`
+	Quality float64 `protobuf:"fixed64,8,opt,name=quality,proto3" json:"quality,omitempty"`
 	// A list of filters (normally quality filters) this variant has failed.
 	// `PASS` indicates this variant has passed all filters.
-	Filter []string `protobuf:"bytes,9,rep,name=filter" json:"filter,omitempty"`
+	Filter []string `protobuf:"bytes,9,rep,name=filter,proto3" json:"filter,omitempty"`
 	// A map of additional variant information. This must be of the form
 	// map<string, string[]> (string key mapping to a list of string values).
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,10,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info map[string]*_struct.ListValue `protobuf:"bytes,10,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The variant calls for this particular variant. Each one represents the
 	// determination of genotype with respect to this variant.
-	Calls []*VariantCall `protobuf:"bytes,11,rep,name=calls" json:"calls,omitempty"`
+	Calls                []*VariantCall `protobuf:"bytes,11,rep,name=calls,proto3" json:"calls,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *Variant) Reset()         { *m = Variant{} }
+func (m *Variant) String() string { return proto.CompactTextString(m) }
+func (*Variant) ProtoMessage()    {}
+func (*Variant) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{2}
+}
+func (m *Variant) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Variant.Unmarshal(m, b)
+}
+func (m *Variant) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Variant.Marshal(b, m, deterministic)
+}
+func (dst *Variant) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Variant.Merge(dst, src)
+}
+func (m *Variant) XXX_Size() int {
+	return xxx_messageInfo_Variant.Size(m)
+}
+func (m *Variant) XXX_DiscardUnknown() {
+	xxx_messageInfo_Variant.DiscardUnknown(m)
 }
 
-func (m *Variant) Reset()                    { *m = Variant{} }
-func (m *Variant) String() string            { return proto.CompactTextString(m) }
-func (*Variant) ProtoMessage()               {}
-func (*Variant) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{2} }
+var xxx_messageInfo_Variant proto.InternalMessageInfo
 
 func (m *Variant) GetVariantSetId() string {
 	if m != nil {
@@ -442,7 +518,7 @@ func (m *Variant) GetFilter() []string {
 	return nil
 }
 
-func (m *Variant) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *Variant) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -462,9 +538,9 @@ func (m *Variant) GetCalls() []*VariantCall {
 // a SNP named rs1234 in a call set with the name NA12345.
 type VariantCall struct {
 	// The ID of the call set this variant call belongs to.
-	CallSetId string `protobuf:"bytes,8,opt,name=call_set_id,json=callSetId" json:"call_set_id,omitempty"`
+	CallSetId string `protobuf:"bytes,8,opt,name=call_set_id,json=callSetId,proto3" json:"call_set_id,omitempty"`
 	// The name of the call set this variant call belongs to.
-	CallSetName string `protobuf:"bytes,9,opt,name=call_set_name,json=callSetName" json:"call_set_name,omitempty"`
+	CallSetName string `protobuf:"bytes,9,opt,name=call_set_name,json=callSetName,proto3" json:"call_set_name,omitempty"`
 	// The genotype of this variant call. Each value represents either the value
 	// of the `referenceBases` field or a 1-based index into
 	// `alternateBases`. If a variant had a `referenceBases`
@@ -477,29 +553,51 @@ type VariantCall struct {
 	// genotype values is important if the `phaseset` is present.
 	// If a genotype is not called (that is, a `.` is present in the
 	// GT string) -1 is returned.
-	Genotype []int32 `protobuf:"varint,7,rep,packed,name=genotype" json:"genotype,omitempty"`
+	Genotype []int32 `protobuf:"varint,7,rep,packed,name=genotype,proto3" json:"genotype,omitempty"`
 	// If this field is present, this variant call's genotype ordering implies
 	// the phase of the bases and is consistent with any other variant calls in
 	// the same reference sequence which have the same phaseset value.
 	// When importing data from VCF, if the genotype data was phased but no
 	// phase set was specified this field will be set to `*`.
-	Phaseset string `protobuf:"bytes,5,opt,name=phaseset" json:"phaseset,omitempty"`
+	Phaseset string `protobuf:"bytes,5,opt,name=phaseset,proto3" json:"phaseset,omitempty"`
 	// The genotype likelihoods for this variant call. Each array entry
 	// represents how likely a specific genotype is for this call. The value
 	// ordering is defined by the GL tag in the VCF spec.
 	// If Phred-scaled genotype likelihood scores (PL) are available and
 	// log10(P) genotype likelihood scores (GL) are not, PL scores are converted
 	// to GL scores.  If both are available, PL scores are stored in `info`.
-	GenotypeLikelihood []float64 `protobuf:"fixed64,6,rep,packed,name=genotype_likelihood,json=genotypeLikelihood" json:"genotype_likelihood,omitempty"`
+	GenotypeLikelihood []float64 `protobuf:"fixed64,6,rep,packed,name=genotype_likelihood,json=genotypeLikelihood,proto3" json:"genotype_likelihood,omitempty"`
 	// A map of additional variant call information. This must be of the form
 	// map<string, string[]> (string key mapping to a list of string values).
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,2,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info                 map[string]*_struct.ListValue `protobuf:"bytes,2,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *VariantCall) Reset()         { *m = VariantCall{} }
+func (m *VariantCall) String() string { return proto.CompactTextString(m) }
+func (*VariantCall) ProtoMessage()    {}
+func (*VariantCall) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{3}
+}
+func (m *VariantCall) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VariantCall.Unmarshal(m, b)
+}
+func (m *VariantCall) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VariantCall.Marshal(b, m, deterministic)
+}
+func (dst *VariantCall) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VariantCall.Merge(dst, src)
+}
+func (m *VariantCall) XXX_Size() int {
+	return xxx_messageInfo_VariantCall.Size(m)
+}
+func (m *VariantCall) XXX_DiscardUnknown() {
+	xxx_messageInfo_VariantCall.DiscardUnknown(m)
 }
 
-func (m *VariantCall) Reset()                    { *m = VariantCall{} }
-func (m *VariantCall) String() string            { return proto.CompactTextString(m) }
-func (*VariantCall) ProtoMessage()               {}
-func (*VariantCall) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{3} }
+var xxx_messageInfo_VariantCall proto.InternalMessageInfo
 
 func (m *VariantCall) GetCallSetId() string {
 	if m != nil {
@@ -536,7 +634,7 @@ func (m *VariantCall) GetGenotypeLikelihood() []float64 {
 	return nil
 }
 
-func (m *VariantCall) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *VariantCall) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -550,28 +648,50 @@ func (m *VariantCall) GetInfo() map[string]*google_protobuf3.ListValue {
 // Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
 type CallSet struct {
 	// The server-generated call set ID, unique across all call sets.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// The call set name.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// The sample ID this call set corresponds to.
-	SampleId string `protobuf:"bytes,7,opt,name=sample_id,json=sampleId" json:"sample_id,omitempty"`
+	SampleId string `protobuf:"bytes,7,opt,name=sample_id,json=sampleId,proto3" json:"sample_id,omitempty"`
 	// The IDs of the variant sets this call set belongs to. This field must
 	// have exactly length one, as a call set belongs to a single variant set.
 	// This field is repeated for compatibility with the
 	// [GA4GH 0.5.1
 	// API](https://github.com/ga4gh/schemas/blob/v0.5.1/src/main/resources/avro/variants.avdl#L76).
-	VariantSetIds []string `protobuf:"bytes,6,rep,name=variant_set_ids,json=variantSetIds" json:"variant_set_ids,omitempty"`
+	VariantSetIds []string `protobuf:"bytes,6,rep,name=variant_set_ids,json=variantSetIds,proto3" json:"variant_set_ids,omitempty"`
 	// The date this call set was created in milliseconds from the epoch.
-	Created int64 `protobuf:"varint,5,opt,name=created" json:"created,omitempty"`
+	Created int64 `protobuf:"varint,5,opt,name=created,proto3" json:"created,omitempty"`
 	// A map of additional call set information. This must be of the form
 	// map<string, string[]> (string key mapping to a list of string values).
-	Info map[string]*google_protobuf3.ListValue `protobuf:"bytes,4,rep,name=info" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Info                 map[string]*_struct.ListValue `protobuf:"bytes,4,rep,name=info,proto3" json:"info,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *CallSet) Reset()         { *m = CallSet{} }
+func (m *CallSet) String() string { return proto.CompactTextString(m) }
+func (*CallSet) ProtoMessage()    {}
+func (*CallSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{4}
+}
+func (m *CallSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CallSet.Unmarshal(m, b)
+}
+func (m *CallSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CallSet.Marshal(b, m, deterministic)
+}
+func (dst *CallSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CallSet.Merge(dst, src)
+}
+func (m *CallSet) XXX_Size() int {
+	return xxx_messageInfo_CallSet.Size(m)
+}
+func (m *CallSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_CallSet.DiscardUnknown(m)
 }
 
-func (m *CallSet) Reset()                    { *m = CallSet{} }
-func (m *CallSet) String() string            { return proto.CompactTextString(m) }
-func (*CallSet) ProtoMessage()               {}
-func (*CallSet) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{4} }
+var xxx_messageInfo_CallSet proto.InternalMessageInfo
 
 func (m *CallSet) GetId() string {
 	if m != nil {
@@ -608,7 +728,7 @@ func (m *CallSet) GetCreated() int64 {
 	return 0
 }
 
-func (m *CallSet) GetInfo() map[string]*google_protobuf3.ListValue {
+func (m *CallSet) GetInfo() map[string]*_struct.ListValue {
 	if m != nil {
 		return m.Info
 	}
@@ -619,16 +739,38 @@ func (m *CallSet) GetInfo() map[string]*google_protobuf3.ListValue {
 // variants in a particular reference.
 type ReferenceBound struct {
 	// The name of the reference associated with this reference bound.
-	ReferenceName string `protobuf:"bytes,1,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,1,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// An upper bound (inclusive) on the starting coordinate of any
 	// variant in the reference sequence.
-	UpperBound int64 `protobuf:"varint,2,opt,name=upper_bound,json=upperBound" json:"upper_bound,omitempty"`
+	UpperBound           int64    `protobuf:"varint,2,opt,name=upper_bound,json=upperBound,proto3" json:"upper_bound,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReferenceBound) Reset()         { *m = ReferenceBound{} }
+func (m *ReferenceBound) String() string { return proto.CompactTextString(m) }
+func (*ReferenceBound) ProtoMessage()    {}
+func (*ReferenceBound) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{5}
+}
+func (m *ReferenceBound) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReferenceBound.Unmarshal(m, b)
+}
+func (m *ReferenceBound) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReferenceBound.Marshal(b, m, deterministic)
+}
+func (dst *ReferenceBound) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReferenceBound.Merge(dst, src)
+}
+func (m *ReferenceBound) XXX_Size() int {
+	return xxx_messageInfo_ReferenceBound.Size(m)
+}
+func (m *ReferenceBound) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReferenceBound.DiscardUnknown(m)
 }
 
-func (m *ReferenceBound) Reset()                    { *m = ReferenceBound{} }
-func (m *ReferenceBound) String() string            { return proto.CompactTextString(m) }
-func (*ReferenceBound) ProtoMessage()               {}
-func (*ReferenceBound) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{5} }
+var xxx_messageInfo_ReferenceBound proto.InternalMessageInfo
 
 func (m *ReferenceBound) GetReferenceName() string {
 	if m != nil {
@@ -647,15 +789,15 @@ func (m *ReferenceBound) GetUpperBound() int64 {
 // The variant data import request.
 type ImportVariantsRequest struct {
 	// Required. The variant set to which variant data should be imported.
-	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId" json:"variant_set_id,omitempty"`
+	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId,proto3" json:"variant_set_id,omitempty"`
 	// A list of URIs referencing variant files in Google Cloud Storage. URIs can
 	// include wildcards [as described
 	// here](https://cloud.google.com/storage/docs/gsutil/addlhelp/WildcardNames).
 	// Note that recursive wildcards ('**') are not supported.
-	SourceUris []string `protobuf:"bytes,2,rep,name=source_uris,json=sourceUris" json:"source_uris,omitempty"`
+	SourceUris []string `protobuf:"bytes,2,rep,name=source_uris,json=sourceUris,proto3" json:"source_uris,omitempty"`
 	// The format of the variant data being imported. If unspecified, defaults to
 	// to `VCF`.
-	Format ImportVariantsRequest_Format `protobuf:"varint,3,opt,name=format,enum=google.genomics.v1.ImportVariantsRequest_Format" json:"format,omitempty"`
+	Format ImportVariantsRequest_Format `protobuf:"varint,3,opt,name=format,proto3,enum=google.genomics.v1.ImportVariantsRequest_Format" json:"format,omitempty"`
 	// Convert reference names to the canonical representation.
 	// hg19 haploytypes (those reference names containing "_hap")
 	// are not modified in any way.
@@ -664,17 +806,39 @@ type ImportVariantsRequest struct {
 	// The "chr" prefix is dropped for all autosomes and sex chromsomes.
 	// For example "chr17" becomes "17" and "chrX" becomes "X".
 	// All mitochondrial chromosomes ("chrM", "chrMT", etc) become "MT".
-	NormalizeReferenceNames bool `protobuf:"varint,5,opt,name=normalize_reference_names,json=normalizeReferenceNames" json:"normalize_reference_names,omitempty"`
+	NormalizeReferenceNames bool `protobuf:"varint,5,opt,name=normalize_reference_names,json=normalizeReferenceNames,proto3" json:"normalize_reference_names,omitempty"`
 	// A mapping between info field keys and the InfoMergeOperations to
 	// be performed on them. This is plumbed down to the MergeVariantRequests
 	// generated by the resulting import job.
-	InfoMergeConfig map[string]InfoMergeOperation `protobuf:"bytes,6,rep,name=info_merge_config,json=infoMergeConfig" json:"info_merge_config,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.genomics.v1.InfoMergeOperation"`
+	InfoMergeConfig      map[string]InfoMergeOperation `protobuf:"bytes,6,rep,name=info_merge_config,json=infoMergeConfig,proto3" json:"info_merge_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=google.genomics.v1.InfoMergeOperation"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *ImportVariantsRequest) Reset()         { *m = ImportVariantsRequest{} }
+func (m *ImportVariantsRequest) String() string { return proto.CompactTextString(m) }
+func (*ImportVariantsRequest) ProtoMessage()    {}
+func (*ImportVariantsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{6}
+}
+func (m *ImportVariantsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportVariantsRequest.Unmarshal(m, b)
+}
+func (m *ImportVariantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportVariantsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ImportVariantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportVariantsRequest.Merge(dst, src)
+}
+func (m *ImportVariantsRequest) XXX_Size() int {
+	return xxx_messageInfo_ImportVariantsRequest.Size(m)
+}
+func (m *ImportVariantsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportVariantsRequest.DiscardUnknown(m)
 }
 
-func (m *ImportVariantsRequest) Reset()                    { *m = ImportVariantsRequest{} }
-func (m *ImportVariantsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ImportVariantsRequest) ProtoMessage()               {}
-func (*ImportVariantsRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{6} }
+var xxx_messageInfo_ImportVariantsRequest proto.InternalMessageInfo
 
 func (m *ImportVariantsRequest) GetVariantSetId() string {
 	if m != nil {
@@ -714,13 +878,35 @@ func (m *ImportVariantsRequest) GetInfoMergeConfig() map[string]InfoMergeOperati
 // The variant data import response.
 type ImportVariantsResponse struct {
 	// IDs of the call sets created during the import.
-	CallSetIds []string `protobuf:"bytes,1,rep,name=call_set_ids,json=callSetIds" json:"call_set_ids,omitempty"`
+	CallSetIds           []string `protobuf:"bytes,1,rep,name=call_set_ids,json=callSetIds,proto3" json:"call_set_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ImportVariantsResponse) Reset()                    { *m = ImportVariantsResponse{} }
-func (m *ImportVariantsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ImportVariantsResponse) ProtoMessage()               {}
-func (*ImportVariantsResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{7} }
+func (m *ImportVariantsResponse) Reset()         { *m = ImportVariantsResponse{} }
+func (m *ImportVariantsResponse) String() string { return proto.CompactTextString(m) }
+func (*ImportVariantsResponse) ProtoMessage()    {}
+func (*ImportVariantsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{7}
+}
+func (m *ImportVariantsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImportVariantsResponse.Unmarshal(m, b)
+}
+func (m *ImportVariantsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImportVariantsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ImportVariantsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImportVariantsResponse.Merge(dst, src)
+}
+func (m *ImportVariantsResponse) XXX_Size() int {
+	return xxx_messageInfo_ImportVariantsResponse.Size(m)
+}
+func (m *ImportVariantsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImportVariantsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImportVariantsResponse proto.InternalMessageInfo
 
 func (m *ImportVariantsResponse) GetCallSetIds() []string {
 	if m != nil {
@@ -732,13 +918,35 @@ func (m *ImportVariantsResponse) GetCallSetIds() []string {
 // The CreateVariantSet request
 type CreateVariantSetRequest struct {
 	// Required. The variant set to be created. Must have a valid `datasetId`.
-	VariantSet *VariantSet `protobuf:"bytes,1,opt,name=variant_set,json=variantSet" json:"variant_set,omitempty"`
+	VariantSet           *VariantSet `protobuf:"bytes,1,opt,name=variant_set,json=variantSet,proto3" json:"variant_set,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *CreateVariantSetRequest) Reset()         { *m = CreateVariantSetRequest{} }
+func (m *CreateVariantSetRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateVariantSetRequest) ProtoMessage()    {}
+func (*CreateVariantSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{8}
+}
+func (m *CreateVariantSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateVariantSetRequest.Unmarshal(m, b)
+}
+func (m *CreateVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateVariantSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVariantSetRequest.Merge(dst, src)
+}
+func (m *CreateVariantSetRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateVariantSetRequest.Size(m)
+}
+func (m *CreateVariantSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateVariantSetRequest.DiscardUnknown(m)
 }
 
-func (m *CreateVariantSetRequest) Reset()                    { *m = CreateVariantSetRequest{} }
-func (m *CreateVariantSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateVariantSetRequest) ProtoMessage()               {}
-func (*CreateVariantSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{8} }
+var xxx_messageInfo_CreateVariantSetRequest proto.InternalMessageInfo
 
 func (m *CreateVariantSetRequest) GetVariantSet() *VariantSet {
 	if m != nil {
@@ -751,29 +959,51 @@ func (m *CreateVariantSetRequest) GetVariantSet() *VariantSet {
 type ExportVariantSetRequest struct {
 	// Required. The ID of the variant set that contains variant data which
 	// should be exported. The caller must have READ access to this variant set.
-	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId" json:"variant_set_id,omitempty"`
+	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId,proto3" json:"variant_set_id,omitempty"`
 	// If provided, only variant call information from the specified call sets
 	// will be exported. By default all variant calls are exported.
-	CallSetIds []string `protobuf:"bytes,2,rep,name=call_set_ids,json=callSetIds" json:"call_set_ids,omitempty"`
+	CallSetIds []string `protobuf:"bytes,2,rep,name=call_set_ids,json=callSetIds,proto3" json:"call_set_ids,omitempty"`
 	// Required. The Google Cloud project ID that owns the destination
 	// BigQuery dataset. The caller must have WRITE access to this project.  This
 	// project will also own the resulting export job.
-	ProjectId string `protobuf:"bytes,3,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,3,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The format for the exported data.
-	Format ExportVariantSetRequest_Format `protobuf:"varint,4,opt,name=format,enum=google.genomics.v1.ExportVariantSetRequest_Format" json:"format,omitempty"`
+	Format ExportVariantSetRequest_Format `protobuf:"varint,4,opt,name=format,proto3,enum=google.genomics.v1.ExportVariantSetRequest_Format" json:"format,omitempty"`
 	// Required. The BigQuery dataset to export data to. This dataset must already
 	// exist. Note that this is distinct from the Genomics concept of "dataset".
-	BigqueryDataset string `protobuf:"bytes,5,opt,name=bigquery_dataset,json=bigqueryDataset" json:"bigquery_dataset,omitempty"`
+	BigqueryDataset string `protobuf:"bytes,5,opt,name=bigquery_dataset,json=bigqueryDataset,proto3" json:"bigquery_dataset,omitempty"`
 	// Required. The BigQuery table to export data to.
 	// If the table doesn't exist, it will be created. If it already exists, it
 	// will be overwritten.
-	BigqueryTable string `protobuf:"bytes,6,opt,name=bigquery_table,json=bigqueryTable" json:"bigquery_table,omitempty"`
+	BigqueryTable        string   `protobuf:"bytes,6,opt,name=bigquery_table,json=bigqueryTable,proto3" json:"bigquery_table,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExportVariantSetRequest) Reset()         { *m = ExportVariantSetRequest{} }
+func (m *ExportVariantSetRequest) String() string { return proto.CompactTextString(m) }
+func (*ExportVariantSetRequest) ProtoMessage()    {}
+func (*ExportVariantSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{9}
+}
+func (m *ExportVariantSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExportVariantSetRequest.Unmarshal(m, b)
+}
+func (m *ExportVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExportVariantSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExportVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportVariantSetRequest.Merge(dst, src)
+}
+func (m *ExportVariantSetRequest) XXX_Size() int {
+	return xxx_messageInfo_ExportVariantSetRequest.Size(m)
+}
+func (m *ExportVariantSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportVariantSetRequest.DiscardUnknown(m)
 }
 
-func (m *ExportVariantSetRequest) Reset()                    { *m = ExportVariantSetRequest{} }
-func (m *ExportVariantSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*ExportVariantSetRequest) ProtoMessage()               {}
-func (*ExportVariantSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{9} }
+var xxx_messageInfo_ExportVariantSetRequest proto.InternalMessageInfo
 
 func (m *ExportVariantSetRequest) GetVariantSetId() string {
 	if m != nil {
@@ -820,13 +1050,35 @@ func (m *ExportVariantSetRequest) GetBigqueryTable() string {
 // The variant set request.
 type GetVariantSetRequest struct {
 	// Required. The ID of the variant set.
-	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId" json:"variant_set_id,omitempty"`
+	VariantSetId         string   `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId,proto3" json:"variant_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetVariantSetRequest) Reset()         { *m = GetVariantSetRequest{} }
+func (m *GetVariantSetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetVariantSetRequest) ProtoMessage()    {}
+func (*GetVariantSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{10}
+}
+func (m *GetVariantSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetVariantSetRequest.Unmarshal(m, b)
+}
+func (m *GetVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetVariantSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVariantSetRequest.Merge(dst, src)
+}
+func (m *GetVariantSetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetVariantSetRequest.Size(m)
+}
+func (m *GetVariantSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetVariantSetRequest.DiscardUnknown(m)
 }
 
-func (m *GetVariantSetRequest) Reset()                    { *m = GetVariantSetRequest{} }
-func (m *GetVariantSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetVariantSetRequest) ProtoMessage()               {}
-func (*GetVariantSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{10} }
+var xxx_messageInfo_GetVariantSetRequest proto.InternalMessageInfo
 
 func (m *GetVariantSetRequest) GetVariantSetId() string {
 	if m != nil {
@@ -839,20 +1091,42 @@ func (m *GetVariantSetRequest) GetVariantSetId() string {
 type SearchVariantSetsRequest struct {
 	// Exactly one dataset ID must be provided here. Only variant sets which
 	// belong to this dataset will be returned.
-	DatasetIds []string `protobuf:"bytes,1,rep,name=dataset_ids,json=datasetIds" json:"dataset_ids,omitempty"`
+	DatasetIds []string `protobuf:"bytes,1,rep,name=dataset_ids,json=datasetIds,proto3" json:"dataset_ids,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 1024.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchVariantSetsRequest) Reset()                    { *m = SearchVariantSetsRequest{} }
-func (m *SearchVariantSetsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchVariantSetsRequest) ProtoMessage()               {}
-func (*SearchVariantSetsRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{11} }
+func (m *SearchVariantSetsRequest) Reset()         { *m = SearchVariantSetsRequest{} }
+func (m *SearchVariantSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchVariantSetsRequest) ProtoMessage()    {}
+func (*SearchVariantSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{11}
+}
+func (m *SearchVariantSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchVariantSetsRequest.Unmarshal(m, b)
+}
+func (m *SearchVariantSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchVariantSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchVariantSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchVariantSetsRequest.Merge(dst, src)
+}
+func (m *SearchVariantSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchVariantSetsRequest.Size(m)
+}
+func (m *SearchVariantSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchVariantSetsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchVariantSetsRequest proto.InternalMessageInfo
 
 func (m *SearchVariantSetsRequest) GetDatasetIds() []string {
 	if m != nil {
@@ -878,17 +1152,39 @@ func (m *SearchVariantSetsRequest) GetPageSize() int32 {
 // The search variant sets response.
 type SearchVariantSetsResponse struct {
 	// The variant sets belonging to the requested dataset.
-	VariantSets []*VariantSet `protobuf:"bytes,1,rep,name=variant_sets,json=variantSets" json:"variant_sets,omitempty"`
+	VariantSets []*VariantSet `protobuf:"bytes,1,rep,name=variant_sets,json=variantSets,proto3" json:"variant_sets,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchVariantSetsResponse) Reset()         { *m = SearchVariantSetsResponse{} }
+func (m *SearchVariantSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchVariantSetsResponse) ProtoMessage()    {}
+func (*SearchVariantSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{12}
+}
+func (m *SearchVariantSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchVariantSetsResponse.Unmarshal(m, b)
+}
+func (m *SearchVariantSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchVariantSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchVariantSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchVariantSetsResponse.Merge(dst, src)
+}
+func (m *SearchVariantSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchVariantSetsResponse.Size(m)
+}
+func (m *SearchVariantSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchVariantSetsResponse.DiscardUnknown(m)
 }
 
-func (m *SearchVariantSetsResponse) Reset()                    { *m = SearchVariantSetsResponse{} }
-func (m *SearchVariantSetsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchVariantSetsResponse) ProtoMessage()               {}
-func (*SearchVariantSetsResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{12} }
+var xxx_messageInfo_SearchVariantSetsResponse proto.InternalMessageInfo
 
 func (m *SearchVariantSetsResponse) GetVariantSets() []*VariantSet {
 	if m != nil {
@@ -907,13 +1203,35 @@ func (m *SearchVariantSetsResponse) GetNextPageToken() string {
 // The delete variant set request.
 type DeleteVariantSetRequest struct {
 	// The ID of the variant set to be deleted.
-	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId" json:"variant_set_id,omitempty"`
+	VariantSetId         string   `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId,proto3" json:"variant_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteVariantSetRequest) Reset()                    { *m = DeleteVariantSetRequest{} }
-func (m *DeleteVariantSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteVariantSetRequest) ProtoMessage()               {}
-func (*DeleteVariantSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{13} }
+func (m *DeleteVariantSetRequest) Reset()         { *m = DeleteVariantSetRequest{} }
+func (m *DeleteVariantSetRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteVariantSetRequest) ProtoMessage()    {}
+func (*DeleteVariantSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{13}
+}
+func (m *DeleteVariantSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteVariantSetRequest.Unmarshal(m, b)
+}
+func (m *DeleteVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteVariantSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVariantSetRequest.Merge(dst, src)
+}
+func (m *DeleteVariantSetRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteVariantSetRequest.Size(m)
+}
+func (m *DeleteVariantSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteVariantSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteVariantSetRequest proto.InternalMessageInfo
 
 func (m *DeleteVariantSetRequest) GetVariantSetId() string {
 	if m != nil {
@@ -924,10 +1242,10 @@ func (m *DeleteVariantSetRequest) GetVariantSetId() string {
 
 type UpdateVariantSetRequest struct {
 	// The ID of the variant to be updated (must already exist).
-	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId" json:"variant_set_id,omitempty"`
+	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId,proto3" json:"variant_set_id,omitempty"`
 	// The new variant data. Only the variant_set.metadata will be considered
 	// for update.
-	VariantSet *VariantSet `protobuf:"bytes,2,opt,name=variant_set,json=variantSet" json:"variant_set,omitempty"`
+	VariantSet *VariantSet `protobuf:"bytes,2,opt,name=variant_set,json=variantSet,proto3" json:"variant_set,omitempty"`
 	// An optional mask specifying which fields to update. Supported fields:
 	//
 	// * [metadata][google.genomics.v1.VariantSet.metadata].
@@ -936,13 +1254,35 @@ type UpdateVariantSetRequest struct {
 	//
 	// Leaving `updateMask` unset is equivalent to specifying all mutable
 	// fields.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *UpdateVariantSetRequest) Reset()                    { *m = UpdateVariantSetRequest{} }
-func (m *UpdateVariantSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateVariantSetRequest) ProtoMessage()               {}
-func (*UpdateVariantSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{14} }
+func (m *UpdateVariantSetRequest) Reset()         { *m = UpdateVariantSetRequest{} }
+func (m *UpdateVariantSetRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateVariantSetRequest) ProtoMessage()    {}
+func (*UpdateVariantSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{14}
+}
+func (m *UpdateVariantSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateVariantSetRequest.Unmarshal(m, b)
+}
+func (m *UpdateVariantSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateVariantSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateVariantSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateVariantSetRequest.Merge(dst, src)
+}
+func (m *UpdateVariantSetRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateVariantSetRequest.Size(m)
+}
+func (m *UpdateVariantSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateVariantSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateVariantSetRequest proto.InternalMessageInfo
 
 func (m *UpdateVariantSetRequest) GetVariantSetId() string {
 	if m != nil {
@@ -958,7 +1298,7 @@ func (m *UpdateVariantSetRequest) GetVariantSet() *VariantSet {
 	return nil
 }
 
-func (m *UpdateVariantSetRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateVariantSetRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -970,39 +1310,61 @@ type SearchVariantsRequest struct {
 	// At most one variant set ID must be provided. Only variants from this
 	// variant set will be returned. If omitted, a call set id must be included in
 	// the request.
-	VariantSetIds []string `protobuf:"bytes,1,rep,name=variant_set_ids,json=variantSetIds" json:"variant_set_ids,omitempty"`
+	VariantSetIds []string `protobuf:"bytes,1,rep,name=variant_set_ids,json=variantSetIds,proto3" json:"variant_set_ids,omitempty"`
 	// Only return variants which have exactly this name.
-	VariantName string `protobuf:"bytes,2,opt,name=variant_name,json=variantName" json:"variant_name,omitempty"`
+	VariantName string `protobuf:"bytes,2,opt,name=variant_name,json=variantName,proto3" json:"variant_name,omitempty"`
 	// Only return variant calls which belong to call sets with these ids.
 	// Leaving this blank returns all variant calls. If a variant has no
 	// calls belonging to any of these call sets, it won't be returned at all.
-	CallSetIds []string `protobuf:"bytes,3,rep,name=call_set_ids,json=callSetIds" json:"call_set_ids,omitempty"`
+	CallSetIds []string `protobuf:"bytes,3,rep,name=call_set_ids,json=callSetIds,proto3" json:"call_set_ids,omitempty"`
 	// Required. Only return variants in this reference sequence.
-	ReferenceName string `protobuf:"bytes,4,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,4,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The beginning of the window (0-based, inclusive) for which
 	// overlapping variants should be returned. If unspecified, defaults to 0.
-	Start int64 `protobuf:"varint,5,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,5,opt,name=start,proto3" json:"start,omitempty"`
 	// The end of the window, 0-based exclusive. If unspecified or 0, defaults to
 	// the length of the reference.
-	End int64 `protobuf:"varint,6,opt,name=end" json:"end,omitempty"`
+	End int64 `protobuf:"varint,6,opt,name=end,proto3" json:"end,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,7,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,7,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of variants to return in a single page. If unspecified,
 	// defaults to 5000. The maximum value is 10000.
-	PageSize int32 `protobuf:"varint,8,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,8,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The maximum number of calls to return in a single page. Note that this
 	// limit may be exceeded in the event that a matching variant contains more
 	// calls than the requested maximum. If unspecified, defaults to 5000. The
 	// maximum value is 10000.
-	MaxCalls int32 `protobuf:"varint,9,opt,name=max_calls,json=maxCalls" json:"max_calls,omitempty"`
+	MaxCalls             int32    `protobuf:"varint,9,opt,name=max_calls,json=maxCalls,proto3" json:"max_calls,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchVariantsRequest) Reset()         { *m = SearchVariantsRequest{} }
+func (m *SearchVariantsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchVariantsRequest) ProtoMessage()    {}
+func (*SearchVariantsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{15}
+}
+func (m *SearchVariantsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchVariantsRequest.Unmarshal(m, b)
+}
+func (m *SearchVariantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchVariantsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchVariantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchVariantsRequest.Merge(dst, src)
+}
+func (m *SearchVariantsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchVariantsRequest.Size(m)
+}
+func (m *SearchVariantsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchVariantsRequest.DiscardUnknown(m)
 }
 
-func (m *SearchVariantsRequest) Reset()                    { *m = SearchVariantsRequest{} }
-func (m *SearchVariantsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchVariantsRequest) ProtoMessage()               {}
-func (*SearchVariantsRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{15} }
+var xxx_messageInfo_SearchVariantsRequest proto.InternalMessageInfo
 
 func (m *SearchVariantsRequest) GetVariantSetIds() []string {
 	if m != nil {
@@ -1070,17 +1432,39 @@ func (m *SearchVariantsRequest) GetMaxCalls() int32 {
 // The variant search response.
 type SearchVariantsResponse struct {
 	// The list of matching Variants.
-	Variants []*Variant `protobuf:"bytes,1,rep,name=variants" json:"variants,omitempty"`
+	Variants []*Variant `protobuf:"bytes,1,rep,name=variants,proto3" json:"variants,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchVariantsResponse) Reset()         { *m = SearchVariantsResponse{} }
+func (m *SearchVariantsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchVariantsResponse) ProtoMessage()    {}
+func (*SearchVariantsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{16}
+}
+func (m *SearchVariantsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchVariantsResponse.Unmarshal(m, b)
+}
+func (m *SearchVariantsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchVariantsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchVariantsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchVariantsResponse.Merge(dst, src)
+}
+func (m *SearchVariantsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchVariantsResponse.Size(m)
+}
+func (m *SearchVariantsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchVariantsResponse.DiscardUnknown(m)
 }
 
-func (m *SearchVariantsResponse) Reset()                    { *m = SearchVariantsResponse{} }
-func (m *SearchVariantsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchVariantsResponse) ProtoMessage()               {}
-func (*SearchVariantsResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{16} }
+var xxx_messageInfo_SearchVariantsResponse proto.InternalMessageInfo
 
 func (m *SearchVariantsResponse) GetVariants() []*Variant {
 	if m != nil {
@@ -1098,13 +1482,35 @@ func (m *SearchVariantsResponse) GetNextPageToken() string {
 
 type CreateVariantRequest struct {
 	// The variant to be created.
-	Variant *Variant `protobuf:"bytes,1,opt,name=variant" json:"variant,omitempty"`
+	Variant              *Variant `protobuf:"bytes,1,opt,name=variant,proto3" json:"variant,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateVariantRequest) Reset()         { *m = CreateVariantRequest{} }
+func (m *CreateVariantRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateVariantRequest) ProtoMessage()    {}
+func (*CreateVariantRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{17}
+}
+func (m *CreateVariantRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateVariantRequest.Unmarshal(m, b)
+}
+func (m *CreateVariantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateVariantRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateVariantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateVariantRequest.Merge(dst, src)
+}
+func (m *CreateVariantRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateVariantRequest.Size(m)
+}
+func (m *CreateVariantRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateVariantRequest.DiscardUnknown(m)
 }
 
-func (m *CreateVariantRequest) Reset()                    { *m = CreateVariantRequest{} }
-func (m *CreateVariantRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateVariantRequest) ProtoMessage()               {}
-func (*CreateVariantRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{17} }
+var xxx_messageInfo_CreateVariantRequest proto.InternalMessageInfo
 
 func (m *CreateVariantRequest) GetVariant() *Variant {
 	if m != nil {
@@ -1115,20 +1521,42 @@ func (m *CreateVariantRequest) GetVariant() *Variant {
 
 type UpdateVariantRequest struct {
 	// The ID of the variant to be updated.
-	VariantId string `protobuf:"bytes,1,opt,name=variant_id,json=variantId" json:"variant_id,omitempty"`
+	VariantId string `protobuf:"bytes,1,opt,name=variant_id,json=variantId,proto3" json:"variant_id,omitempty"`
 	// The new variant data.
-	Variant *Variant `protobuf:"bytes,2,opt,name=variant" json:"variant,omitempty"`
+	Variant *Variant `protobuf:"bytes,2,opt,name=variant,proto3" json:"variant,omitempty"`
 	// An optional mask specifying which fields to update. At this time, mutable
 	// fields are [names][google.genomics.v1.Variant.names] and
 	// [info][google.genomics.v1.Variant.info]. Acceptable values are "names" and
 	// "info". If unspecified, all mutable fields will be updated.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateVariantRequest) Reset()         { *m = UpdateVariantRequest{} }
+func (m *UpdateVariantRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateVariantRequest) ProtoMessage()    {}
+func (*UpdateVariantRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{18}
+}
+func (m *UpdateVariantRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateVariantRequest.Unmarshal(m, b)
+}
+func (m *UpdateVariantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateVariantRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateVariantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateVariantRequest.Merge(dst, src)
+}
+func (m *UpdateVariantRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateVariantRequest.Size(m)
+}
+func (m *UpdateVariantRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateVariantRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateVariantRequest) Reset()                    { *m = UpdateVariantRequest{} }
-func (m *UpdateVariantRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateVariantRequest) ProtoMessage()               {}
-func (*UpdateVariantRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{18} }
+var xxx_messageInfo_UpdateVariantRequest proto.InternalMessageInfo
 
 func (m *UpdateVariantRequest) GetVariantId() string {
 	if m != nil {
@@ -1144,7 +1572,7 @@ func (m *UpdateVariantRequest) GetVariant() *Variant {
 	return nil
 }
 
-func (m *UpdateVariantRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateVariantRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1153,13 +1581,35 @@ func (m *UpdateVariantRequest) GetUpdateMask() *google_protobuf2.FieldMask {
 
 type DeleteVariantRequest struct {
 	// The ID of the variant to be deleted.
-	VariantId string `protobuf:"bytes,1,opt,name=variant_id,json=variantId" json:"variant_id,omitempty"`
+	VariantId            string   `protobuf:"bytes,1,opt,name=variant_id,json=variantId,proto3" json:"variant_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteVariantRequest) Reset()         { *m = DeleteVariantRequest{} }
+func (m *DeleteVariantRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteVariantRequest) ProtoMessage()    {}
+func (*DeleteVariantRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{19}
+}
+func (m *DeleteVariantRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteVariantRequest.Unmarshal(m, b)
+}
+func (m *DeleteVariantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteVariantRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteVariantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteVariantRequest.Merge(dst, src)
+}
+func (m *DeleteVariantRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteVariantRequest.Size(m)
+}
+func (m *DeleteVariantRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteVariantRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteVariantRequest) Reset()                    { *m = DeleteVariantRequest{} }
-func (m *DeleteVariantRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteVariantRequest) ProtoMessage()               {}
-func (*DeleteVariantRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{19} }
+var xxx_messageInfo_DeleteVariantRequest proto.InternalMessageInfo
 
 func (m *DeleteVariantRequest) GetVariantId() string {
 	if m != nil {
@@ -1170,13 +1620,35 @@ func (m *DeleteVariantRequest) GetVariantId() string {
 
 type GetVariantRequest struct {
 	// The ID of the variant.
-	VariantId string `protobuf:"bytes,1,opt,name=variant_id,json=variantId" json:"variant_id,omitempty"`
+	VariantId            string   `protobuf:"bytes,1,opt,name=variant_id,json=variantId,proto3" json:"variant_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetVariantRequest) Reset()         { *m = GetVariantRequest{} }
+func (m *GetVariantRequest) String() string { return proto.CompactTextString(m) }
+func (*GetVariantRequest) ProtoMessage()    {}
+func (*GetVariantRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{20}
+}
+func (m *GetVariantRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetVariantRequest.Unmarshal(m, b)
+}
+func (m *GetVariantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetVariantRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetVariantRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetVariantRequest.Merge(dst, src)
+}
+func (m *GetVariantRequest) XXX_Size() int {
+	return xxx_messageInfo_GetVariantRequest.Size(m)
+}
+func (m *GetVariantRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetVariantRequest.DiscardUnknown(m)
 }
 
-func (m *GetVariantRequest) Reset()                    { *m = GetVariantRequest{} }
-func (m *GetVariantRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetVariantRequest) ProtoMessage()               {}
-func (*GetVariantRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{20} }
+var xxx_messageInfo_GetVariantRequest proto.InternalMessageInfo
 
 func (m *GetVariantRequest) GetVariantId() string {
 	if m != nil {
@@ -1187,18 +1659,40 @@ func (m *GetVariantRequest) GetVariantId() string {
 
 type MergeVariantsRequest struct {
 	// The destination variant set.
-	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId" json:"variant_set_id,omitempty"`
+	VariantSetId string `protobuf:"bytes,1,opt,name=variant_set_id,json=variantSetId,proto3" json:"variant_set_id,omitempty"`
 	// The variants to be merged with existing variants.
-	Variants []*Variant `protobuf:"bytes,2,rep,name=variants" json:"variants,omitempty"`
+	Variants []*Variant `protobuf:"bytes,2,rep,name=variants,proto3" json:"variants,omitempty"`
 	// A mapping between info field keys and the InfoMergeOperations to
 	// be performed on them.
-	InfoMergeConfig map[string]InfoMergeOperation `protobuf:"bytes,3,rep,name=info_merge_config,json=infoMergeConfig" json:"info_merge_config,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.genomics.v1.InfoMergeOperation"`
+	InfoMergeConfig      map[string]InfoMergeOperation `protobuf:"bytes,3,rep,name=info_merge_config,json=infoMergeConfig,proto3" json:"info_merge_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=google.genomics.v1.InfoMergeOperation"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *MergeVariantsRequest) Reset()         { *m = MergeVariantsRequest{} }
+func (m *MergeVariantsRequest) String() string { return proto.CompactTextString(m) }
+func (*MergeVariantsRequest) ProtoMessage()    {}
+func (*MergeVariantsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{21}
+}
+func (m *MergeVariantsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MergeVariantsRequest.Unmarshal(m, b)
+}
+func (m *MergeVariantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MergeVariantsRequest.Marshal(b, m, deterministic)
+}
+func (dst *MergeVariantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MergeVariantsRequest.Merge(dst, src)
+}
+func (m *MergeVariantsRequest) XXX_Size() int {
+	return xxx_messageInfo_MergeVariantsRequest.Size(m)
+}
+func (m *MergeVariantsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MergeVariantsRequest.DiscardUnknown(m)
 }
 
-func (m *MergeVariantsRequest) Reset()                    { *m = MergeVariantsRequest{} }
-func (m *MergeVariantsRequest) String() string            { return proto.CompactTextString(m) }
-func (*MergeVariantsRequest) ProtoMessage()               {}
-func (*MergeVariantsRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{21} }
+var xxx_messageInfo_MergeVariantsRequest proto.InternalMessageInfo
 
 func (m *MergeVariantsRequest) GetVariantSetId() string {
 	if m != nil {
@@ -1225,23 +1719,45 @@ func (m *MergeVariantsRequest) GetInfoMergeConfig() map[string]InfoMergeOperatio
 type SearchCallSetsRequest struct {
 	// Restrict the query to call sets within the given variant sets. At least one
 	// ID must be provided.
-	VariantSetIds []string `protobuf:"bytes,1,rep,name=variant_set_ids,json=variantSetIds" json:"variant_set_ids,omitempty"`
+	VariantSetIds []string `protobuf:"bytes,1,rep,name=variant_set_ids,json=variantSetIds,proto3" json:"variant_set_ids,omitempty"`
 	// Only return call sets for which a substring of the name matches this
 	// string.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// To get the next page of results, set this parameter to the value of
 	// `nextPageToken` from the previous response.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The maximum number of results to return in a single page. If unspecified,
 	// defaults to 1024.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchCallSetsRequest) Reset()         { *m = SearchCallSetsRequest{} }
+func (m *SearchCallSetsRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchCallSetsRequest) ProtoMessage()    {}
+func (*SearchCallSetsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{22}
+}
+func (m *SearchCallSetsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchCallSetsRequest.Unmarshal(m, b)
+}
+func (m *SearchCallSetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchCallSetsRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchCallSetsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchCallSetsRequest.Merge(dst, src)
+}
+func (m *SearchCallSetsRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchCallSetsRequest.Size(m)
+}
+func (m *SearchCallSetsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchCallSetsRequest.DiscardUnknown(m)
 }
 
-func (m *SearchCallSetsRequest) Reset()                    { *m = SearchCallSetsRequest{} }
-func (m *SearchCallSetsRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchCallSetsRequest) ProtoMessage()               {}
-func (*SearchCallSetsRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{22} }
+var xxx_messageInfo_SearchCallSetsRequest proto.InternalMessageInfo
 
 func (m *SearchCallSetsRequest) GetVariantSetIds() []string {
 	if m != nil {
@@ -1274,17 +1790,39 @@ func (m *SearchCallSetsRequest) GetPageSize() int32 {
 // The call set search response.
 type SearchCallSetsResponse struct {
 	// The list of matching call sets.
-	CallSets []*CallSet `protobuf:"bytes,1,rep,name=call_sets,json=callSets" json:"call_sets,omitempty"`
+	CallSets []*CallSet `protobuf:"bytes,1,rep,name=call_sets,json=callSets,proto3" json:"call_sets,omitempty"`
 	// The continuation token, which is used to page through large result sets.
 	// Provide this value in a subsequent request to return the next page of
 	// results. This field will be empty if there aren't any additional results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchCallSetsResponse) Reset()                    { *m = SearchCallSetsResponse{} }
-func (m *SearchCallSetsResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchCallSetsResponse) ProtoMessage()               {}
-func (*SearchCallSetsResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{23} }
+func (m *SearchCallSetsResponse) Reset()         { *m = SearchCallSetsResponse{} }
+func (m *SearchCallSetsResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchCallSetsResponse) ProtoMessage()    {}
+func (*SearchCallSetsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{23}
+}
+func (m *SearchCallSetsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchCallSetsResponse.Unmarshal(m, b)
+}
+func (m *SearchCallSetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchCallSetsResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchCallSetsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchCallSetsResponse.Merge(dst, src)
+}
+func (m *SearchCallSetsResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchCallSetsResponse.Size(m)
+}
+func (m *SearchCallSetsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchCallSetsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchCallSetsResponse proto.InternalMessageInfo
 
 func (m *SearchCallSetsResponse) GetCallSets() []*CallSet {
 	if m != nil {
@@ -1302,13 +1840,35 @@ func (m *SearchCallSetsResponse) GetNextPageToken() string {
 
 type CreateCallSetRequest struct {
 	// The call set to be created.
-	CallSet *CallSet `protobuf:"bytes,1,opt,name=call_set,json=callSet" json:"call_set,omitempty"`
+	CallSet              *CallSet `protobuf:"bytes,1,opt,name=call_set,json=callSet,proto3" json:"call_set,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateCallSetRequest) Reset()         { *m = CreateCallSetRequest{} }
+func (m *CreateCallSetRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateCallSetRequest) ProtoMessage()    {}
+func (*CreateCallSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{24}
+}
+func (m *CreateCallSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateCallSetRequest.Unmarshal(m, b)
+}
+func (m *CreateCallSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateCallSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateCallSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateCallSetRequest.Merge(dst, src)
+}
+func (m *CreateCallSetRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateCallSetRequest.Size(m)
+}
+func (m *CreateCallSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateCallSetRequest.DiscardUnknown(m)
 }
 
-func (m *CreateCallSetRequest) Reset()                    { *m = CreateCallSetRequest{} }
-func (m *CreateCallSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateCallSetRequest) ProtoMessage()               {}
-func (*CreateCallSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{24} }
+var xxx_messageInfo_CreateCallSetRequest proto.InternalMessageInfo
 
 func (m *CreateCallSetRequest) GetCallSet() *CallSet {
 	if m != nil {
@@ -1319,20 +1879,42 @@ func (m *CreateCallSetRequest) GetCallSet() *CallSet {
 
 type UpdateCallSetRequest struct {
 	// The ID of the call set to be updated.
-	CallSetId string `protobuf:"bytes,1,opt,name=call_set_id,json=callSetId" json:"call_set_id,omitempty"`
+	CallSetId string `protobuf:"bytes,1,opt,name=call_set_id,json=callSetId,proto3" json:"call_set_id,omitempty"`
 	// The new call set data.
-	CallSet *CallSet `protobuf:"bytes,2,opt,name=call_set,json=callSet" json:"call_set,omitempty"`
+	CallSet *CallSet `protobuf:"bytes,2,opt,name=call_set,json=callSet,proto3" json:"call_set,omitempty"`
 	// An optional mask specifying which fields to update. At this time, the only
 	// mutable field is [name][google.genomics.v1.CallSet.name]. The only
 	// acceptable value is "name". If unspecified, all mutable fields will be
 	// updated.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateCallSetRequest) Reset()         { *m = UpdateCallSetRequest{} }
+func (m *UpdateCallSetRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateCallSetRequest) ProtoMessage()    {}
+func (*UpdateCallSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{25}
+}
+func (m *UpdateCallSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateCallSetRequest.Unmarshal(m, b)
+}
+func (m *UpdateCallSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateCallSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateCallSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateCallSetRequest.Merge(dst, src)
+}
+func (m *UpdateCallSetRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateCallSetRequest.Size(m)
+}
+func (m *UpdateCallSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateCallSetRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateCallSetRequest) Reset()                    { *m = UpdateCallSetRequest{} }
-func (m *UpdateCallSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateCallSetRequest) ProtoMessage()               {}
-func (*UpdateCallSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{25} }
+var xxx_messageInfo_UpdateCallSetRequest proto.InternalMessageInfo
 
 func (m *UpdateCallSetRequest) GetCallSetId() string {
 	if m != nil {
@@ -1348,7 +1930,7 @@ func (m *UpdateCallSetRequest) GetCallSet() *CallSet {
 	return nil
 }
 
-func (m *UpdateCallSetRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateCallSetRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1357,13 +1939,35 @@ func (m *UpdateCallSetRequest) GetUpdateMask() *google_protobuf2.FieldMask {
 
 type DeleteCallSetRequest struct {
 	// The ID of the call set to be deleted.
-	CallSetId string `protobuf:"bytes,1,opt,name=call_set_id,json=callSetId" json:"call_set_id,omitempty"`
+	CallSetId            string   `protobuf:"bytes,1,opt,name=call_set_id,json=callSetId,proto3" json:"call_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteCallSetRequest) Reset()         { *m = DeleteCallSetRequest{} }
+func (m *DeleteCallSetRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteCallSetRequest) ProtoMessage()    {}
+func (*DeleteCallSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{26}
+}
+func (m *DeleteCallSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteCallSetRequest.Unmarshal(m, b)
+}
+func (m *DeleteCallSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteCallSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteCallSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteCallSetRequest.Merge(dst, src)
+}
+func (m *DeleteCallSetRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteCallSetRequest.Size(m)
+}
+func (m *DeleteCallSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteCallSetRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteCallSetRequest) Reset()                    { *m = DeleteCallSetRequest{} }
-func (m *DeleteCallSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteCallSetRequest) ProtoMessage()               {}
-func (*DeleteCallSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{26} }
+var xxx_messageInfo_DeleteCallSetRequest proto.InternalMessageInfo
 
 func (m *DeleteCallSetRequest) GetCallSetId() string {
 	if m != nil {
@@ -1374,13 +1978,35 @@ func (m *DeleteCallSetRequest) GetCallSetId() string {
 
 type GetCallSetRequest struct {
 	// The ID of the call set.
-	CallSetId string `protobuf:"bytes,1,opt,name=call_set_id,json=callSetId" json:"call_set_id,omitempty"`
+	CallSetId            string   `protobuf:"bytes,1,opt,name=call_set_id,json=callSetId,proto3" json:"call_set_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetCallSetRequest) Reset()                    { *m = GetCallSetRequest{} }
-func (m *GetCallSetRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetCallSetRequest) ProtoMessage()               {}
-func (*GetCallSetRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{27} }
+func (m *GetCallSetRequest) Reset()         { *m = GetCallSetRequest{} }
+func (m *GetCallSetRequest) String() string { return proto.CompactTextString(m) }
+func (*GetCallSetRequest) ProtoMessage()    {}
+func (*GetCallSetRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{27}
+}
+func (m *GetCallSetRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetCallSetRequest.Unmarshal(m, b)
+}
+func (m *GetCallSetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetCallSetRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetCallSetRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetCallSetRequest.Merge(dst, src)
+}
+func (m *GetCallSetRequest) XXX_Size() int {
+	return xxx_messageInfo_GetCallSetRequest.Size(m)
+}
+func (m *GetCallSetRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetCallSetRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetCallSetRequest proto.InternalMessageInfo
 
 func (m *GetCallSetRequest) GetCallSetId() string {
 	if m != nil {
@@ -1394,26 +2020,48 @@ type StreamVariantsRequest struct {
 	// The Google Cloud project ID which will be billed
 	// for this access. The caller must have WRITE access to this project.
 	// Required.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The variant set ID from which to stream variants.
-	VariantSetId string `protobuf:"bytes,2,opt,name=variant_set_id,json=variantSetId" json:"variant_set_id,omitempty"`
+	VariantSetId string `protobuf:"bytes,2,opt,name=variant_set_id,json=variantSetId,proto3" json:"variant_set_id,omitempty"`
 	// Only return variant calls which belong to call sets with these IDs.
 	// Leaving this blank returns all variant calls.
-	CallSetIds []string `protobuf:"bytes,3,rep,name=call_set_ids,json=callSetIds" json:"call_set_ids,omitempty"`
+	CallSetIds []string `protobuf:"bytes,3,rep,name=call_set_ids,json=callSetIds,proto3" json:"call_set_ids,omitempty"`
 	// Required. Only return variants in this reference sequence.
-	ReferenceName string `protobuf:"bytes,4,opt,name=reference_name,json=referenceName" json:"reference_name,omitempty"`
+	ReferenceName string `protobuf:"bytes,4,opt,name=reference_name,json=referenceName,proto3" json:"reference_name,omitempty"`
 	// The beginning of the window (0-based, inclusive) for which
 	// overlapping variants should be returned.
-	Start int64 `protobuf:"varint,5,opt,name=start" json:"start,omitempty"`
+	Start int64 `protobuf:"varint,5,opt,name=start,proto3" json:"start,omitempty"`
 	// The end of the window (0-based, exclusive) for which overlapping
 	// variants should be returned.
-	End int64 `protobuf:"varint,6,opt,name=end" json:"end,omitempty"`
+	End                  int64    `protobuf:"varint,6,opt,name=end,proto3" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamVariantsRequest) Reset()         { *m = StreamVariantsRequest{} }
+func (m *StreamVariantsRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamVariantsRequest) ProtoMessage()    {}
+func (*StreamVariantsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{28}
+}
+func (m *StreamVariantsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamVariantsRequest.Unmarshal(m, b)
+}
+func (m *StreamVariantsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamVariantsRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamVariantsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamVariantsRequest.Merge(dst, src)
+}
+func (m *StreamVariantsRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamVariantsRequest.Size(m)
+}
+func (m *StreamVariantsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamVariantsRequest.DiscardUnknown(m)
 }
 
-func (m *StreamVariantsRequest) Reset()                    { *m = StreamVariantsRequest{} }
-func (m *StreamVariantsRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamVariantsRequest) ProtoMessage()               {}
-func (*StreamVariantsRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{28} }
+var xxx_messageInfo_StreamVariantsRequest proto.InternalMessageInfo
 
 func (m *StreamVariantsRequest) GetProjectId() string {
 	if m != nil {
@@ -1458,13 +2106,35 @@ func (m *StreamVariantsRequest) GetEnd() int64 {
 }
 
 type StreamVariantsResponse struct {
-	Variants []*Variant `protobuf:"bytes,1,rep,name=variants" json:"variants,omitempty"`
+	Variants             []*Variant `protobuf:"bytes,1,rep,name=variants,proto3" json:"variants,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *StreamVariantsResponse) Reset()                    { *m = StreamVariantsResponse{} }
-func (m *StreamVariantsResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamVariantsResponse) ProtoMessage()               {}
-func (*StreamVariantsResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{29} }
+func (m *StreamVariantsResponse) Reset()         { *m = StreamVariantsResponse{} }
+func (m *StreamVariantsResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamVariantsResponse) ProtoMessage()    {}
+func (*StreamVariantsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_variants_8662afc4dcc7ac11, []int{29}
+}
+func (m *StreamVariantsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamVariantsResponse.Unmarshal(m, b)
+}
+func (m *StreamVariantsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamVariantsResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamVariantsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamVariantsResponse.Merge(dst, src)
+}
+func (m *StreamVariantsResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamVariantsResponse.Size(m)
+}
+func (m *StreamVariantsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamVariantsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamVariantsResponse proto.InternalMessageInfo
 
 func (m *StreamVariantsResponse) GetVariants() []*Variant {
 	if m != nil {
@@ -1475,12 +2145,17 @@ func (m *StreamVariantsResponse) GetVariants() []*Variant {
 
 func init() {
 	proto.RegisterType((*VariantSetMetadata)(nil), "google.genomics.v1.VariantSetMetadata")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.VariantSetMetadata.InfoEntry")
 	proto.RegisterType((*VariantSet)(nil), "google.genomics.v1.VariantSet")
 	proto.RegisterType((*Variant)(nil), "google.genomics.v1.Variant")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.Variant.InfoEntry")
 	proto.RegisterType((*VariantCall)(nil), "google.genomics.v1.VariantCall")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.VariantCall.InfoEntry")
 	proto.RegisterType((*CallSet)(nil), "google.genomics.v1.CallSet")
+	proto.RegisterMapType((map[string]*_struct.ListValue)(nil), "google.genomics.v1.CallSet.InfoEntry")
 	proto.RegisterType((*ReferenceBound)(nil), "google.genomics.v1.ReferenceBound")
 	proto.RegisterType((*ImportVariantsRequest)(nil), "google.genomics.v1.ImportVariantsRequest")
+	proto.RegisterMapType((map[string]InfoMergeOperation)(nil), "google.genomics.v1.ImportVariantsRequest.InfoMergeConfigEntry")
 	proto.RegisterType((*ImportVariantsResponse)(nil), "google.genomics.v1.ImportVariantsResponse")
 	proto.RegisterType((*CreateVariantSetRequest)(nil), "google.genomics.v1.CreateVariantSetRequest")
 	proto.RegisterType((*ExportVariantSetRequest)(nil), "google.genomics.v1.ExportVariantSetRequest")
@@ -1496,6 +2171,7 @@ func init() {
 	proto.RegisterType((*DeleteVariantRequest)(nil), "google.genomics.v1.DeleteVariantRequest")
 	proto.RegisterType((*GetVariantRequest)(nil), "google.genomics.v1.GetVariantRequest")
 	proto.RegisterType((*MergeVariantsRequest)(nil), "google.genomics.v1.MergeVariantsRequest")
+	proto.RegisterMapType((map[string]InfoMergeOperation)(nil), "google.genomics.v1.MergeVariantsRequest.InfoMergeConfigEntry")
 	proto.RegisterType((*SearchCallSetsRequest)(nil), "google.genomics.v1.SearchCallSetsRequest")
 	proto.RegisterType((*SearchCallSetsResponse)(nil), "google.genomics.v1.SearchCallSetsResponse")
 	proto.RegisterType((*CreateCallSetRequest)(nil), "google.genomics.v1.CreateCallSetRequest")
@@ -1518,8 +2194,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for StreamingVariantService service
-
+// StreamingVariantServiceClient is the client API for StreamingVariantService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type StreamingVariantServiceClient interface {
 	// Returns a stream of all the variants matching the search request, ordered
 	// by reference name, position, and ID.
@@ -1535,7 +2212,7 @@ func NewStreamingVariantServiceClient(cc *grpc.ClientConn) StreamingVariantServi
 }
 
 func (c *streamingVariantServiceClient) StreamVariants(ctx context.Context, in *StreamVariantsRequest, opts ...grpc.CallOption) (StreamingVariantService_StreamVariantsClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_StreamingVariantService_serviceDesc.Streams[0], c.cc, "/google.genomics.v1.StreamingVariantService/StreamVariants", opts...)
+	stream, err := c.cc.NewStream(ctx, &_StreamingVariantService_serviceDesc.Streams[0], "/google.genomics.v1.StreamingVariantService/StreamVariants", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1566,8 +2243,7 @@ func (x *streamingVariantServiceStreamVariantsClient) Recv() (*StreamVariantsRes
 	return m, nil
 }
 
-// Server API for StreamingVariantService service
-
+// StreamingVariantServiceServer is the server API for StreamingVariantService service.
 type StreamingVariantServiceServer interface {
 	// Returns a stream of all the variants matching the search request, ordered
 	// by reference name, position, and ID.
@@ -1613,8 +2289,9 @@ var _StreamingVariantService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/genomics/v1/variants.proto",
 }
 
-// Client API for VariantServiceV1 service
-
+// VariantServiceV1Client is the client API for VariantServiceV1 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VariantServiceV1Client interface {
 	// Creates variant data by asynchronously importing the provided information.
 	//
@@ -1634,7 +2311,7 @@ type VariantServiceV1Client interface {
 	// be moved to the call level; these are sometimes interpreted in a
 	// call-specific context.
 	// Imported VCF headers are appended to the metadata already in a variant set.
-	ImportVariants(ctx context.Context, in *ImportVariantsRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	ImportVariants(ctx context.Context, in *ImportVariantsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Creates a new variant set.
 	//
 	// For the definitions of variant sets and other genomics resources, see
@@ -1650,7 +2327,7 @@ type VariantServiceV1Client interface {
 	// For the definitions of variant sets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	ExportVariantSet(ctx context.Context, in *ExportVariantSetRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	ExportVariantSet(ctx context.Context, in *ExportVariantSetRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Gets a variant set by ID.
 	//
 	// For the definitions of variant sets and other genomics resources, see
@@ -1672,7 +2349,7 @@ type VariantServiceV1Client interface {
 	// For the definitions of variant sets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteVariantSet(ctx context.Context, in *DeleteVariantSetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteVariantSet(ctx context.Context, in *DeleteVariantSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Updates a variant set using patch semantics.
 	//
 	// For the definitions of variant sets and other genomics resources, see
@@ -1708,7 +2385,7 @@ type VariantServiceV1Client interface {
 	// For the definitions of variants and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteVariant(ctx context.Context, in *DeleteVariantRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteVariant(ctx context.Context, in *DeleteVariantRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Gets a variant by ID.
 	//
 	// For the definitions of variants and other genomics resources, see
@@ -1806,7 +2483,7 @@ type VariantServiceV1Client interface {
 	//
 	// This may be the desired outcome, but it is up to the user to determine if
 	// if that is indeed the case.
-	MergeVariants(ctx context.Context, in *MergeVariantsRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	MergeVariants(ctx context.Context, in *MergeVariantsRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Gets a list of call sets matching the criteria.
 	//
 	// For the definitions of call sets and other genomics resources, see
@@ -1835,7 +2512,7 @@ type VariantServiceV1Client interface {
 	// For the definitions of call sets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteCallSet(ctx context.Context, in *DeleteCallSetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteCallSet(ctx context.Context, in *DeleteCallSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Gets a call set by ID.
 	//
 	// For the definitions of call sets and other genomics resources, see
@@ -1852,9 +2529,9 @@ func NewVariantServiceV1Client(cc *grpc.ClientConn) VariantServiceV1Client {
 	return &variantServiceV1Client{cc}
 }
 
-func (c *variantServiceV1Client) ImportVariants(ctx context.Context, in *ImportVariantsRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/ImportVariants", in, out, c.cc, opts...)
+func (c *variantServiceV1Client) ImportVariants(ctx context.Context, in *ImportVariantsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/ImportVariants", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1863,16 +2540,16 @@ func (c *variantServiceV1Client) ImportVariants(ctx context.Context, in *ImportV
 
 func (c *variantServiceV1Client) CreateVariantSet(ctx context.Context, in *CreateVariantSetRequest, opts ...grpc.CallOption) (*VariantSet, error) {
 	out := new(VariantSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/CreateVariantSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/CreateVariantSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *variantServiceV1Client) ExportVariantSet(ctx context.Context, in *ExportVariantSetRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/ExportVariantSet", in, out, c.cc, opts...)
+func (c *variantServiceV1Client) ExportVariantSet(ctx context.Context, in *ExportVariantSetRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/ExportVariantSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1881,7 +2558,7 @@ func (c *variantServiceV1Client) ExportVariantSet(ctx context.Context, in *Expor
 
 func (c *variantServiceV1Client) GetVariantSet(ctx context.Context, in *GetVariantSetRequest, opts ...grpc.CallOption) (*VariantSet, error) {
 	out := new(VariantSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/GetVariantSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/GetVariantSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1890,16 +2567,16 @@ func (c *variantServiceV1Client) GetVariantSet(ctx context.Context, in *GetVaria
 
 func (c *variantServiceV1Client) SearchVariantSets(ctx context.Context, in *SearchVariantSetsRequest, opts ...grpc.CallOption) (*SearchVariantSetsResponse, error) {
 	out := new(SearchVariantSetsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/SearchVariantSets", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/SearchVariantSets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *variantServiceV1Client) DeleteVariantSet(ctx context.Context, in *DeleteVariantSetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/DeleteVariantSet", in, out, c.cc, opts...)
+func (c *variantServiceV1Client) DeleteVariantSet(ctx context.Context, in *DeleteVariantSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/DeleteVariantSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1908,7 +2585,7 @@ func (c *variantServiceV1Client) DeleteVariantSet(ctx context.Context, in *Delet
 
 func (c *variantServiceV1Client) UpdateVariantSet(ctx context.Context, in *UpdateVariantSetRequest, opts ...grpc.CallOption) (*VariantSet, error) {
 	out := new(VariantSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/UpdateVariantSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/UpdateVariantSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1917,7 +2594,7 @@ func (c *variantServiceV1Client) UpdateVariantSet(ctx context.Context, in *Updat
 
 func (c *variantServiceV1Client) SearchVariants(ctx context.Context, in *SearchVariantsRequest, opts ...grpc.CallOption) (*SearchVariantsResponse, error) {
 	out := new(SearchVariantsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/SearchVariants", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/SearchVariants", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1926,7 +2603,7 @@ func (c *variantServiceV1Client) SearchVariants(ctx context.Context, in *SearchV
 
 func (c *variantServiceV1Client) CreateVariant(ctx context.Context, in *CreateVariantRequest, opts ...grpc.CallOption) (*Variant, error) {
 	out := new(Variant)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/CreateVariant", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/CreateVariant", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1935,16 +2612,16 @@ func (c *variantServiceV1Client) CreateVariant(ctx context.Context, in *CreateVa
 
 func (c *variantServiceV1Client) UpdateVariant(ctx context.Context, in *UpdateVariantRequest, opts ...grpc.CallOption) (*Variant, error) {
 	out := new(Variant)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/UpdateVariant", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/UpdateVariant", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *variantServiceV1Client) DeleteVariant(ctx context.Context, in *DeleteVariantRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/DeleteVariant", in, out, c.cc, opts...)
+func (c *variantServiceV1Client) DeleteVariant(ctx context.Context, in *DeleteVariantRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/DeleteVariant", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1953,16 +2630,16 @@ func (c *variantServiceV1Client) DeleteVariant(ctx context.Context, in *DeleteVa
 
 func (c *variantServiceV1Client) GetVariant(ctx context.Context, in *GetVariantRequest, opts ...grpc.CallOption) (*Variant, error) {
 	out := new(Variant)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/GetVariant", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/GetVariant", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *variantServiceV1Client) MergeVariants(ctx context.Context, in *MergeVariantsRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/MergeVariants", in, out, c.cc, opts...)
+func (c *variantServiceV1Client) MergeVariants(ctx context.Context, in *MergeVariantsRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/MergeVariants", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1971,7 +2648,7 @@ func (c *variantServiceV1Client) MergeVariants(ctx context.Context, in *MergeVar
 
 func (c *variantServiceV1Client) SearchCallSets(ctx context.Context, in *SearchCallSetsRequest, opts ...grpc.CallOption) (*SearchCallSetsResponse, error) {
 	out := new(SearchCallSetsResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/SearchCallSets", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/SearchCallSets", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1980,7 +2657,7 @@ func (c *variantServiceV1Client) SearchCallSets(ctx context.Context, in *SearchC
 
 func (c *variantServiceV1Client) CreateCallSet(ctx context.Context, in *CreateCallSetRequest, opts ...grpc.CallOption) (*CallSet, error) {
 	out := new(CallSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/CreateCallSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/CreateCallSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1989,16 +2666,16 @@ func (c *variantServiceV1Client) CreateCallSet(ctx context.Context, in *CreateCa
 
 func (c *variantServiceV1Client) UpdateCallSet(ctx context.Context, in *UpdateCallSetRequest, opts ...grpc.CallOption) (*CallSet, error) {
 	out := new(CallSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/UpdateCallSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/UpdateCallSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *variantServiceV1Client) DeleteCallSet(ctx context.Context, in *DeleteCallSetRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/DeleteCallSet", in, out, c.cc, opts...)
+func (c *variantServiceV1Client) DeleteCallSet(ctx context.Context, in *DeleteCallSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/DeleteCallSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2007,15 +2684,14 @@ func (c *variantServiceV1Client) DeleteCallSet(ctx context.Context, in *DeleteCa
 
 func (c *variantServiceV1Client) GetCallSet(ctx context.Context, in *GetCallSetRequest, opts ...grpc.CallOption) (*CallSet, error) {
 	out := new(CallSet)
-	err := grpc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/GetCallSet", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1.VariantServiceV1/GetCallSet", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for VariantServiceV1 service
-
+// VariantServiceV1Server is the server API for VariantServiceV1 service.
 type VariantServiceV1Server interface {
 	// Creates variant data by asynchronously importing the provided information.
 	//
@@ -2035,7 +2711,7 @@ type VariantServiceV1Server interface {
 	// be moved to the call level; these are sometimes interpreted in a
 	// call-specific context.
 	// Imported VCF headers are appended to the metadata already in a variant set.
-	ImportVariants(context.Context, *ImportVariantsRequest) (*google_longrunning.Operation, error)
+	ImportVariants(context.Context, *ImportVariantsRequest) (*longrunning.Operation, error)
 	// Creates a new variant set.
 	//
 	// For the definitions of variant sets and other genomics resources, see
@@ -2051,7 +2727,7 @@ type VariantServiceV1Server interface {
 	// For the definitions of variant sets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	ExportVariantSet(context.Context, *ExportVariantSetRequest) (*google_longrunning.Operation, error)
+	ExportVariantSet(context.Context, *ExportVariantSetRequest) (*longrunning.Operation, error)
 	// Gets a variant set by ID.
 	//
 	// For the definitions of variant sets and other genomics resources, see
@@ -2073,7 +2749,7 @@ type VariantServiceV1Server interface {
 	// For the definitions of variant sets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteVariantSet(context.Context, *DeleteVariantSetRequest) (*google_protobuf1.Empty, error)
+	DeleteVariantSet(context.Context, *DeleteVariantSetRequest) (*empty.Empty, error)
 	// Updates a variant set using patch semantics.
 	//
 	// For the definitions of variant sets and other genomics resources, see
@@ -2109,7 +2785,7 @@ type VariantServiceV1Server interface {
 	// For the definitions of variants and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteVariant(context.Context, *DeleteVariantRequest) (*google_protobuf1.Empty, error)
+	DeleteVariant(context.Context, *DeleteVariantRequest) (*empty.Empty, error)
 	// Gets a variant by ID.
 	//
 	// For the definitions of variants and other genomics resources, see
@@ -2207,7 +2883,7 @@ type VariantServiceV1Server interface {
 	//
 	// This may be the desired outcome, but it is up to the user to determine if
 	// if that is indeed the case.
-	MergeVariants(context.Context, *MergeVariantsRequest) (*google_protobuf1.Empty, error)
+	MergeVariants(context.Context, *MergeVariantsRequest) (*empty.Empty, error)
 	// Gets a list of call sets matching the criteria.
 	//
 	// For the definitions of call sets and other genomics resources, see
@@ -2236,7 +2912,7 @@ type VariantServiceV1Server interface {
 	// For the definitions of call sets and other genomics resources, see
 	// [Fundamentals of Google
 	// Genomics](https://cloud.google.com/genomics/fundamentals-of-google-genomics)
-	DeleteCallSet(context.Context, *DeleteCallSetRequest) (*google_protobuf1.Empty, error)
+	DeleteCallSet(context.Context, *DeleteCallSetRequest) (*empty.Empty, error)
 	// Gets a call set by ID.
 	//
 	// For the definitions of call sets and other genomics resources, see
@@ -2654,9 +3330,11 @@ var _VariantServiceV1_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/genomics/v1/variants.proto",
 }
 
-func init() { proto.RegisterFile("google/genomics/v1/variants.proto", fileDescriptor11) }
+func init() {
+	proto.RegisterFile("google/genomics/v1/variants.proto", fileDescriptor_variants_8662afc4dcc7ac11)
+}
 
-var fileDescriptor11 = []byte{
+var fileDescriptor_variants_8662afc4dcc7ac11 = []byte{
 	// 2348 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xdd, 0x6e, 0x1b, 0xc7,
 	0xf5, 0xff, 0xef, 0x92, 0x94, 0xc8, 0x43, 0x91, 0x5a, 0x4f, 0x14, 0x69, 0x43, 0x7f, 0xc9, 0xfb,
diff --git a/vendor/google.golang.org/genproto/googleapis/genomics/v1alpha2/pipelines.pb.go b/vendor/google.golang.org/genproto/googleapis/genomics/v1alpha2/pipelines.pb.go
index 5e79261b..62f353f0 100644
--- a/vendor/google.golang.org/genproto/googleapis/genomics/v1alpha2/pipelines.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/genomics/v1alpha2/pipelines.pb.go
@@ -1,44 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/genomics/v1alpha2/pipelines.proto
 
-/*
-Package genomics is a generated protocol buffer package.
-
-It is generated from these files:
-	google/genomics/v1alpha2/pipelines.proto
-
-It has these top-level messages:
-	ComputeEngine
-	RuntimeMetadata
-	Pipeline
-	CreatePipelineRequest
-	RunPipelineArgs
-	RunPipelineRequest
-	GetPipelineRequest
-	ListPipelinesRequest
-	ListPipelinesResponse
-	DeletePipelineRequest
-	GetControllerConfigRequest
-	ControllerConfig
-	TimestampEvent
-	SetOperationStatusRequest
-	ServiceAccount
-	LoggingOptions
-	PipelineResources
-	PipelineParameter
-	DockerExecutor
-*/
-package genomics
+package genomics // import "google.golang.org/genproto/googleapis/genomics/v1alpha2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc1 "google.golang.org/genproto/googleapis/rpc/code"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import code "google.golang.org/genproto/googleapis/rpc/code"
 
 import (
 	context "golang.org/x/net/context"
@@ -90,26 +63,48 @@ func (x PipelineResources_Disk_Type) String() string {
 	return proto.EnumName(PipelineResources_Disk_Type_name, int32(x))
 }
 func (PipelineResources_Disk_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{16, 0, 0}
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{16, 0, 0}
 }
 
 // Describes a Compute Engine resource that is being managed by a running
 // [pipeline][google.genomics.v1alpha2.Pipeline].
 type ComputeEngine struct {
 	// The instance on which the operation is running.
-	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName" json:"instance_name,omitempty"`
+	InstanceName string `protobuf:"bytes,1,opt,name=instance_name,json=instanceName,proto3" json:"instance_name,omitempty"`
 	// The availability zone in which the instance resides.
-	Zone string `protobuf:"bytes,2,opt,name=zone" json:"zone,omitempty"`
+	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
 	// The machine type of the instance.
-	MachineType string `protobuf:"bytes,3,opt,name=machine_type,json=machineType" json:"machine_type,omitempty"`
+	MachineType string `protobuf:"bytes,3,opt,name=machine_type,json=machineType,proto3" json:"machine_type,omitempty"`
 	// The names of the disks that were created for this pipeline.
-	DiskNames []string `protobuf:"bytes,4,rep,name=disk_names,json=diskNames" json:"disk_names,omitempty"`
+	DiskNames            []string `protobuf:"bytes,4,rep,name=disk_names,json=diskNames,proto3" json:"disk_names,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ComputeEngine) Reset()                    { *m = ComputeEngine{} }
-func (m *ComputeEngine) String() string            { return proto.CompactTextString(m) }
-func (*ComputeEngine) ProtoMessage()               {}
-func (*ComputeEngine) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *ComputeEngine) Reset()         { *m = ComputeEngine{} }
+func (m *ComputeEngine) String() string { return proto.CompactTextString(m) }
+func (*ComputeEngine) ProtoMessage()    {}
+func (*ComputeEngine) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{0}
+}
+func (m *ComputeEngine) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ComputeEngine.Unmarshal(m, b)
+}
+func (m *ComputeEngine) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ComputeEngine.Marshal(b, m, deterministic)
+}
+func (dst *ComputeEngine) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ComputeEngine.Merge(dst, src)
+}
+func (m *ComputeEngine) XXX_Size() int {
+	return xxx_messageInfo_ComputeEngine.Size(m)
+}
+func (m *ComputeEngine) XXX_DiscardUnknown() {
+	xxx_messageInfo_ComputeEngine.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ComputeEngine proto.InternalMessageInfo
 
 func (m *ComputeEngine) GetInstanceName() string {
 	if m != nil {
@@ -144,13 +139,35 @@ func (m *ComputeEngine) GetDiskNames() []string {
 // field of the Operation associated with a RunPipeline execution.
 type RuntimeMetadata struct {
 	// Execution information specific to Google Compute Engine.
-	ComputeEngine *ComputeEngine `protobuf:"bytes,1,opt,name=compute_engine,json=computeEngine" json:"compute_engine,omitempty"`
+	ComputeEngine        *ComputeEngine `protobuf:"bytes,1,opt,name=compute_engine,json=computeEngine,proto3" json:"compute_engine,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *RuntimeMetadata) Reset()         { *m = RuntimeMetadata{} }
+func (m *RuntimeMetadata) String() string { return proto.CompactTextString(m) }
+func (*RuntimeMetadata) ProtoMessage()    {}
+func (*RuntimeMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{1}
+}
+func (m *RuntimeMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RuntimeMetadata.Unmarshal(m, b)
+}
+func (m *RuntimeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RuntimeMetadata.Marshal(b, m, deterministic)
+}
+func (dst *RuntimeMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RuntimeMetadata.Merge(dst, src)
+}
+func (m *RuntimeMetadata) XXX_Size() int {
+	return xxx_messageInfo_RuntimeMetadata.Size(m)
+}
+func (m *RuntimeMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_RuntimeMetadata.DiscardUnknown(m)
 }
 
-func (m *RuntimeMetadata) Reset()                    { *m = RuntimeMetadata{} }
-func (m *RuntimeMetadata) String() string            { return proto.CompactTextString(m) }
-func (*RuntimeMetadata) ProtoMessage()               {}
-func (*RuntimeMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_RuntimeMetadata proto.InternalMessageInfo
 
 func (m *RuntimeMetadata) GetComputeEngine() *ComputeEngine {
 	if m != nil {
@@ -168,16 +185,16 @@ func (m *RuntimeMetadata) GetComputeEngine() *ComputeEngine {
 type Pipeline struct {
 	// Required. The project in which to create the pipeline. The caller must have
 	// WRITE access.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Required. A user specified pipeline name that does not have to be unique.
 	// This name can be used for filtering Pipelines in ListPipelines.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	// User-specified description.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Input parameters of the pipeline.
-	InputParameters []*PipelineParameter `protobuf:"bytes,8,rep,name=input_parameters,json=inputParameters" json:"input_parameters,omitempty"`
+	InputParameters []*PipelineParameter `protobuf:"bytes,8,rep,name=input_parameters,json=inputParameters,proto3" json:"input_parameters,omitempty"`
 	// Output parameters of the pipeline.
-	OutputParameters []*PipelineParameter `protobuf:"bytes,9,rep,name=output_parameters,json=outputParameters" json:"output_parameters,omitempty"`
+	OutputParameters []*PipelineParameter `protobuf:"bytes,9,rep,name=output_parameters,json=outputParameters,proto3" json:"output_parameters,omitempty"`
 	// Required. The executor indicates in which environment the pipeline runs.
 	//
 	// Types that are valid to be assigned to Executor:
@@ -191,37 +208,42 @@ type Pipeline struct {
 	//
 	// *
 	// [minimumRamGb][google.genomics.v1alpha2.PipelineResources.minimum_ram_gb]
-	Resources *PipelineResources `protobuf:"bytes,6,opt,name=resources" json:"resources,omitempty"`
+	Resources *PipelineResources `protobuf:"bytes,6,opt,name=resources,proto3" json:"resources,omitempty"`
 	// Unique pipeline id that is generated by the service when CreatePipeline
 	// is called. Cannot be specified in the Pipeline used in the
 	// CreatePipelineRequest, and will be populated in the response to
 	// CreatePipeline and all subsequent Get and List calls. Indicates that the
 	// service has registered this pipeline.
-	PipelineId string `protobuf:"bytes,7,opt,name=pipeline_id,json=pipelineId" json:"pipeline_id,omitempty"`
+	PipelineId           string   `protobuf:"bytes,7,opt,name=pipeline_id,json=pipelineId,proto3" json:"pipeline_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Pipeline) Reset()                    { *m = Pipeline{} }
-func (m *Pipeline) String() string            { return proto.CompactTextString(m) }
-func (*Pipeline) ProtoMessage()               {}
-func (*Pipeline) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-type isPipeline_Executor interface {
-	isPipeline_Executor()
+func (m *Pipeline) Reset()         { *m = Pipeline{} }
+func (m *Pipeline) String() string { return proto.CompactTextString(m) }
+func (*Pipeline) ProtoMessage()    {}
+func (*Pipeline) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{2}
 }
-
-type Pipeline_Docker struct {
-	Docker *DockerExecutor `protobuf:"bytes,5,opt,name=docker,oneof"`
+func (m *Pipeline) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Pipeline.Unmarshal(m, b)
 }
-
-func (*Pipeline_Docker) isPipeline_Executor() {}
-
-func (m *Pipeline) GetExecutor() isPipeline_Executor {
-	if m != nil {
-		return m.Executor
-	}
-	return nil
+func (m *Pipeline) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Pipeline.Marshal(b, m, deterministic)
+}
+func (dst *Pipeline) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Pipeline.Merge(dst, src)
+}
+func (m *Pipeline) XXX_Size() int {
+	return xxx_messageInfo_Pipeline.Size(m)
+}
+func (m *Pipeline) XXX_DiscardUnknown() {
+	xxx_messageInfo_Pipeline.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_Pipeline proto.InternalMessageInfo
+
 func (m *Pipeline) GetProjectId() string {
 	if m != nil {
 		return m.ProjectId
@@ -257,6 +279,23 @@ func (m *Pipeline) GetOutputParameters() []*PipelineParameter {
 	return nil
 }
 
+type isPipeline_Executor interface {
+	isPipeline_Executor()
+}
+
+type Pipeline_Docker struct {
+	Docker *DockerExecutor `protobuf:"bytes,5,opt,name=docker,proto3,oneof"`
+}
+
+func (*Pipeline_Docker) isPipeline_Executor() {}
+
+func (m *Pipeline) GetExecutor() isPipeline_Executor {
+	if m != nil {
+		return m.Executor
+	}
+	return nil
+}
+
 func (m *Pipeline) GetDocker() *DockerExecutor {
 	if x, ok := m.GetExecutor().(*Pipeline_Docker); ok {
 		return x.Docker
@@ -323,7 +362,7 @@ func _Pipeline_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Executor.(type) {
 	case *Pipeline_Docker:
 		s := proto.Size(x.Docker)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -337,13 +376,35 @@ func _Pipeline_OneofSizer(msg proto.Message) (n int) {
 // `pipelineId` populated, as that will be populated by the server.
 type CreatePipelineRequest struct {
 	// The pipeline to create. Should not have `pipelineId` populated.
-	Pipeline *Pipeline `protobuf:"bytes,1,opt,name=pipeline" json:"pipeline,omitempty"`
+	Pipeline             *Pipeline `protobuf:"bytes,1,opt,name=pipeline,proto3" json:"pipeline,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
 }
 
-func (m *CreatePipelineRequest) Reset()                    { *m = CreatePipelineRequest{} }
-func (m *CreatePipelineRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreatePipelineRequest) ProtoMessage()               {}
-func (*CreatePipelineRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *CreatePipelineRequest) Reset()         { *m = CreatePipelineRequest{} }
+func (m *CreatePipelineRequest) String() string { return proto.CompactTextString(m) }
+func (*CreatePipelineRequest) ProtoMessage()    {}
+func (*CreatePipelineRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{3}
+}
+func (m *CreatePipelineRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreatePipelineRequest.Unmarshal(m, b)
+}
+func (m *CreatePipelineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreatePipelineRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreatePipelineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreatePipelineRequest.Merge(dst, src)
+}
+func (m *CreatePipelineRequest) XXX_Size() int {
+	return xxx_messageInfo_CreatePipelineRequest.Size(m)
+}
+func (m *CreatePipelineRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreatePipelineRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreatePipelineRequest proto.InternalMessageInfo
 
 func (m *CreatePipelineRequest) GetPipeline() *Pipeline {
 	if m != nil {
@@ -357,33 +418,33 @@ type RunPipelineArgs struct {
 	// Required. The project in which to run the pipeline. The caller must have
 	// WRITER access to all Google Cloud services and resources (e.g. Google
 	// Compute Engine) will be used.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Pipeline input arguments; keys are defined in the pipeline documentation.
 	// All input parameters that do not have default values  must be specified.
 	// If parameters with defaults are specified here, the defaults will be
 	// overridden.
-	Inputs map[string]string `protobuf:"bytes,2,rep,name=inputs" json:"inputs,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Inputs map[string]string `protobuf:"bytes,2,rep,name=inputs,proto3" json:"inputs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Pipeline output arguments; keys are defined in the pipeline
 	// documentation.  All output parameters of without default values
 	// must be specified.  If parameters with defaults are specified
 	// here, the defaults will be overridden.
-	Outputs map[string]string `protobuf:"bytes,3,rep,name=outputs" json:"outputs,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Outputs map[string]string `protobuf:"bytes,3,rep,name=outputs,proto3" json:"outputs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The Google Cloud Service Account that will be used to access data and
 	// services. By default, the compute service account associated with
 	// `projectId` is used.
-	ServiceAccount *ServiceAccount `protobuf:"bytes,4,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
+	ServiceAccount *ServiceAccount `protobuf:"bytes,4,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
 	// This field is deprecated. Use `labels` instead. Client-specified pipeline
 	// operation identifier.
-	ClientId string `protobuf:"bytes,5,opt,name=client_id,json=clientId" json:"client_id,omitempty"`
+	ClientId string `protobuf:"bytes,5,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// Specifies resource requirements/overrides for the pipeline run.
-	Resources *PipelineResources `protobuf:"bytes,6,opt,name=resources" json:"resources,omitempty"`
+	Resources *PipelineResources `protobuf:"bytes,6,opt,name=resources,proto3" json:"resources,omitempty"`
 	// Required. Logging options. Used by the service to communicate results
 	// to the user.
-	Logging *LoggingOptions `protobuf:"bytes,7,opt,name=logging" json:"logging,omitempty"`
+	Logging *LoggingOptions `protobuf:"bytes,7,opt,name=logging,proto3" json:"logging,omitempty"`
 	// How long to keep the VM up after a failure (for example docker command
 	// failed, copying input or output files failed, etc). While the VM is up, one
 	// can ssh into the VM to debug. Default is 0; maximum allowed value is 1 day.
-	KeepVmAliveOnFailureDuration *google_protobuf3.Duration `protobuf:"bytes,8,opt,name=keep_vm_alive_on_failure_duration,json=keepVmAliveOnFailureDuration" json:"keep_vm_alive_on_failure_duration,omitempty"`
+	KeepVmAliveOnFailureDuration *duration.Duration `protobuf:"bytes,8,opt,name=keep_vm_alive_on_failure_duration,json=keepVmAliveOnFailureDuration,proto3" json:"keep_vm_alive_on_failure_duration,omitempty"`
 	// Labels to apply to this pipeline run. Labels will also be applied to
 	// compute resources (VM, disks) created by this pipeline run. When listing
 	// operations, operations can [filtered by labels]
@@ -396,13 +457,35 @@ type RunPipelineArgs struct {
 	// character must be a lowercase letter, and all following characters must be
 	// a dash, lowercase letter, or digit, except the last character, which cannot
 	// be a dash.
-	Labels map[string]string `protobuf:"bytes,9,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,9,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *RunPipelineArgs) Reset()                    { *m = RunPipelineArgs{} }
-func (m *RunPipelineArgs) String() string            { return proto.CompactTextString(m) }
-func (*RunPipelineArgs) ProtoMessage()               {}
-func (*RunPipelineArgs) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *RunPipelineArgs) Reset()         { *m = RunPipelineArgs{} }
+func (m *RunPipelineArgs) String() string { return proto.CompactTextString(m) }
+func (*RunPipelineArgs) ProtoMessage()    {}
+func (*RunPipelineArgs) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{4}
+}
+func (m *RunPipelineArgs) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunPipelineArgs.Unmarshal(m, b)
+}
+func (m *RunPipelineArgs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunPipelineArgs.Marshal(b, m, deterministic)
+}
+func (dst *RunPipelineArgs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunPipelineArgs.Merge(dst, src)
+}
+func (m *RunPipelineArgs) XXX_Size() int {
+	return xxx_messageInfo_RunPipelineArgs.Size(m)
+}
+func (m *RunPipelineArgs) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunPipelineArgs.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RunPipelineArgs proto.InternalMessageInfo
 
 func (m *RunPipelineArgs) GetProjectId() string {
 	if m != nil {
@@ -453,7 +536,7 @@ func (m *RunPipelineArgs) GetLogging() *LoggingOptions {
 	return nil
 }
 
-func (m *RunPipelineArgs) GetKeepVmAliveOnFailureDuration() *google_protobuf3.Duration {
+func (m *RunPipelineArgs) GetKeepVmAliveOnFailureDuration() *duration.Duration {
 	if m != nil {
 		return m.KeepVmAliveOnFailureDuration
 	}
@@ -480,26 +563,50 @@ type RunPipelineRequest struct {
 	//	*RunPipelineRequest_EphemeralPipeline
 	Pipeline isRunPipelineRequest_Pipeline `protobuf_oneof:"pipeline"`
 	// The arguments to use when running this pipeline.
-	PipelineArgs *RunPipelineArgs `protobuf:"bytes,3,opt,name=pipeline_args,json=pipelineArgs" json:"pipeline_args,omitempty"`
+	PipelineArgs         *RunPipelineArgs `protobuf:"bytes,3,opt,name=pipeline_args,json=pipelineArgs,proto3" json:"pipeline_args,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *RunPipelineRequest) Reset()                    { *m = RunPipelineRequest{} }
-func (m *RunPipelineRequest) String() string            { return proto.CompactTextString(m) }
-func (*RunPipelineRequest) ProtoMessage()               {}
-func (*RunPipelineRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *RunPipelineRequest) Reset()         { *m = RunPipelineRequest{} }
+func (m *RunPipelineRequest) String() string { return proto.CompactTextString(m) }
+func (*RunPipelineRequest) ProtoMessage()    {}
+func (*RunPipelineRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{5}
+}
+func (m *RunPipelineRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RunPipelineRequest.Unmarshal(m, b)
+}
+func (m *RunPipelineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RunPipelineRequest.Marshal(b, m, deterministic)
+}
+func (dst *RunPipelineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RunPipelineRequest.Merge(dst, src)
+}
+func (m *RunPipelineRequest) XXX_Size() int {
+	return xxx_messageInfo_RunPipelineRequest.Size(m)
+}
+func (m *RunPipelineRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RunPipelineRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RunPipelineRequest proto.InternalMessageInfo
 
 type isRunPipelineRequest_Pipeline interface {
 	isRunPipelineRequest_Pipeline()
 }
 
 type RunPipelineRequest_PipelineId struct {
-	PipelineId string `protobuf:"bytes,1,opt,name=pipeline_id,json=pipelineId,oneof"`
+	PipelineId string `protobuf:"bytes,1,opt,name=pipeline_id,json=pipelineId,proto3,oneof"`
 }
+
 type RunPipelineRequest_EphemeralPipeline struct {
-	EphemeralPipeline *Pipeline `protobuf:"bytes,2,opt,name=ephemeral_pipeline,json=ephemeralPipeline,oneof"`
+	EphemeralPipeline *Pipeline `protobuf:"bytes,2,opt,name=ephemeral_pipeline,json=ephemeralPipeline,proto3,oneof"`
 }
 
-func (*RunPipelineRequest_PipelineId) isRunPipelineRequest_Pipeline()        {}
+func (*RunPipelineRequest_PipelineId) isRunPipelineRequest_Pipeline() {}
+
 func (*RunPipelineRequest_EphemeralPipeline) isRunPipelineRequest_Pipeline() {}
 
 func (m *RunPipelineRequest) GetPipeline() isRunPipelineRequest_Pipeline {
@@ -585,12 +692,12 @@ func _RunPipelineRequest_OneofSizer(msg proto.Message) (n int) {
 	// pipeline
 	switch x := m.Pipeline.(type) {
 	case *RunPipelineRequest_PipelineId:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.PipelineId)))
 		n += len(x.PipelineId)
 	case *RunPipelineRequest_EphemeralPipeline:
 		s := proto.Size(x.EphemeralPipeline)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -604,13 +711,35 @@ func _RunPipelineRequest_OneofSizer(msg proto.Message) (n int) {
 type GetPipelineRequest struct {
 	// Caller must have READ access to the project in which this pipeline
 	// is defined.
-	PipelineId string `protobuf:"bytes,1,opt,name=pipeline_id,json=pipelineId" json:"pipeline_id,omitempty"`
+	PipelineId           string   `protobuf:"bytes,1,opt,name=pipeline_id,json=pipelineId,proto3" json:"pipeline_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetPipelineRequest) Reset()                    { *m = GetPipelineRequest{} }
-func (m *GetPipelineRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetPipelineRequest) ProtoMessage()               {}
-func (*GetPipelineRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *GetPipelineRequest) Reset()         { *m = GetPipelineRequest{} }
+func (m *GetPipelineRequest) String() string { return proto.CompactTextString(m) }
+func (*GetPipelineRequest) ProtoMessage()    {}
+func (*GetPipelineRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{6}
+}
+func (m *GetPipelineRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetPipelineRequest.Unmarshal(m, b)
+}
+func (m *GetPipelineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetPipelineRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetPipelineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPipelineRequest.Merge(dst, src)
+}
+func (m *GetPipelineRequest) XXX_Size() int {
+	return xxx_messageInfo_GetPipelineRequest.Size(m)
+}
+func (m *GetPipelineRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetPipelineRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetPipelineRequest proto.InternalMessageInfo
 
 func (m *GetPipelineRequest) GetPipelineId() string {
 	if m != nil {
@@ -628,23 +757,45 @@ func (m *GetPipelineRequest) GetPipelineId() string {
 type ListPipelinesRequest struct {
 	// Required. The name of the project to search for pipelines. Caller
 	// must have READ access to this project.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Pipelines with names that match this prefix should be
 	// returned.  If unspecified, all pipelines in the project, up to
 	// `pageSize`, will be returned.
-	NamePrefix string `protobuf:"bytes,2,opt,name=name_prefix,json=namePrefix" json:"name_prefix,omitempty"`
+	NamePrefix string `protobuf:"bytes,2,opt,name=name_prefix,json=namePrefix,proto3" json:"name_prefix,omitempty"`
 	// Number of pipelines to return at once. Defaults to 256, and max
 	// is 2048.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Token to use to indicate where to start getting results.
 	// If unspecified, returns the first page of results.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListPipelinesRequest) Reset()                    { *m = ListPipelinesRequest{} }
-func (m *ListPipelinesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListPipelinesRequest) ProtoMessage()               {}
-func (*ListPipelinesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *ListPipelinesRequest) Reset()         { *m = ListPipelinesRequest{} }
+func (m *ListPipelinesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListPipelinesRequest) ProtoMessage()    {}
+func (*ListPipelinesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{7}
+}
+func (m *ListPipelinesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListPipelinesRequest.Unmarshal(m, b)
+}
+func (m *ListPipelinesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListPipelinesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListPipelinesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPipelinesRequest.Merge(dst, src)
+}
+func (m *ListPipelinesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListPipelinesRequest.Size(m)
+}
+func (m *ListPipelinesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListPipelinesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListPipelinesRequest proto.InternalMessageInfo
 
 func (m *ListPipelinesRequest) GetProjectId() string {
 	if m != nil {
@@ -681,15 +832,37 @@ func (m *ListPipelinesRequest) GetPageToken() string {
 // request.
 type ListPipelinesResponse struct {
 	// The matched pipelines.
-	Pipelines []*Pipeline `protobuf:"bytes,1,rep,name=pipelines" json:"pipelines,omitempty"`
+	Pipelines []*Pipeline `protobuf:"bytes,1,rep,name=pipelines,proto3" json:"pipelines,omitempty"`
 	// The token to use to get the next page of results.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListPipelinesResponse) Reset()                    { *m = ListPipelinesResponse{} }
-func (m *ListPipelinesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListPipelinesResponse) ProtoMessage()               {}
-func (*ListPipelinesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *ListPipelinesResponse) Reset()         { *m = ListPipelinesResponse{} }
+func (m *ListPipelinesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListPipelinesResponse) ProtoMessage()    {}
+func (*ListPipelinesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{8}
+}
+func (m *ListPipelinesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListPipelinesResponse.Unmarshal(m, b)
+}
+func (m *ListPipelinesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListPipelinesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListPipelinesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPipelinesResponse.Merge(dst, src)
+}
+func (m *ListPipelinesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListPipelinesResponse.Size(m)
+}
+func (m *ListPipelinesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListPipelinesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListPipelinesResponse proto.InternalMessageInfo
 
 func (m *ListPipelinesResponse) GetPipelines() []*Pipeline {
 	if m != nil {
@@ -709,13 +882,35 @@ func (m *ListPipelinesResponse) GetNextPageToken() string {
 type DeletePipelineRequest struct {
 	// Caller must have WRITE access to the project in which this pipeline
 	// is defined.
-	PipelineId string `protobuf:"bytes,1,opt,name=pipeline_id,json=pipelineId" json:"pipeline_id,omitempty"`
+	PipelineId           string   `protobuf:"bytes,1,opt,name=pipeline_id,json=pipelineId,proto3" json:"pipeline_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeletePipelineRequest) Reset()         { *m = DeletePipelineRequest{} }
+func (m *DeletePipelineRequest) String() string { return proto.CompactTextString(m) }
+func (*DeletePipelineRequest) ProtoMessage()    {}
+func (*DeletePipelineRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{9}
+}
+func (m *DeletePipelineRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeletePipelineRequest.Unmarshal(m, b)
+}
+func (m *DeletePipelineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeletePipelineRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeletePipelineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePipelineRequest.Merge(dst, src)
+}
+func (m *DeletePipelineRequest) XXX_Size() int {
+	return xxx_messageInfo_DeletePipelineRequest.Size(m)
+}
+func (m *DeletePipelineRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeletePipelineRequest.DiscardUnknown(m)
 }
 
-func (m *DeletePipelineRequest) Reset()                    { *m = DeletePipelineRequest{} }
-func (m *DeletePipelineRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeletePipelineRequest) ProtoMessage()               {}
-func (*DeletePipelineRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_DeletePipelineRequest proto.InternalMessageInfo
 
 func (m *DeletePipelineRequest) GetPipelineId() string {
 	if m != nil {
@@ -728,14 +923,36 @@ func (m *DeletePipelineRequest) GetPipelineId() string {
 // by VMs created by the Pipelines Service and not by end users.
 type GetControllerConfigRequest struct {
 	// The operation to retrieve controller configuration for.
-	OperationId     string `protobuf:"bytes,1,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
-	ValidationToken uint64 `protobuf:"varint,2,opt,name=validation_token,json=validationToken" json:"validation_token,omitempty"`
+	OperationId          string   `protobuf:"bytes,1,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
+	ValidationToken      uint64   `protobuf:"varint,2,opt,name=validation_token,json=validationToken,proto3" json:"validation_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetControllerConfigRequest) Reset()         { *m = GetControllerConfigRequest{} }
+func (m *GetControllerConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetControllerConfigRequest) ProtoMessage()    {}
+func (*GetControllerConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{10}
+}
+func (m *GetControllerConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetControllerConfigRequest.Unmarshal(m, b)
+}
+func (m *GetControllerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetControllerConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetControllerConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetControllerConfigRequest.Merge(dst, src)
+}
+func (m *GetControllerConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetControllerConfigRequest.Size(m)
+}
+func (m *GetControllerConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetControllerConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetControllerConfigRequest) Reset()                    { *m = GetControllerConfigRequest{} }
-func (m *GetControllerConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetControllerConfigRequest) ProtoMessage()               {}
-func (*GetControllerConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_GetControllerConfigRequest proto.InternalMessageInfo
 
 func (m *GetControllerConfigRequest) GetOperationId() string {
 	if m != nil {
@@ -755,20 +972,42 @@ func (m *GetControllerConfigRequest) GetValidationToken() uint64 {
 // server in order to run. Should only be used by VMs created by the
 // Pipelines Service and not by end users.
 type ControllerConfig struct {
-	Image       string                                      `protobuf:"bytes,1,opt,name=image" json:"image,omitempty"`
-	Cmd         string                                      `protobuf:"bytes,2,opt,name=cmd" json:"cmd,omitempty"`
-	GcsLogPath  string                                      `protobuf:"bytes,3,opt,name=gcs_log_path,json=gcsLogPath" json:"gcs_log_path,omitempty"`
-	MachineType string                                      `protobuf:"bytes,4,opt,name=machine_type,json=machineType" json:"machine_type,omitempty"`
-	Vars        map[string]string                           `protobuf:"bytes,5,rep,name=vars" json:"vars,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Disks       map[string]string                           `protobuf:"bytes,6,rep,name=disks" json:"disks,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	GcsSources  map[string]*ControllerConfig_RepeatedString `protobuf:"bytes,7,rep,name=gcs_sources,json=gcsSources" json:"gcs_sources,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	GcsSinks    map[string]*ControllerConfig_RepeatedString `protobuf:"bytes,8,rep,name=gcs_sinks,json=gcsSinks" json:"gcs_sinks,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Image                string                                      `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
+	Cmd                  string                                      `protobuf:"bytes,2,opt,name=cmd,proto3" json:"cmd,omitempty"`
+	GcsLogPath           string                                      `protobuf:"bytes,3,opt,name=gcs_log_path,json=gcsLogPath,proto3" json:"gcs_log_path,omitempty"`
+	MachineType          string                                      `protobuf:"bytes,4,opt,name=machine_type,json=machineType,proto3" json:"machine_type,omitempty"`
+	Vars                 map[string]string                           `protobuf:"bytes,5,rep,name=vars,proto3" json:"vars,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Disks                map[string]string                           `protobuf:"bytes,6,rep,name=disks,proto3" json:"disks,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	GcsSources           map[string]*ControllerConfig_RepeatedString `protobuf:"bytes,7,rep,name=gcs_sources,json=gcsSources,proto3" json:"gcs_sources,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	GcsSinks             map[string]*ControllerConfig_RepeatedString `protobuf:"bytes,8,rep,name=gcs_sinks,json=gcsSinks,proto3" json:"gcs_sinks,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                                    `json:"-"`
+	XXX_unrecognized     []byte                                      `json:"-"`
+	XXX_sizecache        int32                                       `json:"-"`
 }
 
-func (m *ControllerConfig) Reset()                    { *m = ControllerConfig{} }
-func (m *ControllerConfig) String() string            { return proto.CompactTextString(m) }
-func (*ControllerConfig) ProtoMessage()               {}
-func (*ControllerConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *ControllerConfig) Reset()         { *m = ControllerConfig{} }
+func (m *ControllerConfig) String() string { return proto.CompactTextString(m) }
+func (*ControllerConfig) ProtoMessage()    {}
+func (*ControllerConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{11}
+}
+func (m *ControllerConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerConfig.Unmarshal(m, b)
+}
+func (m *ControllerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerConfig.Marshal(b, m, deterministic)
+}
+func (dst *ControllerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerConfig.Merge(dst, src)
+}
+func (m *ControllerConfig) XXX_Size() int {
+	return xxx_messageInfo_ControllerConfig.Size(m)
+}
+func (m *ControllerConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ControllerConfig proto.InternalMessageInfo
 
 func (m *ControllerConfig) GetImage() string {
 	if m != nil {
@@ -827,16 +1066,36 @@ func (m *ControllerConfig) GetGcsSinks() map[string]*ControllerConfig_RepeatedSt
 }
 
 type ControllerConfig_RepeatedString struct {
-	Values []string `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
+	Values               []string `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ControllerConfig_RepeatedString) Reset()         { *m = ControllerConfig_RepeatedString{} }
 func (m *ControllerConfig_RepeatedString) String() string { return proto.CompactTextString(m) }
 func (*ControllerConfig_RepeatedString) ProtoMessage()    {}
 func (*ControllerConfig_RepeatedString) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{11, 0}
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{11, 0}
+}
+func (m *ControllerConfig_RepeatedString) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ControllerConfig_RepeatedString.Unmarshal(m, b)
+}
+func (m *ControllerConfig_RepeatedString) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ControllerConfig_RepeatedString.Marshal(b, m, deterministic)
+}
+func (dst *ControllerConfig_RepeatedString) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ControllerConfig_RepeatedString.Merge(dst, src)
+}
+func (m *ControllerConfig_RepeatedString) XXX_Size() int {
+	return xxx_messageInfo_ControllerConfig_RepeatedString.Size(m)
+}
+func (m *ControllerConfig_RepeatedString) XXX_DiscardUnknown() {
+	xxx_messageInfo_ControllerConfig_RepeatedString.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ControllerConfig_RepeatedString proto.InternalMessageInfo
+
 func (m *ControllerConfig_RepeatedString) GetValues() []string {
 	if m != nil {
 		return m.Values
@@ -848,15 +1107,37 @@ func (m *ControllerConfig_RepeatedString) GetValues() []string {
 // execution.
 type TimestampEvent struct {
 	// String indicating the type of event
-	Description string `protobuf:"bytes,1,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
 	// The time this event occured.
-	Timestamp *google_protobuf4.Timestamp `protobuf:"bytes,2,opt,name=timestamp" json:"timestamp,omitempty"`
+	Timestamp            *timestamp.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *TimestampEvent) Reset()         { *m = TimestampEvent{} }
+func (m *TimestampEvent) String() string { return proto.CompactTextString(m) }
+func (*TimestampEvent) ProtoMessage()    {}
+func (*TimestampEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{12}
+}
+func (m *TimestampEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimestampEvent.Unmarshal(m, b)
+}
+func (m *TimestampEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimestampEvent.Marshal(b, m, deterministic)
+}
+func (dst *TimestampEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimestampEvent.Merge(dst, src)
+}
+func (m *TimestampEvent) XXX_Size() int {
+	return xxx_messageInfo_TimestampEvent.Size(m)
+}
+func (m *TimestampEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimestampEvent.DiscardUnknown(m)
 }
 
-func (m *TimestampEvent) Reset()                    { *m = TimestampEvent{} }
-func (m *TimestampEvent) String() string            { return proto.CompactTextString(m) }
-func (*TimestampEvent) ProtoMessage()               {}
-func (*TimestampEvent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_TimestampEvent proto.InternalMessageInfo
 
 func (m *TimestampEvent) GetDescription() string {
 	if m != nil {
@@ -865,7 +1146,7 @@ func (m *TimestampEvent) GetDescription() string {
 	return ""
 }
 
-func (m *TimestampEvent) GetTimestamp() *google_protobuf4.Timestamp {
+func (m *TimestampEvent) GetTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.Timestamp
 	}
@@ -875,17 +1156,39 @@ func (m *TimestampEvent) GetTimestamp() *google_protobuf4.Timestamp {
 // Request to set operation status. Should only be used by VMs
 // created by the Pipelines Service and not by end users.
 type SetOperationStatusRequest struct {
-	OperationId     string            `protobuf:"bytes,1,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
-	TimestampEvents []*TimestampEvent `protobuf:"bytes,2,rep,name=timestamp_events,json=timestampEvents" json:"timestamp_events,omitempty"`
-	ErrorCode       google_rpc1.Code  `protobuf:"varint,3,opt,name=error_code,json=errorCode,enum=google.rpc.Code" json:"error_code,omitempty"`
-	ErrorMessage    string            `protobuf:"bytes,4,opt,name=error_message,json=errorMessage" json:"error_message,omitempty"`
-	ValidationToken uint64            `protobuf:"varint,5,opt,name=validation_token,json=validationToken" json:"validation_token,omitempty"`
+	OperationId          string            `protobuf:"bytes,1,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
+	TimestampEvents      []*TimestampEvent `protobuf:"bytes,2,rep,name=timestamp_events,json=timestampEvents,proto3" json:"timestamp_events,omitempty"`
+	ErrorCode            code.Code         `protobuf:"varint,3,opt,name=error_code,json=errorCode,proto3,enum=google.rpc.Code" json:"error_code,omitempty"`
+	ErrorMessage         string            `protobuf:"bytes,4,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
+	ValidationToken      uint64            `protobuf:"varint,5,opt,name=validation_token,json=validationToken,proto3" json:"validation_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *SetOperationStatusRequest) Reset()                    { *m = SetOperationStatusRequest{} }
-func (m *SetOperationStatusRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetOperationStatusRequest) ProtoMessage()               {}
-func (*SetOperationStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *SetOperationStatusRequest) Reset()         { *m = SetOperationStatusRequest{} }
+func (m *SetOperationStatusRequest) String() string { return proto.CompactTextString(m) }
+func (*SetOperationStatusRequest) ProtoMessage()    {}
+func (*SetOperationStatusRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{13}
+}
+func (m *SetOperationStatusRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetOperationStatusRequest.Unmarshal(m, b)
+}
+func (m *SetOperationStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetOperationStatusRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetOperationStatusRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetOperationStatusRequest.Merge(dst, src)
+}
+func (m *SetOperationStatusRequest) XXX_Size() int {
+	return xxx_messageInfo_SetOperationStatusRequest.Size(m)
+}
+func (m *SetOperationStatusRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetOperationStatusRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetOperationStatusRequest proto.InternalMessageInfo
 
 func (m *SetOperationStatusRequest) GetOperationId() string {
 	if m != nil {
@@ -901,11 +1204,11 @@ func (m *SetOperationStatusRequest) GetTimestampEvents() []*TimestampEvent {
 	return nil
 }
 
-func (m *SetOperationStatusRequest) GetErrorCode() google_rpc1.Code {
+func (m *SetOperationStatusRequest) GetErrorCode() code.Code {
 	if m != nil {
 		return m.ErrorCode
 	}
-	return google_rpc1.Code_OK
+	return code.Code_OK
 }
 
 func (m *SetOperationStatusRequest) GetErrorMessage() string {
@@ -926,7 +1229,7 @@ func (m *SetOperationStatusRequest) GetValidationToken() uint64 {
 type ServiceAccount struct {
 	// Email address of the service account. Defaults to `default`,
 	// which uses the compute service account associated with the project.
-	Email string `protobuf:"bytes,1,opt,name=email" json:"email,omitempty"`
+	Email string `protobuf:"bytes,1,opt,name=email,proto3" json:"email,omitempty"`
 	// List of scopes to be enabled for this service account on the VM.
 	// The following scopes are automatically included:
 	//
@@ -935,13 +1238,35 @@ type ServiceAccount struct {
 	// * https://www.googleapis.com/auth/genomics
 	// * https://www.googleapis.com/auth/logging.write
 	// * https://www.googleapis.com/auth/monitoring.write
-	Scopes []string `protobuf:"bytes,2,rep,name=scopes" json:"scopes,omitempty"`
+	Scopes               []string `protobuf:"bytes,2,rep,name=scopes,proto3" json:"scopes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ServiceAccount) Reset()                    { *m = ServiceAccount{} }
-func (m *ServiceAccount) String() string            { return proto.CompactTextString(m) }
-func (*ServiceAccount) ProtoMessage()               {}
-func (*ServiceAccount) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *ServiceAccount) Reset()         { *m = ServiceAccount{} }
+func (m *ServiceAccount) String() string { return proto.CompactTextString(m) }
+func (*ServiceAccount) ProtoMessage()    {}
+func (*ServiceAccount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{14}
+}
+func (m *ServiceAccount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceAccount.Unmarshal(m, b)
+}
+func (m *ServiceAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceAccount.Marshal(b, m, deterministic)
+}
+func (dst *ServiceAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceAccount.Merge(dst, src)
+}
+func (m *ServiceAccount) XXX_Size() int {
+	return xxx_messageInfo_ServiceAccount.Size(m)
+}
+func (m *ServiceAccount) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceAccount.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServiceAccount proto.InternalMessageInfo
 
 func (m *ServiceAccount) GetEmail() string {
 	if m != nil {
@@ -967,13 +1292,35 @@ type LoggingOptions struct {
 	// used, and the user must ensure that logs are not
 	// overwritten. Stdout and stderr logs from the run are also
 	// generated and output as `-stdout.log` and `-stderr.log`.
-	GcsPath string `protobuf:"bytes,1,opt,name=gcs_path,json=gcsPath" json:"gcs_path,omitempty"`
+	GcsPath              string   `protobuf:"bytes,1,opt,name=gcs_path,json=gcsPath,proto3" json:"gcs_path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *LoggingOptions) Reset()                    { *m = LoggingOptions{} }
-func (m *LoggingOptions) String() string            { return proto.CompactTextString(m) }
-func (*LoggingOptions) ProtoMessage()               {}
-func (*LoggingOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *LoggingOptions) Reset()         { *m = LoggingOptions{} }
+func (m *LoggingOptions) String() string { return proto.CompactTextString(m) }
+func (*LoggingOptions) ProtoMessage()    {}
+func (*LoggingOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{15}
+}
+func (m *LoggingOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoggingOptions.Unmarshal(m, b)
+}
+func (m *LoggingOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoggingOptions.Marshal(b, m, deterministic)
+}
+func (dst *LoggingOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoggingOptions.Merge(dst, src)
+}
+func (m *LoggingOptions) XXX_Size() int {
+	return xxx_messageInfo_LoggingOptions.Size(m)
+}
+func (m *LoggingOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoggingOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LoggingOptions proto.InternalMessageInfo
 
 func (m *LoggingOptions) GetGcsPath() string {
 	if m != nil {
@@ -985,20 +1332,20 @@ func (m *LoggingOptions) GetGcsPath() string {
 // The system resources for the pipeline run.
 type PipelineResources struct {
 	// The minimum number of cores to use. Defaults to 1.
-	MinimumCpuCores int32 `protobuf:"varint,1,opt,name=minimum_cpu_cores,json=minimumCpuCores" json:"minimum_cpu_cores,omitempty"`
+	MinimumCpuCores int32 `protobuf:"varint,1,opt,name=minimum_cpu_cores,json=minimumCpuCores,proto3" json:"minimum_cpu_cores,omitempty"`
 	// Whether to use preemptible VMs. Defaults to `false`. In order to use this,
 	// must be true for both create time and run time. Cannot be true at run time
 	// if false at create time.
-	Preemptible bool `protobuf:"varint,2,opt,name=preemptible" json:"preemptible,omitempty"`
+	Preemptible bool `protobuf:"varint,2,opt,name=preemptible,proto3" json:"preemptible,omitempty"`
 	// The minimum amount of RAM to use. Defaults to 3.75 (GB)
-	MinimumRamGb float64 `protobuf:"fixed64,3,opt,name=minimum_ram_gb,json=minimumRamGb" json:"minimum_ram_gb,omitempty"`
+	MinimumRamGb float64 `protobuf:"fixed64,3,opt,name=minimum_ram_gb,json=minimumRamGb,proto3" json:"minimum_ram_gb,omitempty"`
 	// Disks to attach.
-	Disks []*PipelineResources_Disk `protobuf:"bytes,4,rep,name=disks" json:"disks,omitempty"`
+	Disks []*PipelineResources_Disk `protobuf:"bytes,4,rep,name=disks,proto3" json:"disks,omitempty"`
 	// List of Google Compute Engine availability zones to which resource
 	// creation will restricted. If empty, any zone may be chosen.
-	Zones []string `protobuf:"bytes,5,rep,name=zones" json:"zones,omitempty"`
+	Zones []string `protobuf:"bytes,5,rep,name=zones,proto3" json:"zones,omitempty"`
 	// The size of the boot disk. Defaults to 10 (GB).
-	BootDiskSizeGb int32 `protobuf:"varint,6,opt,name=boot_disk_size_gb,json=bootDiskSizeGb" json:"boot_disk_size_gb,omitempty"`
+	BootDiskSizeGb int32 `protobuf:"varint,6,opt,name=boot_disk_size_gb,json=bootDiskSizeGb,proto3" json:"boot_disk_size_gb,omitempty"`
 	// Whether to assign an external IP to the instance. This is an experimental
 	// feature that may go away. Defaults to false.
 	// Corresponds to `--no_address` flag for [gcloud compute instances create]
@@ -1010,13 +1357,35 @@ type PipelineResources struct {
 	// only load docker images from Google Container Registry and not Docker Hub.
 	// ** Note: To use this option, your project must be in Google Access for
 	// Private IPs Early Access Program.**
-	NoAddress bool `protobuf:"varint,7,opt,name=no_address,json=noAddress" json:"no_address,omitempty"`
+	NoAddress            bool     `protobuf:"varint,7,opt,name=no_address,json=noAddress,proto3" json:"no_address,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PipelineResources) Reset()                    { *m = PipelineResources{} }
-func (m *PipelineResources) String() string            { return proto.CompactTextString(m) }
-func (*PipelineResources) ProtoMessage()               {}
-func (*PipelineResources) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *PipelineResources) Reset()         { *m = PipelineResources{} }
+func (m *PipelineResources) String() string { return proto.CompactTextString(m) }
+func (*PipelineResources) ProtoMessage()    {}
+func (*PipelineResources) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{16}
+}
+func (m *PipelineResources) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PipelineResources.Unmarshal(m, b)
+}
+func (m *PipelineResources) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PipelineResources.Marshal(b, m, deterministic)
+}
+func (dst *PipelineResources) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PipelineResources.Merge(dst, src)
+}
+func (m *PipelineResources) XXX_Size() int {
+	return xxx_messageInfo_PipelineResources.Size(m)
+}
+func (m *PipelineResources) XXX_DiscardUnknown() {
+	xxx_messageInfo_PipelineResources.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PipelineResources proto.InternalMessageInfo
 
 func (m *PipelineResources) GetMinimumCpuCores() int32 {
 	if m != nil {
@@ -1072,34 +1441,56 @@ type PipelineResources_Disk struct {
 	// Required. The name of the disk that can be used in the pipeline
 	// parameters. Must be 1 - 63 characters.
 	// The name "boot" is reserved for system use.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The type of the disk to create.
-	Type PipelineResources_Disk_Type `protobuf:"varint,2,opt,name=type,enum=google.genomics.v1alpha2.PipelineResources_Disk_Type" json:"type,omitempty"`
+	Type PipelineResources_Disk_Type `protobuf:"varint,2,opt,name=type,proto3,enum=google.genomics.v1alpha2.PipelineResources_Disk_Type" json:"type,omitempty"`
 	// The size of the disk. Defaults to 500 (GB).
 	// This field is not applicable for local SSD.
-	SizeGb int32 `protobuf:"varint,3,opt,name=size_gb,json=sizeGb" json:"size_gb,omitempty"`
+	SizeGb int32 `protobuf:"varint,3,opt,name=size_gb,json=sizeGb,proto3" json:"size_gb,omitempty"`
 	// The full or partial URL of the persistent disk to attach. See
 	// https://cloud.google.com/compute/docs/reference/latest/instances#resource
 	// and
 	// https://cloud.google.com/compute/docs/disks/persistent-disks#snapshots
 	// for more details.
-	Source string `protobuf:"bytes,4,opt,name=source" json:"source,omitempty"`
+	Source string `protobuf:"bytes,4,opt,name=source,proto3" json:"source,omitempty"`
 	// Deprecated. Disks created by the Pipelines API will be deleted at the end
 	// of the pipeline run, regardless of what this field is set to.
-	AutoDelete bool `protobuf:"varint,6,opt,name=auto_delete,json=autoDelete" json:"auto_delete,omitempty"`
+	AutoDelete bool `protobuf:"varint,6,opt,name=auto_delete,json=autoDelete,proto3" json:"auto_delete,omitempty"`
 	// Required at create time and cannot be overridden at run time.
 	// Specifies the path in the docker container where files on
 	// this disk should be located. For example, if `mountPoint`
 	// is `/mnt/disk`, and the parameter has `localPath`
 	// `inputs/file.txt`, the docker container can access the data at
 	// `/mnt/disk/inputs/file.txt`.
-	MountPoint string `protobuf:"bytes,8,opt,name=mount_point,json=mountPoint" json:"mount_point,omitempty"`
+	MountPoint           string   `protobuf:"bytes,8,opt,name=mount_point,json=mountPoint,proto3" json:"mount_point,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PipelineResources_Disk) Reset()                    { *m = PipelineResources_Disk{} }
-func (m *PipelineResources_Disk) String() string            { return proto.CompactTextString(m) }
-func (*PipelineResources_Disk) ProtoMessage()               {}
-func (*PipelineResources_Disk) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16, 0} }
+func (m *PipelineResources_Disk) Reset()         { *m = PipelineResources_Disk{} }
+func (m *PipelineResources_Disk) String() string { return proto.CompactTextString(m) }
+func (*PipelineResources_Disk) ProtoMessage()    {}
+func (*PipelineResources_Disk) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{16, 0}
+}
+func (m *PipelineResources_Disk) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PipelineResources_Disk.Unmarshal(m, b)
+}
+func (m *PipelineResources_Disk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PipelineResources_Disk.Marshal(b, m, deterministic)
+}
+func (dst *PipelineResources_Disk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PipelineResources_Disk.Merge(dst, src)
+}
+func (m *PipelineResources_Disk) XXX_Size() int {
+	return xxx_messageInfo_PipelineResources_Disk.Size(m)
+}
+func (m *PipelineResources_Disk) XXX_DiscardUnknown() {
+	xxx_messageInfo_PipelineResources_Disk.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PipelineResources_Disk proto.InternalMessageInfo
 
 func (m *PipelineResources_Disk) GetName() string {
 	if m != nil {
@@ -1237,24 +1628,46 @@ func (m *PipelineResources_Disk) GetMountPoint() string {
 type PipelineParameter struct {
 	// Required. Name of the parameter - the pipeline runner uses this string
 	// as the key to the input and output maps in RunPipeline.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Human-readable description.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// The default value for this parameter. Can be overridden at runtime.
 	// If `localCopy` is present, then this must be a Google Cloud Storage path
 	// beginning with `gs://`.
-	DefaultValue string `protobuf:"bytes,5,opt,name=default_value,json=defaultValue" json:"default_value,omitempty"`
+	DefaultValue string `protobuf:"bytes,5,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
 	// If present, this parameter is marked for copying to and from the VM.
 	// `LocalCopy` indicates where on the VM the file should be. The value
 	// given to this parameter (either at runtime or using `defaultValue`)
 	// must be the remote path where the file should be.
-	LocalCopy *PipelineParameter_LocalCopy `protobuf:"bytes,6,opt,name=local_copy,json=localCopy" json:"local_copy,omitempty"`
+	LocalCopy            *PipelineParameter_LocalCopy `protobuf:"bytes,6,opt,name=local_copy,json=localCopy,proto3" json:"local_copy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *PipelineParameter) Reset()         { *m = PipelineParameter{} }
+func (m *PipelineParameter) String() string { return proto.CompactTextString(m) }
+func (*PipelineParameter) ProtoMessage()    {}
+func (*PipelineParameter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{17}
+}
+func (m *PipelineParameter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PipelineParameter.Unmarshal(m, b)
+}
+func (m *PipelineParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PipelineParameter.Marshal(b, m, deterministic)
+}
+func (dst *PipelineParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PipelineParameter.Merge(dst, src)
+}
+func (m *PipelineParameter) XXX_Size() int {
+	return xxx_messageInfo_PipelineParameter.Size(m)
+}
+func (m *PipelineParameter) XXX_DiscardUnknown() {
+	xxx_messageInfo_PipelineParameter.DiscardUnknown(m)
 }
 
-func (m *PipelineParameter) Reset()                    { *m = PipelineParameter{} }
-func (m *PipelineParameter) String() string            { return proto.CompactTextString(m) }
-func (*PipelineParameter) ProtoMessage()               {}
-func (*PipelineParameter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+var xxx_messageInfo_PipelineParameter proto.InternalMessageInfo
 
 func (m *PipelineParameter) GetName() string {
 	if m != nil {
@@ -1289,18 +1702,40 @@ type PipelineParameter_LocalCopy struct {
 	// Required. The path within the user's docker container where
 	// this input should be localized to and from, relative to the specified
 	// disk's mount point. For example: file.txt,
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
+	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// Required. The name of the disk where this parameter is
 	// located. Can be the name of one of the disks specified in the
 	// Resources field, or "boot", which represents the Docker
 	// instance's boot disk and has a mount point of `/`.
-	Disk string `protobuf:"bytes,2,opt,name=disk" json:"disk,omitempty"`
+	Disk                 string   `protobuf:"bytes,2,opt,name=disk,proto3" json:"disk,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PipelineParameter_LocalCopy) Reset()         { *m = PipelineParameter_LocalCopy{} }
+func (m *PipelineParameter_LocalCopy) String() string { return proto.CompactTextString(m) }
+func (*PipelineParameter_LocalCopy) ProtoMessage()    {}
+func (*PipelineParameter_LocalCopy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{17, 0}
+}
+func (m *PipelineParameter_LocalCopy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PipelineParameter_LocalCopy.Unmarshal(m, b)
+}
+func (m *PipelineParameter_LocalCopy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PipelineParameter_LocalCopy.Marshal(b, m, deterministic)
+}
+func (dst *PipelineParameter_LocalCopy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PipelineParameter_LocalCopy.Merge(dst, src)
+}
+func (m *PipelineParameter_LocalCopy) XXX_Size() int {
+	return xxx_messageInfo_PipelineParameter_LocalCopy.Size(m)
+}
+func (m *PipelineParameter_LocalCopy) XXX_DiscardUnknown() {
+	xxx_messageInfo_PipelineParameter_LocalCopy.DiscardUnknown(m)
 }
 
-func (m *PipelineParameter_LocalCopy) Reset()                    { *m = PipelineParameter_LocalCopy{} }
-func (m *PipelineParameter_LocalCopy) String() string            { return proto.CompactTextString(m) }
-func (*PipelineParameter_LocalCopy) ProtoMessage()               {}
-func (*PipelineParameter_LocalCopy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17, 0} }
+var xxx_messageInfo_PipelineParameter_LocalCopy proto.InternalMessageInfo
 
 func (m *PipelineParameter_LocalCopy) GetPath() string {
 	if m != nil {
@@ -1320,7 +1755,7 @@ func (m *PipelineParameter_LocalCopy) GetDisk() string {
 type DockerExecutor struct {
 	// Required. Image name from either Docker Hub or Google Container Registry.
 	// Users that run pipelines must have READ access to the image.
-	ImageName string `protobuf:"bytes,1,opt,name=image_name,json=imageName" json:"image_name,omitempty"`
+	ImageName string `protobuf:"bytes,1,opt,name=image_name,json=imageName,proto3" json:"image_name,omitempty"`
 	// Required. The command or newline delimited script to run. The command
 	// string will be executed within a bash shell.
 	//
@@ -1329,13 +1764,35 @@ type DockerExecutor struct {
 	// [`error`][google.longrunning.Operation.error] field will be populated.
 	//
 	// Maximum command string length is 16384.
-	Cmd string `protobuf:"bytes,2,opt,name=cmd" json:"cmd,omitempty"`
+	Cmd                  string   `protobuf:"bytes,2,opt,name=cmd,proto3" json:"cmd,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DockerExecutor) Reset()                    { *m = DockerExecutor{} }
-func (m *DockerExecutor) String() string            { return proto.CompactTextString(m) }
-func (*DockerExecutor) ProtoMessage()               {}
-func (*DockerExecutor) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *DockerExecutor) Reset()         { *m = DockerExecutor{} }
+func (m *DockerExecutor) String() string { return proto.CompactTextString(m) }
+func (*DockerExecutor) ProtoMessage()    {}
+func (*DockerExecutor) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pipelines_55609b41fbfd863e, []int{18}
+}
+func (m *DockerExecutor) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DockerExecutor.Unmarshal(m, b)
+}
+func (m *DockerExecutor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DockerExecutor.Marshal(b, m, deterministic)
+}
+func (dst *DockerExecutor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DockerExecutor.Merge(dst, src)
+}
+func (m *DockerExecutor) XXX_Size() int {
+	return xxx_messageInfo_DockerExecutor.Size(m)
+}
+func (m *DockerExecutor) XXX_DiscardUnknown() {
+	xxx_messageInfo_DockerExecutor.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DockerExecutor proto.InternalMessageInfo
 
 func (m *DockerExecutor) GetImageName() string {
 	if m != nil {
@@ -1357,6 +1814,9 @@ func init() {
 	proto.RegisterType((*Pipeline)(nil), "google.genomics.v1alpha2.Pipeline")
 	proto.RegisterType((*CreatePipelineRequest)(nil), "google.genomics.v1alpha2.CreatePipelineRequest")
 	proto.RegisterType((*RunPipelineArgs)(nil), "google.genomics.v1alpha2.RunPipelineArgs")
+	proto.RegisterMapType((map[string]string)(nil), "google.genomics.v1alpha2.RunPipelineArgs.InputsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.genomics.v1alpha2.RunPipelineArgs.LabelsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.genomics.v1alpha2.RunPipelineArgs.OutputsEntry")
 	proto.RegisterType((*RunPipelineRequest)(nil), "google.genomics.v1alpha2.RunPipelineRequest")
 	proto.RegisterType((*GetPipelineRequest)(nil), "google.genomics.v1alpha2.GetPipelineRequest")
 	proto.RegisterType((*ListPipelinesRequest)(nil), "google.genomics.v1alpha2.ListPipelinesRequest")
@@ -1364,6 +1824,10 @@ func init() {
 	proto.RegisterType((*DeletePipelineRequest)(nil), "google.genomics.v1alpha2.DeletePipelineRequest")
 	proto.RegisterType((*GetControllerConfigRequest)(nil), "google.genomics.v1alpha2.GetControllerConfigRequest")
 	proto.RegisterType((*ControllerConfig)(nil), "google.genomics.v1alpha2.ControllerConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.genomics.v1alpha2.ControllerConfig.DisksEntry")
+	proto.RegisterMapType((map[string]*ControllerConfig_RepeatedString)(nil), "google.genomics.v1alpha2.ControllerConfig.GcsSinksEntry")
+	proto.RegisterMapType((map[string]*ControllerConfig_RepeatedString)(nil), "google.genomics.v1alpha2.ControllerConfig.GcsSourcesEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.genomics.v1alpha2.ControllerConfig.VarsEntry")
 	proto.RegisterType((*ControllerConfig_RepeatedString)(nil), "google.genomics.v1alpha2.ControllerConfig.RepeatedString")
 	proto.RegisterType((*TimestampEvent)(nil), "google.genomics.v1alpha2.TimestampEvent")
 	proto.RegisterType((*SetOperationStatusRequest)(nil), "google.genomics.v1alpha2.SetOperationStatusRequest")
@@ -1385,8 +1849,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for PipelinesV1Alpha2 service
-
+// PipelinesV1Alpha2Client is the client API for PipelinesV1Alpha2 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type PipelinesV1Alpha2Client interface {
 	// Creates a pipeline that can be run later. Create takes a Pipeline that
 	// has all fields other than `pipelineId` populated, and then returns
@@ -1402,7 +1867,7 @@ type PipelinesV1Alpha2Client interface {
 	// The caller must have READ permission to the project where the pipeline
 	// is stored and WRITE permission to the project where the pipeline will be
 	// run, as VMs will be created and storage will be used.
-	RunPipeline(ctx context.Context, in *RunPipelineRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	RunPipeline(ctx context.Context, in *RunPipelineRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Retrieves a pipeline based on ID.
 	//
 	// Caller must have READ permission to the project.
@@ -1414,14 +1879,14 @@ type PipelinesV1Alpha2Client interface {
 	// Deletes a pipeline based on ID.
 	//
 	// Caller must have WRITE permission to the project.
-	DeletePipeline(ctx context.Context, in *DeletePipelineRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeletePipeline(ctx context.Context, in *DeletePipelineRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Gets controller configuration information. Should only be called
 	// by VMs created by the Pipelines Service and not by end users.
 	GetControllerConfig(ctx context.Context, in *GetControllerConfigRequest, opts ...grpc.CallOption) (*ControllerConfig, error)
 	// Sets status of a given operation. Any new timestamps (as determined by
 	// description) are appended to TimestampEvents. Should only be called by VMs
 	// created by the Pipelines Service and not by end users.
-	SetOperationStatus(ctx context.Context, in *SetOperationStatusRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	SetOperationStatus(ctx context.Context, in *SetOperationStatusRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type pipelinesV1Alpha2Client struct {
@@ -1434,16 +1899,16 @@ func NewPipelinesV1Alpha2Client(cc *grpc.ClientConn) PipelinesV1Alpha2Client {
 
 func (c *pipelinesV1Alpha2Client) CreatePipeline(ctx context.Context, in *CreatePipelineRequest, opts ...grpc.CallOption) (*Pipeline, error) {
 	out := new(Pipeline)
-	err := grpc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/CreatePipeline", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/CreatePipeline", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *pipelinesV1Alpha2Client) RunPipeline(ctx context.Context, in *RunPipelineRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/RunPipeline", in, out, c.cc, opts...)
+func (c *pipelinesV1Alpha2Client) RunPipeline(ctx context.Context, in *RunPipelineRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/RunPipeline", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1452,7 +1917,7 @@ func (c *pipelinesV1Alpha2Client) RunPipeline(ctx context.Context, in *RunPipeli
 
 func (c *pipelinesV1Alpha2Client) GetPipeline(ctx context.Context, in *GetPipelineRequest, opts ...grpc.CallOption) (*Pipeline, error) {
 	out := new(Pipeline)
-	err := grpc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/GetPipeline", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/GetPipeline", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1461,16 +1926,16 @@ func (c *pipelinesV1Alpha2Client) GetPipeline(ctx context.Context, in *GetPipeli
 
 func (c *pipelinesV1Alpha2Client) ListPipelines(ctx context.Context, in *ListPipelinesRequest, opts ...grpc.CallOption) (*ListPipelinesResponse, error) {
 	out := new(ListPipelinesResponse)
-	err := grpc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/ListPipelines", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/ListPipelines", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *pipelinesV1Alpha2Client) DeletePipeline(ctx context.Context, in *DeletePipelineRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/DeletePipeline", in, out, c.cc, opts...)
+func (c *pipelinesV1Alpha2Client) DeletePipeline(ctx context.Context, in *DeletePipelineRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/DeletePipeline", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1479,24 +1944,23 @@ func (c *pipelinesV1Alpha2Client) DeletePipeline(ctx context.Context, in *Delete
 
 func (c *pipelinesV1Alpha2Client) GetControllerConfig(ctx context.Context, in *GetControllerConfigRequest, opts ...grpc.CallOption) (*ControllerConfig, error) {
 	out := new(ControllerConfig)
-	err := grpc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/GetControllerConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/GetControllerConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *pipelinesV1Alpha2Client) SetOperationStatus(ctx context.Context, in *SetOperationStatusRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/SetOperationStatus", in, out, c.cc, opts...)
+func (c *pipelinesV1Alpha2Client) SetOperationStatus(ctx context.Context, in *SetOperationStatusRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.genomics.v1alpha2.PipelinesV1Alpha2/SetOperationStatus", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for PipelinesV1Alpha2 service
-
+// PipelinesV1Alpha2Server is the server API for PipelinesV1Alpha2 service.
 type PipelinesV1Alpha2Server interface {
 	// Creates a pipeline that can be run later. Create takes a Pipeline that
 	// has all fields other than `pipelineId` populated, and then returns
@@ -1512,7 +1976,7 @@ type PipelinesV1Alpha2Server interface {
 	// The caller must have READ permission to the project where the pipeline
 	// is stored and WRITE permission to the project where the pipeline will be
 	// run, as VMs will be created and storage will be used.
-	RunPipeline(context.Context, *RunPipelineRequest) (*google_longrunning.Operation, error)
+	RunPipeline(context.Context, *RunPipelineRequest) (*longrunning.Operation, error)
 	// Retrieves a pipeline based on ID.
 	//
 	// Caller must have READ permission to the project.
@@ -1524,14 +1988,14 @@ type PipelinesV1Alpha2Server interface {
 	// Deletes a pipeline based on ID.
 	//
 	// Caller must have WRITE permission to the project.
-	DeletePipeline(context.Context, *DeletePipelineRequest) (*google_protobuf2.Empty, error)
+	DeletePipeline(context.Context, *DeletePipelineRequest) (*empty.Empty, error)
 	// Gets controller configuration information. Should only be called
 	// by VMs created by the Pipelines Service and not by end users.
 	GetControllerConfig(context.Context, *GetControllerConfigRequest) (*ControllerConfig, error)
 	// Sets status of a given operation. Any new timestamps (as determined by
 	// description) are appended to TimestampEvents. Should only be called by VMs
 	// created by the Pipelines Service and not by end users.
-	SetOperationStatus(context.Context, *SetOperationStatusRequest) (*google_protobuf2.Empty, error)
+	SetOperationStatus(context.Context, *SetOperationStatusRequest) (*empty.Empty, error)
 }
 
 func RegisterPipelinesV1Alpha2Server(s *grpc.Server, srv PipelinesV1Alpha2Server) {
@@ -1701,9 +2165,11 @@ var _PipelinesV1Alpha2_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/genomics/v1alpha2/pipelines.proto",
 }
 
-func init() { proto.RegisterFile("google/genomics/v1alpha2/pipelines.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/genomics/v1alpha2/pipelines.proto", fileDescriptor_pipelines_55609b41fbfd863e)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_pipelines_55609b41fbfd863e = []byte{
 	// 2065 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x73, 0xdb, 0xc8,
 	0xd1, 0x36, 0x28, 0x4a, 0x22, 0x9a, 0x12, 0x45, 0xcf, 0xda, 0x6b, 0x9a, 0xf6, 0xbe, 0xb6, 0xe1,
diff --git a/vendor/google.golang.org/genproto/googleapis/home/graph/v1/device.pb.go b/vendor/google.golang.org/genproto/googleapis/home/graph/v1/device.pb.go
new file mode 100644
index 00000000..bff02243
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/home/graph/v1/device.pb.go
@@ -0,0 +1,316 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/home/graph/v1/device.proto
+
+package graph // import "google.golang.org/genproto/googleapis/home/graph/v1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Third-party partner's device definition.
+type Device struct {
+	// Third-party partner's device ID.
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	// Hardware type of the device (e.g. light, outlet, etc).
+	Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"`
+	// Traits supported by the device.
+	Traits []string `protobuf:"bytes,3,rep,name=traits,proto3" json:"traits,omitempty"`
+	// Name of the device given by the third party. This includes names given to
+	// the device via third party device manufacturer's app, model names for the
+	// device, etc.
+	Name *DeviceNames `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	// Indicates whether the state of this device is being reported to Google
+	// through ReportStateAndNotification call.
+	WillReportState bool `protobuf:"varint,5,opt,name=will_report_state,json=willReportState,proto3" json:"will_report_state,omitempty"`
+	// If the third-party partner's cloud configuration includes placing devices
+	// in rooms, the name of the room can be provided here.
+	RoomHint string `protobuf:"bytes,6,opt,name=room_hint,json=roomHint,proto3" json:"room_hint,omitempty"`
+	// As in roomHint, for structures that users set up in the partner's system.
+	StructureHint string `protobuf:"bytes,7,opt,name=structure_hint,json=structureHint,proto3" json:"structure_hint,omitempty"`
+	// Device manufacturer, model, hardware version, and software version.
+	DeviceInfo *DeviceInfo `protobuf:"bytes,8,opt,name=device_info,json=deviceInfo,proto3" json:"device_info,omitempty"`
+	// Attributes for the traits supported by the device.
+	Attributes *_struct.Struct `protobuf:"bytes,9,opt,name=attributes,proto3" json:"attributes,omitempty"`
+	// Custom JSON data provided by the manufacturer and attached to QUERY and
+	// EXECUTE requests in AoG.
+	CustomData           string   `protobuf:"bytes,10,opt,name=custom_data,json=customData,proto3" json:"custom_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Device) Reset()         { *m = Device{} }
+func (m *Device) String() string { return proto.CompactTextString(m) }
+func (*Device) ProtoMessage()    {}
+func (*Device) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_8fc78cb86ce98100, []int{0}
+}
+func (m *Device) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Device.Unmarshal(m, b)
+}
+func (m *Device) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Device.Marshal(b, m, deterministic)
+}
+func (dst *Device) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Device.Merge(dst, src)
+}
+func (m *Device) XXX_Size() int {
+	return xxx_messageInfo_Device.Size(m)
+}
+func (m *Device) XXX_DiscardUnknown() {
+	xxx_messageInfo_Device.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Device proto.InternalMessageInfo
+
+func (m *Device) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *Device) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *Device) GetTraits() []string {
+	if m != nil {
+		return m.Traits
+	}
+	return nil
+}
+
+func (m *Device) GetName() *DeviceNames {
+	if m != nil {
+		return m.Name
+	}
+	return nil
+}
+
+func (m *Device) GetWillReportState() bool {
+	if m != nil {
+		return m.WillReportState
+	}
+	return false
+}
+
+func (m *Device) GetRoomHint() string {
+	if m != nil {
+		return m.RoomHint
+	}
+	return ""
+}
+
+func (m *Device) GetStructureHint() string {
+	if m != nil {
+		return m.StructureHint
+	}
+	return ""
+}
+
+func (m *Device) GetDeviceInfo() *DeviceInfo {
+	if m != nil {
+		return m.DeviceInfo
+	}
+	return nil
+}
+
+func (m *Device) GetAttributes() *_struct.Struct {
+	if m != nil {
+		return m.Attributes
+	}
+	return nil
+}
+
+func (m *Device) GetCustomData() string {
+	if m != nil {
+		return m.CustomData
+	}
+	return ""
+}
+
+// Different names for the device.
+type DeviceNames struct {
+	// Primary name of the device, generally provided by the user.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Additional names provided by the user for the device.
+	Nicknames []string `protobuf:"bytes,2,rep,name=nicknames,proto3" json:"nicknames,omitempty"`
+	// List of names provided by the partner rather than the user, often
+	// manufacturer names, SKUs, etc.
+	DefaultNames         []string `protobuf:"bytes,3,rep,name=default_names,json=defaultNames,proto3" json:"default_names,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeviceNames) Reset()         { *m = DeviceNames{} }
+func (m *DeviceNames) String() string { return proto.CompactTextString(m) }
+func (*DeviceNames) ProtoMessage()    {}
+func (*DeviceNames) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_8fc78cb86ce98100, []int{1}
+}
+func (m *DeviceNames) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceNames.Unmarshal(m, b)
+}
+func (m *DeviceNames) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceNames.Marshal(b, m, deterministic)
+}
+func (dst *DeviceNames) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceNames.Merge(dst, src)
+}
+func (m *DeviceNames) XXX_Size() int {
+	return xxx_messageInfo_DeviceNames.Size(m)
+}
+func (m *DeviceNames) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceNames.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeviceNames proto.InternalMessageInfo
+
+func (m *DeviceNames) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *DeviceNames) GetNicknames() []string {
+	if m != nil {
+		return m.Nicknames
+	}
+	return nil
+}
+
+func (m *DeviceNames) GetDefaultNames() []string {
+	if m != nil {
+		return m.DefaultNames
+	}
+	return nil
+}
+
+// Device information.
+type DeviceInfo struct {
+	// Device manufacturer.
+	Manufacturer string `protobuf:"bytes,1,opt,name=manufacturer,proto3" json:"manufacturer,omitempty"`
+	// Device model.
+	Model string `protobuf:"bytes,2,opt,name=model,proto3" json:"model,omitempty"`
+	// Device hardware version.
+	HwVersion string `protobuf:"bytes,3,opt,name=hw_version,json=hwVersion,proto3" json:"hw_version,omitempty"`
+	// Device software version.
+	SwVersion            string   `protobuf:"bytes,4,opt,name=sw_version,json=swVersion,proto3" json:"sw_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeviceInfo) Reset()         { *m = DeviceInfo{} }
+func (m *DeviceInfo) String() string { return proto.CompactTextString(m) }
+func (*DeviceInfo) ProtoMessage()    {}
+func (*DeviceInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_device_8fc78cb86ce98100, []int{2}
+}
+func (m *DeviceInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeviceInfo.Unmarshal(m, b)
+}
+func (m *DeviceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeviceInfo.Marshal(b, m, deterministic)
+}
+func (dst *DeviceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeviceInfo.Merge(dst, src)
+}
+func (m *DeviceInfo) XXX_Size() int {
+	return xxx_messageInfo_DeviceInfo.Size(m)
+}
+func (m *DeviceInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeviceInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeviceInfo proto.InternalMessageInfo
+
+func (m *DeviceInfo) GetManufacturer() string {
+	if m != nil {
+		return m.Manufacturer
+	}
+	return ""
+}
+
+func (m *DeviceInfo) GetModel() string {
+	if m != nil {
+		return m.Model
+	}
+	return ""
+}
+
+func (m *DeviceInfo) GetHwVersion() string {
+	if m != nil {
+		return m.HwVersion
+	}
+	return ""
+}
+
+func (m *DeviceInfo) GetSwVersion() string {
+	if m != nil {
+		return m.SwVersion
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Device)(nil), "google.home.graph.v1.Device")
+	proto.RegisterType((*DeviceNames)(nil), "google.home.graph.v1.DeviceNames")
+	proto.RegisterType((*DeviceInfo)(nil), "google.home.graph.v1.DeviceInfo")
+}
+
+func init() {
+	proto.RegisterFile("google/home/graph/v1/device.proto", fileDescriptor_device_8fc78cb86ce98100)
+}
+
+var fileDescriptor_device_8fc78cb86ce98100 = []byte{
+	// 470 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xc1, 0x6f, 0xd4, 0x3c,
+	0x10, 0xc5, 0x95, 0xdd, 0xed, 0x7e, 0x9b, 0xd9, 0xb6, 0x9f, 0xb0, 0x2a, 0xb0, 0xa0, 0x88, 0x74,
+	0x11, 0xd2, 0x8a, 0x43, 0xa2, 0x82, 0x10, 0x42, 0x9c, 0xa8, 0x7a, 0x80, 0x0b, 0x42, 0xa9, 0xc4,
+	0x81, 0x4b, 0xe4, 0x4d, 0x9c, 0xc4, 0x22, 0xb1, 0x23, 0x7b, 0xb2, 0x2b, 0xee, 0x1c, 0xf8, 0xb3,
+	0x51, 0xc6, 0xd9, 0x6e, 0x2b, 0x55, 0xdc, 0xc6, 0xef, 0xfd, 0x3c, 0x1e, 0x3f, 0x27, 0x70, 0x51,
+	0x19, 0x53, 0x35, 0x32, 0xa9, 0x4d, 0x2b, 0x93, 0xca, 0x8a, 0xae, 0x4e, 0xb6, 0x97, 0x49, 0x21,
+	0xb7, 0x2a, 0x97, 0x71, 0x67, 0x0d, 0x1a, 0x76, 0xe6, 0x91, 0x78, 0x40, 0x62, 0x42, 0xe2, 0xed,
+	0xe5, 0xd3, 0xf3, 0x71, 0x23, 0x31, 0x9b, 0xbe, 0x4c, 0x1c, 0xda, 0x3e, 0x47, 0xbf, 0x67, 0xf5,
+	0x67, 0x0a, 0xf3, 0x6b, 0x6a, 0xc2, 0x4e, 0x61, 0xa2, 0x0a, 0x1e, 0x44, 0xc1, 0x3a, 0x4c, 0x27,
+	0xaa, 0x60, 0x0c, 0x66, 0xf8, 0xab, 0x93, 0x7c, 0x42, 0x0a, 0xd5, 0xec, 0x31, 0xcc, 0xd1, 0x0a,
+	0x85, 0x8e, 0x4f, 0xa3, 0xe9, 0x3a, 0x4c, 0xc7, 0x15, 0x7b, 0x07, 0x33, 0x2d, 0x5a, 0xc9, 0x67,
+	0x51, 0xb0, 0x5e, 0xbe, 0xb9, 0x88, 0x1f, 0x9a, 0x24, 0xf6, 0xe7, 0x7c, 0x15, 0xad, 0x74, 0x29,
+	0xe1, 0xec, 0x35, 0x3c, 0xda, 0xa9, 0xa6, 0xc9, 0xac, 0xec, 0x8c, 0xc5, 0xcc, 0xa1, 0x40, 0xc9,
+	0x8f, 0xa2, 0x60, 0xbd, 0x48, 0xff, 0x1f, 0x8c, 0x94, 0xf4, 0x9b, 0x41, 0x66, 0xcf, 0x20, 0xb4,
+	0xc6, 0xb4, 0x59, 0xad, 0x34, 0xf2, 0x39, 0xcd, 0xb4, 0x18, 0x84, 0xcf, 0x4a, 0x23, 0x7b, 0x05,
+	0xa7, 0xfe, 0x5a, 0xbd, 0x95, 0x9e, 0xf8, 0x8f, 0x88, 0x93, 0x5b, 0x95, 0xb0, 0x4f, 0xb0, 0xf4,
+	0x89, 0x65, 0x4a, 0x97, 0x86, 0x2f, 0x68, 0xda, 0xe8, 0x5f, 0xd3, 0x7e, 0xd1, 0xa5, 0x49, 0xa1,
+	0xb8, 0xad, 0xd9, 0x7b, 0x00, 0x81, 0x68, 0xd5, 0xa6, 0x47, 0xe9, 0x78, 0x48, 0x1d, 0x9e, 0xec,
+	0x3b, 0xec, 0x33, 0x8e, 0x6f, 0xe8, 0xd8, 0xf4, 0x0e, 0xca, 0x5e, 0xc0, 0x32, 0xef, 0x1d, 0x9a,
+	0x36, 0x2b, 0x04, 0x0a, 0x0e, 0x34, 0x1f, 0x78, 0xe9, 0x5a, 0xa0, 0x58, 0x15, 0xb0, 0xbc, 0x93,
+	0xd0, 0x10, 0x3f, 0x45, 0xea, 0x1f, 0xc4, 0xe7, 0x75, 0x0e, 0xa1, 0x56, 0xf9, 0xcf, 0xa1, 0x76,
+	0x7c, 0x42, 0x2f, 0x70, 0x10, 0xd8, 0x4b, 0x38, 0x29, 0x64, 0x29, 0xfa, 0x06, 0x33, 0x4f, 0xf8,
+	0x37, 0x3a, 0x1e, 0x45, 0x6a, 0xbb, 0xfa, 0x1d, 0x00, 0x1c, 0xae, 0xc6, 0x56, 0x70, 0xdc, 0x0a,
+	0xdd, 0x97, 0x82, 0x42, 0xb2, 0xe3, 0x69, 0xf7, 0x34, 0x76, 0x06, 0x47, 0xad, 0x29, 0x64, 0x33,
+	0x7e, 0x09, 0x7e, 0xc1, 0x9e, 0x03, 0xd4, 0xbb, 0x6c, 0x2b, 0xad, 0x53, 0x46, 0xf3, 0x29, 0x59,
+	0x61, 0xbd, 0xfb, 0xee, 0x85, 0xc1, 0x76, 0x07, 0x7b, 0xe6, 0x6d, 0xb7, 0xb7, 0xaf, 0x36, 0xc0,
+	0x73, 0xd3, 0x3e, 0x98, 0xfc, 0xd5, 0x18, 0xc3, 0xb7, 0x21, 0xcc, 0x1f, 0x1f, 0x46, 0xa4, 0x32,
+	0x8d, 0xd0, 0x55, 0x6c, 0x6c, 0x95, 0x54, 0x52, 0x53, 0xd0, 0x89, 0xb7, 0x44, 0xa7, 0xdc, 0xfd,
+	0xdf, 0xe2, 0x23, 0x15, 0x9b, 0x39, 0x51, 0x6f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x2a,
+	0xc2, 0xaf, 0x3b, 0x03, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/home/graph/v1/homegraph.pb.go b/vendor/google.golang.org/genproto/googleapis/home/graph/v1/homegraph.pb.go
new file mode 100644
index 00000000..24e609c5
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/home/graph/v1/homegraph.pb.go
@@ -0,0 +1,1257 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/home/graph/v1/homegraph.proto
+
+package graph // import "google.golang.org/genproto/googleapis/home/graph/v1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Request type for RequestSyncDevices call.
+type RequestSyncDevicesRequest struct {
+	// Required. Third-party user id issued by agent's third-party identity
+	// provider.
+	AgentUserId string `protobuf:"bytes,1,opt,name=agent_user_id,json=agentUserId,proto3" json:"agent_user_id,omitempty"`
+	// Optional. If set, the request will be added to a queue and a response will
+	// be returned immediately. The queue allows for de-duplication of
+	// simultaneous requests.
+	Async                bool     `protobuf:"varint,2,opt,name=async,proto3" json:"async,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RequestSyncDevicesRequest) Reset()         { *m = RequestSyncDevicesRequest{} }
+func (m *RequestSyncDevicesRequest) String() string { return proto.CompactTextString(m) }
+func (*RequestSyncDevicesRequest) ProtoMessage()    {}
+func (*RequestSyncDevicesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{0}
+}
+func (m *RequestSyncDevicesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RequestSyncDevicesRequest.Unmarshal(m, b)
+}
+func (m *RequestSyncDevicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RequestSyncDevicesRequest.Marshal(b, m, deterministic)
+}
+func (dst *RequestSyncDevicesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestSyncDevicesRequest.Merge(dst, src)
+}
+func (m *RequestSyncDevicesRequest) XXX_Size() int {
+	return xxx_messageInfo_RequestSyncDevicesRequest.Size(m)
+}
+func (m *RequestSyncDevicesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RequestSyncDevicesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RequestSyncDevicesRequest proto.InternalMessageInfo
+
+func (m *RequestSyncDevicesRequest) GetAgentUserId() string {
+	if m != nil {
+		return m.AgentUserId
+	}
+	return ""
+}
+
+func (m *RequestSyncDevicesRequest) GetAsync() bool {
+	if m != nil {
+		return m.Async
+	}
+	return false
+}
+
+// Response type for RequestSyncDevices call. Intentionally empty upon success.
+// An HTTP response code is returned with more details upon failure.
+type RequestSyncDevicesResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RequestSyncDevicesResponse) Reset()         { *m = RequestSyncDevicesResponse{} }
+func (m *RequestSyncDevicesResponse) String() string { return proto.CompactTextString(m) }
+func (*RequestSyncDevicesResponse) ProtoMessage()    {}
+func (*RequestSyncDevicesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{1}
+}
+func (m *RequestSyncDevicesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RequestSyncDevicesResponse.Unmarshal(m, b)
+}
+func (m *RequestSyncDevicesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RequestSyncDevicesResponse.Marshal(b, m, deterministic)
+}
+func (dst *RequestSyncDevicesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestSyncDevicesResponse.Merge(dst, src)
+}
+func (m *RequestSyncDevicesResponse) XXX_Size() int {
+	return xxx_messageInfo_RequestSyncDevicesResponse.Size(m)
+}
+func (m *RequestSyncDevicesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RequestSyncDevicesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RequestSyncDevicesResponse proto.InternalMessageInfo
+
+// Sample ReportStateAndNotificationRequest, with states and notifications
+// defined per device_id (eg: "123" and "456" in the following example):
+// {
+//   "requestId": "ff36a3cc-ec34-11e6-b1a0-64510650abcf",
+//   "agent_user_id": "1234",
+//   "payload": {
+//     "devices": {
+//       "states": {
+//         "123": {
+//           "on": true
+//         },
+//         "456": {
+//           "on": true,
+//           "brightness": 10
+//         }
+//       },
+//       "notifications": {
+//         "123": {
+//           "ObjectDetected": {
+//             "priority": 0,
+//             "objects": {
+//               "NAMED": ["Alice", "Bob", "Carol", "Eve"]
+//             }
+//           },
+//           "DoorUnlocked": {
+//             "priority": 0,
+//             "keyUsed": {
+//               "keyName": "Wife's key"
+//             }
+//           }
+//         },
+//         "456": {
+//           "SprinklersOn": {
+//             "priority": 0,
+//             "timeStarted": "1513792702"
+//           }
+//         }
+//       }
+//     }
+//   }
+// }
+// Request type for ReportStateAndNotification call. It may include States,
+// Notifications, or both. This request uses globally unique flattened state
+// names instead of namespaces based on traits to align with the existing QUERY
+// and EXECUTE APIs implemented by 90+ Smart Home partners.
+// Next tag: 6.
+type ReportStateAndNotificationRequest struct {
+	// Request id used for debugging.
+	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	// Unique identifier per event (eg: doorbell press).
+	EventId string `protobuf:"bytes,4,opt,name=event_id,json=eventId,proto3" json:"event_id,omitempty"`
+	// Required. Third-party user id.
+	AgentUserId string `protobuf:"bytes,2,opt,name=agent_user_id,json=agentUserId,proto3" json:"agent_user_id,omitempty"`
+	// Token to maintain state in the follow up notification response.
+	FollowUpToken string `protobuf:"bytes,5,opt,name=follow_up_token,json=followUpToken,proto3" json:"follow_up_token,omitempty"`
+	// State of devices to update and notification metadata for devices. For
+	// example, if a user turns a light on manually, a State update should be
+	// sent so that the information is always the current status of the device.
+	// Notifications are independent from the state and its piece of the payload
+	// should contain everything necessary to notify the user. Although it may be
+	// related to a state change, it does not need to be. For example, if a
+	// device can turn on/off and change temperature, the states reported would
+	// include both "on" and "70 degrees" but the 3p may choose not to send any
+	// notification for that, or to only say that the "the room is heating up",
+	// keeping state and notification independent.
+	Payload              *StateAndNotificationPayload `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *ReportStateAndNotificationRequest) Reset()         { *m = ReportStateAndNotificationRequest{} }
+func (m *ReportStateAndNotificationRequest) String() string { return proto.CompactTextString(m) }
+func (*ReportStateAndNotificationRequest) ProtoMessage()    {}
+func (*ReportStateAndNotificationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{2}
+}
+func (m *ReportStateAndNotificationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportStateAndNotificationRequest.Unmarshal(m, b)
+}
+func (m *ReportStateAndNotificationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportStateAndNotificationRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReportStateAndNotificationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportStateAndNotificationRequest.Merge(dst, src)
+}
+func (m *ReportStateAndNotificationRequest) XXX_Size() int {
+	return xxx_messageInfo_ReportStateAndNotificationRequest.Size(m)
+}
+func (m *ReportStateAndNotificationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportStateAndNotificationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReportStateAndNotificationRequest proto.InternalMessageInfo
+
+func (m *ReportStateAndNotificationRequest) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
+func (m *ReportStateAndNotificationRequest) GetEventId() string {
+	if m != nil {
+		return m.EventId
+	}
+	return ""
+}
+
+func (m *ReportStateAndNotificationRequest) GetAgentUserId() string {
+	if m != nil {
+		return m.AgentUserId
+	}
+	return ""
+}
+
+func (m *ReportStateAndNotificationRequest) GetFollowUpToken() string {
+	if m != nil {
+		return m.FollowUpToken
+	}
+	return ""
+}
+
+func (m *ReportStateAndNotificationRequest) GetPayload() *StateAndNotificationPayload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+// Response type for ReportStateAndNotification call.
+type ReportStateAndNotificationResponse struct {
+	// Request id copied from ReportStateAndNotificationRequest.
+	RequestId            string   `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReportStateAndNotificationResponse) Reset()         { *m = ReportStateAndNotificationResponse{} }
+func (m *ReportStateAndNotificationResponse) String() string { return proto.CompactTextString(m) }
+func (*ReportStateAndNotificationResponse) ProtoMessage()    {}
+func (*ReportStateAndNotificationResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{3}
+}
+func (m *ReportStateAndNotificationResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportStateAndNotificationResponse.Unmarshal(m, b)
+}
+func (m *ReportStateAndNotificationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportStateAndNotificationResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReportStateAndNotificationResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportStateAndNotificationResponse.Merge(dst, src)
+}
+func (m *ReportStateAndNotificationResponse) XXX_Size() int {
+	return xxx_messageInfo_ReportStateAndNotificationResponse.Size(m)
+}
+func (m *ReportStateAndNotificationResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportStateAndNotificationResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReportStateAndNotificationResponse proto.InternalMessageInfo
+
+func (m *ReportStateAndNotificationResponse) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
+// Payload containing the State and Notification information for devices.
+type StateAndNotificationPayload struct {
+	// The devices for updating State and sending Notifications.
+	Devices              *ReportStateAndNotificationDevice `protobuf:"bytes,1,opt,name=devices,proto3" json:"devices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *StateAndNotificationPayload) Reset()         { *m = StateAndNotificationPayload{} }
+func (m *StateAndNotificationPayload) String() string { return proto.CompactTextString(m) }
+func (*StateAndNotificationPayload) ProtoMessage()    {}
+func (*StateAndNotificationPayload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{4}
+}
+func (m *StateAndNotificationPayload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StateAndNotificationPayload.Unmarshal(m, b)
+}
+func (m *StateAndNotificationPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StateAndNotificationPayload.Marshal(b, m, deterministic)
+}
+func (dst *StateAndNotificationPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StateAndNotificationPayload.Merge(dst, src)
+}
+func (m *StateAndNotificationPayload) XXX_Size() int {
+	return xxx_messageInfo_StateAndNotificationPayload.Size(m)
+}
+func (m *StateAndNotificationPayload) XXX_DiscardUnknown() {
+	xxx_messageInfo_StateAndNotificationPayload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StateAndNotificationPayload proto.InternalMessageInfo
+
+func (m *StateAndNotificationPayload) GetDevices() *ReportStateAndNotificationDevice {
+	if m != nil {
+		return m.Devices
+	}
+	return nil
+}
+
+// The States and Notifications specific to a device.
+type ReportStateAndNotificationDevice struct {
+	// States of devices to update.
+	States *_struct.Struct `protobuf:"bytes,1,opt,name=states,proto3" json:"states,omitempty"`
+	// Notifications metadata for devices.
+	Notifications        *_struct.Struct `protobuf:"bytes,2,opt,name=notifications,proto3" json:"notifications,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *ReportStateAndNotificationDevice) Reset()         { *m = ReportStateAndNotificationDevice{} }
+func (m *ReportStateAndNotificationDevice) String() string { return proto.CompactTextString(m) }
+func (*ReportStateAndNotificationDevice) ProtoMessage()    {}
+func (*ReportStateAndNotificationDevice) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{5}
+}
+func (m *ReportStateAndNotificationDevice) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReportStateAndNotificationDevice.Unmarshal(m, b)
+}
+func (m *ReportStateAndNotificationDevice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReportStateAndNotificationDevice.Marshal(b, m, deterministic)
+}
+func (dst *ReportStateAndNotificationDevice) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReportStateAndNotificationDevice.Merge(dst, src)
+}
+func (m *ReportStateAndNotificationDevice) XXX_Size() int {
+	return xxx_messageInfo_ReportStateAndNotificationDevice.Size(m)
+}
+func (m *ReportStateAndNotificationDevice) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReportStateAndNotificationDevice.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReportStateAndNotificationDevice proto.InternalMessageInfo
+
+func (m *ReportStateAndNotificationDevice) GetStates() *_struct.Struct {
+	if m != nil {
+		return m.States
+	}
+	return nil
+}
+
+func (m *ReportStateAndNotificationDevice) GetNotifications() *_struct.Struct {
+	if m != nil {
+		return m.Notifications
+	}
+	return nil
+}
+
+// Request type for DeleteAgentUser call.
+type DeleteAgentUserRequest struct {
+	// Request id used for debugging.
+	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	// Required. Third-party user id.
+	AgentUserId          string   `protobuf:"bytes,2,opt,name=agent_user_id,json=agentUserId,proto3" json:"agent_user_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteAgentUserRequest) Reset()         { *m = DeleteAgentUserRequest{} }
+func (m *DeleteAgentUserRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteAgentUserRequest) ProtoMessage()    {}
+func (*DeleteAgentUserRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{6}
+}
+func (m *DeleteAgentUserRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteAgentUserRequest.Unmarshal(m, b)
+}
+func (m *DeleteAgentUserRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteAgentUserRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteAgentUserRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAgentUserRequest.Merge(dst, src)
+}
+func (m *DeleteAgentUserRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteAgentUserRequest.Size(m)
+}
+func (m *DeleteAgentUserRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteAgentUserRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteAgentUserRequest proto.InternalMessageInfo
+
+func (m *DeleteAgentUserRequest) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
+func (m *DeleteAgentUserRequest) GetAgentUserId() string {
+	if m != nil {
+		return m.AgentUserId
+	}
+	return ""
+}
+
+// Request type for Query call. This should be the same format as the AoG
+// action.devices.QUERY request
+// (https://developers.google.com/actions/smarthome/create-app#actiondevicesquery)
+// with the exception of the extra "agent_user_id" and no "intent" and
+// "customData" field.
+type QueryRequest struct {
+	// Request ID used for debugging.
+	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	// Required. Third-party user ID.
+	AgentUserId string `protobuf:"bytes,2,opt,name=agent_user_id,json=agentUserId,proto3" json:"agent_user_id,omitempty"`
+	// Required. Inputs containing third-party partner's device IDs for which to
+	// get the device states.
+	Inputs               []*QueryRequestInput `protobuf:"bytes,3,rep,name=inputs,proto3" json:"inputs,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *QueryRequest) Reset()         { *m = QueryRequest{} }
+func (m *QueryRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryRequest) ProtoMessage()    {}
+func (*QueryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{7}
+}
+func (m *QueryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryRequest.Unmarshal(m, b)
+}
+func (m *QueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryRequest.Marshal(b, m, deterministic)
+}
+func (dst *QueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryRequest.Merge(dst, src)
+}
+func (m *QueryRequest) XXX_Size() int {
+	return xxx_messageInfo_QueryRequest.Size(m)
+}
+func (m *QueryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryRequest proto.InternalMessageInfo
+
+func (m *QueryRequest) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
+func (m *QueryRequest) GetAgentUserId() string {
+	if m != nil {
+		return m.AgentUserId
+	}
+	return ""
+}
+
+func (m *QueryRequest) GetInputs() []*QueryRequestInput {
+	if m != nil {
+		return m.Inputs
+	}
+	return nil
+}
+
+// Device ID inputs to QueryRequest.
+type QueryRequestInput struct {
+	// Payload containing third-party partner's device IDs.
+	Payload              *QueryRequestPayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *QueryRequestInput) Reset()         { *m = QueryRequestInput{} }
+func (m *QueryRequestInput) String() string { return proto.CompactTextString(m) }
+func (*QueryRequestInput) ProtoMessage()    {}
+func (*QueryRequestInput) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{8}
+}
+func (m *QueryRequestInput) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryRequestInput.Unmarshal(m, b)
+}
+func (m *QueryRequestInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryRequestInput.Marshal(b, m, deterministic)
+}
+func (dst *QueryRequestInput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryRequestInput.Merge(dst, src)
+}
+func (m *QueryRequestInput) XXX_Size() int {
+	return xxx_messageInfo_QueryRequestInput.Size(m)
+}
+func (m *QueryRequestInput) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryRequestInput.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryRequestInput proto.InternalMessageInfo
+
+func (m *QueryRequestInput) GetPayload() *QueryRequestPayload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+// Payload containing device IDs.
+type QueryRequestPayload struct {
+	// Third-party partner's device IDs to get device states for.
+	Devices              []*AgentDeviceId `protobuf:"bytes,1,rep,name=devices,proto3" json:"devices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *QueryRequestPayload) Reset()         { *m = QueryRequestPayload{} }
+func (m *QueryRequestPayload) String() string { return proto.CompactTextString(m) }
+func (*QueryRequestPayload) ProtoMessage()    {}
+func (*QueryRequestPayload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{9}
+}
+func (m *QueryRequestPayload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryRequestPayload.Unmarshal(m, b)
+}
+func (m *QueryRequestPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryRequestPayload.Marshal(b, m, deterministic)
+}
+func (dst *QueryRequestPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryRequestPayload.Merge(dst, src)
+}
+func (m *QueryRequestPayload) XXX_Size() int {
+	return xxx_messageInfo_QueryRequestPayload.Size(m)
+}
+func (m *QueryRequestPayload) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryRequestPayload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryRequestPayload proto.InternalMessageInfo
+
+func (m *QueryRequestPayload) GetDevices() []*AgentDeviceId {
+	if m != nil {
+		return m.Devices
+	}
+	return nil
+}
+
+// Third-party partner's device ID for one device.
+type AgentDeviceId struct {
+	// Third-party partner's device ID.
+	Id                   string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AgentDeviceId) Reset()         { *m = AgentDeviceId{} }
+func (m *AgentDeviceId) String() string { return proto.CompactTextString(m) }
+func (*AgentDeviceId) ProtoMessage()    {}
+func (*AgentDeviceId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{10}
+}
+func (m *AgentDeviceId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AgentDeviceId.Unmarshal(m, b)
+}
+func (m *AgentDeviceId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AgentDeviceId.Marshal(b, m, deterministic)
+}
+func (dst *AgentDeviceId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AgentDeviceId.Merge(dst, src)
+}
+func (m *AgentDeviceId) XXX_Size() int {
+	return xxx_messageInfo_AgentDeviceId.Size(m)
+}
+func (m *AgentDeviceId) XXX_DiscardUnknown() {
+	xxx_messageInfo_AgentDeviceId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AgentDeviceId proto.InternalMessageInfo
+
+func (m *AgentDeviceId) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+// Response type for Query call. This should follow the same format as AoG
+// action.devices.QUERY response
+// (https://developers.google.com/actions/smarthome/create-app#actiondevicesquery).
+type QueryResponse struct {
+	// Request ID used for debugging. Copied from the request.
+	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	// Device states for the devices given in the request.
+	Payload              *QueryResponsePayload `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *QueryResponse) Reset()         { *m = QueryResponse{} }
+func (m *QueryResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryResponse) ProtoMessage()    {}
+func (*QueryResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{11}
+}
+func (m *QueryResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryResponse.Unmarshal(m, b)
+}
+func (m *QueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryResponse.Marshal(b, m, deterministic)
+}
+func (dst *QueryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResponse.Merge(dst, src)
+}
+func (m *QueryResponse) XXX_Size() int {
+	return xxx_messageInfo_QueryResponse.Size(m)
+}
+func (m *QueryResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryResponse proto.InternalMessageInfo
+
+func (m *QueryResponse) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
+func (m *QueryResponse) GetPayload() *QueryResponsePayload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+// Payload containing device states information.
+type QueryResponsePayload struct {
+	// States of the devices. Map of third-party device ID to struct of device
+	// states.
+	Devices              map[string]*_struct.Struct `protobuf:"bytes,1,rep,name=devices,proto3" json:"devices,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *QueryResponsePayload) Reset()         { *m = QueryResponsePayload{} }
+func (m *QueryResponsePayload) String() string { return proto.CompactTextString(m) }
+func (*QueryResponsePayload) ProtoMessage()    {}
+func (*QueryResponsePayload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{12}
+}
+func (m *QueryResponsePayload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryResponsePayload.Unmarshal(m, b)
+}
+func (m *QueryResponsePayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryResponsePayload.Marshal(b, m, deterministic)
+}
+func (dst *QueryResponsePayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryResponsePayload.Merge(dst, src)
+}
+func (m *QueryResponsePayload) XXX_Size() int {
+	return xxx_messageInfo_QueryResponsePayload.Size(m)
+}
+func (m *QueryResponsePayload) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryResponsePayload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryResponsePayload proto.InternalMessageInfo
+
+func (m *QueryResponsePayload) GetDevices() map[string]*_struct.Struct {
+	if m != nil {
+		return m.Devices
+	}
+	return nil
+}
+
+// Request type for Sync call. This should follow the same format as AoG
+// action.devices.SYNC request
+// (https://developers.google.com/actions/smarthome/create-app#actiondevicessync)
+// with the exception of the extra "agent_user_id" and no "intent" field.
+type SyncRequest struct {
+	// Request ID used for debugging.
+	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	// Required. Third-party user ID.
+	AgentUserId          string   `protobuf:"bytes,2,opt,name=agent_user_id,json=agentUserId,proto3" json:"agent_user_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SyncRequest) Reset()         { *m = SyncRequest{} }
+func (m *SyncRequest) String() string { return proto.CompactTextString(m) }
+func (*SyncRequest) ProtoMessage()    {}
+func (*SyncRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{13}
+}
+func (m *SyncRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SyncRequest.Unmarshal(m, b)
+}
+func (m *SyncRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SyncRequest.Marshal(b, m, deterministic)
+}
+func (dst *SyncRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SyncRequest.Merge(dst, src)
+}
+func (m *SyncRequest) XXX_Size() int {
+	return xxx_messageInfo_SyncRequest.Size(m)
+}
+func (m *SyncRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SyncRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SyncRequest proto.InternalMessageInfo
+
+func (m *SyncRequest) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
+func (m *SyncRequest) GetAgentUserId() string {
+	if m != nil {
+		return m.AgentUserId
+	}
+	return ""
+}
+
+// Example SyncResponse:
+// {
+//   "requestId": "ff36a3cc-ec34-11e6-b1a0-64510650abcf",
+//   "payload": {
+//     "agentUserId": "1836.15267389",
+//     "devices": [{
+//       "id": "123",
+//       "type": "action.devices.types.OUTLET",
+//       "traits": [
+//         "action.devices.traits.OnOff"
+//       ],
+//       "name": {
+//         "defaultNames": ["My Outlet 1234"],
+//         "name": "Night light",
+//         "nicknames": ["wall plug"]
+//       },
+//       "willReportState": false,
+//       "deviceInfo": {
+//         "manufacturer": "lights-out-inc",
+//         "model": "hs1234",
+//         "hwVersion": "3.2",
+//         "swVersion": "11.4"
+//       },
+//       "customData": {
+//         "fooValue": 74,
+//         "barValue": true,
+//         "bazValue": "foo"
+//       }
+//     }]
+//   }
+// }
+//
+// Response type for Sync call. This should follow the same format as AoG
+// action.devices.SYNC response
+// (https://developers.google.com/actions/smarthome/create-app#actiondevicessync).
+type SyncResponse struct {
+	// Request ID used for debugging. Copied from the request.
+	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	// Devices associated with the third-party user.
+	Payload              *SyncResponsePayload `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *SyncResponse) Reset()         { *m = SyncResponse{} }
+func (m *SyncResponse) String() string { return proto.CompactTextString(m) }
+func (*SyncResponse) ProtoMessage()    {}
+func (*SyncResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{14}
+}
+func (m *SyncResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SyncResponse.Unmarshal(m, b)
+}
+func (m *SyncResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SyncResponse.Marshal(b, m, deterministic)
+}
+func (dst *SyncResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SyncResponse.Merge(dst, src)
+}
+func (m *SyncResponse) XXX_Size() int {
+	return xxx_messageInfo_SyncResponse.Size(m)
+}
+func (m *SyncResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SyncResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SyncResponse proto.InternalMessageInfo
+
+func (m *SyncResponse) GetRequestId() string {
+	if m != nil {
+		return m.RequestId
+	}
+	return ""
+}
+
+func (m *SyncResponse) GetPayload() *SyncResponsePayload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+// Payload containing device information.
+type SyncResponsePayload struct {
+	// Third-party user ID
+	AgentUserId string `protobuf:"bytes,1,opt,name=agent_user_id,json=agentUserId,proto3" json:"agent_user_id,omitempty"`
+	// Devices associated with the third-party user.
+	Devices              []*Device `protobuf:"bytes,2,rep,name=devices,proto3" json:"devices,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *SyncResponsePayload) Reset()         { *m = SyncResponsePayload{} }
+func (m *SyncResponsePayload) String() string { return proto.CompactTextString(m) }
+func (*SyncResponsePayload) ProtoMessage()    {}
+func (*SyncResponsePayload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_homegraph_d5a465603b8fcbc5, []int{15}
+}
+func (m *SyncResponsePayload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SyncResponsePayload.Unmarshal(m, b)
+}
+func (m *SyncResponsePayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SyncResponsePayload.Marshal(b, m, deterministic)
+}
+func (dst *SyncResponsePayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SyncResponsePayload.Merge(dst, src)
+}
+func (m *SyncResponsePayload) XXX_Size() int {
+	return xxx_messageInfo_SyncResponsePayload.Size(m)
+}
+func (m *SyncResponsePayload) XXX_DiscardUnknown() {
+	xxx_messageInfo_SyncResponsePayload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SyncResponsePayload proto.InternalMessageInfo
+
+func (m *SyncResponsePayload) GetAgentUserId() string {
+	if m != nil {
+		return m.AgentUserId
+	}
+	return ""
+}
+
+func (m *SyncResponsePayload) GetDevices() []*Device {
+	if m != nil {
+		return m.Devices
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*RequestSyncDevicesRequest)(nil), "google.home.graph.v1.RequestSyncDevicesRequest")
+	proto.RegisterType((*RequestSyncDevicesResponse)(nil), "google.home.graph.v1.RequestSyncDevicesResponse")
+	proto.RegisterType((*ReportStateAndNotificationRequest)(nil), "google.home.graph.v1.ReportStateAndNotificationRequest")
+	proto.RegisterType((*ReportStateAndNotificationResponse)(nil), "google.home.graph.v1.ReportStateAndNotificationResponse")
+	proto.RegisterType((*StateAndNotificationPayload)(nil), "google.home.graph.v1.StateAndNotificationPayload")
+	proto.RegisterType((*ReportStateAndNotificationDevice)(nil), "google.home.graph.v1.ReportStateAndNotificationDevice")
+	proto.RegisterType((*DeleteAgentUserRequest)(nil), "google.home.graph.v1.DeleteAgentUserRequest")
+	proto.RegisterType((*QueryRequest)(nil), "google.home.graph.v1.QueryRequest")
+	proto.RegisterType((*QueryRequestInput)(nil), "google.home.graph.v1.QueryRequestInput")
+	proto.RegisterType((*QueryRequestPayload)(nil), "google.home.graph.v1.QueryRequestPayload")
+	proto.RegisterType((*AgentDeviceId)(nil), "google.home.graph.v1.AgentDeviceId")
+	proto.RegisterType((*QueryResponse)(nil), "google.home.graph.v1.QueryResponse")
+	proto.RegisterType((*QueryResponsePayload)(nil), "google.home.graph.v1.QueryResponsePayload")
+	proto.RegisterMapType((map[string]*_struct.Struct)(nil), "google.home.graph.v1.QueryResponsePayload.DevicesEntry")
+	proto.RegisterType((*SyncRequest)(nil), "google.home.graph.v1.SyncRequest")
+	proto.RegisterType((*SyncResponse)(nil), "google.home.graph.v1.SyncResponse")
+	proto.RegisterType((*SyncResponsePayload)(nil), "google.home.graph.v1.SyncResponsePayload")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// HomeGraphApiServiceClient is the client API for HomeGraphApiService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type HomeGraphApiServiceClient interface {
+	// Requests a Sync call from Google to a 3p partner's home control agent for
+	// a user.
+	//
+	//
+	// Third-party user's identity is passed in as agent_user_id.
+	// (see [RequestSyncDevicesRequest][google.home.graph.v1.RequestSyncDevicesRequest]) and forwarded back to the agent.
+	// Agent is identified by the API key or JWT signed by the partner's service
+	// account.
+	RequestSyncDevices(ctx context.Context, in *RequestSyncDevicesRequest, opts ...grpc.CallOption) (*RequestSyncDevicesResponse, error)
+	// Reports device state and optionally sends device notifications. Called by
+	// an agent when the device state of a third-party changes or the agent wants
+	// to send a notification about the device.
+	// This method updates a predefined set of States for a device, which all
+	// devices have (for example a light will have OnOff, Color, Brightness).
+	// A new State may not be created and an INVALID_ARGUMENT code will be thrown
+	// if so. It also optionally takes in a list of Notifications that may be
+	// created, which are associated to this State change.
+	//
+	// Third-party user's identity is passed in as agent_user_id.
+	// Agent is identified by the JWT signed by the partner's service account.
+	ReportStateAndNotification(ctx context.Context, in *ReportStateAndNotificationRequest, opts ...grpc.CallOption) (*ReportStateAndNotificationResponse, error)
+	// Unlink an agent user from Google. As result, all data related to this user
+	// will be deleted.
+	//
+	// Here is how the agent user is created in Google:
+	// When users open their Google Home App, they can begin linking a 3p
+	// partner. User is guided through the OAuth process. After entering the 3p
+	// credentials, Google gets the 3p OAuth token, and uses it to make a
+	// Sync call to the 3p partner and gets back all the user's data, including
+	// agent_user_id and devices.
+	// Google then creates the agent user and stores a mapping from the
+	// agent_user_id -> Google ID mapping. Google also stores all user's devices
+	// under that Google ID.
+	// The mapping from agent_user_id -> Google ID is many to many, since one
+	// Google user can have multiple 3p accounts, and multiple Google users can
+	// map to one agent_user_id (e.g. husband and wife share one Nest account
+	// username/password).
+	//
+	// Third-party user's identity is passed in as agent_user_id
+	// Agent is identified by the JWT signed by the partner's service account.
+	//
+	// Note: Special characters (except "/") in agent_user_id must be URL encoded.
+	DeleteAgentUser(ctx context.Context, in *DeleteAgentUserRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Gets the device states for the devices in QueryRequest.
+	// Third-party user's identity is passed in as agent_user_id. Agent is
+	// identified by the JWT signed by the third-party partner's service account.
+	Query(ctx context.Context, in *QueryRequest, opts ...grpc.CallOption) (*QueryResponse, error)
+	// Gets all the devices associated with the given third-party user.
+	// Third-party user's identity is passed in as agent_user_id. Agent is
+	// identified by the JWT signed by the third-party partner's service account.
+	Sync(ctx context.Context, in *SyncRequest, opts ...grpc.CallOption) (*SyncResponse, error)
+}
+
+type homeGraphApiServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewHomeGraphApiServiceClient(cc *grpc.ClientConn) HomeGraphApiServiceClient {
+	return &homeGraphApiServiceClient{cc}
+}
+
+func (c *homeGraphApiServiceClient) RequestSyncDevices(ctx context.Context, in *RequestSyncDevicesRequest, opts ...grpc.CallOption) (*RequestSyncDevicesResponse, error) {
+	out := new(RequestSyncDevicesResponse)
+	err := c.cc.Invoke(ctx, "/google.home.graph.v1.HomeGraphApiService/RequestSyncDevices", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *homeGraphApiServiceClient) ReportStateAndNotification(ctx context.Context, in *ReportStateAndNotificationRequest, opts ...grpc.CallOption) (*ReportStateAndNotificationResponse, error) {
+	out := new(ReportStateAndNotificationResponse)
+	err := c.cc.Invoke(ctx, "/google.home.graph.v1.HomeGraphApiService/ReportStateAndNotification", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *homeGraphApiServiceClient) DeleteAgentUser(ctx context.Context, in *DeleteAgentUserRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.home.graph.v1.HomeGraphApiService/DeleteAgentUser", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *homeGraphApiServiceClient) Query(ctx context.Context, in *QueryRequest, opts ...grpc.CallOption) (*QueryResponse, error) {
+	out := new(QueryResponse)
+	err := c.cc.Invoke(ctx, "/google.home.graph.v1.HomeGraphApiService/Query", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *homeGraphApiServiceClient) Sync(ctx context.Context, in *SyncRequest, opts ...grpc.CallOption) (*SyncResponse, error) {
+	out := new(SyncResponse)
+	err := c.cc.Invoke(ctx, "/google.home.graph.v1.HomeGraphApiService/Sync", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// HomeGraphApiServiceServer is the server API for HomeGraphApiService service.
+type HomeGraphApiServiceServer interface {
+	// Requests a Sync call from Google to a 3p partner's home control agent for
+	// a user.
+	//
+	//
+	// Third-party user's identity is passed in as agent_user_id.
+	// (see [RequestSyncDevicesRequest][google.home.graph.v1.RequestSyncDevicesRequest]) and forwarded back to the agent.
+	// Agent is identified by the API key or JWT signed by the partner's service
+	// account.
+	RequestSyncDevices(context.Context, *RequestSyncDevicesRequest) (*RequestSyncDevicesResponse, error)
+	// Reports device state and optionally sends device notifications. Called by
+	// an agent when the device state of a third-party changes or the agent wants
+	// to send a notification about the device.
+	// This method updates a predefined set of States for a device, which all
+	// devices have (for example a light will have OnOff, Color, Brightness).
+	// A new State may not be created and an INVALID_ARGUMENT code will be thrown
+	// if so. It also optionally takes in a list of Notifications that may be
+	// created, which are associated to this State change.
+	//
+	// Third-party user's identity is passed in as agent_user_id.
+	// Agent is identified by the JWT signed by the partner's service account.
+	ReportStateAndNotification(context.Context, *ReportStateAndNotificationRequest) (*ReportStateAndNotificationResponse, error)
+	// Unlink an agent user from Google. As result, all data related to this user
+	// will be deleted.
+	//
+	// Here is how the agent user is created in Google:
+	// When users open their Google Home App, they can begin linking a 3p
+	// partner. User is guided through the OAuth process. After entering the 3p
+	// credentials, Google gets the 3p OAuth token, and uses it to make a
+	// Sync call to the 3p partner and gets back all the user's data, including
+	// agent_user_id and devices.
+	// Google then creates the agent user and stores a mapping from the
+	// agent_user_id -> Google ID mapping. Google also stores all user's devices
+	// under that Google ID.
+	// The mapping from agent_user_id -> Google ID is many to many, since one
+	// Google user can have multiple 3p accounts, and multiple Google users can
+	// map to one agent_user_id (e.g. husband and wife share one Nest account
+	// username/password).
+	//
+	// Third-party user's identity is passed in as agent_user_id
+	// Agent is identified by the JWT signed by the partner's service account.
+	//
+	// Note: Special characters (except "/") in agent_user_id must be URL encoded.
+	DeleteAgentUser(context.Context, *DeleteAgentUserRequest) (*empty.Empty, error)
+	// Gets the device states for the devices in QueryRequest.
+	// Third-party user's identity is passed in as agent_user_id. Agent is
+	// identified by the JWT signed by the third-party partner's service account.
+	Query(context.Context, *QueryRequest) (*QueryResponse, error)
+	// Gets all the devices associated with the given third-party user.
+	// Third-party user's identity is passed in as agent_user_id. Agent is
+	// identified by the JWT signed by the third-party partner's service account.
+	Sync(context.Context, *SyncRequest) (*SyncResponse, error)
+}
+
+func RegisterHomeGraphApiServiceServer(s *grpc.Server, srv HomeGraphApiServiceServer) {
+	s.RegisterService(&_HomeGraphApiService_serviceDesc, srv)
+}
+
+func _HomeGraphApiService_RequestSyncDevices_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RequestSyncDevicesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(HomeGraphApiServiceServer).RequestSyncDevices(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.home.graph.v1.HomeGraphApiService/RequestSyncDevices",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(HomeGraphApiServiceServer).RequestSyncDevices(ctx, req.(*RequestSyncDevicesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _HomeGraphApiService_ReportStateAndNotification_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ReportStateAndNotificationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(HomeGraphApiServiceServer).ReportStateAndNotification(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.home.graph.v1.HomeGraphApiService/ReportStateAndNotification",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(HomeGraphApiServiceServer).ReportStateAndNotification(ctx, req.(*ReportStateAndNotificationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _HomeGraphApiService_DeleteAgentUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteAgentUserRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(HomeGraphApiServiceServer).DeleteAgentUser(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.home.graph.v1.HomeGraphApiService/DeleteAgentUser",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(HomeGraphApiServiceServer).DeleteAgentUser(ctx, req.(*DeleteAgentUserRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _HomeGraphApiService_Query_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(HomeGraphApiServiceServer).Query(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.home.graph.v1.HomeGraphApiService/Query",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(HomeGraphApiServiceServer).Query(ctx, req.(*QueryRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _HomeGraphApiService_Sync_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SyncRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(HomeGraphApiServiceServer).Sync(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.home.graph.v1.HomeGraphApiService/Sync",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(HomeGraphApiServiceServer).Sync(ctx, req.(*SyncRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _HomeGraphApiService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.home.graph.v1.HomeGraphApiService",
+	HandlerType: (*HomeGraphApiServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "RequestSyncDevices",
+			Handler:    _HomeGraphApiService_RequestSyncDevices_Handler,
+		},
+		{
+			MethodName: "ReportStateAndNotification",
+			Handler:    _HomeGraphApiService_ReportStateAndNotification_Handler,
+		},
+		{
+			MethodName: "DeleteAgentUser",
+			Handler:    _HomeGraphApiService_DeleteAgentUser_Handler,
+		},
+		{
+			MethodName: "Query",
+			Handler:    _HomeGraphApiService_Query_Handler,
+		},
+		{
+			MethodName: "Sync",
+			Handler:    _HomeGraphApiService_Sync_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/home/graph/v1/homegraph.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/home/graph/v1/homegraph.proto", fileDescriptor_homegraph_d5a465603b8fcbc5)
+}
+
+var fileDescriptor_homegraph_d5a465603b8fcbc5 = []byte{
+	// 879 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x8f, 0xdb, 0x44,
+	0x14, 0x97, 0x93, 0x66, 0xb7, 0x7d, 0xd9, 0xd0, 0x76, 0x76, 0xd9, 0xba, 0xd9, 0x20, 0x92, 0x59,
+	0x54, 0xd2, 0x00, 0x36, 0x09, 0x52, 0x5b, 0x16, 0xad, 0xd0, 0x76, 0xb7, 0x82, 0x08, 0x09, 0xa5,
+	0x4e, 0x57, 0x42, 0x70, 0x88, 0xdc, 0x78, 0xd6, 0x35, 0x4d, 0x3c, 0x5e, 0xcf, 0x38, 0x28, 0x42,
+	0x5c, 0xfa, 0x11, 0xe0, 0xc8, 0x77, 0xe1, 0xc0, 0x57, 0xe0, 0xc4, 0x9d, 0xcf, 0xc0, 0xb9, 0x9a,
+	0x19, 0x7b, 0xf3, 0xc7, 0x4e, 0xe2, 0x4a, 0x7b, 0xf3, 0xcc, 0xfb, 0xbd, 0xdf, 0x7b, 0x6f, 0xde,
+	0x6f, 0xde, 0x18, 0x3e, 0x72, 0x29, 0x75, 0x47, 0xc4, 0x7c, 0x45, 0xc7, 0xc4, 0x74, 0x43, 0x3b,
+	0x78, 0x65, 0x4e, 0xda, 0x72, 0x25, 0x17, 0x46, 0x10, 0x52, 0x4e, 0xd1, 0x9e, 0x42, 0x19, 0x62,
+	0xdf, 0x50, 0x86, 0x49, 0xbb, 0x5a, 0x8b, 0x7d, 0xed, 0xc0, 0x33, 0x6d, 0xdf, 0xa7, 0xdc, 0xe6,
+	0x1e, 0xf5, 0x99, 0xf2, 0xa9, 0x36, 0x32, 0x99, 0x1d, 0x32, 0xf1, 0x86, 0x24, 0x86, 0x1c, 0xc4,
+	0x10, 0xb9, 0x7a, 0x19, 0x5d, 0x98, 0x64, 0x1c, 0xf0, 0x69, 0x6c, 0xac, 0x2d, 0x1b, 0x19, 0x0f,
+	0xa3, 0x21, 0x57, 0x56, 0x7c, 0x0e, 0xf7, 0x2d, 0x72, 0x19, 0x11, 0xc6, 0xfb, 0x53, 0x7f, 0x78,
+	0x26, 0x59, 0x59, 0xbc, 0x83, 0x30, 0x54, 0x6c, 0x97, 0xf8, 0x7c, 0x10, 0x31, 0x12, 0x0e, 0x3c,
+	0x47, 0xd7, 0xea, 0x5a, 0xf3, 0x96, 0x55, 0x96, 0x9b, 0xe7, 0x8c, 0x84, 0x5d, 0x07, 0xed, 0x41,
+	0xc9, 0x66, 0x53, 0x7f, 0xa8, 0x17, 0xea, 0x5a, 0xf3, 0xa6, 0xa5, 0x16, 0xb8, 0x06, 0xd5, 0x2c,
+	0x5a, 0x16, 0x50, 0x9f, 0x11, 0xfc, 0xbf, 0x06, 0x0d, 0x8b, 0x04, 0x34, 0xe4, 0x7d, 0x6e, 0x73,
+	0x72, 0xe2, 0x3b, 0xdf, 0x53, 0xee, 0x5d, 0x78, 0x43, 0x59, 0x78, 0x12, 0xfd, 0x03, 0x80, 0x50,
+	0x7d, 0xce, 0x42, 0xdf, 0x8a, 0x77, 0xba, 0x0e, 0xba, 0x0f, 0x37, 0xc9, 0x44, 0x24, 0xe7, 0x39,
+	0xfa, 0x0d, 0x69, 0xdc, 0x96, 0xeb, 0xae, 0x93, 0xce, 0xbb, 0x90, 0xce, 0xfb, 0x01, 0xdc, 0xbe,
+	0xa0, 0xa3, 0x11, 0xfd, 0x65, 0x10, 0x05, 0x03, 0x4e, 0x5f, 0x13, 0x5f, 0x2f, 0x49, 0x54, 0x45,
+	0x6d, 0x9f, 0x07, 0x2f, 0xc4, 0x26, 0xfa, 0x0e, 0xb6, 0x03, 0x7b, 0x3a, 0xa2, 0xb6, 0xa3, 0x17,
+	0xeb, 0x5a, 0xb3, 0xdc, 0x69, 0x1b, 0x59, 0x4d, 0x34, 0xb2, 0x2a, 0xe9, 0x29, 0x47, 0x2b, 0x61,
+	0xc0, 0xa7, 0x80, 0xd7, 0xd5, 0xad, 0x8e, 0x67, 0x43, 0xe1, 0x98, 0xc2, 0xc1, 0x9a, 0x60, 0xa8,
+	0x07, 0xdb, 0x4a, 0x1c, 0x4c, 0xba, 0x96, 0x3b, 0x8f, 0xb2, 0x13, 0x5e, 0x9d, 0x88, 0x6a, 0x97,
+	0x95, 0xd0, 0xe0, 0xdf, 0x35, 0xa8, 0x6f, 0x42, 0x23, 0x13, 0xb6, 0x98, 0xb0, 0x26, 0x51, 0xef,
+	0x25, 0x51, 0x13, 0xdd, 0x19, 0x7d, 0xa9, 0x3b, 0x2b, 0x86, 0xa1, 0x63, 0xa8, 0xf8, 0x73, 0x34,
+	0x4c, 0x36, 0x69, 0x8d, 0xdf, 0x22, 0x1a, 0xff, 0x04, 0xfb, 0x67, 0x64, 0x44, 0x38, 0x39, 0x49,
+	0x9a, 0x9a, 0x53, 0x37, 0x39, 0xc4, 0x21, 0x2a, 0xde, 0x79, 0x1e, 0x91, 0x70, 0x7a, 0x7d, 0x9c,
+	0xe8, 0x6b, 0xd8, 0xf2, 0xfc, 0x20, 0xe2, 0x4c, 0x2f, 0xd6, 0x8b, 0xcd, 0x72, 0xe7, 0xe3, 0xec,
+	0xb6, 0xcc, 0x87, 0xed, 0x0a, 0xbc, 0x15, 0xbb, 0xe1, 0x1f, 0xe0, 0x6e, 0xca, 0x88, 0x4e, 0x67,
+	0xf2, 0x54, 0xe7, 0xfe, 0x70, 0x33, 0x6d, 0x4a, 0x96, 0x2f, 0x60, 0x37, 0xc3, 0x8e, 0x8e, 0xe7,
+	0x95, 0x24, 0x52, 0x3e, 0xcc, 0xe6, 0x96, 0x1d, 0x50, 0x32, 0xe8, 0x3a, 0x33, 0xd9, 0x7c, 0x08,
+	0x95, 0x05, 0x0b, 0x7a, 0x0f, 0x0a, 0x57, 0x87, 0x57, 0xf0, 0x1c, 0xcc, 0xa1, 0x12, 0x87, 0xcd,
+	0x25, 0x7c, 0x74, 0x36, 0xab, 0x55, 0x69, 0xa5, 0xb5, 0xb6, 0x56, 0x45, 0x9a, 0x2a, 0xf6, 0x2f,
+	0x0d, 0xf6, 0xb2, 0x10, 0xe8, 0xf9, 0x72, 0xb9, 0x8f, 0xf3, 0xd3, 0x1b, 0xf1, 0x88, 0x7b, 0xe6,
+	0xf3, 0x70, 0x7a, 0x75, 0x04, 0xd5, 0x3e, 0xec, 0xcc, 0x1b, 0xd0, 0x1d, 0x28, 0xbe, 0x26, 0xd3,
+	0xb8, 0x32, 0xf1, 0x89, 0x3e, 0x83, 0xd2, 0xc4, 0x1e, 0x45, 0x64, 0x93, 0xfa, 0x15, 0xea, 0xa8,
+	0xf0, 0x44, 0xc3, 0x3d, 0x28, 0x8b, 0xa1, 0x7a, 0x8d, 0x72, 0x0f, 0x61, 0x47, 0x31, 0xe6, 0xeb,
+	0xc3, 0xe9, 0x72, 0x1f, 0x56, 0x68, 0x6e, 0x9e, 0x33, 0xd5, 0x86, 0x4b, 0xd8, 0xcd, 0xb0, 0xe7,
+	0x7a, 0x72, 0x1e, 0xcd, 0x1a, 0x55, 0x90, 0x8d, 0xaa, 0x65, 0xc7, 0x5f, 0x9a, 0x63, 0x9d, 0x7f,
+	0x4b, 0xb0, 0xfb, 0x2d, 0x1d, 0x93, 0x6f, 0x04, 0xe0, 0x24, 0xf0, 0xfa, 0x24, 0x94, 0xa3, 0xeb,
+	0x4f, 0x0d, 0x50, 0xfa, 0xb5, 0x42, 0xe6, 0xaa, 0xb9, 0xb9, 0xe2, 0xb9, 0xac, 0x7e, 0x9e, 0xdf,
+	0x21, 0x7e, 0x08, 0xf1, 0x9b, 0x7f, 0xfe, 0xfb, 0xa3, 0x50, 0xc3, 0xf7, 0x66, 0x4f, 0x3a, 0x3b,
+	0x0a, 0x67, 0xf8, 0x23, 0xad, 0x85, 0xfe, 0xd6, 0xc4, 0x5b, 0xba, 0x6a, 0xfa, 0xa2, 0xc7, 0xef,
+	0x3a, 0xdd, 0x93, 0x6c, 0x9f, 0xbc, 0xbb, 0x63, 0x9c, 0x75, 0x5b, 0x66, 0xfd, 0x09, 0x7e, 0xb0,
+	0x98, 0xf5, 0x2a, 0x3f, 0x51, 0xc4, 0x1b, 0x0d, 0x6e, 0x2f, 0x8d, 0x6b, 0xf4, 0xe9, 0xaa, 0xae,
+	0x65, 0x4d, 0xf5, 0xea, 0x7e, 0xea, 0x66, 0x3c, 0x13, 0x3f, 0x39, 0xf8, 0xa1, 0x4c, 0xe6, 0xb0,
+	0xd5, 0x10, 0xc9, 0xfc, 0xba, 0xa0, 0x9d, 0xe3, 0x2b, 0xd1, 0x30, 0xb3, 0xd5, 0xfa, 0x0d, 0xf9,
+	0x50, 0x92, 0x77, 0x17, 0xe1, 0xcd, 0x33, 0xb2, 0x7a, 0x98, 0xe3, 0xf2, 0xe3, 0x9a, 0x0c, 0xbe,
+	0x8f, 0xef, 0xce, 0x9f, 0xc4, 0xa5, 0x80, 0x88, 0xa2, 0x7f, 0x86, 0x1b, 0xa2, 0x89, 0xa8, 0xb1,
+	0xee, 0x7a, 0xa8, 0x68, 0x78, 0xf3, 0x0d, 0xc2, 0x07, 0x32, 0xd8, 0xfb, 0xf8, 0xce, 0x7c, 0x30,
+	0xa6, 0x54, 0xf2, 0x94, 0x82, 0x3e, 0xa4, 0xe3, 0x4c, 0x96, 0xa7, 0x7a, 0x86, 0xe8, 0x7b, 0xe2,
+	0x14, 0x7f, 0xfc, 0x32, 0xc6, 0xbb, 0x74, 0x64, 0xfb, 0xae, 0x41, 0x43, 0xd7, 0x74, 0x89, 0x2f,
+	0x4f, 0xd8, 0x54, 0x26, 0x3b, 0xf0, 0xd8, 0xe2, 0xaf, 0xe7, 0x57, 0xf2, 0xe3, 0xe5, 0x96, 0x44,
+	0x7d, 0xf1, 0x36, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x87, 0x36, 0x9c, 0xf9, 0x0a, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/iam/admin/v1/iam.pb.go b/vendor/google.golang.org/genproto/googleapis/iam/admin/v1/iam.pb.go
index 44bb9b40..69fcf08f 100644
--- a/vendor/google.golang.org/genproto/googleapis/iam/admin/v1/iam.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/iam/admin/v1/iam.pb.go
@@ -1,54 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/admin/v1/iam.proto
 
-/*
-Package admin is a generated protocol buffer package.
-
-It is generated from these files:
-	google/iam/admin/v1/iam.proto
-
-It has these top-level messages:
-	ServiceAccount
-	CreateServiceAccountRequest
-	ListServiceAccountsRequest
-	ListServiceAccountsResponse
-	GetServiceAccountRequest
-	DeleteServiceAccountRequest
-	ListServiceAccountKeysRequest
-	ListServiceAccountKeysResponse
-	GetServiceAccountKeyRequest
-	ServiceAccountKey
-	CreateServiceAccountKeyRequest
-	DeleteServiceAccountKeyRequest
-	SignBlobRequest
-	SignBlobResponse
-	SignJwtRequest
-	SignJwtResponse
-	Role
-	QueryGrantableRolesRequest
-	QueryGrantableRolesResponse
-	ListRolesRequest
-	ListRolesResponse
-	GetRoleRequest
-	CreateRoleRequest
-	UpdateRoleRequest
-	DeleteRoleRequest
-	UndeleteRoleRequest
-	Permission
-	QueryTestablePermissionsRequest
-	QueryTestablePermissionsResponse
-*/
-package admin
+package admin // import "google.golang.org/genproto/googleapis/iam/admin/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -92,7 +54,9 @@ var ServiceAccountKeyAlgorithm_value = map[string]int32{
 func (x ServiceAccountKeyAlgorithm) String() string {
 	return proto.EnumName(ServiceAccountKeyAlgorithm_name, int32(x))
 }
-func (ServiceAccountKeyAlgorithm) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (ServiceAccountKeyAlgorithm) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{0}
+}
 
 // Supported private key output formats.
 type ServiceAccountPrivateKeyType int32
@@ -122,7 +86,9 @@ var ServiceAccountPrivateKeyType_value = map[string]int32{
 func (x ServiceAccountPrivateKeyType) String() string {
 	return proto.EnumName(ServiceAccountPrivateKeyType_name, int32(x))
 }
-func (ServiceAccountPrivateKeyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (ServiceAccountPrivateKeyType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{1}
+}
 
 // Supported public key output formats.
 type ServiceAccountPublicKeyType int32
@@ -150,7 +116,9 @@ var ServiceAccountPublicKeyType_value = map[string]int32{
 func (x ServiceAccountPublicKeyType) String() string {
 	return proto.EnumName(ServiceAccountPublicKeyType_name, int32(x))
 }
-func (ServiceAccountPublicKeyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (ServiceAccountPublicKeyType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{2}
+}
 
 // A view for Role objects.
 type RoleView int32
@@ -175,7 +143,9 @@ var RoleView_value = map[string]int32{
 func (x RoleView) String() string {
 	return proto.EnumName(RoleView_name, int32(x))
 }
-func (RoleView) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (RoleView) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{3}
+}
 
 // `KeyType` filters to selectively retrieve certain varieties
 // of keys.
@@ -206,7 +176,7 @@ func (x ListServiceAccountKeysRequest_KeyType) String() string {
 	return proto.EnumName(ListServiceAccountKeysRequest_KeyType_name, int32(x))
 }
 func (ListServiceAccountKeysRequest_KeyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{6, 0}
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{6, 0}
 }
 
 // A stage representing a role's lifecycle phase.
@@ -248,7 +218,9 @@ var Role_RoleLaunchStage_value = map[string]int32{
 func (x Role_RoleLaunchStage) String() string {
 	return proto.EnumName(Role_RoleLaunchStage_name, int32(x))
 }
-func (Role_RoleLaunchStage) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{16, 0} }
+func (Role_RoleLaunchStage) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{16, 0}
+}
 
 // A stage representing a permission's lifecycle phase.
 type Permission_PermissionLaunchStage int32
@@ -281,7 +253,7 @@ func (x Permission_PermissionLaunchStage) String() string {
 	return proto.EnumName(Permission_PermissionLaunchStage_name, int32(x))
 }
 func (Permission_PermissionLaunchStage) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{26, 0}
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{26, 0}
 }
 
 // The state of the permission with regards to custom roles.
@@ -311,7 +283,7 @@ func (x Permission_CustomRolesSupportLevel) String() string {
 	return proto.EnumName(Permission_CustomRolesSupportLevel_name, int32(x))
 }
 func (Permission_CustomRolesSupportLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{26, 1}
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{26, 1}
 }
 
 // A service account in the Identity and Access Management API.
@@ -341,28 +313,50 @@ type ServiceAccount struct {
 	//
 	// In responses the resource name will always be in the format
 	// `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// @OutputOnly The id of the project that owns the service account.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// @OutputOnly The unique and stable id of the service account.
-	UniqueId string `protobuf:"bytes,4,opt,name=unique_id,json=uniqueId" json:"unique_id,omitempty"`
+	UniqueId string `protobuf:"bytes,4,opt,name=unique_id,json=uniqueId,proto3" json:"unique_id,omitempty"`
 	// @OutputOnly The email address of the service account.
-	Email string `protobuf:"bytes,5,opt,name=email" json:"email,omitempty"`
+	Email string `protobuf:"bytes,5,opt,name=email,proto3" json:"email,omitempty"`
 	// Optional. A user-specified description of the service account.  Must be
 	// fewer than 100 UTF-8 bytes.
-	DisplayName string `protobuf:"bytes,6,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,6,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Used to perform a consistent read-modify-write.
 	Etag []byte `protobuf:"bytes,7,opt,name=etag,proto3" json:"etag,omitempty"`
 	// @OutputOnly. The OAuth2 client id for the service account.
 	// This is used in conjunction with the OAuth2 clientconfig API to make
 	// three legged OAuth2 (3LO) flows to access the data of Google users.
-	Oauth2ClientId string `protobuf:"bytes,9,opt,name=oauth2_client_id,json=oauth2ClientId" json:"oauth2_client_id,omitempty"`
+	Oauth2ClientId       string   `protobuf:"bytes,9,opt,name=oauth2_client_id,json=oauth2ClientId,proto3" json:"oauth2_client_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ServiceAccount) Reset()         { *m = ServiceAccount{} }
+func (m *ServiceAccount) String() string { return proto.CompactTextString(m) }
+func (*ServiceAccount) ProtoMessage()    {}
+func (*ServiceAccount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{0}
+}
+func (m *ServiceAccount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceAccount.Unmarshal(m, b)
+}
+func (m *ServiceAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceAccount.Marshal(b, m, deterministic)
+}
+func (dst *ServiceAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceAccount.Merge(dst, src)
+}
+func (m *ServiceAccount) XXX_Size() int {
+	return xxx_messageInfo_ServiceAccount.Size(m)
+}
+func (m *ServiceAccount) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceAccount.DiscardUnknown(m)
 }
 
-func (m *ServiceAccount) Reset()                    { *m = ServiceAccount{} }
-func (m *ServiceAccount) String() string            { return proto.CompactTextString(m) }
-func (*ServiceAccount) ProtoMessage()               {}
-func (*ServiceAccount) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_ServiceAccount proto.InternalMessageInfo
 
 func (m *ServiceAccount) GetName() string {
 	if m != nil {
@@ -417,22 +411,44 @@ func (m *ServiceAccount) GetOauth2ClientId() string {
 type CreateServiceAccountRequest struct {
 	// Required. The resource name of the project associated with the service
 	// accounts, such as `projects/my-project-123`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The account id that is used to generate the service account
 	// email address and a stable unique id. It is unique within a project,
 	// must be 6-30 characters long, and match the regular expression
 	// `[a-z]([-a-z0-9]*[a-z0-9])` to comply with RFC1035.
-	AccountId string `protobuf:"bytes,2,opt,name=account_id,json=accountId" json:"account_id,omitempty"`
+	AccountId string `protobuf:"bytes,2,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"`
 	// The [ServiceAccount][google.iam.admin.v1.ServiceAccount] resource to create.
 	// Currently, only the following values are user assignable:
 	// `display_name` .
-	ServiceAccount *ServiceAccount `protobuf:"bytes,3,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
+	ServiceAccount       *ServiceAccount `protobuf:"bytes,3,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *CreateServiceAccountRequest) Reset()                    { *m = CreateServiceAccountRequest{} }
-func (m *CreateServiceAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateServiceAccountRequest) ProtoMessage()               {}
-func (*CreateServiceAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *CreateServiceAccountRequest) Reset()         { *m = CreateServiceAccountRequest{} }
+func (m *CreateServiceAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateServiceAccountRequest) ProtoMessage()    {}
+func (*CreateServiceAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{1}
+}
+func (m *CreateServiceAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateServiceAccountRequest.Unmarshal(m, b)
+}
+func (m *CreateServiceAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateServiceAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateServiceAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceAccountRequest.Merge(dst, src)
+}
+func (m *CreateServiceAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateServiceAccountRequest.Size(m)
+}
+func (m *CreateServiceAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateServiceAccountRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateServiceAccountRequest proto.InternalMessageInfo
 
 func (m *CreateServiceAccountRequest) GetName() string {
 	if m != nil {
@@ -459,21 +475,43 @@ func (m *CreateServiceAccountRequest) GetServiceAccount() *ServiceAccount {
 type ListServiceAccountsRequest struct {
 	// Required. The resource name of the project associated with the service
 	// accounts, such as `projects/my-project-123`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional limit on the number of service accounts to include in the
 	// response. Further accounts can subsequently be obtained by including the
 	// [ListServiceAccountsResponse.next_page_token][google.iam.admin.v1.ListServiceAccountsResponse.next_page_token]
 	// in a subsequent request.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional pagination token returned in an earlier
 	// [ListServiceAccountsResponse.next_page_token][google.iam.admin.v1.ListServiceAccountsResponse.next_page_token].
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListServiceAccountsRequest) Reset()                    { *m = ListServiceAccountsRequest{} }
-func (m *ListServiceAccountsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceAccountsRequest) ProtoMessage()               {}
-func (*ListServiceAccountsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *ListServiceAccountsRequest) Reset()         { *m = ListServiceAccountsRequest{} }
+func (m *ListServiceAccountsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListServiceAccountsRequest) ProtoMessage()    {}
+func (*ListServiceAccountsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{2}
+}
+func (m *ListServiceAccountsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceAccountsRequest.Unmarshal(m, b)
+}
+func (m *ListServiceAccountsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceAccountsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceAccountsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceAccountsRequest.Merge(dst, src)
+}
+func (m *ListServiceAccountsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListServiceAccountsRequest.Size(m)
+}
+func (m *ListServiceAccountsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceAccountsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListServiceAccountsRequest proto.InternalMessageInfo
 
 func (m *ListServiceAccountsRequest) GetName() string {
 	if m != nil {
@@ -499,17 +537,39 @@ func (m *ListServiceAccountsRequest) GetPageToken() string {
 // The service account list response.
 type ListServiceAccountsResponse struct {
 	// The list of matching service accounts.
-	Accounts []*ServiceAccount `protobuf:"bytes,1,rep,name=accounts" json:"accounts,omitempty"`
+	Accounts []*ServiceAccount `protobuf:"bytes,1,rep,name=accounts,proto3" json:"accounts,omitempty"`
 	// To retrieve the next page of results, set
 	// [ListServiceAccountsRequest.page_token][google.iam.admin.v1.ListServiceAccountsRequest.page_token]
 	// to this value.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListServiceAccountsResponse) Reset()                    { *m = ListServiceAccountsResponse{} }
-func (m *ListServiceAccountsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceAccountsResponse) ProtoMessage()               {}
-func (*ListServiceAccountsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ListServiceAccountsResponse) Reset()         { *m = ListServiceAccountsResponse{} }
+func (m *ListServiceAccountsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListServiceAccountsResponse) ProtoMessage()    {}
+func (*ListServiceAccountsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{3}
+}
+func (m *ListServiceAccountsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceAccountsResponse.Unmarshal(m, b)
+}
+func (m *ListServiceAccountsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceAccountsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceAccountsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceAccountsResponse.Merge(dst, src)
+}
+func (m *ListServiceAccountsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListServiceAccountsResponse.Size(m)
+}
+func (m *ListServiceAccountsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceAccountsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListServiceAccountsResponse proto.InternalMessageInfo
 
 func (m *ListServiceAccountsResponse) GetAccounts() []*ServiceAccount {
 	if m != nil {
@@ -532,13 +592,35 @@ type GetServiceAccountRequest struct {
 	// Using `-` as a wildcard for the project will infer the project from
 	// the account. The `account` value can be the `email` address or the
 	// `unique_id` of the service account.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServiceAccountRequest) Reset()         { *m = GetServiceAccountRequest{} }
+func (m *GetServiceAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServiceAccountRequest) ProtoMessage()    {}
+func (*GetServiceAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{4}
+}
+func (m *GetServiceAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServiceAccountRequest.Unmarshal(m, b)
+}
+func (m *GetServiceAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServiceAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServiceAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceAccountRequest.Merge(dst, src)
+}
+func (m *GetServiceAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServiceAccountRequest.Size(m)
+}
+func (m *GetServiceAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServiceAccountRequest.DiscardUnknown(m)
 }
 
-func (m *GetServiceAccountRequest) Reset()                    { *m = GetServiceAccountRequest{} }
-func (m *GetServiceAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServiceAccountRequest) ProtoMessage()               {}
-func (*GetServiceAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_GetServiceAccountRequest proto.InternalMessageInfo
 
 func (m *GetServiceAccountRequest) GetName() string {
 	if m != nil {
@@ -554,13 +636,35 @@ type DeleteServiceAccountRequest struct {
 	// Using `-` as a wildcard for the project will infer the project from
 	// the account. The `account` value can be the `email` address or the
 	// `unique_id` of the service account.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteServiceAccountRequest) Reset()                    { *m = DeleteServiceAccountRequest{} }
-func (m *DeleteServiceAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteServiceAccountRequest) ProtoMessage()               {}
-func (*DeleteServiceAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *DeleteServiceAccountRequest) Reset()         { *m = DeleteServiceAccountRequest{} }
+func (m *DeleteServiceAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteServiceAccountRequest) ProtoMessage()    {}
+func (*DeleteServiceAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{5}
+}
+func (m *DeleteServiceAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteServiceAccountRequest.Unmarshal(m, b)
+}
+func (m *DeleteServiceAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteServiceAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteServiceAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteServiceAccountRequest.Merge(dst, src)
+}
+func (m *DeleteServiceAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteServiceAccountRequest.Size(m)
+}
+func (m *DeleteServiceAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteServiceAccountRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteServiceAccountRequest proto.InternalMessageInfo
 
 func (m *DeleteServiceAccountRequest) GetName() string {
 	if m != nil {
@@ -577,17 +681,39 @@ type ListServiceAccountKeysRequest struct {
 	// Using `-` as a wildcard for the project, will infer the project from
 	// the account. The `account` value can be the `email` address or the
 	// `unique_id` of the service account.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Filters the types of keys the user wants to include in the list
 	// response. Duplicate key types are not allowed. If no key type
 	// is provided, all keys are returned.
-	KeyTypes []ListServiceAccountKeysRequest_KeyType `protobuf:"varint,2,rep,packed,name=key_types,json=keyTypes,enum=google.iam.admin.v1.ListServiceAccountKeysRequest_KeyType" json:"key_types,omitempty"`
+	KeyTypes             []ListServiceAccountKeysRequest_KeyType `protobuf:"varint,2,rep,packed,name=key_types,json=keyTypes,proto3,enum=google.iam.admin.v1.ListServiceAccountKeysRequest_KeyType" json:"key_types,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                `json:"-"`
+	XXX_unrecognized     []byte                                  `json:"-"`
+	XXX_sizecache        int32                                   `json:"-"`
 }
 
-func (m *ListServiceAccountKeysRequest) Reset()                    { *m = ListServiceAccountKeysRequest{} }
-func (m *ListServiceAccountKeysRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceAccountKeysRequest) ProtoMessage()               {}
-func (*ListServiceAccountKeysRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *ListServiceAccountKeysRequest) Reset()         { *m = ListServiceAccountKeysRequest{} }
+func (m *ListServiceAccountKeysRequest) String() string { return proto.CompactTextString(m) }
+func (*ListServiceAccountKeysRequest) ProtoMessage()    {}
+func (*ListServiceAccountKeysRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{6}
+}
+func (m *ListServiceAccountKeysRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceAccountKeysRequest.Unmarshal(m, b)
+}
+func (m *ListServiceAccountKeysRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceAccountKeysRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceAccountKeysRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceAccountKeysRequest.Merge(dst, src)
+}
+func (m *ListServiceAccountKeysRequest) XXX_Size() int {
+	return xxx_messageInfo_ListServiceAccountKeysRequest.Size(m)
+}
+func (m *ListServiceAccountKeysRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceAccountKeysRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListServiceAccountKeysRequest proto.InternalMessageInfo
 
 func (m *ListServiceAccountKeysRequest) GetName() string {
 	if m != nil {
@@ -606,13 +732,35 @@ func (m *ListServiceAccountKeysRequest) GetKeyTypes() []ListServiceAccountKeysRe
 // The service account keys list response.
 type ListServiceAccountKeysResponse struct {
 	// The public keys for the service account.
-	Keys []*ServiceAccountKey `protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"`
+	Keys                 []*ServiceAccountKey `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *ListServiceAccountKeysResponse) Reset()                    { *m = ListServiceAccountKeysResponse{} }
-func (m *ListServiceAccountKeysResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceAccountKeysResponse) ProtoMessage()               {}
-func (*ListServiceAccountKeysResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *ListServiceAccountKeysResponse) Reset()         { *m = ListServiceAccountKeysResponse{} }
+func (m *ListServiceAccountKeysResponse) String() string { return proto.CompactTextString(m) }
+func (*ListServiceAccountKeysResponse) ProtoMessage()    {}
+func (*ListServiceAccountKeysResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{7}
+}
+func (m *ListServiceAccountKeysResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceAccountKeysResponse.Unmarshal(m, b)
+}
+func (m *ListServiceAccountKeysResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceAccountKeysResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceAccountKeysResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceAccountKeysResponse.Merge(dst, src)
+}
+func (m *ListServiceAccountKeysResponse) XXX_Size() int {
+	return xxx_messageInfo_ListServiceAccountKeysResponse.Size(m)
+}
+func (m *ListServiceAccountKeysResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceAccountKeysResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListServiceAccountKeysResponse proto.InternalMessageInfo
 
 func (m *ListServiceAccountKeysResponse) GetKeys() []*ServiceAccountKey {
 	if m != nil {
@@ -629,16 +777,38 @@ type GetServiceAccountKeyRequest struct {
 	// Using `-` as a wildcard for the project will infer the project from
 	// the account. The `account` value can be the `email` address or the
 	// `unique_id` of the service account.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The output format of the public key requested.
 	// X509_PEM is the default output format.
-	PublicKeyType ServiceAccountPublicKeyType `protobuf:"varint,2,opt,name=public_key_type,json=publicKeyType,enum=google.iam.admin.v1.ServiceAccountPublicKeyType" json:"public_key_type,omitempty"`
+	PublicKeyType        ServiceAccountPublicKeyType `protobuf:"varint,2,opt,name=public_key_type,json=publicKeyType,proto3,enum=google.iam.admin.v1.ServiceAccountPublicKeyType" json:"public_key_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
+}
+
+func (m *GetServiceAccountKeyRequest) Reset()         { *m = GetServiceAccountKeyRequest{} }
+func (m *GetServiceAccountKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServiceAccountKeyRequest) ProtoMessage()    {}
+func (*GetServiceAccountKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{8}
+}
+func (m *GetServiceAccountKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServiceAccountKeyRequest.Unmarshal(m, b)
+}
+func (m *GetServiceAccountKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServiceAccountKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServiceAccountKeyRequest.Merge(dst, src)
+}
+func (m *GetServiceAccountKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServiceAccountKeyRequest.Size(m)
+}
+func (m *GetServiceAccountKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServiceAccountKeyRequest.DiscardUnknown(m)
 }
 
-func (m *GetServiceAccountKeyRequest) Reset()                    { *m = GetServiceAccountKeyRequest{} }
-func (m *GetServiceAccountKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetServiceAccountKeyRequest) ProtoMessage()               {}
-func (*GetServiceAccountKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_GetServiceAccountKeyRequest proto.InternalMessageInfo
 
 func (m *GetServiceAccountKeyRequest) GetName() string {
 	if m != nil {
@@ -673,16 +843,16 @@ func (m *GetServiceAccountKeyRequest) GetPublicKeyType() ServiceAccountPublicKey
 type ServiceAccountKey struct {
 	// The resource name of the service account key in the following format
 	// `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}/keys/{key}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The output format for the private key.
 	// Only provided in `CreateServiceAccountKey` responses, not
 	// in `GetServiceAccountKey` or `ListServiceAccountKey` responses.
 	//
 	// Google never exposes system-managed private keys, and never retains
 	// user-managed private keys.
-	PrivateKeyType ServiceAccountPrivateKeyType `protobuf:"varint,2,opt,name=private_key_type,json=privateKeyType,enum=google.iam.admin.v1.ServiceAccountPrivateKeyType" json:"private_key_type,omitempty"`
+	PrivateKeyType ServiceAccountPrivateKeyType `protobuf:"varint,2,opt,name=private_key_type,json=privateKeyType,proto3,enum=google.iam.admin.v1.ServiceAccountPrivateKeyType" json:"private_key_type,omitempty"`
 	// Specifies the algorithm (and possibly key size) for the key.
-	KeyAlgorithm ServiceAccountKeyAlgorithm `protobuf:"varint,8,opt,name=key_algorithm,json=keyAlgorithm,enum=google.iam.admin.v1.ServiceAccountKeyAlgorithm" json:"key_algorithm,omitempty"`
+	KeyAlgorithm ServiceAccountKeyAlgorithm `protobuf:"varint,8,opt,name=key_algorithm,json=keyAlgorithm,proto3,enum=google.iam.admin.v1.ServiceAccountKeyAlgorithm" json:"key_algorithm,omitempty"`
 	// The private key data. Only provided in `CreateServiceAccountKey`
 	// responses. Make sure to keep the private key data secure because it
 	// allows for the assertion of the service account identity.
@@ -694,15 +864,37 @@ type ServiceAccountKey struct {
 	// The public key data. Only provided in `GetServiceAccountKey` responses.
 	PublicKeyData []byte `protobuf:"bytes,7,opt,name=public_key_data,json=publicKeyData,proto3" json:"public_key_data,omitempty"`
 	// The key can be used after this timestamp.
-	ValidAfterTime *google_protobuf3.Timestamp `protobuf:"bytes,4,opt,name=valid_after_time,json=validAfterTime" json:"valid_after_time,omitempty"`
+	ValidAfterTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=valid_after_time,json=validAfterTime,proto3" json:"valid_after_time,omitempty"`
 	// The key can be used before this timestamp.
-	ValidBeforeTime *google_protobuf3.Timestamp `protobuf:"bytes,5,opt,name=valid_before_time,json=validBeforeTime" json:"valid_before_time,omitempty"`
+	ValidBeforeTime      *timestamp.Timestamp `protobuf:"bytes,5,opt,name=valid_before_time,json=validBeforeTime,proto3" json:"valid_before_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *ServiceAccountKey) Reset()                    { *m = ServiceAccountKey{} }
-func (m *ServiceAccountKey) String() string            { return proto.CompactTextString(m) }
-func (*ServiceAccountKey) ProtoMessage()               {}
-func (*ServiceAccountKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *ServiceAccountKey) Reset()         { *m = ServiceAccountKey{} }
+func (m *ServiceAccountKey) String() string { return proto.CompactTextString(m) }
+func (*ServiceAccountKey) ProtoMessage()    {}
+func (*ServiceAccountKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{9}
+}
+func (m *ServiceAccountKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceAccountKey.Unmarshal(m, b)
+}
+func (m *ServiceAccountKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceAccountKey.Marshal(b, m, deterministic)
+}
+func (dst *ServiceAccountKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceAccountKey.Merge(dst, src)
+}
+func (m *ServiceAccountKey) XXX_Size() int {
+	return xxx_messageInfo_ServiceAccountKey.Size(m)
+}
+func (m *ServiceAccountKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceAccountKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServiceAccountKey proto.InternalMessageInfo
 
 func (m *ServiceAccountKey) GetName() string {
 	if m != nil {
@@ -739,14 +931,14 @@ func (m *ServiceAccountKey) GetPublicKeyData() []byte {
 	return nil
 }
 
-func (m *ServiceAccountKey) GetValidAfterTime() *google_protobuf3.Timestamp {
+func (m *ServiceAccountKey) GetValidAfterTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ValidAfterTime
 	}
 	return nil
 }
 
-func (m *ServiceAccountKey) GetValidBeforeTime() *google_protobuf3.Timestamp {
+func (m *ServiceAccountKey) GetValidBeforeTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ValidBeforeTime
 	}
@@ -760,20 +952,42 @@ type CreateServiceAccountKeyRequest struct {
 	// Using `-` as a wildcard for the project will infer the project from
 	// the account. The `account` value can be the `email` address or the
 	// `unique_id` of the service account.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The output format of the private key. `GOOGLE_CREDENTIALS_FILE` is the
 	// default output format.
-	PrivateKeyType ServiceAccountPrivateKeyType `protobuf:"varint,2,opt,name=private_key_type,json=privateKeyType,enum=google.iam.admin.v1.ServiceAccountPrivateKeyType" json:"private_key_type,omitempty"`
+	PrivateKeyType ServiceAccountPrivateKeyType `protobuf:"varint,2,opt,name=private_key_type,json=privateKeyType,proto3,enum=google.iam.admin.v1.ServiceAccountPrivateKeyType" json:"private_key_type,omitempty"`
 	// Which type of key and algorithm to use for the key.
 	// The default is currently a 2K RSA key.  However this may change in the
 	// future.
-	KeyAlgorithm ServiceAccountKeyAlgorithm `protobuf:"varint,3,opt,name=key_algorithm,json=keyAlgorithm,enum=google.iam.admin.v1.ServiceAccountKeyAlgorithm" json:"key_algorithm,omitempty"`
+	KeyAlgorithm         ServiceAccountKeyAlgorithm `protobuf:"varint,3,opt,name=key_algorithm,json=keyAlgorithm,proto3,enum=google.iam.admin.v1.ServiceAccountKeyAlgorithm" json:"key_algorithm,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *CreateServiceAccountKeyRequest) Reset()         { *m = CreateServiceAccountKeyRequest{} }
+func (m *CreateServiceAccountKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateServiceAccountKeyRequest) ProtoMessage()    {}
+func (*CreateServiceAccountKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{10}
+}
+func (m *CreateServiceAccountKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateServiceAccountKeyRequest.Unmarshal(m, b)
+}
+func (m *CreateServiceAccountKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateServiceAccountKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateServiceAccountKeyRequest.Merge(dst, src)
+}
+func (m *CreateServiceAccountKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateServiceAccountKeyRequest.Size(m)
+}
+func (m *CreateServiceAccountKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateServiceAccountKeyRequest.DiscardUnknown(m)
 }
 
-func (m *CreateServiceAccountKeyRequest) Reset()                    { *m = CreateServiceAccountKeyRequest{} }
-func (m *CreateServiceAccountKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateServiceAccountKeyRequest) ProtoMessage()               {}
-func (*CreateServiceAccountKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+var xxx_messageInfo_CreateServiceAccountKeyRequest proto.InternalMessageInfo
 
 func (m *CreateServiceAccountKeyRequest) GetName() string {
 	if m != nil {
@@ -803,13 +1017,35 @@ type DeleteServiceAccountKeyRequest struct {
 	// Using `-` as a wildcard for the project will infer the project from
 	// the account. The `account` value can be the `email` address or the
 	// `unique_id` of the service account.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteServiceAccountKeyRequest) Reset()                    { *m = DeleteServiceAccountKeyRequest{} }
-func (m *DeleteServiceAccountKeyRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteServiceAccountKeyRequest) ProtoMessage()               {}
-func (*DeleteServiceAccountKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *DeleteServiceAccountKeyRequest) Reset()         { *m = DeleteServiceAccountKeyRequest{} }
+func (m *DeleteServiceAccountKeyRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteServiceAccountKeyRequest) ProtoMessage()    {}
+func (*DeleteServiceAccountKeyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{11}
+}
+func (m *DeleteServiceAccountKeyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteServiceAccountKeyRequest.Unmarshal(m, b)
+}
+func (m *DeleteServiceAccountKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteServiceAccountKeyRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteServiceAccountKeyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteServiceAccountKeyRequest.Merge(dst, src)
+}
+func (m *DeleteServiceAccountKeyRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteServiceAccountKeyRequest.Size(m)
+}
+func (m *DeleteServiceAccountKeyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteServiceAccountKeyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteServiceAccountKeyRequest proto.InternalMessageInfo
 
 func (m *DeleteServiceAccountKeyRequest) GetName() string {
 	if m != nil {
@@ -825,15 +1061,37 @@ type SignBlobRequest struct {
 	// Using `-` as a wildcard for the project will infer the project from
 	// the account. The `account` value can be the `email` address or the
 	// `unique_id` of the service account.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The bytes to sign.
-	BytesToSign []byte `protobuf:"bytes,2,opt,name=bytes_to_sign,json=bytesToSign,proto3" json:"bytes_to_sign,omitempty"`
+	BytesToSign          []byte   `protobuf:"bytes,2,opt,name=bytes_to_sign,json=bytesToSign,proto3" json:"bytes_to_sign,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SignBlobRequest) Reset()         { *m = SignBlobRequest{} }
+func (m *SignBlobRequest) String() string { return proto.CompactTextString(m) }
+func (*SignBlobRequest) ProtoMessage()    {}
+func (*SignBlobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{12}
+}
+func (m *SignBlobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SignBlobRequest.Unmarshal(m, b)
+}
+func (m *SignBlobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SignBlobRequest.Marshal(b, m, deterministic)
+}
+func (dst *SignBlobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignBlobRequest.Merge(dst, src)
+}
+func (m *SignBlobRequest) XXX_Size() int {
+	return xxx_messageInfo_SignBlobRequest.Size(m)
+}
+func (m *SignBlobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SignBlobRequest.DiscardUnknown(m)
 }
 
-func (m *SignBlobRequest) Reset()                    { *m = SignBlobRequest{} }
-func (m *SignBlobRequest) String() string            { return proto.CompactTextString(m) }
-func (*SignBlobRequest) ProtoMessage()               {}
-func (*SignBlobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_SignBlobRequest proto.InternalMessageInfo
 
 func (m *SignBlobRequest) GetName() string {
 	if m != nil {
@@ -852,15 +1110,37 @@ func (m *SignBlobRequest) GetBytesToSign() []byte {
 // The service account sign blob response.
 type SignBlobResponse struct {
 	// The id of the key used to sign the blob.
-	KeyId string `protobuf:"bytes,1,opt,name=key_id,json=keyId" json:"key_id,omitempty"`
+	KeyId string `protobuf:"bytes,1,opt,name=key_id,json=keyId,proto3" json:"key_id,omitempty"`
 	// The signed blob.
-	Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	Signature            []byte   `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SignBlobResponse) Reset()                    { *m = SignBlobResponse{} }
-func (m *SignBlobResponse) String() string            { return proto.CompactTextString(m) }
-func (*SignBlobResponse) ProtoMessage()               {}
-func (*SignBlobResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (m *SignBlobResponse) Reset()         { *m = SignBlobResponse{} }
+func (m *SignBlobResponse) String() string { return proto.CompactTextString(m) }
+func (*SignBlobResponse) ProtoMessage()    {}
+func (*SignBlobResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{13}
+}
+func (m *SignBlobResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SignBlobResponse.Unmarshal(m, b)
+}
+func (m *SignBlobResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SignBlobResponse.Marshal(b, m, deterministic)
+}
+func (dst *SignBlobResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignBlobResponse.Merge(dst, src)
+}
+func (m *SignBlobResponse) XXX_Size() int {
+	return xxx_messageInfo_SignBlobResponse.Size(m)
+}
+func (m *SignBlobResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SignBlobResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SignBlobResponse proto.InternalMessageInfo
 
 func (m *SignBlobResponse) GetKeyId() string {
 	if m != nil {
@@ -883,15 +1163,37 @@ type SignJwtRequest struct {
 	// Using `-` as a wildcard for the project will infer the project from
 	// the account. The `account` value can be the `email` address or the
 	// `unique_id` of the service account.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The JWT payload to sign, a JSON JWT Claim set.
-	Payload string `protobuf:"bytes,2,opt,name=payload" json:"payload,omitempty"`
+	Payload              string   `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SignJwtRequest) Reset()                    { *m = SignJwtRequest{} }
-func (m *SignJwtRequest) String() string            { return proto.CompactTextString(m) }
-func (*SignJwtRequest) ProtoMessage()               {}
-func (*SignJwtRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (m *SignJwtRequest) Reset()         { *m = SignJwtRequest{} }
+func (m *SignJwtRequest) String() string { return proto.CompactTextString(m) }
+func (*SignJwtRequest) ProtoMessage()    {}
+func (*SignJwtRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{14}
+}
+func (m *SignJwtRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SignJwtRequest.Unmarshal(m, b)
+}
+func (m *SignJwtRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SignJwtRequest.Marshal(b, m, deterministic)
+}
+func (dst *SignJwtRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignJwtRequest.Merge(dst, src)
+}
+func (m *SignJwtRequest) XXX_Size() int {
+	return xxx_messageInfo_SignJwtRequest.Size(m)
+}
+func (m *SignJwtRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SignJwtRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SignJwtRequest proto.InternalMessageInfo
 
 func (m *SignJwtRequest) GetName() string {
 	if m != nil {
@@ -910,15 +1212,37 @@ func (m *SignJwtRequest) GetPayload() string {
 // The service account sign JWT response.
 type SignJwtResponse struct {
 	// The id of the key used to sign the JWT.
-	KeyId string `protobuf:"bytes,1,opt,name=key_id,json=keyId" json:"key_id,omitempty"`
+	KeyId string `protobuf:"bytes,1,opt,name=key_id,json=keyId,proto3" json:"key_id,omitempty"`
 	// The signed JWT.
-	SignedJwt string `protobuf:"bytes,2,opt,name=signed_jwt,json=signedJwt" json:"signed_jwt,omitempty"`
+	SignedJwt            string   `protobuf:"bytes,2,opt,name=signed_jwt,json=signedJwt,proto3" json:"signed_jwt,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SignJwtResponse) Reset()                    { *m = SignJwtResponse{} }
-func (m *SignJwtResponse) String() string            { return proto.CompactTextString(m) }
-func (*SignJwtResponse) ProtoMessage()               {}
-func (*SignJwtResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *SignJwtResponse) Reset()         { *m = SignJwtResponse{} }
+func (m *SignJwtResponse) String() string { return proto.CompactTextString(m) }
+func (*SignJwtResponse) ProtoMessage()    {}
+func (*SignJwtResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{15}
+}
+func (m *SignJwtResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SignJwtResponse.Unmarshal(m, b)
+}
+func (m *SignJwtResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SignJwtResponse.Marshal(b, m, deterministic)
+}
+func (dst *SignJwtResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignJwtResponse.Merge(dst, src)
+}
+func (m *SignJwtResponse) XXX_Size() int {
+	return xxx_messageInfo_SignJwtResponse.Size(m)
+}
+func (m *SignJwtResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SignJwtResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SignJwtResponse proto.InternalMessageInfo
 
 func (m *SignJwtResponse) GetKeyId() string {
 	if m != nil {
@@ -943,27 +1267,49 @@ type Role struct {
 	// When Role is used in output and other input such as UpdateRole, the role
 	// name is the complete path, e.g., roles/logging.viewer for curated roles
 	// and organizations/{ORGANIZATION_ID}/roles/logging.viewer for custom roles.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional.  A human-readable title for the role.  Typically this
 	// is limited to 100 UTF-8 bytes.
-	Title string `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
 	// Optional.  A human-readable description for the role.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// The names of the permissions this role grants when bound in an IAM policy.
-	IncludedPermissions []string `protobuf:"bytes,7,rep,name=included_permissions,json=includedPermissions" json:"included_permissions,omitempty"`
+	IncludedPermissions []string `protobuf:"bytes,7,rep,name=included_permissions,json=includedPermissions,proto3" json:"included_permissions,omitempty"`
 	// The current launch stage of the role.
-	Stage Role_RoleLaunchStage `protobuf:"varint,8,opt,name=stage,enum=google.iam.admin.v1.Role_RoleLaunchStage" json:"stage,omitempty"`
+	Stage Role_RoleLaunchStage `protobuf:"varint,8,opt,name=stage,proto3,enum=google.iam.admin.v1.Role_RoleLaunchStage" json:"stage,omitempty"`
 	// Used to perform a consistent read-modify-write.
 	Etag []byte `protobuf:"bytes,9,opt,name=etag,proto3" json:"etag,omitempty"`
 	// The current deleted state of the role. This field is read only.
 	// It will be ignored in calls to CreateRole and UpdateRole.
-	Deleted bool `protobuf:"varint,11,opt,name=deleted" json:"deleted,omitempty"`
+	Deleted              bool     `protobuf:"varint,11,opt,name=deleted,proto3" json:"deleted,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Role) Reset()         { *m = Role{} }
+func (m *Role) String() string { return proto.CompactTextString(m) }
+func (*Role) ProtoMessage()    {}
+func (*Role) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{16}
+}
+func (m *Role) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Role.Unmarshal(m, b)
+}
+func (m *Role) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Role.Marshal(b, m, deterministic)
+}
+func (dst *Role) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Role.Merge(dst, src)
+}
+func (m *Role) XXX_Size() int {
+	return xxx_messageInfo_Role.Size(m)
+}
+func (m *Role) XXX_DiscardUnknown() {
+	xxx_messageInfo_Role.DiscardUnknown(m)
 }
 
-func (m *Role) Reset()                    { *m = Role{} }
-func (m *Role) String() string            { return proto.CompactTextString(m) }
-func (*Role) ProtoMessage()               {}
-func (*Role) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_Role proto.InternalMessageInfo
 
 func (m *Role) GetName() string {
 	if m != nil {
@@ -1021,19 +1367,41 @@ type QueryGrantableRolesRequest struct {
 	// The name follows the Google Cloud Platform resource format.
 	// For example, a Cloud Platform project with id `my-project` will be named
 	// `//cloudresourcemanager.googleapis.com/projects/my-project`.
-	FullResourceName string   `protobuf:"bytes,1,opt,name=full_resource_name,json=fullResourceName" json:"full_resource_name,omitempty"`
-	View             RoleView `protobuf:"varint,2,opt,name=view,enum=google.iam.admin.v1.RoleView" json:"view,omitempty"`
+	FullResourceName string   `protobuf:"bytes,1,opt,name=full_resource_name,json=fullResourceName,proto3" json:"full_resource_name,omitempty"`
+	View             RoleView `protobuf:"varint,2,opt,name=view,proto3,enum=google.iam.admin.v1.RoleView" json:"view,omitempty"`
 	// Optional limit on the number of roles to include in the response.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional pagination token returned in an earlier
 	// QueryGrantableRolesResponse.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *QueryGrantableRolesRequest) Reset()         { *m = QueryGrantableRolesRequest{} }
+func (m *QueryGrantableRolesRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryGrantableRolesRequest) ProtoMessage()    {}
+func (*QueryGrantableRolesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{17}
+}
+func (m *QueryGrantableRolesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryGrantableRolesRequest.Unmarshal(m, b)
+}
+func (m *QueryGrantableRolesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryGrantableRolesRequest.Marshal(b, m, deterministic)
+}
+func (dst *QueryGrantableRolesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryGrantableRolesRequest.Merge(dst, src)
+}
+func (m *QueryGrantableRolesRequest) XXX_Size() int {
+	return xxx_messageInfo_QueryGrantableRolesRequest.Size(m)
+}
+func (m *QueryGrantableRolesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryGrantableRolesRequest.DiscardUnknown(m)
 }
 
-func (m *QueryGrantableRolesRequest) Reset()                    { *m = QueryGrantableRolesRequest{} }
-func (m *QueryGrantableRolesRequest) String() string            { return proto.CompactTextString(m) }
-func (*QueryGrantableRolesRequest) ProtoMessage()               {}
-func (*QueryGrantableRolesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+var xxx_messageInfo_QueryGrantableRolesRequest proto.InternalMessageInfo
 
 func (m *QueryGrantableRolesRequest) GetFullResourceName() string {
 	if m != nil {
@@ -1066,16 +1434,38 @@ func (m *QueryGrantableRolesRequest) GetPageToken() string {
 // The grantable role query response.
 type QueryGrantableRolesResponse struct {
 	// The list of matching roles.
-	Roles []*Role `protobuf:"bytes,1,rep,name=roles" json:"roles,omitempty"`
+	Roles []*Role `protobuf:"bytes,1,rep,name=roles,proto3" json:"roles,omitempty"`
 	// To retrieve the next page of results, set
 	// `QueryGrantableRolesRequest.page_token` to this value.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *QueryGrantableRolesResponse) Reset()                    { *m = QueryGrantableRolesResponse{} }
-func (m *QueryGrantableRolesResponse) String() string            { return proto.CompactTextString(m) }
-func (*QueryGrantableRolesResponse) ProtoMessage()               {}
-func (*QueryGrantableRolesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *QueryGrantableRolesResponse) Reset()         { *m = QueryGrantableRolesResponse{} }
+func (m *QueryGrantableRolesResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryGrantableRolesResponse) ProtoMessage()    {}
+func (*QueryGrantableRolesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{18}
+}
+func (m *QueryGrantableRolesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryGrantableRolesResponse.Unmarshal(m, b)
+}
+func (m *QueryGrantableRolesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryGrantableRolesResponse.Marshal(b, m, deterministic)
+}
+func (dst *QueryGrantableRolesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryGrantableRolesResponse.Merge(dst, src)
+}
+func (m *QueryGrantableRolesResponse) XXX_Size() int {
+	return xxx_messageInfo_QueryGrantableRolesResponse.Size(m)
+}
+func (m *QueryGrantableRolesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryGrantableRolesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryGrantableRolesResponse proto.InternalMessageInfo
 
 func (m *QueryGrantableRolesResponse) GetRoles() []*Role {
 	if m != nil {
@@ -1097,21 +1487,43 @@ type ListRolesRequest struct {
 	// `` (empty string) -- this refers to curated roles.
 	// `organizations/{ORGANIZATION_ID}`
 	// `projects/{PROJECT_ID}`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional limit on the number of roles to include in the response.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional pagination token returned in an earlier ListRolesResponse.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional view for the returned Role objects.
-	View RoleView `protobuf:"varint,4,opt,name=view,enum=google.iam.admin.v1.RoleView" json:"view,omitempty"`
+	View RoleView `protobuf:"varint,4,opt,name=view,proto3,enum=google.iam.admin.v1.RoleView" json:"view,omitempty"`
 	// Include Roles that have been deleted.
-	ShowDeleted bool `protobuf:"varint,6,opt,name=show_deleted,json=showDeleted" json:"show_deleted,omitempty"`
+	ShowDeleted          bool     `protobuf:"varint,6,opt,name=show_deleted,json=showDeleted,proto3" json:"show_deleted,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListRolesRequest) Reset()         { *m = ListRolesRequest{} }
+func (m *ListRolesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListRolesRequest) ProtoMessage()    {}
+func (*ListRolesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{19}
+}
+func (m *ListRolesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListRolesRequest.Unmarshal(m, b)
+}
+func (m *ListRolesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListRolesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListRolesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListRolesRequest.Merge(dst, src)
+}
+func (m *ListRolesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListRolesRequest.Size(m)
+}
+func (m *ListRolesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListRolesRequest.DiscardUnknown(m)
 }
 
-func (m *ListRolesRequest) Reset()                    { *m = ListRolesRequest{} }
-func (m *ListRolesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListRolesRequest) ProtoMessage()               {}
-func (*ListRolesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_ListRolesRequest proto.InternalMessageInfo
 
 func (m *ListRolesRequest) GetParent() string {
 	if m != nil {
@@ -1151,16 +1563,38 @@ func (m *ListRolesRequest) GetShowDeleted() bool {
 // The response containing the roles defined under a resource.
 type ListRolesResponse struct {
 	// The Roles defined on this resource.
-	Roles []*Role `protobuf:"bytes,1,rep,name=roles" json:"roles,omitempty"`
+	Roles []*Role `protobuf:"bytes,1,rep,name=roles,proto3" json:"roles,omitempty"`
 	// To retrieve the next page of results, set
 	// `ListRolesRequest.page_token` to this value.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListRolesResponse) Reset()                    { *m = ListRolesResponse{} }
-func (m *ListRolesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListRolesResponse) ProtoMessage()               {}
-func (*ListRolesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *ListRolesResponse) Reset()         { *m = ListRolesResponse{} }
+func (m *ListRolesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListRolesResponse) ProtoMessage()    {}
+func (*ListRolesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{20}
+}
+func (m *ListRolesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListRolesResponse.Unmarshal(m, b)
+}
+func (m *ListRolesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListRolesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListRolesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListRolesResponse.Merge(dst, src)
+}
+func (m *ListRolesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListRolesResponse.Size(m)
+}
+func (m *ListRolesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListRolesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListRolesResponse proto.InternalMessageInfo
 
 func (m *ListRolesResponse) GetRoles() []*Role {
 	if m != nil {
@@ -1182,13 +1616,35 @@ type GetRoleRequest struct {
 	// `roles/{ROLE_NAME}`
 	// `organizations/{ORGANIZATION_ID}/roles/{ROLE_NAME}`
 	// `projects/{PROJECT_ID}/roles/{ROLE_NAME}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetRoleRequest) Reset()         { *m = GetRoleRequest{} }
+func (m *GetRoleRequest) String() string { return proto.CompactTextString(m) }
+func (*GetRoleRequest) ProtoMessage()    {}
+func (*GetRoleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{21}
+}
+func (m *GetRoleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetRoleRequest.Unmarshal(m, b)
+}
+func (m *GetRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetRoleRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetRoleRequest.Merge(dst, src)
+}
+func (m *GetRoleRequest) XXX_Size() int {
+	return xxx_messageInfo_GetRoleRequest.Size(m)
+}
+func (m *GetRoleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetRoleRequest.DiscardUnknown(m)
 }
 
-func (m *GetRoleRequest) Reset()                    { *m = GetRoleRequest{} }
-func (m *GetRoleRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetRoleRequest) ProtoMessage()               {}
-func (*GetRoleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+var xxx_messageInfo_GetRoleRequest proto.InternalMessageInfo
 
 func (m *GetRoleRequest) GetName() string {
 	if m != nil {
@@ -1202,17 +1658,39 @@ type CreateRoleRequest struct {
 	// The resource name of the parent resource in one of the following formats:
 	// `organizations/{ORGANIZATION_ID}`
 	// `projects/{PROJECT_ID}`
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The role id to use for this role.
-	RoleId string `protobuf:"bytes,2,opt,name=role_id,json=roleId" json:"role_id,omitempty"`
+	RoleId string `protobuf:"bytes,2,opt,name=role_id,json=roleId,proto3" json:"role_id,omitempty"`
 	// The Role resource to create.
-	Role *Role `protobuf:"bytes,3,opt,name=role" json:"role,omitempty"`
+	Role                 *Role    `protobuf:"bytes,3,opt,name=role,proto3" json:"role,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateRoleRequest) Reset()                    { *m = CreateRoleRequest{} }
-func (m *CreateRoleRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateRoleRequest) ProtoMessage()               {}
-func (*CreateRoleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+func (m *CreateRoleRequest) Reset()         { *m = CreateRoleRequest{} }
+func (m *CreateRoleRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateRoleRequest) ProtoMessage()    {}
+func (*CreateRoleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{22}
+}
+func (m *CreateRoleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateRoleRequest.Unmarshal(m, b)
+}
+func (m *CreateRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateRoleRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateRoleRequest.Merge(dst, src)
+}
+func (m *CreateRoleRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateRoleRequest.Size(m)
+}
+func (m *CreateRoleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateRoleRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateRoleRequest proto.InternalMessageInfo
 
 func (m *CreateRoleRequest) GetParent() string {
 	if m != nil {
@@ -1241,17 +1719,39 @@ type UpdateRoleRequest struct {
 	// `roles/{ROLE_NAME}`
 	// `organizations/{ORGANIZATION_ID}/roles/{ROLE_NAME}`
 	// `projects/{PROJECT_ID}/roles/{ROLE_NAME}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The updated role.
-	Role *Role `protobuf:"bytes,2,opt,name=role" json:"role,omitempty"`
+	Role *Role `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"`
 	// A mask describing which fields in the Role have changed.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateRoleRequest) Reset()         { *m = UpdateRoleRequest{} }
+func (m *UpdateRoleRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateRoleRequest) ProtoMessage()    {}
+func (*UpdateRoleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{23}
+}
+func (m *UpdateRoleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateRoleRequest.Unmarshal(m, b)
+}
+func (m *UpdateRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateRoleRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateRoleRequest.Merge(dst, src)
+}
+func (m *UpdateRoleRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateRoleRequest.Size(m)
+}
+func (m *UpdateRoleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateRoleRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateRoleRequest) Reset()                    { *m = UpdateRoleRequest{} }
-func (m *UpdateRoleRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateRoleRequest) ProtoMessage()               {}
-func (*UpdateRoleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+var xxx_messageInfo_UpdateRoleRequest proto.InternalMessageInfo
 
 func (m *UpdateRoleRequest) GetName() string {
 	if m != nil {
@@ -1267,7 +1767,7 @@ func (m *UpdateRoleRequest) GetRole() *Role {
 	return nil
 }
 
-func (m *UpdateRoleRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdateRoleRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -1279,15 +1779,37 @@ type DeleteRoleRequest struct {
 	// The resource name of the role in one of the following formats:
 	// `organizations/{ORGANIZATION_ID}/roles/{ROLE_NAME}`
 	// `projects/{PROJECT_ID}/roles/{ROLE_NAME}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Used to perform a consistent read-modify-write.
-	Etag []byte `protobuf:"bytes,2,opt,name=etag,proto3" json:"etag,omitempty"`
+	Etag                 []byte   `protobuf:"bytes,2,opt,name=etag,proto3" json:"etag,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteRoleRequest) Reset()                    { *m = DeleteRoleRequest{} }
-func (m *DeleteRoleRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteRoleRequest) ProtoMessage()               {}
-func (*DeleteRoleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
+func (m *DeleteRoleRequest) Reset()         { *m = DeleteRoleRequest{} }
+func (m *DeleteRoleRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteRoleRequest) ProtoMessage()    {}
+func (*DeleteRoleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{24}
+}
+func (m *DeleteRoleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteRoleRequest.Unmarshal(m, b)
+}
+func (m *DeleteRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteRoleRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteRoleRequest.Merge(dst, src)
+}
+func (m *DeleteRoleRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteRoleRequest.Size(m)
+}
+func (m *DeleteRoleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteRoleRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteRoleRequest proto.InternalMessageInfo
 
 func (m *DeleteRoleRequest) GetName() string {
 	if m != nil {
@@ -1308,15 +1830,37 @@ type UndeleteRoleRequest struct {
 	// The resource name of the role in one of the following formats:
 	// `organizations/{ORGANIZATION_ID}/roles/{ROLE_NAME}`
 	// `projects/{PROJECT_ID}/roles/{ROLE_NAME}`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Used to perform a consistent read-modify-write.
-	Etag []byte `protobuf:"bytes,2,opt,name=etag,proto3" json:"etag,omitempty"`
+	Etag                 []byte   `protobuf:"bytes,2,opt,name=etag,proto3" json:"etag,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UndeleteRoleRequest) Reset()         { *m = UndeleteRoleRequest{} }
+func (m *UndeleteRoleRequest) String() string { return proto.CompactTextString(m) }
+func (*UndeleteRoleRequest) ProtoMessage()    {}
+func (*UndeleteRoleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{25}
+}
+func (m *UndeleteRoleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UndeleteRoleRequest.Unmarshal(m, b)
+}
+func (m *UndeleteRoleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UndeleteRoleRequest.Marshal(b, m, deterministic)
+}
+func (dst *UndeleteRoleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UndeleteRoleRequest.Merge(dst, src)
+}
+func (m *UndeleteRoleRequest) XXX_Size() int {
+	return xxx_messageInfo_UndeleteRoleRequest.Size(m)
+}
+func (m *UndeleteRoleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UndeleteRoleRequest.DiscardUnknown(m)
 }
 
-func (m *UndeleteRoleRequest) Reset()                    { *m = UndeleteRoleRequest{} }
-func (m *UndeleteRoleRequest) String() string            { return proto.CompactTextString(m) }
-func (*UndeleteRoleRequest) ProtoMessage()               {}
-func (*UndeleteRoleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
+var xxx_messageInfo_UndeleteRoleRequest proto.InternalMessageInfo
 
 func (m *UndeleteRoleRequest) GetName() string {
 	if m != nil {
@@ -1335,23 +1879,45 @@ func (m *UndeleteRoleRequest) GetEtag() []byte {
 // A permission which can be included by a role.
 type Permission struct {
 	// The name of this Permission.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The title of this Permission.
-	Title string `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
+	Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
 	// A brief description of what this Permission is used for.
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// This permission can ONLY be used in predefined roles.
-	OnlyInPredefinedRoles bool `protobuf:"varint,4,opt,name=only_in_predefined_roles,json=onlyInPredefinedRoles" json:"only_in_predefined_roles,omitempty"`
+	OnlyInPredefinedRoles bool `protobuf:"varint,4,opt,name=only_in_predefined_roles,json=onlyInPredefinedRoles,proto3" json:"only_in_predefined_roles,omitempty"`
 	// The current launch stage of the permission.
-	Stage Permission_PermissionLaunchStage `protobuf:"varint,5,opt,name=stage,enum=google.iam.admin.v1.Permission_PermissionLaunchStage" json:"stage,omitempty"`
+	Stage Permission_PermissionLaunchStage `protobuf:"varint,5,opt,name=stage,proto3,enum=google.iam.admin.v1.Permission_PermissionLaunchStage" json:"stage,omitempty"`
 	// The current custom role support level.
-	CustomRolesSupportLevel Permission_CustomRolesSupportLevel `protobuf:"varint,6,opt,name=custom_roles_support_level,json=customRolesSupportLevel,enum=google.iam.admin.v1.Permission_CustomRolesSupportLevel" json:"custom_roles_support_level,omitempty"`
+	CustomRolesSupportLevel Permission_CustomRolesSupportLevel `protobuf:"varint,6,opt,name=custom_roles_support_level,json=customRolesSupportLevel,proto3,enum=google.iam.admin.v1.Permission_CustomRolesSupportLevel" json:"custom_roles_support_level,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}                           `json:"-"`
+	XXX_unrecognized        []byte                             `json:"-"`
+	XXX_sizecache           int32                              `json:"-"`
 }
 
-func (m *Permission) Reset()                    { *m = Permission{} }
-func (m *Permission) String() string            { return proto.CompactTextString(m) }
-func (*Permission) ProtoMessage()               {}
-func (*Permission) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
+func (m *Permission) Reset()         { *m = Permission{} }
+func (m *Permission) String() string { return proto.CompactTextString(m) }
+func (*Permission) ProtoMessage()    {}
+func (*Permission) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{26}
+}
+func (m *Permission) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Permission.Unmarshal(m, b)
+}
+func (m *Permission) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Permission.Marshal(b, m, deterministic)
+}
+func (dst *Permission) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Permission.Merge(dst, src)
+}
+func (m *Permission) XXX_Size() int {
+	return xxx_messageInfo_Permission.Size(m)
+}
+func (m *Permission) XXX_DiscardUnknown() {
+	xxx_messageInfo_Permission.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Permission proto.InternalMessageInfo
 
 func (m *Permission) GetName() string {
 	if m != nil {
@@ -1403,20 +1969,40 @@ type QueryTestablePermissionsRequest struct {
 	// The name follows the Google Cloud Platform resource format.
 	// For example, a Cloud Platform project with id `my-project` will be named
 	// `//cloudresourcemanager.googleapis.com/projects/my-project`.
-	FullResourceName string `protobuf:"bytes,1,opt,name=full_resource_name,json=fullResourceName" json:"full_resource_name,omitempty"`
+	FullResourceName string `protobuf:"bytes,1,opt,name=full_resource_name,json=fullResourceName,proto3" json:"full_resource_name,omitempty"`
 	// Optional limit on the number of permissions to include in the response.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional pagination token returned in an earlier
 	// QueryTestablePermissionsRequest.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *QueryTestablePermissionsRequest) Reset()         { *m = QueryTestablePermissionsRequest{} }
 func (m *QueryTestablePermissionsRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryTestablePermissionsRequest) ProtoMessage()    {}
 func (*QueryTestablePermissionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27}
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{27}
+}
+func (m *QueryTestablePermissionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryTestablePermissionsRequest.Unmarshal(m, b)
+}
+func (m *QueryTestablePermissionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryTestablePermissionsRequest.Marshal(b, m, deterministic)
 }
+func (dst *QueryTestablePermissionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryTestablePermissionsRequest.Merge(dst, src)
+}
+func (m *QueryTestablePermissionsRequest) XXX_Size() int {
+	return xxx_messageInfo_QueryTestablePermissionsRequest.Size(m)
+}
+func (m *QueryTestablePermissionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryTestablePermissionsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryTestablePermissionsRequest proto.InternalMessageInfo
 
 func (m *QueryTestablePermissionsRequest) GetFullResourceName() string {
 	if m != nil {
@@ -1442,18 +2028,38 @@ func (m *QueryTestablePermissionsRequest) GetPageToken() string {
 // The response containing permissions which can be tested on a resource.
 type QueryTestablePermissionsResponse struct {
 	// The Permissions testable on the requested resource.
-	Permissions []*Permission `protobuf:"bytes,1,rep,name=permissions" json:"permissions,omitempty"`
+	Permissions []*Permission `protobuf:"bytes,1,rep,name=permissions,proto3" json:"permissions,omitempty"`
 	// To retrieve the next page of results, set
 	// `QueryTestableRolesRequest.page_token` to this value.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *QueryTestablePermissionsResponse) Reset()         { *m = QueryTestablePermissionsResponse{} }
 func (m *QueryTestablePermissionsResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryTestablePermissionsResponse) ProtoMessage()    {}
 func (*QueryTestablePermissionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28}
+	return fileDescriptor_iam_0b2e61fc3ef32ffa, []int{28}
+}
+func (m *QueryTestablePermissionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryTestablePermissionsResponse.Unmarshal(m, b)
+}
+func (m *QueryTestablePermissionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryTestablePermissionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *QueryTestablePermissionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryTestablePermissionsResponse.Merge(dst, src)
 }
+func (m *QueryTestablePermissionsResponse) XXX_Size() int {
+	return xxx_messageInfo_QueryTestablePermissionsResponse.Size(m)
+}
+func (m *QueryTestablePermissionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryTestablePermissionsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryTestablePermissionsResponse proto.InternalMessageInfo
 
 func (m *QueryTestablePermissionsResponse) GetPermissions() []*Permission {
 	if m != nil {
@@ -1517,8 +2123,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for IAM service
-
+// IAMClient is the client API for IAM service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type IAMClient interface {
 	// Lists [ServiceAccounts][google.iam.admin.v1.ServiceAccount] for a project.
 	ListServiceAccounts(ctx context.Context, in *ListServiceAccountsRequest, opts ...grpc.CallOption) (*ListServiceAccountsResponse, error)
@@ -1534,7 +2141,7 @@ type IAMClient interface {
 	// The `etag` is mandatory.
 	UpdateServiceAccount(ctx context.Context, in *ServiceAccount, opts ...grpc.CallOption) (*ServiceAccount, error)
 	// Deletes a [ServiceAccount][google.iam.admin.v1.ServiceAccount].
-	DeleteServiceAccount(ctx context.Context, in *DeleteServiceAccountRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteServiceAccount(ctx context.Context, in *DeleteServiceAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Lists [ServiceAccountKeys][google.iam.admin.v1.ServiceAccountKey].
 	ListServiceAccountKeys(ctx context.Context, in *ListServiceAccountKeysRequest, opts ...grpc.CallOption) (*ListServiceAccountKeysResponse, error)
 	// Gets the [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey]
@@ -1544,7 +2151,7 @@ type IAMClient interface {
 	// and returns it.
 	CreateServiceAccountKey(ctx context.Context, in *CreateServiceAccountKeyRequest, opts ...grpc.CallOption) (*ServiceAccountKey, error)
 	// Deletes a [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey].
-	DeleteServiceAccountKey(ctx context.Context, in *DeleteServiceAccountKeyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	DeleteServiceAccountKey(ctx context.Context, in *DeleteServiceAccountKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Signs a blob using a service account's system-managed private key.
 	SignBlob(ctx context.Context, in *SignBlobRequest, opts ...grpc.CallOption) (*SignBlobResponse, error)
 	// Signs a JWT using a service account's system-managed private key.
@@ -1555,13 +2162,13 @@ type IAMClient interface {
 	SignJwt(ctx context.Context, in *SignJwtRequest, opts ...grpc.CallOption) (*SignJwtResponse, error)
 	// Returns the IAM access control policy for a
 	// [ServiceAccount][google.iam.admin.v1.ServiceAccount].
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Sets the IAM access control policy for a
 	// [ServiceAccount][google.iam.admin.v1.ServiceAccount].
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Tests the specified permissions against the IAM access control policy
 	// for a [ServiceAccount][google.iam.admin.v1.ServiceAccount].
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
 	// Queries roles that can be granted on a particular resource.
 	// A role is grantable if it can be used as the role in a binding for a policy
 	// for that resource.
@@ -1599,7 +2206,7 @@ func NewIAMClient(cc *grpc.ClientConn) IAMClient {
 
 func (c *iAMClient) ListServiceAccounts(ctx context.Context, in *ListServiceAccountsRequest, opts ...grpc.CallOption) (*ListServiceAccountsResponse, error) {
 	out := new(ListServiceAccountsResponse)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/ListServiceAccounts", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/ListServiceAccounts", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1608,7 +2215,7 @@ func (c *iAMClient) ListServiceAccounts(ctx context.Context, in *ListServiceAcco
 
 func (c *iAMClient) GetServiceAccount(ctx context.Context, in *GetServiceAccountRequest, opts ...grpc.CallOption) (*ServiceAccount, error) {
 	out := new(ServiceAccount)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/GetServiceAccount", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/GetServiceAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1617,7 +2224,7 @@ func (c *iAMClient) GetServiceAccount(ctx context.Context, in *GetServiceAccount
 
 func (c *iAMClient) CreateServiceAccount(ctx context.Context, in *CreateServiceAccountRequest, opts ...grpc.CallOption) (*ServiceAccount, error) {
 	out := new(ServiceAccount)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/CreateServiceAccount", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/CreateServiceAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1626,16 +2233,16 @@ func (c *iAMClient) CreateServiceAccount(ctx context.Context, in *CreateServiceA
 
 func (c *iAMClient) UpdateServiceAccount(ctx context.Context, in *ServiceAccount, opts ...grpc.CallOption) (*ServiceAccount, error) {
 	out := new(ServiceAccount)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/UpdateServiceAccount", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/UpdateServiceAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *iAMClient) DeleteServiceAccount(ctx context.Context, in *DeleteServiceAccountRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/DeleteServiceAccount", in, out, c.cc, opts...)
+func (c *iAMClient) DeleteServiceAccount(ctx context.Context, in *DeleteServiceAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/DeleteServiceAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1644,7 +2251,7 @@ func (c *iAMClient) DeleteServiceAccount(ctx context.Context, in *DeleteServiceA
 
 func (c *iAMClient) ListServiceAccountKeys(ctx context.Context, in *ListServiceAccountKeysRequest, opts ...grpc.CallOption) (*ListServiceAccountKeysResponse, error) {
 	out := new(ListServiceAccountKeysResponse)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/ListServiceAccountKeys", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/ListServiceAccountKeys", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1653,7 +2260,7 @@ func (c *iAMClient) ListServiceAccountKeys(ctx context.Context, in *ListServiceA
 
 func (c *iAMClient) GetServiceAccountKey(ctx context.Context, in *GetServiceAccountKeyRequest, opts ...grpc.CallOption) (*ServiceAccountKey, error) {
 	out := new(ServiceAccountKey)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/GetServiceAccountKey", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/GetServiceAccountKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1662,16 +2269,16 @@ func (c *iAMClient) GetServiceAccountKey(ctx context.Context, in *GetServiceAcco
 
 func (c *iAMClient) CreateServiceAccountKey(ctx context.Context, in *CreateServiceAccountKeyRequest, opts ...grpc.CallOption) (*ServiceAccountKey, error) {
 	out := new(ServiceAccountKey)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/CreateServiceAccountKey", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/CreateServiceAccountKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *iAMClient) DeleteServiceAccountKey(ctx context.Context, in *DeleteServiceAccountKeyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", in, out, c.cc, opts...)
+func (c *iAMClient) DeleteServiceAccountKey(ctx context.Context, in *DeleteServiceAccountKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1680,7 +2287,7 @@ func (c *iAMClient) DeleteServiceAccountKey(ctx context.Context, in *DeleteServi
 
 func (c *iAMClient) SignBlob(ctx context.Context, in *SignBlobRequest, opts ...grpc.CallOption) (*SignBlobResponse, error) {
 	out := new(SignBlobResponse)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/SignBlob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/SignBlob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1689,34 +2296,34 @@ func (c *iAMClient) SignBlob(ctx context.Context, in *SignBlobRequest, opts ...g
 
 func (c *iAMClient) SignJwt(ctx context.Context, in *SignJwtRequest, opts ...grpc.CallOption) (*SignJwtResponse, error) {
 	out := new(SignJwtResponse)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/SignJwt", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/SignJwt", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *iAMClient) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/GetIamPolicy", in, out, c.cc, opts...)
+func (c *iAMClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *iAMClient) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/SetIamPolicy", in, out, c.cc, opts...)
+func (c *iAMClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *iAMClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/TestIamPermissions", in, out, c.cc, opts...)
+func (c *iAMClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1725,7 +2332,7 @@ func (c *iAMClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.T
 
 func (c *iAMClient) QueryGrantableRoles(ctx context.Context, in *QueryGrantableRolesRequest, opts ...grpc.CallOption) (*QueryGrantableRolesResponse, error) {
 	out := new(QueryGrantableRolesResponse)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/QueryGrantableRoles", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/QueryGrantableRoles", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1734,7 +2341,7 @@ func (c *iAMClient) QueryGrantableRoles(ctx context.Context, in *QueryGrantableR
 
 func (c *iAMClient) ListRoles(ctx context.Context, in *ListRolesRequest, opts ...grpc.CallOption) (*ListRolesResponse, error) {
 	out := new(ListRolesResponse)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/ListRoles", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/ListRoles", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1743,7 +2350,7 @@ func (c *iAMClient) ListRoles(ctx context.Context, in *ListRolesRequest, opts ..
 
 func (c *iAMClient) GetRole(ctx context.Context, in *GetRoleRequest, opts ...grpc.CallOption) (*Role, error) {
 	out := new(Role)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/GetRole", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/GetRole", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1752,7 +2359,7 @@ func (c *iAMClient) GetRole(ctx context.Context, in *GetRoleRequest, opts ...grp
 
 func (c *iAMClient) CreateRole(ctx context.Context, in *CreateRoleRequest, opts ...grpc.CallOption) (*Role, error) {
 	out := new(Role)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/CreateRole", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/CreateRole", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1761,7 +2368,7 @@ func (c *iAMClient) CreateRole(ctx context.Context, in *CreateRoleRequest, opts
 
 func (c *iAMClient) UpdateRole(ctx context.Context, in *UpdateRoleRequest, opts ...grpc.CallOption) (*Role, error) {
 	out := new(Role)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/UpdateRole", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/UpdateRole", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1770,7 +2377,7 @@ func (c *iAMClient) UpdateRole(ctx context.Context, in *UpdateRoleRequest, opts
 
 func (c *iAMClient) DeleteRole(ctx context.Context, in *DeleteRoleRequest, opts ...grpc.CallOption) (*Role, error) {
 	out := new(Role)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/DeleteRole", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/DeleteRole", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1779,7 +2386,7 @@ func (c *iAMClient) DeleteRole(ctx context.Context, in *DeleteRoleRequest, opts
 
 func (c *iAMClient) UndeleteRole(ctx context.Context, in *UndeleteRoleRequest, opts ...grpc.CallOption) (*Role, error) {
 	out := new(Role)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/UndeleteRole", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/UndeleteRole", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1788,15 +2395,14 @@ func (c *iAMClient) UndeleteRole(ctx context.Context, in *UndeleteRoleRequest, o
 
 func (c *iAMClient) QueryTestablePermissions(ctx context.Context, in *QueryTestablePermissionsRequest, opts ...grpc.CallOption) (*QueryTestablePermissionsResponse, error) {
 	out := new(QueryTestablePermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.iam.admin.v1.IAM/QueryTestablePermissions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.admin.v1.IAM/QueryTestablePermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for IAM service
-
+// IAMServer is the server API for IAM service.
 type IAMServer interface {
 	// Lists [ServiceAccounts][google.iam.admin.v1.ServiceAccount] for a project.
 	ListServiceAccounts(context.Context, *ListServiceAccountsRequest) (*ListServiceAccountsResponse, error)
@@ -1812,7 +2418,7 @@ type IAMServer interface {
 	// The `etag` is mandatory.
 	UpdateServiceAccount(context.Context, *ServiceAccount) (*ServiceAccount, error)
 	// Deletes a [ServiceAccount][google.iam.admin.v1.ServiceAccount].
-	DeleteServiceAccount(context.Context, *DeleteServiceAccountRequest) (*google_protobuf1.Empty, error)
+	DeleteServiceAccount(context.Context, *DeleteServiceAccountRequest) (*empty.Empty, error)
 	// Lists [ServiceAccountKeys][google.iam.admin.v1.ServiceAccountKey].
 	ListServiceAccountKeys(context.Context, *ListServiceAccountKeysRequest) (*ListServiceAccountKeysResponse, error)
 	// Gets the [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey]
@@ -1822,7 +2428,7 @@ type IAMServer interface {
 	// and returns it.
 	CreateServiceAccountKey(context.Context, *CreateServiceAccountKeyRequest) (*ServiceAccountKey, error)
 	// Deletes a [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey].
-	DeleteServiceAccountKey(context.Context, *DeleteServiceAccountKeyRequest) (*google_protobuf1.Empty, error)
+	DeleteServiceAccountKey(context.Context, *DeleteServiceAccountKeyRequest) (*empty.Empty, error)
 	// Signs a blob using a service account's system-managed private key.
 	SignBlob(context.Context, *SignBlobRequest) (*SignBlobResponse, error)
 	// Signs a JWT using a service account's system-managed private key.
@@ -1833,13 +2439,13 @@ type IAMServer interface {
 	SignJwt(context.Context, *SignJwtRequest) (*SignJwtResponse, error)
 	// Returns the IAM access control policy for a
 	// [ServiceAccount][google.iam.admin.v1.ServiceAccount].
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Sets the IAM access control policy for a
 	// [ServiceAccount][google.iam.admin.v1.ServiceAccount].
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Tests the specified permissions against the IAM access control policy
 	// for a [ServiceAccount][google.iam.admin.v1.ServiceAccount].
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
 	// Queries roles that can be granted on a particular resource.
 	// A role is grantable if it can be used as the role in a binding for a policy
 	// for that resource.
@@ -2070,7 +2676,7 @@ func _IAM_SignJwt_Handler(srv interface{}, ctx context.Context, dec func(interfa
 }
 
 func _IAM_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2082,13 +2688,13 @@ func _IAM_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(in
 		FullMethod: "/google.iam.admin.v1.IAM/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(IAMServer).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(IAMServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _IAM_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2100,13 +2706,13 @@ func _IAM_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(in
 		FullMethod: "/google.iam.admin.v1.IAM/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(IAMServer).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(IAMServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _IAM_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2118,7 +2724,7 @@ func _IAM_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec f
 		FullMethod: "/google.iam.admin.v1.IAM/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(IAMServer).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(IAMServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -2364,9 +2970,9 @@ var _IAM_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/iam/admin/v1/iam.proto",
 }
 
-func init() { proto.RegisterFile("google/iam/admin/v1/iam.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/iam/admin/v1/iam.proto", fileDescriptor_iam_0b2e61fc3ef32ffa) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_iam_0b2e61fc3ef32ffa = []byte{
 	// 2430 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5a, 0x4f, 0x73, 0xdb, 0xc6,
 	0x15, 0x37, 0x28, 0xea, 0x0f, 0x9f, 0x24, 0x0a, 0x5a, 0xc9, 0x16, 0x4b, 0x59, 0xb6, 0xb2, 0xb5,
diff --git a/vendor/google.golang.org/genproto/googleapis/iam/v1/iam_policy.pb.go b/vendor/google.golang.org/genproto/googleapis/iam/v1/iam_policy.pb.go
index 913c7160..dfc87966 100644
--- a/vendor/google.golang.org/genproto/googleapis/iam/v1/iam_policy.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/iam/v1/iam_policy.pb.go
@@ -1,24 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/iam_policy.proto
 
-/*
-Package iam is a generated protocol buffer package.
-
-It is generated from these files:
-	google/iam/v1/iam_policy.proto
-	google/iam/v1/policy.proto
-
-It has these top-level messages:
-	SetIamPolicyRequest
-	GetIamPolicyRequest
-	TestIamPermissionsRequest
-	TestIamPermissionsResponse
-	Policy
-	Binding
-	PolicyDelta
-	BindingDelta
-*/
-package iam
+package iam // import "google.golang.org/genproto/googleapis/iam/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -46,18 +29,40 @@ type SetIamPolicyRequest struct {
 	// REQUIRED: The resource for which the policy is being specified.
 	// `resource` is usually specified as a path. For example, a Project
 	// resource is specified as `projects/{project}`.
-	Resource string `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource string `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
 	// REQUIRED: The complete policy to be applied to the `resource`. The size of
 	// the policy is limited to a few 10s of KB. An empty policy is a
 	// valid policy but certain Cloud Platform services (such as Projects)
 	// might reject them.
-	Policy *Policy `protobuf:"bytes,2,opt,name=policy" json:"policy,omitempty"`
+	Policy               *Policy  `protobuf:"bytes,2,opt,name=policy,proto3" json:"policy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetIamPolicyRequest) Reset()                    { *m = SetIamPolicyRequest{} }
-func (m *SetIamPolicyRequest) String() string            { return proto.CompactTextString(m) }
-func (*SetIamPolicyRequest) ProtoMessage()               {}
-func (*SetIamPolicyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *SetIamPolicyRequest) Reset()         { *m = SetIamPolicyRequest{} }
+func (m *SetIamPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*SetIamPolicyRequest) ProtoMessage()    {}
+func (*SetIamPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_policy_58547b5cf2e9d67a, []int{0}
+}
+func (m *SetIamPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetIamPolicyRequest.Unmarshal(m, b)
+}
+func (m *SetIamPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetIamPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *SetIamPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetIamPolicyRequest.Merge(dst, src)
+}
+func (m *SetIamPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_SetIamPolicyRequest.Size(m)
+}
+func (m *SetIamPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetIamPolicyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SetIamPolicyRequest proto.InternalMessageInfo
 
 func (m *SetIamPolicyRequest) GetResource() string {
 	if m != nil {
@@ -78,13 +83,35 @@ type GetIamPolicyRequest struct {
 	// REQUIRED: The resource for which the policy is being requested.
 	// `resource` is usually specified as a path. For example, a Project
 	// resource is specified as `projects/{project}`.
-	Resource string `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource             string   `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetIamPolicyRequest) Reset()         { *m = GetIamPolicyRequest{} }
+func (m *GetIamPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*GetIamPolicyRequest) ProtoMessage()    {}
+func (*GetIamPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_policy_58547b5cf2e9d67a, []int{1}
+}
+func (m *GetIamPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetIamPolicyRequest.Unmarshal(m, b)
+}
+func (m *GetIamPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetIamPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetIamPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetIamPolicyRequest.Merge(dst, src)
+}
+func (m *GetIamPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_GetIamPolicyRequest.Size(m)
+}
+func (m *GetIamPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetIamPolicyRequest.DiscardUnknown(m)
 }
 
-func (m *GetIamPolicyRequest) Reset()                    { *m = GetIamPolicyRequest{} }
-func (m *GetIamPolicyRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetIamPolicyRequest) ProtoMessage()               {}
-func (*GetIamPolicyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_GetIamPolicyRequest proto.InternalMessageInfo
 
 func (m *GetIamPolicyRequest) GetResource() string {
 	if m != nil {
@@ -98,18 +125,40 @@ type TestIamPermissionsRequest struct {
 	// REQUIRED: The resource for which the policy detail is being requested.
 	// `resource` is usually specified as a path. For example, a Project
 	// resource is specified as `projects/{project}`.
-	Resource string `protobuf:"bytes,1,opt,name=resource" json:"resource,omitempty"`
+	Resource string `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
 	// The set of permissions to check for the `resource`. Permissions with
 	// wildcards (such as '*' or 'storage.*') are not allowed. For more
 	// information see
 	// [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions).
-	Permissions []string `protobuf:"bytes,2,rep,name=permissions" json:"permissions,omitempty"`
+	Permissions          []string `protobuf:"bytes,2,rep,name=permissions,proto3" json:"permissions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestIamPermissionsRequest) Reset()         { *m = TestIamPermissionsRequest{} }
+func (m *TestIamPermissionsRequest) String() string { return proto.CompactTextString(m) }
+func (*TestIamPermissionsRequest) ProtoMessage()    {}
+func (*TestIamPermissionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_policy_58547b5cf2e9d67a, []int{2}
+}
+func (m *TestIamPermissionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestIamPermissionsRequest.Unmarshal(m, b)
+}
+func (m *TestIamPermissionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestIamPermissionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *TestIamPermissionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestIamPermissionsRequest.Merge(dst, src)
+}
+func (m *TestIamPermissionsRequest) XXX_Size() int {
+	return xxx_messageInfo_TestIamPermissionsRequest.Size(m)
+}
+func (m *TestIamPermissionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestIamPermissionsRequest.DiscardUnknown(m)
 }
 
-func (m *TestIamPermissionsRequest) Reset()                    { *m = TestIamPermissionsRequest{} }
-func (m *TestIamPermissionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*TestIamPermissionsRequest) ProtoMessage()               {}
-func (*TestIamPermissionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_TestIamPermissionsRequest proto.InternalMessageInfo
 
 func (m *TestIamPermissionsRequest) GetResource() string {
 	if m != nil {
@@ -129,13 +178,35 @@ func (m *TestIamPermissionsRequest) GetPermissions() []string {
 type TestIamPermissionsResponse struct {
 	// A subset of `TestPermissionsRequest.permissions` that the caller is
 	// allowed.
-	Permissions []string `protobuf:"bytes,1,rep,name=permissions" json:"permissions,omitempty"`
+	Permissions          []string `protobuf:"bytes,1,rep,name=permissions,proto3" json:"permissions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestIamPermissionsResponse) Reset()         { *m = TestIamPermissionsResponse{} }
+func (m *TestIamPermissionsResponse) String() string { return proto.CompactTextString(m) }
+func (*TestIamPermissionsResponse) ProtoMessage()    {}
+func (*TestIamPermissionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_iam_policy_58547b5cf2e9d67a, []int{3}
+}
+func (m *TestIamPermissionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestIamPermissionsResponse.Unmarshal(m, b)
+}
+func (m *TestIamPermissionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestIamPermissionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *TestIamPermissionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestIamPermissionsResponse.Merge(dst, src)
+}
+func (m *TestIamPermissionsResponse) XXX_Size() int {
+	return xxx_messageInfo_TestIamPermissionsResponse.Size(m)
+}
+func (m *TestIamPermissionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestIamPermissionsResponse.DiscardUnknown(m)
 }
 
-func (m *TestIamPermissionsResponse) Reset()                    { *m = TestIamPermissionsResponse{} }
-func (m *TestIamPermissionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*TestIamPermissionsResponse) ProtoMessage()               {}
-func (*TestIamPermissionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_TestIamPermissionsResponse proto.InternalMessageInfo
 
 func (m *TestIamPermissionsResponse) GetPermissions() []string {
 	if m != nil {
@@ -159,8 +230,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for IAMPolicy service
-
+// IAMPolicyClient is the client API for IAMPolicy service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type IAMPolicyClient interface {
 	// Sets the access control policy on the specified resource. Replaces any
 	// existing policy.
@@ -185,7 +257,7 @@ func NewIAMPolicyClient(cc *grpc.ClientConn) IAMPolicyClient {
 
 func (c *iAMPolicyClient) SetIamPolicy(ctx context.Context, in *SetIamPolicyRequest, opts ...grpc.CallOption) (*Policy, error) {
 	out := new(Policy)
-	err := grpc.Invoke(ctx, "/google.iam.v1.IAMPolicy/SetIamPolicy", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.v1.IAMPolicy/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -194,7 +266,7 @@ func (c *iAMPolicyClient) SetIamPolicy(ctx context.Context, in *SetIamPolicyRequ
 
 func (c *iAMPolicyClient) GetIamPolicy(ctx context.Context, in *GetIamPolicyRequest, opts ...grpc.CallOption) (*Policy, error) {
 	out := new(Policy)
-	err := grpc.Invoke(ctx, "/google.iam.v1.IAMPolicy/GetIamPolicy", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.v1.IAMPolicy/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -203,15 +275,14 @@ func (c *iAMPolicyClient) GetIamPolicy(ctx context.Context, in *GetIamPolicyRequ
 
 func (c *iAMPolicyClient) TestIamPermissions(ctx context.Context, in *TestIamPermissionsRequest, opts ...grpc.CallOption) (*TestIamPermissionsResponse, error) {
 	out := new(TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.iam.v1.IAMPolicy/TestIamPermissions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.iam.v1.IAMPolicy/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for IAMPolicy service
-
+// IAMPolicyServer is the server API for IAMPolicy service.
 type IAMPolicyServer interface {
 	// Sets the access control policy on the specified resource. Replaces any
 	// existing policy.
@@ -305,9 +376,11 @@ var _IAMPolicy_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/iam/v1/iam_policy.proto",
 }
 
-func init() { proto.RegisterFile("google/iam/v1/iam_policy.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/iam/v1/iam_policy.proto", fileDescriptor_iam_policy_58547b5cf2e9d67a)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_iam_policy_58547b5cf2e9d67a = []byte{
 	// 411 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0xcf, 0x4c, 0xcc, 0xd5, 0x2f, 0x33, 0x04, 0x51, 0xf1, 0x05, 0xf9, 0x39, 0x99,
diff --git a/vendor/google.golang.org/genproto/googleapis/iam/v1/logging/audit_data.pb.go b/vendor/google.golang.org/genproto/googleapis/iam/v1/logging/audit_data.pb.go
index b22765a1..afa29fbb 100644
--- a/vendor/google.golang.org/genproto/googleapis/iam/v1/logging/audit_data.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/iam/v1/logging/audit_data.pb.go
@@ -1,22 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/logging/audit_data.proto
 
-/*
-Package logging is a generated protocol buffer package.
-
-It is generated from these files:
-	google/iam/v1/logging/audit_data.proto
-
-It has these top-level messages:
-	AuditData
-*/
-package logging
+package logging // import "google.golang.org/genproto/googleapis/iam/v1/logging"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -34,15 +25,37 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // `AuditLog` message.
 type AuditData struct {
 	// Policy delta between the original policy and the newly set policy.
-	PolicyDelta *google_iam_v1.PolicyDelta `protobuf:"bytes,2,opt,name=policy_delta,json=policyDelta" json:"policy_delta,omitempty"`
+	PolicyDelta          *v1.PolicyDelta `protobuf:"bytes,2,opt,name=policy_delta,json=policyDelta,proto3" json:"policy_delta,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *AuditData) Reset()                    { *m = AuditData{} }
-func (m *AuditData) String() string            { return proto.CompactTextString(m) }
-func (*AuditData) ProtoMessage()               {}
-func (*AuditData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *AuditData) Reset()         { *m = AuditData{} }
+func (m *AuditData) String() string { return proto.CompactTextString(m) }
+func (*AuditData) ProtoMessage()    {}
+func (*AuditData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_audit_data_2e30197e021fa53a, []int{0}
+}
+func (m *AuditData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AuditData.Unmarshal(m, b)
+}
+func (m *AuditData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AuditData.Marshal(b, m, deterministic)
+}
+func (dst *AuditData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AuditData.Merge(dst, src)
+}
+func (m *AuditData) XXX_Size() int {
+	return xxx_messageInfo_AuditData.Size(m)
+}
+func (m *AuditData) XXX_DiscardUnknown() {
+	xxx_messageInfo_AuditData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AuditData proto.InternalMessageInfo
 
-func (m *AuditData) GetPolicyDelta() *google_iam_v1.PolicyDelta {
+func (m *AuditData) GetPolicyDelta() *v1.PolicyDelta {
 	if m != nil {
 		return m.PolicyDelta
 	}
@@ -53,9 +66,11 @@ func init() {
 	proto.RegisterType((*AuditData)(nil), "google.iam.v1.logging.AuditData")
 }
 
-func init() { proto.RegisterFile("google/iam/v1/logging/audit_data.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/iam/v1/logging/audit_data.proto", fileDescriptor_audit_data_2e30197e021fa53a)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_audit_data_2e30197e021fa53a = []byte{
 	// 236 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4a, 0x04, 0x31,
 	0x10, 0x86, 0xd9, 0x2b, 0x04, 0x73, 0x62, 0x71, 0x20, 0x68, 0xb4, 0x10, 0x0b, 0xb1, 0x9a, 0xb0,
diff --git a/vendor/google.golang.org/genproto/googleapis/iam/v1/policy.pb.go b/vendor/google.golang.org/genproto/googleapis/iam/v1/policy.pb.go
index dde2c408..99dd75f2 100644
--- a/vendor/google.golang.org/genproto/googleapis/iam/v1/policy.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/iam/v1/policy.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/iam/v1/policy.proto
 
-package iam
+package iam // import "google.golang.org/genproto/googleapis/iam/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The type of action performed on a Binding in a policy.
 type BindingDelta_Action int32
 
@@ -39,7 +45,9 @@ var BindingDelta_Action_value = map[string]int32{
 func (x BindingDelta_Action) String() string {
 	return proto.EnumName(BindingDelta_Action_name, int32(x))
 }
-func (BindingDelta_Action) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{3, 0} }
+func (BindingDelta_Action) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_policy_6ba2a3dcbcdd909c, []int{3, 0}
+}
 
 // Defines an Identity and Access Management (IAM) policy. It is used to
 // specify access control policies for Cloud Platform resources.
@@ -74,11 +82,11 @@ func (BindingDelta_Action) EnumDescriptor() ([]byte, []int) { return fileDescrip
 // [IAM developer's guide](https://cloud.google.com/iam).
 type Policy struct {
 	// Version of the `Policy`. The default version is 0.
-	Version int32 `protobuf:"varint,1,opt,name=version" json:"version,omitempty"`
+	Version int32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
 	// Associates a list of `members` to a `role`.
 	// Multiple `bindings` must not be specified for the same `role`.
 	// `bindings` with no members will result in an error.
-	Bindings []*Binding `protobuf:"bytes,4,rep,name=bindings" json:"bindings,omitempty"`
+	Bindings []*Binding `protobuf:"bytes,4,rep,name=bindings,proto3" json:"bindings,omitempty"`
 	// `etag` is used for optimistic concurrency control as a way to help
 	// prevent simultaneous updates of a policy from overwriting each other.
 	// It is strongly suggested that systems make use of the `etag` in the
@@ -89,13 +97,35 @@ type Policy struct {
 	//
 	// If no `etag` is provided in the call to `setIamPolicy`, then the existing
 	// policy is overwritten blindly.
-	Etag []byte `protobuf:"bytes,3,opt,name=etag,proto3" json:"etag,omitempty"`
+	Etag                 []byte   `protobuf:"bytes,3,opt,name=etag,proto3" json:"etag,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Policy) Reset()                    { *m = Policy{} }
-func (m *Policy) String() string            { return proto.CompactTextString(m) }
-func (*Policy) ProtoMessage()               {}
-func (*Policy) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *Policy) Reset()         { *m = Policy{} }
+func (m *Policy) String() string { return proto.CompactTextString(m) }
+func (*Policy) ProtoMessage()    {}
+func (*Policy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_policy_6ba2a3dcbcdd909c, []int{0}
+}
+func (m *Policy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Policy.Unmarshal(m, b)
+}
+func (m *Policy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Policy.Marshal(b, m, deterministic)
+}
+func (dst *Policy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Policy.Merge(dst, src)
+}
+func (m *Policy) XXX_Size() int {
+	return xxx_messageInfo_Policy.Size(m)
+}
+func (m *Policy) XXX_DiscardUnknown() {
+	xxx_messageInfo_Policy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Policy proto.InternalMessageInfo
 
 func (m *Policy) GetVersion() int32 {
 	if m != nil {
@@ -123,7 +153,7 @@ type Binding struct {
 	// Role that is assigned to `members`.
 	// For example, `roles/viewer`, `roles/editor`, or `roles/owner`.
 	// Required
-	Role string `protobuf:"bytes,1,opt,name=role" json:"role,omitempty"`
+	Role string `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
 	// Specifies the identities requesting access for a Cloud Platform resource.
 	// `members` can have the following values:
 	//
@@ -147,13 +177,35 @@ type Binding struct {
 	//    users of that domain. For example, `google.com` or `example.com`.
 	//
 	//
-	Members []string `protobuf:"bytes,2,rep,name=members" json:"members,omitempty"`
+	Members              []string `protobuf:"bytes,2,rep,name=members,proto3" json:"members,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Binding) Reset()         { *m = Binding{} }
+func (m *Binding) String() string { return proto.CompactTextString(m) }
+func (*Binding) ProtoMessage()    {}
+func (*Binding) Descriptor() ([]byte, []int) {
+	return fileDescriptor_policy_6ba2a3dcbcdd909c, []int{1}
+}
+func (m *Binding) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Binding.Unmarshal(m, b)
+}
+func (m *Binding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Binding.Marshal(b, m, deterministic)
+}
+func (dst *Binding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Binding.Merge(dst, src)
+}
+func (m *Binding) XXX_Size() int {
+	return xxx_messageInfo_Binding.Size(m)
+}
+func (m *Binding) XXX_DiscardUnknown() {
+	xxx_messageInfo_Binding.DiscardUnknown(m)
 }
 
-func (m *Binding) Reset()                    { *m = Binding{} }
-func (m *Binding) String() string            { return proto.CompactTextString(m) }
-func (*Binding) ProtoMessage()               {}
-func (*Binding) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_Binding proto.InternalMessageInfo
 
 func (m *Binding) GetRole() string {
 	if m != nil {
@@ -172,13 +224,35 @@ func (m *Binding) GetMembers() []string {
 // The difference delta between two policies.
 type PolicyDelta struct {
 	// The delta for Bindings between two policies.
-	BindingDeltas []*BindingDelta `protobuf:"bytes,1,rep,name=binding_deltas,json=bindingDeltas" json:"binding_deltas,omitempty"`
+	BindingDeltas        []*BindingDelta `protobuf:"bytes,1,rep,name=binding_deltas,json=bindingDeltas,proto3" json:"binding_deltas,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *PolicyDelta) Reset()         { *m = PolicyDelta{} }
+func (m *PolicyDelta) String() string { return proto.CompactTextString(m) }
+func (*PolicyDelta) ProtoMessage()    {}
+func (*PolicyDelta) Descriptor() ([]byte, []int) {
+	return fileDescriptor_policy_6ba2a3dcbcdd909c, []int{2}
+}
+func (m *PolicyDelta) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PolicyDelta.Unmarshal(m, b)
+}
+func (m *PolicyDelta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PolicyDelta.Marshal(b, m, deterministic)
+}
+func (dst *PolicyDelta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PolicyDelta.Merge(dst, src)
+}
+func (m *PolicyDelta) XXX_Size() int {
+	return xxx_messageInfo_PolicyDelta.Size(m)
+}
+func (m *PolicyDelta) XXX_DiscardUnknown() {
+	xxx_messageInfo_PolicyDelta.DiscardUnknown(m)
 }
 
-func (m *PolicyDelta) Reset()                    { *m = PolicyDelta{} }
-func (m *PolicyDelta) String() string            { return proto.CompactTextString(m) }
-func (*PolicyDelta) ProtoMessage()               {}
-func (*PolicyDelta) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_PolicyDelta proto.InternalMessageInfo
 
 func (m *PolicyDelta) GetBindingDeltas() []*BindingDelta {
 	if m != nil {
@@ -192,21 +266,43 @@ func (m *PolicyDelta) GetBindingDeltas() []*BindingDelta {
 type BindingDelta struct {
 	// The action that was performed on a Binding.
 	// Required
-	Action BindingDelta_Action `protobuf:"varint,1,opt,name=action,enum=google.iam.v1.BindingDelta_Action" json:"action,omitempty"`
+	Action BindingDelta_Action `protobuf:"varint,1,opt,name=action,proto3,enum=google.iam.v1.BindingDelta_Action" json:"action,omitempty"`
 	// Role that is assigned to `members`.
 	// For example, `roles/viewer`, `roles/editor`, or `roles/owner`.
 	// Required
-	Role string `protobuf:"bytes,2,opt,name=role" json:"role,omitempty"`
+	Role string `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"`
 	// A single identity requesting access for a Cloud Platform resource.
 	// Follows the same format of Binding.members.
 	// Required
-	Member string `protobuf:"bytes,3,opt,name=member" json:"member,omitempty"`
+	Member               string   `protobuf:"bytes,3,opt,name=member,proto3" json:"member,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BindingDelta) Reset()         { *m = BindingDelta{} }
+func (m *BindingDelta) String() string { return proto.CompactTextString(m) }
+func (*BindingDelta) ProtoMessage()    {}
+func (*BindingDelta) Descriptor() ([]byte, []int) {
+	return fileDescriptor_policy_6ba2a3dcbcdd909c, []int{3}
+}
+func (m *BindingDelta) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BindingDelta.Unmarshal(m, b)
+}
+func (m *BindingDelta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BindingDelta.Marshal(b, m, deterministic)
+}
+func (dst *BindingDelta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BindingDelta.Merge(dst, src)
+}
+func (m *BindingDelta) XXX_Size() int {
+	return xxx_messageInfo_BindingDelta.Size(m)
+}
+func (m *BindingDelta) XXX_DiscardUnknown() {
+	xxx_messageInfo_BindingDelta.DiscardUnknown(m)
 }
 
-func (m *BindingDelta) Reset()                    { *m = BindingDelta{} }
-func (m *BindingDelta) String() string            { return proto.CompactTextString(m) }
-func (*BindingDelta) ProtoMessage()               {}
-func (*BindingDelta) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_BindingDelta proto.InternalMessageInfo
 
 func (m *BindingDelta) GetAction() BindingDelta_Action {
 	if m != nil {
@@ -237,9 +333,9 @@ func init() {
 	proto.RegisterEnum("google.iam.v1.BindingDelta_Action", BindingDelta_Action_name, BindingDelta_Action_value)
 }
 
-func init() { proto.RegisterFile("google/iam/v1/policy.proto", fileDescriptor1) }
+func init() { proto.RegisterFile("google/iam/v1/policy.proto", fileDescriptor_policy_6ba2a3dcbcdd909c) }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_policy_6ba2a3dcbcdd909c = []byte{
 	// 403 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x4d, 0xab, 0x13, 0x31,
 	0x14, 0x35, 0xed, 0x73, 0x6a, 0xef, 0xfb, 0xa0, 0x46, 0x28, 0xc3, 0xd3, 0x45, 0x99, 0x55, 0x57,
diff --git a/vendor/google.golang.org/genproto/googleapis/logging/type/http_request.pb.go b/vendor/google.golang.org/genproto/googleapis/logging/type/http_request.pb.go
index ad4f289f..1ee91aea 100644
--- a/vendor/google.golang.org/genproto/googleapis/logging/type/http_request.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/logging/type/http_request.pb.go
@@ -1,23 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/type/http_request.proto
 
-/*
-Package ltype is a generated protocol buffer package.
-
-It is generated from these files:
-	google/logging/type/http_request.proto
-	google/logging/type/log_severity.proto
-
-It has these top-level messages:
-	HttpRequest
-*/
-package ltype
+package ltype // import "google.golang.org/genproto/googleapis/logging/type"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -35,55 +25,77 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // information MUST be defined in a separate message.
 type HttpRequest struct {
 	// The request method. Examples: `"GET"`, `"HEAD"`, `"PUT"`, `"POST"`.
-	RequestMethod string `protobuf:"bytes,1,opt,name=request_method,json=requestMethod" json:"request_method,omitempty"`
+	RequestMethod string `protobuf:"bytes,1,opt,name=request_method,json=requestMethod,proto3" json:"request_method,omitempty"`
 	// The scheme (http, https), the host name, the path and the query
 	// portion of the URL that was requested.
 	// Example: `"http://example.com/some/info?color=red"`.
-	RequestUrl string `protobuf:"bytes,2,opt,name=request_url,json=requestUrl" json:"request_url,omitempty"`
+	RequestUrl string `protobuf:"bytes,2,opt,name=request_url,json=requestUrl,proto3" json:"request_url,omitempty"`
 	// The size of the HTTP request message in bytes, including the request
 	// headers and the request body.
-	RequestSize int64 `protobuf:"varint,3,opt,name=request_size,json=requestSize" json:"request_size,omitempty"`
+	RequestSize int64 `protobuf:"varint,3,opt,name=request_size,json=requestSize,proto3" json:"request_size,omitempty"`
 	// The response code indicating the status of response.
 	// Examples: 200, 404.
-	Status int32 `protobuf:"varint,4,opt,name=status" json:"status,omitempty"`
+	Status int32 `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
 	// The size of the HTTP response message sent back to the client, in bytes,
 	// including the response headers and the response body.
-	ResponseSize int64 `protobuf:"varint,5,opt,name=response_size,json=responseSize" json:"response_size,omitempty"`
+	ResponseSize int64 `protobuf:"varint,5,opt,name=response_size,json=responseSize,proto3" json:"response_size,omitempty"`
 	// The user agent sent by the client. Example:
 	// `"Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; Q312461; .NET CLR 1.0.3705)"`.
-	UserAgent string `protobuf:"bytes,6,opt,name=user_agent,json=userAgent" json:"user_agent,omitempty"`
+	UserAgent string `protobuf:"bytes,6,opt,name=user_agent,json=userAgent,proto3" json:"user_agent,omitempty"`
 	// The IP address (IPv4 or IPv6) of the client that issued the HTTP
 	// request. Examples: `"192.168.1.1"`, `"FE80::0202:B3FF:FE1E:8329"`.
-	RemoteIp string `protobuf:"bytes,7,opt,name=remote_ip,json=remoteIp" json:"remote_ip,omitempty"`
+	RemoteIp string `protobuf:"bytes,7,opt,name=remote_ip,json=remoteIp,proto3" json:"remote_ip,omitempty"`
 	// The IP address (IPv4 or IPv6) of the origin server that the request was
 	// sent to.
-	ServerIp string `protobuf:"bytes,13,opt,name=server_ip,json=serverIp" json:"server_ip,omitempty"`
+	ServerIp string `protobuf:"bytes,13,opt,name=server_ip,json=serverIp,proto3" json:"server_ip,omitempty"`
 	// The referer URL of the request, as defined in
 	// [HTTP/1.1 Header Field Definitions](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html).
-	Referer string `protobuf:"bytes,8,opt,name=referer" json:"referer,omitempty"`
+	Referer string `protobuf:"bytes,8,opt,name=referer,proto3" json:"referer,omitempty"`
 	// The request processing latency on the server, from the time the request was
 	// received until the response was sent.
-	Latency *google_protobuf1.Duration `protobuf:"bytes,14,opt,name=latency" json:"latency,omitempty"`
+	Latency *duration.Duration `protobuf:"bytes,14,opt,name=latency,proto3" json:"latency,omitempty"`
 	// Whether or not a cache lookup was attempted.
-	CacheLookup bool `protobuf:"varint,11,opt,name=cache_lookup,json=cacheLookup" json:"cache_lookup,omitempty"`
+	CacheLookup bool `protobuf:"varint,11,opt,name=cache_lookup,json=cacheLookup,proto3" json:"cache_lookup,omitempty"`
 	// Whether or not an entity was served from cache
 	// (with or without validation).
-	CacheHit bool `protobuf:"varint,9,opt,name=cache_hit,json=cacheHit" json:"cache_hit,omitempty"`
+	CacheHit bool `protobuf:"varint,9,opt,name=cache_hit,json=cacheHit,proto3" json:"cache_hit,omitempty"`
 	// Whether or not the response was validated with the origin server before
 	// being served from cache. This field is only meaningful if `cache_hit` is
 	// True.
-	CacheValidatedWithOriginServer bool `protobuf:"varint,10,opt,name=cache_validated_with_origin_server,json=cacheValidatedWithOriginServer" json:"cache_validated_with_origin_server,omitempty"`
+	CacheValidatedWithOriginServer bool `protobuf:"varint,10,opt,name=cache_validated_with_origin_server,json=cacheValidatedWithOriginServer,proto3" json:"cache_validated_with_origin_server,omitempty"`
 	// The number of HTTP response bytes inserted into cache. Set only when a
 	// cache fill was attempted.
-	CacheFillBytes int64 `protobuf:"varint,12,opt,name=cache_fill_bytes,json=cacheFillBytes" json:"cache_fill_bytes,omitempty"`
+	CacheFillBytes int64 `protobuf:"varint,12,opt,name=cache_fill_bytes,json=cacheFillBytes,proto3" json:"cache_fill_bytes,omitempty"`
 	// Protocol used for the request. Examples: "HTTP/1.1", "HTTP/2", "websocket"
-	Protocol string `protobuf:"bytes,15,opt,name=protocol" json:"protocol,omitempty"`
+	Protocol             string   `protobuf:"bytes,15,opt,name=protocol,proto3" json:"protocol,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *HttpRequest) Reset()                    { *m = HttpRequest{} }
-func (m *HttpRequest) String() string            { return proto.CompactTextString(m) }
-func (*HttpRequest) ProtoMessage()               {}
-func (*HttpRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *HttpRequest) Reset()         { *m = HttpRequest{} }
+func (m *HttpRequest) String() string { return proto.CompactTextString(m) }
+func (*HttpRequest) ProtoMessage()    {}
+func (*HttpRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_http_request_33a66c45032c6856, []int{0}
+}
+func (m *HttpRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpRequest.Unmarshal(m, b)
+}
+func (m *HttpRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpRequest.Marshal(b, m, deterministic)
+}
+func (dst *HttpRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpRequest.Merge(dst, src)
+}
+func (m *HttpRequest) XXX_Size() int {
+	return xxx_messageInfo_HttpRequest.Size(m)
+}
+func (m *HttpRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HttpRequest proto.InternalMessageInfo
 
 func (m *HttpRequest) GetRequestMethod() string {
 	if m != nil {
@@ -148,7 +160,7 @@ func (m *HttpRequest) GetReferer() string {
 	return ""
 }
 
-func (m *HttpRequest) GetLatency() *google_protobuf1.Duration {
+func (m *HttpRequest) GetLatency() *duration.Duration {
 	if m != nil {
 		return m.Latency
 	}
@@ -194,9 +206,11 @@ func init() {
 	proto.RegisterType((*HttpRequest)(nil), "google.logging.type.HttpRequest")
 }
 
-func init() { proto.RegisterFile("google/logging/type/http_request.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/logging/type/http_request.proto", fileDescriptor_http_request_33a66c45032c6856)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_http_request_33a66c45032c6856 = []byte{
 	// 511 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x5b, 0x6b, 0x14, 0x31,
 	0x18, 0x86, 0x99, 0x1e, 0xf6, 0x90, 0x3d, 0x58, 0x22, 0x68, 0xba, 0x6a, 0x5d, 0x2b, 0xca, 0x5c,
diff --git a/vendor/google.golang.org/genproto/googleapis/logging/type/log_severity.pb.go b/vendor/google.golang.org/genproto/googleapis/logging/type/log_severity.pb.go
index f489a279..a28f5dbb 100644
--- a/vendor/google.golang.org/genproto/googleapis/logging/type/log_severity.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/logging/type/log_severity.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/type/log_severity.proto
 
-package ltype
+package ltype // import "google.golang.org/genproto/googleapis/logging/type"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The severity of the event described in a log entry, expressed as one of the
 // standard severity levels listed below.  For your reference, the levels are
 // assigned the listed numeric values. The effect of using numeric values other
@@ -78,15 +84,19 @@ var LogSeverity_value = map[string]int32{
 func (x LogSeverity) String() string {
 	return proto.EnumName(LogSeverity_name, int32(x))
 }
-func (LogSeverity) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (LogSeverity) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_log_severity_690c3c95c38315a0, []int{0}
+}
 
 func init() {
 	proto.RegisterEnum("google.logging.type.LogSeverity", LogSeverity_name, LogSeverity_value)
 }
 
-func init() { proto.RegisterFile("google/logging/type/log_severity.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/logging/type/log_severity.proto", fileDescriptor_log_severity_690c3c95c38315a0)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_log_severity_690c3c95c38315a0 = []byte{
 	// 309 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0xcf, 0xc9, 0x4f, 0x4f, 0xcf, 0xcc, 0x4b, 0xd7, 0x2f, 0xa9, 0x2c, 0x00, 0x73,
diff --git a/vendor/google.golang.org/genproto/googleapis/logging/v2/log_entry.pb.go b/vendor/google.golang.org/genproto/googleapis/logging/v2/log_entry.pb.go
index 002a8378..3428e5ab 100644
--- a/vendor/google.golang.org/genproto/googleapis/logging/v2/log_entry.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/logging/v2/log_entry.pb.go
@@ -1,63 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/log_entry.proto
 
-/*
-Package logging is a generated protocol buffer package.
-
-It is generated from these files:
-	google/logging/v2/log_entry.proto
-	google/logging/v2/logging.proto
-	google/logging/v2/logging_config.proto
-	google/logging/v2/logging_metrics.proto
-
-It has these top-level messages:
-	LogEntry
-	LogEntryOperation
-	LogEntrySourceLocation
-	DeleteLogRequest
-	WriteLogEntriesRequest
-	WriteLogEntriesResponse
-	WriteLogEntriesPartialErrors
-	ListLogEntriesRequest
-	ListLogEntriesResponse
-	ListMonitoredResourceDescriptorsRequest
-	ListMonitoredResourceDescriptorsResponse
-	ListLogsRequest
-	ListLogsResponse
-	LogSink
-	ListSinksRequest
-	ListSinksResponse
-	GetSinkRequest
-	CreateSinkRequest
-	UpdateSinkRequest
-	DeleteSinkRequest
-	LogExclusion
-	ListExclusionsRequest
-	ListExclusionsResponse
-	GetExclusionRequest
-	CreateExclusionRequest
-	UpdateExclusionRequest
-	DeleteExclusionRequest
-	LogMetric
-	ListLogMetricsRequest
-	ListLogMetricsResponse
-	GetLogMetricRequest
-	CreateLogMetricRequest
-	UpdateLogMetricRequest
-	DeleteLogMetricRequest
-*/
-package logging
+package logging // import "google.golang.org/genproto/googleapis/logging/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api3 "google.golang.org/genproto/googleapis/api/monitoredres"
-import google_logging_type "google.golang.org/genproto/googleapis/logging/type"
-import google_logging_type1 "google.golang.org/genproto/googleapis/logging/type"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
+import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+import _type "google.golang.org/genproto/googleapis/logging/type"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -94,12 +48,12 @@ type LogEntry struct {
 	// forward-slash is removed. Listing the log entry will not show the leading
 	// slash and filtering for a log name with a leading slash will never return
 	// any results.
-	LogName string `protobuf:"bytes,12,opt,name=log_name,json=logName" json:"log_name,omitempty"`
-	// Required. The monitored resource associated with this log entry.
+	LogName string `protobuf:"bytes,12,opt,name=log_name,json=logName,proto3" json:"log_name,omitempty"`
+	// Required. The primary monitored resource associated with this log entry.
 	// Example: a log entry that reports a database error would be
 	// associated with the monitored resource designating the particular
 	// database that reported the error.
-	Resource *google_api3.MonitoredResource `protobuf:"bytes,8,opt,name=resource" json:"resource,omitempty"`
+	Resource *monitoredres.MonitoredResource `protobuf:"bytes,8,opt,name=resource,proto3" json:"resource,omitempty"`
 	// Optional. The log entry payload, which can be one of multiple types.
 	//
 	// Types that are valid to be assigned to Payload:
@@ -111,94 +65,127 @@ type LogEntry struct {
 	// This time is used to compute the log entry's age and to enforce
 	// the logs retention period. If this field is omitted in a new log
 	// entry, then Stackdriver Logging assigns it the current time.
+	// Timestamps have nanosecond accuracy, but trailing zeros in the fractional
+	// seconds might be omitted when the timestamp is displayed.
 	//
 	// Incoming log entries should have timestamps that are no more than
-	// the [logs retention period](/logging/quota-policy) in the past,
-	// and no more than 24 hours in the future.
-	// See the `entries.write` API method for more information.
-	Timestamp *google_protobuf4.Timestamp `protobuf:"bytes,9,opt,name=timestamp" json:"timestamp,omitempty"`
+	// the [logs retention period](/logging/quotas) in the past,
+	// and no more than 24 hours in the future. Log entries outside those time
+	// boundaries will not be available when calling `entries.list`, but
+	// those log entries can still be exported with
+	// [LogSinks](/logging/docs/api/tasks/exporting-logs).
+	Timestamp *timestamp.Timestamp `protobuf:"bytes,9,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	// Output only. The time the log entry was received by Stackdriver Logging.
-	ReceiveTimestamp *google_protobuf4.Timestamp `protobuf:"bytes,24,opt,name=receive_timestamp,json=receiveTimestamp" json:"receive_timestamp,omitempty"`
+	ReceiveTimestamp *timestamp.Timestamp `protobuf:"bytes,24,opt,name=receive_timestamp,json=receiveTimestamp,proto3" json:"receive_timestamp,omitempty"`
 	// Optional. The severity of the log entry. The default value is
 	// `LogSeverity.DEFAULT`.
-	Severity google_logging_type1.LogSeverity `protobuf:"varint,10,opt,name=severity,enum=google.logging.type.LogSeverity" json:"severity,omitempty"`
+	Severity _type.LogSeverity `protobuf:"varint,10,opt,name=severity,proto3,enum=google.logging.type.LogSeverity" json:"severity,omitempty"`
 	// Optional. A unique identifier for the log entry. If you provide a value,
 	// then Stackdriver Logging considers other log entries in the same project,
 	// with the same `timestamp`, and with the same `insert_id` to be duplicates
 	// which can be removed.  If omitted in new log entries, then Stackdriver
 	// Logging assigns its own unique identifier. The `insert_id` is also used
 	// to order log entries that have the same `timestamp` value.
-	InsertId string `protobuf:"bytes,4,opt,name=insert_id,json=insertId" json:"insert_id,omitempty"`
+	InsertId string `protobuf:"bytes,4,opt,name=insert_id,json=insertId,proto3" json:"insert_id,omitempty"`
 	// Optional. Information about the HTTP request associated with this
 	// log entry, if applicable.
-	HttpRequest *google_logging_type.HttpRequest `protobuf:"bytes,7,opt,name=http_request,json=httpRequest" json:"http_request,omitempty"`
+	HttpRequest *_type.HttpRequest `protobuf:"bytes,7,opt,name=http_request,json=httpRequest,proto3" json:"http_request,omitempty"`
 	// Optional. A set of user-defined (key, value) data that provides additional
 	// information about the log entry.
-	Labels map[string]string `protobuf:"bytes,11,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,11,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Output only. Additional metadata about the monitored resource.
+	// Only `k8s_container`, `k8s_pod`, and `k8s_node` MonitoredResources have
+	// this field populated.
+	Metadata *monitoredres.MonitoredResourceMetadata `protobuf:"bytes,25,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// Optional. Information about an operation associated with the log entry, if
 	// applicable.
-	Operation *LogEntryOperation `protobuf:"bytes,15,opt,name=operation" json:"operation,omitempty"`
+	Operation *LogEntryOperation `protobuf:"bytes,15,opt,name=operation,proto3" json:"operation,omitempty"`
 	// Optional. Resource name of the trace associated with the log entry, if any.
 	// If it contains a relative resource name, the name is assumed to be relative
 	// to `//tracing.googleapis.com`. Example:
 	// `projects/my-projectid/traces/06796866738c859f2f19b7cfb3214824`
-	Trace string `protobuf:"bytes,22,opt,name=trace" json:"trace,omitempty"`
-	// Optional. Id of the span within the trace associated with the log entry.
-	// e.g. "0000000000000042"
-	// For Stackdriver trace spans, this is the same format that the Stackdriver
-	// trace API uses.
-	// The ID is a 16-character hexadecimal encoding of an 8-byte array.
-	SpanId string `protobuf:"bytes,27,opt,name=span_id,json=spanId" json:"span_id,omitempty"`
+	Trace string `protobuf:"bytes,22,opt,name=trace,proto3" json:"trace,omitempty"`
+	// Optional. The span ID within the trace associated with the log entry. For
+	// Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+	// API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
+	// as <code>"000000000000004a"</code>.
+	SpanId string `protobuf:"bytes,27,opt,name=span_id,json=spanId,proto3" json:"span_id,omitempty"`
 	// Optional. Source code location information associated with the log entry,
 	// if any.
-	SourceLocation *LogEntrySourceLocation `protobuf:"bytes,23,opt,name=source_location,json=sourceLocation" json:"source_location,omitempty"`
+	SourceLocation       *LogEntrySourceLocation `protobuf:"bytes,23,opt,name=source_location,json=sourceLocation,proto3" json:"source_location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
 }
 
-func (m *LogEntry) Reset()                    { *m = LogEntry{} }
-func (m *LogEntry) String() string            { return proto.CompactTextString(m) }
-func (*LogEntry) ProtoMessage()               {}
-func (*LogEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *LogEntry) Reset()         { *m = LogEntry{} }
+func (m *LogEntry) String() string { return proto.CompactTextString(m) }
+func (*LogEntry) ProtoMessage()    {}
+func (*LogEntry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_log_entry_72fcc25aa7b2cfea, []int{0}
+}
+func (m *LogEntry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogEntry.Unmarshal(m, b)
+}
+func (m *LogEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogEntry.Marshal(b, m, deterministic)
+}
+func (dst *LogEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogEntry.Merge(dst, src)
+}
+func (m *LogEntry) XXX_Size() int {
+	return xxx_messageInfo_LogEntry.Size(m)
+}
+func (m *LogEntry) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogEntry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LogEntry proto.InternalMessageInfo
+
+func (m *LogEntry) GetLogName() string {
+	if m != nil {
+		return m.LogName
+	}
+	return ""
+}
+
+func (m *LogEntry) GetResource() *monitoredres.MonitoredResource {
+	if m != nil {
+		return m.Resource
+	}
+	return nil
+}
 
 type isLogEntry_Payload interface {
 	isLogEntry_Payload()
 }
 
 type LogEntry_ProtoPayload struct {
-	ProtoPayload *google_protobuf2.Any `protobuf:"bytes,2,opt,name=proto_payload,json=protoPayload,oneof"`
+	ProtoPayload *any.Any `protobuf:"bytes,2,opt,name=proto_payload,json=protoPayload,proto3,oneof"`
 }
+
 type LogEntry_TextPayload struct {
-	TextPayload string `protobuf:"bytes,3,opt,name=text_payload,json=textPayload,oneof"`
+	TextPayload string `protobuf:"bytes,3,opt,name=text_payload,json=textPayload,proto3,oneof"`
 }
+
 type LogEntry_JsonPayload struct {
-	JsonPayload *google_protobuf3.Struct `protobuf:"bytes,6,opt,name=json_payload,json=jsonPayload,oneof"`
+	JsonPayload *_struct.Struct `protobuf:"bytes,6,opt,name=json_payload,json=jsonPayload,proto3,oneof"`
 }
 
 func (*LogEntry_ProtoPayload) isLogEntry_Payload() {}
-func (*LogEntry_TextPayload) isLogEntry_Payload()  {}
-func (*LogEntry_JsonPayload) isLogEntry_Payload()  {}
 
-func (m *LogEntry) GetPayload() isLogEntry_Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
+func (*LogEntry_TextPayload) isLogEntry_Payload() {}
 
-func (m *LogEntry) GetLogName() string {
-	if m != nil {
-		return m.LogName
-	}
-	return ""
-}
+func (*LogEntry_JsonPayload) isLogEntry_Payload() {}
 
-func (m *LogEntry) GetResource() *google_api3.MonitoredResource {
+func (m *LogEntry) GetPayload() isLogEntry_Payload {
 	if m != nil {
-		return m.Resource
+		return m.Payload
 	}
 	return nil
 }
 
-func (m *LogEntry) GetProtoPayload() *google_protobuf2.Any {
+func (m *LogEntry) GetProtoPayload() *any.Any {
 	if x, ok := m.GetPayload().(*LogEntry_ProtoPayload); ok {
 		return x.ProtoPayload
 	}
@@ -212,32 +199,32 @@ func (m *LogEntry) GetTextPayload() string {
 	return ""
 }
 
-func (m *LogEntry) GetJsonPayload() *google_protobuf3.Struct {
+func (m *LogEntry) GetJsonPayload() *_struct.Struct {
 	if x, ok := m.GetPayload().(*LogEntry_JsonPayload); ok {
 		return x.JsonPayload
 	}
 	return nil
 }
 
-func (m *LogEntry) GetTimestamp() *google_protobuf4.Timestamp {
+func (m *LogEntry) GetTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.Timestamp
 	}
 	return nil
 }
 
-func (m *LogEntry) GetReceiveTimestamp() *google_protobuf4.Timestamp {
+func (m *LogEntry) GetReceiveTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.ReceiveTimestamp
 	}
 	return nil
 }
 
-func (m *LogEntry) GetSeverity() google_logging_type1.LogSeverity {
+func (m *LogEntry) GetSeverity() _type.LogSeverity {
 	if m != nil {
 		return m.Severity
 	}
-	return google_logging_type1.LogSeverity_DEFAULT
+	return _type.LogSeverity_DEFAULT
 }
 
 func (m *LogEntry) GetInsertId() string {
@@ -247,7 +234,7 @@ func (m *LogEntry) GetInsertId() string {
 	return ""
 }
 
-func (m *LogEntry) GetHttpRequest() *google_logging_type.HttpRequest {
+func (m *LogEntry) GetHttpRequest() *_type.HttpRequest {
 	if m != nil {
 		return m.HttpRequest
 	}
@@ -261,6 +248,13 @@ func (m *LogEntry) GetLabels() map[string]string {
 	return nil
 }
 
+func (m *LogEntry) GetMetadata() *monitoredres.MonitoredResourceMetadata {
+	if m != nil {
+		return m.Metadata
+	}
+	return nil
+}
+
 func (m *LogEntry) GetOperation() *LogEntryOperation {
 	if m != nil {
 		return m.Operation
@@ -329,7 +323,7 @@ func _LogEntry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf2.Any)
+		msg := new(any.Any)
 		err := b.DecodeMessage(msg)
 		m.Payload = &LogEntry_ProtoPayload{msg}
 		return true, err
@@ -344,7 +338,7 @@ func _LogEntry_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf3.Struct)
+		msg := new(_struct.Struct)
 		err := b.DecodeMessage(msg)
 		m.Payload = &LogEntry_JsonPayload{msg}
 		return true, err
@@ -359,16 +353,16 @@ func _LogEntry_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Payload.(type) {
 	case *LogEntry_ProtoPayload:
 		s := proto.Size(x.ProtoPayload)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *LogEntry_TextPayload:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.TextPayload)))
 		n += len(x.TextPayload)
 	case *LogEntry_JsonPayload:
 		s := proto.Size(x.JsonPayload)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -383,21 +377,43 @@ func _LogEntry_OneofSizer(msg proto.Message) (n int) {
 type LogEntryOperation struct {
 	// Optional. An arbitrary operation identifier. Log entries with the
 	// same identifier are assumed to be part of the same operation.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// Optional. An arbitrary producer identifier. The combination of
 	// `id` and `producer` must be globally unique.  Examples for `producer`:
 	// `"MyDivision.MyBigCompany.com"`, `"github.com/MyProject/MyApplication"`.
-	Producer string `protobuf:"bytes,2,opt,name=producer" json:"producer,omitempty"`
+	Producer string `protobuf:"bytes,2,opt,name=producer,proto3" json:"producer,omitempty"`
 	// Optional. Set this to True if this is the first log entry in the operation.
-	First bool `protobuf:"varint,3,opt,name=first" json:"first,omitempty"`
+	First bool `protobuf:"varint,3,opt,name=first,proto3" json:"first,omitempty"`
 	// Optional. Set this to True if this is the last log entry in the operation.
-	Last bool `protobuf:"varint,4,opt,name=last" json:"last,omitempty"`
+	Last                 bool     `protobuf:"varint,4,opt,name=last,proto3" json:"last,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LogEntryOperation) Reset()         { *m = LogEntryOperation{} }
+func (m *LogEntryOperation) String() string { return proto.CompactTextString(m) }
+func (*LogEntryOperation) ProtoMessage()    {}
+func (*LogEntryOperation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_log_entry_72fcc25aa7b2cfea, []int{1}
+}
+func (m *LogEntryOperation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogEntryOperation.Unmarshal(m, b)
+}
+func (m *LogEntryOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogEntryOperation.Marshal(b, m, deterministic)
+}
+func (dst *LogEntryOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogEntryOperation.Merge(dst, src)
+}
+func (m *LogEntryOperation) XXX_Size() int {
+	return xxx_messageInfo_LogEntryOperation.Size(m)
+}
+func (m *LogEntryOperation) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogEntryOperation.DiscardUnknown(m)
 }
 
-func (m *LogEntryOperation) Reset()                    { *m = LogEntryOperation{} }
-func (m *LogEntryOperation) String() string            { return proto.CompactTextString(m) }
-func (*LogEntryOperation) ProtoMessage()               {}
-func (*LogEntryOperation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_LogEntryOperation proto.InternalMessageInfo
 
 func (m *LogEntryOperation) GetId() string {
 	if m != nil {
@@ -432,23 +448,45 @@ func (m *LogEntryOperation) GetLast() bool {
 type LogEntrySourceLocation struct {
 	// Optional. Source file name. Depending on the runtime environment, this
 	// might be a simple name or a fully-qualified name.
-	File string `protobuf:"bytes,1,opt,name=file" json:"file,omitempty"`
+	File string `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"`
 	// Optional. Line within the source file. 1-based; 0 indicates no line number
 	// available.
-	Line int64 `protobuf:"varint,2,opt,name=line" json:"line,omitempty"`
+	Line int64 `protobuf:"varint,2,opt,name=line,proto3" json:"line,omitempty"`
 	// Optional. Human-readable name of the function or method being invoked, with
 	// optional context such as the class or package name. This information may be
 	// used in contexts such as the logs viewer, where a file and line number are
 	// less meaningful. The format can vary by language. For example:
 	// `qual.if.ied.Class.method` (Java), `dir/package.func` (Go), `function`
 	// (Python).
-	Function string `protobuf:"bytes,3,opt,name=function" json:"function,omitempty"`
+	Function             string   `protobuf:"bytes,3,opt,name=function,proto3" json:"function,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LogEntrySourceLocation) Reset()         { *m = LogEntrySourceLocation{} }
+func (m *LogEntrySourceLocation) String() string { return proto.CompactTextString(m) }
+func (*LogEntrySourceLocation) ProtoMessage()    {}
+func (*LogEntrySourceLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_log_entry_72fcc25aa7b2cfea, []int{2}
+}
+func (m *LogEntrySourceLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogEntrySourceLocation.Unmarshal(m, b)
+}
+func (m *LogEntrySourceLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogEntrySourceLocation.Marshal(b, m, deterministic)
+}
+func (dst *LogEntrySourceLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogEntrySourceLocation.Merge(dst, src)
+}
+func (m *LogEntrySourceLocation) XXX_Size() int {
+	return xxx_messageInfo_LogEntrySourceLocation.Size(m)
+}
+func (m *LogEntrySourceLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogEntrySourceLocation.DiscardUnknown(m)
 }
 
-func (m *LogEntrySourceLocation) Reset()                    { *m = LogEntrySourceLocation{} }
-func (m *LogEntrySourceLocation) String() string            { return proto.CompactTextString(m) }
-func (*LogEntrySourceLocation) ProtoMessage()               {}
-func (*LogEntrySourceLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_LogEntrySourceLocation proto.InternalMessageInfo
 
 func (m *LogEntrySourceLocation) GetFile() string {
 	if m != nil {
@@ -473,58 +511,62 @@ func (m *LogEntrySourceLocation) GetFunction() string {
 
 func init() {
 	proto.RegisterType((*LogEntry)(nil), "google.logging.v2.LogEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.logging.v2.LogEntry.LabelsEntry")
 	proto.RegisterType((*LogEntryOperation)(nil), "google.logging.v2.LogEntryOperation")
 	proto.RegisterType((*LogEntrySourceLocation)(nil), "google.logging.v2.LogEntrySourceLocation")
 }
 
-func init() { proto.RegisterFile("google/logging/v2/log_entry.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 729 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcd, 0x6e, 0xdb, 0x46,
-	0x10, 0x36, 0x25, 0x57, 0xa2, 0x56, 0xf2, 0xdf, 0xc2, 0xb5, 0x68, 0xd9, 0x45, 0x55, 0xbb, 0x68,
-	0xd5, 0x0b, 0x05, 0xa8, 0x17, 0xbb, 0x36, 0x50, 0x54, 0x46, 0x61, 0x1b, 0x50, 0x5b, 0x63, 0x5d,
-	0xf8, 0x10, 0x08, 0x10, 0xd6, 0xe4, 0x8a, 0xde, 0x84, 0xda, 0x65, 0x96, 0x4b, 0x21, 0x7a, 0x94,
-	0xbc, 0x42, 0x1e, 0x25, 0x6f, 0x93, 0x5b, 0x8e, 0xc1, 0x0e, 0x97, 0x92, 0x22, 0x19, 0xce, 0x6d,
-	0x66, 0xe7, 0xfb, 0xe6, 0x9b, 0x19, 0xce, 0x10, 0xfd, 0x14, 0x49, 0x19, 0xc5, 0xac, 0x1b, 0xcb,
-	0x28, 0xe2, 0x22, 0xea, 0x4e, 0x7b, 0xc6, 0x1c, 0x31, 0xa1, 0xd5, 0xcc, 0x4f, 0x94, 0xd4, 0x12,
-	0xef, 0xe5, 0x10, 0xdf, 0x42, 0xfc, 0x69, 0xaf, 0x75, 0x6c, 0x59, 0x34, 0xe1, 0x5d, 0x2a, 0x84,
-	0xd4, 0x54, 0x73, 0x29, 0xd2, 0x9c, 0xd0, 0x3a, 0x5d, 0x8a, 0x4e, 0xa4, 0xe0, 0x5a, 0x2a, 0x16,
-	0x8e, 0x14, 0x4b, 0x65, 0xa6, 0x02, 0x66, 0x41, 0xbf, 0xac, 0x08, 0xeb, 0x59, 0xc2, 0xba, 0x4f,
-	0x5a, 0x27, 0x23, 0xc5, 0xde, 0x66, 0x2c, 0xd5, 0x2f, 0xe1, 0x4c, 0x89, 0x29, 0x9b, 0x32, 0xc5,
-	0xb5, 0xad, 0xb2, 0x75, 0x68, 0x71, 0xe0, 0x3d, 0x66, 0xe3, 0x2e, 0x15, 0x45, 0xe8, 0x78, 0x35,
-	0x94, 0x6a, 0x95, 0x05, 0x85, 0xc0, 0x8f, 0xab, 0x51, 0xcd, 0x27, 0x2c, 0xd5, 0x74, 0x92, 0xe4,
-	0x80, 0x93, 0x4f, 0x15, 0xe4, 0x0e, 0x64, 0xf4, 0xb7, 0x19, 0x09, 0x3e, 0x44, 0xae, 0x11, 0x17,
-	0x74, 0xc2, 0xbc, 0x46, 0xdb, 0xe9, 0xd4, 0x48, 0x35, 0x96, 0xd1, 0xbf, 0x74, 0xc2, 0xf0, 0x39,
-	0x72, 0x8b, 0x1e, 0x3d, 0xb7, 0xed, 0x74, 0xea, 0xbd, 0x1f, 0x7c, 0x3b, 0x3a, 0x9a, 0x70, 0xff,
-	0x9f, 0x62, 0x12, 0xc4, 0x82, 0xc8, 0x1c, 0x8e, 0x2f, 0xd0, 0x16, 0x68, 0x8d, 0x12, 0x3a, 0x8b,
-	0x25, 0x0d, 0xbd, 0x12, 0xf0, 0xf7, 0x0b, 0x7e, 0x51, 0x9b, 0xff, 0x97, 0x98, 0xdd, 0x6c, 0x90,
-	0x06, 0xf8, 0x77, 0x39, 0x16, 0x9f, 0xa2, 0x86, 0x66, 0xef, 0xf4, 0x9c, 0x5b, 0x36, 0x65, 0xdd,
-	0x6c, 0x90, 0xba, 0x79, 0x2d, 0x40, 0x97, 0xa8, 0xf1, 0x3a, 0x95, 0x62, 0x0e, 0xaa, 0x80, 0x40,
-	0x73, 0x4d, 0xe0, 0x1e, 0x46, 0x63, 0xd8, 0x06, 0x5e, 0xb0, 0xcf, 0x50, 0x6d, 0x3e, 0x15, 0xaf,
-	0x06, 0xd4, 0xd6, 0x1a, 0xf5, 0xff, 0x02, 0x41, 0x16, 0x60, 0x7c, 0x8d, 0xf6, 0x14, 0x0b, 0x18,
-	0x9f, 0xb2, 0xd1, 0x22, 0x83, 0xf7, 0xcd, 0x0c, 0xbb, 0x96, 0x34, 0x7f, 0xc1, 0x97, 0xc8, 0x2d,
-	0xbe, 0xb8, 0x87, 0xda, 0x4e, 0x67, 0xbb, 0xd7, 0xf6, 0x57, 0x16, 0xd3, 0xac, 0x86, 0x3f, 0x90,
-	0xd1, 0xbd, 0xc5, 0x91, 0x39, 0x03, 0x1f, 0xa1, 0x1a, 0x17, 0x29, 0x53, 0x7a, 0xc4, 0x43, 0x6f,
-	0x13, 0xbe, 0x9b, 0x9b, 0x3f, 0xdc, 0x86, 0xf8, 0x0a, 0x35, 0x96, 0x17, 0xcf, 0xab, 0x42, 0x79,
-	0xcf, 0xa7, 0xbf, 0xd1, 0x3a, 0x21, 0x39, 0x8e, 0xd4, 0x9f, 0x16, 0x0e, 0xfe, 0x13, 0x55, 0x62,
-	0xfa, 0xc8, 0xe2, 0xd4, 0xab, 0xb7, 0xcb, 0x9d, 0x7a, 0xef, 0x57, 0x7f, 0xed, 0x6c, 0xfc, 0x62,
-	0x8b, 0xfc, 0x01, 0x20, 0xc1, 0x26, 0x96, 0x86, 0xfb, 0xa8, 0x26, 0x13, 0xa6, 0xe0, 0x92, 0xbc,
-	0x1d, 0x28, 0xe1, 0xe7, 0x17, 0x72, 0xfc, 0x57, 0x60, 0xc9, 0x82, 0x86, 0xf7, 0xd1, 0x77, 0x5a,
-	0xd1, 0x80, 0x79, 0x07, 0xd0, 0x62, 0xee, 0xe0, 0x26, 0xaa, 0xa6, 0x09, 0x15, 0xa6, 0xf5, 0x23,
-	0x78, 0xaf, 0x18, 0xf7, 0x36, 0xc4, 0x04, 0xed, 0xe4, 0x0b, 0x38, 0x8a, 0x65, 0x90, 0x0b, 0x37,
-	0x41, 0xf8, 0xb7, 0x17, 0x84, 0xef, 0x81, 0x31, 0xb0, 0x04, 0xb2, 0x9d, 0x7e, 0xe5, 0xb7, 0xce,
-	0x51, 0x7d, 0xa9, 0x3b, 0xbc, 0x8b, 0xca, 0x6f, 0xd8, 0xcc, 0x73, 0x40, 0xd7, 0x98, 0xa6, 0xc6,
-	0x29, 0x8d, 0x33, 0x06, 0x3b, 0x5e, 0x23, 0xb9, 0xf3, 0x47, 0xe9, 0xcc, 0xe9, 0xd7, 0x50, 0xd5,
-	0xae, 0xe7, 0x09, 0x47, 0x7b, 0x6b, 0x8d, 0xe2, 0x6d, 0x54, 0xe2, 0xa1, 0x4d, 0x55, 0xe2, 0x21,
-	0x6e, 0x21, 0x37, 0x51, 0x32, 0xcc, 0x02, 0xa6, 0x6c, 0xb2, 0xb9, 0x6f, 0x54, 0xc6, 0x5c, 0xa5,
-	0x1a, 0xae, 0xc1, 0x25, 0xb9, 0x83, 0x31, 0xda, 0x8c, 0x69, 0xaa, 0x61, 0x03, 0x5c, 0x02, 0xf6,
-	0xc9, 0x10, 0x1d, 0x3c, 0xdf, 0x9a, 0x41, 0x8f, 0x79, 0xcc, 0xac, 0x22, 0xd8, 0x90, 0x81, 0x8b,
-	0xbc, 0xf8, 0x32, 0x01, 0xdb, 0xd4, 0x31, 0xce, 0x44, 0x00, 0xf3, 0x2b, 0xe7, 0x75, 0x14, 0x7e,
-	0xff, 0xbd, 0x83, 0xbe, 0x0f, 0xe4, 0x64, 0x7d, 0x9e, 0xfd, 0xad, 0x42, 0xf5, 0x0e, 0x8e, 0xd9,
-	0x79, 0x75, 0x66, 0x31, 0x91, 0x8c, 0xa9, 0x88, 0x7c, 0xa9, 0xa2, 0x6e, 0xc4, 0x04, 0x1c, 0x47,
-	0x37, 0x0f, 0xd1, 0x84, 0xa7, 0x4b, 0x7f, 0xea, 0x0b, 0x6b, 0x7e, 0x76, 0x9c, 0x0f, 0xa5, 0xe6,
-	0x75, 0xce, 0xbe, 0x8a, 0x65, 0x16, 0x9a, 0x8f, 0x05, 0x3a, 0x0f, 0xbd, 0x8f, 0x45, 0x64, 0x08,
-	0x91, 0xa1, 0x8d, 0x0c, 0x1f, 0x7a, 0x8f, 0x15, 0xc8, 0xfd, 0xfb, 0x97, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x80, 0x53, 0xd3, 0xff, 0x04, 0x06, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/logging/v2/log_entry.proto", fileDescriptor_log_entry_72fcc25aa7b2cfea)
+}
+
+var fileDescriptor_log_entry_72fcc25aa7b2cfea = []byte{
+	// 748 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x5d, 0x6f, 0xf3, 0x34,
+	0x14, 0x7e, 0xd3, 0xbe, 0xb4, 0xa9, 0xdb, 0x77, 0x1f, 0xd6, 0x58, 0xb3, 0x6e, 0x88, 0xb2, 0xf1,
+	0x51, 0x6e, 0x52, 0xa9, 0xdc, 0x6c, 0x6c, 0x12, 0x5a, 0x27, 0xb4, 0x4d, 0xea, 0x60, 0xf2, 0xd0,
+	0x2e, 0x50, 0xa5, 0xca, 0x4b, 0xdc, 0xcc, 0x90, 0xda, 0xc1, 0x71, 0x2a, 0xfa, 0x53, 0xf8, 0x0b,
+	0x5c, 0xf3, 0x2b, 0xf8, 0x45, 0x5c, 0x22, 0x9f, 0x38, 0x69, 0x69, 0xa7, 0x72, 0x77, 0x8e, 0xcf,
+	0xf3, 0x9c, 0xe7, 0xc9, 0xf1, 0x71, 0xd0, 0x67, 0x91, 0x94, 0x51, 0xcc, 0xfa, 0xb1, 0x8c, 0x22,
+	0x2e, 0xa2, 0xfe, 0x7c, 0x60, 0xc2, 0x09, 0x13, 0x5a, 0x2d, 0xfc, 0x44, 0x49, 0x2d, 0xf1, 0x7e,
+	0x0e, 0xf1, 0x2d, 0xc4, 0x9f, 0x0f, 0x3a, 0x27, 0x96, 0x45, 0x13, 0xde, 0xa7, 0x42, 0x48, 0x4d,
+	0x35, 0x97, 0x22, 0xcd, 0x09, 0x9d, 0xb3, 0x95, 0xea, 0x4c, 0x0a, 0xae, 0xa5, 0x62, 0xe1, 0x44,
+	0xb1, 0x54, 0x66, 0x2a, 0x60, 0x16, 0xf4, 0xe5, 0x9a, 0xb0, 0x5e, 0x24, 0xac, 0xff, 0xaa, 0x75,
+	0x32, 0x51, 0xec, 0xb7, 0x8c, 0xa5, 0x7a, 0x1b, 0xce, 0x58, 0x4c, 0xd9, 0x9c, 0x29, 0xae, 0xad,
+	0xcb, 0xce, 0x91, 0xc5, 0x41, 0xf6, 0x92, 0x4d, 0xfb, 0x54, 0x14, 0xa5, 0x93, 0xf5, 0x52, 0xaa,
+	0x55, 0x16, 0x14, 0x02, 0x9f, 0xae, 0x57, 0x35, 0x9f, 0xb1, 0x54, 0xd3, 0x59, 0x92, 0x03, 0x4e,
+	0xff, 0xaa, 0x23, 0x77, 0x24, 0xa3, 0xef, 0xcd, 0x48, 0xf0, 0x11, 0x72, 0x8d, 0xb8, 0xa0, 0x33,
+	0xe6, 0xb5, 0xba, 0x4e, 0xaf, 0x41, 0xea, 0xb1, 0x8c, 0x7e, 0xa0, 0x33, 0x86, 0x2f, 0x90, 0x5b,
+	0x7c, 0xa3, 0xe7, 0x76, 0x9d, 0x5e, 0x73, 0xf0, 0x89, 0x6f, 0x47, 0x47, 0x13, 0xee, 0x3f, 0x14,
+	0x93, 0x20, 0x16, 0x44, 0x4a, 0x38, 0xbe, 0x44, 0x1f, 0x40, 0x6b, 0x92, 0xd0, 0x45, 0x2c, 0x69,
+	0xe8, 0x55, 0x80, 0x7f, 0x50, 0xf0, 0x0b, 0x6f, 0xfe, 0xb5, 0x58, 0xdc, 0xbd, 0x23, 0x2d, 0xc8,
+	0x1f, 0x73, 0x2c, 0x3e, 0x43, 0x2d, 0xcd, 0x7e, 0xd7, 0x25, 0xb7, 0x6a, 0x6c, 0xdd, 0xbd, 0x23,
+	0x4d, 0x73, 0x5a, 0x80, 0xae, 0x50, 0xeb, 0x97, 0x54, 0x8a, 0x12, 0x54, 0x03, 0x81, 0xf6, 0x86,
+	0xc0, 0x13, 0x8c, 0xc6, 0xb0, 0x0d, 0xbc, 0x60, 0x9f, 0xa3, 0x46, 0x39, 0x15, 0xaf, 0x01, 0xd4,
+	0xce, 0x06, 0xf5, 0xa7, 0x02, 0x41, 0x96, 0x60, 0x7c, 0x8b, 0xf6, 0x15, 0x0b, 0x18, 0x9f, 0xb3,
+	0xc9, 0xb2, 0x83, 0xf7, 0xbf, 0x1d, 0xf6, 0x2c, 0xa9, 0x3c, 0xc1, 0x57, 0xc8, 0x2d, 0x6e, 0xdc,
+	0x43, 0x5d, 0xa7, 0xb7, 0x33, 0xe8, 0xfa, 0x6b, 0x8b, 0x69, 0x56, 0xc3, 0x1f, 0xc9, 0xe8, 0xc9,
+	0xe2, 0x48, 0xc9, 0xc0, 0xc7, 0xa8, 0xc1, 0x45, 0xca, 0x94, 0x9e, 0xf0, 0xd0, 0x7b, 0x0f, 0xf7,
+	0xe6, 0xe6, 0x07, 0xf7, 0x21, 0xbe, 0x41, 0xad, 0xd5, 0xc5, 0xf3, 0xea, 0x60, 0xef, 0xed, 0xf6,
+	0x77, 0x5a, 0x27, 0x24, 0xc7, 0x91, 0xe6, 0xeb, 0x32, 0xc1, 0xdf, 0xa1, 0x5a, 0x4c, 0x5f, 0x58,
+	0x9c, 0x7a, 0xcd, 0x6e, 0xb5, 0xd7, 0x1c, 0x7c, 0xe5, 0x6f, 0x3c, 0x1b, 0xbf, 0xd8, 0x22, 0x7f,
+	0x04, 0x48, 0x88, 0x89, 0xa5, 0xe1, 0x6b, 0xe4, 0xce, 0x98, 0xa6, 0x21, 0xd5, 0xd4, 0x3b, 0x02,
+	0x07, 0x5f, 0x6c, 0x5d, 0x9f, 0x07, 0x0b, 0x26, 0x25, 0x0d, 0x0f, 0x51, 0x43, 0x26, 0x4c, 0xc1,
+	0x63, 0xf4, 0x76, 0xa1, 0xc7, 0xe7, 0x5b, 0x6c, 0xfc, 0x58, 0x60, 0xc9, 0x92, 0x86, 0x0f, 0xd0,
+	0x47, 0x5a, 0xd1, 0x80, 0x79, 0x87, 0x30, 0xa5, 0x3c, 0xc1, 0x6d, 0x54, 0x4f, 0x13, 0x2a, 0xcc,
+	0xf4, 0x8e, 0xe1, 0xbc, 0x66, 0xd2, 0xfb, 0x10, 0x13, 0xb4, 0x9b, 0xdb, 0x99, 0xc4, 0x32, 0xc8,
+	0x85, 0xdb, 0x20, 0xfc, 0xf5, 0x16, 0xe1, 0x27, 0x60, 0x8c, 0x2c, 0x81, 0xec, 0xa4, 0xff, 0xc9,
+	0x3b, 0x17, 0xa8, 0xb9, 0x32, 0x20, 0xbc, 0x87, 0xaa, 0xbf, 0xb2, 0x85, 0xe7, 0x80, 0xae, 0x09,
+	0x8d, 0xc7, 0x39, 0x8d, 0x33, 0x06, 0xcf, 0xa4, 0x41, 0xf2, 0xe4, 0xdb, 0xca, 0xb9, 0x33, 0x6c,
+	0xa0, 0xba, 0xdd, 0xf0, 0x53, 0x8e, 0xf6, 0x37, 0x3e, 0x14, 0xef, 0xa0, 0x0a, 0x0f, 0x6d, 0xab,
+	0x0a, 0x0f, 0x71, 0x07, 0xb9, 0x89, 0x92, 0x61, 0x16, 0x30, 0x65, 0x9b, 0x95, 0xb9, 0x51, 0x99,
+	0x72, 0x95, 0x6a, 0x78, 0x50, 0x2e, 0xc9, 0x13, 0x8c, 0xd1, 0xfb, 0x98, 0xa6, 0x1a, 0x96, 0xc8,
+	0x25, 0x10, 0x9f, 0x8e, 0xd1, 0xe1, 0xdb, 0x9f, 0x66, 0xd0, 0x53, 0x1e, 0x33, 0xab, 0x08, 0x31,
+	0x74, 0xe0, 0x22, 0x37, 0x5f, 0x25, 0x10, 0x1b, 0x1f, 0xd3, 0x4c, 0x04, 0x30, 0xbf, 0x6a, 0xee,
+	0xa3, 0xc8, 0x87, 0x7f, 0x38, 0xe8, 0xe3, 0x40, 0xce, 0x36, 0xe7, 0x39, 0xfc, 0x50, 0xa8, 0x3e,
+	0xc2, 0xff, 0xc0, 0xf9, 0xf9, 0xdc, 0x62, 0x22, 0x19, 0x53, 0x11, 0xf9, 0x52, 0x45, 0xfd, 0x88,
+	0x09, 0x78, 0x5f, 0xfd, 0xbc, 0x44, 0x13, 0x9e, 0xae, 0xfc, 0xec, 0x2f, 0x6d, 0xf8, 0x8f, 0xe3,
+	0xfc, 0x59, 0x69, 0xdf, 0xe6, 0xec, 0x9b, 0x58, 0x66, 0xa1, 0xb9, 0x2c, 0xd0, 0x79, 0x1e, 0xfc,
+	0x5d, 0x54, 0xc6, 0x50, 0x19, 0xdb, 0xca, 0xf8, 0x79, 0xf0, 0x52, 0x83, 0xde, 0xdf, 0xfc, 0x1b,
+	0x00, 0x00, 0xff, 0xff, 0xc7, 0x91, 0xad, 0xed, 0x47, 0x06, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/logging/v2/logging.pb.go b/vendor/google.golang.org/genproto/googleapis/logging/v2/logging.pb.go
index 12e712c5..929b33f4 100644
--- a/vendor/google.golang.org/genproto/googleapis/logging/v2/logging.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/logging/v2/logging.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging.proto
 
-package logging
+package logging // import "google.golang.org/genproto/googleapis/logging/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api3 "google.golang.org/genproto/googleapis/api/monitoredres"
 import _ "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/empty"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -23,6 +23,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The parameters to DeleteLog.
 type DeleteLogRequest struct {
 	// Required. The resource name of the log to delete:
@@ -37,13 +43,35 @@ type DeleteLogRequest struct {
 	// `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
 	// For more information about log names, see
 	// [LogEntry][google.logging.v2.LogEntry].
-	LogName string `protobuf:"bytes,1,opt,name=log_name,json=logName" json:"log_name,omitempty"`
+	LogName              string   `protobuf:"bytes,1,opt,name=log_name,json=logName,proto3" json:"log_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteLogRequest) Reset()         { *m = DeleteLogRequest{} }
+func (m *DeleteLogRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteLogRequest) ProtoMessage()    {}
+func (*DeleteLogRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{0}
+}
+func (m *DeleteLogRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteLogRequest.Unmarshal(m, b)
+}
+func (m *DeleteLogRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteLogRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteLogRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteLogRequest.Merge(dst, src)
+}
+func (m *DeleteLogRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteLogRequest.Size(m)
+}
+func (m *DeleteLogRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteLogRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteLogRequest) Reset()                    { *m = DeleteLogRequest{} }
-func (m *DeleteLogRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteLogRequest) ProtoMessage()               {}
-func (*DeleteLogRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_DeleteLogRequest proto.InternalMessageInfo
 
 func (m *DeleteLogRequest) GetLogName() string {
 	if m != nil {
@@ -67,7 +95,7 @@ type WriteLogEntriesRequest struct {
 	// `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
 	// For more information about log names, see
 	// [LogEntry][google.logging.v2.LogEntry].
-	LogName string `protobuf:"bytes,1,opt,name=log_name,json=logName" json:"log_name,omitempty"`
+	LogName string `protobuf:"bytes,1,opt,name=log_name,json=logName,proto3" json:"log_name,omitempty"`
 	// Optional. A default monitored resource object that is assigned to all log
 	// entries in `entries` that do not specify a value for `resource`. Example:
 	//
@@ -76,17 +104,18 @@ type WriteLogEntriesRequest struct {
 	//         "zone": "us-central1-a", "instance_id": "00000000000000000000" }}
 	//
 	// See [LogEntry][google.logging.v2.LogEntry].
-	Resource *google_api3.MonitoredResource `protobuf:"bytes,2,opt,name=resource" json:"resource,omitempty"`
+	Resource *monitoredres.MonitoredResource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
 	// Optional. Default labels that are added to the `labels` field of all log
 	// entries in `entries`. If a log entry already has a label with the same key
 	// as a label in this parameter, then the log entry's label is not changed.
 	// See [LogEntry][google.logging.v2.LogEntry].
-	Labels map[string]string `protobuf:"bytes,3,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. The log entries to send to Stackdriver Logging. The order of log
 	// entries in this list does not matter. Values supplied in this method's
 	// `log_name`, `resource`, and `labels` fields are copied into those log
 	// entries in this list that do not include values for their corresponding
-	// fields. For more information, see the [LogEntry][google.logging.v2.LogEntry] type.
+	// fields. For more information, see the
+	// [LogEntry][google.logging.v2.LogEntry] type.
 	//
 	// If the `timestamp` or `insert_id` fields are missing in log entries, then
 	// this method supplies the current time or a unique identifier, respectively.
@@ -96,26 +125,53 @@ type WriteLogEntriesRequest struct {
 	//
 	// Log entries with timestamps that are more than the
 	// [logs retention period](/logging/quota-policy) in the past or more than
-	// 24 hours in the future might be discarded. Discarding does not return
-	// an error.
+	// 24 hours in the future will not be available when calling `entries.list`.
+	// However, those log entries can still be exported with
+	// [LogSinks](/logging/docs/api/tasks/exporting-logs).
 	//
 	// To improve throughput and to avoid exceeding the
 	// [quota limit](/logging/quota-policy) for calls to `entries.write`,
 	// you should try to include several log entries in this list,
 	// rather than calling this method for each individual log entry.
-	Entries []*LogEntry `protobuf:"bytes,4,rep,name=entries" json:"entries,omitempty"`
+	Entries []*LogEntry `protobuf:"bytes,4,rep,name=entries,proto3" json:"entries,omitempty"`
 	// Optional. Whether valid entries should be written even if some other
 	// entries fail due to INVALID_ARGUMENT or PERMISSION_DENIED errors. If any
 	// entry is not written, then the response status is the error associated
 	// with one of the failed entries and the response includes error details
 	// keyed by the entries' zero-based index in the `entries.write` method.
-	PartialSuccess bool `protobuf:"varint,5,opt,name=partial_success,json=partialSuccess" json:"partial_success,omitempty"`
+	PartialSuccess bool `protobuf:"varint,5,opt,name=partial_success,json=partialSuccess,proto3" json:"partial_success,omitempty"`
+	// Optional. If true, the request should expect normal response, but the
+	// entries won't be persisted nor exported. Useful for checking whether the
+	// logging API endpoints are working properly before sending valuable data.
+	DryRun               bool     `protobuf:"varint,6,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *WriteLogEntriesRequest) Reset()                    { *m = WriteLogEntriesRequest{} }
-func (m *WriteLogEntriesRequest) String() string            { return proto.CompactTextString(m) }
-func (*WriteLogEntriesRequest) ProtoMessage()               {}
-func (*WriteLogEntriesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *WriteLogEntriesRequest) Reset()         { *m = WriteLogEntriesRequest{} }
+func (m *WriteLogEntriesRequest) String() string { return proto.CompactTextString(m) }
+func (*WriteLogEntriesRequest) ProtoMessage()    {}
+func (*WriteLogEntriesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{1}
+}
+func (m *WriteLogEntriesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteLogEntriesRequest.Unmarshal(m, b)
+}
+func (m *WriteLogEntriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteLogEntriesRequest.Marshal(b, m, deterministic)
+}
+func (dst *WriteLogEntriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteLogEntriesRequest.Merge(dst, src)
+}
+func (m *WriteLogEntriesRequest) XXX_Size() int {
+	return xxx_messageInfo_WriteLogEntriesRequest.Size(m)
+}
+func (m *WriteLogEntriesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteLogEntriesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WriteLogEntriesRequest proto.InternalMessageInfo
 
 func (m *WriteLogEntriesRequest) GetLogName() string {
 	if m != nil {
@@ -124,7 +180,7 @@ func (m *WriteLogEntriesRequest) GetLogName() string {
 	return ""
 }
 
-func (m *WriteLogEntriesRequest) GetResource() *google_api3.MonitoredResource {
+func (m *WriteLogEntriesRequest) GetResource() *monitoredres.MonitoredResource {
 	if m != nil {
 		return m.Resource
 	}
@@ -152,15 +208,44 @@ func (m *WriteLogEntriesRequest) GetPartialSuccess() bool {
 	return false
 }
 
+func (m *WriteLogEntriesRequest) GetDryRun() bool {
+	if m != nil {
+		return m.DryRun
+	}
+	return false
+}
+
 // Result returned from WriteLogEntries.
 // empty
 type WriteLogEntriesResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *WriteLogEntriesResponse) Reset()                    { *m = WriteLogEntriesResponse{} }
-func (m *WriteLogEntriesResponse) String() string            { return proto.CompactTextString(m) }
-func (*WriteLogEntriesResponse) ProtoMessage()               {}
-func (*WriteLogEntriesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *WriteLogEntriesResponse) Reset()         { *m = WriteLogEntriesResponse{} }
+func (m *WriteLogEntriesResponse) String() string { return proto.CompactTextString(m) }
+func (*WriteLogEntriesResponse) ProtoMessage()    {}
+func (*WriteLogEntriesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{2}
+}
+func (m *WriteLogEntriesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteLogEntriesResponse.Unmarshal(m, b)
+}
+func (m *WriteLogEntriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteLogEntriesResponse.Marshal(b, m, deterministic)
+}
+func (dst *WriteLogEntriesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteLogEntriesResponse.Merge(dst, src)
+}
+func (m *WriteLogEntriesResponse) XXX_Size() int {
+	return xxx_messageInfo_WriteLogEntriesResponse.Size(m)
+}
+func (m *WriteLogEntriesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteLogEntriesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WriteLogEntriesResponse proto.InternalMessageInfo
 
 // Error details for WriteLogEntries with partial success.
 type WriteLogEntriesPartialErrors struct {
@@ -170,15 +255,37 @@ type WriteLogEntriesPartialErrors struct {
 	//
 	// Failed requests for which no entries are written will not include
 	// per-entry errors.
-	LogEntryErrors map[int32]*google_rpc.Status `protobuf:"bytes,1,rep,name=log_entry_errors,json=logEntryErrors" json:"log_entry_errors,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	LogEntryErrors       map[int32]*status.Status `protobuf:"bytes,1,rep,name=log_entry_errors,json=logEntryErrors,proto3" json:"log_entry_errors,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *WriteLogEntriesPartialErrors) Reset()                    { *m = WriteLogEntriesPartialErrors{} }
-func (m *WriteLogEntriesPartialErrors) String() string            { return proto.CompactTextString(m) }
-func (*WriteLogEntriesPartialErrors) ProtoMessage()               {}
-func (*WriteLogEntriesPartialErrors) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *WriteLogEntriesPartialErrors) Reset()         { *m = WriteLogEntriesPartialErrors{} }
+func (m *WriteLogEntriesPartialErrors) String() string { return proto.CompactTextString(m) }
+func (*WriteLogEntriesPartialErrors) ProtoMessage()    {}
+func (*WriteLogEntriesPartialErrors) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{3}
+}
+func (m *WriteLogEntriesPartialErrors) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteLogEntriesPartialErrors.Unmarshal(m, b)
+}
+func (m *WriteLogEntriesPartialErrors) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteLogEntriesPartialErrors.Marshal(b, m, deterministic)
+}
+func (dst *WriteLogEntriesPartialErrors) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteLogEntriesPartialErrors.Merge(dst, src)
+}
+func (m *WriteLogEntriesPartialErrors) XXX_Size() int {
+	return xxx_messageInfo_WriteLogEntriesPartialErrors.Size(m)
+}
+func (m *WriteLogEntriesPartialErrors) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteLogEntriesPartialErrors.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WriteLogEntriesPartialErrors proto.InternalMessageInfo
 
-func (m *WriteLogEntriesPartialErrors) GetLogEntryErrors() map[int32]*google_rpc.Status {
+func (m *WriteLogEntriesPartialErrors) GetLogEntryErrors() map[int32]*status.Status {
 	if m != nil {
 		return m.LogEntryErrors
 	}
@@ -192,7 +299,7 @@ type ListLogEntriesRequest struct {
 	// `"my-project-1A"`. If present, these project identifiers are converted to
 	// resource name format and added to the list of resources in
 	// `resource_names`.
-	ProjectIds []string `protobuf:"bytes,1,rep,name=project_ids,json=projectIds" json:"project_ids,omitempty"`
+	ProjectIds []string `protobuf:"bytes,1,rep,name=project_ids,json=projectIds,proto3" json:"project_ids,omitempty"` // Deprecated: Do not use.
 	// Required. Names of one or more parent resources from which to
 	// retrieve log entries:
 	//
@@ -202,7 +309,7 @@ type ListLogEntriesRequest struct {
 	//     "folders/[FOLDER_ID]"
 	//
 	// Projects listed in the `project_ids` field are added to this list.
-	ResourceNames []string `protobuf:"bytes,8,rep,name=resource_names,json=resourceNames" json:"resource_names,omitempty"`
+	ResourceNames []string `protobuf:"bytes,8,rep,name=resource_names,json=resourceNames,proto3" json:"resource_names,omitempty"`
 	// Optional. A filter that chooses which log entries to return.  See [Advanced
 	// Logs Filters](/logging/docs/view/advanced_filters).  Only log entries that
 	// match the filter are returned.  An empty filter matches all log entries in
@@ -210,30 +317,53 @@ type ListLogEntriesRequest struct {
 	// that is not listed in `resource_names` will cause the filter to return no
 	// results.
 	// The maximum length of the filter is 20000 characters.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Optional. How the results should be sorted.  Presently, the only permitted
 	// values are `"timestamp asc"` (default) and `"timestamp desc"`. The first
 	// option returns entries in order of increasing values of
 	// `LogEntry.timestamp` (oldest first), and the second option returns entries
 	// in order of decreasing timestamps (newest first).  Entries with equal
 	// timestamps are returned in order of their `insert_id` values.
-	OrderBy string `protobuf:"bytes,3,opt,name=order_by,json=orderBy" json:"order_by,omitempty"`
+	OrderBy string `protobuf:"bytes,3,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
 	// Optional. The maximum number of results to return from this request.
 	// Non-positive values are ignored.  The presence of `next_page_token` in the
 	// response indicates that more results might be available.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. If present, then retrieve the next batch of results from the
 	// preceding call to this method.  `page_token` must be the value of
 	// `next_page_token` from the previous response.  The values of other method
 	// parameters should be identical to those in the previous call.
-	PageToken string `protobuf:"bytes,5,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,5,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListLogEntriesRequest) Reset()         { *m = ListLogEntriesRequest{} }
+func (m *ListLogEntriesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListLogEntriesRequest) ProtoMessage()    {}
+func (*ListLogEntriesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{4}
+}
+func (m *ListLogEntriesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLogEntriesRequest.Unmarshal(m, b)
+}
+func (m *ListLogEntriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLogEntriesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListLogEntriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogEntriesRequest.Merge(dst, src)
+}
+func (m *ListLogEntriesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListLogEntriesRequest.Size(m)
+}
+func (m *ListLogEntriesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLogEntriesRequest.DiscardUnknown(m)
 }
 
-func (m *ListLogEntriesRequest) Reset()                    { *m = ListLogEntriesRequest{} }
-func (m *ListLogEntriesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListLogEntriesRequest) ProtoMessage()               {}
-func (*ListLogEntriesRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_ListLogEntriesRequest proto.InternalMessageInfo
 
+// Deprecated: Do not use.
 func (m *ListLogEntriesRequest) GetProjectIds() []string {
 	if m != nil {
 		return m.ProjectIds
@@ -281,7 +411,7 @@ type ListLogEntriesResponse struct {
 	// A list of log entries.  If `entries` is empty, `nextPageToken` may still be
 	// returned, indicating that more entries may exist.  See `nextPageToken` for
 	// more information.
-	Entries []*LogEntry `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty"`
+	Entries []*LogEntry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"`
 	// If there might be more results than those appearing in this response, then
 	// `nextPageToken` is included.  To get the next set of results, call this
 	// method again using the value of `nextPageToken` as `pageToken`.
@@ -292,13 +422,35 @@ type ListLogEntriesResponse struct {
 	// value for `page_token` to continue the search.  Alternatively, consider
 	// speeding up the search by changing your filter to specify a single log name
 	// or resource type, or to narrow the time range of the search.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListLogEntriesResponse) Reset()                    { *m = ListLogEntriesResponse{} }
-func (m *ListLogEntriesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListLogEntriesResponse) ProtoMessage()               {}
-func (*ListLogEntriesResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *ListLogEntriesResponse) Reset()         { *m = ListLogEntriesResponse{} }
+func (m *ListLogEntriesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListLogEntriesResponse) ProtoMessage()    {}
+func (*ListLogEntriesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{5}
+}
+func (m *ListLogEntriesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLogEntriesResponse.Unmarshal(m, b)
+}
+func (m *ListLogEntriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLogEntriesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListLogEntriesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogEntriesResponse.Merge(dst, src)
+}
+func (m *ListLogEntriesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListLogEntriesResponse.Size(m)
+}
+func (m *ListLogEntriesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLogEntriesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListLogEntriesResponse proto.InternalMessageInfo
 
 func (m *ListLogEntriesResponse) GetEntries() []*LogEntry {
 	if m != nil {
@@ -319,12 +471,15 @@ type ListMonitoredResourceDescriptorsRequest struct {
 	// Optional. The maximum number of results to return from this request.
 	// Non-positive values are ignored.  The presence of `nextPageToken` in the
 	// response indicates that more results might be available.
-	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. If present, then retrieve the next batch of results from the
 	// preceding call to this method.  `pageToken` must be the value of
 	// `nextPageToken` from the previous response.  The values of other method
 	// parameters should be identical to those in the previous call.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ListMonitoredResourceDescriptorsRequest) Reset() {
@@ -333,9 +488,26 @@ func (m *ListMonitoredResourceDescriptorsRequest) Reset() {
 func (m *ListMonitoredResourceDescriptorsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListMonitoredResourceDescriptorsRequest) ProtoMessage()    {}
 func (*ListMonitoredResourceDescriptorsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{6}
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{6}
+}
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Unmarshal(m, b)
+}
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListMonitoredResourceDescriptorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Merge(dst, src)
+}
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Size(m)
+}
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_ListMonitoredResourceDescriptorsRequest proto.InternalMessageInfo
+
 func (m *ListMonitoredResourceDescriptorsRequest) GetPageSize() int32 {
 	if m != nil {
 		return m.PageSize
@@ -353,11 +525,14 @@ func (m *ListMonitoredResourceDescriptorsRequest) GetPageToken() string {
 // Result returned from ListMonitoredResourceDescriptors.
 type ListMonitoredResourceDescriptorsResponse struct {
 	// A list of resource descriptors.
-	ResourceDescriptors []*google_api3.MonitoredResourceDescriptor `protobuf:"bytes,1,rep,name=resource_descriptors,json=resourceDescriptors" json:"resource_descriptors,omitempty"`
+	ResourceDescriptors []*monitoredres.MonitoredResourceDescriptor `protobuf:"bytes,1,rep,name=resource_descriptors,json=resourceDescriptors,proto3" json:"resource_descriptors,omitempty"`
 	// If there might be more results than those appearing in this response, then
 	// `nextPageToken` is included.  To get the next set of results, call this
 	// method again using the value of `nextPageToken` as `pageToken`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ListMonitoredResourceDescriptorsResponse) Reset() {
@@ -366,10 +541,27 @@ func (m *ListMonitoredResourceDescriptorsResponse) Reset() {
 func (m *ListMonitoredResourceDescriptorsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListMonitoredResourceDescriptorsResponse) ProtoMessage()    {}
 func (*ListMonitoredResourceDescriptorsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{7}
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{7}
+}
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Unmarshal(m, b)
 }
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListMonitoredResourceDescriptorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Merge(dst, src)
+}
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Size(m)
+}
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListMonitoredResourceDescriptorsResponse proto.InternalMessageInfo
 
-func (m *ListMonitoredResourceDescriptorsResponse) GetResourceDescriptors() []*google_api3.MonitoredResourceDescriptor {
+func (m *ListMonitoredResourceDescriptorsResponse) GetResourceDescriptors() []*monitoredres.MonitoredResourceDescriptor {
 	if m != nil {
 		return m.ResourceDescriptors
 	}
@@ -391,22 +583,44 @@ type ListLogsRequest struct {
 	//     "organizations/[ORGANIZATION_ID]"
 	//     "billingAccounts/[BILLING_ACCOUNT_ID]"
 	//     "folders/[FOLDER_ID]"
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. The maximum number of results to return from this request.
 	// Non-positive values are ignored.  The presence of `nextPageToken` in the
 	// response indicates that more results might be available.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// Optional. If present, then retrieve the next batch of results from the
 	// preceding call to this method.  `pageToken` must be the value of
 	// `nextPageToken` from the previous response.  The values of other method
 	// parameters should be identical to those in the previous call.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListLogsRequest) Reset()                    { *m = ListLogsRequest{} }
-func (m *ListLogsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListLogsRequest) ProtoMessage()               {}
-func (*ListLogsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+func (m *ListLogsRequest) Reset()         { *m = ListLogsRequest{} }
+func (m *ListLogsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListLogsRequest) ProtoMessage()    {}
+func (*ListLogsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{8}
+}
+func (m *ListLogsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLogsRequest.Unmarshal(m, b)
+}
+func (m *ListLogsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLogsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListLogsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogsRequest.Merge(dst, src)
+}
+func (m *ListLogsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListLogsRequest.Size(m)
+}
+func (m *ListLogsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLogsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListLogsRequest proto.InternalMessageInfo
 
 func (m *ListLogsRequest) GetParent() string {
 	if m != nil {
@@ -434,17 +648,39 @@ type ListLogsResponse struct {
 	// A list of log names. For example,
 	// `"projects/my-project/syslog"` or
 	// `"organizations/123/cloudresourcemanager.googleapis.com%2Factivity"`.
-	LogNames []string `protobuf:"bytes,3,rep,name=log_names,json=logNames" json:"log_names,omitempty"`
+	LogNames []string `protobuf:"bytes,3,rep,name=log_names,json=logNames,proto3" json:"log_names,omitempty"`
 	// If there might be more results than those appearing in this response, then
 	// `nextPageToken` is included.  To get the next set of results, call this
 	// method again using the value of `nextPageToken` as `pageToken`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListLogsResponse) Reset()                    { *m = ListLogsResponse{} }
-func (m *ListLogsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListLogsResponse) ProtoMessage()               {}
-func (*ListLogsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+func (m *ListLogsResponse) Reset()         { *m = ListLogsResponse{} }
+func (m *ListLogsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListLogsResponse) ProtoMessage()    {}
+func (*ListLogsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_e1a2d3408d65219d, []int{9}
+}
+func (m *ListLogsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLogsResponse.Unmarshal(m, b)
+}
+func (m *ListLogsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLogsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListLogsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogsResponse.Merge(dst, src)
+}
+func (m *ListLogsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListLogsResponse.Size(m)
+}
+func (m *ListLogsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLogsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListLogsResponse proto.InternalMessageInfo
 
 func (m *ListLogsResponse) GetLogNames() []string {
 	if m != nil {
@@ -463,8 +699,10 @@ func (m *ListLogsResponse) GetNextPageToken() string {
 func init() {
 	proto.RegisterType((*DeleteLogRequest)(nil), "google.logging.v2.DeleteLogRequest")
 	proto.RegisterType((*WriteLogEntriesRequest)(nil), "google.logging.v2.WriteLogEntriesRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.logging.v2.WriteLogEntriesRequest.LabelsEntry")
 	proto.RegisterType((*WriteLogEntriesResponse)(nil), "google.logging.v2.WriteLogEntriesResponse")
 	proto.RegisterType((*WriteLogEntriesPartialErrors)(nil), "google.logging.v2.WriteLogEntriesPartialErrors")
+	proto.RegisterMapType((map[int32]*status.Status)(nil), "google.logging.v2.WriteLogEntriesPartialErrors.LogEntryErrorsEntry")
 	proto.RegisterType((*ListLogEntriesRequest)(nil), "google.logging.v2.ListLogEntriesRequest")
 	proto.RegisterType((*ListLogEntriesResponse)(nil), "google.logging.v2.ListLogEntriesResponse")
 	proto.RegisterType((*ListMonitoredResourceDescriptorsRequest)(nil), "google.logging.v2.ListMonitoredResourceDescriptorsRequest")
@@ -481,21 +719,23 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for LoggingServiceV2 service
-
+// LoggingServiceV2Client is the client API for LoggingServiceV2 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type LoggingServiceV2Client interface {
 	// Deletes all the log entries in a log.
 	// The log reappears if it receives new entries.
 	// Log entries written shortly before the delete operation might not be
 	// deleted.
-	DeleteLog(ctx context.Context, in *DeleteLogRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error)
-	// ## Log entry resources
-	//
+	DeleteLog(ctx context.Context, in *DeleteLogRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Writes log entries to Stackdriver Logging. This API method is the
 	// only way to send log entries to Stackdriver Logging. This method
 	// is used, directly or indirectly, by the Stackdriver Logging agent
 	// (fluentd) and all logging libraries configured to use Stackdriver
 	// Logging.
+	// A single request may contain log entries for a maximum of 1000
+	// different resources (projects, organizations, billing accounts or
+	// folders)
 	WriteLogEntries(ctx context.Context, in *WriteLogEntriesRequest, opts ...grpc.CallOption) (*WriteLogEntriesResponse, error)
 	// Lists log entries.  Use this method to retrieve log entries from
 	// Stackdriver Logging.  For ways to export log entries, see
@@ -517,9 +757,9 @@ func NewLoggingServiceV2Client(cc *grpc.ClientConn) LoggingServiceV2Client {
 	return &loggingServiceV2Client{cc}
 }
 
-func (c *loggingServiceV2Client) DeleteLog(ctx context.Context, in *DeleteLogRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error) {
-	out := new(google_protobuf5.Empty)
-	err := grpc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/DeleteLog", in, out, c.cc, opts...)
+func (c *loggingServiceV2Client) DeleteLog(ctx context.Context, in *DeleteLogRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/DeleteLog", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -528,7 +768,7 @@ func (c *loggingServiceV2Client) DeleteLog(ctx context.Context, in *DeleteLogReq
 
 func (c *loggingServiceV2Client) WriteLogEntries(ctx context.Context, in *WriteLogEntriesRequest, opts ...grpc.CallOption) (*WriteLogEntriesResponse, error) {
 	out := new(WriteLogEntriesResponse)
-	err := grpc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/WriteLogEntries", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/WriteLogEntries", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -537,7 +777,7 @@ func (c *loggingServiceV2Client) WriteLogEntries(ctx context.Context, in *WriteL
 
 func (c *loggingServiceV2Client) ListLogEntries(ctx context.Context, in *ListLogEntriesRequest, opts ...grpc.CallOption) (*ListLogEntriesResponse, error) {
 	out := new(ListLogEntriesResponse)
-	err := grpc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/ListLogEntries", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/ListLogEntries", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -546,7 +786,7 @@ func (c *loggingServiceV2Client) ListLogEntries(ctx context.Context, in *ListLog
 
 func (c *loggingServiceV2Client) ListMonitoredResourceDescriptors(ctx context.Context, in *ListMonitoredResourceDescriptorsRequest, opts ...grpc.CallOption) (*ListMonitoredResourceDescriptorsResponse, error) {
 	out := new(ListMonitoredResourceDescriptorsResponse)
-	err := grpc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/ListMonitoredResourceDescriptors", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/ListMonitoredResourceDescriptors", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -555,28 +795,28 @@ func (c *loggingServiceV2Client) ListMonitoredResourceDescriptors(ctx context.Co
 
 func (c *loggingServiceV2Client) ListLogs(ctx context.Context, in *ListLogsRequest, opts ...grpc.CallOption) (*ListLogsResponse, error) {
 	out := new(ListLogsResponse)
-	err := grpc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/ListLogs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.LoggingServiceV2/ListLogs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for LoggingServiceV2 service
-
+// LoggingServiceV2Server is the server API for LoggingServiceV2 service.
 type LoggingServiceV2Server interface {
 	// Deletes all the log entries in a log.
 	// The log reappears if it receives new entries.
 	// Log entries written shortly before the delete operation might not be
 	// deleted.
-	DeleteLog(context.Context, *DeleteLogRequest) (*google_protobuf5.Empty, error)
-	// ## Log entry resources
-	//
+	DeleteLog(context.Context, *DeleteLogRequest) (*empty.Empty, error)
 	// Writes log entries to Stackdriver Logging. This API method is the
 	// only way to send log entries to Stackdriver Logging. This method
 	// is used, directly or indirectly, by the Stackdriver Logging agent
 	// (fluentd) and all logging libraries configured to use Stackdriver
 	// Logging.
+	// A single request may contain log entries for a maximum of 1000
+	// different resources (projects, organizations, billing accounts or
+	// folders)
 	WriteLogEntries(context.Context, *WriteLogEntriesRequest) (*WriteLogEntriesResponse, error)
 	// Lists log entries.  Use this method to retrieve log entries from
 	// Stackdriver Logging.  For ways to export log entries, see
@@ -713,70 +953,79 @@ var _LoggingServiceV2_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/logging/v2/logging.proto",
 }
 
-func init() { proto.RegisterFile("google/logging/v2/logging.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 991 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0xdb, 0x46,
-	0x10, 0xc6, 0x4a, 0xb1, 0x23, 0x8d, 0x1a, 0x5b, 0xd9, 0xc4, 0xb2, 0x22, 0xd9, 0xb5, 0x4a, 0x23,
-	0xb5, 0x22, 0x20, 0x24, 0xca, 0x22, 0x40, 0xe2, 0x20, 0x17, 0x27, 0x46, 0x51, 0xc0, 0x29, 0x0c,
-	0xba, 0x75, 0x80, 0xc0, 0x80, 0x40, 0x49, 0x1b, 0x62, 0x1b, 0x8a, 0xcb, 0xee, 0xae, 0xe4, 0x2a,
-	0x41, 0x2e, 0x39, 0xf4, 0x05, 0x7a, 0xe9, 0x33, 0xf4, 0xd0, 0xb7, 0xe8, 0xa5, 0x87, 0x5e, 0x8a,
-	0x02, 0x7d, 0x80, 0x3c, 0x44, 0x8f, 0x05, 0x77, 0x97, 0x32, 0xf5, 0x13, 0x59, 0xee, 0x4d, 0x3b,
-	0xf3, 0xed, 0xcc, 0x7c, 0xc3, 0x6f, 0x66, 0x05, 0x3b, 0x01, 0x63, 0x41, 0x48, 0x9c, 0x90, 0x05,
-	0x01, 0x8d, 0x02, 0x67, 0xe8, 0xa6, 0x3f, 0xed, 0x98, 0x33, 0xc9, 0xf0, 0x4d, 0x0d, 0xb0, 0x53,
-	0xeb, 0xd0, 0xad, 0x6d, 0x99, 0x3b, 0x7e, 0x4c, 0x1d, 0x3f, 0x8a, 0x98, 0xf4, 0x25, 0x65, 0x91,
-	0xd0, 0x17, 0x6a, 0xbb, 0x19, 0x6f, 0x9f, 0x45, 0x54, 0x32, 0x4e, 0x7a, 0x6d, 0x4e, 0x04, 0x1b,
-	0xf0, 0x2e, 0x31, 0xa0, 0xcf, 0xe6, 0xa6, 0x6d, 0x93, 0x48, 0xf2, 0x91, 0x81, 0x7c, 0x6a, 0x20,
-	0xea, 0xd4, 0x19, 0xbc, 0x72, 0x7a, 0x03, 0xae, 0x12, 0x19, 0x7f, 0x7d, 0xda, 0x4f, 0xfa, 0xb1,
-	0x4c, 0x2f, 0xef, 0x4c, 0x3b, 0x25, 0xed, 0x13, 0x21, 0xfd, 0x7e, 0x6c, 0x00, 0x9b, 0x06, 0xc0,
-	0xe3, 0xae, 0x23, 0xa4, 0x2f, 0x07, 0xa6, 0x7c, 0xeb, 0x3e, 0x94, 0x9f, 0x91, 0x90, 0x48, 0x72,
-	0xc4, 0x02, 0x8f, 0xfc, 0x30, 0x20, 0x42, 0xe2, 0x3b, 0x50, 0x48, 0xaa, 0x8b, 0xfc, 0x3e, 0xa9,
-	0xa2, 0x06, 0x6a, 0x16, 0xbd, 0xeb, 0x21, 0x0b, 0xbe, 0xf1, 0xfb, 0xc4, 0xfa, 0x27, 0x07, 0x95,
-	0x17, 0x9c, 0x2a, 0xf8, 0x61, 0x24, 0x39, 0x25, 0xe2, 0xf2, 0x5b, 0xf8, 0x11, 0x14, 0xd2, 0x86,
-	0x54, 0x73, 0x0d, 0xd4, 0x2c, 0xb9, 0xdb, 0xb6, 0xe9, 0xb3, 0x1f, 0x53, 0xfb, 0x79, 0xda, 0x36,
-	0xcf, 0x80, 0xbc, 0x31, 0x1c, 0x3f, 0x87, 0xd5, 0xd0, 0xef, 0x90, 0x50, 0x54, 0xf3, 0x8d, 0x7c,
-	0xb3, 0xe4, 0x3e, 0xb0, 0x67, 0x3e, 0x90, 0x3d, 0xbf, 0x20, 0xfb, 0x48, 0xdd, 0x4b, 0x8c, 0x23,
-	0xcf, 0x04, 0xc1, 0x0f, 0xe0, 0x3a, 0xd1, 0xa8, 0xea, 0x35, 0x15, 0xaf, 0x3e, 0x27, 0x9e, 0x09,
-	0x35, 0xf2, 0x52, 0x2c, 0xde, 0x83, 0xf5, 0xd8, 0xe7, 0x92, 0xfa, 0x61, 0x5b, 0x0c, 0xba, 0x5d,
-	0x22, 0x44, 0x75, 0xa5, 0x81, 0x9a, 0x05, 0x6f, 0xcd, 0x98, 0x4f, 0xb4, 0xb5, 0xf6, 0x08, 0x4a,
-	0x99, 0xb4, 0xb8, 0x0c, 0xf9, 0xd7, 0x64, 0x64, 0xda, 0x91, 0xfc, 0xc4, 0xb7, 0x61, 0x65, 0xe8,
-	0x87, 0x03, 0xdd, 0x87, 0xa2, 0xa7, 0x0f, 0xfb, 0xb9, 0x87, 0xc8, 0xba, 0x03, 0x9b, 0x33, 0x44,
-	0x44, 0xcc, 0x22, 0x41, 0xac, 0x0f, 0x08, 0xb6, 0xa6, 0x7c, 0xc7, 0x3a, 0xef, 0x21, 0xe7, 0x8c,
-	0x0b, 0xdc, 0x87, 0xf2, 0x58, 0x4f, 0x6d, 0xa2, 0x6c, 0x55, 0xa4, 0xf8, 0x3d, 0xbd, 0xbc, 0x5f,
-	0x13, 0xa1, 0xc6, 0xe4, 0xf5, 0x51, 0xf7, 0x61, 0x2d, 0x9c, 0x30, 0xd6, 0xbe, 0x83, 0x5b, 0x73,
-	0x60, 0x59, 0xb6, 0x2b, 0x9a, 0x6d, 0x33, 0xcb, 0xb6, 0xe4, 0xe2, 0xb4, 0x18, 0x1e, 0x77, 0xed,
-	0x13, 0x25, 0xc3, 0x6c, 0x07, 0xfe, 0x44, 0xb0, 0x71, 0x44, 0x85, 0x9c, 0xd5, 0xd6, 0x0e, 0x94,
-	0x62, 0xce, 0xbe, 0x27, 0x5d, 0xd9, 0xa6, 0x3d, 0x4d, 0xad, 0xe8, 0x81, 0x31, 0x7d, 0xdd, 0x13,
-	0xf8, 0x2e, 0xac, 0xa5, 0x92, 0x51, 0x0a, 0x14, 0xd5, 0x82, 0xc2, 0xdc, 0x48, 0xad, 0x89, 0x0e,
-	0x05, 0xae, 0xc0, 0xea, 0x2b, 0x1a, 0x4a, 0xc2, 0x4d, 0xfb, 0xcd, 0x29, 0xd1, 0x2e, 0xe3, 0x3d,
-	0xc2, 0xdb, 0x9d, 0x51, 0x35, 0xaf, 0xb5, 0xab, 0xce, 0x07, 0x23, 0x5c, 0x87, 0x62, 0xec, 0x07,
-	0xa4, 0x2d, 0xe8, 0x1b, 0x52, 0xbd, 0xa6, 0xa8, 0x15, 0x12, 0xc3, 0x09, 0x7d, 0x43, 0xf0, 0x36,
-	0x80, 0x72, 0x4a, 0xf6, 0x9a, 0x44, 0x4a, 0x12, 0x45, 0x4f, 0xc1, 0xbf, 0x4d, 0x0c, 0xd6, 0x39,
-	0x54, 0xa6, 0xf9, 0xe8, 0x2f, 0x9a, 0xd5, 0x21, 0xba, 0x82, 0x0e, 0x3f, 0x87, 0xf5, 0x88, 0xfc,
-	0x28, 0xdb, 0x99, 0xa4, 0x9a, 0xc8, 0x8d, 0xc4, 0x7c, 0x3c, 0x4e, 0x4c, 0x60, 0x2f, 0x49, 0x3c,
-	0x33, 0x58, 0xcf, 0x88, 0xe8, 0x72, 0x1a, 0x4b, 0xc6, 0xc7, 0xad, 0x9d, 0xe0, 0x87, 0x16, 0xf2,
-	0xcb, 0x4d, 0xf3, 0xfb, 0x0d, 0x41, 0xf3, 0xf2, 0x3c, 0x86, 0xf2, 0x4b, 0xb8, 0x3d, 0xfe, 0x44,
-	0xbd, 0x0b, 0xbf, 0xe1, 0xbf, 0xb7, 0x70, 0x21, 0x5c, 0xc4, 0xf3, 0x6e, 0xf1, 0xd9, 0x1c, 0x57,
-	0xe8, 0xcb, 0xba, 0xf9, 0x20, 0x63, 0xfe, 0x15, 0x58, 0x8d, 0x7d, 0x4e, 0x22, 0x69, 0xa6, 0xd4,
-	0x9c, 0x26, 0xfb, 0x92, 0x5b, 0xd8, 0x97, 0xfc, 0x74, 0x5f, 0x5e, 0x40, 0xf9, 0x22, 0x8d, 0xa1,
-	0x5f, 0x87, 0x62, 0xba, 0x1e, 0xf5, 0x2e, 0x2b, 0x7a, 0x05, 0xb3, 0x1f, 0x97, 0xae, 0xdf, 0xfd,
-	0x7b, 0x05, 0xca, 0x47, 0x5a, 0x20, 0x27, 0x84, 0x0f, 0x69, 0x97, 0x9c, 0xba, 0xf8, 0x1c, 0x8a,
-	0xe3, 0x15, 0x8e, 0x77, 0xe7, 0xe8, 0x68, 0x7a, 0xc1, 0xd7, 0x2a, 0x29, 0x28, 0x7d, 0x2f, 0xec,
-	0xc3, 0xe4, 0x31, 0xb1, 0xee, 0xbf, 0xff, 0xeb, 0xc3, 0xcf, 0xb9, 0xbd, 0xd6, 0x5d, 0x67, 0xe8,
-	0x76, 0x88, 0xf4, 0xbf, 0x70, 0xde, 0xa6, 0x35, 0x3f, 0x31, 0xc3, 0x26, 0x9c, 0x56, 0xf2, 0x74,
-	0x09, 0xa7, 0xf5, 0x0e, 0xff, 0x84, 0x60, 0x7d, 0x6a, 0x97, 0xe0, 0x7b, 0x4b, 0xef, 0xe7, 0x5a,
-	0x6b, 0x19, 0xa8, 0xd9, 0x80, 0x5b, 0xaa, 0xb2, 0x8a, 0x75, 0x33, 0x79, 0x3a, 0xcd, 0x34, 0xec,
-	0x9f, 0x27, 0xe0, 0x7d, 0xd4, 0xc2, 0xef, 0x11, 0xac, 0x4d, 0x0e, 0x1a, 0x6e, 0xce, 0x9b, 0xa7,
-	0x79, 0xbb, 0xa5, 0x76, 0x6f, 0x09, 0xa4, 0xa9, 0xa2, 0xae, 0xaa, 0xd8, 0xb0, 0xca, 0xd9, 0x2a,
-	0x42, 0x2a, 0x64, 0x52, 0xc4, 0xef, 0x08, 0x1a, 0x97, 0x0d, 0x03, 0xde, 0xff, 0x48, 0xb2, 0x25,
-	0x26, 0xb5, 0xf6, 0xf8, 0x7f, 0xdd, 0x35, 0xa5, 0x37, 0x55, 0xe9, 0x16, 0x6e, 0x24, 0xa5, 0xf7,
-	0x17, 0x95, 0xc8, 0xa1, 0x90, 0x8a, 0x17, 0x5b, 0x1f, 0xef, 0xcd, 0xb8, 0xac, 0xdd, 0x85, 0x18,
-	0x93, 0x7e, 0x5b, 0xa5, 0xdf, 0xc4, 0x1b, 0x49, 0xfa, 0xb7, 0x7a, 0xc4, 0x9e, 0xb4, 0x9c, 0xd6,
-	0x3b, 0x25, 0xa6, 0x83, 0x5f, 0x10, 0x6c, 0x74, 0x59, 0x7f, 0x36, 0xd2, 0xc1, 0x27, 0x46, 0xee,
-	0xc7, 0x89, 0x52, 0x8f, 0xd1, 0xcb, 0x87, 0x06, 0x12, 0xb0, 0xd0, 0x8f, 0x02, 0x9b, 0xf1, 0xc0,
-	0x09, 0x48, 0xa4, 0x74, 0xec, 0x68, 0x97, 0x1f, 0x53, 0x91, 0xf9, 0xa3, 0xf5, 0xd8, 0xfc, 0xfc,
-	0x17, 0xa1, 0x5f, 0x73, 0x9b, 0x5f, 0xe9, 0xdb, 0x4f, 0x43, 0x36, 0xe8, 0xd9, 0x26, 0xb4, 0x7d,
-	0xea, 0xfe, 0x91, 0x7a, 0xce, 0x94, 0xe7, 0xcc, 0x78, 0xce, 0x4e, 0xdd, 0xce, 0xaa, 0x8a, 0xfd,
-	0xe5, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x96, 0xc5, 0x3e, 0x3a, 0x0a, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/logging/v2/logging.proto", fileDescriptor_logging_e1a2d3408d65219d)
+}
+
+var fileDescriptor_logging_e1a2d3408d65219d = []byte{
+	// 1093 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0xdc, 0x44,
+	0x14, 0xd7, 0x6c, 0x9a, 0xcd, 0xee, 0x84, 0x26, 0xdb, 0x69, 0xb3, 0x71, 0x77, 0x93, 0x66, 0xb3,
+	0xab, 0x90, 0x8d, 0x25, 0x6c, 0x69, 0x51, 0xa5, 0x36, 0x55, 0x0f, 0xa4, 0x8d, 0x10, 0x52, 0x8a,
+	0x22, 0x07, 0x52, 0x29, 0x8a, 0xb4, 0x72, 0xec, 0x89, 0x35, 0xd4, 0xeb, 0x31, 0x33, 0xe3, 0x94,
+	0x0d, 0xea, 0xa5, 0x07, 0xbe, 0x00, 0x17, 0xb8, 0x21, 0x6e, 0x70, 0xe0, 0x5b, 0x70, 0xe1, 0x08,
+	0x17, 0x3e, 0x40, 0x6f, 0x9c, 0xb8, 0x71, 0x03, 0x79, 0x66, 0xec, 0x78, 0xff, 0x34, 0x49, 0xb9,
+	0x79, 0xde, 0xfb, 0xcd, 0xbc, 0xf7, 0x7b, 0xf3, 0x7b, 0x6f, 0x0c, 0xd7, 0x02, 0x4a, 0x83, 0x10,
+	0xdb, 0x21, 0x0d, 0x02, 0x12, 0x05, 0xf6, 0x59, 0x2f, 0xfb, 0xb4, 0x62, 0x46, 0x05, 0x45, 0xb7,
+	0x14, 0xc0, 0xca, 0xac, 0x67, 0xbd, 0xc6, 0x8a, 0xde, 0xe3, 0xc6, 0xc4, 0x76, 0xa3, 0x88, 0x0a,
+	0x57, 0x10, 0x1a, 0x71, 0xb5, 0xa1, 0xd1, 0x29, 0x78, 0x07, 0x34, 0x22, 0x82, 0x32, 0xec, 0xf7,
+	0x19, 0xe6, 0x34, 0x61, 0x1e, 0xd6, 0xa0, 0xf5, 0xa9, 0x61, 0xfb, 0x38, 0x12, 0x6c, 0xa8, 0x21,
+	0xf7, 0x34, 0x44, 0xae, 0x4e, 0x92, 0x53, 0xdb, 0x4f, 0x98, 0x0c, 0xa4, 0xfd, 0xcd, 0x71, 0x3f,
+	0x1e, 0xc4, 0x22, 0xdb, 0xbc, 0x36, 0xee, 0x14, 0x64, 0x80, 0xb9, 0x70, 0x07, 0xb1, 0x06, 0x2c,
+	0x6b, 0x00, 0x8b, 0x3d, 0x9b, 0x0b, 0x57, 0x24, 0x3a, 0xfd, 0xf6, 0x07, 0xb0, 0xf6, 0x14, 0x87,
+	0x58, 0xe0, 0x3d, 0x1a, 0x38, 0xf8, 0xcb, 0x04, 0x73, 0x81, 0xee, 0xc2, 0x4a, 0x9a, 0x5d, 0xe4,
+	0x0e, 0xb0, 0x01, 0x5a, 0xa0, 0x5b, 0x75, 0xe6, 0x42, 0x1a, 0x7c, 0xea, 0x0e, 0x70, 0xfb, 0xef,
+	0x12, 0xac, 0x3f, 0x67, 0x44, 0xc2, 0x77, 0x23, 0xc1, 0x08, 0xe6, 0x57, 0xef, 0x42, 0x0f, 0x61,
+	0x25, 0x2b, 0x88, 0x51, 0x6a, 0x81, 0xee, 0x7c, 0x6f, 0xd5, 0xd2, 0x75, 0x76, 0x63, 0x62, 0x3d,
+	0xcb, 0xca, 0xe6, 0x68, 0x90, 0x93, 0xc3, 0xd1, 0x33, 0x58, 0x0e, 0xdd, 0x13, 0x1c, 0x72, 0x63,
+	0xa6, 0x35, 0xd3, 0x9d, 0xef, 0xdd, 0xb7, 0x26, 0x2e, 0xc8, 0x9a, 0x9e, 0x90, 0xb5, 0x27, 0xf7,
+	0xa5, 0xc6, 0xa1, 0xa3, 0x0f, 0x41, 0xf7, 0xe1, 0x1c, 0x56, 0x28, 0xe3, 0x86, 0x3c, 0xaf, 0x39,
+	0xe5, 0x3c, 0x7d, 0xd4, 0xd0, 0xc9, 0xb0, 0x68, 0x13, 0x2e, 0xc6, 0x2e, 0x13, 0xc4, 0x0d, 0xfb,
+	0x3c, 0xf1, 0x3c, 0xcc, 0xb9, 0x31, 0xdb, 0x02, 0xdd, 0x8a, 0xb3, 0xa0, 0xcd, 0x07, 0xca, 0x8a,
+	0x96, 0xe1, 0x9c, 0xcf, 0x86, 0x7d, 0x96, 0x44, 0x46, 0x59, 0x02, 0xca, 0x3e, 0x1b, 0x3a, 0x49,
+	0xd4, 0x78, 0x08, 0xe7, 0x0b, 0xf9, 0xa0, 0x1a, 0x9c, 0x79, 0x81, 0x87, 0xba, 0x4e, 0xe9, 0x27,
+	0xba, 0x03, 0x67, 0xcf, 0xdc, 0x30, 0x51, 0x05, 0xaa, 0x3a, 0x6a, 0xb1, 0x5d, 0x7a, 0x00, 0xda,
+	0x77, 0xe1, 0xf2, 0x04, 0x43, 0x1e, 0xd3, 0x88, 0xe3, 0xf6, 0x1b, 0x00, 0x57, 0xc6, 0x7c, 0xfb,
+	0x2a, 0xa1, 0x5d, 0xc6, 0x28, 0xe3, 0x68, 0x00, 0x6b, 0xb9, 0xd0, 0xfa, 0x58, 0xda, 0x0c, 0x20,
+	0x89, 0x3f, 0xb9, 0xba, 0x90, 0x23, 0x47, 0xe5, 0x55, 0x51, 0x4b, 0x55, 0xa0, 0x85, 0x70, 0xc4,
+	0xd8, 0xf8, 0x1c, 0xde, 0x9e, 0x02, 0x2b, 0xb2, 0x9d, 0x55, 0x6c, 0xbb, 0x45, 0xb6, 0xf3, 0x3d,
+	0x94, 0x25, 0xc3, 0x62, 0xcf, 0x3a, 0x90, 0xfa, 0x2c, 0x56, 0xe0, 0x77, 0x00, 0x97, 0xf6, 0x08,
+	0x17, 0x93, 0xa2, 0xeb, 0xc0, 0xf9, 0x98, 0xd1, 0x2f, 0xb0, 0x27, 0xfa, 0xc4, 0x57, 0xd4, 0xaa,
+	0x3b, 0x25, 0x03, 0x38, 0x50, 0x9b, 0x3f, 0xf1, 0x39, 0xda, 0x80, 0x0b, 0x99, 0x9e, 0xa4, 0x3c,
+	0xb9, 0x51, 0x49, 0x71, 0xce, 0xcd, 0xcc, 0x9a, 0x8a, 0x94, 0xa3, 0x3a, 0x2c, 0x9f, 0x92, 0x50,
+	0x60, 0xa6, 0xaf, 0x40, 0xaf, 0x52, 0x61, 0x53, 0xe6, 0x63, 0xd6, 0x3f, 0x19, 0x1a, 0x33, 0x4a,
+	0xd8, 0x72, 0xbd, 0x33, 0x44, 0x4d, 0x58, 0x8d, 0xdd, 0x00, 0xf7, 0x39, 0x39, 0xc7, 0xc6, 0x0d,
+	0x49, 0xaf, 0x92, 0x1a, 0x0e, 0xc8, 0x39, 0x46, 0xab, 0x10, 0x4a, 0xa7, 0xa0, 0x2f, 0x70, 0x24,
+	0xf5, 0x52, 0x75, 0x24, 0xfc, 0xb3, 0xd4, 0xd0, 0x7e, 0x09, 0xeb, 0xe3, 0x9c, 0xd4, 0xad, 0x16,
+	0x45, 0x0a, 0xde, 0x41, 0xa4, 0xef, 0xc3, 0xc5, 0x08, 0x7f, 0x25, 0xfa, 0x85, 0xa0, 0x8a, 0xc8,
+	0xcd, 0xd4, 0xbc, 0x9f, 0x07, 0xc6, 0x70, 0x33, 0x0d, 0x3c, 0xd1, 0x75, 0x4f, 0x31, 0xf7, 0x18,
+	0x89, 0x05, 0x65, 0x79, 0x79, 0x47, 0xf8, 0x81, 0x4b, 0xf9, 0x95, 0xc6, 0xf9, 0xfd, 0x02, 0x60,
+	0xf7, 0xea, 0x38, 0x9a, 0xf2, 0x11, 0xbc, 0x93, 0x5f, 0x91, 0x7f, 0xe1, 0xd7, 0xfc, 0x37, 0x2f,
+	0x9d, 0x16, 0x17, 0xe7, 0x39, 0xb7, 0xd9, 0x64, 0x8c, 0x77, 0xa8, 0xcb, 0xa2, 0xbe, 0x90, 0x9c,
+	0x7f, 0x1d, 0x96, 0x63, 0x97, 0xe1, 0x48, 0xe8, 0x4e, 0xd5, 0xab, 0xd1, 0xba, 0x94, 0x2e, 0xad,
+	0xcb, 0xcc, 0x78, 0x5d, 0x9e, 0xc3, 0xda, 0x45, 0x18, 0x4d, 0xbf, 0x09, 0xab, 0xd9, 0xec, 0x54,
+	0x83, 0xae, 0xea, 0x54, 0xf4, 0xf0, 0xbc, 0x76, 0xfe, 0xbd, 0x3f, 0xe7, 0x60, 0x6d, 0x4f, 0x09,
+	0xe4, 0x00, 0xb3, 0x33, 0xe2, 0xe1, 0xc3, 0x1e, 0xfa, 0x0b, 0xc0, 0x6a, 0x3e, 0xe0, 0x51, 0x67,
+	0x8a, 0x90, 0xc6, 0xc7, 0x7f, 0xa3, 0x9e, 0x81, 0xb2, 0xd7, 0xc4, 0xda, 0x4d, 0x9f, 0x9a, 0xf6,
+	0x0f, 0xe0, 0xf5, 0x1f, 0x6f, 0xbe, 0x2d, 0x7d, 0x0f, 0xcc, 0x56, 0xfa, 0x80, 0x7d, 0x9d, 0x65,
+	0xfc, 0x58, 0xb7, 0x1a, 0xb7, 0xcd, 0xf4, 0x55, 0xe3, 0xb6, 0xf9, 0xea, 0x68, 0xd3, 0xdc, 0x18,
+	0xc5, 0x50, 0x16, 0xb8, 0x11, 0x39, 0x57, 0x4f, 0x67, 0x01, 0xb8, 0x6e, 0xae, 0x8d, 0x02, 0x4f,
+	0x69, 0xe8, 0x63, 0x56, 0x84, 0x6c, 0x99, 0x9b, 0xa3, 0x90, 0x13, 0x12, 0x86, 0x24, 0x0a, 0x3e,
+	0xf2, 0x3c, 0x9a, 0x44, 0xc5, 0xb0, 0xe8, 0x1b, 0x00, 0x17, 0xc7, 0x86, 0x18, 0xda, 0xba, 0xf6,
+	0x8b, 0xd1, 0x30, 0xaf, 0x03, 0xd5, 0xa3, 0x77, 0x45, 0x16, 0xa3, 0xde, 0xbe, 0x95, 0xe6, 0xa6,
+	0x5b, 0x70, 0xfb, 0x65, 0x0a, 0xde, 0x06, 0x26, 0x7a, 0x0d, 0xe0, 0xc2, 0x68, 0x77, 0xa3, 0xee,
+	0xb4, 0x26, 0x9e, 0x36, 0xd4, 0x1a, 0x5b, 0xd7, 0x40, 0xea, 0x2c, 0x9a, 0x32, 0x8b, 0xa5, 0x76,
+	0xad, 0x98, 0x45, 0x48, 0xb8, 0x48, 0x93, 0xf8, 0x15, 0xc0, 0xd6, 0x55, 0x1d, 0x88, 0xb6, 0xdf,
+	0x12, 0xec, 0x1a, 0xe3, 0xa1, 0xf1, 0xe8, 0x7f, 0xed, 0xd5, 0xa9, 0x77, 0x65, 0xea, 0x6d, 0x24,
+	0xc5, 0x34, 0xb8, 0x2c, 0xc5, 0x7f, 0x01, 0xac, 0x64, 0x2d, 0x83, 0xda, 0x6f, 0x2f, 0x4e, 0x9e,
+	0x57, 0xe7, 0x52, 0x8c, 0x8e, 0xff, 0x93, 0x92, 0xf3, 0x8f, 0x00, 0x2d, 0x49, 0x79, 0xa9, 0xd6,
+	0x7e, 0x6c, 0xda, 0xe6, 0x2b, 0xa9, 0xa7, 0xa3, 0x7b, 0x68, 0xa5, 0xe8, 0xb8, 0x50, 0xb9, 0xf6,
+	0x77, 0xd0, 0x7a, 0xd1, 0x3f, 0xa6, 0x70, 0x0d, 0x5a, 0x45, 0xcd, 0x22, 0x28, 0x57, 0xb7, 0x76,
+	0x6f, 0xa0, 0x4e, 0xd1, 0x3d, 0xa1, 0x6c, 0x05, 0xdb, 0xf9, 0x0e, 0xc0, 0x25, 0x8f, 0x0e, 0x26,
+	0x69, 0xed, 0xbc, 0xa7, 0x3b, 0x7e, 0x3f, 0xed, 0xd5, 0x7d, 0x70, 0xf4, 0x40, 0x43, 0x02, 0x1a,
+	0xba, 0x51, 0x60, 0x51, 0x16, 0xd8, 0x01, 0x8e, 0x64, 0x27, 0xdb, 0xca, 0xe5, 0xc6, 0x84, 0x17,
+	0x7e, 0x44, 0x1f, 0xe9, 0xcf, 0x7f, 0x00, 0xf8, 0xb9, 0xb4, 0xfc, 0xb1, 0xda, 0xfd, 0x24, 0xa4,
+	0x89, 0x6f, 0xe9, 0xa3, 0xad, 0xc3, 0xde, 0x6f, 0x99, 0xe7, 0x58, 0x7a, 0x8e, 0xb5, 0xe7, 0xf8,
+	0xb0, 0x77, 0x52, 0x96, 0x67, 0x7f, 0xf8, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xec, 0x91,
+	0x2d, 0x5a, 0x0b, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/logging/v2/logging_config.pb.go b/vendor/google.golang.org/genproto/googleapis/logging/v2/logging_config.pb.go
index 00fd85ea..f1de0eab 100644
--- a/vendor/google.golang.org/genproto/googleapis/logging/v2/logging_config.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/logging/v2/logging_config.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging_config.proto
 
-package logging
+package logging // import "google.golang.org/genproto/googleapis/logging/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf6 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Available log entry formats. Log entries can be written to Stackdriver
 // Logging in either format and can be exported in either format.
 // Version 2 is the preferred format.
@@ -49,7 +55,9 @@ var LogSink_VersionFormat_value = map[string]int32{
 func (x LogSink_VersionFormat) String() string {
 	return proto.EnumName(LogSink_VersionFormat_name, int32(x))
 }
-func (LogSink_VersionFormat) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (LogSink_VersionFormat) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{0, 0}
+}
 
 // Describes a sink used to export log entries to one of the following
 // destinations in any project: a Cloud Storage bucket, a BigQuery dataset, or a
@@ -62,7 +70,7 @@ type LogSink struct {
 	// limited to 100 characters and can include only the following characters:
 	// upper and lower-case alphanumeric characters, underscores, hyphens, and
 	// periods.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The export destination:
 	//
 	//     "storage.googleapis.com/[GCS_BUCKET]"
@@ -73,17 +81,17 @@ type LogSink struct {
 	// have permission to write to the destination or else the log
 	// entries are not exported.  For more information, see
 	// [Exporting Logs With Sinks](/logging/docs/api/tasks/exporting-logs).
-	Destination string `protobuf:"bytes,3,opt,name=destination" json:"destination,omitempty"`
+	Destination string `protobuf:"bytes,3,opt,name=destination,proto3" json:"destination,omitempty"`
 	// Optional.
 	// An [advanced logs filter](/logging/docs/view/advanced_filters).  The only
 	// exported log entries are those that are in the resource owning the sink and
 	// that match the filter.  For example:
 	//
 	//     logName="projects/[PROJECT_ID]/logs/[LOG_ID]" AND severity>=ERROR
-	Filter string `protobuf:"bytes,5,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Deprecated. The log entry format to use for this sink's exported log
 	// entries.  The v2 format is used by default and cannot be changed.
-	OutputVersionFormat LogSink_VersionFormat `protobuf:"varint,6,opt,name=output_version_format,json=outputVersionFormat,enum=google.logging.v2.LogSink_VersionFormat" json:"output_version_format,omitempty"`
+	OutputVersionFormat LogSink_VersionFormat `protobuf:"varint,6,opt,name=output_version_format,json=outputVersionFormat,proto3,enum=google.logging.v2.LogSink_VersionFormat" json:"output_version_format,omitempty"` // Deprecated: Do not use.
 	// Output only. An IAM identity&mdash;a service account or group&mdash;under
 	// which Stackdriver Logging writes the exported log entries to the sink's
 	// destination.  This field is set by
@@ -98,7 +106,7 @@ type LogSink struct {
 	// resource](/iam/docs/granting-roles-to-service-accounts#granting_access_to_a_service_account_for_a_resource).
 	// Consult the destination service's documentation to determine the
 	// appropriate IAM roles to assign to the identity.
-	WriterIdentity string `protobuf:"bytes,8,opt,name=writer_identity,json=writerIdentity" json:"writer_identity,omitempty"`
+	WriterIdentity string `protobuf:"bytes,8,opt,name=writer_identity,json=writerIdentity,proto3" json:"writer_identity,omitempty"`
 	// Optional. This field applies only to sinks owned by organizations and
 	// folders. If the field is false, the default, only the logs owned by the
 	// sink's parent resource are available for export. If the field is true, then
@@ -112,17 +120,39 @@ type LogSink struct {
 	//
 	//     logName:("projects/test-project1/" OR "projects/test-project2/") AND
 	//     resource.type=gce_instance
-	IncludeChildren bool `protobuf:"varint,9,opt,name=include_children,json=includeChildren" json:"include_children,omitempty"`
+	IncludeChildren bool `protobuf:"varint,9,opt,name=include_children,json=includeChildren,proto3" json:"include_children,omitempty"`
 	// Deprecated. This field is ignored when creating or updating sinks.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,10,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` // Deprecated: Do not use.
 	// Deprecated. This field is ignored when creating or updating sinks.
-	EndTime *google_protobuf4.Timestamp `protobuf:"bytes,11,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              *timestamp.Timestamp `protobuf:"bytes,11,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` // Deprecated: Do not use.
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *LogSink) Reset()                    { *m = LogSink{} }
-func (m *LogSink) String() string            { return proto.CompactTextString(m) }
-func (*LogSink) ProtoMessage()               {}
-func (*LogSink) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (m *LogSink) Reset()         { *m = LogSink{} }
+func (m *LogSink) String() string { return proto.CompactTextString(m) }
+func (*LogSink) ProtoMessage()    {}
+func (*LogSink) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{0}
+}
+func (m *LogSink) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogSink.Unmarshal(m, b)
+}
+func (m *LogSink) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogSink.Marshal(b, m, deterministic)
+}
+func (dst *LogSink) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogSink.Merge(dst, src)
+}
+func (m *LogSink) XXX_Size() int {
+	return xxx_messageInfo_LogSink.Size(m)
+}
+func (m *LogSink) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogSink.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LogSink proto.InternalMessageInfo
 
 func (m *LogSink) GetName() string {
 	if m != nil {
@@ -145,6 +175,7 @@ func (m *LogSink) GetFilter() string {
 	return ""
 }
 
+// Deprecated: Do not use.
 func (m *LogSink) GetOutputVersionFormat() LogSink_VersionFormat {
 	if m != nil {
 		return m.OutputVersionFormat
@@ -166,14 +197,16 @@ func (m *LogSink) GetIncludeChildren() bool {
 	return false
 }
 
-func (m *LogSink) GetStartTime() *google_protobuf4.Timestamp {
+// Deprecated: Do not use.
+func (m *LogSink) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *LogSink) GetEndTime() *google_protobuf4.Timestamp {
+// Deprecated: Do not use.
+func (m *LogSink) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -188,22 +221,44 @@ type ListSinksRequest struct {
 	//     "organizations/[ORGANIZATION_ID]"
 	//     "billingAccounts/[BILLING_ACCOUNT_ID]"
 	//     "folders/[FOLDER_ID]"
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. If present, then retrieve the next batch of results from the
 	// preceding call to this method.  `pageToken` must be the value of
 	// `nextPageToken` from the previous response.  The values of other method
 	// parameters should be identical to those in the previous call.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional. The maximum number of results to return from this request.
 	// Non-positive values are ignored.  The presence of `nextPageToken` in the
 	// response indicates that more results might be available.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSinksRequest) Reset()         { *m = ListSinksRequest{} }
+func (m *ListSinksRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSinksRequest) ProtoMessage()    {}
+func (*ListSinksRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{1}
+}
+func (m *ListSinksRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSinksRequest.Unmarshal(m, b)
+}
+func (m *ListSinksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSinksRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSinksRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSinksRequest.Merge(dst, src)
+}
+func (m *ListSinksRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSinksRequest.Size(m)
+}
+func (m *ListSinksRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSinksRequest.DiscardUnknown(m)
 }
 
-func (m *ListSinksRequest) Reset()                    { *m = ListSinksRequest{} }
-func (m *ListSinksRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListSinksRequest) ProtoMessage()               {}
-func (*ListSinksRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_ListSinksRequest proto.InternalMessageInfo
 
 func (m *ListSinksRequest) GetParent() string {
 	if m != nil {
@@ -229,17 +284,39 @@ func (m *ListSinksRequest) GetPageSize() int32 {
 // Result returned from `ListSinks`.
 type ListSinksResponse struct {
 	// A list of sinks.
-	Sinks []*LogSink `protobuf:"bytes,1,rep,name=sinks" json:"sinks,omitempty"`
+	Sinks []*LogSink `protobuf:"bytes,1,rep,name=sinks,proto3" json:"sinks,omitempty"`
 	// If there might be more results than appear in this response, then
 	// `nextPageToken` is included.  To get the next set of results, call the same
 	// method again using the value of `nextPageToken` as `pageToken`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListSinksResponse) Reset()                    { *m = ListSinksResponse{} }
-func (m *ListSinksResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListSinksResponse) ProtoMessage()               {}
-func (*ListSinksResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+func (m *ListSinksResponse) Reset()         { *m = ListSinksResponse{} }
+func (m *ListSinksResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSinksResponse) ProtoMessage()    {}
+func (*ListSinksResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{2}
+}
+func (m *ListSinksResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSinksResponse.Unmarshal(m, b)
+}
+func (m *ListSinksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSinksResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSinksResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSinksResponse.Merge(dst, src)
+}
+func (m *ListSinksResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSinksResponse.Size(m)
+}
+func (m *ListSinksResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSinksResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListSinksResponse proto.InternalMessageInfo
 
 func (m *ListSinksResponse) GetSinks() []*LogSink {
 	if m != nil {
@@ -265,13 +342,35 @@ type GetSinkRequest struct {
 	//     "folders/[FOLDER_ID]/sinks/[SINK_ID]"
 	//
 	// Example: `"projects/my-project-id/sinks/my-sink-id"`.
-	SinkName string `protobuf:"bytes,1,opt,name=sink_name,json=sinkName" json:"sink_name,omitempty"`
+	SinkName             string   `protobuf:"bytes,1,opt,name=sink_name,json=sinkName,proto3" json:"sink_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSinkRequest) Reset()         { *m = GetSinkRequest{} }
+func (m *GetSinkRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSinkRequest) ProtoMessage()    {}
+func (*GetSinkRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{3}
+}
+func (m *GetSinkRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSinkRequest.Unmarshal(m, b)
+}
+func (m *GetSinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSinkRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSinkRequest.Merge(dst, src)
+}
+func (m *GetSinkRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSinkRequest.Size(m)
+}
+func (m *GetSinkRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSinkRequest.DiscardUnknown(m)
 }
 
-func (m *GetSinkRequest) Reset()                    { *m = GetSinkRequest{} }
-func (m *GetSinkRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSinkRequest) ProtoMessage()               {}
-func (*GetSinkRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_GetSinkRequest proto.InternalMessageInfo
 
 func (m *GetSinkRequest) GetSinkName() string {
 	if m != nil {
@@ -290,10 +389,10 @@ type CreateSinkRequest struct {
 	//     "folders/[FOLDER_ID]"
 	//
 	// Examples: `"projects/my-logging-project"`, `"organizations/123456789"`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The new sink, whose `name` parameter is a sink identifier that
 	// is not already in use.
-	Sink *LogSink `protobuf:"bytes,2,opt,name=sink" json:"sink,omitempty"`
+	Sink *LogSink `protobuf:"bytes,2,opt,name=sink,proto3" json:"sink,omitempty"`
 	// Optional. Determines the kind of IAM identity returned as `writer_identity`
 	// in the new sink.  If this value is omitted or set to false, and if the
 	// sink's parent is a project, then the value returned as `writer_identity` is
@@ -305,13 +404,35 @@ type CreateSinkRequest struct {
 	// resource such as an organization, then the value of `writer_identity` will
 	// be a unique service account used only for exports from the new sink.  For
 	// more information, see `writer_identity` in [LogSink][google.logging.v2.LogSink].
-	UniqueWriterIdentity bool `protobuf:"varint,3,opt,name=unique_writer_identity,json=uniqueWriterIdentity" json:"unique_writer_identity,omitempty"`
+	UniqueWriterIdentity bool     `protobuf:"varint,3,opt,name=unique_writer_identity,json=uniqueWriterIdentity,proto3" json:"unique_writer_identity,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CreateSinkRequest) Reset()                    { *m = CreateSinkRequest{} }
-func (m *CreateSinkRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateSinkRequest) ProtoMessage()               {}
-func (*CreateSinkRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+func (m *CreateSinkRequest) Reset()         { *m = CreateSinkRequest{} }
+func (m *CreateSinkRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateSinkRequest) ProtoMessage()    {}
+func (*CreateSinkRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{4}
+}
+func (m *CreateSinkRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateSinkRequest.Unmarshal(m, b)
+}
+func (m *CreateSinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateSinkRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateSinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSinkRequest.Merge(dst, src)
+}
+func (m *CreateSinkRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateSinkRequest.Size(m)
+}
+func (m *CreateSinkRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateSinkRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateSinkRequest proto.InternalMessageInfo
 
 func (m *CreateSinkRequest) GetParent() string {
 	if m != nil {
@@ -345,10 +466,10 @@ type UpdateSinkRequest struct {
 	//     "folders/[FOLDER_ID]/sinks/[SINK_ID]"
 	//
 	// Example: `"projects/my-project-id/sinks/my-sink-id"`.
-	SinkName string `protobuf:"bytes,1,opt,name=sink_name,json=sinkName" json:"sink_name,omitempty"`
+	SinkName string `protobuf:"bytes,1,opt,name=sink_name,json=sinkName,proto3" json:"sink_name,omitempty"`
 	// Required. The updated sink, whose name is the same identifier that appears
 	// as part of `sink_name`.
-	Sink *LogSink `protobuf:"bytes,2,opt,name=sink" json:"sink,omitempty"`
+	Sink *LogSink `protobuf:"bytes,2,opt,name=sink,proto3" json:"sink,omitempty"`
 	// Optional. See
 	// [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
 	// for a description of this field.  When updating a sink, the effect of this
@@ -361,7 +482,7 @@ type UpdateSinkRequest struct {
 	//     `writer_identity` is changed to a unique service account.
 	// +   It is an error if the old value is true and the new value is
 	//     set to false or defaulted to false.
-	UniqueWriterIdentity bool `protobuf:"varint,3,opt,name=unique_writer_identity,json=uniqueWriterIdentity" json:"unique_writer_identity,omitempty"`
+	UniqueWriterIdentity bool `protobuf:"varint,3,opt,name=unique_writer_identity,json=uniqueWriterIdentity,proto3" json:"unique_writer_identity,omitempty"`
 	// Optional. Field mask that specifies the fields in `sink` that need
 	// an update. A sink field will be overwritten if, and only if, it is
 	// in the update mask.  `name` and output only fields cannot be updated.
@@ -376,13 +497,35 @@ type UpdateSinkRequest struct {
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
 	//
 	// Example: `updateMask=filter`.
-	UpdateMask *google_protobuf6.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateSinkRequest) Reset()         { *m = UpdateSinkRequest{} }
+func (m *UpdateSinkRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateSinkRequest) ProtoMessage()    {}
+func (*UpdateSinkRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{5}
+}
+func (m *UpdateSinkRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateSinkRequest.Unmarshal(m, b)
+}
+func (m *UpdateSinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateSinkRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateSinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSinkRequest.Merge(dst, src)
+}
+func (m *UpdateSinkRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateSinkRequest.Size(m)
+}
+func (m *UpdateSinkRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateSinkRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateSinkRequest) Reset()                    { *m = UpdateSinkRequest{} }
-func (m *UpdateSinkRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateSinkRequest) ProtoMessage()               {}
-func (*UpdateSinkRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_UpdateSinkRequest proto.InternalMessageInfo
 
 func (m *UpdateSinkRequest) GetSinkName() string {
 	if m != nil {
@@ -405,7 +548,7 @@ func (m *UpdateSinkRequest) GetUniqueWriterIdentity() bool {
 	return false
 }
 
-func (m *UpdateSinkRequest) GetUpdateMask() *google_protobuf6.FieldMask {
+func (m *UpdateSinkRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -423,13 +566,35 @@ type DeleteSinkRequest struct {
 	//     "folders/[FOLDER_ID]/sinks/[SINK_ID]"
 	//
 	// Example: `"projects/my-project-id/sinks/my-sink-id"`.
-	SinkName string `protobuf:"bytes,1,opt,name=sink_name,json=sinkName" json:"sink_name,omitempty"`
+	SinkName             string   `protobuf:"bytes,1,opt,name=sink_name,json=sinkName,proto3" json:"sink_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSinkRequest) Reset()         { *m = DeleteSinkRequest{} }
+func (m *DeleteSinkRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSinkRequest) ProtoMessage()    {}
+func (*DeleteSinkRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{6}
+}
+func (m *DeleteSinkRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSinkRequest.Unmarshal(m, b)
+}
+func (m *DeleteSinkRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSinkRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSinkRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSinkRequest.Merge(dst, src)
+}
+func (m *DeleteSinkRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSinkRequest.Size(m)
+}
+func (m *DeleteSinkRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSinkRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteSinkRequest) Reset()                    { *m = DeleteSinkRequest{} }
-func (m *DeleteSinkRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSinkRequest) ProtoMessage()               {}
-func (*DeleteSinkRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+var xxx_messageInfo_DeleteSinkRequest proto.InternalMessageInfo
 
 func (m *DeleteSinkRequest) GetSinkName() string {
 	if m != nil {
@@ -448,9 +613,9 @@ type LogExclusion struct {
 	// Required. A client-assigned identifier, such as
 	// `"load-balancer-exclusion"`. Identifiers are limited to 100 characters and
 	// can include only letters, digits, underscores, hyphens, and periods.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. A description of this exclusion.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Required.
 	// An [advanced logs filter](/logging/docs/view/advanced_filters)
 	// that matches the log entries to be excluded. By using the
@@ -459,19 +624,41 @@ type LogExclusion struct {
 	// For example, the following filter matches 99% of low-severity log
 	// entries from load balancers:
 	//
-	//     "resource.type=http_load_balancer severity<ERROR sample(insertId, 0.99)"
-	Filter string `protobuf:"bytes,3,opt,name=filter" json:"filter,omitempty"`
+	// `"resource.type=http_load_balancer severity<ERROR sample(insertId, 0.99)"`
+	Filter string `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Optional. If set to True, then this exclusion is disabled and it does not
 	// exclude any log entries. You can use
-	// [exclusions.patch](/logging/docs/alpha-exclusion/docs/reference/v2/rest/v2/projects.exclusions/patch)
+	// [exclusions.patch](/logging/docs/reference/v2/rest/v2/projects.exclusions/patch)
 	// to change the value of this field.
-	Disabled bool `protobuf:"varint,4,opt,name=disabled" json:"disabled,omitempty"`
+	Disabled             bool     `protobuf:"varint,4,opt,name=disabled,proto3" json:"disabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *LogExclusion) Reset()                    { *m = LogExclusion{} }
-func (m *LogExclusion) String() string            { return proto.CompactTextString(m) }
-func (*LogExclusion) ProtoMessage()               {}
-func (*LogExclusion) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+func (m *LogExclusion) Reset()         { *m = LogExclusion{} }
+func (m *LogExclusion) String() string { return proto.CompactTextString(m) }
+func (*LogExclusion) ProtoMessage()    {}
+func (*LogExclusion) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{7}
+}
+func (m *LogExclusion) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogExclusion.Unmarshal(m, b)
+}
+func (m *LogExclusion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogExclusion.Marshal(b, m, deterministic)
+}
+func (dst *LogExclusion) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogExclusion.Merge(dst, src)
+}
+func (m *LogExclusion) XXX_Size() int {
+	return xxx_messageInfo_LogExclusion.Size(m)
+}
+func (m *LogExclusion) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogExclusion.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LogExclusion proto.InternalMessageInfo
 
 func (m *LogExclusion) GetName() string {
 	if m != nil {
@@ -509,22 +696,44 @@ type ListExclusionsRequest struct {
 	//     "organizations/[ORGANIZATION_ID]"
 	//     "billingAccounts/[BILLING_ACCOUNT_ID]"
 	//     "folders/[FOLDER_ID]"
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. If present, then retrieve the next batch of results from the
 	// preceding call to this method.  `pageToken` must be the value of
 	// `nextPageToken` from the previous response.  The values of other method
 	// parameters should be identical to those in the previous call.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional. The maximum number of results to return from this request.
 	// Non-positive values are ignored.  The presence of `nextPageToken` in the
 	// response indicates that more results might be available.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListExclusionsRequest) Reset()         { *m = ListExclusionsRequest{} }
+func (m *ListExclusionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListExclusionsRequest) ProtoMessage()    {}
+func (*ListExclusionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{8}
+}
+func (m *ListExclusionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListExclusionsRequest.Unmarshal(m, b)
+}
+func (m *ListExclusionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListExclusionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListExclusionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListExclusionsRequest.Merge(dst, src)
+}
+func (m *ListExclusionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListExclusionsRequest.Size(m)
+}
+func (m *ListExclusionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListExclusionsRequest.DiscardUnknown(m)
 }
 
-func (m *ListExclusionsRequest) Reset()                    { *m = ListExclusionsRequest{} }
-func (m *ListExclusionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListExclusionsRequest) ProtoMessage()               {}
-func (*ListExclusionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+var xxx_messageInfo_ListExclusionsRequest proto.InternalMessageInfo
 
 func (m *ListExclusionsRequest) GetParent() string {
 	if m != nil {
@@ -550,17 +759,39 @@ func (m *ListExclusionsRequest) GetPageSize() int32 {
 // Result returned from `ListExclusions`.
 type ListExclusionsResponse struct {
 	// A list of exclusions.
-	Exclusions []*LogExclusion `protobuf:"bytes,1,rep,name=exclusions" json:"exclusions,omitempty"`
+	Exclusions []*LogExclusion `protobuf:"bytes,1,rep,name=exclusions,proto3" json:"exclusions,omitempty"`
 	// If there might be more results than appear in this response, then
 	// `nextPageToken` is included.  To get the next set of results, call the same
 	// method again using the value of `nextPageToken` as `pageToken`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListExclusionsResponse) Reset()                    { *m = ListExclusionsResponse{} }
-func (m *ListExclusionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListExclusionsResponse) ProtoMessage()               {}
-func (*ListExclusionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+func (m *ListExclusionsResponse) Reset()         { *m = ListExclusionsResponse{} }
+func (m *ListExclusionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListExclusionsResponse) ProtoMessage()    {}
+func (*ListExclusionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{9}
+}
+func (m *ListExclusionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListExclusionsResponse.Unmarshal(m, b)
+}
+func (m *ListExclusionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListExclusionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListExclusionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListExclusionsResponse.Merge(dst, src)
+}
+func (m *ListExclusionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListExclusionsResponse.Size(m)
+}
+func (m *ListExclusionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListExclusionsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListExclusionsResponse proto.InternalMessageInfo
 
 func (m *ListExclusionsResponse) GetExclusions() []*LogExclusion {
 	if m != nil {
@@ -586,13 +817,35 @@ type GetExclusionRequest struct {
 	//     "folders/[FOLDER_ID]/exclusions/[EXCLUSION_ID]"
 	//
 	// Example: `"projects/my-project-id/exclusions/my-exclusion-id"`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetExclusionRequest) Reset()         { *m = GetExclusionRequest{} }
+func (m *GetExclusionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetExclusionRequest) ProtoMessage()    {}
+func (*GetExclusionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{10}
+}
+func (m *GetExclusionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetExclusionRequest.Unmarshal(m, b)
+}
+func (m *GetExclusionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetExclusionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetExclusionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetExclusionRequest.Merge(dst, src)
+}
+func (m *GetExclusionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetExclusionRequest.Size(m)
+}
+func (m *GetExclusionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetExclusionRequest.DiscardUnknown(m)
 }
 
-func (m *GetExclusionRequest) Reset()                    { *m = GetExclusionRequest{} }
-func (m *GetExclusionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetExclusionRequest) ProtoMessage()               {}
-func (*GetExclusionRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} }
+var xxx_messageInfo_GetExclusionRequest proto.InternalMessageInfo
 
 func (m *GetExclusionRequest) GetName() string {
 	if m != nil {
@@ -611,16 +864,38 @@ type CreateExclusionRequest struct {
 	//     "folders/[FOLDER_ID]"
 	//
 	// Examples: `"projects/my-logging-project"`, `"organizations/123456789"`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The new exclusion, whose `name` parameter is an exclusion name
 	// that is not already used in the parent resource.
-	Exclusion *LogExclusion `protobuf:"bytes,2,opt,name=exclusion" json:"exclusion,omitempty"`
+	Exclusion            *LogExclusion `protobuf:"bytes,2,opt,name=exclusion,proto3" json:"exclusion,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *CreateExclusionRequest) Reset()                    { *m = CreateExclusionRequest{} }
-func (m *CreateExclusionRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateExclusionRequest) ProtoMessage()               {}
-func (*CreateExclusionRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} }
+func (m *CreateExclusionRequest) Reset()         { *m = CreateExclusionRequest{} }
+func (m *CreateExclusionRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateExclusionRequest) ProtoMessage()    {}
+func (*CreateExclusionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{11}
+}
+func (m *CreateExclusionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateExclusionRequest.Unmarshal(m, b)
+}
+func (m *CreateExclusionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateExclusionRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateExclusionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateExclusionRequest.Merge(dst, src)
+}
+func (m *CreateExclusionRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateExclusionRequest.Size(m)
+}
+func (m *CreateExclusionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateExclusionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateExclusionRequest proto.InternalMessageInfo
 
 func (m *CreateExclusionRequest) GetParent() string {
 	if m != nil {
@@ -646,10 +921,10 @@ type UpdateExclusionRequest struct {
 	//     "folders/[FOLDER_ID]/exclusions/[EXCLUSION_ID]"
 	//
 	// Example: `"projects/my-project-id/exclusions/my-exclusion-id"`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. New values for the existing exclusion. Only the fields specified
 	// in `update_mask` are relevant.
-	Exclusion *LogExclusion `protobuf:"bytes,2,opt,name=exclusion" json:"exclusion,omitempty"`
+	Exclusion *LogExclusion `protobuf:"bytes,2,opt,name=exclusion,proto3" json:"exclusion,omitempty"`
 	// Required. A nonempty list of fields to change in the existing exclusion.
 	// New values for the fields are taken from the corresponding fields in the
 	// [LogExclusion][google.logging.v2.LogExclusion] included in this request. Fields not mentioned in
@@ -657,13 +932,35 @@ type UpdateExclusionRequest struct {
 	//
 	// For example, to change the filter and description of an exclusion,
 	// specify an `update_mask` of `"filter,description"`.
-	UpdateMask *google_protobuf6.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateExclusionRequest) Reset()         { *m = UpdateExclusionRequest{} }
+func (m *UpdateExclusionRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateExclusionRequest) ProtoMessage()    {}
+func (*UpdateExclusionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{12}
+}
+func (m *UpdateExclusionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateExclusionRequest.Unmarshal(m, b)
+}
+func (m *UpdateExclusionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateExclusionRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateExclusionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateExclusionRequest.Merge(dst, src)
+}
+func (m *UpdateExclusionRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateExclusionRequest.Size(m)
+}
+func (m *UpdateExclusionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateExclusionRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateExclusionRequest) Reset()                    { *m = UpdateExclusionRequest{} }
-func (m *UpdateExclusionRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateExclusionRequest) ProtoMessage()               {}
-func (*UpdateExclusionRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{12} }
+var xxx_messageInfo_UpdateExclusionRequest proto.InternalMessageInfo
 
 func (m *UpdateExclusionRequest) GetName() string {
 	if m != nil {
@@ -679,7 +976,7 @@ func (m *UpdateExclusionRequest) GetExclusion() *LogExclusion {
 	return nil
 }
 
-func (m *UpdateExclusionRequest) GetUpdateMask() *google_protobuf6.FieldMask {
+func (m *UpdateExclusionRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -696,13 +993,35 @@ type DeleteExclusionRequest struct {
 	//     "folders/[FOLDER_ID]/exclusions/[EXCLUSION_ID]"
 	//
 	// Example: `"projects/my-project-id/exclusions/my-exclusion-id"`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteExclusionRequest) Reset()                    { *m = DeleteExclusionRequest{} }
-func (m *DeleteExclusionRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteExclusionRequest) ProtoMessage()               {}
-func (*DeleteExclusionRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{13} }
+func (m *DeleteExclusionRequest) Reset()         { *m = DeleteExclusionRequest{} }
+func (m *DeleteExclusionRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteExclusionRequest) ProtoMessage()    {}
+func (*DeleteExclusionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_config_128af3bb0cbc957f, []int{13}
+}
+func (m *DeleteExclusionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteExclusionRequest.Unmarshal(m, b)
+}
+func (m *DeleteExclusionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteExclusionRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteExclusionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteExclusionRequest.Merge(dst, src)
+}
+func (m *DeleteExclusionRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteExclusionRequest.Size(m)
+}
+func (m *DeleteExclusionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteExclusionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteExclusionRequest proto.InternalMessageInfo
 
 func (m *DeleteExclusionRequest) GetName() string {
 	if m != nil {
@@ -737,8 +1056,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ConfigServiceV2 service
-
+// ConfigServiceV2Client is the client API for ConfigServiceV2 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ConfigServiceV2Client interface {
 	// Lists sinks.
 	ListSinks(ctx context.Context, in *ListSinksRequest, opts ...grpc.CallOption) (*ListSinksResponse, error)
@@ -756,7 +1076,7 @@ type ConfigServiceV2Client interface {
 	UpdateSink(ctx context.Context, in *UpdateSinkRequest, opts ...grpc.CallOption) (*LogSink, error)
 	// Deletes a sink. If the sink has a unique `writer_identity`, then that
 	// service account is also deleted.
-	DeleteSink(ctx context.Context, in *DeleteSinkRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error)
+	DeleteSink(ctx context.Context, in *DeleteSinkRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Lists all the exclusions in a parent resource.
 	ListExclusions(ctx context.Context, in *ListExclusionsRequest, opts ...grpc.CallOption) (*ListExclusionsResponse, error)
 	// Gets the description of an exclusion.
@@ -768,7 +1088,7 @@ type ConfigServiceV2Client interface {
 	// Changes one or more properties of an existing exclusion.
 	UpdateExclusion(ctx context.Context, in *UpdateExclusionRequest, opts ...grpc.CallOption) (*LogExclusion, error)
 	// Deletes an exclusion.
-	DeleteExclusion(ctx context.Context, in *DeleteExclusionRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error)
+	DeleteExclusion(ctx context.Context, in *DeleteExclusionRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type configServiceV2Client struct {
@@ -781,7 +1101,7 @@ func NewConfigServiceV2Client(cc *grpc.ClientConn) ConfigServiceV2Client {
 
 func (c *configServiceV2Client) ListSinks(ctx context.Context, in *ListSinksRequest, opts ...grpc.CallOption) (*ListSinksResponse, error) {
 	out := new(ListSinksResponse)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/ListSinks", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/ListSinks", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -790,7 +1110,7 @@ func (c *configServiceV2Client) ListSinks(ctx context.Context, in *ListSinksRequ
 
 func (c *configServiceV2Client) GetSink(ctx context.Context, in *GetSinkRequest, opts ...grpc.CallOption) (*LogSink, error) {
 	out := new(LogSink)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/GetSink", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/GetSink", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -799,7 +1119,7 @@ func (c *configServiceV2Client) GetSink(ctx context.Context, in *GetSinkRequest,
 
 func (c *configServiceV2Client) CreateSink(ctx context.Context, in *CreateSinkRequest, opts ...grpc.CallOption) (*LogSink, error) {
 	out := new(LogSink)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/CreateSink", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/CreateSink", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -808,16 +1128,16 @@ func (c *configServiceV2Client) CreateSink(ctx context.Context, in *CreateSinkRe
 
 func (c *configServiceV2Client) UpdateSink(ctx context.Context, in *UpdateSinkRequest, opts ...grpc.CallOption) (*LogSink, error) {
 	out := new(LogSink)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/UpdateSink", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/UpdateSink", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *configServiceV2Client) DeleteSink(ctx context.Context, in *DeleteSinkRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error) {
-	out := new(google_protobuf5.Empty)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/DeleteSink", in, out, c.cc, opts...)
+func (c *configServiceV2Client) DeleteSink(ctx context.Context, in *DeleteSinkRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/DeleteSink", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -826,7 +1146,7 @@ func (c *configServiceV2Client) DeleteSink(ctx context.Context, in *DeleteSinkRe
 
 func (c *configServiceV2Client) ListExclusions(ctx context.Context, in *ListExclusionsRequest, opts ...grpc.CallOption) (*ListExclusionsResponse, error) {
 	out := new(ListExclusionsResponse)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/ListExclusions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/ListExclusions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -835,7 +1155,7 @@ func (c *configServiceV2Client) ListExclusions(ctx context.Context, in *ListExcl
 
 func (c *configServiceV2Client) GetExclusion(ctx context.Context, in *GetExclusionRequest, opts ...grpc.CallOption) (*LogExclusion, error) {
 	out := new(LogExclusion)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/GetExclusion", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/GetExclusion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -844,7 +1164,7 @@ func (c *configServiceV2Client) GetExclusion(ctx context.Context, in *GetExclusi
 
 func (c *configServiceV2Client) CreateExclusion(ctx context.Context, in *CreateExclusionRequest, opts ...grpc.CallOption) (*LogExclusion, error) {
 	out := new(LogExclusion)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/CreateExclusion", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/CreateExclusion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -853,24 +1173,23 @@ func (c *configServiceV2Client) CreateExclusion(ctx context.Context, in *CreateE
 
 func (c *configServiceV2Client) UpdateExclusion(ctx context.Context, in *UpdateExclusionRequest, opts ...grpc.CallOption) (*LogExclusion, error) {
 	out := new(LogExclusion)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/UpdateExclusion", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/UpdateExclusion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *configServiceV2Client) DeleteExclusion(ctx context.Context, in *DeleteExclusionRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error) {
-	out := new(google_protobuf5.Empty)
-	err := grpc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/DeleteExclusion", in, out, c.cc, opts...)
+func (c *configServiceV2Client) DeleteExclusion(ctx context.Context, in *DeleteExclusionRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.ConfigServiceV2/DeleteExclusion", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for ConfigServiceV2 service
-
+// ConfigServiceV2Server is the server API for ConfigServiceV2 service.
 type ConfigServiceV2Server interface {
 	// Lists sinks.
 	ListSinks(context.Context, *ListSinksRequest) (*ListSinksResponse, error)
@@ -888,7 +1207,7 @@ type ConfigServiceV2Server interface {
 	UpdateSink(context.Context, *UpdateSinkRequest) (*LogSink, error)
 	// Deletes a sink. If the sink has a unique `writer_identity`, then that
 	// service account is also deleted.
-	DeleteSink(context.Context, *DeleteSinkRequest) (*google_protobuf5.Empty, error)
+	DeleteSink(context.Context, *DeleteSinkRequest) (*empty.Empty, error)
 	// Lists all the exclusions in a parent resource.
 	ListExclusions(context.Context, *ListExclusionsRequest) (*ListExclusionsResponse, error)
 	// Gets the description of an exclusion.
@@ -900,7 +1219,7 @@ type ConfigServiceV2Server interface {
 	// Changes one or more properties of an existing exclusion.
 	UpdateExclusion(context.Context, *UpdateExclusionRequest) (*LogExclusion, error)
 	// Deletes an exclusion.
-	DeleteExclusion(context.Context, *DeleteExclusionRequest) (*google_protobuf5.Empty, error)
+	DeleteExclusion(context.Context, *DeleteExclusionRequest) (*empty.Empty, error)
 }
 
 func RegisterConfigServiceV2Server(s *grpc.Server, srv ConfigServiceV2Server) {
@@ -1136,78 +1455,101 @@ var _ConfigServiceV2_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/logging/v2/logging_config.proto",
 }
 
-func init() { proto.RegisterFile("google/logging/v2/logging_config.proto", fileDescriptor2) }
-
-var fileDescriptor2 = []byte{
-	// 1118 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5d, 0x6f, 0xdb, 0xd4,
-	0x1b, 0xff, 0x3b, 0xe9, 0x4b, 0xf2, 0x74, 0x6b, 0xda, 0xb3, 0x7f, 0x83, 0xe5, 0xb2, 0x2e, 0xb8,
-	0x53, 0x49, 0x2b, 0x70, 0x46, 0x00, 0x09, 0x36, 0x4d, 0x13, 0xeb, 0xda, 0xaa, 0x52, 0xd7, 0x55,
-	0x6e, 0x17, 0x24, 0x54, 0xc9, 0x72, 0xe3, 0x13, 0x73, 0x54, 0xc7, 0xf6, 0xec, 0x93, 0xd2, 0x0e,
-	0x26, 0x01, 0x97, 0x48, 0x5c, 0x20, 0xee, 0xb9, 0x46, 0x7c, 0x06, 0x3e, 0x01, 0xb7, 0xfb, 0x0a,
-	0x7c, 0x08, 0x2e, 0xd1, 0x79, 0x49, 0xe2, 0x38, 0x8e, 0x9b, 0x09, 0xc1, 0x55, 0xcf, 0x79, 0x5e,
-	0xce, 0xef, 0xf7, 0x3c, 0xe7, 0x39, 0xbf, 0x3a, 0xb0, 0xe1, 0x06, 0x81, 0xeb, 0xe1, 0x86, 0x17,
-	0xb8, 0x2e, 0xf1, 0xdd, 0xc6, 0x45, 0xb3, 0xbf, 0xb4, 0xda, 0x81, 0xdf, 0x21, 0xae, 0x11, 0x46,
-	0x01, 0x0d, 0xd0, 0xb2, 0x88, 0x33, 0xa4, 0xd3, 0xb8, 0x68, 0x6a, 0x6f, 0xcb, 0x54, 0x3b, 0x24,
-	0x0d, 0xdb, 0xf7, 0x03, 0x6a, 0x53, 0x12, 0xf8, 0xb1, 0x48, 0xd0, 0x56, 0xa5, 0x97, 0xef, 0xce,
-	0x7a, 0x9d, 0x06, 0xee, 0x86, 0xf4, 0x4a, 0x3a, 0x6b, 0x69, 0x67, 0x87, 0x60, 0xcf, 0xb1, 0xba,
-	0x76, 0x7c, 0x2e, 0x23, 0xee, 0xa4, 0x23, 0x28, 0xe9, 0xe2, 0x98, 0xda, 0xdd, 0x50, 0x04, 0xe8,
-	0xbf, 0x17, 0x61, 0xfe, 0x20, 0x70, 0x8f, 0x89, 0x7f, 0x8e, 0x10, 0xcc, 0xf8, 0x76, 0x17, 0xab,
-	0x4a, 0x4d, 0xa9, 0x97, 0x4d, 0xbe, 0x46, 0x35, 0x58, 0x70, 0x70, 0x4c, 0x89, 0xcf, 0x59, 0xa9,
-	0x45, 0xee, 0x4a, 0x9a, 0x50, 0x15, 0xe6, 0x3a, 0xc4, 0xa3, 0x38, 0x52, 0x67, 0xb9, 0x53, 0xee,
-	0xd0, 0x29, 0xac, 0x04, 0x3d, 0x1a, 0xf6, 0xa8, 0x75, 0x81, 0xa3, 0x98, 0x04, 0xbe, 0xd5, 0x09,
-	0xa2, 0xae, 0x4d, 0xd5, 0xb9, 0x9a, 0x52, 0x5f, 0x6c, 0xd6, 0x8d, 0xb1, 0x56, 0x18, 0x92, 0x88,
-	0xd1, 0x12, 0x09, 0xbb, 0x3c, 0xde, 0xbc, 0x25, 0x8e, 0x19, 0x31, 0xa2, 0x77, 0xa1, 0xf2, 0x55,
-	0x44, 0x28, 0x8e, 0x2c, 0xe2, 0x60, 0x9f, 0x12, 0x7a, 0xa5, 0x96, 0x38, 0xfc, 0xa2, 0x30, 0xef,
-	0x4b, 0x2b, 0xda, 0x84, 0x25, 0xe2, 0xb7, 0xbd, 0x9e, 0x83, 0xad, 0xf6, 0x97, 0xc4, 0x73, 0x22,
-	0xec, 0xab, 0xe5, 0x9a, 0x52, 0x2f, 0x99, 0x15, 0x69, 0xdf, 0x96, 0x66, 0xf4, 0x29, 0x40, 0x4c,
-	0xed, 0x88, 0x5a, 0xac, 0x49, 0x2a, 0xd4, 0x94, 0xfa, 0x42, 0x53, 0xeb, 0xd3, 0xec, 0x77, 0xd0,
-	0x38, 0xe9, 0x77, 0xd0, 0x2c, 0xf3, 0x68, 0xb6, 0x47, 0x1f, 0x43, 0x09, 0xfb, 0x8e, 0x48, 0x5c,
-	0xb8, 0x36, 0x71, 0x1e, 0xfb, 0x0e, 0xdb, 0xe9, 0x8f, 0xe0, 0xe6, 0x68, 0x59, 0x6b, 0xa0, 0xb5,
-	0x76, 0xcc, 0xe3, 0xfd, 0x67, 0x87, 0xd6, 0xee, 0x33, 0xf3, 0xe9, 0x67, 0x27, 0xd6, 0xf3, 0xc3,
-	0xe3, 0xa3, 0x9d, 0xed, 0xfd, 0xdd, 0xfd, 0x9d, 0x27, 0x4b, 0xff, 0x43, 0x73, 0x50, 0x68, 0x35,
-	0x97, 0x14, 0xfe, 0xf7, 0x83, 0xa5, 0x82, 0xde, 0x81, 0xa5, 0x03, 0x12, 0x53, 0xd6, 0xb5, 0xd8,
-	0xc4, 0x2f, 0x7a, 0x38, 0xa6, 0xec, 0x42, 0x42, 0x3b, 0xc2, 0x3e, 0x95, 0x17, 0x29, 0x77, 0xe8,
-	0x36, 0x40, 0x68, 0xbb, 0xd8, 0xa2, 0xc1, 0x39, 0xf6, 0xd5, 0x02, 0xf7, 0x95, 0x99, 0xe5, 0x84,
-	0x19, 0xd0, 0x2a, 0xf0, 0x8d, 0x15, 0x93, 0x97, 0x98, 0xdf, 0xf3, 0xac, 0x59, 0x62, 0x86, 0x63,
-	0xf2, 0x12, 0xeb, 0x5d, 0x58, 0x4e, 0xe0, 0xc4, 0x61, 0xe0, 0xc7, 0x18, 0xdd, 0x83, 0xd9, 0x98,
-	0x19, 0x54, 0xa5, 0x56, 0x4c, 0x56, 0x3c, 0x7e, 0xa3, 0xa6, 0x08, 0x44, 0x1b, 0x50, 0xf1, 0xf1,
-	0x25, 0xb5, 0xc6, 0x78, 0xdc, 0x64, 0xe6, 0xa3, 0x3e, 0x17, 0xfd, 0x7d, 0x58, 0xdc, 0xc3, 0x1c,
-	0xad, 0x5f, 0xd4, 0x2a, 0x94, 0xd9, 0x11, 0x56, 0x62, 0x40, 0x4b, 0xcc, 0x70, 0x68, 0x77, 0xb1,
-	0xfe, 0x93, 0x02, 0xcb, 0xdb, 0x11, 0xb6, 0x29, 0x4e, 0xa6, 0x4c, 0xea, 0x83, 0x01, 0x33, 0x2c,
-	0x93, 0x23, 0xe7, 0xb3, 0xe6, 0x71, 0xe8, 0x23, 0xa8, 0xf6, 0x7c, 0xf2, 0xa2, 0x87, 0xad, 0xf4,
-	0xc4, 0x15, 0xf9, 0x1c, 0xfd, 0x5f, 0x78, 0x3f, 0x1f, 0x99, 0x3b, 0xfd, 0xb5, 0x02, 0xcb, 0xcf,
-	0x43, 0x27, 0xc5, 0x29, 0xaf, 0x8c, 0xff, 0x86, 0x18, 0x7a, 0x00, 0x0b, 0x3d, 0xce, 0x8b, 0xeb,
-	0x84, 0x3a, 0x33, 0x61, 0x5a, 0x77, 0x99, 0x94, 0x3c, 0xb5, 0xe3, 0x73, 0x13, 0x44, 0x38, 0x5b,
-	0xeb, 0xf7, 0x60, 0xf9, 0x09, 0xf6, 0xf0, 0xf4, 0x45, 0xe9, 0x97, 0x70, 0xe3, 0x20, 0x70, 0x77,
-	0x2e, 0xdb, 0x5e, 0x8f, 0xcd, 0x79, 0x8e, 0xc8, 0xb4, 0x23, 0x12, 0x72, 0x91, 0x29, 0x0c, 0x44,
-	0xa6, 0x6f, 0x4a, 0x88, 0x4c, 0x71, 0x44, 0x64, 0x34, 0x28, 0x39, 0x24, 0xb6, 0xcf, 0x3c, 0xec,
-	0xf0, 0x4a, 0x4a, 0xe6, 0x60, 0xaf, 0x9f, 0xc3, 0x0a, 0x9b, 0xd9, 0x01, 0xf4, 0xbf, 0xfa, 0x40,
-	0xbe, 0x53, 0xa0, 0x9a, 0x46, 0x93, 0xcf, 0xe4, 0x11, 0x00, 0x1e, 0x58, 0xe5, 0x5b, 0xb9, 0x93,
-	0x7d, 0xb9, 0x83, 0x6c, 0x33, 0x91, 0x32, 0xf5, 0xab, 0xd9, 0x84, 0x5b, 0x7b, 0x78, 0xc8, 0xa0,
-	0x5f, 0x6e, 0x46, 0xc7, 0xf5, 0x00, 0xaa, 0xe2, 0xc1, 0x8c, 0x45, 0x4f, 0x6a, 0xce, 0x43, 0x28,
-	0x0f, 0x28, 0xc9, 0x09, 0xbd, 0xb6, 0x88, 0x61, 0x86, 0xfe, 0xab, 0x02, 0x55, 0xf1, 0x1c, 0xa6,
-	0xe1, 0xf7, 0x0f, 0xd1, 0xd2, 0x33, 0x5e, 0x7c, 0xa3, 0x19, 0x7f, 0x0f, 0xaa, 0x62, 0xc6, 0xa7,
-	0x61, 0xda, 0xfc, 0x16, 0xa0, 0xb2, 0xcd, 0xff, 0xc5, 0x1f, 0xe3, 0xe8, 0x82, 0xb4, 0x71, 0xab,
-	0x89, 0x2e, 0xa0, 0x3c, 0x50, 0x4b, 0xb4, 0x9e, 0xc5, 0x3b, 0xa5, 0xd9, 0xda, 0xdd, 0xfc, 0x20,
-	0x31, 0x49, 0xfa, 0xda, 0xf7, 0xaf, 0xff, 0xfc, 0xb9, 0xa0, 0xa2, 0x2a, 0xfb, 0xbe, 0xf8, 0x5a,
-	0x5c, 0xcc, 0xc3, 0xad, 0xc6, 0xd6, 0xab, 0x86, 0x90, 0xd7, 0x2e, 0xcc, 0x4b, 0xd9, 0x44, 0xef,
-	0x64, 0x1c, 0x38, 0x2a, 0xa9, 0x5a, 0x8e, 0xc0, 0xe8, 0xeb, 0x1c, 0xe9, 0x36, 0x5a, 0xe5, 0x48,
-	0x83, 0xd7, 0xcd, 0xc0, 0x04, 0x56, 0x63, 0xeb, 0x15, 0xa2, 0x00, 0x43, 0xd5, 0x45, 0x59, 0x25,
-	0x8c, 0x89, 0x72, 0x2e, 0xe8, 0x5d, 0x0e, 0xba, 0xa6, 0x4f, 0x28, 0xef, 0xbe, 0x50, 0xbd, 0x2b,
-	0x80, 0xa1, 0xae, 0x66, 0xa2, 0x8e, 0xc9, 0x6e, 0x2e, 0xea, 0x26, 0x47, 0x5d, 0xd7, 0xf2, 0x4a,
-	0x95, 0xd0, 0x01, 0xc0, 0x50, 0xfd, 0x32, 0xa1, 0xc7, 0xc4, 0x51, 0xab, 0x8e, 0x4d, 0xdd, 0x0e,
-	0xfb, 0x82, 0xeb, 0x77, 0x78, 0x2b, 0xb7, 0xc3, 0x3f, 0x28, 0xb0, 0x38, 0xaa, 0x2a, 0xa8, 0x3e,
-	0x61, 0x52, 0xc6, 0x64, 0x4e, 0xdb, 0x9c, 0x22, 0x52, 0x0e, 0xd6, 0xe8, 0x75, 0x27, 0x3b, 0x9f,
-	0x90, 0xa1, 0x6f, 0xe0, 0x46, 0x52, 0x5e, 0xd0, 0x46, 0xf6, 0x88, 0xa5, 0x5f, 0x8d, 0x76, 0xdd,
-	0xc3, 0x4d, 0xa1, 0x0f, 0xba, 0x30, 0x84, 0x66, 0xad, 0xf8, 0x51, 0x81, 0x4a, 0x4a, 0xb2, 0xd0,
-	0xe6, 0xc4, 0x91, 0x7b, 0x73, 0x12, 0x06, 0x27, 0x51, 0xd7, 0xf3, 0x5a, 0x70, 0x3f, 0x21, 0x31,
-	0x8c, 0x4f, 0x4a, 0xd0, 0x32, 0xf9, 0x64, 0x8b, 0xde, 0xd4, 0x7c, 0x9a, 0x79, 0x4d, 0x49, 0xf2,
-	0xb9, 0x82, 0x4a, 0x4a, 0xb5, 0x32, 0xe9, 0x64, 0x2b, 0xdb, 0x94, 0x53, 0x9a, 0xcd, 0xe2, 0xf1,
-	0x2f, 0x0a, 0xac, 0xb4, 0x83, 0xee, 0x38, 0xda, 0x63, 0x74, 0x20, 0xd6, 0x42, 0x20, 0x8f, 0xd8,
-	0xd9, 0x47, 0xca, 0x17, 0x9f, 0xc8, 0x40, 0x37, 0xf0, 0x6c, 0xdf, 0x35, 0x82, 0xc8, 0x6d, 0xb8,
-	0xd8, 0xe7, 0xc8, 0x0d, 0xe1, 0xb2, 0x43, 0x12, 0x27, 0x7e, 0x4b, 0x3d, 0x90, 0xcb, 0xbf, 0x14,
-	0xe5, 0xb7, 0xc2, 0x5b, 0x7b, 0x22, 0x7b, 0xdb, 0x0b, 0x7a, 0x8e, 0x21, 0x01, 0x8c, 0x56, 0xf3,
-	0x8f, 0xbe, 0xe7, 0x94, 0x7b, 0x4e, 0xa5, 0xe7, 0xb4, 0xd5, 0x3c, 0x9b, 0xe3, 0x67, 0x7f, 0xf8,
-	0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x67, 0x9c, 0x61, 0x2f, 0xa6, 0x0d, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/logging/v2/logging_config.proto", fileDescriptor_logging_config_128af3bb0cbc957f)
+}
+
+var fileDescriptor_logging_config_128af3bb0cbc957f = []byte{
+	// 1446 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0xdc, 0x44,
+	0x14, 0xc6, 0xde, 0x36, 0xcd, 0xbe, 0xb4, 0xf9, 0x31, 0xa5, 0xcb, 0xe2, 0xf4, 0xc7, 0xd6, 0x0d,
+	0x69, 0x76, 0x29, 0xbb, 0xad, 0xa9, 0x10, 0xb4, 0xaa, 0xaa, 0x36, 0x4d, 0xaa, 0x48, 0x69, 0x1b,
+	0x6d, 0xda, 0x20, 0x45, 0x95, 0x8c, 0xb3, 0x3b, 0x6b, 0x86, 0x78, 0xed, 0xad, 0xed, 0x0d, 0x6d,
+	0x51, 0x0f, 0x70, 0xe1, 0x0c, 0xf4, 0xc2, 0x81, 0x0a, 0x4e, 0x20, 0x0e, 0xf0, 0x2f, 0x70, 0x41,
+	0x20, 0xc4, 0xad, 0x77, 0x4e, 0xfc, 0x03, 0x9c, 0xe0, 0x84, 0x90, 0xc7, 0xe3, 0xf5, 0xd8, 0xeb,
+	0x75, 0x66, 0x85, 0xe0, 0x54, 0xfb, 0xbd, 0xef, 0xed, 0xbc, 0xf9, 0xfc, 0xcd, 0x37, 0x2f, 0x85,
+	0x45, 0xd3, 0x71, 0x4c, 0x0b, 0x37, 0x2c, 0xc7, 0x34, 0x89, 0x6d, 0x36, 0xf6, 0xb4, 0xe8, 0x51,
+	0x6f, 0x39, 0x76, 0x87, 0x98, 0xf5, 0x9e, 0xeb, 0xf8, 0x0e, 0x9a, 0x0b, 0x71, 0x75, 0x96, 0xac,
+	0xef, 0x69, 0xca, 0x71, 0x56, 0x6a, 0xf4, 0x48, 0xc3, 0xb0, 0x6d, 0xc7, 0x37, 0x7c, 0xe2, 0xd8,
+	0x5e, 0x58, 0xa0, 0xcc, 0xb3, 0x2c, 0x7d, 0xdb, 0xe9, 0x77, 0x1a, 0xb8, 0xdb, 0xf3, 0x1f, 0xb1,
+	0x64, 0x25, 0x9d, 0xec, 0x10, 0x6c, 0xb5, 0xf5, 0xae, 0xe1, 0xed, 0x32, 0xc4, 0xa9, 0x34, 0xc2,
+	0x27, 0x5d, 0xec, 0xf9, 0x46, 0xb7, 0x17, 0x02, 0xd4, 0x9f, 0x0b, 0x70, 0x68, 0xdd, 0x31, 0x37,
+	0x89, 0xbd, 0x8b, 0x10, 0x1c, 0xb0, 0x8d, 0x2e, 0x2e, 0x4b, 0x15, 0x69, 0xa9, 0xd8, 0xa4, 0xcf,
+	0xa8, 0x02, 0x53, 0x6d, 0xec, 0xf9, 0xc4, 0xa6, 0x5d, 0x95, 0x0b, 0x34, 0xc5, 0x87, 0x50, 0x09,
+	0x26, 0x3a, 0xc4, 0xf2, 0xb1, 0x5b, 0x3e, 0x48, 0x93, 0xec, 0x0d, 0xbd, 0x03, 0xc7, 0x9c, 0xbe,
+	0xdf, 0xeb, 0xfb, 0xfa, 0x1e, 0x76, 0x3d, 0xe2, 0xd8, 0x7a, 0xc7, 0x71, 0xbb, 0x86, 0x5f, 0x9e,
+	0xa8, 0x48, 0x4b, 0xd3, 0xda, 0x52, 0x7d, 0x88, 0x8a, 0x3a, 0x6b, 0xa4, 0xbe, 0x15, 0x16, 0xac,
+	0x52, 0xfc, 0x75, 0xb9, 0x2c, 0x35, 0x8f, 0x86, 0x3f, 0x95, 0x48, 0xa0, 0xb3, 0x30, 0xf3, 0xbe,
+	0x4b, 0x7c, 0xec, 0xea, 0xa4, 0x8d, 0x6d, 0x9f, 0xf8, 0x8f, 0xca, 0x93, 0xb4, 0x85, 0xe9, 0x30,
+	0xbc, 0xc6, 0xa2, 0xa8, 0x0a, 0xb3, 0xc4, 0x6e, 0x59, 0xfd, 0x36, 0xd6, 0x5b, 0xef, 0x12, 0xab,
+	0xed, 0x62, 0xbb, 0x5c, 0xac, 0x48, 0x4b, 0x93, 0xcd, 0x19, 0x16, 0x5f, 0x66, 0x61, 0x74, 0x05,
+	0xc0, 0xf3, 0x0d, 0xd7, 0xd7, 0x03, 0xa2, 0xca, 0x50, 0x91, 0x96, 0xa6, 0x34, 0x25, 0x6a, 0x35,
+	0x62, 0xb1, 0x7e, 0x37, 0x62, 0x91, 0x36, 0x57, 0xa4, 0x15, 0x41, 0x0c, 0xbd, 0x05, 0x93, 0xd8,
+	0x6e, 0x87, 0xc5, 0x53, 0x42, 0xc5, 0x87, 0xb0, 0xdd, 0x0e, 0x22, 0xea, 0x55, 0x38, 0x92, 0xdc,
+	0xde, 0x49, 0x50, 0xb6, 0x56, 0x9a, 0x9b, 0x6b, 0x77, 0x6e, 0xeb, 0xab, 0x77, 0x9a, 0xb7, 0xae,
+	0xdd, 0xd5, 0xef, 0xdd, 0xde, 0xdc, 0x58, 0x59, 0x5e, 0x5b, 0x5d, 0x5b, 0xb9, 0x31, 0xfb, 0x02,
+	0x9a, 0x00, 0x79, 0x4b, 0x9b, 0x95, 0xe8, 0xbf, 0x17, 0x66, 0x65, 0xb5, 0x03, 0xb3, 0xeb, 0xc4,
+	0xf3, 0x03, 0x06, 0xbd, 0x26, 0x7e, 0xd0, 0xc7, 0x9e, 0x1f, 0x7c, 0x9c, 0x9e, 0xe1, 0x62, 0xdb,
+	0x67, 0x1f, 0x95, 0xbd, 0xa1, 0x13, 0x00, 0x3d, 0xc3, 0xc4, 0xba, 0xef, 0xec, 0x62, 0xbb, 0x2c,
+	0xd3, 0x5c, 0x31, 0x88, 0xdc, 0x0d, 0x02, 0x68, 0x1e, 0xe8, 0x8b, 0xee, 0x91, 0xc7, 0x98, 0x7e,
+	0xf3, 0x83, 0xcd, 0xc9, 0x20, 0xb0, 0x49, 0x1e, 0x63, 0xb5, 0x0b, 0x73, 0xdc, 0x3a, 0x5e, 0xcf,
+	0xb1, 0x3d, 0x8c, 0xce, 0xc3, 0x41, 0x2f, 0x08, 0x94, 0xa5, 0x4a, 0x81, 0xdf, 0xf5, 0xf0, 0xd7,
+	0x6d, 0x86, 0x40, 0xb4, 0x08, 0x33, 0x36, 0x7e, 0xe8, 0xeb, 0x43, 0x7d, 0x1c, 0x09, 0xc2, 0x1b,
+	0x51, 0x2f, 0xea, 0x6b, 0x30, 0x7d, 0x13, 0xd3, 0xd5, 0xa2, 0x4d, 0xcd, 0x43, 0x31, 0xf8, 0x09,
+	0x9d, 0x13, 0xeb, 0x64, 0x10, 0xb8, 0x6d, 0x74, 0xb1, 0xfa, 0x89, 0x04, 0x73, 0xcb, 0x2e, 0x36,
+	0x7c, 0xcc, 0x97, 0x8c, 0xe2, 0xa1, 0x0e, 0x07, 0x82, 0x4a, 0xba, 0x72, 0x7e, 0xd7, 0x14, 0x87,
+	0x2e, 0x42, 0xa9, 0x6f, 0x93, 0x07, 0x7d, 0xac, 0xa7, 0x95, 0x57, 0xa0, 0x7a, 0x7a, 0x31, 0xcc,
+	0xbe, 0x9d, 0xd0, 0x9f, 0xfa, 0x5c, 0x82, 0xb9, 0x7b, 0xbd, 0x76, 0xaa, 0xa7, 0xbc, 0x6d, 0xfc,
+	0x3f, 0x8d, 0xa1, 0xcb, 0x30, 0xd5, 0xa7, 0x7d, 0x51, 0xcf, 0x28, 0x1f, 0x18, 0xa1, 0xd8, 0xd5,
+	0xc0, 0x56, 0x6e, 0x19, 0xde, 0x6e, 0x13, 0x42, 0x78, 0xf0, 0xac, 0x9e, 0x87, 0xb9, 0x1b, 0xd8,
+	0xc2, 0xe2, 0x9b, 0x52, 0x1f, 0xc2, 0xe1, 0x75, 0xc7, 0x5c, 0x79, 0xd8, 0xb2, 0xfa, 0x81, 0xce,
+	0x73, 0x0c, 0xa7, 0xe5, 0x92, 0x1e, 0x35, 0x1c, 0x79, 0x60, 0x38, 0x51, 0x88, 0x33, 0x9c, 0x42,
+	0xc2, 0x70, 0x14, 0x98, 0x6c, 0x13, 0xcf, 0xd8, 0xb1, 0x70, 0x9b, 0xee, 0x64, 0xb2, 0x39, 0x78,
+	0x57, 0x77, 0xe1, 0x58, 0xa0, 0xd9, 0xc1, 0xd2, 0xff, 0xe9, 0x01, 0xf9, 0x50, 0x82, 0x52, 0x7a,
+	0x35, 0x76, 0x4c, 0xae, 0x02, 0xe0, 0x41, 0x94, 0x9d, 0x95, 0x53, 0xd9, 0x1f, 0x77, 0x50, 0xdd,
+	0xe4, 0x4a, 0x84, 0x4f, 0x4d, 0x15, 0x8e, 0xde, 0xc4, 0x71, 0x07, 0xd1, 0x76, 0x33, 0x18, 0x57,
+	0x1d, 0x28, 0x85, 0x07, 0x66, 0x08, 0x3d, 0x8a, 0x9c, 0x2b, 0x50, 0x1c, 0xb4, 0xc4, 0x14, 0xba,
+	0xef, 0x26, 0xe2, 0x0a, 0xf5, 0x1b, 0x09, 0x4a, 0xe1, 0x71, 0x10, 0xe9, 0xef, 0x5f, 0xae, 0x96,
+	0xd6, 0x78, 0x61, 0x2c, 0x8d, 0x9f, 0x83, 0x52, 0xa8, 0x71, 0x91, 0x4e, 0xb5, 0xa7, 0x2f, 0xc3,
+	0xcc, 0x32, 0xbd, 0xee, 0x37, 0xb1, 0xbb, 0x47, 0x5a, 0x78, 0x4b, 0x43, 0x1f, 0xcb, 0x50, 0x1c,
+	0xd8, 0x25, 0x3a, 0x93, 0xd5, 0x78, 0xca, 0xb4, 0x95, 0x85, 0x7c, 0x50, 0x28, 0x25, 0xf5, 0x3b,
+	0xe9, 0xa3, 0xe7, 0xbf, 0x7f, 0x26, 0x7f, 0x2d, 0xa1, 0x52, 0x30, 0x6e, 0x7c, 0x10, 0x7e, 0x9b,
+	0x2b, 0xb5, 0x46, 0xed, 0x49, 0x83, 0x3a, 0xec, 0xf6, 0x29, 0x74, 0x82, 0xcf, 0xf4, 0x5c, 0xe7,
+	0x3d, 0xdc, 0xf2, 0xbd, 0x18, 0xb0, 0x80, 0x54, 0x1e, 0xe0, 0xb8, 0xa6, 0x61, 0x93, 0xc7, 0xe1,
+	0xfc, 0x11, 0xa3, 0x4e, 0xa2, 0xe3, 0x3c, 0xaa, 0xe3, 0x58, 0x6d, 0xec, 0x72, 0xf9, 0x45, 0xb4,
+	0xc0, 0xe7, 0x77, 0x88, 0x65, 0x11, 0xdb, 0xbc, 0xd6, 0x6a, 0x39, 0x7d, 0x9b, 0x5b, 0x0d, 0x7d,
+	0x2a, 0xc3, 0x21, 0xe6, 0xe4, 0xe8, 0x74, 0xc6, 0x16, 0x93, 0x2e, 0xaf, 0xe4, 0x78, 0x9e, 0xfa,
+	0x53, 0xb8, 0xf7, 0x1f, 0x24, 0x34, 0x4f, 0x97, 0x1e, 0x58, 0x4e, 0xb0, 0xfd, 0x70, 0xb9, 0x46,
+	0xed, 0xc9, 0x60, 0x7f, 0x71, 0x3a, 0xe6, 0x20, 0x46, 0x55, 0xd1, 0xd9, 0x14, 0x2a, 0x45, 0x44,
+	0x0c, 0x3d, 0x83, 0x4e, 0xa7, 0xa0, 0x03, 0x36, 0x62, 0xd0, 0xab, 0xa8, 0x9a, 0x02, 0x0d, 0x51,
+	0x32, 0x00, 0xa3, 0x2f, 0x64, 0x80, 0xf8, 0xba, 0x42, 0x59, 0x9f, 0x7e, 0xe8, 0x36, 0xcb, 0xa5,
+	0xe6, 0xd7, 0x90, 0x9a, 0x1f, 0x25, 0x75, 0x84, 0x2c, 0x2e, 0xd1, 0x0b, 0x63, 0xfb, 0x15, 0x35,
+	0x5f, 0x1c, 0x0c, 0x56, 0x53, 0x05, 0x24, 0xc2, 0xb0, 0x0b, 0x6a, 0xae, 0x50, 0x18, 0xea, 0x9c,
+	0x2a, 0x24, 0x97, 0x10, 0x8d, 0xfe, 0x28, 0x00, 0xc4, 0x57, 0x67, 0x26, 0x3f, 0x43, 0x37, 0x6b,
+	0x2e, 0x3f, 0x5f, 0x16, 0x28, 0x3f, 0x9f, 0x17, 0x94, 0x3c, 0xe9, 0x44, 0xbb, 0x57, 0x04, 0x04,
+	0xc4, 0xb0, 0x0d, 0x45, 0x54, 0x46, 0xac, 0xa0, 0xaa, 0xec, 0x2f, 0x26, 0x06, 0xbd, 0xa0, 0x88,
+	0x4b, 0x2a, 0x6a, 0x5d, 0x1b, 0xa3, 0x75, 0x6d, 0xdc, 0xd6, 0x35, 0xf1, 0xd6, 0xb5, 0x71, 0x5b,
+	0x47, 0x4f, 0x65, 0x80, 0x78, 0xb2, 0xc8, 0xfc, 0xe6, 0x43, 0x83, 0x87, 0x52, 0x1a, 0x72, 0xf4,
+	0x95, 0xe0, 0x2f, 0xa5, 0xd8, 0x2a, 0x6a, 0xf9, 0x56, 0x51, 0x13, 0xb2, 0x8a, 0x9a, 0xb8, 0x55,
+	0xd4, 0x44, 0xac, 0xa2, 0x36, 0x86, 0x55, 0x7c, 0x2f, 0xc3, 0x74, 0x72, 0xac, 0x40, 0x4b, 0x23,
+	0x6e, 0x8a, 0xa1, 0x39, 0x47, 0xa9, 0x0a, 0x20, 0xd9, 0xc5, 0x92, 0x36, 0x57, 0xde, 0x41, 0xe2,
+	0x49, 0x24, 0x7d, 0x79, 0xf0, 0x06, 0xc2, 0xa1, 0x22, 0x73, 0x1d, 0xe5, 0x1f, 0x1c, 0x34, 0x32,
+	0xd7, 0x61, 0xfb, 0xe0, 0x40, 0x91, 0xb9, 0x8e, 0x76, 0x0f, 0x6e, 0x58, 0xfa, 0x4a, 0x86, 0xc3,
+	0xfc, 0x14, 0x84, 0x16, 0xb3, 0xaf, 0x9d, 0xf4, 0xe5, 0xae, 0xec, 0x37, 0x5f, 0x0c, 0x71, 0x34,
+	0x10, 0x54, 0xbc, 0x3a, 0x7f, 0x01, 0xa5, 0x05, 0x95, 0x44, 0x45, 0x1c, 0x65, 0x0a, 0x2a, 0x09,
+	0x8d, 0x38, 0x4a, 0x09, 0x2a, 0x09, 0x8a, 0x38, 0x1a, 0x21, 0xa8, 0x04, 0x18, 0xfd, 0x26, 0xc3,
+	0x4c, 0x6a, 0xfc, 0x43, 0xd5, 0x91, 0xb7, 0xd0, 0xf8, 0x4c, 0xfd, 0x1d, 0x32, 0xf5, 0xa7, 0xa4,
+	0xe6, 0xa9, 0xe9, 0x52, 0x3c, 0xb0, 0x6d, 0x37, 0x54, 0x01, 0x61, 0xf1, 0x05, 0x17, 0x55, 0x51,
+	0x8d, 0xf1, 0x55, 0x75, 0x75, 0x7f, 0xb9, 0xf1, 0xf8, 0x37, 0x54, 0x71, 0xe5, 0x71, 0x75, 0x94,
+	0xe0, 0xd4, 0xb4, 0x9b, 0x49, 0x70, 0xf6, 0x44, 0x3c, 0x06, 0xc1, 0x5a, 0x9e, 0x14, 0x13, 0x04,
+	0x6b, 0x02, 0xaa, 0x4c, 0x10, 0xac, 0x89, 0x0a, 0x34, 0x41, 0xb0, 0xb6, 0xbf, 0x56, 0x13, 0x04,
+	0x6b, 0xe2, 0xb2, 0xe5, 0x09, 0x7e, 0x26, 0xc3, 0x4c, 0x6a, 0x48, 0xcf, 0x24, 0x38, 0x7b, 0x90,
+	0x17, 0xbe, 0x38, 0x46, 0x1d, 0xf1, 0x9a, 0xd0, 0x11, 0xaf, 0x89, 0x1f, 0xf1, 0x9a, 0xc8, 0x11,
+	0xaf, 0x89, 0x73, 0x75, 0xfd, 0x99, 0x04, 0xc7, 0x5a, 0x4e, 0x77, 0x98, 0x92, 0xeb, 0x68, 0x3d,
+	0x7c, 0x0e, 0xff, 0x68, 0xd9, 0x08, 0x08, 0xd8, 0x90, 0xb6, 0xdf, 0x64, 0x40, 0xd3, 0xb1, 0x0c,
+	0xdb, 0xac, 0x3b, 0xae, 0xd9, 0x30, 0xb1, 0x4d, 0xe9, 0x69, 0x84, 0x29, 0xa3, 0x47, 0x3c, 0xee,
+	0xff, 0x3a, 0x2f, 0xb3, 0xc7, 0xbf, 0x24, 0xe9, 0x5b, 0xf9, 0xa5, 0x9b, 0x61, 0xf5, 0xb2, 0xe5,
+	0xf4, 0xdb, 0x75, 0xb6, 0x40, 0x7d, 0x4b, 0xfb, 0x25, 0xca, 0xdc, 0xa7, 0x99, 0xfb, 0x2c, 0x73,
+	0x7f, 0x4b, 0xdb, 0x99, 0xa0, 0xbf, 0xfd, 0xfa, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9e, 0xb0,
+	0x58, 0x3e, 0x46, 0x15, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/logging/v2/logging_metrics.pb.go b/vendor/google.golang.org/genproto/googleapis/logging/v2/logging_metrics.pb.go
index b4c4fc9e..a59e8e4a 100644
--- a/vendor/google.golang.org/genproto/googleapis/logging/v2/logging_metrics.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/logging/v2/logging_metrics.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/logging/v2/logging_metrics.proto
 
-package logging
+package logging // import "google.golang.org/genproto/googleapis/logging/v2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api4 "google.golang.org/genproto/googleapis/api/distribution"
-import google_api5 "google.golang.org/genproto/googleapis/api/metric"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/empty"
+import distribution "google.golang.org/genproto/googleapis/api/distribution"
+import metric "google.golang.org/genproto/googleapis/api/metric"
 import _ "google.golang.org/genproto/protobuf/field_mask"
 
 import (
@@ -22,6 +22,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Stackdriver Logging API version.
 type LogMetric_ApiVersion int32
 
@@ -44,7 +50,9 @@ var LogMetric_ApiVersion_value = map[string]int32{
 func (x LogMetric_ApiVersion) String() string {
 	return proto.EnumName(LogMetric_ApiVersion_name, int32(x))
 }
-func (LogMetric_ApiVersion) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+func (LogMetric_ApiVersion) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_logging_metrics_447f4682ca2f30ca, []int{0, 0}
+}
 
 // Describes a logs-based metric.  The value of the metric is the
 // number of log entries that match a logs filter in a given time interval.
@@ -69,9 +77,9 @@ type LogMetric struct {
 	// part of a `metric_name` API parameter, then the metric identifier
 	// must be URL-encoded. Example:
 	// `"projects/my-project/metrics/nginx%2Frequests"`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. A description of this metric, which is used in documentation.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Required. An [advanced logs filter](/logging/docs/view/advanced_filters)
 	// which is used to match log entries.
 	// Example:
@@ -79,7 +87,7 @@ type LogMetric struct {
 	//     "resource.type=gae_app AND severity>=ERROR"
 	//
 	// The maximum length of the filter is 20000 characters.
-	Filter string `protobuf:"bytes,3,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"`
 	// Optional. The metric descriptor associated with the logs-based metric.
 	// If unspecified, it uses a default metric descriptor with a DELTA metric
 	// kind, INT64 value type, with no labels and a unit of "1". Such a metric
@@ -101,7 +109,7 @@ type LogMetric struct {
 	// be updated once initially configured. New labels can be added in the
 	// `metric_descriptor`, but existing labels cannot be modified except for
 	// their description.
-	MetricDescriptor *google_api5.MetricDescriptor `protobuf:"bytes,5,opt,name=metric_descriptor,json=metricDescriptor" json:"metric_descriptor,omitempty"`
+	MetricDescriptor *metric.MetricDescriptor `protobuf:"bytes,5,opt,name=metric_descriptor,json=metricDescriptor,proto3" json:"metric_descriptor,omitempty"`
 	// Optional. A `value_extractor` is required when using a distribution
 	// logs-based metric to extract the values to record from a log entry.
 	// Two functions are supported for value extraction: `EXTRACT(field)` or
@@ -121,7 +129,7 @@ type LogMetric struct {
 	// distribution.
 	//
 	// Example: `REGEXP_EXTRACT(jsonPayload.request, ".*quantity=(\d+).*")`
-	ValueExtractor string `protobuf:"bytes,6,opt,name=value_extractor,json=valueExtractor" json:"value_extractor,omitempty"`
+	ValueExtractor string `protobuf:"bytes,6,opt,name=value_extractor,json=valueExtractor,proto3" json:"value_extractor,omitempty"`
 	// Optional. A map from a label key string to an extractor expression which is
 	// used to extract data from a log entry field and assign as the label value.
 	// Each label key specified in the LabelDescriptor must have an associated
@@ -136,20 +144,42 @@ type LogMetric struct {
 	//
 	// Note that there are upper bounds on the maximum number of labels and the
 	// number of active time series that are allowed in a project.
-	LabelExtractors map[string]string `protobuf:"bytes,7,rep,name=label_extractors,json=labelExtractors" json:"label_extractors,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	LabelExtractors map[string]string `protobuf:"bytes,7,rep,name=label_extractors,json=labelExtractors,proto3" json:"label_extractors,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. The `bucket_options` are required when the logs-based metric is
 	// using a DISTRIBUTION value type and it describes the bucket boundaries
 	// used to create a histogram of the extracted values.
-	BucketOptions *google_api4.Distribution_BucketOptions `protobuf:"bytes,8,opt,name=bucket_options,json=bucketOptions" json:"bucket_options,omitempty"`
+	BucketOptions *distribution.Distribution_BucketOptions `protobuf:"bytes,8,opt,name=bucket_options,json=bucketOptions,proto3" json:"bucket_options,omitempty"`
 	// Deprecated. The API version that created or updated this metric.
 	// The v2 format is used by default and cannot be changed.
-	Version LogMetric_ApiVersion `protobuf:"varint,4,opt,name=version,enum=google.logging.v2.LogMetric_ApiVersion" json:"version,omitempty"`
+	Version              LogMetric_ApiVersion `protobuf:"varint,4,opt,name=version,proto3,enum=google.logging.v2.LogMetric_ApiVersion" json:"version,omitempty"` // Deprecated: Do not use.
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *LogMetric) Reset()         { *m = LogMetric{} }
+func (m *LogMetric) String() string { return proto.CompactTextString(m) }
+func (*LogMetric) ProtoMessage()    {}
+func (*LogMetric) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_metrics_447f4682ca2f30ca, []int{0}
+}
+func (m *LogMetric) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogMetric.Unmarshal(m, b)
+}
+func (m *LogMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogMetric.Marshal(b, m, deterministic)
+}
+func (dst *LogMetric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogMetric.Merge(dst, src)
+}
+func (m *LogMetric) XXX_Size() int {
+	return xxx_messageInfo_LogMetric.Size(m)
+}
+func (m *LogMetric) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogMetric.DiscardUnknown(m)
 }
 
-func (m *LogMetric) Reset()                    { *m = LogMetric{} }
-func (m *LogMetric) String() string            { return proto.CompactTextString(m) }
-func (*LogMetric) ProtoMessage()               {}
-func (*LogMetric) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_LogMetric proto.InternalMessageInfo
 
 func (m *LogMetric) GetName() string {
 	if m != nil {
@@ -172,7 +202,7 @@ func (m *LogMetric) GetFilter() string {
 	return ""
 }
 
-func (m *LogMetric) GetMetricDescriptor() *google_api5.MetricDescriptor {
+func (m *LogMetric) GetMetricDescriptor() *metric.MetricDescriptor {
 	if m != nil {
 		return m.MetricDescriptor
 	}
@@ -193,13 +223,14 @@ func (m *LogMetric) GetLabelExtractors() map[string]string {
 	return nil
 }
 
-func (m *LogMetric) GetBucketOptions() *google_api4.Distribution_BucketOptions {
+func (m *LogMetric) GetBucketOptions() *distribution.Distribution_BucketOptions {
 	if m != nil {
 		return m.BucketOptions
 	}
 	return nil
 }
 
+// Deprecated: Do not use.
 func (m *LogMetric) GetVersion() LogMetric_ApiVersion {
 	if m != nil {
 		return m.Version
@@ -212,22 +243,44 @@ type ListLogMetricsRequest struct {
 	// Required. The name of the project containing the metrics:
 	//
 	//     "projects/[PROJECT_ID]"
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Optional. If present, then retrieve the next batch of results from the
 	// preceding call to this method.  `pageToken` must be the value of
 	// `nextPageToken` from the previous response.  The values of other method
 	// parameters should be identical to those in the previous call.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Optional. The maximum number of results to return from this request.
 	// Non-positive values are ignored.  The presence of `nextPageToken` in the
 	// response indicates that more results might be available.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListLogMetricsRequest) Reset()         { *m = ListLogMetricsRequest{} }
+func (m *ListLogMetricsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListLogMetricsRequest) ProtoMessage()    {}
+func (*ListLogMetricsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_metrics_447f4682ca2f30ca, []int{1}
+}
+func (m *ListLogMetricsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLogMetricsRequest.Unmarshal(m, b)
+}
+func (m *ListLogMetricsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLogMetricsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListLogMetricsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogMetricsRequest.Merge(dst, src)
+}
+func (m *ListLogMetricsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListLogMetricsRequest.Size(m)
+}
+func (m *ListLogMetricsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLogMetricsRequest.DiscardUnknown(m)
 }
 
-func (m *ListLogMetricsRequest) Reset()                    { *m = ListLogMetricsRequest{} }
-func (m *ListLogMetricsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListLogMetricsRequest) ProtoMessage()               {}
-func (*ListLogMetricsRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+var xxx_messageInfo_ListLogMetricsRequest proto.InternalMessageInfo
 
 func (m *ListLogMetricsRequest) GetParent() string {
 	if m != nil {
@@ -253,17 +306,39 @@ func (m *ListLogMetricsRequest) GetPageSize() int32 {
 // Result returned from ListLogMetrics.
 type ListLogMetricsResponse struct {
 	// A list of logs-based metrics.
-	Metrics []*LogMetric `protobuf:"bytes,1,rep,name=metrics" json:"metrics,omitempty"`
+	Metrics []*LogMetric `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"`
 	// If there might be more results than appear in this response, then
 	// `nextPageToken` is included.  To get the next set of results, call this
 	// method again using the value of `nextPageToken` as `pageToken`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListLogMetricsResponse) Reset()         { *m = ListLogMetricsResponse{} }
+func (m *ListLogMetricsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListLogMetricsResponse) ProtoMessage()    {}
+func (*ListLogMetricsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_metrics_447f4682ca2f30ca, []int{2}
+}
+func (m *ListLogMetricsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLogMetricsResponse.Unmarshal(m, b)
+}
+func (m *ListLogMetricsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLogMetricsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListLogMetricsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLogMetricsResponse.Merge(dst, src)
+}
+func (m *ListLogMetricsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListLogMetricsResponse.Size(m)
+}
+func (m *ListLogMetricsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLogMetricsResponse.DiscardUnknown(m)
 }
 
-func (m *ListLogMetricsResponse) Reset()                    { *m = ListLogMetricsResponse{} }
-func (m *ListLogMetricsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListLogMetricsResponse) ProtoMessage()               {}
-func (*ListLogMetricsResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
+var xxx_messageInfo_ListLogMetricsResponse proto.InternalMessageInfo
 
 func (m *ListLogMetricsResponse) GetMetrics() []*LogMetric {
 	if m != nil {
@@ -284,13 +359,35 @@ type GetLogMetricRequest struct {
 	// The resource name of the desired metric:
 	//
 	//     "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
-	MetricName string `protobuf:"bytes,1,opt,name=metric_name,json=metricName" json:"metric_name,omitempty"`
+	MetricName           string   `protobuf:"bytes,1,opt,name=metric_name,json=metricName,proto3" json:"metric_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetLogMetricRequest) Reset()         { *m = GetLogMetricRequest{} }
+func (m *GetLogMetricRequest) String() string { return proto.CompactTextString(m) }
+func (*GetLogMetricRequest) ProtoMessage()    {}
+func (*GetLogMetricRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_metrics_447f4682ca2f30ca, []int{3}
+}
+func (m *GetLogMetricRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetLogMetricRequest.Unmarshal(m, b)
+}
+func (m *GetLogMetricRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetLogMetricRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetLogMetricRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetLogMetricRequest.Merge(dst, src)
+}
+func (m *GetLogMetricRequest) XXX_Size() int {
+	return xxx_messageInfo_GetLogMetricRequest.Size(m)
+}
+func (m *GetLogMetricRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetLogMetricRequest.DiscardUnknown(m)
 }
 
-func (m *GetLogMetricRequest) Reset()                    { *m = GetLogMetricRequest{} }
-func (m *GetLogMetricRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetLogMetricRequest) ProtoMessage()               {}
-func (*GetLogMetricRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{3} }
+var xxx_messageInfo_GetLogMetricRequest proto.InternalMessageInfo
 
 func (m *GetLogMetricRequest) GetMetricName() string {
 	if m != nil {
@@ -306,16 +403,38 @@ type CreateLogMetricRequest struct {
 	//     "projects/[PROJECT_ID]"
 	//
 	// The new metric must be provided in the request.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The new logs-based metric, which must not have an identifier that
 	// already exists.
-	Metric *LogMetric `protobuf:"bytes,2,opt,name=metric" json:"metric,omitempty"`
+	Metric               *LogMetric `protobuf:"bytes,2,opt,name=metric,proto3" json:"metric,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *CreateLogMetricRequest) Reset()         { *m = CreateLogMetricRequest{} }
+func (m *CreateLogMetricRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateLogMetricRequest) ProtoMessage()    {}
+func (*CreateLogMetricRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_metrics_447f4682ca2f30ca, []int{4}
+}
+func (m *CreateLogMetricRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateLogMetricRequest.Unmarshal(m, b)
+}
+func (m *CreateLogMetricRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateLogMetricRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateLogMetricRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateLogMetricRequest.Merge(dst, src)
+}
+func (m *CreateLogMetricRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateLogMetricRequest.Size(m)
+}
+func (m *CreateLogMetricRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateLogMetricRequest.DiscardUnknown(m)
 }
 
-func (m *CreateLogMetricRequest) Reset()                    { *m = CreateLogMetricRequest{} }
-func (m *CreateLogMetricRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateLogMetricRequest) ProtoMessage()               {}
-func (*CreateLogMetricRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{4} }
+var xxx_messageInfo_CreateLogMetricRequest proto.InternalMessageInfo
 
 func (m *CreateLogMetricRequest) GetParent() string {
 	if m != nil {
@@ -340,15 +459,37 @@ type UpdateLogMetricRequest struct {
 	// The updated metric must be provided in the request and it's
 	// `name` field must be the same as `[METRIC_ID]` If the metric
 	// does not exist in `[PROJECT_ID]`, then a new metric is created.
-	MetricName string `protobuf:"bytes,1,opt,name=metric_name,json=metricName" json:"metric_name,omitempty"`
+	MetricName string `protobuf:"bytes,1,opt,name=metric_name,json=metricName,proto3" json:"metric_name,omitempty"`
 	// The updated metric.
-	Metric *LogMetric `protobuf:"bytes,2,opt,name=metric" json:"metric,omitempty"`
+	Metric               *LogMetric `protobuf:"bytes,2,opt,name=metric,proto3" json:"metric,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *UpdateLogMetricRequest) Reset()         { *m = UpdateLogMetricRequest{} }
+func (m *UpdateLogMetricRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateLogMetricRequest) ProtoMessage()    {}
+func (*UpdateLogMetricRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_metrics_447f4682ca2f30ca, []int{5}
+}
+func (m *UpdateLogMetricRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateLogMetricRequest.Unmarshal(m, b)
+}
+func (m *UpdateLogMetricRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateLogMetricRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateLogMetricRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateLogMetricRequest.Merge(dst, src)
+}
+func (m *UpdateLogMetricRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateLogMetricRequest.Size(m)
+}
+func (m *UpdateLogMetricRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateLogMetricRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateLogMetricRequest) Reset()                    { *m = UpdateLogMetricRequest{} }
-func (m *UpdateLogMetricRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateLogMetricRequest) ProtoMessage()               {}
-func (*UpdateLogMetricRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{5} }
+var xxx_messageInfo_UpdateLogMetricRequest proto.InternalMessageInfo
 
 func (m *UpdateLogMetricRequest) GetMetricName() string {
 	if m != nil {
@@ -369,13 +510,35 @@ type DeleteLogMetricRequest struct {
 	// The resource name of the metric to delete:
 	//
 	//     "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
-	MetricName string `protobuf:"bytes,1,opt,name=metric_name,json=metricName" json:"metric_name,omitempty"`
+	MetricName           string   `protobuf:"bytes,1,opt,name=metric_name,json=metricName,proto3" json:"metric_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteLogMetricRequest) Reset()         { *m = DeleteLogMetricRequest{} }
+func (m *DeleteLogMetricRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteLogMetricRequest) ProtoMessage()    {}
+func (*DeleteLogMetricRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_logging_metrics_447f4682ca2f30ca, []int{6}
+}
+func (m *DeleteLogMetricRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteLogMetricRequest.Unmarshal(m, b)
+}
+func (m *DeleteLogMetricRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteLogMetricRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteLogMetricRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteLogMetricRequest.Merge(dst, src)
+}
+func (m *DeleteLogMetricRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteLogMetricRequest.Size(m)
+}
+func (m *DeleteLogMetricRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteLogMetricRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteLogMetricRequest) Reset()                    { *m = DeleteLogMetricRequest{} }
-func (m *DeleteLogMetricRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteLogMetricRequest) ProtoMessage()               {}
-func (*DeleteLogMetricRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{6} }
+var xxx_messageInfo_DeleteLogMetricRequest proto.InternalMessageInfo
 
 func (m *DeleteLogMetricRequest) GetMetricName() string {
 	if m != nil {
@@ -386,6 +549,7 @@ func (m *DeleteLogMetricRequest) GetMetricName() string {
 
 func init() {
 	proto.RegisterType((*LogMetric)(nil), "google.logging.v2.LogMetric")
+	proto.RegisterMapType((map[string]string)(nil), "google.logging.v2.LogMetric.LabelExtractorsEntry")
 	proto.RegisterType((*ListLogMetricsRequest)(nil), "google.logging.v2.ListLogMetricsRequest")
 	proto.RegisterType((*ListLogMetricsResponse)(nil), "google.logging.v2.ListLogMetricsResponse")
 	proto.RegisterType((*GetLogMetricRequest)(nil), "google.logging.v2.GetLogMetricRequest")
@@ -403,8 +567,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for MetricsServiceV2 service
-
+// MetricsServiceV2Client is the client API for MetricsServiceV2 service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MetricsServiceV2Client interface {
 	// Lists logs-based metrics.
 	ListLogMetrics(ctx context.Context, in *ListLogMetricsRequest, opts ...grpc.CallOption) (*ListLogMetricsResponse, error)
@@ -415,7 +580,7 @@ type MetricsServiceV2Client interface {
 	// Creates or updates a logs-based metric.
 	UpdateLogMetric(ctx context.Context, in *UpdateLogMetricRequest, opts ...grpc.CallOption) (*LogMetric, error)
 	// Deletes a logs-based metric.
-	DeleteLogMetric(ctx context.Context, in *DeleteLogMetricRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error)
+	DeleteLogMetric(ctx context.Context, in *DeleteLogMetricRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type metricsServiceV2Client struct {
@@ -428,7 +593,7 @@ func NewMetricsServiceV2Client(cc *grpc.ClientConn) MetricsServiceV2Client {
 
 func (c *metricsServiceV2Client) ListLogMetrics(ctx context.Context, in *ListLogMetricsRequest, opts ...grpc.CallOption) (*ListLogMetricsResponse, error) {
 	out := new(ListLogMetricsResponse)
-	err := grpc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/ListLogMetrics", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/ListLogMetrics", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -437,7 +602,7 @@ func (c *metricsServiceV2Client) ListLogMetrics(ctx context.Context, in *ListLog
 
 func (c *metricsServiceV2Client) GetLogMetric(ctx context.Context, in *GetLogMetricRequest, opts ...grpc.CallOption) (*LogMetric, error) {
 	out := new(LogMetric)
-	err := grpc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/GetLogMetric", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/GetLogMetric", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -446,7 +611,7 @@ func (c *metricsServiceV2Client) GetLogMetric(ctx context.Context, in *GetLogMet
 
 func (c *metricsServiceV2Client) CreateLogMetric(ctx context.Context, in *CreateLogMetricRequest, opts ...grpc.CallOption) (*LogMetric, error) {
 	out := new(LogMetric)
-	err := grpc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/CreateLogMetric", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/CreateLogMetric", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -455,24 +620,23 @@ func (c *metricsServiceV2Client) CreateLogMetric(ctx context.Context, in *Create
 
 func (c *metricsServiceV2Client) UpdateLogMetric(ctx context.Context, in *UpdateLogMetricRequest, opts ...grpc.CallOption) (*LogMetric, error) {
 	out := new(LogMetric)
-	err := grpc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/UpdateLogMetric", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/UpdateLogMetric", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *metricsServiceV2Client) DeleteLogMetric(ctx context.Context, in *DeleteLogMetricRequest, opts ...grpc.CallOption) (*google_protobuf5.Empty, error) {
-	out := new(google_protobuf5.Empty)
-	err := grpc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/DeleteLogMetric", in, out, c.cc, opts...)
+func (c *metricsServiceV2Client) DeleteLogMetric(ctx context.Context, in *DeleteLogMetricRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.logging.v2.MetricsServiceV2/DeleteLogMetric", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for MetricsServiceV2 service
-
+// MetricsServiceV2Server is the server API for MetricsServiceV2 service.
 type MetricsServiceV2Server interface {
 	// Lists logs-based metrics.
 	ListLogMetrics(context.Context, *ListLogMetricsRequest) (*ListLogMetricsResponse, error)
@@ -483,7 +647,7 @@ type MetricsServiceV2Server interface {
 	// Creates or updates a logs-based metric.
 	UpdateLogMetric(context.Context, *UpdateLogMetricRequest) (*LogMetric, error)
 	// Deletes a logs-based metric.
-	DeleteLogMetric(context.Context, *DeleteLogMetricRequest) (*google_protobuf5.Empty, error)
+	DeleteLogMetric(context.Context, *DeleteLogMetricRequest) (*empty.Empty, error)
 }
 
 func RegisterMetricsServiceV2Server(s *grpc.Server, srv MetricsServiceV2Server) {
@@ -609,61 +773,64 @@ var _MetricsServiceV2_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/logging/v2/logging_metrics.proto",
 }
 
-func init() { proto.RegisterFile("google/logging/v2/logging_metrics.proto", fileDescriptor3) }
-
-var fileDescriptor3 = []byte{
-	// 846 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xc1, 0x6e, 0xdb, 0x46,
-	0x10, 0xed, 0xca, 0xb6, 0x1c, 0x8f, 0x1b, 0x4b, 0xd9, 0x24, 0x8a, 0xa0, 0x38, 0x88, 0xca, 0x83,
-	0xa5, 0xf8, 0x40, 0x36, 0x6c, 0x61, 0xa4, 0x29, 0x7a, 0x88, 0x62, 0x23, 0x28, 0xa0, 0xb4, 0x06,
-	0xd3, 0xea, 0x50, 0x08, 0x20, 0x28, 0x69, 0x44, 0x6c, 0x45, 0x71, 0x59, 0xee, 0x4a, 0xb0, 0x53,
-	0xe4, 0x52, 0xe4, 0x56, 0xa0, 0x87, 0xf6, 0x03, 0x72, 0xef, 0xa7, 0xf4, 0xda, 0x7e, 0x42, 0x3f,
-	0xa2, 0xc7, 0x82, 0xcb, 0xa5, 0xcc, 0x48, 0x8c, 0x65, 0xf8, 0xe4, 0xdd, 0x79, 0x33, 0xfb, 0xde,
-	0xcc, 0x3c, 0x59, 0x82, 0x96, 0xcf, 0xb9, 0x1f, 0xa0, 0x15, 0x70, 0xdf, 0x67, 0xa1, 0x6f, 0xcd,
-	0xed, 0xec, 0xe8, 0x4e, 0x51, 0xc6, 0x6c, 0x28, 0xcc, 0x28, 0xe6, 0x92, 0xd3, 0x5b, 0x69, 0xa2,
-	0xa9, 0x51, 0x73, 0x6e, 0x37, 0xf6, 0x75, 0xad, 0x17, 0x31, 0xcb, 0x0b, 0x43, 0x2e, 0x3d, 0xc9,
-	0x78, 0xa8, 0x0b, 0x1a, 0x0f, 0x72, 0xe8, 0x88, 0x09, 0x19, 0xb3, 0xc1, 0x2c, 0xc1, 0x35, 0x7c,
-	0x2f, 0x07, 0xa7, 0x4c, 0x1a, 0xb8, 0xaf, 0x01, 0x75, 0x1b, 0xcc, 0xc6, 0x16, 0x4e, 0x23, 0x79,
-	0xae, 0xc1, 0xe6, 0x32, 0x38, 0x66, 0x18, 0x8c, 0xdc, 0xa9, 0x27, 0x26, 0x69, 0x86, 0xf1, 0x6e,
-	0x13, 0x76, 0xba, 0xdc, 0x7f, 0xa9, 0x9e, 0xa4, 0x14, 0x36, 0x43, 0x6f, 0x8a, 0x75, 0xd2, 0x24,
-	0xed, 0x1d, 0x47, 0x9d, 0x69, 0x13, 0x76, 0x47, 0x28, 0x86, 0x31, 0x8b, 0x12, 0x39, 0xf5, 0x92,
-	0x82, 0xf2, 0x21, 0x5a, 0x83, 0xf2, 0x98, 0x05, 0x12, 0xe3, 0xfa, 0x86, 0x02, 0xf5, 0x8d, 0x7e,
-	0x0d, 0xb7, 0x52, 0xa9, 0x6e, 0x96, 0xcd, 0xe3, 0xfa, 0x56, 0x93, 0xb4, 0x77, 0xed, 0x7d, 0x53,
-	0xcf, 0xc7, 0x8b, 0x98, 0x99, 0x92, 0x1f, 0x2f, 0x72, 0x9c, 0xea, 0x74, 0x29, 0x42, 0x5b, 0x50,
-	0x99, 0x7b, 0xc1, 0x0c, 0x5d, 0x3c, 0x93, 0xb1, 0x37, 0x4c, 0x1e, 0x2a, 0x2b, 0xae, 0x3d, 0x15,
-	0x3e, 0xc9, 0xa2, 0xb4, 0x0f, 0xd5, 0xc0, 0x1b, 0x60, 0x70, 0x91, 0x28, 0xea, 0xdb, 0xcd, 0x8d,
-	0xf6, 0xae, 0xfd, 0xd8, 0x5c, 0x59, 0x89, 0xb9, 0xe8, 0xdc, 0xec, 0x26, 0x45, 0x8b, 0x67, 0xc4,
-	0x49, 0x28, 0xe3, 0x73, 0xa7, 0x12, 0xbc, 0x1f, 0xa5, 0x2f, 0x61, 0x6f, 0x30, 0x1b, 0x4e, 0x50,
-	0xba, 0x5c, 0xb5, 0x2e, 0xea, 0x37, 0x54, 0x3b, 0x07, 0xf9, 0x76, 0x8e, 0xf3, 0xdb, 0xeb, 0xa8,
-	0xf4, 0x6f, 0xd3, 0x6c, 0xe7, 0xe6, 0x20, 0x7f, 0xa5, 0xcf, 0x60, 0x7b, 0x8e, 0xb1, 0x48, 0xc6,
-	0xba, 0xd9, 0x24, 0xed, 0x3d, 0xbb, 0x75, 0xa9, 0xc6, 0x67, 0x11, 0xeb, 0xa5, 0xe9, 0x4e, 0x56,
-	0xd7, 0xe8, 0xc0, 0x9d, 0x22, 0xe9, 0xb4, 0x0a, 0x1b, 0x13, 0x3c, 0xd7, 0x8b, 0x4c, 0x8e, 0xf4,
-	0x0e, 0x6c, 0xa9, 0x59, 0xe9, 0x0d, 0xa6, 0x97, 0xa7, 0xa5, 0x27, 0xc4, 0xd8, 0x07, 0xb8, 0x78,
-	0x9a, 0x96, 0xa1, 0xd4, 0xb3, 0xab, 0x1f, 0xa9, 0xbf, 0x8f, 0xab, 0xc4, 0x98, 0xc0, 0xdd, 0x2e,
-	0x13, 0x72, 0x21, 0x43, 0x38, 0xf8, 0xd3, 0x0c, 0x85, 0x4c, 0xd6, 0x1e, 0x79, 0x31, 0x86, 0x52,
-	0xb3, 0xe8, 0x1b, 0x7d, 0x00, 0x10, 0x79, 0x3e, 0xba, 0x92, 0x4f, 0x30, 0xf3, 0xcb, 0x4e, 0x12,
-	0xf9, 0x2e, 0x09, 0xd0, 0xfb, 0xa0, 0x2e, 0xae, 0x60, 0xaf, 0x51, 0x19, 0x66, 0xcb, 0xb9, 0x91,
-	0x04, 0x5e, 0xb1, 0xd7, 0x68, 0x9c, 0x41, 0x6d, 0x99, 0x4c, 0x44, 0x3c, 0x14, 0x48, 0x8f, 0x60,
-	0x5b, 0x7f, 0xc2, 0xea, 0x44, 0xed, 0x73, 0xff, 0xb2, 0x59, 0x39, 0x59, 0x32, 0x3d, 0x80, 0x4a,
-	0x88, 0x67, 0xd2, 0x5d, 0x91, 0x74, 0x33, 0x09, 0x9f, 0x66, 0xb2, 0x8c, 0x23, 0xb8, 0xfd, 0x02,
-	0x2f, 0x88, 0xb3, 0x26, 0x1f, 0xc2, 0xae, 0xf6, 0x70, 0xee, 0x83, 0x01, 0x69, 0xe8, 0x1b, 0x6f,
-	0x8a, 0xc6, 0x18, 0x6a, 0xcf, 0x63, 0xf4, 0x24, 0xae, 0x94, 0x7e, 0x68, 0x3e, 0x9f, 0x43, 0x39,
-	0xad, 0x57, 0x42, 0xd6, 0x35, 0xa2, 0x73, 0x0d, 0x0e, 0xb5, 0xef, 0xa3, 0x51, 0x11, 0xcf, 0x3a,
-	0x89, 0xd7, 0x24, 0xfc, 0x02, 0x6a, 0xc7, 0x18, 0xe0, 0x35, 0x08, 0xed, 0x7f, 0xb6, 0xa0, 0xaa,
-	0xf7, 0xf7, 0x0a, 0xe3, 0x39, 0x1b, 0x62, 0xcf, 0xa6, 0xbf, 0x11, 0xd8, 0x7b, 0x7f, 0xb7, 0xb4,
-	0x5d, 0x24, 0xa4, 0xc8, 0x6b, 0x8d, 0x47, 0x57, 0xc8, 0x4c, 0x8d, 0x62, 0xb4, 0x7e, 0xf9, 0xfb,
-	0xdf, 0x3f, 0x4a, 0x9f, 0xd0, 0x87, 0xc9, 0x3f, 0xe7, 0x9f, 0xd3, 0x99, 0x7f, 0x15, 0xc5, 0xfc,
-	0x47, 0x1c, 0x4a, 0x61, 0x1d, 0xbe, 0xb1, 0x32, 0x67, 0xbc, 0x25, 0xf0, 0x71, 0x7e, 0xe5, 0xf4,
-	0xa0, 0x80, 0xa4, 0xc0, 0x13, 0x8d, 0x4b, 0xe7, 0x67, 0x98, 0x8a, 0xbf, 0x4d, 0x0f, 0x14, 0x7f,
-	0x6e, 0x50, 0x39, 0x11, 0x99, 0x06, 0xeb, 0xf0, 0x0d, 0xfd, 0x95, 0x40, 0x65, 0xc9, 0x41, 0xb4,
-	0xa8, 0xdd, 0x62, 0x97, 0xad, 0x11, 0x63, 0x29, 0x31, 0x8f, 0x8c, 0x75, 0xc3, 0x78, 0xaa, 0xb7,
-	0x4e, 0x7f, 0x27, 0x50, 0x59, 0xf2, 0x59, 0xa1, 0x9a, 0x62, 0x2f, 0xae, 0x51, 0x73, 0xa4, 0xd4,
-	0x7c, 0xda, 0xb8, 0xe2, 0x68, 0x16, 0xa2, 0xde, 0x12, 0xa8, 0x2c, 0x79, 0xb1, 0x50, 0x54, 0xb1,
-	0x5f, 0x1b, 0xb5, 0x2c, 0x35, 0xfb, 0x1a, 0x34, 0x4f, 0x92, 0xef, 0xc8, 0x6c, 0x53, 0x87, 0x57,
-	0x94, 0xd3, 0x79, 0x47, 0xe0, 0xee, 0x90, 0x4f, 0x57, 0x89, 0x3b, 0xb7, 0xbb, 0xe9, 0x59, 0x7b,
-	0xf1, 0x34, 0xe1, 0x39, 0x25, 0x3f, 0x3c, 0xd1, 0x99, 0x3e, 0x0f, 0xbc, 0xd0, 0x37, 0x79, 0xec,
-	0x5b, 0x3e, 0x86, 0x4a, 0x85, 0x95, 0x42, 0x5e, 0xc4, 0x44, 0xee, 0xc7, 0xc4, 0x97, 0xfa, 0xf8,
-	0x1f, 0x21, 0x7f, 0x96, 0xee, 0xbd, 0x48, 0xab, 0x9f, 0x07, 0x7c, 0x36, 0x32, 0x35, 0x83, 0xd9,
-	0xb3, 0xff, 0xca, 0x90, 0xbe, 0x42, 0xfa, 0x1a, 0xe9, 0xf7, 0xec, 0x41, 0x59, 0xbd, 0xfd, 0xd9,
-	0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf7, 0xb9, 0xb3, 0xe4, 0xa7, 0x08, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/logging/v2/logging_metrics.proto", fileDescriptor_logging_metrics_447f4682ca2f30ca)
+}
+
+var fileDescriptor_logging_metrics_447f4682ca2f30ca = []byte{
+	// 850 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0x66, 0x9c, 0xc4, 0x69, 0x5e, 0x68, 0xec, 0x4e, 0x5b, 0x77, 0xe5, 0xa6, 0xaa, 0xd9, 0x43,
+	0xe2, 0xe6, 0xb0, 0x4b, 0x17, 0x14, 0x95, 0x22, 0x0e, 0xb8, 0x89, 0x2a, 0x24, 0x17, 0xa2, 0x2d,
+	0xf8, 0x80, 0x2c, 0xad, 0xd6, 0xf6, 0xf3, 0x6a, 0xf0, 0x7a, 0x67, 0xd9, 0x19, 0x5b, 0x49, 0x51,
+	0x2f, 0xa8, 0x37, 0x24, 0x0e, 0xf0, 0x03, 0x38, 0x70, 0xe3, 0xa7, 0x70, 0x85, 0x9f, 0xc0, 0x8f,
+	0xe0, 0x88, 0x76, 0x76, 0xd6, 0xd9, 0xda, 0x4b, 0x1c, 0xf5, 0x94, 0x99, 0xf7, 0xbd, 0x37, 0xdf,
+	0xf7, 0xde, 0xfb, 0x1c, 0x1b, 0x0e, 0x03, 0xce, 0x83, 0x10, 0xed, 0x90, 0x07, 0x01, 0x8b, 0x02,
+	0x7b, 0xee, 0xe4, 0x47, 0x6f, 0x8a, 0x32, 0x61, 0x43, 0x61, 0xc5, 0x09, 0x97, 0x9c, 0xde, 0xca,
+	0x12, 0x2d, 0x8d, 0x5a, 0x73, 0xa7, 0xb9, 0xaf, 0x6b, 0xfd, 0x98, 0xd9, 0x7e, 0x14, 0x71, 0xe9,
+	0x4b, 0xc6, 0x23, 0x5d, 0xd0, 0x7c, 0x50, 0x40, 0x47, 0x4c, 0xc8, 0x84, 0x0d, 0x66, 0x29, 0xae,
+	0xe1, 0x7b, 0x05, 0x38, 0x63, 0xd2, 0xc0, 0x7d, 0x0d, 0xa8, 0xdb, 0x60, 0x36, 0xb6, 0x71, 0x1a,
+	0xcb, 0x0b, 0x0d, 0xb6, 0x96, 0xc1, 0x31, 0xc3, 0x70, 0xe4, 0x4d, 0x7d, 0x31, 0xc9, 0x32, 0xcc,
+	0xdf, 0x37, 0x61, 0xa7, 0xcb, 0x83, 0x17, 0xea, 0x49, 0x4a, 0x61, 0x33, 0xf2, 0xa7, 0x68, 0x90,
+	0x16, 0x69, 0xef, 0xb8, 0xea, 0x4c, 0x5b, 0xb0, 0x3b, 0x42, 0x31, 0x4c, 0x58, 0x9c, 0xca, 0x31,
+	0x2a, 0x0a, 0x2a, 0x86, 0x68, 0x03, 0xaa, 0x63, 0x16, 0x4a, 0x4c, 0x8c, 0x0d, 0x05, 0xea, 0x1b,
+	0xfd, 0x02, 0x6e, 0x65, 0x52, 0xbd, 0x3c, 0x9b, 0x27, 0xc6, 0x56, 0x8b, 0xb4, 0x77, 0x9d, 0x7d,
+	0x4b, 0xcf, 0xc7, 0x8f, 0x99, 0x95, 0x91, 0x9f, 0x2c, 0x72, 0xdc, 0xfa, 0x74, 0x29, 0x42, 0x0f,
+	0xa1, 0x36, 0xf7, 0xc3, 0x19, 0x7a, 0x78, 0x2e, 0x13, 0x7f, 0x98, 0x3e, 0x54, 0x55, 0x5c, 0x7b,
+	0x2a, 0x7c, 0x9a, 0x47, 0x69, 0x1f, 0xea, 0xa1, 0x3f, 0xc0, 0xf0, 0x32, 0x51, 0x18, 0xdb, 0xad,
+	0x8d, 0xf6, 0xae, 0xf3, 0xd8, 0x5a, 0x59, 0x89, 0xb5, 0xe8, 0xdc, 0xea, 0xa6, 0x45, 0x8b, 0x67,
+	0xc4, 0x69, 0x24, 0x93, 0x0b, 0xb7, 0x16, 0xbe, 0x1d, 0xa5, 0x2f, 0x60, 0x6f, 0x30, 0x1b, 0x4e,
+	0x50, 0x7a, 0x5c, 0xb5, 0x2e, 0x8c, 0x1b, 0xaa, 0x9d, 0x83, 0x62, 0x3b, 0x27, 0xc5, 0xed, 0x75,
+	0x54, 0xfa, 0x57, 0x59, 0xb6, 0x7b, 0x73, 0x50, 0xbc, 0xd2, 0x53, 0xd8, 0x9e, 0x63, 0x22, 0xd2,
+	0xb1, 0x6e, 0xb6, 0x48, 0x7b, 0xcf, 0x39, 0xbc, 0x52, 0xe3, 0xe7, 0x31, 0xeb, 0x65, 0xe9, 0x9d,
+	0x8a, 0x41, 0xdc, 0xbc, 0xb6, 0xd9, 0x81, 0x3b, 0x65, 0xf2, 0x69, 0x1d, 0x36, 0x26, 0x78, 0xa1,
+	0x97, 0x99, 0x1e, 0xe9, 0x1d, 0xd8, 0x52, 0xf3, 0xd2, 0x5b, 0xcc, 0x2e, 0x4f, 0x2b, 0x4f, 0x88,
+	0xb9, 0x0f, 0x70, 0xf9, 0x3c, 0xad, 0x42, 0xa5, 0xe7, 0xd4, 0xdf, 0x53, 0x7f, 0x1f, 0xd7, 0x89,
+	0x39, 0x81, 0xbb, 0x5d, 0x26, 0xe4, 0x42, 0x8a, 0x70, 0xf1, 0xfb, 0x19, 0x0a, 0x99, 0xae, 0x3e,
+	0xf6, 0x13, 0x8c, 0xa4, 0x66, 0xd1, 0x37, 0xfa, 0x00, 0x20, 0xf6, 0x03, 0xf4, 0x24, 0x9f, 0x60,
+	0xee, 0x99, 0x9d, 0x34, 0xf2, 0x75, 0x1a, 0xa0, 0xf7, 0x41, 0x5d, 0x3c, 0xc1, 0x5e, 0xa1, 0x32,
+	0xcd, 0x96, 0x7b, 0x23, 0x0d, 0xbc, 0x64, 0xaf, 0xd0, 0x3c, 0x87, 0xc6, 0x32, 0x99, 0x88, 0x79,
+	0x24, 0x90, 0x1e, 0xc3, 0xb6, 0xfe, 0x94, 0x19, 0x44, 0xed, 0x74, 0xff, 0xaa, 0x79, 0xb9, 0x79,
+	0x32, 0x3d, 0x80, 0x5a, 0x84, 0xe7, 0xd2, 0x5b, 0x91, 0x74, 0x33, 0x0d, 0x9f, 0xe5, 0xb2, 0xcc,
+	0x63, 0xb8, 0xfd, 0x1c, 0x2f, 0x89, 0xf3, 0x26, 0x1f, 0xc2, 0xae, 0xf6, 0x71, 0xe1, 0xc3, 0x01,
+	0x59, 0xe8, 0x4b, 0x7f, 0x8a, 0xe6, 0x18, 0x1a, 0xcf, 0x12, 0xf4, 0x25, 0xae, 0x94, 0xfe, 0xdf,
+	0x7c, 0x3e, 0x86, 0x6a, 0x56, 0xaf, 0x84, 0xac, 0x6b, 0x44, 0xe7, 0x9a, 0x1c, 0x1a, 0xdf, 0xc4,
+	0xa3, 0x32, 0x9e, 0x75, 0x12, 0xdf, 0x91, 0xf0, 0x13, 0x68, 0x9c, 0x60, 0x88, 0xef, 0x40, 0xe8,
+	0xfc, 0xbd, 0x05, 0x75, 0xbd, 0xbf, 0x97, 0x98, 0xcc, 0xd9, 0x10, 0x7b, 0x0e, 0xfd, 0x99, 0xc0,
+	0xde, 0xdb, 0xbb, 0xa5, 0xed, 0x32, 0x21, 0x65, 0x5e, 0x6b, 0x3e, 0xba, 0x46, 0x66, 0x66, 0x14,
+	0xf3, 0xf0, 0xc7, 0xbf, 0xfe, 0xf9, 0xb5, 0xf2, 0x01, 0x7d, 0x98, 0xfe, 0x83, 0xfe, 0x21, 0x9b,
+	0xf9, 0x67, 0x71, 0xc2, 0xbf, 0xc3, 0xa1, 0x14, 0xf6, 0xd1, 0x6b, 0x3b, 0x77, 0xc6, 0x1b, 0x02,
+	0xef, 0x17, 0x57, 0x4e, 0x0f, 0x4a, 0x48, 0x4a, 0x3c, 0xd1, 0xbc, 0x72, 0x7e, 0xa6, 0xa5, 0xf8,
+	0xdb, 0xf4, 0x40, 0xf1, 0x17, 0x06, 0x55, 0x10, 0x91, 0x6b, 0xb0, 0x8f, 0x5e, 0xd3, 0x9f, 0x08,
+	0xd4, 0x96, 0x1c, 0x44, 0xcb, 0xda, 0x2d, 0x77, 0xd9, 0x1a, 0x31, 0xb6, 0x12, 0xf3, 0xc8, 0x5c,
+	0x37, 0x8c, 0xa7, 0x7a, 0xeb, 0xf4, 0x17, 0x02, 0xb5, 0x25, 0x9f, 0x95, 0xaa, 0x29, 0xf7, 0xe2,
+	0x1a, 0x35, 0xc7, 0x4a, 0xcd, 0x87, 0xcd, 0x6b, 0x8e, 0x66, 0x21, 0xea, 0x0d, 0x81, 0xda, 0x92,
+	0x17, 0x4b, 0x45, 0x95, 0xfb, 0xb5, 0xd9, 0xc8, 0x53, 0xf3, 0xaf, 0x42, 0xeb, 0x34, 0xfd, 0x9e,
+	0xcc, 0x37, 0x75, 0x74, 0x4d, 0x39, 0x9d, 0xdf, 0x08, 0xdc, 0x1d, 0xf2, 0xe9, 0x2a, 0x71, 0xe7,
+	0x76, 0x37, 0x3b, 0x6b, 0x2f, 0x9e, 0xa5, 0x3c, 0x67, 0xe4, 0xdb, 0x27, 0x3a, 0x33, 0xe0, 0xa1,
+	0x1f, 0x05, 0x16, 0x4f, 0x02, 0x3b, 0xc0, 0x48, 0xa9, 0xb0, 0x33, 0xc8, 0x8f, 0x99, 0x28, 0xfc,
+	0xa0, 0xf8, 0x54, 0x1f, 0xff, 0x25, 0xe4, 0x8f, 0xca, 0xbd, 0xe7, 0x59, 0xf5, 0xb3, 0x90, 0xcf,
+	0x46, 0x96, 0x66, 0xb0, 0x7a, 0xce, 0x9f, 0x39, 0xd2, 0x57, 0x48, 0x5f, 0x23, 0xfd, 0x9e, 0x33,
+	0xa8, 0xaa, 0xb7, 0x3f, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x79, 0xf6, 0xb5, 0xab, 0x08,
+	0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/longrunning/operations.pb.go b/vendor/google.golang.org/genproto/googleapis/longrunning/operations.pb.go
index 913607f3..06eed24b 100644
--- a/vendor/google.golang.org/genproto/googleapis/longrunning/operations.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/longrunning/operations.pb.go
@@ -1,29 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/longrunning/operations.proto
 
-/*
-Package longrunning is a generated protocol buffer package.
-
-It is generated from these files:
-	google/longrunning/operations.proto
-
-It has these top-level messages:
-	Operation
-	GetOperationRequest
-	ListOperationsRequest
-	ListOperationsResponse
-	CancelOperationRequest
-	DeleteOperationRequest
-*/
-package longrunning
+package longrunning // import "google.golang.org/genproto/googleapis/longrunning"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -47,16 +33,16 @@ type Operation struct {
 	// The server-assigned name, which is only unique within the same service that
 	// originally returns it. If you use the default HTTP mapping, the
 	// `name` should have the format of `operations/some/unique/name`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Service-specific metadata associated with the operation.  It typically
 	// contains progress information and common metadata such as create time.
 	// Some services might not provide such metadata.  Any method that returns a
 	// long-running operation should document the metadata type, if any.
-	Metadata *google_protobuf1.Any `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"`
+	Metadata *any.Any `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// If the value is `false`, it means the operation is still in progress.
 	// If true, the operation is completed, and either `error` or `response` is
 	// available.
-	Done bool `protobuf:"varint,3,opt,name=done" json:"done,omitempty"`
+	Done bool `protobuf:"varint,3,opt,name=done,proto3" json:"done,omitempty"`
 	// The operation result, which can be either an `error` or a valid `response`.
 	// If `done` == `false`, neither `error` nor `response` is set.
 	// If `done` == `true`, exactly one of `error` or `response` is set.
@@ -64,34 +50,35 @@ type Operation struct {
 	// Types that are valid to be assigned to Result:
 	//	*Operation_Error
 	//	*Operation_Response
-	Result isOperation_Result `protobuf_oneof:"result"`
+	Result               isOperation_Result `protobuf_oneof:"result"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *Operation) Reset()                    { *m = Operation{} }
-func (m *Operation) String() string            { return proto.CompactTextString(m) }
-func (*Operation) ProtoMessage()               {}
-func (*Operation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type isOperation_Result interface {
-	isOperation_Result()
+func (m *Operation) Reset()         { *m = Operation{} }
+func (m *Operation) String() string { return proto.CompactTextString(m) }
+func (*Operation) ProtoMessage()    {}
+func (*Operation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_6e3ea16d34200c2d, []int{0}
 }
-
-type Operation_Error struct {
-	Error *google_rpc.Status `protobuf:"bytes,4,opt,name=error,oneof"`
+func (m *Operation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Operation.Unmarshal(m, b)
 }
-type Operation_Response struct {
-	Response *google_protobuf1.Any `protobuf:"bytes,5,opt,name=response,oneof"`
+func (m *Operation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Operation.Marshal(b, m, deterministic)
 }
-
-func (*Operation_Error) isOperation_Result()    {}
-func (*Operation_Response) isOperation_Result() {}
-
-func (m *Operation) GetResult() isOperation_Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
+func (dst *Operation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Operation.Merge(dst, src)
+}
+func (m *Operation) XXX_Size() int {
+	return xxx_messageInfo_Operation.Size(m)
 }
+func (m *Operation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Operation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Operation proto.InternalMessageInfo
 
 func (m *Operation) GetName() string {
 	if m != nil {
@@ -100,7 +87,7 @@ func (m *Operation) GetName() string {
 	return ""
 }
 
-func (m *Operation) GetMetadata() *google_protobuf1.Any {
+func (m *Operation) GetMetadata() *any.Any {
 	if m != nil {
 		return m.Metadata
 	}
@@ -114,14 +101,37 @@ func (m *Operation) GetDone() bool {
 	return false
 }
 
-func (m *Operation) GetError() *google_rpc.Status {
+type isOperation_Result interface {
+	isOperation_Result()
+}
+
+type Operation_Error struct {
+	Error *status.Status `protobuf:"bytes,4,opt,name=error,proto3,oneof"`
+}
+
+type Operation_Response struct {
+	Response *any.Any `protobuf:"bytes,5,opt,name=response,proto3,oneof"`
+}
+
+func (*Operation_Error) isOperation_Result() {}
+
+func (*Operation_Response) isOperation_Result() {}
+
+func (m *Operation) GetResult() isOperation_Result {
+	if m != nil {
+		return m.Result
+	}
+	return nil
+}
+
+func (m *Operation) GetError() *status.Status {
 	if x, ok := m.GetResult().(*Operation_Error); ok {
 		return x.Error
 	}
 	return nil
 }
 
-func (m *Operation) GetResponse() *google_protobuf1.Any {
+func (m *Operation) GetResponse() *any.Any {
 	if x, ok := m.GetResult().(*Operation_Response); ok {
 		return x.Response
 	}
@@ -164,7 +174,7 @@ func _Operation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buff
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_rpc.Status)
+		msg := new(status.Status)
 		err := b.DecodeMessage(msg)
 		m.Result = &Operation_Error{msg}
 		return true, err
@@ -172,7 +182,7 @@ func _Operation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buff
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Any)
+		msg := new(any.Any)
 		err := b.DecodeMessage(msg)
 		m.Result = &Operation_Response{msg}
 		return true, err
@@ -187,12 +197,12 @@ func _Operation_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Result.(type) {
 	case *Operation_Error:
 		s := proto.Size(x.Error)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Operation_Response:
 		s := proto.Size(x.Response)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -205,13 +215,35 @@ func _Operation_OneofSizer(msg proto.Message) (n int) {
 // The request message for [Operations.GetOperation][google.longrunning.Operations.GetOperation].
 type GetOperationRequest struct {
 	// The name of the operation resource.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetOperationRequest) Reset()         { *m = GetOperationRequest{} }
+func (m *GetOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*GetOperationRequest) ProtoMessage()    {}
+func (*GetOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_6e3ea16d34200c2d, []int{1}
+}
+func (m *GetOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetOperationRequest.Unmarshal(m, b)
+}
+func (m *GetOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetOperationRequest.Merge(dst, src)
+}
+func (m *GetOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_GetOperationRequest.Size(m)
+}
+func (m *GetOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetOperationRequest.DiscardUnknown(m)
 }
 
-func (m *GetOperationRequest) Reset()                    { *m = GetOperationRequest{} }
-func (m *GetOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetOperationRequest) ProtoMessage()               {}
-func (*GetOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_GetOperationRequest proto.InternalMessageInfo
 
 func (m *GetOperationRequest) GetName() string {
 	if m != nil {
@@ -223,19 +255,41 @@ func (m *GetOperationRequest) GetName() string {
 // The request message for [Operations.ListOperations][google.longrunning.Operations.ListOperations].
 type ListOperationsRequest struct {
 	// The name of the operation collection.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	// The standard list filter.
-	Filter string `protobuf:"bytes,1,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The standard list page size.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The standard list page token.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListOperationsRequest) Reset()                    { *m = ListOperationsRequest{} }
-func (m *ListOperationsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListOperationsRequest) ProtoMessage()               {}
-func (*ListOperationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *ListOperationsRequest) Reset()         { *m = ListOperationsRequest{} }
+func (m *ListOperationsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListOperationsRequest) ProtoMessage()    {}
+func (*ListOperationsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_6e3ea16d34200c2d, []int{2}
+}
+func (m *ListOperationsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOperationsRequest.Unmarshal(m, b)
+}
+func (m *ListOperationsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOperationsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListOperationsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsRequest.Merge(dst, src)
+}
+func (m *ListOperationsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListOperationsRequest.Size(m)
+}
+func (m *ListOperationsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOperationsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListOperationsRequest proto.InternalMessageInfo
 
 func (m *ListOperationsRequest) GetName() string {
 	if m != nil {
@@ -268,15 +322,37 @@ func (m *ListOperationsRequest) GetPageToken() string {
 // The response message for [Operations.ListOperations][google.longrunning.Operations.ListOperations].
 type ListOperationsResponse struct {
 	// A list of operations that matches the specified filter in the request.
-	Operations []*Operation `protobuf:"bytes,1,rep,name=operations" json:"operations,omitempty"`
+	Operations []*Operation `protobuf:"bytes,1,rep,name=operations,proto3" json:"operations,omitempty"`
 	// The standard List next-page token.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListOperationsResponse) Reset()         { *m = ListOperationsResponse{} }
+func (m *ListOperationsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListOperationsResponse) ProtoMessage()    {}
+func (*ListOperationsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_6e3ea16d34200c2d, []int{3}
+}
+func (m *ListOperationsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOperationsResponse.Unmarshal(m, b)
+}
+func (m *ListOperationsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOperationsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListOperationsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOperationsResponse.Merge(dst, src)
+}
+func (m *ListOperationsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListOperationsResponse.Size(m)
+}
+func (m *ListOperationsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOperationsResponse.DiscardUnknown(m)
 }
 
-func (m *ListOperationsResponse) Reset()                    { *m = ListOperationsResponse{} }
-func (m *ListOperationsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListOperationsResponse) ProtoMessage()               {}
-func (*ListOperationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_ListOperationsResponse proto.InternalMessageInfo
 
 func (m *ListOperationsResponse) GetOperations() []*Operation {
 	if m != nil {
@@ -295,13 +371,35 @@ func (m *ListOperationsResponse) GetNextPageToken() string {
 // The request message for [Operations.CancelOperation][google.longrunning.Operations.CancelOperation].
 type CancelOperationRequest struct {
 	// The name of the operation resource to be cancelled.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CancelOperationRequest) Reset()         { *m = CancelOperationRequest{} }
+func (m *CancelOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelOperationRequest) ProtoMessage()    {}
+func (*CancelOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_6e3ea16d34200c2d, []int{4}
+}
+func (m *CancelOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelOperationRequest.Unmarshal(m, b)
+}
+func (m *CancelOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelOperationRequest.Merge(dst, src)
+}
+func (m *CancelOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelOperationRequest.Size(m)
+}
+func (m *CancelOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelOperationRequest.DiscardUnknown(m)
 }
 
-func (m *CancelOperationRequest) Reset()                    { *m = CancelOperationRequest{} }
-func (m *CancelOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelOperationRequest) ProtoMessage()               {}
-func (*CancelOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_CancelOperationRequest proto.InternalMessageInfo
 
 func (m *CancelOperationRequest) GetName() string {
 	if m != nil {
@@ -313,13 +411,35 @@ func (m *CancelOperationRequest) GetName() string {
 // The request message for [Operations.DeleteOperation][google.longrunning.Operations.DeleteOperation].
 type DeleteOperationRequest struct {
 	// The name of the operation resource to be deleted.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteOperationRequest) Reset()                    { *m = DeleteOperationRequest{} }
-func (m *DeleteOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteOperationRequest) ProtoMessage()               {}
-func (*DeleteOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *DeleteOperationRequest) Reset()         { *m = DeleteOperationRequest{} }
+func (m *DeleteOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteOperationRequest) ProtoMessage()    {}
+func (*DeleteOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_operations_6e3ea16d34200c2d, []int{5}
+}
+func (m *DeleteOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteOperationRequest.Unmarshal(m, b)
+}
+func (m *DeleteOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteOperationRequest.Merge(dst, src)
+}
+func (m *DeleteOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteOperationRequest.Size(m)
+}
+func (m *DeleteOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteOperationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteOperationRequest proto.InternalMessageInfo
 
 func (m *DeleteOperationRequest) GetName() string {
 	if m != nil {
@@ -345,8 +465,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Operations service
-
+// OperationsClient is the client API for Operations service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type OperationsClient interface {
 	// Lists operations that match the specified filter in the request. If the
 	// server doesn't support this method, it returns `UNIMPLEMENTED`.
@@ -362,7 +483,7 @@ type OperationsClient interface {
 	// no longer interested in the operation result. It does not cancel the
 	// operation. If the server doesn't support this method, it returns
 	// `google.rpc.Code.UNIMPLEMENTED`.
-	DeleteOperation(ctx context.Context, in *DeleteOperationRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteOperation(ctx context.Context, in *DeleteOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Starts asynchronous cancellation on a long-running operation.  The server
 	// makes a best effort to cancel the operation, but success is not
 	// guaranteed.  If the server doesn't support this method, it returns
@@ -373,7 +494,7 @@ type OperationsClient interface {
 	// the operation is not deleted; instead, it becomes an operation with
 	// an [Operation.error][google.longrunning.Operation.error] value with a [google.rpc.Status.code][google.rpc.Status.code] of 1,
 	// corresponding to `Code.CANCELLED`.
-	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type operationsClient struct {
@@ -386,7 +507,7 @@ func NewOperationsClient(cc *grpc.ClientConn) OperationsClient {
 
 func (c *operationsClient) ListOperations(ctx context.Context, in *ListOperationsRequest, opts ...grpc.CallOption) (*ListOperationsResponse, error) {
 	out := new(ListOperationsResponse)
-	err := grpc.Invoke(ctx, "/google.longrunning.Operations/ListOperations", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.longrunning.Operations/ListOperations", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -395,33 +516,32 @@ func (c *operationsClient) ListOperations(ctx context.Context, in *ListOperation
 
 func (c *operationsClient) GetOperation(ctx context.Context, in *GetOperationRequest, opts ...grpc.CallOption) (*Operation, error) {
 	out := new(Operation)
-	err := grpc.Invoke(ctx, "/google.longrunning.Operations/GetOperation", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.longrunning.Operations/GetOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *operationsClient) DeleteOperation(ctx context.Context, in *DeleteOperationRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.longrunning.Operations/DeleteOperation", in, out, c.cc, opts...)
+func (c *operationsClient) DeleteOperation(ctx context.Context, in *DeleteOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.longrunning.Operations/DeleteOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *operationsClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.longrunning.Operations/CancelOperation", in, out, c.cc, opts...)
+func (c *operationsClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.longrunning.Operations/CancelOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Operations service
-
+// OperationsServer is the server API for Operations service.
 type OperationsServer interface {
 	// Lists operations that match the specified filter in the request. If the
 	// server doesn't support this method, it returns `UNIMPLEMENTED`.
@@ -437,7 +557,7 @@ type OperationsServer interface {
 	// no longer interested in the operation result. It does not cancel the
 	// operation. If the server doesn't support this method, it returns
 	// `google.rpc.Code.UNIMPLEMENTED`.
-	DeleteOperation(context.Context, *DeleteOperationRequest) (*google_protobuf2.Empty, error)
+	DeleteOperation(context.Context, *DeleteOperationRequest) (*empty.Empty, error)
 	// Starts asynchronous cancellation on a long-running operation.  The server
 	// makes a best effort to cancel the operation, but success is not
 	// guaranteed.  If the server doesn't support this method, it returns
@@ -448,7 +568,7 @@ type OperationsServer interface {
 	// the operation is not deleted; instead, it becomes an operation with
 	// an [Operation.error][google.longrunning.Operation.error] value with a [google.rpc.Status.code][google.rpc.Status.code] of 1,
 	// corresponding to `Code.CANCELLED`.
-	CancelOperation(context.Context, *CancelOperationRequest) (*google_protobuf2.Empty, error)
+	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
 }
 
 func RegisterOperationsServer(s *grpc.Server, srv OperationsServer) {
@@ -552,9 +672,11 @@ var _Operations_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/longrunning/operations.proto",
 }
 
-func init() { proto.RegisterFile("google/longrunning/operations.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/longrunning/operations.proto", fileDescriptor_operations_6e3ea16d34200c2d)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_operations_6e3ea16d34200c2d = []byte{
 	// 597 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xc1, 0x6e, 0xd3, 0x4c,
 	0x10, 0xae, 0xd3, 0xb4, 0x4a, 0xa6, 0xff, 0x4f, 0xa4, 0x85, 0xba, 0xc6, 0x25, 0x22, 0x32, 0x08,
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert.pb.go
new file mode 100644
index 00000000..583adca7
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert.pb.go
@@ -0,0 +1,958 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/monitoring/v3/alert.proto
+
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Operators for combining conditions.
+type AlertPolicy_ConditionCombinerType int32
+
+const (
+	// An unspecified combiner.
+	AlertPolicy_COMBINE_UNSPECIFIED AlertPolicy_ConditionCombinerType = 0
+	// Combine conditions using the logical `AND` operator. An
+	// incident is created only if all conditions are met
+	// simultaneously. This combiner is satisfied if all conditions are
+	// met, even if they are met on completely different resources.
+	AlertPolicy_AND AlertPolicy_ConditionCombinerType = 1
+	// Combine conditions using the logical `OR` operator. An incident
+	// is created if any of the listed conditions is met.
+	AlertPolicy_OR AlertPolicy_ConditionCombinerType = 2
+	// Combine conditions using logical `AND` operator, but unlike the regular
+	// `AND` option, an incident is created only if all conditions are met
+	// simultaneously on at least one resource.
+	AlertPolicy_AND_WITH_MATCHING_RESOURCE AlertPolicy_ConditionCombinerType = 3
+)
+
+var AlertPolicy_ConditionCombinerType_name = map[int32]string{
+	0: "COMBINE_UNSPECIFIED",
+	1: "AND",
+	2: "OR",
+	3: "AND_WITH_MATCHING_RESOURCE",
+}
+var AlertPolicy_ConditionCombinerType_value = map[string]int32{
+	"COMBINE_UNSPECIFIED": 0,
+	"AND": 1,
+	"OR":  2,
+	"AND_WITH_MATCHING_RESOURCE": 3,
+}
+
+func (x AlertPolicy_ConditionCombinerType) String() string {
+	return proto.EnumName(AlertPolicy_ConditionCombinerType_name, int32(x))
+}
+func (AlertPolicy_ConditionCombinerType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_alert_3dd18d9aa69795e4, []int{0, 0}
+}
+
+// A description of the conditions under which some aspect of your system is
+// considered to be "unhealthy" and the ways to notify people or services about
+// this state. For an overview of alert policies, see
+// [Introduction to Alerting](/monitoring/alerts/).
+type AlertPolicy struct {
+	// Required if the policy exists. The resource name for this policy. The
+	// syntax is:
+	//
+	//     projects/[PROJECT_ID]/alertPolicies/[ALERT_POLICY_ID]
+	//
+	// `[ALERT_POLICY_ID]` is assigned by Stackdriver Monitoring when the policy
+	// is created.  When calling the
+	// [alertPolicies.create][google.monitoring.v3.AlertPolicyService.CreateAlertPolicy]
+	// method, do not include the `name` field in the alerting policy passed as
+	// part of the request.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// A short name or phrase used to identify the policy in dashboards,
+	// notifications, and incidents. To avoid confusion, don't use the same
+	// display name for multiple policies in the same project. The name is
+	// limited to 512 Unicode characters.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Documentation that is included with notifications and incidents related to
+	// this policy. Best practice is for the documentation to include information
+	// to help responders understand, mitigate, escalate, and correct the
+	// underlying problems detected by the alerting policy. Notification channels
+	// that have limited capacity might not show this documentation.
+	Documentation *AlertPolicy_Documentation `protobuf:"bytes,13,opt,name=documentation,proto3" json:"documentation,omitempty"`
+	// User-supplied key/value data to be used for organizing and
+	// identifying the `AlertPolicy` objects.
+	//
+	// The field can contain up to 64 entries. Each key and value is limited to
+	// 63 Unicode characters or 128 bytes, whichever is smaller. Labels and
+	// values can contain only lowercase letters, numerals, underscores, and
+	// dashes. Keys must begin with a letter.
+	UserLabels map[string]string `protobuf:"bytes,16,rep,name=user_labels,json=userLabels,proto3" json:"user_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// A list of conditions for the policy. The conditions are combined by AND or
+	// OR according to the `combiner` field. If the combined conditions evaluate
+	// to true, then an incident is created. A policy can have from one to six
+	// conditions.
+	Conditions []*AlertPolicy_Condition `protobuf:"bytes,12,rep,name=conditions,proto3" json:"conditions,omitempty"`
+	// How to combine the results of multiple conditions
+	// to determine if an incident should be opened.
+	Combiner AlertPolicy_ConditionCombinerType `protobuf:"varint,6,opt,name=combiner,proto3,enum=google.monitoring.v3.AlertPolicy_ConditionCombinerType" json:"combiner,omitempty"`
+	// Whether or not the policy is enabled. On write, the default interpretation
+	// if unset is that the policy is enabled. On read, clients should not make
+	// any assumption about the state if it has not been populated. The
+	// field should always be populated on List and Get operations, unless
+	// a field projection has been specified that strips it out.
+	Enabled *wrappers.BoolValue `protobuf:"bytes,17,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	// Identifies the notification channels to which notifications should be sent
+	// when incidents are opened or closed or when new violations occur on
+	// an already opened incident. Each element of this array corresponds to
+	// the `name` field in each of the
+	// [`NotificationChannel`][google.monitoring.v3.NotificationChannel]
+	// objects that are returned from the [`ListNotificationChannels`]
+	// [google.monitoring.v3.NotificationChannelService.ListNotificationChannels]
+	// method. The syntax of the entries in this field is:
+	//
+	//     projects/[PROJECT_ID]/notificationChannels/[CHANNEL_ID]
+	NotificationChannels []string `protobuf:"bytes,14,rep,name=notification_channels,json=notificationChannels,proto3" json:"notification_channels,omitempty"`
+	// A read-only record of the creation of the alerting policy. If provided
+	// in a call to create or update, this field will be ignored.
+	CreationRecord *MutationRecord `protobuf:"bytes,10,opt,name=creation_record,json=creationRecord,proto3" json:"creation_record,omitempty"`
+	// A read-only record of the most recent change to the alerting policy. If
+	// provided in a call to create or update, this field will be ignored.
+	MutationRecord       *MutationRecord `protobuf:"bytes,11,opt,name=mutation_record,json=mutationRecord,proto3" json:"mutation_record,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *AlertPolicy) Reset()         { *m = AlertPolicy{} }
+func (m *AlertPolicy) String() string { return proto.CompactTextString(m) }
+func (*AlertPolicy) ProtoMessage()    {}
+func (*AlertPolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_3dd18d9aa69795e4, []int{0}
+}
+func (m *AlertPolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AlertPolicy.Unmarshal(m, b)
+}
+func (m *AlertPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AlertPolicy.Marshal(b, m, deterministic)
+}
+func (dst *AlertPolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy.Merge(dst, src)
+}
+func (m *AlertPolicy) XXX_Size() int {
+	return xxx_messageInfo_AlertPolicy.Size(m)
+}
+func (m *AlertPolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_AlertPolicy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AlertPolicy proto.InternalMessageInfo
+
+func (m *AlertPolicy) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *AlertPolicy) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *AlertPolicy) GetDocumentation() *AlertPolicy_Documentation {
+	if m != nil {
+		return m.Documentation
+	}
+	return nil
+}
+
+func (m *AlertPolicy) GetUserLabels() map[string]string {
+	if m != nil {
+		return m.UserLabels
+	}
+	return nil
+}
+
+func (m *AlertPolicy) GetConditions() []*AlertPolicy_Condition {
+	if m != nil {
+		return m.Conditions
+	}
+	return nil
+}
+
+func (m *AlertPolicy) GetCombiner() AlertPolicy_ConditionCombinerType {
+	if m != nil {
+		return m.Combiner
+	}
+	return AlertPolicy_COMBINE_UNSPECIFIED
+}
+
+func (m *AlertPolicy) GetEnabled() *wrappers.BoolValue {
+	if m != nil {
+		return m.Enabled
+	}
+	return nil
+}
+
+func (m *AlertPolicy) GetNotificationChannels() []string {
+	if m != nil {
+		return m.NotificationChannels
+	}
+	return nil
+}
+
+func (m *AlertPolicy) GetCreationRecord() *MutationRecord {
+	if m != nil {
+		return m.CreationRecord
+	}
+	return nil
+}
+
+func (m *AlertPolicy) GetMutationRecord() *MutationRecord {
+	if m != nil {
+		return m.MutationRecord
+	}
+	return nil
+}
+
+// A content string and a MIME type that describes the content string's
+// format.
+type AlertPolicy_Documentation struct {
+	// The text of the documentation, interpreted according to `mime_type`.
+	// The content may not exceed 8,192 Unicode characters and may not exceed
+	// more than 10,240 bytes when encoded in UTF-8 format, whichever is
+	// smaller.
+	Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
+	// The format of the `content` field. Presently, only the value
+	// `"text/markdown"` is supported. See
+	// [Markdown](https://en.wikipedia.org/wiki/Markdown) for more information.
+	MimeType             string   `protobuf:"bytes,2,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AlertPolicy_Documentation) Reset()         { *m = AlertPolicy_Documentation{} }
+func (m *AlertPolicy_Documentation) String() string { return proto.CompactTextString(m) }
+func (*AlertPolicy_Documentation) ProtoMessage()    {}
+func (*AlertPolicy_Documentation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_3dd18d9aa69795e4, []int{0, 0}
+}
+func (m *AlertPolicy_Documentation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AlertPolicy_Documentation.Unmarshal(m, b)
+}
+func (m *AlertPolicy_Documentation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AlertPolicy_Documentation.Marshal(b, m, deterministic)
+}
+func (dst *AlertPolicy_Documentation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Documentation.Merge(dst, src)
+}
+func (m *AlertPolicy_Documentation) XXX_Size() int {
+	return xxx_messageInfo_AlertPolicy_Documentation.Size(m)
+}
+func (m *AlertPolicy_Documentation) XXX_DiscardUnknown() {
+	xxx_messageInfo_AlertPolicy_Documentation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AlertPolicy_Documentation proto.InternalMessageInfo
+
+func (m *AlertPolicy_Documentation) GetContent() string {
+	if m != nil {
+		return m.Content
+	}
+	return ""
+}
+
+func (m *AlertPolicy_Documentation) GetMimeType() string {
+	if m != nil {
+		return m.MimeType
+	}
+	return ""
+}
+
+// A condition is a true/false test that determines when an alerting policy
+// should open an incident. If a condition evaluates to true, it signifies
+// that something is wrong.
+type AlertPolicy_Condition struct {
+	// Required if the condition exists. The unique resource name for this
+	// condition. Its syntax is:
+	//
+	//     projects/[PROJECT_ID]/alertPolicies/[POLICY_ID]/conditions/[CONDITION_ID]
+	//
+	// `[CONDITION_ID]` is assigned by Stackdriver Monitoring when the
+	// condition is created as part of a new or updated alerting policy.
+	//
+	// When calling the
+	// [alertPolicies.create][google.monitoring.v3.AlertPolicyService.CreateAlertPolicy]
+	// method, do not include the `name` field in the conditions of the
+	// requested alerting policy. Stackdriver Monitoring creates the
+	// condition identifiers and includes them in the new policy.
+	//
+	// When calling the
+	// [alertPolicies.update][google.monitoring.v3.AlertPolicyService.UpdateAlertPolicy]
+	// method to update a policy, including a condition `name` causes the
+	// existing condition to be updated. Conditions without names are added to
+	// the updated policy. Existing conditions are deleted if they are not
+	// updated.
+	//
+	// Best practice is to preserve `[CONDITION_ID]` if you make only small
+	// changes, such as those to condition thresholds, durations, or trigger
+	// values.  Otherwise, treat the change as a new condition and let the
+	// existing condition be deleted.
+	Name string `protobuf:"bytes,12,opt,name=name,proto3" json:"name,omitempty"`
+	// A short name or phrase used to identify the condition in dashboards,
+	// notifications, and incidents. To avoid confusion, don't use the same
+	// display name for multiple conditions in the same policy.
+	DisplayName string `protobuf:"bytes,6,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Only one of the following condition types will be specified.
+	//
+	// Types that are valid to be assigned to Condition:
+	//	*AlertPolicy_Condition_ConditionThreshold
+	//	*AlertPolicy_Condition_ConditionAbsent
+	Condition            isAlertPolicy_Condition_Condition `protobuf_oneof:"condition"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *AlertPolicy_Condition) Reset()         { *m = AlertPolicy_Condition{} }
+func (m *AlertPolicy_Condition) String() string { return proto.CompactTextString(m) }
+func (*AlertPolicy_Condition) ProtoMessage()    {}
+func (*AlertPolicy_Condition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_3dd18d9aa69795e4, []int{0, 1}
+}
+func (m *AlertPolicy_Condition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AlertPolicy_Condition.Unmarshal(m, b)
+}
+func (m *AlertPolicy_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AlertPolicy_Condition.Marshal(b, m, deterministic)
+}
+func (dst *AlertPolicy_Condition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Condition.Merge(dst, src)
+}
+func (m *AlertPolicy_Condition) XXX_Size() int {
+	return xxx_messageInfo_AlertPolicy_Condition.Size(m)
+}
+func (m *AlertPolicy_Condition) XXX_DiscardUnknown() {
+	xxx_messageInfo_AlertPolicy_Condition.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AlertPolicy_Condition proto.InternalMessageInfo
+
+func (m *AlertPolicy_Condition) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *AlertPolicy_Condition) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+type isAlertPolicy_Condition_Condition interface {
+	isAlertPolicy_Condition_Condition()
+}
+
+type AlertPolicy_Condition_ConditionThreshold struct {
+	ConditionThreshold *AlertPolicy_Condition_MetricThreshold `protobuf:"bytes,1,opt,name=condition_threshold,json=conditionThreshold,proto3,oneof"`
+}
+
+type AlertPolicy_Condition_ConditionAbsent struct {
+	ConditionAbsent *AlertPolicy_Condition_MetricAbsence `protobuf:"bytes,2,opt,name=condition_absent,json=conditionAbsent,proto3,oneof"`
+}
+
+func (*AlertPolicy_Condition_ConditionThreshold) isAlertPolicy_Condition_Condition() {}
+
+func (*AlertPolicy_Condition_ConditionAbsent) isAlertPolicy_Condition_Condition() {}
+
+func (m *AlertPolicy_Condition) GetCondition() isAlertPolicy_Condition_Condition {
+	if m != nil {
+		return m.Condition
+	}
+	return nil
+}
+
+func (m *AlertPolicy_Condition) GetConditionThreshold() *AlertPolicy_Condition_MetricThreshold {
+	if x, ok := m.GetCondition().(*AlertPolicy_Condition_ConditionThreshold); ok {
+		return x.ConditionThreshold
+	}
+	return nil
+}
+
+func (m *AlertPolicy_Condition) GetConditionAbsent() *AlertPolicy_Condition_MetricAbsence {
+	if x, ok := m.GetCondition().(*AlertPolicy_Condition_ConditionAbsent); ok {
+		return x.ConditionAbsent
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*AlertPolicy_Condition) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _AlertPolicy_Condition_OneofMarshaler, _AlertPolicy_Condition_OneofUnmarshaler, _AlertPolicy_Condition_OneofSizer, []interface{}{
+		(*AlertPolicy_Condition_ConditionThreshold)(nil),
+		(*AlertPolicy_Condition_ConditionAbsent)(nil),
+	}
+}
+
+func _AlertPolicy_Condition_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*AlertPolicy_Condition)
+	// condition
+	switch x := m.Condition.(type) {
+	case *AlertPolicy_Condition_ConditionThreshold:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ConditionThreshold); err != nil {
+			return err
+		}
+	case *AlertPolicy_Condition_ConditionAbsent:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ConditionAbsent); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("AlertPolicy_Condition.Condition has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _AlertPolicy_Condition_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*AlertPolicy_Condition)
+	switch tag {
+	case 1: // condition.condition_threshold
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AlertPolicy_Condition_MetricThreshold)
+		err := b.DecodeMessage(msg)
+		m.Condition = &AlertPolicy_Condition_ConditionThreshold{msg}
+		return true, err
+	case 2: // condition.condition_absent
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AlertPolicy_Condition_MetricAbsence)
+		err := b.DecodeMessage(msg)
+		m.Condition = &AlertPolicy_Condition_ConditionAbsent{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _AlertPolicy_Condition_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*AlertPolicy_Condition)
+	// condition
+	switch x := m.Condition.(type) {
+	case *AlertPolicy_Condition_ConditionThreshold:
+		s := proto.Size(x.ConditionThreshold)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *AlertPolicy_Condition_ConditionAbsent:
+		s := proto.Size(x.ConditionAbsent)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Specifies how many time series must fail a predicate to trigger a
+// condition. If not specified, then a `{count: 1}` trigger is used.
+type AlertPolicy_Condition_Trigger struct {
+	// A type of trigger.
+	//
+	// Types that are valid to be assigned to Type:
+	//	*AlertPolicy_Condition_Trigger_Count
+	//	*AlertPolicy_Condition_Trigger_Percent
+	Type                 isAlertPolicy_Condition_Trigger_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}                             `json:"-"`
+	XXX_unrecognized     []byte                               `json:"-"`
+	XXX_sizecache        int32                                `json:"-"`
+}
+
+func (m *AlertPolicy_Condition_Trigger) Reset()         { *m = AlertPolicy_Condition_Trigger{} }
+func (m *AlertPolicy_Condition_Trigger) String() string { return proto.CompactTextString(m) }
+func (*AlertPolicy_Condition_Trigger) ProtoMessage()    {}
+func (*AlertPolicy_Condition_Trigger) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_3dd18d9aa69795e4, []int{0, 1, 0}
+}
+func (m *AlertPolicy_Condition_Trigger) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AlertPolicy_Condition_Trigger.Unmarshal(m, b)
+}
+func (m *AlertPolicy_Condition_Trigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AlertPolicy_Condition_Trigger.Marshal(b, m, deterministic)
+}
+func (dst *AlertPolicy_Condition_Trigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Condition_Trigger.Merge(dst, src)
+}
+func (m *AlertPolicy_Condition_Trigger) XXX_Size() int {
+	return xxx_messageInfo_AlertPolicy_Condition_Trigger.Size(m)
+}
+func (m *AlertPolicy_Condition_Trigger) XXX_DiscardUnknown() {
+	xxx_messageInfo_AlertPolicy_Condition_Trigger.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AlertPolicy_Condition_Trigger proto.InternalMessageInfo
+
+type isAlertPolicy_Condition_Trigger_Type interface {
+	isAlertPolicy_Condition_Trigger_Type()
+}
+
+type AlertPolicy_Condition_Trigger_Count struct {
+	Count int32 `protobuf:"varint,1,opt,name=count,proto3,oneof"`
+}
+
+type AlertPolicy_Condition_Trigger_Percent struct {
+	Percent float64 `protobuf:"fixed64,2,opt,name=percent,proto3,oneof"`
+}
+
+func (*AlertPolicy_Condition_Trigger_Count) isAlertPolicy_Condition_Trigger_Type() {}
+
+func (*AlertPolicy_Condition_Trigger_Percent) isAlertPolicy_Condition_Trigger_Type() {}
+
+func (m *AlertPolicy_Condition_Trigger) GetType() isAlertPolicy_Condition_Trigger_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *AlertPolicy_Condition_Trigger) GetCount() int32 {
+	if x, ok := m.GetType().(*AlertPolicy_Condition_Trigger_Count); ok {
+		return x.Count
+	}
+	return 0
+}
+
+func (m *AlertPolicy_Condition_Trigger) GetPercent() float64 {
+	if x, ok := m.GetType().(*AlertPolicy_Condition_Trigger_Percent); ok {
+		return x.Percent
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*AlertPolicy_Condition_Trigger) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _AlertPolicy_Condition_Trigger_OneofMarshaler, _AlertPolicy_Condition_Trigger_OneofUnmarshaler, _AlertPolicy_Condition_Trigger_OneofSizer, []interface{}{
+		(*AlertPolicy_Condition_Trigger_Count)(nil),
+		(*AlertPolicy_Condition_Trigger_Percent)(nil),
+	}
+}
+
+func _AlertPolicy_Condition_Trigger_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*AlertPolicy_Condition_Trigger)
+	// type
+	switch x := m.Type.(type) {
+	case *AlertPolicy_Condition_Trigger_Count:
+		b.EncodeVarint(1<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Count))
+	case *AlertPolicy_Condition_Trigger_Percent:
+		b.EncodeVarint(2<<3 | proto.WireFixed64)
+		b.EncodeFixed64(math.Float64bits(x.Percent))
+	case nil:
+	default:
+		return fmt.Errorf("AlertPolicy_Condition_Trigger.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _AlertPolicy_Condition_Trigger_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*AlertPolicy_Condition_Trigger)
+	switch tag {
+	case 1: // type.count
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Type = &AlertPolicy_Condition_Trigger_Count{int32(x)}
+		return true, err
+	case 2: // type.percent
+		if wire != proto.WireFixed64 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed64()
+		m.Type = &AlertPolicy_Condition_Trigger_Percent{math.Float64frombits(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _AlertPolicy_Condition_Trigger_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*AlertPolicy_Condition_Trigger)
+	// type
+	switch x := m.Type.(type) {
+	case *AlertPolicy_Condition_Trigger_Count:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Count))
+	case *AlertPolicy_Condition_Trigger_Percent:
+		n += 1 // tag and wire
+		n += 8
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// A condition type that compares a collection of time series
+// against a threshold.
+type AlertPolicy_Condition_MetricThreshold struct {
+	// A [filter](/monitoring/api/v3/filters) that
+	// identifies which time series should be compared with the threshold.
+	//
+	// The filter is similar to the one that is specified in the
+	// [`MetricService.ListTimeSeries`
+	// request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list) (that
+	// call is useful to verify the time series that will be retrieved /
+	// processed) and must specify the metric type and optionally may contain
+	// restrictions on resource type, resource labels, and metric labels.
+	// This field may not exceed 2048 Unicode characters in length.
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
+	// Specifies the alignment of data points in individual time series as
+	// well as how to combine the retrieved time series together (such as
+	// when aggregating multiple streams on each resource to a single
+	// stream for each resource or when aggregating streams across all
+	// members of a group of resrouces). Multiple aggregations
+	// are applied in the order specified.
+	//
+	// This field is similar to the one in the
+	// [`MetricService.ListTimeSeries` request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list).
+	// It is advisable to use the `ListTimeSeries` method when debugging this field.
+	Aggregations []*Aggregation `protobuf:"bytes,8,rep,name=aggregations,proto3" json:"aggregations,omitempty"`
+	// A [filter](/monitoring/api/v3/filters) that identifies a time
+	// series that should be used as the denominator of a ratio that will be
+	// compared with the threshold. If a `denominator_filter` is specified,
+	// the time series specified by the `filter` field will be used as the
+	// numerator.
+	//
+	// The filter is similar to the one that is specified in the
+	// [`MetricService.ListTimeSeries`
+	// request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list) (that
+	// call is useful to verify the time series that will be retrieved /
+	// processed) and must specify the metric type and optionally may contain
+	// restrictions on resource type, resource labels, and metric labels.
+	// This field may not exceed 2048 Unicode characters in length.
+	DenominatorFilter string `protobuf:"bytes,9,opt,name=denominator_filter,json=denominatorFilter,proto3" json:"denominator_filter,omitempty"`
+	// Specifies the alignment of data points in individual time series
+	// selected by `denominatorFilter` as
+	// well as how to combine the retrieved time series together (such as
+	// when aggregating multiple streams on each resource to a single
+	// stream for each resource or when aggregating streams across all
+	// members of a group of resources).
+	//
+	// When computing ratios, the `aggregations` and
+	// `denominator_aggregations` fields must use the same alignment period
+	// and produce time series that have the same periodicity and labels.
+	//
+	// This field is similar to the one in the
+	// [`MetricService.ListTimeSeries`
+	// request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list). It
+	// is advisable to use the `ListTimeSeries` method when debugging this
+	// field.
+	DenominatorAggregations []*Aggregation `protobuf:"bytes,10,rep,name=denominator_aggregations,json=denominatorAggregations,proto3" json:"denominator_aggregations,omitempty"`
+	// The comparison to apply between the time series (indicated by `filter`
+	// and `aggregation`) and the threshold (indicated by `threshold_value`).
+	// The comparison is applied on each time series, with the time series
+	// on the left-hand side and the threshold on the right-hand side.
+	//
+	// Only `COMPARISON_LT` and `COMPARISON_GT` are supported currently.
+	Comparison ComparisonType `protobuf:"varint,4,opt,name=comparison,proto3,enum=google.monitoring.v3.ComparisonType" json:"comparison,omitempty"`
+	// A value against which to compare the time series.
+	ThresholdValue float64 `protobuf:"fixed64,5,opt,name=threshold_value,json=thresholdValue,proto3" json:"threshold_value,omitempty"`
+	// The amount of time that a time series must violate the
+	// threshold to be considered failing. Currently, only values
+	// that are a multiple of a minute--e.g., 0, 60, 120, or 300
+	// seconds--are supported. If an invalid value is given, an
+	// error will be returned. When choosing a duration, it is useful to
+	// keep in mind the frequency of the underlying time series data
+	// (which may also be affected by any alignments specified in the
+	// `aggregations` field); a good duration is long enough so that a single
+	// outlier does not generate spurious alerts, but short enough that
+	// unhealthy states are detected and alerted on quickly.
+	Duration *duration.Duration `protobuf:"bytes,6,opt,name=duration,proto3" json:"duration,omitempty"`
+	// The number/percent of time series for which the comparison must hold
+	// in order for the condition to trigger. If unspecified, then the
+	// condition will trigger if the comparison is true for any of the
+	// time series that have been identified by `filter` and `aggregations`,
+	// or by the ratio, if `denominator_filter` and `denominator_aggregations`
+	// are specified.
+	Trigger              *AlertPolicy_Condition_Trigger `protobuf:"bytes,7,opt,name=trigger,proto3" json:"trigger,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *AlertPolicy_Condition_MetricThreshold) Reset()         { *m = AlertPolicy_Condition_MetricThreshold{} }
+func (m *AlertPolicy_Condition_MetricThreshold) String() string { return proto.CompactTextString(m) }
+func (*AlertPolicy_Condition_MetricThreshold) ProtoMessage()    {}
+func (*AlertPolicy_Condition_MetricThreshold) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_3dd18d9aa69795e4, []int{0, 1, 1}
+}
+func (m *AlertPolicy_Condition_MetricThreshold) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Unmarshal(m, b)
+}
+func (m *AlertPolicy_Condition_MetricThreshold) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Marshal(b, m, deterministic)
+}
+func (dst *AlertPolicy_Condition_MetricThreshold) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Merge(dst, src)
+}
+func (m *AlertPolicy_Condition_MetricThreshold) XXX_Size() int {
+	return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Size(m)
+}
+func (m *AlertPolicy_Condition_MetricThreshold) XXX_DiscardUnknown() {
+	xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AlertPolicy_Condition_MetricThreshold proto.InternalMessageInfo
+
+func (m *AlertPolicy_Condition_MetricThreshold) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *AlertPolicy_Condition_MetricThreshold) GetAggregations() []*Aggregation {
+	if m != nil {
+		return m.Aggregations
+	}
+	return nil
+}
+
+func (m *AlertPolicy_Condition_MetricThreshold) GetDenominatorFilter() string {
+	if m != nil {
+		return m.DenominatorFilter
+	}
+	return ""
+}
+
+func (m *AlertPolicy_Condition_MetricThreshold) GetDenominatorAggregations() []*Aggregation {
+	if m != nil {
+		return m.DenominatorAggregations
+	}
+	return nil
+}
+
+func (m *AlertPolicy_Condition_MetricThreshold) GetComparison() ComparisonType {
+	if m != nil {
+		return m.Comparison
+	}
+	return ComparisonType_COMPARISON_UNSPECIFIED
+}
+
+func (m *AlertPolicy_Condition_MetricThreshold) GetThresholdValue() float64 {
+	if m != nil {
+		return m.ThresholdValue
+	}
+	return 0
+}
+
+func (m *AlertPolicy_Condition_MetricThreshold) GetDuration() *duration.Duration {
+	if m != nil {
+		return m.Duration
+	}
+	return nil
+}
+
+func (m *AlertPolicy_Condition_MetricThreshold) GetTrigger() *AlertPolicy_Condition_Trigger {
+	if m != nil {
+		return m.Trigger
+	}
+	return nil
+}
+
+// A condition type that checks that monitored resources
+// are reporting data. The configuration defines a metric and
+// a set of monitored resources. The predicate is considered in violation
+// when a time series for the specified metric of a monitored
+// resource does not include any data in the specified `duration`.
+type AlertPolicy_Condition_MetricAbsence struct {
+	// A [filter](/monitoring/api/v3/filters) that
+	// identifies which time series should be compared with the threshold.
+	//
+	// The filter is similar to the one that is specified in the
+	// [`MetricService.ListTimeSeries`
+	// request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list) (that
+	// call is useful to verify the time series that will be retrieved /
+	// processed) and must specify the metric type and optionally may contain
+	// restrictions on resource type, resource labels, and metric labels.
+	// This field may not exceed 2048 Unicode characters in length.
+	Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
+	// Specifies the alignment of data points in individual time series as
+	// well as how to combine the retrieved time series together (such as
+	// when aggregating multiple streams on each resource to a single
+	// stream for each resource or when aggregating streams across all
+	// members of a group of resrouces). Multiple aggregations
+	// are applied in the order specified.
+	//
+	// This field is similar to the
+	// one in the [`MetricService.ListTimeSeries` request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list).
+	// It is advisable to use the `ListTimeSeries` method when debugging this field.
+	Aggregations []*Aggregation `protobuf:"bytes,5,rep,name=aggregations,proto3" json:"aggregations,omitempty"`
+	// The amount of time that a time series must fail to report new
+	// data to be considered failing. Currently, only values that
+	// are a multiple of a minute--e.g.  60, 120, or 300
+	// seconds--are supported. If an invalid value is given, an
+	// error will be returned. The `Duration.nanos` field is
+	// ignored.
+	Duration *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	// The number/percent of time series for which the comparison must hold
+	// in order for the condition to trigger. If unspecified, then the
+	// condition will trigger if the comparison is true for any of the
+	// time series that have been identified by `filter` and `aggregations`.
+	Trigger              *AlertPolicy_Condition_Trigger `protobuf:"bytes,3,opt,name=trigger,proto3" json:"trigger,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *AlertPolicy_Condition_MetricAbsence) Reset()         { *m = AlertPolicy_Condition_MetricAbsence{} }
+func (m *AlertPolicy_Condition_MetricAbsence) String() string { return proto.CompactTextString(m) }
+func (*AlertPolicy_Condition_MetricAbsence) ProtoMessage()    {}
+func (*AlertPolicy_Condition_MetricAbsence) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_3dd18d9aa69795e4, []int{0, 1, 2}
+}
+func (m *AlertPolicy_Condition_MetricAbsence) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Unmarshal(m, b)
+}
+func (m *AlertPolicy_Condition_MetricAbsence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Marshal(b, m, deterministic)
+}
+func (dst *AlertPolicy_Condition_MetricAbsence) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Merge(dst, src)
+}
+func (m *AlertPolicy_Condition_MetricAbsence) XXX_Size() int {
+	return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Size(m)
+}
+func (m *AlertPolicy_Condition_MetricAbsence) XXX_DiscardUnknown() {
+	xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AlertPolicy_Condition_MetricAbsence proto.InternalMessageInfo
+
+func (m *AlertPolicy_Condition_MetricAbsence) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *AlertPolicy_Condition_MetricAbsence) GetAggregations() []*Aggregation {
+	if m != nil {
+		return m.Aggregations
+	}
+	return nil
+}
+
+func (m *AlertPolicy_Condition_MetricAbsence) GetDuration() *duration.Duration {
+	if m != nil {
+		return m.Duration
+	}
+	return nil
+}
+
+func (m *AlertPolicy_Condition_MetricAbsence) GetTrigger() *AlertPolicy_Condition_Trigger {
+	if m != nil {
+		return m.Trigger
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*AlertPolicy)(nil), "google.monitoring.v3.AlertPolicy")
+	proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.AlertPolicy.UserLabelsEntry")
+	proto.RegisterType((*AlertPolicy_Documentation)(nil), "google.monitoring.v3.AlertPolicy.Documentation")
+	proto.RegisterType((*AlertPolicy_Condition)(nil), "google.monitoring.v3.AlertPolicy.Condition")
+	proto.RegisterType((*AlertPolicy_Condition_Trigger)(nil), "google.monitoring.v3.AlertPolicy.Condition.Trigger")
+	proto.RegisterType((*AlertPolicy_Condition_MetricThreshold)(nil), "google.monitoring.v3.AlertPolicy.Condition.MetricThreshold")
+	proto.RegisterType((*AlertPolicy_Condition_MetricAbsence)(nil), "google.monitoring.v3.AlertPolicy.Condition.MetricAbsence")
+	proto.RegisterEnum("google.monitoring.v3.AlertPolicy_ConditionCombinerType", AlertPolicy_ConditionCombinerType_name, AlertPolicy_ConditionCombinerType_value)
+}
+
+func init() {
+	proto.RegisterFile("google/monitoring/v3/alert.proto", fileDescriptor_alert_3dd18d9aa69795e4)
+}
+
+var fileDescriptor_alert_3dd18d9aa69795e4 = []byte{
+	// 941 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xeb, 0x6e, 0xe3, 0x44,
+	0x14, 0xae, 0x93, 0xe6, 0x76, 0xd2, 0x36, 0xd9, 0xd9, 0xee, 0xae, 0x31, 0x68, 0x95, 0xae, 0x90,
+	0x88, 0x40, 0x38, 0x22, 0x01, 0x71, 0x59, 0x81, 0x94, 0x5b, 0x37, 0x11, 0x24, 0xad, 0xa6, 0x69,
+	0x91, 0x50, 0x25, 0xcb, 0x71, 0xa6, 0xae, 0x85, 0x3d, 0x63, 0x4d, 0xec, 0xa2, 0xbc, 0x0e, 0x3f,
+	0x79, 0x14, 0x1e, 0x81, 0x7f, 0xbc, 0x02, 0xe2, 0x01, 0x90, 0xc7, 0x63, 0xc7, 0xe9, 0xa6, 0xbb,
+	0x64, 0xf7, 0x5f, 0xce, 0x9c, 0xef, 0x7c, 0xe7, 0xf6, 0xcd, 0x38, 0xd0, 0xb0, 0x19, 0xb3, 0x5d,
+	0xd2, 0xf2, 0x18, 0x75, 0x02, 0xc6, 0x1d, 0x6a, 0xb7, 0xee, 0x3a, 0x2d, 0xd3, 0x25, 0x3c, 0xd0,
+	0x7d, 0xce, 0x02, 0x86, 0x8e, 0x63, 0x84, 0xbe, 0x46, 0xe8, 0x77, 0x1d, 0xed, 0x23, 0x19, 0x67,
+	0xfa, 0x4e, 0xcb, 0xa4, 0x94, 0x05, 0x66, 0xe0, 0x30, 0xba, 0x8c, 0x63, 0xb4, 0x93, 0xad, 0xac,
+	0x16, 0xf3, 0x3c, 0x46, 0x25, 0xe4, 0xd3, 0xad, 0x10, 0x2f, 0x8c, 0x89, 0x0c, 0x4e, 0x2c, 0xc6,
+	0x17, 0x12, 0xfb, 0x5c, 0x62, 0x85, 0x35, 0x0f, 0x6f, 0x5a, 0x8b, 0x90, 0x0b, 0xd8, 0x43, 0xfe,
+	0xdf, 0xb8, 0xe9, 0xfb, 0x84, 0xcb, 0x72, 0x5e, 0xfc, 0x5d, 0x83, 0x6a, 0x37, 0x6a, 0xe9, 0x9c,
+	0xb9, 0x8e, 0xb5, 0x42, 0x08, 0xf6, 0xa9, 0xe9, 0x11, 0x55, 0x69, 0x28, 0xcd, 0x0a, 0x16, 0xbf,
+	0xd1, 0x09, 0x1c, 0x2c, 0x9c, 0xa5, 0xef, 0x9a, 0x2b, 0x43, 0xf8, 0x72, 0xc2, 0x57, 0x95, 0x67,
+	0xd3, 0x08, 0x72, 0x09, 0x87, 0x0b, 0x66, 0x85, 0x1e, 0xa1, 0x71, 0x91, 0xea, 0x61, 0x43, 0x69,
+	0x56, 0xdb, 0x2d, 0x7d, 0xdb, 0x84, 0xf4, 0x4c, 0x42, 0x7d, 0x90, 0x0d, 0xc3, 0x9b, 0x2c, 0x08,
+	0x43, 0x35, 0x5c, 0x12, 0x6e, 0xb8, 0xe6, 0x9c, 0xb8, 0x4b, 0xb5, 0xde, 0xc8, 0x37, 0xab, 0xed,
+	0x2f, 0xde, 0x4e, 0x7a, 0xb9, 0x24, 0xfc, 0x27, 0x11, 0x33, 0xa4, 0x01, 0x5f, 0x61, 0x08, 0xd3,
+	0x03, 0xf4, 0x23, 0x80, 0xc5, 0xe8, 0xc2, 0x11, 0x4b, 0x51, 0x0f, 0x04, 0xe5, 0x67, 0x6f, 0xa7,
+	0xec, 0x27, 0x31, 0x38, 0x13, 0x8e, 0x2e, 0xa0, 0x6c, 0x31, 0x6f, 0xee, 0x50, 0xc2, 0xd5, 0x62,
+	0x43, 0x69, 0x1e, 0xb5, 0xbf, 0xde, 0x81, 0xaa, 0x2f, 0x43, 0x67, 0x2b, 0x9f, 0xe0, 0x94, 0x08,
+	0x7d, 0x09, 0x25, 0x42, 0xcd, 0xb9, 0x4b, 0x16, 0xea, 0x23, 0x31, 0x46, 0x2d, 0xe1, 0x4c, 0xb6,
+	0xa8, 0xf7, 0x18, 0x73, 0xaf, 0x4c, 0x37, 0x24, 0x38, 0x81, 0xa2, 0x0e, 0x3c, 0xa1, 0x2c, 0x70,
+	0x6e, 0x1c, 0x2b, 0x96, 0x89, 0x75, 0x6b, 0x52, 0x1a, 0x4d, 0xed, 0xa8, 0x91, 0x6f, 0x56, 0xf0,
+	0x71, 0xd6, 0xd9, 0x97, 0x3e, 0x34, 0x81, 0x9a, 0xc5, 0x49, 0x56, 0x57, 0x2a, 0x88, 0x94, 0x1f,
+	0x6f, 0x6f, 0x63, 0x22, 0x45, 0x88, 0x05, 0x16, 0x1f, 0x25, 0xc1, 0xb1, 0x1d, 0xd1, 0xdd, 0x93,
+	0xa9, 0x5a, 0xdd, 0x85, 0xce, 0xdb, 0xb0, 0xb5, 0x53, 0x38, 0xdc, 0x90, 0x07, 0x52, 0xa1, 0x64,
+	0x31, 0x1a, 0x10, 0x1a, 0x48, 0x81, 0x26, 0x26, 0xfa, 0x10, 0x2a, 0x9e, 0xe3, 0x11, 0x23, 0x58,
+	0xf9, 0x89, 0x40, 0xcb, 0xd1, 0x41, 0x34, 0x5a, 0xed, 0xaf, 0x32, 0x54, 0xd2, 0xa1, 0xa7, 0x12,
+	0x3f, 0x78, 0x83, 0xc4, 0x8b, 0xaf, 0x4b, 0x9c, 0xc2, 0xe3, 0x74, 0xf1, 0x46, 0x70, 0xcb, 0xc9,
+	0xf2, 0x96, 0xb9, 0x0b, 0x51, 0x47, 0xb5, 0xfd, 0x72, 0x87, 0xad, 0xeb, 0x13, 0x12, 0x70, 0xc7,
+	0x9a, 0x25, 0x14, 0xa3, 0x3d, 0x8c, 0x52, 0xe6, 0xf4, 0x14, 0xdd, 0x40, 0x7d, 0x9d, 0xcf, 0x9c,
+	0x2f, 0xa3, 0xa6, 0x73, 0x22, 0xd9, 0xb7, 0xbb, 0x27, 0xeb, 0x46, 0xf1, 0x16, 0x19, 0xed, 0xe1,
+	0x5a, 0x4a, 0x2a, 0xce, 0x02, 0x6d, 0x08, 0xa5, 0x19, 0x77, 0x6c, 0x9b, 0x70, 0xf4, 0x14, 0x0a,
+	0x16, 0x0b, 0xe5, 0x70, 0x0b, 0xa3, 0x3d, 0x1c, 0x9b, 0x48, 0x83, 0x92, 0x4f, 0xb8, 0x95, 0x54,
+	0xa0, 0x8c, 0xf6, 0x70, 0x72, 0xd0, 0x2b, 0xc2, 0x7e, 0x34, 0x73, 0xed, 0x9f, 0x3c, 0xd4, 0xee,
+	0x35, 0x86, 0x9e, 0x42, 0xf1, 0xc6, 0x71, 0x03, 0xc2, 0xe5, 0x46, 0xa4, 0x85, 0x86, 0x70, 0x60,
+	0xda, 0x36, 0x27, 0x76, 0xfc, 0x32, 0xaa, 0x65, 0x71, 0x09, 0x4f, 0x1e, 0x68, 0x6b, 0x8d, 0xc4,
+	0x1b, 0x61, 0xe8, 0x73, 0x40, 0x0b, 0x42, 0x99, 0xe7, 0x50, 0x33, 0x60, 0xdc, 0x90, 0xa9, 0x2a,
+	0x22, 0xd5, 0xa3, 0x8c, 0xe7, 0x34, 0xce, 0x7a, 0x0d, 0x6a, 0x16, 0xbe, 0x51, 0x01, 0xfc, 0xdf,
+	0x0a, 0x9e, 0x65, 0x28, 0xba, 0xd9, 0x62, 0x06, 0xd1, 0xb3, 0xe2, 0xf9, 0x26, 0x77, 0x96, 0x8c,
+	0xaa, 0xfb, 0xe2, 0x2d, 0x78, 0x40, 0xf5, 0xfd, 0x14, 0x27, 0x2e, 0x7e, 0x26, 0x0e, 0x7d, 0x02,
+	0xb5, 0x54, 0x5a, 0xc6, 0x5d, 0x74, 0xc1, 0xd5, 0x42, 0x34, 0x71, 0x7c, 0x94, 0x1e, 0x8b, 0x6b,
+	0x8f, 0xbe, 0x82, 0x72, 0xf2, 0xd2, 0x0b, 0xb1, 0x56, 0xdb, 0x1f, 0xbc, 0xf6, 0x48, 0x0c, 0x24,
+	0x00, 0xa7, 0x50, 0x34, 0x81, 0x52, 0x10, 0x2f, 0x5b, 0x2d, 0x89, 0xa8, 0xce, 0x2e, 0x5a, 0x92,
+	0x3a, 0xc1, 0x09, 0x87, 0xf6, 0xaf, 0x02, 0x87, 0x1b, 0x02, 0xcb, 0xac, 0x5c, 0x79, 0xe3, 0xca,
+	0x0b, 0xef, 0xb6, 0xf2, 0x6c, 0xdb, 0xb9, 0x77, 0x6a, 0x3b, 0xff, 0xfe, 0x6d, 0xf7, 0xaa, 0x50,
+	0x49, 0x6f, 0x91, 0xf6, 0x3d, 0xd4, 0xee, 0x7d, 0x6e, 0x50, 0x1d, 0xf2, 0xbf, 0x92, 0x95, 0x9c,
+	0x40, 0xf4, 0x13, 0x1d, 0x43, 0x21, 0xde, 0x66, 0x7c, 0x11, 0x62, 0xe3, 0xbb, 0xdc, 0x37, 0xca,
+	0x0b, 0x13, 0x9e, 0x6c, 0xfd, 0x1e, 0xa0, 0x67, 0xf0, 0xb8, 0x7f, 0x36, 0xe9, 0x8d, 0xa7, 0x43,
+	0xe3, 0x72, 0x7a, 0x71, 0x3e, 0xec, 0x8f, 0x4f, 0xc7, 0xc3, 0x41, 0x7d, 0x0f, 0x95, 0x20, 0xdf,
+	0x9d, 0x0e, 0xea, 0x0a, 0x2a, 0x42, 0xee, 0x0c, 0xd7, 0x73, 0xe8, 0x39, 0x68, 0xdd, 0xe9, 0xc0,
+	0xf8, 0x79, 0x3c, 0x1b, 0x19, 0x93, 0xee, 0xac, 0x3f, 0x1a, 0x4f, 0x5f, 0x19, 0x78, 0x78, 0x71,
+	0x76, 0x89, 0xfb, 0xc3, 0x7a, 0xbe, 0xf7, 0xbb, 0x02, 0xaa, 0xc5, 0xbc, 0xad, 0x2d, 0xf7, 0x20,
+	0xee, 0x39, 0x1a, 0xde, 0xb9, 0xf2, 0xcb, 0x0f, 0x12, 0x63, 0x33, 0xd7, 0xa4, 0xb6, 0xce, 0xb8,
+	0xdd, 0xb2, 0x09, 0x15, 0xa3, 0x6d, 0xc5, 0x2e, 0xd3, 0x77, 0x96, 0x9b, 0xff, 0x4c, 0x5e, 0xae,
+	0xad, 0x3f, 0x72, 0xda, 0xab, 0x98, 0xa0, 0xef, 0xb2, 0x70, 0xa1, 0x4f, 0xd6, 0xa9, 0xae, 0x3a,
+	0x7f, 0x26, 0xce, 0x6b, 0xe1, 0xbc, 0x5e, 0x3b, 0xaf, 0xaf, 0x3a, 0xf3, 0xa2, 0x48, 0xd2, 0xf9,
+	0x2f, 0x00, 0x00, 0xff, 0xff, 0x66, 0xb5, 0x16, 0x64, 0x76, 0x09, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert_service.pb.go
new file mode 100644
index 00000000..d72472e3
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert_service.pb.go
@@ -0,0 +1,667 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/monitoring/v3/alert_service.proto
+
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The protocol for the `CreateAlertPolicy` request.
+type CreateAlertPolicyRequest struct {
+	// The project in which to create the alerting policy. The format is
+	// `projects/[PROJECT_ID]`.
+	//
+	// Note that this field names the parent container in which the alerting
+	// policy will be written, not the name of the created policy. The alerting
+	// policy that is returned will have a name that contains a normalized
+	// representation of this name as a prefix but adds a suffix of the form
+	// `/alertPolicies/[POLICY_ID]`, identifying the policy in the container.
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	// The requested alerting policy. You should omit the `name` field in this
+	// policy. The name will be returned in the new policy, including
+	// a new [ALERT_POLICY_ID] value.
+	AlertPolicy          *AlertPolicy `protobuf:"bytes,2,opt,name=alert_policy,json=alertPolicy,proto3" json:"alert_policy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *CreateAlertPolicyRequest) Reset()         { *m = CreateAlertPolicyRequest{} }
+func (m *CreateAlertPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateAlertPolicyRequest) ProtoMessage()    {}
+func (*CreateAlertPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_service_04868c382f0d60a7, []int{0}
+}
+func (m *CreateAlertPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateAlertPolicyRequest.Unmarshal(m, b)
+}
+func (m *CreateAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateAlertPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateAlertPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateAlertPolicyRequest.Merge(dst, src)
+}
+func (m *CreateAlertPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateAlertPolicyRequest.Size(m)
+}
+func (m *CreateAlertPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateAlertPolicyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateAlertPolicyRequest proto.InternalMessageInfo
+
+func (m *CreateAlertPolicyRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *CreateAlertPolicyRequest) GetAlertPolicy() *AlertPolicy {
+	if m != nil {
+		return m.AlertPolicy
+	}
+	return nil
+}
+
+// The protocol for the `GetAlertPolicy` request.
+type GetAlertPolicyRequest struct {
+	// The alerting policy to retrieve. The format is
+	//
+	//     projects/[PROJECT_ID]/alertPolicies/[ALERT_POLICY_ID]
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetAlertPolicyRequest) Reset()         { *m = GetAlertPolicyRequest{} }
+func (m *GetAlertPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*GetAlertPolicyRequest) ProtoMessage()    {}
+func (*GetAlertPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_service_04868c382f0d60a7, []int{1}
+}
+func (m *GetAlertPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetAlertPolicyRequest.Unmarshal(m, b)
+}
+func (m *GetAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetAlertPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetAlertPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetAlertPolicyRequest.Merge(dst, src)
+}
+func (m *GetAlertPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_GetAlertPolicyRequest.Size(m)
+}
+func (m *GetAlertPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetAlertPolicyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetAlertPolicyRequest proto.InternalMessageInfo
+
+func (m *GetAlertPolicyRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The protocol for the `ListAlertPolicies` request.
+type ListAlertPoliciesRequest struct {
+	// The project whose alert policies are to be listed. The format is
+	//
+	//     projects/[PROJECT_ID]
+	//
+	// Note that this field names the parent container in which the alerting
+	// policies to be listed are stored. To retrieve a single alerting policy
+	// by name, use the
+	// [GetAlertPolicy][google.monitoring.v3.AlertPolicyService.GetAlertPolicy]
+	// operation, instead.
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	// If provided, this field specifies the criteria that must be met by
+	// alert policies to be included in the response.
+	//
+	// For more details, see [sorting and
+	// filtering](/monitoring/api/v3/sorting-and-filtering).
+	Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
+	// A comma-separated list of fields by which to sort the result. Supports
+	// the same set of field references as the `filter` field. Entries can be
+	// prefixed with a minus sign to sort by the field in descending order.
+	//
+	// For more details, see [sorting and
+	// filtering](/monitoring/api/v3/sorting-and-filtering).
+	OrderBy string `protobuf:"bytes,6,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
+	// The maximum number of results to return in a single response.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// If this field is not empty then it must contain the `nextPageToken` value
+	// returned by a previous call to this method.  Using this field causes the
+	// method to return more results from the previous method call.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListAlertPoliciesRequest) Reset()         { *m = ListAlertPoliciesRequest{} }
+func (m *ListAlertPoliciesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListAlertPoliciesRequest) ProtoMessage()    {}
+func (*ListAlertPoliciesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_service_04868c382f0d60a7, []int{2}
+}
+func (m *ListAlertPoliciesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListAlertPoliciesRequest.Unmarshal(m, b)
+}
+func (m *ListAlertPoliciesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListAlertPoliciesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListAlertPoliciesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAlertPoliciesRequest.Merge(dst, src)
+}
+func (m *ListAlertPoliciesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListAlertPoliciesRequest.Size(m)
+}
+func (m *ListAlertPoliciesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListAlertPoliciesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListAlertPoliciesRequest proto.InternalMessageInfo
+
+func (m *ListAlertPoliciesRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ListAlertPoliciesRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListAlertPoliciesRequest) GetOrderBy() string {
+	if m != nil {
+		return m.OrderBy
+	}
+	return ""
+}
+
+func (m *ListAlertPoliciesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListAlertPoliciesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// The protocol for the `ListAlertPolicies` response.
+type ListAlertPoliciesResponse struct {
+	// The returned alert policies.
+	AlertPolicies []*AlertPolicy `protobuf:"bytes,3,rep,name=alert_policies,json=alertPolicies,proto3" json:"alert_policies,omitempty"`
+	// If there might be more results than were returned, then this field is set
+	// to a non-empty value. To see the additional results,
+	// use that value as `pageToken` in the next call to this method.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListAlertPoliciesResponse) Reset()         { *m = ListAlertPoliciesResponse{} }
+func (m *ListAlertPoliciesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListAlertPoliciesResponse) ProtoMessage()    {}
+func (*ListAlertPoliciesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_service_04868c382f0d60a7, []int{3}
+}
+func (m *ListAlertPoliciesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListAlertPoliciesResponse.Unmarshal(m, b)
+}
+func (m *ListAlertPoliciesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListAlertPoliciesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListAlertPoliciesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAlertPoliciesResponse.Merge(dst, src)
+}
+func (m *ListAlertPoliciesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListAlertPoliciesResponse.Size(m)
+}
+func (m *ListAlertPoliciesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListAlertPoliciesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListAlertPoliciesResponse proto.InternalMessageInfo
+
+func (m *ListAlertPoliciesResponse) GetAlertPolicies() []*AlertPolicy {
+	if m != nil {
+		return m.AlertPolicies
+	}
+	return nil
+}
+
+func (m *ListAlertPoliciesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The protocol for the `UpdateAlertPolicy` request.
+type UpdateAlertPolicyRequest struct {
+	// Optional. A list of alerting policy field names. If this field is not
+	// empty, each listed field in the existing alerting policy is set to the
+	// value of the corresponding field in the supplied policy (`alert_policy`),
+	// or to the field's default value if the field is not in the supplied
+	// alerting policy.  Fields not listed retain their previous value.
+	//
+	// Examples of valid field masks include `display_name`, `documentation`,
+	// `documentation.content`, `documentation.mime_type`, `user_labels`,
+	// `user_label.nameofkey`, `enabled`, `conditions`, `combiner`, etc.
+	//
+	// If this field is empty, then the supplied alerting policy replaces the
+	// existing policy. It is the same as deleting the existing policy and
+	// adding the supplied policy, except for the following:
+	//
+	// +   The new policy will have the same `[ALERT_POLICY_ID]` as the former
+	//     policy. This gives you continuity with the former policy in your
+	//     notifications and incidents.
+	// +   Conditions in the new policy will keep their former `[CONDITION_ID]` if
+	//     the supplied condition includes the `name` field with that
+	//     `[CONDITION_ID]`. If the supplied condition omits the `name` field,
+	//     then a new `[CONDITION_ID]` is created.
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	// Required. The updated alerting policy or the updated values for the
+	// fields listed in `update_mask`.
+	// If `update_mask` is not empty, any fields in this policy that are
+	// not in `update_mask` are ignored.
+	AlertPolicy          *AlertPolicy `protobuf:"bytes,3,opt,name=alert_policy,json=alertPolicy,proto3" json:"alert_policy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *UpdateAlertPolicyRequest) Reset()         { *m = UpdateAlertPolicyRequest{} }
+func (m *UpdateAlertPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateAlertPolicyRequest) ProtoMessage()    {}
+func (*UpdateAlertPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_service_04868c382f0d60a7, []int{4}
+}
+func (m *UpdateAlertPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateAlertPolicyRequest.Unmarshal(m, b)
+}
+func (m *UpdateAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateAlertPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateAlertPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateAlertPolicyRequest.Merge(dst, src)
+}
+func (m *UpdateAlertPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateAlertPolicyRequest.Size(m)
+}
+func (m *UpdateAlertPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateAlertPolicyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateAlertPolicyRequest proto.InternalMessageInfo
+
+func (m *UpdateAlertPolicyRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+func (m *UpdateAlertPolicyRequest) GetAlertPolicy() *AlertPolicy {
+	if m != nil {
+		return m.AlertPolicy
+	}
+	return nil
+}
+
+// The protocol for the `DeleteAlertPolicy` request.
+type DeleteAlertPolicyRequest struct {
+	// The alerting policy to delete. The format is:
+	//
+	//     projects/[PROJECT_ID]/alertPolicies/[ALERT_POLICY_ID]
+	//
+	// For more information, see [AlertPolicy][google.monitoring.v3.AlertPolicy].
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteAlertPolicyRequest) Reset()         { *m = DeleteAlertPolicyRequest{} }
+func (m *DeleteAlertPolicyRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteAlertPolicyRequest) ProtoMessage()    {}
+func (*DeleteAlertPolicyRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_alert_service_04868c382f0d60a7, []int{5}
+}
+func (m *DeleteAlertPolicyRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteAlertPolicyRequest.Unmarshal(m, b)
+}
+func (m *DeleteAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteAlertPolicyRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteAlertPolicyRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteAlertPolicyRequest.Merge(dst, src)
+}
+func (m *DeleteAlertPolicyRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteAlertPolicyRequest.Size(m)
+}
+func (m *DeleteAlertPolicyRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteAlertPolicyRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteAlertPolicyRequest proto.InternalMessageInfo
+
+func (m *DeleteAlertPolicyRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*CreateAlertPolicyRequest)(nil), "google.monitoring.v3.CreateAlertPolicyRequest")
+	proto.RegisterType((*GetAlertPolicyRequest)(nil), "google.monitoring.v3.GetAlertPolicyRequest")
+	proto.RegisterType((*ListAlertPoliciesRequest)(nil), "google.monitoring.v3.ListAlertPoliciesRequest")
+	proto.RegisterType((*ListAlertPoliciesResponse)(nil), "google.monitoring.v3.ListAlertPoliciesResponse")
+	proto.RegisterType((*UpdateAlertPolicyRequest)(nil), "google.monitoring.v3.UpdateAlertPolicyRequest")
+	proto.RegisterType((*DeleteAlertPolicyRequest)(nil), "google.monitoring.v3.DeleteAlertPolicyRequest")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// AlertPolicyServiceClient is the client API for AlertPolicyService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type AlertPolicyServiceClient interface {
+	// Lists the existing alerting policies for the project.
+	ListAlertPolicies(ctx context.Context, in *ListAlertPoliciesRequest, opts ...grpc.CallOption) (*ListAlertPoliciesResponse, error)
+	// Gets a single alerting policy.
+	GetAlertPolicy(ctx context.Context, in *GetAlertPolicyRequest, opts ...grpc.CallOption) (*AlertPolicy, error)
+	// Creates a new alerting policy.
+	CreateAlertPolicy(ctx context.Context, in *CreateAlertPolicyRequest, opts ...grpc.CallOption) (*AlertPolicy, error)
+	// Deletes an alerting policy.
+	DeleteAlertPolicy(ctx context.Context, in *DeleteAlertPolicyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Updates an alerting policy. You can either replace the entire policy with
+	// a new one or replace only certain fields in the current alerting policy by
+	// specifying the fields to be updated via `updateMask`. Returns the
+	// updated alerting policy.
+	UpdateAlertPolicy(ctx context.Context, in *UpdateAlertPolicyRequest, opts ...grpc.CallOption) (*AlertPolicy, error)
+}
+
+type alertPolicyServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewAlertPolicyServiceClient(cc *grpc.ClientConn) AlertPolicyServiceClient {
+	return &alertPolicyServiceClient{cc}
+}
+
+func (c *alertPolicyServiceClient) ListAlertPolicies(ctx context.Context, in *ListAlertPoliciesRequest, opts ...grpc.CallOption) (*ListAlertPoliciesResponse, error) {
+	out := new(ListAlertPoliciesResponse)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.AlertPolicyService/ListAlertPolicies", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *alertPolicyServiceClient) GetAlertPolicy(ctx context.Context, in *GetAlertPolicyRequest, opts ...grpc.CallOption) (*AlertPolicy, error) {
+	out := new(AlertPolicy)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.AlertPolicyService/GetAlertPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *alertPolicyServiceClient) CreateAlertPolicy(ctx context.Context, in *CreateAlertPolicyRequest, opts ...grpc.CallOption) (*AlertPolicy, error) {
+	out := new(AlertPolicy)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.AlertPolicyService/CreateAlertPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *alertPolicyServiceClient) DeleteAlertPolicy(ctx context.Context, in *DeleteAlertPolicyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.AlertPolicyService/DeleteAlertPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *alertPolicyServiceClient) UpdateAlertPolicy(ctx context.Context, in *UpdateAlertPolicyRequest, opts ...grpc.CallOption) (*AlertPolicy, error) {
+	out := new(AlertPolicy)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.AlertPolicyService/UpdateAlertPolicy", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// AlertPolicyServiceServer is the server API for AlertPolicyService service.
+type AlertPolicyServiceServer interface {
+	// Lists the existing alerting policies for the project.
+	ListAlertPolicies(context.Context, *ListAlertPoliciesRequest) (*ListAlertPoliciesResponse, error)
+	// Gets a single alerting policy.
+	GetAlertPolicy(context.Context, *GetAlertPolicyRequest) (*AlertPolicy, error)
+	// Creates a new alerting policy.
+	CreateAlertPolicy(context.Context, *CreateAlertPolicyRequest) (*AlertPolicy, error)
+	// Deletes an alerting policy.
+	DeleteAlertPolicy(context.Context, *DeleteAlertPolicyRequest) (*empty.Empty, error)
+	// Updates an alerting policy. You can either replace the entire policy with
+	// a new one or replace only certain fields in the current alerting policy by
+	// specifying the fields to be updated via `updateMask`. Returns the
+	// updated alerting policy.
+	UpdateAlertPolicy(context.Context, *UpdateAlertPolicyRequest) (*AlertPolicy, error)
+}
+
+func RegisterAlertPolicyServiceServer(s *grpc.Server, srv AlertPolicyServiceServer) {
+	s.RegisterService(&_AlertPolicyService_serviceDesc, srv)
+}
+
+func _AlertPolicyService_ListAlertPolicies_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListAlertPoliciesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AlertPolicyServiceServer).ListAlertPolicies(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.AlertPolicyService/ListAlertPolicies",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AlertPolicyServiceServer).ListAlertPolicies(ctx, req.(*ListAlertPoliciesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AlertPolicyService_GetAlertPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetAlertPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AlertPolicyServiceServer).GetAlertPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.AlertPolicyService/GetAlertPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AlertPolicyServiceServer).GetAlertPolicy(ctx, req.(*GetAlertPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AlertPolicyService_CreateAlertPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateAlertPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AlertPolicyServiceServer).CreateAlertPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.AlertPolicyService/CreateAlertPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AlertPolicyServiceServer).CreateAlertPolicy(ctx, req.(*CreateAlertPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AlertPolicyService_DeleteAlertPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteAlertPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AlertPolicyServiceServer).DeleteAlertPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.AlertPolicyService/DeleteAlertPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AlertPolicyServiceServer).DeleteAlertPolicy(ctx, req.(*DeleteAlertPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AlertPolicyService_UpdateAlertPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateAlertPolicyRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AlertPolicyServiceServer).UpdateAlertPolicy(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.AlertPolicyService/UpdateAlertPolicy",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AlertPolicyServiceServer).UpdateAlertPolicy(ctx, req.(*UpdateAlertPolicyRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _AlertPolicyService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.monitoring.v3.AlertPolicyService",
+	HandlerType: (*AlertPolicyServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListAlertPolicies",
+			Handler:    _AlertPolicyService_ListAlertPolicies_Handler,
+		},
+		{
+			MethodName: "GetAlertPolicy",
+			Handler:    _AlertPolicyService_GetAlertPolicy_Handler,
+		},
+		{
+			MethodName: "CreateAlertPolicy",
+			Handler:    _AlertPolicyService_CreateAlertPolicy_Handler,
+		},
+		{
+			MethodName: "DeleteAlertPolicy",
+			Handler:    _AlertPolicyService_DeleteAlertPolicy_Handler,
+		},
+		{
+			MethodName: "UpdateAlertPolicy",
+			Handler:    _AlertPolicyService_UpdateAlertPolicy_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/monitoring/v3/alert_service.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/monitoring/v3/alert_service.proto", fileDescriptor_alert_service_04868c382f0d60a7)
+}
+
+var fileDescriptor_alert_service_04868c382f0d60a7 = []byte{
+	// 656 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x41, 0x6f, 0xd3, 0x4c,
+	0x10, 0x95, 0x93, 0x36, 0x5f, 0xbb, 0xfd, 0x5a, 0x94, 0x15, 0x54, 0xae, 0x0b, 0x52, 0x30, 0x2a,
+	0x54, 0xad, 0xb0, 0xa5, 0xf8, 0x04, 0x15, 0x48, 0xa4, 0x85, 0xf6, 0x40, 0xa5, 0x28, 0x85, 0x1e,
+	0x50, 0xa4, 0x68, 0x93, 0x4c, 0xac, 0x25, 0x8e, 0xd7, 0x78, 0x37, 0x11, 0x29, 0xea, 0x85, 0x23,
+	0x12, 0xe2, 0xc0, 0x99, 0x03, 0x47, 0x38, 0x20, 0x7e, 0x07, 0x57, 0xfe, 0x02, 0x3f, 0x04, 0x79,
+	0xed, 0x34, 0x76, 0x6d, 0xab, 0x16, 0xb7, 0xcc, 0xce, 0xdb, 0x99, 0xb7, 0x6f, 0xde, 0x38, 0x68,
+	0xdb, 0x66, 0xcc, 0x76, 0xc0, 0x1c, 0x31, 0x97, 0x0a, 0xe6, 0x53, 0xd7, 0x36, 0x27, 0x96, 0x49,
+	0x1c, 0xf0, 0x45, 0x87, 0x83, 0x3f, 0xa1, 0x3d, 0x30, 0x3c, 0x9f, 0x09, 0x86, 0xaf, 0x87, 0x48,
+	0x63, 0x8e, 0x34, 0x26, 0x96, 0x76, 0x33, 0xba, 0x4f, 0x3c, 0x6a, 0x12, 0xd7, 0x65, 0x82, 0x08,
+	0xca, 0x5c, 0x1e, 0xde, 0xd1, 0x6a, 0xf9, 0xd5, 0x23, 0xc4, 0x66, 0x84, 0x90, 0x51, 0x77, 0x3c,
+	0x30, 0x61, 0xe4, 0x89, 0xe9, 0xa5, 0xeb, 0x17, 0xc9, 0x01, 0x05, 0xa7, 0xdf, 0x19, 0x11, 0x3e,
+	0x0c, 0x11, 0xba, 0x40, 0xea, 0xbe, 0x0f, 0x44, 0xc0, 0x93, 0xa0, 0x66, 0x93, 0x39, 0xb4, 0x37,
+	0x6d, 0xc1, 0x9b, 0x31, 0x70, 0x81, 0x31, 0x5a, 0x70, 0xc9, 0x08, 0xd4, 0x72, 0x4d, 0xd9, 0x5e,
+	0x6e, 0xc9, 0xdf, 0xf8, 0x00, 0xfd, 0x1f, 0xbe, 0xcd, 0x93, 0x50, 0xb5, 0x54, 0x53, 0xb6, 0x57,
+	0xea, 0xb7, 0x8d, 0xac, 0xb7, 0x19, 0xf1, 0x9a, 0x2b, 0x64, 0x1e, 0xe8, 0xbb, 0xe8, 0xc6, 0x21,
+	0x88, 0x62, 0x2d, 0xf5, 0x2f, 0x0a, 0x52, 0x9f, 0x53, 0x1e, 0x83, 0x53, 0xe0, 0x97, 0x2f, 0x2c,
+	0xc4, 0x38, 0xae, 0xa3, 0xca, 0x80, 0x3a, 0x02, 0x7c, 0x75, 0x51, 0x9e, 0x46, 0x11, 0xde, 0x40,
+	0x4b, 0xcc, 0xef, 0x83, 0xdf, 0xe9, 0x4e, 0xd5, 0x8a, 0xcc, 0xfc, 0x27, 0xe3, 0xc6, 0x14, 0x6f,
+	0xa2, 0x65, 0x8f, 0xd8, 0xd0, 0xe1, 0xf4, 0x0c, 0xe4, 0x9b, 0x16, 0x5b, 0x4b, 0xc1, 0xc1, 0x09,
+	0x3d, 0x03, 0x7c, 0x0b, 0x21, 0x99, 0x14, 0x6c, 0x08, 0x6e, 0x44, 0x4d, 0xc2, 0x5f, 0x04, 0x07,
+	0xfa, 0x47, 0x05, 0x6d, 0x64, 0xf0, 0xe3, 0x1e, 0x73, 0x39, 0xe0, 0x23, 0xb4, 0x16, 0x13, 0x8c,
+	0x02, 0x57, 0xcb, 0xb5, 0x72, 0x31, 0xc9, 0x56, 0x49, 0xbc, 0x22, 0xbe, 0x8b, 0xae, 0xb9, 0xf0,
+	0x56, 0x74, 0x62, 0x5c, 0x4a, 0x92, 0xcb, 0x6a, 0x70, 0xdc, 0xbc, 0xe0, 0x13, 0xe8, 0xf5, 0xd2,
+	0xeb, 0x67, 0xcf, 0x74, 0x0f, 0xad, 0x8c, 0x65, 0x4e, 0x9a, 0x20, 0x1a, 0x9f, 0x36, 0xe3, 0x32,
+	0xf3, 0x89, 0xf1, 0x2c, 0xf0, 0xc9, 0x31, 0xe1, 0xc3, 0x16, 0x0a, 0xe1, 0xc1, 0xef, 0xd4, 0xf0,
+	0xcb, 0xff, 0x34, 0x7c, 0x03, 0xa9, 0x07, 0xe0, 0x40, 0x51, 0xcb, 0xd5, 0x7f, 0x54, 0x10, 0x8e,
+	0x41, 0x4f, 0xc2, 0xa5, 0xc2, 0x5f, 0x15, 0x54, 0x4d, 0xc9, 0x8e, 0x8d, 0x6c, 0x32, 0x79, 0xfe,
+	0xd1, 0xcc, 0xc2, 0xf8, 0x70, 0x9e, 0xfa, 0xee, 0xfb, 0xdf, 0x7f, 0x3e, 0x97, 0xb6, 0xf0, 0x9d,
+	0x60, 0x11, 0xdf, 0x05, 0x04, 0x1f, 0x79, 0x3e, 0x7b, 0x0d, 0x3d, 0xc1, 0xcd, 0x9d, 0x73, 0x33,
+	0x39, 0xb2, 0x4f, 0x0a, 0x5a, 0x4b, 0x1a, 0x1d, 0xef, 0x66, 0x37, 0xcc, 0x5c, 0x07, 0xed, 0x6a,
+	0x69, 0xf5, 0xfb, 0x92, 0xcf, 0x3d, 0xbc, 0x95, 0xc5, 0x27, 0x49, 0xc7, 0xdc, 0x39, 0x97, 0xaa,
+	0xa5, 0x16, 0x3e, 0x4f, 0xb5, 0xbc, 0x2f, 0x43, 0x11, 0x5e, 0x0f, 0x24, 0x2f, 0x4b, 0x2f, 0xa2,
+	0xd3, 0xc3, 0x84, 0xad, 0xf0, 0x07, 0x05, 0x55, 0x53, 0x0e, 0xc9, 0xe3, 0x98, 0x67, 0x25, 0x6d,
+	0x3d, 0x65, 0xea, 0xa7, 0xc1, 0x97, 0x71, 0x26, 0xd8, 0x4e, 0x41, 0xc1, 0x7e, 0x2a, 0xa8, 0x9a,
+	0xda, 0xa6, 0x3c, 0x32, 0x79, 0x6b, 0x57, 0x44, 0xb0, 0x23, 0xc9, 0xab, 0x51, 0xaf, 0x4b, 0x5e,
+	0x71, 0x41, 0x8c, 0xab, 0x48, 0x26, 0xf5, 0x6b, 0x7c, 0x53, 0x90, 0xda, 0x63, 0xa3, 0xcc, 0x96,
+	0x8d, 0xaa, 0xec, 0x19, 0x2d, 0x51, 0x33, 0x90, 0xa6, 0xa9, 0xbc, 0x7a, 0x1c, 0x41, 0x6d, 0xe6,
+	0x10, 0xd7, 0x36, 0x98, 0x6f, 0x9b, 0x36, 0xb8, 0x52, 0x38, 0x33, 0x4c, 0x11, 0x8f, 0xf2, 0xe4,
+	0xbf, 0xd0, 0xde, 0x3c, 0xfa, 0x5e, 0xd2, 0x0e, 0xc3, 0x02, 0xfb, 0x0e, 0x1b, 0xf7, 0x8d, 0xe3,
+	0x79, 0xc7, 0x53, 0xeb, 0xd7, 0x2c, 0xd9, 0x96, 0xc9, 0xf6, 0x3c, 0xd9, 0x3e, 0xb5, 0xba, 0x15,
+	0xd9, 0xc4, 0xfa, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x1f, 0xe6, 0xf0, 0x47, 0x07, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/common.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/common.pb.go
index 4d967f52..1ba63eeb 100644
--- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/common.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/common.pb.go
@@ -1,64 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/common.proto
 
-/*
-Package monitoring is a generated protocol buffer package.
-
-It is generated from these files:
-	google/monitoring/v3/common.proto
-	google/monitoring/v3/group.proto
-	google/monitoring/v3/group_service.proto
-	google/monitoring/v3/metric.proto
-	google/monitoring/v3/metric_service.proto
-	google/monitoring/v3/uptime.proto
-	google/monitoring/v3/uptime_service.proto
-
-It has these top-level messages:
-	TypedValue
-	TimeInterval
-	Aggregation
-	Group
-	ListGroupsRequest
-	ListGroupsResponse
-	GetGroupRequest
-	CreateGroupRequest
-	UpdateGroupRequest
-	DeleteGroupRequest
-	ListGroupMembersRequest
-	ListGroupMembersResponse
-	Point
-	TimeSeries
-	ListMonitoredResourceDescriptorsRequest
-	ListMonitoredResourceDescriptorsResponse
-	GetMonitoredResourceDescriptorRequest
-	ListMetricDescriptorsRequest
-	ListMetricDescriptorsResponse
-	GetMetricDescriptorRequest
-	CreateMetricDescriptorRequest
-	DeleteMetricDescriptorRequest
-	ListTimeSeriesRequest
-	ListTimeSeriesResponse
-	CreateTimeSeriesRequest
-	CreateTimeSeriesError
-	UptimeCheckConfig
-	UptimeCheckIp
-	ListUptimeCheckConfigsRequest
-	ListUptimeCheckConfigsResponse
-	GetUptimeCheckConfigRequest
-	CreateUptimeCheckConfigRequest
-	UpdateUptimeCheckConfigRequest
-	DeleteUptimeCheckConfigRequest
-	ListUptimeCheckIpsRequest
-	ListUptimeCheckIpsResponse
-*/
-package monitoring
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_api2 "google.golang.org/genproto/googleapis/api/distribution"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/timestamp"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import distribution "google.golang.org/genproto/googleapis/api/distribution"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -71,6 +22,91 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
+// Specifies an ordering relationship on two arguments, here called left and
+// right.
+type ComparisonType int32
+
+const (
+	// No ordering relationship is specified.
+	ComparisonType_COMPARISON_UNSPECIFIED ComparisonType = 0
+	// The left argument is greater than the right argument.
+	ComparisonType_COMPARISON_GT ComparisonType = 1
+	// The left argument is greater than or equal to the right argument.
+	ComparisonType_COMPARISON_GE ComparisonType = 2
+	// The left argument is less than the right argument.
+	ComparisonType_COMPARISON_LT ComparisonType = 3
+	// The left argument is less than or equal to the right argument.
+	ComparisonType_COMPARISON_LE ComparisonType = 4
+	// The left argument is equal to the right argument.
+	ComparisonType_COMPARISON_EQ ComparisonType = 5
+	// The left argument is not equal to the right argument.
+	ComparisonType_COMPARISON_NE ComparisonType = 6
+)
+
+var ComparisonType_name = map[int32]string{
+	0: "COMPARISON_UNSPECIFIED",
+	1: "COMPARISON_GT",
+	2: "COMPARISON_GE",
+	3: "COMPARISON_LT",
+	4: "COMPARISON_LE",
+	5: "COMPARISON_EQ",
+	6: "COMPARISON_NE",
+}
+var ComparisonType_value = map[string]int32{
+	"COMPARISON_UNSPECIFIED": 0,
+	"COMPARISON_GT":          1,
+	"COMPARISON_GE":          2,
+	"COMPARISON_LT":          3,
+	"COMPARISON_LE":          4,
+	"COMPARISON_EQ":          5,
+	"COMPARISON_NE":          6,
+}
+
+func (x ComparisonType) String() string {
+	return proto.EnumName(ComparisonType_name, int32(x))
+}
+func (ComparisonType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_bd839df590cb6820, []int{0}
+}
+
+// The tier of service for a Stackdriver account. Please see the
+// [service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers)
+// for more details.
+type ServiceTier int32 // Deprecated: Do not use.
+const (
+	// An invalid sentinel value, used to indicate that a tier has not
+	// been provided explicitly.
+	ServiceTier_SERVICE_TIER_UNSPECIFIED ServiceTier = 0
+	// The Stackdriver Basic tier, a free tier of service that provides basic
+	// features, a moderate allotment of logs, and access to built-in metrics.
+	// A number of features are not available in this tier. For more details,
+	// see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers).
+	ServiceTier_SERVICE_TIER_BASIC ServiceTier = 1
+	// The Stackdriver Premium tier, a higher, more expensive tier of service
+	// that provides access to all Stackdriver features, lets you use Stackdriver
+	// with AWS accounts, and has a larger allotments for logs and metrics. For
+	// more details, see [the service tiers documentation](https://cloud.google.com/monitoring/accounts/tiers).
+	ServiceTier_SERVICE_TIER_PREMIUM ServiceTier = 2
+)
+
+var ServiceTier_name = map[int32]string{
+	0: "SERVICE_TIER_UNSPECIFIED",
+	1: "SERVICE_TIER_BASIC",
+	2: "SERVICE_TIER_PREMIUM",
+}
+var ServiceTier_value = map[string]int32{
+	"SERVICE_TIER_UNSPECIFIED": 0,
+	"SERVICE_TIER_BASIC":       1,
+	"SERVICE_TIER_PREMIUM":     2,
+}
+
+func (x ServiceTier) String() string {
+	return proto.EnumName(ServiceTier_name, int32(x))
+}
+func (ServiceTier) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_bd839df590cb6820, []int{1}
+}
+
 // The Aligner describes how to bring the data points in a single
 // time series into temporal alignment.
 type Aggregation_Aligner int32
@@ -85,11 +121,22 @@ const (
 	// delta metric to a delta metric requires that the alignment
 	// period be increased. The value type of the result is the same
 	// as the value type of the input.
+	//
+	// One can think of this aligner as a rate but without time units; that
+	// is, the output is conceptually (second_point - first_point).
 	Aggregation_ALIGN_DELTA Aggregation_Aligner = 1
 	// Align and convert to a rate. This alignment is valid for
 	// cumulative metrics and delta metrics with numeric values. The output is a
 	// gauge metric with value type
 	// [DOUBLE][google.api.MetricDescriptor.ValueType.DOUBLE].
+	//
+	// One can think of this aligner as conceptually providing the slope of
+	// the line that passes through the value at the start and end of the
+	// window. In other words, this is conceptually ((y1 - y0)/(t1 - t0)),
+	// and the output unit is one that has a "/time" dimension.
+	//
+	// If, by rate, you are looking for percentage change, see the
+	// `ALIGN_PERCENT_CHANGE` aligner option.
 	Aggregation_ALIGN_RATE Aggregation_Aligner = 2
 	// Align by interpolating between adjacent points around the
 	// period boundary. This alignment is valid for gauge
@@ -144,6 +191,12 @@ const (
 	// [INT64][google.api.MetricDescriptor.ValueType.INT64].
 	Aggregation_ALIGN_COUNT_TRUE Aggregation_Aligner = 16
 	// Align time series via aggregation. The resulting data point in
+	// the alignment period is the count of False-valued data points in the
+	// period. This alignment is valid for gauge metrics with
+	// Boolean values. The value type of the output is
+	// [INT64][google.api.MetricDescriptor.ValueType.INT64].
+	Aggregation_ALIGN_COUNT_FALSE Aggregation_Aligner = 24
+	// Align time series via aggregation. The resulting data point in
 	// the alignment period is the fraction of True-valued data points in the
 	// period. This alignment is valid for gauge metrics with Boolean values.
 	// The output value is in the range [0, 1] and has value type
@@ -173,6 +226,22 @@ const (
 	// with distribution values. The output is a gauge metric with value type
 	// [DOUBLE][google.api.MetricDescriptor.ValueType.DOUBLE].
 	Aggregation_ALIGN_PERCENTILE_05 Aggregation_Aligner = 21
+	// Align and convert to a percentage change. This alignment is valid for
+	// gauge and delta metrics with numeric values. This alignment conceptually
+	// computes the equivalent of "((current - previous)/previous)*100"
+	// where previous value is determined based on the alignmentPeriod.
+	// In the event that previous is 0 the calculated value is infinity with the
+	// exception that if both (current - previous) and previous are 0 the
+	// calculated value is 0.
+	// A 10 minute moving mean is computed at each point of the time window
+	// prior to the above calculation to smooth the metric and prevent false
+	// positives from very short lived spikes.
+	// Only applicable for data that is >= 0. Any values < 0 are treated as
+	// no data. While delta metrics are accepted by this alignment special care
+	// should be taken that the values for the metric will always be positive.
+	// The output is a gauge metric with value type
+	// [DOUBLE][google.api.MetricDescriptor.ValueType.DOUBLE].
+	Aggregation_ALIGN_PERCENT_CHANGE Aggregation_Aligner = 23
 )
 
 var Aggregation_Aligner_name = map[int32]string{
@@ -188,36 +257,42 @@ var Aggregation_Aligner_name = map[int32]string{
 	14: "ALIGN_SUM",
 	15: "ALIGN_STDDEV",
 	16: "ALIGN_COUNT_TRUE",
+	24: "ALIGN_COUNT_FALSE",
 	17: "ALIGN_FRACTION_TRUE",
 	18: "ALIGN_PERCENTILE_99",
 	19: "ALIGN_PERCENTILE_95",
 	20: "ALIGN_PERCENTILE_50",
 	21: "ALIGN_PERCENTILE_05",
+	23: "ALIGN_PERCENT_CHANGE",
 }
 var Aggregation_Aligner_value = map[string]int32{
-	"ALIGN_NONE":          0,
-	"ALIGN_DELTA":         1,
-	"ALIGN_RATE":          2,
-	"ALIGN_INTERPOLATE":   3,
-	"ALIGN_NEXT_OLDER":    4,
-	"ALIGN_MIN":           10,
-	"ALIGN_MAX":           11,
-	"ALIGN_MEAN":          12,
-	"ALIGN_COUNT":         13,
-	"ALIGN_SUM":           14,
-	"ALIGN_STDDEV":        15,
-	"ALIGN_COUNT_TRUE":    16,
-	"ALIGN_FRACTION_TRUE": 17,
-	"ALIGN_PERCENTILE_99": 18,
-	"ALIGN_PERCENTILE_95": 19,
-	"ALIGN_PERCENTILE_50": 20,
-	"ALIGN_PERCENTILE_05": 21,
+	"ALIGN_NONE":           0,
+	"ALIGN_DELTA":          1,
+	"ALIGN_RATE":           2,
+	"ALIGN_INTERPOLATE":    3,
+	"ALIGN_NEXT_OLDER":     4,
+	"ALIGN_MIN":            10,
+	"ALIGN_MAX":            11,
+	"ALIGN_MEAN":           12,
+	"ALIGN_COUNT":          13,
+	"ALIGN_SUM":            14,
+	"ALIGN_STDDEV":         15,
+	"ALIGN_COUNT_TRUE":     16,
+	"ALIGN_COUNT_FALSE":    24,
+	"ALIGN_FRACTION_TRUE":  17,
+	"ALIGN_PERCENTILE_99":  18,
+	"ALIGN_PERCENTILE_95":  19,
+	"ALIGN_PERCENTILE_50":  20,
+	"ALIGN_PERCENTILE_05":  21,
+	"ALIGN_PERCENT_CHANGE": 23,
 }
 
 func (x Aggregation_Aligner) String() string {
 	return proto.EnumName(Aggregation_Aligner_name, int32(x))
 }
-func (Aggregation_Aligner) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (Aggregation_Aligner) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_bd839df590cb6820, []int{2, 0}
+}
 
 // A Reducer describes how to aggregate data points from multiple
 // time series into a single time series.
@@ -263,6 +338,11 @@ const (
 	// and gauge metrics of Boolean value type. The value type of
 	// the output is [INT64][google.api.MetricDescriptor.ValueType.INT64].
 	Aggregation_REDUCE_COUNT_TRUE Aggregation_Reducer = 7
+	// Reduce by computing the count of False-valued data points across time
+	// series for each alignment period. This reducer is valid for delta
+	// and gauge metrics of Boolean value type. The value type of
+	// the output is [INT64][google.api.MetricDescriptor.ValueType.INT64].
+	Aggregation_REDUCE_COUNT_FALSE Aggregation_Reducer = 15
 	// Reduce by computing the fraction of True-valued data points across time
 	// series for each alignment period. This reducer is valid for delta
 	// and gauge metrics of Boolean value type. The output value is in the
@@ -300,6 +380,7 @@ var Aggregation_Reducer_name = map[int32]string{
 	5:  "REDUCE_STDDEV",
 	6:  "REDUCE_COUNT",
 	7:  "REDUCE_COUNT_TRUE",
+	15: "REDUCE_COUNT_FALSE",
 	8:  "REDUCE_FRACTION_TRUE",
 	9:  "REDUCE_PERCENTILE_99",
 	10: "REDUCE_PERCENTILE_95",
@@ -315,6 +396,7 @@ var Aggregation_Reducer_value = map[string]int32{
 	"REDUCE_STDDEV":        5,
 	"REDUCE_COUNT":         6,
 	"REDUCE_COUNT_TRUE":    7,
+	"REDUCE_COUNT_FALSE":   15,
 	"REDUCE_FRACTION_TRUE": 8,
 	"REDUCE_PERCENTILE_99": 9,
 	"REDUCE_PERCENTILE_95": 10,
@@ -325,7 +407,9 @@ var Aggregation_Reducer_value = map[string]int32{
 func (x Aggregation_Reducer) String() string {
 	return proto.EnumName(Aggregation_Reducer_name, int32(x))
 }
-func (Aggregation_Reducer) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
+func (Aggregation_Reducer) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_bd839df590cb6820, []int{2, 1}
+}
 
 // A single strongly-typed value.
 type TypedValue struct {
@@ -337,38 +421,68 @@ type TypedValue struct {
 	//	*TypedValue_DoubleValue
 	//	*TypedValue_StringValue
 	//	*TypedValue_DistributionValue
-	Value isTypedValue_Value `protobuf_oneof:"value"`
+	Value                isTypedValue_Value `protobuf_oneof:"value"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *TypedValue) Reset()         { *m = TypedValue{} }
+func (m *TypedValue) String() string { return proto.CompactTextString(m) }
+func (*TypedValue) ProtoMessage()    {}
+func (*TypedValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_bd839df590cb6820, []int{0}
+}
+func (m *TypedValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TypedValue.Unmarshal(m, b)
+}
+func (m *TypedValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TypedValue.Marshal(b, m, deterministic)
+}
+func (dst *TypedValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TypedValue.Merge(dst, src)
+}
+func (m *TypedValue) XXX_Size() int {
+	return xxx_messageInfo_TypedValue.Size(m)
+}
+func (m *TypedValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_TypedValue.DiscardUnknown(m)
 }
 
-func (m *TypedValue) Reset()                    { *m = TypedValue{} }
-func (m *TypedValue) String() string            { return proto.CompactTextString(m) }
-func (*TypedValue) ProtoMessage()               {}
-func (*TypedValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_TypedValue proto.InternalMessageInfo
 
 type isTypedValue_Value interface {
 	isTypedValue_Value()
 }
 
 type TypedValue_BoolValue struct {
-	BoolValue bool `protobuf:"varint,1,opt,name=bool_value,json=boolValue,oneof"`
+	BoolValue bool `protobuf:"varint,1,opt,name=bool_value,json=boolValue,proto3,oneof"`
 }
+
 type TypedValue_Int64Value struct {
-	Int64Value int64 `protobuf:"varint,2,opt,name=int64_value,json=int64Value,oneof"`
+	Int64Value int64 `protobuf:"varint,2,opt,name=int64_value,json=int64Value,proto3,oneof"`
 }
+
 type TypedValue_DoubleValue struct {
-	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,oneof"`
+	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,proto3,oneof"`
 }
+
 type TypedValue_StringValue struct {
-	StringValue string `protobuf:"bytes,4,opt,name=string_value,json=stringValue,oneof"`
+	StringValue string `protobuf:"bytes,4,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
+
 type TypedValue_DistributionValue struct {
-	DistributionValue *google_api2.Distribution `protobuf:"bytes,5,opt,name=distribution_value,json=distributionValue,oneof"`
+	DistributionValue *distribution.Distribution `protobuf:"bytes,5,opt,name=distribution_value,json=distributionValue,proto3,oneof"`
 }
 
-func (*TypedValue_BoolValue) isTypedValue_Value()         {}
-func (*TypedValue_Int64Value) isTypedValue_Value()        {}
-func (*TypedValue_DoubleValue) isTypedValue_Value()       {}
-func (*TypedValue_StringValue) isTypedValue_Value()       {}
+func (*TypedValue_BoolValue) isTypedValue_Value() {}
+
+func (*TypedValue_Int64Value) isTypedValue_Value() {}
+
+func (*TypedValue_DoubleValue) isTypedValue_Value() {}
+
+func (*TypedValue_StringValue) isTypedValue_Value() {}
+
 func (*TypedValue_DistributionValue) isTypedValue_Value() {}
 
 func (m *TypedValue) GetValue() isTypedValue_Value {
@@ -406,7 +520,7 @@ func (m *TypedValue) GetStringValue() string {
 	return ""
 }
 
-func (m *TypedValue) GetDistributionValue() *google_api2.Distribution {
+func (m *TypedValue) GetDistributionValue() *distribution.Distribution {
 	if x, ok := m.GetValue().(*TypedValue_DistributionValue); ok {
 		return x.DistributionValue
 	}
@@ -491,7 +605,7 @@ func _TypedValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buf
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_api2.Distribution)
+		msg := new(distribution.Distribution)
 		err := b.DecodeMessage(msg)
 		m.Value = &TypedValue_DistributionValue{msg}
 		return true, err
@@ -505,21 +619,21 @@ func _TypedValue_OneofSizer(msg proto.Message) (n int) {
 	// value
 	switch x := m.Value.(type) {
 	case *TypedValue_BoolValue:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *TypedValue_Int64Value:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.Int64Value))
 	case *TypedValue_DoubleValue:
-		n += proto.SizeVarint(3<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *TypedValue_StringValue:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StringValue)))
 		n += len(x.StringValue)
 	case *TypedValue_DistributionValue:
 		s := proto.Size(x.DistributionValue)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -534,26 +648,48 @@ func _TypedValue_OneofSizer(msg proto.Message) (n int) {
 // represents a single point in time.
 type TimeInterval struct {
 	// Required. The end of the time interval.
-	EndTime *google_protobuf2.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Optional. The beginning of the time interval.  The default value
 	// for the start time is the end time. The start time must not be
 	// later than the end time.
-	StartTime *google_protobuf2.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime            *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *TimeInterval) Reset()                    { *m = TimeInterval{} }
-func (m *TimeInterval) String() string            { return proto.CompactTextString(m) }
-func (*TimeInterval) ProtoMessage()               {}
-func (*TimeInterval) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *TimeInterval) Reset()         { *m = TimeInterval{} }
+func (m *TimeInterval) String() string { return proto.CompactTextString(m) }
+func (*TimeInterval) ProtoMessage()    {}
+func (*TimeInterval) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_bd839df590cb6820, []int{1}
+}
+func (m *TimeInterval) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimeInterval.Unmarshal(m, b)
+}
+func (m *TimeInterval) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimeInterval.Marshal(b, m, deterministic)
+}
+func (dst *TimeInterval) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeInterval.Merge(dst, src)
+}
+func (m *TimeInterval) XXX_Size() int {
+	return xxx_messageInfo_TimeInterval.Size(m)
+}
+func (m *TimeInterval) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimeInterval.DiscardUnknown(m)
+}
 
-func (m *TimeInterval) GetEndTime() *google_protobuf2.Timestamp {
+var xxx_messageInfo_TimeInterval proto.InternalMessageInfo
+
+func (m *TimeInterval) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
 	return nil
 }
 
-func (m *TimeInterval) GetStartTime() *google_protobuf2.Timestamp {
+func (m *TimeInterval) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
@@ -562,8 +698,9 @@ func (m *TimeInterval) GetStartTime() *google_protobuf2.Timestamp {
 
 // Describes how to combine multiple time series to provide different views of
 // the data.  Aggregation consists of an alignment step on individual time
-// series (`per_series_aligner`) followed by an optional reduction of the data
-// across different time series (`cross_series_reducer`).  For more details, see
+// series (`alignment_period` and `per_series_aligner`) followed by an optional
+// reduction step of the data across the aligned time series
+// (`cross_series_reducer` and `group_by_fields`).  For more details, see
 // [Aggregation](/monitoring/api/learn_more#aggregation).
 type Aggregation struct {
 	// The alignment period for per-[time series][google.monitoring.v3.TimeSeries]
@@ -574,7 +711,7 @@ type Aggregation struct {
 	// this field is ignored. If `perSeriesAligner` is specified and
 	// does not equal `ALIGN_NONE`, then this field must be defined;
 	// otherwise an error is returned.
-	AlignmentPeriod *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=alignment_period,json=alignmentPeriod" json:"alignment_period,omitempty"`
+	AlignmentPeriod *duration.Duration `protobuf:"bytes,1,opt,name=alignment_period,json=alignmentPeriod,proto3" json:"alignment_period,omitempty"`
 	// The approach to be used to align individual time series. Not all
 	// alignment functions may be applied to all time series, depending
 	// on the metric type and value type of the original time
@@ -586,7 +723,7 @@ type Aggregation struct {
 	// `perSeriesAligner` must be specified and not equal `ALIGN_NONE`
 	// and `alignmentPeriod` must be specified; otherwise, an error is
 	// returned.
-	PerSeriesAligner Aggregation_Aligner `protobuf:"varint,2,opt,name=per_series_aligner,json=perSeriesAligner,enum=google.monitoring.v3.Aggregation_Aligner" json:"per_series_aligner,omitempty"`
+	PerSeriesAligner Aggregation_Aligner `protobuf:"varint,2,opt,name=per_series_aligner,json=perSeriesAligner,proto3,enum=google.monitoring.v3.Aggregation_Aligner" json:"per_series_aligner,omitempty"`
 	// The approach to be used to combine time series. Not all reducer
 	// functions may be applied to all time series, depending on the
 	// metric type and the value type of the original time
@@ -598,7 +735,7 @@ type Aggregation struct {
 	// `perSeriesAligner` must be specified and not equal `ALIGN_NONE`
 	// and `alignmentPeriod` must be specified; otherwise, an error is
 	// returned.
-	CrossSeriesReducer Aggregation_Reducer `protobuf:"varint,4,opt,name=cross_series_reducer,json=crossSeriesReducer,enum=google.monitoring.v3.Aggregation_Reducer" json:"cross_series_reducer,omitempty"`
+	CrossSeriesReducer Aggregation_Reducer `protobuf:"varint,4,opt,name=cross_series_reducer,json=crossSeriesReducer,proto3,enum=google.monitoring.v3.Aggregation_Reducer" json:"cross_series_reducer,omitempty"`
 	// The set of fields to preserve when `crossSeriesReducer` is
 	// specified. The `groupByFields` determine how the time series are
 	// partitioned into subsets prior to applying the aggregation
@@ -613,15 +750,37 @@ type Aggregation struct {
 	// the same resource type, then the time series are aggregated into
 	// a single output time series. If `crossSeriesReducer` is not
 	// defined, this field is ignored.
-	GroupByFields []string `protobuf:"bytes,5,rep,name=group_by_fields,json=groupByFields" json:"group_by_fields,omitempty"`
+	GroupByFields        []string `protobuf:"bytes,5,rep,name=group_by_fields,json=groupByFields,proto3" json:"group_by_fields,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Aggregation) Reset()                    { *m = Aggregation{} }
-func (m *Aggregation) String() string            { return proto.CompactTextString(m) }
-func (*Aggregation) ProtoMessage()               {}
-func (*Aggregation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Aggregation) Reset()         { *m = Aggregation{} }
+func (m *Aggregation) String() string { return proto.CompactTextString(m) }
+func (*Aggregation) ProtoMessage()    {}
+func (*Aggregation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_bd839df590cb6820, []int{2}
+}
+func (m *Aggregation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Aggregation.Unmarshal(m, b)
+}
+func (m *Aggregation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Aggregation.Marshal(b, m, deterministic)
+}
+func (dst *Aggregation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Aggregation.Merge(dst, src)
+}
+func (m *Aggregation) XXX_Size() int {
+	return xxx_messageInfo_Aggregation.Size(m)
+}
+func (m *Aggregation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Aggregation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Aggregation proto.InternalMessageInfo
 
-func (m *Aggregation) GetAlignmentPeriod() *google_protobuf3.Duration {
+func (m *Aggregation) GetAlignmentPeriod() *duration.Duration {
 	if m != nil {
 		return m.AlignmentPeriod
 	}
@@ -653,62 +812,76 @@ func init() {
 	proto.RegisterType((*TypedValue)(nil), "google.monitoring.v3.TypedValue")
 	proto.RegisterType((*TimeInterval)(nil), "google.monitoring.v3.TimeInterval")
 	proto.RegisterType((*Aggregation)(nil), "google.monitoring.v3.Aggregation")
+	proto.RegisterEnum("google.monitoring.v3.ComparisonType", ComparisonType_name, ComparisonType_value)
+	proto.RegisterEnum("google.monitoring.v3.ServiceTier", ServiceTier_name, ServiceTier_value)
 	proto.RegisterEnum("google.monitoring.v3.Aggregation_Aligner", Aggregation_Aligner_name, Aggregation_Aligner_value)
 	proto.RegisterEnum("google.monitoring.v3.Aggregation_Reducer", Aggregation_Reducer_name, Aggregation_Reducer_value)
 }
 
-func init() { proto.RegisterFile("google/monitoring/v3/common.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 792 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6a, 0xe3, 0x46,
-	0x14, 0xb6, 0xec, 0x64, 0x1d, 0x1f, 0x39, 0xf1, 0x64, 0xd6, 0x4b, 0xdd, 0x40, 0xbb, 0x5e, 0x17,
-	0x8a, 0x7b, 0x23, 0x87, 0xb8, 0x2e, 0x84, 0x42, 0x41, 0xb1, 0xb5, 0x1b, 0x83, 0x23, 0x9b, 0x59,
-	0x25, 0x0d, 0x6d, 0x40, 0xc8, 0xd1, 0xac, 0x10, 0xc8, 0x1a, 0x31, 0x92, 0x0d, 0xb9, 0xeb, 0x6b,
-	0xf4, 0xba, 0x77, 0xfb, 0x28, 0x7d, 0x84, 0x3e, 0x44, 0x9f, 0xa1, 0x68, 0x66, 0xb4, 0x52, 0x5a,
-	0x97, 0xf6, 0xf2, 0xfb, 0x39, 0xdf, 0xe8, 0x7c, 0x23, 0xd9, 0xf0, 0x26, 0x60, 0x2c, 0x88, 0xe8,
-	0x68, 0xc3, 0xe2, 0x30, 0x63, 0x3c, 0x8c, 0x83, 0xd1, 0x6e, 0x3c, 0x7a, 0x64, 0x9b, 0x0d, 0x8b,
-	0x8d, 0x84, 0xb3, 0x8c, 0xe1, 0xae, 0xb4, 0x18, 0xa5, 0xc5, 0xd8, 0x8d, 0xcf, 0xbe, 0x50, 0x83,
-	0x5e, 0x12, 0x8e, 0xfc, 0x30, 0xcd, 0x78, 0xb8, 0xde, 0x66, 0x61, 0x31, 0x74, 0xf6, 0xa5, 0x92,
-	0x05, 0x5a, 0x6f, 0x3f, 0x8c, 0xfc, 0x2d, 0xf7, 0x2a, 0xfa, 0xeb, 0xbf, 0xeb, 0x59, 0xb8, 0xa1,
-	0x69, 0xe6, 0x6d, 0x12, 0x69, 0x18, 0xfc, 0xa9, 0x01, 0x38, 0x4f, 0x09, 0xf5, 0xef, 0xbc, 0x68,
-	0x4b, 0xf1, 0x6b, 0x80, 0x35, 0x63, 0x91, 0xbb, 0xcb, 0x51, 0x4f, 0xeb, 0x6b, 0xc3, 0xa3, 0xeb,
-	0x1a, 0x69, 0xe5, 0x9c, 0x34, 0xbc, 0x01, 0x3d, 0x8c, 0xb3, 0xef, 0xbe, 0x55, 0x8e, 0x7a, 0x5f,
-	0x1b, 0x36, 0xae, 0x6b, 0x04, 0x04, 0x29, 0x2d, 0x5f, 0x41, 0xdb, 0x67, 0xdb, 0x75, 0x44, 0x95,
-	0xa7, 0xd1, 0xd7, 0x86, 0xda, 0x75, 0x8d, 0xe8, 0x92, 0xfd, 0x64, 0xca, 0x97, 0x89, 0x03, 0x65,
-	0x3a, 0xe8, 0x6b, 0xc3, 0x56, 0x6e, 0x92, 0xac, 0x34, 0xcd, 0x01, 0x57, 0x77, 0x56, 0xd6, 0xc3,
-	0xbe, 0x36, 0xd4, 0x2f, 0x7a, 0x86, 0xea, 0xcb, 0x4b, 0x42, 0x63, 0x56, 0x71, 0x5d, 0xd7, 0xc8,
-	0x69, 0x75, 0x4a, 0x44, 0x5d, 0x35, 0xe1, 0x50, 0x4c, 0x0f, 0x7e, 0xd1, 0xa0, 0xed, 0x84, 0x1b,
-	0x3a, 0x8f, 0x33, 0xca, 0x77, 0x5e, 0x84, 0x27, 0x70, 0x44, 0x63, 0xdf, 0xcd, 0x8b, 0x11, 0xeb,
-	0xe8, 0x17, 0x67, 0x45, 0x74, 0xd1, 0x9a, 0xe1, 0x14, 0xad, 0x91, 0x26, 0x8d, 0xfd, 0x1c, 0xe1,
-	0x4b, 0x80, 0x34, 0xf3, 0x78, 0x26, 0x07, 0xb5, 0xff, 0x1c, 0x6c, 0x09, 0x77, 0x8e, 0x07, 0x1f,
-	0x9b, 0xa0, 0x9b, 0x41, 0xc0, 0x69, 0x20, 0xae, 0x0a, 0xcf, 0x00, 0x79, 0x51, 0x18, 0xc4, 0x1b,
-	0x1a, 0x67, 0x6e, 0x42, 0x79, 0xc8, 0x7c, 0x15, 0xf8, 0xf9, 0x3f, 0x02, 0x67, 0xea, 0x7e, 0x49,
-	0xe7, 0xd3, 0xc8, 0x4a, 0x4c, 0xe0, 0x1f, 0x01, 0x27, 0x94, 0xbb, 0x29, 0xe5, 0x21, 0x4d, 0x5d,
-	0xa1, 0x52, 0x2e, 0x36, 0x3a, 0xb9, 0xf8, 0xc6, 0xd8, 0xf7, 0x72, 0x19, 0x95, 0x87, 0x30, 0x4c,
-	0x39, 0x40, 0x50, 0x42, 0xf9, 0x7b, 0x91, 0xa1, 0x18, 0xfc, 0x33, 0x74, 0x1f, 0x39, 0x4b, 0xd3,
-	0x22, 0x9a, 0x53, 0x7f, 0xfb, 0x48, 0xb9, 0xb8, 0xb2, 0xff, 0x15, 0x4d, 0xe4, 0x00, 0xc1, 0x22,
-	0x46, 0x86, 0x2b, 0x0e, 0x7f, 0x0d, 0x9d, 0x80, 0xb3, 0x6d, 0xe2, 0xae, 0x9f, 0xdc, 0x0f, 0x21,
-	0x8d, 0xfc, 0xb4, 0x77, 0xd8, 0x6f, 0x0c, 0x5b, 0xe4, 0x58, 0xd0, 0x57, 0x4f, 0x6f, 0x05, 0x39,
-	0xf8, 0xa3, 0x0e, 0xcd, 0xe2, 0x81, 0x4e, 0x00, 0xcc, 0xc5, 0xfc, 0x9d, 0xed, 0xda, 0x4b, 0xdb,
-	0x42, 0x35, 0xdc, 0x01, 0x5d, 0xe2, 0x99, 0xb5, 0x70, 0x4c, 0xa4, 0x95, 0x06, 0x62, 0x3a, 0x16,
-	0xaa, 0xe3, 0x57, 0x70, 0x2a, 0xf1, 0xdc, 0x76, 0x2c, 0xb2, 0x5a, 0x2e, 0x72, 0xba, 0x81, 0xbb,
-	0x80, 0x54, 0x8e, 0x75, 0xef, 0xb8, 0xcb, 0xc5, 0xcc, 0x22, 0xe8, 0x00, 0x1f, 0x43, 0x4b, 0xb2,
-	0x37, 0x73, 0x1b, 0x41, 0x05, 0x9a, 0xf7, 0x48, 0x2f, 0xa3, 0x6f, 0x2c, 0xd3, 0x46, 0xed, 0xf2,
-	0xec, 0xe9, 0xf2, 0xd6, 0x76, 0xd0, 0x71, 0xe9, 0x7f, 0x7f, 0x7b, 0x83, 0x4e, 0x30, 0x82, 0xb6,
-	0x82, 0xce, 0x6c, 0x66, 0xdd, 0xa1, 0x4e, 0x79, 0xaa, 0x98, 0x70, 0x1d, 0x72, 0x6b, 0x21, 0x84,
-	0x3f, 0x83, 0x97, 0x92, 0x7d, 0x4b, 0xcc, 0xa9, 0x33, 0x5f, 0xda, 0x52, 0x38, 0x2d, 0x85, 0x95,
-	0x45, 0xa6, 0x96, 0xed, 0xcc, 0x17, 0x96, 0x7b, 0x79, 0x89, 0xf0, 0x7e, 0x61, 0x82, 0x5e, 0xee,
-	0x15, 0x26, 0xe7, 0xa8, 0xbb, 0x57, 0x38, 0x9f, 0xa0, 0x57, 0x83, 0x5f, 0xeb, 0xd0, 0x2c, 0x2e,
-	0xa4, 0x03, 0x3a, 0xb1, 0x66, 0xb7, 0x53, 0xab, 0xd2, 0xae, 0x22, 0xc4, 0xca, 0xa2, 0xdd, 0x82,
-	0x98, 0xdb, 0xa8, 0x5e, 0xc5, 0xe6, 0x3d, 0x6a, 0x54, 0x70, 0x5e, 0xc1, 0x01, 0x3e, 0x85, 0xe3,
-	0x02, 0xcb, 0x0e, 0x0e, 0xf3, 0x56, 0x14, 0x25, 0x6b, 0x7b, 0x91, 0x5f, 0x51, 0x95, 0x91, 0xdb,
-	0x37, 0x71, 0x0f, 0xba, 0x8a, 0x7e, 0xde, 0xcb, 0x51, 0x45, 0x79, 0x5e, 0x4c, 0xeb, 0x5f, 0x94,
-	0x09, 0x82, 0xfd, 0xca, 0xe4, 0x1c, 0xe9, 0xfb, 0x95, 0xf3, 0x09, 0x6a, 0x5f, 0xfd, 0xa6, 0x41,
-	0xef, 0x91, 0x6d, 0xf6, 0xbe, 0xe5, 0x57, 0xfa, 0x54, 0xfc, 0x82, 0xaf, 0xf2, 0xaf, 0x73, 0xa5,
-	0xfd, 0xf4, 0x83, 0x32, 0x05, 0x2c, 0xf2, 0xe2, 0xc0, 0x60, 0x3c, 0x18, 0x05, 0x34, 0x16, 0xdf,
-	0xee, 0x48, 0x4a, 0x5e, 0x12, 0xa6, 0xcf, 0xff, 0x04, 0xbe, 0x2f, 0xd1, 0xc7, 0xfa, 0xd9, 0x3b,
-	0x19, 0x30, 0x8d, 0xd8, 0xd6, 0x37, 0x6e, 0xca, 0xb3, 0xee, 0xc6, 0xbf, 0x17, 0xe2, 0x83, 0x10,
-	0x1f, 0x4a, 0xf1, 0xe1, 0x6e, 0xbc, 0x7e, 0x21, 0x0e, 0x19, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff,
-	0x57, 0xa4, 0xb9, 0xce, 0x68, 0x06, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/monitoring/v3/common.proto", fileDescriptor_common_bd839df590cb6820)
+}
+
+var fileDescriptor_common_bd839df590cb6820 = []byte{
+	// 957 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xc1, 0x6e, 0xe3, 0x44,
+	0x18, 0xc7, 0xe3, 0x64, 0xdb, 0x34, 0x9f, 0xdb, 0x66, 0x3a, 0xdb, 0xed, 0x86, 0x68, 0x61, 0xb3,
+	0x45, 0x42, 0x61, 0x0f, 0x4e, 0xd5, 0x12, 0xa4, 0x0a, 0x09, 0xc9, 0x75, 0xa6, 0xad, 0xa5, 0xc4,
+	0x09, 0x13, 0xa7, 0x54, 0x50, 0xc9, 0x72, 0x9a, 0x59, 0xcb, 0x52, 0xe2, 0xb1, 0x6c, 0xa7, 0x52,
+	0x6f, 0xdc, 0x79, 0x07, 0x2e, 0xdc, 0xb8, 0xf1, 0x1a, 0x3c, 0x0c, 0x17, 0x5e, 0x00, 0x79, 0xc6,
+	0x59, 0x3b, 0x21, 0x08, 0x8e, 0xdf, 0xef, 0xff, 0xff, 0xbe, 0x99, 0xf9, 0x8f, 0x35, 0x86, 0x77,
+	0x1e, 0xe7, 0xde, 0x9c, 0x75, 0x16, 0x3c, 0xf0, 0x13, 0x1e, 0xf9, 0x81, 0xd7, 0x79, 0xba, 0xe8,
+	0x3c, 0xf2, 0xc5, 0x82, 0x07, 0x5a, 0x18, 0xf1, 0x84, 0xe3, 0x63, 0x69, 0xd1, 0x72, 0x8b, 0xf6,
+	0x74, 0xd1, 0x7c, 0x93, 0x35, 0xba, 0xa1, 0xdf, 0x71, 0x83, 0x80, 0x27, 0x6e, 0xe2, 0xf3, 0x20,
+	0x96, 0x3d, 0xcd, 0x4f, 0x0b, 0xea, 0xcc, 0x8f, 0x93, 0xc8, 0x9f, 0x2e, 0x53, 0x3d, 0x93, 0x3f,
+	0xcb, 0x64, 0x51, 0x4d, 0x97, 0x1f, 0x3a, 0xb3, 0x65, 0xe4, 0x16, 0xf4, 0xb7, 0x9b, 0x7a, 0xe2,
+	0x2f, 0x58, 0x9c, 0xb8, 0x8b, 0x50, 0x1a, 0x4e, 0xff, 0x54, 0x00, 0xec, 0xe7, 0x90, 0xcd, 0xee,
+	0xdc, 0xf9, 0x92, 0xe1, 0xb7, 0x00, 0x53, 0xce, 0xe7, 0xce, 0x53, 0x5a, 0x35, 0x94, 0x96, 0xd2,
+	0xde, 0xbb, 0x2d, 0xd1, 0x5a, 0xca, 0xa4, 0xe1, 0x1d, 0xa8, 0x7e, 0x90, 0x7c, 0xfd, 0x55, 0xe6,
+	0x28, 0xb7, 0x94, 0x76, 0xe5, 0xb6, 0x44, 0x41, 0x40, 0x69, 0xf9, 0x1c, 0xf6, 0x67, 0x7c, 0x39,
+	0x9d, 0xb3, 0xcc, 0x53, 0x69, 0x29, 0x6d, 0xe5, 0xb6, 0x44, 0x55, 0x49, 0x3f, 0x9a, 0xd2, 0xc3,
+	0x04, 0x5e, 0x66, 0x7a, 0xd1, 0x52, 0xda, 0xb5, 0xd4, 0x24, 0xa9, 0x34, 0x99, 0x80, 0x8b, 0x67,
+	0xce, 0xac, 0x3b, 0x2d, 0xa5, 0xad, 0x9e, 0x37, 0xb4, 0x2c, 0x4d, 0x37, 0xf4, 0xb5, 0x5e, 0xc1,
+	0x75, 0x5b, 0xa2, 0x47, 0xc5, 0x2e, 0x31, 0xea, 0xaa, 0x0a, 0x3b, 0xa2, 0xfb, 0xf4, 0x27, 0x05,
+	0xf6, 0x6d, 0x7f, 0xc1, 0xcc, 0x20, 0x61, 0xd1, 0x93, 0x3b, 0xc7, 0x5d, 0xd8, 0x63, 0xc1, 0xcc,
+	0x49, 0x83, 0x11, 0xc7, 0x51, 0xcf, 0x9b, 0xab, 0xd1, 0xab, 0xd4, 0x34, 0x7b, 0x95, 0x1a, 0xad,
+	0xb2, 0x60, 0x96, 0x56, 0xf8, 0x12, 0x20, 0x4e, 0xdc, 0x28, 0x91, 0x8d, 0xca, 0x7f, 0x36, 0xd6,
+	0x84, 0x3b, 0xad, 0x4f, 0xff, 0xaa, 0x82, 0xaa, 0x7b, 0x5e, 0xc4, 0x3c, 0x71, 0x55, 0xb8, 0x07,
+	0xc8, 0x9d, 0xfb, 0x5e, 0xb0, 0x60, 0x41, 0xe2, 0x84, 0x2c, 0xf2, 0xf9, 0x2c, 0x1b, 0xf8, 0xc9,
+	0x3f, 0x06, 0xf6, 0xb2, 0xfb, 0xa5, 0xf5, 0x8f, 0x2d, 0x23, 0xd1, 0x81, 0xbf, 0x07, 0x1c, 0xb2,
+	0xc8, 0x89, 0x59, 0xe4, 0xb3, 0xd8, 0x11, 0x2a, 0x8b, 0xc4, 0x89, 0x0e, 0xcf, 0xbf, 0xd4, 0xb6,
+	0x7d, 0x7a, 0x5a, 0x61, 0x13, 0x9a, 0x2e, 0x1b, 0x28, 0x0a, 0x59, 0x34, 0x16, 0x33, 0x32, 0x82,
+	0x7f, 0x84, 0xe3, 0xc7, 0x88, 0xc7, 0xf1, 0x6a, 0x74, 0xc4, 0x66, 0xcb, 0x47, 0x16, 0x89, 0x2b,
+	0xfb, 0x5f, 0xa3, 0xa9, 0x6c, 0xa0, 0x58, 0x8c, 0x91, 0xc3, 0x33, 0x86, 0xbf, 0x80, 0xba, 0x17,
+	0xf1, 0x65, 0xe8, 0x4c, 0x9f, 0x9d, 0x0f, 0x3e, 0x9b, 0xcf, 0xe2, 0xc6, 0x4e, 0xab, 0xd2, 0xae,
+	0xd1, 0x03, 0x81, 0xaf, 0x9e, 0xaf, 0x05, 0x3c, 0xfd, 0xb9, 0x02, 0xd5, 0xd5, 0x86, 0x0e, 0x01,
+	0xf4, 0xbe, 0x79, 0x63, 0x39, 0xd6, 0xd0, 0x22, 0xa8, 0x84, 0xeb, 0xa0, 0xca, 0xba, 0x47, 0xfa,
+	0xb6, 0x8e, 0x94, 0xdc, 0x40, 0x75, 0x9b, 0xa0, 0x32, 0x7e, 0x05, 0x47, 0xb2, 0x36, 0x2d, 0x9b,
+	0xd0, 0xd1, 0xb0, 0x9f, 0xe2, 0x0a, 0x3e, 0x06, 0x94, 0xcd, 0x21, 0xf7, 0xb6, 0x33, 0xec, 0xf7,
+	0x08, 0x45, 0x2f, 0xf0, 0x01, 0xd4, 0x24, 0x1d, 0x98, 0x16, 0x82, 0x42, 0xa9, 0xdf, 0x23, 0x35,
+	0x1f, 0x3d, 0x20, 0xba, 0x85, 0xf6, 0xf3, 0xb5, 0x8d, 0xe1, 0xc4, 0xb2, 0xd1, 0x41, 0xee, 0x1f,
+	0x4f, 0x06, 0xe8, 0x10, 0x23, 0xd8, 0xcf, 0x4a, 0xbb, 0xd7, 0x23, 0x77, 0xa8, 0x9e, 0xaf, 0x2a,
+	0x3a, 0x1c, 0x9b, 0x4e, 0x08, 0x42, 0xf9, 0x16, 0x25, 0xbd, 0xd6, 0xfb, 0x63, 0x82, 0x1a, 0xf8,
+	0x35, 0xbc, 0x94, 0xf8, 0x9a, 0xea, 0x86, 0x6d, 0x0e, 0x2d, 0xe9, 0x3f, 0xca, 0x85, 0x11, 0xa1,
+	0x06, 0xb1, 0x6c, 0xb3, 0x4f, 0x9c, 0xcb, 0x4b, 0x84, 0xb7, 0x0b, 0x5d, 0xf4, 0x72, 0xab, 0xd0,
+	0x3d, 0x43, 0xc7, 0x5b, 0x85, 0xb3, 0x2e, 0x7a, 0x85, 0x1b, 0x70, 0xbc, 0x26, 0x38, 0xc6, 0xad,
+	0x6e, 0xdd, 0x10, 0xf4, 0xfa, 0xf4, 0xf7, 0x32, 0x54, 0x57, 0x37, 0x58, 0x07, 0x95, 0x92, 0xde,
+	0xc4, 0x20, 0x85, 0xeb, 0xc8, 0x80, 0xc8, 0x48, 0x5c, 0xc7, 0x0a, 0x98, 0x16, 0x2a, 0x17, 0x6b,
+	0xfd, 0x1e, 0x55, 0x0a, 0x75, 0x9a, 0xd9, 0x0b, 0x7c, 0x04, 0x07, 0xab, 0x5a, 0x86, 0xb6, 0x93,
+	0xc6, 0x98, 0x21, 0x99, 0xf3, 0x6e, 0x1a, 0x58, 0x91, 0xc8, 0x5c, 0xaa, 0xf8, 0x04, 0xf0, 0x1a,
+	0x96, 0x41, 0xd6, 0xd3, 0xb3, 0x64, 0x7c, 0x3d, 0xc9, 0xbd, 0x82, 0xb2, 0x1e, 0x65, 0xed, 0x5f,
+	0x94, 0x2e, 0x82, 0xed, 0x4a, 0xf7, 0x0c, 0xa9, 0xdb, 0x95, 0xb3, 0x2e, 0xda, 0x7f, 0xff, 0x8b,
+	0x02, 0x87, 0x06, 0x5f, 0x84, 0x6e, 0xe4, 0xc7, 0x3c, 0x48, 0xdf, 0x5c, 0xdc, 0x84, 0x13, 0x63,
+	0x38, 0x18, 0xe9, 0xd4, 0x1c, 0x0f, 0x2d, 0x67, 0x62, 0x8d, 0x47, 0xc4, 0x30, 0xaf, 0x4d, 0xd2,
+	0x43, 0xa5, 0x34, 0x84, 0x82, 0x76, 0x63, 0x23, 0x65, 0x13, 0xa5, 0x5f, 0xf6, 0x3a, 0xea, 0xdb,
+	0xa8, 0xb2, 0x89, 0x88, 0x0c, 0xb4, 0x80, 0xc8, 0x77, 0x68, 0x67, 0x03, 0x59, 0x04, 0xed, 0xbe,
+	0x77, 0x41, 0x1d, 0xb3, 0xe8, 0xc9, 0x7f, 0x64, 0xb6, 0xcf, 0x22, 0xfc, 0x06, 0x1a, 0x63, 0x42,
+	0xef, 0x4c, 0x83, 0x38, 0xb6, 0x49, 0xe8, 0xc6, 0xf6, 0x4e, 0x00, 0xaf, 0xa9, 0x57, 0xfa, 0xd8,
+	0x34, 0x90, 0x92, 0x9e, 0x7f, 0x8d, 0x8f, 0x28, 0x19, 0x98, 0x93, 0x01, 0x2a, 0x37, 0xcb, 0x0d,
+	0xe5, 0xea, 0x57, 0x05, 0x1a, 0x8f, 0x7c, 0xb1, 0xf5, 0xc9, 0xb8, 0x52, 0x0d, 0xf1, 0xb3, 0x1c,
+	0xa5, 0x4f, 0xdd, 0x48, 0xf9, 0xe1, 0xdb, 0xcc, 0xe4, 0xf1, 0xb9, 0x1b, 0x78, 0x1a, 0x8f, 0xbc,
+	0x8e, 0xc7, 0x02, 0xf1, 0x10, 0x76, 0xa4, 0xe4, 0x86, 0x7e, 0xbc, 0xfe, 0xbf, 0xfd, 0x26, 0xaf,
+	0x7e, 0x2b, 0x37, 0x6f, 0xe4, 0x00, 0x63, 0xce, 0x97, 0x33, 0x6d, 0x90, 0xaf, 0x75, 0x77, 0xf1,
+	0xc7, 0x4a, 0x7c, 0x10, 0xe2, 0x43, 0x2e, 0x3e, 0xdc, 0x5d, 0x4c, 0x77, 0xc5, 0x22, 0x17, 0x7f,
+	0x07, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x78, 0xd9, 0x96, 0xd3, 0x07, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/dropped_labels.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/dropped_labels.pb.go
new file mode 100644
index 00000000..1e9f3feb
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/dropped_labels.pb.go
@@ -0,0 +1,101 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/monitoring/v3/dropped_labels.proto
+
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// A set of (label, value) pairs which were dropped during aggregation, attached
+// to google.api.Distribution.Exemplars in google.api.Distribution values during
+// aggregation.
+//
+// These values are used in combination with the label values that remain on the
+// aggregated Distribution timeseries to construct the full label set for the
+// exemplar values.  The resulting full label set may be used to identify the
+// specific task/job/instance (for example) which may be contributing to a
+// long-tail, while allowing the storage savings of only storing aggregated
+// distribution values for a large group.
+//
+// Note that there are no guarantees on ordering of the labels from
+// exemplar-to-exemplar and from distribution-to-distribution in the same
+// stream, and there may be duplicates.  It is up to clients to resolve any
+// ambiguities.
+type DroppedLabels struct {
+	// Map from label to its value, for all labels dropped in any aggregation.
+	Label                map[string]string `protobuf:"bytes,1,rep,name=label,proto3" json:"label,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *DroppedLabels) Reset()         { *m = DroppedLabels{} }
+func (m *DroppedLabels) String() string { return proto.CompactTextString(m) }
+func (*DroppedLabels) ProtoMessage()    {}
+func (*DroppedLabels) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dropped_labels_22899c9e024c97fa, []int{0}
+}
+func (m *DroppedLabels) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DroppedLabels.Unmarshal(m, b)
+}
+func (m *DroppedLabels) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DroppedLabels.Marshal(b, m, deterministic)
+}
+func (dst *DroppedLabels) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DroppedLabels.Merge(dst, src)
+}
+func (m *DroppedLabels) XXX_Size() int {
+	return xxx_messageInfo_DroppedLabels.Size(m)
+}
+func (m *DroppedLabels) XXX_DiscardUnknown() {
+	xxx_messageInfo_DroppedLabels.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DroppedLabels proto.InternalMessageInfo
+
+func (m *DroppedLabels) GetLabel() map[string]string {
+	if m != nil {
+		return m.Label
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*DroppedLabels)(nil), "google.monitoring.v3.DroppedLabels")
+	proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.DroppedLabels.LabelEntry")
+}
+
+func init() {
+	proto.RegisterFile("google/monitoring/v3/dropped_labels.proto", fileDescriptor_dropped_labels_22899c9e024c97fa)
+}
+
+var fileDescriptor_dropped_labels_22899c9e024c97fa = []byte{
+	// 219 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4c, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0xcf, 0xcd, 0xcf, 0xcb, 0x2c, 0xc9, 0x2f, 0xca, 0xcc, 0x4b, 0xd7, 0x2f, 0x33,
+	0xd6, 0x4f, 0x29, 0xca, 0x2f, 0x28, 0x48, 0x4d, 0x89, 0xcf, 0x49, 0x4c, 0x4a, 0xcd, 0x29, 0xd6,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0x28, 0xd5, 0x43, 0x28, 0xd5, 0x2b, 0x33, 0x96,
+	0x92, 0x81, 0x1a, 0x90, 0x58, 0x90, 0xa9, 0x9f, 0x98, 0x97, 0x97, 0x5f, 0x92, 0x58, 0x92, 0x99,
+	0x9f, 0x07, 0xd5, 0xa3, 0xd4, 0xcf, 0xc8, 0xc5, 0xeb, 0x02, 0x31, 0xcc, 0x07, 0x6c, 0x96, 0x90,
+	0x0b, 0x17, 0x2b, 0xd8, 0x54, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x3d, 0x3d, 0x6c, 0xa6,
+	0xea, 0xa1, 0xe8, 0xd1, 0x03, 0x53, 0xae, 0x79, 0x25, 0x45, 0x95, 0x41, 0x10, 0xcd, 0x52, 0x16,
+	0x5c, 0x5c, 0x08, 0x41, 0x21, 0x01, 0x2e, 0xe6, 0xec, 0xd4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d,
+	0xce, 0x20, 0x10, 0x53, 0x48, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x09, 0x2c,
+	0x06, 0xe1, 0x58, 0x31, 0x59, 0x30, 0x3a, 0x39, 0x44, 0xd9, 0x41, 0x6d, 0x4c, 0xcf, 0xcf, 0x49,
+	0xcc, 0x4b, 0xd7, 0xcb, 0x2f, 0x4a, 0xd7, 0x4f, 0x4f, 0xcd, 0x03, 0xbb, 0x57, 0x1f, 0x22, 0x95,
+	0x58, 0x90, 0x59, 0x8c, 0x1a, 0x22, 0xd6, 0x08, 0x5e, 0x12, 0x1b, 0x58, 0xa9, 0x31, 0x20, 0x00,
+	0x00, 0xff, 0xff, 0x7e, 0x29, 0xf8, 0x00, 0x3b, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group.pb.go
index a9c0dd81..b5808867 100644
--- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/group.proto
 
-package monitoring
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The description of a dynamic collection of monitored resources. Each group
 // has a filter that is matched against monitored resources and their associated
 // metadata. If a group's filter matches an available monitored resource, then
@@ -44,24 +50,46 @@ type Group struct {
 	// When creating a group, this field is ignored and a new name is created
 	// consisting of the project specified in the call to `CreateGroup`
 	// and a unique `{group_id}` that is generated automatically.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A user-assigned name for this group, used only for display purposes.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// The name of the group's parent, if it has one.
 	// The format is `"projects/{project_id_or_number}/groups/{group_id}"`.
 	// For groups with no parent, `parentName` is the empty string, `""`.
-	ParentName string `protobuf:"bytes,3,opt,name=parent_name,json=parentName" json:"parent_name,omitempty"`
+	ParentName string `protobuf:"bytes,3,opt,name=parent_name,json=parentName,proto3" json:"parent_name,omitempty"`
 	// The filter used to determine which monitored resources belong to this group.
-	Filter string `protobuf:"bytes,5,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
 	// If true, the members of this group are considered to be a cluster.
 	// The system can perform additional analysis on groups that are clusters.
-	IsCluster bool `protobuf:"varint,6,opt,name=is_cluster,json=isCluster" json:"is_cluster,omitempty"`
+	IsCluster            bool     `protobuf:"varint,6,opt,name=is_cluster,json=isCluster,proto3" json:"is_cluster,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Group) Reset()         { *m = Group{} }
+func (m *Group) String() string { return proto.CompactTextString(m) }
+func (*Group) ProtoMessage()    {}
+func (*Group) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_ddaab360fd5d459d, []int{0}
+}
+func (m *Group) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Group.Unmarshal(m, b)
+}
+func (m *Group) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Group.Marshal(b, m, deterministic)
+}
+func (dst *Group) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Group.Merge(dst, src)
+}
+func (m *Group) XXX_Size() int {
+	return xxx_messageInfo_Group.Size(m)
+}
+func (m *Group) XXX_DiscardUnknown() {
+	xxx_messageInfo_Group.DiscardUnknown(m)
 }
 
-func (m *Group) Reset()                    { *m = Group{} }
-func (m *Group) String() string            { return proto.CompactTextString(m) }
-func (*Group) ProtoMessage()               {}
-func (*Group) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Group proto.InternalMessageInfo
 
 func (m *Group) GetName() string {
 	if m != nil {
@@ -102,9 +130,11 @@ func init() {
 	proto.RegisterType((*Group)(nil), "google.monitoring.v3.Group")
 }
 
-func init() { proto.RegisterFile("google/monitoring/v3/group.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/monitoring/v3/group.proto", fileDescriptor_group_ddaab360fd5d459d)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_group_ddaab360fd5d459d = []byte{
 	// 261 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x4a, 0x2b, 0x31,
 	0x14, 0x87, 0x49, 0xef, 0xed, 0x60, 0x4f, 0x5d, 0x0d, 0x22, 0x83, 0x20, 0x8e, 0xae, 0xba, 0xca,
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group_service.pb.go
index 14750fa9..c6f4a0e5 100644
--- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group_service.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/group_service.proto
 
-package monitoring
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api4 "google.golang.org/genproto/googleapis/api/monitoredres"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/empty"
+import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
 
 import (
 	context "golang.org/x/net/context"
@@ -20,11 +20,17 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The `ListGroup` request.
 type ListGroupsRequest struct {
 	// The project whose groups are to be listed. The format is
 	// `"projects/{project_id_or_number}"`.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional filter consisting of a single group name.  The filters limit the
 	// groups returned based on their parent-child relationship with the specified
 	// group. If no filter is specified, all groups are returned.
@@ -35,34 +41,67 @@ type ListGroupsRequest struct {
 	//	*ListGroupsRequest_DescendantsOfGroup
 	Filter isListGroupsRequest_Filter `protobuf_oneof:"filter"`
 	// A positive number that is the maximum number of results to return.
-	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If this field is not empty then it must contain the `nextPageToken` value
 	// returned by a previous call to this method.  Using this field causes the
 	// method to return additional results from the previous method call.
-	PageToken string `protobuf:"bytes,6,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,6,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListGroupsRequest) Reset()         { *m = ListGroupsRequest{} }
+func (m *ListGroupsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListGroupsRequest) ProtoMessage()    {}
+func (*ListGroupsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_service_460c0e48a72aa329, []int{0}
+}
+func (m *ListGroupsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListGroupsRequest.Unmarshal(m, b)
 }
+func (m *ListGroupsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListGroupsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListGroupsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupsRequest.Merge(dst, src)
+}
+func (m *ListGroupsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListGroupsRequest.Size(m)
+}
+func (m *ListGroupsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListGroupsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListGroupsRequest proto.InternalMessageInfo
 
-func (m *ListGroupsRequest) Reset()                    { *m = ListGroupsRequest{} }
-func (m *ListGroupsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListGroupsRequest) ProtoMessage()               {}
-func (*ListGroupsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (m *ListGroupsRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
 
 type isListGroupsRequest_Filter interface {
 	isListGroupsRequest_Filter()
 }
 
 type ListGroupsRequest_ChildrenOfGroup struct {
-	ChildrenOfGroup string `protobuf:"bytes,2,opt,name=children_of_group,json=childrenOfGroup,oneof"`
+	ChildrenOfGroup string `protobuf:"bytes,2,opt,name=children_of_group,json=childrenOfGroup,proto3,oneof"`
 }
+
 type ListGroupsRequest_AncestorsOfGroup struct {
-	AncestorsOfGroup string `protobuf:"bytes,3,opt,name=ancestors_of_group,json=ancestorsOfGroup,oneof"`
+	AncestorsOfGroup string `protobuf:"bytes,3,opt,name=ancestors_of_group,json=ancestorsOfGroup,proto3,oneof"`
 }
+
 type ListGroupsRequest_DescendantsOfGroup struct {
-	DescendantsOfGroup string `protobuf:"bytes,4,opt,name=descendants_of_group,json=descendantsOfGroup,oneof"`
+	DescendantsOfGroup string `protobuf:"bytes,4,opt,name=descendants_of_group,json=descendantsOfGroup,proto3,oneof"`
 }
 
-func (*ListGroupsRequest_ChildrenOfGroup) isListGroupsRequest_Filter()    {}
-func (*ListGroupsRequest_AncestorsOfGroup) isListGroupsRequest_Filter()   {}
+func (*ListGroupsRequest_ChildrenOfGroup) isListGroupsRequest_Filter() {}
+
+func (*ListGroupsRequest_AncestorsOfGroup) isListGroupsRequest_Filter() {}
+
 func (*ListGroupsRequest_DescendantsOfGroup) isListGroupsRequest_Filter() {}
 
 func (m *ListGroupsRequest) GetFilter() isListGroupsRequest_Filter {
@@ -72,13 +111,6 @@ func (m *ListGroupsRequest) GetFilter() isListGroupsRequest_Filter {
 	return nil
 }
 
-func (m *ListGroupsRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
 func (m *ListGroupsRequest) GetChildrenOfGroup() string {
 	if x, ok := m.GetFilter().(*ListGroupsRequest_ChildrenOfGroup); ok {
 		return x.ChildrenOfGroup
@@ -177,15 +209,15 @@ func _ListGroupsRequest_OneofSizer(msg proto.Message) (n int) {
 	// filter
 	switch x := m.Filter.(type) {
 	case *ListGroupsRequest_ChildrenOfGroup:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ChildrenOfGroup)))
 		n += len(x.ChildrenOfGroup)
 	case *ListGroupsRequest_AncestorsOfGroup:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AncestorsOfGroup)))
 		n += len(x.AncestorsOfGroup)
 	case *ListGroupsRequest_DescendantsOfGroup:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.DescendantsOfGroup)))
 		n += len(x.DescendantsOfGroup)
 	case nil:
@@ -198,17 +230,39 @@ func _ListGroupsRequest_OneofSizer(msg proto.Message) (n int) {
 // The `ListGroups` response.
 type ListGroupsResponse struct {
 	// The groups that match the specified filters.
-	Group []*Group `protobuf:"bytes,1,rep,name=group" json:"group,omitempty"`
+	Group []*Group `protobuf:"bytes,1,rep,name=group,proto3" json:"group,omitempty"`
 	// If there are more results than have been returned, then this field is set
 	// to a non-empty value.  To see the additional results,
 	// use that value as `pageToken` in the next call to this method.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListGroupsResponse) Reset()         { *m = ListGroupsResponse{} }
+func (m *ListGroupsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListGroupsResponse) ProtoMessage()    {}
+func (*ListGroupsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_service_460c0e48a72aa329, []int{1}
+}
+func (m *ListGroupsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListGroupsResponse.Unmarshal(m, b)
+}
+func (m *ListGroupsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListGroupsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListGroupsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupsResponse.Merge(dst, src)
+}
+func (m *ListGroupsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListGroupsResponse.Size(m)
+}
+func (m *ListGroupsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListGroupsResponse.DiscardUnknown(m)
 }
 
-func (m *ListGroupsResponse) Reset()                    { *m = ListGroupsResponse{} }
-func (m *ListGroupsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListGroupsResponse) ProtoMessage()               {}
-func (*ListGroupsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_ListGroupsResponse proto.InternalMessageInfo
 
 func (m *ListGroupsResponse) GetGroup() []*Group {
 	if m != nil {
@@ -228,13 +282,35 @@ func (m *ListGroupsResponse) GetNextPageToken() string {
 type GetGroupRequest struct {
 	// The group to retrieve. The format is
 	// `"projects/{project_id_or_number}/groups/{group_id}"`.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetGroupRequest) Reset()         { *m = GetGroupRequest{} }
+func (m *GetGroupRequest) String() string { return proto.CompactTextString(m) }
+func (*GetGroupRequest) ProtoMessage()    {}
+func (*GetGroupRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_service_460c0e48a72aa329, []int{2}
+}
+func (m *GetGroupRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetGroupRequest.Unmarshal(m, b)
+}
+func (m *GetGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetGroupRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGroupRequest.Merge(dst, src)
+}
+func (m *GetGroupRequest) XXX_Size() int {
+	return xxx_messageInfo_GetGroupRequest.Size(m)
+}
+func (m *GetGroupRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetGroupRequest.DiscardUnknown(m)
 }
 
-func (m *GetGroupRequest) Reset()                    { *m = GetGroupRequest{} }
-func (m *GetGroupRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetGroupRequest) ProtoMessage()               {}
-func (*GetGroupRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+var xxx_messageInfo_GetGroupRequest proto.InternalMessageInfo
 
 func (m *GetGroupRequest) GetName() string {
 	if m != nil {
@@ -247,18 +323,40 @@ func (m *GetGroupRequest) GetName() string {
 type CreateGroupRequest struct {
 	// The project in which to create the group. The format is
 	// `"projects/{project_id_or_number}"`.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	// A group definition. It is an error to define the `name` field because
 	// the system assigns the name.
-	Group *Group `protobuf:"bytes,2,opt,name=group" json:"group,omitempty"`
+	Group *Group `protobuf:"bytes,2,opt,name=group,proto3" json:"group,omitempty"`
 	// If true, validate this request but do not create the group.
-	ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly" json:"validate_only,omitempty"`
+	ValidateOnly         bool     `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateGroupRequest) Reset()         { *m = CreateGroupRequest{} }
+func (m *CreateGroupRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateGroupRequest) ProtoMessage()    {}
+func (*CreateGroupRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_service_460c0e48a72aa329, []int{3}
+}
+func (m *CreateGroupRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateGroupRequest.Unmarshal(m, b)
+}
+func (m *CreateGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateGroupRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateGroupRequest.Merge(dst, src)
+}
+func (m *CreateGroupRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateGroupRequest.Size(m)
+}
+func (m *CreateGroupRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateGroupRequest.DiscardUnknown(m)
 }
 
-func (m *CreateGroupRequest) Reset()                    { *m = CreateGroupRequest{} }
-func (m *CreateGroupRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateGroupRequest) ProtoMessage()               {}
-func (*CreateGroupRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_CreateGroupRequest proto.InternalMessageInfo
 
 func (m *CreateGroupRequest) GetName() string {
 	if m != nil {
@@ -285,15 +383,37 @@ func (m *CreateGroupRequest) GetValidateOnly() bool {
 type UpdateGroupRequest struct {
 	// The new definition of the group.  All fields of the existing group,
 	// excepting `name`, are replaced with the corresponding fields of this group.
-	Group *Group `protobuf:"bytes,2,opt,name=group" json:"group,omitempty"`
+	Group *Group `protobuf:"bytes,2,opt,name=group,proto3" json:"group,omitempty"`
 	// If true, validate this request but do not update the existing group.
-	ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly" json:"validate_only,omitempty"`
+	ValidateOnly         bool     `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateGroupRequest) Reset()         { *m = UpdateGroupRequest{} }
+func (m *UpdateGroupRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateGroupRequest) ProtoMessage()    {}
+func (*UpdateGroupRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_service_460c0e48a72aa329, []int{4}
+}
+func (m *UpdateGroupRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateGroupRequest.Unmarshal(m, b)
+}
+func (m *UpdateGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateGroupRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateGroupRequest.Merge(dst, src)
+}
+func (m *UpdateGroupRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateGroupRequest.Size(m)
+}
+func (m *UpdateGroupRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateGroupRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateGroupRequest) Reset()                    { *m = UpdateGroupRequest{} }
-func (m *UpdateGroupRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateGroupRequest) ProtoMessage()               {}
-func (*UpdateGroupRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+var xxx_messageInfo_UpdateGroupRequest proto.InternalMessageInfo
 
 func (m *UpdateGroupRequest) GetGroup() *Group {
 	if m != nil {
@@ -313,13 +433,35 @@ func (m *UpdateGroupRequest) GetValidateOnly() bool {
 type DeleteGroupRequest struct {
 	// The group to delete. The format is
 	// `"projects/{project_id_or_number}/groups/{group_id}"`.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteGroupRequest) Reset()         { *m = DeleteGroupRequest{} }
+func (m *DeleteGroupRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteGroupRequest) ProtoMessage()    {}
+func (*DeleteGroupRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_service_460c0e48a72aa329, []int{5}
+}
+func (m *DeleteGroupRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteGroupRequest.Unmarshal(m, b)
+}
+func (m *DeleteGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteGroupRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteGroupRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteGroupRequest.Merge(dst, src)
+}
+func (m *DeleteGroupRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteGroupRequest.Size(m)
+}
+func (m *DeleteGroupRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteGroupRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteGroupRequest) Reset()                    { *m = DeleteGroupRequest{} }
-func (m *DeleteGroupRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteGroupRequest) ProtoMessage()               {}
-func (*DeleteGroupRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+var xxx_messageInfo_DeleteGroupRequest proto.InternalMessageInfo
 
 func (m *DeleteGroupRequest) GetName() string {
 	if m != nil {
@@ -332,13 +474,13 @@ func (m *DeleteGroupRequest) GetName() string {
 type ListGroupMembersRequest struct {
 	// The group whose members are listed. The format is
 	// `"projects/{project_id_or_number}/groups/{group_id}"`.
-	Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
 	// A positive number that is the maximum number of results to return.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If this field is not empty then it must contain the `nextPageToken` value
 	// returned by a previous call to this method.  Using this field causes the
 	// method to return additional results from the previous method call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// An optional [list filter](/monitoring/api/learn_more#filtering) describing
 	// the members to be returned.  The filter may reference the type, labels, and
 	// metadata of monitored resources that comprise the group.
@@ -346,18 +488,40 @@ type ListGroupMembersRequest struct {
 	// instances, use this filter:
 	//
 	//     resource.type = "gce_instance"
-	Filter string `protobuf:"bytes,5,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
 	// An optional time interval for which results should be returned. Only
 	// members that were part of the group during the specified interval are
 	// included in the response.  If no interval is provided then the group
 	// membership over the last minute is returned.
-	Interval *TimeInterval `protobuf:"bytes,6,opt,name=interval" json:"interval,omitempty"`
+	Interval             *TimeInterval `protobuf:"bytes,6,opt,name=interval,proto3" json:"interval,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ListGroupMembersRequest) Reset()         { *m = ListGroupMembersRequest{} }
+func (m *ListGroupMembersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListGroupMembersRequest) ProtoMessage()    {}
+func (*ListGroupMembersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_service_460c0e48a72aa329, []int{6}
+}
+func (m *ListGroupMembersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListGroupMembersRequest.Unmarshal(m, b)
+}
+func (m *ListGroupMembersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListGroupMembersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListGroupMembersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupMembersRequest.Merge(dst, src)
+}
+func (m *ListGroupMembersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListGroupMembersRequest.Size(m)
+}
+func (m *ListGroupMembersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListGroupMembersRequest.DiscardUnknown(m)
 }
 
-func (m *ListGroupMembersRequest) Reset()                    { *m = ListGroupMembersRequest{} }
-func (m *ListGroupMembersRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListGroupMembersRequest) ProtoMessage()               {}
-func (*ListGroupMembersRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+var xxx_messageInfo_ListGroupMembersRequest proto.InternalMessageInfo
 
 func (m *ListGroupMembersRequest) GetName() string {
 	if m != nil {
@@ -397,21 +561,43 @@ func (m *ListGroupMembersRequest) GetInterval() *TimeInterval {
 // The `ListGroupMembers` response.
 type ListGroupMembersResponse struct {
 	// A set of monitored resources in the group.
-	Members []*google_api4.MonitoredResource `protobuf:"bytes,1,rep,name=members" json:"members,omitempty"`
+	Members []*monitoredres.MonitoredResource `protobuf:"bytes,1,rep,name=members,proto3" json:"members,omitempty"`
 	// If there are more results than have been returned, then this field is
 	// set to a non-empty value.  To see the additional results, use that value as
 	// `pageToken` in the next call to this method.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
 	// The total number of elements matching this request.
-	TotalSize int32 `protobuf:"varint,3,opt,name=total_size,json=totalSize" json:"total_size,omitempty"`
+	TotalSize            int32    `protobuf:"varint,3,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListGroupMembersResponse) Reset()         { *m = ListGroupMembersResponse{} }
+func (m *ListGroupMembersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListGroupMembersResponse) ProtoMessage()    {}
+func (*ListGroupMembersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_group_service_460c0e48a72aa329, []int{7}
+}
+func (m *ListGroupMembersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListGroupMembersResponse.Unmarshal(m, b)
+}
+func (m *ListGroupMembersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListGroupMembersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListGroupMembersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListGroupMembersResponse.Merge(dst, src)
+}
+func (m *ListGroupMembersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListGroupMembersResponse.Size(m)
+}
+func (m *ListGroupMembersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListGroupMembersResponse.DiscardUnknown(m)
 }
 
-func (m *ListGroupMembersResponse) Reset()                    { *m = ListGroupMembersResponse{} }
-func (m *ListGroupMembersResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListGroupMembersResponse) ProtoMessage()               {}
-func (*ListGroupMembersResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+var xxx_messageInfo_ListGroupMembersResponse proto.InternalMessageInfo
 
-func (m *ListGroupMembersResponse) GetMembers() []*google_api4.MonitoredResource {
+func (m *ListGroupMembersResponse) GetMembers() []*monitoredres.MonitoredResource {
 	if m != nil {
 		return m.Members
 	}
@@ -451,8 +637,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for GroupService service
-
+// GroupServiceClient is the client API for GroupService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type GroupServiceClient interface {
 	// Lists the existing groups.
 	ListGroups(ctx context.Context, in *ListGroupsRequest, opts ...grpc.CallOption) (*ListGroupsResponse, error)
@@ -464,7 +651,7 @@ type GroupServiceClient interface {
 	// You can change any group attributes except `name`.
 	UpdateGroup(ctx context.Context, in *UpdateGroupRequest, opts ...grpc.CallOption) (*Group, error)
 	// Deletes an existing group.
-	DeleteGroup(ctx context.Context, in *DeleteGroupRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeleteGroup(ctx context.Context, in *DeleteGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Lists the monitored resources that are members of a group.
 	ListGroupMembers(ctx context.Context, in *ListGroupMembersRequest, opts ...grpc.CallOption) (*ListGroupMembersResponse, error)
 }
@@ -479,7 +666,7 @@ func NewGroupServiceClient(cc *grpc.ClientConn) GroupServiceClient {
 
 func (c *groupServiceClient) ListGroups(ctx context.Context, in *ListGroupsRequest, opts ...grpc.CallOption) (*ListGroupsResponse, error) {
 	out := new(ListGroupsResponse)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.GroupService/ListGroups", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.GroupService/ListGroups", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -488,7 +675,7 @@ func (c *groupServiceClient) ListGroups(ctx context.Context, in *ListGroupsReque
 
 func (c *groupServiceClient) GetGroup(ctx context.Context, in *GetGroupRequest, opts ...grpc.CallOption) (*Group, error) {
 	out := new(Group)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.GroupService/GetGroup", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.GroupService/GetGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -497,7 +684,7 @@ func (c *groupServiceClient) GetGroup(ctx context.Context, in *GetGroupRequest,
 
 func (c *groupServiceClient) CreateGroup(ctx context.Context, in *CreateGroupRequest, opts ...grpc.CallOption) (*Group, error) {
 	out := new(Group)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.GroupService/CreateGroup", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.GroupService/CreateGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -506,16 +693,16 @@ func (c *groupServiceClient) CreateGroup(ctx context.Context, in *CreateGroupReq
 
 func (c *groupServiceClient) UpdateGroup(ctx context.Context, in *UpdateGroupRequest, opts ...grpc.CallOption) (*Group, error) {
 	out := new(Group)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.GroupService/UpdateGroup", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.GroupService/UpdateGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *groupServiceClient) DeleteGroup(ctx context.Context, in *DeleteGroupRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.GroupService/DeleteGroup", in, out, c.cc, opts...)
+func (c *groupServiceClient) DeleteGroup(ctx context.Context, in *DeleteGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.GroupService/DeleteGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -524,15 +711,14 @@ func (c *groupServiceClient) DeleteGroup(ctx context.Context, in *DeleteGroupReq
 
 func (c *groupServiceClient) ListGroupMembers(ctx context.Context, in *ListGroupMembersRequest, opts ...grpc.CallOption) (*ListGroupMembersResponse, error) {
 	out := new(ListGroupMembersResponse)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.GroupService/ListGroupMembers", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.GroupService/ListGroupMembers", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for GroupService service
-
+// GroupServiceServer is the server API for GroupService service.
 type GroupServiceServer interface {
 	// Lists the existing groups.
 	ListGroups(context.Context, *ListGroupsRequest) (*ListGroupsResponse, error)
@@ -544,7 +730,7 @@ type GroupServiceServer interface {
 	// You can change any group attributes except `name`.
 	UpdateGroup(context.Context, *UpdateGroupRequest) (*Group, error)
 	// Deletes an existing group.
-	DeleteGroup(context.Context, *DeleteGroupRequest) (*google_protobuf4.Empty, error)
+	DeleteGroup(context.Context, *DeleteGroupRequest) (*empty.Empty, error)
 	// Lists the monitored resources that are members of a group.
 	ListGroupMembers(context.Context, *ListGroupMembersRequest) (*ListGroupMembersResponse, error)
 }
@@ -694,9 +880,11 @@ var _GroupService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/monitoring/v3/group_service.proto",
 }
 
-func init() { proto.RegisterFile("google/monitoring/v3/group_service.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/monitoring/v3/group_service.proto", fileDescriptor_group_service_460c0e48a72aa329)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_group_service_460c0e48a72aa329 = []byte{
 	// 826 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x4c,
 	0x10, 0x7e, 0xdd, 0xa4, 0x69, 0xb2, 0x69, 0xd5, 0x76, 0x55, 0xf5, 0x8d, 0xdc, 0x0f, 0x05, 0xf7,
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric.pb.go
index 533b5373..f70b88fb 100644
--- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric.pb.go
@@ -1,38 +1,68 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/metric.proto
 
-package monitoring
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_api5 "google.golang.org/genproto/googleapis/api/metric"
-import google_api4 "google.golang.org/genproto/googleapis/api/monitoredres"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import _ "google.golang.org/genproto/googleapis/api/label"
+import metric "google.golang.org/genproto/googleapis/api/metric"
+import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A single data point in a time series.
 type Point struct {
-	// The time interval to which the data point applies.  For GAUGE metrics, only
-	// the end time of the interval is used.  For DELTA metrics, the start and end
-	// time should specify a non-zero interval, with subsequent points specifying
-	// contiguous and non-overlapping intervals.  For CUMULATIVE metrics, the
-	// start and end time should specify a non-zero interval, with subsequent
-	// points specifying the same start time and increasing end times, until an
-	// event resets the cumulative value to zero and sets a new start time for the
-	// following points.
-	Interval *TimeInterval `protobuf:"bytes,1,opt,name=interval" json:"interval,omitempty"`
+	// The time interval to which the data point applies.  For `GAUGE` metrics,
+	// only the end time of the interval is used.  For `DELTA` metrics, the start
+	// and end time should specify a non-zero interval, with subsequent points
+	// specifying contiguous and non-overlapping intervals.  For `CUMULATIVE`
+	// metrics, the start and end time should specify a non-zero interval, with
+	// subsequent points specifying the same start time and increasing end times,
+	// until an event resets the cumulative value to zero and sets a new start
+	// time for the following points.
+	Interval *TimeInterval `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"`
 	// The value of the data point.
-	Value *TypedValue `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value                *TypedValue `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *Point) Reset()         { *m = Point{} }
+func (m *Point) String() string { return proto.CompactTextString(m) }
+func (*Point) ProtoMessage()    {}
+func (*Point) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_360b9781a7cf8bf5, []int{0}
+}
+func (m *Point) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Point.Unmarshal(m, b)
+}
+func (m *Point) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Point.Marshal(b, m, deterministic)
+}
+func (dst *Point) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Point.Merge(dst, src)
+}
+func (m *Point) XXX_Size() int {
+	return xxx_messageInfo_Point.Size(m)
+}
+func (m *Point) XXX_DiscardUnknown() {
+	xxx_messageInfo_Point.DiscardUnknown(m)
 }
 
-func (m *Point) Reset()                    { *m = Point{} }
-func (m *Point) String() string            { return proto.CompactTextString(m) }
-func (*Point) ProtoMessage()               {}
-func (*Point) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_Point proto.InternalMessageInfo
 
 func (m *Point) GetInterval() *TimeInterval {
 	if m != nil {
@@ -55,10 +85,14 @@ func (m *Point) GetValue() *TypedValue {
 type TimeSeries struct {
 	// The associated metric. A fully-specified metric used to identify the time
 	// series.
-	Metric *google_api5.Metric `protobuf:"bytes,1,opt,name=metric" json:"metric,omitempty"`
-	// The associated resource. A fully-specified monitored resource used to
-	// identify the time series.
-	Resource *google_api4.MonitoredResource `protobuf:"bytes,2,opt,name=resource" json:"resource,omitempty"`
+	Metric *metric.Metric `protobuf:"bytes,1,opt,name=metric,proto3" json:"metric,omitempty"`
+	// The associated monitored resource.  Custom metrics can use only certain
+	// monitored resource types in their time series data.
+	Resource *monitoredres.MonitoredResource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
+	// Output only. The associated monitored resource metadata. When reading a
+	// a timeseries, this field will include metadata labels that are explicitly
+	// named in the reduction. When creating a timeseries, this field is ignored.
+	Metadata *monitoredres.MonitoredResourceMetadata `protobuf:"bytes,7,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// The metric kind of the time series. When listing time series, this metric
 	// kind might be different from the metric kind of the associated metric if
 	// this time series is an alignment or reduction of other time series.
@@ -68,56 +102,85 @@ type TimeSeries struct {
 	// metric's descriptor must be auto-created, then this field specifies the
 	// metric kind of the new descriptor and must be either `GAUGE` (the default)
 	// or `CUMULATIVE`.
-	MetricKind google_api5.MetricDescriptor_MetricKind `protobuf:"varint,3,opt,name=metric_kind,json=metricKind,enum=google.api.MetricDescriptor_MetricKind" json:"metric_kind,omitempty"`
+	MetricKind metric.MetricDescriptor_MetricKind `protobuf:"varint,3,opt,name=metric_kind,json=metricKind,proto3,enum=google.api.MetricDescriptor_MetricKind" json:"metric_kind,omitempty"`
 	// The value type of the time series. When listing time series, this value
 	// type might be different from the value type of the associated metric if
 	// this time series is an alignment or reduction of other time series.
 	//
 	// When creating a time series, this field is optional. If present, it must be
 	// the same as the type of the data in the `points` field.
-	ValueType google_api5.MetricDescriptor_ValueType `protobuf:"varint,4,opt,name=value_type,json=valueType,enum=google.api.MetricDescriptor_ValueType" json:"value_type,omitempty"`
-	// The data points of this time series. When listing time series, the order of
-	// the points is specified by the list method.
+	ValueType metric.MetricDescriptor_ValueType `protobuf:"varint,4,opt,name=value_type,json=valueType,proto3,enum=google.api.MetricDescriptor_ValueType" json:"value_type,omitempty"`
+	// The data points of this time series. When listing time series, points are
+	// returned in reverse time order.
 	//
 	// When creating a time series, this field must contain exactly one point and
 	// the point's type must be the same as the value type of the associated
 	// metric. If the associated metric's descriptor must be auto-created, then
 	// the value type of the descriptor is determined by the point's type, which
 	// must be `BOOL`, `INT64`, `DOUBLE`, or `DISTRIBUTION`.
-	Points []*Point `protobuf:"bytes,5,rep,name=points" json:"points,omitempty"`
+	Points               []*Point `protobuf:"bytes,5,rep,name=points,proto3" json:"points,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TimeSeries) Reset()                    { *m = TimeSeries{} }
-func (m *TimeSeries) String() string            { return proto.CompactTextString(m) }
-func (*TimeSeries) ProtoMessage()               {}
-func (*TimeSeries) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+func (m *TimeSeries) Reset()         { *m = TimeSeries{} }
+func (m *TimeSeries) String() string { return proto.CompactTextString(m) }
+func (*TimeSeries) ProtoMessage()    {}
+func (*TimeSeries) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_360b9781a7cf8bf5, []int{1}
+}
+func (m *TimeSeries) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimeSeries.Unmarshal(m, b)
+}
+func (m *TimeSeries) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimeSeries.Marshal(b, m, deterministic)
+}
+func (dst *TimeSeries) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeSeries.Merge(dst, src)
+}
+func (m *TimeSeries) XXX_Size() int {
+	return xxx_messageInfo_TimeSeries.Size(m)
+}
+func (m *TimeSeries) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimeSeries.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TimeSeries proto.InternalMessageInfo
 
-func (m *TimeSeries) GetMetric() *google_api5.Metric {
+func (m *TimeSeries) GetMetric() *metric.Metric {
 	if m != nil {
 		return m.Metric
 	}
 	return nil
 }
 
-func (m *TimeSeries) GetResource() *google_api4.MonitoredResource {
+func (m *TimeSeries) GetResource() *monitoredres.MonitoredResource {
 	if m != nil {
 		return m.Resource
 	}
 	return nil
 }
 
-func (m *TimeSeries) GetMetricKind() google_api5.MetricDescriptor_MetricKind {
+func (m *TimeSeries) GetMetadata() *monitoredres.MonitoredResourceMetadata {
+	if m != nil {
+		return m.Metadata
+	}
+	return nil
+}
+
+func (m *TimeSeries) GetMetricKind() metric.MetricDescriptor_MetricKind {
 	if m != nil {
 		return m.MetricKind
 	}
-	return google_api5.MetricDescriptor_METRIC_KIND_UNSPECIFIED
+	return metric.MetricDescriptor_METRIC_KIND_UNSPECIFIED
 }
 
-func (m *TimeSeries) GetValueType() google_api5.MetricDescriptor_ValueType {
+func (m *TimeSeries) GetValueType() metric.MetricDescriptor_ValueType {
 	if m != nil {
 		return m.ValueType
 	}
-	return google_api5.MetricDescriptor_VALUE_TYPE_UNSPECIFIED
+	return metric.MetricDescriptor_VALUE_TYPE_UNSPECIFIED
 }
 
 func (m *TimeSeries) GetPoints() []*Point {
@@ -132,33 +195,38 @@ func init() {
 	proto.RegisterType((*TimeSeries)(nil), "google.monitoring.v3.TimeSeries")
 }
 
-func init() { proto.RegisterFile("google/monitoring/v3/metric.proto", fileDescriptor3) }
-
-var fileDescriptor3 = []byte{
-	// 396 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x4a, 0xeb, 0x40,
-	0x14, 0x86, 0x49, 0x7b, 0x5b, 0x7a, 0x27, 0x70, 0x17, 0xc3, 0x05, 0x43, 0x45, 0x88, 0x15, 0xb4,
-	0xb8, 0x48, 0xa0, 0x01, 0x41, 0x84, 0x2e, 0xaa, 0xa2, 0x22, 0x42, 0x19, 0xa5, 0x0b, 0x29, 0x94,
-	0x98, 0x0c, 0x61, 0x30, 0x99, 0x33, 0x4c, 0xd2, 0x40, 0x57, 0x3e, 0x8c, 0x3b, 0xdf, 0xc0, 0x57,
-	0xf0, 0xa9, 0x24, 0x33, 0x93, 0xd6, 0x62, 0x74, 0x37, 0xc9, 0xff, 0x9d, 0xff, 0x9f, 0x73, 0xce,
-	0xa0, 0xfd, 0x04, 0x20, 0x49, 0xa9, 0x9f, 0x01, 0x67, 0x05, 0x48, 0xc6, 0x13, 0xbf, 0x0c, 0xfc,
-	0x8c, 0x16, 0x92, 0x45, 0x9e, 0x90, 0x50, 0x00, 0xfe, 0xaf, 0x11, 0x6f, 0x83, 0x78, 0x65, 0xd0,
-	0xdf, 0x31, 0x85, 0xa1, 0x60, 0x5b, 0x78, 0xff, 0xe0, 0xab, 0xa0, 0x4b, 0x68, 0xbc, 0x90, 0x34,
-	0x87, 0xa5, 0x8c, 0xa8, 0x81, 0x9a, 0x63, 0x23, 0xc8, 0x32, 0xe0, 0x1a, 0x19, 0xbc, 0xa0, 0xce,
-	0x14, 0x18, 0x2f, 0xf0, 0x18, 0xf5, 0x18, 0x2f, 0xa8, 0x2c, 0xc3, 0xd4, 0xb1, 0x5c, 0x6b, 0x68,
-	0x8f, 0x06, 0x5e, 0xd3, 0x95, 0xbc, 0x07, 0x96, 0xd1, 0x1b, 0x43, 0x92, 0x75, 0x0d, 0x3e, 0x41,
-	0x9d, 0x32, 0x4c, 0x97, 0xd4, 0x69, 0xa9, 0x62, 0xf7, 0x87, 0xe2, 0x95, 0xa0, 0xf1, 0xac, 0xe2,
-	0x88, 0xc6, 0x07, 0xef, 0x2d, 0x84, 0x2a, 0xcb, 0x7b, 0x2a, 0x19, 0xcd, 0xf1, 0x31, 0xea, 0xea,
-	0x3e, 0xcd, 0x25, 0x70, 0xed, 0x13, 0x0a, 0xe6, 0xdd, 0x29, 0x85, 0x18, 0x02, 0x9f, 0xa2, 0x5e,
-	0xdd, 0xb0, 0x49, 0xdd, 0xdb, 0xa2, 0xeb, 0xb1, 0x10, 0x03, 0x91, 0x35, 0x8e, 0xaf, 0x91, 0xad,
-	0x4d, 0x16, 0xcf, 0x8c, 0xc7, 0x4e, 0xdb, 0xb5, 0x86, 0xff, 0x46, 0x47, 0xdf, 0xb3, 0x2e, 0x68,
-	0x1e, 0x49, 0x26, 0x0a, 0x90, 0xe6, 0xc7, 0x2d, 0xe3, 0x31, 0x41, 0xd9, 0xfa, 0x8c, 0x2f, 0x11,
-	0x52, 0x8d, 0x2c, 0x8a, 0x95, 0xa0, 0xce, 0x1f, 0x65, 0x74, 0xf8, 0xab, 0x91, 0x6a, 0xbf, 0x1a,
-	0x04, 0xf9, 0x5b, 0xd6, 0x47, 0x1c, 0xa0, 0xae, 0xa8, 0xf6, 0x90, 0x3b, 0x1d, 0xb7, 0x3d, 0xb4,
-	0x47, 0xbb, 0xcd, 0xf3, 0x53, 0xbb, 0x22, 0x06, 0x9d, 0xbc, 0x5a, 0xc8, 0x89, 0x20, 0x6b, 0x44,
-	0x27, 0xb6, 0x0e, 0x9e, 0x56, 0x6b, 0x9e, 0x5a, 0x8f, 0x63, 0x03, 0x25, 0x90, 0x86, 0x3c, 0xf1,
-	0x40, 0x26, 0x7e, 0x42, 0xb9, 0x7a, 0x04, 0xbe, 0x96, 0x42, 0xc1, 0xf2, 0xed, 0xa7, 0x72, 0xb6,
-	0xf9, 0x7a, 0x6b, 0xf5, 0xaf, 0xb4, 0xc1, 0x79, 0x0a, 0xcb, 0xb8, 0x1e, 0x6e, 0x95, 0x35, 0x0b,
-	0x3e, 0x6a, 0x71, 0xae, 0xc4, 0xf9, 0x46, 0x9c, 0xcf, 0x82, 0xa7, 0xae, 0x0a, 0x09, 0x3e, 0x03,
-	0x00, 0x00, 0xff, 0xff, 0x28, 0x45, 0x7a, 0x13, 0x05, 0x03, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/monitoring/v3/metric.proto", fileDescriptor_metric_360b9781a7cf8bf5)
+}
+
+var fileDescriptor_metric_360b9781a7cf8bf5 = []byte{
+	// 441 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x51, 0xab, 0xd3, 0x30,
+	0x14, 0xc7, 0xe9, 0xae, 0x9b, 0x33, 0x03, 0x1f, 0x82, 0x68, 0x99, 0x0a, 0x73, 0xa2, 0x0e, 0x1f,
+	0x5a, 0x58, 0x41, 0x10, 0xe1, 0x82, 0x57, 0x45, 0x45, 0x2e, 0x8c, 0x28, 0x7b, 0x90, 0xc1, 0xc8,
+	0x6d, 0x0f, 0x25, 0xd8, 0xe4, 0x84, 0x34, 0x2b, 0xdc, 0x27, 0x3f, 0x8c, 0x6f, 0x7e, 0x14, 0x3f,
+	0x93, 0x0f, 0xd2, 0x24, 0xdd, 0x76, 0xb1, 0xf7, 0xbe, 0xb5, 0xf9, 0xff, 0xfe, 0xe7, 0x7f, 0x72,
+	0x72, 0xc8, 0x93, 0x12, 0xb1, 0xac, 0x20, 0x95, 0xa8, 0x84, 0x45, 0x23, 0x54, 0x99, 0x36, 0x59,
+	0x2a, 0xc1, 0x1a, 0x91, 0x27, 0xda, 0xa0, 0x45, 0x7a, 0xcf, 0x23, 0xc9, 0x01, 0x49, 0x9a, 0x6c,
+	0xfa, 0x28, 0x18, 0xb9, 0x16, 0x29, 0x57, 0x0a, 0x2d, 0xb7, 0x02, 0x55, 0xed, 0x3d, 0xd3, 0xfb,
+	0x47, 0x6a, 0xc5, 0x2f, 0xa0, 0x0a, 0xe7, 0x0f, 0x8e, 0xce, 0x8f, 0x43, 0xa6, 0x4f, 0x8f, 0x05,
+	0x1f, 0x04, 0xc5, 0xd6, 0x40, 0x8d, 0x3b, 0x93, 0x43, 0x80, 0xfa, 0x9b, 0xcd, 0x51, 0x4a, 0x54,
+	0x1e, 0x99, 0xff, 0x24, 0xc3, 0x15, 0x0a, 0x65, 0xe9, 0x29, 0x19, 0x0b, 0x65, 0xc1, 0x34, 0xbc,
+	0x8a, 0xa3, 0x59, 0xb4, 0x98, 0x2c, 0xe7, 0x49, 0xdf, 0x45, 0x92, 0x6f, 0x42, 0xc2, 0xe7, 0x40,
+	0xb2, 0xbd, 0x87, 0xbe, 0x22, 0xc3, 0x86, 0x57, 0x3b, 0x88, 0x07, 0xce, 0x3c, 0xbb, 0xc6, 0x7c,
+	0xa9, 0xa1, 0x58, 0xb7, 0x1c, 0xf3, 0xf8, 0xfc, 0xef, 0x80, 0x90, 0xb6, 0xe4, 0x57, 0x30, 0x02,
+	0x6a, 0xfa, 0x92, 0x8c, 0xfc, 0x3d, 0x43, 0x13, 0xb4, 0xab, 0xc3, 0xb5, 0x48, 0xce, 0x9d, 0xc2,
+	0x02, 0x41, 0x5f, 0x93, 0x71, 0x77, 0xe1, 0x90, 0xfa, 0xf8, 0x0a, 0xdd, 0x8d, 0x85, 0x05, 0x88,
+	0xed, 0x71, 0xfa, 0x96, 0x8c, 0x25, 0x58, 0x5e, 0x70, 0xcb, 0xe3, 0xdb, 0xce, 0xfa, 0xec, 0x46,
+	0xeb, 0x79, 0x80, 0xd9, 0xde, 0x46, 0x3f, 0x91, 0x89, 0xef, 0x63, 0xfb, 0x43, 0xa8, 0x22, 0x3e,
+	0x99, 0x45, 0x8b, 0xbb, 0xcb, 0x17, 0xff, 0xb7, 0xfb, 0x1e, 0xea, 0xdc, 0x08, 0x6d, 0xd1, 0x84,
+	0x83, 0x2f, 0x42, 0x15, 0x8c, 0xc8, 0xfd, 0x37, 0xfd, 0x40, 0x88, 0x9b, 0xc5, 0xd6, 0x5e, 0x6a,
+	0x88, 0x6f, 0xb9, 0x42, 0xcf, 0x6f, 0x2c, 0xe4, 0x26, 0xd8, 0xce, 0x92, 0xdd, 0x69, 0xba, 0x4f,
+	0x9a, 0x91, 0x91, 0x6e, 0x9f, 0xb2, 0x8e, 0x87, 0xb3, 0x93, 0xc5, 0x64, 0xf9, 0xb0, 0xff, 0x09,
+	0xdc, 0x73, 0xb3, 0x80, 0x9e, 0xfd, 0x8a, 0x48, 0x9c, 0xa3, 0xec, 0x45, 0xcf, 0x26, 0x3e, 0x78,
+	0xd5, 0x6e, 0xca, 0x2a, 0xfa, 0x7e, 0x1a, 0xa0, 0x12, 0x2b, 0xae, 0xca, 0x04, 0x4d, 0x99, 0x96,
+	0xa0, 0xdc, 0x1e, 0xa5, 0x5e, 0xe2, 0x5a, 0xd4, 0x57, 0xb7, 0xed, 0xcd, 0xe1, 0xef, 0xf7, 0x60,
+	0xfa, 0xd1, 0x17, 0x78, 0x57, 0xe1, 0xae, 0xe8, 0x86, 0xdc, 0x66, 0xad, 0xb3, 0x3f, 0x9d, 0xb8,
+	0x71, 0xe2, 0xe6, 0x20, 0x6e, 0xd6, 0xd9, 0xc5, 0xc8, 0x85, 0x64, 0xff, 0x02, 0x00, 0x00, 0xff,
+	0xff, 0x5a, 0x88, 0xc9, 0x0b, 0x7e, 0x03, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric_service.pb.go
index 77840f1c..b1fcf831 100644
--- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric_service.pb.go
@@ -1,16 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/metric_service.proto
 
-package monitoring
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _ "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_api5 "google.golang.org/genproto/googleapis/api/metric"
-import google_api4 "google.golang.org/genproto/googleapis/api/monitoredres"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/empty"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import metric "google.golang.org/genproto/googleapis/api/metric"
+import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
+import status "google.golang.org/genproto/googleapis/rpc/status"
 
 import (
 	context "golang.org/x/net/context"
@@ -22,6 +23,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Controls which fields are returned by `ListTimeSeries`.
 type ListTimeSeriesRequest_TimeSeriesView int32
 
@@ -47,14 +54,14 @@ func (x ListTimeSeriesRequest_TimeSeriesView) String() string {
 	return proto.EnumName(ListTimeSeriesRequest_TimeSeriesView_name, int32(x))
 }
 func (ListTimeSeriesRequest_TimeSeriesView) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{8, 0}
+	return fileDescriptor_metric_service_2999501584b35c85, []int{8, 0}
 }
 
 // The `ListMonitoredResourceDescriptors` request.
 type ListMonitoredResourceDescriptorsRequest struct {
 	// The project on which to execute the request. The format is
 	// `"projects/{project_id_or_number}"`.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional [filter](/monitoring/api/v3/filters) describing
 	// the descriptors to be returned.  The filter can reference
 	// the descriptor's type and labels. For example, the
@@ -62,13 +69,16 @@ type ListMonitoredResourceDescriptorsRequest struct {
 	// that have an `id` label:
 	//
 	//     resource.type = starts_with("gce_") AND resource.label:id
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// A positive number that is the maximum number of results to return.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If this field is not empty then it must contain the `nextPageToken` value
 	// returned by a previous call to this method.  Using this field causes the
 	// method to return additional results from the previous method call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ListMonitoredResourceDescriptorsRequest) Reset() {
@@ -77,8 +87,25 @@ func (m *ListMonitoredResourceDescriptorsRequest) Reset() {
 func (m *ListMonitoredResourceDescriptorsRequest) String() string { return proto.CompactTextString(m) }
 func (*ListMonitoredResourceDescriptorsRequest) ProtoMessage()    {}
 func (*ListMonitoredResourceDescriptorsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{0}
+	return fileDescriptor_metric_service_2999501584b35c85, []int{0}
+}
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Unmarshal(m, b)
+}
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListMonitoredResourceDescriptorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Merge(dst, src)
+}
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Size(m)
 }
+func (m *ListMonitoredResourceDescriptorsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListMonitoredResourceDescriptorsRequest proto.InternalMessageInfo
 
 func (m *ListMonitoredResourceDescriptorsRequest) GetName() string {
 	if m != nil {
@@ -108,15 +135,18 @@ func (m *ListMonitoredResourceDescriptorsRequest) GetPageToken() string {
 	return ""
 }
 
-// The `ListMonitoredResourcDescriptors` response.
+// The `ListMonitoredResourceDescriptors` response.
 type ListMonitoredResourceDescriptorsResponse struct {
 	// The monitored resource descriptors that are available to this project
 	// and that match `filter`, if present.
-	ResourceDescriptors []*google_api4.MonitoredResourceDescriptor `protobuf:"bytes,1,rep,name=resource_descriptors,json=resourceDescriptors" json:"resource_descriptors,omitempty"`
+	ResourceDescriptors []*monitoredres.MonitoredResourceDescriptor `protobuf:"bytes,1,rep,name=resource_descriptors,json=resourceDescriptors,proto3" json:"resource_descriptors,omitempty"`
 	// If there are more results than have been returned, then this field is set
 	// to a non-empty value.  To see the additional results,
 	// use that value as `pageToken` in the next call to this method.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ListMonitoredResourceDescriptorsResponse) Reset() {
@@ -125,10 +155,27 @@ func (m *ListMonitoredResourceDescriptorsResponse) Reset() {
 func (m *ListMonitoredResourceDescriptorsResponse) String() string { return proto.CompactTextString(m) }
 func (*ListMonitoredResourceDescriptorsResponse) ProtoMessage()    {}
 func (*ListMonitoredResourceDescriptorsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{1}
+	return fileDescriptor_metric_service_2999501584b35c85, []int{1}
+}
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Unmarshal(m, b)
+}
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListMonitoredResourceDescriptorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Merge(dst, src)
+}
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Size(m)
 }
+func (m *ListMonitoredResourceDescriptorsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListMonitoredResourceDescriptorsResponse proto.InternalMessageInfo
 
-func (m *ListMonitoredResourceDescriptorsResponse) GetResourceDescriptors() []*google_api4.MonitoredResourceDescriptor {
+func (m *ListMonitoredResourceDescriptorsResponse) GetResourceDescriptors() []*monitoredres.MonitoredResourceDescriptor {
 	if m != nil {
 		return m.ResourceDescriptors
 	}
@@ -148,15 +195,35 @@ type GetMonitoredResourceDescriptorRequest struct {
 	// `"projects/{project_id_or_number}/monitoredResourceDescriptors/{resource_type}"`.
 	// The `{resource_type}` is a predefined type, such as
 	// `cloudsql_database`.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *GetMonitoredResourceDescriptorRequest) Reset()         { *m = GetMonitoredResourceDescriptorRequest{} }
 func (m *GetMonitoredResourceDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetMonitoredResourceDescriptorRequest) ProtoMessage()    {}
 func (*GetMonitoredResourceDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{2}
+	return fileDescriptor_metric_service_2999501584b35c85, []int{2}
+}
+func (m *GetMonitoredResourceDescriptorRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Unmarshal(m, b)
+}
+func (m *GetMonitoredResourceDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetMonitoredResourceDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Merge(dst, src)
+}
+func (m *GetMonitoredResourceDescriptorRequest) XXX_Size() int {
+	return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Size(m)
 }
+func (m *GetMonitoredResourceDescriptorRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetMonitoredResourceDescriptorRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetMonitoredResourceDescriptorRequest proto.InternalMessageInfo
 
 func (m *GetMonitoredResourceDescriptorRequest) GetName() string {
 	if m != nil {
@@ -169,7 +236,7 @@ func (m *GetMonitoredResourceDescriptorRequest) GetName() string {
 type ListMetricDescriptorsRequest struct {
 	// The project on which to execute the request. The format is
 	// `"projects/{project_id_or_number}"`.
-	Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
 	// If this field is empty, all custom and
 	// system-defined metric descriptors are returned.
 	// Otherwise, the [filter](/monitoring/api/v3/filters)
@@ -178,19 +245,41 @@ type ListMetricDescriptorsRequest struct {
 	// [custom metrics](/monitoring/custom-metrics):
 	//
 	//     metric.type = starts_with("custom.googleapis.com/")
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// A positive number that is the maximum number of results to return.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If this field is not empty then it must contain the `nextPageToken` value
 	// returned by a previous call to this method.  Using this field causes the
 	// method to return additional results from the previous method call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListMetricDescriptorsRequest) Reset()                    { *m = ListMetricDescriptorsRequest{} }
-func (m *ListMetricDescriptorsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListMetricDescriptorsRequest) ProtoMessage()               {}
-func (*ListMetricDescriptorsRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+func (m *ListMetricDescriptorsRequest) Reset()         { *m = ListMetricDescriptorsRequest{} }
+func (m *ListMetricDescriptorsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListMetricDescriptorsRequest) ProtoMessage()    {}
+func (*ListMetricDescriptorsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{3}
+}
+func (m *ListMetricDescriptorsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListMetricDescriptorsRequest.Unmarshal(m, b)
+}
+func (m *ListMetricDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListMetricDescriptorsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListMetricDescriptorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMetricDescriptorsRequest.Merge(dst, src)
+}
+func (m *ListMetricDescriptorsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListMetricDescriptorsRequest.Size(m)
+}
+func (m *ListMetricDescriptorsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListMetricDescriptorsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListMetricDescriptorsRequest proto.InternalMessageInfo
 
 func (m *ListMetricDescriptorsRequest) GetName() string {
 	if m != nil {
@@ -224,19 +313,41 @@ func (m *ListMetricDescriptorsRequest) GetPageToken() string {
 type ListMetricDescriptorsResponse struct {
 	// The metric descriptors that are available to the project
 	// and that match the value of `filter`, if present.
-	MetricDescriptors []*google_api5.MetricDescriptor `protobuf:"bytes,1,rep,name=metric_descriptors,json=metricDescriptors" json:"metric_descriptors,omitempty"`
+	MetricDescriptors []*metric.MetricDescriptor `protobuf:"bytes,1,rep,name=metric_descriptors,json=metricDescriptors,proto3" json:"metric_descriptors,omitempty"`
 	// If there are more results than have been returned, then this field is set
 	// to a non-empty value.  To see the additional results,
 	// use that value as `pageToken` in the next call to this method.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListMetricDescriptorsResponse) Reset()         { *m = ListMetricDescriptorsResponse{} }
+func (m *ListMetricDescriptorsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListMetricDescriptorsResponse) ProtoMessage()    {}
+func (*ListMetricDescriptorsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{4}
+}
+func (m *ListMetricDescriptorsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListMetricDescriptorsResponse.Unmarshal(m, b)
+}
+func (m *ListMetricDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListMetricDescriptorsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListMetricDescriptorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListMetricDescriptorsResponse.Merge(dst, src)
+}
+func (m *ListMetricDescriptorsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListMetricDescriptorsResponse.Size(m)
+}
+func (m *ListMetricDescriptorsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListMetricDescriptorsResponse.DiscardUnknown(m)
 }
 
-func (m *ListMetricDescriptorsResponse) Reset()                    { *m = ListMetricDescriptorsResponse{} }
-func (m *ListMetricDescriptorsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListMetricDescriptorsResponse) ProtoMessage()               {}
-func (*ListMetricDescriptorsResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
+var xxx_messageInfo_ListMetricDescriptorsResponse proto.InternalMessageInfo
 
-func (m *ListMetricDescriptorsResponse) GetMetricDescriptors() []*google_api5.MetricDescriptor {
+func (m *ListMetricDescriptorsResponse) GetMetricDescriptors() []*metric.MetricDescriptor {
 	if m != nil {
 		return m.MetricDescriptors
 	}
@@ -256,13 +367,35 @@ type GetMetricDescriptorRequest struct {
 	// `"projects/{project_id_or_number}/metricDescriptors/{metric_id}"`.
 	// An example value of `{metric_id}` is
 	// `"compute.googleapis.com/instance/disk/read_bytes_count"`.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetMetricDescriptorRequest) Reset()                    { *m = GetMetricDescriptorRequest{} }
-func (m *GetMetricDescriptorRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetMetricDescriptorRequest) ProtoMessage()               {}
-func (*GetMetricDescriptorRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
+func (m *GetMetricDescriptorRequest) Reset()         { *m = GetMetricDescriptorRequest{} }
+func (m *GetMetricDescriptorRequest) String() string { return proto.CompactTextString(m) }
+func (*GetMetricDescriptorRequest) ProtoMessage()    {}
+func (*GetMetricDescriptorRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{5}
+}
+func (m *GetMetricDescriptorRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetMetricDescriptorRequest.Unmarshal(m, b)
+}
+func (m *GetMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetMetricDescriptorRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetMetricDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetMetricDescriptorRequest.Merge(dst, src)
+}
+func (m *GetMetricDescriptorRequest) XXX_Size() int {
+	return xxx_messageInfo_GetMetricDescriptorRequest.Size(m)
+}
+func (m *GetMetricDescriptorRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetMetricDescriptorRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetMetricDescriptorRequest proto.InternalMessageInfo
 
 func (m *GetMetricDescriptorRequest) GetName() string {
 	if m != nil {
@@ -275,16 +408,38 @@ func (m *GetMetricDescriptorRequest) GetName() string {
 type CreateMetricDescriptorRequest struct {
 	// The project on which to execute the request. The format is
 	// `"projects/{project_id_or_number}"`.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// The new [custom metric](/monitoring/custom-metrics)
 	// descriptor.
-	MetricDescriptor *google_api5.MetricDescriptor `protobuf:"bytes,2,opt,name=metric_descriptor,json=metricDescriptor" json:"metric_descriptor,omitempty"`
+	MetricDescriptor     *metric.MetricDescriptor `protobuf:"bytes,2,opt,name=metric_descriptor,json=metricDescriptor,proto3" json:"metric_descriptor,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *CreateMetricDescriptorRequest) Reset()                    { *m = CreateMetricDescriptorRequest{} }
-func (m *CreateMetricDescriptorRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateMetricDescriptorRequest) ProtoMessage()               {}
-func (*CreateMetricDescriptorRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
+func (m *CreateMetricDescriptorRequest) Reset()         { *m = CreateMetricDescriptorRequest{} }
+func (m *CreateMetricDescriptorRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateMetricDescriptorRequest) ProtoMessage()    {}
+func (*CreateMetricDescriptorRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{6}
+}
+func (m *CreateMetricDescriptorRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateMetricDescriptorRequest.Unmarshal(m, b)
+}
+func (m *CreateMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateMetricDescriptorRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateMetricDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateMetricDescriptorRequest.Merge(dst, src)
+}
+func (m *CreateMetricDescriptorRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateMetricDescriptorRequest.Size(m)
+}
+func (m *CreateMetricDescriptorRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateMetricDescriptorRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateMetricDescriptorRequest proto.InternalMessageInfo
 
 func (m *CreateMetricDescriptorRequest) GetName() string {
 	if m != nil {
@@ -293,7 +448,7 @@ func (m *CreateMetricDescriptorRequest) GetName() string {
 	return ""
 }
 
-func (m *CreateMetricDescriptorRequest) GetMetricDescriptor() *google_api5.MetricDescriptor {
+func (m *CreateMetricDescriptorRequest) GetMetricDescriptor() *metric.MetricDescriptor {
 	if m != nil {
 		return m.MetricDescriptor
 	}
@@ -306,13 +461,35 @@ type DeleteMetricDescriptorRequest struct {
 	// `"projects/{project_id_or_number}/metricDescriptors/{metric_id}"`.
 	// An example of `{metric_id}` is:
 	// `"custom.googleapis.com/my_test_metric"`.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteMetricDescriptorRequest) Reset()         { *m = DeleteMetricDescriptorRequest{} }
+func (m *DeleteMetricDescriptorRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteMetricDescriptorRequest) ProtoMessage()    {}
+func (*DeleteMetricDescriptorRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{7}
+}
+func (m *DeleteMetricDescriptorRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteMetricDescriptorRequest.Unmarshal(m, b)
+}
+func (m *DeleteMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteMetricDescriptorRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteMetricDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteMetricDescriptorRequest.Merge(dst, src)
+}
+func (m *DeleteMetricDescriptorRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteMetricDescriptorRequest.Size(m)
+}
+func (m *DeleteMetricDescriptorRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteMetricDescriptorRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteMetricDescriptorRequest) Reset()                    { *m = DeleteMetricDescriptorRequest{} }
-func (m *DeleteMetricDescriptorRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteMetricDescriptorRequest) ProtoMessage()               {}
-func (*DeleteMetricDescriptorRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{7} }
+var xxx_messageInfo_DeleteMetricDescriptorRequest proto.InternalMessageInfo
 
 func (m *DeleteMetricDescriptorRequest) GetName() string {
 	if m != nil {
@@ -325,7 +502,7 @@ func (m *DeleteMetricDescriptorRequest) GetName() string {
 type ListTimeSeriesRequest struct {
 	// The project on which to execute the request. The format is
 	// "projects/{project_id_or_number}".
-	Name string `protobuf:"bytes,10,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,10,opt,name=name,proto3" json:"name,omitempty"`
 	// A [monitoring filter](/monitoring/api/v3/filters) that specifies which time
 	// series should be returned.  The filter must specify a single metric type,
 	// and can additionally specify metric labels and other information. For
@@ -333,36 +510,59 @@ type ListTimeSeriesRequest struct {
 	//
 	//     metric.type = "compute.googleapis.com/instance/cpu/usage_time" AND
 	//         metric.label.instance_name = "my-instance-name"
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
+	//
+	Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The time interval for which results should be returned. Only time series
 	// that contain data points in the specified interval are included
 	// in the response.
-	Interval *TimeInterval `protobuf:"bytes,4,opt,name=interval" json:"interval,omitempty"`
+	Interval *TimeInterval `protobuf:"bytes,4,opt,name=interval,proto3" json:"interval,omitempty"`
 	// By default, the raw time series data is returned.
 	// Use this field to combine multiple time series for different
 	// views of the data.
-	Aggregation *Aggregation `protobuf:"bytes,5,opt,name=aggregation" json:"aggregation,omitempty"`
-	// Specifies the order in which the points of the time series should
-	// be returned.  By default, results are not ordered.  Currently,
-	// this field must be left blank.
-	OrderBy string `protobuf:"bytes,6,opt,name=order_by,json=orderBy" json:"order_by,omitempty"`
+	Aggregation *Aggregation `protobuf:"bytes,5,opt,name=aggregation,proto3" json:"aggregation,omitempty"`
+	// Unsupported: must be left blank. The points in each time series are
+	// returned in reverse time order.
+	OrderBy string `protobuf:"bytes,6,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
 	// Specifies which information is returned about the time series.
-	View ListTimeSeriesRequest_TimeSeriesView `protobuf:"varint,7,opt,name=view,enum=google.monitoring.v3.ListTimeSeriesRequest_TimeSeriesView" json:"view,omitempty"`
-	// A positive number that is the maximum number of results to return.
-	// When `view` field sets to `FULL`, it limits the number of `Points` server
-	// will return; if `view` field is `HEADERS`, it limits the number of
-	// `TimeSeries` server will return.
-	PageSize int32 `protobuf:"varint,8,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	View ListTimeSeriesRequest_TimeSeriesView `protobuf:"varint,7,opt,name=view,proto3,enum=google.monitoring.v3.ListTimeSeriesRequest_TimeSeriesView" json:"view,omitempty"`
+	// A positive number that is the maximum number of results to return. If
+	// `page_size` is empty or more than 100,000 results, the effective
+	// `page_size` is 100,000 results. If `view` is set to `FULL`, this is the
+	// maximum number of `Points` returned. If `view` is set to `HEADERS`, this is
+	// the maximum number of `TimeSeries` returned.
+	PageSize int32 `protobuf:"varint,8,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If this field is not empty then it must contain the `nextPageToken` value
 	// returned by a previous call to this method.  Using this field causes the
 	// method to return additional results from the previous method call.
-	PageToken string `protobuf:"bytes,9,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,9,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListTimeSeriesRequest) Reset()                    { *m = ListTimeSeriesRequest{} }
-func (m *ListTimeSeriesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTimeSeriesRequest) ProtoMessage()               {}
-func (*ListTimeSeriesRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{8} }
+func (m *ListTimeSeriesRequest) Reset()         { *m = ListTimeSeriesRequest{} }
+func (m *ListTimeSeriesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTimeSeriesRequest) ProtoMessage()    {}
+func (*ListTimeSeriesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{8}
+}
+func (m *ListTimeSeriesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTimeSeriesRequest.Unmarshal(m, b)
+}
+func (m *ListTimeSeriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTimeSeriesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTimeSeriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTimeSeriesRequest.Merge(dst, src)
+}
+func (m *ListTimeSeriesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTimeSeriesRequest.Size(m)
+}
+func (m *ListTimeSeriesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTimeSeriesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTimeSeriesRequest proto.InternalMessageInfo
 
 func (m *ListTimeSeriesRequest) GetName() string {
 	if m != nil {
@@ -423,17 +623,42 @@ func (m *ListTimeSeriesRequest) GetPageToken() string {
 // The `ListTimeSeries` response.
 type ListTimeSeriesResponse struct {
 	// One or more time series that match the filter included in the request.
-	TimeSeries []*TimeSeries `protobuf:"bytes,1,rep,name=time_series,json=timeSeries" json:"time_series,omitempty"`
+	TimeSeries []*TimeSeries `protobuf:"bytes,1,rep,name=time_series,json=timeSeries,proto3" json:"time_series,omitempty"`
 	// If there are more results than have been returned, then this field is set
 	// to a non-empty value.  To see the additional results,
 	// use that value as `pageToken` in the next call to this method.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// Query execution errors that may have caused the time series data returned
+	// to be incomplete.
+	ExecutionErrors      []*status.Status `protobuf:"bytes,3,rep,name=execution_errors,json=executionErrors,proto3" json:"execution_errors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *ListTimeSeriesResponse) Reset()         { *m = ListTimeSeriesResponse{} }
+func (m *ListTimeSeriesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTimeSeriesResponse) ProtoMessage()    {}
+func (*ListTimeSeriesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{9}
+}
+func (m *ListTimeSeriesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTimeSeriesResponse.Unmarshal(m, b)
+}
+func (m *ListTimeSeriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTimeSeriesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTimeSeriesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTimeSeriesResponse.Merge(dst, src)
+}
+func (m *ListTimeSeriesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTimeSeriesResponse.Size(m)
+}
+func (m *ListTimeSeriesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTimeSeriesResponse.DiscardUnknown(m)
 }
 
-func (m *ListTimeSeriesResponse) Reset()                    { *m = ListTimeSeriesResponse{} }
-func (m *ListTimeSeriesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTimeSeriesResponse) ProtoMessage()               {}
-func (*ListTimeSeriesResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{9} }
+var xxx_messageInfo_ListTimeSeriesResponse proto.InternalMessageInfo
 
 func (m *ListTimeSeriesResponse) GetTimeSeries() []*TimeSeries {
 	if m != nil {
@@ -449,23 +674,52 @@ func (m *ListTimeSeriesResponse) GetNextPageToken() string {
 	return ""
 }
 
+func (m *ListTimeSeriesResponse) GetExecutionErrors() []*status.Status {
+	if m != nil {
+		return m.ExecutionErrors
+	}
+	return nil
+}
+
 // The `CreateTimeSeries` request.
 type CreateTimeSeriesRequest struct {
 	// The project on which to execute the request. The format is
 	// `"projects/{project_id_or_number}"`.
-	Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// The new data to be added to a list of time series.
 	// Adds at most one data point to each of several time series.  The new data
 	// point must be more recent than any other point in its time series.  Each
 	// `TimeSeries` value must fully specify a unique time series by supplying
 	// all label values for the metric and the monitored resource.
-	TimeSeries []*TimeSeries `protobuf:"bytes,2,rep,name=time_series,json=timeSeries" json:"time_series,omitempty"`
+	TimeSeries           []*TimeSeries `protobuf:"bytes,2,rep,name=time_series,json=timeSeries,proto3" json:"time_series,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *CreateTimeSeriesRequest) Reset()                    { *m = CreateTimeSeriesRequest{} }
-func (m *CreateTimeSeriesRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateTimeSeriesRequest) ProtoMessage()               {}
-func (*CreateTimeSeriesRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{10} }
+func (m *CreateTimeSeriesRequest) Reset()         { *m = CreateTimeSeriesRequest{} }
+func (m *CreateTimeSeriesRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateTimeSeriesRequest) ProtoMessage()    {}
+func (*CreateTimeSeriesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{10}
+}
+func (m *CreateTimeSeriesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTimeSeriesRequest.Unmarshal(m, b)
+}
+func (m *CreateTimeSeriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTimeSeriesRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateTimeSeriesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTimeSeriesRequest.Merge(dst, src)
+}
+func (m *CreateTimeSeriesRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateTimeSeriesRequest.Size(m)
+}
+func (m *CreateTimeSeriesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTimeSeriesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateTimeSeriesRequest proto.InternalMessageInfo
 
 func (m *CreateTimeSeriesRequest) GetName() string {
 	if m != nil {
@@ -487,15 +741,37 @@ type CreateTimeSeriesError struct {
 	// and `Point`s (including timestamp and value) that resulted
 	// in the error. This field provides all of the context that
 	// would be needed to retry the operation.
-	TimeSeries *TimeSeries `protobuf:"bytes,1,opt,name=time_series,json=timeSeries" json:"time_series,omitempty"`
+	TimeSeries *TimeSeries `protobuf:"bytes,1,opt,name=time_series,json=timeSeries,proto3" json:"time_series,omitempty"`
 	// The status of the requested write operation.
-	Status *google_rpc.Status `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"`
+	Status               *status.Status `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *CreateTimeSeriesError) Reset()                    { *m = CreateTimeSeriesError{} }
-func (m *CreateTimeSeriesError) String() string            { return proto.CompactTextString(m) }
-func (*CreateTimeSeriesError) ProtoMessage()               {}
-func (*CreateTimeSeriesError) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{11} }
+func (m *CreateTimeSeriesError) Reset()         { *m = CreateTimeSeriesError{} }
+func (m *CreateTimeSeriesError) String() string { return proto.CompactTextString(m) }
+func (*CreateTimeSeriesError) ProtoMessage()    {}
+func (*CreateTimeSeriesError) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metric_service_2999501584b35c85, []int{11}
+}
+func (m *CreateTimeSeriesError) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTimeSeriesError.Unmarshal(m, b)
+}
+func (m *CreateTimeSeriesError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTimeSeriesError.Marshal(b, m, deterministic)
+}
+func (dst *CreateTimeSeriesError) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTimeSeriesError.Merge(dst, src)
+}
+func (m *CreateTimeSeriesError) XXX_Size() int {
+	return xxx_messageInfo_CreateTimeSeriesError.Size(m)
+}
+func (m *CreateTimeSeriesError) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTimeSeriesError.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateTimeSeriesError proto.InternalMessageInfo
 
 func (m *CreateTimeSeriesError) GetTimeSeries() *TimeSeries {
 	if m != nil {
@@ -504,7 +780,7 @@ func (m *CreateTimeSeriesError) GetTimeSeries() *TimeSeries {
 	return nil
 }
 
-func (m *CreateTimeSeriesError) GetStatus() *google_rpc.Status {
+func (m *CreateTimeSeriesError) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -535,31 +811,32 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for MetricService service
-
+// MetricServiceClient is the client API for MetricService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MetricServiceClient interface {
 	// Lists monitored resource descriptors that match a filter. This method does not require a Stackdriver account.
 	ListMonitoredResourceDescriptors(ctx context.Context, in *ListMonitoredResourceDescriptorsRequest, opts ...grpc.CallOption) (*ListMonitoredResourceDescriptorsResponse, error)
 	// Gets a single monitored resource descriptor. This method does not require a Stackdriver account.
-	GetMonitoredResourceDescriptor(ctx context.Context, in *GetMonitoredResourceDescriptorRequest, opts ...grpc.CallOption) (*google_api4.MonitoredResourceDescriptor, error)
+	GetMonitoredResourceDescriptor(ctx context.Context, in *GetMonitoredResourceDescriptorRequest, opts ...grpc.CallOption) (*monitoredres.MonitoredResourceDescriptor, error)
 	// Lists metric descriptors that match a filter. This method does not require a Stackdriver account.
 	ListMetricDescriptors(ctx context.Context, in *ListMetricDescriptorsRequest, opts ...grpc.CallOption) (*ListMetricDescriptorsResponse, error)
 	// Gets a single metric descriptor. This method does not require a Stackdriver account.
-	GetMetricDescriptor(ctx context.Context, in *GetMetricDescriptorRequest, opts ...grpc.CallOption) (*google_api5.MetricDescriptor, error)
+	GetMetricDescriptor(ctx context.Context, in *GetMetricDescriptorRequest, opts ...grpc.CallOption) (*metric.MetricDescriptor, error)
 	// Creates a new metric descriptor.
 	// User-created metric descriptors define
 	// [custom metrics](/monitoring/custom-metrics).
-	CreateMetricDescriptor(ctx context.Context, in *CreateMetricDescriptorRequest, opts ...grpc.CallOption) (*google_api5.MetricDescriptor, error)
+	CreateMetricDescriptor(ctx context.Context, in *CreateMetricDescriptorRequest, opts ...grpc.CallOption) (*metric.MetricDescriptor, error)
 	// Deletes a metric descriptor. Only user-created
 	// [custom metrics](/monitoring/custom-metrics) can be deleted.
-	DeleteMetricDescriptor(ctx context.Context, in *DeleteMetricDescriptorRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeleteMetricDescriptor(ctx context.Context, in *DeleteMetricDescriptorRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Lists time series that match a filter. This method does not require a Stackdriver account.
 	ListTimeSeries(ctx context.Context, in *ListTimeSeriesRequest, opts ...grpc.CallOption) (*ListTimeSeriesResponse, error)
 	// Creates or adds data to one or more time series.
 	// The response is empty if all time series in the request were written.
 	// If any time series could not be written, a corresponding failure message is
 	// included in the error response.
-	CreateTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	CreateTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type metricServiceClient struct {
@@ -572,16 +849,16 @@ func NewMetricServiceClient(cc *grpc.ClientConn) MetricServiceClient {
 
 func (c *metricServiceClient) ListMonitoredResourceDescriptors(ctx context.Context, in *ListMonitoredResourceDescriptorsRequest, opts ...grpc.CallOption) (*ListMonitoredResourceDescriptorsResponse, error) {
 	out := new(ListMonitoredResourceDescriptorsResponse)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.MetricService/ListMonitoredResourceDescriptors", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/ListMonitoredResourceDescriptors", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *metricServiceClient) GetMonitoredResourceDescriptor(ctx context.Context, in *GetMonitoredResourceDescriptorRequest, opts ...grpc.CallOption) (*google_api4.MonitoredResourceDescriptor, error) {
-	out := new(google_api4.MonitoredResourceDescriptor)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.MetricService/GetMonitoredResourceDescriptor", in, out, c.cc, opts...)
+func (c *metricServiceClient) GetMonitoredResourceDescriptor(ctx context.Context, in *GetMonitoredResourceDescriptorRequest, opts ...grpc.CallOption) (*monitoredres.MonitoredResourceDescriptor, error) {
+	out := new(monitoredres.MonitoredResourceDescriptor)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/GetMonitoredResourceDescriptor", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -590,34 +867,34 @@ func (c *metricServiceClient) GetMonitoredResourceDescriptor(ctx context.Context
 
 func (c *metricServiceClient) ListMetricDescriptors(ctx context.Context, in *ListMetricDescriptorsRequest, opts ...grpc.CallOption) (*ListMetricDescriptorsResponse, error) {
 	out := new(ListMetricDescriptorsResponse)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.MetricService/ListMetricDescriptors", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/ListMetricDescriptors", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *metricServiceClient) GetMetricDescriptor(ctx context.Context, in *GetMetricDescriptorRequest, opts ...grpc.CallOption) (*google_api5.MetricDescriptor, error) {
-	out := new(google_api5.MetricDescriptor)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.MetricService/GetMetricDescriptor", in, out, c.cc, opts...)
+func (c *metricServiceClient) GetMetricDescriptor(ctx context.Context, in *GetMetricDescriptorRequest, opts ...grpc.CallOption) (*metric.MetricDescriptor, error) {
+	out := new(metric.MetricDescriptor)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/GetMetricDescriptor", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *metricServiceClient) CreateMetricDescriptor(ctx context.Context, in *CreateMetricDescriptorRequest, opts ...grpc.CallOption) (*google_api5.MetricDescriptor, error) {
-	out := new(google_api5.MetricDescriptor)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.MetricService/CreateMetricDescriptor", in, out, c.cc, opts...)
+func (c *metricServiceClient) CreateMetricDescriptor(ctx context.Context, in *CreateMetricDescriptorRequest, opts ...grpc.CallOption) (*metric.MetricDescriptor, error) {
+	out := new(metric.MetricDescriptor)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/CreateMetricDescriptor", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *metricServiceClient) DeleteMetricDescriptor(ctx context.Context, in *DeleteMetricDescriptorRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.MetricService/DeleteMetricDescriptor", in, out, c.cc, opts...)
+func (c *metricServiceClient) DeleteMetricDescriptor(ctx context.Context, in *DeleteMetricDescriptorRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/DeleteMetricDescriptor", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -626,47 +903,46 @@ func (c *metricServiceClient) DeleteMetricDescriptor(ctx context.Context, in *De
 
 func (c *metricServiceClient) ListTimeSeries(ctx context.Context, in *ListTimeSeriesRequest, opts ...grpc.CallOption) (*ListTimeSeriesResponse, error) {
 	out := new(ListTimeSeriesResponse)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.MetricService/ListTimeSeries", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/ListTimeSeries", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *metricServiceClient) CreateTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.MetricService/CreateTimeSeries", in, out, c.cc, opts...)
+func (c *metricServiceClient) CreateTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/CreateTimeSeries", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for MetricService service
-
+// MetricServiceServer is the server API for MetricService service.
 type MetricServiceServer interface {
 	// Lists monitored resource descriptors that match a filter. This method does not require a Stackdriver account.
 	ListMonitoredResourceDescriptors(context.Context, *ListMonitoredResourceDescriptorsRequest) (*ListMonitoredResourceDescriptorsResponse, error)
 	// Gets a single monitored resource descriptor. This method does not require a Stackdriver account.
-	GetMonitoredResourceDescriptor(context.Context, *GetMonitoredResourceDescriptorRequest) (*google_api4.MonitoredResourceDescriptor, error)
+	GetMonitoredResourceDescriptor(context.Context, *GetMonitoredResourceDescriptorRequest) (*monitoredres.MonitoredResourceDescriptor, error)
 	// Lists metric descriptors that match a filter. This method does not require a Stackdriver account.
 	ListMetricDescriptors(context.Context, *ListMetricDescriptorsRequest) (*ListMetricDescriptorsResponse, error)
 	// Gets a single metric descriptor. This method does not require a Stackdriver account.
-	GetMetricDescriptor(context.Context, *GetMetricDescriptorRequest) (*google_api5.MetricDescriptor, error)
+	GetMetricDescriptor(context.Context, *GetMetricDescriptorRequest) (*metric.MetricDescriptor, error)
 	// Creates a new metric descriptor.
 	// User-created metric descriptors define
 	// [custom metrics](/monitoring/custom-metrics).
-	CreateMetricDescriptor(context.Context, *CreateMetricDescriptorRequest) (*google_api5.MetricDescriptor, error)
+	CreateMetricDescriptor(context.Context, *CreateMetricDescriptorRequest) (*metric.MetricDescriptor, error)
 	// Deletes a metric descriptor. Only user-created
 	// [custom metrics](/monitoring/custom-metrics) can be deleted.
-	DeleteMetricDescriptor(context.Context, *DeleteMetricDescriptorRequest) (*google_protobuf4.Empty, error)
+	DeleteMetricDescriptor(context.Context, *DeleteMetricDescriptorRequest) (*empty.Empty, error)
 	// Lists time series that match a filter. This method does not require a Stackdriver account.
 	ListTimeSeries(context.Context, *ListTimeSeriesRequest) (*ListTimeSeriesResponse, error)
 	// Creates or adds data to one or more time series.
 	// The response is empty if all time series in the request were written.
 	// If any time series could not be written, a corresponding failure message is
 	// included in the error response.
-	CreateTimeSeries(context.Context, *CreateTimeSeriesRequest) (*google_protobuf4.Empty, error)
+	CreateTimeSeries(context.Context, *CreateTimeSeriesRequest) (*empty.Empty, error)
 }
 
 func RegisterMetricServiceServer(s *grpc.Server, srv MetricServiceServer) {
@@ -858,72 +1134,76 @@ var _MetricService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/monitoring/v3/metric_service.proto",
 }
 
-func init() { proto.RegisterFile("google/monitoring/v3/metric_service.proto", fileDescriptor4) }
-
-var fileDescriptor4 = []byte{
-	// 1011 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4d, 0x6f, 0x1b, 0x45,
-	0x18, 0x66, 0x92, 0x34, 0x1f, 0xaf, 0xd5, 0x90, 0x4e, 0x5b, 0xd7, 0x6c, 0x13, 0xe4, 0x2e, 0x2a,
-	0x71, 0xdd, 0xb2, 0x5b, 0xd9, 0x15, 0x87, 0xa4, 0x8d, 0x94, 0x2f, 0x4a, 0x45, 0x40, 0xd1, 0xba,
-	0xe4, 0x50, 0x45, 0xb2, 0x36, 0xce, 0x74, 0x35, 0xe0, 0xdd, 0x59, 0x66, 0xc7, 0x2e, 0x29, 0x0a,
-	0x07, 0x90, 0x7a, 0x47, 0x80, 0x04, 0x7f, 0xa1, 0x07, 0x10, 0xff, 0x81, 0x13, 0x57, 0xce, 0xdc,
-	0xf8, 0x0b, 0xdc, 0xd1, 0xce, 0xce, 0xc6, 0xf6, 0x7e, 0xd9, 0xe6, 0xc2, 0xcd, 0xbb, 0xef, 0xd7,
-	0xf3, 0x3e, 0xf3, 0xce, 0xfb, 0xac, 0xe1, 0x8e, 0xc3, 0x98, 0xd3, 0x25, 0xa6, 0xcb, 0x3c, 0x2a,
-	0x18, 0xa7, 0x9e, 0x63, 0xf6, 0x9b, 0xa6, 0x4b, 0x04, 0xa7, 0x9d, 0x76, 0x40, 0x78, 0x9f, 0x76,
-	0x88, 0xe1, 0x73, 0x26, 0x18, 0xbe, 0x16, 0xb9, 0x1a, 0x03, 0x57, 0xa3, 0xdf, 0xd4, 0x56, 0x55,
-	0x02, 0xdb, 0xa7, 0xa6, 0xed, 0x79, 0x4c, 0xd8, 0x82, 0x32, 0x2f, 0x88, 0x62, 0xb4, 0x1b, 0x43,
-	0xd6, 0x28, 0xa9, 0x32, 0xbc, 0x33, 0x6c, 0x88, 0x12, 0x92, 0xd3, 0x36, 0x27, 0x01, 0xeb, 0xf1,
-	0xb8, 0xa2, 0x76, 0x2b, 0x13, 0x5c, 0x87, 0xb9, 0x2e, 0xf3, 0x0a, 0x5d, 0x46, 0x4a, 0xdd, 0x54,
-	0x2e, 0xf2, 0xe9, 0xa4, 0xf7, 0xdc, 0x24, 0xae, 0x2f, 0xce, 0x12, 0x00, 0xb9, 0xdf, 0x31, 0x03,
-	0x61, 0x8b, 0x9e, 0x42, 0xae, 0x7f, 0x87, 0x60, 0xfd, 0x80, 0x06, 0xe2, 0xe3, 0x18, 0x9c, 0xa5,
-	0xb0, 0xed, 0x91, 0xa0, 0xc3, 0xa9, 0x2f, 0x18, 0x0f, 0x2c, 0xf2, 0x45, 0x8f, 0x04, 0x02, 0x63,
-	0x98, 0xf3, 0x6c, 0x97, 0x54, 0x2e, 0x55, 0x51, 0x6d, 0xc9, 0x92, 0xbf, 0x71, 0x19, 0xe6, 0x9f,
-	0xd3, 0xae, 0x20, 0xbc, 0x32, 0x23, 0xdf, 0xaa, 0x27, 0x7c, 0x13, 0x96, 0x7c, 0xdb, 0x21, 0xed,
-	0x80, 0xbe, 0x24, 0x95, 0xd9, 0x2a, 0xaa, 0x5d, 0xb2, 0x16, 0xc3, 0x17, 0x2d, 0xfa, 0x92, 0xe0,
-	0x35, 0x00, 0x69, 0x14, 0xec, 0x73, 0xe2, 0x55, 0xe6, 0x64, 0xa0, 0x74, 0x7f, 0x1a, 0xbe, 0xd0,
-	0x7f, 0x41, 0x50, 0x1b, 0x8f, 0x29, 0xf0, 0x99, 0x17, 0x10, 0xfc, 0x0c, 0xae, 0xc5, 0x74, 0xb6,
-	0x4f, 0x07, 0xf6, 0x0a, 0xaa, 0xce, 0xd6, 0x4a, 0x8d, 0x75, 0x43, 0x9d, 0xa6, 0xed, 0x53, 0xa3,
-	0x20, 0x9f, 0x75, 0x95, 0xa7, 0x6b, 0xe0, 0x77, 0xe1, 0x4d, 0x8f, 0x7c, 0x29, 0xda, 0x43, 0x60,
-	0xa3, 0x2e, 0x2f, 0x87, 0xaf, 0x0f, 0x2f, 0x00, 0x6f, 0xc2, 0xed, 0xc7, 0xa4, 0x08, 0x6e, 0x92,
-	0xc1, 0xd9, 0x01, 0x83, 0xfa, 0x2b, 0x04, 0xab, 0xb2, 0x5b, 0x79, 0x98, 0xff, 0x23, 0xed, 0x3f,
-	0x20, 0x58, 0xcb, 0x01, 0xa2, 0xb8, 0xfe, 0x08, 0xb0, 0xba, 0x32, 0x69, 0xa6, 0x57, 0x47, 0x98,
-	0x4e, 0xa4, 0xb0, 0xae, 0xb8, 0xc9, 0xa4, 0x13, 0x93, 0x7b, 0x1f, 0xb4, 0x90, 0xdc, 0x64, 0xc6,
-	0x02, 0x46, 0xbf, 0x86, 0xb5, 0x5d, 0x4e, 0x6c, 0x41, 0xa6, 0x08, 0xc2, 0x4f, 0xe0, 0x4a, 0xaa,
-	0x37, 0x09, 0x68, 0x5c, 0x6b, 0x2b, 0xc9, 0xd6, 0xf4, 0x26, 0xac, 0xed, 0x91, 0x2e, 0x99, 0xaa,
-	0xbe, 0xfe, 0xd3, 0x2c, 0x5c, 0x0f, 0xd9, 0x7f, 0x4a, 0x5d, 0xd2, 0x22, 0x9c, 0x92, 0xd4, 0xf9,
-	0xc3, 0x04, 0xe7, 0xbf, 0x05, 0x8b, 0xd4, 0x13, 0x84, 0xf7, 0xed, 0xae, 0x3c, 0xe0, 0x52, 0x43,
-	0x37, 0xb2, 0xf6, 0x99, 0x11, 0x96, 0x79, 0xa2, 0x3c, 0xad, 0x8b, 0x18, 0xbc, 0x0b, 0x25, 0xdb,
-	0x71, 0x38, 0x71, 0xe4, 0x7a, 0x93, 0x23, 0x57, 0x6a, 0xdc, 0xca, 0x4e, 0xb1, 0x3d, 0x70, 0xb4,
-	0x86, 0xa3, 0xf0, 0x5b, 0xb0, 0xc8, 0xf8, 0x29, 0xe1, 0xed, 0x93, 0xb3, 0xca, 0xbc, 0x84, 0xb7,
-	0x20, 0x9f, 0x77, 0xce, 0xf0, 0x27, 0x30, 0xd7, 0xa7, 0xe4, 0x45, 0x65, 0xa1, 0x8a, 0x6a, 0xcb,
-	0x8d, 0x8d, 0xec, 0xc4, 0x99, 0x34, 0x18, 0x83, 0x37, 0x47, 0x94, 0xbc, 0xb0, 0x64, 0x9e, 0xd1,
-	0x79, 0x5f, 0x2c, 0x9c, 0xf7, 0xa5, 0xe4, 0xbc, 0xaf, 0xc3, 0xf2, 0x68, 0x4e, 0xbc, 0x08, 0x73,
-	0x1f, 0x7c, 0x7a, 0x70, 0xb0, 0xf2, 0x06, 0x2e, 0xc1, 0xc2, 0x87, 0xfb, 0xdb, 0x7b, 0xfb, 0x56,
-	0x6b, 0x05, 0xe9, 0xdf, 0x22, 0x28, 0x27, 0x31, 0xa9, 0x1b, 0xb1, 0x0d, 0x25, 0x41, 0x5d, 0x12,
-	0x4a, 0x08, 0x25, 0xf1, 0x55, 0xa8, 0xe6, 0x53, 0xae, 0xc2, 0x41, 0x5c, 0xfc, 0x9e, 0xf8, 0x1e,
-	0xf8, 0x70, 0x23, 0x9a, 0xea, 0xfc, 0x09, 0x19, 0x9e, 0xe7, 0x04, 0xb2, 0x99, 0xe9, 0x91, 0x85,
-	0x9b, 0xe9, 0x7a, 0xb2, 0xe4, 0x3e, 0xe7, 0x8c, 0xa7, 0xdb, 0x46, 0x53, 0xb7, 0x5d, 0x87, 0xf9,
-	0x48, 0x88, 0xd4, 0x25, 0xc3, 0x71, 0x34, 0xf7, 0x3b, 0x46, 0x4b, 0x5a, 0x2c, 0xe5, 0xd1, 0xf8,
-	0x07, 0xe0, 0x72, 0x74, 0x97, 0x5a, 0x91, 0x54, 0xe3, 0xbf, 0x10, 0x54, 0xc7, 0x49, 0x04, 0x7e,
-	0x94, 0x3f, 0x5e, 0x13, 0xc8, 0x9d, 0xb6, 0xf5, 0x5f, 0xc3, 0xa3, 0xd9, 0xd0, 0x37, 0xbe, 0xf9,
-	0xf3, 0xef, 0xef, 0x67, 0x1e, 0xe0, 0x46, 0x28, 0xd5, 0x5f, 0x85, 0x87, 0xf2, 0xc8, 0xe7, 0xec,
-	0x33, 0xd2, 0x11, 0x81, 0x59, 0x3f, 0x1f, 0x7c, 0x0e, 0x64, 0x41, 0xff, 0x1d, 0xc1, 0xdb, 0xc5,
-	0x92, 0x82, 0x37, 0xb3, 0xe1, 0x4d, 0x24, 0x44, 0xda, 0xa4, 0xba, 0xa8, 0x3f, 0x94, 0x4d, 0xbc,
-	0x8f, 0x1f, 0x64, 0x35, 0x51, 0xd8, 0x83, 0x59, 0x3f, 0xc7, 0xbf, 0xa1, 0x68, 0xa9, 0xa5, 0x24,
-	0x05, 0x37, 0x0a, 0xc8, 0xcd, 0x11, 0x42, 0xad, 0x39, 0x55, 0x8c, 0x3a, 0x05, 0x53, 0x36, 0x70,
-	0x07, 0xaf, 0xe7, 0x9c, 0x42, 0x0a, 0xd9, 0xcf, 0x08, 0xae, 0x66, 0x08, 0x0e, 0xbe, 0x9f, 0xcf,
-	0x77, 0xf6, 0x9a, 0xd7, 0x0a, 0x75, 0x43, 0x6f, 0x48, 0x60, 0xf7, 0x70, 0x3d, 0x9b, 0xd9, 0x24,
-	0x2e, 0xb3, 0x5e, 0x3f, 0xc7, 0xbf, 0x22, 0x28, 0x67, 0x4b, 0x1b, 0xce, 0x21, 0xa7, 0x50, 0x08,
-	0xc7, 0x20, 0xdc, 0x91, 0x08, 0x1f, 0xea, 0x93, 0x52, 0xb7, 0x91, 0x56, 0xd0, 0x90, 0xcd, 0x72,
-	0xb6, 0x18, 0xe6, 0x21, 0x2e, 0x94, 0x4e, 0xad, 0x1c, 0x07, 0xc5, 0x9f, 0xb9, 0xc6, 0x7e, 0xf8,
-	0x99, 0x1b, 0xb3, 0x59, 0x9f, 0x86, 0xcd, 0x1f, 0x11, 0x2c, 0x8f, 0xee, 0x75, 0x7c, 0x77, 0x0a,
-	0x45, 0xd2, 0xee, 0x4d, 0xe6, 0xac, 0x06, 0xb1, 0x26, 0x11, 0xea, 0xb8, 0x9a, 0xcd, 0xe6, 0xd0,
-	0x6a, 0x7c, 0x85, 0x60, 0x25, 0xb9, 0x77, 0xf1, 0x7b, 0x45, 0xe7, 0x9b, 0xc6, 0x96, 0xc7, 0xd3,
-	0x5d, 0x89, 0xe2, 0xb6, 0x3e, 0x16, 0xc5, 0x06, 0xaa, 0xef, 0xbc, 0x46, 0x50, 0xe9, 0x30, 0x37,
-	0xb3, 0xf2, 0x0e, 0x1e, 0xd9, 0xc8, 0x87, 0x61, 0x99, 0x43, 0xf4, 0x6c, 0x4b, 0xf9, 0x3a, 0xac,
-	0x6b, 0x7b, 0x8e, 0xc1, 0xb8, 0x63, 0x3a, 0xc4, 0x93, 0x20, 0xcc, 0xc8, 0x64, 0xfb, 0x34, 0x18,
-	0xfd, 0x1f, 0xb3, 0x39, 0x78, 0x7a, 0x3d, 0xa3, 0x3d, 0x8e, 0x12, 0xec, 0x76, 0x59, 0xef, 0x34,
-	0x5e, 0x4d, 0x61, 0xc9, 0xa3, 0xe6, 0x1f, 0xb1, 0xf1, 0x58, 0x1a, 0x8f, 0x07, 0xc6, 0xe3, 0xa3,
-	0xe6, 0xc9, 0xbc, 0x2c, 0xd2, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x96, 0x3c, 0x74, 0xeb,
-	0x0d, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/monitoring/v3/metric_service.proto", fileDescriptor_metric_service_2999501584b35c85)
+}
+
+var fileDescriptor_metric_service_2999501584b35c85 = []byte{
+	// 1049 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
+	0x14, 0x67, 0xe2, 0x34, 0x71, 0x9e, 0xd5, 0xd4, 0x9d, 0xb6, 0xae, 0xd9, 0x26, 0x95, 0xbb, 0xa8,
+	0xc4, 0x75, 0xcb, 0x6e, 0x65, 0x57, 0x1c, 0x92, 0x26, 0x52, 0xfe, 0x51, 0x2a, 0x02, 0x8a, 0xd6,
+	0x25, 0x87, 0x2a, 0x92, 0xb5, 0xb1, 0xa7, 0xab, 0x01, 0xef, 0xce, 0x32, 0x3b, 0x76, 0x9b, 0xa2,
+	0x70, 0xe0, 0xd0, 0x3b, 0x02, 0x24, 0xf8, 0x0a, 0x39, 0x80, 0xf8, 0x0a, 0x88, 0x13, 0x57, 0xce,
+	0xdc, 0xf8, 0x0a, 0xdc, 0xd1, 0xce, 0xee, 0xc6, 0xf6, 0x7a, 0x77, 0x6d, 0x73, 0xe9, 0xcd, 0x3b,
+	0xef, 0xcd, 0x7b, 0xbf, 0xf7, 0x9b, 0x79, 0xef, 0x37, 0x86, 0x7b, 0x16, 0x63, 0x56, 0x97, 0xe8,
+	0x36, 0x73, 0xa8, 0x60, 0x9c, 0x3a, 0x96, 0xde, 0x6f, 0xe8, 0x36, 0x11, 0x9c, 0xb6, 0x5b, 0x1e,
+	0xe1, 0x7d, 0xda, 0x26, 0x9a, 0xcb, 0x99, 0x60, 0xf8, 0x7a, 0xe0, 0xaa, 0x0d, 0x5c, 0xb5, 0x7e,
+	0x43, 0x59, 0x09, 0x03, 0x98, 0x2e, 0xd5, 0x4d, 0xc7, 0x61, 0xc2, 0x14, 0x94, 0x39, 0x5e, 0xb0,
+	0x47, 0xb9, 0x39, 0x64, 0x0d, 0x82, 0x86, 0x86, 0xf7, 0x86, 0x0d, 0x41, 0x40, 0xd2, 0x69, 0x71,
+	0xe2, 0xb1, 0x1e, 0x8f, 0x32, 0x2a, 0x77, 0x12, 0xc1, 0xb5, 0x99, 0x6d, 0x33, 0x27, 0xd3, 0x65,
+	0x24, 0xd5, 0xed, 0xd0, 0x45, 0x7e, 0x9d, 0xf4, 0x5e, 0xe8, 0x9d, 0x1e, 0x97, 0x20, 0x43, 0xfb,
+	0xad, 0xb8, 0x9d, 0xd8, 0xae, 0x38, 0x8d, 0x15, 0xc0, 0xdd, 0xb6, 0xee, 0x09, 0x53, 0xf4, 0xc2,
+	0xca, 0xd4, 0xef, 0x10, 0xac, 0x1d, 0x50, 0x4f, 0x7c, 0x1a, 0x81, 0x37, 0x42, 0xec, 0x7b, 0xc4,
+	0x6b, 0x73, 0xea, 0x0a, 0xc6, 0x3d, 0x83, 0x7c, 0xd5, 0x23, 0x9e, 0xc0, 0x18, 0xe6, 0x1d, 0xd3,
+	0x26, 0xe5, 0x4b, 0x15, 0x54, 0x5d, 0x32, 0xe4, 0x6f, 0x5c, 0x82, 0x85, 0x17, 0xb4, 0x2b, 0x08,
+	0x2f, 0xcf, 0xc9, 0xd5, 0xf0, 0x0b, 0xdf, 0x82, 0x25, 0xd7, 0xb4, 0x48, 0xcb, 0xa3, 0xaf, 0x49,
+	0x39, 0x57, 0x41, 0xd5, 0x4b, 0x46, 0xde, 0x5f, 0x68, 0xd2, 0xd7, 0x04, 0xaf, 0x02, 0x48, 0xa3,
+	0x60, 0x5f, 0x12, 0xa7, 0x3c, 0x2f, 0x37, 0x4a, 0xf7, 0x67, 0xfe, 0x82, 0xfa, 0x0b, 0x82, 0xea,
+	0x64, 0x4c, 0x9e, 0xcb, 0x1c, 0x8f, 0xe0, 0xe7, 0x70, 0x3d, 0xa2, 0xbb, 0xd5, 0x19, 0xd8, 0xcb,
+	0xa8, 0x92, 0xab, 0x16, 0xea, 0x6b, 0x5a, 0x78, 0xda, 0xa6, 0x4b, 0xb5, 0x8c, 0x78, 0xc6, 0x35,
+	0x3e, 0x9e, 0x03, 0xbf, 0x0f, 0x57, 0x1c, 0xf2, 0x4a, 0xb4, 0x86, 0xc0, 0x06, 0x55, 0x5e, 0xf6,
+	0x97, 0x0f, 0x2f, 0x00, 0x6f, 0xc0, 0xdd, 0x27, 0x24, 0x0b, 0x6e, 0x9c, 0xc1, 0xdc, 0x80, 0x41,
+	0xf5, 0x0d, 0x82, 0x15, 0x59, 0xad, 0x3c, 0xec, 0xb7, 0x48, 0xfb, 0x0f, 0x08, 0x56, 0x53, 0x80,
+	0x84, 0x5c, 0x7f, 0x02, 0x38, 0x6c, 0xa9, 0x71, 0xa6, 0x57, 0x46, 0x98, 0x8e, 0x85, 0x30, 0xae,
+	0xda, 0xf1, 0xa0, 0x53, 0x93, 0xfb, 0x10, 0x14, 0x9f, 0xdc, 0x78, 0xc4, 0x0c, 0x46, 0xbf, 0x81,
+	0xd5, 0x5d, 0x4e, 0x4c, 0x41, 0x66, 0xd8, 0x84, 0x9f, 0xc2, 0xd5, 0xb1, 0xda, 0x24, 0xa0, 0x49,
+	0xa5, 0x15, 0xe3, 0xa5, 0xa9, 0x0d, 0x58, 0xdd, 0x23, 0x5d, 0x32, 0x53, 0x7e, 0xf5, 0xa7, 0x1c,
+	0xdc, 0xf0, 0xd9, 0x7f, 0x46, 0x6d, 0xd2, 0x24, 0x9c, 0x92, 0xb1, 0xf3, 0x87, 0x29, 0xce, 0x7f,
+	0x0b, 0xf2, 0xd4, 0x11, 0x84, 0xf7, 0xcd, 0xae, 0x3c, 0xe0, 0x42, 0x5d, 0xd5, 0x92, 0xe6, 0x9d,
+	0xe6, 0xa7, 0x79, 0x1a, 0x7a, 0x1a, 0x17, 0x7b, 0xf0, 0x2e, 0x14, 0x4c, 0xcb, 0xe2, 0xc4, 0x92,
+	0x93, 0x45, 0x5e, 0xb9, 0x42, 0xfd, 0x4e, 0x72, 0x88, 0xed, 0x81, 0xa3, 0x31, 0xbc, 0x0b, 0xbf,
+	0x0b, 0x79, 0xc6, 0x3b, 0x84, 0xb7, 0x4e, 0x4e, 0xcb, 0x0b, 0x12, 0xde, 0xa2, 0xfc, 0xde, 0x39,
+	0xc5, 0x9f, 0xc1, 0x7c, 0x9f, 0x92, 0x97, 0xe5, 0xc5, 0x0a, 0xaa, 0x2e, 0xd7, 0xd7, 0x93, 0x03,
+	0x27, 0xd2, 0xa0, 0x0d, 0x56, 0x8e, 0x28, 0x79, 0x69, 0xc8, 0x38, 0xa3, 0xf7, 0x3d, 0x9f, 0x79,
+	0xdf, 0x97, 0xe2, 0xf7, 0x7d, 0x0d, 0x96, 0x47, 0x63, 0xe2, 0x3c, 0xcc, 0x7f, 0xf4, 0xf9, 0xc1,
+	0x41, 0xf1, 0x1d, 0x5c, 0x80, 0xc5, 0x8f, 0xf7, 0xb7, 0xf7, 0xf6, 0x8d, 0x66, 0x11, 0xa9, 0xbf,
+	0x23, 0x28, 0xc5, 0x31, 0x85, 0x1d, 0xb1, 0x0d, 0x05, 0x41, 0x6d, 0xe2, 0x4b, 0x0c, 0x25, 0x51,
+	0x2b, 0x54, 0xd2, 0x29, 0x0f, 0xb7, 0x83, 0xb8, 0xf8, 0x3d, 0x6d, 0x1f, 0xe0, 0x4d, 0x28, 0x92,
+	0x57, 0xa4, 0xdd, 0xf3, 0x29, 0x6e, 0x11, 0xce, 0xfd, 0xd6, 0xcb, 0xc9, 0x7c, 0x38, 0xca, 0xc7,
+	0xdd, 0xb6, 0xd6, 0x94, 0xd3, 0xdd, 0xb8, 0x72, 0xe1, 0xbb, 0x2f, 0x5d, 0x55, 0x17, 0x6e, 0x06,
+	0x4d, 0x91, 0x7e, 0xc1, 0x86, 0xdb, 0x21, 0x56, 0xd8, 0xdc, 0xec, 0x85, 0xf9, 0x83, 0xed, 0x46,
+	0x3c, 0xa5, 0x04, 0x33, 0xce, 0x1a, 0x9a, 0x99, 0xb5, 0x1a, 0x2c, 0x04, 0x3a, 0x16, 0xf6, 0x68,
+	0x12, 0x07, 0xa1, 0x47, 0xfd, 0x5f, 0x80, 0xcb, 0x41, 0x2b, 0x36, 0x83, 0x97, 0x00, 0xfe, 0x1b,
+	0x41, 0x65, 0x92, 0xc2, 0xe0, 0xcd, 0xf4, 0xdb, 0x39, 0x85, 0x5a, 0x2a, 0x5b, 0xff, 0x77, 0x7b,
+	0x70, 0xb5, 0xd4, 0xf5, 0x6f, 0xff, 0xfa, 0xe7, 0xfb, 0xb9, 0x47, 0xb8, 0xee, 0xbf, 0x04, 0xbe,
+	0xf6, 0x0f, 0x65, 0xd3, 0xe5, 0xec, 0x0b, 0xd2, 0x16, 0x9e, 0x5e, 0x3b, 0x1b, 0xbc, 0x36, 0x92,
+	0xa0, 0xff, 0x81, 0xe0, 0x76, 0xb6, 0x22, 0xe1, 0x8d, 0x64, 0x78, 0x53, 0xe9, 0x98, 0x32, 0xad,
+	0xac, 0xaa, 0x8f, 0x65, 0x11, 0x1f, 0xe2, 0x47, 0x49, 0x45, 0x64, 0xd6, 0xa0, 0xd7, 0xce, 0xf0,
+	0x6f, 0x28, 0x98, 0x89, 0x63, 0x8a, 0x84, 0xeb, 0x19, 0xe4, 0xa6, 0xe8, 0xa8, 0xd2, 0x98, 0x69,
+	0x4f, 0x78, 0x0a, 0xba, 0x2c, 0xe0, 0x1e, 0x5e, 0x4b, 0x39, 0x85, 0x31, 0x64, 0x3f, 0x23, 0xb8,
+	0x96, 0xa0, 0x57, 0xf8, 0x61, 0x3a, 0xdf, 0xc9, 0x2a, 0xa1, 0x64, 0xca, 0x8e, 0x5a, 0x97, 0xc0,
+	0x1e, 0xe0, 0x5a, 0x32, 0xb3, 0x71, 0x5c, 0x7a, 0xad, 0x76, 0x86, 0x7f, 0x45, 0x50, 0x4a, 0x56,
+	0x46, 0x9c, 0x42, 0x4e, 0xa6, 0x8e, 0x4e, 0x40, 0xb8, 0x23, 0x11, 0x3e, 0x56, 0xa7, 0xa5, 0x6e,
+	0x7d, 0x5c, 0x80, 0x7d, 0x36, 0x4b, 0xc9, 0x5a, 0x9a, 0x86, 0x38, 0x53, 0x79, 0x95, 0x52, 0xb4,
+	0x29, 0x7a, 0x25, 0x6b, 0xfb, 0xfe, 0x2b, 0x39, 0x62, 0xb3, 0x36, 0x0b, 0x9b, 0x3f, 0x22, 0x58,
+	0x1e, 0x95, 0x05, 0x7c, 0x7f, 0x06, 0x41, 0x53, 0x1e, 0x4c, 0xe7, 0x1c, 0x5e, 0xc4, 0xaa, 0x44,
+	0xa8, 0xe2, 0x4a, 0x32, 0x9b, 0x43, 0xa3, 0xf1, 0x0d, 0x82, 0x62, 0x7c, 0xee, 0xe2, 0x0f, 0xb2,
+	0xce, 0x77, 0x1c, 0x5b, 0x1a, 0x4f, 0xf7, 0x25, 0x8a, 0xbb, 0xea, 0x44, 0x14, 0xeb, 0xa8, 0xb6,
+	0x73, 0x8e, 0xa0, 0xdc, 0x66, 0x76, 0x62, 0xe6, 0x1d, 0x3c, 0x32, 0x91, 0x0f, 0xfd, 0x34, 0x87,
+	0xe8, 0xf9, 0x56, 0xe8, 0x6b, 0xb1, 0xae, 0xe9, 0x58, 0x1a, 0xe3, 0x96, 0x6e, 0x11, 0x47, 0x82,
+	0xd0, 0x03, 0x93, 0xe9, 0x52, 0x6f, 0xf4, 0x6f, 0xd2, 0xc6, 0xe0, 0xeb, 0x7c, 0x4e, 0x79, 0x12,
+	0x04, 0xd8, 0xed, 0xb2, 0x5e, 0x27, 0x1a, 0x4d, 0x7e, 0xca, 0xa3, 0xc6, 0x9f, 0x91, 0xf1, 0x58,
+	0x1a, 0x8f, 0x07, 0xc6, 0xe3, 0xa3, 0xc6, 0xc9, 0x82, 0x4c, 0xd2, 0xf8, 0x2f, 0x00, 0x00, 0xff,
+	0xff, 0x79, 0x2b, 0x3b, 0x90, 0x4a, 0x0e, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/mutation_record.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/mutation_record.pb.go
new file mode 100644
index 00000000..7493e557
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/mutation_record.pb.go
@@ -0,0 +1,97 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/monitoring/v3/mutation_record.proto
+
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Describes a change made to a configuration.
+type MutationRecord struct {
+	// When the change occurred.
+	MutateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=mutate_time,json=mutateTime,proto3" json:"mutate_time,omitempty"`
+	// The email address of the user making the change.
+	MutatedBy            string   `protobuf:"bytes,2,opt,name=mutated_by,json=mutatedBy,proto3" json:"mutated_by,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *MutationRecord) Reset()         { *m = MutationRecord{} }
+func (m *MutationRecord) String() string { return proto.CompactTextString(m) }
+func (*MutationRecord) ProtoMessage()    {}
+func (*MutationRecord) Descriptor() ([]byte, []int) {
+	return fileDescriptor_mutation_record_9017e3771537eac7, []int{0}
+}
+func (m *MutationRecord) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MutationRecord.Unmarshal(m, b)
+}
+func (m *MutationRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MutationRecord.Marshal(b, m, deterministic)
+}
+func (dst *MutationRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MutationRecord.Merge(dst, src)
+}
+func (m *MutationRecord) XXX_Size() int {
+	return xxx_messageInfo_MutationRecord.Size(m)
+}
+func (m *MutationRecord) XXX_DiscardUnknown() {
+	xxx_messageInfo_MutationRecord.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MutationRecord proto.InternalMessageInfo
+
+func (m *MutationRecord) GetMutateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.MutateTime
+	}
+	return nil
+}
+
+func (m *MutationRecord) GetMutatedBy() string {
+	if m != nil {
+		return m.MutatedBy
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*MutationRecord)(nil), "google.monitoring.v3.MutationRecord")
+}
+
+func init() {
+	proto.RegisterFile("google/monitoring/v3/mutation_record.proto", fileDescriptor_mutation_record_9017e3771537eac7)
+}
+
+var fileDescriptor_mutation_record_9017e3771537eac7 = []byte{
+	// 251 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4a, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0xcf, 0xcd, 0xcf, 0xcb, 0x2c, 0xc9, 0x2f, 0xca, 0xcc, 0x4b, 0xd7, 0x2f, 0x33,
+	0xd6, 0xcf, 0x2d, 0x2d, 0x49, 0x2c, 0xc9, 0xcc, 0xcf, 0x8b, 0x2f, 0x4a, 0x4d, 0xce, 0x2f, 0x4a,
+	0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0xa8, 0xd5, 0x43, 0xa8, 0xd5, 0x2b, 0x33,
+	0x96, 0x92, 0x87, 0x9a, 0x00, 0x56, 0x93, 0x54, 0x9a, 0xa6, 0x5f, 0x92, 0x99, 0x9b, 0x5a, 0x5c,
+	0x92, 0x98, 0x5b, 0x00, 0xd1, 0xa6, 0x94, 0xc3, 0xc5, 0xe7, 0x0b, 0x35, 0x2f, 0x08, 0x6c, 0x9c,
+	0x90, 0x35, 0x17, 0x37, 0xd8, 0x86, 0xd4, 0x78, 0x90, 0x5a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x6e,
+	0x23, 0x29, 0x3d, 0xa8, 0xf1, 0x30, 0x83, 0xf4, 0x42, 0x60, 0x06, 0x05, 0x71, 0x41, 0x94, 0x83,
+	0x04, 0x84, 0x64, 0xb9, 0xa0, 0xbc, 0x94, 0xf8, 0xa4, 0x4a, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xce,
+	0x20, 0x4e, 0xa8, 0x88, 0x53, 0xa5, 0xd3, 0x6a, 0x46, 0x2e, 0x89, 0xe4, 0xfc, 0x5c, 0x3d, 0x6c,
+	0x6e, 0x75, 0x12, 0x46, 0x75, 0x48, 0x00, 0xc8, 0xa6, 0x00, 0xc6, 0x28, 0x3b, 0xa8, 0xe2, 0xf4,
+	0xfc, 0x9c, 0xc4, 0xbc, 0x74, 0xbd, 0xfc, 0xa2, 0x74, 0xfd, 0xf4, 0xd4, 0x3c, 0xb0, 0x3b, 0xf4,
+	0x21, 0x52, 0x89, 0x05, 0x99, 0xc5, 0xa8, 0x61, 0x64, 0x8d, 0xe0, 0xad, 0x62, 0x92, 0x72, 0x87,
+	0x18, 0xe0, 0x9c, 0x93, 0x5f, 0x9a, 0xa2, 0xe7, 0x8b, 0xb0, 0x33, 0xcc, 0xf8, 0x14, 0x4c, 0x32,
+	0x06, 0x2c, 0x19, 0x83, 0x90, 0x8c, 0x09, 0x33, 0x4e, 0x62, 0x03, 0x5b, 0x62, 0x0c, 0x08, 0x00,
+	0x00, 0xff, 0xff, 0x95, 0xa7, 0xf3, 0xbd, 0x87, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification.pb.go
new file mode 100644
index 00000000..6da45e71
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification.pb.go
@@ -0,0 +1,368 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/monitoring/v3/notification.proto
+
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import label "google.golang.org/genproto/googleapis/api/label"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Indicates whether the channel has been verified or not. It is illegal
+// to specify this field in a
+// [`CreateNotificationChannel`][google.monitoring.v3.NotificationChannelService.CreateNotificationChannel]
+// or an
+// [`UpdateNotificationChannel`][google.monitoring.v3.NotificationChannelService.UpdateNotificationChannel]
+// operation.
+type NotificationChannel_VerificationStatus int32
+
+const (
+	// Sentinel value used to indicate that the state is unknown, omitted, or
+	// is not applicable (as in the case of channels that neither support
+	// nor require verification in order to function).
+	NotificationChannel_VERIFICATION_STATUS_UNSPECIFIED NotificationChannel_VerificationStatus = 0
+	// The channel has yet to be verified and requires verification to function.
+	// Note that this state also applies to the case where the verification
+	// process has been initiated by sending a verification code but where
+	// the verification code has not been submitted to complete the process.
+	NotificationChannel_UNVERIFIED NotificationChannel_VerificationStatus = 1
+	// It has been proven that notifications can be received on this
+	// notification channel and that someone on the project has access
+	// to messages that are delivered to that channel.
+	NotificationChannel_VERIFIED NotificationChannel_VerificationStatus = 2
+)
+
+var NotificationChannel_VerificationStatus_name = map[int32]string{
+	0: "VERIFICATION_STATUS_UNSPECIFIED",
+	1: "UNVERIFIED",
+	2: "VERIFIED",
+}
+var NotificationChannel_VerificationStatus_value = map[string]int32{
+	"VERIFICATION_STATUS_UNSPECIFIED": 0,
+	"UNVERIFIED":                      1,
+	"VERIFIED":                        2,
+}
+
+func (x NotificationChannel_VerificationStatus) String() string {
+	return proto.EnumName(NotificationChannel_VerificationStatus_name, int32(x))
+}
+func (NotificationChannel_VerificationStatus) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_notification_edf6bf9ac9e92803, []int{1, 0}
+}
+
+// A description of a notification channel. The descriptor includes
+// the properties of the channel and the set of labels or fields that
+// must be specified to configure channels of a given type.
+type NotificationChannelDescriptor struct {
+	// The full REST resource name for this descriptor. The syntax is:
+	//
+	//     projects/[PROJECT_ID]/notificationChannelDescriptors/[TYPE]
+	//
+	// In the above, `[TYPE]` is the value of the `type` field.
+	Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	// The type of notification channel, such as "email", "sms", etc.
+	// Notification channel types are globally unique.
+	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	// A human-readable name for the notification channel type.  This
+	// form of the name is suitable for a user interface.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// A human-readable description of the notification channel
+	// type. The description may include a description of the properties
+	// of the channel and pointers to external documentation.
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// The set of labels that must be defined to identify a particular
+	// channel of the corresponding type. Each label includes a
+	// description for how that field should be populated.
+	Labels []*label.LabelDescriptor `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty"`
+	// The tiers that support this notification channel; the project service tier
+	// must be one of the supported_tiers.
+	SupportedTiers       []ServiceTier `protobuf:"varint,5,rep,packed,name=supported_tiers,json=supportedTiers,proto3,enum=google.monitoring.v3.ServiceTier" json:"supported_tiers,omitempty"` // Deprecated: Do not use.
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *NotificationChannelDescriptor) Reset()         { *m = NotificationChannelDescriptor{} }
+func (m *NotificationChannelDescriptor) String() string { return proto.CompactTextString(m) }
+func (*NotificationChannelDescriptor) ProtoMessage()    {}
+func (*NotificationChannelDescriptor) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_edf6bf9ac9e92803, []int{0}
+}
+func (m *NotificationChannelDescriptor) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NotificationChannelDescriptor.Unmarshal(m, b)
+}
+func (m *NotificationChannelDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NotificationChannelDescriptor.Marshal(b, m, deterministic)
+}
+func (dst *NotificationChannelDescriptor) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NotificationChannelDescriptor.Merge(dst, src)
+}
+func (m *NotificationChannelDescriptor) XXX_Size() int {
+	return xxx_messageInfo_NotificationChannelDescriptor.Size(m)
+}
+func (m *NotificationChannelDescriptor) XXX_DiscardUnknown() {
+	xxx_messageInfo_NotificationChannelDescriptor.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NotificationChannelDescriptor proto.InternalMessageInfo
+
+func (m *NotificationChannelDescriptor) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *NotificationChannelDescriptor) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *NotificationChannelDescriptor) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *NotificationChannelDescriptor) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *NotificationChannelDescriptor) GetLabels() []*label.LabelDescriptor {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+// Deprecated: Do not use.
+func (m *NotificationChannelDescriptor) GetSupportedTiers() []ServiceTier {
+	if m != nil {
+		return m.SupportedTiers
+	}
+	return nil
+}
+
+// A `NotificationChannel` is a medium through which an alert is
+// delivered when a policy violation is detected. Examples of channels
+// include email, SMS, and third-party messaging applications. Fields
+// containing sensitive information like authentication tokens or
+// contact info are only partially populated on retrieval.
+type NotificationChannel struct {
+	// The type of the notification channel. This field matches the
+	// value of the [NotificationChannelDescriptor.type][google.monitoring.v3.NotificationChannelDescriptor.type] field.
+	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	// The full REST resource name for this channel. The syntax is:
+	//
+	//     projects/[PROJECT_ID]/notificationChannels/[CHANNEL_ID]
+	//
+	// The `[CHANNEL_ID]` is automatically assigned by the server on creation.
+	Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	// An optional human-readable name for this notification channel. It is
+	// recommended that you specify a non-empty and unique name in order to
+	// make it easier to identify the channels in your project, though this is
+	// not enforced. The display name is limited to 512 Unicode characters.
+	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// An optional human-readable description of this notification channel. This
+	// description may provide additional details, beyond the display
+	// name, for the channel. This may not exceeed 1024 Unicode characters.
+	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
+	// Configuration fields that define the channel and its behavior. The
+	// permissible and required labels are specified in the
+	// [NotificationChannelDescriptor.labels][google.monitoring.v3.NotificationChannelDescriptor.labels] of the
+	// `NotificationChannelDescriptor` corresponding to the `type` field.
+	Labels map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// User-supplied key/value data that does not need to conform to
+	// the corresponding `NotificationChannelDescriptor`'s schema, unlike
+	// the `labels` field. This field is intended to be used for organizing
+	// and identifying the `NotificationChannel` objects.
+	//
+	// The field can contain up to 64 entries. Each key and value is limited to
+	// 63 Unicode characters or 128 bytes, whichever is smaller. Labels and
+	// values can contain only lowercase letters, numerals, underscores, and
+	// dashes. Keys must begin with a letter.
+	UserLabels map[string]string `protobuf:"bytes,8,rep,name=user_labels,json=userLabels,proto3" json:"user_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Indicates whether this channel has been verified or not. On a
+	// [`ListNotificationChannels`][google.monitoring.v3.NotificationChannelService.ListNotificationChannels]
+	// or
+	// [`GetNotificationChannel`][google.monitoring.v3.NotificationChannelService.GetNotificationChannel]
+	// operation, this field is expected to be populated.
+	//
+	// If the value is `UNVERIFIED`, then it indicates that the channel is
+	// non-functioning (it both requires verification and lacks verification);
+	// otherwise, it is assumed that the channel works.
+	//
+	// If the channel is neither `VERIFIED` nor `UNVERIFIED`, it implies that
+	// the channel is of a type that does not require verification or that
+	// this specific channel has been exempted from verification because it was
+	// created prior to verification being required for channels of this type.
+	//
+	// This field cannot be modified using a standard
+	// [`UpdateNotificationChannel`][google.monitoring.v3.NotificationChannelService.UpdateNotificationChannel]
+	// operation. To change the value of this field, you must call
+	// [`VerifyNotificationChannel`][google.monitoring.v3.NotificationChannelService.VerifyNotificationChannel].
+	VerificationStatus NotificationChannel_VerificationStatus `protobuf:"varint,9,opt,name=verification_status,json=verificationStatus,proto3,enum=google.monitoring.v3.NotificationChannel_VerificationStatus" json:"verification_status,omitempty"`
+	// Whether notifications are forwarded to the described channel. This makes
+	// it possible to disable delivery of notifications to a particular channel
+	// without removing the channel from all alerting policies that reference
+	// the channel. This is a more convenient approach when the change is
+	// temporary and you want to receive notifications from the same set
+	// of alerting policies on the channel at some point in the future.
+	Enabled              *wrappers.BoolValue `protobuf:"bytes,11,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *NotificationChannel) Reset()         { *m = NotificationChannel{} }
+func (m *NotificationChannel) String() string { return proto.CompactTextString(m) }
+func (*NotificationChannel) ProtoMessage()    {}
+func (*NotificationChannel) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_edf6bf9ac9e92803, []int{1}
+}
+func (m *NotificationChannel) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NotificationChannel.Unmarshal(m, b)
+}
+func (m *NotificationChannel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NotificationChannel.Marshal(b, m, deterministic)
+}
+func (dst *NotificationChannel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NotificationChannel.Merge(dst, src)
+}
+func (m *NotificationChannel) XXX_Size() int {
+	return xxx_messageInfo_NotificationChannel.Size(m)
+}
+func (m *NotificationChannel) XXX_DiscardUnknown() {
+	xxx_messageInfo_NotificationChannel.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NotificationChannel proto.InternalMessageInfo
+
+func (m *NotificationChannel) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *NotificationChannel) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *NotificationChannel) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *NotificationChannel) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *NotificationChannel) GetLabels() map[string]string {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+func (m *NotificationChannel) GetUserLabels() map[string]string {
+	if m != nil {
+		return m.UserLabels
+	}
+	return nil
+}
+
+func (m *NotificationChannel) GetVerificationStatus() NotificationChannel_VerificationStatus {
+	if m != nil {
+		return m.VerificationStatus
+	}
+	return NotificationChannel_VERIFICATION_STATUS_UNSPECIFIED
+}
+
+func (m *NotificationChannel) GetEnabled() *wrappers.BoolValue {
+	if m != nil {
+		return m.Enabled
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*NotificationChannelDescriptor)(nil), "google.monitoring.v3.NotificationChannelDescriptor")
+	proto.RegisterType((*NotificationChannel)(nil), "google.monitoring.v3.NotificationChannel")
+	proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.NotificationChannel.LabelsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.NotificationChannel.UserLabelsEntry")
+	proto.RegisterEnum("google.monitoring.v3.NotificationChannel_VerificationStatus", NotificationChannel_VerificationStatus_name, NotificationChannel_VerificationStatus_value)
+}
+
+func init() {
+	proto.RegisterFile("google/monitoring/v3/notification.proto", fileDescriptor_notification_edf6bf9ac9e92803)
+}
+
+var fileDescriptor_notification_edf6bf9ac9e92803 = []byte{
+	// 602 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x6d, 0x6b, 0xdb, 0x3c,
+	0x14, 0x7d, 0x9c, 0x34, 0x7d, 0x5a, 0xb9, 0xa4, 0x9d, 0x5a, 0x86, 0xf1, 0xde, 0xd2, 0xee, 0xc3,
+	0xf2, 0xc9, 0x86, 0x64, 0x83, 0x75, 0x6f, 0xd0, 0xa4, 0xe9, 0x08, 0xac, 0x59, 0xc9, 0xdb, 0xa0,
+	0x14, 0x82, 0x92, 0xa8, 0x9e, 0x98, 0x2d, 0x19, 0x49, 0xf6, 0xc8, 0xcf, 0xd8, 0x8f, 0xd8, 0x87,
+	0xed, 0xa7, 0xec, 0x57, 0x0d, 0xcb, 0x8a, 0xed, 0xb5, 0x86, 0x75, 0xdf, 0x74, 0xcf, 0x3d, 0xe7,
+	0xdc, 0x7b, 0x4f, 0x4c, 0xc0, 0x33, 0x8f, 0x31, 0xcf, 0xc7, 0x6e, 0xc0, 0x28, 0x91, 0x8c, 0x13,
+	0xea, 0xb9, 0x71, 0xdb, 0xa5, 0x4c, 0x92, 0x6b, 0xb2, 0x40, 0x92, 0x30, 0xea, 0x84, 0x9c, 0x49,
+	0x06, 0x0f, 0x52, 0xa2, 0x93, 0x13, 0x9d, 0xb8, 0x6d, 0x3f, 0xd4, 0x72, 0x14, 0x12, 0x17, 0x51,
+	0xca, 0xa4, 0x92, 0x88, 0x54, 0x63, 0xdf, 0x2f, 0x74, 0x7d, 0x34, 0xc7, 0xbe, 0xc6, 0x0f, 0x4b,
+	0x87, 0x2e, 0x58, 0x10, 0xac, 0xc7, 0xd9, 0x8f, 0x35, 0x45, 0x55, 0xf3, 0xe8, 0xda, 0xfd, 0xca,
+	0x51, 0x18, 0x62, 0xae, 0xad, 0x8f, 0xbe, 0x55, 0xc0, 0xa3, 0x41, 0x61, 0xcb, 0xee, 0x67, 0x44,
+	0x29, 0xf6, 0x4f, 0xb1, 0x58, 0x70, 0x12, 0x4a, 0xc6, 0x21, 0x04, 0x1b, 0x14, 0x05, 0xd8, 0xda,
+	0x6c, 0x18, 0xcd, 0xed, 0xa1, 0x7a, 0x27, 0x98, 0x5c, 0x85, 0xd8, 0x32, 0x52, 0x2c, 0x79, 0xc3,
+	0x43, 0xb0, 0xb3, 0x24, 0x22, 0xf4, 0xd1, 0x6a, 0xa6, 0xf8, 0x15, 0xd5, 0x33, 0x35, 0x36, 0x48,
+	0x64, 0x0d, 0x60, 0x2e, 0xb5, 0x31, 0x61, 0xd4, 0xaa, 0x6a, 0x46, 0x0e, 0xc1, 0x36, 0xd8, 0x54,
+	0x07, 0x0a, 0x6b, 0xa3, 0x51, 0x6d, 0x9a, 0xad, 0x07, 0x8e, 0x8e, 0x0b, 0x85, 0xc4, 0xf9, 0x90,
+	0x74, 0xf2, 0xcd, 0x86, 0x9a, 0x0a, 0x07, 0x60, 0x57, 0x44, 0x61, 0xc8, 0xb8, 0xc4, 0xcb, 0x99,
+	0x24, 0x98, 0x0b, 0xab, 0xd6, 0xa8, 0x36, 0xeb, 0xad, 0x43, 0xa7, 0x2c, 0x6c, 0x67, 0x84, 0x79,
+	0x4c, 0x16, 0x78, 0x4c, 0x30, 0xef, 0x54, 0x2c, 0x63, 0x58, 0xcf, 0xd4, 0x09, 0x24, 0x8e, 0xbe,
+	0xd7, 0xc0, 0x7e, 0x49, 0x26, 0xa5, 0x57, 0x97, 0xa5, 0x73, 0x33, 0x89, 0xea, 0x5f, 0x93, 0xd8,
+	0xb8, 0x9d, 0xc4, 0x79, 0x96, 0x44, 0x4d, 0x25, 0xf1, 0xa2, 0xfc, 0x96, 0x92, 0x3d, 0xd3, 0x9c,
+	0x44, 0x8f, 0x4a, 0xbe, 0xca, 0x32, 0xba, 0x04, 0x66, 0x24, 0x30, 0x9f, 0x69, 0xcf, 0x2d, 0xe5,
+	0x79, 0x7c, 0x77, 0xcf, 0x89, 0xc0, 0xbc, 0xe8, 0x0b, 0xa2, 0x0c, 0x80, 0x01, 0xd8, 0x8f, 0x31,
+	0xcf, 0x24, 0x33, 0x21, 0x91, 0x8c, 0x84, 0xb5, 0xdd, 0x30, 0x9a, 0xf5, 0xd6, 0x9b, 0xbb, 0xcf,
+	0x98, 0x16, 0x4c, 0x46, 0xca, 0x63, 0x08, 0xe3, 0x5b, 0x18, 0x7c, 0x0e, 0xfe, 0xc7, 0x14, 0xcd,
+	0x7d, 0xbc, 0xb4, 0xcc, 0x86, 0xd1, 0x34, 0x5b, 0xf6, 0x7a, 0xc4, 0xfa, 0x23, 0x77, 0x3a, 0x8c,
+	0xf9, 0x53, 0xe4, 0x47, 0x78, 0xb8, 0xa6, 0xda, 0xc7, 0xc0, 0x2c, 0xec, 0x0f, 0xf7, 0x40, 0xf5,
+	0x0b, 0x5e, 0xe9, 0x9f, 0x32, 0x79, 0xc2, 0x03, 0x50, 0x8b, 0x13, 0x89, 0xfe, 0x70, 0xd3, 0xe2,
+	0x55, 0xe5, 0xa5, 0x61, 0xbf, 0x05, 0xbb, 0x37, 0xce, 0xff, 0x17, 0xf9, 0xd1, 0x27, 0x00, 0x6f,
+	0x5f, 0x06, 0x9f, 0x82, 0x27, 0xd3, 0xde, 0xb0, 0x7f, 0xd6, 0xef, 0x9e, 0x8c, 0xfb, 0x1f, 0x07,
+	0xb3, 0xd1, 0xf8, 0x64, 0x3c, 0x19, 0xcd, 0x26, 0x83, 0xd1, 0x45, 0xaf, 0xdb, 0x3f, 0xeb, 0xf7,
+	0x4e, 0xf7, 0xfe, 0x83, 0x75, 0x00, 0x26, 0x83, 0x94, 0xd6, 0x3b, 0xdd, 0x33, 0xe0, 0x0e, 0xd8,
+	0xca, 0xaa, 0x4a, 0xe7, 0x87, 0x01, 0xac, 0x05, 0x0b, 0x4a, 0x03, 0xee, 0xdc, 0x2b, 0x26, 0x7c,
+	0x91, 0x04, 0x73, 0x61, 0x5c, 0xbe, 0xd3, 0x54, 0x8f, 0xf9, 0x88, 0x7a, 0x0e, 0xe3, 0x9e, 0xeb,
+	0x61, 0xaa, 0x62, 0x73, 0xd3, 0x16, 0x0a, 0x89, 0xf8, 0xf3, 0xff, 0xe4, 0x75, 0x5e, 0xfd, 0xac,
+	0xd8, 0xef, 0x53, 0x83, 0xae, 0xcf, 0xa2, 0xa5, 0x73, 0x9e, 0x4f, 0x9c, 0xb6, 0x7f, 0xad, 0x9b,
+	0x57, 0xaa, 0x79, 0x95, 0x37, 0xaf, 0xa6, 0xed, 0xf9, 0xa6, 0x1a, 0xd2, 0xfe, 0x1d, 0x00, 0x00,
+	0xff, 0xff, 0xf7, 0x1b, 0x09, 0x21, 0x28, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification_service.pb.go
new file mode 100644
index 00000000..fb881f91
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification_service.pb.go
@@ -0,0 +1,1307 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/monitoring/v3/notification_service.proto
+
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The `ListNotificationChannelDescriptors` request.
+type ListNotificationChannelDescriptorsRequest struct {
+	// The REST resource name of the parent from which to retrieve
+	// the notification channel descriptors. The expected syntax is:
+	//
+	//     projects/[PROJECT_ID]
+	//
+	// Note that this names the parent container in which to look for the
+	// descriptors; to retrieve a single descriptor by name, use the
+	// [GetNotificationChannelDescriptor][google.monitoring.v3.NotificationChannelService.GetNotificationChannelDescriptor]
+	// operation, instead.
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	// The maximum number of results to return in a single response. If
+	// not set to a positive number, a reasonable value will be chosen by the
+	// service.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// If non-empty, `page_token` must contain a value returned as the
+	// `next_page_token` in a previous response to request the next set
+	// of results.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListNotificationChannelDescriptorsRequest) Reset() {
+	*m = ListNotificationChannelDescriptorsRequest{}
+}
+func (m *ListNotificationChannelDescriptorsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListNotificationChannelDescriptorsRequest) ProtoMessage()    {}
+func (*ListNotificationChannelDescriptorsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{0}
+}
+func (m *ListNotificationChannelDescriptorsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Unmarshal(m, b)
+}
+func (m *ListNotificationChannelDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListNotificationChannelDescriptorsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Merge(dst, src)
+}
+func (m *ListNotificationChannelDescriptorsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Size(m)
+}
+func (m *ListNotificationChannelDescriptorsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNotificationChannelDescriptorsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNotificationChannelDescriptorsRequest proto.InternalMessageInfo
+
+func (m *ListNotificationChannelDescriptorsRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ListNotificationChannelDescriptorsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListNotificationChannelDescriptorsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// The `ListNotificationChannelDescriptors` response.
+type ListNotificationChannelDescriptorsResponse struct {
+	// The monitored resource descriptors supported for the specified
+	// project, optionally filtered.
+	ChannelDescriptors []*NotificationChannelDescriptor `protobuf:"bytes,1,rep,name=channel_descriptors,json=channelDescriptors,proto3" json:"channel_descriptors,omitempty"`
+	// If not empty, indicates that there may be more results that match
+	// the request. Use the value in the `page_token` field in a
+	// subsequent request to fetch the next set of results. If empty,
+	// all results have been returned.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListNotificationChannelDescriptorsResponse) Reset() {
+	*m = ListNotificationChannelDescriptorsResponse{}
+}
+func (m *ListNotificationChannelDescriptorsResponse) String() string {
+	return proto.CompactTextString(m)
+}
+func (*ListNotificationChannelDescriptorsResponse) ProtoMessage() {}
+func (*ListNotificationChannelDescriptorsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{1}
+}
+func (m *ListNotificationChannelDescriptorsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Unmarshal(m, b)
+}
+func (m *ListNotificationChannelDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListNotificationChannelDescriptorsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Merge(dst, src)
+}
+func (m *ListNotificationChannelDescriptorsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Size(m)
+}
+func (m *ListNotificationChannelDescriptorsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNotificationChannelDescriptorsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNotificationChannelDescriptorsResponse proto.InternalMessageInfo
+
+func (m *ListNotificationChannelDescriptorsResponse) GetChannelDescriptors() []*NotificationChannelDescriptor {
+	if m != nil {
+		return m.ChannelDescriptors
+	}
+	return nil
+}
+
+func (m *ListNotificationChannelDescriptorsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The `GetNotificationChannelDescriptor` response.
+type GetNotificationChannelDescriptorRequest struct {
+	// The channel type for which to execute the request. The format is
+	// `projects/[PROJECT_ID]/notificationChannelDescriptors/{channel_type}`.
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetNotificationChannelDescriptorRequest) Reset() {
+	*m = GetNotificationChannelDescriptorRequest{}
+}
+func (m *GetNotificationChannelDescriptorRequest) String() string { return proto.CompactTextString(m) }
+func (*GetNotificationChannelDescriptorRequest) ProtoMessage()    {}
+func (*GetNotificationChannelDescriptorRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{2}
+}
+func (m *GetNotificationChannelDescriptorRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Unmarshal(m, b)
+}
+func (m *GetNotificationChannelDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetNotificationChannelDescriptorRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNotificationChannelDescriptorRequest.Merge(dst, src)
+}
+func (m *GetNotificationChannelDescriptorRequest) XXX_Size() int {
+	return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Size(m)
+}
+func (m *GetNotificationChannelDescriptorRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetNotificationChannelDescriptorRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetNotificationChannelDescriptorRequest proto.InternalMessageInfo
+
+func (m *GetNotificationChannelDescriptorRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The `CreateNotificationChannel` request.
+type CreateNotificationChannelRequest struct {
+	// The project on which to execute the request. The format is:
+	//
+	//     projects/[PROJECT_ID]
+	//
+	// Note that this names the container into which the channel will be
+	// written. This does not name the newly created channel. The resulting
+	// channel's name will have a normalized version of this field as a prefix,
+	// but will add `/notificationChannels/[CHANNEL_ID]` to identify the channel.
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	// The definition of the `NotificationChannel` to create.
+	NotificationChannel  *NotificationChannel `protobuf:"bytes,2,opt,name=notification_channel,json=notificationChannel,proto3" json:"notification_channel,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *CreateNotificationChannelRequest) Reset()         { *m = CreateNotificationChannelRequest{} }
+func (m *CreateNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateNotificationChannelRequest) ProtoMessage()    {}
+func (*CreateNotificationChannelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{3}
+}
+func (m *CreateNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateNotificationChannelRequest.Unmarshal(m, b)
+}
+func (m *CreateNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateNotificationChannelRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateNotificationChannelRequest.Merge(dst, src)
+}
+func (m *CreateNotificationChannelRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateNotificationChannelRequest.Size(m)
+}
+func (m *CreateNotificationChannelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateNotificationChannelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateNotificationChannelRequest proto.InternalMessageInfo
+
+func (m *CreateNotificationChannelRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *CreateNotificationChannelRequest) GetNotificationChannel() *NotificationChannel {
+	if m != nil {
+		return m.NotificationChannel
+	}
+	return nil
+}
+
+// The `ListNotificationChannels` request.
+type ListNotificationChannelsRequest struct {
+	// The project on which to execute the request. The format is
+	// `projects/[PROJECT_ID]`. That is, this names the container
+	// in which to look for the notification channels; it does not name a
+	// specific channel. To query a specific channel by REST resource name, use
+	// the
+	// [`GetNotificationChannel`][google.monitoring.v3.NotificationChannelService.GetNotificationChannel] operation.
+	Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	// If provided, this field specifies the criteria that must be met by
+	// notification channels to be included in the response.
+	//
+	// For more details, see [sorting and
+	// filtering](/monitoring/api/v3/sorting-and-filtering).
+	Filter string `protobuf:"bytes,6,opt,name=filter,proto3" json:"filter,omitempty"`
+	// A comma-separated list of fields by which to sort the result. Supports
+	// the same set of fields as in `filter`. Entries can be prefixed with
+	// a minus sign to sort in descending rather than ascending order.
+	//
+	// For more details, see [sorting and
+	// filtering](/monitoring/api/v3/sorting-and-filtering).
+	OrderBy string `protobuf:"bytes,7,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
+	// The maximum number of results to return in a single response. If
+	// not set to a positive number, a reasonable value will be chosen by the
+	// service.
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// If non-empty, `page_token` must contain a value returned as the
+	// `next_page_token` in a previous response to request the next set
+	// of results.
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListNotificationChannelsRequest) Reset()         { *m = ListNotificationChannelsRequest{} }
+func (m *ListNotificationChannelsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListNotificationChannelsRequest) ProtoMessage()    {}
+func (*ListNotificationChannelsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{4}
+}
+func (m *ListNotificationChannelsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNotificationChannelsRequest.Unmarshal(m, b)
+}
+func (m *ListNotificationChannelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNotificationChannelsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListNotificationChannelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotificationChannelsRequest.Merge(dst, src)
+}
+func (m *ListNotificationChannelsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListNotificationChannelsRequest.Size(m)
+}
+func (m *ListNotificationChannelsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNotificationChannelsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNotificationChannelsRequest proto.InternalMessageInfo
+
+func (m *ListNotificationChannelsRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *ListNotificationChannelsRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListNotificationChannelsRequest) GetOrderBy() string {
+	if m != nil {
+		return m.OrderBy
+	}
+	return ""
+}
+
+func (m *ListNotificationChannelsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListNotificationChannelsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// The `ListNotificationChannels` response.
+type ListNotificationChannelsResponse struct {
+	// The notification channels defined for the specified project.
+	NotificationChannels []*NotificationChannel `protobuf:"bytes,3,rep,name=notification_channels,json=notificationChannels,proto3" json:"notification_channels,omitempty"`
+	// If not empty, indicates that there may be more results that match
+	// the request. Use the value in the `page_token` field in a
+	// subsequent request to fetch the next set of results. If empty,
+	// all results have been returned.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListNotificationChannelsResponse) Reset()         { *m = ListNotificationChannelsResponse{} }
+func (m *ListNotificationChannelsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListNotificationChannelsResponse) ProtoMessage()    {}
+func (*ListNotificationChannelsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{5}
+}
+func (m *ListNotificationChannelsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListNotificationChannelsResponse.Unmarshal(m, b)
+}
+func (m *ListNotificationChannelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListNotificationChannelsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListNotificationChannelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListNotificationChannelsResponse.Merge(dst, src)
+}
+func (m *ListNotificationChannelsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListNotificationChannelsResponse.Size(m)
+}
+func (m *ListNotificationChannelsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListNotificationChannelsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListNotificationChannelsResponse proto.InternalMessageInfo
+
+func (m *ListNotificationChannelsResponse) GetNotificationChannels() []*NotificationChannel {
+	if m != nil {
+		return m.NotificationChannels
+	}
+	return nil
+}
+
+func (m *ListNotificationChannelsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The `GetNotificationChannel` request.
+type GetNotificationChannelRequest struct {
+	// The channel for which to execute the request. The format is
+	// `projects/[PROJECT_ID]/notificationChannels/[CHANNEL_ID]`.
+	Name                 string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetNotificationChannelRequest) Reset()         { *m = GetNotificationChannelRequest{} }
+func (m *GetNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
+func (*GetNotificationChannelRequest) ProtoMessage()    {}
+func (*GetNotificationChannelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{6}
+}
+func (m *GetNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetNotificationChannelRequest.Unmarshal(m, b)
+}
+func (m *GetNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetNotificationChannelRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNotificationChannelRequest.Merge(dst, src)
+}
+func (m *GetNotificationChannelRequest) XXX_Size() int {
+	return xxx_messageInfo_GetNotificationChannelRequest.Size(m)
+}
+func (m *GetNotificationChannelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetNotificationChannelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetNotificationChannelRequest proto.InternalMessageInfo
+
+func (m *GetNotificationChannelRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The `UpdateNotificationChannel` request.
+type UpdateNotificationChannelRequest struct {
+	// The fields to update.
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	// A description of the changes to be applied to the specified
+	// notification channel. The description must provide a definition for
+	// fields to be updated; the names of these fields should also be
+	// included in the `update_mask`.
+	NotificationChannel  *NotificationChannel `protobuf:"bytes,3,opt,name=notification_channel,json=notificationChannel,proto3" json:"notification_channel,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *UpdateNotificationChannelRequest) Reset()         { *m = UpdateNotificationChannelRequest{} }
+func (m *UpdateNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateNotificationChannelRequest) ProtoMessage()    {}
+func (*UpdateNotificationChannelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{7}
+}
+func (m *UpdateNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateNotificationChannelRequest.Unmarshal(m, b)
+}
+func (m *UpdateNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateNotificationChannelRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateNotificationChannelRequest.Merge(dst, src)
+}
+func (m *UpdateNotificationChannelRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateNotificationChannelRequest.Size(m)
+}
+func (m *UpdateNotificationChannelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateNotificationChannelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateNotificationChannelRequest proto.InternalMessageInfo
+
+func (m *UpdateNotificationChannelRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+func (m *UpdateNotificationChannelRequest) GetNotificationChannel() *NotificationChannel {
+	if m != nil {
+		return m.NotificationChannel
+	}
+	return nil
+}
+
+// The `DeleteNotificationChannel` request.
+type DeleteNotificationChannelRequest struct {
+	// The channel for which to execute the request. The format is
+	// `projects/[PROJECT_ID]/notificationChannels/[CHANNEL_ID]`.
+	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	// If true, the notification channel will be deleted regardless of its
+	// use in alert policies (the policies will be updated to remove the
+	// channel). If false, channels that are still referenced by an existing
+	// alerting policy will fail to be deleted in a delete operation.
+	Force                bool     `protobuf:"varint,5,opt,name=force,proto3" json:"force,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteNotificationChannelRequest) Reset()         { *m = DeleteNotificationChannelRequest{} }
+func (m *DeleteNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteNotificationChannelRequest) ProtoMessage()    {}
+func (*DeleteNotificationChannelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{8}
+}
+func (m *DeleteNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteNotificationChannelRequest.Unmarshal(m, b)
+}
+func (m *DeleteNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteNotificationChannelRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteNotificationChannelRequest.Merge(dst, src)
+}
+func (m *DeleteNotificationChannelRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteNotificationChannelRequest.Size(m)
+}
+func (m *DeleteNotificationChannelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteNotificationChannelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteNotificationChannelRequest proto.InternalMessageInfo
+
+func (m *DeleteNotificationChannelRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *DeleteNotificationChannelRequest) GetForce() bool {
+	if m != nil {
+		return m.Force
+	}
+	return false
+}
+
+// The `SendNotificationChannelVerificationCode` request.
+type SendNotificationChannelVerificationCodeRequest struct {
+	// The notification channel to which to send a verification code.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SendNotificationChannelVerificationCodeRequest) Reset() {
+	*m = SendNotificationChannelVerificationCodeRequest{}
+}
+func (m *SendNotificationChannelVerificationCodeRequest) String() string {
+	return proto.CompactTextString(m)
+}
+func (*SendNotificationChannelVerificationCodeRequest) ProtoMessage() {}
+func (*SendNotificationChannelVerificationCodeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{9}
+}
+func (m *SendNotificationChannelVerificationCodeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Unmarshal(m, b)
+}
+func (m *SendNotificationChannelVerificationCodeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Marshal(b, m, deterministic)
+}
+func (dst *SendNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Merge(dst, src)
+}
+func (m *SendNotificationChannelVerificationCodeRequest) XXX_Size() int {
+	return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Size(m)
+}
+func (m *SendNotificationChannelVerificationCodeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SendNotificationChannelVerificationCodeRequest proto.InternalMessageInfo
+
+func (m *SendNotificationChannelVerificationCodeRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The `GetNotificationChannelVerificationCode` request.
+type GetNotificationChannelVerificationCodeRequest struct {
+	// The notification channel for which a verification code is to be generated
+	// and retrieved. This must name a channel that is already verified; if
+	// the specified channel is not verified, the request will fail.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The desired expiration time. If specified, the API will guarantee that
+	// the returned code will not be valid after the specified timestamp;
+	// however, the API cannot guarantee that the returned code will be
+	// valid for at least as long as the requested time (the API puts an upper
+	// bound on the amount of time for which a code may be valid). If omitted,
+	// a default expiration will be used, which may be less than the max
+	// permissible expiration (so specifying an expiration may extend the
+	// code's lifetime over omitting an expiration, even though the API does
+	// impose an upper limit on the maximum expiration that is permitted).
+	ExpireTime           *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *GetNotificationChannelVerificationCodeRequest) Reset() {
+	*m = GetNotificationChannelVerificationCodeRequest{}
+}
+func (m *GetNotificationChannelVerificationCodeRequest) String() string {
+	return proto.CompactTextString(m)
+}
+func (*GetNotificationChannelVerificationCodeRequest) ProtoMessage() {}
+func (*GetNotificationChannelVerificationCodeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{10}
+}
+func (m *GetNotificationChannelVerificationCodeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Unmarshal(m, b)
+}
+func (m *GetNotificationChannelVerificationCodeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Merge(dst, src)
+}
+func (m *GetNotificationChannelVerificationCodeRequest) XXX_Size() int {
+	return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Size(m)
+}
+func (m *GetNotificationChannelVerificationCodeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetNotificationChannelVerificationCodeRequest proto.InternalMessageInfo
+
+func (m *GetNotificationChannelVerificationCodeRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *GetNotificationChannelVerificationCodeRequest) GetExpireTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ExpireTime
+	}
+	return nil
+}
+
+// The `GetNotificationChannelVerificationCode` request.
+type GetNotificationChannelVerificationCodeResponse struct {
+	// The verification code, which may be used to verify other channels
+	// that have an equivalent identity (i.e. other channels of the same
+	// type with the same fingerprint such as other email channels with
+	// the same email address or other sms channels with the same number).
+	Code string `protobuf:"bytes,1,opt,name=code,proto3" json:"code,omitempty"`
+	// The expiration time associated with the code that was returned. If
+	// an expiration was provided in the request, this is the minimum of the
+	// requested expiration in the request and the max permitted expiration.
+	ExpireTime           *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *GetNotificationChannelVerificationCodeResponse) Reset() {
+	*m = GetNotificationChannelVerificationCodeResponse{}
+}
+func (m *GetNotificationChannelVerificationCodeResponse) String() string {
+	return proto.CompactTextString(m)
+}
+func (*GetNotificationChannelVerificationCodeResponse) ProtoMessage() {}
+func (*GetNotificationChannelVerificationCodeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{11}
+}
+func (m *GetNotificationChannelVerificationCodeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Unmarshal(m, b)
+}
+func (m *GetNotificationChannelVerificationCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetNotificationChannelVerificationCodeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Merge(dst, src)
+}
+func (m *GetNotificationChannelVerificationCodeResponse) XXX_Size() int {
+	return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Size(m)
+}
+func (m *GetNotificationChannelVerificationCodeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetNotificationChannelVerificationCodeResponse proto.InternalMessageInfo
+
+func (m *GetNotificationChannelVerificationCodeResponse) GetCode() string {
+	if m != nil {
+		return m.Code
+	}
+	return ""
+}
+
+func (m *GetNotificationChannelVerificationCodeResponse) GetExpireTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.ExpireTime
+	}
+	return nil
+}
+
+// The `VerifyNotificationChannel` request.
+type VerifyNotificationChannelRequest struct {
+	// The notification channel to verify.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The verification code that was delivered to the channel as
+	// a result of invoking the `SendNotificationChannelVerificationCode` API
+	// method or that was retrieved from a verified channel via
+	// `GetNotificationChannelVerificationCode`. For example, one might have
+	// "G-123456" or "TKNZGhhd2EyN3I1MnRnMjRv" (in general, one is only
+	// guaranteed that the code is valid UTF-8; one should not
+	// make any assumptions regarding the structure or format of the code).
+	Code                 string   `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *VerifyNotificationChannelRequest) Reset()         { *m = VerifyNotificationChannelRequest{} }
+func (m *VerifyNotificationChannelRequest) String() string { return proto.CompactTextString(m) }
+func (*VerifyNotificationChannelRequest) ProtoMessage()    {}
+func (*VerifyNotificationChannelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_notification_service_5eb7c3d594392714, []int{12}
+}
+func (m *VerifyNotificationChannelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VerifyNotificationChannelRequest.Unmarshal(m, b)
+}
+func (m *VerifyNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VerifyNotificationChannelRequest.Marshal(b, m, deterministic)
+}
+func (dst *VerifyNotificationChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VerifyNotificationChannelRequest.Merge(dst, src)
+}
+func (m *VerifyNotificationChannelRequest) XXX_Size() int {
+	return xxx_messageInfo_VerifyNotificationChannelRequest.Size(m)
+}
+func (m *VerifyNotificationChannelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_VerifyNotificationChannelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VerifyNotificationChannelRequest proto.InternalMessageInfo
+
+func (m *VerifyNotificationChannelRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *VerifyNotificationChannelRequest) GetCode() string {
+	if m != nil {
+		return m.Code
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*ListNotificationChannelDescriptorsRequest)(nil), "google.monitoring.v3.ListNotificationChannelDescriptorsRequest")
+	proto.RegisterType((*ListNotificationChannelDescriptorsResponse)(nil), "google.monitoring.v3.ListNotificationChannelDescriptorsResponse")
+	proto.RegisterType((*GetNotificationChannelDescriptorRequest)(nil), "google.monitoring.v3.GetNotificationChannelDescriptorRequest")
+	proto.RegisterType((*CreateNotificationChannelRequest)(nil), "google.monitoring.v3.CreateNotificationChannelRequest")
+	proto.RegisterType((*ListNotificationChannelsRequest)(nil), "google.monitoring.v3.ListNotificationChannelsRequest")
+	proto.RegisterType((*ListNotificationChannelsResponse)(nil), "google.monitoring.v3.ListNotificationChannelsResponse")
+	proto.RegisterType((*GetNotificationChannelRequest)(nil), "google.monitoring.v3.GetNotificationChannelRequest")
+	proto.RegisterType((*UpdateNotificationChannelRequest)(nil), "google.monitoring.v3.UpdateNotificationChannelRequest")
+	proto.RegisterType((*DeleteNotificationChannelRequest)(nil), "google.monitoring.v3.DeleteNotificationChannelRequest")
+	proto.RegisterType((*SendNotificationChannelVerificationCodeRequest)(nil), "google.monitoring.v3.SendNotificationChannelVerificationCodeRequest")
+	proto.RegisterType((*GetNotificationChannelVerificationCodeRequest)(nil), "google.monitoring.v3.GetNotificationChannelVerificationCodeRequest")
+	proto.RegisterType((*GetNotificationChannelVerificationCodeResponse)(nil), "google.monitoring.v3.GetNotificationChannelVerificationCodeResponse")
+	proto.RegisterType((*VerifyNotificationChannelRequest)(nil), "google.monitoring.v3.VerifyNotificationChannelRequest")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// NotificationChannelServiceClient is the client API for NotificationChannelService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type NotificationChannelServiceClient interface {
+	// Lists the descriptors for supported channel types. The use of descriptors
+	// makes it possible for new channel types to be dynamically added.
+	ListNotificationChannelDescriptors(ctx context.Context, in *ListNotificationChannelDescriptorsRequest, opts ...grpc.CallOption) (*ListNotificationChannelDescriptorsResponse, error)
+	// Gets a single channel descriptor. The descriptor indicates which fields
+	// are expected / permitted for a notification channel of the given type.
+	GetNotificationChannelDescriptor(ctx context.Context, in *GetNotificationChannelDescriptorRequest, opts ...grpc.CallOption) (*NotificationChannelDescriptor, error)
+	// Lists the notification channels that have been created for the project.
+	ListNotificationChannels(ctx context.Context, in *ListNotificationChannelsRequest, opts ...grpc.CallOption) (*ListNotificationChannelsResponse, error)
+	// Gets a single notification channel. The channel includes the relevant
+	// configuration details with which the channel was created. However, the
+	// response may truncate or omit passwords, API keys, or other private key
+	// matter and thus the response may not be 100% identical to the information
+	// that was supplied in the call to the create method.
+	GetNotificationChannel(ctx context.Context, in *GetNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error)
+	// Creates a new notification channel, representing a single notification
+	// endpoint such as an email address, SMS number, or pagerduty service.
+	CreateNotificationChannel(ctx context.Context, in *CreateNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error)
+	// Updates a notification channel. Fields not specified in the field mask
+	// remain unchanged.
+	UpdateNotificationChannel(ctx context.Context, in *UpdateNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error)
+	// Deletes a notification channel.
+	DeleteNotificationChannel(ctx context.Context, in *DeleteNotificationChannelRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Causes a verification code to be delivered to the channel. The code
+	// can then be supplied in `VerifyNotificationChannel` to verify the channel.
+	SendNotificationChannelVerificationCode(ctx context.Context, in *SendNotificationChannelVerificationCodeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Requests a verification code for an already verified channel that can then
+	// be used in a call to VerifyNotificationChannel() on a different channel
+	// with an equivalent identity in the same or in a different project. This
+	// makes it possible to copy a channel between projects without requiring
+	// manual reverification of the channel. If the channel is not in the
+	// verified state, this method will fail (in other words, this may only be
+	// used if the SendNotificationChannelVerificationCode and
+	// VerifyNotificationChannel paths have already been used to put the given
+	// channel into the verified state).
+	//
+	// There is no guarantee that the verification codes returned by this method
+	// will be of a similar structure or form as the ones that are delivered
+	// to the channel via SendNotificationChannelVerificationCode; while
+	// VerifyNotificationChannel() will recognize both the codes delivered via
+	// SendNotificationChannelVerificationCode() and returned from
+	// GetNotificationChannelVerificationCode(), it is typically the case that
+	// the verification codes delivered via
+	// SendNotificationChannelVerificationCode() will be shorter and also
+	// have a shorter expiration (e.g. codes such as "G-123456") whereas
+	// GetVerificationCode() will typically return a much longer, websafe base
+	// 64 encoded string that has a longer expiration time.
+	GetNotificationChannelVerificationCode(ctx context.Context, in *GetNotificationChannelVerificationCodeRequest, opts ...grpc.CallOption) (*GetNotificationChannelVerificationCodeResponse, error)
+	// Verifies a `NotificationChannel` by proving receipt of the code
+	// delivered to the channel as a result of calling
+	// `SendNotificationChannelVerificationCode`.
+	VerifyNotificationChannel(ctx context.Context, in *VerifyNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error)
+}
+
+type notificationChannelServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewNotificationChannelServiceClient(cc *grpc.ClientConn) NotificationChannelServiceClient {
+	return &notificationChannelServiceClient{cc}
+}
+
+func (c *notificationChannelServiceClient) ListNotificationChannelDescriptors(ctx context.Context, in *ListNotificationChannelDescriptorsRequest, opts ...grpc.CallOption) (*ListNotificationChannelDescriptorsResponse, error) {
+	out := new(ListNotificationChannelDescriptorsResponse)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/ListNotificationChannelDescriptors", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) GetNotificationChannelDescriptor(ctx context.Context, in *GetNotificationChannelDescriptorRequest, opts ...grpc.CallOption) (*NotificationChannelDescriptor, error) {
+	out := new(NotificationChannelDescriptor)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelDescriptor", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) ListNotificationChannels(ctx context.Context, in *ListNotificationChannelsRequest, opts ...grpc.CallOption) (*ListNotificationChannelsResponse, error) {
+	out := new(ListNotificationChannelsResponse)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/ListNotificationChannels", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) GetNotificationChannel(ctx context.Context, in *GetNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error) {
+	out := new(NotificationChannel)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/GetNotificationChannel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) CreateNotificationChannel(ctx context.Context, in *CreateNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error) {
+	out := new(NotificationChannel)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/CreateNotificationChannel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) UpdateNotificationChannel(ctx context.Context, in *UpdateNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error) {
+	out := new(NotificationChannel)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/UpdateNotificationChannel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) DeleteNotificationChannel(ctx context.Context, in *DeleteNotificationChannelRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/DeleteNotificationChannel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) SendNotificationChannelVerificationCode(ctx context.Context, in *SendNotificationChannelVerificationCodeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/SendNotificationChannelVerificationCode", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) GetNotificationChannelVerificationCode(ctx context.Context, in *GetNotificationChannelVerificationCodeRequest, opts ...grpc.CallOption) (*GetNotificationChannelVerificationCodeResponse, error) {
+	out := new(GetNotificationChannelVerificationCodeResponse)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelVerificationCode", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *notificationChannelServiceClient) VerifyNotificationChannel(ctx context.Context, in *VerifyNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error) {
+	out := new(NotificationChannel)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/VerifyNotificationChannel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// NotificationChannelServiceServer is the server API for NotificationChannelService service.
+type NotificationChannelServiceServer interface {
+	// Lists the descriptors for supported channel types. The use of descriptors
+	// makes it possible for new channel types to be dynamically added.
+	ListNotificationChannelDescriptors(context.Context, *ListNotificationChannelDescriptorsRequest) (*ListNotificationChannelDescriptorsResponse, error)
+	// Gets a single channel descriptor. The descriptor indicates which fields
+	// are expected / permitted for a notification channel of the given type.
+	GetNotificationChannelDescriptor(context.Context, *GetNotificationChannelDescriptorRequest) (*NotificationChannelDescriptor, error)
+	// Lists the notification channels that have been created for the project.
+	ListNotificationChannels(context.Context, *ListNotificationChannelsRequest) (*ListNotificationChannelsResponse, error)
+	// Gets a single notification channel. The channel includes the relevant
+	// configuration details with which the channel was created. However, the
+	// response may truncate or omit passwords, API keys, or other private key
+	// matter and thus the response may not be 100% identical to the information
+	// that was supplied in the call to the create method.
+	GetNotificationChannel(context.Context, *GetNotificationChannelRequest) (*NotificationChannel, error)
+	// Creates a new notification channel, representing a single notification
+	// endpoint such as an email address, SMS number, or pagerduty service.
+	CreateNotificationChannel(context.Context, *CreateNotificationChannelRequest) (*NotificationChannel, error)
+	// Updates a notification channel. Fields not specified in the field mask
+	// remain unchanged.
+	UpdateNotificationChannel(context.Context, *UpdateNotificationChannelRequest) (*NotificationChannel, error)
+	// Deletes a notification channel.
+	DeleteNotificationChannel(context.Context, *DeleteNotificationChannelRequest) (*empty.Empty, error)
+	// Causes a verification code to be delivered to the channel. The code
+	// can then be supplied in `VerifyNotificationChannel` to verify the channel.
+	SendNotificationChannelVerificationCode(context.Context, *SendNotificationChannelVerificationCodeRequest) (*empty.Empty, error)
+	// Requests a verification code for an already verified channel that can then
+	// be used in a call to VerifyNotificationChannel() on a different channel
+	// with an equivalent identity in the same or in a different project. This
+	// makes it possible to copy a channel between projects without requiring
+	// manual reverification of the channel. If the channel is not in the
+	// verified state, this method will fail (in other words, this may only be
+	// used if the SendNotificationChannelVerificationCode and
+	// VerifyNotificationChannel paths have already been used to put the given
+	// channel into the verified state).
+	//
+	// There is no guarantee that the verification codes returned by this method
+	// will be of a similar structure or form as the ones that are delivered
+	// to the channel via SendNotificationChannelVerificationCode; while
+	// VerifyNotificationChannel() will recognize both the codes delivered via
+	// SendNotificationChannelVerificationCode() and returned from
+	// GetNotificationChannelVerificationCode(), it is typically the case that
+	// the verification codes delivered via
+	// SendNotificationChannelVerificationCode() will be shorter and also
+	// have a shorter expiration (e.g. codes such as "G-123456") whereas
+	// GetVerificationCode() will typically return a much longer, websafe base
+	// 64 encoded string that has a longer expiration time.
+	GetNotificationChannelVerificationCode(context.Context, *GetNotificationChannelVerificationCodeRequest) (*GetNotificationChannelVerificationCodeResponse, error)
+	// Verifies a `NotificationChannel` by proving receipt of the code
+	// delivered to the channel as a result of calling
+	// `SendNotificationChannelVerificationCode`.
+	VerifyNotificationChannel(context.Context, *VerifyNotificationChannelRequest) (*NotificationChannel, error)
+}
+
+func RegisterNotificationChannelServiceServer(s *grpc.Server, srv NotificationChannelServiceServer) {
+	s.RegisterService(&_NotificationChannelService_serviceDesc, srv)
+}
+
+func _NotificationChannelService_ListNotificationChannelDescriptors_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListNotificationChannelDescriptorsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).ListNotificationChannelDescriptors(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/ListNotificationChannelDescriptors",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).ListNotificationChannelDescriptors(ctx, req.(*ListNotificationChannelDescriptorsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_GetNotificationChannelDescriptor_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetNotificationChannelDescriptorRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).GetNotificationChannelDescriptor(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelDescriptor",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).GetNotificationChannelDescriptor(ctx, req.(*GetNotificationChannelDescriptorRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_ListNotificationChannels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListNotificationChannelsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).ListNotificationChannels(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/ListNotificationChannels",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).ListNotificationChannels(ctx, req.(*ListNotificationChannelsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_GetNotificationChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetNotificationChannelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).GetNotificationChannel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/GetNotificationChannel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).GetNotificationChannel(ctx, req.(*GetNotificationChannelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_CreateNotificationChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateNotificationChannelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).CreateNotificationChannel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/CreateNotificationChannel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).CreateNotificationChannel(ctx, req.(*CreateNotificationChannelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_UpdateNotificationChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateNotificationChannelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).UpdateNotificationChannel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/UpdateNotificationChannel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).UpdateNotificationChannel(ctx, req.(*UpdateNotificationChannelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_DeleteNotificationChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteNotificationChannelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).DeleteNotificationChannel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/DeleteNotificationChannel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).DeleteNotificationChannel(ctx, req.(*DeleteNotificationChannelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_SendNotificationChannelVerificationCode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SendNotificationChannelVerificationCodeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).SendNotificationChannelVerificationCode(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/SendNotificationChannelVerificationCode",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).SendNotificationChannelVerificationCode(ctx, req.(*SendNotificationChannelVerificationCodeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_GetNotificationChannelVerificationCode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetNotificationChannelVerificationCodeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).GetNotificationChannelVerificationCode(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelVerificationCode",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).GetNotificationChannelVerificationCode(ctx, req.(*GetNotificationChannelVerificationCodeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _NotificationChannelService_VerifyNotificationChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(VerifyNotificationChannelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NotificationChannelServiceServer).VerifyNotificationChannel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.monitoring.v3.NotificationChannelService/VerifyNotificationChannel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NotificationChannelServiceServer).VerifyNotificationChannel(ctx, req.(*VerifyNotificationChannelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _NotificationChannelService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.monitoring.v3.NotificationChannelService",
+	HandlerType: (*NotificationChannelServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListNotificationChannelDescriptors",
+			Handler:    _NotificationChannelService_ListNotificationChannelDescriptors_Handler,
+		},
+		{
+			MethodName: "GetNotificationChannelDescriptor",
+			Handler:    _NotificationChannelService_GetNotificationChannelDescriptor_Handler,
+		},
+		{
+			MethodName: "ListNotificationChannels",
+			Handler:    _NotificationChannelService_ListNotificationChannels_Handler,
+		},
+		{
+			MethodName: "GetNotificationChannel",
+			Handler:    _NotificationChannelService_GetNotificationChannel_Handler,
+		},
+		{
+			MethodName: "CreateNotificationChannel",
+			Handler:    _NotificationChannelService_CreateNotificationChannel_Handler,
+		},
+		{
+			MethodName: "UpdateNotificationChannel",
+			Handler:    _NotificationChannelService_UpdateNotificationChannel_Handler,
+		},
+		{
+			MethodName: "DeleteNotificationChannel",
+			Handler:    _NotificationChannelService_DeleteNotificationChannel_Handler,
+		},
+		{
+			MethodName: "SendNotificationChannelVerificationCode",
+			Handler:    _NotificationChannelService_SendNotificationChannelVerificationCode_Handler,
+		},
+		{
+			MethodName: "GetNotificationChannelVerificationCode",
+			Handler:    _NotificationChannelService_GetNotificationChannelVerificationCode_Handler,
+		},
+		{
+			MethodName: "VerifyNotificationChannel",
+			Handler:    _NotificationChannelService_VerifyNotificationChannel_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/monitoring/v3/notification_service.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/monitoring/v3/notification_service.proto", fileDescriptor_notification_service_5eb7c3d594392714)
+}
+
+var fileDescriptor_notification_service_5eb7c3d594392714 = []byte{
+	// 1011 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x41, 0x6f, 0xdc, 0x44,
+	0x14, 0xd6, 0xec, 0x26, 0x69, 0xfa, 0x22, 0x04, 0x9a, 0x86, 0xc8, 0xbb, 0xa5, 0xaa, 0xe5, 0x43,
+	0x93, 0xae, 0x8a, 0x2d, 0xad, 0x4b, 0x84, 0x52, 0x52, 0xda, 0x64, 0xdb, 0x22, 0x48, 0x51, 0xb4,
+	0x29, 0x91, 0x40, 0x11, 0x2b, 0xc7, 0x7e, 0x6b, 0x4c, 0x76, 0x67, 0x8c, 0x3d, 0x89, 0x9a, 0x56,
+	0x95, 0x0a, 0x7f, 0x01, 0xfe, 0x00, 0x12, 0xa7, 0x1e, 0x10, 0x67, 0x50, 0x39, 0x23, 0xae, 0x08,
+	0xae, 0x5c, 0xe0, 0x7f, 0x20, 0x8f, 0xbd, 0xd9, 0xcd, 0x66, 0xbc, 0x6b, 0x37, 0xdc, 0x3c, 0xf3,
+	0xde, 0xbc, 0xf7, 0xbd, 0xef, 0x7d, 0x9e, 0x67, 0x83, 0xe5, 0x73, 0xee, 0xf7, 0xd0, 0xea, 0x73,
+	0x16, 0x08, 0x1e, 0x05, 0xcc, 0xb7, 0x8e, 0x6c, 0x8b, 0x71, 0x11, 0x74, 0x03, 0xd7, 0x11, 0x01,
+	0x67, 0x9d, 0x18, 0xa3, 0xa3, 0xc0, 0x45, 0x33, 0x8c, 0xb8, 0xe0, 0x74, 0x31, 0x3d, 0x60, 0x0e,
+	0x0f, 0x98, 0x47, 0x76, 0xfd, 0xad, 0x2c, 0x8c, 0x13, 0x06, 0x96, 0xc3, 0x18, 0x17, 0xf2, 0x68,
+	0x9c, 0x9e, 0xa9, 0x2f, 0x4f, 0x4d, 0x92, 0x39, 0x5e, 0xce, 0x1c, 0xe5, 0x6a, 0xff, 0xb0, 0x6b,
+	0x61, 0x3f, 0x14, 0xc7, 0x99, 0x51, 0x1f, 0x37, 0x76, 0x03, 0xec, 0x79, 0x9d, 0xbe, 0x13, 0x1f,
+	0x64, 0x1e, 0x57, 0xc7, 0x3d, 0x44, 0xd0, 0xc7, 0x58, 0x38, 0xfd, 0x30, 0x75, 0x30, 0x9e, 0xc2,
+	0xf5, 0xad, 0x20, 0x16, 0x1f, 0x8f, 0x64, 0xde, 0xfc, 0xc2, 0x61, 0x0c, 0x7b, 0x2d, 0x8c, 0xdd,
+	0x28, 0x08, 0x05, 0x8f, 0xe2, 0x36, 0x7e, 0x75, 0x88, 0xb1, 0xa0, 0x14, 0x66, 0x98, 0xd3, 0x47,
+	0x6d, 0x46, 0x27, 0x2b, 0x17, 0xdb, 0xf2, 0x99, 0x5e, 0x86, 0x8b, 0xa1, 0xe3, 0x63, 0x27, 0x0e,
+	0x9e, 0xa0, 0x56, 0xd1, 0xc9, 0xca, 0x6c, 0x7b, 0x3e, 0xd9, 0xd8, 0x09, 0x9e, 0x20, 0xbd, 0x02,
+	0x20, 0x8d, 0x82, 0x1f, 0x20, 0xd3, 0xaa, 0xf2, 0x98, 0x74, 0x7f, 0x94, 0x6c, 0x18, 0x3f, 0x13,
+	0x68, 0x14, 0xc9, 0x1e, 0x87, 0x9c, 0xc5, 0x48, 0x3d, 0xb8, 0xe4, 0xa6, 0xd6, 0x8e, 0x37, 0x34,
+	0x6b, 0x44, 0xaf, 0xae, 0x2c, 0x34, 0x6d, 0x53, 0xd5, 0x06, 0x73, 0x62, 0xe8, 0x36, 0x75, 0xcf,
+	0x64, 0xa3, 0xd7, 0xe0, 0x75, 0x86, 0x8f, 0x45, 0x67, 0x04, 0x78, 0x45, 0x02, 0x7f, 0x2d, 0xd9,
+	0xde, 0x3e, 0x01, 0xbf, 0x0e, 0xcb, 0x0f, 0x70, 0x32, 0xf4, 0x71, 0xde, 0xaa, 0x43, 0xde, 0x8c,
+	0xef, 0x08, 0xe8, 0x9b, 0x11, 0x3a, 0x02, 0x15, 0x21, 0x26, 0x1c, 0xa4, 0x7b, 0xb0, 0x78, 0x4a,
+	0x8c, 0x59, 0x09, 0x12, 0xe4, 0x42, 0xf3, 0x7a, 0x61, 0x1a, 0xda, 0x97, 0xd8, 0xd9, 0x4d, 0xe3,
+	0x07, 0x02, 0x57, 0x73, 0x5a, 0x72, 0x46, 0x06, 0xb3, 0x23, 0xa8, 0x96, 0x60, 0xae, 0x1b, 0xf4,
+	0x04, 0x46, 0xda, 0x9c, 0xdc, 0xcd, 0x56, 0xb4, 0x06, 0xf3, 0x3c, 0xf2, 0x30, 0xea, 0xec, 0x1f,
+	0x6b, 0x17, 0xa4, 0xe5, 0x82, 0x5c, 0x6f, 0x1c, 0x9f, 0x56, 0x4e, 0x75, 0xa2, 0x72, 0x66, 0xc6,
+	0x95, 0xf3, 0x82, 0x80, 0x9e, 0x0f, 0x33, 0xd3, 0xcb, 0xe7, 0xf0, 0xa6, 0x8a, 0xa9, 0x58, 0xab,
+	0x4a, 0xc5, 0x94, 0xa0, 0x6a, 0x51, 0x41, 0x55, 0x71, 0xa5, 0xd8, 0x70, 0x45, 0xad, 0x94, 0x49,
+	0xfa, 0x78, 0x49, 0x40, 0xff, 0x24, 0xf4, 0x26, 0xeb, 0xe3, 0x16, 0x2c, 0x1c, 0x4a, 0x1f, 0xf9,
+	0xce, 0x67, 0x12, 0xa8, 0x0f, 0xea, 0x1a, 0xbc, 0xf4, 0xe6, 0xfd, 0xe4, 0x5a, 0x78, 0xe8, 0xc4,
+	0x07, 0x6d, 0x48, 0xdd, 0x93, 0xe7, 0x5c, 0x21, 0x55, 0xff, 0x17, 0x21, 0x6d, 0x81, 0xde, 0xc2,
+	0x1e, 0x96, 0x96, 0xf7, 0x22, 0xcc, 0x76, 0x79, 0xe4, 0xa6, 0xea, 0x9a, 0x6f, 0xa7, 0x0b, 0xa3,
+	0x05, 0xe6, 0x0e, 0x32, 0x4f, 0x11, 0x6b, 0x17, 0xa3, 0xe1, 0x16, 0xf7, 0x70, 0x3c, 0x36, 0x19,
+	0xe1, 0xf4, 0x39, 0x81, 0xb7, 0xd5, 0x9d, 0x28, 0x11, 0x25, 0x21, 0x1d, 0x1f, 0x87, 0x41, 0x84,
+	0x9d, 0xe4, 0x32, 0xcd, 0x25, 0xfd, 0xd1, 0xe0, 0xa6, 0x6d, 0x43, 0xea, 0x9e, 0x6c, 0x18, 0x5f,
+	0x13, 0x30, 0x8b, 0x42, 0xc8, 0x64, 0x4c, 0x61, 0xc6, 0xe5, 0xde, 0x09, 0x86, 0xe4, 0xf9, 0x7c,
+	0x18, 0x3e, 0x04, 0x5d, 0x26, 0x3b, 0x2e, 0xd0, 0x9a, 0xd1, 0xc2, 0x07, 0x40, 0x2a, 0x43, 0x20,
+	0xcd, 0x5f, 0xde, 0x80, 0xba, 0x22, 0xcc, 0x4e, 0x3a, 0x21, 0xe9, 0xbf, 0x04, 0x8c, 0xe9, 0x37,
+	0x3c, 0x7d, 0x5f, 0x2d, 0xb6, 0xc2, 0x93, 0xa9, 0x7e, 0xe7, 0xd5, 0x03, 0xa4, 0x2c, 0x1b, 0xef,
+	0x7d, 0xf3, 0xc7, 0x3f, 0xdf, 0x56, 0x56, 0xe9, 0xcd, 0x64, 0x10, 0x3f, 0x4d, 0xea, 0x5d, 0x0f,
+	0x23, 0xfe, 0x25, 0xba, 0x22, 0xb6, 0x1a, 0xcf, 0x2c, 0x36, 0xb9, 0x80, 0xbf, 0x08, 0xe8, 0xd3,
+	0xa6, 0x01, 0x5d, 0x57, 0x83, 0x2c, 0x38, 0x45, 0xea, 0xaf, 0x32, 0xe1, 0x8c, 0xdb, 0xb2, 0xac,
+	0x77, 0xe9, 0xaa, 0xaa, 0xac, 0x29, 0x55, 0x59, 0x8d, 0x67, 0xf4, 0x25, 0x01, 0x2d, 0xef, 0xa2,
+	0xa5, 0xef, 0x94, 0x62, 0xfd, 0xa4, 0x59, 0xab, 0x65, 0x8f, 0x65, 0x2d, 0x6a, 0xca, 0x5a, 0x6e,
+	0xd0, 0x46, 0xe1, 0x16, 0xc5, 0xf4, 0x47, 0x02, 0x4b, 0x6a, 0x82, 0xa9, 0x5d, 0xa6, 0x1d, 0x03,
+	0xec, 0xc5, 0xaf, 0x45, 0xe3, 0xa6, 0x84, 0x6b, 0xd2, 0x1b, 0x45, 0xa9, 0x97, 0x84, 0xff, 0x46,
+	0xa0, 0x96, 0xfb, 0x5d, 0x40, 0x73, 0xa8, 0x9b, 0xf6, 0x21, 0x51, 0x06, 0xf6, 0x07, 0x12, 0xf6,
+	0x86, 0x51, 0x82, 0xe5, 0x35, 0xe5, 0x20, 0xa1, 0x7f, 0x13, 0xa8, 0xe5, 0x8e, 0xb0, 0xbc, 0x52,
+	0xa6, 0xcd, 0xbc, 0x32, 0xa5, 0x74, 0x64, 0x29, 0x9f, 0x36, 0xef, 0xa6, 0xa5, 0x28, 0x30, 0x9a,
+	0x05, 0xdb, 0x92, 0x53, 0xe1, 0xf7, 0x04, 0x6a, 0xb9, 0x53, 0x2e, 0xaf, 0xc2, 0x69, 0x63, 0xb1,
+	0xbe, 0x74, 0xe6, 0x1e, 0xbf, 0x97, 0x7c, 0xf4, 0x0f, 0x04, 0xd5, 0x28, 0x27, 0xa8, 0x3f, 0x09,
+	0x2c, 0x17, 0x9c, 0x9d, 0xb4, 0xa5, 0x46, 0x5c, 0x6e, 0xf4, 0xe6, 0xe2, 0xdf, 0x92, 0xf8, 0xef,
+	0x1b, 0x77, 0xcb, 0xe0, 0x5f, 0x8b, 0x91, 0x79, 0xe3, 0x99, 0xd6, 0x48, 0x83, 0x3e, 0xaf, 0xc0,
+	0xb5, 0x62, 0x93, 0x94, 0x6e, 0x96, 0x79, 0xd3, 0xf3, 0xaa, 0x6a, 0x9d, 0x2f, 0x48, 0x76, 0x87,
+	0x7d, 0x24, 0x39, 0xb8, 0x67, 0xdc, 0x29, 0xc5, 0x81, 0x8f, 0x42, 0x45, 0xc1, 0xaf, 0x04, 0x6a,
+	0xb9, 0x93, 0x3c, 0x4f, 0x7e, 0xd3, 0x46, 0x7f, 0x99, 0x17, 0x2c, 0x9b, 0x2e, 0x86, 0x5d, 0xaa,
+	0x9a, 0x23, 0x89, 0x60, 0x8d, 0x34, 0x36, 0x7e, 0x22, 0xa0, 0xb9, 0xbc, 0xaf, 0x4c, 0xb8, 0xa1,
+	0x8d, 0x66, 0xcc, 0x3e, 0x28, 0xb6, 0x13, 0x45, 0x6d, 0x93, 0xcf, 0x6e, 0x67, 0x27, 0x7c, 0xde,
+	0x73, 0x98, 0x6f, 0xf2, 0xc8, 0xb7, 0x7c, 0x64, 0x52, 0x6f, 0xd9, 0xff, 0xbb, 0x13, 0x06, 0xf1,
+	0xe9, 0xdf, 0xeb, 0x5b, 0xc3, 0xd5, 0x8b, 0x4a, 0xfd, 0x41, 0x1a, 0x60, 0xb3, 0xc7, 0x0f, 0x3d,
+	0xf3, 0xe1, 0x30, 0xf1, 0xae, 0xfd, 0xfb, 0xc0, 0xb8, 0x27, 0x8d, 0x7b, 0x43, 0xe3, 0xde, 0xae,
+	0xbd, 0x3f, 0x27, 0x93, 0xd8, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xf3, 0x96, 0xf5, 0x27,
+	0x10, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/span_context.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/span_context.pb.go
new file mode 100644
index 00000000..db672756
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/span_context.pb.go
@@ -0,0 +1,96 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/monitoring/v3/span_context.proto
+
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The context of a span, attached to google.api.Distribution.Exemplars
+// in google.api.Distribution values during aggregation.
+//
+// It contains the name of a span with format:
+//     projects/[PROJECT_ID]/traces/[TRACE_ID]/spans/[SPAN_ID]
+type SpanContext struct {
+	// The resource name of the span in the following format:
+	//
+	//     projects/[PROJECT_ID]/traces/[TRACE_ID]/spans/[SPAN_ID]
+	//
+	// [TRACE_ID] is a unique identifier for a trace within a project;
+	// it is a 32-character hexadecimal encoding of a 16-byte array.
+	//
+	// [SPAN_ID] is a unique identifier for a span within a trace; it
+	// is a 16-character hexadecimal encoding of an 8-byte array.
+	SpanName             string   `protobuf:"bytes,1,opt,name=span_name,json=spanName,proto3" json:"span_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SpanContext) Reset()         { *m = SpanContext{} }
+func (m *SpanContext) String() string { return proto.CompactTextString(m) }
+func (*SpanContext) ProtoMessage()    {}
+func (*SpanContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_span_context_3190ff95558fbb1a, []int{0}
+}
+func (m *SpanContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SpanContext.Unmarshal(m, b)
+}
+func (m *SpanContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SpanContext.Marshal(b, m, deterministic)
+}
+func (dst *SpanContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpanContext.Merge(dst, src)
+}
+func (m *SpanContext) XXX_Size() int {
+	return xxx_messageInfo_SpanContext.Size(m)
+}
+func (m *SpanContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpanContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpanContext proto.InternalMessageInfo
+
+func (m *SpanContext) GetSpanName() string {
+	if m != nil {
+		return m.SpanName
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*SpanContext)(nil), "google.monitoring.v3.SpanContext")
+}
+
+func init() {
+	proto.RegisterFile("google/monitoring/v3/span_context.proto", fileDescriptor_span_context_3190ff95558fbb1a)
+}
+
+var fileDescriptor_span_context_3190ff95558fbb1a = []byte{
+	// 197 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4f, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0xcf, 0xcd, 0xcf, 0xcb, 0x2c, 0xc9, 0x2f, 0xca, 0xcc, 0x4b, 0xd7, 0x2f, 0x33,
+	0xd6, 0x2f, 0x2e, 0x48, 0xcc, 0x8b, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xad, 0x28, 0xd1, 0x2b, 0x28,
+	0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0x28, 0xd4, 0x43, 0x28, 0xd4, 0x2b, 0x33, 0x56, 0xd2, 0xe2,
+	0xe2, 0x0e, 0x2e, 0x48, 0xcc, 0x73, 0x86, 0x28, 0x15, 0x92, 0xe6, 0xe2, 0x04, 0x6b, 0xcd, 0x4b,
+	0xcc, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0xe2, 0x00, 0x09, 0xf8, 0x25, 0xe6, 0xa6,
+	0x3a, 0xad, 0x60, 0xe4, 0x92, 0x48, 0xce, 0xcf, 0xd5, 0xc3, 0x66, 0x90, 0x93, 0x00, 0x92, 0x31,
+	0x01, 0x20, 0x0b, 0x03, 0x18, 0xa3, 0xec, 0xa0, 0x2a, 0xd3, 0xf3, 0x73, 0x12, 0xf3, 0xd2, 0xf5,
+	0xf2, 0x8b, 0xd2, 0xf5, 0xd3, 0x53, 0xf3, 0xc0, 0xce, 0xd1, 0x87, 0x48, 0x25, 0x16, 0x64, 0x16,
+	0xa3, 0x3a, 0xdd, 0x1a, 0xc1, 0x5b, 0xc5, 0x24, 0xe5, 0x0e, 0x31, 0xc0, 0x39, 0x27, 0xbf, 0x34,
+	0x45, 0xcf, 0x17, 0x61, 0x61, 0x98, 0xf1, 0x29, 0x98, 0x64, 0x0c, 0x58, 0x32, 0x06, 0x21, 0x19,
+	0x13, 0x66, 0x9c, 0xc4, 0x06, 0xb6, 0xc4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x19, 0x01,
+	0xcb, 0x1e, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime.pb.go
index 042cddd0..3878b9c4 100644
--- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/uptime.proto
 
-package monitoring
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_api4 "google.golang.org/genproto/googleapis/api/monitoredres"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The regions from which an uptime check can be run.
 type UptimeCheckRegion int32
 
@@ -51,19 +57,24 @@ var UptimeCheckRegion_value = map[string]int32{
 func (x UptimeCheckRegion) String() string {
 	return proto.EnumName(UptimeCheckRegion_name, int32(x))
 }
-func (UptimeCheckRegion) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+func (UptimeCheckRegion) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{0}
+}
 
 // The supported resource types that can be used as values of
-// group_resource.resource_type. gae_app and uptime_url are not allowed
-// because group checks on App Engine modules and URLs are not allowed.
+// `group_resource.resource_type`.
+// `INSTANCE` includes `gce_instance` and `aws_ec2_instance` resource types.
+// The resource types `gae_app` and `uptime_url` are not valid here because
+// group checks on App Engine modules and URLs are not allowed.
 type GroupResourceType int32
 
 const (
 	// Default value (not valid).
 	GroupResourceType_RESOURCE_TYPE_UNSPECIFIED GroupResourceType = 0
-	// A group of instances (could be either GCE or AWS_EC2).
+	// A group of instances from Google Cloud Platform (GCP) or
+	// Amazon Web Services (AWS).
 	GroupResourceType_INSTANCE GroupResourceType = 1
-	// A group of AWS load balancers.
+	// A group of Amazon ELB load balancers.
 	GroupResourceType_AWS_ELB_LOAD_BALANCER GroupResourceType = 2
 )
 
@@ -81,7 +92,87 @@ var GroupResourceType_value = map[string]int32{
 func (x GroupResourceType) String() string {
 	return proto.EnumName(GroupResourceType_name, int32(x))
 }
-func (GroupResourceType) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
+func (GroupResourceType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{1}
+}
+
+// Nimbus InternalCheckers.
+type InternalChecker struct {
+	// The GCP project ID. Not necessarily the same as the project_id for the
+	// config.
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// The internal network to perform this uptime check on.
+	Network string `protobuf:"bytes,2,opt,name=network,proto3" json:"network,omitempty"`
+	// The GCP zone the uptime check should egress from. Only respected for
+	// internal uptime checks, where internal_network is specified.
+	GcpZone string `protobuf:"bytes,3,opt,name=gcp_zone,json=gcpZone,proto3" json:"gcp_zone,omitempty"`
+	// The checker ID.
+	CheckerId string `protobuf:"bytes,4,opt,name=checker_id,json=checkerId,proto3" json:"checker_id,omitempty"`
+	// The checker's human-readable name.
+	DisplayName          string   `protobuf:"bytes,5,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InternalChecker) Reset()         { *m = InternalChecker{} }
+func (m *InternalChecker) String() string { return proto.CompactTextString(m) }
+func (*InternalChecker) ProtoMessage()    {}
+func (*InternalChecker) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{0}
+}
+func (m *InternalChecker) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InternalChecker.Unmarshal(m, b)
+}
+func (m *InternalChecker) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InternalChecker.Marshal(b, m, deterministic)
+}
+func (dst *InternalChecker) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InternalChecker.Merge(dst, src)
+}
+func (m *InternalChecker) XXX_Size() int {
+	return xxx_messageInfo_InternalChecker.Size(m)
+}
+func (m *InternalChecker) XXX_DiscardUnknown() {
+	xxx_messageInfo_InternalChecker.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InternalChecker proto.InternalMessageInfo
+
+func (m *InternalChecker) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+func (m *InternalChecker) GetNetwork() string {
+	if m != nil {
+		return m.Network
+	}
+	return ""
+}
+
+func (m *InternalChecker) GetGcpZone() string {
+	if m != nil {
+		return m.GcpZone
+	}
+	return ""
+}
+
+func (m *InternalChecker) GetCheckerId() string {
+	if m != nil {
+		return m.CheckerId
+	}
+	return ""
+}
+
+func (m *InternalChecker) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
 
 // This message configures which resources and services to monitor for
 // availability.
@@ -94,11 +185,11 @@ type UptimeCheckConfig struct {
 	// This field should be omitted when creating the uptime check configuration;
 	// on create, the resource name is assigned by the server and included in the
 	// response.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A human-friendly name for the uptime check configuration. The display name
 	// should be unique within a Stackdriver Account in order to make it easier
 	// to identify; however, uniqueness is not enforced. Required.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// The resource the check is checking. Required.
 	//
 	// Types that are valid to be assigned to Resource:
@@ -111,70 +202,60 @@ type UptimeCheckConfig struct {
 	//	*UptimeCheckConfig_HttpCheck_
 	//	*UptimeCheckConfig_TcpCheck_
 	CheckRequestType isUptimeCheckConfig_CheckRequestType `protobuf_oneof:"check_request_type"`
-	// How often the uptime check is performed.
-	// Currently, only 1, 5, 10, and 15 minutes are supported. Required.
-	Period *google_protobuf3.Duration `protobuf:"bytes,7,opt,name=period" json:"period,omitempty"`
+	// How often, in seconds, the uptime check is performed.
+	// Currently, the only supported values are `60s` (1 minute), `300s`
+	// (5 minutes), `600s` (10 minutes), and `900s` (15 minutes). Optional,
+	// defaults to `300s`.
+	Period *duration.Duration `protobuf:"bytes,7,opt,name=period,proto3" json:"period,omitempty"`
 	// The maximum amount of time to wait for the request to complete (must be
 	// between 1 and 60 seconds). Required.
-	Timeout *google_protobuf3.Duration `protobuf:"bytes,8,opt,name=timeout" json:"timeout,omitempty"`
+	Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// The expected content on the page the check is run against.
 	// Currently, only the first entry in the list is supported, and other entries
 	// will be ignored. The server will look for an exact match of the string in
 	// the page response's content. This field is optional and should only be
 	// specified if a content match is required.
-	ContentMatchers []*UptimeCheckConfig_ContentMatcher `protobuf:"bytes,9,rep,name=content_matchers,json=contentMatchers" json:"content_matchers,omitempty"`
+	ContentMatchers []*UptimeCheckConfig_ContentMatcher `protobuf:"bytes,9,rep,name=content_matchers,json=contentMatchers,proto3" json:"content_matchers,omitempty"`
 	// The list of regions from which the check will be run.
 	// If this field is specified, enough regions to include a minimum of
 	// 3 locations must be provided, or an error message is returned.
 	// Not specifying this field will result in uptime checks running from all
 	// regions.
-	SelectedRegions []UptimeCheckRegion `protobuf:"varint,10,rep,packed,name=selected_regions,json=selectedRegions,enum=google.monitoring.v3.UptimeCheckRegion" json:"selected_regions,omitempty"`
-	// The internal checkers that this check will egress from.
-	InternalCheckers []*UptimeCheckConfig_InternalChecker `protobuf:"bytes,14,rep,name=internal_checkers,json=internalCheckers" json:"internal_checkers,omitempty"`
+	SelectedRegions []UptimeCheckRegion `protobuf:"varint,10,rep,packed,name=selected_regions,json=selectedRegions,proto3,enum=google.monitoring.v3.UptimeCheckRegion" json:"selected_regions,omitempty"`
+	// Denotes whether this is a check that egresses from InternalCheckers.
+	IsInternal bool `protobuf:"varint,15,opt,name=is_internal,json=isInternal,proto3" json:"is_internal,omitempty"`
+	// The internal checkers that this check will egress from. If `is_internal` is
+	// true and this list is empty, the check will egress from all
+	// InternalCheckers configured for the project that owns this CheckConfig.
+	InternalCheckers     []*InternalChecker `protobuf:"bytes,14,rep,name=internal_checkers,json=internalCheckers,proto3" json:"internal_checkers,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *UptimeCheckConfig) Reset()                    { *m = UptimeCheckConfig{} }
-func (m *UptimeCheckConfig) String() string            { return proto.CompactTextString(m) }
-func (*UptimeCheckConfig) ProtoMessage()               {}
-func (*UptimeCheckConfig) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
-
-type isUptimeCheckConfig_Resource interface {
-	isUptimeCheckConfig_Resource()
+func (m *UptimeCheckConfig) Reset()         { *m = UptimeCheckConfig{} }
+func (m *UptimeCheckConfig) String() string { return proto.CompactTextString(m) }
+func (*UptimeCheckConfig) ProtoMessage()    {}
+func (*UptimeCheckConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{1}
 }
-type isUptimeCheckConfig_CheckRequestType interface {
-	isUptimeCheckConfig_CheckRequestType()
+func (m *UptimeCheckConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UptimeCheckConfig.Unmarshal(m, b)
 }
-
-type UptimeCheckConfig_MonitoredResource struct {
-	MonitoredResource *google_api4.MonitoredResource `protobuf:"bytes,3,opt,name=monitored_resource,json=monitoredResource,oneof"`
+func (m *UptimeCheckConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UptimeCheckConfig.Marshal(b, m, deterministic)
 }
-type UptimeCheckConfig_ResourceGroup_ struct {
-	ResourceGroup *UptimeCheckConfig_ResourceGroup `protobuf:"bytes,4,opt,name=resource_group,json=resourceGroup,oneof"`
+func (dst *UptimeCheckConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig.Merge(dst, src)
 }
-type UptimeCheckConfig_HttpCheck_ struct {
-	HttpCheck *UptimeCheckConfig_HttpCheck `protobuf:"bytes,5,opt,name=http_check,json=httpCheck,oneof"`
+func (m *UptimeCheckConfig) XXX_Size() int {
+	return xxx_messageInfo_UptimeCheckConfig.Size(m)
 }
-type UptimeCheckConfig_TcpCheck_ struct {
-	TcpCheck *UptimeCheckConfig_TcpCheck `protobuf:"bytes,6,opt,name=tcp_check,json=tcpCheck,oneof"`
+func (m *UptimeCheckConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_UptimeCheckConfig.DiscardUnknown(m)
 }
 
-func (*UptimeCheckConfig_MonitoredResource) isUptimeCheckConfig_Resource()  {}
-func (*UptimeCheckConfig_ResourceGroup_) isUptimeCheckConfig_Resource()     {}
-func (*UptimeCheckConfig_HttpCheck_) isUptimeCheckConfig_CheckRequestType() {}
-func (*UptimeCheckConfig_TcpCheck_) isUptimeCheckConfig_CheckRequestType()  {}
-
-func (m *UptimeCheckConfig) GetResource() isUptimeCheckConfig_Resource {
-	if m != nil {
-		return m.Resource
-	}
-	return nil
-}
-func (m *UptimeCheckConfig) GetCheckRequestType() isUptimeCheckConfig_CheckRequestType {
-	if m != nil {
-		return m.CheckRequestType
-	}
-	return nil
-}
+var xxx_messageInfo_UptimeCheckConfig proto.InternalMessageInfo
 
 func (m *UptimeCheckConfig) GetName() string {
 	if m != nil {
@@ -190,7 +271,30 @@ func (m *UptimeCheckConfig) GetDisplayName() string {
 	return ""
 }
 
-func (m *UptimeCheckConfig) GetMonitoredResource() *google_api4.MonitoredResource {
+type isUptimeCheckConfig_Resource interface {
+	isUptimeCheckConfig_Resource()
+}
+
+type UptimeCheckConfig_MonitoredResource struct {
+	MonitoredResource *monitoredres.MonitoredResource `protobuf:"bytes,3,opt,name=monitored_resource,json=monitoredResource,proto3,oneof"`
+}
+
+type UptimeCheckConfig_ResourceGroup_ struct {
+	ResourceGroup *UptimeCheckConfig_ResourceGroup `protobuf:"bytes,4,opt,name=resource_group,json=resourceGroup,proto3,oneof"`
+}
+
+func (*UptimeCheckConfig_MonitoredResource) isUptimeCheckConfig_Resource() {}
+
+func (*UptimeCheckConfig_ResourceGroup_) isUptimeCheckConfig_Resource() {}
+
+func (m *UptimeCheckConfig) GetResource() isUptimeCheckConfig_Resource {
+	if m != nil {
+		return m.Resource
+	}
+	return nil
+}
+
+func (m *UptimeCheckConfig) GetMonitoredResource() *monitoredres.MonitoredResource {
 	if x, ok := m.GetResource().(*UptimeCheckConfig_MonitoredResource); ok {
 		return x.MonitoredResource
 	}
@@ -204,6 +308,29 @@ func (m *UptimeCheckConfig) GetResourceGroup() *UptimeCheckConfig_ResourceGroup
 	return nil
 }
 
+type isUptimeCheckConfig_CheckRequestType interface {
+	isUptimeCheckConfig_CheckRequestType()
+}
+
+type UptimeCheckConfig_HttpCheck_ struct {
+	HttpCheck *UptimeCheckConfig_HttpCheck `protobuf:"bytes,5,opt,name=http_check,json=httpCheck,proto3,oneof"`
+}
+
+type UptimeCheckConfig_TcpCheck_ struct {
+	TcpCheck *UptimeCheckConfig_TcpCheck `protobuf:"bytes,6,opt,name=tcp_check,json=tcpCheck,proto3,oneof"`
+}
+
+func (*UptimeCheckConfig_HttpCheck_) isUptimeCheckConfig_CheckRequestType() {}
+
+func (*UptimeCheckConfig_TcpCheck_) isUptimeCheckConfig_CheckRequestType() {}
+
+func (m *UptimeCheckConfig) GetCheckRequestType() isUptimeCheckConfig_CheckRequestType {
+	if m != nil {
+		return m.CheckRequestType
+	}
+	return nil
+}
+
 func (m *UptimeCheckConfig) GetHttpCheck() *UptimeCheckConfig_HttpCheck {
 	if x, ok := m.GetCheckRequestType().(*UptimeCheckConfig_HttpCheck_); ok {
 		return x.HttpCheck
@@ -218,14 +345,14 @@ func (m *UptimeCheckConfig) GetTcpCheck() *UptimeCheckConfig_TcpCheck {
 	return nil
 }
 
-func (m *UptimeCheckConfig) GetPeriod() *google_protobuf3.Duration {
+func (m *UptimeCheckConfig) GetPeriod() *duration.Duration {
 	if m != nil {
 		return m.Period
 	}
 	return nil
 }
 
-func (m *UptimeCheckConfig) GetTimeout() *google_protobuf3.Duration {
+func (m *UptimeCheckConfig) GetTimeout() *duration.Duration {
 	if m != nil {
 		return m.Timeout
 	}
@@ -246,7 +373,14 @@ func (m *UptimeCheckConfig) GetSelectedRegions() []UptimeCheckRegion {
 	return nil
 }
 
-func (m *UptimeCheckConfig) GetInternalCheckers() []*UptimeCheckConfig_InternalChecker {
+func (m *UptimeCheckConfig) GetIsInternal() bool {
+	if m != nil {
+		return m.IsInternal
+	}
+	return false
+}
+
+func (m *UptimeCheckConfig) GetInternalCheckers() []*InternalChecker {
 	if m != nil {
 		return m.InternalCheckers
 	}
@@ -307,7 +441,7 @@ func _UptimeCheckConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *pr
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_api4.MonitoredResource)
+		msg := new(monitoredres.MonitoredResource)
 		err := b.DecodeMessage(msg)
 		m.Resource = &UptimeCheckConfig_MonitoredResource{msg}
 		return true, err
@@ -346,12 +480,12 @@ func _UptimeCheckConfig_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Resource.(type) {
 	case *UptimeCheckConfig_MonitoredResource:
 		s := proto.Size(x.MonitoredResource)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *UptimeCheckConfig_ResourceGroup_:
 		s := proto.Size(x.ResourceGroup)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -362,12 +496,12 @@ func _UptimeCheckConfig_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.CheckRequestType.(type) {
 	case *UptimeCheckConfig_HttpCheck_:
 		s := proto.Size(x.HttpCheck)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *UptimeCheckConfig_TcpCheck_:
 		s := proto.Size(x.TcpCheck)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -382,18 +516,38 @@ func _UptimeCheckConfig_OneofSizer(msg proto.Message) (n int) {
 type UptimeCheckConfig_ResourceGroup struct {
 	// The group of resources being monitored. Should be only the
 	// group_id, not projects/<project_id>/groups/<group_id>.
-	GroupId string `protobuf:"bytes,1,opt,name=group_id,json=groupId" json:"group_id,omitempty"`
+	GroupId string `protobuf:"bytes,1,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
 	// The resource type of the group members.
-	ResourceType GroupResourceType `protobuf:"varint,2,opt,name=resource_type,json=resourceType,enum=google.monitoring.v3.GroupResourceType" json:"resource_type,omitempty"`
+	ResourceType         GroupResourceType `protobuf:"varint,2,opt,name=resource_type,json=resourceType,proto3,enum=google.monitoring.v3.GroupResourceType" json:"resource_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *UptimeCheckConfig_ResourceGroup) Reset()         { *m = UptimeCheckConfig_ResourceGroup{} }
 func (m *UptimeCheckConfig_ResourceGroup) String() string { return proto.CompactTextString(m) }
 func (*UptimeCheckConfig_ResourceGroup) ProtoMessage()    {}
 func (*UptimeCheckConfig_ResourceGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor5, []int{0, 0}
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{1, 0}
+}
+func (m *UptimeCheckConfig_ResourceGroup) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Unmarshal(m, b)
+}
+func (m *UptimeCheckConfig_ResourceGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Marshal(b, m, deterministic)
+}
+func (dst *UptimeCheckConfig_ResourceGroup) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Merge(dst, src)
+}
+func (m *UptimeCheckConfig_ResourceGroup) XXX_Size() int {
+	return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Size(m)
+}
+func (m *UptimeCheckConfig_ResourceGroup) XXX_DiscardUnknown() {
+	xxx_messageInfo_UptimeCheckConfig_ResourceGroup.DiscardUnknown(m)
 }
 
+var xxx_messageInfo_UptimeCheckConfig_ResourceGroup proto.InternalMessageInfo
+
 func (m *UptimeCheckConfig_ResourceGroup) GetGroupId() string {
 	if m != nil {
 		return m.GroupId
@@ -411,25 +565,25 @@ func (m *UptimeCheckConfig_ResourceGroup) GetResourceType() GroupResourceType {
 // Information involved in an HTTP/HTTPS uptime check request.
 type UptimeCheckConfig_HttpCheck struct {
 	// If true, use HTTPS instead of HTTP to run the check.
-	UseSsl bool `protobuf:"varint,1,opt,name=use_ssl,json=useSsl" json:"use_ssl,omitempty"`
+	UseSsl bool `protobuf:"varint,1,opt,name=use_ssl,json=useSsl,proto3" json:"use_ssl,omitempty"`
 	// The path to the page to run the check against. Will be combined with the
 	// host (specified within the MonitoredResource) and port to construct the
 	// full URL. Optional (defaults to "/").
-	Path string `protobuf:"bytes,2,opt,name=path" json:"path,omitempty"`
+	Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
 	// The port to the page to run the check against. Will be combined with host
 	// (specified within the MonitoredResource) and path to construct the full
 	// URL. Optional (defaults to 80 without SSL, or 443 with SSL).
-	Port int32 `protobuf:"varint,3,opt,name=port" json:"port,omitempty"`
+	Port int32 `protobuf:"varint,3,opt,name=port,proto3" json:"port,omitempty"`
 	// The authentication information. Optional when creating an HTTP check;
 	// defaults to empty.
-	AuthInfo *UptimeCheckConfig_HttpCheck_BasicAuthentication `protobuf:"bytes,4,opt,name=auth_info,json=authInfo" json:"auth_info,omitempty"`
+	AuthInfo *UptimeCheckConfig_HttpCheck_BasicAuthentication `protobuf:"bytes,4,opt,name=auth_info,json=authInfo,proto3" json:"auth_info,omitempty"`
 	// Boolean specifiying whether to encrypt the header information.
 	// Encryption should be specified for any headers related to authentication
 	// that you do not wish to be seen when retrieving the configuration. The
 	// server will be responsible for encrypting the headers.
 	// On Get/List calls, if mask_headers is set to True then the headers
 	// will be obscured with ******.
-	MaskHeaders bool `protobuf:"varint,5,opt,name=mask_headers,json=maskHeaders" json:"mask_headers,omitempty"`
+	MaskHeaders bool `protobuf:"varint,5,opt,name=mask_headers,json=maskHeaders,proto3" json:"mask_headers,omitempty"`
 	// The list of headers to send as part of the uptime check request.
 	// If two headers have the same key and different values, they should
 	// be entered as a single header, with the value being a comma-separated
@@ -437,13 +591,36 @@ type UptimeCheckConfig_HttpCheck struct {
 	// https://www.w3.org/Protocols/rfc2616/rfc2616.txt (page 31).
 	// Entering two separate headers with the same key in a Create call will
 	// cause the first to be overwritten by the second.
-	Headers map[string]string `protobuf:"bytes,6,rep,name=headers" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// The maximum number of headers allowed is 100.
+	Headers              map[string]string `protobuf:"bytes,6,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *UptimeCheckConfig_HttpCheck) Reset()         { *m = UptimeCheckConfig_HttpCheck{} }
+func (m *UptimeCheckConfig_HttpCheck) String() string { return proto.CompactTextString(m) }
+func (*UptimeCheckConfig_HttpCheck) ProtoMessage()    {}
+func (*UptimeCheckConfig_HttpCheck) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{1, 1}
+}
+func (m *UptimeCheckConfig_HttpCheck) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Unmarshal(m, b)
+}
+func (m *UptimeCheckConfig_HttpCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Marshal(b, m, deterministic)
+}
+func (dst *UptimeCheckConfig_HttpCheck) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_HttpCheck.Merge(dst, src)
+}
+func (m *UptimeCheckConfig_HttpCheck) XXX_Size() int {
+	return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Size(m)
+}
+func (m *UptimeCheckConfig_HttpCheck) XXX_DiscardUnknown() {
+	xxx_messageInfo_UptimeCheckConfig_HttpCheck.DiscardUnknown(m)
 }
 
-func (m *UptimeCheckConfig_HttpCheck) Reset()                    { *m = UptimeCheckConfig_HttpCheck{} }
-func (m *UptimeCheckConfig_HttpCheck) String() string            { return proto.CompactTextString(m) }
-func (*UptimeCheckConfig_HttpCheck) ProtoMessage()               {}
-func (*UptimeCheckConfig_HttpCheck) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 1} }
+var xxx_messageInfo_UptimeCheckConfig_HttpCheck proto.InternalMessageInfo
 
 func (m *UptimeCheckConfig_HttpCheck) GetUseSsl() bool {
 	if m != nil {
@@ -492,9 +669,12 @@ func (m *UptimeCheckConfig_HttpCheck) GetHeaders() map[string]string {
 // Currently, only Basic authentication is supported in Uptime Monitoring.
 type UptimeCheckConfig_HttpCheck_BasicAuthentication struct {
 	// The username to authenticate.
-	Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
+	Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
 	// The password to authenticate.
-	Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
+	Password             string   `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) Reset() {
@@ -505,8 +685,25 @@ func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) String() string {
 }
 func (*UptimeCheckConfig_HttpCheck_BasicAuthentication) ProtoMessage() {}
 func (*UptimeCheckConfig_HttpCheck_BasicAuthentication) Descriptor() ([]byte, []int) {
-	return fileDescriptor5, []int{0, 1, 0}
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{1, 1, 0}
+}
+func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Unmarshal(m, b)
 }
+func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Marshal(b, m, deterministic)
+}
+func (dst *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Merge(dst, src)
+}
+func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Size() int {
+	return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Size(m)
+}
+func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_DiscardUnknown() {
+	xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication proto.InternalMessageInfo
 
 func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) GetUsername() string {
 	if m != nil {
@@ -527,13 +724,35 @@ type UptimeCheckConfig_TcpCheck struct {
 	// The port to the page to run the check against. Will be combined with host
 	// (specified within the MonitoredResource) to construct the full URL.
 	// Required.
-	Port int32 `protobuf:"varint,1,opt,name=port" json:"port,omitempty"`
+	Port                 int32    `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UptimeCheckConfig_TcpCheck) Reset()         { *m = UptimeCheckConfig_TcpCheck{} }
+func (m *UptimeCheckConfig_TcpCheck) String() string { return proto.CompactTextString(m) }
+func (*UptimeCheckConfig_TcpCheck) ProtoMessage()    {}
+func (*UptimeCheckConfig_TcpCheck) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{1, 2}
+}
+func (m *UptimeCheckConfig_TcpCheck) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Unmarshal(m, b)
+}
+func (m *UptimeCheckConfig_TcpCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Marshal(b, m, deterministic)
+}
+func (dst *UptimeCheckConfig_TcpCheck) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_TcpCheck.Merge(dst, src)
+}
+func (m *UptimeCheckConfig_TcpCheck) XXX_Size() int {
+	return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Size(m)
+}
+func (m *UptimeCheckConfig_TcpCheck) XXX_DiscardUnknown() {
+	xxx_messageInfo_UptimeCheckConfig_TcpCheck.DiscardUnknown(m)
 }
 
-func (m *UptimeCheckConfig_TcpCheck) Reset()                    { *m = UptimeCheckConfig_TcpCheck{} }
-func (m *UptimeCheckConfig_TcpCheck) String() string            { return proto.CompactTextString(m) }
-func (*UptimeCheckConfig_TcpCheck) ProtoMessage()               {}
-func (*UptimeCheckConfig_TcpCheck) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 2} }
+var xxx_messageInfo_UptimeCheckConfig_TcpCheck proto.InternalMessageInfo
 
 func (m *UptimeCheckConfig_TcpCheck) GetPort() int32 {
 	if m != nil {
@@ -546,77 +765,40 @@ func (m *UptimeCheckConfig_TcpCheck) GetPort() int32 {
 // content. In the future, it can be expanded to allow for regular expressions
 // and more complex matching.
 type UptimeCheckConfig_ContentMatcher struct {
-	// String content to match
-	Content string `protobuf:"bytes,1,opt,name=content" json:"content,omitempty"`
+	// String content to match (max 1024 bytes)
+	Content              string   `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *UptimeCheckConfig_ContentMatcher) Reset()         { *m = UptimeCheckConfig_ContentMatcher{} }
 func (m *UptimeCheckConfig_ContentMatcher) String() string { return proto.CompactTextString(m) }
 func (*UptimeCheckConfig_ContentMatcher) ProtoMessage()    {}
 func (*UptimeCheckConfig_ContentMatcher) Descriptor() ([]byte, []int) {
-	return fileDescriptor5, []int{0, 3}
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{1, 3}
 }
-
-func (m *UptimeCheckConfig_ContentMatcher) GetContent() string {
-	if m != nil {
-		return m.Content
-	}
-	return ""
+func (m *UptimeCheckConfig_ContentMatcher) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Unmarshal(m, b)
 }
-
-// Nimbus InternalCheckers.
-type UptimeCheckConfig_InternalChecker struct {
-	// The GCP project ID. Not necessarily the same as the project_id for the config.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// The internal network to perform this uptime check on.
-	Network string `protobuf:"bytes,2,opt,name=network" json:"network,omitempty"`
-	// The GCP zone the uptime check should egress from. Only respected for
-	// internal uptime checks, where internal_network is specified.
-	GcpZone string `protobuf:"bytes,3,opt,name=gcp_zone,json=gcpZone" json:"gcp_zone,omitempty"`
-	// The checker ID.
-	CheckerId string `protobuf:"bytes,4,opt,name=checker_id,json=checkerId" json:"checker_id,omitempty"`
-	// The checker's human-readable name.
-	DisplayName string `protobuf:"bytes,5,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+func (m *UptimeCheckConfig_ContentMatcher) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Marshal(b, m, deterministic)
 }
-
-func (m *UptimeCheckConfig_InternalChecker) Reset()         { *m = UptimeCheckConfig_InternalChecker{} }
-func (m *UptimeCheckConfig_InternalChecker) String() string { return proto.CompactTextString(m) }
-func (*UptimeCheckConfig_InternalChecker) ProtoMessage()    {}
-func (*UptimeCheckConfig_InternalChecker) Descriptor() ([]byte, []int) {
-	return fileDescriptor5, []int{0, 4}
+func (dst *UptimeCheckConfig_ContentMatcher) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Merge(dst, src)
 }
-
-func (m *UptimeCheckConfig_InternalChecker) GetProjectId() string {
-	if m != nil {
-		return m.ProjectId
-	}
-	return ""
+func (m *UptimeCheckConfig_ContentMatcher) XXX_Size() int {
+	return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Size(m)
 }
-
-func (m *UptimeCheckConfig_InternalChecker) GetNetwork() string {
-	if m != nil {
-		return m.Network
-	}
-	return ""
-}
-
-func (m *UptimeCheckConfig_InternalChecker) GetGcpZone() string {
-	if m != nil {
-		return m.GcpZone
-	}
-	return ""
+func (m *UptimeCheckConfig_ContentMatcher) XXX_DiscardUnknown() {
+	xxx_messageInfo_UptimeCheckConfig_ContentMatcher.DiscardUnknown(m)
 }
 
-func (m *UptimeCheckConfig_InternalChecker) GetCheckerId() string {
-	if m != nil {
-		return m.CheckerId
-	}
-	return ""
-}
+var xxx_messageInfo_UptimeCheckConfig_ContentMatcher proto.InternalMessageInfo
 
-func (m *UptimeCheckConfig_InternalChecker) GetDisplayName() string {
+func (m *UptimeCheckConfig_ContentMatcher) GetContent() string {
 	if m != nil {
-		return m.DisplayName
+		return m.Content
 	}
 	return ""
 }
@@ -625,23 +807,45 @@ func (m *UptimeCheckConfig_InternalChecker) GetDisplayName() string {
 // addresses where checkers in the location run from.
 type UptimeCheckIp struct {
 	// A broad region category in which the IP address is located.
-	Region UptimeCheckRegion `protobuf:"varint,1,opt,name=region,enum=google.monitoring.v3.UptimeCheckRegion" json:"region,omitempty"`
+	Region UptimeCheckRegion `protobuf:"varint,1,opt,name=region,proto3,enum=google.monitoring.v3.UptimeCheckRegion" json:"region,omitempty"`
 	// A more specific location within the region that typically encodes
 	// a particular city/town/metro (and its containing state/province or country)
 	// within the broader umbrella region category.
-	Location string `protobuf:"bytes,2,opt,name=location" json:"location,omitempty"`
+	Location string `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"`
 	// The IP address from which the uptime check originates. This is a full
 	// IP address (not an IP address range). Most IP addresses, as of this
 	// publication, are in IPv4 format; however, one should not rely on the
 	// IP addresses being in IPv4 format indefinitely and should support
 	// interpreting this field in either IPv4 or IPv6 format.
-	IpAddress string `protobuf:"bytes,3,opt,name=ip_address,json=ipAddress" json:"ip_address,omitempty"`
+	IpAddress            string   `protobuf:"bytes,3,opt,name=ip_address,json=ipAddress,proto3" json:"ip_address,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UptimeCheckIp) Reset()                    { *m = UptimeCheckIp{} }
-func (m *UptimeCheckIp) String() string            { return proto.CompactTextString(m) }
-func (*UptimeCheckIp) ProtoMessage()               {}
-func (*UptimeCheckIp) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
+func (m *UptimeCheckIp) Reset()         { *m = UptimeCheckIp{} }
+func (m *UptimeCheckIp) String() string { return proto.CompactTextString(m) }
+func (*UptimeCheckIp) ProtoMessage()    {}
+func (*UptimeCheckIp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_0cd9344e0988a0e6, []int{2}
+}
+func (m *UptimeCheckIp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UptimeCheckIp.Unmarshal(m, b)
+}
+func (m *UptimeCheckIp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UptimeCheckIp.Marshal(b, m, deterministic)
+}
+func (dst *UptimeCheckIp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UptimeCheckIp.Merge(dst, src)
+}
+func (m *UptimeCheckIp) XXX_Size() int {
+	return xxx_messageInfo_UptimeCheckIp.Size(m)
+}
+func (m *UptimeCheckIp) XXX_DiscardUnknown() {
+	xxx_messageInfo_UptimeCheckIp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UptimeCheckIp proto.InternalMessageInfo
 
 func (m *UptimeCheckIp) GetRegion() UptimeCheckRegion {
 	if m != nil {
@@ -665,84 +869,89 @@ func (m *UptimeCheckIp) GetIpAddress() string {
 }
 
 func init() {
+	proto.RegisterType((*InternalChecker)(nil), "google.monitoring.v3.InternalChecker")
 	proto.RegisterType((*UptimeCheckConfig)(nil), "google.monitoring.v3.UptimeCheckConfig")
 	proto.RegisterType((*UptimeCheckConfig_ResourceGroup)(nil), "google.monitoring.v3.UptimeCheckConfig.ResourceGroup")
 	proto.RegisterType((*UptimeCheckConfig_HttpCheck)(nil), "google.monitoring.v3.UptimeCheckConfig.HttpCheck")
+	proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.UptimeCheckConfig.HttpCheck.HeadersEntry")
 	proto.RegisterType((*UptimeCheckConfig_HttpCheck_BasicAuthentication)(nil), "google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication")
 	proto.RegisterType((*UptimeCheckConfig_TcpCheck)(nil), "google.monitoring.v3.UptimeCheckConfig.TcpCheck")
 	proto.RegisterType((*UptimeCheckConfig_ContentMatcher)(nil), "google.monitoring.v3.UptimeCheckConfig.ContentMatcher")
-	proto.RegisterType((*UptimeCheckConfig_InternalChecker)(nil), "google.monitoring.v3.UptimeCheckConfig.InternalChecker")
 	proto.RegisterType((*UptimeCheckIp)(nil), "google.monitoring.v3.UptimeCheckIp")
 	proto.RegisterEnum("google.monitoring.v3.UptimeCheckRegion", UptimeCheckRegion_name, UptimeCheckRegion_value)
 	proto.RegisterEnum("google.monitoring.v3.GroupResourceType", GroupResourceType_name, GroupResourceType_value)
 }
 
-func init() { proto.RegisterFile("google/monitoring/v3/uptime.proto", fileDescriptor5) }
-
-var fileDescriptor5 = []byte{
-	// 1021 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdd, 0x4e, 0xe3, 0x46,
-	0x14, 0x5e, 0x13, 0xc8, 0xcf, 0x21, 0xb0, 0x66, 0x4a, 0xdb, 0x60, 0x89, 0x15, 0xbb, 0xbd, 0x28,
-	0xe2, 0xc2, 0xe9, 0x12, 0xf5, 0x47, 0x5b, 0x69, 0x2b, 0x27, 0xb8, 0xc4, 0x12, 0x24, 0xd1, 0x84,
-	0x6c, 0xdb, 0x2d, 0xaa, 0x65, 0xec, 0x21, 0x71, 0x49, 0x3c, 0xae, 0x67, 0xcc, 0x96, 0xbe, 0x42,
-	0x1f, 0xa3, 0x17, 0x95, 0xfa, 0x04, 0x7d, 0x86, 0xbe, 0x4d, 0xdf, 0xa0, 0x9a, 0xf1, 0x4c, 0x20,
-	0x40, 0xb5, 0x70, 0x37, 0xdf, 0xf9, 0xf9, 0xe6, 0x1c, 0x9f, 0x9f, 0x31, 0x3c, 0x1f, 0x53, 0x3a,
-	0x9e, 0x92, 0xe6, 0x8c, 0x26, 0x31, 0xa7, 0x59, 0x9c, 0x8c, 0x9b, 0x97, 0xad, 0x66, 0x9e, 0xf2,
-	0x78, 0x46, 0xec, 0x34, 0xa3, 0x9c, 0xa2, 0xcd, 0xc2, 0xc4, 0xbe, 0x36, 0xb1, 0x2f, 0x5b, 0xd6,
-	0x27, 0xca, 0x31, 0x48, 0x63, 0xed, 0x4c, 0x22, 0x3f, 0x23, 0x8c, 0xe6, 0x59, 0xa8, 0x5c, 0xad,
-	0x67, 0xca, 0x48, 0xa2, 0xb3, 0xfc, 0xbc, 0x19, 0xe5, 0x59, 0xc0, 0x63, 0x9a, 0x14, 0xfa, 0x17,
-	0xff, 0xd6, 0x61, 0x63, 0x24, 0xef, 0xea, 0x4c, 0x48, 0x78, 0xd1, 0xa1, 0xc9, 0x79, 0x3c, 0x46,
-	0x08, 0x96, 0x93, 0x60, 0x46, 0x1a, 0xc6, 0x8e, 0xb1, 0x5b, 0xc3, 0xf2, 0x8c, 0x9e, 0x43, 0x3d,
-	0x8a, 0x59, 0x3a, 0x0d, 0xae, 0x7c, 0xa9, 0x5b, 0x92, 0xba, 0x55, 0x25, 0xeb, 0x09, 0x93, 0x1e,
-	0xa0, 0xbb, 0x81, 0x34, 0x4a, 0x3b, 0xc6, 0xee, 0xea, 0xfe, 0xb6, 0xad, 0x92, 0x08, 0xd2, 0xd8,
-	0x3e, 0xd6, 0x56, 0x58, 0x19, 0x75, 0x9f, 0xe0, 0x8d, 0xd9, 0x6d, 0x21, 0xfa, 0x09, 0xd6, 0x35,
-	0x8b, 0x3f, 0xce, 0x68, 0x9e, 0x36, 0x96, 0x25, 0xd7, 0xe7, 0xf6, 0x7d, 0x1f, 0xc4, 0xbe, 0x93,
-	0x87, 0xad, 0x99, 0x0e, 0x85, 0x73, 0xf7, 0x09, 0x5e, 0xcb, 0x6e, 0x0a, 0x10, 0x06, 0x98, 0x70,
-	0x9e, 0xfa, 0xa1, 0x70, 0x69, 0xac, 0x48, 0xee, 0x97, 0x0f, 0xe5, 0xee, 0x72, 0x9e, 0x4a, 0xdc,
-	0x35, 0x70, 0x6d, 0xa2, 0x01, 0xea, 0x43, 0x8d, 0x87, 0x9a, 0xb2, 0x2c, 0x29, 0x3f, 0x7b, 0x28,
-	0xe5, 0x49, 0x38, 0x67, 0xac, 0x72, 0x75, 0x46, 0x2f, 0xa1, 0x9c, 0x92, 0x2c, 0xa6, 0x51, 0xa3,
-	0x22, 0xd9, 0xb6, 0x34, 0x9b, 0x2e, 0xa9, 0x7d, 0xa0, 0x4a, 0x8a, 0x95, 0x21, 0x6a, 0x41, 0x45,
-	0x50, 0xd3, 0x9c, 0x37, 0xaa, 0xef, 0xf3, 0xd1, 0x96, 0x28, 0x00, 0x33, 0xa4, 0x09, 0x27, 0x09,
-	0xf7, 0x67, 0x01, 0x0f, 0x27, 0x24, 0x63, 0x8d, 0xda, 0x4e, 0x69, 0x77, 0x75, 0xff, 0x8b, 0x87,
-	0xc6, 0xdf, 0x29, 0xfc, 0x8f, 0x0b, 0x77, 0xfc, 0x34, 0x5c, 0xc0, 0x0c, 0x61, 0x30, 0x19, 0x99,
-	0x92, 0x90, 0xcb, 0xf6, 0x18, 0xc7, 0x34, 0x61, 0x0d, 0xd8, 0x29, 0xed, 0xae, 0xef, 0x7f, 0xfa,
-	0xde, 0x2b, 0xb0, 0xb4, 0xc7, 0x4f, 0x35, 0x41, 0x81, 0x19, 0x8a, 0x60, 0x23, 0x4e, 0x38, 0xc9,
-	0x92, 0x60, 0x5a, 0x7c, 0x74, 0x11, 0xf7, 0xba, 0x8c, 0xfb, 0xcb, 0x87, 0xc6, 0xed, 0x29, 0x82,
-	0x4e, 0xe1, 0x8f, 0xcd, 0x78, 0x51, 0xc0, 0xac, 0x5f, 0x61, 0x6d, 0xa1, 0x97, 0xd0, 0x16, 0x54,
-	0x65, 0x47, 0xfa, 0x71, 0xa4, 0xa6, 0xa4, 0x22, 0xb1, 0x17, 0xa1, 0x23, 0x98, 0xb7, 0x99, 0xcf,
-	0xaf, 0xd2, 0x62, 0x52, 0xfe, 0x37, 0x45, 0x49, 0xa7, 0xb9, 0x4f, 0xae, 0x52, 0x82, 0xeb, 0xd9,
-	0x0d, 0x64, 0xfd, 0x5d, 0x82, 0xda, 0xbc, 0xd5, 0xd0, 0xc7, 0x50, 0xc9, 0x19, 0xf1, 0x19, 0x9b,
-	0xca, 0x5b, 0xab, 0xb8, 0x9c, 0x33, 0x32, 0x64, 0x53, 0x31, 0xb1, 0x69, 0xc0, 0x27, 0x6a, 0x2a,
-	0xe5, 0x59, 0xca, 0x68, 0xc6, 0xe5, 0x00, 0xae, 0x60, 0x79, 0x46, 0x67, 0x50, 0x0b, 0x72, 0x3e,
-	0xf1, 0xe3, 0xe4, 0x9c, 0xaa, 0x69, 0x72, 0x1f, 0xdd, 0xf1, 0x76, 0x3b, 0x60, 0x71, 0xe8, 0xe4,
-	0x7c, 0x42, 0x12, 0x1e, 0x87, 0x45, 0x23, 0x55, 0x05, 0xaf, 0x97, 0x9c, 0x53, 0xb1, 0x29, 0x66,
-	0x01, 0xbb, 0xf0, 0x27, 0x24, 0x88, 0x44, 0x35, 0x56, 0x64, 0xa4, 0xab, 0x42, 0xd6, 0x2d, 0x44,
-	0xe8, 0x7b, 0xa8, 0x68, 0x6d, 0x59, 0xd6, 0xea, 0xf5, 0xe3, 0x83, 0x50, 0x5c, 0x6e, 0xc2, 0xb3,
-	0x2b, 0xac, 0xe9, 0xac, 0x63, 0xf8, 0xe0, 0x9e, 0xe8, 0x90, 0x05, 0xd5, 0x9c, 0x89, 0x9a, 0xce,
-	0xb7, 0xda, 0x1c, 0x0b, 0x5d, 0x1a, 0x30, 0xf6, 0x8e, 0x66, 0x91, 0xfa, 0x7e, 0x73, 0x6c, 0xbd,
-	0x82, 0xfa, 0xcd, 0x7b, 0x90, 0x09, 0xa5, 0x0b, 0x72, 0xa5, 0x28, 0xc4, 0x11, 0x6d, 0xc2, 0xca,
-	0x65, 0x30, 0xcd, 0xf5, 0x42, 0x2c, 0xc0, 0xab, 0xa5, 0xaf, 0x0c, 0xeb, 0x19, 0x54, 0xf5, 0x44,
-	0xcf, 0x6b, 0x61, 0x5c, 0xd7, 0xc2, 0xda, 0x83, 0xf5, 0xc5, 0x89, 0x41, 0x0d, 0xa8, 0xa8, 0x99,
-	0xd1, 0x4d, 0xa5, 0xa0, 0xf5, 0xa7, 0x01, 0x4f, 0x6f, 0xb5, 0x29, 0xda, 0x06, 0x48, 0x33, 0xfa,
-	0x33, 0x09, 0xf9, 0x75, 0x17, 0xd6, 0x94, 0xc4, 0x8b, 0x04, 0x59, 0x42, 0xf8, 0x3b, 0x9a, 0x5d,
-	0xa8, 0xd0, 0x34, 0x94, 0xcd, 0x1b, 0xa6, 0xfe, 0x6f, 0x34, 0x29, 0xb6, 0xb3, 0x68, 0xde, 0x30,
-	0x7d, 0x4b, 0x13, 0x22, 0x38, 0xd5, 0x14, 0x09, 0xce, 0xe5, 0x82, 0x53, 0x49, 0xbc, 0xe8, 0xce,
-	0x23, 0xb0, 0x72, 0xe7, 0x11, 0x68, 0x03, 0x54, 0x75, 0x03, 0xb7, 0x37, 0x01, 0x49, 0x5f, 0x3f,
-	0x23, 0xbf, 0xe4, 0x84, 0x71, 0x39, 0x0f, 0x2f, 0x7e, 0x37, 0x60, 0xed, 0x46, 0x61, 0xbd, 0x14,
-	0x7d, 0x03, 0xe5, 0x62, 0x1f, 0xc8, 0x2c, 0x1e, 0xb1, 0x0e, 0x94, 0x9b, 0x28, 0xe1, 0x94, 0x16,
-	0xa5, 0xd6, 0x25, 0xd4, 0x58, 0xa4, 0x14, 0xa7, 0x7e, 0x10, 0x45, 0x19, 0x61, 0x4c, 0xe5, 0x5b,
-	0x8b, 0x53, 0xa7, 0x10, 0xec, 0x91, 0x85, 0x07, 0xb0, 0xe0, 0x45, 0x1f, 0x01, 0xc2, 0xee, 0xa1,
-	0xd7, 0xef, 0xf9, 0xa3, 0xde, 0x70, 0xe0, 0x76, 0xbc, 0x6f, 0x3d, 0xf7, 0xc0, 0x7c, 0x82, 0x2a,
-	0x50, 0x1a, 0x0d, 0x1d, 0xd3, 0x40, 0x00, 0x65, 0x77, 0x84, 0xfb, 0x03, 0xd7, 0x5c, 0x42, 0x1b,
-	0xb0, 0x36, 0xec, 0x8f, 0x4e, 0xba, 0xbe, 0x73, 0xec, 0x62, 0xaf, 0xe3, 0x98, 0x25, 0x64, 0x42,
-	0xdd, 0x19, 0x7a, 0x8e, 0x3f, 0x70, 0x84, 0x6b, 0xc7, 0x5c, 0xde, 0xfb, 0x11, 0x36, 0xee, 0x8c,
-	0x3a, 0xda, 0x86, 0x2d, 0xec, 0x0e, 0xfb, 0x23, 0xdc, 0x71, 0xfd, 0x93, 0x1f, 0x06, 0xee, 0xad,
-	0xdb, 0xea, 0x50, 0xf5, 0x7a, 0xc3, 0x13, 0xa7, 0xd7, 0x71, 0x4d, 0x03, 0x6d, 0xc1, 0x87, 0xce,
-	0x77, 0x43, 0xdf, 0x3d, 0x6a, 0xfb, 0x47, 0x7d, 0xe7, 0xc0, 0x6f, 0x3b, 0x47, 0x42, 0x83, 0xcd,
-	0xa5, 0xf6, 0x1f, 0x06, 0x34, 0x42, 0x3a, 0xbb, 0xf7, 0xab, 0xb5, 0x57, 0x8b, 0xf4, 0x06, 0x62,
-	0xf5, 0x0f, 0x8c, 0xb7, 0xaf, 0x95, 0xd1, 0x98, 0x4e, 0x83, 0x64, 0x6c, 0xd3, 0x6c, 0xdc, 0x1c,
-	0x93, 0x44, 0x3e, 0x0c, 0xcd, 0x42, 0x15, 0xa4, 0x31, 0x5b, 0xfc, 0x1d, 0xf9, 0xfa, 0x1a, 0xfd,
-	0xb5, 0x64, 0x1d, 0x16, 0x04, 0x9d, 0x29, 0xcd, 0x23, 0xfd, 0x94, 0x8b, 0xbb, 0xde, 0xb4, 0xfe,
-	0xd1, 0xca, 0x53, 0xa9, 0x3c, 0xbd, 0x56, 0x9e, 0xbe, 0x69, 0x9d, 0x95, 0xe5, 0x25, 0xad, 0xff,
-	0x02, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xa5, 0xbc, 0x87, 0xf2, 0x08, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/monitoring/v3/uptime.proto", fileDescriptor_uptime_0cd9344e0988a0e6)
+}
+
+var fileDescriptor_uptime_0cd9344e0988a0e6 = []byte{
+	// 1043 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xed, 0x6e, 0xe3, 0x44,
+	0x17, 0x5e, 0x27, 0x6d, 0x3e, 0x4e, 0xfa, 0xe1, 0xce, 0xdb, 0x17, 0xdc, 0x48, 0x5d, 0xba, 0x45,
+	0x88, 0xaa, 0x3f, 0x1c, 0xb6, 0x11, 0x08, 0x2d, 0xd2, 0x22, 0x27, 0x35, 0x8d, 0xa5, 0x36, 0x89,
+	0x26, 0xcd, 0x02, 0x4b, 0x85, 0xe5, 0xda, 0x53, 0xc7, 0x34, 0xf1, 0x18, 0xcf, 0xb8, 0x4b, 0xb9,
+	0x05, 0x2e, 0x83, 0x1f, 0x48, 0x5c, 0x01, 0xd7, 0xc0, 0x05, 0x70, 0x3d, 0xc8, 0xe3, 0x99, 0xb4,
+	0x69, 0x8b, 0xb6, 0xfd, 0x37, 0xcf, 0xf9, 0x78, 0xe6, 0xf8, 0xcc, 0x79, 0x66, 0x0c, 0x2f, 0x42,
+	0x4a, 0xc3, 0x29, 0x69, 0xcd, 0x68, 0x1c, 0x71, 0x9a, 0x46, 0x71, 0xd8, 0xba, 0x6a, 0xb7, 0xb2,
+	0x84, 0x47, 0x33, 0x62, 0x26, 0x29, 0xe5, 0x14, 0x6d, 0x16, 0x21, 0xe6, 0x4d, 0x88, 0x79, 0xd5,
+	0x6e, 0x7e, 0x2c, 0x13, 0xbd, 0x24, 0x52, 0xc9, 0x24, 0x70, 0x53, 0xc2, 0x68, 0x96, 0xfa, 0x32,
+	0xb5, 0xf9, 0x5c, 0x06, 0x09, 0x74, 0x9e, 0x5d, 0xb4, 0x82, 0x2c, 0xf5, 0x78, 0x44, 0xe3, 0xc2,
+	0xbf, 0xfb, 0x87, 0x06, 0xeb, 0x4e, 0xcc, 0x49, 0x1a, 0x7b, 0xd3, 0xee, 0x84, 0xf8, 0x97, 0x24,
+	0x45, 0xdb, 0x00, 0x49, 0x4a, 0x7f, 0x22, 0x3e, 0x77, 0xa3, 0xc0, 0xd0, 0x76, 0xb4, 0xbd, 0x3a,
+	0xae, 0x4b, 0x8b, 0x13, 0x20, 0x03, 0xaa, 0x31, 0xe1, 0xef, 0x68, 0x7a, 0x69, 0x94, 0x84, 0x4f,
+	0x41, 0xb4, 0x05, 0xb5, 0xd0, 0x4f, 0xdc, 0x5f, 0x69, 0x4c, 0x8c, 0x72, 0xe1, 0x0a, 0xfd, 0xe4,
+	0x2d, 0x8d, 0x49, 0xce, 0xe9, 0x17, 0xf4, 0x39, 0xe7, 0x52, 0xc1, 0x29, 0x2d, 0x4e, 0x80, 0x5e,
+	0xc0, 0x4a, 0x10, 0xb1, 0x64, 0xea, 0x5d, 0xbb, 0xb1, 0x37, 0x23, 0xc6, 0xb2, 0x08, 0x68, 0x48,
+	0x5b, 0xdf, 0x9b, 0x91, 0xdd, 0x7f, 0x1a, 0xb0, 0x31, 0x16, 0x5d, 0x11, 0x75, 0x76, 0x69, 0x7c,
+	0x11, 0x85, 0x08, 0xc1, 0x92, 0x48, 0x28, 0xaa, 0x14, 0xeb, 0x7b, 0x64, 0xa5, 0x7b, 0x64, 0xa8,
+	0x0f, 0xe8, 0x7e, 0xcb, 0x44, 0xcd, 0x8d, 0x83, 0x6d, 0x53, 0xb6, 0xdb, 0x4b, 0x22, 0xf3, 0x44,
+	0x45, 0x61, 0x19, 0xd4, 0x7b, 0x86, 0x37, 0x66, 0x77, 0x8d, 0xe8, 0x47, 0x58, 0x53, 0x2c, 0x6e,
+	0x98, 0xd2, 0x2c, 0x11, 0x9f, 0xd8, 0x38, 0xf8, 0xdc, 0x7c, 0xe8, 0xe8, 0xcc, 0x7b, 0xdf, 0x61,
+	0x2a, 0xa6, 0xa3, 0x3c, 0xb9, 0xf7, 0x0c, 0xaf, 0xa6, 0xb7, 0x0d, 0x08, 0x03, 0x4c, 0x38, 0x4f,
+	0x5c, 0xd1, 0x31, 0xd1, 0x9d, 0xc6, 0xc1, 0xcb, 0xc7, 0x72, 0xf7, 0x38, 0x4f, 0x04, 0xee, 0x69,
+	0xb8, 0x3e, 0x51, 0x00, 0x0d, 0xa0, 0xce, 0x7d, 0x45, 0x59, 0x11, 0x94, 0x9f, 0x3d, 0x96, 0xf2,
+	0xd4, 0x9f, 0x33, 0xd6, 0xb8, 0x5c, 0xa3, 0x97, 0x50, 0x49, 0x48, 0x1a, 0xd1, 0xc0, 0xa8, 0x0a,
+	0xb6, 0x2d, 0xc5, 0xa6, 0x86, 0xcf, 0x3c, 0x94, 0xc3, 0x87, 0x65, 0x20, 0x6a, 0x43, 0x35, 0xa7,
+	0xa6, 0x19, 0x37, 0x6a, 0xef, 0xcb, 0x51, 0x91, 0xc8, 0x03, 0xdd, 0xa7, 0x31, 0x27, 0x31, 0x77,
+	0x67, 0x1e, 0xf7, 0x27, 0x24, 0x65, 0x46, 0x7d, 0xa7, 0xbc, 0xd7, 0x38, 0xf8, 0xe2, 0xb1, 0xf5,
+	0x77, 0x8b, 0xfc, 0x93, 0x22, 0x1d, 0xaf, 0xfb, 0x0b, 0x98, 0x21, 0x0c, 0x3a, 0x23, 0x53, 0xe2,
+	0x73, 0x31, 0x1e, 0x61, 0x44, 0x63, 0x66, 0xc0, 0x4e, 0x79, 0x6f, 0xed, 0xe0, 0xd3, 0xf7, 0x6e,
+	0x81, 0x45, 0x3c, 0x5e, 0x57, 0x04, 0x05, 0x66, 0xe8, 0x23, 0x68, 0x44, 0xcc, 0x8d, 0xa4, 0xd8,
+	0x8c, 0xf5, 0x1d, 0x6d, 0xaf, 0x86, 0x21, 0x62, 0x4a, 0x7e, 0x08, 0xc3, 0x86, 0xf2, 0xba, 0x52,
+	0x1a, 0xcc, 0x58, 0x13, 0x1f, 0xf6, 0xc9, 0xc3, 0xbb, 0xde, 0x51, 0x2e, 0xd6, 0xa3, 0x45, 0x03,
+	0x6b, 0xfe, 0x02, 0xab, 0x0b, 0xa3, 0x25, 0x34, 0x9a, 0x2f, 0x6e, 0xa4, 0x5d, 0x15, 0xd8, 0x09,
+	0xd0, 0x31, 0xcc, 0xa7, 0xce, 0xe5, 0xd7, 0x49, 0x21, 0x9c, 0xff, 0xfc, 0x62, 0x41, 0xa7, 0xb8,
+	0x4f, 0xaf, 0x13, 0x82, 0x57, 0xd2, 0x5b, 0xa8, 0xf9, 0x57, 0x19, 0xea, 0xf3, 0xc9, 0x43, 0x1f,
+	0x42, 0x35, 0x63, 0xc4, 0x65, 0x6c, 0x2a, 0x76, 0xad, 0xe1, 0x4a, 0xc6, 0xc8, 0x88, 0x4d, 0x73,
+	0x01, 0x27, 0x1e, 0x9f, 0x48, 0x91, 0x8a, 0xb5, 0xb0, 0xd1, 0x94, 0x0b, 0x3d, 0x2e, 0x63, 0xb1,
+	0x46, 0xe7, 0x50, 0xf7, 0x32, 0x3e, 0x71, 0xa3, 0xf8, 0x82, 0x4a, 0x71, 0xd9, 0x4f, 0x16, 0x80,
+	0xd9, 0xf1, 0x58, 0xe4, 0x5b, 0x19, 0x9f, 0x90, 0x98, 0x47, 0x7e, 0x31, 0x57, 0xb5, 0x9c, 0xd7,
+	0x89, 0x2f, 0x68, 0x7e, 0x71, 0xcc, 0x3c, 0x76, 0xe9, 0x4e, 0x88, 0x17, 0xe4, 0xbd, 0x5f, 0x16,
+	0x95, 0x36, 0x72, 0x5b, 0xaf, 0x30, 0xa1, 0xef, 0xa0, 0xaa, 0xbc, 0x15, 0x71, 0x32, 0xaf, 0x9f,
+	0x5e, 0x84, 0xe4, 0xb2, 0x63, 0x9e, 0x5e, 0x63, 0x45, 0xd7, 0x3c, 0x81, 0xff, 0x3d, 0x50, 0x1d,
+	0x6a, 0x42, 0x2d, 0x63, 0xf9, 0x99, 0xce, 0x2f, 0xb9, 0x39, 0xce, 0x7d, 0x89, 0xc7, 0xd8, 0x3b,
+	0x9a, 0x06, 0xb2, 0x7f, 0x73, 0xdc, 0x7c, 0x05, 0x2b, 0xb7, 0xf7, 0x41, 0x3a, 0x94, 0x2f, 0xc9,
+	0xb5, 0xa4, 0xc8, 0x97, 0x68, 0x13, 0x96, 0xaf, 0xbc, 0x69, 0xa6, 0xee, 0xc7, 0x02, 0xbc, 0x2a,
+	0x7d, 0xa9, 0x35, 0x9f, 0x43, 0x4d, 0x09, 0x7c, 0x7e, 0x16, 0xda, 0xcd, 0x59, 0x34, 0xf7, 0x61,
+	0x6d, 0x51, 0x40, 0xf9, 0x9b, 0x20, 0x25, 0xa4, 0x86, 0x4a, 0xc2, 0x0e, 0x40, 0x4d, 0x8d, 0x45,
+	0x67, 0x13, 0x90, 0x98, 0x6b, 0x37, 0x25, 0x3f, 0x67, 0x84, 0x71, 0x31, 0x65, 0xbb, 0xbf, 0x69,
+	0xb0, 0x7a, 0xab, 0x5d, 0x4e, 0x82, 0xbe, 0x86, 0x4a, 0x21, 0x3a, 0x41, 0xf6, 0x04, 0xcd, 0xc9,
+	0xb4, 0xbc, 0x31, 0x53, 0x5a, 0x34, 0x50, 0x35, 0x46, 0xe1, 0xfc, 0x25, 0x8a, 0x12, 0xd7, 0x0b,
+	0x82, 0x94, 0x30, 0x26, 0x9f, 0xa9, 0x7a, 0x94, 0x58, 0x85, 0x61, 0x9f, 0x2c, 0xbc, 0x32, 0x05,
+	0x2f, 0xfa, 0x00, 0x10, 0xb6, 0x8f, 0x9c, 0x41, 0xdf, 0x1d, 0xf7, 0x47, 0x43, 0xbb, 0xeb, 0x7c,
+	0xe3, 0xd8, 0x87, 0xfa, 0x33, 0x54, 0x85, 0xf2, 0x78, 0x64, 0xe9, 0x1a, 0x02, 0xa8, 0xd8, 0x63,
+	0x3c, 0x18, 0xda, 0x7a, 0x09, 0x6d, 0xc0, 0xea, 0x68, 0x30, 0x3e, 0xed, 0xb9, 0xd6, 0x89, 0x8d,
+	0x9d, 0xae, 0xa5, 0x97, 0x91, 0x0e, 0x2b, 0xd6, 0xc8, 0xb1, 0xdc, 0xa1, 0x95, 0xa7, 0x76, 0xf5,
+	0xa5, 0xfd, 0x1f, 0x60, 0xe3, 0x9e, 0x80, 0xd0, 0x36, 0x6c, 0x61, 0x7b, 0x34, 0x18, 0xe3, 0xae,
+	0xed, 0x9e, 0x7e, 0x3f, 0xb4, 0xef, 0xec, 0xb6, 0x02, 0x35, 0xa7, 0x3f, 0x3a, 0xb5, 0xfa, 0x5d,
+	0x5b, 0xd7, 0xd0, 0x16, 0xfc, 0xdf, 0xfa, 0x76, 0xe4, 0xda, 0xc7, 0x1d, 0xf7, 0x78, 0x60, 0x1d,
+	0xba, 0x1d, 0xeb, 0x38, 0xf7, 0x60, 0xbd, 0xd4, 0xf9, 0x5d, 0x03, 0xc3, 0xa7, 0xb3, 0x07, 0xbb,
+	0xd6, 0x69, 0x14, 0x9f, 0x37, 0xcc, 0xef, 0xd7, 0xa1, 0xf6, 0xf6, 0xb5, 0x0c, 0x0a, 0xe9, 0xd4,
+	0x8b, 0x43, 0x93, 0xa6, 0x61, 0x2b, 0x24, 0xb1, 0xb8, 0x7d, 0x5b, 0x85, 0xcb, 0x4b, 0x22, 0xb6,
+	0xf8, 0x77, 0xf2, 0xd5, 0x0d, 0xfa, 0xb3, 0xd4, 0x3c, 0x2a, 0x08, 0xba, 0x53, 0x9a, 0x05, 0xea,
+	0xbd, 0xcc, 0xf7, 0x7a, 0xd3, 0xfe, 0x5b, 0x39, 0xcf, 0x84, 0xf3, 0xec, 0xc6, 0x79, 0xf6, 0xa6,
+	0x7d, 0x5e, 0x11, 0x9b, 0xb4, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x01, 0x68, 0xd9, 0xde, 0x01,
+	0x09, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime_service.pb.go
index 5e2fb2a7..d74d8eea 100644
--- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime_service.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime_service.pb.go
@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/monitoring/v3/uptime_service.proto
 
-package monitoring
+package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf5 "google.golang.org/genproto/protobuf/field_mask"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -20,27 +20,54 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The protocol for the `ListUptimeCheckConfigs` request.
 type ListUptimeCheckConfigsRequest struct {
-	// The project whose uptime check configurations are listed. The format is
-	//
-	//   `projects/[PROJECT_ID]`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	// The project whose uptime check configurations are listed. The format
+	//   is `projects/[PROJECT_ID]`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The maximum number of results to return in a single response. The server
 	// may further constrain the maximum number of results returned in a single
 	// page. If the page_size is <=0, the server will decide the number of results
 	// to be returned.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If this field is not empty then it must contain the `nextPageToken` value
 	// returned by a previous call to this method.  Using this field causes the
 	// method to return more results from the previous method call.
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListUptimeCheckConfigsRequest) Reset()         { *m = ListUptimeCheckConfigsRequest{} }
+func (m *ListUptimeCheckConfigsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListUptimeCheckConfigsRequest) ProtoMessage()    {}
+func (*ListUptimeCheckConfigsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_service_4c86690095fa2cb1, []int{0}
+}
+func (m *ListUptimeCheckConfigsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListUptimeCheckConfigsRequest.Unmarshal(m, b)
+}
+func (m *ListUptimeCheckConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListUptimeCheckConfigsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListUptimeCheckConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUptimeCheckConfigsRequest.Merge(dst, src)
+}
+func (m *ListUptimeCheckConfigsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListUptimeCheckConfigsRequest.Size(m)
+}
+func (m *ListUptimeCheckConfigsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListUptimeCheckConfigsRequest.DiscardUnknown(m)
 }
 
-func (m *ListUptimeCheckConfigsRequest) Reset()                    { *m = ListUptimeCheckConfigsRequest{} }
-func (m *ListUptimeCheckConfigsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListUptimeCheckConfigsRequest) ProtoMessage()               {}
-func (*ListUptimeCheckConfigsRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+var xxx_messageInfo_ListUptimeCheckConfigsRequest proto.InternalMessageInfo
 
 func (m *ListUptimeCheckConfigsRequest) GetParent() string {
 	if m != nil {
@@ -66,19 +93,44 @@ func (m *ListUptimeCheckConfigsRequest) GetPageToken() string {
 // The protocol for the `ListUptimeCheckConfigs` response.
 type ListUptimeCheckConfigsResponse struct {
 	// The returned uptime check configurations.
-	UptimeCheckConfigs []*UptimeCheckConfig `protobuf:"bytes,1,rep,name=uptime_check_configs,json=uptimeCheckConfigs" json:"uptime_check_configs,omitempty"`
+	UptimeCheckConfigs []*UptimeCheckConfig `protobuf:"bytes,1,rep,name=uptime_check_configs,json=uptimeCheckConfigs,proto3" json:"uptime_check_configs,omitempty"`
 	// This field represents the pagination token to retrieve the next page of
 	// results. If the value is empty, it means no further results for the
 	// request. To retrieve the next page of results, the value of the
 	// next_page_token is passed to the subsequent List method call (in the
 	// request message's page_token field).
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	// The total number of uptime check configurations for the project,
+	// irrespective of any pagination.
+	TotalSize            int32    `protobuf:"varint,3,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListUptimeCheckConfigsResponse) Reset()                    { *m = ListUptimeCheckConfigsResponse{} }
-func (m *ListUptimeCheckConfigsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListUptimeCheckConfigsResponse) ProtoMessage()               {}
-func (*ListUptimeCheckConfigsResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
+func (m *ListUptimeCheckConfigsResponse) Reset()         { *m = ListUptimeCheckConfigsResponse{} }
+func (m *ListUptimeCheckConfigsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListUptimeCheckConfigsResponse) ProtoMessage()    {}
+func (*ListUptimeCheckConfigsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_service_4c86690095fa2cb1, []int{1}
+}
+func (m *ListUptimeCheckConfigsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListUptimeCheckConfigsResponse.Unmarshal(m, b)
+}
+func (m *ListUptimeCheckConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListUptimeCheckConfigsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListUptimeCheckConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUptimeCheckConfigsResponse.Merge(dst, src)
+}
+func (m *ListUptimeCheckConfigsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListUptimeCheckConfigsResponse.Size(m)
+}
+func (m *ListUptimeCheckConfigsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListUptimeCheckConfigsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListUptimeCheckConfigsResponse proto.InternalMessageInfo
 
 func (m *ListUptimeCheckConfigsResponse) GetUptimeCheckConfigs() []*UptimeCheckConfig {
 	if m != nil {
@@ -94,18 +146,46 @@ func (m *ListUptimeCheckConfigsResponse) GetNextPageToken() string {
 	return ""
 }
 
+func (m *ListUptimeCheckConfigsResponse) GetTotalSize() int32 {
+	if m != nil {
+		return m.TotalSize
+	}
+	return 0
+}
+
 // The protocol for the `GetUptimeCheckConfig` request.
 type GetUptimeCheckConfigRequest struct {
-	// The uptime check configuration to retrieve. The format is
-	//
-	//   `projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// The uptime check configuration to retrieve. The format
+	//   is `projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetUptimeCheckConfigRequest) Reset()         { *m = GetUptimeCheckConfigRequest{} }
+func (m *GetUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetUptimeCheckConfigRequest) ProtoMessage()    {}
+func (*GetUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_service_4c86690095fa2cb1, []int{2}
+}
+func (m *GetUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetUptimeCheckConfigRequest.Unmarshal(m, b)
+}
+func (m *GetUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetUptimeCheckConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetUptimeCheckConfigRequest.Merge(dst, src)
+}
+func (m *GetUptimeCheckConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetUptimeCheckConfigRequest.Size(m)
+}
+func (m *GetUptimeCheckConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetUptimeCheckConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetUptimeCheckConfigRequest) Reset()                    { *m = GetUptimeCheckConfigRequest{} }
-func (m *GetUptimeCheckConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetUptimeCheckConfigRequest) ProtoMessage()               {}
-func (*GetUptimeCheckConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{2} }
+var xxx_messageInfo_GetUptimeCheckConfigRequest proto.InternalMessageInfo
 
 func (m *GetUptimeCheckConfigRequest) GetName() string {
 	if m != nil {
@@ -116,18 +196,39 @@ func (m *GetUptimeCheckConfigRequest) GetName() string {
 
 // The protocol for the `CreateUptimeCheckConfig` request.
 type CreateUptimeCheckConfigRequest struct {
-	// The project in which to create the uptime check. The format is:
-	//
-	//   `projects/[PROJECT_ID]`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	// The project in which to create the uptime check. The format
+	//   is `projects/[PROJECT_ID]`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The new uptime check configuration.
-	UptimeCheckConfig *UptimeCheckConfig `protobuf:"bytes,2,opt,name=uptime_check_config,json=uptimeCheckConfig" json:"uptime_check_config,omitempty"`
+	UptimeCheckConfig    *UptimeCheckConfig `protobuf:"bytes,2,opt,name=uptime_check_config,json=uptimeCheckConfig,proto3" json:"uptime_check_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *CreateUptimeCheckConfigRequest) Reset()                    { *m = CreateUptimeCheckConfigRequest{} }
-func (m *CreateUptimeCheckConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateUptimeCheckConfigRequest) ProtoMessage()               {}
-func (*CreateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{3} }
+func (m *CreateUptimeCheckConfigRequest) Reset()         { *m = CreateUptimeCheckConfigRequest{} }
+func (m *CreateUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateUptimeCheckConfigRequest) ProtoMessage()    {}
+func (*CreateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_service_4c86690095fa2cb1, []int{3}
+}
+func (m *CreateUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateUptimeCheckConfigRequest.Unmarshal(m, b)
+}
+func (m *CreateUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateUptimeCheckConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateUptimeCheckConfigRequest.Merge(dst, src)
+}
+func (m *CreateUptimeCheckConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateUptimeCheckConfigRequest.Size(m)
+}
+func (m *CreateUptimeCheckConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateUptimeCheckConfigRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateUptimeCheckConfigRequest proto.InternalMessageInfo
 
 func (m *CreateUptimeCheckConfigRequest) GetParent() string {
 	if m != nil {
@@ -149,23 +250,49 @@ type UpdateUptimeCheckConfigRequest struct {
 	// configuration are updated with values from the new configuration. If this
 	// field is empty, then the current configuration is completely replaced with
 	// the new configuration.
-	UpdateMask *google_protobuf5.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. If an `"updateMask"` has been specified, this field gives
 	// the values for the set of fields mentioned in the `"updateMask"`. If an
 	// `"updateMask"` has not been given, this uptime check configuration replaces
-	// the current configuration. If a field is mentioned in `"updateMask`" but
+	// the current configuration. If a field is mentioned in `"updateMask"` but
 	// the corresonding field is omitted in this partial uptime check
 	// configuration, it has the effect of deleting/clearing the field from the
 	// configuration on the server.
-	UptimeCheckConfig *UptimeCheckConfig `protobuf:"bytes,3,opt,name=uptime_check_config,json=uptimeCheckConfig" json:"uptime_check_config,omitempty"`
+	//
+	// The following fields can be updated: `display_name`,
+	// `http_check`, `tcp_check`, `timeout`, `content_matchers`, and
+	// `selected_regions`.
+	UptimeCheckConfig    *UptimeCheckConfig `protobuf:"bytes,3,opt,name=uptime_check_config,json=uptimeCheckConfig,proto3" json:"uptime_check_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *UpdateUptimeCheckConfigRequest) Reset()         { *m = UpdateUptimeCheckConfigRequest{} }
+func (m *UpdateUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateUptimeCheckConfigRequest) ProtoMessage()    {}
+func (*UpdateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_service_4c86690095fa2cb1, []int{4}
+}
+func (m *UpdateUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Unmarshal(m, b)
+}
+func (m *UpdateUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateUptimeCheckConfigRequest.Merge(dst, src)
+}
+func (m *UpdateUptimeCheckConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Size(m)
+}
+func (m *UpdateUptimeCheckConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateUptimeCheckConfigRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateUptimeCheckConfigRequest) Reset()                    { *m = UpdateUptimeCheckConfigRequest{} }
-func (m *UpdateUptimeCheckConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateUptimeCheckConfigRequest) ProtoMessage()               {}
-func (*UpdateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{4} }
+var xxx_messageInfo_UpdateUptimeCheckConfigRequest proto.InternalMessageInfo
 
-func (m *UpdateUptimeCheckConfigRequest) GetUpdateMask() *google_protobuf5.FieldMask {
+func (m *UpdateUptimeCheckConfigRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -181,16 +308,37 @@ func (m *UpdateUptimeCheckConfigRequest) GetUptimeCheckConfig() *UptimeCheckConf
 
 // The protocol for the `DeleteUptimeCheckConfig` request.
 type DeleteUptimeCheckConfigRequest struct {
-	// The uptime check configuration to delete. The format is
-	//
-	//   `projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// The uptime check configuration to delete. The format
+	//   is `projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteUptimeCheckConfigRequest) Reset()         { *m = DeleteUptimeCheckConfigRequest{} }
+func (m *DeleteUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteUptimeCheckConfigRequest) ProtoMessage()    {}
+func (*DeleteUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_service_4c86690095fa2cb1, []int{5}
+}
+func (m *DeleteUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Unmarshal(m, b)
+}
+func (m *DeleteUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteUptimeCheckConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteUptimeCheckConfigRequest.Merge(dst, src)
+}
+func (m *DeleteUptimeCheckConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Size(m)
+}
+func (m *DeleteUptimeCheckConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteUptimeCheckConfigRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteUptimeCheckConfigRequest) Reset()                    { *m = DeleteUptimeCheckConfigRequest{} }
-func (m *DeleteUptimeCheckConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteUptimeCheckConfigRequest) ProtoMessage()               {}
-func (*DeleteUptimeCheckConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{5} }
+var xxx_messageInfo_DeleteUptimeCheckConfigRequest proto.InternalMessageInfo
 
 func (m *DeleteUptimeCheckConfigRequest) GetName() string {
 	if m != nil {
@@ -206,18 +354,40 @@ type ListUptimeCheckIpsRequest struct {
 	// page. If the page_size is <=0, the server will decide the number of results
 	// to be returned.
 	// NOTE: this field is not yet implemented
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If this field is not empty then it must contain the `nextPageToken` value
 	// returned by a previous call to this method.  Using this field causes the
 	// method to return more results from the previous method call.
 	// NOTE: this field is not yet implemented
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListUptimeCheckIpsRequest) Reset()                    { *m = ListUptimeCheckIpsRequest{} }
-func (m *ListUptimeCheckIpsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListUptimeCheckIpsRequest) ProtoMessage()               {}
-func (*ListUptimeCheckIpsRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{6} }
+func (m *ListUptimeCheckIpsRequest) Reset()         { *m = ListUptimeCheckIpsRequest{} }
+func (m *ListUptimeCheckIpsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListUptimeCheckIpsRequest) ProtoMessage()    {}
+func (*ListUptimeCheckIpsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_service_4c86690095fa2cb1, []int{6}
+}
+func (m *ListUptimeCheckIpsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListUptimeCheckIpsRequest.Unmarshal(m, b)
+}
+func (m *ListUptimeCheckIpsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListUptimeCheckIpsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListUptimeCheckIpsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUptimeCheckIpsRequest.Merge(dst, src)
+}
+func (m *ListUptimeCheckIpsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListUptimeCheckIpsRequest.Size(m)
+}
+func (m *ListUptimeCheckIpsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListUptimeCheckIpsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListUptimeCheckIpsRequest proto.InternalMessageInfo
 
 func (m *ListUptimeCheckIpsRequest) GetPageSize() int32 {
 	if m != nil {
@@ -237,20 +407,42 @@ func (m *ListUptimeCheckIpsRequest) GetPageToken() string {
 type ListUptimeCheckIpsResponse struct {
 	// The returned list of IP addresses (including region and location) that the
 	// checkers run from.
-	UptimeCheckIps []*UptimeCheckIp `protobuf:"bytes,1,rep,name=uptime_check_ips,json=uptimeCheckIps" json:"uptime_check_ips,omitempty"`
+	UptimeCheckIps []*UptimeCheckIp `protobuf:"bytes,1,rep,name=uptime_check_ips,json=uptimeCheckIps,proto3" json:"uptime_check_ips,omitempty"`
 	// This field represents the pagination token to retrieve the next page of
 	// results. If the value is empty, it means no further results for the
 	// request. To retrieve the next page of results, the value of the
 	// next_page_token is passed to the subsequent List method call (in the
 	// request message's page_token field).
 	// NOTE: this field is not yet implemented
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListUptimeCheckIpsResponse) Reset()                    { *m = ListUptimeCheckIpsResponse{} }
-func (m *ListUptimeCheckIpsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListUptimeCheckIpsResponse) ProtoMessage()               {}
-func (*ListUptimeCheckIpsResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{7} }
+func (m *ListUptimeCheckIpsResponse) Reset()         { *m = ListUptimeCheckIpsResponse{} }
+func (m *ListUptimeCheckIpsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListUptimeCheckIpsResponse) ProtoMessage()    {}
+func (*ListUptimeCheckIpsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_uptime_service_4c86690095fa2cb1, []int{7}
+}
+func (m *ListUptimeCheckIpsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListUptimeCheckIpsResponse.Unmarshal(m, b)
+}
+func (m *ListUptimeCheckIpsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListUptimeCheckIpsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListUptimeCheckIpsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListUptimeCheckIpsResponse.Merge(dst, src)
+}
+func (m *ListUptimeCheckIpsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListUptimeCheckIpsResponse.Size(m)
+}
+func (m *ListUptimeCheckIpsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListUptimeCheckIpsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListUptimeCheckIpsResponse proto.InternalMessageInfo
 
 func (m *ListUptimeCheckIpsResponse) GetUptimeCheckIps() []*UptimeCheckIp {
 	if m != nil {
@@ -285,8 +477,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for UptimeCheckService service
-
+// UptimeCheckServiceClient is the client API for UptimeCheckService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type UptimeCheckServiceClient interface {
 	// Lists the existing valid uptime check configurations for the project,
 	// leaving out any invalid configurations.
@@ -303,7 +496,7 @@ type UptimeCheckServiceClient interface {
 	// Deletes an uptime check configuration. Note that this method will fail
 	// if the uptime check configuration is referenced by an alert policy or
 	// other dependent configs that would be rendered invalid by the deletion.
-	DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Returns the list of IPs that checkers run from
 	ListUptimeCheckIps(ctx context.Context, in *ListUptimeCheckIpsRequest, opts ...grpc.CallOption) (*ListUptimeCheckIpsResponse, error)
 }
@@ -318,7 +511,7 @@ func NewUptimeCheckServiceClient(cc *grpc.ClientConn) UptimeCheckServiceClient {
 
 func (c *uptimeCheckServiceClient) ListUptimeCheckConfigs(ctx context.Context, in *ListUptimeCheckConfigsRequest, opts ...grpc.CallOption) (*ListUptimeCheckConfigsResponse, error) {
 	out := new(ListUptimeCheckConfigsResponse)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/ListUptimeCheckConfigs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/ListUptimeCheckConfigs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -327,7 +520,7 @@ func (c *uptimeCheckServiceClient) ListUptimeCheckConfigs(ctx context.Context, i
 
 func (c *uptimeCheckServiceClient) GetUptimeCheckConfig(ctx context.Context, in *GetUptimeCheckConfigRequest, opts ...grpc.CallOption) (*UptimeCheckConfig, error) {
 	out := new(UptimeCheckConfig)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/GetUptimeCheckConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/GetUptimeCheckConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -336,7 +529,7 @@ func (c *uptimeCheckServiceClient) GetUptimeCheckConfig(ctx context.Context, in
 
 func (c *uptimeCheckServiceClient) CreateUptimeCheckConfig(ctx context.Context, in *CreateUptimeCheckConfigRequest, opts ...grpc.CallOption) (*UptimeCheckConfig, error) {
 	out := new(UptimeCheckConfig)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/CreateUptimeCheckConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/CreateUptimeCheckConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -345,16 +538,16 @@ func (c *uptimeCheckServiceClient) CreateUptimeCheckConfig(ctx context.Context,
 
 func (c *uptimeCheckServiceClient) UpdateUptimeCheckConfig(ctx context.Context, in *UpdateUptimeCheckConfigRequest, opts ...grpc.CallOption) (*UptimeCheckConfig, error) {
 	out := new(UptimeCheckConfig)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/UpdateUptimeCheckConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/UpdateUptimeCheckConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *uptimeCheckServiceClient) DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/DeleteUptimeCheckConfig", in, out, c.cc, opts...)
+func (c *uptimeCheckServiceClient) DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/DeleteUptimeCheckConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -363,15 +556,14 @@ func (c *uptimeCheckServiceClient) DeleteUptimeCheckConfig(ctx context.Context,
 
 func (c *uptimeCheckServiceClient) ListUptimeCheckIps(ctx context.Context, in *ListUptimeCheckIpsRequest, opts ...grpc.CallOption) (*ListUptimeCheckIpsResponse, error) {
 	out := new(ListUptimeCheckIpsResponse)
-	err := grpc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/ListUptimeCheckIps", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/ListUptimeCheckIps", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for UptimeCheckService service
-
+// UptimeCheckServiceServer is the server API for UptimeCheckService service.
 type UptimeCheckServiceServer interface {
 	// Lists the existing valid uptime check configurations for the project,
 	// leaving out any invalid configurations.
@@ -388,7 +580,7 @@ type UptimeCheckServiceServer interface {
 	// Deletes an uptime check configuration. Note that this method will fail
 	// if the uptime check configuration is referenced by an alert policy or
 	// other dependent configs that would be rendered invalid by the deletion.
-	DeleteUptimeCheckConfig(context.Context, *DeleteUptimeCheckConfigRequest) (*google_protobuf4.Empty, error)
+	DeleteUptimeCheckConfig(context.Context, *DeleteUptimeCheckConfigRequest) (*empty.Empty, error)
 	// Returns the list of IPs that checkers run from
 	ListUptimeCheckIps(context.Context, *ListUptimeCheckIpsRequest) (*ListUptimeCheckIpsResponse, error)
 }
@@ -538,54 +730,57 @@ var _UptimeCheckService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/monitoring/v3/uptime_service.proto",
 }
 
-func init() { proto.RegisterFile("google/monitoring/v3/uptime_service.proto", fileDescriptor6) }
-
-var fileDescriptor6 = []byte{
-	// 735 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdf, 0x4e, 0x13, 0x4f,
-	0x14, 0xce, 0xb4, 0xfc, 0x08, 0x1c, 0xf2, 0xf3, 0xcf, 0xd8, 0x40, 0x5d, 0xa4, 0xa9, 0x35, 0x51,
-	0x6c, 0xcc, 0xae, 0xb4, 0x5c, 0x49, 0x24, 0x91, 0xaa, 0x84, 0x44, 0x12, 0x52, 0x04, 0xa2, 0x92,
-	0x34, 0x4b, 0x19, 0xd6, 0xb5, 0xed, 0xce, 0xd8, 0x99, 0x25, 0x8a, 0xe1, 0xc6, 0x37, 0x30, 0x5c,
-	0x7a, 0x69, 0xe2, 0x05, 0x0f, 0xa0, 0xd7, 0x5e, 0x99, 0x78, 0x6b, 0x7c, 0x03, 0x1f, 0xc4, 0xec,
-	0xec, 0x2c, 0xa5, 0xed, 0xec, 0xba, 0x8d, 0x77, 0xdd, 0x39, 0x67, 0xce, 0xf9, 0xce, 0xb7, 0xdf,
-	0xf9, 0xba, 0x70, 0xdb, 0xa1, 0xd4, 0x69, 0x13, 0xab, 0x43, 0x3d, 0x57, 0xd0, 0xae, 0xeb, 0x39,
-	0xd6, 0x61, 0xd5, 0xf2, 0x99, 0x70, 0x3b, 0xa4, 0xc1, 0x49, 0xf7, 0xd0, 0x6d, 0x12, 0x93, 0x75,
-	0xa9, 0xa0, 0x38, 0x17, 0xa6, 0x9a, 0xbd, 0x54, 0xf3, 0xb0, 0x6a, 0x5c, 0x53, 0x05, 0x6c, 0xe6,
-	0x5a, 0xb6, 0xe7, 0x51, 0x61, 0x0b, 0x97, 0x7a, 0x3c, 0xbc, 0x63, 0x5c, 0x4f, 0x28, 0xaf, 0x52,
-	0x66, 0x55, 0x8a, 0x7c, 0xda, 0xf3, 0x0f, 0x2c, 0xd2, 0x61, 0xe2, 0xad, 0x0a, 0x16, 0x07, 0x83,
-	0x07, 0x2e, 0x69, 0xef, 0x37, 0x3a, 0x36, 0x6f, 0x85, 0x19, 0x25, 0x0e, 0x73, 0x4f, 0x5c, 0x2e,
-	0xb6, 0x64, 0xc9, 0xda, 0x4b, 0xd2, 0x6c, 0xd5, 0xa8, 0x77, 0xe0, 0x3a, 0xbc, 0x4e, 0x5e, 0xfb,
-	0x84, 0x0b, 0x3c, 0x0d, 0xe3, 0xcc, 0xee, 0x12, 0x4f, 0xe4, 0x51, 0x11, 0xcd, 0x4f, 0xd6, 0xd5,
-	0x13, 0x9e, 0x85, 0x49, 0x66, 0x3b, 0xa4, 0xc1, 0xdd, 0x23, 0x92, 0xcf, 0x16, 0xd1, 0xfc, 0x7f,
-	0xf5, 0x89, 0xe0, 0x60, 0xd3, 0x3d, 0x22, 0x78, 0x0e, 0x40, 0x06, 0x05, 0x6d, 0x11, 0x2f, 0x3f,
-	0x26, 0x2f, 0xca, 0xf4, 0xa7, 0xc1, 0x41, 0xe9, 0x13, 0x82, 0x42, 0x5c, 0x57, 0xce, 0xa8, 0xc7,
-	0x09, 0x7e, 0x06, 0x39, 0xc5, 0x62, 0x33, 0x08, 0x37, 0x9a, 0x61, 0x3c, 0x8f, 0x8a, 0xd9, 0xf9,
-	0xa9, 0xca, 0x2d, 0x53, 0x47, 0xa6, 0x39, 0x54, 0xaf, 0x8e, 0xfd, 0xa1, 0x16, 0xf8, 0x26, 0x5c,
-	0xf4, 0xc8, 0x1b, 0xd1, 0x38, 0x87, 0x30, 0x23, 0x11, 0xfe, 0x1f, 0x1c, 0x6f, 0x9c, 0xa1, 0x5c,
-	0x80, 0xd9, 0x55, 0x32, 0x8c, 0x31, 0x22, 0x06, 0xc3, 0x98, 0x67, 0x77, 0x88, 0xa2, 0x45, 0xfe,
-	0x2e, 0x7d, 0x40, 0x50, 0xa8, 0x75, 0x89, 0x2d, 0x48, 0xec, 0xb5, 0x38, 0x3e, 0x77, 0xe0, 0x8a,
-	0x66, 0x60, 0x89, 0x6c, 0x84, 0x79, 0x2f, 0x0f, 0xcd, 0x5b, 0xfa, 0x82, 0xa0, 0xb0, 0xc5, 0xf6,
-	0x93, 0x30, 0x2d, 0xc1, 0x94, 0x2f, 0x33, 0xa4, 0x32, 0x54, 0x4f, 0x23, 0xea, 0x19, 0x89, 0xc7,
-	0x7c, 0x1c, 0x88, 0x67, 0xdd, 0xe6, 0xad, 0x3a, 0x84, 0xe9, 0xc1, 0xef, 0x38, 0xe0, 0xd9, 0x7f,
-	0x06, 0xbe, 0x08, 0x85, 0x87, 0xa4, 0x4d, 0x12, 0x70, 0xeb, 0x5e, 0xc1, 0x0e, 0x5c, 0x1d, 0x90,
-	0xd6, 0x1a, 0x3b, 0x13, 0x73, 0x9f, 0x68, 0x33, 0x89, 0xa2, 0xcd, 0x0e, 0x8a, 0xf6, 0x04, 0x81,
-	0xa1, 0xab, 0xac, 0x04, 0xbb, 0x0e, 0x97, 0xfa, 0x68, 0x70, 0x59, 0x24, 0xd6, 0x1b, 0x7f, 0xe5,
-	0x60, 0x8d, 0xd5, 0x2f, 0xf8, 0x7d, 0x65, 0xd3, 0x8a, 0xb4, 0xf2, 0x7d, 0x02, 0xf0, 0xb9, 0x4a,
-	0x9b, 0xa1, 0xe5, 0xe0, 0xaf, 0x08, 0xa6, 0xf5, 0x1b, 0x86, 0xab, 0x7a, 0x38, 0x89, 0x2e, 0x60,
-	0x2c, 0x8e, 0x76, 0x29, 0xe4, 0xa4, 0x54, 0x79, 0xff, 0xf3, 0xf7, 0x49, 0xe6, 0x0e, 0x2e, 0x07,
-	0xae, 0xf5, 0x2e, 0x14, 0xfa, 0x7d, 0xd6, 0xa5, 0xaf, 0x48, 0x53, 0x70, 0xab, 0x7c, 0x6c, 0x69,
-	0xb6, 0xf3, 0x33, 0x82, 0x9c, 0x6e, 0xed, 0xf0, 0x82, 0x1e, 0x42, 0xc2, 0x8a, 0x1a, 0x69, 0xd5,
-	0x37, 0x00, 0x34, 0xd0, 0xd1, 0x39, 0x98, 0x1a, 0x94, 0x56, 0xf9, 0x18, 0x7f, 0x43, 0x30, 0x13,
-	0xb3, 0xeb, 0x38, 0x86, 0xae, 0x64, 0x6b, 0x48, 0x0f, 0x77, 0x55, 0xc2, 0x7d, 0x50, 0x1a, 0x81,
-	0xd7, 0x7b, 0xba, 0x25, 0xc5, 0xbf, 0x10, 0xcc, 0xc4, 0x78, 0x43, 0xdc, 0x0c, 0xc9, 0x56, 0x92,
-	0x7e, 0x86, 0x17, 0x72, 0x86, 0xad, 0xca, 0xb2, 0x9c, 0x41, 0x03, 0xce, 0x4c, 0xf5, 0x1a, 0xf4,
-	0x73, 0x7d, 0x44, 0x30, 0x13, 0xe3, 0x1d, 0x71, 0x73, 0x25, 0x5b, 0x8d, 0x31, 0x3d, 0xe4, 0x86,
-	0x8f, 0x82, 0xff, 0xd9, 0x48, 0x39, 0xe5, 0x51, 0x94, 0x73, 0x82, 0x00, 0x0f, 0x3b, 0x09, 0xb6,
-	0x52, 0xed, 0x58, 0xcf, 0xcd, 0x8c, 0xbb, 0xe9, 0x2f, 0xa8, 0x85, 0x34, 0x24, 0xda, 0x1c, 0xc6,
-	0xbd, 0xcf, 0x88, 0x28, 0x67, 0xe5, 0x14, 0x41, 0xbe, 0x49, 0x3b, 0xda, 0x9a, 0x2b, 0xca, 0x63,
-	0x94, 0xbd, 0x6c, 0x04, 0x1c, 0x6c, 0xa0, 0xe7, 0xcb, 0x2a, 0xd7, 0xa1, 0x6d, 0xdb, 0x73, 0x4c,
-	0xda, 0x75, 0x2c, 0x87, 0x78, 0x92, 0x21, 0x2b, 0x0c, 0xd9, 0xcc, 0xe5, 0xfd, 0x5f, 0x2f, 0x4b,
-	0xbd, 0xa7, 0xd3, 0x8c, 0xb1, 0x1a, 0x16, 0xa8, 0xb5, 0xa9, 0xbf, 0x6f, 0xae, 0xf7, 0x5a, 0x6e,
-	0x57, 0x7f, 0x44, 0xc1, 0x5d, 0x19, 0xdc, 0xed, 0x05, 0x77, 0xb7, 0xab, 0x7b, 0xe3, 0xb2, 0x49,
-	0xf5, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x1d, 0x15, 0x69, 0x80, 0x09, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/monitoring/v3/uptime_service.proto", fileDescriptor_uptime_service_4c86690095fa2cb1)
+}
+
+var fileDescriptor_uptime_service_4c86690095fa2cb1 = []byte{
+	// 747 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0xd3, 0x4a,
+	0x14, 0xd6, 0x24, 0xbd, 0x55, 0x7b, 0xaa, 0x7b, 0x2f, 0x0c, 0x51, 0x1b, 0x5c, 0x1a, 0x05, 0x23,
+	0x41, 0x89, 0x90, 0x4d, 0x93, 0xae, 0xa8, 0xa8, 0x44, 0x03, 0x54, 0x95, 0xa8, 0x54, 0xa5, 0xb4,
+	0x15, 0x50, 0x29, 0x72, 0xd3, 0xa9, 0x31, 0x49, 0x3c, 0xc6, 0x33, 0xae, 0xa0, 0xa8, 0x1b, 0xde,
+	0x00, 0x75, 0xc9, 0x9e, 0x45, 0x1f, 0x00, 0xd6, 0xb0, 0x41, 0x62, 0x8b, 0x78, 0x03, 0x1e, 0x04,
+	0x79, 0x3c, 0x26, 0x7f, 0x63, 0xe3, 0x88, 0x5d, 0x3c, 0xe7, 0xcc, 0x39, 0xdf, 0xf9, 0xfc, 0x9d,
+	0x2f, 0x86, 0x9b, 0x36, 0xa5, 0x76, 0x87, 0x98, 0x5d, 0xea, 0x3a, 0x9c, 0xfa, 0x8e, 0x6b, 0x9b,
+	0xc7, 0x35, 0x33, 0xf0, 0xb8, 0xd3, 0x25, 0x4d, 0x46, 0xfc, 0x63, 0xa7, 0x45, 0x0c, 0xcf, 0xa7,
+	0x9c, 0xe2, 0x42, 0x94, 0x6a, 0xf4, 0x52, 0x8d, 0xe3, 0x9a, 0x76, 0x45, 0x16, 0xb0, 0x3c, 0xc7,
+	0xb4, 0x5c, 0x97, 0x72, 0x8b, 0x3b, 0xd4, 0x65, 0xd1, 0x1d, 0xed, 0x6a, 0x4a, 0x79, 0x99, 0x32,
+	0x2f, 0x53, 0xc4, 0xd3, 0x41, 0x70, 0x64, 0x92, 0xae, 0xc7, 0x5f, 0xcb, 0x60, 0x79, 0x38, 0x78,
+	0xe4, 0x90, 0xce, 0x61, 0xb3, 0x6b, 0xb1, 0x76, 0x94, 0xa1, 0x33, 0x58, 0x78, 0xe4, 0x30, 0xbe,
+	0x23, 0x4a, 0xd6, 0x9f, 0x93, 0x56, 0xbb, 0x4e, 0xdd, 0x23, 0xc7, 0x66, 0x0d, 0xf2, 0x32, 0x20,
+	0x8c, 0xe3, 0x59, 0x98, 0xf4, 0x2c, 0x9f, 0xb8, 0xbc, 0x88, 0xca, 0x68, 0x71, 0xba, 0x21, 0x9f,
+	0xf0, 0x3c, 0x4c, 0x7b, 0x96, 0x4d, 0x9a, 0xcc, 0x39, 0x21, 0xc5, 0x7c, 0x19, 0x2d, 0xfe, 0xd3,
+	0x98, 0x0a, 0x0f, 0xb6, 0x9d, 0x13, 0x82, 0x17, 0x00, 0x44, 0x90, 0xd3, 0x36, 0x71, 0x8b, 0x13,
+	0xe2, 0xa2, 0x48, 0x7f, 0x1c, 0x1e, 0xe8, 0x5f, 0x10, 0x94, 0x92, 0xba, 0x32, 0x8f, 0xba, 0x8c,
+	0xe0, 0x27, 0x50, 0x90, 0x2c, 0xb6, 0xc2, 0x70, 0xb3, 0x15, 0xc5, 0x8b, 0xa8, 0x9c, 0x5f, 0x9c,
+	0xa9, 0xde, 0x30, 0x54, 0x64, 0x1a, 0x23, 0xf5, 0x1a, 0x38, 0x18, 0x69, 0x81, 0xaf, 0xc3, 0xff,
+	0x2e, 0x79, 0xc5, 0x9b, 0x7d, 0x08, 0x73, 0x02, 0xe1, 0xbf, 0xe1, 0xf1, 0x56, 0x8c, 0x32, 0x1c,
+	0x82, 0x53, 0x6e, 0x75, 0xfa, 0x47, 0x9c, 0x16, 0x27, 0xe1, 0x8c, 0xfa, 0x12, 0xcc, 0xaf, 0x93,
+	0xd1, 0x11, 0x62, 0xde, 0x30, 0x4c, 0xb8, 0x56, 0x97, 0x48, 0xd6, 0xc4, 0x6f, 0xfd, 0x1d, 0x82,
+	0x52, 0xdd, 0x27, 0x16, 0x27, 0x89, 0xd7, 0x92, 0xe8, 0xde, 0x83, 0x4b, 0x0a, 0x3e, 0x04, 0xf0,
+	0x31, 0xe8, 0xb8, 0x38, 0x42, 0x87, 0xfe, 0x11, 0x41, 0x69, 0xc7, 0x3b, 0x4c, 0xc3, 0xb4, 0x02,
+	0x33, 0x81, 0xc8, 0x10, 0xc2, 0x91, 0x3d, 0xb5, 0xb8, 0x67, 0xac, 0x2d, 0xe3, 0x61, 0xa8, 0xad,
+	0x4d, 0x8b, 0xb5, 0x1b, 0x10, 0xa5, 0x87, 0xbf, 0x93, 0x80, 0xe7, 0xff, 0x1a, 0xf8, 0x32, 0x94,
+	0xee, 0x93, 0x0e, 0x49, 0xc1, 0xad, 0x7a, 0x05, 0x7b, 0x70, 0x79, 0x48, 0x79, 0x1b, 0xde, 0x6f,
+	0xad, 0x0f, 0x68, 0x3a, 0x97, 0xaa, 0xe9, 0xfc, 0xb0, 0xa6, 0xcf, 0x10, 0x68, 0xaa, 0xca, 0x52,
+	0xcf, 0x9b, 0x70, 0x61, 0x80, 0x06, 0xc7, 0x8b, 0xb5, 0x7c, 0xed, 0x8f, 0x1c, 0x6c, 0x78, 0x8d,
+	0xff, 0x82, 0x81, 0xb2, 0x59, 0x35, 0x5c, 0xfd, 0x3a, 0x05, 0xb8, 0xaf, 0xd2, 0x76, 0xe4, 0x48,
+	0xf8, 0x13, 0x82, 0x59, 0xf5, 0x02, 0xe2, 0x9a, 0x1a, 0x4e, 0xaa, 0x49, 0x68, 0xcb, 0xe3, 0x5d,
+	0x8a, 0x38, 0xd1, 0xab, 0x6f, 0xbf, 0xff, 0x3c, 0xcb, 0xdd, 0xc2, 0x95, 0xd0, 0xd4, 0xde, 0x44,
+	0x42, 0xbf, 0xeb, 0xf9, 0xf4, 0x05, 0x69, 0x71, 0x66, 0x56, 0x4e, 0x4d, 0xc5, 0xf2, 0x7e, 0x40,
+	0x50, 0x50, 0xad, 0x1d, 0x5e, 0x52, 0x43, 0x48, 0x59, 0x51, 0x2d, 0xab, 0xfa, 0x86, 0x80, 0x86,
+	0x3a, 0xea, 0x83, 0xa9, 0x40, 0x69, 0x56, 0x4e, 0xf1, 0x67, 0x04, 0x73, 0x09, 0xbb, 0x8e, 0x13,
+	0xe8, 0x4a, 0xb7, 0x86, 0xec, 0x70, 0xd7, 0x05, 0xdc, 0x7b, 0xfa, 0x18, 0xbc, 0xde, 0x51, 0x2d,
+	0x29, 0xfe, 0x81, 0x60, 0x2e, 0xc1, 0x1b, 0x92, 0x66, 0x48, 0xb7, 0x92, 0xec, 0x33, 0x3c, 0x13,
+	0x33, 0xec, 0x54, 0x57, 0xc5, 0x0c, 0x0a, 0x70, 0x46, 0xa6, 0xd7, 0xa0, 0x9e, 0xeb, 0x3d, 0x82,
+	0xb9, 0x04, 0xef, 0x48, 0x9a, 0x2b, 0xdd, 0x6a, 0xb4, 0xd9, 0x11, 0x37, 0x7c, 0x10, 0xfe, 0x0d,
+	0xc7, 0xca, 0xa9, 0x8c, 0xa3, 0x9c, 0x33, 0x04, 0x78, 0xd4, 0x49, 0xb0, 0x99, 0x69, 0xc7, 0x7a,
+	0x6e, 0xa6, 0xdd, 0xce, 0x7e, 0x41, 0x2e, 0xa4, 0x26, 0xd0, 0x16, 0x30, 0xee, 0x7d, 0x65, 0xc4,
+	0x39, 0x6b, 0xe7, 0x08, 0x8a, 0x2d, 0xda, 0x55, 0xd6, 0x5c, 0x93, 0x1e, 0x23, 0xed, 0x65, 0x2b,
+	0xe4, 0x60, 0x0b, 0x3d, 0x5d, 0x95, 0xb9, 0x36, 0xed, 0x58, 0xae, 0x6d, 0x50, 0xdf, 0x36, 0x6d,
+	0xe2, 0x0a, 0x86, 0xcc, 0x28, 0x64, 0x79, 0x0e, 0x1b, 0xfc, 0xb8, 0x59, 0xe9, 0x3d, 0x9d, 0xe7,
+	0xb4, 0xf5, 0xa8, 0x40, 0xbd, 0x43, 0x83, 0x43, 0x63, 0xb3, 0xd7, 0x72, 0xb7, 0xf6, 0x2d, 0x0e,
+	0xee, 0x8b, 0xe0, 0x7e, 0x2f, 0xb8, 0xbf, 0x5b, 0x3b, 0x98, 0x14, 0x4d, 0x6a, 0xbf, 0x02, 0x00,
+	0x00, 0xff, 0xff, 0x27, 0xb8, 0x65, 0x92, 0x9f, 0x09, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2/dlp.pb.go b/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2/dlp.pb.go
new file mode 100644
index 00000000..3a33f215
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2/dlp.pb.go
@@ -0,0 +1,13276 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/privacy/dlp/v2/dlp.proto
+
+package dlp // import "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import date "google.golang.org/genproto/googleapis/type/date"
+import dayofweek "google.golang.org/genproto/googleapis/type/dayofweek"
+import timeofday "google.golang.org/genproto/googleapis/type/timeofday"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Options describing which parts of the provided content should be scanned.
+type ContentOption int32
+
+const (
+	// Includes entire content of a file or a data stream.
+	ContentOption_CONTENT_UNSPECIFIED ContentOption = 0
+	// Text content within the data, excluding any metadata.
+	ContentOption_CONTENT_TEXT ContentOption = 1
+	// Images found in the data.
+	ContentOption_CONTENT_IMAGE ContentOption = 2
+)
+
+var ContentOption_name = map[int32]string{
+	0: "CONTENT_UNSPECIFIED",
+	1: "CONTENT_TEXT",
+	2: "CONTENT_IMAGE",
+}
+var ContentOption_value = map[string]int32{
+	"CONTENT_UNSPECIFIED": 0,
+	"CONTENT_TEXT":        1,
+	"CONTENT_IMAGE":       2,
+}
+
+func (x ContentOption) String() string {
+	return proto.EnumName(ContentOption_name, int32(x))
+}
+func (ContentOption) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{0}
+}
+
+// Parts of the APIs which use certain infoTypes.
+type InfoTypeSupportedBy int32
+
+const (
+	InfoTypeSupportedBy_ENUM_TYPE_UNSPECIFIED InfoTypeSupportedBy = 0
+	// Supported by the inspect operations.
+	InfoTypeSupportedBy_INSPECT InfoTypeSupportedBy = 1
+	// Supported by the risk analysis operations.
+	InfoTypeSupportedBy_RISK_ANALYSIS InfoTypeSupportedBy = 2
+)
+
+var InfoTypeSupportedBy_name = map[int32]string{
+	0: "ENUM_TYPE_UNSPECIFIED",
+	1: "INSPECT",
+	2: "RISK_ANALYSIS",
+}
+var InfoTypeSupportedBy_value = map[string]int32{
+	"ENUM_TYPE_UNSPECIFIED": 0,
+	"INSPECT":               1,
+	"RISK_ANALYSIS":         2,
+}
+
+func (x InfoTypeSupportedBy) String() string {
+	return proto.EnumName(InfoTypeSupportedBy_name, int32(x))
+}
+func (InfoTypeSupportedBy) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{1}
+}
+
+// Operators available for comparing the value of fields.
+type RelationalOperator int32
+
+const (
+	RelationalOperator_RELATIONAL_OPERATOR_UNSPECIFIED RelationalOperator = 0
+	// Equal.
+	RelationalOperator_EQUAL_TO RelationalOperator = 1
+	// Not equal to.
+	RelationalOperator_NOT_EQUAL_TO RelationalOperator = 2
+	// Greater than.
+	RelationalOperator_GREATER_THAN RelationalOperator = 3
+	// Less than.
+	RelationalOperator_LESS_THAN RelationalOperator = 4
+	// Greater than or equals.
+	RelationalOperator_GREATER_THAN_OR_EQUALS RelationalOperator = 5
+	// Less than or equals.
+	RelationalOperator_LESS_THAN_OR_EQUALS RelationalOperator = 6
+	// Exists
+	RelationalOperator_EXISTS RelationalOperator = 7
+)
+
+var RelationalOperator_name = map[int32]string{
+	0: "RELATIONAL_OPERATOR_UNSPECIFIED",
+	1: "EQUAL_TO",
+	2: "NOT_EQUAL_TO",
+	3: "GREATER_THAN",
+	4: "LESS_THAN",
+	5: "GREATER_THAN_OR_EQUALS",
+	6: "LESS_THAN_OR_EQUALS",
+	7: "EXISTS",
+}
+var RelationalOperator_value = map[string]int32{
+	"RELATIONAL_OPERATOR_UNSPECIFIED": 0,
+	"EQUAL_TO":                        1,
+	"NOT_EQUAL_TO":                    2,
+	"GREATER_THAN":                    3,
+	"LESS_THAN":                       4,
+	"GREATER_THAN_OR_EQUALS":          5,
+	"LESS_THAN_OR_EQUALS":             6,
+	"EXISTS":                          7,
+}
+
+func (x RelationalOperator) String() string {
+	return proto.EnumName(RelationalOperator_name, int32(x))
+}
+func (RelationalOperator) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{2}
+}
+
+// An enum to represent the various type of DLP jobs.
+type DlpJobType int32
+
+const (
+	DlpJobType_DLP_JOB_TYPE_UNSPECIFIED DlpJobType = 0
+	// The job inspected Google Cloud for sensitive data.
+	DlpJobType_INSPECT_JOB DlpJobType = 1
+	// The job executed a Risk Analysis computation.
+	DlpJobType_RISK_ANALYSIS_JOB DlpJobType = 2
+)
+
+var DlpJobType_name = map[int32]string{
+	0: "DLP_JOB_TYPE_UNSPECIFIED",
+	1: "INSPECT_JOB",
+	2: "RISK_ANALYSIS_JOB",
+}
+var DlpJobType_value = map[string]int32{
+	"DLP_JOB_TYPE_UNSPECIFIED": 0,
+	"INSPECT_JOB":              1,
+	"RISK_ANALYSIS_JOB":        2,
+}
+
+func (x DlpJobType) String() string {
+	return proto.EnumName(DlpJobType_name, int32(x))
+}
+func (DlpJobType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{3}
+}
+
+type ByteContentItem_BytesType int32
+
+const (
+	ByteContentItem_BYTES_TYPE_UNSPECIFIED ByteContentItem_BytesType = 0
+	ByteContentItem_IMAGE                  ByteContentItem_BytesType = 6
+	ByteContentItem_IMAGE_JPEG             ByteContentItem_BytesType = 1
+	ByteContentItem_IMAGE_BMP              ByteContentItem_BytesType = 2
+	ByteContentItem_IMAGE_PNG              ByteContentItem_BytesType = 3
+	ByteContentItem_IMAGE_SVG              ByteContentItem_BytesType = 4
+	ByteContentItem_TEXT_UTF8              ByteContentItem_BytesType = 5
+)
+
+var ByteContentItem_BytesType_name = map[int32]string{
+	0: "BYTES_TYPE_UNSPECIFIED",
+	6: "IMAGE",
+	1: "IMAGE_JPEG",
+	2: "IMAGE_BMP",
+	3: "IMAGE_PNG",
+	4: "IMAGE_SVG",
+	5: "TEXT_UTF8",
+}
+var ByteContentItem_BytesType_value = map[string]int32{
+	"BYTES_TYPE_UNSPECIFIED": 0,
+	"IMAGE":                  6,
+	"IMAGE_JPEG":             1,
+	"IMAGE_BMP":              2,
+	"IMAGE_PNG":              3,
+	"IMAGE_SVG":              4,
+	"TEXT_UTF8":              5,
+}
+
+func (x ByteContentItem_BytesType) String() string {
+	return proto.EnumName(ByteContentItem_BytesType_name, int32(x))
+}
+func (ByteContentItem_BytesType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{1, 0}
+}
+
+// Predefined schemas for storing findings.
+type OutputStorageConfig_OutputSchema int32
+
+const (
+	OutputStorageConfig_OUTPUT_SCHEMA_UNSPECIFIED OutputStorageConfig_OutputSchema = 0
+	// Basic schema including only `info_type`, `quote`, `certainty`, and
+	// `timestamp`.
+	OutputStorageConfig_BASIC_COLUMNS OutputStorageConfig_OutputSchema = 1
+	// Schema tailored to findings from scanning Google Cloud Storage.
+	OutputStorageConfig_GCS_COLUMNS OutputStorageConfig_OutputSchema = 2
+	// Schema tailored to findings from scanning Google Datastore.
+	OutputStorageConfig_DATASTORE_COLUMNS OutputStorageConfig_OutputSchema = 3
+	// Schema tailored to findings from scanning Google BigQuery.
+	OutputStorageConfig_BIG_QUERY_COLUMNS OutputStorageConfig_OutputSchema = 4
+	// Schema containing all columns.
+	OutputStorageConfig_ALL_COLUMNS OutputStorageConfig_OutputSchema = 5
+)
+
+var OutputStorageConfig_OutputSchema_name = map[int32]string{
+	0: "OUTPUT_SCHEMA_UNSPECIFIED",
+	1: "BASIC_COLUMNS",
+	2: "GCS_COLUMNS",
+	3: "DATASTORE_COLUMNS",
+	4: "BIG_QUERY_COLUMNS",
+	5: "ALL_COLUMNS",
+}
+var OutputStorageConfig_OutputSchema_value = map[string]int32{
+	"OUTPUT_SCHEMA_UNSPECIFIED": 0,
+	"BASIC_COLUMNS":             1,
+	"GCS_COLUMNS":               2,
+	"DATASTORE_COLUMNS":         3,
+	"BIG_QUERY_COLUMNS":         4,
+	"ALL_COLUMNS":               5,
+}
+
+func (x OutputStorageConfig_OutputSchema) String() string {
+	return proto.EnumName(OutputStorageConfig_OutputSchema_name, int32(x))
+}
+func (OutputStorageConfig_OutputSchema) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{23, 0}
+}
+
+type TimePartConfig_TimePart int32
+
+const (
+	TimePartConfig_TIME_PART_UNSPECIFIED TimePartConfig_TimePart = 0
+	// [0-9999]
+	TimePartConfig_YEAR TimePartConfig_TimePart = 1
+	// [1-12]
+	TimePartConfig_MONTH TimePartConfig_TimePart = 2
+	// [1-31]
+	TimePartConfig_DAY_OF_MONTH TimePartConfig_TimePart = 3
+	// [1-7]
+	TimePartConfig_DAY_OF_WEEK TimePartConfig_TimePart = 4
+	// [1-52]
+	TimePartConfig_WEEK_OF_YEAR TimePartConfig_TimePart = 5
+	// [0-23]
+	TimePartConfig_HOUR_OF_DAY TimePartConfig_TimePart = 6
+)
+
+var TimePartConfig_TimePart_name = map[int32]string{
+	0: "TIME_PART_UNSPECIFIED",
+	1: "YEAR",
+	2: "MONTH",
+	3: "DAY_OF_MONTH",
+	4: "DAY_OF_WEEK",
+	5: "WEEK_OF_YEAR",
+	6: "HOUR_OF_DAY",
+}
+var TimePartConfig_TimePart_value = map[string]int32{
+	"TIME_PART_UNSPECIFIED": 0,
+	"YEAR":                  1,
+	"MONTH":                 2,
+	"DAY_OF_MONTH":          3,
+	"DAY_OF_WEEK":           4,
+	"WEEK_OF_YEAR":          5,
+	"HOUR_OF_DAY":           6,
+}
+
+func (x TimePartConfig_TimePart) String() string {
+	return proto.EnumName(TimePartConfig_TimePart_name, int32(x))
+}
+func (TimePartConfig_TimePart) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{40, 0}
+}
+
+type CharsToIgnore_CommonCharsToIgnore int32
+
+const (
+	CharsToIgnore_COMMON_CHARS_TO_IGNORE_UNSPECIFIED CharsToIgnore_CommonCharsToIgnore = 0
+	// 0-9
+	CharsToIgnore_NUMERIC CharsToIgnore_CommonCharsToIgnore = 1
+	// A-Z
+	CharsToIgnore_ALPHA_UPPER_CASE CharsToIgnore_CommonCharsToIgnore = 2
+	// a-z
+	CharsToIgnore_ALPHA_LOWER_CASE CharsToIgnore_CommonCharsToIgnore = 3
+	// US Punctuation, one of !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
+	CharsToIgnore_PUNCTUATION CharsToIgnore_CommonCharsToIgnore = 4
+	// Whitespace character, one of [ \t\n\x0B\f\r]
+	CharsToIgnore_WHITESPACE CharsToIgnore_CommonCharsToIgnore = 5
+)
+
+var CharsToIgnore_CommonCharsToIgnore_name = map[int32]string{
+	0: "COMMON_CHARS_TO_IGNORE_UNSPECIFIED",
+	1: "NUMERIC",
+	2: "ALPHA_UPPER_CASE",
+	3: "ALPHA_LOWER_CASE",
+	4: "PUNCTUATION",
+	5: "WHITESPACE",
+}
+var CharsToIgnore_CommonCharsToIgnore_value = map[string]int32{
+	"COMMON_CHARS_TO_IGNORE_UNSPECIFIED": 0,
+	"NUMERIC":          1,
+	"ALPHA_UPPER_CASE": 2,
+	"ALPHA_LOWER_CASE": 3,
+	"PUNCTUATION":      4,
+	"WHITESPACE":       5,
+}
+
+func (x CharsToIgnore_CommonCharsToIgnore) String() string {
+	return proto.EnumName(CharsToIgnore_CommonCharsToIgnore_name, int32(x))
+}
+func (CharsToIgnore_CommonCharsToIgnore) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{45, 0}
+}
+
+// These are commonly used subsets of the alphabet that the FFX mode
+// natively supports. In the algorithm, the alphabet is selected using
+// the "radix". Therefore each corresponds to particular radix.
+type CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet int32
+
+const (
+	CryptoReplaceFfxFpeConfig_FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 0
+	// [0-9] (radix of 10)
+	CryptoReplaceFfxFpeConfig_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 1
+	// [0-9A-F] (radix of 16)
+	CryptoReplaceFfxFpeConfig_HEXADECIMAL CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 2
+	// [0-9A-Z] (radix of 36)
+	CryptoReplaceFfxFpeConfig_UPPER_CASE_ALPHA_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 3
+	// [0-9A-Za-z] (radix of 62)
+	CryptoReplaceFfxFpeConfig_ALPHA_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 4
+)
+
+var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name = map[int32]string{
+	0: "FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED",
+	1: "NUMERIC",
+	2: "HEXADECIMAL",
+	3: "UPPER_CASE_ALPHA_NUMERIC",
+	4: "ALPHA_NUMERIC",
+}
+var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value = map[string]int32{
+	"FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED": 0,
+	"NUMERIC":                  1,
+	"HEXADECIMAL":              2,
+	"UPPER_CASE_ALPHA_NUMERIC": 3,
+	"ALPHA_NUMERIC":            4,
+}
+
+func (x CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet) String() string {
+	return proto.EnumName(CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, int32(x))
+}
+func (CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{49, 0}
+}
+
+type RecordCondition_Expressions_LogicalOperator int32
+
+const (
+	RecordCondition_Expressions_LOGICAL_OPERATOR_UNSPECIFIED RecordCondition_Expressions_LogicalOperator = 0
+	RecordCondition_Expressions_AND                          RecordCondition_Expressions_LogicalOperator = 1
+)
+
+var RecordCondition_Expressions_LogicalOperator_name = map[int32]string{
+	0: "LOGICAL_OPERATOR_UNSPECIFIED",
+	1: "AND",
+}
+var RecordCondition_Expressions_LogicalOperator_value = map[string]int32{
+	"LOGICAL_OPERATOR_UNSPECIFIED": 0,
+	"AND": 1,
+}
+
+func (x RecordCondition_Expressions_LogicalOperator) String() string {
+	return proto.EnumName(RecordCondition_Expressions_LogicalOperator_name, int32(x))
+}
+func (RecordCondition_Expressions_LogicalOperator) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{59, 2, 0}
+}
+
+// Possible outcomes of transformations.
+type TransformationSummary_TransformationResultCode int32
+
+const (
+	TransformationSummary_TRANSFORMATION_RESULT_CODE_UNSPECIFIED TransformationSummary_TransformationResultCode = 0
+	TransformationSummary_SUCCESS                                TransformationSummary_TransformationResultCode = 1
+	TransformationSummary_ERROR                                  TransformationSummary_TransformationResultCode = 2
+)
+
+var TransformationSummary_TransformationResultCode_name = map[int32]string{
+	0: "TRANSFORMATION_RESULT_CODE_UNSPECIFIED",
+	1: "SUCCESS",
+	2: "ERROR",
+}
+var TransformationSummary_TransformationResultCode_value = map[string]int32{
+	"TRANSFORMATION_RESULT_CODE_UNSPECIFIED": 0,
+	"SUCCESS": 1,
+	"ERROR":   2,
+}
+
+func (x TransformationSummary_TransformationResultCode) String() string {
+	return proto.EnumName(TransformationSummary_TransformationResultCode_name, int32(x))
+}
+func (TransformationSummary_TransformationResultCode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{61, 0}
+}
+
+// Whether the trigger is currently active. If PAUSED or CANCELLED, no jobs
+// will be created with this configuration. The service may automatically
+// pause triggers experiencing frequent errors. To restart a job, set the
+// status to HEALTHY after correcting user errors.
+type JobTrigger_Status int32
+
+const (
+	JobTrigger_STATUS_UNSPECIFIED JobTrigger_Status = 0
+	// Trigger is healthy.
+	JobTrigger_HEALTHY JobTrigger_Status = 1
+	// Trigger is temporarily paused.
+	JobTrigger_PAUSED JobTrigger_Status = 2
+	// Trigger is cancelled and can not be resumed.
+	JobTrigger_CANCELLED JobTrigger_Status = 3
+)
+
+var JobTrigger_Status_name = map[int32]string{
+	0: "STATUS_UNSPECIFIED",
+	1: "HEALTHY",
+	2: "PAUSED",
+	3: "CANCELLED",
+}
+var JobTrigger_Status_value = map[string]int32{
+	"STATUS_UNSPECIFIED": 0,
+	"HEALTHY":            1,
+	"PAUSED":             2,
+	"CANCELLED":          3,
+}
+
+func (x JobTrigger_Status) String() string {
+	return proto.EnumName(JobTrigger_Status_name, int32(x))
+}
+func (JobTrigger_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{66, 0}
+}
+
+type DlpJob_JobState int32
+
+const (
+	DlpJob_JOB_STATE_UNSPECIFIED DlpJob_JobState = 0
+	// The job has not yet started.
+	DlpJob_PENDING DlpJob_JobState = 1
+	// The job is currently running.
+	DlpJob_RUNNING DlpJob_JobState = 2
+	// The job is no longer running.
+	DlpJob_DONE DlpJob_JobState = 3
+	// The job was canceled before it could complete.
+	DlpJob_CANCELED DlpJob_JobState = 4
+	// The job had an error and did not complete.
+	DlpJob_FAILED DlpJob_JobState = 5
+)
+
+var DlpJob_JobState_name = map[int32]string{
+	0: "JOB_STATE_UNSPECIFIED",
+	1: "PENDING",
+	2: "RUNNING",
+	3: "DONE",
+	4: "CANCELED",
+	5: "FAILED",
+}
+var DlpJob_JobState_value = map[string]int32{
+	"JOB_STATE_UNSPECIFIED": 0,
+	"PENDING":               1,
+	"RUNNING":               2,
+	"DONE":                  3,
+	"CANCELED":              4,
+	"FAILED":                5,
+}
+
+func (x DlpJob_JobState) String() string {
+	return proto.EnumName(DlpJob_JobState_name, int32(x))
+}
+func (DlpJob_JobState) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{82, 0}
+}
+
+// Configuration description of the scanning process.
+// When used with redactContent only info_types and min_likelihood are currently
+// used.
+type InspectConfig struct {
+	// Restricts what info_types to look for. The values must correspond to
+	// InfoType values returned by ListInfoTypes or listed at
+	// https://cloud.google.com/dlp/docs/infotypes-reference.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in a request, the
+	// system may automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	InfoTypes []*InfoType `protobuf:"bytes,1,rep,name=info_types,json=infoTypes,proto3" json:"info_types,omitempty"`
+	// Only returns findings equal or above this threshold. The default is
+	// POSSIBLE.
+	// See https://cloud.google.com/dlp/docs/likelihood to learn more.
+	MinLikelihood Likelihood                   `protobuf:"varint,2,opt,name=min_likelihood,json=minLikelihood,proto3,enum=google.privacy.dlp.v2.Likelihood" json:"min_likelihood,omitempty"`
+	Limits        *InspectConfig_FindingLimits `protobuf:"bytes,3,opt,name=limits,proto3" json:"limits,omitempty"`
+	// When true, a contextual quote from the data that triggered a finding is
+	// included in the response; see Finding.quote.
+	IncludeQuote bool `protobuf:"varint,4,opt,name=include_quote,json=includeQuote,proto3" json:"include_quote,omitempty"`
+	// When true, excludes type information of the findings.
+	ExcludeInfoTypes bool `protobuf:"varint,5,opt,name=exclude_info_types,json=excludeInfoTypes,proto3" json:"exclude_info_types,omitempty"`
+	// CustomInfoTypes provided by the user. See
+	// https://cloud.google.com/dlp/docs/creating-custom-infotypes to learn more.
+	CustomInfoTypes []*CustomInfoType `protobuf:"bytes,6,rep,name=custom_info_types,json=customInfoTypes,proto3" json:"custom_info_types,omitempty"`
+	// List of options defining data content to scan.
+	// If empty, text, images, and other content will be included.
+	ContentOptions       []ContentOption `protobuf:"varint,8,rep,packed,name=content_options,json=contentOptions,proto3,enum=google.privacy.dlp.v2.ContentOption" json:"content_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *InspectConfig) Reset()         { *m = InspectConfig{} }
+func (m *InspectConfig) String() string { return proto.CompactTextString(m) }
+func (*InspectConfig) ProtoMessage()    {}
+func (*InspectConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{0}
+}
+func (m *InspectConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectConfig.Unmarshal(m, b)
+}
+func (m *InspectConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectConfig.Marshal(b, m, deterministic)
+}
+func (dst *InspectConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectConfig.Merge(dst, src)
+}
+func (m *InspectConfig) XXX_Size() int {
+	return xxx_messageInfo_InspectConfig.Size(m)
+}
+func (m *InspectConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectConfig proto.InternalMessageInfo
+
+func (m *InspectConfig) GetInfoTypes() []*InfoType {
+	if m != nil {
+		return m.InfoTypes
+	}
+	return nil
+}
+
+func (m *InspectConfig) GetMinLikelihood() Likelihood {
+	if m != nil {
+		return m.MinLikelihood
+	}
+	return Likelihood_LIKELIHOOD_UNSPECIFIED
+}
+
+func (m *InspectConfig) GetLimits() *InspectConfig_FindingLimits {
+	if m != nil {
+		return m.Limits
+	}
+	return nil
+}
+
+func (m *InspectConfig) GetIncludeQuote() bool {
+	if m != nil {
+		return m.IncludeQuote
+	}
+	return false
+}
+
+func (m *InspectConfig) GetExcludeInfoTypes() bool {
+	if m != nil {
+		return m.ExcludeInfoTypes
+	}
+	return false
+}
+
+func (m *InspectConfig) GetCustomInfoTypes() []*CustomInfoType {
+	if m != nil {
+		return m.CustomInfoTypes
+	}
+	return nil
+}
+
+func (m *InspectConfig) GetContentOptions() []ContentOption {
+	if m != nil {
+		return m.ContentOptions
+	}
+	return nil
+}
+
+type InspectConfig_FindingLimits struct {
+	// Max number of findings that will be returned for each item scanned.
+	// When set within `InspectDataSourceRequest`,
+	// the maximum returned is 1000 regardless if this is set higher.
+	// When set within `InspectContentRequest`, this field is ignored.
+	MaxFindingsPerItem int32 `protobuf:"varint,1,opt,name=max_findings_per_item,json=maxFindingsPerItem,proto3" json:"max_findings_per_item,omitempty"`
+	// Max number of findings that will be returned per request/job.
+	// When set within `InspectContentRequest`, the maximum returned is 1000
+	// regardless if this is set higher.
+	MaxFindingsPerRequest int32 `protobuf:"varint,2,opt,name=max_findings_per_request,json=maxFindingsPerRequest,proto3" json:"max_findings_per_request,omitempty"`
+	// Configuration of findings limit given for specified infoTypes.
+	MaxFindingsPerInfoType []*InspectConfig_FindingLimits_InfoTypeLimit `protobuf:"bytes,3,rep,name=max_findings_per_info_type,json=maxFindingsPerInfoType,proto3" json:"max_findings_per_info_type,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{}                                     `json:"-"`
+	XXX_unrecognized       []byte                                       `json:"-"`
+	XXX_sizecache          int32                                        `json:"-"`
+}
+
+func (m *InspectConfig_FindingLimits) Reset()         { *m = InspectConfig_FindingLimits{} }
+func (m *InspectConfig_FindingLimits) String() string { return proto.CompactTextString(m) }
+func (*InspectConfig_FindingLimits) ProtoMessage()    {}
+func (*InspectConfig_FindingLimits) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{0, 0}
+}
+func (m *InspectConfig_FindingLimits) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectConfig_FindingLimits.Unmarshal(m, b)
+}
+func (m *InspectConfig_FindingLimits) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectConfig_FindingLimits.Marshal(b, m, deterministic)
+}
+func (dst *InspectConfig_FindingLimits) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectConfig_FindingLimits.Merge(dst, src)
+}
+func (m *InspectConfig_FindingLimits) XXX_Size() int {
+	return xxx_messageInfo_InspectConfig_FindingLimits.Size(m)
+}
+func (m *InspectConfig_FindingLimits) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectConfig_FindingLimits.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectConfig_FindingLimits proto.InternalMessageInfo
+
+func (m *InspectConfig_FindingLimits) GetMaxFindingsPerItem() int32 {
+	if m != nil {
+		return m.MaxFindingsPerItem
+	}
+	return 0
+}
+
+func (m *InspectConfig_FindingLimits) GetMaxFindingsPerRequest() int32 {
+	if m != nil {
+		return m.MaxFindingsPerRequest
+	}
+	return 0
+}
+
+func (m *InspectConfig_FindingLimits) GetMaxFindingsPerInfoType() []*InspectConfig_FindingLimits_InfoTypeLimit {
+	if m != nil {
+		return m.MaxFindingsPerInfoType
+	}
+	return nil
+}
+
+// Max findings configuration per infoType, per content item or long
+// running DlpJob.
+type InspectConfig_FindingLimits_InfoTypeLimit struct {
+	// Type of information the findings limit applies to. Only one limit per
+	// info_type should be provided. If InfoTypeLimit does not have an
+	// info_type, the DLP API applies the limit against all info_types that
+	// are found but not specified in another InfoTypeLimit.
+	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType,proto3" json:"info_type,omitempty"`
+	// Max findings limit for the given infoType.
+	MaxFindings          int32    `protobuf:"varint,2,opt,name=max_findings,json=maxFindings,proto3" json:"max_findings,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) Reset() {
+	*m = InspectConfig_FindingLimits_InfoTypeLimit{}
+}
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) String() string { return proto.CompactTextString(m) }
+func (*InspectConfig_FindingLimits_InfoTypeLimit) ProtoMessage()    {}
+func (*InspectConfig_FindingLimits_InfoTypeLimit) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{0, 0, 0}
+}
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Unmarshal(m, b)
+}
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Marshal(b, m, deterministic)
+}
+func (dst *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Merge(dst, src)
+}
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) XXX_Size() int {
+	return xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.Size(m)
+}
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectConfig_FindingLimits_InfoTypeLimit proto.InternalMessageInfo
+
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) GetInfoType() *InfoType {
+	if m != nil {
+		return m.InfoType
+	}
+	return nil
+}
+
+func (m *InspectConfig_FindingLimits_InfoTypeLimit) GetMaxFindings() int32 {
+	if m != nil {
+		return m.MaxFindings
+	}
+	return 0
+}
+
+// Container for bytes to inspect or redact.
+type ByteContentItem struct {
+	// The type of data stored in the bytes string. Default will be TEXT_UTF8.
+	Type ByteContentItem_BytesType `protobuf:"varint,1,opt,name=type,proto3,enum=google.privacy.dlp.v2.ByteContentItem_BytesType" json:"type,omitempty"`
+	// Content data to inspect or redact.
+	Data                 []byte   `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ByteContentItem) Reset()         { *m = ByteContentItem{} }
+func (m *ByteContentItem) String() string { return proto.CompactTextString(m) }
+func (*ByteContentItem) ProtoMessage()    {}
+func (*ByteContentItem) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{1}
+}
+func (m *ByteContentItem) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ByteContentItem.Unmarshal(m, b)
+}
+func (m *ByteContentItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ByteContentItem.Marshal(b, m, deterministic)
+}
+func (dst *ByteContentItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ByteContentItem.Merge(dst, src)
+}
+func (m *ByteContentItem) XXX_Size() int {
+	return xxx_messageInfo_ByteContentItem.Size(m)
+}
+func (m *ByteContentItem) XXX_DiscardUnknown() {
+	xxx_messageInfo_ByteContentItem.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ByteContentItem proto.InternalMessageInfo
+
+func (m *ByteContentItem) GetType() ByteContentItem_BytesType {
+	if m != nil {
+		return m.Type
+	}
+	return ByteContentItem_BYTES_TYPE_UNSPECIFIED
+}
+
+func (m *ByteContentItem) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+// Container structure for the content to inspect.
+type ContentItem struct {
+	// Data of the item either in the byte array or UTF-8 string form, or table.
+	//
+	// Types that are valid to be assigned to DataItem:
+	//	*ContentItem_Value
+	//	*ContentItem_Table
+	//	*ContentItem_ByteItem
+	DataItem             isContentItem_DataItem `protobuf_oneof:"data_item"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *ContentItem) Reset()         { *m = ContentItem{} }
+func (m *ContentItem) String() string { return proto.CompactTextString(m) }
+func (*ContentItem) ProtoMessage()    {}
+func (*ContentItem) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{2}
+}
+func (m *ContentItem) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentItem.Unmarshal(m, b)
+}
+func (m *ContentItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentItem.Marshal(b, m, deterministic)
+}
+func (dst *ContentItem) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentItem.Merge(dst, src)
+}
+func (m *ContentItem) XXX_Size() int {
+	return xxx_messageInfo_ContentItem.Size(m)
+}
+func (m *ContentItem) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentItem.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentItem proto.InternalMessageInfo
+
+type isContentItem_DataItem interface {
+	isContentItem_DataItem()
+}
+
+type ContentItem_Value struct {
+	Value string `protobuf:"bytes,3,opt,name=value,proto3,oneof"`
+}
+
+type ContentItem_Table struct {
+	Table *Table `protobuf:"bytes,4,opt,name=table,proto3,oneof"`
+}
+
+type ContentItem_ByteItem struct {
+	ByteItem *ByteContentItem `protobuf:"bytes,5,opt,name=byte_item,json=byteItem,proto3,oneof"`
+}
+
+func (*ContentItem_Value) isContentItem_DataItem() {}
+
+func (*ContentItem_Table) isContentItem_DataItem() {}
+
+func (*ContentItem_ByteItem) isContentItem_DataItem() {}
+
+func (m *ContentItem) GetDataItem() isContentItem_DataItem {
+	if m != nil {
+		return m.DataItem
+	}
+	return nil
+}
+
+func (m *ContentItem) GetValue() string {
+	if x, ok := m.GetDataItem().(*ContentItem_Value); ok {
+		return x.Value
+	}
+	return ""
+}
+
+func (m *ContentItem) GetTable() *Table {
+	if x, ok := m.GetDataItem().(*ContentItem_Table); ok {
+		return x.Table
+	}
+	return nil
+}
+
+func (m *ContentItem) GetByteItem() *ByteContentItem {
+	if x, ok := m.GetDataItem().(*ContentItem_ByteItem); ok {
+		return x.ByteItem
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ContentItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ContentItem_OneofMarshaler, _ContentItem_OneofUnmarshaler, _ContentItem_OneofSizer, []interface{}{
+		(*ContentItem_Value)(nil),
+		(*ContentItem_Table)(nil),
+		(*ContentItem_ByteItem)(nil),
+	}
+}
+
+func _ContentItem_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ContentItem)
+	// data_item
+	switch x := m.DataItem.(type) {
+	case *ContentItem_Value:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Value)
+	case *ContentItem_Table:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Table); err != nil {
+			return err
+		}
+	case *ContentItem_ByteItem:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ByteItem); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("ContentItem.DataItem has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ContentItem_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ContentItem)
+	switch tag {
+	case 3: // data_item.value
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.DataItem = &ContentItem_Value{x}
+		return true, err
+	case 4: // data_item.table
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Table)
+		err := b.DecodeMessage(msg)
+		m.DataItem = &ContentItem_Table{msg}
+		return true, err
+	case 5: // data_item.byte_item
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ByteContentItem)
+		err := b.DecodeMessage(msg)
+		m.DataItem = &ContentItem_ByteItem{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ContentItem_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ContentItem)
+	// data_item
+	switch x := m.DataItem.(type) {
+	case *ContentItem_Value:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Value)))
+		n += len(x.Value)
+	case *ContentItem_Table:
+		s := proto.Size(x.Table)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ContentItem_ByteItem:
+		s := proto.Size(x.ByteItem)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Structured content to inspect. Up to 50,000 `Value`s per request allowed.
+// See https://cloud.google.com/dlp/docs/inspecting-text#inspecting_a_table to
+// learn more.
+type Table struct {
+	Headers              []*FieldId   `protobuf:"bytes,1,rep,name=headers,proto3" json:"headers,omitempty"`
+	Rows                 []*Table_Row `protobuf:"bytes,2,rep,name=rows,proto3" json:"rows,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Table) Reset()         { *m = Table{} }
+func (m *Table) String() string { return proto.CompactTextString(m) }
+func (*Table) ProtoMessage()    {}
+func (*Table) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{3}
+}
+func (m *Table) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Table.Unmarshal(m, b)
+}
+func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Table.Marshal(b, m, deterministic)
+}
+func (dst *Table) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table.Merge(dst, src)
+}
+func (m *Table) XXX_Size() int {
+	return xxx_messageInfo_Table.Size(m)
+}
+func (m *Table) XXX_DiscardUnknown() {
+	xxx_messageInfo_Table.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Table proto.InternalMessageInfo
+
+func (m *Table) GetHeaders() []*FieldId {
+	if m != nil {
+		return m.Headers
+	}
+	return nil
+}
+
+func (m *Table) GetRows() []*Table_Row {
+	if m != nil {
+		return m.Rows
+	}
+	return nil
+}
+
+type Table_Row struct {
+	Values               []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Table_Row) Reset()         { *m = Table_Row{} }
+func (m *Table_Row) String() string { return proto.CompactTextString(m) }
+func (*Table_Row) ProtoMessage()    {}
+func (*Table_Row) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{3, 0}
+}
+func (m *Table_Row) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Table_Row.Unmarshal(m, b)
+}
+func (m *Table_Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Table_Row.Marshal(b, m, deterministic)
+}
+func (dst *Table_Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Table_Row.Merge(dst, src)
+}
+func (m *Table_Row) XXX_Size() int {
+	return xxx_messageInfo_Table_Row.Size(m)
+}
+func (m *Table_Row) XXX_DiscardUnknown() {
+	xxx_messageInfo_Table_Row.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Table_Row proto.InternalMessageInfo
+
+func (m *Table_Row) GetValues() []*Value {
+	if m != nil {
+		return m.Values
+	}
+	return nil
+}
+
+// All the findings for a single scanned item.
+type InspectResult struct {
+	// List of findings for an item.
+	Findings []*Finding `protobuf:"bytes,1,rep,name=findings,proto3" json:"findings,omitempty"`
+	// If true, then this item might have more findings than were returned,
+	// and the findings returned are an arbitrary subset of all findings.
+	// The findings list might be truncated because the input items were too
+	// large, or because the server reached the maximum amount of resources
+	// allowed for a single API call. For best results, divide the input into
+	// smaller batches.
+	FindingsTruncated    bool     `protobuf:"varint,2,opt,name=findings_truncated,json=findingsTruncated,proto3" json:"findings_truncated,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InspectResult) Reset()         { *m = InspectResult{} }
+func (m *InspectResult) String() string { return proto.CompactTextString(m) }
+func (*InspectResult) ProtoMessage()    {}
+func (*InspectResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{4}
+}
+func (m *InspectResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectResult.Unmarshal(m, b)
+}
+func (m *InspectResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectResult.Marshal(b, m, deterministic)
+}
+func (dst *InspectResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectResult.Merge(dst, src)
+}
+func (m *InspectResult) XXX_Size() int {
+	return xxx_messageInfo_InspectResult.Size(m)
+}
+func (m *InspectResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectResult proto.InternalMessageInfo
+
+func (m *InspectResult) GetFindings() []*Finding {
+	if m != nil {
+		return m.Findings
+	}
+	return nil
+}
+
+func (m *InspectResult) GetFindingsTruncated() bool {
+	if m != nil {
+		return m.FindingsTruncated
+	}
+	return false
+}
+
+// Represents a piece of potentially sensitive content.
+type Finding struct {
+	// The content that was found. Even if the content is not textual, it
+	// may be converted to a textual representation here.
+	// Provided if `include_quote` is true and the finding is
+	// less than or equal to 4096 bytes long. If the finding exceeds 4096 bytes
+	// in length, the quote may be omitted.
+	Quote string `protobuf:"bytes,1,opt,name=quote,proto3" json:"quote,omitempty"`
+	// The type of content that might have been found.
+	// Provided if `excluded_types` is false.
+	InfoType *InfoType `protobuf:"bytes,2,opt,name=info_type,json=infoType,proto3" json:"info_type,omitempty"`
+	// Confidence of how likely it is that the `info_type` is correct.
+	Likelihood Likelihood `protobuf:"varint,3,opt,name=likelihood,proto3,enum=google.privacy.dlp.v2.Likelihood" json:"likelihood,omitempty"`
+	// Where the content was found.
+	Location *Location `protobuf:"bytes,4,opt,name=location,proto3" json:"location,omitempty"`
+	// Timestamp when finding was detected.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Contains data parsed from quotes. Only populated if include_quote was set
+	// to true and a supported infoType was requested. Currently supported
+	// infoTypes: DATE, DATE_OF_BIRTH and TIME.
+	QuoteInfo            *QuoteInfo `protobuf:"bytes,7,opt,name=quote_info,json=quoteInfo,proto3" json:"quote_info,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *Finding) Reset()         { *m = Finding{} }
+func (m *Finding) String() string { return proto.CompactTextString(m) }
+func (*Finding) ProtoMessage()    {}
+func (*Finding) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{5}
+}
+func (m *Finding) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Finding.Unmarshal(m, b)
+}
+func (m *Finding) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Finding.Marshal(b, m, deterministic)
+}
+func (dst *Finding) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Finding.Merge(dst, src)
+}
+func (m *Finding) XXX_Size() int {
+	return xxx_messageInfo_Finding.Size(m)
+}
+func (m *Finding) XXX_DiscardUnknown() {
+	xxx_messageInfo_Finding.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Finding proto.InternalMessageInfo
+
+func (m *Finding) GetQuote() string {
+	if m != nil {
+		return m.Quote
+	}
+	return ""
+}
+
+func (m *Finding) GetInfoType() *InfoType {
+	if m != nil {
+		return m.InfoType
+	}
+	return nil
+}
+
+func (m *Finding) GetLikelihood() Likelihood {
+	if m != nil {
+		return m.Likelihood
+	}
+	return Likelihood_LIKELIHOOD_UNSPECIFIED
+}
+
+func (m *Finding) GetLocation() *Location {
+	if m != nil {
+		return m.Location
+	}
+	return nil
+}
+
+func (m *Finding) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *Finding) GetQuoteInfo() *QuoteInfo {
+	if m != nil {
+		return m.QuoteInfo
+	}
+	return nil
+}
+
+// Specifies the location of the finding.
+type Location struct {
+	// Zero-based byte offsets delimiting the finding.
+	// These are relative to the finding's containing element.
+	// Note that when the content is not textual, this references
+	// the UTF-8 encoded textual representation of the content.
+	// Omitted if content is an image.
+	ByteRange *Range `protobuf:"bytes,1,opt,name=byte_range,json=byteRange,proto3" json:"byte_range,omitempty"`
+	// Unicode character offsets delimiting the finding.
+	// These are relative to the finding's containing element.
+	// Provided when the content is text.
+	CodepointRange *Range `protobuf:"bytes,2,opt,name=codepoint_range,json=codepointRange,proto3" json:"codepoint_range,omitempty"`
+	// List of nested objects pointing to the precise location of the finding
+	// within the file or record.
+	ContentLocations     []*ContentLocation `protobuf:"bytes,7,rep,name=content_locations,json=contentLocations,proto3" json:"content_locations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Location) Reset()         { *m = Location{} }
+func (m *Location) String() string { return proto.CompactTextString(m) }
+func (*Location) ProtoMessage()    {}
+func (*Location) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{6}
+}
+func (m *Location) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Location.Unmarshal(m, b)
+}
+func (m *Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Location.Marshal(b, m, deterministic)
+}
+func (dst *Location) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Location.Merge(dst, src)
+}
+func (m *Location) XXX_Size() int {
+	return xxx_messageInfo_Location.Size(m)
+}
+func (m *Location) XXX_DiscardUnknown() {
+	xxx_messageInfo_Location.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Location proto.InternalMessageInfo
+
+func (m *Location) GetByteRange() *Range {
+	if m != nil {
+		return m.ByteRange
+	}
+	return nil
+}
+
+func (m *Location) GetCodepointRange() *Range {
+	if m != nil {
+		return m.CodepointRange
+	}
+	return nil
+}
+
+func (m *Location) GetContentLocations() []*ContentLocation {
+	if m != nil {
+		return m.ContentLocations
+	}
+	return nil
+}
+
+// Findings container location data.
+type ContentLocation struct {
+	// Name of the container where the finding is located.
+	// The top level name is the source file name or table name. Nested names
+	// could be absent if the embedded object has no string identifier
+	// (for an example an image contained within a document).
+	ContainerName string `protobuf:"bytes,1,opt,name=container_name,json=containerName,proto3" json:"container_name,omitempty"`
+	// Type of the container within the file with location of the finding.
+	//
+	// Types that are valid to be assigned to Location:
+	//	*ContentLocation_RecordLocation
+	//	*ContentLocation_ImageLocation
+	//	*ContentLocation_DocumentLocation
+	Location isContentLocation_Location `protobuf_oneof:"location"`
+	// Findings container modification timestamp, if applicable.
+	// For Google Cloud Storage contains last file modification timestamp.
+	// For BigQuery table contains last_modified_time property.
+	// For Datastore - not populated.
+	ContainerTimestamp *timestamp.Timestamp `protobuf:"bytes,6,opt,name=container_timestamp,json=containerTimestamp,proto3" json:"container_timestamp,omitempty"`
+	// Findings container version, if available
+	// ("generation" for Google Cloud Storage).
+	ContainerVersion     string   `protobuf:"bytes,7,opt,name=container_version,json=containerVersion,proto3" json:"container_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ContentLocation) Reset()         { *m = ContentLocation{} }
+func (m *ContentLocation) String() string { return proto.CompactTextString(m) }
+func (*ContentLocation) ProtoMessage()    {}
+func (*ContentLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{7}
+}
+func (m *ContentLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentLocation.Unmarshal(m, b)
+}
+func (m *ContentLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentLocation.Marshal(b, m, deterministic)
+}
+func (dst *ContentLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentLocation.Merge(dst, src)
+}
+func (m *ContentLocation) XXX_Size() int {
+	return xxx_messageInfo_ContentLocation.Size(m)
+}
+func (m *ContentLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentLocation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentLocation proto.InternalMessageInfo
+
+func (m *ContentLocation) GetContainerName() string {
+	if m != nil {
+		return m.ContainerName
+	}
+	return ""
+}
+
+type isContentLocation_Location interface {
+	isContentLocation_Location()
+}
+
+type ContentLocation_RecordLocation struct {
+	RecordLocation *RecordLocation `protobuf:"bytes,2,opt,name=record_location,json=recordLocation,proto3,oneof"`
+}
+
+type ContentLocation_ImageLocation struct {
+	ImageLocation *ImageLocation `protobuf:"bytes,3,opt,name=image_location,json=imageLocation,proto3,oneof"`
+}
+
+type ContentLocation_DocumentLocation struct {
+	DocumentLocation *DocumentLocation `protobuf:"bytes,5,opt,name=document_location,json=documentLocation,proto3,oneof"`
+}
+
+func (*ContentLocation_RecordLocation) isContentLocation_Location() {}
+
+func (*ContentLocation_ImageLocation) isContentLocation_Location() {}
+
+func (*ContentLocation_DocumentLocation) isContentLocation_Location() {}
+
+func (m *ContentLocation) GetLocation() isContentLocation_Location {
+	if m != nil {
+		return m.Location
+	}
+	return nil
+}
+
+func (m *ContentLocation) GetRecordLocation() *RecordLocation {
+	if x, ok := m.GetLocation().(*ContentLocation_RecordLocation); ok {
+		return x.RecordLocation
+	}
+	return nil
+}
+
+func (m *ContentLocation) GetImageLocation() *ImageLocation {
+	if x, ok := m.GetLocation().(*ContentLocation_ImageLocation); ok {
+		return x.ImageLocation
+	}
+	return nil
+}
+
+func (m *ContentLocation) GetDocumentLocation() *DocumentLocation {
+	if x, ok := m.GetLocation().(*ContentLocation_DocumentLocation); ok {
+		return x.DocumentLocation
+	}
+	return nil
+}
+
+func (m *ContentLocation) GetContainerTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.ContainerTimestamp
+	}
+	return nil
+}
+
+func (m *ContentLocation) GetContainerVersion() string {
+	if m != nil {
+		return m.ContainerVersion
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ContentLocation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ContentLocation_OneofMarshaler, _ContentLocation_OneofUnmarshaler, _ContentLocation_OneofSizer, []interface{}{
+		(*ContentLocation_RecordLocation)(nil),
+		(*ContentLocation_ImageLocation)(nil),
+		(*ContentLocation_DocumentLocation)(nil),
+	}
+}
+
+func _ContentLocation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ContentLocation)
+	// location
+	switch x := m.Location.(type) {
+	case *ContentLocation_RecordLocation:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.RecordLocation); err != nil {
+			return err
+		}
+	case *ContentLocation_ImageLocation:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ImageLocation); err != nil {
+			return err
+		}
+	case *ContentLocation_DocumentLocation:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.DocumentLocation); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("ContentLocation.Location has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ContentLocation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ContentLocation)
+	switch tag {
+	case 2: // location.record_location
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(RecordLocation)
+		err := b.DecodeMessage(msg)
+		m.Location = &ContentLocation_RecordLocation{msg}
+		return true, err
+	case 3: // location.image_location
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ImageLocation)
+		err := b.DecodeMessage(msg)
+		m.Location = &ContentLocation_ImageLocation{msg}
+		return true, err
+	case 5: // location.document_location
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(DocumentLocation)
+		err := b.DecodeMessage(msg)
+		m.Location = &ContentLocation_DocumentLocation{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ContentLocation_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ContentLocation)
+	// location
+	switch x := m.Location.(type) {
+	case *ContentLocation_RecordLocation:
+		s := proto.Size(x.RecordLocation)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ContentLocation_ImageLocation:
+		s := proto.Size(x.ImageLocation)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ContentLocation_DocumentLocation:
+		s := proto.Size(x.DocumentLocation)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Location of a finding within a document.
+type DocumentLocation struct {
+	// Offset of the line, from the beginning of the file, where the finding
+	// is located.
+	FileOffset           int64    `protobuf:"varint,1,opt,name=file_offset,json=fileOffset,proto3" json:"file_offset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DocumentLocation) Reset()         { *m = DocumentLocation{} }
+func (m *DocumentLocation) String() string { return proto.CompactTextString(m) }
+func (*DocumentLocation) ProtoMessage()    {}
+func (*DocumentLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{8}
+}
+func (m *DocumentLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DocumentLocation.Unmarshal(m, b)
+}
+func (m *DocumentLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DocumentLocation.Marshal(b, m, deterministic)
+}
+func (dst *DocumentLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DocumentLocation.Merge(dst, src)
+}
+func (m *DocumentLocation) XXX_Size() int {
+	return xxx_messageInfo_DocumentLocation.Size(m)
+}
+func (m *DocumentLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_DocumentLocation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DocumentLocation proto.InternalMessageInfo
+
+func (m *DocumentLocation) GetFileOffset() int64 {
+	if m != nil {
+		return m.FileOffset
+	}
+	return 0
+}
+
+// Location of a finding within a row or record.
+type RecordLocation struct {
+	// Key of the finding.
+	RecordKey *RecordKey `protobuf:"bytes,1,opt,name=record_key,json=recordKey,proto3" json:"record_key,omitempty"`
+	// Field id of the field containing the finding.
+	FieldId *FieldId `protobuf:"bytes,2,opt,name=field_id,json=fieldId,proto3" json:"field_id,omitempty"`
+	// Location within a `ContentItem.Table`.
+	TableLocation        *TableLocation `protobuf:"bytes,3,opt,name=table_location,json=tableLocation,proto3" json:"table_location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *RecordLocation) Reset()         { *m = RecordLocation{} }
+func (m *RecordLocation) String() string { return proto.CompactTextString(m) }
+func (*RecordLocation) ProtoMessage()    {}
+func (*RecordLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{9}
+}
+func (m *RecordLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecordLocation.Unmarshal(m, b)
+}
+func (m *RecordLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecordLocation.Marshal(b, m, deterministic)
+}
+func (dst *RecordLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordLocation.Merge(dst, src)
+}
+func (m *RecordLocation) XXX_Size() int {
+	return xxx_messageInfo_RecordLocation.Size(m)
+}
+func (m *RecordLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecordLocation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecordLocation proto.InternalMessageInfo
+
+func (m *RecordLocation) GetRecordKey() *RecordKey {
+	if m != nil {
+		return m.RecordKey
+	}
+	return nil
+}
+
+func (m *RecordLocation) GetFieldId() *FieldId {
+	if m != nil {
+		return m.FieldId
+	}
+	return nil
+}
+
+func (m *RecordLocation) GetTableLocation() *TableLocation {
+	if m != nil {
+		return m.TableLocation
+	}
+	return nil
+}
+
+// Location of a finding within a table.
+type TableLocation struct {
+	// The zero-based index of the row where the finding is located.
+	RowIndex             int64    `protobuf:"varint,1,opt,name=row_index,json=rowIndex,proto3" json:"row_index,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TableLocation) Reset()         { *m = TableLocation{} }
+func (m *TableLocation) String() string { return proto.CompactTextString(m) }
+func (*TableLocation) ProtoMessage()    {}
+func (*TableLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{10}
+}
+func (m *TableLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableLocation.Unmarshal(m, b)
+}
+func (m *TableLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableLocation.Marshal(b, m, deterministic)
+}
+func (dst *TableLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableLocation.Merge(dst, src)
+}
+func (m *TableLocation) XXX_Size() int {
+	return xxx_messageInfo_TableLocation.Size(m)
+}
+func (m *TableLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableLocation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TableLocation proto.InternalMessageInfo
+
+func (m *TableLocation) GetRowIndex() int64 {
+	if m != nil {
+		return m.RowIndex
+	}
+	return 0
+}
+
+// Generic half-open interval [start, end)
+type Range struct {
+	// Index of the first character of the range (inclusive).
+	Start int64 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"`
+	// Index of the last character of the range (exclusive).
+	End                  int64    `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Range) Reset()         { *m = Range{} }
+func (m *Range) String() string { return proto.CompactTextString(m) }
+func (*Range) ProtoMessage()    {}
+func (*Range) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{11}
+}
+func (m *Range) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Range.Unmarshal(m, b)
+}
+func (m *Range) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Range.Marshal(b, m, deterministic)
+}
+func (dst *Range) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Range.Merge(dst, src)
+}
+func (m *Range) XXX_Size() int {
+	return xxx_messageInfo_Range.Size(m)
+}
+func (m *Range) XXX_DiscardUnknown() {
+	xxx_messageInfo_Range.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Range proto.InternalMessageInfo
+
+func (m *Range) GetStart() int64 {
+	if m != nil {
+		return m.Start
+	}
+	return 0
+}
+
+func (m *Range) GetEnd() int64 {
+	if m != nil {
+		return m.End
+	}
+	return 0
+}
+
+// Location of the finding within an image.
+type ImageLocation struct {
+	// Bounding boxes locating the pixels within the image containing the finding.
+	BoundingBoxes        []*BoundingBox `protobuf:"bytes,1,rep,name=bounding_boxes,json=boundingBoxes,proto3" json:"bounding_boxes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *ImageLocation) Reset()         { *m = ImageLocation{} }
+func (m *ImageLocation) String() string { return proto.CompactTextString(m) }
+func (*ImageLocation) ProtoMessage()    {}
+func (*ImageLocation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{12}
+}
+func (m *ImageLocation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ImageLocation.Unmarshal(m, b)
+}
+func (m *ImageLocation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ImageLocation.Marshal(b, m, deterministic)
+}
+func (dst *ImageLocation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ImageLocation.Merge(dst, src)
+}
+func (m *ImageLocation) XXX_Size() int {
+	return xxx_messageInfo_ImageLocation.Size(m)
+}
+func (m *ImageLocation) XXX_DiscardUnknown() {
+	xxx_messageInfo_ImageLocation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ImageLocation proto.InternalMessageInfo
+
+func (m *ImageLocation) GetBoundingBoxes() []*BoundingBox {
+	if m != nil {
+		return m.BoundingBoxes
+	}
+	return nil
+}
+
+// Bounding box encompassing detected text within an image.
+type BoundingBox struct {
+	// Top coordinate of the bounding box. (0,0) is upper left.
+	Top int32 `protobuf:"varint,1,opt,name=top,proto3" json:"top,omitempty"`
+	// Left coordinate of the bounding box. (0,0) is upper left.
+	Left int32 `protobuf:"varint,2,opt,name=left,proto3" json:"left,omitempty"`
+	// Width of the bounding box in pixels.
+	Width int32 `protobuf:"varint,3,opt,name=width,proto3" json:"width,omitempty"`
+	// Height of the bounding box in pixels.
+	Height               int32    `protobuf:"varint,4,opt,name=height,proto3" json:"height,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BoundingBox) Reset()         { *m = BoundingBox{} }
+func (m *BoundingBox) String() string { return proto.CompactTextString(m) }
+func (*BoundingBox) ProtoMessage()    {}
+func (*BoundingBox) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{13}
+}
+func (m *BoundingBox) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BoundingBox.Unmarshal(m, b)
+}
+func (m *BoundingBox) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BoundingBox.Marshal(b, m, deterministic)
+}
+func (dst *BoundingBox) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BoundingBox.Merge(dst, src)
+}
+func (m *BoundingBox) XXX_Size() int {
+	return xxx_messageInfo_BoundingBox.Size(m)
+}
+func (m *BoundingBox) XXX_DiscardUnknown() {
+	xxx_messageInfo_BoundingBox.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BoundingBox proto.InternalMessageInfo
+
+func (m *BoundingBox) GetTop() int32 {
+	if m != nil {
+		return m.Top
+	}
+	return 0
+}
+
+func (m *BoundingBox) GetLeft() int32 {
+	if m != nil {
+		return m.Left
+	}
+	return 0
+}
+
+func (m *BoundingBox) GetWidth() int32 {
+	if m != nil {
+		return m.Width
+	}
+	return 0
+}
+
+func (m *BoundingBox) GetHeight() int32 {
+	if m != nil {
+		return m.Height
+	}
+	return 0
+}
+
+// Request to search for potentially sensitive info in an image and redact it
+// by covering it with a colored rectangle.
+type RedactImageRequest struct {
+	// The parent resource name, for example projects/my-project-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Configuration for the inspector.
+	InspectConfig *InspectConfig `protobuf:"bytes,2,opt,name=inspect_config,json=inspectConfig,proto3" json:"inspect_config,omitempty"`
+	// The configuration for specifying what content to redact from images.
+	ImageRedactionConfigs []*RedactImageRequest_ImageRedactionConfig `protobuf:"bytes,5,rep,name=image_redaction_configs,json=imageRedactionConfigs,proto3" json:"image_redaction_configs,omitempty"`
+	// Whether the response should include findings along with the redacted
+	// image.
+	IncludeFindings bool `protobuf:"varint,6,opt,name=include_findings,json=includeFindings,proto3" json:"include_findings,omitempty"`
+	// The content must be PNG, JPEG, SVG or BMP.
+	ByteItem             *ByteContentItem `protobuf:"bytes,7,opt,name=byte_item,json=byteItem,proto3" json:"byte_item,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *RedactImageRequest) Reset()         { *m = RedactImageRequest{} }
+func (m *RedactImageRequest) String() string { return proto.CompactTextString(m) }
+func (*RedactImageRequest) ProtoMessage()    {}
+func (*RedactImageRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{14}
+}
+func (m *RedactImageRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RedactImageRequest.Unmarshal(m, b)
+}
+func (m *RedactImageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RedactImageRequest.Marshal(b, m, deterministic)
+}
+func (dst *RedactImageRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RedactImageRequest.Merge(dst, src)
+}
+func (m *RedactImageRequest) XXX_Size() int {
+	return xxx_messageInfo_RedactImageRequest.Size(m)
+}
+func (m *RedactImageRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RedactImageRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RedactImageRequest proto.InternalMessageInfo
+
+func (m *RedactImageRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *RedactImageRequest) GetInspectConfig() *InspectConfig {
+	if m != nil {
+		return m.InspectConfig
+	}
+	return nil
+}
+
+func (m *RedactImageRequest) GetImageRedactionConfigs() []*RedactImageRequest_ImageRedactionConfig {
+	if m != nil {
+		return m.ImageRedactionConfigs
+	}
+	return nil
+}
+
+func (m *RedactImageRequest) GetIncludeFindings() bool {
+	if m != nil {
+		return m.IncludeFindings
+	}
+	return false
+}
+
+func (m *RedactImageRequest) GetByteItem() *ByteContentItem {
+	if m != nil {
+		return m.ByteItem
+	}
+	return nil
+}
+
+// Configuration for determining how redaction of images should occur.
+type RedactImageRequest_ImageRedactionConfig struct {
+	// Type of information to redact from images.
+	//
+	// Types that are valid to be assigned to Target:
+	//	*RedactImageRequest_ImageRedactionConfig_InfoType
+	//	*RedactImageRequest_ImageRedactionConfig_RedactAllText
+	Target isRedactImageRequest_ImageRedactionConfig_Target `protobuf_oneof:"target"`
+	// The color to use when redacting content from an image. If not specified,
+	// the default is black.
+	RedactionColor       *Color   `protobuf:"bytes,3,opt,name=redaction_color,json=redactionColor,proto3" json:"redaction_color,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RedactImageRequest_ImageRedactionConfig) Reset() {
+	*m = RedactImageRequest_ImageRedactionConfig{}
+}
+func (m *RedactImageRequest_ImageRedactionConfig) String() string { return proto.CompactTextString(m) }
+func (*RedactImageRequest_ImageRedactionConfig) ProtoMessage()    {}
+func (*RedactImageRequest_ImageRedactionConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{14, 0}
+}
+func (m *RedactImageRequest_ImageRedactionConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Unmarshal(m, b)
+}
+func (m *RedactImageRequest_ImageRedactionConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Marshal(b, m, deterministic)
+}
+func (dst *RedactImageRequest_ImageRedactionConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Merge(dst, src)
+}
+func (m *RedactImageRequest_ImageRedactionConfig) XXX_Size() int {
+	return xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.Size(m)
+}
+func (m *RedactImageRequest_ImageRedactionConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_RedactImageRequest_ImageRedactionConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RedactImageRequest_ImageRedactionConfig proto.InternalMessageInfo
+
+type isRedactImageRequest_ImageRedactionConfig_Target interface {
+	isRedactImageRequest_ImageRedactionConfig_Target()
+}
+
+type RedactImageRequest_ImageRedactionConfig_InfoType struct {
+	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType,proto3,oneof"`
+}
+
+type RedactImageRequest_ImageRedactionConfig_RedactAllText struct {
+	RedactAllText bool `protobuf:"varint,2,opt,name=redact_all_text,json=redactAllText,proto3,oneof"`
+}
+
+func (*RedactImageRequest_ImageRedactionConfig_InfoType) isRedactImageRequest_ImageRedactionConfig_Target() {
+}
+
+func (*RedactImageRequest_ImageRedactionConfig_RedactAllText) isRedactImageRequest_ImageRedactionConfig_Target() {
+}
+
+func (m *RedactImageRequest_ImageRedactionConfig) GetTarget() isRedactImageRequest_ImageRedactionConfig_Target {
+	if m != nil {
+		return m.Target
+	}
+	return nil
+}
+
+func (m *RedactImageRequest_ImageRedactionConfig) GetInfoType() *InfoType {
+	if x, ok := m.GetTarget().(*RedactImageRequest_ImageRedactionConfig_InfoType); ok {
+		return x.InfoType
+	}
+	return nil
+}
+
+func (m *RedactImageRequest_ImageRedactionConfig) GetRedactAllText() bool {
+	if x, ok := m.GetTarget().(*RedactImageRequest_ImageRedactionConfig_RedactAllText); ok {
+		return x.RedactAllText
+	}
+	return false
+}
+
+func (m *RedactImageRequest_ImageRedactionConfig) GetRedactionColor() *Color {
+	if m != nil {
+		return m.RedactionColor
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*RedactImageRequest_ImageRedactionConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _RedactImageRequest_ImageRedactionConfig_OneofMarshaler, _RedactImageRequest_ImageRedactionConfig_OneofUnmarshaler, _RedactImageRequest_ImageRedactionConfig_OneofSizer, []interface{}{
+		(*RedactImageRequest_ImageRedactionConfig_InfoType)(nil),
+		(*RedactImageRequest_ImageRedactionConfig_RedactAllText)(nil),
+	}
+}
+
+func _RedactImageRequest_ImageRedactionConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*RedactImageRequest_ImageRedactionConfig)
+	// target
+	switch x := m.Target.(type) {
+	case *RedactImageRequest_ImageRedactionConfig_InfoType:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InfoType); err != nil {
+			return err
+		}
+	case *RedactImageRequest_ImageRedactionConfig_RedactAllText:
+		t := uint64(0)
+		if x.RedactAllText {
+			t = 1
+		}
+		b.EncodeVarint(2<<3 | proto.WireVarint)
+		b.EncodeVarint(t)
+	case nil:
+	default:
+		return fmt.Errorf("RedactImageRequest_ImageRedactionConfig.Target has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _RedactImageRequest_ImageRedactionConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*RedactImageRequest_ImageRedactionConfig)
+	switch tag {
+	case 1: // target.info_type
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InfoType)
+		err := b.DecodeMessage(msg)
+		m.Target = &RedactImageRequest_ImageRedactionConfig_InfoType{msg}
+		return true, err
+	case 2: // target.redact_all_text
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Target = &RedactImageRequest_ImageRedactionConfig_RedactAllText{x != 0}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _RedactImageRequest_ImageRedactionConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*RedactImageRequest_ImageRedactionConfig)
+	// target
+	switch x := m.Target.(type) {
+	case *RedactImageRequest_ImageRedactionConfig_InfoType:
+		s := proto.Size(x.InfoType)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *RedactImageRequest_ImageRedactionConfig_RedactAllText:
+		n += 1 // tag and wire
+		n += 1
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Represents a color in the RGB color space.
+type Color struct {
+	// The amount of red in the color as a value in the interval [0, 1].
+	Red float32 `protobuf:"fixed32,1,opt,name=red,proto3" json:"red,omitempty"`
+	// The amount of green in the color as a value in the interval [0, 1].
+	Green float32 `protobuf:"fixed32,2,opt,name=green,proto3" json:"green,omitempty"`
+	// The amount of blue in the color as a value in the interval [0, 1].
+	Blue                 float32  `protobuf:"fixed32,3,opt,name=blue,proto3" json:"blue,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Color) Reset()         { *m = Color{} }
+func (m *Color) String() string { return proto.CompactTextString(m) }
+func (*Color) ProtoMessage()    {}
+func (*Color) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{15}
+}
+func (m *Color) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Color.Unmarshal(m, b)
+}
+func (m *Color) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Color.Marshal(b, m, deterministic)
+}
+func (dst *Color) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Color.Merge(dst, src)
+}
+func (m *Color) XXX_Size() int {
+	return xxx_messageInfo_Color.Size(m)
+}
+func (m *Color) XXX_DiscardUnknown() {
+	xxx_messageInfo_Color.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Color proto.InternalMessageInfo
+
+func (m *Color) GetRed() float32 {
+	if m != nil {
+		return m.Red
+	}
+	return 0
+}
+
+func (m *Color) GetGreen() float32 {
+	if m != nil {
+		return m.Green
+	}
+	return 0
+}
+
+func (m *Color) GetBlue() float32 {
+	if m != nil {
+		return m.Blue
+	}
+	return 0
+}
+
+// Results of redacting an image.
+type RedactImageResponse struct {
+	// The redacted image. The type will be the same as the original image.
+	RedactedImage []byte `protobuf:"bytes,1,opt,name=redacted_image,json=redactedImage,proto3" json:"redacted_image,omitempty"`
+	// If an image was being inspected and the InspectConfig's include_quote was
+	// set to true, then this field will include all text, if any, that was found
+	// in the image.
+	ExtractedText string `protobuf:"bytes,2,opt,name=extracted_text,json=extractedText,proto3" json:"extracted_text,omitempty"`
+	// The findings. Populated when include_findings in the request is true.
+	InspectResult        *InspectResult `protobuf:"bytes,3,opt,name=inspect_result,json=inspectResult,proto3" json:"inspect_result,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *RedactImageResponse) Reset()         { *m = RedactImageResponse{} }
+func (m *RedactImageResponse) String() string { return proto.CompactTextString(m) }
+func (*RedactImageResponse) ProtoMessage()    {}
+func (*RedactImageResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{16}
+}
+func (m *RedactImageResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RedactImageResponse.Unmarshal(m, b)
+}
+func (m *RedactImageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RedactImageResponse.Marshal(b, m, deterministic)
+}
+func (dst *RedactImageResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RedactImageResponse.Merge(dst, src)
+}
+func (m *RedactImageResponse) XXX_Size() int {
+	return xxx_messageInfo_RedactImageResponse.Size(m)
+}
+func (m *RedactImageResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_RedactImageResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RedactImageResponse proto.InternalMessageInfo
+
+func (m *RedactImageResponse) GetRedactedImage() []byte {
+	if m != nil {
+		return m.RedactedImage
+	}
+	return nil
+}
+
+func (m *RedactImageResponse) GetExtractedText() string {
+	if m != nil {
+		return m.ExtractedText
+	}
+	return ""
+}
+
+func (m *RedactImageResponse) GetInspectResult() *InspectResult {
+	if m != nil {
+		return m.InspectResult
+	}
+	return nil
+}
+
+// Request to de-identify a list of items.
+type DeidentifyContentRequest struct {
+	// The parent resource name, for example projects/my-project-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Configuration for the de-identification of the content item.
+	// Items specified here will override the template referenced by the
+	// deidentify_template_name argument.
+	DeidentifyConfig *DeidentifyConfig `protobuf:"bytes,2,opt,name=deidentify_config,json=deidentifyConfig,proto3" json:"deidentify_config,omitempty"`
+	// Configuration for the inspector.
+	// Items specified here will override the template referenced by the
+	// inspect_template_name argument.
+	InspectConfig *InspectConfig `protobuf:"bytes,3,opt,name=inspect_config,json=inspectConfig,proto3" json:"inspect_config,omitempty"`
+	// The item to de-identify. Will be treated as text.
+	Item *ContentItem `protobuf:"bytes,4,opt,name=item,proto3" json:"item,omitempty"`
+	// Optional template to use. Any configuration directly specified in
+	// inspect_config will override those set in the template. Singular fields
+	// that are set in this request will replace their corresponding fields in the
+	// template. Repeated fields are appended. Singular sub-messages and groups
+	// are recursively merged.
+	InspectTemplateName string `protobuf:"bytes,5,opt,name=inspect_template_name,json=inspectTemplateName,proto3" json:"inspect_template_name,omitempty"`
+	// Optional template to use. Any configuration directly specified in
+	// deidentify_config will override those set in the template. Singular fields
+	// that are set in this request will replace their corresponding fields in the
+	// template. Repeated fields are appended. Singular sub-messages and groups
+	// are recursively merged.
+	DeidentifyTemplateName string   `protobuf:"bytes,6,opt,name=deidentify_template_name,json=deidentifyTemplateName,proto3" json:"deidentify_template_name,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
+}
+
+func (m *DeidentifyContentRequest) Reset()         { *m = DeidentifyContentRequest{} }
+func (m *DeidentifyContentRequest) String() string { return proto.CompactTextString(m) }
+func (*DeidentifyContentRequest) ProtoMessage()    {}
+func (*DeidentifyContentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{17}
+}
+func (m *DeidentifyContentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeidentifyContentRequest.Unmarshal(m, b)
+}
+func (m *DeidentifyContentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeidentifyContentRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeidentifyContentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeidentifyContentRequest.Merge(dst, src)
+}
+func (m *DeidentifyContentRequest) XXX_Size() int {
+	return xxx_messageInfo_DeidentifyContentRequest.Size(m)
+}
+func (m *DeidentifyContentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeidentifyContentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeidentifyContentRequest proto.InternalMessageInfo
+
+func (m *DeidentifyContentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *DeidentifyContentRequest) GetDeidentifyConfig() *DeidentifyConfig {
+	if m != nil {
+		return m.DeidentifyConfig
+	}
+	return nil
+}
+
+func (m *DeidentifyContentRequest) GetInspectConfig() *InspectConfig {
+	if m != nil {
+		return m.InspectConfig
+	}
+	return nil
+}
+
+func (m *DeidentifyContentRequest) GetItem() *ContentItem {
+	if m != nil {
+		return m.Item
+	}
+	return nil
+}
+
+func (m *DeidentifyContentRequest) GetInspectTemplateName() string {
+	if m != nil {
+		return m.InspectTemplateName
+	}
+	return ""
+}
+
+func (m *DeidentifyContentRequest) GetDeidentifyTemplateName() string {
+	if m != nil {
+		return m.DeidentifyTemplateName
+	}
+	return ""
+}
+
+// Results of de-identifying a ContentItem.
+type DeidentifyContentResponse struct {
+	// The de-identified item.
+	Item *ContentItem `protobuf:"bytes,1,opt,name=item,proto3" json:"item,omitempty"`
+	// An overview of the changes that were made on the `item`.
+	Overview             *TransformationOverview `protobuf:"bytes,2,opt,name=overview,proto3" json:"overview,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *DeidentifyContentResponse) Reset()         { *m = DeidentifyContentResponse{} }
+func (m *DeidentifyContentResponse) String() string { return proto.CompactTextString(m) }
+func (*DeidentifyContentResponse) ProtoMessage()    {}
+func (*DeidentifyContentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{18}
+}
+func (m *DeidentifyContentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeidentifyContentResponse.Unmarshal(m, b)
+}
+func (m *DeidentifyContentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeidentifyContentResponse.Marshal(b, m, deterministic)
+}
+func (dst *DeidentifyContentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeidentifyContentResponse.Merge(dst, src)
+}
+func (m *DeidentifyContentResponse) XXX_Size() int {
+	return xxx_messageInfo_DeidentifyContentResponse.Size(m)
+}
+func (m *DeidentifyContentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeidentifyContentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeidentifyContentResponse proto.InternalMessageInfo
+
+func (m *DeidentifyContentResponse) GetItem() *ContentItem {
+	if m != nil {
+		return m.Item
+	}
+	return nil
+}
+
+func (m *DeidentifyContentResponse) GetOverview() *TransformationOverview {
+	if m != nil {
+		return m.Overview
+	}
+	return nil
+}
+
+// Request to re-identify an item.
+type ReidentifyContentRequest struct {
+	// The parent resource name.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Configuration for the re-identification of the content item.
+	// This field shares the same proto message type that is used for
+	// de-identification, however its usage here is for the reversal of the
+	// previous de-identification. Re-identification is performed by examining
+	// the transformations used to de-identify the items and executing the
+	// reverse. This requires that only reversible transformations
+	// be provided here. The reversible transformations are:
+	//
+	//  - `CryptoReplaceFfxFpeConfig`
+	ReidentifyConfig *DeidentifyConfig `protobuf:"bytes,2,opt,name=reidentify_config,json=reidentifyConfig,proto3" json:"reidentify_config,omitempty"`
+	// Configuration for the inspector.
+	InspectConfig *InspectConfig `protobuf:"bytes,3,opt,name=inspect_config,json=inspectConfig,proto3" json:"inspect_config,omitempty"`
+	// The item to re-identify. Will be treated as text.
+	Item *ContentItem `protobuf:"bytes,4,opt,name=item,proto3" json:"item,omitempty"`
+	// Optional template to use. Any configuration directly specified in
+	// `inspect_config` will override those set in the template. Singular fields
+	// that are set in this request will replace their corresponding fields in the
+	// template. Repeated fields are appended. Singular sub-messages and groups
+	// are recursively merged.
+	InspectTemplateName string `protobuf:"bytes,5,opt,name=inspect_template_name,json=inspectTemplateName,proto3" json:"inspect_template_name,omitempty"`
+	// Optional template to use. References an instance of `DeidentifyTemplate`.
+	// Any configuration directly specified in `reidentify_config` or
+	// `inspect_config` will override those set in the template. Singular fields
+	// that are set in this request will replace their corresponding fields in the
+	// template. Repeated fields are appended. Singular sub-messages and groups
+	// are recursively merged.
+	ReidentifyTemplateName string   `protobuf:"bytes,6,opt,name=reidentify_template_name,json=reidentifyTemplateName,proto3" json:"reidentify_template_name,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
+}
+
+func (m *ReidentifyContentRequest) Reset()         { *m = ReidentifyContentRequest{} }
+func (m *ReidentifyContentRequest) String() string { return proto.CompactTextString(m) }
+func (*ReidentifyContentRequest) ProtoMessage()    {}
+func (*ReidentifyContentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{19}
+}
+func (m *ReidentifyContentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReidentifyContentRequest.Unmarshal(m, b)
+}
+func (m *ReidentifyContentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReidentifyContentRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReidentifyContentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReidentifyContentRequest.Merge(dst, src)
+}
+func (m *ReidentifyContentRequest) XXX_Size() int {
+	return xxx_messageInfo_ReidentifyContentRequest.Size(m)
+}
+func (m *ReidentifyContentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReidentifyContentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReidentifyContentRequest proto.InternalMessageInfo
+
+func (m *ReidentifyContentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ReidentifyContentRequest) GetReidentifyConfig() *DeidentifyConfig {
+	if m != nil {
+		return m.ReidentifyConfig
+	}
+	return nil
+}
+
+func (m *ReidentifyContentRequest) GetInspectConfig() *InspectConfig {
+	if m != nil {
+		return m.InspectConfig
+	}
+	return nil
+}
+
+func (m *ReidentifyContentRequest) GetItem() *ContentItem {
+	if m != nil {
+		return m.Item
+	}
+	return nil
+}
+
+func (m *ReidentifyContentRequest) GetInspectTemplateName() string {
+	if m != nil {
+		return m.InspectTemplateName
+	}
+	return ""
+}
+
+func (m *ReidentifyContentRequest) GetReidentifyTemplateName() string {
+	if m != nil {
+		return m.ReidentifyTemplateName
+	}
+	return ""
+}
+
+// Results of re-identifying a item.
+type ReidentifyContentResponse struct {
+	// The re-identified item.
+	Item *ContentItem `protobuf:"bytes,1,opt,name=item,proto3" json:"item,omitempty"`
+	// An overview of the changes that were made to the `item`.
+	Overview             *TransformationOverview `protobuf:"bytes,2,opt,name=overview,proto3" json:"overview,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *ReidentifyContentResponse) Reset()         { *m = ReidentifyContentResponse{} }
+func (m *ReidentifyContentResponse) String() string { return proto.CompactTextString(m) }
+func (*ReidentifyContentResponse) ProtoMessage()    {}
+func (*ReidentifyContentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{20}
+}
+func (m *ReidentifyContentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReidentifyContentResponse.Unmarshal(m, b)
+}
+func (m *ReidentifyContentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReidentifyContentResponse.Marshal(b, m, deterministic)
+}
+func (dst *ReidentifyContentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReidentifyContentResponse.Merge(dst, src)
+}
+func (m *ReidentifyContentResponse) XXX_Size() int {
+	return xxx_messageInfo_ReidentifyContentResponse.Size(m)
+}
+func (m *ReidentifyContentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReidentifyContentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReidentifyContentResponse proto.InternalMessageInfo
+
+func (m *ReidentifyContentResponse) GetItem() *ContentItem {
+	if m != nil {
+		return m.Item
+	}
+	return nil
+}
+
+func (m *ReidentifyContentResponse) GetOverview() *TransformationOverview {
+	if m != nil {
+		return m.Overview
+	}
+	return nil
+}
+
+// Request to search for potentially sensitive info in a ContentItem.
+type InspectContentRequest struct {
+	// The parent resource name, for example projects/my-project-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Configuration for the inspector. What specified here will override
+	// the template referenced by the inspect_template_name argument.
+	InspectConfig *InspectConfig `protobuf:"bytes,2,opt,name=inspect_config,json=inspectConfig,proto3" json:"inspect_config,omitempty"`
+	// The item to inspect.
+	Item *ContentItem `protobuf:"bytes,3,opt,name=item,proto3" json:"item,omitempty"`
+	// Optional template to use. Any configuration directly specified in
+	// inspect_config will override those set in the template. Singular fields
+	// that are set in this request will replace their corresponding fields in the
+	// template. Repeated fields are appended. Singular sub-messages and groups
+	// are recursively merged.
+	InspectTemplateName  string   `protobuf:"bytes,4,opt,name=inspect_template_name,json=inspectTemplateName,proto3" json:"inspect_template_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InspectContentRequest) Reset()         { *m = InspectContentRequest{} }
+func (m *InspectContentRequest) String() string { return proto.CompactTextString(m) }
+func (*InspectContentRequest) ProtoMessage()    {}
+func (*InspectContentRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{21}
+}
+func (m *InspectContentRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectContentRequest.Unmarshal(m, b)
+}
+func (m *InspectContentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectContentRequest.Marshal(b, m, deterministic)
+}
+func (dst *InspectContentRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectContentRequest.Merge(dst, src)
+}
+func (m *InspectContentRequest) XXX_Size() int {
+	return xxx_messageInfo_InspectContentRequest.Size(m)
+}
+func (m *InspectContentRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectContentRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectContentRequest proto.InternalMessageInfo
+
+func (m *InspectContentRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *InspectContentRequest) GetInspectConfig() *InspectConfig {
+	if m != nil {
+		return m.InspectConfig
+	}
+	return nil
+}
+
+func (m *InspectContentRequest) GetItem() *ContentItem {
+	if m != nil {
+		return m.Item
+	}
+	return nil
+}
+
+func (m *InspectContentRequest) GetInspectTemplateName() string {
+	if m != nil {
+		return m.InspectTemplateName
+	}
+	return ""
+}
+
+// Results of inspecting an item.
+type InspectContentResponse struct {
+	// The findings.
+	Result               *InspectResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *InspectContentResponse) Reset()         { *m = InspectContentResponse{} }
+func (m *InspectContentResponse) String() string { return proto.CompactTextString(m) }
+func (*InspectContentResponse) ProtoMessage()    {}
+func (*InspectContentResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{22}
+}
+func (m *InspectContentResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectContentResponse.Unmarshal(m, b)
+}
+func (m *InspectContentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectContentResponse.Marshal(b, m, deterministic)
+}
+func (dst *InspectContentResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectContentResponse.Merge(dst, src)
+}
+func (m *InspectContentResponse) XXX_Size() int {
+	return xxx_messageInfo_InspectContentResponse.Size(m)
+}
+func (m *InspectContentResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectContentResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectContentResponse proto.InternalMessageInfo
+
+func (m *InspectContentResponse) GetResult() *InspectResult {
+	if m != nil {
+		return m.Result
+	}
+	return nil
+}
+
+// Cloud repository for storing output.
+type OutputStorageConfig struct {
+	// Types that are valid to be assigned to Type:
+	//	*OutputStorageConfig_Table
+	Type isOutputStorageConfig_Type `protobuf_oneof:"type"`
+	// Schema used for writing the findings for Inspect jobs. This field is only
+	// used for Inspect and must be unspecified for Risk jobs. Columns are derived
+	// from the `Finding` object. If appending to an existing table, any columns
+	// from the predefined schema that are missing will be added. No columns in
+	// the existing table will be deleted.
+	//
+	// If unspecified, then all available columns will be used for a new table,
+	// and no changes will be made to an existing table.
+	OutputSchema         OutputStorageConfig_OutputSchema `protobuf:"varint,3,opt,name=output_schema,json=outputSchema,proto3,enum=google.privacy.dlp.v2.OutputStorageConfig_OutputSchema" json:"output_schema,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
+	XXX_unrecognized     []byte                           `json:"-"`
+	XXX_sizecache        int32                            `json:"-"`
+}
+
+func (m *OutputStorageConfig) Reset()         { *m = OutputStorageConfig{} }
+func (m *OutputStorageConfig) String() string { return proto.CompactTextString(m) }
+func (*OutputStorageConfig) ProtoMessage()    {}
+func (*OutputStorageConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{23}
+}
+func (m *OutputStorageConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OutputStorageConfig.Unmarshal(m, b)
+}
+func (m *OutputStorageConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OutputStorageConfig.Marshal(b, m, deterministic)
+}
+func (dst *OutputStorageConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutputStorageConfig.Merge(dst, src)
+}
+func (m *OutputStorageConfig) XXX_Size() int {
+	return xxx_messageInfo_OutputStorageConfig.Size(m)
+}
+func (m *OutputStorageConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutputStorageConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutputStorageConfig proto.InternalMessageInfo
+
+type isOutputStorageConfig_Type interface {
+	isOutputStorageConfig_Type()
+}
+
+type OutputStorageConfig_Table struct {
+	Table *BigQueryTable `protobuf:"bytes,1,opt,name=table,proto3,oneof"`
+}
+
+func (*OutputStorageConfig_Table) isOutputStorageConfig_Type() {}
+
+func (m *OutputStorageConfig) GetType() isOutputStorageConfig_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *OutputStorageConfig) GetTable() *BigQueryTable {
+	if x, ok := m.GetType().(*OutputStorageConfig_Table); ok {
+		return x.Table
+	}
+	return nil
+}
+
+func (m *OutputStorageConfig) GetOutputSchema() OutputStorageConfig_OutputSchema {
+	if m != nil {
+		return m.OutputSchema
+	}
+	return OutputStorageConfig_OUTPUT_SCHEMA_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*OutputStorageConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _OutputStorageConfig_OneofMarshaler, _OutputStorageConfig_OneofUnmarshaler, _OutputStorageConfig_OneofSizer, []interface{}{
+		(*OutputStorageConfig_Table)(nil),
+	}
+}
+
+func _OutputStorageConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*OutputStorageConfig)
+	// type
+	switch x := m.Type.(type) {
+	case *OutputStorageConfig_Table:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Table); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("OutputStorageConfig.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _OutputStorageConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*OutputStorageConfig)
+	switch tag {
+	case 1: // type.table
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(BigQueryTable)
+		err := b.DecodeMessage(msg)
+		m.Type = &OutputStorageConfig_Table{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _OutputStorageConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*OutputStorageConfig)
+	// type
+	switch x := m.Type.(type) {
+	case *OutputStorageConfig_Table:
+		s := proto.Size(x.Table)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Statistics regarding a specific InfoType.
+type InfoTypeStats struct {
+	// The type of finding this stat is for.
+	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType,proto3" json:"info_type,omitempty"`
+	// Number of findings for this infoType.
+	Count                int64    `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InfoTypeStats) Reset()         { *m = InfoTypeStats{} }
+func (m *InfoTypeStats) String() string { return proto.CompactTextString(m) }
+func (*InfoTypeStats) ProtoMessage()    {}
+func (*InfoTypeStats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{24}
+}
+func (m *InfoTypeStats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InfoTypeStats.Unmarshal(m, b)
+}
+func (m *InfoTypeStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InfoTypeStats.Marshal(b, m, deterministic)
+}
+func (dst *InfoTypeStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoTypeStats.Merge(dst, src)
+}
+func (m *InfoTypeStats) XXX_Size() int {
+	return xxx_messageInfo_InfoTypeStats.Size(m)
+}
+func (m *InfoTypeStats) XXX_DiscardUnknown() {
+	xxx_messageInfo_InfoTypeStats.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InfoTypeStats proto.InternalMessageInfo
+
+func (m *InfoTypeStats) GetInfoType() *InfoType {
+	if m != nil {
+		return m.InfoType
+	}
+	return nil
+}
+
+func (m *InfoTypeStats) GetCount() int64 {
+	if m != nil {
+		return m.Count
+	}
+	return 0
+}
+
+// The results of an inspect DataSource job.
+type InspectDataSourceDetails struct {
+	// The configuration used for this job.
+	RequestedOptions *InspectDataSourceDetails_RequestedOptions `protobuf:"bytes,2,opt,name=requested_options,json=requestedOptions,proto3" json:"requested_options,omitempty"`
+	// A summary of the outcome of this inspect job.
+	Result               *InspectDataSourceDetails_Result `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
+	XXX_unrecognized     []byte                           `json:"-"`
+	XXX_sizecache        int32                            `json:"-"`
+}
+
+func (m *InspectDataSourceDetails) Reset()         { *m = InspectDataSourceDetails{} }
+func (m *InspectDataSourceDetails) String() string { return proto.CompactTextString(m) }
+func (*InspectDataSourceDetails) ProtoMessage()    {}
+func (*InspectDataSourceDetails) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{25}
+}
+func (m *InspectDataSourceDetails) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectDataSourceDetails.Unmarshal(m, b)
+}
+func (m *InspectDataSourceDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectDataSourceDetails.Marshal(b, m, deterministic)
+}
+func (dst *InspectDataSourceDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectDataSourceDetails.Merge(dst, src)
+}
+func (m *InspectDataSourceDetails) XXX_Size() int {
+	return xxx_messageInfo_InspectDataSourceDetails.Size(m)
+}
+func (m *InspectDataSourceDetails) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectDataSourceDetails.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectDataSourceDetails proto.InternalMessageInfo
+
+func (m *InspectDataSourceDetails) GetRequestedOptions() *InspectDataSourceDetails_RequestedOptions {
+	if m != nil {
+		return m.RequestedOptions
+	}
+	return nil
+}
+
+func (m *InspectDataSourceDetails) GetResult() *InspectDataSourceDetails_Result {
+	if m != nil {
+		return m.Result
+	}
+	return nil
+}
+
+type InspectDataSourceDetails_RequestedOptions struct {
+	// If run with an InspectTemplate, a snapshot of its state at the time of
+	// this run.
+	SnapshotInspectTemplate *InspectTemplate  `protobuf:"bytes,1,opt,name=snapshot_inspect_template,json=snapshotInspectTemplate,proto3" json:"snapshot_inspect_template,omitempty"`
+	JobConfig               *InspectJobConfig `protobuf:"bytes,3,opt,name=job_config,json=jobConfig,proto3" json:"job_config,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}          `json:"-"`
+	XXX_unrecognized        []byte            `json:"-"`
+	XXX_sizecache           int32             `json:"-"`
+}
+
+func (m *InspectDataSourceDetails_RequestedOptions) Reset() {
+	*m = InspectDataSourceDetails_RequestedOptions{}
+}
+func (m *InspectDataSourceDetails_RequestedOptions) String() string { return proto.CompactTextString(m) }
+func (*InspectDataSourceDetails_RequestedOptions) ProtoMessage()    {}
+func (*InspectDataSourceDetails_RequestedOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{25, 0}
+}
+func (m *InspectDataSourceDetails_RequestedOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Unmarshal(m, b)
+}
+func (m *InspectDataSourceDetails_RequestedOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Marshal(b, m, deterministic)
+}
+func (dst *InspectDataSourceDetails_RequestedOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Merge(dst, src)
+}
+func (m *InspectDataSourceDetails_RequestedOptions) XXX_Size() int {
+	return xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.Size(m)
+}
+func (m *InspectDataSourceDetails_RequestedOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectDataSourceDetails_RequestedOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectDataSourceDetails_RequestedOptions proto.InternalMessageInfo
+
+func (m *InspectDataSourceDetails_RequestedOptions) GetSnapshotInspectTemplate() *InspectTemplate {
+	if m != nil {
+		return m.SnapshotInspectTemplate
+	}
+	return nil
+}
+
+func (m *InspectDataSourceDetails_RequestedOptions) GetJobConfig() *InspectJobConfig {
+	if m != nil {
+		return m.JobConfig
+	}
+	return nil
+}
+
+type InspectDataSourceDetails_Result struct {
+	// Total size in bytes that were processed.
+	ProcessedBytes int64 `protobuf:"varint,1,opt,name=processed_bytes,json=processedBytes,proto3" json:"processed_bytes,omitempty"`
+	// Estimate of the number of bytes to process.
+	TotalEstimatedBytes int64 `protobuf:"varint,2,opt,name=total_estimated_bytes,json=totalEstimatedBytes,proto3" json:"total_estimated_bytes,omitempty"`
+	// Statistics of how many instances of each info type were found during
+	// inspect job.
+	InfoTypeStats        []*InfoTypeStats `protobuf:"bytes,3,rep,name=info_type_stats,json=infoTypeStats,proto3" json:"info_type_stats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *InspectDataSourceDetails_Result) Reset()         { *m = InspectDataSourceDetails_Result{} }
+func (m *InspectDataSourceDetails_Result) String() string { return proto.CompactTextString(m) }
+func (*InspectDataSourceDetails_Result) ProtoMessage()    {}
+func (*InspectDataSourceDetails_Result) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{25, 1}
+}
+func (m *InspectDataSourceDetails_Result) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectDataSourceDetails_Result.Unmarshal(m, b)
+}
+func (m *InspectDataSourceDetails_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectDataSourceDetails_Result.Marshal(b, m, deterministic)
+}
+func (dst *InspectDataSourceDetails_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectDataSourceDetails_Result.Merge(dst, src)
+}
+func (m *InspectDataSourceDetails_Result) XXX_Size() int {
+	return xxx_messageInfo_InspectDataSourceDetails_Result.Size(m)
+}
+func (m *InspectDataSourceDetails_Result) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectDataSourceDetails_Result.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectDataSourceDetails_Result proto.InternalMessageInfo
+
+func (m *InspectDataSourceDetails_Result) GetProcessedBytes() int64 {
+	if m != nil {
+		return m.ProcessedBytes
+	}
+	return 0
+}
+
+func (m *InspectDataSourceDetails_Result) GetTotalEstimatedBytes() int64 {
+	if m != nil {
+		return m.TotalEstimatedBytes
+	}
+	return 0
+}
+
+func (m *InspectDataSourceDetails_Result) GetInfoTypeStats() []*InfoTypeStats {
+	if m != nil {
+		return m.InfoTypeStats
+	}
+	return nil
+}
+
+// InfoType description.
+type InfoTypeDescription struct {
+	// Internal name of the infoType.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Human readable form of the infoType name.
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Which parts of the API supports this InfoType.
+	SupportedBy          []InfoTypeSupportedBy `protobuf:"varint,3,rep,packed,name=supported_by,json=supportedBy,proto3,enum=google.privacy.dlp.v2.InfoTypeSupportedBy" json:"supported_by,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *InfoTypeDescription) Reset()         { *m = InfoTypeDescription{} }
+func (m *InfoTypeDescription) String() string { return proto.CompactTextString(m) }
+func (*InfoTypeDescription) ProtoMessage()    {}
+func (*InfoTypeDescription) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{26}
+}
+func (m *InfoTypeDescription) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InfoTypeDescription.Unmarshal(m, b)
+}
+func (m *InfoTypeDescription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InfoTypeDescription.Marshal(b, m, deterministic)
+}
+func (dst *InfoTypeDescription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoTypeDescription.Merge(dst, src)
+}
+func (m *InfoTypeDescription) XXX_Size() int {
+	return xxx_messageInfo_InfoTypeDescription.Size(m)
+}
+func (m *InfoTypeDescription) XXX_DiscardUnknown() {
+	xxx_messageInfo_InfoTypeDescription.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InfoTypeDescription proto.InternalMessageInfo
+
+func (m *InfoTypeDescription) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *InfoTypeDescription) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *InfoTypeDescription) GetSupportedBy() []InfoTypeSupportedBy {
+	if m != nil {
+		return m.SupportedBy
+	}
+	return nil
+}
+
+// Request for the list of infoTypes.
+type ListInfoTypesRequest struct {
+	// Optional BCP-47 language code for localized infoType friendly
+	// names. If omitted, or if localized strings are not available,
+	// en-US strings will be returned.
+	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
+	// Optional filter to only return infoTypes supported by certain parts of the
+	// API. Defaults to supported_by=INSPECT.
+	Filter               string   `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInfoTypesRequest) Reset()         { *m = ListInfoTypesRequest{} }
+func (m *ListInfoTypesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListInfoTypesRequest) ProtoMessage()    {}
+func (*ListInfoTypesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{27}
+}
+func (m *ListInfoTypesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInfoTypesRequest.Unmarshal(m, b)
+}
+func (m *ListInfoTypesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInfoTypesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListInfoTypesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInfoTypesRequest.Merge(dst, src)
+}
+func (m *ListInfoTypesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListInfoTypesRequest.Size(m)
+}
+func (m *ListInfoTypesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInfoTypesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInfoTypesRequest proto.InternalMessageInfo
+
+func (m *ListInfoTypesRequest) GetLanguageCode() string {
+	if m != nil {
+		return m.LanguageCode
+	}
+	return ""
+}
+
+func (m *ListInfoTypesRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+// Response to the ListInfoTypes request.
+type ListInfoTypesResponse struct {
+	// Set of sensitive infoTypes.
+	InfoTypes            []*InfoTypeDescription `protobuf:"bytes,1,rep,name=info_types,json=infoTypes,proto3" json:"info_types,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *ListInfoTypesResponse) Reset()         { *m = ListInfoTypesResponse{} }
+func (m *ListInfoTypesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListInfoTypesResponse) ProtoMessage()    {}
+func (*ListInfoTypesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{28}
+}
+func (m *ListInfoTypesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInfoTypesResponse.Unmarshal(m, b)
+}
+func (m *ListInfoTypesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInfoTypesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListInfoTypesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInfoTypesResponse.Merge(dst, src)
+}
+func (m *ListInfoTypesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListInfoTypesResponse.Size(m)
+}
+func (m *ListInfoTypesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInfoTypesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInfoTypesResponse proto.InternalMessageInfo
+
+func (m *ListInfoTypesResponse) GetInfoTypes() []*InfoTypeDescription {
+	if m != nil {
+		return m.InfoTypes
+	}
+	return nil
+}
+
+// Configuration for a risk analysis job. See
+// https://cloud.google.com/dlp/docs/concepts-risk-analysis to learn more.
+type RiskAnalysisJobConfig struct {
+	// Privacy metric to compute.
+	PrivacyMetric *PrivacyMetric `protobuf:"bytes,1,opt,name=privacy_metric,json=privacyMetric,proto3" json:"privacy_metric,omitempty"`
+	// Input dataset to compute metrics over.
+	SourceTable *BigQueryTable `protobuf:"bytes,2,opt,name=source_table,json=sourceTable,proto3" json:"source_table,omitempty"`
+	// Actions to execute at the completion of the job. Are executed in the order
+	// provided.
+	Actions              []*Action `protobuf:"bytes,3,rep,name=actions,proto3" json:"actions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *RiskAnalysisJobConfig) Reset()         { *m = RiskAnalysisJobConfig{} }
+func (m *RiskAnalysisJobConfig) String() string { return proto.CompactTextString(m) }
+func (*RiskAnalysisJobConfig) ProtoMessage()    {}
+func (*RiskAnalysisJobConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{29}
+}
+func (m *RiskAnalysisJobConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RiskAnalysisJobConfig.Unmarshal(m, b)
+}
+func (m *RiskAnalysisJobConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RiskAnalysisJobConfig.Marshal(b, m, deterministic)
+}
+func (dst *RiskAnalysisJobConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RiskAnalysisJobConfig.Merge(dst, src)
+}
+func (m *RiskAnalysisJobConfig) XXX_Size() int {
+	return xxx_messageInfo_RiskAnalysisJobConfig.Size(m)
+}
+func (m *RiskAnalysisJobConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_RiskAnalysisJobConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RiskAnalysisJobConfig proto.InternalMessageInfo
+
+func (m *RiskAnalysisJobConfig) GetPrivacyMetric() *PrivacyMetric {
+	if m != nil {
+		return m.PrivacyMetric
+	}
+	return nil
+}
+
+func (m *RiskAnalysisJobConfig) GetSourceTable() *BigQueryTable {
+	if m != nil {
+		return m.SourceTable
+	}
+	return nil
+}
+
+func (m *RiskAnalysisJobConfig) GetActions() []*Action {
+	if m != nil {
+		return m.Actions
+	}
+	return nil
+}
+
+// A column with a semantic tag attached.
+type QuasiId struct {
+	// Identifies the column. [required]
+	Field *FieldId `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
+	// Semantic tag that identifies what a column contains, to determine which
+	// statistical model to use to estimate the reidentifiability of each
+	// value. [required]
+	//
+	// Types that are valid to be assigned to Tag:
+	//	*QuasiId_InfoType
+	//	*QuasiId_CustomTag
+	//	*QuasiId_Inferred
+	Tag                  isQuasiId_Tag `protobuf_oneof:"tag"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *QuasiId) Reset()         { *m = QuasiId{} }
+func (m *QuasiId) String() string { return proto.CompactTextString(m) }
+func (*QuasiId) ProtoMessage()    {}
+func (*QuasiId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{30}
+}
+func (m *QuasiId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QuasiId.Unmarshal(m, b)
+}
+func (m *QuasiId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QuasiId.Marshal(b, m, deterministic)
+}
+func (dst *QuasiId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuasiId.Merge(dst, src)
+}
+func (m *QuasiId) XXX_Size() int {
+	return xxx_messageInfo_QuasiId.Size(m)
+}
+func (m *QuasiId) XXX_DiscardUnknown() {
+	xxx_messageInfo_QuasiId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QuasiId proto.InternalMessageInfo
+
+func (m *QuasiId) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+type isQuasiId_Tag interface {
+	isQuasiId_Tag()
+}
+
+type QuasiId_InfoType struct {
+	InfoType *InfoType `protobuf:"bytes,2,opt,name=info_type,json=infoType,proto3,oneof"`
+}
+
+type QuasiId_CustomTag struct {
+	CustomTag string `protobuf:"bytes,3,opt,name=custom_tag,json=customTag,proto3,oneof"`
+}
+
+type QuasiId_Inferred struct {
+	Inferred *empty.Empty `protobuf:"bytes,4,opt,name=inferred,proto3,oneof"`
+}
+
+func (*QuasiId_InfoType) isQuasiId_Tag() {}
+
+func (*QuasiId_CustomTag) isQuasiId_Tag() {}
+
+func (*QuasiId_Inferred) isQuasiId_Tag() {}
+
+func (m *QuasiId) GetTag() isQuasiId_Tag {
+	if m != nil {
+		return m.Tag
+	}
+	return nil
+}
+
+func (m *QuasiId) GetInfoType() *InfoType {
+	if x, ok := m.GetTag().(*QuasiId_InfoType); ok {
+		return x.InfoType
+	}
+	return nil
+}
+
+func (m *QuasiId) GetCustomTag() string {
+	if x, ok := m.GetTag().(*QuasiId_CustomTag); ok {
+		return x.CustomTag
+	}
+	return ""
+}
+
+func (m *QuasiId) GetInferred() *empty.Empty {
+	if x, ok := m.GetTag().(*QuasiId_Inferred); ok {
+		return x.Inferred
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*QuasiId) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _QuasiId_OneofMarshaler, _QuasiId_OneofUnmarshaler, _QuasiId_OneofSizer, []interface{}{
+		(*QuasiId_InfoType)(nil),
+		(*QuasiId_CustomTag)(nil),
+		(*QuasiId_Inferred)(nil),
+	}
+}
+
+func _QuasiId_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*QuasiId)
+	// tag
+	switch x := m.Tag.(type) {
+	case *QuasiId_InfoType:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InfoType); err != nil {
+			return err
+		}
+	case *QuasiId_CustomTag:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.CustomTag)
+	case *QuasiId_Inferred:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Inferred); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("QuasiId.Tag has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _QuasiId_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*QuasiId)
+	switch tag {
+	case 2: // tag.info_type
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InfoType)
+		err := b.DecodeMessage(msg)
+		m.Tag = &QuasiId_InfoType{msg}
+		return true, err
+	case 3: // tag.custom_tag
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Tag = &QuasiId_CustomTag{x}
+		return true, err
+	case 4: // tag.inferred
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(empty.Empty)
+		err := b.DecodeMessage(msg)
+		m.Tag = &QuasiId_Inferred{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _QuasiId_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*QuasiId)
+	// tag
+	switch x := m.Tag.(type) {
+	case *QuasiId_InfoType:
+		s := proto.Size(x.InfoType)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *QuasiId_CustomTag:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.CustomTag)))
+		n += len(x.CustomTag)
+	case *QuasiId_Inferred:
+		s := proto.Size(x.Inferred)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// An auxiliary table containing statistical information on the relative
+// frequency of different quasi-identifiers values. It has one or several
+// quasi-identifiers columns, and one column that indicates the relative
+// frequency of each quasi-identifier tuple.
+// If a tuple is present in the data but not in the auxiliary table, the
+// corresponding relative frequency is assumed to be zero (and thus, the
+// tuple is highly reidentifiable).
+type StatisticalTable struct {
+	// Auxiliary table location. [required]
+	Table *BigQueryTable `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
+	// Quasi-identifier columns. [required]
+	QuasiIds []*StatisticalTable_QuasiIdentifierField `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds,proto3" json:"quasi_ids,omitempty"`
+	// The relative frequency column must contain a floating-point number
+	// between 0 and 1 (inclusive). Null values are assumed to be zero.
+	// [required]
+	RelativeFrequency    *FieldId `protobuf:"bytes,2,opt,name=relative_frequency,json=relativeFrequency,proto3" json:"relative_frequency,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StatisticalTable) Reset()         { *m = StatisticalTable{} }
+func (m *StatisticalTable) String() string { return proto.CompactTextString(m) }
+func (*StatisticalTable) ProtoMessage()    {}
+func (*StatisticalTable) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{31}
+}
+func (m *StatisticalTable) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StatisticalTable.Unmarshal(m, b)
+}
+func (m *StatisticalTable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StatisticalTable.Marshal(b, m, deterministic)
+}
+func (dst *StatisticalTable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatisticalTable.Merge(dst, src)
+}
+func (m *StatisticalTable) XXX_Size() int {
+	return xxx_messageInfo_StatisticalTable.Size(m)
+}
+func (m *StatisticalTable) XXX_DiscardUnknown() {
+	xxx_messageInfo_StatisticalTable.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StatisticalTable proto.InternalMessageInfo
+
+func (m *StatisticalTable) GetTable() *BigQueryTable {
+	if m != nil {
+		return m.Table
+	}
+	return nil
+}
+
+func (m *StatisticalTable) GetQuasiIds() []*StatisticalTable_QuasiIdentifierField {
+	if m != nil {
+		return m.QuasiIds
+	}
+	return nil
+}
+
+func (m *StatisticalTable) GetRelativeFrequency() *FieldId {
+	if m != nil {
+		return m.RelativeFrequency
+	}
+	return nil
+}
+
+// A quasi-identifier column has a custom_tag, used to know which column
+// in the data corresponds to which column in the statistical model.
+type StatisticalTable_QuasiIdentifierField struct {
+	Field                *FieldId `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
+	CustomTag            string   `protobuf:"bytes,2,opt,name=custom_tag,json=customTag,proto3" json:"custom_tag,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StatisticalTable_QuasiIdentifierField) Reset()         { *m = StatisticalTable_QuasiIdentifierField{} }
+func (m *StatisticalTable_QuasiIdentifierField) String() string { return proto.CompactTextString(m) }
+func (*StatisticalTable_QuasiIdentifierField) ProtoMessage()    {}
+func (*StatisticalTable_QuasiIdentifierField) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{31, 0}
+}
+func (m *StatisticalTable_QuasiIdentifierField) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Unmarshal(m, b)
+}
+func (m *StatisticalTable_QuasiIdentifierField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Marshal(b, m, deterministic)
+}
+func (dst *StatisticalTable_QuasiIdentifierField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Merge(dst, src)
+}
+func (m *StatisticalTable_QuasiIdentifierField) XXX_Size() int {
+	return xxx_messageInfo_StatisticalTable_QuasiIdentifierField.Size(m)
+}
+func (m *StatisticalTable_QuasiIdentifierField) XXX_DiscardUnknown() {
+	xxx_messageInfo_StatisticalTable_QuasiIdentifierField.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StatisticalTable_QuasiIdentifierField proto.InternalMessageInfo
+
+func (m *StatisticalTable_QuasiIdentifierField) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+func (m *StatisticalTable_QuasiIdentifierField) GetCustomTag() string {
+	if m != nil {
+		return m.CustomTag
+	}
+	return ""
+}
+
+// Privacy metric to compute for reidentification risk analysis.
+type PrivacyMetric struct {
+	// Types that are valid to be assigned to Type:
+	//	*PrivacyMetric_NumericalStatsConfig_
+	//	*PrivacyMetric_CategoricalStatsConfig_
+	//	*PrivacyMetric_KAnonymityConfig_
+	//	*PrivacyMetric_LDiversityConfig_
+	//	*PrivacyMetric_KMapEstimationConfig_
+	//	*PrivacyMetric_DeltaPresenceEstimationConfig_
+	Type                 isPrivacyMetric_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *PrivacyMetric) Reset()         { *m = PrivacyMetric{} }
+func (m *PrivacyMetric) String() string { return proto.CompactTextString(m) }
+func (*PrivacyMetric) ProtoMessage()    {}
+func (*PrivacyMetric) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32}
+}
+func (m *PrivacyMetric) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric.Unmarshal(m, b)
+}
+func (m *PrivacyMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric.Merge(dst, src)
+}
+func (m *PrivacyMetric) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric.Size(m)
+}
+func (m *PrivacyMetric) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric proto.InternalMessageInfo
+
+type isPrivacyMetric_Type interface {
+	isPrivacyMetric_Type()
+}
+
+type PrivacyMetric_NumericalStatsConfig_ struct {
+	NumericalStatsConfig *PrivacyMetric_NumericalStatsConfig `protobuf:"bytes,1,opt,name=numerical_stats_config,json=numericalStatsConfig,proto3,oneof"`
+}
+
+type PrivacyMetric_CategoricalStatsConfig_ struct {
+	CategoricalStatsConfig *PrivacyMetric_CategoricalStatsConfig `protobuf:"bytes,2,opt,name=categorical_stats_config,json=categoricalStatsConfig,proto3,oneof"`
+}
+
+type PrivacyMetric_KAnonymityConfig_ struct {
+	KAnonymityConfig *PrivacyMetric_KAnonymityConfig `protobuf:"bytes,3,opt,name=k_anonymity_config,json=kAnonymityConfig,proto3,oneof"`
+}
+
+type PrivacyMetric_LDiversityConfig_ struct {
+	LDiversityConfig *PrivacyMetric_LDiversityConfig `protobuf:"bytes,4,opt,name=l_diversity_config,json=lDiversityConfig,proto3,oneof"`
+}
+
+type PrivacyMetric_KMapEstimationConfig_ struct {
+	KMapEstimationConfig *PrivacyMetric_KMapEstimationConfig `protobuf:"bytes,5,opt,name=k_map_estimation_config,json=kMapEstimationConfig,proto3,oneof"`
+}
+
+type PrivacyMetric_DeltaPresenceEstimationConfig_ struct {
+	DeltaPresenceEstimationConfig *PrivacyMetric_DeltaPresenceEstimationConfig `protobuf:"bytes,6,opt,name=delta_presence_estimation_config,json=deltaPresenceEstimationConfig,proto3,oneof"`
+}
+
+func (*PrivacyMetric_NumericalStatsConfig_) isPrivacyMetric_Type() {}
+
+func (*PrivacyMetric_CategoricalStatsConfig_) isPrivacyMetric_Type() {}
+
+func (*PrivacyMetric_KAnonymityConfig_) isPrivacyMetric_Type() {}
+
+func (*PrivacyMetric_LDiversityConfig_) isPrivacyMetric_Type() {}
+
+func (*PrivacyMetric_KMapEstimationConfig_) isPrivacyMetric_Type() {}
+
+func (*PrivacyMetric_DeltaPresenceEstimationConfig_) isPrivacyMetric_Type() {}
+
+func (m *PrivacyMetric) GetType() isPrivacyMetric_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *PrivacyMetric) GetNumericalStatsConfig() *PrivacyMetric_NumericalStatsConfig {
+	if x, ok := m.GetType().(*PrivacyMetric_NumericalStatsConfig_); ok {
+		return x.NumericalStatsConfig
+	}
+	return nil
+}
+
+func (m *PrivacyMetric) GetCategoricalStatsConfig() *PrivacyMetric_CategoricalStatsConfig {
+	if x, ok := m.GetType().(*PrivacyMetric_CategoricalStatsConfig_); ok {
+		return x.CategoricalStatsConfig
+	}
+	return nil
+}
+
+func (m *PrivacyMetric) GetKAnonymityConfig() *PrivacyMetric_KAnonymityConfig {
+	if x, ok := m.GetType().(*PrivacyMetric_KAnonymityConfig_); ok {
+		return x.KAnonymityConfig
+	}
+	return nil
+}
+
+func (m *PrivacyMetric) GetLDiversityConfig() *PrivacyMetric_LDiversityConfig {
+	if x, ok := m.GetType().(*PrivacyMetric_LDiversityConfig_); ok {
+		return x.LDiversityConfig
+	}
+	return nil
+}
+
+func (m *PrivacyMetric) GetKMapEstimationConfig() *PrivacyMetric_KMapEstimationConfig {
+	if x, ok := m.GetType().(*PrivacyMetric_KMapEstimationConfig_); ok {
+		return x.KMapEstimationConfig
+	}
+	return nil
+}
+
+func (m *PrivacyMetric) GetDeltaPresenceEstimationConfig() *PrivacyMetric_DeltaPresenceEstimationConfig {
+	if x, ok := m.GetType().(*PrivacyMetric_DeltaPresenceEstimationConfig_); ok {
+		return x.DeltaPresenceEstimationConfig
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*PrivacyMetric) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _PrivacyMetric_OneofMarshaler, _PrivacyMetric_OneofUnmarshaler, _PrivacyMetric_OneofSizer, []interface{}{
+		(*PrivacyMetric_NumericalStatsConfig_)(nil),
+		(*PrivacyMetric_CategoricalStatsConfig_)(nil),
+		(*PrivacyMetric_KAnonymityConfig_)(nil),
+		(*PrivacyMetric_LDiversityConfig_)(nil),
+		(*PrivacyMetric_KMapEstimationConfig_)(nil),
+		(*PrivacyMetric_DeltaPresenceEstimationConfig_)(nil),
+	}
+}
+
+func _PrivacyMetric_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*PrivacyMetric)
+	// type
+	switch x := m.Type.(type) {
+	case *PrivacyMetric_NumericalStatsConfig_:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.NumericalStatsConfig); err != nil {
+			return err
+		}
+	case *PrivacyMetric_CategoricalStatsConfig_:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CategoricalStatsConfig); err != nil {
+			return err
+		}
+	case *PrivacyMetric_KAnonymityConfig_:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.KAnonymityConfig); err != nil {
+			return err
+		}
+	case *PrivacyMetric_LDiversityConfig_:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.LDiversityConfig); err != nil {
+			return err
+		}
+	case *PrivacyMetric_KMapEstimationConfig_:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.KMapEstimationConfig); err != nil {
+			return err
+		}
+	case *PrivacyMetric_DeltaPresenceEstimationConfig_:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.DeltaPresenceEstimationConfig); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("PrivacyMetric.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _PrivacyMetric_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*PrivacyMetric)
+	switch tag {
+	case 1: // type.numerical_stats_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PrivacyMetric_NumericalStatsConfig)
+		err := b.DecodeMessage(msg)
+		m.Type = &PrivacyMetric_NumericalStatsConfig_{msg}
+		return true, err
+	case 2: // type.categorical_stats_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PrivacyMetric_CategoricalStatsConfig)
+		err := b.DecodeMessage(msg)
+		m.Type = &PrivacyMetric_CategoricalStatsConfig_{msg}
+		return true, err
+	case 3: // type.k_anonymity_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PrivacyMetric_KAnonymityConfig)
+		err := b.DecodeMessage(msg)
+		m.Type = &PrivacyMetric_KAnonymityConfig_{msg}
+		return true, err
+	case 4: // type.l_diversity_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PrivacyMetric_LDiversityConfig)
+		err := b.DecodeMessage(msg)
+		m.Type = &PrivacyMetric_LDiversityConfig_{msg}
+		return true, err
+	case 5: // type.k_map_estimation_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PrivacyMetric_KMapEstimationConfig)
+		err := b.DecodeMessage(msg)
+		m.Type = &PrivacyMetric_KMapEstimationConfig_{msg}
+		return true, err
+	case 6: // type.delta_presence_estimation_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PrivacyMetric_DeltaPresenceEstimationConfig)
+		err := b.DecodeMessage(msg)
+		m.Type = &PrivacyMetric_DeltaPresenceEstimationConfig_{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _PrivacyMetric_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*PrivacyMetric)
+	// type
+	switch x := m.Type.(type) {
+	case *PrivacyMetric_NumericalStatsConfig_:
+		s := proto.Size(x.NumericalStatsConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrivacyMetric_CategoricalStatsConfig_:
+		s := proto.Size(x.CategoricalStatsConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrivacyMetric_KAnonymityConfig_:
+		s := proto.Size(x.KAnonymityConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrivacyMetric_LDiversityConfig_:
+		s := proto.Size(x.LDiversityConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrivacyMetric_KMapEstimationConfig_:
+		s := proto.Size(x.KMapEstimationConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrivacyMetric_DeltaPresenceEstimationConfig_:
+		s := proto.Size(x.DeltaPresenceEstimationConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Compute numerical stats over an individual column, including
+// min, max, and quantiles.
+type PrivacyMetric_NumericalStatsConfig struct {
+	// Field to compute numerical stats on. Supported types are
+	// integer, float, date, datetime, timestamp, time.
+	Field                *FieldId `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PrivacyMetric_NumericalStatsConfig) Reset()         { *m = PrivacyMetric_NumericalStatsConfig{} }
+func (m *PrivacyMetric_NumericalStatsConfig) String() string { return proto.CompactTextString(m) }
+func (*PrivacyMetric_NumericalStatsConfig) ProtoMessage()    {}
+func (*PrivacyMetric_NumericalStatsConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 0}
+}
+func (m *PrivacyMetric_NumericalStatsConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_NumericalStatsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_NumericalStatsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Merge(dst, src)
+}
+func (m *PrivacyMetric_NumericalStatsConfig) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.Size(m)
+}
+func (m *PrivacyMetric_NumericalStatsConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_NumericalStatsConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_NumericalStatsConfig proto.InternalMessageInfo
+
+func (m *PrivacyMetric_NumericalStatsConfig) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+// Compute numerical stats over an individual column, including
+// number of distinct values and value count distribution.
+type PrivacyMetric_CategoricalStatsConfig struct {
+	// Field to compute categorical stats on. All column types are
+	// supported except for arrays and structs. However, it may be more
+	// informative to use NumericalStats when the field type is supported,
+	// depending on the data.
+	Field                *FieldId `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PrivacyMetric_CategoricalStatsConfig) Reset()         { *m = PrivacyMetric_CategoricalStatsConfig{} }
+func (m *PrivacyMetric_CategoricalStatsConfig) String() string { return proto.CompactTextString(m) }
+func (*PrivacyMetric_CategoricalStatsConfig) ProtoMessage()    {}
+func (*PrivacyMetric_CategoricalStatsConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 1}
+}
+func (m *PrivacyMetric_CategoricalStatsConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_CategoricalStatsConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_CategoricalStatsConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Merge(dst, src)
+}
+func (m *PrivacyMetric_CategoricalStatsConfig) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.Size(m)
+}
+func (m *PrivacyMetric_CategoricalStatsConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_CategoricalStatsConfig proto.InternalMessageInfo
+
+func (m *PrivacyMetric_CategoricalStatsConfig) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+// k-anonymity metric, used for analysis of reidentification risk.
+type PrivacyMetric_KAnonymityConfig struct {
+	// Set of fields to compute k-anonymity over. When multiple fields are
+	// specified, they are considered a single composite key. Structs and
+	// repeated data types are not supported; however, nested fields are
+	// supported so long as they are not structs themselves or nested within
+	// a repeated field.
+	QuasiIds []*FieldId `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds,proto3" json:"quasi_ids,omitempty"`
+	// Optional message indicating that multiple rows might be associated to a
+	// single individual. If the same entity_id is associated to multiple
+	// quasi-identifier tuples over distict rows, we consider the entire
+	// collection of tuples as the composite quasi-identifier. This collection
+	// is a multiset: the order in which the different tuples appear in the
+	// dataset is ignored, but their frequency is taken into account.
+	//
+	// Important note: a maximum of 1000 rows can be associated to a single
+	// entity ID. If more rows are associated with the same entity ID, some
+	// might be ignored.
+	EntityId             *EntityId `protobuf:"bytes,2,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *PrivacyMetric_KAnonymityConfig) Reset()         { *m = PrivacyMetric_KAnonymityConfig{} }
+func (m *PrivacyMetric_KAnonymityConfig) String() string { return proto.CompactTextString(m) }
+func (*PrivacyMetric_KAnonymityConfig) ProtoMessage()    {}
+func (*PrivacyMetric_KAnonymityConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 2}
+}
+func (m *PrivacyMetric_KAnonymityConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_KAnonymityConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_KAnonymityConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Merge(dst, src)
+}
+func (m *PrivacyMetric_KAnonymityConfig) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_KAnonymityConfig.Size(m)
+}
+func (m *PrivacyMetric_KAnonymityConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_KAnonymityConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_KAnonymityConfig proto.InternalMessageInfo
+
+func (m *PrivacyMetric_KAnonymityConfig) GetQuasiIds() []*FieldId {
+	if m != nil {
+		return m.QuasiIds
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_KAnonymityConfig) GetEntityId() *EntityId {
+	if m != nil {
+		return m.EntityId
+	}
+	return nil
+}
+
+// l-diversity metric, used for analysis of reidentification risk.
+type PrivacyMetric_LDiversityConfig struct {
+	// Set of quasi-identifiers indicating how equivalence classes are
+	// defined for the l-diversity computation. When multiple fields are
+	// specified, they are considered a single composite key.
+	QuasiIds []*FieldId `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds,proto3" json:"quasi_ids,omitempty"`
+	// Sensitive field for computing the l-value.
+	SensitiveAttribute   *FieldId `protobuf:"bytes,2,opt,name=sensitive_attribute,json=sensitiveAttribute,proto3" json:"sensitive_attribute,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PrivacyMetric_LDiversityConfig) Reset()         { *m = PrivacyMetric_LDiversityConfig{} }
+func (m *PrivacyMetric_LDiversityConfig) String() string { return proto.CompactTextString(m) }
+func (*PrivacyMetric_LDiversityConfig) ProtoMessage()    {}
+func (*PrivacyMetric_LDiversityConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 3}
+}
+func (m *PrivacyMetric_LDiversityConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_LDiversityConfig.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_LDiversityConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_LDiversityConfig.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_LDiversityConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_LDiversityConfig.Merge(dst, src)
+}
+func (m *PrivacyMetric_LDiversityConfig) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_LDiversityConfig.Size(m)
+}
+func (m *PrivacyMetric_LDiversityConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_LDiversityConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_LDiversityConfig proto.InternalMessageInfo
+
+func (m *PrivacyMetric_LDiversityConfig) GetQuasiIds() []*FieldId {
+	if m != nil {
+		return m.QuasiIds
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_LDiversityConfig) GetSensitiveAttribute() *FieldId {
+	if m != nil {
+		return m.SensitiveAttribute
+	}
+	return nil
+}
+
+// Reidentifiability metric. This corresponds to a risk model similar to what
+// is called "journalist risk" in the literature, except the attack dataset is
+// statistically modeled instead of being perfectly known. This can be done
+// using publicly available data (like the US Census), or using a custom
+// statistical model (indicated as one or several BigQuery tables), or by
+// extrapolating from the distribution of values in the input dataset.
+// A column with a semantic tag attached.
+type PrivacyMetric_KMapEstimationConfig struct {
+	// Fields considered to be quasi-identifiers. No two columns can have the
+	// same tag. [required]
+	QuasiIds []*PrivacyMetric_KMapEstimationConfig_TaggedField `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds,proto3" json:"quasi_ids,omitempty"`
+	// ISO 3166-1 alpha-2 region code to use in the statistical modeling.
+	// Required if no column is tagged with a region-specific InfoType (like
+	// US_ZIP_5) or a region code.
+	RegionCode string `protobuf:"bytes,2,opt,name=region_code,json=regionCode,proto3" json:"region_code,omitempty"`
+	// Several auxiliary tables can be used in the analysis. Each custom_tag
+	// used to tag a quasi-identifiers column must appear in exactly one column
+	// of one auxiliary table.
+	AuxiliaryTables      []*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable `protobuf:"bytes,3,rep,name=auxiliary_tables,json=auxiliaryTables,proto3" json:"auxiliary_tables,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                             `json:"-"`
+	XXX_unrecognized     []byte                                               `json:"-"`
+	XXX_sizecache        int32                                                `json:"-"`
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig) Reset()         { *m = PrivacyMetric_KMapEstimationConfig{} }
+func (m *PrivacyMetric_KMapEstimationConfig) String() string { return proto.CompactTextString(m) }
+func (*PrivacyMetric_KMapEstimationConfig) ProtoMessage()    {}
+func (*PrivacyMetric_KMapEstimationConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 4}
+}
+func (m *PrivacyMetric_KMapEstimationConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_KMapEstimationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_KMapEstimationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Merge(dst, src)
+}
+func (m *PrivacyMetric_KMapEstimationConfig) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.Size(m)
+}
+func (m *PrivacyMetric_KMapEstimationConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_KMapEstimationConfig proto.InternalMessageInfo
+
+func (m *PrivacyMetric_KMapEstimationConfig) GetQuasiIds() []*PrivacyMetric_KMapEstimationConfig_TaggedField {
+	if m != nil {
+		return m.QuasiIds
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig) GetRegionCode() string {
+	if m != nil {
+		return m.RegionCode
+	}
+	return ""
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig) GetAuxiliaryTables() []*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable {
+	if m != nil {
+		return m.AuxiliaryTables
+	}
+	return nil
+}
+
+type PrivacyMetric_KMapEstimationConfig_TaggedField struct {
+	// Identifies the column. [required]
+	Field *FieldId `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
+	// Semantic tag that identifies what a column contains, to determine which
+	// statistical model to use to estimate the reidentifiability of each
+	// value. [required]
+	//
+	// Types that are valid to be assigned to Tag:
+	//	*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType
+	//	*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag
+	//	*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred
+	Tag                  isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag `protobuf_oneof:"tag"`
+	XXX_NoUnkeyedLiteral struct{}                                             `json:"-"`
+	XXX_unrecognized     []byte                                               `json:"-"`
+	XXX_sizecache        int32                                                `json:"-"`
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) Reset() {
+	*m = PrivacyMetric_KMapEstimationConfig_TaggedField{}
+}
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) String() string {
+	return proto.CompactTextString(m)
+}
+func (*PrivacyMetric_KMapEstimationConfig_TaggedField) ProtoMessage() {}
+func (*PrivacyMetric_KMapEstimationConfig_TaggedField) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 4, 0}
+}
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Merge(dst, src)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.Size(m)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_TaggedField proto.InternalMessageInfo
+
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+type isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag interface {
+	isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag()
+}
+
+type PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType struct {
+	InfoType *InfoType `protobuf:"bytes,2,opt,name=info_type,json=infoType,proto3,oneof"`
+}
+
+type PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag struct {
+	CustomTag string `protobuf:"bytes,3,opt,name=custom_tag,json=customTag,proto3,oneof"`
+}
+
+type PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred struct {
+	Inferred *empty.Empty `protobuf:"bytes,4,opt,name=inferred,proto3,oneof"`
+}
+
+func (*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType) isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag() {
+}
+
+func (*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag) isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag() {
+}
+
+func (*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred) isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag() {
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetTag() isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag {
+	if m != nil {
+		return m.Tag
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetInfoType() *InfoType {
+	if x, ok := m.GetTag().(*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType); ok {
+		return x.InfoType
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetCustomTag() string {
+	if x, ok := m.GetTag().(*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag); ok {
+		return x.CustomTag
+	}
+	return ""
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetInferred() *empty.Empty {
+	if x, ok := m.GetTag().(*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred); ok {
+		return x.Inferred
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofMarshaler, _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofUnmarshaler, _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofSizer, []interface{}{
+		(*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType)(nil),
+		(*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag)(nil),
+		(*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred)(nil),
+	}
+}
+
+func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
+	// tag
+	switch x := m.Tag.(type) {
+	case *PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InfoType); err != nil {
+			return err
+		}
+	case *PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.CustomTag)
+	case *PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Inferred); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("PrivacyMetric_KMapEstimationConfig_TaggedField.Tag has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
+	switch tag {
+	case 2: // tag.info_type
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InfoType)
+		err := b.DecodeMessage(msg)
+		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType{msg}
+		return true, err
+	case 3: // tag.custom_tag
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag{x}
+		return true, err
+	case 4: // tag.inferred
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(empty.Empty)
+		err := b.DecodeMessage(msg)
+		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
+	// tag
+	switch x := m.Tag.(type) {
+	case *PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType:
+		s := proto.Size(x.InfoType)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.CustomTag)))
+		n += len(x.CustomTag)
+	case *PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred:
+		s := proto.Size(x.Inferred)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// An auxiliary table contains statistical information on the relative
+// frequency of different quasi-identifiers values. It has one or several
+// quasi-identifiers columns, and one column that indicates the relative
+// frequency of each quasi-identifier tuple.
+// If a tuple is present in the data but not in the auxiliary table, the
+// corresponding relative frequency is assumed to be zero (and thus, the
+// tuple is highly reidentifiable).
+type PrivacyMetric_KMapEstimationConfig_AuxiliaryTable struct {
+	// Auxiliary table location. [required]
+	Table *BigQueryTable `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
+	// Quasi-identifier columns. [required]
+	QuasiIds []*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds,proto3" json:"quasi_ids,omitempty"`
+	// The relative frequency column must contain a floating-point number
+	// between 0 and 1 (inclusive). Null values are assumed to be zero.
+	// [required]
+	RelativeFrequency    *FieldId `protobuf:"bytes,2,opt,name=relative_frequency,json=relativeFrequency,proto3" json:"relative_frequency,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) Reset() {
+	*m = PrivacyMetric_KMapEstimationConfig_AuxiliaryTable{}
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) String() string {
+	return proto.CompactTextString(m)
+}
+func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) ProtoMessage() {}
+func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 4, 1}
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Merge(dst, src)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.Size(m)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable proto.InternalMessageInfo
+
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) GetTable() *BigQueryTable {
+	if m != nil {
+		return m.Table
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) GetQuasiIds() []*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField {
+	if m != nil {
+		return m.QuasiIds
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) GetRelativeFrequency() *FieldId {
+	if m != nil {
+		return m.RelativeFrequency
+	}
+	return nil
+}
+
+// A quasi-identifier column has a custom_tag, used to know which column
+// in the data corresponds to which column in the statistical model.
+type PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField struct {
+	Field                *FieldId `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
+	CustomTag            string   `protobuf:"bytes,2,opt,name=custom_tag,json=customTag,proto3" json:"custom_tag,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) Reset() {
+	*m = PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField{}
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) String() string {
+	return proto.CompactTextString(m)
+}
+func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) ProtoMessage() {}
+func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 4, 1, 0}
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Merge(dst, src)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.Size(m)
+}
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField proto.InternalMessageInfo
+
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) GetCustomTag() string {
+	if m != nil {
+		return m.CustomTag
+	}
+	return ""
+}
+
+// δ-presence metric, used to estimate how likely it is for an attacker to
+// figure out that one given individual appears in a de-identified dataset.
+// Similarly to the k-map metric, we cannot compute δ-presence exactly without
+// knowing the attack dataset, so we use a statistical model instead.
+type PrivacyMetric_DeltaPresenceEstimationConfig struct {
+	// Fields considered to be quasi-identifiers. No two fields can have the
+	// same tag. [required]
+	QuasiIds []*QuasiId `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds,proto3" json:"quasi_ids,omitempty"`
+	// ISO 3166-1 alpha-2 region code to use in the statistical modeling.
+	// Required if no column is tagged with a region-specific InfoType (like
+	// US_ZIP_5) or a region code.
+	RegionCode string `protobuf:"bytes,2,opt,name=region_code,json=regionCode,proto3" json:"region_code,omitempty"`
+	// Several auxiliary tables can be used in the analysis. Each custom_tag
+	// used to tag a quasi-identifiers field must appear in exactly one
+	// field of one auxiliary table.
+	AuxiliaryTables      []*StatisticalTable `protobuf:"bytes,3,rep,name=auxiliary_tables,json=auxiliaryTables,proto3" json:"auxiliary_tables,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) Reset() {
+	*m = PrivacyMetric_DeltaPresenceEstimationConfig{}
+}
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) String() string {
+	return proto.CompactTextString(m)
+}
+func (*PrivacyMetric_DeltaPresenceEstimationConfig) ProtoMessage() {}
+func (*PrivacyMetric_DeltaPresenceEstimationConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{32, 5}
+}
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Unmarshal(m, b)
+}
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Marshal(b, m, deterministic)
+}
+func (dst *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Merge(dst, src)
+}
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_Size() int {
+	return xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.Size(m)
+}
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrivacyMetric_DeltaPresenceEstimationConfig proto.InternalMessageInfo
+
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) GetQuasiIds() []*QuasiId {
+	if m != nil {
+		return m.QuasiIds
+	}
+	return nil
+}
+
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) GetRegionCode() string {
+	if m != nil {
+		return m.RegionCode
+	}
+	return ""
+}
+
+func (m *PrivacyMetric_DeltaPresenceEstimationConfig) GetAuxiliaryTables() []*StatisticalTable {
+	if m != nil {
+		return m.AuxiliaryTables
+	}
+	return nil
+}
+
+// Result of a risk analysis operation request.
+type AnalyzeDataSourceRiskDetails struct {
+	// Privacy metric to compute.
+	RequestedPrivacyMetric *PrivacyMetric `protobuf:"bytes,1,opt,name=requested_privacy_metric,json=requestedPrivacyMetric,proto3" json:"requested_privacy_metric,omitempty"`
+	// Input dataset to compute metrics over.
+	RequestedSourceTable *BigQueryTable `protobuf:"bytes,2,opt,name=requested_source_table,json=requestedSourceTable,proto3" json:"requested_source_table,omitempty"`
+	// Values associated with this metric.
+	//
+	// Types that are valid to be assigned to Result:
+	//	*AnalyzeDataSourceRiskDetails_NumericalStatsResult_
+	//	*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_
+	//	*AnalyzeDataSourceRiskDetails_KAnonymityResult_
+	//	*AnalyzeDataSourceRiskDetails_LDiversityResult_
+	//	*AnalyzeDataSourceRiskDetails_KMapEstimationResult_
+	//	*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_
+	Result               isAnalyzeDataSourceRiskDetails_Result `protobuf_oneof:"result"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails) Reset()         { *m = AnalyzeDataSourceRiskDetails{} }
+func (m *AnalyzeDataSourceRiskDetails) String() string { return proto.CompactTextString(m) }
+func (*AnalyzeDataSourceRiskDetails) ProtoMessage()    {}
+func (*AnalyzeDataSourceRiskDetails) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33}
+}
+func (m *AnalyzeDataSourceRiskDetails) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails) GetRequestedPrivacyMetric() *PrivacyMetric {
+	if m != nil {
+		return m.RequestedPrivacyMetric
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails) GetRequestedSourceTable() *BigQueryTable {
+	if m != nil {
+		return m.RequestedSourceTable
+	}
+	return nil
+}
+
+type isAnalyzeDataSourceRiskDetails_Result interface {
+	isAnalyzeDataSourceRiskDetails_Result()
+}
+
+type AnalyzeDataSourceRiskDetails_NumericalStatsResult_ struct {
+	NumericalStatsResult *AnalyzeDataSourceRiskDetails_NumericalStatsResult `protobuf:"bytes,3,opt,name=numerical_stats_result,json=numericalStatsResult,proto3,oneof"`
+}
+
+type AnalyzeDataSourceRiskDetails_CategoricalStatsResult_ struct {
+	CategoricalStatsResult *AnalyzeDataSourceRiskDetails_CategoricalStatsResult `protobuf:"bytes,4,opt,name=categorical_stats_result,json=categoricalStatsResult,proto3,oneof"`
+}
+
+type AnalyzeDataSourceRiskDetails_KAnonymityResult_ struct {
+	KAnonymityResult *AnalyzeDataSourceRiskDetails_KAnonymityResult `protobuf:"bytes,5,opt,name=k_anonymity_result,json=kAnonymityResult,proto3,oneof"`
+}
+
+type AnalyzeDataSourceRiskDetails_LDiversityResult_ struct {
+	LDiversityResult *AnalyzeDataSourceRiskDetails_LDiversityResult `protobuf:"bytes,6,opt,name=l_diversity_result,json=lDiversityResult,proto3,oneof"`
+}
+
+type AnalyzeDataSourceRiskDetails_KMapEstimationResult_ struct {
+	KMapEstimationResult *AnalyzeDataSourceRiskDetails_KMapEstimationResult `protobuf:"bytes,7,opt,name=k_map_estimation_result,json=kMapEstimationResult,proto3,oneof"`
+}
+
+type AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_ struct {
+	DeltaPresenceEstimationResult *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult `protobuf:"bytes,9,opt,name=delta_presence_estimation_result,json=deltaPresenceEstimationResult,proto3,oneof"`
+}
+
+func (*AnalyzeDataSourceRiskDetails_NumericalStatsResult_) isAnalyzeDataSourceRiskDetails_Result() {}
+
+func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_) isAnalyzeDataSourceRiskDetails_Result() {}
+
+func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_) isAnalyzeDataSourceRiskDetails_Result() {}
+
+func (*AnalyzeDataSourceRiskDetails_LDiversityResult_) isAnalyzeDataSourceRiskDetails_Result() {}
+
+func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_) isAnalyzeDataSourceRiskDetails_Result() {}
+
+func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_) isAnalyzeDataSourceRiskDetails_Result() {
+}
+
+func (m *AnalyzeDataSourceRiskDetails) GetResult() isAnalyzeDataSourceRiskDetails_Result {
+	if m != nil {
+		return m.Result
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails) GetNumericalStatsResult() *AnalyzeDataSourceRiskDetails_NumericalStatsResult {
+	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_NumericalStatsResult_); ok {
+		return x.NumericalStatsResult
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails) GetCategoricalStatsResult() *AnalyzeDataSourceRiskDetails_CategoricalStatsResult {
+	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_); ok {
+		return x.CategoricalStatsResult
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails) GetKAnonymityResult() *AnalyzeDataSourceRiskDetails_KAnonymityResult {
+	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_KAnonymityResult_); ok {
+		return x.KAnonymityResult
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails) GetLDiversityResult() *AnalyzeDataSourceRiskDetails_LDiversityResult {
+	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_LDiversityResult_); ok {
+		return x.LDiversityResult
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails) GetKMapEstimationResult() *AnalyzeDataSourceRiskDetails_KMapEstimationResult {
+	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_KMapEstimationResult_); ok {
+		return x.KMapEstimationResult
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails) GetDeltaPresenceEstimationResult() *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult {
+	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_); ok {
+		return x.DeltaPresenceEstimationResult
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*AnalyzeDataSourceRiskDetails) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _AnalyzeDataSourceRiskDetails_OneofMarshaler, _AnalyzeDataSourceRiskDetails_OneofUnmarshaler, _AnalyzeDataSourceRiskDetails_OneofSizer, []interface{}{
+		(*AnalyzeDataSourceRiskDetails_NumericalStatsResult_)(nil),
+		(*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_)(nil),
+		(*AnalyzeDataSourceRiskDetails_KAnonymityResult_)(nil),
+		(*AnalyzeDataSourceRiskDetails_LDiversityResult_)(nil),
+		(*AnalyzeDataSourceRiskDetails_KMapEstimationResult_)(nil),
+		(*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_)(nil),
+	}
+}
+
+func _AnalyzeDataSourceRiskDetails_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*AnalyzeDataSourceRiskDetails)
+	// result
+	switch x := m.Result.(type) {
+	case *AnalyzeDataSourceRiskDetails_NumericalStatsResult_:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.NumericalStatsResult); err != nil {
+			return err
+		}
+	case *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CategoricalStatsResult); err != nil {
+			return err
+		}
+	case *AnalyzeDataSourceRiskDetails_KAnonymityResult_:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.KAnonymityResult); err != nil {
+			return err
+		}
+	case *AnalyzeDataSourceRiskDetails_LDiversityResult_:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.LDiversityResult); err != nil {
+			return err
+		}
+	case *AnalyzeDataSourceRiskDetails_KMapEstimationResult_:
+		b.EncodeVarint(7<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.KMapEstimationResult); err != nil {
+			return err
+		}
+	case *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_:
+		b.EncodeVarint(9<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.DeltaPresenceEstimationResult); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("AnalyzeDataSourceRiskDetails.Result has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _AnalyzeDataSourceRiskDetails_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*AnalyzeDataSourceRiskDetails)
+	switch tag {
+	case 3: // result.numerical_stats_result
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AnalyzeDataSourceRiskDetails_NumericalStatsResult)
+		err := b.DecodeMessage(msg)
+		m.Result = &AnalyzeDataSourceRiskDetails_NumericalStatsResult_{msg}
+		return true, err
+	case 4: // result.categorical_stats_result
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AnalyzeDataSourceRiskDetails_CategoricalStatsResult)
+		err := b.DecodeMessage(msg)
+		m.Result = &AnalyzeDataSourceRiskDetails_CategoricalStatsResult_{msg}
+		return true, err
+	case 5: // result.k_anonymity_result
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AnalyzeDataSourceRiskDetails_KAnonymityResult)
+		err := b.DecodeMessage(msg)
+		m.Result = &AnalyzeDataSourceRiskDetails_KAnonymityResult_{msg}
+		return true, err
+	case 6: // result.l_diversity_result
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AnalyzeDataSourceRiskDetails_LDiversityResult)
+		err := b.DecodeMessage(msg)
+		m.Result = &AnalyzeDataSourceRiskDetails_LDiversityResult_{msg}
+		return true, err
+	case 7: // result.k_map_estimation_result
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AnalyzeDataSourceRiskDetails_KMapEstimationResult)
+		err := b.DecodeMessage(msg)
+		m.Result = &AnalyzeDataSourceRiskDetails_KMapEstimationResult_{msg}
+		return true, err
+	case 9: // result.delta_presence_estimation_result
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult)
+		err := b.DecodeMessage(msg)
+		m.Result = &AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _AnalyzeDataSourceRiskDetails_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*AnalyzeDataSourceRiskDetails)
+	// result
+	switch x := m.Result.(type) {
+	case *AnalyzeDataSourceRiskDetails_NumericalStatsResult_:
+		s := proto.Size(x.NumericalStatsResult)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_:
+		s := proto.Size(x.CategoricalStatsResult)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *AnalyzeDataSourceRiskDetails_KAnonymityResult_:
+		s := proto.Size(x.KAnonymityResult)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *AnalyzeDataSourceRiskDetails_LDiversityResult_:
+		s := proto.Size(x.LDiversityResult)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *AnalyzeDataSourceRiskDetails_KMapEstimationResult_:
+		s := proto.Size(x.KMapEstimationResult)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_:
+		s := proto.Size(x.DeltaPresenceEstimationResult)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Result of the numerical stats computation.
+type AnalyzeDataSourceRiskDetails_NumericalStatsResult struct {
+	// Minimum value appearing in the column.
+	MinValue *Value `protobuf:"bytes,1,opt,name=min_value,json=minValue,proto3" json:"min_value,omitempty"`
+	// Maximum value appearing in the column.
+	MaxValue *Value `protobuf:"bytes,2,opt,name=max_value,json=maxValue,proto3" json:"max_value,omitempty"`
+	// List of 99 values that partition the set of field values into 100 equal
+	// sized buckets.
+	QuantileValues       []*Value `protobuf:"bytes,4,rep,name=quantile_values,json=quantileValues,proto3" json:"quantile_values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_NumericalStatsResult{}
+}
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_NumericalStatsResult) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_NumericalStatsResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 0}
+}
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_NumericalStatsResult proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) GetMinValue() *Value {
+	if m != nil {
+		return m.MinValue
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) GetMaxValue() *Value {
+	if m != nil {
+		return m.MaxValue
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) GetQuantileValues() []*Value {
+	if m != nil {
+		return m.QuantileValues
+	}
+	return nil
+}
+
+// Result of the categorical stats computation.
+type AnalyzeDataSourceRiskDetails_CategoricalStatsResult struct {
+	// Histogram of value frequencies in the column.
+	ValueFrequencyHistogramBuckets []*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket `protobuf:"bytes,5,rep,name=value_frequency_histogram_buckets,json=valueFrequencyHistogramBuckets,proto3" json:"value_frequency_histogram_buckets,omitempty"`
+	XXX_NoUnkeyedLiteral           struct{}                                                                               `json:"-"`
+	XXX_unrecognized               []byte                                                                                 `json:"-"`
+	XXX_sizecache                  int32                                                                                  `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_CategoricalStatsResult{}
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 1}
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) GetValueFrequencyHistogramBuckets() []*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket {
+	if m != nil {
+		return m.ValueFrequencyHistogramBuckets
+	}
+	return nil
+}
+
+type AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket struct {
+	// Lower bound on the value frequency of the values in this bucket.
+	ValueFrequencyLowerBound int64 `protobuf:"varint,1,opt,name=value_frequency_lower_bound,json=valueFrequencyLowerBound,proto3" json:"value_frequency_lower_bound,omitempty"`
+	// Upper bound on the value frequency of the values in this bucket.
+	ValueFrequencyUpperBound int64 `protobuf:"varint,2,opt,name=value_frequency_upper_bound,json=valueFrequencyUpperBound,proto3" json:"value_frequency_upper_bound,omitempty"`
+	// Total number of values in this bucket.
+	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize,proto3" json:"bucket_size,omitempty"`
+	// Sample of value frequencies in this bucket. The total number of
+	// values returned per bucket is capped at 20.
+	BucketValues []*ValueFrequency `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues,proto3" json:"bucket_values,omitempty"`
+	// Total number of distinct values in this bucket.
+	BucketValueCount     int64    `protobuf:"varint,5,opt,name=bucket_value_count,json=bucketValueCount,proto3" json:"bucket_value_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket{}
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) ProtoMessage() {
+}
+func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 1, 0}
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetValueFrequencyLowerBound() int64 {
+	if m != nil {
+		return m.ValueFrequencyLowerBound
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetValueFrequencyUpperBound() int64 {
+	if m != nil {
+		return m.ValueFrequencyUpperBound
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetBucketSize() int64 {
+	if m != nil {
+		return m.BucketSize
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetBucketValues() []*ValueFrequency {
+	if m != nil {
+		return m.BucketValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetBucketValueCount() int64 {
+	if m != nil {
+		return m.BucketValueCount
+	}
+	return 0
+}
+
+// Result of the k-anonymity computation.
+type AnalyzeDataSourceRiskDetails_KAnonymityResult struct {
+	// Histogram of k-anonymity equivalence classes.
+	EquivalenceClassHistogramBuckets []*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket `protobuf:"bytes,5,rep,name=equivalence_class_histogram_buckets,json=equivalenceClassHistogramBuckets,proto3" json:"equivalence_class_histogram_buckets,omitempty"`
+	XXX_NoUnkeyedLiteral             struct{}                                                                   `json:"-"`
+	XXX_unrecognized                 []byte                                                                     `json:"-"`
+	XXX_sizecache                    int32                                                                      `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_KAnonymityResult{}
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_KAnonymityResult) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_KAnonymityResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 2}
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) GetEquivalenceClassHistogramBuckets() []*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket {
+	if m != nil {
+		return m.EquivalenceClassHistogramBuckets
+	}
+	return nil
+}
+
+// The set of columns' values that share the same ldiversity value
+type AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass struct {
+	// Set of values defining the equivalence class. One value per
+	// quasi-identifier column in the original KAnonymity metric message.
+	// The order is always the same as the original request.
+	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues,proto3" json:"quasi_ids_values,omitempty"`
+	// Size of the equivalence class, for example number of rows with the
+	// above set of values.
+	EquivalenceClassSize int64    `protobuf:"varint,2,opt,name=equivalence_class_size,json=equivalenceClassSize,proto3" json:"equivalence_class_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass{}
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 2, 0}
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) GetQuasiIdsValues() []*Value {
+	if m != nil {
+		return m.QuasiIdsValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) GetEquivalenceClassSize() int64 {
+	if m != nil {
+		return m.EquivalenceClassSize
+	}
+	return 0
+}
+
+type AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket struct {
+	// Lower bound on the size of the equivalence classes in this bucket.
+	EquivalenceClassSizeLowerBound int64 `protobuf:"varint,1,opt,name=equivalence_class_size_lower_bound,json=equivalenceClassSizeLowerBound,proto3" json:"equivalence_class_size_lower_bound,omitempty"`
+	// Upper bound on the size of the equivalence classes in this bucket.
+	EquivalenceClassSizeUpperBound int64 `protobuf:"varint,2,opt,name=equivalence_class_size_upper_bound,json=equivalenceClassSizeUpperBound,proto3" json:"equivalence_class_size_upper_bound,omitempty"`
+	// Total number of equivalence classes in this bucket.
+	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize,proto3" json:"bucket_size,omitempty"`
+	// Sample of equivalence classes in this bucket. The total number of
+	// classes returned per bucket is capped at 20.
+	BucketValues []*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues,proto3" json:"bucket_values,omitempty"`
+	// Total number of distinct equivalence classes in this bucket.
+	BucketValueCount     int64    `protobuf:"varint,5,opt,name=bucket_value_count,json=bucketValueCount,proto3" json:"bucket_value_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket{}
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 2, 1}
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetEquivalenceClassSizeLowerBound() int64 {
+	if m != nil {
+		return m.EquivalenceClassSizeLowerBound
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetEquivalenceClassSizeUpperBound() int64 {
+	if m != nil {
+		return m.EquivalenceClassSizeUpperBound
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetBucketSize() int64 {
+	if m != nil {
+		return m.BucketSize
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetBucketValues() []*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass {
+	if m != nil {
+		return m.BucketValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetBucketValueCount() int64 {
+	if m != nil {
+		return m.BucketValueCount
+	}
+	return 0
+}
+
+// Result of the l-diversity computation.
+type AnalyzeDataSourceRiskDetails_LDiversityResult struct {
+	// Histogram of l-diversity equivalence class sensitive value frequencies.
+	SensitiveValueFrequencyHistogramBuckets []*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket `protobuf:"bytes,5,rep,name=sensitive_value_frequency_histogram_buckets,json=sensitiveValueFrequencyHistogramBuckets,proto3" json:"sensitive_value_frequency_histogram_buckets,omitempty"`
+	XXX_NoUnkeyedLiteral                    struct{}                                                                   `json:"-"`
+	XXX_unrecognized                        []byte                                                                     `json:"-"`
+	XXX_sizecache                           int32                                                                      `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_LDiversityResult{}
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_LDiversityResult) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_LDiversityResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 3}
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) GetSensitiveValueFrequencyHistogramBuckets() []*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket {
+	if m != nil {
+		return m.SensitiveValueFrequencyHistogramBuckets
+	}
+	return nil
+}
+
+// The set of columns' values that share the same ldiversity value.
+type AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass struct {
+	// Quasi-identifier values defining the k-anonymity equivalence
+	// class. The order is always the same as the original request.
+	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues,proto3" json:"quasi_ids_values,omitempty"`
+	// Size of the k-anonymity equivalence class.
+	EquivalenceClassSize int64 `protobuf:"varint,2,opt,name=equivalence_class_size,json=equivalenceClassSize,proto3" json:"equivalence_class_size,omitempty"`
+	// Number of distinct sensitive values in this equivalence class.
+	NumDistinctSensitiveValues int64 `protobuf:"varint,3,opt,name=num_distinct_sensitive_values,json=numDistinctSensitiveValues,proto3" json:"num_distinct_sensitive_values,omitempty"`
+	// Estimated frequencies of top sensitive values.
+	TopSensitiveValues   []*ValueFrequency `protobuf:"bytes,4,rep,name=top_sensitive_values,json=topSensitiveValues,proto3" json:"top_sensitive_values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass{}
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 3, 0}
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) GetQuasiIdsValues() []*Value {
+	if m != nil {
+		return m.QuasiIdsValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) GetEquivalenceClassSize() int64 {
+	if m != nil {
+		return m.EquivalenceClassSize
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) GetNumDistinctSensitiveValues() int64 {
+	if m != nil {
+		return m.NumDistinctSensitiveValues
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) GetTopSensitiveValues() []*ValueFrequency {
+	if m != nil {
+		return m.TopSensitiveValues
+	}
+	return nil
+}
+
+type AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket struct {
+	// Lower bound on the sensitive value frequencies of the equivalence
+	// classes in this bucket.
+	SensitiveValueFrequencyLowerBound int64 `protobuf:"varint,1,opt,name=sensitive_value_frequency_lower_bound,json=sensitiveValueFrequencyLowerBound,proto3" json:"sensitive_value_frequency_lower_bound,omitempty"`
+	// Upper bound on the sensitive value frequencies of the equivalence
+	// classes in this bucket.
+	SensitiveValueFrequencyUpperBound int64 `protobuf:"varint,2,opt,name=sensitive_value_frequency_upper_bound,json=sensitiveValueFrequencyUpperBound,proto3" json:"sensitive_value_frequency_upper_bound,omitempty"`
+	// Total number of equivalence classes in this bucket.
+	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize,proto3" json:"bucket_size,omitempty"`
+	// Sample of equivalence classes in this bucket. The total number of
+	// classes returned per bucket is capped at 20.
+	BucketValues []*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues,proto3" json:"bucket_values,omitempty"`
+	// Total number of distinct equivalence classes in this bucket.
+	BucketValueCount     int64    `protobuf:"varint,5,opt,name=bucket_value_count,json=bucketValueCount,proto3" json:"bucket_value_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket{}
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 3, 1}
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetSensitiveValueFrequencyLowerBound() int64 {
+	if m != nil {
+		return m.SensitiveValueFrequencyLowerBound
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetSensitiveValueFrequencyUpperBound() int64 {
+	if m != nil {
+		return m.SensitiveValueFrequencyUpperBound
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetBucketSize() int64 {
+	if m != nil {
+		return m.BucketSize
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetBucketValues() []*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass {
+	if m != nil {
+		return m.BucketValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetBucketValueCount() int64 {
+	if m != nil {
+		return m.BucketValueCount
+	}
+	return 0
+}
+
+// Result of the reidentifiability analysis. Note that these results are an
+// estimation, not exact values.
+type AnalyzeDataSourceRiskDetails_KMapEstimationResult struct {
+	// The intervals [min_anonymity, max_anonymity] do not overlap. If a value
+	// doesn't correspond to any such interval, the associated frequency is
+	// zero. For example, the following records:
+	//   {min_anonymity: 1, max_anonymity: 1, frequency: 17}
+	//   {min_anonymity: 2, max_anonymity: 3, frequency: 42}
+	//   {min_anonymity: 5, max_anonymity: 10, frequency: 99}
+	// mean that there are no record with an estimated anonymity of 4, 5, or
+	// larger than 10.
+	KMapEstimationHistogram []*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket `protobuf:"bytes,1,rep,name=k_map_estimation_histogram,json=kMapEstimationHistogram,proto3" json:"k_map_estimation_histogram,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}                                                                           `json:"-"`
+	XXX_unrecognized        []byte                                                                             `json:"-"`
+	XXX_sizecache           int32                                                                              `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_KMapEstimationResult{}
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 4}
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) GetKMapEstimationHistogram() []*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket {
+	if m != nil {
+		return m.KMapEstimationHistogram
+	}
+	return nil
+}
+
+// A tuple of values for the quasi-identifier columns.
+type AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues struct {
+	// The quasi-identifier values.
+	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues,proto3" json:"quasi_ids_values,omitempty"`
+	// The estimated anonymity for these quasi-identifier values.
+	EstimatedAnonymity   int64    `protobuf:"varint,2,opt,name=estimated_anonymity,json=estimatedAnonymity,proto3" json:"estimated_anonymity,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues{}
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 4, 0}
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) GetQuasiIdsValues() []*Value {
+	if m != nil {
+		return m.QuasiIdsValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) GetEstimatedAnonymity() int64 {
+	if m != nil {
+		return m.EstimatedAnonymity
+	}
+	return 0
+}
+
+// A KMapEstimationHistogramBucket message with the following values:
+//   min_anonymity: 3
+//   max_anonymity: 5
+//   frequency: 42
+// means that there are 42 records whose quasi-identifier values correspond
+// to 3, 4 or 5 people in the overlying population. An important particular
+// case is when min_anonymity = max_anonymity = 1: the frequency field then
+// corresponds to the number of uniquely identifiable records.
+type AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket struct {
+	// Always positive.
+	MinAnonymity int64 `protobuf:"varint,1,opt,name=min_anonymity,json=minAnonymity,proto3" json:"min_anonymity,omitempty"`
+	// Always greater than or equal to min_anonymity.
+	MaxAnonymity int64 `protobuf:"varint,2,opt,name=max_anonymity,json=maxAnonymity,proto3" json:"max_anonymity,omitempty"`
+	// Number of records within these anonymity bounds.
+	BucketSize int64 `protobuf:"varint,5,opt,name=bucket_size,json=bucketSize,proto3" json:"bucket_size,omitempty"`
+	// Sample of quasi-identifier tuple values in this bucket. The total
+	// number of classes returned per bucket is capped at 20.
+	BucketValues []*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues `protobuf:"bytes,6,rep,name=bucket_values,json=bucketValues,proto3" json:"bucket_values,omitempty"`
+	// Total number of distinct quasi-identifier tuple values in this bucket.
+	BucketValueCount     int64    `protobuf:"varint,7,opt,name=bucket_value_count,json=bucketValueCount,proto3" json:"bucket_value_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket{}
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) ProtoMessage() {
+}
+func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 4, 1}
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetMinAnonymity() int64 {
+	if m != nil {
+		return m.MinAnonymity
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetMaxAnonymity() int64 {
+	if m != nil {
+		return m.MaxAnonymity
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetBucketSize() int64 {
+	if m != nil {
+		return m.BucketSize
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetBucketValues() []*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues {
+	if m != nil {
+		return m.BucketValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetBucketValueCount() int64 {
+	if m != nil {
+		return m.BucketValueCount
+	}
+	return 0
+}
+
+// Result of the δ-presence computation. Note that these results are an
+// estimation, not exact values.
+type AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult struct {
+	// The intervals [min_probability, max_probability) do not overlap. If a
+	// value doesn't correspond to any such interval, the associated frequency
+	// is zero. For example, the following records:
+	//   {min_probability: 0, max_probability: 0.1, frequency: 17}
+	//   {min_probability: 0.2, max_probability: 0.3, frequency: 42}
+	//   {min_probability: 0.3, max_probability: 0.4, frequency: 99}
+	// mean that there are no record with an estimated probability in [0.1, 0.2)
+	// nor larger or equal to 0.4.
+	DeltaPresenceEstimationHistogram []*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket `protobuf:"bytes,1,rep,name=delta_presence_estimation_histogram,json=deltaPresenceEstimationHistogram,proto3" json:"delta_presence_estimation_histogram,omitempty"`
+	XXX_NoUnkeyedLiteral             struct{}                                                                                             `json:"-"`
+	XXX_unrecognized                 []byte                                                                                               `json:"-"`
+	XXX_sizecache                    int32                                                                                                `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult{}
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) ProtoMessage() {}
+func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 5}
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult) GetDeltaPresenceEstimationHistogram() []*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket {
+	if m != nil {
+		return m.DeltaPresenceEstimationHistogram
+	}
+	return nil
+}
+
+// A tuple of values for the quasi-identifier columns.
+type AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues struct {
+	// The quasi-identifier values.
+	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues,proto3" json:"quasi_ids_values,omitempty"`
+	// The estimated probability that a given individual sharing these
+	// quasi-identifier values is in the dataset. This value, typically called
+	// δ, is the ratio between the number of records in the dataset with these
+	// quasi-identifier values, and the total number of individuals (inside
+	// *and* outside the dataset) with these quasi-identifier values.
+	// For example, if there are 15 individuals in the dataset who share the
+	// same quasi-identifier values, and an estimated 100 people in the entire
+	// population with these values, then δ is 0.15.
+	EstimatedProbability float64  `protobuf:"fixed64,2,opt,name=estimated_probability,json=estimatedProbability,proto3" json:"estimated_probability,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues{}
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) ProtoMessage() {
+}
+func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 5, 0}
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) GetQuasiIdsValues() []*Value {
+	if m != nil {
+		return m.QuasiIdsValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues) GetEstimatedProbability() float64 {
+	if m != nil {
+		return m.EstimatedProbability
+	}
+	return 0
+}
+
+// A DeltaPresenceEstimationHistogramBucket message with the following
+// values:
+//   min_probability: 0.1
+//   max_probability: 0.2
+//   frequency: 42
+// means that there are 42 records for which δ is in [0.1, 0.2). An
+// important particular case is when min_probability = max_probability = 1:
+// then, every individual who shares this quasi-identifier combination is in
+// the dataset.
+type AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket struct {
+	// Between 0 and 1.
+	MinProbability float64 `protobuf:"fixed64,1,opt,name=min_probability,json=minProbability,proto3" json:"min_probability,omitempty"`
+	// Always greater than or equal to min_probability.
+	MaxProbability float64 `protobuf:"fixed64,2,opt,name=max_probability,json=maxProbability,proto3" json:"max_probability,omitempty"`
+	// Number of records within these probability bounds.
+	BucketSize int64 `protobuf:"varint,5,opt,name=bucket_size,json=bucketSize,proto3" json:"bucket_size,omitempty"`
+	// Sample of quasi-identifier tuple values in this bucket. The total
+	// number of classes returned per bucket is capped at 20.
+	BucketValues []*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues `protobuf:"bytes,6,rep,name=bucket_values,json=bucketValues,proto3" json:"bucket_values,omitempty"`
+	// Total number of distinct quasi-identifier tuple values in this bucket.
+	BucketValueCount     int64    `protobuf:"varint,7,opt,name=bucket_value_count,json=bucketValueCount,proto3" json:"bucket_value_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) Reset() {
+	*m = AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket{}
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) String() string {
+	return proto.CompactTextString(m)
+}
+func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) ProtoMessage() {
+}
+func (*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{33, 5, 1}
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Unmarshal(m, b)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Marshal(b, m, deterministic)
+}
+func (dst *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Merge(dst, src)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_Size() int {
+	return xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.Size(m)
+}
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket proto.InternalMessageInfo
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) GetMinProbability() float64 {
+	if m != nil {
+		return m.MinProbability
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) GetMaxProbability() float64 {
+	if m != nil {
+		return m.MaxProbability
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) GetBucketSize() int64 {
+	if m != nil {
+		return m.BucketSize
+	}
+	return 0
+}
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) GetBucketValues() []*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues {
+	if m != nil {
+		return m.BucketValues
+	}
+	return nil
+}
+
+func (m *AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket) GetBucketValueCount() int64 {
+	if m != nil {
+		return m.BucketValueCount
+	}
+	return 0
+}
+
+// A value of a field, including its frequency.
+type ValueFrequency struct {
+	// A value contained in the field in question.
+	Value *Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	// How many times the value is contained in the field.
+	Count                int64    `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ValueFrequency) Reset()         { *m = ValueFrequency{} }
+func (m *ValueFrequency) String() string { return proto.CompactTextString(m) }
+func (*ValueFrequency) ProtoMessage()    {}
+func (*ValueFrequency) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{34}
+}
+func (m *ValueFrequency) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ValueFrequency.Unmarshal(m, b)
+}
+func (m *ValueFrequency) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ValueFrequency.Marshal(b, m, deterministic)
+}
+func (dst *ValueFrequency) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValueFrequency.Merge(dst, src)
+}
+func (m *ValueFrequency) XXX_Size() int {
+	return xxx_messageInfo_ValueFrequency.Size(m)
+}
+func (m *ValueFrequency) XXX_DiscardUnknown() {
+	xxx_messageInfo_ValueFrequency.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ValueFrequency proto.InternalMessageInfo
+
+func (m *ValueFrequency) GetValue() *Value {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+func (m *ValueFrequency) GetCount() int64 {
+	if m != nil {
+		return m.Count
+	}
+	return 0
+}
+
+// Set of primitive values supported by the system.
+// Note that for the purposes of inspection or transformation, the number
+// of bytes considered to comprise a 'Value' is based on its representation
+// as a UTF-8 encoded string. For example, if 'integer_value' is set to
+// 123456789, the number of bytes would be counted as 9, even though an
+// int64 only holds up to 8 bytes of data.
+type Value struct {
+	// Types that are valid to be assigned to Type:
+	//	*Value_IntegerValue
+	//	*Value_FloatValue
+	//	*Value_StringValue
+	//	*Value_BooleanValue
+	//	*Value_TimestampValue
+	//	*Value_TimeValue
+	//	*Value_DateValue
+	//	*Value_DayOfWeekValue
+	Type                 isValue_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Value) Reset()         { *m = Value{} }
+func (m *Value) String() string { return proto.CompactTextString(m) }
+func (*Value) ProtoMessage()    {}
+func (*Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{35}
+}
+func (m *Value) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Value.Unmarshal(m, b)
+}
+func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Value.Marshal(b, m, deterministic)
+}
+func (dst *Value) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Value.Merge(dst, src)
+}
+func (m *Value) XXX_Size() int {
+	return xxx_messageInfo_Value.Size(m)
+}
+func (m *Value) XXX_DiscardUnknown() {
+	xxx_messageInfo_Value.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Value proto.InternalMessageInfo
+
+type isValue_Type interface {
+	isValue_Type()
+}
+
+type Value_IntegerValue struct {
+	IntegerValue int64 `protobuf:"varint,1,opt,name=integer_value,json=integerValue,proto3,oneof"`
+}
+
+type Value_FloatValue struct {
+	FloatValue float64 `protobuf:"fixed64,2,opt,name=float_value,json=floatValue,proto3,oneof"`
+}
+
+type Value_StringValue struct {
+	StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,proto3,oneof"`
+}
+
+type Value_BooleanValue struct {
+	BooleanValue bool `protobuf:"varint,4,opt,name=boolean_value,json=booleanValue,proto3,oneof"`
+}
+
+type Value_TimestampValue struct {
+	TimestampValue *timestamp.Timestamp `protobuf:"bytes,5,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
+}
+
+type Value_TimeValue struct {
+	TimeValue *timeofday.TimeOfDay `protobuf:"bytes,6,opt,name=time_value,json=timeValue,proto3,oneof"`
+}
+
+type Value_DateValue struct {
+	DateValue *date.Date `protobuf:"bytes,7,opt,name=date_value,json=dateValue,proto3,oneof"`
+}
+
+type Value_DayOfWeekValue struct {
+	DayOfWeekValue dayofweek.DayOfWeek `protobuf:"varint,8,opt,name=day_of_week_value,json=dayOfWeekValue,proto3,enum=google.type.DayOfWeek,oneof"`
+}
+
+func (*Value_IntegerValue) isValue_Type() {}
+
+func (*Value_FloatValue) isValue_Type() {}
+
+func (*Value_StringValue) isValue_Type() {}
+
+func (*Value_BooleanValue) isValue_Type() {}
+
+func (*Value_TimestampValue) isValue_Type() {}
+
+func (*Value_TimeValue) isValue_Type() {}
+
+func (*Value_DateValue) isValue_Type() {}
+
+func (*Value_DayOfWeekValue) isValue_Type() {}
+
+func (m *Value) GetType() isValue_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *Value) GetIntegerValue() int64 {
+	if x, ok := m.GetType().(*Value_IntegerValue); ok {
+		return x.IntegerValue
+	}
+	return 0
+}
+
+func (m *Value) GetFloatValue() float64 {
+	if x, ok := m.GetType().(*Value_FloatValue); ok {
+		return x.FloatValue
+	}
+	return 0
+}
+
+func (m *Value) GetStringValue() string {
+	if x, ok := m.GetType().(*Value_StringValue); ok {
+		return x.StringValue
+	}
+	return ""
+}
+
+func (m *Value) GetBooleanValue() bool {
+	if x, ok := m.GetType().(*Value_BooleanValue); ok {
+		return x.BooleanValue
+	}
+	return false
+}
+
+func (m *Value) GetTimestampValue() *timestamp.Timestamp {
+	if x, ok := m.GetType().(*Value_TimestampValue); ok {
+		return x.TimestampValue
+	}
+	return nil
+}
+
+func (m *Value) GetTimeValue() *timeofday.TimeOfDay {
+	if x, ok := m.GetType().(*Value_TimeValue); ok {
+		return x.TimeValue
+	}
+	return nil
+}
+
+func (m *Value) GetDateValue() *date.Date {
+	if x, ok := m.GetType().(*Value_DateValue); ok {
+		return x.DateValue
+	}
+	return nil
+}
+
+func (m *Value) GetDayOfWeekValue() dayofweek.DayOfWeek {
+	if x, ok := m.GetType().(*Value_DayOfWeekValue); ok {
+		return x.DayOfWeekValue
+	}
+	return dayofweek.DayOfWeek_DAY_OF_WEEK_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+		(*Value_IntegerValue)(nil),
+		(*Value_FloatValue)(nil),
+		(*Value_StringValue)(nil),
+		(*Value_BooleanValue)(nil),
+		(*Value_TimestampValue)(nil),
+		(*Value_TimeValue)(nil),
+		(*Value_DateValue)(nil),
+		(*Value_DayOfWeekValue)(nil),
+	}
+}
+
+func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Value)
+	// type
+	switch x := m.Type.(type) {
+	case *Value_IntegerValue:
+		b.EncodeVarint(1<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.IntegerValue))
+	case *Value_FloatValue:
+		b.EncodeVarint(2<<3 | proto.WireFixed64)
+		b.EncodeFixed64(math.Float64bits(x.FloatValue))
+	case *Value_StringValue:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.StringValue)
+	case *Value_BooleanValue:
+		t := uint64(0)
+		if x.BooleanValue {
+			t = 1
+		}
+		b.EncodeVarint(4<<3 | proto.WireVarint)
+		b.EncodeVarint(t)
+	case *Value_TimestampValue:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TimestampValue); err != nil {
+			return err
+		}
+	case *Value_TimeValue:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TimeValue); err != nil {
+			return err
+		}
+	case *Value_DateValue:
+		b.EncodeVarint(7<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.DateValue); err != nil {
+			return err
+		}
+	case *Value_DayOfWeekValue:
+		b.EncodeVarint(8<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.DayOfWeekValue))
+	case nil:
+	default:
+		return fmt.Errorf("Value.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Value)
+	switch tag {
+	case 1: // type.integer_value
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Type = &Value_IntegerValue{int64(x)}
+		return true, err
+	case 2: // type.float_value
+		if wire != proto.WireFixed64 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed64()
+		m.Type = &Value_FloatValue{math.Float64frombits(x)}
+		return true, err
+	case 3: // type.string_value
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Type = &Value_StringValue{x}
+		return true, err
+	case 4: // type.boolean_value
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Type = &Value_BooleanValue{x != 0}
+		return true, err
+	case 5: // type.timestamp_value
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(timestamp.Timestamp)
+		err := b.DecodeMessage(msg)
+		m.Type = &Value_TimestampValue{msg}
+		return true, err
+	case 6: // type.time_value
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(timeofday.TimeOfDay)
+		err := b.DecodeMessage(msg)
+		m.Type = &Value_TimeValue{msg}
+		return true, err
+	case 7: // type.date_value
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(date.Date)
+		err := b.DecodeMessage(msg)
+		m.Type = &Value_DateValue{msg}
+		return true, err
+	case 8: // type.day_of_week_value
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Type = &Value_DayOfWeekValue{dayofweek.DayOfWeek(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Value_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Value)
+	// type
+	switch x := m.Type.(type) {
+	case *Value_IntegerValue:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.IntegerValue))
+	case *Value_FloatValue:
+		n += 1 // tag and wire
+		n += 8
+	case *Value_StringValue:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.StringValue)))
+		n += len(x.StringValue)
+	case *Value_BooleanValue:
+		n += 1 // tag and wire
+		n += 1
+	case *Value_TimestampValue:
+		s := proto.Size(x.TimestampValue)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Value_TimeValue:
+		s := proto.Size(x.TimeValue)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Value_DateValue:
+		s := proto.Size(x.DateValue)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Value_DayOfWeekValue:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.DayOfWeekValue))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Message for infoType-dependent details parsed from quote.
+type QuoteInfo struct {
+	// Object representation of the quote.
+	//
+	// Types that are valid to be assigned to ParsedQuote:
+	//	*QuoteInfo_DateTime
+	ParsedQuote          isQuoteInfo_ParsedQuote `protobuf_oneof:"parsed_quote"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *QuoteInfo) Reset()         { *m = QuoteInfo{} }
+func (m *QuoteInfo) String() string { return proto.CompactTextString(m) }
+func (*QuoteInfo) ProtoMessage()    {}
+func (*QuoteInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{36}
+}
+func (m *QuoteInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QuoteInfo.Unmarshal(m, b)
+}
+func (m *QuoteInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QuoteInfo.Marshal(b, m, deterministic)
+}
+func (dst *QuoteInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuoteInfo.Merge(dst, src)
+}
+func (m *QuoteInfo) XXX_Size() int {
+	return xxx_messageInfo_QuoteInfo.Size(m)
+}
+func (m *QuoteInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_QuoteInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QuoteInfo proto.InternalMessageInfo
+
+type isQuoteInfo_ParsedQuote interface {
+	isQuoteInfo_ParsedQuote()
+}
+
+type QuoteInfo_DateTime struct {
+	DateTime *DateTime `protobuf:"bytes,2,opt,name=date_time,json=dateTime,proto3,oneof"`
+}
+
+func (*QuoteInfo_DateTime) isQuoteInfo_ParsedQuote() {}
+
+func (m *QuoteInfo) GetParsedQuote() isQuoteInfo_ParsedQuote {
+	if m != nil {
+		return m.ParsedQuote
+	}
+	return nil
+}
+
+func (m *QuoteInfo) GetDateTime() *DateTime {
+	if x, ok := m.GetParsedQuote().(*QuoteInfo_DateTime); ok {
+		return x.DateTime
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*QuoteInfo) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _QuoteInfo_OneofMarshaler, _QuoteInfo_OneofUnmarshaler, _QuoteInfo_OneofSizer, []interface{}{
+		(*QuoteInfo_DateTime)(nil),
+	}
+}
+
+func _QuoteInfo_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*QuoteInfo)
+	// parsed_quote
+	switch x := m.ParsedQuote.(type) {
+	case *QuoteInfo_DateTime:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.DateTime); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("QuoteInfo.ParsedQuote has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _QuoteInfo_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*QuoteInfo)
+	switch tag {
+	case 2: // parsed_quote.date_time
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(DateTime)
+		err := b.DecodeMessage(msg)
+		m.ParsedQuote = &QuoteInfo_DateTime{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _QuoteInfo_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*QuoteInfo)
+	// parsed_quote
+	switch x := m.ParsedQuote.(type) {
+	case *QuoteInfo_DateTime:
+		s := proto.Size(x.DateTime)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Message for a date time object.
+type DateTime struct {
+	// One or more of the following must be set. All fields are optional, but
+	// when set must be valid date or time values.
+	Date                 *date.Date           `protobuf:"bytes,1,opt,name=date,proto3" json:"date,omitempty"`
+	DayOfWeek            dayofweek.DayOfWeek  `protobuf:"varint,2,opt,name=day_of_week,json=dayOfWeek,proto3,enum=google.type.DayOfWeek" json:"day_of_week,omitempty"`
+	Time                 *timeofday.TimeOfDay `protobuf:"bytes,3,opt,name=time,proto3" json:"time,omitempty"`
+	TimeZone             *DateTime_TimeZone   `protobuf:"bytes,4,opt,name=time_zone,json=timeZone,proto3" json:"time_zone,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *DateTime) Reset()         { *m = DateTime{} }
+func (m *DateTime) String() string { return proto.CompactTextString(m) }
+func (*DateTime) ProtoMessage()    {}
+func (*DateTime) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{37}
+}
+func (m *DateTime) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DateTime.Unmarshal(m, b)
+}
+func (m *DateTime) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DateTime.Marshal(b, m, deterministic)
+}
+func (dst *DateTime) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateTime.Merge(dst, src)
+}
+func (m *DateTime) XXX_Size() int {
+	return xxx_messageInfo_DateTime.Size(m)
+}
+func (m *DateTime) XXX_DiscardUnknown() {
+	xxx_messageInfo_DateTime.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DateTime proto.InternalMessageInfo
+
+func (m *DateTime) GetDate() *date.Date {
+	if m != nil {
+		return m.Date
+	}
+	return nil
+}
+
+func (m *DateTime) GetDayOfWeek() dayofweek.DayOfWeek {
+	if m != nil {
+		return m.DayOfWeek
+	}
+	return dayofweek.DayOfWeek_DAY_OF_WEEK_UNSPECIFIED
+}
+
+func (m *DateTime) GetTime() *timeofday.TimeOfDay {
+	if m != nil {
+		return m.Time
+	}
+	return nil
+}
+
+func (m *DateTime) GetTimeZone() *DateTime_TimeZone {
+	if m != nil {
+		return m.TimeZone
+	}
+	return nil
+}
+
+type DateTime_TimeZone struct {
+	// Set only if the offset can be determined. Positive for time ahead of UTC.
+	// E.g. For "UTC-9", this value is -540.
+	OffsetMinutes        int32    `protobuf:"varint,1,opt,name=offset_minutes,json=offsetMinutes,proto3" json:"offset_minutes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DateTime_TimeZone) Reset()         { *m = DateTime_TimeZone{} }
+func (m *DateTime_TimeZone) String() string { return proto.CompactTextString(m) }
+func (*DateTime_TimeZone) ProtoMessage()    {}
+func (*DateTime_TimeZone) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{37, 0}
+}
+func (m *DateTime_TimeZone) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DateTime_TimeZone.Unmarshal(m, b)
+}
+func (m *DateTime_TimeZone) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DateTime_TimeZone.Marshal(b, m, deterministic)
+}
+func (dst *DateTime_TimeZone) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateTime_TimeZone.Merge(dst, src)
+}
+func (m *DateTime_TimeZone) XXX_Size() int {
+	return xxx_messageInfo_DateTime_TimeZone.Size(m)
+}
+func (m *DateTime_TimeZone) XXX_DiscardUnknown() {
+	xxx_messageInfo_DateTime_TimeZone.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DateTime_TimeZone proto.InternalMessageInfo
+
+func (m *DateTime_TimeZone) GetOffsetMinutes() int32 {
+	if m != nil {
+		return m.OffsetMinutes
+	}
+	return 0
+}
+
+// The configuration that controls how the data will change.
+type DeidentifyConfig struct {
+	// Types that are valid to be assigned to Transformation:
+	//	*DeidentifyConfig_InfoTypeTransformations
+	//	*DeidentifyConfig_RecordTransformations
+	Transformation       isDeidentifyConfig_Transformation `protobuf_oneof:"transformation"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
+}
+
+func (m *DeidentifyConfig) Reset()         { *m = DeidentifyConfig{} }
+func (m *DeidentifyConfig) String() string { return proto.CompactTextString(m) }
+func (*DeidentifyConfig) ProtoMessage()    {}
+func (*DeidentifyConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{38}
+}
+func (m *DeidentifyConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeidentifyConfig.Unmarshal(m, b)
+}
+func (m *DeidentifyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeidentifyConfig.Marshal(b, m, deterministic)
+}
+func (dst *DeidentifyConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeidentifyConfig.Merge(dst, src)
+}
+func (m *DeidentifyConfig) XXX_Size() int {
+	return xxx_messageInfo_DeidentifyConfig.Size(m)
+}
+func (m *DeidentifyConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeidentifyConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeidentifyConfig proto.InternalMessageInfo
+
+type isDeidentifyConfig_Transformation interface {
+	isDeidentifyConfig_Transformation()
+}
+
+type DeidentifyConfig_InfoTypeTransformations struct {
+	InfoTypeTransformations *InfoTypeTransformations `protobuf:"bytes,1,opt,name=info_type_transformations,json=infoTypeTransformations,proto3,oneof"`
+}
+
+type DeidentifyConfig_RecordTransformations struct {
+	RecordTransformations *RecordTransformations `protobuf:"bytes,2,opt,name=record_transformations,json=recordTransformations,proto3,oneof"`
+}
+
+func (*DeidentifyConfig_InfoTypeTransformations) isDeidentifyConfig_Transformation() {}
+
+func (*DeidentifyConfig_RecordTransformations) isDeidentifyConfig_Transformation() {}
+
+func (m *DeidentifyConfig) GetTransformation() isDeidentifyConfig_Transformation {
+	if m != nil {
+		return m.Transformation
+	}
+	return nil
+}
+
+func (m *DeidentifyConfig) GetInfoTypeTransformations() *InfoTypeTransformations {
+	if x, ok := m.GetTransformation().(*DeidentifyConfig_InfoTypeTransformations); ok {
+		return x.InfoTypeTransformations
+	}
+	return nil
+}
+
+func (m *DeidentifyConfig) GetRecordTransformations() *RecordTransformations {
+	if x, ok := m.GetTransformation().(*DeidentifyConfig_RecordTransformations); ok {
+		return x.RecordTransformations
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*DeidentifyConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _DeidentifyConfig_OneofMarshaler, _DeidentifyConfig_OneofUnmarshaler, _DeidentifyConfig_OneofSizer, []interface{}{
+		(*DeidentifyConfig_InfoTypeTransformations)(nil),
+		(*DeidentifyConfig_RecordTransformations)(nil),
+	}
+}
+
+func _DeidentifyConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*DeidentifyConfig)
+	// transformation
+	switch x := m.Transformation.(type) {
+	case *DeidentifyConfig_InfoTypeTransformations:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InfoTypeTransformations); err != nil {
+			return err
+		}
+	case *DeidentifyConfig_RecordTransformations:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.RecordTransformations); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("DeidentifyConfig.Transformation has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _DeidentifyConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*DeidentifyConfig)
+	switch tag {
+	case 1: // transformation.info_type_transformations
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InfoTypeTransformations)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &DeidentifyConfig_InfoTypeTransformations{msg}
+		return true, err
+	case 2: // transformation.record_transformations
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(RecordTransformations)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &DeidentifyConfig_RecordTransformations{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _DeidentifyConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*DeidentifyConfig)
+	// transformation
+	switch x := m.Transformation.(type) {
+	case *DeidentifyConfig_InfoTypeTransformations:
+		s := proto.Size(x.InfoTypeTransformations)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *DeidentifyConfig_RecordTransformations:
+		s := proto.Size(x.RecordTransformations)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// A rule for transforming a value.
+type PrimitiveTransformation struct {
+	// Types that are valid to be assigned to Transformation:
+	//	*PrimitiveTransformation_ReplaceConfig
+	//	*PrimitiveTransformation_RedactConfig
+	//	*PrimitiveTransformation_CharacterMaskConfig
+	//	*PrimitiveTransformation_CryptoReplaceFfxFpeConfig
+	//	*PrimitiveTransformation_FixedSizeBucketingConfig
+	//	*PrimitiveTransformation_BucketingConfig
+	//	*PrimitiveTransformation_ReplaceWithInfoTypeConfig
+	//	*PrimitiveTransformation_TimePartConfig
+	//	*PrimitiveTransformation_CryptoHashConfig
+	//	*PrimitiveTransformation_DateShiftConfig
+	Transformation       isPrimitiveTransformation_Transformation `protobuf_oneof:"transformation"`
+	XXX_NoUnkeyedLiteral struct{}                                 `json:"-"`
+	XXX_unrecognized     []byte                                   `json:"-"`
+	XXX_sizecache        int32                                    `json:"-"`
+}
+
+func (m *PrimitiveTransformation) Reset()         { *m = PrimitiveTransformation{} }
+func (m *PrimitiveTransformation) String() string { return proto.CompactTextString(m) }
+func (*PrimitiveTransformation) ProtoMessage()    {}
+func (*PrimitiveTransformation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{39}
+}
+func (m *PrimitiveTransformation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PrimitiveTransformation.Unmarshal(m, b)
+}
+func (m *PrimitiveTransformation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PrimitiveTransformation.Marshal(b, m, deterministic)
+}
+func (dst *PrimitiveTransformation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PrimitiveTransformation.Merge(dst, src)
+}
+func (m *PrimitiveTransformation) XXX_Size() int {
+	return xxx_messageInfo_PrimitiveTransformation.Size(m)
+}
+func (m *PrimitiveTransformation) XXX_DiscardUnknown() {
+	xxx_messageInfo_PrimitiveTransformation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PrimitiveTransformation proto.InternalMessageInfo
+
+type isPrimitiveTransformation_Transformation interface {
+	isPrimitiveTransformation_Transformation()
+}
+
+type PrimitiveTransformation_ReplaceConfig struct {
+	ReplaceConfig *ReplaceValueConfig `protobuf:"bytes,1,opt,name=replace_config,json=replaceConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_RedactConfig struct {
+	RedactConfig *RedactConfig `protobuf:"bytes,2,opt,name=redact_config,json=redactConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_CharacterMaskConfig struct {
+	CharacterMaskConfig *CharacterMaskConfig `protobuf:"bytes,3,opt,name=character_mask_config,json=characterMaskConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_CryptoReplaceFfxFpeConfig struct {
+	CryptoReplaceFfxFpeConfig *CryptoReplaceFfxFpeConfig `protobuf:"bytes,4,opt,name=crypto_replace_ffx_fpe_config,json=cryptoReplaceFfxFpeConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_FixedSizeBucketingConfig struct {
+	FixedSizeBucketingConfig *FixedSizeBucketingConfig `protobuf:"bytes,5,opt,name=fixed_size_bucketing_config,json=fixedSizeBucketingConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_BucketingConfig struct {
+	BucketingConfig *BucketingConfig `protobuf:"bytes,6,opt,name=bucketing_config,json=bucketingConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_ReplaceWithInfoTypeConfig struct {
+	ReplaceWithInfoTypeConfig *ReplaceWithInfoTypeConfig `protobuf:"bytes,7,opt,name=replace_with_info_type_config,json=replaceWithInfoTypeConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_TimePartConfig struct {
+	TimePartConfig *TimePartConfig `protobuf:"bytes,8,opt,name=time_part_config,json=timePartConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_CryptoHashConfig struct {
+	CryptoHashConfig *CryptoHashConfig `protobuf:"bytes,9,opt,name=crypto_hash_config,json=cryptoHashConfig,proto3,oneof"`
+}
+
+type PrimitiveTransformation_DateShiftConfig struct {
+	DateShiftConfig *DateShiftConfig `protobuf:"bytes,11,opt,name=date_shift_config,json=dateShiftConfig,proto3,oneof"`
+}
+
+func (*PrimitiveTransformation_ReplaceConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_RedactConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_CharacterMaskConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_CryptoReplaceFfxFpeConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_FixedSizeBucketingConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_BucketingConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_ReplaceWithInfoTypeConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_TimePartConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_CryptoHashConfig) isPrimitiveTransformation_Transformation() {}
+
+func (*PrimitiveTransformation_DateShiftConfig) isPrimitiveTransformation_Transformation() {}
+
+func (m *PrimitiveTransformation) GetTransformation() isPrimitiveTransformation_Transformation {
+	if m != nil {
+		return m.Transformation
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetReplaceConfig() *ReplaceValueConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_ReplaceConfig); ok {
+		return x.ReplaceConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetRedactConfig() *RedactConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_RedactConfig); ok {
+		return x.RedactConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetCharacterMaskConfig() *CharacterMaskConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CharacterMaskConfig); ok {
+		return x.CharacterMaskConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetCryptoReplaceFfxFpeConfig() *CryptoReplaceFfxFpeConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CryptoReplaceFfxFpeConfig); ok {
+		return x.CryptoReplaceFfxFpeConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetFixedSizeBucketingConfig() *FixedSizeBucketingConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_FixedSizeBucketingConfig); ok {
+		return x.FixedSizeBucketingConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetBucketingConfig() *BucketingConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_BucketingConfig); ok {
+		return x.BucketingConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetReplaceWithInfoTypeConfig() *ReplaceWithInfoTypeConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_ReplaceWithInfoTypeConfig); ok {
+		return x.ReplaceWithInfoTypeConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetTimePartConfig() *TimePartConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_TimePartConfig); ok {
+		return x.TimePartConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetCryptoHashConfig() *CryptoHashConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CryptoHashConfig); ok {
+		return x.CryptoHashConfig
+	}
+	return nil
+}
+
+func (m *PrimitiveTransformation) GetDateShiftConfig() *DateShiftConfig {
+	if x, ok := m.GetTransformation().(*PrimitiveTransformation_DateShiftConfig); ok {
+		return x.DateShiftConfig
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*PrimitiveTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _PrimitiveTransformation_OneofMarshaler, _PrimitiveTransformation_OneofUnmarshaler, _PrimitiveTransformation_OneofSizer, []interface{}{
+		(*PrimitiveTransformation_ReplaceConfig)(nil),
+		(*PrimitiveTransformation_RedactConfig)(nil),
+		(*PrimitiveTransformation_CharacterMaskConfig)(nil),
+		(*PrimitiveTransformation_CryptoReplaceFfxFpeConfig)(nil),
+		(*PrimitiveTransformation_FixedSizeBucketingConfig)(nil),
+		(*PrimitiveTransformation_BucketingConfig)(nil),
+		(*PrimitiveTransformation_ReplaceWithInfoTypeConfig)(nil),
+		(*PrimitiveTransformation_TimePartConfig)(nil),
+		(*PrimitiveTransformation_CryptoHashConfig)(nil),
+		(*PrimitiveTransformation_DateShiftConfig)(nil),
+	}
+}
+
+func _PrimitiveTransformation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*PrimitiveTransformation)
+	// transformation
+	switch x := m.Transformation.(type) {
+	case *PrimitiveTransformation_ReplaceConfig:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ReplaceConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_RedactConfig:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.RedactConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_CharacterMaskConfig:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CharacterMaskConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_CryptoReplaceFfxFpeConfig:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CryptoReplaceFfxFpeConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_FixedSizeBucketingConfig:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.FixedSizeBucketingConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_BucketingConfig:
+		b.EncodeVarint(6<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.BucketingConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_ReplaceWithInfoTypeConfig:
+		b.EncodeVarint(7<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ReplaceWithInfoTypeConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_TimePartConfig:
+		b.EncodeVarint(8<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TimePartConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_CryptoHashConfig:
+		b.EncodeVarint(9<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CryptoHashConfig); err != nil {
+			return err
+		}
+	case *PrimitiveTransformation_DateShiftConfig:
+		b.EncodeVarint(11<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.DateShiftConfig); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("PrimitiveTransformation.Transformation has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _PrimitiveTransformation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*PrimitiveTransformation)
+	switch tag {
+	case 1: // transformation.replace_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ReplaceValueConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_ReplaceConfig{msg}
+		return true, err
+	case 2: // transformation.redact_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(RedactConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_RedactConfig{msg}
+		return true, err
+	case 3: // transformation.character_mask_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CharacterMaskConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_CharacterMaskConfig{msg}
+		return true, err
+	case 4: // transformation.crypto_replace_ffx_fpe_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CryptoReplaceFfxFpeConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_CryptoReplaceFfxFpeConfig{msg}
+		return true, err
+	case 5: // transformation.fixed_size_bucketing_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(FixedSizeBucketingConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_FixedSizeBucketingConfig{msg}
+		return true, err
+	case 6: // transformation.bucketing_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(BucketingConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_BucketingConfig{msg}
+		return true, err
+	case 7: // transformation.replace_with_info_type_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ReplaceWithInfoTypeConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_ReplaceWithInfoTypeConfig{msg}
+		return true, err
+	case 8: // transformation.time_part_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TimePartConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_TimePartConfig{msg}
+		return true, err
+	case 9: // transformation.crypto_hash_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CryptoHashConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_CryptoHashConfig{msg}
+		return true, err
+	case 11: // transformation.date_shift_config
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(DateShiftConfig)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &PrimitiveTransformation_DateShiftConfig{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _PrimitiveTransformation_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*PrimitiveTransformation)
+	// transformation
+	switch x := m.Transformation.(type) {
+	case *PrimitiveTransformation_ReplaceConfig:
+		s := proto.Size(x.ReplaceConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_RedactConfig:
+		s := proto.Size(x.RedactConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_CharacterMaskConfig:
+		s := proto.Size(x.CharacterMaskConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_CryptoReplaceFfxFpeConfig:
+		s := proto.Size(x.CryptoReplaceFfxFpeConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_FixedSizeBucketingConfig:
+		s := proto.Size(x.FixedSizeBucketingConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_BucketingConfig:
+		s := proto.Size(x.BucketingConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_ReplaceWithInfoTypeConfig:
+		s := proto.Size(x.ReplaceWithInfoTypeConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_TimePartConfig:
+		s := proto.Size(x.TimePartConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_CryptoHashConfig:
+		s := proto.Size(x.CryptoHashConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *PrimitiveTransformation_DateShiftConfig:
+		s := proto.Size(x.DateShiftConfig)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// For use with `Date`, `Timestamp`, and `TimeOfDay`, extract or preserve a
+// portion of the value.
+type TimePartConfig struct {
+	PartToExtract        TimePartConfig_TimePart `protobuf:"varint,1,opt,name=part_to_extract,json=partToExtract,proto3,enum=google.privacy.dlp.v2.TimePartConfig_TimePart" json:"part_to_extract,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *TimePartConfig) Reset()         { *m = TimePartConfig{} }
+func (m *TimePartConfig) String() string { return proto.CompactTextString(m) }
+func (*TimePartConfig) ProtoMessage()    {}
+func (*TimePartConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{40}
+}
+func (m *TimePartConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimePartConfig.Unmarshal(m, b)
+}
+func (m *TimePartConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimePartConfig.Marshal(b, m, deterministic)
+}
+func (dst *TimePartConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimePartConfig.Merge(dst, src)
+}
+func (m *TimePartConfig) XXX_Size() int {
+	return xxx_messageInfo_TimePartConfig.Size(m)
+}
+func (m *TimePartConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimePartConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TimePartConfig proto.InternalMessageInfo
+
+func (m *TimePartConfig) GetPartToExtract() TimePartConfig_TimePart {
+	if m != nil {
+		return m.PartToExtract
+	}
+	return TimePartConfig_TIME_PART_UNSPECIFIED
+}
+
+// Pseudonymization method that generates surrogates via cryptographic hashing.
+// Uses SHA-256.
+// The key size must be either 32 or 64 bytes.
+// Outputs a 32 byte digest as an uppercase hex string
+// (for example, 41D1567F7F99F1DC2A5FAB886DEE5BEE).
+// Currently, only string and integer values can be hashed.
+type CryptoHashConfig struct {
+	// The key used by the hash function.
+	CryptoKey            *CryptoKey `protobuf:"bytes,1,opt,name=crypto_key,json=cryptoKey,proto3" json:"crypto_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *CryptoHashConfig) Reset()         { *m = CryptoHashConfig{} }
+func (m *CryptoHashConfig) String() string { return proto.CompactTextString(m) }
+func (*CryptoHashConfig) ProtoMessage()    {}
+func (*CryptoHashConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{41}
+}
+func (m *CryptoHashConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CryptoHashConfig.Unmarshal(m, b)
+}
+func (m *CryptoHashConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CryptoHashConfig.Marshal(b, m, deterministic)
+}
+func (dst *CryptoHashConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoHashConfig.Merge(dst, src)
+}
+func (m *CryptoHashConfig) XXX_Size() int {
+	return xxx_messageInfo_CryptoHashConfig.Size(m)
+}
+func (m *CryptoHashConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_CryptoHashConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CryptoHashConfig proto.InternalMessageInfo
+
+func (m *CryptoHashConfig) GetCryptoKey() *CryptoKey {
+	if m != nil {
+		return m.CryptoKey
+	}
+	return nil
+}
+
+// Replace each input value with a given `Value`.
+type ReplaceValueConfig struct {
+	// Value to replace it with.
+	NewValue             *Value   `protobuf:"bytes,1,opt,name=new_value,json=newValue,proto3" json:"new_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReplaceValueConfig) Reset()         { *m = ReplaceValueConfig{} }
+func (m *ReplaceValueConfig) String() string { return proto.CompactTextString(m) }
+func (*ReplaceValueConfig) ProtoMessage()    {}
+func (*ReplaceValueConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{42}
+}
+func (m *ReplaceValueConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReplaceValueConfig.Unmarshal(m, b)
+}
+func (m *ReplaceValueConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReplaceValueConfig.Marshal(b, m, deterministic)
+}
+func (dst *ReplaceValueConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplaceValueConfig.Merge(dst, src)
+}
+func (m *ReplaceValueConfig) XXX_Size() int {
+	return xxx_messageInfo_ReplaceValueConfig.Size(m)
+}
+func (m *ReplaceValueConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReplaceValueConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReplaceValueConfig proto.InternalMessageInfo
+
+func (m *ReplaceValueConfig) GetNewValue() *Value {
+	if m != nil {
+		return m.NewValue
+	}
+	return nil
+}
+
+// Replace each matching finding with the name of the info_type.
+type ReplaceWithInfoTypeConfig struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReplaceWithInfoTypeConfig) Reset()         { *m = ReplaceWithInfoTypeConfig{} }
+func (m *ReplaceWithInfoTypeConfig) String() string { return proto.CompactTextString(m) }
+func (*ReplaceWithInfoTypeConfig) ProtoMessage()    {}
+func (*ReplaceWithInfoTypeConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{43}
+}
+func (m *ReplaceWithInfoTypeConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReplaceWithInfoTypeConfig.Unmarshal(m, b)
+}
+func (m *ReplaceWithInfoTypeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReplaceWithInfoTypeConfig.Marshal(b, m, deterministic)
+}
+func (dst *ReplaceWithInfoTypeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplaceWithInfoTypeConfig.Merge(dst, src)
+}
+func (m *ReplaceWithInfoTypeConfig) XXX_Size() int {
+	return xxx_messageInfo_ReplaceWithInfoTypeConfig.Size(m)
+}
+func (m *ReplaceWithInfoTypeConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReplaceWithInfoTypeConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReplaceWithInfoTypeConfig proto.InternalMessageInfo
+
+// Redact a given value. For example, if used with an `InfoTypeTransformation`
+// transforming PHONE_NUMBER, and input 'My phone number is 206-555-0123', the
+// output would be 'My phone number is '.
+type RedactConfig struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RedactConfig) Reset()         { *m = RedactConfig{} }
+func (m *RedactConfig) String() string { return proto.CompactTextString(m) }
+func (*RedactConfig) ProtoMessage()    {}
+func (*RedactConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{44}
+}
+func (m *RedactConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RedactConfig.Unmarshal(m, b)
+}
+func (m *RedactConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RedactConfig.Marshal(b, m, deterministic)
+}
+func (dst *RedactConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RedactConfig.Merge(dst, src)
+}
+func (m *RedactConfig) XXX_Size() int {
+	return xxx_messageInfo_RedactConfig.Size(m)
+}
+func (m *RedactConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_RedactConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RedactConfig proto.InternalMessageInfo
+
+// Characters to skip when doing deidentification of a value. These will be left
+// alone and skipped.
+type CharsToIgnore struct {
+	// Types that are valid to be assigned to Characters:
+	//	*CharsToIgnore_CharactersToSkip
+	//	*CharsToIgnore_CommonCharactersToIgnore
+	Characters           isCharsToIgnore_Characters `protobuf_oneof:"characters"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *CharsToIgnore) Reset()         { *m = CharsToIgnore{} }
+func (m *CharsToIgnore) String() string { return proto.CompactTextString(m) }
+func (*CharsToIgnore) ProtoMessage()    {}
+func (*CharsToIgnore) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{45}
+}
+func (m *CharsToIgnore) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CharsToIgnore.Unmarshal(m, b)
+}
+func (m *CharsToIgnore) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CharsToIgnore.Marshal(b, m, deterministic)
+}
+func (dst *CharsToIgnore) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CharsToIgnore.Merge(dst, src)
+}
+func (m *CharsToIgnore) XXX_Size() int {
+	return xxx_messageInfo_CharsToIgnore.Size(m)
+}
+func (m *CharsToIgnore) XXX_DiscardUnknown() {
+	xxx_messageInfo_CharsToIgnore.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CharsToIgnore proto.InternalMessageInfo
+
+type isCharsToIgnore_Characters interface {
+	isCharsToIgnore_Characters()
+}
+
+type CharsToIgnore_CharactersToSkip struct {
+	CharactersToSkip string `protobuf:"bytes,1,opt,name=characters_to_skip,json=charactersToSkip,proto3,oneof"`
+}
+
+type CharsToIgnore_CommonCharactersToIgnore struct {
+	CommonCharactersToIgnore CharsToIgnore_CommonCharsToIgnore `protobuf:"varint,2,opt,name=common_characters_to_ignore,json=commonCharactersToIgnore,proto3,enum=google.privacy.dlp.v2.CharsToIgnore_CommonCharsToIgnore,oneof"`
+}
+
+func (*CharsToIgnore_CharactersToSkip) isCharsToIgnore_Characters() {}
+
+func (*CharsToIgnore_CommonCharactersToIgnore) isCharsToIgnore_Characters() {}
+
+func (m *CharsToIgnore) GetCharacters() isCharsToIgnore_Characters {
+	if m != nil {
+		return m.Characters
+	}
+	return nil
+}
+
+func (m *CharsToIgnore) GetCharactersToSkip() string {
+	if x, ok := m.GetCharacters().(*CharsToIgnore_CharactersToSkip); ok {
+		return x.CharactersToSkip
+	}
+	return ""
+}
+
+func (m *CharsToIgnore) GetCommonCharactersToIgnore() CharsToIgnore_CommonCharsToIgnore {
+	if x, ok := m.GetCharacters().(*CharsToIgnore_CommonCharactersToIgnore); ok {
+		return x.CommonCharactersToIgnore
+	}
+	return CharsToIgnore_COMMON_CHARS_TO_IGNORE_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CharsToIgnore) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CharsToIgnore_OneofMarshaler, _CharsToIgnore_OneofUnmarshaler, _CharsToIgnore_OneofSizer, []interface{}{
+		(*CharsToIgnore_CharactersToSkip)(nil),
+		(*CharsToIgnore_CommonCharactersToIgnore)(nil),
+	}
+}
+
+func _CharsToIgnore_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CharsToIgnore)
+	// characters
+	switch x := m.Characters.(type) {
+	case *CharsToIgnore_CharactersToSkip:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.CharactersToSkip)
+	case *CharsToIgnore_CommonCharactersToIgnore:
+		b.EncodeVarint(2<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.CommonCharactersToIgnore))
+	case nil:
+	default:
+		return fmt.Errorf("CharsToIgnore.Characters has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CharsToIgnore_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CharsToIgnore)
+	switch tag {
+	case 1: // characters.characters_to_skip
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Characters = &CharsToIgnore_CharactersToSkip{x}
+		return true, err
+	case 2: // characters.common_characters_to_ignore
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Characters = &CharsToIgnore_CommonCharactersToIgnore{CharsToIgnore_CommonCharsToIgnore(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CharsToIgnore_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CharsToIgnore)
+	// characters
+	switch x := m.Characters.(type) {
+	case *CharsToIgnore_CharactersToSkip:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.CharactersToSkip)))
+		n += len(x.CharactersToSkip)
+	case *CharsToIgnore_CommonCharactersToIgnore:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.CommonCharactersToIgnore))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Partially mask a string by replacing a given number of characters with a
+// fixed character. Masking can start from the beginning or end of the string.
+// This can be used on data of any type (numbers, longs, and so on) and when
+// de-identifying structured data we'll attempt to preserve the original data's
+// type. (This allows you to take a long like 123 and modify it to a string like
+// **3.
+type CharacterMaskConfig struct {
+	// Character to mask the sensitive values&mdash;for example, "*" for an
+	// alphabetic string such as name, or "0" for a numeric string such as ZIP
+	// code or credit card number. String must have length 1. If not supplied, we
+	// will default to "*" for strings, 0 for digits.
+	MaskingCharacter string `protobuf:"bytes,1,opt,name=masking_character,json=maskingCharacter,proto3" json:"masking_character,omitempty"`
+	// Number of characters to mask. If not set, all matching chars will be
+	// masked. Skipped characters do not count towards this tally.
+	NumberToMask int32 `protobuf:"varint,2,opt,name=number_to_mask,json=numberToMask,proto3" json:"number_to_mask,omitempty"`
+	// Mask characters in reverse order. For example, if `masking_character` is
+	// '0', number_to_mask is 14, and `reverse_order` is false, then
+	// 1234-5678-9012-3456 -> 00000000000000-3456
+	// If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
+	// is true, then 12345 -> 12***
+	ReverseOrder bool `protobuf:"varint,3,opt,name=reverse_order,json=reverseOrder,proto3" json:"reverse_order,omitempty"`
+	// When masking a string, items in this list will be skipped when replacing.
+	// For example, if your string is 555-555-5555 and you ask us to skip `-` and
+	// mask 5 chars with * we would produce ***-*55-5555.
+	CharactersToIgnore   []*CharsToIgnore `protobuf:"bytes,4,rep,name=characters_to_ignore,json=charactersToIgnore,proto3" json:"characters_to_ignore,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *CharacterMaskConfig) Reset()         { *m = CharacterMaskConfig{} }
+func (m *CharacterMaskConfig) String() string { return proto.CompactTextString(m) }
+func (*CharacterMaskConfig) ProtoMessage()    {}
+func (*CharacterMaskConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{46}
+}
+func (m *CharacterMaskConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CharacterMaskConfig.Unmarshal(m, b)
+}
+func (m *CharacterMaskConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CharacterMaskConfig.Marshal(b, m, deterministic)
+}
+func (dst *CharacterMaskConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CharacterMaskConfig.Merge(dst, src)
+}
+func (m *CharacterMaskConfig) XXX_Size() int {
+	return xxx_messageInfo_CharacterMaskConfig.Size(m)
+}
+func (m *CharacterMaskConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_CharacterMaskConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CharacterMaskConfig proto.InternalMessageInfo
+
+func (m *CharacterMaskConfig) GetMaskingCharacter() string {
+	if m != nil {
+		return m.MaskingCharacter
+	}
+	return ""
+}
+
+func (m *CharacterMaskConfig) GetNumberToMask() int32 {
+	if m != nil {
+		return m.NumberToMask
+	}
+	return 0
+}
+
+func (m *CharacterMaskConfig) GetReverseOrder() bool {
+	if m != nil {
+		return m.ReverseOrder
+	}
+	return false
+}
+
+func (m *CharacterMaskConfig) GetCharactersToIgnore() []*CharsToIgnore {
+	if m != nil {
+		return m.CharactersToIgnore
+	}
+	return nil
+}
+
+// Buckets values based on fixed size ranges. The
+// Bucketing transformation can provide all of this functionality,
+// but requires more configuration. This message is provided as a convenience to
+// the user for simple bucketing strategies.
+//
+// The transformed value will be a hyphenated string of
+// <lower_bound>-<upper_bound>, i.e if lower_bound = 10 and upper_bound = 20
+// all values that are within this bucket will be replaced with "10-20".
+//
+// This can be used on data of type: double, long.
+//
+// If the bound Value type differs from the type of data
+// being transformed, we will first attempt converting the type of the data to
+// be transformed to match the type of the bound before comparing.
+//
+// See https://cloud.google.com/dlp/docs/concepts-bucketing to learn more.
+type FixedSizeBucketingConfig struct {
+	// Lower bound value of buckets. All values less than `lower_bound` are
+	// grouped together into a single bucket; for example if `lower_bound` = 10,
+	// then all values less than 10 are replaced with the value “-10”. [Required].
+	LowerBound *Value `protobuf:"bytes,1,opt,name=lower_bound,json=lowerBound,proto3" json:"lower_bound,omitempty"`
+	// Upper bound value of buckets. All values greater than upper_bound are
+	// grouped together into a single bucket; for example if `upper_bound` = 89,
+	// then all values greater than 89 are replaced with the value “89+”.
+	// [Required].
+	UpperBound *Value `protobuf:"bytes,2,opt,name=upper_bound,json=upperBound,proto3" json:"upper_bound,omitempty"`
+	// Size of each bucket (except for minimum and maximum buckets). So if
+	// `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
+	// following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
+	// 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
+	BucketSize           float64  `protobuf:"fixed64,3,opt,name=bucket_size,json=bucketSize,proto3" json:"bucket_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FixedSizeBucketingConfig) Reset()         { *m = FixedSizeBucketingConfig{} }
+func (m *FixedSizeBucketingConfig) String() string { return proto.CompactTextString(m) }
+func (*FixedSizeBucketingConfig) ProtoMessage()    {}
+func (*FixedSizeBucketingConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{47}
+}
+func (m *FixedSizeBucketingConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FixedSizeBucketingConfig.Unmarshal(m, b)
+}
+func (m *FixedSizeBucketingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FixedSizeBucketingConfig.Marshal(b, m, deterministic)
+}
+func (dst *FixedSizeBucketingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FixedSizeBucketingConfig.Merge(dst, src)
+}
+func (m *FixedSizeBucketingConfig) XXX_Size() int {
+	return xxx_messageInfo_FixedSizeBucketingConfig.Size(m)
+}
+func (m *FixedSizeBucketingConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_FixedSizeBucketingConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FixedSizeBucketingConfig proto.InternalMessageInfo
+
+func (m *FixedSizeBucketingConfig) GetLowerBound() *Value {
+	if m != nil {
+		return m.LowerBound
+	}
+	return nil
+}
+
+func (m *FixedSizeBucketingConfig) GetUpperBound() *Value {
+	if m != nil {
+		return m.UpperBound
+	}
+	return nil
+}
+
+func (m *FixedSizeBucketingConfig) GetBucketSize() float64 {
+	if m != nil {
+		return m.BucketSize
+	}
+	return 0
+}
+
+// Generalization function that buckets values based on ranges. The ranges and
+// replacement values are dynamically provided by the user for custom behavior,
+// such as 1-30 -> LOW 31-65 -> MEDIUM 66-100 -> HIGH
+// This can be used on
+// data of type: number, long, string, timestamp.
+// If the bound `Value` type differs from the type of data being transformed, we
+// will first attempt converting the type of the data to be transformed to match
+// the type of the bound before comparing.
+// See https://cloud.google.com/dlp/docs/concepts-bucketing to learn more.
+type BucketingConfig struct {
+	// Set of buckets. Ranges must be non-overlapping.
+	Buckets              []*BucketingConfig_Bucket `protobuf:"bytes,1,rep,name=buckets,proto3" json:"buckets,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
+}
+
+func (m *BucketingConfig) Reset()         { *m = BucketingConfig{} }
+func (m *BucketingConfig) String() string { return proto.CompactTextString(m) }
+func (*BucketingConfig) ProtoMessage()    {}
+func (*BucketingConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{48}
+}
+func (m *BucketingConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BucketingConfig.Unmarshal(m, b)
+}
+func (m *BucketingConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BucketingConfig.Marshal(b, m, deterministic)
+}
+func (dst *BucketingConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BucketingConfig.Merge(dst, src)
+}
+func (m *BucketingConfig) XXX_Size() int {
+	return xxx_messageInfo_BucketingConfig.Size(m)
+}
+func (m *BucketingConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_BucketingConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BucketingConfig proto.InternalMessageInfo
+
+func (m *BucketingConfig) GetBuckets() []*BucketingConfig_Bucket {
+	if m != nil {
+		return m.Buckets
+	}
+	return nil
+}
+
+// Bucket is represented as a range, along with replacement values.
+type BucketingConfig_Bucket struct {
+	// Lower bound of the range, inclusive. Type should be the same as max if
+	// used.
+	Min *Value `protobuf:"bytes,1,opt,name=min,proto3" json:"min,omitempty"`
+	// Upper bound of the range, exclusive; type must match min.
+	Max *Value `protobuf:"bytes,2,opt,name=max,proto3" json:"max,omitempty"`
+	// Replacement value for this bucket. If not provided
+	// the default behavior will be to hyphenate the min-max range.
+	ReplacementValue     *Value   `protobuf:"bytes,3,opt,name=replacement_value,json=replacementValue,proto3" json:"replacement_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BucketingConfig_Bucket) Reset()         { *m = BucketingConfig_Bucket{} }
+func (m *BucketingConfig_Bucket) String() string { return proto.CompactTextString(m) }
+func (*BucketingConfig_Bucket) ProtoMessage()    {}
+func (*BucketingConfig_Bucket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{48, 0}
+}
+func (m *BucketingConfig_Bucket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BucketingConfig_Bucket.Unmarshal(m, b)
+}
+func (m *BucketingConfig_Bucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BucketingConfig_Bucket.Marshal(b, m, deterministic)
+}
+func (dst *BucketingConfig_Bucket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BucketingConfig_Bucket.Merge(dst, src)
+}
+func (m *BucketingConfig_Bucket) XXX_Size() int {
+	return xxx_messageInfo_BucketingConfig_Bucket.Size(m)
+}
+func (m *BucketingConfig_Bucket) XXX_DiscardUnknown() {
+	xxx_messageInfo_BucketingConfig_Bucket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BucketingConfig_Bucket proto.InternalMessageInfo
+
+func (m *BucketingConfig_Bucket) GetMin() *Value {
+	if m != nil {
+		return m.Min
+	}
+	return nil
+}
+
+func (m *BucketingConfig_Bucket) GetMax() *Value {
+	if m != nil {
+		return m.Max
+	}
+	return nil
+}
+
+func (m *BucketingConfig_Bucket) GetReplacementValue() *Value {
+	if m != nil {
+		return m.ReplacementValue
+	}
+	return nil
+}
+
+// Replaces an identifier with a surrogate using FPE with the FFX
+// mode of operation; however when used in the `ReidentifyContent` API method,
+// it serves the opposite function by reversing the surrogate back into
+// the original identifier.
+// The identifier must be encoded as ASCII.
+// For a given crypto key and context, the same identifier will be
+// replaced with the same surrogate.
+// Identifiers must be at least two characters long.
+// In the case that the identifier is the empty string, it will be skipped.
+// See https://cloud.google.com/dlp/docs/pseudonymization to learn more.
+type CryptoReplaceFfxFpeConfig struct {
+	// The key used by the encryption algorithm. [required]
+	CryptoKey *CryptoKey `protobuf:"bytes,1,opt,name=crypto_key,json=cryptoKey,proto3" json:"crypto_key,omitempty"`
+	// The 'tweak', a context may be used for higher security since the same
+	// identifier in two different contexts won't be given the same surrogate. If
+	// the context is not set, a default tweak will be used.
+	//
+	// If the context is set but:
+	//
+	// 1. there is no record present when transforming a given value or
+	// 1. the field is not present when transforming a given value,
+	//
+	// a default tweak will be used.
+	//
+	// Note that case (1) is expected when an `InfoTypeTransformation` is
+	// applied to both structured and non-structured `ContentItem`s.
+	// Currently, the referenced field may be of value type integer or string.
+	//
+	// The tweak is constructed as a sequence of bytes in big endian byte order
+	// such that:
+	//
+	// - a 64 bit integer is encoded followed by a single byte of value 1
+	// - a string is encoded in UTF-8 format followed by a single byte of value 2
+	Context *FieldId `protobuf:"bytes,2,opt,name=context,proto3" json:"context,omitempty"`
+	// Types that are valid to be assigned to Alphabet:
+	//	*CryptoReplaceFfxFpeConfig_CommonAlphabet
+	//	*CryptoReplaceFfxFpeConfig_CustomAlphabet
+	//	*CryptoReplaceFfxFpeConfig_Radix
+	Alphabet isCryptoReplaceFfxFpeConfig_Alphabet `protobuf_oneof:"alphabet"`
+	// The custom infoType to annotate the surrogate with.
+	// This annotation will be applied to the surrogate by prefixing it with
+	// the name of the custom infoType followed by the number of
+	// characters comprising the surrogate. The following scheme defines the
+	// format: info_type_name(surrogate_character_count):surrogate
+	//
+	// For example, if the name of custom infoType is 'MY_TOKEN_INFO_TYPE' and
+	// the surrogate is 'abc', the full replacement value
+	// will be: 'MY_TOKEN_INFO_TYPE(3):abc'
+	//
+	// This annotation identifies the surrogate when inspecting content using the
+	// custom infoType
+	// [`SurrogateType`](/dlp/docs/reference/rest/v2/InspectConfig#surrogatetype).
+	// This facilitates reversal of the surrogate when it occurs in free text.
+	//
+	// In order for inspection to work properly, the name of this infoType must
+	// not occur naturally anywhere in your data; otherwise, inspection may
+	// find a surrogate that does not correspond to an actual identifier.
+	// Therefore, choose your custom infoType name carefully after considering
+	// what your data looks like. One way to select a name that has a high chance
+	// of yielding reliable detection is to include one or more unicode characters
+	// that are highly improbable to exist in your data.
+	// For example, assuming your data is entered from a regular ASCII keyboard,
+	// the symbol with the hex code point 29DD might be used like so:
+	// ⧝MY_TOKEN_TYPE
+	SurrogateInfoType    *InfoType `protobuf:"bytes,8,opt,name=surrogate_info_type,json=surrogateInfoType,proto3" json:"surrogate_info_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CryptoReplaceFfxFpeConfig) Reset()         { *m = CryptoReplaceFfxFpeConfig{} }
+func (m *CryptoReplaceFfxFpeConfig) String() string { return proto.CompactTextString(m) }
+func (*CryptoReplaceFfxFpeConfig) ProtoMessage()    {}
+func (*CryptoReplaceFfxFpeConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{49}
+}
+func (m *CryptoReplaceFfxFpeConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CryptoReplaceFfxFpeConfig.Unmarshal(m, b)
+}
+func (m *CryptoReplaceFfxFpeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CryptoReplaceFfxFpeConfig.Marshal(b, m, deterministic)
+}
+func (dst *CryptoReplaceFfxFpeConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoReplaceFfxFpeConfig.Merge(dst, src)
+}
+func (m *CryptoReplaceFfxFpeConfig) XXX_Size() int {
+	return xxx_messageInfo_CryptoReplaceFfxFpeConfig.Size(m)
+}
+func (m *CryptoReplaceFfxFpeConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_CryptoReplaceFfxFpeConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CryptoReplaceFfxFpeConfig proto.InternalMessageInfo
+
+func (m *CryptoReplaceFfxFpeConfig) GetCryptoKey() *CryptoKey {
+	if m != nil {
+		return m.CryptoKey
+	}
+	return nil
+}
+
+func (m *CryptoReplaceFfxFpeConfig) GetContext() *FieldId {
+	if m != nil {
+		return m.Context
+	}
+	return nil
+}
+
+type isCryptoReplaceFfxFpeConfig_Alphabet interface {
+	isCryptoReplaceFfxFpeConfig_Alphabet()
+}
+
+type CryptoReplaceFfxFpeConfig_CommonAlphabet struct {
+	CommonAlphabet CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet `protobuf:"varint,4,opt,name=common_alphabet,json=commonAlphabet,proto3,enum=google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet,oneof"`
+}
+
+type CryptoReplaceFfxFpeConfig_CustomAlphabet struct {
+	CustomAlphabet string `protobuf:"bytes,5,opt,name=custom_alphabet,json=customAlphabet,proto3,oneof"`
+}
+
+type CryptoReplaceFfxFpeConfig_Radix struct {
+	Radix int32 `protobuf:"varint,6,opt,name=radix,proto3,oneof"`
+}
+
+func (*CryptoReplaceFfxFpeConfig_CommonAlphabet) isCryptoReplaceFfxFpeConfig_Alphabet() {}
+
+func (*CryptoReplaceFfxFpeConfig_CustomAlphabet) isCryptoReplaceFfxFpeConfig_Alphabet() {}
+
+func (*CryptoReplaceFfxFpeConfig_Radix) isCryptoReplaceFfxFpeConfig_Alphabet() {}
+
+func (m *CryptoReplaceFfxFpeConfig) GetAlphabet() isCryptoReplaceFfxFpeConfig_Alphabet {
+	if m != nil {
+		return m.Alphabet
+	}
+	return nil
+}
+
+func (m *CryptoReplaceFfxFpeConfig) GetCommonAlphabet() CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet {
+	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_CommonAlphabet); ok {
+		return x.CommonAlphabet
+	}
+	return CryptoReplaceFfxFpeConfig_FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED
+}
+
+func (m *CryptoReplaceFfxFpeConfig) GetCustomAlphabet() string {
+	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_CustomAlphabet); ok {
+		return x.CustomAlphabet
+	}
+	return ""
+}
+
+func (m *CryptoReplaceFfxFpeConfig) GetRadix() int32 {
+	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_Radix); ok {
+		return x.Radix
+	}
+	return 0
+}
+
+func (m *CryptoReplaceFfxFpeConfig) GetSurrogateInfoType() *InfoType {
+	if m != nil {
+		return m.SurrogateInfoType
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CryptoReplaceFfxFpeConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CryptoReplaceFfxFpeConfig_OneofMarshaler, _CryptoReplaceFfxFpeConfig_OneofUnmarshaler, _CryptoReplaceFfxFpeConfig_OneofSizer, []interface{}{
+		(*CryptoReplaceFfxFpeConfig_CommonAlphabet)(nil),
+		(*CryptoReplaceFfxFpeConfig_CustomAlphabet)(nil),
+		(*CryptoReplaceFfxFpeConfig_Radix)(nil),
+	}
+}
+
+func _CryptoReplaceFfxFpeConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CryptoReplaceFfxFpeConfig)
+	// alphabet
+	switch x := m.Alphabet.(type) {
+	case *CryptoReplaceFfxFpeConfig_CommonAlphabet:
+		b.EncodeVarint(4<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.CommonAlphabet))
+	case *CryptoReplaceFfxFpeConfig_CustomAlphabet:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.CustomAlphabet)
+	case *CryptoReplaceFfxFpeConfig_Radix:
+		b.EncodeVarint(6<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Radix))
+	case nil:
+	default:
+		return fmt.Errorf("CryptoReplaceFfxFpeConfig.Alphabet has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CryptoReplaceFfxFpeConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CryptoReplaceFfxFpeConfig)
+	switch tag {
+	case 4: // alphabet.common_alphabet
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Alphabet = &CryptoReplaceFfxFpeConfig_CommonAlphabet{CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet(x)}
+		return true, err
+	case 5: // alphabet.custom_alphabet
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Alphabet = &CryptoReplaceFfxFpeConfig_CustomAlphabet{x}
+		return true, err
+	case 6: // alphabet.radix
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Alphabet = &CryptoReplaceFfxFpeConfig_Radix{int32(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CryptoReplaceFfxFpeConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CryptoReplaceFfxFpeConfig)
+	// alphabet
+	switch x := m.Alphabet.(type) {
+	case *CryptoReplaceFfxFpeConfig_CommonAlphabet:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.CommonAlphabet))
+	case *CryptoReplaceFfxFpeConfig_CustomAlphabet:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.CustomAlphabet)))
+		n += len(x.CustomAlphabet)
+	case *CryptoReplaceFfxFpeConfig_Radix:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Radix))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// This is a data encryption key (DEK) (as opposed to
+// a key encryption key (KEK) stored by KMS).
+// When using KMS to wrap/unwrap DEKs, be sure to set an appropriate
+// IAM policy on the KMS CryptoKey (KEK) to ensure an attacker cannot
+// unwrap the data crypto key.
+type CryptoKey struct {
+	// Types that are valid to be assigned to Source:
+	//	*CryptoKey_Transient
+	//	*CryptoKey_Unwrapped
+	//	*CryptoKey_KmsWrapped
+	Source               isCryptoKey_Source `protobuf_oneof:"source"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *CryptoKey) Reset()         { *m = CryptoKey{} }
+func (m *CryptoKey) String() string { return proto.CompactTextString(m) }
+func (*CryptoKey) ProtoMessage()    {}
+func (*CryptoKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{50}
+}
+func (m *CryptoKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CryptoKey.Unmarshal(m, b)
+}
+func (m *CryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CryptoKey.Marshal(b, m, deterministic)
+}
+func (dst *CryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CryptoKey.Merge(dst, src)
+}
+func (m *CryptoKey) XXX_Size() int {
+	return xxx_messageInfo_CryptoKey.Size(m)
+}
+func (m *CryptoKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_CryptoKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CryptoKey proto.InternalMessageInfo
+
+type isCryptoKey_Source interface {
+	isCryptoKey_Source()
+}
+
+type CryptoKey_Transient struct {
+	Transient *TransientCryptoKey `protobuf:"bytes,1,opt,name=transient,proto3,oneof"`
+}
+
+type CryptoKey_Unwrapped struct {
+	Unwrapped *UnwrappedCryptoKey `protobuf:"bytes,2,opt,name=unwrapped,proto3,oneof"`
+}
+
+type CryptoKey_KmsWrapped struct {
+	KmsWrapped *KmsWrappedCryptoKey `protobuf:"bytes,3,opt,name=kms_wrapped,json=kmsWrapped,proto3,oneof"`
+}
+
+func (*CryptoKey_Transient) isCryptoKey_Source() {}
+
+func (*CryptoKey_Unwrapped) isCryptoKey_Source() {}
+
+func (*CryptoKey_KmsWrapped) isCryptoKey_Source() {}
+
+func (m *CryptoKey) GetSource() isCryptoKey_Source {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+func (m *CryptoKey) GetTransient() *TransientCryptoKey {
+	if x, ok := m.GetSource().(*CryptoKey_Transient); ok {
+		return x.Transient
+	}
+	return nil
+}
+
+func (m *CryptoKey) GetUnwrapped() *UnwrappedCryptoKey {
+	if x, ok := m.GetSource().(*CryptoKey_Unwrapped); ok {
+		return x.Unwrapped
+	}
+	return nil
+}
+
+func (m *CryptoKey) GetKmsWrapped() *KmsWrappedCryptoKey {
+	if x, ok := m.GetSource().(*CryptoKey_KmsWrapped); ok {
+		return x.KmsWrapped
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CryptoKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CryptoKey_OneofMarshaler, _CryptoKey_OneofUnmarshaler, _CryptoKey_OneofSizer, []interface{}{
+		(*CryptoKey_Transient)(nil),
+		(*CryptoKey_Unwrapped)(nil),
+		(*CryptoKey_KmsWrapped)(nil),
+	}
+}
+
+func _CryptoKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CryptoKey)
+	// source
+	switch x := m.Source.(type) {
+	case *CryptoKey_Transient:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Transient); err != nil {
+			return err
+		}
+	case *CryptoKey_Unwrapped:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Unwrapped); err != nil {
+			return err
+		}
+	case *CryptoKey_KmsWrapped:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.KmsWrapped); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("CryptoKey.Source has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CryptoKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CryptoKey)
+	switch tag {
+	case 1: // source.transient
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(TransientCryptoKey)
+		err := b.DecodeMessage(msg)
+		m.Source = &CryptoKey_Transient{msg}
+		return true, err
+	case 2: // source.unwrapped
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(UnwrappedCryptoKey)
+		err := b.DecodeMessage(msg)
+		m.Source = &CryptoKey_Unwrapped{msg}
+		return true, err
+	case 3: // source.kms_wrapped
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(KmsWrappedCryptoKey)
+		err := b.DecodeMessage(msg)
+		m.Source = &CryptoKey_KmsWrapped{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CryptoKey_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CryptoKey)
+	// source
+	switch x := m.Source.(type) {
+	case *CryptoKey_Transient:
+		s := proto.Size(x.Transient)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CryptoKey_Unwrapped:
+		s := proto.Size(x.Unwrapped)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CryptoKey_KmsWrapped:
+		s := proto.Size(x.KmsWrapped)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Use this to have a random data crypto key generated.
+// It will be discarded after the request finishes.
+type TransientCryptoKey struct {
+	// Name of the key. [required]
+	// This is an arbitrary string used to differentiate different keys.
+	// A unique key is generated per name: two separate `TransientCryptoKey`
+	// protos share the same generated key if their names are the same.
+	// When the data crypto key is generated, this name is not used in any way
+	// (repeating the api call will result in a different key being generated).
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransientCryptoKey) Reset()         { *m = TransientCryptoKey{} }
+func (m *TransientCryptoKey) String() string { return proto.CompactTextString(m) }
+func (*TransientCryptoKey) ProtoMessage()    {}
+func (*TransientCryptoKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{51}
+}
+func (m *TransientCryptoKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransientCryptoKey.Unmarshal(m, b)
+}
+func (m *TransientCryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransientCryptoKey.Marshal(b, m, deterministic)
+}
+func (dst *TransientCryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransientCryptoKey.Merge(dst, src)
+}
+func (m *TransientCryptoKey) XXX_Size() int {
+	return xxx_messageInfo_TransientCryptoKey.Size(m)
+}
+func (m *TransientCryptoKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransientCryptoKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransientCryptoKey proto.InternalMessageInfo
+
+func (m *TransientCryptoKey) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Using raw keys is prone to security risks due to accidentally
+// leaking the key. Choose another type of key if possible.
+type UnwrappedCryptoKey struct {
+	// The AES 128/192/256 bit key. [required]
+	Key                  []byte   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UnwrappedCryptoKey) Reset()         { *m = UnwrappedCryptoKey{} }
+func (m *UnwrappedCryptoKey) String() string { return proto.CompactTextString(m) }
+func (*UnwrappedCryptoKey) ProtoMessage()    {}
+func (*UnwrappedCryptoKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{52}
+}
+func (m *UnwrappedCryptoKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UnwrappedCryptoKey.Unmarshal(m, b)
+}
+func (m *UnwrappedCryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UnwrappedCryptoKey.Marshal(b, m, deterministic)
+}
+func (dst *UnwrappedCryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UnwrappedCryptoKey.Merge(dst, src)
+}
+func (m *UnwrappedCryptoKey) XXX_Size() int {
+	return xxx_messageInfo_UnwrappedCryptoKey.Size(m)
+}
+func (m *UnwrappedCryptoKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_UnwrappedCryptoKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UnwrappedCryptoKey proto.InternalMessageInfo
+
+func (m *UnwrappedCryptoKey) GetKey() []byte {
+	if m != nil {
+		return m.Key
+	}
+	return nil
+}
+
+// Include to use an existing data crypto key wrapped by KMS.
+// Authorization requires the following IAM permissions when sending a request
+// to perform a crypto transformation using a kms-wrapped crypto key:
+// dlp.kms.encrypt
+type KmsWrappedCryptoKey struct {
+	// The wrapped data crypto key. [required]
+	WrappedKey []byte `protobuf:"bytes,1,opt,name=wrapped_key,json=wrappedKey,proto3" json:"wrapped_key,omitempty"`
+	// The resource name of the KMS CryptoKey to use for unwrapping. [required]
+	CryptoKeyName        string   `protobuf:"bytes,2,opt,name=crypto_key_name,json=cryptoKeyName,proto3" json:"crypto_key_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KmsWrappedCryptoKey) Reset()         { *m = KmsWrappedCryptoKey{} }
+func (m *KmsWrappedCryptoKey) String() string { return proto.CompactTextString(m) }
+func (*KmsWrappedCryptoKey) ProtoMessage()    {}
+func (*KmsWrappedCryptoKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{53}
+}
+func (m *KmsWrappedCryptoKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KmsWrappedCryptoKey.Unmarshal(m, b)
+}
+func (m *KmsWrappedCryptoKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KmsWrappedCryptoKey.Marshal(b, m, deterministic)
+}
+func (dst *KmsWrappedCryptoKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KmsWrappedCryptoKey.Merge(dst, src)
+}
+func (m *KmsWrappedCryptoKey) XXX_Size() int {
+	return xxx_messageInfo_KmsWrappedCryptoKey.Size(m)
+}
+func (m *KmsWrappedCryptoKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_KmsWrappedCryptoKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KmsWrappedCryptoKey proto.InternalMessageInfo
+
+func (m *KmsWrappedCryptoKey) GetWrappedKey() []byte {
+	if m != nil {
+		return m.WrappedKey
+	}
+	return nil
+}
+
+func (m *KmsWrappedCryptoKey) GetCryptoKeyName() string {
+	if m != nil {
+		return m.CryptoKeyName
+	}
+	return ""
+}
+
+// Shifts dates by random number of days, with option to be consistent for the
+// same context. See https://cloud.google.com/dlp/docs/concepts-date-shifting
+// to learn more.
+type DateShiftConfig struct {
+	// Range of shift in days. Actual shift will be selected at random within this
+	// range (inclusive ends). Negative means shift to earlier in time. Must not
+	// be more than 365250 days (1000 years) each direction.
+	//
+	// For example, 3 means shift date to at most 3 days into the future.
+	// [Required]
+	UpperBoundDays int32 `protobuf:"varint,1,opt,name=upper_bound_days,json=upperBoundDays,proto3" json:"upper_bound_days,omitempty"`
+	// For example, -5 means shift date to at most 5 days back in the past.
+	// [Required]
+	LowerBoundDays int32 `protobuf:"varint,2,opt,name=lower_bound_days,json=lowerBoundDays,proto3" json:"lower_bound_days,omitempty"`
+	// Points to the field that contains the context, for example, an entity id.
+	// If set, must also set method. If set, shift will be consistent for the
+	// given context.
+	Context *FieldId `protobuf:"bytes,3,opt,name=context,proto3" json:"context,omitempty"`
+	// Method for calculating shift that takes context into consideration. If
+	// set, must also set context. Can only be applied to table items.
+	//
+	// Types that are valid to be assigned to Method:
+	//	*DateShiftConfig_CryptoKey
+	Method               isDateShiftConfig_Method `protobuf_oneof:"method"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *DateShiftConfig) Reset()         { *m = DateShiftConfig{} }
+func (m *DateShiftConfig) String() string { return proto.CompactTextString(m) }
+func (*DateShiftConfig) ProtoMessage()    {}
+func (*DateShiftConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{54}
+}
+func (m *DateShiftConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DateShiftConfig.Unmarshal(m, b)
+}
+func (m *DateShiftConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DateShiftConfig.Marshal(b, m, deterministic)
+}
+func (dst *DateShiftConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DateShiftConfig.Merge(dst, src)
+}
+func (m *DateShiftConfig) XXX_Size() int {
+	return xxx_messageInfo_DateShiftConfig.Size(m)
+}
+func (m *DateShiftConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_DateShiftConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DateShiftConfig proto.InternalMessageInfo
+
+func (m *DateShiftConfig) GetUpperBoundDays() int32 {
+	if m != nil {
+		return m.UpperBoundDays
+	}
+	return 0
+}
+
+func (m *DateShiftConfig) GetLowerBoundDays() int32 {
+	if m != nil {
+		return m.LowerBoundDays
+	}
+	return 0
+}
+
+func (m *DateShiftConfig) GetContext() *FieldId {
+	if m != nil {
+		return m.Context
+	}
+	return nil
+}
+
+type isDateShiftConfig_Method interface {
+	isDateShiftConfig_Method()
+}
+
+type DateShiftConfig_CryptoKey struct {
+	CryptoKey *CryptoKey `protobuf:"bytes,4,opt,name=crypto_key,json=cryptoKey,proto3,oneof"`
+}
+
+func (*DateShiftConfig_CryptoKey) isDateShiftConfig_Method() {}
+
+func (m *DateShiftConfig) GetMethod() isDateShiftConfig_Method {
+	if m != nil {
+		return m.Method
+	}
+	return nil
+}
+
+func (m *DateShiftConfig) GetCryptoKey() *CryptoKey {
+	if x, ok := m.GetMethod().(*DateShiftConfig_CryptoKey); ok {
+		return x.CryptoKey
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*DateShiftConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _DateShiftConfig_OneofMarshaler, _DateShiftConfig_OneofUnmarshaler, _DateShiftConfig_OneofSizer, []interface{}{
+		(*DateShiftConfig_CryptoKey)(nil),
+	}
+}
+
+func _DateShiftConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*DateShiftConfig)
+	// method
+	switch x := m.Method.(type) {
+	case *DateShiftConfig_CryptoKey:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CryptoKey); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("DateShiftConfig.Method has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _DateShiftConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*DateShiftConfig)
+	switch tag {
+	case 4: // method.crypto_key
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CryptoKey)
+		err := b.DecodeMessage(msg)
+		m.Method = &DateShiftConfig_CryptoKey{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _DateShiftConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*DateShiftConfig)
+	// method
+	switch x := m.Method.(type) {
+	case *DateShiftConfig_CryptoKey:
+		s := proto.Size(x.CryptoKey)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// A type of transformation that will scan unstructured text and
+// apply various `PrimitiveTransformation`s to each finding, where the
+// transformation is applied to only values that were identified as a specific
+// info_type.
+type InfoTypeTransformations struct {
+	// Transformation for each infoType. Cannot specify more than one
+	// for a given infoType. [required]
+	Transformations      []*InfoTypeTransformations_InfoTypeTransformation `protobuf:"bytes,1,rep,name=transformations,proto3" json:"transformations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                          `json:"-"`
+	XXX_unrecognized     []byte                                            `json:"-"`
+	XXX_sizecache        int32                                             `json:"-"`
+}
+
+func (m *InfoTypeTransformations) Reset()         { *m = InfoTypeTransformations{} }
+func (m *InfoTypeTransformations) String() string { return proto.CompactTextString(m) }
+func (*InfoTypeTransformations) ProtoMessage()    {}
+func (*InfoTypeTransformations) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{55}
+}
+func (m *InfoTypeTransformations) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InfoTypeTransformations.Unmarshal(m, b)
+}
+func (m *InfoTypeTransformations) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InfoTypeTransformations.Marshal(b, m, deterministic)
+}
+func (dst *InfoTypeTransformations) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoTypeTransformations.Merge(dst, src)
+}
+func (m *InfoTypeTransformations) XXX_Size() int {
+	return xxx_messageInfo_InfoTypeTransformations.Size(m)
+}
+func (m *InfoTypeTransformations) XXX_DiscardUnknown() {
+	xxx_messageInfo_InfoTypeTransformations.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InfoTypeTransformations proto.InternalMessageInfo
+
+func (m *InfoTypeTransformations) GetTransformations() []*InfoTypeTransformations_InfoTypeTransformation {
+	if m != nil {
+		return m.Transformations
+	}
+	return nil
+}
+
+// A transformation to apply to text that is identified as a specific
+// info_type.
+type InfoTypeTransformations_InfoTypeTransformation struct {
+	// InfoTypes to apply the transformation to. An empty list will cause
+	// this transformation to apply to all findings that correspond to
+	// infoTypes that were requested in `InspectConfig`.
+	InfoTypes []*InfoType `protobuf:"bytes,1,rep,name=info_types,json=infoTypes,proto3" json:"info_types,omitempty"`
+	// Primitive transformation to apply to the infoType. [required]
+	PrimitiveTransformation *PrimitiveTransformation `protobuf:"bytes,2,opt,name=primitive_transformation,json=primitiveTransformation,proto3" json:"primitive_transformation,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}                 `json:"-"`
+	XXX_unrecognized        []byte                   `json:"-"`
+	XXX_sizecache           int32                    `json:"-"`
+}
+
+func (m *InfoTypeTransformations_InfoTypeTransformation) Reset() {
+	*m = InfoTypeTransformations_InfoTypeTransformation{}
+}
+func (m *InfoTypeTransformations_InfoTypeTransformation) String() string {
+	return proto.CompactTextString(m)
+}
+func (*InfoTypeTransformations_InfoTypeTransformation) ProtoMessage() {}
+func (*InfoTypeTransformations_InfoTypeTransformation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{55, 0}
+}
+func (m *InfoTypeTransformations_InfoTypeTransformation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Unmarshal(m, b)
+}
+func (m *InfoTypeTransformations_InfoTypeTransformation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Marshal(b, m, deterministic)
+}
+func (dst *InfoTypeTransformations_InfoTypeTransformation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Merge(dst, src)
+}
+func (m *InfoTypeTransformations_InfoTypeTransformation) XXX_Size() int {
+	return xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.Size(m)
+}
+func (m *InfoTypeTransformations_InfoTypeTransformation) XXX_DiscardUnknown() {
+	xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InfoTypeTransformations_InfoTypeTransformation proto.InternalMessageInfo
+
+func (m *InfoTypeTransformations_InfoTypeTransformation) GetInfoTypes() []*InfoType {
+	if m != nil {
+		return m.InfoTypes
+	}
+	return nil
+}
+
+func (m *InfoTypeTransformations_InfoTypeTransformation) GetPrimitiveTransformation() *PrimitiveTransformation {
+	if m != nil {
+		return m.PrimitiveTransformation
+	}
+	return nil
+}
+
+// The transformation to apply to the field.
+type FieldTransformation struct {
+	// Input field(s) to apply the transformation to. [required]
+	Fields []*FieldId `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
+	// Only apply the transformation if the condition evaluates to true for the
+	// given `RecordCondition`. The conditions are allowed to reference fields
+	// that are not used in the actual transformation. [optional]
+	//
+	// Example Use Cases:
+	//
+	// - Apply a different bucket transformation to an age column if the zip code
+	// column for the same record is within a specific range.
+	// - Redact a field if the date of birth field is greater than 85.
+	Condition *RecordCondition `protobuf:"bytes,3,opt,name=condition,proto3" json:"condition,omitempty"`
+	// Transformation to apply. [required]
+	//
+	// Types that are valid to be assigned to Transformation:
+	//	*FieldTransformation_PrimitiveTransformation
+	//	*FieldTransformation_InfoTypeTransformations
+	Transformation       isFieldTransformation_Transformation `protobuf_oneof:"transformation"`
+	XXX_NoUnkeyedLiteral struct{}                             `json:"-"`
+	XXX_unrecognized     []byte                               `json:"-"`
+	XXX_sizecache        int32                                `json:"-"`
+}
+
+func (m *FieldTransformation) Reset()         { *m = FieldTransformation{} }
+func (m *FieldTransformation) String() string { return proto.CompactTextString(m) }
+func (*FieldTransformation) ProtoMessage()    {}
+func (*FieldTransformation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{56}
+}
+func (m *FieldTransformation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FieldTransformation.Unmarshal(m, b)
+}
+func (m *FieldTransformation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FieldTransformation.Marshal(b, m, deterministic)
+}
+func (dst *FieldTransformation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldTransformation.Merge(dst, src)
+}
+func (m *FieldTransformation) XXX_Size() int {
+	return xxx_messageInfo_FieldTransformation.Size(m)
+}
+func (m *FieldTransformation) XXX_DiscardUnknown() {
+	xxx_messageInfo_FieldTransformation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FieldTransformation proto.InternalMessageInfo
+
+func (m *FieldTransformation) GetFields() []*FieldId {
+	if m != nil {
+		return m.Fields
+	}
+	return nil
+}
+
+func (m *FieldTransformation) GetCondition() *RecordCondition {
+	if m != nil {
+		return m.Condition
+	}
+	return nil
+}
+
+type isFieldTransformation_Transformation interface {
+	isFieldTransformation_Transformation()
+}
+
+type FieldTransformation_PrimitiveTransformation struct {
+	PrimitiveTransformation *PrimitiveTransformation `protobuf:"bytes,4,opt,name=primitive_transformation,json=primitiveTransformation,proto3,oneof"`
+}
+
+type FieldTransformation_InfoTypeTransformations struct {
+	InfoTypeTransformations *InfoTypeTransformations `protobuf:"bytes,5,opt,name=info_type_transformations,json=infoTypeTransformations,proto3,oneof"`
+}
+
+func (*FieldTransformation_PrimitiveTransformation) isFieldTransformation_Transformation() {}
+
+func (*FieldTransformation_InfoTypeTransformations) isFieldTransformation_Transformation() {}
+
+func (m *FieldTransformation) GetTransformation() isFieldTransformation_Transformation {
+	if m != nil {
+		return m.Transformation
+	}
+	return nil
+}
+
+func (m *FieldTransformation) GetPrimitiveTransformation() *PrimitiveTransformation {
+	if x, ok := m.GetTransformation().(*FieldTransformation_PrimitiveTransformation); ok {
+		return x.PrimitiveTransformation
+	}
+	return nil
+}
+
+func (m *FieldTransformation) GetInfoTypeTransformations() *InfoTypeTransformations {
+	if x, ok := m.GetTransformation().(*FieldTransformation_InfoTypeTransformations); ok {
+		return x.InfoTypeTransformations
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*FieldTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _FieldTransformation_OneofMarshaler, _FieldTransformation_OneofUnmarshaler, _FieldTransformation_OneofSizer, []interface{}{
+		(*FieldTransformation_PrimitiveTransformation)(nil),
+		(*FieldTransformation_InfoTypeTransformations)(nil),
+	}
+}
+
+func _FieldTransformation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*FieldTransformation)
+	// transformation
+	switch x := m.Transformation.(type) {
+	case *FieldTransformation_PrimitiveTransformation:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.PrimitiveTransformation); err != nil {
+			return err
+		}
+	case *FieldTransformation_InfoTypeTransformations:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InfoTypeTransformations); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("FieldTransformation.Transformation has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _FieldTransformation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*FieldTransformation)
+	switch tag {
+	case 4: // transformation.primitive_transformation
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(PrimitiveTransformation)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &FieldTransformation_PrimitiveTransformation{msg}
+		return true, err
+	case 5: // transformation.info_type_transformations
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InfoTypeTransformations)
+		err := b.DecodeMessage(msg)
+		m.Transformation = &FieldTransformation_InfoTypeTransformations{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _FieldTransformation_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*FieldTransformation)
+	// transformation
+	switch x := m.Transformation.(type) {
+	case *FieldTransformation_PrimitiveTransformation:
+		s := proto.Size(x.PrimitiveTransformation)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *FieldTransformation_InfoTypeTransformations:
+		s := proto.Size(x.InfoTypeTransformations)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// A type of transformation that is applied over structured data such as a
+// table.
+type RecordTransformations struct {
+	// Transform the record by applying various field transformations.
+	FieldTransformations []*FieldTransformation `protobuf:"bytes,1,rep,name=field_transformations,json=fieldTransformations,proto3" json:"field_transformations,omitempty"`
+	// Configuration defining which records get suppressed entirely. Records that
+	// match any suppression rule are omitted from the output [optional].
+	RecordSuppressions   []*RecordSuppression `protobuf:"bytes,2,rep,name=record_suppressions,json=recordSuppressions,proto3" json:"record_suppressions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *RecordTransformations) Reset()         { *m = RecordTransformations{} }
+func (m *RecordTransformations) String() string { return proto.CompactTextString(m) }
+func (*RecordTransformations) ProtoMessage()    {}
+func (*RecordTransformations) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{57}
+}
+func (m *RecordTransformations) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecordTransformations.Unmarshal(m, b)
+}
+func (m *RecordTransformations) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecordTransformations.Marshal(b, m, deterministic)
+}
+func (dst *RecordTransformations) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordTransformations.Merge(dst, src)
+}
+func (m *RecordTransformations) XXX_Size() int {
+	return xxx_messageInfo_RecordTransformations.Size(m)
+}
+func (m *RecordTransformations) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecordTransformations.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecordTransformations proto.InternalMessageInfo
+
+func (m *RecordTransformations) GetFieldTransformations() []*FieldTransformation {
+	if m != nil {
+		return m.FieldTransformations
+	}
+	return nil
+}
+
+func (m *RecordTransformations) GetRecordSuppressions() []*RecordSuppression {
+	if m != nil {
+		return m.RecordSuppressions
+	}
+	return nil
+}
+
+// Configuration to suppress records whose suppression conditions evaluate to
+// true.
+type RecordSuppression struct {
+	// A condition that when it evaluates to true will result in the record being
+	// evaluated to be suppressed from the transformed content.
+	Condition            *RecordCondition `protobuf:"bytes,1,opt,name=condition,proto3" json:"condition,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *RecordSuppression) Reset()         { *m = RecordSuppression{} }
+func (m *RecordSuppression) String() string { return proto.CompactTextString(m) }
+func (*RecordSuppression) ProtoMessage()    {}
+func (*RecordSuppression) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{58}
+}
+func (m *RecordSuppression) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecordSuppression.Unmarshal(m, b)
+}
+func (m *RecordSuppression) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecordSuppression.Marshal(b, m, deterministic)
+}
+func (dst *RecordSuppression) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordSuppression.Merge(dst, src)
+}
+func (m *RecordSuppression) XXX_Size() int {
+	return xxx_messageInfo_RecordSuppression.Size(m)
+}
+func (m *RecordSuppression) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecordSuppression.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecordSuppression proto.InternalMessageInfo
+
+func (m *RecordSuppression) GetCondition() *RecordCondition {
+	if m != nil {
+		return m.Condition
+	}
+	return nil
+}
+
+// A condition for determining whether a transformation should be applied to
+// a field.
+type RecordCondition struct {
+	// An expression.
+	Expressions          *RecordCondition_Expressions `protobuf:"bytes,3,opt,name=expressions,proto3" json:"expressions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *RecordCondition) Reset()         { *m = RecordCondition{} }
+func (m *RecordCondition) String() string { return proto.CompactTextString(m) }
+func (*RecordCondition) ProtoMessage()    {}
+func (*RecordCondition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{59}
+}
+func (m *RecordCondition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecordCondition.Unmarshal(m, b)
+}
+func (m *RecordCondition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecordCondition.Marshal(b, m, deterministic)
+}
+func (dst *RecordCondition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordCondition.Merge(dst, src)
+}
+func (m *RecordCondition) XXX_Size() int {
+	return xxx_messageInfo_RecordCondition.Size(m)
+}
+func (m *RecordCondition) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecordCondition.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecordCondition proto.InternalMessageInfo
+
+func (m *RecordCondition) GetExpressions() *RecordCondition_Expressions {
+	if m != nil {
+		return m.Expressions
+	}
+	return nil
+}
+
+// The field type of `value` and `field` do not need to match to be
+// considered equal, but not all comparisons are possible.
+//
+// A `value` of type:
+//
+// - `string` can be compared against all other types
+// - `boolean` can only be compared against other booleans
+// - `integer` can be compared against doubles or a string if the string value
+// can be parsed as an integer.
+// - `double` can be compared against integers or a string if the string can
+// be parsed as a double.
+// - `Timestamp` can be compared against strings in RFC 3339 date string
+// format.
+// - `TimeOfDay` can be compared against timestamps and strings in the format
+// of 'HH:mm:ss'.
+//
+// If we fail to compare do to type mismatch, a warning will be given and
+// the condition will evaluate to false.
+type RecordCondition_Condition struct {
+	// Field within the record this condition is evaluated against. [required]
+	Field *FieldId `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
+	// Operator used to compare the field or infoType to the value. [required]
+	Operator RelationalOperator `protobuf:"varint,3,opt,name=operator,proto3,enum=google.privacy.dlp.v2.RelationalOperator" json:"operator,omitempty"`
+	// Value to compare against. [Required, except for `EXISTS` tests.]
+	Value                *Value   `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RecordCondition_Condition) Reset()         { *m = RecordCondition_Condition{} }
+func (m *RecordCondition_Condition) String() string { return proto.CompactTextString(m) }
+func (*RecordCondition_Condition) ProtoMessage()    {}
+func (*RecordCondition_Condition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{59, 0}
+}
+func (m *RecordCondition_Condition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecordCondition_Condition.Unmarshal(m, b)
+}
+func (m *RecordCondition_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecordCondition_Condition.Marshal(b, m, deterministic)
+}
+func (dst *RecordCondition_Condition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordCondition_Condition.Merge(dst, src)
+}
+func (m *RecordCondition_Condition) XXX_Size() int {
+	return xxx_messageInfo_RecordCondition_Condition.Size(m)
+}
+func (m *RecordCondition_Condition) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecordCondition_Condition.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecordCondition_Condition proto.InternalMessageInfo
+
+func (m *RecordCondition_Condition) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+func (m *RecordCondition_Condition) GetOperator() RelationalOperator {
+	if m != nil {
+		return m.Operator
+	}
+	return RelationalOperator_RELATIONAL_OPERATOR_UNSPECIFIED
+}
+
+func (m *RecordCondition_Condition) GetValue() *Value {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+// A collection of conditions.
+type RecordCondition_Conditions struct {
+	Conditions           []*RecordCondition_Condition `protobuf:"bytes,1,rep,name=conditions,proto3" json:"conditions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *RecordCondition_Conditions) Reset()         { *m = RecordCondition_Conditions{} }
+func (m *RecordCondition_Conditions) String() string { return proto.CompactTextString(m) }
+func (*RecordCondition_Conditions) ProtoMessage()    {}
+func (*RecordCondition_Conditions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{59, 1}
+}
+func (m *RecordCondition_Conditions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecordCondition_Conditions.Unmarshal(m, b)
+}
+func (m *RecordCondition_Conditions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecordCondition_Conditions.Marshal(b, m, deterministic)
+}
+func (dst *RecordCondition_Conditions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordCondition_Conditions.Merge(dst, src)
+}
+func (m *RecordCondition_Conditions) XXX_Size() int {
+	return xxx_messageInfo_RecordCondition_Conditions.Size(m)
+}
+func (m *RecordCondition_Conditions) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecordCondition_Conditions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecordCondition_Conditions proto.InternalMessageInfo
+
+func (m *RecordCondition_Conditions) GetConditions() []*RecordCondition_Condition {
+	if m != nil {
+		return m.Conditions
+	}
+	return nil
+}
+
+// An expression, consisting or an operator and conditions.
+type RecordCondition_Expressions struct {
+	// The operator to apply to the result of conditions. Default and currently
+	// only supported value is `AND`.
+	LogicalOperator RecordCondition_Expressions_LogicalOperator `protobuf:"varint,1,opt,name=logical_operator,json=logicalOperator,proto3,enum=google.privacy.dlp.v2.RecordCondition_Expressions_LogicalOperator" json:"logical_operator,omitempty"`
+	// Types that are valid to be assigned to Type:
+	//	*RecordCondition_Expressions_Conditions
+	Type                 isRecordCondition_Expressions_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
+}
+
+func (m *RecordCondition_Expressions) Reset()         { *m = RecordCondition_Expressions{} }
+func (m *RecordCondition_Expressions) String() string { return proto.CompactTextString(m) }
+func (*RecordCondition_Expressions) ProtoMessage()    {}
+func (*RecordCondition_Expressions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{59, 2}
+}
+func (m *RecordCondition_Expressions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecordCondition_Expressions.Unmarshal(m, b)
+}
+func (m *RecordCondition_Expressions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecordCondition_Expressions.Marshal(b, m, deterministic)
+}
+func (dst *RecordCondition_Expressions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordCondition_Expressions.Merge(dst, src)
+}
+func (m *RecordCondition_Expressions) XXX_Size() int {
+	return xxx_messageInfo_RecordCondition_Expressions.Size(m)
+}
+func (m *RecordCondition_Expressions) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecordCondition_Expressions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecordCondition_Expressions proto.InternalMessageInfo
+
+func (m *RecordCondition_Expressions) GetLogicalOperator() RecordCondition_Expressions_LogicalOperator {
+	if m != nil {
+		return m.LogicalOperator
+	}
+	return RecordCondition_Expressions_LOGICAL_OPERATOR_UNSPECIFIED
+}
+
+type isRecordCondition_Expressions_Type interface {
+	isRecordCondition_Expressions_Type()
+}
+
+type RecordCondition_Expressions_Conditions struct {
+	Conditions *RecordCondition_Conditions `protobuf:"bytes,3,opt,name=conditions,proto3,oneof"`
+}
+
+func (*RecordCondition_Expressions_Conditions) isRecordCondition_Expressions_Type() {}
+
+func (m *RecordCondition_Expressions) GetType() isRecordCondition_Expressions_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *RecordCondition_Expressions) GetConditions() *RecordCondition_Conditions {
+	if x, ok := m.GetType().(*RecordCondition_Expressions_Conditions); ok {
+		return x.Conditions
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*RecordCondition_Expressions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _RecordCondition_Expressions_OneofMarshaler, _RecordCondition_Expressions_OneofUnmarshaler, _RecordCondition_Expressions_OneofSizer, []interface{}{
+		(*RecordCondition_Expressions_Conditions)(nil),
+	}
+}
+
+func _RecordCondition_Expressions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*RecordCondition_Expressions)
+	// type
+	switch x := m.Type.(type) {
+	case *RecordCondition_Expressions_Conditions:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Conditions); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("RecordCondition_Expressions.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _RecordCondition_Expressions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*RecordCondition_Expressions)
+	switch tag {
+	case 3: // type.conditions
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(RecordCondition_Conditions)
+		err := b.DecodeMessage(msg)
+		m.Type = &RecordCondition_Expressions_Conditions{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _RecordCondition_Expressions_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*RecordCondition_Expressions)
+	// type
+	switch x := m.Type.(type) {
+	case *RecordCondition_Expressions_Conditions:
+		s := proto.Size(x.Conditions)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Overview of the modifications that occurred.
+type TransformationOverview struct {
+	// Total size in bytes that were transformed in some way.
+	TransformedBytes int64 `protobuf:"varint,2,opt,name=transformed_bytes,json=transformedBytes,proto3" json:"transformed_bytes,omitempty"`
+	// Transformations applied to the dataset.
+	TransformationSummaries []*TransformationSummary `protobuf:"bytes,3,rep,name=transformation_summaries,json=transformationSummaries,proto3" json:"transformation_summaries,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}                 `json:"-"`
+	XXX_unrecognized        []byte                   `json:"-"`
+	XXX_sizecache           int32                    `json:"-"`
+}
+
+func (m *TransformationOverview) Reset()         { *m = TransformationOverview{} }
+func (m *TransformationOverview) String() string { return proto.CompactTextString(m) }
+func (*TransformationOverview) ProtoMessage()    {}
+func (*TransformationOverview) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{60}
+}
+func (m *TransformationOverview) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransformationOverview.Unmarshal(m, b)
+}
+func (m *TransformationOverview) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransformationOverview.Marshal(b, m, deterministic)
+}
+func (dst *TransformationOverview) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransformationOverview.Merge(dst, src)
+}
+func (m *TransformationOverview) XXX_Size() int {
+	return xxx_messageInfo_TransformationOverview.Size(m)
+}
+func (m *TransformationOverview) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransformationOverview.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransformationOverview proto.InternalMessageInfo
+
+func (m *TransformationOverview) GetTransformedBytes() int64 {
+	if m != nil {
+		return m.TransformedBytes
+	}
+	return 0
+}
+
+func (m *TransformationOverview) GetTransformationSummaries() []*TransformationSummary {
+	if m != nil {
+		return m.TransformationSummaries
+	}
+	return nil
+}
+
+// Summary of a single tranformation.
+// Only one of 'transformation', 'field_transformation', or 'record_suppress'
+// will be set.
+type TransformationSummary struct {
+	// Set if the transformation was limited to a specific info_type.
+	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType,proto3" json:"info_type,omitempty"`
+	// Set if the transformation was limited to a specific FieldId.
+	Field *FieldId `protobuf:"bytes,2,opt,name=field,proto3" json:"field,omitempty"`
+	// The specific transformation these stats apply to.
+	Transformation *PrimitiveTransformation `protobuf:"bytes,3,opt,name=transformation,proto3" json:"transformation,omitempty"`
+	// The field transformation that was applied.
+	// If multiple field transformations are requested for a single field,
+	// this list will contain all of them; otherwise, only one is supplied.
+	FieldTransformations []*FieldTransformation `protobuf:"bytes,5,rep,name=field_transformations,json=fieldTransformations,proto3" json:"field_transformations,omitempty"`
+	// The specific suppression option these stats apply to.
+	RecordSuppress *RecordSuppression                     `protobuf:"bytes,6,opt,name=record_suppress,json=recordSuppress,proto3" json:"record_suppress,omitempty"`
+	Results        []*TransformationSummary_SummaryResult `protobuf:"bytes,4,rep,name=results,proto3" json:"results,omitempty"`
+	// Total size in bytes that were transformed in some way.
+	TransformedBytes     int64    `protobuf:"varint,7,opt,name=transformed_bytes,json=transformedBytes,proto3" json:"transformed_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransformationSummary) Reset()         { *m = TransformationSummary{} }
+func (m *TransformationSummary) String() string { return proto.CompactTextString(m) }
+func (*TransformationSummary) ProtoMessage()    {}
+func (*TransformationSummary) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{61}
+}
+func (m *TransformationSummary) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransformationSummary.Unmarshal(m, b)
+}
+func (m *TransformationSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransformationSummary.Marshal(b, m, deterministic)
+}
+func (dst *TransformationSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransformationSummary.Merge(dst, src)
+}
+func (m *TransformationSummary) XXX_Size() int {
+	return xxx_messageInfo_TransformationSummary.Size(m)
+}
+func (m *TransformationSummary) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransformationSummary.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransformationSummary proto.InternalMessageInfo
+
+func (m *TransformationSummary) GetInfoType() *InfoType {
+	if m != nil {
+		return m.InfoType
+	}
+	return nil
+}
+
+func (m *TransformationSummary) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+func (m *TransformationSummary) GetTransformation() *PrimitiveTransformation {
+	if m != nil {
+		return m.Transformation
+	}
+	return nil
+}
+
+func (m *TransformationSummary) GetFieldTransformations() []*FieldTransformation {
+	if m != nil {
+		return m.FieldTransformations
+	}
+	return nil
+}
+
+func (m *TransformationSummary) GetRecordSuppress() *RecordSuppression {
+	if m != nil {
+		return m.RecordSuppress
+	}
+	return nil
+}
+
+func (m *TransformationSummary) GetResults() []*TransformationSummary_SummaryResult {
+	if m != nil {
+		return m.Results
+	}
+	return nil
+}
+
+func (m *TransformationSummary) GetTransformedBytes() int64 {
+	if m != nil {
+		return m.TransformedBytes
+	}
+	return 0
+}
+
+// A collection that informs the user the number of times a particular
+// `TransformationResultCode` and error details occurred.
+type TransformationSummary_SummaryResult struct {
+	Count int64                                          `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
+	Code  TransformationSummary_TransformationResultCode `protobuf:"varint,2,opt,name=code,proto3,enum=google.privacy.dlp.v2.TransformationSummary_TransformationResultCode" json:"code,omitempty"`
+	// A place for warnings or errors to show up if a transformation didn't
+	// work as expected.
+	Details              string   `protobuf:"bytes,3,opt,name=details,proto3" json:"details,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransformationSummary_SummaryResult) Reset()         { *m = TransformationSummary_SummaryResult{} }
+func (m *TransformationSummary_SummaryResult) String() string { return proto.CompactTextString(m) }
+func (*TransformationSummary_SummaryResult) ProtoMessage()    {}
+func (*TransformationSummary_SummaryResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{61, 0}
+}
+func (m *TransformationSummary_SummaryResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransformationSummary_SummaryResult.Unmarshal(m, b)
+}
+func (m *TransformationSummary_SummaryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransformationSummary_SummaryResult.Marshal(b, m, deterministic)
+}
+func (dst *TransformationSummary_SummaryResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransformationSummary_SummaryResult.Merge(dst, src)
+}
+func (m *TransformationSummary_SummaryResult) XXX_Size() int {
+	return xxx_messageInfo_TransformationSummary_SummaryResult.Size(m)
+}
+func (m *TransformationSummary_SummaryResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransformationSummary_SummaryResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransformationSummary_SummaryResult proto.InternalMessageInfo
+
+func (m *TransformationSummary_SummaryResult) GetCount() int64 {
+	if m != nil {
+		return m.Count
+	}
+	return 0
+}
+
+func (m *TransformationSummary_SummaryResult) GetCode() TransformationSummary_TransformationResultCode {
+	if m != nil {
+		return m.Code
+	}
+	return TransformationSummary_TRANSFORMATION_RESULT_CODE_UNSPECIFIED
+}
+
+func (m *TransformationSummary_SummaryResult) GetDetails() string {
+	if m != nil {
+		return m.Details
+	}
+	return ""
+}
+
+// Schedule for triggeredJobs.
+type Schedule struct {
+	// Types that are valid to be assigned to Option:
+	//	*Schedule_RecurrencePeriodDuration
+	Option               isSchedule_Option `protobuf_oneof:"option"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Schedule) Reset()         { *m = Schedule{} }
+func (m *Schedule) String() string { return proto.CompactTextString(m) }
+func (*Schedule) ProtoMessage()    {}
+func (*Schedule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{62}
+}
+func (m *Schedule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Schedule.Unmarshal(m, b)
+}
+func (m *Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Schedule.Marshal(b, m, deterministic)
+}
+func (dst *Schedule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Schedule.Merge(dst, src)
+}
+func (m *Schedule) XXX_Size() int {
+	return xxx_messageInfo_Schedule.Size(m)
+}
+func (m *Schedule) XXX_DiscardUnknown() {
+	xxx_messageInfo_Schedule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Schedule proto.InternalMessageInfo
+
+type isSchedule_Option interface {
+	isSchedule_Option()
+}
+
+type Schedule_RecurrencePeriodDuration struct {
+	RecurrencePeriodDuration *duration.Duration `protobuf:"bytes,1,opt,name=recurrence_period_duration,json=recurrencePeriodDuration,proto3,oneof"`
+}
+
+func (*Schedule_RecurrencePeriodDuration) isSchedule_Option() {}
+
+func (m *Schedule) GetOption() isSchedule_Option {
+	if m != nil {
+		return m.Option
+	}
+	return nil
+}
+
+func (m *Schedule) GetRecurrencePeriodDuration() *duration.Duration {
+	if x, ok := m.GetOption().(*Schedule_RecurrencePeriodDuration); ok {
+		return x.RecurrencePeriodDuration
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Schedule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Schedule_OneofMarshaler, _Schedule_OneofUnmarshaler, _Schedule_OneofSizer, []interface{}{
+		(*Schedule_RecurrencePeriodDuration)(nil),
+	}
+}
+
+func _Schedule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Schedule)
+	// option
+	switch x := m.Option.(type) {
+	case *Schedule_RecurrencePeriodDuration:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.RecurrencePeriodDuration); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Schedule.Option has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Schedule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Schedule)
+	switch tag {
+	case 1: // option.recurrence_period_duration
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(duration.Duration)
+		err := b.DecodeMessage(msg)
+		m.Option = &Schedule_RecurrencePeriodDuration{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Schedule_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Schedule)
+	// option
+	switch x := m.Option.(type) {
+	case *Schedule_RecurrencePeriodDuration:
+		s := proto.Size(x.RecurrencePeriodDuration)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The inspectTemplate contains a configuration (set of types of sensitive data
+// to be detected) to be used anywhere you otherwise would normally specify
+// InspectConfig. See https://cloud.google.com/dlp/docs/concepts-templates
+// to learn more.
+type InspectTemplate struct {
+	// The template name. Output only.
+	//
+	// The template will have one of the following formats:
+	// `projects/PROJECT_ID/inspectTemplates/TEMPLATE_ID` OR
+	// `organizations/ORGANIZATION_ID/inspectTemplates/TEMPLATE_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Display name (max 256 chars).
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Short description (max 256 chars).
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// The creation timestamp of a inspectTemplate, output only field.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// The last update timestamp of a inspectTemplate, output only field.
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	// The core content of the template. Configuration of the scanning process.
+	InspectConfig        *InspectConfig `protobuf:"bytes,6,opt,name=inspect_config,json=inspectConfig,proto3" json:"inspect_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *InspectTemplate) Reset()         { *m = InspectTemplate{} }
+func (m *InspectTemplate) String() string { return proto.CompactTextString(m) }
+func (*InspectTemplate) ProtoMessage()    {}
+func (*InspectTemplate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{63}
+}
+func (m *InspectTemplate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectTemplate.Unmarshal(m, b)
+}
+func (m *InspectTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectTemplate.Marshal(b, m, deterministic)
+}
+func (dst *InspectTemplate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectTemplate.Merge(dst, src)
+}
+func (m *InspectTemplate) XXX_Size() int {
+	return xxx_messageInfo_InspectTemplate.Size(m)
+}
+func (m *InspectTemplate) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectTemplate.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectTemplate proto.InternalMessageInfo
+
+func (m *InspectTemplate) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *InspectTemplate) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *InspectTemplate) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *InspectTemplate) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *InspectTemplate) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
+func (m *InspectTemplate) GetInspectConfig() *InspectConfig {
+	if m != nil {
+		return m.InspectConfig
+	}
+	return nil
+}
+
+// The DeidentifyTemplates contains instructions on how to deidentify content.
+// See https://cloud.google.com/dlp/docs/concepts-templates to learn more.
+type DeidentifyTemplate struct {
+	// The template name. Output only.
+	//
+	// The template will have one of the following formats:
+	// `projects/PROJECT_ID/deidentifyTemplates/TEMPLATE_ID` OR
+	// `organizations/ORGANIZATION_ID/deidentifyTemplates/TEMPLATE_ID`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Display name (max 256 chars).
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// Short description (max 256 chars).
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// The creation timestamp of a inspectTemplate, output only field.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// The last update timestamp of a inspectTemplate, output only field.
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	// ///////////// // The core content of the template  // ///////////////
+	DeidentifyConfig     *DeidentifyConfig `protobuf:"bytes,6,opt,name=deidentify_config,json=deidentifyConfig,proto3" json:"deidentify_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *DeidentifyTemplate) Reset()         { *m = DeidentifyTemplate{} }
+func (m *DeidentifyTemplate) String() string { return proto.CompactTextString(m) }
+func (*DeidentifyTemplate) ProtoMessage()    {}
+func (*DeidentifyTemplate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{64}
+}
+func (m *DeidentifyTemplate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeidentifyTemplate.Unmarshal(m, b)
+}
+func (m *DeidentifyTemplate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeidentifyTemplate.Marshal(b, m, deterministic)
+}
+func (dst *DeidentifyTemplate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeidentifyTemplate.Merge(dst, src)
+}
+func (m *DeidentifyTemplate) XXX_Size() int {
+	return xxx_messageInfo_DeidentifyTemplate.Size(m)
+}
+func (m *DeidentifyTemplate) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeidentifyTemplate.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeidentifyTemplate proto.InternalMessageInfo
+
+func (m *DeidentifyTemplate) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *DeidentifyTemplate) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *DeidentifyTemplate) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *DeidentifyTemplate) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *DeidentifyTemplate) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
+func (m *DeidentifyTemplate) GetDeidentifyConfig() *DeidentifyConfig {
+	if m != nil {
+		return m.DeidentifyConfig
+	}
+	return nil
+}
+
+// Details information about an error encountered during job execution or
+// the results of an unsuccessful activation of the JobTrigger.
+// Output only field.
+type Error struct {
+	Details *status.Status `protobuf:"bytes,1,opt,name=details,proto3" json:"details,omitempty"`
+	// The times the error occurred.
+	Timestamps           []*timestamp.Timestamp `protobuf:"bytes,2,rep,name=timestamps,proto3" json:"timestamps,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *Error) Reset()         { *m = Error{} }
+func (m *Error) String() string { return proto.CompactTextString(m) }
+func (*Error) ProtoMessage()    {}
+func (*Error) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{65}
+}
+func (m *Error) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Error.Unmarshal(m, b)
+}
+func (m *Error) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Error.Marshal(b, m, deterministic)
+}
+func (dst *Error) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Error.Merge(dst, src)
+}
+func (m *Error) XXX_Size() int {
+	return xxx_messageInfo_Error.Size(m)
+}
+func (m *Error) XXX_DiscardUnknown() {
+	xxx_messageInfo_Error.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Error proto.InternalMessageInfo
+
+func (m *Error) GetDetails() *status.Status {
+	if m != nil {
+		return m.Details
+	}
+	return nil
+}
+
+func (m *Error) GetTimestamps() []*timestamp.Timestamp {
+	if m != nil {
+		return m.Timestamps
+	}
+	return nil
+}
+
+// Contains a configuration to make dlp api calls on a repeating basis.
+// See https://cloud.google.com/dlp/docs/concepts-job-triggers to learn more.
+type JobTrigger struct {
+	// Unique resource name for the triggeredJob, assigned by the service when the
+	// triggeredJob is created, for example
+	// `projects/dlp-test-project/triggeredJobs/53234423`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// Display name (max 100 chars)
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	// User provided description (max 256 chars)
+	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	// The configuration details for the specific type of job to run.
+	//
+	// Types that are valid to be assigned to Job:
+	//	*JobTrigger_InspectJob
+	Job isJobTrigger_Job `protobuf_oneof:"job"`
+	// A list of triggers which will be OR'ed together. Only one in the list
+	// needs to trigger for a job to be started. The list may contain only
+	// a single Schedule trigger and must have at least one object.
+	Triggers []*JobTrigger_Trigger `protobuf:"bytes,5,rep,name=triggers,proto3" json:"triggers,omitempty"`
+	// A stream of errors encountered when the trigger was activated. Repeated
+	// errors may result in the JobTrigger automaticaly being paused.
+	// Will return the last 100 errors. Whenever the JobTrigger is modified
+	// this list will be cleared. Output only field.
+	Errors []*Error `protobuf:"bytes,6,rep,name=errors,proto3" json:"errors,omitempty"`
+	// The creation timestamp of a triggeredJob, output only field.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// The last update timestamp of a triggeredJob, output only field.
+	UpdateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	// The timestamp of the last time this trigger executed, output only field.
+	LastRunTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=last_run_time,json=lastRunTime,proto3" json:"last_run_time,omitempty"`
+	// A status for this trigger. [required]
+	Status               JobTrigger_Status `protobuf:"varint,10,opt,name=status,proto3,enum=google.privacy.dlp.v2.JobTrigger_Status" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *JobTrigger) Reset()         { *m = JobTrigger{} }
+func (m *JobTrigger) String() string { return proto.CompactTextString(m) }
+func (*JobTrigger) ProtoMessage()    {}
+func (*JobTrigger) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{66}
+}
+func (m *JobTrigger) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobTrigger.Unmarshal(m, b)
+}
+func (m *JobTrigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobTrigger.Marshal(b, m, deterministic)
+}
+func (dst *JobTrigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobTrigger.Merge(dst, src)
+}
+func (m *JobTrigger) XXX_Size() int {
+	return xxx_messageInfo_JobTrigger.Size(m)
+}
+func (m *JobTrigger) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobTrigger.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobTrigger proto.InternalMessageInfo
+
+func (m *JobTrigger) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *JobTrigger) GetDisplayName() string {
+	if m != nil {
+		return m.DisplayName
+	}
+	return ""
+}
+
+func (m *JobTrigger) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+type isJobTrigger_Job interface {
+	isJobTrigger_Job()
+}
+
+type JobTrigger_InspectJob struct {
+	InspectJob *InspectJobConfig `protobuf:"bytes,4,opt,name=inspect_job,json=inspectJob,proto3,oneof"`
+}
+
+func (*JobTrigger_InspectJob) isJobTrigger_Job() {}
+
+func (m *JobTrigger) GetJob() isJobTrigger_Job {
+	if m != nil {
+		return m.Job
+	}
+	return nil
+}
+
+func (m *JobTrigger) GetInspectJob() *InspectJobConfig {
+	if x, ok := m.GetJob().(*JobTrigger_InspectJob); ok {
+		return x.InspectJob
+	}
+	return nil
+}
+
+func (m *JobTrigger) GetTriggers() []*JobTrigger_Trigger {
+	if m != nil {
+		return m.Triggers
+	}
+	return nil
+}
+
+func (m *JobTrigger) GetErrors() []*Error {
+	if m != nil {
+		return m.Errors
+	}
+	return nil
+}
+
+func (m *JobTrigger) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *JobTrigger) GetUpdateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.UpdateTime
+	}
+	return nil
+}
+
+func (m *JobTrigger) GetLastRunTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.LastRunTime
+	}
+	return nil
+}
+
+func (m *JobTrigger) GetStatus() JobTrigger_Status {
+	if m != nil {
+		return m.Status
+	}
+	return JobTrigger_STATUS_UNSPECIFIED
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*JobTrigger) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _JobTrigger_OneofMarshaler, _JobTrigger_OneofUnmarshaler, _JobTrigger_OneofSizer, []interface{}{
+		(*JobTrigger_InspectJob)(nil),
+	}
+}
+
+func _JobTrigger_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*JobTrigger)
+	// job
+	switch x := m.Job.(type) {
+	case *JobTrigger_InspectJob:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InspectJob); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("JobTrigger.Job has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _JobTrigger_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*JobTrigger)
+	switch tag {
+	case 4: // job.inspect_job
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InspectJobConfig)
+		err := b.DecodeMessage(msg)
+		m.Job = &JobTrigger_InspectJob{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _JobTrigger_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*JobTrigger)
+	// job
+	switch x := m.Job.(type) {
+	case *JobTrigger_InspectJob:
+		s := proto.Size(x.InspectJob)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// What event needs to occur for a new job to be started.
+type JobTrigger_Trigger struct {
+	// Types that are valid to be assigned to Trigger:
+	//	*JobTrigger_Trigger_Schedule
+	Trigger              isJobTrigger_Trigger_Trigger `protobuf_oneof:"trigger"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *JobTrigger_Trigger) Reset()         { *m = JobTrigger_Trigger{} }
+func (m *JobTrigger_Trigger) String() string { return proto.CompactTextString(m) }
+func (*JobTrigger_Trigger) ProtoMessage()    {}
+func (*JobTrigger_Trigger) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{66, 0}
+}
+func (m *JobTrigger_Trigger) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_JobTrigger_Trigger.Unmarshal(m, b)
+}
+func (m *JobTrigger_Trigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_JobTrigger_Trigger.Marshal(b, m, deterministic)
+}
+func (dst *JobTrigger_Trigger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_JobTrigger_Trigger.Merge(dst, src)
+}
+func (m *JobTrigger_Trigger) XXX_Size() int {
+	return xxx_messageInfo_JobTrigger_Trigger.Size(m)
+}
+func (m *JobTrigger_Trigger) XXX_DiscardUnknown() {
+	xxx_messageInfo_JobTrigger_Trigger.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_JobTrigger_Trigger proto.InternalMessageInfo
+
+type isJobTrigger_Trigger_Trigger interface {
+	isJobTrigger_Trigger_Trigger()
+}
+
+type JobTrigger_Trigger_Schedule struct {
+	Schedule *Schedule `protobuf:"bytes,1,opt,name=schedule,proto3,oneof"`
+}
+
+func (*JobTrigger_Trigger_Schedule) isJobTrigger_Trigger_Trigger() {}
+
+func (m *JobTrigger_Trigger) GetTrigger() isJobTrigger_Trigger_Trigger {
+	if m != nil {
+		return m.Trigger
+	}
+	return nil
+}
+
+func (m *JobTrigger_Trigger) GetSchedule() *Schedule {
+	if x, ok := m.GetTrigger().(*JobTrigger_Trigger_Schedule); ok {
+		return x.Schedule
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*JobTrigger_Trigger) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _JobTrigger_Trigger_OneofMarshaler, _JobTrigger_Trigger_OneofUnmarshaler, _JobTrigger_Trigger_OneofSizer, []interface{}{
+		(*JobTrigger_Trigger_Schedule)(nil),
+	}
+}
+
+func _JobTrigger_Trigger_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*JobTrigger_Trigger)
+	// trigger
+	switch x := m.Trigger.(type) {
+	case *JobTrigger_Trigger_Schedule:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Schedule); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("JobTrigger_Trigger.Trigger has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _JobTrigger_Trigger_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*JobTrigger_Trigger)
+	switch tag {
+	case 1: // trigger.schedule
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Schedule)
+		err := b.DecodeMessage(msg)
+		m.Trigger = &JobTrigger_Trigger_Schedule{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _JobTrigger_Trigger_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*JobTrigger_Trigger)
+	// trigger
+	switch x := m.Trigger.(type) {
+	case *JobTrigger_Trigger_Schedule:
+		s := proto.Size(x.Schedule)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// A task to execute on the completion of a job.
+// See https://cloud.google.com/dlp/docs/concepts-actions to learn more.
+type Action struct {
+	// Types that are valid to be assigned to Action:
+	//	*Action_SaveFindings_
+	//	*Action_PubSub
+	//	*Action_PublishSummaryToCscc_
+	Action               isAction_Action `protobuf_oneof:"action"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Action) Reset()         { *m = Action{} }
+func (m *Action) String() string { return proto.CompactTextString(m) }
+func (*Action) ProtoMessage()    {}
+func (*Action) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{67}
+}
+func (m *Action) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Action.Unmarshal(m, b)
+}
+func (m *Action) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Action.Marshal(b, m, deterministic)
+}
+func (dst *Action) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action.Merge(dst, src)
+}
+func (m *Action) XXX_Size() int {
+	return xxx_messageInfo_Action.Size(m)
+}
+func (m *Action) XXX_DiscardUnknown() {
+	xxx_messageInfo_Action.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Action proto.InternalMessageInfo
+
+type isAction_Action interface {
+	isAction_Action()
+}
+
+type Action_SaveFindings_ struct {
+	SaveFindings *Action_SaveFindings `protobuf:"bytes,1,opt,name=save_findings,json=saveFindings,proto3,oneof"`
+}
+
+type Action_PubSub struct {
+	PubSub *Action_PublishToPubSub `protobuf:"bytes,2,opt,name=pub_sub,json=pubSub,proto3,oneof"`
+}
+
+type Action_PublishSummaryToCscc_ struct {
+	PublishSummaryToCscc *Action_PublishSummaryToCscc `protobuf:"bytes,3,opt,name=publish_summary_to_cscc,json=publishSummaryToCscc,proto3,oneof"`
+}
+
+func (*Action_SaveFindings_) isAction_Action() {}
+
+func (*Action_PubSub) isAction_Action() {}
+
+func (*Action_PublishSummaryToCscc_) isAction_Action() {}
+
+func (m *Action) GetAction() isAction_Action {
+	if m != nil {
+		return m.Action
+	}
+	return nil
+}
+
+func (m *Action) GetSaveFindings() *Action_SaveFindings {
+	if x, ok := m.GetAction().(*Action_SaveFindings_); ok {
+		return x.SaveFindings
+	}
+	return nil
+}
+
+func (m *Action) GetPubSub() *Action_PublishToPubSub {
+	if x, ok := m.GetAction().(*Action_PubSub); ok {
+		return x.PubSub
+	}
+	return nil
+}
+
+func (m *Action) GetPublishSummaryToCscc() *Action_PublishSummaryToCscc {
+	if x, ok := m.GetAction().(*Action_PublishSummaryToCscc_); ok {
+		return x.PublishSummaryToCscc
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Action) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Action_OneofMarshaler, _Action_OneofUnmarshaler, _Action_OneofSizer, []interface{}{
+		(*Action_SaveFindings_)(nil),
+		(*Action_PubSub)(nil),
+		(*Action_PublishSummaryToCscc_)(nil),
+	}
+}
+
+func _Action_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Action)
+	// action
+	switch x := m.Action.(type) {
+	case *Action_SaveFindings_:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.SaveFindings); err != nil {
+			return err
+		}
+	case *Action_PubSub:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.PubSub); err != nil {
+			return err
+		}
+	case *Action_PublishSummaryToCscc_:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.PublishSummaryToCscc); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Action.Action has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Action_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Action)
+	switch tag {
+	case 1: // action.save_findings
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Action_SaveFindings)
+		err := b.DecodeMessage(msg)
+		m.Action = &Action_SaveFindings_{msg}
+		return true, err
+	case 2: // action.pub_sub
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Action_PublishToPubSub)
+		err := b.DecodeMessage(msg)
+		m.Action = &Action_PubSub{msg}
+		return true, err
+	case 3: // action.publish_summary_to_cscc
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Action_PublishSummaryToCscc)
+		err := b.DecodeMessage(msg)
+		m.Action = &Action_PublishSummaryToCscc_{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Action_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Action)
+	// action
+	switch x := m.Action.(type) {
+	case *Action_SaveFindings_:
+		s := proto.Size(x.SaveFindings)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Action_PubSub:
+		s := proto.Size(x.PubSub)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Action_PublishSummaryToCscc_:
+		s := proto.Size(x.PublishSummaryToCscc)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// If set, the detailed findings will be persisted to the specified
+// OutputStorageConfig. Only a single instance of this action can be
+// specified.
+// Compatible with: Inspect, Risk
+type Action_SaveFindings struct {
+	OutputConfig         *OutputStorageConfig `protobuf:"bytes,1,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Action_SaveFindings) Reset()         { *m = Action_SaveFindings{} }
+func (m *Action_SaveFindings) String() string { return proto.CompactTextString(m) }
+func (*Action_SaveFindings) ProtoMessage()    {}
+func (*Action_SaveFindings) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{67, 0}
+}
+func (m *Action_SaveFindings) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Action_SaveFindings.Unmarshal(m, b)
+}
+func (m *Action_SaveFindings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Action_SaveFindings.Marshal(b, m, deterministic)
+}
+func (dst *Action_SaveFindings) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_SaveFindings.Merge(dst, src)
+}
+func (m *Action_SaveFindings) XXX_Size() int {
+	return xxx_messageInfo_Action_SaveFindings.Size(m)
+}
+func (m *Action_SaveFindings) XXX_DiscardUnknown() {
+	xxx_messageInfo_Action_SaveFindings.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Action_SaveFindings proto.InternalMessageInfo
+
+func (m *Action_SaveFindings) GetOutputConfig() *OutputStorageConfig {
+	if m != nil {
+		return m.OutputConfig
+	}
+	return nil
+}
+
+// Publish the results of a DlpJob to a pub sub channel.
+// Compatible with: Inspect, Risk
+type Action_PublishToPubSub struct {
+	// Cloud Pub/Sub topic to send notifications to. The topic must have given
+	// publishing access rights to the DLP API service account executing
+	// the long running DlpJob sending the notifications.
+	// Format is projects/{project}/topics/{topic}.
+	Topic                string   `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Action_PublishToPubSub) Reset()         { *m = Action_PublishToPubSub{} }
+func (m *Action_PublishToPubSub) String() string { return proto.CompactTextString(m) }
+func (*Action_PublishToPubSub) ProtoMessage()    {}
+func (*Action_PublishToPubSub) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{67, 1}
+}
+func (m *Action_PublishToPubSub) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Action_PublishToPubSub.Unmarshal(m, b)
+}
+func (m *Action_PublishToPubSub) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Action_PublishToPubSub.Marshal(b, m, deterministic)
+}
+func (dst *Action_PublishToPubSub) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_PublishToPubSub.Merge(dst, src)
+}
+func (m *Action_PublishToPubSub) XXX_Size() int {
+	return xxx_messageInfo_Action_PublishToPubSub.Size(m)
+}
+func (m *Action_PublishToPubSub) XXX_DiscardUnknown() {
+	xxx_messageInfo_Action_PublishToPubSub.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Action_PublishToPubSub proto.InternalMessageInfo
+
+func (m *Action_PublishToPubSub) GetTopic() string {
+	if m != nil {
+		return m.Topic
+	}
+	return ""
+}
+
+// Publish the result summary of a DlpJob to the Cloud Security
+// Command Center (CSCC Alpha).
+// This action is only available for projects which are parts of
+// an organization and whitelisted for the alpha Cloud Security Command
+// Center.
+// The action will publish count of finding instances and their info types.
+// The summary of findings will be persisted in CSCC and are governed by CSCC
+// service-specific policy, see https://cloud.google.com/terms/service-terms
+// Only a single instance of this action can be specified.
+// Compatible with: Inspect
+type Action_PublishSummaryToCscc struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Action_PublishSummaryToCscc) Reset()         { *m = Action_PublishSummaryToCscc{} }
+func (m *Action_PublishSummaryToCscc) String() string { return proto.CompactTextString(m) }
+func (*Action_PublishSummaryToCscc) ProtoMessage()    {}
+func (*Action_PublishSummaryToCscc) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{67, 2}
+}
+func (m *Action_PublishSummaryToCscc) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Action_PublishSummaryToCscc.Unmarshal(m, b)
+}
+func (m *Action_PublishSummaryToCscc) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Action_PublishSummaryToCscc.Marshal(b, m, deterministic)
+}
+func (dst *Action_PublishSummaryToCscc) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Action_PublishSummaryToCscc.Merge(dst, src)
+}
+func (m *Action_PublishSummaryToCscc) XXX_Size() int {
+	return xxx_messageInfo_Action_PublishSummaryToCscc.Size(m)
+}
+func (m *Action_PublishSummaryToCscc) XXX_DiscardUnknown() {
+	xxx_messageInfo_Action_PublishSummaryToCscc.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Action_PublishSummaryToCscc proto.InternalMessageInfo
+
+// Request message for CreateInspectTemplate.
+type CreateInspectTemplateRequest struct {
+	// The parent resource name, for example projects/my-project-id or
+	// organizations/my-org-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The InspectTemplate to create.
+	InspectTemplate *InspectTemplate `protobuf:"bytes,2,opt,name=inspect_template,json=inspectTemplate,proto3" json:"inspect_template,omitempty"`
+	// The template id can contain uppercase and lowercase letters,
+	// numbers, and hyphens; that is, it must match the regular
+	// expression: `[a-zA-Z\\d-]+`. The maximum length is 100
+	// characters. Can be empty to allow the system to generate one.
+	TemplateId           string   `protobuf:"bytes,3,opt,name=template_id,json=templateId,proto3" json:"template_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateInspectTemplateRequest) Reset()         { *m = CreateInspectTemplateRequest{} }
+func (m *CreateInspectTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateInspectTemplateRequest) ProtoMessage()    {}
+func (*CreateInspectTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{68}
+}
+func (m *CreateInspectTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateInspectTemplateRequest.Unmarshal(m, b)
+}
+func (m *CreateInspectTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateInspectTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateInspectTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInspectTemplateRequest.Merge(dst, src)
+}
+func (m *CreateInspectTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateInspectTemplateRequest.Size(m)
+}
+func (m *CreateInspectTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateInspectTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateInspectTemplateRequest proto.InternalMessageInfo
+
+func (m *CreateInspectTemplateRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateInspectTemplateRequest) GetInspectTemplate() *InspectTemplate {
+	if m != nil {
+		return m.InspectTemplate
+	}
+	return nil
+}
+
+func (m *CreateInspectTemplateRequest) GetTemplateId() string {
+	if m != nil {
+		return m.TemplateId
+	}
+	return ""
+}
+
+// Request message for UpdateInspectTemplate.
+type UpdateInspectTemplateRequest struct {
+	// Resource name of organization and inspectTemplate to be updated, for
+	// example `organizations/433245324/inspectTemplates/432452342` or
+	// projects/project-id/inspectTemplates/432452342.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// New InspectTemplate value.
+	InspectTemplate *InspectTemplate `protobuf:"bytes,2,opt,name=inspect_template,json=inspectTemplate,proto3" json:"inspect_template,omitempty"`
+	// Mask to control which fields get updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateInspectTemplateRequest) Reset()         { *m = UpdateInspectTemplateRequest{} }
+func (m *UpdateInspectTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateInspectTemplateRequest) ProtoMessage()    {}
+func (*UpdateInspectTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{69}
+}
+func (m *UpdateInspectTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateInspectTemplateRequest.Unmarshal(m, b)
+}
+func (m *UpdateInspectTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateInspectTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateInspectTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInspectTemplateRequest.Merge(dst, src)
+}
+func (m *UpdateInspectTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateInspectTemplateRequest.Size(m)
+}
+func (m *UpdateInspectTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateInspectTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateInspectTemplateRequest proto.InternalMessageInfo
+
+func (m *UpdateInspectTemplateRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *UpdateInspectTemplateRequest) GetInspectTemplate() *InspectTemplate {
+	if m != nil {
+		return m.InspectTemplate
+	}
+	return nil
+}
+
+func (m *UpdateInspectTemplateRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Request message for GetInspectTemplate.
+type GetInspectTemplateRequest struct {
+	// Resource name of the organization and inspectTemplate to be read, for
+	// example `organizations/433245324/inspectTemplates/432452342` or
+	// projects/project-id/inspectTemplates/432452342.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetInspectTemplateRequest) Reset()         { *m = GetInspectTemplateRequest{} }
+func (m *GetInspectTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*GetInspectTemplateRequest) ProtoMessage()    {}
+func (*GetInspectTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{70}
+}
+func (m *GetInspectTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetInspectTemplateRequest.Unmarshal(m, b)
+}
+func (m *GetInspectTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetInspectTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetInspectTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInspectTemplateRequest.Merge(dst, src)
+}
+func (m *GetInspectTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_GetInspectTemplateRequest.Size(m)
+}
+func (m *GetInspectTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetInspectTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetInspectTemplateRequest proto.InternalMessageInfo
+
+func (m *GetInspectTemplateRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for ListInspectTemplates.
+type ListInspectTemplatesRequest struct {
+	// The parent resource name, for example projects/my-project-id or
+	// organizations/my-org-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional page token to continue retrieval. Comes from previous call
+	// to `ListInspectTemplates`.
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// Optional size of the page, can be limited by server. If zero server returns
+	// a page of max size 100.
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInspectTemplatesRequest) Reset()         { *m = ListInspectTemplatesRequest{} }
+func (m *ListInspectTemplatesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListInspectTemplatesRequest) ProtoMessage()    {}
+func (*ListInspectTemplatesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{71}
+}
+func (m *ListInspectTemplatesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInspectTemplatesRequest.Unmarshal(m, b)
+}
+func (m *ListInspectTemplatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInspectTemplatesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListInspectTemplatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInspectTemplatesRequest.Merge(dst, src)
+}
+func (m *ListInspectTemplatesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListInspectTemplatesRequest.Size(m)
+}
+func (m *ListInspectTemplatesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInspectTemplatesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInspectTemplatesRequest proto.InternalMessageInfo
+
+func (m *ListInspectTemplatesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListInspectTemplatesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+func (m *ListInspectTemplatesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+// Response message for ListInspectTemplates.
+type ListInspectTemplatesResponse struct {
+	// List of inspectTemplates, up to page_size in ListInspectTemplatesRequest.
+	InspectTemplates []*InspectTemplate `protobuf:"bytes,1,rep,name=inspect_templates,json=inspectTemplates,proto3" json:"inspect_templates,omitempty"`
+	// If the next page is available then the next page token to be used
+	// in following ListInspectTemplates request.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInspectTemplatesResponse) Reset()         { *m = ListInspectTemplatesResponse{} }
+func (m *ListInspectTemplatesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListInspectTemplatesResponse) ProtoMessage()    {}
+func (*ListInspectTemplatesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{72}
+}
+func (m *ListInspectTemplatesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInspectTemplatesResponse.Unmarshal(m, b)
+}
+func (m *ListInspectTemplatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInspectTemplatesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListInspectTemplatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInspectTemplatesResponse.Merge(dst, src)
+}
+func (m *ListInspectTemplatesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListInspectTemplatesResponse.Size(m)
+}
+func (m *ListInspectTemplatesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInspectTemplatesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInspectTemplatesResponse proto.InternalMessageInfo
+
+func (m *ListInspectTemplatesResponse) GetInspectTemplates() []*InspectTemplate {
+	if m != nil {
+		return m.InspectTemplates
+	}
+	return nil
+}
+
+func (m *ListInspectTemplatesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for DeleteInspectTemplate.
+type DeleteInspectTemplateRequest struct {
+	// Resource name of the organization and inspectTemplate to be deleted, for
+	// example `organizations/433245324/inspectTemplates/432452342` or
+	// projects/project-id/inspectTemplates/432452342.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteInspectTemplateRequest) Reset()         { *m = DeleteInspectTemplateRequest{} }
+func (m *DeleteInspectTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteInspectTemplateRequest) ProtoMessage()    {}
+func (*DeleteInspectTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{73}
+}
+func (m *DeleteInspectTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteInspectTemplateRequest.Unmarshal(m, b)
+}
+func (m *DeleteInspectTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteInspectTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteInspectTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInspectTemplateRequest.Merge(dst, src)
+}
+func (m *DeleteInspectTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteInspectTemplateRequest.Size(m)
+}
+func (m *DeleteInspectTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteInspectTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteInspectTemplateRequest proto.InternalMessageInfo
+
+func (m *DeleteInspectTemplateRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for CreateJobTrigger.
+type CreateJobTriggerRequest struct {
+	// The parent resource name, for example projects/my-project-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The JobTrigger to create.
+	JobTrigger *JobTrigger `protobuf:"bytes,2,opt,name=job_trigger,json=jobTrigger,proto3" json:"job_trigger,omitempty"`
+	// The trigger id can contain uppercase and lowercase letters,
+	// numbers, and hyphens; that is, it must match the regular
+	// expression: `[a-zA-Z\\d-]+`. The maximum length is 100
+	// characters. Can be empty to allow the system to generate one.
+	TriggerId            string   `protobuf:"bytes,3,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateJobTriggerRequest) Reset()         { *m = CreateJobTriggerRequest{} }
+func (m *CreateJobTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateJobTriggerRequest) ProtoMessage()    {}
+func (*CreateJobTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{74}
+}
+func (m *CreateJobTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateJobTriggerRequest.Unmarshal(m, b)
+}
+func (m *CreateJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateJobTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateJobTriggerRequest.Merge(dst, src)
+}
+func (m *CreateJobTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateJobTriggerRequest.Size(m)
+}
+func (m *CreateJobTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateJobTriggerRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateJobTriggerRequest proto.InternalMessageInfo
+
+func (m *CreateJobTriggerRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateJobTriggerRequest) GetJobTrigger() *JobTrigger {
+	if m != nil {
+		return m.JobTrigger
+	}
+	return nil
+}
+
+func (m *CreateJobTriggerRequest) GetTriggerId() string {
+	if m != nil {
+		return m.TriggerId
+	}
+	return ""
+}
+
+// Request message for UpdateJobTrigger.
+type UpdateJobTriggerRequest struct {
+	// Resource name of the project and the triggeredJob, for example
+	// `projects/dlp-test-project/jobTriggers/53234423`.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// New JobTrigger value.
+	JobTrigger *JobTrigger `protobuf:"bytes,2,opt,name=job_trigger,json=jobTrigger,proto3" json:"job_trigger,omitempty"`
+	// Mask to control which fields get updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateJobTriggerRequest) Reset()         { *m = UpdateJobTriggerRequest{} }
+func (m *UpdateJobTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateJobTriggerRequest) ProtoMessage()    {}
+func (*UpdateJobTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{75}
+}
+func (m *UpdateJobTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateJobTriggerRequest.Unmarshal(m, b)
+}
+func (m *UpdateJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateJobTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateJobTriggerRequest.Merge(dst, src)
+}
+func (m *UpdateJobTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateJobTriggerRequest.Size(m)
+}
+func (m *UpdateJobTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateJobTriggerRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateJobTriggerRequest proto.InternalMessageInfo
+
+func (m *UpdateJobTriggerRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *UpdateJobTriggerRequest) GetJobTrigger() *JobTrigger {
+	if m != nil {
+		return m.JobTrigger
+	}
+	return nil
+}
+
+func (m *UpdateJobTriggerRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Request message for GetJobTrigger.
+type GetJobTriggerRequest struct {
+	// Resource name of the project and the triggeredJob, for example
+	// `projects/dlp-test-project/jobTriggers/53234423`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetJobTriggerRequest) Reset()         { *m = GetJobTriggerRequest{} }
+func (m *GetJobTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*GetJobTriggerRequest) ProtoMessage()    {}
+func (*GetJobTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{76}
+}
+func (m *GetJobTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetJobTriggerRequest.Unmarshal(m, b)
+}
+func (m *GetJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetJobTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetJobTriggerRequest.Merge(dst, src)
+}
+func (m *GetJobTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_GetJobTriggerRequest.Size(m)
+}
+func (m *GetJobTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetJobTriggerRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetJobTriggerRequest proto.InternalMessageInfo
+
+func (m *GetJobTriggerRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for CreateDlpJobRequest. Used to initiate long running
+// jobs such as calculating risk metrics or inspecting Google Cloud
+// Storage.
+type CreateDlpJobRequest struct {
+	// The parent resource name, for example projects/my-project-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The configuration details for the specific type of job to run.
+	//
+	// Types that are valid to be assigned to Job:
+	//	*CreateDlpJobRequest_InspectJob
+	//	*CreateDlpJobRequest_RiskJob
+	Job isCreateDlpJobRequest_Job `protobuf_oneof:"job"`
+	// The job id can contain uppercase and lowercase letters,
+	// numbers, and hyphens; that is, it must match the regular
+	// expression: `[a-zA-Z\\d-]+`. The maximum length is 100
+	// characters. Can be empty to allow the system to generate one.
+	JobId                string   `protobuf:"bytes,4,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateDlpJobRequest) Reset()         { *m = CreateDlpJobRequest{} }
+func (m *CreateDlpJobRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDlpJobRequest) ProtoMessage()    {}
+func (*CreateDlpJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{77}
+}
+func (m *CreateDlpJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDlpJobRequest.Unmarshal(m, b)
+}
+func (m *CreateDlpJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDlpJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDlpJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDlpJobRequest.Merge(dst, src)
+}
+func (m *CreateDlpJobRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDlpJobRequest.Size(m)
+}
+func (m *CreateDlpJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDlpJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateDlpJobRequest proto.InternalMessageInfo
+
+func (m *CreateDlpJobRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+type isCreateDlpJobRequest_Job interface {
+	isCreateDlpJobRequest_Job()
+}
+
+type CreateDlpJobRequest_InspectJob struct {
+	InspectJob *InspectJobConfig `protobuf:"bytes,2,opt,name=inspect_job,json=inspectJob,proto3,oneof"`
+}
+
+type CreateDlpJobRequest_RiskJob struct {
+	RiskJob *RiskAnalysisJobConfig `protobuf:"bytes,3,opt,name=risk_job,json=riskJob,proto3,oneof"`
+}
+
+func (*CreateDlpJobRequest_InspectJob) isCreateDlpJobRequest_Job() {}
+
+func (*CreateDlpJobRequest_RiskJob) isCreateDlpJobRequest_Job() {}
+
+func (m *CreateDlpJobRequest) GetJob() isCreateDlpJobRequest_Job {
+	if m != nil {
+		return m.Job
+	}
+	return nil
+}
+
+func (m *CreateDlpJobRequest) GetInspectJob() *InspectJobConfig {
+	if x, ok := m.GetJob().(*CreateDlpJobRequest_InspectJob); ok {
+		return x.InspectJob
+	}
+	return nil
+}
+
+func (m *CreateDlpJobRequest) GetRiskJob() *RiskAnalysisJobConfig {
+	if x, ok := m.GetJob().(*CreateDlpJobRequest_RiskJob); ok {
+		return x.RiskJob
+	}
+	return nil
+}
+
+func (m *CreateDlpJobRequest) GetJobId() string {
+	if m != nil {
+		return m.JobId
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CreateDlpJobRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CreateDlpJobRequest_OneofMarshaler, _CreateDlpJobRequest_OneofUnmarshaler, _CreateDlpJobRequest_OneofSizer, []interface{}{
+		(*CreateDlpJobRequest_InspectJob)(nil),
+		(*CreateDlpJobRequest_RiskJob)(nil),
+	}
+}
+
+func _CreateDlpJobRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CreateDlpJobRequest)
+	// job
+	switch x := m.Job.(type) {
+	case *CreateDlpJobRequest_InspectJob:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InspectJob); err != nil {
+			return err
+		}
+	case *CreateDlpJobRequest_RiskJob:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.RiskJob); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("CreateDlpJobRequest.Job has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CreateDlpJobRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CreateDlpJobRequest)
+	switch tag {
+	case 2: // job.inspect_job
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InspectJobConfig)
+		err := b.DecodeMessage(msg)
+		m.Job = &CreateDlpJobRequest_InspectJob{msg}
+		return true, err
+	case 3: // job.risk_job
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(RiskAnalysisJobConfig)
+		err := b.DecodeMessage(msg)
+		m.Job = &CreateDlpJobRequest_RiskJob{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CreateDlpJobRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CreateDlpJobRequest)
+	// job
+	switch x := m.Job.(type) {
+	case *CreateDlpJobRequest_InspectJob:
+		s := proto.Size(x.InspectJob)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CreateDlpJobRequest_RiskJob:
+		s := proto.Size(x.RiskJob)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Request message for ListJobTriggers.
+type ListJobTriggersRequest struct {
+	// The parent resource name, for example `projects/my-project-id`.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional page token to continue retrieval. Comes from previous call
+	// to ListJobTriggers. `order_by` field must not
+	// change for subsequent calls.
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// Optional size of the page, can be limited by a server.
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Optional comma separated list of triggeredJob fields to order by,
+	// followed by `asc` or `desc` postfix. This list is case-insensitive,
+	// default sorting order is ascending, redundant space characters are
+	// insignificant.
+	//
+	// Example: `name asc,update_time, create_time desc`
+	//
+	// Supported fields are:
+	//
+	// - `create_time`: corresponds to time the triggeredJob was created.
+	// - `update_time`: corresponds to time the triggeredJob was last updated.
+	// - `name`: corresponds to JobTrigger's name.
+	OrderBy              string   `protobuf:"bytes,4,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListJobTriggersRequest) Reset()         { *m = ListJobTriggersRequest{} }
+func (m *ListJobTriggersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListJobTriggersRequest) ProtoMessage()    {}
+func (*ListJobTriggersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{78}
+}
+func (m *ListJobTriggersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListJobTriggersRequest.Unmarshal(m, b)
+}
+func (m *ListJobTriggersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListJobTriggersRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListJobTriggersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobTriggersRequest.Merge(dst, src)
+}
+func (m *ListJobTriggersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListJobTriggersRequest.Size(m)
+}
+func (m *ListJobTriggersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListJobTriggersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListJobTriggersRequest proto.InternalMessageInfo
+
+func (m *ListJobTriggersRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListJobTriggersRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+func (m *ListJobTriggersRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListJobTriggersRequest) GetOrderBy() string {
+	if m != nil {
+		return m.OrderBy
+	}
+	return ""
+}
+
+// Response message for ListJobTriggers.
+type ListJobTriggersResponse struct {
+	// List of triggeredJobs, up to page_size in ListJobTriggersRequest.
+	JobTriggers []*JobTrigger `protobuf:"bytes,1,rep,name=job_triggers,json=jobTriggers,proto3" json:"job_triggers,omitempty"`
+	// If the next page is available then the next page token to be used
+	// in following ListJobTriggers request.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListJobTriggersResponse) Reset()         { *m = ListJobTriggersResponse{} }
+func (m *ListJobTriggersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListJobTriggersResponse) ProtoMessage()    {}
+func (*ListJobTriggersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{79}
+}
+func (m *ListJobTriggersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListJobTriggersResponse.Unmarshal(m, b)
+}
+func (m *ListJobTriggersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListJobTriggersResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListJobTriggersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListJobTriggersResponse.Merge(dst, src)
+}
+func (m *ListJobTriggersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListJobTriggersResponse.Size(m)
+}
+func (m *ListJobTriggersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListJobTriggersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListJobTriggersResponse proto.InternalMessageInfo
+
+func (m *ListJobTriggersResponse) GetJobTriggers() []*JobTrigger {
+	if m != nil {
+		return m.JobTriggers
+	}
+	return nil
+}
+
+func (m *ListJobTriggersResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for DeleteJobTrigger.
+type DeleteJobTriggerRequest struct {
+	// Resource name of the project and the triggeredJob, for example
+	// `projects/dlp-test-project/jobTriggers/53234423`.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteJobTriggerRequest) Reset()         { *m = DeleteJobTriggerRequest{} }
+func (m *DeleteJobTriggerRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteJobTriggerRequest) ProtoMessage()    {}
+func (*DeleteJobTriggerRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{80}
+}
+func (m *DeleteJobTriggerRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteJobTriggerRequest.Unmarshal(m, b)
+}
+func (m *DeleteJobTriggerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteJobTriggerRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteJobTriggerRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteJobTriggerRequest.Merge(dst, src)
+}
+func (m *DeleteJobTriggerRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteJobTriggerRequest.Size(m)
+}
+func (m *DeleteJobTriggerRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteJobTriggerRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteJobTriggerRequest proto.InternalMessageInfo
+
+func (m *DeleteJobTriggerRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+type InspectJobConfig struct {
+	// The data to scan.
+	StorageConfig *StorageConfig `protobuf:"bytes,1,opt,name=storage_config,json=storageConfig,proto3" json:"storage_config,omitempty"`
+	// How and what to scan for.
+	InspectConfig *InspectConfig `protobuf:"bytes,2,opt,name=inspect_config,json=inspectConfig,proto3" json:"inspect_config,omitempty"`
+	// If provided, will be used as the default for all values in InspectConfig.
+	// `inspect_config` will be merged into the values persisted as part of the
+	// template.
+	InspectTemplateName string `protobuf:"bytes,3,opt,name=inspect_template_name,json=inspectTemplateName,proto3" json:"inspect_template_name,omitempty"`
+	// Actions to execute at the completion of the job. Are executed in the order
+	// provided.
+	Actions              []*Action `protobuf:"bytes,4,rep,name=actions,proto3" json:"actions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *InspectJobConfig) Reset()         { *m = InspectJobConfig{} }
+func (m *InspectJobConfig) String() string { return proto.CompactTextString(m) }
+func (*InspectJobConfig) ProtoMessage()    {}
+func (*InspectJobConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{81}
+}
+func (m *InspectJobConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InspectJobConfig.Unmarshal(m, b)
+}
+func (m *InspectJobConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InspectJobConfig.Marshal(b, m, deterministic)
+}
+func (dst *InspectJobConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InspectJobConfig.Merge(dst, src)
+}
+func (m *InspectJobConfig) XXX_Size() int {
+	return xxx_messageInfo_InspectJobConfig.Size(m)
+}
+func (m *InspectJobConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InspectJobConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InspectJobConfig proto.InternalMessageInfo
+
+func (m *InspectJobConfig) GetStorageConfig() *StorageConfig {
+	if m != nil {
+		return m.StorageConfig
+	}
+	return nil
+}
+
+func (m *InspectJobConfig) GetInspectConfig() *InspectConfig {
+	if m != nil {
+		return m.InspectConfig
+	}
+	return nil
+}
+
+func (m *InspectJobConfig) GetInspectTemplateName() string {
+	if m != nil {
+		return m.InspectTemplateName
+	}
+	return ""
+}
+
+func (m *InspectJobConfig) GetActions() []*Action {
+	if m != nil {
+		return m.Actions
+	}
+	return nil
+}
+
+// Combines all of the information about a DLP job.
+type DlpJob struct {
+	// The server-assigned name.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The type of job.
+	Type DlpJobType `protobuf:"varint,2,opt,name=type,proto3,enum=google.privacy.dlp.v2.DlpJobType" json:"type,omitempty"`
+	// State of a job.
+	State DlpJob_JobState `protobuf:"varint,3,opt,name=state,proto3,enum=google.privacy.dlp.v2.DlpJob_JobState" json:"state,omitempty"`
+	// Types that are valid to be assigned to Details:
+	//	*DlpJob_RiskDetails
+	//	*DlpJob_InspectDetails
+	Details isDlpJob_Details `protobuf_oneof:"details"`
+	// Time when the job was created.
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	// Time when the job started.
+	StartTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// Time when the job finished.
+	EndTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	// If created by a job trigger, the resource name of the trigger that
+	// instantiated the job.
+	JobTriggerName string `protobuf:"bytes,10,opt,name=job_trigger_name,json=jobTriggerName,proto3" json:"job_trigger_name,omitempty"`
+	// A stream of errors encountered running the job.
+	Errors               []*Error `protobuf:"bytes,11,rep,name=errors,proto3" json:"errors,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DlpJob) Reset()         { *m = DlpJob{} }
+func (m *DlpJob) String() string { return proto.CompactTextString(m) }
+func (*DlpJob) ProtoMessage()    {}
+func (*DlpJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{82}
+}
+func (m *DlpJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DlpJob.Unmarshal(m, b)
+}
+func (m *DlpJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DlpJob.Marshal(b, m, deterministic)
+}
+func (dst *DlpJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DlpJob.Merge(dst, src)
+}
+func (m *DlpJob) XXX_Size() int {
+	return xxx_messageInfo_DlpJob.Size(m)
+}
+func (m *DlpJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_DlpJob.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DlpJob proto.InternalMessageInfo
+
+func (m *DlpJob) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *DlpJob) GetType() DlpJobType {
+	if m != nil {
+		return m.Type
+	}
+	return DlpJobType_DLP_JOB_TYPE_UNSPECIFIED
+}
+
+func (m *DlpJob) GetState() DlpJob_JobState {
+	if m != nil {
+		return m.State
+	}
+	return DlpJob_JOB_STATE_UNSPECIFIED
+}
+
+type isDlpJob_Details interface {
+	isDlpJob_Details()
+}
+
+type DlpJob_RiskDetails struct {
+	RiskDetails *AnalyzeDataSourceRiskDetails `protobuf:"bytes,4,opt,name=risk_details,json=riskDetails,proto3,oneof"`
+}
+
+type DlpJob_InspectDetails struct {
+	InspectDetails *InspectDataSourceDetails `protobuf:"bytes,5,opt,name=inspect_details,json=inspectDetails,proto3,oneof"`
+}
+
+func (*DlpJob_RiskDetails) isDlpJob_Details() {}
+
+func (*DlpJob_InspectDetails) isDlpJob_Details() {}
+
+func (m *DlpJob) GetDetails() isDlpJob_Details {
+	if m != nil {
+		return m.Details
+	}
+	return nil
+}
+
+func (m *DlpJob) GetRiskDetails() *AnalyzeDataSourceRiskDetails {
+	if x, ok := m.GetDetails().(*DlpJob_RiskDetails); ok {
+		return x.RiskDetails
+	}
+	return nil
+}
+
+func (m *DlpJob) GetInspectDetails() *InspectDataSourceDetails {
+	if x, ok := m.GetDetails().(*DlpJob_InspectDetails); ok {
+		return x.InspectDetails
+	}
+	return nil
+}
+
+func (m *DlpJob) GetCreateTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreateTime
+	}
+	return nil
+}
+
+func (m *DlpJob) GetStartTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.StartTime
+	}
+	return nil
+}
+
+func (m *DlpJob) GetEndTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.EndTime
+	}
+	return nil
+}
+
+func (m *DlpJob) GetJobTriggerName() string {
+	if m != nil {
+		return m.JobTriggerName
+	}
+	return ""
+}
+
+func (m *DlpJob) GetErrors() []*Error {
+	if m != nil {
+		return m.Errors
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*DlpJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _DlpJob_OneofMarshaler, _DlpJob_OneofUnmarshaler, _DlpJob_OneofSizer, []interface{}{
+		(*DlpJob_RiskDetails)(nil),
+		(*DlpJob_InspectDetails)(nil),
+	}
+}
+
+func _DlpJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*DlpJob)
+	// details
+	switch x := m.Details.(type) {
+	case *DlpJob_RiskDetails:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.RiskDetails); err != nil {
+			return err
+		}
+	case *DlpJob_InspectDetails:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InspectDetails); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("DlpJob.Details has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _DlpJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*DlpJob)
+	switch tag {
+	case 4: // details.risk_details
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(AnalyzeDataSourceRiskDetails)
+		err := b.DecodeMessage(msg)
+		m.Details = &DlpJob_RiskDetails{msg}
+		return true, err
+	case 5: // details.inspect_details
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InspectDataSourceDetails)
+		err := b.DecodeMessage(msg)
+		m.Details = &DlpJob_InspectDetails{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _DlpJob_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*DlpJob)
+	// details
+	switch x := m.Details.(type) {
+	case *DlpJob_RiskDetails:
+		s := proto.Size(x.RiskDetails)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *DlpJob_InspectDetails:
+		s := proto.Size(x.InspectDetails)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The request message for [DlpJobs.GetDlpJob][].
+type GetDlpJobRequest struct {
+	// The name of the DlpJob resource.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetDlpJobRequest) Reset()         { *m = GetDlpJobRequest{} }
+func (m *GetDlpJobRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDlpJobRequest) ProtoMessage()    {}
+func (*GetDlpJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{83}
+}
+func (m *GetDlpJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDlpJobRequest.Unmarshal(m, b)
+}
+func (m *GetDlpJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDlpJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDlpJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDlpJobRequest.Merge(dst, src)
+}
+func (m *GetDlpJobRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDlpJobRequest.Size(m)
+}
+func (m *GetDlpJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDlpJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDlpJobRequest proto.InternalMessageInfo
+
+func (m *GetDlpJobRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The request message for listing DLP jobs.
+type ListDlpJobsRequest struct {
+	// The parent resource name, for example projects/my-project-id.
+	Parent string `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional. Allows filtering.
+	//
+	// Supported syntax:
+	//
+	// * Filter expressions are made up of one or more restrictions.
+	// * Restrictions can be combined by `AND` or `OR` logical operators. A
+	// sequence of restrictions implicitly uses `AND`.
+	// * A restriction has the form of `<field> <operator> <value>`.
+	// * Supported fields/values for inspect jobs:
+	//     - `state` - PENDING|RUNNING|CANCELED|FINISHED|FAILED
+	//     - `inspected_storage` - DATASTORE|CLOUD_STORAGE|BIGQUERY
+	//     - `trigger_name` - The resource name of the trigger that created job.
+	// * Supported fields for risk analysis jobs:
+	//     - `state` - RUNNING|CANCELED|FINISHED|FAILED
+	// * The operator must be `=` or `!=`.
+	//
+	// Examples:
+	//
+	// * inspected_storage = cloud_storage AND state = done
+	// * inspected_storage = cloud_storage OR inspected_storage = bigquery
+	// * inspected_storage = cloud_storage AND (state = done OR state = canceled)
+	//
+	// The length of this field should be no more than 500 characters.
+	Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
+	// The standard list page size.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// The standard list page token.
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// The type of job. Defaults to `DlpJobType.INSPECT`
+	Type                 DlpJobType `protobuf:"varint,5,opt,name=type,proto3,enum=google.privacy.dlp.v2.DlpJobType" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *ListDlpJobsRequest) Reset()         { *m = ListDlpJobsRequest{} }
+func (m *ListDlpJobsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDlpJobsRequest) ProtoMessage()    {}
+func (*ListDlpJobsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{84}
+}
+func (m *ListDlpJobsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDlpJobsRequest.Unmarshal(m, b)
+}
+func (m *ListDlpJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDlpJobsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDlpJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDlpJobsRequest.Merge(dst, src)
+}
+func (m *ListDlpJobsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDlpJobsRequest.Size(m)
+}
+func (m *ListDlpJobsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDlpJobsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDlpJobsRequest proto.InternalMessageInfo
+
+func (m *ListDlpJobsRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListDlpJobsRequest) GetFilter() string {
+	if m != nil {
+		return m.Filter
+	}
+	return ""
+}
+
+func (m *ListDlpJobsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListDlpJobsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+func (m *ListDlpJobsRequest) GetType() DlpJobType {
+	if m != nil {
+		return m.Type
+	}
+	return DlpJobType_DLP_JOB_TYPE_UNSPECIFIED
+}
+
+// The response message for listing DLP jobs.
+type ListDlpJobsResponse struct {
+	// A list of DlpJobs that matches the specified filter in the request.
+	Jobs []*DlpJob `protobuf:"bytes,1,rep,name=jobs,proto3" json:"jobs,omitempty"`
+	// The standard List next-page token.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDlpJobsResponse) Reset()         { *m = ListDlpJobsResponse{} }
+func (m *ListDlpJobsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDlpJobsResponse) ProtoMessage()    {}
+func (*ListDlpJobsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{85}
+}
+func (m *ListDlpJobsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDlpJobsResponse.Unmarshal(m, b)
+}
+func (m *ListDlpJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDlpJobsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDlpJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDlpJobsResponse.Merge(dst, src)
+}
+func (m *ListDlpJobsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDlpJobsResponse.Size(m)
+}
+func (m *ListDlpJobsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDlpJobsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDlpJobsResponse proto.InternalMessageInfo
+
+func (m *ListDlpJobsResponse) GetJobs() []*DlpJob {
+	if m != nil {
+		return m.Jobs
+	}
+	return nil
+}
+
+func (m *ListDlpJobsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// The request message for canceling a DLP job.
+type CancelDlpJobRequest struct {
+	// The name of the DlpJob resource to be cancelled.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CancelDlpJobRequest) Reset()         { *m = CancelDlpJobRequest{} }
+func (m *CancelDlpJobRequest) String() string { return proto.CompactTextString(m) }
+func (*CancelDlpJobRequest) ProtoMessage()    {}
+func (*CancelDlpJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{86}
+}
+func (m *CancelDlpJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CancelDlpJobRequest.Unmarshal(m, b)
+}
+func (m *CancelDlpJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CancelDlpJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *CancelDlpJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CancelDlpJobRequest.Merge(dst, src)
+}
+func (m *CancelDlpJobRequest) XXX_Size() int {
+	return xxx_messageInfo_CancelDlpJobRequest.Size(m)
+}
+func (m *CancelDlpJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CancelDlpJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CancelDlpJobRequest proto.InternalMessageInfo
+
+func (m *CancelDlpJobRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// The request message for deleting a DLP job.
+type DeleteDlpJobRequest struct {
+	// The name of the DlpJob resource to be deleted.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteDlpJobRequest) Reset()         { *m = DeleteDlpJobRequest{} }
+func (m *DeleteDlpJobRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteDlpJobRequest) ProtoMessage()    {}
+func (*DeleteDlpJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{87}
+}
+func (m *DeleteDlpJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteDlpJobRequest.Unmarshal(m, b)
+}
+func (m *DeleteDlpJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteDlpJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteDlpJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDlpJobRequest.Merge(dst, src)
+}
+func (m *DeleteDlpJobRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteDlpJobRequest.Size(m)
+}
+func (m *DeleteDlpJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteDlpJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteDlpJobRequest proto.InternalMessageInfo
+
+func (m *DeleteDlpJobRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for CreateDeidentifyTemplate.
+type CreateDeidentifyTemplateRequest struct {
+	// The parent resource name, for example projects/my-project-id or
+	// organizations/my-org-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// The DeidentifyTemplate to create.
+	DeidentifyTemplate *DeidentifyTemplate `protobuf:"bytes,2,opt,name=deidentify_template,json=deidentifyTemplate,proto3" json:"deidentify_template,omitempty"`
+	// The template id can contain uppercase and lowercase letters,
+	// numbers, and hyphens; that is, it must match the regular
+	// expression: `[a-zA-Z\\d-]+`. The maximum length is 100
+	// characters. Can be empty to allow the system to generate one.
+	TemplateId           string   `protobuf:"bytes,3,opt,name=template_id,json=templateId,proto3" json:"template_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateDeidentifyTemplateRequest) Reset()         { *m = CreateDeidentifyTemplateRequest{} }
+func (m *CreateDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDeidentifyTemplateRequest) ProtoMessage()    {}
+func (*CreateDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{88}
+}
+func (m *CreateDeidentifyTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDeidentifyTemplateRequest.Unmarshal(m, b)
+}
+func (m *CreateDeidentifyTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDeidentifyTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDeidentifyTemplateRequest.Merge(dst, src)
+}
+func (m *CreateDeidentifyTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDeidentifyTemplateRequest.Size(m)
+}
+func (m *CreateDeidentifyTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDeidentifyTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateDeidentifyTemplateRequest proto.InternalMessageInfo
+
+func (m *CreateDeidentifyTemplateRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *CreateDeidentifyTemplateRequest) GetDeidentifyTemplate() *DeidentifyTemplate {
+	if m != nil {
+		return m.DeidentifyTemplate
+	}
+	return nil
+}
+
+func (m *CreateDeidentifyTemplateRequest) GetTemplateId() string {
+	if m != nil {
+		return m.TemplateId
+	}
+	return ""
+}
+
+// Request message for UpdateDeidentifyTemplate.
+type UpdateDeidentifyTemplateRequest struct {
+	// Resource name of organization and deidentify template to be updated, for
+	// example `organizations/433245324/deidentifyTemplates/432452342` or
+	// projects/project-id/deidentifyTemplates/432452342.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// New DeidentifyTemplate value.
+	DeidentifyTemplate *DeidentifyTemplate `protobuf:"bytes,2,opt,name=deidentify_template,json=deidentifyTemplate,proto3" json:"deidentify_template,omitempty"`
+	// Mask to control which fields get updated.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateDeidentifyTemplateRequest) Reset()         { *m = UpdateDeidentifyTemplateRequest{} }
+func (m *UpdateDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateDeidentifyTemplateRequest) ProtoMessage()    {}
+func (*UpdateDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{89}
+}
+func (m *UpdateDeidentifyTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateDeidentifyTemplateRequest.Unmarshal(m, b)
+}
+func (m *UpdateDeidentifyTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateDeidentifyTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDeidentifyTemplateRequest.Merge(dst, src)
+}
+func (m *UpdateDeidentifyTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateDeidentifyTemplateRequest.Size(m)
+}
+func (m *UpdateDeidentifyTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateDeidentifyTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateDeidentifyTemplateRequest proto.InternalMessageInfo
+
+func (m *UpdateDeidentifyTemplateRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *UpdateDeidentifyTemplateRequest) GetDeidentifyTemplate() *DeidentifyTemplate {
+	if m != nil {
+		return m.DeidentifyTemplate
+	}
+	return nil
+}
+
+func (m *UpdateDeidentifyTemplateRequest) GetUpdateMask() *field_mask.FieldMask {
+	if m != nil {
+		return m.UpdateMask
+	}
+	return nil
+}
+
+// Request message for GetDeidentifyTemplate.
+type GetDeidentifyTemplateRequest struct {
+	// Resource name of the organization and deidentify template to be read, for
+	// example `organizations/433245324/deidentifyTemplates/432452342` or
+	// projects/project-id/deidentifyTemplates/432452342.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetDeidentifyTemplateRequest) Reset()         { *m = GetDeidentifyTemplateRequest{} }
+func (m *GetDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDeidentifyTemplateRequest) ProtoMessage()    {}
+func (*GetDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{90}
+}
+func (m *GetDeidentifyTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDeidentifyTemplateRequest.Unmarshal(m, b)
+}
+func (m *GetDeidentifyTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDeidentifyTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDeidentifyTemplateRequest.Merge(dst, src)
+}
+func (m *GetDeidentifyTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDeidentifyTemplateRequest.Size(m)
+}
+func (m *GetDeidentifyTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDeidentifyTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDeidentifyTemplateRequest proto.InternalMessageInfo
+
+func (m *GetDeidentifyTemplateRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Request message for ListDeidentifyTemplates.
+type ListDeidentifyTemplatesRequest struct {
+	// The parent resource name, for example projects/my-project-id or
+	// organizations/my-org-id.
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	// Optional page token to continue retrieval. Comes from previous call
+	// to `ListDeidentifyTemplates`.
+	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	// Optional size of the page, can be limited by server. If zero server returns
+	// a page of max size 100.
+	PageSize             int32    `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDeidentifyTemplatesRequest) Reset()         { *m = ListDeidentifyTemplatesRequest{} }
+func (m *ListDeidentifyTemplatesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDeidentifyTemplatesRequest) ProtoMessage()    {}
+func (*ListDeidentifyTemplatesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{91}
+}
+func (m *ListDeidentifyTemplatesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDeidentifyTemplatesRequest.Unmarshal(m, b)
+}
+func (m *ListDeidentifyTemplatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDeidentifyTemplatesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDeidentifyTemplatesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeidentifyTemplatesRequest.Merge(dst, src)
+}
+func (m *ListDeidentifyTemplatesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDeidentifyTemplatesRequest.Size(m)
+}
+func (m *ListDeidentifyTemplatesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDeidentifyTemplatesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDeidentifyTemplatesRequest proto.InternalMessageInfo
+
+func (m *ListDeidentifyTemplatesRequest) GetParent() string {
+	if m != nil {
+		return m.Parent
+	}
+	return ""
+}
+
+func (m *ListDeidentifyTemplatesRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+func (m *ListDeidentifyTemplatesRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+// Response message for ListDeidentifyTemplates.
+type ListDeidentifyTemplatesResponse struct {
+	// List of deidentify templates, up to page_size in
+	// ListDeidentifyTemplatesRequest.
+	DeidentifyTemplates []*DeidentifyTemplate `protobuf:"bytes,1,rep,name=deidentify_templates,json=deidentifyTemplates,proto3" json:"deidentify_templates,omitempty"`
+	// If the next page is available then the next page token to be used
+	// in following ListDeidentifyTemplates request.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListDeidentifyTemplatesResponse) Reset()         { *m = ListDeidentifyTemplatesResponse{} }
+func (m *ListDeidentifyTemplatesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDeidentifyTemplatesResponse) ProtoMessage()    {}
+func (*ListDeidentifyTemplatesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{92}
+}
+func (m *ListDeidentifyTemplatesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDeidentifyTemplatesResponse.Unmarshal(m, b)
+}
+func (m *ListDeidentifyTemplatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDeidentifyTemplatesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDeidentifyTemplatesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDeidentifyTemplatesResponse.Merge(dst, src)
+}
+func (m *ListDeidentifyTemplatesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDeidentifyTemplatesResponse.Size(m)
+}
+func (m *ListDeidentifyTemplatesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDeidentifyTemplatesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDeidentifyTemplatesResponse proto.InternalMessageInfo
+
+func (m *ListDeidentifyTemplatesResponse) GetDeidentifyTemplates() []*DeidentifyTemplate {
+	if m != nil {
+		return m.DeidentifyTemplates
+	}
+	return nil
+}
+
+func (m *ListDeidentifyTemplatesResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
+// Request message for DeleteDeidentifyTemplate.
+type DeleteDeidentifyTemplateRequest struct {
+	// Resource name of the organization and deidentify template to be deleted,
+	// for example `organizations/433245324/deidentifyTemplates/432452342` or
+	// projects/project-id/deidentifyTemplates/432452342.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteDeidentifyTemplateRequest) Reset()         { *m = DeleteDeidentifyTemplateRequest{} }
+func (m *DeleteDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteDeidentifyTemplateRequest) ProtoMessage()    {}
+func (*DeleteDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_dlp_e1ef6d5c60cd7b39, []int{93}
+}
+func (m *DeleteDeidentifyTemplateRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteDeidentifyTemplateRequest.Unmarshal(m, b)
+}
+func (m *DeleteDeidentifyTemplateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteDeidentifyTemplateRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteDeidentifyTemplateRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteDeidentifyTemplateRequest.Merge(dst, src)
+}
+func (m *DeleteDeidentifyTemplateRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteDeidentifyTemplateRequest.Size(m)
+}
+func (m *DeleteDeidentifyTemplateRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteDeidentifyTemplateRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteDeidentifyTemplateRequest proto.InternalMessageInfo
+
+func (m *DeleteDeidentifyTemplateRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*InspectConfig)(nil), "google.privacy.dlp.v2.InspectConfig")
+	proto.RegisterType((*InspectConfig_FindingLimits)(nil), "google.privacy.dlp.v2.InspectConfig.FindingLimits")
+	proto.RegisterType((*InspectConfig_FindingLimits_InfoTypeLimit)(nil), "google.privacy.dlp.v2.InspectConfig.FindingLimits.InfoTypeLimit")
+	proto.RegisterType((*ByteContentItem)(nil), "google.privacy.dlp.v2.ByteContentItem")
+	proto.RegisterType((*ContentItem)(nil), "google.privacy.dlp.v2.ContentItem")
+	proto.RegisterType((*Table)(nil), "google.privacy.dlp.v2.Table")
+	proto.RegisterType((*Table_Row)(nil), "google.privacy.dlp.v2.Table.Row")
+	proto.RegisterType((*InspectResult)(nil), "google.privacy.dlp.v2.InspectResult")
+	proto.RegisterType((*Finding)(nil), "google.privacy.dlp.v2.Finding")
+	proto.RegisterType((*Location)(nil), "google.privacy.dlp.v2.Location")
+	proto.RegisterType((*ContentLocation)(nil), "google.privacy.dlp.v2.ContentLocation")
+	proto.RegisterType((*DocumentLocation)(nil), "google.privacy.dlp.v2.DocumentLocation")
+	proto.RegisterType((*RecordLocation)(nil), "google.privacy.dlp.v2.RecordLocation")
+	proto.RegisterType((*TableLocation)(nil), "google.privacy.dlp.v2.TableLocation")
+	proto.RegisterType((*Range)(nil), "google.privacy.dlp.v2.Range")
+	proto.RegisterType((*ImageLocation)(nil), "google.privacy.dlp.v2.ImageLocation")
+	proto.RegisterType((*BoundingBox)(nil), "google.privacy.dlp.v2.BoundingBox")
+	proto.RegisterType((*RedactImageRequest)(nil), "google.privacy.dlp.v2.RedactImageRequest")
+	proto.RegisterType((*RedactImageRequest_ImageRedactionConfig)(nil), "google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig")
+	proto.RegisterType((*Color)(nil), "google.privacy.dlp.v2.Color")
+	proto.RegisterType((*RedactImageResponse)(nil), "google.privacy.dlp.v2.RedactImageResponse")
+	proto.RegisterType((*DeidentifyContentRequest)(nil), "google.privacy.dlp.v2.DeidentifyContentRequest")
+	proto.RegisterType((*DeidentifyContentResponse)(nil), "google.privacy.dlp.v2.DeidentifyContentResponse")
+	proto.RegisterType((*ReidentifyContentRequest)(nil), "google.privacy.dlp.v2.ReidentifyContentRequest")
+	proto.RegisterType((*ReidentifyContentResponse)(nil), "google.privacy.dlp.v2.ReidentifyContentResponse")
+	proto.RegisterType((*InspectContentRequest)(nil), "google.privacy.dlp.v2.InspectContentRequest")
+	proto.RegisterType((*InspectContentResponse)(nil), "google.privacy.dlp.v2.InspectContentResponse")
+	proto.RegisterType((*OutputStorageConfig)(nil), "google.privacy.dlp.v2.OutputStorageConfig")
+	proto.RegisterType((*InfoTypeStats)(nil), "google.privacy.dlp.v2.InfoTypeStats")
+	proto.RegisterType((*InspectDataSourceDetails)(nil), "google.privacy.dlp.v2.InspectDataSourceDetails")
+	proto.RegisterType((*InspectDataSourceDetails_RequestedOptions)(nil), "google.privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions")
+	proto.RegisterType((*InspectDataSourceDetails_Result)(nil), "google.privacy.dlp.v2.InspectDataSourceDetails.Result")
+	proto.RegisterType((*InfoTypeDescription)(nil), "google.privacy.dlp.v2.InfoTypeDescription")
+	proto.RegisterType((*ListInfoTypesRequest)(nil), "google.privacy.dlp.v2.ListInfoTypesRequest")
+	proto.RegisterType((*ListInfoTypesResponse)(nil), "google.privacy.dlp.v2.ListInfoTypesResponse")
+	proto.RegisterType((*RiskAnalysisJobConfig)(nil), "google.privacy.dlp.v2.RiskAnalysisJobConfig")
+	proto.RegisterType((*QuasiId)(nil), "google.privacy.dlp.v2.QuasiId")
+	proto.RegisterType((*StatisticalTable)(nil), "google.privacy.dlp.v2.StatisticalTable")
+	proto.RegisterType((*StatisticalTable_QuasiIdentifierField)(nil), "google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierField")
+	proto.RegisterType((*PrivacyMetric)(nil), "google.privacy.dlp.v2.PrivacyMetric")
+	proto.RegisterType((*PrivacyMetric_NumericalStatsConfig)(nil), "google.privacy.dlp.v2.PrivacyMetric.NumericalStatsConfig")
+	proto.RegisterType((*PrivacyMetric_CategoricalStatsConfig)(nil), "google.privacy.dlp.v2.PrivacyMetric.CategoricalStatsConfig")
+	proto.RegisterType((*PrivacyMetric_KAnonymityConfig)(nil), "google.privacy.dlp.v2.PrivacyMetric.KAnonymityConfig")
+	proto.RegisterType((*PrivacyMetric_LDiversityConfig)(nil), "google.privacy.dlp.v2.PrivacyMetric.LDiversityConfig")
+	proto.RegisterType((*PrivacyMetric_KMapEstimationConfig)(nil), "google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig")
+	proto.RegisterType((*PrivacyMetric_KMapEstimationConfig_TaggedField)(nil), "google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField")
+	proto.RegisterType((*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable)(nil), "google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable")
+	proto.RegisterType((*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField)(nil), "google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable.QuasiIdField")
+	proto.RegisterType((*PrivacyMetric_DeltaPresenceEstimationConfig)(nil), "google.privacy.dlp.v2.PrivacyMetric.DeltaPresenceEstimationConfig")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_NumericalStatsResult)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.NumericalStatsResult")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_CategoricalStatsResult)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult.CategoricalStatsHistogramBucket")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KAnonymityResult)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult.KAnonymityEquivalenceClass")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult.KAnonymityHistogramBucket")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_LDiversityResult)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult.LDiversityEquivalenceClass")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult.LDiversityHistogramBucket")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KMapEstimationResult)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult.KMapEstimationQuasiIdValues")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult.KMapEstimationHistogramBucket")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.DeltaPresenceEstimationResult")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationQuasiIdValues)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.DeltaPresenceEstimationResult.DeltaPresenceEstimationQuasiIdValues")
+	proto.RegisterType((*AnalyzeDataSourceRiskDetails_DeltaPresenceEstimationResult_DeltaPresenceEstimationHistogramBucket)(nil), "google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.DeltaPresenceEstimationResult.DeltaPresenceEstimationHistogramBucket")
+	proto.RegisterType((*ValueFrequency)(nil), "google.privacy.dlp.v2.ValueFrequency")
+	proto.RegisterType((*Value)(nil), "google.privacy.dlp.v2.Value")
+	proto.RegisterType((*QuoteInfo)(nil), "google.privacy.dlp.v2.QuoteInfo")
+	proto.RegisterType((*DateTime)(nil), "google.privacy.dlp.v2.DateTime")
+	proto.RegisterType((*DateTime_TimeZone)(nil), "google.privacy.dlp.v2.DateTime.TimeZone")
+	proto.RegisterType((*DeidentifyConfig)(nil), "google.privacy.dlp.v2.DeidentifyConfig")
+	proto.RegisterType((*PrimitiveTransformation)(nil), "google.privacy.dlp.v2.PrimitiveTransformation")
+	proto.RegisterType((*TimePartConfig)(nil), "google.privacy.dlp.v2.TimePartConfig")
+	proto.RegisterType((*CryptoHashConfig)(nil), "google.privacy.dlp.v2.CryptoHashConfig")
+	proto.RegisterType((*ReplaceValueConfig)(nil), "google.privacy.dlp.v2.ReplaceValueConfig")
+	proto.RegisterType((*ReplaceWithInfoTypeConfig)(nil), "google.privacy.dlp.v2.ReplaceWithInfoTypeConfig")
+	proto.RegisterType((*RedactConfig)(nil), "google.privacy.dlp.v2.RedactConfig")
+	proto.RegisterType((*CharsToIgnore)(nil), "google.privacy.dlp.v2.CharsToIgnore")
+	proto.RegisterType((*CharacterMaskConfig)(nil), "google.privacy.dlp.v2.CharacterMaskConfig")
+	proto.RegisterType((*FixedSizeBucketingConfig)(nil), "google.privacy.dlp.v2.FixedSizeBucketingConfig")
+	proto.RegisterType((*BucketingConfig)(nil), "google.privacy.dlp.v2.BucketingConfig")
+	proto.RegisterType((*BucketingConfig_Bucket)(nil), "google.privacy.dlp.v2.BucketingConfig.Bucket")
+	proto.RegisterType((*CryptoReplaceFfxFpeConfig)(nil), "google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig")
+	proto.RegisterType((*CryptoKey)(nil), "google.privacy.dlp.v2.CryptoKey")
+	proto.RegisterType((*TransientCryptoKey)(nil), "google.privacy.dlp.v2.TransientCryptoKey")
+	proto.RegisterType((*UnwrappedCryptoKey)(nil), "google.privacy.dlp.v2.UnwrappedCryptoKey")
+	proto.RegisterType((*KmsWrappedCryptoKey)(nil), "google.privacy.dlp.v2.KmsWrappedCryptoKey")
+	proto.RegisterType((*DateShiftConfig)(nil), "google.privacy.dlp.v2.DateShiftConfig")
+	proto.RegisterType((*InfoTypeTransformations)(nil), "google.privacy.dlp.v2.InfoTypeTransformations")
+	proto.RegisterType((*InfoTypeTransformations_InfoTypeTransformation)(nil), "google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation")
+	proto.RegisterType((*FieldTransformation)(nil), "google.privacy.dlp.v2.FieldTransformation")
+	proto.RegisterType((*RecordTransformations)(nil), "google.privacy.dlp.v2.RecordTransformations")
+	proto.RegisterType((*RecordSuppression)(nil), "google.privacy.dlp.v2.RecordSuppression")
+	proto.RegisterType((*RecordCondition)(nil), "google.privacy.dlp.v2.RecordCondition")
+	proto.RegisterType((*RecordCondition_Condition)(nil), "google.privacy.dlp.v2.RecordCondition.Condition")
+	proto.RegisterType((*RecordCondition_Conditions)(nil), "google.privacy.dlp.v2.RecordCondition.Conditions")
+	proto.RegisterType((*RecordCondition_Expressions)(nil), "google.privacy.dlp.v2.RecordCondition.Expressions")
+	proto.RegisterType((*TransformationOverview)(nil), "google.privacy.dlp.v2.TransformationOverview")
+	proto.RegisterType((*TransformationSummary)(nil), "google.privacy.dlp.v2.TransformationSummary")
+	proto.RegisterType((*TransformationSummary_SummaryResult)(nil), "google.privacy.dlp.v2.TransformationSummary.SummaryResult")
+	proto.RegisterType((*Schedule)(nil), "google.privacy.dlp.v2.Schedule")
+	proto.RegisterType((*InspectTemplate)(nil), "google.privacy.dlp.v2.InspectTemplate")
+	proto.RegisterType((*DeidentifyTemplate)(nil), "google.privacy.dlp.v2.DeidentifyTemplate")
+	proto.RegisterType((*Error)(nil), "google.privacy.dlp.v2.Error")
+	proto.RegisterType((*JobTrigger)(nil), "google.privacy.dlp.v2.JobTrigger")
+	proto.RegisterType((*JobTrigger_Trigger)(nil), "google.privacy.dlp.v2.JobTrigger.Trigger")
+	proto.RegisterType((*Action)(nil), "google.privacy.dlp.v2.Action")
+	proto.RegisterType((*Action_SaveFindings)(nil), "google.privacy.dlp.v2.Action.SaveFindings")
+	proto.RegisterType((*Action_PublishToPubSub)(nil), "google.privacy.dlp.v2.Action.PublishToPubSub")
+	proto.RegisterType((*Action_PublishSummaryToCscc)(nil), "google.privacy.dlp.v2.Action.PublishSummaryToCscc")
+	proto.RegisterType((*CreateInspectTemplateRequest)(nil), "google.privacy.dlp.v2.CreateInspectTemplateRequest")
+	proto.RegisterType((*UpdateInspectTemplateRequest)(nil), "google.privacy.dlp.v2.UpdateInspectTemplateRequest")
+	proto.RegisterType((*GetInspectTemplateRequest)(nil), "google.privacy.dlp.v2.GetInspectTemplateRequest")
+	proto.RegisterType((*ListInspectTemplatesRequest)(nil), "google.privacy.dlp.v2.ListInspectTemplatesRequest")
+	proto.RegisterType((*ListInspectTemplatesResponse)(nil), "google.privacy.dlp.v2.ListInspectTemplatesResponse")
+	proto.RegisterType((*DeleteInspectTemplateRequest)(nil), "google.privacy.dlp.v2.DeleteInspectTemplateRequest")
+	proto.RegisterType((*CreateJobTriggerRequest)(nil), "google.privacy.dlp.v2.CreateJobTriggerRequest")
+	proto.RegisterType((*UpdateJobTriggerRequest)(nil), "google.privacy.dlp.v2.UpdateJobTriggerRequest")
+	proto.RegisterType((*GetJobTriggerRequest)(nil), "google.privacy.dlp.v2.GetJobTriggerRequest")
+	proto.RegisterType((*CreateDlpJobRequest)(nil), "google.privacy.dlp.v2.CreateDlpJobRequest")
+	proto.RegisterType((*ListJobTriggersRequest)(nil), "google.privacy.dlp.v2.ListJobTriggersRequest")
+	proto.RegisterType((*ListJobTriggersResponse)(nil), "google.privacy.dlp.v2.ListJobTriggersResponse")
+	proto.RegisterType((*DeleteJobTriggerRequest)(nil), "google.privacy.dlp.v2.DeleteJobTriggerRequest")
+	proto.RegisterType((*InspectJobConfig)(nil), "google.privacy.dlp.v2.InspectJobConfig")
+	proto.RegisterType((*DlpJob)(nil), "google.privacy.dlp.v2.DlpJob")
+	proto.RegisterType((*GetDlpJobRequest)(nil), "google.privacy.dlp.v2.GetDlpJobRequest")
+	proto.RegisterType((*ListDlpJobsRequest)(nil), "google.privacy.dlp.v2.ListDlpJobsRequest")
+	proto.RegisterType((*ListDlpJobsResponse)(nil), "google.privacy.dlp.v2.ListDlpJobsResponse")
+	proto.RegisterType((*CancelDlpJobRequest)(nil), "google.privacy.dlp.v2.CancelDlpJobRequest")
+	proto.RegisterType((*DeleteDlpJobRequest)(nil), "google.privacy.dlp.v2.DeleteDlpJobRequest")
+	proto.RegisterType((*CreateDeidentifyTemplateRequest)(nil), "google.privacy.dlp.v2.CreateDeidentifyTemplateRequest")
+	proto.RegisterType((*UpdateDeidentifyTemplateRequest)(nil), "google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest")
+	proto.RegisterType((*GetDeidentifyTemplateRequest)(nil), "google.privacy.dlp.v2.GetDeidentifyTemplateRequest")
+	proto.RegisterType((*ListDeidentifyTemplatesRequest)(nil), "google.privacy.dlp.v2.ListDeidentifyTemplatesRequest")
+	proto.RegisterType((*ListDeidentifyTemplatesResponse)(nil), "google.privacy.dlp.v2.ListDeidentifyTemplatesResponse")
+	proto.RegisterType((*DeleteDeidentifyTemplateRequest)(nil), "google.privacy.dlp.v2.DeleteDeidentifyTemplateRequest")
+	proto.RegisterEnum("google.privacy.dlp.v2.ContentOption", ContentOption_name, ContentOption_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.InfoTypeSupportedBy", InfoTypeSupportedBy_name, InfoTypeSupportedBy_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.RelationalOperator", RelationalOperator_name, RelationalOperator_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.DlpJobType", DlpJobType_name, DlpJobType_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.ByteContentItem_BytesType", ByteContentItem_BytesType_name, ByteContentItem_BytesType_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.OutputStorageConfig_OutputSchema", OutputStorageConfig_OutputSchema_name, OutputStorageConfig_OutputSchema_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.TimePartConfig_TimePart", TimePartConfig_TimePart_name, TimePartConfig_TimePart_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.CharsToIgnore_CommonCharsToIgnore", CharsToIgnore_CommonCharsToIgnore_name, CharsToIgnore_CommonCharsToIgnore_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet", CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.RecordCondition_Expressions_LogicalOperator", RecordCondition_Expressions_LogicalOperator_name, RecordCondition_Expressions_LogicalOperator_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.TransformationSummary_TransformationResultCode", TransformationSummary_TransformationResultCode_name, TransformationSummary_TransformationResultCode_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.JobTrigger_Status", JobTrigger_Status_name, JobTrigger_Status_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.DlpJob_JobState", DlpJob_JobState_name, DlpJob_JobState_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// DlpServiceClient is the client API for DlpService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type DlpServiceClient interface {
+	// Finds potentially sensitive info in content.
+	// This method has limits on input size, processing time, and output size.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	//
+	// For how to guides, see https://cloud.google.com/dlp/docs/inspecting-images
+	// and https://cloud.google.com/dlp/docs/inspecting-text,
+	InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error)
+	// Redacts potentially sensitive info from an image.
+	// This method has limits on input size, processing time, and output size.
+	// See https://cloud.google.com/dlp/docs/redacting-sensitive-data-images to
+	// learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	RedactImage(ctx context.Context, in *RedactImageRequest, opts ...grpc.CallOption) (*RedactImageResponse, error)
+	// De-identifies potentially sensitive info from a ContentItem.
+	// This method has limits on input size and output size.
+	// See https://cloud.google.com/dlp/docs/deidentify-sensitive-data to
+	// learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error)
+	// Re-identifies content that has been de-identified.
+	// See
+	// https://cloud.google.com/dlp/docs/pseudonymization#re-identification_in_free_text_code_example
+	// to learn more.
+	ReidentifyContent(ctx context.Context, in *ReidentifyContentRequest, opts ...grpc.CallOption) (*ReidentifyContentResponse, error)
+	// Returns a list of the sensitive information types that the DLP API
+	// supports. See https://cloud.google.com/dlp/docs/infotypes-reference to
+	// learn more.
+	ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error)
+	// Creates an InspectTemplate for re-using frequently used configuration
+	// for inspecting content, images, and storage.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	CreateInspectTemplate(ctx context.Context, in *CreateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
+	// Updates the InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	UpdateInspectTemplate(ctx context.Context, in *UpdateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
+	// Gets an InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	GetInspectTemplate(ctx context.Context, in *GetInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
+	// Lists InspectTemplates.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	ListInspectTemplates(ctx context.Context, in *ListInspectTemplatesRequest, opts ...grpc.CallOption) (*ListInspectTemplatesResponse, error)
+	// Deletes an InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates a DeidentifyTemplate for re-using frequently used configuration
+	// for de-identifying content, images, and storage.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	CreateDeidentifyTemplate(ctx context.Context, in *CreateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
+	// Updates the DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	UpdateDeidentifyTemplate(ctx context.Context, in *UpdateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
+	// Gets a DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	GetDeidentifyTemplate(ctx context.Context, in *GetDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
+	// Lists DeidentifyTemplates.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	ListDeidentifyTemplates(ctx context.Context, in *ListDeidentifyTemplatesRequest, opts ...grpc.CallOption) (*ListDeidentifyTemplatesResponse, error)
+	// Deletes a DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates a job trigger to run DLP actions such as scanning storage for
+	// sensitive information on a set schedule.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	CreateJobTrigger(ctx context.Context, in *CreateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
+	// Updates a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	UpdateJobTrigger(ctx context.Context, in *UpdateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
+	// Gets a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	GetJobTrigger(ctx context.Context, in *GetJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error)
+	// Lists job triggers.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	ListJobTriggers(ctx context.Context, in *ListJobTriggersRequest, opts ...grpc.CallOption) (*ListJobTriggersResponse, error)
+	// Deletes a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Creates a new job to inspect storage or calculate risk metrics.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in inspect jobs, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	CreateDlpJob(ctx context.Context, in *CreateDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error)
+	// Lists DlpJobs that match the specified filter in the request.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	ListDlpJobs(ctx context.Context, in *ListDlpJobsRequest, opts ...grpc.CallOption) (*ListDlpJobsResponse, error)
+	// Gets the latest state of a long-running DlpJob.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	GetDlpJob(ctx context.Context, in *GetDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error)
+	// Deletes a long-running DlpJob. This method indicates that the client is
+	// no longer interested in the DlpJob result. The job will be cancelled if
+	// possible.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Starts asynchronous cancellation on a long-running DlpJob. The server
+	// makes a best effort to cancel the DlpJob, but success is not
+	// guaranteed.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+}
+
+type dlpServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewDlpServiceClient(cc *grpc.ClientConn) DlpServiceClient {
+	return &dlpServiceClient{cc}
+}
+
+func (c *dlpServiceClient) InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error) {
+	out := new(InspectContentResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/InspectContent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) RedactImage(ctx context.Context, in *RedactImageRequest, opts ...grpc.CallOption) (*RedactImageResponse, error) {
+	out := new(RedactImageResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/RedactImage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error) {
+	out := new(DeidentifyContentResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeidentifyContent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ReidentifyContent(ctx context.Context, in *ReidentifyContentRequest, opts ...grpc.CallOption) (*ReidentifyContentResponse, error) {
+	out := new(ReidentifyContentResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ReidentifyContent", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error) {
+	out := new(ListInfoTypesResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListInfoTypes", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateInspectTemplate(ctx context.Context, in *CreateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
+	out := new(InspectTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateInspectTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) UpdateInspectTemplate(ctx context.Context, in *UpdateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
+	out := new(InspectTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateInspectTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetInspectTemplate(ctx context.Context, in *GetInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
+	out := new(InspectTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetInspectTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListInspectTemplates(ctx context.Context, in *ListInspectTemplatesRequest, opts ...grpc.CallOption) (*ListInspectTemplatesResponse, error) {
+	out := new(ListInspectTemplatesResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListInspectTemplates", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteInspectTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateDeidentifyTemplate(ctx context.Context, in *CreateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
+	out := new(DeidentifyTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) UpdateDeidentifyTemplate(ctx context.Context, in *UpdateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
+	out := new(DeidentifyTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetDeidentifyTemplate(ctx context.Context, in *GetDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
+	out := new(DeidentifyTemplate)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetDeidentifyTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListDeidentifyTemplates(ctx context.Context, in *ListDeidentifyTemplatesRequest, opts ...grpc.CallOption) (*ListDeidentifyTemplatesResponse, error) {
+	out := new(ListDeidentifyTemplatesResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListDeidentifyTemplates", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateJobTrigger(ctx context.Context, in *CreateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
+	out := new(JobTrigger)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) UpdateJobTrigger(ctx context.Context, in *UpdateJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
+	out := new(JobTrigger)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/UpdateJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetJobTrigger(ctx context.Context, in *GetJobTriggerRequest, opts ...grpc.CallOption) (*JobTrigger, error) {
+	out := new(JobTrigger)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListJobTriggers(ctx context.Context, in *ListJobTriggersRequest, opts ...grpc.CallOption) (*ListJobTriggersResponse, error) {
+	out := new(ListJobTriggersResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListJobTriggers", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteJobTrigger", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CreateDlpJob(ctx context.Context, in *CreateDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error) {
+	out := new(DlpJob)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CreateDlpJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) ListDlpJobs(ctx context.Context, in *ListDlpJobsRequest, opts ...grpc.CallOption) (*ListDlpJobsResponse, error) {
+	out := new(ListDlpJobsResponse)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/ListDlpJobs", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) GetDlpJob(ctx context.Context, in *GetDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error) {
+	out := new(DlpJob)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/GetDlpJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteDlpJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *dlpServiceClient) CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CancelDlpJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// DlpServiceServer is the server API for DlpService service.
+type DlpServiceServer interface {
+	// Finds potentially sensitive info in content.
+	// This method has limits on input size, processing time, and output size.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	//
+	// For how to guides, see https://cloud.google.com/dlp/docs/inspecting-images
+	// and https://cloud.google.com/dlp/docs/inspecting-text,
+	InspectContent(context.Context, *InspectContentRequest) (*InspectContentResponse, error)
+	// Redacts potentially sensitive info from an image.
+	// This method has limits on input size, processing time, and output size.
+	// See https://cloud.google.com/dlp/docs/redacting-sensitive-data-images to
+	// learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	RedactImage(context.Context, *RedactImageRequest) (*RedactImageResponse, error)
+	// De-identifies potentially sensitive info from a ContentItem.
+	// This method has limits on input size and output size.
+	// See https://cloud.google.com/dlp/docs/deidentify-sensitive-data to
+	// learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in this request, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	DeidentifyContent(context.Context, *DeidentifyContentRequest) (*DeidentifyContentResponse, error)
+	// Re-identifies content that has been de-identified.
+	// See
+	// https://cloud.google.com/dlp/docs/pseudonymization#re-identification_in_free_text_code_example
+	// to learn more.
+	ReidentifyContent(context.Context, *ReidentifyContentRequest) (*ReidentifyContentResponse, error)
+	// Returns a list of the sensitive information types that the DLP API
+	// supports. See https://cloud.google.com/dlp/docs/infotypes-reference to
+	// learn more.
+	ListInfoTypes(context.Context, *ListInfoTypesRequest) (*ListInfoTypesResponse, error)
+	// Creates an InspectTemplate for re-using frequently used configuration
+	// for inspecting content, images, and storage.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	CreateInspectTemplate(context.Context, *CreateInspectTemplateRequest) (*InspectTemplate, error)
+	// Updates the InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	UpdateInspectTemplate(context.Context, *UpdateInspectTemplateRequest) (*InspectTemplate, error)
+	// Gets an InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	GetInspectTemplate(context.Context, *GetInspectTemplateRequest) (*InspectTemplate, error)
+	// Lists InspectTemplates.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	ListInspectTemplates(context.Context, *ListInspectTemplatesRequest) (*ListInspectTemplatesResponse, error)
+	// Deletes an InspectTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates to learn more.
+	DeleteInspectTemplate(context.Context, *DeleteInspectTemplateRequest) (*empty.Empty, error)
+	// Creates a DeidentifyTemplate for re-using frequently used configuration
+	// for de-identifying content, images, and storage.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	CreateDeidentifyTemplate(context.Context, *CreateDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
+	// Updates the DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	UpdateDeidentifyTemplate(context.Context, *UpdateDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
+	// Gets a DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	GetDeidentifyTemplate(context.Context, *GetDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
+	// Lists DeidentifyTemplates.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	ListDeidentifyTemplates(context.Context, *ListDeidentifyTemplatesRequest) (*ListDeidentifyTemplatesResponse, error)
+	// Deletes a DeidentifyTemplate.
+	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
+	// more.
+	DeleteDeidentifyTemplate(context.Context, *DeleteDeidentifyTemplateRequest) (*empty.Empty, error)
+	// Creates a job trigger to run DLP actions such as scanning storage for
+	// sensitive information on a set schedule.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	CreateJobTrigger(context.Context, *CreateJobTriggerRequest) (*JobTrigger, error)
+	// Updates a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	UpdateJobTrigger(context.Context, *UpdateJobTriggerRequest) (*JobTrigger, error)
+	// Gets a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	GetJobTrigger(context.Context, *GetJobTriggerRequest) (*JobTrigger, error)
+	// Lists job triggers.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	ListJobTriggers(context.Context, *ListJobTriggersRequest) (*ListJobTriggersResponse, error)
+	// Deletes a job trigger.
+	// See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more.
+	DeleteJobTrigger(context.Context, *DeleteJobTriggerRequest) (*empty.Empty, error)
+	// Creates a new job to inspect storage or calculate risk metrics.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	//
+	// When no InfoTypes or CustomInfoTypes are specified in inspect jobs, the
+	// system will automatically choose what detectors to run. By default this may
+	// be all types, but may change over time as detectors are updated.
+	CreateDlpJob(context.Context, *CreateDlpJobRequest) (*DlpJob, error)
+	// Lists DlpJobs that match the specified filter in the request.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	ListDlpJobs(context.Context, *ListDlpJobsRequest) (*ListDlpJobsResponse, error)
+	// Gets the latest state of a long-running DlpJob.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	GetDlpJob(context.Context, *GetDlpJobRequest) (*DlpJob, error)
+	// Deletes a long-running DlpJob. This method indicates that the client is
+	// no longer interested in the DlpJob result. The job will be cancelled if
+	// possible.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	DeleteDlpJob(context.Context, *DeleteDlpJobRequest) (*empty.Empty, error)
+	// Starts asynchronous cancellation on a long-running DlpJob. The server
+	// makes a best effort to cancel the DlpJob, but success is not
+	// guaranteed.
+	// See https://cloud.google.com/dlp/docs/inspecting-storage and
+	// https://cloud.google.com/dlp/docs/compute-risk-analysis to learn more.
+	CancelDlpJob(context.Context, *CancelDlpJobRequest) (*empty.Empty, error)
+}
+
+func RegisterDlpServiceServer(s *grpc.Server, srv DlpServiceServer) {
+	s.RegisterService(&_DlpService_serviceDesc, srv)
+}
+
+func _DlpService_InspectContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(InspectContentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).InspectContent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/InspectContent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).InspectContent(ctx, req.(*InspectContentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_RedactImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RedactImageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).RedactImage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/RedactImage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).RedactImage(ctx, req.(*RedactImageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeidentifyContentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeidentifyContent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeidentifyContent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeidentifyContent(ctx, req.(*DeidentifyContentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ReidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ReidentifyContentRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ReidentifyContent(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ReidentifyContent",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ReidentifyContent(ctx, req.(*ReidentifyContentRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListInfoTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListInfoTypesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListInfoTypes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListInfoTypes",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListInfoTypes(ctx, req.(*ListInfoTypesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateInspectTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateInspectTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateInspectTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateInspectTemplate(ctx, req.(*CreateInspectTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_UpdateInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateInspectTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).UpdateInspectTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateInspectTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).UpdateInspectTemplate(ctx, req.(*UpdateInspectTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetInspectTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetInspectTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetInspectTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetInspectTemplate(ctx, req.(*GetInspectTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListInspectTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListInspectTemplatesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListInspectTemplates(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListInspectTemplates",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListInspectTemplates(ctx, req.(*ListInspectTemplatesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteInspectTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteInspectTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteInspectTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteInspectTemplate(ctx, req.(*DeleteInspectTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateDeidentifyTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateDeidentifyTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateDeidentifyTemplate(ctx, req.(*CreateDeidentifyTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_UpdateDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateDeidentifyTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).UpdateDeidentifyTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).UpdateDeidentifyTemplate(ctx, req.(*UpdateDeidentifyTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDeidentifyTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetDeidentifyTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetDeidentifyTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetDeidentifyTemplate(ctx, req.(*GetDeidentifyTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListDeidentifyTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListDeidentifyTemplatesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListDeidentifyTemplates(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListDeidentifyTemplates",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListDeidentifyTemplates(ctx, req.(*ListDeidentifyTemplatesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteDeidentifyTemplateRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteDeidentifyTemplate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteDeidentifyTemplate(ctx, req.(*DeleteDeidentifyTemplateRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateJobTrigger(ctx, req.(*CreateJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_UpdateJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).UpdateJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/UpdateJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).UpdateJobTrigger(ctx, req.(*UpdateJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetJobTrigger(ctx, req.(*GetJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListJobTriggers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListJobTriggersRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListJobTriggers(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListJobTriggers",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListJobTriggers(ctx, req.(*ListJobTriggersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteJobTrigger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteJobTriggerRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteJobTrigger(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteJobTrigger",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteJobTrigger(ctx, req.(*DeleteJobTriggerRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CreateDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateDlpJobRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CreateDlpJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CreateDlpJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CreateDlpJob(ctx, req.(*CreateDlpJobRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_ListDlpJobs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListDlpJobsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).ListDlpJobs(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/ListDlpJobs",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).ListDlpJobs(ctx, req.(*ListDlpJobsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_GetDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDlpJobRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).GetDlpJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/GetDlpJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).GetDlpJob(ctx, req.(*GetDlpJobRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_DeleteDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteDlpJobRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).DeleteDlpJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/DeleteDlpJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).DeleteDlpJob(ctx, req.(*DeleteDlpJobRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _DlpService_CancelDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CancelDlpJobRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DlpServiceServer).CancelDlpJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.privacy.dlp.v2.DlpService/CancelDlpJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DlpServiceServer).CancelDlpJob(ctx, req.(*CancelDlpJobRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _DlpService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.privacy.dlp.v2.DlpService",
+	HandlerType: (*DlpServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "InspectContent",
+			Handler:    _DlpService_InspectContent_Handler,
+		},
+		{
+			MethodName: "RedactImage",
+			Handler:    _DlpService_RedactImage_Handler,
+		},
+		{
+			MethodName: "DeidentifyContent",
+			Handler:    _DlpService_DeidentifyContent_Handler,
+		},
+		{
+			MethodName: "ReidentifyContent",
+			Handler:    _DlpService_ReidentifyContent_Handler,
+		},
+		{
+			MethodName: "ListInfoTypes",
+			Handler:    _DlpService_ListInfoTypes_Handler,
+		},
+		{
+			MethodName: "CreateInspectTemplate",
+			Handler:    _DlpService_CreateInspectTemplate_Handler,
+		},
+		{
+			MethodName: "UpdateInspectTemplate",
+			Handler:    _DlpService_UpdateInspectTemplate_Handler,
+		},
+		{
+			MethodName: "GetInspectTemplate",
+			Handler:    _DlpService_GetInspectTemplate_Handler,
+		},
+		{
+			MethodName: "ListInspectTemplates",
+			Handler:    _DlpService_ListInspectTemplates_Handler,
+		},
+		{
+			MethodName: "DeleteInspectTemplate",
+			Handler:    _DlpService_DeleteInspectTemplate_Handler,
+		},
+		{
+			MethodName: "CreateDeidentifyTemplate",
+			Handler:    _DlpService_CreateDeidentifyTemplate_Handler,
+		},
+		{
+			MethodName: "UpdateDeidentifyTemplate",
+			Handler:    _DlpService_UpdateDeidentifyTemplate_Handler,
+		},
+		{
+			MethodName: "GetDeidentifyTemplate",
+			Handler:    _DlpService_GetDeidentifyTemplate_Handler,
+		},
+		{
+			MethodName: "ListDeidentifyTemplates",
+			Handler:    _DlpService_ListDeidentifyTemplates_Handler,
+		},
+		{
+			MethodName: "DeleteDeidentifyTemplate",
+			Handler:    _DlpService_DeleteDeidentifyTemplate_Handler,
+		},
+		{
+			MethodName: "CreateJobTrigger",
+			Handler:    _DlpService_CreateJobTrigger_Handler,
+		},
+		{
+			MethodName: "UpdateJobTrigger",
+			Handler:    _DlpService_UpdateJobTrigger_Handler,
+		},
+		{
+			MethodName: "GetJobTrigger",
+			Handler:    _DlpService_GetJobTrigger_Handler,
+		},
+		{
+			MethodName: "ListJobTriggers",
+			Handler:    _DlpService_ListJobTriggers_Handler,
+		},
+		{
+			MethodName: "DeleteJobTrigger",
+			Handler:    _DlpService_DeleteJobTrigger_Handler,
+		},
+		{
+			MethodName: "CreateDlpJob",
+			Handler:    _DlpService_CreateDlpJob_Handler,
+		},
+		{
+			MethodName: "ListDlpJobs",
+			Handler:    _DlpService_ListDlpJobs_Handler,
+		},
+		{
+			MethodName: "GetDlpJob",
+			Handler:    _DlpService_GetDlpJob_Handler,
+		},
+		{
+			MethodName: "DeleteDlpJob",
+			Handler:    _DlpService_DeleteDlpJob_Handler,
+		},
+		{
+			MethodName: "CancelDlpJob",
+			Handler:    _DlpService_CancelDlpJob_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/privacy/dlp/v2/dlp.proto",
+}
+
+func init() {
+	proto.RegisterFile("google/privacy/dlp/v2/dlp.proto", fileDescriptor_dlp_e1ef6d5c60cd7b39)
+}
+
+var fileDescriptor_dlp_e1ef6d5c60cd7b39 = []byte{
+	// 8339 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x7d, 0x6d, 0x6c, 0x1b, 0xd9,
+	0x76, 0x98, 0x86, 0x14, 0x29, 0xf2, 0x50, 0xa4, 0xa8, 0xab, 0x0f, 0xcb, 0xb4, 0xbd, 0xf6, 0x8e,
+	0x77, 0x6d, 0xaf, 0xd6, 0x96, 0x76, 0xb5, 0x1f, 0x6f, 0xd7, 0xbb, 0x6f, 0x13, 0x8a, 0xa4, 0x4d,
+	0x7a, 0x25, 0x51, 0x1e, 0x52, 0xde, 0xb5, 0xb3, 0xd8, 0xe9, 0x90, 0xbc, 0xa2, 0xc6, 0x22, 0x39,
+	0xf4, 0xcc, 0xd0, 0x96, 0x36, 0x49, 0x91, 0x14, 0x6d, 0x83, 0x00, 0x5d, 0x34, 0x40, 0xfa, 0xfa,
+	0xd0, 0xbc, 0x34, 0x48, 0x9b, 0x1f, 0x05, 0x02, 0xa4, 0x1f, 0x68, 0x93, 0xa0, 0x6d, 0x9a, 0x1f,
+	0x69, 0xd1, 0x14, 0x45, 0x51, 0xbc, 0x87, 0xf7, 0xab, 0x28, 0x02, 0xb4, 0xaf, 0x4d, 0x1b, 0x60,
+	0xf3, 0xa7, 0x40, 0xff, 0xa4, 0x05, 0x8a, 0xe2, 0x7e, 0xcc, 0x27, 0x67, 0xf8, 0x21, 0xdb, 0x6d,
+	0xf0, 0x7e, 0x89, 0xf7, 0xdc, 0x73, 0xce, 0x3d, 0xf7, 0xdc, 0x73, 0xcf, 0x3d, 0xf7, 0xcc, 0xbd,
+	0x57, 0x70, 0xb9, 0xad, 0x69, 0xed, 0x0e, 0xde, 0xec, 0xeb, 0xea, 0x53, 0xa5, 0x79, 0xba, 0xd9,
+	0xea, 0xf4, 0x37, 0x9f, 0x6e, 0x91, 0x3f, 0x1b, 0x7d, 0x5d, 0x33, 0x35, 0xb4, 0xc2, 0x10, 0x36,
+	0x38, 0xc2, 0x06, 0xa9, 0x79, 0xba, 0x95, 0xbb, 0xc8, 0xe9, 0x94, 0xbe, 0xba, 0xa9, 0xf4, 0x7a,
+	0x9a, 0xa9, 0x98, 0xaa, 0xd6, 0x33, 0x18, 0x51, 0xee, 0x6a, 0x30, 0x57, 0xc3, 0xd4, 0x74, 0xa5,
+	0x8d, 0x39, 0xd2, 0x2b, 0x36, 0x92, 0x66, 0x6a, 0x8d, 0xc1, 0xe1, 0x66, 0x6b, 0xa0, 0x53, 0x2e,
+	0xbc, 0xfe, 0x82, 0xbf, 0x1e, 0x77, 0xfb, 0xe6, 0x29, 0xaf, 0xbc, 0xe2, 0xaf, 0x3c, 0x54, 0x71,
+	0xa7, 0x25, 0x77, 0x15, 0xe3, 0x98, 0x63, 0x5c, 0xf6, 0x63, 0x98, 0x6a, 0x17, 0x1b, 0xa6, 0xd2,
+	0xe5, 0x3d, 0xcb, 0x9d, 0xe3, 0x08, 0x7a, 0xbf, 0xb9, 0x69, 0x98, 0x8a, 0x39, 0xb0, 0xa4, 0x5f,
+	0xe5, 0x15, 0xe6, 0x69, 0x1f, 0x6f, 0xb6, 0x14, 0x13, 0xfb, 0x04, 0xe2, 0xf0, 0x53, 0xed, 0xf0,
+	0x19, 0xc6, 0xc7, 0x41, 0x95, 0xa4, 0x29, 0xed, 0xb0, 0xa5, 0x70, 0x69, 0xc5, 0x7f, 0x13, 0x87,
+	0x74, 0xa5, 0x67, 0xf4, 0x71, 0xd3, 0x2c, 0x68, 0xbd, 0x43, 0xb5, 0x8d, 0x3e, 0x01, 0x50, 0x7b,
+	0x87, 0x9a, 0x4c, 0xd0, 0x8d, 0x35, 0xe1, 0x4a, 0xf4, 0x46, 0x6a, 0xeb, 0xf2, 0x46, 0xa0, 0xae,
+	0x37, 0x2a, 0xbd, 0x43, 0xad, 0x7e, 0xda, 0xc7, 0x52, 0x52, 0xe5, 0xbf, 0x0c, 0x54, 0x86, 0x4c,
+	0x57, 0xed, 0xc9, 0x1d, 0xf5, 0x18, 0x77, 0xd4, 0x23, 0x4d, 0x6b, 0xad, 0x45, 0xae, 0x08, 0x37,
+	0x32, 0x5b, 0xaf, 0x86, 0xf0, 0xd8, 0xb1, 0x11, 0xa5, 0x74, 0x57, 0xed, 0x39, 0x45, 0x74, 0x0f,
+	0xe2, 0x1d, 0xb5, 0xab, 0x9a, 0xc6, 0x5a, 0xf4, 0x8a, 0x70, 0x23, 0xb5, 0xb5, 0x15, 0x2a, 0x85,
+	0x4b, 0xfe, 0x8d, 0x3b, 0x6a, 0xaf, 0xa5, 0xf6, 0xda, 0x3b, 0x94, 0x52, 0xe2, 0x1c, 0xd0, 0x55,
+	0x48, 0xab, 0xbd, 0x66, 0x67, 0xd0, 0xc2, 0xf2, 0x93, 0x81, 0x66, 0xe2, 0xb5, 0xd9, 0x2b, 0xc2,
+	0x8d, 0x84, 0x34, 0xcf, 0x81, 0xf7, 0x09, 0x0c, 0xdd, 0x04, 0x84, 0x4f, 0x18, 0x92, 0x4b, 0x05,
+	0x31, 0x8a, 0x99, 0xe5, 0x35, 0x15, 0xbb, 0xa3, 0xf7, 0x61, 0xb1, 0x39, 0x30, 0x4c, 0xad, 0xeb,
+	0x46, 0x8e, 0x53, 0x7d, 0xbd, 0x1e, 0x22, 0x69, 0x81, 0xe2, 0xdb, 0x5a, 0x5b, 0x68, 0x7a, 0xca,
+	0x06, 0xda, 0x85, 0x85, 0xa6, 0xd6, 0x33, 0x71, 0xcf, 0x94, 0xb5, 0x3e, 0x35, 0xdb, 0xb5, 0xc4,
+	0x95, 0xe8, 0x8d, 0xcc, 0xd6, 0x6b, 0x61, 0x0c, 0x19, 0x76, 0x95, 0x22, 0x4b, 0x99, 0xa6, 0xbb,
+	0x68, 0xe4, 0xbe, 0x89, 0x40, 0xda, 0xa3, 0x0e, 0xf4, 0x36, 0xac, 0x74, 0x95, 0x13, 0xf9, 0x90,
+	0x01, 0x0d, 0xb9, 0x8f, 0x75, 0x59, 0x35, 0x71, 0x77, 0x4d, 0xb8, 0x22, 0xdc, 0x88, 0x49, 0xa8,
+	0xab, 0x9c, 0x70, 0x02, 0x63, 0x1f, 0xeb, 0x15, 0x13, 0x77, 0xd1, 0xb7, 0x60, 0x6d, 0x88, 0x44,
+	0xc7, 0x4f, 0x06, 0xd8, 0x30, 0xe9, 0xc8, 0xc6, 0xa4, 0x15, 0x2f, 0x95, 0xc4, 0x2a, 0xd1, 0xcf,
+	0x40, 0x6e, 0xb8, 0x2d, 0x4b, 0x53, 0x6b, 0x51, 0xaa, 0xa8, 0x9f, 0x9c, 0x7e, 0x48, 0x6d, 0xa3,
+	0xa3, 0x45, 0x69, 0xd5, 0x27, 0x32, 0xaf, 0xcc, 0xf5, 0x89, 0x5d, 0xbb, 0x10, 0xd1, 0xc7, 0x90,
+	0x74, 0x5a, 0x17, 0xa8, 0x41, 0x8d, 0x35, 0xeb, 0x84, 0x65, 0xd6, 0xe8, 0x55, 0x98, 0x77, 0x77,
+	0x86, 0xf7, 0x3c, 0xe5, 0x6a, 0x5c, 0xfc, 0x46, 0x80, 0x85, 0xed, 0x53, 0x13, 0xf3, 0x31, 0xa1,
+	0xca, 0x2b, 0xc2, 0xac, 0xdd, 0x5e, 0x66, 0xeb, 0xad, 0x90, 0xf6, 0x7c, 0x54, 0xb4, 0x6c, 0x50,
+	0x01, 0x28, 0x35, 0x42, 0x30, 0xdb, 0x52, 0x4c, 0x85, 0x36, 0x3a, 0x2f, 0xd1, 0xdf, 0xe2, 0x5f,
+	0x84, 0xa4, 0x8d, 0x86, 0x72, 0xb0, 0xba, 0xfd, 0xb0, 0x5e, 0xaa, 0xc9, 0xf5, 0x87, 0xfb, 0x25,
+	0xf9, 0x60, 0xaf, 0xb6, 0x5f, 0x2a, 0x54, 0xee, 0x54, 0x4a, 0xc5, 0xec, 0x0c, 0x4a, 0x42, 0xac,
+	0xb2, 0x9b, 0xbf, 0x5b, 0xca, 0xc6, 0x51, 0x06, 0x80, 0xfe, 0x94, 0xef, 0xed, 0x97, 0xee, 0x66,
+	0x05, 0x94, 0x86, 0x24, 0x2b, 0x6f, 0xef, 0xee, 0x67, 0x23, 0x4e, 0x71, 0x7f, 0xef, 0x6e, 0x36,
+	0xea, 0x14, 0x6b, 0x0f, 0xee, 0x66, 0x67, 0x49, 0xb1, 0x5e, 0xfa, 0xbc, 0x2e, 0x1f, 0xd4, 0xef,
+	0x7c, 0x90, 0x8d, 0x89, 0xff, 0x40, 0x80, 0x94, 0xbb, 0xa7, 0xab, 0x10, 0x7b, 0xaa, 0x74, 0x06,
+	0x98, 0xce, 0xd5, 0x64, 0x79, 0x46, 0x62, 0x45, 0xf4, 0x2e, 0xc4, 0x4c, 0xa5, 0xd1, 0x61, 0x13,
+	0x2e, 0xb5, 0x75, 0x31, 0x44, 0x05, 0x75, 0x82, 0x43, 0xa8, 0x28, 0x32, 0x2a, 0x41, 0xb2, 0x71,
+	0x6a, 0x62, 0x66, 0x9b, 0x31, 0x4a, 0x79, 0x6d, 0x32, 0xe5, 0x95, 0x67, 0xa4, 0x04, 0x21, 0x25,
+	0xbf, 0xb7, 0x53, 0x90, 0x24, 0xca, 0xa2, 0x6c, 0xc4, 0x7f, 0x22, 0x40, 0x8c, 0x36, 0x83, 0x3e,
+	0x80, 0xb9, 0x23, 0xac, 0xb4, 0xb0, 0x6e, 0xf9, 0xb7, 0x57, 0x42, 0x78, 0xdf, 0x21, 0xae, 0xbb,
+	0xd2, 0x92, 0x2c, 0x74, 0xf4, 0x2e, 0xcc, 0xea, 0xda, 0x33, 0x32, 0xfc, 0x84, 0xec, 0xca, 0xa8,
+	0xce, 0x6c, 0x48, 0xda, 0x33, 0x89, 0x62, 0xe7, 0x3e, 0x82, 0xa8, 0xa4, 0x3d, 0x43, 0xef, 0x42,
+	0x9c, 0xea, 0xc4, 0x6a, 0x35, 0x4c, 0x17, 0x0f, 0x08, 0x92, 0xc4, 0x71, 0xc5, 0xaf, 0x6c, 0x07,
+	0x2d, 0x61, 0x63, 0xd0, 0x31, 0xd1, 0x6d, 0x48, 0xd8, 0x66, 0x38, 0x4e, 0x7c, 0x8a, 0x26, 0xd9,
+	0xf8, 0xe8, 0x16, 0x20, 0x7b, 0x3e, 0x9a, 0xfa, 0xa0, 0xd7, 0x54, 0x4c, 0xcc, 0x1c, 0x74, 0x42,
+	0x5a, 0xb4, 0x6a, 0xea, 0x56, 0x85, 0xf8, 0x1f, 0x23, 0x30, 0xc7, 0x99, 0xa0, 0x65, 0x88, 0x31,
+	0xcf, 0x49, 0x6c, 0x39, 0x29, 0xb1, 0x82, 0x77, 0x56, 0x45, 0xa6, 0x9d, 0x55, 0x79, 0x00, 0xd7,
+	0x3a, 0x11, 0x9d, 0x74, 0x9d, 0x70, 0x11, 0xa1, 0x8f, 0x20, 0xd1, 0xd1, 0x9a, 0x74, 0x75, 0xe6,
+	0x26, 0x16, 0xd6, 0xfe, 0x0e, 0x47, 0x93, 0x6c, 0x02, 0xf4, 0x11, 0xa4, 0x9a, 0x3a, 0x56, 0x4c,
+	0x2c, 0x93, 0x75, 0x71, 0x2d, 0x4e, 0xe9, 0x73, 0x0e, 0x3d, 0x5b, 0x9f, 0x37, 0xea, 0xd6, 0xfa,
+	0x2c, 0x01, 0x43, 0x27, 0x00, 0xf4, 0x13, 0x00, 0x54, 0x07, 0xd4, 0xa9, 0xad, 0xcd, 0x51, 0xda,
+	0x30, 0x8b, 0xa0, 0xeb, 0x0b, 0x51, 0x80, 0x94, 0x7c, 0x62, 0xfd, 0x14, 0xff, 0x8b, 0x00, 0x89,
+	0x1d, 0x47, 0x14, 0xa0, 0x16, 0xaf, 0x2b, 0xbd, 0xb6, 0xe5, 0x9f, 0xc2, 0x0c, 0x44, 0x22, 0x38,
+	0x12, 0x9d, 0x21, 0xf4, 0x27, 0x2a, 0x91, 0x75, 0xa3, 0x85, 0xfb, 0x9a, 0xda, 0x33, 0x39, 0x87,
+	0xc8, 0x04, 0x1c, 0x32, 0x36, 0x11, 0x63, 0x53, 0x83, 0x45, 0x6b, 0xf9, 0xb1, 0x54, 0x64, 0xac,
+	0xcd, 0x51, 0x13, 0xbb, 0x36, 0x7a, 0x01, 0xb2, 0x75, 0x9b, 0x6d, 0x7a, 0x01, 0x86, 0xf8, 0xbb,
+	0x51, 0x58, 0xf0, 0x61, 0xa1, 0xd7, 0x81, 0x2e, 0x55, 0x8a, 0xda, 0xc3, 0xba, 0xdc, 0x53, 0xba,
+	0x96, 0x51, 0xa5, 0x6d, 0xe8, 0x9e, 0xd2, 0xc5, 0x68, 0x1f, 0x16, 0x74, 0xdc, 0xd4, 0xf4, 0x96,
+	0x2d, 0x0e, 0xef, 0x56, 0xd8, 0xfa, 0x2a, 0x51, 0x6c, 0xab, 0x99, 0xf2, 0x8c, 0x94, 0xd1, 0x3d,
+	0x10, 0xb4, 0x0b, 0x19, 0xb5, 0xab, 0xb4, 0xb1, 0xc3, 0x90, 0x85, 0x16, 0x61, 0xeb, 0x6b, 0x85,
+	0x20, 0xbb, 0xf8, 0xa5, 0x55, 0x37, 0x00, 0x3d, 0x80, 0xc5, 0x96, 0xd6, 0x1c, 0x74, 0xdd, 0x1a,
+	0xe3, 0xee, 0xea, 0x7a, 0x08, 0xc7, 0x22, 0xc7, 0x77, 0x31, 0xcd, 0xb6, 0x7c, 0x30, 0xf4, 0x29,
+	0x2c, 0x39, 0xfa, 0xb1, 0xa3, 0xc3, 0x09, 0xec, 0x13, 0xd9, 0x64, 0x36, 0x0c, 0xbd, 0xc9, 0x46,
+	0x95, 0x31, 0x7b, 0x8a, 0x75, 0x83, 0x08, 0x39, 0x47, 0xf5, 0x9d, 0xb5, 0x2b, 0x1e, 0x30, 0xf8,
+	0x36, 0x38, 0xd3, 0x49, 0x7c, 0x07, 0xb2, 0x7e, 0x69, 0xd1, 0x65, 0x48, 0x1d, 0xaa, 0x1d, 0x2c,
+	0x6b, 0x87, 0x87, 0x06, 0x36, 0xe9, 0xb0, 0x45, 0x25, 0x20, 0xa0, 0x2a, 0x85, 0x88, 0xff, 0x41,
+	0x80, 0x8c, 0x77, 0x18, 0xc8, 0x44, 0xe1, 0xc3, 0x78, 0x8c, 0x4f, 0xb9, 0x69, 0x5f, 0x19, 0x39,
+	0x82, 0x9f, 0xe2, 0x53, 0x29, 0xa9, 0x5b, 0x3f, 0xd1, 0x87, 0xc4, 0xe3, 0x91, 0x20, 0x5a, 0x6d,
+	0x71, 0x03, 0x18, 0xeb, 0xb0, 0x0f, 0xd9, 0x0f, 0xf4, 0x29, 0x64, 0xe8, 0x8a, 0x32, 0xe9, 0x80,
+	0x53, 0xd7, 0x6d, 0x5b, 0x73, 0xda, 0x74, 0x17, 0xc5, 0x9b, 0x90, 0xf6, 0xd4, 0xa3, 0x0b, 0x90,
+	0xd4, 0xb5, 0x67, 0xb2, 0xda, 0x6b, 0xe1, 0x13, 0xae, 0x8b, 0x84, 0xae, 0x3d, 0xab, 0x90, 0xb2,
+	0xb8, 0x09, 0x31, 0x36, 0xad, 0x96, 0x21, 0x66, 0x98, 0x8a, 0x6e, 0x69, 0x8b, 0x15, 0x50, 0x16,
+	0xa2, 0xb8, 0xc7, 0xfa, 0x13, 0x95, 0xc8, 0x4f, 0xf1, 0x11, 0xa4, 0x3d, 0xf6, 0x86, 0x2a, 0x90,
+	0x69, 0x68, 0x03, 0xea, 0x7e, 0xe5, 0x86, 0x76, 0x62, 0x2f, 0x1c, 0x62, 0xd8, 0x52, 0xc8, 0x91,
+	0xb7, 0xb5, 0x13, 0x29, 0xdd, 0x70, 0x0a, 0xd8, 0x10, 0x15, 0x48, 0xb9, 0x6a, 0x49, 0xe3, 0xa6,
+	0xd6, 0xe7, 0x51, 0x1f, 0xf9, 0x49, 0x62, 0x8c, 0x0e, 0x3e, 0xb4, 0x42, 0x3a, 0xfa, 0x9b, 0x08,
+	0xfe, 0x4c, 0x6d, 0x99, 0x47, 0x54, 0x67, 0x31, 0x89, 0x15, 0xd0, 0x2a, 0xc4, 0x8f, 0xb0, 0xda,
+	0x3e, 0x32, 0xa9, 0xbf, 0x8d, 0x49, 0xbc, 0x24, 0xfe, 0xf6, 0x2c, 0x20, 0x09, 0xb7, 0x94, 0xa6,
+	0x49, 0x7b, 0x61, 0x85, 0x81, 0xab, 0x10, 0xef, 0x2b, 0x3a, 0xee, 0x99, 0x7c, 0x8e, 0xf3, 0x12,
+	0x19, 0x19, 0x95, 0xad, 0x6b, 0x72, 0x93, 0x86, 0x79, 0x7c, 0x68, 0x5f, 0x9b, 0x24, 0x24, 0x94,
+	0xd2, 0xaa, 0x67, 0xd3, 0xf2, 0x14, 0xce, 0xb1, 0x79, 0xad, 0x53, 0x01, 0x54, 0xad, 0xc7, 0x99,
+	0x92, 0xf0, 0x9d, 0xa8, 0xec, 0x93, 0x50, 0x7b, 0xf3, 0x0b, 0xbc, 0xc1, 0x0b, 0x9c, 0x0f, 0x6f,
+	0x6f, 0x45, 0x0d, 0x80, 0x1a, 0xe8, 0x0d, 0xc8, 0x5a, 0xdb, 0x0a, 0x7b, 0x4d, 0x8e, 0xd3, 0xd5,
+	0x74, 0x81, 0xc3, 0xad, 0xf0, 0x10, 0x15, 0xdc, 0x21, 0xcd, 0xdc, 0x34, 0x21, 0x8d, 0x13, 0xd0,
+	0xe4, 0x7e, 0x20, 0xc0, 0x72, 0x90, 0x7c, 0xe8, 0x93, 0xe9, 0xa3, 0x5b, 0x12, 0x29, 0xd9, 0x2b,
+	0xf1, 0x0d, 0xe2, 0x6a, 0x09, 0x4b, 0x59, 0xe9, 0x74, 0x64, 0x13, 0x9f, 0x30, 0x4b, 0x48, 0x10,
+	0x9f, 0xc7, 0x2a, 0xf2, 0x9d, 0x4e, 0x1d, 0x9f, 0x98, 0x64, 0xad, 0x71, 0x2b, 0xb9, 0xa3, 0xe9,
+	0x7c, 0x4a, 0x5d, 0x0c, 0x5d, 0x22, 0x3a, 0x9a, 0x4e, 0x3c, 0xb1, 0x2d, 0x71, 0x47, 0xd3, 0xb7,
+	0x13, 0x10, 0x37, 0x15, 0xbd, 0x8d, 0x4d, 0xb1, 0x00, 0x31, 0x0a, 0x22, 0x46, 0xa9, 0xe3, 0x16,
+	0x95, 0x3e, 0x22, 0x91, 0x9f, 0xc4, 0x00, 0xdb, 0x3a, 0xc6, 0xcc, 0xed, 0x47, 0x24, 0x56, 0x20,
+	0xa6, 0xda, 0xb0, 0x22, 0xcd, 0x88, 0x44, 0x7f, 0x8b, 0xff, 0x50, 0x80, 0x25, 0xcf, 0x58, 0x1a,
+	0x7d, 0xad, 0x67, 0x60, 0xb2, 0xd2, 0xb0, 0x86, 0x71, 0x4b, 0xa6, 0x43, 0x48, 0xd9, 0xcf, 0x5b,
+	0x9d, 0xc2, 0x2d, 0x8a, 0x4e, 0xd0, 0xf0, 0x89, 0xa9, 0x33, 0x3c, 0xbb, 0xf7, 0x49, 0x29, 0x6d,
+	0x43, 0x69, 0xdf, 0x5d, 0x36, 0xab, 0xd3, 0x60, 0x6c, 0xdc, 0xf2, 0xe1, 0x0e, 0xdc, 0x6c, 0x9b,
+	0x65, 0x45, 0xf1, 0x7f, 0x47, 0x60, 0xad, 0x88, 0xd5, 0x16, 0xee, 0x99, 0xea, 0xe1, 0x29, 0x1f,
+	0xef, 0x71, 0xb3, 0xa6, 0x0e, 0x8b, 0x2d, 0x9b, 0xc6, 0x3b, 0x71, 0x42, 0x57, 0x1c, 0x77, 0x1b,
+	0xc4, 0x96, 0xb3, 0x2d, 0x1f, 0x24, 0x60, 0x2e, 0x46, 0xcf, 0x3e, 0x17, 0xdf, 0x87, 0x59, 0x6a,
+	0xe3, 0x2c, 0x1a, 0x13, 0x47, 0x07, 0x0e, 0xd4, 0xbe, 0x29, 0x3e, 0xda, 0x82, 0x15, 0x4b, 0x08,
+	0x13, 0x77, 0xfb, 0x1d, 0x12, 0x96, 0xd1, 0xd8, 0x20, 0x46, 0x35, 0xb0, 0xc4, 0x2b, 0xeb, 0xbc,
+	0x8e, 0x46, 0x08, 0x1f, 0xc0, 0x9a, 0x4b, 0x1d, 0x5e, 0xb2, 0x38, 0x25, 0x5b, 0x75, 0xea, 0xdd,
+	0x94, 0xe2, 0xaf, 0x09, 0x70, 0x3e, 0x40, 0xfb, 0xdc, 0x6c, 0xac, 0x3e, 0x08, 0x53, 0xf6, 0xa1,
+	0x02, 0x09, 0xed, 0x29, 0xd6, 0x9f, 0xaa, 0xf8, 0x19, 0x1f, 0x95, 0x5b, 0x61, 0x0b, 0x8d, 0xae,
+	0xf4, 0x8c, 0x43, 0x4d, 0xef, 0x52, 0x57, 0x5f, 0xe5, 0x44, 0x92, 0x4d, 0x4e, 0xcd, 0x43, 0x3a,
+	0x83, 0x79, 0xe8, 0xcf, 0x6d, 0x1e, 0xfa, 0x8f, 0x93, 0x79, 0xe8, 0x63, 0xcc, 0x43, 0x0f, 0x37,
+	0x0f, 0xe9, 0xcf, 0xb3, 0x79, 0xfc, 0x89, 0x00, 0x2b, 0x8e, 0x9e, 0x27, 0xb1, 0x8d, 0x17, 0xba,
+	0xe0, 0x5a, 0x1a, 0x88, 0xbe, 0xa8, 0x51, 0x9c, 0x0d, 0x1d, 0x45, 0xf1, 0x01, 0xac, 0xfa, 0x7b,
+	0xca, 0xc7, 0xe1, 0x63, 0x88, 0x73, 0x3f, 0x2c, 0x4c, 0xe1, 0x87, 0x39, 0x8d, 0xf8, 0xef, 0x22,
+	0xb0, 0x54, 0x1d, 0x98, 0xfd, 0x81, 0x59, 0x63, 0xe9, 0x5f, 0xde, 0xb7, 0x8f, 0xad, 0x94, 0xc5,
+	0x68, 0xa6, 0xdb, 0x6a, 0xfb, 0xfe, 0x00, 0xeb, 0xa7, 0xbe, 0xd4, 0xc5, 0x17, 0x90, 0xd6, 0x28,
+	0x53, 0xd9, 0x68, 0x1e, 0xe1, 0xae, 0xc2, 0xb7, 0xb5, 0xdf, 0x0a, 0xe1, 0x12, 0x20, 0x80, 0x05,
+	0xa3, 0xe4, 0xd2, 0xbc, 0xe6, 0x2a, 0x89, 0xbf, 0x24, 0xc0, 0xbc, 0xbb, 0x1a, 0x5d, 0x82, 0xf3,
+	0xd5, 0x83, 0xfa, 0xfe, 0x41, 0x5d, 0xae, 0x15, 0xca, 0xa5, 0xdd, 0xbc, 0x2f, 0xfb, 0xb3, 0x08,
+	0xe9, 0xed, 0x7c, 0xad, 0x52, 0x90, 0x0b, 0xd5, 0x9d, 0x83, 0xdd, 0xbd, 0x5a, 0x56, 0x40, 0x0b,
+	0x90, 0xba, 0x5b, 0xa8, 0xd9, 0x80, 0x08, 0x5a, 0x81, 0xc5, 0x62, 0xbe, 0x9e, 0xaf, 0xd5, 0xab,
+	0x52, 0xc9, 0x06, 0x47, 0x09, 0x78, 0xbb, 0x72, 0x57, 0xbe, 0x7f, 0x50, 0x92, 0x1e, 0xda, 0xe0,
+	0x59, 0x42, 0x9e, 0xdf, 0xd9, 0xb1, 0x01, 0xb1, 0xed, 0x38, 0xcb, 0x71, 0x89, 0x4d, 0x27, 0xe3,
+	0x56, 0x33, 0x15, 0xd3, 0x78, 0xce, 0x8c, 0xdb, 0x32, 0xc4, 0x9a, 0xda, 0xa0, 0x67, 0xf2, 0x08,
+	0x99, 0x15, 0xc4, 0xef, 0xcf, 0xc2, 0x1a, 0x1f, 0xcd, 0xa2, 0x62, 0x2a, 0x35, 0x6d, 0xa0, 0x37,
+	0x71, 0x11, 0x9b, 0x8a, 0xda, 0x31, 0x50, 0x97, 0x78, 0x3f, 0x3a, 0x09, 0x70, 0xcb, 0x4e, 0xa0,
+	0x32, 0x23, 0x1f, 0x93, 0x68, 0x1c, 0xe2, 0xb5, 0x21, 0x59, 0x8c, 0x78, 0x32, 0x95, 0xb8, 0x45,
+	0x2f, 0x04, 0xed, 0xd9, 0xd6, 0xc7, 0x66, 0xc1, 0xfb, 0xd3, 0xb7, 0xe1, 0xb6, 0xc7, 0xdc, 0xef,
+	0x0b, 0x90, 0xf5, 0x37, 0x8b, 0x1a, 0x70, 0xde, 0xe8, 0x29, 0x7d, 0xe3, 0x48, 0x33, 0x65, 0xff,
+	0xcc, 0xe1, 0x4a, 0xbd, 0x36, 0xba, 0x5d, 0x6b, 0x2e, 0x49, 0xe7, 0x2c, 0x46, 0xbe, 0x0a, 0x74,
+	0x07, 0xe0, 0xb1, 0xd6, 0xf0, 0xfa, 0xf6, 0xeb, 0xa3, 0x99, 0xde, 0xd3, 0x1a, 0xdc, 0x31, 0x24,
+	0x1f, 0x5b, 0x3f, 0x73, 0xff, 0x58, 0x80, 0x38, 0x4f, 0x52, 0x5d, 0x87, 0x85, 0xbe, 0xae, 0x35,
+	0xb1, 0x61, 0xe0, 0x96, 0x4c, 0xc2, 0x57, 0x83, 0xef, 0x7e, 0x32, 0x36, 0x98, 0xa6, 0x2f, 0x89,
+	0x43, 0x30, 0x35, 0x53, 0xe9, 0xc8, 0xd8, 0x30, 0xd5, 0xae, 0x62, 0xda, 0xe8, 0x6c, 0xd8, 0x97,
+	0x68, 0x65, 0xc9, 0xaa, 0x63, 0x34, 0x3b, 0xb0, 0x60, 0x1b, 0x96, 0x6c, 0x10, 0x5b, 0xe3, 0xe9,
+	0xe4, 0xd7, 0xc6, 0x98, 0x17, 0xb5, 0x4b, 0xe2, 0xca, 0x5c, 0x45, 0xf1, 0x7b, 0x02, 0x2c, 0x59,
+	0x08, 0x45, 0x6c, 0x34, 0x75, 0x95, 0xaa, 0x9e, 0x84, 0x99, 0xae, 0xd4, 0x04, 0xfd, 0x8d, 0x5e,
+	0x85, 0xf9, 0x96, 0x6a, 0xf4, 0x3b, 0xca, 0x29, 0xf3, 0x5a, 0x2c, 0x4a, 0x4c, 0x71, 0x18, 0x5d,
+	0x73, 0x76, 0x61, 0xde, 0x18, 0xf4, 0xfb, 0x9a, 0xce, 0xba, 0x42, 0x25, 0xcb, 0x6c, 0xad, 0x8f,
+	0x93, 0xcc, 0x22, 0xd9, 0x3e, 0x95, 0x52, 0x86, 0x53, 0x10, 0x6b, 0xb0, 0xbc, 0xa3, 0x1a, 0xa6,
+	0xfd, 0x8d, 0xc0, 0xf2, 0xf2, 0x57, 0x21, 0xdd, 0x51, 0x7a, 0xed, 0x01, 0xd9, 0xf4, 0x34, 0xb5,
+	0x96, 0x25, 0xe6, 0xbc, 0x05, 0x2c, 0x68, 0x2d, 0x4c, 0x96, 0x82, 0x43, 0xb5, 0x63, 0x62, 0x9d,
+	0x0b, 0xca, 0x4b, 0x62, 0x03, 0x56, 0x7c, 0x4c, 0xb9, 0x43, 0xad, 0x04, 0x7c, 0xfc, 0x19, 0x27,
+	0xba, 0x4b, 0x67, 0xae, 0xef, 0x40, 0xe2, 0x7f, 0x13, 0x60, 0x45, 0x52, 0x8d, 0xe3, 0x7c, 0x4f,
+	0xe9, 0x9c, 0x1a, 0xaa, 0x61, 0x5b, 0x0c, 0x59, 0x88, 0x38, 0x2b, 0xb9, 0x8b, 0x4d, 0x5d, 0x6d,
+	0x8e, 0x71, 0xb4, 0xfb, 0xac, 0xb8, 0x4b, 0x71, 0xa5, 0x74, 0xdf, 0x5d, 0x44, 0x77, 0x61, 0xde,
+	0xa0, 0x93, 0x4a, 0x66, 0x3e, 0x3b, 0x32, 0xb9, 0xcf, 0x96, 0x52, 0x8c, 0x92, 0x25, 0x85, 0xbf,
+	0x05, 0x73, 0x6c, 0x7f, 0x62, 0x19, 0xd3, 0xa5, 0x10, 0x1e, 0x79, 0x8a, 0x25, 0x59, 0xd8, 0xe2,
+	0x1f, 0x09, 0x30, 0x77, 0x7f, 0xa0, 0x18, 0x6a, 0xa5, 0x85, 0xde, 0x85, 0x18, 0xcd, 0x3c, 0xf0,
+	0x1e, 0x8d, 0x4b, 0x53, 0x30, 0x64, 0xef, 0xe6, 0x2d, 0x32, 0xfd, 0xe6, 0xed, 0x32, 0x00, 0xff,
+	0x12, 0x65, 0x2a, 0x6d, 0x3b, 0x01, 0x9f, 0x64, 0xb0, 0xba, 0xd2, 0x46, 0xef, 0x02, 0x41, 0xc6,
+	0x3a, 0xd9, 0x5e, 0xb1, 0xb8, 0x6b, 0x75, 0x28, 0x89, 0x54, 0xea, 0xf6, 0xcd, 0x53, 0xce, 0x96,
+	0x62, 0x6e, 0xc7, 0x20, 0x6a, 0x2a, 0x6d, 0xf1, 0x8f, 0x23, 0x90, 0x25, 0x33, 0x45, 0x35, 0x4c,
+	0xb5, 0xa9, 0x74, 0x98, 0xb6, 0x6e, 0x5b, 0x6b, 0x64, 0x74, 0x0a, 0x7d, 0xf3, 0x15, 0xf2, 0x21,
+	0x24, 0x9f, 0x10, 0x7d, 0xc9, 0x6a, 0xcb, 0xb2, 0xb1, 0x8f, 0x43, 0xe8, 0xfd, 0xed, 0x6e, 0x70,
+	0x45, 0xd3, 0xb0, 0x4c, 0xc5, 0x3a, 0x55, 0xa4, 0x94, 0x78, 0xc2, 0xa0, 0x06, 0xda, 0x05, 0xa4,
+	0xe3, 0x8e, 0x62, 0xaa, 0x4f, 0xb1, 0x7c, 0x48, 0x1d, 0x76, 0xaf, 0x79, 0x3a, 0x61, 0xce, 0x68,
+	0xd1, 0xa2, 0xbc, 0x63, 0x11, 0xe6, 0x8e, 0x61, 0x39, 0xa8, 0xc1, 0x33, 0x0e, 0xf3, 0x25, 0xcf,
+	0x30, 0xb1, 0x19, 0xe9, 0x0c, 0x92, 0xf8, 0x27, 0x8b, 0x90, 0xf6, 0x98, 0x3a, 0x7a, 0x02, 0xab,
+	0xbd, 0x41, 0x17, 0xeb, 0xa4, 0xfb, 0xcc, 0xcf, 0x59, 0x3e, 0x9a, 0xb5, 0xfb, 0xe1, 0x24, 0x13,
+	0x66, 0x63, 0xcf, 0x62, 0x41, 0xdd, 0x1d, 0x9b, 0x83, 0xe5, 0x19, 0x69, 0xb9, 0x17, 0x00, 0x47,
+	0xcf, 0x60, 0xad, 0xa9, 0x98, 0xb8, 0xad, 0x05, 0x34, 0xca, 0xd4, 0xf8, 0xd1, 0x44, 0x8d, 0x16,
+	0x1c, 0x26, 0xde, 0x66, 0x57, 0x9b, 0x81, 0x35, 0x08, 0x03, 0x3a, 0x96, 0x95, 0x9e, 0xd6, 0x3b,
+	0xed, 0xaa, 0xe6, 0xa9, 0x77, 0x2d, 0x7a, 0x6f, 0xa2, 0x26, 0x3f, 0xcd, 0x5b, 0xd4, 0x76, 0x63,
+	0xd9, 0x63, 0x1f, 0x8c, 0x34, 0xd3, 0x91, 0x5b, 0x2a, 0x4d, 0x83, 0x3a, 0xcd, 0xcc, 0x4e, 0xd1,
+	0xcc, 0x4e, 0xd1, 0xa2, 0x76, 0x9a, 0xe9, 0xf8, 0x60, 0x48, 0x87, 0x73, 0xc7, 0x72, 0x57, 0xe9,
+	0x5b, 0xab, 0x9a, 0x93, 0x90, 0xe2, 0xe9, 0xe1, 0xc9, 0x86, 0xee, 0xd3, 0x5d, 0xa5, 0x5f, 0xb2,
+	0x39, 0x38, 0x43, 0x77, 0x1c, 0x00, 0x47, 0x5f, 0x0b, 0x70, 0xa5, 0x85, 0x3b, 0xa6, 0x22, 0xf7,
+	0x75, 0x6c, 0xe0, 0x5e, 0x13, 0x07, 0xb4, 0xce, 0x52, 0xc8, 0xdb, 0x13, 0xb5, 0x5e, 0x24, 0xcc,
+	0xf6, 0x39, 0xaf, 0x00, 0x31, 0x2e, 0xb5, 0x46, 0x21, 0xe4, 0x76, 0x60, 0x39, 0xc8, 0xf4, 0xce,
+	0x36, 0x79, 0x72, 0x7b, 0xb0, 0x1a, 0x6c, 0x53, 0x67, 0xe4, 0xf7, 0xb5, 0x00, 0x59, 0xbf, 0xc5,
+	0xa0, 0x8f, 0x86, 0x3d, 0xd3, 0x38, 0x76, 0x8e, 0xef, 0xf9, 0x18, 0x92, 0xc4, 0x4b, 0x98, 0xa7,
+	0x4e, 0x9a, 0x3a, 0xcc, 0x8b, 0x97, 0x28, 0x1e, 0xa1, 0xc6, 0xfc, 0x57, 0xee, 0xd7, 0x05, 0xc8,
+	0xfa, 0x4d, 0xeb, 0xf9, 0xe4, 0xa9, 0xc2, 0x92, 0x81, 0x7b, 0x86, 0x4a, 0x9d, 0xa1, 0x62, 0x9a,
+	0xba, 0xda, 0x18, 0x98, 0x78, 0x42, 0x67, 0x88, 0x6c, 0xd2, 0xbc, 0x45, 0x99, 0xfb, 0x26, 0x0e,
+	0xcb, 0x41, 0x16, 0x89, 0x1a, 0xc3, 0x62, 0x96, 0xce, 0x6c, 0xdf, 0x1b, 0x75, 0xa5, 0xdd, 0xc6,
+	0x2d, 0xbf, 0x67, 0xbf, 0x0c, 0x29, 0x1d, 0xb7, 0x99, 0x25, 0xb7, 0xac, 0xc0, 0x0b, 0x18, 0x88,
+	0xc6, 0x3a, 0x06, 0x64, 0x95, 0xc1, 0x89, 0xda, 0x51, 0x15, 0xfd, 0x94, 0xc5, 0x02, 0xd6, 0x42,
+	0x5e, 0x3e, 0xbb, 0x2c, 0x79, 0x8b, 0x23, 0x5b, 0xc0, 0x16, 0x14, 0x4f, 0xd9, 0xc8, 0xfd, 0x67,
+	0x01, 0x52, 0x2e, 0x79, 0x7f, 0x1c, 0xd7, 0xff, 0xdc, 0xff, 0x8c, 0x40, 0xc6, 0xab, 0x87, 0xe7,
+	0x5a, 0xfd, 0xf5, 0x61, 0x63, 0x39, 0x78, 0x51, 0x03, 0x64, 0x85, 0x07, 0x2f, 0x39, 0x2c, 0x68,
+	0xc2, 0xbc, 0xbb, 0xa1, 0x97, 0x12, 0x0e, 0xe4, 0x7e, 0x20, 0xc0, 0xa5, 0x91, 0x1e, 0x78, 0x1a,
+	0xef, 0xc0, 0xc5, 0x9d, 0x66, 0x3e, 0x49, 0xa1, 0xf3, 0xe9, 0xfa, 0x84, 0xc1, 0xda, 0xd0, 0x74,
+	0xb1, 0x53, 0x05, 0xbf, 0x7c, 0x0d, 0x2e, 0xd2, 0x7d, 0xc1, 0x57, 0xd8, 0xd9, 0x15, 0x93, 0xcd,
+	0x82, 0xb5, 0x93, 0xff, 0x12, 0xd6, 0x9c, 0x9d, 0xfc, 0x73, 0x6c, 0x16, 0x56, 0x6d, 0x2e, 0xde,
+	0xc8, 0xea, 0x11, 0x38, 0x35, 0xf2, 0x99, 0xf7, 0x0f, 0xcb, 0x36, 0x8f, 0x9a, 0x6b, 0x23, 0xf1,
+	0x73, 0xc2, 0x70, 0xd8, 0xe6, 0xc9, 0x13, 0x84, 0xf9, 0xa3, 0x51, 0x1a, 0xf1, 0x45, 0x71, 0x6c,
+	0x97, 0x3d, 0x1c, 0xc5, 0xf1, 0xdd, 0xf7, 0x5f, 0x15, 0x82, 0xc2, 0x38, 0x2e, 0x04, 0x73, 0x00,
+	0xf7, 0xce, 0x22, 0x84, 0x7f, 0x05, 0xb6, 0xc5, 0x18, 0x8a, 0xea, 0xb8, 0x20, 0xa6, 0x37, 0xaa,
+	0xe3, 0x12, 0xb0, 0x10, 0xa8, 0x78, 0x16, 0x09, 0x9c, 0x25, 0xdb, 0x6e, 0xdb, 0x15, 0xe4, 0x39,
+	0xad, 0xba, 0x83, 0x3c, 0xde, 0x6a, 0xfc, 0xec, 0xad, 0x3a, 0x0b, 0xb3, 0xd3, 0x6a, 0xc7, 0x07,
+	0x43, 0x3f, 0x2f, 0x04, 0x04, 0x7d, 0xbc, 0xed, 0xb9, 0xb3, 0x0f, 0xbc, 0xd7, 0xed, 0x39, 0x03,
+	0x7f, 0x1c, 0x00, 0x47, 0xbf, 0x3a, 0x32, 0x06, 0xe4, 0xc2, 0x24, 0xa9, 0x30, 0xf7, 0xcf, 0x22,
+	0x4c, 0x88, 0x43, 0xb2, 0xa5, 0x0a, 0x0b, 0x09, 0x19, 0x42, 0xee, 0x87, 0x82, 0x3f, 0x26, 0xe4,
+	0x72, 0x7f, 0x08, 0xc9, 0xae, 0xda, 0x93, 0xd9, 0x09, 0xb2, 0xd1, 0x87, 0x5f, 0xd8, 0xe9, 0xa8,
+	0x44, 0x57, 0xed, 0xd1, 0x5f, 0x94, 0x54, 0x39, 0xe1, 0xa4, 0x91, 0x89, 0x48, 0x95, 0x13, 0x46,
+	0x5a, 0x82, 0x85, 0x27, 0x03, 0xa5, 0x67, 0xaa, 0x1d, 0x2c, 0xf3, 0x93, 0x59, 0xb3, 0x13, 0x9c,
+	0xcc, 0xca, 0x58, 0x44, 0xb4, 0x68, 0xe4, 0xbe, 0x9e, 0x1d, 0x8e, 0x4d, 0x79, 0xbf, 0x7e, 0x5b,
+	0x80, 0x57, 0x29, 0x67, 0x67, 0xd9, 0x91, 0x8f, 0x54, 0xc3, 0xd4, 0xda, 0xba, 0xd2, 0x95, 0x1b,
+	0x83, 0xe6, 0x31, 0x36, 0xad, 0x4f, 0xd4, 0x8f, 0x5f, 0xdc, 0x8c, 0x1c, 0x02, 0x97, 0xad, 0x36,
+	0xb7, 0x69, 0x93, 0xd2, 0x2b, 0x54, 0x28, 0x7b, 0x45, 0xf3, 0x55, 0x1b, 0xb9, 0x7f, 0x16, 0x81,
+	0xcb, 0x63, 0x78, 0xa0, 0x6f, 0xc3, 0x05, 0x7f, 0xd7, 0x3a, 0xda, 0x33, 0xac, 0xcb, 0xf4, 0xe4,
+	0x01, 0x4f, 0xf7, 0xad, 0x79, 0x1b, 0xda, 0x21, 0x08, 0xf4, 0x20, 0x42, 0x10, 0xf9, 0xa0, 0xdf,
+	0xb7, 0xc9, 0x23, 0x41, 0xe4, 0x07, 0x04, 0x81, 0x91, 0x5f, 0x86, 0x14, 0x53, 0x9f, 0x6c, 0xa8,
+	0x5f, 0xb1, 0x40, 0x24, 0x2a, 0x01, 0x03, 0xd5, 0xd4, 0xaf, 0x30, 0xba, 0x07, 0x69, 0x8e, 0xe0,
+	0x19, 0xda, 0xd7, 0x47, 0x0d, 0xad, 0xdd, 0x90, 0x34, 0xcf, 0x68, 0xd9, 0x08, 0xa3, 0x9b, 0x80,
+	0xdc, 0xbc, 0x64, 0x96, 0x98, 0x8e, 0xd1, 0x36, 0xb3, 0x2e, 0xcc, 0x02, 0x81, 0xe7, 0xbe, 0x89,
+	0xb9, 0xb7, 0x16, 0xdc, 0x12, 0x7e, 0x4b, 0x80, 0xab, 0xf8, 0xc9, 0x40, 0x7d, 0xaa, 0x74, 0xe8,
+	0xb4, 0x6c, 0x76, 0x14, 0xc3, 0x08, 0xb5, 0x85, 0x2f, 0x5f, 0x84, 0x6f, 0x74, 0x01, 0xfc, 0xe3,
+	0x7f, 0xc5, 0x25, 0x4a, 0x81, 0x48, 0x32, 0x64, 0x01, 0xbf, 0x22, 0x40, 0xce, 0xa1, 0x2f, 0xf9,
+	0xd0, 0xd1, 0x1d, 0xc8, 0xda, 0xb1, 0x87, 0x3c, 0xc5, 0xa9, 0xc6, 0x8c, 0x15, 0x80, 0x70, 0xcd,
+	0xbe, 0x0b, 0xab, 0xc3, 0x5a, 0xa1, 0x23, 0xca, 0x0c, 0x60, 0xd9, 0x2f, 0x28, 0x19, 0xdb, 0xdc,
+	0x2f, 0x46, 0xe1, 0x7c, 0x68, 0xe7, 0xd0, 0x3d, 0x10, 0x83, 0x79, 0x06, 0xd8, 0xe7, 0x2b, 0x41,
+	0xfc, 0x5d, 0x56, 0x1a, 0xce, 0x6b, 0xd8, 0x58, 0x03, 0x79, 0x4d, 0x63, 0xb2, 0x7f, 0x59, 0x08,
+	0xb6, 0x59, 0xf9, 0x05, 0x5b, 0x83, 0x7f, 0x34, 0x9f, 0xcb, 0xda, 0xff, 0xee, 0x9c, 0x7b, 0xe3,
+	0xca, 0xad, 0xfd, 0xf7, 0x04, 0x78, 0xd3, 0xd9, 0x7c, 0x4e, 0xea, 0x01, 0xbf, 0x7c, 0x11, 0x6b,
+	0xb3, 0x0b, 0xe0, 0xb7, 0xfa, 0xeb, 0xb6, 0x48, 0x0f, 0x46, 0xbb, 0xbf, 0xdf, 0x89, 0x40, 0xce,
+	0x61, 0xf3, 0xe7, 0xcb, 0xf8, 0x51, 0x1e, 0x2e, 0xf5, 0x06, 0x5d, 0xb9, 0x45, 0x42, 0xed, 0x5e,
+	0xd3, 0x94, 0x7d, 0x7a, 0x36, 0xb8, 0x61, 0xe5, 0x7a, 0x83, 0x6e, 0x91, 0xe3, 0xd4, 0x3c, 0xfd,
+	0x36, 0xd0, 0x67, 0xb0, 0x6c, 0x6a, 0xfd, 0x61, 0xca, 0xa9, 0x5c, 0x24, 0x32, 0xb5, 0xbe, 0x8f,
+	0x71, 0xee, 0x3b, 0x51, 0x38, 0x1f, 0xaa, 0x7f, 0xb4, 0x0f, 0xaf, 0x87, 0x1b, 0xc5, 0xf0, 0xdc,
+	0x7c, 0x35, 0x64, 0xb8, 0x5c, 0xd3, 0x73, 0x24, 0xc7, 0xe1, 0x19, 0x1a, 0xc6, 0xf1, 0xff, 0xdb,
+	0x24, 0x1d, 0x61, 0xbc, 0x2f, 0x74, 0x92, 0xfe, 0x6a, 0xcc, 0x9f, 0xba, 0xe1, 0x13, 0xf5, 0x37,
+	0x04, 0xc8, 0x0d, 0x05, 0xad, 0xf6, 0xfc, 0xe4, 0x56, 0x7d, 0xf8, 0xa2, 0xe2, 0x56, 0x1f, 0xd0,
+	0x3f, 0x3f, 0xcf, 0x1d, 0x07, 0x57, 0xe7, 0xfe, 0xa6, 0x00, 0x17, 0xbc, 0xa4, 0x7c, 0x43, 0xcb,
+	0x95, 0xf1, 0xa2, 0x26, 0xe4, 0x26, 0x2c, 0x39, 0x9f, 0x21, 0xed, 0x6d, 0x0b, 0x37, 0x1e, 0x64,
+	0x57, 0xd9, 0x8e, 0x34, 0xf7, 0xaf, 0x22, 0x70, 0x69, 0x64, 0x9f, 0xd0, 0x55, 0x48, 0x93, 0xc8,
+	0xd6, 0x61, 0xc6, 0x6c, 0x7b, 0xbe, 0xab, 0xf6, 0x6c, 0x36, 0x14, 0x49, 0x39, 0x19, 0x6a, 0x71,
+	0xbe, 0xab, 0x9c, 0x38, 0x48, 0x3e, 0xcb, 0x8c, 0x0d, 0x59, 0xe6, 0x2f, 0x0e, 0x59, 0x26, 0xbb,
+	0x8d, 0xd4, 0x7a, 0x49, 0xc3, 0xe7, 0x19, 0x83, 0x89, 0xcc, 0x73, 0x2e, 0xc4, 0x3c, 0xff, 0x2c,
+	0x16, 0x9a, 0xeb, 0xe0, 0x76, 0xfa, 0x87, 0x02, 0x5c, 0x0d, 0xdf, 0xd8, 0xf8, 0x0d, 0xf6, 0xe4,
+	0x85, 0xef, 0x6d, 0xc2, 0x6a, 0x87, 0x02, 0xab, 0xd6, 0x18, 0xbc, 0xdc, 0x6f, 0x08, 0xf0, 0x5a,
+	0x08, 0xb3, 0x97, 0x63, 0xd4, 0xef, 0xc0, 0x8a, 0x63, 0xd4, 0x7d, 0x5d, 0x6b, 0x28, 0x0d, 0xb5,
+	0x63, 0x19, 0x99, 0x20, 0x2d, 0xdb, 0x95, 0xfb, 0x4e, 0x5d, 0xee, 0xbf, 0x47, 0xe0, 0xda, 0x64,
+	0x5d, 0x46, 0xd7, 0x61, 0x81, 0x58, 0xb8, 0x9b, 0xb3, 0x40, 0x39, 0x67, 0xba, 0x6a, 0xcf, 0xc5,
+	0x93, 0x22, 0x2a, 0x27, 0x01, 0x22, 0x64, 0xba, 0xca, 0x89, 0x1b, 0x71, 0xac, 0xa5, 0x7f, 0x2f,
+	0xc4, 0xd2, 0x9f, 0xfe, 0x3f, 0x1b, 0xf7, 0x17, 0x66, 0xfb, 0xdb, 0x09, 0xeb, 0x14, 0x89, 0xf8,
+	0x08, 0x32, 0xde, 0x65, 0x09, 0x6d, 0x59, 0x97, 0xaa, 0x26, 0xd9, 0x12, 0xf3, 0x0b, 0x57, 0xc1,
+	0xe7, 0x66, 0x7e, 0x2d, 0x0a, 0x31, 0xb6, 0xe9, 0x7d, 0x1d, 0xd2, 0x6a, 0xcf, 0xc4, 0x6d, 0xac,
+	0xbb, 0xb6, 0xdb, 0xd1, 0xf2, 0x8c, 0x34, 0xcf, 0xc1, 0x0c, 0xed, 0x55, 0x48, 0x1d, 0x76, 0x34,
+	0xc5, 0x74, 0x6d, 0xac, 0x85, 0xf2, 0x8c, 0x04, 0x14, 0xc8, 0x50, 0xae, 0xc2, 0xbc, 0x61, 0xea,
+	0x6a, 0xaf, 0x2d, 0x7b, 0x6f, 0x7e, 0xa5, 0x18, 0xd4, 0x6e, 0xae, 0xa1, 0x69, 0x1d, 0xac, 0x58,
+	0xbb, 0xfb, 0x59, 0x7e, 0xac, 0x78, 0x9e, 0x83, 0xed, 0xad, 0xb8, 0x7d, 0xcf, 0x81, 0x23, 0xc6,
+	0xc6, 0xdd, 0x76, 0x28, 0xcf, 0x48, 0x19, 0x9b, 0x88, 0xb1, 0xf9, 0x16, 0x00, 0x81, 0x70, 0x0e,
+	0x71, 0x6f, 0xaa, 0xdb, 0x3c, 0xed, 0x63, 0x4a, 0x5d, 0x3d, 0x2c, 0x2a, 0xa7, 0xe5, 0x19, 0x29,
+	0x49, 0x70, 0x19, 0xe1, 0x16, 0x40, 0x4b, 0x31, 0x2d, 0x42, 0x96, 0xae, 0x59, 0xf4, 0x10, 0x16,
+	0x15, 0x13, 0x13, 0x1a, 0x82, 0xc6, 0x68, 0x0a, 0xb0, 0xd8, 0x52, 0x4e, 0x65, 0xed, 0x50, 0x7e,
+	0x86, 0xf1, 0x31, 0x27, 0x4d, 0xd0, 0xd3, 0x5e, 0xab, 0x3e, 0xd2, 0xd3, 0xea, 0xe1, 0x67, 0x18,
+	0x1f, 0x13, 0x89, 0x5b, 0x56, 0x81, 0x32, 0xb1, 0x53, 0xa2, 0x3f, 0x05, 0x49, 0xfb, 0x92, 0x10,
+	0xfa, 0x84, 0xde, 0x5b, 0xe3, 0xb7, 0x92, 0x46, 0x7f, 0x10, 0x28, 0xf2, 0xeb, 0x48, 0xe5, 0x19,
+	0x29, 0xd1, 0xe2, 0xbf, 0xb7, 0x33, 0x30, 0xdf, 0x57, 0x74, 0x03, 0xb7, 0xd8, 0x65, 0x57, 0xf1,
+	0xaf, 0x47, 0x20, 0x61, 0x21, 0xa2, 0xd7, 0xe9, 0x6d, 0x42, 0xcb, 0xa6, 0x86, 0x3b, 0x49, 0x2f,
+	0x18, 0x62, 0xf4, 0x3e, 0xa4, 0x5c, 0xbd, 0xe3, 0x97, 0x78, 0x43, 0xfa, 0x45, 0xb4, 0xc2, 0x7f,
+	0xa2, 0x75, 0x98, 0xa5, 0x62, 0x47, 0x47, 0x29, 0x5f, 0xa2, 0x38, 0xa8, 0x04, 0x74, 0x08, 0xe4,
+	0xaf, 0xb4, 0x9e, 0x75, 0x41, 0xf0, 0xc6, 0x98, 0x7e, 0x52, 0x1e, 0x8f, 0xb4, 0x1e, 0x96, 0x12,
+	0x26, 0xff, 0x95, 0x7b, 0x1b, 0x12, 0x16, 0x14, 0xbd, 0x0e, 0x19, 0x76, 0x37, 0x45, 0xee, 0xaa,
+	0xbd, 0x81, 0x75, 0xee, 0x28, 0x26, 0xa5, 0x19, 0x74, 0x97, 0x01, 0xc5, 0x3f, 0x13, 0x20, 0xeb,
+	0x3f, 0xf9, 0x8a, 0x3a, 0x70, 0xde, 0x39, 0x57, 0x64, 0x7a, 0x4e, 0x60, 0x1a, 0x5c, 0x5d, 0x1b,
+	0x63, 0xbe, 0xcb, 0x78, 0xcf, 0x6d, 0x1a, 0xe5, 0x19, 0xe9, 0x9c, 0x1a, 0x5c, 0x85, 0x30, 0xac,
+	0xf2, 0x6b, 0x31, 0xfe, 0xa6, 0xd8, 0x88, 0xdf, 0x1c, 0x79, 0x45, 0x66, 0xb8, 0xa1, 0x15, 0x3d,
+	0xa8, 0x62, 0x3b, 0x0b, 0x19, 0x2f, 0x7f, 0xf1, 0x47, 0x73, 0x70, 0x6e, 0x5f, 0x57, 0xbb, 0x34,
+	0x10, 0xf6, 0xa2, 0x23, 0x09, 0x32, 0x3a, 0xee, 0x77, 0x14, 0xb2, 0x1d, 0x71, 0x1f, 0x35, 0x78,
+	0x23, 0x54, 0x18, 0x8a, 0xcc, 0xfd, 0x19, 0xff, 0x30, 0x9c, 0xe6, 0x2c, 0xb8, 0x5a, 0xef, 0x01,
+	0x3f, 0x6d, 0xef, 0x3d, 0x48, 0x70, 0x75, 0xe4, 0x95, 0x0c, 0x9b, 0xd9, 0xbc, 0xee, 0x2a, 0xa3,
+	0xbf, 0x00, 0x2b, 0xcd, 0x23, 0x85, 0x1e, 0xc9, 0xd7, 0xe9, 0x9d, 0x7a, 0xef, 0x49, 0x81, 0xb0,
+	0xb3, 0x4a, 0x05, 0x8b, 0x66, 0x57, 0x31, 0x8e, 0x6d, 0xd6, 0x4b, 0xcd, 0x61, 0x30, 0x32, 0xe1,
+	0x52, 0x53, 0x3f, 0xed, 0x9b, 0x9a, 0x6c, 0x29, 0xe2, 0xf0, 0xf0, 0x44, 0x3e, 0xec, 0x63, 0xef,
+	0x61, 0x81, 0xb0, 0xbb, 0xbc, 0x05, 0x4a, 0xcb, 0xd5, 0x72, 0xe7, 0xf0, 0xe4, 0x4e, 0xdf, 0xd1,
+	0xcb, 0xf9, 0x66, 0x58, 0x25, 0xea, 0xc3, 0x85, 0x43, 0xf5, 0x04, 0xb7, 0x58, 0x6e, 0x81, 0x2d,
+	0x12, 0xc4, 0xb3, 0x7a, 0x0e, 0x0d, 0x6c, 0x86, 0x7e, 0x58, 0x3a, 0xc1, 0x2d, 0xb2, 0x30, 0x6e,
+	0x5b, 0x74, 0x76, 0x93, 0x6b, 0x87, 0x21, 0x75, 0xa8, 0x06, 0xd9, 0xa1, 0x66, 0xe2, 0xa3, 0xaf,
+	0xa5, 0x0c, 0x71, 0x5f, 0x68, 0xf8, 0x98, 0x9a, 0x70, 0xc9, 0xd2, 0xda, 0x33, 0xd5, 0x3c, 0x72,
+	0xee, 0x7b, 0x5b, 0x2d, 0xcc, 0x8d, 0x54, 0x1e, 0xd7, 0xcc, 0x67, 0xaa, 0x79, 0x64, 0x4d, 0x28,
+	0x47, 0x79, 0x7a, 0x58, 0x25, 0xba, 0x0f, 0x59, 0xea, 0x46, 0xfa, 0x8a, 0x6e, 0xdb, 0x58, 0x62,
+	0xe4, 0x45, 0x41, 0xe2, 0x2e, 0xf6, 0x15, 0xdd, 0xb1, 0x32, 0xba, 0x90, 0x38, 0x10, 0xf4, 0x19,
+	0x20, 0x6e, 0x05, 0x47, 0x8a, 0x71, 0x64, 0x31, 0x4d, 0x8e, 0x3c, 0x1a, 0xc9, 0x86, 0xbe, 0xac,
+	0x18, 0x47, 0xce, 0xc9, 0x90, 0xa6, 0x0f, 0x46, 0x2f, 0x70, 0x10, 0xd7, 0x6e, 0x1c, 0xa9, 0x87,
+	0xb6, 0xb0, 0xa9, 0x91, 0x7a, 0x27, 0xae, 0xaf, 0x46, 0xd0, 0x1d, 0xbd, 0xb7, 0xbc, 0xa0, 0x80,
+	0x49, 0xfe, 0x8d, 0x00, 0x19, 0x6f, 0x2f, 0xd1, 0x03, 0x58, 0xa0, 0x1a, 0x32, 0x35, 0x99, 0x5f,
+	0x6b, 0xe1, 0xf7, 0xd2, 0x37, 0x26, 0xd2, 0x92, 0x5d, 0x94, 0xd2, 0x84, 0x4d, 0x5d, 0x2b, 0x31,
+	0x26, 0xe2, 0xcf, 0x09, 0xcc, 0xff, 0x92, 0x3a, 0x74, 0x1e, 0x56, 0xea, 0x95, 0xdd, 0x92, 0xbc,
+	0x9f, 0x97, 0xea, 0xbe, 0xb3, 0xc8, 0x09, 0x98, 0x7d, 0x58, 0xca, 0x4b, 0x59, 0x01, 0x25, 0x21,
+	0xb6, 0x5b, 0xdd, 0xab, 0x97, 0xb3, 0x11, 0x94, 0x85, 0xf9, 0x62, 0xfe, 0xa1, 0x5c, 0xbd, 0x23,
+	0x33, 0x48, 0x14, 0x2d, 0x40, 0x8a, 0x43, 0x3e, 0x2b, 0x95, 0x3e, 0xcd, 0xce, 0x12, 0x14, 0xf2,
+	0x8b, 0x40, 0x28, 0x7d, 0x8c, 0xa0, 0x94, 0xab, 0x07, 0x12, 0x81, 0x14, 0xf3, 0x0f, 0xb3, 0x71,
+	0xb1, 0x06, 0x59, 0xbf, 0xf6, 0xd1, 0x4f, 0x00, 0xf0, 0x21, 0x1c, 0x7f, 0xed, 0x90, 0x11, 0xd3,
+	0x6b, 0x87, 0x4d, 0xeb, 0xa7, 0x58, 0x05, 0x34, 0xec, 0xde, 0xd0, 0x87, 0x90, 0xec, 0xe1, 0x67,
+	0xd3, 0x7c, 0xaa, 0xe8, 0xe1, 0x67, 0xf4, 0x97, 0x78, 0x01, 0xce, 0x87, 0x5a, 0xb8, 0x98, 0x81,
+	0x79, 0xb7, 0xe7, 0x13, 0x7f, 0x14, 0x81, 0x34, 0x71, 0x5b, 0x46, 0x5d, 0xab, 0xb4, 0x7b, 0x9a,
+	0x8e, 0xd1, 0x06, 0x20, 0xdb, 0x61, 0x19, 0x64, 0x14, 0x8d, 0x63, 0x95, 0xdd, 0xe1, 0x4b, 0x52,
+	0x53, 0xb3, 0xeb, 0xea, 0x5a, 0xed, 0x58, 0xed, 0xa3, 0x53, 0xb8, 0xd0, 0xd4, 0xba, 0x5d, 0xad,
+	0x27, 0x7b, 0xc9, 0x54, 0xca, 0x8e, 0xaf, 0xe8, 0x1f, 0x8c, 0xf0, 0x98, 0x76, 0xd3, 0x1b, 0x05,
+	0xca, 0xc7, 0x03, 0x23, 0xce, 0xa5, 0x69, 0x83, 0xad, 0x86, 0x59, 0x9d, 0xf8, 0x5d, 0x01, 0x96,
+	0x02, 0x68, 0xd0, 0x35, 0x10, 0x0b, 0xd5, 0xdd, 0xdd, 0xea, 0x9e, 0x5c, 0x28, 0xe7, 0xa5, 0x9a,
+	0x5c, 0xaf, 0xca, 0x95, 0xbb, 0x7b, 0x55, 0xc9, 0xff, 0x68, 0x41, 0x0a, 0xe6, 0xf6, 0x0e, 0x76,
+	0x4b, 0x52, 0xa5, 0x90, 0x15, 0xd0, 0x32, 0x64, 0xf3, 0x3b, 0xfb, 0xe5, 0xbc, 0x7c, 0xb0, 0xbf,
+	0x5f, 0x92, 0xe4, 0x42, 0xbe, 0x56, 0xca, 0x46, 0x1c, 0xe8, 0x4e, 0xf5, 0x33, 0x0b, 0x4a, 0x8d,
+	0x67, 0xff, 0x60, 0xaf, 0x50, 0x3f, 0xc8, 0xd7, 0x2b, 0xd5, 0xbd, 0xec, 0x2c, 0xca, 0x00, 0x7c,
+	0x56, 0xae, 0xd4, 0x4b, 0xb5, 0xfd, 0x7c, 0xa1, 0x94, 0x8d, 0x6d, 0xcf, 0x03, 0x38, 0xda, 0x10,
+	0xff, 0x98, 0xc8, 0x19, 0xb0, 0x08, 0xbc, 0x09, 0x8b, 0x64, 0x71, 0xa1, 0xae, 0xd1, 0xaa, 0xe6,
+	0x27, 0x6c, 0xb3, 0xbc, 0xc2, 0x26, 0x43, 0xaf, 0x41, 0xa6, 0x37, 0xe8, 0x36, 0xb0, 0x4e, 0x94,
+	0x4b, 0x6a, 0xf9, 0x25, 0xca, 0x79, 0x06, 0xad, 0x6b, 0x84, 0x31, 0xd9, 0xe3, 0xeb, 0xf8, 0x29,
+	0xd6, 0x0d, 0x2c, 0x6b, 0x7a, 0x0b, 0xb3, 0x5b, 0x73, 0x09, 0xb2, 0xbc, 0x51, 0x60, 0x95, 0xc0,
+	0xd0, 0x03, 0x58, 0x0e, 0x1c, 0xab, 0xd9, 0x91, 0xc7, 0x9b, 0x3d, 0x3a, 0x96, 0x50, 0x73, 0x78,
+	0x3c, 0xfe, 0xa9, 0x00, 0x6b, 0x61, 0xab, 0x04, 0xfa, 0x36, 0xa4, 0xfc, 0xc9, 0xb7, 0x71, 0x36,
+	0x0d, 0x1d, 0xf7, 0x87, 0x9c, 0x94, 0x3f, 0xd3, 0x36, 0x96, 0x7c, 0x30, 0x32, 0xe1, 0x26, 0xb8,
+	0x37, 0x7b, 0xe2, 0x2f, 0x45, 0x60, 0xc1, 0x2f, 0xf2, 0x5d, 0x98, 0xb3, 0x52, 0xc7, 0x6c, 0x4b,
+	0x7c, 0x6b, 0xb2, 0x35, 0x8b, 0x97, 0x25, 0x8b, 0x9a, 0x1e, 0x59, 0xe7, 0xfb, 0xd8, 0x0d, 0x88,
+	0x76, 0xd5, 0xde, 0x44, 0xdd, 0x27, 0x88, 0x14, 0x5f, 0x39, 0x99, 0xa8, 0xbf, 0x04, 0x11, 0x55,
+	0x60, 0x91, 0x2f, 0x61, 0xf4, 0xbe, 0xb8, 0xb3, 0x67, 0x1a, 0x47, 0x9d, 0x75, 0x91, 0x31, 0x47,
+	0xf2, 0x07, 0xb3, 0x70, 0x3e, 0x34, 0xd0, 0x78, 0x6e, 0xc7, 0x87, 0x3e, 0x80, 0x39, 0x7a, 0x8d,
+	0x9f, 0x5f, 0x83, 0x9c, 0xe0, 0xba, 0x35, 0x47, 0x47, 0x06, 0x2c, 0x70, 0x97, 0xa3, 0x74, 0xfa,
+	0x47, 0x4a, 0x03, 0xb3, 0xe3, 0x06, 0x99, 0xd0, 0x4f, 0xdf, 0xa1, 0xbd, 0xd8, 0xb8, 0x73, 0x78,
+	0xc2, 0x3c, 0xc8, 0x1e, 0x3d, 0x7d, 0x93, 0xe7, 0xfc, 0xc8, 0x5a, 0xcd, 0x9a, 0xb0, 0x20, 0xe8,
+	0x0d, 0xe0, 0x0f, 0xe9, 0x38, 0x8d, 0xc6, 0xb8, 0x53, 0xcc, 0xb0, 0x0a, 0x1b, 0x75, 0x15, 0x62,
+	0xba, 0xd2, 0x52, 0x4f, 0x68, 0xa4, 0x13, 0x2b, 0xcf, 0x48, 0xac, 0x48, 0xcf, 0xca, 0x0d, 0x74,
+	0x5d, 0x6b, 0x2b, 0xa6, 0xeb, 0xed, 0x1f, 0x1e, 0x44, 0x8c, 0xbd, 0xb4, 0xb2, 0x68, 0xd3, 0x5a,
+	0x20, 0xf1, 0x6f, 0x08, 0x70, 0x2e, 0xa4, 0x07, 0x68, 0x1d, 0xae, 0xdd, 0xb9, 0xf3, 0xb9, 0xcc,
+	0x1d, 0xe1, 0x5e, 0xbe, 0x5e, 0x79, 0x50, 0x92, 0xa9, 0x2f, 0xdb, 0x2e, 0xd5, 0x47, 0x39, 0x42,
+	0xb2, 0xec, 0x95, 0x3e, 0xcf, 0x17, 0x4b, 0x85, 0xca, 0x6e, 0x7e, 0x27, 0x1b, 0x41, 0x17, 0x61,
+	0xcd, 0xf1, 0x89, 0x8c, 0x85, 0x6c, 0xa1, 0x47, 0xd1, 0x22, 0xa4, 0xbd, 0xa0, 0xd9, 0x6d, 0x80,
+	0x84, 0xa5, 0x23, 0xf1, 0x7f, 0x09, 0x90, 0xb4, 0x87, 0x1f, 0x55, 0x20, 0x49, 0x23, 0x08, 0xd5,
+	0xba, 0x38, 0x16, 0x1e, 0xf3, 0xd7, 0x2d, 0x3c, 0x9b, 0x9a, 0xee, 0xa5, 0x2d, 0x28, 0x61, 0x35,
+	0xe8, 0x3d, 0xd3, 0x95, 0x7e, 0x1f, 0x5b, 0xee, 0x20, 0x8c, 0xd5, 0x81, 0x85, 0xe7, 0x61, 0x65,
+	0x53, 0xa3, 0x5d, 0x48, 0x1d, 0x77, 0x0d, 0xd9, 0x62, 0x36, 0x3a, 0xc8, 0xff, 0xb4, 0x6b, 0x7c,
+	0x36, 0xcc, 0x0d, 0x8e, 0x6d, 0xf0, 0x76, 0x02, 0xe2, 0xec, 0xb0, 0x8f, 0x78, 0x03, 0xd0, 0x70,
+	0x37, 0x82, 0xae, 0x7c, 0x88, 0xd7, 0x00, 0x0d, 0x4b, 0x89, 0xb2, 0x10, 0xb5, 0x26, 0xd7, 0xbc,
+	0x44, 0x7e, 0x8a, 0x5f, 0xc2, 0x52, 0x80, 0x00, 0xc4, 0xbd, 0x71, 0x62, 0xd9, 0x21, 0x00, 0x0e,
+	0x22, 0x08, 0xd7, 0x60, 0xc1, 0x99, 0xad, 0xee, 0x5b, 0x25, 0x69, 0x7b, 0x42, 0xd2, 0x5b, 0x70,
+	0x7f, 0x2a, 0xc0, 0x82, 0x2f, 0x12, 0x44, 0x37, 0x20, 0xeb, 0x72, 0xbd, 0x72, 0x4b, 0x39, 0xb5,
+	0xb6, 0xbb, 0x19, 0xc7, 0xc3, 0x16, 0x95, 0x53, 0x83, 0x60, 0xba, 0x7c, 0x3c, 0xc3, 0x64, 0xab,
+	0x54, 0xc6, 0x71, 0xe5, 0x14, 0xd3, 0x35, 0xf9, 0xa3, 0xd3, 0x4d, 0xfe, 0xbc, 0xc7, 0xef, 0xcc,
+	0x4e, 0xe6, 0x77, 0xe8, 0x41, 0x45, 0xab, 0x40, 0x06, 0xa8, 0x8b, 0xcd, 0x23, 0xad, 0x25, 0x7e,
+	0x3f, 0x02, 0xe7, 0x42, 0x36, 0xd5, 0x48, 0x83, 0x85, 0xe1, 0xdd, 0xf9, 0xa8, 0x53, 0xa7, 0x21,
+	0x8c, 0x42, 0xe0, 0x92, 0x9f, 0x7b, 0xee, 0x5f, 0x0a, 0xb0, 0x1a, 0x8c, 0xfb, 0xdc, 0xcf, 0xa5,
+	0xa9, 0xb0, 0xd6, 0xb7, 0xf6, 0xe2, 0xbe, 0x44, 0x00, 0x9f, 0x3b, 0x1b, 0xe1, 0x27, 0xdd, 0x82,
+	0xb6, 0xf0, 0xd2, 0xb9, 0x7e, 0x70, 0x85, 0xf8, 0x73, 0x51, 0x58, 0xa2, 0x83, 0xe6, 0xeb, 0xc2,
+	0xfb, 0x10, 0xa7, 0x27, 0x12, 0x27, 0x3d, 0x62, 0xcc, 0xb1, 0x51, 0x11, 0x92, 0x4d, 0xad, 0xd7,
+	0x52, 0x5d, 0xcf, 0x6a, 0x5c, 0x1b, 0x99, 0xb3, 0x28, 0x58, 0xd8, 0x92, 0x43, 0x88, 0x8e, 0x47,
+	0x28, 0x60, 0xf6, 0x2c, 0x0a, 0x28, 0xcf, 0x84, 0xaa, 0x60, 0x74, 0x86, 0x27, 0xf6, 0x82, 0x33,
+	0x3c, 0x01, 0xbb, 0xb2, 0x1f, 0x0a, 0xb0, 0x12, 0x98, 0xbf, 0x41, 0x32, 0xac, 0xb0, 0x37, 0x4e,
+	0x82, 0x2d, 0x7b, 0x7d, 0xd4, 0x98, 0xf8, 0x0c, 0x60, 0xf9, 0x70, 0x18, 0x68, 0xa0, 0x87, 0xb0,
+	0xc4, 0xd3, 0x4d, 0xc6, 0xa0, 0xdf, 0xd7, 0xb1, 0x61, 0xf0, 0x5c, 0x53, 0x74, 0x44, 0xd6, 0x8d,
+	0xc9, 0x5a, 0x73, 0x08, 0x24, 0xa4, 0xfb, 0x41, 0x86, 0xf8, 0x10, 0x16, 0x87, 0x10, 0xbd, 0xd6,
+	0x21, 0x9c, 0xd1, 0x3a, 0xc4, 0x5f, 0x8f, 0xc1, 0x82, 0xaf, 0x1a, 0xd5, 0x21, 0x85, 0x4f, 0x9c,
+	0x1e, 0x8c, 0x7e, 0x1c, 0xd0, 0x47, 0xbc, 0x51, 0x72, 0x28, 0x25, 0x37, 0x9b, 0xdc, 0xef, 0x91,
+	0xe5, 0xd0, 0x6e, 0xe3, 0x6c, 0x47, 0x7a, 0x4b, 0x90, 0xd0, 0xfa, 0x58, 0x57, 0x4c, 0xfe, 0x28,
+	0x46, 0x66, 0x44, 0xde, 0xac, 0x43, 0xc7, 0x45, 0xe9, 0x54, 0x39, 0x81, 0x64, 0x93, 0x3a, 0x69,
+	0xff, 0xd9, 0x89, 0xd3, 0xfe, 0xb9, 0x2f, 0x01, 0x6c, 0xe9, 0x0d, 0xb4, 0x0f, 0x60, 0xeb, 0xd0,
+	0x32, 0xa1, 0xb7, 0x26, 0xd4, 0x90, 0x33, 0x0e, 0x2e, 0x1e, 0xb9, 0xef, 0x46, 0x20, 0xe5, 0xd2,
+	0x1d, 0xea, 0x92, 0x05, 0xa5, 0x4d, 0x4f, 0x97, 0xda, 0x5d, 0x66, 0xd9, 0x84, 0xed, 0xe9, 0x47,
+	0x62, 0x63, 0x87, 0xb1, 0xb2, 0x75, 0xb1, 0xd0, 0xf1, 0x02, 0x50, 0xcd, 0xd3, 0x21, 0x36, 0xe4,
+	0x6f, 0x4f, 0xdb, 0x21, 0x32, 0x59, 0x5d, 0x6c, 0xc4, 0x8f, 0x61, 0xc1, 0xd7, 0x30, 0xba, 0x02,
+	0x17, 0x77, 0xaa, 0x77, 0x2b, 0x85, 0xfc, 0x8e, 0x5c, 0xdd, 0x2f, 0x49, 0xf9, 0x7a, 0x55, 0xf2,
+	0x45, 0x64, 0x73, 0x10, 0xcd, 0xef, 0x15, 0xb3, 0x82, 0x9d, 0xb9, 0xff, 0xfb, 0x02, 0xac, 0x06,
+	0x5f, 0xd7, 0x27, 0xdb, 0x48, 0x7b, 0x3a, 0xfb, 0x2e, 0xb6, 0x66, 0x5d, 0x15, 0xec, 0x56, 0x6b,
+	0x1b, 0xd6, 0xbc, 0x73, 0x5f, 0x36, 0x06, 0xdd, 0xae, 0xa2, 0xab, 0xf6, 0xc1, 0xeb, 0x9b, 0x13,
+	0x3d, 0x16, 0x50, 0xa3, 0x54, 0xa7, 0xd2, 0x39, 0x33, 0x00, 0xac, 0x62, 0x43, 0xfc, 0x6e, 0x1c,
+	0x56, 0x02, 0x49, 0x9e, 0xf3, 0xc6, 0xb6, 0x3d, 0x67, 0x22, 0xd3, 0xcc, 0x99, 0x07, 0x7e, 0x27,
+	0xc9, 0x47, 0x77, 0xda, 0x65, 0xcf, 0xc7, 0x25, 0xdc, 0xa1, 0xc6, 0x5e, 0x90, 0x43, 0xbd, 0x6f,
+	0xbf, 0x4e, 0x66, 0x39, 0x54, 0x9e, 0x3f, 0x9d, 0xdc, 0x99, 0x66, 0xbc, 0xce, 0x14, 0xd5, 0x61,
+	0x8e, 0x7d, 0x0b, 0xb4, 0x0e, 0x95, 0xdc, 0x9e, 0x66, 0xc4, 0x37, 0xac, 0x91, 0x67, 0xd7, 0xca,
+	0x2d, 0x56, 0xc1, 0x56, 0x38, 0x17, 0x6c, 0x85, 0xb9, 0x5f, 0x11, 0x20, 0xed, 0xe1, 0xe3, 0x7c,
+	0x50, 0x14, 0x5c, 0x1f, 0x14, 0xd1, 0x43, 0x98, 0xb5, 0x2f, 0x0e, 0x64, 0x42, 0x03, 0xaf, 0x60,
+	0x39, 0x7d, 0xea, 0xa5, 0xcd, 0x14, 0xb4, 0x16, 0x96, 0x28, 0x4b, 0xb4, 0x06, 0x73, 0x2d, 0xf6,
+	0x6d, 0x96, 0x7d, 0x52, 0x94, 0xac, 0xa2, 0xf8, 0x25, 0xac, 0x85, 0xd1, 0x92, 0x5d, 0x55, 0x5d,
+	0xca, 0xef, 0xd5, 0xee, 0x54, 0xa5, 0x5d, 0x9a, 0xfc, 0x91, 0xa5, 0x52, 0xed, 0x60, 0xa7, 0x2e,
+	0x17, 0xaa, 0xc5, 0x80, 0xf4, 0x52, 0xed, 0xa0, 0x50, 0x28, 0xd5, 0x6a, 0x2c, 0x19, 0x59, 0x92,
+	0xa4, 0xaa, 0x94, 0x8d, 0x88, 0x1a, 0x24, 0x6a, 0xcd, 0x23, 0xdc, 0x1a, 0xd0, 0x5b, 0xaa, 0x39,
+	0x1d, 0x37, 0x07, 0xba, 0x4e, 0x0f, 0x1b, 0xf4, 0xb1, 0xae, 0x6a, 0x2d, 0xd9, 0x7a, 0x08, 0x98,
+	0x4f, 0x8e, 0xf3, 0x43, 0x1f, 0x27, 0x8b, 0x1c, 0xa1, 0x3c, 0x23, 0xad, 0x39, 0xe4, 0xfb, 0x94,
+	0xda, 0xaa, 0x23, 0x51, 0x2e, 0x7b, 0x9d, 0x40, 0xfc, 0x47, 0x11, 0x58, 0xf0, 0xdf, 0xc6, 0x3f,
+	0xe3, 0xbd, 0xf3, 0x2b, 0x90, 0x6a, 0x39, 0x37, 0xb1, 0xb9, 0xe6, 0xdc, 0x20, 0xff, 0x6b, 0x87,
+	0xb3, 0x53, 0xbd, 0x76, 0xf8, 0x11, 0xa4, 0x06, 0x7d, 0xe7, 0xa3, 0x64, 0x6c, 0x3c, 0x31, 0x43,
+	0xa7, 0xc4, 0xc3, 0x4f, 0x8f, 0xc4, 0xcf, 0xfc, 0xf4, 0x88, 0xf8, 0x2f, 0x22, 0x80, 0x8a, 0x43,
+	0xaf, 0xb6, 0xfc, 0x38, 0xaa, 0x2d, 0xf0, 0xb1, 0xa7, 0xf8, 0x73, 0x3e, 0xf6, 0x24, 0x3e, 0x81,
+	0x58, 0x49, 0xd7, 0x35, 0x1d, 0xdd, 0x74, 0xe6, 0x19, 0x33, 0x67, 0x64, 0x31, 0xd5, 0xfb, 0x4d,
+	0x7a, 0x9b, 0x67, 0x60, 0xd8, 0x73, 0x0f, 0xdd, 0x66, 0x9f, 0xd6, 0xa9, 0x94, 0x56, 0xd8, 0x38,
+	0xb2, 0x23, 0x0e, 0xb6, 0xf8, 0xfd, 0x18, 0xc0, 0x3d, 0xad, 0x51, 0xd7, 0xd5, 0x76, 0x1b, 0xeb,
+	0x2f, 0x6f, 0xa8, 0xee, 0x41, 0xca, 0xb2, 0xb3, 0xc7, 0x5a, 0x83, 0x0f, 0xd5, 0xa4, 0x2f, 0x59,
+	0x90, 0xe0, 0x40, 0xb5, 0x61, 0x24, 0x96, 0x33, 0x99, 0xbc, 0xd6, 0x92, 0x11, 0x16, 0xcb, 0x39,
+	0x3d, 0xdb, 0xe0, 0x7f, 0x25, 0x9b, 0x14, 0xbd, 0x0b, 0x71, 0x4c, 0xb4, 0x6d, 0x1d, 0x51, 0x09,
+	0x0b, 0xe6, 0xe8, 0x90, 0x48, 0x1c, 0xd7, 0x6f, 0x73, 0x73, 0xcf, 0x63, 0x73, 0x89, 0xa9, 0x6c,
+	0xee, 0x13, 0x48, 0x77, 0x14, 0xc3, 0x94, 0xf5, 0x41, 0x8f, 0x91, 0x27, 0xc7, 0x92, 0xa7, 0x08,
+	0x81, 0x34, 0xe8, 0x51, 0xfa, 0x9f, 0x84, 0x38, 0x7b, 0xb2, 0x7c, 0x0d, 0xe8, 0xca, 0x70, 0x63,
+	0xbc, 0xd2, 0xb8, 0xa5, 0x71, 0xba, 0x5c, 0x0d, 0xe6, 0x2c, 0x43, 0xf9, 0x36, 0x24, 0x0c, 0xee,
+	0x8f, 0xc7, 0x84, 0x23, 0x96, 0xdb, 0x2e, 0xcf, 0x48, 0x36, 0xc9, 0x76, 0x12, 0xe6, 0xf8, 0x38,
+	0x88, 0x65, 0x88, 0xb3, 0x66, 0xd0, 0x2a, 0xa0, 0x5a, 0x3d, 0x5f, 0x3f, 0xa8, 0x0d, 0xaf, 0x09,
+	0xe5, 0x52, 0x7e, 0xa7, 0x5e, 0x7e, 0x98, 0x15, 0x10, 0x40, 0x7c, 0x3f, 0x7f, 0x50, 0x2b, 0x15,
+	0xd9, 0xb3, 0xc8, 0x85, 0xfc, 0x5e, 0xa1, 0xb4, 0xb3, 0x53, 0x2a, 0x66, 0xa3, 0xdb, 0x31, 0x88,
+	0x3e, 0xd6, 0x1a, 0xe2, 0xef, 0x47, 0x21, 0xce, 0x5e, 0x82, 0x40, 0xf7, 0x21, 0x6d, 0x28, 0x4f,
+	0x5d, 0x2f, 0x00, 0x0a, 0x23, 0xd3, 0x54, 0x8c, 0x6a, 0xa3, 0xa6, 0x3c, 0xb5, 0x1f, 0x07, 0x2c,
+	0xcf, 0x48, 0xf3, 0x86, 0xab, 0x8c, 0xca, 0x30, 0xd7, 0x1f, 0x34, 0x64, 0x63, 0xd0, 0x18, 0xf3,
+	0x4e, 0x14, 0x67, 0xb6, 0x3f, 0x68, 0x74, 0x54, 0xe3, 0xa8, 0xae, 0xed, 0x0f, 0x1a, 0xb5, 0x41,
+	0xa3, 0x3c, 0x23, 0xc5, 0xfb, 0xf4, 0x17, 0x3a, 0x86, 0x73, 0x7d, 0x56, 0xc9, 0xc3, 0xc9, 0x53,
+	0xd9, 0xd4, 0xe4, 0xa6, 0xd1, 0x6c, 0x8e, 0xd9, 0x38, 0x79, 0x39, 0xf3, 0xa5, 0xbb, 0xae, 0x15,
+	0x8c, 0x66, 0xb3, 0x3c, 0x23, 0x2d, 0xf7, 0x03, 0xe0, 0x39, 0x19, 0xe6, 0xdd, 0xdd, 0x42, 0x55,
+	0xfb, 0x2d, 0x24, 0xcf, 0x61, 0x82, 0xf5, 0xc9, 0xdf, 0x42, 0xb2, 0x9e, 0x3f, 0xe2, 0x77, 0xca,
+	0xaf, 0xc3, 0x82, 0xaf, 0xab, 0x24, 0x3c, 0x31, 0xb5, 0x3e, 0xbf, 0x17, 0x98, 0x94, 0x58, 0x21,
+	0xb7, 0x0a, 0xcb, 0x41, 0x92, 0x93, 0xa5, 0x97, 0xbd, 0xdb, 0x21, 0xfe, 0xa6, 0x00, 0x17, 0x0b,
+	0x74, 0xd2, 0xf8, 0xdf, 0xc9, 0x19, 0xf3, 0x8e, 0xd6, 0x7d, 0xc8, 0x0e, 0x3d, 0xc4, 0x13, 0x99,
+	0xea, 0x21, 0x9e, 0x05, 0xdf, 0x2b, 0x57, 0xe8, 0x32, 0xa4, 0xec, 0xd7, 0xb0, 0xd4, 0x16, 0xf7,
+	0x6c, 0x60, 0x81, 0x2a, 0x2d, 0xf1, 0x0f, 0x04, 0xb8, 0x78, 0x40, 0x27, 0x69, 0x88, 0xb0, 0x41,
+	0x2e, 0xf5, 0x25, 0x08, 0xea, 0xb8, 0x16, 0xfa, 0x9d, 0x2b, 0x1a, 0xe2, 0x1b, 0x68, 0x10, 0xbd,
+	0xab, 0x18, 0xc7, 0x96, 0x6b, 0x21, 0xbf, 0xc5, 0x4d, 0x38, 0x7f, 0x17, 0x9b, 0x93, 0x77, 0x40,
+	0x7c, 0x02, 0x17, 0xd8, 0x33, 0x35, 0x1e, 0x0a, 0x63, 0xdc, 0x00, 0x5d, 0x02, 0xe8, 0x2b, 0x6d,
+	0x2c, 0x9b, 0xda, 0x31, 0x7f, 0x3a, 0x32, 0x29, 0x25, 0x09, 0xa4, 0x4e, 0x00, 0xe8, 0x02, 0xd0,
+	0x82, 0xf3, 0xb9, 0x29, 0x26, 0x25, 0x08, 0x80, 0x7e, 0x6c, 0xfa, 0x9e, 0x00, 0x17, 0x83, 0xdb,
+	0xe4, 0x2f, 0xe4, 0xd4, 0x60, 0xd1, 0xaf, 0x54, 0x6b, 0x83, 0x3d, 0xa9, 0x56, 0xb3, 0x3e, 0xad,
+	0x1a, 0xe8, 0x1a, 0x2c, 0xf4, 0xf0, 0x89, 0x29, 0x0f, 0x89, 0x9d, 0x26, 0xe0, 0x7d, 0x4b, 0x74,
+	0x71, 0x0b, 0x2e, 0x16, 0x71, 0x07, 0x4f, 0x63, 0x05, 0xf4, 0x4b, 0x04, 0xb3, 0x73, 0xc7, 0xe5,
+	0x8e, 0xd3, 0xe0, 0x36, 0xa4, 0x1e, 0x6b, 0x0d, 0x99, 0x3b, 0x4f, 0x6e, 0x34, 0xaf, 0x8e, 0xf5,
+	0xe4, 0x12, 0x3c, 0x76, 0x16, 0xf9, 0x4b, 0x00, 0x9c, 0xde, 0x31, 0xe9, 0x24, 0x87, 0x54, 0x5a,
+	0x64, 0xd7, 0x7c, 0x8e, 0x59, 0xf4, 0xb0, 0x58, 0x41, 0xc6, 0xfc, 0x22, 0x44, 0x7a, 0x2e, 0xeb,
+	0x5d, 0x87, 0xe5, 0xbb, 0xd8, 0x9c, 0x48, 0x58, 0xf1, 0x47, 0x02, 0x2c, 0x31, 0x9d, 0x17, 0x3b,
+	0xfd, 0x7b, 0x5a, 0x63, 0x9c, 0xbe, 0x7d, 0x71, 0x4b, 0xe4, 0x79, 0xe2, 0x96, 0x0a, 0x24, 0x74,
+	0xd5, 0x38, 0xa6, 0x8c, 0xa2, 0xa3, 0x0f, 0x92, 0x05, 0xbd, 0xce, 0x54, 0x9e, 0x91, 0xe6, 0x08,
+	0x3d, 0x61, 0xb5, 0x02, 0x71, 0xa2, 0x73, 0xb5, 0xc5, 0x5f, 0xe7, 0x8b, 0x3d, 0xd6, 0x1a, 0x95,
+	0x96, 0xb5, 0x02, 0xfe, 0x82, 0x00, 0xab, 0x64, 0xaa, 0x38, 0x2a, 0x79, 0x99, 0x33, 0x13, 0x9d,
+	0x87, 0x04, 0xfd, 0x6e, 0x2e, 0x37, 0x4e, 0xb9, 0x38, 0x73, 0xb4, 0xbc, 0x7d, 0x4a, 0x24, 0x39,
+	0x37, 0x24, 0x09, 0x9f, 0xaf, 0x45, 0x98, 0x77, 0xd9, 0x8d, 0x35, 0x55, 0x27, 0x30, 0x9c, 0x94,
+	0x63, 0x38, 0x93, 0x4f, 0xd0, 0x5b, 0x70, 0x8e, 0x4d, 0xd0, 0xc9, 0xec, 0xe4, 0x6f, 0x45, 0x20,
+	0xeb, 0x1f, 0x4e, 0xb2, 0x59, 0xe2, 0xff, 0x8e, 0xc6, 0xbb, 0x6a, 0xbe, 0x16, 0x7a, 0xed, 0xde,
+	0xbd, 0x5e, 0xa6, 0x0d, 0xcf, 0x5b, 0x86, 0x2f, 0xf4, 0xd1, 0xc7, 0xd0, 0xc7, 0x1b, 0xa3, 0xe1,
+	0x4f, 0x70, 0xba, 0x9e, 0xd5, 0x9a, 0x9d, 0xea, 0x59, 0xad, 0x7f, 0x1d, 0x83, 0x38, 0x9b, 0x3d,
+	0x81, 0xfe, 0xe0, 0x3d, 0xfe, 0x9f, 0x35, 0x46, 0xff, 0x73, 0x19, 0xc6, 0xc0, 0xf5, 0xaf, 0x34,
+	0x3e, 0xa6, 0x6f, 0x71, 0x9b, 0x98, 0xa7, 0x67, 0xaf, 0x8d, 0xa4, 0x23, 0xe6, 0x40, 0xa2, 0x46,
+	0x2c, 0x31, 0x22, 0xf4, 0x39, 0xcc, 0xd3, 0xb9, 0x65, 0x6d, 0x9b, 0xd8, 0x06, 0xe3, 0x9d, 0x33,
+	0x9c, 0x3a, 0x2f, 0xcf, 0x48, 0x29, 0xdd, 0xf5, 0xe0, 0xc1, 0x23, 0xb0, 0xd6, 0x5a, 0x9b, 0xf9,
+	0xe8, 0x33, 0x7f, 0x61, 0x8f, 0x0a, 0x96, 0x67, 0x24, 0x6b, 0xc4, 0x2d, 0xde, 0xcf, 0xf5, 0x5f,
+	0x0e, 0x3e, 0x04, 0xa0, 0xef, 0x95, 0x4f, 0xba, 0x11, 0x49, 0x52, 0x6c, 0x4a, 0xfa, 0x1e, 0x24,
+	0x70, 0xaf, 0x35, 0xe9, 0x26, 0x64, 0x0e, 0xf7, 0x5a, 0x94, 0xec, 0x06, 0x64, 0x5d, 0x33, 0x96,
+	0x19, 0x18, 0xd0, 0x91, 0xcf, 0x38, 0x53, 0x92, 0xda, 0x96, 0xb3, 0xb7, 0x4a, 0x4d, 0xbe, 0xb7,
+	0x12, 0x9b, 0x90, 0xb0, 0xc6, 0x15, 0x9d, 0x87, 0x95, 0x7b, 0xd5, 0x6d, 0x99, 0x6c, 0x08, 0x02,
+	0x72, 0x44, 0xfb, 0xa5, 0xbd, 0x62, 0x65, 0xef, 0x6e, 0x56, 0x20, 0x05, 0xe9, 0x60, 0x6f, 0x8f,
+	0x14, 0x22, 0x28, 0x01, 0xb3, 0xc5, 0xea, 0x5e, 0x29, 0x1b, 0x45, 0xf3, 0x90, 0x60, 0x5b, 0x83,
+	0x52, 0x31, 0x3b, 0x4b, 0x36, 0x0d, 0x77, 0xf2, 0x15, 0xf2, 0x3b, 0x46, 0xb6, 0x1e, 0x56, 0xd2,
+	0xea, 0x1a, 0x64, 0xef, 0x62, 0xd3, 0xbb, 0x10, 0x04, 0x39, 0x83, 0xdf, 0x15, 0x00, 0x11, 0x2f,
+	0xc6, 0x30, 0x03, 0x7c, 0xe9, 0xac, 0xc7, 0x97, 0x3a, 0x6f, 0xfb, 0x09, 0xee, 0xb7, 0xfd, 0xbc,
+	0x4e, 0x34, 0xe2, 0x73, 0xa2, 0x5e, 0x07, 0x1c, 0xf5, 0x3b, 0x60, 0x6b, 0x52, 0xc5, 0xa6, 0x9a,
+	0x54, 0x62, 0x1f, 0x96, 0x3c, 0x82, 0x73, 0xd7, 0xfb, 0x36, 0xcc, 0x3e, 0xd6, 0x1a, 0x96, 0xcb,
+	0xbd, 0x34, 0x92, 0x9b, 0x44, 0x51, 0x27, 0xf6, 0xb3, 0x6f, 0xc0, 0x52, 0x41, 0xe9, 0x35, 0x71,
+	0x67, 0xbc, 0x5a, 0xdf, 0x80, 0x25, 0xe6, 0x92, 0xc7, 0xa3, 0xfe, 0x8e, 0x00, 0x97, 0xf9, 0xb2,
+	0x3d, 0x94, 0x5f, 0x1a, 0xb7, 0xb4, 0x3d, 0x82, 0xa5, 0x80, 0x97, 0xa8, 0xc7, 0x1c, 0x7f, 0x08,
+	0x68, 0x06, 0x0d, 0xbf, 0x57, 0x3d, 0x7e, 0x7b, 0xf0, 0xef, 0x05, 0xb8, 0xcc, 0x82, 0xa9, 0x70,
+	0xc1, 0x83, 0x9c, 0xe8, 0xcb, 0x14, 0xfa, 0xb9, 0x82, 0xad, 0x2d, 0xb8, 0x48, 0xe6, 0xcc, 0x34,
+	0x9d, 0x11, 0x4d, 0x78, 0x85, 0x5a, 0xe1, 0x10, 0xd1, 0x4b, 0xdd, 0x30, 0xfc, 0x3d, 0x01, 0x2e,
+	0x87, 0x36, 0xcb, 0x27, 0xc2, 0x17, 0xb0, 0x1c, 0xa0, 0x66, 0x6b, 0x62, 0x4c, 0xa1, 0xe7, 0xa5,
+	0x61, 0x3d, 0x4f, 0x3e, 0x67, 0xde, 0x83, 0xcb, 0x7c, 0x22, 0x4c, 0xa3, 0xd6, 0xf5, 0x5d, 0x48,
+	0x7b, 0xfe, 0xcb, 0x18, 0x3a, 0x07, 0x4b, 0x85, 0xea, 0x5e, 0xbd, 0xb4, 0xe7, 0x3f, 0xab, 0x94,
+	0x85, 0x79, 0xab, 0xa2, 0x5e, 0xfa, 0xbc, 0x9e, 0x15, 0xd0, 0x22, 0xa4, 0x2d, 0x08, 0xfb, 0x1f,
+	0x54, 0x91, 0xf5, 0x7d, 0xe7, 0xb1, 0x55, 0xd7, 0x9b, 0xa7, 0xc4, 0x11, 0x97, 0xf6, 0x0e, 0x76,
+	0x83, 0xfe, 0x81, 0x55, 0x0a, 0xe6, 0x2a, 0x14, 0xc0, 0x39, 0x4a, 0x95, 0xda, 0xa7, 0x72, 0x7e,
+	0x2f, 0xbf, 0xf3, 0xb0, 0x56, 0xa9, 0x65, 0x23, 0xeb, 0xff, 0x5c, 0x00, 0x34, 0xfc, 0x39, 0x15,
+	0x5d, 0x85, 0xcb, 0x52, 0x69, 0x87, 0x7e, 0x09, 0x08, 0xff, 0x98, 0x37, 0x0f, 0x89, 0xd2, 0xfd,
+	0x83, 0xfc, 0x8e, 0x5c, 0xaf, 0x66, 0x05, 0xd2, 0x81, 0xbd, 0x6a, 0x5d, 0xb6, 0x21, 0xf4, 0x74,
+	0xf2, 0x5d, 0xa9, 0x94, 0xaf, 0x97, 0x24, 0xb9, 0x5e, 0xce, 0xef, 0xb1, 0xff, 0x8a, 0xb5, 0x53,
+	0xaa, 0xd5, 0x58, 0x71, 0x16, 0xe5, 0x60, 0xd5, 0x8d, 0x20, 0x57, 0x25, 0x46, 0x5e, 0xcb, 0xc6,
+	0x88, 0xa2, 0x6c, 0x54, 0x57, 0x45, 0x9c, 0x2c, 0x14, 0xa5, 0xcf, 0x2b, 0xb5, 0x7a, 0x2d, 0x3b,
+	0xb7, 0x2e, 0x01, 0x38, 0xfe, 0x14, 0x5d, 0x84, 0xb5, 0xe2, 0xce, 0xbe, 0x4c, 0xd6, 0xa4, 0x00,
+	0x4d, 0x2c, 0x40, 0x8a, 0x6b, 0x82, 0x60, 0x64, 0x05, 0xb4, 0x02, 0x8b, 0x1e, 0x6d, 0x50, 0x70,
+	0x64, 0xeb, 0xff, 0x88, 0x94, 0x69, 0x0d, 0xeb, 0x4f, 0xd5, 0x26, 0x46, 0x7f, 0x47, 0x80, 0x8c,
+	0xf7, 0x01, 0x6d, 0x74, 0x73, 0x6c, 0xf8, 0xe7, 0x7a, 0x51, 0x3c, 0x77, 0x6b, 0x42, 0x6c, 0x66,
+	0xee, 0xe2, 0xd6, 0x5f, 0xfa, 0xe1, 0x7f, 0xfd, 0xe5, 0xc8, 0x4d, 0xf1, 0xfa, 0xe6, 0xd3, 0xad,
+	0xcd, 0x9f, 0x66, 0x73, 0xec, 0xdb, 0x7d, 0x5d, 0x7b, 0x8c, 0x9b, 0xa6, 0xb1, 0xb9, 0xfe, 0xb3,
+	0x9b, 0xfc, 0x7f, 0x04, 0xdd, 0xe6, 0x71, 0xca, 0x6d, 0x61, 0x1d, 0x7d, 0x47, 0x80, 0x94, 0xeb,
+	0xff, 0x37, 0xa0, 0x37, 0x26, 0xfe, 0x7f, 0x1d, 0xb9, 0xf5, 0x49, 0x50, 0xb9, 0x68, 0x9b, 0x54,
+	0xb4, 0x37, 0xc4, 0xd7, 0xc2, 0x44, 0xa3, 0xff, 0x23, 0xe2, 0x36, 0xbb, 0x72, 0x42, 0xe4, 0xfa,
+	0x2d, 0x01, 0x16, 0x87, 0xfe, 0x4d, 0x00, 0xda, 0x9c, 0x24, 0xfb, 0xee, 0xd6, 0xe0, 0x5b, 0x93,
+	0x13, 0x70, 0x49, 0xdf, 0xa3, 0x92, 0x6e, 0x8a, 0xeb, 0xe3, 0x94, 0xe8, 0xb8, 0x04, 0x4b, 0x5e,
+	0x69, 0x62, 0x79, 0xa5, 0x69, 0xe5, 0x95, 0x9e, 0x5f, 0x5e, 0xdd, 0x23, 0xef, 0xcf, 0x0b, 0x90,
+	0xf6, 0x3c, 0x45, 0x8c, 0xde, 0x0c, 0xfd, 0xff, 0x5f, 0xc3, 0xaf, 0x20, 0xe7, 0x6e, 0x4e, 0x86,
+	0xcc, 0x65, 0x5c, 0xa1, 0x32, 0x2e, 0xa0, 0x34, 0x91, 0xd1, 0x39, 0x82, 0xf5, 0x47, 0x02, 0xac,
+	0x04, 0x66, 0x02, 0xd1, 0x3b, 0xa1, 0xa7, 0xd7, 0xc2, 0xf3, 0x86, 0xb9, 0x09, 0xd3, 0x40, 0x62,
+	0x9b, 0x4a, 0xa3, 0x88, 0xb7, 0xdc, 0x1a, 0xd3, 0xf4, 0xb6, 0xd2, 0x53, 0xbf, 0x62, 0x9f, 0x98,
+	0xa9, 0x41, 0xfa, 0x72, 0x45, 0xb7, 0x85, 0xf5, 0x47, 0xb7, 0xc4, 0x1b, 0xa1, 0xf6, 0x3b, 0x8c,
+	0x4e, 0xfb, 0x17, 0x98, 0x3c, 0x0c, 0xed, 0xdf, 0xa8, 0x54, 0xe3, 0xb4, 0xfd, 0xdb, 0x62, 0xfd,
+	0x23, 0x6b, 0x89, 0xbf, 0x77, 0x43, 0xd2, 0x6e, 0xae, 0xff, 0x2c, 0xed, 0xdf, 0xd6, 0x0d, 0x87,
+	0xc6, 0xe9, 0x5d, 0x08, 0x3a, 0xfa, 0x81, 0x00, 0x68, 0x38, 0xb1, 0x88, 0xc2, 0x6c, 0x38, 0x34,
+	0x07, 0x39, 0x71, 0xcf, 0x14, 0xda, 0xb3, 0x9f, 0x42, 0xd3, 0xf5, 0xec, 0xd1, 0x3a, 0x9a, 0xb8,
+	0x5b, 0xe8, 0x47, 0x82, 0xf5, 0xee, 0xb7, 0x2f, 0x55, 0xb8, 0x35, 0xd2, 0xe2, 0x03, 0x13, 0xa5,
+	0xb9, 0x77, 0xa6, 0xa2, 0xe1, 0x93, 0xc5, 0xdb, 0xc9, 0x49, 0xcd, 0xd3, 0xee, 0xe4, 0x04, 0xb6,
+	0x89, 0xfe, 0x50, 0x80, 0x95, 0xc0, 0x7c, 0x66, 0xa8, 0x61, 0x8e, 0xca, 0x7e, 0xe6, 0x42, 0xde,
+	0xb4, 0xb4, 0x7a, 0xb2, 0x3e, 0xed, 0x70, 0xad, 0x4f, 0x3e, 0x5c, 0x7f, 0x2a, 0xc0, 0x5a, 0xd8,
+	0xce, 0x01, 0xbd, 0x3f, 0xd2, 0x8b, 0x84, 0x46, 0x63, 0xb9, 0xc9, 0x03, 0x43, 0xb1, 0x4b, 0xbb,
+	0xd8, 0x16, 0xdf, 0x1a, 0x39, 0x58, 0x01, 0xd1, 0x23, 0x99, 0x6e, 0x6f, 0x89, 0x6f, 0x86, 0x0d,
+	0x59, 0x30, 0x05, 0xed, 0x6e, 0xd8, 0x7e, 0x23, 0xb4, 0xbb, 0x63, 0x36, 0x28, 0x67, 0xe8, 0xee,
+	0xd6, 0x5b, 0xe1, 0x23, 0x1a, 0x20, 0x39, 0xf7, 0x2e, 0x6f, 0x6d, 0xbd, 0x19, 0x38, 0xae, 0xa1,
+	0x14, 0xe8, 0x3f, 0x09, 0xb0, 0x12, 0xb8, 0x1d, 0x09, 0xb5, 0xd3, 0x51, 0x9b, 0x97, 0x69, 0x3a,
+	0xca, 0x7d, 0x28, 0x9a, 0xba, 0xa3, 0x8f, 0x6e, 0xa1, 0x69, 0x7a, 0x89, 0xfe, 0x07, 0x4f, 0xa1,
+	0x06, 0x6c, 0x63, 0xd0, 0x7b, 0x23, 0xdc, 0x47, 0xf8, 0x6e, 0x2b, 0xf7, 0xfe, 0xb4, 0x64, 0xdc,
+	0xf1, 0x78, 0xfb, 0x3c, 0x85, 0x2d, 0xdb, 0x7d, 0x9e, 0xcc, 0x90, 0xd1, 0x0f, 0x05, 0x58, 0x0b,
+	0xdb, 0x11, 0x85, 0x5a, 0xf1, 0x98, 0x2d, 0x54, 0xa8, 0x13, 0xe2, 0xbd, 0x5a, 0x3f, 0xc3, 0x48,
+	0xae, 0x4f, 0x35, 0x92, 0xdf, 0x11, 0x20, 0xeb, 0xff, 0xde, 0x83, 0x36, 0x46, 0xba, 0xa0, 0xa1,
+	0x64, 0x75, 0x6e, 0x7c, 0x7e, 0x5c, 0xdc, 0xa0, 0x1d, 0xba, 0x21, 0x5e, 0x0d, 0x53, 0xb9, 0x2b,
+	0x7f, 0xce, 0x23, 0xfc, 0xac, 0xff, 0x83, 0x4f, 0xa8, 0x5c, 0x21, 0x5f, 0x86, 0xa6, 0x90, 0x6b,
+	0xeb, 0x6a, 0xa0, 0xd2, 0x5c, 0x42, 0xf1, 0xc9, 0xfd, 0xd7, 0x04, 0x48, 0x7b, 0x3e, 0xec, 0x84,
+	0x46, 0xa0, 0x41, 0x9f, 0x7f, 0x26, 0x91, 0xe8, 0x4d, 0x2a, 0xd1, 0xeb, 0x68, 0x12, 0x89, 0xd0,
+	0xdf, 0x16, 0x60, 0xc1, 0xf7, 0x2d, 0x03, 0xdd, 0x1a, 0x31, 0x93, 0x86, 0xbf, 0xbe, 0xe4, 0x36,
+	0x26, 0x45, 0xe7, 0x13, 0xce, 0x2b, 0xdf, 0xe8, 0x91, 0x44, 0xbf, 0x40, 0x1f, 0x4e, 0xf0, 0x7e,
+	0xe2, 0x08, 0x1d, 0xc6, 0x90, 0x6f, 0x21, 0xa1, 0x93, 0x84, 0x4b, 0xb2, 0x3e, 0x91, 0xa6, 0xfe,
+	0x8a, 0x00, 0xf3, 0xee, 0x8f, 0x6c, 0x68, 0x7d, 0xf4, 0x3a, 0xeb, 0x4e, 0xff, 0xe5, 0x46, 0x67,
+	0x23, 0xc5, 0x75, 0x2a, 0xc8, 0x6b, 0xe2, 0xe5, 0x50, 0x7f, 0xc2, 0x72, 0x9d, 0xc4, 0x80, 0xbe,
+	0x16, 0x20, 0xe5, 0x4a, 0x7f, 0x86, 0x6e, 0x5d, 0x87, 0x73, 0xbb, 0xa1, 0x5b, 0xd7, 0x80, 0x6c,
+	0xaa, 0x78, 0x9d, 0x8a, 0xf4, 0x2a, 0x1a, 0x27, 0x12, 0xfa, 0x19, 0x48, 0xda, 0xf9, 0x66, 0x74,
+	0x7d, 0xc4, 0x02, 0x35, 0x8d, 0x42, 0xbc, 0xad, 0x0f, 0xb9, 0x22, 0xd6, 0x34, 0x19, 0x95, 0x9f,
+	0x86, 0x79, 0x77, 0xba, 0x35, 0x74, 0x50, 0x02, 0x72, 0xb2, 0xa1, 0x66, 0xc1, 0x1b, 0x5f, 0x1f,
+	0xdb, 0x38, 0x35, 0x09, 0x57, 0x5e, 0x38, 0xdc, 0x24, 0x86, 0x93, 0xc7, 0xa1, 0xad, 0xbf, 0x4d,
+	0x5b, 0x7f, 0x53, 0xbc, 0x36, 0xa6, 0xf5, 0xdb, 0x4d, 0xca, 0xf4, 0xb6, 0xb0, 0xbe, 0xfd, 0xb5,
+	0x00, 0xe7, 0x9b, 0x5a, 0x37, 0xb8, 0xf1, 0xed, 0x44, 0xb1, 0xd3, 0xdf, 0x27, 0x6d, 0xec, 0x0b,
+	0x8f, 0x3e, 0xe0, 0x28, 0x6d, 0xad, 0xa3, 0xf4, 0xda, 0x1b, 0x9a, 0xde, 0xde, 0x6c, 0xe3, 0x1e,
+	0x95, 0x60, 0x93, 0x55, 0x29, 0x7d, 0xd5, 0xd8, 0xe4, 0x1c, 0x48, 0x6b, 0x9b, 0x4f, 0xb7, 0x3e,
+	0x6a, 0x75, 0xfa, 0xbf, 0x19, 0x59, 0xba, 0xcb, 0x48, 0x0b, 0x1d, 0x6d, 0xd0, 0x22, 0xe3, 0xb4,
+	0xf1, 0x60, 0xeb, 0xdf, 0x5a, 0xd0, 0x2f, 0x28, 0xf4, 0x8b, 0x62, 0xa7, 0xff, 0xc5, 0x83, 0xad,
+	0x46, 0x9c, 0x32, 0x7c, 0xe7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x69, 0x25, 0xf9, 0x3d, 0x54,
+	0x83, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2/storage.pb.go b/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2/storage.pb.go
new file mode 100644
index 00000000..7b8fb38a
--- /dev/null
+++ b/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2/storage.pb.go
@@ -0,0 +1,2468 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/privacy/dlp/v2/storage.proto
+
+package dlp // import "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// Categorization of results based on how likely they are to represent a match,
+// based on the number of elements they contain which imply a match.
+type Likelihood int32
+
+const (
+	// Default value; same as POSSIBLE.
+	Likelihood_LIKELIHOOD_UNSPECIFIED Likelihood = 0
+	// Few matching elements.
+	Likelihood_VERY_UNLIKELY Likelihood = 1
+	Likelihood_UNLIKELY      Likelihood = 2
+	// Some matching elements.
+	Likelihood_POSSIBLE Likelihood = 3
+	Likelihood_LIKELY   Likelihood = 4
+	// Many matching elements.
+	Likelihood_VERY_LIKELY Likelihood = 5
+)
+
+var Likelihood_name = map[int32]string{
+	0: "LIKELIHOOD_UNSPECIFIED",
+	1: "VERY_UNLIKELY",
+	2: "UNLIKELY",
+	3: "POSSIBLE",
+	4: "LIKELY",
+	5: "VERY_LIKELY",
+}
+var Likelihood_value = map[string]int32{
+	"LIKELIHOOD_UNSPECIFIED": 0,
+	"VERY_UNLIKELY":          1,
+	"UNLIKELY":               2,
+	"POSSIBLE":               3,
+	"LIKELY":                 4,
+	"VERY_LIKELY":            5,
+}
+
+func (x Likelihood) String() string {
+	return proto.EnumName(Likelihood_name, int32(x))
+}
+func (Likelihood) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{0}
+}
+
+// Definitions of file type groups to scan.
+type FileType int32
+
+const (
+	// Includes all files.
+	FileType_FILE_TYPE_UNSPECIFIED FileType = 0
+	// Includes all file extensions not covered by text file types.
+	FileType_BINARY_FILE FileType = 1
+	// Included file extensions:
+	//   asc, brf, c, cc, cpp, csv, cxx, c++, cs, css, dart, eml, go, h, hh, hpp,
+	//   hxx, h++, hs, html, htm, shtml, shtm, xhtml, lhs, ini, java, js, json,
+	//   ocaml, md, mkd, markdown, m, ml, mli, pl, pm, php, phtml, pht, py, pyw,
+	//   rb, rbw, rs, rc, scala, sh, sql, tex, txt, text, tsv, vcard, vcs, wml,
+	//   xml, xsl, xsd, yml, yaml.
+	FileType_TEXT_FILE FileType = 2
+)
+
+var FileType_name = map[int32]string{
+	0: "FILE_TYPE_UNSPECIFIED",
+	1: "BINARY_FILE",
+	2: "TEXT_FILE",
+}
+var FileType_value = map[string]int32{
+	"FILE_TYPE_UNSPECIFIED": 0,
+	"BINARY_FILE":           1,
+	"TEXT_FILE":             2,
+}
+
+func (x FileType) String() string {
+	return proto.EnumName(FileType_name, int32(x))
+}
+func (FileType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1}
+}
+
+// How to sample bytes if not all bytes are scanned. Meaningful only when used
+// in conjunction with bytes_limit_per_file. If not specified, scanning would
+// start from the top.
+type CloudStorageOptions_SampleMethod int32
+
+const (
+	CloudStorageOptions_SAMPLE_METHOD_UNSPECIFIED CloudStorageOptions_SampleMethod = 0
+	// Scan from the top (default).
+	CloudStorageOptions_TOP CloudStorageOptions_SampleMethod = 1
+	// For each file larger than bytes_limit_per_file, randomly pick the offset
+	// to start scanning. The scanned bytes are contiguous.
+	CloudStorageOptions_RANDOM_START CloudStorageOptions_SampleMethod = 2
+)
+
+var CloudStorageOptions_SampleMethod_name = map[int32]string{
+	0: "SAMPLE_METHOD_UNSPECIFIED",
+	1: "TOP",
+	2: "RANDOM_START",
+}
+var CloudStorageOptions_SampleMethod_value = map[string]int32{
+	"SAMPLE_METHOD_UNSPECIFIED": 0,
+	"TOP":          1,
+	"RANDOM_START": 2,
+}
+
+func (x CloudStorageOptions_SampleMethod) String() string {
+	return proto.EnumName(CloudStorageOptions_SampleMethod_name, int32(x))
+}
+func (CloudStorageOptions_SampleMethod) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{6, 0}
+}
+
+// How to sample rows if not all rows are scanned. Meaningful only when used
+// in conjunction with rows_limit. If not specified, scanning would start
+// from the top.
+type BigQueryOptions_SampleMethod int32
+
+const (
+	BigQueryOptions_SAMPLE_METHOD_UNSPECIFIED BigQueryOptions_SampleMethod = 0
+	// Scan from the top (default).
+	BigQueryOptions_TOP BigQueryOptions_SampleMethod = 1
+	// Randomly pick the row to start scanning. The scanned rows are contiguous.
+	BigQueryOptions_RANDOM_START BigQueryOptions_SampleMethod = 2
+)
+
+var BigQueryOptions_SampleMethod_name = map[int32]string{
+	0: "SAMPLE_METHOD_UNSPECIFIED",
+	1: "TOP",
+	2: "RANDOM_START",
+}
+var BigQueryOptions_SampleMethod_value = map[string]int32{
+	"SAMPLE_METHOD_UNSPECIFIED": 0,
+	"TOP":          1,
+	"RANDOM_START": 2,
+}
+
+func (x BigQueryOptions_SampleMethod) String() string {
+	return proto.EnumName(BigQueryOptions_SampleMethod_name, int32(x))
+}
+func (BigQueryOptions_SampleMethod) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{8, 0}
+}
+
+// Type of information detected by the API.
+type InfoType struct {
+	// Name of the information type. Either a name of your choosing when
+	// creating a CustomInfoType, or one of the names listed
+	// at https://cloud.google.com/dlp/docs/infotypes-reference when specifying
+	// a built-in type.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InfoType) Reset()         { *m = InfoType{} }
+func (m *InfoType) String() string { return proto.CompactTextString(m) }
+func (*InfoType) ProtoMessage()    {}
+func (*InfoType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{0}
+}
+func (m *InfoType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InfoType.Unmarshal(m, b)
+}
+func (m *InfoType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InfoType.Marshal(b, m, deterministic)
+}
+func (dst *InfoType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InfoType.Merge(dst, src)
+}
+func (m *InfoType) XXX_Size() int {
+	return xxx_messageInfo_InfoType.Size(m)
+}
+func (m *InfoType) XXX_DiscardUnknown() {
+	xxx_messageInfo_InfoType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InfoType proto.InternalMessageInfo
+
+func (m *InfoType) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Custom information type provided by the user. Used to find domain-specific
+// sensitive information configurable to the data in question.
+type CustomInfoType struct {
+	// All CustomInfoTypes must have a name
+	// that does not conflict with built-in InfoTypes or other CustomInfoTypes.
+	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType,proto3" json:"info_type,omitempty"`
+	// Likelihood to return for this CustomInfoType. This base value can be
+	// altered by a detection rule if the finding meets the criteria specified by
+	// the rule. Defaults to `VERY_LIKELY` if not specified.
+	Likelihood Likelihood `protobuf:"varint,6,opt,name=likelihood,proto3,enum=google.privacy.dlp.v2.Likelihood" json:"likelihood,omitempty"`
+	// Types that are valid to be assigned to Type:
+	//	*CustomInfoType_Dictionary_
+	//	*CustomInfoType_Regex_
+	//	*CustomInfoType_SurrogateType_
+	Type isCustomInfoType_Type `protobuf_oneof:"type"`
+	// Set of detection rules to apply to all findings of this CustomInfoType.
+	// Rules are applied in order that they are specified. Not supported for the
+	// `surrogate_type` CustomInfoType.
+	DetectionRules       []*CustomInfoType_DetectionRule `protobuf:"bytes,7,rep,name=detection_rules,json=detectionRules,proto3" json:"detection_rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
+}
+
+func (m *CustomInfoType) Reset()         { *m = CustomInfoType{} }
+func (m *CustomInfoType) String() string { return proto.CompactTextString(m) }
+func (*CustomInfoType) ProtoMessage()    {}
+func (*CustomInfoType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1}
+}
+func (m *CustomInfoType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType.Unmarshal(m, b)
+}
+func (m *CustomInfoType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType.Merge(dst, src)
+}
+func (m *CustomInfoType) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType.Size(m)
+}
+func (m *CustomInfoType) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType proto.InternalMessageInfo
+
+func (m *CustomInfoType) GetInfoType() *InfoType {
+	if m != nil {
+		return m.InfoType
+	}
+	return nil
+}
+
+func (m *CustomInfoType) GetLikelihood() Likelihood {
+	if m != nil {
+		return m.Likelihood
+	}
+	return Likelihood_LIKELIHOOD_UNSPECIFIED
+}
+
+type isCustomInfoType_Type interface {
+	isCustomInfoType_Type()
+}
+
+type CustomInfoType_Dictionary_ struct {
+	Dictionary *CustomInfoType_Dictionary `protobuf:"bytes,2,opt,name=dictionary,proto3,oneof"`
+}
+
+type CustomInfoType_Regex_ struct {
+	Regex *CustomInfoType_Regex `protobuf:"bytes,3,opt,name=regex,proto3,oneof"`
+}
+
+type CustomInfoType_SurrogateType_ struct {
+	SurrogateType *CustomInfoType_SurrogateType `protobuf:"bytes,4,opt,name=surrogate_type,json=surrogateType,proto3,oneof"`
+}
+
+func (*CustomInfoType_Dictionary_) isCustomInfoType_Type() {}
+
+func (*CustomInfoType_Regex_) isCustomInfoType_Type() {}
+
+func (*CustomInfoType_SurrogateType_) isCustomInfoType_Type() {}
+
+func (m *CustomInfoType) GetType() isCustomInfoType_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *CustomInfoType) GetDictionary() *CustomInfoType_Dictionary {
+	if x, ok := m.GetType().(*CustomInfoType_Dictionary_); ok {
+		return x.Dictionary
+	}
+	return nil
+}
+
+func (m *CustomInfoType) GetRegex() *CustomInfoType_Regex {
+	if x, ok := m.GetType().(*CustomInfoType_Regex_); ok {
+		return x.Regex
+	}
+	return nil
+}
+
+func (m *CustomInfoType) GetSurrogateType() *CustomInfoType_SurrogateType {
+	if x, ok := m.GetType().(*CustomInfoType_SurrogateType_); ok {
+		return x.SurrogateType
+	}
+	return nil
+}
+
+func (m *CustomInfoType) GetDetectionRules() []*CustomInfoType_DetectionRule {
+	if m != nil {
+		return m.DetectionRules
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CustomInfoType) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CustomInfoType_OneofMarshaler, _CustomInfoType_OneofUnmarshaler, _CustomInfoType_OneofSizer, []interface{}{
+		(*CustomInfoType_Dictionary_)(nil),
+		(*CustomInfoType_Regex_)(nil),
+		(*CustomInfoType_SurrogateType_)(nil),
+	}
+}
+
+func _CustomInfoType_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CustomInfoType)
+	// type
+	switch x := m.Type.(type) {
+	case *CustomInfoType_Dictionary_:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Dictionary); err != nil {
+			return err
+		}
+	case *CustomInfoType_Regex_:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Regex); err != nil {
+			return err
+		}
+	case *CustomInfoType_SurrogateType_:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.SurrogateType); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("CustomInfoType.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CustomInfoType_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CustomInfoType)
+	switch tag {
+	case 2: // type.dictionary
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CustomInfoType_Dictionary)
+		err := b.DecodeMessage(msg)
+		m.Type = &CustomInfoType_Dictionary_{msg}
+		return true, err
+	case 3: // type.regex
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CustomInfoType_Regex)
+		err := b.DecodeMessage(msg)
+		m.Type = &CustomInfoType_Regex_{msg}
+		return true, err
+	case 4: // type.surrogate_type
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CustomInfoType_SurrogateType)
+		err := b.DecodeMessage(msg)
+		m.Type = &CustomInfoType_SurrogateType_{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CustomInfoType_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CustomInfoType)
+	// type
+	switch x := m.Type.(type) {
+	case *CustomInfoType_Dictionary_:
+		s := proto.Size(x.Dictionary)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CustomInfoType_Regex_:
+		s := proto.Size(x.Regex)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CustomInfoType_SurrogateType_:
+		s := proto.Size(x.SurrogateType)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Custom information type based on a dictionary of words or phrases. This can
+// be used to match sensitive information specific to the data, such as a list
+// of employee IDs or job titles.
+//
+// Dictionary words are case-insensitive and all characters other than letters
+// and digits in the unicode [Basic Multilingual
+// Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
+// will be replaced with whitespace when scanning for matches, so the
+// dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
+// "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
+// surrounding any match must be of a different type than the adjacent
+// characters within the word, so letters must be next to non-letters and
+// digits next to non-digits. For example, the dictionary word "jen" will
+// match the first three letters of the text "jen123" but will return no
+// matches for "jennifer".
+//
+// Dictionary words containing a large number of characters that are not
+// letters or digits may result in unexpected findings because such characters
+// are treated as whitespace.
+type CustomInfoType_Dictionary struct {
+	// Types that are valid to be assigned to Source:
+	//	*CustomInfoType_Dictionary_WordList_
+	//	*CustomInfoType_Dictionary_CloudStoragePath
+	Source               isCustomInfoType_Dictionary_Source `protobuf_oneof:"source"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
+}
+
+func (m *CustomInfoType_Dictionary) Reset()         { *m = CustomInfoType_Dictionary{} }
+func (m *CustomInfoType_Dictionary) String() string { return proto.CompactTextString(m) }
+func (*CustomInfoType_Dictionary) ProtoMessage()    {}
+func (*CustomInfoType_Dictionary) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1, 0}
+}
+func (m *CustomInfoType_Dictionary) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType_Dictionary.Unmarshal(m, b)
+}
+func (m *CustomInfoType_Dictionary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType_Dictionary.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType_Dictionary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_Dictionary.Merge(dst, src)
+}
+func (m *CustomInfoType_Dictionary) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType_Dictionary.Size(m)
+}
+func (m *CustomInfoType_Dictionary) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType_Dictionary.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType_Dictionary proto.InternalMessageInfo
+
+type isCustomInfoType_Dictionary_Source interface {
+	isCustomInfoType_Dictionary_Source()
+}
+
+type CustomInfoType_Dictionary_WordList_ struct {
+	WordList *CustomInfoType_Dictionary_WordList `protobuf:"bytes,1,opt,name=word_list,json=wordList,proto3,oneof"`
+}
+
+type CustomInfoType_Dictionary_CloudStoragePath struct {
+	CloudStoragePath *CloudStoragePath `protobuf:"bytes,3,opt,name=cloud_storage_path,json=cloudStoragePath,proto3,oneof"`
+}
+
+func (*CustomInfoType_Dictionary_WordList_) isCustomInfoType_Dictionary_Source() {}
+
+func (*CustomInfoType_Dictionary_CloudStoragePath) isCustomInfoType_Dictionary_Source() {}
+
+func (m *CustomInfoType_Dictionary) GetSource() isCustomInfoType_Dictionary_Source {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+func (m *CustomInfoType_Dictionary) GetWordList() *CustomInfoType_Dictionary_WordList {
+	if x, ok := m.GetSource().(*CustomInfoType_Dictionary_WordList_); ok {
+		return x.WordList
+	}
+	return nil
+}
+
+func (m *CustomInfoType_Dictionary) GetCloudStoragePath() *CloudStoragePath {
+	if x, ok := m.GetSource().(*CustomInfoType_Dictionary_CloudStoragePath); ok {
+		return x.CloudStoragePath
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CustomInfoType_Dictionary) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CustomInfoType_Dictionary_OneofMarshaler, _CustomInfoType_Dictionary_OneofUnmarshaler, _CustomInfoType_Dictionary_OneofSizer, []interface{}{
+		(*CustomInfoType_Dictionary_WordList_)(nil),
+		(*CustomInfoType_Dictionary_CloudStoragePath)(nil),
+	}
+}
+
+func _CustomInfoType_Dictionary_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CustomInfoType_Dictionary)
+	// source
+	switch x := m.Source.(type) {
+	case *CustomInfoType_Dictionary_WordList_:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.WordList); err != nil {
+			return err
+		}
+	case *CustomInfoType_Dictionary_CloudStoragePath:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CloudStoragePath); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("CustomInfoType_Dictionary.Source has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CustomInfoType_Dictionary_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CustomInfoType_Dictionary)
+	switch tag {
+	case 1: // source.word_list
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CustomInfoType_Dictionary_WordList)
+		err := b.DecodeMessage(msg)
+		m.Source = &CustomInfoType_Dictionary_WordList_{msg}
+		return true, err
+	case 3: // source.cloud_storage_path
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CloudStoragePath)
+		err := b.DecodeMessage(msg)
+		m.Source = &CustomInfoType_Dictionary_CloudStoragePath{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CustomInfoType_Dictionary_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CustomInfoType_Dictionary)
+	// source
+	switch x := m.Source.(type) {
+	case *CustomInfoType_Dictionary_WordList_:
+		s := proto.Size(x.WordList)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *CustomInfoType_Dictionary_CloudStoragePath:
+		s := proto.Size(x.CloudStoragePath)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Message defining a list of words or phrases to search for in the data.
+type CustomInfoType_Dictionary_WordList struct {
+	// Words or phrases defining the dictionary. The dictionary must contain
+	// at least one phrase and every phrase must contain at least 2 characters
+	// that are letters or digits. [required]
+	Words                []string `protobuf:"bytes,1,rep,name=words,proto3" json:"words,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CustomInfoType_Dictionary_WordList) Reset()         { *m = CustomInfoType_Dictionary_WordList{} }
+func (m *CustomInfoType_Dictionary_WordList) String() string { return proto.CompactTextString(m) }
+func (*CustomInfoType_Dictionary_WordList) ProtoMessage()    {}
+func (*CustomInfoType_Dictionary_WordList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1, 0, 0}
+}
+func (m *CustomInfoType_Dictionary_WordList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType_Dictionary_WordList.Unmarshal(m, b)
+}
+func (m *CustomInfoType_Dictionary_WordList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType_Dictionary_WordList.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType_Dictionary_WordList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_Dictionary_WordList.Merge(dst, src)
+}
+func (m *CustomInfoType_Dictionary_WordList) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType_Dictionary_WordList.Size(m)
+}
+func (m *CustomInfoType_Dictionary_WordList) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType_Dictionary_WordList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType_Dictionary_WordList proto.InternalMessageInfo
+
+func (m *CustomInfoType_Dictionary_WordList) GetWords() []string {
+	if m != nil {
+		return m.Words
+	}
+	return nil
+}
+
+// Message defining a custom regular expression.
+type CustomInfoType_Regex struct {
+	// Pattern defining the regular expression.
+	Pattern              string   `protobuf:"bytes,1,opt,name=pattern,proto3" json:"pattern,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CustomInfoType_Regex) Reset()         { *m = CustomInfoType_Regex{} }
+func (m *CustomInfoType_Regex) String() string { return proto.CompactTextString(m) }
+func (*CustomInfoType_Regex) ProtoMessage()    {}
+func (*CustomInfoType_Regex) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1, 1}
+}
+func (m *CustomInfoType_Regex) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType_Regex.Unmarshal(m, b)
+}
+func (m *CustomInfoType_Regex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType_Regex.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType_Regex) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_Regex.Merge(dst, src)
+}
+func (m *CustomInfoType_Regex) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType_Regex.Size(m)
+}
+func (m *CustomInfoType_Regex) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType_Regex.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType_Regex proto.InternalMessageInfo
+
+func (m *CustomInfoType_Regex) GetPattern() string {
+	if m != nil {
+		return m.Pattern
+	}
+	return ""
+}
+
+// Message for detecting output from deidentification transformations
+// such as
+// [`CryptoReplaceFfxFpeConfig`](/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
+// These types of transformations are
+// those that perform pseudonymization, thereby producing a "surrogate" as
+// output. This should be used in conjunction with a field on the
+// transformation such as `surrogate_info_type`. This CustomInfoType does
+// not support the use of `detection_rules`.
+type CustomInfoType_SurrogateType struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CustomInfoType_SurrogateType) Reset()         { *m = CustomInfoType_SurrogateType{} }
+func (m *CustomInfoType_SurrogateType) String() string { return proto.CompactTextString(m) }
+func (*CustomInfoType_SurrogateType) ProtoMessage()    {}
+func (*CustomInfoType_SurrogateType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1, 2}
+}
+func (m *CustomInfoType_SurrogateType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType_SurrogateType.Unmarshal(m, b)
+}
+func (m *CustomInfoType_SurrogateType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType_SurrogateType.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType_SurrogateType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_SurrogateType.Merge(dst, src)
+}
+func (m *CustomInfoType_SurrogateType) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType_SurrogateType.Size(m)
+}
+func (m *CustomInfoType_SurrogateType) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType_SurrogateType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType_SurrogateType proto.InternalMessageInfo
+
+// Rule for modifying a CustomInfoType to alter behavior under certain
+// circumstances, depending on the specific details of the rule. Not supported
+// for the `surrogate_type` custom info type.
+type CustomInfoType_DetectionRule struct {
+	// Types that are valid to be assigned to Type:
+	//	*CustomInfoType_DetectionRule_HotwordRule_
+	Type                 isCustomInfoType_DetectionRule_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
+}
+
+func (m *CustomInfoType_DetectionRule) Reset()         { *m = CustomInfoType_DetectionRule{} }
+func (m *CustomInfoType_DetectionRule) String() string { return proto.CompactTextString(m) }
+func (*CustomInfoType_DetectionRule) ProtoMessage()    {}
+func (*CustomInfoType_DetectionRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1, 3}
+}
+func (m *CustomInfoType_DetectionRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType_DetectionRule.Unmarshal(m, b)
+}
+func (m *CustomInfoType_DetectionRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType_DetectionRule.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType_DetectionRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_DetectionRule.Merge(dst, src)
+}
+func (m *CustomInfoType_DetectionRule) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType_DetectionRule.Size(m)
+}
+func (m *CustomInfoType_DetectionRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType_DetectionRule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType_DetectionRule proto.InternalMessageInfo
+
+type isCustomInfoType_DetectionRule_Type interface {
+	isCustomInfoType_DetectionRule_Type()
+}
+
+type CustomInfoType_DetectionRule_HotwordRule_ struct {
+	HotwordRule *CustomInfoType_DetectionRule_HotwordRule `protobuf:"bytes,1,opt,name=hotword_rule,json=hotwordRule,proto3,oneof"`
+}
+
+func (*CustomInfoType_DetectionRule_HotwordRule_) isCustomInfoType_DetectionRule_Type() {}
+
+func (m *CustomInfoType_DetectionRule) GetType() isCustomInfoType_DetectionRule_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *CustomInfoType_DetectionRule) GetHotwordRule() *CustomInfoType_DetectionRule_HotwordRule {
+	if x, ok := m.GetType().(*CustomInfoType_DetectionRule_HotwordRule_); ok {
+		return x.HotwordRule
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CustomInfoType_DetectionRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CustomInfoType_DetectionRule_OneofMarshaler, _CustomInfoType_DetectionRule_OneofUnmarshaler, _CustomInfoType_DetectionRule_OneofSizer, []interface{}{
+		(*CustomInfoType_DetectionRule_HotwordRule_)(nil),
+	}
+}
+
+func _CustomInfoType_DetectionRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CustomInfoType_DetectionRule)
+	// type
+	switch x := m.Type.(type) {
+	case *CustomInfoType_DetectionRule_HotwordRule_:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.HotwordRule); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("CustomInfoType_DetectionRule.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CustomInfoType_DetectionRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CustomInfoType_DetectionRule)
+	switch tag {
+	case 1: // type.hotword_rule
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CustomInfoType_DetectionRule_HotwordRule)
+		err := b.DecodeMessage(msg)
+		m.Type = &CustomInfoType_DetectionRule_HotwordRule_{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CustomInfoType_DetectionRule_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CustomInfoType_DetectionRule)
+	// type
+	switch x := m.Type.(type) {
+	case *CustomInfoType_DetectionRule_HotwordRule_:
+		s := proto.Size(x.HotwordRule)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Message for specifying a window around a finding to apply a detection
+// rule.
+type CustomInfoType_DetectionRule_Proximity struct {
+	// Number of characters before the finding to consider.
+	WindowBefore int32 `protobuf:"varint,1,opt,name=window_before,json=windowBefore,proto3" json:"window_before,omitempty"`
+	// Number of characters after the finding to consider.
+	WindowAfter          int32    `protobuf:"varint,2,opt,name=window_after,json=windowAfter,proto3" json:"window_after,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CustomInfoType_DetectionRule_Proximity) Reset() {
+	*m = CustomInfoType_DetectionRule_Proximity{}
+}
+func (m *CustomInfoType_DetectionRule_Proximity) String() string { return proto.CompactTextString(m) }
+func (*CustomInfoType_DetectionRule_Proximity) ProtoMessage()    {}
+func (*CustomInfoType_DetectionRule_Proximity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1, 3, 0}
+}
+func (m *CustomInfoType_DetectionRule_Proximity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Unmarshal(m, b)
+}
+func (m *CustomInfoType_DetectionRule_Proximity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType_DetectionRule_Proximity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Merge(dst, src)
+}
+func (m *CustomInfoType_DetectionRule_Proximity) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.Size(m)
+}
+func (m *CustomInfoType_DetectionRule_Proximity) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType_DetectionRule_Proximity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType_DetectionRule_Proximity proto.InternalMessageInfo
+
+func (m *CustomInfoType_DetectionRule_Proximity) GetWindowBefore() int32 {
+	if m != nil {
+		return m.WindowBefore
+	}
+	return 0
+}
+
+func (m *CustomInfoType_DetectionRule_Proximity) GetWindowAfter() int32 {
+	if m != nil {
+		return m.WindowAfter
+	}
+	return 0
+}
+
+// Message for specifying an adjustment to the likelihood of a finding as
+// part of a detection rule.
+type CustomInfoType_DetectionRule_LikelihoodAdjustment struct {
+	// Types that are valid to be assigned to Adjustment:
+	//	*CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood
+	//	*CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood
+	Adjustment           isCustomInfoType_DetectionRule_LikelihoodAdjustment_Adjustment `protobuf_oneof:"adjustment"`
+	XXX_NoUnkeyedLiteral struct{}                                                       `json:"-"`
+	XXX_unrecognized     []byte                                                         `json:"-"`
+	XXX_sizecache        int32                                                          `json:"-"`
+}
+
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) Reset() {
+	*m = CustomInfoType_DetectionRule_LikelihoodAdjustment{}
+}
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) String() string {
+	return proto.CompactTextString(m)
+}
+func (*CustomInfoType_DetectionRule_LikelihoodAdjustment) ProtoMessage() {}
+func (*CustomInfoType_DetectionRule_LikelihoodAdjustment) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1, 3, 1}
+}
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Unmarshal(m, b)
+}
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Merge(dst, src)
+}
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.Size(m)
+}
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType_DetectionRule_LikelihoodAdjustment proto.InternalMessageInfo
+
+type isCustomInfoType_DetectionRule_LikelihoodAdjustment_Adjustment interface {
+	isCustomInfoType_DetectionRule_LikelihoodAdjustment_Adjustment()
+}
+
+type CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood struct {
+	FixedLikelihood Likelihood `protobuf:"varint,1,opt,name=fixed_likelihood,json=fixedLikelihood,proto3,enum=google.privacy.dlp.v2.Likelihood,oneof"`
+}
+
+type CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood struct {
+	RelativeLikelihood int32 `protobuf:"varint,2,opt,name=relative_likelihood,json=relativeLikelihood,proto3,oneof"`
+}
+
+func (*CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood) isCustomInfoType_DetectionRule_LikelihoodAdjustment_Adjustment() {
+}
+
+func (*CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood) isCustomInfoType_DetectionRule_LikelihoodAdjustment_Adjustment() {
+}
+
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) GetAdjustment() isCustomInfoType_DetectionRule_LikelihoodAdjustment_Adjustment {
+	if m != nil {
+		return m.Adjustment
+	}
+	return nil
+}
+
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) GetFixedLikelihood() Likelihood {
+	if x, ok := m.GetAdjustment().(*CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood); ok {
+		return x.FixedLikelihood
+	}
+	return Likelihood_LIKELIHOOD_UNSPECIFIED
+}
+
+func (m *CustomInfoType_DetectionRule_LikelihoodAdjustment) GetRelativeLikelihood() int32 {
+	if x, ok := m.GetAdjustment().(*CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood); ok {
+		return x.RelativeLikelihood
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*CustomInfoType_DetectionRule_LikelihoodAdjustment) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofMarshaler, _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofUnmarshaler, _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofSizer, []interface{}{
+		(*CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood)(nil),
+		(*CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood)(nil),
+	}
+}
+
+func _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*CustomInfoType_DetectionRule_LikelihoodAdjustment)
+	// adjustment
+	switch x := m.Adjustment.(type) {
+	case *CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood:
+		b.EncodeVarint(1<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.FixedLikelihood))
+	case *CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood:
+		b.EncodeVarint(2<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.RelativeLikelihood))
+	case nil:
+	default:
+		return fmt.Errorf("CustomInfoType_DetectionRule_LikelihoodAdjustment.Adjustment has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*CustomInfoType_DetectionRule_LikelihoodAdjustment)
+	switch tag {
+	case 1: // adjustment.fixed_likelihood
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Adjustment = &CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood{Likelihood(x)}
+		return true, err
+	case 2: // adjustment.relative_likelihood
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Adjustment = &CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood{int32(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _CustomInfoType_DetectionRule_LikelihoodAdjustment_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*CustomInfoType_DetectionRule_LikelihoodAdjustment)
+	// adjustment
+	switch x := m.Adjustment.(type) {
+	case *CustomInfoType_DetectionRule_LikelihoodAdjustment_FixedLikelihood:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.FixedLikelihood))
+	case *CustomInfoType_DetectionRule_LikelihoodAdjustment_RelativeLikelihood:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.RelativeLikelihood))
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// The rule that adjusts the likelihood of findings within a certain
+// proximity of hotwords.
+type CustomInfoType_DetectionRule_HotwordRule struct {
+	// Regular expression pattern defining what qualifies as a hotword.
+	HotwordRegex *CustomInfoType_Regex `protobuf:"bytes,1,opt,name=hotword_regex,json=hotwordRegex,proto3" json:"hotword_regex,omitempty"`
+	// Proximity of the finding within which the entire hotword must reside.
+	// The total length of the window cannot exceed 1000 characters. Note that
+	// the finding itself will be included in the window, so that hotwords may
+	// be used to match substrings of the finding itself. For example, the
+	// certainty of a phone number regex "\(\d{3}\) \d{3}-\d{4}" could be
+	// adjusted upwards if the area code is known to be the local area code of
+	// a company office using the hotword regex "\(xxx\)", where "xxx"
+	// is the area code in question.
+	Proximity *CustomInfoType_DetectionRule_Proximity `protobuf:"bytes,2,opt,name=proximity,proto3" json:"proximity,omitempty"`
+	// Likelihood adjustment to apply to all matching findings.
+	LikelihoodAdjustment *CustomInfoType_DetectionRule_LikelihoodAdjustment `protobuf:"bytes,3,opt,name=likelihood_adjustment,json=likelihoodAdjustment,proto3" json:"likelihood_adjustment,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                                           `json:"-"`
+	XXX_unrecognized     []byte                                             `json:"-"`
+	XXX_sizecache        int32                                              `json:"-"`
+}
+
+func (m *CustomInfoType_DetectionRule_HotwordRule) Reset() {
+	*m = CustomInfoType_DetectionRule_HotwordRule{}
+}
+func (m *CustomInfoType_DetectionRule_HotwordRule) String() string { return proto.CompactTextString(m) }
+func (*CustomInfoType_DetectionRule_HotwordRule) ProtoMessage()    {}
+func (*CustomInfoType_DetectionRule_HotwordRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{1, 3, 2}
+}
+func (m *CustomInfoType_DetectionRule_HotwordRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Unmarshal(m, b)
+}
+func (m *CustomInfoType_DetectionRule_HotwordRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Marshal(b, m, deterministic)
+}
+func (dst *CustomInfoType_DetectionRule_HotwordRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Merge(dst, src)
+}
+func (m *CustomInfoType_DetectionRule_HotwordRule) XXX_Size() int {
+	return xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.Size(m)
+}
+func (m *CustomInfoType_DetectionRule_HotwordRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomInfoType_DetectionRule_HotwordRule proto.InternalMessageInfo
+
+func (m *CustomInfoType_DetectionRule_HotwordRule) GetHotwordRegex() *CustomInfoType_Regex {
+	if m != nil {
+		return m.HotwordRegex
+	}
+	return nil
+}
+
+func (m *CustomInfoType_DetectionRule_HotwordRule) GetProximity() *CustomInfoType_DetectionRule_Proximity {
+	if m != nil {
+		return m.Proximity
+	}
+	return nil
+}
+
+func (m *CustomInfoType_DetectionRule_HotwordRule) GetLikelihoodAdjustment() *CustomInfoType_DetectionRule_LikelihoodAdjustment {
+	if m != nil {
+		return m.LikelihoodAdjustment
+	}
+	return nil
+}
+
+// General identifier of a data field in a storage service.
+type FieldId struct {
+	// Name describing the field.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FieldId) Reset()         { *m = FieldId{} }
+func (m *FieldId) String() string { return proto.CompactTextString(m) }
+func (*FieldId) ProtoMessage()    {}
+func (*FieldId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{2}
+}
+func (m *FieldId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FieldId.Unmarshal(m, b)
+}
+func (m *FieldId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FieldId.Marshal(b, m, deterministic)
+}
+func (dst *FieldId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldId.Merge(dst, src)
+}
+func (m *FieldId) XXX_Size() int {
+	return xxx_messageInfo_FieldId.Size(m)
+}
+func (m *FieldId) XXX_DiscardUnknown() {
+	xxx_messageInfo_FieldId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FieldId proto.InternalMessageInfo
+
+func (m *FieldId) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Datastore partition ID.
+// A partition ID identifies a grouping of entities. The grouping is always
+// by project and namespace, however the namespace ID may be empty.
+//
+// A partition ID contains several dimensions:
+// project ID and namespace ID.
+type PartitionId struct {
+	// The ID of the project to which the entities belong.
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// If not empty, the ID of the namespace to which the entities belong.
+	NamespaceId          string   `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PartitionId) Reset()         { *m = PartitionId{} }
+func (m *PartitionId) String() string { return proto.CompactTextString(m) }
+func (*PartitionId) ProtoMessage()    {}
+func (*PartitionId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{3}
+}
+func (m *PartitionId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartitionId.Unmarshal(m, b)
+}
+func (m *PartitionId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartitionId.Marshal(b, m, deterministic)
+}
+func (dst *PartitionId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionId.Merge(dst, src)
+}
+func (m *PartitionId) XXX_Size() int {
+	return xxx_messageInfo_PartitionId.Size(m)
+}
+func (m *PartitionId) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartitionId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PartitionId proto.InternalMessageInfo
+
+func (m *PartitionId) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+func (m *PartitionId) GetNamespaceId() string {
+	if m != nil {
+		return m.NamespaceId
+	}
+	return ""
+}
+
+// A representation of a Datastore kind.
+type KindExpression struct {
+	// The name of the kind.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KindExpression) Reset()         { *m = KindExpression{} }
+func (m *KindExpression) String() string { return proto.CompactTextString(m) }
+func (*KindExpression) ProtoMessage()    {}
+func (*KindExpression) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{4}
+}
+func (m *KindExpression) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KindExpression.Unmarshal(m, b)
+}
+func (m *KindExpression) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KindExpression.Marshal(b, m, deterministic)
+}
+func (dst *KindExpression) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KindExpression.Merge(dst, src)
+}
+func (m *KindExpression) XXX_Size() int {
+	return xxx_messageInfo_KindExpression.Size(m)
+}
+func (m *KindExpression) XXX_DiscardUnknown() {
+	xxx_messageInfo_KindExpression.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KindExpression proto.InternalMessageInfo
+
+func (m *KindExpression) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Options defining a data set within Google Cloud Datastore.
+type DatastoreOptions struct {
+	// A partition ID identifies a grouping of entities. The grouping is always
+	// by project and namespace, however the namespace ID may be empty.
+	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId,proto3" json:"partition_id,omitempty"`
+	// The kind to process.
+	Kind                 *KindExpression `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *DatastoreOptions) Reset()         { *m = DatastoreOptions{} }
+func (m *DatastoreOptions) String() string { return proto.CompactTextString(m) }
+func (*DatastoreOptions) ProtoMessage()    {}
+func (*DatastoreOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{5}
+}
+func (m *DatastoreOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatastoreOptions.Unmarshal(m, b)
+}
+func (m *DatastoreOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatastoreOptions.Marshal(b, m, deterministic)
+}
+func (dst *DatastoreOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatastoreOptions.Merge(dst, src)
+}
+func (m *DatastoreOptions) XXX_Size() int {
+	return xxx_messageInfo_DatastoreOptions.Size(m)
+}
+func (m *DatastoreOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatastoreOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DatastoreOptions proto.InternalMessageInfo
+
+func (m *DatastoreOptions) GetPartitionId() *PartitionId {
+	if m != nil {
+		return m.PartitionId
+	}
+	return nil
+}
+
+func (m *DatastoreOptions) GetKind() *KindExpression {
+	if m != nil {
+		return m.Kind
+	}
+	return nil
+}
+
+// Options defining a file or a set of files (path ending with *) within
+// a Google Cloud Storage bucket.
+type CloudStorageOptions struct {
+	FileSet *CloudStorageOptions_FileSet `protobuf:"bytes,1,opt,name=file_set,json=fileSet,proto3" json:"file_set,omitempty"`
+	// Max number of bytes to scan from a file. If a scanned file's size is bigger
+	// than this value then the rest of the bytes are omitted.
+	BytesLimitPerFile int64 `protobuf:"varint,4,opt,name=bytes_limit_per_file,json=bytesLimitPerFile,proto3" json:"bytes_limit_per_file,omitempty"`
+	// List of file type groups to include in the scan.
+	// If empty, all files are scanned and available data format processors
+	// are applied.
+	FileTypes    []FileType                       `protobuf:"varint,5,rep,packed,name=file_types,json=fileTypes,proto3,enum=google.privacy.dlp.v2.FileType" json:"file_types,omitempty"`
+	SampleMethod CloudStorageOptions_SampleMethod `protobuf:"varint,6,opt,name=sample_method,json=sampleMethod,proto3,enum=google.privacy.dlp.v2.CloudStorageOptions_SampleMethod" json:"sample_method,omitempty"`
+	// Limits the number of files to scan to this percentage of the input FileSet.
+	// Number of files scanned is rounded down. Must be between 0 and 100,
+	// inclusively. Both 0 and 100 means no limit. Defaults to 0.
+	FilesLimitPercent    int32    `protobuf:"varint,7,opt,name=files_limit_percent,json=filesLimitPercent,proto3" json:"files_limit_percent,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CloudStorageOptions) Reset()         { *m = CloudStorageOptions{} }
+func (m *CloudStorageOptions) String() string { return proto.CompactTextString(m) }
+func (*CloudStorageOptions) ProtoMessage()    {}
+func (*CloudStorageOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{6}
+}
+func (m *CloudStorageOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CloudStorageOptions.Unmarshal(m, b)
+}
+func (m *CloudStorageOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CloudStorageOptions.Marshal(b, m, deterministic)
+}
+func (dst *CloudStorageOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudStorageOptions.Merge(dst, src)
+}
+func (m *CloudStorageOptions) XXX_Size() int {
+	return xxx_messageInfo_CloudStorageOptions.Size(m)
+}
+func (m *CloudStorageOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_CloudStorageOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CloudStorageOptions proto.InternalMessageInfo
+
+func (m *CloudStorageOptions) GetFileSet() *CloudStorageOptions_FileSet {
+	if m != nil {
+		return m.FileSet
+	}
+	return nil
+}
+
+func (m *CloudStorageOptions) GetBytesLimitPerFile() int64 {
+	if m != nil {
+		return m.BytesLimitPerFile
+	}
+	return 0
+}
+
+func (m *CloudStorageOptions) GetFileTypes() []FileType {
+	if m != nil {
+		return m.FileTypes
+	}
+	return nil
+}
+
+func (m *CloudStorageOptions) GetSampleMethod() CloudStorageOptions_SampleMethod {
+	if m != nil {
+		return m.SampleMethod
+	}
+	return CloudStorageOptions_SAMPLE_METHOD_UNSPECIFIED
+}
+
+func (m *CloudStorageOptions) GetFilesLimitPercent() int32 {
+	if m != nil {
+		return m.FilesLimitPercent
+	}
+	return 0
+}
+
+// Set of files to scan.
+type CloudStorageOptions_FileSet struct {
+	// The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
+	// path is allowed.
+	Url                  string   `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CloudStorageOptions_FileSet) Reset()         { *m = CloudStorageOptions_FileSet{} }
+func (m *CloudStorageOptions_FileSet) String() string { return proto.CompactTextString(m) }
+func (*CloudStorageOptions_FileSet) ProtoMessage()    {}
+func (*CloudStorageOptions_FileSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{6, 0}
+}
+func (m *CloudStorageOptions_FileSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CloudStorageOptions_FileSet.Unmarshal(m, b)
+}
+func (m *CloudStorageOptions_FileSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CloudStorageOptions_FileSet.Marshal(b, m, deterministic)
+}
+func (dst *CloudStorageOptions_FileSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudStorageOptions_FileSet.Merge(dst, src)
+}
+func (m *CloudStorageOptions_FileSet) XXX_Size() int {
+	return xxx_messageInfo_CloudStorageOptions_FileSet.Size(m)
+}
+func (m *CloudStorageOptions_FileSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_CloudStorageOptions_FileSet.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CloudStorageOptions_FileSet proto.InternalMessageInfo
+
+func (m *CloudStorageOptions_FileSet) GetUrl() string {
+	if m != nil {
+		return m.Url
+	}
+	return ""
+}
+
+// Message representing a single file or path in Cloud Storage.
+type CloudStoragePath struct {
+	// A url representing a file or path (no wildcards) in Cloud Storage.
+	// Example: gs://[BUCKET_NAME]/dictionary.txt
+	Path                 string   `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CloudStoragePath) Reset()         { *m = CloudStoragePath{} }
+func (m *CloudStoragePath) String() string { return proto.CompactTextString(m) }
+func (*CloudStoragePath) ProtoMessage()    {}
+func (*CloudStoragePath) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{7}
+}
+func (m *CloudStoragePath) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CloudStoragePath.Unmarshal(m, b)
+}
+func (m *CloudStoragePath) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CloudStoragePath.Marshal(b, m, deterministic)
+}
+func (dst *CloudStoragePath) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CloudStoragePath.Merge(dst, src)
+}
+func (m *CloudStoragePath) XXX_Size() int {
+	return xxx_messageInfo_CloudStoragePath.Size(m)
+}
+func (m *CloudStoragePath) XXX_DiscardUnknown() {
+	xxx_messageInfo_CloudStoragePath.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CloudStoragePath proto.InternalMessageInfo
+
+func (m *CloudStoragePath) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
+// Options defining BigQuery table and row identifiers.
+type BigQueryOptions struct {
+	// Complete BigQuery table reference.
+	TableReference *BigQueryTable `protobuf:"bytes,1,opt,name=table_reference,json=tableReference,proto3" json:"table_reference,omitempty"`
+	// References to fields uniquely identifying rows within the table.
+	// Nested fields in the format, like `person.birthdate.year`, are allowed.
+	IdentifyingFields []*FieldId `protobuf:"bytes,2,rep,name=identifying_fields,json=identifyingFields,proto3" json:"identifying_fields,omitempty"`
+	// Max number of rows to scan. If the table has more rows than this value, the
+	// rest of the rows are omitted. If not set, or if set to 0, all rows will be
+	// scanned. Cannot be used in conjunction with TimespanConfig.
+	RowsLimit            int64                        `protobuf:"varint,3,opt,name=rows_limit,json=rowsLimit,proto3" json:"rows_limit,omitempty"`
+	SampleMethod         BigQueryOptions_SampleMethod `protobuf:"varint,4,opt,name=sample_method,json=sampleMethod,proto3,enum=google.privacy.dlp.v2.BigQueryOptions_SampleMethod" json:"sample_method,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *BigQueryOptions) Reset()         { *m = BigQueryOptions{} }
+func (m *BigQueryOptions) String() string { return proto.CompactTextString(m) }
+func (*BigQueryOptions) ProtoMessage()    {}
+func (*BigQueryOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{8}
+}
+func (m *BigQueryOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BigQueryOptions.Unmarshal(m, b)
+}
+func (m *BigQueryOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BigQueryOptions.Marshal(b, m, deterministic)
+}
+func (dst *BigQueryOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryOptions.Merge(dst, src)
+}
+func (m *BigQueryOptions) XXX_Size() int {
+	return xxx_messageInfo_BigQueryOptions.Size(m)
+}
+func (m *BigQueryOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_BigQueryOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BigQueryOptions proto.InternalMessageInfo
+
+func (m *BigQueryOptions) GetTableReference() *BigQueryTable {
+	if m != nil {
+		return m.TableReference
+	}
+	return nil
+}
+
+func (m *BigQueryOptions) GetIdentifyingFields() []*FieldId {
+	if m != nil {
+		return m.IdentifyingFields
+	}
+	return nil
+}
+
+func (m *BigQueryOptions) GetRowsLimit() int64 {
+	if m != nil {
+		return m.RowsLimit
+	}
+	return 0
+}
+
+func (m *BigQueryOptions) GetSampleMethod() BigQueryOptions_SampleMethod {
+	if m != nil {
+		return m.SampleMethod
+	}
+	return BigQueryOptions_SAMPLE_METHOD_UNSPECIFIED
+}
+
+// Shared message indicating Cloud storage type.
+type StorageConfig struct {
+	// Types that are valid to be assigned to Type:
+	//	*StorageConfig_DatastoreOptions
+	//	*StorageConfig_CloudStorageOptions
+	//	*StorageConfig_BigQueryOptions
+	Type                 isStorageConfig_Type          `protobuf_oneof:"type"`
+	TimespanConfig       *StorageConfig_TimespanConfig `protobuf:"bytes,6,opt,name=timespan_config,json=timespanConfig,proto3" json:"timespan_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *StorageConfig) Reset()         { *m = StorageConfig{} }
+func (m *StorageConfig) String() string { return proto.CompactTextString(m) }
+func (*StorageConfig) ProtoMessage()    {}
+func (*StorageConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{9}
+}
+func (m *StorageConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StorageConfig.Unmarshal(m, b)
+}
+func (m *StorageConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StorageConfig.Marshal(b, m, deterministic)
+}
+func (dst *StorageConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StorageConfig.Merge(dst, src)
+}
+func (m *StorageConfig) XXX_Size() int {
+	return xxx_messageInfo_StorageConfig.Size(m)
+}
+func (m *StorageConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_StorageConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StorageConfig proto.InternalMessageInfo
+
+type isStorageConfig_Type interface {
+	isStorageConfig_Type()
+}
+
+type StorageConfig_DatastoreOptions struct {
+	DatastoreOptions *DatastoreOptions `protobuf:"bytes,2,opt,name=datastore_options,json=datastoreOptions,proto3,oneof"`
+}
+
+type StorageConfig_CloudStorageOptions struct {
+	CloudStorageOptions *CloudStorageOptions `protobuf:"bytes,3,opt,name=cloud_storage_options,json=cloudStorageOptions,proto3,oneof"`
+}
+
+type StorageConfig_BigQueryOptions struct {
+	BigQueryOptions *BigQueryOptions `protobuf:"bytes,4,opt,name=big_query_options,json=bigQueryOptions,proto3,oneof"`
+}
+
+func (*StorageConfig_DatastoreOptions) isStorageConfig_Type() {}
+
+func (*StorageConfig_CloudStorageOptions) isStorageConfig_Type() {}
+
+func (*StorageConfig_BigQueryOptions) isStorageConfig_Type() {}
+
+func (m *StorageConfig) GetType() isStorageConfig_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *StorageConfig) GetDatastoreOptions() *DatastoreOptions {
+	if x, ok := m.GetType().(*StorageConfig_DatastoreOptions); ok {
+		return x.DatastoreOptions
+	}
+	return nil
+}
+
+func (m *StorageConfig) GetCloudStorageOptions() *CloudStorageOptions {
+	if x, ok := m.GetType().(*StorageConfig_CloudStorageOptions); ok {
+		return x.CloudStorageOptions
+	}
+	return nil
+}
+
+func (m *StorageConfig) GetBigQueryOptions() *BigQueryOptions {
+	if x, ok := m.GetType().(*StorageConfig_BigQueryOptions); ok {
+		return x.BigQueryOptions
+	}
+	return nil
+}
+
+func (m *StorageConfig) GetTimespanConfig() *StorageConfig_TimespanConfig {
+	if m != nil {
+		return m.TimespanConfig
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*StorageConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _StorageConfig_OneofMarshaler, _StorageConfig_OneofUnmarshaler, _StorageConfig_OneofSizer, []interface{}{
+		(*StorageConfig_DatastoreOptions)(nil),
+		(*StorageConfig_CloudStorageOptions)(nil),
+		(*StorageConfig_BigQueryOptions)(nil),
+	}
+}
+
+func _StorageConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*StorageConfig)
+	// type
+	switch x := m.Type.(type) {
+	case *StorageConfig_DatastoreOptions:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.DatastoreOptions); err != nil {
+			return err
+		}
+	case *StorageConfig_CloudStorageOptions:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.CloudStorageOptions); err != nil {
+			return err
+		}
+	case *StorageConfig_BigQueryOptions:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.BigQueryOptions); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("StorageConfig.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _StorageConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*StorageConfig)
+	switch tag {
+	case 2: // type.datastore_options
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(DatastoreOptions)
+		err := b.DecodeMessage(msg)
+		m.Type = &StorageConfig_DatastoreOptions{msg}
+		return true, err
+	case 3: // type.cloud_storage_options
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(CloudStorageOptions)
+		err := b.DecodeMessage(msg)
+		m.Type = &StorageConfig_CloudStorageOptions{msg}
+		return true, err
+	case 4: // type.big_query_options
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(BigQueryOptions)
+		err := b.DecodeMessage(msg)
+		m.Type = &StorageConfig_BigQueryOptions{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _StorageConfig_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*StorageConfig)
+	// type
+	switch x := m.Type.(type) {
+	case *StorageConfig_DatastoreOptions:
+		s := proto.Size(x.DatastoreOptions)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *StorageConfig_CloudStorageOptions:
+		s := proto.Size(x.CloudStorageOptions)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *StorageConfig_BigQueryOptions:
+		s := proto.Size(x.BigQueryOptions)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Configuration of the timespan of the items to include in scanning.
+// Currently only supported when inspecting Google Cloud Storage and BigQuery.
+type StorageConfig_TimespanConfig struct {
+	// Exclude files older than this value.
+	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	// Exclude files newer than this value.
+	// If set to zero, no upper time limit is applied.
+	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	// Specification of the field containing the timestamp of scanned items.
+	// Required for data sources like Datastore or BigQuery.
+	// The valid data types of the timestamp field are:
+	// for BigQuery - timestamp, date, datetime;
+	// for Datastore - timestamp.
+	// Datastore entity will be scanned if the timestamp property does not exist
+	// or its value is empty or invalid.
+	TimestampField *FieldId `protobuf:"bytes,3,opt,name=timestamp_field,json=timestampField,proto3" json:"timestamp_field,omitempty"`
+	// When the job is started by a JobTrigger we will automatically figure out
+	// a valid start_time to avoid scanning files that have not been modified
+	// since the last time the JobTrigger executed. This will be based on the
+	// time of the execution of the last run of the JobTrigger.
+	EnableAutoPopulationOfTimespanConfig bool     `protobuf:"varint,4,opt,name=enable_auto_population_of_timespan_config,json=enableAutoPopulationOfTimespanConfig,proto3" json:"enable_auto_population_of_timespan_config,omitempty"`
+	XXX_NoUnkeyedLiteral                 struct{} `json:"-"`
+	XXX_unrecognized                     []byte   `json:"-"`
+	XXX_sizecache                        int32    `json:"-"`
+}
+
+func (m *StorageConfig_TimespanConfig) Reset()         { *m = StorageConfig_TimespanConfig{} }
+func (m *StorageConfig_TimespanConfig) String() string { return proto.CompactTextString(m) }
+func (*StorageConfig_TimespanConfig) ProtoMessage()    {}
+func (*StorageConfig_TimespanConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{9, 0}
+}
+func (m *StorageConfig_TimespanConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StorageConfig_TimespanConfig.Unmarshal(m, b)
+}
+func (m *StorageConfig_TimespanConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StorageConfig_TimespanConfig.Marshal(b, m, deterministic)
+}
+func (dst *StorageConfig_TimespanConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StorageConfig_TimespanConfig.Merge(dst, src)
+}
+func (m *StorageConfig_TimespanConfig) XXX_Size() int {
+	return xxx_messageInfo_StorageConfig_TimespanConfig.Size(m)
+}
+func (m *StorageConfig_TimespanConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_StorageConfig_TimespanConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StorageConfig_TimespanConfig proto.InternalMessageInfo
+
+func (m *StorageConfig_TimespanConfig) GetStartTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.StartTime
+	}
+	return nil
+}
+
+func (m *StorageConfig_TimespanConfig) GetEndTime() *timestamp.Timestamp {
+	if m != nil {
+		return m.EndTime
+	}
+	return nil
+}
+
+func (m *StorageConfig_TimespanConfig) GetTimestampField() *FieldId {
+	if m != nil {
+		return m.TimestampField
+	}
+	return nil
+}
+
+func (m *StorageConfig_TimespanConfig) GetEnableAutoPopulationOfTimespanConfig() bool {
+	if m != nil {
+		return m.EnableAutoPopulationOfTimespanConfig
+	}
+	return false
+}
+
+// Row key for identifying a record in BigQuery table.
+type BigQueryKey struct {
+	// Complete BigQuery table reference.
+	TableReference *BigQueryTable `protobuf:"bytes,1,opt,name=table_reference,json=tableReference,proto3" json:"table_reference,omitempty"`
+	// Absolute number of the row from the beginning of the table at the time
+	// of scanning.
+	RowNumber            int64    `protobuf:"varint,2,opt,name=row_number,json=rowNumber,proto3" json:"row_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BigQueryKey) Reset()         { *m = BigQueryKey{} }
+func (m *BigQueryKey) String() string { return proto.CompactTextString(m) }
+func (*BigQueryKey) ProtoMessage()    {}
+func (*BigQueryKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{10}
+}
+func (m *BigQueryKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BigQueryKey.Unmarshal(m, b)
+}
+func (m *BigQueryKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BigQueryKey.Marshal(b, m, deterministic)
+}
+func (dst *BigQueryKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryKey.Merge(dst, src)
+}
+func (m *BigQueryKey) XXX_Size() int {
+	return xxx_messageInfo_BigQueryKey.Size(m)
+}
+func (m *BigQueryKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_BigQueryKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BigQueryKey proto.InternalMessageInfo
+
+func (m *BigQueryKey) GetTableReference() *BigQueryTable {
+	if m != nil {
+		return m.TableReference
+	}
+	return nil
+}
+
+func (m *BigQueryKey) GetRowNumber() int64 {
+	if m != nil {
+		return m.RowNumber
+	}
+	return 0
+}
+
+// Record key for a finding in Cloud Datastore.
+type DatastoreKey struct {
+	// Datastore entity key.
+	EntityKey            *Key     `protobuf:"bytes,1,opt,name=entity_key,json=entityKey,proto3" json:"entity_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DatastoreKey) Reset()         { *m = DatastoreKey{} }
+func (m *DatastoreKey) String() string { return proto.CompactTextString(m) }
+func (*DatastoreKey) ProtoMessage()    {}
+func (*DatastoreKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{11}
+}
+func (m *DatastoreKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatastoreKey.Unmarshal(m, b)
+}
+func (m *DatastoreKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatastoreKey.Marshal(b, m, deterministic)
+}
+func (dst *DatastoreKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatastoreKey.Merge(dst, src)
+}
+func (m *DatastoreKey) XXX_Size() int {
+	return xxx_messageInfo_DatastoreKey.Size(m)
+}
+func (m *DatastoreKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatastoreKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DatastoreKey proto.InternalMessageInfo
+
+func (m *DatastoreKey) GetEntityKey() *Key {
+	if m != nil {
+		return m.EntityKey
+	}
+	return nil
+}
+
+// A unique identifier for a Datastore entity.
+// If a key's partition ID or any of its path kinds or names are
+// reserved/read-only, the key is reserved/read-only.
+// A reserved/read-only key is forbidden in certain documented contexts.
+type Key struct {
+	// Entities are partitioned into subsets, currently identified by a project
+	// ID and namespace ID.
+	// Queries are scoped to a single partition.
+	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId,proto3" json:"partition_id,omitempty"`
+	// The entity path.
+	// An entity path consists of one or more elements composed of a kind and a
+	// string or numerical identifier, which identify entities. The first
+	// element identifies a _root entity_, the second element identifies
+	// a _child_ of the root entity, the third element identifies a child of the
+	// second entity, and so forth. The entities identified by all prefixes of
+	// the path are called the element's _ancestors_.
+	//
+	// A path can never be empty, and a path can have at most 100 elements.
+	Path                 []*Key_PathElement `protobuf:"bytes,2,rep,name=path,proto3" json:"path,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Key) Reset()         { *m = Key{} }
+func (m *Key) String() string { return proto.CompactTextString(m) }
+func (*Key) ProtoMessage()    {}
+func (*Key) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{12}
+}
+func (m *Key) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Key.Unmarshal(m, b)
+}
+func (m *Key) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Key.Marshal(b, m, deterministic)
+}
+func (dst *Key) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key.Merge(dst, src)
+}
+func (m *Key) XXX_Size() int {
+	return xxx_messageInfo_Key.Size(m)
+}
+func (m *Key) XXX_DiscardUnknown() {
+	xxx_messageInfo_Key.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Key proto.InternalMessageInfo
+
+func (m *Key) GetPartitionId() *PartitionId {
+	if m != nil {
+		return m.PartitionId
+	}
+	return nil
+}
+
+func (m *Key) GetPath() []*Key_PathElement {
+	if m != nil {
+		return m.Path
+	}
+	return nil
+}
+
+// A (kind, ID/name) pair used to construct a key path.
+//
+// If either name or ID is set, the element is complete.
+// If neither is set, the element is incomplete.
+type Key_PathElement struct {
+	// The kind of the entity.
+	// A kind matching regex `__.*__` is reserved/read-only.
+	// A kind must not contain more than 1500 bytes when UTF-8 encoded.
+	// Cannot be `""`.
+	Kind string `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"`
+	// The type of ID.
+	//
+	// Types that are valid to be assigned to IdType:
+	//	*Key_PathElement_Id
+	//	*Key_PathElement_Name
+	IdType               isKey_PathElement_IdType `protobuf_oneof:"id_type"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *Key_PathElement) Reset()         { *m = Key_PathElement{} }
+func (m *Key_PathElement) String() string { return proto.CompactTextString(m) }
+func (*Key_PathElement) ProtoMessage()    {}
+func (*Key_PathElement) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{12, 0}
+}
+func (m *Key_PathElement) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Key_PathElement.Unmarshal(m, b)
+}
+func (m *Key_PathElement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Key_PathElement.Marshal(b, m, deterministic)
+}
+func (dst *Key_PathElement) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Key_PathElement.Merge(dst, src)
+}
+func (m *Key_PathElement) XXX_Size() int {
+	return xxx_messageInfo_Key_PathElement.Size(m)
+}
+func (m *Key_PathElement) XXX_DiscardUnknown() {
+	xxx_messageInfo_Key_PathElement.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Key_PathElement proto.InternalMessageInfo
+
+func (m *Key_PathElement) GetKind() string {
+	if m != nil {
+		return m.Kind
+	}
+	return ""
+}
+
+type isKey_PathElement_IdType interface {
+	isKey_PathElement_IdType()
+}
+
+type Key_PathElement_Id struct {
+	Id int64 `protobuf:"varint,2,opt,name=id,proto3,oneof"`
+}
+
+type Key_PathElement_Name struct {
+	Name string `protobuf:"bytes,3,opt,name=name,proto3,oneof"`
+}
+
+func (*Key_PathElement_Id) isKey_PathElement_IdType() {}
+
+func (*Key_PathElement_Name) isKey_PathElement_IdType() {}
+
+func (m *Key_PathElement) GetIdType() isKey_PathElement_IdType {
+	if m != nil {
+		return m.IdType
+	}
+	return nil
+}
+
+func (m *Key_PathElement) GetId() int64 {
+	if x, ok := m.GetIdType().(*Key_PathElement_Id); ok {
+		return x.Id
+	}
+	return 0
+}
+
+func (m *Key_PathElement) GetName() string {
+	if x, ok := m.GetIdType().(*Key_PathElement_Name); ok {
+		return x.Name
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Key_PathElement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Key_PathElement_OneofMarshaler, _Key_PathElement_OneofUnmarshaler, _Key_PathElement_OneofSizer, []interface{}{
+		(*Key_PathElement_Id)(nil),
+		(*Key_PathElement_Name)(nil),
+	}
+}
+
+func _Key_PathElement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Key_PathElement)
+	// id_type
+	switch x := m.IdType.(type) {
+	case *Key_PathElement_Id:
+		b.EncodeVarint(2<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Id))
+	case *Key_PathElement_Name:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Name)
+	case nil:
+	default:
+		return fmt.Errorf("Key_PathElement.IdType has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Key_PathElement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Key_PathElement)
+	switch tag {
+	case 2: // id_type.id
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.IdType = &Key_PathElement_Id{int64(x)}
+		return true, err
+	case 3: // id_type.name
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.IdType = &Key_PathElement_Name{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Key_PathElement_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Key_PathElement)
+	// id_type
+	switch x := m.IdType.(type) {
+	case *Key_PathElement_Id:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(x.Id))
+	case *Key_PathElement_Name:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Name)))
+		n += len(x.Name)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Message for a unique key indicating a record that contains a finding.
+type RecordKey struct {
+	// Types that are valid to be assigned to Type:
+	//	*RecordKey_DatastoreKey
+	//	*RecordKey_BigQueryKey
+	Type                 isRecordKey_Type `protobuf_oneof:"type"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *RecordKey) Reset()         { *m = RecordKey{} }
+func (m *RecordKey) String() string { return proto.CompactTextString(m) }
+func (*RecordKey) ProtoMessage()    {}
+func (*RecordKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{13}
+}
+func (m *RecordKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RecordKey.Unmarshal(m, b)
+}
+func (m *RecordKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RecordKey.Marshal(b, m, deterministic)
+}
+func (dst *RecordKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RecordKey.Merge(dst, src)
+}
+func (m *RecordKey) XXX_Size() int {
+	return xxx_messageInfo_RecordKey.Size(m)
+}
+func (m *RecordKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_RecordKey.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RecordKey proto.InternalMessageInfo
+
+type isRecordKey_Type interface {
+	isRecordKey_Type()
+}
+
+type RecordKey_DatastoreKey struct {
+	DatastoreKey *DatastoreKey `protobuf:"bytes,2,opt,name=datastore_key,json=datastoreKey,proto3,oneof"`
+}
+
+type RecordKey_BigQueryKey struct {
+	BigQueryKey *BigQueryKey `protobuf:"bytes,3,opt,name=big_query_key,json=bigQueryKey,proto3,oneof"`
+}
+
+func (*RecordKey_DatastoreKey) isRecordKey_Type() {}
+
+func (*RecordKey_BigQueryKey) isRecordKey_Type() {}
+
+func (m *RecordKey) GetType() isRecordKey_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (m *RecordKey) GetDatastoreKey() *DatastoreKey {
+	if x, ok := m.GetType().(*RecordKey_DatastoreKey); ok {
+		return x.DatastoreKey
+	}
+	return nil
+}
+
+func (m *RecordKey) GetBigQueryKey() *BigQueryKey {
+	if x, ok := m.GetType().(*RecordKey_BigQueryKey); ok {
+		return x.BigQueryKey
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*RecordKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _RecordKey_OneofMarshaler, _RecordKey_OneofUnmarshaler, _RecordKey_OneofSizer, []interface{}{
+		(*RecordKey_DatastoreKey)(nil),
+		(*RecordKey_BigQueryKey)(nil),
+	}
+}
+
+func _RecordKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*RecordKey)
+	// type
+	switch x := m.Type.(type) {
+	case *RecordKey_DatastoreKey:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.DatastoreKey); err != nil {
+			return err
+		}
+	case *RecordKey_BigQueryKey:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.BigQueryKey); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("RecordKey.Type has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _RecordKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*RecordKey)
+	switch tag {
+	case 2: // type.datastore_key
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(DatastoreKey)
+		err := b.DecodeMessage(msg)
+		m.Type = &RecordKey_DatastoreKey{msg}
+		return true, err
+	case 3: // type.big_query_key
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(BigQueryKey)
+		err := b.DecodeMessage(msg)
+		m.Type = &RecordKey_BigQueryKey{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _RecordKey_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*RecordKey)
+	// type
+	switch x := m.Type.(type) {
+	case *RecordKey_DatastoreKey:
+		s := proto.Size(x.DatastoreKey)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *RecordKey_BigQueryKey:
+		s := proto.Size(x.BigQueryKey)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// Message defining the location of a BigQuery table. A table is uniquely
+// identified  by its project_id, dataset_id, and table_name. Within a query
+// a table is often referenced with a string in the format of:
+// `<project_id>:<dataset_id>.<table_id>` or
+// `<project_id>.<dataset_id>.<table_id>`.
+type BigQueryTable struct {
+	// The Google Cloud Platform project ID of the project containing the table.
+	// If omitted, project ID is inferred from the API call.
+	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	// Dataset ID of the table.
+	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
+	// Name of the table.
+	TableId              string   `protobuf:"bytes,3,opt,name=table_id,json=tableId,proto3" json:"table_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BigQueryTable) Reset()         { *m = BigQueryTable{} }
+func (m *BigQueryTable) String() string { return proto.CompactTextString(m) }
+func (*BigQueryTable) ProtoMessage()    {}
+func (*BigQueryTable) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{14}
+}
+func (m *BigQueryTable) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BigQueryTable.Unmarshal(m, b)
+}
+func (m *BigQueryTable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BigQueryTable.Marshal(b, m, deterministic)
+}
+func (dst *BigQueryTable) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BigQueryTable.Merge(dst, src)
+}
+func (m *BigQueryTable) XXX_Size() int {
+	return xxx_messageInfo_BigQueryTable.Size(m)
+}
+func (m *BigQueryTable) XXX_DiscardUnknown() {
+	xxx_messageInfo_BigQueryTable.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BigQueryTable proto.InternalMessageInfo
+
+func (m *BigQueryTable) GetProjectId() string {
+	if m != nil {
+		return m.ProjectId
+	}
+	return ""
+}
+
+func (m *BigQueryTable) GetDatasetId() string {
+	if m != nil {
+		return m.DatasetId
+	}
+	return ""
+}
+
+func (m *BigQueryTable) GetTableId() string {
+	if m != nil {
+		return m.TableId
+	}
+	return ""
+}
+
+// An entity in a dataset is a field or set of fields that correspond to a
+// single person. For example, in medical records the `EntityId` might be a
+// patient identifier, or for financial records it might be an account
+// identifier. This message is used when generalizations or analysis must take
+// into account that multiple rows correspond to the same entity.
+type EntityId struct {
+	// Composite key indicating which field contains the entity identifier.
+	Field                *FieldId `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EntityId) Reset()         { *m = EntityId{} }
+func (m *EntityId) String() string { return proto.CompactTextString(m) }
+func (*EntityId) ProtoMessage()    {}
+func (*EntityId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_storage_b718b41311eb5c58, []int{15}
+}
+func (m *EntityId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EntityId.Unmarshal(m, b)
+}
+func (m *EntityId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EntityId.Marshal(b, m, deterministic)
+}
+func (dst *EntityId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EntityId.Merge(dst, src)
+}
+func (m *EntityId) XXX_Size() int {
+	return xxx_messageInfo_EntityId.Size(m)
+}
+func (m *EntityId) XXX_DiscardUnknown() {
+	xxx_messageInfo_EntityId.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EntityId proto.InternalMessageInfo
+
+func (m *EntityId) GetField() *FieldId {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*InfoType)(nil), "google.privacy.dlp.v2.InfoType")
+	proto.RegisterType((*CustomInfoType)(nil), "google.privacy.dlp.v2.CustomInfoType")
+	proto.RegisterType((*CustomInfoType_Dictionary)(nil), "google.privacy.dlp.v2.CustomInfoType.Dictionary")
+	proto.RegisterType((*CustomInfoType_Dictionary_WordList)(nil), "google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList")
+	proto.RegisterType((*CustomInfoType_Regex)(nil), "google.privacy.dlp.v2.CustomInfoType.Regex")
+	proto.RegisterType((*CustomInfoType_SurrogateType)(nil), "google.privacy.dlp.v2.CustomInfoType.SurrogateType")
+	proto.RegisterType((*CustomInfoType_DetectionRule)(nil), "google.privacy.dlp.v2.CustomInfoType.DetectionRule")
+	proto.RegisterType((*CustomInfoType_DetectionRule_Proximity)(nil), "google.privacy.dlp.v2.CustomInfoType.DetectionRule.Proximity")
+	proto.RegisterType((*CustomInfoType_DetectionRule_LikelihoodAdjustment)(nil), "google.privacy.dlp.v2.CustomInfoType.DetectionRule.LikelihoodAdjustment")
+	proto.RegisterType((*CustomInfoType_DetectionRule_HotwordRule)(nil), "google.privacy.dlp.v2.CustomInfoType.DetectionRule.HotwordRule")
+	proto.RegisterType((*FieldId)(nil), "google.privacy.dlp.v2.FieldId")
+	proto.RegisterType((*PartitionId)(nil), "google.privacy.dlp.v2.PartitionId")
+	proto.RegisterType((*KindExpression)(nil), "google.privacy.dlp.v2.KindExpression")
+	proto.RegisterType((*DatastoreOptions)(nil), "google.privacy.dlp.v2.DatastoreOptions")
+	proto.RegisterType((*CloudStorageOptions)(nil), "google.privacy.dlp.v2.CloudStorageOptions")
+	proto.RegisterType((*CloudStorageOptions_FileSet)(nil), "google.privacy.dlp.v2.CloudStorageOptions.FileSet")
+	proto.RegisterType((*CloudStoragePath)(nil), "google.privacy.dlp.v2.CloudStoragePath")
+	proto.RegisterType((*BigQueryOptions)(nil), "google.privacy.dlp.v2.BigQueryOptions")
+	proto.RegisterType((*StorageConfig)(nil), "google.privacy.dlp.v2.StorageConfig")
+	proto.RegisterType((*StorageConfig_TimespanConfig)(nil), "google.privacy.dlp.v2.StorageConfig.TimespanConfig")
+	proto.RegisterType((*BigQueryKey)(nil), "google.privacy.dlp.v2.BigQueryKey")
+	proto.RegisterType((*DatastoreKey)(nil), "google.privacy.dlp.v2.DatastoreKey")
+	proto.RegisterType((*Key)(nil), "google.privacy.dlp.v2.Key")
+	proto.RegisterType((*Key_PathElement)(nil), "google.privacy.dlp.v2.Key.PathElement")
+	proto.RegisterType((*RecordKey)(nil), "google.privacy.dlp.v2.RecordKey")
+	proto.RegisterType((*BigQueryTable)(nil), "google.privacy.dlp.v2.BigQueryTable")
+	proto.RegisterType((*EntityId)(nil), "google.privacy.dlp.v2.EntityId")
+	proto.RegisterEnum("google.privacy.dlp.v2.Likelihood", Likelihood_name, Likelihood_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.FileType", FileType_name, FileType_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.CloudStorageOptions_SampleMethod", CloudStorageOptions_SampleMethod_name, CloudStorageOptions_SampleMethod_value)
+	proto.RegisterEnum("google.privacy.dlp.v2.BigQueryOptions_SampleMethod", BigQueryOptions_SampleMethod_name, BigQueryOptions_SampleMethod_value)
+}
+
+func init() {
+	proto.RegisterFile("google/privacy/dlp/v2/storage.proto", fileDescriptor_storage_b718b41311eb5c58)
+}
+
+var fileDescriptor_storage_b718b41311eb5c58 = []byte{
+	// 1753 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xfd, 0x92, 0x1a, 0x4b,
+	0x15, 0x67, 0x60, 0x59, 0xe0, 0xf0, 0xb1, 0x6c, 0xef, 0xc6, 0x22, 0x68, 0xee, 0xdd, 0x90, 0x18,
+	0x63, 0xac, 0x02, 0xdd, 0x68, 0x69, 0xfc, 0x5e, 0x02, 0xb9, 0x33, 0xee, 0x17, 0x36, 0xdc, 0x7c,
+	0xe8, 0x56, 0x8d, 0x03, 0xd3, 0xb0, 0x7d, 0x33, 0x4c, 0x8f, 0x33, 0x4d, 0x36, 0x94, 0xe5, 0x33,
+	0xf8, 0x8f, 0x8f, 0x60, 0x95, 0xa5, 0xe5, 0x13, 0xe8, 0x1b, 0xdc, 0x2a, 0x5f, 0xc1, 0x17, 0xf0,
+	0x3f, 0x9f, 0xc0, 0xea, 0xee, 0x99, 0x61, 0x20, 0xcb, 0x5d, 0x92, 0xca, 0x5f, 0x3b, 0xe7, 0xf4,
+	0xf9, 0x9d, 0x3e, 0x7d, 0xbe, 0x59, 0xb8, 0x37, 0x61, 0x6c, 0xe2, 0x90, 0x96, 0xe7, 0xd3, 0x37,
+	0xd6, 0x68, 0xde, 0xb2, 0x1d, 0xaf, 0xf5, 0xe6, 0xb0, 0x15, 0x70, 0xe6, 0x5b, 0x13, 0xd2, 0xf4,
+	0x7c, 0xc6, 0x19, 0xba, 0xa5, 0x84, 0x9a, 0xa1, 0x50, 0xd3, 0x76, 0xbc, 0xe6, 0x9b, 0xc3, 0xfa,
+	0x37, 0x42, 0xac, 0xe5, 0xd1, 0x96, 0xe5, 0xba, 0x8c, 0x5b, 0x9c, 0x32, 0x37, 0x50, 0xa0, 0xfa,
+	0xa7, 0xb1, 0x66, 0xc6, 0xd9, 0x70, 0x36, 0x6e, 0x71, 0x3a, 0x25, 0x01, 0xb7, 0xa6, 0x9e, 0x12,
+	0x68, 0x7c, 0x02, 0x79, 0xc3, 0x1d, 0xb3, 0xc1, 0xdc, 0x23, 0x08, 0xc1, 0x96, 0x6b, 0x4d, 0x49,
+	0x4d, 0x3b, 0xd0, 0x1e, 0x16, 0xb0, 0xfc, 0x6e, 0xfc, 0xbb, 0x08, 0x95, 0xa7, 0xb3, 0x80, 0xb3,
+	0x69, 0x2c, 0xf6, 0x53, 0x28, 0x50, 0x77, 0xcc, 0x4c, 0x3e, 0xf7, 0x94, 0x6c, 0xf1, 0xf0, 0xd3,
+	0xe6, 0xb5, 0xc6, 0x35, 0x23, 0x0c, 0xce, 0xd3, 0x08, 0x7d, 0x04, 0xe0, 0xd0, 0xd7, 0xc4, 0xa1,
+	0x97, 0x8c, 0xd9, 0xb5, 0xed, 0x03, 0xed, 0x61, 0xe5, 0xf0, 0xee, 0x1a, 0xf8, 0x49, 0x2c, 0x88,
+	0x13, 0x20, 0x84, 0x01, 0x6c, 0x3a, 0x12, 0xcf, 0xb4, 0xfc, 0x79, 0x2d, 0x2d, 0x2d, 0xf8, 0xee,
+	0x1a, 0x15, 0xcb, 0xb6, 0x37, 0x3b, 0x31, 0x4e, 0x4f, 0xe1, 0x84, 0x16, 0xf4, 0x14, 0xb2, 0x3e,
+	0x99, 0x90, 0xb7, 0xb5, 0x8c, 0x54, 0xf7, 0x9d, 0xcd, 0xd4, 0x61, 0x01, 0xd1, 0x53, 0x58, 0x61,
+	0xd1, 0x05, 0x54, 0x82, 0x99, 0xef, 0xb3, 0x89, 0xc5, 0x89, 0x72, 0xcf, 0x96, 0xd4, 0xf6, 0x78,
+	0x33, 0x6d, 0xfd, 0x08, 0x2b, 0x28, 0x3d, 0x85, 0xcb, 0x41, 0x92, 0x81, 0x2e, 0x60, 0xc7, 0x26,
+	0x9c, 0x48, 0x93, 0x4d, 0x7f, 0xe6, 0x90, 0xa0, 0x96, 0x3b, 0xc8, 0x6c, 0xae, 0xbe, 0x13, 0x81,
+	0xf1, 0xcc, 0x21, 0xb8, 0x62, 0x27, 0xc9, 0xa0, 0xfe, 0x5f, 0x0d, 0x60, 0xe1, 0x1d, 0xf4, 0x12,
+	0x0a, 0x57, 0xcc, 0xb7, 0x4d, 0x87, 0x06, 0x3c, 0x0c, 0xf2, 0x93, 0xf7, 0x75, 0x71, 0xf3, 0x05,
+	0xf3, 0xed, 0x13, 0x1a, 0x70, 0x3d, 0x85, 0xf3, 0x57, 0xe1, 0x37, 0x7a, 0x01, 0x68, 0xe4, 0xb0,
+	0x99, 0x6d, 0x86, 0xe9, 0x6d, 0x7a, 0x16, 0xbf, 0x0c, 0xdd, 0xfe, 0xad, 0x75, 0x57, 0x08, 0x40,
+	0x5f, 0xc9, 0xf7, 0x2c, 0x7e, 0xa9, 0xa7, 0x70, 0x75, 0xb4, 0xc2, 0xab, 0x1f, 0x40, 0x3e, 0xba,
+	0x10, 0xed, 0x43, 0x56, 0x5c, 0x18, 0xd4, 0xb4, 0x83, 0xcc, 0xc3, 0x02, 0x56, 0x44, 0x3b, 0x0f,
+	0xdb, 0x01, 0x9b, 0xf9, 0x23, 0x52, 0xbf, 0x0b, 0x59, 0x19, 0x3b, 0x54, 0x83, 0x9c, 0x67, 0x71,
+	0x4e, 0x7c, 0x37, 0x4c, 0xfb, 0x88, 0xac, 0xef, 0x40, 0x79, 0x29, 0x20, 0xf5, 0x7f, 0x66, 0xa1,
+	0xbc, 0xe4, 0x43, 0x64, 0x43, 0xe9, 0x92, 0x71, 0xe9, 0x27, 0x11, 0x8f, 0xd0, 0x4f, 0xbf, 0xf8,
+	0x80, 0x70, 0x34, 0x75, 0xa5, 0x47, 0x7c, 0xeb, 0x29, 0x5c, 0xbc, 0x5c, 0x90, 0xf5, 0x3e, 0x14,
+	0x7a, 0x3e, 0x7b, 0x4b, 0xa7, 0x94, 0xcf, 0xd1, 0x3d, 0x28, 0x5f, 0x51, 0xd7, 0x66, 0x57, 0xe6,
+	0x90, 0x8c, 0x99, 0xaf, 0xee, 0xcc, 0xe2, 0x92, 0x62, 0xb6, 0x25, 0x0f, 0xdd, 0x85, 0x90, 0x36,
+	0xad, 0x31, 0x27, 0xbe, 0x2c, 0x91, 0x2c, 0x2e, 0x2a, 0xde, 0x91, 0x60, 0xd5, 0xff, 0xaa, 0xc1,
+	0xfe, 0xa2, 0xbc, 0x8e, 0xec, 0x2f, 0x66, 0x01, 0x9f, 0x12, 0x97, 0xa3, 0x33, 0xa8, 0x8e, 0xe9,
+	0x5b, 0x22, 0x22, 0x1f, 0x57, 0xa9, 0xb6, 0x61, 0x95, 0xea, 0x29, 0xbc, 0x23, 0xc1, 0x0b, 0x16,
+	0xfa, 0x1e, 0xec, 0xf9, 0xc4, 0xb1, 0x38, 0x7d, 0x43, 0x92, 0x2a, 0xa5, 0x49, 0x7a, 0x0a, 0xa3,
+	0xe8, 0x70, 0x01, 0x69, 0x97, 0x00, 0xac, 0xd8, 0xa0, 0xfa, 0xbf, 0xd2, 0x50, 0x4c, 0x78, 0x07,
+	0xf5, 0xa0, 0x1c, 0x3b, 0x5d, 0x56, 0xac, 0xf6, 0xde, 0x15, 0x8b, 0xa3, 0xb0, 0xa9, 0x1c, 0xf8,
+	0x2d, 0x14, 0xbc, 0xc8, 0xc1, 0x61, 0x3b, 0xf9, 0xd9, 0x87, 0xc4, 0x30, 0x8e, 0x12, 0x5e, 0xe8,
+	0x43, 0x7f, 0x84, 0x5b, 0x8b, 0x67, 0x9b, 0x8b, 0x77, 0x85, 0x19, 0xaf, 0x7f, 0xc8, 0x45, 0xd7,
+	0x05, 0x0e, 0xef, 0x3b, 0xd7, 0x70, 0xdb, 0xdb, 0xb0, 0x25, 0x1a, 0x51, 0xf4, 0xb7, 0x71, 0x07,
+	0x72, 0xcf, 0x28, 0x71, 0x6c, 0xc3, 0xbe, 0xb6, 0xdd, 0x9f, 0x43, 0xb1, 0x67, 0xf9, 0x9c, 0x8a,
+	0xab, 0x0c, 0x1b, 0xdd, 0x01, 0xf0, 0x7c, 0xf6, 0x05, 0x19, 0x71, 0x93, 0xaa, 0x98, 0x15, 0xe4,
+	0xdb, 0x04, 0xc7, 0xb0, 0x45, 0x9e, 0x09, 0x54, 0xe0, 0x59, 0x23, 0x22, 0x04, 0xb6, 0xa4, 0x40,
+	0x31, 0xe6, 0x19, 0x76, 0xe3, 0x3e, 0x54, 0x8e, 0xa9, 0x6b, 0x77, 0xdf, 0x7a, 0x3e, 0x09, 0x02,
+	0xca, 0xdc, 0x6b, 0xaf, 0xfd, 0xb3, 0x06, 0xd5, 0x8e, 0xc5, 0x2d, 0xd1, 0x12, 0xc8, 0xb9, 0x27,
+	0x27, 0x18, 0xea, 0x42, 0xc9, 0x8b, 0x6c, 0x11, 0xda, 0x55, 0x9c, 0x1b, 0x6b, 0x1c, 0x96, 0x30,
+	0x1b, 0x17, 0xbd, 0xc4, 0x1b, 0x9e, 0xc0, 0xd6, 0x6b, 0xea, 0xda, 0x61, 0x60, 0xbf, 0xb9, 0x06,
+	0xbe, 0x6c, 0x24, 0x96, 0x90, 0xc6, 0x97, 0x19, 0xd8, 0x4b, 0xb6, 0x9e, 0xc8, 0xb2, 0x53, 0xc8,
+	0x8f, 0xa9, 0x43, 0xcc, 0x80, 0x44, 0xbd, 0xf1, 0x70, 0x83, 0xc6, 0x15, 0xa2, 0x9b, 0xcf, 0xa8,
+	0x43, 0xfa, 0x84, 0xe3, 0xdc, 0x58, 0x7d, 0xa0, 0x16, 0xec, 0x0f, 0xe7, 0x9c, 0x04, 0xa6, 0x23,
+	0x52, 0xc6, 0xf4, 0x88, 0x6f, 0x8a, 0x23, 0xe9, 0xce, 0x0c, 0xde, 0x95, 0x67, 0x27, 0xe2, 0xa8,
+	0x47, 0x7c, 0x01, 0x46, 0x3f, 0x07, 0x90, 0xf7, 0x8b, 0x88, 0x06, 0xb5, 0xec, 0x41, 0xe6, 0x61,
+	0x65, 0xed, 0x08, 0x16, 0x00, 0x39, 0x82, 0x0b, 0xe3, 0xf0, 0x2b, 0x40, 0x17, 0x50, 0x0e, 0xac,
+	0xa9, 0xe7, 0x10, 0x73, 0x4a, 0xf8, 0x65, 0x3c, 0x86, 0x7f, 0xf8, 0x1e, 0x8f, 0xe8, 0x4b, 0xfc,
+	0xa9, 0x84, 0xe3, 0x52, 0x90, 0xa0, 0x50, 0x13, 0xf6, 0xc4, 0x55, 0x89, 0xe7, 0x8c, 0x44, 0xbe,
+	0xe7, 0x64, 0x13, 0xda, 0x95, 0x47, 0xd1, 0x6b, 0xc4, 0x41, 0xfd, 0xeb, 0x22, 0x25, 0x95, 0x27,
+	0xaa, 0x90, 0x99, 0xf9, 0x4e, 0x98, 0x1a, 0xe2, 0xb3, 0xa1, 0x43, 0x29, 0x79, 0x15, 0xba, 0x03,
+	0xb7, 0xfb, 0x47, 0xa7, 0xbd, 0x93, 0xae, 0x79, 0xda, 0x1d, 0xe8, 0xe7, 0x1d, 0xf3, 0xf3, 0xb3,
+	0x7e, 0xaf, 0xfb, 0xd4, 0x78, 0x66, 0x74, 0x3b, 0xd5, 0x14, 0xca, 0x41, 0x66, 0x70, 0xde, 0xab,
+	0x6a, 0xa8, 0x0a, 0x25, 0x7c, 0x74, 0xd6, 0x39, 0x3f, 0x35, 0xfb, 0x83, 0x23, 0x3c, 0xa8, 0xa6,
+	0x1b, 0x0f, 0xa0, 0xba, 0x3a, 0x46, 0x44, 0x2e, 0xca, 0xe9, 0x13, 0xe6, 0xa2, 0xf8, 0x6e, 0xfc,
+	0x2f, 0x0d, 0x3b, 0x6d, 0x3a, 0xf9, 0xf5, 0x8c, 0xf8, 0xf3, 0x45, 0xc0, 0x77, 0xb8, 0x35, 0x74,
+	0x88, 0xe9, 0x93, 0x31, 0xf1, 0x89, 0x3b, 0x8a, 0x7a, 0xfd, 0xfd, 0x35, 0x2e, 0x8b, 0x14, 0x0c,
+	0x04, 0x0a, 0x57, 0x24, 0x18, 0x47, 0x58, 0x74, 0x0a, 0x88, 0xda, 0xc4, 0xe5, 0x74, 0x3c, 0xa7,
+	0xee, 0xc4, 0x1c, 0x8b, 0x82, 0x0c, 0x6a, 0x69, 0x39, 0xcc, 0x3f, 0x59, 0x1b, 0x47, 0x59, 0xb5,
+	0x78, 0x37, 0x81, 0x94, 0xbc, 0x40, 0x54, 0xa9, 0xcf, 0xae, 0x42, 0x7f, 0xcb, 0xbe, 0x92, 0xc1,
+	0x05, 0xc1, 0x91, 0x6e, 0x46, 0x2f, 0x57, 0xa3, 0xbd, 0x25, 0xa3, 0xfd, 0xf8, 0x06, 0xd3, 0x6f,
+	0x8e, 0xf4, 0x47, 0x0c, 0xce, 0x3f, 0xb2, 0x50, 0x0e, 0x03, 0xf3, 0x94, 0xb9, 0x63, 0x3a, 0x41,
+	0xcf, 0x61, 0xd7, 0x8e, 0x3a, 0x82, 0xc9, 0x94, 0x2d, 0x61, 0x0d, 0xaf, 0xdb, 0x12, 0x56, 0x3b,
+	0x88, 0xd8, 0x12, 0xec, 0xd5, 0xae, 0xf2, 0x3b, 0xb8, 0xb5, 0xbc, 0x7e, 0x44, 0xba, 0x55, 0x3f,
+	0x7e, 0xb4, 0x79, 0x0d, 0xe8, 0x29, 0xbc, 0x37, 0xba, 0xa6, 0x3b, 0x0c, 0x60, 0x77, 0x48, 0x27,
+	0xe6, 0xef, 0x85, 0x13, 0x63, 0xed, 0x6a, 0x11, 0x7c, 0xb0, 0x99, 0xcf, 0xc5, 0x1c, 0x1d, 0xae,
+	0xa4, 0xe0, 0x05, 0xec, 0xc8, 0xdd, 0xdd, 0xb3, 0x5c, 0x73, 0x24, 0x5d, 0x24, 0xab, 0x76, 0xfd,
+	0xf6, 0xb7, 0xe4, 0xce, 0xe6, 0x20, 0xc4, 0x2a, 0x12, 0x57, 0xf8, 0x12, 0x5d, 0xff, 0x4b, 0x1a,
+	0x2a, 0xcb, 0x22, 0xe8, 0x09, 0x40, 0xc0, 0x2d, 0x9f, 0x9b, 0x42, 0x34, 0x4c, 0xf7, 0xfa, 0xe2,
+	0x2e, 0xf5, 0x7b, 0x42, 0xe9, 0x15, 0xbf, 0x27, 0x70, 0x41, 0x4a, 0x0b, 0x1a, 0xfd, 0x00, 0xf2,
+	0xc4, 0xb5, 0x15, 0x30, 0x7d, 0x23, 0x30, 0x47, 0x5c, 0x5b, 0xc2, 0x3e, 0x0b, 0x9f, 0x28, 0xb8,
+	0xaa, 0x28, 0xc2, 0xa0, 0xdc, 0x54, 0x13, 0x95, 0x18, 0x26, 0x39, 0xe8, 0x05, 0x7c, 0x9b, 0xb8,
+	0xb2, 0x5e, 0xad, 0x19, 0x67, 0xa6, 0xc7, 0xbc, 0x99, 0x23, 0x7f, 0x16, 0x99, 0x6c, 0x6c, 0xae,
+	0x7a, 0x51, 0x44, 0x26, 0x8f, 0xef, 0x2b, 0xc0, 0xd1, 0x8c, 0xb3, 0x5e, 0x2c, 0x7e, 0x3e, 0x5e,
+	0xf6, 0x49, 0x3c, 0x45, 0xff, 0x00, 0xc5, 0x28, 0x64, 0xc7, 0x64, 0xfe, 0xb1, 0xdb, 0x83, 0xaa,
+	0x67, 0xd3, 0x9d, 0x4d, 0x87, 0xe1, 0xf2, 0xa6, 0xea, 0xf9, 0x4c, 0x32, 0x1a, 0x06, 0x94, 0xe2,
+	0x4c, 0x17, 0xb7, 0x3f, 0x01, 0x10, 0x1d, 0x81, 0xcf, 0xcd, 0xd7, 0x64, 0xfe, 0x6e, 0xa0, 0x96,
+	0xc7, 0x1c, 0x99, 0xe3, 0x82, 0x92, 0x3e, 0x26, 0xf3, 0xc6, 0x7f, 0x34, 0xc8, 0x08, 0x15, 0x1f,
+	0x69, 0xd4, 0xfe, 0x38, 0x6c, 0xa7, 0xaa, 0x93, 0x3d, 0x58, 0x6f, 0x43, 0x53, 0x74, 0xdf, 0xae,
+	0x43, 0xe4, 0xe2, 0x22, 0x31, 0xf5, 0x81, 0xd8, 0x3c, 0x62, 0xa6, 0xe8, 0xcc, 0x72, 0x6a, 0x87,
+	0x9d, 0x59, 0x7c, 0xa3, 0x2a, 0xa4, 0xc3, 0x2d, 0x24, 0xa3, 0xa7, 0x70, 0x9a, 0xda, 0x68, 0x3f,
+	0xdc, 0x25, 0x44, 0x9a, 0x14, 0xf4, 0x94, 0xda, 0x26, 0xda, 0x05, 0xc8, 0x51, 0x5b, 0x0e, 0xc7,
+	0xc6, 0xdf, 0x34, 0x28, 0x60, 0x32, 0x62, 0xbe, 0x2d, 0x9e, 0xf9, 0x2b, 0x28, 0x2f, 0x7a, 0x8a,
+	0x70, 0x96, 0x4a, 0xce, 0x7b, 0x37, 0xf5, 0x93, 0x63, 0x22, 0x7e, 0x2e, 0x96, 0xec, 0xa4, 0xd7,
+	0x75, 0x28, 0x2f, 0xaa, 0x5c, 0xe8, 0xca, 0x7c, 0xa5, 0xcf, 0x12, 0xe9, 0x22, 0xf6, 0xfb, 0xe1,
+	0x82, 0x8c, 0x93, 0xea, 0x12, 0xca, 0x4b, 0x79, 0xb1, 0xb2, 0x7d, 0x69, 0xab, 0xdb, 0xd7, 0x1d,
+	0x00, 0x69, 0x11, 0x49, 0x2e, 0x67, 0x21, 0xc7, 0xb0, 0xd1, 0x6d, 0xc8, 0xab, 0xa4, 0xa4, 0xaa,
+	0x8c, 0x0a, 0x38, 0x27, 0x69, 0xc3, 0x6e, 0xfc, 0x12, 0xf2, 0x5d, 0x99, 0x03, 0x86, 0x8d, 0xbe,
+	0x0f, 0x59, 0x55, 0x6a, 0xda, 0x46, 0xa5, 0xa6, 0x84, 0x1f, 0x71, 0x80, 0xc4, 0x8e, 0x5f, 0x87,
+	0xaf, 0x9d, 0x18, 0xc7, 0xdd, 0x13, 0x43, 0x3f, 0x7f, 0xa7, 0xe9, 0xef, 0x42, 0xf9, 0x79, 0x17,
+	0xbf, 0x32, 0x3f, 0x3f, 0x93, 0x22, 0xaf, 0xaa, 0x1a, 0x2a, 0x41, 0x3e, 0xa6, 0xd2, 0x82, 0xea,
+	0x9d, 0xf7, 0xfb, 0x46, 0xfb, 0xa4, 0x5b, 0xcd, 0x20, 0x80, 0xed, 0xf0, 0x64, 0x0b, 0xed, 0x40,
+	0x51, 0x42, 0x43, 0x46, 0xf6, 0x51, 0x17, 0xf2, 0xd1, 0x3a, 0x83, 0x6e, 0xc3, 0xad, 0x67, 0xc6,
+	0x49, 0xd7, 0x1c, 0xbc, 0xea, 0x75, 0x57, 0xae, 0xdc, 0x81, 0x62, 0xdb, 0x38, 0x3b, 0xc2, 0xaf,
+	0x4c, 0x21, 0x51, 0xd5, 0x50, 0x19, 0x0a, 0x83, 0xee, 0xcb, 0x81, 0x22, 0xd3, 0xed, 0x3f, 0x69,
+	0x70, 0x7b, 0xc4, 0xa6, 0xd7, 0xbf, 0xb4, 0x0d, 0x1d, 0xc7, 0x8b, 0x76, 0x04, 0xed, 0x37, 0x3f,
+	0x0a, 0x85, 0x26, 0xcc, 0xb1, 0xdc, 0x49, 0x93, 0xf9, 0x93, 0xd6, 0x84, 0xb8, 0xb2, 0x8b, 0xb5,
+	0xd4, 0x91, 0xe5, 0xd1, 0x60, 0xe5, 0x3f, 0x37, 0x3f, 0xb1, 0x1d, 0xef, 0xef, 0xe9, 0xbd, 0xcf,
+	0x14, 0x54, 0x8e, 0x8e, 0x66, 0xc7, 0xf1, 0x9a, 0xcf, 0x0f, 0xbf, 0x8c, 0xb8, 0x17, 0x92, 0x7b,
+	0xd1, 0x71, 0xbc, 0x8b, 0xe7, 0x87, 0xc3, 0x6d, 0xa9, 0xf0, 0xf1, 0xff, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0x69, 0x7c, 0xa2, 0x7a, 0x09, 0x12, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta1/dlp.pb.go b/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta1/dlp.pb.go
deleted file mode 100644
index 7d2fc2fd..00000000
--- a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta1/dlp.pb.go
+++ /dev/null
@@ -1,5610 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-/*
-Package dlp is a generated protocol buffer package.
-
-It is generated from these files:
-	google/privacy/dlp/v2beta1/dlp.proto
-	google/privacy/dlp/v2beta1/storage.proto
-
-It has these top-level messages:
-	InspectConfig
-	OperationConfig
-	ContentItem
-	Table
-	InspectResult
-	Finding
-	Location
-	TableLocation
-	Range
-	ImageLocation
-	RedactContentRequest
-	Color
-	RedactContentResponse
-	DeidentifyContentRequest
-	DeidentifyContentResponse
-	InspectContentRequest
-	InspectContentResponse
-	CreateInspectOperationRequest
-	OutputStorageConfig
-	InfoTypeStatistics
-	InspectOperationMetadata
-	InspectOperationResult
-	ListInspectFindingsRequest
-	ListInspectFindingsResponse
-	InfoTypeDescription
-	ListInfoTypesRequest
-	ListInfoTypesResponse
-	CategoryDescription
-	ListRootCategoriesRequest
-	ListRootCategoriesResponse
-	AnalyzeDataSourceRiskRequest
-	PrivacyMetric
-	RiskAnalysisOperationMetadata
-	RiskAnalysisOperationResult
-	ValueFrequency
-	Value
-	DeidentifyConfig
-	PrimitiveTransformation
-	TimePartConfig
-	CryptoHashConfig
-	ReplaceValueConfig
-	ReplaceWithInfoTypeConfig
-	RedactConfig
-	CharsToIgnore
-	CharacterMaskConfig
-	FixedSizeBucketingConfig
-	BucketingConfig
-	CryptoReplaceFfxFpeConfig
-	CryptoKey
-	TransientCryptoKey
-	UnwrappedCryptoKey
-	KmsWrappedCryptoKey
-	InfoTypeTransformations
-	FieldTransformation
-	RecordTransformations
-	RecordSuppression
-	RecordCondition
-	DeidentificationSummary
-	TransformationSummary
-	InfoType
-	CustomInfoType
-	FieldId
-	PartitionId
-	KindExpression
-	PropertyReference
-	Projection
-	DatastoreOptions
-	CloudStorageOptions
-	CloudStoragePath
-	BigQueryOptions
-	StorageConfig
-	CloudStorageKey
-	DatastoreKey
-	Key
-	RecordKey
-	BigQueryTable
-	EntityId
-*/
-package dlp
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import _ "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
-import google_type "google.golang.org/genproto/googleapis/type/date"
-import google_type1 "google.golang.org/genproto/googleapis/type/timeofday"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-// Categorization of results based on how likely they are to represent a match,
-// based on the number of elements they contain which imply a match.
-type Likelihood int32
-
-const (
-	// Default value; information with all likelihoods is included.
-	Likelihood_LIKELIHOOD_UNSPECIFIED Likelihood = 0
-	// Few matching elements.
-	Likelihood_VERY_UNLIKELY Likelihood = 1
-	Likelihood_UNLIKELY      Likelihood = 2
-	// Some matching elements.
-	Likelihood_POSSIBLE Likelihood = 3
-	Likelihood_LIKELY   Likelihood = 4
-	// Many matching elements.
-	Likelihood_VERY_LIKELY Likelihood = 5
-)
-
-var Likelihood_name = map[int32]string{
-	0: "LIKELIHOOD_UNSPECIFIED",
-	1: "VERY_UNLIKELY",
-	2: "UNLIKELY",
-	3: "POSSIBLE",
-	4: "LIKELY",
-	5: "VERY_LIKELY",
-}
-var Likelihood_value = map[string]int32{
-	"LIKELIHOOD_UNSPECIFIED": 0,
-	"VERY_UNLIKELY":          1,
-	"UNLIKELY":               2,
-	"POSSIBLE":               3,
-	"LIKELY":                 4,
-	"VERY_LIKELY":            5,
-}
-
-func (x Likelihood) String() string {
-	return proto.EnumName(Likelihood_name, int32(x))
-}
-func (Likelihood) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-// Operators available for comparing the value of fields.
-type RelationalOperator int32
-
-const (
-	RelationalOperator_RELATIONAL_OPERATOR_UNSPECIFIED RelationalOperator = 0
-	// Equal.
-	RelationalOperator_EQUAL_TO RelationalOperator = 1
-	// Not equal to.
-	RelationalOperator_NOT_EQUAL_TO RelationalOperator = 2
-	// Greater than.
-	RelationalOperator_GREATER_THAN RelationalOperator = 3
-	// Less than.
-	RelationalOperator_LESS_THAN RelationalOperator = 4
-	// Greater than or equals.
-	RelationalOperator_GREATER_THAN_OR_EQUALS RelationalOperator = 5
-	// Less than or equals.
-	RelationalOperator_LESS_THAN_OR_EQUALS RelationalOperator = 6
-	// Exists
-	RelationalOperator_EXISTS RelationalOperator = 7
-)
-
-var RelationalOperator_name = map[int32]string{
-	0: "RELATIONAL_OPERATOR_UNSPECIFIED",
-	1: "EQUAL_TO",
-	2: "NOT_EQUAL_TO",
-	3: "GREATER_THAN",
-	4: "LESS_THAN",
-	5: "GREATER_THAN_OR_EQUALS",
-	6: "LESS_THAN_OR_EQUALS",
-	7: "EXISTS",
-}
-var RelationalOperator_value = map[string]int32{
-	"RELATIONAL_OPERATOR_UNSPECIFIED": 0,
-	"EQUAL_TO":                        1,
-	"NOT_EQUAL_TO":                    2,
-	"GREATER_THAN":                    3,
-	"LESS_THAN":                       4,
-	"GREATER_THAN_OR_EQUALS":          5,
-	"LESS_THAN_OR_EQUALS":             6,
-	"EXISTS":                          7,
-}
-
-func (x RelationalOperator) String() string {
-	return proto.EnumName(RelationalOperator_name, int32(x))
-}
-func (RelationalOperator) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type TimePartConfig_TimePart int32
-
-const (
-	TimePartConfig_TIME_PART_UNSPECIFIED TimePartConfig_TimePart = 0
-	// [000-9999]
-	TimePartConfig_YEAR TimePartConfig_TimePart = 1
-	// [1-12]
-	TimePartConfig_MONTH TimePartConfig_TimePart = 2
-	// [1-31]
-	TimePartConfig_DAY_OF_MONTH TimePartConfig_TimePart = 3
-	// [1-7]
-	TimePartConfig_DAY_OF_WEEK TimePartConfig_TimePart = 4
-	// [1-52]
-	TimePartConfig_WEEK_OF_YEAR TimePartConfig_TimePart = 5
-	// [0-24]
-	TimePartConfig_HOUR_OF_DAY TimePartConfig_TimePart = 6
-)
-
-var TimePartConfig_TimePart_name = map[int32]string{
-	0: "TIME_PART_UNSPECIFIED",
-	1: "YEAR",
-	2: "MONTH",
-	3: "DAY_OF_MONTH",
-	4: "DAY_OF_WEEK",
-	5: "WEEK_OF_YEAR",
-	6: "HOUR_OF_DAY",
-}
-var TimePartConfig_TimePart_value = map[string]int32{
-	"TIME_PART_UNSPECIFIED": 0,
-	"YEAR":                  1,
-	"MONTH":                 2,
-	"DAY_OF_MONTH":          3,
-	"DAY_OF_WEEK":           4,
-	"WEEK_OF_YEAR":          5,
-	"HOUR_OF_DAY":           6,
-}
-
-func (x TimePartConfig_TimePart) String() string {
-	return proto.EnumName(TimePartConfig_TimePart_name, int32(x))
-}
-func (TimePartConfig_TimePart) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{38, 0} }
-
-type CharsToIgnore_CharacterGroup int32
-
-const (
-	CharsToIgnore_CHARACTER_GROUP_UNSPECIFIED CharsToIgnore_CharacterGroup = 0
-	// 0-9
-	CharsToIgnore_NUMERIC CharsToIgnore_CharacterGroup = 1
-	// A-Z
-	CharsToIgnore_ALPHA_UPPER_CASE CharsToIgnore_CharacterGroup = 2
-	// a-z
-	CharsToIgnore_ALPHA_LOWER_CASE CharsToIgnore_CharacterGroup = 3
-	// US Punctuation, one of !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
-	CharsToIgnore_PUNCTUATION CharsToIgnore_CharacterGroup = 4
-	// Whitespace character, one of [ \t\n\x0B\f\r]
-	CharsToIgnore_WHITESPACE CharsToIgnore_CharacterGroup = 5
-)
-
-var CharsToIgnore_CharacterGroup_name = map[int32]string{
-	0: "CHARACTER_GROUP_UNSPECIFIED",
-	1: "NUMERIC",
-	2: "ALPHA_UPPER_CASE",
-	3: "ALPHA_LOWER_CASE",
-	4: "PUNCTUATION",
-	5: "WHITESPACE",
-}
-var CharsToIgnore_CharacterGroup_value = map[string]int32{
-	"CHARACTER_GROUP_UNSPECIFIED": 0,
-	"NUMERIC":                     1,
-	"ALPHA_UPPER_CASE":            2,
-	"ALPHA_LOWER_CASE":            3,
-	"PUNCTUATION":                 4,
-	"WHITESPACE":                  5,
-}
-
-func (x CharsToIgnore_CharacterGroup) String() string {
-	return proto.EnumName(CharsToIgnore_CharacterGroup_name, int32(x))
-}
-func (CharsToIgnore_CharacterGroup) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{43, 0}
-}
-
-// These are commonly used subsets of the alphabet that the FFX mode
-// natively supports. In the algorithm, the alphabet is selected using
-// the "radix". Therefore each corresponds to particular radix.
-type CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet int32
-
-const (
-	CryptoReplaceFfxFpeConfig_FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 0
-	// [0-9] (radix of 10)
-	CryptoReplaceFfxFpeConfig_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 1
-	// [0-9A-F] (radix of 16)
-	CryptoReplaceFfxFpeConfig_HEXADECIMAL CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 2
-	// [0-9A-Z] (radix of 36)
-	CryptoReplaceFfxFpeConfig_UPPER_CASE_ALPHA_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 3
-	// [0-9A-Za-z] (radix of 62)
-	CryptoReplaceFfxFpeConfig_ALPHA_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 4
-)
-
-var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name = map[int32]string{
-	0: "FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED",
-	1: "NUMERIC",
-	2: "HEXADECIMAL",
-	3: "UPPER_CASE_ALPHA_NUMERIC",
-	4: "ALPHA_NUMERIC",
-}
-var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value = map[string]int32{
-	"FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED": 0,
-	"NUMERIC":                  1,
-	"HEXADECIMAL":              2,
-	"UPPER_CASE_ALPHA_NUMERIC": 3,
-	"ALPHA_NUMERIC":            4,
-}
-
-func (x CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet) String() string {
-	return proto.EnumName(CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, int32(x))
-}
-func (CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{47, 0}
-}
-
-type RecordCondition_Expressions_LogicalOperator int32
-
-const (
-	RecordCondition_Expressions_LOGICAL_OPERATOR_UNSPECIFIED RecordCondition_Expressions_LogicalOperator = 0
-	RecordCondition_Expressions_AND                          RecordCondition_Expressions_LogicalOperator = 1
-)
-
-var RecordCondition_Expressions_LogicalOperator_name = map[int32]string{
-	0: "LOGICAL_OPERATOR_UNSPECIFIED",
-	1: "AND",
-}
-var RecordCondition_Expressions_LogicalOperator_value = map[string]int32{
-	"LOGICAL_OPERATOR_UNSPECIFIED": 0,
-	"AND": 1,
-}
-
-func (x RecordCondition_Expressions_LogicalOperator) String() string {
-	return proto.EnumName(RecordCondition_Expressions_LogicalOperator_name, int32(x))
-}
-func (RecordCondition_Expressions_LogicalOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{56, 2, 0}
-}
-
-// Possible outcomes of transformations.
-type TransformationSummary_TransformationResultCode int32
-
-const (
-	TransformationSummary_TRANSFORMATION_RESULT_CODE_UNSPECIFIED TransformationSummary_TransformationResultCode = 0
-	TransformationSummary_SUCCESS                                TransformationSummary_TransformationResultCode = 1
-	TransformationSummary_ERROR                                  TransformationSummary_TransformationResultCode = 2
-)
-
-var TransformationSummary_TransformationResultCode_name = map[int32]string{
-	0: "TRANSFORMATION_RESULT_CODE_UNSPECIFIED",
-	1: "SUCCESS",
-	2: "ERROR",
-}
-var TransformationSummary_TransformationResultCode_value = map[string]int32{
-	"TRANSFORMATION_RESULT_CODE_UNSPECIFIED": 0,
-	"SUCCESS": 1,
-	"ERROR":   2,
-}
-
-func (x TransformationSummary_TransformationResultCode) String() string {
-	return proto.EnumName(TransformationSummary_TransformationResultCode_name, int32(x))
-}
-func (TransformationSummary_TransformationResultCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{58, 0}
-}
-
-// Configuration description of the scanning process.
-// When used with redactContent only info_types and min_likelihood are currently
-// used.
-type InspectConfig struct {
-	// Restricts what info_types to look for. The values must correspond to
-	// InfoType values returned by ListInfoTypes or found in documentation.
-	// Empty info_types runs all enabled detectors.
-	InfoTypes []*InfoType `protobuf:"bytes,1,rep,name=info_types,json=infoTypes" json:"info_types,omitempty"`
-	// Only returns findings equal or above this threshold.
-	MinLikelihood Likelihood `protobuf:"varint,2,opt,name=min_likelihood,json=minLikelihood,enum=google.privacy.dlp.v2beta1.Likelihood" json:"min_likelihood,omitempty"`
-	// Limits the number of findings per content item or long running operation.
-	MaxFindings int32 `protobuf:"varint,3,opt,name=max_findings,json=maxFindings" json:"max_findings,omitempty"`
-	// When true, a contextual quote from the data that triggered a finding is
-	// included in the response; see Finding.quote.
-	IncludeQuote bool `protobuf:"varint,4,opt,name=include_quote,json=includeQuote" json:"include_quote,omitempty"`
-	// When true, excludes type information of the findings.
-	ExcludeTypes bool `protobuf:"varint,6,opt,name=exclude_types,json=excludeTypes" json:"exclude_types,omitempty"`
-	// Configuration of findings limit given for specified info types.
-	InfoTypeLimits []*InspectConfig_InfoTypeLimit `protobuf:"bytes,7,rep,name=info_type_limits,json=infoTypeLimits" json:"info_type_limits,omitempty"`
-	// Custom info types provided by the user.
-	CustomInfoTypes []*CustomInfoType `protobuf:"bytes,8,rep,name=custom_info_types,json=customInfoTypes" json:"custom_info_types,omitempty"`
-}
-
-func (m *InspectConfig) Reset()                    { *m = InspectConfig{} }
-func (m *InspectConfig) String() string            { return proto.CompactTextString(m) }
-func (*InspectConfig) ProtoMessage()               {}
-func (*InspectConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *InspectConfig) GetInfoTypes() []*InfoType {
-	if m != nil {
-		return m.InfoTypes
-	}
-	return nil
-}
-
-func (m *InspectConfig) GetMinLikelihood() Likelihood {
-	if m != nil {
-		return m.MinLikelihood
-	}
-	return Likelihood_LIKELIHOOD_UNSPECIFIED
-}
-
-func (m *InspectConfig) GetMaxFindings() int32 {
-	if m != nil {
-		return m.MaxFindings
-	}
-	return 0
-}
-
-func (m *InspectConfig) GetIncludeQuote() bool {
-	if m != nil {
-		return m.IncludeQuote
-	}
-	return false
-}
-
-func (m *InspectConfig) GetExcludeTypes() bool {
-	if m != nil {
-		return m.ExcludeTypes
-	}
-	return false
-}
-
-func (m *InspectConfig) GetInfoTypeLimits() []*InspectConfig_InfoTypeLimit {
-	if m != nil {
-		return m.InfoTypeLimits
-	}
-	return nil
-}
-
-func (m *InspectConfig) GetCustomInfoTypes() []*CustomInfoType {
-	if m != nil {
-		return m.CustomInfoTypes
-	}
-	return nil
-}
-
-// Max findings configuration per info type, per content item or long running
-// operation.
-type InspectConfig_InfoTypeLimit struct {
-	// Type of information the findings limit applies to. Only one limit per
-	// info_type should be provided. If InfoTypeLimit does not have an
-	// info_type, the DLP API applies the limit against all info_types that are
-	// found but not specified in another InfoTypeLimit.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Max findings limit for the given infoType.
-	MaxFindings int32 `protobuf:"varint,2,opt,name=max_findings,json=maxFindings" json:"max_findings,omitempty"`
-}
-
-func (m *InspectConfig_InfoTypeLimit) Reset()                    { *m = InspectConfig_InfoTypeLimit{} }
-func (m *InspectConfig_InfoTypeLimit) String() string            { return proto.CompactTextString(m) }
-func (*InspectConfig_InfoTypeLimit) ProtoMessage()               {}
-func (*InspectConfig_InfoTypeLimit) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
-
-func (m *InspectConfig_InfoTypeLimit) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *InspectConfig_InfoTypeLimit) GetMaxFindings() int32 {
-	if m != nil {
-		return m.MaxFindings
-	}
-	return 0
-}
-
-// Additional configuration for inspect long running operations.
-type OperationConfig struct {
-	// Max number of findings per file, Datastore entity, or database row.
-	MaxItemFindings int64 `protobuf:"varint,1,opt,name=max_item_findings,json=maxItemFindings" json:"max_item_findings,omitempty"`
-}
-
-func (m *OperationConfig) Reset()                    { *m = OperationConfig{} }
-func (m *OperationConfig) String() string            { return proto.CompactTextString(m) }
-func (*OperationConfig) ProtoMessage()               {}
-func (*OperationConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *OperationConfig) GetMaxItemFindings() int64 {
-	if m != nil {
-		return m.MaxItemFindings
-	}
-	return 0
-}
-
-// Container structure for the content to inspect.
-type ContentItem struct {
-	// Type of the content, as defined in Content-Type HTTP header.
-	// Supported types are: all "text" types, octet streams, PNG images,
-	// JPEG images.
-	Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
-	// Data of the item either in the byte array or UTF-8 string form.
-	//
-	// Types that are valid to be assigned to DataItem:
-	//	*ContentItem_Data
-	//	*ContentItem_Value
-	//	*ContentItem_Table
-	DataItem isContentItem_DataItem `protobuf_oneof:"data_item"`
-}
-
-func (m *ContentItem) Reset()                    { *m = ContentItem{} }
-func (m *ContentItem) String() string            { return proto.CompactTextString(m) }
-func (*ContentItem) ProtoMessage()               {}
-func (*ContentItem) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-type isContentItem_DataItem interface {
-	isContentItem_DataItem()
-}
-
-type ContentItem_Data struct {
-	Data []byte `protobuf:"bytes,2,opt,name=data,proto3,oneof"`
-}
-type ContentItem_Value struct {
-	Value string `protobuf:"bytes,3,opt,name=value,oneof"`
-}
-type ContentItem_Table struct {
-	Table *Table `protobuf:"bytes,4,opt,name=table,oneof"`
-}
-
-func (*ContentItem_Data) isContentItem_DataItem()  {}
-func (*ContentItem_Value) isContentItem_DataItem() {}
-func (*ContentItem_Table) isContentItem_DataItem() {}
-
-func (m *ContentItem) GetDataItem() isContentItem_DataItem {
-	if m != nil {
-		return m.DataItem
-	}
-	return nil
-}
-
-func (m *ContentItem) GetType() string {
-	if m != nil {
-		return m.Type
-	}
-	return ""
-}
-
-func (m *ContentItem) GetData() []byte {
-	if x, ok := m.GetDataItem().(*ContentItem_Data); ok {
-		return x.Data
-	}
-	return nil
-}
-
-func (m *ContentItem) GetValue() string {
-	if x, ok := m.GetDataItem().(*ContentItem_Value); ok {
-		return x.Value
-	}
-	return ""
-}
-
-func (m *ContentItem) GetTable() *Table {
-	if x, ok := m.GetDataItem().(*ContentItem_Table); ok {
-		return x.Table
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ContentItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ContentItem_OneofMarshaler, _ContentItem_OneofUnmarshaler, _ContentItem_OneofSizer, []interface{}{
-		(*ContentItem_Data)(nil),
-		(*ContentItem_Value)(nil),
-		(*ContentItem_Table)(nil),
-	}
-}
-
-func _ContentItem_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ContentItem)
-	// data_item
-	switch x := m.DataItem.(type) {
-	case *ContentItem_Data:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Data)
-	case *ContentItem_Value:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Value)
-	case *ContentItem_Table:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Table); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ContentItem.DataItem has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ContentItem_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ContentItem)
-	switch tag {
-	case 2: // data_item.data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.DataItem = &ContentItem_Data{x}
-		return true, err
-	case 3: // data_item.value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.DataItem = &ContentItem_Value{x}
-		return true, err
-	case 4: // data_item.table
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Table)
-		err := b.DecodeMessage(msg)
-		m.DataItem = &ContentItem_Table{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ContentItem_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ContentItem)
-	// data_item
-	switch x := m.DataItem.(type) {
-	case *ContentItem_Data:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Data)))
-		n += len(x.Data)
-	case *ContentItem_Value:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Value)))
-		n += len(x.Value)
-	case *ContentItem_Table:
-		s := proto.Size(x.Table)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Structured content to inspect. Up to 50,000 `Value`s per request allowed.
-type Table struct {
-	Headers []*FieldId   `protobuf:"bytes,1,rep,name=headers" json:"headers,omitempty"`
-	Rows    []*Table_Row `protobuf:"bytes,2,rep,name=rows" json:"rows,omitempty"`
-}
-
-func (m *Table) Reset()                    { *m = Table{} }
-func (m *Table) String() string            { return proto.CompactTextString(m) }
-func (*Table) ProtoMessage()               {}
-func (*Table) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *Table) GetHeaders() []*FieldId {
-	if m != nil {
-		return m.Headers
-	}
-	return nil
-}
-
-func (m *Table) GetRows() []*Table_Row {
-	if m != nil {
-		return m.Rows
-	}
-	return nil
-}
-
-type Table_Row struct {
-	Values []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
-}
-
-func (m *Table_Row) Reset()                    { *m = Table_Row{} }
-func (m *Table_Row) String() string            { return proto.CompactTextString(m) }
-func (*Table_Row) ProtoMessage()               {}
-func (*Table_Row) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 0} }
-
-func (m *Table_Row) GetValues() []*Value {
-	if m != nil {
-		return m.Values
-	}
-	return nil
-}
-
-// All the findings for a single scanned item.
-type InspectResult struct {
-	// List of findings for an item.
-	Findings []*Finding `protobuf:"bytes,1,rep,name=findings" json:"findings,omitempty"`
-	// If true, then this item might have more findings than were returned,
-	// and the findings returned are an arbitrary subset of all findings.
-	// The findings list might be truncated because the input items were too
-	// large, or because the server reached the maximum amount of resources
-	// allowed for a single API call. For best results, divide the input into
-	// smaller batches.
-	FindingsTruncated bool `protobuf:"varint,2,opt,name=findings_truncated,json=findingsTruncated" json:"findings_truncated,omitempty"`
-}
-
-func (m *InspectResult) Reset()                    { *m = InspectResult{} }
-func (m *InspectResult) String() string            { return proto.CompactTextString(m) }
-func (*InspectResult) ProtoMessage()               {}
-func (*InspectResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *InspectResult) GetFindings() []*Finding {
-	if m != nil {
-		return m.Findings
-	}
-	return nil
-}
-
-func (m *InspectResult) GetFindingsTruncated() bool {
-	if m != nil {
-		return m.FindingsTruncated
-	}
-	return false
-}
-
-// Container structure describing a single finding within a string or image.
-type Finding struct {
-	// The specific string that may be potentially sensitive info.
-	Quote string `protobuf:"bytes,1,opt,name=quote" json:"quote,omitempty"`
-	// The specific type of info the string might be.
-	InfoType *InfoType `protobuf:"bytes,2,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Estimate of how likely it is that the info_type is correct.
-	Likelihood Likelihood `protobuf:"varint,3,opt,name=likelihood,enum=google.privacy.dlp.v2beta1.Likelihood" json:"likelihood,omitempty"`
-	// Location of the info found.
-	Location *Location `protobuf:"bytes,4,opt,name=location" json:"location,omitempty"`
-	// Timestamp when finding was detected.
-	CreateTime *google_protobuf3.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-}
-
-func (m *Finding) Reset()                    { *m = Finding{} }
-func (m *Finding) String() string            { return proto.CompactTextString(m) }
-func (*Finding) ProtoMessage()               {}
-func (*Finding) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *Finding) GetQuote() string {
-	if m != nil {
-		return m.Quote
-	}
-	return ""
-}
-
-func (m *Finding) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *Finding) GetLikelihood() Likelihood {
-	if m != nil {
-		return m.Likelihood
-	}
-	return Likelihood_LIKELIHOOD_UNSPECIFIED
-}
-
-func (m *Finding) GetLocation() *Location {
-	if m != nil {
-		return m.Location
-	}
-	return nil
-}
-
-func (m *Finding) GetCreateTime() *google_protobuf3.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-// Specifies the location of a finding within its source item.
-type Location struct {
-	// Zero-based byte offsets within a content item.
-	ByteRange *Range `protobuf:"bytes,1,opt,name=byte_range,json=byteRange" json:"byte_range,omitempty"`
-	// Character offsets within a content item, included when content type
-	// is a text. Default charset assumed to be UTF-8.
-	CodepointRange *Range `protobuf:"bytes,2,opt,name=codepoint_range,json=codepointRange" json:"codepoint_range,omitempty"`
-	// Location within an image's pixels.
-	ImageBoxes []*ImageLocation `protobuf:"bytes,3,rep,name=image_boxes,json=imageBoxes" json:"image_boxes,omitempty"`
-	// Key of the finding.
-	RecordKey *RecordKey `protobuf:"bytes,4,opt,name=record_key,json=recordKey" json:"record_key,omitempty"`
-	// Field id of the field containing the finding.
-	FieldId *FieldId `protobuf:"bytes,5,opt,name=field_id,json=fieldId" json:"field_id,omitempty"`
-	// Location within a `ContentItem.Table`.
-	TableLocation *TableLocation `protobuf:"bytes,6,opt,name=table_location,json=tableLocation" json:"table_location,omitempty"`
-}
-
-func (m *Location) Reset()                    { *m = Location{} }
-func (m *Location) String() string            { return proto.CompactTextString(m) }
-func (*Location) ProtoMessage()               {}
-func (*Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *Location) GetByteRange() *Range {
-	if m != nil {
-		return m.ByteRange
-	}
-	return nil
-}
-
-func (m *Location) GetCodepointRange() *Range {
-	if m != nil {
-		return m.CodepointRange
-	}
-	return nil
-}
-
-func (m *Location) GetImageBoxes() []*ImageLocation {
-	if m != nil {
-		return m.ImageBoxes
-	}
-	return nil
-}
-
-func (m *Location) GetRecordKey() *RecordKey {
-	if m != nil {
-		return m.RecordKey
-	}
-	return nil
-}
-
-func (m *Location) GetFieldId() *FieldId {
-	if m != nil {
-		return m.FieldId
-	}
-	return nil
-}
-
-func (m *Location) GetTableLocation() *TableLocation {
-	if m != nil {
-		return m.TableLocation
-	}
-	return nil
-}
-
-// Location of a finding within a `ContentItem.Table`.
-type TableLocation struct {
-	// The zero-based index of the row where the finding is located.
-	RowIndex int64 `protobuf:"varint,1,opt,name=row_index,json=rowIndex" json:"row_index,omitempty"`
-}
-
-func (m *TableLocation) Reset()                    { *m = TableLocation{} }
-func (m *TableLocation) String() string            { return proto.CompactTextString(m) }
-func (*TableLocation) ProtoMessage()               {}
-func (*TableLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *TableLocation) GetRowIndex() int64 {
-	if m != nil {
-		return m.RowIndex
-	}
-	return 0
-}
-
-// Generic half-open interval [start, end)
-type Range struct {
-	// Index of the first character of the range (inclusive).
-	Start int64 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	// Index of the last character of the range (exclusive).
-	End int64 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-}
-
-func (m *Range) Reset()                    { *m = Range{} }
-func (m *Range) String() string            { return proto.CompactTextString(m) }
-func (*Range) ProtoMessage()               {}
-func (*Range) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *Range) GetStart() int64 {
-	if m != nil {
-		return m.Start
-	}
-	return 0
-}
-
-func (m *Range) GetEnd() int64 {
-	if m != nil {
-		return m.End
-	}
-	return 0
-}
-
-// Bounding box encompassing detected text within an image.
-type ImageLocation struct {
-	// Top coordinate of the bounding box. (0,0) is upper left.
-	Top int32 `protobuf:"varint,1,opt,name=top" json:"top,omitempty"`
-	// Left coordinate of the bounding box. (0,0) is upper left.
-	Left int32 `protobuf:"varint,2,opt,name=left" json:"left,omitempty"`
-	// Width of the bounding box in pixels.
-	Width int32 `protobuf:"varint,3,opt,name=width" json:"width,omitempty"`
-	// Height of the bounding box in pixels.
-	Height int32 `protobuf:"varint,4,opt,name=height" json:"height,omitempty"`
-}
-
-func (m *ImageLocation) Reset()                    { *m = ImageLocation{} }
-func (m *ImageLocation) String() string            { return proto.CompactTextString(m) }
-func (*ImageLocation) ProtoMessage()               {}
-func (*ImageLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-func (m *ImageLocation) GetTop() int32 {
-	if m != nil {
-		return m.Top
-	}
-	return 0
-}
-
-func (m *ImageLocation) GetLeft() int32 {
-	if m != nil {
-		return m.Left
-	}
-	return 0
-}
-
-func (m *ImageLocation) GetWidth() int32 {
-	if m != nil {
-		return m.Width
-	}
-	return 0
-}
-
-func (m *ImageLocation) GetHeight() int32 {
-	if m != nil {
-		return m.Height
-	}
-	return 0
-}
-
-// Request to search for potentially sensitive info in a list of items
-// and replace it with a default or provided content.
-type RedactContentRequest struct {
-	// Configuration for the inspector.
-	InspectConfig *InspectConfig `protobuf:"bytes,1,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// The list of items to inspect. Up to 100 are allowed per request.
-	Items []*ContentItem `protobuf:"bytes,2,rep,name=items" json:"items,omitempty"`
-	// The strings to replace findings text findings with. Must specify at least
-	// one of these or one ImageRedactionConfig if redacting images.
-	ReplaceConfigs []*RedactContentRequest_ReplaceConfig `protobuf:"bytes,3,rep,name=replace_configs,json=replaceConfigs" json:"replace_configs,omitempty"`
-	// The configuration for specifying what content to redact from images.
-	ImageRedactionConfigs []*RedactContentRequest_ImageRedactionConfig `protobuf:"bytes,4,rep,name=image_redaction_configs,json=imageRedactionConfigs" json:"image_redaction_configs,omitempty"`
-}
-
-func (m *RedactContentRequest) Reset()                    { *m = RedactContentRequest{} }
-func (m *RedactContentRequest) String() string            { return proto.CompactTextString(m) }
-func (*RedactContentRequest) ProtoMessage()               {}
-func (*RedactContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-func (m *RedactContentRequest) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *RedactContentRequest) GetItems() []*ContentItem {
-	if m != nil {
-		return m.Items
-	}
-	return nil
-}
-
-func (m *RedactContentRequest) GetReplaceConfigs() []*RedactContentRequest_ReplaceConfig {
-	if m != nil {
-		return m.ReplaceConfigs
-	}
-	return nil
-}
-
-func (m *RedactContentRequest) GetImageRedactionConfigs() []*RedactContentRequest_ImageRedactionConfig {
-	if m != nil {
-		return m.ImageRedactionConfigs
-	}
-	return nil
-}
-
-type RedactContentRequest_ReplaceConfig struct {
-	// Type of information to replace. Only one ReplaceConfig per info_type
-	// should be provided. If ReplaceConfig does not have an info_type, the DLP
-	// API matches it against all info_types that are found but not specified in
-	// another ReplaceConfig.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Content replacing sensitive information of given type. Max 256 chars.
-	ReplaceWith string `protobuf:"bytes,2,opt,name=replace_with,json=replaceWith" json:"replace_with,omitempty"`
-}
-
-func (m *RedactContentRequest_ReplaceConfig) Reset()         { *m = RedactContentRequest_ReplaceConfig{} }
-func (m *RedactContentRequest_ReplaceConfig) String() string { return proto.CompactTextString(m) }
-func (*RedactContentRequest_ReplaceConfig) ProtoMessage()    {}
-func (*RedactContentRequest_ReplaceConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{10, 0}
-}
-
-func (m *RedactContentRequest_ReplaceConfig) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *RedactContentRequest_ReplaceConfig) GetReplaceWith() string {
-	if m != nil {
-		return m.ReplaceWith
-	}
-	return ""
-}
-
-// Configuration for determining how redaction of images should occur.
-type RedactContentRequest_ImageRedactionConfig struct {
-	// Type of information to redact from images.
-	//
-	// Types that are valid to be assigned to Target:
-	//	*RedactContentRequest_ImageRedactionConfig_InfoType
-	//	*RedactContentRequest_ImageRedactionConfig_RedactAllText
-	Target isRedactContentRequest_ImageRedactionConfig_Target `protobuf_oneof:"target"`
-	// The color to use when redacting content from an image. If not specified,
-	// the default is black.
-	RedactionColor *Color `protobuf:"bytes,3,opt,name=redaction_color,json=redactionColor" json:"redaction_color,omitempty"`
-}
-
-func (m *RedactContentRequest_ImageRedactionConfig) Reset() {
-	*m = RedactContentRequest_ImageRedactionConfig{}
-}
-func (m *RedactContentRequest_ImageRedactionConfig) String() string { return proto.CompactTextString(m) }
-func (*RedactContentRequest_ImageRedactionConfig) ProtoMessage()    {}
-func (*RedactContentRequest_ImageRedactionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{10, 1}
-}
-
-type isRedactContentRequest_ImageRedactionConfig_Target interface {
-	isRedactContentRequest_ImageRedactionConfig_Target()
-}
-
-type RedactContentRequest_ImageRedactionConfig_InfoType struct {
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType,oneof"`
-}
-type RedactContentRequest_ImageRedactionConfig_RedactAllText struct {
-	RedactAllText bool `protobuf:"varint,2,opt,name=redact_all_text,json=redactAllText,oneof"`
-}
-
-func (*RedactContentRequest_ImageRedactionConfig_InfoType) isRedactContentRequest_ImageRedactionConfig_Target() {
-}
-func (*RedactContentRequest_ImageRedactionConfig_RedactAllText) isRedactContentRequest_ImageRedactionConfig_Target() {
-}
-
-func (m *RedactContentRequest_ImageRedactionConfig) GetTarget() isRedactContentRequest_ImageRedactionConfig_Target {
-	if m != nil {
-		return m.Target
-	}
-	return nil
-}
-
-func (m *RedactContentRequest_ImageRedactionConfig) GetInfoType() *InfoType {
-	if x, ok := m.GetTarget().(*RedactContentRequest_ImageRedactionConfig_InfoType); ok {
-		return x.InfoType
-	}
-	return nil
-}
-
-func (m *RedactContentRequest_ImageRedactionConfig) GetRedactAllText() bool {
-	if x, ok := m.GetTarget().(*RedactContentRequest_ImageRedactionConfig_RedactAllText); ok {
-		return x.RedactAllText
-	}
-	return false
-}
-
-func (m *RedactContentRequest_ImageRedactionConfig) GetRedactionColor() *Color {
-	if m != nil {
-		return m.RedactionColor
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RedactContentRequest_ImageRedactionConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RedactContentRequest_ImageRedactionConfig_OneofMarshaler, _RedactContentRequest_ImageRedactionConfig_OneofUnmarshaler, _RedactContentRequest_ImageRedactionConfig_OneofSizer, []interface{}{
-		(*RedactContentRequest_ImageRedactionConfig_InfoType)(nil),
-		(*RedactContentRequest_ImageRedactionConfig_RedactAllText)(nil),
-	}
-}
-
-func _RedactContentRequest_ImageRedactionConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RedactContentRequest_ImageRedactionConfig)
-	// target
-	switch x := m.Target.(type) {
-	case *RedactContentRequest_ImageRedactionConfig_InfoType:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoType); err != nil {
-			return err
-		}
-	case *RedactContentRequest_ImageRedactionConfig_RedactAllText:
-		t := uint64(0)
-		if x.RedactAllText {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("RedactContentRequest_ImageRedactionConfig.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RedactContentRequest_ImageRedactionConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RedactContentRequest_ImageRedactionConfig)
-	switch tag {
-	case 1: // target.info_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoType)
-		err := b.DecodeMessage(msg)
-		m.Target = &RedactContentRequest_ImageRedactionConfig_InfoType{msg}
-		return true, err
-	case 2: // target.redact_all_text
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Target = &RedactContentRequest_ImageRedactionConfig_RedactAllText{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RedactContentRequest_ImageRedactionConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RedactContentRequest_ImageRedactionConfig)
-	// target
-	switch x := m.Target.(type) {
-	case *RedactContentRequest_ImageRedactionConfig_InfoType:
-		s := proto.Size(x.InfoType)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RedactContentRequest_ImageRedactionConfig_RedactAllText:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Represents a color in the RGB color space.
-type Color struct {
-	// The amount of red in the color as a value in the interval [0, 1].
-	Red float32 `protobuf:"fixed32,1,opt,name=red" json:"red,omitempty"`
-	// The amount of green in the color as a value in the interval [0, 1].
-	Green float32 `protobuf:"fixed32,2,opt,name=green" json:"green,omitempty"`
-	// The amount of blue in the color as a value in the interval [0, 1].
-	Blue float32 `protobuf:"fixed32,3,opt,name=blue" json:"blue,omitempty"`
-}
-
-func (m *Color) Reset()                    { *m = Color{} }
-func (m *Color) String() string            { return proto.CompactTextString(m) }
-func (*Color) ProtoMessage()               {}
-func (*Color) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-func (m *Color) GetRed() float32 {
-	if m != nil {
-		return m.Red
-	}
-	return 0
-}
-
-func (m *Color) GetGreen() float32 {
-	if m != nil {
-		return m.Green
-	}
-	return 0
-}
-
-func (m *Color) GetBlue() float32 {
-	if m != nil {
-		return m.Blue
-	}
-	return 0
-}
-
-// Results of redacting a list of items.
-type RedactContentResponse struct {
-	// The redacted content.
-	Items []*ContentItem `protobuf:"bytes,1,rep,name=items" json:"items,omitempty"`
-}
-
-func (m *RedactContentResponse) Reset()                    { *m = RedactContentResponse{} }
-func (m *RedactContentResponse) String() string            { return proto.CompactTextString(m) }
-func (*RedactContentResponse) ProtoMessage()               {}
-func (*RedactContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-func (m *RedactContentResponse) GetItems() []*ContentItem {
-	if m != nil {
-		return m.Items
-	}
-	return nil
-}
-
-// Request to de-identify a list of items.
-type DeidentifyContentRequest struct {
-	// Configuration for the de-identification of the list of content items.
-	DeidentifyConfig *DeidentifyConfig `protobuf:"bytes,1,opt,name=deidentify_config,json=deidentifyConfig" json:"deidentify_config,omitempty"`
-	// Configuration for the inspector.
-	InspectConfig *InspectConfig `protobuf:"bytes,2,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// The list of items to inspect. Up to 100 are allowed per request.
-	// All items will be treated as text/*.
-	Items []*ContentItem `protobuf:"bytes,3,rep,name=items" json:"items,omitempty"`
-}
-
-func (m *DeidentifyContentRequest) Reset()                    { *m = DeidentifyContentRequest{} }
-func (m *DeidentifyContentRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeidentifyContentRequest) ProtoMessage()               {}
-func (*DeidentifyContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
-
-func (m *DeidentifyContentRequest) GetDeidentifyConfig() *DeidentifyConfig {
-	if m != nil {
-		return m.DeidentifyConfig
-	}
-	return nil
-}
-
-func (m *DeidentifyContentRequest) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *DeidentifyContentRequest) GetItems() []*ContentItem {
-	if m != nil {
-		return m.Items
-	}
-	return nil
-}
-
-// Results of de-identifying a list of items.
-type DeidentifyContentResponse struct {
-	Items []*ContentItem `protobuf:"bytes,1,rep,name=items" json:"items,omitempty"`
-	// A review of the transformations that took place for each item.
-	Summaries []*DeidentificationSummary `protobuf:"bytes,2,rep,name=summaries" json:"summaries,omitempty"`
-}
-
-func (m *DeidentifyContentResponse) Reset()                    { *m = DeidentifyContentResponse{} }
-func (m *DeidentifyContentResponse) String() string            { return proto.CompactTextString(m) }
-func (*DeidentifyContentResponse) ProtoMessage()               {}
-func (*DeidentifyContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
-
-func (m *DeidentifyContentResponse) GetItems() []*ContentItem {
-	if m != nil {
-		return m.Items
-	}
-	return nil
-}
-
-func (m *DeidentifyContentResponse) GetSummaries() []*DeidentificationSummary {
-	if m != nil {
-		return m.Summaries
-	}
-	return nil
-}
-
-// Request to search for potentially sensitive info in a list of items.
-type InspectContentRequest struct {
-	// Configuration for the inspector.
-	InspectConfig *InspectConfig `protobuf:"bytes,1,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// The list of items to inspect. Items in a single request are
-	// considered "related" unless inspect_config.independent_inputs is true.
-	// Up to 100 are allowed per request.
-	Items []*ContentItem `protobuf:"bytes,2,rep,name=items" json:"items,omitempty"`
-}
-
-func (m *InspectContentRequest) Reset()                    { *m = InspectContentRequest{} }
-func (m *InspectContentRequest) String() string            { return proto.CompactTextString(m) }
-func (*InspectContentRequest) ProtoMessage()               {}
-func (*InspectContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
-
-func (m *InspectContentRequest) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *InspectContentRequest) GetItems() []*ContentItem {
-	if m != nil {
-		return m.Items
-	}
-	return nil
-}
-
-// Results of inspecting a list of items.
-type InspectContentResponse struct {
-	// Each content_item from the request has a result in this list, in the
-	// same order as the request.
-	Results []*InspectResult `protobuf:"bytes,1,rep,name=results" json:"results,omitempty"`
-}
-
-func (m *InspectContentResponse) Reset()                    { *m = InspectContentResponse{} }
-func (m *InspectContentResponse) String() string            { return proto.CompactTextString(m) }
-func (*InspectContentResponse) ProtoMessage()               {}
-func (*InspectContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
-
-func (m *InspectContentResponse) GetResults() []*InspectResult {
-	if m != nil {
-		return m.Results
-	}
-	return nil
-}
-
-// Request for scheduling a scan of a data subset from a Google Platform data
-// repository.
-type CreateInspectOperationRequest struct {
-	// Configuration for the inspector.
-	InspectConfig *InspectConfig `protobuf:"bytes,1,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// Specification of the data set to process.
-	StorageConfig *StorageConfig `protobuf:"bytes,2,opt,name=storage_config,json=storageConfig" json:"storage_config,omitempty"`
-	// Optional location to store findings.
-	OutputConfig *OutputStorageConfig `protobuf:"bytes,3,opt,name=output_config,json=outputConfig" json:"output_config,omitempty"`
-	// Additional configuration settings for long running operations.
-	OperationConfig *OperationConfig `protobuf:"bytes,5,opt,name=operation_config,json=operationConfig" json:"operation_config,omitempty"`
-}
-
-func (m *CreateInspectOperationRequest) Reset()                    { *m = CreateInspectOperationRequest{} }
-func (m *CreateInspectOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateInspectOperationRequest) ProtoMessage()               {}
-func (*CreateInspectOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
-
-func (m *CreateInspectOperationRequest) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *CreateInspectOperationRequest) GetStorageConfig() *StorageConfig {
-	if m != nil {
-		return m.StorageConfig
-	}
-	return nil
-}
-
-func (m *CreateInspectOperationRequest) GetOutputConfig() *OutputStorageConfig {
-	if m != nil {
-		return m.OutputConfig
-	}
-	return nil
-}
-
-func (m *CreateInspectOperationRequest) GetOperationConfig() *OperationConfig {
-	if m != nil {
-		return m.OperationConfig
-	}
-	return nil
-}
-
-// Cloud repository for storing output.
-type OutputStorageConfig struct {
-	// Types that are valid to be assigned to Type:
-	//	*OutputStorageConfig_Table
-	//	*OutputStorageConfig_StoragePath
-	Type isOutputStorageConfig_Type `protobuf_oneof:"type"`
-}
-
-func (m *OutputStorageConfig) Reset()                    { *m = OutputStorageConfig{} }
-func (m *OutputStorageConfig) String() string            { return proto.CompactTextString(m) }
-func (*OutputStorageConfig) ProtoMessage()               {}
-func (*OutputStorageConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
-
-type isOutputStorageConfig_Type interface {
-	isOutputStorageConfig_Type()
-}
-
-type OutputStorageConfig_Table struct {
-	Table *BigQueryTable `protobuf:"bytes,1,opt,name=table,oneof"`
-}
-type OutputStorageConfig_StoragePath struct {
-	StoragePath *CloudStoragePath `protobuf:"bytes,2,opt,name=storage_path,json=storagePath,oneof"`
-}
-
-func (*OutputStorageConfig_Table) isOutputStorageConfig_Type()       {}
-func (*OutputStorageConfig_StoragePath) isOutputStorageConfig_Type() {}
-
-func (m *OutputStorageConfig) GetType() isOutputStorageConfig_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *OutputStorageConfig) GetTable() *BigQueryTable {
-	if x, ok := m.GetType().(*OutputStorageConfig_Table); ok {
-		return x.Table
-	}
-	return nil
-}
-
-func (m *OutputStorageConfig) GetStoragePath() *CloudStoragePath {
-	if x, ok := m.GetType().(*OutputStorageConfig_StoragePath); ok {
-		return x.StoragePath
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OutputStorageConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OutputStorageConfig_OneofMarshaler, _OutputStorageConfig_OneofUnmarshaler, _OutputStorageConfig_OneofSizer, []interface{}{
-		(*OutputStorageConfig_Table)(nil),
-		(*OutputStorageConfig_StoragePath)(nil),
-	}
-}
-
-func _OutputStorageConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OutputStorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *OutputStorageConfig_Table:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Table); err != nil {
-			return err
-		}
-	case *OutputStorageConfig_StoragePath:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StoragePath); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OutputStorageConfig.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OutputStorageConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OutputStorageConfig)
-	switch tag {
-	case 1: // type.table
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryTable)
-		err := b.DecodeMessage(msg)
-		m.Type = &OutputStorageConfig_Table{msg}
-		return true, err
-	case 2: // type.storage_path
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudStoragePath)
-		err := b.DecodeMessage(msg)
-		m.Type = &OutputStorageConfig_StoragePath{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OutputStorageConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OutputStorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *OutputStorageConfig_Table:
-		s := proto.Size(x.Table)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *OutputStorageConfig_StoragePath:
-		s := proto.Size(x.StoragePath)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Statistics regarding a specific InfoType.
-type InfoTypeStatistics struct {
-	// The type of finding this stat is for.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Number of findings for this info type.
-	Count int64 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
-}
-
-func (m *InfoTypeStatistics) Reset()                    { *m = InfoTypeStatistics{} }
-func (m *InfoTypeStatistics) String() string            { return proto.CompactTextString(m) }
-func (*InfoTypeStatistics) ProtoMessage()               {}
-func (*InfoTypeStatistics) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
-
-func (m *InfoTypeStatistics) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *InfoTypeStatistics) GetCount() int64 {
-	if m != nil {
-		return m.Count
-	}
-	return 0
-}
-
-// Metadata returned within GetOperation for an inspect request.
-type InspectOperationMetadata struct {
-	// Total size in bytes that were processed.
-	ProcessedBytes int64 `protobuf:"varint,1,opt,name=processed_bytes,json=processedBytes" json:"processed_bytes,omitempty"`
-	// Estimate of the number of bytes to process.
-	TotalEstimatedBytes int64                 `protobuf:"varint,4,opt,name=total_estimated_bytes,json=totalEstimatedBytes" json:"total_estimated_bytes,omitempty"`
-	InfoTypeStats       []*InfoTypeStatistics `protobuf:"bytes,2,rep,name=info_type_stats,json=infoTypeStats" json:"info_type_stats,omitempty"`
-	// The time which this request was started.
-	CreateTime *google_protobuf3.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// The inspect config used to create the Operation.
-	RequestInspectConfig *InspectConfig `protobuf:"bytes,5,opt,name=request_inspect_config,json=requestInspectConfig" json:"request_inspect_config,omitempty"`
-	// The storage config used to create the Operation.
-	RequestStorageConfig *StorageConfig `protobuf:"bytes,6,opt,name=request_storage_config,json=requestStorageConfig" json:"request_storage_config,omitempty"`
-	// Optional location to store findings.
-	RequestOutputConfig *OutputStorageConfig `protobuf:"bytes,7,opt,name=request_output_config,json=requestOutputConfig" json:"request_output_config,omitempty"`
-}
-
-func (m *InspectOperationMetadata) Reset()                    { *m = InspectOperationMetadata{} }
-func (m *InspectOperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*InspectOperationMetadata) ProtoMessage()               {}
-func (*InspectOperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
-
-func (m *InspectOperationMetadata) GetProcessedBytes() int64 {
-	if m != nil {
-		return m.ProcessedBytes
-	}
-	return 0
-}
-
-func (m *InspectOperationMetadata) GetTotalEstimatedBytes() int64 {
-	if m != nil {
-		return m.TotalEstimatedBytes
-	}
-	return 0
-}
-
-func (m *InspectOperationMetadata) GetInfoTypeStats() []*InfoTypeStatistics {
-	if m != nil {
-		return m.InfoTypeStats
-	}
-	return nil
-}
-
-func (m *InspectOperationMetadata) GetCreateTime() *google_protobuf3.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-func (m *InspectOperationMetadata) GetRequestInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.RequestInspectConfig
-	}
-	return nil
-}
-
-func (m *InspectOperationMetadata) GetRequestStorageConfig() *StorageConfig {
-	if m != nil {
-		return m.RequestStorageConfig
-	}
-	return nil
-}
-
-func (m *InspectOperationMetadata) GetRequestOutputConfig() *OutputStorageConfig {
-	if m != nil {
-		return m.RequestOutputConfig
-	}
-	return nil
-}
-
-// The operational data.
-type InspectOperationResult struct {
-	// The server-assigned name, which is only unique within the same service that
-	// originally returns it. If you use the default HTTP mapping, the
-	// `name` should have the format of `inspect/results/{id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *InspectOperationResult) Reset()                    { *m = InspectOperationResult{} }
-func (m *InspectOperationResult) String() string            { return proto.CompactTextString(m) }
-func (*InspectOperationResult) ProtoMessage()               {}
-func (*InspectOperationResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
-
-func (m *InspectOperationResult) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Request for the list of results in a given inspect operation.
-type ListInspectFindingsRequest struct {
-	// Identifier of the results set returned as metadata of
-	// the longrunning operation created by a call to InspectDataSource.
-	// Should be in the format of `inspect/results/{id}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Maximum number of results to return.
-	// If 0, the implementation selects a reasonable value.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
-	// The value returned by the last `ListInspectFindingsResponse`; indicates
-	// that this is a continuation of a prior `ListInspectFindings` call, and that
-	// the system should return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
-	// Restricts findings to items that match. Supports info_type and likelihood.
-	//
-	// Examples:
-	//
-	// - info_type=EMAIL_ADDRESS
-	// - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-	// - likelihood=VERY_LIKELY
-	// - likelihood=VERY_LIKELY,LIKELY
-	// - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-	Filter string `protobuf:"bytes,4,opt,name=filter" json:"filter,omitempty"`
-}
-
-func (m *ListInspectFindingsRequest) Reset()                    { *m = ListInspectFindingsRequest{} }
-func (m *ListInspectFindingsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListInspectFindingsRequest) ProtoMessage()               {}
-func (*ListInspectFindingsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
-
-func (m *ListInspectFindingsRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *ListInspectFindingsRequest) GetPageSize() int32 {
-	if m != nil {
-		return m.PageSize
-	}
-	return 0
-}
-
-func (m *ListInspectFindingsRequest) GetPageToken() string {
-	if m != nil {
-		return m.PageToken
-	}
-	return ""
-}
-
-func (m *ListInspectFindingsRequest) GetFilter() string {
-	if m != nil {
-		return m.Filter
-	}
-	return ""
-}
-
-// Response to the ListInspectFindings request.
-type ListInspectFindingsResponse struct {
-	// The results.
-	Result *InspectResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
-	// If not empty, indicates that there may be more results that match the
-	// request; this value should be passed in a new `ListInspectFindingsRequest`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
-}
-
-func (m *ListInspectFindingsResponse) Reset()                    { *m = ListInspectFindingsResponse{} }
-func (m *ListInspectFindingsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListInspectFindingsResponse) ProtoMessage()               {}
-func (*ListInspectFindingsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
-
-func (m *ListInspectFindingsResponse) GetResult() *InspectResult {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-func (m *ListInspectFindingsResponse) GetNextPageToken() string {
-	if m != nil {
-		return m.NextPageToken
-	}
-	return ""
-}
-
-// Description of the information type (infoType).
-type InfoTypeDescription struct {
-	// Internal name of the infoType.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Human readable form of the infoType name.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
-	// List of categories this infoType belongs to.
-	Categories []*CategoryDescription `protobuf:"bytes,3,rep,name=categories" json:"categories,omitempty"`
-}
-
-func (m *InfoTypeDescription) Reset()                    { *m = InfoTypeDescription{} }
-func (m *InfoTypeDescription) String() string            { return proto.CompactTextString(m) }
-func (*InfoTypeDescription) ProtoMessage()               {}
-func (*InfoTypeDescription) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
-
-func (m *InfoTypeDescription) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *InfoTypeDescription) GetDisplayName() string {
-	if m != nil {
-		return m.DisplayName
-	}
-	return ""
-}
-
-func (m *InfoTypeDescription) GetCategories() []*CategoryDescription {
-	if m != nil {
-		return m.Categories
-	}
-	return nil
-}
-
-// Request for the list of info types belonging to a given category,
-// or all supported info types if no category is specified.
-type ListInfoTypesRequest struct {
-	// Category name as returned by ListRootCategories.
-	Category string `protobuf:"bytes,1,opt,name=category" json:"category,omitempty"`
-	// Optional BCP-47 language code for localized info type friendly
-	// names. If omitted, or if localized strings are not available,
-	// en-US strings will be returned.
-	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
-}
-
-func (m *ListInfoTypesRequest) Reset()                    { *m = ListInfoTypesRequest{} }
-func (m *ListInfoTypesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListInfoTypesRequest) ProtoMessage()               {}
-func (*ListInfoTypesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
-
-func (m *ListInfoTypesRequest) GetCategory() string {
-	if m != nil {
-		return m.Category
-	}
-	return ""
-}
-
-func (m *ListInfoTypesRequest) GetLanguageCode() string {
-	if m != nil {
-		return m.LanguageCode
-	}
-	return ""
-}
-
-// Response to the ListInfoTypes request.
-type ListInfoTypesResponse struct {
-	// Set of sensitive info types belonging to a category.
-	InfoTypes []*InfoTypeDescription `protobuf:"bytes,1,rep,name=info_types,json=infoTypes" json:"info_types,omitempty"`
-}
-
-func (m *ListInfoTypesResponse) Reset()                    { *m = ListInfoTypesResponse{} }
-func (m *ListInfoTypesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListInfoTypesResponse) ProtoMessage()               {}
-func (*ListInfoTypesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
-
-func (m *ListInfoTypesResponse) GetInfoTypes() []*InfoTypeDescription {
-	if m != nil {
-		return m.InfoTypes
-	}
-	return nil
-}
-
-// Info Type Category description.
-type CategoryDescription struct {
-	// Internal name of the category.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Human readable form of the category name.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
-}
-
-func (m *CategoryDescription) Reset()                    { *m = CategoryDescription{} }
-func (m *CategoryDescription) String() string            { return proto.CompactTextString(m) }
-func (*CategoryDescription) ProtoMessage()               {}
-func (*CategoryDescription) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
-
-func (m *CategoryDescription) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *CategoryDescription) GetDisplayName() string {
-	if m != nil {
-		return m.DisplayName
-	}
-	return ""
-}
-
-// Request for root categories of Info Types supported by the API.
-// Example values might include "FINANCE", "HEALTH", "FAST", "DEFAULT".
-type ListRootCategoriesRequest struct {
-	// Optional language code for localized friendly category names.
-	// If omitted or if localized strings are not available,
-	// en-US strings will be returned.
-	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
-}
-
-func (m *ListRootCategoriesRequest) Reset()                    { *m = ListRootCategoriesRequest{} }
-func (m *ListRootCategoriesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListRootCategoriesRequest) ProtoMessage()               {}
-func (*ListRootCategoriesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
-
-func (m *ListRootCategoriesRequest) GetLanguageCode() string {
-	if m != nil {
-		return m.LanguageCode
-	}
-	return ""
-}
-
-// Response for ListRootCategories request.
-type ListRootCategoriesResponse struct {
-	// List of all into type categories supported by the API.
-	Categories []*CategoryDescription `protobuf:"bytes,1,rep,name=categories" json:"categories,omitempty"`
-}
-
-func (m *ListRootCategoriesResponse) Reset()                    { *m = ListRootCategoriesResponse{} }
-func (m *ListRootCategoriesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListRootCategoriesResponse) ProtoMessage()               {}
-func (*ListRootCategoriesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
-
-func (m *ListRootCategoriesResponse) GetCategories() []*CategoryDescription {
-	if m != nil {
-		return m.Categories
-	}
-	return nil
-}
-
-// Request for creating a risk analysis operation.
-type AnalyzeDataSourceRiskRequest struct {
-	// Privacy metric to compute.
-	PrivacyMetric *PrivacyMetric `protobuf:"bytes,1,opt,name=privacy_metric,json=privacyMetric" json:"privacy_metric,omitempty"`
-	// Input dataset to compute metrics over.
-	SourceTable *BigQueryTable `protobuf:"bytes,3,opt,name=source_table,json=sourceTable" json:"source_table,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskRequest) Reset()                    { *m = AnalyzeDataSourceRiskRequest{} }
-func (m *AnalyzeDataSourceRiskRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeDataSourceRiskRequest) ProtoMessage()               {}
-func (*AnalyzeDataSourceRiskRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
-
-func (m *AnalyzeDataSourceRiskRequest) GetPrivacyMetric() *PrivacyMetric {
-	if m != nil {
-		return m.PrivacyMetric
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskRequest) GetSourceTable() *BigQueryTable {
-	if m != nil {
-		return m.SourceTable
-	}
-	return nil
-}
-
-// Privacy metric to compute for reidentification risk analysis.
-type PrivacyMetric struct {
-	// Types that are valid to be assigned to Type:
-	//	*PrivacyMetric_NumericalStatsConfig_
-	//	*PrivacyMetric_CategoricalStatsConfig_
-	//	*PrivacyMetric_KAnonymityConfig_
-	//	*PrivacyMetric_LDiversityConfig_
-	Type isPrivacyMetric_Type `protobuf_oneof:"type"`
-}
-
-func (m *PrivacyMetric) Reset()                    { *m = PrivacyMetric{} }
-func (m *PrivacyMetric) String() string            { return proto.CompactTextString(m) }
-func (*PrivacyMetric) ProtoMessage()               {}
-func (*PrivacyMetric) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
-
-type isPrivacyMetric_Type interface {
-	isPrivacyMetric_Type()
-}
-
-type PrivacyMetric_NumericalStatsConfig_ struct {
-	NumericalStatsConfig *PrivacyMetric_NumericalStatsConfig `protobuf:"bytes,1,opt,name=numerical_stats_config,json=numericalStatsConfig,oneof"`
-}
-type PrivacyMetric_CategoricalStatsConfig_ struct {
-	CategoricalStatsConfig *PrivacyMetric_CategoricalStatsConfig `protobuf:"bytes,2,opt,name=categorical_stats_config,json=categoricalStatsConfig,oneof"`
-}
-type PrivacyMetric_KAnonymityConfig_ struct {
-	KAnonymityConfig *PrivacyMetric_KAnonymityConfig `protobuf:"bytes,3,opt,name=k_anonymity_config,json=kAnonymityConfig,oneof"`
-}
-type PrivacyMetric_LDiversityConfig_ struct {
-	LDiversityConfig *PrivacyMetric_LDiversityConfig `protobuf:"bytes,4,opt,name=l_diversity_config,json=lDiversityConfig,oneof"`
-}
-
-func (*PrivacyMetric_NumericalStatsConfig_) isPrivacyMetric_Type()   {}
-func (*PrivacyMetric_CategoricalStatsConfig_) isPrivacyMetric_Type() {}
-func (*PrivacyMetric_KAnonymityConfig_) isPrivacyMetric_Type()       {}
-func (*PrivacyMetric_LDiversityConfig_) isPrivacyMetric_Type()       {}
-
-func (m *PrivacyMetric) GetType() isPrivacyMetric_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetNumericalStatsConfig() *PrivacyMetric_NumericalStatsConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_NumericalStatsConfig_); ok {
-		return x.NumericalStatsConfig
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetCategoricalStatsConfig() *PrivacyMetric_CategoricalStatsConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_CategoricalStatsConfig_); ok {
-		return x.CategoricalStatsConfig
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetKAnonymityConfig() *PrivacyMetric_KAnonymityConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_KAnonymityConfig_); ok {
-		return x.KAnonymityConfig
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetLDiversityConfig() *PrivacyMetric_LDiversityConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_LDiversityConfig_); ok {
-		return x.LDiversityConfig
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PrivacyMetric) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PrivacyMetric_OneofMarshaler, _PrivacyMetric_OneofUnmarshaler, _PrivacyMetric_OneofSizer, []interface{}{
-		(*PrivacyMetric_NumericalStatsConfig_)(nil),
-		(*PrivacyMetric_CategoricalStatsConfig_)(nil),
-		(*PrivacyMetric_KAnonymityConfig_)(nil),
-		(*PrivacyMetric_LDiversityConfig_)(nil),
-	}
-}
-
-func _PrivacyMetric_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PrivacyMetric)
-	// type
-	switch x := m.Type.(type) {
-	case *PrivacyMetric_NumericalStatsConfig_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NumericalStatsConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_CategoricalStatsConfig_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CategoricalStatsConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_KAnonymityConfig_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KAnonymityConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_LDiversityConfig_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LDiversityConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PrivacyMetric.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PrivacyMetric_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PrivacyMetric)
-	switch tag {
-	case 1: // type.numerical_stats_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_NumericalStatsConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_NumericalStatsConfig_{msg}
-		return true, err
-	case 2: // type.categorical_stats_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_CategoricalStatsConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_CategoricalStatsConfig_{msg}
-		return true, err
-	case 3: // type.k_anonymity_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_KAnonymityConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_KAnonymityConfig_{msg}
-		return true, err
-	case 4: // type.l_diversity_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_LDiversityConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_LDiversityConfig_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PrivacyMetric_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PrivacyMetric)
-	// type
-	switch x := m.Type.(type) {
-	case *PrivacyMetric_NumericalStatsConfig_:
-		s := proto.Size(x.NumericalStatsConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_CategoricalStatsConfig_:
-		s := proto.Size(x.CategoricalStatsConfig)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_KAnonymityConfig_:
-		s := proto.Size(x.KAnonymityConfig)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_LDiversityConfig_:
-		s := proto.Size(x.LDiversityConfig)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Compute numerical stats over an individual column, including
-// min, max, and quantiles.
-type PrivacyMetric_NumericalStatsConfig struct {
-	// Field to compute numerical stats on. Supported types are
-	// integer, float, date, datetime, timestamp, time.
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-}
-
-func (m *PrivacyMetric_NumericalStatsConfig) Reset()         { *m = PrivacyMetric_NumericalStatsConfig{} }
-func (m *PrivacyMetric_NumericalStatsConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_NumericalStatsConfig) ProtoMessage()    {}
-func (*PrivacyMetric_NumericalStatsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{31, 0}
-}
-
-func (m *PrivacyMetric_NumericalStatsConfig) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-// Compute numerical stats over an individual column, including
-// number of distinct values and value count distribution.
-type PrivacyMetric_CategoricalStatsConfig struct {
-	// Field to compute categorical stats on. All column types are
-	// supported except for arrays and structs. However, it may be more
-	// informative to use NumericalStats when the field type is supported,
-	// depending on the data.
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-}
-
-func (m *PrivacyMetric_CategoricalStatsConfig) Reset()         { *m = PrivacyMetric_CategoricalStatsConfig{} }
-func (m *PrivacyMetric_CategoricalStatsConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_CategoricalStatsConfig) ProtoMessage()    {}
-func (*PrivacyMetric_CategoricalStatsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{31, 1}
-}
-
-func (m *PrivacyMetric_CategoricalStatsConfig) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-// k-anonymity metric, used for analysis of reidentification risk.
-type PrivacyMetric_KAnonymityConfig struct {
-	// Set of fields to compute k-anonymity over. When multiple fields are
-	// specified, they are considered a single composite key. Structs and
-	// repeated data types are not supported; however, nested fields are
-	// supported so long as they are not structs themselves or nested within
-	// a repeated field.
-	QuasiIds []*FieldId `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds" json:"quasi_ids,omitempty"`
-	// Optional message indicating that each distinct `EntityId` should not
-	// contribute to the k-anonymity count more than once per equivalence class.
-	EntityId *EntityId `protobuf:"bytes,2,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"`
-}
-
-func (m *PrivacyMetric_KAnonymityConfig) Reset()         { *m = PrivacyMetric_KAnonymityConfig{} }
-func (m *PrivacyMetric_KAnonymityConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_KAnonymityConfig) ProtoMessage()    {}
-func (*PrivacyMetric_KAnonymityConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{31, 2}
-}
-
-func (m *PrivacyMetric_KAnonymityConfig) GetQuasiIds() []*FieldId {
-	if m != nil {
-		return m.QuasiIds
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KAnonymityConfig) GetEntityId() *EntityId {
-	if m != nil {
-		return m.EntityId
-	}
-	return nil
-}
-
-// l-diversity metric, used for analysis of reidentification risk.
-type PrivacyMetric_LDiversityConfig struct {
-	// Set of quasi-identifiers indicating how equivalence classes are
-	// defined for the l-diversity computation. When multiple fields are
-	// specified, they are considered a single composite key.
-	QuasiIds []*FieldId `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds" json:"quasi_ids,omitempty"`
-	// Sensitive field for computing the l-value.
-	SensitiveAttribute *FieldId `protobuf:"bytes,2,opt,name=sensitive_attribute,json=sensitiveAttribute" json:"sensitive_attribute,omitempty"`
-}
-
-func (m *PrivacyMetric_LDiversityConfig) Reset()         { *m = PrivacyMetric_LDiversityConfig{} }
-func (m *PrivacyMetric_LDiversityConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_LDiversityConfig) ProtoMessage()    {}
-func (*PrivacyMetric_LDiversityConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{31, 3}
-}
-
-func (m *PrivacyMetric_LDiversityConfig) GetQuasiIds() []*FieldId {
-	if m != nil {
-		return m.QuasiIds
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_LDiversityConfig) GetSensitiveAttribute() *FieldId {
-	if m != nil {
-		return m.SensitiveAttribute
-	}
-	return nil
-}
-
-// Metadata returned within the
-// [`riskAnalysis.operations.get`](/dlp/docs/reference/rest/v2beta1/riskAnalysis.operations/get)
-// for risk analysis.
-type RiskAnalysisOperationMetadata struct {
-	// The time which this request was started.
-	CreateTime *google_protobuf3.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// Privacy metric to compute.
-	RequestedPrivacyMetric *PrivacyMetric `protobuf:"bytes,2,opt,name=requested_privacy_metric,json=requestedPrivacyMetric" json:"requested_privacy_metric,omitempty"`
-	// Input dataset to compute metrics over.
-	RequestedSourceTable *BigQueryTable `protobuf:"bytes,3,opt,name=requested_source_table,json=requestedSourceTable" json:"requested_source_table,omitempty"`
-}
-
-func (m *RiskAnalysisOperationMetadata) Reset()                    { *m = RiskAnalysisOperationMetadata{} }
-func (m *RiskAnalysisOperationMetadata) String() string            { return proto.CompactTextString(m) }
-func (*RiskAnalysisOperationMetadata) ProtoMessage()               {}
-func (*RiskAnalysisOperationMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
-
-func (m *RiskAnalysisOperationMetadata) GetCreateTime() *google_protobuf3.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationMetadata) GetRequestedPrivacyMetric() *PrivacyMetric {
-	if m != nil {
-		return m.RequestedPrivacyMetric
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationMetadata) GetRequestedSourceTable() *BigQueryTable {
-	if m != nil {
-		return m.RequestedSourceTable
-	}
-	return nil
-}
-
-// Result of a risk analysis
-// [`Operation`](/dlp/docs/reference/rest/v2beta1/inspect.operations)
-// request.
-type RiskAnalysisOperationResult struct {
-	// Values associated with this metric.
-	//
-	// Types that are valid to be assigned to Result:
-	//	*RiskAnalysisOperationResult_NumericalStatsResult_
-	//	*RiskAnalysisOperationResult_CategoricalStatsResult_
-	//	*RiskAnalysisOperationResult_KAnonymityResult_
-	//	*RiskAnalysisOperationResult_LDiversityResult_
-	Result isRiskAnalysisOperationResult_Result `protobuf_oneof:"result"`
-}
-
-func (m *RiskAnalysisOperationResult) Reset()                    { *m = RiskAnalysisOperationResult{} }
-func (m *RiskAnalysisOperationResult) String() string            { return proto.CompactTextString(m) }
-func (*RiskAnalysisOperationResult) ProtoMessage()               {}
-func (*RiskAnalysisOperationResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} }
-
-type isRiskAnalysisOperationResult_Result interface {
-	isRiskAnalysisOperationResult_Result()
-}
-
-type RiskAnalysisOperationResult_NumericalStatsResult_ struct {
-	NumericalStatsResult *RiskAnalysisOperationResult_NumericalStatsResult `protobuf:"bytes,3,opt,name=numerical_stats_result,json=numericalStatsResult,oneof"`
-}
-type RiskAnalysisOperationResult_CategoricalStatsResult_ struct {
-	CategoricalStatsResult *RiskAnalysisOperationResult_CategoricalStatsResult `protobuf:"bytes,4,opt,name=categorical_stats_result,json=categoricalStatsResult,oneof"`
-}
-type RiskAnalysisOperationResult_KAnonymityResult_ struct {
-	KAnonymityResult *RiskAnalysisOperationResult_KAnonymityResult `protobuf:"bytes,5,opt,name=k_anonymity_result,json=kAnonymityResult,oneof"`
-}
-type RiskAnalysisOperationResult_LDiversityResult_ struct {
-	LDiversityResult *RiskAnalysisOperationResult_LDiversityResult `protobuf:"bytes,6,opt,name=l_diversity_result,json=lDiversityResult,oneof"`
-}
-
-func (*RiskAnalysisOperationResult_NumericalStatsResult_) isRiskAnalysisOperationResult_Result()   {}
-func (*RiskAnalysisOperationResult_CategoricalStatsResult_) isRiskAnalysisOperationResult_Result() {}
-func (*RiskAnalysisOperationResult_KAnonymityResult_) isRiskAnalysisOperationResult_Result()       {}
-func (*RiskAnalysisOperationResult_LDiversityResult_) isRiskAnalysisOperationResult_Result()       {}
-
-func (m *RiskAnalysisOperationResult) GetResult() isRiskAnalysisOperationResult_Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationResult) GetNumericalStatsResult() *RiskAnalysisOperationResult_NumericalStatsResult {
-	if x, ok := m.GetResult().(*RiskAnalysisOperationResult_NumericalStatsResult_); ok {
-		return x.NumericalStatsResult
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationResult) GetCategoricalStatsResult() *RiskAnalysisOperationResult_CategoricalStatsResult {
-	if x, ok := m.GetResult().(*RiskAnalysisOperationResult_CategoricalStatsResult_); ok {
-		return x.CategoricalStatsResult
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationResult) GetKAnonymityResult() *RiskAnalysisOperationResult_KAnonymityResult {
-	if x, ok := m.GetResult().(*RiskAnalysisOperationResult_KAnonymityResult_); ok {
-		return x.KAnonymityResult
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationResult) GetLDiversityResult() *RiskAnalysisOperationResult_LDiversityResult {
-	if x, ok := m.GetResult().(*RiskAnalysisOperationResult_LDiversityResult_); ok {
-		return x.LDiversityResult
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RiskAnalysisOperationResult) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RiskAnalysisOperationResult_OneofMarshaler, _RiskAnalysisOperationResult_OneofUnmarshaler, _RiskAnalysisOperationResult_OneofSizer, []interface{}{
-		(*RiskAnalysisOperationResult_NumericalStatsResult_)(nil),
-		(*RiskAnalysisOperationResult_CategoricalStatsResult_)(nil),
-		(*RiskAnalysisOperationResult_KAnonymityResult_)(nil),
-		(*RiskAnalysisOperationResult_LDiversityResult_)(nil),
-	}
-}
-
-func _RiskAnalysisOperationResult_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RiskAnalysisOperationResult)
-	// result
-	switch x := m.Result.(type) {
-	case *RiskAnalysisOperationResult_NumericalStatsResult_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NumericalStatsResult); err != nil {
-			return err
-		}
-	case *RiskAnalysisOperationResult_CategoricalStatsResult_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CategoricalStatsResult); err != nil {
-			return err
-		}
-	case *RiskAnalysisOperationResult_KAnonymityResult_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KAnonymityResult); err != nil {
-			return err
-		}
-	case *RiskAnalysisOperationResult_LDiversityResult_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LDiversityResult); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RiskAnalysisOperationResult.Result has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RiskAnalysisOperationResult_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RiskAnalysisOperationResult)
-	switch tag {
-	case 3: // result.numerical_stats_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RiskAnalysisOperationResult_NumericalStatsResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &RiskAnalysisOperationResult_NumericalStatsResult_{msg}
-		return true, err
-	case 4: // result.categorical_stats_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RiskAnalysisOperationResult_CategoricalStatsResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &RiskAnalysisOperationResult_CategoricalStatsResult_{msg}
-		return true, err
-	case 5: // result.k_anonymity_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RiskAnalysisOperationResult_KAnonymityResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &RiskAnalysisOperationResult_KAnonymityResult_{msg}
-		return true, err
-	case 6: // result.l_diversity_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RiskAnalysisOperationResult_LDiversityResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &RiskAnalysisOperationResult_LDiversityResult_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RiskAnalysisOperationResult_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RiskAnalysisOperationResult)
-	// result
-	switch x := m.Result.(type) {
-	case *RiskAnalysisOperationResult_NumericalStatsResult_:
-		s := proto.Size(x.NumericalStatsResult)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RiskAnalysisOperationResult_CategoricalStatsResult_:
-		s := proto.Size(x.CategoricalStatsResult)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RiskAnalysisOperationResult_KAnonymityResult_:
-		s := proto.Size(x.KAnonymityResult)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RiskAnalysisOperationResult_LDiversityResult_:
-		s := proto.Size(x.LDiversityResult)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Result of the numerical stats computation.
-type RiskAnalysisOperationResult_NumericalStatsResult struct {
-	// Minimum value appearing in the column.
-	MinValue *Value `protobuf:"bytes,1,opt,name=min_value,json=minValue" json:"min_value,omitempty"`
-	// Maximum value appearing in the column.
-	MaxValue *Value `protobuf:"bytes,2,opt,name=max_value,json=maxValue" json:"max_value,omitempty"`
-	// List of 99 values that partition the set of field values into 100 equal
-	// sized buckets.
-	QuantileValues []*Value `protobuf:"bytes,4,rep,name=quantile_values,json=quantileValues" json:"quantile_values,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_NumericalStatsResult) Reset() {
-	*m = RiskAnalysisOperationResult_NumericalStatsResult{}
-}
-func (m *RiskAnalysisOperationResult_NumericalStatsResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_NumericalStatsResult) ProtoMessage() {}
-func (*RiskAnalysisOperationResult_NumericalStatsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 0}
-}
-
-func (m *RiskAnalysisOperationResult_NumericalStatsResult) GetMinValue() *Value {
-	if m != nil {
-		return m.MinValue
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationResult_NumericalStatsResult) GetMaxValue() *Value {
-	if m != nil {
-		return m.MaxValue
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationResult_NumericalStatsResult) GetQuantileValues() []*Value {
-	if m != nil {
-		return m.QuantileValues
-	}
-	return nil
-}
-
-// Result of the categorical stats computation.
-type RiskAnalysisOperationResult_CategoricalStatsResult struct {
-	// Histogram of value frequencies in the column.
-	ValueFrequencyHistogramBuckets []*RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket `protobuf:"bytes,5,rep,name=value_frequency_histogram_buckets,json=valueFrequencyHistogramBuckets" json:"value_frequency_histogram_buckets,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult) Reset() {
-	*m = RiskAnalysisOperationResult_CategoricalStatsResult{}
-}
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_CategoricalStatsResult) ProtoMessage() {}
-func (*RiskAnalysisOperationResult_CategoricalStatsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 1}
-}
-
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult) GetValueFrequencyHistogramBuckets() []*RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket {
-	if m != nil {
-		return m.ValueFrequencyHistogramBuckets
-	}
-	return nil
-}
-
-// Histogram bucket of value frequencies in the column.
-type RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket struct {
-	// Lower bound on the value frequency of the values in this bucket.
-	ValueFrequencyLowerBound int64 `protobuf:"varint,1,opt,name=value_frequency_lower_bound,json=valueFrequencyLowerBound" json:"value_frequency_lower_bound,omitempty"`
-	// Upper bound on the value frequency of the values in this bucket.
-	ValueFrequencyUpperBound int64 `protobuf:"varint,2,opt,name=value_frequency_upper_bound,json=valueFrequencyUpperBound" json:"value_frequency_upper_bound,omitempty"`
-	// Total number of records in this bucket.
-	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-	// Sample of value frequencies in this bucket. The total number of
-	// values returned per bucket is capped at 20.
-	BucketValues []*ValueFrequency `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues" json:"bucket_values,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket) Reset() {
-	*m = RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket{}
-}
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket) ProtoMessage() {
-}
-func (*RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 1, 0}
-}
-
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetValueFrequencyLowerBound() int64 {
-	if m != nil {
-		return m.ValueFrequencyLowerBound
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetValueFrequencyUpperBound() int64 {
-	if m != nil {
-		return m.ValueFrequencyUpperBound
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetBucketSize() int64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetBucketValues() []*ValueFrequency {
-	if m != nil {
-		return m.BucketValues
-	}
-	return nil
-}
-
-// Result of the k-anonymity computation.
-type RiskAnalysisOperationResult_KAnonymityResult struct {
-	// Histogram of k-anonymity equivalence classes.
-	EquivalenceClassHistogramBuckets []*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket `protobuf:"bytes,5,rep,name=equivalence_class_histogram_buckets,json=equivalenceClassHistogramBuckets" json:"equivalence_class_histogram_buckets,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult) Reset() {
-	*m = RiskAnalysisOperationResult_KAnonymityResult{}
-}
-func (m *RiskAnalysisOperationResult_KAnonymityResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_KAnonymityResult) ProtoMessage() {}
-func (*RiskAnalysisOperationResult_KAnonymityResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 2}
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult) GetEquivalenceClassHistogramBuckets() []*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket {
-	if m != nil {
-		return m.EquivalenceClassHistogramBuckets
-	}
-	return nil
-}
-
-// The set of columns' values that share the same k-anonymity value.
-type RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass struct {
-	// Set of values defining the equivalence class. One value per
-	// quasi-identifier column in the original KAnonymity metric message.
-	// The order is always the same as the original request.
-	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues" json:"quasi_ids_values,omitempty"`
-	// Size of the equivalence class, for example number of rows with the
-	// above set of values.
-	EquivalenceClassSize int64 `protobuf:"varint,2,opt,name=equivalence_class_size,json=equivalenceClassSize" json:"equivalence_class_size,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass) Reset() {
-	*m = RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass{}
-}
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass) ProtoMessage() {}
-func (*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 2, 0}
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass) GetQuasiIdsValues() []*Value {
-	if m != nil {
-		return m.QuasiIdsValues
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass) GetEquivalenceClassSize() int64 {
-	if m != nil {
-		return m.EquivalenceClassSize
-	}
-	return 0
-}
-
-// Histogram bucket of equivalence class sizes in the table.
-type RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket struct {
-	// Lower bound on the size of the equivalence classes in this bucket.
-	EquivalenceClassSizeLowerBound int64 `protobuf:"varint,1,opt,name=equivalence_class_size_lower_bound,json=equivalenceClassSizeLowerBound" json:"equivalence_class_size_lower_bound,omitempty"`
-	// Upper bound on the size of the equivalence classes in this bucket.
-	EquivalenceClassSizeUpperBound int64 `protobuf:"varint,2,opt,name=equivalence_class_size_upper_bound,json=equivalenceClassSizeUpperBound" json:"equivalence_class_size_upper_bound,omitempty"`
-	// Total number of records in this bucket.
-	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-	// Sample of equivalence classes in this bucket. The total number of
-	// classes returned per bucket is capped at 20.
-	BucketValues []*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues" json:"bucket_values,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket) Reset() {
-	*m = RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket{}
-}
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket) ProtoMessage() {}
-func (*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 2, 1}
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket) GetEquivalenceClassSizeLowerBound() int64 {
-	if m != nil {
-		return m.EquivalenceClassSizeLowerBound
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket) GetEquivalenceClassSizeUpperBound() int64 {
-	if m != nil {
-		return m.EquivalenceClassSizeUpperBound
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket) GetBucketSize() int64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket) GetBucketValues() []*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass {
-	if m != nil {
-		return m.BucketValues
-	}
-	return nil
-}
-
-// Result of the l-diversity computation.
-type RiskAnalysisOperationResult_LDiversityResult struct {
-	// Histogram of l-diversity equivalence class sensitive value frequencies.
-	SensitiveValueFrequencyHistogramBuckets []*RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket `protobuf:"bytes,5,rep,name=sensitive_value_frequency_histogram_buckets,json=sensitiveValueFrequencyHistogramBuckets" json:"sensitive_value_frequency_histogram_buckets,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult) Reset() {
-	*m = RiskAnalysisOperationResult_LDiversityResult{}
-}
-func (m *RiskAnalysisOperationResult_LDiversityResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_LDiversityResult) ProtoMessage() {}
-func (*RiskAnalysisOperationResult_LDiversityResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 3}
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult) GetSensitiveValueFrequencyHistogramBuckets() []*RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket {
-	if m != nil {
-		return m.SensitiveValueFrequencyHistogramBuckets
-	}
-	return nil
-}
-
-// The set of columns' values that share the same l-diversity value.
-type RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass struct {
-	// Quasi-identifier values defining the k-anonymity equivalence
-	// class. The order is always the same as the original request.
-	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues" json:"quasi_ids_values,omitempty"`
-	// Size of the k-anonymity equivalence class.
-	EquivalenceClassSize int64 `protobuf:"varint,2,opt,name=equivalence_class_size,json=equivalenceClassSize" json:"equivalence_class_size,omitempty"`
-	// Number of distinct sensitive values in this equivalence class.
-	NumDistinctSensitiveValues int64 `protobuf:"varint,3,opt,name=num_distinct_sensitive_values,json=numDistinctSensitiveValues" json:"num_distinct_sensitive_values,omitempty"`
-	// Estimated frequencies of top sensitive values.
-	TopSensitiveValues []*ValueFrequency `protobuf:"bytes,4,rep,name=top_sensitive_values,json=topSensitiveValues" json:"top_sensitive_values,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass) Reset() {
-	*m = RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass{}
-}
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass) ProtoMessage() {}
-func (*RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 3, 0}
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass) GetQuasiIdsValues() []*Value {
-	if m != nil {
-		return m.QuasiIdsValues
-	}
-	return nil
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass) GetEquivalenceClassSize() int64 {
-	if m != nil {
-		return m.EquivalenceClassSize
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass) GetNumDistinctSensitiveValues() int64 {
-	if m != nil {
-		return m.NumDistinctSensitiveValues
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass) GetTopSensitiveValues() []*ValueFrequency {
-	if m != nil {
-		return m.TopSensitiveValues
-	}
-	return nil
-}
-
-// Histogram bucket of sensitive value frequencies in the table.
-type RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket struct {
-	// Lower bound on the sensitive value frequencies of the equivalence
-	// classes in this bucket.
-	SensitiveValueFrequencyLowerBound int64 `protobuf:"varint,1,opt,name=sensitive_value_frequency_lower_bound,json=sensitiveValueFrequencyLowerBound" json:"sensitive_value_frequency_lower_bound,omitempty"`
-	// Upper bound on the sensitive value frequencies of the equivalence
-	// classes in this bucket.
-	SensitiveValueFrequencyUpperBound int64 `protobuf:"varint,2,opt,name=sensitive_value_frequency_upper_bound,json=sensitiveValueFrequencyUpperBound" json:"sensitive_value_frequency_upper_bound,omitempty"`
-	// Total number of records in this bucket.
-	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-	// Sample of equivalence classes in this bucket. The total number of
-	// classes returned per bucket is capped at 20.
-	BucketValues []*RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues" json:"bucket_values,omitempty"`
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket) Reset() {
-	*m = RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket{}
-}
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket) String() string {
-	return proto.CompactTextString(m)
-}
-func (*RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket) ProtoMessage() {}
-func (*RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{33, 3, 1}
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket) GetSensitiveValueFrequencyLowerBound() int64 {
-	if m != nil {
-		return m.SensitiveValueFrequencyLowerBound
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket) GetSensitiveValueFrequencyUpperBound() int64 {
-	if m != nil {
-		return m.SensitiveValueFrequencyUpperBound
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket) GetBucketSize() int64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-func (m *RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket) GetBucketValues() []*RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass {
-	if m != nil {
-		return m.BucketValues
-	}
-	return nil
-}
-
-// A value of a field, including its frequency.
-type ValueFrequency struct {
-	// A value contained in the field in question.
-	Value *Value `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"`
-	// How many times the value is contained in the field.
-	Count int64 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
-}
-
-func (m *ValueFrequency) Reset()                    { *m = ValueFrequency{} }
-func (m *ValueFrequency) String() string            { return proto.CompactTextString(m) }
-func (*ValueFrequency) ProtoMessage()               {}
-func (*ValueFrequency) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} }
-
-func (m *ValueFrequency) GetValue() *Value {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *ValueFrequency) GetCount() int64 {
-	if m != nil {
-		return m.Count
-	}
-	return 0
-}
-
-// Set of primitive values supported by the system.
-type Value struct {
-	// Types that are valid to be assigned to Type:
-	//	*Value_IntegerValue
-	//	*Value_FloatValue
-	//	*Value_StringValue
-	//	*Value_BooleanValue
-	//	*Value_TimestampValue
-	//	*Value_TimeValue
-	//	*Value_DateValue
-	Type isValue_Type `protobuf_oneof:"type"`
-}
-
-func (m *Value) Reset()                    { *m = Value{} }
-func (m *Value) String() string            { return proto.CompactTextString(m) }
-func (*Value) ProtoMessage()               {}
-func (*Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} }
-
-type isValue_Type interface {
-	isValue_Type()
-}
-
-type Value_IntegerValue struct {
-	IntegerValue int64 `protobuf:"varint,1,opt,name=integer_value,json=integerValue,oneof"`
-}
-type Value_FloatValue struct {
-	FloatValue float64 `protobuf:"fixed64,2,opt,name=float_value,json=floatValue,oneof"`
-}
-type Value_StringValue struct {
-	StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,oneof"`
-}
-type Value_BooleanValue struct {
-	BooleanValue bool `protobuf:"varint,4,opt,name=boolean_value,json=booleanValue,oneof"`
-}
-type Value_TimestampValue struct {
-	TimestampValue *google_protobuf3.Timestamp `protobuf:"bytes,5,opt,name=timestamp_value,json=timestampValue,oneof"`
-}
-type Value_TimeValue struct {
-	TimeValue *google_type1.TimeOfDay `protobuf:"bytes,6,opt,name=time_value,json=timeValue,oneof"`
-}
-type Value_DateValue struct {
-	DateValue *google_type.Date `protobuf:"bytes,7,opt,name=date_value,json=dateValue,oneof"`
-}
-
-func (*Value_IntegerValue) isValue_Type()   {}
-func (*Value_FloatValue) isValue_Type()     {}
-func (*Value_StringValue) isValue_Type()    {}
-func (*Value_BooleanValue) isValue_Type()   {}
-func (*Value_TimestampValue) isValue_Type() {}
-func (*Value_TimeValue) isValue_Type()      {}
-func (*Value_DateValue) isValue_Type()      {}
-
-func (m *Value) GetType() isValue_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *Value) GetIntegerValue() int64 {
-	if x, ok := m.GetType().(*Value_IntegerValue); ok {
-		return x.IntegerValue
-	}
-	return 0
-}
-
-func (m *Value) GetFloatValue() float64 {
-	if x, ok := m.GetType().(*Value_FloatValue); ok {
-		return x.FloatValue
-	}
-	return 0
-}
-
-func (m *Value) GetStringValue() string {
-	if x, ok := m.GetType().(*Value_StringValue); ok {
-		return x.StringValue
-	}
-	return ""
-}
-
-func (m *Value) GetBooleanValue() bool {
-	if x, ok := m.GetType().(*Value_BooleanValue); ok {
-		return x.BooleanValue
-	}
-	return false
-}
-
-func (m *Value) GetTimestampValue() *google_protobuf3.Timestamp {
-	if x, ok := m.GetType().(*Value_TimestampValue); ok {
-		return x.TimestampValue
-	}
-	return nil
-}
-
-func (m *Value) GetTimeValue() *google_type1.TimeOfDay {
-	if x, ok := m.GetType().(*Value_TimeValue); ok {
-		return x.TimeValue
-	}
-	return nil
-}
-
-func (m *Value) GetDateValue() *google_type.Date {
-	if x, ok := m.GetType().(*Value_DateValue); ok {
-		return x.DateValue
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
-		(*Value_IntegerValue)(nil),
-		(*Value_FloatValue)(nil),
-		(*Value_StringValue)(nil),
-		(*Value_BooleanValue)(nil),
-		(*Value_TimestampValue)(nil),
-		(*Value_TimeValue)(nil),
-		(*Value_DateValue)(nil),
-	}
-}
-
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// type
-	switch x := m.Type.(type) {
-	case *Value_IntegerValue:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntegerValue))
-	case *Value_FloatValue:
-		b.EncodeVarint(2<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.FloatValue))
-	case *Value_StringValue:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BooleanValue:
-		t := uint64(0)
-		if x.BooleanValue {
-			t = 1
-		}
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_TimestampValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampValue); err != nil {
-			return err
-		}
-	case *Value_TimeValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimeValue); err != nil {
-			return err
-		}
-	case *Value_DateValue:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DateValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Value.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 1: // type.integer_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Type = &Value_IntegerValue{int64(x)}
-		return true, err
-	case 2: // type.float_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Type = &Value_FloatValue{math.Float64frombits(x)}
-		return true, err
-	case 3: // type.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Type = &Value_StringValue{x}
-		return true, err
-	case 4: // type.boolean_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Type = &Value_BooleanValue{x != 0}
-		return true, err
-	case 5: // type.timestamp_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(google_protobuf3.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_TimestampValue{msg}
-		return true, err
-	case 6: // type.time_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(google_type1.TimeOfDay)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_TimeValue{msg}
-		return true, err
-	case 7: // type.date_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(google_type.Date)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_DateValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// type
-	switch x := m.Type.(type) {
-	case *Value_IntegerValue:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.IntegerValue))
-	case *Value_FloatValue:
-		n += proto.SizeVarint(2<<3 | proto.WireFixed64)
-		n += 8
-	case *Value_StringValue:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BooleanValue:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
-		n += 1
-	case *Value_TimestampValue:
-		s := proto.Size(x.TimestampValue)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_TimeValue:
-		s := proto.Size(x.TimeValue)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_DateValue:
-		s := proto.Size(x.DateValue)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// The configuration that controls how the data will change.
-type DeidentifyConfig struct {
-	// Types that are valid to be assigned to Transformation:
-	//	*DeidentifyConfig_InfoTypeTransformations
-	//	*DeidentifyConfig_RecordTransformations
-	Transformation isDeidentifyConfig_Transformation `protobuf_oneof:"transformation"`
-}
-
-func (m *DeidentifyConfig) Reset()                    { *m = DeidentifyConfig{} }
-func (m *DeidentifyConfig) String() string            { return proto.CompactTextString(m) }
-func (*DeidentifyConfig) ProtoMessage()               {}
-func (*DeidentifyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} }
-
-type isDeidentifyConfig_Transformation interface {
-	isDeidentifyConfig_Transformation()
-}
-
-type DeidentifyConfig_InfoTypeTransformations struct {
-	InfoTypeTransformations *InfoTypeTransformations `protobuf:"bytes,1,opt,name=info_type_transformations,json=infoTypeTransformations,oneof"`
-}
-type DeidentifyConfig_RecordTransformations struct {
-	RecordTransformations *RecordTransformations `protobuf:"bytes,2,opt,name=record_transformations,json=recordTransformations,oneof"`
-}
-
-func (*DeidentifyConfig_InfoTypeTransformations) isDeidentifyConfig_Transformation() {}
-func (*DeidentifyConfig_RecordTransformations) isDeidentifyConfig_Transformation()   {}
-
-func (m *DeidentifyConfig) GetTransformation() isDeidentifyConfig_Transformation {
-	if m != nil {
-		return m.Transformation
-	}
-	return nil
-}
-
-func (m *DeidentifyConfig) GetInfoTypeTransformations() *InfoTypeTransformations {
-	if x, ok := m.GetTransformation().(*DeidentifyConfig_InfoTypeTransformations); ok {
-		return x.InfoTypeTransformations
-	}
-	return nil
-}
-
-func (m *DeidentifyConfig) GetRecordTransformations() *RecordTransformations {
-	if x, ok := m.GetTransformation().(*DeidentifyConfig_RecordTransformations); ok {
-		return x.RecordTransformations
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DeidentifyConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DeidentifyConfig_OneofMarshaler, _DeidentifyConfig_OneofUnmarshaler, _DeidentifyConfig_OneofSizer, []interface{}{
-		(*DeidentifyConfig_InfoTypeTransformations)(nil),
-		(*DeidentifyConfig_RecordTransformations)(nil),
-	}
-}
-
-func _DeidentifyConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DeidentifyConfig)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *DeidentifyConfig_InfoTypeTransformations:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoTypeTransformations); err != nil {
-			return err
-		}
-	case *DeidentifyConfig_RecordTransformations:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RecordTransformations); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DeidentifyConfig.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DeidentifyConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DeidentifyConfig)
-	switch tag {
-	case 1: // transformation.info_type_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoTypeTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &DeidentifyConfig_InfoTypeTransformations{msg}
-		return true, err
-	case 2: // transformation.record_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RecordTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &DeidentifyConfig_RecordTransformations{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DeidentifyConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DeidentifyConfig)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *DeidentifyConfig_InfoTypeTransformations:
-		s := proto.Size(x.InfoTypeTransformations)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DeidentifyConfig_RecordTransformations:
-		s := proto.Size(x.RecordTransformations)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// A rule for transforming a value.
-type PrimitiveTransformation struct {
-	// Types that are valid to be assigned to Transformation:
-	//	*PrimitiveTransformation_ReplaceConfig
-	//	*PrimitiveTransformation_RedactConfig
-	//	*PrimitiveTransformation_CharacterMaskConfig
-	//	*PrimitiveTransformation_CryptoReplaceFfxFpeConfig
-	//	*PrimitiveTransformation_FixedSizeBucketingConfig
-	//	*PrimitiveTransformation_BucketingConfig
-	//	*PrimitiveTransformation_ReplaceWithInfoTypeConfig
-	//	*PrimitiveTransformation_TimePartConfig
-	//	*PrimitiveTransformation_CryptoHashConfig
-	Transformation isPrimitiveTransformation_Transformation `protobuf_oneof:"transformation"`
-}
-
-func (m *PrimitiveTransformation) Reset()                    { *m = PrimitiveTransformation{} }
-func (m *PrimitiveTransformation) String() string            { return proto.CompactTextString(m) }
-func (*PrimitiveTransformation) ProtoMessage()               {}
-func (*PrimitiveTransformation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} }
-
-type isPrimitiveTransformation_Transformation interface {
-	isPrimitiveTransformation_Transformation()
-}
-
-type PrimitiveTransformation_ReplaceConfig struct {
-	ReplaceConfig *ReplaceValueConfig `protobuf:"bytes,1,opt,name=replace_config,json=replaceConfig,oneof"`
-}
-type PrimitiveTransformation_RedactConfig struct {
-	RedactConfig *RedactConfig `protobuf:"bytes,2,opt,name=redact_config,json=redactConfig,oneof"`
-}
-type PrimitiveTransformation_CharacterMaskConfig struct {
-	CharacterMaskConfig *CharacterMaskConfig `protobuf:"bytes,3,opt,name=character_mask_config,json=characterMaskConfig,oneof"`
-}
-type PrimitiveTransformation_CryptoReplaceFfxFpeConfig struct {
-	CryptoReplaceFfxFpeConfig *CryptoReplaceFfxFpeConfig `protobuf:"bytes,4,opt,name=crypto_replace_ffx_fpe_config,json=cryptoReplaceFfxFpeConfig,oneof"`
-}
-type PrimitiveTransformation_FixedSizeBucketingConfig struct {
-	FixedSizeBucketingConfig *FixedSizeBucketingConfig `protobuf:"bytes,5,opt,name=fixed_size_bucketing_config,json=fixedSizeBucketingConfig,oneof"`
-}
-type PrimitiveTransformation_BucketingConfig struct {
-	BucketingConfig *BucketingConfig `protobuf:"bytes,6,opt,name=bucketing_config,json=bucketingConfig,oneof"`
-}
-type PrimitiveTransformation_ReplaceWithInfoTypeConfig struct {
-	ReplaceWithInfoTypeConfig *ReplaceWithInfoTypeConfig `protobuf:"bytes,7,opt,name=replace_with_info_type_config,json=replaceWithInfoTypeConfig,oneof"`
-}
-type PrimitiveTransformation_TimePartConfig struct {
-	TimePartConfig *TimePartConfig `protobuf:"bytes,8,opt,name=time_part_config,json=timePartConfig,oneof"`
-}
-type PrimitiveTransformation_CryptoHashConfig struct {
-	CryptoHashConfig *CryptoHashConfig `protobuf:"bytes,9,opt,name=crypto_hash_config,json=cryptoHashConfig,oneof"`
-}
-
-func (*PrimitiveTransformation_ReplaceConfig) isPrimitiveTransformation_Transformation()             {}
-func (*PrimitiveTransformation_RedactConfig) isPrimitiveTransformation_Transformation()              {}
-func (*PrimitiveTransformation_CharacterMaskConfig) isPrimitiveTransformation_Transformation()       {}
-func (*PrimitiveTransformation_CryptoReplaceFfxFpeConfig) isPrimitiveTransformation_Transformation() {}
-func (*PrimitiveTransformation_FixedSizeBucketingConfig) isPrimitiveTransformation_Transformation()  {}
-func (*PrimitiveTransformation_BucketingConfig) isPrimitiveTransformation_Transformation()           {}
-func (*PrimitiveTransformation_ReplaceWithInfoTypeConfig) isPrimitiveTransformation_Transformation() {}
-func (*PrimitiveTransformation_TimePartConfig) isPrimitiveTransformation_Transformation()            {}
-func (*PrimitiveTransformation_CryptoHashConfig) isPrimitiveTransformation_Transformation()          {}
-
-func (m *PrimitiveTransformation) GetTransformation() isPrimitiveTransformation_Transformation {
-	if m != nil {
-		return m.Transformation
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetReplaceConfig() *ReplaceValueConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_ReplaceConfig); ok {
-		return x.ReplaceConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetRedactConfig() *RedactConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_RedactConfig); ok {
-		return x.RedactConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetCharacterMaskConfig() *CharacterMaskConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CharacterMaskConfig); ok {
-		return x.CharacterMaskConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetCryptoReplaceFfxFpeConfig() *CryptoReplaceFfxFpeConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CryptoReplaceFfxFpeConfig); ok {
-		return x.CryptoReplaceFfxFpeConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetFixedSizeBucketingConfig() *FixedSizeBucketingConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_FixedSizeBucketingConfig); ok {
-		return x.FixedSizeBucketingConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetBucketingConfig() *BucketingConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_BucketingConfig); ok {
-		return x.BucketingConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetReplaceWithInfoTypeConfig() *ReplaceWithInfoTypeConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_ReplaceWithInfoTypeConfig); ok {
-		return x.ReplaceWithInfoTypeConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetTimePartConfig() *TimePartConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_TimePartConfig); ok {
-		return x.TimePartConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetCryptoHashConfig() *CryptoHashConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CryptoHashConfig); ok {
-		return x.CryptoHashConfig
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PrimitiveTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PrimitiveTransformation_OneofMarshaler, _PrimitiveTransformation_OneofUnmarshaler, _PrimitiveTransformation_OneofSizer, []interface{}{
-		(*PrimitiveTransformation_ReplaceConfig)(nil),
-		(*PrimitiveTransformation_RedactConfig)(nil),
-		(*PrimitiveTransformation_CharacterMaskConfig)(nil),
-		(*PrimitiveTransformation_CryptoReplaceFfxFpeConfig)(nil),
-		(*PrimitiveTransformation_FixedSizeBucketingConfig)(nil),
-		(*PrimitiveTransformation_BucketingConfig)(nil),
-		(*PrimitiveTransformation_ReplaceWithInfoTypeConfig)(nil),
-		(*PrimitiveTransformation_TimePartConfig)(nil),
-		(*PrimitiveTransformation_CryptoHashConfig)(nil),
-	}
-}
-
-func _PrimitiveTransformation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PrimitiveTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *PrimitiveTransformation_ReplaceConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReplaceConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_RedactConfig:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RedactConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CharacterMaskConfig:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CharacterMaskConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CryptoReplaceFfxFpeConfig:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CryptoReplaceFfxFpeConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_FixedSizeBucketingConfig:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FixedSizeBucketingConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_BucketingConfig:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BucketingConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_ReplaceWithInfoTypeConfig:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReplaceWithInfoTypeConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_TimePartConfig:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimePartConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CryptoHashConfig:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CryptoHashConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PrimitiveTransformation.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PrimitiveTransformation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PrimitiveTransformation)
-	switch tag {
-	case 1: // transformation.replace_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ReplaceValueConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_ReplaceConfig{msg}
-		return true, err
-	case 2: // transformation.redact_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RedactConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_RedactConfig{msg}
-		return true, err
-	case 3: // transformation.character_mask_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CharacterMaskConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CharacterMaskConfig{msg}
-		return true, err
-	case 4: // transformation.crypto_replace_ffx_fpe_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CryptoReplaceFfxFpeConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CryptoReplaceFfxFpeConfig{msg}
-		return true, err
-	case 5: // transformation.fixed_size_bucketing_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(FixedSizeBucketingConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_FixedSizeBucketingConfig{msg}
-		return true, err
-	case 6: // transformation.bucketing_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BucketingConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_BucketingConfig{msg}
-		return true, err
-	case 7: // transformation.replace_with_info_type_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ReplaceWithInfoTypeConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_ReplaceWithInfoTypeConfig{msg}
-		return true, err
-	case 8: // transformation.time_part_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TimePartConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_TimePartConfig{msg}
-		return true, err
-	case 9: // transformation.crypto_hash_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CryptoHashConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CryptoHashConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PrimitiveTransformation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PrimitiveTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *PrimitiveTransformation_ReplaceConfig:
-		s := proto.Size(x.ReplaceConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_RedactConfig:
-		s := proto.Size(x.RedactConfig)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CharacterMaskConfig:
-		s := proto.Size(x.CharacterMaskConfig)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CryptoReplaceFfxFpeConfig:
-		s := proto.Size(x.CryptoReplaceFfxFpeConfig)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_FixedSizeBucketingConfig:
-		s := proto.Size(x.FixedSizeBucketingConfig)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_BucketingConfig:
-		s := proto.Size(x.BucketingConfig)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_ReplaceWithInfoTypeConfig:
-		s := proto.Size(x.ReplaceWithInfoTypeConfig)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_TimePartConfig:
-		s := proto.Size(x.TimePartConfig)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CryptoHashConfig:
-		s := proto.Size(x.CryptoHashConfig)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// For use with `Date`, `Timestamp`, and `TimeOfDay`, extract or preserve a
-// portion of the value.
-type TimePartConfig struct {
-	PartToExtract TimePartConfig_TimePart `protobuf:"varint,1,opt,name=part_to_extract,json=partToExtract,enum=google.privacy.dlp.v2beta1.TimePartConfig_TimePart" json:"part_to_extract,omitempty"`
-}
-
-func (m *TimePartConfig) Reset()                    { *m = TimePartConfig{} }
-func (m *TimePartConfig) String() string            { return proto.CompactTextString(m) }
-func (*TimePartConfig) ProtoMessage()               {}
-func (*TimePartConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} }
-
-func (m *TimePartConfig) GetPartToExtract() TimePartConfig_TimePart {
-	if m != nil {
-		return m.PartToExtract
-	}
-	return TimePartConfig_TIME_PART_UNSPECIFIED
-}
-
-// Pseudonymization method that generates surrogates via cryptographic hashing.
-// Uses SHA-256.
-// Outputs a 32 byte digest as an uppercase hex string
-// (for example, 41D1567F7F99F1DC2A5FAB886DEE5BEE).
-// Currently, only string and integer values can be hashed.
-type CryptoHashConfig struct {
-	// The key used by the hash function.
-	CryptoKey *CryptoKey `protobuf:"bytes,1,opt,name=crypto_key,json=cryptoKey" json:"crypto_key,omitempty"`
-}
-
-func (m *CryptoHashConfig) Reset()                    { *m = CryptoHashConfig{} }
-func (m *CryptoHashConfig) String() string            { return proto.CompactTextString(m) }
-func (*CryptoHashConfig) ProtoMessage()               {}
-func (*CryptoHashConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} }
-
-func (m *CryptoHashConfig) GetCryptoKey() *CryptoKey {
-	if m != nil {
-		return m.CryptoKey
-	}
-	return nil
-}
-
-// Replace each input value with a given `Value`.
-type ReplaceValueConfig struct {
-	// Value to replace it with.
-	NewValue *Value `protobuf:"bytes,1,opt,name=new_value,json=newValue" json:"new_value,omitempty"`
-}
-
-func (m *ReplaceValueConfig) Reset()                    { *m = ReplaceValueConfig{} }
-func (m *ReplaceValueConfig) String() string            { return proto.CompactTextString(m) }
-func (*ReplaceValueConfig) ProtoMessage()               {}
-func (*ReplaceValueConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} }
-
-func (m *ReplaceValueConfig) GetNewValue() *Value {
-	if m != nil {
-		return m.NewValue
-	}
-	return nil
-}
-
-// Replace each matching finding with the name of the info_type.
-type ReplaceWithInfoTypeConfig struct {
-}
-
-func (m *ReplaceWithInfoTypeConfig) Reset()                    { *m = ReplaceWithInfoTypeConfig{} }
-func (m *ReplaceWithInfoTypeConfig) String() string            { return proto.CompactTextString(m) }
-func (*ReplaceWithInfoTypeConfig) ProtoMessage()               {}
-func (*ReplaceWithInfoTypeConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} }
-
-// Redact a given value. For example, if used with an `InfoTypeTransformation`
-// transforming PHONE_NUMBER, and input 'My phone number is 206-555-0123', the
-// output would be 'My phone number is '.
-type RedactConfig struct {
-}
-
-func (m *RedactConfig) Reset()                    { *m = RedactConfig{} }
-func (m *RedactConfig) String() string            { return proto.CompactTextString(m) }
-func (*RedactConfig) ProtoMessage()               {}
-func (*RedactConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{42} }
-
-// Characters to skip when doing deidentification of a value. These will be left
-// alone and skipped.
-type CharsToIgnore struct {
-	// Types that are valid to be assigned to Characters:
-	//	*CharsToIgnore_CharactersToSkip
-	//	*CharsToIgnore_CommonCharactersToIgnore
-	Characters isCharsToIgnore_Characters `protobuf_oneof:"characters"`
-}
-
-func (m *CharsToIgnore) Reset()                    { *m = CharsToIgnore{} }
-func (m *CharsToIgnore) String() string            { return proto.CompactTextString(m) }
-func (*CharsToIgnore) ProtoMessage()               {}
-func (*CharsToIgnore) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{43} }
-
-type isCharsToIgnore_Characters interface {
-	isCharsToIgnore_Characters()
-}
-
-type CharsToIgnore_CharactersToSkip struct {
-	CharactersToSkip string `protobuf:"bytes,1,opt,name=characters_to_skip,json=charactersToSkip,oneof"`
-}
-type CharsToIgnore_CommonCharactersToIgnore struct {
-	CommonCharactersToIgnore CharsToIgnore_CharacterGroup `protobuf:"varint,2,opt,name=common_characters_to_ignore,json=commonCharactersToIgnore,enum=google.privacy.dlp.v2beta1.CharsToIgnore_CharacterGroup,oneof"`
-}
-
-func (*CharsToIgnore_CharactersToSkip) isCharsToIgnore_Characters()         {}
-func (*CharsToIgnore_CommonCharactersToIgnore) isCharsToIgnore_Characters() {}
-
-func (m *CharsToIgnore) GetCharacters() isCharsToIgnore_Characters {
-	if m != nil {
-		return m.Characters
-	}
-	return nil
-}
-
-func (m *CharsToIgnore) GetCharactersToSkip() string {
-	if x, ok := m.GetCharacters().(*CharsToIgnore_CharactersToSkip); ok {
-		return x.CharactersToSkip
-	}
-	return ""
-}
-
-func (m *CharsToIgnore) GetCommonCharactersToIgnore() CharsToIgnore_CharacterGroup {
-	if x, ok := m.GetCharacters().(*CharsToIgnore_CommonCharactersToIgnore); ok {
-		return x.CommonCharactersToIgnore
-	}
-	return CharsToIgnore_CHARACTER_GROUP_UNSPECIFIED
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CharsToIgnore) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CharsToIgnore_OneofMarshaler, _CharsToIgnore_OneofUnmarshaler, _CharsToIgnore_OneofSizer, []interface{}{
-		(*CharsToIgnore_CharactersToSkip)(nil),
-		(*CharsToIgnore_CommonCharactersToIgnore)(nil),
-	}
-}
-
-func _CharsToIgnore_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CharsToIgnore)
-	// characters
-	switch x := m.Characters.(type) {
-	case *CharsToIgnore_CharactersToSkip:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CharactersToSkip)
-	case *CharsToIgnore_CommonCharactersToIgnore:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CommonCharactersToIgnore))
-	case nil:
-	default:
-		return fmt.Errorf("CharsToIgnore.Characters has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CharsToIgnore_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CharsToIgnore)
-	switch tag {
-	case 1: // characters.characters_to_skip
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Characters = &CharsToIgnore_CharactersToSkip{x}
-		return true, err
-	case 2: // characters.common_characters_to_ignore
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Characters = &CharsToIgnore_CommonCharactersToIgnore{CharsToIgnore_CharacterGroup(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CharsToIgnore_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CharsToIgnore)
-	// characters
-	switch x := m.Characters.(type) {
-	case *CharsToIgnore_CharactersToSkip:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.CharactersToSkip)))
-		n += len(x.CharactersToSkip)
-	case *CharsToIgnore_CommonCharactersToIgnore:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.CommonCharactersToIgnore))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Partially mask a string by replacing a given number of characters with a
-// fixed character. Masking can start from the beginning or end of the string.
-// This can be used on data of any type (numbers, longs, and so on) and when
-// de-identifying structured data we'll attempt to preserve the original data's
-// type. (This allows you to take a long like 123 and modify it to a string like
-// **3.
-type CharacterMaskConfig struct {
-	// Character to mask the sensitive values&mdash;for example, "*" for an
-	// alphabetic string such as name, or "0" for a numeric string such as ZIP
-	// code or credit card number. String must have length 1. If not supplied, we
-	// will default to "*" for strings, 0 for digits.
-	MaskingCharacter string `protobuf:"bytes,1,opt,name=masking_character,json=maskingCharacter" json:"masking_character,omitempty"`
-	// Number of characters to mask. If not set, all matching chars will be
-	// masked. Skipped characters do not count towards this tally.
-	NumberToMask int32 `protobuf:"varint,2,opt,name=number_to_mask,json=numberToMask" json:"number_to_mask,omitempty"`
-	// Mask characters in reverse order. For example, if `masking_character` is
-	// '0', number_to_mask is 14, and `reverse_order` is false, then
-	// 1234-5678-9012-3456 -> 00000000000000-3456
-	// If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
-	// is true, then 12345 -> 12***
-	ReverseOrder bool `protobuf:"varint,3,opt,name=reverse_order,json=reverseOrder" json:"reverse_order,omitempty"`
-	// When masking a string, items in this list will be skipped when replacing.
-	// For example, if your string is 555-555-5555 and you ask us to skip `-` and
-	// mask 5 chars with * we would produce ***-*55-5555.
-	CharactersToIgnore []*CharsToIgnore `protobuf:"bytes,4,rep,name=characters_to_ignore,json=charactersToIgnore" json:"characters_to_ignore,omitempty"`
-}
-
-func (m *CharacterMaskConfig) Reset()                    { *m = CharacterMaskConfig{} }
-func (m *CharacterMaskConfig) String() string            { return proto.CompactTextString(m) }
-func (*CharacterMaskConfig) ProtoMessage()               {}
-func (*CharacterMaskConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{44} }
-
-func (m *CharacterMaskConfig) GetMaskingCharacter() string {
-	if m != nil {
-		return m.MaskingCharacter
-	}
-	return ""
-}
-
-func (m *CharacterMaskConfig) GetNumberToMask() int32 {
-	if m != nil {
-		return m.NumberToMask
-	}
-	return 0
-}
-
-func (m *CharacterMaskConfig) GetReverseOrder() bool {
-	if m != nil {
-		return m.ReverseOrder
-	}
-	return false
-}
-
-func (m *CharacterMaskConfig) GetCharactersToIgnore() []*CharsToIgnore {
-	if m != nil {
-		return m.CharactersToIgnore
-	}
-	return nil
-}
-
-// Buckets values based on fixed size ranges. The
-// Bucketing transformation can provide all of this functionality,
-// but requires more configuration. This message is provided as a convenience to
-// the user for simple bucketing strategies.
-// The resulting value will be a hyphenated string of
-// lower_bound-upper_bound.
-// This can be used on data of type: double, long.
-// If the bound Value type differs from the type of data
-// being transformed, we will first attempt converting the type of the data to
-// be transformed to match the type of the bound before comparing.
-type FixedSizeBucketingConfig struct {
-	// Lower bound value of buckets. All values less than `lower_bound` are
-	// grouped together into a single bucket; for example if `lower_bound` = 10,
-	// then all values less than 10 are replaced with the value “-10”. [Required].
-	LowerBound *Value `protobuf:"bytes,1,opt,name=lower_bound,json=lowerBound" json:"lower_bound,omitempty"`
-	// Upper bound value of buckets. All values greater than upper_bound are
-	// grouped together into a single bucket; for example if `upper_bound` = 89,
-	// then all values greater than 89 are replaced with the value “89+”.
-	// [Required].
-	UpperBound *Value `protobuf:"bytes,2,opt,name=upper_bound,json=upperBound" json:"upper_bound,omitempty"`
-	// Size of each bucket (except for minimum and maximum buckets). So if
-	// `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
-	// following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
-	// 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
-	BucketSize float64 `protobuf:"fixed64,3,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-}
-
-func (m *FixedSizeBucketingConfig) Reset()                    { *m = FixedSizeBucketingConfig{} }
-func (m *FixedSizeBucketingConfig) String() string            { return proto.CompactTextString(m) }
-func (*FixedSizeBucketingConfig) ProtoMessage()               {}
-func (*FixedSizeBucketingConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{45} }
-
-func (m *FixedSizeBucketingConfig) GetLowerBound() *Value {
-	if m != nil {
-		return m.LowerBound
-	}
-	return nil
-}
-
-func (m *FixedSizeBucketingConfig) GetUpperBound() *Value {
-	if m != nil {
-		return m.UpperBound
-	}
-	return nil
-}
-
-func (m *FixedSizeBucketingConfig) GetBucketSize() float64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-// Generalization function that buckets values based on ranges. The ranges and
-// replacement values are dynamically provided by the user for custom behavior,
-// such as 1-30 -> LOW 31-65 -> MEDIUM 66-100 -> HIGH
-// This can be used on
-// data of type: number, long, string, timestamp.
-// If the bound `Value` type differs from the type of data being transformed, we
-// will first attempt converting the type of the data to be transformed to match
-// the type of the bound before comparing.
-type BucketingConfig struct {
-	Buckets []*BucketingConfig_Bucket `protobuf:"bytes,1,rep,name=buckets" json:"buckets,omitempty"`
-}
-
-func (m *BucketingConfig) Reset()                    { *m = BucketingConfig{} }
-func (m *BucketingConfig) String() string            { return proto.CompactTextString(m) }
-func (*BucketingConfig) ProtoMessage()               {}
-func (*BucketingConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46} }
-
-func (m *BucketingConfig) GetBuckets() []*BucketingConfig_Bucket {
-	if m != nil {
-		return m.Buckets
-	}
-	return nil
-}
-
-// Buckets represented as ranges, along with replacement values. Ranges must
-// be non-overlapping.
-type BucketingConfig_Bucket struct {
-	// Lower bound of the range, inclusive. Type should be the same as max if
-	// used.
-	Min *Value `protobuf:"bytes,1,opt,name=min" json:"min,omitempty"`
-	// Upper bound of the range, exclusive; type must match min.
-	Max *Value `protobuf:"bytes,2,opt,name=max" json:"max,omitempty"`
-	// Replacement value for this bucket. If not provided
-	// the default behavior will be to hyphenate the min-max range.
-	ReplacementValue *Value `protobuf:"bytes,3,opt,name=replacement_value,json=replacementValue" json:"replacement_value,omitempty"`
-}
-
-func (m *BucketingConfig_Bucket) Reset()                    { *m = BucketingConfig_Bucket{} }
-func (m *BucketingConfig_Bucket) String() string            { return proto.CompactTextString(m) }
-func (*BucketingConfig_Bucket) ProtoMessage()               {}
-func (*BucketingConfig_Bucket) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46, 0} }
-
-func (m *BucketingConfig_Bucket) GetMin() *Value {
-	if m != nil {
-		return m.Min
-	}
-	return nil
-}
-
-func (m *BucketingConfig_Bucket) GetMax() *Value {
-	if m != nil {
-		return m.Max
-	}
-	return nil
-}
-
-func (m *BucketingConfig_Bucket) GetReplacementValue() *Value {
-	if m != nil {
-		return m.ReplacementValue
-	}
-	return nil
-}
-
-// Replaces an identifier with a surrogate using FPE with the FFX
-// mode of operation.
-// The identifier must be representable by the US-ASCII character set.
-// For a given crypto key and context, the same identifier will be
-// replaced with the same surrogate.
-// Identifiers must be at least two characters long.
-// In the case that the identifier is the empty string, it will be skipped.
-type CryptoReplaceFfxFpeConfig struct {
-	// The key used by the encryption algorithm. [required]
-	CryptoKey *CryptoKey `protobuf:"bytes,1,opt,name=crypto_key,json=cryptoKey" json:"crypto_key,omitempty"`
-	// A context may be used for higher security since the same
-	// identifier in two different contexts likely will be given a distinct
-	// surrogate. The principle is that the likeliness is inversely related
-	// to the ratio of the number of distinct identifiers per context over the
-	// number of possible surrogates: As long as this ratio is small, the
-	// likehood is large.
-	//
-	// If the context is not set, a default tweak will be used.
-	// If the context is set but:
-	//
-	// 1. there is no record present when transforming a given value or
-	// 1. the field is not present when transforming a given value,
-	//
-	// a default tweak will be used.
-	//
-	// Note that case (1) is expected when an `InfoTypeTransformation` is
-	// applied to both structured and non-structured `ContentItem`s.
-	// Currently, the referenced field may be of value type integer or string.
-	//
-	// The tweak is constructed as a sequence of bytes in big endian byte order
-	// such that:
-	//
-	// - a 64 bit integer is encoded followed by a single byte of value 1
-	// - a string is encoded in UTF-8 format followed by a single byte of value 2
-	//
-	// This is also known as the 'tweak', as in tweakable encryption.
-	Context *FieldId `protobuf:"bytes,2,opt,name=context" json:"context,omitempty"`
-	// Types that are valid to be assigned to Alphabet:
-	//	*CryptoReplaceFfxFpeConfig_CommonAlphabet
-	//	*CryptoReplaceFfxFpeConfig_CustomAlphabet
-	//	*CryptoReplaceFfxFpeConfig_Radix
-	Alphabet isCryptoReplaceFfxFpeConfig_Alphabet `protobuf_oneof:"alphabet"`
-}
-
-func (m *CryptoReplaceFfxFpeConfig) Reset()                    { *m = CryptoReplaceFfxFpeConfig{} }
-func (m *CryptoReplaceFfxFpeConfig) String() string            { return proto.CompactTextString(m) }
-func (*CryptoReplaceFfxFpeConfig) ProtoMessage()               {}
-func (*CryptoReplaceFfxFpeConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{47} }
-
-type isCryptoReplaceFfxFpeConfig_Alphabet interface {
-	isCryptoReplaceFfxFpeConfig_Alphabet()
-}
-
-type CryptoReplaceFfxFpeConfig_CommonAlphabet struct {
-	CommonAlphabet CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet `protobuf:"varint,4,opt,name=common_alphabet,json=commonAlphabet,enum=google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet,oneof"`
-}
-type CryptoReplaceFfxFpeConfig_CustomAlphabet struct {
-	CustomAlphabet string `protobuf:"bytes,5,opt,name=custom_alphabet,json=customAlphabet,oneof"`
-}
-type CryptoReplaceFfxFpeConfig_Radix struct {
-	Radix int32 `protobuf:"varint,6,opt,name=radix,oneof"`
-}
-
-func (*CryptoReplaceFfxFpeConfig_CommonAlphabet) isCryptoReplaceFfxFpeConfig_Alphabet() {}
-func (*CryptoReplaceFfxFpeConfig_CustomAlphabet) isCryptoReplaceFfxFpeConfig_Alphabet() {}
-func (*CryptoReplaceFfxFpeConfig_Radix) isCryptoReplaceFfxFpeConfig_Alphabet()          {}
-
-func (m *CryptoReplaceFfxFpeConfig) GetAlphabet() isCryptoReplaceFfxFpeConfig_Alphabet {
-	if m != nil {
-		return m.Alphabet
-	}
-	return nil
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetCryptoKey() *CryptoKey {
-	if m != nil {
-		return m.CryptoKey
-	}
-	return nil
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetContext() *FieldId {
-	if m != nil {
-		return m.Context
-	}
-	return nil
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetCommonAlphabet() CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet {
-	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_CommonAlphabet); ok {
-		return x.CommonAlphabet
-	}
-	return CryptoReplaceFfxFpeConfig_FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetCustomAlphabet() string {
-	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_CustomAlphabet); ok {
-		return x.CustomAlphabet
-	}
-	return ""
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetRadix() int32 {
-	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_Radix); ok {
-		return x.Radix
-	}
-	return 0
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CryptoReplaceFfxFpeConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CryptoReplaceFfxFpeConfig_OneofMarshaler, _CryptoReplaceFfxFpeConfig_OneofUnmarshaler, _CryptoReplaceFfxFpeConfig_OneofSizer, []interface{}{
-		(*CryptoReplaceFfxFpeConfig_CommonAlphabet)(nil),
-		(*CryptoReplaceFfxFpeConfig_CustomAlphabet)(nil),
-		(*CryptoReplaceFfxFpeConfig_Radix)(nil),
-	}
-}
-
-func _CryptoReplaceFfxFpeConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	// alphabet
-	switch x := m.Alphabet.(type) {
-	case *CryptoReplaceFfxFpeConfig_CommonAlphabet:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CommonAlphabet))
-	case *CryptoReplaceFfxFpeConfig_CustomAlphabet:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CustomAlphabet)
-	case *CryptoReplaceFfxFpeConfig_Radix:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Radix))
-	case nil:
-	default:
-		return fmt.Errorf("CryptoReplaceFfxFpeConfig.Alphabet has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CryptoReplaceFfxFpeConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	switch tag {
-	case 4: // alphabet.common_alphabet
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_CommonAlphabet{CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet(x)}
-		return true, err
-	case 5: // alphabet.custom_alphabet
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_CustomAlphabet{x}
-		return true, err
-	case 6: // alphabet.radix
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_Radix{int32(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CryptoReplaceFfxFpeConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	// alphabet
-	switch x := m.Alphabet.(type) {
-	case *CryptoReplaceFfxFpeConfig_CommonAlphabet:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.CommonAlphabet))
-	case *CryptoReplaceFfxFpeConfig_CustomAlphabet:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.CustomAlphabet)))
-		n += len(x.CustomAlphabet)
-	case *CryptoReplaceFfxFpeConfig_Radix:
-		n += proto.SizeVarint(6<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Radix))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// This is a data encryption key (DEK) (as opposed to
-// a key encryption key (KEK) stored by KMS).
-// When using KMS to wrap/unwrap DEKs, be sure to set an appropriate
-// IAM policy on the KMS CryptoKey (KEK) to ensure an attacker cannot
-// unwrap the data crypto key.
-type CryptoKey struct {
-	// Types that are valid to be assigned to Source:
-	//	*CryptoKey_Transient
-	//	*CryptoKey_Unwrapped
-	//	*CryptoKey_KmsWrapped
-	Source isCryptoKey_Source `protobuf_oneof:"source"`
-}
-
-func (m *CryptoKey) Reset()                    { *m = CryptoKey{} }
-func (m *CryptoKey) String() string            { return proto.CompactTextString(m) }
-func (*CryptoKey) ProtoMessage()               {}
-func (*CryptoKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{48} }
-
-type isCryptoKey_Source interface {
-	isCryptoKey_Source()
-}
-
-type CryptoKey_Transient struct {
-	Transient *TransientCryptoKey `protobuf:"bytes,1,opt,name=transient,oneof"`
-}
-type CryptoKey_Unwrapped struct {
-	Unwrapped *UnwrappedCryptoKey `protobuf:"bytes,2,opt,name=unwrapped,oneof"`
-}
-type CryptoKey_KmsWrapped struct {
-	KmsWrapped *KmsWrappedCryptoKey `protobuf:"bytes,3,opt,name=kms_wrapped,json=kmsWrapped,oneof"`
-}
-
-func (*CryptoKey_Transient) isCryptoKey_Source()  {}
-func (*CryptoKey_Unwrapped) isCryptoKey_Source()  {}
-func (*CryptoKey_KmsWrapped) isCryptoKey_Source() {}
-
-func (m *CryptoKey) GetSource() isCryptoKey_Source {
-	if m != nil {
-		return m.Source
-	}
-	return nil
-}
-
-func (m *CryptoKey) GetTransient() *TransientCryptoKey {
-	if x, ok := m.GetSource().(*CryptoKey_Transient); ok {
-		return x.Transient
-	}
-	return nil
-}
-
-func (m *CryptoKey) GetUnwrapped() *UnwrappedCryptoKey {
-	if x, ok := m.GetSource().(*CryptoKey_Unwrapped); ok {
-		return x.Unwrapped
-	}
-	return nil
-}
-
-func (m *CryptoKey) GetKmsWrapped() *KmsWrappedCryptoKey {
-	if x, ok := m.GetSource().(*CryptoKey_KmsWrapped); ok {
-		return x.KmsWrapped
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CryptoKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CryptoKey_OneofMarshaler, _CryptoKey_OneofUnmarshaler, _CryptoKey_OneofSizer, []interface{}{
-		(*CryptoKey_Transient)(nil),
-		(*CryptoKey_Unwrapped)(nil),
-		(*CryptoKey_KmsWrapped)(nil),
-	}
-}
-
-func _CryptoKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CryptoKey)
-	// source
-	switch x := m.Source.(type) {
-	case *CryptoKey_Transient:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Transient); err != nil {
-			return err
-		}
-	case *CryptoKey_Unwrapped:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Unwrapped); err != nil {
-			return err
-		}
-	case *CryptoKey_KmsWrapped:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KmsWrapped); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CryptoKey.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CryptoKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CryptoKey)
-	switch tag {
-	case 1: // source.transient
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransientCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_Transient{msg}
-		return true, err
-	case 2: // source.unwrapped
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UnwrappedCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_Unwrapped{msg}
-		return true, err
-	case 3: // source.kms_wrapped
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(KmsWrappedCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_KmsWrapped{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CryptoKey_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CryptoKey)
-	// source
-	switch x := m.Source.(type) {
-	case *CryptoKey_Transient:
-		s := proto.Size(x.Transient)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CryptoKey_Unwrapped:
-		s := proto.Size(x.Unwrapped)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CryptoKey_KmsWrapped:
-		s := proto.Size(x.KmsWrapped)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Use this to have a random data crypto key generated.
-// It will be discarded after the operation/request finishes.
-type TransientCryptoKey struct {
-	// Name of the key. [required]
-	// This is an arbitrary string used to differentiate different keys.
-	// A unique key is generated per name: two separate `TransientCryptoKey`
-	// protos share the same generated key if their names are the same.
-	// When the data crypto key is generated, this name is not used in any way
-	// (repeating the api call will result in a different key being generated).
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *TransientCryptoKey) Reset()                    { *m = TransientCryptoKey{} }
-func (m *TransientCryptoKey) String() string            { return proto.CompactTextString(m) }
-func (*TransientCryptoKey) ProtoMessage()               {}
-func (*TransientCryptoKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{49} }
-
-func (m *TransientCryptoKey) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Using raw keys is prone to security risks due to accidentally
-// leaking the key. Choose another type of key if possible.
-type UnwrappedCryptoKey struct {
-	// The AES 128/192/256 bit key. [required]
-	Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-}
-
-func (m *UnwrappedCryptoKey) Reset()                    { *m = UnwrappedCryptoKey{} }
-func (m *UnwrappedCryptoKey) String() string            { return proto.CompactTextString(m) }
-func (*UnwrappedCryptoKey) ProtoMessage()               {}
-func (*UnwrappedCryptoKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{50} }
-
-func (m *UnwrappedCryptoKey) GetKey() []byte {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-// Include to use an existing data crypto key wrapped by KMS.
-// Authorization requires the following IAM permissions when sending a request
-// to perform a crypto transformation using a kms-wrapped crypto key:
-// dlp.kms.encrypt
-type KmsWrappedCryptoKey struct {
-	// The wrapped data crypto key. [required]
-	WrappedKey []byte `protobuf:"bytes,1,opt,name=wrapped_key,json=wrappedKey,proto3" json:"wrapped_key,omitempty"`
-	// The resource name of the KMS CryptoKey to use for unwrapping. [required]
-	CryptoKeyName string `protobuf:"bytes,2,opt,name=crypto_key_name,json=cryptoKeyName" json:"crypto_key_name,omitempty"`
-}
-
-func (m *KmsWrappedCryptoKey) Reset()                    { *m = KmsWrappedCryptoKey{} }
-func (m *KmsWrappedCryptoKey) String() string            { return proto.CompactTextString(m) }
-func (*KmsWrappedCryptoKey) ProtoMessage()               {}
-func (*KmsWrappedCryptoKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51} }
-
-func (m *KmsWrappedCryptoKey) GetWrappedKey() []byte {
-	if m != nil {
-		return m.WrappedKey
-	}
-	return nil
-}
-
-func (m *KmsWrappedCryptoKey) GetCryptoKeyName() string {
-	if m != nil {
-		return m.CryptoKeyName
-	}
-	return ""
-}
-
-// A type of transformation that will scan unstructured text and
-// apply various `PrimitiveTransformation`s to each finding, where the
-// transformation is applied to only values that were identified as a specific
-// info_type.
-type InfoTypeTransformations struct {
-	// Transformation for each info type. Cannot specify more than one
-	// for a given info type. [required]
-	Transformations []*InfoTypeTransformations_InfoTypeTransformation `protobuf:"bytes,1,rep,name=transformations" json:"transformations,omitempty"`
-}
-
-func (m *InfoTypeTransformations) Reset()                    { *m = InfoTypeTransformations{} }
-func (m *InfoTypeTransformations) String() string            { return proto.CompactTextString(m) }
-func (*InfoTypeTransformations) ProtoMessage()               {}
-func (*InfoTypeTransformations) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{52} }
-
-func (m *InfoTypeTransformations) GetTransformations() []*InfoTypeTransformations_InfoTypeTransformation {
-	if m != nil {
-		return m.Transformations
-	}
-	return nil
-}
-
-// A transformation to apply to text that is identified as a specific
-// info_type.
-type InfoTypeTransformations_InfoTypeTransformation struct {
-	// Info types to apply the transformation to. Empty list will match all
-	// available info types for this transformation.
-	InfoTypes []*InfoType `protobuf:"bytes,1,rep,name=info_types,json=infoTypes" json:"info_types,omitempty"`
-	// Primitive transformation to apply to the info type. [required]
-	PrimitiveTransformation *PrimitiveTransformation `protobuf:"bytes,2,opt,name=primitive_transformation,json=primitiveTransformation" json:"primitive_transformation,omitempty"`
-}
-
-func (m *InfoTypeTransformations_InfoTypeTransformation) Reset() {
-	*m = InfoTypeTransformations_InfoTypeTransformation{}
-}
-func (m *InfoTypeTransformations_InfoTypeTransformation) String() string {
-	return proto.CompactTextString(m)
-}
-func (*InfoTypeTransformations_InfoTypeTransformation) ProtoMessage() {}
-func (*InfoTypeTransformations_InfoTypeTransformation) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{52, 0}
-}
-
-func (m *InfoTypeTransformations_InfoTypeTransformation) GetInfoTypes() []*InfoType {
-	if m != nil {
-		return m.InfoTypes
-	}
-	return nil
-}
-
-func (m *InfoTypeTransformations_InfoTypeTransformation) GetPrimitiveTransformation() *PrimitiveTransformation {
-	if m != nil {
-		return m.PrimitiveTransformation
-	}
-	return nil
-}
-
-// The transformation to apply to the field.
-type FieldTransformation struct {
-	// Input field(s) to apply the transformation to. [required]
-	Fields []*FieldId `protobuf:"bytes,1,rep,name=fields" json:"fields,omitempty"`
-	// Only apply the transformation if the condition evaluates to true for the
-	// given `RecordCondition`. The conditions are allowed to reference fields
-	// that are not used in the actual transformation. [optional]
-	//
-	// Example Use Cases:
-	//
-	// - Apply a different bucket transformation to an age column if the zip code
-	// column for the same record is within a specific range.
-	// - Redact a field if the date of birth field is greater than 85.
-	Condition *RecordCondition `protobuf:"bytes,3,opt,name=condition" json:"condition,omitempty"`
-	// Transformation to apply. [required]
-	//
-	// Types that are valid to be assigned to Transformation:
-	//	*FieldTransformation_PrimitiveTransformation
-	//	*FieldTransformation_InfoTypeTransformations
-	Transformation isFieldTransformation_Transformation `protobuf_oneof:"transformation"`
-}
-
-func (m *FieldTransformation) Reset()                    { *m = FieldTransformation{} }
-func (m *FieldTransformation) String() string            { return proto.CompactTextString(m) }
-func (*FieldTransformation) ProtoMessage()               {}
-func (*FieldTransformation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{53} }
-
-type isFieldTransformation_Transformation interface {
-	isFieldTransformation_Transformation()
-}
-
-type FieldTransformation_PrimitiveTransformation struct {
-	PrimitiveTransformation *PrimitiveTransformation `protobuf:"bytes,4,opt,name=primitive_transformation,json=primitiveTransformation,oneof"`
-}
-type FieldTransformation_InfoTypeTransformations struct {
-	InfoTypeTransformations *InfoTypeTransformations `protobuf:"bytes,5,opt,name=info_type_transformations,json=infoTypeTransformations,oneof"`
-}
-
-func (*FieldTransformation_PrimitiveTransformation) isFieldTransformation_Transformation() {}
-func (*FieldTransformation_InfoTypeTransformations) isFieldTransformation_Transformation() {}
-
-func (m *FieldTransformation) GetTransformation() isFieldTransformation_Transformation {
-	if m != nil {
-		return m.Transformation
-	}
-	return nil
-}
-
-func (m *FieldTransformation) GetFields() []*FieldId {
-	if m != nil {
-		return m.Fields
-	}
-	return nil
-}
-
-func (m *FieldTransformation) GetCondition() *RecordCondition {
-	if m != nil {
-		return m.Condition
-	}
-	return nil
-}
-
-func (m *FieldTransformation) GetPrimitiveTransformation() *PrimitiveTransformation {
-	if x, ok := m.GetTransformation().(*FieldTransformation_PrimitiveTransformation); ok {
-		return x.PrimitiveTransformation
-	}
-	return nil
-}
-
-func (m *FieldTransformation) GetInfoTypeTransformations() *InfoTypeTransformations {
-	if x, ok := m.GetTransformation().(*FieldTransformation_InfoTypeTransformations); ok {
-		return x.InfoTypeTransformations
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FieldTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FieldTransformation_OneofMarshaler, _FieldTransformation_OneofUnmarshaler, _FieldTransformation_OneofSizer, []interface{}{
-		(*FieldTransformation_PrimitiveTransformation)(nil),
-		(*FieldTransformation_InfoTypeTransformations)(nil),
-	}
-}
-
-func _FieldTransformation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FieldTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *FieldTransformation_PrimitiveTransformation:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PrimitiveTransformation); err != nil {
-			return err
-		}
-	case *FieldTransformation_InfoTypeTransformations:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoTypeTransformations); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("FieldTransformation.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FieldTransformation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FieldTransformation)
-	switch tag {
-	case 4: // transformation.primitive_transformation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrimitiveTransformation)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &FieldTransformation_PrimitiveTransformation{msg}
-		return true, err
-	case 5: // transformation.info_type_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoTypeTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &FieldTransformation_InfoTypeTransformations{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FieldTransformation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FieldTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *FieldTransformation_PrimitiveTransformation:
-		s := proto.Size(x.PrimitiveTransformation)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FieldTransformation_InfoTypeTransformations:
-		s := proto.Size(x.InfoTypeTransformations)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// A type of transformation that is applied over structured data such as a
-// table.
-type RecordTransformations struct {
-	// Transform the record by applying various field transformations.
-	FieldTransformations []*FieldTransformation `protobuf:"bytes,1,rep,name=field_transformations,json=fieldTransformations" json:"field_transformations,omitempty"`
-	// Configuration defining which records get suppressed entirely. Records that
-	// match any suppression rule are omitted from the output [optional].
-	RecordSuppressions []*RecordSuppression `protobuf:"bytes,2,rep,name=record_suppressions,json=recordSuppressions" json:"record_suppressions,omitempty"`
-}
-
-func (m *RecordTransformations) Reset()                    { *m = RecordTransformations{} }
-func (m *RecordTransformations) String() string            { return proto.CompactTextString(m) }
-func (*RecordTransformations) ProtoMessage()               {}
-func (*RecordTransformations) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{54} }
-
-func (m *RecordTransformations) GetFieldTransformations() []*FieldTransformation {
-	if m != nil {
-		return m.FieldTransformations
-	}
-	return nil
-}
-
-func (m *RecordTransformations) GetRecordSuppressions() []*RecordSuppression {
-	if m != nil {
-		return m.RecordSuppressions
-	}
-	return nil
-}
-
-// Configuration to suppress records whose suppression conditions evaluate to
-// true.
-type RecordSuppression struct {
-	Condition *RecordCondition `protobuf:"bytes,1,opt,name=condition" json:"condition,omitempty"`
-}
-
-func (m *RecordSuppression) Reset()                    { *m = RecordSuppression{} }
-func (m *RecordSuppression) String() string            { return proto.CompactTextString(m) }
-func (*RecordSuppression) ProtoMessage()               {}
-func (*RecordSuppression) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{55} }
-
-func (m *RecordSuppression) GetCondition() *RecordCondition {
-	if m != nil {
-		return m.Condition
-	}
-	return nil
-}
-
-// A condition for determining whether a transformation should be applied to
-// a field.
-type RecordCondition struct {
-	Expressions *RecordCondition_Expressions `protobuf:"bytes,3,opt,name=expressions" json:"expressions,omitempty"`
-}
-
-func (m *RecordCondition) Reset()                    { *m = RecordCondition{} }
-func (m *RecordCondition) String() string            { return proto.CompactTextString(m) }
-func (*RecordCondition) ProtoMessage()               {}
-func (*RecordCondition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56} }
-
-func (m *RecordCondition) GetExpressions() *RecordCondition_Expressions {
-	if m != nil {
-		return m.Expressions
-	}
-	return nil
-}
-
-// The field type of `value` and `field` do not need to match to be
-// considered equal, but not all comparisons are possible.
-//
-// A `value` of type:
-//
-// - `string` can be compared against all other types
-// - `boolean` can only be compared against other booleans
-// - `integer` can be compared against doubles or a string if the string value
-// can be parsed as an integer.
-// - `double` can be compared against integers or a string if the string can
-// be parsed as a double.
-// - `Timestamp` can be compared against strings in RFC 3339 date string
-// format.
-// - `TimeOfDay` can be compared against timestamps and strings in the format
-// of 'HH:mm:ss'.
-//
-// If we fail to compare do to type mismatch, a warning will be given and
-// the condition will evaluate to false.
-type RecordCondition_Condition struct {
-	// Field within the record this condition is evaluated against. [required]
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-	// Operator used to compare the field or info type to the value. [required]
-	Operator RelationalOperator `protobuf:"varint,3,opt,name=operator,enum=google.privacy.dlp.v2beta1.RelationalOperator" json:"operator,omitempty"`
-	// Value to compare against. [Required, except for `EXISTS` tests.]
-	Value *Value `protobuf:"bytes,4,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *RecordCondition_Condition) Reset()                    { *m = RecordCondition_Condition{} }
-func (m *RecordCondition_Condition) String() string            { return proto.CompactTextString(m) }
-func (*RecordCondition_Condition) ProtoMessage()               {}
-func (*RecordCondition_Condition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56, 0} }
-
-func (m *RecordCondition_Condition) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func (m *RecordCondition_Condition) GetOperator() RelationalOperator {
-	if m != nil {
-		return m.Operator
-	}
-	return RelationalOperator_RELATIONAL_OPERATOR_UNSPECIFIED
-}
-
-func (m *RecordCondition_Condition) GetValue() *Value {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-type RecordCondition_Conditions struct {
-	Conditions []*RecordCondition_Condition `protobuf:"bytes,1,rep,name=conditions" json:"conditions,omitempty"`
-}
-
-func (m *RecordCondition_Conditions) Reset()                    { *m = RecordCondition_Conditions{} }
-func (m *RecordCondition_Conditions) String() string            { return proto.CompactTextString(m) }
-func (*RecordCondition_Conditions) ProtoMessage()               {}
-func (*RecordCondition_Conditions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56, 1} }
-
-func (m *RecordCondition_Conditions) GetConditions() []*RecordCondition_Condition {
-	if m != nil {
-		return m.Conditions
-	}
-	return nil
-}
-
-// A collection of expressions
-type RecordCondition_Expressions struct {
-	// The operator to apply to the result of conditions. Default and currently
-	// only supported value is `AND`.
-	LogicalOperator RecordCondition_Expressions_LogicalOperator `protobuf:"varint,1,opt,name=logical_operator,json=logicalOperator,enum=google.privacy.dlp.v2beta1.RecordCondition_Expressions_LogicalOperator" json:"logical_operator,omitempty"`
-	// Types that are valid to be assigned to Type:
-	//	*RecordCondition_Expressions_Conditions
-	Type isRecordCondition_Expressions_Type `protobuf_oneof:"type"`
-}
-
-func (m *RecordCondition_Expressions) Reset()                    { *m = RecordCondition_Expressions{} }
-func (m *RecordCondition_Expressions) String() string            { return proto.CompactTextString(m) }
-func (*RecordCondition_Expressions) ProtoMessage()               {}
-func (*RecordCondition_Expressions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56, 2} }
-
-type isRecordCondition_Expressions_Type interface {
-	isRecordCondition_Expressions_Type()
-}
-
-type RecordCondition_Expressions_Conditions struct {
-	Conditions *RecordCondition_Conditions `protobuf:"bytes,3,opt,name=conditions,oneof"`
-}
-
-func (*RecordCondition_Expressions_Conditions) isRecordCondition_Expressions_Type() {}
-
-func (m *RecordCondition_Expressions) GetType() isRecordCondition_Expressions_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *RecordCondition_Expressions) GetLogicalOperator() RecordCondition_Expressions_LogicalOperator {
-	if m != nil {
-		return m.LogicalOperator
-	}
-	return RecordCondition_Expressions_LOGICAL_OPERATOR_UNSPECIFIED
-}
-
-func (m *RecordCondition_Expressions) GetConditions() *RecordCondition_Conditions {
-	if x, ok := m.GetType().(*RecordCondition_Expressions_Conditions); ok {
-		return x.Conditions
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecordCondition_Expressions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecordCondition_Expressions_OneofMarshaler, _RecordCondition_Expressions_OneofUnmarshaler, _RecordCondition_Expressions_OneofSizer, []interface{}{
-		(*RecordCondition_Expressions_Conditions)(nil),
-	}
-}
-
-func _RecordCondition_Expressions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecordCondition_Expressions)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordCondition_Expressions_Conditions:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Conditions); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RecordCondition_Expressions.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecordCondition_Expressions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecordCondition_Expressions)
-	switch tag {
-	case 3: // type.conditions
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RecordCondition_Conditions)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordCondition_Expressions_Conditions{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecordCondition_Expressions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecordCondition_Expressions)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordCondition_Expressions_Conditions:
-		s := proto.Size(x.Conditions)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// High level summary of deidentification.
-type DeidentificationSummary struct {
-	// Total size in bytes that were transformed in some way.
-	TransformedBytes int64 `protobuf:"varint,2,opt,name=transformed_bytes,json=transformedBytes" json:"transformed_bytes,omitempty"`
-	// Transformations applied to the dataset.
-	TransformationSummaries []*TransformationSummary `protobuf:"bytes,3,rep,name=transformation_summaries,json=transformationSummaries" json:"transformation_summaries,omitempty"`
-}
-
-func (m *DeidentificationSummary) Reset()                    { *m = DeidentificationSummary{} }
-func (m *DeidentificationSummary) String() string            { return proto.CompactTextString(m) }
-func (*DeidentificationSummary) ProtoMessage()               {}
-func (*DeidentificationSummary) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{57} }
-
-func (m *DeidentificationSummary) GetTransformedBytes() int64 {
-	if m != nil {
-		return m.TransformedBytes
-	}
-	return 0
-}
-
-func (m *DeidentificationSummary) GetTransformationSummaries() []*TransformationSummary {
-	if m != nil {
-		return m.TransformationSummaries
-	}
-	return nil
-}
-
-// Summary of a single tranformation.
-type TransformationSummary struct {
-	// Set if the transformation was limited to a specific info_type.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Set if the transformation was limited to a specific FieldId.
-	Field *FieldId `protobuf:"bytes,2,opt,name=field" json:"field,omitempty"`
-	// The specific transformation these stats apply to.
-	Transformation *PrimitiveTransformation `protobuf:"bytes,3,opt,name=transformation" json:"transformation,omitempty"`
-	// The field transformation that was applied. This list will contain
-	// multiple only in the case of errors.
-	FieldTransformations []*FieldTransformation `protobuf:"bytes,5,rep,name=field_transformations,json=fieldTransformations" json:"field_transformations,omitempty"`
-	// The specific suppression option these stats apply to.
-	RecordSuppress *RecordSuppression                     `protobuf:"bytes,6,opt,name=record_suppress,json=recordSuppress" json:"record_suppress,omitempty"`
-	Results        []*TransformationSummary_SummaryResult `protobuf:"bytes,4,rep,name=results" json:"results,omitempty"`
-}
-
-func (m *TransformationSummary) Reset()                    { *m = TransformationSummary{} }
-func (m *TransformationSummary) String() string            { return proto.CompactTextString(m) }
-func (*TransformationSummary) ProtoMessage()               {}
-func (*TransformationSummary) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{58} }
-
-func (m *TransformationSummary) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetTransformation() *PrimitiveTransformation {
-	if m != nil {
-		return m.Transformation
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetFieldTransformations() []*FieldTransformation {
-	if m != nil {
-		return m.FieldTransformations
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetRecordSuppress() *RecordSuppression {
-	if m != nil {
-		return m.RecordSuppress
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetResults() []*TransformationSummary_SummaryResult {
-	if m != nil {
-		return m.Results
-	}
-	return nil
-}
-
-// A collection that informs the user the number of times a particular
-// `TransformationResultCode` and error details occurred.
-type TransformationSummary_SummaryResult struct {
-	Count int64                                          `protobuf:"varint,1,opt,name=count" json:"count,omitempty"`
-	Code  TransformationSummary_TransformationResultCode `protobuf:"varint,2,opt,name=code,enum=google.privacy.dlp.v2beta1.TransformationSummary_TransformationResultCode" json:"code,omitempty"`
-	// A place for warnings or errors to show up if a transformation didn't
-	// work as expected.
-	Details string `protobuf:"bytes,3,opt,name=details" json:"details,omitempty"`
-}
-
-func (m *TransformationSummary_SummaryResult) Reset()         { *m = TransformationSummary_SummaryResult{} }
-func (m *TransformationSummary_SummaryResult) String() string { return proto.CompactTextString(m) }
-func (*TransformationSummary_SummaryResult) ProtoMessage()    {}
-func (*TransformationSummary_SummaryResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{58, 0}
-}
-
-func (m *TransformationSummary_SummaryResult) GetCount() int64 {
-	if m != nil {
-		return m.Count
-	}
-	return 0
-}
-
-func (m *TransformationSummary_SummaryResult) GetCode() TransformationSummary_TransformationResultCode {
-	if m != nil {
-		return m.Code
-	}
-	return TransformationSummary_TRANSFORMATION_RESULT_CODE_UNSPECIFIED
-}
-
-func (m *TransformationSummary_SummaryResult) GetDetails() string {
-	if m != nil {
-		return m.Details
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*InspectConfig)(nil), "google.privacy.dlp.v2beta1.InspectConfig")
-	proto.RegisterType((*InspectConfig_InfoTypeLimit)(nil), "google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit")
-	proto.RegisterType((*OperationConfig)(nil), "google.privacy.dlp.v2beta1.OperationConfig")
-	proto.RegisterType((*ContentItem)(nil), "google.privacy.dlp.v2beta1.ContentItem")
-	proto.RegisterType((*Table)(nil), "google.privacy.dlp.v2beta1.Table")
-	proto.RegisterType((*Table_Row)(nil), "google.privacy.dlp.v2beta1.Table.Row")
-	proto.RegisterType((*InspectResult)(nil), "google.privacy.dlp.v2beta1.InspectResult")
-	proto.RegisterType((*Finding)(nil), "google.privacy.dlp.v2beta1.Finding")
-	proto.RegisterType((*Location)(nil), "google.privacy.dlp.v2beta1.Location")
-	proto.RegisterType((*TableLocation)(nil), "google.privacy.dlp.v2beta1.TableLocation")
-	proto.RegisterType((*Range)(nil), "google.privacy.dlp.v2beta1.Range")
-	proto.RegisterType((*ImageLocation)(nil), "google.privacy.dlp.v2beta1.ImageLocation")
-	proto.RegisterType((*RedactContentRequest)(nil), "google.privacy.dlp.v2beta1.RedactContentRequest")
-	proto.RegisterType((*RedactContentRequest_ReplaceConfig)(nil), "google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig")
-	proto.RegisterType((*RedactContentRequest_ImageRedactionConfig)(nil), "google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig")
-	proto.RegisterType((*Color)(nil), "google.privacy.dlp.v2beta1.Color")
-	proto.RegisterType((*RedactContentResponse)(nil), "google.privacy.dlp.v2beta1.RedactContentResponse")
-	proto.RegisterType((*DeidentifyContentRequest)(nil), "google.privacy.dlp.v2beta1.DeidentifyContentRequest")
-	proto.RegisterType((*DeidentifyContentResponse)(nil), "google.privacy.dlp.v2beta1.DeidentifyContentResponse")
-	proto.RegisterType((*InspectContentRequest)(nil), "google.privacy.dlp.v2beta1.InspectContentRequest")
-	proto.RegisterType((*InspectContentResponse)(nil), "google.privacy.dlp.v2beta1.InspectContentResponse")
-	proto.RegisterType((*CreateInspectOperationRequest)(nil), "google.privacy.dlp.v2beta1.CreateInspectOperationRequest")
-	proto.RegisterType((*OutputStorageConfig)(nil), "google.privacy.dlp.v2beta1.OutputStorageConfig")
-	proto.RegisterType((*InfoTypeStatistics)(nil), "google.privacy.dlp.v2beta1.InfoTypeStatistics")
-	proto.RegisterType((*InspectOperationMetadata)(nil), "google.privacy.dlp.v2beta1.InspectOperationMetadata")
-	proto.RegisterType((*InspectOperationResult)(nil), "google.privacy.dlp.v2beta1.InspectOperationResult")
-	proto.RegisterType((*ListInspectFindingsRequest)(nil), "google.privacy.dlp.v2beta1.ListInspectFindingsRequest")
-	proto.RegisterType((*ListInspectFindingsResponse)(nil), "google.privacy.dlp.v2beta1.ListInspectFindingsResponse")
-	proto.RegisterType((*InfoTypeDescription)(nil), "google.privacy.dlp.v2beta1.InfoTypeDescription")
-	proto.RegisterType((*ListInfoTypesRequest)(nil), "google.privacy.dlp.v2beta1.ListInfoTypesRequest")
-	proto.RegisterType((*ListInfoTypesResponse)(nil), "google.privacy.dlp.v2beta1.ListInfoTypesResponse")
-	proto.RegisterType((*CategoryDescription)(nil), "google.privacy.dlp.v2beta1.CategoryDescription")
-	proto.RegisterType((*ListRootCategoriesRequest)(nil), "google.privacy.dlp.v2beta1.ListRootCategoriesRequest")
-	proto.RegisterType((*ListRootCategoriesResponse)(nil), "google.privacy.dlp.v2beta1.ListRootCategoriesResponse")
-	proto.RegisterType((*AnalyzeDataSourceRiskRequest)(nil), "google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest")
-	proto.RegisterType((*PrivacyMetric)(nil), "google.privacy.dlp.v2beta1.PrivacyMetric")
-	proto.RegisterType((*PrivacyMetric_NumericalStatsConfig)(nil), "google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig")
-	proto.RegisterType((*PrivacyMetric_CategoricalStatsConfig)(nil), "google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig")
-	proto.RegisterType((*PrivacyMetric_KAnonymityConfig)(nil), "google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig")
-	proto.RegisterType((*PrivacyMetric_LDiversityConfig)(nil), "google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig")
-	proto.RegisterType((*RiskAnalysisOperationMetadata)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata")
-	proto.RegisterType((*RiskAnalysisOperationResult)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult")
-	proto.RegisterType((*RiskAnalysisOperationResult_NumericalStatsResult)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult")
-	proto.RegisterType((*RiskAnalysisOperationResult_CategoricalStatsResult)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult")
-	proto.RegisterType((*RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket")
-	proto.RegisterType((*RiskAnalysisOperationResult_KAnonymityResult)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult")
-	proto.RegisterType((*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass")
-	proto.RegisterType((*RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket")
-	proto.RegisterType((*RiskAnalysisOperationResult_LDiversityResult)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult")
-	proto.RegisterType((*RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass")
-	proto.RegisterType((*RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket)(nil), "google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket")
-	proto.RegisterType((*ValueFrequency)(nil), "google.privacy.dlp.v2beta1.ValueFrequency")
-	proto.RegisterType((*Value)(nil), "google.privacy.dlp.v2beta1.Value")
-	proto.RegisterType((*DeidentifyConfig)(nil), "google.privacy.dlp.v2beta1.DeidentifyConfig")
-	proto.RegisterType((*PrimitiveTransformation)(nil), "google.privacy.dlp.v2beta1.PrimitiveTransformation")
-	proto.RegisterType((*TimePartConfig)(nil), "google.privacy.dlp.v2beta1.TimePartConfig")
-	proto.RegisterType((*CryptoHashConfig)(nil), "google.privacy.dlp.v2beta1.CryptoHashConfig")
-	proto.RegisterType((*ReplaceValueConfig)(nil), "google.privacy.dlp.v2beta1.ReplaceValueConfig")
-	proto.RegisterType((*ReplaceWithInfoTypeConfig)(nil), "google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig")
-	proto.RegisterType((*RedactConfig)(nil), "google.privacy.dlp.v2beta1.RedactConfig")
-	proto.RegisterType((*CharsToIgnore)(nil), "google.privacy.dlp.v2beta1.CharsToIgnore")
-	proto.RegisterType((*CharacterMaskConfig)(nil), "google.privacy.dlp.v2beta1.CharacterMaskConfig")
-	proto.RegisterType((*FixedSizeBucketingConfig)(nil), "google.privacy.dlp.v2beta1.FixedSizeBucketingConfig")
-	proto.RegisterType((*BucketingConfig)(nil), "google.privacy.dlp.v2beta1.BucketingConfig")
-	proto.RegisterType((*BucketingConfig_Bucket)(nil), "google.privacy.dlp.v2beta1.BucketingConfig.Bucket")
-	proto.RegisterType((*CryptoReplaceFfxFpeConfig)(nil), "google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig")
-	proto.RegisterType((*CryptoKey)(nil), "google.privacy.dlp.v2beta1.CryptoKey")
-	proto.RegisterType((*TransientCryptoKey)(nil), "google.privacy.dlp.v2beta1.TransientCryptoKey")
-	proto.RegisterType((*UnwrappedCryptoKey)(nil), "google.privacy.dlp.v2beta1.UnwrappedCryptoKey")
-	proto.RegisterType((*KmsWrappedCryptoKey)(nil), "google.privacy.dlp.v2beta1.KmsWrappedCryptoKey")
-	proto.RegisterType((*InfoTypeTransformations)(nil), "google.privacy.dlp.v2beta1.InfoTypeTransformations")
-	proto.RegisterType((*InfoTypeTransformations_InfoTypeTransformation)(nil), "google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation")
-	proto.RegisterType((*FieldTransformation)(nil), "google.privacy.dlp.v2beta1.FieldTransformation")
-	proto.RegisterType((*RecordTransformations)(nil), "google.privacy.dlp.v2beta1.RecordTransformations")
-	proto.RegisterType((*RecordSuppression)(nil), "google.privacy.dlp.v2beta1.RecordSuppression")
-	proto.RegisterType((*RecordCondition)(nil), "google.privacy.dlp.v2beta1.RecordCondition")
-	proto.RegisterType((*RecordCondition_Condition)(nil), "google.privacy.dlp.v2beta1.RecordCondition.Condition")
-	proto.RegisterType((*RecordCondition_Conditions)(nil), "google.privacy.dlp.v2beta1.RecordCondition.Conditions")
-	proto.RegisterType((*RecordCondition_Expressions)(nil), "google.privacy.dlp.v2beta1.RecordCondition.Expressions")
-	proto.RegisterType((*DeidentificationSummary)(nil), "google.privacy.dlp.v2beta1.DeidentificationSummary")
-	proto.RegisterType((*TransformationSummary)(nil), "google.privacy.dlp.v2beta1.TransformationSummary")
-	proto.RegisterType((*TransformationSummary_SummaryResult)(nil), "google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult")
-	proto.RegisterEnum("google.privacy.dlp.v2beta1.Likelihood", Likelihood_name, Likelihood_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta1.RelationalOperator", RelationalOperator_name, RelationalOperator_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta1.TimePartConfig_TimePart", TimePartConfig_TimePart_name, TimePartConfig_TimePart_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta1.CharsToIgnore_CharacterGroup", CharsToIgnore_CharacterGroup_name, CharsToIgnore_CharacterGroup_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet", CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta1.RecordCondition_Expressions_LogicalOperator", RecordCondition_Expressions_LogicalOperator_name, RecordCondition_Expressions_LogicalOperator_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta1.TransformationSummary_TransformationResultCode", TransformationSummary_TransformationResultCode_name, TransformationSummary_TransformationResultCode_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for DlpService service
-
-type DlpServiceClient interface {
-	// Finds potentially sensitive info in a list of strings.
-	// This method has limits on input size, processing time, and output size.
-	InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error)
-	// Redacts potentially sensitive info from a list of strings.
-	// This method has limits on input size, processing time, and output size.
-	RedactContent(ctx context.Context, in *RedactContentRequest, opts ...grpc.CallOption) (*RedactContentResponse, error)
-	// De-identifies potentially sensitive info from a list of strings.
-	// This method has limits on input size and output size.
-	DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error)
-	// Schedules a job scanning content in a Google Cloud Platform data
-	// repository.
-	CreateInspectOperation(ctx context.Context, in *CreateInspectOperationRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// Schedules a job to compute risk analysis metrics over content in a Google
-	// Cloud Platform repository.
-	AnalyzeDataSourceRisk(ctx context.Context, in *AnalyzeDataSourceRiskRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
-	// Returns list of results for given inspect operation result set id.
-	ListInspectFindings(ctx context.Context, in *ListInspectFindingsRequest, opts ...grpc.CallOption) (*ListInspectFindingsResponse, error)
-	// Returns sensitive information types for given category.
-	ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error)
-	// Returns the list of root categories of sensitive information.
-	ListRootCategories(ctx context.Context, in *ListRootCategoriesRequest, opts ...grpc.CallOption) (*ListRootCategoriesResponse, error)
-}
-
-type dlpServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewDlpServiceClient(cc *grpc.ClientConn) DlpServiceClient {
-	return &dlpServiceClient{cc}
-}
-
-func (c *dlpServiceClient) InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error) {
-	out := new(InspectContentResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta1.DlpService/InspectContent", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) RedactContent(ctx context.Context, in *RedactContentRequest, opts ...grpc.CallOption) (*RedactContentResponse, error) {
-	out := new(RedactContentResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta1.DlpService/RedactContent", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error) {
-	out := new(DeidentifyContentResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta1.DlpService/DeidentifyContent", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CreateInspectOperation(ctx context.Context, in *CreateInspectOperationRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta1.DlpService/CreateInspectOperation", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) AnalyzeDataSourceRisk(ctx context.Context, in *AnalyzeDataSourceRiskRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta1.DlpService/AnalyzeDataSourceRisk", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListInspectFindings(ctx context.Context, in *ListInspectFindingsRequest, opts ...grpc.CallOption) (*ListInspectFindingsResponse, error) {
-	out := new(ListInspectFindingsResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta1.DlpService/ListInspectFindings", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error) {
-	out := new(ListInfoTypesResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta1.DlpService/ListInfoTypes", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListRootCategories(ctx context.Context, in *ListRootCategoriesRequest, opts ...grpc.CallOption) (*ListRootCategoriesResponse, error) {
-	out := new(ListRootCategoriesResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta1.DlpService/ListRootCategories", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for DlpService service
-
-type DlpServiceServer interface {
-	// Finds potentially sensitive info in a list of strings.
-	// This method has limits on input size, processing time, and output size.
-	InspectContent(context.Context, *InspectContentRequest) (*InspectContentResponse, error)
-	// Redacts potentially sensitive info from a list of strings.
-	// This method has limits on input size, processing time, and output size.
-	RedactContent(context.Context, *RedactContentRequest) (*RedactContentResponse, error)
-	// De-identifies potentially sensitive info from a list of strings.
-	// This method has limits on input size and output size.
-	DeidentifyContent(context.Context, *DeidentifyContentRequest) (*DeidentifyContentResponse, error)
-	// Schedules a job scanning content in a Google Cloud Platform data
-	// repository.
-	CreateInspectOperation(context.Context, *CreateInspectOperationRequest) (*google_longrunning.Operation, error)
-	// Schedules a job to compute risk analysis metrics over content in a Google
-	// Cloud Platform repository.
-	AnalyzeDataSourceRisk(context.Context, *AnalyzeDataSourceRiskRequest) (*google_longrunning.Operation, error)
-	// Returns list of results for given inspect operation result set id.
-	ListInspectFindings(context.Context, *ListInspectFindingsRequest) (*ListInspectFindingsResponse, error)
-	// Returns sensitive information types for given category.
-	ListInfoTypes(context.Context, *ListInfoTypesRequest) (*ListInfoTypesResponse, error)
-	// Returns the list of root categories of sensitive information.
-	ListRootCategories(context.Context, *ListRootCategoriesRequest) (*ListRootCategoriesResponse, error)
-}
-
-func RegisterDlpServiceServer(s *grpc.Server, srv DlpServiceServer) {
-	s.RegisterService(&_DlpService_serviceDesc, srv)
-}
-
-func _DlpService_InspectContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(InspectContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).InspectContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta1.DlpService/InspectContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).InspectContent(ctx, req.(*InspectContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_RedactContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RedactContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).RedactContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta1.DlpService/RedactContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).RedactContent(ctx, req.(*RedactContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeidentifyContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeidentifyContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta1.DlpService/DeidentifyContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeidentifyContent(ctx, req.(*DeidentifyContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CreateInspectOperation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateInspectOperationRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CreateInspectOperation(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta1.DlpService/CreateInspectOperation",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CreateInspectOperation(ctx, req.(*CreateInspectOperationRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_AnalyzeDataSourceRisk_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AnalyzeDataSourceRiskRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).AnalyzeDataSourceRisk(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta1.DlpService/AnalyzeDataSourceRisk",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).AnalyzeDataSourceRisk(ctx, req.(*AnalyzeDataSourceRiskRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListInspectFindings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListInspectFindingsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListInspectFindings(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta1.DlpService/ListInspectFindings",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListInspectFindings(ctx, req.(*ListInspectFindingsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListInfoTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListInfoTypesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListInfoTypes(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta1.DlpService/ListInfoTypes",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListInfoTypes(ctx, req.(*ListInfoTypesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListRootCategories_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListRootCategoriesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListRootCategories(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta1.DlpService/ListRootCategories",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListRootCategories(ctx, req.(*ListRootCategoriesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _DlpService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.privacy.dlp.v2beta1.DlpService",
-	HandlerType: (*DlpServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "InspectContent",
-			Handler:    _DlpService_InspectContent_Handler,
-		},
-		{
-			MethodName: "RedactContent",
-			Handler:    _DlpService_RedactContent_Handler,
-		},
-		{
-			MethodName: "DeidentifyContent",
-			Handler:    _DlpService_DeidentifyContent_Handler,
-		},
-		{
-			MethodName: "CreateInspectOperation",
-			Handler:    _DlpService_CreateInspectOperation_Handler,
-		},
-		{
-			MethodName: "AnalyzeDataSourceRisk",
-			Handler:    _DlpService_AnalyzeDataSourceRisk_Handler,
-		},
-		{
-			MethodName: "ListInspectFindings",
-			Handler:    _DlpService_ListInspectFindings_Handler,
-		},
-		{
-			MethodName: "ListInfoTypes",
-			Handler:    _DlpService_ListInfoTypes_Handler,
-		},
-		{
-			MethodName: "ListRootCategories",
-			Handler:    _DlpService_ListRootCategories_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/privacy/dlp/v2beta1/dlp.proto",
-}
-
-func init() { proto.RegisterFile("google/privacy/dlp/v2beta1/dlp.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 5192 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x3c, 0x5d, 0x6f, 0x1b, 0xd9,
-	0x75, 0x1a, 0x7e, 0x48, 0xe4, 0x91, 0x48, 0xd1, 0x57, 0x1f, 0xa6, 0xe9, 0x75, 0x6c, 0x8f, 0x77,
-	0xbd, 0x5e, 0xef, 0x46, 0xca, 0x6a, 0xbf, 0xba, 0xbb, 0xf5, 0xc6, 0x14, 0x45, 0x99, 0x5a, 0x53,
-	0xa2, 0x3c, 0xa4, 0x64, 0xbb, 0xbb, 0xdd, 0xc1, 0x88, 0xbc, 0xa2, 0x26, 0x1a, 0xce, 0xd0, 0x33,
-	0x43, 0x5b, 0xdc, 0x74, 0xd1, 0xa0, 0x0d, 0x82, 0xb4, 0x45, 0x1f, 0x8a, 0x06, 0x48, 0x51, 0xb4,
-	0x08, 0x52, 0xe4, 0x21, 0x0d, 0xda, 0x87, 0x22, 0x7d, 0x49, 0x1b, 0x14, 0x41, 0xf6, 0x2d, 0x45,
-	0x9f, 0xfa, 0x01, 0x14, 0x45, 0x11, 0xa0, 0xc8, 0x43, 0xd1, 0xbe, 0xb4, 0xff, 0xa0, 0xb8, 0x1f,
-	0xf3, 0xc9, 0x21, 0x45, 0x6a, 0xb5, 0x68, 0xde, 0x78, 0xcf, 0x3d, 0x5f, 0xf7, 0xdc, 0x73, 0xce,
-	0x3d, 0xf7, 0xce, 0xbd, 0x84, 0xe7, 0xdb, 0x86, 0xd1, 0xd6, 0xf0, 0x6a, 0xd7, 0x54, 0x9f, 0x2a,
-	0xcd, 0xfe, 0x6a, 0x4b, 0xeb, 0xae, 0x3e, 0x5d, 0x3b, 0xc0, 0xb6, 0xf2, 0x2a, 0xf9, 0xbd, 0xd2,
-	0x35, 0x0d, 0xdb, 0x40, 0x05, 0x86, 0xb5, 0xc2, 0xb1, 0x56, 0x48, 0x0f, 0xc7, 0x2a, 0x3c, 0xc7,
-	0x39, 0x28, 0x5d, 0x75, 0x55, 0xd1, 0x75, 0xc3, 0x56, 0x6c, 0xd5, 0xd0, 0x2d, 0x46, 0x59, 0xb8,
-	0xc1, 0x7b, 0x35, 0x43, 0x6f, 0x9b, 0x3d, 0x5d, 0x57, 0xf5, 0xf6, 0xaa, 0xd1, 0xc5, 0x66, 0x00,
-	0xe9, 0xd6, 0x08, 0x25, 0x2c, 0xdb, 0x30, 0x95, 0x36, 0xe6, 0x98, 0x97, 0x5d, 0x4c, 0xc3, 0x36,
-	0x0e, 0x7a, 0x87, 0xab, 0xb8, 0xd3, 0xb5, 0xfb, 0xbc, 0xf3, 0x6a, 0xb8, 0xd3, 0x56, 0x3b, 0xd8,
-	0xb2, 0x95, 0x0e, 0x1f, 0x46, 0x61, 0x99, 0x23, 0xd8, 0xfd, 0x2e, 0x5e, 0x6d, 0x29, 0x76, 0x98,
-	0x2b, 0x85, 0x13, 0x22, 0xe3, 0xb0, 0xa5, 0x70, 0xae, 0xe2, 0x4f, 0x13, 0x90, 0xd9, 0xd2, 0xad,
-	0x2e, 0x6e, 0xda, 0x25, 0x43, 0x3f, 0x54, 0xdb, 0xa8, 0x04, 0xa0, 0xea, 0x87, 0x86, 0x4c, 0xd0,
-	0xad, 0xbc, 0x70, 0x2d, 0x7e, 0x6b, 0x76, 0xed, 0xf9, 0x95, 0xe1, 0x26, 0x5a, 0xd9, 0xd2, 0x0f,
-	0x8d, 0x46, 0xbf, 0x8b, 0xa5, 0xb4, 0xca, 0x7f, 0x59, 0x68, 0x1b, 0xb2, 0x1d, 0x55, 0x97, 0x35,
-	0xf5, 0x18, 0x6b, 0xea, 0x91, 0x61, 0xb4, 0xf2, 0xb1, 0x6b, 0xc2, 0xad, 0xec, 0xda, 0xcd, 0x51,
-	0x8c, 0xaa, 0x2e, 0xb6, 0x94, 0xe9, 0xa8, 0xba, 0xd7, 0x44, 0xd7, 0x61, 0xae, 0xa3, 0x9c, 0xc8,
-	0x87, 0xaa, 0xde, 0x52, 0xf5, 0xb6, 0x95, 0x8f, 0x5f, 0x13, 0x6e, 0x25, 0xa5, 0xd9, 0x8e, 0x72,
-	0xb2, 0xc9, 0x41, 0xe8, 0x06, 0x64, 0x54, 0xbd, 0xa9, 0xf5, 0x5a, 0x58, 0x7e, 0xd2, 0x33, 0x6c,
-	0x9c, 0x4f, 0x5c, 0x13, 0x6e, 0xa5, 0xa4, 0x39, 0x0e, 0x7c, 0x40, 0x60, 0x04, 0x09, 0x9f, 0x30,
-	0x24, 0x36, 0xbc, 0x69, 0x86, 0xc4, 0x81, 0x4c, 0x77, 0x05, 0x72, 0xae, 0x01, 0x64, 0x4d, 0xed,
-	0xa8, 0xb6, 0x95, 0x9f, 0xa1, 0x66, 0x78, 0x6b, 0xb4, 0x19, 0x7c, 0x56, 0x74, 0x8d, 0x52, 0x25,
-	0xf4, 0x52, 0x56, 0xf5, 0x37, 0x2d, 0xb4, 0x0f, 0x17, 0x9a, 0x3d, 0xcb, 0x36, 0x3a, 0xb2, 0xcf,
-	0xd4, 0x29, 0x2a, 0xe3, 0xf6, 0x28, 0x19, 0x25, 0x4a, 0xe4, 0x1a, 0x7c, 0xbe, 0x19, 0x68, 0x5b,
-	0x85, 0x1e, 0x99, 0x4c, 0x9f, 0x24, 0x54, 0x84, 0xb4, 0x2b, 0x21, 0x2f, 0x5c, 0x13, 0xc6, 0x9e,
-	0xcb, 0x94, 0xa3, 0xf1, 0x80, 0xed, 0x63, 0x03, 0xb6, 0x17, 0xef, 0xc0, 0x7c, 0xcd, 0xf1, 0x7a,
-	0xee, 0x45, 0xb7, 0xe1, 0x02, 0xa1, 0x52, 0x6d, 0xdc, 0xf1, 0x48, 0x89, 0x02, 0x71, 0x69, 0xbe,
-	0xa3, 0x9c, 0x6c, 0xd9, 0xb8, 0xe3, 0x92, 0x7f, 0x5b, 0x80, 0xd9, 0x92, 0xa1, 0xdb, 0x58, 0xb7,
-	0x09, 0x1c, 0x21, 0x48, 0xb8, 0xfa, 0xa6, 0x25, 0xfa, 0x1b, 0x2d, 0x42, 0xa2, 0xa5, 0xd8, 0x0a,
-	0x95, 0x3e, 0x57, 0x99, 0x92, 0x68, 0x0b, 0x2d, 0x43, 0xf2, 0xa9, 0xa2, 0xf5, 0x30, 0x75, 0x88,
-	0x74, 0x65, 0x4a, 0x62, 0x4d, 0xf4, 0x36, 0x24, 0x6d, 0xe5, 0x40, 0x63, 0x4e, 0x30, 0xbb, 0x76,
-	0x7d, 0xd4, 0x90, 0x1b, 0x04, 0x91, 0x90, 0x52, 0x8a, 0xf5, 0x59, 0x48, 0x13, 0xd6, 0x54, 0x73,
-	0xf1, 0x53, 0x01, 0x92, 0xb4, 0x1f, 0xdd, 0x81, 0x99, 0x23, 0xac, 0xb4, 0xb0, 0xe9, 0x84, 0xc4,
-	0x8d, 0x51, 0x3c, 0x37, 0x55, 0xac, 0xb5, 0xb6, 0x5a, 0x92, 0x43, 0x83, 0xde, 0x86, 0x84, 0x69,
-	0x3c, 0x23, 0xc6, 0x23, 0xb4, 0x2f, 0x9c, 0xaa, 0xcf, 0x8a, 0x64, 0x3c, 0x93, 0x28, 0x49, 0xe1,
-	0x2e, 0xc4, 0x25, 0xe3, 0x19, 0x7a, 0x1b, 0xa6, 0xe9, 0xd8, 0x1c, 0xf9, 0x23, 0xc7, 0xb4, 0x4f,
-	0x30, 0x25, 0x4e, 0x20, 0xfe, 0xa6, 0x1b, 0xe2, 0x12, 0xb6, 0x7a, 0x9a, 0x8d, 0xbe, 0x0c, 0x29,
-	0xdf, 0x9c, 0x8c, 0x31, 0x1a, 0x8a, 0x2b, 0xb9, 0x44, 0xe8, 0x8b, 0x80, 0x9c, 0xdf, 0xb2, 0x6d,
-	0xf6, 0xf4, 0xa6, 0x62, 0x63, 0x16, 0xe2, 0x29, 0xe9, 0x82, 0xd3, 0xd3, 0x70, 0x3a, 0xc4, 0x3f,
-	0x8f, 0xc1, 0x0c, 0x67, 0x82, 0x16, 0x21, 0xc9, 0xe2, 0x93, 0xcd, 0x2e, 0x6b, 0x04, 0xfd, 0x34,
-	0x76, 0x26, 0x3f, 0xdd, 0x04, 0xf0, 0xa5, 0x9b, 0xf8, 0x44, 0xe9, 0xc6, 0x47, 0x89, 0xee, 0x42,
-	0x4a, 0x33, 0x9a, 0xd4, 0x97, 0xb9, 0xfb, 0x8c, 0xd4, 0xa4, 0xca, 0x71, 0x25, 0x97, 0x0a, 0xbd,
-	0x0b, 0xb3, 0x4d, 0x13, 0x2b, 0x36, 0x96, 0x49, 0xb6, 0xa5, 0x39, 0x66, 0x76, 0xad, 0xe0, 0x31,
-	0x61, 0xf9, 0x7b, 0xa5, 0xe1, 0xe4, 0x6f, 0x09, 0x18, 0x3a, 0x01, 0x88, 0x3f, 0x8e, 0x43, 0xca,
-	0xe1, 0x89, 0xee, 0x02, 0x1c, 0xf4, 0x6d, 0x2c, 0x9b, 0x8a, 0xde, 0x76, 0xe2, 0x77, 0xe4, 0xc4,
-	0x4b, 0x04, 0x51, 0x4a, 0x13, 0x22, 0xfa, 0x13, 0xbd, 0x0f, 0xf3, 0x4d, 0xa3, 0x85, 0xbb, 0x86,
-	0xaa, 0xdb, 0x9c, 0x4d, 0x6c, 0x5c, 0x36, 0x59, 0x97, 0xd2, 0xe1, 0x35, 0xab, 0x76, 0x94, 0x36,
-	0x96, 0x0f, 0x8c, 0x13, 0x4c, 0x92, 0x30, 0xf1, 0x9c, 0x97, 0x46, 0x4e, 0x13, 0x41, 0x77, 0x2d,
-	0x04, 0x94, 0x7a, 0x9d, 0x10, 0xa3, 0x0d, 0x00, 0x13, 0x37, 0x0d, 0xb3, 0x25, 0x1f, 0xe3, 0x3e,
-	0xb7, 0xf3, 0xc8, 0xb0, 0x90, 0x28, 0xf6, 0x7d, 0xdc, 0x97, 0xd2, 0xa6, 0xf3, 0x13, 0xbd, 0x47,
-	0x1c, 0x19, 0x6b, 0x2d, 0x59, 0x6d, 0xe5, 0x93, 0x94, 0xc7, 0x78, 0x61, 0x79, 0xc8, 0x7e, 0xa0,
-	0x5d, 0xc8, 0xd2, 0xa8, 0x97, 0xdd, 0x19, 0x67, 0x93, 0xf5, 0xd2, 0xa9, 0x01, 0xea, 0x0e, 0x2a,
-	0x63, 0xfb, 0x9b, 0xe2, 0x2b, 0x90, 0x09, 0xf4, 0xa3, 0xcb, 0x90, 0x36, 0x8d, 0x67, 0xb2, 0xaa,
-	0xb7, 0xf0, 0x09, 0x4f, 0x80, 0x29, 0xd3, 0x78, 0xb6, 0x45, 0xda, 0xe2, 0x2a, 0x24, 0x99, 0x69,
-	0x17, 0x21, 0x69, 0xd9, 0x8a, 0x69, 0x73, 0x0c, 0xd6, 0x40, 0x39, 0x88, 0x63, 0x9d, 0xc5, 0x55,
-	0x5c, 0x22, 0x3f, 0xc5, 0x26, 0x64, 0x02, 0x36, 0x25, 0x28, 0xb6, 0xd1, 0xa5, 0x64, 0x49, 0x89,
-	0xfc, 0x24, 0xd9, 0x53, 0xc3, 0x87, 0x36, 0xcf, 0xd3, 0xf4, 0x37, 0x61, 0xff, 0x4c, 0x6d, 0xd9,
-	0x47, 0x7c, 0xe1, 0x64, 0x0d, 0xb4, 0x0c, 0xd3, 0x47, 0x58, 0x6d, 0x1f, 0xd9, 0xd4, 0xfe, 0x49,
-	0x89, 0xb7, 0xc4, 0x5f, 0x24, 0x61, 0x51, 0xc2, 0x2d, 0x85, 0x2e, 0x66, 0x24, 0x2b, 0x4b, 0xf8,
-	0x49, 0x0f, 0x5b, 0x36, 0x31, 0x97, 0xca, 0x12, 0x89, 0xdc, 0xa4, 0x69, 0x9e, 0xbb, 0xe4, 0x4b,
-	0x63, 0xaf, 0x8b, 0x52, 0x46, 0x0d, 0x14, 0x1b, 0x77, 0x20, 0x49, 0x12, 0xad, 0x93, 0x18, 0x5f,
-	0x1c, 0xb9, 0xf8, 0x79, 0x4b, 0x84, 0xc4, 0xa8, 0x50, 0x1b, 0xe6, 0x4d, 0xdc, 0xd5, 0x94, 0x26,
-	0xe6, 0x0a, 0x39, 0x5e, 0xf9, 0xde, 0x68, 0x57, 0x1a, 0x1c, 0xdb, 0x8a, 0xc4, 0xf8, 0x70, 0x35,
-	0xb3, 0xa6, 0xbf, 0x69, 0xa1, 0x4f, 0xe0, 0x22, 0x73, 0x7d, 0x93, 0xd2, 0xaa, 0x86, 0xee, 0x0a,
-	0x4c, 0x50, 0x81, 0xe5, 0x89, 0x05, 0xd2, 0x79, 0x94, 0x1c, 0x76, 0x5c, 0xee, 0x92, 0x1a, 0x01,
-	0xa5, 0xeb, 0x7a, 0x40, 0xbf, 0x73, 0x5a, 0xd7, 0x1d, 0xdb, 0x3d, 0x53, 0xed, 0x23, 0xea, 0x2f,
-	0x69, 0x69, 0x96, 0xc3, 0x1e, 0xaa, 0xf6, 0x51, 0xe1, 0xdf, 0x04, 0x58, 0x8c, 0x52, 0x13, 0x95,
-	0xce, 0x28, 0xbe, 0x32, 0xe5, 0x53, 0xe0, 0x16, 0x99, 0x3c, 0xc2, 0x57, 0x56, 0x34, 0x4d, 0xb6,
-	0xf1, 0x09, 0xf3, 0xd9, 0x54, 0x65, 0x4a, 0xca, 0xb0, 0x8e, 0xa2, 0xa6, 0x35, 0xf0, 0x89, 0x4d,
-	0x92, 0x98, 0xdf, 0xee, 0x9a, 0x61, 0x52, 0x47, 0x3e, 0x25, 0x89, 0x95, 0x08, 0x22, 0x99, 0x49,
-	0x57, 0x77, 0xcd, 0x30, 0xd7, 0x53, 0x30, 0x6d, 0x2b, 0x66, 0x1b, 0xdb, 0x62, 0x09, 0x92, 0x14,
-	0x44, 0x62, 0xc8, 0xc4, 0x2d, 0x3a, 0x8e, 0x98, 0x44, 0x7e, 0x92, 0x78, 0x69, 0x9b, 0x18, 0xeb,
-	0x54, 0xa1, 0x98, 0xc4, 0x1a, 0x24, 0xb2, 0x0e, 0x9c, 0x62, 0x23, 0x26, 0xd1, 0xdf, 0xe2, 0x3e,
-	0x2c, 0x85, 0x66, 0xd7, 0xea, 0x1a, 0xba, 0x85, 0x3d, 0xcf, 0x16, 0xce, 0xe2, 0xd9, 0xe2, 0x37,
-	0x62, 0x90, 0xdf, 0xc0, 0x6a, 0x0b, 0xeb, 0xb6, 0x7a, 0xd8, 0x0f, 0xc5, 0xe1, 0x63, 0xb8, 0xd0,
-	0x72, 0xfb, 0x82, 0xa1, 0xf8, 0xca, 0x28, 0x39, 0x01, 0x86, 0xc4, 0xdd, 0x72, 0xad, 0x10, 0x24,
-	0x22, 0xc4, 0x63, 0xe7, 0x15, 0xe2, 0xf1, 0x33, 0x19, 0xe2, 0x2f, 0x05, 0xb8, 0x14, 0x61, 0x88,
-	0x73, 0xb1, 0x32, 0x7a, 0x00, 0x69, 0xab, 0xd7, 0xe9, 0x28, 0xa6, 0x8a, 0x9d, 0x14, 0xf4, 0xda,
-	0x58, 0x06, 0x54, 0x59, 0xfa, 0xad, 0x53, 0xe2, 0xbe, 0xe4, 0x71, 0x11, 0xbf, 0x2f, 0xc0, 0x92,
-	0x67, 0x8f, 0x5f, 0xe6, 0xec, 0x29, 0xfe, 0x3a, 0x2c, 0x87, 0x35, 0xe5, 0x66, 0x2d, 0xc1, 0x8c,
-	0x49, 0x4b, 0x45, 0xc7, 0xb0, 0xe3, 0xe8, 0xc8, 0x8a, 0x4b, 0xc9, 0xa1, 0x14, 0xff, 0x37, 0x06,
-	0x57, 0x4a, 0xb4, 0xb0, 0xe1, 0x08, 0xee, 0x1e, 0xe1, 0xf3, 0xb3, 0xc8, 0x2e, 0x64, 0xf9, 0x96,
-	0x7a, 0x02, 0xf7, 0xad, 0x33, 0x0a, 0x87, 0xa3, 0xe5, 0x6f, 0xa2, 0x06, 0x64, 0x8c, 0x9e, 0xdd,
-	0xed, 0xb9, 0x2a, 0xb2, 0xcc, 0xb3, 0x3a, 0x8a, 0x61, 0x8d, 0x12, 0x04, 0xd9, 0xce, 0x31, 0x2e,
-	0x9c, 0xeb, 0x3e, 0xe4, 0xdc, 0x73, 0x02, 0x87, 0x31, 0x2b, 0x60, 0x5e, 0x1e, 0xc9, 0x38, 0xb8,
-	0xcb, 0x92, 0xe6, 0x8d, 0x20, 0x40, 0xfc, 0xa1, 0x00, 0x0b, 0x11, 0xd2, 0x51, 0xd1, 0xd9, 0x10,
-	0x8d, 0x61, 0xe0, 0x75, 0xb5, 0xfd, 0xa0, 0x87, 0xcd, 0x7e, 0x70, 0x63, 0x84, 0x1e, 0xc0, 0x9c,
-	0x63, 0xda, 0xae, 0xc2, 0xd7, 0x8b, 0x53, 0xf2, 0x4d, 0x49, 0x33, 0x7a, 0x2d, 0xae, 0xc8, 0xae,
-	0x62, 0x1f, 0x55, 0xa6, 0xa4, 0x59, 0xcb, 0x6b, 0xae, 0x4f, 0xb3, 0x8d, 0x9e, 0xd8, 0x01, 0xe4,
-	0xac, 0x10, 0x75, 0x5b, 0xb1, 0x55, 0xcb, 0x56, 0x9b, 0xd6, 0x79, 0xac, 0x71, 0x8b, 0x90, 0x6c,
-	0x1a, 0x3d, 0xdd, 0xe6, 0x25, 0x14, 0x6b, 0x88, 0x3f, 0x4c, 0x40, 0x3e, 0xec, 0x92, 0xdb, 0xd8,
-	0x56, 0xe8, 0x96, 0xf2, 0x45, 0x98, 0xef, 0x9a, 0x46, 0x13, 0x5b, 0x16, 0x6e, 0xc9, 0xa4, 0x8e,
-	0x76, 0xb6, 0xad, 0x59, 0x17, 0xbc, 0x4e, 0xa0, 0x68, 0x0d, 0x96, 0x6c, 0xc3, 0x56, 0x34, 0x19,
-	0x5b, 0xb6, 0xda, 0x21, 0xfb, 0x1c, 0x8e, 0x9e, 0xa0, 0xe8, 0x0b, 0xb4, 0xb3, 0xec, 0xf4, 0x31,
-	0x9a, 0x7d, 0x98, 0xf7, 0x8e, 0x16, 0x2c, 0x5b, 0xb1, 0x9d, 0xd0, 0x5d, 0x19, 0x67, 0x60, 0x9e,
-	0x6d, 0x88, 0xdb, 0x7b, 0x30, 0x2b, 0xbc, 0xe3, 0x88, 0x4f, 0xb2, 0xe3, 0x40, 0x32, 0x2c, 0x9b,
-	0x2c, 0x20, 0xe5, 0x50, 0x34, 0x26, 0x27, 0x8d, 0xc6, 0x45, 0xce, 0x28, 0x78, 0xa2, 0xe4, 0x13,
-	0x10, 0x0a, 0xce, 0xe9, 0x49, 0x83, 0xd3, 0x11, 0x10, 0xf4, 0xee, 0x26, 0x2c, 0x39, 0x02, 0x82,
-	0xb1, 0x3a, 0x73, 0xb6, 0x58, 0x5d, 0xe0, 0xdc, 0x6a, 0xbe, 0x90, 0x15, 0x5f, 0x71, 0xb3, 0xa5,
-	0x2f, 0x8f, 0xd1, 0xed, 0x34, 0x82, 0x84, 0xae, 0x74, 0xdc, 0xf3, 0x0a, 0xf2, 0x5b, 0xfc, 0xba,
-	0x00, 0x85, 0xaa, 0xea, 0x5a, 0xc2, 0x39, 0xeb, 0x70, 0x32, 0x5f, 0x04, 0x09, 0xd9, 0x29, 0x74,
-	0x89, 0x6d, 0x2c, 0xf5, 0x63, 0xcc, 0xab, 0xf7, 0x14, 0x01, 0xd4, 0xd5, 0x8f, 0x31, 0xba, 0x02,
-	0x40, 0x3b, 0x6d, 0xe3, 0x18, 0xeb, 0xec, 0xb8, 0x43, 0xa2, 0xe8, 0x0d, 0x02, 0x20, 0xa5, 0xfc,
-	0xa1, 0xaa, 0xd9, 0xd8, 0xa4, 0xde, 0x97, 0x96, 0x78, 0x4b, 0xfc, 0xa6, 0x00, 0x97, 0x23, 0xd5,
-	0xe0, 0x89, 0xbe, 0x08, 0xd3, 0x2c, 0x5d, 0x4f, 0x90, 0x79, 0x79, 0x9e, 0xe7, 0x84, 0xe8, 0x26,
-	0xcc, 0xeb, 0xf8, 0xc4, 0x96, 0x7d, 0xea, 0xb1, 0x52, 0x32, 0x43, 0xc0, 0xbb, 0x8e, 0x8a, 0xe2,
-	0x9f, 0x0a, 0xb0, 0xe0, 0x78, 0xf2, 0x06, 0xb6, 0x9a, 0xa6, 0xda, 0xa5, 0x3b, 0x98, 0x28, 0x53,
-	0x5c, 0x87, 0xb9, 0x96, 0x6a, 0x75, 0x35, 0xa5, 0x2f, 0xd3, 0x3e, 0x5e, 0x9b, 0x72, 0xd8, 0x0e,
-	0x41, 0xa9, 0x01, 0x34, 0x15, 0x1b, 0xb7, 0x0d, 0xba, 0x76, 0xb3, 0xda, 0x62, 0xe4, 0x44, 0x97,
-	0x18, 0x76, 0xdf, 0x27, 0x5b, 0xf2, 0xb1, 0x10, 0x1f, 0xc2, 0x22, 0xb3, 0x14, 0x3f, 0x4c, 0x73,
-	0xa6, 0xaa, 0x00, 0x29, 0x8e, 0xd5, 0xe7, 0x3a, 0xba, 0x6d, 0x74, 0x03, 0x32, 0x9a, 0xa2, 0xb7,
-	0x7b, 0xcc, 0xa5, 0x5b, 0x8e, 0xa2, 0x73, 0x0e, 0xb0, 0x64, 0xb4, 0xb0, 0xd8, 0x86, 0xa5, 0x10,
-	0x63, 0x6e, 0xfc, 0x9d, 0x88, 0x93, 0xd6, 0xd5, 0x71, 0x12, 0x81, 0x7f, 0x08, 0xde, 0xa1, 0xab,
-	0x58, 0x85, 0x85, 0x88, 0x41, 0x9e, 0xd1, 0xc0, 0xe2, 0x5d, 0xb8, 0x44, 0xd4, 0x96, 0x0c, 0xc3,
-	0x2e, 0xb9, 0x56, 0x72, 0x8c, 0x32, 0x30, 0x70, 0x21, 0x62, 0xe0, 0x1d, 0x16, 0x02, 0x61, 0x0e,
-	0x7c, 0xf4, 0xc1, 0x09, 0x14, 0x3e, 0xfb, 0x04, 0xfe, 0x9d, 0x00, 0xcf, 0x15, 0x75, 0x45, 0xeb,
-	0x7f, 0x8c, 0x37, 0x14, 0x5b, 0xa9, 0x1b, 0x3d, 0xb3, 0x89, 0x25, 0xd5, 0x3a, 0xf6, 0x95, 0x1b,
-	0x9c, 0xaf, 0xdc, 0xc1, 0xb6, 0xa9, 0x36, 0xc7, 0x71, 0xfa, 0x5d, 0x06, 0xdb, 0xa6, 0x04, 0x52,
-	0xa6, 0xeb, 0x6f, 0xa2, 0x2a, 0xcc, 0x59, 0x54, 0x8c, 0xcc, 0x56, 0xd7, 0xf8, 0x84, 0xab, 0xab,
-	0x34, 0xcb, 0xc8, 0x69, 0x43, 0xfc, 0xa7, 0x19, 0xc8, 0x04, 0xc4, 0xa1, 0xa7, 0xb0, 0xac, 0xf7,
-	0x3a, 0xd8, 0x54, 0x9b, 0x8a, 0xc6, 0xd6, 0x8b, 0x60, 0xa1, 0xf4, 0xde, 0xd8, 0x9a, 0xaf, 0xec,
-	0x38, 0x7c, 0xe8, 0x8a, 0xc1, 0x72, 0x5a, 0x65, 0x4a, 0x5a, 0xd4, 0x23, 0xe0, 0xe8, 0x37, 0x20,
-	0xef, 0x18, 0x76, 0x40, 0x32, 0x5b, 0xf7, 0xef, 0x8e, 0x2f, 0xb9, 0xe4, 0x71, 0x0a, 0xca, 0x5e,
-	0x6e, 0x46, 0xf6, 0xa0, 0xaf, 0x00, 0x3a, 0x96, 0x15, 0xdd, 0xd0, 0xfb, 0x1d, 0xd5, 0xee, 0x07,
-	0xeb, 0xae, 0x77, 0xc6, 0x97, 0x7b, 0xbf, 0xe8, 0xb0, 0x70, 0x25, 0xe6, 0x8e, 0x43, 0x30, 0x22,
-	0x4b, 0x93, 0x5b, 0xea, 0x53, 0x6c, 0x5a, 0x3e, 0x59, 0x89, 0x49, 0x65, 0x55, 0x37, 0x1c, 0x16,
-	0x9e, 0x2c, 0x2d, 0x04, 0x2b, 0x3c, 0x80, 0xc5, 0xa8, 0x59, 0x40, 0x6f, 0x43, 0x92, 0x1e, 0x48,
-	0xf1, 0x49, 0x1d, 0xeb, 0x08, 0x8b, 0x51, 0x14, 0xea, 0xb0, 0x1c, 0x6d, 0xde, 0xcf, 0xc2, 0xf4,
-	0xdb, 0x02, 0xe4, 0xc2, 0xc6, 0x43, 0x77, 0x21, 0xfd, 0xa4, 0xa7, 0x58, 0xaa, 0xac, 0xb6, 0x26,
-	0x3a, 0x02, 0x4f, 0x51, 0xaa, 0xad, 0x16, 0xad, 0xe7, 0xc8, 0xde, 0xc9, 0xee, 0xcb, 0x6a, 0x6b,
-	0x9c, 0x33, 0xde, 0x32, 0x45, 0x26, 0x2c, 0x30, 0xff, 0x55, 0xf8, 0x81, 0x00, 0xb9, 0xb0, 0xa9,
-	0xcf, 0x41, 0xb3, 0x06, 0x2c, 0x58, 0x58, 0xb7, 0x54, 0x5b, 0x7d, 0x8a, 0x65, 0xc5, 0xb6, 0x4d,
-	0xf5, 0xa0, 0x67, 0x3b, 0x07, 0xa5, 0x63, 0xf1, 0x42, 0x2e, 0x7d, 0xd1, 0x21, 0x77, 0xab, 0xdb,
-	0x3f, 0x8b, 0xc1, 0x15, 0x92, 0x86, 0x68, 0x6e, 0xb2, 0x54, 0x6b, 0xb0, 0xe6, 0x0c, 0x95, 0x6f,
-	0xc2, 0x44, 0xe5, 0x5b, 0x13, 0xf2, 0xbc, 0x5c, 0xc1, 0x2d, 0x39, 0x94, 0xdf, 0x62, 0x93, 0xe6,
-	0xb7, 0x65, 0x97, 0x55, 0x30, 0x11, 0x79, 0x25, 0x1c, 0x6e, 0xc9, 0x9f, 0x2d, 0xe5, 0x2d, 0xba,
-	0x8c, 0xea, 0xbe, 0xdc, 0xf7, 0xcf, 0xcb, 0x70, 0x39, 0xd2, 0x48, 0xbc, 0xc6, 0xfa, 0xba, 0x30,
-	0x98, 0x0a, 0x79, 0xe5, 0xc2, 0x34, 0xa8, 0x8e, 0x3c, 0x80, 0x1b, 0xce, 0x39, 0x94, 0x18, 0x19,
-	0x70, 0x30, 0x31, 0x72, 0x35, 0x7e, 0x57, 0x88, 0xca, 0x8c, 0x5c, 0x11, 0x96, 0x35, 0x76, 0xce,
-	0xaa, 0x48, 0x38, 0x90, 0x5d, 0x55, 0x06, 0xf2, 0x24, 0x57, 0xe6, 0x24, 0x98, 0x27, 0xb9, 0x16,
-	0xac, 0x68, 0xaf, 0x9c, 0x55, 0x0b, 0x2f, 0xf0, 0x5d, 0xf9, 0xbe, 0xac, 0xe9, 0x49, 0xf6, 0x67,
-	0x4d, 0x2e, 0x79, 0xfa, 0xb3, 0x49, 0xf6, 0x02, 0xdb, 0x93, 0xac, 0x85, 0x60, 0x85, 0xff, 0x10,
-	0xc2, 0x49, 0x94, 0xab, 0xf4, 0x1e, 0xa4, 0x3b, 0xaa, 0x2e, 0xb3, 0xcf, 0x81, 0x63, 0x7c, 0x29,
-	0x61, 0x9f, 0xc8, 0x52, 0x1d, 0x55, 0xa7, 0xbf, 0x28, 0xbd, 0x72, 0xc2, 0xe9, 0x63, 0xe3, 0xd3,
-	0x2b, 0x27, 0x8c, 0xfe, 0x7d, 0x98, 0x7f, 0xd2, 0x53, 0x74, 0x5b, 0xd5, 0xb0, 0xcc, 0x3f, 0xd4,
-	0x25, 0xc6, 0xfd, 0x50, 0x97, 0x75, 0x28, 0x69, 0xd3, 0x2a, 0xfc, 0x67, 0x7c, 0x30, 0xad, 0xf3,
-	0x61, 0xfe, 0x48, 0x80, 0xeb, 0x94, 0xbd, 0x7c, 0x48, 0xe3, 0x48, 0x6f, 0xf6, 0xe5, 0x23, 0xd5,
-	0xb2, 0x8d, 0xb6, 0xa9, 0x74, 0xe4, 0x83, 0x5e, 0xf3, 0x18, 0xdb, 0x56, 0x3e, 0x49, 0x25, 0xeb,
-	0xe7, 0xeb, 0x89, 0x03, 0xe0, 0x8a, 0x23, 0x77, 0x9d, 0x8a, 0x95, 0xbe, 0x40, 0x15, 0xdb, 0x74,
-	0xf4, 0x0a, 0x75, 0x5b, 0x85, 0x3f, 0x88, 0xc1, 0xd5, 0x53, 0x78, 0xa0, 0x3b, 0x70, 0x39, 0x3c,
-	0x3c, 0xcd, 0x78, 0x86, 0x4d, 0xf9, 0xc0, 0xe8, 0xe9, 0x2d, 0xbe, 0x15, 0xcf, 0x07, 0x05, 0x55,
-	0x09, 0xc2, 0x3a, 0xe9, 0x8f, 0x22, 0xef, 0x75, 0xbb, 0x2e, 0x79, 0x2c, 0x8a, 0x7c, 0x8f, 0x20,
-	0x30, 0xf2, 0xab, 0x30, 0xcb, 0x4c, 0xc8, 0x36, 0x61, 0x71, 0x8a, 0x0e, 0x0c, 0x44, 0xb7, 0x61,
-	0x35, 0xc8, 0x70, 0x84, 0xc0, 0x1c, 0xdf, 0x3e, 0x75, 0x8e, 0x5d, 0x69, 0xd2, 0x1c, 0x63, 0xc0,
-	0xa7, 0xfa, 0x67, 0x49, 0xff, 0x5a, 0xcb, 0x27, 0xf9, 0xaf, 0x04, 0xb8, 0x81, 0x9f, 0xf4, 0xd4,
-	0xa7, 0x8a, 0x86, 0xf5, 0x26, 0x96, 0x9b, 0x9a, 0x62, 0x59, 0x43, 0xa7, 0xf9, 0xe0, 0xbc, 0x42,
-	0xdd, 0x07, 0x08, 0x4f, 0xed, 0x35, 0x9f, 0x3a, 0x25, 0xa2, 0xcd, 0xc0, 0xe4, 0x7e, 0x47, 0x80,
-	0x82, 0x47, 0x5f, 0x0e, 0xa1, 0xa3, 0xfb, 0x90, 0x73, 0x17, 0x69, 0x79, 0xd2, 0x0f, 0xd9, 0x59,
-	0x67, 0xa5, 0x66, 0x46, 0x43, 0xaf, 0xc3, 0xf2, 0xa0, 0x79, 0xdc, 0x6d, 0x73, 0x5c, 0x5a, 0x0c,
-	0x6b, 0x4b, 0xe6, 0xae, 0xf0, 0xf3, 0x18, 0x5c, 0x1a, 0x3a, 0x42, 0xf4, 0x3e, 0x88, 0xd1, 0x3c,
-	0x23, 0xfc, 0xef, 0x0b, 0x51, 0xfc, 0x7d, 0x5e, 0x38, 0x9c, 0xd7, 0xa0, 0x33, 0x46, 0xf2, 0x9a,
-	0xc4, 0x25, 0xbf, 0x29, 0x44, 0xfb, 0x64, 0xf3, 0x73, 0x70, 0x8b, 0xf0, 0xb4, 0x86, 0x9c, 0xf9,
-	0x1b, 0x33, 0xfe, 0xf2, 0x8c, 0x3b, 0xf3, 0x4f, 0x04, 0x78, 0xd9, 0xab, 0xae, 0xc6, 0xcd, 0x5d,
-	0x07, 0xe7, 0xb5, 0x8a, 0xf8, 0x00, 0x61, 0xa7, 0x7e, 0xd1, 0x55, 0x6b, 0x7f, 0x74, 0xe2, 0xfa,
-	0x49, 0x0c, 0x0a, 0x1e, 0x9b, 0x5f, 0x42, 0xdf, 0x46, 0x45, 0xb8, 0xa2, 0xf7, 0x3a, 0x72, 0x4b,
-	0xb5, 0x6c, 0x55, 0x6f, 0xda, 0x72, 0xc8, 0xe0, 0x16, 0xf7, 0x9b, 0x82, 0xde, 0xeb, 0x6c, 0x70,
-	0x9c, 0x7a, 0x60, 0xf0, 0x16, 0xfa, 0x10, 0x16, 0x6d, 0xa3, 0x3b, 0x48, 0x39, 0x79, 0x86, 0x43,
-	0xb6, 0xd1, 0x0d, 0x71, 0x2f, 0xfc, 0x77, 0x0c, 0x2e, 0x0d, 0x9d, 0x09, 0xb4, 0x0b, 0x2f, 0x0c,
-	0x77, 0x91, 0xc1, 0xf8, 0xbb, 0x3e, 0x64, 0xe2, 0x7c, 0x21, 0x38, 0x92, 0xe3, 0x60, 0x14, 0x0e,
-	0xe3, 0xf8, 0xff, 0x1a, 0x88, 0x23, 0x5c, 0x79, 0x74, 0x20, 0xae, 0xa7, 0x9c, 0x63, 0x3d, 0x51,
-	0x86, 0x6c, 0x70, 0x44, 0xe8, 0x2d, 0xe7, 0xce, 0xd4, 0xd8, 0x45, 0x12, 0xbf, 0x54, 0x15, 0x7d,
-	0x98, 0xfe, 0xaf, 0x31, 0x48, 0xb2, 0x0a, 0xe8, 0x05, 0xc8, 0xa8, 0xba, 0x8d, 0xdb, 0xd8, 0xf4,
-	0x55, 0x61, 0xf1, 0xca, 0x94, 0x34, 0xc7, 0xc1, 0x0c, 0xed, 0x3a, 0xcc, 0x1e, 0x6a, 0x86, 0x62,
-	0xfb, 0x4a, 0x2d, 0xa1, 0x32, 0x25, 0x01, 0x05, 0x32, 0x94, 0x1b, 0x30, 0x67, 0xd9, 0xa6, 0xaa,
-	0xb7, 0xe5, 0xe0, 0xed, 0xae, 0x59, 0x06, 0x75, 0xc5, 0x1d, 0x18, 0x86, 0x86, 0x15, 0xa7, 0xe8,
-	0x4b, 0xf0, 0x8f, 0xc7, 0x73, 0x1c, 0xcc, 0xd0, 0xca, 0x30, 0xef, 0x5e, 0x94, 0xe4, 0x88, 0xc9,
-	0xd3, 0xf6, 0x57, 0x95, 0x29, 0x29, 0xeb, 0x12, 0x31, 0x36, 0x6f, 0x01, 0x10, 0x08, 0xe7, 0xc0,
-	0x2a, 0xdd, 0x65, 0x87, 0x03, 0xd9, 0xe6, 0x51, 0xea, 0xda, 0xe1, 0x86, 0xd2, 0xaf, 0x4c, 0x49,
-	0x69, 0x82, 0xcb, 0x08, 0xd7, 0x00, 0x5a, 0x64, 0x67, 0xc7, 0x08, 0xd9, 0x81, 0xf4, 0x85, 0x00,
-	0xe1, 0x86, 0x62, 0x63, 0x42, 0x43, 0xd0, 0x28, 0x8d, 0xbb, 0x73, 0xfc, 0xed, 0x18, 0xe4, 0xc2,
-	0xdf, 0x6c, 0xd1, 0x13, 0xb8, 0xe4, 0x7d, 0x43, 0xb0, 0x4d, 0x45, 0xb7, 0x0e, 0x0d, 0xb3, 0xc3,
-	0x6e, 0x9c, 0xf2, 0x39, 0x7d, 0x6d, 0x9c, 0x43, 0xc4, 0x46, 0x90, 0xb4, 0x32, 0x25, 0x5d, 0x54,
-	0xa3, 0xbb, 0xd0, 0x57, 0xc8, 0xee, 0x8f, 0x5e, 0xd6, 0x09, 0xcb, 0x63, 0x85, 0xf2, 0xab, 0xa7,
-	0x5f, 0xdc, 0x19, 0x94, 0xb6, 0x64, 0x46, 0x75, 0xac, 0xe7, 0x20, 0x1b, 0x14, 0x22, 0xfe, 0x68,
-	0x06, 0x2e, 0xee, 0x9a, 0x6a, 0x87, 0x86, 0x67, 0x10, 0x1d, 0x3d, 0x84, 0x6c, 0xf0, 0x02, 0x08,
-	0xb7, 0xc0, 0xca, 0x68, 0x8d, 0x28, 0x05, 0xb5, 0xb5, 0x7b, 0x5c, 0x93, 0x09, 0xdc, 0xf8, 0x20,
-	0x85, 0x1e, 0xbf, 0x9c, 0x10, 0x38, 0xf6, 0xba, 0x35, 0xd6, 0x35, 0x0f, 0xc6, 0x71, 0xce, 0xf4,
-	0xb5, 0x11, 0x86, 0xa5, 0xe6, 0x91, 0x62, 0x2a, 0x4d, 0x1b, 0x9b, 0x72, 0x47, 0xb1, 0x8e, 0x27,
-	0xf8, 0x9e, 0x58, 0x72, 0x08, 0xb7, 0x15, 0xeb, 0xd8, 0xe5, 0xbf, 0xd0, 0x1c, 0x04, 0xa3, 0x3e,
-	0x5c, 0x69, 0x9a, 0xfd, 0xae, 0x6d, 0xc8, 0x8e, 0x5d, 0x0e, 0x0f, 0x4f, 0xe4, 0xc3, 0x2e, 0x0e,
-	0x1e, 0x6d, 0xbd, 0x31, 0x52, 0x1c, 0x65, 0xc0, 0xad, 0xb4, 0x79, 0x78, 0xb2, 0xd9, 0xf5, 0xcc,
-	0x74, 0xa9, 0x39, 0xac, 0x13, 0xf5, 0xe0, 0xf2, 0xa1, 0x7a, 0x82, 0x5b, 0xac, 0xd2, 0x61, 0xf9,
-	0x88, 0xc4, 0x70, 0xe0, 0x63, 0xd2, 0xeb, 0xa3, 0x4f, 0x53, 0x4e, 0x70, 0x8b, 0xe4, 0xd2, 0x75,
-	0x87, 0xd8, 0x95, 0x9b, 0x3f, 0x1c, 0xd2, 0x87, 0x1e, 0x41, 0x6e, 0x40, 0xd6, 0xf4, 0xe9, 0x9f,
-	0x52, 0x07, 0x45, 0xcc, 0x1f, 0x84, 0x38, 0xf7, 0xe1, 0x8a, 0xff, 0x86, 0x8c, 0x77, 0x57, 0x37,
-	0xf8, 0x79, 0xe9, 0x8d, 0x31, 0x7c, 0xed, 0xa1, 0x6a, 0x1f, 0x39, 0x81, 0xe7, 0xd9, 0xd2, 0x1c,
-	0xd6, 0x89, 0xf6, 0x21, 0x47, 0xd3, 0x4d, 0x57, 0x31, 0x5d, 0x0f, 0x4c, 0x51, 0x69, 0x23, 0x17,
-	0x62, 0x92, 0x83, 0x76, 0x15, 0xd3, 0xf3, 0x41, 0x9a, 0xc6, 0x3c, 0x08, 0xfa, 0x10, 0x10, 0x77,
-	0x8f, 0x23, 0xc5, 0x3a, 0x72, 0x38, 0xa7, 0xc7, 0xf8, 0x94, 0x4b, 0xa9, 0x2a, 0x8a, 0x75, 0xe4,
-	0x1d, 0x70, 0x36, 0x43, 0xb0, 0x88, 0xd8, 0xfd, 0x1f, 0x01, 0xb2, 0x41, 0xa5, 0xd0, 0x07, 0x30,
-	0x4f, 0x47, 0x65, 0x1b, 0x32, 0x3e, 0xb1, 0x89, 0x03, 0xd3, 0x98, 0xcd, 0x8e, 0xce, 0x5a, 0x41,
-	0x26, 0x6e, 0x53, 0xca, 0x10, 0x5e, 0x0d, 0xa3, 0xcc, 0x38, 0x89, 0x5f, 0x13, 0x20, 0xe5, 0xf4,
-	0xa1, 0x4b, 0xb0, 0xd4, 0xd8, 0xda, 0x2e, 0xcb, 0xbb, 0x45, 0xa9, 0x21, 0xef, 0xed, 0xd4, 0x77,
-	0xcb, 0xa5, 0xad, 0xcd, 0xad, 0xf2, 0x46, 0x6e, 0x0a, 0xa5, 0x20, 0xf1, 0xb8, 0x5c, 0x94, 0x72,
-	0x02, 0x4a, 0x43, 0x72, 0xbb, 0xb6, 0xd3, 0xa8, 0xe4, 0x62, 0x28, 0x07, 0x73, 0x1b, 0xc5, 0xc7,
-	0x72, 0x6d, 0x53, 0x66, 0x90, 0x38, 0x9a, 0x87, 0x59, 0x0e, 0x79, 0x58, 0x2e, 0xdf, 0xcf, 0x25,
-	0x08, 0x0a, 0xf9, 0x45, 0x20, 0x94, 0x3e, 0x49, 0x50, 0x2a, 0xb5, 0x3d, 0x89, 0x40, 0x36, 0x8a,
-	0x8f, 0x73, 0xd3, 0xe2, 0x23, 0xc8, 0x85, 0x8d, 0x85, 0x36, 0x00, 0xb8, 0xd9, 0x8f, 0x71, 0x9f,
-	0xa7, 0xa8, 0x17, 0x4e, 0x37, 0x37, 0xbd, 0xed, 0xd8, 0x74, 0x7e, 0x8a, 0x0d, 0x40, 0x83, 0xa9,
-	0x0b, 0xbd, 0x07, 0x69, 0x1d, 0x3f, 0x9b, 0xf8, 0xe0, 0x43, 0xc7, 0xcf, 0xe8, 0x2f, 0xf1, 0x32,
-	0x5c, 0x1a, 0xea, 0xa4, 0x62, 0x16, 0xe6, 0xfc, 0x59, 0x4d, 0xfc, 0x97, 0x18, 0x64, 0x48, 0x36,
-	0xb2, 0x1a, 0xc6, 0x56, 0x5b, 0x37, 0x4c, 0x8c, 0x56, 0x00, 0xb9, 0x79, 0xc8, 0x22, 0x93, 0x6a,
-	0x1d, 0xab, 0xec, 0x3e, 0x62, 0x9a, 0xfa, 0x88, 0xdb, 0xd7, 0x30, 0xea, 0xc7, 0x6a, 0x17, 0xf5,
-	0xe1, 0x72, 0xd3, 0xe8, 0x74, 0x0c, 0x5d, 0x0e, 0x92, 0xa9, 0x94, 0x1d, 0x7f, 0x26, 0xf0, 0x2b,
-	0xa7, 0x65, 0x43, 0x57, 0xbe, 0x97, 0x1b, 0xef, 0x99, 0x46, 0x8f, 0xac, 0xdc, 0x79, 0xc6, 0xbe,
-	0xe4, 0x13, 0xcc, 0x50, 0xc5, 0xdf, 0x13, 0x20, 0x1b, 0x44, 0x47, 0x57, 0xe1, 0x72, 0xa9, 0x52,
-	0x94, 0x8a, 0xa5, 0x46, 0x59, 0x92, 0xef, 0x49, 0xb5, 0xbd, 0xdd, 0x90, 0xa3, 0xcc, 0xc2, 0xcc,
-	0xce, 0xde, 0x76, 0x59, 0xda, 0x2a, 0xe5, 0x04, 0xb4, 0x08, 0xb9, 0x62, 0x75, 0xb7, 0x52, 0x94,
-	0xf7, 0x76, 0x77, 0xcb, 0x92, 0x5c, 0x2a, 0xd6, 0xcb, 0xb9, 0x98, 0x07, 0xad, 0xd6, 0x1e, 0x3a,
-	0x50, 0xea, 0x3a, 0xbb, 0x7b, 0x3b, 0xa5, 0xc6, 0x5e, 0xb1, 0xb1, 0x55, 0xdb, 0xc9, 0x25, 0x50,
-	0x16, 0xe0, 0x61, 0x65, 0xab, 0x51, 0xae, 0xef, 0x16, 0x4b, 0xe5, 0x5c, 0x72, 0x7d, 0x0e, 0xc0,
-	0xb3, 0x80, 0xf8, 0x5f, 0x02, 0x2c, 0x44, 0xa4, 0x79, 0xf4, 0x32, 0x5c, 0x20, 0x8b, 0x05, 0xcd,
-	0x6d, 0x4e, 0x37, 0xff, 0xd8, 0x96, 0xe3, 0x1d, 0x2e, 0x19, 0x7a, 0x1e, 0xb2, 0x7a, 0xaf, 0x73,
-	0x80, 0x4d, 0x62, 0x50, 0xd2, 0xcb, 0x3f, 0x23, 0xcf, 0x31, 0x68, 0xc3, 0x20, 0x8c, 0xd1, 0x0d,
-	0xb2, 0xb4, 0x91, 0x3a, 0x12, 0xcb, 0x86, 0xd9, 0xc2, 0xec, 0x2e, 0x5d, 0x8a, 0x2c, 0x57, 0x14,
-	0x58, 0x23, 0x30, 0xf4, 0x01, 0x2c, 0x46, 0xce, 0x4f, 0xe2, 0xf4, 0xeb, 0x40, 0x81, 0xf9, 0x91,
-	0x50, 0x73, 0x70, 0x22, 0x3e, 0x15, 0x20, 0x3f, 0x2c, 0xd7, 0xa3, 0x75, 0x98, 0x0d, 0x57, 0xfc,
-	0x63, 0x79, 0x34, 0x68, 0x5e, 0xf5, 0xbf, 0x0e, 0xb3, 0xe1, 0x1a, 0x7f, 0x3c, 0x1e, 0xbd, 0x91,
-	0xf5, 0xbe, 0xe0, 0xaf, 0xf7, 0xc5, 0xef, 0xc5, 0x60, 0x3e, 0xac, 0x7c, 0x15, 0x66, 0x9c, 0x7d,
-	0x2c, 0xdb, 0x01, 0xae, 0x4d, 0xb0, 0x06, 0xf1, 0xb6, 0xe4, 0xb0, 0x28, 0xfc, 0x54, 0x80, 0x69,
-	0xbe, 0x43, 0x7a, 0x0d, 0xe2, 0x1d, 0x55, 0x1f, 0xdf, 0x1a, 0x04, 0x9b, 0x12, 0x29, 0x27, 0xe3,
-	0x0f, 0x9f, 0x60, 0xa3, 0x1d, 0xb8, 0xc0, 0xd7, 0xa5, 0x0e, 0xd6, 0x6d, 0x5f, 0x05, 0x3e, 0x16,
-	0x8b, 0x9c, 0x8f, 0x96, 0xe5, 0x97, 0xaf, 0x25, 0xe0, 0xd2, 0xd0, 0x8a, 0xe2, 0x7c, 0x32, 0x23,
-	0xba, 0x03, 0x33, 0x4d, 0x43, 0x77, 0xaf, 0x90, 0x8e, 0x7b, 0x0d, 0x9c, 0xd3, 0xa0, 0x13, 0x98,
-	0xe7, 0x39, 0x49, 0xd1, 0xba, 0x47, 0xca, 0x01, 0x66, 0x67, 0xf9, 0xd9, 0xb5, 0xed, 0x33, 0x95,
-	0x49, 0x2b, 0x9b, 0x87, 0x27, 0x25, 0xca, 0x6f, 0x47, 0xa1, 0x9f, 0x84, 0x38, 0x53, 0xb2, 0x1e,
-	0x33, 0x39, 0x0e, 0x04, 0xbd, 0x04, 0xfc, 0x0d, 0x8f, 0x27, 0x39, 0xc9, 0x53, 0x67, 0x96, 0x75,
-	0xb8, 0xa8, 0xcb, 0x90, 0x34, 0x95, 0x96, 0x7a, 0x42, 0x8b, 0x9b, 0x64, 0x65, 0x4a, 0x62, 0x4d,
-	0xf1, 0x5b, 0x02, 0x5c, 0x1c, 0x22, 0x10, 0xdd, 0x86, 0x9b, 0x9b, 0x9b, 0x8f, 0xe4, 0x52, 0x6d,
-	0x7b, 0xbb, 0xb6, 0x23, 0xef, 0x14, 0x1b, 0x5b, 0xfb, 0x65, 0x99, 0x26, 0xab, 0xf5, 0x72, 0x63,
-	0x54, 0xa6, 0x23, 0xab, 0x5a, 0xf9, 0x51, 0x71, 0xa3, 0x5c, 0xda, 0xda, 0x2e, 0x56, 0x73, 0x31,
-	0xf4, 0x1c, 0xe4, 0xbd, 0xa4, 0xc7, 0x58, 0xc8, 0x0e, 0x7a, 0x1c, 0x5d, 0x80, 0x4c, 0x10, 0x94,
-	0x58, 0x07, 0x48, 0x39, 0x43, 0x12, 0x7f, 0x27, 0x06, 0x69, 0x77, 0xde, 0xd0, 0x0e, 0xa4, 0x69,
-	0x95, 0xa0, 0x62, 0xdd, 0x1e, 0xa7, 0x5c, 0x6f, 0x38, 0xc8, 0x2e, 0x0b, 0xba, 0xc3, 0x72, 0xa0,
-	0x84, 0x5f, 0x4f, 0x7f, 0x66, 0x2a, 0xdd, 0x2e, 0x76, 0x42, 0x7d, 0x24, 0xbf, 0x3d, 0x07, 0x39,
-	0xc0, 0xcf, 0x65, 0x81, 0x24, 0x98, 0x3d, 0xee, 0x58, 0xb2, 0xc3, 0x71, 0x8c, 0xfa, 0xfc, 0x7e,
-	0xc7, 0x7a, 0x38, 0xc8, 0x12, 0x8e, 0x5d, 0x30, 0xd9, 0x90, 0xb3, 0xaf, 0x66, 0xe2, 0x2d, 0x40,
-	0x83, 0x03, 0x8a, 0xbc, 0x42, 0x74, 0x13, 0xd0, 0xa0, 0xaa, 0x28, 0x07, 0x71, 0x27, 0x52, 0xe6,
-	0x24, 0xf2, 0x53, 0xfc, 0x08, 0x16, 0x22, 0x14, 0x20, 0xf9, 0x8b, 0x13, 0xcb, 0x1e, 0x01, 0x70,
-	0x10, 0x41, 0xb8, 0x09, 0xf3, 0x5e, 0xe8, 0xf9, 0xaf, 0x81, 0x64, 0xdc, 0xc0, 0xa2, 0x17, 0x41,
-	0x7e, 0x1e, 0x83, 0x8b, 0x43, 0x36, 0x8d, 0xc8, 0x86, 0xf9, 0xc1, 0x2d, 0x28, 0xc9, 0x7b, 0xef,
-	0x9f, 0x61, 0x0b, 0x3a, 0x04, 0x2e, 0x85, 0x45, 0x14, 0xfe, 0x41, 0x80, 0xe5, 0x68, 0xdc, 0xf3,
-	0x79, 0xbd, 0xa8, 0x43, 0xbe, 0xeb, 0x6c, 0x38, 0x43, 0x5b, 0x5e, 0xee, 0x60, 0xaf, 0x9d, 0xf2,
-	0x49, 0x35, 0x6a, 0xb3, 0x2a, 0x5d, 0xec, 0x46, 0x77, 0x88, 0xdf, 0x8a, 0xc3, 0x02, 0x4d, 0x4a,
-	0xa1, 0xc1, 0xbc, 0x0b, 0xd3, 0xf4, 0x8b, 0xfc, 0x44, 0x9f, 0xb5, 0x39, 0x09, 0xda, 0x82, 0x74,
-	0xd3, 0xd0, 0x5b, 0x2a, 0xd5, 0x3a, 0x7e, 0xfa, 0x86, 0x88, 0xed, 0xd3, 0x4b, 0x0e, 0x89, 0xe4,
-	0x51, 0xa3, 0xee, 0x08, 0x7b, 0x24, 0xce, 0x6c, 0x8f, 0xca, 0xd4, 0x50, 0x8b, 0x8c, 0x3e, 0xe4,
-	0x48, 0x7e, 0x1e, 0x87, 0x1c, 0x11, 0x9b, 0x97, 0x7f, 0x17, 0x60, 0x29, 0xf2, 0xf4, 0x02, 0xb5,
-	0x60, 0x89, 0xbd, 0x3b, 0x8a, 0x76, 0xfe, 0xd5, 0x53, 0xe7, 0x29, 0xe4, 0x19, 0x8b, 0x87, 0x83,
-	0x40, 0x0b, 0x7d, 0x04, 0x0b, 0xfc, 0xd8, 0xc5, 0xea, 0x75, 0xbb, 0x26, 0xb6, 0x2c, 0x7e, 0xe6,
-	0x42, 0x64, 0x7c, 0xf1, 0xf4, 0xb9, 0xac, 0x7b, 0x54, 0x12, 0x32, 0xc3, 0x20, 0x4b, 0xfc, 0x08,
-	0x2e, 0x0c, 0x20, 0x06, 0xdd, 0x46, 0xf8, 0x2c, 0x6e, 0x23, 0x7e, 0x9a, 0x84, 0xf9, 0x50, 0x37,
-	0x7a, 0x0c, 0xb3, 0xf8, 0xc4, 0x1b, 0x0b, 0xf3, 0xcb, 0xb7, 0x26, 0x10, 0xb0, 0x52, 0xf6, 0xc8,
-	0x25, 0x3f, 0xaf, 0xc2, 0xdf, 0x0b, 0x90, 0xf6, 0x04, 0x9d, 0xfd, 0xfe, 0x0b, 0x7a, 0x1f, 0x52,
-	0xec, 0x5e, 0x35, 0x7f, 0x67, 0x92, 0x3d, 0xed, 0x38, 0x49, 0xa3, 0x13, 0xa6, 0x68, 0x35, 0x4e,
-	0x25, 0xb9, 0xf4, 0xde, 0x69, 0x6b, 0x62, 0xb2, 0xd3, 0xd6, 0x42, 0x13, 0xc0, 0x1d, 0x8c, 0x85,
-	0xf6, 0x00, 0x5c, 0xbb, 0x3a, 0x5e, 0xf6, 0xc6, 0x24, 0x56, 0xf3, 0x26, 0xc8, 0xc7, 0xa8, 0xf0,
-	0xdd, 0x18, 0xcc, 0xfa, 0xec, 0x89, 0x4c, 0xc8, 0x69, 0x46, 0x9b, 0xde, 0x6c, 0x70, 0x2d, 0xc0,
-	0x36, 0xe7, 0xf7, 0xce, 0x38, 0x45, 0x2b, 0x55, 0xc6, 0xcf, 0x35, 0xcd, 0xbc, 0x16, 0x04, 0xa0,
-	0x47, 0x81, 0xa1, 0x31, 0x87, 0x78, 0xf3, 0x4c, 0x43, 0x23, 0xe1, 0xed, 0xe3, 0x25, 0xfe, 0x2a,
-	0xcc, 0x87, 0xa4, 0xa3, 0x6b, 0xf0, 0x5c, 0xb5, 0x76, 0x6f, 0xab, 0x54, 0xac, 0xca, 0xb5, 0xdd,
-	0xb2, 0x54, 0x6c, 0xd4, 0xa4, 0x50, 0x19, 0x34, 0x03, 0xf1, 0xe2, 0xce, 0x46, 0x4e, 0x70, 0x0f,
-	0x61, 0xff, 0x5a, 0x80, 0x8b, 0x43, 0xde, 0x7d, 0x90, 0xdd, 0x99, 0x9b, 0x01, 0xdc, 0xfb, 0xdf,
-	0xec, 0x78, 0x3c, 0xe7, 0xeb, 0x60, 0x97, 0xbf, 0x35, 0xc8, 0x07, 0xd3, 0x85, 0xec, 0xbd, 0x3d,
-	0x61, 0xf7, 0x57, 0x5f, 0x3d, 0xb5, 0x0c, 0x72, 0x69, 0x9d, 0x97, 0x27, 0x17, 0xed, 0x08, 0xb0,
-	0x8a, 0x2d, 0xf1, 0xf7, 0xa7, 0x61, 0x29, 0x92, 0xe4, 0x3c, 0xee, 0xd5, 0xbb, 0xc1, 0x15, 0x9b,
-	0x38, 0xb8, 0x3e, 0x08, 0xa7, 0x59, 0x3e, 0xe5, 0x67, 0x5a, 0x51, 0x43, 0xac, 0x86, 0xe7, 0xe5,
-	0xe4, 0x79, 0xe6, 0xe5, 0x7d, 0x98, 0x0f, 0xe5, 0x65, 0x7e, 0xe0, 0x38, 0x61, 0x4e, 0xce, 0x06,
-	0x73, 0x32, 0x7a, 0xec, 0xbd, 0xba, 0x61, 0xdb, 0xec, 0x2f, 0x4f, 0xec, 0x0f, 0x2b, 0x8e, 0x5f,
-	0x04, 0xdf, 0xe2, 0x14, 0xbe, 0x23, 0x40, 0x26, 0xd0, 0xe5, 0x7d, 0xcd, 0x11, 0x7c, 0x5f, 0x73,
-	0xd0, 0x47, 0x90, 0x70, 0xef, 0x31, 0x67, 0x47, 0x17, 0x71, 0xd1, 0xf2, 0x43, 0x06, 0xa4, 0xb2,
-	0x4a, 0x46, 0x0b, 0x4b, 0x94, 0x2f, 0xca, 0xc3, 0x4c, 0x0b, 0xdb, 0x8a, 0xaa, 0x59, 0xfc, 0x0e,
-	0xbb, 0xd3, 0x14, 0x3f, 0x82, 0xfc, 0x30, 0x5a, 0xb2, 0x8d, 0x69, 0x48, 0xc5, 0x9d, 0xfa, 0x66,
-	0x4d, 0xda, 0xa6, 0xc7, 0x29, 0xb2, 0x54, 0xae, 0xef, 0x55, 0x1b, 0x72, 0xa9, 0xb6, 0x51, 0x1e,
-	0xdc, 0xc6, 0xd4, 0xf7, 0x4a, 0xa5, 0x72, 0xbd, 0xce, 0x0e, 0xf7, 0xca, 0x92, 0x54, 0x93, 0x72,
-	0xb1, 0xdb, 0x36, 0x80, 0xef, 0x0f, 0x25, 0x0a, 0xb0, 0x5c, 0xdd, 0xba, 0x5f, 0xae, 0x6e, 0x55,
-	0x6a, 0xb5, 0x8d, 0x10, 0x87, 0x0b, 0x90, 0xd9, 0x2f, 0x4b, 0x8f, 0xe5, 0xbd, 0x1d, 0x8a, 0xf2,
-	0x38, 0x27, 0xa0, 0x39, 0x48, 0xb9, 0xad, 0x18, 0x69, 0xed, 0xd6, 0xea, 0xf5, 0xad, 0xf5, 0x6a,
-	0x39, 0x17, 0x47, 0x00, 0xd3, 0xbc, 0x27, 0x41, 0xb6, 0x4d, 0x94, 0x94, 0x03, 0x92, 0xb7, 0xff,
-	0x56, 0x00, 0x34, 0xb8, 0x3e, 0xa0, 0x1b, 0x70, 0x55, 0x2a, 0x57, 0xe9, 0x50, 0x86, 0x67, 0xa2,
-	0x39, 0x48, 0x95, 0x1f, 0xec, 0x15, 0xab, 0x72, 0xa3, 0x96, 0x13, 0x50, 0x0e, 0xe6, 0x76, 0x6a,
-	0x0d, 0xd9, 0x85, 0xd0, 0xe3, 0xca, 0x7b, 0x52, 0xb9, 0xd8, 0x28, 0x4b, 0x72, 0xa3, 0x52, 0xdc,
-	0xc9, 0xc5, 0x51, 0x06, 0xd2, 0xd5, 0x72, 0xbd, 0xce, 0x9a, 0x09, 0x32, 0x48, 0x3f, 0x82, 0x5c,
-	0x93, 0x18, 0x79, 0x3d, 0x97, 0x44, 0x17, 0x61, 0xc1, 0x45, 0xf5, 0x75, 0x4c, 0x93, 0xe1, 0x94,
-	0x1f, 0x6d, 0xd5, 0x1b, 0xf5, 0xdc, 0xcc, 0xda, 0x8f, 0x01, 0x60, 0x43, 0xeb, 0xd6, 0xb1, 0xf9,
-	0x54, 0x6d, 0x62, 0xf4, 0x27, 0x02, 0x64, 0x83, 0x0f, 0xc6, 0xd0, 0xab, 0xe3, 0xbd, 0x0d, 0xf1,
-	0x3d, 0x83, 0x2b, 0xac, 0x4d, 0x42, 0xc2, 0xee, 0x8a, 0x8b, 0x37, 0x7e, 0xeb, 0x1f, 0x7f, 0xf1,
-	0x87, 0xb1, 0x2b, 0x62, 0xde, 0xfd, 0xe3, 0x94, 0x26, 0xc3, 0x78, 0x87, 0xbf, 0x58, 0x79, 0x47,
-	0xb8, 0x8d, 0xfe, 0x48, 0x80, 0x4c, 0xe0, 0x2d, 0x26, 0xfa, 0xd2, 0xa4, 0x8f, 0x72, 0x0b, 0xaf,
-	0x4e, 0x40, 0xc1, 0x75, 0x13, 0xa9, 0x6e, 0xcf, 0x89, 0x17, 0x07, 0x74, 0x63, 0xdf, 0x7f, 0x88,
-	0x6a, 0xdf, 0x17, 0xe0, 0xc2, 0xc0, 0x23, 0x46, 0xf4, 0xfa, 0xd8, 0x6f, 0x35, 0xfd, 0x2a, 0xbe,
-	0x31, 0x21, 0x15, 0x57, 0xf3, 0x26, 0x55, 0xf3, 0x9a, 0x78, 0x79, 0x40, 0x4d, 0xef, 0x0d, 0x28,
-	0x51, 0xf5, 0x8f, 0x05, 0x58, 0x8e, 0x7e, 0xb5, 0x87, 0xde, 0x1e, 0x7d, 0x1a, 0x32, 0xe2, 0xa5,
-	0x5f, 0xe1, 0x8a, 0x43, 0xea, 0xfb, 0xa7, 0x1c, 0xef, 0x35, 0x5b, 0x84, 0x72, 0x7c, 0x5e, 0x7d,
-	0xff, 0xa6, 0xc3, 0xa7, 0x78, 0x29, 0xf2, 0x8a, 0x3f, 0x1a, 0x79, 0x62, 0x3c, 0xea, 0x55, 0xc0,
-	0xe4, 0xaa, 0xb5, 0x5c, 0x36, 0xef, 0x28, 0x8c, 0x31, 0x51, 0xed, 0x6f, 0x04, 0x58, 0x88, 0x78,
-	0x69, 0x83, 0xde, 0x1c, 0xfd, 0x17, 0x14, 0xc3, 0x5e, 0x08, 0x15, 0xde, 0x9a, 0x98, 0x8e, 0x4f,
-	0xf4, 0x1a, 0x55, 0xf8, 0x15, 0x74, 0xdb, 0x55, 0xf8, 0xab, 0x64, 0x6f, 0x7f, 0xc7, 0xb1, 0x28,
-	0x5f, 0x12, 0x56, 0x6f, 0x7f, 0xb2, 0xea, 0xfe, 0x9f, 0xc7, 0x5f, 0x08, 0x90, 0x09, 0xbc, 0x51,
-	0x19, 0x1d, 0x3a, 0x51, 0xef, 0x64, 0x46, 0x87, 0x4e, 0xe4, 0x03, 0x18, 0xf1, 0x4d, 0xaa, 0xea,
-	0x97, 0xd0, 0x8a, 0xab, 0xaa, 0x19, 0x78, 0x2b, 0xb2, 0xfa, 0x55, 0xe7, 0xa5, 0xcd, 0x9d, 0xdb,
-	0x9f, 0xac, 0x7a, 0xfb, 0xf3, 0xef, 0x09, 0x80, 0x06, 0x5f, 0x96, 0xa0, 0x37, 0x4e, 0xd3, 0x20,
-	0xf2, 0x2d, 0x4b, 0xe1, 0xcd, 0x49, 0xc9, 0xb8, 0xf6, 0x57, 0xa9, 0xf6, 0x97, 0xd0, 0xc5, 0x21,
-	0xda, 0xaf, 0x7f, 0x57, 0x80, 0x2f, 0x34, 0x8d, 0xce, 0x08, 0xf6, 0xeb, 0xa9, 0x0d, 0xad, 0xbb,
-	0x6b, 0x1a, 0xb6, 0xb1, 0x2b, 0xfc, 0xda, 0x1d, 0x8e, 0xd7, 0x36, 0x34, 0x45, 0x6f, 0xaf, 0x18,
-	0x66, 0x7b, 0xb5, 0x8d, 0x75, 0x7a, 0x3b, 0x61, 0x95, 0x75, 0x29, 0x5d, 0xd5, 0x8a, 0xfa, 0x1b,
-	0xa9, 0x77, 0x5b, 0x5a, 0xf7, 0x07, 0xb1, 0xfc, 0x3d, 0x46, 0x4f, 0x5f, 0x5d, 0xae, 0x6c, 0x68,
-	0xdd, 0x95, 0xfd, 0xb5, 0x75, 0xd2, 0xfd, 0x33, 0xa7, 0xeb, 0x43, 0xda, 0xf5, 0xe1, 0x86, 0xd6,
-	0xfd, 0x70, 0x9f, 0x51, 0x1e, 0x4c, 0x53, 0xfe, 0xaf, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0xac, 0x11, 0x04, 0x57, 0x2a, 0x4b, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta1/storage.pb.go b/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta1/storage.pb.go
deleted file mode 100644
index 7ec5a39a..00000000
--- a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta1/storage.pb.go
+++ /dev/null
@@ -1,1143 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package dlp
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// Type of information detected by the API.
-type InfoType struct {
-	// Name of the information type.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *InfoType) Reset()                    { *m = InfoType{} }
-func (m *InfoType) String() string            { return proto.CompactTextString(m) }
-func (*InfoType) ProtoMessage()               {}
-func (*InfoType) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-func (m *InfoType) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Custom information type provided by the user. Used to find domain-specific
-// sensitive information configurable to the data in question.
-type CustomInfoType struct {
-	// Info type configuration. All custom info types must have configurations
-	// that do not conflict with built-in info types or other custom info types.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Types that are valid to be assigned to Type:
-	//	*CustomInfoType_Dictionary_
-	Type isCustomInfoType_Type `protobuf_oneof:"type"`
-}
-
-func (m *CustomInfoType) Reset()                    { *m = CustomInfoType{} }
-func (m *CustomInfoType) String() string            { return proto.CompactTextString(m) }
-func (*CustomInfoType) ProtoMessage()               {}
-func (*CustomInfoType) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
-
-type isCustomInfoType_Type interface {
-	isCustomInfoType_Type()
-}
-
-type CustomInfoType_Dictionary_ struct {
-	Dictionary *CustomInfoType_Dictionary `protobuf:"bytes,2,opt,name=dictionary,oneof"`
-}
-
-func (*CustomInfoType_Dictionary_) isCustomInfoType_Type() {}
-
-func (m *CustomInfoType) GetType() isCustomInfoType_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *CustomInfoType) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *CustomInfoType) GetDictionary() *CustomInfoType_Dictionary {
-	if x, ok := m.GetType().(*CustomInfoType_Dictionary_); ok {
-		return x.Dictionary
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInfoType) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInfoType_OneofMarshaler, _CustomInfoType_OneofUnmarshaler, _CustomInfoType_OneofSizer, []interface{}{
-		(*CustomInfoType_Dictionary_)(nil),
-	}
-}
-
-func _CustomInfoType_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInfoType)
-	// type
-	switch x := m.Type.(type) {
-	case *CustomInfoType_Dictionary_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Dictionary); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomInfoType.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInfoType_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInfoType)
-	switch tag {
-	case 2: // type.dictionary
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Dictionary)
-		err := b.DecodeMessage(msg)
-		m.Type = &CustomInfoType_Dictionary_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInfoType_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInfoType)
-	// type
-	switch x := m.Type.(type) {
-	case *CustomInfoType_Dictionary_:
-		s := proto.Size(x.Dictionary)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Custom information type based on a dictionary of words or phrases. This can
-// be used to match sensitive information specific to the data, such as a list
-// of employee IDs or job titles.
-//
-// Dictionary words are case-insensitive and all characters other than letters
-// and digits in the unicode [Basic Multilingual
-// Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
-// will be replaced with whitespace when scanning for matches, so the
-// dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
-// "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
-// surrounding any match must be of a different type than the adjacent
-// characters within the word, so letters must be next to non-letters and
-// digits next to non-digits. For example, the dictionary word "jen" will
-// match the first three letters of the text "jen123" but will return no
-// matches for "jennifer".
-//
-// Dictionary words containing a large number of characters that are not
-// letters or digits may result in unexpected findings because such characters
-// are treated as whitespace.
-type CustomInfoType_Dictionary struct {
-	// Types that are valid to be assigned to Source:
-	//	*CustomInfoType_Dictionary_WordList_
-	Source isCustomInfoType_Dictionary_Source `protobuf_oneof:"source"`
-}
-
-func (m *CustomInfoType_Dictionary) Reset()                    { *m = CustomInfoType_Dictionary{} }
-func (m *CustomInfoType_Dictionary) String() string            { return proto.CompactTextString(m) }
-func (*CustomInfoType_Dictionary) ProtoMessage()               {}
-func (*CustomInfoType_Dictionary) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} }
-
-type isCustomInfoType_Dictionary_Source interface {
-	isCustomInfoType_Dictionary_Source()
-}
-
-type CustomInfoType_Dictionary_WordList_ struct {
-	WordList *CustomInfoType_Dictionary_WordList `protobuf:"bytes,1,opt,name=word_list,json=wordList,oneof"`
-}
-
-func (*CustomInfoType_Dictionary_WordList_) isCustomInfoType_Dictionary_Source() {}
-
-func (m *CustomInfoType_Dictionary) GetSource() isCustomInfoType_Dictionary_Source {
-	if m != nil {
-		return m.Source
-	}
-	return nil
-}
-
-func (m *CustomInfoType_Dictionary) GetWordList() *CustomInfoType_Dictionary_WordList {
-	if x, ok := m.GetSource().(*CustomInfoType_Dictionary_WordList_); ok {
-		return x.WordList
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInfoType_Dictionary) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInfoType_Dictionary_OneofMarshaler, _CustomInfoType_Dictionary_OneofUnmarshaler, _CustomInfoType_Dictionary_OneofSizer, []interface{}{
-		(*CustomInfoType_Dictionary_WordList_)(nil),
-	}
-}
-
-func _CustomInfoType_Dictionary_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInfoType_Dictionary)
-	// source
-	switch x := m.Source.(type) {
-	case *CustomInfoType_Dictionary_WordList_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.WordList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomInfoType_Dictionary.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInfoType_Dictionary_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInfoType_Dictionary)
-	switch tag {
-	case 1: // source.word_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Dictionary_WordList)
-		err := b.DecodeMessage(msg)
-		m.Source = &CustomInfoType_Dictionary_WordList_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInfoType_Dictionary_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInfoType_Dictionary)
-	// source
-	switch x := m.Source.(type) {
-	case *CustomInfoType_Dictionary_WordList_:
-		s := proto.Size(x.WordList)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Message defining a list of words or phrases to search for in the data.
-type CustomInfoType_Dictionary_WordList struct {
-	// Words or phrases defining the dictionary. The dictionary must contain
-	// at least one phrase and every phrase must contain at least 2 characters
-	// that are letters or digits. [required]
-	Words []string `protobuf:"bytes,1,rep,name=words" json:"words,omitempty"`
-}
-
-func (m *CustomInfoType_Dictionary_WordList) Reset()         { *m = CustomInfoType_Dictionary_WordList{} }
-func (m *CustomInfoType_Dictionary_WordList) String() string { return proto.CompactTextString(m) }
-func (*CustomInfoType_Dictionary_WordList) ProtoMessage()    {}
-func (*CustomInfoType_Dictionary_WordList) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{1, 0, 0}
-}
-
-func (m *CustomInfoType_Dictionary_WordList) GetWords() []string {
-	if m != nil {
-		return m.Words
-	}
-	return nil
-}
-
-// General identifier of a data field in a storage service.
-type FieldId struct {
-	// Name describing the field.
-	ColumnName string `protobuf:"bytes,1,opt,name=column_name,json=columnName" json:"column_name,omitempty"`
-}
-
-func (m *FieldId) Reset()                    { *m = FieldId{} }
-func (m *FieldId) String() string            { return proto.CompactTextString(m) }
-func (*FieldId) ProtoMessage()               {}
-func (*FieldId) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
-
-func (m *FieldId) GetColumnName() string {
-	if m != nil {
-		return m.ColumnName
-	}
-	return ""
-}
-
-// Datastore partition ID.
-// A partition ID identifies a grouping of entities. The grouping is always
-// by project and namespace, however the namespace ID may be empty.
-//
-// A partition ID contains several dimensions:
-// project ID and namespace ID.
-type PartitionId struct {
-	// The ID of the project to which the entities belong.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// If not empty, the ID of the namespace to which the entities belong.
-	NamespaceId string `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceId" json:"namespace_id,omitempty"`
-}
-
-func (m *PartitionId) Reset()                    { *m = PartitionId{} }
-func (m *PartitionId) String() string            { return proto.CompactTextString(m) }
-func (*PartitionId) ProtoMessage()               {}
-func (*PartitionId) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
-
-func (m *PartitionId) GetProjectId() string {
-	if m != nil {
-		return m.ProjectId
-	}
-	return ""
-}
-
-func (m *PartitionId) GetNamespaceId() string {
-	if m != nil {
-		return m.NamespaceId
-	}
-	return ""
-}
-
-// A representation of a Datastore kind.
-type KindExpression struct {
-	// The name of the kind.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *KindExpression) Reset()                    { *m = KindExpression{} }
-func (m *KindExpression) String() string            { return proto.CompactTextString(m) }
-func (*KindExpression) ProtoMessage()               {}
-func (*KindExpression) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
-
-func (m *KindExpression) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// A reference to a property relative to the Datastore kind expressions.
-type PropertyReference struct {
-	// The name of the property.
-	// If name includes "."s, it may be interpreted as a property name path.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *PropertyReference) Reset()                    { *m = PropertyReference{} }
-func (m *PropertyReference) String() string            { return proto.CompactTextString(m) }
-func (*PropertyReference) ProtoMessage()               {}
-func (*PropertyReference) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
-
-func (m *PropertyReference) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// A representation of a Datastore property in a projection.
-type Projection struct {
-	// The property to project.
-	Property *PropertyReference `protobuf:"bytes,1,opt,name=property" json:"property,omitempty"`
-}
-
-func (m *Projection) Reset()                    { *m = Projection{} }
-func (m *Projection) String() string            { return proto.CompactTextString(m) }
-func (*Projection) ProtoMessage()               {}
-func (*Projection) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
-
-func (m *Projection) GetProperty() *PropertyReference {
-	if m != nil {
-		return m.Property
-	}
-	return nil
-}
-
-// Options defining a data set within Google Cloud Datastore.
-type DatastoreOptions struct {
-	// A partition ID identifies a grouping of entities. The grouping is always
-	// by project and namespace, however the namespace ID may be empty.
-	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId" json:"partition_id,omitempty"`
-	// The kind to process.
-	Kind *KindExpression `protobuf:"bytes,2,opt,name=kind" json:"kind,omitempty"`
-	// Properties to scan. If none are specified, all properties will be scanned
-	// by default.
-	Projection []*Projection `protobuf:"bytes,3,rep,name=projection" json:"projection,omitempty"`
-}
-
-func (m *DatastoreOptions) Reset()                    { *m = DatastoreOptions{} }
-func (m *DatastoreOptions) String() string            { return proto.CompactTextString(m) }
-func (*DatastoreOptions) ProtoMessage()               {}
-func (*DatastoreOptions) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
-
-func (m *DatastoreOptions) GetPartitionId() *PartitionId {
-	if m != nil {
-		return m.PartitionId
-	}
-	return nil
-}
-
-func (m *DatastoreOptions) GetKind() *KindExpression {
-	if m != nil {
-		return m.Kind
-	}
-	return nil
-}
-
-func (m *DatastoreOptions) GetProjection() []*Projection {
-	if m != nil {
-		return m.Projection
-	}
-	return nil
-}
-
-// Options defining a file or a set of files (path ending with *) within
-// a Google Cloud Storage bucket.
-type CloudStorageOptions struct {
-	FileSet *CloudStorageOptions_FileSet `protobuf:"bytes,1,opt,name=file_set,json=fileSet" json:"file_set,omitempty"`
-}
-
-func (m *CloudStorageOptions) Reset()                    { *m = CloudStorageOptions{} }
-func (m *CloudStorageOptions) String() string            { return proto.CompactTextString(m) }
-func (*CloudStorageOptions) ProtoMessage()               {}
-func (*CloudStorageOptions) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
-
-func (m *CloudStorageOptions) GetFileSet() *CloudStorageOptions_FileSet {
-	if m != nil {
-		return m.FileSet
-	}
-	return nil
-}
-
-// Set of files to scan.
-type CloudStorageOptions_FileSet struct {
-	// The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-	// path is allowed.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
-}
-
-func (m *CloudStorageOptions_FileSet) Reset()                    { *m = CloudStorageOptions_FileSet{} }
-func (m *CloudStorageOptions_FileSet) String() string            { return proto.CompactTextString(m) }
-func (*CloudStorageOptions_FileSet) ProtoMessage()               {}
-func (*CloudStorageOptions_FileSet) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8, 0} }
-
-func (m *CloudStorageOptions_FileSet) GetUrl() string {
-	if m != nil {
-		return m.Url
-	}
-	return ""
-}
-
-// A location in Cloud Storage.
-type CloudStoragePath struct {
-	// The url, in the format of `gs://bucket/<path>`.
-	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
-}
-
-func (m *CloudStoragePath) Reset()                    { *m = CloudStoragePath{} }
-func (m *CloudStoragePath) String() string            { return proto.CompactTextString(m) }
-func (*CloudStoragePath) ProtoMessage()               {}
-func (*CloudStoragePath) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
-
-func (m *CloudStoragePath) GetPath() string {
-	if m != nil {
-		return m.Path
-	}
-	return ""
-}
-
-// Options defining BigQuery table and row identifiers.
-type BigQueryOptions struct {
-	// Complete BigQuery table reference.
-	TableReference *BigQueryTable `protobuf:"bytes,1,opt,name=table_reference,json=tableReference" json:"table_reference,omitempty"`
-	// References to fields uniquely identifying rows within the table.
-	// Nested fields in the format, like `person.birthdate.year`, are allowed.
-	IdentifyingFields []*FieldId `protobuf:"bytes,2,rep,name=identifying_fields,json=identifyingFields" json:"identifying_fields,omitempty"`
-}
-
-func (m *BigQueryOptions) Reset()                    { *m = BigQueryOptions{} }
-func (m *BigQueryOptions) String() string            { return proto.CompactTextString(m) }
-func (*BigQueryOptions) ProtoMessage()               {}
-func (*BigQueryOptions) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
-
-func (m *BigQueryOptions) GetTableReference() *BigQueryTable {
-	if m != nil {
-		return m.TableReference
-	}
-	return nil
-}
-
-func (m *BigQueryOptions) GetIdentifyingFields() []*FieldId {
-	if m != nil {
-		return m.IdentifyingFields
-	}
-	return nil
-}
-
-// Shared message indicating Cloud storage type.
-type StorageConfig struct {
-	// Types that are valid to be assigned to Type:
-	//	*StorageConfig_DatastoreOptions
-	//	*StorageConfig_CloudStorageOptions
-	//	*StorageConfig_BigQueryOptions
-	Type isStorageConfig_Type `protobuf_oneof:"type"`
-}
-
-func (m *StorageConfig) Reset()                    { *m = StorageConfig{} }
-func (m *StorageConfig) String() string            { return proto.CompactTextString(m) }
-func (*StorageConfig) ProtoMessage()               {}
-func (*StorageConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
-
-type isStorageConfig_Type interface {
-	isStorageConfig_Type()
-}
-
-type StorageConfig_DatastoreOptions struct {
-	DatastoreOptions *DatastoreOptions `protobuf:"bytes,2,opt,name=datastore_options,json=datastoreOptions,oneof"`
-}
-type StorageConfig_CloudStorageOptions struct {
-	CloudStorageOptions *CloudStorageOptions `protobuf:"bytes,3,opt,name=cloud_storage_options,json=cloudStorageOptions,oneof"`
-}
-type StorageConfig_BigQueryOptions struct {
-	BigQueryOptions *BigQueryOptions `protobuf:"bytes,4,opt,name=big_query_options,json=bigQueryOptions,oneof"`
-}
-
-func (*StorageConfig_DatastoreOptions) isStorageConfig_Type()    {}
-func (*StorageConfig_CloudStorageOptions) isStorageConfig_Type() {}
-func (*StorageConfig_BigQueryOptions) isStorageConfig_Type()     {}
-
-func (m *StorageConfig) GetType() isStorageConfig_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *StorageConfig) GetDatastoreOptions() *DatastoreOptions {
-	if x, ok := m.GetType().(*StorageConfig_DatastoreOptions); ok {
-		return x.DatastoreOptions
-	}
-	return nil
-}
-
-func (m *StorageConfig) GetCloudStorageOptions() *CloudStorageOptions {
-	if x, ok := m.GetType().(*StorageConfig_CloudStorageOptions); ok {
-		return x.CloudStorageOptions
-	}
-	return nil
-}
-
-func (m *StorageConfig) GetBigQueryOptions() *BigQueryOptions {
-	if x, ok := m.GetType().(*StorageConfig_BigQueryOptions); ok {
-		return x.BigQueryOptions
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StorageConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StorageConfig_OneofMarshaler, _StorageConfig_OneofUnmarshaler, _StorageConfig_OneofSizer, []interface{}{
-		(*StorageConfig_DatastoreOptions)(nil),
-		(*StorageConfig_CloudStorageOptions)(nil),
-		(*StorageConfig_BigQueryOptions)(nil),
-	}
-}
-
-func _StorageConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *StorageConfig_DatastoreOptions:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatastoreOptions); err != nil {
-			return err
-		}
-	case *StorageConfig_CloudStorageOptions:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudStorageOptions); err != nil {
-			return err
-		}
-	case *StorageConfig_BigQueryOptions:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigQueryOptions); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StorageConfig.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StorageConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StorageConfig)
-	switch tag {
-	case 2: // type.datastore_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatastoreOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_DatastoreOptions{msg}
-		return true, err
-	case 3: // type.cloud_storage_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudStorageOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_CloudStorageOptions{msg}
-		return true, err
-	case 4: // type.big_query_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_BigQueryOptions{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StorageConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *StorageConfig_DatastoreOptions:
-		s := proto.Size(x.DatastoreOptions)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StorageConfig_CloudStorageOptions:
-		s := proto.Size(x.CloudStorageOptions)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StorageConfig_BigQueryOptions:
-		s := proto.Size(x.BigQueryOptions)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Record key for a finding in a Cloud Storage file.
-type CloudStorageKey struct {
-	// Path to the file.
-	FilePath string `protobuf:"bytes,1,opt,name=file_path,json=filePath" json:"file_path,omitempty"`
-	// Byte offset of the referenced data in the file.
-	StartOffset int64 `protobuf:"varint,2,opt,name=start_offset,json=startOffset" json:"start_offset,omitempty"`
-}
-
-func (m *CloudStorageKey) Reset()                    { *m = CloudStorageKey{} }
-func (m *CloudStorageKey) String() string            { return proto.CompactTextString(m) }
-func (*CloudStorageKey) ProtoMessage()               {}
-func (*CloudStorageKey) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
-
-func (m *CloudStorageKey) GetFilePath() string {
-	if m != nil {
-		return m.FilePath
-	}
-	return ""
-}
-
-func (m *CloudStorageKey) GetStartOffset() int64 {
-	if m != nil {
-		return m.StartOffset
-	}
-	return 0
-}
-
-// Record key for a finding in Cloud Datastore.
-type DatastoreKey struct {
-	// Datastore entity key.
-	EntityKey *Key `protobuf:"bytes,1,opt,name=entity_key,json=entityKey" json:"entity_key,omitempty"`
-}
-
-func (m *DatastoreKey) Reset()                    { *m = DatastoreKey{} }
-func (m *DatastoreKey) String() string            { return proto.CompactTextString(m) }
-func (*DatastoreKey) ProtoMessage()               {}
-func (*DatastoreKey) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
-
-func (m *DatastoreKey) GetEntityKey() *Key {
-	if m != nil {
-		return m.EntityKey
-	}
-	return nil
-}
-
-// A unique identifier for a Datastore entity.
-// If a key's partition ID or any of its path kinds or names are
-// reserved/read-only, the key is reserved/read-only.
-// A reserved/read-only key is forbidden in certain documented contexts.
-type Key struct {
-	// Entities are partitioned into subsets, currently identified by a project
-	// ID and namespace ID.
-	// Queries are scoped to a single partition.
-	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId" json:"partition_id,omitempty"`
-	// The entity path.
-	// An entity path consists of one or more elements composed of a kind and a
-	// string or numerical identifier, which identify entities. The first
-	// element identifies a _root entity_, the second element identifies
-	// a _child_ of the root entity, the third element identifies a child of the
-	// second entity, and so forth. The entities identified by all prefixes of
-	// the path are called the element's _ancestors_.
-	//
-	// A path can never be empty, and a path can have at most 100 elements.
-	Path []*Key_PathElement `protobuf:"bytes,2,rep,name=path" json:"path,omitempty"`
-}
-
-func (m *Key) Reset()                    { *m = Key{} }
-func (m *Key) String() string            { return proto.CompactTextString(m) }
-func (*Key) ProtoMessage()               {}
-func (*Key) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
-
-func (m *Key) GetPartitionId() *PartitionId {
-	if m != nil {
-		return m.PartitionId
-	}
-	return nil
-}
-
-func (m *Key) GetPath() []*Key_PathElement {
-	if m != nil {
-		return m.Path
-	}
-	return nil
-}
-
-// A (kind, ID/name) pair used to construct a key path.
-//
-// If either name or ID is set, the element is complete.
-// If neither is set, the element is incomplete.
-type Key_PathElement struct {
-	// The kind of the entity.
-	// A kind matching regex `__.*__` is reserved/read-only.
-	// A kind must not contain more than 1500 bytes when UTF-8 encoded.
-	// Cannot be `""`.
-	Kind string `protobuf:"bytes,1,opt,name=kind" json:"kind,omitempty"`
-	// The type of ID.
-	//
-	// Types that are valid to be assigned to IdType:
-	//	*Key_PathElement_Id
-	//	*Key_PathElement_Name
-	IdType isKey_PathElement_IdType `protobuf_oneof:"id_type"`
-}
-
-func (m *Key_PathElement) Reset()                    { *m = Key_PathElement{} }
-func (m *Key_PathElement) String() string            { return proto.CompactTextString(m) }
-func (*Key_PathElement) ProtoMessage()               {}
-func (*Key_PathElement) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14, 0} }
-
-type isKey_PathElement_IdType interface {
-	isKey_PathElement_IdType()
-}
-
-type Key_PathElement_Id struct {
-	Id int64 `protobuf:"varint,2,opt,name=id,oneof"`
-}
-type Key_PathElement_Name struct {
-	Name string `protobuf:"bytes,3,opt,name=name,oneof"`
-}
-
-func (*Key_PathElement_Id) isKey_PathElement_IdType()   {}
-func (*Key_PathElement_Name) isKey_PathElement_IdType() {}
-
-func (m *Key_PathElement) GetIdType() isKey_PathElement_IdType {
-	if m != nil {
-		return m.IdType
-	}
-	return nil
-}
-
-func (m *Key_PathElement) GetKind() string {
-	if m != nil {
-		return m.Kind
-	}
-	return ""
-}
-
-func (m *Key_PathElement) GetId() int64 {
-	if x, ok := m.GetIdType().(*Key_PathElement_Id); ok {
-		return x.Id
-	}
-	return 0
-}
-
-func (m *Key_PathElement) GetName() string {
-	if x, ok := m.GetIdType().(*Key_PathElement_Name); ok {
-		return x.Name
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Key_PathElement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Key_PathElement_OneofMarshaler, _Key_PathElement_OneofUnmarshaler, _Key_PathElement_OneofSizer, []interface{}{
-		(*Key_PathElement_Id)(nil),
-		(*Key_PathElement_Name)(nil),
-	}
-}
-
-func _Key_PathElement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case nil:
-	default:
-		return fmt.Errorf("Key_PathElement.IdType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Key_PathElement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Key_PathElement)
-	switch tag {
-	case 2: // id_type.id
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.IdType = &Key_PathElement_Id{int64(x)}
-		return true, err
-	case 3: // id_type.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.IdType = &Key_PathElement_Name{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Key_PathElement_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Message for a unique key indicating a record that contains a finding.
-type RecordKey struct {
-	// Types that are valid to be assigned to Type:
-	//	*RecordKey_CloudStorageKey
-	//	*RecordKey_DatastoreKey
-	Type isRecordKey_Type `protobuf_oneof:"type"`
-}
-
-func (m *RecordKey) Reset()                    { *m = RecordKey{} }
-func (m *RecordKey) String() string            { return proto.CompactTextString(m) }
-func (*RecordKey) ProtoMessage()               {}
-func (*RecordKey) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
-
-type isRecordKey_Type interface {
-	isRecordKey_Type()
-}
-
-type RecordKey_CloudStorageKey struct {
-	CloudStorageKey *CloudStorageKey `protobuf:"bytes,1,opt,name=cloud_storage_key,json=cloudStorageKey,oneof"`
-}
-type RecordKey_DatastoreKey struct {
-	DatastoreKey *DatastoreKey `protobuf:"bytes,2,opt,name=datastore_key,json=datastoreKey,oneof"`
-}
-
-func (*RecordKey_CloudStorageKey) isRecordKey_Type() {}
-func (*RecordKey_DatastoreKey) isRecordKey_Type()    {}
-
-func (m *RecordKey) GetType() isRecordKey_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *RecordKey) GetCloudStorageKey() *CloudStorageKey {
-	if x, ok := m.GetType().(*RecordKey_CloudStorageKey); ok {
-		return x.CloudStorageKey
-	}
-	return nil
-}
-
-func (m *RecordKey) GetDatastoreKey() *DatastoreKey {
-	if x, ok := m.GetType().(*RecordKey_DatastoreKey); ok {
-		return x.DatastoreKey
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecordKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecordKey_OneofMarshaler, _RecordKey_OneofUnmarshaler, _RecordKey_OneofSizer, []interface{}{
-		(*RecordKey_CloudStorageKey)(nil),
-		(*RecordKey_DatastoreKey)(nil),
-	}
-}
-
-func _RecordKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecordKey)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordKey_CloudStorageKey:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudStorageKey); err != nil {
-			return err
-		}
-	case *RecordKey_DatastoreKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatastoreKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RecordKey.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecordKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecordKey)
-	switch tag {
-	case 1: // type.cloud_storage_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudStorageKey)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordKey_CloudStorageKey{msg}
-		return true, err
-	case 2: // type.datastore_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatastoreKey)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordKey_DatastoreKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecordKey_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecordKey)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordKey_CloudStorageKey:
-		s := proto.Size(x.CloudStorageKey)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RecordKey_DatastoreKey:
-		s := proto.Size(x.DatastoreKey)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Message defining the location of a BigQuery table. A table is uniquely
-// identified  by its project_id, dataset_id, and table_name. Within a query
-// a table is often referenced with a string in the format of:
-// `<project_id>:<dataset_id>.<table_id>` or
-// `<project_id>.<dataset_id>.<table_id>`.
-type BigQueryTable struct {
-	// The Google Cloud Platform project ID of the project containing the table.
-	// If omitted, project ID is inferred from the API call.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// Dataset ID of the table.
-	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
-	// Name of the table.
-	TableId string `protobuf:"bytes,3,opt,name=table_id,json=tableId" json:"table_id,omitempty"`
-}
-
-func (m *BigQueryTable) Reset()                    { *m = BigQueryTable{} }
-func (m *BigQueryTable) String() string            { return proto.CompactTextString(m) }
-func (*BigQueryTable) ProtoMessage()               {}
-func (*BigQueryTable) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
-
-func (m *BigQueryTable) GetProjectId() string {
-	if m != nil {
-		return m.ProjectId
-	}
-	return ""
-}
-
-func (m *BigQueryTable) GetDatasetId() string {
-	if m != nil {
-		return m.DatasetId
-	}
-	return ""
-}
-
-func (m *BigQueryTable) GetTableId() string {
-	if m != nil {
-		return m.TableId
-	}
-	return ""
-}
-
-// An entity in a dataset is a field or set of fields that correspond to a
-// single person. For example, in medical records the `EntityId` might be
-// a patient identifier, or for financial records it might be an account
-// identifier. This message is used when generalizations or analysis must be
-// consistent across multiple rows pertaining to the same entity.
-type EntityId struct {
-	// Composite key indicating which field contains the entity identifier.
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-}
-
-func (m *EntityId) Reset()                    { *m = EntityId{} }
-func (m *EntityId) String() string            { return proto.CompactTextString(m) }
-func (*EntityId) ProtoMessage()               {}
-func (*EntityId) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{17} }
-
-func (m *EntityId) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*InfoType)(nil), "google.privacy.dlp.v2beta1.InfoType")
-	proto.RegisterType((*CustomInfoType)(nil), "google.privacy.dlp.v2beta1.CustomInfoType")
-	proto.RegisterType((*CustomInfoType_Dictionary)(nil), "google.privacy.dlp.v2beta1.CustomInfoType.Dictionary")
-	proto.RegisterType((*CustomInfoType_Dictionary_WordList)(nil), "google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList")
-	proto.RegisterType((*FieldId)(nil), "google.privacy.dlp.v2beta1.FieldId")
-	proto.RegisterType((*PartitionId)(nil), "google.privacy.dlp.v2beta1.PartitionId")
-	proto.RegisterType((*KindExpression)(nil), "google.privacy.dlp.v2beta1.KindExpression")
-	proto.RegisterType((*PropertyReference)(nil), "google.privacy.dlp.v2beta1.PropertyReference")
-	proto.RegisterType((*Projection)(nil), "google.privacy.dlp.v2beta1.Projection")
-	proto.RegisterType((*DatastoreOptions)(nil), "google.privacy.dlp.v2beta1.DatastoreOptions")
-	proto.RegisterType((*CloudStorageOptions)(nil), "google.privacy.dlp.v2beta1.CloudStorageOptions")
-	proto.RegisterType((*CloudStorageOptions_FileSet)(nil), "google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet")
-	proto.RegisterType((*CloudStoragePath)(nil), "google.privacy.dlp.v2beta1.CloudStoragePath")
-	proto.RegisterType((*BigQueryOptions)(nil), "google.privacy.dlp.v2beta1.BigQueryOptions")
-	proto.RegisterType((*StorageConfig)(nil), "google.privacy.dlp.v2beta1.StorageConfig")
-	proto.RegisterType((*CloudStorageKey)(nil), "google.privacy.dlp.v2beta1.CloudStorageKey")
-	proto.RegisterType((*DatastoreKey)(nil), "google.privacy.dlp.v2beta1.DatastoreKey")
-	proto.RegisterType((*Key)(nil), "google.privacy.dlp.v2beta1.Key")
-	proto.RegisterType((*Key_PathElement)(nil), "google.privacy.dlp.v2beta1.Key.PathElement")
-	proto.RegisterType((*RecordKey)(nil), "google.privacy.dlp.v2beta1.RecordKey")
-	proto.RegisterType((*BigQueryTable)(nil), "google.privacy.dlp.v2beta1.BigQueryTable")
-	proto.RegisterType((*EntityId)(nil), "google.privacy.dlp.v2beta1.EntityId")
-}
-
-func init() { proto.RegisterFile("google/privacy/dlp/v2beta1/storage.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 1068 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x6e, 0xdc, 0xc4,
-	0x17, 0x5f, 0xef, 0xa6, 0xcd, 0xee, 0xd9, 0x7c, 0xba, 0xfd, 0x4b, 0xfb, 0xdf, 0xd2, 0x26, 0x35,
-	0x55, 0x1b, 0x1a, 0xf0, 0x8a, 0x20, 0x84, 0x10, 0x22, 0x88, 0xcd, 0x07, 0xbb, 0x04, 0x35, 0xe9,
-	0x34, 0x6a, 0x54, 0x08, 0xb2, 0xbc, 0x9e, 0xb1, 0x33, 0xd4, 0xeb, 0x19, 0xec, 0xd9, 0x16, 0xbf,
-	0x00, 0xaf, 0xc0, 0x03, 0x70, 0xc7, 0x03, 0x20, 0x71, 0xc5, 0x3d, 0x17, 0x3c, 0x06, 0xe2, 0x31,
-	0xd0, 0x7c, 0xd8, 0xeb, 0xa4, 0x61, 0x1b, 0x10, 0x77, 0xe3, 0x33, 0xe7, 0xfc, 0xce, 0x99, 0xdf,
-	0xfc, 0xce, 0x19, 0xc3, 0x46, 0xc4, 0x58, 0x14, 0x93, 0x1e, 0x4f, 0xe9, 0x0b, 0x3f, 0xc8, 0x7b,
-	0x38, 0xe6, 0xbd, 0x17, 0x5b, 0x23, 0x22, 0xfc, 0x77, 0x7b, 0x99, 0x60, 0xa9, 0x1f, 0x11, 0x97,
-	0xa7, 0x4c, 0x30, 0xbb, 0xab, 0x3d, 0x5d, 0xe3, 0xe9, 0xe2, 0x98, 0xbb, 0xc6, 0xb3, 0xfb, 0x86,
-	0x41, 0xf1, 0x39, 0xed, 0xf9, 0x49, 0xc2, 0x84, 0x2f, 0x28, 0x4b, 0x32, 0x1d, 0xd9, 0x5d, 0x2b,
-	0x73, 0x30, 0xc1, 0x46, 0x93, 0xb0, 0x27, 0xe8, 0x98, 0x64, 0xc2, 0x1f, 0x73, 0xed, 0xe0, 0xdc,
-	0x81, 0xe6, 0x30, 0x09, 0xd9, 0x71, 0xce, 0x89, 0x6d, 0xc3, 0x5c, 0xe2, 0x8f, 0x49, 0xc7, 0x5a,
-	0xb7, 0x36, 0x5a, 0x48, 0xad, 0x9d, 0xdf, 0xeb, 0xb0, 0xb4, 0x33, 0xc9, 0x04, 0x1b, 0x97, 0x6e,
-	0x9f, 0x42, 0x8b, 0x26, 0x21, 0xf3, 0x44, 0xce, 0xb5, 0x6f, 0x7b, 0xeb, 0x9e, 0xfb, 0xf7, 0x15,
-	0xba, 0x45, 0x20, 0x6a, 0xd2, 0x02, 0xe2, 0x04, 0x00, 0xd3, 0x40, 0x16, 0xea, 0xa7, 0x79, 0xa7,
-	0xae, 0x30, 0xde, 0x9f, 0x85, 0x71, 0xbe, 0x04, 0x77, 0xb7, 0x0c, 0x1e, 0xd4, 0x50, 0x05, 0xaa,
-	0xfb, 0x83, 0x05, 0x30, 0xdd, 0xb4, 0xbf, 0x86, 0xd6, 0x4b, 0x96, 0x62, 0x2f, 0xa6, 0x99, 0x30,
-	0xa5, 0x6e, 0xff, 0xab, 0x34, 0xee, 0x09, 0x4b, 0xf1, 0x17, 0x34, 0x13, 0x83, 0x1a, 0x6a, 0xbe,
-	0x34, 0xeb, 0xee, 0x3a, 0x34, 0x0b, 0xbb, 0x7d, 0x13, 0xae, 0x49, 0x7b, 0xd6, 0xb1, 0xd6, 0x1b,
-	0x1b, 0x2d, 0xa4, 0x3f, 0xfa, 0x4d, 0xb8, 0x9e, 0xb1, 0x49, 0x1a, 0x90, 0xfe, 0x75, 0x98, 0x93,
-	0x84, 0x39, 0x0f, 0x61, 0x7e, 0x9f, 0x92, 0x18, 0x0f, 0xb1, 0xbd, 0x06, 0xed, 0x80, 0xc5, 0x93,
-	0x71, 0xe2, 0x55, 0x68, 0x07, 0x6d, 0x7a, 0x24, 0xc9, 0x3f, 0x84, 0xf6, 0x91, 0x9f, 0x0a, 0x2a,
-	0x8b, 0x18, 0x62, 0xfb, 0x36, 0x00, 0x4f, 0xd9, 0x37, 0x24, 0x10, 0x1e, 0xc5, 0x8a, 0xb5, 0x16,
-	0x6a, 0x19, 0xcb, 0x10, 0xdb, 0x77, 0x61, 0x41, 0xe2, 0x64, 0xdc, 0x0f, 0x88, 0x74, 0x98, 0x53,
-	0x0e, 0xed, 0xd2, 0x36, 0xc4, 0xce, 0x3d, 0x58, 0x3a, 0xa0, 0x09, 0xde, 0xfb, 0x8e, 0xa7, 0x24,
-	0xcb, 0x28, 0x4b, 0x2e, 0xbd, 0xf3, 0x07, 0xb0, 0x7a, 0x94, 0x32, 0x4e, 0x52, 0x91, 0x23, 0x12,
-	0x92, 0x94, 0x24, 0xc1, 0x54, 0x1c, 0xf5, 0x8a, 0xe3, 0x09, 0xc0, 0x91, 0x4e, 0x2f, 0xa1, 0x86,
-	0xd0, 0xe4, 0x26, 0xcc, 0x70, 0xfd, 0xce, 0x2c, 0xae, 0x5f, 0x49, 0x81, 0xca, 0x70, 0xe7, 0x0f,
-	0x0b, 0x56, 0x76, 0x7d, 0xe1, 0xcb, 0x36, 0x20, 0x87, 0x5c, 0x29, 0xda, 0xfe, 0x1c, 0x16, 0x78,
-	0xc1, 0x86, 0x3c, 0x9f, 0xce, 0xf1, 0x60, 0x66, 0x8e, 0x29, 0x7b, 0xa8, 0xcd, 0x2b, 0x54, 0x6e,
-	0xc3, 0xdc, 0x73, 0x9a, 0x60, 0x23, 0xbd, 0x87, 0xb3, 0x30, 0xce, 0x13, 0x86, 0x54, 0x9c, 0xbd,
-	0x5f, 0x5e, 0x05, 0x65, 0x49, 0xa7, 0xb1, 0xde, 0xd8, 0x68, 0x6f, 0xdd, 0x7f, 0xcd, 0x69, 0x8d,
-	0x37, 0xaa, 0x44, 0x3a, 0xdf, 0x5b, 0x70, 0x63, 0x27, 0x66, 0x13, 0xfc, 0x44, 0x37, 0x7c, 0x71,
-	0x56, 0x04, 0xcd, 0x90, 0xc6, 0xc4, 0xcb, 0x48, 0xa1, 0xdb, 0x0f, 0x66, 0xea, 0xf6, 0x55, 0x08,
-	0x77, 0x9f, 0xc6, 0xe4, 0x09, 0x11, 0x68, 0x3e, 0xd4, 0x8b, 0xee, 0x2d, 0xa9, 0x3c, 0xb5, 0xb4,
-	0x57, 0xa0, 0x31, 0x49, 0x63, 0x73, 0xe9, 0x72, 0xe9, 0xdc, 0x87, 0x95, 0x2a, 0xc8, 0x91, 0x2f,
-	0xce, 0xe4, 0x95, 0x73, 0x5f, 0x9c, 0x15, 0xda, 0x90, 0x6b, 0xe7, 0x17, 0x0b, 0x96, 0xfb, 0x34,
-	0x7a, 0x3c, 0x21, 0x69, 0x3e, 0x2d, 0x76, 0x59, 0xf8, 0xa3, 0x98, 0x78, 0x69, 0x71, 0x95, 0xa6,
-	0xe6, 0xb7, 0x66, 0xd5, 0x5c, 0xa0, 0x1c, 0xcb, 0x50, 0xb4, 0xa4, 0x10, 0xa6, 0x72, 0x43, 0x60,
-	0x53, 0x4c, 0x12, 0x41, 0xc3, 0x9c, 0x26, 0x91, 0x17, 0xca, 0x96, 0xc9, 0x3a, 0x75, 0x45, 0xf4,
-	0x9b, 0xb3, 0x60, 0x4d, 0x73, 0xa1, 0xd5, 0x4a, 0xb8, 0xb2, 0x65, 0xce, 0xcf, 0x75, 0x58, 0x34,
-	0xe7, 0xdb, 0x61, 0x49, 0x48, 0x23, 0xfb, 0x2b, 0x58, 0xc5, 0x85, 0xcc, 0x3c, 0xa6, 0x8f, 0x63,
-	0x34, 0xf1, 0xf6, 0xac, 0x24, 0x17, 0xb5, 0x39, 0xa8, 0xa1, 0x15, 0x7c, 0x51, 0xaf, 0x04, 0xfe,
-	0x17, 0x48, 0x4a, 0x3d, 0x33, 0xcc, 0xcb, 0x04, 0x0d, 0x95, 0xa0, 0xf7, 0x0f, 0x2f, 0x74, 0x50,
-	0x43, 0x37, 0x82, 0x4b, 0xa4, 0xf2, 0x0c, 0x56, 0x47, 0x34, 0xf2, 0xbe, 0x95, 0x5c, 0x96, 0x29,
-	0xe6, 0x54, 0x8a, 0xcd, 0xab, 0xf0, 0x3f, 0x85, 0x5f, 0x1e, 0x9d, 0x37, 0x95, 0x33, 0xeb, 0x31,
-	0x2c, 0x57, 0x0b, 0x3a, 0x20, 0xb9, 0x7d, 0x0b, 0x5a, 0x4a, 0xa0, 0x15, 0x81, 0x28, 0xc5, 0x2a,
-	0xe1, 0xdc, 0x85, 0x85, 0x4c, 0xf8, 0xa9, 0xf0, 0x58, 0x18, 0x4a, 0x05, 0x4b, 0x46, 0x1b, 0xa8,
-	0xad, 0x6c, 0x87, 0xca, 0xe4, 0x3c, 0x82, 0x85, 0x92, 0x44, 0x89, 0xb7, 0x0d, 0x20, 0xaf, 0x4b,
-	0xe4, 0xde, 0x73, 0x52, 0x8c, 0x8f, 0xb5, 0x99, 0x6d, 0x49, 0x72, 0xd4, 0xd2, 0x21, 0x07, 0x24,
-	0x77, 0xfe, 0xb4, 0xa0, 0x21, 0x71, 0xfe, 0xcb, 0x21, 0xf1, 0x89, 0xd1, 0xbf, 0x56, 0xdd, 0xe6,
-	0x6b, 0xaa, 0x71, 0xe5, 0xd1, 0xf7, 0x62, 0x32, 0x26, 0x89, 0xd0, 0xcd, 0xd2, 0x3d, 0x96, 0xf3,
-	0xbb, 0x34, 0xca, 0x7e, 0x52, 0x43, 0xc7, 0xf4, 0x93, 0x1a, 0x24, 0x2b, 0x50, 0x37, 0xb3, 0xbc,
-	0x31, 0xa8, 0xa1, 0x3a, 0xc5, 0xf6, 0x4d, 0x33, 0x68, 0xa5, 0x4a, 0x5a, 0x83, 0x9a, 0x1e, 0xb5,
-	0xfd, 0x16, 0xcc, 0x53, 0xac, 0x9e, 0x5c, 0xe7, 0x57, 0x0b, 0x5a, 0x88, 0x04, 0x2c, 0xc5, 0xf2,
-	0xc0, 0xcf, 0x60, 0xf5, 0xbc, 0xca, 0xa6, 0xfc, 0x6d, 0x5e, 0x55, 0x61, 0x07, 0x44, 0xbe, 0xa3,
-	0xcb, 0xc1, 0x85, 0x3b, 0x3e, 0x84, 0xc5, 0x69, 0x77, 0x48, 0x58, 0xdd, 0x19, 0x1b, 0x57, 0xea,
-	0x0c, 0x8d, 0xb9, 0x80, 0x2b, 0xdf, 0xa5, 0x9e, 0xce, 0x60, 0xf1, 0x5c, 0xf7, 0x5f, 0x78, 0xd9,
-	0xac, 0x8b, 0x2f, 0xdb, 0x6d, 0x00, 0x85, 0x43, 0xaa, 0x0f, 0x9f, 0xb1, 0x0c, 0xb1, 0xfd, 0x7f,
-	0x68, 0xea, 0xf9, 0x43, 0xb1, 0x66, 0x0d, 0xcd, 0xab, 0xef, 0x21, 0x76, 0xf6, 0xa0, 0xb9, 0xa7,
-	0x34, 0x32, 0xc4, 0xf6, 0x87, 0x70, 0x4d, 0x8d, 0x11, 0xc3, 0xce, 0x95, 0xa6, 0x88, 0x8e, 0xe8,
-	0xff, 0x68, 0xc1, 0x9d, 0x80, 0x8d, 0x67, 0x44, 0xf4, 0x61, 0x37, 0xe6, 0xc5, 0xf0, 0xb4, 0xbe,
-	0xfc, 0xd8, 0x78, 0x46, 0x2c, 0xf6, 0x93, 0xc8, 0x65, 0x69, 0xd4, 0x8b, 0x48, 0xa2, 0x7e, 0xb9,
-	0x7a, 0x7a, 0xcb, 0xe7, 0x34, 0xbb, 0xec, 0xd7, 0xef, 0x23, 0x1c, 0xf3, 0x9f, 0xea, 0x9d, 0xcf,
-	0x74, 0xbc, 0xba, 0x25, 0x77, 0x37, 0xe6, 0xee, 0xd3, 0xad, 0xbe, 0xdc, 0xfe, 0xad, 0xd8, 0x3a,
-	0x55, 0x5b, 0xa7, 0xbb, 0x31, 0x3f, 0x7d, 0xaa, 0x23, 0x47, 0xd7, 0x15, 0xfe, 0x7b, 0x7f, 0x05,
-	0x00, 0x00, 0xff, 0xff, 0x05, 0x77, 0xdf, 0xed, 0x59, 0x0a, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta2/dlp.pb.go b/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta2/dlp.pb.go
deleted file mode 100644
index 5a89152f..00000000
--- a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta2/dlp.pb.go
+++ /dev/null
@@ -1,7704 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/privacy/dlp/v2beta2/dlp.proto
-
-/*
-Package dlp is a generated protocol buffer package.
-
-It is generated from these files:
-	google/privacy/dlp/v2beta2/dlp.proto
-	google/privacy/dlp/v2beta2/storage.proto
-
-It has these top-level messages:
-	InspectConfig
-	ContentItem
-	Table
-	InspectResult
-	Finding
-	Location
-	TableLocation
-	Range
-	ImageLocation
-	RedactImageRequest
-	Color
-	RedactImageResponse
-	DeidentifyContentRequest
-	DeidentifyContentResponse
-	ReidentifyContentRequest
-	ReidentifyContentResponse
-	InspectContentRequest
-	InspectContentResponse
-	InspectDataSourceRequest
-	OutputStorageConfig
-	InfoTypeStatistics
-	InspectDataSourceDetails
-	InfoTypeDescription
-	ListInfoTypesRequest
-	ListInfoTypesResponse
-	AnalyzeDataSourceRiskRequest
-	RiskAnalysisJobConfig
-	PrivacyMetric
-	AnalyzeDataSourceRiskDetails
-	ValueFrequency
-	Value
-	DeidentifyConfig
-	PrimitiveTransformation
-	TimePartConfig
-	CryptoHashConfig
-	ReplaceValueConfig
-	ReplaceWithInfoTypeConfig
-	RedactConfig
-	CharsToIgnore
-	CharacterMaskConfig
-	FixedSizeBucketingConfig
-	BucketingConfig
-	CryptoReplaceFfxFpeConfig
-	CryptoKey
-	TransientCryptoKey
-	UnwrappedCryptoKey
-	KmsWrappedCryptoKey
-	InfoTypeTransformations
-	FieldTransformation
-	RecordTransformations
-	RecordSuppression
-	RecordCondition
-	TransformationOverview
-	TransformationSummary
-	InspectTemplate
-	DeidentifyTemplate
-	CreateInspectTemplateRequest
-	UpdateInspectTemplateRequest
-	GetInspectTemplateRequest
-	ListInspectTemplatesRequest
-	ListInspectTemplatesResponse
-	DeleteInspectTemplateRequest
-	InspectJobConfig
-	DlpJob
-	GetDlpJobRequest
-	ListDlpJobsRequest
-	ListDlpJobsResponse
-	CancelDlpJobRequest
-	DeleteDlpJobRequest
-	CreateDeidentifyTemplateRequest
-	UpdateDeidentifyTemplateRequest
-	GetDeidentifyTemplateRequest
-	ListDeidentifyTemplatesRequest
-	ListDeidentifyTemplatesResponse
-	DeleteDeidentifyTemplateRequest
-	InfoType
-	CustomInfoType
-	FieldId
-	PartitionId
-	KindExpression
-	DatastoreOptions
-	CloudStorageOptions
-	BigQueryOptions
-	StorageConfig
-	CloudStorageKey
-	DatastoreKey
-	Key
-	RecordKey
-	BigQueryTable
-	EntityId
-*/
-package dlp
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf4 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
-import google_type "google.golang.org/genproto/googleapis/type/date"
-import _ "google.golang.org/genproto/googleapis/type/dayofweek"
-import google_type2 "google.golang.org/genproto/googleapis/type/timeofday"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-// Parts of the APIs which use certain infoTypes.
-type InfoTypeSupportedBy int32
-
-const (
-	InfoTypeSupportedBy_ENUM_TYPE_UNSPECIFIED InfoTypeSupportedBy = 0
-	// Supported by the inspect operations.
-	InfoTypeSupportedBy_INSPECT InfoTypeSupportedBy = 1
-	// Supported by the risk analysis operations.
-	InfoTypeSupportedBy_RISK_ANALYSIS InfoTypeSupportedBy = 2
-)
-
-var InfoTypeSupportedBy_name = map[int32]string{
-	0: "ENUM_TYPE_UNSPECIFIED",
-	1: "INSPECT",
-	2: "RISK_ANALYSIS",
-}
-var InfoTypeSupportedBy_value = map[string]int32{
-	"ENUM_TYPE_UNSPECIFIED": 0,
-	"INSPECT":               1,
-	"RISK_ANALYSIS":         2,
-}
-
-func (x InfoTypeSupportedBy) String() string {
-	return proto.EnumName(InfoTypeSupportedBy_name, int32(x))
-}
-func (InfoTypeSupportedBy) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-// Operators available for comparing the value of fields.
-type RelationalOperator int32
-
-const (
-	RelationalOperator_RELATIONAL_OPERATOR_UNSPECIFIED RelationalOperator = 0
-	// Equal.
-	RelationalOperator_EQUAL_TO RelationalOperator = 1
-	// Not equal to.
-	RelationalOperator_NOT_EQUAL_TO RelationalOperator = 2
-	// Greater than.
-	RelationalOperator_GREATER_THAN RelationalOperator = 3
-	// Less than.
-	RelationalOperator_LESS_THAN RelationalOperator = 4
-	// Greater than or equals.
-	RelationalOperator_GREATER_THAN_OR_EQUALS RelationalOperator = 5
-	// Less than or equals.
-	RelationalOperator_LESS_THAN_OR_EQUALS RelationalOperator = 6
-	// Exists
-	RelationalOperator_EXISTS RelationalOperator = 7
-)
-
-var RelationalOperator_name = map[int32]string{
-	0: "RELATIONAL_OPERATOR_UNSPECIFIED",
-	1: "EQUAL_TO",
-	2: "NOT_EQUAL_TO",
-	3: "GREATER_THAN",
-	4: "LESS_THAN",
-	5: "GREATER_THAN_OR_EQUALS",
-	6: "LESS_THAN_OR_EQUALS",
-	7: "EXISTS",
-}
-var RelationalOperator_value = map[string]int32{
-	"RELATIONAL_OPERATOR_UNSPECIFIED": 0,
-	"EQUAL_TO":                        1,
-	"NOT_EQUAL_TO":                    2,
-	"GREATER_THAN":                    3,
-	"LESS_THAN":                       4,
-	"GREATER_THAN_OR_EQUALS":          5,
-	"LESS_THAN_OR_EQUALS":             6,
-	"EXISTS":                          7,
-}
-
-func (x RelationalOperator) String() string {
-	return proto.EnumName(RelationalOperator_name, int32(x))
-}
-func (RelationalOperator) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-// An enum to represent the various type of DLP jobs.
-type DlpJobType int32
-
-const (
-	DlpJobType_DLP_JOB_TYPE_UNSPECIFIED DlpJobType = 0
-	// The job inspected Google Cloud for sensitive data.
-	DlpJobType_INSPECT_JOB DlpJobType = 1
-	// The job executed a Risk Analysis computation.
-	DlpJobType_RISK_ANALYSIS_JOB DlpJobType = 2
-)
-
-var DlpJobType_name = map[int32]string{
-	0: "DLP_JOB_TYPE_UNSPECIFIED",
-	1: "INSPECT_JOB",
-	2: "RISK_ANALYSIS_JOB",
-}
-var DlpJobType_value = map[string]int32{
-	"DLP_JOB_TYPE_UNSPECIFIED": 0,
-	"INSPECT_JOB":              1,
-	"RISK_ANALYSIS_JOB":        2,
-}
-
-func (x DlpJobType) String() string {
-	return proto.EnumName(DlpJobType_name, int32(x))
-}
-func (DlpJobType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-type TimePartConfig_TimePart int32
-
-const (
-	TimePartConfig_TIME_PART_UNSPECIFIED TimePartConfig_TimePart = 0
-	// [0-9999]
-	TimePartConfig_YEAR TimePartConfig_TimePart = 1
-	// [1-12]
-	TimePartConfig_MONTH TimePartConfig_TimePart = 2
-	// [1-31]
-	TimePartConfig_DAY_OF_MONTH TimePartConfig_TimePart = 3
-	// [1-7]
-	TimePartConfig_DAY_OF_WEEK TimePartConfig_TimePart = 4
-	// [1-52]
-	TimePartConfig_WEEK_OF_YEAR TimePartConfig_TimePart = 5
-	// [0-23]
-	TimePartConfig_HOUR_OF_DAY TimePartConfig_TimePart = 6
-)
-
-var TimePartConfig_TimePart_name = map[int32]string{
-	0: "TIME_PART_UNSPECIFIED",
-	1: "YEAR",
-	2: "MONTH",
-	3: "DAY_OF_MONTH",
-	4: "DAY_OF_WEEK",
-	5: "WEEK_OF_YEAR",
-	6: "HOUR_OF_DAY",
-}
-var TimePartConfig_TimePart_value = map[string]int32{
-	"TIME_PART_UNSPECIFIED": 0,
-	"YEAR":                  1,
-	"MONTH":                 2,
-	"DAY_OF_MONTH":          3,
-	"DAY_OF_WEEK":           4,
-	"WEEK_OF_YEAR":          5,
-	"HOUR_OF_DAY":           6,
-}
-
-func (x TimePartConfig_TimePart) String() string {
-	return proto.EnumName(TimePartConfig_TimePart_name, int32(x))
-}
-func (TimePartConfig_TimePart) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{33, 0} }
-
-type CharsToIgnore_CommonCharsToIgnore int32
-
-const (
-	CharsToIgnore_COMMON_CHARS_TO_IGNORE_UNSPECIFIED CharsToIgnore_CommonCharsToIgnore = 0
-	// 0-9
-	CharsToIgnore_NUMERIC CharsToIgnore_CommonCharsToIgnore = 1
-	// A-Z
-	CharsToIgnore_ALPHA_UPPER_CASE CharsToIgnore_CommonCharsToIgnore = 2
-	// a-z
-	CharsToIgnore_ALPHA_LOWER_CASE CharsToIgnore_CommonCharsToIgnore = 3
-	// US Punctuation, one of !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
-	CharsToIgnore_PUNCTUATION CharsToIgnore_CommonCharsToIgnore = 4
-	// Whitespace character, one of [ \t\n\x0B\f\r]
-	CharsToIgnore_WHITESPACE CharsToIgnore_CommonCharsToIgnore = 5
-)
-
-var CharsToIgnore_CommonCharsToIgnore_name = map[int32]string{
-	0: "COMMON_CHARS_TO_IGNORE_UNSPECIFIED",
-	1: "NUMERIC",
-	2: "ALPHA_UPPER_CASE",
-	3: "ALPHA_LOWER_CASE",
-	4: "PUNCTUATION",
-	5: "WHITESPACE",
-}
-var CharsToIgnore_CommonCharsToIgnore_value = map[string]int32{
-	"COMMON_CHARS_TO_IGNORE_UNSPECIFIED": 0,
-	"NUMERIC":          1,
-	"ALPHA_UPPER_CASE": 2,
-	"ALPHA_LOWER_CASE": 3,
-	"PUNCTUATION":      4,
-	"WHITESPACE":       5,
-}
-
-func (x CharsToIgnore_CommonCharsToIgnore) String() string {
-	return proto.EnumName(CharsToIgnore_CommonCharsToIgnore_name, int32(x))
-}
-func (CharsToIgnore_CommonCharsToIgnore) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{38, 0}
-}
-
-// These are commonly used subsets of the alphabet that the FFX mode
-// natively supports. In the algorithm, the alphabet is selected using
-// the "radix". Therefore each corresponds to particular radix.
-type CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet int32
-
-const (
-	CryptoReplaceFfxFpeConfig_FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 0
-	// [0-9] (radix of 10)
-	CryptoReplaceFfxFpeConfig_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 1
-	// [0-9A-F] (radix of 16)
-	CryptoReplaceFfxFpeConfig_HEXADECIMAL CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 2
-	// [0-9A-Z] (radix of 36)
-	CryptoReplaceFfxFpeConfig_UPPER_CASE_ALPHA_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 3
-	// [0-9A-Za-z] (radix of 62)
-	CryptoReplaceFfxFpeConfig_ALPHA_NUMERIC CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet = 4
-)
-
-var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name = map[int32]string{
-	0: "FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED",
-	1: "NUMERIC",
-	2: "HEXADECIMAL",
-	3: "UPPER_CASE_ALPHA_NUMERIC",
-	4: "ALPHA_NUMERIC",
-}
-var CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value = map[string]int32{
-	"FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED": 0,
-	"NUMERIC":                  1,
-	"HEXADECIMAL":              2,
-	"UPPER_CASE_ALPHA_NUMERIC": 3,
-	"ALPHA_NUMERIC":            4,
-}
-
-func (x CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet) String() string {
-	return proto.EnumName(CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, int32(x))
-}
-func (CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{42, 0}
-}
-
-type RecordCondition_Expressions_LogicalOperator int32
-
-const (
-	RecordCondition_Expressions_LOGICAL_OPERATOR_UNSPECIFIED RecordCondition_Expressions_LogicalOperator = 0
-	RecordCondition_Expressions_AND                          RecordCondition_Expressions_LogicalOperator = 1
-)
-
-var RecordCondition_Expressions_LogicalOperator_name = map[int32]string{
-	0: "LOGICAL_OPERATOR_UNSPECIFIED",
-	1: "AND",
-}
-var RecordCondition_Expressions_LogicalOperator_value = map[string]int32{
-	"LOGICAL_OPERATOR_UNSPECIFIED": 0,
-	"AND": 1,
-}
-
-func (x RecordCondition_Expressions_LogicalOperator) String() string {
-	return proto.EnumName(RecordCondition_Expressions_LogicalOperator_name, int32(x))
-}
-func (RecordCondition_Expressions_LogicalOperator) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{51, 2, 0}
-}
-
-// Possible outcomes of transformations.
-type TransformationSummary_TransformationResultCode int32
-
-const (
-	TransformationSummary_TRANSFORMATION_RESULT_CODE_UNSPECIFIED TransformationSummary_TransformationResultCode = 0
-	TransformationSummary_SUCCESS                                TransformationSummary_TransformationResultCode = 1
-	TransformationSummary_ERROR                                  TransformationSummary_TransformationResultCode = 2
-)
-
-var TransformationSummary_TransformationResultCode_name = map[int32]string{
-	0: "TRANSFORMATION_RESULT_CODE_UNSPECIFIED",
-	1: "SUCCESS",
-	2: "ERROR",
-}
-var TransformationSummary_TransformationResultCode_value = map[string]int32{
-	"TRANSFORMATION_RESULT_CODE_UNSPECIFIED": 0,
-	"SUCCESS": 1,
-	"ERROR":   2,
-}
-
-func (x TransformationSummary_TransformationResultCode) String() string {
-	return proto.EnumName(TransformationSummary_TransformationResultCode_name, int32(x))
-}
-func (TransformationSummary_TransformationResultCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{53, 0}
-}
-
-type DlpJob_JobState int32
-
-const (
-	DlpJob_JOB_STATE_UNSPECIFIED DlpJob_JobState = 0
-	// The job has not yet started.
-	DlpJob_PENDING DlpJob_JobState = 1
-	// The job is currently running.
-	DlpJob_RUNNING DlpJob_JobState = 2
-	// The job is no longer running.
-	DlpJob_DONE DlpJob_JobState = 3
-	// The job was canceled before it could complete.
-	DlpJob_CANCELED DlpJob_JobState = 4
-	// The job had an error and did not complete.
-	DlpJob_FAILED DlpJob_JobState = 5
-)
-
-var DlpJob_JobState_name = map[int32]string{
-	0: "JOB_STATE_UNSPECIFIED",
-	1: "PENDING",
-	2: "RUNNING",
-	3: "DONE",
-	4: "CANCELED",
-	5: "FAILED",
-}
-var DlpJob_JobState_value = map[string]int32{
-	"JOB_STATE_UNSPECIFIED": 0,
-	"PENDING":               1,
-	"RUNNING":               2,
-	"DONE":                  3,
-	"CANCELED":              4,
-	"FAILED":                5,
-}
-
-func (x DlpJob_JobState) String() string {
-	return proto.EnumName(DlpJob_JobState_name, int32(x))
-}
-func (DlpJob_JobState) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{63, 0} }
-
-// Configuration description of the scanning process.
-// When used with redactContent only info_types and min_likelihood are currently
-// used.
-type InspectConfig struct {
-	// Restricts what info_types to look for. The values must correspond to
-	// InfoType values returned by ListInfoTypes or found in documentation.
-	// Empty info_types runs all enabled detectors.
-	InfoTypes []*InfoType `protobuf:"bytes,1,rep,name=info_types,json=infoTypes" json:"info_types,omitempty"`
-	// Only returns findings equal or above this threshold. The default is
-	// POSSIBLE.
-	MinLikelihood Likelihood                   `protobuf:"varint,2,opt,name=min_likelihood,json=minLikelihood,enum=google.privacy.dlp.v2beta2.Likelihood" json:"min_likelihood,omitempty"`
-	Limits        *InspectConfig_FindingLimits `protobuf:"bytes,3,opt,name=limits" json:"limits,omitempty"`
-	// When true, a contextual quote from the data that triggered a finding is
-	// included in the response; see Finding.quote.
-	IncludeQuote bool `protobuf:"varint,4,opt,name=include_quote,json=includeQuote" json:"include_quote,omitempty"`
-	// When true, excludes type information of the findings.
-	ExcludeInfoTypes bool `protobuf:"varint,5,opt,name=exclude_info_types,json=excludeInfoTypes" json:"exclude_info_types,omitempty"`
-	// Custom infoTypes provided by the user.
-	CustomInfoTypes []*CustomInfoType `protobuf:"bytes,6,rep,name=custom_info_types,json=customInfoTypes" json:"custom_info_types,omitempty"`
-}
-
-func (m *InspectConfig) Reset()                    { *m = InspectConfig{} }
-func (m *InspectConfig) String() string            { return proto.CompactTextString(m) }
-func (*InspectConfig) ProtoMessage()               {}
-func (*InspectConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *InspectConfig) GetInfoTypes() []*InfoType {
-	if m != nil {
-		return m.InfoTypes
-	}
-	return nil
-}
-
-func (m *InspectConfig) GetMinLikelihood() Likelihood {
-	if m != nil {
-		return m.MinLikelihood
-	}
-	return Likelihood_LIKELIHOOD_UNSPECIFIED
-}
-
-func (m *InspectConfig) GetLimits() *InspectConfig_FindingLimits {
-	if m != nil {
-		return m.Limits
-	}
-	return nil
-}
-
-func (m *InspectConfig) GetIncludeQuote() bool {
-	if m != nil {
-		return m.IncludeQuote
-	}
-	return false
-}
-
-func (m *InspectConfig) GetExcludeInfoTypes() bool {
-	if m != nil {
-		return m.ExcludeInfoTypes
-	}
-	return false
-}
-
-func (m *InspectConfig) GetCustomInfoTypes() []*CustomInfoType {
-	if m != nil {
-		return m.CustomInfoTypes
-	}
-	return nil
-}
-
-type InspectConfig_FindingLimits struct {
-	// Max number of findings that will be returned for each item scanned.
-	MaxFindingsPerItem int32 `protobuf:"varint,1,opt,name=max_findings_per_item,json=maxFindingsPerItem" json:"max_findings_per_item,omitempty"`
-	// Max total number of findings that will be returned per request/job.
-	MaxFindingsPerRequest int32 `protobuf:"varint,2,opt,name=max_findings_per_request,json=maxFindingsPerRequest" json:"max_findings_per_request,omitempty"`
-	// Configuration of findings limit given for specified infoTypes.
-	MaxFindingsPerInfoType []*InspectConfig_FindingLimits_InfoTypeLimit `protobuf:"bytes,3,rep,name=max_findings_per_info_type,json=maxFindingsPerInfoType" json:"max_findings_per_info_type,omitempty"`
-}
-
-func (m *InspectConfig_FindingLimits) Reset()                    { *m = InspectConfig_FindingLimits{} }
-func (m *InspectConfig_FindingLimits) String() string            { return proto.CompactTextString(m) }
-func (*InspectConfig_FindingLimits) ProtoMessage()               {}
-func (*InspectConfig_FindingLimits) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
-
-func (m *InspectConfig_FindingLimits) GetMaxFindingsPerItem() int32 {
-	if m != nil {
-		return m.MaxFindingsPerItem
-	}
-	return 0
-}
-
-func (m *InspectConfig_FindingLimits) GetMaxFindingsPerRequest() int32 {
-	if m != nil {
-		return m.MaxFindingsPerRequest
-	}
-	return 0
-}
-
-func (m *InspectConfig_FindingLimits) GetMaxFindingsPerInfoType() []*InspectConfig_FindingLimits_InfoTypeLimit {
-	if m != nil {
-		return m.MaxFindingsPerInfoType
-	}
-	return nil
-}
-
-// Max findings configuration per infoType, per content item or long
-// running DlpJob.
-type InspectConfig_FindingLimits_InfoTypeLimit struct {
-	// Type of information the findings limit applies to. Only one limit per
-	// info_type should be provided. If InfoTypeLimit does not have an
-	// info_type, the DLP API applies the limit against all info_types that
-	// are found but not specified in another InfoTypeLimit.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Max findings limit for the given infoType.
-	MaxFindings int32 `protobuf:"varint,2,opt,name=max_findings,json=maxFindings" json:"max_findings,omitempty"`
-}
-
-func (m *InspectConfig_FindingLimits_InfoTypeLimit) Reset() {
-	*m = InspectConfig_FindingLimits_InfoTypeLimit{}
-}
-func (m *InspectConfig_FindingLimits_InfoTypeLimit) String() string { return proto.CompactTextString(m) }
-func (*InspectConfig_FindingLimits_InfoTypeLimit) ProtoMessage()    {}
-func (*InspectConfig_FindingLimits_InfoTypeLimit) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{0, 0, 0}
-}
-
-func (m *InspectConfig_FindingLimits_InfoTypeLimit) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *InspectConfig_FindingLimits_InfoTypeLimit) GetMaxFindings() int32 {
-	if m != nil {
-		return m.MaxFindings
-	}
-	return 0
-}
-
-// Container structure for the content to inspect.
-type ContentItem struct {
-	// Type of the content, as defined in Content-Type HTTP header.
-	// Supported types are: all "text" types, octet streams, PNG images,
-	// JPEG images.
-	Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
-	// Data of the item either in the byte array or UTF-8 string form.
-	//
-	// Types that are valid to be assigned to DataItem:
-	//	*ContentItem_Data
-	//	*ContentItem_Value
-	//	*ContentItem_Table
-	DataItem isContentItem_DataItem `protobuf_oneof:"data_item"`
-}
-
-func (m *ContentItem) Reset()                    { *m = ContentItem{} }
-func (m *ContentItem) String() string            { return proto.CompactTextString(m) }
-func (*ContentItem) ProtoMessage()               {}
-func (*ContentItem) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type isContentItem_DataItem interface {
-	isContentItem_DataItem()
-}
-
-type ContentItem_Data struct {
-	Data []byte `protobuf:"bytes,2,opt,name=data,proto3,oneof"`
-}
-type ContentItem_Value struct {
-	Value string `protobuf:"bytes,3,opt,name=value,oneof"`
-}
-type ContentItem_Table struct {
-	Table *Table `protobuf:"bytes,4,opt,name=table,oneof"`
-}
-
-func (*ContentItem_Data) isContentItem_DataItem()  {}
-func (*ContentItem_Value) isContentItem_DataItem() {}
-func (*ContentItem_Table) isContentItem_DataItem() {}
-
-func (m *ContentItem) GetDataItem() isContentItem_DataItem {
-	if m != nil {
-		return m.DataItem
-	}
-	return nil
-}
-
-func (m *ContentItem) GetType() string {
-	if m != nil {
-		return m.Type
-	}
-	return ""
-}
-
-func (m *ContentItem) GetData() []byte {
-	if x, ok := m.GetDataItem().(*ContentItem_Data); ok {
-		return x.Data
-	}
-	return nil
-}
-
-func (m *ContentItem) GetValue() string {
-	if x, ok := m.GetDataItem().(*ContentItem_Value); ok {
-		return x.Value
-	}
-	return ""
-}
-
-func (m *ContentItem) GetTable() *Table {
-	if x, ok := m.GetDataItem().(*ContentItem_Table); ok {
-		return x.Table
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ContentItem) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ContentItem_OneofMarshaler, _ContentItem_OneofUnmarshaler, _ContentItem_OneofSizer, []interface{}{
-		(*ContentItem_Data)(nil),
-		(*ContentItem_Value)(nil),
-		(*ContentItem_Table)(nil),
-	}
-}
-
-func _ContentItem_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ContentItem)
-	// data_item
-	switch x := m.DataItem.(type) {
-	case *ContentItem_Data:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Data)
-	case *ContentItem_Value:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Value)
-	case *ContentItem_Table:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Table); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("ContentItem.DataItem has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ContentItem_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ContentItem)
-	switch tag {
-	case 2: // data_item.data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.DataItem = &ContentItem_Data{x}
-		return true, err
-	case 3: // data_item.value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.DataItem = &ContentItem_Value{x}
-		return true, err
-	case 4: // data_item.table
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Table)
-		err := b.DecodeMessage(msg)
-		m.DataItem = &ContentItem_Table{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ContentItem_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ContentItem)
-	// data_item
-	switch x := m.DataItem.(type) {
-	case *ContentItem_Data:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Data)))
-		n += len(x.Data)
-	case *ContentItem_Value:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Value)))
-		n += len(x.Value)
-	case *ContentItem_Table:
-		s := proto.Size(x.Table)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Structured content to inspect. Up to 50,000 `Value`s per request allowed.
-type Table struct {
-	Headers []*FieldId   `protobuf:"bytes,1,rep,name=headers" json:"headers,omitempty"`
-	Rows    []*Table_Row `protobuf:"bytes,2,rep,name=rows" json:"rows,omitempty"`
-}
-
-func (m *Table) Reset()                    { *m = Table{} }
-func (m *Table) String() string            { return proto.CompactTextString(m) }
-func (*Table) ProtoMessage()               {}
-func (*Table) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *Table) GetHeaders() []*FieldId {
-	if m != nil {
-		return m.Headers
-	}
-	return nil
-}
-
-func (m *Table) GetRows() []*Table_Row {
-	if m != nil {
-		return m.Rows
-	}
-	return nil
-}
-
-type Table_Row struct {
-	Values []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
-}
-
-func (m *Table_Row) Reset()                    { *m = Table_Row{} }
-func (m *Table_Row) String() string            { return proto.CompactTextString(m) }
-func (*Table_Row) ProtoMessage()               {}
-func (*Table_Row) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-func (m *Table_Row) GetValues() []*Value {
-	if m != nil {
-		return m.Values
-	}
-	return nil
-}
-
-// All the findings for a single scanned item.
-type InspectResult struct {
-	// List of findings for an item.
-	Findings []*Finding `protobuf:"bytes,1,rep,name=findings" json:"findings,omitempty"`
-	// If true, then this item might have more findings than were returned,
-	// and the findings returned are an arbitrary subset of all findings.
-	// The findings list might be truncated because the input items were too
-	// large, or because the server reached the maximum amount of resources
-	// allowed for a single API call. For best results, divide the input into
-	// smaller batches.
-	FindingsTruncated bool `protobuf:"varint,2,opt,name=findings_truncated,json=findingsTruncated" json:"findings_truncated,omitempty"`
-}
-
-func (m *InspectResult) Reset()                    { *m = InspectResult{} }
-func (m *InspectResult) String() string            { return proto.CompactTextString(m) }
-func (*InspectResult) ProtoMessage()               {}
-func (*InspectResult) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *InspectResult) GetFindings() []*Finding {
-	if m != nil {
-		return m.Findings
-	}
-	return nil
-}
-
-func (m *InspectResult) GetFindingsTruncated() bool {
-	if m != nil {
-		return m.FindingsTruncated
-	}
-	return false
-}
-
-// Represents a piece of potentially sensitive content.
-type Finding struct {
-	// The content that was found. Even if the content is not textual, it
-	// may be converted to a textual representation here.
-	// Provided if requested by the `InspectConfig`.
-	Quote string `protobuf:"bytes,1,opt,name=quote" json:"quote,omitempty"`
-	// The type of content that might have been found.
-	// Provided if requested by the `InspectConfig`.
-	InfoType *InfoType `protobuf:"bytes,2,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Estimate of how likely it is that the `info_type` is correct.
-	Likelihood Likelihood `protobuf:"varint,3,opt,name=likelihood,enum=google.privacy.dlp.v2beta2.Likelihood" json:"likelihood,omitempty"`
-	// Where the content was found.
-	Location *Location `protobuf:"bytes,4,opt,name=location" json:"location,omitempty"`
-	// Timestamp when finding was detected.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-}
-
-func (m *Finding) Reset()                    { *m = Finding{} }
-func (m *Finding) String() string            { return proto.CompactTextString(m) }
-func (*Finding) ProtoMessage()               {}
-func (*Finding) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *Finding) GetQuote() string {
-	if m != nil {
-		return m.Quote
-	}
-	return ""
-}
-
-func (m *Finding) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *Finding) GetLikelihood() Likelihood {
-	if m != nil {
-		return m.Likelihood
-	}
-	return Likelihood_LIKELIHOOD_UNSPECIFIED
-}
-
-func (m *Finding) GetLocation() *Location {
-	if m != nil {
-		return m.Location
-	}
-	return nil
-}
-
-func (m *Finding) GetCreateTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-// Specifies the location of the finding.
-type Location struct {
-	// Zero-based byte offsets delimiting the finding.
-	// These are relative to the finding's containing element.
-	// Note that when the content is not textual, this references
-	// the UTF-8 encoded textual representation of the content.
-	// Omitted if content is an image.
-	ByteRange *Range `protobuf:"bytes,1,opt,name=byte_range,json=byteRange" json:"byte_range,omitempty"`
-	// Unicode character offsets delimiting the finding.
-	// These are relative to the finding's containing element.
-	// Provided when the content is text.
-	CodepointRange *Range `protobuf:"bytes,2,opt,name=codepoint_range,json=codepointRange" json:"codepoint_range,omitempty"`
-	// The area within the image that contained the finding.
-	// Provided when the content is an image.
-	ImageBoxes []*ImageLocation `protobuf:"bytes,3,rep,name=image_boxes,json=imageBoxes" json:"image_boxes,omitempty"`
-	// The pointer to the record in storage that contained the field the
-	// finding was found in.
-	// Provided when the finding's containing element is a property
-	// of a storage object.
-	RecordKey *RecordKey `protobuf:"bytes,4,opt,name=record_key,json=recordKey" json:"record_key,omitempty"`
-	// The pointer to the property or cell that contained the finding.
-	// Provided when the finding's containing element is a cell in a table
-	// or a property of storage object.
-	FieldId *FieldId `protobuf:"bytes,5,opt,name=field_id,json=fieldId" json:"field_id,omitempty"`
-	// The pointer to the row of the table that contained the finding.
-	// Provided when the finding's containing element is a cell of a table.
-	TableLocation *TableLocation `protobuf:"bytes,6,opt,name=table_location,json=tableLocation" json:"table_location,omitempty"`
-}
-
-func (m *Location) Reset()                    { *m = Location{} }
-func (m *Location) String() string            { return proto.CompactTextString(m) }
-func (*Location) ProtoMessage()               {}
-func (*Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *Location) GetByteRange() *Range {
-	if m != nil {
-		return m.ByteRange
-	}
-	return nil
-}
-
-func (m *Location) GetCodepointRange() *Range {
-	if m != nil {
-		return m.CodepointRange
-	}
-	return nil
-}
-
-func (m *Location) GetImageBoxes() []*ImageLocation {
-	if m != nil {
-		return m.ImageBoxes
-	}
-	return nil
-}
-
-func (m *Location) GetRecordKey() *RecordKey {
-	if m != nil {
-		return m.RecordKey
-	}
-	return nil
-}
-
-func (m *Location) GetFieldId() *FieldId {
-	if m != nil {
-		return m.FieldId
-	}
-	return nil
-}
-
-func (m *Location) GetTableLocation() *TableLocation {
-	if m != nil {
-		return m.TableLocation
-	}
-	return nil
-}
-
-// Location of a finding within a table.
-type TableLocation struct {
-	// The zero-based index of the row where the finding is located.
-	RowIndex int64 `protobuf:"varint,1,opt,name=row_index,json=rowIndex" json:"row_index,omitempty"`
-}
-
-func (m *TableLocation) Reset()                    { *m = TableLocation{} }
-func (m *TableLocation) String() string            { return proto.CompactTextString(m) }
-func (*TableLocation) ProtoMessage()               {}
-func (*TableLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *TableLocation) GetRowIndex() int64 {
-	if m != nil {
-		return m.RowIndex
-	}
-	return 0
-}
-
-// Generic half-open interval [start, end)
-type Range struct {
-	// Index of the first character of the range (inclusive).
-	Start int64 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	// Index of the last character of the range (exclusive).
-	End int64 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-}
-
-func (m *Range) Reset()                    { *m = Range{} }
-func (m *Range) String() string            { return proto.CompactTextString(m) }
-func (*Range) ProtoMessage()               {}
-func (*Range) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *Range) GetStart() int64 {
-	if m != nil {
-		return m.Start
-	}
-	return 0
-}
-
-func (m *Range) GetEnd() int64 {
-	if m != nil {
-		return m.End
-	}
-	return 0
-}
-
-// Bounding box encompassing detected text within an image.
-type ImageLocation struct {
-	// Top coordinate of the bounding box. (0,0) is upper left.
-	Top int32 `protobuf:"varint,1,opt,name=top" json:"top,omitempty"`
-	// Left coordinate of the bounding box. (0,0) is upper left.
-	Left int32 `protobuf:"varint,2,opt,name=left" json:"left,omitempty"`
-	// Width of the bounding box in pixels.
-	Width int32 `protobuf:"varint,3,opt,name=width" json:"width,omitempty"`
-	// Height of the bounding box in pixels.
-	Height int32 `protobuf:"varint,4,opt,name=height" json:"height,omitempty"`
-}
-
-func (m *ImageLocation) Reset()                    { *m = ImageLocation{} }
-func (m *ImageLocation) String() string            { return proto.CompactTextString(m) }
-func (*ImageLocation) ProtoMessage()               {}
-func (*ImageLocation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *ImageLocation) GetTop() int32 {
-	if m != nil {
-		return m.Top
-	}
-	return 0
-}
-
-func (m *ImageLocation) GetLeft() int32 {
-	if m != nil {
-		return m.Left
-	}
-	return 0
-}
-
-func (m *ImageLocation) GetWidth() int32 {
-	if m != nil {
-		return m.Width
-	}
-	return 0
-}
-
-func (m *ImageLocation) GetHeight() int32 {
-	if m != nil {
-		return m.Height
-	}
-	return 0
-}
-
-// Request to search for potentially sensitive info in a list of items
-// and replace it with a default or provided content.
-type RedactImageRequest struct {
-	// The parent resource name, for example projects/my-project-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Configuration for the inspector.
-	InspectConfig *InspectConfig `protobuf:"bytes,2,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// Type of the content, as defined in Content-Type HTTP header.
-	// Supported types are: PNG, JPEG, SVG, & BMP.
-	ImageType string `protobuf:"bytes,3,opt,name=image_type,json=imageType" json:"image_type,omitempty"`
-	// The bytes of the image to redact.
-	ImageData []byte `protobuf:"bytes,4,opt,name=image_data,json=imageData,proto3" json:"image_data,omitempty"`
-	// The configuration for specifying what content to redact from images.
-	ImageRedactionConfigs []*RedactImageRequest_ImageRedactionConfig `protobuf:"bytes,5,rep,name=image_redaction_configs,json=imageRedactionConfigs" json:"image_redaction_configs,omitempty"`
-}
-
-func (m *RedactImageRequest) Reset()                    { *m = RedactImageRequest{} }
-func (m *RedactImageRequest) String() string            { return proto.CompactTextString(m) }
-func (*RedactImageRequest) ProtoMessage()               {}
-func (*RedactImageRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-func (m *RedactImageRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *RedactImageRequest) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *RedactImageRequest) GetImageType() string {
-	if m != nil {
-		return m.ImageType
-	}
-	return ""
-}
-
-func (m *RedactImageRequest) GetImageData() []byte {
-	if m != nil {
-		return m.ImageData
-	}
-	return nil
-}
-
-func (m *RedactImageRequest) GetImageRedactionConfigs() []*RedactImageRequest_ImageRedactionConfig {
-	if m != nil {
-		return m.ImageRedactionConfigs
-	}
-	return nil
-}
-
-// Configuration for determining how redaction of images should occur.
-type RedactImageRequest_ImageRedactionConfig struct {
-	// Type of information to redact from images.
-	//
-	// Types that are valid to be assigned to Target:
-	//	*RedactImageRequest_ImageRedactionConfig_InfoType
-	//	*RedactImageRequest_ImageRedactionConfig_RedactAllText
-	Target isRedactImageRequest_ImageRedactionConfig_Target `protobuf_oneof:"target"`
-	// The color to use when redacting content from an image. If not specified,
-	// the default is black.
-	RedactionColor *Color `protobuf:"bytes,3,opt,name=redaction_color,json=redactionColor" json:"redaction_color,omitempty"`
-}
-
-func (m *RedactImageRequest_ImageRedactionConfig) Reset() {
-	*m = RedactImageRequest_ImageRedactionConfig{}
-}
-func (m *RedactImageRequest_ImageRedactionConfig) String() string { return proto.CompactTextString(m) }
-func (*RedactImageRequest_ImageRedactionConfig) ProtoMessage()    {}
-func (*RedactImageRequest_ImageRedactionConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{9, 0}
-}
-
-type isRedactImageRequest_ImageRedactionConfig_Target interface {
-	isRedactImageRequest_ImageRedactionConfig_Target()
-}
-
-type RedactImageRequest_ImageRedactionConfig_InfoType struct {
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType,oneof"`
-}
-type RedactImageRequest_ImageRedactionConfig_RedactAllText struct {
-	RedactAllText bool `protobuf:"varint,2,opt,name=redact_all_text,json=redactAllText,oneof"`
-}
-
-func (*RedactImageRequest_ImageRedactionConfig_InfoType) isRedactImageRequest_ImageRedactionConfig_Target() {
-}
-func (*RedactImageRequest_ImageRedactionConfig_RedactAllText) isRedactImageRequest_ImageRedactionConfig_Target() {
-}
-
-func (m *RedactImageRequest_ImageRedactionConfig) GetTarget() isRedactImageRequest_ImageRedactionConfig_Target {
-	if m != nil {
-		return m.Target
-	}
-	return nil
-}
-
-func (m *RedactImageRequest_ImageRedactionConfig) GetInfoType() *InfoType {
-	if x, ok := m.GetTarget().(*RedactImageRequest_ImageRedactionConfig_InfoType); ok {
-		return x.InfoType
-	}
-	return nil
-}
-
-func (m *RedactImageRequest_ImageRedactionConfig) GetRedactAllText() bool {
-	if x, ok := m.GetTarget().(*RedactImageRequest_ImageRedactionConfig_RedactAllText); ok {
-		return x.RedactAllText
-	}
-	return false
-}
-
-func (m *RedactImageRequest_ImageRedactionConfig) GetRedactionColor() *Color {
-	if m != nil {
-		return m.RedactionColor
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RedactImageRequest_ImageRedactionConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RedactImageRequest_ImageRedactionConfig_OneofMarshaler, _RedactImageRequest_ImageRedactionConfig_OneofUnmarshaler, _RedactImageRequest_ImageRedactionConfig_OneofSizer, []interface{}{
-		(*RedactImageRequest_ImageRedactionConfig_InfoType)(nil),
-		(*RedactImageRequest_ImageRedactionConfig_RedactAllText)(nil),
-	}
-}
-
-func _RedactImageRequest_ImageRedactionConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RedactImageRequest_ImageRedactionConfig)
-	// target
-	switch x := m.Target.(type) {
-	case *RedactImageRequest_ImageRedactionConfig_InfoType:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoType); err != nil {
-			return err
-		}
-	case *RedactImageRequest_ImageRedactionConfig_RedactAllText:
-		t := uint64(0)
-		if x.RedactAllText {
-			t = 1
-		}
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("RedactImageRequest_ImageRedactionConfig.Target has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RedactImageRequest_ImageRedactionConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RedactImageRequest_ImageRedactionConfig)
-	switch tag {
-	case 1: // target.info_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoType)
-		err := b.DecodeMessage(msg)
-		m.Target = &RedactImageRequest_ImageRedactionConfig_InfoType{msg}
-		return true, err
-	case 2: // target.redact_all_text
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Target = &RedactImageRequest_ImageRedactionConfig_RedactAllText{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RedactImageRequest_ImageRedactionConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RedactImageRequest_ImageRedactionConfig)
-	// target
-	switch x := m.Target.(type) {
-	case *RedactImageRequest_ImageRedactionConfig_InfoType:
-		s := proto.Size(x.InfoType)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RedactImageRequest_ImageRedactionConfig_RedactAllText:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Represents a color in the RGB color space.
-type Color struct {
-	// The amount of red in the color as a value in the interval [0, 1].
-	Red float32 `protobuf:"fixed32,1,opt,name=red" json:"red,omitempty"`
-	// The amount of green in the color as a value in the interval [0, 1].
-	Green float32 `protobuf:"fixed32,2,opt,name=green" json:"green,omitempty"`
-	// The amount of blue in the color as a value in the interval [0, 1].
-	Blue float32 `protobuf:"fixed32,3,opt,name=blue" json:"blue,omitempty"`
-}
-
-func (m *Color) Reset()                    { *m = Color{} }
-func (m *Color) String() string            { return proto.CompactTextString(m) }
-func (*Color) ProtoMessage()               {}
-func (*Color) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-func (m *Color) GetRed() float32 {
-	if m != nil {
-		return m.Red
-	}
-	return 0
-}
-
-func (m *Color) GetGreen() float32 {
-	if m != nil {
-		return m.Green
-	}
-	return 0
-}
-
-func (m *Color) GetBlue() float32 {
-	if m != nil {
-		return m.Blue
-	}
-	return 0
-}
-
-// Results of redacting an image.
-type RedactImageResponse struct {
-	// The redacted image. The type will be the same as the original image.
-	RedactedImage []byte `protobuf:"bytes,1,opt,name=redacted_image,json=redactedImage,proto3" json:"redacted_image,omitempty"`
-	// If an image was being inspected and the InspectConfig's include_quote was
-	// set to true, then this field will include all text, if any, that was found
-	// in the image.
-	ExtractedText string `protobuf:"bytes,2,opt,name=extracted_text,json=extractedText" json:"extracted_text,omitempty"`
-}
-
-func (m *RedactImageResponse) Reset()                    { *m = RedactImageResponse{} }
-func (m *RedactImageResponse) String() string            { return proto.CompactTextString(m) }
-func (*RedactImageResponse) ProtoMessage()               {}
-func (*RedactImageResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-func (m *RedactImageResponse) GetRedactedImage() []byte {
-	if m != nil {
-		return m.RedactedImage
-	}
-	return nil
-}
-
-func (m *RedactImageResponse) GetExtractedText() string {
-	if m != nil {
-		return m.ExtractedText
-	}
-	return ""
-}
-
-// Request to de-identify a list of items.
-type DeidentifyContentRequest struct {
-	// The parent resource name, for example projects/my-project-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Configuration for the de-identification of the content item.
-	// Items specified here will override the template referenced by the
-	// deidentify_template_name argument.
-	DeidentifyConfig *DeidentifyConfig `protobuf:"bytes,2,opt,name=deidentify_config,json=deidentifyConfig" json:"deidentify_config,omitempty"`
-	// Configuration for the inspector.
-	// Items specified here will override the template referenced by the
-	// inspect_template_name argument.
-	InspectConfig *InspectConfig `protobuf:"bytes,3,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// The item to de-identify. Will be treated as text.
-	Item *ContentItem `protobuf:"bytes,4,opt,name=item" json:"item,omitempty"`
-	// Optional template to use. Any configuration directly specified in
-	// inspect_config will override those set in the template. Singular fields
-	// that are set in this request will replace their corresponding fields in the
-	// template. Repeated fields are appended. Singular sub-messages and groups
-	// are recursively merged.
-	InspectTemplateName string `protobuf:"bytes,5,opt,name=inspect_template_name,json=inspectTemplateName" json:"inspect_template_name,omitempty"`
-	// Optional template to use. Any configuration directly specified in
-	// deidentify_config will override those set in the template. Singular fields
-	// that are set in this request will replace their corresponding fields in the
-	// template. Repeated fields are appended. Singular sub-messages and groups
-	// are recursively merged.
-	DeidentifyTemplateName string `protobuf:"bytes,6,opt,name=deidentify_template_name,json=deidentifyTemplateName" json:"deidentify_template_name,omitempty"`
-}
-
-func (m *DeidentifyContentRequest) Reset()                    { *m = DeidentifyContentRequest{} }
-func (m *DeidentifyContentRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeidentifyContentRequest) ProtoMessage()               {}
-func (*DeidentifyContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-func (m *DeidentifyContentRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *DeidentifyContentRequest) GetDeidentifyConfig() *DeidentifyConfig {
-	if m != nil {
-		return m.DeidentifyConfig
-	}
-	return nil
-}
-
-func (m *DeidentifyContentRequest) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *DeidentifyContentRequest) GetItem() *ContentItem {
-	if m != nil {
-		return m.Item
-	}
-	return nil
-}
-
-func (m *DeidentifyContentRequest) GetInspectTemplateName() string {
-	if m != nil {
-		return m.InspectTemplateName
-	}
-	return ""
-}
-
-func (m *DeidentifyContentRequest) GetDeidentifyTemplateName() string {
-	if m != nil {
-		return m.DeidentifyTemplateName
-	}
-	return ""
-}
-
-// Results of de-identifying a ContentItem.
-type DeidentifyContentResponse struct {
-	// The de-identified item.
-	Item *ContentItem `protobuf:"bytes,1,opt,name=item" json:"item,omitempty"`
-	// An overview of the changes that were made on the `item`.
-	Overview *TransformationOverview `protobuf:"bytes,2,opt,name=overview" json:"overview,omitempty"`
-}
-
-func (m *DeidentifyContentResponse) Reset()                    { *m = DeidentifyContentResponse{} }
-func (m *DeidentifyContentResponse) String() string            { return proto.CompactTextString(m) }
-func (*DeidentifyContentResponse) ProtoMessage()               {}
-func (*DeidentifyContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
-
-func (m *DeidentifyContentResponse) GetItem() *ContentItem {
-	if m != nil {
-		return m.Item
-	}
-	return nil
-}
-
-func (m *DeidentifyContentResponse) GetOverview() *TransformationOverview {
-	if m != nil {
-		return m.Overview
-	}
-	return nil
-}
-
-// Request to re-identify an item.
-type ReidentifyContentRequest struct {
-	// The parent resource name.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Configuration for the re-identification of the content item.
-	// This field shares the same proto message type that is used for
-	// de-identification, however its usage here is for the reversal of the
-	// previous de-identification. Re-identification is performed by examining
-	// the transformations used to de-identify the items and executing the
-	// reverse. This requires that only reversible transformations
-	// be provided here. The reversible transformations are:
-	//
-	//  - `CryptoReplaceFfxFpeConfig`
-	ReidentifyConfig *DeidentifyConfig `protobuf:"bytes,2,opt,name=reidentify_config,json=reidentifyConfig" json:"reidentify_config,omitempty"`
-	// Configuration for the inspector.
-	InspectConfig *InspectConfig `protobuf:"bytes,3,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// The item to re-identify. Will be treated as text.
-	Item *ContentItem `protobuf:"bytes,4,opt,name=item" json:"item,omitempty"`
-	// Optional template to use. Any configuration directly specified in
-	// `inspect_config` will override those set in the template. Singular fields
-	// that are set in this request will replace their corresponding fields in the
-	// template. Repeated fields are appended. Singular sub-messages and groups
-	// are recursively merged.
-	InspectTemplateName string `protobuf:"bytes,5,opt,name=inspect_template_name,json=inspectTemplateName" json:"inspect_template_name,omitempty"`
-	// Optional template to use. References an instance of `DeidentifyTemplate`.
-	// Any configuration directly specified in `reidentify_config` or
-	// `inspect_config` will override those set in the template. Singular fields
-	// that are set in this request will replace their corresponding fields in the
-	// template. Repeated fields are appended. Singular sub-messages and groups
-	// are recursively merged.
-	ReidentifyTemplateName string `protobuf:"bytes,6,opt,name=reidentify_template_name,json=reidentifyTemplateName" json:"reidentify_template_name,omitempty"`
-}
-
-func (m *ReidentifyContentRequest) Reset()                    { *m = ReidentifyContentRequest{} }
-func (m *ReidentifyContentRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReidentifyContentRequest) ProtoMessage()               {}
-func (*ReidentifyContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
-
-func (m *ReidentifyContentRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *ReidentifyContentRequest) GetReidentifyConfig() *DeidentifyConfig {
-	if m != nil {
-		return m.ReidentifyConfig
-	}
-	return nil
-}
-
-func (m *ReidentifyContentRequest) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *ReidentifyContentRequest) GetItem() *ContentItem {
-	if m != nil {
-		return m.Item
-	}
-	return nil
-}
-
-func (m *ReidentifyContentRequest) GetInspectTemplateName() string {
-	if m != nil {
-		return m.InspectTemplateName
-	}
-	return ""
-}
-
-func (m *ReidentifyContentRequest) GetReidentifyTemplateName() string {
-	if m != nil {
-		return m.ReidentifyTemplateName
-	}
-	return ""
-}
-
-// Results of re-identifying a item.
-type ReidentifyContentResponse struct {
-	// The re-identified item.
-	Item *ContentItem `protobuf:"bytes,1,opt,name=item" json:"item,omitempty"`
-	// An overview of the changes that were made to the `item`.
-	Overview *TransformationOverview `protobuf:"bytes,2,opt,name=overview" json:"overview,omitempty"`
-}
-
-func (m *ReidentifyContentResponse) Reset()                    { *m = ReidentifyContentResponse{} }
-func (m *ReidentifyContentResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReidentifyContentResponse) ProtoMessage()               {}
-func (*ReidentifyContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
-
-func (m *ReidentifyContentResponse) GetItem() *ContentItem {
-	if m != nil {
-		return m.Item
-	}
-	return nil
-}
-
-func (m *ReidentifyContentResponse) GetOverview() *TransformationOverview {
-	if m != nil {
-		return m.Overview
-	}
-	return nil
-}
-
-// Request to search for potentially sensitive info in a ContentItem.
-type InspectContentRequest struct {
-	// The parent resource name, for example projects/my-project-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Configuration for the inspector. What specified here will override
-	// the template referenced by the inspect_template_name argument.
-	InspectConfig *InspectConfig `protobuf:"bytes,2,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// The item to inspect.
-	Item *ContentItem `protobuf:"bytes,3,opt,name=item" json:"item,omitempty"`
-	// Optional template to use. Any configuration directly specified in
-	// inspect_config will override those set in the template. Singular fields
-	// that are set in this request will replace their corresponding fields in the
-	// template. Repeated fields are appended. Singular sub-messages and groups
-	// are recursively merged.
-	InspectTemplateName string `protobuf:"bytes,4,opt,name=inspect_template_name,json=inspectTemplateName" json:"inspect_template_name,omitempty"`
-}
-
-func (m *InspectContentRequest) Reset()                    { *m = InspectContentRequest{} }
-func (m *InspectContentRequest) String() string            { return proto.CompactTextString(m) }
-func (*InspectContentRequest) ProtoMessage()               {}
-func (*InspectContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
-
-func (m *InspectContentRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *InspectContentRequest) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *InspectContentRequest) GetItem() *ContentItem {
-	if m != nil {
-		return m.Item
-	}
-	return nil
-}
-
-func (m *InspectContentRequest) GetInspectTemplateName() string {
-	if m != nil {
-		return m.InspectTemplateName
-	}
-	return ""
-}
-
-// Results of inspecting an item.
-type InspectContentResponse struct {
-	// The findings.
-	Result *InspectResult `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"`
-}
-
-func (m *InspectContentResponse) Reset()                    { *m = InspectContentResponse{} }
-func (m *InspectContentResponse) String() string            { return proto.CompactTextString(m) }
-func (*InspectContentResponse) ProtoMessage()               {}
-func (*InspectContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
-
-func (m *InspectContentResponse) GetResult() *InspectResult {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-// Request for scheduling a scan of a data subset from a Google Platform data
-// repository.
-type InspectDataSourceRequest struct {
-	// The parent resource name, for example projects/my-project-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// A configuration for the job.
-	JobConfig *InspectJobConfig `protobuf:"bytes,2,opt,name=job_config,json=jobConfig" json:"job_config,omitempty"`
-}
-
-func (m *InspectDataSourceRequest) Reset()                    { *m = InspectDataSourceRequest{} }
-func (m *InspectDataSourceRequest) String() string            { return proto.CompactTextString(m) }
-func (*InspectDataSourceRequest) ProtoMessage()               {}
-func (*InspectDataSourceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
-
-func (m *InspectDataSourceRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *InspectDataSourceRequest) GetJobConfig() *InspectJobConfig {
-	if m != nil {
-		return m.JobConfig
-	}
-	return nil
-}
-
-// Cloud repository for storing output.
-type OutputStorageConfig struct {
-	// Types that are valid to be assigned to Type:
-	//	*OutputStorageConfig_Table
-	Type isOutputStorageConfig_Type `protobuf_oneof:"type"`
-}
-
-func (m *OutputStorageConfig) Reset()                    { *m = OutputStorageConfig{} }
-func (m *OutputStorageConfig) String() string            { return proto.CompactTextString(m) }
-func (*OutputStorageConfig) ProtoMessage()               {}
-func (*OutputStorageConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
-
-type isOutputStorageConfig_Type interface {
-	isOutputStorageConfig_Type()
-}
-
-type OutputStorageConfig_Table struct {
-	Table *BigQueryTable `protobuf:"bytes,1,opt,name=table,oneof"`
-}
-
-func (*OutputStorageConfig_Table) isOutputStorageConfig_Type() {}
-
-func (m *OutputStorageConfig) GetType() isOutputStorageConfig_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *OutputStorageConfig) GetTable() *BigQueryTable {
-	if x, ok := m.GetType().(*OutputStorageConfig_Table); ok {
-		return x.Table
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*OutputStorageConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _OutputStorageConfig_OneofMarshaler, _OutputStorageConfig_OneofUnmarshaler, _OutputStorageConfig_OneofSizer, []interface{}{
-		(*OutputStorageConfig_Table)(nil),
-	}
-}
-
-func _OutputStorageConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*OutputStorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *OutputStorageConfig_Table:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Table); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("OutputStorageConfig.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _OutputStorageConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*OutputStorageConfig)
-	switch tag {
-	case 1: // type.table
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryTable)
-		err := b.DecodeMessage(msg)
-		m.Type = &OutputStorageConfig_Table{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _OutputStorageConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*OutputStorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *OutputStorageConfig_Table:
-		s := proto.Size(x.Table)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Statistics regarding a specific InfoType.
-type InfoTypeStatistics struct {
-	// The type of finding this stat is for.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Number of findings for this infoType.
-	Count int64 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
-}
-
-func (m *InfoTypeStatistics) Reset()                    { *m = InfoTypeStatistics{} }
-func (m *InfoTypeStatistics) String() string            { return proto.CompactTextString(m) }
-func (*InfoTypeStatistics) ProtoMessage()               {}
-func (*InfoTypeStatistics) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
-
-func (m *InfoTypeStatistics) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *InfoTypeStatistics) GetCount() int64 {
-	if m != nil {
-		return m.Count
-	}
-	return 0
-}
-
-// The results of an inspect DataSource job.
-type InspectDataSourceDetails struct {
-	// The configuration used for this job.
-	RequestedOptions *InspectDataSourceDetails_RequestedOptions `protobuf:"bytes,2,opt,name=requested_options,json=requestedOptions" json:"requested_options,omitempty"`
-	// A summary of the outcome of this inspect job.
-	Result *InspectDataSourceDetails_Result `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"`
-}
-
-func (m *InspectDataSourceDetails) Reset()                    { *m = InspectDataSourceDetails{} }
-func (m *InspectDataSourceDetails) String() string            { return proto.CompactTextString(m) }
-func (*InspectDataSourceDetails) ProtoMessage()               {}
-func (*InspectDataSourceDetails) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
-
-func (m *InspectDataSourceDetails) GetRequestedOptions() *InspectDataSourceDetails_RequestedOptions {
-	if m != nil {
-		return m.RequestedOptions
-	}
-	return nil
-}
-
-func (m *InspectDataSourceDetails) GetResult() *InspectDataSourceDetails_Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-type InspectDataSourceDetails_RequestedOptions struct {
-	// If run with an inspect template, a snapshot of it's state at the time of
-	// this run.
-	SnapshotInspectTemplate *InspectTemplate  `protobuf:"bytes,1,opt,name=snapshot_inspect_template,json=snapshotInspectTemplate" json:"snapshot_inspect_template,omitempty"`
-	JobConfig               *InspectJobConfig `protobuf:"bytes,3,opt,name=job_config,json=jobConfig" json:"job_config,omitempty"`
-}
-
-func (m *InspectDataSourceDetails_RequestedOptions) Reset() {
-	*m = InspectDataSourceDetails_RequestedOptions{}
-}
-func (m *InspectDataSourceDetails_RequestedOptions) String() string { return proto.CompactTextString(m) }
-func (*InspectDataSourceDetails_RequestedOptions) ProtoMessage()    {}
-func (*InspectDataSourceDetails_RequestedOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{21, 0}
-}
-
-func (m *InspectDataSourceDetails_RequestedOptions) GetSnapshotInspectTemplate() *InspectTemplate {
-	if m != nil {
-		return m.SnapshotInspectTemplate
-	}
-	return nil
-}
-
-func (m *InspectDataSourceDetails_RequestedOptions) GetJobConfig() *InspectJobConfig {
-	if m != nil {
-		return m.JobConfig
-	}
-	return nil
-}
-
-type InspectDataSourceDetails_Result struct {
-	// Total size in bytes that were processed.
-	ProcessedBytes int64 `protobuf:"varint,1,opt,name=processed_bytes,json=processedBytes" json:"processed_bytes,omitempty"`
-	// Estimate of the number of bytes to process.
-	TotalEstimatedBytes int64 `protobuf:"varint,2,opt,name=total_estimated_bytes,json=totalEstimatedBytes" json:"total_estimated_bytes,omitempty"`
-	// Statistics of how many instances of each info type were found during
-	// inspect job.
-	InfoTypeStats []*InfoTypeStatistics `protobuf:"bytes,3,rep,name=info_type_stats,json=infoTypeStats" json:"info_type_stats,omitempty"`
-}
-
-func (m *InspectDataSourceDetails_Result) Reset()         { *m = InspectDataSourceDetails_Result{} }
-func (m *InspectDataSourceDetails_Result) String() string { return proto.CompactTextString(m) }
-func (*InspectDataSourceDetails_Result) ProtoMessage()    {}
-func (*InspectDataSourceDetails_Result) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{21, 1}
-}
-
-func (m *InspectDataSourceDetails_Result) GetProcessedBytes() int64 {
-	if m != nil {
-		return m.ProcessedBytes
-	}
-	return 0
-}
-
-func (m *InspectDataSourceDetails_Result) GetTotalEstimatedBytes() int64 {
-	if m != nil {
-		return m.TotalEstimatedBytes
-	}
-	return 0
-}
-
-func (m *InspectDataSourceDetails_Result) GetInfoTypeStats() []*InfoTypeStatistics {
-	if m != nil {
-		return m.InfoTypeStats
-	}
-	return nil
-}
-
-// InfoType description.
-type InfoTypeDescription struct {
-	// Internal name of the infoType.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Human readable form of the infoType name.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
-	// Which parts of the API supports this InfoType.
-	SupportedBy []InfoTypeSupportedBy `protobuf:"varint,3,rep,packed,name=supported_by,json=supportedBy,enum=google.privacy.dlp.v2beta2.InfoTypeSupportedBy" json:"supported_by,omitempty"`
-}
-
-func (m *InfoTypeDescription) Reset()                    { *m = InfoTypeDescription{} }
-func (m *InfoTypeDescription) String() string            { return proto.CompactTextString(m) }
-func (*InfoTypeDescription) ProtoMessage()               {}
-func (*InfoTypeDescription) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
-
-func (m *InfoTypeDescription) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *InfoTypeDescription) GetDisplayName() string {
-	if m != nil {
-		return m.DisplayName
-	}
-	return ""
-}
-
-func (m *InfoTypeDescription) GetSupportedBy() []InfoTypeSupportedBy {
-	if m != nil {
-		return m.SupportedBy
-	}
-	return nil
-}
-
-// Request for the list of infoTypes.
-type ListInfoTypesRequest struct {
-	// Optional BCP-47 language code for localized infoType friendly
-	// names. If omitted, or if localized strings are not available,
-	// en-US strings will be returned.
-	LanguageCode string `protobuf:"bytes,1,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
-	// Optional filter to only return infoTypes supported by certain parts of the
-	// API. Defaults to supported_by=INSPECT.
-	Filter string `protobuf:"bytes,2,opt,name=filter" json:"filter,omitempty"`
-}
-
-func (m *ListInfoTypesRequest) Reset()                    { *m = ListInfoTypesRequest{} }
-func (m *ListInfoTypesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListInfoTypesRequest) ProtoMessage()               {}
-func (*ListInfoTypesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
-
-func (m *ListInfoTypesRequest) GetLanguageCode() string {
-	if m != nil {
-		return m.LanguageCode
-	}
-	return ""
-}
-
-func (m *ListInfoTypesRequest) GetFilter() string {
-	if m != nil {
-		return m.Filter
-	}
-	return ""
-}
-
-// Response to the ListInfoTypes request.
-type ListInfoTypesResponse struct {
-	// Set of sensitive infoTypes.
-	InfoTypes []*InfoTypeDescription `protobuf:"bytes,1,rep,name=info_types,json=infoTypes" json:"info_types,omitempty"`
-}
-
-func (m *ListInfoTypesResponse) Reset()                    { *m = ListInfoTypesResponse{} }
-func (m *ListInfoTypesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListInfoTypesResponse) ProtoMessage()               {}
-func (*ListInfoTypesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
-
-func (m *ListInfoTypesResponse) GetInfoTypes() []*InfoTypeDescription {
-	if m != nil {
-		return m.InfoTypes
-	}
-	return nil
-}
-
-// Request for creating a risk analysis DlpJob.
-type AnalyzeDataSourceRiskRequest struct {
-	// The parent resource name, for example projects/my-project-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Configuration for this risk analysis job.
-	JobConfig *RiskAnalysisJobConfig `protobuf:"bytes,2,opt,name=job_config,json=jobConfig" json:"job_config,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskRequest) Reset()                    { *m = AnalyzeDataSourceRiskRequest{} }
-func (m *AnalyzeDataSourceRiskRequest) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeDataSourceRiskRequest) ProtoMessage()               {}
-func (*AnalyzeDataSourceRiskRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
-
-func (m *AnalyzeDataSourceRiskRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *AnalyzeDataSourceRiskRequest) GetJobConfig() *RiskAnalysisJobConfig {
-	if m != nil {
-		return m.JobConfig
-	}
-	return nil
-}
-
-// Configuration for a risk analysis job.
-type RiskAnalysisJobConfig struct {
-	// Privacy metric to compute.
-	PrivacyMetric *PrivacyMetric `protobuf:"bytes,1,opt,name=privacy_metric,json=privacyMetric" json:"privacy_metric,omitempty"`
-	// Input dataset to compute metrics over.
-	SourceTable *BigQueryTable `protobuf:"bytes,2,opt,name=source_table,json=sourceTable" json:"source_table,omitempty"`
-}
-
-func (m *RiskAnalysisJobConfig) Reset()                    { *m = RiskAnalysisJobConfig{} }
-func (m *RiskAnalysisJobConfig) String() string            { return proto.CompactTextString(m) }
-func (*RiskAnalysisJobConfig) ProtoMessage()               {}
-func (*RiskAnalysisJobConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
-
-func (m *RiskAnalysisJobConfig) GetPrivacyMetric() *PrivacyMetric {
-	if m != nil {
-		return m.PrivacyMetric
-	}
-	return nil
-}
-
-func (m *RiskAnalysisJobConfig) GetSourceTable() *BigQueryTable {
-	if m != nil {
-		return m.SourceTable
-	}
-	return nil
-}
-
-// Privacy metric to compute for reidentification risk analysis.
-type PrivacyMetric struct {
-	// Types that are valid to be assigned to Type:
-	//	*PrivacyMetric_NumericalStatsConfig_
-	//	*PrivacyMetric_CategoricalStatsConfig_
-	//	*PrivacyMetric_KAnonymityConfig_
-	//	*PrivacyMetric_LDiversityConfig_
-	//	*PrivacyMetric_KMapEstimationConfig_
-	Type isPrivacyMetric_Type `protobuf_oneof:"type"`
-}
-
-func (m *PrivacyMetric) Reset()                    { *m = PrivacyMetric{} }
-func (m *PrivacyMetric) String() string            { return proto.CompactTextString(m) }
-func (*PrivacyMetric) ProtoMessage()               {}
-func (*PrivacyMetric) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
-
-type isPrivacyMetric_Type interface {
-	isPrivacyMetric_Type()
-}
-
-type PrivacyMetric_NumericalStatsConfig_ struct {
-	NumericalStatsConfig *PrivacyMetric_NumericalStatsConfig `protobuf:"bytes,1,opt,name=numerical_stats_config,json=numericalStatsConfig,oneof"`
-}
-type PrivacyMetric_CategoricalStatsConfig_ struct {
-	CategoricalStatsConfig *PrivacyMetric_CategoricalStatsConfig `protobuf:"bytes,2,opt,name=categorical_stats_config,json=categoricalStatsConfig,oneof"`
-}
-type PrivacyMetric_KAnonymityConfig_ struct {
-	KAnonymityConfig *PrivacyMetric_KAnonymityConfig `protobuf:"bytes,3,opt,name=k_anonymity_config,json=kAnonymityConfig,oneof"`
-}
-type PrivacyMetric_LDiversityConfig_ struct {
-	LDiversityConfig *PrivacyMetric_LDiversityConfig `protobuf:"bytes,4,opt,name=l_diversity_config,json=lDiversityConfig,oneof"`
-}
-type PrivacyMetric_KMapEstimationConfig_ struct {
-	KMapEstimationConfig *PrivacyMetric_KMapEstimationConfig `protobuf:"bytes,5,opt,name=k_map_estimation_config,json=kMapEstimationConfig,oneof"`
-}
-
-func (*PrivacyMetric_NumericalStatsConfig_) isPrivacyMetric_Type()   {}
-func (*PrivacyMetric_CategoricalStatsConfig_) isPrivacyMetric_Type() {}
-func (*PrivacyMetric_KAnonymityConfig_) isPrivacyMetric_Type()       {}
-func (*PrivacyMetric_LDiversityConfig_) isPrivacyMetric_Type()       {}
-func (*PrivacyMetric_KMapEstimationConfig_) isPrivacyMetric_Type()   {}
-
-func (m *PrivacyMetric) GetType() isPrivacyMetric_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetNumericalStatsConfig() *PrivacyMetric_NumericalStatsConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_NumericalStatsConfig_); ok {
-		return x.NumericalStatsConfig
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetCategoricalStatsConfig() *PrivacyMetric_CategoricalStatsConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_CategoricalStatsConfig_); ok {
-		return x.CategoricalStatsConfig
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetKAnonymityConfig() *PrivacyMetric_KAnonymityConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_KAnonymityConfig_); ok {
-		return x.KAnonymityConfig
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetLDiversityConfig() *PrivacyMetric_LDiversityConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_LDiversityConfig_); ok {
-		return x.LDiversityConfig
-	}
-	return nil
-}
-
-func (m *PrivacyMetric) GetKMapEstimationConfig() *PrivacyMetric_KMapEstimationConfig {
-	if x, ok := m.GetType().(*PrivacyMetric_KMapEstimationConfig_); ok {
-		return x.KMapEstimationConfig
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PrivacyMetric) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PrivacyMetric_OneofMarshaler, _PrivacyMetric_OneofUnmarshaler, _PrivacyMetric_OneofSizer, []interface{}{
-		(*PrivacyMetric_NumericalStatsConfig_)(nil),
-		(*PrivacyMetric_CategoricalStatsConfig_)(nil),
-		(*PrivacyMetric_KAnonymityConfig_)(nil),
-		(*PrivacyMetric_LDiversityConfig_)(nil),
-		(*PrivacyMetric_KMapEstimationConfig_)(nil),
-	}
-}
-
-func _PrivacyMetric_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PrivacyMetric)
-	// type
-	switch x := m.Type.(type) {
-	case *PrivacyMetric_NumericalStatsConfig_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NumericalStatsConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_CategoricalStatsConfig_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CategoricalStatsConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_KAnonymityConfig_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KAnonymityConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_LDiversityConfig_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LDiversityConfig); err != nil {
-			return err
-		}
-	case *PrivacyMetric_KMapEstimationConfig_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KMapEstimationConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PrivacyMetric.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PrivacyMetric_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PrivacyMetric)
-	switch tag {
-	case 1: // type.numerical_stats_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_NumericalStatsConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_NumericalStatsConfig_{msg}
-		return true, err
-	case 2: // type.categorical_stats_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_CategoricalStatsConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_CategoricalStatsConfig_{msg}
-		return true, err
-	case 3: // type.k_anonymity_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_KAnonymityConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_KAnonymityConfig_{msg}
-		return true, err
-	case 4: // type.l_diversity_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_LDiversityConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_LDiversityConfig_{msg}
-		return true, err
-	case 5: // type.k_map_estimation_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrivacyMetric_KMapEstimationConfig)
-		err := b.DecodeMessage(msg)
-		m.Type = &PrivacyMetric_KMapEstimationConfig_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PrivacyMetric_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PrivacyMetric)
-	// type
-	switch x := m.Type.(type) {
-	case *PrivacyMetric_NumericalStatsConfig_:
-		s := proto.Size(x.NumericalStatsConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_CategoricalStatsConfig_:
-		s := proto.Size(x.CategoricalStatsConfig)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_KAnonymityConfig_:
-		s := proto.Size(x.KAnonymityConfig)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_LDiversityConfig_:
-		s := proto.Size(x.LDiversityConfig)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_KMapEstimationConfig_:
-		s := proto.Size(x.KMapEstimationConfig)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Compute numerical stats over an individual column, including
-// min, max, and quantiles.
-type PrivacyMetric_NumericalStatsConfig struct {
-	// Field to compute numerical stats on. Supported types are
-	// integer, float, date, datetime, timestamp, time.
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-}
-
-func (m *PrivacyMetric_NumericalStatsConfig) Reset()         { *m = PrivacyMetric_NumericalStatsConfig{} }
-func (m *PrivacyMetric_NumericalStatsConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_NumericalStatsConfig) ProtoMessage()    {}
-func (*PrivacyMetric_NumericalStatsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27, 0}
-}
-
-func (m *PrivacyMetric_NumericalStatsConfig) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-// Compute numerical stats over an individual column, including
-// number of distinct values and value count distribution.
-type PrivacyMetric_CategoricalStatsConfig struct {
-	// Field to compute categorical stats on. All column types are
-	// supported except for arrays and structs. However, it may be more
-	// informative to use NumericalStats when the field type is supported,
-	// depending on the data.
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-}
-
-func (m *PrivacyMetric_CategoricalStatsConfig) Reset()         { *m = PrivacyMetric_CategoricalStatsConfig{} }
-func (m *PrivacyMetric_CategoricalStatsConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_CategoricalStatsConfig) ProtoMessage()    {}
-func (*PrivacyMetric_CategoricalStatsConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27, 1}
-}
-
-func (m *PrivacyMetric_CategoricalStatsConfig) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-// k-anonymity metric, used for analysis of reidentification risk.
-type PrivacyMetric_KAnonymityConfig struct {
-	// Set of fields to compute k-anonymity over. When multiple fields are
-	// specified, they are considered a single composite key. Structs and
-	// repeated data types are not supported; however, nested fields are
-	// supported so long as they are not structs themselves or nested within
-	// a repeated field.
-	QuasiIds []*FieldId `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds" json:"quasi_ids,omitempty"`
-	// Optional message indicating that each distinct entity_id should not
-	// contribute to the k-anonymity count more than once per equivalence class.
-	// If an entity_id appears on several rows with different quasi-identifier
-	// tuples, it will contribute to each count exactly once.
-	//
-	// This can lead to unexpected results. Consider a table where ID 1 is
-	// associated to quasi-identifier "foo", ID 2 to "bar", and ID 3 to *both*
-	// quasi-identifiers "foo" and "bar" (on separate rows), and where this ID
-	// is used as entity_id. Then, the anonymity value associated to ID 3 will
-	// be 2, even if it is the only ID to be associated to both values "foo" and
-	// "bar".
-	EntityId *EntityId `protobuf:"bytes,2,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"`
-}
-
-func (m *PrivacyMetric_KAnonymityConfig) Reset()         { *m = PrivacyMetric_KAnonymityConfig{} }
-func (m *PrivacyMetric_KAnonymityConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_KAnonymityConfig) ProtoMessage()    {}
-func (*PrivacyMetric_KAnonymityConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27, 2}
-}
-
-func (m *PrivacyMetric_KAnonymityConfig) GetQuasiIds() []*FieldId {
-	if m != nil {
-		return m.QuasiIds
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KAnonymityConfig) GetEntityId() *EntityId {
-	if m != nil {
-		return m.EntityId
-	}
-	return nil
-}
-
-// l-diversity metric, used for analysis of reidentification risk.
-type PrivacyMetric_LDiversityConfig struct {
-	// Set of quasi-identifiers indicating how equivalence classes are
-	// defined for the l-diversity computation. When multiple fields are
-	// specified, they are considered a single composite key.
-	QuasiIds []*FieldId `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds" json:"quasi_ids,omitempty"`
-	// Sensitive field for computing the l-value.
-	SensitiveAttribute *FieldId `protobuf:"bytes,2,opt,name=sensitive_attribute,json=sensitiveAttribute" json:"sensitive_attribute,omitempty"`
-}
-
-func (m *PrivacyMetric_LDiversityConfig) Reset()         { *m = PrivacyMetric_LDiversityConfig{} }
-func (m *PrivacyMetric_LDiversityConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_LDiversityConfig) ProtoMessage()    {}
-func (*PrivacyMetric_LDiversityConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27, 3}
-}
-
-func (m *PrivacyMetric_LDiversityConfig) GetQuasiIds() []*FieldId {
-	if m != nil {
-		return m.QuasiIds
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_LDiversityConfig) GetSensitiveAttribute() *FieldId {
-	if m != nil {
-		return m.SensitiveAttribute
-	}
-	return nil
-}
-
-// Reidentifiability metric. This corresponds to a risk model similar to what
-// is called "journalist risk" in the literature, except the attack dataset is
-// statistically modeled instead of being perfectly known. This can be done
-// using publicly available data (like the US Census), or using a custom
-// statistical model (indicated as one or several BigQuery tables), or by
-// extrapolating from the distribution of values in the input dataset.
-type PrivacyMetric_KMapEstimationConfig struct {
-	// Fields considered to be quasi-identifiers. No two columns can have the
-	// same tag. [required]
-	QuasiIds []*PrivacyMetric_KMapEstimationConfig_TaggedField `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds" json:"quasi_ids,omitempty"`
-	// ISO 3166-1 alpha-2 region code to use in the statistical modeling.
-	// Required if no column is tagged with a region-specific InfoType (like
-	// US_ZIP_5) or a region code.
-	RegionCode string `protobuf:"bytes,2,opt,name=region_code,json=regionCode" json:"region_code,omitempty"`
-	// Several auxiliary tables can be used in the analysis. Each custom_tag
-	// used to tag a quasi-identifiers column must appear in exactly one column
-	// of one auxiliary table.
-	AuxiliaryTables []*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable `protobuf:"bytes,3,rep,name=auxiliary_tables,json=auxiliaryTables" json:"auxiliary_tables,omitempty"`
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig) Reset()         { *m = PrivacyMetric_KMapEstimationConfig{} }
-func (m *PrivacyMetric_KMapEstimationConfig) String() string { return proto.CompactTextString(m) }
-func (*PrivacyMetric_KMapEstimationConfig) ProtoMessage()    {}
-func (*PrivacyMetric_KMapEstimationConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27, 4}
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig) GetQuasiIds() []*PrivacyMetric_KMapEstimationConfig_TaggedField {
-	if m != nil {
-		return m.QuasiIds
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig) GetRegionCode() string {
-	if m != nil {
-		return m.RegionCode
-	}
-	return ""
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig) GetAuxiliaryTables() []*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable {
-	if m != nil {
-		return m.AuxiliaryTables
-	}
-	return nil
-}
-
-// A column with a semantic tag attached.
-type PrivacyMetric_KMapEstimationConfig_TaggedField struct {
-	// Identifies the column. [required]
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-	// Semantic tag that identifies what a column contains, to determine which
-	// statistical model to use to estimate the reidentifiability of each
-	// value. [required]
-	//
-	// Types that are valid to be assigned to Tag:
-	//	*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType
-	//	*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag
-	//	*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred
-	Tag isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag `protobuf_oneof:"tag"`
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) Reset() {
-	*m = PrivacyMetric_KMapEstimationConfig_TaggedField{}
-}
-func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) String() string {
-	return proto.CompactTextString(m)
-}
-func (*PrivacyMetric_KMapEstimationConfig_TaggedField) ProtoMessage() {}
-func (*PrivacyMetric_KMapEstimationConfig_TaggedField) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27, 4, 0}
-}
-
-type isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag interface {
-	isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag()
-}
-
-type PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType struct {
-	InfoType *InfoType `protobuf:"bytes,2,opt,name=info_type,json=infoType,oneof"`
-}
-type PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag struct {
-	CustomTag string `protobuf:"bytes,3,opt,name=custom_tag,json=customTag,oneof"`
-}
-type PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred struct {
-	Inferred *google_protobuf3.Empty `protobuf:"bytes,4,opt,name=inferred,oneof"`
-}
-
-func (*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType) isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag() {
-}
-func (*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag) isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag() {
-}
-func (*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred) isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag() {
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetTag() isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag {
-	if m != nil {
-		return m.Tag
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetInfoType() *InfoType {
-	if x, ok := m.GetTag().(*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType); ok {
-		return x.InfoType
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetCustomTag() string {
-	if x, ok := m.GetTag().(*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag); ok {
-		return x.CustomTag
-	}
-	return ""
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_TaggedField) GetInferred() *google_protobuf3.Empty {
-	if x, ok := m.GetTag().(*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred); ok {
-		return x.Inferred
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PrivacyMetric_KMapEstimationConfig_TaggedField) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofMarshaler, _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofUnmarshaler, _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofSizer, []interface{}{
-		(*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType)(nil),
-		(*PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag)(nil),
-		(*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred)(nil),
-	}
-}
-
-func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
-	// tag
-	switch x := m.Tag.(type) {
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoType); err != nil {
-			return err
-		}
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CustomTag)
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Inferred); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PrivacyMetric_KMapEstimationConfig_TaggedField.Tag has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
-	switch tag {
-	case 2: // tag.info_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoType)
-		err := b.DecodeMessage(msg)
-		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType{msg}
-		return true, err
-	case 3: // tag.custom_tag
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag{x}
-		return true, err
-	case 4: // tag.inferred
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(google_protobuf3.Empty)
-		err := b.DecodeMessage(msg)
-		m.Tag = &PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PrivacyMetric_KMapEstimationConfig_TaggedField_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PrivacyMetric_KMapEstimationConfig_TaggedField)
-	// tag
-	switch x := m.Tag.(type) {
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType:
-		s := proto.Size(x.InfoType)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.CustomTag)))
-		n += len(x.CustomTag)
-	case *PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred:
-		s := proto.Size(x.Inferred)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// An auxiliary table contains statistical information on the relative
-// frequency of different quasi-identifiers values. It has one or several
-// quasi-identifiers columns, and one column that indicates the relative
-// frequency of each quasi-identifier tuple.
-// If a tuple is present in the data but not in the auxiliary table, the
-// corresponding relative frequency is assumed to be zero (and thus, the
-// tuple is highly reidentifiable).
-type PrivacyMetric_KMapEstimationConfig_AuxiliaryTable struct {
-	// Auxiliary table location. [required]
-	Table *BigQueryTable `protobuf:"bytes,3,opt,name=table" json:"table,omitempty"`
-	// Quasi-identifier columns. [required]
-	QuasiIds []*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField `protobuf:"bytes,1,rep,name=quasi_ids,json=quasiIds" json:"quasi_ids,omitempty"`
-	// The relative frequency column must contain a floating-point number
-	// between 0 and 1 (inclusive). Null values are assumed to be zero.
-	// [required]
-	RelativeFrequency *FieldId `protobuf:"bytes,2,opt,name=relative_frequency,json=relativeFrequency" json:"relative_frequency,omitempty"`
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) Reset() {
-	*m = PrivacyMetric_KMapEstimationConfig_AuxiliaryTable{}
-}
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) String() string {
-	return proto.CompactTextString(m)
-}
-func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) ProtoMessage() {}
-func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27, 4, 1}
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) GetTable() *BigQueryTable {
-	if m != nil {
-		return m.Table
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) GetQuasiIds() []*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField {
-	if m != nil {
-		return m.QuasiIds
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable) GetRelativeFrequency() *FieldId {
-	if m != nil {
-		return m.RelativeFrequency
-	}
-	return nil
-}
-
-// A quasi-identifier column has a custom_tag, used to know which column
-// in the data corresponds to which column in the statistical model.
-type PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField struct {
-	Field     *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-	CustomTag string   `protobuf:"bytes,2,opt,name=custom_tag,json=customTag" json:"custom_tag,omitempty"`
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) Reset() {
-	*m = PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField{}
-}
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) String() string {
-	return proto.CompactTextString(m)
-}
-func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) ProtoMessage() {}
-func (*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{27, 4, 1, 0}
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func (m *PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField) GetCustomTag() string {
-	if m != nil {
-		return m.CustomTag
-	}
-	return ""
-}
-
-// Result of a risk analysis operation request.
-type AnalyzeDataSourceRiskDetails struct {
-	// Privacy metric to compute.
-	RequestedPrivacyMetric *PrivacyMetric `protobuf:"bytes,1,opt,name=requested_privacy_metric,json=requestedPrivacyMetric" json:"requested_privacy_metric,omitempty"`
-	// Input dataset to compute metrics over.
-	RequestedSourceTable *BigQueryTable `protobuf:"bytes,2,opt,name=requested_source_table,json=requestedSourceTable" json:"requested_source_table,omitempty"`
-	// Values associated with this metric.
-	//
-	// Types that are valid to be assigned to Result:
-	//	*AnalyzeDataSourceRiskDetails_NumericalStatsResult_
-	//	*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_
-	//	*AnalyzeDataSourceRiskDetails_KAnonymityResult_
-	//	*AnalyzeDataSourceRiskDetails_LDiversityResult_
-	//	*AnalyzeDataSourceRiskDetails_KMapEstimationResult_
-	Result isAnalyzeDataSourceRiskDetails_Result `protobuf_oneof:"result"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails) Reset()                    { *m = AnalyzeDataSourceRiskDetails{} }
-func (m *AnalyzeDataSourceRiskDetails) String() string            { return proto.CompactTextString(m) }
-func (*AnalyzeDataSourceRiskDetails) ProtoMessage()               {}
-func (*AnalyzeDataSourceRiskDetails) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
-
-type isAnalyzeDataSourceRiskDetails_Result interface {
-	isAnalyzeDataSourceRiskDetails_Result()
-}
-
-type AnalyzeDataSourceRiskDetails_NumericalStatsResult_ struct {
-	NumericalStatsResult *AnalyzeDataSourceRiskDetails_NumericalStatsResult `protobuf:"bytes,3,opt,name=numerical_stats_result,json=numericalStatsResult,oneof"`
-}
-type AnalyzeDataSourceRiskDetails_CategoricalStatsResult_ struct {
-	CategoricalStatsResult *AnalyzeDataSourceRiskDetails_CategoricalStatsResult `protobuf:"bytes,4,opt,name=categorical_stats_result,json=categoricalStatsResult,oneof"`
-}
-type AnalyzeDataSourceRiskDetails_KAnonymityResult_ struct {
-	KAnonymityResult *AnalyzeDataSourceRiskDetails_KAnonymityResult `protobuf:"bytes,5,opt,name=k_anonymity_result,json=kAnonymityResult,oneof"`
-}
-type AnalyzeDataSourceRiskDetails_LDiversityResult_ struct {
-	LDiversityResult *AnalyzeDataSourceRiskDetails_LDiversityResult `protobuf:"bytes,6,opt,name=l_diversity_result,json=lDiversityResult,oneof"`
-}
-type AnalyzeDataSourceRiskDetails_KMapEstimationResult_ struct {
-	KMapEstimationResult *AnalyzeDataSourceRiskDetails_KMapEstimationResult `protobuf:"bytes,7,opt,name=k_map_estimation_result,json=kMapEstimationResult,oneof"`
-}
-
-func (*AnalyzeDataSourceRiskDetails_NumericalStatsResult_) isAnalyzeDataSourceRiskDetails_Result()   {}
-func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_) isAnalyzeDataSourceRiskDetails_Result() {}
-func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_) isAnalyzeDataSourceRiskDetails_Result()       {}
-func (*AnalyzeDataSourceRiskDetails_LDiversityResult_) isAnalyzeDataSourceRiskDetails_Result()       {}
-func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_) isAnalyzeDataSourceRiskDetails_Result()   {}
-
-func (m *AnalyzeDataSourceRiskDetails) GetResult() isAnalyzeDataSourceRiskDetails_Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails) GetRequestedPrivacyMetric() *PrivacyMetric {
-	if m != nil {
-		return m.RequestedPrivacyMetric
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails) GetRequestedSourceTable() *BigQueryTable {
-	if m != nil {
-		return m.RequestedSourceTable
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails) GetNumericalStatsResult() *AnalyzeDataSourceRiskDetails_NumericalStatsResult {
-	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_NumericalStatsResult_); ok {
-		return x.NumericalStatsResult
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails) GetCategoricalStatsResult() *AnalyzeDataSourceRiskDetails_CategoricalStatsResult {
-	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_); ok {
-		return x.CategoricalStatsResult
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails) GetKAnonymityResult() *AnalyzeDataSourceRiskDetails_KAnonymityResult {
-	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_KAnonymityResult_); ok {
-		return x.KAnonymityResult
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails) GetLDiversityResult() *AnalyzeDataSourceRiskDetails_LDiversityResult {
-	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_LDiversityResult_); ok {
-		return x.LDiversityResult
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails) GetKMapEstimationResult() *AnalyzeDataSourceRiskDetails_KMapEstimationResult {
-	if x, ok := m.GetResult().(*AnalyzeDataSourceRiskDetails_KMapEstimationResult_); ok {
-		return x.KMapEstimationResult
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*AnalyzeDataSourceRiskDetails) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _AnalyzeDataSourceRiskDetails_OneofMarshaler, _AnalyzeDataSourceRiskDetails_OneofUnmarshaler, _AnalyzeDataSourceRiskDetails_OneofSizer, []interface{}{
-		(*AnalyzeDataSourceRiskDetails_NumericalStatsResult_)(nil),
-		(*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_)(nil),
-		(*AnalyzeDataSourceRiskDetails_KAnonymityResult_)(nil),
-		(*AnalyzeDataSourceRiskDetails_LDiversityResult_)(nil),
-		(*AnalyzeDataSourceRiskDetails_KMapEstimationResult_)(nil),
-	}
-}
-
-func _AnalyzeDataSourceRiskDetails_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*AnalyzeDataSourceRiskDetails)
-	// result
-	switch x := m.Result.(type) {
-	case *AnalyzeDataSourceRiskDetails_NumericalStatsResult_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NumericalStatsResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CategoricalStatsResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_KAnonymityResult_:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KAnonymityResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_LDiversityResult_:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.LDiversityResult); err != nil {
-			return err
-		}
-	case *AnalyzeDataSourceRiskDetails_KMapEstimationResult_:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KMapEstimationResult); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("AnalyzeDataSourceRiskDetails.Result has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _AnalyzeDataSourceRiskDetails_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*AnalyzeDataSourceRiskDetails)
-	switch tag {
-	case 3: // result.numerical_stats_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_NumericalStatsResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_NumericalStatsResult_{msg}
-		return true, err
-	case 4: // result.categorical_stats_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_CategoricalStatsResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_CategoricalStatsResult_{msg}
-		return true, err
-	case 5: // result.k_anonymity_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_KAnonymityResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_KAnonymityResult_{msg}
-		return true, err
-	case 6: // result.l_diversity_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_LDiversityResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_LDiversityResult_{msg}
-		return true, err
-	case 7: // result.k_map_estimation_result
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails_KMapEstimationResult)
-		err := b.DecodeMessage(msg)
-		m.Result = &AnalyzeDataSourceRiskDetails_KMapEstimationResult_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _AnalyzeDataSourceRiskDetails_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*AnalyzeDataSourceRiskDetails)
-	// result
-	switch x := m.Result.(type) {
-	case *AnalyzeDataSourceRiskDetails_NumericalStatsResult_:
-		s := proto.Size(x.NumericalStatsResult)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_:
-		s := proto.Size(x.CategoricalStatsResult)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_KAnonymityResult_:
-		s := proto.Size(x.KAnonymityResult)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_LDiversityResult_:
-		s := proto.Size(x.LDiversityResult)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *AnalyzeDataSourceRiskDetails_KMapEstimationResult_:
-		s := proto.Size(x.KMapEstimationResult)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Result of the numerical stats computation.
-type AnalyzeDataSourceRiskDetails_NumericalStatsResult struct {
-	// Minimum value appearing in the column.
-	MinValue *Value `protobuf:"bytes,1,opt,name=min_value,json=minValue" json:"min_value,omitempty"`
-	// Maximum value appearing in the column.
-	MaxValue *Value `protobuf:"bytes,2,opt,name=max_value,json=maxValue" json:"max_value,omitempty"`
-	// List of 99 values that partition the set of field values into 100 equal
-	// sized buckets.
-	QuantileValues []*Value `protobuf:"bytes,4,rep,name=quantile_values,json=quantileValues" json:"quantile_values,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_NumericalStatsResult{}
-}
-func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_NumericalStatsResult) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_NumericalStatsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 0}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) GetMinValue() *Value {
-	if m != nil {
-		return m.MinValue
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) GetMaxValue() *Value {
-	if m != nil {
-		return m.MaxValue
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails_NumericalStatsResult) GetQuantileValues() []*Value {
-	if m != nil {
-		return m.QuantileValues
-	}
-	return nil
-}
-
-// Result of the categorical stats computation.
-type AnalyzeDataSourceRiskDetails_CategoricalStatsResult struct {
-	// Histogram of value frequencies in the column.
-	ValueFrequencyHistogramBuckets []*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket `protobuf:"bytes,5,rep,name=value_frequency_histogram_buckets,json=valueFrequencyHistogramBuckets" json:"value_frequency_histogram_buckets,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_CategoricalStatsResult{}
-}
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 1}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult) GetValueFrequencyHistogramBuckets() []*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket {
-	if m != nil {
-		return m.ValueFrequencyHistogramBuckets
-	}
-	return nil
-}
-
-type AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket struct {
-	// Lower bound on the value frequency of the values in this bucket.
-	ValueFrequencyLowerBound int64 `protobuf:"varint,1,opt,name=value_frequency_lower_bound,json=valueFrequencyLowerBound" json:"value_frequency_lower_bound,omitempty"`
-	// Upper bound on the value frequency of the values in this bucket.
-	ValueFrequencyUpperBound int64 `protobuf:"varint,2,opt,name=value_frequency_upper_bound,json=valueFrequencyUpperBound" json:"value_frequency_upper_bound,omitempty"`
-	// Total number of values in this bucket.
-	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-	// Sample of value frequencies in this bucket. The total number of
-	// values returned per bucket is capped at 20.
-	BucketValues []*ValueFrequency `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues" json:"bucket_values,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket{}
-}
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) ProtoMessage() {
-}
-func (*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 1, 0}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetValueFrequencyLowerBound() int64 {
-	if m != nil {
-		return m.ValueFrequencyLowerBound
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetValueFrequencyUpperBound() int64 {
-	if m != nil {
-		return m.ValueFrequencyUpperBound
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetBucketSize() int64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket) GetBucketValues() []*ValueFrequency {
-	if m != nil {
-		return m.BucketValues
-	}
-	return nil
-}
-
-// Result of the k-anonymity computation.
-type AnalyzeDataSourceRiskDetails_KAnonymityResult struct {
-	// Histogram of k-anonymity equivalence classes.
-	EquivalenceClassHistogramBuckets []*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket `protobuf:"bytes,5,rep,name=equivalence_class_histogram_buckets,json=equivalenceClassHistogramBuckets" json:"equivalence_class_histogram_buckets,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_KAnonymityResult{}
-}
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_KAnonymityResult) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_KAnonymityResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 2}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult) GetEquivalenceClassHistogramBuckets() []*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket {
-	if m != nil {
-		return m.EquivalenceClassHistogramBuckets
-	}
-	return nil
-}
-
-// The set of columns' values that share the same ldiversity value
-type AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass struct {
-	// Set of values defining the equivalence class. One value per
-	// quasi-identifier column in the original KAnonymity metric message.
-	// The order is always the same as the original request.
-	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues" json:"quasi_ids_values,omitempty"`
-	// Size of the equivalence class, for example number of rows with the
-	// above set of values.
-	EquivalenceClassSize int64 `protobuf:"varint,2,opt,name=equivalence_class_size,json=equivalenceClassSize" json:"equivalence_class_size,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass{}
-}
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 2, 0}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) GetQuasiIdsValues() []*Value {
-	if m != nil {
-		return m.QuasiIdsValues
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass) GetEquivalenceClassSize() int64 {
-	if m != nil {
-		return m.EquivalenceClassSize
-	}
-	return 0
-}
-
-type AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket struct {
-	// Lower bound on the size of the equivalence classes in this bucket.
-	EquivalenceClassSizeLowerBound int64 `protobuf:"varint,1,opt,name=equivalence_class_size_lower_bound,json=equivalenceClassSizeLowerBound" json:"equivalence_class_size_lower_bound,omitempty"`
-	// Upper bound on the size of the equivalence classes in this bucket.
-	EquivalenceClassSizeUpperBound int64 `protobuf:"varint,2,opt,name=equivalence_class_size_upper_bound,json=equivalenceClassSizeUpperBound" json:"equivalence_class_size_upper_bound,omitempty"`
-	// Total number of equivalence classes in this bucket.
-	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-	// Sample of equivalence classes in this bucket. The total number of
-	// classes returned per bucket is capped at 20.
-	BucketValues []*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues" json:"bucket_values,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket{}
-}
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 2, 1}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetEquivalenceClassSizeLowerBound() int64 {
-	if m != nil {
-		return m.EquivalenceClassSizeLowerBound
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetEquivalenceClassSizeUpperBound() int64 {
-	if m != nil {
-		return m.EquivalenceClassSizeUpperBound
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetBucketSize() int64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket) GetBucketValues() []*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass {
-	if m != nil {
-		return m.BucketValues
-	}
-	return nil
-}
-
-// Result of the l-diversity computation.
-type AnalyzeDataSourceRiskDetails_LDiversityResult struct {
-	// Histogram of l-diversity equivalence class sensitive value frequencies.
-	SensitiveValueFrequencyHistogramBuckets []*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket `protobuf:"bytes,5,rep,name=sensitive_value_frequency_histogram_buckets,json=sensitiveValueFrequencyHistogramBuckets" json:"sensitive_value_frequency_histogram_buckets,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_LDiversityResult{}
-}
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_LDiversityResult) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_LDiversityResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 3}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult) GetSensitiveValueFrequencyHistogramBuckets() []*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket {
-	if m != nil {
-		return m.SensitiveValueFrequencyHistogramBuckets
-	}
-	return nil
-}
-
-// The set of columns' values that share the same ldiversity value.
-type AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass struct {
-	// Quasi-identifier values defining the k-anonymity equivalence
-	// class. The order is always the same as the original request.
-	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues" json:"quasi_ids_values,omitempty"`
-	// Size of the k-anonymity equivalence class.
-	EquivalenceClassSize int64 `protobuf:"varint,2,opt,name=equivalence_class_size,json=equivalenceClassSize" json:"equivalence_class_size,omitempty"`
-	// Number of distinct sensitive values in this equivalence class.
-	NumDistinctSensitiveValues int64 `protobuf:"varint,3,opt,name=num_distinct_sensitive_values,json=numDistinctSensitiveValues" json:"num_distinct_sensitive_values,omitempty"`
-	// Estimated frequencies of top sensitive values.
-	TopSensitiveValues []*ValueFrequency `protobuf:"bytes,4,rep,name=top_sensitive_values,json=topSensitiveValues" json:"top_sensitive_values,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass{}
-}
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 3, 0}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) GetQuasiIdsValues() []*Value {
-	if m != nil {
-		return m.QuasiIdsValues
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) GetEquivalenceClassSize() int64 {
-	if m != nil {
-		return m.EquivalenceClassSize
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) GetNumDistinctSensitiveValues() int64 {
-	if m != nil {
-		return m.NumDistinctSensitiveValues
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass) GetTopSensitiveValues() []*ValueFrequency {
-	if m != nil {
-		return m.TopSensitiveValues
-	}
-	return nil
-}
-
-type AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket struct {
-	// Lower bound on the sensitive value frequencies of the equivalence
-	// classes in this bucket.
-	SensitiveValueFrequencyLowerBound int64 `protobuf:"varint,1,opt,name=sensitive_value_frequency_lower_bound,json=sensitiveValueFrequencyLowerBound" json:"sensitive_value_frequency_lower_bound,omitempty"`
-	// Upper bound on the sensitive value frequencies of the equivalence
-	// classes in this bucket.
-	SensitiveValueFrequencyUpperBound int64 `protobuf:"varint,2,opt,name=sensitive_value_frequency_upper_bound,json=sensitiveValueFrequencyUpperBound" json:"sensitive_value_frequency_upper_bound,omitempty"`
-	// Total number of equivalence classes in this bucket.
-	BucketSize int64 `protobuf:"varint,3,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-	// Sample of equivalence classes in this bucket. The total number of
-	// classes returned per bucket is capped at 20.
-	BucketValues []*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass `protobuf:"bytes,4,rep,name=bucket_values,json=bucketValues" json:"bucket_values,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket{}
-}
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 3, 1}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetSensitiveValueFrequencyLowerBound() int64 {
-	if m != nil {
-		return m.SensitiveValueFrequencyLowerBound
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetSensitiveValueFrequencyUpperBound() int64 {
-	if m != nil {
-		return m.SensitiveValueFrequencyUpperBound
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetBucketSize() int64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket) GetBucketValues() []*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass {
-	if m != nil {
-		return m.BucketValues
-	}
-	return nil
-}
-
-// Result of the reidentifiability analysis. Note that these results are an
-// estimation, not exact values.
-type AnalyzeDataSourceRiskDetails_KMapEstimationResult struct {
-	// The intervals [min_anonymity, max_anonymity] do not overlap. If a value
-	// doesn't correspond to any such interval, the associated frequency is
-	// zero. For example, the following records:
-	//   {min_anonymity: 1, max_anonymity: 1, frequency: 17}
-	//   {min_anonymity: 2, max_anonymity: 3, frequency: 42}
-	//   {min_anonymity: 5, max_anonymity: 10, frequency: 99}
-	// mean that there are no record with an estimated anonymity of 4, 5, or
-	// larger than 10.
-	KMapEstimationHistogram []*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket `protobuf:"bytes,1,rep,name=k_map_estimation_histogram,json=kMapEstimationHistogram" json:"k_map_estimation_histogram,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_KMapEstimationResult{}
-}
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 4}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult) GetKMapEstimationHistogram() []*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket {
-	if m != nil {
-		return m.KMapEstimationHistogram
-	}
-	return nil
-}
-
-// A tuple of values for the quasi-identifier columns.
-type AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues struct {
-	// The quasi-identifier values.
-	QuasiIdsValues []*Value `protobuf:"bytes,1,rep,name=quasi_ids_values,json=quasiIdsValues" json:"quasi_ids_values,omitempty"`
-	// The estimated anonymity for these quasi-identifier values.
-	EstimatedAnonymity int64 `protobuf:"varint,2,opt,name=estimated_anonymity,json=estimatedAnonymity" json:"estimated_anonymity,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues{}
-}
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) ProtoMessage() {}
-func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 4, 0}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) GetQuasiIdsValues() []*Value {
-	if m != nil {
-		return m.QuasiIdsValues
-	}
-	return nil
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues) GetEstimatedAnonymity() int64 {
-	if m != nil {
-		return m.EstimatedAnonymity
-	}
-	return 0
-}
-
-// A KMapEstimationHistogramBucket message with the following values:
-//   min_anonymity: 3
-//   max_anonymity: 5
-//   frequency: 42
-// means that there are 42 records whose quasi-identifier values correspond
-// to 3, 4 or 5 people in the overlying population. An important particular
-// case is when min_anonymity = max_anonymity = 1: the frequency field then
-// corresponds to the number of uniquely identifiable records.
-type AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket struct {
-	// Always positive.
-	MinAnonymity int64 `protobuf:"varint,1,opt,name=min_anonymity,json=minAnonymity" json:"min_anonymity,omitempty"`
-	// Always greater than or equal to min_anonymity.
-	MaxAnonymity int64 `protobuf:"varint,2,opt,name=max_anonymity,json=maxAnonymity" json:"max_anonymity,omitempty"`
-	// Number of records within these anonymity bounds.
-	BucketSize int64 `protobuf:"varint,5,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-	// Sample of quasi-identifier tuple values in this bucket. The total
-	// number of classes returned per bucket is capped at 20.
-	BucketValues []*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues `protobuf:"bytes,6,rep,name=bucket_values,json=bucketValues" json:"bucket_values,omitempty"`
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) Reset() {
-	*m = AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket{}
-}
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) String() string {
-	return proto.CompactTextString(m)
-}
-func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) ProtoMessage() {
-}
-func (*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{28, 4, 1}
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetMinAnonymity() int64 {
-	if m != nil {
-		return m.MinAnonymity
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetMaxAnonymity() int64 {
-	if m != nil {
-		return m.MaxAnonymity
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetBucketSize() int64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-func (m *AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket) GetBucketValues() []*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues {
-	if m != nil {
-		return m.BucketValues
-	}
-	return nil
-}
-
-// A value of a field, including its frequency.
-type ValueFrequency struct {
-	// A value contained in the field in question.
-	Value *Value `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"`
-	// How many times the value is contained in the field.
-	Count int64 `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
-}
-
-func (m *ValueFrequency) Reset()                    { *m = ValueFrequency{} }
-func (m *ValueFrequency) String() string            { return proto.CompactTextString(m) }
-func (*ValueFrequency) ProtoMessage()               {}
-func (*ValueFrequency) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
-
-func (m *ValueFrequency) GetValue() *Value {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *ValueFrequency) GetCount() int64 {
-	if m != nil {
-		return m.Count
-	}
-	return 0
-}
-
-// Set of primitive values supported by the system.
-// Note that for the purposes of inspection or transformation, the number
-// of bytes considered to comprise a 'Value' is based on its representation
-// as a UTF-8 encoded string. For example, if 'integer_value' is set to
-// 123456789, the number of bytes would be counted as 9, even though an
-// int64 only holds up to 8 bytes of data.
-type Value struct {
-	// Types that are valid to be assigned to Type:
-	//	*Value_IntegerValue
-	//	*Value_FloatValue
-	//	*Value_StringValue
-	//	*Value_BooleanValue
-	//	*Value_TimestampValue
-	//	*Value_TimeValue
-	//	*Value_DateValue
-	Type isValue_Type `protobuf_oneof:"type"`
-}
-
-func (m *Value) Reset()                    { *m = Value{} }
-func (m *Value) String() string            { return proto.CompactTextString(m) }
-func (*Value) ProtoMessage()               {}
-func (*Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
-
-type isValue_Type interface {
-	isValue_Type()
-}
-
-type Value_IntegerValue struct {
-	IntegerValue int64 `protobuf:"varint,1,opt,name=integer_value,json=integerValue,oneof"`
-}
-type Value_FloatValue struct {
-	FloatValue float64 `protobuf:"fixed64,2,opt,name=float_value,json=floatValue,oneof"`
-}
-type Value_StringValue struct {
-	StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,oneof"`
-}
-type Value_BooleanValue struct {
-	BooleanValue bool `protobuf:"varint,4,opt,name=boolean_value,json=booleanValue,oneof"`
-}
-type Value_TimestampValue struct {
-	TimestampValue *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=timestamp_value,json=timestampValue,oneof"`
-}
-type Value_TimeValue struct {
-	TimeValue *google_type2.TimeOfDay `protobuf:"bytes,6,opt,name=time_value,json=timeValue,oneof"`
-}
-type Value_DateValue struct {
-	DateValue *google_type.Date `protobuf:"bytes,7,opt,name=date_value,json=dateValue,oneof"`
-}
-
-func (*Value_IntegerValue) isValue_Type()   {}
-func (*Value_FloatValue) isValue_Type()     {}
-func (*Value_StringValue) isValue_Type()    {}
-func (*Value_BooleanValue) isValue_Type()   {}
-func (*Value_TimestampValue) isValue_Type() {}
-func (*Value_TimeValue) isValue_Type()      {}
-func (*Value_DateValue) isValue_Type()      {}
-
-func (m *Value) GetType() isValue_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *Value) GetIntegerValue() int64 {
-	if x, ok := m.GetType().(*Value_IntegerValue); ok {
-		return x.IntegerValue
-	}
-	return 0
-}
-
-func (m *Value) GetFloatValue() float64 {
-	if x, ok := m.GetType().(*Value_FloatValue); ok {
-		return x.FloatValue
-	}
-	return 0
-}
-
-func (m *Value) GetStringValue() string {
-	if x, ok := m.GetType().(*Value_StringValue); ok {
-		return x.StringValue
-	}
-	return ""
-}
-
-func (m *Value) GetBooleanValue() bool {
-	if x, ok := m.GetType().(*Value_BooleanValue); ok {
-		return x.BooleanValue
-	}
-	return false
-}
-
-func (m *Value) GetTimestampValue() *google_protobuf1.Timestamp {
-	if x, ok := m.GetType().(*Value_TimestampValue); ok {
-		return x.TimestampValue
-	}
-	return nil
-}
-
-func (m *Value) GetTimeValue() *google_type2.TimeOfDay {
-	if x, ok := m.GetType().(*Value_TimeValue); ok {
-		return x.TimeValue
-	}
-	return nil
-}
-
-func (m *Value) GetDateValue() *google_type.Date {
-	if x, ok := m.GetType().(*Value_DateValue); ok {
-		return x.DateValue
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
-		(*Value_IntegerValue)(nil),
-		(*Value_FloatValue)(nil),
-		(*Value_StringValue)(nil),
-		(*Value_BooleanValue)(nil),
-		(*Value_TimestampValue)(nil),
-		(*Value_TimeValue)(nil),
-		(*Value_DateValue)(nil),
-	}
-}
-
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// type
-	switch x := m.Type.(type) {
-	case *Value_IntegerValue:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntegerValue))
-	case *Value_FloatValue:
-		b.EncodeVarint(2<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.FloatValue))
-	case *Value_StringValue:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BooleanValue:
-		t := uint64(0)
-		if x.BooleanValue {
-			t = 1
-		}
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_TimestampValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimestampValue); err != nil {
-			return err
-		}
-	case *Value_TimeValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimeValue); err != nil {
-			return err
-		}
-	case *Value_DateValue:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DateValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Value.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 1: // type.integer_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Type = &Value_IntegerValue{int64(x)}
-		return true, err
-	case 2: // type.float_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Type = &Value_FloatValue{math.Float64frombits(x)}
-		return true, err
-	case 3: // type.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Type = &Value_StringValue{x}
-		return true, err
-	case 4: // type.boolean_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Type = &Value_BooleanValue{x != 0}
-		return true, err
-	case 5: // type.timestamp_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(google_protobuf1.Timestamp)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_TimestampValue{msg}
-		return true, err
-	case 6: // type.time_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(google_type2.TimeOfDay)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_TimeValue{msg}
-		return true, err
-	case 7: // type.date_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(google_type.Date)
-		err := b.DecodeMessage(msg)
-		m.Type = &Value_DateValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// type
-	switch x := m.Type.(type) {
-	case *Value_IntegerValue:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.IntegerValue))
-	case *Value_FloatValue:
-		n += proto.SizeVarint(2<<3 | proto.WireFixed64)
-		n += 8
-	case *Value_StringValue:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BooleanValue:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
-		n += 1
-	case *Value_TimestampValue:
-		s := proto.Size(x.TimestampValue)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_TimeValue:
-		s := proto.Size(x.TimeValue)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_DateValue:
-		s := proto.Size(x.DateValue)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// The configuration that controls how the data will change.
-type DeidentifyConfig struct {
-	// Types that are valid to be assigned to Transformation:
-	//	*DeidentifyConfig_InfoTypeTransformations
-	//	*DeidentifyConfig_RecordTransformations
-	Transformation isDeidentifyConfig_Transformation `protobuf_oneof:"transformation"`
-}
-
-func (m *DeidentifyConfig) Reset()                    { *m = DeidentifyConfig{} }
-func (m *DeidentifyConfig) String() string            { return proto.CompactTextString(m) }
-func (*DeidentifyConfig) ProtoMessage()               {}
-func (*DeidentifyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
-
-type isDeidentifyConfig_Transformation interface {
-	isDeidentifyConfig_Transformation()
-}
-
-type DeidentifyConfig_InfoTypeTransformations struct {
-	InfoTypeTransformations *InfoTypeTransformations `protobuf:"bytes,1,opt,name=info_type_transformations,json=infoTypeTransformations,oneof"`
-}
-type DeidentifyConfig_RecordTransformations struct {
-	RecordTransformations *RecordTransformations `protobuf:"bytes,2,opt,name=record_transformations,json=recordTransformations,oneof"`
-}
-
-func (*DeidentifyConfig_InfoTypeTransformations) isDeidentifyConfig_Transformation() {}
-func (*DeidentifyConfig_RecordTransformations) isDeidentifyConfig_Transformation()   {}
-
-func (m *DeidentifyConfig) GetTransformation() isDeidentifyConfig_Transformation {
-	if m != nil {
-		return m.Transformation
-	}
-	return nil
-}
-
-func (m *DeidentifyConfig) GetInfoTypeTransformations() *InfoTypeTransformations {
-	if x, ok := m.GetTransformation().(*DeidentifyConfig_InfoTypeTransformations); ok {
-		return x.InfoTypeTransformations
-	}
-	return nil
-}
-
-func (m *DeidentifyConfig) GetRecordTransformations() *RecordTransformations {
-	if x, ok := m.GetTransformation().(*DeidentifyConfig_RecordTransformations); ok {
-		return x.RecordTransformations
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DeidentifyConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DeidentifyConfig_OneofMarshaler, _DeidentifyConfig_OneofUnmarshaler, _DeidentifyConfig_OneofSizer, []interface{}{
-		(*DeidentifyConfig_InfoTypeTransformations)(nil),
-		(*DeidentifyConfig_RecordTransformations)(nil),
-	}
-}
-
-func _DeidentifyConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DeidentifyConfig)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *DeidentifyConfig_InfoTypeTransformations:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoTypeTransformations); err != nil {
-			return err
-		}
-	case *DeidentifyConfig_RecordTransformations:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RecordTransformations); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DeidentifyConfig.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DeidentifyConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DeidentifyConfig)
-	switch tag {
-	case 1: // transformation.info_type_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoTypeTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &DeidentifyConfig_InfoTypeTransformations{msg}
-		return true, err
-	case 2: // transformation.record_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RecordTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &DeidentifyConfig_RecordTransformations{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DeidentifyConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DeidentifyConfig)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *DeidentifyConfig_InfoTypeTransformations:
-		s := proto.Size(x.InfoTypeTransformations)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DeidentifyConfig_RecordTransformations:
-		s := proto.Size(x.RecordTransformations)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// A rule for transforming a value.
-type PrimitiveTransformation struct {
-	// Types that are valid to be assigned to Transformation:
-	//	*PrimitiveTransformation_ReplaceConfig
-	//	*PrimitiveTransformation_RedactConfig
-	//	*PrimitiveTransformation_CharacterMaskConfig
-	//	*PrimitiveTransformation_CryptoReplaceFfxFpeConfig
-	//	*PrimitiveTransformation_FixedSizeBucketingConfig
-	//	*PrimitiveTransformation_BucketingConfig
-	//	*PrimitiveTransformation_ReplaceWithInfoTypeConfig
-	//	*PrimitiveTransformation_TimePartConfig
-	//	*PrimitiveTransformation_CryptoHashConfig
-	Transformation isPrimitiveTransformation_Transformation `protobuf_oneof:"transformation"`
-}
-
-func (m *PrimitiveTransformation) Reset()                    { *m = PrimitiveTransformation{} }
-func (m *PrimitiveTransformation) String() string            { return proto.CompactTextString(m) }
-func (*PrimitiveTransformation) ProtoMessage()               {}
-func (*PrimitiveTransformation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
-
-type isPrimitiveTransformation_Transformation interface {
-	isPrimitiveTransformation_Transformation()
-}
-
-type PrimitiveTransformation_ReplaceConfig struct {
-	ReplaceConfig *ReplaceValueConfig `protobuf:"bytes,1,opt,name=replace_config,json=replaceConfig,oneof"`
-}
-type PrimitiveTransformation_RedactConfig struct {
-	RedactConfig *RedactConfig `protobuf:"bytes,2,opt,name=redact_config,json=redactConfig,oneof"`
-}
-type PrimitiveTransformation_CharacterMaskConfig struct {
-	CharacterMaskConfig *CharacterMaskConfig `protobuf:"bytes,3,opt,name=character_mask_config,json=characterMaskConfig,oneof"`
-}
-type PrimitiveTransformation_CryptoReplaceFfxFpeConfig struct {
-	CryptoReplaceFfxFpeConfig *CryptoReplaceFfxFpeConfig `protobuf:"bytes,4,opt,name=crypto_replace_ffx_fpe_config,json=cryptoReplaceFfxFpeConfig,oneof"`
-}
-type PrimitiveTransformation_FixedSizeBucketingConfig struct {
-	FixedSizeBucketingConfig *FixedSizeBucketingConfig `protobuf:"bytes,5,opt,name=fixed_size_bucketing_config,json=fixedSizeBucketingConfig,oneof"`
-}
-type PrimitiveTransformation_BucketingConfig struct {
-	BucketingConfig *BucketingConfig `protobuf:"bytes,6,opt,name=bucketing_config,json=bucketingConfig,oneof"`
-}
-type PrimitiveTransformation_ReplaceWithInfoTypeConfig struct {
-	ReplaceWithInfoTypeConfig *ReplaceWithInfoTypeConfig `protobuf:"bytes,7,opt,name=replace_with_info_type_config,json=replaceWithInfoTypeConfig,oneof"`
-}
-type PrimitiveTransformation_TimePartConfig struct {
-	TimePartConfig *TimePartConfig `protobuf:"bytes,8,opt,name=time_part_config,json=timePartConfig,oneof"`
-}
-type PrimitiveTransformation_CryptoHashConfig struct {
-	CryptoHashConfig *CryptoHashConfig `protobuf:"bytes,9,opt,name=crypto_hash_config,json=cryptoHashConfig,oneof"`
-}
-
-func (*PrimitiveTransformation_ReplaceConfig) isPrimitiveTransformation_Transformation()             {}
-func (*PrimitiveTransformation_RedactConfig) isPrimitiveTransformation_Transformation()              {}
-func (*PrimitiveTransformation_CharacterMaskConfig) isPrimitiveTransformation_Transformation()       {}
-func (*PrimitiveTransformation_CryptoReplaceFfxFpeConfig) isPrimitiveTransformation_Transformation() {}
-func (*PrimitiveTransformation_FixedSizeBucketingConfig) isPrimitiveTransformation_Transformation()  {}
-func (*PrimitiveTransformation_BucketingConfig) isPrimitiveTransformation_Transformation()           {}
-func (*PrimitiveTransformation_ReplaceWithInfoTypeConfig) isPrimitiveTransformation_Transformation() {}
-func (*PrimitiveTransformation_TimePartConfig) isPrimitiveTransformation_Transformation()            {}
-func (*PrimitiveTransformation_CryptoHashConfig) isPrimitiveTransformation_Transformation()          {}
-
-func (m *PrimitiveTransformation) GetTransformation() isPrimitiveTransformation_Transformation {
-	if m != nil {
-		return m.Transformation
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetReplaceConfig() *ReplaceValueConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_ReplaceConfig); ok {
-		return x.ReplaceConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetRedactConfig() *RedactConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_RedactConfig); ok {
-		return x.RedactConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetCharacterMaskConfig() *CharacterMaskConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CharacterMaskConfig); ok {
-		return x.CharacterMaskConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetCryptoReplaceFfxFpeConfig() *CryptoReplaceFfxFpeConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CryptoReplaceFfxFpeConfig); ok {
-		return x.CryptoReplaceFfxFpeConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetFixedSizeBucketingConfig() *FixedSizeBucketingConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_FixedSizeBucketingConfig); ok {
-		return x.FixedSizeBucketingConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetBucketingConfig() *BucketingConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_BucketingConfig); ok {
-		return x.BucketingConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetReplaceWithInfoTypeConfig() *ReplaceWithInfoTypeConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_ReplaceWithInfoTypeConfig); ok {
-		return x.ReplaceWithInfoTypeConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetTimePartConfig() *TimePartConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_TimePartConfig); ok {
-		return x.TimePartConfig
-	}
-	return nil
-}
-
-func (m *PrimitiveTransformation) GetCryptoHashConfig() *CryptoHashConfig {
-	if x, ok := m.GetTransformation().(*PrimitiveTransformation_CryptoHashConfig); ok {
-		return x.CryptoHashConfig
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*PrimitiveTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _PrimitiveTransformation_OneofMarshaler, _PrimitiveTransformation_OneofUnmarshaler, _PrimitiveTransformation_OneofSizer, []interface{}{
-		(*PrimitiveTransformation_ReplaceConfig)(nil),
-		(*PrimitiveTransformation_RedactConfig)(nil),
-		(*PrimitiveTransformation_CharacterMaskConfig)(nil),
-		(*PrimitiveTransformation_CryptoReplaceFfxFpeConfig)(nil),
-		(*PrimitiveTransformation_FixedSizeBucketingConfig)(nil),
-		(*PrimitiveTransformation_BucketingConfig)(nil),
-		(*PrimitiveTransformation_ReplaceWithInfoTypeConfig)(nil),
-		(*PrimitiveTransformation_TimePartConfig)(nil),
-		(*PrimitiveTransformation_CryptoHashConfig)(nil),
-	}
-}
-
-func _PrimitiveTransformation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*PrimitiveTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *PrimitiveTransformation_ReplaceConfig:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReplaceConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_RedactConfig:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RedactConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CharacterMaskConfig:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CharacterMaskConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CryptoReplaceFfxFpeConfig:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CryptoReplaceFfxFpeConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_FixedSizeBucketingConfig:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.FixedSizeBucketingConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_BucketingConfig:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BucketingConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_ReplaceWithInfoTypeConfig:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ReplaceWithInfoTypeConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_TimePartConfig:
-		b.EncodeVarint(8<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.TimePartConfig); err != nil {
-			return err
-		}
-	case *PrimitiveTransformation_CryptoHashConfig:
-		b.EncodeVarint(9<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CryptoHashConfig); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("PrimitiveTransformation.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _PrimitiveTransformation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*PrimitiveTransformation)
-	switch tag {
-	case 1: // transformation.replace_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ReplaceValueConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_ReplaceConfig{msg}
-		return true, err
-	case 2: // transformation.redact_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RedactConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_RedactConfig{msg}
-		return true, err
-	case 3: // transformation.character_mask_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CharacterMaskConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CharacterMaskConfig{msg}
-		return true, err
-	case 4: // transformation.crypto_replace_ffx_fpe_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CryptoReplaceFfxFpeConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CryptoReplaceFfxFpeConfig{msg}
-		return true, err
-	case 5: // transformation.fixed_size_bucketing_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(FixedSizeBucketingConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_FixedSizeBucketingConfig{msg}
-		return true, err
-	case 6: // transformation.bucketing_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BucketingConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_BucketingConfig{msg}
-		return true, err
-	case 7: // transformation.replace_with_info_type_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ReplaceWithInfoTypeConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_ReplaceWithInfoTypeConfig{msg}
-		return true, err
-	case 8: // transformation.time_part_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TimePartConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_TimePartConfig{msg}
-		return true, err
-	case 9: // transformation.crypto_hash_config
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CryptoHashConfig)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &PrimitiveTransformation_CryptoHashConfig{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _PrimitiveTransformation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*PrimitiveTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *PrimitiveTransformation_ReplaceConfig:
-		s := proto.Size(x.ReplaceConfig)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_RedactConfig:
-		s := proto.Size(x.RedactConfig)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CharacterMaskConfig:
-		s := proto.Size(x.CharacterMaskConfig)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CryptoReplaceFfxFpeConfig:
-		s := proto.Size(x.CryptoReplaceFfxFpeConfig)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_FixedSizeBucketingConfig:
-		s := proto.Size(x.FixedSizeBucketingConfig)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_BucketingConfig:
-		s := proto.Size(x.BucketingConfig)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_ReplaceWithInfoTypeConfig:
-		s := proto.Size(x.ReplaceWithInfoTypeConfig)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_TimePartConfig:
-		s := proto.Size(x.TimePartConfig)
-		n += proto.SizeVarint(8<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *PrimitiveTransformation_CryptoHashConfig:
-		s := proto.Size(x.CryptoHashConfig)
-		n += proto.SizeVarint(9<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// For use with `Date`, `Timestamp`, and `TimeOfDay`, extract or preserve a
-// portion of the value.
-type TimePartConfig struct {
-	PartToExtract TimePartConfig_TimePart `protobuf:"varint,1,opt,name=part_to_extract,json=partToExtract,enum=google.privacy.dlp.v2beta2.TimePartConfig_TimePart" json:"part_to_extract,omitempty"`
-}
-
-func (m *TimePartConfig) Reset()                    { *m = TimePartConfig{} }
-func (m *TimePartConfig) String() string            { return proto.CompactTextString(m) }
-func (*TimePartConfig) ProtoMessage()               {}
-func (*TimePartConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} }
-
-func (m *TimePartConfig) GetPartToExtract() TimePartConfig_TimePart {
-	if m != nil {
-		return m.PartToExtract
-	}
-	return TimePartConfig_TIME_PART_UNSPECIFIED
-}
-
-// Pseudonymization method that generates surrogates via cryptographic hashing.
-// Uses SHA-256.
-// The key size must be either 32 or 64 bytes.
-// Outputs a 32 byte digest as an uppercase hex string
-// (for example, 41D1567F7F99F1DC2A5FAB886DEE5BEE).
-// Currently, only string and integer values can be hashed.
-type CryptoHashConfig struct {
-	// The key used by the hash function.
-	CryptoKey *CryptoKey `protobuf:"bytes,1,opt,name=crypto_key,json=cryptoKey" json:"crypto_key,omitempty"`
-}
-
-func (m *CryptoHashConfig) Reset()                    { *m = CryptoHashConfig{} }
-func (m *CryptoHashConfig) String() string            { return proto.CompactTextString(m) }
-func (*CryptoHashConfig) ProtoMessage()               {}
-func (*CryptoHashConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} }
-
-func (m *CryptoHashConfig) GetCryptoKey() *CryptoKey {
-	if m != nil {
-		return m.CryptoKey
-	}
-	return nil
-}
-
-// Replace each input value with a given `Value`.
-type ReplaceValueConfig struct {
-	// Value to replace it with.
-	NewValue *Value `protobuf:"bytes,1,opt,name=new_value,json=newValue" json:"new_value,omitempty"`
-}
-
-func (m *ReplaceValueConfig) Reset()                    { *m = ReplaceValueConfig{} }
-func (m *ReplaceValueConfig) String() string            { return proto.CompactTextString(m) }
-func (*ReplaceValueConfig) ProtoMessage()               {}
-func (*ReplaceValueConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} }
-
-func (m *ReplaceValueConfig) GetNewValue() *Value {
-	if m != nil {
-		return m.NewValue
-	}
-	return nil
-}
-
-// Replace each matching finding with the name of the info_type.
-type ReplaceWithInfoTypeConfig struct {
-}
-
-func (m *ReplaceWithInfoTypeConfig) Reset()                    { *m = ReplaceWithInfoTypeConfig{} }
-func (m *ReplaceWithInfoTypeConfig) String() string            { return proto.CompactTextString(m) }
-func (*ReplaceWithInfoTypeConfig) ProtoMessage()               {}
-func (*ReplaceWithInfoTypeConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} }
-
-// Redact a given value. For example, if used with an `InfoTypeTransformation`
-// transforming PHONE_NUMBER, and input 'My phone number is 206-555-0123', the
-// output would be 'My phone number is '.
-type RedactConfig struct {
-}
-
-func (m *RedactConfig) Reset()                    { *m = RedactConfig{} }
-func (m *RedactConfig) String() string            { return proto.CompactTextString(m) }
-func (*RedactConfig) ProtoMessage()               {}
-func (*RedactConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{37} }
-
-// Characters to skip when doing deidentification of a value. These will be left
-// alone and skipped.
-type CharsToIgnore struct {
-	// Types that are valid to be assigned to Characters:
-	//	*CharsToIgnore_CharactersToSkip
-	//	*CharsToIgnore_CommonCharactersToIgnore
-	Characters isCharsToIgnore_Characters `protobuf_oneof:"characters"`
-}
-
-func (m *CharsToIgnore) Reset()                    { *m = CharsToIgnore{} }
-func (m *CharsToIgnore) String() string            { return proto.CompactTextString(m) }
-func (*CharsToIgnore) ProtoMessage()               {}
-func (*CharsToIgnore) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} }
-
-type isCharsToIgnore_Characters interface {
-	isCharsToIgnore_Characters()
-}
-
-type CharsToIgnore_CharactersToSkip struct {
-	CharactersToSkip string `protobuf:"bytes,1,opt,name=characters_to_skip,json=charactersToSkip,oneof"`
-}
-type CharsToIgnore_CommonCharactersToIgnore struct {
-	CommonCharactersToIgnore CharsToIgnore_CommonCharsToIgnore `protobuf:"varint,2,opt,name=common_characters_to_ignore,json=commonCharactersToIgnore,enum=google.privacy.dlp.v2beta2.CharsToIgnore_CommonCharsToIgnore,oneof"`
-}
-
-func (*CharsToIgnore_CharactersToSkip) isCharsToIgnore_Characters()         {}
-func (*CharsToIgnore_CommonCharactersToIgnore) isCharsToIgnore_Characters() {}
-
-func (m *CharsToIgnore) GetCharacters() isCharsToIgnore_Characters {
-	if m != nil {
-		return m.Characters
-	}
-	return nil
-}
-
-func (m *CharsToIgnore) GetCharactersToSkip() string {
-	if x, ok := m.GetCharacters().(*CharsToIgnore_CharactersToSkip); ok {
-		return x.CharactersToSkip
-	}
-	return ""
-}
-
-func (m *CharsToIgnore) GetCommonCharactersToIgnore() CharsToIgnore_CommonCharsToIgnore {
-	if x, ok := m.GetCharacters().(*CharsToIgnore_CommonCharactersToIgnore); ok {
-		return x.CommonCharactersToIgnore
-	}
-	return CharsToIgnore_COMMON_CHARS_TO_IGNORE_UNSPECIFIED
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CharsToIgnore) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CharsToIgnore_OneofMarshaler, _CharsToIgnore_OneofUnmarshaler, _CharsToIgnore_OneofSizer, []interface{}{
-		(*CharsToIgnore_CharactersToSkip)(nil),
-		(*CharsToIgnore_CommonCharactersToIgnore)(nil),
-	}
-}
-
-func _CharsToIgnore_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CharsToIgnore)
-	// characters
-	switch x := m.Characters.(type) {
-	case *CharsToIgnore_CharactersToSkip:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CharactersToSkip)
-	case *CharsToIgnore_CommonCharactersToIgnore:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CommonCharactersToIgnore))
-	case nil:
-	default:
-		return fmt.Errorf("CharsToIgnore.Characters has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CharsToIgnore_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CharsToIgnore)
-	switch tag {
-	case 1: // characters.characters_to_skip
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Characters = &CharsToIgnore_CharactersToSkip{x}
-		return true, err
-	case 2: // characters.common_characters_to_ignore
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Characters = &CharsToIgnore_CommonCharactersToIgnore{CharsToIgnore_CommonCharsToIgnore(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CharsToIgnore_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CharsToIgnore)
-	// characters
-	switch x := m.Characters.(type) {
-	case *CharsToIgnore_CharactersToSkip:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.CharactersToSkip)))
-		n += len(x.CharactersToSkip)
-	case *CharsToIgnore_CommonCharactersToIgnore:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.CommonCharactersToIgnore))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Partially mask a string by replacing a given number of characters with a
-// fixed character. Masking can start from the beginning or end of the string.
-// This can be used on data of any type (numbers, longs, and so on) and when
-// de-identifying structured data we'll attempt to preserve the original data's
-// type. (This allows you to take a long like 123 and modify it to a string like
-// **3.
-type CharacterMaskConfig struct {
-	// Character to mask the sensitive values&mdash;for example, "*" for an
-	// alphabetic string such as name, or "0" for a numeric string such as ZIP
-	// code or credit card number. String must have length 1. If not supplied, we
-	// will default to "*" for strings, 0 for digits.
-	MaskingCharacter string `protobuf:"bytes,1,opt,name=masking_character,json=maskingCharacter" json:"masking_character,omitempty"`
-	// Number of characters to mask. If not set, all matching chars will be
-	// masked. Skipped characters do not count towards this tally.
-	NumberToMask int32 `protobuf:"varint,2,opt,name=number_to_mask,json=numberToMask" json:"number_to_mask,omitempty"`
-	// Mask characters in reverse order. For example, if `masking_character` is
-	// '0', number_to_mask is 14, and `reverse_order` is false, then
-	// 1234-5678-9012-3456 -> 00000000000000-3456
-	// If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
-	// is true, then 12345 -> 12***
-	ReverseOrder bool `protobuf:"varint,3,opt,name=reverse_order,json=reverseOrder" json:"reverse_order,omitempty"`
-	// When masking a string, items in this list will be skipped when replacing.
-	// For example, if your string is 555-555-5555 and you ask us to skip `-` and
-	// mask 5 chars with * we would produce ***-*55-5555.
-	CharactersToIgnore []*CharsToIgnore `protobuf:"bytes,4,rep,name=characters_to_ignore,json=charactersToIgnore" json:"characters_to_ignore,omitempty"`
-}
-
-func (m *CharacterMaskConfig) Reset()                    { *m = CharacterMaskConfig{} }
-func (m *CharacterMaskConfig) String() string            { return proto.CompactTextString(m) }
-func (*CharacterMaskConfig) ProtoMessage()               {}
-func (*CharacterMaskConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} }
-
-func (m *CharacterMaskConfig) GetMaskingCharacter() string {
-	if m != nil {
-		return m.MaskingCharacter
-	}
-	return ""
-}
-
-func (m *CharacterMaskConfig) GetNumberToMask() int32 {
-	if m != nil {
-		return m.NumberToMask
-	}
-	return 0
-}
-
-func (m *CharacterMaskConfig) GetReverseOrder() bool {
-	if m != nil {
-		return m.ReverseOrder
-	}
-	return false
-}
-
-func (m *CharacterMaskConfig) GetCharactersToIgnore() []*CharsToIgnore {
-	if m != nil {
-		return m.CharactersToIgnore
-	}
-	return nil
-}
-
-// Buckets values based on fixed size ranges. The
-// Bucketing transformation can provide all of this functionality,
-// but requires more configuration. This message is provided as a convenience to
-// the user for simple bucketing strategies.
-//
-// The transformed value will be a hyphenated string of
-// <lower_bound>-<upper_bound>, i.e if lower_bound = 10 and upper_bound = 20
-// all values that are within this bucket will be replaced with "10-20".
-//
-// This can be used on data of type: double, long.
-//
-// If the bound Value type differs from the type of data
-// being transformed, we will first attempt converting the type of the data to
-// be transformed to match the type of the bound before comparing.
-type FixedSizeBucketingConfig struct {
-	// Lower bound value of buckets. All values less than `lower_bound` are
-	// grouped together into a single bucket; for example if `lower_bound` = 10,
-	// then all values less than 10 are replaced with the value “-10”. [Required].
-	LowerBound *Value `protobuf:"bytes,1,opt,name=lower_bound,json=lowerBound" json:"lower_bound,omitempty"`
-	// Upper bound value of buckets. All values greater than upper_bound are
-	// grouped together into a single bucket; for example if `upper_bound` = 89,
-	// then all values greater than 89 are replaced with the value “89+”.
-	// [Required].
-	UpperBound *Value `protobuf:"bytes,2,opt,name=upper_bound,json=upperBound" json:"upper_bound,omitempty"`
-	// Size of each bucket (except for minimum and maximum buckets). So if
-	// `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
-	// following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
-	// 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
-	BucketSize float64 `protobuf:"fixed64,3,opt,name=bucket_size,json=bucketSize" json:"bucket_size,omitempty"`
-}
-
-func (m *FixedSizeBucketingConfig) Reset()                    { *m = FixedSizeBucketingConfig{} }
-func (m *FixedSizeBucketingConfig) String() string            { return proto.CompactTextString(m) }
-func (*FixedSizeBucketingConfig) ProtoMessage()               {}
-func (*FixedSizeBucketingConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} }
-
-func (m *FixedSizeBucketingConfig) GetLowerBound() *Value {
-	if m != nil {
-		return m.LowerBound
-	}
-	return nil
-}
-
-func (m *FixedSizeBucketingConfig) GetUpperBound() *Value {
-	if m != nil {
-		return m.UpperBound
-	}
-	return nil
-}
-
-func (m *FixedSizeBucketingConfig) GetBucketSize() float64 {
-	if m != nil {
-		return m.BucketSize
-	}
-	return 0
-}
-
-// Generalization function that buckets values based on ranges. The ranges and
-// replacement values are dynamically provided by the user for custom behavior,
-// such as 1-30 -> LOW 31-65 -> MEDIUM 66-100 -> HIGH
-// This can be used on
-// data of type: number, long, string, timestamp.
-// If the bound `Value` type differs from the type of data being transformed, we
-// will first attempt converting the type of the data to be transformed to match
-// the type of the bound before comparing.
-type BucketingConfig struct {
-	// Set of buckets. Ranges must be non-overlapping.
-	Buckets []*BucketingConfig_Bucket `protobuf:"bytes,1,rep,name=buckets" json:"buckets,omitempty"`
-}
-
-func (m *BucketingConfig) Reset()                    { *m = BucketingConfig{} }
-func (m *BucketingConfig) String() string            { return proto.CompactTextString(m) }
-func (*BucketingConfig) ProtoMessage()               {}
-func (*BucketingConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} }
-
-func (m *BucketingConfig) GetBuckets() []*BucketingConfig_Bucket {
-	if m != nil {
-		return m.Buckets
-	}
-	return nil
-}
-
-// Bucket is represented as a range, along with replacement values.
-type BucketingConfig_Bucket struct {
-	// Lower bound of the range, inclusive. Type should be the same as max if
-	// used.
-	Min *Value `protobuf:"bytes,1,opt,name=min" json:"min,omitempty"`
-	// Upper bound of the range, exclusive; type must match min.
-	Max *Value `protobuf:"bytes,2,opt,name=max" json:"max,omitempty"`
-	// Replacement value for this bucket. If not provided
-	// the default behavior will be to hyphenate the min-max range.
-	ReplacementValue *Value `protobuf:"bytes,3,opt,name=replacement_value,json=replacementValue" json:"replacement_value,omitempty"`
-}
-
-func (m *BucketingConfig_Bucket) Reset()                    { *m = BucketingConfig_Bucket{} }
-func (m *BucketingConfig_Bucket) String() string            { return proto.CompactTextString(m) }
-func (*BucketingConfig_Bucket) ProtoMessage()               {}
-func (*BucketingConfig_Bucket) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41, 0} }
-
-func (m *BucketingConfig_Bucket) GetMin() *Value {
-	if m != nil {
-		return m.Min
-	}
-	return nil
-}
-
-func (m *BucketingConfig_Bucket) GetMax() *Value {
-	if m != nil {
-		return m.Max
-	}
-	return nil
-}
-
-func (m *BucketingConfig_Bucket) GetReplacementValue() *Value {
-	if m != nil {
-		return m.ReplacementValue
-	}
-	return nil
-}
-
-// Replaces an identifier with a surrogate using FPE with the FFX
-// mode of operation; however when used in the `ReidentifyContent` API method,
-// it serves the opposite function by reversing the surrogate back into
-// the original identifier.
-// The identifier must be encoded as ASCII.
-// For a given crypto key and context, the same identifier will be
-// replaced with the same surrogate.
-// Identifiers must be at least two characters long.
-// In the case that the identifier is the empty string, it will be skipped.
-type CryptoReplaceFfxFpeConfig struct {
-	// The key used by the encryption algorithm. [required]
-	CryptoKey *CryptoKey `protobuf:"bytes,1,opt,name=crypto_key,json=cryptoKey" json:"crypto_key,omitempty"`
-	// The 'tweak', a context may be used for higher security since the same
-	// identifier in two different contexts won't be given the same surrogate. If
-	// the context is not set, a default tweak will be used.
-	//
-	// If the context is set but:
-	//
-	// 1. there is no record present when transforming a given value or
-	// 1. the field is not present when transforming a given value,
-	//
-	// a default tweak will be used.
-	//
-	// Note that case (1) is expected when an `InfoTypeTransformation` is
-	// applied to both structured and non-structured `ContentItem`s.
-	// Currently, the referenced field may be of value type integer or string.
-	//
-	// The tweak is constructed as a sequence of bytes in big endian byte order
-	// such that:
-	//
-	// - a 64 bit integer is encoded followed by a single byte of value 1
-	// - a string is encoded in UTF-8 format followed by a single byte of value
-	//  å 2
-	Context *FieldId `protobuf:"bytes,2,opt,name=context" json:"context,omitempty"`
-	// Types that are valid to be assigned to Alphabet:
-	//	*CryptoReplaceFfxFpeConfig_CommonAlphabet
-	//	*CryptoReplaceFfxFpeConfig_CustomAlphabet
-	//	*CryptoReplaceFfxFpeConfig_Radix
-	Alphabet isCryptoReplaceFfxFpeConfig_Alphabet `protobuf_oneof:"alphabet"`
-	// The custom infoType to annotate the surrogate with.
-	// This annotation will be applied to the surrogate by prefixing it with
-	// the name of the custom infoType followed by the number of
-	// characters comprising the surrogate. The following scheme defines the
-	// format: info_type_name(surrogate_character_count):surrogate
-	//
-	// For example, if the name of custom infoType is 'MY_TOKEN_INFO_TYPE' and
-	// the surrogate is 'abc', the full replacement value
-	// will be: 'MY_TOKEN_INFO_TYPE(3):abc'
-	//
-	// This annotation identifies the surrogate when inspecting content using the
-	// custom infoType
-	// [`SurrogateType`](/dlp/docs/reference/rest/v2beta2/InspectConfig#surrogatetype).
-	// This facilitates reversal of the surrogate when it occurs in free text.
-	//
-	// In order for inspection to work properly, the name of this infoType must
-	// not occur naturally anywhere in your data; otherwise, inspection may
-	// find a surrogate that does not correspond to an actual identifier.
-	// Therefore, choose your custom infoType name carefully after considering
-	// what your data looks like. One way to select a name that has a high chance
-	// of yielding reliable detection is to include one or more unicode characters
-	// that are highly improbable to exist in your data.
-	// For example, assuming your data is entered from a regular ASCII keyboard,
-	// the symbol with the hex code point 29DD might be used like so:
-	// ⧝MY_TOKEN_TYPE
-	SurrogateInfoType *InfoType `protobuf:"bytes,8,opt,name=surrogate_info_type,json=surrogateInfoType" json:"surrogate_info_type,omitempty"`
-}
-
-func (m *CryptoReplaceFfxFpeConfig) Reset()                    { *m = CryptoReplaceFfxFpeConfig{} }
-func (m *CryptoReplaceFfxFpeConfig) String() string            { return proto.CompactTextString(m) }
-func (*CryptoReplaceFfxFpeConfig) ProtoMessage()               {}
-func (*CryptoReplaceFfxFpeConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{42} }
-
-type isCryptoReplaceFfxFpeConfig_Alphabet interface {
-	isCryptoReplaceFfxFpeConfig_Alphabet()
-}
-
-type CryptoReplaceFfxFpeConfig_CommonAlphabet struct {
-	CommonAlphabet CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet `protobuf:"varint,4,opt,name=common_alphabet,json=commonAlphabet,enum=google.privacy.dlp.v2beta2.CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet,oneof"`
-}
-type CryptoReplaceFfxFpeConfig_CustomAlphabet struct {
-	CustomAlphabet string `protobuf:"bytes,5,opt,name=custom_alphabet,json=customAlphabet,oneof"`
-}
-type CryptoReplaceFfxFpeConfig_Radix struct {
-	Radix int32 `protobuf:"varint,6,opt,name=radix,oneof"`
-}
-
-func (*CryptoReplaceFfxFpeConfig_CommonAlphabet) isCryptoReplaceFfxFpeConfig_Alphabet() {}
-func (*CryptoReplaceFfxFpeConfig_CustomAlphabet) isCryptoReplaceFfxFpeConfig_Alphabet() {}
-func (*CryptoReplaceFfxFpeConfig_Radix) isCryptoReplaceFfxFpeConfig_Alphabet()          {}
-
-func (m *CryptoReplaceFfxFpeConfig) GetAlphabet() isCryptoReplaceFfxFpeConfig_Alphabet {
-	if m != nil {
-		return m.Alphabet
-	}
-	return nil
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetCryptoKey() *CryptoKey {
-	if m != nil {
-		return m.CryptoKey
-	}
-	return nil
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetContext() *FieldId {
-	if m != nil {
-		return m.Context
-	}
-	return nil
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetCommonAlphabet() CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet {
-	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_CommonAlphabet); ok {
-		return x.CommonAlphabet
-	}
-	return CryptoReplaceFfxFpeConfig_FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetCustomAlphabet() string {
-	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_CustomAlphabet); ok {
-		return x.CustomAlphabet
-	}
-	return ""
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetRadix() int32 {
-	if x, ok := m.GetAlphabet().(*CryptoReplaceFfxFpeConfig_Radix); ok {
-		return x.Radix
-	}
-	return 0
-}
-
-func (m *CryptoReplaceFfxFpeConfig) GetSurrogateInfoType() *InfoType {
-	if m != nil {
-		return m.SurrogateInfoType
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CryptoReplaceFfxFpeConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CryptoReplaceFfxFpeConfig_OneofMarshaler, _CryptoReplaceFfxFpeConfig_OneofUnmarshaler, _CryptoReplaceFfxFpeConfig_OneofSizer, []interface{}{
-		(*CryptoReplaceFfxFpeConfig_CommonAlphabet)(nil),
-		(*CryptoReplaceFfxFpeConfig_CustomAlphabet)(nil),
-		(*CryptoReplaceFfxFpeConfig_Radix)(nil),
-	}
-}
-
-func _CryptoReplaceFfxFpeConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	// alphabet
-	switch x := m.Alphabet.(type) {
-	case *CryptoReplaceFfxFpeConfig_CommonAlphabet:
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.CommonAlphabet))
-	case *CryptoReplaceFfxFpeConfig_CustomAlphabet:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.CustomAlphabet)
-	case *CryptoReplaceFfxFpeConfig_Radix:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Radix))
-	case nil:
-	default:
-		return fmt.Errorf("CryptoReplaceFfxFpeConfig.Alphabet has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CryptoReplaceFfxFpeConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	switch tag {
-	case 4: // alphabet.common_alphabet
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_CommonAlphabet{CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet(x)}
-		return true, err
-	case 5: // alphabet.custom_alphabet
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_CustomAlphabet{x}
-		return true, err
-	case 6: // alphabet.radix
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Alphabet = &CryptoReplaceFfxFpeConfig_Radix{int32(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CryptoReplaceFfxFpeConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CryptoReplaceFfxFpeConfig)
-	// alphabet
-	switch x := m.Alphabet.(type) {
-	case *CryptoReplaceFfxFpeConfig_CommonAlphabet:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.CommonAlphabet))
-	case *CryptoReplaceFfxFpeConfig_CustomAlphabet:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.CustomAlphabet)))
-		n += len(x.CustomAlphabet)
-	case *CryptoReplaceFfxFpeConfig_Radix:
-		n += proto.SizeVarint(6<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Radix))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// This is a data encryption key (DEK) (as opposed to
-// a key encryption key (KEK) stored by KMS).
-// When using KMS to wrap/unwrap DEKs, be sure to set an appropriate
-// IAM policy on the KMS CryptoKey (KEK) to ensure an attacker cannot
-// unwrap the data crypto key.
-type CryptoKey struct {
-	// Types that are valid to be assigned to Source:
-	//	*CryptoKey_Transient
-	//	*CryptoKey_Unwrapped
-	//	*CryptoKey_KmsWrapped
-	Source isCryptoKey_Source `protobuf_oneof:"source"`
-}
-
-func (m *CryptoKey) Reset()                    { *m = CryptoKey{} }
-func (m *CryptoKey) String() string            { return proto.CompactTextString(m) }
-func (*CryptoKey) ProtoMessage()               {}
-func (*CryptoKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{43} }
-
-type isCryptoKey_Source interface {
-	isCryptoKey_Source()
-}
-
-type CryptoKey_Transient struct {
-	Transient *TransientCryptoKey `protobuf:"bytes,1,opt,name=transient,oneof"`
-}
-type CryptoKey_Unwrapped struct {
-	Unwrapped *UnwrappedCryptoKey `protobuf:"bytes,2,opt,name=unwrapped,oneof"`
-}
-type CryptoKey_KmsWrapped struct {
-	KmsWrapped *KmsWrappedCryptoKey `protobuf:"bytes,3,opt,name=kms_wrapped,json=kmsWrapped,oneof"`
-}
-
-func (*CryptoKey_Transient) isCryptoKey_Source()  {}
-func (*CryptoKey_Unwrapped) isCryptoKey_Source()  {}
-func (*CryptoKey_KmsWrapped) isCryptoKey_Source() {}
-
-func (m *CryptoKey) GetSource() isCryptoKey_Source {
-	if m != nil {
-		return m.Source
-	}
-	return nil
-}
-
-func (m *CryptoKey) GetTransient() *TransientCryptoKey {
-	if x, ok := m.GetSource().(*CryptoKey_Transient); ok {
-		return x.Transient
-	}
-	return nil
-}
-
-func (m *CryptoKey) GetUnwrapped() *UnwrappedCryptoKey {
-	if x, ok := m.GetSource().(*CryptoKey_Unwrapped); ok {
-		return x.Unwrapped
-	}
-	return nil
-}
-
-func (m *CryptoKey) GetKmsWrapped() *KmsWrappedCryptoKey {
-	if x, ok := m.GetSource().(*CryptoKey_KmsWrapped); ok {
-		return x.KmsWrapped
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CryptoKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CryptoKey_OneofMarshaler, _CryptoKey_OneofUnmarshaler, _CryptoKey_OneofSizer, []interface{}{
-		(*CryptoKey_Transient)(nil),
-		(*CryptoKey_Unwrapped)(nil),
-		(*CryptoKey_KmsWrapped)(nil),
-	}
-}
-
-func _CryptoKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CryptoKey)
-	// source
-	switch x := m.Source.(type) {
-	case *CryptoKey_Transient:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Transient); err != nil {
-			return err
-		}
-	case *CryptoKey_Unwrapped:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Unwrapped); err != nil {
-			return err
-		}
-	case *CryptoKey_KmsWrapped:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.KmsWrapped); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CryptoKey.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CryptoKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CryptoKey)
-	switch tag {
-	case 1: // source.transient
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TransientCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_Transient{msg}
-		return true, err
-	case 2: // source.unwrapped
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(UnwrappedCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_Unwrapped{msg}
-		return true, err
-	case 3: // source.kms_wrapped
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(KmsWrappedCryptoKey)
-		err := b.DecodeMessage(msg)
-		m.Source = &CryptoKey_KmsWrapped{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CryptoKey_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CryptoKey)
-	// source
-	switch x := m.Source.(type) {
-	case *CryptoKey_Transient:
-		s := proto.Size(x.Transient)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CryptoKey_Unwrapped:
-		s := proto.Size(x.Unwrapped)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CryptoKey_KmsWrapped:
-		s := proto.Size(x.KmsWrapped)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Use this to have a random data crypto key generated.
-// It will be discarded after the request finishes.
-type TransientCryptoKey struct {
-	// Name of the key. [required]
-	// This is an arbitrary string used to differentiate different keys.
-	// A unique key is generated per name: two separate `TransientCryptoKey`
-	// protos share the same generated key if their names are the same.
-	// When the data crypto key is generated, this name is not used in any way
-	// (repeating the api call will result in a different key being generated).
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *TransientCryptoKey) Reset()                    { *m = TransientCryptoKey{} }
-func (m *TransientCryptoKey) String() string            { return proto.CompactTextString(m) }
-func (*TransientCryptoKey) ProtoMessage()               {}
-func (*TransientCryptoKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{44} }
-
-func (m *TransientCryptoKey) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Using raw keys is prone to security risks due to accidentally
-// leaking the key. Choose another type of key if possible.
-type UnwrappedCryptoKey struct {
-	// The AES 128/192/256 bit key. [required]
-	Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-}
-
-func (m *UnwrappedCryptoKey) Reset()                    { *m = UnwrappedCryptoKey{} }
-func (m *UnwrappedCryptoKey) String() string            { return proto.CompactTextString(m) }
-func (*UnwrappedCryptoKey) ProtoMessage()               {}
-func (*UnwrappedCryptoKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{45} }
-
-func (m *UnwrappedCryptoKey) GetKey() []byte {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-// Include to use an existing data crypto key wrapped by KMS.
-// Authorization requires the following IAM permissions when sending a request
-// to perform a crypto transformation using a kms-wrapped crypto key:
-// dlp.kms.encrypt
-type KmsWrappedCryptoKey struct {
-	// The wrapped data crypto key. [required]
-	WrappedKey []byte `protobuf:"bytes,1,opt,name=wrapped_key,json=wrappedKey,proto3" json:"wrapped_key,omitempty"`
-	// The resource name of the KMS CryptoKey to use for unwrapping. [required]
-	CryptoKeyName string `protobuf:"bytes,2,opt,name=crypto_key_name,json=cryptoKeyName" json:"crypto_key_name,omitempty"`
-}
-
-func (m *KmsWrappedCryptoKey) Reset()                    { *m = KmsWrappedCryptoKey{} }
-func (m *KmsWrappedCryptoKey) String() string            { return proto.CompactTextString(m) }
-func (*KmsWrappedCryptoKey) ProtoMessage()               {}
-func (*KmsWrappedCryptoKey) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46} }
-
-func (m *KmsWrappedCryptoKey) GetWrappedKey() []byte {
-	if m != nil {
-		return m.WrappedKey
-	}
-	return nil
-}
-
-func (m *KmsWrappedCryptoKey) GetCryptoKeyName() string {
-	if m != nil {
-		return m.CryptoKeyName
-	}
-	return ""
-}
-
-// A type of transformation that will scan unstructured text and
-// apply various `PrimitiveTransformation`s to each finding, where the
-// transformation is applied to only values that were identified as a specific
-// info_type.
-type InfoTypeTransformations struct {
-	// Transformation for each infoType. Cannot specify more than one
-	// for a given infoType. [required]
-	Transformations []*InfoTypeTransformations_InfoTypeTransformation `protobuf:"bytes,1,rep,name=transformations" json:"transformations,omitempty"`
-}
-
-func (m *InfoTypeTransformations) Reset()                    { *m = InfoTypeTransformations{} }
-func (m *InfoTypeTransformations) String() string            { return proto.CompactTextString(m) }
-func (*InfoTypeTransformations) ProtoMessage()               {}
-func (*InfoTypeTransformations) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{47} }
-
-func (m *InfoTypeTransformations) GetTransformations() []*InfoTypeTransformations_InfoTypeTransformation {
-	if m != nil {
-		return m.Transformations
-	}
-	return nil
-}
-
-// A transformation to apply to text that is identified as a specific
-// info_type.
-type InfoTypeTransformations_InfoTypeTransformation struct {
-	// InfoTypes to apply the transformation to. Empty list will match all
-	// available infoTypes for this transformation.
-	InfoTypes []*InfoType `protobuf:"bytes,1,rep,name=info_types,json=infoTypes" json:"info_types,omitempty"`
-	// Primitive transformation to apply to the infoType. [required]
-	PrimitiveTransformation *PrimitiveTransformation `protobuf:"bytes,2,opt,name=primitive_transformation,json=primitiveTransformation" json:"primitive_transformation,omitempty"`
-}
-
-func (m *InfoTypeTransformations_InfoTypeTransformation) Reset() {
-	*m = InfoTypeTransformations_InfoTypeTransformation{}
-}
-func (m *InfoTypeTransformations_InfoTypeTransformation) String() string {
-	return proto.CompactTextString(m)
-}
-func (*InfoTypeTransformations_InfoTypeTransformation) ProtoMessage() {}
-func (*InfoTypeTransformations_InfoTypeTransformation) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{47, 0}
-}
-
-func (m *InfoTypeTransformations_InfoTypeTransformation) GetInfoTypes() []*InfoType {
-	if m != nil {
-		return m.InfoTypes
-	}
-	return nil
-}
-
-func (m *InfoTypeTransformations_InfoTypeTransformation) GetPrimitiveTransformation() *PrimitiveTransformation {
-	if m != nil {
-		return m.PrimitiveTransformation
-	}
-	return nil
-}
-
-// The transformation to apply to the field.
-type FieldTransformation struct {
-	// Input field(s) to apply the transformation to. [required]
-	Fields []*FieldId `protobuf:"bytes,1,rep,name=fields" json:"fields,omitempty"`
-	// Only apply the transformation if the condition evaluates to true for the
-	// given `RecordCondition`. The conditions are allowed to reference fields
-	// that are not used in the actual transformation. [optional]
-	//
-	// Example Use Cases:
-	//
-	// - Apply a different bucket transformation to an age column if the zip code
-	// column for the same record is within a specific range.
-	// - Redact a field if the date of birth field is greater than 85.
-	Condition *RecordCondition `protobuf:"bytes,3,opt,name=condition" json:"condition,omitempty"`
-	// Transformation to apply. [required]
-	//
-	// Types that are valid to be assigned to Transformation:
-	//	*FieldTransformation_PrimitiveTransformation
-	//	*FieldTransformation_InfoTypeTransformations
-	Transformation isFieldTransformation_Transformation `protobuf_oneof:"transformation"`
-}
-
-func (m *FieldTransformation) Reset()                    { *m = FieldTransformation{} }
-func (m *FieldTransformation) String() string            { return proto.CompactTextString(m) }
-func (*FieldTransformation) ProtoMessage()               {}
-func (*FieldTransformation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{48} }
-
-type isFieldTransformation_Transformation interface {
-	isFieldTransformation_Transformation()
-}
-
-type FieldTransformation_PrimitiveTransformation struct {
-	PrimitiveTransformation *PrimitiveTransformation `protobuf:"bytes,4,opt,name=primitive_transformation,json=primitiveTransformation,oneof"`
-}
-type FieldTransformation_InfoTypeTransformations struct {
-	InfoTypeTransformations *InfoTypeTransformations `protobuf:"bytes,5,opt,name=info_type_transformations,json=infoTypeTransformations,oneof"`
-}
-
-func (*FieldTransformation_PrimitiveTransformation) isFieldTransformation_Transformation() {}
-func (*FieldTransformation_InfoTypeTransformations) isFieldTransformation_Transformation() {}
-
-func (m *FieldTransformation) GetTransformation() isFieldTransformation_Transformation {
-	if m != nil {
-		return m.Transformation
-	}
-	return nil
-}
-
-func (m *FieldTransformation) GetFields() []*FieldId {
-	if m != nil {
-		return m.Fields
-	}
-	return nil
-}
-
-func (m *FieldTransformation) GetCondition() *RecordCondition {
-	if m != nil {
-		return m.Condition
-	}
-	return nil
-}
-
-func (m *FieldTransformation) GetPrimitiveTransformation() *PrimitiveTransformation {
-	if x, ok := m.GetTransformation().(*FieldTransformation_PrimitiveTransformation); ok {
-		return x.PrimitiveTransformation
-	}
-	return nil
-}
-
-func (m *FieldTransformation) GetInfoTypeTransformations() *InfoTypeTransformations {
-	if x, ok := m.GetTransformation().(*FieldTransformation_InfoTypeTransformations); ok {
-		return x.InfoTypeTransformations
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*FieldTransformation) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _FieldTransformation_OneofMarshaler, _FieldTransformation_OneofUnmarshaler, _FieldTransformation_OneofSizer, []interface{}{
-		(*FieldTransformation_PrimitiveTransformation)(nil),
-		(*FieldTransformation_InfoTypeTransformations)(nil),
-	}
-}
-
-func _FieldTransformation_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*FieldTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *FieldTransformation_PrimitiveTransformation:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.PrimitiveTransformation); err != nil {
-			return err
-		}
-	case *FieldTransformation_InfoTypeTransformations:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InfoTypeTransformations); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("FieldTransformation.Transformation has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _FieldTransformation_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*FieldTransformation)
-	switch tag {
-	case 4: // transformation.primitive_transformation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(PrimitiveTransformation)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &FieldTransformation_PrimitiveTransformation{msg}
-		return true, err
-	case 5: // transformation.info_type_transformations
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InfoTypeTransformations)
-		err := b.DecodeMessage(msg)
-		m.Transformation = &FieldTransformation_InfoTypeTransformations{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _FieldTransformation_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*FieldTransformation)
-	// transformation
-	switch x := m.Transformation.(type) {
-	case *FieldTransformation_PrimitiveTransformation:
-		s := proto.Size(x.PrimitiveTransformation)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *FieldTransformation_InfoTypeTransformations:
-		s := proto.Size(x.InfoTypeTransformations)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// A type of transformation that is applied over structured data such as a
-// table.
-type RecordTransformations struct {
-	// Transform the record by applying various field transformations.
-	FieldTransformations []*FieldTransformation `protobuf:"bytes,1,rep,name=field_transformations,json=fieldTransformations" json:"field_transformations,omitempty"`
-	// Configuration defining which records get suppressed entirely. Records that
-	// match any suppression rule are omitted from the output [optional].
-	RecordSuppressions []*RecordSuppression `protobuf:"bytes,2,rep,name=record_suppressions,json=recordSuppressions" json:"record_suppressions,omitempty"`
-}
-
-func (m *RecordTransformations) Reset()                    { *m = RecordTransformations{} }
-func (m *RecordTransformations) String() string            { return proto.CompactTextString(m) }
-func (*RecordTransformations) ProtoMessage()               {}
-func (*RecordTransformations) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{49} }
-
-func (m *RecordTransformations) GetFieldTransformations() []*FieldTransformation {
-	if m != nil {
-		return m.FieldTransformations
-	}
-	return nil
-}
-
-func (m *RecordTransformations) GetRecordSuppressions() []*RecordSuppression {
-	if m != nil {
-		return m.RecordSuppressions
-	}
-	return nil
-}
-
-// Configuration to suppress records whose suppression conditions evaluate to
-// true.
-type RecordSuppression struct {
-	// A condition that when it evaluates to true will result in the record being
-	// evaluated to be suppressed from the transformed content.
-	Condition *RecordCondition `protobuf:"bytes,1,opt,name=condition" json:"condition,omitempty"`
-}
-
-func (m *RecordSuppression) Reset()                    { *m = RecordSuppression{} }
-func (m *RecordSuppression) String() string            { return proto.CompactTextString(m) }
-func (*RecordSuppression) ProtoMessage()               {}
-func (*RecordSuppression) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{50} }
-
-func (m *RecordSuppression) GetCondition() *RecordCondition {
-	if m != nil {
-		return m.Condition
-	}
-	return nil
-}
-
-// A condition for determining whether a transformation should be applied to
-// a field.
-type RecordCondition struct {
-	// An expression.
-	Expressions *RecordCondition_Expressions `protobuf:"bytes,3,opt,name=expressions" json:"expressions,omitempty"`
-}
-
-func (m *RecordCondition) Reset()                    { *m = RecordCondition{} }
-func (m *RecordCondition) String() string            { return proto.CompactTextString(m) }
-func (*RecordCondition) ProtoMessage()               {}
-func (*RecordCondition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51} }
-
-func (m *RecordCondition) GetExpressions() *RecordCondition_Expressions {
-	if m != nil {
-		return m.Expressions
-	}
-	return nil
-}
-
-// The field type of `value` and `field` do not need to match to be
-// considered equal, but not all comparisons are possible.
-//
-// A `value` of type:
-//
-// - `string` can be compared against all other types
-// - `boolean` can only be compared against other booleans
-// - `integer` can be compared against doubles or a string if the string value
-// can be parsed as an integer.
-// - `double` can be compared against integers or a string if the string can
-// be parsed as a double.
-// - `Timestamp` can be compared against strings in RFC 3339 date string
-// format.
-// - `TimeOfDay` can be compared against timestamps and strings in the format
-// of 'HH:mm:ss'.
-//
-// If we fail to compare do to type mismatch, a warning will be given and
-// the condition will evaluate to false.
-type RecordCondition_Condition struct {
-	// Field within the record this condition is evaluated against. [required]
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-	// Operator used to compare the field or infoType to the value. [required]
-	Operator RelationalOperator `protobuf:"varint,3,opt,name=operator,enum=google.privacy.dlp.v2beta2.RelationalOperator" json:"operator,omitempty"`
-	// Value to compare against. [Required, except for `EXISTS` tests.]
-	Value *Value `protobuf:"bytes,4,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *RecordCondition_Condition) Reset()                    { *m = RecordCondition_Condition{} }
-func (m *RecordCondition_Condition) String() string            { return proto.CompactTextString(m) }
-func (*RecordCondition_Condition) ProtoMessage()               {}
-func (*RecordCondition_Condition) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51, 0} }
-
-func (m *RecordCondition_Condition) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func (m *RecordCondition_Condition) GetOperator() RelationalOperator {
-	if m != nil {
-		return m.Operator
-	}
-	return RelationalOperator_RELATIONAL_OPERATOR_UNSPECIFIED
-}
-
-func (m *RecordCondition_Condition) GetValue() *Value {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-// A collection of conditions.
-type RecordCondition_Conditions struct {
-	Conditions []*RecordCondition_Condition `protobuf:"bytes,1,rep,name=conditions" json:"conditions,omitempty"`
-}
-
-func (m *RecordCondition_Conditions) Reset()                    { *m = RecordCondition_Conditions{} }
-func (m *RecordCondition_Conditions) String() string            { return proto.CompactTextString(m) }
-func (*RecordCondition_Conditions) ProtoMessage()               {}
-func (*RecordCondition_Conditions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51, 1} }
-
-func (m *RecordCondition_Conditions) GetConditions() []*RecordCondition_Condition {
-	if m != nil {
-		return m.Conditions
-	}
-	return nil
-}
-
-// An expression, consisting or an operator and conditions.
-type RecordCondition_Expressions struct {
-	// The operator to apply to the result of conditions. Default and currently
-	// only supported value is `AND`.
-	LogicalOperator RecordCondition_Expressions_LogicalOperator `protobuf:"varint,1,opt,name=logical_operator,json=logicalOperator,enum=google.privacy.dlp.v2beta2.RecordCondition_Expressions_LogicalOperator" json:"logical_operator,omitempty"`
-	// Types that are valid to be assigned to Type:
-	//	*RecordCondition_Expressions_Conditions
-	Type isRecordCondition_Expressions_Type `protobuf_oneof:"type"`
-}
-
-func (m *RecordCondition_Expressions) Reset()                    { *m = RecordCondition_Expressions{} }
-func (m *RecordCondition_Expressions) String() string            { return proto.CompactTextString(m) }
-func (*RecordCondition_Expressions) ProtoMessage()               {}
-func (*RecordCondition_Expressions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{51, 2} }
-
-type isRecordCondition_Expressions_Type interface {
-	isRecordCondition_Expressions_Type()
-}
-
-type RecordCondition_Expressions_Conditions struct {
-	Conditions *RecordCondition_Conditions `protobuf:"bytes,3,opt,name=conditions,oneof"`
-}
-
-func (*RecordCondition_Expressions_Conditions) isRecordCondition_Expressions_Type() {}
-
-func (m *RecordCondition_Expressions) GetType() isRecordCondition_Expressions_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *RecordCondition_Expressions) GetLogicalOperator() RecordCondition_Expressions_LogicalOperator {
-	if m != nil {
-		return m.LogicalOperator
-	}
-	return RecordCondition_Expressions_LOGICAL_OPERATOR_UNSPECIFIED
-}
-
-func (m *RecordCondition_Expressions) GetConditions() *RecordCondition_Conditions {
-	if x, ok := m.GetType().(*RecordCondition_Expressions_Conditions); ok {
-		return x.Conditions
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecordCondition_Expressions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecordCondition_Expressions_OneofMarshaler, _RecordCondition_Expressions_OneofUnmarshaler, _RecordCondition_Expressions_OneofSizer, []interface{}{
-		(*RecordCondition_Expressions_Conditions)(nil),
-	}
-}
-
-func _RecordCondition_Expressions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecordCondition_Expressions)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordCondition_Expressions_Conditions:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Conditions); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RecordCondition_Expressions.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecordCondition_Expressions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecordCondition_Expressions)
-	switch tag {
-	case 3: // type.conditions
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(RecordCondition_Conditions)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordCondition_Expressions_Conditions{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecordCondition_Expressions_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecordCondition_Expressions)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordCondition_Expressions_Conditions:
-		s := proto.Size(x.Conditions)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Overview of the modifications that occurred.
-type TransformationOverview struct {
-	// Total size in bytes that were transformed in some way.
-	TransformedBytes int64 `protobuf:"varint,2,opt,name=transformed_bytes,json=transformedBytes" json:"transformed_bytes,omitempty"`
-	// Transformations applied to the dataset.
-	TransformationSummaries []*TransformationSummary `protobuf:"bytes,3,rep,name=transformation_summaries,json=transformationSummaries" json:"transformation_summaries,omitempty"`
-}
-
-func (m *TransformationOverview) Reset()                    { *m = TransformationOverview{} }
-func (m *TransformationOverview) String() string            { return proto.CompactTextString(m) }
-func (*TransformationOverview) ProtoMessage()               {}
-func (*TransformationOverview) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{52} }
-
-func (m *TransformationOverview) GetTransformedBytes() int64 {
-	if m != nil {
-		return m.TransformedBytes
-	}
-	return 0
-}
-
-func (m *TransformationOverview) GetTransformationSummaries() []*TransformationSummary {
-	if m != nil {
-		return m.TransformationSummaries
-	}
-	return nil
-}
-
-// Summary of a single tranformation.
-// Only one of 'transformation', 'field_transformation', or 'record_suppress'
-// will be set.
-type TransformationSummary struct {
-	// Set if the transformation was limited to a specific info_type.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Set if the transformation was limited to a specific FieldId.
-	Field *FieldId `protobuf:"bytes,2,opt,name=field" json:"field,omitempty"`
-	// The specific transformation these stats apply to.
-	Transformation *PrimitiveTransformation `protobuf:"bytes,3,opt,name=transformation" json:"transformation,omitempty"`
-	// The field transformation that was applied.
-	// If multiple field transformations are requested for a single field,
-	// this list will contain all of them; otherwise, only one is supplied.
-	FieldTransformations []*FieldTransformation `protobuf:"bytes,5,rep,name=field_transformations,json=fieldTransformations" json:"field_transformations,omitempty"`
-	// The specific suppression option these stats apply to.
-	RecordSuppress *RecordSuppression                     `protobuf:"bytes,6,opt,name=record_suppress,json=recordSuppress" json:"record_suppress,omitempty"`
-	Results        []*TransformationSummary_SummaryResult `protobuf:"bytes,4,rep,name=results" json:"results,omitempty"`
-	// Total size in bytes that were transformed in some way.
-	TransformedBytes int64 `protobuf:"varint,7,opt,name=transformed_bytes,json=transformedBytes" json:"transformed_bytes,omitempty"`
-}
-
-func (m *TransformationSummary) Reset()                    { *m = TransformationSummary{} }
-func (m *TransformationSummary) String() string            { return proto.CompactTextString(m) }
-func (*TransformationSummary) ProtoMessage()               {}
-func (*TransformationSummary) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{53} }
-
-func (m *TransformationSummary) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetTransformation() *PrimitiveTransformation {
-	if m != nil {
-		return m.Transformation
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetFieldTransformations() []*FieldTransformation {
-	if m != nil {
-		return m.FieldTransformations
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetRecordSuppress() *RecordSuppression {
-	if m != nil {
-		return m.RecordSuppress
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetResults() []*TransformationSummary_SummaryResult {
-	if m != nil {
-		return m.Results
-	}
-	return nil
-}
-
-func (m *TransformationSummary) GetTransformedBytes() int64 {
-	if m != nil {
-		return m.TransformedBytes
-	}
-	return 0
-}
-
-// A collection that informs the user the number of times a particular
-// `TransformationResultCode` and error details occurred.
-type TransformationSummary_SummaryResult struct {
-	Count int64                                          `protobuf:"varint,1,opt,name=count" json:"count,omitempty"`
-	Code  TransformationSummary_TransformationResultCode `protobuf:"varint,2,opt,name=code,enum=google.privacy.dlp.v2beta2.TransformationSummary_TransformationResultCode" json:"code,omitempty"`
-	// A place for warnings or errors to show up if a transformation didn't
-	// work as expected.
-	Details string `protobuf:"bytes,3,opt,name=details" json:"details,omitempty"`
-}
-
-func (m *TransformationSummary_SummaryResult) Reset()         { *m = TransformationSummary_SummaryResult{} }
-func (m *TransformationSummary_SummaryResult) String() string { return proto.CompactTextString(m) }
-func (*TransformationSummary_SummaryResult) ProtoMessage()    {}
-func (*TransformationSummary_SummaryResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{53, 0}
-}
-
-func (m *TransformationSummary_SummaryResult) GetCount() int64 {
-	if m != nil {
-		return m.Count
-	}
-	return 0
-}
-
-func (m *TransformationSummary_SummaryResult) GetCode() TransformationSummary_TransformationResultCode {
-	if m != nil {
-		return m.Code
-	}
-	return TransformationSummary_TRANSFORMATION_RESULT_CODE_UNSPECIFIED
-}
-
-func (m *TransformationSummary_SummaryResult) GetDetails() string {
-	if m != nil {
-		return m.Details
-	}
-	return ""
-}
-
-// The inspectTemplate contains a configuration (set of types of sensitive data
-// to be detected) to be used anywhere you otherwise would normally specify
-// InspectConfig.
-type InspectTemplate struct {
-	// The template name. Output only.
-	//
-	// The template will have one of the following formats:
-	// `projects/PROJECT_ID/inspectTemplates/TEMPLATE_ID` OR
-	// `organizations/ORGANIZATION_ID/inspectTemplates/TEMPLATE_ID`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Display name (max 256 chars).
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
-	// Short description (max 256 chars).
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
-	// The creation timestamp of a inspectTemplate, output only field.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// The last update timestamp of a inspectTemplate, output only field.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
-	// The core content of the template. Configuration of the scanning process.
-	InspectConfig *InspectConfig `protobuf:"bytes,6,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-}
-
-func (m *InspectTemplate) Reset()                    { *m = InspectTemplate{} }
-func (m *InspectTemplate) String() string            { return proto.CompactTextString(m) }
-func (*InspectTemplate) ProtoMessage()               {}
-func (*InspectTemplate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{54} }
-
-func (m *InspectTemplate) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *InspectTemplate) GetDisplayName() string {
-	if m != nil {
-		return m.DisplayName
-	}
-	return ""
-}
-
-func (m *InspectTemplate) GetDescription() string {
-	if m != nil {
-		return m.Description
-	}
-	return ""
-}
-
-func (m *InspectTemplate) GetCreateTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-func (m *InspectTemplate) GetUpdateTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.UpdateTime
-	}
-	return nil
-}
-
-func (m *InspectTemplate) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-// The DeidentifyTemplates contains instructions on how to deidentify content.
-type DeidentifyTemplate struct {
-	// The template name. Output only.
-	//
-	// The template will have one of the following formats:
-	// `projects/PROJECT_ID/deidentifyTemplates/TEMPLATE_ID` OR
-	// `organizations/ORGANIZATION_ID/deidentifyTemplates/TEMPLATE_ID`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Display name (max 256 chars).
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
-	// Short description (max 256 chars).
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
-	// The creation timestamp of a inspectTemplate, output only field.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// The last update timestamp of a inspectTemplate, output only field.
-	UpdateTime *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime" json:"update_time,omitempty"`
-	// ///////////// // The core content of the template  // ///////////////
-	DeidentifyConfig *DeidentifyConfig `protobuf:"bytes,6,opt,name=deidentify_config,json=deidentifyConfig" json:"deidentify_config,omitempty"`
-}
-
-func (m *DeidentifyTemplate) Reset()                    { *m = DeidentifyTemplate{} }
-func (m *DeidentifyTemplate) String() string            { return proto.CompactTextString(m) }
-func (*DeidentifyTemplate) ProtoMessage()               {}
-func (*DeidentifyTemplate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{55} }
-
-func (m *DeidentifyTemplate) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *DeidentifyTemplate) GetDisplayName() string {
-	if m != nil {
-		return m.DisplayName
-	}
-	return ""
-}
-
-func (m *DeidentifyTemplate) GetDescription() string {
-	if m != nil {
-		return m.Description
-	}
-	return ""
-}
-
-func (m *DeidentifyTemplate) GetCreateTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-func (m *DeidentifyTemplate) GetUpdateTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.UpdateTime
-	}
-	return nil
-}
-
-func (m *DeidentifyTemplate) GetDeidentifyConfig() *DeidentifyConfig {
-	if m != nil {
-		return m.DeidentifyConfig
-	}
-	return nil
-}
-
-// Request message for CreateInspectTemplate.
-type CreateInspectTemplateRequest struct {
-	// The parent resource name, for example projects/my-project-id or
-	// organizations/my-org-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// The InspectTemplate to create.
-	InspectTemplate *InspectTemplate `protobuf:"bytes,2,opt,name=inspect_template,json=inspectTemplate" json:"inspect_template,omitempty"`
-	// The template id can contain uppercase and lowercase letters,
-	// numbers, and hyphens; that is, it must match the regular
-	// expression: `[a-zA-Z\\d-]+`. The maximum length is 100
-	// characters. Can be empty to allow the system to generate one.
-	TemplateId string `protobuf:"bytes,3,opt,name=template_id,json=templateId" json:"template_id,omitempty"`
-}
-
-func (m *CreateInspectTemplateRequest) Reset()                    { *m = CreateInspectTemplateRequest{} }
-func (m *CreateInspectTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateInspectTemplateRequest) ProtoMessage()               {}
-func (*CreateInspectTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{56} }
-
-func (m *CreateInspectTemplateRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *CreateInspectTemplateRequest) GetInspectTemplate() *InspectTemplate {
-	if m != nil {
-		return m.InspectTemplate
-	}
-	return nil
-}
-
-func (m *CreateInspectTemplateRequest) GetTemplateId() string {
-	if m != nil {
-		return m.TemplateId
-	}
-	return ""
-}
-
-// Request message for UpdateInspectTemplate.
-type UpdateInspectTemplateRequest struct {
-	// Resource name of organization and inspectTemplate to be updated, for
-	// example `organizations/433245324/inspectTemplates/432452342`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// New InspectTemplate value.
-	InspectTemplate *InspectTemplate `protobuf:"bytes,2,opt,name=inspect_template,json=inspectTemplate" json:"inspect_template,omitempty"`
-	// Mask to control which fields get updated.
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
-}
-
-func (m *UpdateInspectTemplateRequest) Reset()                    { *m = UpdateInspectTemplateRequest{} }
-func (m *UpdateInspectTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateInspectTemplateRequest) ProtoMessage()               {}
-func (*UpdateInspectTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{57} }
-
-func (m *UpdateInspectTemplateRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *UpdateInspectTemplateRequest) GetInspectTemplate() *InspectTemplate {
-	if m != nil {
-		return m.InspectTemplate
-	}
-	return nil
-}
-
-func (m *UpdateInspectTemplateRequest) GetUpdateMask() *google_protobuf4.FieldMask {
-	if m != nil {
-		return m.UpdateMask
-	}
-	return nil
-}
-
-// Request message for GetInspectTemplate.
-type GetInspectTemplateRequest struct {
-	// Resource name of the organization and inspectTemplate to be read, for
-	// example `organizations/433245324/inspectTemplates/432452342`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *GetInspectTemplateRequest) Reset()                    { *m = GetInspectTemplateRequest{} }
-func (m *GetInspectTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetInspectTemplateRequest) ProtoMessage()               {}
-func (*GetInspectTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{58} }
-
-func (m *GetInspectTemplateRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Request message for ListInspectTemplates.
-type ListInspectTemplatesRequest struct {
-	// The parent resource name, for example projects/my-project-id or
-	// organizations/my-org-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Optional page token to continue retrieval. Comes from previous call
-	// to `ListInspectTemplates`.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
-	// Optional size of the page, can be limited by server. If zero server returns
-	// a page of max size 100.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
-}
-
-func (m *ListInspectTemplatesRequest) Reset()                    { *m = ListInspectTemplatesRequest{} }
-func (m *ListInspectTemplatesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListInspectTemplatesRequest) ProtoMessage()               {}
-func (*ListInspectTemplatesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{59} }
-
-func (m *ListInspectTemplatesRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *ListInspectTemplatesRequest) GetPageToken() string {
-	if m != nil {
-		return m.PageToken
-	}
-	return ""
-}
-
-func (m *ListInspectTemplatesRequest) GetPageSize() int32 {
-	if m != nil {
-		return m.PageSize
-	}
-	return 0
-}
-
-// Response message for ListInspectTemplates.
-type ListInspectTemplatesResponse struct {
-	// List of inspectTemplates, up to page_size in ListInspectTemplatesRequest.
-	InspectTemplates []*InspectTemplate `protobuf:"bytes,1,rep,name=inspect_templates,json=inspectTemplates" json:"inspect_templates,omitempty"`
-	// If the next page is available then the next page token to be used
-	// in following ListInspectTemplates request.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
-}
-
-func (m *ListInspectTemplatesResponse) Reset()                    { *m = ListInspectTemplatesResponse{} }
-func (m *ListInspectTemplatesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListInspectTemplatesResponse) ProtoMessage()               {}
-func (*ListInspectTemplatesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{60} }
-
-func (m *ListInspectTemplatesResponse) GetInspectTemplates() []*InspectTemplate {
-	if m != nil {
-		return m.InspectTemplates
-	}
-	return nil
-}
-
-func (m *ListInspectTemplatesResponse) GetNextPageToken() string {
-	if m != nil {
-		return m.NextPageToken
-	}
-	return ""
-}
-
-// Request message for DeleteInspectTemplate.
-type DeleteInspectTemplateRequest struct {
-	// Resource name of the organization and inspectTemplate to be deleted, for
-	// example `organizations/433245324/inspectTemplates/432452342`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *DeleteInspectTemplateRequest) Reset()                    { *m = DeleteInspectTemplateRequest{} }
-func (m *DeleteInspectTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteInspectTemplateRequest) ProtoMessage()               {}
-func (*DeleteInspectTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{61} }
-
-func (m *DeleteInspectTemplateRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-type InspectJobConfig struct {
-	// The data to scan.
-	StorageConfig *StorageConfig `protobuf:"bytes,1,opt,name=storage_config,json=storageConfig" json:"storage_config,omitempty"`
-	// Where to put the findings.
-	OutputConfig *OutputStorageConfig `protobuf:"bytes,2,opt,name=output_config,json=outputConfig" json:"output_config,omitempty"`
-	// How and what to scan for.
-	InspectConfig *InspectConfig `protobuf:"bytes,3,opt,name=inspect_config,json=inspectConfig" json:"inspect_config,omitempty"`
-	// If provided, will be used as the default for all values in InspectConfig.
-	// `inspect_config` will be merged into the values persisted as part of the
-	// template.
-	InspectTemplateName string `protobuf:"bytes,4,opt,name=inspect_template_name,json=inspectTemplateName" json:"inspect_template_name,omitempty"`
-}
-
-func (m *InspectJobConfig) Reset()                    { *m = InspectJobConfig{} }
-func (m *InspectJobConfig) String() string            { return proto.CompactTextString(m) }
-func (*InspectJobConfig) ProtoMessage()               {}
-func (*InspectJobConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{62} }
-
-func (m *InspectJobConfig) GetStorageConfig() *StorageConfig {
-	if m != nil {
-		return m.StorageConfig
-	}
-	return nil
-}
-
-func (m *InspectJobConfig) GetOutputConfig() *OutputStorageConfig {
-	if m != nil {
-		return m.OutputConfig
-	}
-	return nil
-}
-
-func (m *InspectJobConfig) GetInspectConfig() *InspectConfig {
-	if m != nil {
-		return m.InspectConfig
-	}
-	return nil
-}
-
-func (m *InspectJobConfig) GetInspectTemplateName() string {
-	if m != nil {
-		return m.InspectTemplateName
-	}
-	return ""
-}
-
-// Combines all of the information about a DLP job.
-type DlpJob struct {
-	// The server-assigned name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// The type of job.
-	Type DlpJobType `protobuf:"varint,2,opt,name=type,enum=google.privacy.dlp.v2beta2.DlpJobType" json:"type,omitempty"`
-	// State of a job.
-	State DlpJob_JobState `protobuf:"varint,3,opt,name=state,enum=google.privacy.dlp.v2beta2.DlpJob_JobState" json:"state,omitempty"`
-	// Types that are valid to be assigned to Details:
-	//	*DlpJob_RiskDetails
-	//	*DlpJob_InspectDetails
-	Details isDlpJob_Details `protobuf_oneof:"details"`
-	// Time when the job was created.
-	CreateTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
-	// Time when the job started.
-	StartTime *google_protobuf1.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
-	// Time when the job finished.
-	EndTime *google_protobuf1.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
-	// A stream of errors encountered running the job.
-	ErrorResults []*google_rpc.Status `protobuf:"bytes,9,rep,name=error_results,json=errorResults" json:"error_results,omitempty"`
-}
-
-func (m *DlpJob) Reset()                    { *m = DlpJob{} }
-func (m *DlpJob) String() string            { return proto.CompactTextString(m) }
-func (*DlpJob) ProtoMessage()               {}
-func (*DlpJob) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{63} }
-
-type isDlpJob_Details interface {
-	isDlpJob_Details()
-}
-
-type DlpJob_RiskDetails struct {
-	RiskDetails *AnalyzeDataSourceRiskDetails `protobuf:"bytes,4,opt,name=risk_details,json=riskDetails,oneof"`
-}
-type DlpJob_InspectDetails struct {
-	InspectDetails *InspectDataSourceDetails `protobuf:"bytes,5,opt,name=inspect_details,json=inspectDetails,oneof"`
-}
-
-func (*DlpJob_RiskDetails) isDlpJob_Details()    {}
-func (*DlpJob_InspectDetails) isDlpJob_Details() {}
-
-func (m *DlpJob) GetDetails() isDlpJob_Details {
-	if m != nil {
-		return m.Details
-	}
-	return nil
-}
-
-func (m *DlpJob) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *DlpJob) GetType() DlpJobType {
-	if m != nil {
-		return m.Type
-	}
-	return DlpJobType_DLP_JOB_TYPE_UNSPECIFIED
-}
-
-func (m *DlpJob) GetState() DlpJob_JobState {
-	if m != nil {
-		return m.State
-	}
-	return DlpJob_JOB_STATE_UNSPECIFIED
-}
-
-func (m *DlpJob) GetRiskDetails() *AnalyzeDataSourceRiskDetails {
-	if x, ok := m.GetDetails().(*DlpJob_RiskDetails); ok {
-		return x.RiskDetails
-	}
-	return nil
-}
-
-func (m *DlpJob) GetInspectDetails() *InspectDataSourceDetails {
-	if x, ok := m.GetDetails().(*DlpJob_InspectDetails); ok {
-		return x.InspectDetails
-	}
-	return nil
-}
-
-func (m *DlpJob) GetCreateTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.CreateTime
-	}
-	return nil
-}
-
-func (m *DlpJob) GetStartTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.StartTime
-	}
-	return nil
-}
-
-func (m *DlpJob) GetEndTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.EndTime
-	}
-	return nil
-}
-
-func (m *DlpJob) GetErrorResults() []*google_rpc.Status {
-	if m != nil {
-		return m.ErrorResults
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*DlpJob) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _DlpJob_OneofMarshaler, _DlpJob_OneofUnmarshaler, _DlpJob_OneofSizer, []interface{}{
-		(*DlpJob_RiskDetails)(nil),
-		(*DlpJob_InspectDetails)(nil),
-	}
-}
-
-func _DlpJob_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*DlpJob)
-	// details
-	switch x := m.Details.(type) {
-	case *DlpJob_RiskDetails:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.RiskDetails); err != nil {
-			return err
-		}
-	case *DlpJob_InspectDetails:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InspectDetails); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("DlpJob.Details has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _DlpJob_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*DlpJob)
-	switch tag {
-	case 4: // details.risk_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(AnalyzeDataSourceRiskDetails)
-		err := b.DecodeMessage(msg)
-		m.Details = &DlpJob_RiskDetails{msg}
-		return true, err
-	case 5: // details.inspect_details
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InspectDataSourceDetails)
-		err := b.DecodeMessage(msg)
-		m.Details = &DlpJob_InspectDetails{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _DlpJob_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*DlpJob)
-	// details
-	switch x := m.Details.(type) {
-	case *DlpJob_RiskDetails:
-		s := proto.Size(x.RiskDetails)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *DlpJob_InspectDetails:
-		s := proto.Size(x.InspectDetails)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// The request message for [DlpJobs.GetDlpJob][].
-type GetDlpJobRequest struct {
-	// The name of the DlpJob resource.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *GetDlpJobRequest) Reset()                    { *m = GetDlpJobRequest{} }
-func (m *GetDlpJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDlpJobRequest) ProtoMessage()               {}
-func (*GetDlpJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{64} }
-
-func (m *GetDlpJobRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// The request message for listing DLP jobs.
-type ListDlpJobsRequest struct {
-	// The parent resource name, for example projects/my-project-id.
-	Parent string `protobuf:"bytes,4,opt,name=parent" json:"parent,omitempty"`
-	// Optional. Allows filtering.
-	//
-	// Supported syntax:
-	//
-	// * Filter expressions are made up of one or more restrictions.
-	// * Restrictions can be combined by `AND` or `OR` logical operators. A
-	// sequence of restrictions implicitly uses `AND`.
-	// * A restriction has the form of `<field> <operator> <value>`.
-	// * Supported fields/values for inspect jobs:
-	//     - `state` - PENDING|RUNNING|CANCELED|FINISHED|FAILED
-	//     - `inspected_storage` - DATASTORE|CLOUD_STORAGE|BIGQUERY
-	// * Supported fields for risk analysis jobs:
-	//     - `state` - RUNNING|CANCELED|FINISHED|FAILED
-	// * The operator must be `=` or `!=`.
-	//
-	// Examples:
-	//
-	// * inspected_storage = cloud_storage AND state = done
-	// * inspected_storage = cloud_storage OR inspected_storage = bigquery
-	// * inspected_storage = cloud_storage AND (state = done OR state = canceled)
-	//
-	// The length of this field should be no more than 500 characters.
-	Filter string `protobuf:"bytes,1,opt,name=filter" json:"filter,omitempty"`
-	// The standard list page size.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
-	// The standard list page token.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
-	// The type of job. Defaults to `DlpJobType.INSPECT`
-	Type DlpJobType `protobuf:"varint,5,opt,name=type,enum=google.privacy.dlp.v2beta2.DlpJobType" json:"type,omitempty"`
-}
-
-func (m *ListDlpJobsRequest) Reset()                    { *m = ListDlpJobsRequest{} }
-func (m *ListDlpJobsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDlpJobsRequest) ProtoMessage()               {}
-func (*ListDlpJobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{65} }
-
-func (m *ListDlpJobsRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *ListDlpJobsRequest) GetFilter() string {
-	if m != nil {
-		return m.Filter
-	}
-	return ""
-}
-
-func (m *ListDlpJobsRequest) GetPageSize() int32 {
-	if m != nil {
-		return m.PageSize
-	}
-	return 0
-}
-
-func (m *ListDlpJobsRequest) GetPageToken() string {
-	if m != nil {
-		return m.PageToken
-	}
-	return ""
-}
-
-func (m *ListDlpJobsRequest) GetType() DlpJobType {
-	if m != nil {
-		return m.Type
-	}
-	return DlpJobType_DLP_JOB_TYPE_UNSPECIFIED
-}
-
-// The response message for listing DLP jobs.
-type ListDlpJobsResponse struct {
-	// A list of DlpJobs that matches the specified filter in the request.
-	Jobs []*DlpJob `protobuf:"bytes,1,rep,name=jobs" json:"jobs,omitempty"`
-	// The standard List next-page token.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
-}
-
-func (m *ListDlpJobsResponse) Reset()                    { *m = ListDlpJobsResponse{} }
-func (m *ListDlpJobsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDlpJobsResponse) ProtoMessage()               {}
-func (*ListDlpJobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{66} }
-
-func (m *ListDlpJobsResponse) GetJobs() []*DlpJob {
-	if m != nil {
-		return m.Jobs
-	}
-	return nil
-}
-
-func (m *ListDlpJobsResponse) GetNextPageToken() string {
-	if m != nil {
-		return m.NextPageToken
-	}
-	return ""
-}
-
-// The request message for canceling a DLP job.
-type CancelDlpJobRequest struct {
-	// The name of the DlpJob resource to be cancelled.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *CancelDlpJobRequest) Reset()                    { *m = CancelDlpJobRequest{} }
-func (m *CancelDlpJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*CancelDlpJobRequest) ProtoMessage()               {}
-func (*CancelDlpJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{67} }
-
-func (m *CancelDlpJobRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// The request message for deleting a DLP job.
-type DeleteDlpJobRequest struct {
-	// The name of the DlpJob resource to be deleted.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *DeleteDlpJobRequest) Reset()                    { *m = DeleteDlpJobRequest{} }
-func (m *DeleteDlpJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteDlpJobRequest) ProtoMessage()               {}
-func (*DeleteDlpJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{68} }
-
-func (m *DeleteDlpJobRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Request message for CreateDeidentifyTemplate.
-type CreateDeidentifyTemplateRequest struct {
-	// The parent resource name, for example projects/my-project-id or
-	// organizations/my-org-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// The DeidentifyTemplate to create.
-	DeidentifyTemplate *DeidentifyTemplate `protobuf:"bytes,2,opt,name=deidentify_template,json=deidentifyTemplate" json:"deidentify_template,omitempty"`
-	// The template id can contain uppercase and lowercase letters,
-	// numbers, and hyphens; that is, it must match the regular
-	// expression: `[a-zA-Z\\d-]+`. The maximum length is 100
-	// characters. Can be empty to allow the system to generate one.
-	TemplateId string `protobuf:"bytes,3,opt,name=template_id,json=templateId" json:"template_id,omitempty"`
-}
-
-func (m *CreateDeidentifyTemplateRequest) Reset()         { *m = CreateDeidentifyTemplateRequest{} }
-func (m *CreateDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
-func (*CreateDeidentifyTemplateRequest) ProtoMessage()    {}
-func (*CreateDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{69}
-}
-
-func (m *CreateDeidentifyTemplateRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *CreateDeidentifyTemplateRequest) GetDeidentifyTemplate() *DeidentifyTemplate {
-	if m != nil {
-		return m.DeidentifyTemplate
-	}
-	return nil
-}
-
-func (m *CreateDeidentifyTemplateRequest) GetTemplateId() string {
-	if m != nil {
-		return m.TemplateId
-	}
-	return ""
-}
-
-// Request message for UpdateDeidentifyTemplate.
-type UpdateDeidentifyTemplateRequest struct {
-	// Resource name of organization and deidentify template to be updated, for
-	// example `organizations/433245324/deidentifyTemplates/432452342`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// New DeidentifyTemplate value.
-	DeidentifyTemplate *DeidentifyTemplate `protobuf:"bytes,2,opt,name=deidentify_template,json=deidentifyTemplate" json:"deidentify_template,omitempty"`
-	// Mask to control which fields get updated.
-	UpdateMask *google_protobuf4.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
-}
-
-func (m *UpdateDeidentifyTemplateRequest) Reset()         { *m = UpdateDeidentifyTemplateRequest{} }
-func (m *UpdateDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
-func (*UpdateDeidentifyTemplateRequest) ProtoMessage()    {}
-func (*UpdateDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{70}
-}
-
-func (m *UpdateDeidentifyTemplateRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *UpdateDeidentifyTemplateRequest) GetDeidentifyTemplate() *DeidentifyTemplate {
-	if m != nil {
-		return m.DeidentifyTemplate
-	}
-	return nil
-}
-
-func (m *UpdateDeidentifyTemplateRequest) GetUpdateMask() *google_protobuf4.FieldMask {
-	if m != nil {
-		return m.UpdateMask
-	}
-	return nil
-}
-
-// Request message for GetDeidentifyTemplate.
-type GetDeidentifyTemplateRequest struct {
-	// Resource name of the organization and deidentify template to be read, for
-	// example `organizations/433245324/deidentifyTemplates/432452342`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *GetDeidentifyTemplateRequest) Reset()                    { *m = GetDeidentifyTemplateRequest{} }
-func (m *GetDeidentifyTemplateRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDeidentifyTemplateRequest) ProtoMessage()               {}
-func (*GetDeidentifyTemplateRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{71} }
-
-func (m *GetDeidentifyTemplateRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Request message for ListDeidentifyTemplates.
-type ListDeidentifyTemplatesRequest struct {
-	// The parent resource name, for example projects/my-project-id or
-	// organizations/my-org-id.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
-	// Optional page token to continue retrieval. Comes from previous call
-	// to `ListDeidentifyTemplates`.
-	PageToken string `protobuf:"bytes,2,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
-	// Optional size of the page, can be limited by server. If zero server returns
-	// a page of max size 100.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
-}
-
-func (m *ListDeidentifyTemplatesRequest) Reset()                    { *m = ListDeidentifyTemplatesRequest{} }
-func (m *ListDeidentifyTemplatesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDeidentifyTemplatesRequest) ProtoMessage()               {}
-func (*ListDeidentifyTemplatesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{72} }
-
-func (m *ListDeidentifyTemplatesRequest) GetParent() string {
-	if m != nil {
-		return m.Parent
-	}
-	return ""
-}
-
-func (m *ListDeidentifyTemplatesRequest) GetPageToken() string {
-	if m != nil {
-		return m.PageToken
-	}
-	return ""
-}
-
-func (m *ListDeidentifyTemplatesRequest) GetPageSize() int32 {
-	if m != nil {
-		return m.PageSize
-	}
-	return 0
-}
-
-// Response message for ListDeidentifyTemplates.
-type ListDeidentifyTemplatesResponse struct {
-	// List of deidentify templates, up to page_size in
-	// ListDeidentifyTemplatesRequest.
-	DeidentifyTemplates []*DeidentifyTemplate `protobuf:"bytes,1,rep,name=deidentify_templates,json=deidentifyTemplates" json:"deidentify_templates,omitempty"`
-	// If the next page is available then the next page token to be used
-	// in following ListDeidentifyTemplates request.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
-}
-
-func (m *ListDeidentifyTemplatesResponse) Reset()         { *m = ListDeidentifyTemplatesResponse{} }
-func (m *ListDeidentifyTemplatesResponse) String() string { return proto.CompactTextString(m) }
-func (*ListDeidentifyTemplatesResponse) ProtoMessage()    {}
-func (*ListDeidentifyTemplatesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{73}
-}
-
-func (m *ListDeidentifyTemplatesResponse) GetDeidentifyTemplates() []*DeidentifyTemplate {
-	if m != nil {
-		return m.DeidentifyTemplates
-	}
-	return nil
-}
-
-func (m *ListDeidentifyTemplatesResponse) GetNextPageToken() string {
-	if m != nil {
-		return m.NextPageToken
-	}
-	return ""
-}
-
-// Request message for DeleteDeidentifyTemplate.
-type DeleteDeidentifyTemplateRequest struct {
-	// Resource name of the organization and deidentify template to be deleted,
-	// for example `organizations/433245324/deidentifyTemplates/432452342`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *DeleteDeidentifyTemplateRequest) Reset()         { *m = DeleteDeidentifyTemplateRequest{} }
-func (m *DeleteDeidentifyTemplateRequest) String() string { return proto.CompactTextString(m) }
-func (*DeleteDeidentifyTemplateRequest) ProtoMessage()    {}
-func (*DeleteDeidentifyTemplateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{74}
-}
-
-func (m *DeleteDeidentifyTemplateRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*InspectConfig)(nil), "google.privacy.dlp.v2beta2.InspectConfig")
-	proto.RegisterType((*InspectConfig_FindingLimits)(nil), "google.privacy.dlp.v2beta2.InspectConfig.FindingLimits")
-	proto.RegisterType((*InspectConfig_FindingLimits_InfoTypeLimit)(nil), "google.privacy.dlp.v2beta2.InspectConfig.FindingLimits.InfoTypeLimit")
-	proto.RegisterType((*ContentItem)(nil), "google.privacy.dlp.v2beta2.ContentItem")
-	proto.RegisterType((*Table)(nil), "google.privacy.dlp.v2beta2.Table")
-	proto.RegisterType((*Table_Row)(nil), "google.privacy.dlp.v2beta2.Table.Row")
-	proto.RegisterType((*InspectResult)(nil), "google.privacy.dlp.v2beta2.InspectResult")
-	proto.RegisterType((*Finding)(nil), "google.privacy.dlp.v2beta2.Finding")
-	proto.RegisterType((*Location)(nil), "google.privacy.dlp.v2beta2.Location")
-	proto.RegisterType((*TableLocation)(nil), "google.privacy.dlp.v2beta2.TableLocation")
-	proto.RegisterType((*Range)(nil), "google.privacy.dlp.v2beta2.Range")
-	proto.RegisterType((*ImageLocation)(nil), "google.privacy.dlp.v2beta2.ImageLocation")
-	proto.RegisterType((*RedactImageRequest)(nil), "google.privacy.dlp.v2beta2.RedactImageRequest")
-	proto.RegisterType((*RedactImageRequest_ImageRedactionConfig)(nil), "google.privacy.dlp.v2beta2.RedactImageRequest.ImageRedactionConfig")
-	proto.RegisterType((*Color)(nil), "google.privacy.dlp.v2beta2.Color")
-	proto.RegisterType((*RedactImageResponse)(nil), "google.privacy.dlp.v2beta2.RedactImageResponse")
-	proto.RegisterType((*DeidentifyContentRequest)(nil), "google.privacy.dlp.v2beta2.DeidentifyContentRequest")
-	proto.RegisterType((*DeidentifyContentResponse)(nil), "google.privacy.dlp.v2beta2.DeidentifyContentResponse")
-	proto.RegisterType((*ReidentifyContentRequest)(nil), "google.privacy.dlp.v2beta2.ReidentifyContentRequest")
-	proto.RegisterType((*ReidentifyContentResponse)(nil), "google.privacy.dlp.v2beta2.ReidentifyContentResponse")
-	proto.RegisterType((*InspectContentRequest)(nil), "google.privacy.dlp.v2beta2.InspectContentRequest")
-	proto.RegisterType((*InspectContentResponse)(nil), "google.privacy.dlp.v2beta2.InspectContentResponse")
-	proto.RegisterType((*InspectDataSourceRequest)(nil), "google.privacy.dlp.v2beta2.InspectDataSourceRequest")
-	proto.RegisterType((*OutputStorageConfig)(nil), "google.privacy.dlp.v2beta2.OutputStorageConfig")
-	proto.RegisterType((*InfoTypeStatistics)(nil), "google.privacy.dlp.v2beta2.InfoTypeStatistics")
-	proto.RegisterType((*InspectDataSourceDetails)(nil), "google.privacy.dlp.v2beta2.InspectDataSourceDetails")
-	proto.RegisterType((*InspectDataSourceDetails_RequestedOptions)(nil), "google.privacy.dlp.v2beta2.InspectDataSourceDetails.RequestedOptions")
-	proto.RegisterType((*InspectDataSourceDetails_Result)(nil), "google.privacy.dlp.v2beta2.InspectDataSourceDetails.Result")
-	proto.RegisterType((*InfoTypeDescription)(nil), "google.privacy.dlp.v2beta2.InfoTypeDescription")
-	proto.RegisterType((*ListInfoTypesRequest)(nil), "google.privacy.dlp.v2beta2.ListInfoTypesRequest")
-	proto.RegisterType((*ListInfoTypesResponse)(nil), "google.privacy.dlp.v2beta2.ListInfoTypesResponse")
-	proto.RegisterType((*AnalyzeDataSourceRiskRequest)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskRequest")
-	proto.RegisterType((*RiskAnalysisJobConfig)(nil), "google.privacy.dlp.v2beta2.RiskAnalysisJobConfig")
-	proto.RegisterType((*PrivacyMetric)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric")
-	proto.RegisterType((*PrivacyMetric_NumericalStatsConfig)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric.NumericalStatsConfig")
-	proto.RegisterType((*PrivacyMetric_CategoricalStatsConfig)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric.CategoricalStatsConfig")
-	proto.RegisterType((*PrivacyMetric_KAnonymityConfig)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric.KAnonymityConfig")
-	proto.RegisterType((*PrivacyMetric_LDiversityConfig)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric.LDiversityConfig")
-	proto.RegisterType((*PrivacyMetric_KMapEstimationConfig)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric.KMapEstimationConfig")
-	proto.RegisterType((*PrivacyMetric_KMapEstimationConfig_TaggedField)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric.KMapEstimationConfig.TaggedField")
-	proto.RegisterType((*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable")
-	proto.RegisterType((*PrivacyMetric_KMapEstimationConfig_AuxiliaryTable_QuasiIdField)(nil), "google.privacy.dlp.v2beta2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable.QuasiIdField")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_NumericalStatsResult)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.NumericalStatsResult")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_CategoricalStatsResult)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_CategoricalStatsResult_CategoricalStatsHistogramBucket)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult.CategoricalStatsHistogramBucket")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KAnonymityResult)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.KAnonymityResult")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityEquivalenceClass)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.KAnonymityResult.KAnonymityEquivalenceClass")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KAnonymityResult_KAnonymityHistogramBucket)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.KAnonymityResult.KAnonymityHistogramBucket")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_LDiversityResult)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.LDiversityResult")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityEquivalenceClass)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.LDiversityResult.LDiversityEquivalenceClass")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_LDiversityResult_LDiversityHistogramBucket)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.LDiversityResult.LDiversityHistogramBucket")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KMapEstimationResult)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.KMapEstimationResult")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationQuasiIdValues)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.KMapEstimationResult.KMapEstimationQuasiIdValues")
-	proto.RegisterType((*AnalyzeDataSourceRiskDetails_KMapEstimationResult_KMapEstimationHistogramBucket)(nil), "google.privacy.dlp.v2beta2.AnalyzeDataSourceRiskDetails.KMapEstimationResult.KMapEstimationHistogramBucket")
-	proto.RegisterType((*ValueFrequency)(nil), "google.privacy.dlp.v2beta2.ValueFrequency")
-	proto.RegisterType((*Value)(nil), "google.privacy.dlp.v2beta2.Value")
-	proto.RegisterType((*DeidentifyConfig)(nil), "google.privacy.dlp.v2beta2.DeidentifyConfig")
-	proto.RegisterType((*PrimitiveTransformation)(nil), "google.privacy.dlp.v2beta2.PrimitiveTransformation")
-	proto.RegisterType((*TimePartConfig)(nil), "google.privacy.dlp.v2beta2.TimePartConfig")
-	proto.RegisterType((*CryptoHashConfig)(nil), "google.privacy.dlp.v2beta2.CryptoHashConfig")
-	proto.RegisterType((*ReplaceValueConfig)(nil), "google.privacy.dlp.v2beta2.ReplaceValueConfig")
-	proto.RegisterType((*ReplaceWithInfoTypeConfig)(nil), "google.privacy.dlp.v2beta2.ReplaceWithInfoTypeConfig")
-	proto.RegisterType((*RedactConfig)(nil), "google.privacy.dlp.v2beta2.RedactConfig")
-	proto.RegisterType((*CharsToIgnore)(nil), "google.privacy.dlp.v2beta2.CharsToIgnore")
-	proto.RegisterType((*CharacterMaskConfig)(nil), "google.privacy.dlp.v2beta2.CharacterMaskConfig")
-	proto.RegisterType((*FixedSizeBucketingConfig)(nil), "google.privacy.dlp.v2beta2.FixedSizeBucketingConfig")
-	proto.RegisterType((*BucketingConfig)(nil), "google.privacy.dlp.v2beta2.BucketingConfig")
-	proto.RegisterType((*BucketingConfig_Bucket)(nil), "google.privacy.dlp.v2beta2.BucketingConfig.Bucket")
-	proto.RegisterType((*CryptoReplaceFfxFpeConfig)(nil), "google.privacy.dlp.v2beta2.CryptoReplaceFfxFpeConfig")
-	proto.RegisterType((*CryptoKey)(nil), "google.privacy.dlp.v2beta2.CryptoKey")
-	proto.RegisterType((*TransientCryptoKey)(nil), "google.privacy.dlp.v2beta2.TransientCryptoKey")
-	proto.RegisterType((*UnwrappedCryptoKey)(nil), "google.privacy.dlp.v2beta2.UnwrappedCryptoKey")
-	proto.RegisterType((*KmsWrappedCryptoKey)(nil), "google.privacy.dlp.v2beta2.KmsWrappedCryptoKey")
-	proto.RegisterType((*InfoTypeTransformations)(nil), "google.privacy.dlp.v2beta2.InfoTypeTransformations")
-	proto.RegisterType((*InfoTypeTransformations_InfoTypeTransformation)(nil), "google.privacy.dlp.v2beta2.InfoTypeTransformations.InfoTypeTransformation")
-	proto.RegisterType((*FieldTransformation)(nil), "google.privacy.dlp.v2beta2.FieldTransformation")
-	proto.RegisterType((*RecordTransformations)(nil), "google.privacy.dlp.v2beta2.RecordTransformations")
-	proto.RegisterType((*RecordSuppression)(nil), "google.privacy.dlp.v2beta2.RecordSuppression")
-	proto.RegisterType((*RecordCondition)(nil), "google.privacy.dlp.v2beta2.RecordCondition")
-	proto.RegisterType((*RecordCondition_Condition)(nil), "google.privacy.dlp.v2beta2.RecordCondition.Condition")
-	proto.RegisterType((*RecordCondition_Conditions)(nil), "google.privacy.dlp.v2beta2.RecordCondition.Conditions")
-	proto.RegisterType((*RecordCondition_Expressions)(nil), "google.privacy.dlp.v2beta2.RecordCondition.Expressions")
-	proto.RegisterType((*TransformationOverview)(nil), "google.privacy.dlp.v2beta2.TransformationOverview")
-	proto.RegisterType((*TransformationSummary)(nil), "google.privacy.dlp.v2beta2.TransformationSummary")
-	proto.RegisterType((*TransformationSummary_SummaryResult)(nil), "google.privacy.dlp.v2beta2.TransformationSummary.SummaryResult")
-	proto.RegisterType((*InspectTemplate)(nil), "google.privacy.dlp.v2beta2.InspectTemplate")
-	proto.RegisterType((*DeidentifyTemplate)(nil), "google.privacy.dlp.v2beta2.DeidentifyTemplate")
-	proto.RegisterType((*CreateInspectTemplateRequest)(nil), "google.privacy.dlp.v2beta2.CreateInspectTemplateRequest")
-	proto.RegisterType((*UpdateInspectTemplateRequest)(nil), "google.privacy.dlp.v2beta2.UpdateInspectTemplateRequest")
-	proto.RegisterType((*GetInspectTemplateRequest)(nil), "google.privacy.dlp.v2beta2.GetInspectTemplateRequest")
-	proto.RegisterType((*ListInspectTemplatesRequest)(nil), "google.privacy.dlp.v2beta2.ListInspectTemplatesRequest")
-	proto.RegisterType((*ListInspectTemplatesResponse)(nil), "google.privacy.dlp.v2beta2.ListInspectTemplatesResponse")
-	proto.RegisterType((*DeleteInspectTemplateRequest)(nil), "google.privacy.dlp.v2beta2.DeleteInspectTemplateRequest")
-	proto.RegisterType((*InspectJobConfig)(nil), "google.privacy.dlp.v2beta2.InspectJobConfig")
-	proto.RegisterType((*DlpJob)(nil), "google.privacy.dlp.v2beta2.DlpJob")
-	proto.RegisterType((*GetDlpJobRequest)(nil), "google.privacy.dlp.v2beta2.GetDlpJobRequest")
-	proto.RegisterType((*ListDlpJobsRequest)(nil), "google.privacy.dlp.v2beta2.ListDlpJobsRequest")
-	proto.RegisterType((*ListDlpJobsResponse)(nil), "google.privacy.dlp.v2beta2.ListDlpJobsResponse")
-	proto.RegisterType((*CancelDlpJobRequest)(nil), "google.privacy.dlp.v2beta2.CancelDlpJobRequest")
-	proto.RegisterType((*DeleteDlpJobRequest)(nil), "google.privacy.dlp.v2beta2.DeleteDlpJobRequest")
-	proto.RegisterType((*CreateDeidentifyTemplateRequest)(nil), "google.privacy.dlp.v2beta2.CreateDeidentifyTemplateRequest")
-	proto.RegisterType((*UpdateDeidentifyTemplateRequest)(nil), "google.privacy.dlp.v2beta2.UpdateDeidentifyTemplateRequest")
-	proto.RegisterType((*GetDeidentifyTemplateRequest)(nil), "google.privacy.dlp.v2beta2.GetDeidentifyTemplateRequest")
-	proto.RegisterType((*ListDeidentifyTemplatesRequest)(nil), "google.privacy.dlp.v2beta2.ListDeidentifyTemplatesRequest")
-	proto.RegisterType((*ListDeidentifyTemplatesResponse)(nil), "google.privacy.dlp.v2beta2.ListDeidentifyTemplatesResponse")
-	proto.RegisterType((*DeleteDeidentifyTemplateRequest)(nil), "google.privacy.dlp.v2beta2.DeleteDeidentifyTemplateRequest")
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.InfoTypeSupportedBy", InfoTypeSupportedBy_name, InfoTypeSupportedBy_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.RelationalOperator", RelationalOperator_name, RelationalOperator_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.DlpJobType", DlpJobType_name, DlpJobType_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.TimePartConfig_TimePart", TimePartConfig_TimePart_name, TimePartConfig_TimePart_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.CharsToIgnore_CommonCharsToIgnore", CharsToIgnore_CommonCharsToIgnore_name, CharsToIgnore_CommonCharsToIgnore_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet", CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_name, CryptoReplaceFfxFpeConfig_FfxCommonNativeAlphabet_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.RecordCondition_Expressions_LogicalOperator", RecordCondition_Expressions_LogicalOperator_name, RecordCondition_Expressions_LogicalOperator_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.TransformationSummary_TransformationResultCode", TransformationSummary_TransformationResultCode_name, TransformationSummary_TransformationResultCode_value)
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.DlpJob_JobState", DlpJob_JobState_name, DlpJob_JobState_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for DlpService service
-
-type DlpServiceClient interface {
-	// Finds potentially sensitive info in content.
-	// This method has limits on input size, processing time, and output size.
-	// [How-to guide for text](/dlp/docs/inspecting-text), [How-to guide for
-	// images](/dlp/docs/inspecting-images)
-	InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error)
-	// Redacts potentially sensitive info from an image.
-	// This method has limits on input size, processing time, and output size.
-	// [How-to guide](/dlp/docs/redacting-sensitive-data-images)
-	RedactImage(ctx context.Context, in *RedactImageRequest, opts ...grpc.CallOption) (*RedactImageResponse, error)
-	// De-identifies potentially sensitive info from a ContentItem.
-	// This method has limits on input size and output size.
-	// [How-to guide](/dlp/docs/deidentify-sensitive-data)
-	DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error)
-	// Re-identify content that has been de-identified.
-	ReidentifyContent(ctx context.Context, in *ReidentifyContentRequest, opts ...grpc.CallOption) (*ReidentifyContentResponse, error)
-	// Schedules a job scanning content in a Google Cloud Platform data
-	// repository. [How-to guide](/dlp/docs/inspecting-storage)
-	InspectDataSource(ctx context.Context, in *InspectDataSourceRequest, opts ...grpc.CallOption) (*DlpJob, error)
-	// Schedules a job to compute risk analysis metrics over content in a Google
-	// Cloud Platform repository. [How-to guide}(/dlp/docs/compute-risk-analysis)
-	AnalyzeDataSourceRisk(ctx context.Context, in *AnalyzeDataSourceRiskRequest, opts ...grpc.CallOption) (*DlpJob, error)
-	// Returns sensitive information types DLP supports.
-	ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error)
-	// Creates an inspect template for re-using frequently used configuration
-	// for inspecting content, images, and storage.
-	CreateInspectTemplate(ctx context.Context, in *CreateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
-	// Updates the inspect template.
-	UpdateInspectTemplate(ctx context.Context, in *UpdateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
-	// Gets an inspect template.
-	GetInspectTemplate(ctx context.Context, in *GetInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error)
-	// Lists inspect templates.
-	ListInspectTemplates(ctx context.Context, in *ListInspectTemplatesRequest, opts ...grpc.CallOption) (*ListInspectTemplatesResponse, error)
-	// Deletes inspect templates.
-	DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
-	// Creates an Deidentify template for re-using frequently used configuration
-	// for Deidentifying content, images, and storage.
-	CreateDeidentifyTemplate(ctx context.Context, in *CreateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
-	// Updates the inspect template.
-	UpdateDeidentifyTemplate(ctx context.Context, in *UpdateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
-	// Gets an inspect template.
-	GetDeidentifyTemplate(ctx context.Context, in *GetDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error)
-	// Lists inspect templates.
-	ListDeidentifyTemplates(ctx context.Context, in *ListDeidentifyTemplatesRequest, opts ...grpc.CallOption) (*ListDeidentifyTemplatesResponse, error)
-	// Deletes inspect templates.
-	DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
-	// Lists DlpJobs that match the specified filter in the request.
-	ListDlpJobs(ctx context.Context, in *ListDlpJobsRequest, opts ...grpc.CallOption) (*ListDlpJobsResponse, error)
-	// Gets the latest state of a long-running DlpJob.
-	GetDlpJob(ctx context.Context, in *GetDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error)
-	// Deletes a long-running DlpJob. This method indicates that the client is
-	// no longer interested in the DlpJob result. The job will be cancelled if
-	// possible.
-	DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
-	// Starts asynchronous cancellation on a long-running DlpJob.  The server
-	// makes a best effort to cancel the DlpJob, but success is not
-	// guaranteed.
-	CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error)
-}
-
-type dlpServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewDlpServiceClient(cc *grpc.ClientConn) DlpServiceClient {
-	return &dlpServiceClient{cc}
-}
-
-func (c *dlpServiceClient) InspectContent(ctx context.Context, in *InspectContentRequest, opts ...grpc.CallOption) (*InspectContentResponse, error) {
-	out := new(InspectContentResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/InspectContent", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) RedactImage(ctx context.Context, in *RedactImageRequest, opts ...grpc.CallOption) (*RedactImageResponse, error) {
-	out := new(RedactImageResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/RedactImage", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeidentifyContent(ctx context.Context, in *DeidentifyContentRequest, opts ...grpc.CallOption) (*DeidentifyContentResponse, error) {
-	out := new(DeidentifyContentResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/DeidentifyContent", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ReidentifyContent(ctx context.Context, in *ReidentifyContentRequest, opts ...grpc.CallOption) (*ReidentifyContentResponse, error) {
-	out := new(ReidentifyContentResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/ReidentifyContent", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) InspectDataSource(ctx context.Context, in *InspectDataSourceRequest, opts ...grpc.CallOption) (*DlpJob, error) {
-	out := new(DlpJob)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/InspectDataSource", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) AnalyzeDataSourceRisk(ctx context.Context, in *AnalyzeDataSourceRiskRequest, opts ...grpc.CallOption) (*DlpJob, error) {
-	out := new(DlpJob)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/AnalyzeDataSourceRisk", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListInfoTypes(ctx context.Context, in *ListInfoTypesRequest, opts ...grpc.CallOption) (*ListInfoTypesResponse, error) {
-	out := new(ListInfoTypesResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/ListInfoTypes", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CreateInspectTemplate(ctx context.Context, in *CreateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
-	out := new(InspectTemplate)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/CreateInspectTemplate", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) UpdateInspectTemplate(ctx context.Context, in *UpdateInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
-	out := new(InspectTemplate)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/UpdateInspectTemplate", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) GetInspectTemplate(ctx context.Context, in *GetInspectTemplateRequest, opts ...grpc.CallOption) (*InspectTemplate, error) {
-	out := new(InspectTemplate)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/GetInspectTemplate", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListInspectTemplates(ctx context.Context, in *ListInspectTemplatesRequest, opts ...grpc.CallOption) (*ListInspectTemplatesResponse, error) {
-	out := new(ListInspectTemplatesResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/ListInspectTemplates", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/DeleteInspectTemplate", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CreateDeidentifyTemplate(ctx context.Context, in *CreateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
-	out := new(DeidentifyTemplate)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/CreateDeidentifyTemplate", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) UpdateDeidentifyTemplate(ctx context.Context, in *UpdateDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
-	out := new(DeidentifyTemplate)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/UpdateDeidentifyTemplate", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) GetDeidentifyTemplate(ctx context.Context, in *GetDeidentifyTemplateRequest, opts ...grpc.CallOption) (*DeidentifyTemplate, error) {
-	out := new(DeidentifyTemplate)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/GetDeidentifyTemplate", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListDeidentifyTemplates(ctx context.Context, in *ListDeidentifyTemplatesRequest, opts ...grpc.CallOption) (*ListDeidentifyTemplatesResponse, error) {
-	out := new(ListDeidentifyTemplatesResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/ListDeidentifyTemplates", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/DeleteDeidentifyTemplate", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) ListDlpJobs(ctx context.Context, in *ListDlpJobsRequest, opts ...grpc.CallOption) (*ListDlpJobsResponse, error) {
-	out := new(ListDlpJobsResponse)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/ListDlpJobs", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) GetDlpJob(ctx context.Context, in *GetDlpJobRequest, opts ...grpc.CallOption) (*DlpJob, error) {
-	out := new(DlpJob)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/GetDlpJob", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/DeleteDlpJob", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *dlpServiceClient) CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*google_protobuf3.Empty, error) {
-	out := new(google_protobuf3.Empty)
-	err := grpc.Invoke(ctx, "/google.privacy.dlp.v2beta2.DlpService/CancelDlpJob", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for DlpService service
-
-type DlpServiceServer interface {
-	// Finds potentially sensitive info in content.
-	// This method has limits on input size, processing time, and output size.
-	// [How-to guide for text](/dlp/docs/inspecting-text), [How-to guide for
-	// images](/dlp/docs/inspecting-images)
-	InspectContent(context.Context, *InspectContentRequest) (*InspectContentResponse, error)
-	// Redacts potentially sensitive info from an image.
-	// This method has limits on input size, processing time, and output size.
-	// [How-to guide](/dlp/docs/redacting-sensitive-data-images)
-	RedactImage(context.Context, *RedactImageRequest) (*RedactImageResponse, error)
-	// De-identifies potentially sensitive info from a ContentItem.
-	// This method has limits on input size and output size.
-	// [How-to guide](/dlp/docs/deidentify-sensitive-data)
-	DeidentifyContent(context.Context, *DeidentifyContentRequest) (*DeidentifyContentResponse, error)
-	// Re-identify content that has been de-identified.
-	ReidentifyContent(context.Context, *ReidentifyContentRequest) (*ReidentifyContentResponse, error)
-	// Schedules a job scanning content in a Google Cloud Platform data
-	// repository. [How-to guide](/dlp/docs/inspecting-storage)
-	InspectDataSource(context.Context, *InspectDataSourceRequest) (*DlpJob, error)
-	// Schedules a job to compute risk analysis metrics over content in a Google
-	// Cloud Platform repository. [How-to guide}(/dlp/docs/compute-risk-analysis)
-	AnalyzeDataSourceRisk(context.Context, *AnalyzeDataSourceRiskRequest) (*DlpJob, error)
-	// Returns sensitive information types DLP supports.
-	ListInfoTypes(context.Context, *ListInfoTypesRequest) (*ListInfoTypesResponse, error)
-	// Creates an inspect template for re-using frequently used configuration
-	// for inspecting content, images, and storage.
-	CreateInspectTemplate(context.Context, *CreateInspectTemplateRequest) (*InspectTemplate, error)
-	// Updates the inspect template.
-	UpdateInspectTemplate(context.Context, *UpdateInspectTemplateRequest) (*InspectTemplate, error)
-	// Gets an inspect template.
-	GetInspectTemplate(context.Context, *GetInspectTemplateRequest) (*InspectTemplate, error)
-	// Lists inspect templates.
-	ListInspectTemplates(context.Context, *ListInspectTemplatesRequest) (*ListInspectTemplatesResponse, error)
-	// Deletes inspect templates.
-	DeleteInspectTemplate(context.Context, *DeleteInspectTemplateRequest) (*google_protobuf3.Empty, error)
-	// Creates an Deidentify template for re-using frequently used configuration
-	// for Deidentifying content, images, and storage.
-	CreateDeidentifyTemplate(context.Context, *CreateDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
-	// Updates the inspect template.
-	UpdateDeidentifyTemplate(context.Context, *UpdateDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
-	// Gets an inspect template.
-	GetDeidentifyTemplate(context.Context, *GetDeidentifyTemplateRequest) (*DeidentifyTemplate, error)
-	// Lists inspect templates.
-	ListDeidentifyTemplates(context.Context, *ListDeidentifyTemplatesRequest) (*ListDeidentifyTemplatesResponse, error)
-	// Deletes inspect templates.
-	DeleteDeidentifyTemplate(context.Context, *DeleteDeidentifyTemplateRequest) (*google_protobuf3.Empty, error)
-	// Lists DlpJobs that match the specified filter in the request.
-	ListDlpJobs(context.Context, *ListDlpJobsRequest) (*ListDlpJobsResponse, error)
-	// Gets the latest state of a long-running DlpJob.
-	GetDlpJob(context.Context, *GetDlpJobRequest) (*DlpJob, error)
-	// Deletes a long-running DlpJob. This method indicates that the client is
-	// no longer interested in the DlpJob result. The job will be cancelled if
-	// possible.
-	DeleteDlpJob(context.Context, *DeleteDlpJobRequest) (*google_protobuf3.Empty, error)
-	// Starts asynchronous cancellation on a long-running DlpJob.  The server
-	// makes a best effort to cancel the DlpJob, but success is not
-	// guaranteed.
-	CancelDlpJob(context.Context, *CancelDlpJobRequest) (*google_protobuf3.Empty, error)
-}
-
-func RegisterDlpServiceServer(s *grpc.Server, srv DlpServiceServer) {
-	s.RegisterService(&_DlpService_serviceDesc, srv)
-}
-
-func _DlpService_InspectContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(InspectContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).InspectContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/InspectContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).InspectContent(ctx, req.(*InspectContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_RedactImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RedactImageRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).RedactImage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/RedactImage",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).RedactImage(ctx, req.(*RedactImageRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeidentifyContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeidentifyContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/DeidentifyContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeidentifyContent(ctx, req.(*DeidentifyContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ReidentifyContent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReidentifyContentRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ReidentifyContent(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/ReidentifyContent",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ReidentifyContent(ctx, req.(*ReidentifyContentRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_InspectDataSource_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(InspectDataSourceRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).InspectDataSource(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/InspectDataSource",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).InspectDataSource(ctx, req.(*InspectDataSourceRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_AnalyzeDataSourceRisk_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AnalyzeDataSourceRiskRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).AnalyzeDataSourceRisk(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/AnalyzeDataSourceRisk",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).AnalyzeDataSourceRisk(ctx, req.(*AnalyzeDataSourceRiskRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListInfoTypes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListInfoTypesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListInfoTypes(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/ListInfoTypes",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListInfoTypes(ctx, req.(*ListInfoTypesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CreateInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateInspectTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CreateInspectTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/CreateInspectTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CreateInspectTemplate(ctx, req.(*CreateInspectTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_UpdateInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateInspectTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).UpdateInspectTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/UpdateInspectTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).UpdateInspectTemplate(ctx, req.(*UpdateInspectTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_GetInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetInspectTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).GetInspectTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/GetInspectTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).GetInspectTemplate(ctx, req.(*GetInspectTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListInspectTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListInspectTemplatesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListInspectTemplates(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/ListInspectTemplates",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListInspectTemplates(ctx, req.(*ListInspectTemplatesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeleteInspectTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteInspectTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeleteInspectTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/DeleteInspectTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeleteInspectTemplate(ctx, req.(*DeleteInspectTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CreateDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateDeidentifyTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CreateDeidentifyTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/CreateDeidentifyTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CreateDeidentifyTemplate(ctx, req.(*CreateDeidentifyTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_UpdateDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateDeidentifyTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).UpdateDeidentifyTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/UpdateDeidentifyTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).UpdateDeidentifyTemplate(ctx, req.(*UpdateDeidentifyTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_GetDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetDeidentifyTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).GetDeidentifyTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/GetDeidentifyTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).GetDeidentifyTemplate(ctx, req.(*GetDeidentifyTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListDeidentifyTemplates_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListDeidentifyTemplatesRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListDeidentifyTemplates(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/ListDeidentifyTemplates",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListDeidentifyTemplates(ctx, req.(*ListDeidentifyTemplatesRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeleteDeidentifyTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteDeidentifyTemplateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeleteDeidentifyTemplate(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/DeleteDeidentifyTemplate",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeleteDeidentifyTemplate(ctx, req.(*DeleteDeidentifyTemplateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_ListDlpJobs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListDlpJobsRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).ListDlpJobs(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/ListDlpJobs",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).ListDlpJobs(ctx, req.(*ListDlpJobsRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_GetDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetDlpJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).GetDlpJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/GetDlpJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).GetDlpJob(ctx, req.(*GetDlpJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_DeleteDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteDlpJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).DeleteDlpJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/DeleteDlpJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).DeleteDlpJob(ctx, req.(*DeleteDlpJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _DlpService_CancelDlpJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CancelDlpJobRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(DlpServiceServer).CancelDlpJob(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.privacy.dlp.v2beta2.DlpService/CancelDlpJob",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DlpServiceServer).CancelDlpJob(ctx, req.(*CancelDlpJobRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _DlpService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.privacy.dlp.v2beta2.DlpService",
-	HandlerType: (*DlpServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "InspectContent",
-			Handler:    _DlpService_InspectContent_Handler,
-		},
-		{
-			MethodName: "RedactImage",
-			Handler:    _DlpService_RedactImage_Handler,
-		},
-		{
-			MethodName: "DeidentifyContent",
-			Handler:    _DlpService_DeidentifyContent_Handler,
-		},
-		{
-			MethodName: "ReidentifyContent",
-			Handler:    _DlpService_ReidentifyContent_Handler,
-		},
-		{
-			MethodName: "InspectDataSource",
-			Handler:    _DlpService_InspectDataSource_Handler,
-		},
-		{
-			MethodName: "AnalyzeDataSourceRisk",
-			Handler:    _DlpService_AnalyzeDataSourceRisk_Handler,
-		},
-		{
-			MethodName: "ListInfoTypes",
-			Handler:    _DlpService_ListInfoTypes_Handler,
-		},
-		{
-			MethodName: "CreateInspectTemplate",
-			Handler:    _DlpService_CreateInspectTemplate_Handler,
-		},
-		{
-			MethodName: "UpdateInspectTemplate",
-			Handler:    _DlpService_UpdateInspectTemplate_Handler,
-		},
-		{
-			MethodName: "GetInspectTemplate",
-			Handler:    _DlpService_GetInspectTemplate_Handler,
-		},
-		{
-			MethodName: "ListInspectTemplates",
-			Handler:    _DlpService_ListInspectTemplates_Handler,
-		},
-		{
-			MethodName: "DeleteInspectTemplate",
-			Handler:    _DlpService_DeleteInspectTemplate_Handler,
-		},
-		{
-			MethodName: "CreateDeidentifyTemplate",
-			Handler:    _DlpService_CreateDeidentifyTemplate_Handler,
-		},
-		{
-			MethodName: "UpdateDeidentifyTemplate",
-			Handler:    _DlpService_UpdateDeidentifyTemplate_Handler,
-		},
-		{
-			MethodName: "GetDeidentifyTemplate",
-			Handler:    _DlpService_GetDeidentifyTemplate_Handler,
-		},
-		{
-			MethodName: "ListDeidentifyTemplates",
-			Handler:    _DlpService_ListDeidentifyTemplates_Handler,
-		},
-		{
-			MethodName: "DeleteDeidentifyTemplate",
-			Handler:    _DlpService_DeleteDeidentifyTemplate_Handler,
-		},
-		{
-			MethodName: "ListDlpJobs",
-			Handler:    _DlpService_ListDlpJobs_Handler,
-		},
-		{
-			MethodName: "GetDlpJob",
-			Handler:    _DlpService_GetDlpJob_Handler,
-		},
-		{
-			MethodName: "DeleteDlpJob",
-			Handler:    _DlpService_DeleteDlpJob_Handler,
-		},
-		{
-			MethodName: "CancelDlpJob",
-			Handler:    _DlpService_CancelDlpJob_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "google/privacy/dlp/v2beta2/dlp.proto",
-}
-
-func init() { proto.RegisterFile("google/privacy/dlp/v2beta2/dlp.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 6587 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x7d, 0x6b, 0x6c, 0x1b, 0xd9,
-	0x75, 0xb0, 0x86, 0x14, 0x25, 0xf2, 0x90, 0x94, 0xa8, 0xab, 0x87, 0x65, 0xda, 0x5e, 0x7b, 0x67,
-	0x77, 0x1d, 0xaf, 0x77, 0x23, 0x65, 0xb5, 0xeb, 0x38, 0x6b, 0x7f, 0xde, 0x2c, 0x45, 0xd1, 0x96,
-	0x6c, 0x49, 0xd4, 0x0e, 0x29, 0xaf, 0x9d, 0xdd, 0x6f, 0xe7, 0x1b, 0x91, 0x57, 0xd4, 0xac, 0xc8,
-	0x19, 0x7a, 0x66, 0x68, 0x49, 0x9b, 0x2f, 0x5f, 0xbe, 0xb6, 0x48, 0x91, 0x34, 0x40, 0x1f, 0x48,
-	0x80, 0x2d, 0x90, 0x02, 0x49, 0x80, 0x04, 0x48, 0x82, 0x22, 0x7d, 0xa4, 0x68, 0xd1, 0x3c, 0x80,
-	0x34, 0x41, 0xd1, 0xf7, 0x8f, 0x22, 0x40, 0x81, 0xa2, 0x28, 0x5a, 0xb4, 0x05, 0x8a, 0x3e, 0x50,
-	0x14, 0xfd, 0xd1, 0x7f, 0x05, 0x8a, 0xfb, 0x98, 0x27, 0x87, 0x43, 0x52, 0x92, 0xd1, 0x36, 0xff,
-	0x38, 0xe7, 0x9e, 0x73, 0xee, 0xb9, 0xe7, 0x9e, 0x7b, 0xee, 0xb9, 0xe7, 0x3e, 0x08, 0xcf, 0x36,
-	0x74, 0xbd, 0xd1, 0xc4, 0x8b, 0x6d, 0x43, 0x7d, 0xac, 0xd4, 0x8e, 0x16, 0xeb, 0xcd, 0xf6, 0xe2,
-	0xe3, 0xa5, 0x1d, 0x6c, 0x29, 0x4b, 0xe4, 0xf7, 0x42, 0xdb, 0xd0, 0x2d, 0x1d, 0xe5, 0x19, 0xd6,
-	0x02, 0xc7, 0x5a, 0x20, 0x25, 0x1c, 0x2b, 0x7f, 0x9e, 0x73, 0x50, 0xda, 0xea, 0xa2, 0xa2, 0x69,
-	0xba, 0xa5, 0x58, 0xaa, 0xae, 0x99, 0x8c, 0x32, 0x7f, 0x25, 0x82, 0xbf, 0x69, 0xe9, 0x86, 0xd2,
-	0xc0, 0x1c, 0xf3, 0x29, 0x07, 0x53, 0xb7, 0xf4, 0x9d, 0xce, 0xee, 0x62, 0xbd, 0x63, 0x50, 0x56,
-	0xbc, 0xfc, 0x5c, 0xb0, 0x1c, 0xb7, 0xda, 0xd6, 0x11, 0x2f, 0xbc, 0x14, 0x2c, 0xdc, 0x55, 0x71,
-	0xb3, 0x2e, 0xb7, 0x14, 0x73, 0x9f, 0x63, 0x5c, 0x0c, 0x62, 0x58, 0x6a, 0x0b, 0x9b, 0x96, 0xd2,
-	0xe2, 0x6d, 0xcc, 0x9f, 0xe1, 0x08, 0x46, 0xbb, 0xb6, 0x68, 0x5a, 0x8a, 0xd5, 0xb1, 0x9b, 0x30,
-	0xc7, 0x0b, 0xac, 0xa3, 0x36, 0x5e, 0xac, 0x2b, 0x16, 0x0e, 0x08, 0xc4, 0xe1, 0x47, 0xfa, 0xee,
-	0x01, 0xc6, 0xfb, 0x61, 0x85, 0xa4, 0x2a, 0x7d, 0xb7, 0xae, 0x70, 0x69, 0xc5, 0x5f, 0x1c, 0x83,
-	0xec, 0x9a, 0x66, 0xb6, 0x71, 0xcd, 0x2a, 0xea, 0xda, 0xae, 0xda, 0x40, 0x45, 0x00, 0x55, 0xdb,
-	0xd5, 0x65, 0x82, 0x6e, 0xce, 0x0b, 0x97, 0xe2, 0x57, 0xd2, 0x4b, 0xcf, 0x2e, 0xf4, 0xd6, 0xfa,
-	0xc2, 0x9a, 0xb6, 0xab, 0x57, 0x8f, 0xda, 0x58, 0x4a, 0xa9, 0xfc, 0x97, 0x89, 0x36, 0x60, 0xa2,
-	0xa5, 0x6a, 0x72, 0x53, 0xdd, 0xc7, 0x4d, 0x75, 0x4f, 0xd7, 0xeb, 0xf3, 0xb1, 0x4b, 0xc2, 0x95,
-	0x89, 0xa5, 0xcb, 0x51, 0x8c, 0xd6, 0x1d, 0x6c, 0x29, 0xdb, 0x52, 0x35, 0xf7, 0x13, 0x95, 0x61,
-	0xac, 0xa9, 0xb6, 0x54, 0xcb, 0x9c, 0x8f, 0x5f, 0x12, 0xae, 0xa4, 0x97, 0xae, 0x47, 0xcb, 0xe3,
-	0x69, 0xce, 0xc2, 0x6d, 0x55, 0xab, 0xab, 0x5a, 0x63, 0x9d, 0x92, 0x4b, 0x9c, 0x0d, 0x7a, 0x06,
-	0xb2, 0xaa, 0x56, 0x6b, 0x76, 0xea, 0x58, 0x7e, 0xd4, 0xd1, 0x2d, 0x3c, 0x3f, 0x7a, 0x49, 0xb8,
-	0x92, 0x94, 0x32, 0x1c, 0xf8, 0x06, 0x81, 0xa1, 0x17, 0x01, 0xe1, 0x43, 0x86, 0xe4, 0xd1, 0x48,
-	0x82, 0x62, 0xe6, 0x78, 0xc9, 0x9a, 0xd3, 0xe4, 0xfb, 0x30, 0x55, 0xeb, 0x98, 0x96, 0xde, 0xf2,
-	0x22, 0x8f, 0x51, 0xf5, 0x5d, 0x8d, 0x12, 0xb7, 0x48, 0x89, 0x1c, 0x25, 0x4e, 0xd6, 0x7c, 0xdf,
-	0x66, 0xfe, 0xdf, 0x63, 0x90, 0xf5, 0x35, 0x02, 0xbd, 0x04, 0xb3, 0x2d, 0xe5, 0x50, 0xde, 0x65,
-	0x40, 0x53, 0x6e, 0x63, 0x43, 0x56, 0x2d, 0xdc, 0x9a, 0x17, 0x2e, 0x09, 0x57, 0x12, 0x12, 0x6a,
-	0x29, 0x87, 0x9c, 0xc0, 0xdc, 0xc2, 0xc6, 0x9a, 0x85, 0x5b, 0xe8, 0x3a, 0xcc, 0x77, 0x91, 0x18,
-	0xf8, 0x51, 0x07, 0x9b, 0x16, 0xed, 0x99, 0x84, 0x34, 0xeb, 0xa7, 0x92, 0x58, 0x21, 0xfa, 0x09,
-	0x01, 0xf2, 0xdd, 0x95, 0xd9, 0x0d, 0x9c, 0x8f, 0xd3, 0xf6, 0x95, 0x8e, 0xd9, 0x1d, 0x8e, 0xe9,
-	0xd0, 0x4f, 0x69, 0x2e, 0x20, 0x38, 0x2f, 0xcc, 0x77, 0x88, 0x89, 0x7a, 0x10, 0x51, 0x01, 0x52,
-	0xae, 0x08, 0x02, 0xb5, 0x88, 0xc1, 0x2c, 0x34, 0x69, 0x5b, 0x28, 0x7a, 0x1a, 0x32, 0xde, 0x66,
-	0x71, 0x25, 0xa4, 0x3d, 0x12, 0x88, 0xef, 0x0b, 0x90, 0x2e, 0xea, 0x9a, 0x85, 0x35, 0x8b, 0xea,
-	0x10, 0xc1, 0xa8, 0x53, 0x61, 0x4a, 0xa2, 0xbf, 0xd1, 0x0c, 0x8c, 0xd6, 0x15, 0x4b, 0xa1, 0xe4,
-	0x99, 0xd5, 0x11, 0x89, 0x7e, 0xa1, 0x39, 0x48, 0x3c, 0x56, 0x9a, 0x1d, 0x4c, 0xad, 0x35, 0xb5,
-	0x3a, 0x22, 0xb1, 0x4f, 0xf4, 0x2a, 0x24, 0x2c, 0x65, 0xa7, 0xc9, 0xac, 0x2d, 0xbd, 0xf4, 0x74,
-	0x94, 0xcc, 0x55, 0x82, 0x48, 0x48, 0x29, 0xc5, 0x72, 0x1a, 0x52, 0x84, 0x35, 0xed, 0x67, 0xf1,
-	0x87, 0x02, 0x24, 0x68, 0x39, 0xba, 0x05, 0xe3, 0x7b, 0x58, 0xa9, 0x63, 0xc3, 0x1e, 0xa9, 0xcf,
-	0x44, 0xf1, 0xbc, 0x4d, 0x3c, 0xd1, 0x5a, 0x5d, 0xb2, 0x69, 0xd0, 0xab, 0x30, 0x6a, 0xe8, 0x07,
-	0xa4, 0xf5, 0x84, 0xf6, 0xb9, 0xbe, 0xf2, 0x2c, 0x48, 0xfa, 0x81, 0x44, 0x49, 0xf2, 0xaf, 0x43,
-	0x5c, 0xd2, 0x0f, 0xd0, 0xab, 0x30, 0x46, 0xdb, 0x66, 0xd7, 0x1f, 0xd9, 0xa6, 0xfb, 0x04, 0x53,
-	0xe2, 0x04, 0xe2, 0x27, 0x1d, 0xcf, 0x23, 0x61, 0xb3, 0xd3, 0xb4, 0xd0, 0x47, 0x21, 0xe9, 0xf4,
-	0xc7, 0x40, 0xad, 0xa1, 0xb8, 0x92, 0x43, 0x84, 0x3e, 0x08, 0xc8, 0xb1, 0x53, 0xcb, 0xe8, 0x68,
-	0x35, 0xc5, 0xc2, 0xcc, 0xf3, 0x24, 0xa5, 0x29, 0xbb, 0xa4, 0x6a, 0x17, 0x88, 0x5f, 0x8f, 0xc1,
-	0x38, 0x67, 0x82, 0x66, 0x20, 0xc1, 0x1c, 0x01, 0xeb, 0x5d, 0xf6, 0xe1, 0x37, 0xb4, 0xd8, 0xb1,
-	0x0c, 0xed, 0x36, 0x80, 0xc7, 0x0b, 0xc6, 0x87, 0xf2, 0x82, 0x1e, 0x4a, 0xf4, 0x3a, 0x24, 0x9b,
-	0x7a, 0x8d, 0xce, 0x42, 0xdc, 0x7c, 0x22, 0x25, 0x59, 0xe7, 0xb8, 0x92, 0x43, 0x85, 0x6e, 0x42,
-	0xba, 0x66, 0x60, 0xc5, 0xc2, 0x32, 0x99, 0x04, 0xe6, 0xc7, 0x28, 0x93, 0xbc, 0xcb, 0x84, 0x4d,
-	0x46, 0x0b, 0x55, 0x7b, 0x32, 0x92, 0x80, 0xa1, 0x13, 0x80, 0xf8, 0xdd, 0x38, 0x24, 0x6d, 0x9e,
-	0xe8, 0x75, 0x80, 0x9d, 0x23, 0x0b, 0xcb, 0x86, 0xa2, 0x35, 0xec, 0x01, 0x18, 0xd9, 0xf1, 0x12,
-	0x41, 0x94, 0x52, 0x84, 0x88, 0xfe, 0x44, 0x77, 0x61, 0xb2, 0xa6, 0xd7, 0x71, 0x5b, 0x57, 0x35,
-	0x8b, 0xb3, 0x89, 0x0d, 0xca, 0x66, 0xc2, 0xa1, 0xb4, 0x79, 0xa5, 0xd5, 0x96, 0xd2, 0xc0, 0xf2,
-	0x8e, 0x7e, 0x88, 0x4d, 0xee, 0x92, 0x9e, 0x8f, 0xec, 0x26, 0x82, 0xee, 0x68, 0x08, 0x28, 0xf5,
-	0x32, 0x21, 0x46, 0x2b, 0x00, 0x06, 0xae, 0xe9, 0x46, 0x5d, 0xde, 0xc7, 0x47, 0x5c, 0xcf, 0x91,
-	0xc3, 0x42, 0xa2, 0xd8, 0xf7, 0xf0, 0x91, 0x94, 0x32, 0xec, 0x9f, 0xe8, 0x35, 0x62, 0xc8, 0x64,
-	0xd2, 0x57, 0xeb, 0x74, 0xba, 0x18, 0x74, 0x58, 0xee, 0xb2, 0x1f, 0x68, 0x0b, 0x26, 0xe8, 0xa8,
-	0x97, 0x9d, 0x1e, 0x67, 0x9d, 0xf5, 0x7c, 0xdf, 0x01, 0xea, 0x34, 0x2a, 0x6b, 0x79, 0x3f, 0xc5,
-	0x17, 0x21, 0xeb, 0x2b, 0x47, 0xe7, 0x20, 0x65, 0xe8, 0x07, 0xb2, 0xaa, 0xd5, 0xf1, 0x21, 0xed,
-	0xc1, 0xb8, 0x94, 0x34, 0xf4, 0x83, 0x35, 0xf2, 0x2d, 0x2e, 0x42, 0x82, 0xa9, 0x76, 0x06, 0x12,
-	0xa6, 0xa5, 0x18, 0x16, 0xc7, 0x60, 0x1f, 0x28, 0x07, 0x71, 0xac, 0xb1, 0x71, 0x15, 0x97, 0xc8,
-	0x4f, 0xb1, 0x06, 0x59, 0x9f, 0x4e, 0x09, 0x8a, 0xa5, 0xb7, 0xf9, 0x84, 0x44, 0x7e, 0x12, 0xef,
-	0xd9, 0xc4, 0xbb, 0xf6, 0x6c, 0x43, 0x7f, 0x13, 0xf6, 0x07, 0x6a, 0xdd, 0xda, 0xa3, 0xc3, 0x22,
-	0x21, 0xb1, 0x0f, 0x34, 0x07, 0x63, 0x7b, 0x58, 0x6d, 0xec, 0x59, 0x54, 0xff, 0x09, 0x89, 0x7f,
-	0x89, 0xef, 0x8f, 0x02, 0x92, 0x70, 0x5d, 0xa9, 0x59, 0xb4, 0x2e, 0x7b, 0x86, 0x9a, 0x83, 0xb1,
-	0xb6, 0x62, 0x60, 0xcd, 0xe2, 0x43, 0x97, 0x7f, 0x11, 0x25, 0xaa, 0xcc, 0xbd, 0xc8, 0x35, 0x3a,
-	0xf7, 0x70, 0x0b, 0x7b, 0x7e, 0xe0, 0xc9, 0x4a, 0xca, 0xaa, 0xbe, 0xc8, 0xe8, 0x02, 0x30, 0x53,
-	0xb1, 0xa7, 0x3e, 0x52, 0x5b, 0x8a, 0x42, 0xe8, 0x48, 0x77, 0x8a, 0xe9, 0x8c, 0x40, 0x64, 0xcf,
-	0xf0, 0xe2, 0x15, 0x32, 0x29, 0x7c, 0x1c, 0xce, 0xb0, 0x62, 0x83, 0xb6, 0x41, 0xd5, 0x35, 0x2e,
-	0x17, 0x09, 0x29, 0x88, 0xc9, 0x16, 0xa3, 0xed, 0x2c, 0xd8, 0xf0, 0x05, 0xfe, 0xc1, 0x99, 0x71,
-	0x91, 0x67, 0xd5, 0x10, 0xa8, 0x99, 0xff, 0x0b, 0x01, 0x66, 0xc2, 0xf0, 0x51, 0xf1, 0x98, 0x53,
-	0xe9, 0xea, 0x88, 0xc7, 0xc7, 0x5d, 0x81, 0x49, 0xd6, 0x28, 0x59, 0x69, 0x36, 0x65, 0x0b, 0x1f,
-	0xb2, 0x6e, 0x4e, 0xae, 0x8e, 0x48, 0x59, 0x56, 0x50, 0x68, 0x36, 0xab, 0xf8, 0xd0, 0x22, 0xe3,
-	0xde, 0xdb, 0xfc, 0xa6, 0x6e, 0xf0, 0x88, 0x2e, 0x72, 0xdc, 0x17, 0x09, 0xa2, 0x34, 0x61, 0xb8,
-	0xb2, 0x37, 0x75, 0x63, 0x39, 0x09, 0x63, 0x96, 0x62, 0x34, 0xb0, 0x25, 0x16, 0x21, 0x41, 0x41,
-	0xc4, 0xec, 0x0c, 0x5c, 0xa7, 0xed, 0x88, 0x49, 0xe4, 0x27, 0x31, 0xb1, 0x86, 0x81, 0xb1, 0x46,
-	0x05, 0x8a, 0x49, 0xec, 0x83, 0x18, 0xe3, 0x8e, 0x3d, 0x3f, 0xc7, 0x24, 0xfa, 0x5b, 0xac, 0xc1,
-	0xb4, 0x4f, 0xc9, 0x66, 0x5b, 0xd7, 0x4c, 0x8c, 0x9e, 0x03, 0x5e, 0x2f, 0xae, 0xcb, 0x54, 0xb7,
-	0x94, 0x7b, 0xc6, 0x6e, 0x18, 0xae, 0x53, 0x74, 0x82, 0x86, 0x0f, 0x2d, 0x83, 0xe1, 0x39, 0x1a,
-	0x48, 0x49, 0x59, 0x07, 0x4a, 0xda, 0x2f, 0xfe, 0x4c, 0x1c, 0xe6, 0x57, 0xb0, 0x5a, 0xc7, 0x9a,
-	0xa5, 0xee, 0x1e, 0xf1, 0xe8, 0xa2, 0x9f, 0x25, 0x3f, 0x84, 0xa9, 0xba, 0x43, 0xe3, 0x37, 0xe6,
-	0x17, 0xa3, 0xd4, 0xe6, 0xab, 0x88, 0x18, 0x47, 0xae, 0x1e, 0x80, 0x84, 0x0c, 0x92, 0xf8, 0x09,
-	0x07, 0xc9, 0x4d, 0x18, 0xa5, 0xb1, 0x28, 0xf3, 0x9d, 0x1f, 0x88, 0xee, 0x56, 0x27, 0xb8, 0x92,
-	0x28, 0x11, 0x5a, 0x82, 0x59, 0x5b, 0x1c, 0x0b, 0xb7, 0xda, 0x4d, 0x32, 0x59, 0x69, 0x4a, 0x0b,
-	0x53, 0x2f, 0x9a, 0x92, 0xa6, 0x79, 0x61, 0x95, 0x97, 0x6d, 0x2a, 0x2d, 0x8c, 0x3e, 0x02, 0xf3,
-	0x1e, 0xed, 0xf8, 0xc9, 0xc6, 0x28, 0xd9, 0x9c, 0x5b, 0xee, 0xa5, 0x14, 0xbf, 0x26, 0xc0, 0xd9,
-	0x90, 0xce, 0xe0, 0x1d, 0x6f, 0x37, 0x44, 0x38, 0x4e, 0x43, 0x36, 0x21, 0xa9, 0x3f, 0xc6, 0xc6,
-	0x63, 0x15, 0x1f, 0xf0, 0x9e, 0x5a, 0x8a, 0xf4, 0xdd, 0x86, 0xa2, 0x99, 0xbb, 0xba, 0xd1, 0xa2,
-	0xde, 0xb3, 0xcc, 0x29, 0x25, 0x87, 0x07, 0xb5, 0x1b, 0xe9, 0x18, 0x76, 0x63, 0x9c, 0x8e, 0xdd,
-	0x18, 0x3f, 0x9e, 0x76, 0x63, 0xf4, 0xb1, 0x1b, 0xa3, 0xb7, 0xdd, 0x48, 0xff, 0x33, 0xec, 0xe6,
-	0xdf, 0x04, 0x98, 0x75, 0xd5, 0x3e, 0x88, 0xd1, 0x9c, 0xfe, 0xb4, 0x69, 0x2b, 0x24, 0x7e, 0xaa,
-	0x3d, 0x3b, 0xda, 0xb3, 0x67, 0xc5, 0xb7, 0x60, 0x2e, 0xd8, 0x66, 0xde, 0x37, 0x05, 0x18, 0x33,
-	0xe8, 0x5a, 0x83, 0xf7, 0xce, 0x20, 0x8d, 0x62, 0x8b, 0x13, 0x89, 0x13, 0x8a, 0x9f, 0x84, 0x79,
-	0x5e, 0x40, 0x66, 0xf5, 0x8a, 0xde, 0x31, 0x6a, 0x7d, 0x43, 0x91, 0x7b, 0x00, 0xef, 0xea, 0x3b,
-	0x43, 0x8c, 0x40, 0x5e, 0xc3, 0x5d, 0x7d, 0x87, 0xab, 0x34, 0xf5, 0xae, 0xfd, 0x53, 0xfc, 0x3f,
-	0x30, 0x5d, 0xee, 0x58, 0xed, 0x8e, 0x55, 0x61, 0x39, 0x2b, 0xae, 0xe5, 0x82, 0xbd, 0xb6, 0x1c,
-	0xa0, 0x65, 0xcb, 0x6a, 0xe3, 0x8d, 0x0e, 0x36, 0x8e, 0x02, 0x6b, 0xcc, 0x31, 0xb6, 0xc0, 0x15,
-	0x5b, 0x80, 0xec, 0x69, 0xbe, 0x62, 0x29, 0x96, 0x6a, 0x5a, 0x6a, 0xcd, 0x3c, 0x8d, 0x45, 0xf7,
-	0x0c, 0x24, 0x6a, 0x7a, 0x47, 0xb3, 0x78, 0xe8, 0xc8, 0x3e, 0xc4, 0x7f, 0x19, 0x0d, 0x51, 0xe9,
-	0x0a, 0xb6, 0x14, 0xb5, 0x69, 0x22, 0x83, 0xf8, 0x30, 0xaa, 0x5d, 0x5c, 0x97, 0xf5, 0x36, 0xcd,
-	0xe7, 0x71, 0x0d, 0x0e, 0x92, 0x75, 0xe8, 0x62, 0xb8, 0x20, 0xd9, 0xdc, 0xca, 0x8c, 0x19, 0x71,
-	0x6e, 0x7e, 0x08, 0xaa, 0x38, 0x56, 0xc2, 0x4c, 0xf6, 0xe6, 0x31, 0x2b, 0xf2, 0xda, 0x4d, 0xfe,
-	0xf7, 0x05, 0xc8, 0x05, 0xeb, 0x46, 0x0d, 0x38, 0x6b, 0x6a, 0x4a, 0xdb, 0xdc, 0xd3, 0x2d, 0x39,
-	0x68, 0xe6, 0x5c, 0xc7, 0x2f, 0x0c, 0x50, 0xb9, 0x6d, 0xfd, 0xd2, 0x19, 0x9b, 0x5b, 0xa0, 0x20,
-	0x60, 0x81, 0xf1, 0x13, 0x59, 0x60, 0xfe, 0x7b, 0x02, 0x8c, 0xf1, 0x25, 0xfb, 0x07, 0x60, 0xb2,
-	0x6d, 0xe8, 0x35, 0x6c, 0x9a, 0xb8, 0x2e, 0x93, 0xe5, 0x9d, 0xc9, 0x97, 0x0a, 0x13, 0x0e, 0x78,
-	0x99, 0x40, 0xc9, 0x38, 0xb6, 0x74, 0x4b, 0x69, 0xca, 0xd8, 0xb4, 0xd4, 0x16, 0x59, 0x7e, 0x73,
-	0x74, 0x66, 0x0a, 0xd3, 0xb4, 0xb0, 0x64, 0x97, 0x31, 0x9a, 0xfb, 0x30, 0xe9, 0x58, 0x9c, 0x6c,
-	0x5a, 0x8a, 0x65, 0x2f, 0xee, 0x16, 0x06, 0xb1, 0x3b, 0xd7, 0x74, 0x89, 0x43, 0x72, 0x61, 0xa6,
-	0xf8, 0x25, 0x01, 0xa6, 0x6d, 0xac, 0x15, 0x6c, 0xd6, 0x0c, 0x95, 0x76, 0x07, 0x89, 0x0a, 0xa9,
-	0x6b, 0xe1, 0x09, 0x1e, 0xf2, 0x1b, 0x3d, 0x0d, 0x99, 0xba, 0x6a, 0xb6, 0x9b, 0xca, 0x11, 0x73,
-	0x3b, 0x2c, 0xaa, 0x4b, 0x73, 0x18, 0x9d, 0x48, 0x24, 0xc8, 0x98, 0x9d, 0x76, 0x5b, 0x37, 0x58,
-	0xa3, 0xa8, 0x8c, 0x13, 0x4b, 0x8b, 0x03, 0xc9, 0x68, 0xd3, 0x2d, 0x1f, 0x49, 0x69, 0xd3, 0xfd,
-	0x10, 0x2b, 0x30, 0xb3, 0xae, 0x9a, 0x96, 0x93, 0x05, 0xb4, 0x3d, 0xcc, 0x33, 0x90, 0x6d, 0x2a,
-	0x5a, 0xa3, 0x43, 0xd6, 0x11, 0x64, 0x19, 0xcc, 0x65, 0xcd, 0xd8, 0xc0, 0xa2, 0x5e, 0xc7, 0xc4,
-	0x0d, 0xed, 0xaa, 0x4d, 0x0b, 0x1b, 0x5c, 0x5a, 0xfe, 0x25, 0x36, 0x60, 0x36, 0xc0, 0x94, 0xbb,
-	0xc5, 0xcd, 0x90, 0x94, 0xef, 0x40, 0xf2, 0x7b, 0xb4, 0xe7, 0xc9, 0xfe, 0x8a, 0x9f, 0x16, 0xe0,
-	0x7c, 0x41, 0x53, 0x9a, 0x47, 0xef, 0x61, 0x8f, 0x93, 0x54, 0xcd, 0xfd, 0xfe, 0x93, 0x4f, 0xb7,
-	0xa3, 0x7c, 0x29, 0x72, 0x59, 0xa4, 0x9a, 0xfb, 0xb4, 0x26, 0x53, 0x35, 0x43, 0xbd, 0xe5, 0x6f,
-	0x09, 0x30, 0x1b, 0x8a, 0x44, 0x26, 0x3a, 0xce, 0x51, 0x6e, 0x61, 0xcb, 0x50, 0x6b, 0x83, 0x78,
-	0xce, 0x2d, 0x06, 0xdb, 0xa0, 0x04, 0x52, 0xb6, 0xed, 0xfd, 0x44, 0xeb, 0x90, 0x31, 0x69, 0x53,
-	0x65, 0xe6, 0x89, 0x63, 0x43, 0x7a, 0x62, 0x29, 0xcd, 0xc8, 0xe9, 0x87, 0xf8, 0xb7, 0x93, 0x90,
-	0xf5, 0x55, 0x87, 0x1e, 0xc3, 0x9c, 0xd6, 0x69, 0x61, 0x43, 0xad, 0x29, 0x4d, 0x36, 0x1e, 0x6c,
-	0x4d, 0x31, 0xc9, 0x5f, 0x1b, 0x58, 0xf2, 0x85, 0x4d, 0x9b, 0x0f, 0x1d, 0x11, 0x4c, 0x23, 0xab,
-	0x23, 0xd2, 0x8c, 0x16, 0x02, 0x47, 0xff, 0x17, 0xe6, 0x6b, 0x8a, 0x85, 0x1b, 0x7a, 0x48, 0xcd,
-	0xac, 0x8d, 0xaf, 0x0f, 0x5e, 0x73, 0xd1, 0xe5, 0xe4, 0xaf, 0x7b, 0xae, 0x16, 0x5a, 0x82, 0xde,
-	0x05, 0xb4, 0x2f, 0x2b, 0x9a, 0xae, 0x1d, 0xb5, 0x54, 0xeb, 0xc8, 0xef, 0xc2, 0x6e, 0x0c, 0x5e,
-	0xef, 0xbd, 0x82, 0xcd, 0xc2, 0xa9, 0x31, 0xb7, 0x1f, 0x80, 0x91, 0xba, 0x9a, 0x72, 0x5d, 0x7d,
-	0x8c, 0x0d, 0xd3, 0x53, 0xd7, 0xe8, 0xb0, 0x75, 0xad, 0xaf, 0xd8, 0x2c, 0xdc, 0xba, 0x9a, 0x01,
-	0x18, 0x3a, 0x80, 0x33, 0xfb, 0x72, 0x4b, 0x69, 0xdb, 0x1e, 0xd1, 0x4d, 0x08, 0xf0, 0x9c, 0xd1,
-	0x10, 0xdd, 0x79, 0x6f, 0x43, 0x69, 0x97, 0x1c, 0x36, 0x6e, 0x77, 0xee, 0x87, 0xc0, 0xf3, 0x6f,
-	0xc0, 0x4c, 0x58, 0xf7, 0xa3, 0x57, 0x21, 0x41, 0x13, 0x50, 0xdc, 0x9a, 0x06, 0x4a, 0x59, 0x31,
-	0x8a, 0x7c, 0x05, 0xe6, 0xc2, 0xfb, 0xf5, 0x24, 0x4c, 0xdf, 0x17, 0x20, 0x17, 0xec, 0x35, 0xf4,
-	0x3a, 0xa4, 0x1e, 0x75, 0x14, 0x53, 0x95, 0xd5, 0xfa, 0x50, 0x29, 0xef, 0x24, 0xa5, 0x5a, 0xab,
-	0xd3, 0x38, 0x86, 0x04, 0xee, 0xd6, 0x91, 0xac, 0xd6, 0x07, 0xc9, 0xe9, 0x96, 0x28, 0x32, 0x61,
-	0x81, 0xf9, 0xaf, 0xfc, 0x37, 0x04, 0xc8, 0x05, 0xfb, 0xf8, 0x14, 0x24, 0xab, 0xc2, 0xb4, 0x89,
-	0x35, 0x53, 0xb5, 0xd4, 0xc7, 0x58, 0x56, 0x2c, 0xcb, 0x50, 0x77, 0x3a, 0x96, 0xed, 0x46, 0x06,
-	0xe2, 0x85, 0x1c, 0xfa, 0x82, 0x4d, 0x9e, 0xff, 0xdc, 0x38, 0xcc, 0x84, 0xd9, 0x07, 0x6a, 0x74,
-	0x0b, 0x7c, 0xf7, 0x64, 0x26, 0xb7, 0x50, 0x55, 0x1a, 0x0d, 0x5c, 0xa7, 0xd2, 0x78, 0xda, 0x75,
-	0x11, 0xd2, 0x06, 0x6e, 0x30, 0xfb, 0xae, 0xdb, 0x53, 0x28, 0x30, 0x10, 0x9d, 0xb0, 0x0e, 0x21,
-	0xa7, 0x74, 0x0e, 0xd5, 0xa6, 0xaa, 0x18, 0x47, 0xcc, 0x77, 0xda, 0x33, 0xfd, 0xc6, 0x09, 0x05,
-	0x2a, 0xd8, 0x6c, 0x99, 0x83, 0x9d, 0x54, 0x7c, 0xdf, 0x66, 0xfe, 0x9f, 0x04, 0x48, 0x7b, 0x84,
-	0x3e, 0x81, 0xb9, 0xfa, 0x33, 0x69, 0xb1, 0x63, 0x66, 0xd2, 0x2e, 0x02, 0xf0, 0x4d, 0x44, 0x4b,
-	0x69, 0x38, 0xdb, 0x47, 0x29, 0x06, 0xab, 0x2a, 0x0d, 0xf4, 0x0a, 0x10, 0x64, 0x6c, 0x18, 0xb8,
-	0xce, 0xfd, 0xd2, 0x5c, 0x57, 0x06, 0xbf, 0xd4, 0x6a, 0x5b, 0x47, 0x9c, 0x2d, 0xc5, 0x5c, 0x4e,
-	0x40, 0xdc, 0x52, 0x1a, 0xf9, 0x4f, 0xc7, 0x61, 0xc2, 0xaf, 0x11, 0xf4, 0x51, 0x7b, 0xd9, 0x10,
-	0x1f, 0x76, 0xb2, 0x62, 0x74, 0xe8, 0xa0, 0xdb, 0x8a, 0x3e, 0x76, 0xaa, 0x9d, 0xb6, 0xf0, 0x06,
-	0xb3, 0xa3, 0xa0, 0x55, 0x49, 0x80, 0x0c, 0xdc, 0x54, 0xe8, 0x60, 0xd9, 0xa5, 0x31, 0xbc, 0x56,
-	0x3b, 0x1a, 0x66, 0xb0, 0x4c, 0xd9, 0xe4, 0xb7, 0x6d, 0xea, 0xfc, 0x1e, 0x64, 0xbc, 0xb5, 0x9d,
-	0xc4, 0x1c, 0x2e, 0xf8, 0x7a, 0x92, 0xd9, 0xbc, 0xdb, 0x8f, 0xce, 0x5a, 0xeb, 0x9b, 0x4f, 0xf5,
-	0x08, 0x95, 0xec, 0x05, 0x50, 0x0d, 0xe6, 0xdd, 0x05, 0xd0, 0x49, 0x03, 0x96, 0x39, 0x87, 0x95,
-	0x3f, 0xb2, 0x90, 0xc1, 0x2d, 0x91, 0x4f, 0x16, 0xc3, 0xcc, 0x38, 0x8c, 0x2a, 0x6e, 0x30, 0x83,
-	0x3e, 0x25, 0x74, 0xc7, 0x2e, 0xbe, 0x35, 0x56, 0xe4, 0x40, 0x8f, 0x52, 0x50, 0x20, 0x94, 0x61,
-	0xeb, 0x92, 0xee, 0x50, 0x86, 0xaf, 0x57, 0x3e, 0x2b, 0x84, 0xc5, 0x32, 0x5c, 0x12, 0x36, 0x9e,
-	0xca, 0xc7, 0x96, 0x24, 0x38, 0x05, 0x3a, 0xb2, 0x74, 0x85, 0x36, 0x5c, 0x9a, 0x23, 0x7f, 0x68,
-	0xc3, 0xc5, 0x60, 0xb3, 0xff, 0xda, 0xb1, 0xc5, 0x70, 0xe7, 0x4c, 0x47, 0x00, 0x4f, 0xa4, 0xe3,
-	0x56, 0xed, 0x8d, 0x74, 0x78, 0xd5, 0x63, 0x27, 0xac, 0xda, 0x9d, 0x14, 0xdd, 0xaa, 0x9b, 0x01,
-	0x18, 0xfa, 0x69, 0x21, 0x24, 0xf2, 0xe1, 0x02, 0x8c, 0x9f, 0xd0, 0x18, 0xfc, 0xfe, 0xc4, 0x35,
-	0x86, 0xfd, 0x10, 0x78, 0xfe, 0x6f, 0x84, 0x60, 0x24, 0xc4, 0x25, 0x7c, 0x0d, 0x52, 0x2d, 0x55,
-	0x93, 0xd9, 0x1e, 0xfe, 0x00, 0xdb, 0x9b, 0x6c, 0x5f, 0x3b, 0xd9, 0x52, 0x35, 0xfa, 0x8b, 0xd2,
-	0x2b, 0x87, 0x9c, 0x3e, 0x36, 0x38, 0xbd, 0x72, 0xc8, 0xe8, 0xef, 0xc2, 0xe4, 0xa3, 0x8e, 0xa2,
-	0x59, 0x6a, 0x13, 0xcb, 0x7c, 0x77, 0x7d, 0x74, 0xd0, 0xdd, 0xf5, 0x09, 0x9b, 0x92, 0x7e, 0x9a,
-	0xf9, 0x7f, 0x88, 0x77, 0xc7, 0x66, 0xbc, 0x99, 0xdf, 0x16, 0xe0, 0x69, 0xca, 0xde, 0xf5, 0x9f,
-	0xf2, 0x9e, 0x6a, 0x5a, 0x7a, 0xc3, 0x50, 0x5a, 0xf2, 0x4e, 0xa7, 0xb6, 0x8f, 0x2d, 0x7b, 0x73,
-	0x4a, 0x3f, 0xe5, 0x51, 0xd1, 0x05, 0x5e, 0xb5, 0x2b, 0x5e, 0xa6, 0xf5, 0x4a, 0x4f, 0x51, 0xc9,
-	0x1c, 0xd7, 0x1c, 0x28, 0x36, 0xf3, 0xbf, 0x10, 0x83, 0x8b, 0x7d, 0x78, 0xa0, 0x5b, 0x70, 0x2e,
-	0xd8, 0xbe, 0xa6, 0x7e, 0x80, 0x0d, 0x79, 0x47, 0xef, 0x68, 0x75, 0x9e, 0xa9, 0x98, 0xf7, 0x57,
-	0xb4, 0x4e, 0x10, 0x96, 0x49, 0x79, 0x18, 0x79, 0xa7, 0xdd, 0x76, 0xc8, 0x63, 0x61, 0xe4, 0xdb,
-	0x04, 0x81, 0x91, 0x5f, 0x84, 0x34, 0xd3, 0xa1, 0x6c, 0xaa, 0xef, 0xb1, 0x09, 0x36, 0x2e, 0x01,
-	0x03, 0x55, 0xd4, 0xf7, 0x30, 0x2a, 0x43, 0x96, 0x23, 0xf8, 0x3a, 0xf9, 0x6a, 0xdf, 0x4e, 0x76,
-	0x6a, 0x93, 0x32, 0x8c, 0x01, 0xef, 0xeb, 0x3f, 0x4e, 0x78, 0x23, 0x66, 0xde, 0xcb, 0xbf, 0x2e,
-	0xc0, 0x33, 0xf8, 0x51, 0x47, 0x7d, 0xac, 0x34, 0xb1, 0x56, 0xc3, 0x72, 0xad, 0xa9, 0x98, 0x66,
-	0xcf, 0x7e, 0xae, 0x9d, 0x9a, 0xdb, 0xf1, 0x00, 0x82, 0x7d, 0x7b, 0xc9, 0x23, 0x4f, 0x91, 0x88,
-	0xd3, 0xd5, 0xbb, 0x5f, 0x14, 0x20, 0xef, 0xd2, 0x97, 0x02, 0xe8, 0xe8, 0x1e, 0xe4, 0x9c, 0xa0,
-	0x43, 0x1e, 0xf6, 0xfc, 0xc9, 0x84, 0x1d, 0x42, 0x30, 0xad, 0xa1, 0x57, 0x60, 0xae, 0x5b, 0x3f,
-	0xb4, 0xcb, 0x58, 0x0f, 0xcf, 0x04, 0xa5, 0x25, 0x9d, 0x97, 0xff, 0xeb, 0x18, 0x9c, 0xed, 0xd9,
-	0x42, 0x74, 0x17, 0xc4, 0x70, 0x9e, 0x21, 0x06, 0xf8, 0x54, 0x18, 0x7f, 0x8f, 0x19, 0xf6, 0xe6,
-	0xd5, 0x6d, 0x8d, 0xa1, 0xbc, 0x86, 0xb1, 0xc9, 0xcf, 0x08, 0xe1, 0x46, 0x59, 0x7f, 0x12, 0x76,
-	0x11, 0xec, 0xd7, 0x80, 0x39, 0x7f, 0x7a, 0xdc, 0xbb, 0xcc, 0xe2, 0xe6, 0xfc, 0x3b, 0x02, 0xbc,
-	0xe0, 0xae, 0x92, 0x06, 0x75, 0x5f, 0xb5, 0x53, 0x9b, 0xd2, 0x3c, 0x80, 0xa0, 0x59, 0x7f, 0xc0,
-	0x91, 0xeb, 0x7e, 0xb4, 0xef, 0xfa, 0x7e, 0x0c, 0xf2, 0x2e, 0x9b, 0xff, 0x86, 0xd6, 0x8d, 0x0a,
-	0x70, 0x41, 0xeb, 0xb4, 0xe4, 0xba, 0x6a, 0x5a, 0xaa, 0x56, 0xb3, 0xe4, 0x80, 0xc6, 0x4d, 0x6e,
-	0x39, 0x79, 0xad, 0xd3, 0x5a, 0xe1, 0x38, 0x15, 0x5f, 0xe3, 0x4d, 0xf4, 0x36, 0xcc, 0x58, 0x7a,
-	0xbb, 0x9b, 0x72, 0x78, 0x27, 0x87, 0x2c, 0xbd, 0x1d, 0xe0, 0x9e, 0xff, 0xe7, 0x18, 0x9c, 0xed,
-	0xd9, 0x13, 0x68, 0x0b, 0x9e, 0xeb, 0x6d, 0x23, 0xdd, 0x23, 0xf0, 0xe9, 0x1e, 0x1d, 0xe7, 0x19,
-	0x84, 0x91, 0x1c, 0xbb, 0xc7, 0x61, 0x2f, 0x8e, 0xff, 0xb5, 0x43, 0x31, 0xc2, 0x96, 0xfb, 0x0c,
-	0xc5, 0xff, 0x18, 0x0d, 0x26, 0x11, 0xf8, 0x70, 0xfc, 0x9a, 0x00, 0xf9, 0xae, 0x60, 0xce, 0x19,
-	0x85, 0xdc, 0x6c, 0xf7, 0x4f, 0x35, 0x9e, 0x0b, 0x00, 0x83, 0xa3, 0xf0, 0xcc, 0x7e, 0x78, 0x71,
-	0xfe, 0x0b, 0x02, 0x9c, 0xf3, 0x93, 0xf2, 0xb5, 0x1e, 0x37, 0xd8, 0x53, 0x1d, 0x76, 0x8b, 0x30,
-	0xed, 0xee, 0x74, 0x38, 0x21, 0x3e, 0xb7, 0x0e, 0xe4, 0x14, 0x39, 0xae, 0x30, 0xff, 0x85, 0x18,
-	0x5c, 0x88, 0x6c, 0x18, 0x7a, 0x06, 0xb2, 0x24, 0x2a, 0x75, 0x99, 0x31, 0xe3, 0xcd, 0xb4, 0x54,
-	0xcd, 0x61, 0x43, 0x91, 0x94, 0xc3, 0xae, 0x1a, 0x33, 0x2d, 0xe5, 0xd0, 0x45, 0x0a, 0x98, 0x5e,
-	0xa2, 0xcb, 0xf4, 0x7e, 0xb6, 0xcb, 0xf4, 0xd8, 0x41, 0x66, 0xf5, 0x49, 0x76, 0xa4, 0xaf, 0x37,
-	0xfc, 0xf6, 0xb7, 0x9c, 0xb4, 0xb7, 0xe4, 0x44, 0x19, 0x26, 0xfc, 0x43, 0x0a, 0x5d, 0xb7, 0x4f,
-	0xdb, 0x0e, 0x1c, 0xa9, 0xf3, 0xe3, 0xb8, 0xe1, 0xdb, 0x91, 0x7f, 0x1e, 0x83, 0x04, 0x0b, 0xc3,
-	0x9f, 0x83, 0xac, 0xaa, 0x59, 0xb8, 0x81, 0x0d, 0xcf, 0x52, 0x20, 0xbe, 0x3a, 0x22, 0x65, 0x38,
-	0x98, 0xa1, 0x3d, 0x0d, 0xe9, 0xdd, 0xa6, 0xae, 0x58, 0x9e, 0x78, 0x5f, 0x58, 0x1d, 0x91, 0x80,
-	0x02, 0x19, 0xca, 0x33, 0x90, 0x31, 0x2d, 0x43, 0xd5, 0x1a, 0xb2, 0xff, 0x5c, 0x70, 0x9a, 0x41,
-	0x9d, 0xea, 0x76, 0x74, 0xbd, 0x89, 0x15, 0x7b, 0xe5, 0x31, 0xca, 0xcf, 0x50, 0x65, 0x38, 0x98,
-	0xa1, 0x95, 0x60, 0xd2, 0xb9, 0x2f, 0xc0, 0x11, 0x13, 0xfd, 0x8e, 0x72, 0xae, 0x8e, 0x48, 0x13,
-	0x0e, 0x11, 0x63, 0x73, 0x1d, 0x80, 0x40, 0x38, 0x87, 0x31, 0x7f, 0x2a, 0xc9, 0x3a, 0x6a, 0x63,
-	0x4a, 0x5d, 0xde, 0x5d, 0x51, 0x8e, 0x56, 0x47, 0xa4, 0x14, 0xc1, 0x65, 0x84, 0x4b, 0x00, 0x75,
-	0xc5, 0xb2, 0x09, 0xd9, 0x82, 0x6d, 0xca, 0x47, 0xb8, 0xa2, 0x58, 0x98, 0xd0, 0x10, 0x34, 0x4a,
-	0xe3, 0x64, 0x3b, 0x7e, 0x2a, 0x06, 0xb9, 0xe0, 0xe9, 0x12, 0xf4, 0x08, 0xce, 0xba, 0xdb, 0x7c,
-	0x96, 0xef, 0x44, 0x83, 0xc9, 0xfb, 0xf4, 0xe5, 0x41, 0x12, 0x69, 0xfe, 0xc3, 0x10, 0xe6, 0xea,
-	0x88, 0x74, 0x46, 0x0d, 0x2f, 0x42, 0xef, 0xc2, 0x1c, 0x3f, 0xe6, 0x19, 0xac, 0x6f, 0x90, 0x3d,
-	0x27, 0x4a, 0xd9, 0x5d, 0xdb, 0xac, 0x11, 0x56, 0xb0, 0x9c, 0x83, 0x09, 0x7f, 0x25, 0xe2, 0x6f,
-	0x8f, 0xc3, 0x99, 0x2d, 0x43, 0x6d, 0xd1, 0xf9, 0xc1, 0x8f, 0x8e, 0xde, 0x84, 0x09, 0x03, 0xb7,
-	0x9b, 0x0a, 0x99, 0xaa, 0xbd, 0x7b, 0x3b, 0x0b, 0xd1, 0x12, 0x51, 0x0a, 0xaa, 0x6b, 0x27, 0xf9,
-	0x9f, 0xe5, 0x7c, 0xb8, 0x96, 0xcb, 0xc0, 0x4f, 0xac, 0xf9, 0x77, 0x6e, 0xae, 0xf4, 0x3f, 0x74,
-	0xe8, 0x70, 0xcc, 0x18, 0x9e, 0x6f, 0x84, 0x61, 0xb6, 0xb6, 0xa7, 0xd0, 0xb3, 0x6d, 0x06, 0xbd,
-	0xdd, 0xe2, 0xdf, 0x9a, 0x89, 0xdc, 0x3f, 0x2c, 0xda, 0x84, 0x1b, 0x8a, 0xb9, 0xef, 0xf0, 0x9f,
-	0xae, 0x75, 0x83, 0xd1, 0x11, 0x5c, 0xa8, 0x19, 0x47, 0x6d, 0x4b, 0x97, 0x6d, 0xbd, 0xec, 0xee,
-	0x1e, 0xca, 0xbb, 0x6d, 0xec, 0xdf, 0x9d, 0xb9, 0x16, 0x59, 0x1d, 0x65, 0xc0, 0xb5, 0x74, 0x7b,
-	0xf7, 0xf0, 0x76, 0xdb, 0x55, 0xd3, 0xd9, 0x5a, 0xaf, 0x42, 0xd4, 0x81, 0x73, 0xbb, 0xea, 0x21,
-	0xae, 0xb3, 0x60, 0x9b, 0xf9, 0x23, 0x32, 0x86, 0x7d, 0xbb, 0x34, 0xaf, 0x44, 0xe7, 0x04, 0x0f,
-	0x71, 0x9d, 0x78, 0xd4, 0x65, 0x9b, 0xd8, 0xa9, 0x77, 0x7e, 0xb7, 0x47, 0x19, 0x7a, 0x00, 0xb9,
-	0xae, 0xba, 0xc6, 0xfa, 0x9f, 0x05, 0xe8, 0xae, 0x62, 0x72, 0x27, 0xc0, 0xf9, 0x08, 0x2e, 0xd8,
-	0x4a, 0x3c, 0x50, 0xad, 0x3d, 0xf7, 0x1e, 0x87, 0x5d, 0xcd, 0x78, 0x7f, 0x5d, 0x72, 0x45, 0xbd,
-	0xa9, 0x5a, 0x7b, 0xf6, 0xc0, 0x73, 0x75, 0x69, 0xf4, 0x2a, 0x44, 0xf7, 0x21, 0x47, 0xdd, 0x4d,
-	0x5b, 0x31, 0x1c, 0x0b, 0x4c, 0xd2, 0xda, 0x22, 0x23, 0x41, 0xe2, 0x83, 0xb6, 0x14, 0xc3, 0xb5,
-	0x41, 0xea, 0xc6, 0x5c, 0x08, 0x7a, 0x1b, 0x10, 0x37, 0x8f, 0x3d, 0xc5, 0xdc, 0xb3, 0x39, 0xa7,
-	0xfa, 0x1f, 0x70, 0x60, 0x36, 0xb1, 0xaa, 0x98, 0x7b, 0xee, 0x1e, 0x5d, 0x2d, 0x00, 0x0b, 0x19,
-	0xbb, 0xff, 0x2a, 0xc0, 0x84, 0x5f, 0x28, 0xf4, 0x16, 0x4c, 0xd2, 0x56, 0x59, 0xba, 0xcc, 0x0f,
-	0x7b, 0xd2, 0x31, 0x3b, 0x11, 0xed, 0xb5, 0xfc, 0x4c, 0x9c, 0x4f, 0x29, 0x4b, 0x78, 0x55, 0xf5,
-	0x12, 0xe3, 0x24, 0xfe, 0x7f, 0x01, 0x92, 0x76, 0x19, 0x3a, 0x0b, 0xb3, 0xd5, 0xb5, 0x8d, 0x92,
-	0xbc, 0x55, 0x90, 0xaa, 0xf2, 0xf6, 0x66, 0x65, 0xab, 0x54, 0x5c, 0xbb, 0xbd, 0x56, 0x5a, 0xc9,
-	0x8d, 0xa0, 0x24, 0x8c, 0x3e, 0x2c, 0x15, 0xa4, 0x9c, 0x80, 0x52, 0x90, 0xd8, 0x28, 0x6f, 0x56,
-	0x57, 0x73, 0x31, 0x94, 0x83, 0xcc, 0x4a, 0xe1, 0xa1, 0x5c, 0xbe, 0x2d, 0x33, 0x48, 0x1c, 0x4d,
-	0x42, 0x9a, 0x43, 0xde, 0x2c, 0x95, 0xee, 0xe5, 0x46, 0x09, 0x0a, 0xf9, 0x45, 0x20, 0x94, 0x3e,
-	0x41, 0x50, 0x56, 0xcb, 0xdb, 0x12, 0x81, 0xac, 0x14, 0x1e, 0xe6, 0xc6, 0xc4, 0x07, 0x90, 0x0b,
-	0x2a, 0x0b, 0xad, 0x00, 0x70, 0xb5, 0xef, 0xe3, 0x23, 0xee, 0xa2, 0x9e, 0xeb, 0xaf, 0x6e, 0x7a,
-	0x4e, 0xbe, 0x66, 0xff, 0x14, 0xab, 0x80, 0xba, 0x5d, 0x17, 0x7a, 0x0d, 0x52, 0x1a, 0x3e, 0x18,
-	0x3a, 0xfb, 0xa6, 0xe1, 0x03, 0xfa, 0x4b, 0x3c, 0x07, 0x67, 0x7b, 0x1a, 0xa9, 0x38, 0x01, 0x19,
-	0xaf, 0x57, 0x13, 0xff, 0x3e, 0x06, 0x59, 0xe2, 0x8d, 0xcc, 0xaa, 0xbe, 0xd6, 0xd0, 0x74, 0x03,
-	0xa3, 0x05, 0x40, 0x8e, 0x1f, 0x32, 0x49, 0xa7, 0x9a, 0xfb, 0x2a, 0x3b, 0xc9, 0x9e, 0xa2, 0x36,
-	0xe2, 0x94, 0x55, 0xf5, 0xca, 0xbe, 0xda, 0x46, 0xff, 0x0f, 0xce, 0xd5, 0xf4, 0x56, 0x4b, 0xd7,
-	0x64, 0x3f, 0x99, 0x4a, 0xd9, 0xf1, 0x7b, 0x6f, 0xb7, 0xfa, 0x79, 0x43, 0xa7, 0xfe, 0x85, 0x22,
-	0x65, 0xe6, 0x83, 0x11, 0x77, 0x51, 0x73, 0xc0, 0x76, 0xed, 0xac, 0x4c, 0x7c, 0x5f, 0x80, 0xe9,
-	0x10, 0x1a, 0x74, 0x19, 0xc4, 0x62, 0x79, 0x63, 0xa3, 0xbc, 0x29, 0x17, 0x57, 0x0b, 0x52, 0x45,
-	0xae, 0x96, 0xe5, 0xb5, 0x3b, 0x9b, 0x65, 0xa9, 0x14, 0xb0, 0x9c, 0x34, 0x8c, 0x6f, 0x6e, 0x6f,
-	0x94, 0xa4, 0xb5, 0x62, 0x4e, 0x40, 0x33, 0x90, 0x2b, 0xac, 0x6f, 0xad, 0x16, 0xe4, 0xed, 0xad,
-	0xad, 0x92, 0x24, 0x17, 0x0b, 0x95, 0x52, 0x2e, 0xe6, 0x42, 0xd7, 0xcb, 0x6f, 0xda, 0x50, 0x6a,
-	0x4b, 0x5b, 0xdb, 0x9b, 0xc5, 0xea, 0x76, 0xa1, 0xba, 0x56, 0xde, 0xcc, 0x8d, 0xa2, 0x09, 0x80,
-	0x37, 0x57, 0xd7, 0xaa, 0xa5, 0xca, 0x56, 0xa1, 0x58, 0xca, 0x25, 0x96, 0x33, 0x00, 0xae, 0x4a,
-	0xc4, 0x7f, 0x24, 0x72, 0x86, 0x38, 0xf8, 0x17, 0x60, 0x8a, 0xcc, 0x1e, 0xd4, 0xd9, 0xd9, 0xc5,
-	0xfc, 0x58, 0x48, 0x8e, 0x17, 0x38, 0x64, 0xe8, 0x59, 0x98, 0xd0, 0x3a, 0xad, 0x1d, 0x6c, 0x10,
-	0x0d, 0x93, 0x52, 0x7e, 0x9f, 0x20, 0xc3, 0xa0, 0x55, 0x9d, 0x30, 0x26, 0x41, 0xb0, 0x81, 0xc9,
-	0xc2, 0x06, 0xcb, 0xba, 0x51, 0xc7, 0xec, 0x8c, 0x79, 0x92, 0xcc, 0x5f, 0x14, 0x58, 0x26, 0x30,
-	0xf4, 0x16, 0xcc, 0x84, 0x76, 0xd8, 0x68, 0xff, 0xfb, 0x23, 0x3e, 0x45, 0x4b, 0xa8, 0xd6, 0xdd,
-	0x29, 0x3f, 0x14, 0x60, 0xbe, 0x97, 0xf3, 0x47, 0xcb, 0x90, 0x0e, 0xae, 0x41, 0x07, 0x32, 0x71,
-	0x68, 0xba, 0xeb, 0xd1, 0x65, 0x48, 0x07, 0x57, 0x9d, 0x83, 0xf1, 0xe8, 0x44, 0xae, 0x40, 0x05,
-	0xef, 0x32, 0x40, 0xfc, 0x4a, 0x0c, 0x26, 0x83, 0xc2, 0xaf, 0xc3, 0xb8, 0x9d, 0x5a, 0x61, 0x8b,
-	0xa3, 0xa5, 0x21, 0x26, 0x25, 0xfe, 0x2d, 0xd9, 0x2c, 0xf2, 0x3f, 0x10, 0x60, 0x8c, 0x2f, 0x6f,
-	0x5e, 0x86, 0x78, 0x4b, 0xd5, 0x06, 0xd7, 0x06, 0xc1, 0xa6, 0x44, 0xca, 0xe1, 0xe0, 0xcd, 0x27,
-	0xd8, 0x68, 0x13, 0xa6, 0xf8, 0x44, 0xd5, 0xc2, 0x9a, 0xe5, 0x09, 0xc9, 0x07, 0x62, 0x91, 0xf3,
-	0xd0, 0x32, 0x87, 0xf3, 0x67, 0xa3, 0x70, 0xb6, 0x67, 0x88, 0x71, 0x3a, 0xae, 0x12, 0xdd, 0x82,
-	0xf1, 0x9a, 0xae, 0x39, 0x17, 0x0b, 0x06, 0xbd, 0x51, 0xc4, 0x69, 0xd0, 0x21, 0x4c, 0x72, 0x27,
-	0xa5, 0x34, 0xdb, 0x7b, 0xca, 0x0e, 0x66, 0xbb, 0x5d, 0x13, 0xd1, 0x5b, 0x2d, 0x3d, 0x1b, 0xb5,
-	0x70, 0x7b, 0xf7, 0x90, 0xf9, 0x9c, 0x4d, 0xba, 0x83, 0x5a, 0xe0, 0x4c, 0xc9, 0x04, 0xcd, 0xea,
-	0xb1, 0x21, 0xe8, 0x79, 0xe0, 0x37, 0x5a, 0xdd, 0x9a, 0x13, 0xdc, 0x97, 0x4e, 0xb0, 0x02, 0x07,
-	0x75, 0x0e, 0x12, 0x86, 0x52, 0x57, 0x0f, 0x69, 0xb4, 0x93, 0x58, 0x1d, 0x91, 0xd8, 0x27, 0x3d,
-	0x17, 0xd1, 0x31, 0x0c, 0xbd, 0x41, 0x96, 0x1d, 0xee, 0x1e, 0x7b, 0x72, 0x88, 0x33, 0xa8, 0x53,
-	0x0e, 0x03, 0x1b, 0x24, 0x7e, 0x5e, 0x80, 0x33, 0x3d, 0x9a, 0x81, 0xae, 0xc2, 0xe5, 0xdb, 0xb7,
-	0x1f, 0xc8, 0xdc, 0x7f, 0x6e, 0x16, 0xaa, 0x6b, 0xf7, 0x4b, 0x32, 0x75, 0x81, 0xcb, 0xa5, 0x6a,
-	0x94, 0xff, 0x24, 0x93, 0x67, 0xe9, 0x41, 0x61, 0xa5, 0x54, 0x5c, 0xdb, 0x28, 0xac, 0xe7, 0x62,
-	0xe8, 0x3c, 0xcc, 0xbb, 0xae, 0x94, 0xb1, 0x90, 0x6d, 0xf4, 0x38, 0x9a, 0x82, 0xac, 0x1f, 0x34,
-	0xba, 0x0c, 0x90, 0xb4, 0x15, 0x25, 0x7e, 0x26, 0x06, 0x29, 0xc7, 0x1a, 0xd0, 0x26, 0xa4, 0x68,
-	0x30, 0xa2, 0xda, 0xe7, 0xe6, 0xfa, 0xac, 0x0a, 0xaa, 0x36, 0xb2, 0xc3, 0x82, 0x2e, 0xe4, 0x6c,
-	0x28, 0xe1, 0xd7, 0xd1, 0x0e, 0x0c, 0xa5, 0xdd, 0xc6, 0xb6, 0x03, 0x89, 0xe4, 0xb7, 0x6d, 0x23,
-	0xfb, 0xf8, 0x39, 0x2c, 0x90, 0x04, 0xe9, 0xfd, 0x96, 0x29, 0xdb, 0x1c, 0x07, 0x58, 0x06, 0xdc,
-	0x6b, 0x99, 0x6f, 0x76, 0xb3, 0x84, 0x7d, 0x07, 0x4c, 0xd6, 0xfd, 0x6c, 0x3b, 0x5a, 0xbc, 0x02,
-	0xa8, 0xbb, 0x41, 0x61, 0x47, 0x36, 0xc5, 0xcb, 0x80, 0xba, 0x45, 0x45, 0x39, 0x88, 0xdb, 0xe3,
-	0x2f, 0x23, 0x91, 0x9f, 0xe2, 0x3b, 0x30, 0x1d, 0x22, 0x00, 0xf1, 0x8a, 0x9c, 0x58, 0x76, 0x09,
-	0x80, 0x83, 0x08, 0xc2, 0x65, 0x98, 0x74, 0x07, 0xb4, 0xf7, 0x54, 0x68, 0xd6, 0x19, 0xae, 0xf4,
-	0x18, 0xfa, 0x5f, 0xc5, 0xe0, 0x4c, 0x8f, 0xb5, 0x29, 0xb2, 0x60, 0xb2, 0x7b, 0xa5, 0xdb, 0xf7,
-	0x04, 0x4e, 0x0f, 0x6e, 0x3d, 0xe0, 0x52, 0xb0, 0x8a, 0xfc, 0x9f, 0x08, 0x30, 0x17, 0x8e, 0x7b,
-	0x3a, 0xb7, 0xfe, 0x35, 0x98, 0x6f, 0xdb, 0xeb, 0xda, 0xc0, 0xca, 0x9a, 0x1b, 0xd8, 0xcb, 0x7d,
-	0xce, 0x2a, 0x84, 0xad, 0x89, 0xa5, 0x33, 0xed, 0xf0, 0x02, 0xf1, 0xf3, 0x71, 0x98, 0xa6, 0xae,
-	0x2e, 0xd0, 0x98, 0x9b, 0x30, 0x46, 0x0f, 0x61, 0x0c, 0x75, 0x0e, 0x8b, 0x93, 0xa0, 0x35, 0x48,
-	0xd5, 0x74, 0xad, 0xae, 0x52, 0xa9, 0xe3, 0xfd, 0xd7, 0x5d, 0x2c, 0x1d, 0x50, 0xb4, 0x49, 0x24,
-	0x97, 0x1a, 0xb5, 0x23, 0xf4, 0x31, 0x7a, 0x6c, 0x7d, 0xac, 0x8e, 0xf4, 0xd4, 0x48, 0x74, 0x2e,
-	0x25, 0xf1, 0x24, 0x72, 0x29, 0x21, 0x6b, 0xa4, 0xbf, 0x14, 0x60, 0x36, 0x34, 0x49, 0x82, 0xea,
-	0x30, 0xcb, 0x2e, 0xc6, 0x86, 0x1b, 0xff, 0x62, 0xdf, 0x7e, 0x0a, 0x58, 0xc6, 0xcc, 0x6e, 0x37,
-	0xd0, 0x44, 0xef, 0xc0, 0x34, 0xcf, 0xee, 0x98, 0x9d, 0x76, 0xdb, 0xc0, 0xa6, 0xc9, 0x53, 0x3b,
-	0xa4, 0x8e, 0x0f, 0xf6, 0xef, 0xcb, 0x8a, 0x4b, 0x25, 0x21, 0x23, 0x08, 0x32, 0xc5, 0x77, 0x60,
-	0xaa, 0x0b, 0xd1, 0x6f, 0x36, 0xc2, 0x49, 0xcc, 0x46, 0xfc, 0x61, 0x02, 0x26, 0x03, 0xc5, 0xe8,
-	0x21, 0xa4, 0xf1, 0xa1, 0xdb, 0x96, 0x01, 0x9e, 0xc1, 0x08, 0x70, 0x58, 0x28, 0xb9, 0xe4, 0x92,
-	0x97, 0x57, 0xfe, 0x8f, 0x04, 0x48, 0xb9, 0x15, 0x9d, 0xe0, 0xc8, 0xd3, 0x5d, 0x48, 0xea, 0x6d,
-	0x6c, 0x28, 0x16, 0xbf, 0xd5, 0x39, 0xd1, 0x2f, 0x6b, 0xd5, 0xa4, 0x1d, 0xa6, 0x34, 0xcb, 0x9c,
-	0x4a, 0x72, 0xe8, 0xdd, 0xa4, 0xee, 0xe8, 0x70, 0x49, 0xdd, 0x7c, 0x0d, 0xc0, 0x69, 0x8c, 0x89,
-	0xb6, 0x01, 0x1c, 0xbd, 0xda, 0x56, 0x76, 0x6d, 0x18, 0xad, 0xb9, 0x1d, 0xe4, 0x61, 0x94, 0xff,
-	0x72, 0x0c, 0xd2, 0x1e, 0x7d, 0x22, 0x03, 0x72, 0x4d, 0xbd, 0x41, 0x4f, 0x14, 0x39, 0x1a, 0x60,
-	0x39, 0x80, 0x3b, 0xc7, 0xec, 0xa2, 0x85, 0x75, 0xc6, 0xcf, 0x51, 0xcd, 0x64, 0xd3, 0x0f, 0x40,
-	0x0f, 0x7c, 0x4d, 0x63, 0x06, 0xf1, 0xe1, 0x63, 0x35, 0x8d, 0x0c, 0x6f, 0x0f, 0x2f, 0xf1, 0x7f,
-	0xc1, 0x64, 0xa0, 0x76, 0x74, 0x09, 0xce, 0xaf, 0x97, 0xef, 0xac, 0x15, 0x0b, 0xeb, 0x72, 0x79,
-	0xab, 0x24, 0x15, 0xaa, 0x65, 0x29, 0x10, 0x06, 0x8d, 0x43, 0xbc, 0xb0, 0xb9, 0x92, 0x13, 0x9c,
-	0x5c, 0xef, 0xb7, 0x04, 0x98, 0x0b, 0xbf, 0x9f, 0x46, 0x96, 0x7c, 0x8e, 0x03, 0x08, 0x5c, 0x04,
-	0xc9, 0x79, 0x0a, 0xd8, 0x2d, 0x90, 0x26, 0xcc, 0xfb, 0xbd, 0x85, 0x6c, 0x76, 0x5a, 0x2d, 0xc5,
-	0x50, 0x9d, 0x43, 0xa2, 0x2f, 0x0d, 0x7e, 0x45, 0xae, 0x42, 0x49, 0x8f, 0xa4, 0x33, 0x56, 0x08,
-	0x58, 0xc5, 0xa6, 0xf8, 0xed, 0x31, 0x98, 0x0d, 0x25, 0x39, 0x8d, 0xfb, 0x4f, 0xce, 0xd8, 0x8a,
-	0x0d, 0x3d, 0xb6, 0xde, 0x0a, 0x7a, 0x59, 0xde, 0xe3, 0xc7, 0x9a, 0x50, 0x03, 0xac, 0x7a, 0xbb,
-	0xe5, 0xc4, 0x69, 0xba, 0xe5, 0xfb, 0x30, 0x19, 0x70, 0xcb, 0x3c, 0xad, 0x39, 0xa4, 0x4b, 0x9e,
-	0xf0, 0xbb, 0x64, 0xf4, 0x10, 0xc6, 0xd9, 0xde, 0x90, 0xbd, 0x41, 0xfa, 0xd1, 0xa1, 0xed, 0x61,
-	0xc1, 0xb6, 0x0b, 0x76, 0x67, 0xcb, 0xe6, 0x17, 0x6e, 0xa8, 0xe3, 0xe1, 0x86, 0x9a, 0xff, 0xa2,
-	0x00, 0x59, 0x1f, 0x1f, 0x77, 0x83, 0x49, 0xf0, 0x6c, 0x30, 0xa1, 0x77, 0x60, 0xd4, 0x39, 0x07,
-	0x3d, 0x11, 0x1d, 0xf0, 0x85, 0x0b, 0x1b, 0xd0, 0x36, 0xad, 0xab, 0xa8, 0xd7, 0xb1, 0x44, 0xf9,
-	0xa2, 0x79, 0x18, 0xaf, 0xb3, 0x5d, 0x37, 0xfe, 0x46, 0x81, 0xfd, 0x29, 0xbe, 0x03, 0xf3, 0xbd,
-	0x68, 0xc9, 0x92, 0xa7, 0x2a, 0x15, 0x36, 0x2b, 0xb7, 0xcb, 0xd2, 0x06, 0x4d, 0xe8, 0xc8, 0x52,
-	0xa9, 0xb2, 0xbd, 0x5e, 0x95, 0x8b, 0xe5, 0x95, 0x90, 0x94, 0x51, 0x65, 0xbb, 0x58, 0x2c, 0x55,
-	0x2a, 0x2c, 0xdf, 0x58, 0x92, 0xa4, 0xb2, 0x94, 0x8b, 0x89, 0xbf, 0x19, 0x83, 0xc9, 0xe0, 0xcd,
-	0xb3, 0x63, 0x5e, 0xaa, 0xba, 0x04, 0xe9, 0xba, 0x7b, 0xb9, 0x88, 0x37, 0xc4, 0x0b, 0x0a, 0x3e,
-	0x67, 0x32, 0x3a, 0xcc, 0x73, 0x26, 0x84, 0xb8, 0xd3, 0xae, 0x3b, 0xc4, 0x89, 0xfe, 0xc4, 0x0c,
-	0x9d, 0x12, 0x77, 0x5f, 0x91, 0x1d, 0x3b, 0xd9, 0x15, 0x59, 0xf1, 0x07, 0x31, 0x40, 0x2b, 0x5d,
-	0x97, 0x8d, 0x7f, 0x1c, 0x75, 0x17, 0xfa, 0x96, 0xc1, 0xd8, 0x69, 0xbc, 0x65, 0x20, 0xfe, 0x8a,
-	0x00, 0xe7, 0x8b, 0x54, 0xcc, 0xe0, 0xb5, 0xc8, 0x3e, 0xb7, 0xce, 0xee, 0x43, 0xae, 0xeb, 0xf2,
-	0x65, 0x6c, 0xf8, 0xcb, 0x97, 0x93, 0x81, 0xbb, 0xc8, 0x64, 0x25, 0xe9, 0xdc, 0x59, 0x56, 0xeb,
-	0xbc, 0x1f, 0xc0, 0x06, 0xad, 0xd5, 0xc5, 0xdf, 0x13, 0xe0, 0xfc, 0x36, 0xd5, 0x4d, 0x0f, 0x89,
-	0xc3, 0x0c, 0xe0, 0x49, 0x49, 0xeb, 0x76, 0x2b, 0xcd, 0xab, 0xc6, 0x7b, 0x74, 0x2b, 0xf5, 0xf7,
-	0x1b, 0x8a, 0xb9, 0x6f, 0x77, 0x2b, 0xf9, 0x2d, 0x2e, 0xc2, 0xd9, 0x3b, 0xd8, 0x1a, 0xbc, 0x15,
-	0xe2, 0x23, 0x38, 0xc7, 0xee, 0x22, 0xfa, 0x28, 0xcc, 0x7e, 0x5d, 0x75, 0x01, 0xa0, 0x4d, 0x5f,
-	0x60, 0xd1, 0xf7, 0xf9, 0x9b, 0x1e, 0x29, 0x29, 0x45, 0x20, 0x55, 0x02, 0x40, 0xe7, 0x80, 0x7e,
-	0xb8, 0xf9, 0xcc, 0x84, 0x94, 0x24, 0x00, 0x9a, 0xcd, 0xfc, 0x92, 0x00, 0xe7, 0xc3, 0xeb, 0xe4,
-	0xd7, 0x20, 0x1f, 0xc0, 0x54, 0x50, 0xb3, 0x76, 0xcc, 0x38, 0x94, 0x6a, 0x73, 0x01, 0xd5, 0x9a,
-	0xe8, 0x32, 0x4c, 0x6a, 0xf8, 0xd0, 0x92, 0xbb, 0x64, 0xcf, 0x12, 0xf0, 0x96, 0x2d, 0xbf, 0xb8,
-	0x04, 0xe7, 0x57, 0x70, 0x13, 0x0f, 0x63, 0x0f, 0xe2, 0xf7, 0x63, 0x90, 0x0b, 0xde, 0xd6, 0x25,
-	0x2e, 0x8a, 0x3f, 0x69, 0xe8, 0xdf, 0x46, 0x8e, 0x74, 0x51, 0xbe, 0x0b, 0xe5, 0x52, 0xd6, 0xf4,
-	0xdd, 0x2f, 0xaf, 0x42, 0x56, 0xa7, 0xd7, 0xce, 0xfd, 0xfb, 0xc7, 0x91, 0xb1, 0x41, 0xc8, 0x3d,
-	0x75, 0x29, 0xc3, 0xb8, 0x3c, 0xb1, 0x77, 0x24, 0x8e, 0xf3, 0x60, 0xc0, 0xb7, 0x12, 0x30, 0xb6,
-	0xd2, 0x6c, 0xdf, 0xd5, 0x77, 0x42, 0x47, 0xdc, 0x0d, 0xfe, 0xf0, 0xdb, 0x00, 0x4f, 0x18, 0x32,
-	0x2e, 0x34, 0xec, 0x63, 0x0f, 0xc4, 0x15, 0xe8, 0x0b, 0x4a, 0x16, 0xe6, 0x0b, 0xa2, 0x17, 0xfa,
-	0x13, 0x2f, 0xdc, 0xd5, 0x77, 0x2a, 0x84, 0x44, 0x62, 0x94, 0xe8, 0x7f, 0x43, 0xc6, 0x50, 0xcd,
-	0x7d, 0xd9, 0x9e, 0xd4, 0x99, 0xb7, 0xfe, 0xc8, 0x71, 0x8f, 0xe2, 0xac, 0x8e, 0x48, 0x69, 0xc3,
-	0x73, 0xc1, 0x44, 0x06, 0xdb, 0x15, 0x38, 0x35, 0x0c, 0xb0, 0xb3, 0xdd, 0xeb, 0xda, 0xfb, 0xea,
-	0x88, 0x64, 0xf7, 0xa8, 0x5d, 0xc1, 0x49, 0xde, 0x1d, 0x43, 0xaf, 0x02, 0xd0, 0x47, 0xa7, 0x18,
-	0xed, 0x78, 0x5f, 0xda, 0x14, 0xc5, 0xa6, 0xa4, 0xd7, 0x20, 0x89, 0xb5, 0x3a, 0x23, 0x4c, 0xf6,
-	0x25, 0x1c, 0xc7, 0x5a, 0x9d, 0x92, 0x5d, 0x87, 0x2c, 0x36, 0x0c, 0xdd, 0x90, 0xed, 0xa0, 0x32,
-	0x45, 0x3d, 0x00, 0xb2, 0x69, 0x8d, 0x76, 0x6d, 0xa1, 0x42, 0x1f, 0xe5, 0x94, 0x32, 0x14, 0x91,
-	0x05, 0x51, 0xa6, 0x58, 0x83, 0xa4, 0xdd, 0x75, 0xe8, 0x2c, 0xcc, 0xde, 0x2d, 0x2f, 0xcb, 0x95,
-	0x6a, 0xa1, 0x1a, 0x12, 0x3c, 0x6d, 0x95, 0x36, 0x57, 0xd6, 0x36, 0xef, 0xe4, 0x04, 0xf2, 0x21,
-	0x6d, 0x6f, 0x6e, 0x92, 0x8f, 0x18, 0x4a, 0xc2, 0xe8, 0x4a, 0x79, 0xb3, 0x94, 0x8b, 0xa3, 0x0c,
-	0x24, 0x8b, 0x85, 0xcd, 0x62, 0x69, 0xbd, 0xb4, 0x92, 0x1b, 0x45, 0x00, 0x63, 0xb7, 0x0b, 0x6b,
-	0xe4, 0x77, 0x62, 0x39, 0xe5, 0x04, 0x77, 0xe2, 0x65, 0xc8, 0xdd, 0xc1, 0x16, 0x33, 0x9a, 0x28,
-	0x07, 0xf1, 0x5d, 0x01, 0x10, 0xf1, 0x7b, 0x0c, 0x33, 0xc4, 0xc5, 0x8e, 0xfa, 0x5c, 0xac, 0x7b,
-	0x7b, 0x5c, 0xf0, 0xde, 0x1e, 0xf7, 0xfb, 0xd6, 0x98, 0xdf, 0xb7, 0x06, 0xfc, 0x72, 0x3c, 0xe8,
-	0x97, 0xed, 0x11, 0x94, 0x18, 0x7e, 0x04, 0x89, 0x1d, 0x98, 0xf6, 0x49, 0xcf, 0x9d, 0xf5, 0x87,
-	0x61, 0xf4, 0x5d, 0x7d, 0xc7, 0xf6, 0xcf, 0x62, 0x7f, 0x96, 0x12, 0xc5, 0x1f, 0xd8, 0x15, 0x3f,
-	0x0f, 0xd3, 0x45, 0x45, 0xab, 0xe1, 0x66, 0x7f, 0x05, 0x3f, 0x0f, 0xd3, 0xcc, 0x6b, 0xf7, 0x47,
-	0xfd, 0x8e, 0x00, 0x17, 0x59, 0x8c, 0xd2, 0x1d, 0xee, 0xf5, 0x9b, 0xfb, 0x64, 0x98, 0x0e, 0x79,
-	0xe8, 0x68, 0x90, 0xcc, 0x7d, 0x48, 0x5d, 0xa8, 0xfb, 0x4d, 0xa4, 0xfe, 0xf1, 0xca, 0x8f, 0x04,
-	0xb8, 0xc8, 0xe2, 0x95, 0xde, 0xd2, 0x87, 0x39, 0xd0, 0x27, 0x2e, 0xf9, 0x89, 0x62, 0x97, 0x25,
-	0x38, 0x4f, 0xc6, 0xd1, 0x30, 0x2d, 0x12, 0x2d, 0x78, 0x8a, 0x1a, 0x65, 0x17, 0xd1, 0x13, 0x8d,
-	0x60, 0x7e, 0x59, 0x80, 0x8b, 0x3d, 0xab, 0xe5, 0xe3, 0x42, 0x81, 0x99, 0x10, 0x5d, 0xdb, 0xe3,
-	0x64, 0x58, 0x65, 0x4f, 0x77, 0x2b, 0x7b, 0xf0, 0x21, 0x74, 0x0d, 0x2e, 0xf2, 0x71, 0x31, 0x8c,
-	0x6e, 0xaf, 0x6e, 0xb9, 0xaf, 0x73, 0x78, 0xde, 0xc7, 0x20, 0x2e, 0xb5, 0xb4, 0xb9, 0xbd, 0x21,
-	0x57, 0x1f, 0x6e, 0x85, 0xb8, 0xd4, 0x35, 0x0a, 0xa8, 0xe6, 0x04, 0x34, 0x05, 0x59, 0x69, 0xad,
-	0x72, 0x4f, 0x2e, 0x6c, 0x16, 0xd6, 0x1f, 0x56, 0xd6, 0x2a, 0xb9, 0xd8, 0xd5, 0xef, 0x08, 0x80,
-	0xba, 0xb3, 0x8d, 0xe8, 0x19, 0xb8, 0x28, 0x95, 0xd6, 0xe9, 0x62, 0xb7, 0x77, 0x5e, 0x2b, 0x03,
-	0xc9, 0xd2, 0x1b, 0xdb, 0x85, 0x75, 0xb9, 0x5a, 0xce, 0x09, 0x28, 0x07, 0x99, 0xcd, 0x72, 0x55,
-	0x76, 0x20, 0xf4, 0x8c, 0xcd, 0x1d, 0xa9, 0x54, 0xa8, 0x96, 0x24, 0xb9, 0xba, 0x5a, 0xd8, 0xcc,
-	0xc5, 0x51, 0x16, 0x52, 0xeb, 0xa5, 0x4a, 0x85, 0x7d, 0x8e, 0xa2, 0x3c, 0xcc, 0x79, 0x11, 0xe4,
-	0xb2, 0xc4, 0xc8, 0x2b, 0xb9, 0x04, 0x3a, 0x03, 0xd3, 0x0e, 0xaa, 0xa7, 0x60, 0x8c, 0xb8, 0xfc,
-	0xd2, 0x83, 0xb5, 0x4a, 0xb5, 0x92, 0x1b, 0xbf, 0x2a, 0x01, 0xb8, 0x4e, 0x11, 0x9d, 0x87, 0xf9,
-	0x95, 0xf5, 0x2d, 0x99, 0xcc, 0x2e, 0x21, 0x9a, 0x98, 0x84, 0x34, 0xd7, 0x04, 0xc1, 0xc8, 0x09,
-	0x68, 0x16, 0xa6, 0x7c, 0xda, 0xa0, 0xe0, 0xd8, 0xd2, 0x57, 0x2f, 0x50, 0xa6, 0x15, 0x6c, 0x3c,
-	0x56, 0x6b, 0x18, 0xfd, 0xaa, 0x00, 0x13, 0xfe, 0x27, 0x93, 0xd0, 0x4b, 0x83, 0x45, 0x60, 0x9e,
-	0x27, 0xa5, 0xf2, 0x4b, 0xc3, 0x90, 0x30, 0x73, 0x15, 0xaf, 0xff, 0xe4, 0x8f, 0xfe, 0xee, 0x73,
-	0xb1, 0x97, 0xc4, 0x17, 0x9d, 0xa7, 0xb8, 0x3f, 0xce, 0x06, 0xca, 0xad, 0xb6, 0xa1, 0xbf, 0x8b,
-	0x6b, 0x96, 0xb9, 0x78, 0xf5, 0x13, 0x8b, 0x35, 0x46, 0x75, 0x83, 0x47, 0x16, 0x37, 0x84, 0xab,
-	0xe8, 0x2b, 0x02, 0xa4, 0x3d, 0xef, 0xf5, 0xa1, 0x85, 0xe1, 0x5e, 0x4f, 0xcc, 0x2f, 0x0e, 0x8c,
-	0xcf, 0x25, 0x7d, 0x85, 0x4a, 0xba, 0x20, 0x3e, 0x1f, 0x29, 0x29, 0x7d, 0x22, 0xf0, 0x06, 0x3b,
-	0x28, 0x49, 0xc4, 0xfc, 0xae, 0x00, 0x53, 0x5d, 0x6f, 0xcc, 0xa1, 0x57, 0x06, 0x5e, 0xea, 0x7a,
-	0xf5, 0x7b, 0x6d, 0x48, 0x2a, 0x2e, 0xf8, 0x0d, 0x2a, 0xf8, 0x2b, 0xe2, 0xe2, 0x40, 0x2a, 0x76,
-	0x07, 0xbc, 0x2d, 0xbe, 0x34, 0x9c, 0xf8, 0xd2, 0xb1, 0xc4, 0x97, 0x4e, 0x49, 0x7c, 0xc3, 0x27,
-	0xfe, 0xd7, 0x05, 0x98, 0xea, 0x8a, 0x54, 0xd1, 0x70, 0x81, 0xad, 0x2d, 0xfe, 0x00, 0x21, 0xc6,
-	0x80, 0xb2, 0xd6, 0x1d, 0xde, 0x5e, 0x83, 0xfe, 0x35, 0x01, 0x66, 0x43, 0xe3, 0x76, 0x34, 0x7c,
-	0xa8, 0xff, 0x44, 0x65, 0x56, 0x58, 0x8d, 0x44, 0xe6, 0x9f, 0x17, 0x20, 0xeb, 0x7b, 0x52, 0x08,
-	0x7d, 0x28, 0xfa, 0x69, 0xe3, 0xee, 0x27, 0x8d, 0xf2, 0x2f, 0x0d, 0x41, 0xc1, 0x4d, 0x22, 0x4f,
-	0x45, 0x9e, 0x41, 0xc8, 0x11, 0xd9, 0xdd, 0x83, 0xfe, 0x9e, 0x00, 0xb3, 0xa1, 0x59, 0xa0, 0x68,
-	0x35, 0x46, 0x25, 0x8e, 0xf2, 0xc3, 0xac, 0xfe, 0xc5, 0x5b, 0x54, 0xb8, 0xeb, 0xe2, 0x52, 0x97,
-	0x3e, 0x75, 0xa3, 0xa1, 0x68, 0xea, 0x7b, 0x2c, 0x1d, 0x4e, 0x9d, 0x45, 0x20, 0x4f, 0x40, 0x54,
-	0x4a, 0xe4, 0x0f, 0xcd, 0x09, 0x45, 0xcb, 0x1f, 0x95, 0x46, 0x3a, 0x96, 0xfc, 0x4b, 0x1e, 0xf9,
-	0xc9, 0xb4, 0x1c, 0x94, 0xbe, 0x4b, 0xf8, 0xc5, 0xab, 0x9f, 0x20, 0xf2, 0xff, 0x86, 0x00, 0xa8,
-	0x3b, 0x15, 0x84, 0x22, 0x07, 0x7f, 0xcf, 0xd4, 0xd1, 0x70, 0x92, 0x73, 0x4b, 0x46, 0xc7, 0x90,
-	0x1c, 0xfd, 0xae, 0x60, 0xbf, 0xb8, 0x15, 0x48, 0xdd, 0x5c, 0xef, 0x6f, 0x9e, 0xa1, 0x29, 0xac,
-	0xfc, 0x47, 0x86, 0x27, 0xf4, 0x7b, 0x3c, 0x74, 0x0c, 0x0b, 0x42, 0x5f, 0x15, 0x60, 0x36, 0x34,
-	0x85, 0x14, 0x6d, 0x3e, 0x51, 0x59, 0xa7, 0x7c, 0x8f, 0x17, 0x46, 0x6c, 0x39, 0xaf, 0x1e, 0x47,
-	0xdf, 0x7f, 0x20, 0xc0, 0x7c, 0xaf, 0x85, 0x10, 0xba, 0xd9, 0x7f, 0xa4, 0xf6, 0x0c, 0x29, 0xf3,
-	0x43, 0x86, 0xb8, 0xe2, 0xeb, 0xb4, 0x15, 0x37, 0xc4, 0x6b, 0xfd, 0xb5, 0x1d, 0x12, 0x0c, 0x13,
-	0x93, 0x27, 0x6d, 0xe9, 0xb5, 0x2c, 0x8a, 0x6e, 0x4b, 0x9f, 0xc5, 0xd4, 0x71, 0xdb, 0xb2, 0x74,
-	0xad, 0x4f, 0x8f, 0x84, 0x34, 0x84, 0x0f, 0xdf, 0xef, 0x0b, 0x30, 0x1b, 0xba, 0x1a, 0x8a, 0xb6,
-	0x9f, 0xa8, 0x05, 0xd4, 0xd0, 0xad, 0xe0, 0x1e, 0x08, 0x1d, 0xaf, 0x15, 0xe8, 0x4f, 0x05, 0x38,
-	0xd3, 0x63, 0x95, 0x84, 0x6e, 0xf4, 0x1b, 0x94, 0xbd, 0x57, 0x74, 0xf9, 0x9b, 0xc7, 0xa2, 0xe5,
-	0x63, 0x3a, 0xa4, 0x4d, 0x43, 0x58, 0x19, 0xfa, 0xa6, 0x00, 0xf3, 0xbd, 0xd6, 0x52, 0xd1, 0x26,
-	0xd6, 0x67, 0x05, 0xd6, 0x73, 0x70, 0x73, 0x81, 0xaf, 0x1e, 0xb3, 0x13, 0x7e, 0x49, 0x80, 0xb4,
-	0x27, 0x6d, 0x13, 0x1d, 0x9e, 0x77, 0x67, 0xa7, 0xa2, 0xc3, 0xf3, 0x90, 0x7c, 0x90, 0xf8, 0x22,
-	0x95, 0xf7, 0x32, 0x7a, 0x36, 0x3a, 0x8c, 0xe1, 0xe2, 0x7c, 0x56, 0x80, 0x94, 0x93, 0x3c, 0x43,
-	0x2f, 0xf6, 0x33, 0x6d, 0x6f, 0x5e, 0x67, 0xa0, 0xa0, 0x2a, 0x44, 0x1a, 0xaa, 0x3d, 0x57, 0x16,
-	0x5b, 0x14, 0xa2, 0xac, 0x4f, 0x09, 0x90, 0xf1, 0x66, 0x90, 0xd0, 0xe2, 0x00, 0x3d, 0xea, 0x93,
-	0xa9, 0x57, 0x2f, 0x72, 0x39, 0xae, 0x0e, 0x26, 0xc7, 0xcf, 0x09, 0x90, 0xf1, 0x26, 0xbd, 0xa2,
-	0xe5, 0x08, 0x49, 0x8f, 0xf5, 0x94, 0xe3, 0xc3, 0x54, 0x8e, 0x0f, 0x89, 0x2f, 0x0c, 0x22, 0xc7,
-	0x8d, 0x1a, 0xe5, 0x7c, 0x43, 0xb8, 0xba, 0xfc, 0x65, 0x01, 0x9e, 0xaa, 0xe9, 0xad, 0x08, 0x31,
-	0x96, 0x93, 0x2b, 0xcd, 0xf6, 0x16, 0xa9, 0x6d, 0x4b, 0xf8, 0xd8, 0x2d, 0x8e, 0xd7, 0xd0, 0x9b,
-	0x8a, 0xd6, 0x58, 0xd0, 0x8d, 0xc6, 0x62, 0x03, 0x6b, 0x54, 0x96, 0x45, 0x56, 0xa4, 0xb4, 0x55,
-	0x33, 0xec, 0x1f, 0xa0, 0x6e, 0xd6, 0x9b, 0xed, 0x6f, 0xc4, 0xe6, 0xef, 0x30, 0xfa, 0x62, 0x53,
-	0xef, 0xd4, 0x49, 0x5f, 0x2e, 0xdc, 0x5f, 0x5a, 0x26, 0xc5, 0x7f, 0x68, 0x17, 0xbd, 0x4d, 0x8b,
-	0xde, 0x5e, 0x69, 0xb6, 0xdf, 0xbe, 0xcf, 0x28, 0x77, 0xc6, 0x28, 0xff, 0x97, 0xff, 0x33, 0x00,
-	0x00, 0xff, 0xff, 0x78, 0xae, 0x10, 0x67, 0xc0, 0x6a, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta2/storage.pb.go b/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta2/storage.pb.go
deleted file mode 100644
index ab4fdec5..00000000
--- a/vendor/google.golang.org/genproto/googleapis/privacy/dlp/v2beta2/storage.pb.go
+++ /dev/null
@@ -1,1165 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/privacy/dlp/v2beta2/storage.proto
-
-package dlp
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import _ "github.com/golang/protobuf/ptypes/timestamp"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// Categorization of results based on how likely they are to represent a match,
-// based on the number of elements they contain which imply a match.
-type Likelihood int32
-
-const (
-	// Default value; information with all likelihoods is included.
-	Likelihood_LIKELIHOOD_UNSPECIFIED Likelihood = 0
-	// Few matching elements.
-	Likelihood_VERY_UNLIKELY Likelihood = 1
-	Likelihood_UNLIKELY      Likelihood = 2
-	// Some matching elements.
-	Likelihood_POSSIBLE Likelihood = 3
-	Likelihood_LIKELY   Likelihood = 4
-	// Many matching elements.
-	Likelihood_VERY_LIKELY Likelihood = 5
-)
-
-var Likelihood_name = map[int32]string{
-	0: "LIKELIHOOD_UNSPECIFIED",
-	1: "VERY_UNLIKELY",
-	2: "UNLIKELY",
-	3: "POSSIBLE",
-	4: "LIKELY",
-	5: "VERY_LIKELY",
-}
-var Likelihood_value = map[string]int32{
-	"LIKELIHOOD_UNSPECIFIED": 0,
-	"VERY_UNLIKELY":          1,
-	"UNLIKELY":               2,
-	"POSSIBLE":               3,
-	"LIKELY":                 4,
-	"VERY_LIKELY":            5,
-}
-
-func (x Likelihood) String() string {
-	return proto.EnumName(Likelihood_name, int32(x))
-}
-func (Likelihood) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-// Type of information detected by the API.
-type InfoType struct {
-	// Name of the information type.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *InfoType) Reset()                    { *m = InfoType{} }
-func (m *InfoType) String() string            { return proto.CompactTextString(m) }
-func (*InfoType) ProtoMessage()               {}
-func (*InfoType) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-func (m *InfoType) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Custom information type provided by the user. Used to find domain-specific
-// sensitive information configurable to the data in question.
-type CustomInfoType struct {
-	// Info type configuration. All custom info types must have configurations
-	// that do not conflict with built-in info types or other custom info types.
-	InfoType *InfoType `protobuf:"bytes,1,opt,name=info_type,json=infoType" json:"info_type,omitempty"`
-	// Types that are valid to be assigned to Type:
-	//	*CustomInfoType_Dictionary_
-	//	*CustomInfoType_SurrogateType_
-	Type isCustomInfoType_Type `protobuf_oneof:"type"`
-}
-
-func (m *CustomInfoType) Reset()                    { *m = CustomInfoType{} }
-func (m *CustomInfoType) String() string            { return proto.CompactTextString(m) }
-func (*CustomInfoType) ProtoMessage()               {}
-func (*CustomInfoType) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
-
-type isCustomInfoType_Type interface {
-	isCustomInfoType_Type()
-}
-
-type CustomInfoType_Dictionary_ struct {
-	Dictionary *CustomInfoType_Dictionary `protobuf:"bytes,2,opt,name=dictionary,oneof"`
-}
-type CustomInfoType_SurrogateType_ struct {
-	SurrogateType *CustomInfoType_SurrogateType `protobuf:"bytes,4,opt,name=surrogate_type,json=surrogateType,oneof"`
-}
-
-func (*CustomInfoType_Dictionary_) isCustomInfoType_Type()    {}
-func (*CustomInfoType_SurrogateType_) isCustomInfoType_Type() {}
-
-func (m *CustomInfoType) GetType() isCustomInfoType_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *CustomInfoType) GetInfoType() *InfoType {
-	if m != nil {
-		return m.InfoType
-	}
-	return nil
-}
-
-func (m *CustomInfoType) GetDictionary() *CustomInfoType_Dictionary {
-	if x, ok := m.GetType().(*CustomInfoType_Dictionary_); ok {
-		return x.Dictionary
-	}
-	return nil
-}
-
-func (m *CustomInfoType) GetSurrogateType() *CustomInfoType_SurrogateType {
-	if x, ok := m.GetType().(*CustomInfoType_SurrogateType_); ok {
-		return x.SurrogateType
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInfoType) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInfoType_OneofMarshaler, _CustomInfoType_OneofUnmarshaler, _CustomInfoType_OneofSizer, []interface{}{
-		(*CustomInfoType_Dictionary_)(nil),
-		(*CustomInfoType_SurrogateType_)(nil),
-	}
-}
-
-func _CustomInfoType_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInfoType)
-	// type
-	switch x := m.Type.(type) {
-	case *CustomInfoType_Dictionary_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Dictionary); err != nil {
-			return err
-		}
-	case *CustomInfoType_SurrogateType_:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.SurrogateType); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomInfoType.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInfoType_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInfoType)
-	switch tag {
-	case 2: // type.dictionary
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Dictionary)
-		err := b.DecodeMessage(msg)
-		m.Type = &CustomInfoType_Dictionary_{msg}
-		return true, err
-	case 4: // type.surrogate_type
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_SurrogateType)
-		err := b.DecodeMessage(msg)
-		m.Type = &CustomInfoType_SurrogateType_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInfoType_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInfoType)
-	// type
-	switch x := m.Type.(type) {
-	case *CustomInfoType_Dictionary_:
-		s := proto.Size(x.Dictionary)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *CustomInfoType_SurrogateType_:
-		s := proto.Size(x.SurrogateType)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Custom information type based on a dictionary of words or phrases. This can
-// be used to match sensitive information specific to the data, such as a list
-// of employee IDs or job titles.
-//
-// Dictionary words are case-insensitive and all characters other than letters
-// and digits in the unicode [Basic Multilingual
-// Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
-// will be replaced with whitespace when scanning for matches, so the
-// dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
-// "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
-// surrounding any match must be of a different type than the adjacent
-// characters within the word, so letters must be next to non-letters and
-// digits next to non-digits. For example, the dictionary word "jen" will
-// match the first three letters of the text "jen123" but will return no
-// matches for "jennifer".
-//
-// Dictionary words containing a large number of characters that are not
-// letters or digits may result in unexpected findings because such characters
-// are treated as whitespace.
-type CustomInfoType_Dictionary struct {
-	// Types that are valid to be assigned to Source:
-	//	*CustomInfoType_Dictionary_WordList_
-	Source isCustomInfoType_Dictionary_Source `protobuf_oneof:"source"`
-}
-
-func (m *CustomInfoType_Dictionary) Reset()                    { *m = CustomInfoType_Dictionary{} }
-func (m *CustomInfoType_Dictionary) String() string            { return proto.CompactTextString(m) }
-func (*CustomInfoType_Dictionary) ProtoMessage()               {}
-func (*CustomInfoType_Dictionary) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} }
-
-type isCustomInfoType_Dictionary_Source interface {
-	isCustomInfoType_Dictionary_Source()
-}
-
-type CustomInfoType_Dictionary_WordList_ struct {
-	WordList *CustomInfoType_Dictionary_WordList `protobuf:"bytes,1,opt,name=word_list,json=wordList,oneof"`
-}
-
-func (*CustomInfoType_Dictionary_WordList_) isCustomInfoType_Dictionary_Source() {}
-
-func (m *CustomInfoType_Dictionary) GetSource() isCustomInfoType_Dictionary_Source {
-	if m != nil {
-		return m.Source
-	}
-	return nil
-}
-
-func (m *CustomInfoType_Dictionary) GetWordList() *CustomInfoType_Dictionary_WordList {
-	if x, ok := m.GetSource().(*CustomInfoType_Dictionary_WordList_); ok {
-		return x.WordList
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*CustomInfoType_Dictionary) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _CustomInfoType_Dictionary_OneofMarshaler, _CustomInfoType_Dictionary_OneofUnmarshaler, _CustomInfoType_Dictionary_OneofSizer, []interface{}{
-		(*CustomInfoType_Dictionary_WordList_)(nil),
-	}
-}
-
-func _CustomInfoType_Dictionary_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*CustomInfoType_Dictionary)
-	// source
-	switch x := m.Source.(type) {
-	case *CustomInfoType_Dictionary_WordList_:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.WordList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("CustomInfoType_Dictionary.Source has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _CustomInfoType_Dictionary_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*CustomInfoType_Dictionary)
-	switch tag {
-	case 1: // source.word_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CustomInfoType_Dictionary_WordList)
-		err := b.DecodeMessage(msg)
-		m.Source = &CustomInfoType_Dictionary_WordList_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _CustomInfoType_Dictionary_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*CustomInfoType_Dictionary)
-	// source
-	switch x := m.Source.(type) {
-	case *CustomInfoType_Dictionary_WordList_:
-		s := proto.Size(x.WordList)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Message defining a list of words or phrases to search for in the data.
-type CustomInfoType_Dictionary_WordList struct {
-	// Words or phrases defining the dictionary. The dictionary must contain
-	// at least one phrase and every phrase must contain at least 2 characters
-	// that are letters or digits. [required]
-	Words []string `protobuf:"bytes,1,rep,name=words" json:"words,omitempty"`
-}
-
-func (m *CustomInfoType_Dictionary_WordList) Reset()         { *m = CustomInfoType_Dictionary_WordList{} }
-func (m *CustomInfoType_Dictionary_WordList) String() string { return proto.CompactTextString(m) }
-func (*CustomInfoType_Dictionary_WordList) ProtoMessage()    {}
-func (*CustomInfoType_Dictionary_WordList) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{1, 0, 0}
-}
-
-func (m *CustomInfoType_Dictionary_WordList) GetWords() []string {
-	if m != nil {
-		return m.Words
-	}
-	return nil
-}
-
-// Message for detecting output from deidentification transformations
-// such as
-// [`CryptoReplaceFfxFpeConfig`](/dlp/docs/reference/rest/v2beta1/content/deidentify#CryptoReplaceFfxFpeConfig).
-// These types of transformations are
-// those that perform pseudonymization, thereby producing a "surrogate" as
-// output. This should be used in conjunction with a field on the
-// transformation such as `surrogate_info_type`. This custom info type does
-// not support the use of `detection_rules`.
-type CustomInfoType_SurrogateType struct {
-}
-
-func (m *CustomInfoType_SurrogateType) Reset()                    { *m = CustomInfoType_SurrogateType{} }
-func (m *CustomInfoType_SurrogateType) String() string            { return proto.CompactTextString(m) }
-func (*CustomInfoType_SurrogateType) ProtoMessage()               {}
-func (*CustomInfoType_SurrogateType) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 1} }
-
-// General identifier of a data field in a storage service.
-type FieldId struct {
-	// Name describing the field.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *FieldId) Reset()                    { *m = FieldId{} }
-func (m *FieldId) String() string            { return proto.CompactTextString(m) }
-func (*FieldId) ProtoMessage()               {}
-func (*FieldId) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
-
-func (m *FieldId) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Datastore partition ID.
-// A partition ID identifies a grouping of entities. The grouping is always
-// by project and namespace, however the namespace ID may be empty.
-//
-// A partition ID contains several dimensions:
-// project ID and namespace ID.
-type PartitionId struct {
-	// The ID of the project to which the entities belong.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// If not empty, the ID of the namespace to which the entities belong.
-	NamespaceId string `protobuf:"bytes,4,opt,name=namespace_id,json=namespaceId" json:"namespace_id,omitempty"`
-}
-
-func (m *PartitionId) Reset()                    { *m = PartitionId{} }
-func (m *PartitionId) String() string            { return proto.CompactTextString(m) }
-func (*PartitionId) ProtoMessage()               {}
-func (*PartitionId) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
-
-func (m *PartitionId) GetProjectId() string {
-	if m != nil {
-		return m.ProjectId
-	}
-	return ""
-}
-
-func (m *PartitionId) GetNamespaceId() string {
-	if m != nil {
-		return m.NamespaceId
-	}
-	return ""
-}
-
-// A representation of a Datastore kind.
-type KindExpression struct {
-	// The name of the kind.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *KindExpression) Reset()                    { *m = KindExpression{} }
-func (m *KindExpression) String() string            { return proto.CompactTextString(m) }
-func (*KindExpression) ProtoMessage()               {}
-func (*KindExpression) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
-
-func (m *KindExpression) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Options defining a data set within Google Cloud Datastore.
-type DatastoreOptions struct {
-	// A partition ID identifies a grouping of entities. The grouping is always
-	// by project and namespace, however the namespace ID may be empty.
-	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId" json:"partition_id,omitempty"`
-	// The kind to process.
-	Kind *KindExpression `protobuf:"bytes,2,opt,name=kind" json:"kind,omitempty"`
-}
-
-func (m *DatastoreOptions) Reset()                    { *m = DatastoreOptions{} }
-func (m *DatastoreOptions) String() string            { return proto.CompactTextString(m) }
-func (*DatastoreOptions) ProtoMessage()               {}
-func (*DatastoreOptions) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
-
-func (m *DatastoreOptions) GetPartitionId() *PartitionId {
-	if m != nil {
-		return m.PartitionId
-	}
-	return nil
-}
-
-func (m *DatastoreOptions) GetKind() *KindExpression {
-	if m != nil {
-		return m.Kind
-	}
-	return nil
-}
-
-// Options defining a file or a set of files (path ending with *) within
-// a Google Cloud Storage bucket.
-type CloudStorageOptions struct {
-	FileSet *CloudStorageOptions_FileSet `protobuf:"bytes,1,opt,name=file_set,json=fileSet" json:"file_set,omitempty"`
-}
-
-func (m *CloudStorageOptions) Reset()                    { *m = CloudStorageOptions{} }
-func (m *CloudStorageOptions) String() string            { return proto.CompactTextString(m) }
-func (*CloudStorageOptions) ProtoMessage()               {}
-func (*CloudStorageOptions) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
-
-func (m *CloudStorageOptions) GetFileSet() *CloudStorageOptions_FileSet {
-	if m != nil {
-		return m.FileSet
-	}
-	return nil
-}
-
-// Set of files to scan.
-type CloudStorageOptions_FileSet struct {
-	// The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-	// path is allowed.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
-}
-
-func (m *CloudStorageOptions_FileSet) Reset()                    { *m = CloudStorageOptions_FileSet{} }
-func (m *CloudStorageOptions_FileSet) String() string            { return proto.CompactTextString(m) }
-func (*CloudStorageOptions_FileSet) ProtoMessage()               {}
-func (*CloudStorageOptions_FileSet) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6, 0} }
-
-func (m *CloudStorageOptions_FileSet) GetUrl() string {
-	if m != nil {
-		return m.Url
-	}
-	return ""
-}
-
-// Options defining BigQuery table and row identifiers.
-type BigQueryOptions struct {
-	// Complete BigQuery table reference.
-	TableReference *BigQueryTable `protobuf:"bytes,1,opt,name=table_reference,json=tableReference" json:"table_reference,omitempty"`
-	// References to fields uniquely identifying rows within the table.
-	// Nested fields in the format, like `person.birthdate.year`, are allowed.
-	IdentifyingFields []*FieldId `protobuf:"bytes,2,rep,name=identifying_fields,json=identifyingFields" json:"identifying_fields,omitempty"`
-}
-
-func (m *BigQueryOptions) Reset()                    { *m = BigQueryOptions{} }
-func (m *BigQueryOptions) String() string            { return proto.CompactTextString(m) }
-func (*BigQueryOptions) ProtoMessage()               {}
-func (*BigQueryOptions) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
-
-func (m *BigQueryOptions) GetTableReference() *BigQueryTable {
-	if m != nil {
-		return m.TableReference
-	}
-	return nil
-}
-
-func (m *BigQueryOptions) GetIdentifyingFields() []*FieldId {
-	if m != nil {
-		return m.IdentifyingFields
-	}
-	return nil
-}
-
-// Shared message indicating Cloud storage type.
-type StorageConfig struct {
-	// Types that are valid to be assigned to Type:
-	//	*StorageConfig_DatastoreOptions
-	//	*StorageConfig_CloudStorageOptions
-	//	*StorageConfig_BigQueryOptions
-	Type isStorageConfig_Type `protobuf_oneof:"type"`
-}
-
-func (m *StorageConfig) Reset()                    { *m = StorageConfig{} }
-func (m *StorageConfig) String() string            { return proto.CompactTextString(m) }
-func (*StorageConfig) ProtoMessage()               {}
-func (*StorageConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
-
-type isStorageConfig_Type interface {
-	isStorageConfig_Type()
-}
-
-type StorageConfig_DatastoreOptions struct {
-	DatastoreOptions *DatastoreOptions `protobuf:"bytes,2,opt,name=datastore_options,json=datastoreOptions,oneof"`
-}
-type StorageConfig_CloudStorageOptions struct {
-	CloudStorageOptions *CloudStorageOptions `protobuf:"bytes,3,opt,name=cloud_storage_options,json=cloudStorageOptions,oneof"`
-}
-type StorageConfig_BigQueryOptions struct {
-	BigQueryOptions *BigQueryOptions `protobuf:"bytes,4,opt,name=big_query_options,json=bigQueryOptions,oneof"`
-}
-
-func (*StorageConfig_DatastoreOptions) isStorageConfig_Type()    {}
-func (*StorageConfig_CloudStorageOptions) isStorageConfig_Type() {}
-func (*StorageConfig_BigQueryOptions) isStorageConfig_Type()     {}
-
-func (m *StorageConfig) GetType() isStorageConfig_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *StorageConfig) GetDatastoreOptions() *DatastoreOptions {
-	if x, ok := m.GetType().(*StorageConfig_DatastoreOptions); ok {
-		return x.DatastoreOptions
-	}
-	return nil
-}
-
-func (m *StorageConfig) GetCloudStorageOptions() *CloudStorageOptions {
-	if x, ok := m.GetType().(*StorageConfig_CloudStorageOptions); ok {
-		return x.CloudStorageOptions
-	}
-	return nil
-}
-
-func (m *StorageConfig) GetBigQueryOptions() *BigQueryOptions {
-	if x, ok := m.GetType().(*StorageConfig_BigQueryOptions); ok {
-		return x.BigQueryOptions
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*StorageConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _StorageConfig_OneofMarshaler, _StorageConfig_OneofUnmarshaler, _StorageConfig_OneofSizer, []interface{}{
-		(*StorageConfig_DatastoreOptions)(nil),
-		(*StorageConfig_CloudStorageOptions)(nil),
-		(*StorageConfig_BigQueryOptions)(nil),
-	}
-}
-
-func _StorageConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*StorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *StorageConfig_DatastoreOptions:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatastoreOptions); err != nil {
-			return err
-		}
-	case *StorageConfig_CloudStorageOptions:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudStorageOptions); err != nil {
-			return err
-		}
-	case *StorageConfig_BigQueryOptions:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.BigQueryOptions); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("StorageConfig.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _StorageConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*StorageConfig)
-	switch tag {
-	case 2: // type.datastore_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatastoreOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_DatastoreOptions{msg}
-		return true, err
-	case 3: // type.cloud_storage_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudStorageOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_CloudStorageOptions{msg}
-		return true, err
-	case 4: // type.big_query_options
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(BigQueryOptions)
-		err := b.DecodeMessage(msg)
-		m.Type = &StorageConfig_BigQueryOptions{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _StorageConfig_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*StorageConfig)
-	// type
-	switch x := m.Type.(type) {
-	case *StorageConfig_DatastoreOptions:
-		s := proto.Size(x.DatastoreOptions)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StorageConfig_CloudStorageOptions:
-		s := proto.Size(x.CloudStorageOptions)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *StorageConfig_BigQueryOptions:
-		s := proto.Size(x.BigQueryOptions)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Record key for a finding in a Cloud Storage file.
-type CloudStorageKey struct {
-	// Path to the file.
-	FilePath string `protobuf:"bytes,1,opt,name=file_path,json=filePath" json:"file_path,omitempty"`
-	// Byte offset of the referenced data in the file.
-	StartOffset int64 `protobuf:"varint,2,opt,name=start_offset,json=startOffset" json:"start_offset,omitempty"`
-}
-
-func (m *CloudStorageKey) Reset()                    { *m = CloudStorageKey{} }
-func (m *CloudStorageKey) String() string            { return proto.CompactTextString(m) }
-func (*CloudStorageKey) ProtoMessage()               {}
-func (*CloudStorageKey) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
-
-func (m *CloudStorageKey) GetFilePath() string {
-	if m != nil {
-		return m.FilePath
-	}
-	return ""
-}
-
-func (m *CloudStorageKey) GetStartOffset() int64 {
-	if m != nil {
-		return m.StartOffset
-	}
-	return 0
-}
-
-// Record key for a finding in Cloud Datastore.
-type DatastoreKey struct {
-	// Datastore entity key.
-	EntityKey *Key `protobuf:"bytes,1,opt,name=entity_key,json=entityKey" json:"entity_key,omitempty"`
-}
-
-func (m *DatastoreKey) Reset()                    { *m = DatastoreKey{} }
-func (m *DatastoreKey) String() string            { return proto.CompactTextString(m) }
-func (*DatastoreKey) ProtoMessage()               {}
-func (*DatastoreKey) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
-
-func (m *DatastoreKey) GetEntityKey() *Key {
-	if m != nil {
-		return m.EntityKey
-	}
-	return nil
-}
-
-// A unique identifier for a Datastore entity.
-// If a key's partition ID or any of its path kinds or names are
-// reserved/read-only, the key is reserved/read-only.
-// A reserved/read-only key is forbidden in certain documented contexts.
-type Key struct {
-	// Entities are partitioned into subsets, currently identified by a project
-	// ID and namespace ID.
-	// Queries are scoped to a single partition.
-	PartitionId *PartitionId `protobuf:"bytes,1,opt,name=partition_id,json=partitionId" json:"partition_id,omitempty"`
-	// The entity path.
-	// An entity path consists of one or more elements composed of a kind and a
-	// string or numerical identifier, which identify entities. The first
-	// element identifies a _root entity_, the second element identifies
-	// a _child_ of the root entity, the third element identifies a child of the
-	// second entity, and so forth. The entities identified by all prefixes of
-	// the path are called the element's _ancestors_.
-	//
-	// A path can never be empty, and a path can have at most 100 elements.
-	Path []*Key_PathElement `protobuf:"bytes,2,rep,name=path" json:"path,omitempty"`
-}
-
-func (m *Key) Reset()                    { *m = Key{} }
-func (m *Key) String() string            { return proto.CompactTextString(m) }
-func (*Key) ProtoMessage()               {}
-func (*Key) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
-
-func (m *Key) GetPartitionId() *PartitionId {
-	if m != nil {
-		return m.PartitionId
-	}
-	return nil
-}
-
-func (m *Key) GetPath() []*Key_PathElement {
-	if m != nil {
-		return m.Path
-	}
-	return nil
-}
-
-// A (kind, ID/name) pair used to construct a key path.
-//
-// If either name or ID is set, the element is complete.
-// If neither is set, the element is incomplete.
-type Key_PathElement struct {
-	// The kind of the entity.
-	// A kind matching regex `__.*__` is reserved/read-only.
-	// A kind must not contain more than 1500 bytes when UTF-8 encoded.
-	// Cannot be `""`.
-	Kind string `protobuf:"bytes,1,opt,name=kind" json:"kind,omitempty"`
-	// The type of ID.
-	//
-	// Types that are valid to be assigned to IdType:
-	//	*Key_PathElement_Id
-	//	*Key_PathElement_Name
-	IdType isKey_PathElement_IdType `protobuf_oneof:"id_type"`
-}
-
-func (m *Key_PathElement) Reset()                    { *m = Key_PathElement{} }
-func (m *Key_PathElement) String() string            { return proto.CompactTextString(m) }
-func (*Key_PathElement) ProtoMessage()               {}
-func (*Key_PathElement) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11, 0} }
-
-type isKey_PathElement_IdType interface {
-	isKey_PathElement_IdType()
-}
-
-type Key_PathElement_Id struct {
-	Id int64 `protobuf:"varint,2,opt,name=id,oneof"`
-}
-type Key_PathElement_Name struct {
-	Name string `protobuf:"bytes,3,opt,name=name,oneof"`
-}
-
-func (*Key_PathElement_Id) isKey_PathElement_IdType()   {}
-func (*Key_PathElement_Name) isKey_PathElement_IdType() {}
-
-func (m *Key_PathElement) GetIdType() isKey_PathElement_IdType {
-	if m != nil {
-		return m.IdType
-	}
-	return nil
-}
-
-func (m *Key_PathElement) GetKind() string {
-	if m != nil {
-		return m.Kind
-	}
-	return ""
-}
-
-func (m *Key_PathElement) GetId() int64 {
-	if x, ok := m.GetIdType().(*Key_PathElement_Id); ok {
-		return x.Id
-	}
-	return 0
-}
-
-func (m *Key_PathElement) GetName() string {
-	if x, ok := m.GetIdType().(*Key_PathElement_Name); ok {
-		return x.Name
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Key_PathElement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Key_PathElement_OneofMarshaler, _Key_PathElement_OneofUnmarshaler, _Key_PathElement_OneofSizer, []interface{}{
-		(*Key_PathElement_Id)(nil),
-		(*Key_PathElement_Name)(nil),
-	}
-}
-
-func _Key_PathElement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case nil:
-	default:
-		return fmt.Errorf("Key_PathElement.IdType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Key_PathElement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Key_PathElement)
-	switch tag {
-	case 2: // id_type.id
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.IdType = &Key_PathElement_Id{int64(x)}
-		return true, err
-	case 3: // id_type.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.IdType = &Key_PathElement_Name{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Key_PathElement_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Key_PathElement)
-	// id_type
-	switch x := m.IdType.(type) {
-	case *Key_PathElement_Id:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Id))
-	case *Key_PathElement_Name:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Message for a unique key indicating a record that contains a finding.
-type RecordKey struct {
-	// Types that are valid to be assigned to Type:
-	//	*RecordKey_CloudStorageKey
-	//	*RecordKey_DatastoreKey
-	Type isRecordKey_Type `protobuf_oneof:"type"`
-}
-
-func (m *RecordKey) Reset()                    { *m = RecordKey{} }
-func (m *RecordKey) String() string            { return proto.CompactTextString(m) }
-func (*RecordKey) ProtoMessage()               {}
-func (*RecordKey) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
-
-type isRecordKey_Type interface {
-	isRecordKey_Type()
-}
-
-type RecordKey_CloudStorageKey struct {
-	CloudStorageKey *CloudStorageKey `protobuf:"bytes,1,opt,name=cloud_storage_key,json=cloudStorageKey,oneof"`
-}
-type RecordKey_DatastoreKey struct {
-	DatastoreKey *DatastoreKey `protobuf:"bytes,2,opt,name=datastore_key,json=datastoreKey,oneof"`
-}
-
-func (*RecordKey_CloudStorageKey) isRecordKey_Type() {}
-func (*RecordKey_DatastoreKey) isRecordKey_Type()    {}
-
-func (m *RecordKey) GetType() isRecordKey_Type {
-	if m != nil {
-		return m.Type
-	}
-	return nil
-}
-
-func (m *RecordKey) GetCloudStorageKey() *CloudStorageKey {
-	if x, ok := m.GetType().(*RecordKey_CloudStorageKey); ok {
-		return x.CloudStorageKey
-	}
-	return nil
-}
-
-func (m *RecordKey) GetDatastoreKey() *DatastoreKey {
-	if x, ok := m.GetType().(*RecordKey_DatastoreKey); ok {
-		return x.DatastoreKey
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*RecordKey) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _RecordKey_OneofMarshaler, _RecordKey_OneofUnmarshaler, _RecordKey_OneofSizer, []interface{}{
-		(*RecordKey_CloudStorageKey)(nil),
-		(*RecordKey_DatastoreKey)(nil),
-	}
-}
-
-func _RecordKey_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*RecordKey)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordKey_CloudStorageKey:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.CloudStorageKey); err != nil {
-			return err
-		}
-	case *RecordKey_DatastoreKey:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.DatastoreKey); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("RecordKey.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _RecordKey_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*RecordKey)
-	switch tag {
-	case 1: // type.cloud_storage_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(CloudStorageKey)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordKey_CloudStorageKey{msg}
-		return true, err
-	case 2: // type.datastore_key
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(DatastoreKey)
-		err := b.DecodeMessage(msg)
-		m.Type = &RecordKey_DatastoreKey{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _RecordKey_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*RecordKey)
-	// type
-	switch x := m.Type.(type) {
-	case *RecordKey_CloudStorageKey:
-		s := proto.Size(x.CloudStorageKey)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *RecordKey_DatastoreKey:
-		s := proto.Size(x.DatastoreKey)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Message defining the location of a BigQuery table. A table is uniquely
-// identified  by its project_id, dataset_id, and table_name. Within a query
-// a table is often referenced with a string in the format of:
-// `<project_id>:<dataset_id>.<table_id>` or
-// `<project_id>.<dataset_id>.<table_id>`.
-type BigQueryTable struct {
-	// The Google Cloud Platform project ID of the project containing the table.
-	// If omitted, project ID is inferred from the API call.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
-	// Dataset ID of the table.
-	DatasetId string `protobuf:"bytes,2,opt,name=dataset_id,json=datasetId" json:"dataset_id,omitempty"`
-	// Name of the table.
-	TableId string `protobuf:"bytes,3,opt,name=table_id,json=tableId" json:"table_id,omitempty"`
-}
-
-func (m *BigQueryTable) Reset()                    { *m = BigQueryTable{} }
-func (m *BigQueryTable) String() string            { return proto.CompactTextString(m) }
-func (*BigQueryTable) ProtoMessage()               {}
-func (*BigQueryTable) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
-
-func (m *BigQueryTable) GetProjectId() string {
-	if m != nil {
-		return m.ProjectId
-	}
-	return ""
-}
-
-func (m *BigQueryTable) GetDatasetId() string {
-	if m != nil {
-		return m.DatasetId
-	}
-	return ""
-}
-
-func (m *BigQueryTable) GetTableId() string {
-	if m != nil {
-		return m.TableId
-	}
-	return ""
-}
-
-// An entity in a dataset is a field or set of fields that correspond to a
-// single person. For example, in medical records the `EntityId` might be
-// a patient identifier, or for financial records it might be an account
-// identifier. This message is used when generalizations or analysis must be
-// consistent across multiple rows pertaining to the same entity.
-type EntityId struct {
-	// Composite key indicating which field contains the entity identifier.
-	Field *FieldId `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-}
-
-func (m *EntityId) Reset()                    { *m = EntityId{} }
-func (m *EntityId) String() string            { return proto.CompactTextString(m) }
-func (*EntityId) ProtoMessage()               {}
-func (*EntityId) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{14} }
-
-func (m *EntityId) GetField() *FieldId {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*InfoType)(nil), "google.privacy.dlp.v2beta2.InfoType")
-	proto.RegisterType((*CustomInfoType)(nil), "google.privacy.dlp.v2beta2.CustomInfoType")
-	proto.RegisterType((*CustomInfoType_Dictionary)(nil), "google.privacy.dlp.v2beta2.CustomInfoType.Dictionary")
-	proto.RegisterType((*CustomInfoType_Dictionary_WordList)(nil), "google.privacy.dlp.v2beta2.CustomInfoType.Dictionary.WordList")
-	proto.RegisterType((*CustomInfoType_SurrogateType)(nil), "google.privacy.dlp.v2beta2.CustomInfoType.SurrogateType")
-	proto.RegisterType((*FieldId)(nil), "google.privacy.dlp.v2beta2.FieldId")
-	proto.RegisterType((*PartitionId)(nil), "google.privacy.dlp.v2beta2.PartitionId")
-	proto.RegisterType((*KindExpression)(nil), "google.privacy.dlp.v2beta2.KindExpression")
-	proto.RegisterType((*DatastoreOptions)(nil), "google.privacy.dlp.v2beta2.DatastoreOptions")
-	proto.RegisterType((*CloudStorageOptions)(nil), "google.privacy.dlp.v2beta2.CloudStorageOptions")
-	proto.RegisterType((*CloudStorageOptions_FileSet)(nil), "google.privacy.dlp.v2beta2.CloudStorageOptions.FileSet")
-	proto.RegisterType((*BigQueryOptions)(nil), "google.privacy.dlp.v2beta2.BigQueryOptions")
-	proto.RegisterType((*StorageConfig)(nil), "google.privacy.dlp.v2beta2.StorageConfig")
-	proto.RegisterType((*CloudStorageKey)(nil), "google.privacy.dlp.v2beta2.CloudStorageKey")
-	proto.RegisterType((*DatastoreKey)(nil), "google.privacy.dlp.v2beta2.DatastoreKey")
-	proto.RegisterType((*Key)(nil), "google.privacy.dlp.v2beta2.Key")
-	proto.RegisterType((*Key_PathElement)(nil), "google.privacy.dlp.v2beta2.Key.PathElement")
-	proto.RegisterType((*RecordKey)(nil), "google.privacy.dlp.v2beta2.RecordKey")
-	proto.RegisterType((*BigQueryTable)(nil), "google.privacy.dlp.v2beta2.BigQueryTable")
-	proto.RegisterType((*EntityId)(nil), "google.privacy.dlp.v2beta2.EntityId")
-	proto.RegisterEnum("google.privacy.dlp.v2beta2.Likelihood", Likelihood_name, Likelihood_value)
-}
-
-func init() { proto.RegisterFile("google/privacy/dlp/v2beta2/storage.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 1100 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x6e, 0xe3, 0xc4,
-	0x17, 0x8e, 0x93, 0xb4, 0x4d, 0x4e, 0x9a, 0x26, 0x9d, 0xdd, 0xdf, 0x4f, 0x25, 0x4b, 0x77, 0x4b,
-	0x58, 0x89, 0xb2, 0x45, 0x8e, 0x54, 0x84, 0x00, 0x21, 0x8a, 0x48, 0x93, 0x12, 0xd3, 0xaa, 0xe9,
-	0x4e, 0xba, 0x5d, 0x15, 0x8a, 0x2c, 0x27, 0x33, 0x71, 0x87, 0x3a, 0x1e, 0x63, 0x4f, 0x76, 0xc9,
-	0x0b, 0xf0, 0x0a, 0xdc, 0x71, 0xc3, 0x1d, 0x0f, 0x80, 0xc4, 0x15, 0x12, 0x97, 0x3c, 0x09, 0x8f,
-	0x81, 0xe6, 0x8f, 0xd3, 0xa4, 0x94, 0xd0, 0x45, 0xdc, 0xcd, 0x9c, 0x39, 0xe7, 0x9b, 0x6f, 0xce,
-	0xf9, 0xce, 0xb1, 0x61, 0xdb, 0xe7, 0xdc, 0x0f, 0x68, 0x23, 0x8a, 0xd9, 0x0b, 0x6f, 0x30, 0x69,
-	0x90, 0x20, 0x6a, 0xbc, 0xd8, 0xed, 0x53, 0xe1, 0xed, 0x36, 0x12, 0xc1, 0x63, 0xcf, 0xa7, 0x76,
-	0x14, 0x73, 0xc1, 0x51, 0x4d, 0x7b, 0xda, 0xc6, 0xd3, 0x26, 0x41, 0x64, 0x1b, 0xcf, 0xda, 0xeb,
-	0x06, 0xc5, 0x8b, 0x58, 0xc3, 0x0b, 0x43, 0x2e, 0x3c, 0xc1, 0x78, 0x98, 0xe8, 0xc8, 0xda, 0xa3,
-	0xe9, 0x1d, 0x5c, 0xf0, 0xfe, 0x78, 0xd8, 0x10, 0x6c, 0x44, 0x13, 0xe1, 0x8d, 0x22, 0xed, 0x50,
-	0x7f, 0x08, 0x05, 0x27, 0x1c, 0xf2, 0xd3, 0x49, 0x44, 0x11, 0x82, 0x7c, 0xe8, 0x8d, 0xe8, 0x86,
-	0xb5, 0x65, 0x6d, 0x17, 0xb1, 0x5a, 0xd7, 0x7f, 0xcb, 0xc1, 0xda, 0xfe, 0x38, 0x11, 0x7c, 0x34,
-	0x75, 0xfb, 0x14, 0x8a, 0x2c, 0x1c, 0x72, 0x57, 0x4c, 0x22, 0xed, 0x5b, 0xda, 0x7d, 0x6c, 0xff,
-	0x3d, 0x43, 0x3b, 0x0d, 0xc4, 0x05, 0x96, 0x42, 0x3c, 0x07, 0x20, 0x6c, 0x20, 0x89, 0x7a, 0xf1,
-	0x64, 0x23, 0xab, 0x30, 0xde, 0x5b, 0x84, 0x31, 0x4f, 0xc1, 0x6e, 0x4d, 0x83, 0x3b, 0x19, 0x3c,
-	0x03, 0x85, 0x3c, 0x58, 0x4b, 0xc6, 0x71, 0xcc, 0x7d, 0x4f, 0x50, 0x4d, 0x30, 0xaf, 0xc0, 0x3f,
-	0x78, 0x05, 0xf0, 0x5e, 0x0a, 0x20, 0x77, 0x9d, 0x0c, 0x2e, 0x27, 0xb3, 0x86, 0xda, 0xf7, 0x16,
-	0xc0, 0xf5, 0xfd, 0xe8, 0x2b, 0x28, 0xbe, 0xe4, 0x31, 0x71, 0x03, 0x96, 0x08, 0x93, 0x8d, 0xbd,
-	0x7f, 0xf5, 0x12, 0xfb, 0x39, 0x8f, 0xc9, 0x11, 0x4b, 0x44, 0x27, 0x83, 0x0b, 0x2f, 0xcd, 0xba,
-	0xb6, 0x05, 0x85, 0xd4, 0x8e, 0xee, 0xc3, 0x92, 0xb4, 0x27, 0x1b, 0xd6, 0x56, 0x6e, 0xbb, 0x88,
-	0xf5, 0xa6, 0x59, 0x80, 0xe5, 0x84, 0x8f, 0xe3, 0x01, 0xad, 0x55, 0xa0, 0x3c, 0xc7, 0xbd, 0xb9,
-	0x0c, 0x79, 0x99, 0x83, 0xfa, 0x26, 0xac, 0x1c, 0x30, 0x1a, 0x10, 0x87, 0xdc, 0x5a, 0xe3, 0x2e,
-	0x94, 0x4e, 0xbc, 0x58, 0x30, 0x49, 0xc4, 0x21, 0x68, 0x13, 0x20, 0x8a, 0xf9, 0xd7, 0x74, 0x20,
-	0x5c, 0x46, 0x54, 0x71, 0x8a, 0xb8, 0x68, 0x2c, 0x0e, 0x41, 0x6f, 0xc0, 0xaa, 0x8c, 0x4a, 0x22,
-	0x6f, 0x40, 0xa5, 0x43, 0x5e, 0x39, 0x94, 0xa6, 0x36, 0x87, 0xd4, 0x1f, 0xc3, 0xda, 0x21, 0x0b,
-	0x49, 0xfb, 0xdb, 0x28, 0xa6, 0x49, 0xc2, 0x78, 0x78, 0xeb, 0xb5, 0x3f, 0x58, 0x50, 0x6d, 0x79,
-	0xc2, 0x93, 0x5a, 0xa7, 0xdd, 0x48, 0xc9, 0x16, 0x7d, 0x0e, 0xab, 0x51, 0xca, 0x45, 0xa2, 0xeb,
-	0x8c, 0xbe, 0xb5, 0x28, 0xa3, 0x33, 0xdc, 0x71, 0x29, 0x9a, 0x79, 0xc8, 0x1e, 0xe4, 0xaf, 0x58,
-	0x48, 0x8c, 0xbe, 0x9e, 0x2c, 0xc2, 0x98, 0xa7, 0x8b, 0x55, 0x5c, 0xfd, 0x3b, 0x0b, 0xee, 0xed,
-	0x07, 0x7c, 0x4c, 0x7a, 0xba, 0x1b, 0x53, 0x8e, 0x18, 0x0a, 0x43, 0x16, 0x50, 0x37, 0xa1, 0x69,
-	0xc5, 0xdf, 0x5f, 0x58, 0xf1, 0xbf, 0x42, 0xd8, 0x07, 0x2c, 0xa0, 0x3d, 0x2a, 0xf0, 0xca, 0x50,
-	0x2f, 0x6a, 0x0f, 0x64, 0x89, 0xd4, 0x12, 0x55, 0x21, 0x37, 0x8e, 0x03, 0x93, 0x2a, 0xb9, 0xac,
-	0xff, 0x62, 0x41, 0xa5, 0xc9, 0xfc, 0xa7, 0x63, 0x1a, 0x4f, 0xae, 0x49, 0x54, 0x84, 0xd7, 0x0f,
-	0xa8, 0x1b, 0xd3, 0x21, 0x8d, 0x69, 0x38, 0x48, 0x7b, 0xf1, 0xed, 0x45, 0x5c, 0x52, 0x94, 0x53,
-	0x19, 0x8a, 0xd7, 0x14, 0x02, 0x4e, 0x01, 0x10, 0x06, 0xc4, 0x08, 0x0d, 0x05, 0x1b, 0x4e, 0x58,
-	0xe8, 0xbb, 0x43, 0xa9, 0x99, 0x64, 0x23, 0xbb, 0x95, 0xdb, 0x2e, 0xed, 0xbe, 0xb9, 0x08, 0xd6,
-	0xa8, 0x0b, 0xaf, 0xcf, 0x84, 0x2b, 0x5b, 0x52, 0xff, 0x39, 0x0b, 0x65, 0xf3, 0xf8, 0x7d, 0x1e,
-	0x0e, 0x99, 0x8f, 0xbe, 0x84, 0x75, 0x92, 0x96, 0xdd, 0xe5, 0xfa, 0x39, 0xa6, 0x46, 0xef, 0x2c,
-	0xba, 0xe4, 0xa6, 0x56, 0x3a, 0x19, 0x5c, 0x25, 0x37, 0xf5, 0x43, 0xe1, 0x7f, 0x03, 0x99, 0x6f,
-	0xd7, 0x4c, 0xd0, 0xe9, 0x05, 0x39, 0x75, 0x41, 0xe3, 0x15, 0x0b, 0xd5, 0xc9, 0xe0, 0x7b, 0x83,
-	0x5b, 0x24, 0x70, 0x0e, 0xeb, 0x7d, 0xe6, 0xbb, 0xdf, 0xc8, 0x5c, 0x4e, 0xaf, 0xd0, 0xa3, 0x66,
-	0xe7, 0x2e, 0xf9, 0xbf, 0x86, 0xaf, 0xf4, 0xe7, 0x4d, 0xd3, 0xa6, 0x7d, 0x0a, 0x95, 0x59, 0x42,
-	0x87, 0x74, 0x82, 0x1e, 0x40, 0x51, 0x09, 0x2f, 0xf2, 0xc4, 0xa5, 0xd1, 0x87, 0x52, 0xe2, 0x89,
-	0x27, 0x2e, 0x65, 0x5f, 0x26, 0xc2, 0x8b, 0x85, 0xcb, 0x87, 0x43, 0xa9, 0x4c, 0x99, 0xd1, 0x1c,
-	0x2e, 0x29, 0x5b, 0x57, 0x99, 0xea, 0xc7, 0xb0, 0x3a, 0x4d, 0xa2, 0xc4, 0xdb, 0x03, 0x90, 0xe5,
-	0x12, 0x13, 0xf7, 0x8a, 0x4e, 0x8c, 0x7c, 0x1e, 0x2d, 0x6c, 0x13, 0x3a, 0xc1, 0x45, 0x1d, 0x72,
-	0x48, 0x27, 0xf5, 0x3f, 0x2c, 0xc8, 0x49, 0x9c, 0xff, 0xb2, 0x69, 0x3f, 0x81, 0xbc, 0x7a, 0x9e,
-	0x56, 0xdd, 0xce, 0x3f, 0xb0, 0xb1, 0xe5, 0xd3, 0xdb, 0x01, 0x1d, 0xd1, 0x50, 0x60, 0x15, 0x58,
-	0x3b, 0x95, 0xd3, 0x6c, 0x6a, 0x94, 0x93, 0x47, 0x0d, 0x01, 0x33, 0x79, 0xe4, 0x1a, 0x55, 0x21,
-	0x6b, 0x26, 0x5b, 0xae, 0x93, 0xc1, 0x59, 0x46, 0xd0, 0x7d, 0x33, 0x9f, 0xa4, 0x4a, 0x8a, 0x9d,
-	0x8c, 0x9e, 0x50, 0xcd, 0x22, 0xac, 0x30, 0xa2, 0x3e, 0x23, 0xf5, 0x5f, 0x2d, 0x28, 0x62, 0x3a,
-	0xe0, 0x31, 0x91, 0x0f, 0x3e, 0x87, 0xf5, 0x79, 0x95, 0x5d, 0xe7, 0x6f, 0xe7, 0xae, 0x0a, 0x3b,
-	0xa4, 0xf2, 0xe3, 0x55, 0x19, 0xdc, 0xa8, 0x71, 0x17, 0xca, 0xd7, 0xdd, 0x21, 0x61, 0x75, 0x67,
-	0x6c, 0xdf, 0xa9, 0x33, 0x34, 0xe6, 0x2a, 0x99, 0xd9, 0x4f, 0xf5, 0x74, 0x09, 0xe5, 0xb9, 0xee,
-	0xbf, 0x31, 0xe7, 0xad, 0x9b, 0x73, 0x7e, 0x13, 0x40, 0xe1, 0xd0, 0xd9, 0xcf, 0x80, 0xb1, 0x38,
-	0x04, 0xbd, 0x06, 0x05, 0x3d, 0x7f, 0x18, 0xd1, 0x59, 0xc3, 0x2b, 0x6a, 0xef, 0x90, 0x7a, 0x1b,
-	0x0a, 0x6d, 0xa5, 0x11, 0x87, 0xa0, 0x0f, 0x61, 0x49, 0x8d, 0x11, 0x93, 0x9d, 0x3b, 0x4d, 0x11,
-	0x1d, 0xf1, 0x44, 0x00, 0x1c, 0xb1, 0x2b, 0x1a, 0xb0, 0x4b, 0xce, 0x09, 0xaa, 0xc1, 0xff, 0x8f,
-	0x9c, 0xc3, 0xf6, 0x91, 0xd3, 0xe9, 0x76, 0x5b, 0xee, 0xb3, 0xe3, 0xde, 0x49, 0x7b, 0xdf, 0x39,
-	0x70, 0xda, 0xad, 0x6a, 0x06, 0xad, 0x43, 0xf9, 0xac, 0x8d, 0xcf, 0xdd, 0x67, 0xc7, 0xca, 0xe5,
-	0xbc, 0x6a, 0xa1, 0x55, 0x28, 0x4c, 0x77, 0x59, 0xb9, 0x3b, 0xe9, 0xf6, 0x7a, 0x4e, 0xf3, 0xa8,
-	0x5d, 0xcd, 0x21, 0x80, 0x65, 0x73, 0x92, 0x47, 0x15, 0x28, 0xa9, 0x50, 0x63, 0x58, 0x6a, 0xfe,
-	0x68, 0xc1, 0xc3, 0x01, 0x1f, 0x2d, 0xe0, 0xd9, 0x84, 0x56, 0x10, 0x99, 0x8a, 0x9d, 0x58, 0x5f,
-	0x7c, 0x6c, 0x3c, 0x7d, 0x1e, 0x78, 0xa1, 0x6f, 0xf3, 0xd8, 0x6f, 0xf8, 0x34, 0x54, 0x7f, 0x57,
-	0x0d, 0x7d, 0xe4, 0x45, 0x2c, 0xb9, 0xed, 0x2f, 0xef, 0x23, 0x12, 0x44, 0x3f, 0x65, 0x37, 0x3e,
-	0xd3, 0xf1, 0x4a, 0x1b, 0x76, 0x2b, 0x88, 0xec, 0xb3, 0xdd, 0xa6, 0x3c, 0xfe, 0x3d, 0x3d, 0xba,
-	0x50, 0x47, 0x17, 0xad, 0x20, 0xba, 0x38, 0xd3, 0x91, 0xfd, 0x65, 0x85, 0xff, 0xee, 0x9f, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x8f, 0x4f, 0x2f, 0x44, 0x44, 0x0a, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/pubsub/v1/pubsub.pb.go b/vendor/google.golang.org/genproto/googleapis/pubsub/v1/pubsub.pb.go
index 0689b3c0..0cbd2272 100644
--- a/vendor/google.golang.org/genproto/googleapis/pubsub/v1/pubsub.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/pubsub/v1/pubsub.pb.go
@@ -1,58 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/pubsub/v1/pubsub.proto
 
-/*
-Package pubsub is a generated protocol buffer package.
-
-It is generated from these files:
-	google/pubsub/v1/pubsub.proto
-
-It has these top-level messages:
-	Topic
-	PubsubMessage
-	GetTopicRequest
-	UpdateTopicRequest
-	PublishRequest
-	PublishResponse
-	ListTopicsRequest
-	ListTopicsResponse
-	ListTopicSubscriptionsRequest
-	ListTopicSubscriptionsResponse
-	DeleteTopicRequest
-	Subscription
-	PushConfig
-	ReceivedMessage
-	GetSubscriptionRequest
-	UpdateSubscriptionRequest
-	ListSubscriptionsRequest
-	ListSubscriptionsResponse
-	DeleteSubscriptionRequest
-	ModifyPushConfigRequest
-	PullRequest
-	PullResponse
-	ModifyAckDeadlineRequest
-	AcknowledgeRequest
-	StreamingPullRequest
-	StreamingPullResponse
-	CreateSnapshotRequest
-	UpdateSnapshotRequest
-	Snapshot
-	ListSnapshotsRequest
-	ListSnapshotsResponse
-	DeleteSnapshotRequest
-	SeekRequest
-	SeekResponse
-*/
-package pubsub
+package pubsub // import "google.golang.org/genproto/googleapis/pubsub/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -70,6 +28,50 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
+type MessageStoragePolicy struct {
+	// The list of GCP regions where messages that are published to the topic may
+	// be persisted in storage. Messages published by publishers running in
+	// non-allowed GCP regions (or running outside of GCP altogether) will be
+	// routed for storage in one of the allowed regions. An empty list indicates a
+	// misconfiguration at the project or organization level, which will result in
+	// all Publish operations failing.
+	AllowedPersistenceRegions []string `protobuf:"bytes,1,rep,name=allowed_persistence_regions,json=allowedPersistenceRegions,proto3" json:"allowed_persistence_regions,omitempty"`
+	XXX_NoUnkeyedLiteral      struct{} `json:"-"`
+	XXX_unrecognized          []byte   `json:"-"`
+	XXX_sizecache             int32    `json:"-"`
+}
+
+func (m *MessageStoragePolicy) Reset()         { *m = MessageStoragePolicy{} }
+func (m *MessageStoragePolicy) String() string { return proto.CompactTextString(m) }
+func (*MessageStoragePolicy) ProtoMessage()    {}
+func (*MessageStoragePolicy) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{0}
+}
+func (m *MessageStoragePolicy) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MessageStoragePolicy.Unmarshal(m, b)
+}
+func (m *MessageStoragePolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MessageStoragePolicy.Marshal(b, m, deterministic)
+}
+func (dst *MessageStoragePolicy) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MessageStoragePolicy.Merge(dst, src)
+}
+func (m *MessageStoragePolicy) XXX_Size() int {
+	return xxx_messageInfo_MessageStoragePolicy.Size(m)
+}
+func (m *MessageStoragePolicy) XXX_DiscardUnknown() {
+	xxx_messageInfo_MessageStoragePolicy.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MessageStoragePolicy proto.InternalMessageInfo
+
+func (m *MessageStoragePolicy) GetAllowedPersistenceRegions() []string {
+	if m != nil {
+		return m.AllowedPersistenceRegions
+	}
+	return nil
+}
+
 // A topic resource.
 type Topic struct {
 	// The name of the topic. It must have the format
@@ -78,15 +80,44 @@ type Topic struct {
 	// underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent
 	// signs (`%`). It must be between 3 and 255 characters in length, and it
 	// must not start with `"goog"`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// User labels.
-	Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Policy constraining how messages published to the topic may be stored. It
+	// is determined when the topic is created based on the policy configured at
+	// the project level. It must not be set by the caller in the request to
+	// CreateTopic or to UpdateTopic. This field will be populated in the
+	// responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the
+	// response, then no constraints are in effect.
+	MessageStoragePolicy *MessageStoragePolicy `protobuf:"bytes,3,opt,name=message_storage_policy,json=messageStoragePolicy,proto3" json:"message_storage_policy,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *Topic) Reset()         { *m = Topic{} }
+func (m *Topic) String() string { return proto.CompactTextString(m) }
+func (*Topic) ProtoMessage()    {}
+func (*Topic) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{1}
+}
+func (m *Topic) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Topic.Unmarshal(m, b)
+}
+func (m *Topic) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Topic.Marshal(b, m, deterministic)
+}
+func (dst *Topic) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Topic.Merge(dst, src)
+}
+func (m *Topic) XXX_Size() int {
+	return xxx_messageInfo_Topic.Size(m)
+}
+func (m *Topic) XXX_DiscardUnknown() {
+	xxx_messageInfo_Topic.DiscardUnknown(m)
 }
 
-func (m *Topic) Reset()                    { *m = Topic{} }
-func (m *Topic) String() string            { return proto.CompactTextString(m) }
-func (*Topic) ProtoMessage()               {}
-func (*Topic) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Topic proto.InternalMessageInfo
 
 func (m *Topic) GetName() string {
 	if m != nil {
@@ -102,28 +133,57 @@ func (m *Topic) GetLabels() map[string]string {
 	return nil
 }
 
+func (m *Topic) GetMessageStoragePolicy() *MessageStoragePolicy {
+	if m != nil {
+		return m.MessageStoragePolicy
+	}
+	return nil
+}
+
 // A message data and its attributes. The message payload must not be empty;
 // it must contain either a non-empty data field, or at least one attribute.
 type PubsubMessage struct {
 	// The message payload.
 	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
 	// Optional attributes for this message.
-	Attributes map[string]string `protobuf:"bytes,2,rep,name=attributes" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Attributes map[string]string `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// ID of this message, assigned by the server when the message is published.
 	// Guaranteed to be unique within the topic. This value may be read by a
 	// subscriber that receives a `PubsubMessage` via a `Pull` call or a push
 	// delivery. It must not be populated by the publisher in a `Publish` call.
-	MessageId string `protobuf:"bytes,3,opt,name=message_id,json=messageId" json:"message_id,omitempty"`
+	MessageId string `protobuf:"bytes,3,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"`
 	// The time at which the message was published, populated by the server when
 	// it receives the `Publish` call. It must not be populated by the
 	// publisher in a `Publish` call.
-	PublishTime *google_protobuf4.Timestamp `protobuf:"bytes,4,opt,name=publish_time,json=publishTime" json:"publish_time,omitempty"`
+	PublishTime          *timestamp.Timestamp `protobuf:"bytes,4,opt,name=publish_time,json=publishTime,proto3" json:"publish_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *PubsubMessage) Reset()         { *m = PubsubMessage{} }
+func (m *PubsubMessage) String() string { return proto.CompactTextString(m) }
+func (*PubsubMessage) ProtoMessage()    {}
+func (*PubsubMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{2}
+}
+func (m *PubsubMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PubsubMessage.Unmarshal(m, b)
+}
+func (m *PubsubMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PubsubMessage.Marshal(b, m, deterministic)
+}
+func (dst *PubsubMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PubsubMessage.Merge(dst, src)
+}
+func (m *PubsubMessage) XXX_Size() int {
+	return xxx_messageInfo_PubsubMessage.Size(m)
+}
+func (m *PubsubMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_PubsubMessage.DiscardUnknown(m)
 }
 
-func (m *PubsubMessage) Reset()                    { *m = PubsubMessage{} }
-func (m *PubsubMessage) String() string            { return proto.CompactTextString(m) }
-func (*PubsubMessage) ProtoMessage()               {}
-func (*PubsubMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_PubsubMessage proto.InternalMessageInfo
 
 func (m *PubsubMessage) GetData() []byte {
 	if m != nil {
@@ -146,7 +206,7 @@ func (m *PubsubMessage) GetMessageId() string {
 	return ""
 }
 
-func (m *PubsubMessage) GetPublishTime() *google_protobuf4.Timestamp {
+func (m *PubsubMessage) GetPublishTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.PublishTime
 	}
@@ -157,13 +217,35 @@ func (m *PubsubMessage) GetPublishTime() *google_protobuf4.Timestamp {
 type GetTopicRequest struct {
 	// The name of the topic to get.
 	// Format is `projects/{project}/topics/{topic}`.
-	Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
+	Topic                string   `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTopicRequest) Reset()         { *m = GetTopicRequest{} }
+func (m *GetTopicRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTopicRequest) ProtoMessage()    {}
+func (*GetTopicRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{3}
+}
+func (m *GetTopicRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTopicRequest.Unmarshal(m, b)
+}
+func (m *GetTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTopicRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTopicRequest.Merge(dst, src)
+}
+func (m *GetTopicRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTopicRequest.Size(m)
+}
+func (m *GetTopicRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTopicRequest.DiscardUnknown(m)
 }
 
-func (m *GetTopicRequest) Reset()                    { *m = GetTopicRequest{} }
-func (m *GetTopicRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTopicRequest) ProtoMessage()               {}
-func (*GetTopicRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_GetTopicRequest proto.InternalMessageInfo
 
 func (m *GetTopicRequest) GetTopic() string {
 	if m != nil {
@@ -174,17 +256,42 @@ func (m *GetTopicRequest) GetTopic() string {
 
 // Request for the UpdateTopic method.
 type UpdateTopicRequest struct {
-	// The topic to update.
-	Topic *Topic `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
-	// Indicates which fields in the provided topic to update.
-	// Must be specified and non-empty.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	// The updated topic object.
+	Topic *Topic `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
+	// Indicates which fields in the provided topic to update. Must be specified
+	// and non-empty. Note that if `update_mask` contains
+	// "message_storage_policy" then the new value will be determined based on the
+	// policy configured at the project or organization level. The
+	// `message_storage_policy` must not be set in the `topic` provided above.
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateTopicRequest) Reset()         { *m = UpdateTopicRequest{} }
+func (m *UpdateTopicRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateTopicRequest) ProtoMessage()    {}
+func (*UpdateTopicRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{4}
+}
+func (m *UpdateTopicRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateTopicRequest.Unmarshal(m, b)
+}
+func (m *UpdateTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateTopicRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTopicRequest.Merge(dst, src)
+}
+func (m *UpdateTopicRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateTopicRequest.Size(m)
+}
+func (m *UpdateTopicRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateTopicRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateTopicRequest) Reset()                    { *m = UpdateTopicRequest{} }
-func (m *UpdateTopicRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateTopicRequest) ProtoMessage()               {}
-func (*UpdateTopicRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_UpdateTopicRequest proto.InternalMessageInfo
 
 func (m *UpdateTopicRequest) GetTopic() *Topic {
 	if m != nil {
@@ -193,7 +300,7 @@ func (m *UpdateTopicRequest) GetTopic() *Topic {
 	return nil
 }
 
-func (m *UpdateTopicRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateTopicRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -204,15 +311,37 @@ func (m *UpdateTopicRequest) GetUpdateMask() *google_protobuf3.FieldMask {
 type PublishRequest struct {
 	// The messages in the request will be published on this topic.
 	// Format is `projects/{project}/topics/{topic}`.
-	Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
+	Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
 	// The messages to publish.
-	Messages []*PubsubMessage `protobuf:"bytes,2,rep,name=messages" json:"messages,omitempty"`
+	Messages             []*PubsubMessage `protobuf:"bytes,2,rep,name=messages,proto3" json:"messages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *PublishRequest) Reset()         { *m = PublishRequest{} }
+func (m *PublishRequest) String() string { return proto.CompactTextString(m) }
+func (*PublishRequest) ProtoMessage()    {}
+func (*PublishRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{5}
+}
+func (m *PublishRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublishRequest.Unmarshal(m, b)
+}
+func (m *PublishRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublishRequest.Marshal(b, m, deterministic)
+}
+func (dst *PublishRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishRequest.Merge(dst, src)
+}
+func (m *PublishRequest) XXX_Size() int {
+	return xxx_messageInfo_PublishRequest.Size(m)
+}
+func (m *PublishRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublishRequest.DiscardUnknown(m)
 }
 
-func (m *PublishRequest) Reset()                    { *m = PublishRequest{} }
-func (m *PublishRequest) String() string            { return proto.CompactTextString(m) }
-func (*PublishRequest) ProtoMessage()               {}
-func (*PublishRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_PublishRequest proto.InternalMessageInfo
 
 func (m *PublishRequest) GetTopic() string {
 	if m != nil {
@@ -233,13 +362,35 @@ type PublishResponse struct {
 	// The server-assigned ID of each published message, in the same order as
 	// the messages in the request. IDs are guaranteed to be unique within
 	// the topic.
-	MessageIds []string `protobuf:"bytes,1,rep,name=message_ids,json=messageIds" json:"message_ids,omitempty"`
+	MessageIds           []string `protobuf:"bytes,1,rep,name=message_ids,json=messageIds,proto3" json:"message_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PublishResponse) Reset()                    { *m = PublishResponse{} }
-func (m *PublishResponse) String() string            { return proto.CompactTextString(m) }
-func (*PublishResponse) ProtoMessage()               {}
-func (*PublishResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *PublishResponse) Reset()         { *m = PublishResponse{} }
+func (m *PublishResponse) String() string { return proto.CompactTextString(m) }
+func (*PublishResponse) ProtoMessage()    {}
+func (*PublishResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{6}
+}
+func (m *PublishResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublishResponse.Unmarshal(m, b)
+}
+func (m *PublishResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublishResponse.Marshal(b, m, deterministic)
+}
+func (dst *PublishResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishResponse.Merge(dst, src)
+}
+func (m *PublishResponse) XXX_Size() int {
+	return xxx_messageInfo_PublishResponse.Size(m)
+}
+func (m *PublishResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublishResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PublishResponse proto.InternalMessageInfo
 
 func (m *PublishResponse) GetMessageIds() []string {
 	if m != nil {
@@ -252,19 +403,41 @@ func (m *PublishResponse) GetMessageIds() []string {
 type ListTopicsRequest struct {
 	// The name of the cloud project that topics belong to.
 	// Format is `projects/{project}`.
-	Project string `protobuf:"bytes,1,opt,name=project" json:"project,omitempty"`
+	Project string `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"`
 	// Maximum number of topics to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last `ListTopicsResponse`; indicates that this is
 	// a continuation of a prior `ListTopics` call, and that the system should
 	// return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicsRequest) Reset()         { *m = ListTopicsRequest{} }
+func (m *ListTopicsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTopicsRequest) ProtoMessage()    {}
+func (*ListTopicsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{7}
+}
+func (m *ListTopicsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicsRequest.Unmarshal(m, b)
+}
+func (m *ListTopicsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicsRequest.Merge(dst, src)
+}
+func (m *ListTopicsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTopicsRequest.Size(m)
+}
+func (m *ListTopicsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicsRequest.DiscardUnknown(m)
 }
 
-func (m *ListTopicsRequest) Reset()                    { *m = ListTopicsRequest{} }
-func (m *ListTopicsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTopicsRequest) ProtoMessage()               {}
-func (*ListTopicsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ListTopicsRequest proto.InternalMessageInfo
 
 func (m *ListTopicsRequest) GetProject() string {
 	if m != nil {
@@ -290,16 +463,38 @@ func (m *ListTopicsRequest) GetPageToken() string {
 // Response for the `ListTopics` method.
 type ListTopicsResponse struct {
 	// The resulting topics.
-	Topics []*Topic `protobuf:"bytes,1,rep,name=topics" json:"topics,omitempty"`
+	Topics []*Topic `protobuf:"bytes,1,rep,name=topics,proto3" json:"topics,omitempty"`
 	// If not empty, indicates that there may be more topics that match the
 	// request; this value should be passed in a new `ListTopicsRequest`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicsResponse) Reset()         { *m = ListTopicsResponse{} }
+func (m *ListTopicsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTopicsResponse) ProtoMessage()    {}
+func (*ListTopicsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{8}
+}
+func (m *ListTopicsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicsResponse.Unmarshal(m, b)
+}
+func (m *ListTopicsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicsResponse.Merge(dst, src)
+}
+func (m *ListTopicsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTopicsResponse.Size(m)
+}
+func (m *ListTopicsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicsResponse.DiscardUnknown(m)
 }
 
-func (m *ListTopicsResponse) Reset()                    { *m = ListTopicsResponse{} }
-func (m *ListTopicsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTopicsResponse) ProtoMessage()               {}
-func (*ListTopicsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ListTopicsResponse proto.InternalMessageInfo
 
 func (m *ListTopicsResponse) GetTopics() []*Topic {
 	if m != nil {
@@ -319,19 +514,41 @@ func (m *ListTopicsResponse) GetNextPageToken() string {
 type ListTopicSubscriptionsRequest struct {
 	// The name of the topic that subscriptions are attached to.
 	// Format is `projects/{project}/topics/{topic}`.
-	Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
+	Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
 	// Maximum number of subscription names to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last `ListTopicSubscriptionsResponse`; indicates
 	// that this is a continuation of a prior `ListTopicSubscriptions` call, and
 	// that the system should return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicSubscriptionsRequest) Reset()         { *m = ListTopicSubscriptionsRequest{} }
+func (m *ListTopicSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTopicSubscriptionsRequest) ProtoMessage()    {}
+func (*ListTopicSubscriptionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{9}
+}
+func (m *ListTopicSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicSubscriptionsRequest.Unmarshal(m, b)
+}
+func (m *ListTopicSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicSubscriptionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSubscriptionsRequest.Merge(dst, src)
+}
+func (m *ListTopicSubscriptionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTopicSubscriptionsRequest.Size(m)
+}
+func (m *ListTopicSubscriptionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicSubscriptionsRequest.DiscardUnknown(m)
 }
 
-func (m *ListTopicSubscriptionsRequest) Reset()                    { *m = ListTopicSubscriptionsRequest{} }
-func (m *ListTopicSubscriptionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTopicSubscriptionsRequest) ProtoMessage()               {}
-func (*ListTopicSubscriptionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_ListTopicSubscriptionsRequest proto.InternalMessageInfo
 
 func (m *ListTopicSubscriptionsRequest) GetTopic() string {
 	if m != nil {
@@ -357,17 +574,39 @@ func (m *ListTopicSubscriptionsRequest) GetPageToken() string {
 // Response for the `ListTopicSubscriptions` method.
 type ListTopicSubscriptionsResponse struct {
 	// The names of the subscriptions that match the request.
-	Subscriptions []string `protobuf:"bytes,1,rep,name=subscriptions" json:"subscriptions,omitempty"`
+	Subscriptions []string `protobuf:"bytes,1,rep,name=subscriptions,proto3" json:"subscriptions,omitempty"`
 	// If not empty, indicates that there may be more subscriptions that match
 	// the request; this value should be passed in a new
 	// `ListTopicSubscriptionsRequest` to get more subscriptions.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicSubscriptionsResponse) Reset()         { *m = ListTopicSubscriptionsResponse{} }
+func (m *ListTopicSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTopicSubscriptionsResponse) ProtoMessage()    {}
+func (*ListTopicSubscriptionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{10}
+}
+func (m *ListTopicSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicSubscriptionsResponse.Unmarshal(m, b)
+}
+func (m *ListTopicSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicSubscriptionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSubscriptionsResponse.Merge(dst, src)
+}
+func (m *ListTopicSubscriptionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTopicSubscriptionsResponse.Size(m)
+}
+func (m *ListTopicSubscriptionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicSubscriptionsResponse.DiscardUnknown(m)
 }
 
-func (m *ListTopicSubscriptionsResponse) Reset()                    { *m = ListTopicSubscriptionsResponse{} }
-func (m *ListTopicSubscriptionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTopicSubscriptionsResponse) ProtoMessage()               {}
-func (*ListTopicSubscriptionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_ListTopicSubscriptionsResponse proto.InternalMessageInfo
 
 func (m *ListTopicSubscriptionsResponse) GetSubscriptions() []string {
 	if m != nil {
@@ -383,17 +622,157 @@ func (m *ListTopicSubscriptionsResponse) GetNextPageToken() string {
 	return ""
 }
 
+// Request for the `ListTopicSnapshots` method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
+type ListTopicSnapshotsRequest struct {
+	// The name of the topic that snapshots are attached to.
+	// Format is `projects/{project}/topics/{topic}`.
+	Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
+	// Maximum number of snapshot names to return.
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// The value returned by the last `ListTopicSnapshotsResponse`; indicates
+	// that this is a continuation of a prior `ListTopicSnapshots` call, and
+	// that the system should return the next page of data.
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicSnapshotsRequest) Reset()         { *m = ListTopicSnapshotsRequest{} }
+func (m *ListTopicSnapshotsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTopicSnapshotsRequest) ProtoMessage()    {}
+func (*ListTopicSnapshotsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{11}
+}
+func (m *ListTopicSnapshotsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicSnapshotsRequest.Unmarshal(m, b)
+}
+func (m *ListTopicSnapshotsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicSnapshotsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicSnapshotsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSnapshotsRequest.Merge(dst, src)
+}
+func (m *ListTopicSnapshotsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTopicSnapshotsRequest.Size(m)
+}
+func (m *ListTopicSnapshotsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicSnapshotsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTopicSnapshotsRequest proto.InternalMessageInfo
+
+func (m *ListTopicSnapshotsRequest) GetTopic() string {
+	if m != nil {
+		return m.Topic
+	}
+	return ""
+}
+
+func (m *ListTopicSnapshotsRequest) GetPageSize() int32 {
+	if m != nil {
+		return m.PageSize
+	}
+	return 0
+}
+
+func (m *ListTopicSnapshotsRequest) GetPageToken() string {
+	if m != nil {
+		return m.PageToken
+	}
+	return ""
+}
+
+// Response for the `ListTopicSnapshots` method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
+type ListTopicSnapshotsResponse struct {
+	// The names of the snapshots that match the request.
+	Snapshots []string `protobuf:"bytes,1,rep,name=snapshots,proto3" json:"snapshots,omitempty"`
+	// If not empty, indicates that there may be more snapshots that match
+	// the request; this value should be passed in a new
+	// `ListTopicSnapshotsRequest` to get more snapshots.
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicSnapshotsResponse) Reset()         { *m = ListTopicSnapshotsResponse{} }
+func (m *ListTopicSnapshotsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTopicSnapshotsResponse) ProtoMessage()    {}
+func (*ListTopicSnapshotsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{12}
+}
+func (m *ListTopicSnapshotsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicSnapshotsResponse.Unmarshal(m, b)
+}
+func (m *ListTopicSnapshotsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicSnapshotsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicSnapshotsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSnapshotsResponse.Merge(dst, src)
+}
+func (m *ListTopicSnapshotsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTopicSnapshotsResponse.Size(m)
+}
+func (m *ListTopicSnapshotsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicSnapshotsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTopicSnapshotsResponse proto.InternalMessageInfo
+
+func (m *ListTopicSnapshotsResponse) GetSnapshots() []string {
+	if m != nil {
+		return m.Snapshots
+	}
+	return nil
+}
+
+func (m *ListTopicSnapshotsResponse) GetNextPageToken() string {
+	if m != nil {
+		return m.NextPageToken
+	}
+	return ""
+}
+
 // Request for the `DeleteTopic` method.
 type DeleteTopicRequest struct {
 	// Name of the topic to delete.
 	// Format is `projects/{project}/topics/{topic}`.
-	Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
+	Topic                string   `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteTopicRequest) Reset()                    { *m = DeleteTopicRequest{} }
-func (m *DeleteTopicRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteTopicRequest) ProtoMessage()               {}
-func (*DeleteTopicRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *DeleteTopicRequest) Reset()         { *m = DeleteTopicRequest{} }
+func (m *DeleteTopicRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteTopicRequest) ProtoMessage()    {}
+func (*DeleteTopicRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{13}
+}
+func (m *DeleteTopicRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteTopicRequest.Unmarshal(m, b)
+}
+func (m *DeleteTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteTopicRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTopicRequest.Merge(dst, src)
+}
+func (m *DeleteTopicRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteTopicRequest.Size(m)
+}
+func (m *DeleteTopicRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteTopicRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteTopicRequest proto.InternalMessageInfo
 
 func (m *DeleteTopicRequest) GetTopic() string {
 	if m != nil {
@@ -410,16 +789,16 @@ type Subscription struct {
 	// (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`),
 	// plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters
 	// in length, and it must not start with `"goog"`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the topic from which this subscription is receiving messages.
 	// Format is `projects/{project}/topics/{topic}`.
 	// The value of this field will be `_deleted-topic_` if the topic has been
 	// deleted.
-	Topic string `protobuf:"bytes,2,opt,name=topic" json:"topic,omitempty"`
+	Topic string `protobuf:"bytes,2,opt,name=topic,proto3" json:"topic,omitempty"`
 	// If push delivery is used with this subscription, this field is
 	// used to configure it. An empty `pushConfig` signifies that the subscriber
 	// will pull and ack messages using API methods.
-	PushConfig *PushConfig `protobuf:"bytes,4,opt,name=push_config,json=pushConfig" json:"push_config,omitempty"`
+	PushConfig *PushConfig `protobuf:"bytes,4,opt,name=push_config,json=pushConfig,proto3" json:"push_config,omitempty"`
 	// This value is the maximum time after a subscriber receives a message
 	// before the subscriber should acknowledge the message. After message
 	// delivery but before the ack deadline expires and before the message is
@@ -429,7 +808,8 @@ type Subscription struct {
 	// For pull subscriptions, this value is used as the initial value for the ack
 	// deadline. To override this value for a given message, call
 	// `ModifyAckDeadline` with the corresponding `ack_id` if using
-	// pull.
+	// non-streaming pull or send the `ack_id` in a
+	// `StreamingModifyAckDeadlineRequest` if using streaming pull.
 	// The minimum custom deadline you can specify is 10 seconds.
 	// The maximum custom deadline you can specify is 600 seconds (10 minutes).
 	// If this parameter is 0, a default value of 10 seconds is used.
@@ -439,27 +819,55 @@ type Subscription struct {
 	//
 	// If the subscriber never acknowledges the message, the Pub/Sub
 	// system will eventually redeliver the message.
-	AckDeadlineSeconds int32 `protobuf:"varint,5,opt,name=ack_deadline_seconds,json=ackDeadlineSeconds" json:"ack_deadline_seconds,omitempty"`
+	AckDeadlineSeconds int32 `protobuf:"varint,5,opt,name=ack_deadline_seconds,json=ackDeadlineSeconds,proto3" json:"ack_deadline_seconds,omitempty"`
 	// Indicates whether to retain acknowledged messages. If true, then
 	// messages are not expunged from the subscription's backlog, even if they are
 	// acknowledged, until they fall out of the `message_retention_duration`
-	// window.
-	RetainAckedMessages bool `protobuf:"varint,7,opt,name=retain_acked_messages,json=retainAckedMessages" json:"retain_acked_messages,omitempty"`
+	// window.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	RetainAckedMessages bool `protobuf:"varint,7,opt,name=retain_acked_messages,json=retainAckedMessages,proto3" json:"retain_acked_messages,omitempty"`
 	// How long to retain unacknowledged messages in the subscription's backlog,
 	// from the moment a message is published.
 	// If `retain_acked_messages` is true, then this also configures the retention
 	// of acknowledged messages, and thus configures how far back in time a `Seek`
 	// can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10
-	// minutes.
-	MessageRetentionDuration *google_protobuf1.Duration `protobuf:"bytes,8,opt,name=message_retention_duration,json=messageRetentionDuration" json:"message_retention_duration,omitempty"`
+	// minutes.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	MessageRetentionDuration *duration.Duration `protobuf:"bytes,8,opt,name=message_retention_duration,json=messageRetentionDuration,proto3" json:"message_retention_duration,omitempty"`
 	// User labels.
-	Labels map[string]string `protobuf:"bytes,9,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,9,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Subscription) Reset()         { *m = Subscription{} }
+func (m *Subscription) String() string { return proto.CompactTextString(m) }
+func (*Subscription) ProtoMessage()    {}
+func (*Subscription) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{14}
+}
+func (m *Subscription) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Subscription.Unmarshal(m, b)
+}
+func (m *Subscription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Subscription.Marshal(b, m, deterministic)
+}
+func (dst *Subscription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Subscription.Merge(dst, src)
+}
+func (m *Subscription) XXX_Size() int {
+	return xxx_messageInfo_Subscription.Size(m)
+}
+func (m *Subscription) XXX_DiscardUnknown() {
+	xxx_messageInfo_Subscription.DiscardUnknown(m)
 }
 
-func (m *Subscription) Reset()                    { *m = Subscription{} }
-func (m *Subscription) String() string            { return proto.CompactTextString(m) }
-func (*Subscription) ProtoMessage()               {}
-func (*Subscription) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_Subscription proto.InternalMessageInfo
 
 func (m *Subscription) GetName() string {
 	if m != nil {
@@ -496,7 +904,7 @@ func (m *Subscription) GetRetainAckedMessages() bool {
 	return false
 }
 
-func (m *Subscription) GetMessageRetentionDuration() *google_protobuf1.Duration {
+func (m *Subscription) GetMessageRetentionDuration() *duration.Duration {
 	if m != nil {
 		return m.MessageRetentionDuration
 	}
@@ -514,7 +922,7 @@ func (m *Subscription) GetLabels() map[string]string {
 type PushConfig struct {
 	// A URL locating the endpoint to which messages should be pushed.
 	// For example, a Webhook endpoint might use "https://example.com/push".
-	PushEndpoint string `protobuf:"bytes,1,opt,name=push_endpoint,json=pushEndpoint" json:"push_endpoint,omitempty"`
+	PushEndpoint string `protobuf:"bytes,1,opt,name=push_endpoint,json=pushEndpoint,proto3" json:"push_endpoint,omitempty"`
 	// Endpoint configuration attributes.
 	//
 	// Every endpoint has a set of API supported attributes that can be used to
@@ -536,13 +944,35 @@ type PushConfig struct {
 	//
 	// * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API.
 	// * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API.
-	Attributes map[string]string `protobuf:"bytes,2,rep,name=attributes" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Attributes           map[string]string `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *PushConfig) Reset()         { *m = PushConfig{} }
+func (m *PushConfig) String() string { return proto.CompactTextString(m) }
+func (*PushConfig) ProtoMessage()    {}
+func (*PushConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{15}
+}
+func (m *PushConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PushConfig.Unmarshal(m, b)
+}
+func (m *PushConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PushConfig.Marshal(b, m, deterministic)
+}
+func (dst *PushConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PushConfig.Merge(dst, src)
+}
+func (m *PushConfig) XXX_Size() int {
+	return xxx_messageInfo_PushConfig.Size(m)
+}
+func (m *PushConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PushConfig.DiscardUnknown(m)
 }
 
-func (m *PushConfig) Reset()                    { *m = PushConfig{} }
-func (m *PushConfig) String() string            { return proto.CompactTextString(m) }
-func (*PushConfig) ProtoMessage()               {}
-func (*PushConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_PushConfig proto.InternalMessageInfo
 
 func (m *PushConfig) GetPushEndpoint() string {
 	if m != nil {
@@ -561,15 +991,37 @@ func (m *PushConfig) GetAttributes() map[string]string {
 // A message and its corresponding acknowledgment ID.
 type ReceivedMessage struct {
 	// This ID can be used to acknowledge the received message.
-	AckId string `protobuf:"bytes,1,opt,name=ack_id,json=ackId" json:"ack_id,omitempty"`
+	AckId string `protobuf:"bytes,1,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"`
 	// The message.
-	Message *PubsubMessage `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Message              *PubsubMessage `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *ReceivedMessage) Reset()         { *m = ReceivedMessage{} }
+func (m *ReceivedMessage) String() string { return proto.CompactTextString(m) }
+func (*ReceivedMessage) ProtoMessage()    {}
+func (*ReceivedMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{16}
+}
+func (m *ReceivedMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReceivedMessage.Unmarshal(m, b)
+}
+func (m *ReceivedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReceivedMessage.Marshal(b, m, deterministic)
+}
+func (dst *ReceivedMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceivedMessage.Merge(dst, src)
+}
+func (m *ReceivedMessage) XXX_Size() int {
+	return xxx_messageInfo_ReceivedMessage.Size(m)
+}
+func (m *ReceivedMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReceivedMessage.DiscardUnknown(m)
 }
 
-func (m *ReceivedMessage) Reset()                    { *m = ReceivedMessage{} }
-func (m *ReceivedMessage) String() string            { return proto.CompactTextString(m) }
-func (*ReceivedMessage) ProtoMessage()               {}
-func (*ReceivedMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_ReceivedMessage proto.InternalMessageInfo
 
 func (m *ReceivedMessage) GetAckId() string {
 	if m != nil {
@@ -589,13 +1041,35 @@ func (m *ReceivedMessage) GetMessage() *PubsubMessage {
 type GetSubscriptionRequest struct {
 	// The name of the subscription to get.
 	// Format is `projects/{project}/subscriptions/{sub}`.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription         string   `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSubscriptionRequest) Reset()         { *m = GetSubscriptionRequest{} }
+func (m *GetSubscriptionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSubscriptionRequest) ProtoMessage()    {}
+func (*GetSubscriptionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{17}
+}
+func (m *GetSubscriptionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSubscriptionRequest.Unmarshal(m, b)
+}
+func (m *GetSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSubscriptionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSubscriptionRequest.Merge(dst, src)
+}
+func (m *GetSubscriptionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSubscriptionRequest.Size(m)
+}
+func (m *GetSubscriptionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSubscriptionRequest.DiscardUnknown(m)
 }
 
-func (m *GetSubscriptionRequest) Reset()                    { *m = GetSubscriptionRequest{} }
-func (m *GetSubscriptionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSubscriptionRequest) ProtoMessage()               {}
-func (*GetSubscriptionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_GetSubscriptionRequest proto.InternalMessageInfo
 
 func (m *GetSubscriptionRequest) GetSubscription() string {
 	if m != nil {
@@ -607,16 +1081,38 @@ func (m *GetSubscriptionRequest) GetSubscription() string {
 // Request for the UpdateSubscription method.
 type UpdateSubscriptionRequest struct {
 	// The updated subscription object.
-	Subscription *Subscription `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription *Subscription `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// Indicates which fields in the provided subscription to update.
 	// Must be specified and non-empty.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateSubscriptionRequest) Reset()         { *m = UpdateSubscriptionRequest{} }
+func (m *UpdateSubscriptionRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateSubscriptionRequest) ProtoMessage()    {}
+func (*UpdateSubscriptionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{18}
+}
+func (m *UpdateSubscriptionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateSubscriptionRequest.Unmarshal(m, b)
+}
+func (m *UpdateSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateSubscriptionRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSubscriptionRequest.Merge(dst, src)
+}
+func (m *UpdateSubscriptionRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateSubscriptionRequest.Size(m)
+}
+func (m *UpdateSubscriptionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateSubscriptionRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateSubscriptionRequest) Reset()                    { *m = UpdateSubscriptionRequest{} }
-func (m *UpdateSubscriptionRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateSubscriptionRequest) ProtoMessage()               {}
-func (*UpdateSubscriptionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_UpdateSubscriptionRequest proto.InternalMessageInfo
 
 func (m *UpdateSubscriptionRequest) GetSubscription() *Subscription {
 	if m != nil {
@@ -625,7 +1121,7 @@ func (m *UpdateSubscriptionRequest) GetSubscription() *Subscription {
 	return nil
 }
 
-func (m *UpdateSubscriptionRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateSubscriptionRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -636,19 +1132,41 @@ func (m *UpdateSubscriptionRequest) GetUpdateMask() *google_protobuf3.FieldMask
 type ListSubscriptionsRequest struct {
 	// The name of the cloud project that subscriptions belong to.
 	// Format is `projects/{project}`.
-	Project string `protobuf:"bytes,1,opt,name=project" json:"project,omitempty"`
+	Project string `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"`
 	// Maximum number of subscriptions to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last `ListSubscriptionsResponse`; indicates that
 	// this is a continuation of a prior `ListSubscriptions` call, and that the
 	// system should return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSubscriptionsRequest) Reset()         { *m = ListSubscriptionsRequest{} }
+func (m *ListSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSubscriptionsRequest) ProtoMessage()    {}
+func (*ListSubscriptionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{19}
+}
+func (m *ListSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSubscriptionsRequest.Unmarshal(m, b)
+}
+func (m *ListSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSubscriptionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsRequest.Merge(dst, src)
+}
+func (m *ListSubscriptionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSubscriptionsRequest.Size(m)
+}
+func (m *ListSubscriptionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSubscriptionsRequest.DiscardUnknown(m)
 }
 
-func (m *ListSubscriptionsRequest) Reset()                    { *m = ListSubscriptionsRequest{} }
-func (m *ListSubscriptionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListSubscriptionsRequest) ProtoMessage()               {}
-func (*ListSubscriptionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_ListSubscriptionsRequest proto.InternalMessageInfo
 
 func (m *ListSubscriptionsRequest) GetProject() string {
 	if m != nil {
@@ -674,17 +1192,39 @@ func (m *ListSubscriptionsRequest) GetPageToken() string {
 // Response for the `ListSubscriptions` method.
 type ListSubscriptionsResponse struct {
 	// The subscriptions that match the request.
-	Subscriptions []*Subscription `protobuf:"bytes,1,rep,name=subscriptions" json:"subscriptions,omitempty"`
+	Subscriptions []*Subscription `protobuf:"bytes,1,rep,name=subscriptions,proto3" json:"subscriptions,omitempty"`
 	// If not empty, indicates that there may be more subscriptions that match
 	// the request; this value should be passed in a new
 	// `ListSubscriptionsRequest` to get more subscriptions.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSubscriptionsResponse) Reset()         { *m = ListSubscriptionsResponse{} }
+func (m *ListSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSubscriptionsResponse) ProtoMessage()    {}
+func (*ListSubscriptionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{20}
+}
+func (m *ListSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSubscriptionsResponse.Unmarshal(m, b)
+}
+func (m *ListSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSubscriptionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsResponse.Merge(dst, src)
+}
+func (m *ListSubscriptionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSubscriptionsResponse.Size(m)
+}
+func (m *ListSubscriptionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSubscriptionsResponse.DiscardUnknown(m)
 }
 
-func (m *ListSubscriptionsResponse) Reset()                    { *m = ListSubscriptionsResponse{} }
-func (m *ListSubscriptionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListSubscriptionsResponse) ProtoMessage()               {}
-func (*ListSubscriptionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+var xxx_messageInfo_ListSubscriptionsResponse proto.InternalMessageInfo
 
 func (m *ListSubscriptionsResponse) GetSubscriptions() []*Subscription {
 	if m != nil {
@@ -704,13 +1244,35 @@ func (m *ListSubscriptionsResponse) GetNextPageToken() string {
 type DeleteSubscriptionRequest struct {
 	// The subscription to delete.
 	// Format is `projects/{project}/subscriptions/{sub}`.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription         string   `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteSubscriptionRequest) Reset()                    { *m = DeleteSubscriptionRequest{} }
-func (m *DeleteSubscriptionRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSubscriptionRequest) ProtoMessage()               {}
-func (*DeleteSubscriptionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+func (m *DeleteSubscriptionRequest) Reset()         { *m = DeleteSubscriptionRequest{} }
+func (m *DeleteSubscriptionRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSubscriptionRequest) ProtoMessage()    {}
+func (*DeleteSubscriptionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{21}
+}
+func (m *DeleteSubscriptionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSubscriptionRequest.Unmarshal(m, b)
+}
+func (m *DeleteSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSubscriptionRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSubscriptionRequest.Merge(dst, src)
+}
+func (m *DeleteSubscriptionRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSubscriptionRequest.Size(m)
+}
+func (m *DeleteSubscriptionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSubscriptionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteSubscriptionRequest proto.InternalMessageInfo
 
 func (m *DeleteSubscriptionRequest) GetSubscription() string {
 	if m != nil {
@@ -723,20 +1285,42 @@ func (m *DeleteSubscriptionRequest) GetSubscription() string {
 type ModifyPushConfigRequest struct {
 	// The name of the subscription.
 	// Format is `projects/{project}/subscriptions/{sub}`.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// The push configuration for future deliveries.
 	//
 	// An empty `pushConfig` indicates that the Pub/Sub system should
 	// stop pushing messages from the given subscription and allow
 	// messages to be pulled and acknowledged - effectively pausing
-	// the subscription if `Pull` is not called.
-	PushConfig *PushConfig `protobuf:"bytes,2,opt,name=push_config,json=pushConfig" json:"push_config,omitempty"`
+	// the subscription if `Pull` or `StreamingPull` is not called.
+	PushConfig           *PushConfig `protobuf:"bytes,2,opt,name=push_config,json=pushConfig,proto3" json:"push_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *ModifyPushConfigRequest) Reset()         { *m = ModifyPushConfigRequest{} }
+func (m *ModifyPushConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*ModifyPushConfigRequest) ProtoMessage()    {}
+func (*ModifyPushConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{22}
+}
+func (m *ModifyPushConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ModifyPushConfigRequest.Unmarshal(m, b)
+}
+func (m *ModifyPushConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ModifyPushConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *ModifyPushConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyPushConfigRequest.Merge(dst, src)
+}
+func (m *ModifyPushConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_ModifyPushConfigRequest.Size(m)
+}
+func (m *ModifyPushConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ModifyPushConfigRequest.DiscardUnknown(m)
 }
 
-func (m *ModifyPushConfigRequest) Reset()                    { *m = ModifyPushConfigRequest{} }
-func (m *ModifyPushConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*ModifyPushConfigRequest) ProtoMessage()               {}
-func (*ModifyPushConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_ModifyPushConfigRequest proto.InternalMessageInfo
 
 func (m *ModifyPushConfigRequest) GetSubscription() string {
 	if m != nil {
@@ -756,23 +1340,45 @@ func (m *ModifyPushConfigRequest) GetPushConfig() *PushConfig {
 type PullRequest struct {
 	// The subscription from which messages should be pulled.
 	// Format is `projects/{project}/subscriptions/{sub}`.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// If this field set to true, the system will respond immediately even if
 	// it there are no messages available to return in the `Pull` response.
 	// Otherwise, the system may wait (for a bounded amount of time) until at
 	// least one message is available, rather than returning no messages. The
 	// client may cancel the request if it does not wish to wait any longer for
 	// the response.
-	ReturnImmediately bool `protobuf:"varint,2,opt,name=return_immediately,json=returnImmediately" json:"return_immediately,omitempty"`
+	ReturnImmediately bool `protobuf:"varint,2,opt,name=return_immediately,json=returnImmediately,proto3" json:"return_immediately,omitempty"`
 	// The maximum number of messages returned for this request. The Pub/Sub
 	// system may return fewer than the number specified.
-	MaxMessages int32 `protobuf:"varint,3,opt,name=max_messages,json=maxMessages" json:"max_messages,omitempty"`
+	MaxMessages          int32    `protobuf:"varint,3,opt,name=max_messages,json=maxMessages,proto3" json:"max_messages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PullRequest) Reset()         { *m = PullRequest{} }
+func (m *PullRequest) String() string { return proto.CompactTextString(m) }
+func (*PullRequest) ProtoMessage()    {}
+func (*PullRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{23}
+}
+func (m *PullRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PullRequest.Unmarshal(m, b)
+}
+func (m *PullRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PullRequest.Marshal(b, m, deterministic)
+}
+func (dst *PullRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullRequest.Merge(dst, src)
+}
+func (m *PullRequest) XXX_Size() int {
+	return xxx_messageInfo_PullRequest.Size(m)
+}
+func (m *PullRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PullRequest.DiscardUnknown(m)
 }
 
-func (m *PullRequest) Reset()                    { *m = PullRequest{} }
-func (m *PullRequest) String() string            { return proto.CompactTextString(m) }
-func (*PullRequest) ProtoMessage()               {}
-func (*PullRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+var xxx_messageInfo_PullRequest proto.InternalMessageInfo
 
 func (m *PullRequest) GetSubscription() string {
 	if m != nil {
@@ -801,13 +1407,35 @@ type PullResponse struct {
 	// there are no more available in the backlog. The Pub/Sub system may return
 	// fewer than the `maxMessages` requested even if there are more messages
 	// available in the backlog.
-	ReceivedMessages []*ReceivedMessage `protobuf:"bytes,1,rep,name=received_messages,json=receivedMessages" json:"received_messages,omitempty"`
+	ReceivedMessages     []*ReceivedMessage `protobuf:"bytes,1,rep,name=received_messages,json=receivedMessages,proto3" json:"received_messages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *PullResponse) Reset()         { *m = PullResponse{} }
+func (m *PullResponse) String() string { return proto.CompactTextString(m) }
+func (*PullResponse) ProtoMessage()    {}
+func (*PullResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{24}
+}
+func (m *PullResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PullResponse.Unmarshal(m, b)
+}
+func (m *PullResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PullResponse.Marshal(b, m, deterministic)
+}
+func (dst *PullResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullResponse.Merge(dst, src)
+}
+func (m *PullResponse) XXX_Size() int {
+	return xxx_messageInfo_PullResponse.Size(m)
+}
+func (m *PullResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_PullResponse.DiscardUnknown(m)
 }
 
-func (m *PullResponse) Reset()                    { *m = PullResponse{} }
-func (m *PullResponse) String() string            { return proto.CompactTextString(m) }
-func (*PullResponse) ProtoMessage()               {}
-func (*PullResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+var xxx_messageInfo_PullResponse proto.InternalMessageInfo
 
 func (m *PullResponse) GetReceivedMessages() []*ReceivedMessage {
 	if m != nil {
@@ -820,9 +1448,9 @@ func (m *PullResponse) GetReceivedMessages() []*ReceivedMessage {
 type ModifyAckDeadlineRequest struct {
 	// The name of the subscription.
 	// Format is `projects/{project}/subscriptions/{sub}`.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// List of acknowledgment IDs.
-	AckIds []string `protobuf:"bytes,4,rep,name=ack_ids,json=ackIds" json:"ack_ids,omitempty"`
+	AckIds []string `protobuf:"bytes,4,rep,name=ack_ids,json=ackIds,proto3" json:"ack_ids,omitempty"`
 	// The new ack deadline with respect to the time this request was sent to
 	// the Pub/Sub system. For example, if the value is 10, the new
 	// ack deadline will expire 10 seconds after the `ModifyAckDeadline` call
@@ -830,13 +1458,35 @@ type ModifyAckDeadlineRequest struct {
 	// another pull request.
 	// The minimum deadline you can specify is 0 seconds.
 	// The maximum deadline you can specify is 600 seconds (10 minutes).
-	AckDeadlineSeconds int32 `protobuf:"varint,3,opt,name=ack_deadline_seconds,json=ackDeadlineSeconds" json:"ack_deadline_seconds,omitempty"`
+	AckDeadlineSeconds   int32    `protobuf:"varint,3,opt,name=ack_deadline_seconds,json=ackDeadlineSeconds,proto3" json:"ack_deadline_seconds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ModifyAckDeadlineRequest) Reset()         { *m = ModifyAckDeadlineRequest{} }
+func (m *ModifyAckDeadlineRequest) String() string { return proto.CompactTextString(m) }
+func (*ModifyAckDeadlineRequest) ProtoMessage()    {}
+func (*ModifyAckDeadlineRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{25}
+}
+func (m *ModifyAckDeadlineRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ModifyAckDeadlineRequest.Unmarshal(m, b)
+}
+func (m *ModifyAckDeadlineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ModifyAckDeadlineRequest.Marshal(b, m, deterministic)
+}
+func (dst *ModifyAckDeadlineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyAckDeadlineRequest.Merge(dst, src)
+}
+func (m *ModifyAckDeadlineRequest) XXX_Size() int {
+	return xxx_messageInfo_ModifyAckDeadlineRequest.Size(m)
+}
+func (m *ModifyAckDeadlineRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ModifyAckDeadlineRequest.DiscardUnknown(m)
 }
 
-func (m *ModifyAckDeadlineRequest) Reset()                    { *m = ModifyAckDeadlineRequest{} }
-func (m *ModifyAckDeadlineRequest) String() string            { return proto.CompactTextString(m) }
-func (*ModifyAckDeadlineRequest) ProtoMessage()               {}
-func (*ModifyAckDeadlineRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
+var xxx_messageInfo_ModifyAckDeadlineRequest proto.InternalMessageInfo
 
 func (m *ModifyAckDeadlineRequest) GetSubscription() string {
 	if m != nil {
@@ -863,16 +1513,38 @@ func (m *ModifyAckDeadlineRequest) GetAckDeadlineSeconds() int32 {
 type AcknowledgeRequest struct {
 	// The subscription whose message is being acknowledged.
 	// Format is `projects/{project}/subscriptions/{sub}`.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// The acknowledgment ID for the messages being acknowledged that was returned
 	// by the Pub/Sub system in the `Pull` response. Must not be empty.
-	AckIds []string `protobuf:"bytes,2,rep,name=ack_ids,json=ackIds" json:"ack_ids,omitempty"`
+	AckIds               []string `protobuf:"bytes,2,rep,name=ack_ids,json=ackIds,proto3" json:"ack_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AcknowledgeRequest) Reset()         { *m = AcknowledgeRequest{} }
+func (m *AcknowledgeRequest) String() string { return proto.CompactTextString(m) }
+func (*AcknowledgeRequest) ProtoMessage()    {}
+func (*AcknowledgeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{26}
+}
+func (m *AcknowledgeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AcknowledgeRequest.Unmarshal(m, b)
+}
+func (m *AcknowledgeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AcknowledgeRequest.Marshal(b, m, deterministic)
+}
+func (dst *AcknowledgeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcknowledgeRequest.Merge(dst, src)
+}
+func (m *AcknowledgeRequest) XXX_Size() int {
+	return xxx_messageInfo_AcknowledgeRequest.Size(m)
+}
+func (m *AcknowledgeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AcknowledgeRequest.DiscardUnknown(m)
 }
 
-func (m *AcknowledgeRequest) Reset()                    { *m = AcknowledgeRequest{} }
-func (m *AcknowledgeRequest) String() string            { return proto.CompactTextString(m) }
-func (*AcknowledgeRequest) ProtoMessage()               {}
-func (*AcknowledgeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
+var xxx_messageInfo_AcknowledgeRequest proto.InternalMessageInfo
 
 func (m *AcknowledgeRequest) GetSubscription() string {
 	if m != nil {
@@ -896,13 +1568,13 @@ type StreamingPullRequest struct {
 	// provided in the first request on the stream, and must not be set in
 	// subsequent requests from client to server.
 	// Format is `projects/{project}/subscriptions/{sub}`.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// List of acknowledgement IDs for acknowledging previously received messages
 	// (received on this stream or a different stream). If an ack ID has expired,
 	// the corresponding message may be redelivered later. Acknowledging a message
 	// more than once will not result in an error. If the acknowledgement ID is
 	// malformed, the stream will be aborted with status `INVALID_ARGUMENT`.
-	AckIds []string `protobuf:"bytes,2,rep,name=ack_ids,json=ackIds" json:"ack_ids,omitempty"`
+	AckIds []string `protobuf:"bytes,2,rep,name=ack_ids,json=ackIds,proto3" json:"ack_ids,omitempty"`
 	// The list of new ack deadlines for the IDs listed in
 	// `modify_deadline_ack_ids`. The size of this list must be the same as the
 	// size of `modify_deadline_ack_ids`. If it differs the stream will be aborted
@@ -914,24 +1586,46 @@ type StreamingPullRequest struct {
 	// the message is immediately made available for another streaming or
 	// non-streaming pull request. If the value is < 0 (an error), the stream will
 	// be aborted with status `INVALID_ARGUMENT`.
-	ModifyDeadlineSeconds []int32 `protobuf:"varint,3,rep,packed,name=modify_deadline_seconds,json=modifyDeadlineSeconds" json:"modify_deadline_seconds,omitempty"`
+	ModifyDeadlineSeconds []int32 `protobuf:"varint,3,rep,packed,name=modify_deadline_seconds,json=modifyDeadlineSeconds,proto3" json:"modify_deadline_seconds,omitempty"`
 	// List of acknowledgement IDs whose deadline will be modified based on the
 	// corresponding element in `modify_deadline_seconds`. This field can be used
 	// to indicate that more time is needed to process a message by the
 	// subscriber, or to make the message available for redelivery if the
 	// processing was interrupted.
-	ModifyDeadlineAckIds []string `protobuf:"bytes,4,rep,name=modify_deadline_ack_ids,json=modifyDeadlineAckIds" json:"modify_deadline_ack_ids,omitempty"`
+	ModifyDeadlineAckIds []string `protobuf:"bytes,4,rep,name=modify_deadline_ack_ids,json=modifyDeadlineAckIds,proto3" json:"modify_deadline_ack_ids,omitempty"`
 	// The ack deadline to use for the stream. This must be provided in the
 	// first request on the stream, but it can also be updated on subsequent
 	// requests from client to server. The minimum deadline you can specify is 10
 	// seconds. The maximum deadline you can specify is 600 seconds (10 minutes).
-	StreamAckDeadlineSeconds int32 `protobuf:"varint,5,opt,name=stream_ack_deadline_seconds,json=streamAckDeadlineSeconds" json:"stream_ack_deadline_seconds,omitempty"`
+	StreamAckDeadlineSeconds int32    `protobuf:"varint,5,opt,name=stream_ack_deadline_seconds,json=streamAckDeadlineSeconds,proto3" json:"stream_ack_deadline_seconds,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{} `json:"-"`
+	XXX_unrecognized         []byte   `json:"-"`
+	XXX_sizecache            int32    `json:"-"`
+}
+
+func (m *StreamingPullRequest) Reset()         { *m = StreamingPullRequest{} }
+func (m *StreamingPullRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingPullRequest) ProtoMessage()    {}
+func (*StreamingPullRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{27}
+}
+func (m *StreamingPullRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingPullRequest.Unmarshal(m, b)
+}
+func (m *StreamingPullRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingPullRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingPullRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingPullRequest.Merge(dst, src)
+}
+func (m *StreamingPullRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingPullRequest.Size(m)
+}
+func (m *StreamingPullRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingPullRequest.DiscardUnknown(m)
 }
 
-func (m *StreamingPullRequest) Reset()                    { *m = StreamingPullRequest{} }
-func (m *StreamingPullRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingPullRequest) ProtoMessage()               {}
-func (*StreamingPullRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
+var xxx_messageInfo_StreamingPullRequest proto.InternalMessageInfo
 
 func (m *StreamingPullRequest) GetSubscription() string {
 	if m != nil {
@@ -972,13 +1666,35 @@ func (m *StreamingPullRequest) GetStreamAckDeadlineSeconds() int32 {
 // messages from the server to the client.
 type StreamingPullResponse struct {
 	// Received Pub/Sub messages. This will not be empty.
-	ReceivedMessages []*ReceivedMessage `protobuf:"bytes,1,rep,name=received_messages,json=receivedMessages" json:"received_messages,omitempty"`
+	ReceivedMessages     []*ReceivedMessage `protobuf:"bytes,1,rep,name=received_messages,json=receivedMessages,proto3" json:"received_messages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *StreamingPullResponse) Reset()         { *m = StreamingPullResponse{} }
+func (m *StreamingPullResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingPullResponse) ProtoMessage()    {}
+func (*StreamingPullResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{28}
+}
+func (m *StreamingPullResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingPullResponse.Unmarshal(m, b)
+}
+func (m *StreamingPullResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingPullResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingPullResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingPullResponse.Merge(dst, src)
+}
+func (m *StreamingPullResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingPullResponse.Size(m)
+}
+func (m *StreamingPullResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingPullResponse.DiscardUnknown(m)
 }
 
-func (m *StreamingPullResponse) Reset()                    { *m = StreamingPullResponse{} }
-func (m *StreamingPullResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingPullResponse) ProtoMessage()               {}
-func (*StreamingPullResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
+var xxx_messageInfo_StreamingPullResponse proto.InternalMessageInfo
 
 func (m *StreamingPullResponse) GetReceivedMessages() []*ReceivedMessage {
 	if m != nil {
@@ -987,14 +1703,17 @@ func (m *StreamingPullResponse) GetReceivedMessages() []*ReceivedMessage {
 	return nil
 }
 
-// Request for the `CreateSnapshot` method.
+// Request for the `CreateSnapshot` method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be changed in
+// backward-incompatible ways and is not recommended for production use.
+// It is not subject to any SLA or deprecation policy.
 type CreateSnapshotRequest struct {
 	// Optional user-provided name for this snapshot.
 	// If the name is not provided in the request, the server will assign a random
 	// name for this snapshot on the same project as the subscription.
 	// Note that for REST API requests, you must specify a name.
 	// Format is `projects/{project}/snapshots/{snap}`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The subscription whose backlog the snapshot retains.
 	// Specifically, the created snapshot is guaranteed to retain:
 	//  (a) The existing backlog on the subscription. More precisely, this is
@@ -1004,13 +1723,37 @@ type CreateSnapshotRequest struct {
 	//  (b) Any messages published to the subscription's topic following the
 	//      successful completion of the CreateSnapshot request.
 	// Format is `projects/{project}/subscriptions/{sub}`.
-	Subscription string `protobuf:"bytes,2,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,2,opt,name=subscription,proto3" json:"subscription,omitempty"`
+	// User labels.
+	Labels               map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *CreateSnapshotRequest) Reset()         { *m = CreateSnapshotRequest{} }
+func (m *CreateSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateSnapshotRequest) ProtoMessage()    {}
+func (*CreateSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{29}
+}
+func (m *CreateSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateSnapshotRequest.Unmarshal(m, b)
+}
+func (m *CreateSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSnapshotRequest.Merge(dst, src)
+}
+func (m *CreateSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateSnapshotRequest.Size(m)
+}
+func (m *CreateSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateSnapshotRequest.DiscardUnknown(m)
 }
 
-func (m *CreateSnapshotRequest) Reset()                    { *m = CreateSnapshotRequest{} }
-func (m *CreateSnapshotRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateSnapshotRequest) ProtoMessage()               {}
-func (*CreateSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
+var xxx_messageInfo_CreateSnapshotRequest proto.InternalMessageInfo
 
 func (m *CreateSnapshotRequest) GetName() string {
 	if m != nil {
@@ -1026,19 +1769,51 @@ func (m *CreateSnapshotRequest) GetSubscription() string {
 	return ""
 }
 
-// Request for the UpdateSnapshot method.
+func (m *CreateSnapshotRequest) GetLabels() map[string]string {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
+// Request for the UpdateSnapshot method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
 type UpdateSnapshotRequest struct {
-	// The updated snpashot object.
-	Snapshot *Snapshot `protobuf:"bytes,1,opt,name=snapshot" json:"snapshot,omitempty"`
+	// The updated snapshot object.
+	Snapshot *Snapshot `protobuf:"bytes,1,opt,name=snapshot,proto3" json:"snapshot,omitempty"`
 	// Indicates which fields in the provided snapshot to update.
 	// Must be specified and non-empty.
-	UpdateMask *google_protobuf3.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateSnapshotRequest) Reset()         { *m = UpdateSnapshotRequest{} }
+func (m *UpdateSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateSnapshotRequest) ProtoMessage()    {}
+func (*UpdateSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{30}
+}
+func (m *UpdateSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateSnapshotRequest.Unmarshal(m, b)
+}
+func (m *UpdateSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateSnapshotRequest.Merge(dst, src)
+}
+func (m *UpdateSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateSnapshotRequest.Size(m)
+}
+func (m *UpdateSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateSnapshotRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateSnapshotRequest) Reset()                    { *m = UpdateSnapshotRequest{} }
-func (m *UpdateSnapshotRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateSnapshotRequest) ProtoMessage()               {}
-func (*UpdateSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
+var xxx_messageInfo_UpdateSnapshotRequest proto.InternalMessageInfo
 
 func (m *UpdateSnapshotRequest) GetSnapshot() *Snapshot {
 	if m != nil {
@@ -1047,19 +1822,22 @@ func (m *UpdateSnapshotRequest) GetSnapshot() *Snapshot {
 	return nil
 }
 
-func (m *UpdateSnapshotRequest) GetUpdateMask() *google_protobuf3.FieldMask {
+func (m *UpdateSnapshotRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
 	return nil
 }
 
-// A snapshot resource.
+// A snapshot resource.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
 type Snapshot struct {
 	// The name of the snapshot.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the topic from which this snapshot is retaining messages.
-	Topic string `protobuf:"bytes,2,opt,name=topic" json:"topic,omitempty"`
+	Topic string `protobuf:"bytes,2,opt,name=topic,proto3" json:"topic,omitempty"`
 	// The snapshot is guaranteed to exist up until this time.
 	// A newly-created snapshot expires no later than 7 days from the time of its
 	// creation. Its exact lifetime is determined at creation by the existing
@@ -1068,16 +1846,39 @@ type Snapshot struct {
 	// For example, consider a subscription whose oldest unacked message is 3 days
 	// old. If a snapshot is created from this subscription, the snapshot -- which
 	// will always capture this 3-day-old backlog as long as the snapshot
-	// exists -- will expire in 4 days.
-	ExpireTime *google_protobuf4.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime" json:"expire_time,omitempty"`
+	// exists -- will expire in 4 days. The service will refuse to create a
+	// snapshot that would expire in less than 1 hour after creation.
+	ExpireTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// User labels.
-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Snapshot) Reset()         { *m = Snapshot{} }
+func (m *Snapshot) String() string { return proto.CompactTextString(m) }
+func (*Snapshot) ProtoMessage()    {}
+func (*Snapshot) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{31}
+}
+func (m *Snapshot) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Snapshot.Unmarshal(m, b)
+}
+func (m *Snapshot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Snapshot.Marshal(b, m, deterministic)
+}
+func (dst *Snapshot) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Snapshot.Merge(dst, src)
+}
+func (m *Snapshot) XXX_Size() int {
+	return xxx_messageInfo_Snapshot.Size(m)
+}
+func (m *Snapshot) XXX_DiscardUnknown() {
+	xxx_messageInfo_Snapshot.DiscardUnknown(m)
 }
 
-func (m *Snapshot) Reset()                    { *m = Snapshot{} }
-func (m *Snapshot) String() string            { return proto.CompactTextString(m) }
-func (*Snapshot) ProtoMessage()               {}
-func (*Snapshot) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
+var xxx_messageInfo_Snapshot proto.InternalMessageInfo
 
 func (m *Snapshot) GetName() string {
 	if m != nil {
@@ -1093,7 +1894,7 @@ func (m *Snapshot) GetTopic() string {
 	return ""
 }
 
-func (m *Snapshot) GetExpireTime() *google_protobuf4.Timestamp {
+func (m *Snapshot) GetExpireTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ExpireTime
 	}
@@ -1107,23 +1908,92 @@ func (m *Snapshot) GetLabels() map[string]string {
 	return nil
 }
 
-// Request for the `ListSnapshots` method.
+// Request for the GetSnapshot method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
+type GetSnapshotRequest struct {
+	// The name of the snapshot to get.
+	// Format is `projects/{project}/snapshots/{snap}`.
+	Snapshot             string   `protobuf:"bytes,1,opt,name=snapshot,proto3" json:"snapshot,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSnapshotRequest) Reset()         { *m = GetSnapshotRequest{} }
+func (m *GetSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSnapshotRequest) ProtoMessage()    {}
+func (*GetSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{32}
+}
+func (m *GetSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSnapshotRequest.Unmarshal(m, b)
+}
+func (m *GetSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSnapshotRequest.Merge(dst, src)
+}
+func (m *GetSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSnapshotRequest.Size(m)
+}
+func (m *GetSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSnapshotRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetSnapshotRequest proto.InternalMessageInfo
+
+func (m *GetSnapshotRequest) GetSnapshot() string {
+	if m != nil {
+		return m.Snapshot
+	}
+	return ""
+}
+
+// Request for the `ListSnapshots` method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
 type ListSnapshotsRequest struct {
 	// The name of the cloud project that snapshots belong to.
 	// Format is `projects/{project}`.
-	Project string `protobuf:"bytes,1,opt,name=project" json:"project,omitempty"`
+	Project string `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"`
 	// Maximum number of snapshots to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last `ListSnapshotsResponse`; indicates that this
 	// is a continuation of a prior `ListSnapshots` call, and that the system
 	// should return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSnapshotsRequest) Reset()         { *m = ListSnapshotsRequest{} }
+func (m *ListSnapshotsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSnapshotsRequest) ProtoMessage()    {}
+func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{33}
+}
+func (m *ListSnapshotsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSnapshotsRequest.Unmarshal(m, b)
+}
+func (m *ListSnapshotsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSnapshotsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSnapshotsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsRequest.Merge(dst, src)
+}
+func (m *ListSnapshotsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSnapshotsRequest.Size(m)
+}
+func (m *ListSnapshotsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSnapshotsRequest.DiscardUnknown(m)
 }
 
-func (m *ListSnapshotsRequest) Reset()                    { *m = ListSnapshotsRequest{} }
-func (m *ListSnapshotsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListSnapshotsRequest) ProtoMessage()               {}
-func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
+var xxx_messageInfo_ListSnapshotsRequest proto.InternalMessageInfo
 
 func (m *ListSnapshotsRequest) GetProject() string {
 	if m != nil {
@@ -1146,19 +2016,44 @@ func (m *ListSnapshotsRequest) GetPageToken() string {
 	return ""
 }
 
-// Response for the `ListSnapshots` method.
+// Response for the `ListSnapshots` method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
 type ListSnapshotsResponse struct {
 	// The resulting snapshots.
-	Snapshots []*Snapshot `protobuf:"bytes,1,rep,name=snapshots" json:"snapshots,omitempty"`
+	Snapshots []*Snapshot `protobuf:"bytes,1,rep,name=snapshots,proto3" json:"snapshots,omitempty"`
 	// If not empty, indicates that there may be more snapshot that match the
 	// request; this value should be passed in a new `ListSnapshotsRequest`.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSnapshotsResponse) Reset()         { *m = ListSnapshotsResponse{} }
+func (m *ListSnapshotsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSnapshotsResponse) ProtoMessage()    {}
+func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{34}
+}
+func (m *ListSnapshotsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSnapshotsResponse.Unmarshal(m, b)
+}
+func (m *ListSnapshotsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSnapshotsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSnapshotsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSnapshotsResponse.Merge(dst, src)
+}
+func (m *ListSnapshotsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSnapshotsResponse.Size(m)
+}
+func (m *ListSnapshotsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSnapshotsResponse.DiscardUnknown(m)
 }
 
-func (m *ListSnapshotsResponse) Reset()                    { *m = ListSnapshotsResponse{} }
-func (m *ListSnapshotsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListSnapshotsResponse) ProtoMessage()               {}
-func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
+var xxx_messageInfo_ListSnapshotsResponse proto.InternalMessageInfo
 
 func (m *ListSnapshotsResponse) GetSnapshots() []*Snapshot {
 	if m != nil {
@@ -1174,17 +2069,42 @@ func (m *ListSnapshotsResponse) GetNextPageToken() string {
 	return ""
 }
 
-// Request for the `DeleteSnapshot` method.
+// Request for the `DeleteSnapshot` method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
 type DeleteSnapshotRequest struct {
 	// The name of the snapshot to delete.
 	// Format is `projects/{project}/snapshots/{snap}`.
-	Snapshot string `protobuf:"bytes,1,opt,name=snapshot" json:"snapshot,omitempty"`
+	Snapshot             string   `protobuf:"bytes,1,opt,name=snapshot,proto3" json:"snapshot,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSnapshotRequest) Reset()         { *m = DeleteSnapshotRequest{} }
+func (m *DeleteSnapshotRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSnapshotRequest) ProtoMessage()    {}
+func (*DeleteSnapshotRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{35}
+}
+func (m *DeleteSnapshotRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSnapshotRequest.Unmarshal(m, b)
+}
+func (m *DeleteSnapshotRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSnapshotRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSnapshotRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSnapshotRequest.Merge(dst, src)
+}
+func (m *DeleteSnapshotRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSnapshotRequest.Size(m)
+}
+func (m *DeleteSnapshotRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSnapshotRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteSnapshotRequest) Reset()                    { *m = DeleteSnapshotRequest{} }
-func (m *DeleteSnapshotRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSnapshotRequest) ProtoMessage()               {}
-func (*DeleteSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
+var xxx_messageInfo_DeleteSnapshotRequest proto.InternalMessageInfo
 
 func (m *DeleteSnapshotRequest) GetSnapshot() string {
 	if m != nil {
@@ -1193,33 +2113,67 @@ func (m *DeleteSnapshotRequest) GetSnapshot() string {
 	return ""
 }
 
-// Request for the `Seek` method.
+// Request for the `Seek` method.<br><br>
+// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+// changed in backward-incompatible ways and is not recommended for production
+// use. It is not subject to any SLA or deprecation policy.
 type SeekRequest struct {
 	// The subscription to affect.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// Types that are valid to be assigned to Target:
 	//	*SeekRequest_Time
 	//	*SeekRequest_Snapshot
-	Target isSeekRequest_Target `protobuf_oneof:"target"`
+	Target               isSeekRequest_Target `protobuf_oneof:"target"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *SeekRequest) Reset()         { *m = SeekRequest{} }
+func (m *SeekRequest) String() string { return proto.CompactTextString(m) }
+func (*SeekRequest) ProtoMessage()    {}
+func (*SeekRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{36}
+}
+func (m *SeekRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SeekRequest.Unmarshal(m, b)
+}
+func (m *SeekRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SeekRequest.Marshal(b, m, deterministic)
+}
+func (dst *SeekRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SeekRequest.Merge(dst, src)
+}
+func (m *SeekRequest) XXX_Size() int {
+	return xxx_messageInfo_SeekRequest.Size(m)
 }
+func (m *SeekRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SeekRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SeekRequest proto.InternalMessageInfo
 
-func (m *SeekRequest) Reset()                    { *m = SeekRequest{} }
-func (m *SeekRequest) String() string            { return proto.CompactTextString(m) }
-func (*SeekRequest) ProtoMessage()               {}
-func (*SeekRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
+func (m *SeekRequest) GetSubscription() string {
+	if m != nil {
+		return m.Subscription
+	}
+	return ""
+}
 
 type isSeekRequest_Target interface {
 	isSeekRequest_Target()
 }
 
 type SeekRequest_Time struct {
-	Time *google_protobuf4.Timestamp `protobuf:"bytes,2,opt,name=time,oneof"`
+	Time *timestamp.Timestamp `protobuf:"bytes,2,opt,name=time,proto3,oneof"`
 }
+
 type SeekRequest_Snapshot struct {
-	Snapshot string `protobuf:"bytes,3,opt,name=snapshot,oneof"`
+	Snapshot string `protobuf:"bytes,3,opt,name=snapshot,proto3,oneof"`
 }
 
-func (*SeekRequest_Time) isSeekRequest_Target()     {}
+func (*SeekRequest_Time) isSeekRequest_Target() {}
+
 func (*SeekRequest_Snapshot) isSeekRequest_Target() {}
 
 func (m *SeekRequest) GetTarget() isSeekRequest_Target {
@@ -1229,14 +2183,7 @@ func (m *SeekRequest) GetTarget() isSeekRequest_Target {
 	return nil
 }
 
-func (m *SeekRequest) GetSubscription() string {
-	if m != nil {
-		return m.Subscription
-	}
-	return ""
-}
-
-func (m *SeekRequest) GetTime() *google_protobuf4.Timestamp {
+func (m *SeekRequest) GetTime() *timestamp.Timestamp {
 	if x, ok := m.GetTarget().(*SeekRequest_Time); ok {
 		return x.Time
 	}
@@ -1284,7 +2231,7 @@ func _SeekRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Bu
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf4.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.Target = &SeekRequest_Time{msg}
 		return true, err
@@ -1306,11 +2253,11 @@ func _SeekRequest_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Target.(type) {
 	case *SeekRequest_Time:
 		s := proto.Size(x.Time)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *SeekRequest_Snapshot:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Snapshot)))
 		n += len(x.Snapshot)
 	case nil:
@@ -1321,16 +2268,41 @@ func _SeekRequest_OneofSizer(msg proto.Message) (n int) {
 }
 
 type SeekResponse struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SeekResponse) Reset()         { *m = SeekResponse{} }
+func (m *SeekResponse) String() string { return proto.CompactTextString(m) }
+func (*SeekResponse) ProtoMessage()    {}
+func (*SeekResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_d7d430fc6d2b8a0b, []int{37}
+}
+func (m *SeekResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SeekResponse.Unmarshal(m, b)
+}
+func (m *SeekResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SeekResponse.Marshal(b, m, deterministic)
+}
+func (dst *SeekResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SeekResponse.Merge(dst, src)
+}
+func (m *SeekResponse) XXX_Size() int {
+	return xxx_messageInfo_SeekResponse.Size(m)
+}
+func (m *SeekResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SeekResponse.DiscardUnknown(m)
 }
 
-func (m *SeekResponse) Reset()                    { *m = SeekResponse{} }
-func (m *SeekResponse) String() string            { return proto.CompactTextString(m) }
-func (*SeekResponse) ProtoMessage()               {}
-func (*SeekResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} }
+var xxx_messageInfo_SeekResponse proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterType((*MessageStoragePolicy)(nil), "google.pubsub.v1.MessageStoragePolicy")
 	proto.RegisterType((*Topic)(nil), "google.pubsub.v1.Topic")
+	proto.RegisterMapType((map[string]string)(nil), "google.pubsub.v1.Topic.LabelsEntry")
 	proto.RegisterType((*PubsubMessage)(nil), "google.pubsub.v1.PubsubMessage")
+	proto.RegisterMapType((map[string]string)(nil), "google.pubsub.v1.PubsubMessage.AttributesEntry")
 	proto.RegisterType((*GetTopicRequest)(nil), "google.pubsub.v1.GetTopicRequest")
 	proto.RegisterType((*UpdateTopicRequest)(nil), "google.pubsub.v1.UpdateTopicRequest")
 	proto.RegisterType((*PublishRequest)(nil), "google.pubsub.v1.PublishRequest")
@@ -1339,9 +2311,13 @@ func init() {
 	proto.RegisterType((*ListTopicsResponse)(nil), "google.pubsub.v1.ListTopicsResponse")
 	proto.RegisterType((*ListTopicSubscriptionsRequest)(nil), "google.pubsub.v1.ListTopicSubscriptionsRequest")
 	proto.RegisterType((*ListTopicSubscriptionsResponse)(nil), "google.pubsub.v1.ListTopicSubscriptionsResponse")
+	proto.RegisterType((*ListTopicSnapshotsRequest)(nil), "google.pubsub.v1.ListTopicSnapshotsRequest")
+	proto.RegisterType((*ListTopicSnapshotsResponse)(nil), "google.pubsub.v1.ListTopicSnapshotsResponse")
 	proto.RegisterType((*DeleteTopicRequest)(nil), "google.pubsub.v1.DeleteTopicRequest")
 	proto.RegisterType((*Subscription)(nil), "google.pubsub.v1.Subscription")
+	proto.RegisterMapType((map[string]string)(nil), "google.pubsub.v1.Subscription.LabelsEntry")
 	proto.RegisterType((*PushConfig)(nil), "google.pubsub.v1.PushConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.pubsub.v1.PushConfig.AttributesEntry")
 	proto.RegisterType((*ReceivedMessage)(nil), "google.pubsub.v1.ReceivedMessage")
 	proto.RegisterType((*GetSubscriptionRequest)(nil), "google.pubsub.v1.GetSubscriptionRequest")
 	proto.RegisterType((*UpdateSubscriptionRequest)(nil), "google.pubsub.v1.UpdateSubscriptionRequest")
@@ -1356,8 +2332,11 @@ func init() {
 	proto.RegisterType((*StreamingPullRequest)(nil), "google.pubsub.v1.StreamingPullRequest")
 	proto.RegisterType((*StreamingPullResponse)(nil), "google.pubsub.v1.StreamingPullResponse")
 	proto.RegisterType((*CreateSnapshotRequest)(nil), "google.pubsub.v1.CreateSnapshotRequest")
+	proto.RegisterMapType((map[string]string)(nil), "google.pubsub.v1.CreateSnapshotRequest.LabelsEntry")
 	proto.RegisterType((*UpdateSnapshotRequest)(nil), "google.pubsub.v1.UpdateSnapshotRequest")
 	proto.RegisterType((*Snapshot)(nil), "google.pubsub.v1.Snapshot")
+	proto.RegisterMapType((map[string]string)(nil), "google.pubsub.v1.Snapshot.LabelsEntry")
+	proto.RegisterType((*GetSnapshotRequest)(nil), "google.pubsub.v1.GetSnapshotRequest")
 	proto.RegisterType((*ListSnapshotsRequest)(nil), "google.pubsub.v1.ListSnapshotsRequest")
 	proto.RegisterType((*ListSnapshotsResponse)(nil), "google.pubsub.v1.ListSnapshotsResponse")
 	proto.RegisterType((*DeleteSnapshotRequest)(nil), "google.pubsub.v1.DeleteSnapshotRequest")
@@ -1373,1152 +2352,1253 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Subscriber service
-
-type SubscriberClient interface {
-	// Creates a subscription to a given topic.
-	// If the subscription already exists, returns `ALREADY_EXISTS`.
-	// If the corresponding topic doesn't exist, returns `NOT_FOUND`.
-	//
-	// If the name is not provided in the request, the server will assign a random
-	// name for this subscription on the same project as the topic, conforming
-	// to the
-	// [resource name format](https://cloud.google.com/pubsub/docs/overview#names).
-	// The generated name is populated in the returned Subscription object.
-	// Note that for REST API requests, you must specify a name in the request.
-	CreateSubscription(ctx context.Context, in *Subscription, opts ...grpc.CallOption) (*Subscription, error)
-	// Gets the configuration details of a subscription.
-	GetSubscription(ctx context.Context, in *GetSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error)
-	// Updates an existing subscription. Note that certain properties of a
-	// subscription, such as its topic, are not modifiable.
-	// NOTE:  The style guide requires body: "subscription" instead of body: "*".
-	// Keeping the latter for internal consistency in V1, however it should be
-	// corrected in V2.  See
-	// https://cloud.google.com/apis/design/standard_methods#update for details.
-	UpdateSubscription(ctx context.Context, in *UpdateSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error)
-	// Lists matching subscriptions.
-	ListSubscriptions(ctx context.Context, in *ListSubscriptionsRequest, opts ...grpc.CallOption) (*ListSubscriptionsResponse, error)
-	// Deletes an existing subscription. All messages retained in the subscription
-	// are immediately dropped. Calls to `Pull` after deletion will return
-	// `NOT_FOUND`. After a subscription is deleted, a new one may be created with
-	// the same name, but the new one has no association with the old
-	// subscription or its topic unless the same topic is specified.
-	DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
-	// Modifies the ack deadline for a specific message. This method is useful
-	// to indicate that more time is needed to process a message by the
-	// subscriber, or to make the message available for redelivery if the
-	// processing was interrupted. Note that this does not modify the
-	// subscription-level `ackDeadlineSeconds` used for subsequent messages.
-	ModifyAckDeadline(ctx context.Context, in *ModifyAckDeadlineRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
-	// Acknowledges the messages associated with the `ack_ids` in the
-	// `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages
-	// from the subscription.
-	//
-	// Acknowledging a message whose ack deadline has expired may succeed,
-	// but such a message may be redelivered later. Acknowledging a message more
-	// than once will not result in an error.
-	Acknowledge(ctx context.Context, in *AcknowledgeRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
-	// Pulls messages from the server. Returns an empty list if there are no
-	// messages available in the backlog. The server may return `UNAVAILABLE` if
-	// there are too many concurrent pull requests pending for the given
-	// subscription.
-	Pull(ctx context.Context, in *PullRequest, opts ...grpc.CallOption) (*PullResponse, error)
-	// (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will
-	// respond with UNIMPLEMENTED errors unless you have been invited to test
-	// this feature. Contact cloud-pubsub@google.com with any questions.
-	//
-	// Establishes a stream with the server, which sends messages down to the
-	// client. The client streams acknowledgements and ack deadline modifications
-	// back to the server. The server will close the stream and return the status
-	// on any error. The server may close the stream with status `OK` to reassign
-	// server-side resources, in which case, the client should re-establish the
-	// stream. `UNAVAILABLE` may also be returned in the case of a transient error
-	// (e.g., a server restart). These should also be retried by the client. Flow
-	// control can be achieved by configuring the underlying RPC channel.
-	StreamingPull(ctx context.Context, opts ...grpc.CallOption) (Subscriber_StreamingPullClient, error)
-	// Modifies the `PushConfig` for a specified subscription.
-	//
-	// This may be used to change a push subscription to a pull one (signified by
-	// an empty `PushConfig`) or vice versa, or change the endpoint URL and other
-	// attributes of a push subscription. Messages will accumulate for delivery
-	// continuously through the call regardless of changes to the `PushConfig`.
-	ModifyPushConfig(ctx context.Context, in *ModifyPushConfigRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
-	// Lists the existing snapshots.
-	ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error)
-	// Creates a snapshot from the requested subscription.
-	// If the snapshot already exists, returns `ALREADY_EXISTS`.
-	// If the requested subscription doesn't exist, returns `NOT_FOUND`.
-	//
-	// If the name is not provided in the request, the server will assign a random
-	// name for this snapshot on the same project as the subscription, conforming
-	// to the
-	// [resource name format](https://cloud.google.com/pubsub/docs/overview#names).
-	// The generated name is populated in the returned Snapshot object.
-	// Note that for REST API requests, you must specify a name in the request.
-	CreateSnapshot(ctx context.Context, in *CreateSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error)
-	// Updates an existing snapshot. Note that certain properties of a snapshot
-	// are not modifiable.
-	// NOTE:  The style guide requires body: "snapshot" instead of body: "*".
-	// Keeping the latter for internal consistency in V1, however it should be
-	// corrected in V2.  See
-	// https://cloud.google.com/apis/design/standard_methods#update for details.
-	UpdateSnapshot(ctx context.Context, in *UpdateSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error)
-	// Removes an existing snapshot. All messages retained in the snapshot
-	// are immediately dropped. After a snapshot is deleted, a new one may be
-	// created with the same name, but the new one has no association with the old
-	// snapshot or its subscription, unless the same subscription is specified.
-	DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
-	// Seeks an existing subscription to a point in time or to a given snapshot,
-	// whichever is provided in the request.
-	Seek(ctx context.Context, in *SeekRequest, opts ...grpc.CallOption) (*SeekResponse, error)
+// PublisherClient is the client API for Publisher service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type PublisherClient interface {
+	// Creates the given topic with the given name. See the
+	// <a href="/pubsub/docs/admin#resource_names"> resource name rules</a>.
+	CreateTopic(ctx context.Context, in *Topic, opts ...grpc.CallOption) (*Topic, error)
+	// Updates an existing topic. Note that certain properties of a
+	// topic are not modifiable.
+	UpdateTopic(ctx context.Context, in *UpdateTopicRequest, opts ...grpc.CallOption) (*Topic, error)
+	// Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic
+	// does not exist. The message payload must not be empty; it must contain
+	//  either a non-empty data field, or at least one attribute.
+	Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*PublishResponse, error)
+	// Gets the configuration of a topic.
+	GetTopic(ctx context.Context, in *GetTopicRequest, opts ...grpc.CallOption) (*Topic, error)
+	// Lists matching topics.
+	ListTopics(ctx context.Context, in *ListTopicsRequest, opts ...grpc.CallOption) (*ListTopicsResponse, error)
+	// Lists the names of the subscriptions on this topic.
+	ListTopicSubscriptions(ctx context.Context, in *ListTopicSubscriptionsRequest, opts ...grpc.CallOption) (*ListTopicSubscriptionsResponse, error)
+	// Lists the names of the snapshots on this topic.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	ListTopicSnapshots(ctx context.Context, in *ListTopicSnapshotsRequest, opts ...grpc.CallOption) (*ListTopicSnapshotsResponse, error)
+	// Deletes the topic with the given name. Returns `NOT_FOUND` if the topic
+	// does not exist. After a topic is deleted, a new topic may be created with
+	// the same name; this is an entirely new topic with none of the old
+	// configuration or subscriptions. Existing subscriptions to this topic are
+	// not deleted, but their `topic` field is set to `_deleted-topic_`.
+	DeleteTopic(ctx context.Context, in *DeleteTopicRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
-type subscriberClient struct {
+type publisherClient struct {
 	cc *grpc.ClientConn
 }
 
-func NewSubscriberClient(cc *grpc.ClientConn) SubscriberClient {
-	return &subscriberClient{cc}
+func NewPublisherClient(cc *grpc.ClientConn) PublisherClient {
+	return &publisherClient{cc}
 }
 
-func (c *subscriberClient) CreateSubscription(ctx context.Context, in *Subscription, opts ...grpc.CallOption) (*Subscription, error) {
-	out := new(Subscription)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/CreateSubscription", in, out, c.cc, opts...)
+func (c *publisherClient) CreateTopic(ctx context.Context, in *Topic, opts ...grpc.CallOption) (*Topic, error) {
+	out := new(Topic)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Publisher/CreateTopic", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) GetSubscription(ctx context.Context, in *GetSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error) {
-	out := new(Subscription)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/GetSubscription", in, out, c.cc, opts...)
+func (c *publisherClient) UpdateTopic(ctx context.Context, in *UpdateTopicRequest, opts ...grpc.CallOption) (*Topic, error) {
+	out := new(Topic)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Publisher/UpdateTopic", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) UpdateSubscription(ctx context.Context, in *UpdateSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error) {
-	out := new(Subscription)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/UpdateSubscription", in, out, c.cc, opts...)
+func (c *publisherClient) Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*PublishResponse, error) {
+	out := new(PublishResponse)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Publisher/Publish", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) ListSubscriptions(ctx context.Context, in *ListSubscriptionsRequest, opts ...grpc.CallOption) (*ListSubscriptionsResponse, error) {
-	out := new(ListSubscriptionsResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/ListSubscriptions", in, out, c.cc, opts...)
+func (c *publisherClient) GetTopic(ctx context.Context, in *GetTopicRequest, opts ...grpc.CallOption) (*Topic, error) {
+	out := new(Topic)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Publisher/GetTopic", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/DeleteSubscription", in, out, c.cc, opts...)
+func (c *publisherClient) ListTopics(ctx context.Context, in *ListTopicsRequest, opts ...grpc.CallOption) (*ListTopicsResponse, error) {
+	out := new(ListTopicsResponse)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Publisher/ListTopics", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) ModifyAckDeadline(ctx context.Context, in *ModifyAckDeadlineRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/ModifyAckDeadline", in, out, c.cc, opts...)
+func (c *publisherClient) ListTopicSubscriptions(ctx context.Context, in *ListTopicSubscriptionsRequest, opts ...grpc.CallOption) (*ListTopicSubscriptionsResponse, error) {
+	out := new(ListTopicSubscriptionsResponse)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Publisher/ListTopicSubscriptions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) Acknowledge(ctx context.Context, in *AcknowledgeRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/Acknowledge", in, out, c.cc, opts...)
+func (c *publisherClient) ListTopicSnapshots(ctx context.Context, in *ListTopicSnapshotsRequest, opts ...grpc.CallOption) (*ListTopicSnapshotsResponse, error) {
+	out := new(ListTopicSnapshotsResponse)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Publisher/ListTopicSnapshots", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) Pull(ctx context.Context, in *PullRequest, opts ...grpc.CallOption) (*PullResponse, error) {
-	out := new(PullResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/Pull", in, out, c.cc, opts...)
+func (c *publisherClient) DeleteTopic(ctx context.Context, in *DeleteTopicRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Publisher/DeleteTopic", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) StreamingPull(ctx context.Context, opts ...grpc.CallOption) (Subscriber_StreamingPullClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Subscriber_serviceDesc.Streams[0], c.cc, "/google.pubsub.v1.Subscriber/StreamingPull", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &subscriberStreamingPullClient{stream}
-	return x, nil
-}
-
-type Subscriber_StreamingPullClient interface {
-	Send(*StreamingPullRequest) error
-	Recv() (*StreamingPullResponse, error)
-	grpc.ClientStream
-}
-
-type subscriberStreamingPullClient struct {
-	grpc.ClientStream
+// PublisherServer is the server API for Publisher service.
+type PublisherServer interface {
+	// Creates the given topic with the given name. See the
+	// <a href="/pubsub/docs/admin#resource_names"> resource name rules</a>.
+	CreateTopic(context.Context, *Topic) (*Topic, error)
+	// Updates an existing topic. Note that certain properties of a
+	// topic are not modifiable.
+	UpdateTopic(context.Context, *UpdateTopicRequest) (*Topic, error)
+	// Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic
+	// does not exist. The message payload must not be empty; it must contain
+	//  either a non-empty data field, or at least one attribute.
+	Publish(context.Context, *PublishRequest) (*PublishResponse, error)
+	// Gets the configuration of a topic.
+	GetTopic(context.Context, *GetTopicRequest) (*Topic, error)
+	// Lists matching topics.
+	ListTopics(context.Context, *ListTopicsRequest) (*ListTopicsResponse, error)
+	// Lists the names of the subscriptions on this topic.
+	ListTopicSubscriptions(context.Context, *ListTopicSubscriptionsRequest) (*ListTopicSubscriptionsResponse, error)
+	// Lists the names of the snapshots on this topic.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	ListTopicSnapshots(context.Context, *ListTopicSnapshotsRequest) (*ListTopicSnapshotsResponse, error)
+	// Deletes the topic with the given name. Returns `NOT_FOUND` if the topic
+	// does not exist. After a topic is deleted, a new topic may be created with
+	// the same name; this is an entirely new topic with none of the old
+	// configuration or subscriptions. Existing subscriptions to this topic are
+	// not deleted, but their `topic` field is set to `_deleted-topic_`.
+	DeleteTopic(context.Context, *DeleteTopicRequest) (*empty.Empty, error)
 }
 
-func (x *subscriberStreamingPullClient) Send(m *StreamingPullRequest) error {
-	return x.ClientStream.SendMsg(m)
+func RegisterPublisherServer(s *grpc.Server, srv PublisherServer) {
+	s.RegisterService(&_Publisher_serviceDesc, srv)
 }
 
-func (x *subscriberStreamingPullClient) Recv() (*StreamingPullResponse, error) {
-	m := new(StreamingPullResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *subscriberClient) ModifyPushConfig(ctx context.Context, in *ModifyPushConfigRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/ModifyPushConfig", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *subscriberClient) ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error) {
-	out := new(ListSnapshotsResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/ListSnapshots", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *subscriberClient) CreateSnapshot(ctx context.Context, in *CreateSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error) {
-	out := new(Snapshot)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/CreateSnapshot", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *subscriberClient) UpdateSnapshot(ctx context.Context, in *UpdateSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error) {
-	out := new(Snapshot)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/UpdateSnapshot", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *subscriberClient) DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/DeleteSnapshot", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *subscriberClient) Seek(ctx context.Context, in *SeekRequest, opts ...grpc.CallOption) (*SeekResponse, error) {
-	out := new(SeekResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Subscriber/Seek", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for Subscriber service
-
-type SubscriberServer interface {
-	// Creates a subscription to a given topic.
-	// If the subscription already exists, returns `ALREADY_EXISTS`.
-	// If the corresponding topic doesn't exist, returns `NOT_FOUND`.
-	//
-	// If the name is not provided in the request, the server will assign a random
-	// name for this subscription on the same project as the topic, conforming
-	// to the
-	// [resource name format](https://cloud.google.com/pubsub/docs/overview#names).
-	// The generated name is populated in the returned Subscription object.
-	// Note that for REST API requests, you must specify a name in the request.
-	CreateSubscription(context.Context, *Subscription) (*Subscription, error)
-	// Gets the configuration details of a subscription.
-	GetSubscription(context.Context, *GetSubscriptionRequest) (*Subscription, error)
-	// Updates an existing subscription. Note that certain properties of a
-	// subscription, such as its topic, are not modifiable.
-	// NOTE:  The style guide requires body: "subscription" instead of body: "*".
-	// Keeping the latter for internal consistency in V1, however it should be
-	// corrected in V2.  See
-	// https://cloud.google.com/apis/design/standard_methods#update for details.
-	UpdateSubscription(context.Context, *UpdateSubscriptionRequest) (*Subscription, error)
-	// Lists matching subscriptions.
-	ListSubscriptions(context.Context, *ListSubscriptionsRequest) (*ListSubscriptionsResponse, error)
-	// Deletes an existing subscription. All messages retained in the subscription
-	// are immediately dropped. Calls to `Pull` after deletion will return
-	// `NOT_FOUND`. After a subscription is deleted, a new one may be created with
-	// the same name, but the new one has no association with the old
-	// subscription or its topic unless the same topic is specified.
-	DeleteSubscription(context.Context, *DeleteSubscriptionRequest) (*google_protobuf2.Empty, error)
-	// Modifies the ack deadline for a specific message. This method is useful
-	// to indicate that more time is needed to process a message by the
-	// subscriber, or to make the message available for redelivery if the
-	// processing was interrupted. Note that this does not modify the
-	// subscription-level `ackDeadlineSeconds` used for subsequent messages.
-	ModifyAckDeadline(context.Context, *ModifyAckDeadlineRequest) (*google_protobuf2.Empty, error)
-	// Acknowledges the messages associated with the `ack_ids` in the
-	// `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages
-	// from the subscription.
-	//
-	// Acknowledging a message whose ack deadline has expired may succeed,
-	// but such a message may be redelivered later. Acknowledging a message more
-	// than once will not result in an error.
-	Acknowledge(context.Context, *AcknowledgeRequest) (*google_protobuf2.Empty, error)
-	// Pulls messages from the server. Returns an empty list if there are no
-	// messages available in the backlog. The server may return `UNAVAILABLE` if
-	// there are too many concurrent pull requests pending for the given
-	// subscription.
-	Pull(context.Context, *PullRequest) (*PullResponse, error)
-	// (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will
-	// respond with UNIMPLEMENTED errors unless you have been invited to test
-	// this feature. Contact cloud-pubsub@google.com with any questions.
-	//
-	// Establishes a stream with the server, which sends messages down to the
-	// client. The client streams acknowledgements and ack deadline modifications
-	// back to the server. The server will close the stream and return the status
-	// on any error. The server may close the stream with status `OK` to reassign
-	// server-side resources, in which case, the client should re-establish the
-	// stream. `UNAVAILABLE` may also be returned in the case of a transient error
-	// (e.g., a server restart). These should also be retried by the client. Flow
-	// control can be achieved by configuring the underlying RPC channel.
-	StreamingPull(Subscriber_StreamingPullServer) error
-	// Modifies the `PushConfig` for a specified subscription.
-	//
-	// This may be used to change a push subscription to a pull one (signified by
-	// an empty `PushConfig`) or vice versa, or change the endpoint URL and other
-	// attributes of a push subscription. Messages will accumulate for delivery
-	// continuously through the call regardless of changes to the `PushConfig`.
-	ModifyPushConfig(context.Context, *ModifyPushConfigRequest) (*google_protobuf2.Empty, error)
-	// Lists the existing snapshots.
-	ListSnapshots(context.Context, *ListSnapshotsRequest) (*ListSnapshotsResponse, error)
-	// Creates a snapshot from the requested subscription.
-	// If the snapshot already exists, returns `ALREADY_EXISTS`.
-	// If the requested subscription doesn't exist, returns `NOT_FOUND`.
-	//
-	// If the name is not provided in the request, the server will assign a random
-	// name for this snapshot on the same project as the subscription, conforming
-	// to the
-	// [resource name format](https://cloud.google.com/pubsub/docs/overview#names).
-	// The generated name is populated in the returned Snapshot object.
-	// Note that for REST API requests, you must specify a name in the request.
-	CreateSnapshot(context.Context, *CreateSnapshotRequest) (*Snapshot, error)
-	// Updates an existing snapshot. Note that certain properties of a snapshot
-	// are not modifiable.
-	// NOTE:  The style guide requires body: "snapshot" instead of body: "*".
-	// Keeping the latter for internal consistency in V1, however it should be
-	// corrected in V2.  See
-	// https://cloud.google.com/apis/design/standard_methods#update for details.
-	UpdateSnapshot(context.Context, *UpdateSnapshotRequest) (*Snapshot, error)
-	// Removes an existing snapshot. All messages retained in the snapshot
-	// are immediately dropped. After a snapshot is deleted, a new one may be
-	// created with the same name, but the new one has no association with the old
-	// snapshot or its subscription, unless the same subscription is specified.
-	DeleteSnapshot(context.Context, *DeleteSnapshotRequest) (*google_protobuf2.Empty, error)
-	// Seeks an existing subscription to a point in time or to a given snapshot,
-	// whichever is provided in the request.
-	Seek(context.Context, *SeekRequest) (*SeekResponse, error)
-}
-
-func RegisterSubscriberServer(s *grpc.Server, srv SubscriberServer) {
-	s.RegisterService(&_Subscriber_serviceDesc, srv)
-}
-
-func _Subscriber_CreateSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(Subscription)
-	if err := dec(in); err != nil {
+func _Publisher_CreateTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(Topic)
+	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).CreateSubscription(ctx, in)
+		return srv.(PublisherServer).CreateTopic(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/CreateSubscription",
+		FullMethod: "/google.pubsub.v1.Publisher/CreateTopic",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).CreateSubscription(ctx, req.(*Subscription))
+		return srv.(PublisherServer).CreateTopic(ctx, req.(*Topic))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_GetSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetSubscriptionRequest)
+func _Publisher_UpdateTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateTopicRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).GetSubscription(ctx, in)
+		return srv.(PublisherServer).UpdateTopic(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/GetSubscription",
+		FullMethod: "/google.pubsub.v1.Publisher/UpdateTopic",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).GetSubscription(ctx, req.(*GetSubscriptionRequest))
+		return srv.(PublisherServer).UpdateTopic(ctx, req.(*UpdateTopicRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_UpdateSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateSubscriptionRequest)
+func _Publisher_Publish_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PublishRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).UpdateSubscription(ctx, in)
+		return srv.(PublisherServer).Publish(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/UpdateSubscription",
+		FullMethod: "/google.pubsub.v1.Publisher/Publish",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).UpdateSubscription(ctx, req.(*UpdateSubscriptionRequest))
+		return srv.(PublisherServer).Publish(ctx, req.(*PublishRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_ListSubscriptions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListSubscriptionsRequest)
+func _Publisher_GetTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetTopicRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).ListSubscriptions(ctx, in)
+		return srv.(PublisherServer).GetTopic(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/ListSubscriptions",
+		FullMethod: "/google.pubsub.v1.Publisher/GetTopic",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).ListSubscriptions(ctx, req.(*ListSubscriptionsRequest))
+		return srv.(PublisherServer).GetTopic(ctx, req.(*GetTopicRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_DeleteSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteSubscriptionRequest)
+func _Publisher_ListTopics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListTopicsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).DeleteSubscription(ctx, in)
+		return srv.(PublisherServer).ListTopics(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/DeleteSubscription",
+		FullMethod: "/google.pubsub.v1.Publisher/ListTopics",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).DeleteSubscription(ctx, req.(*DeleteSubscriptionRequest))
+		return srv.(PublisherServer).ListTopics(ctx, req.(*ListTopicsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_ModifyAckDeadline_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ModifyAckDeadlineRequest)
+func _Publisher_ListTopicSubscriptions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListTopicSubscriptionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).ModifyAckDeadline(ctx, in)
+		return srv.(PublisherServer).ListTopicSubscriptions(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/ModifyAckDeadline",
+		FullMethod: "/google.pubsub.v1.Publisher/ListTopicSubscriptions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).ModifyAckDeadline(ctx, req.(*ModifyAckDeadlineRequest))
+		return srv.(PublisherServer).ListTopicSubscriptions(ctx, req.(*ListTopicSubscriptionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_Acknowledge_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AcknowledgeRequest)
+func _Publisher_ListTopicSnapshots_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListTopicSnapshotsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).Acknowledge(ctx, in)
+		return srv.(PublisherServer).ListTopicSnapshots(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/Acknowledge",
+		FullMethod: "/google.pubsub.v1.Publisher/ListTopicSnapshots",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).Acknowledge(ctx, req.(*AcknowledgeRequest))
+		return srv.(PublisherServer).ListTopicSnapshots(ctx, req.(*ListTopicSnapshotsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_Pull_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PullRequest)
+func _Publisher_DeleteTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteTopicRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).Pull(ctx, in)
+		return srv.(PublisherServer).DeleteTopic(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/Pull",
+		FullMethod: "/google.pubsub.v1.Publisher/DeleteTopic",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).Pull(ctx, req.(*PullRequest))
+		return srv.(PublisherServer).DeleteTopic(ctx, req.(*DeleteTopicRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_StreamingPull_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(SubscriberServer).StreamingPull(&subscriberStreamingPullServer{stream})
-}
-
-type Subscriber_StreamingPullServer interface {
-	Send(*StreamingPullResponse) error
-	Recv() (*StreamingPullRequest, error)
-	grpc.ServerStream
-}
-
-type subscriberStreamingPullServer struct {
-	grpc.ServerStream
-}
-
-func (x *subscriberStreamingPullServer) Send(m *StreamingPullResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *subscriberStreamingPullServer) Recv() (*StreamingPullRequest, error) {
-	m := new(StreamingPullRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
+var _Publisher_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.pubsub.v1.Publisher",
+	HandlerType: (*PublisherServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "CreateTopic",
+			Handler:    _Publisher_CreateTopic_Handler,
+		},
+		{
+			MethodName: "UpdateTopic",
+			Handler:    _Publisher_UpdateTopic_Handler,
+		},
+		{
+			MethodName: "Publish",
+			Handler:    _Publisher_Publish_Handler,
+		},
+		{
+			MethodName: "GetTopic",
+			Handler:    _Publisher_GetTopic_Handler,
+		},
+		{
+			MethodName: "ListTopics",
+			Handler:    _Publisher_ListTopics_Handler,
+		},
+		{
+			MethodName: "ListTopicSubscriptions",
+			Handler:    _Publisher_ListTopicSubscriptions_Handler,
+		},
+		{
+			MethodName: "ListTopicSnapshots",
+			Handler:    _Publisher_ListTopicSnapshots_Handler,
+		},
+		{
+			MethodName: "DeleteTopic",
+			Handler:    _Publisher_DeleteTopic_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "google/pubsub/v1/pubsub.proto",
 }
 
-func _Subscriber_ModifyPushConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ModifyPushConfigRequest)
-	if err := dec(in); err != nil {
+// SubscriberClient is the client API for Subscriber service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type SubscriberClient interface {
+	// Creates a subscription to a given topic. See the
+	// <a href="/pubsub/docs/admin#resource_names"> resource name rules</a>.
+	// If the subscription already exists, returns `ALREADY_EXISTS`.
+	// If the corresponding topic doesn't exist, returns `NOT_FOUND`.
+	//
+	// If the name is not provided in the request, the server will assign a random
+	// name for this subscription on the same project as the topic, conforming
+	// to the
+	// [resource name format](https://cloud.google.com/pubsub/docs/overview#names).
+	// The generated name is populated in the returned Subscription object.
+	// Note that for REST API requests, you must specify a name in the request.
+	CreateSubscription(ctx context.Context, in *Subscription, opts ...grpc.CallOption) (*Subscription, error)
+	// Gets the configuration details of a subscription.
+	GetSubscription(ctx context.Context, in *GetSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error)
+	// Updates an existing subscription. Note that certain properties of a
+	// subscription, such as its topic, are not modifiable.
+	UpdateSubscription(ctx context.Context, in *UpdateSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error)
+	// Lists matching subscriptions.
+	ListSubscriptions(ctx context.Context, in *ListSubscriptionsRequest, opts ...grpc.CallOption) (*ListSubscriptionsResponse, error)
+	// Deletes an existing subscription. All messages retained in the subscription
+	// are immediately dropped. Calls to `Pull` after deletion will return
+	// `NOT_FOUND`. After a subscription is deleted, a new one may be created with
+	// the same name, but the new one has no association with the old
+	// subscription or its topic unless the same topic is specified.
+	DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Modifies the ack deadline for a specific message. This method is useful
+	// to indicate that more time is needed to process a message by the
+	// subscriber, or to make the message available for redelivery if the
+	// processing was interrupted. Note that this does not modify the
+	// subscription-level `ackDeadlineSeconds` used for subsequent messages.
+	ModifyAckDeadline(ctx context.Context, in *ModifyAckDeadlineRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Acknowledges the messages associated with the `ack_ids` in the
+	// `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages
+	// from the subscription.
+	//
+	// Acknowledging a message whose ack deadline has expired may succeed,
+	// but such a message may be redelivered later. Acknowledging a message more
+	// than once will not result in an error.
+	Acknowledge(ctx context.Context, in *AcknowledgeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Pulls messages from the server. Returns an empty list if there are no
+	// messages available in the backlog. The server may return `UNAVAILABLE` if
+	// there are too many concurrent pull requests pending for the given
+	// subscription.
+	Pull(ctx context.Context, in *PullRequest, opts ...grpc.CallOption) (*PullResponse, error)
+	// Establishes a stream with the server, which sends messages down to the
+	// client. The client streams acknowledgements and ack deadline modifications
+	// back to the server. The server will close the stream and return the status
+	// on any error. The server may close the stream with status `UNAVAILABLE` to
+	// reassign server-side resources, in which case, the client should
+	// re-establish the stream. Flow control can be achieved by configuring the
+	// underlying RPC channel.
+	StreamingPull(ctx context.Context, opts ...grpc.CallOption) (Subscriber_StreamingPullClient, error)
+	// Modifies the `PushConfig` for a specified subscription.
+	//
+	// This may be used to change a push subscription to a pull one (signified by
+	// an empty `PushConfig`) or vice versa, or change the endpoint URL and other
+	// attributes of a push subscription. Messages will accumulate for delivery
+	// continuously through the call regardless of changes to the `PushConfig`.
+	ModifyPushConfig(ctx context.Context, in *ModifyPushConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Gets the configuration details of a snapshot.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	GetSnapshot(ctx context.Context, in *GetSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error)
+	// Lists the existing snapshots.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error)
+	// Creates a snapshot from the requested subscription.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	// If the snapshot already exists, returns `ALREADY_EXISTS`.
+	// If the requested subscription doesn't exist, returns `NOT_FOUND`.
+	// If the backlog in the subscription is too old -- and the resulting snapshot
+	// would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned.
+	// See also the `Snapshot.expire_time` field. If the name is not provided in
+	// the request, the server will assign a random
+	// name for this snapshot on the same project as the subscription, conforming
+	// to the [resource name format](https://cloud.google.com/pubsub/docs/overview#names).
+	// The generated
+	// name is populated in the returned Snapshot object. Note that for REST API
+	// requests, you must specify a name in the request.
+	CreateSnapshot(ctx context.Context, in *CreateSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error)
+	// Updates an existing snapshot.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	// Note that certain properties of a snapshot are not modifiable.
+	UpdateSnapshot(ctx context.Context, in *UpdateSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error)
+	// Removes an existing snapshot. <br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	// When the snapshot is deleted, all messages retained in the snapshot
+	// are immediately dropped. After a snapshot is deleted, a new one may be
+	// created with the same name, but the new one has no association with the old
+	// snapshot or its subscription, unless the same subscription is specified.
+	DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	// Seeks an existing subscription to a point in time or to a given snapshot,
+	// whichever is provided in the request.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	Seek(ctx context.Context, in *SeekRequest, opts ...grpc.CallOption) (*SeekResponse, error)
+}
+
+type subscriberClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewSubscriberClient(cc *grpc.ClientConn) SubscriberClient {
+	return &subscriberClient{cc}
+}
+
+func (c *subscriberClient) CreateSubscription(ctx context.Context, in *Subscription, opts ...grpc.CallOption) (*Subscription, error) {
+	out := new(Subscription)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/CreateSubscription", in, out, opts...)
+	if err != nil {
 		return nil, err
 	}
-	if interceptor == nil {
-		return srv.(SubscriberServer).ModifyPushConfig(ctx, in)
+	return out, nil
+}
+
+func (c *subscriberClient) GetSubscription(ctx context.Context, in *GetSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error) {
+	out := new(Subscription)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/GetSubscription", in, out, opts...)
+	if err != nil {
+		return nil, err
 	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/ModifyPushConfig",
+	return out, nil
+}
+
+func (c *subscriberClient) UpdateSubscription(ctx context.Context, in *UpdateSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error) {
+	out := new(Subscription)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/UpdateSubscription", in, out, opts...)
+	if err != nil {
+		return nil, err
 	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).ModifyPushConfig(ctx, req.(*ModifyPushConfigRequest))
+	return out, nil
+}
+
+func (c *subscriberClient) ListSubscriptions(ctx context.Context, in *ListSubscriptionsRequest, opts ...grpc.CallOption) (*ListSubscriptionsResponse, error) {
+	out := new(ListSubscriptionsResponse)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/ListSubscriptions", in, out, opts...)
+	if err != nil {
+		return nil, err
 	}
-	return interceptor(ctx, in, info, handler)
+	return out, nil
 }
 
-func _Subscriber_ListSnapshots_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListSnapshotsRequest)
-	if err := dec(in); err != nil {
+func (c *subscriberClient) DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/DeleteSubscription", in, out, opts...)
+	if err != nil {
 		return nil, err
 	}
-	if interceptor == nil {
-		return srv.(SubscriberServer).ListSnapshots(ctx, in)
+	return out, nil
+}
+
+func (c *subscriberClient) ModifyAckDeadline(ctx context.Context, in *ModifyAckDeadlineRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/ModifyAckDeadline", in, out, opts...)
+	if err != nil {
+		return nil, err
 	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/ListSnapshots",
+	return out, nil
+}
+
+func (c *subscriberClient) Acknowledge(ctx context.Context, in *AcknowledgeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/Acknowledge", in, out, opts...)
+	if err != nil {
+		return nil, err
 	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).ListSnapshots(ctx, req.(*ListSnapshotsRequest))
+	return out, nil
+}
+
+func (c *subscriberClient) Pull(ctx context.Context, in *PullRequest, opts ...grpc.CallOption) (*PullResponse, error) {
+	out := new(PullResponse)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/Pull", in, out, opts...)
+	if err != nil {
+		return nil, err
 	}
-	return interceptor(ctx, in, info, handler)
+	return out, nil
 }
 
-func _Subscriber_CreateSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateSnapshotRequest)
-	if err := dec(in); err != nil {
+func (c *subscriberClient) StreamingPull(ctx context.Context, opts ...grpc.CallOption) (Subscriber_StreamingPullClient, error) {
+	stream, err := c.cc.NewStream(ctx, &_Subscriber_serviceDesc.Streams[0], "/google.pubsub.v1.Subscriber/StreamingPull", opts...)
+	if err != nil {
 		return nil, err
 	}
-	if interceptor == nil {
-		return srv.(SubscriberServer).CreateSnapshot(ctx, in)
+	x := &subscriberStreamingPullClient{stream}
+	return x, nil
+}
+
+type Subscriber_StreamingPullClient interface {
+	Send(*StreamingPullRequest) error
+	Recv() (*StreamingPullResponse, error)
+	grpc.ClientStream
+}
+
+type subscriberStreamingPullClient struct {
+	grpc.ClientStream
+}
+
+func (x *subscriberStreamingPullClient) Send(m *StreamingPullRequest) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *subscriberStreamingPullClient) Recv() (*StreamingPullResponse, error) {
+	m := new(StreamingPullResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
 	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/CreateSnapshot",
+	return m, nil
+}
+
+func (c *subscriberClient) ModifyPushConfig(ctx context.Context, in *ModifyPushConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/ModifyPushConfig", in, out, opts...)
+	if err != nil {
+		return nil, err
 	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).CreateSnapshot(ctx, req.(*CreateSnapshotRequest))
+	return out, nil
+}
+
+func (c *subscriberClient) GetSnapshot(ctx context.Context, in *GetSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error) {
+	out := new(Snapshot)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/GetSnapshot", in, out, opts...)
+	if err != nil {
+		return nil, err
 	}
-	return interceptor(ctx, in, info, handler)
+	return out, nil
 }
 
-func _Subscriber_UpdateSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateSnapshotRequest)
+func (c *subscriberClient) ListSnapshots(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (*ListSnapshotsResponse, error) {
+	out := new(ListSnapshotsResponse)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/ListSnapshots", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *subscriberClient) CreateSnapshot(ctx context.Context, in *CreateSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error) {
+	out := new(Snapshot)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/CreateSnapshot", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *subscriberClient) UpdateSnapshot(ctx context.Context, in *UpdateSnapshotRequest, opts ...grpc.CallOption) (*Snapshot, error) {
+	out := new(Snapshot)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/UpdateSnapshot", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *subscriberClient) DeleteSnapshot(ctx context.Context, in *DeleteSnapshotRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/DeleteSnapshot", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *subscriberClient) Seek(ctx context.Context, in *SeekRequest, opts ...grpc.CallOption) (*SeekResponse, error) {
+	out := new(SeekResponse)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1.Subscriber/Seek", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// SubscriberServer is the server API for Subscriber service.
+type SubscriberServer interface {
+	// Creates a subscription to a given topic. See the
+	// <a href="/pubsub/docs/admin#resource_names"> resource name rules</a>.
+	// If the subscription already exists, returns `ALREADY_EXISTS`.
+	// If the corresponding topic doesn't exist, returns `NOT_FOUND`.
+	//
+	// If the name is not provided in the request, the server will assign a random
+	// name for this subscription on the same project as the topic, conforming
+	// to the
+	// [resource name format](https://cloud.google.com/pubsub/docs/overview#names).
+	// The generated name is populated in the returned Subscription object.
+	// Note that for REST API requests, you must specify a name in the request.
+	CreateSubscription(context.Context, *Subscription) (*Subscription, error)
+	// Gets the configuration details of a subscription.
+	GetSubscription(context.Context, *GetSubscriptionRequest) (*Subscription, error)
+	// Updates an existing subscription. Note that certain properties of a
+	// subscription, such as its topic, are not modifiable.
+	UpdateSubscription(context.Context, *UpdateSubscriptionRequest) (*Subscription, error)
+	// Lists matching subscriptions.
+	ListSubscriptions(context.Context, *ListSubscriptionsRequest) (*ListSubscriptionsResponse, error)
+	// Deletes an existing subscription. All messages retained in the subscription
+	// are immediately dropped. Calls to `Pull` after deletion will return
+	// `NOT_FOUND`. After a subscription is deleted, a new one may be created with
+	// the same name, but the new one has no association with the old
+	// subscription or its topic unless the same topic is specified.
+	DeleteSubscription(context.Context, *DeleteSubscriptionRequest) (*empty.Empty, error)
+	// Modifies the ack deadline for a specific message. This method is useful
+	// to indicate that more time is needed to process a message by the
+	// subscriber, or to make the message available for redelivery if the
+	// processing was interrupted. Note that this does not modify the
+	// subscription-level `ackDeadlineSeconds` used for subsequent messages.
+	ModifyAckDeadline(context.Context, *ModifyAckDeadlineRequest) (*empty.Empty, error)
+	// Acknowledges the messages associated with the `ack_ids` in the
+	// `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages
+	// from the subscription.
+	//
+	// Acknowledging a message whose ack deadline has expired may succeed,
+	// but such a message may be redelivered later. Acknowledging a message more
+	// than once will not result in an error.
+	Acknowledge(context.Context, *AcknowledgeRequest) (*empty.Empty, error)
+	// Pulls messages from the server. Returns an empty list if there are no
+	// messages available in the backlog. The server may return `UNAVAILABLE` if
+	// there are too many concurrent pull requests pending for the given
+	// subscription.
+	Pull(context.Context, *PullRequest) (*PullResponse, error)
+	// Establishes a stream with the server, which sends messages down to the
+	// client. The client streams acknowledgements and ack deadline modifications
+	// back to the server. The server will close the stream and return the status
+	// on any error. The server may close the stream with status `UNAVAILABLE` to
+	// reassign server-side resources, in which case, the client should
+	// re-establish the stream. Flow control can be achieved by configuring the
+	// underlying RPC channel.
+	StreamingPull(Subscriber_StreamingPullServer) error
+	// Modifies the `PushConfig` for a specified subscription.
+	//
+	// This may be used to change a push subscription to a pull one (signified by
+	// an empty `PushConfig`) or vice versa, or change the endpoint URL and other
+	// attributes of a push subscription. Messages will accumulate for delivery
+	// continuously through the call regardless of changes to the `PushConfig`.
+	ModifyPushConfig(context.Context, *ModifyPushConfigRequest) (*empty.Empty, error)
+	// Gets the configuration details of a snapshot.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	GetSnapshot(context.Context, *GetSnapshotRequest) (*Snapshot, error)
+	// Lists the existing snapshots.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	ListSnapshots(context.Context, *ListSnapshotsRequest) (*ListSnapshotsResponse, error)
+	// Creates a snapshot from the requested subscription.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	// If the snapshot already exists, returns `ALREADY_EXISTS`.
+	// If the requested subscription doesn't exist, returns `NOT_FOUND`.
+	// If the backlog in the subscription is too old -- and the resulting snapshot
+	// would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned.
+	// See also the `Snapshot.expire_time` field. If the name is not provided in
+	// the request, the server will assign a random
+	// name for this snapshot on the same project as the subscription, conforming
+	// to the [resource name format](https://cloud.google.com/pubsub/docs/overview#names).
+	// The generated
+	// name is populated in the returned Snapshot object. Note that for REST API
+	// requests, you must specify a name in the request.
+	CreateSnapshot(context.Context, *CreateSnapshotRequest) (*Snapshot, error)
+	// Updates an existing snapshot.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	// Note that certain properties of a snapshot are not modifiable.
+	UpdateSnapshot(context.Context, *UpdateSnapshotRequest) (*Snapshot, error)
+	// Removes an existing snapshot. <br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	// When the snapshot is deleted, all messages retained in the snapshot
+	// are immediately dropped. After a snapshot is deleted, a new one may be
+	// created with the same name, but the new one has no association with the old
+	// snapshot or its subscription, unless the same subscription is specified.
+	DeleteSnapshot(context.Context, *DeleteSnapshotRequest) (*empty.Empty, error)
+	// Seeks an existing subscription to a point in time or to a given snapshot,
+	// whichever is provided in the request.<br><br>
+	// <b>ALPHA:</b> This feature is part of an alpha release. This API might be
+	// changed in backward-incompatible ways and is not recommended for production
+	// use. It is not subject to any SLA or deprecation policy.
+	Seek(context.Context, *SeekRequest) (*SeekResponse, error)
+}
+
+func RegisterSubscriberServer(s *grpc.Server, srv SubscriberServer) {
+	s.RegisterService(&_Subscriber_serviceDesc, srv)
+}
+
+func _Subscriber_CreateSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(Subscription)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).UpdateSnapshot(ctx, in)
+		return srv.(SubscriberServer).CreateSubscription(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/UpdateSnapshot",
+		FullMethod: "/google.pubsub.v1.Subscriber/CreateSubscription",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).UpdateSnapshot(ctx, req.(*UpdateSnapshotRequest))
+		return srv.(SubscriberServer).CreateSubscription(ctx, req.(*Subscription))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_DeleteSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteSnapshotRequest)
+func _Subscriber_GetSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetSubscriptionRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).DeleteSnapshot(ctx, in)
+		return srv.(SubscriberServer).GetSubscription(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/DeleteSnapshot",
+		FullMethod: "/google.pubsub.v1.Subscriber/GetSubscription",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).DeleteSnapshot(ctx, req.(*DeleteSnapshotRequest))
+		return srv.(SubscriberServer).GetSubscription(ctx, req.(*GetSubscriptionRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Subscriber_Seek_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SeekRequest)
+func _Subscriber_UpdateSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateSubscriptionRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SubscriberServer).Seek(ctx, in)
+		return srv.(SubscriberServer).UpdateSubscription(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Subscriber/Seek",
+		FullMethod: "/google.pubsub.v1.Subscriber/UpdateSubscription",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SubscriberServer).Seek(ctx, req.(*SeekRequest))
+		return srv.(SubscriberServer).UpdateSubscription(ctx, req.(*UpdateSubscriptionRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-var _Subscriber_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.pubsub.v1.Subscriber",
-	HandlerType: (*SubscriberServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "CreateSubscription",
-			Handler:    _Subscriber_CreateSubscription_Handler,
-		},
-		{
-			MethodName: "GetSubscription",
-			Handler:    _Subscriber_GetSubscription_Handler,
-		},
-		{
-			MethodName: "UpdateSubscription",
-			Handler:    _Subscriber_UpdateSubscription_Handler,
-		},
-		{
-			MethodName: "ListSubscriptions",
-			Handler:    _Subscriber_ListSubscriptions_Handler,
-		},
-		{
-			MethodName: "DeleteSubscription",
-			Handler:    _Subscriber_DeleteSubscription_Handler,
-		},
-		{
-			MethodName: "ModifyAckDeadline",
-			Handler:    _Subscriber_ModifyAckDeadline_Handler,
-		},
-		{
-			MethodName: "Acknowledge",
-			Handler:    _Subscriber_Acknowledge_Handler,
-		},
-		{
-			MethodName: "Pull",
-			Handler:    _Subscriber_Pull_Handler,
-		},
-		{
-			MethodName: "ModifyPushConfig",
-			Handler:    _Subscriber_ModifyPushConfig_Handler,
-		},
-		{
-			MethodName: "ListSnapshots",
-			Handler:    _Subscriber_ListSnapshots_Handler,
-		},
-		{
-			MethodName: "CreateSnapshot",
-			Handler:    _Subscriber_CreateSnapshot_Handler,
-		},
-		{
-			MethodName: "UpdateSnapshot",
-			Handler:    _Subscriber_UpdateSnapshot_Handler,
-		},
-		{
-			MethodName: "DeleteSnapshot",
-			Handler:    _Subscriber_DeleteSnapshot_Handler,
-		},
-		{
-			MethodName: "Seek",
-			Handler:    _Subscriber_Seek_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "StreamingPull",
-			Handler:       _Subscriber_StreamingPull_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-	Metadata: "google/pubsub/v1/pubsub.proto",
-}
-
-// Client API for Publisher service
-
-type PublisherClient interface {
-	// Creates the given topic with the given name.
-	CreateTopic(ctx context.Context, in *Topic, opts ...grpc.CallOption) (*Topic, error)
-	// Updates an existing topic. Note that certain properties of a topic are not
-	// modifiable.  Options settings follow the style guide:
-	// NOTE:  The style guide requires body: "topic" instead of body: "*".
-	// Keeping the latter for internal consistency in V1, however it should be
-	// corrected in V2.  See
-	// https://cloud.google.com/apis/design/standard_methods#update for details.
-	UpdateTopic(ctx context.Context, in *UpdateTopicRequest, opts ...grpc.CallOption) (*Topic, error)
-	// Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic
-	// does not exist. The message payload must not be empty; it must contain
-	//  either a non-empty data field, or at least one attribute.
-	Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*PublishResponse, error)
-	// Gets the configuration of a topic.
-	GetTopic(ctx context.Context, in *GetTopicRequest, opts ...grpc.CallOption) (*Topic, error)
-	// Lists matching topics.
-	ListTopics(ctx context.Context, in *ListTopicsRequest, opts ...grpc.CallOption) (*ListTopicsResponse, error)
-	// Lists the name of the subscriptions for this topic.
-	ListTopicSubscriptions(ctx context.Context, in *ListTopicSubscriptionsRequest, opts ...grpc.CallOption) (*ListTopicSubscriptionsResponse, error)
-	// Deletes the topic with the given name. Returns `NOT_FOUND` if the topic
-	// does not exist. After a topic is deleted, a new topic may be created with
-	// the same name; this is an entirely new topic with none of the old
-	// configuration or subscriptions. Existing subscriptions to this topic are
-	// not deleted, but their `topic` field is set to `_deleted-topic_`.
-	DeleteTopic(ctx context.Context, in *DeleteTopicRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
-}
-
-type publisherClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewPublisherClient(cc *grpc.ClientConn) PublisherClient {
-	return &publisherClient{cc}
-}
-
-func (c *publisherClient) CreateTopic(ctx context.Context, in *Topic, opts ...grpc.CallOption) (*Topic, error) {
-	out := new(Topic)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Publisher/CreateTopic", in, out, c.cc, opts...)
-	if err != nil {
+func _Subscriber_ListSubscriptions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListSubscriptionsRequest)
+	if err := dec(in); err != nil {
 		return nil, err
 	}
-	return out, nil
-}
-
-func (c *publisherClient) UpdateTopic(ctx context.Context, in *UpdateTopicRequest, opts ...grpc.CallOption) (*Topic, error) {
-	out := new(Topic)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Publisher/UpdateTopic", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(SubscriberServer).ListSubscriptions(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.pubsub.v1.Subscriber/ListSubscriptions",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SubscriberServer).ListSubscriptions(ctx, req.(*ListSubscriptionsRequest))
 	}
-	return out, nil
+	return interceptor(ctx, in, info, handler)
 }
 
-func (c *publisherClient) Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*PublishResponse, error) {
-	out := new(PublishResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Publisher/Publish", in, out, c.cc, opts...)
-	if err != nil {
+func _Subscriber_DeleteSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteSubscriptionRequest)
+	if err := dec(in); err != nil {
 		return nil, err
 	}
-	return out, nil
+	if interceptor == nil {
+		return srv.(SubscriberServer).DeleteSubscription(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.pubsub.v1.Subscriber/DeleteSubscription",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SubscriberServer).DeleteSubscription(ctx, req.(*DeleteSubscriptionRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func (c *publisherClient) GetTopic(ctx context.Context, in *GetTopicRequest, opts ...grpc.CallOption) (*Topic, error) {
-	out := new(Topic)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Publisher/GetTopic", in, out, c.cc, opts...)
-	if err != nil {
+func _Subscriber_ModifyAckDeadline_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ModifyAckDeadlineRequest)
+	if err := dec(in); err != nil {
 		return nil, err
 	}
-	return out, nil
+	if interceptor == nil {
+		return srv.(SubscriberServer).ModifyAckDeadline(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.pubsub.v1.Subscriber/ModifyAckDeadline",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SubscriberServer).ModifyAckDeadline(ctx, req.(*ModifyAckDeadlineRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func (c *publisherClient) ListTopics(ctx context.Context, in *ListTopicsRequest, opts ...grpc.CallOption) (*ListTopicsResponse, error) {
-	out := new(ListTopicsResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Publisher/ListTopics", in, out, c.cc, opts...)
-	if err != nil {
+func _Subscriber_Acknowledge_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AcknowledgeRequest)
+	if err := dec(in); err != nil {
 		return nil, err
 	}
-	return out, nil
+	if interceptor == nil {
+		return srv.(SubscriberServer).Acknowledge(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.pubsub.v1.Subscriber/Acknowledge",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SubscriberServer).Acknowledge(ctx, req.(*AcknowledgeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func (c *publisherClient) ListTopicSubscriptions(ctx context.Context, in *ListTopicSubscriptionsRequest, opts ...grpc.CallOption) (*ListTopicSubscriptionsResponse, error) {
-	out := new(ListTopicSubscriptionsResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Publisher/ListTopicSubscriptions", in, out, c.cc, opts...)
-	if err != nil {
+func _Subscriber_Pull_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PullRequest)
+	if err := dec(in); err != nil {
 		return nil, err
 	}
-	return out, nil
+	if interceptor == nil {
+		return srv.(SubscriberServer).Pull(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/google.pubsub.v1.Subscriber/Pull",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SubscriberServer).Pull(ctx, req.(*PullRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func (c *publisherClient) DeleteTopic(ctx context.Context, in *DeleteTopicRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1.Publisher/DeleteTopic", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
+func _Subscriber_StreamingPull_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(SubscriberServer).StreamingPull(&subscriberStreamingPullServer{stream})
 }
 
-// Server API for Publisher service
+type Subscriber_StreamingPullServer interface {
+	Send(*StreamingPullResponse) error
+	Recv() (*StreamingPullRequest, error)
+	grpc.ServerStream
+}
 
-type PublisherServer interface {
-	// Creates the given topic with the given name.
-	CreateTopic(context.Context, *Topic) (*Topic, error)
-	// Updates an existing topic. Note that certain properties of a topic are not
-	// modifiable.  Options settings follow the style guide:
-	// NOTE:  The style guide requires body: "topic" instead of body: "*".
-	// Keeping the latter for internal consistency in V1, however it should be
-	// corrected in V2.  See
-	// https://cloud.google.com/apis/design/standard_methods#update for details.
-	UpdateTopic(context.Context, *UpdateTopicRequest) (*Topic, error)
-	// Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic
-	// does not exist. The message payload must not be empty; it must contain
-	//  either a non-empty data field, or at least one attribute.
-	Publish(context.Context, *PublishRequest) (*PublishResponse, error)
-	// Gets the configuration of a topic.
-	GetTopic(context.Context, *GetTopicRequest) (*Topic, error)
-	// Lists matching topics.
-	ListTopics(context.Context, *ListTopicsRequest) (*ListTopicsResponse, error)
-	// Lists the name of the subscriptions for this topic.
-	ListTopicSubscriptions(context.Context, *ListTopicSubscriptionsRequest) (*ListTopicSubscriptionsResponse, error)
-	// Deletes the topic with the given name. Returns `NOT_FOUND` if the topic
-	// does not exist. After a topic is deleted, a new topic may be created with
-	// the same name; this is an entirely new topic with none of the old
-	// configuration or subscriptions. Existing subscriptions to this topic are
-	// not deleted, but their `topic` field is set to `_deleted-topic_`.
-	DeleteTopic(context.Context, *DeleteTopicRequest) (*google_protobuf2.Empty, error)
+type subscriberStreamingPullServer struct {
+	grpc.ServerStream
 }
 
-func RegisterPublisherServer(s *grpc.Server, srv PublisherServer) {
-	s.RegisterService(&_Publisher_serviceDesc, srv)
+func (x *subscriberStreamingPullServer) Send(m *StreamingPullResponse) error {
+	return x.ServerStream.SendMsg(m)
 }
 
-func _Publisher_CreateTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(Topic)
+func (x *subscriberStreamingPullServer) Recv() (*StreamingPullRequest, error) {
+	m := new(StreamingPullRequest)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func _Subscriber_ModifyPushConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ModifyPushConfigRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PublisherServer).CreateTopic(ctx, in)
+		return srv.(SubscriberServer).ModifyPushConfig(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Publisher/CreateTopic",
+		FullMethod: "/google.pubsub.v1.Subscriber/ModifyPushConfig",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PublisherServer).CreateTopic(ctx, req.(*Topic))
+		return srv.(SubscriberServer).ModifyPushConfig(ctx, req.(*ModifyPushConfigRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Publisher_UpdateTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateTopicRequest)
+func _Subscriber_GetSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetSnapshotRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PublisherServer).UpdateTopic(ctx, in)
+		return srv.(SubscriberServer).GetSnapshot(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Publisher/UpdateTopic",
+		FullMethod: "/google.pubsub.v1.Subscriber/GetSnapshot",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PublisherServer).UpdateTopic(ctx, req.(*UpdateTopicRequest))
+		return srv.(SubscriberServer).GetSnapshot(ctx, req.(*GetSnapshotRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Publisher_Publish_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PublishRequest)
+func _Subscriber_ListSnapshots_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListSnapshotsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PublisherServer).Publish(ctx, in)
+		return srv.(SubscriberServer).ListSnapshots(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Publisher/Publish",
+		FullMethod: "/google.pubsub.v1.Subscriber/ListSnapshots",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PublisherServer).Publish(ctx, req.(*PublishRequest))
+		return srv.(SubscriberServer).ListSnapshots(ctx, req.(*ListSnapshotsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Publisher_GetTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetTopicRequest)
+func _Subscriber_CreateSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateSnapshotRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PublisherServer).GetTopic(ctx, in)
+		return srv.(SubscriberServer).CreateSnapshot(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Publisher/GetTopic",
+		FullMethod: "/google.pubsub.v1.Subscriber/CreateSnapshot",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PublisherServer).GetTopic(ctx, req.(*GetTopicRequest))
+		return srv.(SubscriberServer).CreateSnapshot(ctx, req.(*CreateSnapshotRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Publisher_ListTopics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListTopicsRequest)
+func _Subscriber_UpdateSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateSnapshotRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PublisherServer).ListTopics(ctx, in)
+		return srv.(SubscriberServer).UpdateSnapshot(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Publisher/ListTopics",
+		FullMethod: "/google.pubsub.v1.Subscriber/UpdateSnapshot",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PublisherServer).ListTopics(ctx, req.(*ListTopicsRequest))
+		return srv.(SubscriberServer).UpdateSnapshot(ctx, req.(*UpdateSnapshotRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Publisher_ListTopicSubscriptions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListTopicSubscriptionsRequest)
+func _Subscriber_DeleteSnapshot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteSnapshotRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PublisherServer).ListTopicSubscriptions(ctx, in)
+		return srv.(SubscriberServer).DeleteSnapshot(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Publisher/ListTopicSubscriptions",
+		FullMethod: "/google.pubsub.v1.Subscriber/DeleteSnapshot",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PublisherServer).ListTopicSubscriptions(ctx, req.(*ListTopicSubscriptionsRequest))
+		return srv.(SubscriberServer).DeleteSnapshot(ctx, req.(*DeleteSnapshotRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Publisher_DeleteTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteTopicRequest)
+func _Subscriber_Seek_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SeekRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PublisherServer).DeleteTopic(ctx, in)
+		return srv.(SubscriberServer).Seek(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/google.pubsub.v1.Publisher/DeleteTopic",
+		FullMethod: "/google.pubsub.v1.Subscriber/Seek",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PublisherServer).DeleteTopic(ctx, req.(*DeleteTopicRequest))
+		return srv.(SubscriberServer).Seek(ctx, req.(*SeekRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-var _Publisher_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "google.pubsub.v1.Publisher",
-	HandlerType: (*PublisherServer)(nil),
+var _Subscriber_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "google.pubsub.v1.Subscriber",
+	HandlerType: (*SubscriberServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "CreateTopic",
-			Handler:    _Publisher_CreateTopic_Handler,
+			MethodName: "CreateSubscription",
+			Handler:    _Subscriber_CreateSubscription_Handler,
 		},
 		{
-			MethodName: "UpdateTopic",
-			Handler:    _Publisher_UpdateTopic_Handler,
+			MethodName: "GetSubscription",
+			Handler:    _Subscriber_GetSubscription_Handler,
 		},
 		{
-			MethodName: "Publish",
-			Handler:    _Publisher_Publish_Handler,
+			MethodName: "UpdateSubscription",
+			Handler:    _Subscriber_UpdateSubscription_Handler,
 		},
 		{
-			MethodName: "GetTopic",
-			Handler:    _Publisher_GetTopic_Handler,
+			MethodName: "ListSubscriptions",
+			Handler:    _Subscriber_ListSubscriptions_Handler,
 		},
 		{
-			MethodName: "ListTopics",
-			Handler:    _Publisher_ListTopics_Handler,
+			MethodName: "DeleteSubscription",
+			Handler:    _Subscriber_DeleteSubscription_Handler,
 		},
 		{
-			MethodName: "ListTopicSubscriptions",
-			Handler:    _Publisher_ListTopicSubscriptions_Handler,
+			MethodName: "ModifyAckDeadline",
+			Handler:    _Subscriber_ModifyAckDeadline_Handler,
 		},
 		{
-			MethodName: "DeleteTopic",
-			Handler:    _Publisher_DeleteTopic_Handler,
+			MethodName: "Acknowledge",
+			Handler:    _Subscriber_Acknowledge_Handler,
+		},
+		{
+			MethodName: "Pull",
+			Handler:    _Subscriber_Pull_Handler,
+		},
+		{
+			MethodName: "ModifyPushConfig",
+			Handler:    _Subscriber_ModifyPushConfig_Handler,
+		},
+		{
+			MethodName: "GetSnapshot",
+			Handler:    _Subscriber_GetSnapshot_Handler,
+		},
+		{
+			MethodName: "ListSnapshots",
+			Handler:    _Subscriber_ListSnapshots_Handler,
+		},
+		{
+			MethodName: "CreateSnapshot",
+			Handler:    _Subscriber_CreateSnapshot_Handler,
+		},
+		{
+			MethodName: "UpdateSnapshot",
+			Handler:    _Subscriber_UpdateSnapshot_Handler,
+		},
+		{
+			MethodName: "DeleteSnapshot",
+			Handler:    _Subscriber_DeleteSnapshot_Handler,
+		},
+		{
+			MethodName: "Seek",
+			Handler:    _Subscriber_Seek_Handler,
+		},
+	},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "StreamingPull",
+			Handler:       _Subscriber_StreamingPull_Handler,
+			ServerStreams: true,
+			ClientStreams: true,
 		},
 	},
-	Streams:  []grpc.StreamDesc{},
 	Metadata: "google/pubsub/v1/pubsub.proto",
 }
 
-func init() { proto.RegisterFile("google/pubsub/v1/pubsub.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 2026 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xdb, 0x6f, 0xdb, 0xd6,
-	0x19, 0xef, 0x91, 0x6f, 0xf2, 0x47, 0xdf, 0x72, 0x66, 0x27, 0x0a, 0x73, 0xb3, 0x19, 0x37, 0x56,
-	0xd4, 0x44, 0xb2, 0x55, 0x34, 0x6b, 0xe2, 0x39, 0x85, 0x1d, 0x67, 0x69, 0x86, 0x64, 0xf5, 0xe8,
-	0xac, 0x03, 0x86, 0x60, 0x02, 0x25, 0x9e, 0x28, 0xac, 0x24, 0x92, 0x25, 0x29, 0x2f, 0xee, 0x16,
-	0xa0, 0x6b, 0x87, 0x01, 0xc3, 0xf2, 0xb0, 0xb6, 0x6f, 0x43, 0x1f, 0x06, 0xec, 0x6d, 0x8f, 0x03,
-	0xf6, 0xba, 0x3f, 0x60, 0xaf, 0xfb, 0x17, 0xf6, 0xb8, 0xf7, 0xed, 0x71, 0x38, 0x17, 0x52, 0xbc,
-	0x1c, 0x4a, 0x96, 0xd3, 0xbc, 0x91, 0xe7, 0xfb, 0xce, 0xf9, 0x7e, 0xdf, 0xfd, 0x23, 0x0f, 0x5c,
-	0x6a, 0x3b, 0x4e, 0xbb, 0x4b, 0x6a, 0x6e, 0xbf, 0xe9, 0xf7, 0x9b, 0xb5, 0xa3, 0x2d, 0xf1, 0x54,
-	0x75, 0x3d, 0x27, 0x70, 0xf0, 0x12, 0x27, 0x57, 0xc5, 0xe2, 0xd1, 0x96, 0x7a, 0x51, 0x6c, 0x30,
-	0x5c, 0xab, 0x66, 0xd8, 0xb6, 0x13, 0x18, 0x81, 0xe5, 0xd8, 0x3e, 0xe7, 0x57, 0x2f, 0x87, 0xc7,
-	0xd1, 0xb7, 0x66, 0xff, 0x59, 0xcd, 0xec, 0x7b, 0x8c, 0x41, 0xd0, 0x2f, 0xa4, 0xe9, 0xa4, 0xe7,
-	0x06, 0xc7, 0x82, 0xb8, 0x9a, 0x26, 0x3e, 0xb3, 0x48, 0xd7, 0x6c, 0xf4, 0x0c, 0xbf, 0x23, 0x38,
-	0xae, 0xa4, 0x39, 0x02, 0xab, 0x47, 0xfc, 0xc0, 0xe8, 0xb9, 0x9c, 0x41, 0xfb, 0x06, 0xc1, 0xd4,
-	0x13, 0xc7, 0xb5, 0x5a, 0x18, 0xc3, 0xa4, 0x6d, 0xf4, 0x48, 0x09, 0xad, 0xa2, 0xf2, 0xac, 0xce,
-	0x9e, 0xf1, 0x36, 0x4c, 0x77, 0x8d, 0x26, 0xe9, 0xfa, 0xa5, 0xc2, 0xea, 0x44, 0x59, 0xa9, 0x5f,
-	0xad, 0xa6, 0xd5, 0xab, 0xb2, 0xcd, 0xd5, 0x47, 0x8c, 0xeb, 0xbe, 0x1d, 0x78, 0xc7, 0xba, 0xd8,
-	0xa2, 0xde, 0x06, 0x25, 0xb6, 0x8c, 0x97, 0x60, 0xa2, 0x43, 0x8e, 0xc5, 0xf1, 0xf4, 0x11, 0x2f,
-	0xc3, 0xd4, 0x91, 0xd1, 0xed, 0x93, 0x52, 0x81, 0xad, 0xf1, 0x97, 0x3b, 0x85, 0xf7, 0x91, 0xf6,
-	0x55, 0x01, 0xe6, 0x0f, 0x98, 0x88, 0xc7, 0xc4, 0xf7, 0x8d, 0x36, 0xa1, 0xe8, 0x4c, 0x23, 0x30,
-	0xd8, 0xf6, 0x39, 0x9d, 0x3d, 0xe3, 0x8f, 0x00, 0x8c, 0x20, 0xf0, 0xac, 0x66, 0x3f, 0x20, 0x21,
-	0xc2, 0x5a, 0x16, 0x61, 0xe2, 0xa0, 0xea, 0x6e, 0xb4, 0x83, 0xa3, 0x8d, 0x1d, 0x81, 0x2f, 0x01,
-	0xf4, 0x38, 0x5b, 0xc3, 0x32, 0x4b, 0x13, 0x0c, 0xd5, 0xac, 0x58, 0x79, 0x68, 0xe2, 0x1d, 0x98,
-	0x73, 0xfb, 0xcd, 0xae, 0xe5, 0x3f, 0x6f, 0x50, 0x33, 0x96, 0x26, 0x57, 0x51, 0x59, 0xa9, 0xab,
-	0x91, 0x44, 0x61, 0xe3, 0xea, 0x93, 0xd0, 0xc6, 0xba, 0x22, 0xf8, 0xe9, 0x8a, 0xba, 0x03, 0x8b,
-	0x29, 0xe1, 0x63, 0xd9, 0x64, 0x03, 0x16, 0x1f, 0x90, 0x80, 0x99, 0x5b, 0x27, 0x9f, 0xf6, 0x89,
-	0x1f, 0x50, 0xe6, 0x80, 0xbe, 0x8b, 0x03, 0xf8, 0x8b, 0xf6, 0x39, 0x02, 0xfc, 0x53, 0xd7, 0x34,
-	0x02, 0x92, 0x60, 0xbe, 0x19, 0x67, 0x56, 0xea, 0xe7, 0x72, 0x5c, 0x29, 0x4e, 0xc1, 0xdb, 0xa0,
-	0xf4, 0xd9, 0x21, 0x2c, 0x9c, 0x18, 0x1c, 0x99, 0xae, 0x3f, 0xa4, 0x11, 0xf7, 0xd8, 0xf0, 0x3b,
-	0x3a, 0x70, 0x76, 0xfa, 0xac, 0xb5, 0x60, 0xe1, 0x80, 0x6b, 0x3e, 0x14, 0x2a, 0xde, 0x86, 0xa2,
-	0x30, 0x6f, 0xe8, 0xbf, 0x2b, 0x23, 0xfc, 0xa7, 0x47, 0x1b, 0xb4, 0x3a, 0x2c, 0x46, 0x42, 0x7c,
-	0xd7, 0xb1, 0x7d, 0x82, 0xaf, 0x80, 0x32, 0x70, 0xa0, 0x5f, 0x42, 0xab, 0x13, 0xe5, 0x59, 0x1d,
-	0x22, 0x0f, 0xfa, 0x9a, 0x05, 0x67, 0x1e, 0x59, 0x3e, 0xb7, 0xa2, 0x1f, 0x62, 0x2b, 0xc1, 0x8c,
-	0xeb, 0x39, 0x9f, 0x90, 0x56, 0x20, 0xd0, 0x85, 0xaf, 0xf8, 0x02, 0xcc, 0xba, 0xf4, 0x30, 0xdf,
-	0xfa, 0x8c, 0x7b, 0x64, 0x4a, 0x2f, 0xd2, 0x85, 0x43, 0xeb, 0x33, 0x42, 0xa3, 0x85, 0x11, 0x03,
-	0xa7, 0x43, 0xec, 0x30, 0x5a, 0xe8, 0xca, 0x13, 0xba, 0xa0, 0xf5, 0x00, 0xc7, 0x45, 0x09, 0x84,
-	0x35, 0x98, 0x66, 0xaa, 0x73, 0x70, 0x43, 0xdc, 0x20, 0xd8, 0xf0, 0x35, 0x58, 0xb4, 0xc9, 0x8b,
-	0xa0, 0x11, 0x13, 0xc5, 0x43, 0x63, 0x9e, 0x2e, 0x1f, 0x44, 0xe2, 0x3e, 0x85, 0x4b, 0x91, 0xb8,
-	0xc3, 0x7e, 0xd3, 0x6f, 0x79, 0x96, 0xcb, 0x0a, 0xcd, 0x70, 0x0f, 0xbc, 0x8e, 0x86, 0x36, 0x5c,
-	0xce, 0x13, 0x29, 0xb4, 0x5d, 0x87, 0x79, 0x3f, 0x4e, 0x10, 0x1e, 0x49, 0x2e, 0x9e, 0x58, 0xc5,
-	0x0a, 0xe0, 0x7d, 0xd2, 0x25, 0xa9, 0xb8, 0x96, 0x27, 0xc1, 0xdf, 0x27, 0x60, 0x2e, 0x8e, 0x49,
-	0x5a, 0xde, 0xa2, 0xad, 0x85, 0xb8, 0x49, 0x76, 0x40, 0x71, 0xfb, 0xfe, 0xf3, 0x46, 0xcb, 0xb1,
-	0x9f, 0x59, 0x6d, 0x91, 0xe5, 0x17, 0x65, 0x71, 0xe9, 0x3f, 0xbf, 0xc7, 0x78, 0x74, 0x70, 0xa3,
-	0x67, 0xbc, 0x09, 0xcb, 0x46, 0xab, 0xd3, 0x30, 0x89, 0x61, 0x76, 0x2d, 0x9b, 0x34, 0x7c, 0xd2,
-	0x72, 0x6c, 0xd3, 0x2f, 0x4d, 0x31, 0xe3, 0x62, 0xa3, 0xd5, 0xd9, 0x17, 0xa4, 0x43, 0x4e, 0xc1,
-	0x75, 0x58, 0xf1, 0x48, 0x60, 0x58, 0x76, 0xc3, 0x68, 0x75, 0x88, 0xd9, 0x88, 0x52, 0x62, 0x66,
-	0x15, 0x95, 0x8b, 0xfa, 0xf7, 0x38, 0x71, 0x97, 0xd2, 0x44, 0x16, 0xf8, 0xf8, 0x67, 0xa0, 0x86,
-	0x91, 0xee, 0x91, 0x80, 0xd8, 0x54, 0xc7, 0x46, 0xd8, 0x3b, 0x4a, 0x45, 0x86, 0xf9, 0x7c, 0x26,
-	0x5b, 0xf7, 0x05, 0x83, 0x5e, 0x12, 0x9b, 0xf5, 0x70, 0x6f, 0x48, 0xc1, 0x7b, 0x51, 0xc9, 0x9f,
-	0x65, 0x01, 0x5a, 0xc9, 0x2a, 0x1e, 0xb7, 0xeb, 0x77, 0x5d, 0xf9, 0xff, 0x81, 0x00, 0x06, 0x86,
-	0xc5, 0x57, 0x61, 0x9e, 0xf9, 0x82, 0xd8, 0xa6, 0xeb, 0x58, 0x76, 0x98, 0xa0, 0x73, 0x74, 0xf1,
-	0xbe, 0x58, 0xc3, 0x8f, 0x24, 0x7d, 0xe0, 0xc6, 0x30, 0x7f, 0x0d, 0x6b, 0x02, 0xaf, 0x5b, 0xa6,
-	0x5b, 0xb0, 0xa8, 0x93, 0x16, 0xb1, 0x8e, 0x22, 0x67, 0xe1, 0x15, 0x98, 0xa6, 0x11, 0x61, 0x99,
-	0x61, 0x88, 0x1a, 0xad, 0xce, 0x43, 0x13, 0xdf, 0x86, 0x19, 0xe1, 0x05, 0x51, 0x5d, 0x47, 0xd6,
-	0xbe, 0x90, 0x5f, 0xfb, 0x01, 0x9c, 0x7d, 0x40, 0x82, 0xb8, 0x1f, 0xc2, 0x6c, 0xd0, 0x60, 0x2e,
-	0x9e, 0x5c, 0xa1, 0xbd, 0xe2, 0x6b, 0xda, 0xb7, 0x08, 0xce, 0xf3, 0x06, 0x21, 0x3b, 0x61, 0x4f,
-	0x72, 0x82, 0x52, 0xbf, 0x3c, 0x3c, 0x0c, 0x92, 0x12, 0x5e, 0xaf, 0x79, 0xb8, 0x50, 0xa2, 0x65,
-	0x45, 0x5a, 0xc4, 0xde, 0x4c, 0xa9, 0xfe, 0x3d, 0x82, 0xf3, 0x12, 0x91, 0xa2, 0x88, 0xed, 0xcb,
-	0x8a, 0xd8, 0x68, 0x8b, 0x9c, 0xb2, 0xc8, 0x7d, 0x00, 0xe7, 0x79, 0x91, 0x3b, 0xad, 0x77, 0x7f,
-	0x0d, 0xe7, 0x1e, 0x3b, 0xa6, 0xf5, 0xec, 0x38, 0x56, 0x9f, 0x4e, 0xbe, 0x3d, 0x5d, 0xfd, 0x0a,
-	0xe3, 0x55, 0x3f, 0xed, 0x4b, 0x04, 0xca, 0x41, 0xbf, 0xdb, 0x1d, 0x47, 0xe4, 0x4d, 0xc0, 0x1e,
-	0x09, 0xfa, 0x9e, 0xdd, 0xb0, 0x7a, 0x3d, 0x62, 0x5a, 0x46, 0x40, 0xba, 0xc7, 0x4c, 0x72, 0x51,
-	0x3f, 0xc3, 0x29, 0x0f, 0x07, 0x04, 0xbc, 0x06, 0x73, 0x3d, 0xe3, 0xc5, 0xa0, 0x4a, 0x4e, 0x30,
-	0x67, 0x2b, 0x3d, 0xe3, 0x45, 0x58, 0x1d, 0xb5, 0x5f, 0xc0, 0x1c, 0x07, 0x21, 0x5c, 0xf8, 0x63,
-	0x38, 0xe3, 0x89, 0xa4, 0x1c, 0xec, 0xe3, 0x6e, 0x5c, 0xcb, 0xaa, 0x96, 0xca, 0x5f, 0x7d, 0xc9,
-	0x4b, 0x2e, 0xf8, 0x34, 0x60, 0x4a, 0xdc, 0xc8, 0xbb, 0x83, 0x72, 0x3e, 0x8e, 0xca, 0xe7, 0x60,
-	0x86, 0x97, 0x04, 0xbf, 0x34, 0xc9, 0x5a, 0xe2, 0x34, 0xab, 0x09, 0x7e, 0x6e, 0xf7, 0x98, 0xc8,
-	0xeb, 0x1e, 0xda, 0x4f, 0x00, 0xef, 0xb6, 0x3a, 0xb6, 0xf3, 0xcb, 0x2e, 0x31, 0xdb, 0xa7, 0x05,
-	0x51, 0x88, 0x83, 0xd0, 0x7e, 0x53, 0x80, 0xe5, 0xc3, 0xc0, 0x23, 0x46, 0xcf, 0xb2, 0xdb, 0xe3,
-	0x7a, 0x33, 0xef, 0x54, 0x7c, 0x0b, 0xce, 0xf5, 0x98, 0xcd, 0x64, 0xda, 0x4d, 0x94, 0xa7, 0xf4,
-	0x15, 0x4e, 0x4e, 0xb7, 0xc7, 0xf7, 0xb2, 0xfb, 0x92, 0xb6, 0x5b, 0x4e, 0xee, 0xdb, 0xe5, 0xe2,
-	0x76, 0xe0, 0x82, 0xcf, 0x74, 0x68, 0x0c, 0x69, 0xc7, 0x25, 0xce, 0xb2, 0x9b, 0x35, 0x6b, 0x1b,
-	0x56, 0x52, 0x26, 0x78, 0x43, 0xb1, 0xf4, 0x11, 0xac, 0xdc, 0xf3, 0x08, 0x2d, 0xc6, 0xb6, 0xe1,
-	0xfa, 0xcf, 0x9d, 0x20, 0x34, 0xb6, 0x6c, 0x62, 0x49, 0x3b, 0xa0, 0x20, 0x29, 0x00, 0xaf, 0x10,
-	0xac, 0x88, 0xf2, 0x9e, 0x3a, 0xf1, 0x16, 0x14, 0x7d, 0xb1, 0x24, 0xca, 0xba, 0x2a, 0x29, 0x62,
-	0xe1, 0xa6, 0x88, 0xf7, 0xf5, 0xca, 0xf9, 0x7f, 0x10, 0x14, 0xc3, 0x33, 0xc7, 0x98, 0xc2, 0xb6,
-	0x41, 0x21, 0x2f, 0x5c, 0xcb, 0x23, 0xfc, 0x5b, 0x6b, 0x62, 0xe4, 0xb7, 0x16, 0x70, 0x76, 0xba,
-	0x80, 0xef, 0x46, 0x43, 0xcc, 0x24, 0x73, 0xcc, 0xb5, 0x7c, 0x35, 0xbf, 0xeb, 0x01, 0xa6, 0x0b,
-	0xcb, 0xac, 0x95, 0x88, 0xe3, 0xdf, 0x70, 0xe7, 0x3a, 0x86, 0x95, 0x94, 0x34, 0x11, 0xa5, 0xef,
-	0xc3, 0x6c, 0xe8, 0xbe, 0x30, 0x3a, 0x87, 0xf9, 0x7a, 0xc0, 0x7c, 0xe2, 0x46, 0xf5, 0x2e, 0xac,
-	0x88, 0x46, 0x95, 0x8a, 0x32, 0x35, 0x15, 0x65, 0xb3, 0x83, 0x48, 0xd2, 0xfe, 0x80, 0x40, 0x39,
-	0x24, 0xa4, 0x33, 0x4e, 0x41, 0xd9, 0x84, 0x49, 0x16, 0x02, 0x85, 0x51, 0x21, 0xf0, 0xe1, 0x5b,
-	0x3a, 0xe3, 0xc4, 0x17, 0x63, 0x08, 0x98, 0xc9, 0x3e, 0x7c, 0x6b, 0x80, 0x61, 0xaf, 0x08, 0xd3,
-	0x81, 0xe1, 0xb5, 0x49, 0xa0, 0x2d, 0xc0, 0x1c, 0x07, 0xc3, 0x8d, 0x56, 0xff, 0xef, 0x12, 0x80,
-	0x68, 0xbb, 0x4d, 0xe2, 0xe1, 0xdf, 0x21, 0xc0, 0x22, 0x35, 0xe3, 0x78, 0x46, 0x34, 0x7e, 0x75,
-	0x04, 0x5d, 0xdb, 0xfc, 0xe2, 0x5f, 0xff, 0xfe, 0xa6, 0x50, 0x51, 0xdf, 0xae, 0x1d, 0x6d, 0xd5,
-	0x7e, 0x45, 0x53, 0x60, 0x47, 0x84, 0x82, 0x5f, 0xab, 0xd4, 0x12, 0x53, 0x43, 0xad, 0xf2, 0xf2,
-	0x0e, 0xaa, 0xe0, 0xaf, 0x11, 0xfb, 0xf6, 0x4f, 0xa0, 0x28, 0x67, 0xa5, 0xc8, 0x47, 0xc2, 0x91,
-	0x78, 0xde, 0x63, 0x78, 0x6a, 0xf8, 0x26, 0xc3, 0x13, 0x97, 0x3f, 0x0c, 0x17, 0xfe, 0x73, 0xf4,
-	0x9b, 0x21, 0x81, 0xeb, 0x9d, 0xac, 0xb4, 0xdc, 0x59, 0x73, 0x24, 0xb4, 0x1d, 0x06, 0xed, 0xfb,
-	0xf5, 0x7a, 0x06, 0x5a, 0xf5, 0x24, 0x76, 0xfb, 0x16, 0xf1, 0xcf, 0xfd, 0xc4, 0x5c, 0x87, 0x25,
-	0x5f, 0x34, 0x79, 0xf3, 0xa6, 0xfa, 0xce, 0x89, 0x78, 0x79, 0xf8, 0x68, 0x55, 0x86, 0xb6, 0x8c,
-	0xaf, 0x31, 0xb4, 0x02, 0x5b, 0x0c, 0xe3, 0xcb, 0x24, 0x48, 0xfc, 0x47, 0x14, 0x7e, 0xd0, 0x8e,
-	0xb2, 0x60, 0xee, 0x44, 0xa8, 0x9e, 0xcd, 0xa4, 0xc3, 0xfd, 0x9e, 0x1b, 0x1c, 0x87, 0x4e, 0xad,
-	0x8c, 0xe9, 0xd4, 0xbf, 0x20, 0x38, 0x93, 0x19, 0x6c, 0x64, 0x16, 0xcb, 0x9b, 0x7e, 0x72, 0x01,
-	0xfd, 0x88, 0x01, 0xda, 0xd7, 0x3e, 0x18, 0x0b, 0xd0, 0x9d, 0x5e, 0x5a, 0x0e, 0xf5, 0xeb, 0x57,
-	0x08, 0x94, 0xd8, 0xcc, 0x83, 0xd7, 0xb3, 0xf8, 0xb2, 0x23, 0x51, 0x2e, 0xb2, 0x7d, 0x86, 0xec,
-	0xae, 0x76, 0x7b, 0x3c, 0x64, 0xc6, 0x40, 0x02, 0xc5, 0xf4, 0x5b, 0x04, 0x93, 0x74, 0x4e, 0xc0,
-	0x97, 0x64, 0xb3, 0x72, 0x34, 0x42, 0xc9, 0x42, 0x3e, 0x3e, 0x5e, 0x84, 0x21, 0xaf, 0xd5, 0xc7,
-	0x43, 0xe3, 0xf6, 0xbb, 0x5d, 0x0a, 0xc3, 0x84, 0xf9, 0xc4, 0xd8, 0x82, 0x65, 0xad, 0x4f, 0x32,
-	0xda, 0xa9, 0x1b, 0x23, 0xf9, 0x38, 0xc0, 0x32, 0xda, 0x44, 0x34, 0xf7, 0x97, 0xd2, 0x1f, 0x19,
-	0xf8, 0x7a, 0x5e, 0x94, 0x64, 0x3e, 0x44, 0x72, 0x5d, 0xf1, 0x90, 0x29, 0x7f, 0x4f, 0xbb, 0x7b,
-	0x9a, 0x20, 0x19, 0x88, 0xa1, 0x86, 0x78, 0x85, 0x60, 0x3e, 0xd1, 0x1a, 0x65, 0x96, 0x90, 0x75,
-	0x6a, 0x99, 0x25, 0xa4, 0x3d, 0x56, 0xab, 0x30, 0xb4, 0xeb, 0x58, 0xcb, 0xcf, 0xf7, 0x48, 0xf8,
-	0x97, 0x08, 0x16, 0x92, 0x63, 0x1e, 0x96, 0xc8, 0x91, 0x0e, 0x82, 0xea, 0x90, 0xc6, 0xad, 0xdd,
-	0x60, 0x18, 0xae, 0xa9, 0x6b, 0xf2, 0x66, 0x12, 0xca, 0x17, 0x05, 0xf1, 0x15, 0x82, 0x85, 0xe4,
-	0x68, 0x28, 0x43, 0x21, 0x1d, 0x1e, 0x87, 0xa2, 0x10, 0xd5, 0xa6, 0x5e, 0xe1, 0x7e, 0x0b, 0x47,
-	0xab, 0x51, 0x70, 0x3e, 0x47, 0xb0, 0x90, 0x9c, 0x21, 0x64, 0x70, 0xa4, 0x53, 0x46, 0x6e, 0x08,
-	0xdd, 0x64, 0x50, 0x36, 0x2a, 0x6f, 0x27, 0xa0, 0xe4, 0xa1, 0x60, 0x69, 0x4b, 0x67, 0x00, 0x59,
-	0xda, 0xc6, 0x06, 0x15, 0x69, 0xa7, 0x8a, 0x8d, 0x0e, 0xa7, 0x4d, 0x5b, 0x9f, 0x90, 0xce, 0x1d,
-	0x54, 0xa9, 0xff, 0x69, 0x06, 0x66, 0xc5, 0xcf, 0x6c, 0xe2, 0xe1, 0x4f, 0x40, 0xe1, 0x91, 0xc0,
-	0x6f, 0x66, 0xf2, 0xfe, 0x11, 0xab, 0x79, 0x04, 0xed, 0x3a, 0x43, 0x73, 0x55, 0xbd, 0x2c, 0x8d,
-	0x0a, 0xfe, 0x67, 0x59, 0xf8, 0xe0, 0x25, 0x28, 0xb1, 0xcb, 0x02, 0x59, 0x29, 0xcd, 0xde, 0x25,
-	0xe4, 0x0b, 0xae, 0x31, 0xc1, 0xd7, 0xeb, 0xeb, 0x4c, 0x30, 0x13, 0x54, 0x1d, 0x2a, 0xfe, 0x0b,
-	0x04, 0x33, 0x42, 0x71, 0xbc, 0x2a, 0xfd, 0xff, 0x15, 0xbb, 0x45, 0x50, 0xd7, 0x86, 0x70, 0x08,
-	0x47, 0xd4, 0x19, 0x82, 0x1b, 0xda, 0xc6, 0x00, 0x81, 0x5c, 0xb8, 0xb8, 0x9a, 0xa1, 0x20, 0x1c,
-	0x28, 0x86, 0x57, 0x2b, 0x78, 0x4d, 0x3a, 0x57, 0x9d, 0x4c, 0xfb, 0x0d, 0x26, 0x7b, 0x0d, 0x5f,
-	0x19, 0x21, 0x9b, 0x06, 0x3e, 0x0c, 0x2e, 0x07, 0xf0, 0x55, 0x79, 0xc5, 0x49, 0xdc, 0x52, 0xa8,
-	0xeb, 0xc3, 0x99, 0x84, 0xfa, 0x49, 0x08, 0xb2, 0x9a, 0x24, 0xee, 0x15, 0xfe, 0x86, 0xe0, 0xac,
-	0xfc, 0xef, 0x3d, 0xae, 0x0d, 0x91, 0x24, 0x9d, 0x92, 0x36, 0x4f, 0xbe, 0x41, 0xc0, 0x4c, 0xce,
-	0x9c, 0xf9, 0x96, 0x4a, 0x4d, 0x4c, 0x01, 0x28, 0xb1, 0x1b, 0x00, 0x59, 0xb0, 0x66, 0x2f, 0x08,
-	0x72, 0x2b, 0x85, 0x30, 0x55, 0x65, 0x94, 0xb7, 0xf6, 0xbe, 0x46, 0xb0, 0xdc, 0x72, 0x7a, 0x19,
-	0x61, 0x7b, 0x0a, 0xff, 0x3d, 0x7b, 0x40, 0xcf, 0x3d, 0x40, 0x3f, 0xbf, 0x25, 0x18, 0xda, 0x4e,
-	0xd7, 0xb0, 0xdb, 0x55, 0xc7, 0x6b, 0xd7, 0xda, 0xc4, 0x66, 0x52, 0x6b, 0x9c, 0x64, 0xb8, 0x96,
-	0x3f, 0xb8, 0x39, 0xde, 0xe6, 0x4f, 0xff, 0x43, 0xe8, 0xaf, 0x85, 0xb3, 0x0f, 0xf8, 0xde, 0x7b,
-	0x5d, 0xa7, 0x6f, 0xd2, 0xa0, 0x3e, 0xec, 0x37, 0xab, 0x1f, 0x6f, 0xfd, 0x33, 0x24, 0x3c, 0x65,
-	0x84, 0xa7, 0x9c, 0xf0, 0xf4, 0xe3, 0xad, 0xe6, 0x34, 0x3b, 0xf7, 0xdd, 0xff, 0x07, 0x00, 0x00,
-	0xff, 0xff, 0xcb, 0xe1, 0xb8, 0xca, 0x90, 0x1e, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("google/pubsub/v1/pubsub.proto", fileDescriptor_pubsub_d7d430fc6d2b8a0b)
+}
+
+var fileDescriptor_pubsub_d7d430fc6d2b8a0b = []byte{
+	// 2199 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xcd, 0x73, 0x1b, 0x49,
+	0x15, 0xdf, 0x96, 0x1c, 0x47, 0x7e, 0xb2, 0xe3, 0xb8, 0xb1, 0x1d, 0x79, 0xf2, 0x65, 0x4f, 0x8c,
+	0xed, 0x28, 0x89, 0x64, 0x2b, 0xb5, 0x61, 0x13, 0xe3, 0x6c, 0xd9, 0x71, 0xc8, 0x06, 0x12, 0x30,
+	0xe3, 0x10, 0xaa, 0xa8, 0x14, 0xaa, 0x91, 0xd4, 0x51, 0x66, 0x35, 0x9a, 0x99, 0x9d, 0x19, 0x79,
+	0xe3, 0x85, 0x50, 0x61, 0x97, 0xa2, 0x8a, 0x22, 0x07, 0x76, 0xb9, 0xee, 0x81, 0x82, 0x1b, 0x47,
+	0xaa, 0xb8, 0xc2, 0x9d, 0x2b, 0x07, 0xfe, 0x01, 0x8e, 0x5c, 0x38, 0xc1, 0x71, 0xab, 0x3f, 0x66,
+	0x34, 0x1f, 0x3d, 0x92, 0x65, 0x6f, 0x6e, 0xa3, 0xee, 0xd7, 0xfd, 0x7e, 0xef, 0xbb, 0xdf, 0x2b,
+	0xc1, 0xc5, 0xb6, 0x6d, 0xb7, 0x4d, 0x52, 0x75, 0x7a, 0x0d, 0xaf, 0xd7, 0xa8, 0x1e, 0x6c, 0x88,
+	0xaf, 0x8a, 0xe3, 0xda, 0xbe, 0x8d, 0xcf, 0xf2, 0xed, 0x8a, 0x58, 0x3c, 0xd8, 0x50, 0x2e, 0x88,
+	0x03, 0xba, 0x63, 0x54, 0x75, 0xcb, 0xb2, 0x7d, 0xdd, 0x37, 0x6c, 0xcb, 0xe3, 0xf4, 0xca, 0xa5,
+	0xe0, 0x3a, 0xfa, 0xab, 0xd1, 0x7b, 0x5e, 0x6d, 0xf5, 0x5c, 0x46, 0x20, 0xf6, 0xcf, 0x27, 0xf7,
+	0x49, 0xd7, 0xf1, 0x0f, 0xc5, 0xe6, 0x62, 0x72, 0xf3, 0xb9, 0x41, 0xcc, 0x56, 0xbd, 0xab, 0x7b,
+	0x1d, 0x41, 0x71, 0x39, 0x49, 0xe1, 0x1b, 0x5d, 0xe2, 0xf9, 0x7a, 0xd7, 0xe1, 0x04, 0xea, 0x53,
+	0x98, 0x7d, 0x4c, 0x3c, 0x4f, 0x6f, 0x93, 0x7d, 0xdf, 0x76, 0xf5, 0x36, 0xd9, 0xb3, 0x4d, 0xa3,
+	0x79, 0x88, 0xef, 0xc2, 0x79, 0xdd, 0x34, 0xed, 0x8f, 0x49, 0xab, 0xee, 0x10, 0xd7, 0x33, 0x3c,
+	0x9f, 0x58, 0x4d, 0x52, 0x77, 0x49, 0x9b, 0x82, 0x2f, 0xa1, 0xc5, 0xfc, 0xda, 0x84, 0xb6, 0x20,
+	0x48, 0xf6, 0xfa, 0x14, 0x1a, 0x27, 0x50, 0xff, 0x8b, 0xe0, 0xd4, 0x13, 0xdb, 0x31, 0x9a, 0x18,
+	0xc3, 0x98, 0xa5, 0x77, 0x49, 0x09, 0x2d, 0xa2, 0xb5, 0x09, 0x8d, 0x7d, 0xe3, 0x4d, 0x18, 0x37,
+	0xf5, 0x06, 0x31, 0xbd, 0x52, 0x6e, 0x31, 0xbf, 0x56, 0xac, 0x5d, 0xa9, 0x24, 0xd5, 0x56, 0x61,
+	0x87, 0x2b, 0x8f, 0x18, 0xd5, 0x7d, 0xcb, 0x77, 0x0f, 0x35, 0x71, 0x04, 0x3f, 0x83, 0xf9, 0x2e,
+	0x87, 0x5c, 0xf7, 0x38, 0xe6, 0xba, 0xc3, 0x40, 0x97, 0xf2, 0x8b, 0x68, 0xad, 0x58, 0x5b, 0x49,
+	0x5f, 0x26, 0x13, 0x51, 0x9b, 0xed, 0x4a, 0x56, 0x95, 0xdb, 0x50, 0x8c, 0x30, 0xc5, 0x67, 0x21,
+	0xdf, 0x21, 0x87, 0x02, 0x3c, 0xfd, 0xc4, 0xb3, 0x70, 0xea, 0x40, 0x37, 0x7b, 0xa4, 0x94, 0x63,
+	0x6b, 0xfc, 0xc7, 0x9d, 0xdc, 0x7b, 0x48, 0xfd, 0x3c, 0x07, 0x53, 0x7b, 0x8c, 0xa7, 0xe0, 0x47,
+	0x65, 0x6f, 0xe9, 0xbe, 0xce, 0x8e, 0x4f, 0x6a, 0xec, 0x1b, 0xff, 0x00, 0x40, 0xf7, 0x7d, 0xd7,
+	0x68, 0xf4, 0x7c, 0x12, 0xc8, 0x5f, 0x4d, 0x43, 0x8e, 0x5d, 0x54, 0xd9, 0x0e, 0x4f, 0x70, 0x5d,
+	0x44, 0xae, 0xc0, 0x17, 0x01, 0x02, 0x7d, 0x18, 0x2d, 0xa6, 0x83, 0x09, 0x6d, 0x42, 0xac, 0x3c,
+	0x6c, 0xe1, 0x2d, 0x98, 0x74, 0x7a, 0x0d, 0xd3, 0xf0, 0x5e, 0xd4, 0xa9, 0xf1, 0x4b, 0x63, 0x4c,
+	0x49, 0x4a, 0xc8, 0x51, 0x78, 0x46, 0xe5, 0x49, 0xe0, 0x19, 0x5a, 0x51, 0xd0, 0xd3, 0x15, 0x65,
+	0x0b, 0xa6, 0x13, 0xcc, 0x47, 0xd2, 0xc9, 0x2a, 0x4c, 0x3f, 0x20, 0x3e, 0x33, 0xa6, 0x46, 0x3e,
+	0xea, 0x11, 0xcf, 0xa7, 0xc4, 0x3e, 0xfd, 0x2d, 0x2e, 0xe0, 0x3f, 0xd4, 0xd7, 0x08, 0xf0, 0x8f,
+	0x9c, 0x96, 0xee, 0x93, 0x18, 0xf1, 0x8d, 0x28, 0x71, 0xb1, 0x76, 0x2e, 0xc3, 0x51, 0xc4, 0x2d,
+	0x78, 0x13, 0x8a, 0x3d, 0x76, 0x09, 0x0b, 0x02, 0x06, 0x47, 0x26, 0xeb, 0x77, 0x68, 0x9c, 0x3c,
+	0xd6, 0xbd, 0x8e, 0x06, 0x9c, 0x9c, 0x7e, 0xab, 0x4d, 0x38, 0xb3, 0xc7, 0x25, 0x1f, 0x08, 0x15,
+	0x6f, 0x42, 0x41, 0xa8, 0x37, 0xb0, 0xdf, 0xe5, 0x21, 0xf6, 0xd3, 0xc2, 0x03, 0x6a, 0x0d, 0xa6,
+	0x43, 0x26, 0x9e, 0x63, 0x5b, 0x1e, 0xc1, 0x97, 0xa1, 0xd8, 0x37, 0x60, 0x10, 0x5b, 0x10, 0x5a,
+	0xd0, 0x53, 0x0d, 0x98, 0x79, 0x64, 0x78, 0x5c, 0x8b, 0x5e, 0x80, 0xad, 0x04, 0xa7, 0x1d, 0xd7,
+	0xfe, 0x90, 0x34, 0x7d, 0x81, 0x2e, 0xf8, 0x89, 0xcf, 0xc3, 0x84, 0xc3, 0xa2, 0xc3, 0xf8, 0x84,
+	0x5b, 0xe4, 0x94, 0x56, 0xa0, 0x0b, 0xfb, 0xc6, 0x27, 0x84, 0x7a, 0x0b, 0xdb, 0xf4, 0xed, 0x0e,
+	0xb1, 0x02, 0x6f, 0xa1, 0x2b, 0x4f, 0xe8, 0x82, 0xda, 0x05, 0x1c, 0x65, 0x25, 0x10, 0x56, 0x61,
+	0x9c, 0x89, 0xce, 0xc1, 0x0d, 0x30, 0x83, 0x20, 0xc3, 0x2b, 0x30, 0x6d, 0x91, 0x97, 0x7e, 0x3d,
+	0xc2, 0x8a, 0xbb, 0xc6, 0x14, 0x5d, 0xde, 0x0b, 0xd9, 0x7d, 0x04, 0x17, 0x43, 0x76, 0xfb, 0xbd,
+	0x86, 0xd7, 0x74, 0x0d, 0x87, 0xa5, 0xc7, 0xc1, 0x16, 0x38, 0x89, 0x84, 0x16, 0x5c, 0xca, 0x62,
+	0x29, 0xa4, 0x5d, 0x86, 0x29, 0x2f, 0xba, 0x21, 0x2c, 0x12, 0x5f, 0x3c, 0xb2, 0x88, 0x5d, 0x58,
+	0xe8, 0xf3, 0xb3, 0x74, 0xc7, 0x7b, 0x61, 0xfb, 0x6f, 0x51, 0xbc, 0x06, 0x28, 0x32, 0x76, 0x42,
+	0xb4, 0x0b, 0x30, 0xe1, 0x05, 0x8b, 0x42, 0xac, 0xfe, 0xc2, 0x91, 0x45, 0x2a, 0x03, 0xde, 0x25,
+	0x26, 0x49, 0x84, 0xaa, 0x3c, 0xae, 0xff, 0x9a, 0x87, 0xc9, 0xa8, 0x9a, 0xa5, 0xf5, 0x20, 0x3c,
+	0x9a, 0x8b, 0xaa, 0x61, 0x0b, 0x8a, 0x4e, 0xcf, 0x7b, 0x51, 0x6f, 0xda, 0xd6, 0x73, 0xa3, 0x2d,
+	0x12, 0xd7, 0x05, 0x59, 0xa8, 0x79, 0x2f, 0xee, 0x31, 0x1a, 0x0d, 0x9c, 0xf0, 0x1b, 0xaf, 0xc3,
+	0xac, 0xde, 0xec, 0xd4, 0x5b, 0x44, 0x6f, 0x99, 0x86, 0x45, 0xea, 0x1e, 0x69, 0xda, 0x56, 0xcb,
+	0x2b, 0x9d, 0x62, 0x0a, 0xc5, 0x7a, 0xb3, 0xb3, 0x2b, 0xb6, 0xf6, 0xf9, 0x0e, 0xae, 0xc1, 0x9c,
+	0x4b, 0x7c, 0xdd, 0xb0, 0xea, 0x7a, 0xb3, 0x43, 0x5a, 0xf5, 0x30, 0xca, 0x4f, 0x2f, 0xa2, 0xb5,
+	0x82, 0xf6, 0x0d, 0xbe, 0xb9, 0x4d, 0xf7, 0x44, 0x60, 0x7b, 0xf8, 0xc7, 0xa0, 0x04, 0xc1, 0xeb,
+	0x12, 0x9f, 0x58, 0x54, 0xc6, 0x7a, 0x50, 0xc4, 0x4b, 0x05, 0x86, 0x79, 0x21, 0x95, 0x80, 0x76,
+	0x05, 0x81, 0x56, 0x12, 0x87, 0xb5, 0xe0, 0x6c, 0xb0, 0x83, 0x77, 0xc2, 0x1a, 0x39, 0xc1, 0x62,
+	0xae, 0x9c, 0x16, 0x3c, 0xaa, 0x57, 0x59, 0xa9, 0x3c, 0x49, 0x31, 0xfb, 0x1b, 0x02, 0xe8, 0x2b,
+	0x16, 0x5f, 0x81, 0x29, 0x66, 0x0b, 0x62, 0xb5, 0x1c, 0xdb, 0xb0, 0x82, 0x9c, 0x33, 0x49, 0x17,
+	0xef, 0x8b, 0x35, 0xfc, 0x48, 0x52, 0xda, 0xae, 0x0f, 0xb2, 0xd7, 0xa0, 0xba, 0x76, 0xd2, 0xca,
+	0xd3, 0x84, 0x69, 0x8d, 0x34, 0x89, 0x71, 0x10, 0x1a, 0x0b, 0xcf, 0xc1, 0x38, 0xf5, 0x08, 0xa3,
+	0x15, 0xb8, 0xa8, 0xde, 0xec, 0x3c, 0x6c, 0xe1, 0xdb, 0x70, 0x5a, 0x58, 0x41, 0x14, 0x8c, 0xa1,
+	0xe9, 0x3c, 0xa0, 0x57, 0xbf, 0x0d, 0xf3, 0x0f, 0x88, 0x1f, 0xb5, 0x43, 0x10, 0x0d, 0x2a, 0x4c,
+	0x46, 0xf3, 0x45, 0xa0, 0xaf, 0xe8, 0x9a, 0xfa, 0x25, 0x82, 0x05, 0x5e, 0xf3, 0x64, 0x37, 0xec,
+	0x48, 0x6e, 0x28, 0xd6, 0x2e, 0x0d, 0x76, 0x83, 0x38, 0x87, 0x93, 0xd5, 0x43, 0x07, 0x4a, 0x34,
+	0x95, 0x48, 0xf3, 0xf2, 0xdb, 0xa9, 0x3e, 0xbf, 0x41, 0x3c, 0x59, 0xca, 0xf3, 0xf2, 0xae, 0x2c,
+	0x2f, 0x0f, 0xd7, 0xc8, 0x31, 0xf3, 0xf6, 0xfb, 0xb0, 0xc0, 0x93, 0xdc, 0x71, 0xad, 0xfb, 0x73,
+	0x38, 0xf7, 0xd8, 0x6e, 0x19, 0xcf, 0x0f, 0x23, 0xf9, 0xe9, 0xe8, 0xc7, 0x93, 0xd9, 0x2f, 0x37,
+	0x5a, 0xf6, 0x53, 0x3f, 0x43, 0x50, 0xdc, 0xeb, 0x99, 0xe6, 0x28, 0x2c, 0x6f, 0x00, 0x76, 0x89,
+	0xdf, 0x73, 0xad, 0xba, 0xd1, 0xed, 0x92, 0x96, 0xa1, 0xfb, 0xc4, 0x3c, 0x64, 0x9c, 0x0b, 0xda,
+	0x0c, 0xdf, 0x79, 0xd8, 0xdf, 0xc0, 0x4b, 0x30, 0xd9, 0xd5, 0x5f, 0xf6, 0xb3, 0x64, 0x9e, 0x19,
+	0xbb, 0xd8, 0xd5, 0x5f, 0x06, 0xd9, 0x51, 0xfd, 0x29, 0x4c, 0x72, 0x10, 0xc2, 0x84, 0xdf, 0x87,
+	0x19, 0x57, 0x04, 0x65, 0xff, 0x1c, 0x37, 0xe3, 0x52, 0x5a, 0xb4, 0x44, 0xfc, 0x6a, 0x67, 0xdd,
+	0xf8, 0x82, 0x47, 0x1d, 0xa6, 0xc4, 0x95, 0xbc, 0xdd, 0x4f, 0xe7, 0xa3, 0x88, 0x7c, 0x0e, 0x4e,
+	0xf3, 0x94, 0xe0, 0x95, 0xc6, 0x58, 0x39, 0x1c, 0x67, 0x39, 0xc1, 0xcb, 0xac, 0x1e, 0xf9, 0xac,
+	0xea, 0xa1, 0xfe, 0x10, 0xf0, 0x76, 0xb3, 0x63, 0xd9, 0x1f, 0x9b, 0xa4, 0xd5, 0x3e, 0x2e, 0x88,
+	0x5c, 0x14, 0x84, 0xfa, 0xcb, 0x1c, 0xcc, 0xee, 0xfb, 0x2e, 0xd1, 0xbb, 0x86, 0xd5, 0x1e, 0xd5,
+	0x9a, 0x59, 0xb7, 0xe2, 0x5b, 0x70, 0xae, 0xcb, 0x74, 0x26, 0x93, 0x2e, 0xbf, 0x76, 0x4a, 0x9b,
+	0xe3, 0xdb, 0xc9, 0xf2, 0xf8, 0x6e, 0xfa, 0x5c, 0x5c, 0x77, 0xb3, 0xf1, 0x73, 0xdb, 0x9c, 0xdd,
+	0x16, 0x9c, 0xf7, 0x98, 0x0c, 0xf5, 0x01, 0xe5, 0xb8, 0xc4, 0x49, 0xb6, 0xd3, 0x6a, 0x6d, 0xc3,
+	0x5c, 0x42, 0x05, 0x6f, 0xc9, 0x97, 0xfe, 0x85, 0x60, 0xee, 0x9e, 0x4b, 0x68, 0x36, 0x16, 0x2f,
+	0xa2, 0x40, 0xdb, 0xb2, 0x27, 0x4b, 0xd2, 0x02, 0x39, 0x89, 0x05, 0xbe, 0x17, 0x96, 0xf0, 0x3c,
+	0x83, 0x75, 0x33, 0x0d, 0x4b, 0xca, 0xf0, 0xeb, 0xae, 0xe5, 0x6f, 0x10, 0xcc, 0x89, 0x3a, 0x93,
+	0x90, 0xec, 0x16, 0x14, 0x82, 0xe7, 0x9f, 0xa8, 0x2f, 0x8a, 0x24, 0x9b, 0x06, 0x87, 0x42, 0xda,
+	0x93, 0xd5, 0x95, 0xff, 0x20, 0x28, 0x04, 0x77, 0x8e, 0xf0, 0x1c, 0xdc, 0x84, 0x22, 0x79, 0xe9,
+	0x18, 0x2e, 0xe1, 0x7d, 0x6c, 0x7e, 0x68, 0x1f, 0x0b, 0x9c, 0x9c, 0x2e, 0xe0, 0xbb, 0xa1, 0x29,
+	0xc6, 0x98, 0x29, 0x56, 0xb2, 0xc5, 0xfc, 0xba, 0xb5, 0xbf, 0x0e, 0x98, 0xbe, 0x11, 0x12, 0x9a,
+	0x57, 0x12, 0x9a, 0x9f, 0xe8, 0x6b, 0x57, 0x35, 0x61, 0x96, 0x55, 0xc1, 0x64, 0xb7, 0xf0, 0x76,
+	0x8a, 0xee, 0x21, 0xcc, 0x25, 0xb8, 0x89, 0x00, 0x7b, 0x2f, 0xd9, 0x2c, 0x0c, 0xf6, 0x8e, 0x63,
+	0x34, 0x12, 0x37, 0x61, 0x4e, 0xd4, 0xd8, 0x11, 0xb4, 0xf3, 0x5b, 0x04, 0xc5, 0x7d, 0x42, 0x3a,
+	0xa3, 0xe4, 0xc2, 0x75, 0x18, 0x63, 0x4e, 0x93, 0x1b, 0xe6, 0x34, 0x1f, 0xbc, 0xa3, 0x31, 0x4a,
+	0x7c, 0x21, 0x82, 0x80, 0xa9, 0xec, 0x83, 0x77, 0xfa, 0x18, 0x76, 0x0a, 0x30, 0xee, 0xeb, 0x6e,
+	0x9b, 0xf8, 0xea, 0x19, 0x98, 0xe4, 0x60, 0xb8, 0xd2, 0x6a, 0x7f, 0x2f, 0xc0, 0x84, 0x68, 0xf0,
+	0x89, 0x8b, 0x3f, 0x84, 0x22, 0x8f, 0x70, 0x3e, 0x0b, 0xcb, 0xea, 0x9b, 0x95, 0xac, 0x0d, 0xf5,
+	0xea, 0xa7, 0xff, 0xfc, 0xf7, 0xef, 0x73, 0x57, 0x94, 0x4b, 0xd5, 0x83, 0x8d, 0xea, 0xcf, 0x68,
+	0x74, 0x6c, 0x09, 0x9b, 0x7b, 0xd5, 0x72, 0x95, 0x77, 0xdb, 0xd5, 0xf2, 0xab, 0x3b, 0xa8, 0x8c,
+	0x5f, 0x41, 0x31, 0x32, 0x40, 0xc1, 0xcb, 0xe9, 0x2b, 0xd3, 0xf3, 0x95, 0x6c, 0xc6, 0x55, 0xc6,
+	0xf8, 0x6a, 0x6d, 0x99, 0x31, 0x66, 0x8c, 0x2a, 0x03, 0xd9, 0x7f, 0x8a, 0xe0, 0xb4, 0x10, 0x1c,
+	0x2f, 0x4a, 0x1f, 0xd0, 0x91, 0xc9, 0x8a, 0xb2, 0x34, 0x80, 0x82, 0x6b, 0x52, 0xad, 0x31, 0x04,
+	0xd7, 0xd5, 0xd5, 0x3e, 0x02, 0x39, 0x73, 0x31, 0xae, 0xa2, 0x20, 0x6c, 0x28, 0x04, 0xe3, 0x26,
+	0x2c, 0x61, 0x91, 0x18, 0x45, 0x65, 0x4b, 0xbf, 0xca, 0x78, 0x2f, 0xe1, 0xcb, 0x43, 0x78, 0xe3,
+	0xd7, 0x08, 0xa0, 0x3f, 0x30, 0xc1, 0x92, 0x41, 0x66, 0x6a, 0x72, 0xa3, 0x2c, 0x0f, 0x26, 0x12,
+	0xe2, 0xc7, 0x21, 0x08, 0xe6, 0x11, 0x10, 0xaf, 0x04, 0x0a, 0xfc, 0x17, 0x04, 0xf3, 0xf2, 0x89,
+	0x06, 0xae, 0x0e, 0xe0, 0x24, 0x7b, 0xd6, 0x2b, 0xeb, 0x47, 0x3f, 0x20, 0x60, 0xbe, 0xcb, 0x60,
+	0x56, 0xf1, 0x8d, 0x21, 0x9a, 0xaa, 0xc6, 0x5f, 0xe1, 0x7f, 0x44, 0x91, 0x41, 0x53, 0x98, 0x7a,
+	0xf0, 0xb5, 0x41, 0xfc, 0x13, 0xe9, 0x50, 0xb9, 0x7e, 0x34, 0x62, 0x01, 0x74, 0x83, 0x01, 0xbd,
+	0x86, 0xaf, 0x0e, 0x05, 0x1a, 0xa2, 0xf1, 0xa1, 0x18, 0x99, 0x73, 0xc8, 0x22, 0x2a, 0x3d, 0x06,
+	0x51, 0xe6, 0x53, 0xc9, 0xe5, 0x7e, 0xd7, 0xf1, 0x0f, 0x03, 0x7b, 0x96, 0x87, 0xb9, 0x54, 0xed,
+	0x7f, 0x33, 0x00, 0x42, 0xd7, 0x0d, 0xe2, 0xe2, 0x5f, 0x23, 0xc0, 0xe2, 0x95, 0x10, 0xcd, 0x68,
+	0x43, 0xba, 0x1e, 0x65, 0xc8, 0xbe, 0xba, 0xce, 0xe0, 0x94, 0x95, 0x6f, 0x4a, 0x13, 0x4b, 0xcc,
+	0x58, 0x22, 0xc0, 0xbf, 0x40, 0x6c, 0x96, 0x1b, 0x43, 0xb1, 0x26, 0x8d, 0x31, 0x49, 0xc7, 0x34,
+	0x14, 0x4f, 0xdc, 0x8f, 0xa2, 0xfc, 0x07, 0xe1, 0xc2, 0x7f, 0x08, 0xc7, 0xc6, 0x31, 0x5c, 0xd7,
+	0xb2, 0x92, 0xdf, 0x71, 0xa0, 0x6d, 0x31, 0x68, 0xdf, 0xaa, 0xd5, 0x52, 0xd0, 0x2a, 0x47, 0xd1,
+	0xdb, 0x97, 0x88, 0x8f, 0x6f, 0xe3, 0xa1, 0x59, 0x96, 0x3b, 0xaf, 0x34, 0x2a, 0xaf, 0x1d, 0x89,
+	0x56, 0xf8, 0x79, 0x85, 0xa1, 0x5d, 0xc3, 0x2b, 0x99, 0x79, 0x23, 0x1e, 0x89, 0xbf, 0x43, 0xc1,
+	0x34, 0x6f, 0x98, 0x06, 0x33, 0xdb, 0xe1, 0x4c, 0x9f, 0x17, 0x46, 0x2d, 0x8f, 0x68, 0xd4, 0x3f,
+	0x21, 0x98, 0x49, 0x75, 0x75, 0x32, 0x8d, 0x65, 0xb5, 0x7e, 0x99, 0x80, 0xbe, 0xcb, 0x00, 0xed,
+	0xaa, 0xef, 0x8f, 0x04, 0xe8, 0x4e, 0x37, 0xc9, 0x87, 0xda, 0xf5, 0x73, 0x04, 0xc5, 0x48, 0xc3,
+	0x27, 0x4b, 0x0f, 0xe9, 0x7e, 0x30, 0x13, 0xd9, 0x2e, 0x43, 0x76, 0x57, 0xbd, 0x3d, 0x1a, 0x32,
+	0xbd, 0xcf, 0x81, 0x62, 0xfa, 0x15, 0x82, 0x31, 0xda, 0x24, 0xe1, 0x8b, 0xb2, 0xfa, 0x1a, 0xf6,
+	0x8f, 0x32, 0x97, 0x8f, 0xf6, 0x56, 0x81, 0xcb, 0xab, 0xb5, 0xd1, 0xd0, 0x38, 0x3d, 0xd3, 0xa4,
+	0x30, 0x5a, 0x30, 0x15, 0xeb, 0xd9, 0xb0, 0xec, 0xb9, 0x2d, 0xe9, 0x6b, 0x95, 0xd5, 0xa1, 0x74,
+	0x1c, 0xe0, 0x1a, 0x5a, 0x47, 0x34, 0xf6, 0xcf, 0x26, 0x27, 0x2c, 0xf8, 0x6a, 0x96, 0x97, 0xa4,
+	0xa6, 0x30, 0x99, 0xa6, 0x78, 0xc8, 0x84, 0xbf, 0xa7, 0xde, 0x3d, 0x8e, 0x93, 0xf4, 0xd9, 0x50,
+	0x45, 0xfc, 0x02, 0x8a, 0x91, 0xb7, 0xbf, 0xcc, 0x45, 0xd2, 0xad, 0x81, 0x32, 0xe0, 0x91, 0xad,
+	0xde, 0x60, 0xd8, 0x56, 0x31, 0x4f, 0xdb, 0x41, 0xa9, 0x8a, 0xe1, 0x0a, 0xca, 0x17, 0x8d, 0xa4,
+	0x37, 0x08, 0xa6, 0x62, 0x8f, 0x7b, 0x99, 0x25, 0x64, 0xbd, 0x86, 0xcc, 0x12, 0xd2, 0x2e, 0x41,
+	0x2d, 0x33, 0x44, 0xcb, 0x58, 0xcd, 0xce, 0x37, 0x21, 0xf3, 0xcf, 0x10, 0x9c, 0x89, 0x77, 0xbc,
+	0x78, 0xf5, 0x88, 0x3d, 0xf1, 0x40, 0xad, 0x5c, 0x67, 0x18, 0x56, 0x94, 0x25, 0x79, 0x31, 0x8b,
+	0x68, 0x84, 0x1a, 0xe5, 0x0d, 0x82, 0x33, 0xf1, 0x76, 0x58, 0x86, 0x42, 0xda, 0x30, 0x0f, 0x44,
+	0x21, 0xb2, 0x5d, 0xad, 0x1c, 0xb3, 0x4d, 0x65, 0x18, 0x9c, 0xd7, 0x08, 0xce, 0xc4, 0xbb, 0x20,
+	0x19, 0x1c, 0x69, 0x9f, 0x94, 0xe9, 0xc2, 0xc2, 0x4d, 0xca, 0x47, 0x74, 0x13, 0x9a, 0x36, 0x68,
+	0x17, 0x23, 0x4b, 0x1b, 0x91, 0x56, 0x4b, 0x5a, 0x29, 0x23, 0xcd, 0xcf, 0x71, 0xd3, 0x86, 0x47,
+	0x48, 0xe7, 0x0e, 0x2a, 0xef, 0x7c, 0x81, 0x60, 0xb6, 0x69, 0x77, 0x53, 0x4c, 0x76, 0x8a, 0x7c,
+	0xfc, 0xbe, 0x47, 0x85, 0xdc, 0x43, 0x3f, 0xb9, 0x25, 0x08, 0xda, 0xb6, 0xa9, 0x5b, 0xed, 0x8a,
+	0xed, 0xb6, 0xab, 0x6d, 0x62, 0x31, 0x15, 0x54, 0xf9, 0x96, 0xee, 0x18, 0x5e, 0xff, 0x2f, 0x1a,
+	0x9b, 0xfc, 0xeb, 0xff, 0x08, 0xfd, 0x39, 0x37, 0xff, 0x80, 0x9f, 0xbd, 0x67, 0xda, 0xbd, 0x16,
+	0xed, 0x39, 0xf6, 0x7b, 0x8d, 0xca, 0xd3, 0x8d, 0x7f, 0x04, 0x1b, 0xcf, 0xd8, 0xc6, 0x33, 0xbe,
+	0xf1, 0xec, 0xe9, 0x46, 0x63, 0x9c, 0xdd, 0x7b, 0xf3, 0xab, 0x00, 0x00, 0x00, 0xff, 0xff, 0x52,
+	0x93, 0x85, 0x71, 0xf9, 0x21, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/genproto/googleapis/pubsub/v1beta2/pubsub.pb.go b/vendor/google.golang.org/genproto/googleapis/pubsub/v1beta2/pubsub.pb.go
index 75d044a6..ed4c8344 100644
--- a/vendor/google.golang.org/genproto/googleapis/pubsub/v1beta2/pubsub.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/pubsub/v1beta2/pubsub.pb.go
@@ -1,42 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/pubsub/v1beta2/pubsub.proto
 
-/*
-Package pubsub is a generated protocol buffer package.
-
-It is generated from these files:
-	google/pubsub/v1beta2/pubsub.proto
-
-It has these top-level messages:
-	Topic
-	PubsubMessage
-	GetTopicRequest
-	PublishRequest
-	PublishResponse
-	ListTopicsRequest
-	ListTopicsResponse
-	ListTopicSubscriptionsRequest
-	ListTopicSubscriptionsResponse
-	DeleteTopicRequest
-	Subscription
-	PushConfig
-	ReceivedMessage
-	GetSubscriptionRequest
-	ListSubscriptionsRequest
-	ListSubscriptionsResponse
-	DeleteSubscriptionRequest
-	ModifyPushConfigRequest
-	PullRequest
-	PullResponse
-	ModifyAckDeadlineRequest
-	AcknowledgeRequest
-*/
-package pubsub
+package pubsub // import "google.golang.org/genproto/googleapis/pubsub/v1beta2"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/empty"
+import empty "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -57,13 +27,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // A topic resource.
 type Topic struct {
 	// Name of the topic.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Topic) Reset()                    { *m = Topic{} }
-func (m *Topic) String() string            { return proto.CompactTextString(m) }
-func (*Topic) ProtoMessage()               {}
-func (*Topic) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Topic) Reset()         { *m = Topic{} }
+func (m *Topic) String() string { return proto.CompactTextString(m) }
+func (*Topic) ProtoMessage()    {}
+func (*Topic) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{0}
+}
+func (m *Topic) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Topic.Unmarshal(m, b)
+}
+func (m *Topic) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Topic.Marshal(b, m, deterministic)
+}
+func (dst *Topic) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Topic.Merge(dst, src)
+}
+func (m *Topic) XXX_Size() int {
+	return xxx_messageInfo_Topic.Size(m)
+}
+func (m *Topic) XXX_DiscardUnknown() {
+	xxx_messageInfo_Topic.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Topic proto.InternalMessageInfo
 
 func (m *Topic) GetName() string {
 	if m != nil {
@@ -78,18 +70,40 @@ type PubsubMessage struct {
 	// base64-encoded.
 	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
 	// Optional attributes for this message.
-	Attributes map[string]string `protobuf:"bytes,2,rep,name=attributes" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Attributes map[string]string `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// ID of this message assigned by the server at publication time. Guaranteed
 	// to be unique within the topic. This value may be read by a subscriber
 	// that receives a PubsubMessage via a Pull call or a push delivery. It must
 	// not be populated by a publisher in a Publish call.
-	MessageId string `protobuf:"bytes,3,opt,name=message_id,json=messageId" json:"message_id,omitempty"`
+	MessageId            string   `protobuf:"bytes,3,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PubsubMessage) Reset()         { *m = PubsubMessage{} }
+func (m *PubsubMessage) String() string { return proto.CompactTextString(m) }
+func (*PubsubMessage) ProtoMessage()    {}
+func (*PubsubMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{1}
+}
+func (m *PubsubMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PubsubMessage.Unmarshal(m, b)
+}
+func (m *PubsubMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PubsubMessage.Marshal(b, m, deterministic)
+}
+func (dst *PubsubMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PubsubMessage.Merge(dst, src)
+}
+func (m *PubsubMessage) XXX_Size() int {
+	return xxx_messageInfo_PubsubMessage.Size(m)
+}
+func (m *PubsubMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_PubsubMessage.DiscardUnknown(m)
 }
 
-func (m *PubsubMessage) Reset()                    { *m = PubsubMessage{} }
-func (m *PubsubMessage) String() string            { return proto.CompactTextString(m) }
-func (*PubsubMessage) ProtoMessage()               {}
-func (*PubsubMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_PubsubMessage proto.InternalMessageInfo
 
 func (m *PubsubMessage) GetData() []byte {
 	if m != nil {
@@ -115,13 +129,35 @@ func (m *PubsubMessage) GetMessageId() string {
 // Request for the GetTopic method.
 type GetTopicRequest struct {
 	// The name of the topic to get.
-	Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
+	Topic                string   `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTopicRequest) Reset()         { *m = GetTopicRequest{} }
+func (m *GetTopicRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTopicRequest) ProtoMessage()    {}
+func (*GetTopicRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{2}
+}
+func (m *GetTopicRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTopicRequest.Unmarshal(m, b)
+}
+func (m *GetTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTopicRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTopicRequest.Merge(dst, src)
+}
+func (m *GetTopicRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTopicRequest.Size(m)
+}
+func (m *GetTopicRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTopicRequest.DiscardUnknown(m)
 }
 
-func (m *GetTopicRequest) Reset()                    { *m = GetTopicRequest{} }
-func (m *GetTopicRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTopicRequest) ProtoMessage()               {}
-func (*GetTopicRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_GetTopicRequest proto.InternalMessageInfo
 
 func (m *GetTopicRequest) GetTopic() string {
 	if m != nil {
@@ -133,15 +169,37 @@ func (m *GetTopicRequest) GetTopic() string {
 // Request for the Publish method.
 type PublishRequest struct {
 	// The messages in the request will be published on this topic.
-	Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
+	Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
 	// The messages to publish.
-	Messages []*PubsubMessage `protobuf:"bytes,2,rep,name=messages" json:"messages,omitempty"`
+	Messages             []*PubsubMessage `protobuf:"bytes,2,rep,name=messages,proto3" json:"messages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *PublishRequest) Reset()         { *m = PublishRequest{} }
+func (m *PublishRequest) String() string { return proto.CompactTextString(m) }
+func (*PublishRequest) ProtoMessage()    {}
+func (*PublishRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{3}
+}
+func (m *PublishRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublishRequest.Unmarshal(m, b)
+}
+func (m *PublishRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublishRequest.Marshal(b, m, deterministic)
+}
+func (dst *PublishRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishRequest.Merge(dst, src)
+}
+func (m *PublishRequest) XXX_Size() int {
+	return xxx_messageInfo_PublishRequest.Size(m)
+}
+func (m *PublishRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublishRequest.DiscardUnknown(m)
 }
 
-func (m *PublishRequest) Reset()                    { *m = PublishRequest{} }
-func (m *PublishRequest) String() string            { return proto.CompactTextString(m) }
-func (*PublishRequest) ProtoMessage()               {}
-func (*PublishRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_PublishRequest proto.InternalMessageInfo
 
 func (m *PublishRequest) GetTopic() string {
 	if m != nil {
@@ -162,13 +220,35 @@ type PublishResponse struct {
 	// The server-assigned ID of each published message, in the same order as
 	// the messages in the request. IDs are guaranteed to be unique within
 	// the topic.
-	MessageIds []string `protobuf:"bytes,1,rep,name=message_ids,json=messageIds" json:"message_ids,omitempty"`
+	MessageIds           []string `protobuf:"bytes,1,rep,name=message_ids,json=messageIds,proto3" json:"message_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PublishResponse) Reset()         { *m = PublishResponse{} }
+func (m *PublishResponse) String() string { return proto.CompactTextString(m) }
+func (*PublishResponse) ProtoMessage()    {}
+func (*PublishResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{4}
+}
+func (m *PublishResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PublishResponse.Unmarshal(m, b)
+}
+func (m *PublishResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PublishResponse.Marshal(b, m, deterministic)
+}
+func (dst *PublishResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PublishResponse.Merge(dst, src)
+}
+func (m *PublishResponse) XXX_Size() int {
+	return xxx_messageInfo_PublishResponse.Size(m)
+}
+func (m *PublishResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_PublishResponse.DiscardUnknown(m)
 }
 
-func (m *PublishResponse) Reset()                    { *m = PublishResponse{} }
-func (m *PublishResponse) String() string            { return proto.CompactTextString(m) }
-func (*PublishResponse) ProtoMessage()               {}
-func (*PublishResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_PublishResponse proto.InternalMessageInfo
 
 func (m *PublishResponse) GetMessageIds() []string {
 	if m != nil {
@@ -180,19 +260,41 @@ func (m *PublishResponse) GetMessageIds() []string {
 // Request for the ListTopics method.
 type ListTopicsRequest struct {
 	// The name of the cloud project that topics belong to.
-	Project string `protobuf:"bytes,1,opt,name=project" json:"project,omitempty"`
+	Project string `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"`
 	// Maximum number of topics to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last ListTopicsResponse; indicates that this is
 	// a continuation of a prior ListTopics call, and that the system should
 	// return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicsRequest) Reset()         { *m = ListTopicsRequest{} }
+func (m *ListTopicsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTopicsRequest) ProtoMessage()    {}
+func (*ListTopicsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{5}
+}
+func (m *ListTopicsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicsRequest.Unmarshal(m, b)
+}
+func (m *ListTopicsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicsRequest.Merge(dst, src)
+}
+func (m *ListTopicsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTopicsRequest.Size(m)
+}
+func (m *ListTopicsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicsRequest.DiscardUnknown(m)
 }
 
-func (m *ListTopicsRequest) Reset()                    { *m = ListTopicsRequest{} }
-func (m *ListTopicsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTopicsRequest) ProtoMessage()               {}
-func (*ListTopicsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_ListTopicsRequest proto.InternalMessageInfo
 
 func (m *ListTopicsRequest) GetProject() string {
 	if m != nil {
@@ -218,16 +320,38 @@ func (m *ListTopicsRequest) GetPageToken() string {
 // Response for the ListTopics method.
 type ListTopicsResponse struct {
 	// The resulting topics.
-	Topics []*Topic `protobuf:"bytes,1,rep,name=topics" json:"topics,omitempty"`
+	Topics []*Topic `protobuf:"bytes,1,rep,name=topics,proto3" json:"topics,omitempty"`
 	// If not empty, indicates that there may be more topics that match the
 	// request; this value should be passed in a new ListTopicsRequest.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicsResponse) Reset()         { *m = ListTopicsResponse{} }
+func (m *ListTopicsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTopicsResponse) ProtoMessage()    {}
+func (*ListTopicsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{6}
+}
+func (m *ListTopicsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicsResponse.Unmarshal(m, b)
+}
+func (m *ListTopicsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicsResponse.Merge(dst, src)
+}
+func (m *ListTopicsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTopicsResponse.Size(m)
+}
+func (m *ListTopicsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicsResponse.DiscardUnknown(m)
 }
 
-func (m *ListTopicsResponse) Reset()                    { *m = ListTopicsResponse{} }
-func (m *ListTopicsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTopicsResponse) ProtoMessage()               {}
-func (*ListTopicsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ListTopicsResponse proto.InternalMessageInfo
 
 func (m *ListTopicsResponse) GetTopics() []*Topic {
 	if m != nil {
@@ -246,19 +370,41 @@ func (m *ListTopicsResponse) GetNextPageToken() string {
 // Request for the ListTopicSubscriptions method.
 type ListTopicSubscriptionsRequest struct {
 	// The name of the topic that subscriptions are attached to.
-	Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
+	Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
 	// Maximum number of subscription names to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last ListTopicSubscriptionsResponse; indicates
 	// that this is a continuation of a prior ListTopicSubscriptions call, and
 	// that the system should return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicSubscriptionsRequest) Reset()         { *m = ListTopicSubscriptionsRequest{} }
+func (m *ListTopicSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTopicSubscriptionsRequest) ProtoMessage()    {}
+func (*ListTopicSubscriptionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{7}
+}
+func (m *ListTopicSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicSubscriptionsRequest.Unmarshal(m, b)
+}
+func (m *ListTopicSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicSubscriptionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSubscriptionsRequest.Merge(dst, src)
+}
+func (m *ListTopicSubscriptionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTopicSubscriptionsRequest.Size(m)
+}
+func (m *ListTopicSubscriptionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicSubscriptionsRequest.DiscardUnknown(m)
 }
 
-func (m *ListTopicSubscriptionsRequest) Reset()                    { *m = ListTopicSubscriptionsRequest{} }
-func (m *ListTopicSubscriptionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTopicSubscriptionsRequest) ProtoMessage()               {}
-func (*ListTopicSubscriptionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ListTopicSubscriptionsRequest proto.InternalMessageInfo
 
 func (m *ListTopicSubscriptionsRequest) GetTopic() string {
 	if m != nil {
@@ -284,17 +430,39 @@ func (m *ListTopicSubscriptionsRequest) GetPageToken() string {
 // Response for the ListTopicSubscriptions method.
 type ListTopicSubscriptionsResponse struct {
 	// The names of the subscriptions that match the request.
-	Subscriptions []string `protobuf:"bytes,1,rep,name=subscriptions" json:"subscriptions,omitempty"`
+	Subscriptions []string `protobuf:"bytes,1,rep,name=subscriptions,proto3" json:"subscriptions,omitempty"`
 	// If not empty, indicates that there may be more subscriptions that match
 	// the request; this value should be passed in a new
 	// ListTopicSubscriptionsRequest to get more subscriptions.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTopicSubscriptionsResponse) Reset()         { *m = ListTopicSubscriptionsResponse{} }
+func (m *ListTopicSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTopicSubscriptionsResponse) ProtoMessage()    {}
+func (*ListTopicSubscriptionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{8}
+}
+func (m *ListTopicSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTopicSubscriptionsResponse.Unmarshal(m, b)
+}
+func (m *ListTopicSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTopicSubscriptionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTopicSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTopicSubscriptionsResponse.Merge(dst, src)
+}
+func (m *ListTopicSubscriptionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTopicSubscriptionsResponse.Size(m)
+}
+func (m *ListTopicSubscriptionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTopicSubscriptionsResponse.DiscardUnknown(m)
 }
 
-func (m *ListTopicSubscriptionsResponse) Reset()                    { *m = ListTopicSubscriptionsResponse{} }
-func (m *ListTopicSubscriptionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTopicSubscriptionsResponse) ProtoMessage()               {}
-func (*ListTopicSubscriptionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_ListTopicSubscriptionsResponse proto.InternalMessageInfo
 
 func (m *ListTopicSubscriptionsResponse) GetSubscriptions() []string {
 	if m != nil {
@@ -313,13 +481,35 @@ func (m *ListTopicSubscriptionsResponse) GetNextPageToken() string {
 // Request for the DeleteTopic method.
 type DeleteTopicRequest struct {
 	// Name of the topic to delete.
-	Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
+	Topic                string   `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteTopicRequest) Reset()         { *m = DeleteTopicRequest{} }
+func (m *DeleteTopicRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteTopicRequest) ProtoMessage()    {}
+func (*DeleteTopicRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{9}
+}
+func (m *DeleteTopicRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteTopicRequest.Unmarshal(m, b)
+}
+func (m *DeleteTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteTopicRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteTopicRequest.Merge(dst, src)
+}
+func (m *DeleteTopicRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteTopicRequest.Size(m)
+}
+func (m *DeleteTopicRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteTopicRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteTopicRequest) Reset()                    { *m = DeleteTopicRequest{} }
-func (m *DeleteTopicRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteTopicRequest) ProtoMessage()               {}
-func (*DeleteTopicRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_DeleteTopicRequest proto.InternalMessageInfo
 
 func (m *DeleteTopicRequest) GetTopic() string {
 	if m != nil {
@@ -331,15 +521,15 @@ func (m *DeleteTopicRequest) GetTopic() string {
 // A subscription resource.
 type Subscription struct {
 	// Name of the subscription.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of the topic from which this subscription is receiving messages.
 	// This will be present if and only if the subscription has not been detached
 	// from its topic.
-	Topic string `protobuf:"bytes,2,opt,name=topic" json:"topic,omitempty"`
+	Topic string `protobuf:"bytes,2,opt,name=topic,proto3" json:"topic,omitempty"`
 	// If push delivery is used with this subscription, this field is
 	// used to configure it. An empty pushConfig signifies that the subscriber
 	// will pull and ack messages using API methods.
-	PushConfig *PushConfig `protobuf:"bytes,4,opt,name=push_config,json=pushConfig" json:"push_config,omitempty"`
+	PushConfig *PushConfig `protobuf:"bytes,4,opt,name=push_config,json=pushConfig,proto3" json:"push_config,omitempty"`
 	// This value is the maximum time after a subscriber receives a message
 	// before the subscriber should acknowledge the message. After message
 	// delivery but before the ack deadline expires and before the message is
@@ -355,13 +545,35 @@ type Subscription struct {
 	//
 	// If the subscriber never acknowledges the message, the Pub/Sub
 	// system will eventually redeliver the message.
-	AckDeadlineSeconds int32 `protobuf:"varint,5,opt,name=ack_deadline_seconds,json=ackDeadlineSeconds" json:"ack_deadline_seconds,omitempty"`
+	AckDeadlineSeconds   int32    `protobuf:"varint,5,opt,name=ack_deadline_seconds,json=ackDeadlineSeconds,proto3" json:"ack_deadline_seconds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Subscription) Reset()                    { *m = Subscription{} }
-func (m *Subscription) String() string            { return proto.CompactTextString(m) }
-func (*Subscription) ProtoMessage()               {}
-func (*Subscription) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *Subscription) Reset()         { *m = Subscription{} }
+func (m *Subscription) String() string { return proto.CompactTextString(m) }
+func (*Subscription) ProtoMessage()    {}
+func (*Subscription) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{10}
+}
+func (m *Subscription) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Subscription.Unmarshal(m, b)
+}
+func (m *Subscription) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Subscription.Marshal(b, m, deterministic)
+}
+func (dst *Subscription) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Subscription.Merge(dst, src)
+}
+func (m *Subscription) XXX_Size() int {
+	return xxx_messageInfo_Subscription.Size(m)
+}
+func (m *Subscription) XXX_DiscardUnknown() {
+	xxx_messageInfo_Subscription.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Subscription proto.InternalMessageInfo
 
 func (m *Subscription) GetName() string {
 	if m != nil {
@@ -395,7 +607,7 @@ func (m *Subscription) GetAckDeadlineSeconds() int32 {
 type PushConfig struct {
 	// A URL locating the endpoint to which messages should be pushed.
 	// For example, a Webhook endpoint might use "https://example.com/push".
-	PushEndpoint string `protobuf:"bytes,1,opt,name=push_endpoint,json=pushEndpoint" json:"push_endpoint,omitempty"`
+	PushEndpoint string `protobuf:"bytes,1,opt,name=push_endpoint,json=pushEndpoint,proto3" json:"push_endpoint,omitempty"`
 	// Endpoint configuration attributes.
 	//
 	// Every endpoint has a set of API supported attributes that can be used to
@@ -419,13 +631,35 @@ type PushConfig struct {
 	// * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API.
 	// * `v1beta2`: uses the push format defined in the v1beta2 Pub/Sub API.
 	//
-	Attributes map[string]string `protobuf:"bytes,2,rep,name=attributes" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Attributes           map[string]string `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *PushConfig) Reset()         { *m = PushConfig{} }
+func (m *PushConfig) String() string { return proto.CompactTextString(m) }
+func (*PushConfig) ProtoMessage()    {}
+func (*PushConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{11}
+}
+func (m *PushConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PushConfig.Unmarshal(m, b)
+}
+func (m *PushConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PushConfig.Marshal(b, m, deterministic)
+}
+func (dst *PushConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PushConfig.Merge(dst, src)
+}
+func (m *PushConfig) XXX_Size() int {
+	return xxx_messageInfo_PushConfig.Size(m)
+}
+func (m *PushConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PushConfig.DiscardUnknown(m)
 }
 
-func (m *PushConfig) Reset()                    { *m = PushConfig{} }
-func (m *PushConfig) String() string            { return proto.CompactTextString(m) }
-func (*PushConfig) ProtoMessage()               {}
-func (*PushConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_PushConfig proto.InternalMessageInfo
 
 func (m *PushConfig) GetPushEndpoint() string {
 	if m != nil {
@@ -444,15 +678,37 @@ func (m *PushConfig) GetAttributes() map[string]string {
 // A message and its corresponding acknowledgment ID.
 type ReceivedMessage struct {
 	// This ID can be used to acknowledge the received message.
-	AckId string `protobuf:"bytes,1,opt,name=ack_id,json=ackId" json:"ack_id,omitempty"`
+	AckId string `protobuf:"bytes,1,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"`
 	// The message.
-	Message *PubsubMessage `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Message              *PubsubMessage `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
+func (m *ReceivedMessage) Reset()         { *m = ReceivedMessage{} }
+func (m *ReceivedMessage) String() string { return proto.CompactTextString(m) }
+func (*ReceivedMessage) ProtoMessage()    {}
+func (*ReceivedMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{12}
+}
+func (m *ReceivedMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReceivedMessage.Unmarshal(m, b)
+}
+func (m *ReceivedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReceivedMessage.Marshal(b, m, deterministic)
+}
+func (dst *ReceivedMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReceivedMessage.Merge(dst, src)
+}
+func (m *ReceivedMessage) XXX_Size() int {
+	return xxx_messageInfo_ReceivedMessage.Size(m)
+}
+func (m *ReceivedMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReceivedMessage.DiscardUnknown(m)
 }
 
-func (m *ReceivedMessage) Reset()                    { *m = ReceivedMessage{} }
-func (m *ReceivedMessage) String() string            { return proto.CompactTextString(m) }
-func (*ReceivedMessage) ProtoMessage()               {}
-func (*ReceivedMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_ReceivedMessage proto.InternalMessageInfo
 
 func (m *ReceivedMessage) GetAckId() string {
 	if m != nil {
@@ -471,13 +727,35 @@ func (m *ReceivedMessage) GetMessage() *PubsubMessage {
 // Request for the GetSubscription method.
 type GetSubscriptionRequest struct {
 	// The name of the subscription to get.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription         string   `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSubscriptionRequest) Reset()         { *m = GetSubscriptionRequest{} }
+func (m *GetSubscriptionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSubscriptionRequest) ProtoMessage()    {}
+func (*GetSubscriptionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{13}
+}
+func (m *GetSubscriptionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSubscriptionRequest.Unmarshal(m, b)
+}
+func (m *GetSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSubscriptionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSubscriptionRequest.Merge(dst, src)
+}
+func (m *GetSubscriptionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSubscriptionRequest.Size(m)
+}
+func (m *GetSubscriptionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSubscriptionRequest.DiscardUnknown(m)
 }
 
-func (m *GetSubscriptionRequest) Reset()                    { *m = GetSubscriptionRequest{} }
-func (m *GetSubscriptionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSubscriptionRequest) ProtoMessage()               {}
-func (*GetSubscriptionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_GetSubscriptionRequest proto.InternalMessageInfo
 
 func (m *GetSubscriptionRequest) GetSubscription() string {
 	if m != nil {
@@ -489,19 +767,41 @@ func (m *GetSubscriptionRequest) GetSubscription() string {
 // Request for the ListSubscriptions method.
 type ListSubscriptionsRequest struct {
 	// The name of the cloud project that subscriptions belong to.
-	Project string `protobuf:"bytes,1,opt,name=project" json:"project,omitempty"`
+	Project string `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"`
 	// Maximum number of subscriptions to return.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The value returned by the last ListSubscriptionsResponse; indicates that
 	// this is a continuation of a prior ListSubscriptions call, and that the
 	// system should return the next page of data.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSubscriptionsRequest) Reset()         { *m = ListSubscriptionsRequest{} }
+func (m *ListSubscriptionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSubscriptionsRequest) ProtoMessage()    {}
+func (*ListSubscriptionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{14}
+}
+func (m *ListSubscriptionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSubscriptionsRequest.Unmarshal(m, b)
+}
+func (m *ListSubscriptionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSubscriptionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSubscriptionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsRequest.Merge(dst, src)
+}
+func (m *ListSubscriptionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSubscriptionsRequest.Size(m)
+}
+func (m *ListSubscriptionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSubscriptionsRequest.DiscardUnknown(m)
 }
 
-func (m *ListSubscriptionsRequest) Reset()                    { *m = ListSubscriptionsRequest{} }
-func (m *ListSubscriptionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListSubscriptionsRequest) ProtoMessage()               {}
-func (*ListSubscriptionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_ListSubscriptionsRequest proto.InternalMessageInfo
 
 func (m *ListSubscriptionsRequest) GetProject() string {
 	if m != nil {
@@ -527,17 +827,39 @@ func (m *ListSubscriptionsRequest) GetPageToken() string {
 // Response for the ListSubscriptions method.
 type ListSubscriptionsResponse struct {
 	// The subscriptions that match the request.
-	Subscriptions []*Subscription `protobuf:"bytes,1,rep,name=subscriptions" json:"subscriptions,omitempty"`
+	Subscriptions []*Subscription `protobuf:"bytes,1,rep,name=subscriptions,proto3" json:"subscriptions,omitempty"`
 	// If not empty, indicates that there may be more subscriptions that match
 	// the request; this value should be passed in a new ListSubscriptionsRequest
 	// to get more subscriptions.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSubscriptionsResponse) Reset()         { *m = ListSubscriptionsResponse{} }
+func (m *ListSubscriptionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSubscriptionsResponse) ProtoMessage()    {}
+func (*ListSubscriptionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{15}
+}
+func (m *ListSubscriptionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSubscriptionsResponse.Unmarshal(m, b)
+}
+func (m *ListSubscriptionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSubscriptionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSubscriptionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSubscriptionsResponse.Merge(dst, src)
+}
+func (m *ListSubscriptionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSubscriptionsResponse.Size(m)
+}
+func (m *ListSubscriptionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSubscriptionsResponse.DiscardUnknown(m)
 }
 
-func (m *ListSubscriptionsResponse) Reset()                    { *m = ListSubscriptionsResponse{} }
-func (m *ListSubscriptionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListSubscriptionsResponse) ProtoMessage()               {}
-func (*ListSubscriptionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+var xxx_messageInfo_ListSubscriptionsResponse proto.InternalMessageInfo
 
 func (m *ListSubscriptionsResponse) GetSubscriptions() []*Subscription {
 	if m != nil {
@@ -556,13 +878,35 @@ func (m *ListSubscriptionsResponse) GetNextPageToken() string {
 // Request for the DeleteSubscription method.
 type DeleteSubscriptionRequest struct {
 	// The subscription to delete.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription         string   `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DeleteSubscriptionRequest) Reset()         { *m = DeleteSubscriptionRequest{} }
+func (m *DeleteSubscriptionRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSubscriptionRequest) ProtoMessage()    {}
+func (*DeleteSubscriptionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{16}
+}
+func (m *DeleteSubscriptionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSubscriptionRequest.Unmarshal(m, b)
+}
+func (m *DeleteSubscriptionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSubscriptionRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSubscriptionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSubscriptionRequest.Merge(dst, src)
+}
+func (m *DeleteSubscriptionRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSubscriptionRequest.Size(m)
+}
+func (m *DeleteSubscriptionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSubscriptionRequest.DiscardUnknown(m)
 }
 
-func (m *DeleteSubscriptionRequest) Reset()                    { *m = DeleteSubscriptionRequest{} }
-func (m *DeleteSubscriptionRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSubscriptionRequest) ProtoMessage()               {}
-func (*DeleteSubscriptionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+var xxx_messageInfo_DeleteSubscriptionRequest proto.InternalMessageInfo
 
 func (m *DeleteSubscriptionRequest) GetSubscription() string {
 	if m != nil {
@@ -574,20 +918,42 @@ func (m *DeleteSubscriptionRequest) GetSubscription() string {
 // Request for the ModifyPushConfig method.
 type ModifyPushConfigRequest struct {
 	// The name of the subscription.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// The push configuration for future deliveries.
 	//
 	// An empty pushConfig indicates that the Pub/Sub system should
 	// stop pushing messages from the given subscription and allow
 	// messages to be pulled and acknowledged - effectively pausing
 	// the subscription if Pull is not called.
-	PushConfig *PushConfig `protobuf:"bytes,2,opt,name=push_config,json=pushConfig" json:"push_config,omitempty"`
+	PushConfig           *PushConfig `protobuf:"bytes,2,opt,name=push_config,json=pushConfig,proto3" json:"push_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *ModifyPushConfigRequest) Reset()         { *m = ModifyPushConfigRequest{} }
+func (m *ModifyPushConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*ModifyPushConfigRequest) ProtoMessage()    {}
+func (*ModifyPushConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{17}
+}
+func (m *ModifyPushConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ModifyPushConfigRequest.Unmarshal(m, b)
+}
+func (m *ModifyPushConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ModifyPushConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *ModifyPushConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyPushConfigRequest.Merge(dst, src)
+}
+func (m *ModifyPushConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_ModifyPushConfigRequest.Size(m)
+}
+func (m *ModifyPushConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ModifyPushConfigRequest.DiscardUnknown(m)
 }
 
-func (m *ModifyPushConfigRequest) Reset()                    { *m = ModifyPushConfigRequest{} }
-func (m *ModifyPushConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*ModifyPushConfigRequest) ProtoMessage()               {}
-func (*ModifyPushConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+var xxx_messageInfo_ModifyPushConfigRequest proto.InternalMessageInfo
 
 func (m *ModifyPushConfigRequest) GetSubscription() string {
 	if m != nil {
@@ -606,22 +972,44 @@ func (m *ModifyPushConfigRequest) GetPushConfig() *PushConfig {
 // Request for the Pull method.
 type PullRequest struct {
 	// The subscription from which messages should be pulled.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// If this is specified as true the system will respond immediately even if
 	// it is not able to return a message in the Pull response. Otherwise the
 	// system is allowed to wait until at least one message is available rather
 	// than returning no messages. The client may cancel the request if it does
 	// not wish to wait any longer for the response.
-	ReturnImmediately bool `protobuf:"varint,2,opt,name=return_immediately,json=returnImmediately" json:"return_immediately,omitempty"`
+	ReturnImmediately bool `protobuf:"varint,2,opt,name=return_immediately,json=returnImmediately,proto3" json:"return_immediately,omitempty"`
 	// The maximum number of messages returned for this request. The Pub/Sub
 	// system may return fewer than the number specified.
-	MaxMessages int32 `protobuf:"varint,3,opt,name=max_messages,json=maxMessages" json:"max_messages,omitempty"`
+	MaxMessages          int32    `protobuf:"varint,3,opt,name=max_messages,json=maxMessages,proto3" json:"max_messages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PullRequest) Reset()         { *m = PullRequest{} }
+func (m *PullRequest) String() string { return proto.CompactTextString(m) }
+func (*PullRequest) ProtoMessage()    {}
+func (*PullRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{18}
+}
+func (m *PullRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PullRequest.Unmarshal(m, b)
+}
+func (m *PullRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PullRequest.Marshal(b, m, deterministic)
+}
+func (dst *PullRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullRequest.Merge(dst, src)
+}
+func (m *PullRequest) XXX_Size() int {
+	return xxx_messageInfo_PullRequest.Size(m)
+}
+func (m *PullRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PullRequest.DiscardUnknown(m)
 }
 
-func (m *PullRequest) Reset()                    { *m = PullRequest{} }
-func (m *PullRequest) String() string            { return proto.CompactTextString(m) }
-func (*PullRequest) ProtoMessage()               {}
-func (*PullRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_PullRequest proto.InternalMessageInfo
 
 func (m *PullRequest) GetSubscription() string {
 	if m != nil {
@@ -650,13 +1038,35 @@ type PullResponse struct {
 	// there are no more available in the backlog. The Pub/Sub system may return
 	// fewer than the maxMessages requested even if there are more messages
 	// available in the backlog.
-	ReceivedMessages []*ReceivedMessage `protobuf:"bytes,1,rep,name=received_messages,json=receivedMessages" json:"received_messages,omitempty"`
+	ReceivedMessages     []*ReceivedMessage `protobuf:"bytes,1,rep,name=received_messages,json=receivedMessages,proto3" json:"received_messages,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *PullResponse) Reset()         { *m = PullResponse{} }
+func (m *PullResponse) String() string { return proto.CompactTextString(m) }
+func (*PullResponse) ProtoMessage()    {}
+func (*PullResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{19}
+}
+func (m *PullResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PullResponse.Unmarshal(m, b)
+}
+func (m *PullResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PullResponse.Marshal(b, m, deterministic)
+}
+func (dst *PullResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PullResponse.Merge(dst, src)
+}
+func (m *PullResponse) XXX_Size() int {
+	return xxx_messageInfo_PullResponse.Size(m)
+}
+func (m *PullResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_PullResponse.DiscardUnknown(m)
 }
 
-func (m *PullResponse) Reset()                    { *m = PullResponse{} }
-func (m *PullResponse) String() string            { return proto.CompactTextString(m) }
-func (*PullResponse) ProtoMessage()               {}
-func (*PullResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+var xxx_messageInfo_PullResponse proto.InternalMessageInfo
 
 func (m *PullResponse) GetReceivedMessages() []*ReceivedMessage {
 	if m != nil {
@@ -668,21 +1078,43 @@ func (m *PullResponse) GetReceivedMessages() []*ReceivedMessage {
 // Request for the ModifyAckDeadline method.
 type ModifyAckDeadlineRequest struct {
 	// The name of the subscription.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// The acknowledgment ID.
-	AckId string `protobuf:"bytes,2,opt,name=ack_id,json=ackId" json:"ack_id,omitempty"`
+	AckId string `protobuf:"bytes,2,opt,name=ack_id,json=ackId,proto3" json:"ack_id,omitempty"`
 	// The new ack deadline with respect to the time this request was sent to the
 	// Pub/Sub system. Must be >= 0. For example, if the value is 10, the new ack
 	// deadline will expire 10 seconds after the ModifyAckDeadline call was made.
 	// Specifying zero may immediately make the message available for another pull
 	// request.
-	AckDeadlineSeconds int32 `protobuf:"varint,3,opt,name=ack_deadline_seconds,json=ackDeadlineSeconds" json:"ack_deadline_seconds,omitempty"`
+	AckDeadlineSeconds   int32    `protobuf:"varint,3,opt,name=ack_deadline_seconds,json=ackDeadlineSeconds,proto3" json:"ack_deadline_seconds,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ModifyAckDeadlineRequest) Reset()                    { *m = ModifyAckDeadlineRequest{} }
-func (m *ModifyAckDeadlineRequest) String() string            { return proto.CompactTextString(m) }
-func (*ModifyAckDeadlineRequest) ProtoMessage()               {}
-func (*ModifyAckDeadlineRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (m *ModifyAckDeadlineRequest) Reset()         { *m = ModifyAckDeadlineRequest{} }
+func (m *ModifyAckDeadlineRequest) String() string { return proto.CompactTextString(m) }
+func (*ModifyAckDeadlineRequest) ProtoMessage()    {}
+func (*ModifyAckDeadlineRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{20}
+}
+func (m *ModifyAckDeadlineRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ModifyAckDeadlineRequest.Unmarshal(m, b)
+}
+func (m *ModifyAckDeadlineRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ModifyAckDeadlineRequest.Marshal(b, m, deterministic)
+}
+func (dst *ModifyAckDeadlineRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ModifyAckDeadlineRequest.Merge(dst, src)
+}
+func (m *ModifyAckDeadlineRequest) XXX_Size() int {
+	return xxx_messageInfo_ModifyAckDeadlineRequest.Size(m)
+}
+func (m *ModifyAckDeadlineRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ModifyAckDeadlineRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ModifyAckDeadlineRequest proto.InternalMessageInfo
 
 func (m *ModifyAckDeadlineRequest) GetSubscription() string {
 	if m != nil {
@@ -708,16 +1140,38 @@ func (m *ModifyAckDeadlineRequest) GetAckDeadlineSeconds() int32 {
 // Request for the Acknowledge method.
 type AcknowledgeRequest struct {
 	// The subscription whose message is being acknowledged.
-	Subscription string `protobuf:"bytes,1,opt,name=subscription" json:"subscription,omitempty"`
+	Subscription string `protobuf:"bytes,1,opt,name=subscription,proto3" json:"subscription,omitempty"`
 	// The acknowledgment ID for the messages being acknowledged that was returned
 	// by the Pub/Sub system in the Pull response. Must not be empty.
-	AckIds []string `protobuf:"bytes,2,rep,name=ack_ids,json=ackIds" json:"ack_ids,omitempty"`
+	AckIds               []string `protobuf:"bytes,2,rep,name=ack_ids,json=ackIds,proto3" json:"ack_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AcknowledgeRequest) Reset()         { *m = AcknowledgeRequest{} }
+func (m *AcknowledgeRequest) String() string { return proto.CompactTextString(m) }
+func (*AcknowledgeRequest) ProtoMessage()    {}
+func (*AcknowledgeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_pubsub_53f7bdab0b836696, []int{21}
+}
+func (m *AcknowledgeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AcknowledgeRequest.Unmarshal(m, b)
+}
+func (m *AcknowledgeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AcknowledgeRequest.Marshal(b, m, deterministic)
+}
+func (dst *AcknowledgeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AcknowledgeRequest.Merge(dst, src)
+}
+func (m *AcknowledgeRequest) XXX_Size() int {
+	return xxx_messageInfo_AcknowledgeRequest.Size(m)
+}
+func (m *AcknowledgeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_AcknowledgeRequest.DiscardUnknown(m)
 }
 
-func (m *AcknowledgeRequest) Reset()                    { *m = AcknowledgeRequest{} }
-func (m *AcknowledgeRequest) String() string            { return proto.CompactTextString(m) }
-func (*AcknowledgeRequest) ProtoMessage()               {}
-func (*AcknowledgeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
+var xxx_messageInfo_AcknowledgeRequest proto.InternalMessageInfo
 
 func (m *AcknowledgeRequest) GetSubscription() string {
 	if m != nil {
@@ -736,6 +1190,7 @@ func (m *AcknowledgeRequest) GetAckIds() []string {
 func init() {
 	proto.RegisterType((*Topic)(nil), "google.pubsub.v1beta2.Topic")
 	proto.RegisterType((*PubsubMessage)(nil), "google.pubsub.v1beta2.PubsubMessage")
+	proto.RegisterMapType((map[string]string)(nil), "google.pubsub.v1beta2.PubsubMessage.AttributesEntry")
 	proto.RegisterType((*GetTopicRequest)(nil), "google.pubsub.v1beta2.GetTopicRequest")
 	proto.RegisterType((*PublishRequest)(nil), "google.pubsub.v1beta2.PublishRequest")
 	proto.RegisterType((*PublishResponse)(nil), "google.pubsub.v1beta2.PublishResponse")
@@ -746,6 +1201,7 @@ func init() {
 	proto.RegisterType((*DeleteTopicRequest)(nil), "google.pubsub.v1beta2.DeleteTopicRequest")
 	proto.RegisterType((*Subscription)(nil), "google.pubsub.v1beta2.Subscription")
 	proto.RegisterType((*PushConfig)(nil), "google.pubsub.v1beta2.PushConfig")
+	proto.RegisterMapType((map[string]string)(nil), "google.pubsub.v1beta2.PushConfig.AttributesEntry")
 	proto.RegisterType((*ReceivedMessage)(nil), "google.pubsub.v1beta2.ReceivedMessage")
 	proto.RegisterType((*GetSubscriptionRequest)(nil), "google.pubsub.v1beta2.GetSubscriptionRequest")
 	proto.RegisterType((*ListSubscriptionsRequest)(nil), "google.pubsub.v1beta2.ListSubscriptionsRequest")
@@ -766,8 +1222,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Subscriber service
-
+// SubscriberClient is the client API for Subscriber service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SubscriberClient interface {
 	// Creates a subscription to a given topic for a given subscriber.
 	// If the subscription already exists, returns ALREADY_EXISTS.
@@ -785,12 +1242,12 @@ type SubscriberClient interface {
 	// NOT_FOUND. After a subscription is deleted, a new one may be created with
 	// the same name, but the new one has no association with the old
 	// subscription, or its topic unless the same topic is specified.
-	DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error)
+	DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Modifies the ack deadline for a specific message. This method is useful to
 	// indicate that more time is needed to process a message by the subscriber,
 	// or to make the message available for redelivery if the processing was
 	// interrupted.
-	ModifyAckDeadline(ctx context.Context, in *ModifyAckDeadlineRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error)
+	ModifyAckDeadline(ctx context.Context, in *ModifyAckDeadlineRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Acknowledges the messages associated with the ack tokens in the
 	// AcknowledgeRequest. The Pub/Sub system can remove the relevant messages
 	// from the subscription.
@@ -798,7 +1255,7 @@ type SubscriberClient interface {
 	// Acknowledging a message whose ack deadline has expired may succeed,
 	// but such a message may be redelivered later. Acknowledging a message more
 	// than once will not result in an error.
-	Acknowledge(ctx context.Context, in *AcknowledgeRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error)
+	Acknowledge(ctx context.Context, in *AcknowledgeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Pulls messages from the server. Returns an empty list if there are no
 	// messages available in the backlog. The server may return UNAVAILABLE if
 	// there are too many concurrent pull requests pending for the given
@@ -811,7 +1268,7 @@ type SubscriberClient interface {
 	// attributes of a push subscription. Messages will accumulate for
 	// delivery continuously through the call regardless of changes to the
 	// PushConfig.
-	ModifyPushConfig(ctx context.Context, in *ModifyPushConfigRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error)
+	ModifyPushConfig(ctx context.Context, in *ModifyPushConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type subscriberClient struct {
@@ -824,7 +1281,7 @@ func NewSubscriberClient(cc *grpc.ClientConn) SubscriberClient {
 
 func (c *subscriberClient) CreateSubscription(ctx context.Context, in *Subscription, opts ...grpc.CallOption) (*Subscription, error) {
 	out := new(Subscription)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/CreateSubscription", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/CreateSubscription", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -833,7 +1290,7 @@ func (c *subscriberClient) CreateSubscription(ctx context.Context, in *Subscript
 
 func (c *subscriberClient) GetSubscription(ctx context.Context, in *GetSubscriptionRequest, opts ...grpc.CallOption) (*Subscription, error) {
 	out := new(Subscription)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/GetSubscription", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/GetSubscription", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -842,34 +1299,34 @@ func (c *subscriberClient) GetSubscription(ctx context.Context, in *GetSubscript
 
 func (c *subscriberClient) ListSubscriptions(ctx context.Context, in *ListSubscriptionsRequest, opts ...grpc.CallOption) (*ListSubscriptionsResponse, error) {
 	out := new(ListSubscriptionsResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/ListSubscriptions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/ListSubscriptions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
-	out := new(google_protobuf.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/DeleteSubscription", in, out, c.cc, opts...)
+func (c *subscriberClient) DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/DeleteSubscription", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) ModifyAckDeadline(ctx context.Context, in *ModifyAckDeadlineRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
-	out := new(google_protobuf.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/ModifyAckDeadline", in, out, c.cc, opts...)
+func (c *subscriberClient) ModifyAckDeadline(ctx context.Context, in *ModifyAckDeadlineRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/ModifyAckDeadline", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) Acknowledge(ctx context.Context, in *AcknowledgeRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
-	out := new(google_protobuf.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/Acknowledge", in, out, c.cc, opts...)
+func (c *subscriberClient) Acknowledge(ctx context.Context, in *AcknowledgeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/Acknowledge", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -878,24 +1335,23 @@ func (c *subscriberClient) Acknowledge(ctx context.Context, in *AcknowledgeReque
 
 func (c *subscriberClient) Pull(ctx context.Context, in *PullRequest, opts ...grpc.CallOption) (*PullResponse, error) {
 	out := new(PullResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/Pull", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/Pull", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *subscriberClient) ModifyPushConfig(ctx context.Context, in *ModifyPushConfigRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
-	out := new(google_protobuf.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/ModifyPushConfig", in, out, c.cc, opts...)
+func (c *subscriberClient) ModifyPushConfig(ctx context.Context, in *ModifyPushConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Subscriber/ModifyPushConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Subscriber service
-
+// SubscriberServer is the server API for Subscriber service.
 type SubscriberServer interface {
 	// Creates a subscription to a given topic for a given subscriber.
 	// If the subscription already exists, returns ALREADY_EXISTS.
@@ -913,12 +1369,12 @@ type SubscriberServer interface {
 	// NOT_FOUND. After a subscription is deleted, a new one may be created with
 	// the same name, but the new one has no association with the old
 	// subscription, or its topic unless the same topic is specified.
-	DeleteSubscription(context.Context, *DeleteSubscriptionRequest) (*google_protobuf.Empty, error)
+	DeleteSubscription(context.Context, *DeleteSubscriptionRequest) (*empty.Empty, error)
 	// Modifies the ack deadline for a specific message. This method is useful to
 	// indicate that more time is needed to process a message by the subscriber,
 	// or to make the message available for redelivery if the processing was
 	// interrupted.
-	ModifyAckDeadline(context.Context, *ModifyAckDeadlineRequest) (*google_protobuf.Empty, error)
+	ModifyAckDeadline(context.Context, *ModifyAckDeadlineRequest) (*empty.Empty, error)
 	// Acknowledges the messages associated with the ack tokens in the
 	// AcknowledgeRequest. The Pub/Sub system can remove the relevant messages
 	// from the subscription.
@@ -926,7 +1382,7 @@ type SubscriberServer interface {
 	// Acknowledging a message whose ack deadline has expired may succeed,
 	// but such a message may be redelivered later. Acknowledging a message more
 	// than once will not result in an error.
-	Acknowledge(context.Context, *AcknowledgeRequest) (*google_protobuf.Empty, error)
+	Acknowledge(context.Context, *AcknowledgeRequest) (*empty.Empty, error)
 	// Pulls messages from the server. Returns an empty list if there are no
 	// messages available in the backlog. The server may return UNAVAILABLE if
 	// there are too many concurrent pull requests pending for the given
@@ -939,7 +1395,7 @@ type SubscriberServer interface {
 	// attributes of a push subscription. Messages will accumulate for
 	// delivery continuously through the call regardless of changes to the
 	// PushConfig.
-	ModifyPushConfig(context.Context, *ModifyPushConfigRequest) (*google_protobuf.Empty, error)
+	ModifyPushConfig(context.Context, *ModifyPushConfigRequest) (*empty.Empty, error)
 }
 
 func RegisterSubscriberServer(s *grpc.Server, srv SubscriberServer) {
@@ -1131,8 +1587,9 @@ var _Subscriber_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/pubsub/v1beta2/pubsub.proto",
 }
 
-// Client API for Publisher service
-
+// PublisherClient is the client API for Publisher service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type PublisherClient interface {
 	// Creates the given topic with the given name.
 	CreateTopic(ctx context.Context, in *Topic, opts ...grpc.CallOption) (*Topic, error)
@@ -1150,7 +1607,7 @@ type PublisherClient interface {
 	// same name; this is an entirely new topic with none of the old
 	// configuration or subscriptions. Existing subscriptions to this topic are
 	// not deleted.
-	DeleteTopic(ctx context.Context, in *DeleteTopicRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error)
+	DeleteTopic(ctx context.Context, in *DeleteTopicRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type publisherClient struct {
@@ -1163,7 +1620,7 @@ func NewPublisherClient(cc *grpc.ClientConn) PublisherClient {
 
 func (c *publisherClient) CreateTopic(ctx context.Context, in *Topic, opts ...grpc.CallOption) (*Topic, error) {
 	out := new(Topic)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/CreateTopic", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/CreateTopic", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1172,7 +1629,7 @@ func (c *publisherClient) CreateTopic(ctx context.Context, in *Topic, opts ...gr
 
 func (c *publisherClient) Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*PublishResponse, error) {
 	out := new(PublishResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/Publish", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/Publish", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1181,7 +1638,7 @@ func (c *publisherClient) Publish(ctx context.Context, in *PublishRequest, opts
 
 func (c *publisherClient) GetTopic(ctx context.Context, in *GetTopicRequest, opts ...grpc.CallOption) (*Topic, error) {
 	out := new(Topic)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/GetTopic", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/GetTopic", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1190,7 +1647,7 @@ func (c *publisherClient) GetTopic(ctx context.Context, in *GetTopicRequest, opt
 
 func (c *publisherClient) ListTopics(ctx context.Context, in *ListTopicsRequest, opts ...grpc.CallOption) (*ListTopicsResponse, error) {
 	out := new(ListTopicsResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/ListTopics", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/ListTopics", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1199,24 +1656,23 @@ func (c *publisherClient) ListTopics(ctx context.Context, in *ListTopicsRequest,
 
 func (c *publisherClient) ListTopicSubscriptions(ctx context.Context, in *ListTopicSubscriptionsRequest, opts ...grpc.CallOption) (*ListTopicSubscriptionsResponse, error) {
 	out := new(ListTopicSubscriptionsResponse)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/ListTopicSubscriptions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/ListTopicSubscriptions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *publisherClient) DeleteTopic(ctx context.Context, in *DeleteTopicRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
-	out := new(google_protobuf.Empty)
-	err := grpc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/DeleteTopic", in, out, c.cc, opts...)
+func (c *publisherClient) DeleteTopic(ctx context.Context, in *DeleteTopicRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.pubsub.v1beta2.Publisher/DeleteTopic", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Publisher service
-
+// PublisherServer is the server API for Publisher service.
 type PublisherServer interface {
 	// Creates the given topic with the given name.
 	CreateTopic(context.Context, *Topic) (*Topic, error)
@@ -1234,7 +1690,7 @@ type PublisherServer interface {
 	// same name; this is an entirely new topic with none of the old
 	// configuration or subscriptions. Existing subscriptions to this topic are
 	// not deleted.
-	DeleteTopic(context.Context, *DeleteTopicRequest) (*google_protobuf.Empty, error)
+	DeleteTopic(context.Context, *DeleteTopicRequest) (*empty.Empty, error)
 }
 
 func RegisterPublisherServer(s *grpc.Server, srv PublisherServer) {
@@ -1382,9 +1838,11 @@ var _Publisher_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/pubsub/v1beta2/pubsub.proto",
 }
 
-func init() { proto.RegisterFile("google/pubsub/v1beta2/pubsub.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/pubsub/v1beta2/pubsub.proto", fileDescriptor_pubsub_53f7bdab0b836696)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_pubsub_53f7bdab0b836696 = []byte{
 	// 1107 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5f, 0x6f, 0xdb, 0x54,
 	0x14, 0x97, 0x93, 0xfe, 0xcb, 0x71, 0x4a, 0xda, 0xab, 0xad, 0x73, 0x53, 0x06, 0x9d, 0x37, 0x4a,
diff --git a/vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go b/vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go
index dbd73b37..410e374c 100644
--- a/vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/rpc/code/code.pb.go
@@ -1,15 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/code.proto
 
-/*
-Package code is a generated protocol buffer package.
-
-It is generated from these files:
-	google/rpc/code.proto
-
-It has these top-level messages:
-*/
-package code
+package code // import "google.golang.org/genproto/googleapis/rpc/code"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -216,15 +208,17 @@ var Code_value = map[string]int32{
 func (x Code) String() string {
 	return proto.EnumName(Code_name, int32(x))
 }
-func (Code) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (Code) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_code_932ba152e0df0902, []int{0}
+}
 
 func init() {
 	proto.RegisterEnum("google.rpc.Code", Code_name, Code_value)
 }
 
-func init() { proto.RegisterFile("google/rpc/code.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/rpc/code.proto", fileDescriptor_code_932ba152e0df0902) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_code_932ba152e0df0902 = []byte{
 	// 362 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x51, 0xcd, 0x6e, 0x93, 0x31,
 	0x10, 0xa4, 0x69, 0x49, 0x9b, 0xcd, 0xdf, 0xd6, 0xa5, 0xf0, 0x0e, 0x1c, 0x92, 0x43, 0x8f, 0x9c,
diff --git a/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go b/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go
index 068bfb2e..81a8155d 100644
--- a/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/rpc/errdetails/error_details.pb.go
@@ -1,29 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/error_details.proto
 
-/*
-Package errdetails is a generated protocol buffer package.
-
-It is generated from these files:
-	google/rpc/error_details.proto
-
-It has these top-level messages:
-	RetryInfo
-	DebugInfo
-	QuotaFailure
-	PreconditionFailure
-	BadRequest
-	RequestInfo
-	ResourceInfo
-	Help
-	LocalizedMessage
-*/
-package errdetails
+package errdetails // import "google.golang.org/genproto/googleapis/rpc/errdetails"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/duration"
+import duration "github.com/golang/protobuf/ptypes/duration"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -51,15 +34,37 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // reached.
 type RetryInfo struct {
 	// Clients should wait at least this long between retrying the same request.
-	RetryDelay *google_protobuf.Duration `protobuf:"bytes,1,opt,name=retry_delay,json=retryDelay" json:"retry_delay,omitempty"`
+	RetryDelay           *duration.Duration `protobuf:"bytes,1,opt,name=retry_delay,json=retryDelay,proto3" json:"retry_delay,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *RetryInfo) Reset()                    { *m = RetryInfo{} }
-func (m *RetryInfo) String() string            { return proto.CompactTextString(m) }
-func (*RetryInfo) ProtoMessage()               {}
-func (*RetryInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *RetryInfo) Reset()         { *m = RetryInfo{} }
+func (m *RetryInfo) String() string { return proto.CompactTextString(m) }
+func (*RetryInfo) ProtoMessage()    {}
+func (*RetryInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{0}
+}
+func (m *RetryInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RetryInfo.Unmarshal(m, b)
+}
+func (m *RetryInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RetryInfo.Marshal(b, m, deterministic)
+}
+func (dst *RetryInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryInfo.Merge(dst, src)
+}
+func (m *RetryInfo) XXX_Size() int {
+	return xxx_messageInfo_RetryInfo.Size(m)
+}
+func (m *RetryInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_RetryInfo.DiscardUnknown(m)
+}
 
-func (m *RetryInfo) GetRetryDelay() *google_protobuf.Duration {
+var xxx_messageInfo_RetryInfo proto.InternalMessageInfo
+
+func (m *RetryInfo) GetRetryDelay() *duration.Duration {
 	if m != nil {
 		return m.RetryDelay
 	}
@@ -69,15 +74,37 @@ func (m *RetryInfo) GetRetryDelay() *google_protobuf.Duration {
 // Describes additional debugging info.
 type DebugInfo struct {
 	// The stack trace entries indicating where the error occurred.
-	StackEntries []string `protobuf:"bytes,1,rep,name=stack_entries,json=stackEntries" json:"stack_entries,omitempty"`
+	StackEntries []string `protobuf:"bytes,1,rep,name=stack_entries,json=stackEntries,proto3" json:"stack_entries,omitempty"`
 	// Additional debugging information provided by the server.
-	Detail string `protobuf:"bytes,2,opt,name=detail" json:"detail,omitempty"`
+	Detail               string   `protobuf:"bytes,2,opt,name=detail,proto3" json:"detail,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DebugInfo) Reset()                    { *m = DebugInfo{} }
-func (m *DebugInfo) String() string            { return proto.CompactTextString(m) }
-func (*DebugInfo) ProtoMessage()               {}
-func (*DebugInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *DebugInfo) Reset()         { *m = DebugInfo{} }
+func (m *DebugInfo) String() string { return proto.CompactTextString(m) }
+func (*DebugInfo) ProtoMessage()    {}
+func (*DebugInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{1}
+}
+func (m *DebugInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DebugInfo.Unmarshal(m, b)
+}
+func (m *DebugInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DebugInfo.Marshal(b, m, deterministic)
+}
+func (dst *DebugInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DebugInfo.Merge(dst, src)
+}
+func (m *DebugInfo) XXX_Size() int {
+	return xxx_messageInfo_DebugInfo.Size(m)
+}
+func (m *DebugInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_DebugInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DebugInfo proto.InternalMessageInfo
 
 func (m *DebugInfo) GetStackEntries() []string {
 	if m != nil {
@@ -106,13 +133,35 @@ func (m *DebugInfo) GetDetail() string {
 // quota failure.
 type QuotaFailure struct {
 	// Describes all quota violations.
-	Violations []*QuotaFailure_Violation `protobuf:"bytes,1,rep,name=violations" json:"violations,omitempty"`
+	Violations           []*QuotaFailure_Violation `protobuf:"bytes,1,rep,name=violations,proto3" json:"violations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *QuotaFailure) Reset()                    { *m = QuotaFailure{} }
-func (m *QuotaFailure) String() string            { return proto.CompactTextString(m) }
-func (*QuotaFailure) ProtoMessage()               {}
-func (*QuotaFailure) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *QuotaFailure) Reset()         { *m = QuotaFailure{} }
+func (m *QuotaFailure) String() string { return proto.CompactTextString(m) }
+func (*QuotaFailure) ProtoMessage()    {}
+func (*QuotaFailure) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{2}
+}
+func (m *QuotaFailure) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QuotaFailure.Unmarshal(m, b)
+}
+func (m *QuotaFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QuotaFailure.Marshal(b, m, deterministic)
+}
+func (dst *QuotaFailure) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaFailure.Merge(dst, src)
+}
+func (m *QuotaFailure) XXX_Size() int {
+	return xxx_messageInfo_QuotaFailure.Size(m)
+}
+func (m *QuotaFailure) XXX_DiscardUnknown() {
+	xxx_messageInfo_QuotaFailure.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QuotaFailure proto.InternalMessageInfo
 
 func (m *QuotaFailure) GetViolations() []*QuotaFailure_Violation {
 	if m != nil {
@@ -127,7 +176,7 @@ type QuotaFailure_Violation struct {
 	// The subject on which the quota check failed.
 	// For example, "clientip:<ip address of client>" or "project:<Google
 	// developer project id>".
-	Subject string `protobuf:"bytes,1,opt,name=subject" json:"subject,omitempty"`
+	Subject string `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"`
 	// A description of how the quota check failed. Clients can use this
 	// description to find more about the quota configuration in the service's
 	// public documentation, or find the relevant quota limit to adjust through
@@ -135,13 +184,35 @@ type QuotaFailure_Violation struct {
 	//
 	// For example: "Service disabled" or "Daily Limit for read operations
 	// exceeded".
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *QuotaFailure_Violation) Reset()         { *m = QuotaFailure_Violation{} }
+func (m *QuotaFailure_Violation) String() string { return proto.CompactTextString(m) }
+func (*QuotaFailure_Violation) ProtoMessage()    {}
+func (*QuotaFailure_Violation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{2, 0}
+}
+func (m *QuotaFailure_Violation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QuotaFailure_Violation.Unmarshal(m, b)
+}
+func (m *QuotaFailure_Violation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QuotaFailure_Violation.Marshal(b, m, deterministic)
+}
+func (dst *QuotaFailure_Violation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QuotaFailure_Violation.Merge(dst, src)
+}
+func (m *QuotaFailure_Violation) XXX_Size() int {
+	return xxx_messageInfo_QuotaFailure_Violation.Size(m)
+}
+func (m *QuotaFailure_Violation) XXX_DiscardUnknown() {
+	xxx_messageInfo_QuotaFailure_Violation.DiscardUnknown(m)
 }
 
-func (m *QuotaFailure_Violation) Reset()                    { *m = QuotaFailure_Violation{} }
-func (m *QuotaFailure_Violation) String() string            { return proto.CompactTextString(m) }
-func (*QuotaFailure_Violation) ProtoMessage()               {}
-func (*QuotaFailure_Violation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+var xxx_messageInfo_QuotaFailure_Violation proto.InternalMessageInfo
 
 func (m *QuotaFailure_Violation) GetSubject() string {
 	if m != nil {
@@ -164,13 +235,35 @@ func (m *QuotaFailure_Violation) GetDescription() string {
 // PreconditionFailure message.
 type PreconditionFailure struct {
 	// Describes all precondition violations.
-	Violations []*PreconditionFailure_Violation `protobuf:"bytes,1,rep,name=violations" json:"violations,omitempty"`
+	Violations           []*PreconditionFailure_Violation `protobuf:"bytes,1,rep,name=violations,proto3" json:"violations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
+	XXX_unrecognized     []byte                           `json:"-"`
+	XXX_sizecache        int32                            `json:"-"`
+}
+
+func (m *PreconditionFailure) Reset()         { *m = PreconditionFailure{} }
+func (m *PreconditionFailure) String() string { return proto.CompactTextString(m) }
+func (*PreconditionFailure) ProtoMessage()    {}
+func (*PreconditionFailure) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{3}
+}
+func (m *PreconditionFailure) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PreconditionFailure.Unmarshal(m, b)
+}
+func (m *PreconditionFailure) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PreconditionFailure.Marshal(b, m, deterministic)
+}
+func (dst *PreconditionFailure) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PreconditionFailure.Merge(dst, src)
+}
+func (m *PreconditionFailure) XXX_Size() int {
+	return xxx_messageInfo_PreconditionFailure.Size(m)
+}
+func (m *PreconditionFailure) XXX_DiscardUnknown() {
+	xxx_messageInfo_PreconditionFailure.DiscardUnknown(m)
 }
 
-func (m *PreconditionFailure) Reset()                    { *m = PreconditionFailure{} }
-func (m *PreconditionFailure) String() string            { return proto.CompactTextString(m) }
-func (*PreconditionFailure) ProtoMessage()               {}
-func (*PreconditionFailure) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_PreconditionFailure proto.InternalMessageInfo
 
 func (m *PreconditionFailure) GetViolations() []*PreconditionFailure_Violation {
 	if m != nil {
@@ -184,24 +277,44 @@ type PreconditionFailure_Violation struct {
 	// The type of PreconditionFailure. We recommend using a service-specific
 	// enum type to define the supported precondition violation types. For
 	// example, "TOS" for "Terms of Service violation".
-	Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
 	// The subject, relative to the type, that failed.
 	// For example, "google.com/cloud" relative to the "TOS" type would
 	// indicate which terms of service is being referenced.
-	Subject string `protobuf:"bytes,2,opt,name=subject" json:"subject,omitempty"`
+	Subject string `protobuf:"bytes,2,opt,name=subject,proto3" json:"subject,omitempty"`
 	// A description of how the precondition failed. Developers can use this
 	// description to understand how to fix the failure.
 	//
 	// For example: "Terms of service not accepted".
-	Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *PreconditionFailure_Violation) Reset()         { *m = PreconditionFailure_Violation{} }
 func (m *PreconditionFailure_Violation) String() string { return proto.CompactTextString(m) }
 func (*PreconditionFailure_Violation) ProtoMessage()    {}
 func (*PreconditionFailure_Violation) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{3, 0}
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{3, 0}
 }
+func (m *PreconditionFailure_Violation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PreconditionFailure_Violation.Unmarshal(m, b)
+}
+func (m *PreconditionFailure_Violation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PreconditionFailure_Violation.Marshal(b, m, deterministic)
+}
+func (dst *PreconditionFailure_Violation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PreconditionFailure_Violation.Merge(dst, src)
+}
+func (m *PreconditionFailure_Violation) XXX_Size() int {
+	return xxx_messageInfo_PreconditionFailure_Violation.Size(m)
+}
+func (m *PreconditionFailure_Violation) XXX_DiscardUnknown() {
+	xxx_messageInfo_PreconditionFailure_Violation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PreconditionFailure_Violation proto.InternalMessageInfo
 
 func (m *PreconditionFailure_Violation) GetType() string {
 	if m != nil {
@@ -228,13 +341,35 @@ func (m *PreconditionFailure_Violation) GetDescription() string {
 // syntactic aspects of the request.
 type BadRequest struct {
 	// Describes all violations in a client request.
-	FieldViolations []*BadRequest_FieldViolation `protobuf:"bytes,1,rep,name=field_violations,json=fieldViolations" json:"field_violations,omitempty"`
+	FieldViolations      []*BadRequest_FieldViolation `protobuf:"bytes,1,rep,name=field_violations,json=fieldViolations,proto3" json:"field_violations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *BadRequest) Reset()         { *m = BadRequest{} }
+func (m *BadRequest) String() string { return proto.CompactTextString(m) }
+func (*BadRequest) ProtoMessage()    {}
+func (*BadRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{4}
+}
+func (m *BadRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BadRequest.Unmarshal(m, b)
+}
+func (m *BadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BadRequest.Marshal(b, m, deterministic)
+}
+func (dst *BadRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BadRequest.Merge(dst, src)
+}
+func (m *BadRequest) XXX_Size() int {
+	return xxx_messageInfo_BadRequest.Size(m)
+}
+func (m *BadRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BadRequest.DiscardUnknown(m)
 }
 
-func (m *BadRequest) Reset()                    { *m = BadRequest{} }
-func (m *BadRequest) String() string            { return proto.CompactTextString(m) }
-func (*BadRequest) ProtoMessage()               {}
-func (*BadRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_BadRequest proto.InternalMessageInfo
 
 func (m *BadRequest) GetFieldViolations() []*BadRequest_FieldViolation {
 	if m != nil {
@@ -248,15 +383,37 @@ type BadRequest_FieldViolation struct {
 	// A path leading to a field in the request body. The value will be a
 	// sequence of dot-separated identifiers that identify a protocol buffer
 	// field. E.g., "field_violations.field" would identify this field.
-	Field string `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
+	Field string `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
 	// A description of why the request element is bad.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *BadRequest_FieldViolation) Reset()         { *m = BadRequest_FieldViolation{} }
+func (m *BadRequest_FieldViolation) String() string { return proto.CompactTextString(m) }
+func (*BadRequest_FieldViolation) ProtoMessage()    {}
+func (*BadRequest_FieldViolation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{4, 0}
+}
+func (m *BadRequest_FieldViolation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BadRequest_FieldViolation.Unmarshal(m, b)
+}
+func (m *BadRequest_FieldViolation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BadRequest_FieldViolation.Marshal(b, m, deterministic)
+}
+func (dst *BadRequest_FieldViolation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BadRequest_FieldViolation.Merge(dst, src)
+}
+func (m *BadRequest_FieldViolation) XXX_Size() int {
+	return xxx_messageInfo_BadRequest_FieldViolation.Size(m)
+}
+func (m *BadRequest_FieldViolation) XXX_DiscardUnknown() {
+	xxx_messageInfo_BadRequest_FieldViolation.DiscardUnknown(m)
 }
 
-func (m *BadRequest_FieldViolation) Reset()                    { *m = BadRequest_FieldViolation{} }
-func (m *BadRequest_FieldViolation) String() string            { return proto.CompactTextString(m) }
-func (*BadRequest_FieldViolation) ProtoMessage()               {}
-func (*BadRequest_FieldViolation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
+var xxx_messageInfo_BadRequest_FieldViolation proto.InternalMessageInfo
 
 func (m *BadRequest_FieldViolation) GetField() string {
 	if m != nil {
@@ -277,16 +434,38 @@ func (m *BadRequest_FieldViolation) GetDescription() string {
 type RequestInfo struct {
 	// An opaque string that should only be interpreted by the service generating
 	// it. For example, it can be used to identify requests in the service's logs.
-	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
+	RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
 	// Any data that was used to serve this request. For example, an encrypted
 	// stack trace that can be sent back to the service provider for debugging.
-	ServingData string `protobuf:"bytes,2,opt,name=serving_data,json=servingData" json:"serving_data,omitempty"`
+	ServingData          string   `protobuf:"bytes,2,opt,name=serving_data,json=servingData,proto3" json:"serving_data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RequestInfo) Reset()                    { *m = RequestInfo{} }
-func (m *RequestInfo) String() string            { return proto.CompactTextString(m) }
-func (*RequestInfo) ProtoMessage()               {}
-func (*RequestInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *RequestInfo) Reset()         { *m = RequestInfo{} }
+func (m *RequestInfo) String() string { return proto.CompactTextString(m) }
+func (*RequestInfo) ProtoMessage()    {}
+func (*RequestInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{5}
+}
+func (m *RequestInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RequestInfo.Unmarshal(m, b)
+}
+func (m *RequestInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RequestInfo.Marshal(b, m, deterministic)
+}
+func (dst *RequestInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RequestInfo.Merge(dst, src)
+}
+func (m *RequestInfo) XXX_Size() int {
+	return xxx_messageInfo_RequestInfo.Size(m)
+}
+func (m *RequestInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_RequestInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RequestInfo proto.InternalMessageInfo
 
 func (m *RequestInfo) GetRequestId() string {
 	if m != nil {
@@ -307,25 +486,47 @@ type ResourceInfo struct {
 	// A name for the type of resource being accessed, e.g. "sql table",
 	// "cloud storage bucket", "file", "Google calendar"; or the type URL
 	// of the resource: e.g. "type.googleapis.com/google.pubsub.v1.Topic".
-	ResourceType string `protobuf:"bytes,1,opt,name=resource_type,json=resourceType" json:"resource_type,omitempty"`
+	ResourceType string `protobuf:"bytes,1,opt,name=resource_type,json=resourceType,proto3" json:"resource_type,omitempty"`
 	// The name of the resource being accessed.  For example, a shared calendar
 	// name: "example.com_4fghdhgsrgh@group.calendar.google.com", if the current
 	// error is [google.rpc.Code.PERMISSION_DENIED][google.rpc.Code.PERMISSION_DENIED].
-	ResourceName string `protobuf:"bytes,2,opt,name=resource_name,json=resourceName" json:"resource_name,omitempty"`
+	ResourceName string `protobuf:"bytes,2,opt,name=resource_name,json=resourceName,proto3" json:"resource_name,omitempty"`
 	// The owner of the resource (optional).
 	// For example, "user:<owner email>" or "project:<Google developer project
 	// id>".
-	Owner string `protobuf:"bytes,3,opt,name=owner" json:"owner,omitempty"`
+	Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"`
 	// Describes what error is encountered when accessing this resource.
 	// For example, updating a cloud project may require the `writer` permission
 	// on the developer console project.
-	Description string `protobuf:"bytes,4,opt,name=description" json:"description,omitempty"`
+	Description          string   `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ResourceInfo) Reset()         { *m = ResourceInfo{} }
+func (m *ResourceInfo) String() string { return proto.CompactTextString(m) }
+func (*ResourceInfo) ProtoMessage()    {}
+func (*ResourceInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{6}
+}
+func (m *ResourceInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResourceInfo.Unmarshal(m, b)
+}
+func (m *ResourceInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResourceInfo.Marshal(b, m, deterministic)
+}
+func (dst *ResourceInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResourceInfo.Merge(dst, src)
+}
+func (m *ResourceInfo) XXX_Size() int {
+	return xxx_messageInfo_ResourceInfo.Size(m)
+}
+func (m *ResourceInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResourceInfo.DiscardUnknown(m)
 }
 
-func (m *ResourceInfo) Reset()                    { *m = ResourceInfo{} }
-func (m *ResourceInfo) String() string            { return proto.CompactTextString(m) }
-func (*ResourceInfo) ProtoMessage()               {}
-func (*ResourceInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ResourceInfo proto.InternalMessageInfo
 
 func (m *ResourceInfo) GetResourceType() string {
 	if m != nil {
@@ -362,13 +563,35 @@ func (m *ResourceInfo) GetDescription() string {
 // directly to the right place in the developer console to flip the bit.
 type Help struct {
 	// URL(s) pointing to additional information on handling the current error.
-	Links []*Help_Link `protobuf:"bytes,1,rep,name=links" json:"links,omitempty"`
+	Links                []*Help_Link `protobuf:"bytes,1,rep,name=links,proto3" json:"links,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *Help) Reset()                    { *m = Help{} }
-func (m *Help) String() string            { return proto.CompactTextString(m) }
-func (*Help) ProtoMessage()               {}
-func (*Help) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *Help) Reset()         { *m = Help{} }
+func (m *Help) String() string { return proto.CompactTextString(m) }
+func (*Help) ProtoMessage()    {}
+func (*Help) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{7}
+}
+func (m *Help) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Help.Unmarshal(m, b)
+}
+func (m *Help) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Help.Marshal(b, m, deterministic)
+}
+func (dst *Help) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Help.Merge(dst, src)
+}
+func (m *Help) XXX_Size() int {
+	return xxx_messageInfo_Help.Size(m)
+}
+func (m *Help) XXX_DiscardUnknown() {
+	xxx_messageInfo_Help.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Help proto.InternalMessageInfo
 
 func (m *Help) GetLinks() []*Help_Link {
 	if m != nil {
@@ -380,15 +603,37 @@ func (m *Help) GetLinks() []*Help_Link {
 // Describes a URL link.
 type Help_Link struct {
 	// Describes what the link offers.
-	Description string `protobuf:"bytes,1,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
 	// The URL of the link.
-	Url string `protobuf:"bytes,2,opt,name=url" json:"url,omitempty"`
+	Url                  string   `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Help_Link) Reset()                    { *m = Help_Link{} }
-func (m *Help_Link) String() string            { return proto.CompactTextString(m) }
-func (*Help_Link) ProtoMessage()               {}
-func (*Help_Link) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
+func (m *Help_Link) Reset()         { *m = Help_Link{} }
+func (m *Help_Link) String() string { return proto.CompactTextString(m) }
+func (*Help_Link) ProtoMessage()    {}
+func (*Help_Link) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{7, 0}
+}
+func (m *Help_Link) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Help_Link.Unmarshal(m, b)
+}
+func (m *Help_Link) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Help_Link.Marshal(b, m, deterministic)
+}
+func (dst *Help_Link) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Help_Link.Merge(dst, src)
+}
+func (m *Help_Link) XXX_Size() int {
+	return xxx_messageInfo_Help_Link.Size(m)
+}
+func (m *Help_Link) XXX_DiscardUnknown() {
+	xxx_messageInfo_Help_Link.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Help_Link proto.InternalMessageInfo
 
 func (m *Help_Link) GetDescription() string {
 	if m != nil {
@@ -410,15 +655,37 @@ type LocalizedMessage struct {
 	// The locale used following the specification defined at
 	// http://www.rfc-editor.org/rfc/bcp/bcp47.txt.
 	// Examples are: "en-US", "fr-CH", "es-MX"
-	Locale string `protobuf:"bytes,1,opt,name=locale" json:"locale,omitempty"`
+	Locale string `protobuf:"bytes,1,opt,name=locale,proto3" json:"locale,omitempty"`
 	// The localized error message in the above locale.
-	Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Message              string   `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *LocalizedMessage) Reset()                    { *m = LocalizedMessage{} }
-func (m *LocalizedMessage) String() string            { return proto.CompactTextString(m) }
-func (*LocalizedMessage) ProtoMessage()               {}
-func (*LocalizedMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *LocalizedMessage) Reset()         { *m = LocalizedMessage{} }
+func (m *LocalizedMessage) String() string { return proto.CompactTextString(m) }
+func (*LocalizedMessage) ProtoMessage()    {}
+func (*LocalizedMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_error_details_816025d2d1ab7c4c, []int{8}
+}
+func (m *LocalizedMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LocalizedMessage.Unmarshal(m, b)
+}
+func (m *LocalizedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LocalizedMessage.Marshal(b, m, deterministic)
+}
+func (dst *LocalizedMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LocalizedMessage.Merge(dst, src)
+}
+func (m *LocalizedMessage) XXX_Size() int {
+	return xxx_messageInfo_LocalizedMessage.Size(m)
+}
+func (m *LocalizedMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_LocalizedMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LocalizedMessage proto.InternalMessageInfo
 
 func (m *LocalizedMessage) GetLocale() string {
 	if m != nil {
@@ -450,9 +717,11 @@ func init() {
 	proto.RegisterType((*LocalizedMessage)(nil), "google.rpc.LocalizedMessage")
 }
 
-func init() { proto.RegisterFile("google/rpc/error_details.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/rpc/error_details.proto", fileDescriptor_error_details_816025d2d1ab7c4c)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_error_details_816025d2d1ab7c4c = []byte{
 	// 595 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
 	0x14, 0x95, 0x9b, 0xb4, 0x9f, 0x7c, 0x93, 0xaf, 0x14, 0xf3, 0xa3, 0x10, 0x09, 0x14, 0x8c, 0x90,
diff --git a/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go b/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go
index 8867ae78..7bfe37a3 100644
--- a/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go
@@ -1,21 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/rpc/status.proto
 
-/*
-Package status is a generated protocol buffer package.
-
-It is generated from these files:
-	google/rpc/status.proto
-
-It has these top-level messages:
-	Status
-*/
-package status
+package status // import "google.golang.org/genproto/googleapis/rpc/status"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
+import any "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -82,20 +73,42 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 //     be used directly after any stripping needed for security/privacy reasons.
 type Status struct {
 	// The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code].
-	Code int32 `protobuf:"varint,1,opt,name=code" json:"code,omitempty"`
+	Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
 	// A developer-facing error message, which should be in English. Any
 	// user-facing error message should be localized and sent in the
 	// [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client.
-	Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
 	// A list of messages that carry the error details.  There is a common set of
 	// message types for APIs to use.
-	Details []*google_protobuf.Any `protobuf:"bytes,3,rep,name=details" json:"details,omitempty"`
+	Details              []*any.Any `protobuf:"bytes,3,rep,name=details,proto3" json:"details,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *Status) Reset()         { *m = Status{} }
+func (m *Status) String() string { return proto.CompactTextString(m) }
+func (*Status) ProtoMessage()    {}
+func (*Status) Descriptor() ([]byte, []int) {
+	return fileDescriptor_status_c6e4de62dcdf2edf, []int{0}
+}
+func (m *Status) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Status.Unmarshal(m, b)
+}
+func (m *Status) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Status.Marshal(b, m, deterministic)
+}
+func (dst *Status) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Status.Merge(dst, src)
+}
+func (m *Status) XXX_Size() int {
+	return xxx_messageInfo_Status.Size(m)
+}
+func (m *Status) XXX_DiscardUnknown() {
+	xxx_messageInfo_Status.DiscardUnknown(m)
 }
 
-func (m *Status) Reset()                    { *m = Status{} }
-func (m *Status) String() string            { return proto.CompactTextString(m) }
-func (*Status) ProtoMessage()               {}
-func (*Status) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Status proto.InternalMessageInfo
 
 func (m *Status) GetCode() int32 {
 	if m != nil {
@@ -111,7 +124,7 @@ func (m *Status) GetMessage() string {
 	return ""
 }
 
-func (m *Status) GetDetails() []*google_protobuf.Any {
+func (m *Status) GetDetails() []*any.Any {
 	if m != nil {
 		return m.Details
 	}
@@ -122,9 +135,9 @@ func init() {
 	proto.RegisterType((*Status)(nil), "google.rpc.Status")
 }
 
-func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor_status_c6e4de62dcdf2edf) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_status_c6e4de62dcdf2edf = []byte{
 	// 209 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0x2d, 0xd6, 0x2b, 0x28,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
index 93f12e10..8e911f8e 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/admin/database/v1/spanner_database_admin.pb.go
@@ -1,36 +1,16 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/admin/database/v1/spanner_database_admin.proto
 
-/*
-Package database is a generated protocol buffer package.
-
-It is generated from these files:
-	google/spanner/admin/database/v1/spanner_database_admin.proto
-
-It has these top-level messages:
-	Database
-	ListDatabasesRequest
-	ListDatabasesResponse
-	CreateDatabaseRequest
-	CreateDatabaseMetadata
-	GetDatabaseRequest
-	UpdateDatabaseDdlRequest
-	UpdateDatabaseDdlMetadata
-	DropDatabaseRequest
-	GetDatabaseDdlRequest
-	GetDatabaseDdlResponse
-*/
-package database
+package database // import "google.golang.org/genproto/googleapis/spanner/admin/database/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
 
 import (
 	context "golang.org/x/net/context"
@@ -75,7 +55,9 @@ var Database_State_value = map[string]int32{
 func (x Database_State) String() string {
 	return proto.EnumName(Database_State_name, int32(x))
 }
-func (Database_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+func (Database_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{0, 0}
+}
 
 // A Cloud Spanner database.
 type Database struct {
@@ -84,15 +66,37 @@ type Database struct {
 	// where `<database>` is as specified in the `CREATE DATABASE`
 	// statement. This name can be passed to other API methods to
 	// identify the database.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The current database state.
-	State Database_State `protobuf:"varint,2,opt,name=state,enum=google.spanner.admin.database.v1.Database_State" json:"state,omitempty"`
+	State                Database_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.spanner.admin.database.v1.Database_State" json:"state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *Database) Reset()                    { *m = Database{} }
-func (m *Database) String() string            { return proto.CompactTextString(m) }
-func (*Database) ProtoMessage()               {}
-func (*Database) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Database) Reset()         { *m = Database{} }
+func (m *Database) String() string { return proto.CompactTextString(m) }
+func (*Database) ProtoMessage()    {}
+func (*Database) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{0}
+}
+func (m *Database) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Database.Unmarshal(m, b)
+}
+func (m *Database) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Database.Marshal(b, m, deterministic)
+}
+func (dst *Database) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Database.Merge(dst, src)
+}
+func (m *Database) XXX_Size() int {
+	return xxx_messageInfo_Database.Size(m)
+}
+func (m *Database) XXX_DiscardUnknown() {
+	xxx_messageInfo_Database.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Database proto.InternalMessageInfo
 
 func (m *Database) GetName() string {
 	if m != nil {
@@ -112,20 +116,42 @@ func (m *Database) GetState() Database_State {
 type ListDatabasesRequest struct {
 	// Required. The instance whose databases should be listed.
 	// Values are of the form `projects/<project>/instances/<instance>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Number of databases to be returned in the response. If 0 or less,
 	// defaults to the server's maximum allowed page size.
-	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,3,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If non-empty, `page_token` should contain a
 	// [next_page_token][google.spanner.admin.database.v1.ListDatabasesResponse.next_page_token] from a
 	// previous [ListDatabasesResponse][google.spanner.admin.database.v1.ListDatabasesResponse].
-	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDatabasesRequest) Reset()                    { *m = ListDatabasesRequest{} }
-func (m *ListDatabasesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListDatabasesRequest) ProtoMessage()               {}
-func (*ListDatabasesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ListDatabasesRequest) Reset()         { *m = ListDatabasesRequest{} }
+func (m *ListDatabasesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListDatabasesRequest) ProtoMessage()    {}
+func (*ListDatabasesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{1}
+}
+func (m *ListDatabasesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDatabasesRequest.Unmarshal(m, b)
+}
+func (m *ListDatabasesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDatabasesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListDatabasesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatabasesRequest.Merge(dst, src)
+}
+func (m *ListDatabasesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListDatabasesRequest.Size(m)
+}
+func (m *ListDatabasesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDatabasesRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDatabasesRequest proto.InternalMessageInfo
 
 func (m *ListDatabasesRequest) GetParent() string {
 	if m != nil {
@@ -151,17 +177,39 @@ func (m *ListDatabasesRequest) GetPageToken() string {
 // The response for [ListDatabases][google.spanner.admin.database.v1.DatabaseAdmin.ListDatabases].
 type ListDatabasesResponse struct {
 	// Databases that matched the request.
-	Databases []*Database `protobuf:"bytes,1,rep,name=databases" json:"databases,omitempty"`
+	Databases []*Database `protobuf:"bytes,1,rep,name=databases,proto3" json:"databases,omitempty"`
 	// `next_page_token` can be sent in a subsequent
 	// [ListDatabases][google.spanner.admin.database.v1.DatabaseAdmin.ListDatabases] call to fetch more
 	// of the matching databases.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListDatabasesResponse) Reset()                    { *m = ListDatabasesResponse{} }
-func (m *ListDatabasesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListDatabasesResponse) ProtoMessage()               {}
-func (*ListDatabasesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *ListDatabasesResponse) Reset()         { *m = ListDatabasesResponse{} }
+func (m *ListDatabasesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListDatabasesResponse) ProtoMessage()    {}
+func (*ListDatabasesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{2}
+}
+func (m *ListDatabasesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListDatabasesResponse.Unmarshal(m, b)
+}
+func (m *ListDatabasesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListDatabasesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListDatabasesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListDatabasesResponse.Merge(dst, src)
+}
+func (m *ListDatabasesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListDatabasesResponse.Size(m)
+}
+func (m *ListDatabasesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListDatabasesResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListDatabasesResponse proto.InternalMessageInfo
 
 func (m *ListDatabasesResponse) GetDatabases() []*Database {
 	if m != nil {
@@ -181,24 +229,46 @@ func (m *ListDatabasesResponse) GetNextPageToken() string {
 type CreateDatabaseRequest struct {
 	// Required. The name of the instance that will serve the new database.
 	// Values are of the form `projects/<project>/instances/<instance>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. A `CREATE DATABASE` statement, which specifies the ID of the
 	// new database.  The database ID must conform to the regular expression
 	// `[a-z][a-z0-9_\-]*[a-z0-9]` and be between 2 and 30 characters in length.
 	// If the database ID is a reserved word or if it contains a hyphen, the
 	// database ID must be enclosed in backticks (`` ` ``).
-	CreateStatement string `protobuf:"bytes,2,opt,name=create_statement,json=createStatement" json:"create_statement,omitempty"`
+	CreateStatement string `protobuf:"bytes,2,opt,name=create_statement,json=createStatement,proto3" json:"create_statement,omitempty"`
 	// An optional list of DDL statements to run inside the newly created
 	// database. Statements can create tables, indexes, etc. These
 	// statements execute atomically with the creation of the database:
 	// if there is an error in any statement, the database is not created.
-	ExtraStatements []string `protobuf:"bytes,3,rep,name=extra_statements,json=extraStatements" json:"extra_statements,omitempty"`
+	ExtraStatements      []string `protobuf:"bytes,3,rep,name=extra_statements,json=extraStatements,proto3" json:"extra_statements,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateDatabaseRequest) Reset()         { *m = CreateDatabaseRequest{} }
+func (m *CreateDatabaseRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateDatabaseRequest) ProtoMessage()    {}
+func (*CreateDatabaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{3}
+}
+func (m *CreateDatabaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDatabaseRequest.Unmarshal(m, b)
+}
+func (m *CreateDatabaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDatabaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateDatabaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatabaseRequest.Merge(dst, src)
+}
+func (m *CreateDatabaseRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateDatabaseRequest.Size(m)
+}
+func (m *CreateDatabaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDatabaseRequest.DiscardUnknown(m)
 }
 
-func (m *CreateDatabaseRequest) Reset()                    { *m = CreateDatabaseRequest{} }
-func (m *CreateDatabaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateDatabaseRequest) ProtoMessage()               {}
-func (*CreateDatabaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_CreateDatabaseRequest proto.InternalMessageInfo
 
 func (m *CreateDatabaseRequest) GetParent() string {
 	if m != nil {
@@ -225,13 +295,35 @@ func (m *CreateDatabaseRequest) GetExtraStatements() []string {
 // [CreateDatabase][google.spanner.admin.database.v1.DatabaseAdmin.CreateDatabase].
 type CreateDatabaseMetadata struct {
 	// The database being created.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database             string   `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateDatabaseMetadata) Reset()         { *m = CreateDatabaseMetadata{} }
+func (m *CreateDatabaseMetadata) String() string { return proto.CompactTextString(m) }
+func (*CreateDatabaseMetadata) ProtoMessage()    {}
+func (*CreateDatabaseMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{4}
+}
+func (m *CreateDatabaseMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateDatabaseMetadata.Unmarshal(m, b)
+}
+func (m *CreateDatabaseMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateDatabaseMetadata.Marshal(b, m, deterministic)
+}
+func (dst *CreateDatabaseMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateDatabaseMetadata.Merge(dst, src)
+}
+func (m *CreateDatabaseMetadata) XXX_Size() int {
+	return xxx_messageInfo_CreateDatabaseMetadata.Size(m)
+}
+func (m *CreateDatabaseMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateDatabaseMetadata.DiscardUnknown(m)
 }
 
-func (m *CreateDatabaseMetadata) Reset()                    { *m = CreateDatabaseMetadata{} }
-func (m *CreateDatabaseMetadata) String() string            { return proto.CompactTextString(m) }
-func (*CreateDatabaseMetadata) ProtoMessage()               {}
-func (*CreateDatabaseMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_CreateDatabaseMetadata proto.InternalMessageInfo
 
 func (m *CreateDatabaseMetadata) GetDatabase() string {
 	if m != nil {
@@ -244,13 +336,35 @@ func (m *CreateDatabaseMetadata) GetDatabase() string {
 type GetDatabaseRequest struct {
 	// Required. The name of the requested database. Values are of the form
 	// `projects/<project>/instances/<instance>/databases/<database>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetDatabaseRequest) Reset()                    { *m = GetDatabaseRequest{} }
-func (m *GetDatabaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDatabaseRequest) ProtoMessage()               {}
-func (*GetDatabaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *GetDatabaseRequest) Reset()         { *m = GetDatabaseRequest{} }
+func (m *GetDatabaseRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDatabaseRequest) ProtoMessage()    {}
+func (*GetDatabaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{5}
+}
+func (m *GetDatabaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDatabaseRequest.Unmarshal(m, b)
+}
+func (m *GetDatabaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDatabaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDatabaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatabaseRequest.Merge(dst, src)
+}
+func (m *GetDatabaseRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDatabaseRequest.Size(m)
+}
+func (m *GetDatabaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDatabaseRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDatabaseRequest proto.InternalMessageInfo
 
 func (m *GetDatabaseRequest) GetName() string {
 	if m != nil {
@@ -277,9 +391,9 @@ func (m *GetDatabaseRequest) GetName() string {
 // details.
 type UpdateDatabaseDdlRequest struct {
 	// Required. The database to update.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// DDL statements to be applied to the database.
-	Statements []string `protobuf:"bytes,2,rep,name=statements" json:"statements,omitempty"`
+	Statements []string `protobuf:"bytes,2,rep,name=statements,proto3" json:"statements,omitempty"`
 	// If empty, the new update request is assigned an
 	// automatically-generated operation ID. Otherwise, `operation_id`
 	// is used to construct the name of the resulting
@@ -299,13 +413,35 @@ type UpdateDatabaseDdlRequest struct {
 	// underscore. If the named operation already exists,
 	// [UpdateDatabaseDdl][google.spanner.admin.database.v1.DatabaseAdmin.UpdateDatabaseDdl] returns
 	// `ALREADY_EXISTS`.
-	OperationId string `protobuf:"bytes,3,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"`
+	OperationId          string   `protobuf:"bytes,3,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateDatabaseDdlRequest) Reset()         { *m = UpdateDatabaseDdlRequest{} }
+func (m *UpdateDatabaseDdlRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateDatabaseDdlRequest) ProtoMessage()    {}
+func (*UpdateDatabaseDdlRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{6}
+}
+func (m *UpdateDatabaseDdlRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateDatabaseDdlRequest.Unmarshal(m, b)
+}
+func (m *UpdateDatabaseDdlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateDatabaseDdlRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateDatabaseDdlRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDatabaseDdlRequest.Merge(dst, src)
+}
+func (m *UpdateDatabaseDdlRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateDatabaseDdlRequest.Size(m)
+}
+func (m *UpdateDatabaseDdlRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateDatabaseDdlRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateDatabaseDdlRequest) Reset()                    { *m = UpdateDatabaseDdlRequest{} }
-func (m *UpdateDatabaseDdlRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateDatabaseDdlRequest) ProtoMessage()               {}
-func (*UpdateDatabaseDdlRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_UpdateDatabaseDdlRequest proto.InternalMessageInfo
 
 func (m *UpdateDatabaseDdlRequest) GetDatabase() string {
 	if m != nil {
@@ -332,20 +468,42 @@ func (m *UpdateDatabaseDdlRequest) GetOperationId() string {
 // [UpdateDatabaseDdl][google.spanner.admin.database.v1.DatabaseAdmin.UpdateDatabaseDdl].
 type UpdateDatabaseDdlMetadata struct {
 	// The database being modified.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// For an update this list contains all the statements. For an
 	// individual statement, this list contains only that statement.
-	Statements []string `protobuf:"bytes,2,rep,name=statements" json:"statements,omitempty"`
+	Statements []string `protobuf:"bytes,2,rep,name=statements,proto3" json:"statements,omitempty"`
 	// Reports the commit timestamps of all statements that have
 	// succeeded so far, where `commit_timestamps[i]` is the commit
 	// timestamp for the statement `statements[i]`.
-	CommitTimestamps []*google_protobuf3.Timestamp `protobuf:"bytes,3,rep,name=commit_timestamps,json=commitTimestamps" json:"commit_timestamps,omitempty"`
+	CommitTimestamps     []*timestamp.Timestamp `protobuf:"bytes,3,rep,name=commit_timestamps,json=commitTimestamps,proto3" json:"commit_timestamps,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *UpdateDatabaseDdlMetadata) Reset()         { *m = UpdateDatabaseDdlMetadata{} }
+func (m *UpdateDatabaseDdlMetadata) String() string { return proto.CompactTextString(m) }
+func (*UpdateDatabaseDdlMetadata) ProtoMessage()    {}
+func (*UpdateDatabaseDdlMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{7}
+}
+func (m *UpdateDatabaseDdlMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateDatabaseDdlMetadata.Unmarshal(m, b)
+}
+func (m *UpdateDatabaseDdlMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateDatabaseDdlMetadata.Marshal(b, m, deterministic)
+}
+func (dst *UpdateDatabaseDdlMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateDatabaseDdlMetadata.Merge(dst, src)
+}
+func (m *UpdateDatabaseDdlMetadata) XXX_Size() int {
+	return xxx_messageInfo_UpdateDatabaseDdlMetadata.Size(m)
+}
+func (m *UpdateDatabaseDdlMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateDatabaseDdlMetadata.DiscardUnknown(m)
 }
 
-func (m *UpdateDatabaseDdlMetadata) Reset()                    { *m = UpdateDatabaseDdlMetadata{} }
-func (m *UpdateDatabaseDdlMetadata) String() string            { return proto.CompactTextString(m) }
-func (*UpdateDatabaseDdlMetadata) ProtoMessage()               {}
-func (*UpdateDatabaseDdlMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_UpdateDatabaseDdlMetadata proto.InternalMessageInfo
 
 func (m *UpdateDatabaseDdlMetadata) GetDatabase() string {
 	if m != nil {
@@ -361,7 +519,7 @@ func (m *UpdateDatabaseDdlMetadata) GetStatements() []string {
 	return nil
 }
 
-func (m *UpdateDatabaseDdlMetadata) GetCommitTimestamps() []*google_protobuf3.Timestamp {
+func (m *UpdateDatabaseDdlMetadata) GetCommitTimestamps() []*timestamp.Timestamp {
 	if m != nil {
 		return m.CommitTimestamps
 	}
@@ -371,13 +529,35 @@ func (m *UpdateDatabaseDdlMetadata) GetCommitTimestamps() []*google_protobuf3.Ti
 // The request for [DropDatabase][google.spanner.admin.database.v1.DatabaseAdmin.DropDatabase].
 type DropDatabaseRequest struct {
 	// Required. The database to be dropped.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database             string   `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DropDatabaseRequest) Reset()         { *m = DropDatabaseRequest{} }
+func (m *DropDatabaseRequest) String() string { return proto.CompactTextString(m) }
+func (*DropDatabaseRequest) ProtoMessage()    {}
+func (*DropDatabaseRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{8}
+}
+func (m *DropDatabaseRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DropDatabaseRequest.Unmarshal(m, b)
+}
+func (m *DropDatabaseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DropDatabaseRequest.Marshal(b, m, deterministic)
+}
+func (dst *DropDatabaseRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DropDatabaseRequest.Merge(dst, src)
+}
+func (m *DropDatabaseRequest) XXX_Size() int {
+	return xxx_messageInfo_DropDatabaseRequest.Size(m)
+}
+func (m *DropDatabaseRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DropDatabaseRequest.DiscardUnknown(m)
 }
 
-func (m *DropDatabaseRequest) Reset()                    { *m = DropDatabaseRequest{} }
-func (m *DropDatabaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*DropDatabaseRequest) ProtoMessage()               {}
-func (*DropDatabaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_DropDatabaseRequest proto.InternalMessageInfo
 
 func (m *DropDatabaseRequest) GetDatabase() string {
 	if m != nil {
@@ -389,13 +569,35 @@ func (m *DropDatabaseRequest) GetDatabase() string {
 // The request for [GetDatabaseDdl][google.spanner.admin.database.v1.DatabaseAdmin.GetDatabaseDdl].
 type GetDatabaseDdlRequest struct {
 	// Required. The database whose schema we wish to get.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database             string   `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetDatabaseDdlRequest) Reset()         { *m = GetDatabaseDdlRequest{} }
+func (m *GetDatabaseDdlRequest) String() string { return proto.CompactTextString(m) }
+func (*GetDatabaseDdlRequest) ProtoMessage()    {}
+func (*GetDatabaseDdlRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{9}
+}
+func (m *GetDatabaseDdlRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDatabaseDdlRequest.Unmarshal(m, b)
+}
+func (m *GetDatabaseDdlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDatabaseDdlRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetDatabaseDdlRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatabaseDdlRequest.Merge(dst, src)
+}
+func (m *GetDatabaseDdlRequest) XXX_Size() int {
+	return xxx_messageInfo_GetDatabaseDdlRequest.Size(m)
+}
+func (m *GetDatabaseDdlRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDatabaseDdlRequest.DiscardUnknown(m)
 }
 
-func (m *GetDatabaseDdlRequest) Reset()                    { *m = GetDatabaseDdlRequest{} }
-func (m *GetDatabaseDdlRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetDatabaseDdlRequest) ProtoMessage()               {}
-func (*GetDatabaseDdlRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_GetDatabaseDdlRequest proto.InternalMessageInfo
 
 func (m *GetDatabaseDdlRequest) GetDatabase() string {
 	if m != nil {
@@ -408,13 +610,35 @@ func (m *GetDatabaseDdlRequest) GetDatabase() string {
 type GetDatabaseDdlResponse struct {
 	// A list of formatted DDL statements defining the schema of the database
 	// specified in the request.
-	Statements []string `protobuf:"bytes,1,rep,name=statements" json:"statements,omitempty"`
+	Statements           []string `protobuf:"bytes,1,rep,name=statements,proto3" json:"statements,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetDatabaseDdlResponse) Reset()                    { *m = GetDatabaseDdlResponse{} }
-func (m *GetDatabaseDdlResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetDatabaseDdlResponse) ProtoMessage()               {}
-func (*GetDatabaseDdlResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *GetDatabaseDdlResponse) Reset()         { *m = GetDatabaseDdlResponse{} }
+func (m *GetDatabaseDdlResponse) String() string { return proto.CompactTextString(m) }
+func (*GetDatabaseDdlResponse) ProtoMessage()    {}
+func (*GetDatabaseDdlResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_database_admin_7b69d4ce340cae98, []int{10}
+}
+func (m *GetDatabaseDdlResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetDatabaseDdlResponse.Unmarshal(m, b)
+}
+func (m *GetDatabaseDdlResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetDatabaseDdlResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetDatabaseDdlResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDatabaseDdlResponse.Merge(dst, src)
+}
+func (m *GetDatabaseDdlResponse) XXX_Size() int {
+	return xxx_messageInfo_GetDatabaseDdlResponse.Size(m)
+}
+func (m *GetDatabaseDdlResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDatabaseDdlResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetDatabaseDdlResponse proto.InternalMessageInfo
 
 func (m *GetDatabaseDdlResponse) GetStatements() []string {
 	if m != nil {
@@ -446,8 +670,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for DatabaseAdmin service
-
+// DatabaseAdminClient is the client API for DatabaseAdmin service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DatabaseAdminClient interface {
 	// Lists Cloud Spanner databases.
 	ListDatabases(ctx context.Context, in *ListDatabasesRequest, opts ...grpc.CallOption) (*ListDatabasesResponse, error)
@@ -459,7 +684,7 @@ type DatabaseAdminClient interface {
 	// [CreateDatabaseMetadata][google.spanner.admin.database.v1.CreateDatabaseMetadata]. The
 	// [response][google.longrunning.Operation.response] field type is
 	// [Database][google.spanner.admin.database.v1.Database], if successful.
-	CreateDatabase(ctx context.Context, in *CreateDatabaseRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateDatabase(ctx context.Context, in *CreateDatabaseRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Gets the state of a Cloud Spanner database.
 	GetDatabase(ctx context.Context, in *GetDatabaseRequest, opts ...grpc.CallOption) (*Database, error)
 	// Updates the schema of a Cloud Spanner database by
@@ -469,9 +694,9 @@ type DatabaseAdminClient interface {
 	// track execution of the schema change(s). The
 	// [metadata][google.longrunning.Operation.metadata] field type is
 	// [UpdateDatabaseDdlMetadata][google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata].  The operation has no response.
-	UpdateDatabaseDdl(ctx context.Context, in *UpdateDatabaseDdlRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UpdateDatabaseDdl(ctx context.Context, in *UpdateDatabaseDdlRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Drops (aka deletes) a Cloud Spanner database.
-	DropDatabase(ctx context.Context, in *DropDatabaseRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DropDatabase(ctx context.Context, in *DropDatabaseRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Returns the schema of a Cloud Spanner database as a list of formatted
 	// DDL statements. This method does not show pending schema updates, those may
 	// be queried using the [Operations][google.longrunning.Operations] API.
@@ -481,20 +706,20 @@ type DatabaseAdminClient interface {
 	//
 	// Authorization requires `spanner.databases.setIamPolicy` permission on
 	// [resource][google.iam.v1.SetIamPolicyRequest.resource].
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Gets the access control policy for a database resource. Returns an empty
 	// policy if a database exists but does not have a policy set.
 	//
 	// Authorization requires `spanner.databases.getIamPolicy` permission on
 	// [resource][google.iam.v1.GetIamPolicyRequest.resource].
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Returns permissions that the caller has on the specified database resource.
 	//
 	// Attempting this RPC on a non-existent Cloud Spanner database will result in
 	// a NOT_FOUND error if the user has `spanner.databases.list` permission on
 	// the containing Cloud Spanner instance. Otherwise returns an empty set of
 	// permissions.
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
 }
 
 type databaseAdminClient struct {
@@ -507,16 +732,16 @@ func NewDatabaseAdminClient(cc *grpc.ClientConn) DatabaseAdminClient {
 
 func (c *databaseAdminClient) ListDatabases(ctx context.Context, in *ListDatabasesRequest, opts ...grpc.CallOption) (*ListDatabasesResponse, error) {
 	out := new(ListDatabasesResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/ListDatabases", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/ListDatabases", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *databaseAdminClient) CreateDatabase(ctx context.Context, in *CreateDatabaseRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/CreateDatabase", in, out, c.cc, opts...)
+func (c *databaseAdminClient) CreateDatabase(ctx context.Context, in *CreateDatabaseRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/CreateDatabase", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -525,25 +750,25 @@ func (c *databaseAdminClient) CreateDatabase(ctx context.Context, in *CreateData
 
 func (c *databaseAdminClient) GetDatabase(ctx context.Context, in *GetDatabaseRequest, opts ...grpc.CallOption) (*Database, error) {
 	out := new(Database)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/GetDatabase", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/GetDatabase", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *databaseAdminClient) UpdateDatabaseDdl(ctx context.Context, in *UpdateDatabaseDdlRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/UpdateDatabaseDdl", in, out, c.cc, opts...)
+func (c *databaseAdminClient) UpdateDatabaseDdl(ctx context.Context, in *UpdateDatabaseDdlRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/UpdateDatabaseDdl", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *databaseAdminClient) DropDatabase(ctx context.Context, in *DropDatabaseRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/DropDatabase", in, out, c.cc, opts...)
+func (c *databaseAdminClient) DropDatabase(ctx context.Context, in *DropDatabaseRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/DropDatabase", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -552,42 +777,41 @@ func (c *databaseAdminClient) DropDatabase(ctx context.Context, in *DropDatabase
 
 func (c *databaseAdminClient) GetDatabaseDdl(ctx context.Context, in *GetDatabaseDdlRequest, opts ...grpc.CallOption) (*GetDatabaseDdlResponse, error) {
 	out := new(GetDatabaseDdlResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/GetDatabaseDdl", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/GetDatabaseDdl", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *databaseAdminClient) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/SetIamPolicy", in, out, c.cc, opts...)
+func (c *databaseAdminClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *databaseAdminClient) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/GetIamPolicy", in, out, c.cc, opts...)
+func (c *databaseAdminClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *databaseAdminClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/TestIamPermissions", in, out, c.cc, opts...)
+func (c *databaseAdminClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.database.v1.DatabaseAdmin/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for DatabaseAdmin service
-
+// DatabaseAdminServer is the server API for DatabaseAdmin service.
 type DatabaseAdminServer interface {
 	// Lists Cloud Spanner databases.
 	ListDatabases(context.Context, *ListDatabasesRequest) (*ListDatabasesResponse, error)
@@ -599,7 +823,7 @@ type DatabaseAdminServer interface {
 	// [CreateDatabaseMetadata][google.spanner.admin.database.v1.CreateDatabaseMetadata]. The
 	// [response][google.longrunning.Operation.response] field type is
 	// [Database][google.spanner.admin.database.v1.Database], if successful.
-	CreateDatabase(context.Context, *CreateDatabaseRequest) (*google_longrunning.Operation, error)
+	CreateDatabase(context.Context, *CreateDatabaseRequest) (*longrunning.Operation, error)
 	// Gets the state of a Cloud Spanner database.
 	GetDatabase(context.Context, *GetDatabaseRequest) (*Database, error)
 	// Updates the schema of a Cloud Spanner database by
@@ -609,9 +833,9 @@ type DatabaseAdminServer interface {
 	// track execution of the schema change(s). The
 	// [metadata][google.longrunning.Operation.metadata] field type is
 	// [UpdateDatabaseDdlMetadata][google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata].  The operation has no response.
-	UpdateDatabaseDdl(context.Context, *UpdateDatabaseDdlRequest) (*google_longrunning.Operation, error)
+	UpdateDatabaseDdl(context.Context, *UpdateDatabaseDdlRequest) (*longrunning.Operation, error)
 	// Drops (aka deletes) a Cloud Spanner database.
-	DropDatabase(context.Context, *DropDatabaseRequest) (*google_protobuf2.Empty, error)
+	DropDatabase(context.Context, *DropDatabaseRequest) (*empty.Empty, error)
 	// Returns the schema of a Cloud Spanner database as a list of formatted
 	// DDL statements. This method does not show pending schema updates, those may
 	// be queried using the [Operations][google.longrunning.Operations] API.
@@ -621,20 +845,20 @@ type DatabaseAdminServer interface {
 	//
 	// Authorization requires `spanner.databases.setIamPolicy` permission on
 	// [resource][google.iam.v1.SetIamPolicyRequest.resource].
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Gets the access control policy for a database resource. Returns an empty
 	// policy if a database exists but does not have a policy set.
 	//
 	// Authorization requires `spanner.databases.getIamPolicy` permission on
 	// [resource][google.iam.v1.GetIamPolicyRequest.resource].
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Returns permissions that the caller has on the specified database resource.
 	//
 	// Attempting this RPC on a non-existent Cloud Spanner database will result in
 	// a NOT_FOUND error if the user has `spanner.databases.list` permission on
 	// the containing Cloud Spanner instance. Otherwise returns an empty set of
 	// permissions.
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
 }
 
 func RegisterDatabaseAdminServer(s *grpc.Server, srv DatabaseAdminServer) {
@@ -750,7 +974,7 @@ func _DatabaseAdmin_GetDatabaseDdl_Handler(srv interface{}, ctx context.Context,
 }
 
 func _DatabaseAdmin_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -762,13 +986,13 @@ func _DatabaseAdmin_SetIamPolicy_Handler(srv interface{}, ctx context.Context, d
 		FullMethod: "/google.spanner.admin.database.v1.DatabaseAdmin/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DatabaseAdminServer).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(DatabaseAdminServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _DatabaseAdmin_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -780,13 +1004,13 @@ func _DatabaseAdmin_GetIamPolicy_Handler(srv interface{}, ctx context.Context, d
 		FullMethod: "/google.spanner.admin.database.v1.DatabaseAdmin/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DatabaseAdminServer).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(DatabaseAdminServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _DatabaseAdmin_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -798,7 +1022,7 @@ func _DatabaseAdmin_TestIamPermissions_Handler(srv interface{}, ctx context.Cont
 		FullMethod: "/google.spanner.admin.database.v1.DatabaseAdmin/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DatabaseAdminServer).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(DatabaseAdminServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -849,10 +1073,10 @@ var _DatabaseAdmin_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/spanner/admin/database/v1/spanner_database_admin.proto", fileDescriptor0)
+	proto.RegisterFile("google/spanner/admin/database/v1/spanner_database_admin.proto", fileDescriptor_spanner_database_admin_7b69d4ce340cae98)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_spanner_database_admin_7b69d4ce340cae98 = []byte{
 	// 1033 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x96, 0xcf, 0x6f, 0x1b, 0x45,
 	0x14, 0xc7, 0x19, 0xa7, 0xa9, 0x92, 0x17, 0x27, 0x75, 0x06, 0x1c, 0xb9, 0x5b, 0x5a, 0xcc, 0x82,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
index aeff94a2..53763aa3 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/admin/instance/v1/spanner_instance_admin.pb.go
@@ -1,39 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/admin/instance/v1/spanner_instance_admin.proto
 
-/*
-Package instance is a generated protocol buffer package.
-
-It is generated from these files:
-	google/spanner/admin/instance/v1/spanner_instance_admin.proto
-
-It has these top-level messages:
-	InstanceConfig
-	Instance
-	ListInstanceConfigsRequest
-	ListInstanceConfigsResponse
-	GetInstanceConfigRequest
-	GetInstanceRequest
-	CreateInstanceRequest
-	ListInstancesRequest
-	ListInstancesResponse
-	UpdateInstanceRequest
-	DeleteInstanceRequest
-	CreateInstanceMetadata
-	UpdateInstanceMetadata
-*/
-package instance
+package instance // import "google.golang.org/genproto/googleapis/spanner/admin/instance/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_iam_v11 "google.golang.org/genproto/googleapis/iam/v1"
-import google_iam_v1 "google.golang.org/genproto/googleapis/iam/v1"
-import google_longrunning "google.golang.org/genproto/googleapis/longrunning"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf3 "google.golang.org/genproto/protobuf/field_mask"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
+import v1 "google.golang.org/genproto/googleapis/iam/v1"
+import longrunning "google.golang.org/genproto/googleapis/longrunning"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -80,7 +58,9 @@ var Instance_State_value = map[string]int32{
 func (x Instance_State) String() string {
 	return proto.EnumName(Instance_State_name, int32(x))
 }
-func (Instance_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (Instance_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{1, 0}
+}
 
 // A possible configuration for a Cloud Spanner instance. Configurations
 // define the geographic placement of nodes and their replication.
@@ -88,15 +68,37 @@ type InstanceConfig struct {
 	// A unique identifier for the instance configuration.  Values
 	// are of the form
 	// `projects/<project>/instanceConfigs/[a-z][-a-z0-9]*`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The name of this instance configuration as it appears in UIs.
-	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName          string   `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InstanceConfig) Reset()         { *m = InstanceConfig{} }
+func (m *InstanceConfig) String() string { return proto.CompactTextString(m) }
+func (*InstanceConfig) ProtoMessage()    {}
+func (*InstanceConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{0}
+}
+func (m *InstanceConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InstanceConfig.Unmarshal(m, b)
+}
+func (m *InstanceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InstanceConfig.Marshal(b, m, deterministic)
+}
+func (dst *InstanceConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InstanceConfig.Merge(dst, src)
+}
+func (m *InstanceConfig) XXX_Size() int {
+	return xxx_messageInfo_InstanceConfig.Size(m)
+}
+func (m *InstanceConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_InstanceConfig.DiscardUnknown(m)
 }
 
-func (m *InstanceConfig) Reset()                    { *m = InstanceConfig{} }
-func (m *InstanceConfig) String() string            { return proto.CompactTextString(m) }
-func (*InstanceConfig) ProtoMessage()               {}
-func (*InstanceConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_InstanceConfig proto.InternalMessageInfo
 
 func (m *InstanceConfig) GetName() string {
 	if m != nil {
@@ -118,27 +120,27 @@ type Instance struct {
 	// after the instance is created. Values are of the form
 	// `projects/<project>/instances/[a-z][-a-z0-9]*[a-z0-9]`. The final
 	// segment of the name must be between 6 and 30 characters in length.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. The name of the instance's configuration. Values are of the form
 	// `projects/<project>/instanceConfigs/<configuration>`. See
 	// also [InstanceConfig][google.spanner.admin.instance.v1.InstanceConfig] and
 	// [ListInstanceConfigs][google.spanner.admin.instance.v1.InstanceAdmin.ListInstanceConfigs].
-	Config string `protobuf:"bytes,2,opt,name=config" json:"config,omitempty"`
+	Config string `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 	// Required. The descriptive name for this instance as it appears in UIs.
 	// Must be unique per project and between 4 and 30 characters in length.
-	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Required. The number of nodes allocated to this instance. This may be zero
 	// in API responses for instances that are not yet in state `READY`.
 	//
 	// See [the documentation](https://cloud.google.com/spanner/docs/instances#node_count)
 	// for more information about nodes.
-	NodeCount int32 `protobuf:"varint,5,opt,name=node_count,json=nodeCount" json:"node_count,omitempty"`
+	NodeCount int32 `protobuf:"varint,5,opt,name=node_count,json=nodeCount,proto3" json:"node_count,omitempty"`
 	// Output only. The current instance state. For
 	// [CreateInstance][google.spanner.admin.instance.v1.InstanceAdmin.CreateInstance], the state must be
 	// either omitted or set to `CREATING`. For
 	// [UpdateInstance][google.spanner.admin.instance.v1.InstanceAdmin.UpdateInstance], the state must be
 	// either omitted or set to `READY`.
-	State Instance_State `protobuf:"varint,6,opt,name=state,enum=google.spanner.admin.instance.v1.Instance_State" json:"state,omitempty"`
+	State Instance_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.spanner.admin.instance.v1.Instance_State" json:"state,omitempty"`
 	// Cloud Labels are a flexible and lightweight mechanism for organizing cloud
 	// resources into groups that reflect a customer's organizational needs and
 	// deployment strategies. Cloud Labels can be used to filter collections of
@@ -160,13 +162,35 @@ type Instance struct {
 	// specific characters being disallowed.  For example, representing labels
 	// as the string:  name + "_" + value  would prove problematic if we were to
 	// allow "_" in a future release.
-	Labels map[string]string `protobuf:"bytes,7,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels               map[string]string `protobuf:"bytes,7,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Instance) Reset()         { *m = Instance{} }
+func (m *Instance) String() string { return proto.CompactTextString(m) }
+func (*Instance) ProtoMessage()    {}
+func (*Instance) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{1}
+}
+func (m *Instance) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Instance.Unmarshal(m, b)
+}
+func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
+}
+func (dst *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(dst, src)
+}
+func (m *Instance) XXX_Size() int {
+	return xxx_messageInfo_Instance.Size(m)
+}
+func (m *Instance) XXX_DiscardUnknown() {
+	xxx_messageInfo_Instance.DiscardUnknown(m)
 }
 
-func (m *Instance) Reset()                    { *m = Instance{} }
-func (m *Instance) String() string            { return proto.CompactTextString(m) }
-func (*Instance) ProtoMessage()               {}
-func (*Instance) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Instance proto.InternalMessageInfo
 
 func (m *Instance) GetName() string {
 	if m != nil {
@@ -215,20 +239,42 @@ type ListInstanceConfigsRequest struct {
 	// Required. The name of the project for which a list of supported instance
 	// configurations is requested. Values are of the form
 	// `projects/<project>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Number of instance configurations to be returned in the response. If 0 or
 	// less, defaults to the server's maximum allowed page size.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If non-empty, `page_token` should contain a
 	// [next_page_token][google.spanner.admin.instance.v1.ListInstanceConfigsResponse.next_page_token]
 	// from a previous [ListInstanceConfigsResponse][google.spanner.admin.instance.v1.ListInstanceConfigsResponse].
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInstanceConfigsRequest) Reset()         { *m = ListInstanceConfigsRequest{} }
+func (m *ListInstanceConfigsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListInstanceConfigsRequest) ProtoMessage()    {}
+func (*ListInstanceConfigsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{2}
+}
+func (m *ListInstanceConfigsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstanceConfigsRequest.Unmarshal(m, b)
+}
+func (m *ListInstanceConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstanceConfigsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListInstanceConfigsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstanceConfigsRequest.Merge(dst, src)
+}
+func (m *ListInstanceConfigsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListInstanceConfigsRequest.Size(m)
+}
+func (m *ListInstanceConfigsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstanceConfigsRequest.DiscardUnknown(m)
 }
 
-func (m *ListInstanceConfigsRequest) Reset()                    { *m = ListInstanceConfigsRequest{} }
-func (m *ListInstanceConfigsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListInstanceConfigsRequest) ProtoMessage()               {}
-func (*ListInstanceConfigsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_ListInstanceConfigsRequest proto.InternalMessageInfo
 
 func (m *ListInstanceConfigsRequest) GetParent() string {
 	if m != nil {
@@ -254,17 +300,39 @@ func (m *ListInstanceConfigsRequest) GetPageToken() string {
 // The response for [ListInstanceConfigs][google.spanner.admin.instance.v1.InstanceAdmin.ListInstanceConfigs].
 type ListInstanceConfigsResponse struct {
 	// The list of requested instance configurations.
-	InstanceConfigs []*InstanceConfig `protobuf:"bytes,1,rep,name=instance_configs,json=instanceConfigs" json:"instance_configs,omitempty"`
+	InstanceConfigs []*InstanceConfig `protobuf:"bytes,1,rep,name=instance_configs,json=instanceConfigs,proto3" json:"instance_configs,omitempty"`
 	// `next_page_token` can be sent in a subsequent
 	// [ListInstanceConfigs][google.spanner.admin.instance.v1.InstanceAdmin.ListInstanceConfigs] call to
 	// fetch more of the matching instance configurations.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListInstanceConfigsResponse) Reset()                    { *m = ListInstanceConfigsResponse{} }
-func (m *ListInstanceConfigsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListInstanceConfigsResponse) ProtoMessage()               {}
-func (*ListInstanceConfigsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *ListInstanceConfigsResponse) Reset()         { *m = ListInstanceConfigsResponse{} }
+func (m *ListInstanceConfigsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListInstanceConfigsResponse) ProtoMessage()    {}
+func (*ListInstanceConfigsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{3}
+}
+func (m *ListInstanceConfigsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstanceConfigsResponse.Unmarshal(m, b)
+}
+func (m *ListInstanceConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstanceConfigsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListInstanceConfigsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstanceConfigsResponse.Merge(dst, src)
+}
+func (m *ListInstanceConfigsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListInstanceConfigsResponse.Size(m)
+}
+func (m *ListInstanceConfigsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstanceConfigsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListInstanceConfigsResponse proto.InternalMessageInfo
 
 func (m *ListInstanceConfigsResponse) GetInstanceConfigs() []*InstanceConfig {
 	if m != nil {
@@ -285,13 +353,35 @@ func (m *ListInstanceConfigsResponse) GetNextPageToken() string {
 type GetInstanceConfigRequest struct {
 	// Required. The name of the requested instance configuration. Values are of
 	// the form `projects/<project>/instanceConfigs/<config>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetInstanceConfigRequest) Reset()         { *m = GetInstanceConfigRequest{} }
+func (m *GetInstanceConfigRequest) String() string { return proto.CompactTextString(m) }
+func (*GetInstanceConfigRequest) ProtoMessage()    {}
+func (*GetInstanceConfigRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{4}
+}
+func (m *GetInstanceConfigRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetInstanceConfigRequest.Unmarshal(m, b)
+}
+func (m *GetInstanceConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetInstanceConfigRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetInstanceConfigRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceConfigRequest.Merge(dst, src)
+}
+func (m *GetInstanceConfigRequest) XXX_Size() int {
+	return xxx_messageInfo_GetInstanceConfigRequest.Size(m)
+}
+func (m *GetInstanceConfigRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetInstanceConfigRequest.DiscardUnknown(m)
 }
 
-func (m *GetInstanceConfigRequest) Reset()                    { *m = GetInstanceConfigRequest{} }
-func (m *GetInstanceConfigRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetInstanceConfigRequest) ProtoMessage()               {}
-func (*GetInstanceConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_GetInstanceConfigRequest proto.InternalMessageInfo
 
 func (m *GetInstanceConfigRequest) GetName() string {
 	if m != nil {
@@ -304,13 +394,35 @@ func (m *GetInstanceConfigRequest) GetName() string {
 type GetInstanceRequest struct {
 	// Required. The name of the requested instance. Values are of the form
 	// `projects/<project>/instances/<instance>`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetInstanceRequest) Reset()                    { *m = GetInstanceRequest{} }
-func (m *GetInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetInstanceRequest) ProtoMessage()               {}
-func (*GetInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *GetInstanceRequest) Reset()         { *m = GetInstanceRequest{} }
+func (m *GetInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*GetInstanceRequest) ProtoMessage()    {}
+func (*GetInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{5}
+}
+func (m *GetInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetInstanceRequest.Unmarshal(m, b)
+}
+func (m *GetInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetInstanceRequest.Merge(dst, src)
+}
+func (m *GetInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_GetInstanceRequest.Size(m)
+}
+func (m *GetInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetInstanceRequest proto.InternalMessageInfo
 
 func (m *GetInstanceRequest) GetName() string {
 	if m != nil {
@@ -323,20 +435,42 @@ func (m *GetInstanceRequest) GetName() string {
 type CreateInstanceRequest struct {
 	// Required. The name of the project in which to create the instance. Values
 	// are of the form `projects/<project>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Required. The ID of the instance to create.  Valid identifiers are of the
 	// form `[a-z][-a-z0-9]*[a-z0-9]` and must be between 6 and 30 characters in
 	// length.
-	InstanceId string `protobuf:"bytes,2,opt,name=instance_id,json=instanceId" json:"instance_id,omitempty"`
+	InstanceId string `protobuf:"bytes,2,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
 	// Required. The instance to create.  The name may be omitted, but if
 	// specified must be `<parent>/instances/<instance_id>`.
-	Instance *Instance `protobuf:"bytes,3,opt,name=instance" json:"instance,omitempty"`
+	Instance             *Instance `protobuf:"bytes,3,opt,name=instance,proto3" json:"instance,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *CreateInstanceRequest) Reset()         { *m = CreateInstanceRequest{} }
+func (m *CreateInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateInstanceRequest) ProtoMessage()    {}
+func (*CreateInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{6}
+}
+func (m *CreateInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateInstanceRequest.Unmarshal(m, b)
+}
+func (m *CreateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceRequest.Merge(dst, src)
+}
+func (m *CreateInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateInstanceRequest.Size(m)
+}
+func (m *CreateInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateInstanceRequest.DiscardUnknown(m)
 }
 
-func (m *CreateInstanceRequest) Reset()                    { *m = CreateInstanceRequest{} }
-func (m *CreateInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateInstanceRequest) ProtoMessage()               {}
-func (*CreateInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_CreateInstanceRequest proto.InternalMessageInfo
 
 func (m *CreateInstanceRequest) GetParent() string {
 	if m != nil {
@@ -363,14 +497,14 @@ func (m *CreateInstanceRequest) GetInstance() *Instance {
 type ListInstancesRequest struct {
 	// Required. The name of the project for which a list of instances is
 	// requested. Values are of the form `projects/<project>`.
-	Parent string `protobuf:"bytes,1,opt,name=parent" json:"parent,omitempty"`
+	Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Number of instances to be returned in the response. If 0 or less, defaults
 	// to the server's maximum allowed page size.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If non-empty, `page_token` should contain a
 	// [next_page_token][google.spanner.admin.instance.v1.ListInstancesResponse.next_page_token] from a
 	// previous [ListInstancesResponse][google.spanner.admin.instance.v1.ListInstancesResponse].
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// An expression for filtering the results of the request. Filter rules are
 	// case insensitive. The fields eligible for filtering are:
 	//
@@ -390,13 +524,35 @@ type ListInstancesRequest struct {
 	//   * `name:howl labels.env:dev` --> The instance's name contains "howl" and
 	//                                  it has the label "env" with its value
 	//                                  containing "dev".
-	Filter string `protobuf:"bytes,4,opt,name=filter" json:"filter,omitempty"`
+	Filter               string   `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInstancesRequest) Reset()         { *m = ListInstancesRequest{} }
+func (m *ListInstancesRequest) String() string { return proto.CompactTextString(m) }
+func (*ListInstancesRequest) ProtoMessage()    {}
+func (*ListInstancesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{7}
+}
+func (m *ListInstancesRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstancesRequest.Unmarshal(m, b)
+}
+func (m *ListInstancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstancesRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListInstancesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesRequest.Merge(dst, src)
+}
+func (m *ListInstancesRequest) XXX_Size() int {
+	return xxx_messageInfo_ListInstancesRequest.Size(m)
+}
+func (m *ListInstancesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstancesRequest.DiscardUnknown(m)
 }
 
-func (m *ListInstancesRequest) Reset()                    { *m = ListInstancesRequest{} }
-func (m *ListInstancesRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListInstancesRequest) ProtoMessage()               {}
-func (*ListInstancesRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ListInstancesRequest proto.InternalMessageInfo
 
 func (m *ListInstancesRequest) GetParent() string {
 	if m != nil {
@@ -429,17 +585,39 @@ func (m *ListInstancesRequest) GetFilter() string {
 // The response for [ListInstances][google.spanner.admin.instance.v1.InstanceAdmin.ListInstances].
 type ListInstancesResponse struct {
 	// The list of requested instances.
-	Instances []*Instance `protobuf:"bytes,1,rep,name=instances" json:"instances,omitempty"`
+	Instances []*Instance `protobuf:"bytes,1,rep,name=instances,proto3" json:"instances,omitempty"`
 	// `next_page_token` can be sent in a subsequent
 	// [ListInstances][google.spanner.admin.instance.v1.InstanceAdmin.ListInstances] call to fetch more
 	// of the matching instances.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListInstancesResponse) Reset()         { *m = ListInstancesResponse{} }
+func (m *ListInstancesResponse) String() string { return proto.CompactTextString(m) }
+func (*ListInstancesResponse) ProtoMessage()    {}
+func (*ListInstancesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{8}
+}
+func (m *ListInstancesResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListInstancesResponse.Unmarshal(m, b)
+}
+func (m *ListInstancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListInstancesResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListInstancesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListInstancesResponse.Merge(dst, src)
+}
+func (m *ListInstancesResponse) XXX_Size() int {
+	return xxx_messageInfo_ListInstancesResponse.Size(m)
+}
+func (m *ListInstancesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListInstancesResponse.DiscardUnknown(m)
 }
 
-func (m *ListInstancesResponse) Reset()                    { *m = ListInstancesResponse{} }
-func (m *ListInstancesResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListInstancesResponse) ProtoMessage()               {}
-func (*ListInstancesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_ListInstancesResponse proto.InternalMessageInfo
 
 func (m *ListInstancesResponse) GetInstances() []*Instance {
 	if m != nil {
@@ -459,18 +637,40 @@ func (m *ListInstancesResponse) GetNextPageToken() string {
 type UpdateInstanceRequest struct {
 	// Required. The instance to update, which must always include the instance
 	// name.  Otherwise, only fields mentioned in [][google.spanner.admin.instance.v1.UpdateInstanceRequest.field_mask] need be included.
-	Instance *Instance `protobuf:"bytes,1,opt,name=instance" json:"instance,omitempty"`
+	Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
 	// Required. A mask specifying which fields in [][google.spanner.admin.instance.v1.UpdateInstanceRequest.instance] should be updated.
 	// The field mask must always be specified; this prevents any future fields in
 	// [][google.spanner.admin.instance.v1.Instance] from being erased accidentally by clients that do not know
 	// about them.
-	FieldMask *google_protobuf3.FieldMask `protobuf:"bytes,2,opt,name=field_mask,json=fieldMask" json:"field_mask,omitempty"`
+	FieldMask            *field_mask.FieldMask `protobuf:"bytes,2,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdateInstanceRequest) Reset()         { *m = UpdateInstanceRequest{} }
+func (m *UpdateInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateInstanceRequest) ProtoMessage()    {}
+func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{9}
+}
+func (m *UpdateInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateInstanceRequest.Unmarshal(m, b)
+}
+func (m *UpdateInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceRequest.Merge(dst, src)
+}
+func (m *UpdateInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateInstanceRequest.Size(m)
+}
+func (m *UpdateInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateInstanceRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateInstanceRequest) Reset()                    { *m = UpdateInstanceRequest{} }
-func (m *UpdateInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateInstanceRequest) ProtoMessage()               {}
-func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_UpdateInstanceRequest proto.InternalMessageInfo
 
 func (m *UpdateInstanceRequest) GetInstance() *Instance {
 	if m != nil {
@@ -479,7 +679,7 @@ func (m *UpdateInstanceRequest) GetInstance() *Instance {
 	return nil
 }
 
-func (m *UpdateInstanceRequest) GetFieldMask() *google_protobuf3.FieldMask {
+func (m *UpdateInstanceRequest) GetFieldMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.FieldMask
 	}
@@ -490,13 +690,35 @@ func (m *UpdateInstanceRequest) GetFieldMask() *google_protobuf3.FieldMask {
 type DeleteInstanceRequest struct {
 	// Required. The name of the instance to be deleted. Values are of the form
 	// `projects/<project>/instances/<instance>`
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteInstanceRequest) Reset()                    { *m = DeleteInstanceRequest{} }
-func (m *DeleteInstanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteInstanceRequest) ProtoMessage()               {}
-func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *DeleteInstanceRequest) Reset()         { *m = DeleteInstanceRequest{} }
+func (m *DeleteInstanceRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteInstanceRequest) ProtoMessage()    {}
+func (*DeleteInstanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{10}
+}
+func (m *DeleteInstanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteInstanceRequest.Unmarshal(m, b)
+}
+func (m *DeleteInstanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteInstanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteInstanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteInstanceRequest.Merge(dst, src)
+}
+func (m *DeleteInstanceRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteInstanceRequest.Size(m)
+}
+func (m *DeleteInstanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteInstanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteInstanceRequest proto.InternalMessageInfo
 
 func (m *DeleteInstanceRequest) GetName() string {
 	if m != nil {
@@ -509,23 +731,45 @@ func (m *DeleteInstanceRequest) GetName() string {
 // [CreateInstance][google.spanner.admin.instance.v1.InstanceAdmin.CreateInstance].
 type CreateInstanceMetadata struct {
 	// The instance being created.
-	Instance *Instance `protobuf:"bytes,1,opt,name=instance" json:"instance,omitempty"`
+	Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
 	// The time at which the
 	// [CreateInstance][google.spanner.admin.instance.v1.InstanceAdmin.CreateInstance] request was
 	// received.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time at which this operation was cancelled. If set, this operation is
 	// in the process of undoing itself (which is guaranteed to succeed) and
 	// cannot be cancelled again.
-	CancelTime *google_protobuf4.Timestamp `protobuf:"bytes,3,opt,name=cancel_time,json=cancelTime" json:"cancel_time,omitempty"`
+	CancelTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=cancel_time,json=cancelTime,proto3" json:"cancel_time,omitempty"`
 	// The time at which this operation failed or was completed successfully.
-	EndTime *google_protobuf4.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              *timestamp.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *CreateInstanceMetadata) Reset()                    { *m = CreateInstanceMetadata{} }
-func (m *CreateInstanceMetadata) String() string            { return proto.CompactTextString(m) }
-func (*CreateInstanceMetadata) ProtoMessage()               {}
-func (*CreateInstanceMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *CreateInstanceMetadata) Reset()         { *m = CreateInstanceMetadata{} }
+func (m *CreateInstanceMetadata) String() string { return proto.CompactTextString(m) }
+func (*CreateInstanceMetadata) ProtoMessage()    {}
+func (*CreateInstanceMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{11}
+}
+func (m *CreateInstanceMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateInstanceMetadata.Unmarshal(m, b)
+}
+func (m *CreateInstanceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateInstanceMetadata.Marshal(b, m, deterministic)
+}
+func (dst *CreateInstanceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateInstanceMetadata.Merge(dst, src)
+}
+func (m *CreateInstanceMetadata) XXX_Size() int {
+	return xxx_messageInfo_CreateInstanceMetadata.Size(m)
+}
+func (m *CreateInstanceMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateInstanceMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateInstanceMetadata proto.InternalMessageInfo
 
 func (m *CreateInstanceMetadata) GetInstance() *Instance {
 	if m != nil {
@@ -534,21 +778,21 @@ func (m *CreateInstanceMetadata) GetInstance() *Instance {
 	return nil
 }
 
-func (m *CreateInstanceMetadata) GetStartTime() *google_protobuf4.Timestamp {
+func (m *CreateInstanceMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *CreateInstanceMetadata) GetCancelTime() *google_protobuf4.Timestamp {
+func (m *CreateInstanceMetadata) GetCancelTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CancelTime
 	}
 	return nil
 }
 
-func (m *CreateInstanceMetadata) GetEndTime() *google_protobuf4.Timestamp {
+func (m *CreateInstanceMetadata) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -559,22 +803,44 @@ func (m *CreateInstanceMetadata) GetEndTime() *google_protobuf4.Timestamp {
 // [UpdateInstance][google.spanner.admin.instance.v1.InstanceAdmin.UpdateInstance].
 type UpdateInstanceMetadata struct {
 	// The desired end state of the update.
-	Instance *Instance `protobuf:"bytes,1,opt,name=instance" json:"instance,omitempty"`
+	Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`
 	// The time at which [UpdateInstance][google.spanner.admin.instance.v1.InstanceAdmin.UpdateInstance]
 	// request was received.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time at which this operation was cancelled. If set, this operation is
 	// in the process of undoing itself (which is guaranteed to succeed) and
 	// cannot be cancelled again.
-	CancelTime *google_protobuf4.Timestamp `protobuf:"bytes,3,opt,name=cancel_time,json=cancelTime" json:"cancel_time,omitempty"`
+	CancelTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=cancel_time,json=cancelTime,proto3" json:"cancel_time,omitempty"`
 	// The time at which this operation failed or was completed successfully.
-	EndTime *google_protobuf4.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime              *timestamp.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *UpdateInstanceMetadata) Reset()                    { *m = UpdateInstanceMetadata{} }
-func (m *UpdateInstanceMetadata) String() string            { return proto.CompactTextString(m) }
-func (*UpdateInstanceMetadata) ProtoMessage()               {}
-func (*UpdateInstanceMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *UpdateInstanceMetadata) Reset()         { *m = UpdateInstanceMetadata{} }
+func (m *UpdateInstanceMetadata) String() string { return proto.CompactTextString(m) }
+func (*UpdateInstanceMetadata) ProtoMessage()    {}
+func (*UpdateInstanceMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_instance_admin_6383269d887c996f, []int{12}
+}
+func (m *UpdateInstanceMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateInstanceMetadata.Unmarshal(m, b)
+}
+func (m *UpdateInstanceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateInstanceMetadata.Marshal(b, m, deterministic)
+}
+func (dst *UpdateInstanceMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateInstanceMetadata.Merge(dst, src)
+}
+func (m *UpdateInstanceMetadata) XXX_Size() int {
+	return xxx_messageInfo_UpdateInstanceMetadata.Size(m)
+}
+func (m *UpdateInstanceMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateInstanceMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateInstanceMetadata proto.InternalMessageInfo
 
 func (m *UpdateInstanceMetadata) GetInstance() *Instance {
 	if m != nil {
@@ -583,21 +849,21 @@ func (m *UpdateInstanceMetadata) GetInstance() *Instance {
 	return nil
 }
 
-func (m *UpdateInstanceMetadata) GetStartTime() *google_protobuf4.Timestamp {
+func (m *UpdateInstanceMetadata) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *UpdateInstanceMetadata) GetCancelTime() *google_protobuf4.Timestamp {
+func (m *UpdateInstanceMetadata) GetCancelTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CancelTime
 	}
 	return nil
 }
 
-func (m *UpdateInstanceMetadata) GetEndTime() *google_protobuf4.Timestamp {
+func (m *UpdateInstanceMetadata) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -607,6 +873,7 @@ func (m *UpdateInstanceMetadata) GetEndTime() *google_protobuf4.Timestamp {
 func init() {
 	proto.RegisterType((*InstanceConfig)(nil), "google.spanner.admin.instance.v1.InstanceConfig")
 	proto.RegisterType((*Instance)(nil), "google.spanner.admin.instance.v1.Instance")
+	proto.RegisterMapType((map[string]string)(nil), "google.spanner.admin.instance.v1.Instance.LabelsEntry")
 	proto.RegisterType((*ListInstanceConfigsRequest)(nil), "google.spanner.admin.instance.v1.ListInstanceConfigsRequest")
 	proto.RegisterType((*ListInstanceConfigsResponse)(nil), "google.spanner.admin.instance.v1.ListInstanceConfigsResponse")
 	proto.RegisterType((*GetInstanceConfigRequest)(nil), "google.spanner.admin.instance.v1.GetInstanceConfigRequest")
@@ -629,8 +896,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for InstanceAdmin service
-
+// InstanceAdminClient is the client API for InstanceAdmin service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type InstanceAdminClient interface {
 	// Lists the supported instance configurations for a given project.
 	ListInstanceConfigs(ctx context.Context, in *ListInstanceConfigsRequest, opts ...grpc.CallOption) (*ListInstanceConfigsResponse, error)
@@ -674,7 +942,7 @@ type InstanceAdminClient interface {
 	// [CreateInstanceMetadata][google.spanner.admin.instance.v1.CreateInstanceMetadata].
 	// The [response][google.longrunning.Operation.response] field type is
 	// [Instance][google.spanner.admin.instance.v1.Instance], if successful.
-	CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Updates an instance, and begins allocating or releasing resources
 	// as requested. The returned [long-running
 	// operation][google.longrunning.Operation] can be used to track the
@@ -715,7 +983,7 @@ type InstanceAdminClient interface {
 	//
 	// Authorization requires `spanner.instances.update` permission on
 	// resource [name][google.spanner.admin.instance.v1.Instance.name].
-	UpdateInstance(ctx context.Context, in *UpdateInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error)
+	UpdateInstance(ctx context.Context, in *UpdateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes an instance.
 	//
 	// Immediately upon completion of the request:
@@ -727,26 +995,26 @@ type InstanceAdminClient interface {
 	//   * The instance and *all of its databases* immediately and
 	//     irrevocably disappear from the API. All data in the databases
 	//     is permanently deleted.
-	DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error)
+	DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Sets the access control policy on an instance resource. Replaces any
 	// existing policy.
 	//
 	// Authorization requires `spanner.instances.setIamPolicy` on
 	// [resource][google.iam.v1.SetIamPolicyRequest.resource].
-	SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Gets the access control policy for an instance resource. Returns an empty
 	// policy if an instance exists but does not have a policy set.
 	//
 	// Authorization requires `spanner.instances.getIamPolicy` on
 	// [resource][google.iam.v1.GetIamPolicyRequest.resource].
-	GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error)
+	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Returns permissions that the caller has on the specified instance resource.
 	//
 	// Attempting this RPC on a non-existent Cloud Spanner instance resource will
 	// result in a NOT_FOUND error if the user has `spanner.instances.list`
 	// permission on the containing Google Cloud Project. Otherwise returns an
 	// empty set of permissions.
-	TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error)
 }
 
 type instanceAdminClient struct {
@@ -759,7 +1027,7 @@ func NewInstanceAdminClient(cc *grpc.ClientConn) InstanceAdminClient {
 
 func (c *instanceAdminClient) ListInstanceConfigs(ctx context.Context, in *ListInstanceConfigsRequest, opts ...grpc.CallOption) (*ListInstanceConfigsResponse, error) {
 	out := new(ListInstanceConfigsResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/ListInstanceConfigs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/ListInstanceConfigs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -768,7 +1036,7 @@ func (c *instanceAdminClient) ListInstanceConfigs(ctx context.Context, in *ListI
 
 func (c *instanceAdminClient) GetInstanceConfig(ctx context.Context, in *GetInstanceConfigRequest, opts ...grpc.CallOption) (*InstanceConfig, error) {
 	out := new(InstanceConfig)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/GetInstanceConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/GetInstanceConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -777,7 +1045,7 @@ func (c *instanceAdminClient) GetInstanceConfig(ctx context.Context, in *GetInst
 
 func (c *instanceAdminClient) ListInstances(ctx context.Context, in *ListInstancesRequest, opts ...grpc.CallOption) (*ListInstancesResponse, error) {
 	out := new(ListInstancesResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/ListInstances", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/ListInstances", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -786,69 +1054,68 @@ func (c *instanceAdminClient) ListInstances(ctx context.Context, in *ListInstanc
 
 func (c *instanceAdminClient) GetInstance(ctx context.Context, in *GetInstanceRequest, opts ...grpc.CallOption) (*Instance, error) {
 	out := new(Instance)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/GetInstance", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/GetInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *instanceAdminClient) CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/CreateInstance", in, out, c.cc, opts...)
+func (c *instanceAdminClient) CreateInstance(ctx context.Context, in *CreateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/CreateInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *instanceAdminClient) UpdateInstance(ctx context.Context, in *UpdateInstanceRequest, opts ...grpc.CallOption) (*google_longrunning.Operation, error) {
-	out := new(google_longrunning.Operation)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/UpdateInstance", in, out, c.cc, opts...)
+func (c *instanceAdminClient) UpdateInstance(ctx context.Context, in *UpdateInstanceRequest, opts ...grpc.CallOption) (*longrunning.Operation, error) {
+	out := new(longrunning.Operation)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/UpdateInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *instanceAdminClient) DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*google_protobuf2.Empty, error) {
-	out := new(google_protobuf2.Empty)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/DeleteInstance", in, out, c.cc, opts...)
+func (c *instanceAdminClient) DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/DeleteInstance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *instanceAdminClient) SetIamPolicy(ctx context.Context, in *google_iam_v11.SetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/SetIamPolicy", in, out, c.cc, opts...)
+func (c *instanceAdminClient) SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/SetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *instanceAdminClient) GetIamPolicy(ctx context.Context, in *google_iam_v11.GetIamPolicyRequest, opts ...grpc.CallOption) (*google_iam_v1.Policy, error) {
-	out := new(google_iam_v1.Policy)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/GetIamPolicy", in, out, c.cc, opts...)
+func (c *instanceAdminClient) GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error) {
+	out := new(v1.Policy)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/GetIamPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *instanceAdminClient) TestIamPermissions(ctx context.Context, in *google_iam_v11.TestIamPermissionsRequest, opts ...grpc.CallOption) (*google_iam_v11.TestIamPermissionsResponse, error) {
-	out := new(google_iam_v11.TestIamPermissionsResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/TestIamPermissions", in, out, c.cc, opts...)
+func (c *instanceAdminClient) TestIamPermissions(ctx context.Context, in *v1.TestIamPermissionsRequest, opts ...grpc.CallOption) (*v1.TestIamPermissionsResponse, error) {
+	out := new(v1.TestIamPermissionsResponse)
+	err := c.cc.Invoke(ctx, "/google.spanner.admin.instance.v1.InstanceAdmin/TestIamPermissions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for InstanceAdmin service
-
+// InstanceAdminServer is the server API for InstanceAdmin service.
 type InstanceAdminServer interface {
 	// Lists the supported instance configurations for a given project.
 	ListInstanceConfigs(context.Context, *ListInstanceConfigsRequest) (*ListInstanceConfigsResponse, error)
@@ -892,7 +1159,7 @@ type InstanceAdminServer interface {
 	// [CreateInstanceMetadata][google.spanner.admin.instance.v1.CreateInstanceMetadata].
 	// The [response][google.longrunning.Operation.response] field type is
 	// [Instance][google.spanner.admin.instance.v1.Instance], if successful.
-	CreateInstance(context.Context, *CreateInstanceRequest) (*google_longrunning.Operation, error)
+	CreateInstance(context.Context, *CreateInstanceRequest) (*longrunning.Operation, error)
 	// Updates an instance, and begins allocating or releasing resources
 	// as requested. The returned [long-running
 	// operation][google.longrunning.Operation] can be used to track the
@@ -933,7 +1200,7 @@ type InstanceAdminServer interface {
 	//
 	// Authorization requires `spanner.instances.update` permission on
 	// resource [name][google.spanner.admin.instance.v1.Instance.name].
-	UpdateInstance(context.Context, *UpdateInstanceRequest) (*google_longrunning.Operation, error)
+	UpdateInstance(context.Context, *UpdateInstanceRequest) (*longrunning.Operation, error)
 	// Deletes an instance.
 	//
 	// Immediately upon completion of the request:
@@ -945,26 +1212,26 @@ type InstanceAdminServer interface {
 	//   * The instance and *all of its databases* immediately and
 	//     irrevocably disappear from the API. All data in the databases
 	//     is permanently deleted.
-	DeleteInstance(context.Context, *DeleteInstanceRequest) (*google_protobuf2.Empty, error)
+	DeleteInstance(context.Context, *DeleteInstanceRequest) (*empty.Empty, error)
 	// Sets the access control policy on an instance resource. Replaces any
 	// existing policy.
 	//
 	// Authorization requires `spanner.instances.setIamPolicy` on
 	// [resource][google.iam.v1.SetIamPolicyRequest.resource].
-	SetIamPolicy(context.Context, *google_iam_v11.SetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Gets the access control policy for an instance resource. Returns an empty
 	// policy if an instance exists but does not have a policy set.
 	//
 	// Authorization requires `spanner.instances.getIamPolicy` on
 	// [resource][google.iam.v1.GetIamPolicyRequest.resource].
-	GetIamPolicy(context.Context, *google_iam_v11.GetIamPolicyRequest) (*google_iam_v1.Policy, error)
+	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Returns permissions that the caller has on the specified instance resource.
 	//
 	// Attempting this RPC on a non-existent Cloud Spanner instance resource will
 	// result in a NOT_FOUND error if the user has `spanner.instances.list`
 	// permission on the containing Google Cloud Project. Otherwise returns an
 	// empty set of permissions.
-	TestIamPermissions(context.Context, *google_iam_v11.TestIamPermissionsRequest) (*google_iam_v11.TestIamPermissionsResponse, error)
+	TestIamPermissions(context.Context, *v1.TestIamPermissionsRequest) (*v1.TestIamPermissionsResponse, error)
 }
 
 func RegisterInstanceAdminServer(s *grpc.Server, srv InstanceAdminServer) {
@@ -1098,7 +1365,7 @@ func _InstanceAdmin_DeleteInstance_Handler(srv interface{}, ctx context.Context,
 }
 
 func _InstanceAdmin_SetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.SetIamPolicyRequest)
+	in := new(v1.SetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1110,13 +1377,13 @@ func _InstanceAdmin_SetIamPolicy_Handler(srv interface{}, ctx context.Context, d
 		FullMethod: "/google.spanner.admin.instance.v1.InstanceAdmin/SetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(InstanceAdminServer).SetIamPolicy(ctx, req.(*google_iam_v11.SetIamPolicyRequest))
+		return srv.(InstanceAdminServer).SetIamPolicy(ctx, req.(*v1.SetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _InstanceAdmin_GetIamPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.GetIamPolicyRequest)
+	in := new(v1.GetIamPolicyRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1128,13 +1395,13 @@ func _InstanceAdmin_GetIamPolicy_Handler(srv interface{}, ctx context.Context, d
 		FullMethod: "/google.spanner.admin.instance.v1.InstanceAdmin/GetIamPolicy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(InstanceAdminServer).GetIamPolicy(ctx, req.(*google_iam_v11.GetIamPolicyRequest))
+		return srv.(InstanceAdminServer).GetIamPolicy(ctx, req.(*v1.GetIamPolicyRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _InstanceAdmin_TestIamPermissions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_iam_v11.TestIamPermissionsRequest)
+	in := new(v1.TestIamPermissionsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1146,7 +1413,7 @@ func _InstanceAdmin_TestIamPermissions_Handler(srv interface{}, ctx context.Cont
 		FullMethod: "/google.spanner.admin.instance.v1.InstanceAdmin/TestIamPermissions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(InstanceAdminServer).TestIamPermissions(ctx, req.(*google_iam_v11.TestIamPermissionsRequest))
+		return srv.(InstanceAdminServer).TestIamPermissions(ctx, req.(*v1.TestIamPermissionsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1201,10 +1468,10 @@ var _InstanceAdmin_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/spanner/admin/instance/v1/spanner_instance_admin.proto", fileDescriptor0)
+	proto.RegisterFile("google/spanner/admin/instance/v1/spanner_instance_admin.proto", fileDescriptor_spanner_instance_admin_6383269d887c996f)
 }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_spanner_instance_admin_6383269d887c996f = []byte{
 	// 1210 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
 	0x14, 0x67, 0x92, 0x3a, 0x8d, 0x9f, 0xd3, 0x34, 0x1d, 0x9a, 0xca, 0xb8, 0x94, 0xa6, 0x5b, 0x54,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/v1/keys.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/v1/keys.pb.go
index 66728bea..f6b2e117 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/v1/keys.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/v1/keys.pb.go
@@ -1,58 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/keys.proto
 
-/*
-Package spanner is a generated protocol buffer package.
-
-It is generated from these files:
-	google/spanner/v1/keys.proto
-	google/spanner/v1/mutation.proto
-	google/spanner/v1/query_plan.proto
-	google/spanner/v1/result_set.proto
-	google/spanner/v1/spanner.proto
-	google/spanner/v1/transaction.proto
-	google/spanner/v1/type.proto
-
-It has these top-level messages:
-	KeyRange
-	KeySet
-	Mutation
-	PlanNode
-	QueryPlan
-	ResultSet
-	PartialResultSet
-	ResultSetMetadata
-	ResultSetStats
-	CreateSessionRequest
-	Session
-	GetSessionRequest
-	ListSessionsRequest
-	ListSessionsResponse
-	DeleteSessionRequest
-	ExecuteSqlRequest
-	PartitionOptions
-	PartitionQueryRequest
-	PartitionReadRequest
-	Partition
-	PartitionResponse
-	ReadRequest
-	BeginTransactionRequest
-	CommitRequest
-	CommitResponse
-	RollbackRequest
-	TransactionOptions
-	Transaction
-	TransactionSelector
-	Type
-	StructType
-*/
-package spanner
+package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/struct"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -164,38 +119,51 @@ type KeyRange struct {
 	// Types that are valid to be assigned to EndKeyType:
 	//	*KeyRange_EndClosed
 	//	*KeyRange_EndOpen
-	EndKeyType isKeyRange_EndKeyType `protobuf_oneof:"end_key_type"`
+	EndKeyType           isKeyRange_EndKeyType `protobuf_oneof:"end_key_type"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *KeyRange) Reset()                    { *m = KeyRange{} }
-func (m *KeyRange) String() string            { return proto.CompactTextString(m) }
-func (*KeyRange) ProtoMessage()               {}
-func (*KeyRange) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *KeyRange) Reset()         { *m = KeyRange{} }
+func (m *KeyRange) String() string { return proto.CompactTextString(m) }
+func (*KeyRange) ProtoMessage()    {}
+func (*KeyRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor_keys_3b687fe915157fa4, []int{0}
+}
+func (m *KeyRange) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KeyRange.Unmarshal(m, b)
+}
+func (m *KeyRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KeyRange.Marshal(b, m, deterministic)
+}
+func (dst *KeyRange) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeyRange.Merge(dst, src)
+}
+func (m *KeyRange) XXX_Size() int {
+	return xxx_messageInfo_KeyRange.Size(m)
+}
+func (m *KeyRange) XXX_DiscardUnknown() {
+	xxx_messageInfo_KeyRange.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_KeyRange proto.InternalMessageInfo
 
 type isKeyRange_StartKeyType interface {
 	isKeyRange_StartKeyType()
 }
-type isKeyRange_EndKeyType interface {
-	isKeyRange_EndKeyType()
-}
 
 type KeyRange_StartClosed struct {
-	StartClosed *google_protobuf1.ListValue `protobuf:"bytes,1,opt,name=start_closed,json=startClosed,oneof"`
+	StartClosed *_struct.ListValue `protobuf:"bytes,1,opt,name=start_closed,json=startClosed,proto3,oneof"`
 }
+
 type KeyRange_StartOpen struct {
-	StartOpen *google_protobuf1.ListValue `protobuf:"bytes,2,opt,name=start_open,json=startOpen,oneof"`
-}
-type KeyRange_EndClosed struct {
-	EndClosed *google_protobuf1.ListValue `protobuf:"bytes,3,opt,name=end_closed,json=endClosed,oneof"`
-}
-type KeyRange_EndOpen struct {
-	EndOpen *google_protobuf1.ListValue `protobuf:"bytes,4,opt,name=end_open,json=endOpen,oneof"`
+	StartOpen *_struct.ListValue `protobuf:"bytes,2,opt,name=start_open,json=startOpen,proto3,oneof"`
 }
 
 func (*KeyRange_StartClosed) isKeyRange_StartKeyType() {}
-func (*KeyRange_StartOpen) isKeyRange_StartKeyType()   {}
-func (*KeyRange_EndClosed) isKeyRange_EndKeyType()     {}
-func (*KeyRange_EndOpen) isKeyRange_EndKeyType()       {}
+
+func (*KeyRange_StartOpen) isKeyRange_StartKeyType() {}
 
 func (m *KeyRange) GetStartKeyType() isKeyRange_StartKeyType {
 	if m != nil {
@@ -203,35 +171,52 @@ func (m *KeyRange) GetStartKeyType() isKeyRange_StartKeyType {
 	}
 	return nil
 }
-func (m *KeyRange) GetEndKeyType() isKeyRange_EndKeyType {
-	if m != nil {
-		return m.EndKeyType
-	}
-	return nil
-}
 
-func (m *KeyRange) GetStartClosed() *google_protobuf1.ListValue {
+func (m *KeyRange) GetStartClosed() *_struct.ListValue {
 	if x, ok := m.GetStartKeyType().(*KeyRange_StartClosed); ok {
 		return x.StartClosed
 	}
 	return nil
 }
 
-func (m *KeyRange) GetStartOpen() *google_protobuf1.ListValue {
+func (m *KeyRange) GetStartOpen() *_struct.ListValue {
 	if x, ok := m.GetStartKeyType().(*KeyRange_StartOpen); ok {
 		return x.StartOpen
 	}
 	return nil
 }
 
-func (m *KeyRange) GetEndClosed() *google_protobuf1.ListValue {
+type isKeyRange_EndKeyType interface {
+	isKeyRange_EndKeyType()
+}
+
+type KeyRange_EndClosed struct {
+	EndClosed *_struct.ListValue `protobuf:"bytes,3,opt,name=end_closed,json=endClosed,proto3,oneof"`
+}
+
+type KeyRange_EndOpen struct {
+	EndOpen *_struct.ListValue `protobuf:"bytes,4,opt,name=end_open,json=endOpen,proto3,oneof"`
+}
+
+func (*KeyRange_EndClosed) isKeyRange_EndKeyType() {}
+
+func (*KeyRange_EndOpen) isKeyRange_EndKeyType() {}
+
+func (m *KeyRange) GetEndKeyType() isKeyRange_EndKeyType {
+	if m != nil {
+		return m.EndKeyType
+	}
+	return nil
+}
+
+func (m *KeyRange) GetEndClosed() *_struct.ListValue {
 	if x, ok := m.GetEndKeyType().(*KeyRange_EndClosed); ok {
 		return x.EndClosed
 	}
 	return nil
 }
 
-func (m *KeyRange) GetEndOpen() *google_protobuf1.ListValue {
+func (m *KeyRange) GetEndOpen() *_struct.ListValue {
 	if x, ok := m.GetEndKeyType().(*KeyRange_EndOpen); ok {
 		return x.EndOpen
 	}
@@ -292,7 +277,7 @@ func _KeyRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.ListValue)
+		msg := new(_struct.ListValue)
 		err := b.DecodeMessage(msg)
 		m.StartKeyType = &KeyRange_StartClosed{msg}
 		return true, err
@@ -300,7 +285,7 @@ func _KeyRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.ListValue)
+		msg := new(_struct.ListValue)
 		err := b.DecodeMessage(msg)
 		m.StartKeyType = &KeyRange_StartOpen{msg}
 		return true, err
@@ -308,7 +293,7 @@ func _KeyRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.ListValue)
+		msg := new(_struct.ListValue)
 		err := b.DecodeMessage(msg)
 		m.EndKeyType = &KeyRange_EndClosed{msg}
 		return true, err
@@ -316,7 +301,7 @@ func _KeyRange_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.ListValue)
+		msg := new(_struct.ListValue)
 		err := b.DecodeMessage(msg)
 		m.EndKeyType = &KeyRange_EndOpen{msg}
 		return true, err
@@ -331,12 +316,12 @@ func _KeyRange_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.StartKeyType.(type) {
 	case *KeyRange_StartClosed:
 		s := proto.Size(x.StartClosed)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *KeyRange_StartOpen:
 		s := proto.Size(x.StartOpen)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -347,12 +332,12 @@ func _KeyRange_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.EndKeyType.(type) {
 	case *KeyRange_EndClosed:
 		s := proto.Size(x.EndClosed)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *KeyRange_EndOpen:
 		s := proto.Size(x.EndOpen)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -374,22 +359,44 @@ type KeySet struct {
 	// many elements as there are columns in the primary or index key
 	// with which this `KeySet` is used.  Individual key values are
 	// encoded as described [here][google.spanner.v1.TypeCode].
-	Keys []*google_protobuf1.ListValue `protobuf:"bytes,1,rep,name=keys" json:"keys,omitempty"`
+	Keys []*_struct.ListValue `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
 	// A list of key ranges. See [KeyRange][google.spanner.v1.KeyRange] for more information about
 	// key range specifications.
-	Ranges []*KeyRange `protobuf:"bytes,2,rep,name=ranges" json:"ranges,omitempty"`
+	Ranges []*KeyRange `protobuf:"bytes,2,rep,name=ranges,proto3" json:"ranges,omitempty"`
 	// For convenience `all` can be set to `true` to indicate that this
 	// `KeySet` matches all keys in the table or index. Note that any keys
 	// specified in `keys` or `ranges` are only yielded once.
-	All bool `protobuf:"varint,3,opt,name=all" json:"all,omitempty"`
+	All                  bool     `protobuf:"varint,3,opt,name=all,proto3" json:"all,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *KeySet) Reset()         { *m = KeySet{} }
+func (m *KeySet) String() string { return proto.CompactTextString(m) }
+func (*KeySet) ProtoMessage()    {}
+func (*KeySet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_keys_3b687fe915157fa4, []int{1}
+}
+func (m *KeySet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_KeySet.Unmarshal(m, b)
+}
+func (m *KeySet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_KeySet.Marshal(b, m, deterministic)
+}
+func (dst *KeySet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_KeySet.Merge(dst, src)
+}
+func (m *KeySet) XXX_Size() int {
+	return xxx_messageInfo_KeySet.Size(m)
+}
+func (m *KeySet) XXX_DiscardUnknown() {
+	xxx_messageInfo_KeySet.DiscardUnknown(m)
 }
 
-func (m *KeySet) Reset()                    { *m = KeySet{} }
-func (m *KeySet) String() string            { return proto.CompactTextString(m) }
-func (*KeySet) ProtoMessage()               {}
-func (*KeySet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_KeySet proto.InternalMessageInfo
 
-func (m *KeySet) GetKeys() []*google_protobuf1.ListValue {
+func (m *KeySet) GetKeys() []*_struct.ListValue {
 	if m != nil {
 		return m.Keys
 	}
@@ -415,9 +422,9 @@ func init() {
 	proto.RegisterType((*KeySet)(nil), "google.spanner.v1.KeySet")
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/keys.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/spanner/v1/keys.proto", fileDescriptor_keys_3b687fe915157fa4) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_keys_3b687fe915157fa4 = []byte{
 	// 371 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6b, 0xea, 0x30,
 	0x1c, 0xc7, 0x5f, 0xab, 0xf8, 0x34, 0x8a, 0xf8, 0x0a, 0x8f, 0x57, 0x7c, 0x3b, 0x88, 0xa7, 0x9d,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/v1/mutation.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/v1/mutation.pb.go
index 2f827795..18481d21 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/v1/mutation.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/v1/mutation.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/mutation.proto
 
-package spanner
+package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/struct"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // A modification to one or more Cloud Spanner rows.  Mutations can be
 // applied to a Cloud Spanner database by sending them in a
 // [Commit][google.spanner.v1.Spanner.Commit] call.
@@ -26,39 +32,69 @@ type Mutation struct {
 	//	*Mutation_InsertOrUpdate
 	//	*Mutation_Replace
 	//	*Mutation_Delete_
-	Operation isMutation_Operation `protobuf_oneof:"operation"`
+	Operation            isMutation_Operation `protobuf_oneof:"operation"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Mutation) Reset()         { *m = Mutation{} }
+func (m *Mutation) String() string { return proto.CompactTextString(m) }
+func (*Mutation) ProtoMessage()    {}
+func (*Mutation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_mutation_eb7ac5a738061ac4, []int{0}
+}
+func (m *Mutation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation.Unmarshal(m, b)
+}
+func (m *Mutation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation.Marshal(b, m, deterministic)
+}
+func (dst *Mutation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation.Merge(dst, src)
+}
+func (m *Mutation) XXX_Size() int {
+	return xxx_messageInfo_Mutation.Size(m)
+}
+func (m *Mutation) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation.DiscardUnknown(m)
 }
 
-func (m *Mutation) Reset()                    { *m = Mutation{} }
-func (m *Mutation) String() string            { return proto.CompactTextString(m) }
-func (*Mutation) ProtoMessage()               {}
-func (*Mutation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Mutation proto.InternalMessageInfo
 
 type isMutation_Operation interface {
 	isMutation_Operation()
 }
 
 type Mutation_Insert struct {
-	Insert *Mutation_Write `protobuf:"bytes,1,opt,name=insert,oneof"`
+	Insert *Mutation_Write `protobuf:"bytes,1,opt,name=insert,proto3,oneof"`
 }
+
 type Mutation_Update struct {
-	Update *Mutation_Write `protobuf:"bytes,2,opt,name=update,oneof"`
+	Update *Mutation_Write `protobuf:"bytes,2,opt,name=update,proto3,oneof"`
 }
+
 type Mutation_InsertOrUpdate struct {
-	InsertOrUpdate *Mutation_Write `protobuf:"bytes,3,opt,name=insert_or_update,json=insertOrUpdate,oneof"`
+	InsertOrUpdate *Mutation_Write `protobuf:"bytes,3,opt,name=insert_or_update,json=insertOrUpdate,proto3,oneof"`
 }
+
 type Mutation_Replace struct {
-	Replace *Mutation_Write `protobuf:"bytes,4,opt,name=replace,oneof"`
+	Replace *Mutation_Write `protobuf:"bytes,4,opt,name=replace,proto3,oneof"`
 }
+
 type Mutation_Delete_ struct {
-	Delete *Mutation_Delete `protobuf:"bytes,5,opt,name=delete,oneof"`
+	Delete *Mutation_Delete `protobuf:"bytes,5,opt,name=delete,proto3,oneof"`
 }
 
-func (*Mutation_Insert) isMutation_Operation()         {}
-func (*Mutation_Update) isMutation_Operation()         {}
+func (*Mutation_Insert) isMutation_Operation() {}
+
+func (*Mutation_Update) isMutation_Operation() {}
+
 func (*Mutation_InsertOrUpdate) isMutation_Operation() {}
-func (*Mutation_Replace) isMutation_Operation()        {}
-func (*Mutation_Delete_) isMutation_Operation()        {}
+
+func (*Mutation_Replace) isMutation_Operation() {}
+
+func (*Mutation_Delete_) isMutation_Operation() {}
 
 func (m *Mutation) GetOperation() isMutation_Operation {
 	if m != nil {
@@ -203,27 +239,27 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Operation.(type) {
 	case *Mutation_Insert:
 		s := proto.Size(x.Insert)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Update:
 		s := proto.Size(x.Update)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_InsertOrUpdate:
 		s := proto.Size(x.InsertOrUpdate)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Replace:
 		s := proto.Size(x.Replace)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *Mutation_Delete_:
 		s := proto.Size(x.Delete)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -237,13 +273,13 @@ func _Mutation_OneofSizer(msg proto.Message) (n int) {
 // [replace][google.spanner.v1.Mutation.replace] operations.
 type Mutation_Write struct {
 	// Required. The table whose rows will be written.
-	Table string `protobuf:"bytes,1,opt,name=table" json:"table,omitempty"`
+	Table string `protobuf:"bytes,1,opt,name=table,proto3" json:"table,omitempty"`
 	// The names of the columns in [table][google.spanner.v1.Mutation.Write.table] to be written.
 	//
 	// The list of columns must contain enough columns to allow
 	// Cloud Spanner to derive values for all primary key columns in the
 	// row(s) to be modified.
-	Columns []string `protobuf:"bytes,2,rep,name=columns" json:"columns,omitempty"`
+	Columns []string `protobuf:"bytes,2,rep,name=columns,proto3" json:"columns,omitempty"`
 	// The values to be written. `values` can contain more than one
 	// list of values. If it does, then multiple rows are written, one
 	// for each entry in `values`. Each list in `values` must have
@@ -252,13 +288,35 @@ type Mutation_Write struct {
 	// `Mutation`s, each containing one `values` entry and repeating
 	// [table][google.spanner.v1.Mutation.Write.table] and [columns][google.spanner.v1.Mutation.Write.columns]. Individual values in each list are
 	// encoded as described [here][google.spanner.v1.TypeCode].
-	Values []*google_protobuf1.ListValue `protobuf:"bytes,3,rep,name=values" json:"values,omitempty"`
+	Values               []*_struct.ListValue `protobuf:"bytes,3,rep,name=values,proto3" json:"values,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *Mutation_Write) Reset()                    { *m = Mutation_Write{} }
-func (m *Mutation_Write) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_Write) ProtoMessage()               {}
-func (*Mutation_Write) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
+func (m *Mutation_Write) Reset()         { *m = Mutation_Write{} }
+func (m *Mutation_Write) String() string { return proto.CompactTextString(m) }
+func (*Mutation_Write) ProtoMessage()    {}
+func (*Mutation_Write) Descriptor() ([]byte, []int) {
+	return fileDescriptor_mutation_eb7ac5a738061ac4, []int{0, 0}
+}
+func (m *Mutation_Write) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_Write.Unmarshal(m, b)
+}
+func (m *Mutation_Write) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_Write.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_Write) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_Write.Merge(dst, src)
+}
+func (m *Mutation_Write) XXX_Size() int {
+	return xxx_messageInfo_Mutation_Write.Size(m)
+}
+func (m *Mutation_Write) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_Write.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mutation_Write proto.InternalMessageInfo
 
 func (m *Mutation_Write) GetTable() string {
 	if m != nil {
@@ -274,7 +332,7 @@ func (m *Mutation_Write) GetColumns() []string {
 	return nil
 }
 
-func (m *Mutation_Write) GetValues() []*google_protobuf1.ListValue {
+func (m *Mutation_Write) GetValues() []*_struct.ListValue {
 	if m != nil {
 		return m.Values
 	}
@@ -284,17 +342,39 @@ func (m *Mutation_Write) GetValues() []*google_protobuf1.ListValue {
 // Arguments to [delete][google.spanner.v1.Mutation.delete] operations.
 type Mutation_Delete struct {
 	// Required. The table whose rows will be deleted.
-	Table string `protobuf:"bytes,1,opt,name=table" json:"table,omitempty"`
+	Table string `protobuf:"bytes,1,opt,name=table,proto3" json:"table,omitempty"`
 	// Required. The primary keys of the rows within [table][google.spanner.v1.Mutation.Delete.table] to delete.
 	// Delete is idempotent. The transaction will succeed even if some or all
 	// rows do not exist.
-	KeySet *KeySet `protobuf:"bytes,2,opt,name=key_set,json=keySet" json:"key_set,omitempty"`
+	KeySet               *KeySet  `protobuf:"bytes,2,opt,name=key_set,json=keySet,proto3" json:"key_set,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Mutation_Delete) Reset()         { *m = Mutation_Delete{} }
+func (m *Mutation_Delete) String() string { return proto.CompactTextString(m) }
+func (*Mutation_Delete) ProtoMessage()    {}
+func (*Mutation_Delete) Descriptor() ([]byte, []int) {
+	return fileDescriptor_mutation_eb7ac5a738061ac4, []int{0, 1}
+}
+func (m *Mutation_Delete) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mutation_Delete.Unmarshal(m, b)
+}
+func (m *Mutation_Delete) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mutation_Delete.Marshal(b, m, deterministic)
+}
+func (dst *Mutation_Delete) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mutation_Delete.Merge(dst, src)
+}
+func (m *Mutation_Delete) XXX_Size() int {
+	return xxx_messageInfo_Mutation_Delete.Size(m)
+}
+func (m *Mutation_Delete) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mutation_Delete.DiscardUnknown(m)
 }
 
-func (m *Mutation_Delete) Reset()                    { *m = Mutation_Delete{} }
-func (m *Mutation_Delete) String() string            { return proto.CompactTextString(m) }
-func (*Mutation_Delete) ProtoMessage()               {}
-func (*Mutation_Delete) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 1} }
+var xxx_messageInfo_Mutation_Delete proto.InternalMessageInfo
 
 func (m *Mutation_Delete) GetTable() string {
 	if m != nil {
@@ -316,9 +396,11 @@ func init() {
 	proto.RegisterType((*Mutation_Delete)(nil), "google.spanner.v1.Mutation.Delete")
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/mutation.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/spanner/v1/mutation.proto", fileDescriptor_mutation_eb7ac5a738061ac4)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_mutation_eb7ac5a738061ac4 = []byte{
 	// 413 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xd1, 0xea, 0xd3, 0x30,
 	0x14, 0xc6, 0xed, 0xba, 0x75, 0x2e, 0x43, 0xd1, 0xa2, 0x58, 0x8b, 0x17, 0x75, 0x57, 0xbb, 0x4a,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/v1/query_plan.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/v1/query_plan.pb.go
index b42db0fe..37f9a224 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/v1/query_plan.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/v1/query_plan.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/query_plan.proto
 
-package spanner
+package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/struct"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The kind of [PlanNode][google.spanner.v1.PlanNode]. Distinguishes between the two different kinds of
 // nodes that can appear in a query plan.
 type PlanNode_Kind int32
@@ -46,24 +52,26 @@ var PlanNode_Kind_value = map[string]int32{
 func (x PlanNode_Kind) String() string {
 	return proto.EnumName(PlanNode_Kind_name, int32(x))
 }
-func (PlanNode_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (PlanNode_Kind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_query_plan_e20f6b3462ee8118, []int{0, 0}
+}
 
 // Node information for nodes appearing in a [QueryPlan.plan_nodes][google.spanner.v1.QueryPlan.plan_nodes].
 type PlanNode struct {
 	// The `PlanNode`'s index in [node list][google.spanner.v1.QueryPlan.plan_nodes].
-	Index int32 `protobuf:"varint,1,opt,name=index" json:"index,omitempty"`
+	Index int32 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"`
 	// Used to determine the type of node. May be needed for visualizing
 	// different kinds of nodes differently. For example, If the node is a
 	// [SCALAR][google.spanner.v1.PlanNode.Kind.SCALAR] node, it will have a condensed representation
 	// which can be used to directly embed a description of the node in its
 	// parent.
-	Kind PlanNode_Kind `protobuf:"varint,2,opt,name=kind,enum=google.spanner.v1.PlanNode_Kind" json:"kind,omitempty"`
+	Kind PlanNode_Kind `protobuf:"varint,2,opt,name=kind,proto3,enum=google.spanner.v1.PlanNode_Kind" json:"kind,omitempty"`
 	// The display name for the node.
-	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName" json:"display_name,omitempty"`
+	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// List of child node `index`es and their relationship to this parent.
-	ChildLinks []*PlanNode_ChildLink `protobuf:"bytes,4,rep,name=child_links,json=childLinks" json:"child_links,omitempty"`
+	ChildLinks []*PlanNode_ChildLink `protobuf:"bytes,4,rep,name=child_links,json=childLinks,proto3" json:"child_links,omitempty"`
 	// Condensed representation for [SCALAR][google.spanner.v1.PlanNode.Kind.SCALAR] nodes.
-	ShortRepresentation *PlanNode_ShortRepresentation `protobuf:"bytes,5,opt,name=short_representation,json=shortRepresentation" json:"short_representation,omitempty"`
+	ShortRepresentation *PlanNode_ShortRepresentation `protobuf:"bytes,5,opt,name=short_representation,json=shortRepresentation,proto3" json:"short_representation,omitempty"`
 	// Attributes relevant to the node contained in a group of key-value pairs.
 	// For example, a Parameter Reference node could have the following
 	// information in its metadata:
@@ -72,18 +80,40 @@ type PlanNode struct {
 	//       "parameter_reference": "param1",
 	//       "parameter_type": "array"
 	//     }
-	Metadata *google_protobuf1.Struct `protobuf:"bytes,6,opt,name=metadata" json:"metadata,omitempty"`
+	Metadata *_struct.Struct `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// The execution statistics associated with the node, contained in a group of
 	// key-value pairs. Only present if the plan was returned as a result of a
 	// profile query. For example, number of executions, number of rows/time per
 	// execution etc.
-	ExecutionStats *google_protobuf1.Struct `protobuf:"bytes,7,opt,name=execution_stats,json=executionStats" json:"execution_stats,omitempty"`
+	ExecutionStats       *_struct.Struct `protobuf:"bytes,7,opt,name=execution_stats,json=executionStats,proto3" json:"execution_stats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *PlanNode) Reset()         { *m = PlanNode{} }
+func (m *PlanNode) String() string { return proto.CompactTextString(m) }
+func (*PlanNode) ProtoMessage()    {}
+func (*PlanNode) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_plan_e20f6b3462ee8118, []int{0}
+}
+func (m *PlanNode) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PlanNode.Unmarshal(m, b)
+}
+func (m *PlanNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PlanNode.Marshal(b, m, deterministic)
+}
+func (dst *PlanNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlanNode.Merge(dst, src)
+}
+func (m *PlanNode) XXX_Size() int {
+	return xxx_messageInfo_PlanNode.Size(m)
+}
+func (m *PlanNode) XXX_DiscardUnknown() {
+	xxx_messageInfo_PlanNode.DiscardUnknown(m)
 }
 
-func (m *PlanNode) Reset()                    { *m = PlanNode{} }
-func (m *PlanNode) String() string            { return proto.CompactTextString(m) }
-func (*PlanNode) ProtoMessage()               {}
-func (*PlanNode) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_PlanNode proto.InternalMessageInfo
 
 func (m *PlanNode) GetIndex() int32 {
 	if m != nil {
@@ -120,14 +150,14 @@ func (m *PlanNode) GetShortRepresentation() *PlanNode_ShortRepresentation {
 	return nil
 }
 
-func (m *PlanNode) GetMetadata() *google_protobuf1.Struct {
+func (m *PlanNode) GetMetadata() *_struct.Struct {
 	if m != nil {
 		return m.Metadata
 	}
 	return nil
 }
 
-func (m *PlanNode) GetExecutionStats() *google_protobuf1.Struct {
+func (m *PlanNode) GetExecutionStats() *_struct.Struct {
 	if m != nil {
 		return m.ExecutionStats
 	}
@@ -138,12 +168,12 @@ func (m *PlanNode) GetExecutionStats() *google_protobuf1.Struct {
 // [PlanNode][google.spanner.v1.PlanNode].
 type PlanNode_ChildLink struct {
 	// The node to which the link points.
-	ChildIndex int32 `protobuf:"varint,1,opt,name=child_index,json=childIndex" json:"child_index,omitempty"`
+	ChildIndex int32 `protobuf:"varint,1,opt,name=child_index,json=childIndex,proto3" json:"child_index,omitempty"`
 	// The type of the link. For example, in Hash Joins this could be used to
 	// distinguish between the build child and the probe child, or in the case
 	// of the child being an output variable, to represent the tag associated
 	// with the output variable.
-	Type string `protobuf:"bytes,2,opt,name=type" json:"type,omitempty"`
+	Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"`
 	// Only present if the child node is [SCALAR][google.spanner.v1.PlanNode.Kind.SCALAR] and corresponds
 	// to an output variable of the parent node. The field carries the name of
 	// the output variable.
@@ -152,13 +182,35 @@ type PlanNode_ChildLink struct {
 	// created for each column that is read by the operator. The corresponding
 	// `variable` fields will be set to the variable names assigned to the
 	// columns.
-	Variable string `protobuf:"bytes,3,opt,name=variable" json:"variable,omitempty"`
+	Variable             string   `protobuf:"bytes,3,opt,name=variable,proto3" json:"variable,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PlanNode_ChildLink) Reset()         { *m = PlanNode_ChildLink{} }
+func (m *PlanNode_ChildLink) String() string { return proto.CompactTextString(m) }
+func (*PlanNode_ChildLink) ProtoMessage()    {}
+func (*PlanNode_ChildLink) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_plan_e20f6b3462ee8118, []int{0, 0}
+}
+func (m *PlanNode_ChildLink) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PlanNode_ChildLink.Unmarshal(m, b)
+}
+func (m *PlanNode_ChildLink) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PlanNode_ChildLink.Marshal(b, m, deterministic)
+}
+func (dst *PlanNode_ChildLink) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlanNode_ChildLink.Merge(dst, src)
+}
+func (m *PlanNode_ChildLink) XXX_Size() int {
+	return xxx_messageInfo_PlanNode_ChildLink.Size(m)
+}
+func (m *PlanNode_ChildLink) XXX_DiscardUnknown() {
+	xxx_messageInfo_PlanNode_ChildLink.DiscardUnknown(m)
 }
 
-func (m *PlanNode_ChildLink) Reset()                    { *m = PlanNode_ChildLink{} }
-func (m *PlanNode_ChildLink) String() string            { return proto.CompactTextString(m) }
-func (*PlanNode_ChildLink) ProtoMessage()               {}
-func (*PlanNode_ChildLink) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+var xxx_messageInfo_PlanNode_ChildLink proto.InternalMessageInfo
 
 func (m *PlanNode_ChildLink) GetChildIndex() int32 {
 	if m != nil {
@@ -185,19 +237,41 @@ func (m *PlanNode_ChildLink) GetVariable() string {
 // `SCALAR` [PlanNode(s)][google.spanner.v1.PlanNode].
 type PlanNode_ShortRepresentation struct {
 	// A string representation of the expression subtree rooted at this node.
-	Description string `protobuf:"bytes,1,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
 	// A mapping of (subquery variable name) -> (subquery node id) for cases
 	// where the `description` string of this node references a `SCALAR`
 	// subquery contained in the expression subtree rooted at this node. The
 	// referenced `SCALAR` subquery may not necessarily be a direct child of
 	// this node.
-	Subqueries map[string]int32 `protobuf:"bytes,2,rep,name=subqueries" json:"subqueries,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+	Subqueries           map[string]int32 `protobuf:"bytes,2,rep,name=subqueries,proto3" json:"subqueries,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *PlanNode_ShortRepresentation) Reset()                    { *m = PlanNode_ShortRepresentation{} }
-func (m *PlanNode_ShortRepresentation) String() string            { return proto.CompactTextString(m) }
-func (*PlanNode_ShortRepresentation) ProtoMessage()               {}
-func (*PlanNode_ShortRepresentation) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 1} }
+func (m *PlanNode_ShortRepresentation) Reset()         { *m = PlanNode_ShortRepresentation{} }
+func (m *PlanNode_ShortRepresentation) String() string { return proto.CompactTextString(m) }
+func (*PlanNode_ShortRepresentation) ProtoMessage()    {}
+func (*PlanNode_ShortRepresentation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_plan_e20f6b3462ee8118, []int{0, 1}
+}
+func (m *PlanNode_ShortRepresentation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PlanNode_ShortRepresentation.Unmarshal(m, b)
+}
+func (m *PlanNode_ShortRepresentation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PlanNode_ShortRepresentation.Marshal(b, m, deterministic)
+}
+func (dst *PlanNode_ShortRepresentation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlanNode_ShortRepresentation.Merge(dst, src)
+}
+func (m *PlanNode_ShortRepresentation) XXX_Size() int {
+	return xxx_messageInfo_PlanNode_ShortRepresentation.Size(m)
+}
+func (m *PlanNode_ShortRepresentation) XXX_DiscardUnknown() {
+	xxx_messageInfo_PlanNode_ShortRepresentation.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PlanNode_ShortRepresentation proto.InternalMessageInfo
 
 func (m *PlanNode_ShortRepresentation) GetDescription() string {
 	if m != nil {
@@ -218,13 +292,35 @@ type QueryPlan struct {
 	// The nodes in the query plan. Plan nodes are returned in pre-order starting
 	// with the plan root. Each [PlanNode][google.spanner.v1.PlanNode]'s `id` corresponds to its index in
 	// `plan_nodes`.
-	PlanNodes []*PlanNode `protobuf:"bytes,1,rep,name=plan_nodes,json=planNodes" json:"plan_nodes,omitempty"`
+	PlanNodes            []*PlanNode `protobuf:"bytes,1,rep,name=plan_nodes,json=planNodes,proto3" json:"plan_nodes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *QueryPlan) Reset()         { *m = QueryPlan{} }
+func (m *QueryPlan) String() string { return proto.CompactTextString(m) }
+func (*QueryPlan) ProtoMessage()    {}
+func (*QueryPlan) Descriptor() ([]byte, []int) {
+	return fileDescriptor_query_plan_e20f6b3462ee8118, []int{1}
+}
+func (m *QueryPlan) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryPlan.Unmarshal(m, b)
+}
+func (m *QueryPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryPlan.Marshal(b, m, deterministic)
+}
+func (dst *QueryPlan) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryPlan.Merge(dst, src)
+}
+func (m *QueryPlan) XXX_Size() int {
+	return xxx_messageInfo_QueryPlan.Size(m)
+}
+func (m *QueryPlan) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryPlan.DiscardUnknown(m)
 }
 
-func (m *QueryPlan) Reset()                    { *m = QueryPlan{} }
-func (m *QueryPlan) String() string            { return proto.CompactTextString(m) }
-func (*QueryPlan) ProtoMessage()               {}
-func (*QueryPlan) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+var xxx_messageInfo_QueryPlan proto.InternalMessageInfo
 
 func (m *QueryPlan) GetPlanNodes() []*PlanNode {
 	if m != nil {
@@ -237,13 +333,16 @@ func init() {
 	proto.RegisterType((*PlanNode)(nil), "google.spanner.v1.PlanNode")
 	proto.RegisterType((*PlanNode_ChildLink)(nil), "google.spanner.v1.PlanNode.ChildLink")
 	proto.RegisterType((*PlanNode_ShortRepresentation)(nil), "google.spanner.v1.PlanNode.ShortRepresentation")
+	proto.RegisterMapType((map[string]int32)(nil), "google.spanner.v1.PlanNode.ShortRepresentation.SubqueriesEntry")
 	proto.RegisterType((*QueryPlan)(nil), "google.spanner.v1.QueryPlan")
 	proto.RegisterEnum("google.spanner.v1.PlanNode_Kind", PlanNode_Kind_name, PlanNode_Kind_value)
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/query_plan.proto", fileDescriptor2) }
+func init() {
+	proto.RegisterFile("google/spanner/v1/query_plan.proto", fileDescriptor_query_plan_e20f6b3462ee8118)
+}
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_query_plan_e20f6b3462ee8118 = []byte{
 	// 604 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xdd, 0x6e, 0xd3, 0x4c,
 	0x10, 0xfd, 0x9c, 0x26, 0xf9, 0x9a, 0x09, 0x4a, 0xc3, 0xb6, 0xa8, 0x56, 0x40, 0xc2, 0x44, 0x42,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/v1/result_set.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/v1/result_set.pb.go
index 18b53a03..58344b57 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/v1/result_set.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/v1/result_set.pb.go
@@ -1,41 +1,69 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/result_set.proto
 
-package spanner
+package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import _struct "github.com/golang/protobuf/ptypes/struct"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/struct"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Results from [Read][google.spanner.v1.Spanner.Read] or
 // [ExecuteSql][google.spanner.v1.Spanner.ExecuteSql].
 type ResultSet struct {
 	// Metadata about the result set, such as row type information.
-	Metadata *ResultSetMetadata `protobuf:"bytes,1,opt,name=metadata" json:"metadata,omitempty"`
+	Metadata *ResultSetMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// Each element in `rows` is a row whose format is defined by
 	// [metadata.row_type][google.spanner.v1.ResultSetMetadata.row_type]. The ith element
 	// in each row matches the ith field in
 	// [metadata.row_type][google.spanner.v1.ResultSetMetadata.row_type]. Elements are
 	// encoded based on type as described
 	// [here][google.spanner.v1.TypeCode].
-	Rows []*google_protobuf1.ListValue `protobuf:"bytes,2,rep,name=rows" json:"rows,omitempty"`
+	Rows []*_struct.ListValue `protobuf:"bytes,2,rep,name=rows,proto3" json:"rows,omitempty"`
 	// Query plan and execution statistics for the query that produced this
 	// result set. These can be requested by setting
 	// [ExecuteSqlRequest.query_mode][google.spanner.v1.ExecuteSqlRequest.query_mode].
-	Stats *ResultSetStats `protobuf:"bytes,3,opt,name=stats" json:"stats,omitempty"`
+	Stats                *ResultSetStats `protobuf:"bytes,3,opt,name=stats,proto3" json:"stats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *ResultSet) Reset()         { *m = ResultSet{} }
+func (m *ResultSet) String() string { return proto.CompactTextString(m) }
+func (*ResultSet) ProtoMessage()    {}
+func (*ResultSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_result_set_d3beff64c1ecf5a2, []int{0}
+}
+func (m *ResultSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResultSet.Unmarshal(m, b)
+}
+func (m *ResultSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResultSet.Marshal(b, m, deterministic)
+}
+func (dst *ResultSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResultSet.Merge(dst, src)
+}
+func (m *ResultSet) XXX_Size() int {
+	return xxx_messageInfo_ResultSet.Size(m)
+}
+func (m *ResultSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResultSet.DiscardUnknown(m)
 }
 
-func (m *ResultSet) Reset()                    { *m = ResultSet{} }
-func (m *ResultSet) String() string            { return proto.CompactTextString(m) }
-func (*ResultSet) ProtoMessage()               {}
-func (*ResultSet) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+var xxx_messageInfo_ResultSet proto.InternalMessageInfo
 
 func (m *ResultSet) GetMetadata() *ResultSetMetadata {
 	if m != nil {
@@ -44,7 +72,7 @@ func (m *ResultSet) GetMetadata() *ResultSetMetadata {
 	return nil
 }
 
-func (m *ResultSet) GetRows() []*google_protobuf1.ListValue {
+func (m *ResultSet) GetRows() []*_struct.ListValue {
 	if m != nil {
 		return m.Rows
 	}
@@ -64,7 +92,7 @@ func (m *ResultSet) GetStats() *ResultSetStats {
 type PartialResultSet struct {
 	// Metadata about the result set, such as row type information.
 	// Only present in the first response.
-	Metadata *ResultSetMetadata `protobuf:"bytes,1,opt,name=metadata" json:"metadata,omitempty"`
+	Metadata *ResultSetMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// A streamed result set consists of a stream of values, which might
 	// be split into many `PartialResultSet` messages to accommodate
 	// large rows and/or large values. Every N complete values defines a
@@ -138,11 +166,11 @@ type PartialResultSet struct {
 	// This sequence of `PartialResultSet`s encodes two rows, one
 	// containing the field value `"Hello"`, and a second containing the
 	// field value `"World" = "W" + "orl" + "d"`.
-	Values []*google_protobuf1.Value `protobuf:"bytes,2,rep,name=values" json:"values,omitempty"`
+	Values []*_struct.Value `protobuf:"bytes,2,rep,name=values,proto3" json:"values,omitempty"`
 	// If true, then the final value in [values][google.spanner.v1.PartialResultSet.values] is chunked, and must
 	// be combined with more values from subsequent `PartialResultSet`s
 	// to obtain a complete field value.
-	ChunkedValue bool `protobuf:"varint,3,opt,name=chunked_value,json=chunkedValue" json:"chunked_value,omitempty"`
+	ChunkedValue bool `protobuf:"varint,3,opt,name=chunked_value,json=chunkedValue,proto3" json:"chunked_value,omitempty"`
 	// Streaming calls might be interrupted for a variety of reasons, such
 	// as TCP connection loss. If this occurs, the stream of results can
 	// be resumed by re-sending the original request and including
@@ -153,13 +181,35 @@ type PartialResultSet struct {
 	// streaming result set. These can be requested by setting
 	// [ExecuteSqlRequest.query_mode][google.spanner.v1.ExecuteSqlRequest.query_mode] and are sent
 	// only once with the last response in the stream.
-	Stats *ResultSetStats `protobuf:"bytes,5,opt,name=stats" json:"stats,omitempty"`
+	Stats                *ResultSetStats `protobuf:"bytes,5,opt,name=stats,proto3" json:"stats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *PartialResultSet) Reset()                    { *m = PartialResultSet{} }
-func (m *PartialResultSet) String() string            { return proto.CompactTextString(m) }
-func (*PartialResultSet) ProtoMessage()               {}
-func (*PartialResultSet) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+func (m *PartialResultSet) Reset()         { *m = PartialResultSet{} }
+func (m *PartialResultSet) String() string { return proto.CompactTextString(m) }
+func (*PartialResultSet) ProtoMessage()    {}
+func (*PartialResultSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_result_set_d3beff64c1ecf5a2, []int{1}
+}
+func (m *PartialResultSet) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartialResultSet.Unmarshal(m, b)
+}
+func (m *PartialResultSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartialResultSet.Marshal(b, m, deterministic)
+}
+func (dst *PartialResultSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartialResultSet.Merge(dst, src)
+}
+func (m *PartialResultSet) XXX_Size() int {
+	return xxx_messageInfo_PartialResultSet.Size(m)
+}
+func (m *PartialResultSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartialResultSet.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PartialResultSet proto.InternalMessageInfo
 
 func (m *PartialResultSet) GetMetadata() *ResultSetMetadata {
 	if m != nil {
@@ -168,7 +218,7 @@ func (m *PartialResultSet) GetMetadata() *ResultSetMetadata {
 	return nil
 }
 
-func (m *PartialResultSet) GetValues() []*google_protobuf1.Value {
+func (m *PartialResultSet) GetValues() []*_struct.Value {
 	if m != nil {
 		return m.Values
 	}
@@ -206,16 +256,38 @@ type ResultSetMetadata struct {
 	//       { "name": "UserId", "type": { "code": "INT64" } },
 	//       { "name": "UserName", "type": { "code": "STRING" } },
 	//     ]
-	RowType *StructType `protobuf:"bytes,1,opt,name=row_type,json=rowType" json:"row_type,omitempty"`
+	RowType *StructType `protobuf:"bytes,1,opt,name=row_type,json=rowType,proto3" json:"row_type,omitempty"`
 	// If the read or SQL query began a transaction as a side-effect, the
 	// information about the new transaction is yielded here.
-	Transaction *Transaction `protobuf:"bytes,2,opt,name=transaction" json:"transaction,omitempty"`
+	Transaction          *Transaction `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *ResultSetMetadata) Reset()                    { *m = ResultSetMetadata{} }
-func (m *ResultSetMetadata) String() string            { return proto.CompactTextString(m) }
-func (*ResultSetMetadata) ProtoMessage()               {}
-func (*ResultSetMetadata) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
+func (m *ResultSetMetadata) Reset()         { *m = ResultSetMetadata{} }
+func (m *ResultSetMetadata) String() string { return proto.CompactTextString(m) }
+func (*ResultSetMetadata) ProtoMessage()    {}
+func (*ResultSetMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_result_set_d3beff64c1ecf5a2, []int{2}
+}
+func (m *ResultSetMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResultSetMetadata.Unmarshal(m, b)
+}
+func (m *ResultSetMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResultSetMetadata.Marshal(b, m, deterministic)
+}
+func (dst *ResultSetMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResultSetMetadata.Merge(dst, src)
+}
+func (m *ResultSetMetadata) XXX_Size() int {
+	return xxx_messageInfo_ResultSetMetadata.Size(m)
+}
+func (m *ResultSetMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResultSetMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ResultSetMetadata proto.InternalMessageInfo
 
 func (m *ResultSetMetadata) GetRowType() *StructType {
 	if m != nil {
@@ -234,7 +306,7 @@ func (m *ResultSetMetadata) GetTransaction() *Transaction {
 // Additional statistics about a [ResultSet][google.spanner.v1.ResultSet] or [PartialResultSet][google.spanner.v1.PartialResultSet].
 type ResultSetStats struct {
 	// [QueryPlan][google.spanner.v1.QueryPlan] for the query associated with this result.
-	QueryPlan *QueryPlan `protobuf:"bytes,1,opt,name=query_plan,json=queryPlan" json:"query_plan,omitempty"`
+	QueryPlan *QueryPlan `protobuf:"bytes,1,opt,name=query_plan,json=queryPlan,proto3" json:"query_plan,omitempty"`
 	// Aggregated statistics from the execution of the query. Only present when
 	// the query is profiled. For example, a query could return the statistics as
 	// follows:
@@ -244,13 +316,35 @@ type ResultSetStats struct {
 	//       "elapsed_time": "1.22 secs",
 	//       "cpu_time": "1.19 secs"
 	//     }
-	QueryStats *google_protobuf1.Struct `protobuf:"bytes,2,opt,name=query_stats,json=queryStats" json:"query_stats,omitempty"`
+	QueryStats           *_struct.Struct `protobuf:"bytes,2,opt,name=query_stats,json=queryStats,proto3" json:"query_stats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
 }
 
-func (m *ResultSetStats) Reset()                    { *m = ResultSetStats{} }
-func (m *ResultSetStats) String() string            { return proto.CompactTextString(m) }
-func (*ResultSetStats) ProtoMessage()               {}
-func (*ResultSetStats) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{3} }
+func (m *ResultSetStats) Reset()         { *m = ResultSetStats{} }
+func (m *ResultSetStats) String() string { return proto.CompactTextString(m) }
+func (*ResultSetStats) ProtoMessage()    {}
+func (*ResultSetStats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_result_set_d3beff64c1ecf5a2, []int{3}
+}
+func (m *ResultSetStats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResultSetStats.Unmarshal(m, b)
+}
+func (m *ResultSetStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResultSetStats.Marshal(b, m, deterministic)
+}
+func (dst *ResultSetStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResultSetStats.Merge(dst, src)
+}
+func (m *ResultSetStats) XXX_Size() int {
+	return xxx_messageInfo_ResultSetStats.Size(m)
+}
+func (m *ResultSetStats) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResultSetStats.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ResultSetStats proto.InternalMessageInfo
 
 func (m *ResultSetStats) GetQueryPlan() *QueryPlan {
 	if m != nil {
@@ -259,7 +353,7 @@ func (m *ResultSetStats) GetQueryPlan() *QueryPlan {
 	return nil
 }
 
-func (m *ResultSetStats) GetQueryStats() *google_protobuf1.Struct {
+func (m *ResultSetStats) GetQueryStats() *_struct.Struct {
 	if m != nil {
 		return m.QueryStats
 	}
@@ -273,9 +367,11 @@ func init() {
 	proto.RegisterType((*ResultSetStats)(nil), "google.spanner.v1.ResultSetStats")
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/result_set.proto", fileDescriptor3) }
+func init() {
+	proto.RegisterFile("google/spanner/v1/result_set.proto", fileDescriptor_result_set_d3beff64c1ecf5a2)
+}
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_result_set_d3beff64c1ecf5a2 = []byte{
 	// 501 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcd, 0x6e, 0x13, 0x31,
 	0x14, 0x85, 0xe5, 0xf4, 0x87, 0xd4, 0x13, 0x10, 0xb5, 0x04, 0x1d, 0x45, 0x05, 0xa5, 0x29, 0x8b,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/v1/spanner.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/v1/spanner.pb.go
index 27125f18..93a82123 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/v1/spanner.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/v1/spanner.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/spanner.proto
 
-package spanner
+package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
+import _struct "github.com/golang/protobuf/ptypes/struct"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
 
 import (
 	context "golang.org/x/net/context"
@@ -21,6 +21,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Mode in which the query must be processed.
 type ExecuteSqlRequest_QueryMode int32
 
@@ -51,21 +57,43 @@ func (x ExecuteSqlRequest_QueryMode) String() string {
 	return proto.EnumName(ExecuteSqlRequest_QueryMode_name, int32(x))
 }
 func (ExecuteSqlRequest_QueryMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor4, []int{6, 0}
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{6, 0}
 }
 
 // The request for [CreateSession][google.spanner.v1.Spanner.CreateSession].
 type CreateSessionRequest struct {
 	// Required. The database in which the new session is created.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// The session to create.
-	Session *Session `protobuf:"bytes,2,opt,name=session" json:"session,omitempty"`
+	Session              *Session `protobuf:"bytes,2,opt,name=session,proto3" json:"session,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreateSessionRequest) Reset()         { *m = CreateSessionRequest{} }
+func (m *CreateSessionRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateSessionRequest) ProtoMessage()    {}
+func (*CreateSessionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{0}
+}
+func (m *CreateSessionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateSessionRequest.Unmarshal(m, b)
+}
+func (m *CreateSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateSessionRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateSessionRequest.Merge(dst, src)
+}
+func (m *CreateSessionRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateSessionRequest.Size(m)
+}
+func (m *CreateSessionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateSessionRequest.DiscardUnknown(m)
 }
 
-func (m *CreateSessionRequest) Reset()                    { *m = CreateSessionRequest{} }
-func (m *CreateSessionRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateSessionRequest) ProtoMessage()               {}
-func (*CreateSessionRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_CreateSessionRequest proto.InternalMessageInfo
 
 func (m *CreateSessionRequest) GetDatabase() string {
 	if m != nil {
@@ -85,7 +113,7 @@ func (m *CreateSessionRequest) GetSession() *Session {
 type Session struct {
 	// The name of the session. This is always system-assigned; values provided
 	// when creating a session are ignored.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The labels for the session.
 	//
 	//  * Label keys must be between 1 and 63 characters long and must conform to
@@ -95,18 +123,40 @@ type Session struct {
 	//  * No more than 64 labels can be associated with a given session.
 	//
 	// See https://goo.gl/xmQnxf for more information on and examples of labels.
-	Labels map[string]string `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. The timestamp when the session is created.
-	CreateTime *google_protobuf3.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime" json:"create_time,omitempty"`
+	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The approximate timestamp when the session is last used. It is
 	// typically earlier than the actual last use time.
-	ApproximateLastUseTime *google_protobuf3.Timestamp `protobuf:"bytes,4,opt,name=approximate_last_use_time,json=approximateLastUseTime" json:"approximate_last_use_time,omitempty"`
+	ApproximateLastUseTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=approximate_last_use_time,json=approximateLastUseTime,proto3" json:"approximate_last_use_time,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{}             `json:"-"`
+	XXX_unrecognized       []byte               `json:"-"`
+	XXX_sizecache          int32                `json:"-"`
 }
 
-func (m *Session) Reset()                    { *m = Session{} }
-func (m *Session) String() string            { return proto.CompactTextString(m) }
-func (*Session) ProtoMessage()               {}
-func (*Session) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+func (m *Session) Reset()         { *m = Session{} }
+func (m *Session) String() string { return proto.CompactTextString(m) }
+func (*Session) ProtoMessage()    {}
+func (*Session) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{1}
+}
+func (m *Session) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Session.Unmarshal(m, b)
+}
+func (m *Session) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Session.Marshal(b, m, deterministic)
+}
+func (dst *Session) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Session.Merge(dst, src)
+}
+func (m *Session) XXX_Size() int {
+	return xxx_messageInfo_Session.Size(m)
+}
+func (m *Session) XXX_DiscardUnknown() {
+	xxx_messageInfo_Session.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Session proto.InternalMessageInfo
 
 func (m *Session) GetName() string {
 	if m != nil {
@@ -122,14 +172,14 @@ func (m *Session) GetLabels() map[string]string {
 	return nil
 }
 
-func (m *Session) GetCreateTime() *google_protobuf3.Timestamp {
+func (m *Session) GetCreateTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *Session) GetApproximateLastUseTime() *google_protobuf3.Timestamp {
+func (m *Session) GetApproximateLastUseTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.ApproximateLastUseTime
 	}
@@ -139,13 +189,35 @@ func (m *Session) GetApproximateLastUseTime() *google_protobuf3.Timestamp {
 // The request for [GetSession][google.spanner.v1.Spanner.GetSession].
 type GetSessionRequest struct {
 	// Required. The name of the session to retrieve.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSessionRequest) Reset()         { *m = GetSessionRequest{} }
+func (m *GetSessionRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSessionRequest) ProtoMessage()    {}
+func (*GetSessionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{2}
+}
+func (m *GetSessionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSessionRequest.Unmarshal(m, b)
+}
+func (m *GetSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSessionRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSessionRequest.Merge(dst, src)
+}
+func (m *GetSessionRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSessionRequest.Size(m)
+}
+func (m *GetSessionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSessionRequest.DiscardUnknown(m)
 }
 
-func (m *GetSessionRequest) Reset()                    { *m = GetSessionRequest{} }
-func (m *GetSessionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetSessionRequest) ProtoMessage()               {}
-func (*GetSessionRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
+var xxx_messageInfo_GetSessionRequest proto.InternalMessageInfo
 
 func (m *GetSessionRequest) GetName() string {
 	if m != nil {
@@ -157,14 +229,14 @@ func (m *GetSessionRequest) GetName() string {
 // The request for [ListSessions][google.spanner.v1.Spanner.ListSessions].
 type ListSessionsRequest struct {
 	// Required. The database in which to list sessions.
-	Database string `protobuf:"bytes,1,opt,name=database" json:"database,omitempty"`
+	Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
 	// Number of sessions to be returned in the response. If 0 or less, defaults
 	// to the server's maximum allowed page size.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// If non-empty, `page_token` should contain a
 	// [next_page_token][google.spanner.v1.ListSessionsResponse.next_page_token] from a previous
 	// [ListSessionsResponse][google.spanner.v1.ListSessionsResponse].
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// An expression for filtering the results of the request. Filter rules are
 	// case insensitive. The fields eligible for filtering are:
 	//
@@ -175,13 +247,35 @@ type ListSessionsRequest struct {
 	//   * `labels.env:*` --> The session has the label "env".
 	//   * `labels.env:dev` --> The session has the label "env" and the value of
 	//                        the label contains the string "dev".
-	Filter string `protobuf:"bytes,4,opt,name=filter" json:"filter,omitempty"`
+	Filter               string   `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSessionsRequest) Reset()         { *m = ListSessionsRequest{} }
+func (m *ListSessionsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListSessionsRequest) ProtoMessage()    {}
+func (*ListSessionsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{3}
+}
+func (m *ListSessionsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSessionsRequest.Unmarshal(m, b)
+}
+func (m *ListSessionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSessionsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListSessionsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionsRequest.Merge(dst, src)
+}
+func (m *ListSessionsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListSessionsRequest.Size(m)
+}
+func (m *ListSessionsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSessionsRequest.DiscardUnknown(m)
 }
 
-func (m *ListSessionsRequest) Reset()                    { *m = ListSessionsRequest{} }
-func (m *ListSessionsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListSessionsRequest) ProtoMessage()               {}
-func (*ListSessionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+var xxx_messageInfo_ListSessionsRequest proto.InternalMessageInfo
 
 func (m *ListSessionsRequest) GetDatabase() string {
 	if m != nil {
@@ -214,17 +308,39 @@ func (m *ListSessionsRequest) GetFilter() string {
 // The response for [ListSessions][google.spanner.v1.Spanner.ListSessions].
 type ListSessionsResponse struct {
 	// The list of requested sessions.
-	Sessions []*Session `protobuf:"bytes,1,rep,name=sessions" json:"sessions,omitempty"`
+	Sessions []*Session `protobuf:"bytes,1,rep,name=sessions,proto3" json:"sessions,omitempty"`
 	// `next_page_token` can be sent in a subsequent
 	// [ListSessions][google.spanner.v1.Spanner.ListSessions] call to fetch more of the matching
 	// sessions.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListSessionsResponse) Reset()         { *m = ListSessionsResponse{} }
+func (m *ListSessionsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListSessionsResponse) ProtoMessage()    {}
+func (*ListSessionsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{4}
+}
+func (m *ListSessionsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListSessionsResponse.Unmarshal(m, b)
+}
+func (m *ListSessionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListSessionsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListSessionsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListSessionsResponse.Merge(dst, src)
+}
+func (m *ListSessionsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListSessionsResponse.Size(m)
+}
+func (m *ListSessionsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListSessionsResponse.DiscardUnknown(m)
 }
 
-func (m *ListSessionsResponse) Reset()                    { *m = ListSessionsResponse{} }
-func (m *ListSessionsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListSessionsResponse) ProtoMessage()               {}
-func (*ListSessionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
+var xxx_messageInfo_ListSessionsResponse proto.InternalMessageInfo
 
 func (m *ListSessionsResponse) GetSessions() []*Session {
 	if m != nil {
@@ -243,13 +359,35 @@ func (m *ListSessionsResponse) GetNextPageToken() string {
 // The request for [DeleteSession][google.spanner.v1.Spanner.DeleteSession].
 type DeleteSessionRequest struct {
 	// Required. The name of the session to delete.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeleteSessionRequest) Reset()                    { *m = DeleteSessionRequest{} }
-func (m *DeleteSessionRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteSessionRequest) ProtoMessage()               {}
-func (*DeleteSessionRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
+func (m *DeleteSessionRequest) Reset()         { *m = DeleteSessionRequest{} }
+func (m *DeleteSessionRequest) String() string { return proto.CompactTextString(m) }
+func (*DeleteSessionRequest) ProtoMessage()    {}
+func (*DeleteSessionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{5}
+}
+func (m *DeleteSessionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteSessionRequest.Unmarshal(m, b)
+}
+func (m *DeleteSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteSessionRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeleteSessionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteSessionRequest.Merge(dst, src)
+}
+func (m *DeleteSessionRequest) XXX_Size() int {
+	return xxx_messageInfo_DeleteSessionRequest.Size(m)
+}
+func (m *DeleteSessionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteSessionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteSessionRequest proto.InternalMessageInfo
 
 func (m *DeleteSessionRequest) GetName() string {
 	if m != nil {
@@ -262,12 +400,12 @@ func (m *DeleteSessionRequest) GetName() string {
 // [ExecuteStreamingSql][google.spanner.v1.Spanner.ExecuteStreamingSql].
 type ExecuteSqlRequest struct {
 	// Required. The session in which the SQL query should be performed.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// The transaction to use. If none is provided, the default is a
 	// temporary read-only transaction with strong concurrency.
-	Transaction *TransactionSelector `protobuf:"bytes,2,opt,name=transaction" json:"transaction,omitempty"`
+	Transaction *TransactionSelector `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
 	// Required. The SQL query string.
-	Sql string `protobuf:"bytes,3,opt,name=sql" json:"sql,omitempty"`
+	Sql string `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
 	// The SQL query string can contain parameter placeholders. A parameter
 	// placeholder consists of `'@'` followed by the parameter
 	// name. Parameter names consist of any combination of letters,
@@ -282,7 +420,7 @@ type ExecuteSqlRequest struct {
 	// Parameter values are specified using `params`, which is a JSON
 	// object whose keys are parameter names, and whose values are the
 	// corresponding parameter values.
-	Params *google_protobuf1.Struct `protobuf:"bytes,4,opt,name=params" json:"params,omitempty"`
+	Params *_struct.Struct `protobuf:"bytes,4,opt,name=params,proto3" json:"params,omitempty"`
 	// It is not always possible for Cloud Spanner to infer the right SQL type
 	// from a JSON value.  For example, values of type `BYTES` and values
 	// of type `STRING` both appear in [params][google.spanner.v1.ExecuteSqlRequest.params] as JSON strings.
@@ -291,7 +429,7 @@ type ExecuteSqlRequest struct {
 	// SQL type for some or all of the SQL query parameters. See the
 	// definition of [Type][google.spanner.v1.Type] for more information
 	// about SQL types.
-	ParamTypes map[string]*Type `protobuf:"bytes,5,rep,name=param_types,json=paramTypes" json:"param_types,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ParamTypes map[string]*Type `protobuf:"bytes,5,rep,name=param_types,json=paramTypes,proto3" json:"param_types,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// If this request is resuming a previously interrupted SQL query
 	// execution, `resume_token` should be copied from the last
 	// [PartialResultSet][google.spanner.v1.PartialResultSet] yielded before the interruption. Doing this
@@ -302,18 +440,40 @@ type ExecuteSqlRequest struct {
 	// Used to control the amount of debugging information returned in
 	// [ResultSetStats][google.spanner.v1.ResultSetStats]. If [partition_token][google.spanner.v1.ExecuteSqlRequest.partition_token] is set, [query_mode][google.spanner.v1.ExecuteSqlRequest.query_mode] can only
 	// be set to [QueryMode.NORMAL][google.spanner.v1.ExecuteSqlRequest.QueryMode.NORMAL].
-	QueryMode ExecuteSqlRequest_QueryMode `protobuf:"varint,7,opt,name=query_mode,json=queryMode,enum=google.spanner.v1.ExecuteSqlRequest_QueryMode" json:"query_mode,omitempty"`
+	QueryMode ExecuteSqlRequest_QueryMode `protobuf:"varint,7,opt,name=query_mode,json=queryMode,proto3,enum=google.spanner.v1.ExecuteSqlRequest_QueryMode" json:"query_mode,omitempty"`
 	// If present, results will be restricted to the specified partition
 	// previously created using PartitionQuery().  There must be an exact
 	// match for the values of fields common to this message and the
 	// PartitionQueryRequest message used to create this partition_token.
-	PartitionToken []byte `protobuf:"bytes,8,opt,name=partition_token,json=partitionToken,proto3" json:"partition_token,omitempty"`
+	PartitionToken       []byte   `protobuf:"bytes,8,opt,name=partition_token,json=partitionToken,proto3" json:"partition_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExecuteSqlRequest) Reset()         { *m = ExecuteSqlRequest{} }
+func (m *ExecuteSqlRequest) String() string { return proto.CompactTextString(m) }
+func (*ExecuteSqlRequest) ProtoMessage()    {}
+func (*ExecuteSqlRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{6}
+}
+func (m *ExecuteSqlRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExecuteSqlRequest.Unmarshal(m, b)
+}
+func (m *ExecuteSqlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExecuteSqlRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExecuteSqlRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExecuteSqlRequest.Merge(dst, src)
+}
+func (m *ExecuteSqlRequest) XXX_Size() int {
+	return xxx_messageInfo_ExecuteSqlRequest.Size(m)
+}
+func (m *ExecuteSqlRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExecuteSqlRequest.DiscardUnknown(m)
 }
 
-func (m *ExecuteSqlRequest) Reset()                    { *m = ExecuteSqlRequest{} }
-func (m *ExecuteSqlRequest) String() string            { return proto.CompactTextString(m) }
-func (*ExecuteSqlRequest) ProtoMessage()               {}
-func (*ExecuteSqlRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
+var xxx_messageInfo_ExecuteSqlRequest proto.InternalMessageInfo
 
 func (m *ExecuteSqlRequest) GetSession() string {
 	if m != nil {
@@ -336,7 +496,7 @@ func (m *ExecuteSqlRequest) GetSql() string {
 	return ""
 }
 
-func (m *ExecuteSqlRequest) GetParams() *google_protobuf1.Struct {
+func (m *ExecuteSqlRequest) GetParams() *_struct.Struct {
 	if m != nil {
 		return m.Params
 	}
@@ -374,22 +534,50 @@ func (m *ExecuteSqlRequest) GetPartitionToken() []byte {
 // Options for a PartitionQueryRequest and
 // PartitionReadRequest.
 type PartitionOptions struct {
+	// **Note:** This hint is currently ignored by PartitionQuery and
+	// PartitionRead requests.
+	//
 	// The desired data size for each partition generated.  The default for this
 	// option is currently 1 GiB.  This is only a hint. The actual size of each
 	// partition may be smaller or larger than this size request.
-	PartitionSizeBytes int64 `protobuf:"varint,1,opt,name=partition_size_bytes,json=partitionSizeBytes" json:"partition_size_bytes,omitempty"`
+	PartitionSizeBytes int64 `protobuf:"varint,1,opt,name=partition_size_bytes,json=partitionSizeBytes,proto3" json:"partition_size_bytes,omitempty"`
+	// **Note:** This hint is currently ignored by PartitionQuery and
+	// PartitionRead requests.
+	//
 	// The desired maximum number of partitions to return.  For example, this may
 	// be set to the number of workers available.  The default for this option
 	// is currently 10,000. The maximum value is currently 200,000.  This is only
 	// a hint.  The actual number of partitions returned may be smaller or larger
 	// than this maximum count request.
-	MaxPartitions int64 `protobuf:"varint,2,opt,name=max_partitions,json=maxPartitions" json:"max_partitions,omitempty"`
+	MaxPartitions        int64    `protobuf:"varint,2,opt,name=max_partitions,json=maxPartitions,proto3" json:"max_partitions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PartitionOptions) Reset()         { *m = PartitionOptions{} }
+func (m *PartitionOptions) String() string { return proto.CompactTextString(m) }
+func (*PartitionOptions) ProtoMessage()    {}
+func (*PartitionOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{7}
+}
+func (m *PartitionOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartitionOptions.Unmarshal(m, b)
+}
+func (m *PartitionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartitionOptions.Marshal(b, m, deterministic)
+}
+func (dst *PartitionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionOptions.Merge(dst, src)
+}
+func (m *PartitionOptions) XXX_Size() int {
+	return xxx_messageInfo_PartitionOptions.Size(m)
+}
+func (m *PartitionOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartitionOptions.DiscardUnknown(m)
 }
 
-func (m *PartitionOptions) Reset()                    { *m = PartitionOptions{} }
-func (m *PartitionOptions) String() string            { return proto.CompactTextString(m) }
-func (*PartitionOptions) ProtoMessage()               {}
-func (*PartitionOptions) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{7} }
+var xxx_messageInfo_PartitionOptions proto.InternalMessageInfo
 
 func (m *PartitionOptions) GetPartitionSizeBytes() int64 {
 	if m != nil {
@@ -408,17 +596,17 @@ func (m *PartitionOptions) GetMaxPartitions() int64 {
 // The request for [PartitionQuery][google.spanner.v1.Spanner.PartitionQuery]
 type PartitionQueryRequest struct {
 	// Required. The session used to create the partitions.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// Read only snapshot transactions are supported, read/write and single use
 	// transactions are not.
-	Transaction *TransactionSelector `protobuf:"bytes,2,opt,name=transaction" json:"transaction,omitempty"`
+	Transaction *TransactionSelector `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
 	// The query request to generate partitions for. The request will fail if
 	// the query is not root partitionable. The query plan of a root
 	// partitionable query has a single distributed union operator. A distributed
 	// union operator conceptually divides one or more tables into multiple
 	// splits, remotely evaluates a subquery independently on each split, and
 	// then unions all results.
-	Sql string `protobuf:"bytes,3,opt,name=sql" json:"sql,omitempty"`
+	Sql string `protobuf:"bytes,3,opt,name=sql,proto3" json:"sql,omitempty"`
 	// The SQL query string can contain parameter placeholders. A parameter
 	// placeholder consists of `'@'` followed by the parameter
 	// name. Parameter names consist of any combination of letters,
@@ -433,7 +621,7 @@ type PartitionQueryRequest struct {
 	// Parameter values are specified using `params`, which is a JSON
 	// object whose keys are parameter names, and whose values are the
 	// corresponding parameter values.
-	Params *google_protobuf1.Struct `protobuf:"bytes,4,opt,name=params" json:"params,omitempty"`
+	Params *_struct.Struct `protobuf:"bytes,4,opt,name=params,proto3" json:"params,omitempty"`
 	// It is not always possible for Cloud Spanner to infer the right SQL type
 	// from a JSON value.  For example, values of type `BYTES` and values
 	// of type `STRING` both appear in [params][google.spanner.v1.PartitionQueryRequest.params] as JSON strings.
@@ -442,15 +630,37 @@ type PartitionQueryRequest struct {
 	// SQL type for some or all of the SQL query parameters. See the
 	// definition of [Type][google.spanner.v1.Type] for more information
 	// about SQL types.
-	ParamTypes map[string]*Type `protobuf:"bytes,5,rep,name=param_types,json=paramTypes" json:"param_types,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	ParamTypes map[string]*Type `protobuf:"bytes,5,rep,name=param_types,json=paramTypes,proto3" json:"param_types,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Additional options that affect how many partitions are created.
-	PartitionOptions *PartitionOptions `protobuf:"bytes,6,opt,name=partition_options,json=partitionOptions" json:"partition_options,omitempty"`
+	PartitionOptions     *PartitionOptions `protobuf:"bytes,6,opt,name=partition_options,json=partitionOptions,proto3" json:"partition_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *PartitionQueryRequest) Reset()         { *m = PartitionQueryRequest{} }
+func (m *PartitionQueryRequest) String() string { return proto.CompactTextString(m) }
+func (*PartitionQueryRequest) ProtoMessage()    {}
+func (*PartitionQueryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{8}
+}
+func (m *PartitionQueryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartitionQueryRequest.Unmarshal(m, b)
+}
+func (m *PartitionQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartitionQueryRequest.Marshal(b, m, deterministic)
+}
+func (dst *PartitionQueryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionQueryRequest.Merge(dst, src)
+}
+func (m *PartitionQueryRequest) XXX_Size() int {
+	return xxx_messageInfo_PartitionQueryRequest.Size(m)
+}
+func (m *PartitionQueryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartitionQueryRequest.DiscardUnknown(m)
 }
 
-func (m *PartitionQueryRequest) Reset()                    { *m = PartitionQueryRequest{} }
-func (m *PartitionQueryRequest) String() string            { return proto.CompactTextString(m) }
-func (*PartitionQueryRequest) ProtoMessage()               {}
-func (*PartitionQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{8} }
+var xxx_messageInfo_PartitionQueryRequest proto.InternalMessageInfo
 
 func (m *PartitionQueryRequest) GetSession() string {
 	if m != nil {
@@ -473,7 +683,7 @@ func (m *PartitionQueryRequest) GetSql() string {
 	return ""
 }
 
-func (m *PartitionQueryRequest) GetParams() *google_protobuf1.Struct {
+func (m *PartitionQueryRequest) GetParams() *_struct.Struct {
 	if m != nil {
 		return m.Params
 	}
@@ -497,19 +707,19 @@ func (m *PartitionQueryRequest) GetPartitionOptions() *PartitionOptions {
 // The request for [PartitionRead][google.spanner.v1.Spanner.PartitionRead]
 type PartitionReadRequest struct {
 	// Required. The session used to create the partitions.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// Read only snapshot transactions are supported, read/write and single use
 	// transactions are not.
-	Transaction *TransactionSelector `protobuf:"bytes,2,opt,name=transaction" json:"transaction,omitempty"`
+	Transaction *TransactionSelector `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
 	// Required. The name of the table in the database to be read.
-	Table string `protobuf:"bytes,3,opt,name=table" json:"table,omitempty"`
+	Table string `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
 	// If non-empty, the name of an index on [table][google.spanner.v1.PartitionReadRequest.table]. This index is
 	// used instead of the table primary key when interpreting [key_set][google.spanner.v1.PartitionReadRequest.key_set]
 	// and sorting result rows. See [key_set][google.spanner.v1.PartitionReadRequest.key_set] for further information.
-	Index string `protobuf:"bytes,4,opt,name=index" json:"index,omitempty"`
+	Index string `protobuf:"bytes,4,opt,name=index,proto3" json:"index,omitempty"`
 	// The columns of [table][google.spanner.v1.PartitionReadRequest.table] to be returned for each row matching
 	// this request.
-	Columns []string `protobuf:"bytes,5,rep,name=columns" json:"columns,omitempty"`
+	Columns []string `protobuf:"bytes,5,rep,name=columns,proto3" json:"columns,omitempty"`
 	// Required. `key_set` identifies the rows to be yielded. `key_set` names the
 	// primary keys of the rows in [table][google.spanner.v1.PartitionReadRequest.table] to be yielded, unless [index][google.spanner.v1.PartitionReadRequest.index]
 	// is present. If [index][google.spanner.v1.PartitionReadRequest.index] is present, then [key_set][google.spanner.v1.PartitionReadRequest.key_set] instead names
@@ -517,15 +727,37 @@ type PartitionReadRequest struct {
 	//
 	// It is not an error for the `key_set` to name rows that do not
 	// exist in the database. Read yields nothing for nonexistent rows.
-	KeySet *KeySet `protobuf:"bytes,6,opt,name=key_set,json=keySet" json:"key_set,omitempty"`
+	KeySet *KeySet `protobuf:"bytes,6,opt,name=key_set,json=keySet,proto3" json:"key_set,omitempty"`
 	// Additional options that affect how many partitions are created.
-	PartitionOptions *PartitionOptions `protobuf:"bytes,9,opt,name=partition_options,json=partitionOptions" json:"partition_options,omitempty"`
+	PartitionOptions     *PartitionOptions `protobuf:"bytes,9,opt,name=partition_options,json=partitionOptions,proto3" json:"partition_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *PartitionReadRequest) Reset()                    { *m = PartitionReadRequest{} }
-func (m *PartitionReadRequest) String() string            { return proto.CompactTextString(m) }
-func (*PartitionReadRequest) ProtoMessage()               {}
-func (*PartitionReadRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{9} }
+func (m *PartitionReadRequest) Reset()         { *m = PartitionReadRequest{} }
+func (m *PartitionReadRequest) String() string { return proto.CompactTextString(m) }
+func (*PartitionReadRequest) ProtoMessage()    {}
+func (*PartitionReadRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{9}
+}
+func (m *PartitionReadRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartitionReadRequest.Unmarshal(m, b)
+}
+func (m *PartitionReadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartitionReadRequest.Marshal(b, m, deterministic)
+}
+func (dst *PartitionReadRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionReadRequest.Merge(dst, src)
+}
+func (m *PartitionReadRequest) XXX_Size() int {
+	return xxx_messageInfo_PartitionReadRequest.Size(m)
+}
+func (m *PartitionReadRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartitionReadRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PartitionReadRequest proto.InternalMessageInfo
 
 func (m *PartitionReadRequest) GetSession() string {
 	if m != nil {
@@ -582,13 +814,35 @@ type Partition struct {
 	// This token can be passed to Read, StreamingRead, ExecuteSql, or
 	// ExecuteStreamingSql requests to restrict the results to those identified by
 	// this partition token.
-	PartitionToken []byte `protobuf:"bytes,1,opt,name=partition_token,json=partitionToken,proto3" json:"partition_token,omitempty"`
+	PartitionToken       []byte   `protobuf:"bytes,1,opt,name=partition_token,json=partitionToken,proto3" json:"partition_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Partition) Reset()         { *m = Partition{} }
+func (m *Partition) String() string { return proto.CompactTextString(m) }
+func (*Partition) ProtoMessage()    {}
+func (*Partition) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{10}
+}
+func (m *Partition) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Partition.Unmarshal(m, b)
+}
+func (m *Partition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Partition.Marshal(b, m, deterministic)
+}
+func (dst *Partition) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Partition.Merge(dst, src)
+}
+func (m *Partition) XXX_Size() int {
+	return xxx_messageInfo_Partition.Size(m)
+}
+func (m *Partition) XXX_DiscardUnknown() {
+	xxx_messageInfo_Partition.DiscardUnknown(m)
 }
 
-func (m *Partition) Reset()                    { *m = Partition{} }
-func (m *Partition) String() string            { return proto.CompactTextString(m) }
-func (*Partition) ProtoMessage()               {}
-func (*Partition) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{10} }
+var xxx_messageInfo_Partition proto.InternalMessageInfo
 
 func (m *Partition) GetPartitionToken() []byte {
 	if m != nil {
@@ -601,15 +855,37 @@ func (m *Partition) GetPartitionToken() []byte {
 // or [PartitionRead][google.spanner.v1.Spanner.PartitionRead]
 type PartitionResponse struct {
 	// Partitions created by this request.
-	Partitions []*Partition `protobuf:"bytes,1,rep,name=partitions" json:"partitions,omitempty"`
+	Partitions []*Partition `protobuf:"bytes,1,rep,name=partitions,proto3" json:"partitions,omitempty"`
 	// Transaction created by this request.
-	Transaction *Transaction `protobuf:"bytes,2,opt,name=transaction" json:"transaction,omitempty"`
+	Transaction          *Transaction `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *PartitionResponse) Reset()                    { *m = PartitionResponse{} }
-func (m *PartitionResponse) String() string            { return proto.CompactTextString(m) }
-func (*PartitionResponse) ProtoMessage()               {}
-func (*PartitionResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{11} }
+func (m *PartitionResponse) Reset()         { *m = PartitionResponse{} }
+func (m *PartitionResponse) String() string { return proto.CompactTextString(m) }
+func (*PartitionResponse) ProtoMessage()    {}
+func (*PartitionResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{11}
+}
+func (m *PartitionResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PartitionResponse.Unmarshal(m, b)
+}
+func (m *PartitionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PartitionResponse.Marshal(b, m, deterministic)
+}
+func (dst *PartitionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PartitionResponse.Merge(dst, src)
+}
+func (m *PartitionResponse) XXX_Size() int {
+	return xxx_messageInfo_PartitionResponse.Size(m)
+}
+func (m *PartitionResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_PartitionResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PartitionResponse proto.InternalMessageInfo
 
 func (m *PartitionResponse) GetPartitions() []*Partition {
 	if m != nil {
@@ -629,19 +905,19 @@ func (m *PartitionResponse) GetTransaction() *Transaction {
 // [StreamingRead][google.spanner.v1.Spanner.StreamingRead].
 type ReadRequest struct {
 	// Required. The session in which the read should be performed.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// The transaction to use. If none is provided, the default is a
 	// temporary read-only transaction with strong concurrency.
-	Transaction *TransactionSelector `protobuf:"bytes,2,opt,name=transaction" json:"transaction,omitempty"`
+	Transaction *TransactionSelector `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
 	// Required. The name of the table in the database to be read.
-	Table string `protobuf:"bytes,3,opt,name=table" json:"table,omitempty"`
+	Table string `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"`
 	// If non-empty, the name of an index on [table][google.spanner.v1.ReadRequest.table]. This index is
 	// used instead of the table primary key when interpreting [key_set][google.spanner.v1.ReadRequest.key_set]
 	// and sorting result rows. See [key_set][google.spanner.v1.ReadRequest.key_set] for further information.
-	Index string `protobuf:"bytes,4,opt,name=index" json:"index,omitempty"`
+	Index string `protobuf:"bytes,4,opt,name=index,proto3" json:"index,omitempty"`
 	// The columns of [table][google.spanner.v1.ReadRequest.table] to be returned for each row matching
 	// this request.
-	Columns []string `protobuf:"bytes,5,rep,name=columns" json:"columns,omitempty"`
+	Columns []string `protobuf:"bytes,5,rep,name=columns,proto3" json:"columns,omitempty"`
 	// Required. `key_set` identifies the rows to be yielded. `key_set` names the
 	// primary keys of the rows in [table][google.spanner.v1.ReadRequest.table] to be yielded, unless [index][google.spanner.v1.ReadRequest.index]
 	// is present. If [index][google.spanner.v1.ReadRequest.index] is present, then [key_set][google.spanner.v1.ReadRequest.key_set] instead names
@@ -654,11 +930,11 @@ type ReadRequest struct {
 	//
 	// It is not an error for the `key_set` to name rows that do not
 	// exist in the database. Read yields nothing for nonexistent rows.
-	KeySet *KeySet `protobuf:"bytes,6,opt,name=key_set,json=keySet" json:"key_set,omitempty"`
+	KeySet *KeySet `protobuf:"bytes,6,opt,name=key_set,json=keySet,proto3" json:"key_set,omitempty"`
 	// If greater than zero, only the first `limit` rows are yielded. If `limit`
 	// is zero, the default is no limit. A limit cannot be specified if
 	// `partition_token` is set.
-	Limit int64 `protobuf:"varint,8,opt,name=limit" json:"limit,omitempty"`
+	Limit int64 `protobuf:"varint,8,opt,name=limit,proto3" json:"limit,omitempty"`
 	// If this request is resuming a previously interrupted read,
 	// `resume_token` should be copied from the last
 	// [PartialResultSet][google.spanner.v1.PartialResultSet] yielded before the interruption. Doing this
@@ -670,13 +946,35 @@ type ReadRequest struct {
 	// previously created using PartitionRead().    There must be an exact
 	// match for the values of fields common to this message and the
 	// PartitionReadRequest message used to create this partition_token.
-	PartitionToken []byte `protobuf:"bytes,10,opt,name=partition_token,json=partitionToken,proto3" json:"partition_token,omitempty"`
+	PartitionToken       []byte   `protobuf:"bytes,10,opt,name=partition_token,json=partitionToken,proto3" json:"partition_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReadRequest) Reset()         { *m = ReadRequest{} }
+func (m *ReadRequest) String() string { return proto.CompactTextString(m) }
+func (*ReadRequest) ProtoMessage()    {}
+func (*ReadRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{12}
+}
+func (m *ReadRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReadRequest.Unmarshal(m, b)
+}
+func (m *ReadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReadRequest.Marshal(b, m, deterministic)
+}
+func (dst *ReadRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReadRequest.Merge(dst, src)
+}
+func (m *ReadRequest) XXX_Size() int {
+	return xxx_messageInfo_ReadRequest.Size(m)
+}
+func (m *ReadRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReadRequest.DiscardUnknown(m)
 }
 
-func (m *ReadRequest) Reset()                    { *m = ReadRequest{} }
-func (m *ReadRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReadRequest) ProtoMessage()               {}
-func (*ReadRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{12} }
+var xxx_messageInfo_ReadRequest proto.InternalMessageInfo
 
 func (m *ReadRequest) GetSession() string {
 	if m != nil {
@@ -744,15 +1042,37 @@ func (m *ReadRequest) GetPartitionToken() []byte {
 // The request for [BeginTransaction][google.spanner.v1.Spanner.BeginTransaction].
 type BeginTransactionRequest struct {
 	// Required. The session in which the transaction runs.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// Required. Options for the new transaction.
-	Options *TransactionOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
+	Options              *TransactionOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest{} }
+func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
+func (*BeginTransactionRequest) ProtoMessage()    {}
+func (*BeginTransactionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{13}
+}
+func (m *BeginTransactionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BeginTransactionRequest.Unmarshal(m, b)
+}
+func (m *BeginTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BeginTransactionRequest.Marshal(b, m, deterministic)
+}
+func (dst *BeginTransactionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BeginTransactionRequest.Merge(dst, src)
+}
+func (m *BeginTransactionRequest) XXX_Size() int {
+	return xxx_messageInfo_BeginTransactionRequest.Size(m)
+}
+func (m *BeginTransactionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BeginTransactionRequest.DiscardUnknown(m)
 }
 
-func (m *BeginTransactionRequest) Reset()                    { *m = BeginTransactionRequest{} }
-func (m *BeginTransactionRequest) String() string            { return proto.CompactTextString(m) }
-func (*BeginTransactionRequest) ProtoMessage()               {}
-func (*BeginTransactionRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{13} }
+var xxx_messageInfo_BeginTransactionRequest proto.InternalMessageInfo
 
 func (m *BeginTransactionRequest) GetSession() string {
 	if m != nil {
@@ -771,7 +1091,7 @@ func (m *BeginTransactionRequest) GetOptions() *TransactionOptions {
 // The request for [Commit][google.spanner.v1.Spanner.Commit].
 type CommitRequest struct {
 	// Required. The session in which the transaction to be committed is running.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// Required. The transaction in which to commit.
 	//
 	// Types that are valid to be assigned to Transaction:
@@ -781,13 +1101,42 @@ type CommitRequest struct {
 	// The mutations to be executed when this transaction commits. All
 	// mutations are applied atomically, in the order they appear in
 	// this list.
-	Mutations []*Mutation `protobuf:"bytes,4,rep,name=mutations" json:"mutations,omitempty"`
+	Mutations            []*Mutation `protobuf:"bytes,4,rep,name=mutations,proto3" json:"mutations,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *CommitRequest) Reset()                    { *m = CommitRequest{} }
-func (m *CommitRequest) String() string            { return proto.CompactTextString(m) }
-func (*CommitRequest) ProtoMessage()               {}
-func (*CommitRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{14} }
+func (m *CommitRequest) Reset()         { *m = CommitRequest{} }
+func (m *CommitRequest) String() string { return proto.CompactTextString(m) }
+func (*CommitRequest) ProtoMessage()    {}
+func (*CommitRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{14}
+}
+func (m *CommitRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommitRequest.Unmarshal(m, b)
+}
+func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic)
+}
+func (dst *CommitRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitRequest.Merge(dst, src)
+}
+func (m *CommitRequest) XXX_Size() int {
+	return xxx_messageInfo_CommitRequest.Size(m)
+}
+func (m *CommitRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommitRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommitRequest proto.InternalMessageInfo
+
+func (m *CommitRequest) GetSession() string {
+	if m != nil {
+		return m.Session
+	}
+	return ""
+}
 
 type isCommitRequest_Transaction interface {
 	isCommitRequest_Transaction()
@@ -796,11 +1145,13 @@ type isCommitRequest_Transaction interface {
 type CommitRequest_TransactionId struct {
 	TransactionId []byte `protobuf:"bytes,2,opt,name=transaction_id,json=transactionId,proto3,oneof"`
 }
+
 type CommitRequest_SingleUseTransaction struct {
-	SingleUseTransaction *TransactionOptions `protobuf:"bytes,3,opt,name=single_use_transaction,json=singleUseTransaction,oneof"`
+	SingleUseTransaction *TransactionOptions `protobuf:"bytes,3,opt,name=single_use_transaction,json=singleUseTransaction,proto3,oneof"`
 }
 
-func (*CommitRequest_TransactionId) isCommitRequest_Transaction()        {}
+func (*CommitRequest_TransactionId) isCommitRequest_Transaction() {}
+
 func (*CommitRequest_SingleUseTransaction) isCommitRequest_Transaction() {}
 
 func (m *CommitRequest) GetTransaction() isCommitRequest_Transaction {
@@ -810,13 +1161,6 @@ func (m *CommitRequest) GetTransaction() isCommitRequest_Transaction {
 	return nil
 }
 
-func (m *CommitRequest) GetSession() string {
-	if m != nil {
-		return m.Session
-	}
-	return ""
-}
-
 func (m *CommitRequest) GetTransactionId() []byte {
 	if x, ok := m.GetTransaction().(*CommitRequest_TransactionId); ok {
 		return x.TransactionId
@@ -893,12 +1237,12 @@ func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
 	// transaction
 	switch x := m.Transaction.(type) {
 	case *CommitRequest_TransactionId:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.TransactionId)))
 		n += len(x.TransactionId)
 	case *CommitRequest_SingleUseTransaction:
 		s := proto.Size(x.SingleUseTransaction)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -911,15 +1255,37 @@ func _CommitRequest_OneofSizer(msg proto.Message) (n int) {
 // The response for [Commit][google.spanner.v1.Spanner.Commit].
 type CommitResponse struct {
 	// The Cloud Spanner timestamp at which the transaction committed.
-	CommitTimestamp *google_protobuf3.Timestamp `protobuf:"bytes,1,opt,name=commit_timestamp,json=commitTimestamp" json:"commit_timestamp,omitempty"`
+	CommitTimestamp      *timestamp.Timestamp `protobuf:"bytes,1,opt,name=commit_timestamp,json=commitTimestamp,proto3" json:"commit_timestamp,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *CommitResponse) Reset()                    { *m = CommitResponse{} }
-func (m *CommitResponse) String() string            { return proto.CompactTextString(m) }
-func (*CommitResponse) ProtoMessage()               {}
-func (*CommitResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{15} }
+func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
+func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
+func (*CommitResponse) ProtoMessage()    {}
+func (*CommitResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{15}
+}
+func (m *CommitResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommitResponse.Unmarshal(m, b)
+}
+func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic)
+}
+func (dst *CommitResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommitResponse.Merge(dst, src)
+}
+func (m *CommitResponse) XXX_Size() int {
+	return xxx_messageInfo_CommitResponse.Size(m)
+}
+func (m *CommitResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommitResponse.DiscardUnknown(m)
+}
 
-func (m *CommitResponse) GetCommitTimestamp() *google_protobuf3.Timestamp {
+var xxx_messageInfo_CommitResponse proto.InternalMessageInfo
+
+func (m *CommitResponse) GetCommitTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.CommitTimestamp
 	}
@@ -929,15 +1295,37 @@ func (m *CommitResponse) GetCommitTimestamp() *google_protobuf3.Timestamp {
 // The request for [Rollback][google.spanner.v1.Spanner.Rollback].
 type RollbackRequest struct {
 	// Required. The session in which the transaction to roll back is running.
-	Session string `protobuf:"bytes,1,opt,name=session" json:"session,omitempty"`
+	Session string `protobuf:"bytes,1,opt,name=session,proto3" json:"session,omitempty"`
 	// Required. The transaction to roll back.
-	TransactionId []byte `protobuf:"bytes,2,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	TransactionId        []byte   `protobuf:"bytes,2,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RollbackRequest) Reset()                    { *m = RollbackRequest{} }
-func (m *RollbackRequest) String() string            { return proto.CompactTextString(m) }
-func (*RollbackRequest) ProtoMessage()               {}
-func (*RollbackRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{16} }
+func (m *RollbackRequest) Reset()         { *m = RollbackRequest{} }
+func (m *RollbackRequest) String() string { return proto.CompactTextString(m) }
+func (*RollbackRequest) ProtoMessage()    {}
+func (*RollbackRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_spanner_d2fc31bf582f58c8, []int{16}
+}
+func (m *RollbackRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RollbackRequest.Unmarshal(m, b)
+}
+func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic)
+}
+func (dst *RollbackRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RollbackRequest.Merge(dst, src)
+}
+func (m *RollbackRequest) XXX_Size() int {
+	return xxx_messageInfo_RollbackRequest.Size(m)
+}
+func (m *RollbackRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_RollbackRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RollbackRequest proto.InternalMessageInfo
 
 func (m *RollbackRequest) GetSession() string {
 	if m != nil {
@@ -956,13 +1344,16 @@ func (m *RollbackRequest) GetTransactionId() []byte {
 func init() {
 	proto.RegisterType((*CreateSessionRequest)(nil), "google.spanner.v1.CreateSessionRequest")
 	proto.RegisterType((*Session)(nil), "google.spanner.v1.Session")
+	proto.RegisterMapType((map[string]string)(nil), "google.spanner.v1.Session.LabelsEntry")
 	proto.RegisterType((*GetSessionRequest)(nil), "google.spanner.v1.GetSessionRequest")
 	proto.RegisterType((*ListSessionsRequest)(nil), "google.spanner.v1.ListSessionsRequest")
 	proto.RegisterType((*ListSessionsResponse)(nil), "google.spanner.v1.ListSessionsResponse")
 	proto.RegisterType((*DeleteSessionRequest)(nil), "google.spanner.v1.DeleteSessionRequest")
 	proto.RegisterType((*ExecuteSqlRequest)(nil), "google.spanner.v1.ExecuteSqlRequest")
+	proto.RegisterMapType((map[string]*Type)(nil), "google.spanner.v1.ExecuteSqlRequest.ParamTypesEntry")
 	proto.RegisterType((*PartitionOptions)(nil), "google.spanner.v1.PartitionOptions")
 	proto.RegisterType((*PartitionQueryRequest)(nil), "google.spanner.v1.PartitionQueryRequest")
+	proto.RegisterMapType((map[string]*Type)(nil), "google.spanner.v1.PartitionQueryRequest.ParamTypesEntry")
 	proto.RegisterType((*PartitionReadRequest)(nil), "google.spanner.v1.PartitionReadRequest")
 	proto.RegisterType((*Partition)(nil), "google.spanner.v1.Partition")
 	proto.RegisterType((*PartitionResponse)(nil), "google.spanner.v1.PartitionResponse")
@@ -982,8 +1373,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Spanner service
-
+// SpannerClient is the client API for Spanner service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SpannerClient interface {
 	// Creates a new session. A session can be used to perform
 	// transactions that read and/or modify data in a Cloud Spanner database.
@@ -1012,7 +1404,7 @@ type SpannerClient interface {
 	// Lists all sessions in a given database.
 	ListSessions(ctx context.Context, in *ListSessionsRequest, opts ...grpc.CallOption) (*ListSessionsResponse, error)
 	// Ends a session, releasing server resources associated with it.
-	DeleteSession(ctx context.Context, in *DeleteSessionRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeleteSession(ctx context.Context, in *DeleteSessionRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Executes an SQL query, returning all rows in a single reply. This
 	// method cannot be used to return a result set larger than 10 MiB;
 	// if the query yields more data than that, the query fails with
@@ -1073,7 +1465,7 @@ type SpannerClient interface {
 	// `Rollback` returns `OK` if it successfully aborts the transaction, the
 	// transaction was already aborted, or the transaction is not
 	// found. `Rollback` never returns `ABORTED`.
-	Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Creates a set of partition tokens that can be used to execute a query
 	// operation in parallel.  Each of the returned partition tokens can be used
 	// by [ExecuteStreamingSql][google.spanner.v1.Spanner.ExecuteStreamingSql] to specify a subset
@@ -1104,7 +1496,7 @@ func NewSpannerClient(cc *grpc.ClientConn) SpannerClient {
 
 func (c *spannerClient) CreateSession(ctx context.Context, in *CreateSessionRequest, opts ...grpc.CallOption) (*Session, error) {
 	out := new(Session)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/CreateSession", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/CreateSession", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1113,7 +1505,7 @@ func (c *spannerClient) CreateSession(ctx context.Context, in *CreateSessionRequ
 
 func (c *spannerClient) GetSession(ctx context.Context, in *GetSessionRequest, opts ...grpc.CallOption) (*Session, error) {
 	out := new(Session)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/GetSession", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/GetSession", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1122,16 +1514,16 @@ func (c *spannerClient) GetSession(ctx context.Context, in *GetSessionRequest, o
 
 func (c *spannerClient) ListSessions(ctx context.Context, in *ListSessionsRequest, opts ...grpc.CallOption) (*ListSessionsResponse, error) {
 	out := new(ListSessionsResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/ListSessions", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/ListSessions", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *spannerClient) DeleteSession(ctx context.Context, in *DeleteSessionRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/DeleteSession", in, out, c.cc, opts...)
+func (c *spannerClient) DeleteSession(ctx context.Context, in *DeleteSessionRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/DeleteSession", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1140,7 +1532,7 @@ func (c *spannerClient) DeleteSession(ctx context.Context, in *DeleteSessionRequ
 
 func (c *spannerClient) ExecuteSql(ctx context.Context, in *ExecuteSqlRequest, opts ...grpc.CallOption) (*ResultSet, error) {
 	out := new(ResultSet)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/ExecuteSql", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/ExecuteSql", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1148,7 +1540,7 @@ func (c *spannerClient) ExecuteSql(ctx context.Context, in *ExecuteSqlRequest, o
 }
 
 func (c *spannerClient) ExecuteStreamingSql(ctx context.Context, in *ExecuteSqlRequest, opts ...grpc.CallOption) (Spanner_ExecuteStreamingSqlClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Spanner_serviceDesc.Streams[0], c.cc, "/google.spanner.v1.Spanner/ExecuteStreamingSql", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Spanner_serviceDesc.Streams[0], "/google.spanner.v1.Spanner/ExecuteStreamingSql", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1181,7 +1573,7 @@ func (x *spannerExecuteStreamingSqlClient) Recv() (*PartialResultSet, error) {
 
 func (c *spannerClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ResultSet, error) {
 	out := new(ResultSet)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/Read", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/Read", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1189,7 +1581,7 @@ func (c *spannerClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.
 }
 
 func (c *spannerClient) StreamingRead(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (Spanner_StreamingReadClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Spanner_serviceDesc.Streams[1], c.cc, "/google.spanner.v1.Spanner/StreamingRead", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Spanner_serviceDesc.Streams[1], "/google.spanner.v1.Spanner/StreamingRead", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1222,7 +1614,7 @@ func (x *spannerStreamingReadClient) Recv() (*PartialResultSet, error) {
 
 func (c *spannerClient) BeginTransaction(ctx context.Context, in *BeginTransactionRequest, opts ...grpc.CallOption) (*Transaction, error) {
 	out := new(Transaction)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/BeginTransaction", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/BeginTransaction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1231,16 +1623,16 @@ func (c *spannerClient) BeginTransaction(ctx context.Context, in *BeginTransacti
 
 func (c *spannerClient) Commit(ctx context.Context, in *CommitRequest, opts ...grpc.CallOption) (*CommitResponse, error) {
 	out := new(CommitResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/Commit", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/Commit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *spannerClient) Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/Rollback", in, out, c.cc, opts...)
+func (c *spannerClient) Rollback(ctx context.Context, in *RollbackRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/Rollback", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1249,7 +1641,7 @@ func (c *spannerClient) Rollback(ctx context.Context, in *RollbackRequest, opts
 
 func (c *spannerClient) PartitionQuery(ctx context.Context, in *PartitionQueryRequest, opts ...grpc.CallOption) (*PartitionResponse, error) {
 	out := new(PartitionResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/PartitionQuery", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/PartitionQuery", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1258,15 +1650,14 @@ func (c *spannerClient) PartitionQuery(ctx context.Context, in *PartitionQueryRe
 
 func (c *spannerClient) PartitionRead(ctx context.Context, in *PartitionReadRequest, opts ...grpc.CallOption) (*PartitionResponse, error) {
 	out := new(PartitionResponse)
-	err := grpc.Invoke(ctx, "/google.spanner.v1.Spanner/PartitionRead", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.spanner.v1.Spanner/PartitionRead", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Spanner service
-
+// SpannerServer is the server API for Spanner service.
 type SpannerServer interface {
 	// Creates a new session. A session can be used to perform
 	// transactions that read and/or modify data in a Cloud Spanner database.
@@ -1295,7 +1686,7 @@ type SpannerServer interface {
 	// Lists all sessions in a given database.
 	ListSessions(context.Context, *ListSessionsRequest) (*ListSessionsResponse, error)
 	// Ends a session, releasing server resources associated with it.
-	DeleteSession(context.Context, *DeleteSessionRequest) (*google_protobuf4.Empty, error)
+	DeleteSession(context.Context, *DeleteSessionRequest) (*empty.Empty, error)
 	// Executes an SQL query, returning all rows in a single reply. This
 	// method cannot be used to return a result set larger than 10 MiB;
 	// if the query yields more data than that, the query fails with
@@ -1356,7 +1747,7 @@ type SpannerServer interface {
 	// `Rollback` returns `OK` if it successfully aborts the transaction, the
 	// transaction was already aborted, or the transaction is not
 	// found. `Rollback` never returns `ABORTED`.
-	Rollback(context.Context, *RollbackRequest) (*google_protobuf4.Empty, error)
+	Rollback(context.Context, *RollbackRequest) (*empty.Empty, error)
 	// Creates a set of partition tokens that can be used to execute a query
 	// operation in parallel.  Each of the returned partition tokens can be used
 	// by [ExecuteStreamingSql][google.spanner.v1.Spanner.ExecuteStreamingSql] to specify a subset
@@ -1685,9 +2076,11 @@ var _Spanner_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/spanner/v1/spanner.proto",
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/spanner.proto", fileDescriptor4) }
+func init() {
+	proto.RegisterFile("google/spanner/v1/spanner.proto", fileDescriptor_spanner_d2fc31bf582f58c8)
+}
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_spanner_d2fc31bf582f58c8 = []byte{
 	// 1657 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xdd, 0x6f, 0x53, 0xc9,
 	0x15, 0xe7, 0xda, 0x89, 0x13, 0x1f, 0xc7, 0x89, 0x33, 0x98, 0x60, 0x0c, 0x85, 0x70, 0xf9, 0x48,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/v1/transaction.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/v1/transaction.pb.go
index f63797d3..2e841b0f 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/v1/transaction.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/v1/transaction.pb.go
@@ -1,20 +1,26 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/transaction.proto
 
-package spanner
+package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // # Transactions
 //
 //
@@ -238,27 +244,51 @@ type TransactionOptions struct {
 	// Types that are valid to be assigned to Mode:
 	//	*TransactionOptions_ReadWrite_
 	//	*TransactionOptions_ReadOnly_
-	Mode isTransactionOptions_Mode `protobuf_oneof:"mode"`
+	Mode                 isTransactionOptions_Mode `protobuf_oneof:"mode"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
-func (m *TransactionOptions) Reset()                    { *m = TransactionOptions{} }
-func (m *TransactionOptions) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions) ProtoMessage()               {}
-func (*TransactionOptions) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+func (m *TransactionOptions) Reset()         { *m = TransactionOptions{} }
+func (m *TransactionOptions) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions) ProtoMessage()    {}
+func (*TransactionOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transaction_1d57af638fc1a731, []int{0}
+}
+func (m *TransactionOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions.Unmarshal(m, b)
+}
+func (m *TransactionOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions.Merge(dst, src)
+}
+func (m *TransactionOptions) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions.Size(m)
+}
+func (m *TransactionOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransactionOptions proto.InternalMessageInfo
 
 type isTransactionOptions_Mode interface {
 	isTransactionOptions_Mode()
 }
 
 type TransactionOptions_ReadWrite_ struct {
-	ReadWrite *TransactionOptions_ReadWrite `protobuf:"bytes,1,opt,name=read_write,json=readWrite,oneof"`
+	ReadWrite *TransactionOptions_ReadWrite `protobuf:"bytes,1,opt,name=read_write,json=readWrite,proto3,oneof"`
 }
+
 type TransactionOptions_ReadOnly_ struct {
-	ReadOnly *TransactionOptions_ReadOnly `protobuf:"bytes,2,opt,name=read_only,json=readOnly,oneof"`
+	ReadOnly *TransactionOptions_ReadOnly `protobuf:"bytes,2,opt,name=read_only,json=readOnly,proto3,oneof"`
 }
 
 func (*TransactionOptions_ReadWrite_) isTransactionOptions_Mode() {}
-func (*TransactionOptions_ReadOnly_) isTransactionOptions_Mode()  {}
+
+func (*TransactionOptions_ReadOnly_) isTransactionOptions_Mode() {}
 
 func (m *TransactionOptions) GetMode() isTransactionOptions_Mode {
 	if m != nil {
@@ -340,12 +370,12 @@ func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Mode.(type) {
 	case *TransactionOptions_ReadWrite_:
 		s := proto.Size(x.ReadWrite)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransactionOptions_ReadOnly_:
 		s := proto.Size(x.ReadOnly)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -358,12 +388,34 @@ func _TransactionOptions_OneofSizer(msg proto.Message) (n int) {
 // Message type to initiate a read-write transaction. Currently this
 // transaction type has no options.
 type TransactionOptions_ReadWrite struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransactionOptions_ReadWrite) Reset()         { *m = TransactionOptions_ReadWrite{} }
+func (m *TransactionOptions_ReadWrite) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions_ReadWrite) ProtoMessage()    {}
+func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transaction_1d57af638fc1a731, []int{0, 0}
+}
+func (m *TransactionOptions_ReadWrite) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Unmarshal(m, b)
+}
+func (m *TransactionOptions_ReadWrite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions_ReadWrite) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadWrite.Merge(dst, src)
+}
+func (m *TransactionOptions_ReadWrite) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions_ReadWrite.Size(m)
+}
+func (m *TransactionOptions_ReadWrite) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions_ReadWrite.DiscardUnknown(m)
 }
 
-func (m *TransactionOptions_ReadWrite) Reset()                    { *m = TransactionOptions_ReadWrite{} }
-func (m *TransactionOptions_ReadWrite) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions_ReadWrite) ProtoMessage()               {}
-func (*TransactionOptions_ReadWrite) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 0} }
+var xxx_messageInfo_TransactionOptions_ReadWrite proto.InternalMessageInfo
 
 // Message type to initiate a read-only transaction.
 type TransactionOptions_ReadOnly struct {
@@ -378,39 +430,69 @@ type TransactionOptions_ReadOnly struct {
 	TimestampBound isTransactionOptions_ReadOnly_TimestampBound `protobuf_oneof:"timestamp_bound"`
 	// If true, the Cloud Spanner-selected read timestamp is included in
 	// the [Transaction][google.spanner.v1.Transaction] message that describes the transaction.
-	ReturnReadTimestamp bool `protobuf:"varint,6,opt,name=return_read_timestamp,json=returnReadTimestamp" json:"return_read_timestamp,omitempty"`
+	ReturnReadTimestamp  bool     `protobuf:"varint,6,opt,name=return_read_timestamp,json=returnReadTimestamp,proto3" json:"return_read_timestamp,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TransactionOptions_ReadOnly) Reset()                    { *m = TransactionOptions_ReadOnly{} }
-func (m *TransactionOptions_ReadOnly) String() string            { return proto.CompactTextString(m) }
-func (*TransactionOptions_ReadOnly) ProtoMessage()               {}
-func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 1} }
+func (m *TransactionOptions_ReadOnly) Reset()         { *m = TransactionOptions_ReadOnly{} }
+func (m *TransactionOptions_ReadOnly) String() string { return proto.CompactTextString(m) }
+func (*TransactionOptions_ReadOnly) ProtoMessage()    {}
+func (*TransactionOptions_ReadOnly) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transaction_1d57af638fc1a731, []int{0, 1}
+}
+func (m *TransactionOptions_ReadOnly) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Unmarshal(m, b)
+}
+func (m *TransactionOptions_ReadOnly) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Marshal(b, m, deterministic)
+}
+func (dst *TransactionOptions_ReadOnly) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionOptions_ReadOnly.Merge(dst, src)
+}
+func (m *TransactionOptions_ReadOnly) XXX_Size() int {
+	return xxx_messageInfo_TransactionOptions_ReadOnly.Size(m)
+}
+func (m *TransactionOptions_ReadOnly) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionOptions_ReadOnly.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransactionOptions_ReadOnly proto.InternalMessageInfo
 
 type isTransactionOptions_ReadOnly_TimestampBound interface {
 	isTransactionOptions_ReadOnly_TimestampBound()
 }
 
 type TransactionOptions_ReadOnly_Strong struct {
-	Strong bool `protobuf:"varint,1,opt,name=strong,oneof"`
+	Strong bool `protobuf:"varint,1,opt,name=strong,proto3,oneof"`
 }
+
 type TransactionOptions_ReadOnly_MinReadTimestamp struct {
-	MinReadTimestamp *google_protobuf3.Timestamp `protobuf:"bytes,2,opt,name=min_read_timestamp,json=minReadTimestamp,oneof"`
+	MinReadTimestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=min_read_timestamp,json=minReadTimestamp,proto3,oneof"`
 }
+
 type TransactionOptions_ReadOnly_MaxStaleness struct {
-	MaxStaleness *google_protobuf2.Duration `protobuf:"bytes,3,opt,name=max_staleness,json=maxStaleness,oneof"`
+	MaxStaleness *duration.Duration `protobuf:"bytes,3,opt,name=max_staleness,json=maxStaleness,proto3,oneof"`
 }
+
 type TransactionOptions_ReadOnly_ReadTimestamp struct {
-	ReadTimestamp *google_protobuf3.Timestamp `protobuf:"bytes,4,opt,name=read_timestamp,json=readTimestamp,oneof"`
+	ReadTimestamp *timestamp.Timestamp `protobuf:"bytes,4,opt,name=read_timestamp,json=readTimestamp,proto3,oneof"`
 }
+
 type TransactionOptions_ReadOnly_ExactStaleness struct {
-	ExactStaleness *google_protobuf2.Duration `protobuf:"bytes,5,opt,name=exact_staleness,json=exactStaleness,oneof"`
+	ExactStaleness *duration.Duration `protobuf:"bytes,5,opt,name=exact_staleness,json=exactStaleness,proto3,oneof"`
 }
 
-func (*TransactionOptions_ReadOnly_Strong) isTransactionOptions_ReadOnly_TimestampBound()           {}
+func (*TransactionOptions_ReadOnly_Strong) isTransactionOptions_ReadOnly_TimestampBound() {}
+
 func (*TransactionOptions_ReadOnly_MinReadTimestamp) isTransactionOptions_ReadOnly_TimestampBound() {}
-func (*TransactionOptions_ReadOnly_MaxStaleness) isTransactionOptions_ReadOnly_TimestampBound()     {}
-func (*TransactionOptions_ReadOnly_ReadTimestamp) isTransactionOptions_ReadOnly_TimestampBound()    {}
-func (*TransactionOptions_ReadOnly_ExactStaleness) isTransactionOptions_ReadOnly_TimestampBound()   {}
+
+func (*TransactionOptions_ReadOnly_MaxStaleness) isTransactionOptions_ReadOnly_TimestampBound() {}
+
+func (*TransactionOptions_ReadOnly_ReadTimestamp) isTransactionOptions_ReadOnly_TimestampBound() {}
+
+func (*TransactionOptions_ReadOnly_ExactStaleness) isTransactionOptions_ReadOnly_TimestampBound() {}
 
 func (m *TransactionOptions_ReadOnly) GetTimestampBound() isTransactionOptions_ReadOnly_TimestampBound {
 	if m != nil {
@@ -426,28 +508,28 @@ func (m *TransactionOptions_ReadOnly) GetStrong() bool {
 	return false
 }
 
-func (m *TransactionOptions_ReadOnly) GetMinReadTimestamp() *google_protobuf3.Timestamp {
+func (m *TransactionOptions_ReadOnly) GetMinReadTimestamp() *timestamp.Timestamp {
 	if x, ok := m.GetTimestampBound().(*TransactionOptions_ReadOnly_MinReadTimestamp); ok {
 		return x.MinReadTimestamp
 	}
 	return nil
 }
 
-func (m *TransactionOptions_ReadOnly) GetMaxStaleness() *google_protobuf2.Duration {
+func (m *TransactionOptions_ReadOnly) GetMaxStaleness() *duration.Duration {
 	if x, ok := m.GetTimestampBound().(*TransactionOptions_ReadOnly_MaxStaleness); ok {
 		return x.MaxStaleness
 	}
 	return nil
 }
 
-func (m *TransactionOptions_ReadOnly) GetReadTimestamp() *google_protobuf3.Timestamp {
+func (m *TransactionOptions_ReadOnly) GetReadTimestamp() *timestamp.Timestamp {
 	if x, ok := m.GetTimestampBound().(*TransactionOptions_ReadOnly_ReadTimestamp); ok {
 		return x.ReadTimestamp
 	}
 	return nil
 }
 
-func (m *TransactionOptions_ReadOnly) GetExactStaleness() *google_protobuf2.Duration {
+func (m *TransactionOptions_ReadOnly) GetExactStaleness() *duration.Duration {
 	if x, ok := m.GetTimestampBound().(*TransactionOptions_ReadOnly_ExactStaleness); ok {
 		return x.ExactStaleness
 	}
@@ -524,7 +606,7 @@ func _TransactionOptions_ReadOnly_OneofUnmarshaler(msg proto.Message, tag, wire
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf3.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.TimestampBound = &TransactionOptions_ReadOnly_MinReadTimestamp{msg}
 		return true, err
@@ -532,7 +614,7 @@ func _TransactionOptions_ReadOnly_OneofUnmarshaler(msg proto.Message, tag, wire
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf2.Duration)
+		msg := new(duration.Duration)
 		err := b.DecodeMessage(msg)
 		m.TimestampBound = &TransactionOptions_ReadOnly_MaxStaleness{msg}
 		return true, err
@@ -540,7 +622,7 @@ func _TransactionOptions_ReadOnly_OneofUnmarshaler(msg proto.Message, tag, wire
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf3.Timestamp)
+		msg := new(timestamp.Timestamp)
 		err := b.DecodeMessage(msg)
 		m.TimestampBound = &TransactionOptions_ReadOnly_ReadTimestamp{msg}
 		return true, err
@@ -548,7 +630,7 @@ func _TransactionOptions_ReadOnly_OneofUnmarshaler(msg proto.Message, tag, wire
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf2.Duration)
+		msg := new(duration.Duration)
 		err := b.DecodeMessage(msg)
 		m.TimestampBound = &TransactionOptions_ReadOnly_ExactStaleness{msg}
 		return true, err
@@ -562,26 +644,26 @@ func _TransactionOptions_ReadOnly_OneofSizer(msg proto.Message) (n int) {
 	// timestamp_bound
 	switch x := m.TimestampBound.(type) {
 	case *TransactionOptions_ReadOnly_Strong:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += 1
 	case *TransactionOptions_ReadOnly_MinReadTimestamp:
 		s := proto.Size(x.MinReadTimestamp)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransactionOptions_ReadOnly_MaxStaleness:
 		s := proto.Size(x.MaxStaleness)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransactionOptions_ReadOnly_ReadTimestamp:
 		s := proto.Size(x.ReadTimestamp)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransactionOptions_ReadOnly_ExactStaleness:
 		s := proto.Size(x.ExactStaleness)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -608,13 +690,35 @@ type Transaction struct {
 	//
 	// A timestamp in RFC3339 UTC \"Zulu\" format, accurate to nanoseconds.
 	// Example: `"2014-10-02T15:01:23.045123456Z"`.
-	ReadTimestamp *google_protobuf3.Timestamp `protobuf:"bytes,2,opt,name=read_timestamp,json=readTimestamp" json:"read_timestamp,omitempty"`
+	ReadTimestamp        *timestamp.Timestamp `protobuf:"bytes,2,opt,name=read_timestamp,json=readTimestamp,proto3" json:"read_timestamp,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Transaction) Reset()         { *m = Transaction{} }
+func (m *Transaction) String() string { return proto.CompactTextString(m) }
+func (*Transaction) ProtoMessage()    {}
+func (*Transaction) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transaction_1d57af638fc1a731, []int{1}
+}
+func (m *Transaction) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Transaction.Unmarshal(m, b)
+}
+func (m *Transaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Transaction.Marshal(b, m, deterministic)
+}
+func (dst *Transaction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Transaction.Merge(dst, src)
+}
+func (m *Transaction) XXX_Size() int {
+	return xxx_messageInfo_Transaction.Size(m)
+}
+func (m *Transaction) XXX_DiscardUnknown() {
+	xxx_messageInfo_Transaction.DiscardUnknown(m)
 }
 
-func (m *Transaction) Reset()                    { *m = Transaction{} }
-func (m *Transaction) String() string            { return proto.CompactTextString(m) }
-func (*Transaction) ProtoMessage()               {}
-func (*Transaction) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
+var xxx_messageInfo_Transaction proto.InternalMessageInfo
 
 func (m *Transaction) GetId() []byte {
 	if m != nil {
@@ -623,7 +727,7 @@ func (m *Transaction) GetId() []byte {
 	return nil
 }
 
-func (m *Transaction) GetReadTimestamp() *google_protobuf3.Timestamp {
+func (m *Transaction) GetReadTimestamp() *timestamp.Timestamp {
 	if m != nil {
 		return m.ReadTimestamp
 	}
@@ -643,31 +747,57 @@ type TransactionSelector struct {
 	//	*TransactionSelector_SingleUse
 	//	*TransactionSelector_Id
 	//	*TransactionSelector_Begin
-	Selector isTransactionSelector_Selector `protobuf_oneof:"selector"`
+	Selector             isTransactionSelector_Selector `protobuf_oneof:"selector"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
 }
 
-func (m *TransactionSelector) Reset()                    { *m = TransactionSelector{} }
-func (m *TransactionSelector) String() string            { return proto.CompactTextString(m) }
-func (*TransactionSelector) ProtoMessage()               {}
-func (*TransactionSelector) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} }
+func (m *TransactionSelector) Reset()         { *m = TransactionSelector{} }
+func (m *TransactionSelector) String() string { return proto.CompactTextString(m) }
+func (*TransactionSelector) ProtoMessage()    {}
+func (*TransactionSelector) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transaction_1d57af638fc1a731, []int{2}
+}
+func (m *TransactionSelector) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransactionSelector.Unmarshal(m, b)
+}
+func (m *TransactionSelector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransactionSelector.Marshal(b, m, deterministic)
+}
+func (dst *TransactionSelector) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransactionSelector.Merge(dst, src)
+}
+func (m *TransactionSelector) XXX_Size() int {
+	return xxx_messageInfo_TransactionSelector.Size(m)
+}
+func (m *TransactionSelector) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransactionSelector.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransactionSelector proto.InternalMessageInfo
 
 type isTransactionSelector_Selector interface {
 	isTransactionSelector_Selector()
 }
 
 type TransactionSelector_SingleUse struct {
-	SingleUse *TransactionOptions `protobuf:"bytes,1,opt,name=single_use,json=singleUse,oneof"`
+	SingleUse *TransactionOptions `protobuf:"bytes,1,opt,name=single_use,json=singleUse,proto3,oneof"`
 }
+
 type TransactionSelector_Id struct {
 	Id []byte `protobuf:"bytes,2,opt,name=id,proto3,oneof"`
 }
+
 type TransactionSelector_Begin struct {
-	Begin *TransactionOptions `protobuf:"bytes,3,opt,name=begin,oneof"`
+	Begin *TransactionOptions `protobuf:"bytes,3,opt,name=begin,proto3,oneof"`
 }
 
 func (*TransactionSelector_SingleUse) isTransactionSelector_Selector() {}
-func (*TransactionSelector_Id) isTransactionSelector_Selector()        {}
-func (*TransactionSelector_Begin) isTransactionSelector_Selector()     {}
+
+func (*TransactionSelector_Id) isTransactionSelector_Selector() {}
+
+func (*TransactionSelector_Begin) isTransactionSelector_Selector() {}
 
 func (m *TransactionSelector) GetSelector() isTransactionSelector_Selector {
 	if m != nil {
@@ -767,16 +897,16 @@ func _TransactionSelector_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Selector.(type) {
 	case *TransactionSelector_SingleUse:
 		s := proto.Size(x.SingleUse)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransactionSelector_Id:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.Id)))
 		n += len(x.Id)
 	case *TransactionSelector_Begin:
 		s := proto.Size(x.Begin)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -794,9 +924,11 @@ func init() {
 	proto.RegisterType((*TransactionSelector)(nil), "google.spanner.v1.TransactionSelector")
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/transaction.proto", fileDescriptor5) }
+func init() {
+	proto.RegisterFile("google/spanner/v1/transaction.proto", fileDescriptor_transaction_1d57af638fc1a731)
+}
 
-var fileDescriptor5 = []byte{
+var fileDescriptor_transaction_1d57af638fc1a731 = []byte{
 	// 537 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xd1, 0x8a, 0xd3, 0x40,
 	0x14, 0x86, 0xd3, 0x6e, 0xb7, 0x74, 0x4f, 0xbb, 0xdd, 0xee, 0x2c, 0x8b, 0x35, 0x88, 0x4a, 0x45,
diff --git a/vendor/google.golang.org/genproto/googleapis/spanner/v1/type.pb.go b/vendor/google.golang.org/genproto/googleapis/spanner/v1/type.pb.go
index 499cad60..a4fe387a 100644
--- a/vendor/google.golang.org/genproto/googleapis/spanner/v1/type.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/spanner/v1/type.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/spanner/v1/type.proto
 
-package spanner
+package spanner // import "google.golang.org/genproto/googleapis/spanner/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -13,6 +13,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // `TypeCode` is used as part of [Type][google.spanner.v1.Type] to
 // indicate the type of a Cloud Spanner value.
 //
@@ -34,6 +40,12 @@ const (
 	TypeCode_FLOAT64 TypeCode = 3
 	// Encoded as `string` in RFC 3339 timestamp format. The time zone
 	// must be present, and must be `"Z"`.
+	//
+	// If the schema has the column option
+	// `allow_commit_timestamp=true`, the placeholder string
+	// `"spanner.commit_timestamp()"` can be used to instruct the system
+	// to insert the commit timestamp associated with the transaction
+	// commit.
 	TypeCode_TIMESTAMP TypeCode = 4
 	// Encoded as `string` in RFC 3339 date format.
 	TypeCode_DATE TypeCode = 5
@@ -78,25 +90,49 @@ var TypeCode_value = map[string]int32{
 func (x TypeCode) String() string {
 	return proto.EnumName(TypeCode_name, int32(x))
 }
-func (TypeCode) EnumDescriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+func (TypeCode) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_type_d02d3ac499dc3799, []int{0}
+}
 
 // `Type` indicates the type of a Cloud Spanner value, as might be stored in a
 // table cell or returned from an SQL query.
 type Type struct {
 	// Required. The [TypeCode][google.spanner.v1.TypeCode] for this type.
-	Code TypeCode `protobuf:"varint,1,opt,name=code,enum=google.spanner.v1.TypeCode" json:"code,omitempty"`
+	Code TypeCode `protobuf:"varint,1,opt,name=code,proto3,enum=google.spanner.v1.TypeCode" json:"code,omitempty"`
 	// If [code][google.spanner.v1.Type.code] == [ARRAY][google.spanner.v1.TypeCode.ARRAY], then `array_element_type`
 	// is the type of the array elements.
-	ArrayElementType *Type `protobuf:"bytes,2,opt,name=array_element_type,json=arrayElementType" json:"array_element_type,omitempty"`
+	ArrayElementType *Type `protobuf:"bytes,2,opt,name=array_element_type,json=arrayElementType,proto3" json:"array_element_type,omitempty"`
 	// If [code][google.spanner.v1.Type.code] == [STRUCT][google.spanner.v1.TypeCode.STRUCT], then `struct_type`
 	// provides type information for the struct's fields.
-	StructType *StructType `protobuf:"bytes,3,opt,name=struct_type,json=structType" json:"struct_type,omitempty"`
+	StructType           *StructType `protobuf:"bytes,3,opt,name=struct_type,json=structType,proto3" json:"struct_type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *Type) Reset()         { *m = Type{} }
+func (m *Type) String() string { return proto.CompactTextString(m) }
+func (*Type) ProtoMessage()    {}
+func (*Type) Descriptor() ([]byte, []int) {
+	return fileDescriptor_type_d02d3ac499dc3799, []int{0}
+}
+func (m *Type) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Type.Unmarshal(m, b)
+}
+func (m *Type) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Type.Marshal(b, m, deterministic)
+}
+func (dst *Type) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type.Merge(dst, src)
+}
+func (m *Type) XXX_Size() int {
+	return xxx_messageInfo_Type.Size(m)
+}
+func (m *Type) XXX_DiscardUnknown() {
+	xxx_messageInfo_Type.DiscardUnknown(m)
 }
 
-func (m *Type) Reset()                    { *m = Type{} }
-func (m *Type) String() string            { return proto.CompactTextString(m) }
-func (*Type) ProtoMessage()               {}
-func (*Type) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+var xxx_messageInfo_Type proto.InternalMessageInfo
 
 func (m *Type) GetCode() TypeCode {
 	if m != nil {
@@ -127,13 +163,35 @@ type StructType struct {
 	// fields in the [StructType][google.spanner.v1.StructType]. In turn, the order of fields
 	// matches the order of columns in a read request, or the order of
 	// fields in the `SELECT` clause of a query.
-	Fields []*StructType_Field `protobuf:"bytes,1,rep,name=fields" json:"fields,omitempty"`
+	Fields               []*StructType_Field `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *StructType) Reset()                    { *m = StructType{} }
-func (m *StructType) String() string            { return proto.CompactTextString(m) }
-func (*StructType) ProtoMessage()               {}
-func (*StructType) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
+func (m *StructType) Reset()         { *m = StructType{} }
+func (m *StructType) String() string { return proto.CompactTextString(m) }
+func (*StructType) ProtoMessage()    {}
+func (*StructType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_type_d02d3ac499dc3799, []int{1}
+}
+func (m *StructType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructType.Unmarshal(m, b)
+}
+func (m *StructType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructType.Marshal(b, m, deterministic)
+}
+func (dst *StructType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructType.Merge(dst, src)
+}
+func (m *StructType) XXX_Size() int {
+	return xxx_messageInfo_StructType.Size(m)
+}
+func (m *StructType) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StructType proto.InternalMessageInfo
 
 func (m *StructType) GetFields() []*StructType_Field {
 	if m != nil {
@@ -151,15 +209,37 @@ type StructType_Field struct {
 	// columns might have an empty name (e.g., !"SELECT
 	// UPPER(ColName)"`). Note that a query result can contain
 	// multiple fields with the same name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The type of the field.
-	Type *Type `protobuf:"bytes,2,opt,name=type" json:"type,omitempty"`
+	Type                 *Type    `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StructType_Field) Reset()         { *m = StructType_Field{} }
+func (m *StructType_Field) String() string { return proto.CompactTextString(m) }
+func (*StructType_Field) ProtoMessage()    {}
+func (*StructType_Field) Descriptor() ([]byte, []int) {
+	return fileDescriptor_type_d02d3ac499dc3799, []int{1, 0}
+}
+func (m *StructType_Field) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StructType_Field.Unmarshal(m, b)
+}
+func (m *StructType_Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StructType_Field.Marshal(b, m, deterministic)
+}
+func (dst *StructType_Field) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StructType_Field.Merge(dst, src)
+}
+func (m *StructType_Field) XXX_Size() int {
+	return xxx_messageInfo_StructType_Field.Size(m)
+}
+func (m *StructType_Field) XXX_DiscardUnknown() {
+	xxx_messageInfo_StructType_Field.DiscardUnknown(m)
 }
 
-func (m *StructType_Field) Reset()                    { *m = StructType_Field{} }
-func (m *StructType_Field) String() string            { return proto.CompactTextString(m) }
-func (*StructType_Field) ProtoMessage()               {}
-func (*StructType_Field) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1, 0} }
+var xxx_messageInfo_StructType_Field proto.InternalMessageInfo
 
 func (m *StructType_Field) GetName() string {
 	if m != nil {
@@ -182,9 +262,9 @@ func init() {
 	proto.RegisterEnum("google.spanner.v1.TypeCode", TypeCode_name, TypeCode_value)
 }
 
-func init() { proto.RegisterFile("google/spanner/v1/type.proto", fileDescriptor6) }
+func init() { proto.RegisterFile("google/spanner/v1/type.proto", fileDescriptor_type_d02d3ac499dc3799) }
 
-var fileDescriptor6 = []byte{
+var fileDescriptor_type_d02d3ac499dc3799 = []byte{
 	// 444 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xd1, 0x8a, 0xd3, 0x40,
 	0x14, 0x86, 0x9d, 0x6d, 0xda, 0x6d, 0x4e, 0x51, 0xc6, 0x81, 0x65, 0xeb, 0xaa, 0x50, 0xd6, 0x9b,
diff --git a/vendor/google.golang.org/genproto/googleapis/storagetransfer/v1/transfer.pb.go b/vendor/google.golang.org/genproto/googleapis/storagetransfer/v1/transfer.pb.go
index 8b6625b5..32c8fe80 100644
--- a/vendor/google.golang.org/genproto/googleapis/storagetransfer/v1/transfer.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/storagetransfer/v1/transfer.pb.go
@@ -1,45 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/storagetransfer/v1/transfer.proto
 
-/*
-Package storagetransfer is a generated protocol buffer package.
-
-It is generated from these files:
-	google/storagetransfer/v1/transfer.proto
-	google/storagetransfer/v1/transfer_types.proto
-
-It has these top-level messages:
-	GetGoogleServiceAccountRequest
-	CreateTransferJobRequest
-	UpdateTransferJobRequest
-	GetTransferJobRequest
-	ListTransferJobsRequest
-	ListTransferJobsResponse
-	PauseTransferOperationRequest
-	ResumeTransferOperationRequest
-	GoogleServiceAccount
-	AwsAccessKey
-	ObjectConditions
-	GcsData
-	AwsS3Data
-	HttpData
-	TransferOptions
-	TransferSpec
-	Schedule
-	TransferJob
-	ErrorLogEntry
-	ErrorSummary
-	TransferCounters
-	TransferOperation
-*/
-package storagetransfer
+package storagetransfer // import "google.golang.org/genproto/googleapis/storagetransfer/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 import (
 	context "golang.org/x/net/context"
@@ -62,13 +31,35 @@ type GetGoogleServiceAccountRequest struct {
 	// The ID of the Google Cloud Platform Console project that the Google service
 	// account is associated with.
 	// Required.
-	ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId            string   `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetGoogleServiceAccountRequest) Reset()                    { *m = GetGoogleServiceAccountRequest{} }
-func (m *GetGoogleServiceAccountRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetGoogleServiceAccountRequest) ProtoMessage()               {}
-func (*GetGoogleServiceAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *GetGoogleServiceAccountRequest) Reset()         { *m = GetGoogleServiceAccountRequest{} }
+func (m *GetGoogleServiceAccountRequest) String() string { return proto.CompactTextString(m) }
+func (*GetGoogleServiceAccountRequest) ProtoMessage()    {}
+func (*GetGoogleServiceAccountRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_fe1aac113c6727f1, []int{0}
+}
+func (m *GetGoogleServiceAccountRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetGoogleServiceAccountRequest.Unmarshal(m, b)
+}
+func (m *GetGoogleServiceAccountRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetGoogleServiceAccountRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetGoogleServiceAccountRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetGoogleServiceAccountRequest.Merge(dst, src)
+}
+func (m *GetGoogleServiceAccountRequest) XXX_Size() int {
+	return xxx_messageInfo_GetGoogleServiceAccountRequest.Size(m)
+}
+func (m *GetGoogleServiceAccountRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetGoogleServiceAccountRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetGoogleServiceAccountRequest proto.InternalMessageInfo
 
 func (m *GetGoogleServiceAccountRequest) GetProjectId() string {
 	if m != nil {
@@ -81,13 +72,35 @@ func (m *GetGoogleServiceAccountRequest) GetProjectId() string {
 type CreateTransferJobRequest struct {
 	// The job to create.
 	// Required.
-	TransferJob *TransferJob `protobuf:"bytes,1,opt,name=transfer_job,json=transferJob" json:"transfer_job,omitempty"`
+	TransferJob          *TransferJob `protobuf:"bytes,1,opt,name=transfer_job,json=transferJob,proto3" json:"transfer_job,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *CreateTransferJobRequest) Reset()                    { *m = CreateTransferJobRequest{} }
-func (m *CreateTransferJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreateTransferJobRequest) ProtoMessage()               {}
-func (*CreateTransferJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *CreateTransferJobRequest) Reset()         { *m = CreateTransferJobRequest{} }
+func (m *CreateTransferJobRequest) String() string { return proto.CompactTextString(m) }
+func (*CreateTransferJobRequest) ProtoMessage()    {}
+func (*CreateTransferJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_fe1aac113c6727f1, []int{1}
+}
+func (m *CreateTransferJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreateTransferJobRequest.Unmarshal(m, b)
+}
+func (m *CreateTransferJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreateTransferJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreateTransferJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreateTransferJobRequest.Merge(dst, src)
+}
+func (m *CreateTransferJobRequest) XXX_Size() int {
+	return xxx_messageInfo_CreateTransferJobRequest.Size(m)
+}
+func (m *CreateTransferJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreateTransferJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CreateTransferJobRequest proto.InternalMessageInfo
 
 func (m *CreateTransferJobRequest) GetTransferJob() *TransferJob {
 	if m != nil {
@@ -100,29 +113,51 @@ func (m *CreateTransferJobRequest) GetTransferJob() *TransferJob {
 type UpdateTransferJobRequest struct {
 	// The name of job to update.
 	// Required.
-	JobName string `protobuf:"bytes,1,opt,name=job_name,json=jobName" json:"job_name,omitempty"`
+	JobName string `protobuf:"bytes,1,opt,name=job_name,json=jobName,proto3" json:"job_name,omitempty"`
 	// The ID of the Google Cloud Platform Console project that owns the job.
 	// Required.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// The job to update. `transferJob` is expected to specify only three fields:
 	// `description`, `transferSpec`, and `status`.  An UpdateTransferJobRequest
 	// that specifies other fields will be rejected with an error
 	// `INVALID_ARGUMENT`.
 	// Required.
-	TransferJob *TransferJob `protobuf:"bytes,3,opt,name=transfer_job,json=transferJob" json:"transfer_job,omitempty"`
+	TransferJob *TransferJob `protobuf:"bytes,3,opt,name=transfer_job,json=transferJob,proto3" json:"transfer_job,omitempty"`
 	// The field mask of the fields in `transferJob` that are to be updated in
 	// this request.  Fields in `transferJob` that can be updated are:
 	// `description`, `transferSpec`, and `status`.  To update the `transferSpec`
 	// of the job, a complete transfer specification has to be provided. An
 	// incomplete specification which misses any required fields will be rejected
 	// with the error `INVALID_ARGUMENT`.
-	UpdateTransferJobFieldMask *google_protobuf2.FieldMask `protobuf:"bytes,4,opt,name=update_transfer_job_field_mask,json=updateTransferJobFieldMask" json:"update_transfer_job_field_mask,omitempty"`
+	UpdateTransferJobFieldMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_transfer_job_field_mask,json=updateTransferJobFieldMask,proto3" json:"update_transfer_job_field_mask,omitempty"`
+	XXX_NoUnkeyedLiteral       struct{}              `json:"-"`
+	XXX_unrecognized           []byte                `json:"-"`
+	XXX_sizecache              int32                 `json:"-"`
+}
+
+func (m *UpdateTransferJobRequest) Reset()         { *m = UpdateTransferJobRequest{} }
+func (m *UpdateTransferJobRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdateTransferJobRequest) ProtoMessage()    {}
+func (*UpdateTransferJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_fe1aac113c6727f1, []int{2}
+}
+func (m *UpdateTransferJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateTransferJobRequest.Unmarshal(m, b)
+}
+func (m *UpdateTransferJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateTransferJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdateTransferJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateTransferJobRequest.Merge(dst, src)
+}
+func (m *UpdateTransferJobRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdateTransferJobRequest.Size(m)
+}
+func (m *UpdateTransferJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateTransferJobRequest.DiscardUnknown(m)
 }
 
-func (m *UpdateTransferJobRequest) Reset()                    { *m = UpdateTransferJobRequest{} }
-func (m *UpdateTransferJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdateTransferJobRequest) ProtoMessage()               {}
-func (*UpdateTransferJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_UpdateTransferJobRequest proto.InternalMessageInfo
 
 func (m *UpdateTransferJobRequest) GetJobName() string {
 	if m != nil {
@@ -145,7 +180,7 @@ func (m *UpdateTransferJobRequest) GetTransferJob() *TransferJob {
 	return nil
 }
 
-func (m *UpdateTransferJobRequest) GetUpdateTransferJobFieldMask() *google_protobuf2.FieldMask {
+func (m *UpdateTransferJobRequest) GetUpdateTransferJobFieldMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateTransferJobFieldMask
 	}
@@ -156,16 +191,38 @@ func (m *UpdateTransferJobRequest) GetUpdateTransferJobFieldMask() *google_proto
 type GetTransferJobRequest struct {
 	// The job to get.
 	// Required.
-	JobName string `protobuf:"bytes,1,opt,name=job_name,json=jobName" json:"job_name,omitempty"`
+	JobName string `protobuf:"bytes,1,opt,name=job_name,json=jobName,proto3" json:"job_name,omitempty"`
 	// The ID of the Google Cloud Platform Console project that owns the job.
 	// Required.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId            string   `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GetTransferJobRequest) Reset()                    { *m = GetTransferJobRequest{} }
-func (m *GetTransferJobRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetTransferJobRequest) ProtoMessage()               {}
-func (*GetTransferJobRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *GetTransferJobRequest) Reset()         { *m = GetTransferJobRequest{} }
+func (m *GetTransferJobRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTransferJobRequest) ProtoMessage()    {}
+func (*GetTransferJobRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_fe1aac113c6727f1, []int{3}
+}
+func (m *GetTransferJobRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTransferJobRequest.Unmarshal(m, b)
+}
+func (m *GetTransferJobRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTransferJobRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTransferJobRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTransferJobRequest.Merge(dst, src)
+}
+func (m *GetTransferJobRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTransferJobRequest.Size(m)
+}
+func (m *GetTransferJobRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTransferJobRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetTransferJobRequest proto.InternalMessageInfo
 
 func (m *GetTransferJobRequest) GetJobName() string {
 	if m != nil {
@@ -192,17 +249,39 @@ type ListTransferJobsRequest struct {
 	// must be specified with array notation. `project_id` is required. `job_names`
 	// and `job_statuses` are optional.  The valid values for `job_statuses` are
 	// case-insensitive: `ENABLED`, `DISABLED`, and `DELETED`.
-	Filter string `protobuf:"bytes,1,opt,name=filter" json:"filter,omitempty"`
+	Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The list page size. The max allowed value is 256.
-	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The list page token.
-	PageToken string `protobuf:"bytes,5,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken            string   `protobuf:"bytes,5,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListTransferJobsRequest) Reset()         { *m = ListTransferJobsRequest{} }
+func (m *ListTransferJobsRequest) String() string { return proto.CompactTextString(m) }
+func (*ListTransferJobsRequest) ProtoMessage()    {}
+func (*ListTransferJobsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_fe1aac113c6727f1, []int{4}
+}
+func (m *ListTransferJobsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTransferJobsRequest.Unmarshal(m, b)
+}
+func (m *ListTransferJobsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTransferJobsRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListTransferJobsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferJobsRequest.Merge(dst, src)
+}
+func (m *ListTransferJobsRequest) XXX_Size() int {
+	return xxx_messageInfo_ListTransferJobsRequest.Size(m)
+}
+func (m *ListTransferJobsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTransferJobsRequest.DiscardUnknown(m)
 }
 
-func (m *ListTransferJobsRequest) Reset()                    { *m = ListTransferJobsRequest{} }
-func (m *ListTransferJobsRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListTransferJobsRequest) ProtoMessage()               {}
-func (*ListTransferJobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ListTransferJobsRequest proto.InternalMessageInfo
 
 func (m *ListTransferJobsRequest) GetFilter() string {
 	if m != nil {
@@ -228,15 +307,37 @@ func (m *ListTransferJobsRequest) GetPageToken() string {
 // Response from ListTransferJobs.
 type ListTransferJobsResponse struct {
 	// A list of transfer jobs.
-	TransferJobs []*TransferJob `protobuf:"bytes,1,rep,name=transfer_jobs,json=transferJobs" json:"transfer_jobs,omitempty"`
+	TransferJobs []*TransferJob `protobuf:"bytes,1,rep,name=transfer_jobs,json=transferJobs,proto3" json:"transfer_jobs,omitempty"`
 	// The list next page token.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListTransferJobsResponse) Reset()                    { *m = ListTransferJobsResponse{} }
-func (m *ListTransferJobsResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListTransferJobsResponse) ProtoMessage()               {}
-func (*ListTransferJobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ListTransferJobsResponse) Reset()         { *m = ListTransferJobsResponse{} }
+func (m *ListTransferJobsResponse) String() string { return proto.CompactTextString(m) }
+func (*ListTransferJobsResponse) ProtoMessage()    {}
+func (*ListTransferJobsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_fe1aac113c6727f1, []int{5}
+}
+func (m *ListTransferJobsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListTransferJobsResponse.Unmarshal(m, b)
+}
+func (m *ListTransferJobsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListTransferJobsResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListTransferJobsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListTransferJobsResponse.Merge(dst, src)
+}
+func (m *ListTransferJobsResponse) XXX_Size() int {
+	return xxx_messageInfo_ListTransferJobsResponse.Size(m)
+}
+func (m *ListTransferJobsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListTransferJobsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListTransferJobsResponse proto.InternalMessageInfo
 
 func (m *ListTransferJobsResponse) GetTransferJobs() []*TransferJob {
 	if m != nil {
@@ -256,13 +357,35 @@ func (m *ListTransferJobsResponse) GetNextPageToken() string {
 type PauseTransferOperationRequest struct {
 	// The name of the transfer operation.
 	// Required.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PauseTransferOperationRequest) Reset()         { *m = PauseTransferOperationRequest{} }
+func (m *PauseTransferOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*PauseTransferOperationRequest) ProtoMessage()    {}
+func (*PauseTransferOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_fe1aac113c6727f1, []int{6}
+}
+func (m *PauseTransferOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PauseTransferOperationRequest.Unmarshal(m, b)
+}
+func (m *PauseTransferOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PauseTransferOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *PauseTransferOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PauseTransferOperationRequest.Merge(dst, src)
+}
+func (m *PauseTransferOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_PauseTransferOperationRequest.Size(m)
+}
+func (m *PauseTransferOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_PauseTransferOperationRequest.DiscardUnknown(m)
 }
 
-func (m *PauseTransferOperationRequest) Reset()                    { *m = PauseTransferOperationRequest{} }
-func (m *PauseTransferOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*PauseTransferOperationRequest) ProtoMessage()               {}
-func (*PauseTransferOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_PauseTransferOperationRequest proto.InternalMessageInfo
 
 func (m *PauseTransferOperationRequest) GetName() string {
 	if m != nil {
@@ -275,13 +398,35 @@ func (m *PauseTransferOperationRequest) GetName() string {
 type ResumeTransferOperationRequest struct {
 	// The name of the transfer operation.
 	// Required.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ResumeTransferOperationRequest) Reset()                    { *m = ResumeTransferOperationRequest{} }
-func (m *ResumeTransferOperationRequest) String() string            { return proto.CompactTextString(m) }
-func (*ResumeTransferOperationRequest) ProtoMessage()               {}
-func (*ResumeTransferOperationRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *ResumeTransferOperationRequest) Reset()         { *m = ResumeTransferOperationRequest{} }
+func (m *ResumeTransferOperationRequest) String() string { return proto.CompactTextString(m) }
+func (*ResumeTransferOperationRequest) ProtoMessage()    {}
+func (*ResumeTransferOperationRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_fe1aac113c6727f1, []int{7}
+}
+func (m *ResumeTransferOperationRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResumeTransferOperationRequest.Unmarshal(m, b)
+}
+func (m *ResumeTransferOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResumeTransferOperationRequest.Marshal(b, m, deterministic)
+}
+func (dst *ResumeTransferOperationRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResumeTransferOperationRequest.Merge(dst, src)
+}
+func (m *ResumeTransferOperationRequest) XXX_Size() int {
+	return xxx_messageInfo_ResumeTransferOperationRequest.Size(m)
+}
+func (m *ResumeTransferOperationRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResumeTransferOperationRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ResumeTransferOperationRequest proto.InternalMessageInfo
 
 func (m *ResumeTransferOperationRequest) GetName() string {
 	if m != nil {
@@ -309,8 +454,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for StorageTransferService service
-
+// StorageTransferServiceClient is the client API for StorageTransferService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type StorageTransferServiceClient interface {
 	// Returns the Google service account that is used by Storage Transfer
 	// Service to access buckets in the project where transfers
@@ -332,9 +478,9 @@ type StorageTransferServiceClient interface {
 	// Lists transfer jobs.
 	ListTransferJobs(ctx context.Context, in *ListTransferJobsRequest, opts ...grpc.CallOption) (*ListTransferJobsResponse, error)
 	// Pauses a transfer operation.
-	PauseTransferOperation(ctx context.Context, in *PauseTransferOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	PauseTransferOperation(ctx context.Context, in *PauseTransferOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Resumes a transfer operation that is paused.
-	ResumeTransferOperation(ctx context.Context, in *ResumeTransferOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
+	ResumeTransferOperation(ctx context.Context, in *ResumeTransferOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 }
 
 type storageTransferServiceClient struct {
@@ -347,7 +493,7 @@ func NewStorageTransferServiceClient(cc *grpc.ClientConn) StorageTransferService
 
 func (c *storageTransferServiceClient) GetGoogleServiceAccount(ctx context.Context, in *GetGoogleServiceAccountRequest, opts ...grpc.CallOption) (*GoogleServiceAccount, error) {
 	out := new(GoogleServiceAccount)
-	err := grpc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/GetGoogleServiceAccount", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/GetGoogleServiceAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -356,7 +502,7 @@ func (c *storageTransferServiceClient) GetGoogleServiceAccount(ctx context.Conte
 
 func (c *storageTransferServiceClient) CreateTransferJob(ctx context.Context, in *CreateTransferJobRequest, opts ...grpc.CallOption) (*TransferJob, error) {
 	out := new(TransferJob)
-	err := grpc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/CreateTransferJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/CreateTransferJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -365,7 +511,7 @@ func (c *storageTransferServiceClient) CreateTransferJob(ctx context.Context, in
 
 func (c *storageTransferServiceClient) UpdateTransferJob(ctx context.Context, in *UpdateTransferJobRequest, opts ...grpc.CallOption) (*TransferJob, error) {
 	out := new(TransferJob)
-	err := grpc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/UpdateTransferJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/UpdateTransferJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -374,7 +520,7 @@ func (c *storageTransferServiceClient) UpdateTransferJob(ctx context.Context, in
 
 func (c *storageTransferServiceClient) GetTransferJob(ctx context.Context, in *GetTransferJobRequest, opts ...grpc.CallOption) (*TransferJob, error) {
 	out := new(TransferJob)
-	err := grpc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/GetTransferJob", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/GetTransferJob", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -383,33 +529,32 @@ func (c *storageTransferServiceClient) GetTransferJob(ctx context.Context, in *G
 
 func (c *storageTransferServiceClient) ListTransferJobs(ctx context.Context, in *ListTransferJobsRequest, opts ...grpc.CallOption) (*ListTransferJobsResponse, error) {
 	out := new(ListTransferJobsResponse)
-	err := grpc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/ListTransferJobs", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/ListTransferJobs", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *storageTransferServiceClient) PauseTransferOperation(ctx context.Context, in *PauseTransferOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/PauseTransferOperation", in, out, c.cc, opts...)
+func (c *storageTransferServiceClient) PauseTransferOperation(ctx context.Context, in *PauseTransferOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/PauseTransferOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *storageTransferServiceClient) ResumeTransferOperation(ctx context.Context, in *ResumeTransferOperationRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
-	out := new(google_protobuf1.Empty)
-	err := grpc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/ResumeTransferOperation", in, out, c.cc, opts...)
+func (c *storageTransferServiceClient) ResumeTransferOperation(ctx context.Context, in *ResumeTransferOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/ResumeTransferOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for StorageTransferService service
-
+// StorageTransferServiceServer is the server API for StorageTransferService service.
 type StorageTransferServiceServer interface {
 	// Returns the Google service account that is used by Storage Transfer
 	// Service to access buckets in the project where transfers
@@ -431,9 +576,9 @@ type StorageTransferServiceServer interface {
 	// Lists transfer jobs.
 	ListTransferJobs(context.Context, *ListTransferJobsRequest) (*ListTransferJobsResponse, error)
 	// Pauses a transfer operation.
-	PauseTransferOperation(context.Context, *PauseTransferOperationRequest) (*google_protobuf1.Empty, error)
+	PauseTransferOperation(context.Context, *PauseTransferOperationRequest) (*empty.Empty, error)
 	// Resumes a transfer operation that is paused.
-	ResumeTransferOperation(context.Context, *ResumeTransferOperationRequest) (*google_protobuf1.Empty, error)
+	ResumeTransferOperation(context.Context, *ResumeTransferOperationRequest) (*empty.Empty, error)
 }
 
 func RegisterStorageTransferServiceServer(s *grpc.Server, srv StorageTransferServiceServer) {
@@ -603,9 +748,11 @@ var _StorageTransferService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/storagetransfer/v1/transfer.proto",
 }
 
-func init() { proto.RegisterFile("google/storagetransfer/v1/transfer.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/storagetransfer/v1/transfer.proto", fileDescriptor_transfer_fe1aac113c6727f1)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_transfer_fe1aac113c6727f1 = []byte{
 	// 786 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x4e, 0x13, 0x4f,
 	0x14, 0xce, 0xf0, 0xef, 0x07, 0x03, 0xfc, 0x84, 0x49, 0x2c, 0x4b, 0x91, 0xda, 0x2c, 0x49, 0xc5,
diff --git a/vendor/google.golang.org/genproto/googleapis/storagetransfer/v1/transfer_types.pb.go b/vendor/google.golang.org/genproto/googleapis/storagetransfer/v1/transfer_types.pb.go
index 0d94273c..12911ab1 100644
--- a/vendor/google.golang.org/genproto/googleapis/storagetransfer/v1/transfer_types.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/storagetransfer/v1/transfer_types.pb.go
@@ -1,23 +1,29 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/storagetransfer/v1/transfer_types.proto
 
-package storagetransfer
+package storagetransfer // import "google.golang.org/genproto/googleapis/storagetransfer/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/code"
-import google_type "google.golang.org/genproto/googleapis/type/date"
-import google_type1 "google.golang.org/genproto/googleapis/type/timeofday"
+import code "google.golang.org/genproto/googleapis/rpc/code"
+import date "google.golang.org/genproto/googleapis/type/date"
+import timeofday "google.golang.org/genproto/googleapis/type/timeofday"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The status of the transfer job.
 type TransferJob_Status int32
 
@@ -50,7 +56,9 @@ var TransferJob_Status_value = map[string]int32{
 func (x TransferJob_Status) String() string {
 	return proto.EnumName(TransferJob_Status_name, int32(x))
 }
-func (TransferJob_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{9, 0} }
+func (TransferJob_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{9, 0}
+}
 
 // The status of a TransferOperation.
 type TransferOperation_Status int32
@@ -90,18 +98,42 @@ var TransferOperation_Status_value = map[string]int32{
 func (x TransferOperation_Status) String() string {
 	return proto.EnumName(TransferOperation_Status_name, int32(x))
 }
-func (TransferOperation_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{13, 0} }
+func (TransferOperation_Status) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{13, 0}
+}
 
 // Google service account
 type GoogleServiceAccount struct {
 	// Required.
-	AccountEmail string `protobuf:"bytes,1,opt,name=account_email,json=accountEmail" json:"account_email,omitempty"`
+	AccountEmail         string   `protobuf:"bytes,1,opt,name=account_email,json=accountEmail,proto3" json:"account_email,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GoogleServiceAccount) Reset()                    { *m = GoogleServiceAccount{} }
-func (m *GoogleServiceAccount) String() string            { return proto.CompactTextString(m) }
-func (*GoogleServiceAccount) ProtoMessage()               {}
-func (*GoogleServiceAccount) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (m *GoogleServiceAccount) Reset()         { *m = GoogleServiceAccount{} }
+func (m *GoogleServiceAccount) String() string { return proto.CompactTextString(m) }
+func (*GoogleServiceAccount) ProtoMessage()    {}
+func (*GoogleServiceAccount) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{0}
+}
+func (m *GoogleServiceAccount) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GoogleServiceAccount.Unmarshal(m, b)
+}
+func (m *GoogleServiceAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GoogleServiceAccount.Marshal(b, m, deterministic)
+}
+func (dst *GoogleServiceAccount) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GoogleServiceAccount.Merge(dst, src)
+}
+func (m *GoogleServiceAccount) XXX_Size() int {
+	return xxx_messageInfo_GoogleServiceAccount.Size(m)
+}
+func (m *GoogleServiceAccount) XXX_DiscardUnknown() {
+	xxx_messageInfo_GoogleServiceAccount.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GoogleServiceAccount proto.InternalMessageInfo
 
 func (m *GoogleServiceAccount) GetAccountEmail() string {
 	if m != nil {
@@ -115,16 +147,38 @@ func (m *GoogleServiceAccount) GetAccountEmail() string {
 type AwsAccessKey struct {
 	// AWS access key ID.
 	// Required.
-	AccessKeyId string `protobuf:"bytes,1,opt,name=access_key_id,json=accessKeyId" json:"access_key_id,omitempty"`
+	AccessKeyId string `protobuf:"bytes,1,opt,name=access_key_id,json=accessKeyId,proto3" json:"access_key_id,omitempty"`
 	// AWS secret access key. This field is not returned in RPC responses.
 	// Required.
-	SecretAccessKey string `protobuf:"bytes,2,opt,name=secret_access_key,json=secretAccessKey" json:"secret_access_key,omitempty"`
+	SecretAccessKey      string   `protobuf:"bytes,2,opt,name=secret_access_key,json=secretAccessKey,proto3" json:"secret_access_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AwsAccessKey) Reset()         { *m = AwsAccessKey{} }
+func (m *AwsAccessKey) String() string { return proto.CompactTextString(m) }
+func (*AwsAccessKey) ProtoMessage()    {}
+func (*AwsAccessKey) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{1}
+}
+func (m *AwsAccessKey) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AwsAccessKey.Unmarshal(m, b)
+}
+func (m *AwsAccessKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AwsAccessKey.Marshal(b, m, deterministic)
+}
+func (dst *AwsAccessKey) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AwsAccessKey.Merge(dst, src)
+}
+func (m *AwsAccessKey) XXX_Size() int {
+	return xxx_messageInfo_AwsAccessKey.Size(m)
+}
+func (m *AwsAccessKey) XXX_DiscardUnknown() {
+	xxx_messageInfo_AwsAccessKey.DiscardUnknown(m)
 }
 
-func (m *AwsAccessKey) Reset()                    { *m = AwsAccessKey{} }
-func (m *AwsAccessKey) String() string            { return proto.CompactTextString(m) }
-func (*AwsAccessKey) ProtoMessage()               {}
-func (*AwsAccessKey) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_AwsAccessKey proto.InternalMessageInfo
 
 func (m *AwsAccessKey) GetAccessKeyId() string {
 	if m != nil {
@@ -149,10 +203,10 @@ type ObjectConditions struct {
 	// `NOW` - `maxTimeElapsedSinceLastModification` and less than
 	// `NOW` - `minTimeElapsedSinceLastModification`, or not have a
 	// `lastModificationTime`.
-	MinTimeElapsedSinceLastModification *google_protobuf3.Duration `protobuf:"bytes,1,opt,name=min_time_elapsed_since_last_modification,json=minTimeElapsedSinceLastModification" json:"min_time_elapsed_since_last_modification,omitempty"`
+	MinTimeElapsedSinceLastModification *duration.Duration `protobuf:"bytes,1,opt,name=min_time_elapsed_since_last_modification,json=minTimeElapsedSinceLastModification,proto3" json:"min_time_elapsed_since_last_modification,omitempty"`
 	// `maxTimeElapsedSinceLastModification` is the complement to
 	// `minTimeElapsedSinceLastModification`.
-	MaxTimeElapsedSinceLastModification *google_protobuf3.Duration `protobuf:"bytes,2,opt,name=max_time_elapsed_since_last_modification,json=maxTimeElapsedSinceLastModification" json:"max_time_elapsed_since_last_modification,omitempty"`
+	MaxTimeElapsedSinceLastModification *duration.Duration `protobuf:"bytes,2,opt,name=max_time_elapsed_since_last_modification,json=maxTimeElapsedSinceLastModification,proto3" json:"max_time_elapsed_since_last_modification,omitempty"`
 	// If `includePrefixes` is specified, objects that satisfy the object
 	// conditions must have names that start with one of the `includePrefixes`
 	// and that do not start with any of the `excludePrefixes`. If `includePrefixes`
@@ -186,27 +240,49 @@ type ObjectConditions struct {
 	//     with the value of a path explicitly included by `includePrefixes`.
 	//
 	// The max size of `includePrefixes` is 1000.
-	IncludePrefixes []string `protobuf:"bytes,3,rep,name=include_prefixes,json=includePrefixes" json:"include_prefixes,omitempty"`
+	IncludePrefixes []string `protobuf:"bytes,3,rep,name=include_prefixes,json=includePrefixes,proto3" json:"include_prefixes,omitempty"`
 	// `excludePrefixes` must follow the requirements described for
 	// `includePrefixes`.
 	//
 	// The max size of `excludePrefixes` is 1000.
-	ExcludePrefixes []string `protobuf:"bytes,4,rep,name=exclude_prefixes,json=excludePrefixes" json:"exclude_prefixes,omitempty"`
+	ExcludePrefixes      []string `protobuf:"bytes,4,rep,name=exclude_prefixes,json=excludePrefixes,proto3" json:"exclude_prefixes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ObjectConditions) Reset()                    { *m = ObjectConditions{} }
-func (m *ObjectConditions) String() string            { return proto.CompactTextString(m) }
-func (*ObjectConditions) ProtoMessage()               {}
-func (*ObjectConditions) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (m *ObjectConditions) Reset()         { *m = ObjectConditions{} }
+func (m *ObjectConditions) String() string { return proto.CompactTextString(m) }
+func (*ObjectConditions) ProtoMessage()    {}
+func (*ObjectConditions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{2}
+}
+func (m *ObjectConditions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ObjectConditions.Unmarshal(m, b)
+}
+func (m *ObjectConditions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ObjectConditions.Marshal(b, m, deterministic)
+}
+func (dst *ObjectConditions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectConditions.Merge(dst, src)
+}
+func (m *ObjectConditions) XXX_Size() int {
+	return xxx_messageInfo_ObjectConditions.Size(m)
+}
+func (m *ObjectConditions) XXX_DiscardUnknown() {
+	xxx_messageInfo_ObjectConditions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ObjectConditions proto.InternalMessageInfo
 
-func (m *ObjectConditions) GetMinTimeElapsedSinceLastModification() *google_protobuf3.Duration {
+func (m *ObjectConditions) GetMinTimeElapsedSinceLastModification() *duration.Duration {
 	if m != nil {
 		return m.MinTimeElapsedSinceLastModification
 	}
 	return nil
 }
 
-func (m *ObjectConditions) GetMaxTimeElapsedSinceLastModification() *google_protobuf3.Duration {
+func (m *ObjectConditions) GetMaxTimeElapsedSinceLastModification() *duration.Duration {
 	if m != nil {
 		return m.MaxTimeElapsedSinceLastModification
 	}
@@ -234,13 +310,35 @@ type GcsData struct {
 	// Google Cloud Storage bucket name (see
 	// [Bucket Name Requirements](https://cloud.google.com/storage/docs/bucket-naming#requirements)).
 	// Required.
-	BucketName string `protobuf:"bytes,1,opt,name=bucket_name,json=bucketName" json:"bucket_name,omitempty"`
+	BucketName           string   `protobuf:"bytes,1,opt,name=bucket_name,json=bucketName,proto3" json:"bucket_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GcsData) Reset()                    { *m = GcsData{} }
-func (m *GcsData) String() string            { return proto.CompactTextString(m) }
-func (*GcsData) ProtoMessage()               {}
-func (*GcsData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (m *GcsData) Reset()         { *m = GcsData{} }
+func (m *GcsData) String() string { return proto.CompactTextString(m) }
+func (*GcsData) ProtoMessage()    {}
+func (*GcsData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{3}
+}
+func (m *GcsData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GcsData.Unmarshal(m, b)
+}
+func (m *GcsData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GcsData.Marshal(b, m, deterministic)
+}
+func (dst *GcsData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GcsData.Merge(dst, src)
+}
+func (m *GcsData) XXX_Size() int {
+	return xxx_messageInfo_GcsData.Size(m)
+}
+func (m *GcsData) XXX_DiscardUnknown() {
+	xxx_messageInfo_GcsData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GcsData proto.InternalMessageInfo
 
 func (m *GcsData) GetBucketName() string {
 	if m != nil {
@@ -255,18 +353,40 @@ type AwsS3Data struct {
 	// S3 Bucket name (see
 	// [Creating a bucket](http://docs.aws.amazon.com/AmazonS3/latest/dev/create-bucket-get-location-example.html)).
 	// Required.
-	BucketName string `protobuf:"bytes,1,opt,name=bucket_name,json=bucketName" json:"bucket_name,omitempty"`
+	BucketName string `protobuf:"bytes,1,opt,name=bucket_name,json=bucketName,proto3" json:"bucket_name,omitempty"`
 	// AWS access key used to sign the API requests to the AWS S3 bucket.
 	// Permissions on the bucket must be granted to the access ID of the
 	// AWS access key.
 	// Required.
-	AwsAccessKey *AwsAccessKey `protobuf:"bytes,2,opt,name=aws_access_key,json=awsAccessKey" json:"aws_access_key,omitempty"`
+	AwsAccessKey         *AwsAccessKey `protobuf:"bytes,2,opt,name=aws_access_key,json=awsAccessKey,proto3" json:"aws_access_key,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *AwsS3Data) Reset()                    { *m = AwsS3Data{} }
-func (m *AwsS3Data) String() string            { return proto.CompactTextString(m) }
-func (*AwsS3Data) ProtoMessage()               {}
-func (*AwsS3Data) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (m *AwsS3Data) Reset()         { *m = AwsS3Data{} }
+func (m *AwsS3Data) String() string { return proto.CompactTextString(m) }
+func (*AwsS3Data) ProtoMessage()    {}
+func (*AwsS3Data) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{4}
+}
+func (m *AwsS3Data) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AwsS3Data.Unmarshal(m, b)
+}
+func (m *AwsS3Data) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AwsS3Data.Marshal(b, m, deterministic)
+}
+func (dst *AwsS3Data) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AwsS3Data.Merge(dst, src)
+}
+func (m *AwsS3Data) XXX_Size() int {
+	return xxx_messageInfo_AwsS3Data.Size(m)
+}
+func (m *AwsS3Data) XXX_DiscardUnknown() {
+	xxx_messageInfo_AwsS3Data.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AwsS3Data proto.InternalMessageInfo
 
 func (m *AwsS3Data) GetBucketName() string {
 	if m != nil {
@@ -328,13 +448,35 @@ type HttpData struct {
 	// This file must allow public access.  Currently, only URLs with HTTP and
 	// HTTPS schemes are supported.
 	// Required.
-	ListUrl string `protobuf:"bytes,1,opt,name=list_url,json=listUrl" json:"list_url,omitempty"`
+	ListUrl              string   `protobuf:"bytes,1,opt,name=list_url,json=listUrl,proto3" json:"list_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *HttpData) Reset()                    { *m = HttpData{} }
-func (m *HttpData) String() string            { return proto.CompactTextString(m) }
-func (*HttpData) ProtoMessage()               {}
-func (*HttpData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (m *HttpData) Reset()         { *m = HttpData{} }
+func (m *HttpData) String() string { return proto.CompactTextString(m) }
+func (*HttpData) ProtoMessage()    {}
+func (*HttpData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{5}
+}
+func (m *HttpData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HttpData.Unmarshal(m, b)
+}
+func (m *HttpData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HttpData.Marshal(b, m, deterministic)
+}
+func (dst *HttpData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HttpData.Merge(dst, src)
+}
+func (m *HttpData) XXX_Size() int {
+	return xxx_messageInfo_HttpData.Size(m)
+}
+func (m *HttpData) XXX_DiscardUnknown() {
+	xxx_messageInfo_HttpData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HttpData proto.InternalMessageInfo
 
 func (m *HttpData) GetListUrl() string {
 	if m != nil {
@@ -347,21 +489,43 @@ func (m *HttpData) GetListUrl() string {
 // to be performed on objects in a transfer.
 type TransferOptions struct {
 	// Whether overwriting objects that already exist in the sink is allowed.
-	OverwriteObjectsAlreadyExistingInSink bool `protobuf:"varint,1,opt,name=overwrite_objects_already_existing_in_sink,json=overwriteObjectsAlreadyExistingInSink" json:"overwrite_objects_already_existing_in_sink,omitempty"`
+	OverwriteObjectsAlreadyExistingInSink bool `protobuf:"varint,1,opt,name=overwrite_objects_already_existing_in_sink,json=overwriteObjectsAlreadyExistingInSink,proto3" json:"overwrite_objects_already_existing_in_sink,omitempty"`
 	// Whether objects that exist only in the sink should be deleted.  Note that
 	// this option and `deleteObjectsFromSourceAfterTransfer` are mutually
 	// exclusive.
-	DeleteObjectsUniqueInSink bool `protobuf:"varint,2,opt,name=delete_objects_unique_in_sink,json=deleteObjectsUniqueInSink" json:"delete_objects_unique_in_sink,omitempty"`
+	DeleteObjectsUniqueInSink bool `protobuf:"varint,2,opt,name=delete_objects_unique_in_sink,json=deleteObjectsUniqueInSink,proto3" json:"delete_objects_unique_in_sink,omitempty"`
 	// Whether objects should be deleted from the source after they are
 	// transferred to the sink.  Note that this option and
 	// `deleteObjectsUniqueInSink` are mutually exclusive.
-	DeleteObjectsFromSourceAfterTransfer bool `protobuf:"varint,3,opt,name=delete_objects_from_source_after_transfer,json=deleteObjectsFromSourceAfterTransfer" json:"delete_objects_from_source_after_transfer,omitempty"`
+	DeleteObjectsFromSourceAfterTransfer bool     `protobuf:"varint,3,opt,name=delete_objects_from_source_after_transfer,json=deleteObjectsFromSourceAfterTransfer,proto3" json:"delete_objects_from_source_after_transfer,omitempty"`
+	XXX_NoUnkeyedLiteral                 struct{} `json:"-"`
+	XXX_unrecognized                     []byte   `json:"-"`
+	XXX_sizecache                        int32    `json:"-"`
 }
 
-func (m *TransferOptions) Reset()                    { *m = TransferOptions{} }
-func (m *TransferOptions) String() string            { return proto.CompactTextString(m) }
-func (*TransferOptions) ProtoMessage()               {}
-func (*TransferOptions) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *TransferOptions) Reset()         { *m = TransferOptions{} }
+func (m *TransferOptions) String() string { return proto.CompactTextString(m) }
+func (*TransferOptions) ProtoMessage()    {}
+func (*TransferOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{6}
+}
+func (m *TransferOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferOptions.Unmarshal(m, b)
+}
+func (m *TransferOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferOptions.Marshal(b, m, deterministic)
+}
+func (dst *TransferOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferOptions.Merge(dst, src)
+}
+func (m *TransferOptions) XXX_Size() int {
+	return xxx_messageInfo_TransferOptions.Size(m)
+}
+func (m *TransferOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransferOptions proto.InternalMessageInfo
 
 func (m *TransferOptions) GetOverwriteObjectsAlreadyExistingInSink() bool {
 	if m != nil {
@@ -401,42 +565,61 @@ type TransferSpec struct {
 	// Only objects that satisfy these object conditions are included in the set
 	// of data source and data sink objects.  Object conditions based on
 	// objects' `lastModificationTime` do not exclude objects in a data sink.
-	ObjectConditions *ObjectConditions `protobuf:"bytes,5,opt,name=object_conditions,json=objectConditions" json:"object_conditions,omitempty"`
+	ObjectConditions *ObjectConditions `protobuf:"bytes,5,opt,name=object_conditions,json=objectConditions,proto3" json:"object_conditions,omitempty"`
 	// If the option `deleteObjectsUniqueInSink` is `true`, object conditions
 	// based on objects' `lastModificationTime` are ignored and do not exclude
 	// objects in a data source or a data sink.
-	TransferOptions *TransferOptions `protobuf:"bytes,6,opt,name=transfer_options,json=transferOptions" json:"transfer_options,omitempty"`
+	TransferOptions      *TransferOptions `protobuf:"bytes,6,opt,name=transfer_options,json=transferOptions,proto3" json:"transfer_options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *TransferSpec) Reset()         { *m = TransferSpec{} }
+func (m *TransferSpec) String() string { return proto.CompactTextString(m) }
+func (*TransferSpec) ProtoMessage()    {}
+func (*TransferSpec) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{7}
+}
+func (m *TransferSpec) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferSpec.Unmarshal(m, b)
+}
+func (m *TransferSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferSpec.Marshal(b, m, deterministic)
+}
+func (dst *TransferSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferSpec.Merge(dst, src)
+}
+func (m *TransferSpec) XXX_Size() int {
+	return xxx_messageInfo_TransferSpec.Size(m)
+}
+func (m *TransferSpec) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferSpec.DiscardUnknown(m)
 }
 
-func (m *TransferSpec) Reset()                    { *m = TransferSpec{} }
-func (m *TransferSpec) String() string            { return proto.CompactTextString(m) }
-func (*TransferSpec) ProtoMessage()               {}
-func (*TransferSpec) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_TransferSpec proto.InternalMessageInfo
 
 type isTransferSpec_DataSource interface {
 	isTransferSpec_DataSource()
 }
-type isTransferSpec_DataSink interface {
-	isTransferSpec_DataSink()
-}
 
 type TransferSpec_GcsDataSource struct {
-	GcsDataSource *GcsData `protobuf:"bytes,1,opt,name=gcs_data_source,json=gcsDataSource,oneof"`
+	GcsDataSource *GcsData `protobuf:"bytes,1,opt,name=gcs_data_source,json=gcsDataSource,proto3,oneof"`
 }
+
 type TransferSpec_AwsS3DataSource struct {
-	AwsS3DataSource *AwsS3Data `protobuf:"bytes,2,opt,name=aws_s3_data_source,json=awsS3DataSource,oneof"`
+	AwsS3DataSource *AwsS3Data `protobuf:"bytes,2,opt,name=aws_s3_data_source,json=awsS3DataSource,proto3,oneof"`
 }
+
 type TransferSpec_HttpDataSource struct {
-	HttpDataSource *HttpData `protobuf:"bytes,3,opt,name=http_data_source,json=httpDataSource,oneof"`
-}
-type TransferSpec_GcsDataSink struct {
-	GcsDataSink *GcsData `protobuf:"bytes,4,opt,name=gcs_data_sink,json=gcsDataSink,oneof"`
+	HttpDataSource *HttpData `protobuf:"bytes,3,opt,name=http_data_source,json=httpDataSource,proto3,oneof"`
 }
 
-func (*TransferSpec_GcsDataSource) isTransferSpec_DataSource()   {}
+func (*TransferSpec_GcsDataSource) isTransferSpec_DataSource() {}
+
 func (*TransferSpec_AwsS3DataSource) isTransferSpec_DataSource() {}
-func (*TransferSpec_HttpDataSource) isTransferSpec_DataSource()  {}
-func (*TransferSpec_GcsDataSink) isTransferSpec_DataSink()       {}
+
+func (*TransferSpec_HttpDataSource) isTransferSpec_DataSource() {}
 
 func (m *TransferSpec) GetDataSource() isTransferSpec_DataSource {
 	if m != nil {
@@ -444,12 +627,6 @@ func (m *TransferSpec) GetDataSource() isTransferSpec_DataSource {
 	}
 	return nil
 }
-func (m *TransferSpec) GetDataSink() isTransferSpec_DataSink {
-	if m != nil {
-		return m.DataSink
-	}
-	return nil
-}
 
 func (m *TransferSpec) GetGcsDataSource() *GcsData {
 	if x, ok := m.GetDataSource().(*TransferSpec_GcsDataSource); ok {
@@ -472,6 +649,23 @@ func (m *TransferSpec) GetHttpDataSource() *HttpData {
 	return nil
 }
 
+type isTransferSpec_DataSink interface {
+	isTransferSpec_DataSink()
+}
+
+type TransferSpec_GcsDataSink struct {
+	GcsDataSink *GcsData `protobuf:"bytes,4,opt,name=gcs_data_sink,json=gcsDataSink,proto3,oneof"`
+}
+
+func (*TransferSpec_GcsDataSink) isTransferSpec_DataSink() {}
+
+func (m *TransferSpec) GetDataSink() isTransferSpec_DataSink {
+	if m != nil {
+		return m.DataSink
+	}
+	return nil
+}
+
 func (m *TransferSpec) GetGcsDataSink() *GcsData {
 	if x, ok := m.GetDataSink().(*TransferSpec_GcsDataSink); ok {
 		return x.GcsDataSink
@@ -586,17 +780,17 @@ func _TransferSpec_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.DataSource.(type) {
 	case *TransferSpec_GcsDataSource:
 		s := proto.Size(x.GcsDataSource)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransferSpec_AwsS3DataSource:
 		s := proto.Size(x.AwsS3DataSource)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *TransferSpec_HttpDataSource:
 		s := proto.Size(x.HttpDataSource)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -607,7 +801,7 @@ func _TransferSpec_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.DataSink.(type) {
 	case *TransferSpec_GcsDataSink:
 		s := proto.Size(x.GcsDataSink)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -623,11 +817,11 @@ type Schedule struct {
 	// `scheduleStartDate` is in the past, the transfer will run for the first
 	// time on the following day.
 	// Required.
-	ScheduleStartDate *google_type.Date `protobuf:"bytes,1,opt,name=schedule_start_date,json=scheduleStartDate" json:"schedule_start_date,omitempty"`
+	ScheduleStartDate *date.Date `protobuf:"bytes,1,opt,name=schedule_start_date,json=scheduleStartDate,proto3" json:"schedule_start_date,omitempty"`
 	// The last day the recurring transfer will be run. If `scheduleEndDate`
 	// is the same as `scheduleStartDate`, the transfer will be executed only
 	// once.
-	ScheduleEndDate *google_type.Date `protobuf:"bytes,2,opt,name=schedule_end_date,json=scheduleEndDate" json:"schedule_end_date,omitempty"`
+	ScheduleEndDate *date.Date `protobuf:"bytes,2,opt,name=schedule_end_date,json=scheduleEndDate,proto3" json:"schedule_end_date,omitempty"`
 	// The time in UTC at which the transfer will be scheduled to start in a day.
 	// Transfers may start later than this time. If not specified, recurring and
 	// one-time transfers that are scheduled to run today will run immediately;
@@ -635,29 +829,51 @@ type Schedule struct {
 	// at approximately midnight UTC on that date. Note that when configuring a
 	// transfer with the Cloud Platform Console, the transfer's start time in a
 	// day is specified in your local timezone.
-	StartTimeOfDay *google_type1.TimeOfDay `protobuf:"bytes,3,opt,name=start_time_of_day,json=startTimeOfDay" json:"start_time_of_day,omitempty"`
+	StartTimeOfDay       *timeofday.TimeOfDay `protobuf:"bytes,3,opt,name=start_time_of_day,json=startTimeOfDay,proto3" json:"start_time_of_day,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Schedule) Reset()         { *m = Schedule{} }
+func (m *Schedule) String() string { return proto.CompactTextString(m) }
+func (*Schedule) ProtoMessage()    {}
+func (*Schedule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{8}
+}
+func (m *Schedule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Schedule.Unmarshal(m, b)
+}
+func (m *Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Schedule.Marshal(b, m, deterministic)
+}
+func (dst *Schedule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Schedule.Merge(dst, src)
+}
+func (m *Schedule) XXX_Size() int {
+	return xxx_messageInfo_Schedule.Size(m)
+}
+func (m *Schedule) XXX_DiscardUnknown() {
+	xxx_messageInfo_Schedule.DiscardUnknown(m)
 }
 
-func (m *Schedule) Reset()                    { *m = Schedule{} }
-func (m *Schedule) String() string            { return proto.CompactTextString(m) }
-func (*Schedule) ProtoMessage()               {}
-func (*Schedule) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+var xxx_messageInfo_Schedule proto.InternalMessageInfo
 
-func (m *Schedule) GetScheduleStartDate() *google_type.Date {
+func (m *Schedule) GetScheduleStartDate() *date.Date {
 	if m != nil {
 		return m.ScheduleStartDate
 	}
 	return nil
 }
 
-func (m *Schedule) GetScheduleEndDate() *google_type.Date {
+func (m *Schedule) GetScheduleEndDate() *date.Date {
 	if m != nil {
 		return m.ScheduleEndDate
 	}
 	return nil
 }
 
-func (m *Schedule) GetStartTimeOfDay() *google_type1.TimeOfDay {
+func (m *Schedule) GetStartTimeOfDay() *timeofday.TimeOfDay {
 	if m != nil {
 		return m.StartTimeOfDay
 	}
@@ -671,16 +887,16 @@ type TransferJob struct {
 	// job is created. This field should be left empty in requests to create a new
 	// transfer job; otherwise, the requests result in an `INVALID_ARGUMENT`
 	// error.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A description provided by the user for the job. Its max length is 1024
 	// bytes when Unicode-encoded.
-	Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// The ID of the Google Cloud Platform Console project that owns the job.
-	ProjectId string `protobuf:"bytes,3,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,3,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Transfer specification.
-	TransferSpec *TransferSpec `protobuf:"bytes,4,opt,name=transfer_spec,json=transferSpec" json:"transfer_spec,omitempty"`
+	TransferSpec *TransferSpec `protobuf:"bytes,4,opt,name=transfer_spec,json=transferSpec,proto3" json:"transfer_spec,omitempty"`
 	// Schedule specification.
-	Schedule *Schedule `protobuf:"bytes,5,opt,name=schedule" json:"schedule,omitempty"`
+	Schedule *Schedule `protobuf:"bytes,5,opt,name=schedule,proto3" json:"schedule,omitempty"`
 	// Status of the job. This value MUST be specified for
 	// `CreateTransferJobRequests`.
 	//
@@ -688,19 +904,41 @@ type TransferJob struct {
 	// run. For example, if you change the job status from `ENABLED` to
 	// `DISABLED`, and an operation spawned by the transfer is running, the status
 	// change would not affect the current operation.
-	Status TransferJob_Status `protobuf:"varint,6,opt,name=status,enum=google.storagetransfer.v1.TransferJob_Status" json:"status,omitempty"`
+	Status TransferJob_Status `protobuf:"varint,6,opt,name=status,proto3,enum=google.storagetransfer.v1.TransferJob_Status" json:"status,omitempty"`
 	// This field cannot be changed by user requests.
-	CreationTime *google_protobuf4.Timestamp `protobuf:"bytes,7,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
+	CreationTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"`
 	// This field cannot be changed by user requests.
-	LastModificationTime *google_protobuf4.Timestamp `protobuf:"bytes,8,opt,name=last_modification_time,json=lastModificationTime" json:"last_modification_time,omitempty"`
+	LastModificationTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=last_modification_time,json=lastModificationTime,proto3" json:"last_modification_time,omitempty"`
 	// This field cannot be changed by user requests.
-	DeletionTime *google_protobuf4.Timestamp `protobuf:"bytes,9,opt,name=deletion_time,json=deletionTime" json:"deletion_time,omitempty"`
+	DeletionTime         *timestamp.Timestamp `protobuf:"bytes,9,opt,name=deletion_time,json=deletionTime,proto3" json:"deletion_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *TransferJob) Reset()         { *m = TransferJob{} }
+func (m *TransferJob) String() string { return proto.CompactTextString(m) }
+func (*TransferJob) ProtoMessage()    {}
+func (*TransferJob) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{9}
+}
+func (m *TransferJob) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferJob.Unmarshal(m, b)
+}
+func (m *TransferJob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferJob.Marshal(b, m, deterministic)
+}
+func (dst *TransferJob) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferJob.Merge(dst, src)
+}
+func (m *TransferJob) XXX_Size() int {
+	return xxx_messageInfo_TransferJob.Size(m)
+}
+func (m *TransferJob) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferJob.DiscardUnknown(m)
 }
 
-func (m *TransferJob) Reset()                    { *m = TransferJob{} }
-func (m *TransferJob) String() string            { return proto.CompactTextString(m) }
-func (*TransferJob) ProtoMessage()               {}
-func (*TransferJob) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_TransferJob proto.InternalMessageInfo
 
 func (m *TransferJob) GetName() string {
 	if m != nil {
@@ -744,21 +982,21 @@ func (m *TransferJob) GetStatus() TransferJob_Status {
 	return TransferJob_STATUS_UNSPECIFIED
 }
 
-func (m *TransferJob) GetCreationTime() *google_protobuf4.Timestamp {
+func (m *TransferJob) GetCreationTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CreationTime
 	}
 	return nil
 }
 
-func (m *TransferJob) GetLastModificationTime() *google_protobuf4.Timestamp {
+func (m *TransferJob) GetLastModificationTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.LastModificationTime
 	}
 	return nil
 }
 
-func (m *TransferJob) GetDeletionTime() *google_protobuf4.Timestamp {
+func (m *TransferJob) GetDeletionTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.DeletionTime
 	}
@@ -770,15 +1008,37 @@ type ErrorLogEntry struct {
 	// A URL that refers to the target (a data source, a data sink,
 	// or an object) with which the error is associated.
 	// Required.
-	Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
 	// A list of messages that carry the error details.
-	ErrorDetails []string `protobuf:"bytes,3,rep,name=error_details,json=errorDetails" json:"error_details,omitempty"`
+	ErrorDetails         []string `protobuf:"bytes,3,rep,name=error_details,json=errorDetails,proto3" json:"error_details,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ErrorLogEntry) Reset()                    { *m = ErrorLogEntry{} }
-func (m *ErrorLogEntry) String() string            { return proto.CompactTextString(m) }
-func (*ErrorLogEntry) ProtoMessage()               {}
-func (*ErrorLogEntry) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *ErrorLogEntry) Reset()         { *m = ErrorLogEntry{} }
+func (m *ErrorLogEntry) String() string { return proto.CompactTextString(m) }
+func (*ErrorLogEntry) ProtoMessage()    {}
+func (*ErrorLogEntry) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{10}
+}
+func (m *ErrorLogEntry) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErrorLogEntry.Unmarshal(m, b)
+}
+func (m *ErrorLogEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErrorLogEntry.Marshal(b, m, deterministic)
+}
+func (dst *ErrorLogEntry) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorLogEntry.Merge(dst, src)
+}
+func (m *ErrorLogEntry) XXX_Size() int {
+	return xxx_messageInfo_ErrorLogEntry.Size(m)
+}
+func (m *ErrorLogEntry) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErrorLogEntry.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ErrorLogEntry proto.InternalMessageInfo
 
 func (m *ErrorLogEntry) GetUrl() string {
 	if m != nil {
@@ -798,24 +1058,46 @@ func (m *ErrorLogEntry) GetErrorDetails() []string {
 // entries.
 type ErrorSummary struct {
 	// Required.
-	ErrorCode google_rpc.Code `protobuf:"varint,1,opt,name=error_code,json=errorCode,enum=google.rpc.Code" json:"error_code,omitempty"`
+	ErrorCode code.Code `protobuf:"varint,1,opt,name=error_code,json=errorCode,proto3,enum=google.rpc.Code" json:"error_code,omitempty"`
 	// Count of this type of error.
 	// Required.
-	ErrorCount int64 `protobuf:"varint,2,opt,name=error_count,json=errorCount" json:"error_count,omitempty"`
+	ErrorCount int64 `protobuf:"varint,2,opt,name=error_count,json=errorCount,proto3" json:"error_count,omitempty"`
 	// Error samples.
-	ErrorLogEntries []*ErrorLogEntry `protobuf:"bytes,3,rep,name=error_log_entries,json=errorLogEntries" json:"error_log_entries,omitempty"`
+	ErrorLogEntries      []*ErrorLogEntry `protobuf:"bytes,3,rep,name=error_log_entries,json=errorLogEntries,proto3" json:"error_log_entries,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *ErrorSummary) Reset()         { *m = ErrorSummary{} }
+func (m *ErrorSummary) String() string { return proto.CompactTextString(m) }
+func (*ErrorSummary) ProtoMessage()    {}
+func (*ErrorSummary) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{11}
+}
+func (m *ErrorSummary) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErrorSummary.Unmarshal(m, b)
+}
+func (m *ErrorSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErrorSummary.Marshal(b, m, deterministic)
+}
+func (dst *ErrorSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorSummary.Merge(dst, src)
+}
+func (m *ErrorSummary) XXX_Size() int {
+	return xxx_messageInfo_ErrorSummary.Size(m)
+}
+func (m *ErrorSummary) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErrorSummary.DiscardUnknown(m)
 }
 
-func (m *ErrorSummary) Reset()                    { *m = ErrorSummary{} }
-func (m *ErrorSummary) String() string            { return proto.CompactTextString(m) }
-func (*ErrorSummary) ProtoMessage()               {}
-func (*ErrorSummary) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+var xxx_messageInfo_ErrorSummary proto.InternalMessageInfo
 
-func (m *ErrorSummary) GetErrorCode() google_rpc.Code {
+func (m *ErrorSummary) GetErrorCode() code.Code {
 	if m != nil {
 		return m.ErrorCode
 	}
-	return google_rpc.Code_OK
+	return code.Code_OK
 }
 
 func (m *ErrorSummary) GetErrorCount() int64 {
@@ -837,47 +1119,69 @@ type TransferCounters struct {
 	// Objects found in the data source that are scheduled to be transferred,
 	// excluding any that are filtered based on object conditions or skipped due
 	// to sync.
-	ObjectsFoundFromSource int64 `protobuf:"varint,1,opt,name=objects_found_from_source,json=objectsFoundFromSource" json:"objects_found_from_source,omitempty"`
+	ObjectsFoundFromSource int64 `protobuf:"varint,1,opt,name=objects_found_from_source,json=objectsFoundFromSource,proto3" json:"objects_found_from_source,omitempty"`
 	// Bytes found in the data source that are scheduled to be transferred,
 	// excluding any that are filtered based on object conditions or skipped due
 	// to sync.
-	BytesFoundFromSource int64 `protobuf:"varint,2,opt,name=bytes_found_from_source,json=bytesFoundFromSource" json:"bytes_found_from_source,omitempty"`
+	BytesFoundFromSource int64 `protobuf:"varint,2,opt,name=bytes_found_from_source,json=bytesFoundFromSource,proto3" json:"bytes_found_from_source,omitempty"`
 	// Objects found only in the data sink that are scheduled to be deleted.
-	ObjectsFoundOnlyFromSink int64 `protobuf:"varint,3,opt,name=objects_found_only_from_sink,json=objectsFoundOnlyFromSink" json:"objects_found_only_from_sink,omitempty"`
+	ObjectsFoundOnlyFromSink int64 `protobuf:"varint,3,opt,name=objects_found_only_from_sink,json=objectsFoundOnlyFromSink,proto3" json:"objects_found_only_from_sink,omitempty"`
 	// Bytes found only in the data sink that are scheduled to be deleted.
-	BytesFoundOnlyFromSink int64 `protobuf:"varint,4,opt,name=bytes_found_only_from_sink,json=bytesFoundOnlyFromSink" json:"bytes_found_only_from_sink,omitempty"`
+	BytesFoundOnlyFromSink int64 `protobuf:"varint,4,opt,name=bytes_found_only_from_sink,json=bytesFoundOnlyFromSink,proto3" json:"bytes_found_only_from_sink,omitempty"`
 	// Objects in the data source that are not transferred because they already
 	// exist in the data sink.
-	ObjectsFromSourceSkippedBySync int64 `protobuf:"varint,5,opt,name=objects_from_source_skipped_by_sync,json=objectsFromSourceSkippedBySync" json:"objects_from_source_skipped_by_sync,omitempty"`
+	ObjectsFromSourceSkippedBySync int64 `protobuf:"varint,5,opt,name=objects_from_source_skipped_by_sync,json=objectsFromSourceSkippedBySync,proto3" json:"objects_from_source_skipped_by_sync,omitempty"`
 	// Bytes in the data source that are not transferred because they already
 	// exist in the data sink.
-	BytesFromSourceSkippedBySync int64 `protobuf:"varint,6,opt,name=bytes_from_source_skipped_by_sync,json=bytesFromSourceSkippedBySync" json:"bytes_from_source_skipped_by_sync,omitempty"`
+	BytesFromSourceSkippedBySync int64 `protobuf:"varint,6,opt,name=bytes_from_source_skipped_by_sync,json=bytesFromSourceSkippedBySync,proto3" json:"bytes_from_source_skipped_by_sync,omitempty"`
 	// Objects that are copied to the data sink.
-	ObjectsCopiedToSink int64 `protobuf:"varint,7,opt,name=objects_copied_to_sink,json=objectsCopiedToSink" json:"objects_copied_to_sink,omitempty"`
+	ObjectsCopiedToSink int64 `protobuf:"varint,7,opt,name=objects_copied_to_sink,json=objectsCopiedToSink,proto3" json:"objects_copied_to_sink,omitempty"`
 	// Bytes that are copied to the data sink.
-	BytesCopiedToSink int64 `protobuf:"varint,8,opt,name=bytes_copied_to_sink,json=bytesCopiedToSink" json:"bytes_copied_to_sink,omitempty"`
+	BytesCopiedToSink int64 `protobuf:"varint,8,opt,name=bytes_copied_to_sink,json=bytesCopiedToSink,proto3" json:"bytes_copied_to_sink,omitempty"`
 	// Objects that are deleted from the data source.
-	ObjectsDeletedFromSource int64 `protobuf:"varint,9,opt,name=objects_deleted_from_source,json=objectsDeletedFromSource" json:"objects_deleted_from_source,omitempty"`
+	ObjectsDeletedFromSource int64 `protobuf:"varint,9,opt,name=objects_deleted_from_source,json=objectsDeletedFromSource,proto3" json:"objects_deleted_from_source,omitempty"`
 	// Bytes that are deleted from the data source.
-	BytesDeletedFromSource int64 `protobuf:"varint,10,opt,name=bytes_deleted_from_source,json=bytesDeletedFromSource" json:"bytes_deleted_from_source,omitempty"`
+	BytesDeletedFromSource int64 `protobuf:"varint,10,opt,name=bytes_deleted_from_source,json=bytesDeletedFromSource,proto3" json:"bytes_deleted_from_source,omitempty"`
 	// Objects that are deleted from the data sink.
-	ObjectsDeletedFromSink int64 `protobuf:"varint,11,opt,name=objects_deleted_from_sink,json=objectsDeletedFromSink" json:"objects_deleted_from_sink,omitempty"`
+	ObjectsDeletedFromSink int64 `protobuf:"varint,11,opt,name=objects_deleted_from_sink,json=objectsDeletedFromSink,proto3" json:"objects_deleted_from_sink,omitempty"`
 	// Bytes that are deleted from the data sink.
-	BytesDeletedFromSink int64 `protobuf:"varint,12,opt,name=bytes_deleted_from_sink,json=bytesDeletedFromSink" json:"bytes_deleted_from_sink,omitempty"`
+	BytesDeletedFromSink int64 `protobuf:"varint,12,opt,name=bytes_deleted_from_sink,json=bytesDeletedFromSink,proto3" json:"bytes_deleted_from_sink,omitempty"`
 	// Objects in the data source that failed during the transfer.
-	ObjectsFromSourceFailed int64 `protobuf:"varint,13,opt,name=objects_from_source_failed,json=objectsFromSourceFailed" json:"objects_from_source_failed,omitempty"`
+	ObjectsFromSourceFailed int64 `protobuf:"varint,13,opt,name=objects_from_source_failed,json=objectsFromSourceFailed,proto3" json:"objects_from_source_failed,omitempty"`
 	// Bytes in the data source that failed during the transfer.
-	BytesFromSourceFailed int64 `protobuf:"varint,14,opt,name=bytes_from_source_failed,json=bytesFromSourceFailed" json:"bytes_from_source_failed,omitempty"`
+	BytesFromSourceFailed int64 `protobuf:"varint,14,opt,name=bytes_from_source_failed,json=bytesFromSourceFailed,proto3" json:"bytes_from_source_failed,omitempty"`
 	// Objects that failed to be deleted from the data sink.
-	ObjectsFailedToDeleteFromSink int64 `protobuf:"varint,15,opt,name=objects_failed_to_delete_from_sink,json=objectsFailedToDeleteFromSink" json:"objects_failed_to_delete_from_sink,omitempty"`
+	ObjectsFailedToDeleteFromSink int64 `protobuf:"varint,15,opt,name=objects_failed_to_delete_from_sink,json=objectsFailedToDeleteFromSink,proto3" json:"objects_failed_to_delete_from_sink,omitempty"`
 	// Bytes that failed to be deleted from the data sink.
-	BytesFailedToDeleteFromSink int64 `protobuf:"varint,16,opt,name=bytes_failed_to_delete_from_sink,json=bytesFailedToDeleteFromSink" json:"bytes_failed_to_delete_from_sink,omitempty"`
+	BytesFailedToDeleteFromSink int64    `protobuf:"varint,16,opt,name=bytes_failed_to_delete_from_sink,json=bytesFailedToDeleteFromSink,proto3" json:"bytes_failed_to_delete_from_sink,omitempty"`
+	XXX_NoUnkeyedLiteral        struct{} `json:"-"`
+	XXX_unrecognized            []byte   `json:"-"`
+	XXX_sizecache               int32    `json:"-"`
 }
 
-func (m *TransferCounters) Reset()                    { *m = TransferCounters{} }
-func (m *TransferCounters) String() string            { return proto.CompactTextString(m) }
-func (*TransferCounters) ProtoMessage()               {}
-func (*TransferCounters) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+func (m *TransferCounters) Reset()         { *m = TransferCounters{} }
+func (m *TransferCounters) String() string { return proto.CompactTextString(m) }
+func (*TransferCounters) ProtoMessage()    {}
+func (*TransferCounters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{12}
+}
+func (m *TransferCounters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferCounters.Unmarshal(m, b)
+}
+func (m *TransferCounters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferCounters.Marshal(b, m, deterministic)
+}
+func (dst *TransferCounters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferCounters.Merge(dst, src)
+}
+func (m *TransferCounters) XXX_Size() int {
+	return xxx_messageInfo_TransferCounters.Size(m)
+}
+func (m *TransferCounters) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferCounters.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TransferCounters proto.InternalMessageInfo
 
 func (m *TransferCounters) GetObjectsFoundFromSource() int64 {
 	if m != nil {
@@ -994,31 +1298,53 @@ func (m *TransferCounters) GetBytesFailedToDeleteFromSink() int64 {
 // A description of the execution of a transfer.
 type TransferOperation struct {
 	// A globally unique ID assigned by the system.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The ID of the Google Cloud Platform Console project that owns the operation.
 	// Required.
-	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId" json:"project_id,omitempty"`
+	ProjectId string `protobuf:"bytes,2,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
 	// Transfer specification.
 	// Required.
-	TransferSpec *TransferSpec `protobuf:"bytes,3,opt,name=transfer_spec,json=transferSpec" json:"transfer_spec,omitempty"`
+	TransferSpec *TransferSpec `protobuf:"bytes,3,opt,name=transfer_spec,json=transferSpec,proto3" json:"transfer_spec,omitempty"`
 	// Start time of this transfer execution.
-	StartTime *google_protobuf4.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime" json:"start_time,omitempty"`
+	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of this transfer execution.
-	EndTime *google_protobuf4.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime" json:"end_time,omitempty"`
+	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Status of the transfer operation.
-	Status TransferOperation_Status `protobuf:"varint,6,opt,name=status,enum=google.storagetransfer.v1.TransferOperation_Status" json:"status,omitempty"`
+	Status TransferOperation_Status `protobuf:"varint,6,opt,name=status,proto3,enum=google.storagetransfer.v1.TransferOperation_Status" json:"status,omitempty"`
 	// Information about the progress of the transfer operation.
-	Counters *TransferCounters `protobuf:"bytes,7,opt,name=counters" json:"counters,omitempty"`
+	Counters *TransferCounters `protobuf:"bytes,7,opt,name=counters,proto3" json:"counters,omitempty"`
 	// Summarizes errors encountered with sample error log entries.
-	ErrorBreakdowns []*ErrorSummary `protobuf:"bytes,8,rep,name=error_breakdowns,json=errorBreakdowns" json:"error_breakdowns,omitempty"`
+	ErrorBreakdowns []*ErrorSummary `protobuf:"bytes,8,rep,name=error_breakdowns,json=errorBreakdowns,proto3" json:"error_breakdowns,omitempty"`
 	// The name of the transfer job that triggers this transfer operation.
-	TransferJobName string `protobuf:"bytes,9,opt,name=transfer_job_name,json=transferJobName" json:"transfer_job_name,omitempty"`
+	TransferJobName      string   `protobuf:"bytes,9,opt,name=transfer_job_name,json=transferJobName,proto3" json:"transfer_job_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TransferOperation) Reset()         { *m = TransferOperation{} }
+func (m *TransferOperation) String() string { return proto.CompactTextString(m) }
+func (*TransferOperation) ProtoMessage()    {}
+func (*TransferOperation) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transfer_types_86dab7ad4ac5c425, []int{13}
+}
+func (m *TransferOperation) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TransferOperation.Unmarshal(m, b)
+}
+func (m *TransferOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TransferOperation.Marshal(b, m, deterministic)
+}
+func (dst *TransferOperation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TransferOperation.Merge(dst, src)
+}
+func (m *TransferOperation) XXX_Size() int {
+	return xxx_messageInfo_TransferOperation.Size(m)
+}
+func (m *TransferOperation) XXX_DiscardUnknown() {
+	xxx_messageInfo_TransferOperation.DiscardUnknown(m)
 }
 
-func (m *TransferOperation) Reset()                    { *m = TransferOperation{} }
-func (m *TransferOperation) String() string            { return proto.CompactTextString(m) }
-func (*TransferOperation) ProtoMessage()               {}
-func (*TransferOperation) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{13} }
+var xxx_messageInfo_TransferOperation proto.InternalMessageInfo
 
 func (m *TransferOperation) GetName() string {
 	if m != nil {
@@ -1041,14 +1367,14 @@ func (m *TransferOperation) GetTransferSpec() *TransferSpec {
 	return nil
 }
 
-func (m *TransferOperation) GetStartTime() *google_protobuf4.Timestamp {
+func (m *TransferOperation) GetStartTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.StartTime
 	}
 	return nil
 }
 
-func (m *TransferOperation) GetEndTime() *google_protobuf4.Timestamp {
+func (m *TransferOperation) GetEndTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.EndTime
 	}
@@ -1102,9 +1428,11 @@ func init() {
 	proto.RegisterEnum("google.storagetransfer.v1.TransferOperation_Status", TransferOperation_Status_name, TransferOperation_Status_value)
 }
 
-func init() { proto.RegisterFile("google/storagetransfer/v1/transfer_types.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/storagetransfer/v1/transfer_types.proto", fileDescriptor_transfer_types_86dab7ad4ac5c425)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_transfer_types_86dab7ad4ac5c425 = []byte{
 	// 1767 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x6e, 0xdb, 0xc8,
 	0x15, 0x8e, 0x24, 0xc7, 0x96, 0x8e, 0x24, 0x4b, 0x9e, 0xcd, 0x7a, 0x65, 0x27, 0xd9, 0xa4, 0xf4,
diff --git a/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/resources.pb.go b/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/resources.pb.go
index a92e9eac..933fd59d 100644
--- a/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/resources.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/resources.pb.go
@@ -1,44 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/resources.proto
 
-/*
-Package publish is a generated protocol buffer package.
-
-It is generated from these files:
-	google/streetview/publish/v1/resources.proto
-	google/streetview/publish/v1/rpcmessages.proto
-	google/streetview/publish/v1/streetview_publish.proto
-
-It has these top-level messages:
-	UploadRef
-	PhotoId
-	Level
-	Pose
-	Place
-	Connection
-	Photo
-	CreatePhotoRequest
-	GetPhotoRequest
-	BatchGetPhotosRequest
-	BatchGetPhotosResponse
-	PhotoResponse
-	ListPhotosRequest
-	ListPhotosResponse
-	UpdatePhotoRequest
-	BatchUpdatePhotosRequest
-	BatchUpdatePhotosResponse
-	DeletePhotoRequest
-	BatchDeletePhotosRequest
-	BatchDeletePhotosResponse
-*/
-package publish
+package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
-import google_type "google.golang.org/genproto/googleapis/type/latlng"
+import latlng "google.golang.org/genproto/googleapis/type/latlng"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -56,13 +26,35 @@ type UploadRef struct {
 	// Required. An upload reference should be unique for each user. It follows
 	// the form:
 	// "https://streetviewpublish.googleapis.com/media/user/<account_id>/photo/<upload_reference>"
-	UploadUrl string `protobuf:"bytes,1,opt,name=upload_url,json=uploadUrl" json:"upload_url,omitempty"`
+	UploadUrl            string   `protobuf:"bytes,1,opt,name=upload_url,json=uploadUrl,proto3" json:"upload_url,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UploadRef) Reset()                    { *m = UploadRef{} }
-func (m *UploadRef) String() string            { return proto.CompactTextString(m) }
-func (*UploadRef) ProtoMessage()               {}
-func (*UploadRef) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *UploadRef) Reset()         { *m = UploadRef{} }
+func (m *UploadRef) String() string { return proto.CompactTextString(m) }
+func (*UploadRef) ProtoMessage()    {}
+func (*UploadRef) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8db553b896211977, []int{0}
+}
+func (m *UploadRef) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UploadRef.Unmarshal(m, b)
+}
+func (m *UploadRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UploadRef.Marshal(b, m, deterministic)
+}
+func (dst *UploadRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UploadRef.Merge(dst, src)
+}
+func (m *UploadRef) XXX_Size() int {
+	return xxx_messageInfo_UploadRef.Size(m)
+}
+func (m *UploadRef) XXX_DiscardUnknown() {
+	xxx_messageInfo_UploadRef.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UploadRef proto.InternalMessageInfo
 
 func (m *UploadRef) GetUploadUrl() string {
 	if m != nil {
@@ -74,13 +66,35 @@ func (m *UploadRef) GetUploadUrl() string {
 // Identifier for a photo.
 type PhotoId struct {
 	// Required. A base64 encoded identifier.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Id                   string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PhotoId) Reset()         { *m = PhotoId{} }
+func (m *PhotoId) String() string { return proto.CompactTextString(m) }
+func (*PhotoId) ProtoMessage()    {}
+func (*PhotoId) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8db553b896211977, []int{1}
+}
+func (m *PhotoId) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PhotoId.Unmarshal(m, b)
+}
+func (m *PhotoId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PhotoId.Marshal(b, m, deterministic)
+}
+func (dst *PhotoId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PhotoId.Merge(dst, src)
+}
+func (m *PhotoId) XXX_Size() int {
+	return xxx_messageInfo_PhotoId.Size(m)
+}
+func (m *PhotoId) XXX_DiscardUnknown() {
+	xxx_messageInfo_PhotoId.DiscardUnknown(m)
 }
 
-func (m *PhotoId) Reset()                    { *m = PhotoId{} }
-func (m *PhotoId) String() string            { return proto.CompactTextString(m) }
-func (*PhotoId) ProtoMessage()               {}
-func (*PhotoId) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_PhotoId proto.InternalMessageInfo
 
 func (m *PhotoId) GetId() string {
 	if m != nil {
@@ -94,17 +108,39 @@ type Level struct {
 	// Floor number, used for ordering. 0 indicates the ground level, 1 indicates
 	// the first level above ground level, -1 indicates the first level under
 	// ground level. Non-integer values are OK.
-	Number float64 `protobuf:"fixed64,1,opt,name=number" json:"number,omitempty"`
+	Number float64 `protobuf:"fixed64,1,opt,name=number,proto3" json:"number,omitempty"`
 	// Required. A name assigned to this Level, restricted to 3 characters.
 	// Consider how the elevator buttons would be labeled for this level if there
 	// was an elevator.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Level) Reset()                    { *m = Level{} }
-func (m *Level) String() string            { return proto.CompactTextString(m) }
-func (*Level) ProtoMessage()               {}
-func (*Level) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Level) Reset()         { *m = Level{} }
+func (m *Level) String() string { return proto.CompactTextString(m) }
+func (*Level) ProtoMessage()    {}
+func (*Level) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8db553b896211977, []int{2}
+}
+func (m *Level) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Level.Unmarshal(m, b)
+}
+func (m *Level) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Level.Marshal(b, m, deterministic)
+}
+func (dst *Level) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Level.Merge(dst, src)
+}
+func (m *Level) XXX_Size() int {
+	return xxx_messageInfo_Level.Size(m)
+}
+func (m *Level) XXX_DiscardUnknown() {
+	xxx_messageInfo_Level.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Level proto.InternalMessageInfo
 
 func (m *Level) GetNumber() float64 {
 	if m != nil {
@@ -128,33 +164,55 @@ type Pose struct {
 	// here, the geolocation from the exif header will be used.
 	// If the latitude and longitude pair is not provided and cannot be found in
 	// the exif header, the create photo process will fail.
-	LatLngPair *google_type.LatLng `protobuf:"bytes,1,opt,name=lat_lng_pair,json=latLngPair" json:"lat_lng_pair,omitempty"`
+	LatLngPair *latlng.LatLng `protobuf:"bytes,1,opt,name=lat_lng_pair,json=latLngPair,proto3" json:"lat_lng_pair,omitempty"`
 	// Altitude of the pose in meters above ground level (as defined by WGS84).
 	// NaN indicates an unmeasured quantity.
-	Altitude float64 `protobuf:"fixed64,2,opt,name=altitude" json:"altitude,omitempty"`
+	Altitude float64 `protobuf:"fixed64,2,opt,name=altitude,proto3" json:"altitude,omitempty"`
 	// Compass heading, measured at the center of the photo in degrees clockwise
 	// from North. Value must be >=0 and <360.
 	// NaN indicates an unmeasured quantity.
-	Heading float64 `protobuf:"fixed64,3,opt,name=heading" json:"heading,omitempty"`
+	Heading float64 `protobuf:"fixed64,3,opt,name=heading,proto3" json:"heading,omitempty"`
 	// Pitch, measured at the center of the photo in degrees. Value must be >=-90
 	// and <= 90. A value of -90 means looking directly down, and a value of 90
 	// means looking directly up.
 	// NaN indicates an unmeasured quantity.
-	Pitch float64 `protobuf:"fixed64,4,opt,name=pitch" json:"pitch,omitempty"`
+	Pitch float64 `protobuf:"fixed64,4,opt,name=pitch,proto3" json:"pitch,omitempty"`
 	// Roll, measured in degrees. Value must be >= 0 and <360. A value of 0
 	// means level with the horizon.
 	// NaN indicates an unmeasured quantity.
-	Roll float64 `protobuf:"fixed64,5,opt,name=roll" json:"roll,omitempty"`
+	Roll float64 `protobuf:"fixed64,5,opt,name=roll,proto3" json:"roll,omitempty"`
 	// Level (the floor in a building) used to configure vertical navigation.
-	Level *Level `protobuf:"bytes,7,opt,name=level" json:"level,omitempty"`
+	Level                *Level   `protobuf:"bytes,7,opt,name=level,proto3" json:"level,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Pose) Reset()                    { *m = Pose{} }
-func (m *Pose) String() string            { return proto.CompactTextString(m) }
-func (*Pose) ProtoMessage()               {}
-func (*Pose) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (m *Pose) Reset()         { *m = Pose{} }
+func (m *Pose) String() string { return proto.CompactTextString(m) }
+func (*Pose) ProtoMessage()    {}
+func (*Pose) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8db553b896211977, []int{3}
+}
+func (m *Pose) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Pose.Unmarshal(m, b)
+}
+func (m *Pose) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Pose.Marshal(b, m, deterministic)
+}
+func (dst *Pose) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Pose.Merge(dst, src)
+}
+func (m *Pose) XXX_Size() int {
+	return xxx_messageInfo_Pose.Size(m)
+}
+func (m *Pose) XXX_DiscardUnknown() {
+	xxx_messageInfo_Pose.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Pose proto.InternalMessageInfo
 
-func (m *Pose) GetLatLngPair() *google_type.LatLng {
+func (m *Pose) GetLatLngPair() *latlng.LatLng {
 	if m != nil {
 		return m.LatLngPair
 	}
@@ -200,13 +258,35 @@ func (m *Pose) GetLevel() *Level {
 type Place struct {
 	// Required. Place identifier, as described in
 	// https://developers.google.com/places/place-id.
-	PlaceId string `protobuf:"bytes,1,opt,name=place_id,json=placeId" json:"place_id,omitempty"`
+	PlaceId              string   `protobuf:"bytes,1,opt,name=place_id,json=placeId,proto3" json:"place_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Place) Reset()                    { *m = Place{} }
-func (m *Place) String() string            { return proto.CompactTextString(m) }
-func (*Place) ProtoMessage()               {}
-func (*Place) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *Place) Reset()         { *m = Place{} }
+func (m *Place) String() string { return proto.CompactTextString(m) }
+func (*Place) ProtoMessage()    {}
+func (*Place) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8db553b896211977, []int{4}
+}
+func (m *Place) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Place.Unmarshal(m, b)
+}
+func (m *Place) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Place.Marshal(b, m, deterministic)
+}
+func (dst *Place) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Place.Merge(dst, src)
+}
+func (m *Place) XXX_Size() int {
+	return xxx_messageInfo_Place.Size(m)
+}
+func (m *Place) XXX_DiscardUnknown() {
+	xxx_messageInfo_Place.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Place proto.InternalMessageInfo
 
 func (m *Place) GetPlaceId() string {
 	if m != nil {
@@ -219,13 +299,35 @@ func (m *Place) GetPlaceId() string {
 type Connection struct {
 	// Required. The destination of the connection from the containing photo to
 	// another photo.
-	Target *PhotoId `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"`
+	Target               *PhotoId `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Connection) Reset()                    { *m = Connection{} }
-func (m *Connection) String() string            { return proto.CompactTextString(m) }
-func (*Connection) ProtoMessage()               {}
-func (*Connection) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *Connection) Reset()         { *m = Connection{} }
+func (m *Connection) String() string { return proto.CompactTextString(m) }
+func (*Connection) ProtoMessage()    {}
+func (*Connection) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8db553b896211977, []int{5}
+}
+func (m *Connection) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Connection.Unmarshal(m, b)
+}
+func (m *Connection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Connection.Marshal(b, m, deterministic)
+}
+func (dst *Connection) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Connection.Merge(dst, src)
+}
+func (m *Connection) XXX_Size() int {
+	return xxx_messageInfo_Connection.Size(m)
+}
+func (m *Connection) XXX_DiscardUnknown() {
+	xxx_messageInfo_Connection.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Connection proto.InternalMessageInfo
 
 func (m *Connection) GetTarget() *PhotoId {
 	if m != nil {
@@ -238,37 +340,59 @@ func (m *Connection) GetTarget() *PhotoId {
 type Photo struct {
 	// Output only. Identifier for the photo, which is unique among all photos in
 	// Google.
-	PhotoId *PhotoId `protobuf:"bytes,1,opt,name=photo_id,json=photoId" json:"photo_id,omitempty"`
+	PhotoId *PhotoId `protobuf:"bytes,1,opt,name=photo_id,json=photoId,proto3" json:"photo_id,omitempty"`
 	// Required (when creating photo). Input only. The resource URL where the
 	// photo bytes are uploaded to.
-	UploadReference *UploadRef `protobuf:"bytes,2,opt,name=upload_reference,json=uploadReference" json:"upload_reference,omitempty"`
+	UploadReference *UploadRef `protobuf:"bytes,2,opt,name=upload_reference,json=uploadReference,proto3" json:"upload_reference,omitempty"`
 	// Output only. The download URL for the photo bytes. This field is set only
 	// when the `view` parameter in a `GetPhotoRequest` is set to
 	// `INCLUDE_DOWNLOAD_URL`.
-	DownloadUrl string `protobuf:"bytes,3,opt,name=download_url,json=downloadUrl" json:"download_url,omitempty"`
+	DownloadUrl string `protobuf:"bytes,3,opt,name=download_url,json=downloadUrl,proto3" json:"download_url,omitempty"`
 	// Output only. The thumbnail URL for showing a preview of the given photo.
-	ThumbnailUrl string `protobuf:"bytes,9,opt,name=thumbnail_url,json=thumbnailUrl" json:"thumbnail_url,omitempty"`
+	ThumbnailUrl string `protobuf:"bytes,9,opt,name=thumbnail_url,json=thumbnailUrl,proto3" json:"thumbnail_url,omitempty"`
 	// Output only. The share link for the photo.
-	ShareLink string `protobuf:"bytes,11,opt,name=share_link,json=shareLink" json:"share_link,omitempty"`
+	ShareLink string `protobuf:"bytes,11,opt,name=share_link,json=shareLink,proto3" json:"share_link,omitempty"`
 	// Pose of the photo.
-	Pose *Pose `protobuf:"bytes,4,opt,name=pose" json:"pose,omitempty"`
+	Pose *Pose `protobuf:"bytes,4,opt,name=pose,proto3" json:"pose,omitempty"`
 	// Connections to other photos. A connection represents the link from this
 	// photo to another photo.
-	Connections []*Connection `protobuf:"bytes,5,rep,name=connections" json:"connections,omitempty"`
+	Connections []*Connection `protobuf:"bytes,5,rep,name=connections,proto3" json:"connections,omitempty"`
 	// Absolute time when the photo was captured.
 	// When the photo has no exif timestamp, this is used to set a timestamp in
 	// the photo metadata.
-	CaptureTime *google_protobuf1.Timestamp `protobuf:"bytes,6,opt,name=capture_time,json=captureTime" json:"capture_time,omitempty"`
+	CaptureTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=capture_time,json=captureTime,proto3" json:"capture_time,omitempty"`
 	// Places where this photo belongs.
-	Places []*Place `protobuf:"bytes,7,rep,name=places" json:"places,omitempty"`
+	Places []*Place `protobuf:"bytes,7,rep,name=places,proto3" json:"places,omitempty"`
 	// Output only. View count of the photo.
-	ViewCount int64 `protobuf:"varint,10,opt,name=view_count,json=viewCount" json:"view_count,omitempty"`
+	ViewCount            int64    `protobuf:"varint,10,opt,name=view_count,json=viewCount,proto3" json:"view_count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Photo) Reset()         { *m = Photo{} }
+func (m *Photo) String() string { return proto.CompactTextString(m) }
+func (*Photo) ProtoMessage()    {}
+func (*Photo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_resources_8db553b896211977, []int{6}
+}
+func (m *Photo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Photo.Unmarshal(m, b)
+}
+func (m *Photo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Photo.Marshal(b, m, deterministic)
+}
+func (dst *Photo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Photo.Merge(dst, src)
+}
+func (m *Photo) XXX_Size() int {
+	return xxx_messageInfo_Photo.Size(m)
+}
+func (m *Photo) XXX_DiscardUnknown() {
+	xxx_messageInfo_Photo.DiscardUnknown(m)
 }
 
-func (m *Photo) Reset()                    { *m = Photo{} }
-func (m *Photo) String() string            { return proto.CompactTextString(m) }
-func (*Photo) ProtoMessage()               {}
-func (*Photo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_Photo proto.InternalMessageInfo
 
 func (m *Photo) GetPhotoId() *PhotoId {
 	if m != nil {
@@ -319,7 +443,7 @@ func (m *Photo) GetConnections() []*Connection {
 	return nil
 }
 
-func (m *Photo) GetCaptureTime() *google_protobuf1.Timestamp {
+func (m *Photo) GetCaptureTime() *timestamp.Timestamp {
 	if m != nil {
 		return m.CaptureTime
 	}
@@ -350,9 +474,11 @@ func init() {
 	proto.RegisterType((*Photo)(nil), "google.streetview.publish.v1.Photo")
 }
 
-func init() { proto.RegisterFile("google/streetview/publish/v1/resources.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/streetview/publish/v1/resources.proto", fileDescriptor_resources_8db553b896211977)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_resources_8db553b896211977 = []byte{
 	// 651 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdb, 0x6a, 0xdb, 0x4c,
 	0x10, 0xc6, 0xf1, 0x29, 0x1e, 0xf9, 0x3f, 0xb0, 0xff, 0x4f, 0x51, 0x4c, 0x43, 0x53, 0x85, 0x52,
diff --git a/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/rpcmessages.pb.go b/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/rpcmessages.pb.go
index 4a96824f..f3a330d1 100644
--- a/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/rpcmessages.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/rpcmessages.pb.go
@@ -1,19 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/rpcmessages.proto
 
-package publish
+package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf2 "google.golang.org/genproto/protobuf/field_mask"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
+import status "google.golang.org/genproto/googleapis/rpc/status"
+import field_mask "google.golang.org/genproto/protobuf/field_mask"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Specifies which view of the `Photo` should be included in the response.
 type PhotoView int32
 
@@ -37,18 +43,42 @@ var PhotoView_value = map[string]int32{
 func (x PhotoView) String() string {
 	return proto.EnumName(PhotoView_name, int32(x))
 }
-func (PhotoView) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (PhotoView) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{0}
+}
 
 // Request to create a photo.
 type CreatePhotoRequest struct {
 	// Required. Photo to create.
-	Photo *Photo `protobuf:"bytes,1,opt,name=photo" json:"photo,omitempty"`
+	Photo                *Photo   `protobuf:"bytes,1,opt,name=photo,proto3" json:"photo,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CreatePhotoRequest) Reset()         { *m = CreatePhotoRequest{} }
+func (m *CreatePhotoRequest) String() string { return proto.CompactTextString(m) }
+func (*CreatePhotoRequest) ProtoMessage()    {}
+func (*CreatePhotoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{0}
+}
+func (m *CreatePhotoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CreatePhotoRequest.Unmarshal(m, b)
+}
+func (m *CreatePhotoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CreatePhotoRequest.Marshal(b, m, deterministic)
+}
+func (dst *CreatePhotoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CreatePhotoRequest.Merge(dst, src)
+}
+func (m *CreatePhotoRequest) XXX_Size() int {
+	return xxx_messageInfo_CreatePhotoRequest.Size(m)
+}
+func (m *CreatePhotoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CreatePhotoRequest.DiscardUnknown(m)
 }
 
-func (m *CreatePhotoRequest) Reset()                    { *m = CreatePhotoRequest{} }
-func (m *CreatePhotoRequest) String() string            { return proto.CompactTextString(m) }
-func (*CreatePhotoRequest) ProtoMessage()               {}
-func (*CreatePhotoRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_CreatePhotoRequest proto.InternalMessageInfo
 
 func (m *CreatePhotoRequest) GetPhoto() *Photo {
 	if m != nil {
@@ -66,16 +96,38 @@ func (m *CreatePhotoRequest) GetPhoto() *Photo {
 // - 'view' controls if the download URL for the photo bytes will be returned.
 type GetPhotoRequest struct {
 	// Required. ID of the photo.
-	PhotoId string `protobuf:"bytes,1,opt,name=photo_id,json=photoId" json:"photo_id,omitempty"`
+	PhotoId string `protobuf:"bytes,1,opt,name=photo_id,json=photoId,proto3" json:"photo_id,omitempty"`
 	// Specifies if a download URL for the photo bytes should be returned in the
 	// Photo response.
-	View PhotoView `protobuf:"varint,2,opt,name=view,enum=google.streetview.publish.v1.PhotoView" json:"view,omitempty"`
+	View                 PhotoView `protobuf:"varint,2,opt,name=view,proto3,enum=google.streetview.publish.v1.PhotoView" json:"view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *GetPhotoRequest) Reset()         { *m = GetPhotoRequest{} }
+func (m *GetPhotoRequest) String() string { return proto.CompactTextString(m) }
+func (*GetPhotoRequest) ProtoMessage()    {}
+func (*GetPhotoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{1}
+}
+func (m *GetPhotoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetPhotoRequest.Unmarshal(m, b)
+}
+func (m *GetPhotoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetPhotoRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetPhotoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetPhotoRequest.Merge(dst, src)
+}
+func (m *GetPhotoRequest) XXX_Size() int {
+	return xxx_messageInfo_GetPhotoRequest.Size(m)
+}
+func (m *GetPhotoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetPhotoRequest.DiscardUnknown(m)
 }
 
-func (m *GetPhotoRequest) Reset()                    { *m = GetPhotoRequest{} }
-func (m *GetPhotoRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetPhotoRequest) ProtoMessage()               {}
-func (*GetPhotoRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+var xxx_messageInfo_GetPhotoRequest proto.InternalMessageInfo
 
 func (m *GetPhotoRequest) GetPhotoId() string {
 	if m != nil {
@@ -99,16 +151,38 @@ func (m *GetPhotoRequest) GetView() PhotoView {
 // - 'view' controls if the download URL for the photo bytes will be returned.
 type BatchGetPhotosRequest struct {
 	// Required. IDs of the photos.
-	PhotoIds []string `protobuf:"bytes,1,rep,name=photo_ids,json=photoIds" json:"photo_ids,omitempty"`
+	PhotoIds []string `protobuf:"bytes,1,rep,name=photo_ids,json=photoIds,proto3" json:"photo_ids,omitempty"`
 	// Specifies if a download URL for the photo bytes should be returned in the
 	// Photo response.
-	View PhotoView `protobuf:"varint,2,opt,name=view,enum=google.streetview.publish.v1.PhotoView" json:"view,omitempty"`
+	View                 PhotoView `protobuf:"varint,2,opt,name=view,proto3,enum=google.streetview.publish.v1.PhotoView" json:"view,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *BatchGetPhotosRequest) Reset()         { *m = BatchGetPhotosRequest{} }
+func (m *BatchGetPhotosRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchGetPhotosRequest) ProtoMessage()    {}
+func (*BatchGetPhotosRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{2}
+}
+func (m *BatchGetPhotosRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchGetPhotosRequest.Unmarshal(m, b)
+}
+func (m *BatchGetPhotosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchGetPhotosRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchGetPhotosRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetPhotosRequest.Merge(dst, src)
+}
+func (m *BatchGetPhotosRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchGetPhotosRequest.Size(m)
+}
+func (m *BatchGetPhotosRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchGetPhotosRequest.DiscardUnknown(m)
 }
 
-func (m *BatchGetPhotosRequest) Reset()                    { *m = BatchGetPhotosRequest{} }
-func (m *BatchGetPhotosRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchGetPhotosRequest) ProtoMessage()               {}
-func (*BatchGetPhotosRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_BatchGetPhotosRequest proto.InternalMessageInfo
 
 func (m *BatchGetPhotosRequest) GetPhotoIds() []string {
 	if m != nil {
@@ -128,13 +202,35 @@ func (m *BatchGetPhotosRequest) GetView() PhotoView {
 type BatchGetPhotosResponse struct {
 	// List of results for each individual photo requested, in the same order as
 	// the request.
-	Results []*PhotoResponse `protobuf:"bytes,1,rep,name=results" json:"results,omitempty"`
+	Results              []*PhotoResponse `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *BatchGetPhotosResponse) Reset()         { *m = BatchGetPhotosResponse{} }
+func (m *BatchGetPhotosResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchGetPhotosResponse) ProtoMessage()    {}
+func (*BatchGetPhotosResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{3}
+}
+func (m *BatchGetPhotosResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchGetPhotosResponse.Unmarshal(m, b)
+}
+func (m *BatchGetPhotosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchGetPhotosResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchGetPhotosResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchGetPhotosResponse.Merge(dst, src)
+}
+func (m *BatchGetPhotosResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchGetPhotosResponse.Size(m)
+}
+func (m *BatchGetPhotosResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchGetPhotosResponse.DiscardUnknown(m)
 }
 
-func (m *BatchGetPhotosResponse) Reset()                    { *m = BatchGetPhotosResponse{} }
-func (m *BatchGetPhotosResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchGetPhotosResponse) ProtoMessage()               {}
-func (*BatchGetPhotosResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_BatchGetPhotosResponse proto.InternalMessageInfo
 
 func (m *BatchGetPhotosResponse) GetResults() []*PhotoResponse {
 	if m != nil {
@@ -148,17 +244,39 @@ func (m *BatchGetPhotosResponse) GetResults() []*PhotoResponse {
 type PhotoResponse struct {
 	// The status for the operation to get or update a single photo in the batch
 	// request.
-	Status *google_rpc.Status `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"`
+	Status *status.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	// The photo resource, if the request was successful.
-	Photo *Photo `protobuf:"bytes,2,opt,name=photo" json:"photo,omitempty"`
+	Photo                *Photo   `protobuf:"bytes,2,opt,name=photo,proto3" json:"photo,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PhotoResponse) Reset()         { *m = PhotoResponse{} }
+func (m *PhotoResponse) String() string { return proto.CompactTextString(m) }
+func (*PhotoResponse) ProtoMessage()    {}
+func (*PhotoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{4}
+}
+func (m *PhotoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PhotoResponse.Unmarshal(m, b)
+}
+func (m *PhotoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PhotoResponse.Marshal(b, m, deterministic)
+}
+func (dst *PhotoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PhotoResponse.Merge(dst, src)
+}
+func (m *PhotoResponse) XXX_Size() int {
+	return xxx_messageInfo_PhotoResponse.Size(m)
+}
+func (m *PhotoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_PhotoResponse.DiscardUnknown(m)
 }
 
-func (m *PhotoResponse) Reset()                    { *m = PhotoResponse{} }
-func (m *PhotoResponse) String() string            { return proto.CompactTextString(m) }
-func (*PhotoResponse) ProtoMessage()               {}
-func (*PhotoResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_PhotoResponse proto.InternalMessageInfo
 
-func (m *PhotoResponse) GetStatus() *google_rpc.Status {
+func (m *PhotoResponse) GetStatus() *status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -185,24 +303,46 @@ func (m *PhotoResponse) GetPhoto() *Photo {
 type ListPhotosRequest struct {
 	// Specifies if a download URL for the photos bytes should be returned in the
 	// Photos response.
-	View PhotoView `protobuf:"varint,1,opt,name=view,enum=google.streetview.publish.v1.PhotoView" json:"view,omitempty"`
+	View PhotoView `protobuf:"varint,1,opt,name=view,proto3,enum=google.streetview.publish.v1.PhotoView" json:"view,omitempty"`
 	// The maximum number of photos to return.
 	// `page_size` must be non-negative. If `page_size` is zero or is not
 	// provided, the default page size of 100 will be used.
 	// The number of photos returned in the response may be less than `page_size`
 	// if the number of photos that belong to the user is less than `page_size`.
-	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize" json:"page_size,omitempty"`
+	PageSize int32 `protobuf:"varint,2,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// The next_page_token value returned from a previous List request, if any.
-	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken" json:"page_token,omitempty"`
+	PageToken string `protobuf:"bytes,3,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// The filter expression.
 	// Example: `placeId=ChIJj61dQgK6j4AR4GeTYWZsKWw`
-	Filter string `protobuf:"bytes,4,opt,name=filter" json:"filter,omitempty"`
+	Filter               string   `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListPhotosRequest) Reset()         { *m = ListPhotosRequest{} }
+func (m *ListPhotosRequest) String() string { return proto.CompactTextString(m) }
+func (*ListPhotosRequest) ProtoMessage()    {}
+func (*ListPhotosRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{5}
+}
+func (m *ListPhotosRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListPhotosRequest.Unmarshal(m, b)
+}
+func (m *ListPhotosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListPhotosRequest.Marshal(b, m, deterministic)
+}
+func (dst *ListPhotosRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPhotosRequest.Merge(dst, src)
+}
+func (m *ListPhotosRequest) XXX_Size() int {
+	return xxx_messageInfo_ListPhotosRequest.Size(m)
+}
+func (m *ListPhotosRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListPhotosRequest.DiscardUnknown(m)
 }
 
-func (m *ListPhotosRequest) Reset()                    { *m = ListPhotosRequest{} }
-func (m *ListPhotosRequest) String() string            { return proto.CompactTextString(m) }
-func (*ListPhotosRequest) ProtoMessage()               {}
-func (*ListPhotosRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_ListPhotosRequest proto.InternalMessageInfo
 
 func (m *ListPhotosRequest) GetView() PhotoView {
 	if m != nil {
@@ -236,16 +376,38 @@ func (m *ListPhotosRequest) GetFilter() string {
 type ListPhotosResponse struct {
 	// List of photos. There will be a maximum number of items returned based on
 	// the page_size field in the request.
-	Photos []*Photo `protobuf:"bytes,1,rep,name=photos" json:"photos,omitempty"`
+	Photos []*Photo `protobuf:"bytes,1,rep,name=photos,proto3" json:"photos,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no
 	// more results in the list.
-	NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken" json:"next_page_token,omitempty"`
+	NextPageToken        string   `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ListPhotosResponse) Reset()                    { *m = ListPhotosResponse{} }
-func (m *ListPhotosResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListPhotosResponse) ProtoMessage()               {}
-func (*ListPhotosResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+func (m *ListPhotosResponse) Reset()         { *m = ListPhotosResponse{} }
+func (m *ListPhotosResponse) String() string { return proto.CompactTextString(m) }
+func (*ListPhotosResponse) ProtoMessage()    {}
+func (*ListPhotosResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{6}
+}
+func (m *ListPhotosResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListPhotosResponse.Unmarshal(m, b)
+}
+func (m *ListPhotosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListPhotosResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListPhotosResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListPhotosResponse.Merge(dst, src)
+}
+func (m *ListPhotosResponse) XXX_Size() int {
+	return xxx_messageInfo_ListPhotosResponse.Size(m)
+}
+func (m *ListPhotosResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListPhotosResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListPhotosResponse proto.InternalMessageInfo
 
 func (m *ListPhotosResponse) GetPhotos() []*Photo {
 	if m != nil {
@@ -269,7 +431,7 @@ type UpdatePhotoRequest struct {
 	// update applies to all fields.
 	// **Note:** To update `pose.altitude`, `pose.latlngpair` has to be filled as
 	// well. Otherwise, the request will fail.
-	Photo *Photo `protobuf:"bytes,1,opt,name=photo" json:"photo,omitempty"`
+	Photo *Photo `protobuf:"bytes,1,opt,name=photo,proto3" json:"photo,omitempty"`
 	// Mask that identifies fields on the photo metadata to update.
 	// If not present, the old Photo metadata will be entirely replaced with the
 	// new Photo metadata in this request. The update fails if invalid fields are
@@ -292,13 +454,35 @@ type UpdatePhotoRequest struct {
 	// `UpdatePhotoRequest.photo.update_mask` contains `connections` and
 	// `UpdatePhotoRequest.photo.connections` is empty, all connections will be
 	// removed.
-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
+	UpdateMask           *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *UpdatePhotoRequest) Reset()         { *m = UpdatePhotoRequest{} }
+func (m *UpdatePhotoRequest) String() string { return proto.CompactTextString(m) }
+func (*UpdatePhotoRequest) ProtoMessage()    {}
+func (*UpdatePhotoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{7}
+}
+func (m *UpdatePhotoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdatePhotoRequest.Unmarshal(m, b)
+}
+func (m *UpdatePhotoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdatePhotoRequest.Marshal(b, m, deterministic)
+}
+func (dst *UpdatePhotoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdatePhotoRequest.Merge(dst, src)
+}
+func (m *UpdatePhotoRequest) XXX_Size() int {
+	return xxx_messageInfo_UpdatePhotoRequest.Size(m)
+}
+func (m *UpdatePhotoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdatePhotoRequest.DiscardUnknown(m)
 }
 
-func (m *UpdatePhotoRequest) Reset()                    { *m = UpdatePhotoRequest{} }
-func (m *UpdatePhotoRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpdatePhotoRequest) ProtoMessage()               {}
-func (*UpdatePhotoRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_UpdatePhotoRequest proto.InternalMessageInfo
 
 func (m *UpdatePhotoRequest) GetPhoto() *Photo {
 	if m != nil {
@@ -307,7 +491,7 @@ func (m *UpdatePhotoRequest) GetPhoto() *Photo {
 	return nil
 }
 
-func (m *UpdatePhotoRequest) GetUpdateMask() *google_protobuf2.FieldMask {
+func (m *UpdatePhotoRequest) GetUpdateMask() *field_mask.FieldMask {
 	if m != nil {
 		return m.UpdateMask
 	}
@@ -318,13 +502,35 @@ func (m *UpdatePhotoRequest) GetUpdateMask() *google_protobuf2.FieldMask {
 // Updating the pixels of photos is not supported.
 type BatchUpdatePhotosRequest struct {
 	// Required. List of update photo requests.
-	UpdatePhotoRequests []*UpdatePhotoRequest `protobuf:"bytes,1,rep,name=update_photo_requests,json=updatePhotoRequests" json:"update_photo_requests,omitempty"`
+	UpdatePhotoRequests  []*UpdatePhotoRequest `protobuf:"bytes,1,rep,name=update_photo_requests,json=updatePhotoRequests,proto3" json:"update_photo_requests,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
+}
+
+func (m *BatchUpdatePhotosRequest) Reset()         { *m = BatchUpdatePhotosRequest{} }
+func (m *BatchUpdatePhotosRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdatePhotosRequest) ProtoMessage()    {}
+func (*BatchUpdatePhotosRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{8}
+}
+func (m *BatchUpdatePhotosRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdatePhotosRequest.Unmarshal(m, b)
+}
+func (m *BatchUpdatePhotosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdatePhotosRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdatePhotosRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdatePhotosRequest.Merge(dst, src)
+}
+func (m *BatchUpdatePhotosRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdatePhotosRequest.Size(m)
+}
+func (m *BatchUpdatePhotosRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdatePhotosRequest.DiscardUnknown(m)
 }
 
-func (m *BatchUpdatePhotosRequest) Reset()                    { *m = BatchUpdatePhotosRequest{} }
-func (m *BatchUpdatePhotosRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdatePhotosRequest) ProtoMessage()               {}
-func (*BatchUpdatePhotosRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+var xxx_messageInfo_BatchUpdatePhotosRequest proto.InternalMessageInfo
 
 func (m *BatchUpdatePhotosRequest) GetUpdatePhotoRequests() []*UpdatePhotoRequest {
 	if m != nil {
@@ -337,13 +543,35 @@ func (m *BatchUpdatePhotosRequest) GetUpdatePhotoRequests() []*UpdatePhotoReques
 type BatchUpdatePhotosResponse struct {
 	// List of results for each individual photo updated, in the same order as
 	// the request.
-	Results []*PhotoResponse `protobuf:"bytes,1,rep,name=results" json:"results,omitempty"`
+	Results              []*PhotoResponse `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *BatchUpdatePhotosResponse) Reset()         { *m = BatchUpdatePhotosResponse{} }
+func (m *BatchUpdatePhotosResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchUpdatePhotosResponse) ProtoMessage()    {}
+func (*BatchUpdatePhotosResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{9}
+}
+func (m *BatchUpdatePhotosResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchUpdatePhotosResponse.Unmarshal(m, b)
+}
+func (m *BatchUpdatePhotosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchUpdatePhotosResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchUpdatePhotosResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchUpdatePhotosResponse.Merge(dst, src)
+}
+func (m *BatchUpdatePhotosResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchUpdatePhotosResponse.Size(m)
+}
+func (m *BatchUpdatePhotosResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchUpdatePhotosResponse.DiscardUnknown(m)
 }
 
-func (m *BatchUpdatePhotosResponse) Reset()                    { *m = BatchUpdatePhotosResponse{} }
-func (m *BatchUpdatePhotosResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchUpdatePhotosResponse) ProtoMessage()               {}
-func (*BatchUpdatePhotosResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_BatchUpdatePhotosResponse proto.InternalMessageInfo
 
 func (m *BatchUpdatePhotosResponse) GetResults() []*PhotoResponse {
 	if m != nil {
@@ -355,13 +583,35 @@ func (m *BatchUpdatePhotosResponse) GetResults() []*PhotoResponse {
 // Request to delete a photo.
 type DeletePhotoRequest struct {
 	// Required. ID of the photo.
-	PhotoId string `protobuf:"bytes,1,opt,name=photo_id,json=photoId" json:"photo_id,omitempty"`
+	PhotoId              string   `protobuf:"bytes,1,opt,name=photo_id,json=photoId,proto3" json:"photo_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeletePhotoRequest) Reset()                    { *m = DeletePhotoRequest{} }
-func (m *DeletePhotoRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeletePhotoRequest) ProtoMessage()               {}
-func (*DeletePhotoRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+func (m *DeletePhotoRequest) Reset()         { *m = DeletePhotoRequest{} }
+func (m *DeletePhotoRequest) String() string { return proto.CompactTextString(m) }
+func (*DeletePhotoRequest) ProtoMessage()    {}
+func (*DeletePhotoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{10}
+}
+func (m *DeletePhotoRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeletePhotoRequest.Unmarshal(m, b)
+}
+func (m *DeletePhotoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeletePhotoRequest.Marshal(b, m, deterministic)
+}
+func (dst *DeletePhotoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeletePhotoRequest.Merge(dst, src)
+}
+func (m *DeletePhotoRequest) XXX_Size() int {
+	return xxx_messageInfo_DeletePhotoRequest.Size(m)
+}
+func (m *DeletePhotoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeletePhotoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeletePhotoRequest proto.InternalMessageInfo
 
 func (m *DeletePhotoRequest) GetPhotoId() string {
 	if m != nil {
@@ -373,13 +623,35 @@ func (m *DeletePhotoRequest) GetPhotoId() string {
 // Request to delete multiple photos.
 type BatchDeletePhotosRequest struct {
 	// Required. List of delete photo requests.
-	PhotoIds []string `protobuf:"bytes,1,rep,name=photo_ids,json=photoIds" json:"photo_ids,omitempty"`
+	PhotoIds             []string `protobuf:"bytes,1,rep,name=photo_ids,json=photoIds,proto3" json:"photo_ids,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *BatchDeletePhotosRequest) Reset()                    { *m = BatchDeletePhotosRequest{} }
-func (m *BatchDeletePhotosRequest) String() string            { return proto.CompactTextString(m) }
-func (*BatchDeletePhotosRequest) ProtoMessage()               {}
-func (*BatchDeletePhotosRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} }
+func (m *BatchDeletePhotosRequest) Reset()         { *m = BatchDeletePhotosRequest{} }
+func (m *BatchDeletePhotosRequest) String() string { return proto.CompactTextString(m) }
+func (*BatchDeletePhotosRequest) ProtoMessage()    {}
+func (*BatchDeletePhotosRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{11}
+}
+func (m *BatchDeletePhotosRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchDeletePhotosRequest.Unmarshal(m, b)
+}
+func (m *BatchDeletePhotosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchDeletePhotosRequest.Marshal(b, m, deterministic)
+}
+func (dst *BatchDeletePhotosRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeletePhotosRequest.Merge(dst, src)
+}
+func (m *BatchDeletePhotosRequest) XXX_Size() int {
+	return xxx_messageInfo_BatchDeletePhotosRequest.Size(m)
+}
+func (m *BatchDeletePhotosRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchDeletePhotosRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchDeletePhotosRequest proto.InternalMessageInfo
 
 func (m *BatchDeletePhotosRequest) GetPhotoIds() []string {
 	if m != nil {
@@ -391,15 +663,37 @@ func (m *BatchDeletePhotosRequest) GetPhotoIds() []string {
 // Response to batch delete of one or more photos.
 type BatchDeletePhotosResponse struct {
 	// The status for the operation to delete a single photo in the batch request.
-	Status []*google_rpc.Status `protobuf:"bytes,1,rep,name=status" json:"status,omitempty"`
+	Status               []*status.Status `protobuf:"bytes,1,rep,name=status,proto3" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
-func (m *BatchDeletePhotosResponse) Reset()                    { *m = BatchDeletePhotosResponse{} }
-func (m *BatchDeletePhotosResponse) String() string            { return proto.CompactTextString(m) }
-func (*BatchDeletePhotosResponse) ProtoMessage()               {}
-func (*BatchDeletePhotosResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{12} }
+func (m *BatchDeletePhotosResponse) Reset()         { *m = BatchDeletePhotosResponse{} }
+func (m *BatchDeletePhotosResponse) String() string { return proto.CompactTextString(m) }
+func (*BatchDeletePhotosResponse) ProtoMessage()    {}
+func (*BatchDeletePhotosResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rpcmessages_f5aa79e45963eccc, []int{12}
+}
+func (m *BatchDeletePhotosResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_BatchDeletePhotosResponse.Unmarshal(m, b)
+}
+func (m *BatchDeletePhotosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_BatchDeletePhotosResponse.Marshal(b, m, deterministic)
+}
+func (dst *BatchDeletePhotosResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_BatchDeletePhotosResponse.Merge(dst, src)
+}
+func (m *BatchDeletePhotosResponse) XXX_Size() int {
+	return xxx_messageInfo_BatchDeletePhotosResponse.Size(m)
+}
+func (m *BatchDeletePhotosResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_BatchDeletePhotosResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BatchDeletePhotosResponse proto.InternalMessageInfo
 
-func (m *BatchDeletePhotosResponse) GetStatus() []*google_rpc.Status {
+func (m *BatchDeletePhotosResponse) GetStatus() []*status.Status {
 	if m != nil {
 		return m.Status
 	}
@@ -423,9 +717,11 @@ func init() {
 	proto.RegisterEnum("google.streetview.publish.v1.PhotoView", PhotoView_name, PhotoView_value)
 }
 
-func init() { proto.RegisterFile("google/streetview/publish/v1/rpcmessages.proto", fileDescriptor1) }
+func init() {
+	proto.RegisterFile("google/streetview/publish/v1/rpcmessages.proto", fileDescriptor_rpcmessages_f5aa79e45963eccc)
+}
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_rpcmessages_f5aa79e45963eccc = []byte{
 	// 639 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcb, 0x6e, 0xd3, 0x40,
 	0x14, 0xc5, 0x7d, 0xa4, 0xcd, 0xad, 0x4a, 0xcb, 0x40, 0x8b, 0x1b, 0x8a, 0x14, 0x19, 0x09, 0xa2,
diff --git a/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/streetview_publish.pb.go b/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/streetview_publish.pb.go
index 63849b68..8ef3084f 100644
--- a/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/streetview_publish.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/streetview/publish/v1/streetview_publish.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/streetview/publish/v1/streetview_publish.proto
 
-package publish
+package publish // import "google.golang.org/genproto/googleapis/streetview/publish/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import empty "github.com/golang/protobuf/ptypes/empty"
 import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/empty"
 
 import (
 	context "golang.org/x/net/context"
@@ -19,6 +19,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -27,8 +33,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for StreetViewPublishService service
-
+// StreetViewPublishServiceClient is the client API for StreetViewPublishService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type StreetViewPublishServiceClient interface {
 	// Creates an upload session to start uploading photo data. The upload URL of
 	// the returned `UploadRef` is used to upload the data for the photo.
@@ -36,7 +43,7 @@ type StreetViewPublishServiceClient interface {
 	// After the upload is complete, the `UploadRef` is used with
 	// `StreetViewPublishService:CreatePhoto()` to create the `Photo` object
 	// entry.
-	StartUpload(ctx context.Context, in *google_protobuf4.Empty, opts ...grpc.CallOption) (*UploadRef, error)
+	StartUpload(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*UploadRef, error)
 	// After the client finishes uploading the photo with the returned
 	// `UploadRef`, `photo.create` publishes the uploaded photo to Street View on
 	// Google Maps.
@@ -92,7 +99,7 @@ type StreetViewPublishServiceClient interface {
 	// * `PERMISSION_DENIED` if the requesting user did not create the requested
 	// photo.
 	// * `NOT_FOUND` if the photo ID does not exist.
-	DeletePhoto(ctx context.Context, in *DeletePhotoRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error)
+	DeletePhoto(ctx context.Context, in *DeletePhotoRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Deletes a list of photos and their metadata.
 	//
 	// Note that if `photos.batchDelete` fails, either critical fields
@@ -112,9 +119,9 @@ func NewStreetViewPublishServiceClient(cc *grpc.ClientConn) StreetViewPublishSer
 	return &streetViewPublishServiceClient{cc}
 }
 
-func (c *streetViewPublishServiceClient) StartUpload(ctx context.Context, in *google_protobuf4.Empty, opts ...grpc.CallOption) (*UploadRef, error) {
+func (c *streetViewPublishServiceClient) StartUpload(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*UploadRef, error) {
 	out := new(UploadRef)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/StartUpload", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/StartUpload", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -123,7 +130,7 @@ func (c *streetViewPublishServiceClient) StartUpload(ctx context.Context, in *go
 
 func (c *streetViewPublishServiceClient) CreatePhoto(ctx context.Context, in *CreatePhotoRequest, opts ...grpc.CallOption) (*Photo, error) {
 	out := new(Photo)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/CreatePhoto", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/CreatePhoto", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -132,7 +139,7 @@ func (c *streetViewPublishServiceClient) CreatePhoto(ctx context.Context, in *Cr
 
 func (c *streetViewPublishServiceClient) GetPhoto(ctx context.Context, in *GetPhotoRequest, opts ...grpc.CallOption) (*Photo, error) {
 	out := new(Photo)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/GetPhoto", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/GetPhoto", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -141,7 +148,7 @@ func (c *streetViewPublishServiceClient) GetPhoto(ctx context.Context, in *GetPh
 
 func (c *streetViewPublishServiceClient) BatchGetPhotos(ctx context.Context, in *BatchGetPhotosRequest, opts ...grpc.CallOption) (*BatchGetPhotosResponse, error) {
 	out := new(BatchGetPhotosResponse)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/BatchGetPhotos", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/BatchGetPhotos", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -150,7 +157,7 @@ func (c *streetViewPublishServiceClient) BatchGetPhotos(ctx context.Context, in
 
 func (c *streetViewPublishServiceClient) ListPhotos(ctx context.Context, in *ListPhotosRequest, opts ...grpc.CallOption) (*ListPhotosResponse, error) {
 	out := new(ListPhotosResponse)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/ListPhotos", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/ListPhotos", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -159,7 +166,7 @@ func (c *streetViewPublishServiceClient) ListPhotos(ctx context.Context, in *Lis
 
 func (c *streetViewPublishServiceClient) UpdatePhoto(ctx context.Context, in *UpdatePhotoRequest, opts ...grpc.CallOption) (*Photo, error) {
 	out := new(Photo)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/UpdatePhoto", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/UpdatePhoto", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -168,16 +175,16 @@ func (c *streetViewPublishServiceClient) UpdatePhoto(ctx context.Context, in *Up
 
 func (c *streetViewPublishServiceClient) BatchUpdatePhotos(ctx context.Context, in *BatchUpdatePhotosRequest, opts ...grpc.CallOption) (*BatchUpdatePhotosResponse, error) {
 	out := new(BatchUpdatePhotosResponse)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/BatchUpdatePhotos", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/BatchUpdatePhotos", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *streetViewPublishServiceClient) DeletePhoto(ctx context.Context, in *DeletePhotoRequest, opts ...grpc.CallOption) (*google_protobuf4.Empty, error) {
-	out := new(google_protobuf4.Empty)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/DeletePhoto", in, out, c.cc, opts...)
+func (c *streetViewPublishServiceClient) DeletePhoto(ctx context.Context, in *DeletePhotoRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/DeletePhoto", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -186,15 +193,14 @@ func (c *streetViewPublishServiceClient) DeletePhoto(ctx context.Context, in *De
 
 func (c *streetViewPublishServiceClient) BatchDeletePhotos(ctx context.Context, in *BatchDeletePhotosRequest, opts ...grpc.CallOption) (*BatchDeletePhotosResponse, error) {
 	out := new(BatchDeletePhotosResponse)
-	err := grpc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/BatchDeletePhotos", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/google.streetview.publish.v1.StreetViewPublishService/BatchDeletePhotos", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for StreetViewPublishService service
-
+// StreetViewPublishServiceServer is the server API for StreetViewPublishService service.
 type StreetViewPublishServiceServer interface {
 	// Creates an upload session to start uploading photo data. The upload URL of
 	// the returned `UploadRef` is used to upload the data for the photo.
@@ -202,7 +208,7 @@ type StreetViewPublishServiceServer interface {
 	// After the upload is complete, the `UploadRef` is used with
 	// `StreetViewPublishService:CreatePhoto()` to create the `Photo` object
 	// entry.
-	StartUpload(context.Context, *google_protobuf4.Empty) (*UploadRef, error)
+	StartUpload(context.Context, *empty.Empty) (*UploadRef, error)
 	// After the client finishes uploading the photo with the returned
 	// `UploadRef`, `photo.create` publishes the uploaded photo to Street View on
 	// Google Maps.
@@ -258,7 +264,7 @@ type StreetViewPublishServiceServer interface {
 	// * `PERMISSION_DENIED` if the requesting user did not create the requested
 	// photo.
 	// * `NOT_FOUND` if the photo ID does not exist.
-	DeletePhoto(context.Context, *DeletePhotoRequest) (*google_protobuf4.Empty, error)
+	DeletePhoto(context.Context, *DeletePhotoRequest) (*empty.Empty, error)
 	// Deletes a list of photos and their metadata.
 	//
 	// Note that if `photos.batchDelete` fails, either critical fields
@@ -275,7 +281,7 @@ func RegisterStreetViewPublishServiceServer(s *grpc.Server, srv StreetViewPublis
 }
 
 func _StreetViewPublishService_StartUpload_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(google_protobuf4.Empty)
+	in := new(empty.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -287,7 +293,7 @@ func _StreetViewPublishService_StartUpload_Handler(srv interface{}, ctx context.
 		FullMethod: "/google.streetview.publish.v1.StreetViewPublishService/StartUpload",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(StreetViewPublishServiceServer).StartUpload(ctx, req.(*google_protobuf4.Empty))
+		return srv.(StreetViewPublishServiceServer).StartUpload(ctx, req.(*empty.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -482,10 +488,10 @@ var _StreetViewPublishService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("google/streetview/publish/v1/streetview_publish.proto", fileDescriptor2)
+	proto.RegisterFile("google/streetview/publish/v1/streetview_publish.proto", fileDescriptor_streetview_publish_6fe4a239917591dc)
 }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_streetview_publish_6fe4a239917591dc = []byte{
 	// 533 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x4f, 0x6f, 0xd3, 0x30,
 	0x18, 0xc6, 0x15, 0x24, 0x10, 0xb8, 0x08, 0x69, 0x86, 0x55, 0x53, 0x3a, 0x24, 0x08, 0x12, 0xa0,
diff --git a/vendor/google.golang.org/genproto/googleapis/tracing/v1/trace.pb.go b/vendor/google.golang.org/genproto/googleapis/tracing/v1/trace.pb.go
deleted file mode 100644
index b2549366..00000000
--- a/vendor/google.golang.org/genproto/googleapis/tracing/v1/trace.pb.go
+++ /dev/null
@@ -1,888 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/tracing/trace.proto
-
-/*
-Package tracing is a generated protocol buffer package.
-
-It is generated from these files:
-	google/tracing/trace.proto
-
-It has these top-level messages:
-	TraceId
-	Module
-	StackTrace
-	LabelValue
-	Span
-	Trace
-*/
-package tracing
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
-import google_rpc "google.golang.org/genproto/googleapis/rpc/status"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-// The type of the network event. SENT or RECV event.
-type Span_TimeEvent_NetworkEvent_Type int32
-
-const (
-	Span_TimeEvent_NetworkEvent_UNSPECIFIED Span_TimeEvent_NetworkEvent_Type = 0
-	Span_TimeEvent_NetworkEvent_SENT        Span_TimeEvent_NetworkEvent_Type = 1
-	Span_TimeEvent_NetworkEvent_RECV        Span_TimeEvent_NetworkEvent_Type = 2
-)
-
-var Span_TimeEvent_NetworkEvent_Type_name = map[int32]string{
-	0: "UNSPECIFIED",
-	1: "SENT",
-	2: "RECV",
-}
-var Span_TimeEvent_NetworkEvent_Type_value = map[string]int32{
-	"UNSPECIFIED": 0,
-	"SENT":        1,
-	"RECV":        2,
-}
-
-func (x Span_TimeEvent_NetworkEvent_Type) String() string {
-	return proto.EnumName(Span_TimeEvent_NetworkEvent_Type_name, int32(x))
-}
-func (Span_TimeEvent_NetworkEvent_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{4, 0, 1, 0}
-}
-
-// The type of the link.
-type Span_Link_Type int32
-
-const (
-	Span_Link_UNSPECIFIED Span_Link_Type = 0
-	Span_Link_CHILD       Span_Link_Type = 1
-	Span_Link_PARENT      Span_Link_Type = 2
-)
-
-var Span_Link_Type_name = map[int32]string{
-	0: "UNSPECIFIED",
-	1: "CHILD",
-	2: "PARENT",
-}
-var Span_Link_Type_value = map[string]int32{
-	"UNSPECIFIED": 0,
-	"CHILD":       1,
-	"PARENT":      2,
-}
-
-func (x Span_Link_Type) String() string {
-	return proto.EnumName(Span_Link_Type_name, int32(x))
-}
-func (Span_Link_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 1, 0} }
-
-// A TraceId uniquely identifies a Trace. It is conceptually a 128-bit value,
-// represented as a string, containing the hex-encoded value.
-type TraceId struct {
-	// Trace ID specified as a hex-encoded string. *Must* be 32 bytes long.
-	HexEncoded string `protobuf:"bytes,1,opt,name=hex_encoded,json=hexEncoded" json:"hex_encoded,omitempty"`
-}
-
-func (m *TraceId) Reset()                    { *m = TraceId{} }
-func (m *TraceId) String() string            { return proto.CompactTextString(m) }
-func (*TraceId) ProtoMessage()               {}
-func (*TraceId) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *TraceId) GetHexEncoded() string {
-	if m != nil {
-		return m.HexEncoded
-	}
-	return ""
-}
-
-type Module struct {
-	// Binary module.
-	// E.g. main binary, kernel modules, and dynamic libraries
-	// such as libc.so, sharedlib.so
-	Module string `protobuf:"bytes,1,opt,name=module" json:"module,omitempty"`
-	// Build_id is a unique identifier for the module,
-	// probably a hash of its contents
-	BuildId string `protobuf:"bytes,2,opt,name=build_id,json=buildId" json:"build_id,omitempty"`
-}
-
-func (m *Module) Reset()                    { *m = Module{} }
-func (m *Module) String() string            { return proto.CompactTextString(m) }
-func (*Module) ProtoMessage()               {}
-func (*Module) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *Module) GetModule() string {
-	if m != nil {
-		return m.Module
-	}
-	return ""
-}
-
-func (m *Module) GetBuildId() string {
-	if m != nil {
-		return m.BuildId
-	}
-	return ""
-}
-
-type StackTrace struct {
-	// Stack frames of this stack trace.
-	StackFrame []*StackTrace_StackFrame `protobuf:"bytes,1,rep,name=stack_frame,json=stackFrame" json:"stack_frame,omitempty"`
-	// User can choose to use his own hash function to hash large labels to save
-	// network bandwidth and storage.
-	// Typical usage is to pass both initially to inform the storage of the
-	// mapping. And in subsequent calls, pass in stack_trace_hash_id only.
-	// User shall verify the hash value is successfully stored.
-	StackTraceHashId uint64 `protobuf:"varint,2,opt,name=stack_trace_hash_id,json=stackTraceHashId" json:"stack_trace_hash_id,omitempty"`
-}
-
-func (m *StackTrace) Reset()                    { *m = StackTrace{} }
-func (m *StackTrace) String() string            { return proto.CompactTextString(m) }
-func (*StackTrace) ProtoMessage()               {}
-func (*StackTrace) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *StackTrace) GetStackFrame() []*StackTrace_StackFrame {
-	if m != nil {
-		return m.StackFrame
-	}
-	return nil
-}
-
-func (m *StackTrace) GetStackTraceHashId() uint64 {
-	if m != nil {
-		return m.StackTraceHashId
-	}
-	return 0
-}
-
-// Presents a single stack frame in a stack trace.
-type StackTrace_StackFrame struct {
-	// Fully qualified names which uniquely identify function/method/etc.
-	FunctionName string `protobuf:"bytes,1,opt,name=function_name,json=functionName" json:"function_name,omitempty"`
-	// Used when function name is ‘mangled’. Not guaranteed to be fully
-	// qualified but usually it is.
-	OrigFunctionName string `protobuf:"bytes,2,opt,name=orig_function_name,json=origFunctionName" json:"orig_function_name,omitempty"`
-	// File name of the frame.
-	FileName string `protobuf:"bytes,3,opt,name=file_name,json=fileName" json:"file_name,omitempty"`
-	// Line number of the frame.
-	LineNumber int64 `protobuf:"varint,4,opt,name=line_number,json=lineNumber" json:"line_number,omitempty"`
-	// Column number is important in JavaScript(anonymous functions),
-	// Might not be available in some languages.
-	ColumnNumber int64 `protobuf:"varint,5,opt,name=column_number,json=columnNumber" json:"column_number,omitempty"`
-	// Binary module the code is loaded from.
-	LoadModule *Module `protobuf:"bytes,6,opt,name=load_module,json=loadModule" json:"load_module,omitempty"`
-	// source_version is deployment specific. It might be
-	// better to be stored in deployment metadata.
-	// However, in distributed tracing, it’s hard to keep track of
-	// source/binary versions at one place for all spans.
-	SourceVersion string `protobuf:"bytes,7,opt,name=source_version,json=sourceVersion" json:"source_version,omitempty"`
-}
-
-func (m *StackTrace_StackFrame) Reset()                    { *m = StackTrace_StackFrame{} }
-func (m *StackTrace_StackFrame) String() string            { return proto.CompactTextString(m) }
-func (*StackTrace_StackFrame) ProtoMessage()               {}
-func (*StackTrace_StackFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-func (m *StackTrace_StackFrame) GetFunctionName() string {
-	if m != nil {
-		return m.FunctionName
-	}
-	return ""
-}
-
-func (m *StackTrace_StackFrame) GetOrigFunctionName() string {
-	if m != nil {
-		return m.OrigFunctionName
-	}
-	return ""
-}
-
-func (m *StackTrace_StackFrame) GetFileName() string {
-	if m != nil {
-		return m.FileName
-	}
-	return ""
-}
-
-func (m *StackTrace_StackFrame) GetLineNumber() int64 {
-	if m != nil {
-		return m.LineNumber
-	}
-	return 0
-}
-
-func (m *StackTrace_StackFrame) GetColumnNumber() int64 {
-	if m != nil {
-		return m.ColumnNumber
-	}
-	return 0
-}
-
-func (m *StackTrace_StackFrame) GetLoadModule() *Module {
-	if m != nil {
-		return m.LoadModule
-	}
-	return nil
-}
-
-func (m *StackTrace_StackFrame) GetSourceVersion() string {
-	if m != nil {
-		return m.SourceVersion
-	}
-	return ""
-}
-
-// Allowed label values.
-type LabelValue struct {
-	// The value of the label.
-	//
-	// Types that are valid to be assigned to Value:
-	//	*LabelValue_StringValue
-	//	*LabelValue_IntValue
-	//	*LabelValue_BoolValue
-	Value isLabelValue_Value `protobuf_oneof:"value"`
-}
-
-func (m *LabelValue) Reset()                    { *m = LabelValue{} }
-func (m *LabelValue) String() string            { return proto.CompactTextString(m) }
-func (*LabelValue) ProtoMessage()               {}
-func (*LabelValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-type isLabelValue_Value interface {
-	isLabelValue_Value()
-}
-
-type LabelValue_StringValue struct {
-	StringValue string `protobuf:"bytes,1,opt,name=string_value,json=stringValue,oneof"`
-}
-type LabelValue_IntValue struct {
-	IntValue int64 `protobuf:"varint,2,opt,name=int_value,json=intValue,oneof"`
-}
-type LabelValue_BoolValue struct {
-	BoolValue bool `protobuf:"varint,3,opt,name=bool_value,json=boolValue,oneof"`
-}
-
-func (*LabelValue_StringValue) isLabelValue_Value() {}
-func (*LabelValue_IntValue) isLabelValue_Value()    {}
-func (*LabelValue_BoolValue) isLabelValue_Value()   {}
-
-func (m *LabelValue) GetValue() isLabelValue_Value {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *LabelValue) GetStringValue() string {
-	if x, ok := m.GetValue().(*LabelValue_StringValue); ok {
-		return x.StringValue
-	}
-	return ""
-}
-
-func (m *LabelValue) GetIntValue() int64 {
-	if x, ok := m.GetValue().(*LabelValue_IntValue); ok {
-		return x.IntValue
-	}
-	return 0
-}
-
-func (m *LabelValue) GetBoolValue() bool {
-	if x, ok := m.GetValue().(*LabelValue_BoolValue); ok {
-		return x.BoolValue
-	}
-	return false
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LabelValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LabelValue_OneofMarshaler, _LabelValue_OneofUnmarshaler, _LabelValue_OneofSizer, []interface{}{
-		(*LabelValue_StringValue)(nil),
-		(*LabelValue_IntValue)(nil),
-		(*LabelValue_BoolValue)(nil),
-	}
-}
-
-func _LabelValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LabelValue)
-	// value
-	switch x := m.Value.(type) {
-	case *LabelValue_StringValue:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *LabelValue_IntValue:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.IntValue))
-	case *LabelValue_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case nil:
-	default:
-		return fmt.Errorf("LabelValue.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LabelValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LabelValue)
-	switch tag {
-	case 1: // value.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Value = &LabelValue_StringValue{x}
-		return true, err
-	case 2: // value.int_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &LabelValue_IntValue{int64(x)}
-		return true, err
-	case 3: // value.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Value = &LabelValue_BoolValue{x != 0}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LabelValue_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LabelValue)
-	// value
-	switch x := m.Value.(type) {
-	case *LabelValue_StringValue:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *LabelValue_IntValue:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.IntValue))
-	case *LabelValue_BoolValue:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
-		n += 1
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// A span represents a single operation within a trace. Spans can be nested
-// and form a trace tree. Often, a trace contains a root span that describes the
-// end-to-end latency and, optionally, one or more subspans for
-// its sub-operations. Spans do not need to be contiguous. There may be gaps
-// between spans in a trace.
-type Span struct {
-	// Identifier for the span. Must be a 64-bit integer other than 0 and
-	// unique within a trace.
-	Id uint64 `protobuf:"fixed64,1,opt,name=id" json:"id,omitempty"`
-	// Name of the span. The span name is sanitized and displayed in the
-	// Stackdriver Trace tool in the {% dynamic print site_values.console_name %}.
-	// The name may be a method name or some other per-call site name.
-	// For the same executable and the same call point, a best practice is
-	// to use a consistent name, which makes it easier to correlate
-	// cross-trace spans.
-	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	// ID of parent span. 0 or missing if this is a root span.
-	ParentId uint64 `protobuf:"fixed64,3,opt,name=parent_id,json=parentId" json:"parent_id,omitempty"`
-	// Local machine clock in nanoseconds from the UNIX epoch,
-	// at which span execution started.
-	// On the server side these are the times when the server application
-	// handler starts running.
-	LocalStartTime *google_protobuf1.Timestamp `protobuf:"bytes,4,opt,name=local_start_time,json=localStartTime" json:"local_start_time,omitempty"`
-	// Local machine clock in nanoseconds from the UNIX epoch,
-	// at which span execution ended.
-	// On the server side these are the times when the server application
-	// handler finishes running.
-	LocalEndTime *google_protobuf1.Timestamp `protobuf:"bytes,5,opt,name=local_end_time,json=localEndTime" json:"local_end_time,omitempty"`
-	// Properties of a span. Labels at the span level.
-	// E.g.
-	// "/instance_id": "my-instance"
-	// "/zone": "us-central1-a"
-	// "/grpc/peer_address": "ip:port" (dns, etc.)
-	// "/grpc/deadline": "Duration"
-	// "/http/user_agent"
-	// "/http/request_bytes": 300
-	// "/http/response_bytes": 1200
-	// "/http/url": google.com/apis
-	// "/pid"
-	// "abc.com/mylabel": "my label value"
-	Labels map[string]*LabelValue `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Stack trace captured at the start of the span. This is optional.
-	StackTrace *StackTrace `protobuf:"bytes,7,opt,name=stack_trace,json=stackTrace" json:"stack_trace,omitempty"`
-	// A collection of time-stamped events.
-	TimeEvents []*Span_TimeEvent `protobuf:"bytes,8,rep,name=time_events,json=timeEvents" json:"time_events,omitempty"`
-	// A collection of links.
-	Links []*Span_Link `protobuf:"bytes,9,rep,name=links" json:"links,omitempty"`
-	// The final status of the Span. This is optional.
-	Status *google_rpc.Status `protobuf:"bytes,10,opt,name=status" json:"status,omitempty"`
-	// True if this Span has a remote parent (is an RPC server Span).
-	HasRemoteParent bool `protobuf:"varint,11,opt,name=has_remote_parent,json=hasRemoteParent" json:"has_remote_parent,omitempty"`
-}
-
-func (m *Span) Reset()                    { *m = Span{} }
-func (m *Span) String() string            { return proto.CompactTextString(m) }
-func (*Span) ProtoMessage()               {}
-func (*Span) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *Span) GetId() uint64 {
-	if m != nil {
-		return m.Id
-	}
-	return 0
-}
-
-func (m *Span) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *Span) GetParentId() uint64 {
-	if m != nil {
-		return m.ParentId
-	}
-	return 0
-}
-
-func (m *Span) GetLocalStartTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.LocalStartTime
-	}
-	return nil
-}
-
-func (m *Span) GetLocalEndTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.LocalEndTime
-	}
-	return nil
-}
-
-func (m *Span) GetLabels() map[string]*LabelValue {
-	if m != nil {
-		return m.Labels
-	}
-	return nil
-}
-
-func (m *Span) GetStackTrace() *StackTrace {
-	if m != nil {
-		return m.StackTrace
-	}
-	return nil
-}
-
-func (m *Span) GetTimeEvents() []*Span_TimeEvent {
-	if m != nil {
-		return m.TimeEvents
-	}
-	return nil
-}
-
-func (m *Span) GetLinks() []*Span_Link {
-	if m != nil {
-		return m.Links
-	}
-	return nil
-}
-
-func (m *Span) GetStatus() *google_rpc.Status {
-	if m != nil {
-		return m.Status
-	}
-	return nil
-}
-
-func (m *Span) GetHasRemoteParent() bool {
-	if m != nil {
-		return m.HasRemoteParent
-	}
-	return false
-}
-
-// A time-stamped annotation in the Span.
-type Span_TimeEvent struct {
-	// The local machine absolute timestamp when this event happened.
-	LocalTime *google_protobuf1.Timestamp `protobuf:"bytes,1,opt,name=local_time,json=localTime" json:"local_time,omitempty"`
-	// Types that are valid to be assigned to Value:
-	//	*Span_TimeEvent_Annotation_
-	//	*Span_TimeEvent_NetworkEvent_
-	Value isSpan_TimeEvent_Value `protobuf_oneof:"value"`
-}
-
-func (m *Span_TimeEvent) Reset()                    { *m = Span_TimeEvent{} }
-func (m *Span_TimeEvent) String() string            { return proto.CompactTextString(m) }
-func (*Span_TimeEvent) ProtoMessage()               {}
-func (*Span_TimeEvent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
-
-type isSpan_TimeEvent_Value interface {
-	isSpan_TimeEvent_Value()
-}
-
-type Span_TimeEvent_Annotation_ struct {
-	Annotation *Span_TimeEvent_Annotation `protobuf:"bytes,2,opt,name=annotation,oneof"`
-}
-type Span_TimeEvent_NetworkEvent_ struct {
-	NetworkEvent *Span_TimeEvent_NetworkEvent `protobuf:"bytes,3,opt,name=network_event,json=networkEvent,oneof"`
-}
-
-func (*Span_TimeEvent_Annotation_) isSpan_TimeEvent_Value()   {}
-func (*Span_TimeEvent_NetworkEvent_) isSpan_TimeEvent_Value() {}
-
-func (m *Span_TimeEvent) GetValue() isSpan_TimeEvent_Value {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *Span_TimeEvent) GetLocalTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.LocalTime
-	}
-	return nil
-}
-
-func (m *Span_TimeEvent) GetAnnotation() *Span_TimeEvent_Annotation {
-	if x, ok := m.GetValue().(*Span_TimeEvent_Annotation_); ok {
-		return x.Annotation
-	}
-	return nil
-}
-
-func (m *Span_TimeEvent) GetNetworkEvent() *Span_TimeEvent_NetworkEvent {
-	if x, ok := m.GetValue().(*Span_TimeEvent_NetworkEvent_); ok {
-		return x.NetworkEvent
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Span_TimeEvent) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Span_TimeEvent_OneofMarshaler, _Span_TimeEvent_OneofUnmarshaler, _Span_TimeEvent_OneofSizer, []interface{}{
-		(*Span_TimeEvent_Annotation_)(nil),
-		(*Span_TimeEvent_NetworkEvent_)(nil),
-	}
-}
-
-func _Span_TimeEvent_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Span_TimeEvent)
-	// value
-	switch x := m.Value.(type) {
-	case *Span_TimeEvent_Annotation_:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Annotation); err != nil {
-			return err
-		}
-	case *Span_TimeEvent_NetworkEvent_:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.NetworkEvent); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Span_TimeEvent.Value has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Span_TimeEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Span_TimeEvent)
-	switch tag {
-	case 2: // value.annotation
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Span_TimeEvent_Annotation)
-		err := b.DecodeMessage(msg)
-		m.Value = &Span_TimeEvent_Annotation_{msg}
-		return true, err
-	case 3: // value.network_event
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Span_TimeEvent_NetworkEvent)
-		err := b.DecodeMessage(msg)
-		m.Value = &Span_TimeEvent_NetworkEvent_{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Span_TimeEvent_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Span_TimeEvent)
-	// value
-	switch x := m.Value.(type) {
-	case *Span_TimeEvent_Annotation_:
-		s := proto.Size(x.Annotation)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Span_TimeEvent_NetworkEvent_:
-		s := proto.Size(x.NetworkEvent)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Text annotation with a set of labels.
-type Span_TimeEvent_Annotation struct {
-	// A user-supplied message describing the event.
-	Description string `protobuf:"bytes,1,opt,name=description" json:"description,omitempty"`
-	// A set of labels on the annotation.
-	Labels map[string]*LabelValue `protobuf:"bytes,2,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-}
-
-func (m *Span_TimeEvent_Annotation) Reset()                    { *m = Span_TimeEvent_Annotation{} }
-func (m *Span_TimeEvent_Annotation) String() string            { return proto.CompactTextString(m) }
-func (*Span_TimeEvent_Annotation) ProtoMessage()               {}
-func (*Span_TimeEvent_Annotation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0, 0} }
-
-func (m *Span_TimeEvent_Annotation) GetDescription() string {
-	if m != nil {
-		return m.Description
-	}
-	return ""
-}
-
-func (m *Span_TimeEvent_Annotation) GetLabels() map[string]*LabelValue {
-	if m != nil {
-		return m.Labels
-	}
-	return nil
-}
-
-// An event describing an RPC message sent/received on the network.
-type Span_TimeEvent_NetworkEvent struct {
-	// If available, this is the kernel time:
-	// For sent messages, this is the time at which the first bit was sent.
-	// For received messages, this is the time at which the last bit was
-	// received.
-	KernelTime *google_protobuf1.Timestamp      `protobuf:"bytes,1,opt,name=kernel_time,json=kernelTime" json:"kernel_time,omitempty"`
-	Type       Span_TimeEvent_NetworkEvent_Type `protobuf:"varint,2,opt,name=type,enum=google.tracing.v1.Span_TimeEvent_NetworkEvent_Type" json:"type,omitempty"`
-	// Every message has an identifier, that must be different from all the
-	// network messages in this span.
-	// This is very important when the request/response are streamed.
-	MessageId uint64 `protobuf:"varint,3,opt,name=message_id,json=messageId" json:"message_id,omitempty"`
-	// Number of bytes send/receive.
-	MessageSize uint64 `protobuf:"varint,4,opt,name=message_size,json=messageSize" json:"message_size,omitempty"`
-}
-
-func (m *Span_TimeEvent_NetworkEvent) Reset()         { *m = Span_TimeEvent_NetworkEvent{} }
-func (m *Span_TimeEvent_NetworkEvent) String() string { return proto.CompactTextString(m) }
-func (*Span_TimeEvent_NetworkEvent) ProtoMessage()    {}
-func (*Span_TimeEvent_NetworkEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{4, 0, 1}
-}
-
-func (m *Span_TimeEvent_NetworkEvent) GetKernelTime() *google_protobuf1.Timestamp {
-	if m != nil {
-		return m.KernelTime
-	}
-	return nil
-}
-
-func (m *Span_TimeEvent_NetworkEvent) GetType() Span_TimeEvent_NetworkEvent_Type {
-	if m != nil {
-		return m.Type
-	}
-	return Span_TimeEvent_NetworkEvent_UNSPECIFIED
-}
-
-func (m *Span_TimeEvent_NetworkEvent) GetMessageId() uint64 {
-	if m != nil {
-		return m.MessageId
-	}
-	return 0
-}
-
-func (m *Span_TimeEvent_NetworkEvent) GetMessageSize() uint64 {
-	if m != nil {
-		return m.MessageSize
-	}
-	return 0
-}
-
-// Link one span with another which may be in a different Trace. Used (for
-// example) in batching operations, where a single batch handler processes
-// multiple requests from different traces.
-type Span_Link struct {
-	// The trace and span identifier of the linked span.
-	TraceId *TraceId       `protobuf:"bytes,1,opt,name=trace_id,json=traceId" json:"trace_id,omitempty"`
-	SpanId  uint64         `protobuf:"fixed64,2,opt,name=span_id,json=spanId" json:"span_id,omitempty"`
-	Type    Span_Link_Type `protobuf:"varint,3,opt,name=type,enum=google.tracing.v1.Span_Link_Type" json:"type,omitempty"`
-}
-
-func (m *Span_Link) Reset()                    { *m = Span_Link{} }
-func (m *Span_Link) String() string            { return proto.CompactTextString(m) }
-func (*Span_Link) ProtoMessage()               {}
-func (*Span_Link) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 1} }
-
-func (m *Span_Link) GetTraceId() *TraceId {
-	if m != nil {
-		return m.TraceId
-	}
-	return nil
-}
-
-func (m *Span_Link) GetSpanId() uint64 {
-	if m != nil {
-		return m.SpanId
-	}
-	return 0
-}
-
-func (m *Span_Link) GetType() Span_Link_Type {
-	if m != nil {
-		return m.Type
-	}
-	return Span_Link_UNSPECIFIED
-}
-
-// A trace describes how long it takes for an application to perform some
-// operations. It consists of a tree of spans, each of which contains details
-// about an operation with time information and operation details.
-type Trace struct {
-	// Globally unique identifier for the trace. Common to all the spans.
-	TraceId *TraceId `protobuf:"bytes,1,opt,name=trace_id,json=traceId" json:"trace_id,omitempty"`
-	// Collection of spans in the trace. The root span has parent_id == 0.
-	Spans []*Span `protobuf:"bytes,2,rep,name=spans" json:"spans,omitempty"`
-}
-
-func (m *Trace) Reset()                    { *m = Trace{} }
-func (m *Trace) String() string            { return proto.CompactTextString(m) }
-func (*Trace) ProtoMessage()               {}
-func (*Trace) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *Trace) GetTraceId() *TraceId {
-	if m != nil {
-		return m.TraceId
-	}
-	return nil
-}
-
-func (m *Trace) GetSpans() []*Span {
-	if m != nil {
-		return m.Spans
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*TraceId)(nil), "google.tracing.v1.TraceId")
-	proto.RegisterType((*Module)(nil), "google.tracing.v1.Module")
-	proto.RegisterType((*StackTrace)(nil), "google.tracing.v1.StackTrace")
-	proto.RegisterType((*StackTrace_StackFrame)(nil), "google.tracing.v1.StackTrace.StackFrame")
-	proto.RegisterType((*LabelValue)(nil), "google.tracing.v1.LabelValue")
-	proto.RegisterType((*Span)(nil), "google.tracing.v1.Span")
-	proto.RegisterType((*Span_TimeEvent)(nil), "google.tracing.v1.Span.TimeEvent")
-	proto.RegisterType((*Span_TimeEvent_Annotation)(nil), "google.tracing.v1.Span.TimeEvent.Annotation")
-	proto.RegisterType((*Span_TimeEvent_NetworkEvent)(nil), "google.tracing.v1.Span.TimeEvent.NetworkEvent")
-	proto.RegisterType((*Span_Link)(nil), "google.tracing.v1.Span.Link")
-	proto.RegisterType((*Trace)(nil), "google.tracing.v1.Trace")
-	proto.RegisterEnum("google.tracing.v1.Span_TimeEvent_NetworkEvent_Type", Span_TimeEvent_NetworkEvent_Type_name, Span_TimeEvent_NetworkEvent_Type_value)
-	proto.RegisterEnum("google.tracing.v1.Span_Link_Type", Span_Link_Type_name, Span_Link_Type_value)
-}
-
-func init() { proto.RegisterFile("google/tracing/trace.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 1102 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x6e, 0x1a, 0x47,
-	0x14, 0x66, 0xf9, 0x59, 0xe0, 0x2c, 0x76, 0xc8, 0x54, 0xad, 0x09, 0x8d, 0x65, 0x9b, 0xa8, 0x92,
-	0xe5, 0x26, 0x8b, 0x82, 0x15, 0xc9, 0x8d, 0xa5, 0xaa, 0xb1, 0x8d, 0x0b, 0x52, 0x8a, 0xd0, 0xe0,
-	0x58, 0x55, 0x6f, 0x56, 0xc3, 0xee, 0x18, 0x56, 0x2c, 0xb3, 0xab, 0x9d, 0x81, 0xc6, 0xbe, 0xed,
-	0x1b, 0xf4, 0x1d, 0x7a, 0xdb, 0x37, 0xe8, 0x83, 0xb4, 0x4f, 0x53, 0xcd, 0xcf, 0x62, 0xaa, 0xd8,
-	0x71, 0x53, 0xa9, 0x57, 0xcc, 0x7c, 0xe7, 0x3b, 0x67, 0xce, 0x7c, 0xe7, 0x9c, 0x59, 0xa0, 0x39,
-	0x89, 0xe3, 0x49, 0x44, 0xdb, 0x22, 0x25, 0x7e, 0xc8, 0x26, 0xea, 0x97, 0xba, 0x49, 0x1a, 0x8b,
-	0x18, 0x3d, 0xd6, 0x36, 0xd7, 0xd8, 0xdc, 0xe5, 0xcb, 0xe6, 0x53, 0x43, 0x27, 0x49, 0xd8, 0x26,
-	0x8c, 0xc5, 0x82, 0x88, 0x30, 0x66, 0x5c, 0x3b, 0x34, 0x77, 0x8c, 0x55, 0xed, 0xc6, 0x8b, 0xab,
-	0xb6, 0x08, 0xe7, 0x94, 0x0b, 0x32, 0x4f, 0x0c, 0x61, 0xcb, 0x10, 0xd2, 0xc4, 0x6f, 0x73, 0x41,
-	0xc4, 0xc2, 0x78, 0xb6, 0x0e, 0xa0, 0x7c, 0x21, 0x4f, 0xee, 0x07, 0x68, 0x07, 0x9c, 0x29, 0x7d,
-	0xef, 0x51, 0xe6, 0xc7, 0x01, 0x0d, 0x1a, 0xd6, 0xae, 0xb5, 0x5f, 0xc5, 0x30, 0xa5, 0xef, 0xbb,
-	0x1a, 0x69, 0x1d, 0x83, 0xfd, 0x43, 0x1c, 0x2c, 0x22, 0x8a, 0xbe, 0x00, 0x7b, 0xae, 0x56, 0x86,
-	0x65, 0x76, 0xe8, 0x09, 0x54, 0xc6, 0x8b, 0x30, 0x0a, 0xbc, 0x30, 0x68, 0xe4, 0x95, 0xa5, 0xac,
-	0xf6, 0xfd, 0xa0, 0xf5, 0x7b, 0x01, 0x60, 0x24, 0x88, 0x3f, 0x53, 0xc7, 0xa1, 0x3e, 0x38, 0x5c,
-	0xee, 0xbc, 0xab, 0x94, 0xcc, 0x65, 0x98, 0xc2, 0xbe, 0xd3, 0xd9, 0x77, 0x3f, 0xb8, 0xb8, 0x7b,
-	0xeb, 0xa3, 0x97, 0xe7, 0x92, 0x8f, 0x81, 0xaf, 0xd6, 0xe8, 0x05, 0x7c, 0xa6, 0x43, 0x29, 0x09,
-	0xbd, 0x29, 0xe1, 0xd3, 0xec, 0xfc, 0x22, 0xae, 0xf3, 0x95, 0x7f, 0x8f, 0xf0, 0x69, 0x3f, 0x68,
-	0xfe, 0x96, 0x37, 0x89, 0x68, 0xef, 0x67, 0xb0, 0x71, 0xb5, 0x60, 0xbe, 0x54, 0xd3, 0x63, 0x3a,
-	0x15, 0x99, 0x77, 0x2d, 0x03, 0x07, 0x92, 0xf4, 0x1c, 0x50, 0x9c, 0x86, 0x13, 0xef, 0x9f, 0x4c,
-	0x7d, 0xc3, 0xba, 0xb4, 0x9c, 0xaf, 0xb3, 0xbf, 0x84, 0xea, 0x55, 0x18, 0x51, 0x4d, 0x2a, 0x28,
-	0x52, 0x45, 0x02, 0xca, 0xb8, 0x03, 0x4e, 0x14, 0x32, 0xea, 0xb1, 0xc5, 0x7c, 0x4c, 0xd3, 0x46,
-	0x71, 0xd7, 0xda, 0x2f, 0x60, 0x90, 0xd0, 0x40, 0x21, 0x32, 0x21, 0x3f, 0x8e, 0x16, 0x73, 0x96,
-	0x51, 0x4a, 0x8a, 0x52, 0xd3, 0xa0, 0x21, 0xbd, 0x06, 0x27, 0x8a, 0x49, 0xe0, 0x99, 0x2a, 0xd8,
-	0xbb, 0xd6, 0xbe, 0xd3, 0x79, 0x72, 0x87, 0x7c, 0xba, 0x60, 0x18, 0x24, 0xdb, 0x14, 0xef, 0x2b,
-	0xd8, 0xe4, 0xf1, 0x22, 0xf5, 0xa9, 0xb7, 0xa4, 0x29, 0x0f, 0x63, 0xd6, 0x28, 0xab, 0x1c, 0x37,
-	0x34, 0x7a, 0xa9, 0xc1, 0xd6, 0x0d, 0xc0, 0x5b, 0x32, 0xa6, 0xd1, 0x25, 0x89, 0x16, 0x52, 0xa6,
-	0x1a, 0x17, 0x69, 0xc8, 0x26, 0xde, 0x52, 0xee, 0xb5, 0x4a, 0xbd, 0x1c, 0x76, 0x34, 0xaa, 0x49,
-	0xdb, 0x50, 0x0d, 0x99, 0x30, 0x0c, 0xa9, 0x4e, 0xa1, 0x97, 0xc3, 0x95, 0x90, 0x09, 0x6d, 0xde,
-	0x01, 0x18, 0xc7, 0x71, 0x64, 0xec, 0x52, 0x98, 0x4a, 0x2f, 0x87, 0xab, 0x12, 0x53, 0x84, 0x93,
-	0x32, 0x94, 0x94, 0xad, 0xf5, 0x6b, 0x0d, 0x8a, 0xa3, 0x84, 0x30, 0xb4, 0x09, 0xf9, 0x50, 0xb7,
-	0xa2, 0x8d, 0xf3, 0x61, 0x80, 0x10, 0x14, 0xd7, 0xa4, 0x57, 0x6b, 0x29, 0x77, 0x42, 0x52, 0xca,
-	0x84, 0xac, 0x7a, 0x41, 0x51, 0x2b, 0x1a, 0xe8, 0x07, 0xe8, 0x0c, 0xea, 0x51, 0xec, 0x93, 0xc8,
-	0xe3, 0x82, 0xa4, 0xc2, 0x93, 0x73, 0xa1, 0x34, 0x77, 0x3a, 0xcd, 0x4c, 0xad, 0x6c, 0x68, 0xdc,
-	0x8b, 0x6c, 0x68, 0xf0, 0xa6, 0xf2, 0x19, 0x49, 0x17, 0x09, 0xa2, 0xef, 0x40, 0x23, 0x1e, 0x65,
-	0x81, 0x8e, 0x51, 0x7a, 0x30, 0x46, 0x4d, 0x79, 0x74, 0x59, 0xa0, 0x22, 0x1c, 0x83, 0x1d, 0x49,
-	0x35, 0x79, 0xc3, 0x56, 0xad, 0xfe, 0xec, 0xae, 0x56, 0x4f, 0x08, 0x73, 0x95, 0xe6, 0xbc, 0xcb,
-	0x44, 0x7a, 0x8d, 0x8d, 0x0b, 0xfa, 0x36, 0x1b, 0x16, 0xd5, 0xe1, 0xaa, 0x5c, 0x4e, 0x67, 0xfb,
-	0xa3, 0xc3, 0x62, 0x26, 0x44, 0x0f, 0xdb, 0x09, 0x38, 0x32, 0x69, 0x8f, 0x2e, 0x29, 0x13, 0xbc,
-	0x51, 0x51, 0x19, 0xec, 0xdd, 0x97, 0x81, 0xcc, 0xb7, 0x2b, 0x99, 0x18, 0x44, 0xb6, 0xe4, 0xa8,
-	0x03, 0xa5, 0x28, 0x64, 0x33, 0xde, 0xa8, 0x2a, 0xef, 0xa7, 0xf7, 0xe6, 0x1f, 0xb2, 0x19, 0xd6,
-	0x54, 0x74, 0x00, 0xb6, 0x7e, 0x6c, 0x1a, 0xa0, 0x52, 0x46, 0x99, 0x53, 0x9a, 0xf8, 0x32, 0x57,
-	0xb1, 0xe0, 0xd8, 0x30, 0xd0, 0x01, 0x3c, 0x9e, 0x12, 0xee, 0xa5, 0x74, 0x1e, 0x0b, 0xea, 0xe9,
-	0xfa, 0x35, 0x1c, 0xd9, 0x23, 0xf8, 0xd1, 0x94, 0x70, 0xac, 0xf0, 0xa1, 0x82, 0x9b, 0x7f, 0x96,
-	0xa0, 0xba, 0xca, 0x12, 0x7d, 0x03, 0xa0, 0x8b, 0xa3, 0x0a, 0x63, 0x3d, 0x58, 0x98, 0xaa, 0x62,
-	0xab, 0xaa, 0x0c, 0x00, 0x6e, 0x1f, 0x53, 0xd5, 0x54, 0x4e, 0xe7, 0xf9, 0x83, 0xba, 0xb8, 0x6f,
-	0x56, 0x3e, 0xbd, 0x1c, 0x5e, 0x8b, 0x80, 0xde, 0xc1, 0x06, 0xa3, 0xe2, 0xe7, 0x38, 0x9d, 0x69,
-	0xad, 0x55, 0x3b, 0x3a, 0x1d, 0xf7, 0xe1, 0x90, 0x03, 0xed, 0xa6, 0x36, 0xbd, 0x1c, 0xae, 0xb1,
-	0xb5, 0x7d, 0xf3, 0x2f, 0x0b, 0xe0, 0xf6, 0x4c, 0xb4, 0x0b, 0x4e, 0x40, 0xb9, 0x9f, 0x86, 0x89,
-	0x4a, 0x5b, 0x3f, 0x58, 0xeb, 0x10, 0x1a, 0xae, 0xba, 0x2d, 0xaf, 0xaa, 0x75, 0xf4, 0x29, 0x77,
-	0xba, 0xab, 0x05, 0x9b, 0x3f, 0x82, 0xb3, 0x06, 0xa3, 0x3a, 0x14, 0x66, 0xf4, 0xda, 0x1c, 0x2d,
-	0x97, 0xe8, 0xd0, 0xcc, 0xae, 0x51, 0xf1, 0xae, 0xee, 0xbc, 0x7d, 0x4e, 0xb0, 0xe6, 0xbe, 0xce,
-	0x1f, 0x59, 0xcd, 0x5f, 0xf2, 0x50, 0x5b, 0xbf, 0x3d, 0x3a, 0x06, 0x67, 0x46, 0x53, 0x46, 0xff,
-	0x75, 0x41, 0x41, 0xd3, 0x55, 0x45, 0xbf, 0x87, 0xa2, 0xb8, 0x4e, 0x74, 0x16, 0x9b, 0x9d, 0xc3,
-	0x4f, 0x13, 0xde, 0xbd, 0xb8, 0x4e, 0x28, 0x56, 0x01, 0xd0, 0x36, 0xc0, 0x9c, 0x72, 0x4e, 0x26,
-	0x34, 0x7b, 0x56, 0x8a, 0xb8, 0x6a, 0x90, 0x7e, 0x80, 0xf6, 0xa0, 0x96, 0x99, 0x79, 0x78, 0xa3,
-	0xdf, 0x94, 0x22, 0x76, 0x0c, 0x36, 0x0a, 0x6f, 0x68, 0xeb, 0x6b, 0x28, 0xca, 0x78, 0xe8, 0x11,
-	0x38, 0xef, 0x06, 0xa3, 0x61, 0xf7, 0xb4, 0x7f, 0xde, 0xef, 0x9e, 0xd5, 0x73, 0xa8, 0x02, 0xc5,
-	0x51, 0x77, 0x70, 0x51, 0xb7, 0xe4, 0x0a, 0x77, 0x4f, 0x2f, 0xeb, 0xf9, 0xd5, 0xd3, 0xd7, 0xfc,
-	0xc3, 0x82, 0xa2, 0x9c, 0x21, 0xf4, 0x0a, 0x2a, 0xfa, 0x83, 0x66, 0x1e, 0xc0, 0x35, 0x0d, 0xd6,
-	0x6e, 0x63, 0x3e, 0xde, 0xb8, 0x2c, 0xcc, 0x57, 0x7c, 0x0b, 0xca, 0x3c, 0x21, 0x2c, 0xfb, 0x02,
-	0xda, 0xd8, 0x96, 0xdb, 0x7e, 0x80, 0x5e, 0x19, 0x65, 0x0a, 0x4a, 0x99, 0xbd, 0x8f, 0xcd, 0xef,
-	0x9a, 0x0e, 0x2d, 0xf7, 0xbe, 0x5b, 0x54, 0xa1, 0x74, 0xda, 0xeb, 0xbf, 0x3d, 0xab, 0x5b, 0x08,
-	0xc0, 0x1e, 0xbe, 0xc1, 0xf2, 0x4a, 0xf9, 0xff, 0xaf, 0x51, 0x5a, 0x73, 0x28, 0xe9, 0xe7, 0xec,
-	0x3f, 0x2a, 0xf3, 0x02, 0x4a, 0x52, 0x8a, 0x6c, 0x26, 0xb6, 0xee, 0x51, 0x00, 0x6b, 0xd6, 0x89,
-	0x07, 0x9f, 0xfb, 0xf1, 0xfc, 0x43, 0xd2, 0x09, 0xa8, 0xc8, 0x43, 0xd9, 0x87, 0x43, 0xeb, 0xa7,
-	0x23, 0x43, 0x98, 0xc4, 0x11, 0x61, 0x13, 0x37, 0x4e, 0x27, 0xed, 0x09, 0x65, 0xaa, 0x4b, 0xdb,
-	0xda, 0x44, 0x92, 0x90, 0xaf, 0xfe, 0xe6, 0x2d, 0x5f, 0x1e, 0x9b, 0xe5, 0xd8, 0x56, 0xa4, 0xc3,
-	0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x30, 0x5b, 0x04, 0x0a, 0x0a, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/genproto/googleapis/type/color/color.pb.go b/vendor/google.golang.org/genproto/googleapis/type/color/color.pb.go
index 4f201b88..82ba0399 100644
--- a/vendor/google.golang.org/genproto/googleapis/type/color/color.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/type/color/color.pb.go
@@ -1,21 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/color.proto
 
-/*
-Package color is a generated protocol buffer package.
-
-It is generated from these files:
-	google/type/color.proto
-
-It has these top-level messages:
-	Color
-*/
-package color
+package color // import "google.golang.org/genproto/googleapis/type/color"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/wrappers"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -144,11 +135,11 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 //     // ...
 type Color struct {
 	// The amount of red in the color as a value in the interval [0, 1].
-	Red float32 `protobuf:"fixed32,1,opt,name=red" json:"red,omitempty"`
+	Red float32 `protobuf:"fixed32,1,opt,name=red,proto3" json:"red,omitempty"`
 	// The amount of green in the color as a value in the interval [0, 1].
-	Green float32 `protobuf:"fixed32,2,opt,name=green" json:"green,omitempty"`
+	Green float32 `protobuf:"fixed32,2,opt,name=green,proto3" json:"green,omitempty"`
 	// The amount of blue in the color as a value in the interval [0, 1].
-	Blue float32 `protobuf:"fixed32,3,opt,name=blue" json:"blue,omitempty"`
+	Blue float32 `protobuf:"fixed32,3,opt,name=blue,proto3" json:"blue,omitempty"`
 	// The fraction of this color that should be applied to the pixel. That is,
 	// the final pixel color is defined by the equation:
 	//
@@ -160,13 +151,35 @@ type Color struct {
 	// possible to distinguish between a default value and the value being unset.
 	// If omitted, this color object is to be rendered as a solid color
 	// (as if the alpha value had been explicitly given with a value of 1.0).
-	Alpha *google_protobuf.FloatValue `protobuf:"bytes,4,opt,name=alpha" json:"alpha,omitempty"`
+	Alpha                *wrappers.FloatValue `protobuf:"bytes,4,opt,name=alpha,proto3" json:"alpha,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Color) Reset()         { *m = Color{} }
+func (m *Color) String() string { return proto.CompactTextString(m) }
+func (*Color) ProtoMessage()    {}
+func (*Color) Descriptor() ([]byte, []int) {
+	return fileDescriptor_color_8eaf754e0972446d, []int{0}
+}
+func (m *Color) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Color.Unmarshal(m, b)
+}
+func (m *Color) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Color.Marshal(b, m, deterministic)
+}
+func (dst *Color) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Color.Merge(dst, src)
+}
+func (m *Color) XXX_Size() int {
+	return xxx_messageInfo_Color.Size(m)
+}
+func (m *Color) XXX_DiscardUnknown() {
+	xxx_messageInfo_Color.DiscardUnknown(m)
 }
 
-func (m *Color) Reset()                    { *m = Color{} }
-func (m *Color) String() string            { return proto.CompactTextString(m) }
-func (*Color) ProtoMessage()               {}
-func (*Color) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Color proto.InternalMessageInfo
 
 func (m *Color) GetRed() float32 {
 	if m != nil {
@@ -189,7 +202,7 @@ func (m *Color) GetBlue() float32 {
 	return 0
 }
 
-func (m *Color) GetAlpha() *google_protobuf.FloatValue {
+func (m *Color) GetAlpha() *wrappers.FloatValue {
 	if m != nil {
 		return m.Alpha
 	}
@@ -200,9 +213,9 @@ func init() {
 	proto.RegisterType((*Color)(nil), "google.type.Color")
 }
 
-func init() { proto.RegisterFile("google/type/color.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/type/color.proto", fileDescriptor_color_8eaf754e0972446d) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_color_8eaf754e0972446d = []byte{
 	// 224 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8f, 0x31, 0x4b, 0xc5, 0x30,
 	0x10, 0xc7, 0x49, 0xfb, 0xea, 0x70, 0x6f, 0x50, 0x82, 0x60, 0x50, 0x90, 0x87, 0xd3, 0x9b, 0x12,
diff --git a/vendor/google.golang.org/genproto/googleapis/type/date/date.pb.go b/vendor/google.golang.org/genproto/googleapis/type/date/date.pb.go
index 40beaab0..7cfd6ccb 100644
--- a/vendor/google.golang.org/genproto/googleapis/type/date/date.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/type/date/date.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/date.proto
 
-/*
-Package date is a generated protocol buffer package.
-
-It is generated from these files:
-	google/type/date.proto
-
-It has these top-level messages:
-	Date
-*/
-package date
+package date // import "google.golang.org/genproto/googleapis/type/date"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -37,18 +28,40 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type Date struct {
 	// Year of date. Must be from 1 to 9999, or 0 if specifying a date without
 	// a year.
-	Year int32 `protobuf:"varint,1,opt,name=year" json:"year,omitempty"`
+	Year int32 `protobuf:"varint,1,opt,name=year,proto3" json:"year,omitempty"`
 	// Month of year. Must be from 1 to 12.
-	Month int32 `protobuf:"varint,2,opt,name=month" json:"month,omitempty"`
+	Month int32 `protobuf:"varint,2,opt,name=month,proto3" json:"month,omitempty"`
 	// Day of month. Must be from 1 to 31 and valid for the year and month, or 0
 	// if specifying a year/month where the day is not significant.
-	Day int32 `protobuf:"varint,3,opt,name=day" json:"day,omitempty"`
+	Day                  int32    `protobuf:"varint,3,opt,name=day,proto3" json:"day,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Date) Reset()         { *m = Date{} }
+func (m *Date) String() string { return proto.CompactTextString(m) }
+func (*Date) ProtoMessage()    {}
+func (*Date) Descriptor() ([]byte, []int) {
+	return fileDescriptor_date_7d25862cee0f408d, []int{0}
+}
+func (m *Date) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Date.Unmarshal(m, b)
+}
+func (m *Date) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Date.Marshal(b, m, deterministic)
+}
+func (dst *Date) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Date.Merge(dst, src)
+}
+func (m *Date) XXX_Size() int {
+	return xxx_messageInfo_Date.Size(m)
+}
+func (m *Date) XXX_DiscardUnknown() {
+	xxx_messageInfo_Date.DiscardUnknown(m)
 }
 
-func (m *Date) Reset()                    { *m = Date{} }
-func (m *Date) String() string            { return proto.CompactTextString(m) }
-func (*Date) ProtoMessage()               {}
-func (*Date) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Date proto.InternalMessageInfo
 
 func (m *Date) GetYear() int32 {
 	if m != nil {
@@ -75,9 +88,9 @@ func init() {
 	proto.RegisterType((*Date)(nil), "google.type.Date")
 }
 
-func init() { proto.RegisterFile("google/type/date.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/type/date.proto", fileDescriptor_date_7d25862cee0f408d) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_date_7d25862cee0f408d = []byte{
 	// 172 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0x49, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca,
diff --git a/vendor/google.golang.org/genproto/googleapis/type/dayofweek/dayofweek.pb.go b/vendor/google.golang.org/genproto/googleapis/type/dayofweek/dayofweek.pb.go
index eecd403f..110cc7eb 100644
--- a/vendor/google.golang.org/genproto/googleapis/type/dayofweek/dayofweek.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/type/dayofweek/dayofweek.pb.go
@@ -1,15 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/dayofweek.proto
 
-/*
-Package dayofweek is a generated protocol buffer package.
-
-It is generated from these files:
-	google/type/dayofweek.proto
-
-It has these top-level messages:
-*/
-package dayofweek
+package dayofweek // import "google.golang.org/genproto/googleapis/type/dayofweek"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -72,15 +64,19 @@ var DayOfWeek_value = map[string]int32{
 func (x DayOfWeek) String() string {
 	return proto.EnumName(DayOfWeek_name, int32(x))
 }
-func (DayOfWeek) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (DayOfWeek) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_dayofweek_65556e97092f8975, []int{0}
+}
 
 func init() {
 	proto.RegisterEnum("google.type.DayOfWeek", DayOfWeek_name, DayOfWeek_value)
 }
 
-func init() { proto.RegisterFile("google/type/dayofweek.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/type/dayofweek.proto", fileDescriptor_dayofweek_65556e97092f8975)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_dayofweek_65556e97092f8975 = []byte{
 	// 235 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0x49, 0xac, 0xcc, 0x4f, 0x2b, 0x4f, 0x4d,
diff --git a/vendor/google.golang.org/genproto/googleapis/type/latlng/latlng.pb.go b/vendor/google.golang.org/genproto/googleapis/type/latlng/latlng.pb.go
index 9a845f9c..d8e979b4 100644
--- a/vendor/google.golang.org/genproto/googleapis/type/latlng/latlng.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/type/latlng/latlng.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/latlng.proto
 
-/*
-Package latlng is a generated protocol buffer package.
-
-It is generated from these files:
-	google/type/latlng.proto
-
-It has these top-level messages:
-	LatLng
-*/
-package latlng
+package latlng // import "google.golang.org/genproto/googleapis/type/latlng"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -68,15 +59,37 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 //     assert (90.0, 10.0) == NormalizeLatLng(-270.0, 10.0)
 type LatLng struct {
 	// The latitude in degrees. It must be in the range [-90.0, +90.0].
-	Latitude float64 `protobuf:"fixed64,1,opt,name=latitude" json:"latitude,omitempty"`
+	Latitude float64 `protobuf:"fixed64,1,opt,name=latitude,proto3" json:"latitude,omitempty"`
 	// The longitude in degrees. It must be in the range [-180.0, +180.0].
-	Longitude float64 `protobuf:"fixed64,2,opt,name=longitude" json:"longitude,omitempty"`
+	Longitude            float64  `protobuf:"fixed64,2,opt,name=longitude,proto3" json:"longitude,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LatLng) Reset()         { *m = LatLng{} }
+func (m *LatLng) String() string { return proto.CompactTextString(m) }
+func (*LatLng) ProtoMessage()    {}
+func (*LatLng) Descriptor() ([]byte, []int) {
+	return fileDescriptor_latlng_c1d6506011cbaf0c, []int{0}
+}
+func (m *LatLng) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LatLng.Unmarshal(m, b)
+}
+func (m *LatLng) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LatLng.Marshal(b, m, deterministic)
+}
+func (dst *LatLng) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LatLng.Merge(dst, src)
+}
+func (m *LatLng) XXX_Size() int {
+	return xxx_messageInfo_LatLng.Size(m)
+}
+func (m *LatLng) XXX_DiscardUnknown() {
+	xxx_messageInfo_LatLng.DiscardUnknown(m)
 }
 
-func (m *LatLng) Reset()                    { *m = LatLng{} }
-func (m *LatLng) String() string            { return proto.CompactTextString(m) }
-func (*LatLng) ProtoMessage()               {}
-func (*LatLng) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_LatLng proto.InternalMessageInfo
 
 func (m *LatLng) GetLatitude() float64 {
 	if m != nil {
@@ -96,9 +109,9 @@ func init() {
 	proto.RegisterType((*LatLng)(nil), "google.type.LatLng")
 }
 
-func init() { proto.RegisterFile("google/type/latlng.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/type/latlng.proto", fileDescriptor_latlng_c1d6506011cbaf0c) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_latlng_c1d6506011cbaf0c = []byte{
 	// 165 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0xcf, 0x49, 0x2c, 0xc9, 0xc9, 0x4b, 0xd7, 0x2b,
diff --git a/vendor/google.golang.org/genproto/googleapis/type/money/money.pb.go b/vendor/google.golang.org/genproto/googleapis/type/money/money.pb.go
index 34bf8ab6..0b159677 100644
--- a/vendor/google.golang.org/genproto/googleapis/type/money/money.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/type/money/money.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/money.proto
 
-/*
-Package money is a generated protocol buffer package.
-
-It is generated from these files:
-	google/type/money.proto
-
-It has these top-level messages:
-	Money
-*/
-package money
+package money // import "google.golang.org/genproto/googleapis/type/money"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -30,23 +21,45 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Represents an amount of money with its currency type.
 type Money struct {
 	// The 3-letter currency code defined in ISO 4217.
-	CurrencyCode string `protobuf:"bytes,1,opt,name=currency_code,json=currencyCode" json:"currency_code,omitempty"`
+	CurrencyCode string `protobuf:"bytes,1,opt,name=currency_code,json=currencyCode,proto3" json:"currency_code,omitempty"`
 	// The whole units of the amount.
 	// For example if `currencyCode` is `"USD"`, then 1 unit is one US dollar.
-	Units int64 `protobuf:"varint,2,opt,name=units" json:"units,omitempty"`
+	Units int64 `protobuf:"varint,2,opt,name=units,proto3" json:"units,omitempty"`
 	// Number of nano (10^-9) units of the amount.
 	// The value must be between -999,999,999 and +999,999,999 inclusive.
 	// If `units` is positive, `nanos` must be positive or zero.
 	// If `units` is zero, `nanos` can be positive, zero, or negative.
 	// If `units` is negative, `nanos` must be negative or zero.
 	// For example $-1.75 is represented as `units`=-1 and `nanos`=-750,000,000.
-	Nanos int32 `protobuf:"varint,3,opt,name=nanos" json:"nanos,omitempty"`
+	Nanos                int32    `protobuf:"varint,3,opt,name=nanos,proto3" json:"nanos,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Money) Reset()         { *m = Money{} }
+func (m *Money) String() string { return proto.CompactTextString(m) }
+func (*Money) ProtoMessage()    {}
+func (*Money) Descriptor() ([]byte, []int) {
+	return fileDescriptor_money_608c90f64d8c0d93, []int{0}
+}
+func (m *Money) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Money.Unmarshal(m, b)
+}
+func (m *Money) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Money.Marshal(b, m, deterministic)
+}
+func (dst *Money) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Money.Merge(dst, src)
+}
+func (m *Money) XXX_Size() int {
+	return xxx_messageInfo_Money.Size(m)
+}
+func (m *Money) XXX_DiscardUnknown() {
+	xxx_messageInfo_Money.DiscardUnknown(m)
 }
 
-func (m *Money) Reset()                    { *m = Money{} }
-func (m *Money) String() string            { return proto.CompactTextString(m) }
-func (*Money) ProtoMessage()               {}
-func (*Money) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Money proto.InternalMessageInfo
 
 func (m *Money) GetCurrencyCode() string {
 	if m != nil {
@@ -73,9 +86,9 @@ func init() {
 	proto.RegisterType((*Money)(nil), "google.type.Money")
 }
 
-func init() { proto.RegisterFile("google/type/money.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/type/money.proto", fileDescriptor_money_608c90f64d8c0d93) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_money_608c90f64d8c0d93 = []byte{
 	// 190 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0xcf, 0xcd, 0xcf, 0x4b, 0xad, 0xd4, 0x2b, 0x28,
diff --git a/vendor/google.golang.org/genproto/googleapis/type/postaladdress/postal_address.pb.go b/vendor/google.golang.org/genproto/googleapis/type/postaladdress/postal_address.pb.go
index 430f3b45..3c2704b1 100644
--- a/vendor/google.golang.org/genproto/googleapis/type/postaladdress/postal_address.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/type/postaladdress/postal_address.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/postal_address.proto
 
-/*
-Package postaladdress is a generated protocol buffer package.
-
-It is generated from these files:
-	google/type/postal_address.proto
-
-It has these top-level messages:
-	PostalAddress
-*/
-package postaladdress
+package postaladdress // import "google.golang.org/genproto/googleapis/type/postaladdress"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -47,13 +38,13 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type PostalAddress struct {
 	// The schema revision of the `PostalAddress`.
 	// All new revisions **must** be backward compatible with old revisions.
-	Revision int32 `protobuf:"varint,1,opt,name=revision" json:"revision,omitempty"`
+	Revision int32 `protobuf:"varint,1,opt,name=revision,proto3" json:"revision,omitempty"`
 	// Required. CLDR region code of the country/region of the address. This
 	// is never inferred and it is up to the user to ensure the value is
 	// correct. See http://cldr.unicode.org/ and
 	// http://www.unicode.org/cldr/charts/30/supplemental/territory_information.html
 	// for details. Example: "CH" for Switzerland.
-	RegionCode string `protobuf:"bytes,2,opt,name=region_code,json=regionCode" json:"region_code,omitempty"`
+	RegionCode string `protobuf:"bytes,2,opt,name=region_code,json=regionCode,proto3" json:"region_code,omitempty"`
 	// Optional. BCP-47 language code of the contents of this address (if
 	// known). This is often the UI language of the input form or is expected
 	// to match one of the languages used in the address' country/region, or their
@@ -66,18 +57,18 @@ type PostalAddress struct {
 	// possibly incorrect default).
 	//
 	// Examples: "zh-Hant", "ja", "ja-Latn", "en".
-	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode" json:"language_code,omitempty"`
+	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. Postal code of the address. Not all countries use or require
 	// postal codes to be present, but where they are used, they may trigger
 	// additional validation with other parts of the address (e.g. state/zip
 	// validation in the U.S.A.).
-	PostalCode string `protobuf:"bytes,4,opt,name=postal_code,json=postalCode" json:"postal_code,omitempty"`
+	PostalCode string `protobuf:"bytes,4,opt,name=postal_code,json=postalCode,proto3" json:"postal_code,omitempty"`
 	// Optional. Additional, country-specific, sorting code. This is not used
 	// in most regions. Where it is used, the value is either a string like
 	// "CEDEX", optionally followed by a number (e.g. "CEDEX 7"), or just a number
 	// alone, representing the "sector code" (Jamaica), "delivery area indicator"
 	// (Malawi) or "post office indicator" (e.g. Côte d'Ivoire).
-	SortingCode string `protobuf:"bytes,5,opt,name=sorting_code,json=sortingCode" json:"sorting_code,omitempty"`
+	SortingCode string `protobuf:"bytes,5,opt,name=sorting_code,json=sortingCode,proto3" json:"sorting_code,omitempty"`
 	// Optional. Highest administrative subdivision which is used for postal
 	// addresses of a country or region.
 	// For example, this can be a state, a province, an oblast, or a prefecture.
@@ -85,15 +76,15 @@ type PostalAddress struct {
 	// community (e.g. "Barcelona" and not "Catalonia").
 	// Many countries don't use an administrative area in postal addresses. E.g.
 	// in Switzerland this should be left unpopulated.
-	AdministrativeArea string `protobuf:"bytes,6,opt,name=administrative_area,json=administrativeArea" json:"administrative_area,omitempty"`
+	AdministrativeArea string `protobuf:"bytes,6,opt,name=administrative_area,json=administrativeArea,proto3" json:"administrative_area,omitempty"`
 	// Optional. Generally refers to the city/town portion of the address.
 	// Examples: US city, IT comune, UK post town.
 	// In regions of the world where localities are not well defined or do not fit
 	// into this structure well, leave locality empty and use address_lines.
-	Locality string `protobuf:"bytes,7,opt,name=locality" json:"locality,omitempty"`
+	Locality string `protobuf:"bytes,7,opt,name=locality,proto3" json:"locality,omitempty"`
 	// Optional. Sublocality of the address.
 	// For example, this can be neighborhoods, boroughs, districts.
-	Sublocality string `protobuf:"bytes,8,opt,name=sublocality" json:"sublocality,omitempty"`
+	Sublocality string `protobuf:"bytes,8,opt,name=sublocality,proto3" json:"sublocality,omitempty"`
 	// Unstructured address lines describing the lower levels of an address.
 	//
 	// Because values in address_lines do not have type information and may
@@ -116,19 +107,41 @@ type PostalAddress struct {
 	// then geocoding is the recommended way to handle completely unstructured
 	// addresses (as opposed to guessing which parts of the address should be
 	// localities or administrative areas).
-	AddressLines []string `protobuf:"bytes,9,rep,name=address_lines,json=addressLines" json:"address_lines,omitempty"`
+	AddressLines []string `protobuf:"bytes,9,rep,name=address_lines,json=addressLines,proto3" json:"address_lines,omitempty"`
 	// Optional. The recipient at the address.
 	// This field may, under certain circumstances, contain multiline information.
 	// For example, it might contain "care of" information.
-	Recipients []string `protobuf:"bytes,10,rep,name=recipients" json:"recipients,omitempty"`
+	Recipients []string `protobuf:"bytes,10,rep,name=recipients,proto3" json:"recipients,omitempty"`
 	// Optional. The name of the organization at the address.
-	Organization string `protobuf:"bytes,11,opt,name=organization" json:"organization,omitempty"`
+	Organization         string   `protobuf:"bytes,11,opt,name=organization,proto3" json:"organization,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *PostalAddress) Reset()                    { *m = PostalAddress{} }
-func (m *PostalAddress) String() string            { return proto.CompactTextString(m) }
-func (*PostalAddress) ProtoMessage()               {}
-func (*PostalAddress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *PostalAddress) Reset()         { *m = PostalAddress{} }
+func (m *PostalAddress) String() string { return proto.CompactTextString(m) }
+func (*PostalAddress) ProtoMessage()    {}
+func (*PostalAddress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_postal_address_dc3389450c08c04a, []int{0}
+}
+func (m *PostalAddress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PostalAddress.Unmarshal(m, b)
+}
+func (m *PostalAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PostalAddress.Marshal(b, m, deterministic)
+}
+func (dst *PostalAddress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PostalAddress.Merge(dst, src)
+}
+func (m *PostalAddress) XXX_Size() int {
+	return xxx_messageInfo_PostalAddress.Size(m)
+}
+func (m *PostalAddress) XXX_DiscardUnknown() {
+	xxx_messageInfo_PostalAddress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_PostalAddress proto.InternalMessageInfo
 
 func (m *PostalAddress) GetRevision() int32 {
 	if m != nil {
@@ -211,9 +224,11 @@ func init() {
 	proto.RegisterType((*PostalAddress)(nil), "google.type.PostalAddress")
 }
 
-func init() { proto.RegisterFile("google/type/postal_address.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/type/postal_address.proto", fileDescriptor_postal_address_dc3389450c08c04a)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_postal_address_dc3389450c08c04a = []byte{
 	// 338 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0x31, 0x6f, 0xea, 0x30,
 	0x10, 0xc7, 0x15, 0xf2, 0xe0, 0xc1, 0x05, 0xf4, 0x24, 0xbf, 0x25, 0xea, 0x50, 0x52, 0xba, 0x30,
diff --git a/vendor/google.golang.org/genproto/googleapis/type/timeofday/timeofday.pb.go b/vendor/google.golang.org/genproto/googleapis/type/timeofday/timeofday.pb.go
index 703c74c2..0ab10a74 100644
--- a/vendor/google.golang.org/genproto/googleapis/type/timeofday/timeofday.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/type/timeofday/timeofday.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/type/timeofday.proto
 
-/*
-Package timeofday is a generated protocol buffer package.
-
-It is generated from these files:
-	google/type/timeofday.proto
-
-It has these top-level messages:
-	TimeOfDay
-*/
-package timeofday
+package timeofday // import "google.golang.org/genproto/googleapis/type/timeofday"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -33,20 +24,42 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type TimeOfDay struct {
 	// Hours of day in 24 hour format. Should be from 0 to 23. An API may choose
 	// to allow the value "24:00:00" for scenarios like business closing time.
-	Hours int32 `protobuf:"varint,1,opt,name=hours" json:"hours,omitempty"`
+	Hours int32 `protobuf:"varint,1,opt,name=hours,proto3" json:"hours,omitempty"`
 	// Minutes of hour of day. Must be from 0 to 59.
-	Minutes int32 `protobuf:"varint,2,opt,name=minutes" json:"minutes,omitempty"`
+	Minutes int32 `protobuf:"varint,2,opt,name=minutes,proto3" json:"minutes,omitempty"`
 	// Seconds of minutes of the time. Must normally be from 0 to 59. An API may
 	// allow the value 60 if it allows leap-seconds.
-	Seconds int32 `protobuf:"varint,3,opt,name=seconds" json:"seconds,omitempty"`
+	Seconds int32 `protobuf:"varint,3,opt,name=seconds,proto3" json:"seconds,omitempty"`
 	// Fractions of seconds in nanoseconds. Must be from 0 to 999,999,999.
-	Nanos int32 `protobuf:"varint,4,opt,name=nanos" json:"nanos,omitempty"`
+	Nanos                int32    `protobuf:"varint,4,opt,name=nanos,proto3" json:"nanos,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TimeOfDay) Reset()                    { *m = TimeOfDay{} }
-func (m *TimeOfDay) String() string            { return proto.CompactTextString(m) }
-func (*TimeOfDay) ProtoMessage()               {}
-func (*TimeOfDay) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *TimeOfDay) Reset()         { *m = TimeOfDay{} }
+func (m *TimeOfDay) String() string { return proto.CompactTextString(m) }
+func (*TimeOfDay) ProtoMessage()    {}
+func (*TimeOfDay) Descriptor() ([]byte, []int) {
+	return fileDescriptor_timeofday_99fd81ba301b1e70, []int{0}
+}
+func (m *TimeOfDay) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TimeOfDay.Unmarshal(m, b)
+}
+func (m *TimeOfDay) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TimeOfDay.Marshal(b, m, deterministic)
+}
+func (dst *TimeOfDay) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TimeOfDay.Merge(dst, src)
+}
+func (m *TimeOfDay) XXX_Size() int {
+	return xxx_messageInfo_TimeOfDay.Size(m)
+}
+func (m *TimeOfDay) XXX_DiscardUnknown() {
+	xxx_messageInfo_TimeOfDay.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TimeOfDay proto.InternalMessageInfo
 
 func (m *TimeOfDay) GetHours() int32 {
 	if m != nil {
@@ -80,9 +93,11 @@ func init() {
 	proto.RegisterType((*TimeOfDay)(nil), "google.type.TimeOfDay")
 }
 
-func init() { proto.RegisterFile("google/type/timeofday.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/type/timeofday.proto", fileDescriptor_timeofday_99fd81ba301b1e70)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_timeofday_99fd81ba301b1e70 = []byte{
 	// 198 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x2f, 0xc9, 0xcc, 0x4d, 0xcd, 0x4f, 0x4b, 0x49,
diff --git a/vendor/google.golang.org/genproto/googleapis/watcher/v1/watch.pb.go b/vendor/google.golang.org/genproto/googleapis/watcher/v1/watch.pb.go
index c3128144..6490c08b 100644
--- a/vendor/google.golang.org/genproto/googleapis/watcher/v1/watch.pb.go
+++ b/vendor/google.golang.org/genproto/googleapis/watcher/v1/watch.pb.go
@@ -1,25 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/watcher/v1/watch.proto
 
-/*
-Package watcher is a generated protocol buffer package.
-
-It is generated from these files:
-	google/watcher/v1/watch.proto
-
-It has these top-level messages:
-	Request
-	ChangeBatch
-	Change
-*/
-package watcher
+package watcher // import "google.golang.org/genproto/googleapis/watcher/v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "google.golang.org/genproto/googleapis/api/annotations"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/any"
+import any "github.com/golang/protobuf/ptypes/any"
 import _ "github.com/golang/protobuf/ptypes/empty"
+import _ "google.golang.org/genproto/googleapis/api/annotations"
 
 import (
 	context "golang.org/x/net/context"
@@ -71,7 +60,9 @@ var Change_State_value = map[string]int32{
 func (x Change_State) String() string {
 	return proto.EnumName(Change_State_name, int32(x))
 }
-func (Change_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+func (Change_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_watch_40ce6762a23e7042, []int{2, 0}
+}
 
 // The message used by the client to register interest in an entity.
 type Request struct {
@@ -99,7 +90,7 @@ type Request struct {
 	// contains a special character, it must be %-encoded.  We recommend that
 	// clients and servers use their runtime's URL library to produce and consume
 	// target values.
-	Target string `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"`
+	Target string `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
 	// The `resume_marker` specifies how much of the existing underlying state is
 	// delivered to the client when the watch request is received by the
 	// system. The client can set this marker in one of the following ways to get
@@ -129,13 +120,35 @@ type Request struct {
 	// An implementation MUST support an unspecified parameter and the
 	// empty string "" marker (initial state fetching) and the "now" marker.
 	// It need not support resuming from a specific point.
-	ResumeMarker []byte `protobuf:"bytes,2,opt,name=resume_marker,json=resumeMarker,proto3" json:"resume_marker,omitempty"`
+	ResumeMarker         []byte   `protobuf:"bytes,2,opt,name=resume_marker,json=resumeMarker,proto3" json:"resume_marker,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Request) Reset()                    { *m = Request{} }
-func (m *Request) String() string            { return proto.CompactTextString(m) }
-func (*Request) ProtoMessage()               {}
-func (*Request) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Request) Reset()         { *m = Request{} }
+func (m *Request) String() string { return proto.CompactTextString(m) }
+func (*Request) ProtoMessage()    {}
+func (*Request) Descriptor() ([]byte, []int) {
+	return fileDescriptor_watch_40ce6762a23e7042, []int{0}
+}
+func (m *Request) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Request.Unmarshal(m, b)
+}
+func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Request.Marshal(b, m, deterministic)
+}
+func (dst *Request) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Request.Merge(dst, src)
+}
+func (m *Request) XXX_Size() int {
+	return xxx_messageInfo_Request.Size(m)
+}
+func (m *Request) XXX_DiscardUnknown() {
+	xxx_messageInfo_Request.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Request proto.InternalMessageInfo
 
 func (m *Request) GetTarget() string {
 	if m != nil {
@@ -154,13 +167,35 @@ func (m *Request) GetResumeMarker() []byte {
 // A batch of Change messages.
 type ChangeBatch struct {
 	// A list of Change messages.
-	Changes []*Change `protobuf:"bytes,1,rep,name=changes" json:"changes,omitempty"`
+	Changes              []*Change `protobuf:"bytes,1,rep,name=changes,proto3" json:"changes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *ChangeBatch) Reset()         { *m = ChangeBatch{} }
+func (m *ChangeBatch) String() string { return proto.CompactTextString(m) }
+func (*ChangeBatch) ProtoMessage()    {}
+func (*ChangeBatch) Descriptor() ([]byte, []int) {
+	return fileDescriptor_watch_40ce6762a23e7042, []int{1}
+}
+func (m *ChangeBatch) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ChangeBatch.Unmarshal(m, b)
+}
+func (m *ChangeBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ChangeBatch.Marshal(b, m, deterministic)
+}
+func (dst *ChangeBatch) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChangeBatch.Merge(dst, src)
+}
+func (m *ChangeBatch) XXX_Size() int {
+	return xxx_messageInfo_ChangeBatch.Size(m)
+}
+func (m *ChangeBatch) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChangeBatch.DiscardUnknown(m)
 }
 
-func (m *ChangeBatch) Reset()                    { *m = ChangeBatch{} }
-func (m *ChangeBatch) String() string            { return proto.CompactTextString(m) }
-func (*ChangeBatch) ProtoMessage()               {}
-func (*ChangeBatch) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_ChangeBatch proto.InternalMessageInfo
 
 func (m *ChangeBatch) GetChanges() []*Change {
 	if m != nil {
@@ -174,13 +209,13 @@ type Change struct {
 	// Name of the element, interpreted relative to the entity's actual
 	// name. "" refers to the entity itself. The element name is a valid
 	// UTF-8 string.
-	Element string `protobuf:"bytes,1,opt,name=element" json:"element,omitempty"`
+	Element string `protobuf:"bytes,1,opt,name=element,proto3" json:"element,omitempty"`
 	// The state of the `element`.
-	State Change_State `protobuf:"varint,2,opt,name=state,enum=google.watcher.v1.Change_State" json:"state,omitempty"`
+	State Change_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.watcher.v1.Change_State" json:"state,omitempty"`
 	// The actual change data. This field is present only when `state() == EXISTS`
 	// or `state() == ERROR`. Please see [google.protobuf.Any][google.protobuf.Any] about how to use
 	// the Any type.
-	Data *google_protobuf1.Any `protobuf:"bytes,6,opt,name=data" json:"data,omitempty"`
+	Data *any.Any `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"`
 	// If present, provides a compact representation of all the messages that have
 	// been received by the caller for the given entity, e.g., it could be a
 	// sequence number or a multi-part timestamp/version vector. This marker can
@@ -189,13 +224,35 @@ type Change struct {
 	ResumeMarker []byte `protobuf:"bytes,4,opt,name=resume_marker,json=resumeMarker,proto3" json:"resume_marker,omitempty"`
 	// If true, this Change is followed by more Changes that are in the same group
 	// as this Change.
-	Continued bool `protobuf:"varint,5,opt,name=continued" json:"continued,omitempty"`
+	Continued            bool     `protobuf:"varint,5,opt,name=continued,proto3" json:"continued,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Change) Reset()                    { *m = Change{} }
-func (m *Change) String() string            { return proto.CompactTextString(m) }
-func (*Change) ProtoMessage()               {}
-func (*Change) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *Change) Reset()         { *m = Change{} }
+func (m *Change) String() string { return proto.CompactTextString(m) }
+func (*Change) ProtoMessage()    {}
+func (*Change) Descriptor() ([]byte, []int) {
+	return fileDescriptor_watch_40ce6762a23e7042, []int{2}
+}
+func (m *Change) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Change.Unmarshal(m, b)
+}
+func (m *Change) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Change.Marshal(b, m, deterministic)
+}
+func (dst *Change) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Change.Merge(dst, src)
+}
+func (m *Change) XXX_Size() int {
+	return xxx_messageInfo_Change.Size(m)
+}
+func (m *Change) XXX_DiscardUnknown() {
+	xxx_messageInfo_Change.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Change proto.InternalMessageInfo
 
 func (m *Change) GetElement() string {
 	if m != nil {
@@ -211,7 +268,7 @@ func (m *Change) GetState() Change_State {
 	return Change_EXISTS
 }
 
-func (m *Change) GetData() *google_protobuf1.Any {
+func (m *Change) GetData() *any.Any {
 	if m != nil {
 		return m.Data
 	}
@@ -247,8 +304,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Watcher service
-
+// WatcherClient is the client API for Watcher service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type WatcherClient interface {
 	// Start a streaming RPC to get watch information from the server.
 	Watch(ctx context.Context, in *Request, opts ...grpc.CallOption) (Watcher_WatchClient, error)
@@ -263,7 +321,7 @@ func NewWatcherClient(cc *grpc.ClientConn) WatcherClient {
 }
 
 func (c *watcherClient) Watch(ctx context.Context, in *Request, opts ...grpc.CallOption) (Watcher_WatchClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Watcher_serviceDesc.Streams[0], c.cc, "/google.watcher.v1.Watcher/Watch", opts...)
+	stream, err := c.cc.NewStream(ctx, &_Watcher_serviceDesc.Streams[0], "/google.watcher.v1.Watcher/Watch", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -294,8 +352,7 @@ func (x *watcherWatchClient) Recv() (*ChangeBatch, error) {
 	return m, nil
 }
 
-// Server API for Watcher service
-
+// WatcherServer is the server API for Watcher service.
 type WatcherServer interface {
 	// Start a streaming RPC to get watch information from the server.
 	Watch(*Request, Watcher_WatchServer) error
@@ -340,9 +397,11 @@ var _Watcher_serviceDesc = grpc.ServiceDesc{
 	Metadata: "google/watcher/v1/watch.proto",
 }
 
-func init() { proto.RegisterFile("google/watcher/v1/watch.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/watcher/v1/watch.proto", fileDescriptor_watch_40ce6762a23e7042)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_watch_40ce6762a23e7042 = []byte{
 	// 449 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xdd, 0x6e, 0xd3, 0x30,
 	0x14, 0xc6, 0xdd, 0x92, 0xd2, 0xd3, 0x31, 0x75, 0x16, 0x43, 0x69, 0x19, 0x10, 0x85, 0x9b, 0x5c,
diff --git a/vendor/google.golang.org/genproto/protobuf/api/api.pb.go b/vendor/google.golang.org/genproto/protobuf/api/api.pb.go
index d41ce3c6..51c70927 100644
--- a/vendor/google.golang.org/genproto/protobuf/api/api.pb.go
+++ b/vendor/google.golang.org/genproto/protobuf/api/api.pb.go
@@ -1,24 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/api.proto
 
-/*
-Package api is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/api.proto
-
-It has these top-level messages:
-	Api
-	Method
-	Mixin
-*/
-package api
+package api // import "google.golang.org/genproto/protobuf/api"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "google.golang.org/genproto/protobuf/source_context"
-import google_protobuf2 "google.golang.org/genproto/protobuf/ptype"
+import ptype "google.golang.org/genproto/protobuf/ptype"
+import source_context "google.golang.org/genproto/protobuf/source_context"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -43,11 +32,11 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type Api struct {
 	// The fully qualified name of this interface, including package name
 	// followed by the interface's simple name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The methods of this interface, in unspecified order.
-	Methods []*Method `protobuf:"bytes,2,rep,name=methods" json:"methods,omitempty"`
+	Methods []*Method `protobuf:"bytes,2,rep,name=methods,proto3" json:"methods,omitempty"`
 	// Any metadata attached to the interface.
-	Options []*google_protobuf2.Option `protobuf:"bytes,3,rep,name=options" json:"options,omitempty"`
+	Options []*ptype.Option `protobuf:"bytes,3,rep,name=options,proto3" json:"options,omitempty"`
 	// A version string for this interface. If specified, must have the form
 	// `major-version.minor-version`, as in `1.10`. If the minor version is
 	// omitted, it defaults to zero. If the entire version field is empty, the
@@ -69,20 +58,42 @@ type Api struct {
 	// experimental, non-GA interfaces.
 	//
 	//
-	Version string `protobuf:"bytes,4,opt,name=version" json:"version,omitempty"`
+	Version string `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"`
 	// Source context for the protocol buffer service represented by this
 	// message.
-	SourceContext *google_protobuf.SourceContext `protobuf:"bytes,5,opt,name=source_context,json=sourceContext" json:"source_context,omitempty"`
+	SourceContext *source_context.SourceContext `protobuf:"bytes,5,opt,name=source_context,json=sourceContext,proto3" json:"source_context,omitempty"`
 	// Included interfaces. See [Mixin][].
-	Mixins []*Mixin `protobuf:"bytes,6,rep,name=mixins" json:"mixins,omitempty"`
+	Mixins []*Mixin `protobuf:"bytes,6,rep,name=mixins,proto3" json:"mixins,omitempty"`
 	// The source syntax of the service.
-	Syntax google_protobuf2.Syntax `protobuf:"varint,7,opt,name=syntax,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	Syntax               ptype.Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Api) Reset()         { *m = Api{} }
+func (m *Api) String() string { return proto.CompactTextString(m) }
+func (*Api) ProtoMessage()    {}
+func (*Api) Descriptor() ([]byte, []int) {
+	return fileDescriptor_api_3a57081c831903d2, []int{0}
+}
+func (m *Api) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Api.Unmarshal(m, b)
+}
+func (m *Api) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Api.Marshal(b, m, deterministic)
+}
+func (dst *Api) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Api.Merge(dst, src)
+}
+func (m *Api) XXX_Size() int {
+	return xxx_messageInfo_Api.Size(m)
+}
+func (m *Api) XXX_DiscardUnknown() {
+	xxx_messageInfo_Api.DiscardUnknown(m)
 }
 
-func (m *Api) Reset()                    { *m = Api{} }
-func (m *Api) String() string            { return proto.CompactTextString(m) }
-func (*Api) ProtoMessage()               {}
-func (*Api) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Api proto.InternalMessageInfo
 
 func (m *Api) GetName() string {
 	if m != nil {
@@ -98,7 +109,7 @@ func (m *Api) GetMethods() []*Method {
 	return nil
 }
 
-func (m *Api) GetOptions() []*google_protobuf2.Option {
+func (m *Api) GetOptions() []*ptype.Option {
 	if m != nil {
 		return m.Options
 	}
@@ -112,7 +123,7 @@ func (m *Api) GetVersion() string {
 	return ""
 }
 
-func (m *Api) GetSourceContext() *google_protobuf.SourceContext {
+func (m *Api) GetSourceContext() *source_context.SourceContext {
 	if m != nil {
 		return m.SourceContext
 	}
@@ -126,35 +137,57 @@ func (m *Api) GetMixins() []*Mixin {
 	return nil
 }
 
-func (m *Api) GetSyntax() google_protobuf2.Syntax {
+func (m *Api) GetSyntax() ptype.Syntax {
 	if m != nil {
 		return m.Syntax
 	}
-	return google_protobuf2.Syntax_SYNTAX_PROTO2
+	return ptype.Syntax_SYNTAX_PROTO2
 }
 
 // Method represents a method of an API interface.
 type Method struct {
 	// The simple name of this method.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A URL of the input message type.
-	RequestTypeUrl string `protobuf:"bytes,2,opt,name=request_type_url,json=requestTypeUrl" json:"request_type_url,omitempty"`
+	RequestTypeUrl string `protobuf:"bytes,2,opt,name=request_type_url,json=requestTypeUrl,proto3" json:"request_type_url,omitempty"`
 	// If true, the request is streamed.
-	RequestStreaming bool `protobuf:"varint,3,opt,name=request_streaming,json=requestStreaming" json:"request_streaming,omitempty"`
+	RequestStreaming bool `protobuf:"varint,3,opt,name=request_streaming,json=requestStreaming,proto3" json:"request_streaming,omitempty"`
 	// The URL of the output message type.
-	ResponseTypeUrl string `protobuf:"bytes,4,opt,name=response_type_url,json=responseTypeUrl" json:"response_type_url,omitempty"`
+	ResponseTypeUrl string `protobuf:"bytes,4,opt,name=response_type_url,json=responseTypeUrl,proto3" json:"response_type_url,omitempty"`
 	// If true, the response is streamed.
-	ResponseStreaming bool `protobuf:"varint,5,opt,name=response_streaming,json=responseStreaming" json:"response_streaming,omitempty"`
+	ResponseStreaming bool `protobuf:"varint,5,opt,name=response_streaming,json=responseStreaming,proto3" json:"response_streaming,omitempty"`
 	// Any metadata attached to the method.
-	Options []*google_protobuf2.Option `protobuf:"bytes,6,rep,name=options" json:"options,omitempty"`
+	Options []*ptype.Option `protobuf:"bytes,6,rep,name=options,proto3" json:"options,omitempty"`
 	// The source syntax of this method.
-	Syntax google_protobuf2.Syntax `protobuf:"varint,7,opt,name=syntax,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	Syntax               ptype.Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
-func (m *Method) Reset()                    { *m = Method{} }
-func (m *Method) String() string            { return proto.CompactTextString(m) }
-func (*Method) ProtoMessage()               {}
-func (*Method) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Method) Reset()         { *m = Method{} }
+func (m *Method) String() string { return proto.CompactTextString(m) }
+func (*Method) ProtoMessage()    {}
+func (*Method) Descriptor() ([]byte, []int) {
+	return fileDescriptor_api_3a57081c831903d2, []int{1}
+}
+func (m *Method) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Method.Unmarshal(m, b)
+}
+func (m *Method) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Method.Marshal(b, m, deterministic)
+}
+func (dst *Method) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Method.Merge(dst, src)
+}
+func (m *Method) XXX_Size() int {
+	return xxx_messageInfo_Method.Size(m)
+}
+func (m *Method) XXX_DiscardUnknown() {
+	xxx_messageInfo_Method.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Method proto.InternalMessageInfo
 
 func (m *Method) GetName() string {
 	if m != nil {
@@ -191,18 +224,18 @@ func (m *Method) GetResponseStreaming() bool {
 	return false
 }
 
-func (m *Method) GetOptions() []*google_protobuf2.Option {
+func (m *Method) GetOptions() []*ptype.Option {
 	if m != nil {
 		return m.Options
 	}
 	return nil
 }
 
-func (m *Method) GetSyntax() google_protobuf2.Syntax {
+func (m *Method) GetSyntax() ptype.Syntax {
 	if m != nil {
 		return m.Syntax
 	}
-	return google_protobuf2.Syntax_SYNTAX_PROTO2
+	return ptype.Syntax_SYNTAX_PROTO2
 }
 
 // Declares an API Interface to be included in this interface. The including
@@ -285,16 +318,38 @@ func (m *Method) GetSyntax() google_protobuf2.Syntax {
 //     }
 type Mixin struct {
 	// The fully qualified name of the interface which is included.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// If non-empty specifies a path under which inherited HTTP paths
 	// are rooted.
-	Root string `protobuf:"bytes,2,opt,name=root" json:"root,omitempty"`
+	Root                 string   `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Mixin) Reset()         { *m = Mixin{} }
+func (m *Mixin) String() string { return proto.CompactTextString(m) }
+func (*Mixin) ProtoMessage()    {}
+func (*Mixin) Descriptor() ([]byte, []int) {
+	return fileDescriptor_api_3a57081c831903d2, []int{2}
+}
+func (m *Mixin) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mixin.Unmarshal(m, b)
+}
+func (m *Mixin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mixin.Marshal(b, m, deterministic)
+}
+func (dst *Mixin) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mixin.Merge(dst, src)
+}
+func (m *Mixin) XXX_Size() int {
+	return xxx_messageInfo_Mixin.Size(m)
+}
+func (m *Mixin) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mixin.DiscardUnknown(m)
 }
 
-func (m *Mixin) Reset()                    { *m = Mixin{} }
-func (m *Mixin) String() string            { return proto.CompactTextString(m) }
-func (*Mixin) ProtoMessage()               {}
-func (*Mixin) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_Mixin proto.InternalMessageInfo
 
 func (m *Mixin) GetName() string {
 	if m != nil {
@@ -316,9 +371,9 @@ func init() {
 	proto.RegisterType((*Mixin)(nil), "google.protobuf.Mixin")
 }
 
-func init() { proto.RegisterFile("google/protobuf/api.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/protobuf/api.proto", fileDescriptor_api_3a57081c831903d2) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_api_3a57081c831903d2 = []byte{
 	// 432 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcf, 0x8e, 0xd3, 0x30,
 	0x10, 0xc6, 0x95, 0xa4, 0x4d, 0x17, 0xaf, 0xe8, 0x82, 0x91, 0xc0, 0xf4, 0xb0, 0x8a, 0x56, 0x1c,
diff --git a/vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go b/vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go
index 42693d68..89d65c6c 100644
--- a/vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go
+++ b/vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/field_mask.proto
 
-/*
-Package field_mask is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/field_mask.proto
-
-It has these top-level messages:
-	FieldMask
-*/
-package field_mask
+package field_mask // import "google.golang.org/genproto/protobuf/field_mask"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -231,18 +222,40 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 //
 // ## Field Mask Verification
 //
-// The implementation of the all the API methods, which have any FieldMask type
-// field in the request, should verify the included field paths, and return
+// The implementation of any API method which has a FieldMask type field in the
+// request should verify the included field paths, and return an
 // `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
 type FieldMask struct {
 	// The set of field mask paths.
-	Paths []string `protobuf:"bytes,1,rep,name=paths" json:"paths,omitempty"`
+	Paths                []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *FieldMask) Reset()                    { *m = FieldMask{} }
-func (m *FieldMask) String() string            { return proto.CompactTextString(m) }
-func (*FieldMask) ProtoMessage()               {}
-func (*FieldMask) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *FieldMask) Reset()         { *m = FieldMask{} }
+func (m *FieldMask) String() string { return proto.CompactTextString(m) }
+func (*FieldMask) ProtoMessage()    {}
+func (*FieldMask) Descriptor() ([]byte, []int) {
+	return fileDescriptor_field_mask_c0545479882ba5a2, []int{0}
+}
+func (m *FieldMask) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FieldMask.Unmarshal(m, b)
+}
+func (m *FieldMask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FieldMask.Marshal(b, m, deterministic)
+}
+func (dst *FieldMask) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FieldMask.Merge(dst, src)
+}
+func (m *FieldMask) XXX_Size() int {
+	return xxx_messageInfo_FieldMask.Size(m)
+}
+func (m *FieldMask) XXX_DiscardUnknown() {
+	xxx_messageInfo_FieldMask.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FieldMask proto.InternalMessageInfo
 
 func (m *FieldMask) GetPaths() []string {
 	if m != nil {
@@ -255,9 +268,11 @@ func init() {
 	proto.RegisterType((*FieldMask)(nil), "google.protobuf.FieldMask")
 }
 
-func init() { proto.RegisterFile("google/protobuf/field_mask.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/protobuf/field_mask.proto", fileDescriptor_field_mask_c0545479882ba5a2)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_field_mask_c0545479882ba5a2 = []byte{
 	// 171 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcb, 0x4c, 0xcd,
diff --git a/vendor/google.golang.org/genproto/protobuf/ptype/type.pb.go b/vendor/google.golang.org/genproto/protobuf/ptype/type.pb.go
index b9ad3f10..519faab8 100644
--- a/vendor/google.golang.org/genproto/protobuf/ptype/type.pb.go
+++ b/vendor/google.golang.org/genproto/protobuf/ptype/type.pb.go
@@ -1,26 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/type.proto
 
-/*
-Package ptype is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/type.proto
-
-It has these top-level messages:
-	Type
-	Field
-	Enum
-	EnumValue
-	Option
-*/
-package ptype
+package ptype // import "google.golang.org/genproto/protobuf/ptype"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import google_protobuf1 "google.golang.org/genproto/protobuf/source_context"
+import any "github.com/golang/protobuf/ptypes/any"
+import source_context "google.golang.org/genproto/protobuf/source_context"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -55,7 +42,9 @@ var Syntax_value = map[string]int32{
 func (x Syntax) String() string {
 	return proto.EnumName(Syntax_name, int32(x))
 }
-func (Syntax) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (Syntax) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_type_de958d9f8682c896, []int{0}
+}
 
 // Basic field types.
 type Field_Kind int32
@@ -147,7 +136,9 @@ var Field_Kind_value = map[string]int32{
 func (x Field_Kind) String() string {
 	return proto.EnumName(Field_Kind_name, int32(x))
 }
-func (Field_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+func (Field_Kind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_type_de958d9f8682c896, []int{1, 0}
+}
 
 // Whether a field is optional, required, or repeated.
 type Field_Cardinality int32
@@ -179,28 +170,52 @@ var Field_Cardinality_value = map[string]int32{
 func (x Field_Cardinality) String() string {
 	return proto.EnumName(Field_Cardinality_name, int32(x))
 }
-func (Field_Cardinality) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 1} }
+func (Field_Cardinality) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_type_de958d9f8682c896, []int{1, 1}
+}
 
 // A protocol buffer message type.
 type Type struct {
 	// The fully qualified message name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The list of fields.
-	Fields []*Field `protobuf:"bytes,2,rep,name=fields" json:"fields,omitempty"`
+	Fields []*Field `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"`
 	// The list of types appearing in `oneof` definitions in this type.
-	Oneofs []string `protobuf:"bytes,3,rep,name=oneofs" json:"oneofs,omitempty"`
+	Oneofs []string `protobuf:"bytes,3,rep,name=oneofs,proto3" json:"oneofs,omitempty"`
 	// The protocol buffer options.
-	Options []*Option `protobuf:"bytes,4,rep,name=options" json:"options,omitempty"`
+	Options []*Option `protobuf:"bytes,4,rep,name=options,proto3" json:"options,omitempty"`
 	// The source context.
-	SourceContext *google_protobuf1.SourceContext `protobuf:"bytes,5,opt,name=source_context,json=sourceContext" json:"source_context,omitempty"`
+	SourceContext *source_context.SourceContext `protobuf:"bytes,5,opt,name=source_context,json=sourceContext,proto3" json:"source_context,omitempty"`
 	// The source syntax.
-	Syntax Syntax `protobuf:"varint,6,opt,name=syntax,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	Syntax               Syntax   `protobuf:"varint,6,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Type) Reset()         { *m = Type{} }
+func (m *Type) String() string { return proto.CompactTextString(m) }
+func (*Type) ProtoMessage()    {}
+func (*Type) Descriptor() ([]byte, []int) {
+	return fileDescriptor_type_de958d9f8682c896, []int{0}
+}
+func (m *Type) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Type.Unmarshal(m, b)
+}
+func (m *Type) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Type.Marshal(b, m, deterministic)
+}
+func (dst *Type) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Type.Merge(dst, src)
+}
+func (m *Type) XXX_Size() int {
+	return xxx_messageInfo_Type.Size(m)
+}
+func (m *Type) XXX_DiscardUnknown() {
+	xxx_messageInfo_Type.DiscardUnknown(m)
 }
 
-func (m *Type) Reset()                    { *m = Type{} }
-func (m *Type) String() string            { return proto.CompactTextString(m) }
-func (*Type) ProtoMessage()               {}
-func (*Type) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Type proto.InternalMessageInfo
 
 func (m *Type) GetName() string {
 	if m != nil {
@@ -230,7 +245,7 @@ func (m *Type) GetOptions() []*Option {
 	return nil
 }
 
-func (m *Type) GetSourceContext() *google_protobuf1.SourceContext {
+func (m *Type) GetSourceContext() *source_context.SourceContext {
 	if m != nil {
 		return m.SourceContext
 	}
@@ -247,33 +262,55 @@ func (m *Type) GetSyntax() Syntax {
 // A single field of a message type.
 type Field struct {
 	// The field type.
-	Kind Field_Kind `protobuf:"varint,1,opt,name=kind,enum=google.protobuf.Field_Kind" json:"kind,omitempty"`
+	Kind Field_Kind `protobuf:"varint,1,opt,name=kind,proto3,enum=google.protobuf.Field_Kind" json:"kind,omitempty"`
 	// The field cardinality.
-	Cardinality Field_Cardinality `protobuf:"varint,2,opt,name=cardinality,enum=google.protobuf.Field_Cardinality" json:"cardinality,omitempty"`
+	Cardinality Field_Cardinality `protobuf:"varint,2,opt,name=cardinality,proto3,enum=google.protobuf.Field_Cardinality" json:"cardinality,omitempty"`
 	// The field number.
-	Number int32 `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
+	Number int32 `protobuf:"varint,3,opt,name=number,proto3" json:"number,omitempty"`
 	// The field name.
-	Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	// The field type URL, without the scheme, for message or enumeration
 	// types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
-	TypeUrl string `protobuf:"bytes,6,opt,name=type_url,json=typeUrl" json:"type_url,omitempty"`
+	TypeUrl string `protobuf:"bytes,6,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"`
 	// The index of the field type in `Type.oneofs`, for message or enumeration
 	// types. The first type has index 1; zero means the type is not in the list.
-	OneofIndex int32 `protobuf:"varint,7,opt,name=oneof_index,json=oneofIndex" json:"oneof_index,omitempty"`
+	OneofIndex int32 `protobuf:"varint,7,opt,name=oneof_index,json=oneofIndex,proto3" json:"oneof_index,omitempty"`
 	// Whether to use alternative packed wire representation.
-	Packed bool `protobuf:"varint,8,opt,name=packed" json:"packed,omitempty"`
+	Packed bool `protobuf:"varint,8,opt,name=packed,proto3" json:"packed,omitempty"`
 	// The protocol buffer options.
-	Options []*Option `protobuf:"bytes,9,rep,name=options" json:"options,omitempty"`
+	Options []*Option `protobuf:"bytes,9,rep,name=options,proto3" json:"options,omitempty"`
 	// The field JSON name.
-	JsonName string `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"`
+	JsonName string `protobuf:"bytes,10,opt,name=json_name,json=jsonName,proto3" json:"json_name,omitempty"`
 	// The string value of the default value of this field. Proto2 syntax only.
-	DefaultValue string `protobuf:"bytes,11,opt,name=default_value,json=defaultValue" json:"default_value,omitempty"`
+	DefaultValue         string   `protobuf:"bytes,11,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Field) Reset()         { *m = Field{} }
+func (m *Field) String() string { return proto.CompactTextString(m) }
+func (*Field) ProtoMessage()    {}
+func (*Field) Descriptor() ([]byte, []int) {
+	return fileDescriptor_type_de958d9f8682c896, []int{1}
+}
+func (m *Field) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Field.Unmarshal(m, b)
+}
+func (m *Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Field.Marshal(b, m, deterministic)
+}
+func (dst *Field) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Field.Merge(dst, src)
+}
+func (m *Field) XXX_Size() int {
+	return xxx_messageInfo_Field.Size(m)
+}
+func (m *Field) XXX_DiscardUnknown() {
+	xxx_messageInfo_Field.DiscardUnknown(m)
 }
 
-func (m *Field) Reset()                    { *m = Field{} }
-func (m *Field) String() string            { return proto.CompactTextString(m) }
-func (*Field) ProtoMessage()               {}
-func (*Field) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+var xxx_messageInfo_Field proto.InternalMessageInfo
 
 func (m *Field) GetKind() Field_Kind {
 	if m != nil {
@@ -348,21 +385,43 @@ func (m *Field) GetDefaultValue() string {
 // Enum type definition.
 type Enum struct {
 	// Enum type name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Enum value definitions.
-	Enumvalue []*EnumValue `protobuf:"bytes,2,rep,name=enumvalue" json:"enumvalue,omitempty"`
+	Enumvalue []*EnumValue `protobuf:"bytes,2,rep,name=enumvalue,proto3" json:"enumvalue,omitempty"`
 	// Protocol buffer options.
-	Options []*Option `protobuf:"bytes,3,rep,name=options" json:"options,omitempty"`
+	Options []*Option `protobuf:"bytes,3,rep,name=options,proto3" json:"options,omitempty"`
 	// The source context.
-	SourceContext *google_protobuf1.SourceContext `protobuf:"bytes,4,opt,name=source_context,json=sourceContext" json:"source_context,omitempty"`
+	SourceContext *source_context.SourceContext `protobuf:"bytes,4,opt,name=source_context,json=sourceContext,proto3" json:"source_context,omitempty"`
 	// The source syntax.
-	Syntax Syntax `protobuf:"varint,5,opt,name=syntax,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	Syntax               Syntax   `protobuf:"varint,5,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Enum) Reset()         { *m = Enum{} }
+func (m *Enum) String() string { return proto.CompactTextString(m) }
+func (*Enum) ProtoMessage()    {}
+func (*Enum) Descriptor() ([]byte, []int) {
+	return fileDescriptor_type_de958d9f8682c896, []int{2}
+}
+func (m *Enum) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Enum.Unmarshal(m, b)
+}
+func (m *Enum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Enum.Marshal(b, m, deterministic)
+}
+func (dst *Enum) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Enum.Merge(dst, src)
+}
+func (m *Enum) XXX_Size() int {
+	return xxx_messageInfo_Enum.Size(m)
+}
+func (m *Enum) XXX_DiscardUnknown() {
+	xxx_messageInfo_Enum.DiscardUnknown(m)
 }
 
-func (m *Enum) Reset()                    { *m = Enum{} }
-func (m *Enum) String() string            { return proto.CompactTextString(m) }
-func (*Enum) ProtoMessage()               {}
-func (*Enum) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_Enum proto.InternalMessageInfo
 
 func (m *Enum) GetName() string {
 	if m != nil {
@@ -385,7 +444,7 @@ func (m *Enum) GetOptions() []*Option {
 	return nil
 }
 
-func (m *Enum) GetSourceContext() *google_protobuf1.SourceContext {
+func (m *Enum) GetSourceContext() *source_context.SourceContext {
 	if m != nil {
 		return m.SourceContext
 	}
@@ -402,17 +461,39 @@ func (m *Enum) GetSyntax() Syntax {
 // Enum value definition.
 type EnumValue struct {
 	// Enum value name.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Enum value number.
-	Number int32 `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
+	Number int32 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"`
 	// Protocol buffer options.
-	Options []*Option `protobuf:"bytes,3,rep,name=options" json:"options,omitempty"`
+	Options              []*Option `protobuf:"bytes,3,rep,name=options,proto3" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *EnumValue) Reset()         { *m = EnumValue{} }
+func (m *EnumValue) String() string { return proto.CompactTextString(m) }
+func (*EnumValue) ProtoMessage()    {}
+func (*EnumValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_type_de958d9f8682c896, []int{3}
+}
+func (m *EnumValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EnumValue.Unmarshal(m, b)
+}
+func (m *EnumValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EnumValue.Marshal(b, m, deterministic)
+}
+func (dst *EnumValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EnumValue.Merge(dst, src)
+}
+func (m *EnumValue) XXX_Size() int {
+	return xxx_messageInfo_EnumValue.Size(m)
+}
+func (m *EnumValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_EnumValue.DiscardUnknown(m)
 }
 
-func (m *EnumValue) Reset()                    { *m = EnumValue{} }
-func (m *EnumValue) String() string            { return proto.CompactTextString(m) }
-func (*EnumValue) ProtoMessage()               {}
-func (*EnumValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_EnumValue proto.InternalMessageInfo
 
 func (m *EnumValue) GetName() string {
 	if m != nil {
@@ -442,18 +523,40 @@ type Option struct {
 	// descriptor.proto), this is the short name. For example, `"map_entry"`.
 	// For custom options, it should be the fully-qualified name. For example,
 	// `"google.api.http"`.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The option's value packed in an Any message. If the value is a primitive,
 	// the corresponding wrapper type defined in google/protobuf/wrappers.proto
 	// should be used. If the value is an enum, it should be stored as an int32
 	// value using the google.protobuf.Int32Value type.
-	Value *google_protobuf.Any `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
+	Value                *any.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Option) Reset()         { *m = Option{} }
+func (m *Option) String() string { return proto.CompactTextString(m) }
+func (*Option) ProtoMessage()    {}
+func (*Option) Descriptor() ([]byte, []int) {
+	return fileDescriptor_type_de958d9f8682c896, []int{4}
+}
+func (m *Option) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Option.Unmarshal(m, b)
+}
+func (m *Option) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Option.Marshal(b, m, deterministic)
+}
+func (dst *Option) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Option.Merge(dst, src)
+}
+func (m *Option) XXX_Size() int {
+	return xxx_messageInfo_Option.Size(m)
+}
+func (m *Option) XXX_DiscardUnknown() {
+	xxx_messageInfo_Option.DiscardUnknown(m)
 }
 
-func (m *Option) Reset()                    { *m = Option{} }
-func (m *Option) String() string            { return proto.CompactTextString(m) }
-func (*Option) ProtoMessage()               {}
-func (*Option) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_Option proto.InternalMessageInfo
 
 func (m *Option) GetName() string {
 	if m != nil {
@@ -462,7 +565,7 @@ func (m *Option) GetName() string {
 	return ""
 }
 
-func (m *Option) GetValue() *google_protobuf.Any {
+func (m *Option) GetValue() *any.Any {
 	if m != nil {
 		return m.Value
 	}
@@ -480,9 +583,9 @@ func init() {
 	proto.RegisterEnum("google.protobuf.Field_Cardinality", Field_Cardinality_name, Field_Cardinality_value)
 }
 
-func init() { proto.RegisterFile("google/protobuf/type.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/protobuf/type.proto", fileDescriptor_type_de958d9f8682c896) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_type_de958d9f8682c896 = []byte{
 	// 810 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x8e, 0xda, 0x56,
 	0x14, 0x8e, 0x8d, 0xf1, 0xe0, 0xc3, 0xc0, 0xdc, 0xdc, 0x44, 0x89, 0x33, 0x91, 0x52, 0x44, 0xbb,
diff --git a/vendor/google.golang.org/genproto/protobuf/source_context/source_context.pb.go b/vendor/google.golang.org/genproto/protobuf/source_context/source_context.pb.go
index 0cedee09..c073ffb6 100644
--- a/vendor/google.golang.org/genproto/protobuf/source_context/source_context.pb.go
+++ b/vendor/google.golang.org/genproto/protobuf/source_context/source_context.pb.go
@@ -1,16 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/source_context.proto
 
-/*
-Package source_context is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/source_context.proto
-
-It has these top-level messages:
-	SourceContext
-*/
-package source_context
+package source_context // import "google.golang.org/genproto/protobuf/source_context"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -32,13 +23,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 type SourceContext struct {
 	// The path-qualified name of the .proto file that contained the associated
 	// protobuf element.  For example: `"google/protobuf/source_context.proto"`.
-	FileName string `protobuf:"bytes,1,opt,name=file_name,json=fileName" json:"file_name,omitempty"`
+	FileName             string   `protobuf:"bytes,1,opt,name=file_name,json=fileName,proto3" json:"file_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SourceContext) Reset()                    { *m = SourceContext{} }
-func (m *SourceContext) String() string            { return proto.CompactTextString(m) }
-func (*SourceContext) ProtoMessage()               {}
-func (*SourceContext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *SourceContext) Reset()         { *m = SourceContext{} }
+func (m *SourceContext) String() string { return proto.CompactTextString(m) }
+func (*SourceContext) ProtoMessage()    {}
+func (*SourceContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_context_4ade4e806de19b22, []int{0}
+}
+func (m *SourceContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SourceContext.Unmarshal(m, b)
+}
+func (m *SourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic)
+}
+func (dst *SourceContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceContext.Merge(dst, src)
+}
+func (m *SourceContext) XXX_Size() int {
+	return xxx_messageInfo_SourceContext.Size(m)
+}
+func (m *SourceContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_SourceContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SourceContext proto.InternalMessageInfo
 
 func (m *SourceContext) GetFileName() string {
 	if m != nil {
@@ -51,9 +64,11 @@ func init() {
 	proto.RegisterType((*SourceContext)(nil), "google.protobuf.SourceContext")
 }
 
-func init() { proto.RegisterFile("google/protobuf/source_context.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("google/protobuf/source_context.proto", fileDescriptor_source_context_4ade4e806de19b22)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_source_context_4ade4e806de19b22 = []byte{
 	// 184 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xce, 0x2f, 0x2d,
diff --git a/vendor/google.golang.org/genproto/regen.go b/vendor/google.golang.org/genproto/regen.go
index 9c906f20..53779b92 100644
--- a/vendor/google.golang.org/genproto/regen.go
+++ b/vendor/google.golang.org/genproto/regen.go
@@ -21,6 +21,9 @@
 // If the pkg_prefix flag is not an empty string,
 // any proto file without `go_package` option
 // or whose option does not begin with the prefix is ignored.
+// If multiple roots contain files with the same name,
+// eg "root1/path/to/file" and "root2/path/to/file",
+// only the first file is processed; the rest are ignored.
 // Protoc is executed on remaining files,
 // one invocation per set of files declaring the same Go package.
 package main
@@ -58,22 +61,33 @@ func main() {
 		log.Fatal("need go_out flag")
 	}
 
+	seenFiles := make(map[string]bool)
 	pkgFiles := make(map[string][]string)
-	walkFn := func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if !info.Mode().IsRegular() || !strings.HasSuffix(path, ".proto") {
+	for _, root := range flag.Args() {
+		walkFn := func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
+			if !info.Mode().IsRegular() || !strings.HasSuffix(path, ".proto") {
+				return nil
+			}
+
+			switch rel, err := filepath.Rel(root, path); {
+			case err != nil:
+				return err
+			case seenFiles[rel]:
+				return nil
+			default:
+				seenFiles[rel] = true
+			}
+
+			pkg, err := goPkg(path)
+			if err != nil {
+				return err
+			}
+			pkgFiles[pkg] = append(pkgFiles[pkg], path)
 			return nil
 		}
-		pkg, err := goPkg(path)
-		if err != nil {
-			return err
-		}
-		pkgFiles[pkg] = append(pkgFiles[pkg], path)
-		return nil
-	}
-	for _, root := range flag.Args() {
 		if err := filepath.Walk(root, walkFn); err != nil {
 			log.Fatal(err)
 		}
diff --git a/vendor/google.golang.org/genproto/regen.sh b/vendor/google.golang.org/genproto/regen.sh
index 8d9c7319..53e00fc3 100755
--- a/vendor/google.golang.org/genproto/regen.sh
+++ b/vendor/google.golang.org/genproto/regen.sh
@@ -24,7 +24,8 @@ set -e
 PKG=google.golang.org/genproto
 PROTO_REPO=https://github.com/google/protobuf
 PROTO_SUBDIR=src/google/protobuf
-API_REPO=https://github.com/googleapis/googleapis
+GOOGLEAPIS_REPO=https://github.com/googleapis/googleapis
+API_COMMON_REPO=https://github.com/googleapis/api-common-protos.git
 
 function die() {
   echo 1>&2 $*
@@ -57,18 +58,26 @@ fi
 
 if [ -z "$GOOGLEAPIS" ]; then
   apidir=$(mktemp -d -t regen-cds-api.XXXXXX)
-  git clone -q $API_REPO $apidir &
+  git clone -q $GOOGLEAPIS_REPO $apidir &
   remove_dirs="$remove_dirs $apidir"
 else
   apidir="$GOOGLEAPIS"
 fi
 
+if [ -z "$COMMONPROTOS" ]; then
+  commondir=$(mktemp -d -t regen-cds-common.XXXXXX)
+  git clone -q $API_COMMON_REPO $commondir &
+  remove_dirs="$remove_dirs $commondir"
+else
+  commondir="$COMMONPROTOS"
+fi
+
 wait
 
 # Nuke everything, we'll generate them back
 rm -r googleapis/ protobuf/
 
-go run regen.go -go_out "$root/src" -pkg_prefix "$PKG" "$apidir" "$protodir"
+go run regen.go -go_out "$root/src" -pkg_prefix "$PKG" "$commondir" "$apidir" "$protodir"
 
 # Sanity check the build.
 echo 1>&2 "Checking that the libraries build..."
diff --git a/vendor/google.golang.org/grpc/.travis.yml b/vendor/google.golang.org/grpc/.travis.yml
index 13af5396..5b5bfb13 100644
--- a/vendor/google.golang.org/grpc/.travis.yml
+++ b/vendor/google.golang.org/grpc/.travis.yml
@@ -1,23 +1,34 @@
 language: go
 
-go:
-  - 1.6.x
-  - 1.7.x
-  - 1.8.x
-  - 1.9.x
-
 matrix:
   include:
+  - go: 1.10.x
+    env: VET=1 RACE=1
+  - go: 1.6.x
+  - go: 1.7.x
+  - go: 1.8.x
+  - go: 1.9.x
   - go: 1.9.x
+    env: GAE=1
+  - go: 1.10.x
     env: RUN386=1
+  - go: 1.10.x
+    env: GRPC_GO_RETRY=on
 
 go_import_path: google.golang.org/grpc
 
 before_install:
-  - if [[ "$TRAVIS_GO_VERSION" = 1.9* && "$GOARCH" != "386" ]]; then ./vet.sh -install || exit 1; fi
+  - if [[ -n "$RUN386" ]]; then export GOARCH=386; fi
+  - if [[ "$TRAVIS_EVENT_TYPE" = "cron" && -z "$RUN386" ]]; then RACE=1; fi
+  - if [[ "$TRAVIS_EVENT_TYPE" != "cron" ]]; then VET_SKIP_PROTO=1; fi
+
+install:
+  - if [[ "$GAE" = 1 ]]; then source ./install_gae.sh; fi
+  - if [[ "$VET" = 1 ]]; then ./vet.sh -install; fi
 
 script:
-  - if [[ -n "$RUN386" ]]; then export GOARCH=386; fi
-  - if [[ "$TRAVIS_GO_VERSION" = 1.9* && "$GOARCH" != "386" ]]; then ./vet.sh || exit 1; fi
-  - make test || exit 1
-  - if [[ "$GOARCH" != "386" ]]; then make testrace; fi
+  - set -e
+  - if [[ "$GAE" = 1 ]]; then make testappengine; exit 0; fi
+  - if [[ "$VET" = 1 ]]; then ./vet.sh; fi
+  - make test
+  - if [[ "$RACE" = 1 ]]; then make testrace; fi
diff --git a/vendor/google.golang.org/grpc/CONTRIBUTING.md b/vendor/google.golang.org/grpc/CONTRIBUTING.md
index 8ec6c957..0863eb26 100644
--- a/vendor/google.golang.org/grpc/CONTRIBUTING.md
+++ b/vendor/google.golang.org/grpc/CONTRIBUTING.md
@@ -27,6 +27,10 @@ How to get your contributions merged smoothly and quickly.
 - Keep your PR up to date with upstream/master (if there are merge conflicts, we can't really merge your change).
  
 - **All tests need to be passing** before your change can be merged. We recommend you **run tests locally** before creating your PR to catch breakages early on.
+  - `make all` to test everything, OR
+  - `make vet` to catch vet errors
+  - `make test` to run the tests
+  - `make testrace` to run tests in race mode
 
 - Exceptions to the rules can be made if there's a compelling reason for doing so.
  
diff --git a/vendor/google.golang.org/grpc/Documentation/concurrency.md b/vendor/google.golang.org/grpc/Documentation/concurrency.md
new file mode 100644
index 00000000..d0c1142a
--- /dev/null
+++ b/vendor/google.golang.org/grpc/Documentation/concurrency.md
@@ -0,0 +1,33 @@
+# Concurrency
+
+In general, gRPC-go provides a concurrency-friendly API. What follows are some
+guidelines.
+
+## Clients
+
+A [ClientConn][client-conn] can safely be accessed concurrently. Using
+[helloworld][helloworld] as an example, one could share the `ClientConn` across
+multiple goroutines to create multiple `GreeterClient` types. In this case, RPCs
+would be sent in parallel.
+
+## Streams
+
+When using streams, one must take care to avoid calling either `SendMsg` or
+`RecvMsg` multiple times against the same [Stream][stream] from different
+goroutines. In other words, it's safe to have a goroutine calling `SendMsg` and
+another goroutine calling `RecvMsg` on the same stream at the same time. But it
+is not safe to call `SendMsg` on the same stream in different goroutines, or to
+call `RecvMsg` on the same stream in different goroutines.
+
+## Servers
+
+Each RPC handler attached to a registered server will be invoked in its own
+goroutine. For example, [SayHello][say-hello] will be invoked in its own
+goroutine. The same is true for service handlers for streaming RPCs, as seen
+in the route guide example [here][route-guide-stream].
+
+[helloworld]: https://github.com/grpc/grpc-go/blob/master/examples/helloworld/greeter_client/main.go#L43
+[client-conn]: https://godoc.org/google.golang.org/grpc#ClientConn
+[stream]: https://godoc.org/google.golang.org/grpc#Stream
+[say-hello]: https://github.com/grpc/grpc-go/blob/master/examples/helloworld/greeter_server/main.go#L41
+[route-guide-stream]: https://github.com/grpc/grpc-go/blob/master/examples/route_guide/server/server.go#L126
diff --git a/vendor/google.golang.org/grpc/Documentation/grpc-auth-support.md b/vendor/google.golang.org/grpc/Documentation/grpc-auth-support.md
index 1b6b14e9..b0232674 100644
--- a/vendor/google.golang.org/grpc/Documentation/grpc-auth-support.md
+++ b/vendor/google.golang.org/grpc/Documentation/grpc-auth-support.md
@@ -21,6 +21,43 @@ server := grpc.NewServer(grpc.Creds(creds))
 server.Serve(lis)
 ```
 
+# OAuth2
+
+For an example of how to configure client and server to use OAuth2 tokens, see
+[here](https://github.com/grpc/grpc-go/blob/master/examples/oauth/).
+
+## Validating a token on the server
+
+Clients may use
+[metadata.MD](https://godoc.org/google.golang.org/grpc/metadata#MD)
+to store tokens and other authentication-related data. To gain access to the
+`metadata.MD` object, a server may use
+[metadata.FromIncomingContext](https://godoc.org/google.golang.org/grpc/metadata#FromIncomingContext).
+With a reference to `metadata.MD` on the server, one needs to simply lookup the
+`authorization` key. Note, all keys stored within `metadata.MD` are normalized
+to lowercase. See [here](https://godoc.org/google.golang.org/grpc/metadata#New).
+
+It is possible to configure token validation for all RPCs using an interceptor.
+A server may configure either a
+[grpc.UnaryInterceptor](https://godoc.org/google.golang.org/grpc#UnaryInterceptor)
+or a
+[grpc.StreamInterceptor](https://godoc.org/google.golang.org/grpc#StreamInterceptor).
+
+## Adding a token to all outgoing client RPCs
+
+To send an OAuth2 token with each RPC, a client may configure the
+`grpc.DialOption`
+[grpc.WithPerRPCCredentials](https://godoc.org/google.golang.org/grpc#WithPerRPCCredentials).
+Alternatively, a client may also use the `grpc.CallOption`
+[grpc.PerRPCCredentials](https://godoc.org/google.golang.org/grpc#PerRPCCredentials)
+on each invocation of an RPC.
+
+To create a `credentials.PerRPCCredentials`, use
+[oauth.NewOauthAccess](https://godoc.org/google.golang.org/grpc/credentials/oauth#NewOauthAccess).
+Note, the OAuth2 implementation of `grpc.PerRPCCredentials` requires a client to use
+[grpc.WithTransportCredentials](https://godoc.org/google.golang.org/grpc#WithTransportCredentials)
+to prevent any insecure transmission of tokens.
+
 # Authenticating with Google
 
 ## Google Compute Engine (GCE)
diff --git a/vendor/google.golang.org/grpc/Documentation/log_levels.md b/vendor/google.golang.org/grpc/Documentation/log_levels.md
new file mode 100644
index 00000000..6839f6d0
--- /dev/null
+++ b/vendor/google.golang.org/grpc/Documentation/log_levels.md
@@ -0,0 +1,49 @@
+# Log Levels
+
+This document describes the different log levels supported by the grpc-go
+library, and under what conditions they should be used.
+
+### Info
+
+Info messages are for informational purposes and may aid in the debugging of
+applications or the gRPC library.
+
+Examples:
+- The name resolver received an update.
+- The balancer updated its picker.
+- Significant gRPC state is changing.
+
+At verbosity of 0 (the default), any single info message should not be output
+more than once every 5 minutes under normal operation.
+
+### Warning
+
+Warning messages indicate problems that are non-fatal for the application, but
+could lead to unexpected behavior or subsequent errors.
+
+Examples:
+- Resolver could not resolve target name.
+- Error received while connecting to a server.
+- Lost or corrupt connection with remote endpoint.
+
+### Error
+
+Error messages represent errors in the usage of gRPC that cannot be returned to
+the application as errors, or internal gRPC-Go errors that are recoverable.
+
+Internal errors are detected during gRPC tests and will result in test failures.
+
+Examples:
+- Invalid arguments passed to a function that cannot return an error.
+- An internal error that cannot be returned or would be inappropriate to return
+  to the user.
+
+### Fatal
+
+Fatal errors are severe internal errors that are unrecoverable.  These lead
+directly to panics, and are avoided as much as possible.
+
+Example:
+- Internal invariant was violated.
+- User attempted an action that cannot return an error gracefully, but would
+  lead to an invalid state if performed.
diff --git a/vendor/google.golang.org/grpc/Documentation/rpc-errors.md b/vendor/google.golang.org/grpc/Documentation/rpc-errors.md
new file mode 100644
index 00000000..27e74e05
--- /dev/null
+++ b/vendor/google.golang.org/grpc/Documentation/rpc-errors.md
@@ -0,0 +1,68 @@
+# RPC Errors
+
+All service method handlers should return `nil` or errors from the
+`status.Status` type. Clients have direct access to the errors.
+
+Upon encountering an error, a gRPC server method handler should create a
+`status.Status`. In typical usage, one would use [status.New][new-status]
+passing in an appropriate [codes.Code][code] as well as a description of the
+error to produce a `status.Status`. Calling [status.Err][status-err] converts
+the `status.Status` type into an `error`. As a convenience method, there is also
+[status.Error][status-error] which obviates the conversion step. Compare:
+
+```
+st := status.New(codes.NotFound, "some description")
+err := st.Err()
+
+// vs.
+
+err := status.Error(codes.NotFound, "some description")
+```
+
+## Adding additional details to errors
+
+In some cases, it may be necessary to add details for a particular error on the
+server side. The [status.WithDetails][with-details] method exists for this
+purpose. Clients may then read those details by first converting the plain
+`error` type back to a [status.Status][status] and then using
+[status.Details][details].
+
+## Example
+
+The [example][example] demonstrates the API discussed above and shows how to add
+information about rate limits to the error message using `status.Status`.
+
+To run the example, first start the server:
+
+```
+$ go run examples/rpc_errors/server/main.go
+```
+
+In a separate session, run the client:
+
+```
+$ go run examples/rpc_errors/client/main.go
+```
+
+On the first run of the client, all is well:
+
+```
+2018/03/12 19:39:33 Greeting: Hello world
+```
+
+Upon running the client a second time, the client exceeds the rate limit and
+receives an error with details:
+
+```
+2018/03/19 16:42:01 Quota failure: violations:<subject:"name:world" description:"Limit one greeting per person" >
+exit status 1
+```
+
+[status]:       https://godoc.org/google.golang.org/grpc/status#Status
+[new-status]:   https://godoc.org/google.golang.org/grpc/status#New
+[code]:         https://godoc.org/google.golang.org/grpc/codes#Code
+[with-details]: https://godoc.org/google.golang.org/grpc/status#Status.WithDetails
+[details]:      https://godoc.org/google.golang.org/grpc/status#Status.Details
+[status-err]:   https://godoc.org/google.golang.org/grpc/status#Status.Err
+[status-error]: https://godoc.org/google.golang.org/grpc/status#Error
+[example]:      https://github.com/grpc/grpc-go/blob/master/examples/rpc_errors
diff --git a/vendor/google.golang.org/grpc/Makefile b/vendor/google.golang.org/grpc/Makefile
index c4453437..50454530 100644
--- a/vendor/google.golang.org/grpc/Makefile
+++ b/vendor/google.golang.org/grpc/Makefile
@@ -1,4 +1,4 @@
-all: test testrace
+all: vet test testrace
 
 deps:
 	go get -d -v google.golang.org/grpc/...
@@ -9,6 +9,9 @@ updatedeps:
 testdeps:
 	go get -d -v -t google.golang.org/grpc/...
 
+testgaedeps:
+	goapp get -d -v -t -tags 'appengine appenginevm' google.golang.org/grpc/...
+
 updatetestdeps:
 	go get -d -v -t -u -f google.golang.org/grpc/...
 
@@ -22,12 +25,18 @@ proto:
 	fi
 	go generate google.golang.org/grpc/...
 
+vet:
+	./vet.sh
+
 test: testdeps
 	go test -cpu 1,4 -timeout 5m google.golang.org/grpc/...
 
 testrace: testdeps
 	go test -race -cpu 1,4 -timeout 7m google.golang.org/grpc/...
 
+testappengine: testgaedeps
+	goapp test -cpu 1,4 -timeout 5m google.golang.org/grpc/...
+
 clean:
 	go clean -i google.golang.org/grpc/...
 
@@ -36,10 +45,11 @@ clean:
 	deps \
 	updatedeps \
 	testdeps \
+	testgaedeps \
 	updatetestdeps \
 	build \
 	proto \
+	vet \
 	test \
 	testrace \
-	clean \
-	coverage
+	clean
diff --git a/vendor/google.golang.org/grpc/README.md b/vendor/google.golang.org/grpc/README.md
index 118327bb..789adfd6 100644
--- a/vendor/google.golang.org/grpc/README.md
+++ b/vendor/google.golang.org/grpc/README.md
@@ -16,8 +16,7 @@ $ go get -u google.golang.org/grpc
 Prerequisites
 -------------
 
-This requires Go 1.6 or later.  Go 1.7 will be required as of the next gRPC-Go
-release (1.8).
+This requires Go 1.6 or later. Go 1.7 will be required soon.
 
 Constraints
 -----------
diff --git a/vendor/google.golang.org/grpc/backoff.go b/vendor/google.golang.org/grpc/backoff.go
index c40facce..fa31565f 100644
--- a/vendor/google.golang.org/grpc/backoff.go
+++ b/vendor/google.golang.org/grpc/backoff.go
@@ -16,81 +16,23 @@
  *
  */
 
+// See internal/backoff package for the backoff implementation. This file is
+// kept for the exported types and API backward compatility.
+
 package grpc
 
 import (
-	"math/rand"
 	"time"
 )
 
 // DefaultBackoffConfig uses values specified for backoff in
 // https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
 var DefaultBackoffConfig = BackoffConfig{
-	MaxDelay:  120 * time.Second,
-	baseDelay: 1.0 * time.Second,
-	factor:    1.6,
-	jitter:    0.2,
-}
-
-// backoffStrategy defines the methodology for backing off after a grpc
-// connection failure.
-//
-// This is unexported until the gRPC project decides whether or not to allow
-// alternative backoff strategies. Once a decision is made, this type and its
-// method may be exported.
-type backoffStrategy interface {
-	// backoff returns the amount of time to wait before the next retry given
-	// the number of consecutive failures.
-	backoff(retries int) time.Duration
+	MaxDelay: 120 * time.Second,
 }
 
 // BackoffConfig defines the parameters for the default gRPC backoff strategy.
 type BackoffConfig struct {
 	// MaxDelay is the upper bound of backoff delay.
 	MaxDelay time.Duration
-
-	// TODO(stevvooe): The following fields are not exported, as allowing
-	// changes would violate the current gRPC specification for backoff. If
-	// gRPC decides to allow more interesting backoff strategies, these fields
-	// may be opened up in the future.
-
-	// baseDelay is the amount of time to wait before retrying after the first
-	// failure.
-	baseDelay time.Duration
-
-	// factor is applied to the backoff after each retry.
-	factor float64
-
-	// jitter provides a range to randomize backoff delays.
-	jitter float64
-}
-
-func setDefaults(bc *BackoffConfig) {
-	md := bc.MaxDelay
-	*bc = DefaultBackoffConfig
-
-	if md > 0 {
-		bc.MaxDelay = md
-	}
-}
-
-func (bc BackoffConfig) backoff(retries int) time.Duration {
-	if retries == 0 {
-		return bc.baseDelay
-	}
-	backoff, max := float64(bc.baseDelay), float64(bc.MaxDelay)
-	for backoff < max && retries > 0 {
-		backoff *= bc.factor
-		retries--
-	}
-	if backoff > max {
-		backoff = max
-	}
-	// Randomize backoff delays so that if a cluster of requests start at
-	// the same time, they won't operate in lockstep.
-	backoff *= 1 + bc.jitter*(rand.Float64()*2-1)
-	if backoff < 0 {
-		return 0
-	}
-	return time.Duration(backoff)
 }
diff --git a/vendor/google.golang.org/grpc/balancer.go b/vendor/google.golang.org/grpc/balancer.go
index 300da6c5..e1730166 100644
--- a/vendor/google.golang.org/grpc/balancer.go
+++ b/vendor/google.golang.org/grpc/balancer.go
@@ -32,7 +32,8 @@ import (
 )
 
 // Address represents a server the client connects to.
-// This is the EXPERIMENTAL API and may be changed or extended in the future.
+//
+// Deprecated: please use package balancer.
 type Address struct {
 	// Addr is the server address on which a connection will be established.
 	Addr string
@@ -42,6 +43,8 @@ type Address struct {
 }
 
 // BalancerConfig specifies the configurations for Balancer.
+//
+// Deprecated: please use package balancer.
 type BalancerConfig struct {
 	// DialCreds is the transport credential the Balancer implementation can
 	// use to dial to a remote load balancer server. The Balancer implementations
@@ -54,7 +57,8 @@ type BalancerConfig struct {
 }
 
 // BalancerGetOptions configures a Get call.
-// This is the EXPERIMENTAL API and may be changed or extended in the future.
+//
+// Deprecated: please use package balancer.
 type BalancerGetOptions struct {
 	// BlockingWait specifies whether Get should block when there is no
 	// connected address.
@@ -62,7 +66,8 @@ type BalancerGetOptions struct {
 }
 
 // Balancer chooses network addresses for RPCs.
-// This is the EXPERIMENTAL API and may be changed or extended in the future.
+//
+// Deprecated: please use package balancer.
 type Balancer interface {
 	// Start does the initialization work to bootstrap a Balancer. For example,
 	// this function may start the name resolution and watch the updates. It will
@@ -135,6 +140,8 @@ func downErrorf(timeout, temporary bool, format string, a ...interface{}) downEr
 
 // RoundRobin returns a Balancer that selects addresses round-robin. It uses r to watch
 // the name resolution updates and updates the addresses available correspondingly.
+//
+// Deprecated: please use package balancer/roundrobin.
 func RoundRobin(r naming.Resolver) Balancer {
 	return &roundRobin{r: r}
 }
diff --git a/vendor/google.golang.org/grpc/balancer/balancer.go b/vendor/google.golang.org/grpc/balancer/balancer.go
index 219a2940..069feb1e 100644
--- a/vendor/google.golang.org/grpc/balancer/balancer.go
+++ b/vendor/google.golang.org/grpc/balancer/balancer.go
@@ -36,9 +36,12 @@ var (
 	m = make(map[string]Builder)
 )
 
-// Register registers the balancer builder to the balancer map.
-// b.Name (lowercased) will be used as the name registered with
-// this builder.
+// Register registers the balancer builder to the balancer map. b.Name
+// (lowercased) will be used as the name registered with this builder.
+//
+// NOTE: this function must only be called during initialization time (i.e. in
+// an init() function), and is not thread-safe. If multiple Balancers are
+// registered with the same name, the one registered last will take effect.
 func Register(b Builder) {
 	m[strings.ToLower(b.Name())] = b
 }
@@ -126,6 +129,8 @@ type BuildOptions struct {
 	// to a remote load balancer server. The Balancer implementations
 	// can ignore this if it doesn't need to talk to remote balancer.
 	Dialer func(context.Context, string) (net.Conn, error)
+	// ChannelzParentID is the entity parent's channelz unique identification number.
+	ChannelzParentID int64
 }
 
 // Builder creates a balancer.
@@ -138,7 +143,11 @@ type Builder interface {
 }
 
 // PickOptions contains addition information for the Pick operation.
-type PickOptions struct{}
+type PickOptions struct {
+	// FullMethodName is the method name that NewClientStream() is called
+	// with. The canonical format is /service/Method.
+	FullMethodName string
+}
 
 // DoneInfo contains additional information for done.
 type DoneInfo struct {
@@ -160,7 +169,7 @@ var (
 )
 
 // Picker is used by gRPC to pick a SubConn to send an RPC.
-// Balancer is expected to generate a new picker from its snapshot everytime its
+// Balancer is expected to generate a new picker from its snapshot every time its
 // internal state has changed.
 //
 // The pickers used by gRPC can be updated by ClientConn.UpdateBalancerState().
@@ -221,3 +230,45 @@ type Balancer interface {
 	// ClientConn.RemoveSubConn for its existing SubConns.
 	Close()
 }
+
+// ConnectivityStateEvaluator takes the connectivity states of multiple SubConns
+// and returns one aggregated connectivity state.
+//
+// It's not thread safe.
+type ConnectivityStateEvaluator struct {
+	numReady            uint64 // Number of addrConns in ready state.
+	numConnecting       uint64 // Number of addrConns in connecting state.
+	numTransientFailure uint64 // Number of addrConns in transientFailure.
+}
+
+// RecordTransition records state change happening in subConn and based on that
+// it evaluates what aggregated state should be.
+//
+//  - If at least one SubConn in Ready, the aggregated state is Ready;
+//  - Else if at least one SubConn in Connecting, the aggregated state is Connecting;
+//  - Else the aggregated state is TransientFailure.
+//
+// Idle and Shutdown are not considered.
+func (cse *ConnectivityStateEvaluator) RecordTransition(oldState, newState connectivity.State) connectivity.State {
+	// Update counters.
+	for idx, state := range []connectivity.State{oldState, newState} {
+		updateVal := 2*uint64(idx) - 1 // -1 for oldState and +1 for new.
+		switch state {
+		case connectivity.Ready:
+			cse.numReady += updateVal
+		case connectivity.Connecting:
+			cse.numConnecting += updateVal
+		case connectivity.TransientFailure:
+			cse.numTransientFailure += updateVal
+		}
+	}
+
+	// Evaluate.
+	if cse.numReady > 0 {
+		return connectivity.Ready
+	}
+	if cse.numConnecting > 0 {
+		return connectivity.Connecting
+	}
+	return connectivity.TransientFailure
+}
diff --git a/vendor/google.golang.org/grpc/balancer/base/balancer.go b/vendor/google.golang.org/grpc/balancer/base/balancer.go
index 1e962b72..23d13511 100644
--- a/vendor/google.golang.org/grpc/balancer/base/balancer.go
+++ b/vendor/google.golang.org/grpc/balancer/base/balancer.go
@@ -146,7 +146,6 @@ func (b *baseBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectiv
 	}
 
 	b.cc.UpdateBalancerState(b.state, b.picker)
-	return
 }
 
 // Close is a nop because base balancer doesn't have internal state to clean up,
diff --git a/vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go b/vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
new file mode 100644
index 00000000..a72b014e
--- /dev/null
+++ b/vendor/google.golang.org/grpc/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go
@@ -0,0 +1,840 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: grpc/lb/v1/load_balancer.proto
+
+package grpc_lb_v1 // import "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type LoadBalanceRequest struct {
+	// Types that are valid to be assigned to LoadBalanceRequestType:
+	//	*LoadBalanceRequest_InitialRequest
+	//	*LoadBalanceRequest_ClientStats
+	LoadBalanceRequestType isLoadBalanceRequest_LoadBalanceRequestType `protobuf_oneof:"load_balance_request_type"`
+	XXX_NoUnkeyedLiteral   struct{}                                    `json:"-"`
+	XXX_unrecognized       []byte                                      `json:"-"`
+	XXX_sizecache          int32                                       `json:"-"`
+}
+
+func (m *LoadBalanceRequest) Reset()         { *m = LoadBalanceRequest{} }
+func (m *LoadBalanceRequest) String() string { return proto.CompactTextString(m) }
+func (*LoadBalanceRequest) ProtoMessage()    {}
+func (*LoadBalanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_load_balancer_eea3e5156960c20a, []int{0}
+}
+func (m *LoadBalanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoadBalanceRequest.Unmarshal(m, b)
+}
+func (m *LoadBalanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoadBalanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *LoadBalanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoadBalanceRequest.Merge(dst, src)
+}
+func (m *LoadBalanceRequest) XXX_Size() int {
+	return xxx_messageInfo_LoadBalanceRequest.Size(m)
+}
+func (m *LoadBalanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoadBalanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LoadBalanceRequest proto.InternalMessageInfo
+
+type isLoadBalanceRequest_LoadBalanceRequestType interface {
+	isLoadBalanceRequest_LoadBalanceRequestType()
+}
+
+type LoadBalanceRequest_InitialRequest struct {
+	InitialRequest *InitialLoadBalanceRequest `protobuf:"bytes,1,opt,name=initial_request,json=initialRequest,proto3,oneof"`
+}
+
+type LoadBalanceRequest_ClientStats struct {
+	ClientStats *ClientStats `protobuf:"bytes,2,opt,name=client_stats,json=clientStats,proto3,oneof"`
+}
+
+func (*LoadBalanceRequest_InitialRequest) isLoadBalanceRequest_LoadBalanceRequestType() {}
+
+func (*LoadBalanceRequest_ClientStats) isLoadBalanceRequest_LoadBalanceRequestType() {}
+
+func (m *LoadBalanceRequest) GetLoadBalanceRequestType() isLoadBalanceRequest_LoadBalanceRequestType {
+	if m != nil {
+		return m.LoadBalanceRequestType
+	}
+	return nil
+}
+
+func (m *LoadBalanceRequest) GetInitialRequest() *InitialLoadBalanceRequest {
+	if x, ok := m.GetLoadBalanceRequestType().(*LoadBalanceRequest_InitialRequest); ok {
+		return x.InitialRequest
+	}
+	return nil
+}
+
+func (m *LoadBalanceRequest) GetClientStats() *ClientStats {
+	if x, ok := m.GetLoadBalanceRequestType().(*LoadBalanceRequest_ClientStats); ok {
+		return x.ClientStats
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*LoadBalanceRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _LoadBalanceRequest_OneofMarshaler, _LoadBalanceRequest_OneofUnmarshaler, _LoadBalanceRequest_OneofSizer, []interface{}{
+		(*LoadBalanceRequest_InitialRequest)(nil),
+		(*LoadBalanceRequest_ClientStats)(nil),
+	}
+}
+
+func _LoadBalanceRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*LoadBalanceRequest)
+	// load_balance_request_type
+	switch x := m.LoadBalanceRequestType.(type) {
+	case *LoadBalanceRequest_InitialRequest:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InitialRequest); err != nil {
+			return err
+		}
+	case *LoadBalanceRequest_ClientStats:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ClientStats); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("LoadBalanceRequest.LoadBalanceRequestType has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _LoadBalanceRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*LoadBalanceRequest)
+	switch tag {
+	case 1: // load_balance_request_type.initial_request
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InitialLoadBalanceRequest)
+		err := b.DecodeMessage(msg)
+		m.LoadBalanceRequestType = &LoadBalanceRequest_InitialRequest{msg}
+		return true, err
+	case 2: // load_balance_request_type.client_stats
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ClientStats)
+		err := b.DecodeMessage(msg)
+		m.LoadBalanceRequestType = &LoadBalanceRequest_ClientStats{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _LoadBalanceRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*LoadBalanceRequest)
+	// load_balance_request_type
+	switch x := m.LoadBalanceRequestType.(type) {
+	case *LoadBalanceRequest_InitialRequest:
+		s := proto.Size(x.InitialRequest)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *LoadBalanceRequest_ClientStats:
+		s := proto.Size(x.ClientStats)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type InitialLoadBalanceRequest struct {
+	// The name of the load balanced service (e.g., service.googleapis.com). Its
+	// length should be less than 256 bytes.
+	// The name might include a port number. How to handle the port number is up
+	// to the balancer.
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *InitialLoadBalanceRequest) Reset()         { *m = InitialLoadBalanceRequest{} }
+func (m *InitialLoadBalanceRequest) String() string { return proto.CompactTextString(m) }
+func (*InitialLoadBalanceRequest) ProtoMessage()    {}
+func (*InitialLoadBalanceRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_load_balancer_eea3e5156960c20a, []int{1}
+}
+func (m *InitialLoadBalanceRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InitialLoadBalanceRequest.Unmarshal(m, b)
+}
+func (m *InitialLoadBalanceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InitialLoadBalanceRequest.Marshal(b, m, deterministic)
+}
+func (dst *InitialLoadBalanceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InitialLoadBalanceRequest.Merge(dst, src)
+}
+func (m *InitialLoadBalanceRequest) XXX_Size() int {
+	return xxx_messageInfo_InitialLoadBalanceRequest.Size(m)
+}
+func (m *InitialLoadBalanceRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_InitialLoadBalanceRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InitialLoadBalanceRequest proto.InternalMessageInfo
+
+func (m *InitialLoadBalanceRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Contains the number of calls finished for a particular load balance token.
+type ClientStatsPerToken struct {
+	// See Server.load_balance_token.
+	LoadBalanceToken string `protobuf:"bytes,1,opt,name=load_balance_token,json=loadBalanceToken,proto3" json:"load_balance_token,omitempty"`
+	// The total number of RPCs that finished associated with the token.
+	NumCalls             int64    `protobuf:"varint,2,opt,name=num_calls,json=numCalls,proto3" json:"num_calls,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClientStatsPerToken) Reset()         { *m = ClientStatsPerToken{} }
+func (m *ClientStatsPerToken) String() string { return proto.CompactTextString(m) }
+func (*ClientStatsPerToken) ProtoMessage()    {}
+func (*ClientStatsPerToken) Descriptor() ([]byte, []int) {
+	return fileDescriptor_load_balancer_eea3e5156960c20a, []int{2}
+}
+func (m *ClientStatsPerToken) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientStatsPerToken.Unmarshal(m, b)
+}
+func (m *ClientStatsPerToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientStatsPerToken.Marshal(b, m, deterministic)
+}
+func (dst *ClientStatsPerToken) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientStatsPerToken.Merge(dst, src)
+}
+func (m *ClientStatsPerToken) XXX_Size() int {
+	return xxx_messageInfo_ClientStatsPerToken.Size(m)
+}
+func (m *ClientStatsPerToken) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientStatsPerToken.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClientStatsPerToken proto.InternalMessageInfo
+
+func (m *ClientStatsPerToken) GetLoadBalanceToken() string {
+	if m != nil {
+		return m.LoadBalanceToken
+	}
+	return ""
+}
+
+func (m *ClientStatsPerToken) GetNumCalls() int64 {
+	if m != nil {
+		return m.NumCalls
+	}
+	return 0
+}
+
+// Contains client level statistics that are useful to load balancing. Each
+// count except the timestamp should be reset to zero after reporting the stats.
+type ClientStats struct {
+	// The timestamp of generating the report.
+	Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	// The total number of RPCs that started.
+	NumCallsStarted int64 `protobuf:"varint,2,opt,name=num_calls_started,json=numCallsStarted,proto3" json:"num_calls_started,omitempty"`
+	// The total number of RPCs that finished.
+	NumCallsFinished int64 `protobuf:"varint,3,opt,name=num_calls_finished,json=numCallsFinished,proto3" json:"num_calls_finished,omitempty"`
+	// The total number of RPCs that failed to reach a server except dropped RPCs.
+	NumCallsFinishedWithClientFailedToSend int64 `protobuf:"varint,6,opt,name=num_calls_finished_with_client_failed_to_send,json=numCallsFinishedWithClientFailedToSend,proto3" json:"num_calls_finished_with_client_failed_to_send,omitempty"`
+	// The total number of RPCs that finished and are known to have been received
+	// by a server.
+	NumCallsFinishedKnownReceived int64 `protobuf:"varint,7,opt,name=num_calls_finished_known_received,json=numCallsFinishedKnownReceived,proto3" json:"num_calls_finished_known_received,omitempty"`
+	// The list of dropped calls.
+	CallsFinishedWithDrop []*ClientStatsPerToken `protobuf:"bytes,8,rep,name=calls_finished_with_drop,json=callsFinishedWithDrop,proto3" json:"calls_finished_with_drop,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{}               `json:"-"`
+	XXX_unrecognized      []byte                 `json:"-"`
+	XXX_sizecache         int32                  `json:"-"`
+}
+
+func (m *ClientStats) Reset()         { *m = ClientStats{} }
+func (m *ClientStats) String() string { return proto.CompactTextString(m) }
+func (*ClientStats) ProtoMessage()    {}
+func (*ClientStats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_load_balancer_eea3e5156960c20a, []int{3}
+}
+func (m *ClientStats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientStats.Unmarshal(m, b)
+}
+func (m *ClientStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientStats.Marshal(b, m, deterministic)
+}
+func (dst *ClientStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientStats.Merge(dst, src)
+}
+func (m *ClientStats) XXX_Size() int {
+	return xxx_messageInfo_ClientStats.Size(m)
+}
+func (m *ClientStats) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientStats.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClientStats proto.InternalMessageInfo
+
+func (m *ClientStats) GetTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.Timestamp
+	}
+	return nil
+}
+
+func (m *ClientStats) GetNumCallsStarted() int64 {
+	if m != nil {
+		return m.NumCallsStarted
+	}
+	return 0
+}
+
+func (m *ClientStats) GetNumCallsFinished() int64 {
+	if m != nil {
+		return m.NumCallsFinished
+	}
+	return 0
+}
+
+func (m *ClientStats) GetNumCallsFinishedWithClientFailedToSend() int64 {
+	if m != nil {
+		return m.NumCallsFinishedWithClientFailedToSend
+	}
+	return 0
+}
+
+func (m *ClientStats) GetNumCallsFinishedKnownReceived() int64 {
+	if m != nil {
+		return m.NumCallsFinishedKnownReceived
+	}
+	return 0
+}
+
+func (m *ClientStats) GetCallsFinishedWithDrop() []*ClientStatsPerToken {
+	if m != nil {
+		return m.CallsFinishedWithDrop
+	}
+	return nil
+}
+
+type LoadBalanceResponse struct {
+	// Types that are valid to be assigned to LoadBalanceResponseType:
+	//	*LoadBalanceResponse_InitialResponse
+	//	*LoadBalanceResponse_ServerList
+	LoadBalanceResponseType isLoadBalanceResponse_LoadBalanceResponseType `protobuf_oneof:"load_balance_response_type"`
+	XXX_NoUnkeyedLiteral    struct{}                                      `json:"-"`
+	XXX_unrecognized        []byte                                        `json:"-"`
+	XXX_sizecache           int32                                         `json:"-"`
+}
+
+func (m *LoadBalanceResponse) Reset()         { *m = LoadBalanceResponse{} }
+func (m *LoadBalanceResponse) String() string { return proto.CompactTextString(m) }
+func (*LoadBalanceResponse) ProtoMessage()    {}
+func (*LoadBalanceResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_load_balancer_eea3e5156960c20a, []int{4}
+}
+func (m *LoadBalanceResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoadBalanceResponse.Unmarshal(m, b)
+}
+func (m *LoadBalanceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoadBalanceResponse.Marshal(b, m, deterministic)
+}
+func (dst *LoadBalanceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoadBalanceResponse.Merge(dst, src)
+}
+func (m *LoadBalanceResponse) XXX_Size() int {
+	return xxx_messageInfo_LoadBalanceResponse.Size(m)
+}
+func (m *LoadBalanceResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoadBalanceResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LoadBalanceResponse proto.InternalMessageInfo
+
+type isLoadBalanceResponse_LoadBalanceResponseType interface {
+	isLoadBalanceResponse_LoadBalanceResponseType()
+}
+
+type LoadBalanceResponse_InitialResponse struct {
+	InitialResponse *InitialLoadBalanceResponse `protobuf:"bytes,1,opt,name=initial_response,json=initialResponse,proto3,oneof"`
+}
+
+type LoadBalanceResponse_ServerList struct {
+	ServerList *ServerList `protobuf:"bytes,2,opt,name=server_list,json=serverList,proto3,oneof"`
+}
+
+func (*LoadBalanceResponse_InitialResponse) isLoadBalanceResponse_LoadBalanceResponseType() {}
+
+func (*LoadBalanceResponse_ServerList) isLoadBalanceResponse_LoadBalanceResponseType() {}
+
+func (m *LoadBalanceResponse) GetLoadBalanceResponseType() isLoadBalanceResponse_LoadBalanceResponseType {
+	if m != nil {
+		return m.LoadBalanceResponseType
+	}
+	return nil
+}
+
+func (m *LoadBalanceResponse) GetInitialResponse() *InitialLoadBalanceResponse {
+	if x, ok := m.GetLoadBalanceResponseType().(*LoadBalanceResponse_InitialResponse); ok {
+		return x.InitialResponse
+	}
+	return nil
+}
+
+func (m *LoadBalanceResponse) GetServerList() *ServerList {
+	if x, ok := m.GetLoadBalanceResponseType().(*LoadBalanceResponse_ServerList); ok {
+		return x.ServerList
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*LoadBalanceResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _LoadBalanceResponse_OneofMarshaler, _LoadBalanceResponse_OneofUnmarshaler, _LoadBalanceResponse_OneofSizer, []interface{}{
+		(*LoadBalanceResponse_InitialResponse)(nil),
+		(*LoadBalanceResponse_ServerList)(nil),
+	}
+}
+
+func _LoadBalanceResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*LoadBalanceResponse)
+	// load_balance_response_type
+	switch x := m.LoadBalanceResponseType.(type) {
+	case *LoadBalanceResponse_InitialResponse:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.InitialResponse); err != nil {
+			return err
+		}
+	case *LoadBalanceResponse_ServerList:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ServerList); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("LoadBalanceResponse.LoadBalanceResponseType has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _LoadBalanceResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*LoadBalanceResponse)
+	switch tag {
+	case 1: // load_balance_response_type.initial_response
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(InitialLoadBalanceResponse)
+		err := b.DecodeMessage(msg)
+		m.LoadBalanceResponseType = &LoadBalanceResponse_InitialResponse{msg}
+		return true, err
+	case 2: // load_balance_response_type.server_list
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ServerList)
+		err := b.DecodeMessage(msg)
+		m.LoadBalanceResponseType = &LoadBalanceResponse_ServerList{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _LoadBalanceResponse_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*LoadBalanceResponse)
+	// load_balance_response_type
+	switch x := m.LoadBalanceResponseType.(type) {
+	case *LoadBalanceResponse_InitialResponse:
+		s := proto.Size(x.InitialResponse)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *LoadBalanceResponse_ServerList:
+		s := proto.Size(x.ServerList)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type InitialLoadBalanceResponse struct {
+	// This is an application layer redirect that indicates the client should use
+	// the specified server for load balancing. When this field is non-empty in
+	// the response, the client should open a separate connection to the
+	// load_balancer_delegate and call the BalanceLoad method. Its length should
+	// be less than 64 bytes.
+	LoadBalancerDelegate string `protobuf:"bytes,1,opt,name=load_balancer_delegate,json=loadBalancerDelegate,proto3" json:"load_balancer_delegate,omitempty"`
+	// This interval defines how often the client should send the client stats
+	// to the load balancer. Stats should only be reported when the duration is
+	// positive.
+	ClientStatsReportInterval *duration.Duration `protobuf:"bytes,2,opt,name=client_stats_report_interval,json=clientStatsReportInterval,proto3" json:"client_stats_report_interval,omitempty"`
+	XXX_NoUnkeyedLiteral      struct{}           `json:"-"`
+	XXX_unrecognized          []byte             `json:"-"`
+	XXX_sizecache             int32              `json:"-"`
+}
+
+func (m *InitialLoadBalanceResponse) Reset()         { *m = InitialLoadBalanceResponse{} }
+func (m *InitialLoadBalanceResponse) String() string { return proto.CompactTextString(m) }
+func (*InitialLoadBalanceResponse) ProtoMessage()    {}
+func (*InitialLoadBalanceResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_load_balancer_eea3e5156960c20a, []int{5}
+}
+func (m *InitialLoadBalanceResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InitialLoadBalanceResponse.Unmarshal(m, b)
+}
+func (m *InitialLoadBalanceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InitialLoadBalanceResponse.Marshal(b, m, deterministic)
+}
+func (dst *InitialLoadBalanceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InitialLoadBalanceResponse.Merge(dst, src)
+}
+func (m *InitialLoadBalanceResponse) XXX_Size() int {
+	return xxx_messageInfo_InitialLoadBalanceResponse.Size(m)
+}
+func (m *InitialLoadBalanceResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_InitialLoadBalanceResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InitialLoadBalanceResponse proto.InternalMessageInfo
+
+func (m *InitialLoadBalanceResponse) GetLoadBalancerDelegate() string {
+	if m != nil {
+		return m.LoadBalancerDelegate
+	}
+	return ""
+}
+
+func (m *InitialLoadBalanceResponse) GetClientStatsReportInterval() *duration.Duration {
+	if m != nil {
+		return m.ClientStatsReportInterval
+	}
+	return nil
+}
+
+type ServerList struct {
+	// Contains a list of servers selected by the load balancer. The list will
+	// be updated when server resolutions change or as needed to balance load
+	// across more servers. The client should consume the server list in order
+	// unless instructed otherwise via the client_config.
+	Servers              []*Server `protobuf:"bytes,1,rep,name=servers,proto3" json:"servers,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
+	XXX_unrecognized     []byte    `json:"-"`
+	XXX_sizecache        int32     `json:"-"`
+}
+
+func (m *ServerList) Reset()         { *m = ServerList{} }
+func (m *ServerList) String() string { return proto.CompactTextString(m) }
+func (*ServerList) ProtoMessage()    {}
+func (*ServerList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_load_balancer_eea3e5156960c20a, []int{6}
+}
+func (m *ServerList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerList.Unmarshal(m, b)
+}
+func (m *ServerList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerList.Marshal(b, m, deterministic)
+}
+func (dst *ServerList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerList.Merge(dst, src)
+}
+func (m *ServerList) XXX_Size() int {
+	return xxx_messageInfo_ServerList.Size(m)
+}
+func (m *ServerList) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerList proto.InternalMessageInfo
+
+func (m *ServerList) GetServers() []*Server {
+	if m != nil {
+		return m.Servers
+	}
+	return nil
+}
+
+// Contains server information. When the drop field is not true, use the other
+// fields.
+type Server struct {
+	// A resolved address for the server, serialized in network-byte-order. It may
+	// either be an IPv4 or IPv6 address.
+	IpAddress []byte `protobuf:"bytes,1,opt,name=ip_address,json=ipAddress,proto3" json:"ip_address,omitempty"`
+	// A resolved port number for the server.
+	Port int32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
+	// An opaque but printable token for load reporting. The client must include
+	// the token of the picked server into the initial metadata when it starts a
+	// call to that server. The token is used by the server to verify the request
+	// and to allow the server to report load to the gRPC LB system. The token is
+	// also used in client stats for reporting dropped calls.
+	//
+	// Its length can be variable but must be less than 50 bytes.
+	LoadBalanceToken string `protobuf:"bytes,3,opt,name=load_balance_token,json=loadBalanceToken,proto3" json:"load_balance_token,omitempty"`
+	// Indicates whether this particular request should be dropped by the client.
+	// If the request is dropped, there will be a corresponding entry in
+	// ClientStats.calls_finished_with_drop.
+	Drop                 bool     `protobuf:"varint,4,opt,name=drop,proto3" json:"drop,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Server) Reset()         { *m = Server{} }
+func (m *Server) String() string { return proto.CompactTextString(m) }
+func (*Server) ProtoMessage()    {}
+func (*Server) Descriptor() ([]byte, []int) {
+	return fileDescriptor_load_balancer_eea3e5156960c20a, []int{7}
+}
+func (m *Server) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Server.Unmarshal(m, b)
+}
+func (m *Server) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Server.Marshal(b, m, deterministic)
+}
+func (dst *Server) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Server.Merge(dst, src)
+}
+func (m *Server) XXX_Size() int {
+	return xxx_messageInfo_Server.Size(m)
+}
+func (m *Server) XXX_DiscardUnknown() {
+	xxx_messageInfo_Server.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Server proto.InternalMessageInfo
+
+func (m *Server) GetIpAddress() []byte {
+	if m != nil {
+		return m.IpAddress
+	}
+	return nil
+}
+
+func (m *Server) GetPort() int32 {
+	if m != nil {
+		return m.Port
+	}
+	return 0
+}
+
+func (m *Server) GetLoadBalanceToken() string {
+	if m != nil {
+		return m.LoadBalanceToken
+	}
+	return ""
+}
+
+func (m *Server) GetDrop() bool {
+	if m != nil {
+		return m.Drop
+	}
+	return false
+}
+
+func init() {
+	proto.RegisterType((*LoadBalanceRequest)(nil), "grpc.lb.v1.LoadBalanceRequest")
+	proto.RegisterType((*InitialLoadBalanceRequest)(nil), "grpc.lb.v1.InitialLoadBalanceRequest")
+	proto.RegisterType((*ClientStatsPerToken)(nil), "grpc.lb.v1.ClientStatsPerToken")
+	proto.RegisterType((*ClientStats)(nil), "grpc.lb.v1.ClientStats")
+	proto.RegisterType((*LoadBalanceResponse)(nil), "grpc.lb.v1.LoadBalanceResponse")
+	proto.RegisterType((*InitialLoadBalanceResponse)(nil), "grpc.lb.v1.InitialLoadBalanceResponse")
+	proto.RegisterType((*ServerList)(nil), "grpc.lb.v1.ServerList")
+	proto.RegisterType((*Server)(nil), "grpc.lb.v1.Server")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// LoadBalancerClient is the client API for LoadBalancer service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type LoadBalancerClient interface {
+	// Bidirectional rpc to get a list of servers.
+	BalanceLoad(ctx context.Context, opts ...grpc.CallOption) (LoadBalancer_BalanceLoadClient, error)
+}
+
+type loadBalancerClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewLoadBalancerClient(cc *grpc.ClientConn) LoadBalancerClient {
+	return &loadBalancerClient{cc}
+}
+
+func (c *loadBalancerClient) BalanceLoad(ctx context.Context, opts ...grpc.CallOption) (LoadBalancer_BalanceLoadClient, error) {
+	stream, err := c.cc.NewStream(ctx, &_LoadBalancer_serviceDesc.Streams[0], "/grpc.lb.v1.LoadBalancer/BalanceLoad", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &loadBalancerBalanceLoadClient{stream}
+	return x, nil
+}
+
+type LoadBalancer_BalanceLoadClient interface {
+	Send(*LoadBalanceRequest) error
+	Recv() (*LoadBalanceResponse, error)
+	grpc.ClientStream
+}
+
+type loadBalancerBalanceLoadClient struct {
+	grpc.ClientStream
+}
+
+func (x *loadBalancerBalanceLoadClient) Send(m *LoadBalanceRequest) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *loadBalancerBalanceLoadClient) Recv() (*LoadBalanceResponse, error) {
+	m := new(LoadBalanceResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// LoadBalancerServer is the server API for LoadBalancer service.
+type LoadBalancerServer interface {
+	// Bidirectional rpc to get a list of servers.
+	BalanceLoad(LoadBalancer_BalanceLoadServer) error
+}
+
+func RegisterLoadBalancerServer(s *grpc.Server, srv LoadBalancerServer) {
+	s.RegisterService(&_LoadBalancer_serviceDesc, srv)
+}
+
+func _LoadBalancer_BalanceLoad_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(LoadBalancerServer).BalanceLoad(&loadBalancerBalanceLoadServer{stream})
+}
+
+type LoadBalancer_BalanceLoadServer interface {
+	Send(*LoadBalanceResponse) error
+	Recv() (*LoadBalanceRequest, error)
+	grpc.ServerStream
+}
+
+type loadBalancerBalanceLoadServer struct {
+	grpc.ServerStream
+}
+
+func (x *loadBalancerBalanceLoadServer) Send(m *LoadBalanceResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func (x *loadBalancerBalanceLoadServer) Recv() (*LoadBalanceRequest, error) {
+	m := new(LoadBalanceRequest)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+var _LoadBalancer_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "grpc.lb.v1.LoadBalancer",
+	HandlerType: (*LoadBalancerServer)(nil),
+	Methods:     []grpc.MethodDesc{},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "BalanceLoad",
+			Handler:       _LoadBalancer_BalanceLoad_Handler,
+			ServerStreams: true,
+			ClientStreams: true,
+		},
+	},
+	Metadata: "grpc/lb/v1/load_balancer.proto",
+}
+
+func init() {
+	proto.RegisterFile("grpc/lb/v1/load_balancer.proto", fileDescriptor_load_balancer_eea3e5156960c20a)
+}
+
+var fileDescriptor_load_balancer_eea3e5156960c20a = []byte{
+	// 756 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0xdd, 0x6e, 0x23, 0x35,
+	0x14, 0xee, 0x90, 0x69, 0x36, 0x39, 0xa9, 0xb6, 0x59, 0x2f, 0x2c, 0x93, 0xec, 0x6e, 0x5b, 0x22,
+	0xb1, 0x8a, 0xd0, 0x32, 0x43, 0x0a, 0x17, 0x20, 0x71, 0x01, 0xd9, 0x6a, 0x95, 0x2d, 0xbd, 0x88,
+	0x9c, 0x4a, 0x54, 0x95, 0x90, 0x99, 0xc9, 0xb8, 0xa9, 0x55, 0xc7, 0x1e, 0x3c, 0x4e, 0x2a, 0xae,
+	0x79, 0x1f, 0xc4, 0x2b, 0x20, 0x5e, 0x0c, 0x8d, 0xed, 0x49, 0xa6, 0x49, 0xa3, 0xbd, 0x69, 0x3d,
+	0xe7, 0x7c, 0xfe, 0xce, 0xef, 0xe7, 0xc0, 0xd1, 0x4c, 0x65, 0xd3, 0x88, 0x27, 0xd1, 0x72, 0x10,
+	0x71, 0x19, 0xa7, 0x24, 0x89, 0x79, 0x2c, 0xa6, 0x54, 0x85, 0x99, 0x92, 0x5a, 0x22, 0x28, 0xfc,
+	0x21, 0x4f, 0xc2, 0xe5, 0xa0, 0x7b, 0x34, 0x93, 0x72, 0xc6, 0x69, 0x64, 0x3c, 0xc9, 0xe2, 0x26,
+	0x4a, 0x17, 0x2a, 0xd6, 0x4c, 0x0a, 0x8b, 0xed, 0x1e, 0x6f, 0xfa, 0x35, 0x9b, 0xd3, 0x5c, 0xc7,
+	0xf3, 0xcc, 0x02, 0x7a, 0xff, 0x7a, 0x80, 0x2e, 0x64, 0x9c, 0x0e, 0x6d, 0x0c, 0x4c, 0xff, 0x58,
+	0xd0, 0x5c, 0xa3, 0x31, 0x1c, 0x32, 0xc1, 0x34, 0x8b, 0x39, 0x51, 0xd6, 0x14, 0x78, 0x27, 0x5e,
+	0xbf, 0x75, 0xfa, 0x65, 0xb8, 0x8e, 0x1e, 0x7e, 0xb0, 0x90, 0xed, 0xfb, 0xa3, 0x3d, 0xfc, 0xd4,
+	0xdd, 0x2f, 0x19, 0x7f, 0x84, 0x83, 0x29, 0x67, 0x54, 0x68, 0x92, 0xeb, 0x58, 0xe7, 0xc1, 0x27,
+	0x86, 0xee, 0xf3, 0x2a, 0xdd, 0x3b, 0xe3, 0x9f, 0x14, 0xee, 0xd1, 0x1e, 0x6e, 0x4d, 0xd7, 0x9f,
+	0xc3, 0x97, 0xd0, 0xa9, 0xb6, 0xa2, 0x4c, 0x8a, 0xe8, 0x3f, 0x33, 0xda, 0x8b, 0xa0, 0xb3, 0x33,
+	0x13, 0x84, 0xc0, 0x17, 0xf1, 0x9c, 0x9a, 0xf4, 0x9b, 0xd8, 0x9c, 0x7b, 0xbf, 0xc3, 0xf3, 0x4a,
+	0xac, 0x31, 0x55, 0x97, 0xf2, 0x8e, 0x0a, 0xf4, 0x16, 0xd0, 0x83, 0x20, 0xba, 0xb0, 0xba, 0x8b,
+	0x6d, 0xbe, 0xa6, 0xb6, 0xe8, 0x97, 0xd0, 0x14, 0x8b, 0x39, 0x99, 0xc6, 0x9c, 0xdb, 0x6a, 0x6a,
+	0xb8, 0x21, 0x16, 0xf3, 0x77, 0xc5, 0x77, 0xef, 0x9f, 0x1a, 0xb4, 0x2a, 0x21, 0xd0, 0xf7, 0xd0,
+	0x5c, 0x75, 0xde, 0x75, 0xb2, 0x1b, 0xda, 0xd9, 0x84, 0xe5, 0x6c, 0xc2, 0xcb, 0x12, 0x81, 0xd7,
+	0x60, 0xf4, 0x15, 0x3c, 0x5b, 0x85, 0x29, 0x5a, 0xa7, 0x34, 0x4d, 0x5d, 0xb8, 0xc3, 0x32, 0xdc,
+	0xc4, 0x9a, 0x8b, 0x02, 0xd6, 0xd8, 0x1b, 0x26, 0x58, 0x7e, 0x4b, 0xd3, 0xa0, 0x66, 0xc0, 0xed,
+	0x12, 0xfc, 0xde, 0xd9, 0xd1, 0x6f, 0xf0, 0xf5, 0x36, 0x9a, 0xdc, 0x33, 0x7d, 0x4b, 0xdc, 0xa4,
+	0x6e, 0x62, 0xc6, 0x69, 0x4a, 0xb4, 0x24, 0x39, 0x15, 0x69, 0x50, 0x37, 0x44, 0x6f, 0x36, 0x89,
+	0x7e, 0x65, 0xfa, 0xd6, 0xd6, 0xfa, 0xde, 0xe0, 0x2f, 0xe5, 0x84, 0x8a, 0x14, 0x8d, 0xe0, 0x8b,
+	0x47, 0xe8, 0xef, 0x84, 0xbc, 0x17, 0x44, 0xd1, 0x29, 0x65, 0x4b, 0x9a, 0x06, 0x4f, 0x0c, 0xe5,
+	0xeb, 0x4d, 0xca, 0x5f, 0x0a, 0x14, 0x76, 0x20, 0x74, 0x05, 0xc1, 0x63, 0x49, 0xa6, 0x4a, 0x66,
+	0x41, 0xe3, 0xa4, 0xd6, 0x6f, 0x9d, 0x1e, 0xef, 0x58, 0xa3, 0x72, 0xb4, 0xf8, 0xb3, 0xe9, 0x66,
+	0xc6, 0x67, 0x4a, 0x66, 0xe7, 0x7e, 0xc3, 0x6f, 0xef, 0x9f, 0xfb, 0x8d, 0xfd, 0x76, 0xbd, 0xf7,
+	0x9f, 0x07, 0xcf, 0x1f, 0xec, 0x4f, 0x9e, 0x49, 0x91, 0x53, 0x34, 0x81, 0xf6, 0x5a, 0x0a, 0xd6,
+	0xe6, 0x26, 0xf8, 0xe6, 0x63, 0x5a, 0xb0, 0xe8, 0xd1, 0x1e, 0x3e, 0x5c, 0x89, 0xc1, 0x91, 0xfe,
+	0x00, 0xad, 0x9c, 0xaa, 0x25, 0x55, 0x84, 0xb3, 0x5c, 0x3b, 0x31, 0xbc, 0xa8, 0xf2, 0x4d, 0x8c,
+	0xfb, 0x82, 0x19, 0x31, 0x41, 0xbe, 0xfa, 0x1a, 0xbe, 0x82, 0xee, 0x86, 0x14, 0x2c, 0xa7, 0xd5,
+	0xc2, 0xdf, 0x1e, 0x74, 0x77, 0xa7, 0x82, 0xbe, 0x83, 0x17, 0x0f, 0x9e, 0x14, 0x92, 0x52, 0x4e,
+	0x67, 0xb1, 0x2e, 0xf5, 0xf1, 0x69, 0x65, 0xcd, 0xd5, 0x99, 0xf3, 0xa1, 0x6b, 0x78, 0x55, 0xd5,
+	0x2e, 0x51, 0x34, 0x93, 0x4a, 0x13, 0x26, 0x34, 0x55, 0xcb, 0x98, 0xbb, 0xf4, 0x3b, 0x5b, 0x0b,
+	0x7d, 0xe6, 0x1e, 0x23, 0xdc, 0xa9, 0x68, 0x19, 0x9b, 0xcb, 0x1f, 0xdc, 0xdd, 0xde, 0x4f, 0x00,
+	0xeb, 0x52, 0xd1, 0x5b, 0x78, 0x62, 0x4b, 0xcd, 0x03, 0xcf, 0x4c, 0x16, 0x6d, 0xf7, 0x04, 0x97,
+	0x90, 0x73, 0xbf, 0x51, 0x6b, 0xfb, 0xbd, 0xbf, 0x3c, 0xa8, 0x5b, 0x0f, 0x7a, 0x0d, 0xc0, 0x32,
+	0x12, 0xa7, 0xa9, 0xa2, 0x79, 0x6e, 0x4a, 0x3a, 0xc0, 0x4d, 0x96, 0xfd, 0x6c, 0x0d, 0xc5, 0x5b,
+	0x50, 0xc4, 0x36, 0xf9, 0xee, 0x63, 0x73, 0xde, 0x21, 0xfa, 0xda, 0x0e, 0xd1, 0x23, 0xf0, 0xcd,
+	0xda, 0xf9, 0x27, 0x5e, 0xbf, 0x81, 0xcd, 0xd9, 0xae, 0xcf, 0x69, 0x02, 0x07, 0x95, 0x86, 0x2b,
+	0x84, 0xa1, 0xe5, 0xce, 0x85, 0x19, 0x1d, 0x55, 0xeb, 0xd8, 0x7e, 0xa6, 0xba, 0xc7, 0x3b, 0xfd,
+	0x76, 0x72, 0x7d, 0xef, 0x1b, 0x6f, 0x78, 0x05, 0x4f, 0x99, 0xb4, 0xc0, 0xe2, 0x0f, 0x4f, 0x86,
+	0xcf, 0xaa, 0x31, 0xc7, 0x45, 0xdf, 0xc7, 0xde, 0xf5, 0xc0, 0xcd, 0x61, 0x26, 0x79, 0x2c, 0x66,
+	0xa1, 0x54, 0xb3, 0xc8, 0xfc, 0xa4, 0x94, 0x43, 0x8f, 0xec, 0x65, 0xf3, 0x8f, 0xf0, 0x84, 0x2c,
+	0x07, 0x49, 0xdd, 0xcc, 0xec, 0xdb, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xc0, 0x96, 0xfd,
+	0x7c, 0x06, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/grpc/grpclb.go b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb.go
similarity index 84%
rename from vendor/google.golang.org/grpc/grpclb.go
rename to vendor/google.golang.org/grpc/balancer/grpclb/grpclb.go
index d14a5d40..0162ac7a 100644
--- a/vendor/google.golang.org/grpc/grpclb.go
+++ b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb.go
@@ -16,19 +16,29 @@
  *
  */
 
-package grpc
+//go:generate ./regenerate.sh
+
+// Package grpclb defines a grpclb balancer.
+//
+// To install grpclb balancer, import this package as:
+//    import _ "google.golang.org/grpc/balancer/grpclb"
+package grpclb
 
 import (
+	"errors"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	durationpb "github.com/golang/protobuf/ptypes/duration"
 	"golang.org/x/net/context"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/balancer"
+	lbpb "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
 	"google.golang.org/grpc/connectivity"
-	lbpb "google.golang.org/grpc/grpclb/grpc_lb_v1/messages"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/backoff"
 	"google.golang.org/grpc/resolver"
 )
 
@@ -38,7 +48,21 @@ const (
 	grpclbName             = "grpclb"
 )
 
-func convertDuration(d *lbpb.Duration) time.Duration {
+var (
+	// defaultBackoffConfig configures the backoff strategy that's used when the
+	// init handshake in the RPC is unsuccessful. It's not for the clientconn
+	// reconnect backoff.
+	//
+	// It has the same value as the default grpc.DefaultBackoffConfig.
+	//
+	// TODO: make backoff configurable.
+	defaultBackoffConfig = backoff.Exponential{
+		MaxDelay: 120 * time.Second,
+	}
+	errServerTerminatedConnection = errors.New("grpclb: failed to recv server list: server terminated connection")
+)
+
+func convertDuration(d *durationpb.Duration) time.Duration {
 	if d == nil {
 		return 0
 	}
@@ -49,16 +73,16 @@ func convertDuration(d *lbpb.Duration) time.Duration {
 // Mostly copied from generated pb.go file.
 // To avoid circular dependency.
 type loadBalancerClient struct {
-	cc *ClientConn
+	cc *grpc.ClientConn
 }
 
-func (c *loadBalancerClient) BalanceLoad(ctx context.Context, opts ...CallOption) (*balanceLoadClientStream, error) {
-	desc := &StreamDesc{
+func (c *loadBalancerClient) BalanceLoad(ctx context.Context, opts ...grpc.CallOption) (*balanceLoadClientStream, error) {
+	desc := &grpc.StreamDesc{
 		StreamName:    "BalanceLoad",
 		ServerStreams: true,
 		ClientStreams: true,
 	}
-	stream, err := NewClientStream(ctx, desc, c.cc, "/grpc.lb.v1.LoadBalancer/BalanceLoad", opts...)
+	stream, err := c.cc.NewStream(ctx, desc, "/grpc.lb.v1.LoadBalancer/BalanceLoad", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +91,7 @@ func (c *loadBalancerClient) BalanceLoad(ctx context.Context, opts ...CallOption
 }
 
 type balanceLoadClientStream struct {
-	ClientStream
+	grpc.ClientStream
 }
 
 func (x *balanceLoadClientStream) Send(m *lbpb.LoadBalanceRequest) error {
@@ -88,16 +112,16 @@ func init() {
 
 // newLBBuilder creates a builder for grpclb.
 func newLBBuilder() balancer.Builder {
-	return NewLBBuilderWithFallbackTimeout(defaultFallbackTimeout)
+	return newLBBuilderWithFallbackTimeout(defaultFallbackTimeout)
 }
 
-// NewLBBuilderWithFallbackTimeout creates a grpclb builder with the given
+// newLBBuilderWithFallbackTimeout creates a grpclb builder with the given
 // fallbackTimeout. If no response is received from the remote balancer within
 // fallbackTimeout, the backend addresses from the resolved address list will be
 // used.
 //
 // Only call this function when a non-default fallback timeout is needed.
-func NewLBBuilderWithFallbackTimeout(fallbackTimeout time.Duration) balancer.Builder {
+func newLBBuilderWithFallbackTimeout(fallbackTimeout time.Duration) balancer.Builder {
 	return &lbBuilder{
 		fallbackTimeout: fallbackTimeout,
 	}
@@ -127,25 +151,26 @@ func (b *lbBuilder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) bal
 	}
 
 	lb := &lbBalancer{
-		cc:              cc,
+		cc:              newLBCacheClientConn(cc),
 		target:          target,
 		opt:             opt,
 		fallbackTimeout: b.fallbackTimeout,
 		doneCh:          make(chan struct{}),
 
 		manualResolver: r,
-		csEvltr:        &connectivityStateEvaluator{},
+		csEvltr:        &balancer.ConnectivityStateEvaluator{},
 		subConns:       make(map[resolver.Address]balancer.SubConn),
 		scStates:       make(map[balancer.SubConn]connectivity.State),
 		picker:         &errPicker{err: balancer.ErrNoSubConnAvailable},
-		clientStats:    &rpcStats{},
+		clientStats:    newRPCStats(),
+		backoff:        defaultBackoffConfig, // TODO: make backoff configurable.
 	}
 
 	return lb
 }
 
 type lbBalancer struct {
-	cc              balancer.ClientConn
+	cc              *lbCacheClientConn
 	target          string
 	opt             balancer.BuildOptions
 	fallbackTimeout time.Duration
@@ -156,7 +181,9 @@ type lbBalancer struct {
 	// send to remote LB ClientConn through this resolver.
 	manualResolver *lbManualResolver
 	// The ClientConn to talk to the remote balancer.
-	ccRemoteLB *ClientConn
+	ccRemoteLB *grpc.ClientConn
+	// backoff for calling remote balancer.
+	backoff backoff.Strategy
 
 	// Support client side load reporting. Each picker gets a reference to this,
 	// and will update its content.
@@ -173,7 +200,7 @@ type lbBalancer struct {
 	// but with only READY SCs will be gerenated.
 	backendAddrs []resolver.Address
 	// Roundrobin functionalities.
-	csEvltr  *connectivityStateEvaluator
+	csEvltr  *balancer.ConnectivityStateEvaluator
 	state    connectivity.State
 	subConns map[resolver.Address]balancer.SubConn   // Used to new/remove SubConn.
 	scStates map[balancer.SubConn]connectivity.State // Used to filter READY SubConns.
@@ -220,7 +247,6 @@ func (lb *lbBalancer) regeneratePicker() {
 		subConns:   readySCs,
 		stats:      lb.clientStats,
 	}
-	return
 }
 
 func (lb *lbBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectivity.State) {
@@ -244,7 +270,7 @@ func (lb *lbBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectivi
 	}
 
 	oldAggrState := lb.state
-	lb.state = lb.csEvltr.recordTransition(oldS, s)
+	lb.state = lb.csEvltr.RecordTransition(oldS, s)
 
 	// Regenerate picker when one of the following happens:
 	//  - this sc became ready from not-ready
@@ -257,7 +283,6 @@ func (lb *lbBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectivi
 	}
 
 	lb.cc.UpdateBalancerState(lb.state, lb.picker)
-	return
 }
 
 // fallbackToBackendsAfter blocks for fallbackTimeout and falls back to use
@@ -339,4 +364,5 @@ func (lb *lbBalancer) Close() {
 	if lb.ccRemoteLB != nil {
 		lb.ccRemoteLB.Close()
 	}
+	lb.cc.close()
 }
diff --git a/vendor/google.golang.org/grpc/grpclb_picker.go b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_picker.go
similarity index 65%
rename from vendor/google.golang.org/grpc/grpclb_picker.go
rename to vendor/google.golang.org/grpc/balancer/grpclb/grpclb_picker.go
index 872c7cce..d77af401 100644
--- a/vendor/google.golang.org/grpc/grpclb_picker.go
+++ b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_picker.go
@@ -16,7 +16,7 @@
  *
  */
 
-package grpc
+package grpclb
 
 import (
 	"sync"
@@ -24,55 +24,70 @@ import (
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/balancer"
+	lbpb "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
 	"google.golang.org/grpc/codes"
-	lbpb "google.golang.org/grpc/grpclb/grpc_lb_v1/messages"
 	"google.golang.org/grpc/status"
 )
 
+// rpcStats is same as lbmpb.ClientStats, except that numCallsDropped is a map
+// instead of a slice.
 type rpcStats struct {
-	NumCallsStarted                          int64
-	NumCallsFinished                         int64
-	NumCallsFinishedWithDropForRateLimiting  int64
-	NumCallsFinishedWithDropForLoadBalancing int64
-	NumCallsFinishedWithClientFailedToSend   int64
-	NumCallsFinishedKnownReceived            int64
+	// Only access the following fields atomically.
+	numCallsStarted                        int64
+	numCallsFinished                       int64
+	numCallsFinishedWithClientFailedToSend int64
+	numCallsFinishedKnownReceived          int64
+
+	mu sync.Mutex
+	// map load_balance_token -> num_calls_dropped
+	numCallsDropped map[string]int64
+}
+
+func newRPCStats() *rpcStats {
+	return &rpcStats{
+		numCallsDropped: make(map[string]int64),
+	}
 }
 
 // toClientStats converts rpcStats to lbpb.ClientStats, and clears rpcStats.
 func (s *rpcStats) toClientStats() *lbpb.ClientStats {
 	stats := &lbpb.ClientStats{
-		NumCallsStarted:                          atomic.SwapInt64(&s.NumCallsStarted, 0),
-		NumCallsFinished:                         atomic.SwapInt64(&s.NumCallsFinished, 0),
-		NumCallsFinishedWithDropForRateLimiting:  atomic.SwapInt64(&s.NumCallsFinishedWithDropForRateLimiting, 0),
-		NumCallsFinishedWithDropForLoadBalancing: atomic.SwapInt64(&s.NumCallsFinishedWithDropForLoadBalancing, 0),
-		NumCallsFinishedWithClientFailedToSend:   atomic.SwapInt64(&s.NumCallsFinishedWithClientFailedToSend, 0),
-		NumCallsFinishedKnownReceived:            atomic.SwapInt64(&s.NumCallsFinishedKnownReceived, 0),
+		NumCallsStarted:                        atomic.SwapInt64(&s.numCallsStarted, 0),
+		NumCallsFinished:                       atomic.SwapInt64(&s.numCallsFinished, 0),
+		NumCallsFinishedWithClientFailedToSend: atomic.SwapInt64(&s.numCallsFinishedWithClientFailedToSend, 0),
+		NumCallsFinishedKnownReceived:          atomic.SwapInt64(&s.numCallsFinishedKnownReceived, 0),
+	}
+	s.mu.Lock()
+	dropped := s.numCallsDropped
+	s.numCallsDropped = make(map[string]int64)
+	s.mu.Unlock()
+	for token, count := range dropped {
+		stats.CallsFinishedWithDrop = append(stats.CallsFinishedWithDrop, &lbpb.ClientStatsPerToken{
+			LoadBalanceToken: token,
+			NumCalls:         count,
+		})
 	}
 	return stats
 }
 
-func (s *rpcStats) dropForRateLimiting() {
-	atomic.AddInt64(&s.NumCallsStarted, 1)
-	atomic.AddInt64(&s.NumCallsFinishedWithDropForRateLimiting, 1)
-	atomic.AddInt64(&s.NumCallsFinished, 1)
-}
-
-func (s *rpcStats) dropForLoadBalancing() {
-	atomic.AddInt64(&s.NumCallsStarted, 1)
-	atomic.AddInt64(&s.NumCallsFinishedWithDropForLoadBalancing, 1)
-	atomic.AddInt64(&s.NumCallsFinished, 1)
+func (s *rpcStats) drop(token string) {
+	atomic.AddInt64(&s.numCallsStarted, 1)
+	s.mu.Lock()
+	s.numCallsDropped[token]++
+	s.mu.Unlock()
+	atomic.AddInt64(&s.numCallsFinished, 1)
 }
 
 func (s *rpcStats) failedToSend() {
-	atomic.AddInt64(&s.NumCallsStarted, 1)
-	atomic.AddInt64(&s.NumCallsFinishedWithClientFailedToSend, 1)
-	atomic.AddInt64(&s.NumCallsFinished, 1)
+	atomic.AddInt64(&s.numCallsStarted, 1)
+	atomic.AddInt64(&s.numCallsFinishedWithClientFailedToSend, 1)
+	atomic.AddInt64(&s.numCallsFinished, 1)
 }
 
 func (s *rpcStats) knownReceived() {
-	atomic.AddInt64(&s.NumCallsStarted, 1)
-	atomic.AddInt64(&s.NumCallsFinishedKnownReceived, 1)
-	atomic.AddInt64(&s.NumCallsFinished, 1)
+	atomic.AddInt64(&s.numCallsStarted, 1)
+	atomic.AddInt64(&s.numCallsFinishedKnownReceived, 1)
+	atomic.AddInt64(&s.numCallsFinished, 1)
 }
 
 type errPicker struct {
@@ -131,12 +146,8 @@ func (p *lbPicker) Pick(ctx context.Context, opts balancer.PickOptions) (balance
 	p.serverListNext = (p.serverListNext + 1) % len(p.serverList)
 
 	// If it's a drop, return an error and fail the RPC.
-	if s.DropForRateLimiting {
-		p.stats.dropForRateLimiting()
-		return nil, nil, status.Errorf(codes.Unavailable, "request dropped by grpclb")
-	}
-	if s.DropForLoadBalancing {
-		p.stats.dropForLoadBalancing()
+	if s.Drop {
+		p.stats.drop(s.LoadBalanceToken)
 		return nil, nil, status.Errorf(codes.Unavailable, "request dropped by grpclb")
 	}
 
diff --git a/vendor/google.golang.org/grpc/grpclb_remote_balancer.go b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_remote_balancer.go
similarity index 66%
rename from vendor/google.golang.org/grpc/grpclb_remote_balancer.go
rename to vendor/google.golang.org/grpc/balancer/grpclb/grpclb_remote_balancer.go
index 1b580df2..d0ecd68b 100644
--- a/vendor/google.golang.org/grpc/grpclb_remote_balancer.go
+++ b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_remote_balancer.go
@@ -16,19 +16,24 @@
  *
  */
 
-package grpc
+package grpclb
 
 import (
 	"fmt"
+	"io"
 	"net"
 	"reflect"
 	"time"
 
+	timestamppb "github.com/golang/protobuf/ptypes/timestamp"
 	"golang.org/x/net/context"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/balancer"
+	lbpb "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
 	"google.golang.org/grpc/connectivity"
-	lbpb "google.golang.org/grpc/grpclb/grpc_lb_v1/messages"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal"
+	"google.golang.org/grpc/internal/channelz"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/resolver"
 )
@@ -52,8 +57,8 @@ func (lb *lbBalancer) processServerList(l *lbpb.ServerList) {
 	lb.fullServerList = l.Servers
 
 	var backendAddrs []resolver.Address
-	for _, s := range l.Servers {
-		if s.DropForLoadBalancing || s.DropForRateLimiting {
+	for i, s := range l.Servers {
+		if s.Drop {
 			continue
 		}
 
@@ -69,20 +74,22 @@ func (lb *lbBalancer) processServerList(l *lbpb.ServerList) {
 			Addr:     fmt.Sprintf("%s:%d", ipStr, s.Port),
 			Metadata: &md,
 		}
-
+		grpclog.Infof("lbBalancer: server list entry[%d]: ipStr:|%s|, port:|%d|, load balancer token:|%v|",
+			i, ipStr, s.Port, s.LoadBalanceToken)
 		backendAddrs = append(backendAddrs, addr)
 	}
 
 	// Call refreshSubConns to create/remove SubConns.
-	backendsUpdated := lb.refreshSubConns(backendAddrs)
-	// If no backend was updated, no SubConn will be newed/removed. But since
-	// the full serverList was different, there might be updates in drops or
-	// pick weights(different number of duplicates). We need to update picker
-	// with the fulllist.
-	if !backendsUpdated {
-		lb.regeneratePicker()
-		lb.cc.UpdateBalancerState(lb.state, lb.picker)
-	}
+	lb.refreshSubConns(backendAddrs)
+	// Regenerate and update picker no matter if there's update on backends (if
+	// any SubConn will be newed/removed). Because since the full serverList was
+	// different, there might be updates in drops or pick weights(different
+	// number of duplicates). We need to update picker with the fulllist.
+	//
+	// Now with cache, even if SubConn was newed/removed, there might be no
+	// state changes.
+	lb.regeneratePicker()
+	lb.cc.UpdateBalancerState(lb.state, lb.picker)
 }
 
 // refreshSubConns creates/removes SubConns with backendAddrs. It returns a bool
@@ -112,7 +119,11 @@ func (lb *lbBalancer) refreshSubConns(backendAddrs []resolver.Address) bool {
 				continue
 			}
 			lb.subConns[addrWithoutMD] = sc // Use the addr without MD as key for the map.
-			lb.scStates[sc] = connectivity.Idle
+			if _, ok := lb.scStates[sc]; !ok {
+				// Only set state of new sc to IDLE. The state could already be
+				// READY for cached SubConns.
+				lb.scStates[sc] = connectivity.Idle
+			}
 			sc.Connect()
 		}
 	}
@@ -136,6 +147,9 @@ func (lb *lbBalancer) readServerList(s *balanceLoadClientStream) error {
 	for {
 		reply, err := s.Recv()
 		if err != nil {
+			if err == io.EOF {
+				return errServerTerminatedConnection
+			}
 			return fmt.Errorf("grpclb: failed to recv server list: %v", err)
 		}
 		if serverList := reply.GetServerList(); serverList != nil {
@@ -155,7 +169,7 @@ func (lb *lbBalancer) sendLoadReport(s *balanceLoadClientStream, interval time.D
 		}
 		stats := lb.clientStats.toClientStats()
 		t := time.Now()
-		stats.Timestamp = &lbpb.Timestamp{
+		stats.Timestamp = &timestamppb.Timestamp{
 			Seconds: t.Unix(),
 			Nanos:   int32(t.Nanosecond()),
 		}
@@ -168,13 +182,14 @@ func (lb *lbBalancer) sendLoadReport(s *balanceLoadClientStream, interval time.D
 		}
 	}
 }
-func (lb *lbBalancer) callRemoteBalancer() error {
+
+func (lb *lbBalancer) callRemoteBalancer() (backoff bool, _ error) {
 	lbClient := &loadBalancerClient{cc: lb.ccRemoteLB}
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	stream, err := lbClient.BalanceLoad(ctx, FailFast(false))
+	stream, err := lbClient.BalanceLoad(ctx, grpc.FailFast(false))
 	if err != nil {
-		return fmt.Errorf("grpclb: failed to perform RPC to the remote balancer %v", err)
+		return true, fmt.Errorf("grpclb: failed to perform RPC to the remote balancer %v", err)
 	}
 
 	// grpclb handshake on the stream.
@@ -186,18 +201,18 @@ func (lb *lbBalancer) callRemoteBalancer() error {
 		},
 	}
 	if err := stream.Send(initReq); err != nil {
-		return fmt.Errorf("grpclb: failed to send init request: %v", err)
+		return true, fmt.Errorf("grpclb: failed to send init request: %v", err)
 	}
 	reply, err := stream.Recv()
 	if err != nil {
-		return fmt.Errorf("grpclb: failed to recv init response: %v", err)
+		return true, fmt.Errorf("grpclb: failed to recv init response: %v", err)
 	}
 	initResp := reply.GetInitialResponse()
 	if initResp == nil {
-		return fmt.Errorf("grpclb: reply from remote balancer did not include initial response")
+		return true, fmt.Errorf("grpclb: reply from remote balancer did not include initial response")
 	}
 	if initResp.LoadBalancerDelegate != "" {
-		return fmt.Errorf("grpclb: Delegation is not supported")
+		return true, fmt.Errorf("grpclb: Delegation is not supported")
 	}
 
 	go func() {
@@ -205,47 +220,72 @@ func (lb *lbBalancer) callRemoteBalancer() error {
 			lb.sendLoadReport(stream, d)
 		}
 	}()
-	return lb.readServerList(stream)
+	// No backoff if init req/resp handshake was successful.
+	return false, lb.readServerList(stream)
 }
 
 func (lb *lbBalancer) watchRemoteBalancer() {
+	var retryCount int
 	for {
-		err := lb.callRemoteBalancer()
+		doBackoff, err := lb.callRemoteBalancer()
 		select {
 		case <-lb.doneCh:
 			return
 		default:
 			if err != nil {
-				grpclog.Error(err)
+				if err == errServerTerminatedConnection {
+					grpclog.Info(err)
+				} else {
+					grpclog.Error(err)
+				}
 			}
 		}
 
+		if !doBackoff {
+			retryCount = 0
+			continue
+		}
+
+		timer := time.NewTimer(lb.backoff.Backoff(retryCount))
+		select {
+		case <-timer.C:
+		case <-lb.doneCh:
+			timer.Stop()
+			return
+		}
+		retryCount++
 	}
 }
 
 func (lb *lbBalancer) dialRemoteLB(remoteLBName string) {
-	var dopts []DialOption
+	var dopts []grpc.DialOption
 	if creds := lb.opt.DialCreds; creds != nil {
 		if err := creds.OverrideServerName(remoteLBName); err == nil {
-			dopts = append(dopts, WithTransportCredentials(creds))
+			dopts = append(dopts, grpc.WithTransportCredentials(creds))
 		} else {
 			grpclog.Warningf("grpclb: failed to override the server name in the credentials: %v, using Insecure", err)
-			dopts = append(dopts, WithInsecure())
+			dopts = append(dopts, grpc.WithInsecure())
 		}
 	} else {
-		dopts = append(dopts, WithInsecure())
+		dopts = append(dopts, grpc.WithInsecure())
 	}
 	if lb.opt.Dialer != nil {
 		// WithDialer takes a different type of function, so we instead use a
 		// special DialOption here.
-		dopts = append(dopts, withContextDialer(lb.opt.Dialer))
+		wcd := internal.WithContextDialer.(func(func(context.Context, string) (net.Conn, error)) grpc.DialOption)
+		dopts = append(dopts, wcd(lb.opt.Dialer))
 	}
 	// Explicitly set pickfirst as the balancer.
-	dopts = append(dopts, WithBalancerName(PickFirstBalancerName))
-	dopts = append(dopts, withResolverBuilder(lb.manualResolver))
-	// Dial using manualResolver.Scheme, which is a random scheme generated
+	dopts = append(dopts, grpc.WithBalancerName(grpc.PickFirstBalancerName))
+	wrb := internal.WithResolverBuilder.(func(resolver.Builder) grpc.DialOption)
+	dopts = append(dopts, wrb(lb.manualResolver))
+	if channelz.IsOn() {
+		dopts = append(dopts, grpc.WithChannelzParentID(lb.opt.ChannelzParentID))
+	}
+
+	// DialContext using manualResolver.Scheme, which is a random scheme generated
 	// when init grpclb. The target name is not important.
-	cc, err := Dial("grpclb:///grpclb.server", dopts...)
+	cc, err := grpc.DialContext(context.Background(), "grpclb:///grpclb.server", dopts...)
 	if err != nil {
 		grpclog.Fatalf("failed to dial: %v", err)
 	}
diff --git a/vendor/google.golang.org/grpc/grpclb/grpclb_test.go b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_test.go
similarity index 74%
rename from vendor/google.golang.org/grpc/grpclb/grpclb_test.go
rename to vendor/google.golang.org/grpc/balancer/grpclb/grpclb_test.go
index d83ea6b8..7e6ca76e 100644
--- a/vendor/google.golang.org/grpc/grpclb/grpclb_test.go
+++ b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_test.go
@@ -16,11 +16,7 @@
  *
  */
 
-//go:generate protoc --go_out=plugins=:$GOPATH grpc_lb_v1/messages/messages.proto
-//go:generate protoc --go_out=plugins=grpc:$GOPATH grpc_lb_v1/service/service.proto
-
-// Package grpclb_test is currently used only for grpclb testing.
-package grpclb_test
+package grpclb
 
 import (
 	"errors"
@@ -30,27 +26,26 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	durationpb "github.com/golang/protobuf/ptypes/duration"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/balancer"
+	lbgrpc "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
+	lbpb "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
-	lbmpb "google.golang.org/grpc/grpclb/grpc_lb_v1/messages"
-	lbspb "google.golang.org/grpc/grpclb/grpc_lb_v1/service"
 	_ "google.golang.org/grpc/grpclog/glogger"
+	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/resolver/manual"
 	"google.golang.org/grpc/status"
 	testpb "google.golang.org/grpc/test/grpc_testing"
-	"google.golang.org/grpc/test/leakcheck"
-
-	_ "google.golang.org/grpc/grpclog/glogger"
 )
 
 var (
@@ -127,18 +122,75 @@ func fakeNameDialer(addr string, timeout time.Duration) (net.Conn, error) {
 	return net.DialTimeout("tcp", addr, timeout)
 }
 
+// merge merges the new client stats into current stats.
+//
+// It's a test-only method. rpcStats is defined in grpclb_picker.
+func (s *rpcStats) merge(new *lbpb.ClientStats) {
+	atomic.AddInt64(&s.numCallsStarted, new.NumCallsStarted)
+	atomic.AddInt64(&s.numCallsFinished, new.NumCallsFinished)
+	atomic.AddInt64(&s.numCallsFinishedWithClientFailedToSend, new.NumCallsFinishedWithClientFailedToSend)
+	atomic.AddInt64(&s.numCallsFinishedKnownReceived, new.NumCallsFinishedKnownReceived)
+	s.mu.Lock()
+	for _, perToken := range new.CallsFinishedWithDrop {
+		s.numCallsDropped[perToken.LoadBalanceToken] += perToken.NumCalls
+	}
+	s.mu.Unlock()
+}
+
+func mapsEqual(a, b map[string]int64) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for k, v1 := range a {
+		if v2, ok := b[k]; !ok || v1 != v2 {
+			return false
+		}
+	}
+	return true
+}
+
+func atomicEqual(a, b *int64) bool {
+	return atomic.LoadInt64(a) == atomic.LoadInt64(b)
+}
+
+// equal compares two rpcStats.
+//
+// It's a test-only method. rpcStats is defined in grpclb_picker.
+func (s *rpcStats) equal(new *rpcStats) bool {
+	if !atomicEqual(&s.numCallsStarted, &new.numCallsStarted) {
+		return false
+	}
+	if !atomicEqual(&s.numCallsFinished, &new.numCallsFinished) {
+		return false
+	}
+	if !atomicEqual(&s.numCallsFinishedWithClientFailedToSend, &new.numCallsFinishedWithClientFailedToSend) {
+		return false
+	}
+	if !atomicEqual(&s.numCallsFinishedKnownReceived, &new.numCallsFinishedKnownReceived) {
+		return false
+	}
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	new.mu.Lock()
+	defer new.mu.Unlock()
+	if !mapsEqual(s.numCallsDropped, new.numCallsDropped) {
+		return false
+	}
+	return true
+}
+
 type remoteBalancer struct {
-	sls       chan *lbmpb.ServerList
+	sls       chan *lbpb.ServerList
 	statsDura time.Duration
 	done      chan struct{}
-	mu        sync.Mutex
-	stats     lbmpb.ClientStats
+	stats     *rpcStats
 }
 
 func newRemoteBalancer(intervals []time.Duration) *remoteBalancer {
 	return &remoteBalancer{
-		sls:  make(chan *lbmpb.ServerList, 1),
-		done: make(chan struct{}),
+		sls:   make(chan *lbpb.ServerList, 1),
+		done:  make(chan struct{}),
+		stats: newRPCStats(),
 	}
 }
 
@@ -147,7 +199,7 @@ func (b *remoteBalancer) stop() {
 	close(b.done)
 }
 
-func (b *remoteBalancer) BalanceLoad(stream lbspb.LoadBalancer_BalanceLoadServer) error {
+func (b *remoteBalancer) BalanceLoad(stream lbgrpc.LoadBalancer_BalanceLoadServer) error {
 	req, err := stream.Recv()
 	if err != nil {
 		return err
@@ -156,10 +208,10 @@ func (b *remoteBalancer) BalanceLoad(stream lbspb.LoadBalancer_BalanceLoadServer
 	if initReq.Name != beServerName {
 		return status.Errorf(codes.InvalidArgument, "invalid service name: %v", initReq.Name)
 	}
-	resp := &lbmpb.LoadBalanceResponse{
-		LoadBalanceResponseType: &lbmpb.LoadBalanceResponse_InitialResponse{
-			InitialResponse: &lbmpb.InitialLoadBalanceResponse{
-				ClientStatsReportInterval: &lbmpb.Duration{
+	resp := &lbpb.LoadBalanceResponse{
+		LoadBalanceResponseType: &lbpb.LoadBalanceResponse_InitialResponse{
+			InitialResponse: &lbpb.InitialLoadBalanceResponse{
+				ClientStatsReportInterval: &durationpb.Duration{
 					Seconds: int64(b.statsDura.Seconds()),
 					Nanos:   int32(b.statsDura.Nanoseconds() - int64(b.statsDura.Seconds())*1e9),
 				},
@@ -172,25 +224,18 @@ func (b *remoteBalancer) BalanceLoad(stream lbspb.LoadBalancer_BalanceLoadServer
 	go func() {
 		for {
 			var (
-				req *lbmpb.LoadBalanceRequest
+				req *lbpb.LoadBalanceRequest
 				err error
 			)
 			if req, err = stream.Recv(); err != nil {
 				return
 			}
-			b.mu.Lock()
-			b.stats.NumCallsStarted += req.GetClientStats().NumCallsStarted
-			b.stats.NumCallsFinished += req.GetClientStats().NumCallsFinished
-			b.stats.NumCallsFinishedWithDropForRateLimiting += req.GetClientStats().NumCallsFinishedWithDropForRateLimiting
-			b.stats.NumCallsFinishedWithDropForLoadBalancing += req.GetClientStats().NumCallsFinishedWithDropForLoadBalancing
-			b.stats.NumCallsFinishedWithClientFailedToSend += req.GetClientStats().NumCallsFinishedWithClientFailedToSend
-			b.stats.NumCallsFinishedKnownReceived += req.GetClientStats().NumCallsFinishedKnownReceived
-			b.mu.Unlock()
+			b.stats.merge(req.GetClientStats())
 		}
 	}()
 	for v := range b.sls {
-		resp = &lbmpb.LoadBalanceResponse{
-			LoadBalanceResponseType: &lbmpb.LoadBalanceResponse_ServerList{
+		resp = &lbpb.LoadBalanceResponse{
+			LoadBalanceResponseType: &lbpb.LoadBalanceResponse_ServerList{
 				ServerList: v,
 			},
 		}
@@ -288,12 +333,8 @@ func newLoadBalancer(numberOfBackends int) (tss *testServers, cleanup func(), er
 		sn: lbServerName,
 	}
 	lb = grpc.NewServer(grpc.Creds(lbCreds))
-	if err != nil {
-		err = fmt.Errorf("Failed to generate the port number %v", err)
-		return
-	}
 	ls = newRemoteBalancer(nil)
-	lbspb.RegisterLoadBalancerServer(lb, ls)
+	lbgrpc.RegisterLoadBalancerServer(lb, ls)
 	go func() {
 		lb.Serve(lbLis)
 	}()
@@ -327,14 +368,14 @@ func TestGRPCLB(t *testing.T) {
 	}
 	defer cleanup()
 
-	be := &lbmpb.Server{
+	be := &lbpb.Server{
 		IpAddress:        tss.beIPs[0],
 		Port:             int32(tss.bePorts[0]),
 		LoadBalanceToken: lbToken,
 	}
-	var bes []*lbmpb.Server
+	var bes []*lbpb.Server
 	bes = append(bes, be)
-	sl := &lbmpb.ServerList{
+	sl := &lbpb.ServerList{
 		Servers: bes,
 	}
 	tss.ls.sls <- sl
@@ -375,7 +416,7 @@ func TestGRPCLBWeighted(t *testing.T) {
 	}
 	defer cleanup()
 
-	beServers := []*lbmpb.Server{{
+	beServers := []*lbpb.Server{{
 		IpAddress:        tss.beIPs[0],
 		Port:             int32(tss.bePorts[0]),
 		LoadBalanceToken: lbToken,
@@ -411,14 +452,14 @@ func TestGRPCLBWeighted(t *testing.T) {
 	sequences := []string{"00101", "00011"}
 	for _, seq := range sequences {
 		var (
-			bes    []*lbmpb.Server
+			bes    []*lbpb.Server
 			p      peer.Peer
 			result string
 		)
 		for _, s := range seq {
 			bes = append(bes, beServers[s-'0'])
 		}
-		tss.ls.sls <- &lbmpb.ServerList{Servers: bes}
+		tss.ls.sls <- &lbpb.ServerList{Servers: bes}
 
 		for i := 0; i < 1000; i++ {
 			if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}, grpc.FailFast(false), grpc.Peer(&p)); err != nil {
@@ -444,14 +485,14 @@ func TestDropRequest(t *testing.T) {
 		t.Fatalf("failed to create new load balancer: %v", err)
 	}
 	defer cleanup()
-	tss.ls.sls <- &lbmpb.ServerList{
-		Servers: []*lbmpb.Server{{
-			IpAddress:            tss.beIPs[0],
-			Port:                 int32(tss.bePorts[0]),
-			LoadBalanceToken:     lbToken,
-			DropForLoadBalancing: false,
+	tss.ls.sls <- &lbpb.ServerList{
+		Servers: []*lbpb.Server{{
+			IpAddress:        tss.beIPs[0],
+			Port:             int32(tss.bePorts[0]),
+			LoadBalanceToken: lbToken,
+			Drop:             false,
 		}, {
-			DropForLoadBalancing: true,
+			Drop: true,
 		}},
 	}
 	creds := serverNameCheckCreds{
@@ -473,11 +514,24 @@ func TestDropRequest(t *testing.T) {
 		ServerName: lbServerName,
 	}})
 
-	// The 1st, non-fail-fast RPC should succeed.  This ensures both server
-	// connections are made, because the first one has DropForLoadBalancing set to true.
-	if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}, grpc.FailFast(false)); err != nil {
+	// Wait for the 1st, non-fail-fast RPC to succeed. This ensures both server
+	// connections are made, because the first one has DropForLoadBalancing set
+	// to true.
+	var i int
+	for i = 0; i < 1000; i++ {
+		if _, err := testC.EmptyCall(ctx, &testpb.Empty{}, grpc.FailFast(false)); err == nil {
+			break
+		}
+		time.Sleep(time.Millisecond)
+	}
+	if i >= 1000 {
 		t.Fatalf("%v.SayHello(_, _) = _, %v, want _, <nil>", testC, err)
 	}
+	select {
+	case <-ctx.Done():
+		t.Fatal("timed out", ctx.Err())
+	default:
+	}
 	for _, failfast := range []bool{true, false} {
 		for i := 0; i < 3; i++ {
 			// Even RPCs should fail, because the 2st backend has
@@ -512,14 +566,14 @@ func TestBalancerDisconnects(t *testing.T) {
 		}
 		defer cleanup()
 
-		be := &lbmpb.Server{
+		be := &lbpb.Server{
 			IpAddress:        tss.beIPs[0],
 			Port:             int32(tss.bePorts[0]),
 			LoadBalanceToken: lbToken,
 		}
-		var bes []*lbmpb.Server
+		var bes []*lbpb.Server
 		bes = append(bes, be)
-		sl := &lbmpb.ServerList{
+		sl := &lbpb.ServerList{
 			Servers: bes,
 		}
 		tss.ls.sls <- sl
@@ -587,7 +641,7 @@ const grpclbCustomFallbackName = "grpclb_with_custom_fallback_timeout"
 
 func init() {
 	balancer.Register(&customGRPCLBBuilder{
-		Builder: grpc.NewLBBuilderWithFallbackTimeout(100 * time.Millisecond),
+		Builder: newLBBuilderWithFallbackTimeout(100 * time.Millisecond),
 		name:    grpclbCustomFallbackName,
 	})
 }
@@ -613,14 +667,14 @@ func TestFallback(t *testing.T) {
 	standaloneBEs := startBackends(beServerName, true, beLis)
 	defer stopBackends(standaloneBEs)
 
-	be := &lbmpb.Server{
+	be := &lbpb.Server{
 		IpAddress:        tss.beIPs[0],
 		Port:             int32(tss.bePorts[0]),
 		LoadBalanceToken: lbToken,
 	}
-	var bes []*lbmpb.Server
+	var bes []*lbpb.Server
 	bes = append(bes, be)
-	sl := &lbmpb.ServerList{
+	sl := &lbpb.ServerList{
 		Servers: bes,
 	}
 	tss.ls.sls <- sl
@@ -691,14 +745,14 @@ func (failPreRPCCred) RequireTransportSecurity() bool {
 	return false
 }
 
-func checkStats(stats *lbmpb.ClientStats, expected *lbmpb.ClientStats) error {
-	if !proto.Equal(stats, expected) {
+func checkStats(stats, expected *rpcStats) error {
+	if !stats.equal(expected) {
 		return fmt.Errorf("stats not equal: got %+v, want %+v", stats, expected)
 	}
 	return nil
 }
 
-func runAndGetStats(t *testing.T, dropForLoadBalancing, dropForRateLimiting bool, runRPCs func(*grpc.ClientConn)) lbmpb.ClientStats {
+func runAndGetStats(t *testing.T, drop bool, runRPCs func(*grpc.ClientConn)) *rpcStats {
 	defer leakcheck.Check(t)
 
 	r, cleanup := manual.GenerateAndRegisterManualResolver()
@@ -709,13 +763,12 @@ func runAndGetStats(t *testing.T, dropForLoadBalancing, dropForRateLimiting bool
 		t.Fatalf("failed to create new load balancer: %v", err)
 	}
 	defer cleanup()
-	tss.ls.sls <- &lbmpb.ServerList{
-		Servers: []*lbmpb.Server{{
-			IpAddress:            tss.beIPs[0],
-			Port:                 int32(tss.bePorts[0]),
-			LoadBalanceToken:     lbToken,
-			DropForLoadBalancing: dropForLoadBalancing,
-			DropForRateLimiting:  dropForRateLimiting,
+	tss.ls.sls <- &lbpb.ServerList{
+		Servers: []*lbpb.Server{{
+			IpAddress:        tss.beIPs[0],
+			Port:             int32(tss.bePorts[0]),
+			LoadBalanceToken: lbToken,
+			Drop:             drop,
 		}},
 	}
 	tss.ls.statsDura = 100 * time.Millisecond
@@ -740,9 +793,7 @@ func runAndGetStats(t *testing.T, dropForLoadBalancing, dropForRateLimiting bool
 
 	runRPCs(cc)
 	time.Sleep(1 * time.Second)
-	tss.ls.mu.Lock()
 	stats := tss.ls.stats
-	tss.ls.mu.Unlock()
 	return stats
 }
 
@@ -754,7 +805,7 @@ const (
 
 func TestGRPCLBStatsUnarySuccess(t *testing.T) {
 	defer leakcheck.Check(t)
-	stats := runAndGetStats(t, false, false, func(cc *grpc.ClientConn) {
+	stats := runAndGetStats(t, false, func(cc *grpc.ClientConn) {
 		testC := testpb.NewTestServiceClient(cc)
 		// The first non-failfast RPC succeeds, all connections are up.
 		if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}, grpc.FailFast(false)); err != nil {
@@ -765,47 +816,19 @@ func TestGRPCLBStatsUnarySuccess(t *testing.T) {
 		}
 	})
 
-	if err := checkStats(&stats, &lbmpb.ClientStats{
-		NumCallsStarted:               int64(countRPC),
-		NumCallsFinished:              int64(countRPC),
-		NumCallsFinishedKnownReceived: int64(countRPC),
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGRPCLBStatsUnaryDropLoadBalancing(t *testing.T) {
-	defer leakcheck.Check(t)
-	c := 0
-	stats := runAndGetStats(t, true, false, func(cc *grpc.ClientConn) {
-		testC := testpb.NewTestServiceClient(cc)
-		for {
-			c++
-			if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}); err != nil {
-				if strings.Contains(err.Error(), dropErrDesc) {
-					break
-				}
-			}
-		}
-		for i := 0; i < countRPC; i++ {
-			testC.EmptyCall(context.Background(), &testpb.Empty{})
-		}
-	})
-
-	if err := checkStats(&stats, &lbmpb.ClientStats{
-		NumCallsStarted:                          int64(countRPC + c),
-		NumCallsFinished:                         int64(countRPC + c),
-		NumCallsFinishedWithDropForLoadBalancing: int64(countRPC + 1),
-		NumCallsFinishedWithClientFailedToSend:   int64(c - 1),
+	if err := checkStats(stats, &rpcStats{
+		numCallsStarted:               int64(countRPC),
+		numCallsFinished:              int64(countRPC),
+		numCallsFinishedKnownReceived: int64(countRPC),
 	}); err != nil {
 		t.Fatal(err)
 	}
 }
 
-func TestGRPCLBStatsUnaryDropRateLimiting(t *testing.T) {
+func TestGRPCLBStatsUnaryDrop(t *testing.T) {
 	defer leakcheck.Check(t)
 	c := 0
-	stats := runAndGetStats(t, false, true, func(cc *grpc.ClientConn) {
+	stats := runAndGetStats(t, true, func(cc *grpc.ClientConn) {
 		testC := testpb.NewTestServiceClient(cc)
 		for {
 			c++
@@ -820,11 +843,11 @@ func TestGRPCLBStatsUnaryDropRateLimiting(t *testing.T) {
 		}
 	})
 
-	if err := checkStats(&stats, &lbmpb.ClientStats{
-		NumCallsStarted:                         int64(countRPC + c),
-		NumCallsFinished:                        int64(countRPC + c),
-		NumCallsFinishedWithDropForRateLimiting: int64(countRPC + 1),
-		NumCallsFinishedWithClientFailedToSend:  int64(c - 1),
+	if err := checkStats(stats, &rpcStats{
+		numCallsStarted:                        int64(countRPC + c),
+		numCallsFinished:                       int64(countRPC + c),
+		numCallsFinishedWithClientFailedToSend: int64(c - 1),
+		numCallsDropped:                        map[string]int64{lbToken: int64(countRPC + 1)},
 	}); err != nil {
 		t.Fatal(err)
 	}
@@ -832,22 +855,22 @@ func TestGRPCLBStatsUnaryDropRateLimiting(t *testing.T) {
 
 func TestGRPCLBStatsUnaryFailedToSend(t *testing.T) {
 	defer leakcheck.Check(t)
-	stats := runAndGetStats(t, false, false, func(cc *grpc.ClientConn) {
+	stats := runAndGetStats(t, false, func(cc *grpc.ClientConn) {
 		testC := testpb.NewTestServiceClient(cc)
 		// The first non-failfast RPC succeeds, all connections are up.
 		if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}, grpc.FailFast(false)); err != nil {
 			t.Fatalf("%v.EmptyCall(_, _) = _, %v, want _, <nil>", testC, err)
 		}
 		for i := 0; i < countRPC-1; i++ {
-			grpc.Invoke(context.Background(), failtosendURI, &testpb.Empty{}, nil, cc)
+			cc.Invoke(context.Background(), failtosendURI, &testpb.Empty{}, nil)
 		}
 	})
 
-	if err := checkStats(&stats, &lbmpb.ClientStats{
-		NumCallsStarted:                        int64(countRPC),
-		NumCallsFinished:                       int64(countRPC),
-		NumCallsFinishedWithClientFailedToSend: int64(countRPC - 1),
-		NumCallsFinishedKnownReceived:          1,
+	if err := checkStats(stats, &rpcStats{
+		numCallsStarted:                        int64(countRPC),
+		numCallsFinished:                       int64(countRPC),
+		numCallsFinishedWithClientFailedToSend: int64(countRPC - 1),
+		numCallsFinishedKnownReceived:          1,
 	}); err != nil {
 		t.Fatal(err)
 	}
@@ -855,7 +878,7 @@ func TestGRPCLBStatsUnaryFailedToSend(t *testing.T) {
 
 func TestGRPCLBStatsStreamingSuccess(t *testing.T) {
 	defer leakcheck.Check(t)
-	stats := runAndGetStats(t, false, false, func(cc *grpc.ClientConn) {
+	stats := runAndGetStats(t, false, func(cc *grpc.ClientConn) {
 		testC := testpb.NewTestServiceClient(cc)
 		// The first non-failfast RPC succeeds, all connections are up.
 		stream, err := testC.FullDuplexCall(context.Background(), grpc.FailFast(false))
@@ -880,47 +903,19 @@ func TestGRPCLBStatsStreamingSuccess(t *testing.T) {
 		}
 	})
 
-	if err := checkStats(&stats, &lbmpb.ClientStats{
-		NumCallsStarted:               int64(countRPC),
-		NumCallsFinished:              int64(countRPC),
-		NumCallsFinishedKnownReceived: int64(countRPC),
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGRPCLBStatsStreamingDropLoadBalancing(t *testing.T) {
-	defer leakcheck.Check(t)
-	c := 0
-	stats := runAndGetStats(t, true, false, func(cc *grpc.ClientConn) {
-		testC := testpb.NewTestServiceClient(cc)
-		for {
-			c++
-			if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}); err != nil {
-				if strings.Contains(err.Error(), dropErrDesc) {
-					break
-				}
-			}
-		}
-		for i := 0; i < countRPC; i++ {
-			testC.FullDuplexCall(context.Background())
-		}
-	})
-
-	if err := checkStats(&stats, &lbmpb.ClientStats{
-		NumCallsStarted:                          int64(countRPC + c),
-		NumCallsFinished:                         int64(countRPC + c),
-		NumCallsFinishedWithDropForLoadBalancing: int64(countRPC + 1),
-		NumCallsFinishedWithClientFailedToSend:   int64(c - 1),
+	if err := checkStats(stats, &rpcStats{
+		numCallsStarted:               int64(countRPC),
+		numCallsFinished:              int64(countRPC),
+		numCallsFinishedKnownReceived: int64(countRPC),
 	}); err != nil {
 		t.Fatal(err)
 	}
 }
 
-func TestGRPCLBStatsStreamingDropRateLimiting(t *testing.T) {
+func TestGRPCLBStatsStreamingDrop(t *testing.T) {
 	defer leakcheck.Check(t)
 	c := 0
-	stats := runAndGetStats(t, false, true, func(cc *grpc.ClientConn) {
+	stats := runAndGetStats(t, true, func(cc *grpc.ClientConn) {
 		testC := testpb.NewTestServiceClient(cc)
 		for {
 			c++
@@ -935,11 +930,11 @@ func TestGRPCLBStatsStreamingDropRateLimiting(t *testing.T) {
 		}
 	})
 
-	if err := checkStats(&stats, &lbmpb.ClientStats{
-		NumCallsStarted:                         int64(countRPC + c),
-		NumCallsFinished:                        int64(countRPC + c),
-		NumCallsFinishedWithDropForRateLimiting: int64(countRPC + 1),
-		NumCallsFinishedWithClientFailedToSend:  int64(c - 1),
+	if err := checkStats(stats, &rpcStats{
+		numCallsStarted:                        int64(countRPC + c),
+		numCallsFinished:                       int64(countRPC + c),
+		numCallsFinishedWithClientFailedToSend: int64(c - 1),
+		numCallsDropped:                        map[string]int64{lbToken: int64(countRPC + 1)},
 	}); err != nil {
 		t.Fatal(err)
 	}
@@ -947,7 +942,7 @@ func TestGRPCLBStatsStreamingDropRateLimiting(t *testing.T) {
 
 func TestGRPCLBStatsStreamingFailedToSend(t *testing.T) {
 	defer leakcheck.Check(t)
-	stats := runAndGetStats(t, false, false, func(cc *grpc.ClientConn) {
+	stats := runAndGetStats(t, false, func(cc *grpc.ClientConn) {
 		testC := testpb.NewTestServiceClient(cc)
 		// The first non-failfast RPC succeeds, all connections are up.
 		stream, err := testC.FullDuplexCall(context.Background(), grpc.FailFast(false))
@@ -960,15 +955,15 @@ func TestGRPCLBStatsStreamingFailedToSend(t *testing.T) {
 			}
 		}
 		for i := 0; i < countRPC-1; i++ {
-			grpc.NewClientStream(context.Background(), &grpc.StreamDesc{}, cc, failtosendURI)
+			cc.NewStream(context.Background(), &grpc.StreamDesc{}, failtosendURI)
 		}
 	})
 
-	if err := checkStats(&stats, &lbmpb.ClientStats{
-		NumCallsStarted:                        int64(countRPC),
-		NumCallsFinished:                       int64(countRPC),
-		NumCallsFinishedWithClientFailedToSend: int64(countRPC - 1),
-		NumCallsFinishedKnownReceived:          1,
+	if err := checkStats(stats, &rpcStats{
+		numCallsStarted:                        int64(countRPC),
+		numCallsFinished:                       int64(countRPC),
+		numCallsFinishedWithClientFailedToSend: int64(countRPC - 1),
+		numCallsFinishedKnownReceived:          1,
 	}); err != nil {
 		t.Fatal(err)
 	}
diff --git a/vendor/google.golang.org/grpc/grpclb_util.go b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_util.go
similarity index 51%
rename from vendor/google.golang.org/grpc/grpclb_util.go
rename to vendor/google.golang.org/grpc/balancer/grpclb/grpclb_util.go
index 93ab2db3..3194c070 100644
--- a/vendor/google.golang.org/grpc/grpclb_util.go
+++ b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_util.go
@@ -16,10 +16,15 @@
  *
  */
 
-package grpc
+package grpclb
 
 import (
+	"fmt"
+	"sync"
+	"time"
+
 	"google.golang.org/grpc/balancer"
+	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/resolver"
 )
 
@@ -88,3 +93,122 @@ func (r *lbManualResolver) NewAddress(addrs []resolver.Address) {
 func (r *lbManualResolver) NewServiceConfig(sc string) {
 	r.ccr.NewServiceConfig(sc)
 }
+
+const subConnCacheTime = time.Second * 10
+
+// lbCacheClientConn is a wrapper balancer.ClientConn with a SubConn cache.
+// SubConns will be kept in cache for subConnCacheTime before being removed.
+//
+// Its new and remove methods are updated to do cache first.
+type lbCacheClientConn struct {
+	cc      balancer.ClientConn
+	timeout time.Duration
+
+	mu sync.Mutex
+	// subConnCache only keeps subConns that are being deleted.
+	subConnCache  map[resolver.Address]*subConnCacheEntry
+	subConnToAddr map[balancer.SubConn]resolver.Address
+}
+
+type subConnCacheEntry struct {
+	sc balancer.SubConn
+
+	cancel        func()
+	abortDeleting bool
+}
+
+func newLBCacheClientConn(cc balancer.ClientConn) *lbCacheClientConn {
+	return &lbCacheClientConn{
+		cc:            cc,
+		timeout:       subConnCacheTime,
+		subConnCache:  make(map[resolver.Address]*subConnCacheEntry),
+		subConnToAddr: make(map[balancer.SubConn]resolver.Address),
+	}
+}
+
+func (ccc *lbCacheClientConn) NewSubConn(addrs []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) {
+	if len(addrs) != 1 {
+		return nil, fmt.Errorf("grpclb calling NewSubConn with addrs of length %v", len(addrs))
+	}
+	addrWithoutMD := addrs[0]
+	addrWithoutMD.Metadata = nil
+
+	ccc.mu.Lock()
+	defer ccc.mu.Unlock()
+	if entry, ok := ccc.subConnCache[addrWithoutMD]; ok {
+		// If entry is in subConnCache, the SubConn was being deleted.
+		// cancel function will never be nil.
+		entry.cancel()
+		delete(ccc.subConnCache, addrWithoutMD)
+		return entry.sc, nil
+	}
+
+	scNew, err := ccc.cc.NewSubConn(addrs, opts)
+	if err != nil {
+		return nil, err
+	}
+
+	ccc.subConnToAddr[scNew] = addrWithoutMD
+	return scNew, nil
+}
+
+func (ccc *lbCacheClientConn) RemoveSubConn(sc balancer.SubConn) {
+	ccc.mu.Lock()
+	defer ccc.mu.Unlock()
+	addr, ok := ccc.subConnToAddr[sc]
+	if !ok {
+		return
+	}
+
+	if entry, ok := ccc.subConnCache[addr]; ok {
+		if entry.sc != sc {
+			// This could happen if NewSubConn was called multiple times for the
+			// same address, and those SubConns are all removed. We remove sc
+			// immediately here.
+			delete(ccc.subConnToAddr, sc)
+			ccc.cc.RemoveSubConn(sc)
+		}
+		return
+	}
+
+	entry := &subConnCacheEntry{
+		sc: sc,
+	}
+	ccc.subConnCache[addr] = entry
+
+	timer := time.AfterFunc(ccc.timeout, func() {
+		ccc.mu.Lock()
+		if entry.abortDeleting {
+			return
+		}
+		ccc.cc.RemoveSubConn(sc)
+		delete(ccc.subConnToAddr, sc)
+		delete(ccc.subConnCache, addr)
+		ccc.mu.Unlock()
+	})
+	entry.cancel = func() {
+		if !timer.Stop() {
+			// If stop was not successful, the timer has fired (this can only
+			// happen in a race). But the deleting function is blocked on ccc.mu
+			// because the mutex was held by the caller of this function.
+			//
+			// Set abortDeleting to true to abort the deleting function. When
+			// the lock is released, the deleting function will acquire the
+			// lock, check the value of abortDeleting and return.
+			entry.abortDeleting = true
+		}
+	}
+}
+
+func (ccc *lbCacheClientConn) UpdateBalancerState(s connectivity.State, p balancer.Picker) {
+	ccc.cc.UpdateBalancerState(s, p)
+}
+
+func (ccc *lbCacheClientConn) close() {
+	ccc.mu.Lock()
+	// Only cancel all existing timers. There's no need to remove SubConns.
+	for _, entry := range ccc.subConnCache {
+		entry.cancel()
+	}
+	ccc.mu.Unlock()
+}
diff --git a/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_util_test.go b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_util_test.go
new file mode 100644
index 00000000..39d422a7
--- /dev/null
+++ b/vendor/google.golang.org/grpc/balancer/grpclb/grpclb_util_test.go
@@ -0,0 +1,219 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package grpclb
+
+import (
+	"fmt"
+	"sync"
+	"testing"
+	"time"
+
+	"google.golang.org/grpc/balancer"
+	"google.golang.org/grpc/resolver"
+)
+
+type mockSubConn struct {
+	balancer.SubConn
+}
+
+type mockClientConn struct {
+	balancer.ClientConn
+
+	mu       sync.Mutex
+	subConns map[balancer.SubConn]resolver.Address
+}
+
+func newMockClientConn() *mockClientConn {
+	return &mockClientConn{
+		subConns: make(map[balancer.SubConn]resolver.Address),
+	}
+}
+
+func (mcc *mockClientConn) NewSubConn(addrs []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) {
+	sc := &mockSubConn{}
+	mcc.mu.Lock()
+	defer mcc.mu.Unlock()
+	mcc.subConns[sc] = addrs[0]
+	return sc, nil
+}
+
+func (mcc *mockClientConn) RemoveSubConn(sc balancer.SubConn) {
+	mcc.mu.Lock()
+	defer mcc.mu.Unlock()
+	delete(mcc.subConns, sc)
+}
+
+const testCacheTimeout = 100 * time.Millisecond
+
+func checkMockCC(mcc *mockClientConn, scLen int) error {
+	mcc.mu.Lock()
+	defer mcc.mu.Unlock()
+	if len(mcc.subConns) != scLen {
+		return fmt.Errorf("mcc = %+v, want len(mcc.subConns) = %v", mcc.subConns, scLen)
+	}
+	return nil
+}
+
+func checkCacheCC(ccc *lbCacheClientConn, sccLen, sctaLen int) error {
+	ccc.mu.Lock()
+	defer ccc.mu.Unlock()
+	if len(ccc.subConnCache) != sccLen {
+		return fmt.Errorf("ccc = %+v, want len(ccc.subConnCache) = %v", ccc.subConnCache, sccLen)
+	}
+	if len(ccc.subConnToAddr) != sctaLen {
+		return fmt.Errorf("ccc = %+v, want len(ccc.subConnToAddr) = %v", ccc.subConnToAddr, sctaLen)
+	}
+	return nil
+}
+
+// Test that SubConn won't be immediately removed.
+func TestLBCacheClientConnExpire(t *testing.T) {
+	mcc := newMockClientConn()
+	if err := checkMockCC(mcc, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	ccc := newLBCacheClientConn(mcc)
+	ccc.timeout = testCacheTimeout
+	if err := checkCacheCC(ccc, 0, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	sc, _ := ccc.NewSubConn([]resolver.Address{{Addr: "address1"}}, balancer.NewSubConnOptions{})
+	// One subconn in MockCC.
+	if err := checkMockCC(mcc, 1); err != nil {
+		t.Fatal(err)
+	}
+	// No subconn being deleted, and one in CacheCC.
+	if err := checkCacheCC(ccc, 0, 1); err != nil {
+		t.Fatal(err)
+	}
+
+	ccc.RemoveSubConn(sc)
+	// One subconn in MockCC before timeout.
+	if err := checkMockCC(mcc, 1); err != nil {
+		t.Fatal(err)
+	}
+	// One subconn being deleted, and one in CacheCC.
+	if err := checkCacheCC(ccc, 1, 1); err != nil {
+		t.Fatal(err)
+	}
+
+	// Should all become empty after timeout.
+	var err error
+	for i := 0; i < 2; i++ {
+		time.Sleep(testCacheTimeout)
+		err = checkMockCC(mcc, 0)
+		if err != nil {
+			continue
+		}
+		err = checkCacheCC(ccc, 0, 0)
+		if err != nil {
+			continue
+		}
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Test that NewSubConn with the same address of a SubConn being removed will
+// reuse the SubConn and cancel the removing.
+func TestLBCacheClientConnReuse(t *testing.T) {
+	mcc := newMockClientConn()
+	if err := checkMockCC(mcc, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	ccc := newLBCacheClientConn(mcc)
+	ccc.timeout = testCacheTimeout
+	if err := checkCacheCC(ccc, 0, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	sc, _ := ccc.NewSubConn([]resolver.Address{{Addr: "address1"}}, balancer.NewSubConnOptions{})
+	// One subconn in MockCC.
+	if err := checkMockCC(mcc, 1); err != nil {
+		t.Fatal(err)
+	}
+	// No subconn being deleted, and one in CacheCC.
+	if err := checkCacheCC(ccc, 0, 1); err != nil {
+		t.Fatal(err)
+	}
+
+	ccc.RemoveSubConn(sc)
+	// One subconn in MockCC before timeout.
+	if err := checkMockCC(mcc, 1); err != nil {
+		t.Fatal(err)
+	}
+	// One subconn being deleted, and one in CacheCC.
+	if err := checkCacheCC(ccc, 1, 1); err != nil {
+		t.Fatal(err)
+	}
+
+	// Recreate the old subconn, this should cancel the deleting process.
+	sc, _ = ccc.NewSubConn([]resolver.Address{{Addr: "address1"}}, balancer.NewSubConnOptions{})
+	// One subconn in MockCC.
+	if err := checkMockCC(mcc, 1); err != nil {
+		t.Fatal(err)
+	}
+	// No subconn being deleted, and one in CacheCC.
+	if err := checkCacheCC(ccc, 0, 1); err != nil {
+		t.Fatal(err)
+	}
+
+	var err error
+	// Should not become empty after 2*timeout.
+	time.Sleep(2 * testCacheTimeout)
+	err = checkMockCC(mcc, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = checkCacheCC(ccc, 0, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Call remove again, will delete after timeout.
+	ccc.RemoveSubConn(sc)
+	// One subconn in MockCC before timeout.
+	if err := checkMockCC(mcc, 1); err != nil {
+		t.Fatal(err)
+	}
+	// One subconn being deleted, and one in CacheCC.
+	if err := checkCacheCC(ccc, 1, 1); err != nil {
+		t.Fatal(err)
+	}
+
+	// Should all become empty after timeout.
+	for i := 0; i < 2; i++ {
+		time.Sleep(testCacheTimeout)
+		err = checkMockCC(mcc, 0)
+		if err != nil {
+			continue
+		}
+		err = checkCacheCC(ccc, 0, 0)
+		if err != nil {
+			continue
+		}
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/balancer/grpclb/regenerate.sh b/vendor/google.golang.org/grpc/balancer/grpclb/regenerate.sh
new file mode 100755
index 00000000..b8978e11
--- /dev/null
+++ b/vendor/google.golang.org/grpc/balancer/grpclb/regenerate.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2018 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eux -o pipefail
+
+TMP=$(mktemp -d)
+
+function finish {
+  rm -rf "$TMP"
+}
+trap finish EXIT
+
+pushd "$TMP"
+mkdir -p grpc/lb/v1
+curl https://raw.githubusercontent.com/grpc/grpc-proto/master/grpc/lb/v1/load_balancer.proto > grpc/lb/v1/load_balancer.proto
+
+protoc --go_out=plugins=grpc,paths=source_relative:. -I. grpc/lb/v1/*.proto
+popd
+rm -f grpc_lb_v1/*.pb.go
+cp "$TMP"/grpc/lb/v1/*.pb.go grpc_lb_v1/
+
diff --git a/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin_test.go b/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin_test.go
index 59cac4b1..70d8af71 100644
--- a/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin_test.go
+++ b/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin_test.go
@@ -30,12 +30,12 @@ import (
 	"google.golang.org/grpc/balancer/roundrobin"
 	"google.golang.org/grpc/codes"
 	_ "google.golang.org/grpc/grpclog/glogger"
+	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/resolver/manual"
 	"google.golang.org/grpc/status"
 	testpb "google.golang.org/grpc/test/grpc_testing"
-	"google.golang.org/grpc/test/leakcheck"
 )
 
 type testServer struct {
diff --git a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go
index db6f0ae3..c23f8170 100644
--- a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go
+++ b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go
@@ -115,7 +115,7 @@ func newCCBalancerWrapper(cc *ClientConn, b balancer.Builder, bopts balancer.Bui
 	return ccb
 }
 
-// watcher balancer functions sequencially, so the balancer can be implemeneted
+// watcher balancer functions sequentially, so the balancer can be implemented
 // lock-free.
 func (ccb *ccBalancerWrapper) watcher() {
 	for {
diff --git a/vendor/google.golang.org/grpc/balancer_switching_test.go b/vendor/google.golang.org/grpc/balancer_switching_test.go
index 0d8b2a54..0dcd9165 100644
--- a/vendor/google.golang.org/grpc/balancer_switching_test.go
+++ b/vendor/google.golang.org/grpc/balancer_switching_test.go
@@ -25,13 +25,39 @@ import (
 	"time"
 
 	"golang.org/x/net/context"
+	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/roundrobin"
+	"google.golang.org/grpc/connectivity"
 	_ "google.golang.org/grpc/grpclog/glogger"
+	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/resolver/manual"
-	"google.golang.org/grpc/test/leakcheck"
 )
 
+var _ balancer.Builder = &magicalLB{}
+var _ balancer.Balancer = &magicalLB{}
+
+// magicalLB is a ringer for grpclb.  It is used to avoid circular dependencies on the grpclb package
+type magicalLB struct{}
+
+func (b *magicalLB) Name() string {
+	return "grpclb"
+}
+
+func (b *magicalLB) Build(cc balancer.ClientConn, opts balancer.BuildOptions) balancer.Balancer {
+	return b
+}
+
+func (b *magicalLB) HandleSubConnStateChange(balancer.SubConn, connectivity.State) {}
+
+func (b *magicalLB) HandleResolvedAddrs([]resolver.Address, error) {}
+
+func (b *magicalLB) Close() {}
+
+func init() {
+	balancer.Register(&magicalLB{})
+}
+
 func checkPickFirst(cc *ClientConn, servers []*server) error {
 	var (
 		req   = "port"
@@ -40,7 +66,7 @@ func checkPickFirst(cc *ClientConn, servers []*server) error {
 	)
 	connected := false
 	for i := 0; i < 5000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); errorDesc(err) == servers[0].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); errorDesc(err) == servers[0].port {
 			if connected {
 				// connected is set to false if peer is not server[0]. So if
 				// connected is true here, this is the second time we saw
@@ -58,7 +84,7 @@ func checkPickFirst(cc *ClientConn, servers []*server) error {
 	}
 	// The following RPCs should all succeed with the first server.
 	for i := 0; i < 3; i++ {
-		err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc)
+		err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply)
 		if errorDesc(err) != servers[0].port {
 			return fmt.Errorf("Index %d: want peer %v, got peer %v", i, servers[0].port, err)
 		}
@@ -80,7 +106,7 @@ func checkRoundRobin(cc *ClientConn, servers []*server) error {
 		for _, s := range servers {
 			var up bool
 			for i := 0; i < 5000; i++ {
-				if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); errorDesc(err) == s.port {
+				if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); errorDesc(err) == s.port {
 					up = true
 					break
 				}
@@ -94,7 +120,7 @@ func checkRoundRobin(cc *ClientConn, servers []*server) error {
 
 	serverCount := len(servers)
 	for i := 0; i < 3*serverCount; i++ {
-		err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc)
+		err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply)
 		if errorDesc(err) != servers[i%serverCount].port {
 			return fmt.Errorf("Index %d: want peer %v, got peer %v", i, servers[i%serverCount].port, err)
 		}
diff --git a/vendor/google.golang.org/grpc/balancer_test.go b/vendor/google.golang.org/grpc/balancer_test.go
index 3e0fa19b..8675e7d5 100644
--- a/vendor/google.golang.org/grpc/balancer_test.go
+++ b/vendor/google.golang.org/grpc/balancer_test.go
@@ -29,9 +29,9 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	_ "google.golang.org/grpc/grpclog/glogger"
+	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/naming"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/test/leakcheck"
 
 	// V1 balancer tests use passthrough resolver instead of dns.
 	// TODO(bar) remove this when removing v1 balaner entirely.
@@ -44,7 +44,7 @@ type testWatcher struct {
 	update chan *naming.Update
 	// the side channel to get to know how many updates in a batch
 	side chan int
-	// the channel to notifiy update injector that the update reading is done
+	// the channel to notify update injector that the update reading is done
 	readDone chan int
 }
 
@@ -130,7 +130,7 @@ func TestNameDiscovery(t *testing.T) {
 	defer cc.Close()
 	req := "port"
 	var reply string
-	if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[0].port {
+	if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[0].port {
 		t.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want %s", err, servers[0].port)
 	}
 	// Inject the name resolution change to remove servers[0] and add servers[1].
@@ -146,7 +146,7 @@ func TestNameDiscovery(t *testing.T) {
 	r.w.inject(updates)
 	// Loop until the rpcs in flight talks to servers[1].
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[1].port {
 			break
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -163,7 +163,7 @@ func TestEmptyAddrs(t *testing.T) {
 	}
 	defer cc.Close()
 	var reply string
-	if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc); err != nil || reply != expectedResponse {
+	if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply); err != nil || reply != expectedResponse {
 		t.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, reply = %q, want %q, <nil>", err, reply, expectedResponse)
 	}
 	// Inject name resolution change to remove the server so that there is no address
@@ -177,7 +177,7 @@ func TestEmptyAddrs(t *testing.T) {
 	for {
 		time.Sleep(10 * time.Millisecond)
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
-		if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc); err != nil {
+		if err := cc.Invoke(ctx, "/foo/bar", &expectedRequest, &reply); err != nil {
 			cancel()
 			break
 		}
@@ -206,7 +206,7 @@ func TestRoundRobin(t *testing.T) {
 	var reply string
 	// Loop until servers[1] is up
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[1].port {
 			break
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -219,14 +219,14 @@ func TestRoundRobin(t *testing.T) {
 	r.w.inject([]*naming.Update{u})
 	// Loop until both servers[2] are up.
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[2].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[2].port {
 			break
 		}
 		time.Sleep(10 * time.Millisecond)
 	}
 	// Check the incoming RPCs served in a round-robin manner.
 	for i := 0; i < 10; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[i%numServers].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[i%numServers].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", i, err, servers[i%numServers].port)
 		}
 	}
@@ -242,7 +242,7 @@ func TestCloseWithPendingRPC(t *testing.T) {
 	}
 	defer cc.Close()
 	var reply string
-	if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err != nil {
+	if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err != nil {
 		t.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want %s", err, servers[0].port)
 	}
 	// Remove the server.
@@ -254,7 +254,7 @@ func TestCloseWithPendingRPC(t *testing.T) {
 	// Loop until the above update applies.
 	for {
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
-		if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); status.Code(err) == codes.DeadlineExceeded {
+		if err := cc.Invoke(ctx, "/foo/bar", &expectedRequest, &reply, FailFast(false)); status.Code(err) == codes.DeadlineExceeded {
 			cancel()
 			break
 		}
@@ -267,7 +267,7 @@ func TestCloseWithPendingRPC(t *testing.T) {
 	go func() {
 		defer wg.Done()
 		var reply string
-		if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err == nil {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err == nil {
 			t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want not nil", err)
 		}
 	}()
@@ -275,7 +275,7 @@ func TestCloseWithPendingRPC(t *testing.T) {
 		defer wg.Done()
 		var reply string
 		time.Sleep(5 * time.Millisecond)
-		if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err == nil {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err == nil {
 			t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want not nil", err)
 		}
 	}()
@@ -302,7 +302,7 @@ func TestGetOnWaitChannel(t *testing.T) {
 	for {
 		var reply string
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
-		if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); status.Code(err) == codes.DeadlineExceeded {
+		if err := cc.Invoke(ctx, "/foo/bar", &expectedRequest, &reply, FailFast(false)); status.Code(err) == codes.DeadlineExceeded {
 			cancel()
 			break
 		}
@@ -314,7 +314,7 @@ func TestGetOnWaitChannel(t *testing.T) {
 	go func() {
 		defer wg.Done()
 		var reply string
-		if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err != nil {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err != nil {
 			t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want <nil>", err)
 		}
 	}()
@@ -350,7 +350,7 @@ func TestOneServerDown(t *testing.T) {
 	var reply string
 	// Loop until servers[1] is up
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[1].port {
 			break
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -374,7 +374,7 @@ func TestOneServerDown(t *testing.T) {
 			time.Sleep(sleepDuration)
 			// After sleepDuration, invoke RPC.
 			// server[0] is killed around the same time to make it racy between balancer and gRPC internals.
-			Invoke(context.Background(), "/foo/bar", &req, &reply, cc, FailFast(false))
+			cc.Invoke(context.Background(), "/foo/bar", &req, &reply, FailFast(false))
 			wg.Done()
 		}()
 	}
@@ -403,7 +403,7 @@ func TestOneAddressRemoval(t *testing.T) {
 	var reply string
 	// Loop until servers[1] is up
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[1].port {
 			break
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -433,8 +433,8 @@ func TestOneAddressRemoval(t *testing.T) {
 			time.Sleep(sleepDuration)
 			// After sleepDuration, invoke RPC.
 			// server[0] is removed around the same time to make it racy between balancer and gRPC internals.
-			if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err != nil {
-				t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want not nil", err)
+			if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err != nil {
+				t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want nil", err)
 			}
 			wg.Done()
 		}()
@@ -452,7 +452,7 @@ func checkServerUp(t *testing.T, currentServer *server) {
 	defer cc.Close()
 	var reply string
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == port {
 			break
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -469,7 +469,7 @@ func TestPickFirstEmptyAddrs(t *testing.T) {
 	}
 	defer cc.Close()
 	var reply string
-	if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc); err != nil || reply != expectedResponse {
+	if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply); err != nil || reply != expectedResponse {
 		t.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, reply = %q, want %q, <nil>", err, reply, expectedResponse)
 	}
 	// Inject name resolution change to remove the server so that there is no address
@@ -483,7 +483,7 @@ func TestPickFirstEmptyAddrs(t *testing.T) {
 	for {
 		time.Sleep(10 * time.Millisecond)
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
-		if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc); err != nil {
+		if err := cc.Invoke(ctx, "/foo/bar", &expectedRequest, &reply); err != nil {
 			cancel()
 			break
 		}
@@ -501,7 +501,7 @@ func TestPickFirstCloseWithPendingRPC(t *testing.T) {
 	}
 	defer cc.Close()
 	var reply string
-	if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err != nil {
+	if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err != nil {
 		t.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want %s", err, servers[0].port)
 	}
 	// Remove the server.
@@ -513,7 +513,7 @@ func TestPickFirstCloseWithPendingRPC(t *testing.T) {
 	// Loop until the above update applies.
 	for {
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
-		if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); status.Code(err) == codes.DeadlineExceeded {
+		if err := cc.Invoke(ctx, "/foo/bar", &expectedRequest, &reply, FailFast(false)); status.Code(err) == codes.DeadlineExceeded {
 			cancel()
 			break
 		}
@@ -526,7 +526,7 @@ func TestPickFirstCloseWithPendingRPC(t *testing.T) {
 	go func() {
 		defer wg.Done()
 		var reply string
-		if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err == nil {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err == nil {
 			t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want not nil", err)
 		}
 	}()
@@ -534,7 +534,7 @@ func TestPickFirstCloseWithPendingRPC(t *testing.T) {
 		defer wg.Done()
 		var reply string
 		time.Sleep(5 * time.Millisecond)
-		if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err == nil {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err == nil {
 			t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want not nil", err)
 		}
 	}()
@@ -576,7 +576,7 @@ func TestPickFirstOrderAllServerUp(t *testing.T) {
 	req := "port"
 	var reply string
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[0].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[0].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 0, err, servers[0].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -591,13 +591,13 @@ func TestPickFirstOrderAllServerUp(t *testing.T) {
 	r.w.inject([]*naming.Update{u})
 	// Loop until it changes to server[1]
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[1].port {
 			break
 		}
 		time.Sleep(10 * time.Millisecond)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[1].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 1, err, servers[1].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -611,7 +611,7 @@ func TestPickFirstOrderAllServerUp(t *testing.T) {
 	}
 	r.w.inject([]*naming.Update{u})
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[1].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 1, err, servers[1].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -624,13 +624,13 @@ func TestPickFirstOrderAllServerUp(t *testing.T) {
 	}
 	r.w.inject([]*naming.Update{u})
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[2].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[2].port {
 			break
 		}
 		time.Sleep(1 * time.Second)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[2].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[2].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 2, err, servers[2].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -643,13 +643,13 @@ func TestPickFirstOrderAllServerUp(t *testing.T) {
 	}
 	r.w.inject([]*naming.Update{u})
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[0].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[0].port {
 			break
 		}
 		time.Sleep(1 * time.Second)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[0].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[0].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 0, err, servers[0].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -689,7 +689,7 @@ func TestPickFirstOrderOneServerDown(t *testing.T) {
 	req := "port"
 	var reply string
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[0].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[0].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 0, err, servers[0].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -700,13 +700,13 @@ func TestPickFirstOrderOneServerDown(t *testing.T) {
 	servers[0].stop()
 	// Loop until it changes to server[1]
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[1].port {
 			break
 		}
 		time.Sleep(10 * time.Millisecond)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[1].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 1, err, servers[1].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -721,7 +721,7 @@ func TestPickFirstOrderOneServerDown(t *testing.T) {
 	checkServerUp(t, servers[0])
 
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[1].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 1, err, servers[1].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -734,13 +734,13 @@ func TestPickFirstOrderOneServerDown(t *testing.T) {
 	}
 	r.w.inject([]*naming.Update{u})
 	for {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[0].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[0].port {
 			break
 		}
 		time.Sleep(1 * time.Second)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[0].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[0].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 0, err, servers[0].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -794,8 +794,8 @@ func TestPickFirstOneAddressRemoval(t *testing.T) {
 			time.Sleep(sleepDuration)
 			// After sleepDuration, invoke RPC.
 			// server[0] is removed around the same time to make it racy between balancer and gRPC internals.
-			if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); err != nil {
-				t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want not nil", err)
+			if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, FailFast(false)); err != nil {
+				t.Errorf("grpc.Invoke(_, _, _, _, _) = %v, want nil", err)
 			}
 			wg.Done()
 		}()
diff --git a/vendor/google.golang.org/grpc/balancer_v1_wrapper.go b/vendor/google.golang.org/grpc/balancer_v1_wrapper.go
index faabf87d..e0ce32cf 100644
--- a/vendor/google.golang.org/grpc/balancer_v1_wrapper.go
+++ b/vendor/google.golang.org/grpc/balancer_v1_wrapper.go
@@ -55,7 +55,7 @@ func (bwb *balancerWrapperBuilder) Build(cc balancer.ClientConn, opts balancer.B
 		startCh:    make(chan struct{}),
 		conns:      make(map[resolver.Address]balancer.SubConn),
 		connSt:     make(map[balancer.SubConn]*scState),
-		csEvltr:    &connectivityStateEvaluator{},
+		csEvltr:    &balancer.ConnectivityStateEvaluator{},
 		state:      connectivity.Idle,
 	}
 	cc.UpdateBalancerState(connectivity.Idle, bw)
@@ -80,10 +80,6 @@ type balancerWrapper struct {
 	cc         balancer.ClientConn
 	targetAddr string // Target without the scheme.
 
-	// To aggregate the connectivity state.
-	csEvltr *connectivityStateEvaluator
-	state   connectivity.State
-
 	mu     sync.Mutex
 	conns  map[resolver.Address]balancer.SubConn
 	connSt map[balancer.SubConn]*scState
@@ -92,6 +88,10 @@ type balancerWrapper struct {
 	// - NewSubConn is created, cc wants to notify balancer of state changes;
 	// - Build hasn't return, cc doesn't have access to balancer.
 	startCh chan struct{}
+
+	// To aggregate the connectivity state.
+	csEvltr *balancer.ConnectivityStateEvaluator
+	state   connectivity.State
 }
 
 // lbWatcher watches the Notify channel of the balancer and manages
@@ -248,7 +248,7 @@ func (bw *balancerWrapper) HandleSubConnStateChange(sc balancer.SubConn, s conne
 			scSt.down(errConnClosing)
 		}
 	}
-	sa := bw.csEvltr.recordTransition(oldS, s)
+	sa := bw.csEvltr.RecordTransition(oldS, s)
 	if bw.state != sa {
 		bw.state = sa
 	}
@@ -257,7 +257,6 @@ func (bw *balancerWrapper) HandleSubConnStateChange(sc balancer.SubConn, s conne
 		// Remove state for this sc.
 		delete(bw.connSt, sc)
 	}
-	return
 }
 
 func (bw *balancerWrapper) HandleResolvedAddrs([]resolver.Address, error) {
@@ -270,7 +269,6 @@ func (bw *balancerWrapper) HandleResolvedAddrs([]resolver.Address, error) {
 	}
 	// There should be a resolver inside the balancer.
 	// All updates here, if any, are ignored.
-	return
 }
 
 func (bw *balancerWrapper) Close() {
@@ -282,7 +280,6 @@ func (bw *balancerWrapper) Close() {
 		close(bw.startCh)
 	}
 	bw.balancer.Close()
-	return
 }
 
 // The picker is the balancerWrapper itself.
@@ -329,47 +326,3 @@ func (bw *balancerWrapper) Pick(ctx context.Context, opts balancer.PickOptions)
 
 	return sc, done, nil
 }
-
-// connectivityStateEvaluator gets updated by addrConns when their
-// states transition, based on which it evaluates the state of
-// ClientConn.
-type connectivityStateEvaluator struct {
-	mu                  sync.Mutex
-	numReady            uint64 // Number of addrConns in ready state.
-	numConnecting       uint64 // Number of addrConns in connecting state.
-	numTransientFailure uint64 // Number of addrConns in transientFailure.
-}
-
-// recordTransition records state change happening in every subConn and based on
-// that it evaluates what aggregated state should be.
-// It can only transition between Ready, Connecting and TransientFailure. Other states,
-// Idle and Shutdown are transitioned into by ClientConn; in the beginning of the connection
-// before any subConn is created ClientConn is in idle state. In the end when ClientConn
-// closes it is in Shutdown state.
-// TODO Note that in later releases, a ClientConn with no activity will be put into an Idle state.
-func (cse *connectivityStateEvaluator) recordTransition(oldState, newState connectivity.State) connectivity.State {
-	cse.mu.Lock()
-	defer cse.mu.Unlock()
-
-	// Update counters.
-	for idx, state := range []connectivity.State{oldState, newState} {
-		updateVal := 2*uint64(idx) - 1 // -1 for oldState and +1 for new.
-		switch state {
-		case connectivity.Ready:
-			cse.numReady += updateVal
-		case connectivity.Connecting:
-			cse.numConnecting += updateVal
-		case connectivity.TransientFailure:
-			cse.numTransientFailure += updateVal
-		}
-	}
-
-	// Evaluate.
-	if cse.numReady > 0 {
-		return connectivity.Ready
-	}
-	if cse.numConnecting > 0 {
-		return connectivity.Connecting
-	}
-	return connectivity.TransientFailure
-}
diff --git a/vendor/google.golang.org/grpc/benchmark/benchmain/main.go b/vendor/google.golang.org/grpc/benchmark/benchmain/main.go
index 0cc1f25e..5a9e478d 100644
--- a/vendor/google.golang.org/grpc/benchmark/benchmain/main.go
+++ b/vendor/google.golang.org/grpc/benchmark/benchmain/main.go
@@ -66,6 +66,7 @@ import (
 	"google.golang.org/grpc/benchmark/latency"
 	"google.golang.org/grpc/benchmark/stats"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/test/bufconn"
 )
 
 const (
@@ -100,6 +101,7 @@ var (
 	memProfile, cpuProfile string
 	memProfileRate         int
 	enableCompressor       []bool
+	enableChannelz         []bool
 	networkMode            string
 	benchmarkResultFile    string
 	networks               = map[string]latency.Network{
@@ -137,13 +139,31 @@ func makeFuncUnary(benchFeatures stats.Features) (func(int), func()) {
 		)
 	}
 	sopts = append(sopts, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1)))
-	opts = append(opts, grpc.WithDialer(func(address string, timeout time.Duration) (net.Conn, error) {
-		return nw.TimeoutDialer(net.DialTimeout)("tcp", address, timeout)
-	}))
 	opts = append(opts, grpc.WithInsecure())
 
-	target, stopper := bm.StartServer(bm.ServerInfo{Addr: "localhost:0", Type: "protobuf", Network: nw}, sopts...)
-	conn := bm.NewClientConn(target, opts...)
+	var lis net.Listener
+	if *useBufconn {
+		bcLis := bufconn.Listen(256 * 1024)
+		lis = bcLis
+		opts = append(opts, grpc.WithDialer(func(string, time.Duration) (net.Conn, error) {
+			return nw.TimeoutDialer(
+				func(string, string, time.Duration) (net.Conn, error) {
+					return bcLis.Dial()
+				})("", "", 0)
+		}))
+	} else {
+		var err error
+		lis, err = net.Listen("tcp", "localhost:0")
+		if err != nil {
+			grpclog.Fatalf("Failed to listen: %v", err)
+		}
+		opts = append(opts, grpc.WithDialer(func(_ string, timeout time.Duration) (net.Conn, error) {
+			return nw.TimeoutDialer(net.DialTimeout)("tcp", lis.Addr().String(), timeout)
+		}))
+	}
+	lis = nw.Listener(lis)
+	stopper := bm.StartServer(bm.ServerInfo{Type: "protobuf", Listener: lis}, sopts...)
+	conn := bm.NewClientConn("" /* target not used */, opts...)
 	tc := testpb.NewBenchmarkServiceClient(conn)
 	return func(int) {
 			unaryCaller(tc, benchFeatures.ReqSizeBytes, benchFeatures.RespSizeBytes)
@@ -154,6 +174,7 @@ func makeFuncUnary(benchFeatures stats.Features) (func(int), func()) {
 }
 
 func makeFuncStream(benchFeatures stats.Features) (func(int), func()) {
+	// TODO: Refactor to remove duplication with makeFuncUnary.
 	nw := &latency.Network{Kbps: benchFeatures.Kbps, Latency: benchFeatures.Latency, MTU: benchFeatures.Mtu}
 	opts := []grpc.DialOption{}
 	sopts := []grpc.ServerOption{}
@@ -168,13 +189,31 @@ func makeFuncStream(benchFeatures stats.Features) (func(int), func()) {
 		)
 	}
 	sopts = append(sopts, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1)))
-	opts = append(opts, grpc.WithDialer(func(address string, timeout time.Duration) (net.Conn, error) {
-		return nw.TimeoutDialer(net.DialTimeout)("tcp", address, timeout)
-	}))
 	opts = append(opts, grpc.WithInsecure())
 
-	target, stopper := bm.StartServer(bm.ServerInfo{Addr: "localhost:0", Type: "protobuf", Network: nw}, sopts...)
-	conn := bm.NewClientConn(target, opts...)
+	var lis net.Listener
+	if *useBufconn {
+		bcLis := bufconn.Listen(256 * 1024)
+		lis = bcLis
+		opts = append(opts, grpc.WithDialer(func(string, time.Duration) (net.Conn, error) {
+			return nw.TimeoutDialer(
+				func(string, string, time.Duration) (net.Conn, error) {
+					return bcLis.Dial()
+				})("", "", 0)
+		}))
+	} else {
+		var err error
+		lis, err = net.Listen("tcp", "localhost:0")
+		if err != nil {
+			grpclog.Fatalf("Failed to listen: %v", err)
+		}
+		opts = append(opts, grpc.WithDialer(func(_ string, timeout time.Duration) (net.Conn, error) {
+			return nw.TimeoutDialer(net.DialTimeout)("tcp", lis.Addr().String(), timeout)
+		}))
+	}
+	lis = nw.Listener(lis)
+	stopper := bm.StartServer(bm.ServerInfo{Type: "protobuf", Listener: lis}, sopts...)
+	conn := bm.NewClientConn("" /* target not used */, opts...)
 	tc := testpb.NewBenchmarkServiceClient(conn)
 	streams := make([]testpb.BenchmarkService_StreamingCallClient, benchFeatures.MaxConcurrentCalls)
 	for i := 0; i < benchFeatures.MaxConcurrentCalls; i++ {
@@ -240,18 +279,21 @@ func runBenchmark(caller func(int), startTimer func(), stopTimer func(int32), be
 	stopTimer(count)
 }
 
+var useBufconn = flag.Bool("bufconn", false, "Use in-memory connection instead of system network I/O")
+
 // Initiate main function to get settings of features.
 func init() {
 	var (
-		workloads, traceMode, compressorMode, readLatency string
-		readKbps, readMtu, readMaxConcurrentCalls         intSliceType
-		readReqSizeBytes, readRespSizeBytes               intSliceType
+		workloads, traceMode, compressorMode, readLatency, channelzOn string
+		readKbps, readMtu, readMaxConcurrentCalls                     intSliceType
+		readReqSizeBytes, readRespSizeBytes                           intSliceType
 	)
 	flag.StringVar(&workloads, "workloads", workloadsAll,
 		fmt.Sprintf("Workloads to execute - One of: %v", strings.Join(allWorkloads, ", ")))
 	flag.StringVar(&traceMode, "trace", modeOff,
 		fmt.Sprintf("Trace mode - One of: %v", strings.Join(allTraceModes, ", ")))
 	flag.StringVar(&readLatency, "latency", "", "Simulated one-way network latency - may be a comma-separated list")
+	flag.StringVar(&channelzOn, "channelz", modeOff, "whether channelz should be turned on")
 	flag.DurationVar(&benchtime, "benchtime", time.Second, "Configures the amount of time to run each benchmark")
 	flag.Var(&readKbps, "kbps", "Simulated network throughput (in kbps) - may be a comma-separated list")
 	flag.Var(&readMtu, "mtu", "Simulated network MTU (Maximum Transmission Unit) - may be a comma-separated list")
@@ -287,6 +329,7 @@ func init() {
 	}
 	enableCompressor = setMode(compressorMode)
 	enableTrace = setMode(traceMode)
+	enableChannelz = setMode(channelzOn)
 	// Time input formats as (time + unit).
 	readTimeFromInput(&ltc, readLatency)
 	readIntFromIntSlice(&kbps, readKbps)
@@ -360,10 +403,10 @@ func readTimeFromInput(values *[]time.Duration, replace string) {
 
 func main() {
 	before()
-	featuresPos := make([]int, 8)
+	featuresPos := make([]int, 9)
 	// 0:enableTracing 1:ltc 2:kbps 3:mtu 4:maxC 5:reqSize 6:respSize
 	featuresNum := []int{len(enableTrace), len(ltc), len(kbps), len(mtu),
-		len(maxConcurrentCalls), len(reqSizeBytes), len(respSizeBytes), len(enableCompressor)}
+		len(maxConcurrentCalls), len(reqSizeBytes), len(respSizeBytes), len(enableCompressor), len(enableChannelz)}
 	initalPos := make([]int, len(featuresPos))
 	s := stats.NewStats(10)
 	s.SortLatency()
@@ -380,7 +423,7 @@ func main() {
 	}
 	var stopTimer = func(count int32) {
 		runtime.ReadMemStats(&memStats)
-		results = testing.BenchmarkResult{N: int(count), T: time.Now().Sub(startTime),
+		results = testing.BenchmarkResult{N: int(count), T: time.Since(startTime),
 			Bytes: 0, MemAllocs: memStats.Mallocs - startAllocs, MemBytes: memStats.TotalAlloc - startBytes}
 	}
 	sharedPos := make([]bool, len(featuresPos))
@@ -404,9 +447,13 @@ func main() {
 			ReqSizeBytes:       reqSizeBytes[featuresPos[5]],
 			RespSizeBytes:      respSizeBytes[featuresPos[6]],
 			EnableCompressor:   enableCompressor[featuresPos[7]],
+			EnableChannelz:     enableChannelz[featuresPos[8]],
 		}
 
 		grpc.EnableTracing = enableTrace[featuresPos[0]]
+		if enableChannelz[featuresPos[8]] {
+			grpc.RegisterChannelz()
+		}
 		if runMode[0] {
 			unaryBenchmark(startTimer, stopTimer, benchFeature, benchtime, s)
 			s.SetBenchmarkResult("Unary", benchFeature, results.N,
diff --git a/vendor/google.golang.org/grpc/benchmark/benchmark.go b/vendor/google.golang.org/grpc/benchmark/benchmark.go
index f09fa454..ec9b50b2 100644
--- a/vendor/google.golang.org/grpc/benchmark/benchmark.go
+++ b/vendor/google.golang.org/grpc/benchmark/benchmark.go
@@ -65,7 +65,6 @@ func setPayload(p *testpb.Payload, t testpb.PayloadType, size int) {
 	}
 	p.Type = t
 	p.Body = body
-	return
 }
 
 func newPayload(t testpb.PayloadType, size int) *testpb.Payload {
@@ -136,9 +135,6 @@ func (s *byteBufServer) StreamingCall(stream testpb.BenchmarkService_StreamingCa
 
 // ServerInfo contains the information to create a gRPC benchmark server.
 type ServerInfo struct {
-	// Addr is the address of the server.
-	Addr string
-
 	// Type is the type of the server.
 	// It should be "protobuf" or "bytebuf".
 	Type string
@@ -148,21 +144,13 @@ type ServerInfo struct {
 	// For "bytebuf", it should be an int representing response size.
 	Metadata interface{}
 
-	// Network can simulate latency
-	Network *latency.Network
+	// Listener is the network listener for the server to use
+	Listener net.Listener
 }
 
 // StartServer starts a gRPC server serving a benchmark service according to info.
-// It returns its listen address and a function to stop the server.
-func StartServer(info ServerInfo, opts ...grpc.ServerOption) (string, func()) {
-	lis, err := net.Listen("tcp", info.Addr)
-	if err != nil {
-		grpclog.Fatalf("Failed to listen: %v", err)
-	}
-	nw := info.Network
-	if nw != nil {
-		lis = nw.Listener(lis)
-	}
+// It returns a function to stop the server.
+func StartServer(info ServerInfo, opts ...grpc.ServerOption) func() {
 	opts = append(opts, grpc.WriteBufferSize(128*1024))
 	opts = append(opts, grpc.ReadBufferSize(128*1024))
 	s := grpc.NewServer(opts...)
@@ -178,8 +166,8 @@ func StartServer(info ServerInfo, opts ...grpc.ServerOption) (string, func()) {
 	default:
 		grpclog.Fatalf("failed to StartServer, unknown Type: %v", info.Type)
 	}
-	go s.Serve(lis)
-	return lis.Addr().String(), func() {
+	go s.Serve(info.Listener)
+	return func() {
 		s.Stop()
 	}
 }
@@ -238,9 +226,14 @@ func DoByteBufStreamingRoundTrip(stream testpb.BenchmarkService_StreamingCallCli
 
 // NewClientConn creates a gRPC client connection to addr.
 func NewClientConn(addr string, opts ...grpc.DialOption) *grpc.ClientConn {
+	return NewClientConnWithContext(context.Background(), addr, opts...)
+}
+
+// NewClientConnWithContext creates a gRPC client connection to addr using ctx.
+func NewClientConnWithContext(ctx context.Context, addr string, opts ...grpc.DialOption) *grpc.ClientConn {
 	opts = append(opts, grpc.WithWriteBufferSize(128*1024))
 	opts = append(opts, grpc.WithReadBufferSize(128*1024))
-	conn, err := grpc.Dial(addr, opts...)
+	conn, err := grpc.DialContext(ctx, addr, opts...)
 	if err != nil {
 		grpclog.Fatalf("NewClientConn(%q) failed to create a ClientConn %v", addr, err)
 	}
@@ -250,7 +243,13 @@ func NewClientConn(addr string, opts ...grpc.DialOption) *grpc.ClientConn {
 func runUnary(b *testing.B, benchFeatures stats.Features) {
 	s := stats.AddStats(b, 38)
 	nw := &latency.Network{Kbps: benchFeatures.Kbps, Latency: benchFeatures.Latency, MTU: benchFeatures.Mtu}
-	target, stopper := StartServer(ServerInfo{Addr: "localhost:0", Type: "protobuf", Network: nw}, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1)))
+	lis, err := net.Listen("tcp", "localhost:0")
+	if err != nil {
+		grpclog.Fatalf("Failed to listen: %v", err)
+	}
+	target := lis.Addr().String()
+	lis = nw.Listener(lis)
+	stopper := StartServer(ServerInfo{Type: "protobuf", Listener: lis}, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1)))
 	defer stopper()
 	conn := NewClientConn(
 		target, grpc.WithInsecure(),
@@ -298,7 +297,13 @@ func runUnary(b *testing.B, benchFeatures stats.Features) {
 func runStream(b *testing.B, benchFeatures stats.Features) {
 	s := stats.AddStats(b, 38)
 	nw := &latency.Network{Kbps: benchFeatures.Kbps, Latency: benchFeatures.Latency, MTU: benchFeatures.Mtu}
-	target, stopper := StartServer(ServerInfo{Addr: "localhost:0", Type: "protobuf", Network: nw}, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1)))
+	lis, err := net.Listen("tcp", "localhost:0")
+	if err != nil {
+		grpclog.Fatalf("Failed to listen: %v", err)
+	}
+	target := lis.Addr().String()
+	lis = nw.Listener(lis)
+	stopper := StartServer(ServerInfo{Type: "protobuf", Listener: lis}, grpc.MaxConcurrentStreams(uint32(benchFeatures.MaxConcurrentCalls+1)))
 	defer stopper()
 	conn := NewClientConn(
 		target, grpc.WithInsecure(),
diff --git a/vendor/google.golang.org/grpc/benchmark/benchmark16_test.go b/vendor/google.golang.org/grpc/benchmark/benchmark16_test.go
index fc33e80d..a036b63c 100644
--- a/vendor/google.golang.org/grpc/benchmark/benchmark16_test.go
+++ b/vendor/google.golang.org/grpc/benchmark/benchmark16_test.go
@@ -30,81 +30,81 @@ import (
 
 func BenchmarkClientStreamc1(b *testing.B) {
 	grpc.EnableTracing = true
-	runStream(b, stats.Features{"", true, 0, 0, 0, 1, 1, 1, false})
+	runStream(b, stats.Features{"", true, 0, 0, 0, 1, 1, 1, false, false})
 }
 
 func BenchmarkClientStreamc8(b *testing.B) {
 	grpc.EnableTracing = true
-	runStream(b, stats.Features{"", true, 0, 0, 0, 8, 1, 1, false})
+	runStream(b, stats.Features{"", true, 0, 0, 0, 8, 1, 1, false, false})
 }
 
 func BenchmarkClientStreamc64(b *testing.B) {
 	grpc.EnableTracing = true
-	runStream(b, stats.Features{"", true, 0, 0, 0, 64, 1, 1, false})
+	runStream(b, stats.Features{"", true, 0, 0, 0, 64, 1, 1, false, false})
 }
 
 func BenchmarkClientStreamc512(b *testing.B) {
 	grpc.EnableTracing = true
-	runStream(b, stats.Features{"", true, 0, 0, 0, 512, 1, 1, false})
+	runStream(b, stats.Features{"", true, 0, 0, 0, 512, 1, 1, false, false})
 }
 func BenchmarkClientUnaryc1(b *testing.B) {
 	grpc.EnableTracing = true
-	runStream(b, stats.Features{"", true, 0, 0, 0, 1, 1, 1, false})
+	runStream(b, stats.Features{"", true, 0, 0, 0, 1, 1, 1, false, false})
 }
 
 func BenchmarkClientUnaryc8(b *testing.B) {
 	grpc.EnableTracing = true
-	runStream(b, stats.Features{"", true, 0, 0, 0, 8, 1, 1, false})
+	runStream(b, stats.Features{"", true, 0, 0, 0, 8, 1, 1, false, false})
 }
 
 func BenchmarkClientUnaryc64(b *testing.B) {
 	grpc.EnableTracing = true
-	runStream(b, stats.Features{"", true, 0, 0, 0, 64, 1, 1, false})
+	runStream(b, stats.Features{"", true, 0, 0, 0, 64, 1, 1, false, false})
 }
 
 func BenchmarkClientUnaryc512(b *testing.B) {
 	grpc.EnableTracing = true
-	runStream(b, stats.Features{"", true, 0, 0, 0, 512, 1, 1, false})
+	runStream(b, stats.Features{"", true, 0, 0, 0, 512, 1, 1, false, false})
 }
 
 func BenchmarkClientStreamNoTracec1(b *testing.B) {
 	grpc.EnableTracing = false
-	runStream(b, stats.Features{"", false, 0, 0, 0, 1, 1, 1, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 1, 1, 1, false, false})
 }
 
 func BenchmarkClientStreamNoTracec8(b *testing.B) {
 	grpc.EnableTracing = false
-	runStream(b, stats.Features{"", false, 0, 0, 0, 8, 1, 1, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 8, 1, 1, false, false})
 }
 
 func BenchmarkClientStreamNoTracec64(b *testing.B) {
 	grpc.EnableTracing = false
-	runStream(b, stats.Features{"", false, 0, 0, 0, 64, 1, 1, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 64, 1, 1, false, false})
 }
 
 func BenchmarkClientStreamNoTracec512(b *testing.B) {
 	grpc.EnableTracing = false
-	runStream(b, stats.Features{"", false, 0, 0, 0, 512, 1, 1, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 512, 1, 1, false, false})
 }
 func BenchmarkClientUnaryNoTracec1(b *testing.B) {
 	grpc.EnableTracing = false
-	runStream(b, stats.Features{"", false, 0, 0, 0, 1, 1, 1, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 1, 1, 1, false, false})
 }
 
 func BenchmarkClientUnaryNoTracec8(b *testing.B) {
 	grpc.EnableTracing = false
-	runStream(b, stats.Features{"", false, 0, 0, 0, 8, 1, 1, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 8, 1, 1, false, false})
 }
 
 func BenchmarkClientUnaryNoTracec64(b *testing.B) {
 	grpc.EnableTracing = false
-	runStream(b, stats.Features{"", false, 0, 0, 0, 64, 1, 1, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 64, 1, 1, false, false})
 }
 
 func BenchmarkClientUnaryNoTracec512(b *testing.B) {
 	grpc.EnableTracing = false
-	runStream(b, stats.Features{"", false, 0, 0, 0, 512, 1, 1, false})
-	runStream(b, stats.Features{"", false, 0, 0, 0, 512, 1, 1, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 512, 1, 1, false, false})
+	runStream(b, stats.Features{"", false, 0, 0, 0, 512, 1, 1, false, false})
 }
 
 func TestMain(m *testing.M) {
diff --git a/vendor/google.golang.org/grpc/benchmark/client/main.go b/vendor/google.golang.org/grpc/benchmark/client/main.go
index 9aa587e3..fb6f9b63 100644
--- a/vendor/google.golang.org/grpc/benchmark/client/main.go
+++ b/vendor/google.golang.org/grpc/benchmark/client/main.go
@@ -20,10 +20,10 @@ package main
 
 import (
 	"flag"
-	"math"
-	"net"
-	"net/http"
-	_ "net/http/pprof"
+	"fmt"
+	"os"
+	"runtime"
+	"runtime/pprof"
 	"sync"
 	"time"
 
@@ -33,148 +33,155 @@ import (
 	testpb "google.golang.org/grpc/benchmark/grpc_testing"
 	"google.golang.org/grpc/benchmark/stats"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/syscall"
 )
 
 var (
-	server            = flag.String("server", "", "The server address")
-	maxConcurrentRPCs = flag.Int("max_concurrent_rpcs", 1, "The max number of concurrent RPCs")
-	duration          = flag.Int("duration", math.MaxInt32, "The duration in seconds to run the benchmark client")
-	trace             = flag.Bool("trace", true, "Whether tracing is on")
-	rpcType           = flag.Int("rpc_type", 0,
+	port      = flag.String("port", "50051", "Localhost port to connect to.")
+	numRPC    = flag.Int("r", 1, "The number of concurrent RPCs on each connection.")
+	numConn   = flag.Int("c", 1, "The number of parallel connections.")
+	warmupDur = flag.Int("w", 10, "Warm-up duration in seconds")
+	duration  = flag.Int("d", 60, "Benchmark duration in seconds")
+	rqSize    = flag.Int("req", 1, "Request message size in bytes.")
+	rspSize   = flag.Int("resp", 1, "Response message size in bytes.")
+	rpcType   = flag.String("rpc_type", "unary",
 		`Configure different client rpc type. Valid options are:
-		   0 : unary call;
-		   1 : streaming call.`)
+		   unary;
+		   streaming.`)
+	testName = flag.String("test_name", "", "Name of the test used for creating profiles.")
+	wg       sync.WaitGroup
+	hopts    = stats.HistogramOptions{
+		NumBuckets:   2495,
+		GrowthFactor: .01,
+	}
+	mu    sync.Mutex
+	hists []*stats.Histogram
 )
 
-func unaryCaller(client testpb.BenchmarkServiceClient) {
-	benchmark.DoUnaryCall(client, 1, 1)
-}
-
-func streamCaller(stream testpb.BenchmarkService_StreamingCallClient) {
-	benchmark.DoStreamingRoundTrip(stream, 1, 1)
-}
-
-func buildConnection() (s *stats.Stats, conn *grpc.ClientConn, tc testpb.BenchmarkServiceClient) {
-	s = stats.NewStats(256)
-	conn = benchmark.NewClientConn(*server)
-	tc = testpb.NewBenchmarkServiceClient(conn)
-	return s, conn, tc
+func main() {
+	flag.Parse()
+	if *testName == "" {
+		grpclog.Fatalf("test_name not set")
+	}
+	req := &testpb.SimpleRequest{
+		ResponseType: testpb.PayloadType_COMPRESSABLE,
+		ResponseSize: int32(*rspSize),
+		Payload: &testpb.Payload{
+			Type: testpb.PayloadType_COMPRESSABLE,
+			Body: make([]byte, *rqSize),
+		},
+	}
+	connectCtx, connectCancel := context.WithDeadline(context.Background(), time.Now().Add(5*time.Second))
+	defer connectCancel()
+	ccs := buildConnections(connectCtx)
+	warmDeadline := time.Now().Add(time.Duration(*warmupDur) * time.Second)
+	endDeadline := warmDeadline.Add(time.Duration(*duration) * time.Second)
+	cf, err := os.Create("/tmp/" + *testName + ".cpu")
+	if err != nil {
+		grpclog.Fatalf("Error creating file: %v", err)
+	}
+	defer cf.Close()
+	pprof.StartCPUProfile(cf)
+	cpuBeg := syscall.GetCPUTime()
+	for _, cc := range ccs {
+		runWithConn(cc, req, warmDeadline, endDeadline)
+	}
+	wg.Wait()
+	cpu := time.Duration(syscall.GetCPUTime() - cpuBeg)
+	pprof.StopCPUProfile()
+	mf, err := os.Create("/tmp/" + *testName + ".mem")
+	if err != nil {
+		grpclog.Fatalf("Error creating file: %v", err)
+	}
+	defer mf.Close()
+	runtime.GC() // materialize all statistics
+	if err := pprof.WriteHeapProfile(mf); err != nil {
+		grpclog.Fatalf("Error writing memory profile: %v", err)
+	}
+	hist := stats.NewHistogram(hopts)
+	for _, h := range hists {
+		hist.Merge(h)
+	}
+	parseHist(hist)
+	fmt.Println("Client CPU utilization:", cpu)
+	fmt.Println("Client CPU profile:", cf.Name())
+	fmt.Println("Client Mem Profile:", mf.Name())
 }
 
-func closeLoopUnary() {
-	s, conn, tc := buildConnection()
-
-	for i := 0; i < 100; i++ {
-		unaryCaller(tc)
+func buildConnections(ctx context.Context) []*grpc.ClientConn {
+	ccs := make([]*grpc.ClientConn, *numConn)
+	for i := range ccs {
+		ccs[i] = benchmark.NewClientConnWithContext(ctx, "localhost:"+*port, grpc.WithInsecure(), grpc.WithBlock())
 	}
-	ch := make(chan int, *maxConcurrentRPCs*4)
-	var (
-		mu sync.Mutex
-		wg sync.WaitGroup
-	)
-	wg.Add(*maxConcurrentRPCs)
+	return ccs
+}
 
-	for i := 0; i < *maxConcurrentRPCs; i++ {
+func runWithConn(cc *grpc.ClientConn, req *testpb.SimpleRequest, warmDeadline, endDeadline time.Time) {
+	for i := 0; i < *numRPC; i++ {
+		wg.Add(1)
 		go func() {
-			for range ch {
+			defer wg.Done()
+			caller := makeCaller(cc, req)
+			hist := stats.NewHistogram(hopts)
+			for {
 				start := time.Now()
-				unaryCaller(tc)
-				elapse := time.Since(start)
-				mu.Lock()
-				s.Add(elapse)
-				mu.Unlock()
+				if start.After(endDeadline) {
+					mu.Lock()
+					hists = append(hists, hist)
+					mu.Unlock()
+					return
+				}
+				caller()
+				elapsed := time.Since(start)
+				if start.After(warmDeadline) {
+					hist.Add(elapsed.Nanoseconds())
+				}
 			}
-			wg.Done()
 		}()
 	}
-	// Stop the client when time is up.
-	done := make(chan struct{})
-	go func() {
-		<-time.After(time.Duration(*duration) * time.Second)
-		close(done)
-	}()
-	ok := true
-	for ok {
-		select {
-		case ch <- 0:
-		case <-done:
-			ok = false
-		}
-	}
-	close(ch)
-	wg.Wait()
-	conn.Close()
-	grpclog.Println(s.String())
-
 }
 
-func closeLoopStream() {
-	s, conn, tc := buildConnection()
-	ch := make(chan int, *maxConcurrentRPCs*4)
-	var (
-		mu sync.Mutex
-		wg sync.WaitGroup
-	)
-	wg.Add(*maxConcurrentRPCs)
-	// Distribute RPCs over maxConcurrentCalls workers.
-	for i := 0; i < *maxConcurrentRPCs; i++ {
-		go func() {
-			stream, err := tc.StreamingCall(context.Background())
-			if err != nil {
-				grpclog.Fatalf("%v.StreamingCall(_) = _, %v", tc, err)
-			}
-			// Do some warm up.
-			for i := 0; i < 100; i++ {
-				streamCaller(stream)
+func makeCaller(cc *grpc.ClientConn, req *testpb.SimpleRequest) func() {
+	client := testpb.NewBenchmarkServiceClient(cc)
+	if *rpcType == "unary" {
+		return func() {
+			if _, err := client.UnaryCall(context.Background(), req); err != nil {
+				grpclog.Fatalf("RPC failed: %v", err)
 			}
-			for range ch {
-				start := time.Now()
-				streamCaller(stream)
-				elapse := time.Since(start)
-				mu.Lock()
-				s.Add(elapse)
-				mu.Unlock()
-			}
-			wg.Done()
-		}()
+		}
 	}
-	// Stop the client when time is up.
-	done := make(chan struct{})
-	go func() {
-		<-time.After(time.Duration(*duration) * time.Second)
-		close(done)
-	}()
-	ok := true
-	for ok {
-		select {
-		case ch <- 0:
-		case <-done:
-			ok = false
+	stream, err := client.StreamingCall(context.Background())
+	if err != nil {
+		grpclog.Fatalf("RPC failed: %v", err)
+	}
+	return func() {
+		if err := stream.Send(req); err != nil {
+			grpclog.Fatalf("Streaming RPC failed to send: %v", err)
+		}
+		if _, err := stream.Recv(); err != nil {
+			grpclog.Fatalf("Streaming RPC failed to read: %v", err)
 		}
 	}
-	close(ch)
-	wg.Wait()
-	conn.Close()
-	grpclog.Println(s.String())
 }
 
-func main() {
-	flag.Parse()
-	grpc.EnableTracing = *trace
-	go func() {
-		lis, err := net.Listen("tcp", ":0")
-		if err != nil {
-			grpclog.Fatalf("Failed to listen: %v", err)
-		}
-		grpclog.Println("Client profiling address: ", lis.Addr().String())
-		if err := http.Serve(lis, nil); err != nil {
-			grpclog.Fatalf("Failed to serve: %v", err)
+func parseHist(hist *stats.Histogram) {
+	fmt.Println("qps:", float64(hist.Count)/float64(*duration))
+	fmt.Printf("Latency: (50/90/99 %%ile): %v/%v/%v\n",
+		time.Duration(median(.5, hist)),
+		time.Duration(median(.9, hist)),
+		time.Duration(median(.99, hist)))
+}
+
+func median(percentile float64, h *stats.Histogram) int64 {
+	need := int64(float64(h.Count) * percentile)
+	have := int64(0)
+	for _, bucket := range h.Buckets {
+		count := bucket.Count
+		if have+count >= need {
+			percent := float64(need-have) / float64(count)
+			return int64((1.0-percent)*bucket.LowBound + percent*bucket.LowBound*(1.0+hopts.GrowthFactor))
 		}
-	}()
-	switch *rpcType {
-	case 0:
-		closeLoopUnary()
-	case 1:
-		closeLoopStream()
+		have += bucket.Count
 	}
+	panic("should have found a bound")
 }
diff --git a/vendor/google.golang.org/grpc/benchmark/grpc_testing/control.pb.go b/vendor/google.golang.org/grpc/benchmark/grpc_testing/control.pb.go
index b88832f7..3d125b31 100644
--- a/vendor/google.golang.org/grpc/benchmark/grpc_testing/control.pb.go
+++ b/vendor/google.golang.org/grpc/benchmark/grpc_testing/control.pb.go
@@ -1,56 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: control.proto
 
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	control.proto
-	messages.proto
-	payloads.proto
-	services.proto
-	stats.proto
-
-It has these top-level messages:
-	PoissonParams
-	UniformParams
-	DeterministicParams
-	ParetoParams
-	ClosedLoopParams
-	LoadParams
-	SecurityParams
-	ClientConfig
-	ClientStatus
-	Mark
-	ClientArgs
-	ServerConfig
-	ServerArgs
-	ServerStatus
-	CoreRequest
-	CoreResponse
-	Void
-	Scenario
-	Scenarios
-	Payload
-	EchoStatus
-	SimpleRequest
-	SimpleResponse
-	StreamingInputCallRequest
-	StreamingInputCallResponse
-	ResponseParameters
-	StreamingOutputCallRequest
-	StreamingOutputCallResponse
-	ReconnectParams
-	ReconnectInfo
-	ByteBufferParams
-	SimpleProtoParams
-	ComplexProtoParams
-	PayloadConfig
-	ServerStats
-	HistogramParams
-	HistogramData
-	ClientStats
-*/
 package grpc_testing
 
 import proto "github.com/golang/protobuf/proto"
@@ -87,7 +37,9 @@ var ClientType_value = map[string]int32{
 func (x ClientType) String() string {
 	return proto.EnumName(ClientType_name, int32(x))
 }
-func (ClientType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (ClientType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{0}
+}
 
 type ServerType int32
 
@@ -111,7 +63,9 @@ var ServerType_value = map[string]int32{
 func (x ServerType) String() string {
 	return proto.EnumName(ServerType_name, int32(x))
 }
-func (ServerType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (ServerType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{1}
+}
 
 type RpcType int32
 
@@ -132,19 +86,43 @@ var RpcType_value = map[string]int32{
 func (x RpcType) String() string {
 	return proto.EnumName(RpcType_name, int32(x))
 }
-func (RpcType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (RpcType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{2}
+}
 
 // Parameters of poisson process distribution, which is a good representation
 // of activity coming in from independent identical stationary sources.
 type PoissonParams struct {
 	// The rate of arrivals (a.k.a. lambda parameter of the exp distribution).
-	OfferedLoad float64 `protobuf:"fixed64,1,opt,name=offered_load,json=offeredLoad" json:"offered_load,omitempty"`
+	OfferedLoad          float64  `protobuf:"fixed64,1,opt,name=offered_load,json=offeredLoad,proto3" json:"offered_load,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *PoissonParams) Reset()         { *m = PoissonParams{} }
+func (m *PoissonParams) String() string { return proto.CompactTextString(m) }
+func (*PoissonParams) ProtoMessage()    {}
+func (*PoissonParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{0}
+}
+func (m *PoissonParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PoissonParams.Unmarshal(m, b)
+}
+func (m *PoissonParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PoissonParams.Marshal(b, m, deterministic)
+}
+func (dst *PoissonParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PoissonParams.Merge(dst, src)
+}
+func (m *PoissonParams) XXX_Size() int {
+	return xxx_messageInfo_PoissonParams.Size(m)
+}
+func (m *PoissonParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_PoissonParams.DiscardUnknown(m)
 }
 
-func (m *PoissonParams) Reset()                    { *m = PoissonParams{} }
-func (m *PoissonParams) String() string            { return proto.CompactTextString(m) }
-func (*PoissonParams) ProtoMessage()               {}
-func (*PoissonParams) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_PoissonParams proto.InternalMessageInfo
 
 func (m *PoissonParams) GetOfferedLoad() float64 {
 	if m != nil {
@@ -154,14 +132,36 @@ func (m *PoissonParams) GetOfferedLoad() float64 {
 }
 
 type UniformParams struct {
-	InterarrivalLo float64 `protobuf:"fixed64,1,opt,name=interarrival_lo,json=interarrivalLo" json:"interarrival_lo,omitempty"`
-	InterarrivalHi float64 `protobuf:"fixed64,2,opt,name=interarrival_hi,json=interarrivalHi" json:"interarrival_hi,omitempty"`
+	InterarrivalLo       float64  `protobuf:"fixed64,1,opt,name=interarrival_lo,json=interarrivalLo,proto3" json:"interarrival_lo,omitempty"`
+	InterarrivalHi       float64  `protobuf:"fixed64,2,opt,name=interarrival_hi,json=interarrivalHi,proto3" json:"interarrival_hi,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *UniformParams) Reset()                    { *m = UniformParams{} }
-func (m *UniformParams) String() string            { return proto.CompactTextString(m) }
-func (*UniformParams) ProtoMessage()               {}
-func (*UniformParams) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *UniformParams) Reset()         { *m = UniformParams{} }
+func (m *UniformParams) String() string { return proto.CompactTextString(m) }
+func (*UniformParams) ProtoMessage()    {}
+func (*UniformParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{1}
+}
+func (m *UniformParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UniformParams.Unmarshal(m, b)
+}
+func (m *UniformParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UniformParams.Marshal(b, m, deterministic)
+}
+func (dst *UniformParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UniformParams.Merge(dst, src)
+}
+func (m *UniformParams) XXX_Size() int {
+	return xxx_messageInfo_UniformParams.Size(m)
+}
+func (m *UniformParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_UniformParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UniformParams proto.InternalMessageInfo
 
 func (m *UniformParams) GetInterarrivalLo() float64 {
 	if m != nil {
@@ -178,13 +178,35 @@ func (m *UniformParams) GetInterarrivalHi() float64 {
 }
 
 type DeterministicParams struct {
-	OfferedLoad float64 `protobuf:"fixed64,1,opt,name=offered_load,json=offeredLoad" json:"offered_load,omitempty"`
+	OfferedLoad          float64  `protobuf:"fixed64,1,opt,name=offered_load,json=offeredLoad,proto3" json:"offered_load,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *DeterministicParams) Reset()                    { *m = DeterministicParams{} }
-func (m *DeterministicParams) String() string            { return proto.CompactTextString(m) }
-func (*DeterministicParams) ProtoMessage()               {}
-func (*DeterministicParams) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *DeterministicParams) Reset()         { *m = DeterministicParams{} }
+func (m *DeterministicParams) String() string { return proto.CompactTextString(m) }
+func (*DeterministicParams) ProtoMessage()    {}
+func (*DeterministicParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{2}
+}
+func (m *DeterministicParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeterministicParams.Unmarshal(m, b)
+}
+func (m *DeterministicParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeterministicParams.Marshal(b, m, deterministic)
+}
+func (dst *DeterministicParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeterministicParams.Merge(dst, src)
+}
+func (m *DeterministicParams) XXX_Size() int {
+	return xxx_messageInfo_DeterministicParams.Size(m)
+}
+func (m *DeterministicParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeterministicParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeterministicParams proto.InternalMessageInfo
 
 func (m *DeterministicParams) GetOfferedLoad() float64 {
 	if m != nil {
@@ -194,14 +216,36 @@ func (m *DeterministicParams) GetOfferedLoad() float64 {
 }
 
 type ParetoParams struct {
-	InterarrivalBase float64 `protobuf:"fixed64,1,opt,name=interarrival_base,json=interarrivalBase" json:"interarrival_base,omitempty"`
-	Alpha            float64 `protobuf:"fixed64,2,opt,name=alpha" json:"alpha,omitempty"`
+	InterarrivalBase     float64  `protobuf:"fixed64,1,opt,name=interarrival_base,json=interarrivalBase,proto3" json:"interarrival_base,omitempty"`
+	Alpha                float64  `protobuf:"fixed64,2,opt,name=alpha,proto3" json:"alpha,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ParetoParams) Reset()         { *m = ParetoParams{} }
+func (m *ParetoParams) String() string { return proto.CompactTextString(m) }
+func (*ParetoParams) ProtoMessage()    {}
+func (*ParetoParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{3}
+}
+func (m *ParetoParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ParetoParams.Unmarshal(m, b)
+}
+func (m *ParetoParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ParetoParams.Marshal(b, m, deterministic)
+}
+func (dst *ParetoParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParetoParams.Merge(dst, src)
+}
+func (m *ParetoParams) XXX_Size() int {
+	return xxx_messageInfo_ParetoParams.Size(m)
+}
+func (m *ParetoParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_ParetoParams.DiscardUnknown(m)
 }
 
-func (m *ParetoParams) Reset()                    { *m = ParetoParams{} }
-func (m *ParetoParams) String() string            { return proto.CompactTextString(m) }
-func (*ParetoParams) ProtoMessage()               {}
-func (*ParetoParams) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_ParetoParams proto.InternalMessageInfo
 
 func (m *ParetoParams) GetInterarrivalBase() float64 {
 	if m != nil {
@@ -220,12 +264,34 @@ func (m *ParetoParams) GetAlpha() float64 {
 // Once an RPC finishes, immediately start a new one.
 // No configuration parameters needed.
 type ClosedLoopParams struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClosedLoopParams) Reset()         { *m = ClosedLoopParams{} }
+func (m *ClosedLoopParams) String() string { return proto.CompactTextString(m) }
+func (*ClosedLoopParams) ProtoMessage()    {}
+func (*ClosedLoopParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{4}
+}
+func (m *ClosedLoopParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClosedLoopParams.Unmarshal(m, b)
+}
+func (m *ClosedLoopParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClosedLoopParams.Marshal(b, m, deterministic)
+}
+func (dst *ClosedLoopParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClosedLoopParams.Merge(dst, src)
+}
+func (m *ClosedLoopParams) XXX_Size() int {
+	return xxx_messageInfo_ClosedLoopParams.Size(m)
+}
+func (m *ClosedLoopParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClosedLoopParams.DiscardUnknown(m)
 }
 
-func (m *ClosedLoopParams) Reset()                    { *m = ClosedLoopParams{} }
-func (m *ClosedLoopParams) String() string            { return proto.CompactTextString(m) }
-func (*ClosedLoopParams) ProtoMessage()               {}
-func (*ClosedLoopParams) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ClosedLoopParams proto.InternalMessageInfo
 
 type LoadParams struct {
 	// Types that are valid to be assigned to Load:
@@ -234,39 +300,69 @@ type LoadParams struct {
 	//	*LoadParams_Uniform
 	//	*LoadParams_Determ
 	//	*LoadParams_Pareto
-	Load isLoadParams_Load `protobuf_oneof:"load"`
+	Load                 isLoadParams_Load `protobuf_oneof:"load"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *LoadParams) Reset()         { *m = LoadParams{} }
+func (m *LoadParams) String() string { return proto.CompactTextString(m) }
+func (*LoadParams) ProtoMessage()    {}
+func (*LoadParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{5}
+}
+func (m *LoadParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LoadParams.Unmarshal(m, b)
+}
+func (m *LoadParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LoadParams.Marshal(b, m, deterministic)
+}
+func (dst *LoadParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LoadParams.Merge(dst, src)
+}
+func (m *LoadParams) XXX_Size() int {
+	return xxx_messageInfo_LoadParams.Size(m)
+}
+func (m *LoadParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_LoadParams.DiscardUnknown(m)
 }
 
-func (m *LoadParams) Reset()                    { *m = LoadParams{} }
-func (m *LoadParams) String() string            { return proto.CompactTextString(m) }
-func (*LoadParams) ProtoMessage()               {}
-func (*LoadParams) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_LoadParams proto.InternalMessageInfo
 
 type isLoadParams_Load interface {
 	isLoadParams_Load()
 }
 
 type LoadParams_ClosedLoop struct {
-	ClosedLoop *ClosedLoopParams `protobuf:"bytes,1,opt,name=closed_loop,json=closedLoop,oneof"`
+	ClosedLoop *ClosedLoopParams `protobuf:"bytes,1,opt,name=closed_loop,json=closedLoop,proto3,oneof"`
 }
+
 type LoadParams_Poisson struct {
-	Poisson *PoissonParams `protobuf:"bytes,2,opt,name=poisson,oneof"`
+	Poisson *PoissonParams `protobuf:"bytes,2,opt,name=poisson,proto3,oneof"`
 }
+
 type LoadParams_Uniform struct {
-	Uniform *UniformParams `protobuf:"bytes,3,opt,name=uniform,oneof"`
+	Uniform *UniformParams `protobuf:"bytes,3,opt,name=uniform,proto3,oneof"`
 }
+
 type LoadParams_Determ struct {
-	Determ *DeterministicParams `protobuf:"bytes,4,opt,name=determ,oneof"`
+	Determ *DeterministicParams `protobuf:"bytes,4,opt,name=determ,proto3,oneof"`
 }
+
 type LoadParams_Pareto struct {
-	Pareto *ParetoParams `protobuf:"bytes,5,opt,name=pareto,oneof"`
+	Pareto *ParetoParams `protobuf:"bytes,5,opt,name=pareto,proto3,oneof"`
 }
 
 func (*LoadParams_ClosedLoop) isLoadParams_Load() {}
-func (*LoadParams_Poisson) isLoadParams_Load()    {}
-func (*LoadParams_Uniform) isLoadParams_Load()    {}
-func (*LoadParams_Determ) isLoadParams_Load()     {}
-func (*LoadParams_Pareto) isLoadParams_Load()     {}
+
+func (*LoadParams_Poisson) isLoadParams_Load() {}
+
+func (*LoadParams_Uniform) isLoadParams_Load() {}
+
+func (*LoadParams_Determ) isLoadParams_Load() {}
+
+func (*LoadParams_Pareto) isLoadParams_Load() {}
 
 func (m *LoadParams) GetLoad() isLoadParams_Load {
 	if m != nil {
@@ -411,27 +507,27 @@ func _LoadParams_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Load.(type) {
 	case *LoadParams_ClosedLoop:
 		s := proto.Size(x.ClosedLoop)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *LoadParams_Poisson:
 		s := proto.Size(x.Poisson)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *LoadParams_Uniform:
 		s := proto.Size(x.Uniform)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *LoadParams_Determ:
 		s := proto.Size(x.Determ)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *LoadParams_Pareto:
 		s := proto.Size(x.Pareto)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -443,14 +539,36 @@ func _LoadParams_OneofSizer(msg proto.Message) (n int) {
 
 // presence of SecurityParams implies use of TLS
 type SecurityParams struct {
-	UseTestCa          bool   `protobuf:"varint,1,opt,name=use_test_ca,json=useTestCa" json:"use_test_ca,omitempty"`
-	ServerHostOverride string `protobuf:"bytes,2,opt,name=server_host_override,json=serverHostOverride" json:"server_host_override,omitempty"`
+	UseTestCa            bool     `protobuf:"varint,1,opt,name=use_test_ca,json=useTestCa,proto3" json:"use_test_ca,omitempty"`
+	ServerHostOverride   string   `protobuf:"bytes,2,opt,name=server_host_override,json=serverHostOverride,proto3" json:"server_host_override,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SecurityParams) Reset()                    { *m = SecurityParams{} }
-func (m *SecurityParams) String() string            { return proto.CompactTextString(m) }
-func (*SecurityParams) ProtoMessage()               {}
-func (*SecurityParams) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *SecurityParams) Reset()         { *m = SecurityParams{} }
+func (m *SecurityParams) String() string { return proto.CompactTextString(m) }
+func (*SecurityParams) ProtoMessage()    {}
+func (*SecurityParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{6}
+}
+func (m *SecurityParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SecurityParams.Unmarshal(m, b)
+}
+func (m *SecurityParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SecurityParams.Marshal(b, m, deterministic)
+}
+func (dst *SecurityParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SecurityParams.Merge(dst, src)
+}
+func (m *SecurityParams) XXX_Size() int {
+	return xxx_messageInfo_SecurityParams.Size(m)
+}
+func (m *SecurityParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_SecurityParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SecurityParams proto.InternalMessageInfo
 
 func (m *SecurityParams) GetUseTestCa() bool {
 	if m != nil {
@@ -468,31 +586,53 @@ func (m *SecurityParams) GetServerHostOverride() string {
 
 type ClientConfig struct {
 	// List of targets to connect to. At least one target needs to be specified.
-	ServerTargets  []string        `protobuf:"bytes,1,rep,name=server_targets,json=serverTargets" json:"server_targets,omitempty"`
-	ClientType     ClientType      `protobuf:"varint,2,opt,name=client_type,json=clientType,enum=grpc.testing.ClientType" json:"client_type,omitempty"`
-	SecurityParams *SecurityParams `protobuf:"bytes,3,opt,name=security_params,json=securityParams" json:"security_params,omitempty"`
+	ServerTargets  []string        `protobuf:"bytes,1,rep,name=server_targets,json=serverTargets,proto3" json:"server_targets,omitempty"`
+	ClientType     ClientType      `protobuf:"varint,2,opt,name=client_type,json=clientType,proto3,enum=grpc.testing.ClientType" json:"client_type,omitempty"`
+	SecurityParams *SecurityParams `protobuf:"bytes,3,opt,name=security_params,json=securityParams,proto3" json:"security_params,omitempty"`
 	// How many concurrent RPCs to start for each channel.
 	// For synchronous client, use a separate thread for each outstanding RPC.
-	OutstandingRpcsPerChannel int32 `protobuf:"varint,4,opt,name=outstanding_rpcs_per_channel,json=outstandingRpcsPerChannel" json:"outstanding_rpcs_per_channel,omitempty"`
+	OutstandingRpcsPerChannel int32 `protobuf:"varint,4,opt,name=outstanding_rpcs_per_channel,json=outstandingRpcsPerChannel,proto3" json:"outstanding_rpcs_per_channel,omitempty"`
 	// Number of independent client channels to create.
 	// i-th channel will connect to server_target[i % server_targets.size()]
-	ClientChannels int32 `protobuf:"varint,5,opt,name=client_channels,json=clientChannels" json:"client_channels,omitempty"`
+	ClientChannels int32 `protobuf:"varint,5,opt,name=client_channels,json=clientChannels,proto3" json:"client_channels,omitempty"`
 	// Only for async client. Number of threads to use to start/manage RPCs.
-	AsyncClientThreads int32   `protobuf:"varint,7,opt,name=async_client_threads,json=asyncClientThreads" json:"async_client_threads,omitempty"`
-	RpcType            RpcType `protobuf:"varint,8,opt,name=rpc_type,json=rpcType,enum=grpc.testing.RpcType" json:"rpc_type,omitempty"`
+	AsyncClientThreads int32   `protobuf:"varint,7,opt,name=async_client_threads,json=asyncClientThreads,proto3" json:"async_client_threads,omitempty"`
+	RpcType            RpcType `protobuf:"varint,8,opt,name=rpc_type,json=rpcType,proto3,enum=grpc.testing.RpcType" json:"rpc_type,omitempty"`
 	// The requested load for the entire client (aggregated over all the threads).
-	LoadParams      *LoadParams      `protobuf:"bytes,10,opt,name=load_params,json=loadParams" json:"load_params,omitempty"`
-	PayloadConfig   *PayloadConfig   `protobuf:"bytes,11,opt,name=payload_config,json=payloadConfig" json:"payload_config,omitempty"`
-	HistogramParams *HistogramParams `protobuf:"bytes,12,opt,name=histogram_params,json=histogramParams" json:"histogram_params,omitempty"`
+	LoadParams      *LoadParams      `protobuf:"bytes,10,opt,name=load_params,json=loadParams,proto3" json:"load_params,omitempty"`
+	PayloadConfig   *PayloadConfig   `protobuf:"bytes,11,opt,name=payload_config,json=payloadConfig,proto3" json:"payload_config,omitempty"`
+	HistogramParams *HistogramParams `protobuf:"bytes,12,opt,name=histogram_params,json=histogramParams,proto3" json:"histogram_params,omitempty"`
 	// Specify the cores we should run the client on, if desired
-	CoreList  []int32 `protobuf:"varint,13,rep,packed,name=core_list,json=coreList" json:"core_list,omitempty"`
-	CoreLimit int32   `protobuf:"varint,14,opt,name=core_limit,json=coreLimit" json:"core_limit,omitempty"`
+	CoreList             []int32  `protobuf:"varint,13,rep,packed,name=core_list,json=coreList,proto3" json:"core_list,omitempty"`
+	CoreLimit            int32    `protobuf:"varint,14,opt,name=core_limit,json=coreLimit,proto3" json:"core_limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClientConfig) Reset()         { *m = ClientConfig{} }
+func (m *ClientConfig) String() string { return proto.CompactTextString(m) }
+func (*ClientConfig) ProtoMessage()    {}
+func (*ClientConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{7}
+}
+func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientConfig.Unmarshal(m, b)
+}
+func (m *ClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientConfig.Marshal(b, m, deterministic)
+}
+func (dst *ClientConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientConfig.Merge(dst, src)
+}
+func (m *ClientConfig) XXX_Size() int {
+	return xxx_messageInfo_ClientConfig.Size(m)
+}
+func (m *ClientConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientConfig.DiscardUnknown(m)
 }
 
-func (m *ClientConfig) Reset()                    { *m = ClientConfig{} }
-func (m *ClientConfig) String() string            { return proto.CompactTextString(m) }
-func (*ClientConfig) ProtoMessage()               {}
-func (*ClientConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ClientConfig proto.InternalMessageInfo
 
 func (m *ClientConfig) GetServerTargets() []string {
 	if m != nil {
@@ -579,13 +719,35 @@ func (m *ClientConfig) GetCoreLimit() int32 {
 }
 
 type ClientStatus struct {
-	Stats *ClientStats `protobuf:"bytes,1,opt,name=stats" json:"stats,omitempty"`
+	Stats                *ClientStats `protobuf:"bytes,1,opt,name=stats,proto3" json:"stats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *ClientStatus) Reset()         { *m = ClientStatus{} }
+func (m *ClientStatus) String() string { return proto.CompactTextString(m) }
+func (*ClientStatus) ProtoMessage()    {}
+func (*ClientStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{8}
+}
+func (m *ClientStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientStatus.Unmarshal(m, b)
+}
+func (m *ClientStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientStatus.Marshal(b, m, deterministic)
+}
+func (dst *ClientStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientStatus.Merge(dst, src)
+}
+func (m *ClientStatus) XXX_Size() int {
+	return xxx_messageInfo_ClientStatus.Size(m)
+}
+func (m *ClientStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientStatus.DiscardUnknown(m)
 }
 
-func (m *ClientStatus) Reset()                    { *m = ClientStatus{} }
-func (m *ClientStatus) String() string            { return proto.CompactTextString(m) }
-func (*ClientStatus) ProtoMessage()               {}
-func (*ClientStatus) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_ClientStatus proto.InternalMessageInfo
 
 func (m *ClientStatus) GetStats() *ClientStats {
 	if m != nil {
@@ -597,13 +759,35 @@ func (m *ClientStatus) GetStats() *ClientStats {
 // Request current stats
 type Mark struct {
 	// if true, the stats will be reset after taking their snapshot.
-	Reset_ bool `protobuf:"varint,1,opt,name=reset" json:"reset,omitempty"`
+	Reset_               bool     `protobuf:"varint,1,opt,name=reset,proto3" json:"reset,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Mark) Reset()                    { *m = Mark{} }
-func (m *Mark) String() string            { return proto.CompactTextString(m) }
-func (*Mark) ProtoMessage()               {}
-func (*Mark) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (m *Mark) Reset()         { *m = Mark{} }
+func (m *Mark) String() string { return proto.CompactTextString(m) }
+func (*Mark) ProtoMessage()    {}
+func (*Mark) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{9}
+}
+func (m *Mark) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Mark.Unmarshal(m, b)
+}
+func (m *Mark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Mark.Marshal(b, m, deterministic)
+}
+func (dst *Mark) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Mark.Merge(dst, src)
+}
+func (m *Mark) XXX_Size() int {
+	return xxx_messageInfo_Mark.Size(m)
+}
+func (m *Mark) XXX_DiscardUnknown() {
+	xxx_messageInfo_Mark.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Mark proto.InternalMessageInfo
 
 func (m *Mark) GetReset_() bool {
 	if m != nil {
@@ -616,27 +800,51 @@ type ClientArgs struct {
 	// Types that are valid to be assigned to Argtype:
 	//	*ClientArgs_Setup
 	//	*ClientArgs_Mark
-	Argtype isClientArgs_Argtype `protobuf_oneof:"argtype"`
+	Argtype              isClientArgs_Argtype `protobuf_oneof:"argtype"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
-func (m *ClientArgs) Reset()                    { *m = ClientArgs{} }
-func (m *ClientArgs) String() string            { return proto.CompactTextString(m) }
-func (*ClientArgs) ProtoMessage()               {}
-func (*ClientArgs) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *ClientArgs) Reset()         { *m = ClientArgs{} }
+func (m *ClientArgs) String() string { return proto.CompactTextString(m) }
+func (*ClientArgs) ProtoMessage()    {}
+func (*ClientArgs) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{10}
+}
+func (m *ClientArgs) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientArgs.Unmarshal(m, b)
+}
+func (m *ClientArgs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientArgs.Marshal(b, m, deterministic)
+}
+func (dst *ClientArgs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientArgs.Merge(dst, src)
+}
+func (m *ClientArgs) XXX_Size() int {
+	return xxx_messageInfo_ClientArgs.Size(m)
+}
+func (m *ClientArgs) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientArgs.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClientArgs proto.InternalMessageInfo
 
 type isClientArgs_Argtype interface {
 	isClientArgs_Argtype()
 }
 
 type ClientArgs_Setup struct {
-	Setup *ClientConfig `protobuf:"bytes,1,opt,name=setup,oneof"`
+	Setup *ClientConfig `protobuf:"bytes,1,opt,name=setup,proto3,oneof"`
 }
+
 type ClientArgs_Mark struct {
-	Mark *Mark `protobuf:"bytes,2,opt,name=mark,oneof"`
+	Mark *Mark `protobuf:"bytes,2,opt,name=mark,proto3,oneof"`
 }
 
 func (*ClientArgs_Setup) isClientArgs_Argtype() {}
-func (*ClientArgs_Mark) isClientArgs_Argtype()  {}
+
+func (*ClientArgs_Mark) isClientArgs_Argtype() {}
 
 func (m *ClientArgs) GetArgtype() isClientArgs_Argtype {
 	if m != nil {
@@ -718,12 +926,12 @@ func _ClientArgs_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Argtype.(type) {
 	case *ClientArgs_Setup:
 		s := proto.Size(x.Setup)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ClientArgs_Mark:
 		s := proto.Size(x.Mark)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -734,24 +942,46 @@ func _ClientArgs_OneofSizer(msg proto.Message) (n int) {
 }
 
 type ServerConfig struct {
-	ServerType     ServerType      `protobuf:"varint,1,opt,name=server_type,json=serverType,enum=grpc.testing.ServerType" json:"server_type,omitempty"`
-	SecurityParams *SecurityParams `protobuf:"bytes,2,opt,name=security_params,json=securityParams" json:"security_params,omitempty"`
+	ServerType     ServerType      `protobuf:"varint,1,opt,name=server_type,json=serverType,proto3,enum=grpc.testing.ServerType" json:"server_type,omitempty"`
+	SecurityParams *SecurityParams `protobuf:"bytes,2,opt,name=security_params,json=securityParams,proto3" json:"security_params,omitempty"`
 	// Port on which to listen. Zero means pick unused port.
-	Port int32 `protobuf:"varint,4,opt,name=port" json:"port,omitempty"`
+	Port int32 `protobuf:"varint,4,opt,name=port,proto3" json:"port,omitempty"`
 	// Only for async server. Number of threads used to serve the requests.
-	AsyncServerThreads int32 `protobuf:"varint,7,opt,name=async_server_threads,json=asyncServerThreads" json:"async_server_threads,omitempty"`
+	AsyncServerThreads int32 `protobuf:"varint,7,opt,name=async_server_threads,json=asyncServerThreads,proto3" json:"async_server_threads,omitempty"`
 	// Specify the number of cores to limit server to, if desired
-	CoreLimit int32 `protobuf:"varint,8,opt,name=core_limit,json=coreLimit" json:"core_limit,omitempty"`
+	CoreLimit int32 `protobuf:"varint,8,opt,name=core_limit,json=coreLimit,proto3" json:"core_limit,omitempty"`
 	// payload config, used in generic server
-	PayloadConfig *PayloadConfig `protobuf:"bytes,9,opt,name=payload_config,json=payloadConfig" json:"payload_config,omitempty"`
+	PayloadConfig *PayloadConfig `protobuf:"bytes,9,opt,name=payload_config,json=payloadConfig,proto3" json:"payload_config,omitempty"`
 	// Specify the cores we should run the server on, if desired
-	CoreList []int32 `protobuf:"varint,10,rep,packed,name=core_list,json=coreList" json:"core_list,omitempty"`
+	CoreList             []int32  `protobuf:"varint,10,rep,packed,name=core_list,json=coreList,proto3" json:"core_list,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ServerConfig) Reset()                    { *m = ServerConfig{} }
-func (m *ServerConfig) String() string            { return proto.CompactTextString(m) }
-func (*ServerConfig) ProtoMessage()               {}
-func (*ServerConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
+func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
+func (*ServerConfig) ProtoMessage()    {}
+func (*ServerConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{11}
+}
+func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
+}
+func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
+}
+func (dst *ServerConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerConfig.Merge(dst, src)
+}
+func (m *ServerConfig) XXX_Size() int {
+	return xxx_messageInfo_ServerConfig.Size(m)
+}
+func (m *ServerConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerConfig proto.InternalMessageInfo
 
 func (m *ServerConfig) GetServerType() ServerType {
 	if m != nil {
@@ -806,27 +1036,51 @@ type ServerArgs struct {
 	// Types that are valid to be assigned to Argtype:
 	//	*ServerArgs_Setup
 	//	*ServerArgs_Mark
-	Argtype isServerArgs_Argtype `protobuf_oneof:"argtype"`
+	Argtype              isServerArgs_Argtype `protobuf_oneof:"argtype"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *ServerArgs) Reset()         { *m = ServerArgs{} }
+func (m *ServerArgs) String() string { return proto.CompactTextString(m) }
+func (*ServerArgs) ProtoMessage()    {}
+func (*ServerArgs) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{12}
+}
+func (m *ServerArgs) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerArgs.Unmarshal(m, b)
+}
+func (m *ServerArgs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerArgs.Marshal(b, m, deterministic)
+}
+func (dst *ServerArgs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerArgs.Merge(dst, src)
+}
+func (m *ServerArgs) XXX_Size() int {
+	return xxx_messageInfo_ServerArgs.Size(m)
+}
+func (m *ServerArgs) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerArgs.DiscardUnknown(m)
 }
 
-func (m *ServerArgs) Reset()                    { *m = ServerArgs{} }
-func (m *ServerArgs) String() string            { return proto.CompactTextString(m) }
-func (*ServerArgs) ProtoMessage()               {}
-func (*ServerArgs) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+var xxx_messageInfo_ServerArgs proto.InternalMessageInfo
 
 type isServerArgs_Argtype interface {
 	isServerArgs_Argtype()
 }
 
 type ServerArgs_Setup struct {
-	Setup *ServerConfig `protobuf:"bytes,1,opt,name=setup,oneof"`
+	Setup *ServerConfig `protobuf:"bytes,1,opt,name=setup,proto3,oneof"`
 }
+
 type ServerArgs_Mark struct {
-	Mark *Mark `protobuf:"bytes,2,opt,name=mark,oneof"`
+	Mark *Mark `protobuf:"bytes,2,opt,name=mark,proto3,oneof"`
 }
 
 func (*ServerArgs_Setup) isServerArgs_Argtype() {}
-func (*ServerArgs_Mark) isServerArgs_Argtype()  {}
+
+func (*ServerArgs_Mark) isServerArgs_Argtype() {}
 
 func (m *ServerArgs) GetArgtype() isServerArgs_Argtype {
 	if m != nil {
@@ -908,12 +1162,12 @@ func _ServerArgs_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Argtype.(type) {
 	case *ServerArgs_Setup:
 		s := proto.Size(x.Setup)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ServerArgs_Mark:
 		s := proto.Size(x.Mark)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -924,17 +1178,39 @@ func _ServerArgs_OneofSizer(msg proto.Message) (n int) {
 }
 
 type ServerStatus struct {
-	Stats *ServerStats `protobuf:"bytes,1,opt,name=stats" json:"stats,omitempty"`
+	Stats *ServerStats `protobuf:"bytes,1,opt,name=stats,proto3" json:"stats,omitempty"`
 	// the port bound by the server
-	Port int32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"`
+	Port int32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
 	// Number of cores available to the server
-	Cores int32 `protobuf:"varint,3,opt,name=cores" json:"cores,omitempty"`
+	Cores                int32    `protobuf:"varint,3,opt,name=cores,proto3" json:"cores,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ServerStatus) Reset()         { *m = ServerStatus{} }
+func (m *ServerStatus) String() string { return proto.CompactTextString(m) }
+func (*ServerStatus) ProtoMessage()    {}
+func (*ServerStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{13}
+}
+func (m *ServerStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerStatus.Unmarshal(m, b)
+}
+func (m *ServerStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerStatus.Marshal(b, m, deterministic)
+}
+func (dst *ServerStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerStatus.Merge(dst, src)
+}
+func (m *ServerStatus) XXX_Size() int {
+	return xxx_messageInfo_ServerStatus.Size(m)
+}
+func (m *ServerStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerStatus.DiscardUnknown(m)
 }
 
-func (m *ServerStatus) Reset()                    { *m = ServerStatus{} }
-func (m *ServerStatus) String() string            { return proto.CompactTextString(m) }
-func (*ServerStatus) ProtoMessage()               {}
-func (*ServerStatus) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_ServerStatus proto.InternalMessageInfo
 
 func (m *ServerStatus) GetStats() *ServerStats {
 	if m != nil {
@@ -958,22 +1234,66 @@ func (m *ServerStatus) GetCores() int32 {
 }
 
 type CoreRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CoreRequest) Reset()         { *m = CoreRequest{} }
+func (m *CoreRequest) String() string { return proto.CompactTextString(m) }
+func (*CoreRequest) ProtoMessage()    {}
+func (*CoreRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{14}
+}
+func (m *CoreRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CoreRequest.Unmarshal(m, b)
+}
+func (m *CoreRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CoreRequest.Marshal(b, m, deterministic)
+}
+func (dst *CoreRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CoreRequest.Merge(dst, src)
+}
+func (m *CoreRequest) XXX_Size() int {
+	return xxx_messageInfo_CoreRequest.Size(m)
+}
+func (m *CoreRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_CoreRequest.DiscardUnknown(m)
 }
 
-func (m *CoreRequest) Reset()                    { *m = CoreRequest{} }
-func (m *CoreRequest) String() string            { return proto.CompactTextString(m) }
-func (*CoreRequest) ProtoMessage()               {}
-func (*CoreRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_CoreRequest proto.InternalMessageInfo
 
 type CoreResponse struct {
 	// Number of cores available on the server
-	Cores int32 `protobuf:"varint,1,opt,name=cores" json:"cores,omitempty"`
+	Cores                int32    `protobuf:"varint,1,opt,name=cores,proto3" json:"cores,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *CoreResponse) Reset()                    { *m = CoreResponse{} }
-func (m *CoreResponse) String() string            { return proto.CompactTextString(m) }
-func (*CoreResponse) ProtoMessage()               {}
-func (*CoreResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (m *CoreResponse) Reset()         { *m = CoreResponse{} }
+func (m *CoreResponse) String() string { return proto.CompactTextString(m) }
+func (*CoreResponse) ProtoMessage()    {}
+func (*CoreResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{15}
+}
+func (m *CoreResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CoreResponse.Unmarshal(m, b)
+}
+func (m *CoreResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CoreResponse.Marshal(b, m, deterministic)
+}
+func (dst *CoreResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CoreResponse.Merge(dst, src)
+}
+func (m *CoreResponse) XXX_Size() int {
+	return xxx_messageInfo_CoreResponse.Size(m)
+}
+func (m *CoreResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CoreResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CoreResponse proto.InternalMessageInfo
 
 func (m *CoreResponse) GetCores() int32 {
 	if m != nil {
@@ -983,37 +1303,81 @@ func (m *CoreResponse) GetCores() int32 {
 }
 
 type Void struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Void) Reset()                    { *m = Void{} }
-func (m *Void) String() string            { return proto.CompactTextString(m) }
-func (*Void) ProtoMessage()               {}
-func (*Void) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (m *Void) Reset()         { *m = Void{} }
+func (m *Void) String() string { return proto.CompactTextString(m) }
+func (*Void) ProtoMessage()    {}
+func (*Void) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{16}
+}
+func (m *Void) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Void.Unmarshal(m, b)
+}
+func (m *Void) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Void.Marshal(b, m, deterministic)
+}
+func (dst *Void) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Void.Merge(dst, src)
+}
+func (m *Void) XXX_Size() int {
+	return xxx_messageInfo_Void.Size(m)
+}
+func (m *Void) XXX_DiscardUnknown() {
+	xxx_messageInfo_Void.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Void proto.InternalMessageInfo
 
 // A single performance scenario: input to qps_json_driver
 type Scenario struct {
 	// Human readable name for this scenario
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Client configuration
-	ClientConfig *ClientConfig `protobuf:"bytes,2,opt,name=client_config,json=clientConfig" json:"client_config,omitempty"`
+	ClientConfig *ClientConfig `protobuf:"bytes,2,opt,name=client_config,json=clientConfig,proto3" json:"client_config,omitempty"`
 	// Number of clients to start for the test
-	NumClients int32 `protobuf:"varint,3,opt,name=num_clients,json=numClients" json:"num_clients,omitempty"`
+	NumClients int32 `protobuf:"varint,3,opt,name=num_clients,json=numClients,proto3" json:"num_clients,omitempty"`
 	// Server configuration
-	ServerConfig *ServerConfig `protobuf:"bytes,4,opt,name=server_config,json=serverConfig" json:"server_config,omitempty"`
+	ServerConfig *ServerConfig `protobuf:"bytes,4,opt,name=server_config,json=serverConfig,proto3" json:"server_config,omitempty"`
 	// Number of servers to start for the test
-	NumServers int32 `protobuf:"varint,5,opt,name=num_servers,json=numServers" json:"num_servers,omitempty"`
+	NumServers int32 `protobuf:"varint,5,opt,name=num_servers,json=numServers,proto3" json:"num_servers,omitempty"`
 	// Warmup period, in seconds
-	WarmupSeconds int32 `protobuf:"varint,6,opt,name=warmup_seconds,json=warmupSeconds" json:"warmup_seconds,omitempty"`
+	WarmupSeconds int32 `protobuf:"varint,6,opt,name=warmup_seconds,json=warmupSeconds,proto3" json:"warmup_seconds,omitempty"`
 	// Benchmark time, in seconds
-	BenchmarkSeconds int32 `protobuf:"varint,7,opt,name=benchmark_seconds,json=benchmarkSeconds" json:"benchmark_seconds,omitempty"`
+	BenchmarkSeconds int32 `protobuf:"varint,7,opt,name=benchmark_seconds,json=benchmarkSeconds,proto3" json:"benchmark_seconds,omitempty"`
 	// Number of workers to spawn locally (usually zero)
-	SpawnLocalWorkerCount int32 `protobuf:"varint,8,opt,name=spawn_local_worker_count,json=spawnLocalWorkerCount" json:"spawn_local_worker_count,omitempty"`
+	SpawnLocalWorkerCount int32    `protobuf:"varint,8,opt,name=spawn_local_worker_count,json=spawnLocalWorkerCount,proto3" json:"spawn_local_worker_count,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *Scenario) Reset()         { *m = Scenario{} }
+func (m *Scenario) String() string { return proto.CompactTextString(m) }
+func (*Scenario) ProtoMessage()    {}
+func (*Scenario) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{17}
+}
+func (m *Scenario) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Scenario.Unmarshal(m, b)
+}
+func (m *Scenario) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Scenario.Marshal(b, m, deterministic)
+}
+func (dst *Scenario) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Scenario.Merge(dst, src)
+}
+func (m *Scenario) XXX_Size() int {
+	return xxx_messageInfo_Scenario.Size(m)
+}
+func (m *Scenario) XXX_DiscardUnknown() {
+	xxx_messageInfo_Scenario.DiscardUnknown(m)
 }
 
-func (m *Scenario) Reset()                    { *m = Scenario{} }
-func (m *Scenario) String() string            { return proto.CompactTextString(m) }
-func (*Scenario) ProtoMessage()               {}
-func (*Scenario) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+var xxx_messageInfo_Scenario proto.InternalMessageInfo
 
 func (m *Scenario) GetName() string {
 	if m != nil {
@@ -1073,13 +1437,35 @@ func (m *Scenario) GetSpawnLocalWorkerCount() int32 {
 
 // A set of scenarios to be run with qps_json_driver
 type Scenarios struct {
-	Scenarios []*Scenario `protobuf:"bytes,1,rep,name=scenarios" json:"scenarios,omitempty"`
+	Scenarios            []*Scenario `protobuf:"bytes,1,rep,name=scenarios,proto3" json:"scenarios,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *Scenarios) Reset()         { *m = Scenarios{} }
+func (m *Scenarios) String() string { return proto.CompactTextString(m) }
+func (*Scenarios) ProtoMessage()    {}
+func (*Scenarios) Descriptor() ([]byte, []int) {
+	return fileDescriptor_control_63d6a60a9ad7e299, []int{18}
+}
+func (m *Scenarios) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Scenarios.Unmarshal(m, b)
+}
+func (m *Scenarios) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Scenarios.Marshal(b, m, deterministic)
+}
+func (dst *Scenarios) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Scenarios.Merge(dst, src)
+}
+func (m *Scenarios) XXX_Size() int {
+	return xxx_messageInfo_Scenarios.Size(m)
+}
+func (m *Scenarios) XXX_DiscardUnknown() {
+	xxx_messageInfo_Scenarios.DiscardUnknown(m)
 }
 
-func (m *Scenarios) Reset()                    { *m = Scenarios{} }
-func (m *Scenarios) String() string            { return proto.CompactTextString(m) }
-func (*Scenarios) ProtoMessage()               {}
-func (*Scenarios) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
+var xxx_messageInfo_Scenarios proto.InternalMessageInfo
 
 func (m *Scenarios) GetScenarios() []*Scenario {
 	if m != nil {
@@ -1113,9 +1499,9 @@ func init() {
 	proto.RegisterEnum("grpc.testing.RpcType", RpcType_name, RpcType_value)
 }
 
-func init() { proto.RegisterFile("control.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("control.proto", fileDescriptor_control_63d6a60a9ad7e299) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_control_63d6a60a9ad7e299 = []byte{
 	// 1179 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x6f, 0x6f, 0xdb, 0xb6,
 	0x13, 0xb6, 0x1d, 0xdb, 0xb1, 0x4e, 0xb6, 0xe3, 0x1f, 0x7f, 0xe9, 0xa0, 0xa6, 0x69, 0x97, 0x6a,
diff --git a/vendor/google.golang.org/grpc/benchmark/grpc_testing/messages.pb.go b/vendor/google.golang.org/grpc/benchmark/grpc_testing/messages.pb.go
index b34c5d59..9354eeaa 100644
--- a/vendor/google.golang.org/grpc/benchmark/grpc_testing/messages.pb.go
+++ b/vendor/google.golang.org/grpc/benchmark/grpc_testing/messages.pb.go
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // The type of payload that should be returned.
 type PayloadType int32
 
@@ -38,7 +44,9 @@ var PayloadType_value = map[string]int32{
 func (x PayloadType) String() string {
 	return proto.EnumName(PayloadType_name, int32(x))
 }
-func (PayloadType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (PayloadType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{0}
+}
 
 // Compression algorithms
 type CompressionType int32
@@ -64,20 +72,44 @@ var CompressionType_value = map[string]int32{
 func (x CompressionType) String() string {
 	return proto.EnumName(CompressionType_name, int32(x))
 }
-func (CompressionType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (CompressionType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{1}
+}
 
 // A block of data, to simply increase gRPC message size.
 type Payload struct {
 	// The type of data in body.
-	Type PayloadType `protobuf:"varint,1,opt,name=type,enum=grpc.testing.PayloadType" json:"type,omitempty"`
+	Type PayloadType `protobuf:"varint,1,opt,name=type,proto3,enum=grpc.testing.PayloadType" json:"type,omitempty"`
 	// Primary contents of payload.
-	Body []byte `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	Body                 []byte   `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Payload) Reset()         { *m = Payload{} }
+func (m *Payload) String() string { return proto.CompactTextString(m) }
+func (*Payload) ProtoMessage()    {}
+func (*Payload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{0}
+}
+func (m *Payload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Payload.Unmarshal(m, b)
+}
+func (m *Payload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Payload.Marshal(b, m, deterministic)
+}
+func (dst *Payload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Payload.Merge(dst, src)
+}
+func (m *Payload) XXX_Size() int {
+	return xxx_messageInfo_Payload.Size(m)
+}
+func (m *Payload) XXX_DiscardUnknown() {
+	xxx_messageInfo_Payload.DiscardUnknown(m)
 }
 
-func (m *Payload) Reset()                    { *m = Payload{} }
-func (m *Payload) String() string            { return proto.CompactTextString(m) }
-func (*Payload) ProtoMessage()               {}
-func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Payload proto.InternalMessageInfo
 
 func (m *Payload) GetType() PayloadType {
 	if m != nil {
@@ -96,14 +128,36 @@ func (m *Payload) GetBody() []byte {
 // A protobuf representation for grpc status. This is used by test
 // clients to specify a status that the server should attempt to return.
 type EchoStatus struct {
-	Code    int32  `protobuf:"varint,1,opt,name=code" json:"code,omitempty"`
-	Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Code                 int32    `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+	Message              string   `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *EchoStatus) Reset()                    { *m = EchoStatus{} }
-func (m *EchoStatus) String() string            { return proto.CompactTextString(m) }
-func (*EchoStatus) ProtoMessage()               {}
-func (*EchoStatus) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (m *EchoStatus) Reset()         { *m = EchoStatus{} }
+func (m *EchoStatus) String() string { return proto.CompactTextString(m) }
+func (*EchoStatus) ProtoMessage()    {}
+func (*EchoStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{1}
+}
+func (m *EchoStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EchoStatus.Unmarshal(m, b)
+}
+func (m *EchoStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EchoStatus.Marshal(b, m, deterministic)
+}
+func (dst *EchoStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EchoStatus.Merge(dst, src)
+}
+func (m *EchoStatus) XXX_Size() int {
+	return xxx_messageInfo_EchoStatus.Size(m)
+}
+func (m *EchoStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_EchoStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EchoStatus proto.InternalMessageInfo
 
 func (m *EchoStatus) GetCode() int32 {
 	if m != nil {
@@ -123,26 +177,48 @@ func (m *EchoStatus) GetMessage() string {
 type SimpleRequest struct {
 	// Desired payload type in the response from the server.
 	// If response_type is RANDOM, server randomly chooses one from other formats.
-	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
+	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,proto3,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
 	// Desired payload size in the response from the server.
 	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	ResponseSize int32 `protobuf:"varint,2,opt,name=response_size,json=responseSize" json:"response_size,omitempty"`
+	ResponseSize int32 `protobuf:"varint,2,opt,name=response_size,json=responseSize,proto3" json:"response_size,omitempty"`
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	Payload *Payload `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Whether SimpleResponse should include username.
-	FillUsername bool `protobuf:"varint,4,opt,name=fill_username,json=fillUsername" json:"fill_username,omitempty"`
+	FillUsername bool `protobuf:"varint,4,opt,name=fill_username,json=fillUsername,proto3" json:"fill_username,omitempty"`
 	// Whether SimpleResponse should include OAuth scope.
-	FillOauthScope bool `protobuf:"varint,5,opt,name=fill_oauth_scope,json=fillOauthScope" json:"fill_oauth_scope,omitempty"`
+	FillOauthScope bool `protobuf:"varint,5,opt,name=fill_oauth_scope,json=fillOauthScope,proto3" json:"fill_oauth_scope,omitempty"`
 	// Compression algorithm to be used by the server for the response (stream)
-	ResponseCompression CompressionType `protobuf:"varint,6,opt,name=response_compression,json=responseCompression,enum=grpc.testing.CompressionType" json:"response_compression,omitempty"`
+	ResponseCompression CompressionType `protobuf:"varint,6,opt,name=response_compression,json=responseCompression,proto3,enum=grpc.testing.CompressionType" json:"response_compression,omitempty"`
 	// Whether server should return a given status
-	ResponseStatus *EchoStatus `protobuf:"bytes,7,opt,name=response_status,json=responseStatus" json:"response_status,omitempty"`
+	ResponseStatus       *EchoStatus `protobuf:"bytes,7,opt,name=response_status,json=responseStatus,proto3" json:"response_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
+func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
+func (*SimpleRequest) ProtoMessage()    {}
+func (*SimpleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{2}
+}
+func (m *SimpleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleRequest.Unmarshal(m, b)
+}
+func (m *SimpleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleRequest.Marshal(b, m, deterministic)
+}
+func (dst *SimpleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleRequest.Merge(dst, src)
+}
+func (m *SimpleRequest) XXX_Size() int {
+	return xxx_messageInfo_SimpleRequest.Size(m)
+}
+func (m *SimpleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleRequest.DiscardUnknown(m)
 }
 
-func (m *SimpleRequest) Reset()                    { *m = SimpleRequest{} }
-func (m *SimpleRequest) String() string            { return proto.CompactTextString(m) }
-func (*SimpleRequest) ProtoMessage()               {}
-func (*SimpleRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+var xxx_messageInfo_SimpleRequest proto.InternalMessageInfo
 
 func (m *SimpleRequest) GetResponseType() PayloadType {
 	if m != nil {
@@ -196,18 +272,40 @@ func (m *SimpleRequest) GetResponseStatus() *EchoStatus {
 // Unary response, as configured by the request.
 type SimpleResponse struct {
 	// Payload to increase message size.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
 	// The user the request came from, for verifying authentication was
 	// successful when the client expected it.
-	Username string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
 	// OAuth scope.
-	OauthScope string `protobuf:"bytes,3,opt,name=oauth_scope,json=oauthScope" json:"oauth_scope,omitempty"`
+	OauthScope           string   `protobuf:"bytes,3,opt,name=oauth_scope,json=oauthScope,proto3" json:"oauth_scope,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
+func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
+func (*SimpleResponse) ProtoMessage()    {}
+func (*SimpleResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{3}
+}
+func (m *SimpleResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleResponse.Unmarshal(m, b)
+}
+func (m *SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleResponse.Marshal(b, m, deterministic)
+}
+func (dst *SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleResponse.Merge(dst, src)
+}
+func (m *SimpleResponse) XXX_Size() int {
+	return xxx_messageInfo_SimpleResponse.Size(m)
+}
+func (m *SimpleResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleResponse.DiscardUnknown(m)
 }
 
-func (m *SimpleResponse) Reset()                    { *m = SimpleResponse{} }
-func (m *SimpleResponse) String() string            { return proto.CompactTextString(m) }
-func (*SimpleResponse) ProtoMessage()               {}
-func (*SimpleResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+var xxx_messageInfo_SimpleResponse proto.InternalMessageInfo
 
 func (m *SimpleResponse) GetPayload() *Payload {
 	if m != nil {
@@ -233,13 +331,35 @@ func (m *SimpleResponse) GetOauthScope() string {
 // Client-streaming request.
 type StreamingInputCallRequest struct {
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload              *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingInputCallRequest) Reset()         { *m = StreamingInputCallRequest{} }
+func (m *StreamingInputCallRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingInputCallRequest) ProtoMessage()    {}
+func (*StreamingInputCallRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{4}
+}
+func (m *StreamingInputCallRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingInputCallRequest.Unmarshal(m, b)
+}
+func (m *StreamingInputCallRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingInputCallRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingInputCallRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingInputCallRequest.Merge(dst, src)
+}
+func (m *StreamingInputCallRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingInputCallRequest.Size(m)
+}
+func (m *StreamingInputCallRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingInputCallRequest.DiscardUnknown(m)
 }
 
-func (m *StreamingInputCallRequest) Reset()                    { *m = StreamingInputCallRequest{} }
-func (m *StreamingInputCallRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingInputCallRequest) ProtoMessage()               {}
-func (*StreamingInputCallRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+var xxx_messageInfo_StreamingInputCallRequest proto.InternalMessageInfo
 
 func (m *StreamingInputCallRequest) GetPayload() *Payload {
 	if m != nil {
@@ -251,13 +371,35 @@ func (m *StreamingInputCallRequest) GetPayload() *Payload {
 // Client-streaming response.
 type StreamingInputCallResponse struct {
 	// Aggregated size of payloads received from the client.
-	AggregatedPayloadSize int32 `protobuf:"varint,1,opt,name=aggregated_payload_size,json=aggregatedPayloadSize" json:"aggregated_payload_size,omitempty"`
+	AggregatedPayloadSize int32    `protobuf:"varint,1,opt,name=aggregated_payload_size,json=aggregatedPayloadSize,proto3" json:"aggregated_payload_size,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *StreamingInputCallResponse) Reset()         { *m = StreamingInputCallResponse{} }
+func (m *StreamingInputCallResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingInputCallResponse) ProtoMessage()    {}
+func (*StreamingInputCallResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{5}
+}
+func (m *StreamingInputCallResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingInputCallResponse.Unmarshal(m, b)
+}
+func (m *StreamingInputCallResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingInputCallResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingInputCallResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingInputCallResponse.Merge(dst, src)
+}
+func (m *StreamingInputCallResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingInputCallResponse.Size(m)
+}
+func (m *StreamingInputCallResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingInputCallResponse.DiscardUnknown(m)
 }
 
-func (m *StreamingInputCallResponse) Reset()                    { *m = StreamingInputCallResponse{} }
-func (m *StreamingInputCallResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingInputCallResponse) ProtoMessage()               {}
-func (*StreamingInputCallResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+var xxx_messageInfo_StreamingInputCallResponse proto.InternalMessageInfo
 
 func (m *StreamingInputCallResponse) GetAggregatedPayloadSize() int32 {
 	if m != nil {
@@ -270,16 +412,38 @@ func (m *StreamingInputCallResponse) GetAggregatedPayloadSize() int32 {
 type ResponseParameters struct {
 	// Desired payload sizes in responses from the server.
 	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	Size int32 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"`
+	Size int32 `protobuf:"varint,1,opt,name=size,proto3" json:"size,omitempty"`
 	// Desired interval between consecutive responses in the response stream in
 	// microseconds.
-	IntervalUs int32 `protobuf:"varint,2,opt,name=interval_us,json=intervalUs" json:"interval_us,omitempty"`
+	IntervalUs           int32    `protobuf:"varint,2,opt,name=interval_us,json=intervalUs,proto3" json:"interval_us,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ResponseParameters) Reset()         { *m = ResponseParameters{} }
+func (m *ResponseParameters) String() string { return proto.CompactTextString(m) }
+func (*ResponseParameters) ProtoMessage()    {}
+func (*ResponseParameters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{6}
+}
+func (m *ResponseParameters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResponseParameters.Unmarshal(m, b)
+}
+func (m *ResponseParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResponseParameters.Marshal(b, m, deterministic)
+}
+func (dst *ResponseParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResponseParameters.Merge(dst, src)
+}
+func (m *ResponseParameters) XXX_Size() int {
+	return xxx_messageInfo_ResponseParameters.Size(m)
+}
+func (m *ResponseParameters) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResponseParameters.DiscardUnknown(m)
 }
 
-func (m *ResponseParameters) Reset()                    { *m = ResponseParameters{} }
-func (m *ResponseParameters) String() string            { return proto.CompactTextString(m) }
-func (*ResponseParameters) ProtoMessage()               {}
-func (*ResponseParameters) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+var xxx_messageInfo_ResponseParameters proto.InternalMessageInfo
 
 func (m *ResponseParameters) GetSize() int32 {
 	if m != nil {
@@ -301,21 +465,43 @@ type StreamingOutputCallRequest struct {
 	// If response_type is RANDOM, the payload from each response in the stream
 	// might be of different types. This is to simulate a mixed type of payload
 	// stream.
-	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
+	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,proto3,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
 	// Configuration for each expected response message.
-	ResponseParameters []*ResponseParameters `protobuf:"bytes,2,rep,name=response_parameters,json=responseParameters" json:"response_parameters,omitempty"`
+	ResponseParameters []*ResponseParameters `protobuf:"bytes,2,rep,name=response_parameters,json=responseParameters,proto3" json:"response_parameters,omitempty"`
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	Payload *Payload `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Compression algorithm to be used by the server for the response (stream)
-	ResponseCompression CompressionType `protobuf:"varint,6,opt,name=response_compression,json=responseCompression,enum=grpc.testing.CompressionType" json:"response_compression,omitempty"`
+	ResponseCompression CompressionType `protobuf:"varint,6,opt,name=response_compression,json=responseCompression,proto3,enum=grpc.testing.CompressionType" json:"response_compression,omitempty"`
 	// Whether server should return a given status
-	ResponseStatus *EchoStatus `protobuf:"bytes,7,opt,name=response_status,json=responseStatus" json:"response_status,omitempty"`
+	ResponseStatus       *EchoStatus `protobuf:"bytes,7,opt,name=response_status,json=responseStatus,proto3" json:"response_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *StreamingOutputCallRequest) Reset()         { *m = StreamingOutputCallRequest{} }
+func (m *StreamingOutputCallRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingOutputCallRequest) ProtoMessage()    {}
+func (*StreamingOutputCallRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{7}
+}
+func (m *StreamingOutputCallRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingOutputCallRequest.Unmarshal(m, b)
+}
+func (m *StreamingOutputCallRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingOutputCallRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingOutputCallRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingOutputCallRequest.Merge(dst, src)
+}
+func (m *StreamingOutputCallRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingOutputCallRequest.Size(m)
+}
+func (m *StreamingOutputCallRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingOutputCallRequest.DiscardUnknown(m)
 }
 
-func (m *StreamingOutputCallRequest) Reset()                    { *m = StreamingOutputCallRequest{} }
-func (m *StreamingOutputCallRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingOutputCallRequest) ProtoMessage()               {}
-func (*StreamingOutputCallRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+var xxx_messageInfo_StreamingOutputCallRequest proto.InternalMessageInfo
 
 func (m *StreamingOutputCallRequest) GetResponseType() PayloadType {
 	if m != nil {
@@ -355,13 +541,35 @@ func (m *StreamingOutputCallRequest) GetResponseStatus() *EchoStatus {
 // Server-streaming response, as configured by the request and parameters.
 type StreamingOutputCallResponse struct {
 	// Payload to increase response size.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload              *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingOutputCallResponse) Reset()         { *m = StreamingOutputCallResponse{} }
+func (m *StreamingOutputCallResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingOutputCallResponse) ProtoMessage()    {}
+func (*StreamingOutputCallResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{8}
+}
+func (m *StreamingOutputCallResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingOutputCallResponse.Unmarshal(m, b)
+}
+func (m *StreamingOutputCallResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingOutputCallResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingOutputCallResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingOutputCallResponse.Merge(dst, src)
+}
+func (m *StreamingOutputCallResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingOutputCallResponse.Size(m)
+}
+func (m *StreamingOutputCallResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingOutputCallResponse.DiscardUnknown(m)
 }
 
-func (m *StreamingOutputCallResponse) Reset()                    { *m = StreamingOutputCallResponse{} }
-func (m *StreamingOutputCallResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingOutputCallResponse) ProtoMessage()               {}
-func (*StreamingOutputCallResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
+var xxx_messageInfo_StreamingOutputCallResponse proto.InternalMessageInfo
 
 func (m *StreamingOutputCallResponse) GetPayload() *Payload {
 	if m != nil {
@@ -373,13 +581,35 @@ func (m *StreamingOutputCallResponse) GetPayload() *Payload {
 // For reconnect interop test only.
 // Client tells server what reconnection parameters it used.
 type ReconnectParams struct {
-	MaxReconnectBackoffMs int32 `protobuf:"varint,1,opt,name=max_reconnect_backoff_ms,json=maxReconnectBackoffMs" json:"max_reconnect_backoff_ms,omitempty"`
+	MaxReconnectBackoffMs int32    `protobuf:"varint,1,opt,name=max_reconnect_backoff_ms,json=maxReconnectBackoffMs,proto3" json:"max_reconnect_backoff_ms,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
+}
+
+func (m *ReconnectParams) Reset()         { *m = ReconnectParams{} }
+func (m *ReconnectParams) String() string { return proto.CompactTextString(m) }
+func (*ReconnectParams) ProtoMessage()    {}
+func (*ReconnectParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{9}
+}
+func (m *ReconnectParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReconnectParams.Unmarshal(m, b)
+}
+func (m *ReconnectParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReconnectParams.Marshal(b, m, deterministic)
+}
+func (dst *ReconnectParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReconnectParams.Merge(dst, src)
+}
+func (m *ReconnectParams) XXX_Size() int {
+	return xxx_messageInfo_ReconnectParams.Size(m)
+}
+func (m *ReconnectParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReconnectParams.DiscardUnknown(m)
 }
 
-func (m *ReconnectParams) Reset()                    { *m = ReconnectParams{} }
-func (m *ReconnectParams) String() string            { return proto.CompactTextString(m) }
-func (*ReconnectParams) ProtoMessage()               {}
-func (*ReconnectParams) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} }
+var xxx_messageInfo_ReconnectParams proto.InternalMessageInfo
 
 func (m *ReconnectParams) GetMaxReconnectBackoffMs() int32 {
 	if m != nil {
@@ -392,14 +622,36 @@ func (m *ReconnectParams) GetMaxReconnectBackoffMs() int32 {
 // Server tells client whether its reconnects are following the spec and the
 // reconnect backoffs it saw.
 type ReconnectInfo struct {
-	Passed    bool    `protobuf:"varint,1,opt,name=passed" json:"passed,omitempty"`
-	BackoffMs []int32 `protobuf:"varint,2,rep,packed,name=backoff_ms,json=backoffMs" json:"backoff_ms,omitempty"`
+	Passed               bool     `protobuf:"varint,1,opt,name=passed,proto3" json:"passed,omitempty"`
+	BackoffMs            []int32  `protobuf:"varint,2,rep,packed,name=backoff_ms,json=backoffMs,proto3" json:"backoff_ms,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReconnectInfo) Reset()         { *m = ReconnectInfo{} }
+func (m *ReconnectInfo) String() string { return proto.CompactTextString(m) }
+func (*ReconnectInfo) ProtoMessage()    {}
+func (*ReconnectInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_messages_5c70222ad96bf232, []int{10}
+}
+func (m *ReconnectInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReconnectInfo.Unmarshal(m, b)
+}
+func (m *ReconnectInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReconnectInfo.Marshal(b, m, deterministic)
+}
+func (dst *ReconnectInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReconnectInfo.Merge(dst, src)
+}
+func (m *ReconnectInfo) XXX_Size() int {
+	return xxx_messageInfo_ReconnectInfo.Size(m)
+}
+func (m *ReconnectInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReconnectInfo.DiscardUnknown(m)
 }
 
-func (m *ReconnectInfo) Reset()                    { *m = ReconnectInfo{} }
-func (m *ReconnectInfo) String() string            { return proto.CompactTextString(m) }
-func (*ReconnectInfo) ProtoMessage()               {}
-func (*ReconnectInfo) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} }
+var xxx_messageInfo_ReconnectInfo proto.InternalMessageInfo
 
 func (m *ReconnectInfo) GetPassed() bool {
 	if m != nil {
@@ -431,9 +683,9 @@ func init() {
 	proto.RegisterEnum("grpc.testing.CompressionType", CompressionType_name, CompressionType_value)
 }
 
-func init() { proto.RegisterFile("messages.proto", fileDescriptor1) }
+func init() { proto.RegisterFile("messages.proto", fileDescriptor_messages_5c70222ad96bf232) }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_messages_5c70222ad96bf232 = []byte{
 	// 652 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x4d, 0x6f, 0xd3, 0x40,
 	0x10, 0xc5, 0xf9, 0xee, 0x24, 0x4d, 0xa3, 0x85, 0x82, 0x5b, 0x54, 0x11, 0x99, 0x4b, 0x54, 0x89,
diff --git a/vendor/google.golang.org/grpc/benchmark/grpc_testing/payloads.pb.go b/vendor/google.golang.org/grpc/benchmark/grpc_testing/payloads.pb.go
index d70d1f74..f7f9cf8e 100644
--- a/vendor/google.golang.org/grpc/benchmark/grpc_testing/payloads.pb.go
+++ b/vendor/google.golang.org/grpc/benchmark/grpc_testing/payloads.pb.go
@@ -12,15 +12,43 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type ByteBufferParams struct {
-	ReqSize  int32 `protobuf:"varint,1,opt,name=req_size,json=reqSize" json:"req_size,omitempty"`
-	RespSize int32 `protobuf:"varint,2,opt,name=resp_size,json=respSize" json:"resp_size,omitempty"`
+	ReqSize              int32    `protobuf:"varint,1,opt,name=req_size,json=reqSize,proto3" json:"req_size,omitempty"`
+	RespSize             int32    `protobuf:"varint,2,opt,name=resp_size,json=respSize,proto3" json:"resp_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ByteBufferParams) Reset()                    { *m = ByteBufferParams{} }
-func (m *ByteBufferParams) String() string            { return proto.CompactTextString(m) }
-func (*ByteBufferParams) ProtoMessage()               {}
-func (*ByteBufferParams) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+func (m *ByteBufferParams) Reset()         { *m = ByteBufferParams{} }
+func (m *ByteBufferParams) String() string { return proto.CompactTextString(m) }
+func (*ByteBufferParams) ProtoMessage()    {}
+func (*ByteBufferParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_payloads_3abc71de35f06c83, []int{0}
+}
+func (m *ByteBufferParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ByteBufferParams.Unmarshal(m, b)
+}
+func (m *ByteBufferParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ByteBufferParams.Marshal(b, m, deterministic)
+}
+func (dst *ByteBufferParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ByteBufferParams.Merge(dst, src)
+}
+func (m *ByteBufferParams) XXX_Size() int {
+	return xxx_messageInfo_ByteBufferParams.Size(m)
+}
+func (m *ByteBufferParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_ByteBufferParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ByteBufferParams proto.InternalMessageInfo
 
 func (m *ByteBufferParams) GetReqSize() int32 {
 	if m != nil {
@@ -37,14 +65,36 @@ func (m *ByteBufferParams) GetRespSize() int32 {
 }
 
 type SimpleProtoParams struct {
-	ReqSize  int32 `protobuf:"varint,1,opt,name=req_size,json=reqSize" json:"req_size,omitempty"`
-	RespSize int32 `protobuf:"varint,2,opt,name=resp_size,json=respSize" json:"resp_size,omitempty"`
+	ReqSize              int32    `protobuf:"varint,1,opt,name=req_size,json=reqSize,proto3" json:"req_size,omitempty"`
+	RespSize             int32    `protobuf:"varint,2,opt,name=resp_size,json=respSize,proto3" json:"resp_size,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SimpleProtoParams) Reset()                    { *m = SimpleProtoParams{} }
-func (m *SimpleProtoParams) String() string            { return proto.CompactTextString(m) }
-func (*SimpleProtoParams) ProtoMessage()               {}
-func (*SimpleProtoParams) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+func (m *SimpleProtoParams) Reset()         { *m = SimpleProtoParams{} }
+func (m *SimpleProtoParams) String() string { return proto.CompactTextString(m) }
+func (*SimpleProtoParams) ProtoMessage()    {}
+func (*SimpleProtoParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_payloads_3abc71de35f06c83, []int{1}
+}
+func (m *SimpleProtoParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleProtoParams.Unmarshal(m, b)
+}
+func (m *SimpleProtoParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleProtoParams.Marshal(b, m, deterministic)
+}
+func (dst *SimpleProtoParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleProtoParams.Merge(dst, src)
+}
+func (m *SimpleProtoParams) XXX_Size() int {
+	return xxx_messageInfo_SimpleProtoParams.Size(m)
+}
+func (m *SimpleProtoParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleProtoParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SimpleProtoParams proto.InternalMessageInfo
 
 func (m *SimpleProtoParams) GetReqSize() int32 {
 	if m != nil {
@@ -61,42 +111,90 @@ func (m *SimpleProtoParams) GetRespSize() int32 {
 }
 
 type ComplexProtoParams struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ComplexProtoParams) Reset()                    { *m = ComplexProtoParams{} }
-func (m *ComplexProtoParams) String() string            { return proto.CompactTextString(m) }
-func (*ComplexProtoParams) ProtoMessage()               {}
-func (*ComplexProtoParams) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+func (m *ComplexProtoParams) Reset()         { *m = ComplexProtoParams{} }
+func (m *ComplexProtoParams) String() string { return proto.CompactTextString(m) }
+func (*ComplexProtoParams) ProtoMessage()    {}
+func (*ComplexProtoParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_payloads_3abc71de35f06c83, []int{2}
+}
+func (m *ComplexProtoParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ComplexProtoParams.Unmarshal(m, b)
+}
+func (m *ComplexProtoParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ComplexProtoParams.Marshal(b, m, deterministic)
+}
+func (dst *ComplexProtoParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ComplexProtoParams.Merge(dst, src)
+}
+func (m *ComplexProtoParams) XXX_Size() int {
+	return xxx_messageInfo_ComplexProtoParams.Size(m)
+}
+func (m *ComplexProtoParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_ComplexProtoParams.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ComplexProtoParams proto.InternalMessageInfo
 
 type PayloadConfig struct {
 	// Types that are valid to be assigned to Payload:
 	//	*PayloadConfig_BytebufParams
 	//	*PayloadConfig_SimpleParams
 	//	*PayloadConfig_ComplexParams
-	Payload isPayloadConfig_Payload `protobuf_oneof:"payload"`
+	Payload              isPayloadConfig_Payload `protobuf_oneof:"payload"`
+	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
+	XXX_unrecognized     []byte                  `json:"-"`
+	XXX_sizecache        int32                   `json:"-"`
+}
+
+func (m *PayloadConfig) Reset()         { *m = PayloadConfig{} }
+func (m *PayloadConfig) String() string { return proto.CompactTextString(m) }
+func (*PayloadConfig) ProtoMessage()    {}
+func (*PayloadConfig) Descriptor() ([]byte, []int) {
+	return fileDescriptor_payloads_3abc71de35f06c83, []int{3}
+}
+func (m *PayloadConfig) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_PayloadConfig.Unmarshal(m, b)
+}
+func (m *PayloadConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_PayloadConfig.Marshal(b, m, deterministic)
+}
+func (dst *PayloadConfig) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PayloadConfig.Merge(dst, src)
+}
+func (m *PayloadConfig) XXX_Size() int {
+	return xxx_messageInfo_PayloadConfig.Size(m)
+}
+func (m *PayloadConfig) XXX_DiscardUnknown() {
+	xxx_messageInfo_PayloadConfig.DiscardUnknown(m)
 }
 
-func (m *PayloadConfig) Reset()                    { *m = PayloadConfig{} }
-func (m *PayloadConfig) String() string            { return proto.CompactTextString(m) }
-func (*PayloadConfig) ProtoMessage()               {}
-func (*PayloadConfig) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+var xxx_messageInfo_PayloadConfig proto.InternalMessageInfo
 
 type isPayloadConfig_Payload interface {
 	isPayloadConfig_Payload()
 }
 
 type PayloadConfig_BytebufParams struct {
-	BytebufParams *ByteBufferParams `protobuf:"bytes,1,opt,name=bytebuf_params,json=bytebufParams,oneof"`
+	BytebufParams *ByteBufferParams `protobuf:"bytes,1,opt,name=bytebuf_params,json=bytebufParams,proto3,oneof"`
 }
+
 type PayloadConfig_SimpleParams struct {
-	SimpleParams *SimpleProtoParams `protobuf:"bytes,2,opt,name=simple_params,json=simpleParams,oneof"`
+	SimpleParams *SimpleProtoParams `protobuf:"bytes,2,opt,name=simple_params,json=simpleParams,proto3,oneof"`
 }
+
 type PayloadConfig_ComplexParams struct {
-	ComplexParams *ComplexProtoParams `protobuf:"bytes,3,opt,name=complex_params,json=complexParams,oneof"`
+	ComplexParams *ComplexProtoParams `protobuf:"bytes,3,opt,name=complex_params,json=complexParams,proto3,oneof"`
 }
 
 func (*PayloadConfig_BytebufParams) isPayloadConfig_Payload() {}
-func (*PayloadConfig_SimpleParams) isPayloadConfig_Payload()  {}
+
+func (*PayloadConfig_SimpleParams) isPayloadConfig_Payload() {}
+
 func (*PayloadConfig_ComplexParams) isPayloadConfig_Payload() {}
 
 func (m *PayloadConfig) GetPayload() isPayloadConfig_Payload {
@@ -200,17 +298,17 @@ func _PayloadConfig_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.Payload.(type) {
 	case *PayloadConfig_BytebufParams:
 		s := proto.Size(x.BytebufParams)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *PayloadConfig_SimpleParams:
 		s := proto.Size(x.SimpleParams)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *PayloadConfig_ComplexParams:
 		s := proto.Size(x.ComplexParams)
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -227,9 +325,9 @@ func init() {
 	proto.RegisterType((*PayloadConfig)(nil), "grpc.testing.PayloadConfig")
 }
 
-func init() { proto.RegisterFile("payloads.proto", fileDescriptor2) }
+func init() { proto.RegisterFile("payloads.proto", fileDescriptor_payloads_3abc71de35f06c83) }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_payloads_3abc71de35f06c83 = []byte{
 	// 254 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2b, 0x48, 0xac, 0xcc,
 	0xc9, 0x4f, 0x4c, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x49, 0x2f, 0x2a, 0x48,
diff --git a/vendor/google.golang.org/grpc/benchmark/grpc_testing/services.pb.go b/vendor/google.golang.org/grpc/benchmark/grpc_testing/services.pb.go
index 50e35059..5156ae73 100644
--- a/vendor/google.golang.org/grpc/benchmark/grpc_testing/services.pb.go
+++ b/vendor/google.golang.org/grpc/benchmark/grpc_testing/services.pb.go
@@ -17,6 +17,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -25,8 +31,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for BenchmarkService service
-
+// BenchmarkServiceClient is the client API for BenchmarkService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type BenchmarkServiceClient interface {
 	// One request followed by one response.
 	// The server returns the client payload as-is.
@@ -46,7 +53,7 @@ func NewBenchmarkServiceClient(cc *grpc.ClientConn) BenchmarkServiceClient {
 
 func (c *benchmarkServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
 	out := new(SimpleResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.BenchmarkService/UnaryCall", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.BenchmarkService/UnaryCall", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -54,7 +61,7 @@ func (c *benchmarkServiceClient) UnaryCall(ctx context.Context, in *SimpleReques
 }
 
 func (c *benchmarkServiceClient) StreamingCall(ctx context.Context, opts ...grpc.CallOption) (BenchmarkService_StreamingCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_BenchmarkService_serviceDesc.Streams[0], c.cc, "/grpc.testing.BenchmarkService/StreamingCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_BenchmarkService_serviceDesc.Streams[0], "/grpc.testing.BenchmarkService/StreamingCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -84,8 +91,7 @@ func (x *benchmarkServiceStreamingCallClient) Recv() (*SimpleResponse, error) {
 	return m, nil
 }
 
-// Server API for BenchmarkService service
-
+// BenchmarkServiceServer is the server API for BenchmarkService service.
 type BenchmarkServiceServer interface {
 	// One request followed by one response.
 	// The server returns the client payload as-is.
@@ -163,8 +169,9 @@ var _BenchmarkService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "services.proto",
 }
 
-// Client API for WorkerService service
-
+// WorkerServiceClient is the client API for WorkerService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type WorkerServiceClient interface {
 	// Start server with specified workload.
 	// First request sent specifies the ServerConfig followed by ServerStatus
@@ -195,7 +202,7 @@ func NewWorkerServiceClient(cc *grpc.ClientConn) WorkerServiceClient {
 }
 
 func (c *workerServiceClient) RunServer(ctx context.Context, opts ...grpc.CallOption) (WorkerService_RunServerClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_WorkerService_serviceDesc.Streams[0], c.cc, "/grpc.testing.WorkerService/RunServer", opts...)
+	stream, err := c.cc.NewStream(ctx, &_WorkerService_serviceDesc.Streams[0], "/grpc.testing.WorkerService/RunServer", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -226,7 +233,7 @@ func (x *workerServiceRunServerClient) Recv() (*ServerStatus, error) {
 }
 
 func (c *workerServiceClient) RunClient(ctx context.Context, opts ...grpc.CallOption) (WorkerService_RunClientClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_WorkerService_serviceDesc.Streams[1], c.cc, "/grpc.testing.WorkerService/RunClient", opts...)
+	stream, err := c.cc.NewStream(ctx, &_WorkerService_serviceDesc.Streams[1], "/grpc.testing.WorkerService/RunClient", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -258,7 +265,7 @@ func (x *workerServiceRunClientClient) Recv() (*ClientStatus, error) {
 
 func (c *workerServiceClient) CoreCount(ctx context.Context, in *CoreRequest, opts ...grpc.CallOption) (*CoreResponse, error) {
 	out := new(CoreResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.WorkerService/CoreCount", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.WorkerService/CoreCount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -267,15 +274,14 @@ func (c *workerServiceClient) CoreCount(ctx context.Context, in *CoreRequest, op
 
 func (c *workerServiceClient) QuitWorker(ctx context.Context, in *Void, opts ...grpc.CallOption) (*Void, error) {
 	out := new(Void)
-	err := grpc.Invoke(ctx, "/grpc.testing.WorkerService/QuitWorker", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.WorkerService/QuitWorker", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for WorkerService service
-
+// WorkerServiceServer is the server API for WorkerService service.
 type WorkerServiceServer interface {
 	// Start server with specified workload.
 	// First request sent specifies the ServerConfig followed by ServerStatus
@@ -419,9 +425,9 @@ var _WorkerService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "services.proto",
 }
 
-func init() { proto.RegisterFile("services.proto", fileDescriptor3) }
+func init() { proto.RegisterFile("services.proto", fileDescriptor_services_bf68f4d7cbd0e0a1) }
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_services_bf68f4d7cbd0e0a1 = []byte{
 	// 255 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x91, 0xc1, 0x4a, 0xc4, 0x30,
 	0x10, 0x86, 0xa9, 0x07, 0xa1, 0xc1, 0x2e, 0x92, 0x93, 0x46, 0x1f, 0xc0, 0x53, 0x91, 0xd5, 0x17,
diff --git a/vendor/google.golang.org/grpc/benchmark/grpc_testing/stats.pb.go b/vendor/google.golang.org/grpc/benchmark/grpc_testing/stats.pb.go
index d69cb741..abc2aea7 100644
--- a/vendor/google.golang.org/grpc/benchmark/grpc_testing/stats.pb.go
+++ b/vendor/google.golang.org/grpc/benchmark/grpc_testing/stats.pb.go
@@ -12,20 +12,48 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type ServerStats struct {
 	// wall clock time change in seconds since last reset
-	TimeElapsed float64 `protobuf:"fixed64,1,opt,name=time_elapsed,json=timeElapsed" json:"time_elapsed,omitempty"`
+	TimeElapsed float64 `protobuf:"fixed64,1,opt,name=time_elapsed,json=timeElapsed,proto3" json:"time_elapsed,omitempty"`
 	// change in user time (in seconds) used by the server since last reset
-	TimeUser float64 `protobuf:"fixed64,2,opt,name=time_user,json=timeUser" json:"time_user,omitempty"`
+	TimeUser float64 `protobuf:"fixed64,2,opt,name=time_user,json=timeUser,proto3" json:"time_user,omitempty"`
 	// change in server time (in seconds) used by the server process and all
 	// threads since last reset
-	TimeSystem float64 `protobuf:"fixed64,3,opt,name=time_system,json=timeSystem" json:"time_system,omitempty"`
+	TimeSystem           float64  `protobuf:"fixed64,3,opt,name=time_system,json=timeSystem,proto3" json:"time_system,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ServerStats) Reset()         { *m = ServerStats{} }
+func (m *ServerStats) String() string { return proto.CompactTextString(m) }
+func (*ServerStats) ProtoMessage()    {}
+func (*ServerStats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_stats_8ba831c0cb3c3440, []int{0}
+}
+func (m *ServerStats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerStats.Unmarshal(m, b)
+}
+func (m *ServerStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerStats.Marshal(b, m, deterministic)
+}
+func (dst *ServerStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerStats.Merge(dst, src)
+}
+func (m *ServerStats) XXX_Size() int {
+	return xxx_messageInfo_ServerStats.Size(m)
+}
+func (m *ServerStats) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerStats.DiscardUnknown(m)
 }
 
-func (m *ServerStats) Reset()                    { *m = ServerStats{} }
-func (m *ServerStats) String() string            { return proto.CompactTextString(m) }
-func (*ServerStats) ProtoMessage()               {}
-func (*ServerStats) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+var xxx_messageInfo_ServerStats proto.InternalMessageInfo
 
 func (m *ServerStats) GetTimeElapsed() float64 {
 	if m != nil {
@@ -50,14 +78,36 @@ func (m *ServerStats) GetTimeSystem() float64 {
 
 // Histogram params based on grpc/support/histogram.c
 type HistogramParams struct {
-	Resolution  float64 `protobuf:"fixed64,1,opt,name=resolution" json:"resolution,omitempty"`
-	MaxPossible float64 `protobuf:"fixed64,2,opt,name=max_possible,json=maxPossible" json:"max_possible,omitempty"`
+	Resolution           float64  `protobuf:"fixed64,1,opt,name=resolution,proto3" json:"resolution,omitempty"`
+	MaxPossible          float64  `protobuf:"fixed64,2,opt,name=max_possible,json=maxPossible,proto3" json:"max_possible,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HistogramParams) Reset()         { *m = HistogramParams{} }
+func (m *HistogramParams) String() string { return proto.CompactTextString(m) }
+func (*HistogramParams) ProtoMessage()    {}
+func (*HistogramParams) Descriptor() ([]byte, []int) {
+	return fileDescriptor_stats_8ba831c0cb3c3440, []int{1}
+}
+func (m *HistogramParams) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HistogramParams.Unmarshal(m, b)
+}
+func (m *HistogramParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HistogramParams.Marshal(b, m, deterministic)
+}
+func (dst *HistogramParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HistogramParams.Merge(dst, src)
+}
+func (m *HistogramParams) XXX_Size() int {
+	return xxx_messageInfo_HistogramParams.Size(m)
+}
+func (m *HistogramParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_HistogramParams.DiscardUnknown(m)
 }
 
-func (m *HistogramParams) Reset()                    { *m = HistogramParams{} }
-func (m *HistogramParams) String() string            { return proto.CompactTextString(m) }
-func (*HistogramParams) ProtoMessage()               {}
-func (*HistogramParams) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+var xxx_messageInfo_HistogramParams proto.InternalMessageInfo
 
 func (m *HistogramParams) GetResolution() float64 {
 	if m != nil {
@@ -75,18 +125,40 @@ func (m *HistogramParams) GetMaxPossible() float64 {
 
 // Histogram data based on grpc/support/histogram.c
 type HistogramData struct {
-	Bucket       []uint32 `protobuf:"varint,1,rep,packed,name=bucket" json:"bucket,omitempty"`
-	MinSeen      float64  `protobuf:"fixed64,2,opt,name=min_seen,json=minSeen" json:"min_seen,omitempty"`
-	MaxSeen      float64  `protobuf:"fixed64,3,opt,name=max_seen,json=maxSeen" json:"max_seen,omitempty"`
-	Sum          float64  `protobuf:"fixed64,4,opt,name=sum" json:"sum,omitempty"`
-	SumOfSquares float64  `protobuf:"fixed64,5,opt,name=sum_of_squares,json=sumOfSquares" json:"sum_of_squares,omitempty"`
-	Count        float64  `protobuf:"fixed64,6,opt,name=count" json:"count,omitempty"`
+	Bucket               []uint32 `protobuf:"varint,1,rep,packed,name=bucket,proto3" json:"bucket,omitempty"`
+	MinSeen              float64  `protobuf:"fixed64,2,opt,name=min_seen,json=minSeen,proto3" json:"min_seen,omitempty"`
+	MaxSeen              float64  `protobuf:"fixed64,3,opt,name=max_seen,json=maxSeen,proto3" json:"max_seen,omitempty"`
+	Sum                  float64  `protobuf:"fixed64,4,opt,name=sum,proto3" json:"sum,omitempty"`
+	SumOfSquares         float64  `protobuf:"fixed64,5,opt,name=sum_of_squares,json=sumOfSquares,proto3" json:"sum_of_squares,omitempty"`
+	Count                float64  `protobuf:"fixed64,6,opt,name=count,proto3" json:"count,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *HistogramData) Reset()                    { *m = HistogramData{} }
-func (m *HistogramData) String() string            { return proto.CompactTextString(m) }
-func (*HistogramData) ProtoMessage()               {}
-func (*HistogramData) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
+func (m *HistogramData) Reset()         { *m = HistogramData{} }
+func (m *HistogramData) String() string { return proto.CompactTextString(m) }
+func (*HistogramData) ProtoMessage()    {}
+func (*HistogramData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_stats_8ba831c0cb3c3440, []int{2}
+}
+func (m *HistogramData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HistogramData.Unmarshal(m, b)
+}
+func (m *HistogramData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HistogramData.Marshal(b, m, deterministic)
+}
+func (dst *HistogramData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HistogramData.Merge(dst, src)
+}
+func (m *HistogramData) XXX_Size() int {
+	return xxx_messageInfo_HistogramData.Size(m)
+}
+func (m *HistogramData) XXX_DiscardUnknown() {
+	xxx_messageInfo_HistogramData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HistogramData proto.InternalMessageInfo
 
 func (m *HistogramData) GetBucket() []uint32 {
 	if m != nil {
@@ -132,17 +204,39 @@ func (m *HistogramData) GetCount() float64 {
 
 type ClientStats struct {
 	// Latency histogram. Data points are in nanoseconds.
-	Latencies *HistogramData `protobuf:"bytes,1,opt,name=latencies" json:"latencies,omitempty"`
+	Latencies *HistogramData `protobuf:"bytes,1,opt,name=latencies,proto3" json:"latencies,omitempty"`
 	// See ServerStats for details.
-	TimeElapsed float64 `protobuf:"fixed64,2,opt,name=time_elapsed,json=timeElapsed" json:"time_elapsed,omitempty"`
-	TimeUser    float64 `protobuf:"fixed64,3,opt,name=time_user,json=timeUser" json:"time_user,omitempty"`
-	TimeSystem  float64 `protobuf:"fixed64,4,opt,name=time_system,json=timeSystem" json:"time_system,omitempty"`
+	TimeElapsed          float64  `protobuf:"fixed64,2,opt,name=time_elapsed,json=timeElapsed,proto3" json:"time_elapsed,omitempty"`
+	TimeUser             float64  `protobuf:"fixed64,3,opt,name=time_user,json=timeUser,proto3" json:"time_user,omitempty"`
+	TimeSystem           float64  `protobuf:"fixed64,4,opt,name=time_system,json=timeSystem,proto3" json:"time_system,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClientStats) Reset()         { *m = ClientStats{} }
+func (m *ClientStats) String() string { return proto.CompactTextString(m) }
+func (*ClientStats) ProtoMessage()    {}
+func (*ClientStats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_stats_8ba831c0cb3c3440, []int{3}
+}
+func (m *ClientStats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClientStats.Unmarshal(m, b)
+}
+func (m *ClientStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClientStats.Marshal(b, m, deterministic)
+}
+func (dst *ClientStats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClientStats.Merge(dst, src)
+}
+func (m *ClientStats) XXX_Size() int {
+	return xxx_messageInfo_ClientStats.Size(m)
+}
+func (m *ClientStats) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClientStats.DiscardUnknown(m)
 }
 
-func (m *ClientStats) Reset()                    { *m = ClientStats{} }
-func (m *ClientStats) String() string            { return proto.CompactTextString(m) }
-func (*ClientStats) ProtoMessage()               {}
-func (*ClientStats) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+var xxx_messageInfo_ClientStats proto.InternalMessageInfo
 
 func (m *ClientStats) GetLatencies() *HistogramData {
 	if m != nil {
@@ -179,9 +273,9 @@ func init() {
 	proto.RegisterType((*ClientStats)(nil), "grpc.testing.ClientStats")
 }
 
-func init() { proto.RegisterFile("stats.proto", fileDescriptor4) }
+func init() { proto.RegisterFile("stats.proto", fileDescriptor_stats_8ba831c0cb3c3440) }
 
-var fileDescriptor4 = []byte{
+var fileDescriptor_stats_8ba831c0cb3c3440 = []byte{
 	// 341 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x4a, 0xeb, 0x40,
 	0x14, 0x86, 0x49, 0xd3, 0xf6, 0xb6, 0x27, 0xed, 0xbd, 0x97, 0x41, 0x24, 0x52, 0xd0, 0x1a, 0x5c,
diff --git a/vendor/google.golang.org/grpc/benchmark/run_bench.sh b/vendor/google.golang.org/grpc/benchmark/run_bench.sh
new file mode 100755
index 00000000..a79292b9
--- /dev/null
+++ b/vendor/google.golang.org/grpc/benchmark/run_bench.sh
@@ -0,0 +1,187 @@
+#!/bin/bash
+
+rpcs=(1)
+conns=(1)
+warmup=10
+dur=10
+reqs=(1)
+resps=(1)
+rpc_types=(unary)
+
+# idx[0] = idx value for rpcs
+# idx[1] = idx value for conns
+# idx[2] = idx value for reqs
+# idx[3] = idx value for resps
+# idx[4] = idx value for rpc_types
+idx=(0 0 0 0 0)
+idx_max=(1 1 1 1 1)
+
+inc()
+{
+  for i in $(seq $((${#idx[@]}-1)) -1 0); do
+    idx[${i}]=$((${idx[${i}]}+1))
+    if [ ${idx[${i}]} == ${idx_max[${i}]} ]; then
+      idx[${i}]=0
+    else
+      break
+    fi
+  done
+  local fin
+  fin=1
+  # Check to see if we have looped back to the beginning.
+  for v in ${idx[@]}; do
+    if [ ${v} != 0 ]; then
+      fin=0
+      break
+    fi
+  done
+  if [ ${fin} == 1 ]; then
+    rm -Rf ${out_dir}
+    clean_and_die 0
+  fi
+}
+
+clean_and_die() {
+  rm -Rf ${out_dir}
+  exit $1
+}
+
+run(){
+  local nr
+  nr=${rpcs[${idx[0]}]}
+  local nc
+  nc=${conns[${idx[1]}]}
+  req_sz=${reqs[${idx[2]}]}
+  resp_sz=${resps[${idx[3]}]}
+  r_type=${rpc_types[${idx[4]}]}
+  # Following runs one benchmark
+  base_port=50051
+  delta=0
+  test_name="r_"${nr}"_c_"${nc}"_req_"${req_sz}"_resp_"${resp_sz}"_"${r_type}"_"$(date +%s)
+  echo "================================================================================"
+  echo ${test_name}
+  while :
+  do
+    port=$((${base_port}+${delta}))
+
+    # Launch the server in background
+    ${out_dir}/server --port=${port} --test_name="Server_"${test_name}&
+    server_pid=$(echo $!)
+
+    # Launch the client
+    ${out_dir}/client --port=${port} --d=${dur} --w=${warmup} --r=${nr} --c=${nc} --req=${req_sz} --resp=${resp_sz} --rpc_type=${r_type}  --test_name="client_"${test_name}
+    client_status=$(echo $?)
+
+    kill -INT ${server_pid}
+    wait ${server_pid}
+
+    if [ ${client_status} == 0 ]; then
+      break
+    fi
+
+    delta=$((${delta}+1))
+    if [ ${delta} == 10 ]; then
+      echo "Continuous 10 failed runs. Exiting now."
+      rm -Rf ${out_dir}
+      clean_and_die 1
+    fi
+  done
+
+}
+
+set_param(){
+  local argname=$1
+  shift
+  local idx=$1
+  shift
+  if [ $# -eq 0 ]; then
+    echo "${argname} not specified"
+    exit 1
+  fi
+  PARAM=($(echo $1 | sed 's/,/ /g'))
+  if [ ${idx} -lt 0 ]; then
+    return
+  fi
+  idx_max[${idx}]=${#PARAM[@]}
+}
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    -r)
+      shift
+      set_param "number of rpcs" 0 $1
+      rpcs=(${PARAM[@]})
+      shift
+      ;;
+    -c)
+      shift
+      set_param "number of connections" 1 $1
+      conns=(${PARAM[@]})
+      shift
+      ;;
+    -w)
+      shift
+      set_param "warm-up period" -1 $1
+      warmup=${PARAM}
+      shift
+      ;;
+    -d)
+      shift
+      set_param "duration" -1 $1
+      dur=${PARAM}
+      shift
+      ;;
+    -req)
+      shift
+      set_param "request size" 2 $1
+      reqs=(${PARAM[@]})
+      shift
+      ;;
+    -resp)
+      shift
+      set_param "response size" 3 $1
+      resps=(${PARAM[@]})
+      shift
+      ;;
+    -rpc_type)
+      shift
+      set_param "rpc type" 4 $1
+      rpc_types=(${PARAM[@]})
+      shift
+      ;;
+    -h|--help)
+      echo "Following are valid options:"
+      echo
+      echo "-h, --help        show brief help"
+      echo "-w                warm-up duration in seconds, default value is 10"
+      echo "-d                benchmark duration in seconds, default value is 60"
+      echo ""
+      echo "Each of the following can have multiple comma separated values."
+      echo ""
+      echo "-r                number of RPCs, default value is 1"
+      echo "-c                number of Connections, default value is 1"
+      echo "-req              req size in bytes, default value is 1"
+      echo "-resp             resp size in bytes, default value is 1"
+      echo "-rpc_type         valid values are unary|streaming, default is unary"
+      ;;
+    *)
+      echo "Incorrect option $1"
+      exit 1
+      ;;
+  esac
+done
+
+# Build server and client
+out_dir=$(mktemp -d oss_benchXXX)
+
+go build -o ${out_dir}/server $GOPATH/src/google.golang.org/grpc/benchmark/server/main.go && go build -o ${out_dir}/client $GOPATH/src/google.golang.org/grpc/benchmark/client/main.go
+if [ $? != 0 ]; then
+  clean_and_die 1
+fi
+
+
+while :
+do
+  run
+  inc
+done
diff --git a/vendor/google.golang.org/grpc/benchmark/server/main.go b/vendor/google.golang.org/grpc/benchmark/server/main.go
index ac59ff77..fe190944 100644
--- a/vendor/google.golang.org/grpc/benchmark/server/main.go
+++ b/vendor/google.golang.org/grpc/benchmark/server/main.go
@@ -20,32 +20,62 @@ package main
 
 import (
 	"flag"
-	"math"
+	"fmt"
 	"net"
-	"net/http"
 	_ "net/http/pprof"
+	"os"
+	"os/signal"
+	"runtime"
+	"runtime/pprof"
 	"time"
 
 	"google.golang.org/grpc/benchmark"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/syscall"
 )
 
-var duration = flag.Int("duration", math.MaxInt32, "The duration in seconds to run the benchmark server")
+var (
+	port     = flag.String("port", "50051", "Localhost port to listen on.")
+	testName = flag.String("test_name", "", "Name of the test used for creating profiles.")
+)
 
 func main() {
 	flag.Parse()
-	go func() {
-		lis, err := net.Listen("tcp", ":0")
-		if err != nil {
-			grpclog.Fatalf("Failed to listen: %v", err)
-		}
-		grpclog.Println("Server profiling address: ", lis.Addr().String())
-		if err := http.Serve(lis, nil); err != nil {
-			grpclog.Fatalf("Failed to serve: %v", err)
-		}
-	}()
-	addr, stopper := benchmark.StartServer(benchmark.ServerInfo{Addr: ":0", Type: "protobuf"}) // listen on all interfaces
-	grpclog.Println("Server Address: ", addr)
-	<-time.After(time.Duration(*duration) * time.Second)
-	stopper()
+	if *testName == "" {
+		grpclog.Fatalf("test name not set")
+	}
+	lis, err := net.Listen("tcp", ":"+*port)
+	if err != nil {
+		grpclog.Fatalf("Failed to listen: %v", err)
+	}
+	defer lis.Close()
+
+	cf, err := os.Create("/tmp/" + *testName + ".cpu")
+	if err != nil {
+		grpclog.Fatalf("Failed to create file: %v", err)
+	}
+	defer cf.Close()
+	pprof.StartCPUProfile(cf)
+	cpuBeg := syscall.GetCPUTime()
+	// Launch server in a separate goroutine.
+	stop := benchmark.StartServer(benchmark.ServerInfo{Type: "protobuf", Listener: lis})
+	// Wait on OS terminate signal.
+	ch := make(chan os.Signal, 1)
+	signal.Notify(ch, os.Interrupt)
+	<-ch
+	cpu := time.Duration(syscall.GetCPUTime() - cpuBeg)
+	stop()
+	pprof.StopCPUProfile()
+	mf, err := os.Create("/tmp/" + *testName + ".mem")
+	if err != nil {
+		grpclog.Fatalf("Failed to create file: %v", err)
+	}
+	defer mf.Close()
+	runtime.GC() // materialize all statistics
+	if err := pprof.WriteHeapProfile(mf); err != nil {
+		grpclog.Fatalf("Failed to write memory profile: %v", err)
+	}
+	fmt.Println("Server CPU utilization:", cpu)
+	fmt.Println("Server CPU profile:", cf.Name())
+	fmt.Println("Server Mem Profile:", mf.Name())
 }
diff --git a/vendor/google.golang.org/grpc/benchmark/stats/stats.go b/vendor/google.golang.org/grpc/benchmark/stats/stats.go
index 2f98861c..041d2475 100644
--- a/vendor/google.golang.org/grpc/benchmark/stats/stats.go
+++ b/vendor/google.golang.org/grpc/benchmark/stats/stats.go
@@ -39,6 +39,7 @@ type Features struct {
 	ReqSizeBytes       int
 	RespSizeBytes      int
 	EnableCompressor   bool
+	EnableChannelz     bool
 }
 
 // String returns the textual output of the Features as string.
@@ -48,6 +49,13 @@ func (f Features) String() string {
 		f.Latency.String(), f.Kbps, f.Mtu, f.MaxConcurrentCalls, f.ReqSizeBytes, f.RespSizeBytes, f.EnableCompressor)
 }
 
+// ConciseString returns the concise textual output of the Features as string, skipping
+// setting with default value.
+func (f Features) ConciseString() string {
+	noneEmptyPos := []bool{f.EnableTrace, f.Latency != 0, f.Kbps != 0, f.Mtu != 0, true, true, true, f.EnableCompressor, f.EnableChannelz}
+	return PartialPrintString(noneEmptyPos, f, false)
+}
+
 // PartialPrintString can print certain features with different format.
 func PartialPrintString(noneEmptyPos []bool, f Features, shared bool) string {
 	s := ""
@@ -63,7 +71,7 @@ func PartialPrintString(noneEmptyPos []bool, f Features, shared bool) string {
 		linker = "_"
 	}
 	if noneEmptyPos[0] {
-		s += fmt.Sprintf("%sTrace%s%t%s", prefix, linker, f.EnableCompressor, suffix)
+		s += fmt.Sprintf("%sTrace%s%t%s", prefix, linker, f.EnableTrace, suffix)
 	}
 	if shared && f.NetworkMode != "" {
 		s += fmt.Sprintf("Network: %s \n", f.NetworkMode)
@@ -92,6 +100,9 @@ func PartialPrintString(noneEmptyPos []bool, f Features, shared bool) string {
 	if noneEmptyPos[7] {
 		s += fmt.Sprintf("%sCompressor%s%t%s", prefix, linker, f.EnableCompressor, suffix)
 	}
+	if noneEmptyPos[8] {
+		s += fmt.Sprintf("%sChannelz%s%t%s", prefix, linker, f.EnableChannelz, suffix)
+	}
 	return s
 }
 
diff --git a/vendor/google.golang.org/grpc/benchmark/worker/benchmark_client.go b/vendor/google.golang.org/grpc/benchmark/worker/benchmark_client.go
index f2a26503..96416bfc 100644
--- a/vendor/google.golang.org/grpc/benchmark/worker/benchmark_client.go
+++ b/vendor/google.golang.org/grpc/benchmark/worker/benchmark_client.go
@@ -23,7 +23,6 @@ import (
 	"math"
 	"runtime"
 	"sync"
-	"syscall"
 	"time"
 
 	"golang.org/x/net/context"
@@ -34,6 +33,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/syscall"
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/testdata"
 )
@@ -81,20 +81,20 @@ func printClientConfig(config *testpb.ClientConfig) {
 	//     will always create sync client
 	// - async client threads.
 	// - core list
-	grpclog.Printf(" * client type: %v (ignored, always creates sync client)", config.ClientType)
-	grpclog.Printf(" * async client threads: %v (ignored)", config.AsyncClientThreads)
+	grpclog.Infof(" * client type: %v (ignored, always creates sync client)", config.ClientType)
+	grpclog.Infof(" * async client threads: %v (ignored)", config.AsyncClientThreads)
 	// TODO: use cores specified by CoreList when setting list of cores is supported in go.
-	grpclog.Printf(" * core list: %v (ignored)", config.CoreList)
-
-	grpclog.Printf(" - security params: %v", config.SecurityParams)
-	grpclog.Printf(" - core limit: %v", config.CoreLimit)
-	grpclog.Printf(" - payload config: %v", config.PayloadConfig)
-	grpclog.Printf(" - rpcs per chann: %v", config.OutstandingRpcsPerChannel)
-	grpclog.Printf(" - channel number: %v", config.ClientChannels)
-	grpclog.Printf(" - load params: %v", config.LoadParams)
-	grpclog.Printf(" - rpc type: %v", config.RpcType)
-	grpclog.Printf(" - histogram params: %v", config.HistogramParams)
-	grpclog.Printf(" - server targets: %v", config.ServerTargets)
+	grpclog.Infof(" * core list: %v (ignored)", config.CoreList)
+
+	grpclog.Infof(" - security params: %v", config.SecurityParams)
+	grpclog.Infof(" - core limit: %v", config.CoreLimit)
+	grpclog.Infof(" - payload config: %v", config.PayloadConfig)
+	grpclog.Infof(" - rpcs per chann: %v", config.OutstandingRpcsPerChannel)
+	grpclog.Infof(" - channel number: %v", config.ClientChannels)
+	grpclog.Infof(" - load params: %v", config.LoadParams)
+	grpclog.Infof(" - rpc type: %v", config.RpcType)
+	grpclog.Infof(" - histogram params: %v", config.HistogramParams)
+	grpclog.Infof(" - server targets: %v", config.ServerTargets)
 }
 
 func setupClientEnv(config *testpb.ClientConfig) {
@@ -118,7 +118,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
 	case testpb.ClientType_SYNC_CLIENT:
 	case testpb.ClientType_ASYNC_CLIENT:
 	default:
-		return nil, nil, status.Errorf(codes.InvalidArgument, "unknow client type: %v", config.ClientType)
+		return nil, nil, status.Errorf(codes.InvalidArgument, "unknown client type: %v", config.ClientType)
 	}
 
 	// Check and set security options.
@@ -142,13 +142,13 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
 			opts = append(opts, grpc.WithDefaultCallOptions(grpc.CallCustomCodec(byteBufCodec{})))
 		case *testpb.PayloadConfig_SimpleParams:
 		default:
-			return nil, nil, status.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
+			return nil, nil, status.Errorf(codes.InvalidArgument, "unknown payload config: %v", config.PayloadConfig)
 		}
 	}
 
 	// Create connections.
 	connCount := int(config.ClientChannels)
-	conns := make([]*grpc.ClientConn, connCount, connCount)
+	conns := make([]*grpc.ClientConn, connCount)
 	for connIndex := 0; connIndex < connCount; connIndex++ {
 		conns[connIndex] = benchmark.NewClientConn(config.ServerTargets[connIndex%len(config.ServerTargets)], opts...)
 	}
@@ -177,7 +177,7 @@ func performRPCs(config *testpb.ClientConfig, conns []*grpc.ClientConn, bc *benc
 			payloadRespSize = int(c.SimpleParams.RespSize)
 			payloadType = "protobuf"
 		default:
-			return status.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
+			return status.Errorf(codes.InvalidArgument, "unknown payload config: %v", config.PayloadConfig)
 		}
 	}
 
@@ -217,9 +217,6 @@ func startBenchmarkClient(config *testpb.ClientConfig) (*benchmarkClient, error)
 		return nil, err
 	}
 
-	rusage := new(syscall.Rusage)
-	syscall.Getrusage(syscall.RUSAGE_SELF, rusage)
-
 	rpcCountPerConn := int(config.OutstandingRpcsPerChannel)
 	bc := &benchmarkClient{
 		histogramOptions: stats.HistogramOptions{
@@ -228,12 +225,12 @@ func startBenchmarkClient(config *testpb.ClientConfig) (*benchmarkClient, error)
 			BaseBucketSize: (1 + config.HistogramParams.Resolution),
 			MinValue:       0,
 		},
-		lockingHistograms: make([]lockingHistogram, rpcCountPerConn*len(conns), rpcCountPerConn*len(conns)),
+		lockingHistograms: make([]lockingHistogram, rpcCountPerConn*len(conns)),
 
 		stop:            make(chan bool),
 		lastResetTime:   time.Now(),
 		closeConns:      closeConns,
-		rusageLastReset: rusage,
+		rusageLastReset: syscall.GetRusage(),
 	}
 
 	if err = performRPCs(config, conns, bc); err != nil {
@@ -335,12 +332,11 @@ func (bc *benchmarkClient) doCloseLoopStreaming(conns []*grpc.ClientConn, rpcCou
 func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
 	var wallTimeElapsed, uTimeElapsed, sTimeElapsed float64
 	mergedHistogram := stats.NewHistogram(bc.histogramOptions)
-	latestRusage := new(syscall.Rusage)
 
 	if reset {
 		// Merging histogram may take some time.
 		// Put all histograms aside and merge later.
-		toMerge := make([]*stats.Histogram, len(bc.lockingHistograms), len(bc.lockingHistograms))
+		toMerge := make([]*stats.Histogram, len(bc.lockingHistograms))
 		for i := range bc.lockingHistograms {
 			toMerge[i] = bc.lockingHistograms[i].swap(stats.NewHistogram(bc.histogramOptions))
 		}
@@ -350,8 +346,8 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
 		}
 
 		wallTimeElapsed = time.Since(bc.lastResetTime).Seconds()
-		syscall.Getrusage(syscall.RUSAGE_SELF, latestRusage)
-		uTimeElapsed, sTimeElapsed = cpuTimeDiff(bc.rusageLastReset, latestRusage)
+		latestRusage := syscall.GetRusage()
+		uTimeElapsed, sTimeElapsed = syscall.CPUTimeDiff(bc.rusageLastReset, latestRusage)
 
 		bc.rusageLastReset = latestRusage
 		bc.lastResetTime = time.Now()
@@ -362,11 +358,10 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats {
 		}
 
 		wallTimeElapsed = time.Since(bc.lastResetTime).Seconds()
-		syscall.Getrusage(syscall.RUSAGE_SELF, latestRusage)
-		uTimeElapsed, sTimeElapsed = cpuTimeDiff(bc.rusageLastReset, latestRusage)
+		uTimeElapsed, sTimeElapsed = syscall.CPUTimeDiff(bc.rusageLastReset, syscall.GetRusage())
 	}
 
-	b := make([]uint32, len(mergedHistogram.Buckets), len(mergedHistogram.Buckets))
+	b := make([]uint32, len(mergedHistogram.Buckets))
 	for i, v := range mergedHistogram.Buckets {
 		b[i] = uint32(v.Count)
 	}
diff --git a/vendor/google.golang.org/grpc/benchmark/worker/benchmark_server.go b/vendor/google.golang.org/grpc/benchmark/worker/benchmark_server.go
index f130efde..56f7e6ee 100644
--- a/vendor/google.golang.org/grpc/benchmark/worker/benchmark_server.go
+++ b/vendor/google.golang.org/grpc/benchmark/worker/benchmark_server.go
@@ -20,11 +20,12 @@ package main
 
 import (
 	"flag"
+	"fmt"
+	"net"
 	"runtime"
 	"strconv"
 	"strings"
 	"sync"
-	"syscall"
 	"time"
 
 	"google.golang.org/grpc"
@@ -33,6 +34,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/syscall"
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/testdata"
 )
@@ -57,15 +59,15 @@ func printServerConfig(config *testpb.ServerConfig) {
 	//     will always start sync server
 	// - async server threads
 	// - core list
-	grpclog.Printf(" * server type: %v (ignored, always starts sync server)", config.ServerType)
-	grpclog.Printf(" * async server threads: %v (ignored)", config.AsyncServerThreads)
+	grpclog.Infof(" * server type: %v (ignored, always starts sync server)", config.ServerType)
+	grpclog.Infof(" * async server threads: %v (ignored)", config.AsyncServerThreads)
 	// TODO: use cores specified by CoreList when setting list of cores is supported in go.
-	grpclog.Printf(" * core list: %v (ignored)", config.CoreList)
+	grpclog.Infof(" * core list: %v (ignored)", config.CoreList)
 
-	grpclog.Printf(" - security params: %v", config.SecurityParams)
-	grpclog.Printf(" - core limit: %v", config.CoreLimit)
-	grpclog.Printf(" - port: %v", config.Port)
-	grpclog.Printf(" - payload config: %v", config.PayloadConfig)
+	grpclog.Infof(" - security params: %v", config.SecurityParams)
+	grpclog.Infof(" - core limit: %v", config.CoreLimit)
+	grpclog.Infof(" - port: %v", config.Port)
+	grpclog.Infof(" - payload config: %v", config.PayloadConfig)
 }
 
 func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchmarkServer, error) {
@@ -87,7 +89,7 @@ func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchma
 	case testpb.ServerType_ASYNC_SERVER:
 	case testpb.ServerType_ASYNC_GENERIC_SERVER:
 	default:
-		return nil, status.Errorf(codes.InvalidArgument, "unknow server type: %v", config.ServerType)
+		return nil, status.Errorf(codes.InvalidArgument, "unknown server type: %v", config.ServerType)
 	}
 
 	// Set security options.
@@ -110,56 +112,54 @@ func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchma
 	if port == 0 {
 		port = serverPort
 	}
+	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
+	if err != nil {
+		grpclog.Fatalf("Failed to listen: %v", err)
+	}
+	addr := lis.Addr().String()
 
 	// Create different benchmark server according to config.
-	var (
-		addr      string
-		closeFunc func()
-		err       error
-	)
+	var closeFunc func()
 	if config.PayloadConfig != nil {
 		switch payload := config.PayloadConfig.Payload.(type) {
 		case *testpb.PayloadConfig_BytebufParams:
 			opts = append(opts, grpc.CustomCodec(byteBufCodec{}))
-			addr, closeFunc = benchmark.StartServer(benchmark.ServerInfo{
-				Addr:     ":" + strconv.Itoa(port),
+			closeFunc = benchmark.StartServer(benchmark.ServerInfo{
 				Type:     "bytebuf",
 				Metadata: payload.BytebufParams.RespSize,
+				Listener: lis,
 			}, opts...)
 		case *testpb.PayloadConfig_SimpleParams:
-			addr, closeFunc = benchmark.StartServer(benchmark.ServerInfo{
-				Addr: ":" + strconv.Itoa(port),
-				Type: "protobuf",
+			closeFunc = benchmark.StartServer(benchmark.ServerInfo{
+				Type:     "protobuf",
+				Listener: lis,
 			}, opts...)
 		case *testpb.PayloadConfig_ComplexParams:
 			return nil, status.Errorf(codes.Unimplemented, "unsupported payload config: %v", config.PayloadConfig)
 		default:
-			return nil, status.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
+			return nil, status.Errorf(codes.InvalidArgument, "unknown payload config: %v", config.PayloadConfig)
 		}
 	} else {
 		// Start protobuf server if payload config is nil.
-		addr, closeFunc = benchmark.StartServer(benchmark.ServerInfo{
-			Addr: ":" + strconv.Itoa(port),
-			Type: "protobuf",
+		closeFunc = benchmark.StartServer(benchmark.ServerInfo{
+			Type:     "protobuf",
+			Listener: lis,
 		}, opts...)
 	}
 
-	grpclog.Printf("benchmark server listening at %v", addr)
+	grpclog.Infof("benchmark server listening at %v", addr)
 	addrSplitted := strings.Split(addr, ":")
 	p, err := strconv.Atoi(addrSplitted[len(addrSplitted)-1])
 	if err != nil {
 		grpclog.Fatalf("failed to get port number from server address: %v", err)
 	}
 
-	rusage := new(syscall.Rusage)
-	syscall.Getrusage(syscall.RUSAGE_SELF, rusage)
-
 	return &benchmarkServer{
 		port:            p,
 		cores:           numOfCores,
 		closeFunc:       closeFunc,
 		lastResetTime:   time.Now(),
-		rusageLastReset: rusage,
+		rusageLastReset: syscall.GetRusage(),
 	}, nil
 }
 
@@ -169,9 +169,8 @@ func (bs *benchmarkServer) getStats(reset bool) *testpb.ServerStats {
 	bs.mu.RLock()
 	defer bs.mu.RUnlock()
 	wallTimeElapsed := time.Since(bs.lastResetTime).Seconds()
-	rusageLatest := new(syscall.Rusage)
-	syscall.Getrusage(syscall.RUSAGE_SELF, rusageLatest)
-	uTimeElapsed, sTimeElapsed := cpuTimeDiff(bs.rusageLastReset, rusageLatest)
+	rusageLatest := syscall.GetRusage()
+	uTimeElapsed, sTimeElapsed := syscall.CPUTimeDiff(bs.rusageLastReset, rusageLatest)
 
 	if reset {
 		bs.lastResetTime = time.Now()
diff --git a/vendor/google.golang.org/grpc/benchmark/worker/main.go b/vendor/google.golang.org/grpc/benchmark/worker/main.go
index 246d452a..3d2fd617 100644
--- a/vendor/google.golang.org/grpc/benchmark/worker/main.go
+++ b/vendor/google.golang.org/grpc/benchmark/worker/main.go
@@ -79,7 +79,7 @@ func (s *workerServer) RunServer(stream testpb.WorkerService_RunServerServer) er
 	var bs *benchmarkServer
 	defer func() {
 		// Close benchmark server when stream ends.
-		grpclog.Printf("closing benchmark server")
+		grpclog.Infof("closing benchmark server")
 		if bs != nil {
 			bs.closeFunc()
 		}
@@ -96,9 +96,9 @@ func (s *workerServer) RunServer(stream testpb.WorkerService_RunServerServer) er
 		var out *testpb.ServerStatus
 		switch argtype := in.Argtype.(type) {
 		case *testpb.ServerArgs_Setup:
-			grpclog.Printf("server setup received:")
+			grpclog.Infof("server setup received:")
 			if bs != nil {
-				grpclog.Printf("server setup received when server already exists, closing the existing server")
+				grpclog.Infof("server setup received when server already exists, closing the existing server")
 				bs.closeFunc()
 			}
 			bs, err = startBenchmarkServer(argtype.Setup, s.serverPort)
@@ -112,8 +112,8 @@ func (s *workerServer) RunServer(stream testpb.WorkerService_RunServerServer) er
 			}
 
 		case *testpb.ServerArgs_Mark:
-			grpclog.Printf("server mark received:")
-			grpclog.Printf(" - %v", argtype)
+			grpclog.Infof("server mark received:")
+			grpclog.Infof(" - %v", argtype)
 			if bs == nil {
 				return status.Error(codes.InvalidArgument, "server does not exist when mark received")
 			}
@@ -134,7 +134,7 @@ func (s *workerServer) RunClient(stream testpb.WorkerService_RunClientServer) er
 	var bc *benchmarkClient
 	defer func() {
 		// Shut down benchmark client when stream ends.
-		grpclog.Printf("shuting down benchmark client")
+		grpclog.Infof("shuting down benchmark client")
 		if bc != nil {
 			bc.shutdown()
 		}
@@ -151,9 +151,9 @@ func (s *workerServer) RunClient(stream testpb.WorkerService_RunClientServer) er
 		var out *testpb.ClientStatus
 		switch t := in.Argtype.(type) {
 		case *testpb.ClientArgs_Setup:
-			grpclog.Printf("client setup received:")
+			grpclog.Infof("client setup received:")
 			if bc != nil {
-				grpclog.Printf("client setup received when client already exists, shuting down the existing client")
+				grpclog.Infof("client setup received when client already exists, shuting down the existing client")
 				bc.shutdown()
 			}
 			bc, err = startBenchmarkClient(t.Setup)
@@ -165,8 +165,8 @@ func (s *workerServer) RunClient(stream testpb.WorkerService_RunClientServer) er
 			}
 
 		case *testpb.ClientArgs_Mark:
-			grpclog.Printf("client mark received:")
-			grpclog.Printf(" - %v", t)
+			grpclog.Infof("client mark received:")
+			grpclog.Infof(" - %v", t)
 			if bc == nil {
 				return status.Error(codes.InvalidArgument, "client does not exist when mark received")
 			}
@@ -182,12 +182,12 @@ func (s *workerServer) RunClient(stream testpb.WorkerService_RunClientServer) er
 }
 
 func (s *workerServer) CoreCount(ctx context.Context, in *testpb.CoreRequest) (*testpb.CoreResponse, error) {
-	grpclog.Printf("core count: %v", runtime.NumCPU())
+	grpclog.Infof("core count: %v", runtime.NumCPU())
 	return &testpb.CoreResponse{Cores: int32(runtime.NumCPU())}, nil
 }
 
 func (s *workerServer) QuitWorker(ctx context.Context, in *testpb.Void) (*testpb.Void, error) {
-	grpclog.Printf("quiting worker")
+	grpclog.Infof("quitting worker")
 	s.stop <- true
 	return &testpb.Void{}, nil
 }
@@ -200,7 +200,7 @@ func main() {
 	if err != nil {
 		grpclog.Fatalf("failed to listen: %v", err)
 	}
-	grpclog.Printf("worker listening at port %v", *driverPort)
+	grpclog.Infof("worker listening at port %v", *driverPort)
 
 	s := grpc.NewServer()
 	stop := make(chan bool)
@@ -221,8 +221,8 @@ func main() {
 
 	if *pprofPort >= 0 {
 		go func() {
-			grpclog.Println("Starting pprof server on port " + strconv.Itoa(*pprofPort))
-			grpclog.Println(http.ListenAndServe("localhost:"+strconv.Itoa(*pprofPort), nil))
+			grpclog.Infoln("Starting pprof server on port " + strconv.Itoa(*pprofPort))
+			grpclog.Infoln(http.ListenAndServe("localhost:"+strconv.Itoa(*pprofPort), nil))
 		}()
 	}
 
diff --git a/vendor/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go
index a66e3c2d..180d79d0 100644
--- a/vendor/google.golang.org/grpc/call.go
+++ b/vendor/google.golang.org/grpc/call.go
@@ -27,12 +27,31 @@ import (
 //
 // All errors returned by Invoke are compatible with the status package.
 func (cc *ClientConn) Invoke(ctx context.Context, method string, args, reply interface{}, opts ...CallOption) error {
+	// allow interceptor to see all applicable call options, which means those
+	// configured as defaults from dial option as well as per-call options
+	opts = combine(cc.dopts.callOptions, opts)
+
 	if cc.dopts.unaryInt != nil {
 		return cc.dopts.unaryInt(ctx, method, args, reply, cc, invoke, opts...)
 	}
 	return invoke(ctx, method, args, reply, cc, opts...)
 }
 
+func combine(o1 []CallOption, o2 []CallOption) []CallOption {
+	// we don't use append because o1 could have extra capacity whose
+	// elements would be overwritten, which could cause inadvertent
+	// sharing (and race connditions) between concurrent calls
+	if len(o1) == 0 {
+		return o2
+	} else if len(o2) == 0 {
+		return o1
+	}
+	ret := make([]CallOption, len(o1)+len(o2))
+	copy(ret, o1)
+	copy(ret[len(o1):], o2)
+	return ret
+}
+
 // Invoke sends the RPC request on the wire and returns after response is
 // received.  This is typically called by generated code.
 //
@@ -44,31 +63,12 @@ func Invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 var unaryStreamDesc = &StreamDesc{ServerStreams: false, ClientStreams: false}
 
 func invoke(ctx context.Context, method string, req, reply interface{}, cc *ClientConn, opts ...CallOption) error {
-	// TODO: implement retries in clientStream and make this simply
-	// newClientStream, SendMsg, RecvMsg.
-	firstAttempt := true
-	for {
-		csInt, err := newClientStream(ctx, unaryStreamDesc, cc, method, opts...)
-		if err != nil {
-			return err
-		}
-		cs := csInt.(*clientStream)
-		if err := cs.SendMsg(req); err != nil {
-			if !cs.c.failFast && cs.s.Unprocessed() && firstAttempt {
-				// TODO: Add a field to header for grpc-transparent-retry-attempts
-				firstAttempt = false
-				continue
-			}
-			return err
-		}
-		if err := cs.RecvMsg(reply); err != nil {
-			if !cs.c.failFast && cs.s.Unprocessed() && firstAttempt {
-				// TODO: Add a field to header for grpc-transparent-retry-attempts
-				firstAttempt = false
-				continue
-			}
-			return err
-		}
-		return nil
+	cs, err := newClientStream(ctx, unaryStreamDesc, cc, method, opts...)
+	if err != nil {
+		return err
+	}
+	if err := cs.SendMsg(req); err != nil {
+		return err
 	}
+	return cs.RecvMsg(reply)
 }
diff --git a/vendor/google.golang.org/grpc/call_test.go b/vendor/google.golang.org/grpc/call_test.go
index b95ade88..df936400 100644
--- a/vendor/google.golang.org/grpc/call_test.go
+++ b/vendor/google.golang.org/grpc/call_test.go
@@ -31,9 +31,9 @@ import (
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/internal/leakcheck"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/test/leakcheck"
-	"google.golang.org/grpc/transport"
 )
 
 var (
@@ -105,12 +105,13 @@ func (h *testStreamHandler) handleStream(t *testing.T, s *transport.Stream) {
 		}
 	}
 	// send a response back to end the stream.
-	hdr, data, err := encode(testCodec{}, &expectedResponse, nil, nil, nil)
+	data, err := encode(testCodec{}, &expectedResponse)
 	if err != nil {
 		t.Errorf("Failed to encode the response: %v", err)
 		return
 	}
-	h.t.Write(s, hdr, data, &transport.Options{})
+	hdr, payload := msgHeader(data, nil)
+	h.t.Write(s, hdr, payload, &transport.Options{})
 	h.t.WriteStatus(s, status.New(codes.OK, ""))
 }
 
@@ -217,7 +218,7 @@ func TestInvoke(t *testing.T) {
 	defer leakcheck.Check(t)
 	server, cc := setUp(t, 0, math.MaxUint32)
 	var reply string
-	if err := Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply, cc); err != nil || reply != expectedResponse {
+	if err := cc.Invoke(context.Background(), "/foo/bar", &expectedRequest, &reply); err != nil || reply != expectedResponse {
 		t.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want <nil>", err)
 	}
 	cc.Close()
@@ -229,7 +230,7 @@ func TestInvokeLargeErr(t *testing.T) {
 	server, cc := setUp(t, 0, math.MaxUint32)
 	var reply string
 	req := "hello"
-	err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc)
+	err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply)
 	if _, ok := status.FromError(err); !ok {
 		t.Fatalf("grpc.Invoke(_, _, _, _, _) receives non rpc error.")
 	}
@@ -246,7 +247,7 @@ func TestInvokeErrorSpecialChars(t *testing.T) {
 	server, cc := setUp(t, 0, math.MaxUint32)
 	var reply string
 	req := "weird error"
-	err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc)
+	err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply)
 	if _, ok := status.FromError(err); !ok {
 		t.Fatalf("grpc.Invoke(_, _, _, _, _) receives non rpc error.")
 	}
@@ -266,7 +267,7 @@ func TestInvokeCancel(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
-		Invoke(ctx, "/foo/bar", &req, &reply, cc)
+		cc.Invoke(ctx, "/foo/bar", &req, &reply)
 	}
 	if canceled != 0 {
 		t.Fatalf("received %d of 100 canceled requests", canceled)
@@ -285,7 +286,7 @@ func TestInvokeCancelClosedNonFailFast(t *testing.T) {
 	req := "hello"
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel()
-	if err := Invoke(ctx, "/foo/bar", &req, &reply, cc, FailFast(false)); err == nil {
+	if err := cc.Invoke(ctx, "/foo/bar", &req, &reply, FailFast(false)); err == nil {
 		t.Fatalf("canceled invoke on closed connection should fail")
 	}
 	server.stop()
diff --git a/vendor/google.golang.org/grpc/channelz/grpc_channelz_v1/channelz.pb.go b/vendor/google.golang.org/grpc/channelz/grpc_channelz_v1/channelz.pb.go
new file mode 100644
index 00000000..72558c90
--- /dev/null
+++ b/vendor/google.golang.org/grpc/channelz/grpc_channelz_v1/channelz.pb.go
@@ -0,0 +1,3267 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: grpc/channelz/v1/channelz.proto
+
+package grpc_channelz_v1 // import "google.golang.org/grpc/channelz/grpc_channelz_v1"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import any "github.com/golang/protobuf/ptypes/any"
+import duration "github.com/golang/protobuf/ptypes/duration"
+import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import wrappers "github.com/golang/protobuf/ptypes/wrappers"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type ChannelConnectivityState_State int32
+
+const (
+	ChannelConnectivityState_UNKNOWN           ChannelConnectivityState_State = 0
+	ChannelConnectivityState_IDLE              ChannelConnectivityState_State = 1
+	ChannelConnectivityState_CONNECTING        ChannelConnectivityState_State = 2
+	ChannelConnectivityState_READY             ChannelConnectivityState_State = 3
+	ChannelConnectivityState_TRANSIENT_FAILURE ChannelConnectivityState_State = 4
+	ChannelConnectivityState_SHUTDOWN          ChannelConnectivityState_State = 5
+)
+
+var ChannelConnectivityState_State_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "IDLE",
+	2: "CONNECTING",
+	3: "READY",
+	4: "TRANSIENT_FAILURE",
+	5: "SHUTDOWN",
+}
+var ChannelConnectivityState_State_value = map[string]int32{
+	"UNKNOWN":           0,
+	"IDLE":              1,
+	"CONNECTING":        2,
+	"READY":             3,
+	"TRANSIENT_FAILURE": 4,
+	"SHUTDOWN":          5,
+}
+
+func (x ChannelConnectivityState_State) String() string {
+	return proto.EnumName(ChannelConnectivityState_State_name, int32(x))
+}
+func (ChannelConnectivityState_State) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{2, 0}
+}
+
+// The supported severity levels of trace events.
+type ChannelTraceEvent_Severity int32
+
+const (
+	ChannelTraceEvent_CT_UNKNOWN ChannelTraceEvent_Severity = 0
+	ChannelTraceEvent_CT_INFO    ChannelTraceEvent_Severity = 1
+	ChannelTraceEvent_CT_WARNING ChannelTraceEvent_Severity = 2
+	ChannelTraceEvent_CT_ERROR   ChannelTraceEvent_Severity = 3
+)
+
+var ChannelTraceEvent_Severity_name = map[int32]string{
+	0: "CT_UNKNOWN",
+	1: "CT_INFO",
+	2: "CT_WARNING",
+	3: "CT_ERROR",
+}
+var ChannelTraceEvent_Severity_value = map[string]int32{
+	"CT_UNKNOWN": 0,
+	"CT_INFO":    1,
+	"CT_WARNING": 2,
+	"CT_ERROR":   3,
+}
+
+func (x ChannelTraceEvent_Severity) String() string {
+	return proto.EnumName(ChannelTraceEvent_Severity_name, int32(x))
+}
+func (ChannelTraceEvent_Severity) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{4, 0}
+}
+
+// Channel is a logical grouping of channels, subchannels, and sockets.
+type Channel struct {
+	// The identifier for this channel. This should bet set.
+	Ref *ChannelRef `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
+	// Data specific to this channel.
+	Data *ChannelData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	// There are no ordering guarantees on the order of channel refs.
+	// There may not be cycles in the ref graph.
+	// A channel ref may be present in more than one channel or subchannel.
+	ChannelRef []*ChannelRef `protobuf:"bytes,3,rep,name=channel_ref,json=channelRef,proto3" json:"channel_ref,omitempty"`
+	// At most one of 'channel_ref+subchannel_ref' and 'socket' is set.
+	// There are no ordering guarantees on the order of subchannel refs.
+	// There may not be cycles in the ref graph.
+	// A sub channel ref may be present in more than one channel or subchannel.
+	SubchannelRef []*SubchannelRef `protobuf:"bytes,4,rep,name=subchannel_ref,json=subchannelRef,proto3" json:"subchannel_ref,omitempty"`
+	// There are no ordering guarantees on the order of sockets.
+	SocketRef            []*SocketRef `protobuf:"bytes,5,rep,name=socket_ref,json=socketRef,proto3" json:"socket_ref,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Channel) Reset()         { *m = Channel{} }
+func (m *Channel) String() string { return proto.CompactTextString(m) }
+func (*Channel) ProtoMessage()    {}
+func (*Channel) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{0}
+}
+func (m *Channel) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Channel.Unmarshal(m, b)
+}
+func (m *Channel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Channel.Marshal(b, m, deterministic)
+}
+func (dst *Channel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Channel.Merge(dst, src)
+}
+func (m *Channel) XXX_Size() int {
+	return xxx_messageInfo_Channel.Size(m)
+}
+func (m *Channel) XXX_DiscardUnknown() {
+	xxx_messageInfo_Channel.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Channel proto.InternalMessageInfo
+
+func (m *Channel) GetRef() *ChannelRef {
+	if m != nil {
+		return m.Ref
+	}
+	return nil
+}
+
+func (m *Channel) GetData() *ChannelData {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *Channel) GetChannelRef() []*ChannelRef {
+	if m != nil {
+		return m.ChannelRef
+	}
+	return nil
+}
+
+func (m *Channel) GetSubchannelRef() []*SubchannelRef {
+	if m != nil {
+		return m.SubchannelRef
+	}
+	return nil
+}
+
+func (m *Channel) GetSocketRef() []*SocketRef {
+	if m != nil {
+		return m.SocketRef
+	}
+	return nil
+}
+
+// Subchannel is a logical grouping of channels, subchannels, and sockets.
+// A subchannel is load balanced over by it's ancestor
+type Subchannel struct {
+	// The identifier for this channel.
+	Ref *SubchannelRef `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
+	// Data specific to this channel.
+	Data *ChannelData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	// There are no ordering guarantees on the order of channel refs.
+	// There may not be cycles in the ref graph.
+	// A channel ref may be present in more than one channel or subchannel.
+	ChannelRef []*ChannelRef `protobuf:"bytes,3,rep,name=channel_ref,json=channelRef,proto3" json:"channel_ref,omitempty"`
+	// At most one of 'channel_ref+subchannel_ref' and 'socket' is set.
+	// There are no ordering guarantees on the order of subchannel refs.
+	// There may not be cycles in the ref graph.
+	// A sub channel ref may be present in more than one channel or subchannel.
+	SubchannelRef []*SubchannelRef `protobuf:"bytes,4,rep,name=subchannel_ref,json=subchannelRef,proto3" json:"subchannel_ref,omitempty"`
+	// There are no ordering guarantees on the order of sockets.
+	SocketRef            []*SocketRef `protobuf:"bytes,5,rep,name=socket_ref,json=socketRef,proto3" json:"socket_ref,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Subchannel) Reset()         { *m = Subchannel{} }
+func (m *Subchannel) String() string { return proto.CompactTextString(m) }
+func (*Subchannel) ProtoMessage()    {}
+func (*Subchannel) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{1}
+}
+func (m *Subchannel) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Subchannel.Unmarshal(m, b)
+}
+func (m *Subchannel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Subchannel.Marshal(b, m, deterministic)
+}
+func (dst *Subchannel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Subchannel.Merge(dst, src)
+}
+func (m *Subchannel) XXX_Size() int {
+	return xxx_messageInfo_Subchannel.Size(m)
+}
+func (m *Subchannel) XXX_DiscardUnknown() {
+	xxx_messageInfo_Subchannel.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Subchannel proto.InternalMessageInfo
+
+func (m *Subchannel) GetRef() *SubchannelRef {
+	if m != nil {
+		return m.Ref
+	}
+	return nil
+}
+
+func (m *Subchannel) GetData() *ChannelData {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *Subchannel) GetChannelRef() []*ChannelRef {
+	if m != nil {
+		return m.ChannelRef
+	}
+	return nil
+}
+
+func (m *Subchannel) GetSubchannelRef() []*SubchannelRef {
+	if m != nil {
+		return m.SubchannelRef
+	}
+	return nil
+}
+
+func (m *Subchannel) GetSocketRef() []*SocketRef {
+	if m != nil {
+		return m.SocketRef
+	}
+	return nil
+}
+
+// These come from the specified states in this document:
+// https://github.com/grpc/grpc/blob/master/doc/connectivity-semantics-and-api.md
+type ChannelConnectivityState struct {
+	State                ChannelConnectivityState_State `protobuf:"varint,1,opt,name=state,proto3,enum=grpc.channelz.v1.ChannelConnectivityState_State" json:"state,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_sizecache        int32                          `json:"-"`
+}
+
+func (m *ChannelConnectivityState) Reset()         { *m = ChannelConnectivityState{} }
+func (m *ChannelConnectivityState) String() string { return proto.CompactTextString(m) }
+func (*ChannelConnectivityState) ProtoMessage()    {}
+func (*ChannelConnectivityState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{2}
+}
+func (m *ChannelConnectivityState) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ChannelConnectivityState.Unmarshal(m, b)
+}
+func (m *ChannelConnectivityState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ChannelConnectivityState.Marshal(b, m, deterministic)
+}
+func (dst *ChannelConnectivityState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChannelConnectivityState.Merge(dst, src)
+}
+func (m *ChannelConnectivityState) XXX_Size() int {
+	return xxx_messageInfo_ChannelConnectivityState.Size(m)
+}
+func (m *ChannelConnectivityState) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChannelConnectivityState.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ChannelConnectivityState proto.InternalMessageInfo
+
+func (m *ChannelConnectivityState) GetState() ChannelConnectivityState_State {
+	if m != nil {
+		return m.State
+	}
+	return ChannelConnectivityState_UNKNOWN
+}
+
+// Channel data is data related to a specific Channel or Subchannel.
+type ChannelData struct {
+	// The connectivity state of the channel or subchannel.  Implementations
+	// should always set this.
+	State *ChannelConnectivityState `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"`
+	// The target this channel originally tried to connect to.  May be absent
+	Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"`
+	// A trace of recent events on the channel.  May be absent.
+	Trace *ChannelTrace `protobuf:"bytes,3,opt,name=trace,proto3" json:"trace,omitempty"`
+	// The number of calls started on the channel
+	CallsStarted int64 `protobuf:"varint,4,opt,name=calls_started,json=callsStarted,proto3" json:"calls_started,omitempty"`
+	// The number of calls that have completed with an OK status
+	CallsSucceeded int64 `protobuf:"varint,5,opt,name=calls_succeeded,json=callsSucceeded,proto3" json:"calls_succeeded,omitempty"`
+	// The number of calls that have completed with a non-OK status
+	CallsFailed int64 `protobuf:"varint,6,opt,name=calls_failed,json=callsFailed,proto3" json:"calls_failed,omitempty"`
+	// The last time a call was started on the channel.
+	LastCallStartedTimestamp *timestamp.Timestamp `protobuf:"bytes,7,opt,name=last_call_started_timestamp,json=lastCallStartedTimestamp,proto3" json:"last_call_started_timestamp,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{}             `json:"-"`
+	XXX_unrecognized         []byte               `json:"-"`
+	XXX_sizecache            int32                `json:"-"`
+}
+
+func (m *ChannelData) Reset()         { *m = ChannelData{} }
+func (m *ChannelData) String() string { return proto.CompactTextString(m) }
+func (*ChannelData) ProtoMessage()    {}
+func (*ChannelData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{3}
+}
+func (m *ChannelData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ChannelData.Unmarshal(m, b)
+}
+func (m *ChannelData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ChannelData.Marshal(b, m, deterministic)
+}
+func (dst *ChannelData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChannelData.Merge(dst, src)
+}
+func (m *ChannelData) XXX_Size() int {
+	return xxx_messageInfo_ChannelData.Size(m)
+}
+func (m *ChannelData) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChannelData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ChannelData proto.InternalMessageInfo
+
+func (m *ChannelData) GetState() *ChannelConnectivityState {
+	if m != nil {
+		return m.State
+	}
+	return nil
+}
+
+func (m *ChannelData) GetTarget() string {
+	if m != nil {
+		return m.Target
+	}
+	return ""
+}
+
+func (m *ChannelData) GetTrace() *ChannelTrace {
+	if m != nil {
+		return m.Trace
+	}
+	return nil
+}
+
+func (m *ChannelData) GetCallsStarted() int64 {
+	if m != nil {
+		return m.CallsStarted
+	}
+	return 0
+}
+
+func (m *ChannelData) GetCallsSucceeded() int64 {
+	if m != nil {
+		return m.CallsSucceeded
+	}
+	return 0
+}
+
+func (m *ChannelData) GetCallsFailed() int64 {
+	if m != nil {
+		return m.CallsFailed
+	}
+	return 0
+}
+
+func (m *ChannelData) GetLastCallStartedTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.LastCallStartedTimestamp
+	}
+	return nil
+}
+
+// A trace event is an interesting thing that happened to a channel or
+// subchannel, such as creation, address resolution, subchannel creation, etc.
+type ChannelTraceEvent struct {
+	// High level description of the event.
+	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
+	// the severity of the trace event
+	Severity ChannelTraceEvent_Severity `protobuf:"varint,2,opt,name=severity,proto3,enum=grpc.channelz.v1.ChannelTraceEvent_Severity" json:"severity,omitempty"`
+	// When this event occurred.
+	Timestamp *timestamp.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	// ref of referenced channel or subchannel.
+	// Optional, only present if this event refers to a child object. For example,
+	// this field would be filled if this trace event was for a subchannel being
+	// created.
+	//
+	// Types that are valid to be assigned to ChildRef:
+	//	*ChannelTraceEvent_ChannelRef
+	//	*ChannelTraceEvent_SubchannelRef
+	ChildRef             isChannelTraceEvent_ChildRef `protobuf_oneof:"child_ref"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *ChannelTraceEvent) Reset()         { *m = ChannelTraceEvent{} }
+func (m *ChannelTraceEvent) String() string { return proto.CompactTextString(m) }
+func (*ChannelTraceEvent) ProtoMessage()    {}
+func (*ChannelTraceEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{4}
+}
+func (m *ChannelTraceEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ChannelTraceEvent.Unmarshal(m, b)
+}
+func (m *ChannelTraceEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ChannelTraceEvent.Marshal(b, m, deterministic)
+}
+func (dst *ChannelTraceEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChannelTraceEvent.Merge(dst, src)
+}
+func (m *ChannelTraceEvent) XXX_Size() int {
+	return xxx_messageInfo_ChannelTraceEvent.Size(m)
+}
+func (m *ChannelTraceEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChannelTraceEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ChannelTraceEvent proto.InternalMessageInfo
+
+func (m *ChannelTraceEvent) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
+func (m *ChannelTraceEvent) GetSeverity() ChannelTraceEvent_Severity {
+	if m != nil {
+		return m.Severity
+	}
+	return ChannelTraceEvent_CT_UNKNOWN
+}
+
+func (m *ChannelTraceEvent) GetTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.Timestamp
+	}
+	return nil
+}
+
+type isChannelTraceEvent_ChildRef interface {
+	isChannelTraceEvent_ChildRef()
+}
+
+type ChannelTraceEvent_ChannelRef struct {
+	ChannelRef *ChannelRef `protobuf:"bytes,4,opt,name=channel_ref,json=channelRef,proto3,oneof"`
+}
+
+type ChannelTraceEvent_SubchannelRef struct {
+	SubchannelRef *SubchannelRef `protobuf:"bytes,5,opt,name=subchannel_ref,json=subchannelRef,proto3,oneof"`
+}
+
+func (*ChannelTraceEvent_ChannelRef) isChannelTraceEvent_ChildRef() {}
+
+func (*ChannelTraceEvent_SubchannelRef) isChannelTraceEvent_ChildRef() {}
+
+func (m *ChannelTraceEvent) GetChildRef() isChannelTraceEvent_ChildRef {
+	if m != nil {
+		return m.ChildRef
+	}
+	return nil
+}
+
+func (m *ChannelTraceEvent) GetChannelRef() *ChannelRef {
+	if x, ok := m.GetChildRef().(*ChannelTraceEvent_ChannelRef); ok {
+		return x.ChannelRef
+	}
+	return nil
+}
+
+func (m *ChannelTraceEvent) GetSubchannelRef() *SubchannelRef {
+	if x, ok := m.GetChildRef().(*ChannelTraceEvent_SubchannelRef); ok {
+		return x.SubchannelRef
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ChannelTraceEvent) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ChannelTraceEvent_OneofMarshaler, _ChannelTraceEvent_OneofUnmarshaler, _ChannelTraceEvent_OneofSizer, []interface{}{
+		(*ChannelTraceEvent_ChannelRef)(nil),
+		(*ChannelTraceEvent_SubchannelRef)(nil),
+	}
+}
+
+func _ChannelTraceEvent_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ChannelTraceEvent)
+	// child_ref
+	switch x := m.ChildRef.(type) {
+	case *ChannelTraceEvent_ChannelRef:
+		b.EncodeVarint(4<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ChannelRef); err != nil {
+			return err
+		}
+	case *ChannelTraceEvent_SubchannelRef:
+		b.EncodeVarint(5<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.SubchannelRef); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("ChannelTraceEvent.ChildRef has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ChannelTraceEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ChannelTraceEvent)
+	switch tag {
+	case 4: // child_ref.channel_ref
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ChannelRef)
+		err := b.DecodeMessage(msg)
+		m.ChildRef = &ChannelTraceEvent_ChannelRef{msg}
+		return true, err
+	case 5: // child_ref.subchannel_ref
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(SubchannelRef)
+		err := b.DecodeMessage(msg)
+		m.ChildRef = &ChannelTraceEvent_SubchannelRef{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ChannelTraceEvent_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ChannelTraceEvent)
+	// child_ref
+	switch x := m.ChildRef.(type) {
+	case *ChannelTraceEvent_ChannelRef:
+		s := proto.Size(x.ChannelRef)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ChannelTraceEvent_SubchannelRef:
+		s := proto.Size(x.SubchannelRef)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+// ChannelTrace represents the recent events that have occurred on the channel.
+type ChannelTrace struct {
+	// Number of events ever logged in this tracing object. This can differ from
+	// events.size() because events can be overwritten or garbage collected by
+	// implementations.
+	NumEventsLogged int64 `protobuf:"varint,1,opt,name=num_events_logged,json=numEventsLogged,proto3" json:"num_events_logged,omitempty"`
+	// Time that this channel was created.
+	CreationTimestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=creation_timestamp,json=creationTimestamp,proto3" json:"creation_timestamp,omitempty"`
+	// List of events that have occurred on this channel.
+	Events               []*ChannelTraceEvent `protobuf:"bytes,3,rep,name=events,proto3" json:"events,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *ChannelTrace) Reset()         { *m = ChannelTrace{} }
+func (m *ChannelTrace) String() string { return proto.CompactTextString(m) }
+func (*ChannelTrace) ProtoMessage()    {}
+func (*ChannelTrace) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{5}
+}
+func (m *ChannelTrace) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ChannelTrace.Unmarshal(m, b)
+}
+func (m *ChannelTrace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ChannelTrace.Marshal(b, m, deterministic)
+}
+func (dst *ChannelTrace) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChannelTrace.Merge(dst, src)
+}
+func (m *ChannelTrace) XXX_Size() int {
+	return xxx_messageInfo_ChannelTrace.Size(m)
+}
+func (m *ChannelTrace) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChannelTrace.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ChannelTrace proto.InternalMessageInfo
+
+func (m *ChannelTrace) GetNumEventsLogged() int64 {
+	if m != nil {
+		return m.NumEventsLogged
+	}
+	return 0
+}
+
+func (m *ChannelTrace) GetCreationTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.CreationTimestamp
+	}
+	return nil
+}
+
+func (m *ChannelTrace) GetEvents() []*ChannelTraceEvent {
+	if m != nil {
+		return m.Events
+	}
+	return nil
+}
+
+// ChannelRef is a reference to a Channel.
+type ChannelRef struct {
+	// The globally unique id for this channel.  Must be a positive number.
+	ChannelId int64 `protobuf:"varint,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	// An optional name associated with the channel.
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ChannelRef) Reset()         { *m = ChannelRef{} }
+func (m *ChannelRef) String() string { return proto.CompactTextString(m) }
+func (*ChannelRef) ProtoMessage()    {}
+func (*ChannelRef) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{6}
+}
+func (m *ChannelRef) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ChannelRef.Unmarshal(m, b)
+}
+func (m *ChannelRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ChannelRef.Marshal(b, m, deterministic)
+}
+func (dst *ChannelRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChannelRef.Merge(dst, src)
+}
+func (m *ChannelRef) XXX_Size() int {
+	return xxx_messageInfo_ChannelRef.Size(m)
+}
+func (m *ChannelRef) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChannelRef.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ChannelRef proto.InternalMessageInfo
+
+func (m *ChannelRef) GetChannelId() int64 {
+	if m != nil {
+		return m.ChannelId
+	}
+	return 0
+}
+
+func (m *ChannelRef) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// ChannelRef is a reference to a Subchannel.
+type SubchannelRef struct {
+	// The globally unique id for this subchannel.  Must be a positive number.
+	SubchannelId int64 `protobuf:"varint,7,opt,name=subchannel_id,json=subchannelId,proto3" json:"subchannel_id,omitempty"`
+	// An optional name associated with the subchannel.
+	Name                 string   `protobuf:"bytes,8,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SubchannelRef) Reset()         { *m = SubchannelRef{} }
+func (m *SubchannelRef) String() string { return proto.CompactTextString(m) }
+func (*SubchannelRef) ProtoMessage()    {}
+func (*SubchannelRef) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{7}
+}
+func (m *SubchannelRef) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SubchannelRef.Unmarshal(m, b)
+}
+func (m *SubchannelRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SubchannelRef.Marshal(b, m, deterministic)
+}
+func (dst *SubchannelRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubchannelRef.Merge(dst, src)
+}
+func (m *SubchannelRef) XXX_Size() int {
+	return xxx_messageInfo_SubchannelRef.Size(m)
+}
+func (m *SubchannelRef) XXX_DiscardUnknown() {
+	xxx_messageInfo_SubchannelRef.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SubchannelRef proto.InternalMessageInfo
+
+func (m *SubchannelRef) GetSubchannelId() int64 {
+	if m != nil {
+		return m.SubchannelId
+	}
+	return 0
+}
+
+func (m *SubchannelRef) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// SocketRef is a reference to a Socket.
+type SocketRef struct {
+	SocketId int64 `protobuf:"varint,3,opt,name=socket_id,json=socketId,proto3" json:"socket_id,omitempty"`
+	// An optional name associated with the socket.
+	Name                 string   `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SocketRef) Reset()         { *m = SocketRef{} }
+func (m *SocketRef) String() string { return proto.CompactTextString(m) }
+func (*SocketRef) ProtoMessage()    {}
+func (*SocketRef) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{8}
+}
+func (m *SocketRef) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SocketRef.Unmarshal(m, b)
+}
+func (m *SocketRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SocketRef.Marshal(b, m, deterministic)
+}
+func (dst *SocketRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SocketRef.Merge(dst, src)
+}
+func (m *SocketRef) XXX_Size() int {
+	return xxx_messageInfo_SocketRef.Size(m)
+}
+func (m *SocketRef) XXX_DiscardUnknown() {
+	xxx_messageInfo_SocketRef.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SocketRef proto.InternalMessageInfo
+
+func (m *SocketRef) GetSocketId() int64 {
+	if m != nil {
+		return m.SocketId
+	}
+	return 0
+}
+
+func (m *SocketRef) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// ServerRef is a reference to a Server.
+type ServerRef struct {
+	// A globally unique identifier for this server.  Must be a positive number.
+	ServerId int64 `protobuf:"varint,5,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
+	// An optional name associated with the server.
+	Name                 string   `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ServerRef) Reset()         { *m = ServerRef{} }
+func (m *ServerRef) String() string { return proto.CompactTextString(m) }
+func (*ServerRef) ProtoMessage()    {}
+func (*ServerRef) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{9}
+}
+func (m *ServerRef) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerRef.Unmarshal(m, b)
+}
+func (m *ServerRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerRef.Marshal(b, m, deterministic)
+}
+func (dst *ServerRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerRef.Merge(dst, src)
+}
+func (m *ServerRef) XXX_Size() int {
+	return xxx_messageInfo_ServerRef.Size(m)
+}
+func (m *ServerRef) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerRef.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerRef proto.InternalMessageInfo
+
+func (m *ServerRef) GetServerId() int64 {
+	if m != nil {
+		return m.ServerId
+	}
+	return 0
+}
+
+func (m *ServerRef) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+// Server represents a single server.  There may be multiple servers in a single
+// program.
+type Server struct {
+	// The identifier for a Server.  This should be set.
+	Ref *ServerRef `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
+	// The associated data of the Server.
+	Data *ServerData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	// The sockets that the server is listening on.  There are no ordering
+	// guarantees.  This may be absent.
+	ListenSocket         []*SocketRef `protobuf:"bytes,3,rep,name=listen_socket,json=listenSocket,proto3" json:"listen_socket,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *Server) Reset()         { *m = Server{} }
+func (m *Server) String() string { return proto.CompactTextString(m) }
+func (*Server) ProtoMessage()    {}
+func (*Server) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{10}
+}
+func (m *Server) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Server.Unmarshal(m, b)
+}
+func (m *Server) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Server.Marshal(b, m, deterministic)
+}
+func (dst *Server) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Server.Merge(dst, src)
+}
+func (m *Server) XXX_Size() int {
+	return xxx_messageInfo_Server.Size(m)
+}
+func (m *Server) XXX_DiscardUnknown() {
+	xxx_messageInfo_Server.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Server proto.InternalMessageInfo
+
+func (m *Server) GetRef() *ServerRef {
+	if m != nil {
+		return m.Ref
+	}
+	return nil
+}
+
+func (m *Server) GetData() *ServerData {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *Server) GetListenSocket() []*SocketRef {
+	if m != nil {
+		return m.ListenSocket
+	}
+	return nil
+}
+
+// ServerData is data for a specific Server.
+type ServerData struct {
+	// A trace of recent events on the server.  May be absent.
+	Trace *ChannelTrace `protobuf:"bytes,1,opt,name=trace,proto3" json:"trace,omitempty"`
+	// The number of incoming calls started on the server
+	CallsStarted int64 `protobuf:"varint,2,opt,name=calls_started,json=callsStarted,proto3" json:"calls_started,omitempty"`
+	// The number of incoming calls that have completed with an OK status
+	CallsSucceeded int64 `protobuf:"varint,3,opt,name=calls_succeeded,json=callsSucceeded,proto3" json:"calls_succeeded,omitempty"`
+	// The number of incoming calls that have a completed with a non-OK status
+	CallsFailed int64 `protobuf:"varint,4,opt,name=calls_failed,json=callsFailed,proto3" json:"calls_failed,omitempty"`
+	// The last time a call was started on the server.
+	LastCallStartedTimestamp *timestamp.Timestamp `protobuf:"bytes,5,opt,name=last_call_started_timestamp,json=lastCallStartedTimestamp,proto3" json:"last_call_started_timestamp,omitempty"`
+	XXX_NoUnkeyedLiteral     struct{}             `json:"-"`
+	XXX_unrecognized         []byte               `json:"-"`
+	XXX_sizecache            int32                `json:"-"`
+}
+
+func (m *ServerData) Reset()         { *m = ServerData{} }
+func (m *ServerData) String() string { return proto.CompactTextString(m) }
+func (*ServerData) ProtoMessage()    {}
+func (*ServerData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{11}
+}
+func (m *ServerData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerData.Unmarshal(m, b)
+}
+func (m *ServerData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerData.Marshal(b, m, deterministic)
+}
+func (dst *ServerData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerData.Merge(dst, src)
+}
+func (m *ServerData) XXX_Size() int {
+	return xxx_messageInfo_ServerData.Size(m)
+}
+func (m *ServerData) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerData proto.InternalMessageInfo
+
+func (m *ServerData) GetTrace() *ChannelTrace {
+	if m != nil {
+		return m.Trace
+	}
+	return nil
+}
+
+func (m *ServerData) GetCallsStarted() int64 {
+	if m != nil {
+		return m.CallsStarted
+	}
+	return 0
+}
+
+func (m *ServerData) GetCallsSucceeded() int64 {
+	if m != nil {
+		return m.CallsSucceeded
+	}
+	return 0
+}
+
+func (m *ServerData) GetCallsFailed() int64 {
+	if m != nil {
+		return m.CallsFailed
+	}
+	return 0
+}
+
+func (m *ServerData) GetLastCallStartedTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.LastCallStartedTimestamp
+	}
+	return nil
+}
+
+// Information about an actual connection.  Pronounced "sock-ay".
+type Socket struct {
+	// The identifier for the Socket.
+	Ref *SocketRef `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
+	// Data specific to this Socket.
+	Data *SocketData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	// The locally bound address.
+	Local *Address `protobuf:"bytes,3,opt,name=local,proto3" json:"local,omitempty"`
+	// The remote bound address.  May be absent.
+	Remote *Address `protobuf:"bytes,4,opt,name=remote,proto3" json:"remote,omitempty"`
+	// Security details for this socket.  May be absent if not available, or
+	// there is no security on the socket.
+	Security *Security `protobuf:"bytes,5,opt,name=security,proto3" json:"security,omitempty"`
+	// Optional, represents the name of the remote endpoint, if different than
+	// the original target name.
+	RemoteName           string   `protobuf:"bytes,6,opt,name=remote_name,json=remoteName,proto3" json:"remote_name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Socket) Reset()         { *m = Socket{} }
+func (m *Socket) String() string { return proto.CompactTextString(m) }
+func (*Socket) ProtoMessage()    {}
+func (*Socket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{12}
+}
+func (m *Socket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Socket.Unmarshal(m, b)
+}
+func (m *Socket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Socket.Marshal(b, m, deterministic)
+}
+func (dst *Socket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Socket.Merge(dst, src)
+}
+func (m *Socket) XXX_Size() int {
+	return xxx_messageInfo_Socket.Size(m)
+}
+func (m *Socket) XXX_DiscardUnknown() {
+	xxx_messageInfo_Socket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Socket proto.InternalMessageInfo
+
+func (m *Socket) GetRef() *SocketRef {
+	if m != nil {
+		return m.Ref
+	}
+	return nil
+}
+
+func (m *Socket) GetData() *SocketData {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *Socket) GetLocal() *Address {
+	if m != nil {
+		return m.Local
+	}
+	return nil
+}
+
+func (m *Socket) GetRemote() *Address {
+	if m != nil {
+		return m.Remote
+	}
+	return nil
+}
+
+func (m *Socket) GetSecurity() *Security {
+	if m != nil {
+		return m.Security
+	}
+	return nil
+}
+
+func (m *Socket) GetRemoteName() string {
+	if m != nil {
+		return m.RemoteName
+	}
+	return ""
+}
+
+// SocketData is data associated for a specific Socket.  The fields present
+// are specific to the implementation, so there may be minor differences in
+// the semantics.  (e.g. flow control windows)
+type SocketData struct {
+	// The number of streams that have been started.
+	StreamsStarted int64 `protobuf:"varint,1,opt,name=streams_started,json=streamsStarted,proto3" json:"streams_started,omitempty"`
+	// The number of streams that have ended successfully:
+	// On client side, received frame with eos bit set;
+	// On server side, sent frame with eos bit set.
+	StreamsSucceeded int64 `protobuf:"varint,2,opt,name=streams_succeeded,json=streamsSucceeded,proto3" json:"streams_succeeded,omitempty"`
+	// The number of streams that have ended unsuccessfully:
+	// On client side, ended without receiving frame with eos bit set;
+	// On server side, ended without sending frame with eos bit set.
+	StreamsFailed int64 `protobuf:"varint,3,opt,name=streams_failed,json=streamsFailed,proto3" json:"streams_failed,omitempty"`
+	// The number of grpc messages successfully sent on this socket.
+	MessagesSent int64 `protobuf:"varint,4,opt,name=messages_sent,json=messagesSent,proto3" json:"messages_sent,omitempty"`
+	// The number of grpc messages received on this socket.
+	MessagesReceived int64 `protobuf:"varint,5,opt,name=messages_received,json=messagesReceived,proto3" json:"messages_received,omitempty"`
+	// The number of keep alives sent.  This is typically implemented with HTTP/2
+	// ping messages.
+	KeepAlivesSent int64 `protobuf:"varint,6,opt,name=keep_alives_sent,json=keepAlivesSent,proto3" json:"keep_alives_sent,omitempty"`
+	// The last time a stream was created by this endpoint.  Usually unset for
+	// servers.
+	LastLocalStreamCreatedTimestamp *timestamp.Timestamp `protobuf:"bytes,7,opt,name=last_local_stream_created_timestamp,json=lastLocalStreamCreatedTimestamp,proto3" json:"last_local_stream_created_timestamp,omitempty"`
+	// The last time a stream was created by the remote endpoint.  Usually unset
+	// for clients.
+	LastRemoteStreamCreatedTimestamp *timestamp.Timestamp `protobuf:"bytes,8,opt,name=last_remote_stream_created_timestamp,json=lastRemoteStreamCreatedTimestamp,proto3" json:"last_remote_stream_created_timestamp,omitempty"`
+	// The last time a message was sent by this endpoint.
+	LastMessageSentTimestamp *timestamp.Timestamp `protobuf:"bytes,9,opt,name=last_message_sent_timestamp,json=lastMessageSentTimestamp,proto3" json:"last_message_sent_timestamp,omitempty"`
+	// The last time a message was received by this endpoint.
+	LastMessageReceivedTimestamp *timestamp.Timestamp `protobuf:"bytes,10,opt,name=last_message_received_timestamp,json=lastMessageReceivedTimestamp,proto3" json:"last_message_received_timestamp,omitempty"`
+	// The amount of window, granted to the local endpoint by the remote endpoint.
+	// This may be slightly out of date due to network latency.  This does NOT
+	// include stream level or TCP level flow control info.
+	LocalFlowControlWindow *wrappers.Int64Value `protobuf:"bytes,11,opt,name=local_flow_control_window,json=localFlowControlWindow,proto3" json:"local_flow_control_window,omitempty"`
+	// The amount of window, granted to the remote endpoint by the local endpoint.
+	// This may be slightly out of date due to network latency.  This does NOT
+	// include stream level or TCP level flow control info.
+	RemoteFlowControlWindow *wrappers.Int64Value `protobuf:"bytes,12,opt,name=remote_flow_control_window,json=remoteFlowControlWindow,proto3" json:"remote_flow_control_window,omitempty"`
+	// Socket options set on this socket.  May be absent.
+	Option               []*SocketOption `protobuf:"bytes,13,rep,name=option,proto3" json:"option,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *SocketData) Reset()         { *m = SocketData{} }
+func (m *SocketData) String() string { return proto.CompactTextString(m) }
+func (*SocketData) ProtoMessage()    {}
+func (*SocketData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{13}
+}
+func (m *SocketData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SocketData.Unmarshal(m, b)
+}
+func (m *SocketData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SocketData.Marshal(b, m, deterministic)
+}
+func (dst *SocketData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SocketData.Merge(dst, src)
+}
+func (m *SocketData) XXX_Size() int {
+	return xxx_messageInfo_SocketData.Size(m)
+}
+func (m *SocketData) XXX_DiscardUnknown() {
+	xxx_messageInfo_SocketData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SocketData proto.InternalMessageInfo
+
+func (m *SocketData) GetStreamsStarted() int64 {
+	if m != nil {
+		return m.StreamsStarted
+	}
+	return 0
+}
+
+func (m *SocketData) GetStreamsSucceeded() int64 {
+	if m != nil {
+		return m.StreamsSucceeded
+	}
+	return 0
+}
+
+func (m *SocketData) GetStreamsFailed() int64 {
+	if m != nil {
+		return m.StreamsFailed
+	}
+	return 0
+}
+
+func (m *SocketData) GetMessagesSent() int64 {
+	if m != nil {
+		return m.MessagesSent
+	}
+	return 0
+}
+
+func (m *SocketData) GetMessagesReceived() int64 {
+	if m != nil {
+		return m.MessagesReceived
+	}
+	return 0
+}
+
+func (m *SocketData) GetKeepAlivesSent() int64 {
+	if m != nil {
+		return m.KeepAlivesSent
+	}
+	return 0
+}
+
+func (m *SocketData) GetLastLocalStreamCreatedTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.LastLocalStreamCreatedTimestamp
+	}
+	return nil
+}
+
+func (m *SocketData) GetLastRemoteStreamCreatedTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.LastRemoteStreamCreatedTimestamp
+	}
+	return nil
+}
+
+func (m *SocketData) GetLastMessageSentTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.LastMessageSentTimestamp
+	}
+	return nil
+}
+
+func (m *SocketData) GetLastMessageReceivedTimestamp() *timestamp.Timestamp {
+	if m != nil {
+		return m.LastMessageReceivedTimestamp
+	}
+	return nil
+}
+
+func (m *SocketData) GetLocalFlowControlWindow() *wrappers.Int64Value {
+	if m != nil {
+		return m.LocalFlowControlWindow
+	}
+	return nil
+}
+
+func (m *SocketData) GetRemoteFlowControlWindow() *wrappers.Int64Value {
+	if m != nil {
+		return m.RemoteFlowControlWindow
+	}
+	return nil
+}
+
+func (m *SocketData) GetOption() []*SocketOption {
+	if m != nil {
+		return m.Option
+	}
+	return nil
+}
+
+// Address represents the address used to create the socket.
+type Address struct {
+	// Types that are valid to be assigned to Address:
+	//	*Address_TcpipAddress
+	//	*Address_UdsAddress_
+	//	*Address_OtherAddress_
+	Address              isAddress_Address `protobuf_oneof:"address"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Address) Reset()         { *m = Address{} }
+func (m *Address) String() string { return proto.CompactTextString(m) }
+func (*Address) ProtoMessage()    {}
+func (*Address) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{14}
+}
+func (m *Address) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Address.Unmarshal(m, b)
+}
+func (m *Address) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Address.Marshal(b, m, deterministic)
+}
+func (dst *Address) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Address.Merge(dst, src)
+}
+func (m *Address) XXX_Size() int {
+	return xxx_messageInfo_Address.Size(m)
+}
+func (m *Address) XXX_DiscardUnknown() {
+	xxx_messageInfo_Address.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Address proto.InternalMessageInfo
+
+type isAddress_Address interface {
+	isAddress_Address()
+}
+
+type Address_TcpipAddress struct {
+	TcpipAddress *Address_TcpIpAddress `protobuf:"bytes,1,opt,name=tcpip_address,json=tcpipAddress,proto3,oneof"`
+}
+
+type Address_UdsAddress_ struct {
+	UdsAddress *Address_UdsAddress `protobuf:"bytes,2,opt,name=uds_address,json=udsAddress,proto3,oneof"`
+}
+
+type Address_OtherAddress_ struct {
+	OtherAddress *Address_OtherAddress `protobuf:"bytes,3,opt,name=other_address,json=otherAddress,proto3,oneof"`
+}
+
+func (*Address_TcpipAddress) isAddress_Address() {}
+
+func (*Address_UdsAddress_) isAddress_Address() {}
+
+func (*Address_OtherAddress_) isAddress_Address() {}
+
+func (m *Address) GetAddress() isAddress_Address {
+	if m != nil {
+		return m.Address
+	}
+	return nil
+}
+
+func (m *Address) GetTcpipAddress() *Address_TcpIpAddress {
+	if x, ok := m.GetAddress().(*Address_TcpipAddress); ok {
+		return x.TcpipAddress
+	}
+	return nil
+}
+
+func (m *Address) GetUdsAddress() *Address_UdsAddress {
+	if x, ok := m.GetAddress().(*Address_UdsAddress_); ok {
+		return x.UdsAddress
+	}
+	return nil
+}
+
+func (m *Address) GetOtherAddress() *Address_OtherAddress {
+	if x, ok := m.GetAddress().(*Address_OtherAddress_); ok {
+		return x.OtherAddress
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Address) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Address_OneofMarshaler, _Address_OneofUnmarshaler, _Address_OneofSizer, []interface{}{
+		(*Address_TcpipAddress)(nil),
+		(*Address_UdsAddress_)(nil),
+		(*Address_OtherAddress_)(nil),
+	}
+}
+
+func _Address_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Address)
+	// address
+	switch x := m.Address.(type) {
+	case *Address_TcpipAddress:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.TcpipAddress); err != nil {
+			return err
+		}
+	case *Address_UdsAddress_:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.UdsAddress); err != nil {
+			return err
+		}
+	case *Address_OtherAddress_:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.OtherAddress); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Address.Address has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Address_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Address)
+	switch tag {
+	case 1: // address.tcpip_address
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Address_TcpIpAddress)
+		err := b.DecodeMessage(msg)
+		m.Address = &Address_TcpipAddress{msg}
+		return true, err
+	case 2: // address.uds_address
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Address_UdsAddress)
+		err := b.DecodeMessage(msg)
+		m.Address = &Address_UdsAddress_{msg}
+		return true, err
+	case 3: // address.other_address
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Address_OtherAddress)
+		err := b.DecodeMessage(msg)
+		m.Address = &Address_OtherAddress_{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Address_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Address)
+	// address
+	switch x := m.Address.(type) {
+	case *Address_TcpipAddress:
+		s := proto.Size(x.TcpipAddress)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Address_UdsAddress_:
+		s := proto.Size(x.UdsAddress)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Address_OtherAddress_:
+		s := proto.Size(x.OtherAddress)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type Address_TcpIpAddress struct {
+	// Either the IPv4 or IPv6 address in bytes.  Will be either 4 bytes or 16
+	// bytes in length.
+	IpAddress []byte `protobuf:"bytes,1,opt,name=ip_address,json=ipAddress,proto3" json:"ip_address,omitempty"`
+	// 0-64k, or -1 if not appropriate.
+	Port                 int32    `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Address_TcpIpAddress) Reset()         { *m = Address_TcpIpAddress{} }
+func (m *Address_TcpIpAddress) String() string { return proto.CompactTextString(m) }
+func (*Address_TcpIpAddress) ProtoMessage()    {}
+func (*Address_TcpIpAddress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{14, 0}
+}
+func (m *Address_TcpIpAddress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Address_TcpIpAddress.Unmarshal(m, b)
+}
+func (m *Address_TcpIpAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Address_TcpIpAddress.Marshal(b, m, deterministic)
+}
+func (dst *Address_TcpIpAddress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Address_TcpIpAddress.Merge(dst, src)
+}
+func (m *Address_TcpIpAddress) XXX_Size() int {
+	return xxx_messageInfo_Address_TcpIpAddress.Size(m)
+}
+func (m *Address_TcpIpAddress) XXX_DiscardUnknown() {
+	xxx_messageInfo_Address_TcpIpAddress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Address_TcpIpAddress proto.InternalMessageInfo
+
+func (m *Address_TcpIpAddress) GetIpAddress() []byte {
+	if m != nil {
+		return m.IpAddress
+	}
+	return nil
+}
+
+func (m *Address_TcpIpAddress) GetPort() int32 {
+	if m != nil {
+		return m.Port
+	}
+	return 0
+}
+
+// A Unix Domain Socket address.
+type Address_UdsAddress struct {
+	Filename             string   `protobuf:"bytes,1,opt,name=filename,proto3" json:"filename,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Address_UdsAddress) Reset()         { *m = Address_UdsAddress{} }
+func (m *Address_UdsAddress) String() string { return proto.CompactTextString(m) }
+func (*Address_UdsAddress) ProtoMessage()    {}
+func (*Address_UdsAddress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{14, 1}
+}
+func (m *Address_UdsAddress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Address_UdsAddress.Unmarshal(m, b)
+}
+func (m *Address_UdsAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Address_UdsAddress.Marshal(b, m, deterministic)
+}
+func (dst *Address_UdsAddress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Address_UdsAddress.Merge(dst, src)
+}
+func (m *Address_UdsAddress) XXX_Size() int {
+	return xxx_messageInfo_Address_UdsAddress.Size(m)
+}
+func (m *Address_UdsAddress) XXX_DiscardUnknown() {
+	xxx_messageInfo_Address_UdsAddress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Address_UdsAddress proto.InternalMessageInfo
+
+func (m *Address_UdsAddress) GetFilename() string {
+	if m != nil {
+		return m.Filename
+	}
+	return ""
+}
+
+// An address type not included above.
+type Address_OtherAddress struct {
+	// The human readable version of the value.  This value should be set.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The actual address message.
+	Value                *any.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Address_OtherAddress) Reset()         { *m = Address_OtherAddress{} }
+func (m *Address_OtherAddress) String() string { return proto.CompactTextString(m) }
+func (*Address_OtherAddress) ProtoMessage()    {}
+func (*Address_OtherAddress) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{14, 2}
+}
+func (m *Address_OtherAddress) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Address_OtherAddress.Unmarshal(m, b)
+}
+func (m *Address_OtherAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Address_OtherAddress.Marshal(b, m, deterministic)
+}
+func (dst *Address_OtherAddress) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Address_OtherAddress.Merge(dst, src)
+}
+func (m *Address_OtherAddress) XXX_Size() int {
+	return xxx_messageInfo_Address_OtherAddress.Size(m)
+}
+func (m *Address_OtherAddress) XXX_DiscardUnknown() {
+	xxx_messageInfo_Address_OtherAddress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Address_OtherAddress proto.InternalMessageInfo
+
+func (m *Address_OtherAddress) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Address_OtherAddress) GetValue() *any.Any {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+// Security represents details about how secure the socket is.
+type Security struct {
+	// Types that are valid to be assigned to Model:
+	//	*Security_Tls_
+	//	*Security_Other
+	Model                isSecurity_Model `protobuf_oneof:"model"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *Security) Reset()         { *m = Security{} }
+func (m *Security) String() string { return proto.CompactTextString(m) }
+func (*Security) ProtoMessage()    {}
+func (*Security) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{15}
+}
+func (m *Security) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Security.Unmarshal(m, b)
+}
+func (m *Security) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Security.Marshal(b, m, deterministic)
+}
+func (dst *Security) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Security.Merge(dst, src)
+}
+func (m *Security) XXX_Size() int {
+	return xxx_messageInfo_Security.Size(m)
+}
+func (m *Security) XXX_DiscardUnknown() {
+	xxx_messageInfo_Security.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Security proto.InternalMessageInfo
+
+type isSecurity_Model interface {
+	isSecurity_Model()
+}
+
+type Security_Tls_ struct {
+	Tls *Security_Tls `protobuf:"bytes,1,opt,name=tls,proto3,oneof"`
+}
+
+type Security_Other struct {
+	Other *Security_OtherSecurity `protobuf:"bytes,2,opt,name=other,proto3,oneof"`
+}
+
+func (*Security_Tls_) isSecurity_Model() {}
+
+func (*Security_Other) isSecurity_Model() {}
+
+func (m *Security) GetModel() isSecurity_Model {
+	if m != nil {
+		return m.Model
+	}
+	return nil
+}
+
+func (m *Security) GetTls() *Security_Tls {
+	if x, ok := m.GetModel().(*Security_Tls_); ok {
+		return x.Tls
+	}
+	return nil
+}
+
+func (m *Security) GetOther() *Security_OtherSecurity {
+	if x, ok := m.GetModel().(*Security_Other); ok {
+		return x.Other
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Security) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Security_OneofMarshaler, _Security_OneofUnmarshaler, _Security_OneofSizer, []interface{}{
+		(*Security_Tls_)(nil),
+		(*Security_Other)(nil),
+	}
+}
+
+func _Security_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Security)
+	// model
+	switch x := m.Model.(type) {
+	case *Security_Tls_:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Tls); err != nil {
+			return err
+		}
+	case *Security_Other:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Other); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("Security.Model has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Security_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Security)
+	switch tag {
+	case 1: // model.tls
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Security_Tls)
+		err := b.DecodeMessage(msg)
+		m.Model = &Security_Tls_{msg}
+		return true, err
+	case 2: // model.other
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Security_OtherSecurity)
+		err := b.DecodeMessage(msg)
+		m.Model = &Security_Other{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Security_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Security)
+	// model
+	switch x := m.Model.(type) {
+	case *Security_Tls_:
+		s := proto.Size(x.Tls)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *Security_Other:
+		s := proto.Size(x.Other)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type Security_Tls struct {
+	// Types that are valid to be assigned to CipherSuite:
+	//	*Security_Tls_StandardName
+	//	*Security_Tls_OtherName
+	CipherSuite isSecurity_Tls_CipherSuite `protobuf_oneof:"cipher_suite"`
+	// the certificate used by this endpoint.
+	LocalCertificate []byte `protobuf:"bytes,3,opt,name=local_certificate,json=localCertificate,proto3" json:"local_certificate,omitempty"`
+	// the certificate used by the remote endpoint.
+	RemoteCertificate    []byte   `protobuf:"bytes,4,opt,name=remote_certificate,json=remoteCertificate,proto3" json:"remote_certificate,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Security_Tls) Reset()         { *m = Security_Tls{} }
+func (m *Security_Tls) String() string { return proto.CompactTextString(m) }
+func (*Security_Tls) ProtoMessage()    {}
+func (*Security_Tls) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{15, 0}
+}
+func (m *Security_Tls) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Security_Tls.Unmarshal(m, b)
+}
+func (m *Security_Tls) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Security_Tls.Marshal(b, m, deterministic)
+}
+func (dst *Security_Tls) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Security_Tls.Merge(dst, src)
+}
+func (m *Security_Tls) XXX_Size() int {
+	return xxx_messageInfo_Security_Tls.Size(m)
+}
+func (m *Security_Tls) XXX_DiscardUnknown() {
+	xxx_messageInfo_Security_Tls.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Security_Tls proto.InternalMessageInfo
+
+type isSecurity_Tls_CipherSuite interface {
+	isSecurity_Tls_CipherSuite()
+}
+
+type Security_Tls_StandardName struct {
+	StandardName string `protobuf:"bytes,1,opt,name=standard_name,json=standardName,proto3,oneof"`
+}
+
+type Security_Tls_OtherName struct {
+	OtherName string `protobuf:"bytes,2,opt,name=other_name,json=otherName,proto3,oneof"`
+}
+
+func (*Security_Tls_StandardName) isSecurity_Tls_CipherSuite() {}
+
+func (*Security_Tls_OtherName) isSecurity_Tls_CipherSuite() {}
+
+func (m *Security_Tls) GetCipherSuite() isSecurity_Tls_CipherSuite {
+	if m != nil {
+		return m.CipherSuite
+	}
+	return nil
+}
+
+func (m *Security_Tls) GetStandardName() string {
+	if x, ok := m.GetCipherSuite().(*Security_Tls_StandardName); ok {
+		return x.StandardName
+	}
+	return ""
+}
+
+func (m *Security_Tls) GetOtherName() string {
+	if x, ok := m.GetCipherSuite().(*Security_Tls_OtherName); ok {
+		return x.OtherName
+	}
+	return ""
+}
+
+func (m *Security_Tls) GetLocalCertificate() []byte {
+	if m != nil {
+		return m.LocalCertificate
+	}
+	return nil
+}
+
+func (m *Security_Tls) GetRemoteCertificate() []byte {
+	if m != nil {
+		return m.RemoteCertificate
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Security_Tls) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Security_Tls_OneofMarshaler, _Security_Tls_OneofUnmarshaler, _Security_Tls_OneofSizer, []interface{}{
+		(*Security_Tls_StandardName)(nil),
+		(*Security_Tls_OtherName)(nil),
+	}
+}
+
+func _Security_Tls_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Security_Tls)
+	// cipher_suite
+	switch x := m.CipherSuite.(type) {
+	case *Security_Tls_StandardName:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.StandardName)
+	case *Security_Tls_OtherName:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.OtherName)
+	case nil:
+	default:
+		return fmt.Errorf("Security_Tls.CipherSuite has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Security_Tls_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Security_Tls)
+	switch tag {
+	case 1: // cipher_suite.standard_name
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.CipherSuite = &Security_Tls_StandardName{x}
+		return true, err
+	case 2: // cipher_suite.other_name
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.CipherSuite = &Security_Tls_OtherName{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Security_Tls_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Security_Tls)
+	// cipher_suite
+	switch x := m.CipherSuite.(type) {
+	case *Security_Tls_StandardName:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.StandardName)))
+		n += len(x.StandardName)
+	case *Security_Tls_OtherName:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.OtherName)))
+		n += len(x.OtherName)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type Security_OtherSecurity struct {
+	// The human readable version of the value.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The actual security details message.
+	Value                *any.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Security_OtherSecurity) Reset()         { *m = Security_OtherSecurity{} }
+func (m *Security_OtherSecurity) String() string { return proto.CompactTextString(m) }
+func (*Security_OtherSecurity) ProtoMessage()    {}
+func (*Security_OtherSecurity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{15, 1}
+}
+func (m *Security_OtherSecurity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Security_OtherSecurity.Unmarshal(m, b)
+}
+func (m *Security_OtherSecurity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Security_OtherSecurity.Marshal(b, m, deterministic)
+}
+func (dst *Security_OtherSecurity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Security_OtherSecurity.Merge(dst, src)
+}
+func (m *Security_OtherSecurity) XXX_Size() int {
+	return xxx_messageInfo_Security_OtherSecurity.Size(m)
+}
+func (m *Security_OtherSecurity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Security_OtherSecurity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Security_OtherSecurity proto.InternalMessageInfo
+
+func (m *Security_OtherSecurity) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Security_OtherSecurity) GetValue() *any.Any {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+// SocketOption represents socket options for a socket.  Specifically, these
+// are the options returned by getsockopt().
+type SocketOption struct {
+	// The full name of the socket option.  Typically this will be the upper case
+	// name, such as "SO_REUSEPORT".
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The human readable value of this socket option.  At least one of value or
+	// additional will be set.
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	// Additional data associated with the socket option.  At least one of value
+	// or additional will be set.
+	Additional           *any.Any `protobuf:"bytes,3,opt,name=additional,proto3" json:"additional,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SocketOption) Reset()         { *m = SocketOption{} }
+func (m *SocketOption) String() string { return proto.CompactTextString(m) }
+func (*SocketOption) ProtoMessage()    {}
+func (*SocketOption) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{16}
+}
+func (m *SocketOption) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SocketOption.Unmarshal(m, b)
+}
+func (m *SocketOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SocketOption.Marshal(b, m, deterministic)
+}
+func (dst *SocketOption) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SocketOption.Merge(dst, src)
+}
+func (m *SocketOption) XXX_Size() int {
+	return xxx_messageInfo_SocketOption.Size(m)
+}
+func (m *SocketOption) XXX_DiscardUnknown() {
+	xxx_messageInfo_SocketOption.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SocketOption proto.InternalMessageInfo
+
+func (m *SocketOption) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *SocketOption) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+func (m *SocketOption) GetAdditional() *any.Any {
+	if m != nil {
+		return m.Additional
+	}
+	return nil
+}
+
+// For use with SocketOption's additional field.  This is primarily used for
+// SO_RCVTIMEO and SO_SNDTIMEO
+type SocketOptionTimeout struct {
+	Duration             *duration.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *SocketOptionTimeout) Reset()         { *m = SocketOptionTimeout{} }
+func (m *SocketOptionTimeout) String() string { return proto.CompactTextString(m) }
+func (*SocketOptionTimeout) ProtoMessage()    {}
+func (*SocketOptionTimeout) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{17}
+}
+func (m *SocketOptionTimeout) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SocketOptionTimeout.Unmarshal(m, b)
+}
+func (m *SocketOptionTimeout) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SocketOptionTimeout.Marshal(b, m, deterministic)
+}
+func (dst *SocketOptionTimeout) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SocketOptionTimeout.Merge(dst, src)
+}
+func (m *SocketOptionTimeout) XXX_Size() int {
+	return xxx_messageInfo_SocketOptionTimeout.Size(m)
+}
+func (m *SocketOptionTimeout) XXX_DiscardUnknown() {
+	xxx_messageInfo_SocketOptionTimeout.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SocketOptionTimeout proto.InternalMessageInfo
+
+func (m *SocketOptionTimeout) GetDuration() *duration.Duration {
+	if m != nil {
+		return m.Duration
+	}
+	return nil
+}
+
+// For use with SocketOption's additional field.  This is primarily used for
+// SO_LINGER.
+type SocketOptionLinger struct {
+	// active maps to `struct linger.l_onoff`
+	Active bool `protobuf:"varint,1,opt,name=active,proto3" json:"active,omitempty"`
+	// duration maps to `struct linger.l_linger`
+	Duration             *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *SocketOptionLinger) Reset()         { *m = SocketOptionLinger{} }
+func (m *SocketOptionLinger) String() string { return proto.CompactTextString(m) }
+func (*SocketOptionLinger) ProtoMessage()    {}
+func (*SocketOptionLinger) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{18}
+}
+func (m *SocketOptionLinger) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SocketOptionLinger.Unmarshal(m, b)
+}
+func (m *SocketOptionLinger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SocketOptionLinger.Marshal(b, m, deterministic)
+}
+func (dst *SocketOptionLinger) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SocketOptionLinger.Merge(dst, src)
+}
+func (m *SocketOptionLinger) XXX_Size() int {
+	return xxx_messageInfo_SocketOptionLinger.Size(m)
+}
+func (m *SocketOptionLinger) XXX_DiscardUnknown() {
+	xxx_messageInfo_SocketOptionLinger.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SocketOptionLinger proto.InternalMessageInfo
+
+func (m *SocketOptionLinger) GetActive() bool {
+	if m != nil {
+		return m.Active
+	}
+	return false
+}
+
+func (m *SocketOptionLinger) GetDuration() *duration.Duration {
+	if m != nil {
+		return m.Duration
+	}
+	return nil
+}
+
+// For use with SocketOption's additional field.  Tcp info for
+// SOL_TCP and TCP_INFO.
+type SocketOptionTcpInfo struct {
+	TcpiState            uint32   `protobuf:"varint,1,opt,name=tcpi_state,json=tcpiState,proto3" json:"tcpi_state,omitempty"`
+	TcpiCaState          uint32   `protobuf:"varint,2,opt,name=tcpi_ca_state,json=tcpiCaState,proto3" json:"tcpi_ca_state,omitempty"`
+	TcpiRetransmits      uint32   `protobuf:"varint,3,opt,name=tcpi_retransmits,json=tcpiRetransmits,proto3" json:"tcpi_retransmits,omitempty"`
+	TcpiProbes           uint32   `protobuf:"varint,4,opt,name=tcpi_probes,json=tcpiProbes,proto3" json:"tcpi_probes,omitempty"`
+	TcpiBackoff          uint32   `protobuf:"varint,5,opt,name=tcpi_backoff,json=tcpiBackoff,proto3" json:"tcpi_backoff,omitempty"`
+	TcpiOptions          uint32   `protobuf:"varint,6,opt,name=tcpi_options,json=tcpiOptions,proto3" json:"tcpi_options,omitempty"`
+	TcpiSndWscale        uint32   `protobuf:"varint,7,opt,name=tcpi_snd_wscale,json=tcpiSndWscale,proto3" json:"tcpi_snd_wscale,omitempty"`
+	TcpiRcvWscale        uint32   `protobuf:"varint,8,opt,name=tcpi_rcv_wscale,json=tcpiRcvWscale,proto3" json:"tcpi_rcv_wscale,omitempty"`
+	TcpiRto              uint32   `protobuf:"varint,9,opt,name=tcpi_rto,json=tcpiRto,proto3" json:"tcpi_rto,omitempty"`
+	TcpiAto              uint32   `protobuf:"varint,10,opt,name=tcpi_ato,json=tcpiAto,proto3" json:"tcpi_ato,omitempty"`
+	TcpiSndMss           uint32   `protobuf:"varint,11,opt,name=tcpi_snd_mss,json=tcpiSndMss,proto3" json:"tcpi_snd_mss,omitempty"`
+	TcpiRcvMss           uint32   `protobuf:"varint,12,opt,name=tcpi_rcv_mss,json=tcpiRcvMss,proto3" json:"tcpi_rcv_mss,omitempty"`
+	TcpiUnacked          uint32   `protobuf:"varint,13,opt,name=tcpi_unacked,json=tcpiUnacked,proto3" json:"tcpi_unacked,omitempty"`
+	TcpiSacked           uint32   `protobuf:"varint,14,opt,name=tcpi_sacked,json=tcpiSacked,proto3" json:"tcpi_sacked,omitempty"`
+	TcpiLost             uint32   `protobuf:"varint,15,opt,name=tcpi_lost,json=tcpiLost,proto3" json:"tcpi_lost,omitempty"`
+	TcpiRetrans          uint32   `protobuf:"varint,16,opt,name=tcpi_retrans,json=tcpiRetrans,proto3" json:"tcpi_retrans,omitempty"`
+	TcpiFackets          uint32   `protobuf:"varint,17,opt,name=tcpi_fackets,json=tcpiFackets,proto3" json:"tcpi_fackets,omitempty"`
+	TcpiLastDataSent     uint32   `protobuf:"varint,18,opt,name=tcpi_last_data_sent,json=tcpiLastDataSent,proto3" json:"tcpi_last_data_sent,omitempty"`
+	TcpiLastAckSent      uint32   `protobuf:"varint,19,opt,name=tcpi_last_ack_sent,json=tcpiLastAckSent,proto3" json:"tcpi_last_ack_sent,omitempty"`
+	TcpiLastDataRecv     uint32   `protobuf:"varint,20,opt,name=tcpi_last_data_recv,json=tcpiLastDataRecv,proto3" json:"tcpi_last_data_recv,omitempty"`
+	TcpiLastAckRecv      uint32   `protobuf:"varint,21,opt,name=tcpi_last_ack_recv,json=tcpiLastAckRecv,proto3" json:"tcpi_last_ack_recv,omitempty"`
+	TcpiPmtu             uint32   `protobuf:"varint,22,opt,name=tcpi_pmtu,json=tcpiPmtu,proto3" json:"tcpi_pmtu,omitempty"`
+	TcpiRcvSsthresh      uint32   `protobuf:"varint,23,opt,name=tcpi_rcv_ssthresh,json=tcpiRcvSsthresh,proto3" json:"tcpi_rcv_ssthresh,omitempty"`
+	TcpiRtt              uint32   `protobuf:"varint,24,opt,name=tcpi_rtt,json=tcpiRtt,proto3" json:"tcpi_rtt,omitempty"`
+	TcpiRttvar           uint32   `protobuf:"varint,25,opt,name=tcpi_rttvar,json=tcpiRttvar,proto3" json:"tcpi_rttvar,omitempty"`
+	TcpiSndSsthresh      uint32   `protobuf:"varint,26,opt,name=tcpi_snd_ssthresh,json=tcpiSndSsthresh,proto3" json:"tcpi_snd_ssthresh,omitempty"`
+	TcpiSndCwnd          uint32   `protobuf:"varint,27,opt,name=tcpi_snd_cwnd,json=tcpiSndCwnd,proto3" json:"tcpi_snd_cwnd,omitempty"`
+	TcpiAdvmss           uint32   `protobuf:"varint,28,opt,name=tcpi_advmss,json=tcpiAdvmss,proto3" json:"tcpi_advmss,omitempty"`
+	TcpiReordering       uint32   `protobuf:"varint,29,opt,name=tcpi_reordering,json=tcpiReordering,proto3" json:"tcpi_reordering,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SocketOptionTcpInfo) Reset()         { *m = SocketOptionTcpInfo{} }
+func (m *SocketOptionTcpInfo) String() string { return proto.CompactTextString(m) }
+func (*SocketOptionTcpInfo) ProtoMessage()    {}
+func (*SocketOptionTcpInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{19}
+}
+func (m *SocketOptionTcpInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SocketOptionTcpInfo.Unmarshal(m, b)
+}
+func (m *SocketOptionTcpInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SocketOptionTcpInfo.Marshal(b, m, deterministic)
+}
+func (dst *SocketOptionTcpInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SocketOptionTcpInfo.Merge(dst, src)
+}
+func (m *SocketOptionTcpInfo) XXX_Size() int {
+	return xxx_messageInfo_SocketOptionTcpInfo.Size(m)
+}
+func (m *SocketOptionTcpInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_SocketOptionTcpInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SocketOptionTcpInfo proto.InternalMessageInfo
+
+func (m *SocketOptionTcpInfo) GetTcpiState() uint32 {
+	if m != nil {
+		return m.TcpiState
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiCaState() uint32 {
+	if m != nil {
+		return m.TcpiCaState
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiRetransmits() uint32 {
+	if m != nil {
+		return m.TcpiRetransmits
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiProbes() uint32 {
+	if m != nil {
+		return m.TcpiProbes
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiBackoff() uint32 {
+	if m != nil {
+		return m.TcpiBackoff
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiOptions() uint32 {
+	if m != nil {
+		return m.TcpiOptions
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiSndWscale() uint32 {
+	if m != nil {
+		return m.TcpiSndWscale
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiRcvWscale() uint32 {
+	if m != nil {
+		return m.TcpiRcvWscale
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiRto() uint32 {
+	if m != nil {
+		return m.TcpiRto
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiAto() uint32 {
+	if m != nil {
+		return m.TcpiAto
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiSndMss() uint32 {
+	if m != nil {
+		return m.TcpiSndMss
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiRcvMss() uint32 {
+	if m != nil {
+		return m.TcpiRcvMss
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiUnacked() uint32 {
+	if m != nil {
+		return m.TcpiUnacked
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiSacked() uint32 {
+	if m != nil {
+		return m.TcpiSacked
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiLost() uint32 {
+	if m != nil {
+		return m.TcpiLost
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiRetrans() uint32 {
+	if m != nil {
+		return m.TcpiRetrans
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiFackets() uint32 {
+	if m != nil {
+		return m.TcpiFackets
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiLastDataSent() uint32 {
+	if m != nil {
+		return m.TcpiLastDataSent
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiLastAckSent() uint32 {
+	if m != nil {
+		return m.TcpiLastAckSent
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiLastDataRecv() uint32 {
+	if m != nil {
+		return m.TcpiLastDataRecv
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiLastAckRecv() uint32 {
+	if m != nil {
+		return m.TcpiLastAckRecv
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiPmtu() uint32 {
+	if m != nil {
+		return m.TcpiPmtu
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiRcvSsthresh() uint32 {
+	if m != nil {
+		return m.TcpiRcvSsthresh
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiRtt() uint32 {
+	if m != nil {
+		return m.TcpiRtt
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiRttvar() uint32 {
+	if m != nil {
+		return m.TcpiRttvar
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiSndSsthresh() uint32 {
+	if m != nil {
+		return m.TcpiSndSsthresh
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiSndCwnd() uint32 {
+	if m != nil {
+		return m.TcpiSndCwnd
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiAdvmss() uint32 {
+	if m != nil {
+		return m.TcpiAdvmss
+	}
+	return 0
+}
+
+func (m *SocketOptionTcpInfo) GetTcpiReordering() uint32 {
+	if m != nil {
+		return m.TcpiReordering
+	}
+	return 0
+}
+
+type GetTopChannelsRequest struct {
+	// start_channel_id indicates that only channels at or above this id should be
+	// included in the results.
+	StartChannelId       int64    `protobuf:"varint,1,opt,name=start_channel_id,json=startChannelId,proto3" json:"start_channel_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTopChannelsRequest) Reset()         { *m = GetTopChannelsRequest{} }
+func (m *GetTopChannelsRequest) String() string { return proto.CompactTextString(m) }
+func (*GetTopChannelsRequest) ProtoMessage()    {}
+func (*GetTopChannelsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{20}
+}
+func (m *GetTopChannelsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTopChannelsRequest.Unmarshal(m, b)
+}
+func (m *GetTopChannelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTopChannelsRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetTopChannelsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTopChannelsRequest.Merge(dst, src)
+}
+func (m *GetTopChannelsRequest) XXX_Size() int {
+	return xxx_messageInfo_GetTopChannelsRequest.Size(m)
+}
+func (m *GetTopChannelsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTopChannelsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetTopChannelsRequest proto.InternalMessageInfo
+
+func (m *GetTopChannelsRequest) GetStartChannelId() int64 {
+	if m != nil {
+		return m.StartChannelId
+	}
+	return 0
+}
+
+type GetTopChannelsResponse struct {
+	// list of channels that the connection detail service knows about.  Sorted in
+	// ascending channel_id order.
+	Channel []*Channel `protobuf:"bytes,1,rep,name=channel,proto3" json:"channel,omitempty"`
+	// If set, indicates that the list of channels is the final list.  Requesting
+	// more channels can only return more if they are created after this RPC
+	// completes.
+	End                  bool     `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetTopChannelsResponse) Reset()         { *m = GetTopChannelsResponse{} }
+func (m *GetTopChannelsResponse) String() string { return proto.CompactTextString(m) }
+func (*GetTopChannelsResponse) ProtoMessage()    {}
+func (*GetTopChannelsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{21}
+}
+func (m *GetTopChannelsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetTopChannelsResponse.Unmarshal(m, b)
+}
+func (m *GetTopChannelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetTopChannelsResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetTopChannelsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetTopChannelsResponse.Merge(dst, src)
+}
+func (m *GetTopChannelsResponse) XXX_Size() int {
+	return xxx_messageInfo_GetTopChannelsResponse.Size(m)
+}
+func (m *GetTopChannelsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetTopChannelsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetTopChannelsResponse proto.InternalMessageInfo
+
+func (m *GetTopChannelsResponse) GetChannel() []*Channel {
+	if m != nil {
+		return m.Channel
+	}
+	return nil
+}
+
+func (m *GetTopChannelsResponse) GetEnd() bool {
+	if m != nil {
+		return m.End
+	}
+	return false
+}
+
+type GetServersRequest struct {
+	// start_server_id indicates that only servers at or above this id should be
+	// included in the results.
+	StartServerId        int64    `protobuf:"varint,1,opt,name=start_server_id,json=startServerId,proto3" json:"start_server_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServersRequest) Reset()         { *m = GetServersRequest{} }
+func (m *GetServersRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServersRequest) ProtoMessage()    {}
+func (*GetServersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{22}
+}
+func (m *GetServersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServersRequest.Unmarshal(m, b)
+}
+func (m *GetServersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServersRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServersRequest.Merge(dst, src)
+}
+func (m *GetServersRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServersRequest.Size(m)
+}
+func (m *GetServersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetServersRequest proto.InternalMessageInfo
+
+func (m *GetServersRequest) GetStartServerId() int64 {
+	if m != nil {
+		return m.StartServerId
+	}
+	return 0
+}
+
+type GetServersResponse struct {
+	// list of servers that the connection detail service knows about.  Sorted in
+	// ascending server_id order.
+	Server []*Server `protobuf:"bytes,1,rep,name=server,proto3" json:"server,omitempty"`
+	// If set, indicates that the list of servers is the final list.  Requesting
+	// more servers will only return more if they are created after this RPC
+	// completes.
+	End                  bool     `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServersResponse) Reset()         { *m = GetServersResponse{} }
+func (m *GetServersResponse) String() string { return proto.CompactTextString(m) }
+func (*GetServersResponse) ProtoMessage()    {}
+func (*GetServersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{23}
+}
+func (m *GetServersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServersResponse.Unmarshal(m, b)
+}
+func (m *GetServersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServersResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetServersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServersResponse.Merge(dst, src)
+}
+func (m *GetServersResponse) XXX_Size() int {
+	return xxx_messageInfo_GetServersResponse.Size(m)
+}
+func (m *GetServersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetServersResponse proto.InternalMessageInfo
+
+func (m *GetServersResponse) GetServer() []*Server {
+	if m != nil {
+		return m.Server
+	}
+	return nil
+}
+
+func (m *GetServersResponse) GetEnd() bool {
+	if m != nil {
+		return m.End
+	}
+	return false
+}
+
+type GetServerSocketsRequest struct {
+	ServerId int64 `protobuf:"varint,1,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
+	// start_socket_id indicates that only sockets at or above this id should be
+	// included in the results.
+	StartSocketId        int64    `protobuf:"varint,2,opt,name=start_socket_id,json=startSocketId,proto3" json:"start_socket_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServerSocketsRequest) Reset()         { *m = GetServerSocketsRequest{} }
+func (m *GetServerSocketsRequest) String() string { return proto.CompactTextString(m) }
+func (*GetServerSocketsRequest) ProtoMessage()    {}
+func (*GetServerSocketsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{24}
+}
+func (m *GetServerSocketsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServerSocketsRequest.Unmarshal(m, b)
+}
+func (m *GetServerSocketsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServerSocketsRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetServerSocketsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServerSocketsRequest.Merge(dst, src)
+}
+func (m *GetServerSocketsRequest) XXX_Size() int {
+	return xxx_messageInfo_GetServerSocketsRequest.Size(m)
+}
+func (m *GetServerSocketsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServerSocketsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetServerSocketsRequest proto.InternalMessageInfo
+
+func (m *GetServerSocketsRequest) GetServerId() int64 {
+	if m != nil {
+		return m.ServerId
+	}
+	return 0
+}
+
+func (m *GetServerSocketsRequest) GetStartSocketId() int64 {
+	if m != nil {
+		return m.StartSocketId
+	}
+	return 0
+}
+
+type GetServerSocketsResponse struct {
+	// list of socket refs that the connection detail service knows about.  Sorted in
+	// ascending socket_id order.
+	SocketRef []*SocketRef `protobuf:"bytes,1,rep,name=socket_ref,json=socketRef,proto3" json:"socket_ref,omitempty"`
+	// If set, indicates that the list of sockets is the final list.  Requesting
+	// more sockets will only return more if they are created after this RPC
+	// completes.
+	End                  bool     `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetServerSocketsResponse) Reset()         { *m = GetServerSocketsResponse{} }
+func (m *GetServerSocketsResponse) String() string { return proto.CompactTextString(m) }
+func (*GetServerSocketsResponse) ProtoMessage()    {}
+func (*GetServerSocketsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{25}
+}
+func (m *GetServerSocketsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetServerSocketsResponse.Unmarshal(m, b)
+}
+func (m *GetServerSocketsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetServerSocketsResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetServerSocketsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetServerSocketsResponse.Merge(dst, src)
+}
+func (m *GetServerSocketsResponse) XXX_Size() int {
+	return xxx_messageInfo_GetServerSocketsResponse.Size(m)
+}
+func (m *GetServerSocketsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetServerSocketsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetServerSocketsResponse proto.InternalMessageInfo
+
+func (m *GetServerSocketsResponse) GetSocketRef() []*SocketRef {
+	if m != nil {
+		return m.SocketRef
+	}
+	return nil
+}
+
+func (m *GetServerSocketsResponse) GetEnd() bool {
+	if m != nil {
+		return m.End
+	}
+	return false
+}
+
+type GetChannelRequest struct {
+	// channel_id is the identifier of the specific channel to get.
+	ChannelId            int64    `protobuf:"varint,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetChannelRequest) Reset()         { *m = GetChannelRequest{} }
+func (m *GetChannelRequest) String() string { return proto.CompactTextString(m) }
+func (*GetChannelRequest) ProtoMessage()    {}
+func (*GetChannelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{26}
+}
+func (m *GetChannelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetChannelRequest.Unmarshal(m, b)
+}
+func (m *GetChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetChannelRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetChannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetChannelRequest.Merge(dst, src)
+}
+func (m *GetChannelRequest) XXX_Size() int {
+	return xxx_messageInfo_GetChannelRequest.Size(m)
+}
+func (m *GetChannelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetChannelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetChannelRequest proto.InternalMessageInfo
+
+func (m *GetChannelRequest) GetChannelId() int64 {
+	if m != nil {
+		return m.ChannelId
+	}
+	return 0
+}
+
+type GetChannelResponse struct {
+	// The Channel that corresponds to the requested channel_id.  This field
+	// should be set.
+	Channel              *Channel `protobuf:"bytes,1,opt,name=channel,proto3" json:"channel,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetChannelResponse) Reset()         { *m = GetChannelResponse{} }
+func (m *GetChannelResponse) String() string { return proto.CompactTextString(m) }
+func (*GetChannelResponse) ProtoMessage()    {}
+func (*GetChannelResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{27}
+}
+func (m *GetChannelResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetChannelResponse.Unmarshal(m, b)
+}
+func (m *GetChannelResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetChannelResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetChannelResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetChannelResponse.Merge(dst, src)
+}
+func (m *GetChannelResponse) XXX_Size() int {
+	return xxx_messageInfo_GetChannelResponse.Size(m)
+}
+func (m *GetChannelResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetChannelResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetChannelResponse proto.InternalMessageInfo
+
+func (m *GetChannelResponse) GetChannel() *Channel {
+	if m != nil {
+		return m.Channel
+	}
+	return nil
+}
+
+type GetSubchannelRequest struct {
+	// subchannel_id is the identifier of the specific subchannel to get.
+	SubchannelId         int64    `protobuf:"varint,1,opt,name=subchannel_id,json=subchannelId,proto3" json:"subchannel_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSubchannelRequest) Reset()         { *m = GetSubchannelRequest{} }
+func (m *GetSubchannelRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSubchannelRequest) ProtoMessage()    {}
+func (*GetSubchannelRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{28}
+}
+func (m *GetSubchannelRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSubchannelRequest.Unmarshal(m, b)
+}
+func (m *GetSubchannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSubchannelRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSubchannelRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSubchannelRequest.Merge(dst, src)
+}
+func (m *GetSubchannelRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSubchannelRequest.Size(m)
+}
+func (m *GetSubchannelRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSubchannelRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetSubchannelRequest proto.InternalMessageInfo
+
+func (m *GetSubchannelRequest) GetSubchannelId() int64 {
+	if m != nil {
+		return m.SubchannelId
+	}
+	return 0
+}
+
+type GetSubchannelResponse struct {
+	// The Subchannel that corresponds to the requested subchannel_id.  This
+	// field should be set.
+	Subchannel           *Subchannel `protobuf:"bytes,1,opt,name=subchannel,proto3" json:"subchannel,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *GetSubchannelResponse) Reset()         { *m = GetSubchannelResponse{} }
+func (m *GetSubchannelResponse) String() string { return proto.CompactTextString(m) }
+func (*GetSubchannelResponse) ProtoMessage()    {}
+func (*GetSubchannelResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{29}
+}
+func (m *GetSubchannelResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSubchannelResponse.Unmarshal(m, b)
+}
+func (m *GetSubchannelResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSubchannelResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetSubchannelResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSubchannelResponse.Merge(dst, src)
+}
+func (m *GetSubchannelResponse) XXX_Size() int {
+	return xxx_messageInfo_GetSubchannelResponse.Size(m)
+}
+func (m *GetSubchannelResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSubchannelResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetSubchannelResponse proto.InternalMessageInfo
+
+func (m *GetSubchannelResponse) GetSubchannel() *Subchannel {
+	if m != nil {
+		return m.Subchannel
+	}
+	return nil
+}
+
+type GetSocketRequest struct {
+	// socket_id is the identifier of the specific socket to get.
+	SocketId             int64    `protobuf:"varint,1,opt,name=socket_id,json=socketId,proto3" json:"socket_id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSocketRequest) Reset()         { *m = GetSocketRequest{} }
+func (m *GetSocketRequest) String() string { return proto.CompactTextString(m) }
+func (*GetSocketRequest) ProtoMessage()    {}
+func (*GetSocketRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{30}
+}
+func (m *GetSocketRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSocketRequest.Unmarshal(m, b)
+}
+func (m *GetSocketRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSocketRequest.Marshal(b, m, deterministic)
+}
+func (dst *GetSocketRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSocketRequest.Merge(dst, src)
+}
+func (m *GetSocketRequest) XXX_Size() int {
+	return xxx_messageInfo_GetSocketRequest.Size(m)
+}
+func (m *GetSocketRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSocketRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetSocketRequest proto.InternalMessageInfo
+
+func (m *GetSocketRequest) GetSocketId() int64 {
+	if m != nil {
+		return m.SocketId
+	}
+	return 0
+}
+
+type GetSocketResponse struct {
+	// The Socket that corresponds to the requested socket_id.  This field
+	// should be set.
+	Socket               *Socket  `protobuf:"bytes,1,opt,name=socket,proto3" json:"socket,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetSocketResponse) Reset()         { *m = GetSocketResponse{} }
+func (m *GetSocketResponse) String() string { return proto.CompactTextString(m) }
+func (*GetSocketResponse) ProtoMessage()    {}
+func (*GetSocketResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_channelz_ce3ed45d08251f2f, []int{31}
+}
+func (m *GetSocketResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSocketResponse.Unmarshal(m, b)
+}
+func (m *GetSocketResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSocketResponse.Marshal(b, m, deterministic)
+}
+func (dst *GetSocketResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSocketResponse.Merge(dst, src)
+}
+func (m *GetSocketResponse) XXX_Size() int {
+	return xxx_messageInfo_GetSocketResponse.Size(m)
+}
+func (m *GetSocketResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSocketResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetSocketResponse proto.InternalMessageInfo
+
+func (m *GetSocketResponse) GetSocket() *Socket {
+	if m != nil {
+		return m.Socket
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Channel)(nil), "grpc.channelz.v1.Channel")
+	proto.RegisterType((*Subchannel)(nil), "grpc.channelz.v1.Subchannel")
+	proto.RegisterType((*ChannelConnectivityState)(nil), "grpc.channelz.v1.ChannelConnectivityState")
+	proto.RegisterType((*ChannelData)(nil), "grpc.channelz.v1.ChannelData")
+	proto.RegisterType((*ChannelTraceEvent)(nil), "grpc.channelz.v1.ChannelTraceEvent")
+	proto.RegisterType((*ChannelTrace)(nil), "grpc.channelz.v1.ChannelTrace")
+	proto.RegisterType((*ChannelRef)(nil), "grpc.channelz.v1.ChannelRef")
+	proto.RegisterType((*SubchannelRef)(nil), "grpc.channelz.v1.SubchannelRef")
+	proto.RegisterType((*SocketRef)(nil), "grpc.channelz.v1.SocketRef")
+	proto.RegisterType((*ServerRef)(nil), "grpc.channelz.v1.ServerRef")
+	proto.RegisterType((*Server)(nil), "grpc.channelz.v1.Server")
+	proto.RegisterType((*ServerData)(nil), "grpc.channelz.v1.ServerData")
+	proto.RegisterType((*Socket)(nil), "grpc.channelz.v1.Socket")
+	proto.RegisterType((*SocketData)(nil), "grpc.channelz.v1.SocketData")
+	proto.RegisterType((*Address)(nil), "grpc.channelz.v1.Address")
+	proto.RegisterType((*Address_TcpIpAddress)(nil), "grpc.channelz.v1.Address.TcpIpAddress")
+	proto.RegisterType((*Address_UdsAddress)(nil), "grpc.channelz.v1.Address.UdsAddress")
+	proto.RegisterType((*Address_OtherAddress)(nil), "grpc.channelz.v1.Address.OtherAddress")
+	proto.RegisterType((*Security)(nil), "grpc.channelz.v1.Security")
+	proto.RegisterType((*Security_Tls)(nil), "grpc.channelz.v1.Security.Tls")
+	proto.RegisterType((*Security_OtherSecurity)(nil), "grpc.channelz.v1.Security.OtherSecurity")
+	proto.RegisterType((*SocketOption)(nil), "grpc.channelz.v1.SocketOption")
+	proto.RegisterType((*SocketOptionTimeout)(nil), "grpc.channelz.v1.SocketOptionTimeout")
+	proto.RegisterType((*SocketOptionLinger)(nil), "grpc.channelz.v1.SocketOptionLinger")
+	proto.RegisterType((*SocketOptionTcpInfo)(nil), "grpc.channelz.v1.SocketOptionTcpInfo")
+	proto.RegisterType((*GetTopChannelsRequest)(nil), "grpc.channelz.v1.GetTopChannelsRequest")
+	proto.RegisterType((*GetTopChannelsResponse)(nil), "grpc.channelz.v1.GetTopChannelsResponse")
+	proto.RegisterType((*GetServersRequest)(nil), "grpc.channelz.v1.GetServersRequest")
+	proto.RegisterType((*GetServersResponse)(nil), "grpc.channelz.v1.GetServersResponse")
+	proto.RegisterType((*GetServerSocketsRequest)(nil), "grpc.channelz.v1.GetServerSocketsRequest")
+	proto.RegisterType((*GetServerSocketsResponse)(nil), "grpc.channelz.v1.GetServerSocketsResponse")
+	proto.RegisterType((*GetChannelRequest)(nil), "grpc.channelz.v1.GetChannelRequest")
+	proto.RegisterType((*GetChannelResponse)(nil), "grpc.channelz.v1.GetChannelResponse")
+	proto.RegisterType((*GetSubchannelRequest)(nil), "grpc.channelz.v1.GetSubchannelRequest")
+	proto.RegisterType((*GetSubchannelResponse)(nil), "grpc.channelz.v1.GetSubchannelResponse")
+	proto.RegisterType((*GetSocketRequest)(nil), "grpc.channelz.v1.GetSocketRequest")
+	proto.RegisterType((*GetSocketResponse)(nil), "grpc.channelz.v1.GetSocketResponse")
+	proto.RegisterEnum("grpc.channelz.v1.ChannelConnectivityState_State", ChannelConnectivityState_State_name, ChannelConnectivityState_State_value)
+	proto.RegisterEnum("grpc.channelz.v1.ChannelTraceEvent_Severity", ChannelTraceEvent_Severity_name, ChannelTraceEvent_Severity_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ChannelzClient is the client API for Channelz service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ChannelzClient interface {
+	// Gets all root channels (i.e. channels the application has directly
+	// created). This does not include subchannels nor non-top level channels.
+	GetTopChannels(ctx context.Context, in *GetTopChannelsRequest, opts ...grpc.CallOption) (*GetTopChannelsResponse, error)
+	// Gets all servers that exist in the process.
+	GetServers(ctx context.Context, in *GetServersRequest, opts ...grpc.CallOption) (*GetServersResponse, error)
+	// Gets all server sockets that exist in the process.
+	GetServerSockets(ctx context.Context, in *GetServerSocketsRequest, opts ...grpc.CallOption) (*GetServerSocketsResponse, error)
+	// Returns a single Channel, or else a NOT_FOUND code.
+	GetChannel(ctx context.Context, in *GetChannelRequest, opts ...grpc.CallOption) (*GetChannelResponse, error)
+	// Returns a single Subchannel, or else a NOT_FOUND code.
+	GetSubchannel(ctx context.Context, in *GetSubchannelRequest, opts ...grpc.CallOption) (*GetSubchannelResponse, error)
+	// Returns a single Socket or else a NOT_FOUND code.
+	GetSocket(ctx context.Context, in *GetSocketRequest, opts ...grpc.CallOption) (*GetSocketResponse, error)
+}
+
+type channelzClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewChannelzClient(cc *grpc.ClientConn) ChannelzClient {
+	return &channelzClient{cc}
+}
+
+func (c *channelzClient) GetTopChannels(ctx context.Context, in *GetTopChannelsRequest, opts ...grpc.CallOption) (*GetTopChannelsResponse, error) {
+	out := new(GetTopChannelsResponse)
+	err := c.cc.Invoke(ctx, "/grpc.channelz.v1.Channelz/GetTopChannels", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *channelzClient) GetServers(ctx context.Context, in *GetServersRequest, opts ...grpc.CallOption) (*GetServersResponse, error) {
+	out := new(GetServersResponse)
+	err := c.cc.Invoke(ctx, "/grpc.channelz.v1.Channelz/GetServers", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *channelzClient) GetServerSockets(ctx context.Context, in *GetServerSocketsRequest, opts ...grpc.CallOption) (*GetServerSocketsResponse, error) {
+	out := new(GetServerSocketsResponse)
+	err := c.cc.Invoke(ctx, "/grpc.channelz.v1.Channelz/GetServerSockets", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *channelzClient) GetChannel(ctx context.Context, in *GetChannelRequest, opts ...grpc.CallOption) (*GetChannelResponse, error) {
+	out := new(GetChannelResponse)
+	err := c.cc.Invoke(ctx, "/grpc.channelz.v1.Channelz/GetChannel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *channelzClient) GetSubchannel(ctx context.Context, in *GetSubchannelRequest, opts ...grpc.CallOption) (*GetSubchannelResponse, error) {
+	out := new(GetSubchannelResponse)
+	err := c.cc.Invoke(ctx, "/grpc.channelz.v1.Channelz/GetSubchannel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *channelzClient) GetSocket(ctx context.Context, in *GetSocketRequest, opts ...grpc.CallOption) (*GetSocketResponse, error) {
+	out := new(GetSocketResponse)
+	err := c.cc.Invoke(ctx, "/grpc.channelz.v1.Channelz/GetSocket", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ChannelzServer is the server API for Channelz service.
+type ChannelzServer interface {
+	// Gets all root channels (i.e. channels the application has directly
+	// created). This does not include subchannels nor non-top level channels.
+	GetTopChannels(context.Context, *GetTopChannelsRequest) (*GetTopChannelsResponse, error)
+	// Gets all servers that exist in the process.
+	GetServers(context.Context, *GetServersRequest) (*GetServersResponse, error)
+	// Gets all server sockets that exist in the process.
+	GetServerSockets(context.Context, *GetServerSocketsRequest) (*GetServerSocketsResponse, error)
+	// Returns a single Channel, or else a NOT_FOUND code.
+	GetChannel(context.Context, *GetChannelRequest) (*GetChannelResponse, error)
+	// Returns a single Subchannel, or else a NOT_FOUND code.
+	GetSubchannel(context.Context, *GetSubchannelRequest) (*GetSubchannelResponse, error)
+	// Returns a single Socket or else a NOT_FOUND code.
+	GetSocket(context.Context, *GetSocketRequest) (*GetSocketResponse, error)
+}
+
+func RegisterChannelzServer(s *grpc.Server, srv ChannelzServer) {
+	s.RegisterService(&_Channelz_serviceDesc, srv)
+}
+
+func _Channelz_GetTopChannels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetTopChannelsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChannelzServer).GetTopChannels(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpc.channelz.v1.Channelz/GetTopChannels",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChannelzServer).GetTopChannels(ctx, req.(*GetTopChannelsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Channelz_GetServers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetServersRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChannelzServer).GetServers(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpc.channelz.v1.Channelz/GetServers",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChannelzServer).GetServers(ctx, req.(*GetServersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Channelz_GetServerSockets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetServerSocketsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChannelzServer).GetServerSockets(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpc.channelz.v1.Channelz/GetServerSockets",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChannelzServer).GetServerSockets(ctx, req.(*GetServerSocketsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Channelz_GetChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetChannelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChannelzServer).GetChannel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpc.channelz.v1.Channelz/GetChannel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChannelzServer).GetChannel(ctx, req.(*GetChannelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Channelz_GetSubchannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetSubchannelRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChannelzServer).GetSubchannel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpc.channelz.v1.Channelz/GetSubchannel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChannelzServer).GetSubchannel(ctx, req.(*GetSubchannelRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Channelz_GetSocket_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetSocketRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChannelzServer).GetSocket(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/grpc.channelz.v1.Channelz/GetSocket",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChannelzServer).GetSocket(ctx, req.(*GetSocketRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Channelz_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "grpc.channelz.v1.Channelz",
+	HandlerType: (*ChannelzServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "GetTopChannels",
+			Handler:    _Channelz_GetTopChannels_Handler,
+		},
+		{
+			MethodName: "GetServers",
+			Handler:    _Channelz_GetServers_Handler,
+		},
+		{
+			MethodName: "GetServerSockets",
+			Handler:    _Channelz_GetServerSockets_Handler,
+		},
+		{
+			MethodName: "GetChannel",
+			Handler:    _Channelz_GetChannel_Handler,
+		},
+		{
+			MethodName: "GetSubchannel",
+			Handler:    _Channelz_GetSubchannel_Handler,
+		},
+		{
+			MethodName: "GetSocket",
+			Handler:    _Channelz_GetSocket_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "grpc/channelz/v1/channelz.proto",
+}
+
+func init() {
+	proto.RegisterFile("grpc/channelz/v1/channelz.proto", fileDescriptor_channelz_ce3ed45d08251f2f)
+}
+
+var fileDescriptor_channelz_ce3ed45d08251f2f = []byte{
+	// 2515 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0x4b, 0x6f, 0xdb, 0xca,
+	0x15, 0xb6, 0xde, 0xd4, 0xd1, 0x23, 0xf2, 0xe4, 0x45, 0x2b, 0x0f, 0xbb, 0x74, 0x6e, 0xe2, 0x9b,
+	0x34, 0x72, 0xec, 0x9b, 0x06, 0x45, 0xd3, 0xa2, 0x57, 0x56, 0xec, 0x58, 0xae, 0x23, 0x07, 0x94,
+	0x7c, 0x93, 0xdb, 0xc5, 0xe5, 0x65, 0xc8, 0xb1, 0xcc, 0x9a, 0x22, 0x55, 0xce, 0x48, 0x46, 0xb2,
+	0xed, 0xbe, 0xcb, 0xa2, 0xbf, 0xa0, 0x9b, 0x2e, 0x0a, 0x14, 0x28, 0xd0, 0x6e, 0x8b, 0xfe, 0x99,
+	0xfe, 0x8b, 0x62, 0x1e, 0x7c, 0xc8, 0x92, 0x2c, 0x07, 0x59, 0x76, 0x63, 0x88, 0x87, 0xdf, 0xf9,
+	0xce, 0x99, 0xf3, 0x9a, 0xe1, 0x18, 0x56, 0xfb, 0xc1, 0xd0, 0xda, 0xb4, 0x4e, 0x4d, 0xcf, 0xc3,
+	0xee, 0xa7, 0xcd, 0xf1, 0x56, 0xf4, 0xbb, 0x31, 0x0c, 0x7c, 0xea, 0xa3, 0x1a, 0x03, 0x34, 0x22,
+	0xe1, 0x78, 0xab, 0xbe, 0xd2, 0xf7, 0xfd, 0xbe, 0x8b, 0x37, 0xf9, 0xfb, 0x0f, 0xa3, 0x93, 0x4d,
+	0xd3, 0xfb, 0x28, 0xc0, 0xf5, 0xfb, 0x17, 0x5f, 0xd9, 0xa3, 0xc0, 0xa4, 0x8e, 0xef, 0xc9, 0xf7,
+	0xab, 0x17, 0xdf, 0x53, 0x67, 0x80, 0x09, 0x35, 0x07, 0xc3, 0x79, 0x04, 0xe7, 0x81, 0x39, 0x1c,
+	0xe2, 0x80, 0x88, 0xf7, 0xda, 0xdf, 0xd2, 0x50, 0x68, 0x09, 0x5f, 0x50, 0x03, 0x32, 0x01, 0x3e,
+	0x51, 0x53, 0x6b, 0xa9, 0x8d, 0xd2, 0xf6, 0xdd, 0xc6, 0x45, 0x3f, 0x1b, 0x12, 0xa7, 0xe3, 0x13,
+	0x9d, 0x01, 0xd1, 0x16, 0x64, 0x6d, 0x93, 0x9a, 0x6a, 0x9a, 0x2b, 0xdc, 0x9b, 0xab, 0xf0, 0xca,
+	0xa4, 0xa6, 0xce, 0xa1, 0xe8, 0x57, 0x50, 0x92, 0x00, 0x83, 0x99, 0xca, 0xac, 0x65, 0x16, 0x9a,
+	0x02, 0x2b, 0xfa, 0x8d, 0xf6, 0xa0, 0x4a, 0x46, 0x1f, 0x92, 0x0c, 0x59, 0xce, 0xb0, 0x3a, 0xcd,
+	0xd0, 0x8d, 0x70, 0x8c, 0xa4, 0x42, 0x92, 0x8f, 0xe8, 0x17, 0x00, 0xc4, 0xb7, 0xce, 0x30, 0xe5,
+	0x1c, 0x39, 0xce, 0x71, 0x67, 0x06, 0x07, 0xc7, 0x30, 0xfd, 0x22, 0x09, 0x7f, 0x6a, 0xff, 0x48,
+	0x03, 0xc4, 0xe4, 0x68, 0x2b, 0x19, 0xb4, 0x85, 0x7e, 0xfc, 0x1f, 0xc7, 0xed, 0xdf, 0x29, 0x50,
+	0xa5, 0x7b, 0x2d, 0xdf, 0xf3, 0xb0, 0x45, 0x9d, 0xb1, 0x43, 0x3f, 0x76, 0xa9, 0x49, 0x31, 0xda,
+	0x83, 0x1c, 0x61, 0x3f, 0x78, 0x1c, 0xab, 0xdb, 0xcf, 0xe6, 0xae, 0x6c, 0x4a, 0xb5, 0xc1, 0xff,
+	0xea, 0x42, 0x5d, 0xfb, 0x01, 0x72, 0x82, 0xb0, 0x04, 0x85, 0xe3, 0xce, 0x6f, 0x3a, 0x47, 0xef,
+	0x3a, 0xb5, 0x25, 0xa4, 0x40, 0xb6, 0xfd, 0xea, 0x70, 0xb7, 0x96, 0x42, 0x55, 0x80, 0xd6, 0x51,
+	0xa7, 0xb3, 0xdb, 0xea, 0xb5, 0x3b, 0xaf, 0x6b, 0x69, 0x54, 0x84, 0x9c, 0xbe, 0xdb, 0x7c, 0xf5,
+	0x7d, 0x2d, 0x83, 0x6e, 0xc2, 0x72, 0x4f, 0x6f, 0x76, 0xba, 0xed, 0xdd, 0x4e, 0xcf, 0xd8, 0x6b,
+	0xb6, 0x0f, 0x8f, 0xf5, 0xdd, 0x5a, 0x16, 0x95, 0x41, 0xe9, 0xee, 0x1f, 0xf7, 0x5e, 0x31, 0xa6,
+	0x9c, 0xf6, 0xdf, 0x34, 0x94, 0x12, 0xd9, 0x41, 0xdf, 0x26, 0xfd, 0x2e, 0x6d, 0x3f, 0xbe, 0xba,
+	0xdf, 0xd2, 0x63, 0x74, 0x0b, 0xf2, 0xd4, 0x0c, 0xfa, 0x98, 0xf2, 0x72, 0x28, 0xea, 0xf2, 0x09,
+	0x3d, 0x87, 0x1c, 0x0d, 0x4c, 0x0b, 0xab, 0x19, 0xce, 0x7c, 0x7f, 0x2e, 0x73, 0x8f, 0xa1, 0x74,
+	0x01, 0x46, 0xeb, 0x50, 0xb1, 0x4c, 0xd7, 0x25, 0x06, 0xa1, 0x66, 0x40, 0xb1, 0xad, 0x66, 0xd7,
+	0x52, 0x1b, 0x19, 0xbd, 0xcc, 0x85, 0x5d, 0x21, 0x43, 0x8f, 0xe0, 0x9a, 0x04, 0x8d, 0x2c, 0x0b,
+	0x63, 0x1b, 0xdb, 0x6a, 0x8e, 0xc3, 0xaa, 0x02, 0x16, 0x4a, 0xd1, 0x4f, 0x40, 0x28, 0x1a, 0x27,
+	0xa6, 0xe3, 0x62, 0x5b, 0xcd, 0x73, 0x54, 0x89, 0xcb, 0xf6, 0xb8, 0x08, 0x7d, 0x0f, 0x77, 0x5c,
+	0x93, 0x50, 0x83, 0xc9, 0x42, 0xa3, 0x46, 0x34, 0x84, 0xd4, 0x02, 0x77, 0xbe, 0xde, 0x10, 0x53,
+	0xa8, 0x11, 0x4e, 0xa1, 0x46, 0x2f, 0x44, 0xe8, 0x2a, 0x53, 0x6f, 0x99, 0xae, 0x2b, 0xbd, 0x8b,
+	0xde, 0x68, 0x7f, 0xce, 0xc0, 0x72, 0x72, 0x8d, 0xbb, 0x63, 0xec, 0x51, 0xb4, 0x06, 0x25, 0x1b,
+	0x13, 0x2b, 0x70, 0x86, 0x6c, 0x0c, 0xf2, 0xb8, 0x17, 0xf5, 0xa4, 0x08, 0xed, 0x83, 0x42, 0xf0,
+	0x18, 0x07, 0x0e, 0xfd, 0xc8, 0x63, 0x5a, 0xdd, 0xfe, 0xe9, 0xe5, 0xc1, 0xe3, 0xc4, 0x8d, 0xae,
+	0xd4, 0xd1, 0x23, 0x6d, 0xf4, 0x73, 0x28, 0xc6, 0x4b, 0xc9, 0x2c, 0x5c, 0x4a, 0x0c, 0x46, 0xbf,
+	0x9e, 0xec, 0xd7, 0xec, 0xe2, 0x91, 0xba, 0xbf, 0x34, 0xd1, 0xb1, 0xfb, 0x53, 0x1d, 0x9b, 0xbb,
+	0xd2, 0x84, 0xd9, 0x5f, 0xba, 0xd0, 0xb3, 0xda, 0x2e, 0x28, 0xe1, 0xd2, 0x78, 0xf9, 0xf7, 0x8c,
+	0xb8, 0x31, 0x4a, 0x50, 0x68, 0xf5, 0x8c, 0x76, 0x67, 0xef, 0x48, 0xf6, 0x46, 0xcf, 0x78, 0xd7,
+	0xd4, 0x3b, 0xa2, 0x37, 0xca, 0xa0, 0xb4, 0x7a, 0xc6, 0xae, 0xae, 0x1f, 0xe9, 0xb5, 0xcc, 0x4e,
+	0x09, 0x8a, 0xd6, 0xa9, 0xe3, 0xda, 0xcc, 0x17, 0xd6, 0xcb, 0xe5, 0x64, 0x04, 0xd1, 0x63, 0x58,
+	0xf6, 0x46, 0x03, 0x03, 0xb3, 0x48, 0x12, 0xc3, 0xf5, 0xfb, 0x7d, 0x6c, 0xf3, 0xdc, 0x64, 0xf4,
+	0x6b, 0xde, 0x68, 0xc0, 0x23, 0x4c, 0x0e, 0xb9, 0x18, 0xb5, 0x01, 0x59, 0x01, 0xe6, 0xbb, 0x58,
+	0xa2, 0x52, 0xd2, 0x0b, 0xc3, 0xbb, 0x1c, 0x6a, 0x45, 0x22, 0xf4, 0x12, 0xf2, 0xc2, 0xa4, 0x9c,
+	0x88, 0xeb, 0x57, 0x48, 0xb4, 0x2e, 0x55, 0x34, 0x0b, 0x20, 0x0e, 0x3f, 0xba, 0x07, 0x61, 0xf8,
+	0x0d, 0x27, 0x74, 0xbd, 0x28, 0x25, 0x6d, 0x1b, 0x21, 0xc8, 0x7a, 0xe6, 0x00, 0xcb, 0x26, 0xe5,
+	0xbf, 0x0f, 0xb2, 0x4a, 0xa6, 0x96, 0x3d, 0xc8, 0x2a, 0xd9, 0x5a, 0xee, 0x20, 0xab, 0xe4, 0x6a,
+	0xf9, 0x83, 0xac, 0x92, 0xaf, 0x15, 0x0e, 0xb2, 0x4a, 0xa1, 0xa6, 0x1c, 0x64, 0x15, 0xa5, 0x56,
+	0xd4, 0x5c, 0xa8, 0x4c, 0xe4, 0x87, 0x75, 0x68, 0x22, 0xb1, 0x8e, 0xcd, 0x5b, 0x24, 0xa3, 0x97,
+	0x63, 0x61, 0xc2, 0x9a, 0x32, 0x61, 0x2d, 0x55, 0x4b, 0x1f, 0x64, 0x95, 0x74, 0x2d, 0x33, 0xcf,
+	0xb2, 0xf6, 0x23, 0x14, 0xa3, 0xd9, 0x8b, 0xee, 0x80, 0x9c, 0xbe, 0xcc, 0x4a, 0x86, 0x5b, 0x51,
+	0x84, 0x20, 0x61, 0x21, 0x3b, 0xd7, 0xc2, 0xec, 0xf5, 0x30, 0x0b, 0x38, 0x18, 0xe3, 0x20, 0xb4,
+	0xc0, 0x1f, 0x98, 0x85, 0x9c, 0xb4, 0xc0, 0x05, 0x09, 0x0b, 0xf9, 0x2b, 0xad, 0x21, 0xb6, 0xf0,
+	0xd7, 0x14, 0xe4, 0x85, 0x09, 0xf4, 0x34, 0xb9, 0xb7, 0xce, 0xda, 0x67, 0x42, 0x4f, 0xc4, 0xbe,
+	0xfa, 0x6c, 0x62, 0x5f, 0xbd, 0x3b, 0x0f, 0x9f, 0xd8, 0x56, 0xbf, 0x85, 0x8a, 0xeb, 0x10, 0x8a,
+	0x3d, 0x43, 0x04, 0x46, 0x96, 0xd1, 0xa5, 0x5b, 0x5a, 0x59, 0x68, 0x08, 0x81, 0xf6, 0x47, 0x76,
+	0x1a, 0x88, 0x68, 0xe3, 0xa9, 0x9d, 0xfa, 0xa2, 0xa9, 0x9d, 0xbe, 0xda, 0xd4, 0xce, 0x5c, 0x69,
+	0x6a, 0x67, 0x3f, 0x7b, 0x6a, 0xe7, 0xbe, 0x60, 0x6a, 0xff, 0x25, 0x0d, 0x79, 0x11, 0x9b, 0xc5,
+	0xe9, 0x8b, 0x62, 0x7a, 0xc5, 0xf4, 0x71, 0x7c, 0x22, 0x7d, 0x9b, 0x90, 0x73, 0x7d, 0xcb, 0x74,
+	0xe5, 0x6c, 0x5e, 0x99, 0x56, 0x69, 0xda, 0x76, 0x80, 0x09, 0xd1, 0x05, 0x0e, 0x6d, 0x41, 0x3e,
+	0xc0, 0x03, 0x9f, 0x62, 0x39, 0x91, 0x2f, 0xd1, 0x90, 0x40, 0xf4, 0x82, 0xed, 0x26, 0xd6, 0x88,
+	0xef, 0x26, 0x51, 0x5c, 0xa6, 0x0b, 0x4b, 0x20, 0xf4, 0x08, 0x8b, 0x56, 0xa1, 0x24, 0x18, 0x8c,
+	0x44, 0x17, 0x80, 0x10, 0x75, 0xcc, 0x01, 0xd6, 0xfe, 0x50, 0x00, 0x88, 0x57, 0xc4, 0xd2, 0x4b,
+	0x68, 0x80, 0xcd, 0x41, 0x5c, 0x05, 0x62, 0x08, 0x55, 0xa5, 0x38, 0xac, 0x83, 0x27, 0xb0, 0x1c,
+	0x01, 0xa3, 0x4a, 0x10, 0x05, 0x53, 0x0b, 0xa1, 0x51, 0x2d, 0x7c, 0x05, 0xa1, 0x7a, 0x58, 0x0d,
+	0xa2, 0x66, 0x2a, 0x52, 0x2a, 0xeb, 0x61, 0x1d, 0x2a, 0x03, 0x4c, 0x88, 0xd9, 0xc7, 0xc4, 0x20,
+	0xd8, 0xa3, 0xe1, 0xb1, 0x21, 0x14, 0x76, 0xd9, 0xce, 0xfb, 0x04, 0x96, 0x23, 0x50, 0x80, 0x2d,
+	0xec, 0x8c, 0xa3, 0x83, 0x43, 0x2d, 0x7c, 0xa1, 0x4b, 0x39, 0xda, 0x80, 0xda, 0x19, 0xc6, 0x43,
+	0xc3, 0x74, 0x9d, 0x71, 0x48, 0x2a, 0x8e, 0x0f, 0x55, 0x26, 0x6f, 0x72, 0x31, 0xa7, 0x3d, 0x85,
+	0x75, 0x5e, 0x8b, 0x3c, 0x43, 0x86, 0xf0, 0xcb, 0xe0, 0xa3, 0xfe, 0x33, 0x4f, 0x12, 0xab, 0x8c,
+	0xe6, 0x90, 0xb1, 0x74, 0x39, 0x49, 0x4b, 0x70, 0xc4, 0xbb, 0xc5, 0xef, 0xe0, 0x01, 0xb7, 0x24,
+	0xf3, 0x32, 0xd7, 0x94, 0xb2, 0xd0, 0xd4, 0x1a, 0xe3, 0xd1, 0x39, 0xcd, 0x1c, 0x5b, 0x61, 0x87,
+	0xc9, 0xc0, 0xf0, 0x00, 0x24, 0x4c, 0x14, 0xaf, 0xd6, 0x61, 0x6f, 0x84, 0x36, 0x8b, 0x53, 0x4c,
+	0x6d, 0xc2, 0xea, 0x04, 0x75, 0x98, 0x8b, 0x04, 0x3d, 0x2c, 0xa4, 0xbf, 0x9b, 0xa0, 0x0f, 0x93,
+	0x16, 0x9b, 0xf8, 0x0e, 0x56, 0x44, 0x3a, 0x4e, 0x5c, 0xff, 0xdc, 0xb0, 0x7c, 0x8f, 0x06, 0xbe,
+	0x6b, 0x9c, 0x3b, 0x9e, 0xed, 0x9f, 0xab, 0xa5, 0xb0, 0x9f, 0x2f, 0x90, 0xb7, 0x3d, 0xfa, 0xe2,
+	0xf9, 0x77, 0xa6, 0x3b, 0xc2, 0xfa, 0x2d, 0xae, 0xbd, 0xe7, 0xfa, 0xe7, 0x2d, 0xa1, 0xfb, 0x8e,
+	0xab, 0xa2, 0xf7, 0x50, 0x97, 0xc1, 0x9f, 0x45, 0x5c, 0x5e, 0x4c, 0x7c, 0x5b, 0xa8, 0x4f, 0x33,
+	0xbf, 0x80, 0xbc, 0x2f, 0x4e, 0x84, 0x15, 0x3e, 0xc2, 0xef, 0xcf, 0x1b, 0x1f, 0x47, 0x1c, 0xa5,
+	0x4b, 0xb4, 0xf6, 0xcf, 0x0c, 0x14, 0x64, 0xcb, 0xa3, 0x37, 0x50, 0xa1, 0xd6, 0xd0, 0x19, 0x1a,
+	0xa6, 0x10, 0xc8, 0xc9, 0xf5, 0x70, 0xee, 0x90, 0x68, 0xf4, 0xac, 0x61, 0x7b, 0x28, 0x1f, 0xf6,
+	0x97, 0xf4, 0x32, 0x57, 0x0f, 0xe9, 0x5e, 0x43, 0x69, 0x64, 0x93, 0x88, 0x4c, 0x8c, 0xb5, 0x07,
+	0xf3, 0xc9, 0x8e, 0x6d, 0x12, 0x53, 0xc1, 0x28, 0x7a, 0x62, 0x7e, 0xf9, 0xf4, 0x14, 0x07, 0x11,
+	0x55, 0x66, 0x91, 0x5f, 0x47, 0x0c, 0x9e, 0xf0, 0xcb, 0x4f, 0x3c, 0xd7, 0x9b, 0x50, 0x4e, 0xfa,
+	0xcd, 0x4e, 0x3e, 0x17, 0xd6, 0x5c, 0xd6, 0x8b, 0xf1, 0x32, 0x10, 0x64, 0x87, 0x7e, 0x20, 0x3e,
+	0x4f, 0x72, 0x3a, 0xff, 0x5d, 0xdf, 0x00, 0x88, 0xbd, 0x45, 0x75, 0x50, 0x4e, 0x1c, 0x17, 0xf3,
+	0x39, 0x27, 0xce, 0xe3, 0xd1, 0x73, 0xbd, 0x03, 0xe5, 0xa4, 0x33, 0xd1, 0xa9, 0x20, 0x15, 0x9f,
+	0x0a, 0xd0, 0x63, 0xc8, 0x8d, 0x59, 0x76, 0x65, 0x88, 0x6e, 0x4c, 0x15, 0x40, 0xd3, 0xfb, 0xa8,
+	0x0b, 0xc8, 0x4e, 0x11, 0x0a, 0xd2, 0x53, 0xed, 0x4f, 0x19, 0x76, 0xb2, 0x95, 0xe3, 0x76, 0x1b,
+	0x32, 0xd4, 0x25, 0xf3, 0xb7, 0xdd, 0x10, 0xd8, 0xe8, 0xb9, 0x2c, 0x22, 0x0c, 0xcc, 0x3e, 0xde,
+	0x78, 0x60, 0xa4, 0xdd, 0x8d, 0x4b, 0xb4, 0xf8, 0x1a, 0xc2, 0xa7, 0xfd, 0x25, 0x5d, 0x28, 0xd6,
+	0xff, 0x95, 0x82, 0x4c, 0xcf, 0x25, 0xe8, 0x2b, 0xa8, 0x10, 0x6a, 0x7a, 0xb6, 0x19, 0xd8, 0x46,
+	0xbc, 0x3c, 0x16, 0xf9, 0x50, 0xcc, 0x46, 0x3e, 0x5a, 0x05, 0x10, 0x89, 0x8c, 0x8f, 0x92, 0xfb,
+	0x4b, 0x7a, 0x91, 0xcb, 0x38, 0xe0, 0x09, 0x2c, 0x8b, 0xbe, 0xb3, 0x70, 0x40, 0x9d, 0x13, 0xc7,
+	0x62, 0x9f, 0x96, 0x19, 0x9e, 0x91, 0x1a, 0x7f, 0xd1, 0x8a, 0xe5, 0xe8, 0x29, 0x20, 0xd9, 0x4c,
+	0x49, 0x74, 0x96, 0xa3, 0x97, 0xc5, 0x9b, 0x04, 0x7c, 0xa7, 0x0a, 0x65, 0xcb, 0x19, 0x32, 0xeb,
+	0x64, 0xe4, 0x50, 0x5c, 0x3f, 0x82, 0xca, 0xc4, 0xaa, 0xbe, 0x38, 0x35, 0x05, 0xc8, 0x0d, 0x7c,
+	0x1b, 0xbb, 0x9a, 0x07, 0xe5, 0x64, 0xaf, 0xcd, 0x24, 0xbe, 0x91, 0x24, 0x2e, 0x4a, 0x0a, 0xf4,
+	0x1c, 0xc0, 0xb4, 0x6d, 0x87, 0x69, 0x45, 0xbb, 0xfa, 0x6c, 0x9b, 0x09, 0x9c, 0x76, 0x08, 0xd7,
+	0x93, 0xf6, 0xd8, 0x18, 0xf3, 0x47, 0x14, 0xfd, 0x0c, 0x94, 0xf0, 0xb6, 0x4c, 0xd6, 0xc5, 0xca,
+	0x14, 0xd5, 0x2b, 0x09, 0xd0, 0x23, 0xa8, 0x66, 0x01, 0x4a, 0xb2, 0x1d, 0x3a, 0x5e, 0x1f, 0x07,
+	0xec, 0x33, 0xdd, 0x64, 0x9f, 0xef, 0x62, 0x15, 0x8a, 0x2e, 0x9f, 0x26, 0x8c, 0xa4, 0xaf, 0x6e,
+	0xe4, 0xef, 0xca, 0x05, 0x9f, 0xad, 0x61, 0xdb, 0x3b, 0xf1, 0x59, 0x2f, 0xb2, 0x19, 0x62, 0xc4,
+	0x97, 0x0a, 0x15, 0xbd, 0xc8, 0x24, 0xe2, 0x56, 0x43, 0x13, 0x13, 0xca, 0xb0, 0x4c, 0x89, 0x48,
+	0x73, 0x44, 0x89, 0x09, 0x5b, 0xa6, 0xc0, 0x7c, 0x0d, 0x35, 0x8e, 0x09, 0x30, 0x0d, 0x4c, 0x8f,
+	0x0c, 0x1c, 0x2a, 0x06, 0x46, 0x45, 0xbf, 0xc6, 0xe4, 0x7a, 0x2c, 0x66, 0x67, 0x14, 0x0e, 0x1d,
+	0x06, 0xfe, 0x07, 0x4c, 0x78, 0xe9, 0x54, 0x74, 0xee, 0xc0, 0x5b, 0x2e, 0x61, 0x47, 0x49, 0x0e,
+	0xf8, 0x60, 0x5a, 0x67, 0xfe, 0x89, 0xf8, 0x06, 0x95, 0xe6, 0x76, 0x84, 0x28, 0x82, 0x88, 0x79,
+	0x4a, 0xf8, 0x26, 0x2f, 0x21, 0x62, 0x69, 0x04, 0x3d, 0x84, 0x6b, 0x62, 0x51, 0x9e, 0x6d, 0x9c,
+	0x13, 0xcb, 0x74, 0x31, 0xdf, 0xcd, 0x2b, 0x3a, 0x5f, 0x4c, 0xd7, 0xb3, 0xdf, 0x71, 0x61, 0x84,
+	0x0b, 0xac, 0x71, 0x88, 0x53, 0x62, 0x9c, 0x6e, 0x8d, 0x25, 0x6e, 0x05, 0x14, 0x81, 0xa3, 0x3e,
+	0xdf, 0x48, 0x2b, 0x7a, 0x81, 0x03, 0xa8, 0x1f, 0xbd, 0x32, 0xa9, 0xcf, 0x37, 0x41, 0xf9, 0xaa,
+	0x49, 0x7d, 0xb4, 0x26, 0x1d, 0x65, 0x5e, 0x0c, 0x08, 0xe1, 0xdb, 0x98, 0x5c, 0x6d, 0xd7, 0xb3,
+	0xdf, 0x10, 0x12, 0x21, 0x98, 0x7d, 0x86, 0x28, 0xc7, 0x08, 0xdd, 0x1a, 0x33, 0x44, 0xb8, 0xd8,
+	0x91, 0x67, 0x5a, 0x67, 0xd8, 0x56, 0x2b, 0xf1, 0x62, 0x8f, 0x85, 0x28, 0x8a, 0x29, 0x11, 0x88,
+	0x6a, 0xc2, 0x8a, 0x00, 0xdc, 0x01, 0x9e, 0x50, 0xc3, 0xf5, 0x09, 0x55, 0xaf, 0xf1, 0xd7, 0xdc,
+	0xe7, 0x43, 0x9f, 0xd0, 0xc8, 0x80, 0x4c, 0x9e, 0x5a, 0x8b, 0x0d, 0xc8, 0xc4, 0x45, 0x90, 0x13,
+	0x46, 0x47, 0x89, 0xba, 0x1c, 0x43, 0xf6, 0x84, 0x08, 0x3d, 0x85, 0xeb, 0xc2, 0x04, 0x3b, 0x26,
+	0xb0, 0x93, 0xb2, 0x38, 0x7f, 0x21, 0x8e, 0xe4, 0xd5, 0x71, 0x68, 0x12, 0x7e, 0xec, 0x94, 0x07,
+	0x3b, 0x14, 0xc3, 0x4d, 0xeb, 0x4c, 0xa0, 0xaf, 0xc7, 0x35, 0xc3, 0xd0, 0x4d, 0xeb, 0x8c, 0x83,
+	0xa7, 0xb9, 0x03, 0x6c, 0x8d, 0xd5, 0x1b, 0xd3, 0xdc, 0x3a, 0xb6, 0xc6, 0xd3, 0xdc, 0x1c, 0x7d,
+	0x73, 0x8a, 0x9b, 0x83, 0xc3, 0xd0, 0x0c, 0x07, 0x74, 0xa4, 0xde, 0x8a, 0x43, 0xf3, 0x76, 0x40,
+	0x47, 0xe8, 0x31, 0x2c, 0x47, 0xd9, 0x21, 0x84, 0x9e, 0x06, 0x98, 0x9c, 0xaa, 0xb7, 0x13, 0x85,
+	0x6d, 0x8d, 0xbb, 0x52, 0x9c, 0xa8, 0x10, 0xaa, 0xaa, 0xc9, 0x0a, 0xa1, 0x51, 0x7e, 0x02, 0x4a,
+	0xc7, 0x66, 0xa0, 0xae, 0x24, 0x72, 0xcc, 0x25, 0x91, 0x1d, 0x56, 0x27, 0x91, 0x9d, 0x7a, 0x6c,
+	0xa7, 0xeb, 0xd9, 0x91, 0x9d, 0xb0, 0x1f, 0x19, 0xd6, 0x3a, 0xf7, 0x6c, 0xf5, 0x4e, 0x9c, 0x8c,
+	0xae, 0x67, 0xb7, 0xce, 0xbd, 0xb8, 0x20, 0x4c, 0x7b, 0xcc, 0x8a, 0xea, 0x6e, 0x6c, 0xb0, 0xc9,
+	0x25, 0xec, 0xe4, 0x2f, 0x73, 0xee, 0x07, 0x36, 0x0e, 0x1c, 0xaf, 0xaf, 0xde, 0xe3, 0xa0, 0xaa,
+	0x48, 0x7b, 0x28, 0xd5, 0x9a, 0x70, 0xf3, 0x35, 0xa6, 0x3d, 0x7f, 0x28, 0xbf, 0x21, 0x89, 0x8e,
+	0x7f, 0x3f, 0xc2, 0x84, 0xb2, 0xc3, 0x36, 0xff, 0x66, 0x30, 0xa6, 0x6e, 0x30, 0xaa, 0x5c, 0xde,
+	0x0a, 0x2f, 0x16, 0x34, 0x03, 0x6e, 0x5d, 0xa4, 0x20, 0x43, 0xdf, 0x23, 0x18, 0x7d, 0x03, 0x05,
+	0xa9, 0xad, 0xa6, 0xf8, 0x09, 0x6a, 0x65, 0xfe, 0x6d, 0x55, 0x88, 0x44, 0x35, 0xc8, 0x60, 0x4f,
+	0x7c, 0x7d, 0x28, 0x3a, 0xfb, 0xa9, 0xbd, 0x84, 0xe5, 0xd7, 0x98, 0x8a, 0x2f, 0xe2, 0xc8, 0xbf,
+	0x87, 0xec, 0xdb, 0x86, 0xf9, 0x17, 0xdf, 0x16, 0xa4, 0xc2, 0xcf, 0x10, 0x33, 0x90, 0xe8, 0xb6,
+	0xad, 0xbd, 0x07, 0x94, 0x54, 0x96, 0x9e, 0x3d, 0x83, 0xbc, 0xd0, 0x93, 0x8e, 0xa9, 0x73, 0x2f,
+	0x02, 0x24, 0x6e, 0x86, 0x5b, 0x3f, 0xc0, 0xed, 0x88, 0x59, 0xcc, 0xdd, 0xc8, 0xb9, 0x89, 0x4b,
+	0x8c, 0xd4, 0x85, 0x4b, 0x8c, 0xd8, 0xf3, 0xe8, 0x26, 0x25, 0x9d, 0xf4, 0x5c, 0x5e, 0xa7, 0x68,
+	0xa7, 0xa0, 0x4e, 0xf3, 0x4b, 0xff, 0x27, 0x2f, 0xcd, 0x53, 0x9f, 0x73, 0x69, 0x3e, 0x63, 0x25,
+	0xdb, 0x3c, 0xc0, 0xd1, 0xc5, 0x95, 0x58, 0xc3, 0xe5, 0x97, 0x57, 0x5a, 0x9b, 0xc7, 0x35, 0xd2,
+	0x99, 0x95, 0xf1, 0xd4, 0xd5, 0x32, 0xae, 0xbd, 0x84, 0x1b, 0x6c, 0xa1, 0x89, 0x2b, 0x2d, 0xe1,
+	0xc1, 0xd4, 0xb5, 0x56, 0x6a, 0xfa, 0x5a, 0x4b, 0x3b, 0xe6, 0x05, 0x9c, 0x54, 0x96, 0xae, 0xfc,
+	0x12, 0x20, 0x06, 0xce, 0xff, 0x07, 0x54, 0x42, 0x33, 0x81, 0xd7, 0x36, 0xa1, 0xc6, 0x68, 0x65,
+	0xd0, 0xe2, 0xac, 0x46, 0x29, 0x4b, 0x4d, 0x5e, 0x7e, 0x69, 0xbb, 0xa2, 0x48, 0xa5, 0x42, 0xa2,
+	0xcc, 0xc4, 0x25, 0x90, 0xb0, 0xaf, 0xce, 0x4d, 0x91, 0xc4, 0x6d, 0xff, 0x27, 0x0b, 0x8a, 0x0c,
+	0xd0, 0x27, 0x64, 0x41, 0x75, 0xb2, 0xb3, 0xd0, 0xa3, 0x69, 0x82, 0x99, 0xed, 0x5b, 0xdf, 0x58,
+	0x0c, 0x94, 0x3e, 0xbe, 0x03, 0x88, 0x1b, 0x04, 0xad, 0xcf, 0xd4, 0x9b, 0xec, 0xbd, 0xfa, 0x83,
+	0xcb, 0x41, 0x92, 0xd8, 0x11, 0x21, 0x4c, 0xd6, 0x2f, 0xfa, 0xfa, 0x12, 0xcd, 0xc9, 0x1e, 0xaa,
+	0x3f, 0xbe, 0x0a, 0x74, 0x62, 0x0d, 0xe1, 0xff, 0x1c, 0x67, 0xaf, 0x61, 0xb2, 0xbc, 0xe7, 0xac,
+	0xe1, 0x62, 0x3d, 0xff, 0x08, 0x95, 0x89, 0xea, 0x42, 0x0f, 0x67, 0x7b, 0x75, 0xb1, 0x76, 0xeb,
+	0x8f, 0x16, 0xe2, 0xa4, 0x85, 0x1e, 0x14, 0xa3, 0xba, 0x41, 0xda, 0x6c, 0xad, 0x64, 0x15, 0xd6,
+	0xd7, 0x2f, 0xc5, 0x08, 0xd6, 0x9d, 0xf7, 0x70, 0xdd, 0xf1, 0xa7, 0x80, 0x3b, 0x95, 0xb0, 0xb4,
+	0xde, 0xb2, 0x73, 0xe4, 0xdb, 0xd4, 0x6f, 0x9f, 0xc9, 0x73, 0x65, 0xdf, 0x77, 0x4d, 0xaf, 0xdf,
+	0xf0, 0x83, 0xfe, 0xe6, 0xe4, 0xff, 0x9a, 0xd9, 0x53, 0xb8, 0x05, 0x7c, 0x32, 0xc6, 0x5b, 0x1f,
+	0xf2, 0xfc, 0x08, 0xfa, 0xcd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x7a, 0xae, 0xc5, 0x94,
+	0x1e, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/grpc/channelz/service/func_linux.go b/vendor/google.golang.org/grpc/channelz/service/func_linux.go
new file mode 100644
index 00000000..fc5bbf36
--- /dev/null
+++ b/vendor/google.golang.org/grpc/channelz/service/func_linux.go
@@ -0,0 +1,105 @@
+// +build !appengine,go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package service
+
+import (
+	"github.com/golang/protobuf/ptypes"
+	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+	"google.golang.org/grpc/internal/channelz"
+)
+
+func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOption {
+	var opts []*channelzpb.SocketOption
+	if skopts.Linger != nil {
+		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionLinger{
+			Active:   skopts.Linger.Onoff != 0,
+			Duration: convertToPtypesDuration(int64(skopts.Linger.Linger), 0),
+		})
+		if err == nil {
+			opts = append(opts, &channelzpb.SocketOption{
+				Name:       "SO_LINGER",
+				Additional: additional,
+			})
+		}
+	}
+	if skopts.RecvTimeout != nil {
+		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTimeout{
+			Duration: convertToPtypesDuration(int64(skopts.RecvTimeout.Sec), int64(skopts.RecvTimeout.Usec)),
+		})
+		if err == nil {
+			opts = append(opts, &channelzpb.SocketOption{
+				Name:       "SO_RCVTIMEO",
+				Additional: additional,
+			})
+		}
+	}
+	if skopts.SendTimeout != nil {
+		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTimeout{
+			Duration: convertToPtypesDuration(int64(skopts.SendTimeout.Sec), int64(skopts.SendTimeout.Usec)),
+		})
+		if err == nil {
+			opts = append(opts, &channelzpb.SocketOption{
+				Name:       "SO_SNDTIMEO",
+				Additional: additional,
+			})
+		}
+	}
+	if skopts.TCPInfo != nil {
+		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTcpInfo{
+			TcpiState:       uint32(skopts.TCPInfo.State),
+			TcpiCaState:     uint32(skopts.TCPInfo.Ca_state),
+			TcpiRetransmits: uint32(skopts.TCPInfo.Retransmits),
+			TcpiProbes:      uint32(skopts.TCPInfo.Probes),
+			TcpiBackoff:     uint32(skopts.TCPInfo.Backoff),
+			TcpiOptions:     uint32(skopts.TCPInfo.Options),
+			// https://golang.org/pkg/syscall/#TCPInfo
+			// TCPInfo struct does not contain info about TcpiSndWscale and TcpiRcvWscale.
+			TcpiRto:          skopts.TCPInfo.Rto,
+			TcpiAto:          skopts.TCPInfo.Ato,
+			TcpiSndMss:       skopts.TCPInfo.Snd_mss,
+			TcpiRcvMss:       skopts.TCPInfo.Rcv_mss,
+			TcpiUnacked:      skopts.TCPInfo.Unacked,
+			TcpiSacked:       skopts.TCPInfo.Sacked,
+			TcpiLost:         skopts.TCPInfo.Lost,
+			TcpiRetrans:      skopts.TCPInfo.Retrans,
+			TcpiFackets:      skopts.TCPInfo.Fackets,
+			TcpiLastDataSent: skopts.TCPInfo.Last_data_sent,
+			TcpiLastAckSent:  skopts.TCPInfo.Last_ack_sent,
+			TcpiLastDataRecv: skopts.TCPInfo.Last_data_recv,
+			TcpiLastAckRecv:  skopts.TCPInfo.Last_ack_recv,
+			TcpiPmtu:         skopts.TCPInfo.Pmtu,
+			TcpiRcvSsthresh:  skopts.TCPInfo.Rcv_ssthresh,
+			TcpiRtt:          skopts.TCPInfo.Rtt,
+			TcpiRttvar:       skopts.TCPInfo.Rttvar,
+			TcpiSndSsthresh:  skopts.TCPInfo.Snd_ssthresh,
+			TcpiSndCwnd:      skopts.TCPInfo.Snd_cwnd,
+			TcpiAdvmss:       skopts.TCPInfo.Advmss,
+			TcpiReordering:   skopts.TCPInfo.Reordering,
+		})
+		if err == nil {
+			opts = append(opts, &channelzpb.SocketOption{
+				Name:       "TCP_INFO",
+				Additional: additional,
+			})
+		}
+	}
+	return opts
+}
diff --git a/vendor/google.golang.org/grpc/benchmark/worker/util.go b/vendor/google.golang.org/grpc/channelz/service/func_nonlinux.go
similarity index 51%
rename from vendor/google.golang.org/grpc/benchmark/worker/util.go
rename to vendor/google.golang.org/grpc/channelz/service/func_nonlinux.go
index f26993e6..44a9f195 100644
--- a/vendor/google.golang.org/grpc/benchmark/worker/util.go
+++ b/vendor/google.golang.org/grpc/channelz/service/func_nonlinux.go
@@ -1,6 +1,8 @@
+// +build !linux appengine !go1.7
+
 /*
  *
- * Copyright 2016 gRPC authors.
+ * Copyright 2018 gRPC authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +18,13 @@
  *
  */
 
-package main
-
-import "syscall"
-
-func cpuTimeDiff(first *syscall.Rusage, latest *syscall.Rusage) (float64, float64) {
-	var (
-		utimeDiffs  = latest.Utime.Sec - first.Utime.Sec
-		utimeDiffus = latest.Utime.Usec - first.Utime.Usec
-		stimeDiffs  = latest.Stime.Sec - first.Stime.Sec
-		stimeDiffus = latest.Stime.Usec - first.Stime.Usec
-	)
+package service
 
-	uTimeElapsed := float64(utimeDiffs) + float64(utimeDiffus)*1.0e-6
-	sTimeElapsed := float64(stimeDiffs) + float64(stimeDiffus)*1.0e-6
+import (
+	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+	"google.golang.org/grpc/internal/channelz"
+)
 
-	return uTimeElapsed, sTimeElapsed
+func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOption {
+	return nil
 }
diff --git a/vendor/google.golang.org/grpc/channelz/service/regenerate.sh b/vendor/google.golang.org/grpc/channelz/service/regenerate.sh
new file mode 100755
index 00000000..9c255b12
--- /dev/null
+++ b/vendor/google.golang.org/grpc/channelz/service/regenerate.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2018 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eux -o pipefail
+
+TMP=$(mktemp -d)
+
+function finish {
+  rm -rf "$TMP"
+}
+trap finish EXIT
+
+pushd "$TMP"
+mkdir -p grpc/channelz/v1
+curl https://raw.githubusercontent.com/grpc/grpc-proto/master/grpc/channelz/v1/channelz.proto > grpc/channelz/v1/channelz.proto
+
+protoc --go_out=plugins=grpc,paths=source_relative:. -I. grpc/channelz/v1/*.proto
+popd
+rm -f ../grpc_channelz_v1/*.pb.go
+cp "$TMP"/grpc/channelz/v1/*.pb.go ../grpc_channelz_v1/
+
diff --git a/vendor/google.golang.org/grpc/channelz/service/service.go b/vendor/google.golang.org/grpc/channelz/service/service.go
new file mode 100644
index 00000000..a1c45d51
--- /dev/null
+++ b/vendor/google.golang.org/grpc/channelz/service/service.go
@@ -0,0 +1,300 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+//go:generate ./regenerate.sh
+
+// Package service provides an implementation for channelz service server.
+package service
+
+import (
+	"net"
+	"time"
+
+	"github.com/golang/protobuf/ptypes"
+	durpb "github.com/golang/protobuf/ptypes/duration"
+	wrpb "github.com/golang/protobuf/ptypes/wrappers"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	channelzgrpc "google.golang.org/grpc/channelz/grpc_channelz_v1"
+	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+	"google.golang.org/grpc/connectivity"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/internal/channelz"
+)
+
+func convertToPtypesDuration(sec int64, usec int64) *durpb.Duration {
+	return ptypes.DurationProto(time.Duration(sec*1e9 + usec*1e3))
+}
+
+// RegisterChannelzServiceToServer registers the channelz service to the given server.
+func RegisterChannelzServiceToServer(s *grpc.Server) {
+	channelzgrpc.RegisterChannelzServer(s, &serverImpl{})
+}
+
+func newCZServer() channelzgrpc.ChannelzServer {
+	return &serverImpl{}
+}
+
+type serverImpl struct{}
+
+func connectivityStateToProto(s connectivity.State) *channelzpb.ChannelConnectivityState {
+	switch s {
+	case connectivity.Idle:
+		return &channelzpb.ChannelConnectivityState{State: channelzpb.ChannelConnectivityState_IDLE}
+	case connectivity.Connecting:
+		return &channelzpb.ChannelConnectivityState{State: channelzpb.ChannelConnectivityState_CONNECTING}
+	case connectivity.Ready:
+		return &channelzpb.ChannelConnectivityState{State: channelzpb.ChannelConnectivityState_READY}
+	case connectivity.TransientFailure:
+		return &channelzpb.ChannelConnectivityState{State: channelzpb.ChannelConnectivityState_TRANSIENT_FAILURE}
+	case connectivity.Shutdown:
+		return &channelzpb.ChannelConnectivityState{State: channelzpb.ChannelConnectivityState_SHUTDOWN}
+	default:
+		return &channelzpb.ChannelConnectivityState{State: channelzpb.ChannelConnectivityState_UNKNOWN}
+	}
+}
+
+func channelMetricToProto(cm *channelz.ChannelMetric) *channelzpb.Channel {
+	c := &channelzpb.Channel{}
+	c.Ref = &channelzpb.ChannelRef{ChannelId: cm.ID, Name: cm.RefName}
+
+	c.Data = &channelzpb.ChannelData{
+		State:          connectivityStateToProto(cm.ChannelData.State),
+		Target:         cm.ChannelData.Target,
+		CallsStarted:   cm.ChannelData.CallsStarted,
+		CallsSucceeded: cm.ChannelData.CallsSucceeded,
+		CallsFailed:    cm.ChannelData.CallsFailed,
+	}
+	if ts, err := ptypes.TimestampProto(cm.ChannelData.LastCallStartedTimestamp); err == nil {
+		c.Data.LastCallStartedTimestamp = ts
+	}
+	nestedChans := make([]*channelzpb.ChannelRef, 0, len(cm.NestedChans))
+	for id, ref := range cm.NestedChans {
+		nestedChans = append(nestedChans, &channelzpb.ChannelRef{ChannelId: id, Name: ref})
+	}
+	c.ChannelRef = nestedChans
+
+	subChans := make([]*channelzpb.SubchannelRef, 0, len(cm.SubChans))
+	for id, ref := range cm.SubChans {
+		subChans = append(subChans, &channelzpb.SubchannelRef{SubchannelId: id, Name: ref})
+	}
+	c.SubchannelRef = subChans
+
+	sockets := make([]*channelzpb.SocketRef, 0, len(cm.Sockets))
+	for id, ref := range cm.Sockets {
+		sockets = append(sockets, &channelzpb.SocketRef{SocketId: id, Name: ref})
+	}
+	c.SocketRef = sockets
+	return c
+}
+
+func subChannelMetricToProto(cm *channelz.SubChannelMetric) *channelzpb.Subchannel {
+	sc := &channelzpb.Subchannel{}
+	sc.Ref = &channelzpb.SubchannelRef{SubchannelId: cm.ID, Name: cm.RefName}
+
+	sc.Data = &channelzpb.ChannelData{
+		State:          connectivityStateToProto(cm.ChannelData.State),
+		Target:         cm.ChannelData.Target,
+		CallsStarted:   cm.ChannelData.CallsStarted,
+		CallsSucceeded: cm.ChannelData.CallsSucceeded,
+		CallsFailed:    cm.ChannelData.CallsFailed,
+	}
+	if ts, err := ptypes.TimestampProto(cm.ChannelData.LastCallStartedTimestamp); err == nil {
+		sc.Data.LastCallStartedTimestamp = ts
+	}
+	nestedChans := make([]*channelzpb.ChannelRef, 0, len(cm.NestedChans))
+	for id, ref := range cm.NestedChans {
+		nestedChans = append(nestedChans, &channelzpb.ChannelRef{ChannelId: id, Name: ref})
+	}
+	sc.ChannelRef = nestedChans
+
+	subChans := make([]*channelzpb.SubchannelRef, 0, len(cm.SubChans))
+	for id, ref := range cm.SubChans {
+		subChans = append(subChans, &channelzpb.SubchannelRef{SubchannelId: id, Name: ref})
+	}
+	sc.SubchannelRef = subChans
+
+	sockets := make([]*channelzpb.SocketRef, 0, len(cm.Sockets))
+	for id, ref := range cm.Sockets {
+		sockets = append(sockets, &channelzpb.SocketRef{SocketId: id, Name: ref})
+	}
+	sc.SocketRef = sockets
+	return sc
+}
+
+func securityToProto(se credentials.ChannelzSecurityValue) *channelzpb.Security {
+	switch v := se.(type) {
+	case *credentials.TLSChannelzSecurityValue:
+		return &channelzpb.Security{Model: &channelzpb.Security_Tls_{Tls: &channelzpb.Security_Tls{
+			CipherSuite:       &channelzpb.Security_Tls_StandardName{StandardName: v.StandardName},
+			LocalCertificate:  v.LocalCertificate,
+			RemoteCertificate: v.RemoteCertificate,
+		}}}
+	case *credentials.OtherChannelzSecurityValue:
+		otherSecurity := &channelzpb.Security_OtherSecurity{
+			Name: v.Name,
+		}
+		if anyval, err := ptypes.MarshalAny(v.Value); err == nil {
+			otherSecurity.Value = anyval
+		}
+		return &channelzpb.Security{Model: &channelzpb.Security_Other{Other: otherSecurity}}
+	}
+	return nil
+}
+
+func addrToProto(a net.Addr) *channelzpb.Address {
+	switch a.Network() {
+	case "udp":
+		// TODO: Address_OtherAddress{}. Need proto def for Value.
+	case "ip":
+		// Note zone info is discarded through the conversion.
+		return &channelzpb.Address{Address: &channelzpb.Address_TcpipAddress{TcpipAddress: &channelzpb.Address_TcpIpAddress{IpAddress: a.(*net.IPAddr).IP}}}
+	case "ip+net":
+		// Note mask info is discarded through the conversion.
+		return &channelzpb.Address{Address: &channelzpb.Address_TcpipAddress{TcpipAddress: &channelzpb.Address_TcpIpAddress{IpAddress: a.(*net.IPNet).IP}}}
+	case "tcp":
+		// Note zone info is discarded through the conversion.
+		return &channelzpb.Address{Address: &channelzpb.Address_TcpipAddress{TcpipAddress: &channelzpb.Address_TcpIpAddress{IpAddress: a.(*net.TCPAddr).IP, Port: int32(a.(*net.TCPAddr).Port)}}}
+	case "unix", "unixgram", "unixpacket":
+		return &channelzpb.Address{Address: &channelzpb.Address_UdsAddress_{UdsAddress: &channelzpb.Address_UdsAddress{Filename: a.String()}}}
+	default:
+	}
+	return &channelzpb.Address{}
+}
+
+func socketMetricToProto(sm *channelz.SocketMetric) *channelzpb.Socket {
+	s := &channelzpb.Socket{}
+	s.Ref = &channelzpb.SocketRef{SocketId: sm.ID, Name: sm.RefName}
+
+	s.Data = &channelzpb.SocketData{
+		StreamsStarted:   sm.SocketData.StreamsStarted,
+		StreamsSucceeded: sm.SocketData.StreamsSucceeded,
+		StreamsFailed:    sm.SocketData.StreamsFailed,
+		MessagesSent:     sm.SocketData.MessagesSent,
+		MessagesReceived: sm.SocketData.MessagesReceived,
+		KeepAlivesSent:   sm.SocketData.KeepAlivesSent,
+	}
+	if ts, err := ptypes.TimestampProto(sm.SocketData.LastLocalStreamCreatedTimestamp); err == nil {
+		s.Data.LastLocalStreamCreatedTimestamp = ts
+	}
+	if ts, err := ptypes.TimestampProto(sm.SocketData.LastRemoteStreamCreatedTimestamp); err == nil {
+		s.Data.LastRemoteStreamCreatedTimestamp = ts
+	}
+	if ts, err := ptypes.TimestampProto(sm.SocketData.LastMessageSentTimestamp); err == nil {
+		s.Data.LastMessageSentTimestamp = ts
+	}
+	if ts, err := ptypes.TimestampProto(sm.SocketData.LastMessageReceivedTimestamp); err == nil {
+		s.Data.LastMessageReceivedTimestamp = ts
+	}
+	s.Data.LocalFlowControlWindow = &wrpb.Int64Value{Value: sm.SocketData.LocalFlowControlWindow}
+	s.Data.RemoteFlowControlWindow = &wrpb.Int64Value{Value: sm.SocketData.RemoteFlowControlWindow}
+
+	if sm.SocketData.SocketOptions != nil {
+		s.Data.Option = sockoptToProto(sm.SocketData.SocketOptions)
+	}
+	if sm.SocketData.Security != nil {
+		s.Security = securityToProto(sm.SocketData.Security)
+	}
+
+	if sm.SocketData.LocalAddr != nil {
+		s.Local = addrToProto(sm.SocketData.LocalAddr)
+	}
+	if sm.SocketData.RemoteAddr != nil {
+		s.Remote = addrToProto(sm.SocketData.RemoteAddr)
+	}
+	s.RemoteName = sm.SocketData.RemoteName
+	return s
+}
+
+func (s *serverImpl) GetTopChannels(ctx context.Context, req *channelzpb.GetTopChannelsRequest) (*channelzpb.GetTopChannelsResponse, error) {
+	metrics, end := channelz.GetTopChannels(req.GetStartChannelId())
+	resp := &channelzpb.GetTopChannelsResponse{}
+	for _, m := range metrics {
+		resp.Channel = append(resp.Channel, channelMetricToProto(m))
+	}
+	resp.End = end
+	return resp, nil
+}
+
+func serverMetricToProto(sm *channelz.ServerMetric) *channelzpb.Server {
+	s := &channelzpb.Server{}
+	s.Ref = &channelzpb.ServerRef{ServerId: sm.ID, Name: sm.RefName}
+
+	s.Data = &channelzpb.ServerData{
+		CallsStarted:   sm.ServerData.CallsStarted,
+		CallsSucceeded: sm.ServerData.CallsSucceeded,
+		CallsFailed:    sm.ServerData.CallsFailed,
+	}
+
+	if ts, err := ptypes.TimestampProto(sm.ServerData.LastCallStartedTimestamp); err == nil {
+		s.Data.LastCallStartedTimestamp = ts
+	}
+	sockets := make([]*channelzpb.SocketRef, 0, len(sm.ListenSockets))
+	for id, ref := range sm.ListenSockets {
+		sockets = append(sockets, &channelzpb.SocketRef{SocketId: id, Name: ref})
+	}
+	s.ListenSocket = sockets
+	return s
+}
+
+func (s *serverImpl) GetServers(ctx context.Context, req *channelzpb.GetServersRequest) (*channelzpb.GetServersResponse, error) {
+	metrics, end := channelz.GetServers(req.GetStartServerId())
+	resp := &channelzpb.GetServersResponse{}
+	for _, m := range metrics {
+		resp.Server = append(resp.Server, serverMetricToProto(m))
+	}
+	resp.End = end
+	return resp, nil
+}
+
+func (s *serverImpl) GetServerSockets(ctx context.Context, req *channelzpb.GetServerSocketsRequest) (*channelzpb.GetServerSocketsResponse, error) {
+	metrics, end := channelz.GetServerSockets(req.GetServerId(), req.GetStartSocketId())
+	resp := &channelzpb.GetServerSocketsResponse{}
+	for _, m := range metrics {
+		resp.SocketRef = append(resp.SocketRef, &channelzpb.SocketRef{SocketId: m.ID, Name: m.RefName})
+	}
+	resp.End = end
+	return resp, nil
+}
+
+func (s *serverImpl) GetChannel(ctx context.Context, req *channelzpb.GetChannelRequest) (*channelzpb.GetChannelResponse, error) {
+	var metric *channelz.ChannelMetric
+	if metric = channelz.GetChannel(req.GetChannelId()); metric == nil {
+		return &channelzpb.GetChannelResponse{}, nil
+	}
+	resp := &channelzpb.GetChannelResponse{Channel: channelMetricToProto(metric)}
+	return resp, nil
+}
+
+func (s *serverImpl) GetSubchannel(ctx context.Context, req *channelzpb.GetSubchannelRequest) (*channelzpb.GetSubchannelResponse, error) {
+	var metric *channelz.SubChannelMetric
+	if metric = channelz.GetSubChannel(req.GetSubchannelId()); metric == nil {
+		return &channelzpb.GetSubchannelResponse{}, nil
+	}
+	resp := &channelzpb.GetSubchannelResponse{Subchannel: subChannelMetricToProto(metric)}
+	return resp, nil
+}
+
+func (s *serverImpl) GetSocket(ctx context.Context, req *channelzpb.GetSocketRequest) (*channelzpb.GetSocketResponse, error) {
+	var metric *channelz.SocketMetric
+	if metric = channelz.GetSocket(req.GetSocketId()); metric == nil {
+		return &channelzpb.GetSocketResponse{}, nil
+	}
+	resp := &channelzpb.GetSocketResponse{Socket: socketMetricToProto(metric)}
+	return resp, nil
+}
diff --git a/vendor/google.golang.org/grpc/channelz/service/service_sktopt_test.go b/vendor/google.golang.org/grpc/channelz/service/service_sktopt_test.go
new file mode 100644
index 00000000..e7e1c7ea
--- /dev/null
+++ b/vendor/google.golang.org/grpc/channelz/service/service_sktopt_test.go
@@ -0,0 +1,152 @@
+// +build linux,!appengine,go1.7
+// +build 386 amd64
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// SocketOptions is only supported on linux system. The functions defined in
+// this file are to parse the socket option field and the test is specifically
+// to verify the behavior of socket option parsing.
+
+package service
+
+import (
+	"reflect"
+	"strconv"
+	"testing"
+
+	"github.com/golang/protobuf/ptypes"
+	durpb "github.com/golang/protobuf/ptypes/duration"
+	"golang.org/x/net/context"
+	"golang.org/x/sys/unix"
+	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+	"google.golang.org/grpc/internal/channelz"
+)
+
+func init() {
+	// Assign protoToSocketOption to protoToSocketOpt in order to enable socket option
+	// data conversion from proto message to channelz defined struct.
+	protoToSocketOpt = protoToSocketOption
+}
+
+func convertToDuration(d *durpb.Duration) (sec int64, usec int64) {
+	if d != nil {
+		if dur, err := ptypes.Duration(d); err == nil {
+			sec = int64(int64(dur) / 1e9)
+			usec = (int64(dur) - sec*1e9) / 1e3
+		}
+	}
+	return
+}
+
+func protoToLinger(protoLinger *channelzpb.SocketOptionLinger) *unix.Linger {
+	linger := &unix.Linger{}
+	if protoLinger.GetActive() {
+		linger.Onoff = 1
+	}
+	lv, _ := convertToDuration(protoLinger.GetDuration())
+	linger.Linger = int32(lv)
+	return linger
+}
+
+func protoToSocketOption(skopts []*channelzpb.SocketOption) *channelz.SocketOptionData {
+	skdata := &channelz.SocketOptionData{}
+	for _, opt := range skopts {
+		switch opt.GetName() {
+		case "SO_LINGER":
+			protoLinger := &channelzpb.SocketOptionLinger{}
+			err := ptypes.UnmarshalAny(opt.GetAdditional(), protoLinger)
+			if err == nil {
+				skdata.Linger = protoToLinger(protoLinger)
+			}
+		case "SO_RCVTIMEO":
+			protoTimeout := &channelzpb.SocketOptionTimeout{}
+			err := ptypes.UnmarshalAny(opt.GetAdditional(), protoTimeout)
+			if err == nil {
+				skdata.RecvTimeout = protoToTime(protoTimeout)
+			}
+		case "SO_SNDTIMEO":
+			protoTimeout := &channelzpb.SocketOptionTimeout{}
+			err := ptypes.UnmarshalAny(opt.GetAdditional(), protoTimeout)
+			if err == nil {
+				skdata.SendTimeout = protoToTime(protoTimeout)
+			}
+		case "TCP_INFO":
+			tcpi := &channelzpb.SocketOptionTcpInfo{}
+			err := ptypes.UnmarshalAny(opt.GetAdditional(), tcpi)
+			if err == nil {
+				skdata.TCPInfo = &unix.TCPInfo{
+					State:          uint8(tcpi.TcpiState),
+					Ca_state:       uint8(tcpi.TcpiCaState),
+					Retransmits:    uint8(tcpi.TcpiRetransmits),
+					Probes:         uint8(tcpi.TcpiProbes),
+					Backoff:        uint8(tcpi.TcpiBackoff),
+					Options:        uint8(tcpi.TcpiOptions),
+					Rto:            tcpi.TcpiRto,
+					Ato:            tcpi.TcpiAto,
+					Snd_mss:        tcpi.TcpiSndMss,
+					Rcv_mss:        tcpi.TcpiRcvMss,
+					Unacked:        tcpi.TcpiUnacked,
+					Sacked:         tcpi.TcpiSacked,
+					Lost:           tcpi.TcpiLost,
+					Retrans:        tcpi.TcpiRetrans,
+					Fackets:        tcpi.TcpiFackets,
+					Last_data_sent: tcpi.TcpiLastDataSent,
+					Last_ack_sent:  tcpi.TcpiLastAckSent,
+					Last_data_recv: tcpi.TcpiLastDataRecv,
+					Last_ack_recv:  tcpi.TcpiLastAckRecv,
+					Pmtu:           tcpi.TcpiPmtu,
+					Rcv_ssthresh:   tcpi.TcpiRcvSsthresh,
+					Rtt:            tcpi.TcpiRtt,
+					Rttvar:         tcpi.TcpiRttvar,
+					Snd_ssthresh:   tcpi.TcpiSndSsthresh,
+					Snd_cwnd:       tcpi.TcpiSndCwnd,
+					Advmss:         tcpi.TcpiAdvmss,
+					Reordering:     tcpi.TcpiReordering}
+			}
+		}
+	}
+	return skdata
+}
+
+func TestGetSocketOptions(t *testing.T) {
+	channelz.NewChannelzStorage()
+	ss := []*dummySocket{
+		{
+			socketOptions: &channelz.SocketOptionData{
+				Linger:      &unix.Linger{Onoff: 1, Linger: 2},
+				RecvTimeout: &unix.Timeval{Sec: 10, Usec: 1},
+				SendTimeout: &unix.Timeval{},
+				TCPInfo:     &unix.TCPInfo{State: 1},
+			},
+		},
+	}
+	svr := newCZServer()
+	ids := make([]int64, len(ss))
+	svrID := channelz.RegisterServer(&dummyServer{}, "")
+	for i, s := range ss {
+		ids[i] = channelz.RegisterNormalSocket(s, svrID, strconv.Itoa(i))
+	}
+	for i, s := range ss {
+		resp, _ := svr.GetSocket(context.Background(), &channelzpb.GetSocketRequest{SocketId: ids[i]})
+		metrics := resp.GetSocket()
+		if !reflect.DeepEqual(metrics.GetRef(), &channelzpb.SocketRef{SocketId: ids[i], Name: strconv.Itoa(i)}) || !reflect.DeepEqual(socketProtoToStruct(metrics), s) {
+			t.Fatalf("resp.GetSocket() want: metrics.GetRef() = %#v and %#v, got: metrics.GetRef() = %#v and %#v", &channelzpb.SocketRef{SocketId: ids[i], Name: strconv.Itoa(i)}, s, metrics.GetRef(), socketProtoToStruct(metrics))
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/channelz/service/service_test.go b/vendor/google.golang.org/grpc/channelz/service/service_test.go
new file mode 100644
index 00000000..10e00e8c
--- /dev/null
+++ b/vendor/google.golang.org/grpc/channelz/service/service_test.go
@@ -0,0 +1,538 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package service
+
+import (
+	"net"
+	"reflect"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/ptypes"
+	"golang.org/x/net/context"
+	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+	"google.golang.org/grpc/connectivity"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/internal/channelz"
+)
+
+func init() {
+	channelz.TurnOn()
+}
+
+type protoToSocketOptFunc func([]*channelzpb.SocketOption) *channelz.SocketOptionData
+
+// protoToSocketOpt is used in function socketProtoToStruct to extract socket option
+// data from unmarshaled proto message.
+// It is only defined under linux, non-appengine environment on x86 architecture.
+var protoToSocketOpt protoToSocketOptFunc
+
+// emptyTime is used for detecting unset value of time.Time type.
+// For go1.7 and earlier, ptypes.Timestamp will fill in the loc field of time.Time
+// with &utcLoc. However zero value of a time.Time type value loc field is nil.
+// This behavior will make reflect.DeepEqual fail upon unset time.Time field,
+// and cause false positive fatal error.
+var emptyTime time.Time
+
+type dummyChannel struct {
+	state                    connectivity.State
+	target                   string
+	callsStarted             int64
+	callsSucceeded           int64
+	callsFailed              int64
+	lastCallStartedTimestamp time.Time
+}
+
+func (d *dummyChannel) ChannelzMetric() *channelz.ChannelInternalMetric {
+	return &channelz.ChannelInternalMetric{
+		State:                    d.state,
+		Target:                   d.target,
+		CallsStarted:             d.callsStarted,
+		CallsSucceeded:           d.callsSucceeded,
+		CallsFailed:              d.callsFailed,
+		LastCallStartedTimestamp: d.lastCallStartedTimestamp,
+	}
+}
+
+type dummyServer struct {
+	callsStarted             int64
+	callsSucceeded           int64
+	callsFailed              int64
+	lastCallStartedTimestamp time.Time
+}
+
+func (d *dummyServer) ChannelzMetric() *channelz.ServerInternalMetric {
+	return &channelz.ServerInternalMetric{
+		CallsStarted:             d.callsStarted,
+		CallsSucceeded:           d.callsSucceeded,
+		CallsFailed:              d.callsFailed,
+		LastCallStartedTimestamp: d.lastCallStartedTimestamp,
+	}
+}
+
+type dummySocket struct {
+	streamsStarted                   int64
+	streamsSucceeded                 int64
+	streamsFailed                    int64
+	messagesSent                     int64
+	messagesReceived                 int64
+	keepAlivesSent                   int64
+	lastLocalStreamCreatedTimestamp  time.Time
+	lastRemoteStreamCreatedTimestamp time.Time
+	lastMessageSentTimestamp         time.Time
+	lastMessageReceivedTimestamp     time.Time
+	localFlowControlWindow           int64
+	remoteFlowControlWindow          int64
+	socketOptions                    *channelz.SocketOptionData
+	localAddr                        net.Addr
+	remoteAddr                       net.Addr
+	security                         credentials.ChannelzSecurityValue
+	remoteName                       string
+}
+
+func (d *dummySocket) ChannelzMetric() *channelz.SocketInternalMetric {
+	return &channelz.SocketInternalMetric{
+		StreamsStarted:                   d.streamsStarted,
+		StreamsSucceeded:                 d.streamsSucceeded,
+		StreamsFailed:                    d.streamsFailed,
+		MessagesSent:                     d.messagesSent,
+		MessagesReceived:                 d.messagesReceived,
+		KeepAlivesSent:                   d.keepAlivesSent,
+		LastLocalStreamCreatedTimestamp:  d.lastLocalStreamCreatedTimestamp,
+		LastRemoteStreamCreatedTimestamp: d.lastRemoteStreamCreatedTimestamp,
+		LastMessageSentTimestamp:         d.lastMessageSentTimestamp,
+		LastMessageReceivedTimestamp:     d.lastMessageReceivedTimestamp,
+		LocalFlowControlWindow:           d.localFlowControlWindow,
+		RemoteFlowControlWindow:          d.remoteFlowControlWindow,
+		SocketOptions:                    d.socketOptions,
+		LocalAddr:                        d.localAddr,
+		RemoteAddr:                       d.remoteAddr,
+		Security:                         d.security,
+		RemoteName:                       d.remoteName,
+	}
+}
+
+func channelProtoToStruct(c *channelzpb.Channel) *dummyChannel {
+	dc := &dummyChannel{}
+	pdata := c.GetData()
+	switch pdata.GetState().GetState() {
+	case channelzpb.ChannelConnectivityState_UNKNOWN:
+		// TODO: what should we set here?
+	case channelzpb.ChannelConnectivityState_IDLE:
+		dc.state = connectivity.Idle
+	case channelzpb.ChannelConnectivityState_CONNECTING:
+		dc.state = connectivity.Connecting
+	case channelzpb.ChannelConnectivityState_READY:
+		dc.state = connectivity.Ready
+	case channelzpb.ChannelConnectivityState_TRANSIENT_FAILURE:
+		dc.state = connectivity.TransientFailure
+	case channelzpb.ChannelConnectivityState_SHUTDOWN:
+		dc.state = connectivity.Shutdown
+	}
+	dc.target = pdata.GetTarget()
+	dc.callsStarted = pdata.CallsStarted
+	dc.callsSucceeded = pdata.CallsSucceeded
+	dc.callsFailed = pdata.CallsFailed
+	if t, err := ptypes.Timestamp(pdata.GetLastCallStartedTimestamp()); err == nil {
+		if !t.Equal(emptyTime) {
+			dc.lastCallStartedTimestamp = t
+		}
+	}
+	return dc
+}
+
+func serverProtoToStruct(s *channelzpb.Server) *dummyServer {
+	ds := &dummyServer{}
+	pdata := s.GetData()
+	ds.callsStarted = pdata.CallsStarted
+	ds.callsSucceeded = pdata.CallsSucceeded
+	ds.callsFailed = pdata.CallsFailed
+	if t, err := ptypes.Timestamp(pdata.GetLastCallStartedTimestamp()); err == nil {
+		if !t.Equal(emptyTime) {
+			ds.lastCallStartedTimestamp = t
+		}
+	}
+	return ds
+}
+
+func socketProtoToStruct(s *channelzpb.Socket) *dummySocket {
+	ds := &dummySocket{}
+	pdata := s.GetData()
+	ds.streamsStarted = pdata.GetStreamsStarted()
+	ds.streamsSucceeded = pdata.GetStreamsSucceeded()
+	ds.streamsFailed = pdata.GetStreamsFailed()
+	ds.messagesSent = pdata.GetMessagesSent()
+	ds.messagesReceived = pdata.GetMessagesReceived()
+	ds.keepAlivesSent = pdata.GetKeepAlivesSent()
+	if t, err := ptypes.Timestamp(pdata.GetLastLocalStreamCreatedTimestamp()); err == nil {
+		if !t.Equal(emptyTime) {
+			ds.lastLocalStreamCreatedTimestamp = t
+		}
+	}
+	if t, err := ptypes.Timestamp(pdata.GetLastRemoteStreamCreatedTimestamp()); err == nil {
+		if !t.Equal(emptyTime) {
+			ds.lastRemoteStreamCreatedTimestamp = t
+		}
+	}
+	if t, err := ptypes.Timestamp(pdata.GetLastMessageSentTimestamp()); err == nil {
+		if !t.Equal(emptyTime) {
+			ds.lastMessageSentTimestamp = t
+		}
+	}
+	if t, err := ptypes.Timestamp(pdata.GetLastMessageReceivedTimestamp()); err == nil {
+		if !t.Equal(emptyTime) {
+			ds.lastMessageReceivedTimestamp = t
+		}
+	}
+	if v := pdata.GetLocalFlowControlWindow(); v != nil {
+		ds.localFlowControlWindow = v.Value
+	}
+	if v := pdata.GetRemoteFlowControlWindow(); v != nil {
+		ds.remoteFlowControlWindow = v.Value
+	}
+	if v := pdata.GetOption(); v != nil && protoToSocketOpt != nil {
+		ds.socketOptions = protoToSocketOpt(v)
+	}
+	if v := s.GetSecurity(); v != nil {
+		ds.security = protoToSecurity(v)
+	}
+	if local := s.GetLocal(); local != nil {
+		ds.localAddr = protoToAddr(local)
+	}
+	if remote := s.GetRemote(); remote != nil {
+		ds.remoteAddr = protoToAddr(remote)
+	}
+	ds.remoteName = s.GetRemoteName()
+	return ds
+}
+
+func protoToSecurity(protoSecurity *channelzpb.Security) credentials.ChannelzSecurityValue {
+	switch v := protoSecurity.Model.(type) {
+	case *channelzpb.Security_Tls_:
+		return &credentials.TLSChannelzSecurityValue{StandardName: v.Tls.GetStandardName(), LocalCertificate: v.Tls.GetLocalCertificate(), RemoteCertificate: v.Tls.GetRemoteCertificate()}
+	case *channelzpb.Security_Other:
+		sv := &credentials.OtherChannelzSecurityValue{Name: v.Other.GetName()}
+		var x ptypes.DynamicAny
+		if err := ptypes.UnmarshalAny(v.Other.GetValue(), &x); err == nil {
+			sv.Value = x.Message
+		}
+		return sv
+	}
+	return nil
+}
+
+func protoToAddr(a *channelzpb.Address) net.Addr {
+	switch v := a.Address.(type) {
+	case *channelzpb.Address_TcpipAddress:
+		if port := v.TcpipAddress.GetPort(); port != 0 {
+			return &net.TCPAddr{IP: v.TcpipAddress.GetIpAddress(), Port: int(port)}
+		}
+		return &net.IPAddr{IP: v.TcpipAddress.GetIpAddress()}
+	case *channelzpb.Address_UdsAddress_:
+		return &net.UnixAddr{Name: v.UdsAddress.GetFilename(), Net: "unix"}
+	case *channelzpb.Address_OtherAddress_:
+		// TODO:
+	}
+	return nil
+}
+
+func convertSocketRefSliceToMap(sktRefs []*channelzpb.SocketRef) map[int64]string {
+	m := make(map[int64]string)
+	for _, sr := range sktRefs {
+		m[sr.SocketId] = sr.Name
+	}
+	return m
+}
+
+type OtherSecurityValue struct {
+	LocalCertificate  []byte `protobuf:"bytes,1,opt,name=local_certificate,json=localCertificate,proto3" json:"local_certificate,omitempty"`
+	RemoteCertificate []byte `protobuf:"bytes,2,opt,name=remote_certificate,json=remoteCertificate,proto3" json:"remote_certificate,omitempty"`
+}
+
+func (m *OtherSecurityValue) Reset()         { *m = OtherSecurityValue{} }
+func (m *OtherSecurityValue) String() string { return proto.CompactTextString(m) }
+func (*OtherSecurityValue) ProtoMessage()    {}
+
+func init() {
+	// Ad-hoc registering the proto type here to facilitate UnmarshalAny of OtherSecurityValue.
+	proto.RegisterType((*OtherSecurityValue)(nil), "grpc.credentials.OtherChannelzSecurityValue")
+}
+
+func TestGetTopChannels(t *testing.T) {
+	tcs := []*dummyChannel{
+		{
+			state:                    connectivity.Connecting,
+			target:                   "test.channelz:1234",
+			callsStarted:             6,
+			callsSucceeded:           2,
+			callsFailed:              3,
+			lastCallStartedTimestamp: time.Now().UTC(),
+		},
+		{
+			state:                    connectivity.Connecting,
+			target:                   "test.channelz:1234",
+			callsStarted:             1,
+			callsSucceeded:           2,
+			callsFailed:              3,
+			lastCallStartedTimestamp: time.Now().UTC(),
+		},
+		{
+			state:          connectivity.Shutdown,
+			target:         "test.channelz:8888",
+			callsStarted:   0,
+			callsSucceeded: 0,
+			callsFailed:    0,
+		},
+		{},
+	}
+	channelz.NewChannelzStorage()
+	for _, c := range tcs {
+		channelz.RegisterChannel(c, 0, "")
+	}
+	s := newCZServer()
+	resp, _ := s.GetTopChannels(context.Background(), &channelzpb.GetTopChannelsRequest{StartChannelId: 0})
+	if !resp.GetEnd() {
+		t.Fatalf("resp.GetEnd() want true, got %v", resp.GetEnd())
+	}
+	for i, c := range resp.GetChannel() {
+		if !reflect.DeepEqual(channelProtoToStruct(c), tcs[i]) {
+			t.Fatalf("dummyChannel: %d, want: %#v, got: %#v", i, tcs[i], channelProtoToStruct(c))
+		}
+	}
+	for i := 0; i < 50; i++ {
+		channelz.RegisterChannel(tcs[0], 0, "")
+	}
+	resp, _ = s.GetTopChannels(context.Background(), &channelzpb.GetTopChannelsRequest{StartChannelId: 0})
+	if resp.GetEnd() {
+		t.Fatalf("resp.GetEnd() want false, got %v", resp.GetEnd())
+	}
+}
+
+func TestGetServers(t *testing.T) {
+	ss := []*dummyServer{
+		{
+			callsStarted:             6,
+			callsSucceeded:           2,
+			callsFailed:              3,
+			lastCallStartedTimestamp: time.Now().UTC(),
+		},
+		{
+			callsStarted:             1,
+			callsSucceeded:           2,
+			callsFailed:              3,
+			lastCallStartedTimestamp: time.Now().UTC(),
+		},
+		{
+			callsStarted:             1,
+			callsSucceeded:           0,
+			callsFailed:              0,
+			lastCallStartedTimestamp: time.Now().UTC(),
+		},
+	}
+	channelz.NewChannelzStorage()
+	for _, s := range ss {
+		channelz.RegisterServer(s, "")
+	}
+	svr := newCZServer()
+	resp, _ := svr.GetServers(context.Background(), &channelzpb.GetServersRequest{StartServerId: 0})
+	if !resp.GetEnd() {
+		t.Fatalf("resp.GetEnd() want true, got %v", resp.GetEnd())
+	}
+	for i, s := range resp.GetServer() {
+		if !reflect.DeepEqual(serverProtoToStruct(s), ss[i]) {
+			t.Fatalf("dummyServer: %d, want: %#v, got: %#v", i, ss[i], serverProtoToStruct(s))
+		}
+	}
+	for i := 0; i < 50; i++ {
+		channelz.RegisterServer(ss[0], "")
+	}
+	resp, _ = svr.GetServers(context.Background(), &channelzpb.GetServersRequest{StartServerId: 0})
+	if resp.GetEnd() {
+		t.Fatalf("resp.GetEnd() want false, got %v", resp.GetEnd())
+	}
+}
+
+func TestGetServerSockets(t *testing.T) {
+	channelz.NewChannelzStorage()
+	svrID := channelz.RegisterServer(&dummyServer{}, "")
+	refNames := []string{"listen socket 1", "normal socket 1", "normal socket 2"}
+	ids := make([]int64, 3)
+	ids[0] = channelz.RegisterListenSocket(&dummySocket{}, svrID, refNames[0])
+	ids[1] = channelz.RegisterNormalSocket(&dummySocket{}, svrID, refNames[1])
+	ids[2] = channelz.RegisterNormalSocket(&dummySocket{}, svrID, refNames[2])
+	svr := newCZServer()
+	resp, _ := svr.GetServerSockets(context.Background(), &channelzpb.GetServerSocketsRequest{ServerId: svrID, StartSocketId: 0})
+	if !resp.GetEnd() {
+		t.Fatalf("resp.GetEnd() want: true, got: %v", resp.GetEnd())
+	}
+	// GetServerSockets only return normal sockets.
+	want := map[int64]string{
+		ids[1]: refNames[1],
+		ids[2]: refNames[2],
+	}
+	if !reflect.DeepEqual(convertSocketRefSliceToMap(resp.GetSocketRef()), want) {
+		t.Fatalf("GetServerSockets want: %#v, got: %#v", want, resp.GetSocketRef())
+	}
+
+	for i := 0; i < 50; i++ {
+		channelz.RegisterNormalSocket(&dummySocket{}, svrID, "")
+	}
+	resp, _ = svr.GetServerSockets(context.Background(), &channelzpb.GetServerSocketsRequest{ServerId: svrID, StartSocketId: 0})
+	if resp.GetEnd() {
+		t.Fatalf("resp.GetEnd() want false, got %v", resp.GetEnd())
+	}
+}
+
+func TestGetChannel(t *testing.T) {
+	channelz.NewChannelzStorage()
+	refNames := []string{"top channel 1", "nested channel 1", "nested channel 2", "nested channel 3"}
+	ids := make([]int64, 4)
+	ids[0] = channelz.RegisterChannel(&dummyChannel{}, 0, refNames[0])
+	ids[1] = channelz.RegisterChannel(&dummyChannel{}, ids[0], refNames[1])
+	ids[2] = channelz.RegisterSubChannel(&dummyChannel{}, ids[0], refNames[2])
+	ids[3] = channelz.RegisterChannel(&dummyChannel{}, ids[1], refNames[3])
+	svr := newCZServer()
+	resp, _ := svr.GetChannel(context.Background(), &channelzpb.GetChannelRequest{ChannelId: ids[0]})
+	metrics := resp.GetChannel()
+	subChans := metrics.GetSubchannelRef()
+	if len(subChans) != 1 || subChans[0].GetName() != refNames[2] || subChans[0].GetSubchannelId() != ids[2] {
+		t.Fatalf("GetSubChannelRef() want %#v, got %#v", []*channelzpb.SubchannelRef{{SubchannelId: ids[2], Name: refNames[2]}}, subChans)
+	}
+	nestedChans := metrics.GetChannelRef()
+	if len(nestedChans) != 1 || nestedChans[0].GetName() != refNames[1] || nestedChans[0].GetChannelId() != ids[1] {
+		t.Fatalf("GetChannelRef() want %#v, got %#v", []*channelzpb.ChannelRef{{ChannelId: ids[1], Name: refNames[1]}}, nestedChans)
+	}
+
+	resp, _ = svr.GetChannel(context.Background(), &channelzpb.GetChannelRequest{ChannelId: ids[1]})
+	metrics = resp.GetChannel()
+	nestedChans = metrics.GetChannelRef()
+	if len(nestedChans) != 1 || nestedChans[0].GetName() != refNames[3] || nestedChans[0].GetChannelId() != ids[3] {
+		t.Fatalf("GetChannelRef() want %#v, got %#v", []*channelzpb.ChannelRef{{ChannelId: ids[3], Name: refNames[3]}}, nestedChans)
+	}
+}
+
+func TestGetSubChannel(t *testing.T) {
+	channelz.NewChannelzStorage()
+	refNames := []string{"top channel 1", "sub channel 1", "socket 1", "socket 2"}
+	ids := make([]int64, 4)
+	ids[0] = channelz.RegisterChannel(&dummyChannel{}, 0, refNames[0])
+	ids[1] = channelz.RegisterSubChannel(&dummyChannel{}, ids[0], refNames[1])
+	ids[2] = channelz.RegisterNormalSocket(&dummySocket{}, ids[1], refNames[2])
+	ids[3] = channelz.RegisterNormalSocket(&dummySocket{}, ids[1], refNames[3])
+	svr := newCZServer()
+	resp, _ := svr.GetSubchannel(context.Background(), &channelzpb.GetSubchannelRequest{SubchannelId: ids[1]})
+	metrics := resp.GetSubchannel()
+	want := map[int64]string{
+		ids[2]: refNames[2],
+		ids[3]: refNames[3],
+	}
+	if !reflect.DeepEqual(convertSocketRefSliceToMap(metrics.GetSocketRef()), want) {
+		t.Fatalf("GetSocketRef() want %#v: got: %#v", want, metrics.GetSocketRef())
+	}
+}
+
+func TestGetSocket(t *testing.T) {
+	channelz.NewChannelzStorage()
+	ss := []*dummySocket{
+		{
+			streamsStarted:                   10,
+			streamsSucceeded:                 2,
+			streamsFailed:                    3,
+			messagesSent:                     20,
+			messagesReceived:                 10,
+			keepAlivesSent:                   2,
+			lastLocalStreamCreatedTimestamp:  time.Now().UTC(),
+			lastRemoteStreamCreatedTimestamp: time.Now().UTC(),
+			lastMessageSentTimestamp:         time.Now().UTC(),
+			lastMessageReceivedTimestamp:     time.Now().UTC(),
+			localFlowControlWindow:           65536,
+			remoteFlowControlWindow:          1024,
+			localAddr:                        &net.TCPAddr{IP: net.ParseIP("1.0.0.1"), Port: 10001},
+			remoteAddr:                       &net.TCPAddr{IP: net.ParseIP("12.0.0.1"), Port: 10002},
+			remoteName:                       "remote.remote",
+		},
+		{
+			streamsStarted:                   10,
+			streamsSucceeded:                 2,
+			streamsFailed:                    3,
+			messagesSent:                     20,
+			messagesReceived:                 10,
+			keepAlivesSent:                   2,
+			lastRemoteStreamCreatedTimestamp: time.Now().UTC(),
+			lastMessageSentTimestamp:         time.Now().UTC(),
+			lastMessageReceivedTimestamp:     time.Now().UTC(),
+			localFlowControlWindow:           65536,
+			remoteFlowControlWindow:          1024,
+			localAddr:                        &net.UnixAddr{Name: "file.path", Net: "unix"},
+			remoteAddr:                       &net.UnixAddr{Name: "another.path", Net: "unix"},
+			remoteName:                       "remote.remote",
+		},
+		{
+			streamsStarted:                  5,
+			streamsSucceeded:                2,
+			streamsFailed:                   3,
+			messagesSent:                    20,
+			messagesReceived:                10,
+			keepAlivesSent:                  2,
+			lastLocalStreamCreatedTimestamp: time.Now().UTC(),
+			lastMessageSentTimestamp:        time.Now().UTC(),
+			lastMessageReceivedTimestamp:    time.Now().UTC(),
+			localFlowControlWindow:          65536,
+			remoteFlowControlWindow:         10240,
+			localAddr:                       &net.IPAddr{IP: net.ParseIP("1.0.0.1")},
+			remoteAddr:                      &net.IPAddr{IP: net.ParseIP("9.0.0.1")},
+			remoteName:                      "",
+		},
+		{
+			localAddr: &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 10001},
+		},
+		{
+			security: &credentials.TLSChannelzSecurityValue{
+				StandardName:      "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+				RemoteCertificate: []byte{48, 130, 2, 156, 48, 130, 2, 5, 160},
+			},
+		},
+		{
+			security: &credentials.OtherChannelzSecurityValue{
+				Name: "XXXX",
+			},
+		},
+		{
+			security: &credentials.OtherChannelzSecurityValue{
+				Name:  "YYYY",
+				Value: &OtherSecurityValue{LocalCertificate: []byte{1, 2, 3}, RemoteCertificate: []byte{4, 5, 6}},
+			},
+		},
+	}
+	svr := newCZServer()
+	ids := make([]int64, len(ss))
+	svrID := channelz.RegisterServer(&dummyServer{}, "")
+	for i, s := range ss {
+		ids[i] = channelz.RegisterNormalSocket(s, svrID, strconv.Itoa(i))
+	}
+	for i, s := range ss {
+		resp, _ := svr.GetSocket(context.Background(), &channelzpb.GetSocketRequest{SocketId: ids[i]})
+		metrics := resp.GetSocket()
+		if !reflect.DeepEqual(metrics.GetRef(), &channelzpb.SocketRef{SocketId: ids[i], Name: strconv.Itoa(i)}) || !reflect.DeepEqual(socketProtoToStruct(metrics), s) {
+			t.Fatalf("resp.GetSocket() want: metrics.GetRef() = %#v and %#v, got: metrics.GetRef() = %#v and %#v", &channelzpb.SocketRef{SocketId: ids[i], Name: strconv.Itoa(i)}, s, metrics.GetRef(), socketProtoToStruct(metrics))
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/channelz/service/util_sktopt_386_test.go b/vendor/google.golang.org/grpc/channelz/service/util_sktopt_386_test.go
new file mode 100644
index 00000000..e713f16d
--- /dev/null
+++ b/vendor/google.golang.org/grpc/channelz/service/util_sktopt_386_test.go
@@ -0,0 +1,33 @@
+// +build 386,linux,!appengine,go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package service
+
+import (
+	"golang.org/x/sys/unix"
+	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+)
+
+func protoToTime(protoTime *channelzpb.SocketOptionTimeout) *unix.Timeval {
+	timeout := &unix.Timeval{}
+	sec, usec := convertToDuration(protoTime.GetDuration())
+	timeout.Sec, timeout.Usec = int32(sec), int32(usec)
+	return timeout
+}
diff --git a/vendor/google.golang.org/grpc/channelz/service/util_sktopt_amd64_test.go b/vendor/google.golang.org/grpc/channelz/service/util_sktopt_amd64_test.go
new file mode 100644
index 00000000..0c1db69b
--- /dev/null
+++ b/vendor/google.golang.org/grpc/channelz/service/util_sktopt_amd64_test.go
@@ -0,0 +1,32 @@
+// +build amd64,linux,!appengine,go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package service
+
+import (
+	"golang.org/x/sys/unix"
+	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+)
+
+func protoToTime(protoTime *channelzpb.SocketOptionTimeout) *unix.Timeval {
+	timeout := &unix.Timeval{}
+	timeout.Sec, timeout.Usec = convertToDuration(protoTime.GetDuration())
+	return timeout
+}
diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go
index 2c22d628..9b035e8f 100644
--- a/vendor/google.golang.org/grpc/clientconn.go
+++ b/vendor/google.golang.org/grpc/clientconn.go
@@ -26,6 +26,7 @@ import (
 	"reflect"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"golang.org/x/net/context"
@@ -36,13 +37,21 @@ import (
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/backoff"
+	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/resolver"
 	_ "google.golang.org/grpc/resolver/dns"         // To register dns resolver.
 	_ "google.golang.org/grpc/resolver/passthrough" // To register passthrough resolver.
-	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/transport"
+)
+
+const (
+	// minimum time to give a connection to complete
+	minConnectTimeout = 20 * time.Second
+	// must match grpclbName in grpclb/grpclb.go
+	grpclbName = "grpclb"
 )
 
 var (
@@ -60,8 +69,11 @@ var (
 	errConnUnavailable = errors.New("grpc: the connection is unavailable")
 	// errBalancerClosed indicates that the balancer is closed.
 	errBalancerClosed = errors.New("grpc: balancer is closed")
-	// minimum time to give a connection to complete
-	minConnectTimeout = 20 * time.Second
+	// We use an accessor so that minConnectTimeout can be
+	// atomically read and updated while testing.
+	getMinConnectTimeout = func() time.Duration {
+		return minConnectTimeout
+	}
 )
 
 // The following errors are returned from Dial and DialContext
@@ -81,311 +93,18 @@ var (
 	errNetworkIO = errors.New("grpc: failed with network I/O error")
 )
 
-// dialOptions configure a Dial call. dialOptions are set by the DialOption
-// values passed to Dial.
-type dialOptions struct {
-	unaryInt    UnaryClientInterceptor
-	streamInt   StreamClientInterceptor
-	cp          Compressor
-	dc          Decompressor
-	bs          backoffStrategy
-	block       bool
-	insecure    bool
-	timeout     time.Duration
-	scChan      <-chan ServiceConfig
-	copts       transport.ConnectOptions
-	callOptions []CallOption
-	// This is used by v1 balancer dial option WithBalancer to support v1
-	// balancer, and also by WithBalancerName dial option.
-	balancerBuilder balancer.Builder
-	// This is to support grpclb.
-	resolverBuilder  resolver.Builder
-	waitForHandshake bool
-}
-
 const (
 	defaultClientMaxReceiveMessageSize = 1024 * 1024 * 4
 	defaultClientMaxSendMessageSize    = math.MaxInt32
+	// http2IOBufSize specifies the buffer size for sending frames.
+	defaultWriteBufSize = 32 * 1024
+	defaultReadBufSize  = 32 * 1024
 )
 
-// DialOption configures how we set up the connection.
-type DialOption func(*dialOptions)
-
-// WithWaitForHandshake blocks until the initial settings frame is received from the
-// server before assigning RPCs to the connection.
-// Experimental API.
-func WithWaitForHandshake() DialOption {
-	return func(o *dialOptions) {
-		o.waitForHandshake = true
-	}
-}
-
-// WithWriteBufferSize lets you set the size of write buffer, this determines how much data can be batched
-// before doing a write on the wire.
-func WithWriteBufferSize(s int) DialOption {
-	return func(o *dialOptions) {
-		o.copts.WriteBufferSize = s
-	}
-}
-
-// WithReadBufferSize lets you set the size of read buffer, this determines how much data can be read at most
-// for each read syscall.
-func WithReadBufferSize(s int) DialOption {
-	return func(o *dialOptions) {
-		o.copts.ReadBufferSize = s
-	}
-}
-
-// WithInitialWindowSize returns a DialOption which sets the value for initial window size on a stream.
-// The lower bound for window size is 64K and any value smaller than that will be ignored.
-func WithInitialWindowSize(s int32) DialOption {
-	return func(o *dialOptions) {
-		o.copts.InitialWindowSize = s
-	}
-}
-
-// WithInitialConnWindowSize returns a DialOption which sets the value for initial window size on a connection.
-// The lower bound for window size is 64K and any value smaller than that will be ignored.
-func WithInitialConnWindowSize(s int32) DialOption {
-	return func(o *dialOptions) {
-		o.copts.InitialConnWindowSize = s
-	}
-}
-
-// WithMaxMsgSize returns a DialOption which sets the maximum message size the client can receive. Deprecated: use WithDefaultCallOptions(MaxCallRecvMsgSize(s)) instead.
-func WithMaxMsgSize(s int) DialOption {
-	return WithDefaultCallOptions(MaxCallRecvMsgSize(s))
-}
-
-// WithDefaultCallOptions returns a DialOption which sets the default CallOptions for calls over the connection.
-func WithDefaultCallOptions(cos ...CallOption) DialOption {
-	return func(o *dialOptions) {
-		o.callOptions = append(o.callOptions, cos...)
-	}
-}
-
-// WithCodec returns a DialOption which sets a codec for message marshaling and unmarshaling.
-//
-// Deprecated: use WithDefaultCallOptions(CallCustomCodec(c)) instead.
-func WithCodec(c Codec) DialOption {
-	return WithDefaultCallOptions(CallCustomCodec(c))
-}
-
-// WithCompressor returns a DialOption which sets a Compressor to use for
-// message compression. It has lower priority than the compressor set by
-// the UseCompressor CallOption.
-//
-// Deprecated: use UseCompressor instead.
-func WithCompressor(cp Compressor) DialOption {
-	return func(o *dialOptions) {
-		o.cp = cp
-	}
-}
-
-// WithDecompressor returns a DialOption which sets a Decompressor to use for
-// incoming message decompression.  If incoming response messages are encoded
-// using the decompressor's Type(), it will be used.  Otherwise, the message
-// encoding will be used to look up the compressor registered via
-// encoding.RegisterCompressor, which will then be used to decompress the
-// message.  If no compressor is registered for the encoding, an Unimplemented
-// status error will be returned.
-//
-// Deprecated: use encoding.RegisterCompressor instead.
-func WithDecompressor(dc Decompressor) DialOption {
-	return func(o *dialOptions) {
-		o.dc = dc
-	}
-}
-
-// WithBalancer returns a DialOption which sets a load balancer with the v1 API.
-// Name resolver will be ignored if this DialOption is specified.
-//
-// Deprecated: use the new balancer APIs in balancer package and WithBalancerName.
-func WithBalancer(b Balancer) DialOption {
-	return func(o *dialOptions) {
-		o.balancerBuilder = &balancerWrapperBuilder{
-			b: b,
-		}
-	}
-}
-
-// WithBalancerName sets the balancer that the ClientConn will be initialized
-// with. Balancer registered with balancerName will be used. This function
-// panics if no balancer was registered by balancerName.
-//
-// The balancer cannot be overridden by balancer option specified by service
-// config.
-//
-// This is an EXPERIMENTAL API.
-func WithBalancerName(balancerName string) DialOption {
-	builder := balancer.Get(balancerName)
-	if builder == nil {
-		panic(fmt.Sprintf("grpc.WithBalancerName: no balancer is registered for name %v", balancerName))
-	}
-	return func(o *dialOptions) {
-		o.balancerBuilder = builder
-	}
-}
-
-// withResolverBuilder is only for grpclb.
-func withResolverBuilder(b resolver.Builder) DialOption {
-	return func(o *dialOptions) {
-		o.resolverBuilder = b
-	}
-}
-
-// WithServiceConfig returns a DialOption which has a channel to read the service configuration.
-// DEPRECATED: service config should be received through name resolver, as specified here.
-// https://github.com/grpc/grpc/blob/master/doc/service_config.md
-func WithServiceConfig(c <-chan ServiceConfig) DialOption {
-	return func(o *dialOptions) {
-		o.scChan = c
-	}
-}
-
-// WithBackoffMaxDelay configures the dialer to use the provided maximum delay
-// when backing off after failed connection attempts.
-func WithBackoffMaxDelay(md time.Duration) DialOption {
-	return WithBackoffConfig(BackoffConfig{MaxDelay: md})
-}
-
-// WithBackoffConfig configures the dialer to use the provided backoff
-// parameters after connection failures.
-//
-// Use WithBackoffMaxDelay until more parameters on BackoffConfig are opened up
-// for use.
-func WithBackoffConfig(b BackoffConfig) DialOption {
-	// Set defaults to ensure that provided BackoffConfig is valid and
-	// unexported fields get default values.
-	setDefaults(&b)
-	return withBackoff(b)
-}
-
-// withBackoff sets the backoff strategy used for connectRetryNum after a
-// failed connection attempt.
-//
-// This can be exported if arbitrary backoff strategies are allowed by gRPC.
-func withBackoff(bs backoffStrategy) DialOption {
-	return func(o *dialOptions) {
-		o.bs = bs
-	}
-}
-
-// WithBlock returns a DialOption which makes caller of Dial blocks until the underlying
-// connection is up. Without this, Dial returns immediately and connecting the server
-// happens in background.
-func WithBlock() DialOption {
-	return func(o *dialOptions) {
-		o.block = true
-	}
-}
-
-// WithInsecure returns a DialOption which disables transport security for this ClientConn.
-// Note that transport security is required unless WithInsecure is set.
-func WithInsecure() DialOption {
-	return func(o *dialOptions) {
-		o.insecure = true
-	}
-}
-
-// WithTransportCredentials returns a DialOption which configures a
-// connection level security credentials (e.g., TLS/SSL).
-func WithTransportCredentials(creds credentials.TransportCredentials) DialOption {
-	return func(o *dialOptions) {
-		o.copts.TransportCredentials = creds
-	}
-}
-
-// WithPerRPCCredentials returns a DialOption which sets
-// credentials and places auth state on each outbound RPC.
-func WithPerRPCCredentials(creds credentials.PerRPCCredentials) DialOption {
-	return func(o *dialOptions) {
-		o.copts.PerRPCCredentials = append(o.copts.PerRPCCredentials, creds)
-	}
-}
-
-// WithTimeout returns a DialOption that configures a timeout for dialing a ClientConn
-// initially. This is valid if and only if WithBlock() is present.
-// Deprecated: use DialContext and context.WithTimeout instead.
-func WithTimeout(d time.Duration) DialOption {
-	return func(o *dialOptions) {
-		o.timeout = d
-	}
-}
-
-func withContextDialer(f func(context.Context, string) (net.Conn, error)) DialOption {
-	return func(o *dialOptions) {
-		o.copts.Dialer = f
-	}
-}
-
-// WithDialer returns a DialOption that specifies a function to use for dialing network addresses.
-// If FailOnNonTempDialError() is set to true, and an error is returned by f, gRPC checks the error's
-// Temporary() method to decide if it should try to reconnect to the network address.
-func WithDialer(f func(string, time.Duration) (net.Conn, error)) DialOption {
-	return withContextDialer(
-		func(ctx context.Context, addr string) (net.Conn, error) {
-			if deadline, ok := ctx.Deadline(); ok {
-				return f(addr, deadline.Sub(time.Now()))
-			}
-			return f(addr, 0)
-		})
-}
-
-// WithStatsHandler returns a DialOption that specifies the stats handler
-// for all the RPCs and underlying network connections in this ClientConn.
-func WithStatsHandler(h stats.Handler) DialOption {
-	return func(o *dialOptions) {
-		o.copts.StatsHandler = h
-	}
-}
-
-// FailOnNonTempDialError returns a DialOption that specifies if gRPC fails on non-temporary dial errors.
-// If f is true, and dialer returns a non-temporary error, gRPC will fail the connection to the network
-// address and won't try to reconnect.
-// The default value of FailOnNonTempDialError is false.
+// RegisterChannelz turns on channelz service.
 // This is an EXPERIMENTAL API.
-func FailOnNonTempDialError(f bool) DialOption {
-	return func(o *dialOptions) {
-		o.copts.FailOnNonTempDialError = f
-	}
-}
-
-// WithUserAgent returns a DialOption that specifies a user agent string for all the RPCs.
-func WithUserAgent(s string) DialOption {
-	return func(o *dialOptions) {
-		o.copts.UserAgent = s
-	}
-}
-
-// WithKeepaliveParams returns a DialOption that specifies keepalive parameters for the client transport.
-func WithKeepaliveParams(kp keepalive.ClientParameters) DialOption {
-	return func(o *dialOptions) {
-		o.copts.KeepaliveParams = kp
-	}
-}
-
-// WithUnaryInterceptor returns a DialOption that specifies the interceptor for unary RPCs.
-func WithUnaryInterceptor(f UnaryClientInterceptor) DialOption {
-	return func(o *dialOptions) {
-		o.unaryInt = f
-	}
-}
-
-// WithStreamInterceptor returns a DialOption that specifies the interceptor for streaming RPCs.
-func WithStreamInterceptor(f StreamClientInterceptor) DialOption {
-	return func(o *dialOptions) {
-		o.streamInt = f
-	}
-}
-
-// WithAuthority returns a DialOption that specifies the value to be used as
-// the :authority pseudo-header. This value only works with WithInsecure and
-// has no effect if TransportCredentials are present.
-func WithAuthority(a string) DialOption {
-	return func(o *dialOptions) {
-		o.copts.Authority = a
-	}
+func RegisterChannelz() {
+	channelz.TurnOn()
 }
 
 // Dial creates a client connection to the given target.
@@ -393,26 +112,43 @@ func Dial(target string, opts ...DialOption) (*ClientConn, error) {
 	return DialContext(context.Background(), target, opts...)
 }
 
-// DialContext creates a client connection to the given target. ctx can be used to
-// cancel or expire the pending connection. Once this function returns, the
-// cancellation and expiration of ctx will be noop. Users should call ClientConn.Close
-// to terminate all the pending operations after this function returns.
+// DialContext creates a client connection to the given target. By default, it's
+// a non-blocking dial (the function won't wait for connections to be
+// established, and connecting happens in the background). To make it a blocking
+// dial, use WithBlock() dial option.
+//
+// In the non-blocking case, the ctx does not act against the connection. It
+// only controls the setup steps.
+//
+// In the blocking case, ctx can be used to cancel or expire the pending
+// connection. Once this function returns, the cancellation and expiration of
+// ctx will be noop. Users should call ClientConn.Close to terminate all the
+// pending operations after this function returns.
 //
 // The target name syntax is defined in
 // https://github.com/grpc/grpc/blob/master/doc/naming.md.
 // e.g. to use dns resolver, a "dns:///" prefix should be applied to the target.
 func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *ClientConn, err error) {
 	cc := &ClientConn{
-		target: target,
-		csMgr:  &connectivityStateManager{},
-		conns:  make(map[*addrConn]struct{}),
-
+		target:         target,
+		csMgr:          &connectivityStateManager{},
+		conns:          make(map[*addrConn]struct{}),
+		dopts:          defaultDialOptions(),
 		blockingpicker: newPickerWrapper(),
 	}
+	cc.retryThrottler.Store((*retryThrottler)(nil))
 	cc.ctx, cc.cancel = context.WithCancel(context.Background())
 
 	for _, opt := range opts {
-		opt(&cc.dopts)
+		opt.apply(&cc.dopts)
+	}
+
+	if channelz.IsOn() {
+		if cc.dopts.channelzParentID != 0 {
+			cc.channelzID = channelz.RegisterChannel(cc, cc.dopts.channelzParentID, target)
+		} else {
+			cc.channelzID = channelz.RegisterChannel(cc, 0, target)
+		}
 	}
 
 	if !cc.dopts.insecure {
@@ -435,7 +171,8 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *
 	if cc.dopts.copts.Dialer == nil {
 		cc.dopts.copts.Dialer = newProxyDialer(
 			func(ctx context.Context, addr string) (net.Conn, error) {
-				return dialContext(ctx, "tcp", addr)
+				network, addr := parseDialTarget(addr)
+				return dialContext(ctx, network, addr)
 			},
 		)
 	}
@@ -477,14 +214,34 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *
 		}
 	}
 	if cc.dopts.bs == nil {
-		cc.dopts.bs = DefaultBackoffConfig
+		cc.dopts.bs = backoff.Exponential{
+			MaxDelay: DefaultBackoffConfig.MaxDelay,
+		}
+	}
+	if cc.dopts.resolverBuilder == nil {
+		// Only try to parse target when resolver builder is not already set.
+		cc.parsedTarget = parseTarget(cc.target)
+		grpclog.Infof("parsed scheme: %q", cc.parsedTarget.Scheme)
+		cc.dopts.resolverBuilder = resolver.Get(cc.parsedTarget.Scheme)
+		if cc.dopts.resolverBuilder == nil {
+			// If resolver builder is still nil, the parse target's scheme is
+			// not registered. Fallback to default resolver and set Endpoint to
+			// the original unparsed target.
+			grpclog.Infof("scheme %q not registered, fallback to default scheme", cc.parsedTarget.Scheme)
+			cc.parsedTarget = resolver.Target{
+				Scheme:   resolver.GetDefaultScheme(),
+				Endpoint: target,
+			}
+			cc.dopts.resolverBuilder = resolver.Get(cc.parsedTarget.Scheme)
+		}
+	} else {
+		cc.parsedTarget = resolver.Target{Endpoint: target}
 	}
-	cc.parsedTarget = parseTarget(cc.target)
 	creds := cc.dopts.copts.TransportCredentials
 	if creds != nil && creds.Info().ServerName != "" {
 		cc.authority = creds.Info().ServerName
-	} else if cc.dopts.insecure && cc.dopts.copts.Authority != "" {
-		cc.authority = cc.dopts.copts.Authority
+	} else if cc.dopts.insecure && cc.dopts.authority != "" {
+		cc.authority = cc.dopts.authority
 	} else {
 		// Use endpoint from "scheme://authority/endpoint" as the default
 		// authority for ClientConn.
@@ -511,8 +268,9 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *
 		credsClone = creds.Clone()
 	}
 	cc.balancerBuildOpts = balancer.BuildOptions{
-		DialCreds: credsClone,
-		Dialer:    cc.dopts.copts.Dialer,
+		DialCreds:        credsClone,
+		Dialer:           cc.dopts.copts.Dialer,
+		ChannelzParentID: cc.channelzID,
 	}
 
 	// Build the resolver.
@@ -614,6 +372,14 @@ type ClientConn struct {
 	preBalancerName string // previous balancer name.
 	curAddresses    []resolver.Address
 	balancerWrapper *ccBalancerWrapper
+	retryThrottler  atomic.Value
+
+	channelzID          int64 // channelz unique identification number
+	czmu                sync.RWMutex
+	callsStarted        int64
+	callsSucceeded      int64
+	callsFailed         int64
+	lastCallStartedTime time.Time
 }
 
 // WaitForStateChange waits until the connectivity.State of ClientConn changes from sourceState or
@@ -777,6 +543,9 @@ func (cc *ClientConn) newAddrConn(addrs []resolver.Address) (*addrConn, error) {
 		cc.mu.Unlock()
 		return nil, ErrClientConnClosing
 	}
+	if channelz.IsOn() {
+		ac.channelzID = channelz.RegisterSubChannel(ac, cc.channelzID, "")
+	}
 	cc.conns[ac] = struct{}{}
 	cc.mu.Unlock()
 	return ac, nil
@@ -795,6 +564,48 @@ func (cc *ClientConn) removeAddrConn(ac *addrConn, err error) {
 	ac.tearDown(err)
 }
 
+// ChannelzMetric returns ChannelInternalMetric of current ClientConn.
+// This is an EXPERIMENTAL API.
+func (cc *ClientConn) ChannelzMetric() *channelz.ChannelInternalMetric {
+	state := cc.GetState()
+	cc.czmu.RLock()
+	defer cc.czmu.RUnlock()
+	return &channelz.ChannelInternalMetric{
+		State:                    state,
+		Target:                   cc.target,
+		CallsStarted:             cc.callsStarted,
+		CallsSucceeded:           cc.callsSucceeded,
+		CallsFailed:              cc.callsFailed,
+		LastCallStartedTimestamp: cc.lastCallStartedTime,
+	}
+}
+
+// Target returns the target string of the ClientConn.
+// This is an EXPERIMENTAL API.
+func (cc *ClientConn) Target() string {
+	return cc.target
+}
+
+func (cc *ClientConn) incrCallsStarted() {
+	cc.czmu.Lock()
+	cc.callsStarted++
+	// TODO(yuxuanli): will make this a time.Time pointer improve performance?
+	cc.lastCallStartedTime = time.Now()
+	cc.czmu.Unlock()
+}
+
+func (cc *ClientConn) incrCallsSucceeded() {
+	cc.czmu.Lock()
+	cc.callsSucceeded++
+	cc.czmu.Unlock()
+}
+
+func (cc *ClientConn) incrCallsFailed() {
+	cc.czmu.Lock()
+	cc.callsFailed++
+	cc.czmu.Unlock()
+}
+
 // connect starts to creating transport and also starts the transport monitor
 // goroutine for this ac.
 // It does nothing if the ac is not IDLE.
@@ -865,7 +676,7 @@ func (ac *addrConn) tryUpdateAddrs(addrs []resolver.Address) bool {
 // the corresponding MethodConfig.
 // If there isn't an exact match for the input method, we look for the default config
 // under the service (i.e /service/). If there is a default MethodConfig for
-// the serivce, we return it.
+// the service, we return it.
 // Otherwise, we return an empty MethodConfig.
 func (cc *ClientConn) GetMethodConfig(method string) MethodConfig {
 	// TODO: Avoid the locking here.
@@ -874,13 +685,15 @@ func (cc *ClientConn) GetMethodConfig(method string) MethodConfig {
 	m, ok := cc.sc.Methods[method]
 	if !ok {
 		i := strings.LastIndex(method, "/")
-		m, _ = cc.sc.Methods[method[:i+1]]
+		m = cc.sc.Methods[method[:i+1]]
 	}
 	return m
 }
 
-func (cc *ClientConn) getTransport(ctx context.Context, failfast bool) (transport.ClientTransport, func(balancer.DoneInfo), error) {
-	t, done, err := cc.blockingpicker.pick(ctx, failfast, balancer.PickOptions{})
+func (cc *ClientConn) getTransport(ctx context.Context, failfast bool, method string) (transport.ClientTransport, func(balancer.DoneInfo), error) {
+	t, done, err := cc.blockingpicker.pick(ctx, failfast, balancer.PickOptions{
+		FullMethodName: method,
+	})
 	if err != nil {
 		return nil, nil, toRPCErr(err)
 	}
@@ -890,6 +703,9 @@ func (cc *ClientConn) getTransport(ctx context.Context, failfast bool) (transpor
 // handleServiceConfig parses the service config string in JSON format to Go native
 // struct ServiceConfig, and store both the struct and the JSON string in ClientConn.
 func (cc *ClientConn) handleServiceConfig(js string) error {
+	if cc.dopts.disableServiceConfig {
+		return nil
+	}
 	sc, err := parseServiceConfig(js)
 	if err != nil {
 		return err
@@ -897,6 +713,19 @@ func (cc *ClientConn) handleServiceConfig(js string) error {
 	cc.mu.Lock()
 	cc.scRaw = js
 	cc.sc = sc
+
+	if sc.retryThrottling != nil {
+		newThrottler := &retryThrottler{
+			tokens: sc.retryThrottling.MaxTokens,
+			max:    sc.retryThrottling.MaxTokens,
+			thresh: sc.retryThrottling.MaxTokens / 2,
+			ratio:  sc.retryThrottling.TokenRatio,
+		}
+		cc.retryThrottler.Store(newThrottler)
+	} else {
+		cc.retryThrottler.Store((*retryThrottler)(nil))
+	}
+
 	if sc.LB != nil && *sc.LB != grpclbName { // "grpclb" is not a valid balancer option in service config.
 		if cc.curBalancerName == grpclbName {
 			// If current balancer is grpclb, there's at least one grpclb
@@ -910,14 +739,15 @@ func (cc *ClientConn) handleServiceConfig(js string) error {
 			cc.balancerWrapper.handleResolvedAddrs(cc.curAddresses, nil)
 		}
 	}
+
 	cc.mu.Unlock()
 	return nil
 }
 
 func (cc *ClientConn) resolveNow(o resolver.ResolveNowOption) {
-	cc.mu.Lock()
+	cc.mu.RLock()
 	r := cc.resolverWrapper
-	cc.mu.Unlock()
+	cc.mu.RUnlock()
 	if r == nil {
 		return
 	}
@@ -926,7 +756,7 @@ func (cc *ClientConn) resolveNow(o resolver.ResolveNowOption) {
 
 // Close tears down the ClientConn and all underlying connections.
 func (cc *ClientConn) Close() error {
-	cc.cancel()
+	defer cc.cancel()
 
 	cc.mu.Lock()
 	if cc.conns == nil {
@@ -942,16 +772,22 @@ func (cc *ClientConn) Close() error {
 	bWrapper := cc.balancerWrapper
 	cc.balancerWrapper = nil
 	cc.mu.Unlock()
+
 	cc.blockingpicker.close()
+
 	if rWrapper != nil {
 		rWrapper.close()
 	}
 	if bWrapper != nil {
 		bWrapper.close()
 	}
+
 	for ac := range conns {
 		ac.tearDown(ErrClientConnClosing)
 	}
+	if channelz.IsOn() {
+		channelz.RemoveEntry(cc.channelzID)
+	}
 	return nil
 }
 
@@ -985,6 +821,13 @@ type addrConn struct {
 	// connectDeadline is the time by which all connection
 	// negotiations must complete.
 	connectDeadline time.Time
+
+	channelzID          int64 // channelz unique identification number
+	czmu                sync.RWMutex
+	callsStarted        int64
+	callsSucceeded      int64
+	callsFailed         int64
+	lastCallStartedTime time.Time
 }
 
 // adjustParams updates parameters used to create transports upon
@@ -1020,7 +863,7 @@ func (ac *addrConn) errorf(format string, a ...interface{}) {
 // resetTransport recreates a transport to the address for ac.  The old
 // transport will close itself on error or when the clientconn is closed.
 // The created transport must receive initial settings frame from the server.
-// In case that doesnt happen, transportMonitor will kill the newly created
+// In case that doesn't happen, transportMonitor will kill the newly created
 // transport after connectDeadline has expired.
 // In case there was an error on the transport before the settings frame was
 // received, resetTransport resumes connecting to backends after the one that
@@ -1053,9 +896,9 @@ func (ac *addrConn) resetTransport() error {
 			// This means either a successful HTTP2 connection was established
 			// or this is the first time this addrConn is trying to establish a
 			// connection.
-			backoffFor := ac.dopts.bs.backoff(connectRetryNum) // time.Duration.
+			backoffFor := ac.dopts.bs.Backoff(connectRetryNum) // time.Duration.
 			// This will be the duration that dial gets to finish.
-			dialDuration := minConnectTimeout
+			dialDuration := getMinConnectTimeout()
 			if backoffFor > dialDuration {
 				// Give dial more time as we keep failing to connect.
 				dialDuration = backoffFor
@@ -1065,7 +908,7 @@ func (ac *addrConn) resetTransport() error {
 			connectDeadline = start.Add(dialDuration)
 			ridx = 0 // Start connecting from the beginning.
 		} else {
-			// Continue trying to conect with the same deadlines.
+			// Continue trying to connect with the same deadlines.
 			connectRetryNum = ac.connectRetryNum
 			backoffDeadline = ac.backoffDeadline
 			connectDeadline = ac.connectDeadline
@@ -1126,18 +969,13 @@ func (ac *addrConn) createTransport(connectRetryNum, ridx int, backoffDeadline,
 		// Do not cancel in the success path because of
 		// this issue in Go1.6: https://github.com/golang/go/issues/15078.
 		connectCtx, cancel := context.WithDeadline(ac.ctx, connectDeadline)
+		if channelz.IsOn() {
+			copts.ChannelzParentID = ac.channelzID
+		}
 		newTr, err := transport.NewClientTransport(connectCtx, ac.cc.ctx, target, copts, onPrefaceReceipt)
 		if err != nil {
 			cancel()
-			if e, ok := err.(transport.ConnectionError); ok && !e.Temporary() {
-				ac.mu.Lock()
-				if ac.state != connectivity.Shutdown {
-					ac.state = connectivity.TransientFailure
-					ac.cc.handleSubConnStateChange(ac.acbw, ac.state)
-				}
-				ac.mu.Unlock()
-				return false, err
-			}
+			ac.cc.blockingpicker.updateConnectionError(err)
 			ac.mu.Lock()
 			if ac.state == connectivity.Shutdown {
 				// ac.tearDown(...) has been invoked.
@@ -1155,7 +993,7 @@ func (ac *addrConn) createTransport(connectRetryNum, ridx int, backoffDeadline,
 				// Didn't receive server preface, must kill this new transport now.
 				grpclog.Warningf("grpc: addrConn.createTransport failed to receive server preface before deadline.")
 				newTr.Close()
-				break
+				continue
 			case <-ac.ctx.Done():
 			}
 		}
@@ -1189,6 +1027,10 @@ func (ac *addrConn) createTransport(connectRetryNum, ridx int, backoffDeadline,
 		return true, nil
 	}
 	ac.mu.Lock()
+	if ac.state == connectivity.Shutdown {
+		ac.mu.Unlock()
+		return false, errConnClosing
+	}
 	ac.state = connectivity.TransientFailure
 	ac.cc.handleSubConnStateChange(ac.acbw, ac.state)
 	ac.cc.resolveNow(resolver.ResolveNowOption{})
@@ -1223,7 +1065,20 @@ func (ac *addrConn) transportMonitor() {
 		// Block until we receive a goaway or an error occurs.
 		select {
 		case <-t.GoAway():
+			done := t.Error()
+			cleanup := t.Close
+			// Since this transport will be orphaned (won't have a transportMonitor)
+			// we need to launch a goroutine to keep track of clientConn.Close()
+			// happening since it might not be noticed by any other goroutine for a while.
+			go func() {
+				<-done
+				cleanup()
+			}()
 		case <-t.Error():
+			// In case this is triggered because clientConn.Close()
+			// was called, we want to immeditately close the transport
+			// since no other goroutine might notice it for a while.
+			t.Close()
 		case <-cdeadline:
 			ac.mu.Lock()
 			// This implies that client received server preface.
@@ -1274,46 +1129,6 @@ func (ac *addrConn) transportMonitor() {
 	}
 }
 
-// wait blocks until i) the new transport is up or ii) ctx is done or iii) ac is closed or
-// iv) transport is in connectivity.TransientFailure and there is a balancer/failfast is true.
-func (ac *addrConn) wait(ctx context.Context, hasBalancer, failfast bool) (transport.ClientTransport, error) {
-	for {
-		ac.mu.Lock()
-		switch {
-		case ac.state == connectivity.Shutdown:
-			if failfast || !hasBalancer {
-				// RPC is failfast or balancer is nil. This RPC should fail with ac.tearDownErr.
-				err := ac.tearDownErr
-				ac.mu.Unlock()
-				return nil, err
-			}
-			ac.mu.Unlock()
-			return nil, errConnClosing
-		case ac.state == connectivity.Ready:
-			ct := ac.transport
-			ac.mu.Unlock()
-			return ct, nil
-		case ac.state == connectivity.TransientFailure:
-			if failfast || hasBalancer {
-				ac.mu.Unlock()
-				return nil, errConnUnavailable
-			}
-		}
-		ready := ac.ready
-		if ready == nil {
-			ready = make(chan struct{})
-			ac.ready = ready
-		}
-		ac.mu.Unlock()
-		select {
-		case <-ctx.Done():
-			return nil, toRPCErr(ctx.Err())
-		// Wait until the new transport is ready or failed.
-		case <-ready:
-		}
-	}
-}
-
 // getReadyTransport returns the transport if ac's state is READY.
 // Otherwise it returns nil, false.
 // If ac's state is IDLE, it will trigger ac to connect.
@@ -1367,7 +1182,9 @@ func (ac *addrConn) tearDown(err error) {
 		close(ac.ready)
 		ac.ready = nil
 	}
-	return
+	if channelz.IsOn() {
+		channelz.RemoveEntry(ac.channelzID)
+	}
 }
 
 func (ac *addrConn) getState() connectivity.State {
@@ -1376,6 +1193,79 @@ func (ac *addrConn) getState() connectivity.State {
 	return ac.state
 }
 
+func (ac *addrConn) ChannelzMetric() *channelz.ChannelInternalMetric {
+	ac.mu.Lock()
+	addr := ac.curAddr.Addr
+	ac.mu.Unlock()
+	state := ac.getState()
+	ac.czmu.RLock()
+	defer ac.czmu.RUnlock()
+	return &channelz.ChannelInternalMetric{
+		State:                    state,
+		Target:                   addr,
+		CallsStarted:             ac.callsStarted,
+		CallsSucceeded:           ac.callsSucceeded,
+		CallsFailed:              ac.callsFailed,
+		LastCallStartedTimestamp: ac.lastCallStartedTime,
+	}
+}
+
+func (ac *addrConn) incrCallsStarted() {
+	ac.czmu.Lock()
+	ac.callsStarted++
+	ac.lastCallStartedTime = time.Now()
+	ac.czmu.Unlock()
+}
+
+func (ac *addrConn) incrCallsSucceeded() {
+	ac.czmu.Lock()
+	ac.callsSucceeded++
+	ac.czmu.Unlock()
+}
+
+func (ac *addrConn) incrCallsFailed() {
+	ac.czmu.Lock()
+	ac.callsFailed++
+	ac.czmu.Unlock()
+}
+
+type retryThrottler struct {
+	max    float64
+	thresh float64
+	ratio  float64
+
+	mu     sync.Mutex
+	tokens float64 // TODO(dfawley): replace with atomic and remove lock.
+}
+
+// throttle subtracts a retry token from the pool and returns whether a retry
+// should be throttled (disallowed) based upon the retry throttling policy in
+// the service config.
+func (rt *retryThrottler) throttle() bool {
+	if rt == nil {
+		return false
+	}
+	rt.mu.Lock()
+	defer rt.mu.Unlock()
+	rt.tokens--
+	if rt.tokens < 0 {
+		rt.tokens = 0
+	}
+	return rt.tokens <= rt.thresh
+}
+
+func (rt *retryThrottler) successfulRPC() {
+	if rt == nil {
+		return
+	}
+	rt.mu.Lock()
+	defer rt.mu.Unlock()
+	rt.tokens += rt.ratio
+	if rt.tokens > rt.max {
+		rt.tokens = rt.max
+	}
+}
+
 // ErrClientConnTimeout indicates that the ClientConn cannot establish the
 // underlying connections within the specified timeout.
 //
diff --git a/vendor/google.golang.org/grpc/clientconn_test.go b/vendor/google.golang.org/grpc/clientconn_test.go
index 4e8e9018..f2614dec 100644
--- a/vendor/google.golang.org/grpc/clientconn_test.go
+++ b/vendor/google.golang.org/grpc/clientconn_test.go
@@ -19,26 +19,36 @@
 package grpc
 
 import (
-	"io"
 	"math"
 	"net"
+	"sync/atomic"
 	"testing"
 	"time"
 
 	"golang.org/x/net/context"
 	"golang.org/x/net/http2"
-
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/internal/backoff"
+	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/naming"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/resolver/manual"
 	_ "google.golang.org/grpc/resolver/passthrough"
-	"google.golang.org/grpc/test/leakcheck"
 	"google.golang.org/grpc/testdata"
 )
 
+var (
+	mutableMinConnectTimeout = time.Second * 20
+)
+
+func init() {
+	getMinConnectTimeout = func() time.Duration {
+		return time.Duration(atomic.LoadInt64((*int64)(&mutableMinConnectTimeout)))
+	}
+}
+
 func assertState(wantState connectivity.State, cc *ClientConn) (connectivity.State, bool) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
@@ -139,9 +149,9 @@ func TestDialWaitsForServerSettings(t *testing.T) {
 			return
 		}
 		defer conn.Close()
-		// Sleep so that if the test were to fail it
-		// will fail more often than not.
-		time.Sleep(100 * time.Millisecond)
+		// Sleep for a little bit to make sure that Dial on client
+		// side blocks until settings are received.
+		time.Sleep(500 * time.Millisecond)
 		framer := http2.NewFramer(conn, conn)
 		close(sent)
 		if err := framer.WriteSettings(http2.Setting{}); err != nil {
@@ -150,7 +160,7 @@ func TestDialWaitsForServerSettings(t *testing.T) {
 		}
 		<-dialDone // Close conn only after dial returns.
 	}()
-	ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	client, err := DialContext(ctx, server.Addr().String(), WithInsecure(), WithWaitForHandshake(), WithBlock())
 	close(dialDone)
@@ -169,102 +179,87 @@ func TestDialWaitsForServerSettings(t *testing.T) {
 }
 
 func TestCloseConnectionWhenServerPrefaceNotReceived(t *testing.T) {
-	mctBkp := minConnectTimeout
+	// 1. Client connects to a server that doesn't send preface.
+	// 2. After minConnectTimeout(500 ms here), client disconnects and retries.
+	// 3. The new server sends its preface.
+	// 4. Client doesn't kill the connection this time.
+	mctBkp := getMinConnectTimeout()
 	// Call this only after transportMonitor goroutine has ended.
 	defer func() {
-		minConnectTimeout = mctBkp
+		atomic.StoreInt64((*int64)(&mutableMinConnectTimeout), int64(mctBkp))
+
 	}()
 	defer leakcheck.Check(t)
-	minConnectTimeout = time.Millisecond * 500
-	server, err := net.Listen("tcp", "localhost:0")
+	atomic.StoreInt64((*int64)(&mutableMinConnectTimeout), int64(time.Millisecond)*500)
+	lis, err := net.Listen("tcp", "localhost:0")
 	if err != nil {
 		t.Fatalf("Error while listening. Err: %v", err)
 	}
-	defer server.Close()
+	var (
+		conn2 net.Conn
+		over  uint32
+	)
+	defer func() {
+		lis.Close()
+		// conn2 shouldn't be closed until the client has
+		// observed a successful test.
+		if conn2 != nil {
+			conn2.Close()
+		}
+	}()
 	done := make(chan struct{})
-	clientDone := make(chan struct{})
+	accepted := make(chan struct{})
 	go func() { // Launch the server.
-		defer func() {
-			if done != nil {
-				close(done)
-			}
-		}()
-		conn1, err := server.Accept()
+		defer close(done)
+		conn1, err := lis.Accept()
 		if err != nil {
 			t.Errorf("Error while accepting. Err: %v", err)
 			return
 		}
 		defer conn1.Close()
-		// Don't send server settings and make sure the connection is closed.
-		time.Sleep(time.Millisecond * 1500) // Since the first backoff is for a second.
-		conn1.SetDeadline(time.Now().Add(time.Second))
-		b := make([]byte, 24)
-		for {
-			// Make sure the connection was closed by client.
-			_, err = conn1.Read(b)
-			if err == nil {
-				continue
-			}
-			if err != io.EOF {
-				t.Errorf(" conn1.Read(_) = _, %v, want _, io.EOF", err)
-				return
-			}
-			break
-		}
-
-		conn2, err := server.Accept() // Accept a reconnection request from client.
+		// Don't send server settings and the client should close the connection and try again.
+		conn2, err = lis.Accept() // Accept a reconnection request from client.
 		if err != nil {
 			t.Errorf("Error while accepting. Err: %v", err)
 			return
 		}
-		defer conn2.Close()
+		close(accepted)
 		framer := http2.NewFramer(conn2, conn2)
-		if err := framer.WriteSettings(http2.Setting{}); err != nil {
+		if err = framer.WriteSettings(http2.Setting{}); err != nil {
 			t.Errorf("Error while writing settings. Err: %v", err)
 			return
 		}
-		time.Sleep(time.Millisecond * 1500) // Since the first backoff is for a second.
-		conn2.SetDeadline(time.Now().Add(time.Millisecond * 500))
+		b := make([]byte, 8)
 		for {
-			// Make sure the connection stays open and is closed
-			// only by connection timeout.
 			_, err = conn2.Read(b)
 			if err == nil {
 				continue
 			}
-			if nerr, ok := err.(net.Error); ok && nerr.Timeout() {
+			if atomic.LoadUint32(&over) == 1 {
+				// The connection stayed alive for the timer.
+				// Success.
 				return
 			}
 			t.Errorf("Unexpected error while reading. Err: %v, want timeout error", err)
 			break
 		}
-		close(done)
-		done = nil
-		<-clientDone
-
 	}()
-	client, err := Dial(server.Addr().String(), WithInsecure())
+	client, err := Dial(lis.Addr().String(), WithInsecure())
 	if err != nil {
 		t.Fatalf("Error while dialing. Err: %v", err)
 	}
-	<-done
-	// TODO: The code from BEGIN to END should be delete once issue
-	// https://github.com/grpc/grpc-go/issues/1750 is fixed.
-	// BEGIN
-	// Set underlying addrConns state to Shutdown so that no reconnect
-	// attempts take place and thereby resetting minConnectTimeout is
-	// race free.
-	client.mu.Lock()
-	addrConns := client.conns
-	client.mu.Unlock()
-	for ac := range addrConns {
-		ac.mu.Lock()
-		ac.state = connectivity.Shutdown
-		ac.mu.Unlock()
-	}
-	// END
+	// wait for connection to be accepted on the server.
+	timer := time.NewTimer(time.Second * 10)
+	select {
+	case <-accepted:
+	case <-timer.C:
+		t.Fatalf("Client didn't make another connection request in time.")
+	}
+	// Make sure the connection stays alive for sometime.
+	time.Sleep(time.Second * 2)
+	atomic.StoreUint32(&over, 1)
 	client.Close()
-	close(clientDone)
+	<-done
 }
 
 func TestBackoffWhenNoServerPrefaceReceived(t *testing.T) {
@@ -351,7 +346,7 @@ func TestConnectivityStates(t *testing.T) {
 
 }
 
-func TestDialTimeout(t *testing.T) {
+func TestWithTimeout(t *testing.T) {
 	defer leakcheck.Check(t)
 	conn, err := Dial("passthrough:///Non-Existent.Server:80", WithTimeout(time.Millisecond), WithBlock(), WithInsecure())
 	if err == nil {
@@ -362,13 +357,15 @@ func TestDialTimeout(t *testing.T) {
 	}
 }
 
-func TestTLSDialTimeout(t *testing.T) {
+func TestWithTransportCredentialsTLS(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond)
+	defer cancel()
 	defer leakcheck.Check(t)
 	creds, err := credentials.NewClientTLSFromFile(testdata.Path("ca.pem"), "x.test.youtube.com")
 	if err != nil {
 		t.Fatalf("Failed to create credentials %v", err)
 	}
-	conn, err := Dial("passthrough:///Non-Existent.Server:80", WithTransportCredentials(creds), WithTimeout(time.Millisecond), WithBlock())
+	conn, err := DialContext(ctx, "passthrough:///Non-Existent.Server:80", WithTransportCredentials(creds), WithBlock())
 	if err == nil {
 		conn.Close()
 	}
@@ -520,7 +517,6 @@ func TestWithBackoffConfig(t *testing.T) {
 	defer leakcheck.Check(t)
 	b := BackoffConfig{MaxDelay: DefaultBackoffConfig.MaxDelay / 2}
 	expected := b
-	setDefaults(&expected) // defaults should be set
 	testBackoffConfigSet(t, &expected, WithBackoffConfig(b))
 }
 
@@ -528,7 +524,6 @@ func TestWithBackoffMaxDelay(t *testing.T) {
 	defer leakcheck.Check(t)
 	md := DefaultBackoffConfig.MaxDelay / 2
 	expected := BackoffConfig{MaxDelay: md}
-	setDefaults(&expected)
 	testBackoffConfigSet(t, &expected, WithBackoffMaxDelay(md))
 }
 
@@ -544,12 +539,15 @@ func testBackoffConfigSet(t *testing.T, expected *BackoffConfig, opts ...DialOpt
 		t.Fatalf("backoff config not set")
 	}
 
-	actual, ok := conn.dopts.bs.(BackoffConfig)
+	actual, ok := conn.dopts.bs.(backoff.Exponential)
 	if !ok {
 		t.Fatalf("unexpected type of backoff config: %#v", conn.dopts.bs)
 	}
 
-	if actual != *expected {
+	expectedValue := backoff.Exponential{
+		MaxDelay: expected.MaxDelay,
+	}
+	if actual != expectedValue {
 		t.Fatalf("unexpected backoff config on connection: %v, want %v", actual, expected)
 	}
 }
@@ -662,3 +660,44 @@ func TestClientUpdatesParamsAfterGoAway(t *testing.T) {
 		t.Fatalf("cc.dopts.copts.Keepalive.Time = %v , want 100ms", v)
 	}
 }
+
+func TestDisableServiceConfigOption(t *testing.T) {
+	r, cleanup := manual.GenerateAndRegisterManualResolver()
+	defer cleanup()
+	addr := r.Scheme() + ":///non.existent"
+	cc, err := Dial(addr, WithInsecure(), WithDisableServiceConfig())
+	if err != nil {
+		t.Fatalf("Dial(%s, _) = _, %v, want _, <nil>", addr, err)
+	}
+	defer cc.Close()
+	r.NewServiceConfig(`{
+    "methodConfig": [
+        {
+            "name": [
+                {
+                    "service": "foo",
+                    "method": "Bar"
+                }
+            ],
+            "waitForReady": true
+        }
+    ]
+}`)
+	time.Sleep(1 * time.Second)
+	m := cc.GetMethodConfig("/foo/Bar")
+	if m.WaitForReady != nil {
+		t.Fatalf("want: method (\"/foo/bar/\") config to be empty, got: %v", m)
+	}
+}
+
+func TestGetClientConnTarget(t *testing.T) {
+	addr := "nonexist:///non.existent"
+	cc, err := Dial(addr, WithInsecure())
+	if err != nil {
+		t.Fatalf("Dial(%s, _) = _, %v, want _, <nil>", addr, err)
+	}
+	defer cc.Close()
+	if cc.Target() != addr {
+		t.Fatalf("Target() = %s, want %s", cc.Target(), addr)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/codes/codes.go b/vendor/google.golang.org/grpc/codes/codes.go
index a8280ae6..d9b9d578 100644
--- a/vendor/google.golang.org/grpc/codes/codes.go
+++ b/vendor/google.golang.org/grpc/codes/codes.go
@@ -22,6 +22,7 @@ package codes // import "google.golang.org/grpc/codes"
 
 import (
 	"fmt"
+	"strconv"
 )
 
 // A Code is an unsigned 32-bit error code as defined in the gRPC spec.
@@ -143,6 +144,8 @@ const (
 	// Unauthenticated indicates the request does not have valid
 	// authentication credentials for the operation.
 	Unauthenticated Code = 16
+
+	_maxCode = 17
 )
 
 var strToCode = map[string]Code{
@@ -176,6 +179,16 @@ func (c *Code) UnmarshalJSON(b []byte) error {
 	if c == nil {
 		return fmt.Errorf("nil receiver passed to UnmarshalJSON")
 	}
+
+	if ci, err := strconv.ParseUint(string(b), 10, 32); err == nil {
+		if ci >= _maxCode {
+			return fmt.Errorf("invalid code: %q", ci)
+		}
+
+		*c = Code(ci)
+		return nil
+	}
+
 	if jc, ok := strToCode[string(b)]; ok {
 		*c = jc
 		return nil
diff --git a/vendor/google.golang.org/grpc/codes/codes_test.go b/vendor/google.golang.org/grpc/codes/codes_test.go
index 1e3b9918..d3e32d22 100644
--- a/vendor/google.golang.org/grpc/codes/codes_test.go
+++ b/vendor/google.golang.org/grpc/codes/codes_test.go
@@ -62,3 +62,23 @@ func TestUnmarshalJSON_UnknownInput(t *testing.T) {
 		}
 	}
 }
+
+func TestUnmarshalJSON_MarshalUnmarshal(t *testing.T) {
+	for i := 0; i < _maxCode; i++ {
+		var cUnMarshaled Code
+		c := Code(i)
+
+		cJSON, err := json.Marshal(c)
+		if err != nil {
+			t.Errorf("marshalling %q failed: %v", c, err)
+		}
+
+		if err := json.Unmarshal(cJSON, &cUnMarshaled); err != nil {
+			t.Errorf("unmarshalling code failed: %s", err)
+		}
+
+		if c != cUnMarshaled {
+			t.Errorf("code is %q after marshalling/unmarshalling, expected %q", cUnMarshaled, c)
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/alts.go b/vendor/google.golang.org/grpc/credentials/alts/alts.go
new file mode 100644
index 00000000..94005654
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/alts.go
@@ -0,0 +1,329 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package alts implements the ALTS credential support by gRPC library, which
+// encapsulates all the state needed by a client to authenticate with a server
+// using ALTS and make various assertions, e.g., about the client's identity,
+// role, or whether it is authorized to make a particular call.
+// This package is experimental.
+package alts
+
+import (
+	"errors"
+	"fmt"
+	"net"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/alts/core"
+	"google.golang.org/grpc/credentials/alts/core/handshaker"
+	"google.golang.org/grpc/credentials/alts/core/handshaker/service"
+	altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+	"google.golang.org/grpc/grpclog"
+)
+
+const (
+	// hypervisorHandshakerServiceAddress represents the default ALTS gRPC
+	// handshaker service address in the hypervisor.
+	hypervisorHandshakerServiceAddress = "metadata.google.internal:8080"
+	// defaultTimeout specifies the server handshake timeout.
+	defaultTimeout = 30.0 * time.Second
+	// The following constants specify the minimum and maximum acceptable
+	// protocol versions.
+	protocolVersionMaxMajor = 2
+	protocolVersionMaxMinor = 1
+	protocolVersionMinMajor = 2
+	protocolVersionMinMinor = 1
+)
+
+var (
+	once          sync.Once
+	maxRPCVersion = &altspb.RpcProtocolVersions_Version{
+		Major: protocolVersionMaxMajor,
+		Minor: protocolVersionMaxMinor,
+	}
+	minRPCVersion = &altspb.RpcProtocolVersions_Version{
+		Major: protocolVersionMinMajor,
+		Minor: protocolVersionMinMinor,
+	}
+	// ErrUntrustedPlatform is returned from ClientHandshake and
+	// ServerHandshake is running on a platform where the trustworthiness of
+	// the handshaker service is not guaranteed.
+	ErrUntrustedPlatform = errors.New("untrusted platform")
+)
+
+// AuthInfo exposes security information from the ALTS handshake to the
+// application. This interface is to be implemented by ALTS. Users should not
+// need a brand new implementation of this interface. For situations like
+// testing, any new implementation should embed this interface. This allows
+// ALTS to add new methods to this interface.
+type AuthInfo interface {
+	// ApplicationProtocol returns application protocol negotiated for the
+	// ALTS connection.
+	ApplicationProtocol() string
+	// RecordProtocol returns the record protocol negotiated for the ALTS
+	// connection.
+	RecordProtocol() string
+	// SecurityLevel returns the security level of the created ALTS secure
+	// channel.
+	SecurityLevel() altspb.SecurityLevel
+	// PeerServiceAccount returns the peer service account.
+	PeerServiceAccount() string
+	// LocalServiceAccount returns the local service account.
+	LocalServiceAccount() string
+	// PeerRPCVersions returns the RPC version supported by the peer.
+	PeerRPCVersions() *altspb.RpcProtocolVersions
+}
+
+// ClientOptions contains the client-side options of an ALTS channel. These
+// options will be passed to the underlying ALTS handshaker.
+type ClientOptions struct {
+	// TargetServiceAccounts contains a list of expected target service
+	// accounts.
+	TargetServiceAccounts []string
+	// HandshakerServiceAddress represents the ALTS handshaker gRPC service
+	// address to connect to.
+	HandshakerServiceAddress string
+}
+
+// DefaultClientOptions creates a new ClientOptions object with the default
+// values.
+func DefaultClientOptions() *ClientOptions {
+	return &ClientOptions{
+		HandshakerServiceAddress: hypervisorHandshakerServiceAddress,
+	}
+}
+
+// ServerOptions contains the server-side options of an ALTS channel. These
+// options will be passed to the underlying ALTS handshaker.
+type ServerOptions struct {
+	// HandshakerServiceAddress represents the ALTS handshaker gRPC service
+	// address to connect to.
+	HandshakerServiceAddress string
+}
+
+// DefaultServerOptions creates a new ServerOptions object with the default
+// values.
+func DefaultServerOptions() *ServerOptions {
+	return &ServerOptions{
+		HandshakerServiceAddress: hypervisorHandshakerServiceAddress,
+	}
+}
+
+// altsTC is the credentials required for authenticating a connection using ALTS.
+// It implements credentials.TransportCredentials interface.
+type altsTC struct {
+	info      *credentials.ProtocolInfo
+	side      core.Side
+	accounts  []string
+	hsAddress string
+}
+
+// NewClientCreds constructs a client-side ALTS TransportCredentials object.
+func NewClientCreds(opts *ClientOptions) credentials.TransportCredentials {
+	return newALTS(core.ClientSide, opts.TargetServiceAccounts, opts.HandshakerServiceAddress)
+}
+
+// NewServerCreds constructs a server-side ALTS TransportCredentials object.
+func NewServerCreds(opts *ServerOptions) credentials.TransportCredentials {
+	return newALTS(core.ServerSide, nil, opts.HandshakerServiceAddress)
+}
+
+func newALTS(side core.Side, accounts []string, hsAddress string) credentials.TransportCredentials {
+	once.Do(func() {
+		vmOnGCP = isRunningOnGCP()
+	})
+
+	if hsAddress == "" {
+		hsAddress = hypervisorHandshakerServiceAddress
+	}
+	return &altsTC{
+		info: &credentials.ProtocolInfo{
+			SecurityProtocol: "alts",
+			SecurityVersion:  "1.0",
+		},
+		side:      side,
+		accounts:  accounts,
+		hsAddress: hsAddress,
+	}
+}
+
+// ClientHandshake implements the client side handshake protocol.
+func (g *altsTC) ClientHandshake(ctx context.Context, addr string, rawConn net.Conn) (_ net.Conn, _ credentials.AuthInfo, err error) {
+	if !vmOnGCP {
+		return nil, nil, ErrUntrustedPlatform
+	}
+
+	// Connecting to ALTS handshaker service.
+	hsConn, err := service.Dial(g.hsAddress)
+	if err != nil {
+		return nil, nil, err
+	}
+	// Do not close hsConn since it is shared with other handshakes.
+
+	// Possible context leak:
+	// The cancel function for the child context we create will only be
+	// called a non-nil error is returned.
+	var cancel context.CancelFunc
+	ctx, cancel = context.WithCancel(ctx)
+	defer func() {
+		if err != nil {
+			cancel()
+		}
+	}()
+
+	opts := handshaker.DefaultClientHandshakerOptions()
+	opts.TargetServiceAccounts = g.accounts
+	opts.RPCVersions = &altspb.RpcProtocolVersions{
+		MaxRpcVersion: maxRPCVersion,
+		MinRpcVersion: minRPCVersion,
+	}
+	chs, err := handshaker.NewClientHandshaker(ctx, hsConn, rawConn, opts)
+	defer func() {
+		if err != nil {
+			chs.Close()
+		}
+	}()
+	if err != nil {
+		return nil, nil, err
+	}
+	secConn, authInfo, err := chs.ClientHandshake(ctx)
+	if err != nil {
+		return nil, nil, err
+	}
+	altsAuthInfo, ok := authInfo.(AuthInfo)
+	if !ok {
+		return nil, nil, errors.New("client-side auth info is not of type alts.AuthInfo")
+	}
+	match, _ := checkRPCVersions(opts.RPCVersions, altsAuthInfo.PeerRPCVersions())
+	if !match {
+		return nil, nil, fmt.Errorf("server-side RPC versions are not compatible with this client, local versions: %v, peer versions: %v", opts.RPCVersions, altsAuthInfo.PeerRPCVersions())
+	}
+	return secConn, authInfo, nil
+}
+
+// ServerHandshake implements the server side ALTS handshaker.
+func (g *altsTC) ServerHandshake(rawConn net.Conn) (_ net.Conn, _ credentials.AuthInfo, err error) {
+	if !vmOnGCP {
+		return nil, nil, ErrUntrustedPlatform
+	}
+	// Connecting to ALTS handshaker service.
+	hsConn, err := service.Dial(g.hsAddress)
+	if err != nil {
+		return nil, nil, err
+	}
+	// Do not close hsConn since it's shared with other handshakes.
+
+	ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
+	defer cancel()
+	opts := handshaker.DefaultServerHandshakerOptions()
+	opts.RPCVersions = &altspb.RpcProtocolVersions{
+		MaxRpcVersion: maxRPCVersion,
+		MinRpcVersion: minRPCVersion,
+	}
+	shs, err := handshaker.NewServerHandshaker(ctx, hsConn, rawConn, opts)
+	defer func() {
+		if err != nil {
+			shs.Close()
+		}
+	}()
+	if err != nil {
+		return nil, nil, err
+	}
+	secConn, authInfo, err := shs.ServerHandshake(ctx)
+	if err != nil {
+		return nil, nil, err
+	}
+	altsAuthInfo, ok := authInfo.(AuthInfo)
+	if !ok {
+		return nil, nil, errors.New("server-side auth info is not of type alts.AuthInfo")
+	}
+	match, _ := checkRPCVersions(opts.RPCVersions, altsAuthInfo.PeerRPCVersions())
+	if !match {
+		return nil, nil, fmt.Errorf("client-side RPC versions is not compatible with this server, local versions: %v, peer versions: %v", opts.RPCVersions, altsAuthInfo.PeerRPCVersions())
+	}
+	return secConn, authInfo, nil
+}
+
+func (g *altsTC) Info() credentials.ProtocolInfo {
+	return *g.info
+}
+
+func (g *altsTC) Clone() credentials.TransportCredentials {
+	info := *g.info
+	var accounts []string
+	if g.accounts != nil {
+		accounts = make([]string, len(g.accounts))
+		copy(accounts, g.accounts)
+	}
+	return &altsTC{
+		info:      &info,
+		side:      g.side,
+		hsAddress: g.hsAddress,
+		accounts:  accounts,
+	}
+}
+
+func (g *altsTC) OverrideServerName(serverNameOverride string) error {
+	g.info.ServerName = serverNameOverride
+	return nil
+}
+
+// compareRPCVersion returns 0 if v1 == v2, 1 if v1 > v2 and -1 if v1 < v2.
+func compareRPCVersions(v1, v2 *altspb.RpcProtocolVersions_Version) int {
+	switch {
+	case v1.GetMajor() > v2.GetMajor(),
+		v1.GetMajor() == v2.GetMajor() && v1.GetMinor() > v2.GetMinor():
+		return 1
+	case v1.GetMajor() < v2.GetMajor(),
+		v1.GetMajor() == v2.GetMajor() && v1.GetMinor() < v2.GetMinor():
+		return -1
+	}
+	return 0
+}
+
+// checkRPCVersions performs a version check between local and peer rpc protocol
+// versions. This function returns true if the check passes which means both
+// parties agreed on a common rpc protocol to use, and false otherwise. The
+// function also returns the highest common RPC protocol version both parties
+// agreed on.
+func checkRPCVersions(local, peer *altspb.RpcProtocolVersions) (bool, *altspb.RpcProtocolVersions_Version) {
+	if local == nil || peer == nil {
+		grpclog.Error("invalid checkRPCVersions argument, either local or peer is nil.")
+		return false, nil
+	}
+
+	// maxCommonVersion is MIN(local.max, peer.max).
+	maxCommonVersion := local.GetMaxRpcVersion()
+	if compareRPCVersions(local.GetMaxRpcVersion(), peer.GetMaxRpcVersion()) > 0 {
+		maxCommonVersion = peer.GetMaxRpcVersion()
+	}
+
+	// minCommonVersion is MAX(local.min, peer.min).
+	minCommonVersion := peer.GetMinRpcVersion()
+	if compareRPCVersions(local.GetMinRpcVersion(), peer.GetMinRpcVersion()) > 0 {
+		minCommonVersion = local.GetMinRpcVersion()
+	}
+
+	if compareRPCVersions(maxCommonVersion, minCommonVersion) < 0 {
+		return false, nil
+	}
+	return true, maxCommonVersion
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/alts_test.go b/vendor/google.golang.org/grpc/credentials/alts/alts_test.go
new file mode 100644
index 00000000..6b041d99
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/alts_test.go
@@ -0,0 +1,290 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package alts
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/golang/protobuf/proto"
+	altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+)
+
+func TestInfoServerName(t *testing.T) {
+	// This is not testing any handshaker functionality, so it's fine to only
+	// use NewServerCreds and not NewClientCreds.
+	alts := NewServerCreds(DefaultServerOptions())
+	if got, want := alts.Info().ServerName, ""; got != want {
+		t.Fatalf("%v.Info().ServerName = %v, want %v", alts, got, want)
+	}
+}
+
+func TestOverrideServerName(t *testing.T) {
+	wantServerName := "server.name"
+	// This is not testing any handshaker functionality, so it's fine to only
+	// use NewServerCreds and not NewClientCreds.
+	c := NewServerCreds(DefaultServerOptions())
+	c.OverrideServerName(wantServerName)
+	if got, want := c.Info().ServerName, wantServerName; got != want {
+		t.Fatalf("c.Info().ServerName = %v, want %v", got, want)
+	}
+}
+
+func TestCloneClient(t *testing.T) {
+	wantServerName := "server.name"
+	opt := DefaultClientOptions()
+	opt.TargetServiceAccounts = []string{"not", "empty"}
+	c := NewClientCreds(opt)
+	c.OverrideServerName(wantServerName)
+	cc := c.Clone()
+	if got, want := cc.Info().ServerName, wantServerName; got != want {
+		t.Fatalf("cc.Info().ServerName = %v, want %v", got, want)
+	}
+	cc.OverrideServerName("")
+	if got, want := c.Info().ServerName, wantServerName; got != want {
+		t.Fatalf("Change in clone should not affect the original, c.Info().ServerName = %v, want %v", got, want)
+	}
+	if got, want := cc.Info().ServerName, ""; got != want {
+		t.Fatalf("cc.Info().ServerName = %v, want %v", got, want)
+	}
+
+	ct := c.(*altsTC)
+	cct := cc.(*altsTC)
+
+	if ct.side != cct.side {
+		t.Errorf("cc.side = %q, want %q", cct.side, ct.side)
+	}
+	if ct.hsAddress != cct.hsAddress {
+		t.Errorf("cc.hsAddress = %q, want %q", cct.hsAddress, ct.hsAddress)
+	}
+	if !reflect.DeepEqual(ct.accounts, cct.accounts) {
+		t.Errorf("cc.accounts = %q, want %q", cct.accounts, ct.accounts)
+	}
+}
+
+func TestCloneServer(t *testing.T) {
+	wantServerName := "server.name"
+	c := NewServerCreds(DefaultServerOptions())
+	c.OverrideServerName(wantServerName)
+	cc := c.Clone()
+	if got, want := cc.Info().ServerName, wantServerName; got != want {
+		t.Fatalf("cc.Info().ServerName = %v, want %v", got, want)
+	}
+	cc.OverrideServerName("")
+	if got, want := c.Info().ServerName, wantServerName; got != want {
+		t.Fatalf("Change in clone should not affect the original, c.Info().ServerName = %v, want %v", got, want)
+	}
+	if got, want := cc.Info().ServerName, ""; got != want {
+		t.Fatalf("cc.Info().ServerName = %v, want %v", got, want)
+	}
+
+	ct := c.(*altsTC)
+	cct := cc.(*altsTC)
+
+	if ct.side != cct.side {
+		t.Errorf("cc.side = %q, want %q", cct.side, ct.side)
+	}
+	if ct.hsAddress != cct.hsAddress {
+		t.Errorf("cc.hsAddress = %q, want %q", cct.hsAddress, ct.hsAddress)
+	}
+	if !reflect.DeepEqual(ct.accounts, cct.accounts) {
+		t.Errorf("cc.accounts = %q, want %q", cct.accounts, ct.accounts)
+	}
+}
+
+func TestInfo(t *testing.T) {
+	// This is not testing any handshaker functionality, so it's fine to only
+	// use NewServerCreds and not NewClientCreds.
+	c := NewServerCreds(DefaultServerOptions())
+	info := c.Info()
+	if got, want := info.ProtocolVersion, ""; got != want {
+		t.Errorf("info.ProtocolVersion=%v, want %v", got, want)
+	}
+	if got, want := info.SecurityProtocol, "alts"; got != want {
+		t.Errorf("info.SecurityProtocol=%v, want %v", got, want)
+	}
+	if got, want := info.SecurityVersion, "1.0"; got != want {
+		t.Errorf("info.SecurityVersion=%v, want %v", got, want)
+	}
+	if got, want := info.ServerName, ""; got != want {
+		t.Errorf("info.ServerName=%v, want %v", got, want)
+	}
+}
+
+func TestCompareRPCVersions(t *testing.T) {
+	for _, tc := range []struct {
+		v1     *altspb.RpcProtocolVersions_Version
+		v2     *altspb.RpcProtocolVersions_Version
+		output int
+	}{
+		{
+			version(3, 2),
+			version(2, 1),
+			1,
+		},
+		{
+			version(3, 2),
+			version(3, 1),
+			1,
+		},
+		{
+			version(2, 1),
+			version(3, 2),
+			-1,
+		},
+		{
+			version(3, 1),
+			version(3, 2),
+			-1,
+		},
+		{
+			version(3, 2),
+			version(3, 2),
+			0,
+		},
+	} {
+		if got, want := compareRPCVersions(tc.v1, tc.v2), tc.output; got != want {
+			t.Errorf("compareRPCVersions(%v, %v)=%v, want %v", tc.v1, tc.v2, got, want)
+		}
+	}
+}
+
+func TestCheckRPCVersions(t *testing.T) {
+	for _, tc := range []struct {
+		desc             string
+		local            *altspb.RpcProtocolVersions
+		peer             *altspb.RpcProtocolVersions
+		output           bool
+		maxCommonVersion *altspb.RpcProtocolVersions_Version
+	}{
+		{
+			"local.max > peer.max and local.min > peer.min",
+			versions(2, 1, 3, 2),
+			versions(1, 2, 2, 1),
+			true,
+			version(2, 1),
+		},
+		{
+			"local.max > peer.max and local.min < peer.min",
+			versions(1, 2, 3, 2),
+			versions(2, 1, 2, 1),
+			true,
+			version(2, 1),
+		},
+		{
+			"local.max > peer.max and local.min = peer.min",
+			versions(2, 1, 3, 2),
+			versions(2, 1, 2, 1),
+			true,
+			version(2, 1),
+		},
+		{
+			"local.max < peer.max and local.min > peer.min",
+			versions(2, 1, 2, 1),
+			versions(1, 2, 3, 2),
+			true,
+			version(2, 1),
+		},
+		{
+			"local.max = peer.max and local.min > peer.min",
+			versions(2, 1, 2, 1),
+			versions(1, 2, 2, 1),
+			true,
+			version(2, 1),
+		},
+		{
+			"local.max < peer.max and local.min < peer.min",
+			versions(1, 2, 2, 1),
+			versions(2, 1, 3, 2),
+			true,
+			version(2, 1),
+		},
+		{
+			"local.max < peer.max and local.min = peer.min",
+			versions(1, 2, 2, 1),
+			versions(1, 2, 3, 2),
+			true,
+			version(2, 1),
+		},
+		{
+			"local.max = peer.max and local.min < peer.min",
+			versions(1, 2, 2, 1),
+			versions(2, 1, 2, 1),
+			true,
+			version(2, 1),
+		},
+		{
+			"all equal",
+			versions(2, 1, 2, 1),
+			versions(2, 1, 2, 1),
+			true,
+			version(2, 1),
+		},
+		{
+			"max is smaller than min",
+			versions(2, 1, 1, 2),
+			versions(2, 1, 1, 2),
+			false,
+			nil,
+		},
+		{
+			"no overlap, local > peer",
+			versions(4, 3, 6, 5),
+			versions(1, 0, 2, 1),
+			false,
+			nil,
+		},
+		{
+			"no overlap, local < peer",
+			versions(1, 0, 2, 1),
+			versions(4, 3, 6, 5),
+			false,
+			nil,
+		},
+		{
+			"no overlap, max < min",
+			versions(6, 5, 4, 3),
+			versions(2, 1, 1, 0),
+			false,
+			nil,
+		},
+	} {
+		output, maxCommonVersion := checkRPCVersions(tc.local, tc.peer)
+		if got, want := output, tc.output; got != want {
+			t.Errorf("%v: checkRPCVersions(%v, %v)=(%v, _), want (%v, _)", tc.desc, tc.local, tc.peer, got, want)
+		}
+		if got, want := maxCommonVersion, tc.maxCommonVersion; !proto.Equal(got, want) {
+			t.Errorf("%v: checkRPCVersions(%v, %v)=(_, %v), want (_, %v)", tc.desc, tc.local, tc.peer, got, want)
+		}
+	}
+}
+
+func version(major, minor uint32) *altspb.RpcProtocolVersions_Version {
+	return &altspb.RpcProtocolVersions_Version{
+		Major: major,
+		Minor: minor,
+	}
+}
+
+func versions(minMajor, minMinor, maxMajor, maxMinor uint32) *altspb.RpcProtocolVersions {
+	return &altspb.RpcProtocolVersions{
+		MinRpcVersion: version(minMajor, minMinor),
+		MaxRpcVersion: version(maxMajor, maxMinor),
+	}
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/authinfo/authinfo.go b/vendor/google.golang.org/grpc/credentials/alts/core/authinfo/authinfo.go
new file mode 100644
index 00000000..2fe54b74
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/authinfo/authinfo.go
@@ -0,0 +1,87 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package authinfo provide authentication information returned by handshakers.
+package authinfo
+
+import (
+	"google.golang.org/grpc/credentials"
+	altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+)
+
+var _ credentials.AuthInfo = (*altsAuthInfo)(nil)
+
+// altsAuthInfo exposes security information from the ALTS handshake to the
+// application. altsAuthInfo is immutable and implements credentials.AuthInfo.
+type altsAuthInfo struct {
+	p *altspb.AltsContext
+}
+
+// New returns a new altsAuthInfo object given handshaker results.
+func New(result *altspb.HandshakerResult) credentials.AuthInfo {
+	return newAuthInfo(result)
+}
+
+func newAuthInfo(result *altspb.HandshakerResult) *altsAuthInfo {
+	return &altsAuthInfo{
+		p: &altspb.AltsContext{
+			ApplicationProtocol: result.GetApplicationProtocol(),
+			RecordProtocol:      result.GetRecordProtocol(),
+			// TODO: assign security level from result.
+			SecurityLevel:       altspb.SecurityLevel_INTEGRITY_AND_PRIVACY,
+			PeerServiceAccount:  result.GetPeerIdentity().GetServiceAccount(),
+			LocalServiceAccount: result.GetLocalIdentity().GetServiceAccount(),
+			PeerRpcVersions:     result.GetPeerRpcVersions(),
+		},
+	}
+}
+
+// AuthType identifies the context as providing ALTS authentication information.
+func (s *altsAuthInfo) AuthType() string {
+	return "alts"
+}
+
+// ApplicationProtocol returns the context's application protocol.
+func (s *altsAuthInfo) ApplicationProtocol() string {
+	return s.p.GetApplicationProtocol()
+}
+
+// RecordProtocol returns the context's record protocol.
+func (s *altsAuthInfo) RecordProtocol() string {
+	return s.p.GetRecordProtocol()
+}
+
+// SecurityLevel returns the context's security level.
+func (s *altsAuthInfo) SecurityLevel() altspb.SecurityLevel {
+	return s.p.GetSecurityLevel()
+}
+
+// PeerServiceAccount returns the context's peer service account.
+func (s *altsAuthInfo) PeerServiceAccount() string {
+	return s.p.GetPeerServiceAccount()
+}
+
+// LocalServiceAccount returns the context's local service account.
+func (s *altsAuthInfo) LocalServiceAccount() string {
+	return s.p.GetLocalServiceAccount()
+}
+
+// PeerRPCVersions returns the context's peer RPC versions.
+func (s *altsAuthInfo) PeerRPCVersions() *altspb.RpcProtocolVersions {
+	return s.p.GetPeerRpcVersions()
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/authinfo/authinfo_test.go b/vendor/google.golang.org/grpc/credentials/alts/core/authinfo/authinfo_test.go
new file mode 100644
index 00000000..635d8049
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/authinfo/authinfo_test.go
@@ -0,0 +1,134 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package authinfo
+
+import (
+	"reflect"
+	"testing"
+
+	altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+)
+
+const (
+	testAppProtocol    = "my_app"
+	testRecordProtocol = "very_secure_protocol"
+	testPeerAccount    = "peer_service_account"
+	testLocalAccount   = "local_service_account"
+	testPeerHostname   = "peer_hostname"
+	testLocalHostname  = "local_hostname"
+)
+
+func TestALTSAuthInfo(t *testing.T) {
+	for _, tc := range []struct {
+		result             *altspb.HandshakerResult
+		outAppProtocol     string
+		outRecordProtocol  string
+		outSecurityLevel   altspb.SecurityLevel
+		outPeerAccount     string
+		outLocalAccount    string
+		outPeerRPCVersions *altspb.RpcProtocolVersions
+	}{
+		{
+			&altspb.HandshakerResult{
+				ApplicationProtocol: testAppProtocol,
+				RecordProtocol:      testRecordProtocol,
+				PeerIdentity: &altspb.Identity{
+					IdentityOneof: &altspb.Identity_ServiceAccount{
+						ServiceAccount: testPeerAccount,
+					},
+				},
+				LocalIdentity: &altspb.Identity{
+					IdentityOneof: &altspb.Identity_ServiceAccount{
+						ServiceAccount: testLocalAccount,
+					},
+				},
+			},
+			testAppProtocol,
+			testRecordProtocol,
+			altspb.SecurityLevel_INTEGRITY_AND_PRIVACY,
+			testPeerAccount,
+			testLocalAccount,
+			nil,
+		},
+		{
+			&altspb.HandshakerResult{
+				ApplicationProtocol: testAppProtocol,
+				RecordProtocol:      testRecordProtocol,
+				PeerIdentity: &altspb.Identity{
+					IdentityOneof: &altspb.Identity_Hostname{
+						Hostname: testPeerHostname,
+					},
+				},
+				LocalIdentity: &altspb.Identity{
+					IdentityOneof: &altspb.Identity_Hostname{
+						Hostname: testLocalHostname,
+					},
+				},
+				PeerRpcVersions: &altspb.RpcProtocolVersions{
+					MaxRpcVersion: &altspb.RpcProtocolVersions_Version{
+						Major: 20,
+						Minor: 21,
+					},
+					MinRpcVersion: &altspb.RpcProtocolVersions_Version{
+						Major: 10,
+						Minor: 11,
+					},
+				},
+			},
+			testAppProtocol,
+			testRecordProtocol,
+			altspb.SecurityLevel_INTEGRITY_AND_PRIVACY,
+			"",
+			"",
+			&altspb.RpcProtocolVersions{
+				MaxRpcVersion: &altspb.RpcProtocolVersions_Version{
+					Major: 20,
+					Minor: 21,
+				},
+				MinRpcVersion: &altspb.RpcProtocolVersions_Version{
+					Major: 10,
+					Minor: 11,
+				},
+			},
+		},
+	} {
+		authInfo := newAuthInfo(tc.result)
+		if got, want := authInfo.AuthType(), "alts"; got != want {
+			t.Errorf("authInfo.AuthType()=%v, want %v", got, want)
+		}
+		if got, want := authInfo.ApplicationProtocol(), tc.outAppProtocol; got != want {
+			t.Errorf("authInfo.ApplicationProtocol()=%v, want %v", got, want)
+		}
+		if got, want := authInfo.RecordProtocol(), tc.outRecordProtocol; got != want {
+			t.Errorf("authInfo.RecordProtocol()=%v, want %v", got, want)
+		}
+		if got, want := authInfo.SecurityLevel(), tc.outSecurityLevel; got != want {
+			t.Errorf("authInfo.SecurityLevel()=%v, want %v", got, want)
+		}
+		if got, want := authInfo.PeerServiceAccount(), tc.outPeerAccount; got != want {
+			t.Errorf("authInfo.PeerServiceAccount()=%v, want %v", got, want)
+		}
+		if got, want := authInfo.LocalServiceAccount(), tc.outLocalAccount; got != want {
+			t.Errorf("authInfo.LocalServiceAccount()=%v, want %v", got, want)
+		}
+		if got, want := authInfo.PeerRPCVersions(), tc.outPeerRPCVersions; !reflect.DeepEqual(got, want) {
+			t.Errorf("authinfo.PeerRpcVersions()=%v, want %v", got, want)
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/common.go b/vendor/google.golang.org/grpc/credentials/alts/core/common.go
new file mode 100644
index 00000000..b7baf77a
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/common.go
@@ -0,0 +1,70 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+//go:generate ./regenerate.sh
+
+// Package core contains common core functionality for ALTS.
+// Disclaimer: users should NEVER reference this package directly.
+package core
+
+import (
+	"net"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/credentials"
+)
+
+const (
+	// ClientSide identifies the client in this communication.
+	ClientSide Side = iota
+	// ServerSide identifies the server in this communication.
+	ServerSide
+)
+
+// PeerNotRespondingError is returned when a peer server is not responding
+// after a channel has been established. It is treated as a temporary connection
+// error and re-connection to the server should be attempted.
+var PeerNotRespondingError = &peerNotRespondingError{}
+
+// Side identifies the party's role: client or server.
+type Side int
+
+type peerNotRespondingError struct{}
+
+// Return an error message for the purpose of logging.
+func (e *peerNotRespondingError) Error() string {
+	return "peer server is not responding and re-connection should be attempted."
+}
+
+// Temporary indicates if this connection error is temporary or fatal.
+func (e *peerNotRespondingError) Temporary() bool {
+	return true
+}
+
+// Handshaker defines a ALTS handshaker interface.
+type Handshaker interface {
+	// ClientHandshake starts and completes a client-side handshaking and
+	// returns a secure connection and corresponding auth information.
+	ClientHandshake(ctx context.Context) (net.Conn, credentials.AuthInfo, error)
+	// ServerHandshake starts and completes a server-side handshaking and
+	// returns a secure connection and corresponding auth information.
+	ServerHandshake(ctx context.Context) (net.Conn, credentials.AuthInfo, error)
+	// Close terminates the Handshaker. It should be called when the caller
+	// obtains the secure connection.
+	Close()
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/aeadrekey.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aeadrekey.go
new file mode 100644
index 00000000..43726e87
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aeadrekey.go
@@ -0,0 +1,131 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/binary"
+	"fmt"
+	"strconv"
+)
+
+// rekeyAEAD holds the necessary information for an AEAD based on
+// AES-GCM that performs nonce-based key derivation and XORs the
+// nonce with a random mask.
+type rekeyAEAD struct {
+	kdfKey     []byte
+	kdfCounter []byte
+	nonceMask  []byte
+	nonceBuf   []byte
+	gcmAEAD    cipher.AEAD
+}
+
+// KeySizeError signals that the given key does not have the correct size.
+type KeySizeError int
+
+func (k KeySizeError) Error() string {
+	return "alts/conn: invalid key size " + strconv.Itoa(int(k))
+}
+
+// newRekeyAEAD creates a new instance of aes128gcm with rekeying.
+// The key argument should be 44 bytes, the first 32 bytes are used as a key
+// for HKDF-expand and the remainining 12 bytes are used as a random mask for
+// the counter.
+func newRekeyAEAD(key []byte) (*rekeyAEAD, error) {
+	k := len(key)
+	if k != kdfKeyLen+nonceLen {
+		return nil, KeySizeError(k)
+	}
+	return &rekeyAEAD{
+		kdfKey:     key[:kdfKeyLen],
+		kdfCounter: make([]byte, kdfCounterLen),
+		nonceMask:  key[kdfKeyLen:],
+		nonceBuf:   make([]byte, nonceLen),
+		gcmAEAD:    nil,
+	}, nil
+}
+
+// Seal rekeys if nonce[2:8] is different than in the last call, masks the nonce,
+// and calls Seal for aes128gcm.
+func (s *rekeyAEAD) Seal(dst, nonce, plaintext, additionalData []byte) []byte {
+	if err := s.rekeyIfRequired(nonce); err != nil {
+		panic(fmt.Sprintf("Rekeying failed with: %s", err.Error()))
+	}
+	maskNonce(s.nonceBuf, nonce, s.nonceMask)
+	return s.gcmAEAD.Seal(dst, s.nonceBuf, plaintext, additionalData)
+}
+
+// Open rekeys if nonce[2:8] is different than in the last call, masks the nonce,
+// and calls Open for aes128gcm.
+func (s *rekeyAEAD) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
+	if err := s.rekeyIfRequired(nonce); err != nil {
+		return nil, err
+	}
+	maskNonce(s.nonceBuf, nonce, s.nonceMask)
+	return s.gcmAEAD.Open(dst, s.nonceBuf, ciphertext, additionalData)
+}
+
+// rekeyIfRequired creates a new aes128gcm AEAD if the existing AEAD is nil
+// or cannot be used with given nonce.
+func (s *rekeyAEAD) rekeyIfRequired(nonce []byte) error {
+	newKdfCounter := nonce[kdfCounterOffset : kdfCounterOffset+kdfCounterLen]
+	if s.gcmAEAD != nil && bytes.Equal(newKdfCounter, s.kdfCounter) {
+		return nil
+	}
+	copy(s.kdfCounter, newKdfCounter)
+	a, err := aes.NewCipher(hkdfExpand(s.kdfKey, s.kdfCounter))
+	if err != nil {
+		return err
+	}
+	s.gcmAEAD, err = cipher.NewGCM(a)
+	return err
+}
+
+// maskNonce XORs the given nonce with the mask and stores the result in dst.
+func maskNonce(dst, nonce, mask []byte) {
+	nonce1 := binary.LittleEndian.Uint64(nonce[:sizeUint64])
+	nonce2 := binary.LittleEndian.Uint32(nonce[sizeUint64:])
+	mask1 := binary.LittleEndian.Uint64(mask[:sizeUint64])
+	mask2 := binary.LittleEndian.Uint32(mask[sizeUint64:])
+	binary.LittleEndian.PutUint64(dst[:sizeUint64], nonce1^mask1)
+	binary.LittleEndian.PutUint32(dst[sizeUint64:], nonce2^mask2)
+}
+
+// NonceSize returns the required nonce size.
+func (s *rekeyAEAD) NonceSize() int {
+	return s.gcmAEAD.NonceSize()
+}
+
+// Overhead returns the ciphertext overhead.
+func (s *rekeyAEAD) Overhead() int {
+	return s.gcmAEAD.Overhead()
+}
+
+// hkdfExpand computes the first 16 bytes of the HKDF-expand function
+// defined in RFC5869.
+func hkdfExpand(key, info []byte) []byte {
+	mac := hmac.New(sha256.New, key)
+	mac.Write(info)
+	mac.Write([]byte{0x01}[:])
+	return mac.Sum(nil)[:aeadKeyLen]
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/aeadrekey_test.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aeadrekey_test.go
new file mode 100644
index 00000000..d639b38a
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aeadrekey_test.go
@@ -0,0 +1,263 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"bytes"
+	"encoding/hex"
+	"testing"
+)
+
+// cryptoTestVector is struct for a rekey test vector
+type rekeyAEADTestVector struct {
+	desc                                   string
+	key, nonce, plaintext, aad, ciphertext []byte
+}
+
+// Test encrypt and decrypt using (adapted) test vectors for AES-GCM.
+func TestAES128GCMRekeyEncrypt(t *testing.T) {
+	for _, test := range []rekeyAEADTestVector{
+		// NIST vectors from:
+		// http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-revised-spec.pdf
+		//
+		// IEEE vectors from:
+		// http://www.ieee802.org/1/files/public/docs2011/bn-randall-test-vectors-0511-v1.pdf
+		//
+		// Key expanded by setting
+		// expandedKey = (key ||
+		//                key ^ {0x01,..,0x01} ||
+		//                key ^ {0x02,..,0x02})[0:44].
+		{
+			desc:       "Derived from NIST test vector 1",
+			key:        dehex("0000000000000000000000000000000001010101010101010101010101010101020202020202020202020202"),
+			nonce:      dehex("000000000000000000000000"),
+			aad:        dehex(""),
+			plaintext:  dehex(""),
+			ciphertext: dehex("85e873e002f6ebdc4060954eb8675508"),
+		},
+		{
+			desc:       "Derived from NIST test vector 2",
+			key:        dehex("0000000000000000000000000000000001010101010101010101010101010101020202020202020202020202"),
+			nonce:      dehex("000000000000000000000000"),
+			aad:        dehex(""),
+			plaintext:  dehex("00000000000000000000000000000000"),
+			ciphertext: dehex("51e9a8cb23ca2512c8256afff8e72d681aca19a1148ac115e83df4888cc00d11"),
+		},
+		{
+			desc:       "Derived from NIST test vector 3",
+			key:        dehex("feffe9928665731c6d6a8f9467308308fffee8938764721d6c6b8e9566318209fcfdeb908467711e6f688d96"),
+			nonce:      dehex("cafebabefacedbaddecaf888"),
+			aad:        dehex(""),
+			plaintext:  dehex("d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255"),
+			ciphertext: dehex("1018ed5a1402a86516d6576d70b2ffccca261b94df88b58f53b64dfba435d18b2f6e3b7869f9353d4ac8cf09afb1663daa7b4017e6fc2c177c0c087c0df1162129952213cee1bc6e9c8495dd705e1f3d"),
+		},
+		{
+			desc:       "Derived from NIST test vector 4",
+			key:        dehex("feffe9928665731c6d6a8f9467308308fffee8938764721d6c6b8e9566318209fcfdeb908467711e6f688d96"),
+			nonce:      dehex("cafebabefacedbaddecaf888"),
+			aad:        dehex("feedfacedeadbeeffeedfacedeadbeefabaddad2"),
+			plaintext:  dehex("d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39"),
+			ciphertext: dehex("1018ed5a1402a86516d6576d70b2ffccca261b94df88b58f53b64dfba435d18b2f6e3b7869f9353d4ac8cf09afb1663daa7b4017e6fc2c177c0c087c4764565d077e9124001ddb27fc0848c5"),
+		},
+		{
+			desc:       "Derived from adapted NIST test vector 4 for KDF counter boundary (flip nonce bit 15)",
+			key:        dehex("feffe9928665731c6d6a8f9467308308fffee8938764721d6c6b8e9566318209fcfdeb908467711e6f688d96"),
+			nonce:      dehex("ca7ebabefacedbaddecaf888"),
+			aad:        dehex("feedfacedeadbeeffeedfacedeadbeefabaddad2"),
+			plaintext:  dehex("d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39"),
+			ciphertext: dehex("e650d3c0fb879327f2d03287fa93cd07342b136215adbca00c3bd5099ec41832b1d18e0423ed26bb12c6cd09debb29230a94c0cee15903656f85edb6fc509b1b28216382172ecbcc31e1e9b1"),
+		},
+		{
+			desc:       "Derived from adapted NIST test vector 4 for KDF counter boundary (flip nonce bit 16)",
+			key:        dehex("feffe9928665731c6d6a8f9467308308fffee8938764721d6c6b8e9566318209fcfdeb908467711e6f688d96"),
+			nonce:      dehex("cafebbbefacedbaddecaf888"),
+			aad:        dehex("feedfacedeadbeeffeedfacedeadbeefabaddad2"),
+			plaintext:  dehex("d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39"),
+			ciphertext: dehex("c0121e6c954d0767f96630c33450999791b2da2ad05c4190169ccad9ac86ff1c721e3d82f2ad22ab463bab4a0754b7dd68ca4de7ea2531b625eda01f89312b2ab957d5c7f8568dd95fcdcd1f"),
+		},
+		{
+			desc:       "Derived from adapted NIST test vector 4 for KDF counter boundary (flip nonce bit 63)",
+			key:        dehex("feffe9928665731c6d6a8f9467308308fffee8938764721d6c6b8e9566318209fcfdeb908467711e6f688d96"),
+			nonce:      dehex("cafebabefacedb2ddecaf888"),
+			aad:        dehex("feedfacedeadbeeffeedfacedeadbeefabaddad2"),
+			plaintext:  dehex("d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39"),
+			ciphertext: dehex("8af37ea5684a4d81d4fd817261fd9743099e7e6a025eaacf8e54b124fb5743149e05cb89f4a49467fe2e5e5965f29a19f99416b0016b54585d12553783ba59e9f782e82e097c336bf7989f08"),
+		},
+		{
+			desc:       "Derived from adapted NIST test vector 4 for KDF counter boundary (flip nonce bit 64)",
+			key:        dehex("feffe9928665731c6d6a8f9467308308fffee8938764721d6c6b8e9566318209fcfdeb908467711e6f688d96"),
+			nonce:      dehex("cafebabefacedbaddfcaf888"),
+			aad:        dehex("feedfacedeadbeeffeedfacedeadbeefabaddad2"),
+			plaintext:  dehex("d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39"),
+			ciphertext: dehex("fbd528448d0346bfa878634864d407a35a039de9db2f1feb8e965b3ae9356ce6289441d77f8f0df294891f37ea438b223e3bf2bdc53d4c5a74fb680bb312a8dec6f7252cbcd7f5799750ad78"),
+		},
+		{
+			desc:       "Derived from IEEE 2.1.1 54-byte auth",
+			key:        dehex("ad7a2bd03eac835a6f620fdcb506b345ac7b2ad13fad825b6e630eddb407b244af7829d23cae81586d600dde"),
+			nonce:      dehex("12153524c0895e81b2c28465"),
+			aad:        dehex("d609b1f056637a0d46df998d88e5222ab2c2846512153524c0895e8108000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233340001"),
+			plaintext:  dehex(""),
+			ciphertext: dehex("3ea0b584f3c85e93f9320ea591699efb"),
+		},
+		{
+			desc:       "Derived from IEEE 2.1.2 54-byte auth",
+			key:        dehex("e3c08a8f06c6e3ad95a70557b23f75483ce33021a9c72b7025666204c69c0b72e1c2888d04c4e1af97a50755"),
+			nonce:      dehex("12153524c0895e81b2c28465"),
+			aad:        dehex("d609b1f056637a0d46df998d88e5222ab2c2846512153524c0895e8108000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233340001"),
+			plaintext:  dehex(""),
+			ciphertext: dehex("294e028bf1fe6f14c4e8f7305c933eb5"),
+		},
+		{
+			desc:       "Derived from IEEE 2.2.1 60-byte crypt",
+			key:        dehex("ad7a2bd03eac835a6f620fdcb506b345ac7b2ad13fad825b6e630eddb407b244af7829d23cae81586d600dde"),
+			nonce:      dehex("12153524c0895e81b2c28465"),
+			aad:        dehex("d609b1f056637a0d46df998d88e52e00b2c2846512153524c0895e81"),
+			plaintext:  dehex("08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a0002"),
+			ciphertext: dehex("db3d25719c6b0a3ca6145c159d5c6ed9aff9c6e0b79f17019ea923b8665ddf52137ad611f0d1bf417a7ca85e45afe106ff9c7569d335d086ae6c03f00987ccd6"),
+		},
+		{
+			desc:       "Derived from IEEE 2.2.2 60-byte crypt",
+			key:        dehex("e3c08a8f06c6e3ad95a70557b23f75483ce33021a9c72b7025666204c69c0b72e1c2888d04c4e1af97a50755"),
+			nonce:      dehex("12153524c0895e81b2c28465"),
+			aad:        dehex("d609b1f056637a0d46df998d88e52e00b2c2846512153524c0895e81"),
+			plaintext:  dehex("08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a0002"),
+			ciphertext: dehex("1641f28ec13afcc8f7903389787201051644914933e9202bb9d06aa020c2a67ef51dfe7bc00a856c55b8f8133e77f659132502bad63f5713d57d0c11e0f871ed"),
+		},
+		{
+			desc:       "Derived from IEEE 2.3.1 60-byte auth",
+			key:        dehex("071b113b0ca743fecccf3d051f737382061a103a0da642ffcdce3c041e727283051913390ea541fccecd3f07"),
+			nonce:      dehex("f0761e8dcd3d000176d457ed"),
+			aad:        dehex("e20106d7cd0df0761e8dcd3d88e5400076d457ed08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a0003"),
+			plaintext:  dehex(""),
+			ciphertext: dehex("58837a10562b0f1f8edbe58ca55811d3"),
+		},
+		{
+			desc:       "Derived from IEEE 2.3.2 60-byte auth",
+			key:        dehex("691d3ee909d7f54167fd1ca0b5d769081f2bde1aee655fdbab80bd5295ae6be76b1f3ceb0bd5f74365ff1ea2"),
+			nonce:      dehex("f0761e8dcd3d000176d457ed"),
+			aad:        dehex("e20106d7cd0df0761e8dcd3d88e5400076d457ed08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a0003"),
+			plaintext:  dehex(""),
+			ciphertext: dehex("c2722ff6ca29a257718a529d1f0c6a3b"),
+		},
+		{
+			desc:       "Derived from IEEE 2.4.1 54-byte crypt",
+			key:        dehex("071b113b0ca743fecccf3d051f737382061a103a0da642ffcdce3c041e727283051913390ea541fccecd3f07"),
+			nonce:      dehex("f0761e8dcd3d000176d457ed"),
+			aad:        dehex("e20106d7cd0df0761e8dcd3d88e54c2a76d457ed"),
+			plaintext:  dehex("08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233340004"),
+			ciphertext: dehex("fd96b715b93a13346af51e8acdf792cdc7b2686f8574c70e6b0cbf16291ded427ad73fec48cd298e0528a1f4c644a949fc31dc9279706ddba33f"),
+		},
+		{
+			desc:       "Derived from IEEE 2.4.2 54-byte crypt",
+			key:        dehex("691d3ee909d7f54167fd1ca0b5d769081f2bde1aee655fdbab80bd5295ae6be76b1f3ceb0bd5f74365ff1ea2"),
+			nonce:      dehex("f0761e8dcd3d000176d457ed"),
+			aad:        dehex("e20106d7cd0df0761e8dcd3d88e54c2a76d457ed"),
+			plaintext:  dehex("08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30313233340004"),
+			ciphertext: dehex("b68f6300c2e9ae833bdc070e24021a3477118e78ccf84e11a485d861476c300f175353d5cdf92008a4f878e6cc3577768085c50a0e98fda6cbb8"),
+		},
+		{
+			desc:       "Derived from IEEE 2.5.1 65-byte auth",
+			key:        dehex("013fe00b5f11be7f866d0cbbc55a7a90003ee10a5e10bf7e876c0dbac45b7b91033de2095d13bc7d846f0eb9"),
+			nonce:      dehex("7cfde9f9e33724c68932d612"),
+			aad:        dehex("84c5d513d2aaf6e5bbd2727788e523008932d6127cfde9f9e33724c608000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f0005"),
+			plaintext:  dehex(""),
+			ciphertext: dehex("cca20eecda6283f09bb3543dd99edb9b"),
+		},
+		{
+			desc:       "Derived from IEEE 2.5.2 65-byte auth",
+			key:        dehex("83c093b58de7ffe1c0da926ac43fb3609ac1c80fee1b624497ef942e2f79a82381c291b78fe5fde3c2d89068"),
+			nonce:      dehex("7cfde9f9e33724c68932d612"),
+			aad:        dehex("84c5d513d2aaf6e5bbd2727788e523008932d6127cfde9f9e33724c608000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f0005"),
+			plaintext:  dehex(""),
+			ciphertext: dehex("b232cc1da5117bf15003734fa599d271"),
+		},
+		{
+			desc:       "Derived from IEEE  2.6.1 61-byte crypt",
+			key:        dehex("013fe00b5f11be7f866d0cbbc55a7a90003ee10a5e10bf7e876c0dbac45b7b91033de2095d13bc7d846f0eb9"),
+			nonce:      dehex("7cfde9f9e33724c68932d612"),
+			aad:        dehex("84c5d513d2aaf6e5bbd2727788e52f008932d6127cfde9f9e33724c6"),
+			plaintext:  dehex("08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b0006"),
+			ciphertext: dehex("ff1910d35ad7e5657890c7c560146fd038707f204b66edbc3d161f8ace244b985921023c436e3a1c3532ecd5d09a056d70be583f0d10829d9387d07d33d872e490"),
+		},
+		{
+			desc:       "Derived from IEEE 2.6.2 61-byte crypt",
+			key:        dehex("83c093b58de7ffe1c0da926ac43fb3609ac1c80fee1b624497ef942e2f79a82381c291b78fe5fde3c2d89068"),
+			nonce:      dehex("7cfde9f9e33724c68932d612"),
+			aad:        dehex("84c5d513d2aaf6e5bbd2727788e52f008932d6127cfde9f9e33724c6"),
+			plaintext:  dehex("08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b0006"),
+			ciphertext: dehex("0db4cf956b5f97eca4eab82a6955307f9ae02a32dd7d93f83d66ad04e1cfdc5182ad12abdea5bbb619a1bd5fb9a573590fba908e9c7a46c1f7ba0905d1b55ffda4"),
+		},
+		{
+			desc:       "Derived from IEEE 2.7.1 79-byte crypt",
+			key:        dehex("88ee087fd95da9fbf6725aa9d757b0cd89ef097ed85ca8faf7735ba8d656b1cc8aec0a7ddb5fabf9f47058ab"),
+			nonce:      dehex("7ae8e2ca4ec500012e58495c"),
+			aad:        dehex("68f2e77696ce7ae8e2ca4ec588e541002e58495c08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d0007"),
+			plaintext:  dehex(""),
+			ciphertext: dehex("813f0e630f96fb2d030f58d83f5cdfd0"),
+		},
+		{
+			desc:       "Derived from IEEE 2.7.2 79-byte crypt",
+			key:        dehex("4c973dbc7364621674f8b5b89e5c15511fced9216490fb1c1a2caa0ffe0407e54e953fbe7166601476fab7ba"),
+			nonce:      dehex("7ae8e2ca4ec500012e58495c"),
+			aad:        dehex("68f2e77696ce7ae8e2ca4ec588e541002e58495c08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d0007"),
+			plaintext:  dehex(""),
+			ciphertext: dehex("77e5a44c21eb07188aacbd74d1980e97"),
+		},
+		{
+			desc:       "Derived from IEEE 2.8.1 61-byte crypt",
+			key:        dehex("88ee087fd95da9fbf6725aa9d757b0cd89ef097ed85ca8faf7735ba8d656b1cc8aec0a7ddb5fabf9f47058ab"),
+			nonce:      dehex("7ae8e2ca4ec500012e58495c"),
+			aad:        dehex("68f2e77696ce7ae8e2ca4ec588e54d002e58495c"),
+			plaintext:  dehex("08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748490008"),
+			ciphertext: dehex("958ec3f6d60afeda99efd888f175e5fcd4c87b9bcc5c2f5426253a8b506296c8c43309ab2adb5939462541d95e80811e04e706b1498f2c407c7fb234f8cc01a647550ee6b557b35a7e3945381821f4"),
+		},
+		{
+			desc:       "Derived from IEEE 2.8.2 61-byte crypt",
+			key:        dehex("4c973dbc7364621674f8b5b89e5c15511fced9216490fb1c1a2caa0ffe0407e54e953fbe7166601476fab7ba"),
+			nonce:      dehex("7ae8e2ca4ec500012e58495c"),
+			aad:        dehex("68f2e77696ce7ae8e2ca4ec588e54d002e58495c"),
+			plaintext:  dehex("08000f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748490008"),
+			ciphertext: dehex("b44d072011cd36d272a9b7a98db9aa90cbc5c67b93ddce67c854503214e2e896ec7e9db649ed4bcf6f850aac0223d0cf92c83db80795c3a17ecc1248bb00591712b1ae71e268164196252162810b00"),
+		}} {
+		aead, err := newRekeyAEAD(test.key)
+		if err != nil {
+			t.Fatal("unexpected failure in newRekeyAEAD: ", err.Error())
+		}
+		if got := aead.Seal(nil, test.nonce, test.plaintext, test.aad); !bytes.Equal(got, test.ciphertext) {
+			t.Errorf("Unexpected ciphertext for test vector '%s':\nciphertext=%s\nwant=      %s",
+				test.desc, hex.EncodeToString(got), hex.EncodeToString(test.ciphertext))
+		}
+		if got, err := aead.Open(nil, test.nonce, test.ciphertext, test.aad); err != nil || !bytes.Equal(got, test.plaintext) {
+			t.Errorf("Unexpected plaintext for test vector '%s':\nplaintext=%s (err=%v)\nwant=     %s",
+				test.desc, hex.EncodeToString(got), err, hex.EncodeToString(test.plaintext))
+		}
+
+	}
+}
+
+func dehex(s string) []byte {
+	if len(s) == 0 {
+		return make([]byte, 0)
+	}
+	b, err := hex.DecodeString(s)
+	if err != nil {
+		panic(err)
+	}
+	return b
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcm.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcm.go
new file mode 100644
index 00000000..0c4fe339
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcm.go
@@ -0,0 +1,105 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+
+	"google.golang.org/grpc/credentials/alts/core"
+)
+
+const (
+	// Overflow length n in bytes, never encrypt more than 2^(n*8) frames (in
+	// each direction).
+	overflowLenAES128GCM = 5
+)
+
+// aes128gcm is the struct that holds necessary information for ALTS record.
+// The counter value is NOT included in the payload during the encryption and
+// decryption operations.
+type aes128gcm struct {
+	// inCounter is used in ALTS record to check that incoming counters are
+	// as expected, since ALTS record guarantees that messages are unwrapped
+	// in the same order that the peer wrapped them.
+	inCounter  counter
+	outCounter counter
+	aead       cipher.AEAD
+}
+
+// NewAES128GCM creates an instance that uses aes128gcm for ALTS record.
+func NewAES128GCM(side core.Side, key []byte) (ALTSRecordCrypto, error) {
+	c, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	a, err := cipher.NewGCM(c)
+	if err != nil {
+		return nil, err
+	}
+	return &aes128gcm{
+		inCounter:  newInCounter(side, overflowLenAES128GCM),
+		outCounter: newOutCounter(side, overflowLenAES128GCM),
+		aead:       a,
+	}, nil
+}
+
+// Encrypt is the encryption function. dst can contain bytes at the beginning of
+// the ciphertext that will not be encrypted but will be authenticated. If dst
+// has enough capacity to hold these bytes, the ciphertext and the tag, no
+// allocation and copy operations will be performed. dst and plaintext do not
+// overlap.
+func (s *aes128gcm) Encrypt(dst, plaintext []byte) ([]byte, error) {
+	// If we need to allocate an output buffer, we want to include space for
+	// GCM tag to avoid forcing ALTS record to reallocate as well.
+	dlen := len(dst)
+	dst, out := SliceForAppend(dst, len(plaintext)+GcmTagSize)
+	seq, err := s.outCounter.Value()
+	if err != nil {
+		return nil, err
+	}
+	data := out[:len(plaintext)]
+	copy(data, plaintext) // data may alias plaintext
+
+	// Seal appends the ciphertext and the tag to its first argument and
+	// returns the updated slice. However, SliceForAppend above ensures that
+	// dst has enough capacity to avoid a reallocation and copy due to the
+	// append.
+	dst = s.aead.Seal(dst[:dlen], seq, data, nil)
+	s.outCounter.Inc()
+	return dst, nil
+}
+
+func (s *aes128gcm) EncryptionOverhead() int {
+	return GcmTagSize
+}
+
+func (s *aes128gcm) Decrypt(dst, ciphertext []byte) ([]byte, error) {
+	seq, err := s.inCounter.Value()
+	if err != nil {
+		return nil, err
+	}
+	// If dst is equal to ciphertext[:0], ciphertext storage is reused.
+	plaintext, err := s.aead.Open(dst, seq, ciphertext, nil)
+	if err != nil {
+		return nil, ErrAuth
+	}
+	s.inCounter.Inc()
+	return plaintext, nil
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcm_test.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcm_test.go
new file mode 100644
index 00000000..c2fca4dd
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcm_test.go
@@ -0,0 +1,223 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"bytes"
+	"testing"
+
+	"google.golang.org/grpc/credentials/alts/core"
+)
+
+// cryptoTestVector is struct for a GCM test vector
+type cryptoTestVector struct {
+	key, counter, plaintext, ciphertext, tag []byte
+	allocateDst                              bool
+}
+
+// getGCMCryptoPair outputs a client/server pair on aes128gcm.
+func getGCMCryptoPair(key []byte, counter []byte, t *testing.T) (ALTSRecordCrypto, ALTSRecordCrypto) {
+	client, err := NewAES128GCM(core.ClientSide, key)
+	if err != nil {
+		t.Fatalf("NewAES128GCM(ClientSide, key) = %v", err)
+	}
+	server, err := NewAES128GCM(core.ServerSide, key)
+	if err != nil {
+		t.Fatalf("NewAES128GCM(ServerSide, key) = %v", err)
+	}
+	// set counter if provided.
+	if counter != nil {
+		if counterSide(counter) == core.ClientSide {
+			client.(*aes128gcm).outCounter = counterFromValue(counter, overflowLenAES128GCM)
+			server.(*aes128gcm).inCounter = counterFromValue(counter, overflowLenAES128GCM)
+		} else {
+			server.(*aes128gcm).outCounter = counterFromValue(counter, overflowLenAES128GCM)
+			client.(*aes128gcm).inCounter = counterFromValue(counter, overflowLenAES128GCM)
+		}
+	}
+	return client, server
+}
+
+func testGCMEncryptionDecryption(sender ALTSRecordCrypto, receiver ALTSRecordCrypto, test *cryptoTestVector, withCounter bool, t *testing.T) {
+	// Ciphertext is: counter + encrypted text + tag.
+	ciphertext := []byte(nil)
+	if withCounter {
+		ciphertext = append(ciphertext, test.counter...)
+	}
+	ciphertext = append(ciphertext, test.ciphertext...)
+	ciphertext = append(ciphertext, test.tag...)
+
+	// Decrypt.
+	if got, err := receiver.Decrypt(nil, ciphertext); err != nil || !bytes.Equal(got, test.plaintext) {
+		t.Errorf("key=%v\ncounter=%v\ntag=%v\nciphertext=%v\nDecrypt = %v, %v\nwant: %v",
+			test.key, test.counter, test.tag, test.ciphertext, got, err, test.plaintext)
+	}
+
+	// Encrypt.
+	var dst []byte
+	if test.allocateDst {
+		dst = make([]byte, len(test.plaintext)+sender.EncryptionOverhead())
+	}
+	if got, err := sender.Encrypt(dst[:0], test.plaintext); err != nil || !bytes.Equal(got, ciphertext) {
+		t.Errorf("key=%v\ncounter=%v\nplaintext=%v\nEncrypt = %v, %v\nwant: %v",
+			test.key, test.counter, test.plaintext, got, err, ciphertext)
+	}
+}
+
+// Test encrypt and decrypt using test vectors for aes128gcm.
+func TestAES128GCMEncrypt(t *testing.T) {
+	for _, test := range []cryptoTestVector{
+		{
+			key:         dehex("11754cd72aec309bf52f7687212e8957"),
+			counter:     dehex("3c819d9a9bed087615030b65"),
+			plaintext:   nil,
+			ciphertext:  nil,
+			tag:         dehex("250327c674aaf477aef2675748cf6971"),
+			allocateDst: false,
+		},
+		{
+			key:         dehex("ca47248ac0b6f8372a97ac43508308ed"),
+			counter:     dehex("ffd2b598feabc9019262d2be"),
+			plaintext:   nil,
+			ciphertext:  nil,
+			tag:         dehex("60d20404af527d248d893ae495707d1a"),
+			allocateDst: false,
+		},
+		{
+			key:         dehex("7fddb57453c241d03efbed3ac44e371c"),
+			counter:     dehex("ee283a3fc75575e33efd4887"),
+			plaintext:   dehex("d5de42b461646c255c87bd2962d3b9a2"),
+			ciphertext:  dehex("2ccda4a5415cb91e135c2a0f78c9b2fd"),
+			tag:         dehex("b36d1df9b9d5e596f83e8b7f52971cb3"),
+			allocateDst: false,
+		},
+		{
+			key:         dehex("ab72c77b97cb5fe9a382d9fe81ffdbed"),
+			counter:     dehex("54cc7dc2c37ec006bcc6d1da"),
+			plaintext:   dehex("007c5e5b3e59df24a7c355584fc1518d"),
+			ciphertext:  dehex("0e1bde206a07a9c2c1b65300f8c64997"),
+			tag:         dehex("2b4401346697138c7a4891ee59867d0c"),
+			allocateDst: false,
+		},
+		{
+			key:         dehex("11754cd72aec309bf52f7687212e8957"),
+			counter:     dehex("3c819d9a9bed087615030b65"),
+			plaintext:   nil,
+			ciphertext:  nil,
+			tag:         dehex("250327c674aaf477aef2675748cf6971"),
+			allocateDst: true,
+		},
+		{
+			key:         dehex("ca47248ac0b6f8372a97ac43508308ed"),
+			counter:     dehex("ffd2b598feabc9019262d2be"),
+			plaintext:   nil,
+			ciphertext:  nil,
+			tag:         dehex("60d20404af527d248d893ae495707d1a"),
+			allocateDst: true,
+		},
+		{
+			key:         dehex("7fddb57453c241d03efbed3ac44e371c"),
+			counter:     dehex("ee283a3fc75575e33efd4887"),
+			plaintext:   dehex("d5de42b461646c255c87bd2962d3b9a2"),
+			ciphertext:  dehex("2ccda4a5415cb91e135c2a0f78c9b2fd"),
+			tag:         dehex("b36d1df9b9d5e596f83e8b7f52971cb3"),
+			allocateDst: true,
+		},
+		{
+			key:         dehex("ab72c77b97cb5fe9a382d9fe81ffdbed"),
+			counter:     dehex("54cc7dc2c37ec006bcc6d1da"),
+			plaintext:   dehex("007c5e5b3e59df24a7c355584fc1518d"),
+			ciphertext:  dehex("0e1bde206a07a9c2c1b65300f8c64997"),
+			tag:         dehex("2b4401346697138c7a4891ee59867d0c"),
+			allocateDst: true,
+		},
+	} {
+		// Test encryption and decryption for aes128gcm.
+		client, server := getGCMCryptoPair(test.key, test.counter, t)
+		if counterSide(test.counter) == core.ClientSide {
+			testGCMEncryptionDecryption(client, server, &test, false, t)
+		} else {
+			testGCMEncryptionDecryption(server, client, &test, false, t)
+		}
+	}
+}
+
+func testGCMEncryptRoundtrip(client ALTSRecordCrypto, server ALTSRecordCrypto, t *testing.T) {
+	// Encrypt.
+	const plaintext = "This is plaintext."
+	var err error
+	buf := []byte(plaintext)
+	buf, err = client.Encrypt(buf[:0], buf)
+	if err != nil {
+		t.Fatal("Encrypting with client-side context: unexpected error", err, "\n",
+			"Plaintext:", []byte(plaintext))
+	}
+
+	// Encrypt a second message.
+	const plaintext2 = "This is a second plaintext."
+	buf2 := []byte(plaintext2)
+	buf2, err = client.Encrypt(buf2[:0], buf2)
+	if err != nil {
+		t.Fatal("Encrypting with client-side context: unexpected error", err, "\n",
+			"Plaintext:", []byte(plaintext2))
+	}
+
+	// Decryption fails: cannot decrypt second message before first.
+	if got, err := server.Decrypt(nil, buf2); err == nil {
+		t.Error("Decrypting client-side ciphertext with a client-side context unexpectedly succeeded; want unexpected counter error:\n",
+			"  Original plaintext:", []byte(plaintext2), "\n",
+			"  Ciphertext:", buf2, "\n",
+			"  Decrypted plaintext:", got)
+	}
+
+	// Decryption fails: wrong counter space.
+	if got, err := client.Decrypt(nil, buf); err == nil {
+		t.Error("Decrypting client-side ciphertext with a client-side context unexpectedly succeeded; want counter space error:\n",
+			"  Original plaintext:", []byte(plaintext), "\n",
+			"  Ciphertext:", buf, "\n",
+			"  Decrypted plaintext:", got)
+	}
+
+	// Decrypt first message.
+	ciphertext := append([]byte(nil), buf...)
+	buf, err = server.Decrypt(buf[:0], buf)
+	if err != nil || string(buf) != plaintext {
+		t.Fatal("Decrypting client-side ciphertext with a server-side context did not produce original content:\n",
+			"  Original plaintext:", []byte(plaintext), "\n",
+			"  Ciphertext:", ciphertext, "\n",
+			"  Decryption error:", err, "\n",
+			"  Decrypted plaintext:", buf)
+	}
+
+	// Decryption fails: replay attack.
+	if got, err := server.Decrypt(nil, buf); err == nil {
+		t.Error("Decrypting client-side ciphertext with a client-side context unexpectedly succeeded; want unexpected counter error:\n",
+			"  Original plaintext:", []byte(plaintext), "\n",
+			"  Ciphertext:", buf, "\n",
+			"  Decrypted plaintext:", got)
+	}
+}
+
+// Test encrypt and decrypt on roundtrip messages for aes128gcm.
+func TestAES128GCMEncryptRoundtrip(t *testing.T) {
+	// Test for aes128gcm.
+	key := make([]byte, 16)
+	client, server := getGCMCryptoPair(key, nil, t)
+	testGCMEncryptRoundtrip(client, server, t)
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcmrekey.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcmrekey.go
new file mode 100644
index 00000000..4b5ecf40
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcmrekey.go
@@ -0,0 +1,116 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"crypto/cipher"
+
+	"google.golang.org/grpc/credentials/alts/core"
+)
+
+const (
+	// Overflow length n in bytes, never encrypt more than 2^(n*8) frames (in
+	// each direction).
+	overflowLenAES128GCMRekey = 8
+	nonceLen                  = 12
+	aeadKeyLen                = 16
+	kdfKeyLen                 = 32
+	kdfCounterOffset          = 2
+	kdfCounterLen             = 6
+	sizeUint64                = 8
+)
+
+// aes128gcmRekey is the struct that holds necessary information for ALTS record.
+// The counter value is NOT included in the payload during the encryption and
+// decryption operations.
+type aes128gcmRekey struct {
+	// inCounter is used in ALTS record to check that incoming counters are
+	// as expected, since ALTS record guarantees that messages are unwrapped
+	// in the same order that the peer wrapped them.
+	inCounter  counter
+	outCounter counter
+	inAEAD     cipher.AEAD
+	outAEAD    cipher.AEAD
+}
+
+// NewAES128GCMRekey creates an instance that uses aes128gcm with rekeying
+// for ALTS record. The key argument should be 44 bytes, the first 32 bytes
+// are used as a key for HKDF-expand and the remainining 12 bytes are used
+// as a random mask for the counter.
+func NewAES128GCMRekey(side core.Side, key []byte) (ALTSRecordCrypto, error) {
+	inCounter := newInCounter(side, overflowLenAES128GCMRekey)
+	outCounter := newOutCounter(side, overflowLenAES128GCMRekey)
+	inAEAD, err := newRekeyAEAD(key)
+	if err != nil {
+		return nil, err
+	}
+	outAEAD, err := newRekeyAEAD(key)
+	if err != nil {
+		return nil, err
+	}
+	return &aes128gcmRekey{
+		inCounter,
+		outCounter,
+		inAEAD,
+		outAEAD,
+	}, nil
+}
+
+// Encrypt is the encryption function. dst can contain bytes at the beginning of
+// the ciphertext that will not be encrypted but will be authenticated. If dst
+// has enough capacity to hold these bytes, the ciphertext and the tag, no
+// allocation and copy operations will be performed. dst and plaintext do not
+// overlap.
+func (s *aes128gcmRekey) Encrypt(dst, plaintext []byte) ([]byte, error) {
+	// If we need to allocate an output buffer, we want to include space for
+	// GCM tag to avoid forcing ALTS record to reallocate as well.
+	dlen := len(dst)
+	dst, out := SliceForAppend(dst, len(plaintext)+GcmTagSize)
+	seq, err := s.outCounter.Value()
+	if err != nil {
+		return nil, err
+	}
+	data := out[:len(plaintext)]
+	copy(data, plaintext) // data may alias plaintext
+
+	// Seal appends the ciphertext and the tag to its first argument and
+	// returns the updated slice. However, SliceForAppend above ensures that
+	// dst has enough capacity to avoid a reallocation and copy due to the
+	// append.
+	dst = s.outAEAD.Seal(dst[:dlen], seq, data, nil)
+	s.outCounter.Inc()
+	return dst, nil
+}
+
+func (s *aes128gcmRekey) EncryptionOverhead() int {
+	return GcmTagSize
+}
+
+func (s *aes128gcmRekey) Decrypt(dst, ciphertext []byte) ([]byte, error) {
+	seq, err := s.inCounter.Value()
+	if err != nil {
+		return nil, err
+	}
+	plaintext, err := s.inAEAD.Open(dst, seq, ciphertext, nil)
+	if err != nil {
+		return nil, ErrAuth
+	}
+	s.inCounter.Inc()
+	return plaintext, nil
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcmrekey_test.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcmrekey_test.go
new file mode 100644
index 00000000..9f31a0fa
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/aes128gcmrekey_test.go
@@ -0,0 +1,117 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"testing"
+
+	"google.golang.org/grpc/credentials/alts/core"
+)
+
+// cryptoTestVector is struct for a rekey test vector
+type rekeyTestVector struct {
+	key, nonce, plaintext, ciphertext []byte
+}
+
+// getGCMCryptoPair outputs a client/server pair on aes128gcmRekey.
+func getRekeyCryptoPair(key []byte, counter []byte, t *testing.T) (ALTSRecordCrypto, ALTSRecordCrypto) {
+	client, err := NewAES128GCMRekey(core.ClientSide, key)
+	if err != nil {
+		t.Fatalf("NewAES128GCMRekey(ClientSide, key) = %v", err)
+	}
+	server, err := NewAES128GCMRekey(core.ServerSide, key)
+	if err != nil {
+		t.Fatalf("NewAES128GCMRekey(ServerSide, key) = %v", err)
+	}
+	// set counter if provided.
+	if counter != nil {
+		if counterSide(counter) == core.ClientSide {
+			client.(*aes128gcmRekey).outCounter = counterFromValue(counter, overflowLenAES128GCMRekey)
+			server.(*aes128gcmRekey).inCounter = counterFromValue(counter, overflowLenAES128GCMRekey)
+		} else {
+			server.(*aes128gcmRekey).outCounter = counterFromValue(counter, overflowLenAES128GCMRekey)
+			client.(*aes128gcmRekey).inCounter = counterFromValue(counter, overflowLenAES128GCMRekey)
+		}
+	}
+	return client, server
+}
+
+func testRekeyEncryptRoundtrip(client ALTSRecordCrypto, server ALTSRecordCrypto, t *testing.T) {
+	// Encrypt.
+	const plaintext = "This is plaintext."
+	var err error
+	buf := []byte(plaintext)
+	buf, err = client.Encrypt(buf[:0], buf)
+	if err != nil {
+		t.Fatal("Encrypting with client-side context: unexpected error", err, "\n",
+			"Plaintext:", []byte(plaintext))
+	}
+
+	// Encrypt a second message.
+	const plaintext2 = "This is a second plaintext."
+	buf2 := []byte(plaintext2)
+	buf2, err = client.Encrypt(buf2[:0], buf2)
+	if err != nil {
+		t.Fatal("Encrypting with client-side context: unexpected error", err, "\n",
+			"Plaintext:", []byte(plaintext2))
+	}
+
+	// Decryption fails: cannot decrypt second message before first.
+	if got, err := server.Decrypt(nil, buf2); err == nil {
+		t.Error("Decrypting client-side ciphertext with a client-side context unexpectedly succeeded; want unexpected counter error:\n",
+			"  Original plaintext:", []byte(plaintext2), "\n",
+			"  Ciphertext:", buf2, "\n",
+			"  Decrypted plaintext:", got)
+	}
+
+	// Decryption fails: wrong counter space.
+	if got, err := client.Decrypt(nil, buf); err == nil {
+		t.Error("Decrypting client-side ciphertext with a client-side context unexpectedly succeeded; want counter space error:\n",
+			"  Original plaintext:", []byte(plaintext), "\n",
+			"  Ciphertext:", buf, "\n",
+			"  Decrypted plaintext:", got)
+	}
+
+	// Decrypt first message.
+	ciphertext := append([]byte(nil), buf...)
+	buf, err = server.Decrypt(buf[:0], buf)
+	if err != nil || string(buf) != plaintext {
+		t.Fatal("Decrypting client-side ciphertext with a server-side context did not produce original content:\n",
+			"  Original plaintext:", []byte(plaintext), "\n",
+			"  Ciphertext:", ciphertext, "\n",
+			"  Decryption error:", err, "\n",
+			"  Decrypted plaintext:", buf)
+	}
+
+	// Decryption fails: replay attack.
+	if got, err := server.Decrypt(nil, buf); err == nil {
+		t.Error("Decrypting client-side ciphertext with a client-side context unexpectedly succeeded; want unexpected counter error:\n",
+			"  Original plaintext:", []byte(plaintext), "\n",
+			"  Ciphertext:", buf, "\n",
+			"  Decrypted plaintext:", got)
+	}
+}
+
+// Test encrypt and decrypt on roundtrip messages for aes128gcmRekey.
+func TestAES128GCMRekeyEncryptRoundtrip(t *testing.T) {
+	// Test for aes128gcmRekey.
+	key := make([]byte, 44)
+	client, server := getRekeyCryptoPair(key, nil, t)
+	testRekeyEncryptRoundtrip(client, server, t)
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/common.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/common.go
new file mode 100644
index 00000000..1795d0c9
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/common.go
@@ -0,0 +1,70 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"encoding/binary"
+	"errors"
+	"fmt"
+)
+
+const (
+	// GcmTagSize is the GCM tag size is the difference in length between
+	// plaintext and ciphertext. From crypto/cipher/gcm.go in Go crypto
+	// library.
+	GcmTagSize = 16
+)
+
+// ErrAuth occurs on authentication failure.
+var ErrAuth = errors.New("message authentication failed")
+
+// SliceForAppend takes a slice and a requested number of bytes. It returns a
+// slice with the contents of the given slice followed by that many bytes and a
+// second slice that aliases into it and contains only the extra bytes. If the
+// original slice has sufficient capacity then no allocation is performed.
+func SliceForAppend(in []byte, n int) (head, tail []byte) {
+	if total := len(in) + n; cap(in) >= total {
+		head = in[:total]
+	} else {
+		head = make([]byte, total)
+		copy(head, in)
+	}
+	tail = head[len(in):]
+	return head, tail
+}
+
+// ParseFramedMsg parse the provided buffer and returns a frame of the format
+// msgLength+msg and any remaining bytes in that buffer.
+func ParseFramedMsg(b []byte, maxLen uint32) ([]byte, []byte, error) {
+	// If the size field is not complete, return the provided buffer as
+	// remaining buffer.
+	if len(b) < MsgLenFieldSize {
+		return nil, b, nil
+	}
+	msgLenField := b[:MsgLenFieldSize]
+	length := binary.LittleEndian.Uint32(msgLenField)
+	if length > maxLen {
+		return nil, nil, fmt.Errorf("received the frame length %d larger than the limit %d", length, maxLen)
+	}
+	if len(b) < int(length)+4 { // account for the first 4 msg length bytes.
+		// Frame is not complete yet.
+		return nil, b, nil
+	}
+	return b[:MsgLenFieldSize+length], b[MsgLenFieldSize+length:], nil
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/counter.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/counter.go
new file mode 100644
index 00000000..754dcfaa
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/counter.go
@@ -0,0 +1,106 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"errors"
+
+	"google.golang.org/grpc/credentials/alts/core"
+)
+
+const counterLen = 12
+
+var (
+	errInvalidCounter = errors.New("invalid counter")
+)
+
+// counter is a 96-bit, little-endian counter.
+type counter struct {
+	value       [counterLen]byte
+	invalid     bool
+	overflowLen int
+}
+
+// newOutCounter returns an outgoing counter initialized to the starting sequence
+// number for the client/server side of a connection.
+func newOutCounter(s core.Side, overflowLen int) (c counter) {
+	c.overflowLen = overflowLen
+	if s == core.ServerSide {
+		// Server counters in ALTS record have the little-endian high bit
+		// set.
+		c.value[counterLen-1] = 0x80
+	}
+	return
+}
+
+// newInCounter returns an incoming counter initialized to the starting sequence
+// number for the client/server side of a connection. This is used in ALTS record
+// to check that incoming counters are as expected, since ALTS record guarantees
+// that messages are unwrapped in the same order that the peer wrapped them.
+func newInCounter(s core.Side, overflowLen int) (c counter) {
+	c.overflowLen = overflowLen
+	if s == core.ClientSide {
+		// Server counters in ALTS record have the little-endian high bit
+		// set.
+		c.value[counterLen-1] = 0x80
+	}
+	return
+}
+
+// counterFromValue creates a new counter given an initial value.
+func counterFromValue(value []byte, overflowLen int) (c counter) {
+	c.overflowLen = overflowLen
+	copy(c.value[:], value)
+	return
+}
+
+// Value returns the current value of the counter as a byte slice.
+func (c *counter) Value() ([]byte, error) {
+	if c.invalid {
+		return nil, errInvalidCounter
+	}
+	return c.value[:], nil
+}
+
+// Inc increments the counter and checks for overflow.
+func (c *counter) Inc() {
+	// If the counter is already invalid, there is not need to increase it.
+	if c.invalid {
+		return
+	}
+	i := 0
+	for ; i < c.overflowLen; i++ {
+		c.value[i]++
+		if c.value[i] != 0 {
+			break
+		}
+	}
+	if i == c.overflowLen {
+		c.invalid = true
+	}
+}
+
+// counterSide returns the connection side (client/server) a sequence counter is
+// associated with.
+func counterSide(c []byte) core.Side {
+	if c[counterLen-1]&0x80 == 0x80 {
+		return core.ServerSide
+	}
+	return core.ClientSide
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/counter_test.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/counter_test.go
new file mode 100644
index 00000000..faf56369
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/counter_test.go
@@ -0,0 +1,141 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"bytes"
+	"testing"
+
+	"google.golang.org/grpc/credentials/alts/core"
+)
+
+const (
+	testOverflowLen = 5
+)
+
+func TestCounterSides(t *testing.T) {
+	for _, side := range []core.Side{core.ClientSide, core.ServerSide} {
+		outCounter := newOutCounter(side, testOverflowLen)
+		inCounter := newInCounter(side, testOverflowLen)
+		for i := 0; i < 1024; i++ {
+			value, _ := outCounter.Value()
+			if g, w := counterSide(value), side; g != w {
+				t.Errorf("after %d iterations, counterSide(outCounter.Value()) = %v, want %v", i, g, w)
+				break
+			}
+			value, _ = inCounter.Value()
+			if g, w := counterSide(value), side; g == w {
+				t.Errorf("after %d iterations, counterSide(inCounter.Value()) = %v, want %v", i, g, w)
+				break
+			}
+			outCounter.Inc()
+			inCounter.Inc()
+		}
+	}
+}
+
+func TestCounterInc(t *testing.T) {
+	for _, test := range []struct {
+		counter []byte
+		want    []byte
+	}{
+		{
+			counter: []byte{0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			want:    []byte{0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+		},
+		{
+			counter: []byte{0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80},
+			want:    []byte{0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80},
+		},
+		{
+			counter: []byte{0xff, 0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			want:    []byte{0x00, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+		},
+		{
+			counter: []byte{0x42, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			want:    []byte{0x43, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+		},
+		{
+			counter: []byte{0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+			want:    []byte{0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		},
+		{
+			counter: []byte{0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80},
+			want:    []byte{0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80},
+		},
+	} {
+		c := counterFromValue(test.counter, overflowLenAES128GCM)
+		c.Inc()
+		value, _ := c.Value()
+		if g, w := value, test.want; !bytes.Equal(g, w) || c.invalid {
+			t.Errorf("counter(%v).Inc() =\n%v, want\n%v", test.counter, g, w)
+		}
+	}
+}
+
+func TestRolloverCounter(t *testing.T) {
+	for _, test := range []struct {
+		desc        string
+		value       []byte
+		overflowLen int
+	}{
+		{
+			desc:        "testing overflow without rekeying 1",
+			value:       []byte{0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80},
+			overflowLen: 5,
+		},
+		{
+			desc:        "testing overflow without rekeying 2",
+			value:       []byte{0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+			overflowLen: 5,
+		},
+		{
+			desc:        "testing overflow for rekeying mode 1",
+			value:       []byte{0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x80},
+			overflowLen: 8,
+		},
+		{
+			desc:        "testing overflow for rekeying mode 2",
+			value:       []byte{0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00},
+			overflowLen: 8,
+		},
+	} {
+		c := counterFromValue(test.value, overflowLenAES128GCM)
+
+		// First Inc() + Value() should work.
+		c.Inc()
+		_, err := c.Value()
+		if err != nil {
+			t.Errorf("%v: first Inc() + Value() unexpectedly failed: %v, want <nil> error", test.desc, err)
+		}
+		// Second Inc() + Value() should fail.
+		c.Inc()
+		_, err = c.Value()
+		if err != errInvalidCounter {
+			t.Errorf("%v: second Inc() + Value() unexpectedly succeeded: want %v", test.desc, errInvalidCounter)
+		}
+		// Third Inc() + Value() should also fail because the counter is
+		// already in an invalid state.
+		c.Inc()
+		_, err = c.Value()
+		if err != errInvalidCounter {
+			t.Errorf("%v: Third Inc() + Value() unexpectedly succeeded: want %v", test.desc, errInvalidCounter)
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/record.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/record.go
new file mode 100644
index 00000000..cb514ebe
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/record.go
@@ -0,0 +1,271 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package conn contains an implementation of a secure channel created by gRPC
+// handshakers.
+package conn
+
+import (
+	"encoding/binary"
+	"fmt"
+	"math"
+	"net"
+
+	"google.golang.org/grpc/credentials/alts/core"
+)
+
+// ALTSRecordCrypto is the interface for gRPC ALTS record protocol.
+type ALTSRecordCrypto interface {
+	// Encrypt encrypts the plaintext and computes the tag (if any) of dst
+	// and plaintext, dst and plaintext do not overlap.
+	Encrypt(dst, plaintext []byte) ([]byte, error)
+	// EncryptionOverhead returns the tag size (if any) in bytes.
+	EncryptionOverhead() int
+	// Decrypt decrypts ciphertext and verify the tag (if any). dst and
+	// ciphertext may alias exactly or not at all. To reuse ciphertext's
+	// storage for the decrypted output, use ciphertext[:0] as dst.
+	Decrypt(dst, ciphertext []byte) ([]byte, error)
+}
+
+// ALTSRecordFunc is a function type for factory functions that create
+// ALTSRecordCrypto instances.
+type ALTSRecordFunc func(s core.Side, keyData []byte) (ALTSRecordCrypto, error)
+
+const (
+	// MsgLenFieldSize is the byte size of the frame length field of a
+	// framed message.
+	MsgLenFieldSize = 4
+	// The byte size of the message type field of a framed message.
+	msgTypeFieldSize = 4
+	// The bytes size limit for a ALTS record message.
+	altsRecordLengthLimit = 1024 * 1024 // 1 MiB
+	// The default bytes size of a ALTS record message.
+	altsRecordDefaultLength = 4 * 1024 // 4KiB
+	// Message type value included in ALTS record framing.
+	altsRecordMsgType = uint32(0x06)
+	// The initial write buffer size.
+	altsWriteBufferInitialSize = 32 * 1024 // 32KiB
+	// The maximum write buffer size. This *must* be multiple of
+	// altsRecordDefaultLength.
+	altsWriteBufferMaxSize = 512 * 1024 // 512KiB
+)
+
+var (
+	protocols = make(map[string]ALTSRecordFunc)
+)
+
+// RegisterProtocol register a ALTS record encryption protocol.
+func RegisterProtocol(protocol string, f ALTSRecordFunc) error {
+	if _, ok := protocols[protocol]; ok {
+		return fmt.Errorf("protocol %v is already registered", protocol)
+	}
+	protocols[protocol] = f
+	return nil
+}
+
+// conn represents a secured connection. It implements the net.Conn interface.
+type conn struct {
+	net.Conn
+	crypto ALTSRecordCrypto
+	// buf holds data that has been read from the connection and decrypted,
+	// but has not yet been returned by Read.
+	buf                []byte
+	payloadLengthLimit int
+	// protected holds data read from the network but have not yet been
+	// decrypted. This data might not compose a complete frame.
+	protected []byte
+	// writeBuf is a buffer used to contain encrypted frames before being
+	// written to the network.
+	writeBuf []byte
+	// nextFrame stores the next frame (in protected buffer) info.
+	nextFrame []byte
+	// overhead is the calculated overhead of each frame.
+	overhead int
+}
+
+// NewConn creates a new secure channel instance given the other party role and
+// handshaking result.
+func NewConn(c net.Conn, side core.Side, recordProtocol string, key []byte, protected []byte) (net.Conn, error) {
+	newCrypto := protocols[recordProtocol]
+	if newCrypto == nil {
+		return nil, fmt.Errorf("negotiated unknown next_protocol %q", recordProtocol)
+	}
+	crypto, err := newCrypto(side, key)
+	if err != nil {
+		return nil, fmt.Errorf("protocol %q: %v", recordProtocol, err)
+	}
+	overhead := MsgLenFieldSize + msgTypeFieldSize + crypto.EncryptionOverhead()
+	payloadLengthLimit := altsRecordDefaultLength - overhead
+	if protected == nil {
+		// We pre-allocate protected to be of size
+		// 2*altsRecordDefaultLength-1 during initialization. We only
+		// read from the network into protected when protected does not
+		// contain a complete frame, which is at most
+		// altsRecordDefaultLength-1 (bytes). And we read at most
+		// altsRecordDefaultLength (bytes) data into protected at one
+		// time. Therefore, 2*altsRecordDefaultLength-1 is large enough
+		// to buffer data read from the network.
+		protected = make([]byte, 0, 2*altsRecordDefaultLength-1)
+	}
+
+	altsConn := &conn{
+		Conn:               c,
+		crypto:             crypto,
+		payloadLengthLimit: payloadLengthLimit,
+		protected:          protected,
+		writeBuf:           make([]byte, altsWriteBufferInitialSize),
+		nextFrame:          protected,
+		overhead:           overhead,
+	}
+	return altsConn, nil
+}
+
+// Read reads and decrypts a frame from the underlying connection, and copies the
+// decrypted payload into b. If the size of the payload is greater than len(b),
+// Read retains the remaining bytes in an internal buffer, and subsequent calls
+// to Read will read from this buffer until it is exhausted.
+func (p *conn) Read(b []byte) (n int, err error) {
+	if len(p.buf) == 0 {
+		var framedMsg []byte
+		framedMsg, p.nextFrame, err = ParseFramedMsg(p.nextFrame, altsRecordLengthLimit)
+		if err != nil {
+			return n, err
+		}
+		// Check whether the next frame to be decrypted has been
+		// completely received yet.
+		if len(framedMsg) == 0 {
+			copy(p.protected, p.nextFrame)
+			p.protected = p.protected[:len(p.nextFrame)]
+			// Always copy next incomplete frame to the beginning of
+			// the protected buffer and reset nextFrame to it.
+			p.nextFrame = p.protected
+		}
+		// Check whether a complete frame has been received yet.
+		for len(framedMsg) == 0 {
+			if len(p.protected) == cap(p.protected) {
+				tmp := make([]byte, len(p.protected), cap(p.protected)+altsRecordDefaultLength)
+				copy(tmp, p.protected)
+				p.protected = tmp
+			}
+			n, err = p.Conn.Read(p.protected[len(p.protected):min(cap(p.protected), len(p.protected)+altsRecordDefaultLength)])
+			if err != nil {
+				return 0, err
+			}
+			p.protected = p.protected[:len(p.protected)+n]
+			framedMsg, p.nextFrame, err = ParseFramedMsg(p.protected, altsRecordLengthLimit)
+			if err != nil {
+				return 0, err
+			}
+		}
+		// Now we have a complete frame, decrypted it.
+		msg := framedMsg[MsgLenFieldSize:]
+		msgType := binary.LittleEndian.Uint32(msg[:msgTypeFieldSize])
+		if msgType&0xff != altsRecordMsgType {
+			return 0, fmt.Errorf("received frame with incorrect message type %v, expected lower byte %v",
+				msgType, altsRecordMsgType)
+		}
+		ciphertext := msg[msgTypeFieldSize:]
+
+		// Decrypt requires that if the dst and ciphertext alias, they
+		// must alias exactly. Code here used to use msg[:0], but msg
+		// starts MsgLenFieldSize+msgTypeFieldSize bytes earlier than
+		// ciphertext, so they alias inexactly. Using ciphertext[:0]
+		// arranges the appropriate aliasing without needing to copy
+		// ciphertext or use a separate destination buffer. For more info
+		// check: https://golang.org/pkg/crypto/cipher/#AEAD.
+		p.buf, err = p.crypto.Decrypt(ciphertext[:0], ciphertext)
+		if err != nil {
+			return 0, err
+		}
+	}
+
+	n = copy(b, p.buf)
+	p.buf = p.buf[n:]
+	return n, nil
+}
+
+// Write encrypts, frames, and writes bytes from b to the underlying connection.
+func (p *conn) Write(b []byte) (n int, err error) {
+	n = len(b)
+	// Calculate the output buffer size with framing and encryption overhead.
+	numOfFrames := int(math.Ceil(float64(len(b)) / float64(p.payloadLengthLimit)))
+	size := len(b) + numOfFrames*p.overhead
+	// If writeBuf is too small, increase its size up to the maximum size.
+	partialBSize := len(b)
+	if size > altsWriteBufferMaxSize {
+		size = altsWriteBufferMaxSize
+		const numOfFramesInMaxWriteBuf = altsWriteBufferMaxSize / altsRecordDefaultLength
+		partialBSize = numOfFramesInMaxWriteBuf * p.payloadLengthLimit
+	}
+	if len(p.writeBuf) < size {
+		p.writeBuf = make([]byte, size)
+	}
+
+	for partialBStart := 0; partialBStart < len(b); partialBStart += partialBSize {
+		partialBEnd := partialBStart + partialBSize
+		if partialBEnd > len(b) {
+			partialBEnd = len(b)
+		}
+		partialB := b[partialBStart:partialBEnd]
+		writeBufIndex := 0
+		for len(partialB) > 0 {
+			payloadLen := len(partialB)
+			if payloadLen > p.payloadLengthLimit {
+				payloadLen = p.payloadLengthLimit
+			}
+			buf := partialB[:payloadLen]
+			partialB = partialB[payloadLen:]
+
+			// Write buffer contains: length, type, payload, and tag
+			// if any.
+
+			// 1. Fill in type field.
+			msg := p.writeBuf[writeBufIndex+MsgLenFieldSize:]
+			binary.LittleEndian.PutUint32(msg, altsRecordMsgType)
+
+			// 2. Encrypt the payload and create a tag if any.
+			msg, err = p.crypto.Encrypt(msg[:msgTypeFieldSize], buf)
+			if err != nil {
+				return n, err
+			}
+
+			// 3. Fill in the size field.
+			binary.LittleEndian.PutUint32(p.writeBuf[writeBufIndex:], uint32(len(msg)))
+
+			// 4. Increase writeBufIndex.
+			writeBufIndex += len(buf) + p.overhead
+		}
+		nn, err := p.Conn.Write(p.writeBuf[:writeBufIndex])
+		if err != nil {
+			// We need to calculate the actual data size that was
+			// written. This means we need to remove header,
+			// encryption overheads, and any partially-written
+			// frame data.
+			numOfWrittenFrames := int(math.Floor(float64(nn) / float64(altsRecordDefaultLength)))
+			return partialBStart + numOfWrittenFrames*p.payloadLengthLimit, err
+		}
+	}
+	return n, nil
+}
+
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/conn/record_test.go b/vendor/google.golang.org/grpc/credentials/alts/core/conn/record_test.go
new file mode 100644
index 00000000..5c3b8e2c
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/conn/record_test.go
@@ -0,0 +1,274 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package conn
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"io"
+	"math"
+	"net"
+	"reflect"
+	"testing"
+
+	"google.golang.org/grpc/credentials/alts/core"
+)
+
+var (
+	nextProtocols   = []string{"ALTSRP_GCM_AES128"}
+	altsRecordFuncs = map[string]ALTSRecordFunc{
+		// ALTS handshaker protocols.
+		"ALTSRP_GCM_AES128": func(s core.Side, keyData []byte) (ALTSRecordCrypto, error) {
+			return NewAES128GCM(s, keyData)
+		},
+	}
+)
+
+func init() {
+	for protocol, f := range altsRecordFuncs {
+		if err := RegisterProtocol(protocol, f); err != nil {
+			panic(err)
+		}
+	}
+}
+
+// testConn mimics a net.Conn to the peer.
+type testConn struct {
+	net.Conn
+	in  *bytes.Buffer
+	out *bytes.Buffer
+}
+
+func (c *testConn) Read(b []byte) (n int, err error) {
+	return c.in.Read(b)
+}
+
+func (c *testConn) Write(b []byte) (n int, err error) {
+	return c.out.Write(b)
+}
+
+func (c *testConn) Close() error {
+	return nil
+}
+
+func newTestALTSRecordConn(in, out *bytes.Buffer, side core.Side, np string) *conn {
+	key := []byte{
+		// 16 arbitrary bytes.
+		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x4c, 0xce, 0x4f, 0x49}
+	tc := testConn{
+		in:  in,
+		out: out,
+	}
+	c, err := NewConn(&tc, side, np, key, nil)
+	if err != nil {
+		panic(fmt.Sprintf("Unexpected error creating test ALTS record connection: %v", err))
+	}
+	return c.(*conn)
+}
+
+func newConnPair(np string) (client, server *conn) {
+	clientBuf := new(bytes.Buffer)
+	serverBuf := new(bytes.Buffer)
+	clientConn := newTestALTSRecordConn(clientBuf, serverBuf, core.ClientSide, np)
+	serverConn := newTestALTSRecordConn(serverBuf, clientBuf, core.ServerSide, np)
+	return clientConn, serverConn
+}
+
+func testPingPong(t *testing.T, np string) {
+	clientConn, serverConn := newConnPair(np)
+	clientMsg := []byte("Client Message")
+	if n, err := clientConn.Write(clientMsg); n != len(clientMsg) || err != nil {
+		t.Fatalf("Client Write() = %v, %v; want %v, <nil>", n, err, len(clientMsg))
+	}
+	rcvClientMsg := make([]byte, len(clientMsg))
+	if n, err := serverConn.Read(rcvClientMsg); n != len(rcvClientMsg) || err != nil {
+		t.Fatalf("Server Read() = %v, %v; want %v, <nil>", n, err, len(rcvClientMsg))
+	}
+	if !reflect.DeepEqual(clientMsg, rcvClientMsg) {
+		t.Fatalf("Client Write()/Server Read() = %v, want %v", rcvClientMsg, clientMsg)
+	}
+
+	serverMsg := []byte("Server Message")
+	if n, err := serverConn.Write(serverMsg); n != len(serverMsg) || err != nil {
+		t.Fatalf("Server Write() = %v, %v; want %v, <nil>", n, err, len(serverMsg))
+	}
+	rcvServerMsg := make([]byte, len(serverMsg))
+	if n, err := clientConn.Read(rcvServerMsg); n != len(rcvServerMsg) || err != nil {
+		t.Fatalf("Client Read() = %v, %v; want %v, <nil>", n, err, len(rcvServerMsg))
+	}
+	if !reflect.DeepEqual(serverMsg, rcvServerMsg) {
+		t.Fatalf("Server Write()/Client Read() = %v, want %v", rcvServerMsg, serverMsg)
+	}
+}
+
+func TestPingPong(t *testing.T) {
+	for _, np := range nextProtocols {
+		testPingPong(t, np)
+	}
+}
+
+func testSmallReadBuffer(t *testing.T, np string) {
+	clientConn, serverConn := newConnPair(np)
+	msg := []byte("Very Important Message")
+	if n, err := clientConn.Write(msg); err != nil {
+		t.Fatalf("Write() = %v, %v; want %v, <nil>", n, err, len(msg))
+	}
+	rcvMsg := make([]byte, len(msg))
+	n := 2 // Arbitrary index to break rcvMsg in two.
+	rcvMsg1 := rcvMsg[:n]
+	rcvMsg2 := rcvMsg[n:]
+	if n, err := serverConn.Read(rcvMsg1); n != len(rcvMsg1) || err != nil {
+		t.Fatalf("Read() = %v, %v; want %v, <nil>", n, err, len(rcvMsg1))
+	}
+	if n, err := serverConn.Read(rcvMsg2); n != len(rcvMsg2) || err != nil {
+		t.Fatalf("Read() = %v, %v; want %v, <nil>", n, err, len(rcvMsg2))
+	}
+	if !reflect.DeepEqual(msg, rcvMsg) {
+		t.Fatalf("Write()/Read() = %v, want %v", rcvMsg, msg)
+	}
+}
+
+func TestSmallReadBuffer(t *testing.T) {
+	for _, np := range nextProtocols {
+		testSmallReadBuffer(t, np)
+	}
+}
+
+func testLargeMsg(t *testing.T, np string) {
+	clientConn, serverConn := newConnPair(np)
+	// msgLen is such that the length in the framing is larger than the
+	// default size of one frame.
+	msgLen := altsRecordDefaultLength - msgTypeFieldSize - clientConn.crypto.EncryptionOverhead() + 1
+	msg := make([]byte, msgLen)
+	if n, err := clientConn.Write(msg); n != len(msg) || err != nil {
+		t.Fatalf("Write() = %v, %v; want %v, <nil>", n, err, len(msg))
+	}
+	rcvMsg := make([]byte, len(msg))
+	if n, err := io.ReadFull(serverConn, rcvMsg); n != len(rcvMsg) || err != nil {
+		t.Fatalf("Read() = %v, %v; want %v, <nil>", n, err, len(rcvMsg))
+	}
+	if !reflect.DeepEqual(msg, rcvMsg) {
+		t.Fatalf("Write()/Server Read() = %v, want %v", rcvMsg, msg)
+	}
+}
+
+func TestLargeMsg(t *testing.T) {
+	for _, np := range nextProtocols {
+		testLargeMsg(t, np)
+	}
+}
+
+func testIncorrectMsgType(t *testing.T, np string) {
+	// framedMsg is an empty ciphertext with correct framing but wrong
+	// message type.
+	framedMsg := make([]byte, MsgLenFieldSize+msgTypeFieldSize)
+	binary.LittleEndian.PutUint32(framedMsg[:MsgLenFieldSize], msgTypeFieldSize)
+	wrongMsgType := uint32(0x22)
+	binary.LittleEndian.PutUint32(framedMsg[MsgLenFieldSize:], wrongMsgType)
+
+	in := bytes.NewBuffer(framedMsg)
+	c := newTestALTSRecordConn(in, nil, core.ClientSide, np)
+	b := make([]byte, 1)
+	if n, err := c.Read(b); n != 0 || err == nil {
+		t.Fatalf("Read() = <nil>, want %v", fmt.Errorf("received frame with incorrect message type %v", wrongMsgType))
+	}
+}
+
+func TestIncorrectMsgType(t *testing.T) {
+	for _, np := range nextProtocols {
+		testIncorrectMsgType(t, np)
+	}
+}
+
+func testFrameTooLarge(t *testing.T, np string) {
+	buf := new(bytes.Buffer)
+	clientConn := newTestALTSRecordConn(nil, buf, core.ClientSide, np)
+	serverConn := newTestALTSRecordConn(buf, nil, core.ServerSide, np)
+	// payloadLen is such that the length in the framing is larger than
+	// allowed in one frame.
+	payloadLen := altsRecordLengthLimit - msgTypeFieldSize - clientConn.crypto.EncryptionOverhead() + 1
+	payload := make([]byte, payloadLen)
+	c, err := clientConn.crypto.Encrypt(nil, payload)
+	if err != nil {
+		t.Fatalf(fmt.Sprintf("Error encrypting message: %v", err))
+	}
+	msgLen := msgTypeFieldSize + len(c)
+	framedMsg := make([]byte, MsgLenFieldSize+msgLen)
+	binary.LittleEndian.PutUint32(framedMsg[:MsgLenFieldSize], uint32(msgTypeFieldSize+len(c)))
+	msg := framedMsg[MsgLenFieldSize:]
+	binary.LittleEndian.PutUint32(msg[:msgTypeFieldSize], altsRecordMsgType)
+	copy(msg[msgTypeFieldSize:], c)
+	if _, err = buf.Write(framedMsg); err != nil {
+		t.Fatal(fmt.Sprintf("Unexpected error writing to buffer: %v", err))
+	}
+	b := make([]byte, 1)
+	if n, err := serverConn.Read(b); n != 0 || err == nil {
+		t.Fatalf("Read() = <nil>, want %v", fmt.Errorf("received the frame length %d larger than the limit %d", altsRecordLengthLimit+1, altsRecordLengthLimit))
+	}
+}
+
+func TestFrameTooLarge(t *testing.T) {
+	for _, np := range nextProtocols {
+		testFrameTooLarge(t, np)
+	}
+}
+
+func testWriteLargeData(t *testing.T, np string) {
+	// Test sending and receiving messages larger than the maximum write
+	// buffer size.
+	clientConn, serverConn := newConnPair(np)
+	// Message size is intentionally chosen to not be multiple of
+	// payloadLengthLimtit.
+	msgSize := altsWriteBufferMaxSize + (100 * 1024)
+	clientMsg := make([]byte, msgSize)
+	for i := 0; i < msgSize; i++ {
+		clientMsg[i] = 0xAA
+	}
+	if n, err := clientConn.Write(clientMsg); n != len(clientMsg) || err != nil {
+		t.Fatalf("Client Write() = %v, %v; want %v, <nil>", n, err, len(clientMsg))
+	}
+	// We need to keep reading until the entire message is received. The
+	// reason we set all bytes of the message to a value other than zero is
+	// to avoid ambiguous zero-init value of rcvClientMsg buffer and the
+	// actual received data.
+	rcvClientMsg := make([]byte, 0, msgSize)
+	numberOfExpectedFrames := int(math.Ceil(float64(msgSize) / float64(serverConn.payloadLengthLimit)))
+	for i := 0; i < numberOfExpectedFrames; i++ {
+		expectedRcvSize := serverConn.payloadLengthLimit
+		if i == numberOfExpectedFrames-1 {
+			// Last frame might be smaller.
+			expectedRcvSize = msgSize % serverConn.payloadLengthLimit
+		}
+		tmpBuf := make([]byte, expectedRcvSize)
+		if n, err := serverConn.Read(tmpBuf); n != len(tmpBuf) || err != nil {
+			t.Fatalf("Server Read() = %v, %v; want %v, <nil>", n, err, len(tmpBuf))
+		}
+		rcvClientMsg = append(rcvClientMsg, tmpBuf...)
+	}
+	if !reflect.DeepEqual(clientMsg, rcvClientMsg) {
+		t.Fatalf("Client Write()/Server Read() = %v, want %v", rcvClientMsg, clientMsg)
+	}
+}
+
+func TestWriteLargeData(t *testing.T) {
+	for _, np := range nextProtocols {
+		testWriteLargeData(t, np)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/handshaker.go b/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/handshaker.go
new file mode 100644
index 00000000..a2049785
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/handshaker.go
@@ -0,0 +1,365 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package handshaker provides ALTS handshaking functionality for GCP.
+package handshaker
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"sync"
+
+	"golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/alts/core"
+	"google.golang.org/grpc/credentials/alts/core/authinfo"
+	"google.golang.org/grpc/credentials/alts/core/conn"
+	altsgrpc "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+	altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+)
+
+const (
+	// The maximum byte size of receive frames.
+	frameLimit              = 64 * 1024 // 64 KB
+	rekeyRecordProtocolName = "ALTSRP_GCM_AES128_REKEY"
+	// maxPendingHandshakes represents the maximum number of concurrent
+	// handshakes.
+	maxPendingHandshakes = 100
+)
+
+var (
+	hsProtocol      = altspb.HandshakeProtocol_ALTS
+	appProtocols    = []string{"grpc"}
+	recordProtocols = []string{rekeyRecordProtocolName}
+	keyLength       = map[string]int{
+		rekeyRecordProtocolName: 44,
+	}
+	altsRecordFuncs = map[string]conn.ALTSRecordFunc{
+		// ALTS handshaker protocols.
+		rekeyRecordProtocolName: func(s core.Side, keyData []byte) (conn.ALTSRecordCrypto, error) {
+			return conn.NewAES128GCMRekey(s, keyData)
+		},
+	}
+	// control number of concurrent created (but not closed) handshakers.
+	mu                   sync.Mutex
+	concurrentHandshakes = int64(0)
+	// errDropped occurs when maxPendingHandshakes is reached.
+	errDropped = errors.New("maximum number of concurrent ALTS handshakes is reached")
+)
+
+func init() {
+	for protocol, f := range altsRecordFuncs {
+		if err := conn.RegisterProtocol(protocol, f); err != nil {
+			panic(err)
+		}
+	}
+}
+
+func acquire(n int64) bool {
+	mu.Lock()
+	success := maxPendingHandshakes-concurrentHandshakes >= n
+	if success {
+		concurrentHandshakes += n
+	}
+	mu.Unlock()
+	return success
+}
+
+func release(n int64) {
+	mu.Lock()
+	concurrentHandshakes -= n
+	if concurrentHandshakes < 0 {
+		mu.Unlock()
+		panic("bad release")
+	}
+	mu.Unlock()
+}
+
+// ClientHandshakerOptions contains the client handshaker options that can
+// provided by the caller.
+type ClientHandshakerOptions struct {
+	// ClientIdentity is the handshaker client local identity.
+	ClientIdentity *altspb.Identity
+	// TargetName is the server service account name for secure name
+	// checking.
+	TargetName string
+	// TargetServiceAccounts contains a list of expected target service
+	// accounts. One of these accounts should match one of the accounts in
+	// the handshaker results. Otherwise, the handshake fails.
+	TargetServiceAccounts []string
+	// RPCVersions specifies the gRPC versions accepted by the client.
+	RPCVersions *altspb.RpcProtocolVersions
+}
+
+// ServerHandshakerOptions contains the server handshaker options that can
+// provided by the caller.
+type ServerHandshakerOptions struct {
+	// RPCVersions specifies the gRPC versions accepted by the server.
+	RPCVersions *altspb.RpcProtocolVersions
+}
+
+// DefaultClientHandshakerOptions returns the default client handshaker options.
+func DefaultClientHandshakerOptions() *ClientHandshakerOptions {
+	return &ClientHandshakerOptions{}
+}
+
+// DefaultServerHandshakerOptions returns the default client handshaker options.
+func DefaultServerHandshakerOptions() *ServerHandshakerOptions {
+	return &ServerHandshakerOptions{}
+}
+
+// TODO: add support for future local and remote endpoint in both client options
+//       and server options (server options struct does not exist now. When
+//       caller can provide endpoints, it should be created.
+
+// altsHandshaker is used to complete a ALTS handshaking between client and
+// server. This handshaker talks to the ALTS handshaker service in the metadata
+// server.
+type altsHandshaker struct {
+	// RPC stream used to access the ALTS Handshaker service.
+	stream altsgrpc.HandshakerService_DoHandshakeClient
+	// the connection to the peer.
+	conn net.Conn
+	// client handshake options.
+	clientOpts *ClientHandshakerOptions
+	// server handshake options.
+	serverOpts *ServerHandshakerOptions
+	// defines the side doing the handshake, client or server.
+	side core.Side
+}
+
+// NewClientHandshaker creates a ALTS handshaker for GCP which contains an RPC
+// stub created using the passed conn and used to talk to the ALTS Handshaker
+// service in the metadata server.
+func NewClientHandshaker(ctx context.Context, conn *grpc.ClientConn, c net.Conn, opts *ClientHandshakerOptions) (core.Handshaker, error) {
+	stream, err := altsgrpc.NewHandshakerServiceClient(conn).DoHandshake(ctx, grpc.FailFast(false))
+	if err != nil {
+		return nil, err
+	}
+	return &altsHandshaker{
+		stream:     stream,
+		conn:       c,
+		clientOpts: opts,
+		side:       core.ClientSide,
+	}, nil
+}
+
+// NewServerHandshaker creates a ALTS handshaker for GCP which contains an RPC
+// stub created using the passed conn and used to talk to the ALTS Handshaker
+// service in the metadata server.
+func NewServerHandshaker(ctx context.Context, conn *grpc.ClientConn, c net.Conn, opts *ServerHandshakerOptions) (core.Handshaker, error) {
+	stream, err := altsgrpc.NewHandshakerServiceClient(conn).DoHandshake(ctx, grpc.FailFast(false))
+	if err != nil {
+		return nil, err
+	}
+	return &altsHandshaker{
+		stream:     stream,
+		conn:       c,
+		serverOpts: opts,
+		side:       core.ServerSide,
+	}, nil
+}
+
+// ClientHandshake starts and completes a client ALTS handshaking for GCP. Once
+// done, ClientHandshake returns a secure connection.
+func (h *altsHandshaker) ClientHandshake(ctx context.Context) (net.Conn, credentials.AuthInfo, error) {
+	if !acquire(1) {
+		return nil, nil, errDropped
+	}
+	defer release(1)
+
+	if h.side != core.ClientSide {
+		return nil, nil, errors.New("only handshakers created using NewClientHandshaker can perform a client handshaker")
+	}
+
+	// Create target identities from service account list.
+	targetIdentities := make([]*altspb.Identity, 0, len(h.clientOpts.TargetServiceAccounts))
+	for _, account := range h.clientOpts.TargetServiceAccounts {
+		targetIdentities = append(targetIdentities, &altspb.Identity{
+			IdentityOneof: &altspb.Identity_ServiceAccount{
+				ServiceAccount: account,
+			},
+		})
+	}
+	req := &altspb.HandshakerReq{
+		ReqOneof: &altspb.HandshakerReq_ClientStart{
+			ClientStart: &altspb.StartClientHandshakeReq{
+				HandshakeSecurityProtocol: hsProtocol,
+				ApplicationProtocols:      appProtocols,
+				RecordProtocols:           recordProtocols,
+				TargetIdentities:          targetIdentities,
+				LocalIdentity:             h.clientOpts.ClientIdentity,
+				TargetName:                h.clientOpts.TargetName,
+				RpcVersions:               h.clientOpts.RPCVersions,
+			},
+		},
+	}
+
+	conn, result, err := h.doHandshake(req)
+	if err != nil {
+		return nil, nil, err
+	}
+	authInfo := authinfo.New(result)
+	return conn, authInfo, nil
+}
+
+// ServerHandshake starts and completes a server ALTS handshaking for GCP. Once
+// done, ServerHandshake returns a secure connection.
+func (h *altsHandshaker) ServerHandshake(ctx context.Context) (net.Conn, credentials.AuthInfo, error) {
+	if !acquire(1) {
+		return nil, nil, errDropped
+	}
+	defer release(1)
+
+	if h.side != core.ServerSide {
+		return nil, nil, errors.New("only handshakers created using NewServerHandshaker can perform a server handshaker")
+	}
+
+	p := make([]byte, frameLimit)
+	n, err := h.conn.Read(p)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// Prepare server parameters.
+	// TODO: currently only ALTS parameters are provided. Might need to use
+	//       more options in the future.
+	params := make(map[int32]*altspb.ServerHandshakeParameters)
+	params[int32(altspb.HandshakeProtocol_ALTS)] = &altspb.ServerHandshakeParameters{
+		RecordProtocols: recordProtocols,
+	}
+	req := &altspb.HandshakerReq{
+		ReqOneof: &altspb.HandshakerReq_ServerStart{
+			ServerStart: &altspb.StartServerHandshakeReq{
+				ApplicationProtocols: appProtocols,
+				HandshakeParameters:  params,
+				InBytes:              p[:n],
+				RpcVersions:          h.serverOpts.RPCVersions,
+			},
+		},
+	}
+
+	conn, result, err := h.doHandshake(req)
+	if err != nil {
+		return nil, nil, err
+	}
+	authInfo := authinfo.New(result)
+	return conn, authInfo, nil
+}
+
+func (h *altsHandshaker) doHandshake(req *altspb.HandshakerReq) (net.Conn, *altspb.HandshakerResult, error) {
+	resp, err := h.accessHandshakerService(req)
+	if err != nil {
+		return nil, nil, err
+	}
+	// Check of the returned status is an error.
+	if resp.GetStatus() != nil {
+		if got, want := resp.GetStatus().Code, uint32(codes.OK); got != want {
+			return nil, nil, fmt.Errorf("%v", resp.GetStatus().Details)
+		}
+	}
+
+	var extra []byte
+	if req.GetServerStart() != nil {
+		extra = req.GetServerStart().GetInBytes()[resp.GetBytesConsumed():]
+	}
+	result, extra, err := h.processUntilDone(resp, extra)
+	if err != nil {
+		return nil, nil, err
+	}
+	// The handshaker returns a 128 bytes key. It should be truncated based
+	// on the returned record protocol.
+	keyLen, ok := keyLength[result.RecordProtocol]
+	if !ok {
+		return nil, nil, fmt.Errorf("unknown resulted record protocol %v", result.RecordProtocol)
+	}
+	sc, err := conn.NewConn(h.conn, h.side, result.GetRecordProtocol(), result.KeyData[:keyLen], extra)
+	if err != nil {
+		return nil, nil, err
+	}
+	return sc, result, nil
+}
+
+func (h *altsHandshaker) accessHandshakerService(req *altspb.HandshakerReq) (*altspb.HandshakerResp, error) {
+	if err := h.stream.Send(req); err != nil {
+		return nil, err
+	}
+	resp, err := h.stream.Recv()
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}
+
+// processUntilDone processes the handshake until the handshaker service returns
+// the results. Handshaker service takes care of frame parsing, so we read
+// whatever received from the network and send it to the handshaker service.
+func (h *altsHandshaker) processUntilDone(resp *altspb.HandshakerResp, extra []byte) (*altspb.HandshakerResult, []byte, error) {
+	for {
+		if len(resp.OutFrames) > 0 {
+			if _, err := h.conn.Write(resp.OutFrames); err != nil {
+				return nil, nil, err
+			}
+		}
+		if resp.Result != nil {
+			return resp.Result, extra, nil
+		}
+		buf := make([]byte, frameLimit)
+		n, err := h.conn.Read(buf)
+		if err != nil && err != io.EOF {
+			return nil, nil, err
+		}
+		// If there is nothing to send to the handshaker service, and
+		// nothing is received from the peer, then we are stuck.
+		// This covers the case when the peer is not responding. Note
+		// that handshaker service connection issues are caught in
+		// accessHandshakerService before we even get here.
+		if len(resp.OutFrames) == 0 && n == 0 {
+			return nil, nil, core.PeerNotRespondingError
+		}
+		// Append extra bytes from the previous interaction with the
+		// handshaker service with the current buffer read from conn.
+		p := append(extra, buf[:n]...)
+		resp, err = h.accessHandshakerService(&altspb.HandshakerReq{
+			ReqOneof: &altspb.HandshakerReq_Next{
+				Next: &altspb.NextHandshakeMessageReq{
+					InBytes: p,
+				},
+			},
+		})
+		if err != nil {
+			return nil, nil, err
+		}
+		// Set extra based on handshaker service response.
+		if n == 0 {
+			extra = nil
+		} else {
+			extra = buf[resp.GetBytesConsumed():n]
+		}
+	}
+}
+
+// Close terminates the Handshaker. It should be called when the caller obtains
+// the secure connection.
+func (h *altsHandshaker) Close() {
+	h.stream.CloseSend()
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/handshaker_test.go b/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/handshaker_test.go
new file mode 100644
index 00000000..322fcb4d
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/handshaker_test.go
@@ -0,0 +1,261 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package handshaker
+
+import (
+	"bytes"
+	"testing"
+	"time"
+
+	"golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/alts/core"
+	altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+	"google.golang.org/grpc/credentials/alts/core/testutil"
+)
+
+var (
+	testAppProtocols   = []string{"grpc"}
+	testRecordProtocol = rekeyRecordProtocolName
+	testKey            = []byte{
+		// 44 arbitrary bytes.
+		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x4c, 0xce, 0x4f, 0x49,
+		0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x4c, 0xce, 0x4f, 0x49, 0x1f, 0x8b,
+		0xd2, 0x4c, 0xce, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2,
+	}
+	testServiceAccount        = "test_service_account"
+	testTargetServiceAccounts = []string{testServiceAccount}
+	testClientIdentity        = &altspb.Identity{
+		IdentityOneof: &altspb.Identity_Hostname{
+			Hostname: "i_am_a_client",
+		},
+	}
+)
+
+// testRPCStream mimics a altspb.HandshakerService_DoHandshakeClient object.
+type testRPCStream struct {
+	grpc.ClientStream
+	t        *testing.T
+	isClient bool
+	// The resp expected to be returned by Recv(). Make sure this is set to
+	// the content the test requires before Recv() is invoked.
+	recvBuf *altspb.HandshakerResp
+	// false if it is the first access to Handshaker service on Envelope.
+	first bool
+	// useful for testing concurrent calls.
+	delay time.Duration
+}
+
+func (t *testRPCStream) Recv() (*altspb.HandshakerResp, error) {
+	resp := t.recvBuf
+	t.recvBuf = nil
+	return resp, nil
+}
+
+func (t *testRPCStream) Send(req *altspb.HandshakerReq) error {
+	var resp *altspb.HandshakerResp
+	if !t.first {
+		// Generate the bytes to be returned by Recv() for the initial
+		// handshaking.
+		t.first = true
+		if t.isClient {
+			resp = &altspb.HandshakerResp{
+				OutFrames: testutil.MakeFrame("ClientInit"),
+				// Simulate consuming ServerInit.
+				BytesConsumed: 14,
+			}
+		} else {
+			resp = &altspb.HandshakerResp{
+				OutFrames: testutil.MakeFrame("ServerInit"),
+				// Simulate consuming ClientInit.
+				BytesConsumed: 14,
+			}
+		}
+	} else {
+		// Add delay to test concurrent calls.
+		close := stat.Update()
+		defer close()
+		time.Sleep(t.delay)
+
+		// Generate the response to be returned by Recv() for the
+		// follow-up handshaking.
+		result := &altspb.HandshakerResult{
+			RecordProtocol: testRecordProtocol,
+			KeyData:        testKey,
+		}
+		resp = &altspb.HandshakerResp{
+			Result: result,
+			// Simulate consuming ClientFinished or ServerFinished.
+			BytesConsumed: 18,
+		}
+	}
+	t.recvBuf = resp
+	return nil
+}
+
+func (t *testRPCStream) CloseSend() error {
+	return nil
+}
+
+var stat testutil.Stats
+
+func TestClientHandshake(t *testing.T) {
+	for _, testCase := range []struct {
+		delay              time.Duration
+		numberOfHandshakes int
+	}{
+		{0 * time.Millisecond, 1},
+		{100 * time.Millisecond, 10 * maxPendingHandshakes},
+	} {
+		errc := make(chan error)
+		stat.Reset()
+		for i := 0; i < testCase.numberOfHandshakes; i++ {
+			stream := &testRPCStream{
+				t:        t,
+				isClient: true,
+			}
+			// Preload the inbound frames.
+			f1 := testutil.MakeFrame("ServerInit")
+			f2 := testutil.MakeFrame("ServerFinished")
+			in := bytes.NewBuffer(f1)
+			in.Write(f2)
+			out := new(bytes.Buffer)
+			tc := testutil.NewTestConn(in, out)
+			chs := &altsHandshaker{
+				stream: stream,
+				conn:   tc,
+				clientOpts: &ClientHandshakerOptions{
+					TargetServiceAccounts: testTargetServiceAccounts,
+					ClientIdentity:        testClientIdentity,
+				},
+				side: core.ClientSide,
+			}
+			go func() {
+				_, context, err := chs.ClientHandshake(context.Background())
+				if err == nil && context == nil {
+					panic("expected non-nil ALTS context")
+				}
+				errc <- err
+				chs.Close()
+			}()
+		}
+
+		// Ensure all errors are expected.
+		for i := 0; i < testCase.numberOfHandshakes; i++ {
+			if err := <-errc; err != nil && err != errDropped {
+				t.Errorf("ClientHandshake() = _, %v, want _, <nil> or %v", err, errDropped)
+			}
+		}
+
+		// Ensure that there are no concurrent calls more than the limit.
+		if stat.MaxConcurrentCalls > maxPendingHandshakes {
+			t.Errorf("Observed %d concurrent handshakes; want <= %d", stat.MaxConcurrentCalls, maxPendingHandshakes)
+		}
+	}
+}
+
+func TestServerHandshake(t *testing.T) {
+	for _, testCase := range []struct {
+		delay              time.Duration
+		numberOfHandshakes int
+	}{
+		{0 * time.Millisecond, 1},
+		{100 * time.Millisecond, 10 * maxPendingHandshakes},
+	} {
+		errc := make(chan error)
+		stat.Reset()
+		for i := 0; i < testCase.numberOfHandshakes; i++ {
+			stream := &testRPCStream{
+				t:        t,
+				isClient: false,
+			}
+			// Preload the inbound frames.
+			f1 := testutil.MakeFrame("ClientInit")
+			f2 := testutil.MakeFrame("ClientFinished")
+			in := bytes.NewBuffer(f1)
+			in.Write(f2)
+			out := new(bytes.Buffer)
+			tc := testutil.NewTestConn(in, out)
+			shs := &altsHandshaker{
+				stream:     stream,
+				conn:       tc,
+				serverOpts: DefaultServerHandshakerOptions(),
+				side:       core.ServerSide,
+			}
+			go func() {
+				_, context, err := shs.ServerHandshake(context.Background())
+				if err == nil && context == nil {
+					panic("expected non-nil ALTS context")
+				}
+				errc <- err
+				shs.Close()
+			}()
+		}
+
+		// Ensure all errors are expected.
+		for i := 0; i < testCase.numberOfHandshakes; i++ {
+			if err := <-errc; err != nil && err != errDropped {
+				t.Errorf("ServerHandshake() = _, %v, want _, <nil> or %v", err, errDropped)
+			}
+		}
+
+		// Ensure that there are no concurrent calls more than the limit.
+		if stat.MaxConcurrentCalls > maxPendingHandshakes {
+			t.Errorf("Observed %d concurrent handshakes; want <= %d", stat.MaxConcurrentCalls, maxPendingHandshakes)
+		}
+	}
+}
+
+// testUnresponsiveRPCStream is used for testing the PeerNotResponding case.
+type testUnresponsiveRPCStream struct {
+	grpc.ClientStream
+}
+
+func (t *testUnresponsiveRPCStream) Recv() (*altspb.HandshakerResp, error) {
+	return &altspb.HandshakerResp{}, nil
+}
+
+func (t *testUnresponsiveRPCStream) Send(req *altspb.HandshakerReq) error {
+	return nil
+}
+
+func (t *testUnresponsiveRPCStream) CloseSend() error {
+	return nil
+}
+
+func TestPeerNotResponding(t *testing.T) {
+	stream := &testUnresponsiveRPCStream{}
+	chs := &altsHandshaker{
+		stream: stream,
+		conn:   testutil.NewUnresponsiveTestConn(),
+		clientOpts: &ClientHandshakerOptions{
+			TargetServiceAccounts: testTargetServiceAccounts,
+			ClientIdentity:        testClientIdentity,
+		},
+		side: core.ClientSide,
+	}
+	_, context, err := chs.ClientHandshake(context.Background())
+	chs.Close()
+	if context != nil {
+		t.Error("expected non-nil ALTS context")
+	}
+	if got, want := err, core.PeerNotRespondingError; got != want {
+		t.Errorf("ClientHandshake() = %v, want %v", got, want)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/service/service.go b/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/service/service.go
new file mode 100644
index 00000000..b09fdaec
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/service/service.go
@@ -0,0 +1,56 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package service manages connections between the VM application and the ALTS
+// handshaker service.
+package service
+
+import (
+	"sync"
+
+	grpc "google.golang.org/grpc"
+)
+
+var (
+	// hsConn represents a connection to hypervisor handshaker service.
+	hsConn *grpc.ClientConn
+	mu     sync.Mutex
+	// hsDialer will be reassigned in tests.
+	hsDialer = grpc.Dial
+)
+
+type dialer func(target string, opts ...grpc.DialOption) (*grpc.ClientConn, error)
+
+// Dial dials the handshake service in the hypervisor. If a connection has
+// already been established, this function returns it. Otherwise, a new
+// connection is created.
+func Dial(hsAddress string) (*grpc.ClientConn, error) {
+	mu.Lock()
+	defer mu.Unlock()
+
+	if hsConn == nil {
+		// Create a new connection to the handshaker service. Note that
+		// this connection stays open until the application is closed.
+		var err error
+		hsConn, err = hsDialer(hsAddress, grpc.WithInsecure())
+		if err != nil {
+			return nil, err
+		}
+	}
+	return hsConn, nil
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/service/service_test.go b/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/service/service_test.go
new file mode 100644
index 00000000..98160bf0
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/handshaker/service/service_test.go
@@ -0,0 +1,69 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package service
+
+import (
+	"testing"
+
+	grpc "google.golang.org/grpc"
+)
+
+const (
+	// The address is irrelevant in this test.
+	testAddress = "some_address"
+)
+
+func TestDial(t *testing.T) {
+	defer func() func() {
+		temp := hsDialer
+		hsDialer = func(target string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
+			return &grpc.ClientConn{}, nil
+		}
+		return func() {
+			hsDialer = temp
+		}
+	}()
+
+	// Ensure that hsConn is nil at first.
+	hsConn = nil
+
+	// First call to Dial, it should create set hsConn.
+	conn1, err := Dial(testAddress)
+	if err != nil {
+		t.Fatalf("first call to Dial failed: %v", err)
+	}
+	if conn1 == nil {
+		t.Fatal("first call to Dial(_)=(nil, _), want not nil")
+	}
+	if got, want := hsConn, conn1; got != want {
+		t.Fatalf("hsConn=%v, want %v", got, want)
+	}
+
+	// Second call to Dial should return conn1 above.
+	conn2, err := Dial(testAddress)
+	if err != nil {
+		t.Fatalf("second call to Dial(_) failed: %v", err)
+	}
+	if got, want := conn2, conn1; got != want {
+		t.Fatalf("second call to Dial(_)=(%v, _), want (%v,. _)", got, want)
+	}
+	if got, want := hsConn, conn1; got != want {
+		t.Fatalf("hsConn=%v, want %v", got, want)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/altscontext.pb.go b/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/altscontext.pb.go
new file mode 100644
index 00000000..cd4fe79b
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/altscontext.pb.go
@@ -0,0 +1,137 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: grpc/gcp/altscontext.proto
+
+package grpc_gcp // import "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type AltsContext struct {
+	// The application protocol negotiated for this connection.
+	ApplicationProtocol string `protobuf:"bytes,1,opt,name=application_protocol,json=applicationProtocol,proto3" json:"application_protocol,omitempty"`
+	// The record protocol negotiated for this connection.
+	RecordProtocol string `protobuf:"bytes,2,opt,name=record_protocol,json=recordProtocol,proto3" json:"record_protocol,omitempty"`
+	// The security level of the created secure channel.
+	SecurityLevel SecurityLevel `protobuf:"varint,3,opt,name=security_level,json=securityLevel,proto3,enum=grpc.gcp.SecurityLevel" json:"security_level,omitempty"`
+	// The peer service account.
+	PeerServiceAccount string `protobuf:"bytes,4,opt,name=peer_service_account,json=peerServiceAccount,proto3" json:"peer_service_account,omitempty"`
+	// The local service account.
+	LocalServiceAccount string `protobuf:"bytes,5,opt,name=local_service_account,json=localServiceAccount,proto3" json:"local_service_account,omitempty"`
+	// The RPC protocol versions supported by the peer.
+	PeerRpcVersions      *RpcProtocolVersions `protobuf:"bytes,6,opt,name=peer_rpc_versions,json=peerRpcVersions,proto3" json:"peer_rpc_versions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *AltsContext) Reset()         { *m = AltsContext{} }
+func (m *AltsContext) String() string { return proto.CompactTextString(m) }
+func (*AltsContext) ProtoMessage()    {}
+func (*AltsContext) Descriptor() ([]byte, []int) {
+	return fileDescriptor_altscontext_2f63c0ac7e856743, []int{0}
+}
+func (m *AltsContext) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AltsContext.Unmarshal(m, b)
+}
+func (m *AltsContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AltsContext.Marshal(b, m, deterministic)
+}
+func (dst *AltsContext) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AltsContext.Merge(dst, src)
+}
+func (m *AltsContext) XXX_Size() int {
+	return xxx_messageInfo_AltsContext.Size(m)
+}
+func (m *AltsContext) XXX_DiscardUnknown() {
+	xxx_messageInfo_AltsContext.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AltsContext proto.InternalMessageInfo
+
+func (m *AltsContext) GetApplicationProtocol() string {
+	if m != nil {
+		return m.ApplicationProtocol
+	}
+	return ""
+}
+
+func (m *AltsContext) GetRecordProtocol() string {
+	if m != nil {
+		return m.RecordProtocol
+	}
+	return ""
+}
+
+func (m *AltsContext) GetSecurityLevel() SecurityLevel {
+	if m != nil {
+		return m.SecurityLevel
+	}
+	return SecurityLevel_SECURITY_NONE
+}
+
+func (m *AltsContext) GetPeerServiceAccount() string {
+	if m != nil {
+		return m.PeerServiceAccount
+	}
+	return ""
+}
+
+func (m *AltsContext) GetLocalServiceAccount() string {
+	if m != nil {
+		return m.LocalServiceAccount
+	}
+	return ""
+}
+
+func (m *AltsContext) GetPeerRpcVersions() *RpcProtocolVersions {
+	if m != nil {
+		return m.PeerRpcVersions
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*AltsContext)(nil), "grpc.gcp.AltsContext")
+}
+
+func init() {
+	proto.RegisterFile("grpc/gcp/altscontext.proto", fileDescriptor_altscontext_2f63c0ac7e856743)
+}
+
+var fileDescriptor_altscontext_2f63c0ac7e856743 = []byte{
+	// 338 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0x4d, 0x4b, 0x23, 0x41,
+	0x10, 0x86, 0x99, 0xec, 0x6e, 0xd8, 0xed, 0xb0, 0xc9, 0xee, 0x6c, 0xc2, 0x0e, 0x01, 0x21, 0x78,
+	0x71, 0x4e, 0x33, 0x1a, 0x8f, 0x82, 0x90, 0x78, 0x12, 0x3c, 0x84, 0x09, 0x78, 0xf0, 0x32, 0xb4,
+	0x95, 0xa2, 0x6d, 0xe8, 0x74, 0x35, 0xd5, 0x9d, 0xa0, 0x7f, 0xd5, 0x5f, 0x23, 0xd3, 0x93, 0x2f,
+	0xf4, 0x58, 0xf5, 0xbc, 0x6f, 0x7d, 0x8a, 0xb1, 0x62, 0x07, 0xa5, 0x02, 0x57, 0x4a, 0x13, 0x3c,
+	0x90, 0x0d, 0xf8, 0x1a, 0x0a, 0xc7, 0x14, 0x28, 0xfd, 0xd9, 0xb0, 0x42, 0x81, 0x1b, 0xe7, 0x07,
+	0x55, 0x60, 0x69, 0xbd, 0x23, 0x0e, 0xb5, 0x47, 0xd8, 0xb0, 0x0e, 0x6f, 0x35, 0xd0, 0x7a, 0x4d,
+	0xb6, 0xf5, 0x9c, 0xbf, 0x77, 0x44, 0x6f, 0x66, 0x82, 0xbf, 0x6b, 0x2b, 0xa5, 0x57, 0x62, 0x28,
+	0x9d, 0x33, 0x1a, 0x64, 0xd0, 0x64, 0xeb, 0x28, 0x02, 0x32, 0x59, 0x32, 0x49, 0xf2, 0x5f, 0xd5,
+	0xbf, 0x13, 0xb6, 0xd8, 0xa1, 0xf4, 0x42, 0x0c, 0x18, 0x81, 0x78, 0x75, 0x54, 0x77, 0xa2, 0xba,
+	0xdf, 0xa6, 0x0f, 0xc2, 0x5b, 0xd1, 0x3f, 0x0c, 0x61, 0x70, 0x8b, 0x26, 0xfb, 0x36, 0x49, 0xf2,
+	0xfe, 0xf4, 0x7f, 0xb1, 0x1f, 0xbc, 0x58, 0xee, 0xf8, 0x43, 0x83, 0xab, 0xdf, 0xfe, 0x34, 0x4c,
+	0x2f, 0xc5, 0xd0, 0x21, 0x72, 0xed, 0x91, 0xb7, 0x1a, 0xb0, 0x96, 0x00, 0xb4, 0xb1, 0x21, 0xfb,
+	0x1e, 0xbb, 0xa5, 0x0d, 0x5b, 0xb6, 0x68, 0xd6, 0x92, 0x74, 0x2a, 0x46, 0x86, 0x40, 0x9a, 0x2f,
+	0x96, 0x1f, 0xed, 0x3a, 0x11, 0x7e, 0xf2, 0xdc, 0x8b, 0xbf, 0xb1, 0x0b, 0x3b, 0xa8, 0xb7, 0xc8,
+	0x5e, 0x93, 0xf5, 0x59, 0x77, 0x92, 0xe4, 0xbd, 0xe9, 0xd9, 0x71, 0xd0, 0xca, 0xc1, 0x7e, 0xaf,
+	0xc7, 0x9d, 0xa8, 0x1a, 0x34, 0xbe, 0xca, 0xc1, 0x3e, 0x31, 0x7f, 0x11, 0x23, 0x4d, 0xad, 0xa7,
+	0xf9, 0x56, 0xa1, 0x6d, 0x40, 0xb6, 0xd2, 0xcc, 0xff, 0x9c, 0x9c, 0x3c, 0x96, 0x59, 0x24, 0x4f,
+	0x37, 0x8a, 0x48, 0x19, 0x2c, 0x14, 0x19, 0x69, 0x55, 0x41, 0xac, 0xca, 0xf8, 0x45, 0x60, 0x5c,
+	0xa1, 0x0d, 0x5a, 0x1a, 0x1f, 0x7f, 0x5e, 0x02, 0x31, 0x96, 0xf1, 0xd4, 0x51, 0x50, 0x2b, 0x70,
+	0xcf, 0xdd, 0x18, 0x5f, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x41, 0xe3, 0x52, 0x1f, 0x02,
+	0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go b/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go
new file mode 100644
index 00000000..99a1cc42
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go
@@ -0,0 +1,1184 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: grpc/gcp/handshaker.proto
+
+package grpc_gcp // import "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+type HandshakeProtocol int32
+
+const (
+	// Default value.
+	HandshakeProtocol_HANDSHAKE_PROTOCOL_UNSPECIFIED HandshakeProtocol = 0
+	// TLS handshake protocol.
+	HandshakeProtocol_TLS HandshakeProtocol = 1
+	// Application Layer Transport Security handshake protocol.
+	HandshakeProtocol_ALTS HandshakeProtocol = 2
+)
+
+var HandshakeProtocol_name = map[int32]string{
+	0: "HANDSHAKE_PROTOCOL_UNSPECIFIED",
+	1: "TLS",
+	2: "ALTS",
+}
+var HandshakeProtocol_value = map[string]int32{
+	"HANDSHAKE_PROTOCOL_UNSPECIFIED": 0,
+	"TLS":  1,
+	"ALTS": 2,
+}
+
+func (x HandshakeProtocol) String() string {
+	return proto.EnumName(HandshakeProtocol_name, int32(x))
+}
+func (HandshakeProtocol) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{0}
+}
+
+type NetworkProtocol int32
+
+const (
+	NetworkProtocol_NETWORK_PROTOCOL_UNSPECIFIED NetworkProtocol = 0
+	NetworkProtocol_TCP                          NetworkProtocol = 1
+	NetworkProtocol_UDP                          NetworkProtocol = 2
+)
+
+var NetworkProtocol_name = map[int32]string{
+	0: "NETWORK_PROTOCOL_UNSPECIFIED",
+	1: "TCP",
+	2: "UDP",
+}
+var NetworkProtocol_value = map[string]int32{
+	"NETWORK_PROTOCOL_UNSPECIFIED": 0,
+	"TCP": 1,
+	"UDP": 2,
+}
+
+func (x NetworkProtocol) String() string {
+	return proto.EnumName(NetworkProtocol_name, int32(x))
+}
+func (NetworkProtocol) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{1}
+}
+
+type Endpoint struct {
+	// IP address. It should contain an IPv4 or IPv6 string literal, e.g.
+	// "192.168.0.1" or "2001:db8::1".
+	IpAddress string `protobuf:"bytes,1,opt,name=ip_address,json=ipAddress,proto3" json:"ip_address,omitempty"`
+	// Port number.
+	Port int32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
+	// Network protocol (e.g., TCP, UDP) associated with this endpoint.
+	Protocol             NetworkProtocol `protobuf:"varint,3,opt,name=protocol,proto3,enum=grpc.gcp.NetworkProtocol" json:"protocol,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Endpoint) Reset()         { *m = Endpoint{} }
+func (m *Endpoint) String() string { return proto.CompactTextString(m) }
+func (*Endpoint) ProtoMessage()    {}
+func (*Endpoint) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{0}
+}
+func (m *Endpoint) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Endpoint.Unmarshal(m, b)
+}
+func (m *Endpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Endpoint.Marshal(b, m, deterministic)
+}
+func (dst *Endpoint) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Endpoint.Merge(dst, src)
+}
+func (m *Endpoint) XXX_Size() int {
+	return xxx_messageInfo_Endpoint.Size(m)
+}
+func (m *Endpoint) XXX_DiscardUnknown() {
+	xxx_messageInfo_Endpoint.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Endpoint proto.InternalMessageInfo
+
+func (m *Endpoint) GetIpAddress() string {
+	if m != nil {
+		return m.IpAddress
+	}
+	return ""
+}
+
+func (m *Endpoint) GetPort() int32 {
+	if m != nil {
+		return m.Port
+	}
+	return 0
+}
+
+func (m *Endpoint) GetProtocol() NetworkProtocol {
+	if m != nil {
+		return m.Protocol
+	}
+	return NetworkProtocol_NETWORK_PROTOCOL_UNSPECIFIED
+}
+
+type Identity struct {
+	// Types that are valid to be assigned to IdentityOneof:
+	//	*Identity_ServiceAccount
+	//	*Identity_Hostname
+	IdentityOneof        isIdentity_IdentityOneof `protobuf_oneof:"identity_oneof"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *Identity) Reset()         { *m = Identity{} }
+func (m *Identity) String() string { return proto.CompactTextString(m) }
+func (*Identity) ProtoMessage()    {}
+func (*Identity) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{1}
+}
+func (m *Identity) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Identity.Unmarshal(m, b)
+}
+func (m *Identity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Identity.Marshal(b, m, deterministic)
+}
+func (dst *Identity) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Identity.Merge(dst, src)
+}
+func (m *Identity) XXX_Size() int {
+	return xxx_messageInfo_Identity.Size(m)
+}
+func (m *Identity) XXX_DiscardUnknown() {
+	xxx_messageInfo_Identity.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Identity proto.InternalMessageInfo
+
+type isIdentity_IdentityOneof interface {
+	isIdentity_IdentityOneof()
+}
+
+type Identity_ServiceAccount struct {
+	ServiceAccount string `protobuf:"bytes,1,opt,name=service_account,json=serviceAccount,proto3,oneof"`
+}
+
+type Identity_Hostname struct {
+	Hostname string `protobuf:"bytes,2,opt,name=hostname,proto3,oneof"`
+}
+
+func (*Identity_ServiceAccount) isIdentity_IdentityOneof() {}
+
+func (*Identity_Hostname) isIdentity_IdentityOneof() {}
+
+func (m *Identity) GetIdentityOneof() isIdentity_IdentityOneof {
+	if m != nil {
+		return m.IdentityOneof
+	}
+	return nil
+}
+
+func (m *Identity) GetServiceAccount() string {
+	if x, ok := m.GetIdentityOneof().(*Identity_ServiceAccount); ok {
+		return x.ServiceAccount
+	}
+	return ""
+}
+
+func (m *Identity) GetHostname() string {
+	if x, ok := m.GetIdentityOneof().(*Identity_Hostname); ok {
+		return x.Hostname
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*Identity) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _Identity_OneofMarshaler, _Identity_OneofUnmarshaler, _Identity_OneofSizer, []interface{}{
+		(*Identity_ServiceAccount)(nil),
+		(*Identity_Hostname)(nil),
+	}
+}
+
+func _Identity_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*Identity)
+	// identity_oneof
+	switch x := m.IdentityOneof.(type) {
+	case *Identity_ServiceAccount:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.ServiceAccount)
+	case *Identity_Hostname:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Hostname)
+	case nil:
+	default:
+		return fmt.Errorf("Identity.IdentityOneof has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _Identity_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*Identity)
+	switch tag {
+	case 1: // identity_oneof.service_account
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.IdentityOneof = &Identity_ServiceAccount{x}
+		return true, err
+	case 2: // identity_oneof.hostname
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.IdentityOneof = &Identity_Hostname{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _Identity_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*Identity)
+	// identity_oneof
+	switch x := m.IdentityOneof.(type) {
+	case *Identity_ServiceAccount:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.ServiceAccount)))
+		n += len(x.ServiceAccount)
+	case *Identity_Hostname:
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(len(x.Hostname)))
+		n += len(x.Hostname)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type StartClientHandshakeReq struct {
+	// Handshake security protocol requested by the client.
+	HandshakeSecurityProtocol HandshakeProtocol `protobuf:"varint,1,opt,name=handshake_security_protocol,json=handshakeSecurityProtocol,proto3,enum=grpc.gcp.HandshakeProtocol" json:"handshake_security_protocol,omitempty"`
+	// The application protocols supported by the client, e.g., "h2" (for http2),
+	// "grpc".
+	ApplicationProtocols []string `protobuf:"bytes,2,rep,name=application_protocols,json=applicationProtocols,proto3" json:"application_protocols,omitempty"`
+	// The record protocols supported by the client, e.g.,
+	// "ALTSRP_GCM_AES128".
+	RecordProtocols []string `protobuf:"bytes,3,rep,name=record_protocols,json=recordProtocols,proto3" json:"record_protocols,omitempty"`
+	// (Optional) Describes which server identities are acceptable by the client.
+	// If target identities are provided and none of them matches the peer
+	// identity of the server, handshake will fail.
+	TargetIdentities []*Identity `protobuf:"bytes,4,rep,name=target_identities,json=targetIdentities,proto3" json:"target_identities,omitempty"`
+	// (Optional) Application may specify a local identity. Otherwise, the
+	// handshaker chooses a default local identity.
+	LocalIdentity *Identity `protobuf:"bytes,5,opt,name=local_identity,json=localIdentity,proto3" json:"local_identity,omitempty"`
+	// (Optional) Local endpoint information of the connection to the server,
+	// such as local IP address, port number, and network protocol.
+	LocalEndpoint *Endpoint `protobuf:"bytes,6,opt,name=local_endpoint,json=localEndpoint,proto3" json:"local_endpoint,omitempty"`
+	// (Optional) Endpoint information of the remote server, such as IP address,
+	// port number, and network protocol.
+	RemoteEndpoint *Endpoint `protobuf:"bytes,7,opt,name=remote_endpoint,json=remoteEndpoint,proto3" json:"remote_endpoint,omitempty"`
+	// (Optional) If target name is provided, a secure naming check is performed
+	// to verify that the peer authenticated identity is indeed authorized to run
+	// the target name.
+	TargetName string `protobuf:"bytes,8,opt,name=target_name,json=targetName,proto3" json:"target_name,omitempty"`
+	// (Optional) RPC protocol versions supported by the client.
+	RpcVersions          *RpcProtocolVersions `protobuf:"bytes,9,opt,name=rpc_versions,json=rpcVersions,proto3" json:"rpc_versions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *StartClientHandshakeReq) Reset()         { *m = StartClientHandshakeReq{} }
+func (m *StartClientHandshakeReq) String() string { return proto.CompactTextString(m) }
+func (*StartClientHandshakeReq) ProtoMessage()    {}
+func (*StartClientHandshakeReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{2}
+}
+func (m *StartClientHandshakeReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StartClientHandshakeReq.Unmarshal(m, b)
+}
+func (m *StartClientHandshakeReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StartClientHandshakeReq.Marshal(b, m, deterministic)
+}
+func (dst *StartClientHandshakeReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartClientHandshakeReq.Merge(dst, src)
+}
+func (m *StartClientHandshakeReq) XXX_Size() int {
+	return xxx_messageInfo_StartClientHandshakeReq.Size(m)
+}
+func (m *StartClientHandshakeReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_StartClientHandshakeReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StartClientHandshakeReq proto.InternalMessageInfo
+
+func (m *StartClientHandshakeReq) GetHandshakeSecurityProtocol() HandshakeProtocol {
+	if m != nil {
+		return m.HandshakeSecurityProtocol
+	}
+	return HandshakeProtocol_HANDSHAKE_PROTOCOL_UNSPECIFIED
+}
+
+func (m *StartClientHandshakeReq) GetApplicationProtocols() []string {
+	if m != nil {
+		return m.ApplicationProtocols
+	}
+	return nil
+}
+
+func (m *StartClientHandshakeReq) GetRecordProtocols() []string {
+	if m != nil {
+		return m.RecordProtocols
+	}
+	return nil
+}
+
+func (m *StartClientHandshakeReq) GetTargetIdentities() []*Identity {
+	if m != nil {
+		return m.TargetIdentities
+	}
+	return nil
+}
+
+func (m *StartClientHandshakeReq) GetLocalIdentity() *Identity {
+	if m != nil {
+		return m.LocalIdentity
+	}
+	return nil
+}
+
+func (m *StartClientHandshakeReq) GetLocalEndpoint() *Endpoint {
+	if m != nil {
+		return m.LocalEndpoint
+	}
+	return nil
+}
+
+func (m *StartClientHandshakeReq) GetRemoteEndpoint() *Endpoint {
+	if m != nil {
+		return m.RemoteEndpoint
+	}
+	return nil
+}
+
+func (m *StartClientHandshakeReq) GetTargetName() string {
+	if m != nil {
+		return m.TargetName
+	}
+	return ""
+}
+
+func (m *StartClientHandshakeReq) GetRpcVersions() *RpcProtocolVersions {
+	if m != nil {
+		return m.RpcVersions
+	}
+	return nil
+}
+
+type ServerHandshakeParameters struct {
+	// The record protocols supported by the server, e.g.,
+	// "ALTSRP_GCM_AES128".
+	RecordProtocols []string `protobuf:"bytes,1,rep,name=record_protocols,json=recordProtocols,proto3" json:"record_protocols,omitempty"`
+	// (Optional) A list of local identities supported by the server, if
+	// specified. Otherwise, the handshaker chooses a default local identity.
+	LocalIdentities      []*Identity `protobuf:"bytes,2,rep,name=local_identities,json=localIdentities,proto3" json:"local_identities,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *ServerHandshakeParameters) Reset()         { *m = ServerHandshakeParameters{} }
+func (m *ServerHandshakeParameters) String() string { return proto.CompactTextString(m) }
+func (*ServerHandshakeParameters) ProtoMessage()    {}
+func (*ServerHandshakeParameters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{3}
+}
+func (m *ServerHandshakeParameters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerHandshakeParameters.Unmarshal(m, b)
+}
+func (m *ServerHandshakeParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerHandshakeParameters.Marshal(b, m, deterministic)
+}
+func (dst *ServerHandshakeParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerHandshakeParameters.Merge(dst, src)
+}
+func (m *ServerHandshakeParameters) XXX_Size() int {
+	return xxx_messageInfo_ServerHandshakeParameters.Size(m)
+}
+func (m *ServerHandshakeParameters) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerHandshakeParameters.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerHandshakeParameters proto.InternalMessageInfo
+
+func (m *ServerHandshakeParameters) GetRecordProtocols() []string {
+	if m != nil {
+		return m.RecordProtocols
+	}
+	return nil
+}
+
+func (m *ServerHandshakeParameters) GetLocalIdentities() []*Identity {
+	if m != nil {
+		return m.LocalIdentities
+	}
+	return nil
+}
+
+type StartServerHandshakeReq struct {
+	// The application protocols supported by the server, e.g., "h2" (for http2),
+	// "grpc".
+	ApplicationProtocols []string `protobuf:"bytes,1,rep,name=application_protocols,json=applicationProtocols,proto3" json:"application_protocols,omitempty"`
+	// Handshake parameters (record protocols and local identities supported by
+	// the server) mapped by the handshake protocol. Each handshake security
+	// protocol (e.g., TLS or ALTS) has its own set of record protocols and local
+	// identities. Since protobuf does not support enum as key to the map, the key
+	// to handshake_parameters is the integer value of HandshakeProtocol enum.
+	HandshakeParameters map[int32]*ServerHandshakeParameters `protobuf:"bytes,2,rep,name=handshake_parameters,json=handshakeParameters,proto3" json:"handshake_parameters,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Bytes in out_frames returned from the peer's HandshakerResp. It is possible
+	// that the peer's out_frames are split into multiple HandshakReq messages.
+	InBytes []byte `protobuf:"bytes,3,opt,name=in_bytes,json=inBytes,proto3" json:"in_bytes,omitempty"`
+	// (Optional) Local endpoint information of the connection to the client,
+	// such as local IP address, port number, and network protocol.
+	LocalEndpoint *Endpoint `protobuf:"bytes,4,opt,name=local_endpoint,json=localEndpoint,proto3" json:"local_endpoint,omitempty"`
+	// (Optional) Endpoint information of the remote client, such as IP address,
+	// port number, and network protocol.
+	RemoteEndpoint *Endpoint `protobuf:"bytes,5,opt,name=remote_endpoint,json=remoteEndpoint,proto3" json:"remote_endpoint,omitempty"`
+	// (Optional) RPC protocol versions supported by the server.
+	RpcVersions          *RpcProtocolVersions `protobuf:"bytes,6,opt,name=rpc_versions,json=rpcVersions,proto3" json:"rpc_versions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *StartServerHandshakeReq) Reset()         { *m = StartServerHandshakeReq{} }
+func (m *StartServerHandshakeReq) String() string { return proto.CompactTextString(m) }
+func (*StartServerHandshakeReq) ProtoMessage()    {}
+func (*StartServerHandshakeReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{4}
+}
+func (m *StartServerHandshakeReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StartServerHandshakeReq.Unmarshal(m, b)
+}
+func (m *StartServerHandshakeReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StartServerHandshakeReq.Marshal(b, m, deterministic)
+}
+func (dst *StartServerHandshakeReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StartServerHandshakeReq.Merge(dst, src)
+}
+func (m *StartServerHandshakeReq) XXX_Size() int {
+	return xxx_messageInfo_StartServerHandshakeReq.Size(m)
+}
+func (m *StartServerHandshakeReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_StartServerHandshakeReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StartServerHandshakeReq proto.InternalMessageInfo
+
+func (m *StartServerHandshakeReq) GetApplicationProtocols() []string {
+	if m != nil {
+		return m.ApplicationProtocols
+	}
+	return nil
+}
+
+func (m *StartServerHandshakeReq) GetHandshakeParameters() map[int32]*ServerHandshakeParameters {
+	if m != nil {
+		return m.HandshakeParameters
+	}
+	return nil
+}
+
+func (m *StartServerHandshakeReq) GetInBytes() []byte {
+	if m != nil {
+		return m.InBytes
+	}
+	return nil
+}
+
+func (m *StartServerHandshakeReq) GetLocalEndpoint() *Endpoint {
+	if m != nil {
+		return m.LocalEndpoint
+	}
+	return nil
+}
+
+func (m *StartServerHandshakeReq) GetRemoteEndpoint() *Endpoint {
+	if m != nil {
+		return m.RemoteEndpoint
+	}
+	return nil
+}
+
+func (m *StartServerHandshakeReq) GetRpcVersions() *RpcProtocolVersions {
+	if m != nil {
+		return m.RpcVersions
+	}
+	return nil
+}
+
+type NextHandshakeMessageReq struct {
+	// Bytes in out_frames returned from the peer's HandshakerResp. It is possible
+	// that the peer's out_frames are split into multiple NextHandshakerMessageReq
+	// messages.
+	InBytes              []byte   `protobuf:"bytes,1,opt,name=in_bytes,json=inBytes,proto3" json:"in_bytes,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *NextHandshakeMessageReq) Reset()         { *m = NextHandshakeMessageReq{} }
+func (m *NextHandshakeMessageReq) String() string { return proto.CompactTextString(m) }
+func (*NextHandshakeMessageReq) ProtoMessage()    {}
+func (*NextHandshakeMessageReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{5}
+}
+func (m *NextHandshakeMessageReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NextHandshakeMessageReq.Unmarshal(m, b)
+}
+func (m *NextHandshakeMessageReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_NextHandshakeMessageReq.Marshal(b, m, deterministic)
+}
+func (dst *NextHandshakeMessageReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NextHandshakeMessageReq.Merge(dst, src)
+}
+func (m *NextHandshakeMessageReq) XXX_Size() int {
+	return xxx_messageInfo_NextHandshakeMessageReq.Size(m)
+}
+func (m *NextHandshakeMessageReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_NextHandshakeMessageReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NextHandshakeMessageReq proto.InternalMessageInfo
+
+func (m *NextHandshakeMessageReq) GetInBytes() []byte {
+	if m != nil {
+		return m.InBytes
+	}
+	return nil
+}
+
+type HandshakerReq struct {
+	// Types that are valid to be assigned to ReqOneof:
+	//	*HandshakerReq_ClientStart
+	//	*HandshakerReq_ServerStart
+	//	*HandshakerReq_Next
+	ReqOneof             isHandshakerReq_ReqOneof `protobuf_oneof:"req_oneof"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
+}
+
+func (m *HandshakerReq) Reset()         { *m = HandshakerReq{} }
+func (m *HandshakerReq) String() string { return proto.CompactTextString(m) }
+func (*HandshakerReq) ProtoMessage()    {}
+func (*HandshakerReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{6}
+}
+func (m *HandshakerReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HandshakerReq.Unmarshal(m, b)
+}
+func (m *HandshakerReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HandshakerReq.Marshal(b, m, deterministic)
+}
+func (dst *HandshakerReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HandshakerReq.Merge(dst, src)
+}
+func (m *HandshakerReq) XXX_Size() int {
+	return xxx_messageInfo_HandshakerReq.Size(m)
+}
+func (m *HandshakerReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_HandshakerReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HandshakerReq proto.InternalMessageInfo
+
+type isHandshakerReq_ReqOneof interface {
+	isHandshakerReq_ReqOneof()
+}
+
+type HandshakerReq_ClientStart struct {
+	ClientStart *StartClientHandshakeReq `protobuf:"bytes,1,opt,name=client_start,json=clientStart,proto3,oneof"`
+}
+
+type HandshakerReq_ServerStart struct {
+	ServerStart *StartServerHandshakeReq `protobuf:"bytes,2,opt,name=server_start,json=serverStart,proto3,oneof"`
+}
+
+type HandshakerReq_Next struct {
+	Next *NextHandshakeMessageReq `protobuf:"bytes,3,opt,name=next,proto3,oneof"`
+}
+
+func (*HandshakerReq_ClientStart) isHandshakerReq_ReqOneof() {}
+
+func (*HandshakerReq_ServerStart) isHandshakerReq_ReqOneof() {}
+
+func (*HandshakerReq_Next) isHandshakerReq_ReqOneof() {}
+
+func (m *HandshakerReq) GetReqOneof() isHandshakerReq_ReqOneof {
+	if m != nil {
+		return m.ReqOneof
+	}
+	return nil
+}
+
+func (m *HandshakerReq) GetClientStart() *StartClientHandshakeReq {
+	if x, ok := m.GetReqOneof().(*HandshakerReq_ClientStart); ok {
+		return x.ClientStart
+	}
+	return nil
+}
+
+func (m *HandshakerReq) GetServerStart() *StartServerHandshakeReq {
+	if x, ok := m.GetReqOneof().(*HandshakerReq_ServerStart); ok {
+		return x.ServerStart
+	}
+	return nil
+}
+
+func (m *HandshakerReq) GetNext() *NextHandshakeMessageReq {
+	if x, ok := m.GetReqOneof().(*HandshakerReq_Next); ok {
+		return x.Next
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*HandshakerReq) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _HandshakerReq_OneofMarshaler, _HandshakerReq_OneofUnmarshaler, _HandshakerReq_OneofSizer, []interface{}{
+		(*HandshakerReq_ClientStart)(nil),
+		(*HandshakerReq_ServerStart)(nil),
+		(*HandshakerReq_Next)(nil),
+	}
+}
+
+func _HandshakerReq_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*HandshakerReq)
+	// req_oneof
+	switch x := m.ReqOneof.(type) {
+	case *HandshakerReq_ClientStart:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ClientStart); err != nil {
+			return err
+		}
+	case *HandshakerReq_ServerStart:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.ServerStart); err != nil {
+			return err
+		}
+	case *HandshakerReq_Next:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Next); err != nil {
+			return err
+		}
+	case nil:
+	default:
+		return fmt.Errorf("HandshakerReq.ReqOneof has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _HandshakerReq_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*HandshakerReq)
+	switch tag {
+	case 1: // req_oneof.client_start
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(StartClientHandshakeReq)
+		err := b.DecodeMessage(msg)
+		m.ReqOneof = &HandshakerReq_ClientStart{msg}
+		return true, err
+	case 2: // req_oneof.server_start
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(StartServerHandshakeReq)
+		err := b.DecodeMessage(msg)
+		m.ReqOneof = &HandshakerReq_ServerStart{msg}
+		return true, err
+	case 3: // req_oneof.next
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(NextHandshakeMessageReq)
+		err := b.DecodeMessage(msg)
+		m.ReqOneof = &HandshakerReq_Next{msg}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _HandshakerReq_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*HandshakerReq)
+	// req_oneof
+	switch x := m.ReqOneof.(type) {
+	case *HandshakerReq_ClientStart:
+		s := proto.Size(x.ClientStart)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *HandshakerReq_ServerStart:
+		s := proto.Size(x.ServerStart)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *HandshakerReq_Next:
+		s := proto.Size(x.Next)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type HandshakerResult struct {
+	// The application protocol negotiated for this connection.
+	ApplicationProtocol string `protobuf:"bytes,1,opt,name=application_protocol,json=applicationProtocol,proto3" json:"application_protocol,omitempty"`
+	// The record protocol negotiated for this connection.
+	RecordProtocol string `protobuf:"bytes,2,opt,name=record_protocol,json=recordProtocol,proto3" json:"record_protocol,omitempty"`
+	// Cryptographic key data. The key data may be more than the key length
+	// required for the record protocol, thus the client of the handshaker
+	// service needs to truncate the key data into the right key length.
+	KeyData []byte `protobuf:"bytes,3,opt,name=key_data,json=keyData,proto3" json:"key_data,omitempty"`
+	// The authenticated identity of the peer.
+	PeerIdentity *Identity `protobuf:"bytes,4,opt,name=peer_identity,json=peerIdentity,proto3" json:"peer_identity,omitempty"`
+	// The local identity used in the handshake.
+	LocalIdentity *Identity `protobuf:"bytes,5,opt,name=local_identity,json=localIdentity,proto3" json:"local_identity,omitempty"`
+	// Indicate whether the handshaker service client should keep the channel
+	// between the handshaker service open, e.g., in order to handle
+	// post-handshake messages in the future.
+	KeepChannelOpen bool `protobuf:"varint,6,opt,name=keep_channel_open,json=keepChannelOpen,proto3" json:"keep_channel_open,omitempty"`
+	// The RPC protocol versions supported by the peer.
+	PeerRpcVersions      *RpcProtocolVersions `protobuf:"bytes,7,opt,name=peer_rpc_versions,json=peerRpcVersions,proto3" json:"peer_rpc_versions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *HandshakerResult) Reset()         { *m = HandshakerResult{} }
+func (m *HandshakerResult) String() string { return proto.CompactTextString(m) }
+func (*HandshakerResult) ProtoMessage()    {}
+func (*HandshakerResult) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{7}
+}
+func (m *HandshakerResult) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HandshakerResult.Unmarshal(m, b)
+}
+func (m *HandshakerResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HandshakerResult.Marshal(b, m, deterministic)
+}
+func (dst *HandshakerResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HandshakerResult.Merge(dst, src)
+}
+func (m *HandshakerResult) XXX_Size() int {
+	return xxx_messageInfo_HandshakerResult.Size(m)
+}
+func (m *HandshakerResult) XXX_DiscardUnknown() {
+	xxx_messageInfo_HandshakerResult.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HandshakerResult proto.InternalMessageInfo
+
+func (m *HandshakerResult) GetApplicationProtocol() string {
+	if m != nil {
+		return m.ApplicationProtocol
+	}
+	return ""
+}
+
+func (m *HandshakerResult) GetRecordProtocol() string {
+	if m != nil {
+		return m.RecordProtocol
+	}
+	return ""
+}
+
+func (m *HandshakerResult) GetKeyData() []byte {
+	if m != nil {
+		return m.KeyData
+	}
+	return nil
+}
+
+func (m *HandshakerResult) GetPeerIdentity() *Identity {
+	if m != nil {
+		return m.PeerIdentity
+	}
+	return nil
+}
+
+func (m *HandshakerResult) GetLocalIdentity() *Identity {
+	if m != nil {
+		return m.LocalIdentity
+	}
+	return nil
+}
+
+func (m *HandshakerResult) GetKeepChannelOpen() bool {
+	if m != nil {
+		return m.KeepChannelOpen
+	}
+	return false
+}
+
+func (m *HandshakerResult) GetPeerRpcVersions() *RpcProtocolVersions {
+	if m != nil {
+		return m.PeerRpcVersions
+	}
+	return nil
+}
+
+type HandshakerStatus struct {
+	// The status code. This could be the gRPC status code.
+	Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+	// The status details.
+	Details              string   `protobuf:"bytes,2,opt,name=details,proto3" json:"details,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HandshakerStatus) Reset()         { *m = HandshakerStatus{} }
+func (m *HandshakerStatus) String() string { return proto.CompactTextString(m) }
+func (*HandshakerStatus) ProtoMessage()    {}
+func (*HandshakerStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{8}
+}
+func (m *HandshakerStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HandshakerStatus.Unmarshal(m, b)
+}
+func (m *HandshakerStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HandshakerStatus.Marshal(b, m, deterministic)
+}
+func (dst *HandshakerStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HandshakerStatus.Merge(dst, src)
+}
+func (m *HandshakerStatus) XXX_Size() int {
+	return xxx_messageInfo_HandshakerStatus.Size(m)
+}
+func (m *HandshakerStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_HandshakerStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HandshakerStatus proto.InternalMessageInfo
+
+func (m *HandshakerStatus) GetCode() uint32 {
+	if m != nil {
+		return m.Code
+	}
+	return 0
+}
+
+func (m *HandshakerStatus) GetDetails() string {
+	if m != nil {
+		return m.Details
+	}
+	return ""
+}
+
+type HandshakerResp struct {
+	// Frames to be given to the peer for the NextHandshakeMessageReq. May be
+	// empty if no out_frames have to be sent to the peer or if in_bytes in the
+	// HandshakerReq are incomplete. All the non-empty out frames must be sent to
+	// the peer even if the handshaker status is not OK as these frames may
+	// contain the alert frames.
+	OutFrames []byte `protobuf:"bytes,1,opt,name=out_frames,json=outFrames,proto3" json:"out_frames,omitempty"`
+	// Number of bytes in the in_bytes consumed by the handshaker. It is possible
+	// that part of in_bytes in HandshakerReq was unrelated to the handshake
+	// process.
+	BytesConsumed uint32 `protobuf:"varint,2,opt,name=bytes_consumed,json=bytesConsumed,proto3" json:"bytes_consumed,omitempty"`
+	// This is set iff the handshake was successful. out_frames may still be set
+	// to frames that needs to be forwarded to the peer.
+	Result *HandshakerResult `protobuf:"bytes,3,opt,name=result,proto3" json:"result,omitempty"`
+	// Status of the handshaker.
+	Status               *HandshakerStatus `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *HandshakerResp) Reset()         { *m = HandshakerResp{} }
+func (m *HandshakerResp) String() string { return proto.CompactTextString(m) }
+func (*HandshakerResp) ProtoMessage()    {}
+func (*HandshakerResp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_handshaker_b28e45bdd1661054, []int{9}
+}
+func (m *HandshakerResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HandshakerResp.Unmarshal(m, b)
+}
+func (m *HandshakerResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HandshakerResp.Marshal(b, m, deterministic)
+}
+func (dst *HandshakerResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HandshakerResp.Merge(dst, src)
+}
+func (m *HandshakerResp) XXX_Size() int {
+	return xxx_messageInfo_HandshakerResp.Size(m)
+}
+func (m *HandshakerResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_HandshakerResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HandshakerResp proto.InternalMessageInfo
+
+func (m *HandshakerResp) GetOutFrames() []byte {
+	if m != nil {
+		return m.OutFrames
+	}
+	return nil
+}
+
+func (m *HandshakerResp) GetBytesConsumed() uint32 {
+	if m != nil {
+		return m.BytesConsumed
+	}
+	return 0
+}
+
+func (m *HandshakerResp) GetResult() *HandshakerResult {
+	if m != nil {
+		return m.Result
+	}
+	return nil
+}
+
+func (m *HandshakerResp) GetStatus() *HandshakerStatus {
+	if m != nil {
+		return m.Status
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Endpoint)(nil), "grpc.gcp.Endpoint")
+	proto.RegisterType((*Identity)(nil), "grpc.gcp.Identity")
+	proto.RegisterType((*StartClientHandshakeReq)(nil), "grpc.gcp.StartClientHandshakeReq")
+	proto.RegisterType((*ServerHandshakeParameters)(nil), "grpc.gcp.ServerHandshakeParameters")
+	proto.RegisterType((*StartServerHandshakeReq)(nil), "grpc.gcp.StartServerHandshakeReq")
+	proto.RegisterMapType((map[int32]*ServerHandshakeParameters)(nil), "grpc.gcp.StartServerHandshakeReq.HandshakeParametersEntry")
+	proto.RegisterType((*NextHandshakeMessageReq)(nil), "grpc.gcp.NextHandshakeMessageReq")
+	proto.RegisterType((*HandshakerReq)(nil), "grpc.gcp.HandshakerReq")
+	proto.RegisterType((*HandshakerResult)(nil), "grpc.gcp.HandshakerResult")
+	proto.RegisterType((*HandshakerStatus)(nil), "grpc.gcp.HandshakerStatus")
+	proto.RegisterType((*HandshakerResp)(nil), "grpc.gcp.HandshakerResp")
+	proto.RegisterEnum("grpc.gcp.HandshakeProtocol", HandshakeProtocol_name, HandshakeProtocol_value)
+	proto.RegisterEnum("grpc.gcp.NetworkProtocol", NetworkProtocol_name, NetworkProtocol_value)
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// HandshakerServiceClient is the client API for HandshakerService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type HandshakerServiceClient interface {
+	// Handshaker service accepts a stream of handshaker request, returning a
+	// stream of handshaker response. Client is expected to send exactly one
+	// message with either client_start or server_start followed by one or more
+	// messages with next. Each time client sends a request, the handshaker
+	// service expects to respond. Client does not have to wait for service's
+	// response before sending next request.
+	DoHandshake(ctx context.Context, opts ...grpc.CallOption) (HandshakerService_DoHandshakeClient, error)
+}
+
+type handshakerServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewHandshakerServiceClient(cc *grpc.ClientConn) HandshakerServiceClient {
+	return &handshakerServiceClient{cc}
+}
+
+func (c *handshakerServiceClient) DoHandshake(ctx context.Context, opts ...grpc.CallOption) (HandshakerService_DoHandshakeClient, error) {
+	stream, err := c.cc.NewStream(ctx, &_HandshakerService_serviceDesc.Streams[0], "/grpc.gcp.HandshakerService/DoHandshake", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &handshakerServiceDoHandshakeClient{stream}
+	return x, nil
+}
+
+type HandshakerService_DoHandshakeClient interface {
+	Send(*HandshakerReq) error
+	Recv() (*HandshakerResp, error)
+	grpc.ClientStream
+}
+
+type handshakerServiceDoHandshakeClient struct {
+	grpc.ClientStream
+}
+
+func (x *handshakerServiceDoHandshakeClient) Send(m *HandshakerReq) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *handshakerServiceDoHandshakeClient) Recv() (*HandshakerResp, error) {
+	m := new(HandshakerResp)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// HandshakerServiceServer is the server API for HandshakerService service.
+type HandshakerServiceServer interface {
+	// Handshaker service accepts a stream of handshaker request, returning a
+	// stream of handshaker response. Client is expected to send exactly one
+	// message with either client_start or server_start followed by one or more
+	// messages with next. Each time client sends a request, the handshaker
+	// service expects to respond. Client does not have to wait for service's
+	// response before sending next request.
+	DoHandshake(HandshakerService_DoHandshakeServer) error
+}
+
+func RegisterHandshakerServiceServer(s *grpc.Server, srv HandshakerServiceServer) {
+	s.RegisterService(&_HandshakerService_serviceDesc, srv)
+}
+
+func _HandshakerService_DoHandshake_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(HandshakerServiceServer).DoHandshake(&handshakerServiceDoHandshakeServer{stream})
+}
+
+type HandshakerService_DoHandshakeServer interface {
+	Send(*HandshakerResp) error
+	Recv() (*HandshakerReq, error)
+	grpc.ServerStream
+}
+
+type handshakerServiceDoHandshakeServer struct {
+	grpc.ServerStream
+}
+
+func (x *handshakerServiceDoHandshakeServer) Send(m *HandshakerResp) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func (x *handshakerServiceDoHandshakeServer) Recv() (*HandshakerReq, error) {
+	m := new(HandshakerReq)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+var _HandshakerService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "grpc.gcp.HandshakerService",
+	HandlerType: (*HandshakerServiceServer)(nil),
+	Methods:     []grpc.MethodDesc{},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "DoHandshake",
+			Handler:       _HandshakerService_DoHandshake_Handler,
+			ServerStreams: true,
+			ClientStreams: true,
+		},
+	},
+	Metadata: "grpc/gcp/handshaker.proto",
+}
+
+func init() {
+	proto.RegisterFile("grpc/gcp/handshaker.proto", fileDescriptor_handshaker_b28e45bdd1661054)
+}
+
+var fileDescriptor_handshaker_b28e45bdd1661054 = []byte{
+	// 1128 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdf, 0x6e, 0x1a, 0xc7,
+	0x17, 0xf6, 0x02, 0xb6, 0xe1, 0x60, 0xfe, 0x78, 0x92, 0x28, 0xd8, 0x49, 0x7e, 0x3f, 0x4a, 0x55,
+	0x95, 0xf8, 0x02, 0x5a, 0xd2, 0x2a, 0x4d, 0xa2, 0xaa, 0xb1, 0x31, 0x16, 0x6e, 0x5c, 0x8c, 0x16,
+	0xa7, 0x95, 0x9a, 0x8b, 0xd5, 0x64, 0x39, 0x59, 0xaf, 0x58, 0x66, 0xd6, 0x33, 0x83, 0x1b, 0x1e,
+	0xa0, 0x8f, 0xd3, 0x57, 0xe8, 0xdb, 0xf4, 0x0d, 0x7a, 0xdf, 0x6a, 0x67, 0xff, 0x61, 0x0c, 0x51,
+	0xa2, 0xde, 0xed, 0xce, 0x7c, 0xdf, 0xd9, 0x73, 0xbe, 0xf3, 0xcd, 0xd9, 0x81, 0x3d, 0x47, 0xf8,
+	0x76, 0xdb, 0xb1, 0xfd, 0xf6, 0x25, 0x65, 0x63, 0x79, 0x49, 0x27, 0x28, 0x5a, 0xbe, 0xe0, 0x8a,
+	0x93, 0x7c, 0xb0, 0xd5, 0x72, 0x6c, 0x7f, 0xbf, 0x99, 0x80, 0x94, 0xa0, 0x4c, 0xfa, 0x5c, 0x28,
+	0x4b, 0xa2, 0x3d, 0x13, 0xae, 0x9a, 0x5b, 0x36, 0x9f, 0x4e, 0x39, 0x0b, 0x39, 0x0d, 0x05, 0xf9,
+	0x1e, 0x1b, 0xfb, 0xdc, 0x65, 0x8a, 0x3c, 0x02, 0x70, 0x7d, 0x8b, 0x8e, 0xc7, 0x02, 0xa5, 0xac,
+	0x19, 0x75, 0xa3, 0x59, 0x30, 0x0b, 0xae, 0x7f, 0x18, 0x2e, 0x10, 0x02, 0xb9, 0x20, 0x50, 0x2d,
+	0x53, 0x37, 0x9a, 0x9b, 0xa6, 0x7e, 0x26, 0xdf, 0x42, 0x5e, 0xc7, 0xb1, 0xb9, 0x57, 0xcb, 0xd6,
+	0x8d, 0x66, 0xb9, 0xb3, 0xd7, 0x8a, 0xb3, 0x68, 0x0d, 0x50, 0xfd, 0xc6, 0xc5, 0x64, 0x18, 0x01,
+	0xcc, 0x04, 0xda, 0x40, 0xc8, 0x9f, 0x8e, 0x91, 0x29, 0x57, 0xcd, 0xc9, 0x63, 0xa8, 0x48, 0x14,
+	0xd7, 0xae, 0x8d, 0x16, 0xb5, 0x6d, 0x3e, 0x63, 0x2a, 0xfc, 0x74, 0x7f, 0xc3, 0x2c, 0x47, 0x1b,
+	0x87, 0xe1, 0x3a, 0x79, 0x08, 0xf9, 0x4b, 0x2e, 0x15, 0xa3, 0x53, 0xd4, 0x59, 0x04, 0x98, 0x64,
+	0xe5, 0xa8, 0x0a, 0x65, 0x37, 0x0a, 0x6a, 0x71, 0x86, 0xfc, 0x5d, 0xe3, 0x8f, 0x1c, 0xdc, 0x1f,
+	0x29, 0x2a, 0x54, 0xd7, 0x73, 0x91, 0xa9, 0x7e, 0x2c, 0x98, 0x89, 0x57, 0xe4, 0x0d, 0x3c, 0x48,
+	0x04, 0x4c, 0xb5, 0x49, 0x8a, 0x31, 0x74, 0x31, 0x0f, 0xd2, 0x62, 0x12, 0x72, 0x52, 0xce, 0x5e,
+	0xc2, 0x1f, 0x45, 0xf4, 0x78, 0x8b, 0x3c, 0x81, 0x7b, 0xd4, 0xf7, 0x3d, 0xd7, 0xa6, 0xca, 0xe5,
+	0x2c, 0x89, 0x2a, 0x6b, 0x99, 0x7a, 0xb6, 0x59, 0x30, 0xef, 0x2e, 0x6c, 0xc6, 0x1c, 0x49, 0x1e,
+	0x43, 0x55, 0xa0, 0xcd, 0xc5, 0x78, 0x01, 0x9f, 0xd5, 0xf8, 0x4a, 0xb8, 0x9e, 0x42, 0x7f, 0x80,
+	0x5d, 0x45, 0x85, 0x83, 0xca, 0x8a, 0x2a, 0x76, 0x51, 0xd6, 0x72, 0xf5, 0x6c, 0xb3, 0xd8, 0x21,
+	0x69, 0xca, 0xb1, 0xc4, 0x66, 0x35, 0x04, 0x9f, 0x26, 0x58, 0xf2, 0x0c, 0xca, 0x1e, 0xb7, 0xa9,
+	0x17, 0xf3, 0xe7, 0xb5, 0xcd, 0xba, 0xb1, 0x86, 0x5d, 0xd2, 0xc8, 0xa4, 0x5f, 0x09, 0x15, 0x23,
+	0xdf, 0xd4, 0xb6, 0x96, 0xa9, 0xb1, 0xa3, 0x22, 0x6a, 0x62, 0xb0, 0x17, 0x50, 0x11, 0x38, 0xe5,
+	0x0a, 0x53, 0xee, 0xf6, 0x5a, 0x6e, 0x39, 0x84, 0x26, 0xe4, 0xff, 0x43, 0x31, 0xaa, 0x59, 0xf7,
+	0x3f, 0xaf, 0xed, 0x09, 0xe1, 0xd2, 0x80, 0x4e, 0x91, 0xbc, 0x84, 0x1d, 0xe1, 0xdb, 0xd6, 0x35,
+	0x0a, 0xe9, 0x72, 0x26, 0x6b, 0x05, 0x1d, 0xfa, 0x51, 0x1a, 0xda, 0xf4, 0xed, 0x58, 0xc2, 0x9f,
+	0x23, 0x90, 0x59, 0x14, 0xbe, 0x1d, 0xbf, 0x34, 0x7e, 0x37, 0x60, 0x6f, 0x84, 0xe2, 0x1a, 0x45,
+	0xda, 0x6d, 0x2a, 0xe8, 0x14, 0x15, 0x8a, 0xd5, 0xfd, 0x31, 0x56, 0xf7, 0xe7, 0x7b, 0xa8, 0xde,
+	0x90, 0x37, 0x68, 0x4f, 0x66, 0x6d, 0x7b, 0x2a, 0x8b, 0x02, 0xbb, 0x28, 0x1b, 0xff, 0x64, 0x23,
+	0xdf, 0x2e, 0x25, 0x13, 0xf8, 0x76, 0xad, 0xb5, 0x8c, 0x0f, 0x58, 0x6b, 0x0a, 0x77, 0x53, 0xb3,
+	0xfb, 0x49, 0x49, 0x51, 0x4e, 0xcf, 0xd3, 0x9c, 0xd6, 0x7c, 0xb5, 0xb5, 0x42, 0x8f, 0x1e, 0x53,
+	0x62, 0x6e, 0xde, 0xb9, 0x5c, 0xa1, 0xd4, 0x1e, 0xe4, 0x5d, 0x66, 0xbd, 0x9d, 0x2b, 0x94, 0x7a,
+	0x2a, 0xec, 0x98, 0xdb, 0x2e, 0x3b, 0x0a, 0x5e, 0x57, 0xb8, 0x27, 0xf7, 0x1f, 0xdc, 0xb3, 0xf9,
+	0xd1, 0xee, 0x59, 0x36, 0xc7, 0xd6, 0xa7, 0x9a, 0x63, 0x7f, 0x02, 0xb5, 0x75, 0x2a, 0x90, 0x2a,
+	0x64, 0x27, 0x38, 0xd7, 0x43, 0x63, 0xd3, 0x0c, 0x1e, 0xc9, 0x33, 0xd8, 0xbc, 0xa6, 0xde, 0x2c,
+	0x9c, 0x53, 0xc5, 0xce, 0xe7, 0x0b, 0x12, 0xaf, 0x33, 0x98, 0x19, 0x32, 0x9e, 0x67, 0xbe, 0x33,
+	0x1a, 0xdf, 0xc0, 0xfd, 0x01, 0xbe, 0x4f, 0x27, 0xd6, 0x4f, 0x28, 0x25, 0x75, 0xb4, 0x01, 0x16,
+	0xc5, 0x35, 0x6e, 0x88, 0xdb, 0xf8, 0xcb, 0x80, 0x52, 0x42, 0x11, 0x01, 0xf8, 0x04, 0x76, 0x6c,
+	0x3d, 0xfb, 0x2c, 0x19, 0x74, 0x56, 0x13, 0x8a, 0x9d, 0xcf, 0x96, 0x1a, 0x7e, 0x7b, 0x3c, 0xf6,
+	0x37, 0xcc, 0x62, 0x48, 0xd4, 0x80, 0x20, 0x8e, 0xd4, 0x79, 0x47, 0x71, 0x32, 0x2b, 0xe3, 0xdc,
+	0x36, 0x4e, 0x10, 0x27, 0x24, 0x86, 0x71, 0x9e, 0x42, 0x8e, 0xe1, 0x7b, 0xa5, 0x5d, 0x71, 0x83,
+	0xbf, 0xa6, 0xda, 0xfe, 0x86, 0xa9, 0x09, 0x47, 0x45, 0x28, 0x08, 0xbc, 0x8a, 0xe6, 0xfa, 0xdf,
+	0x19, 0xa8, 0x2e, 0xd6, 0x29, 0x67, 0x9e, 0x22, 0x5f, 0xc3, 0xdd, 0x55, 0x07, 0x23, 0xfa, 0x8f,
+	0xdd, 0x59, 0x71, 0x2e, 0xc8, 0x97, 0x50, 0x59, 0x3a, 0xd1, 0xe1, 0x6f, 0x25, 0x70, 0xcf, 0xe2,
+	0x81, 0x0e, 0x34, 0x9f, 0xe0, 0xdc, 0x1a, 0x53, 0x45, 0x63, 0x43, 0x4f, 0x70, 0x7e, 0x4c, 0x15,
+	0x25, 0x4f, 0xa1, 0xe4, 0x23, 0x8a, 0x74, 0x90, 0xe6, 0xd6, 0x0e, 0xd2, 0x9d, 0x00, 0x78, 0x7b,
+	0x8e, 0x7e, 0xfa, 0x08, 0x3e, 0x80, 0xdd, 0x09, 0xa2, 0x6f, 0xd9, 0x97, 0x94, 0x31, 0xf4, 0x2c,
+	0xee, 0x23, 0xd3, 0x8e, 0xce, 0x9b, 0x95, 0x60, 0xa3, 0x1b, 0xae, 0x9f, 0xfb, 0xc8, 0xc8, 0x29,
+	0xec, 0xea, 0xfc, 0x6e, 0xb8, 0x7f, 0xfb, 0x63, 0xdc, 0x5f, 0x09, 0x78, 0xe6, 0xc2, 0x78, 0x7c,
+	0xb9, 0xa8, 0xfa, 0x48, 0x51, 0x35, 0xd3, 0x97, 0x02, 0x9b, 0x8f, 0x51, 0xab, 0x5c, 0x32, 0xf5,
+	0x33, 0xa9, 0xc1, 0xf6, 0x18, 0x15, 0x75, 0xf5, 0xff, 0x2e, 0x90, 0x33, 0x7e, 0x6d, 0xfc, 0x69,
+	0x40, 0xf9, 0x46, 0xe3, 0xfc, 0xe0, 0xd2, 0xc1, 0x67, 0xca, 0x7a, 0x17, 0x9c, 0x82, 0xd8, 0xd0,
+	0x05, 0x3e, 0x53, 0x27, 0x7a, 0x81, 0x7c, 0x01, 0x65, 0x6d, 0x75, 0xcb, 0xe6, 0x4c, 0xce, 0xa6,
+	0x38, 0xd6, 0x21, 0x4b, 0x66, 0x49, 0xaf, 0x76, 0xa3, 0x45, 0xd2, 0x81, 0x2d, 0xa1, 0x6d, 0x10,
+	0x39, 0x6b, 0x7f, 0xc5, 0x8f, 0x3b, 0x32, 0x8a, 0x19, 0x21, 0x03, 0x8e, 0xd4, 0x45, 0x44, 0x2d,
+	0x5b, 0xc9, 0x09, 0xcb, 0x34, 0x23, 0xe4, 0xc1, 0x8f, 0xb0, 0x7b, 0xeb, 0x22, 0x40, 0x1a, 0xf0,
+	0xbf, 0xfe, 0xe1, 0xe0, 0x78, 0xd4, 0x3f, 0x7c, 0xd5, 0xb3, 0x86, 0xe6, 0xf9, 0xc5, 0x79, 0xf7,
+	0xfc, 0xcc, 0x7a, 0x3d, 0x18, 0x0d, 0x7b, 0xdd, 0xd3, 0x93, 0xd3, 0xde, 0x71, 0x75, 0x83, 0x6c,
+	0x43, 0xf6, 0xe2, 0x6c, 0x54, 0x35, 0x48, 0x1e, 0x72, 0x87, 0x67, 0x17, 0xa3, 0x6a, 0xe6, 0xa0,
+	0x07, 0x95, 0xa5, 0x1b, 0x12, 0xa9, 0xc3, 0xc3, 0x41, 0xef, 0xe2, 0x97, 0x73, 0xf3, 0xd5, 0x87,
+	0xe2, 0x74, 0x87, 0x55, 0x23, 0x78, 0x78, 0x7d, 0x3c, 0xac, 0x66, 0x3a, 0x6f, 0x16, 0x52, 0x12,
+	0xa3, 0xf0, 0xc2, 0x44, 0x4e, 0xa0, 0x78, 0xcc, 0x93, 0x65, 0x72, 0x7f, 0xb5, 0x1c, 0x57, 0xfb,
+	0xb5, 0x35, 0x3a, 0xf9, 0x8d, 0x8d, 0xa6, 0xf1, 0x95, 0x71, 0xe4, 0xc0, 0x3d, 0x97, 0x87, 0x18,
+	0xea, 0x29, 0xd9, 0x72, 0x99, 0x42, 0xc1, 0xa8, 0x77, 0x54, 0x49, 0xe1, 0x3a, 0xfb, 0xa1, 0xf1,
+	0xeb, 0x0b, 0x87, 0x73, 0xc7, 0xc3, 0x96, 0xc3, 0x3d, 0xca, 0x9c, 0x16, 0x17, 0x4e, 0x5b, 0x5f,
+	0x43, 0x6d, 0x81, 0xda, 0xb8, 0xd4, 0x93, 0xed, 0x20, 0x48, 0xdb, 0xe6, 0x02, 0xdb, 0xfa, 0xc4,
+	0x69, 0x80, 0xe5, 0xd8, 0xfe, 0xdb, 0x2d, 0xfd, 0xfe, 0xe4, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xfa, 0xd2, 0x42, 0x7f, 0xdf, 0x0a, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/transport_security_common.pb.go b/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/transport_security_common.pb.go
new file mode 100644
index 00000000..120700ea
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp/transport_security_common.pb.go
@@ -0,0 +1,178 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: grpc/gcp/transport_security_common.proto
+
+package grpc_gcp // import "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// 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
+
+// The security level of the created channel. The list is sorted in increasing
+// level of security. This order must always be maintained.
+type SecurityLevel int32
+
+const (
+	SecurityLevel_SECURITY_NONE         SecurityLevel = 0
+	SecurityLevel_INTEGRITY_ONLY        SecurityLevel = 1
+	SecurityLevel_INTEGRITY_AND_PRIVACY SecurityLevel = 2
+)
+
+var SecurityLevel_name = map[int32]string{
+	0: "SECURITY_NONE",
+	1: "INTEGRITY_ONLY",
+	2: "INTEGRITY_AND_PRIVACY",
+}
+var SecurityLevel_value = map[string]int32{
+	"SECURITY_NONE":         0,
+	"INTEGRITY_ONLY":        1,
+	"INTEGRITY_AND_PRIVACY": 2,
+}
+
+func (x SecurityLevel) String() string {
+	return proto.EnumName(SecurityLevel_name, int32(x))
+}
+func (SecurityLevel) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_transport_security_common_6489ab913bf26255, []int{0}
+}
+
+// Max and min supported RPC protocol versions.
+type RpcProtocolVersions struct {
+	// Maximum supported RPC version.
+	MaxRpcVersion *RpcProtocolVersions_Version `protobuf:"bytes,1,opt,name=max_rpc_version,json=maxRpcVersion,proto3" json:"max_rpc_version,omitempty"`
+	// Minimum supported RPC version.
+	MinRpcVersion        *RpcProtocolVersions_Version `protobuf:"bytes,2,opt,name=min_rpc_version,json=minRpcVersion,proto3" json:"min_rpc_version,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *RpcProtocolVersions) Reset()         { *m = RpcProtocolVersions{} }
+func (m *RpcProtocolVersions) String() string { return proto.CompactTextString(m) }
+func (*RpcProtocolVersions) ProtoMessage()    {}
+func (*RpcProtocolVersions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transport_security_common_6489ab913bf26255, []int{0}
+}
+func (m *RpcProtocolVersions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RpcProtocolVersions.Unmarshal(m, b)
+}
+func (m *RpcProtocolVersions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RpcProtocolVersions.Marshal(b, m, deterministic)
+}
+func (dst *RpcProtocolVersions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RpcProtocolVersions.Merge(dst, src)
+}
+func (m *RpcProtocolVersions) XXX_Size() int {
+	return xxx_messageInfo_RpcProtocolVersions.Size(m)
+}
+func (m *RpcProtocolVersions) XXX_DiscardUnknown() {
+	xxx_messageInfo_RpcProtocolVersions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RpcProtocolVersions proto.InternalMessageInfo
+
+func (m *RpcProtocolVersions) GetMaxRpcVersion() *RpcProtocolVersions_Version {
+	if m != nil {
+		return m.MaxRpcVersion
+	}
+	return nil
+}
+
+func (m *RpcProtocolVersions) GetMinRpcVersion() *RpcProtocolVersions_Version {
+	if m != nil {
+		return m.MinRpcVersion
+	}
+	return nil
+}
+
+// RPC version contains a major version and a minor version.
+type RpcProtocolVersions_Version struct {
+	Major                uint32   `protobuf:"varint,1,opt,name=major,proto3" json:"major,omitempty"`
+	Minor                uint32   `protobuf:"varint,2,opt,name=minor,proto3" json:"minor,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RpcProtocolVersions_Version) Reset()         { *m = RpcProtocolVersions_Version{} }
+func (m *RpcProtocolVersions_Version) String() string { return proto.CompactTextString(m) }
+func (*RpcProtocolVersions_Version) ProtoMessage()    {}
+func (*RpcProtocolVersions_Version) Descriptor() ([]byte, []int) {
+	return fileDescriptor_transport_security_common_6489ab913bf26255, []int{0, 0}
+}
+func (m *RpcProtocolVersions_Version) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RpcProtocolVersions_Version.Unmarshal(m, b)
+}
+func (m *RpcProtocolVersions_Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RpcProtocolVersions_Version.Marshal(b, m, deterministic)
+}
+func (dst *RpcProtocolVersions_Version) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RpcProtocolVersions_Version.Merge(dst, src)
+}
+func (m *RpcProtocolVersions_Version) XXX_Size() int {
+	return xxx_messageInfo_RpcProtocolVersions_Version.Size(m)
+}
+func (m *RpcProtocolVersions_Version) XXX_DiscardUnknown() {
+	xxx_messageInfo_RpcProtocolVersions_Version.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RpcProtocolVersions_Version proto.InternalMessageInfo
+
+func (m *RpcProtocolVersions_Version) GetMajor() uint32 {
+	if m != nil {
+		return m.Major
+	}
+	return 0
+}
+
+func (m *RpcProtocolVersions_Version) GetMinor() uint32 {
+	if m != nil {
+		return m.Minor
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*RpcProtocolVersions)(nil), "grpc.gcp.RpcProtocolVersions")
+	proto.RegisterType((*RpcProtocolVersions_Version)(nil), "grpc.gcp.RpcProtocolVersions.Version")
+	proto.RegisterEnum("grpc.gcp.SecurityLevel", SecurityLevel_name, SecurityLevel_value)
+}
+
+func init() {
+	proto.RegisterFile("grpc/gcp/transport_security_common.proto", fileDescriptor_transport_security_common_6489ab913bf26255)
+}
+
+var fileDescriptor_transport_security_common_6489ab913bf26255 = []byte{
+	// 324 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0x41, 0x4b, 0x3b, 0x31,
+	0x10, 0xc5, 0xff, 0x5b, 0xf8, 0xab, 0x44, 0x56, 0xeb, 0x6a, 0x41, 0xc5, 0x83, 0x08, 0x42, 0xf1,
+	0x90, 0x05, 0xc5, 0x93, 0xa7, 0xb6, 0x16, 0x29, 0xd4, 0x6d, 0xdd, 0xd6, 0x42, 0xbd, 0x84, 0x18,
+	0x43, 0x88, 0x64, 0x33, 0x61, 0x36, 0x96, 0xfa, 0x95, 0xfd, 0x14, 0xb2, 0x69, 0x97, 0x22, 0x78,
+	0xf1, 0x96, 0xf7, 0x98, 0xf9, 0x4d, 0x66, 0x1e, 0x69, 0x2b, 0x74, 0x22, 0x55, 0xc2, 0xa5, 0x1e,
+	0xb9, 0x2d, 0x1d, 0xa0, 0x67, 0xa5, 0x14, 0x1f, 0xa8, 0xfd, 0x27, 0x13, 0x50, 0x14, 0x60, 0xa9,
+	0x43, 0xf0, 0x90, 0xec, 0x54, 0x95, 0x54, 0x09, 0x77, 0xf1, 0x15, 0x91, 0xc3, 0xdc, 0x89, 0x71,
+	0x65, 0x0b, 0x30, 0x33, 0x89, 0xa5, 0x06, 0x5b, 0x26, 0x8f, 0x64, 0xbf, 0xe0, 0x4b, 0x86, 0x4e,
+	0xb0, 0xc5, 0xca, 0x3b, 0x8e, 0xce, 0xa3, 0xf6, 0xee, 0xf5, 0x25, 0xad, 0x7b, 0xe9, 0x2f, 0x7d,
+	0x74, 0xfd, 0xc8, 0xe3, 0x82, 0x2f, 0x73, 0x27, 0xd6, 0x32, 0xe0, 0xb4, 0xfd, 0x81, 0x6b, 0xfc,
+	0x0d, 0xa7, 0xed, 0x06, 0x77, 0x7a, 0x4b, 0xb6, 0x6b, 0xf2, 0x11, 0xf9, 0x5f, 0xf0, 0x77, 0xc0,
+	0xf0, 0xbd, 0x38, 0x5f, 0x89, 0xe0, 0x6a, 0x0b, 0x18, 0xa6, 0x54, 0x6e, 0x25, 0xae, 0x9e, 0x48,
+	0x3c, 0x59, 0xdf, 0x63, 0x28, 0x17, 0xd2, 0x24, 0x07, 0x24, 0x9e, 0xf4, 0x7b, 0xcf, 0xf9, 0x60,
+	0x3a, 0x67, 0xd9, 0x28, 0xeb, 0x37, 0xff, 0x25, 0x09, 0xd9, 0x1b, 0x64, 0xd3, 0xfe, 0x43, 0xf0,
+	0x46, 0xd9, 0x70, 0xde, 0x8c, 0x92, 0x13, 0xd2, 0xda, 0x78, 0x9d, 0xec, 0x9e, 0x8d, 0xf3, 0xc1,
+	0xac, 0xd3, 0x9b, 0x37, 0x1b, 0x5d, 0x4f, 0x5a, 0x1a, 0x56, 0x3b, 0x70, 0xe3, 0x4b, 0xaa, 0xad,
+	0x97, 0x68, 0xb9, 0xe9, 0x9e, 0x4d, 0xeb, 0x0c, 0xea, 0x91, 0xbd, 0x90, 0x40, 0x58, 0x71, 0x1c,
+	0xbd, 0xdc, 0x29, 0x00, 0x65, 0x24, 0x55, 0x60, 0xb8, 0x55, 0x14, 0x50, 0xa5, 0x21, 0x3e, 0x81,
+	0xf2, 0x4d, 0x5a, 0xaf, 0xb9, 0x29, 0xd3, 0x8a, 0x98, 0x0a, 0x40, 0x99, 0x86, 0xd8, 0x42, 0x01,
+	0x53, 0xc2, 0xbd, 0x6e, 0x05, 0x7d, 0xf3, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xc8, 0x38, 0x9d,
+	0xf2, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/regenerate.sh b/vendor/google.golang.org/grpc/credentials/alts/core/regenerate.sh
new file mode 100755
index 00000000..a79c4201
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/regenerate.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# Copyright 2018 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eux -o pipefail
+
+TMP=$(mktemp -d)
+
+function finish {
+  rm -rf "$TMP"
+}
+trap finish EXIT
+
+pushd "$TMP"
+mkdir -p grpc/gcp
+curl https://raw.githubusercontent.com/grpc/grpc-proto/master/grpc/gcp/altscontext.proto > grpc/gcp/altscontext.proto
+curl https://raw.githubusercontent.com/grpc/grpc-proto/master/grpc/gcp/handshaker.proto > grpc/gcp/handshaker.proto
+curl https://raw.githubusercontent.com/grpc/grpc-proto/master/grpc/gcp/transport_security_common.proto > grpc/gcp/transport_security_common.proto
+
+protoc --go_out=plugins=grpc,paths=source_relative:. -I. grpc/gcp/*.proto
+popd
+rm -f proto/grpc_gcp/*.pb.go
+cp "$TMP"/grpc/gcp/*.pb.go proto/grpc_gcp/
+
diff --git a/vendor/google.golang.org/grpc/credentials/alts/core/testutil/testutil.go b/vendor/google.golang.org/grpc/credentials/alts/core/testutil/testutil.go
new file mode 100644
index 00000000..91cbd039
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/core/testutil/testutil.go
@@ -0,0 +1,125 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package testutil include useful test utilities for the handshaker.
+package testutil
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io"
+	"net"
+	"sync"
+
+	"google.golang.org/grpc/credentials/alts/core/conn"
+)
+
+// Stats is used to collect statistics about concurrent handshake calls.
+type Stats struct {
+	mu                 sync.Mutex
+	calls              int
+	MaxConcurrentCalls int
+}
+
+// Update updates the statistics by adding one call.
+func (s *Stats) Update() func() {
+	s.mu.Lock()
+	s.calls++
+	if s.calls > s.MaxConcurrentCalls {
+		s.MaxConcurrentCalls = s.calls
+	}
+	s.mu.Unlock()
+
+	return func() {
+		s.mu.Lock()
+		s.calls--
+		s.mu.Unlock()
+	}
+}
+
+// Reset resets the statistics.
+func (s *Stats) Reset() {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.calls = 0
+	s.MaxConcurrentCalls = 0
+}
+
+// testConn mimics a net.Conn to the peer.
+type testConn struct {
+	net.Conn
+	in  *bytes.Buffer
+	out *bytes.Buffer
+}
+
+// NewTestConn creates a new instance of testConn object.
+func NewTestConn(in *bytes.Buffer, out *bytes.Buffer) net.Conn {
+	return &testConn{
+		in:  in,
+		out: out,
+	}
+}
+
+// Read reads from the in buffer.
+func (c *testConn) Read(b []byte) (n int, err error) {
+	return c.in.Read(b)
+}
+
+// Write writes to the out buffer.
+func (c *testConn) Write(b []byte) (n int, err error) {
+	return c.out.Write(b)
+}
+
+// Close closes the testConn object.
+func (c *testConn) Close() error {
+	return nil
+}
+
+// unresponsiveTestConn mimics a net.Conn for an unresponsive peer. It is used
+// for testing the PeerNotResponding case.
+type unresponsiveTestConn struct {
+	net.Conn
+}
+
+// NewUnresponsiveTestConn creates a new instance of unresponsiveTestConn object.
+func NewUnresponsiveTestConn() net.Conn {
+	return &unresponsiveTestConn{}
+}
+
+// Read reads from the in buffer.
+func (c *unresponsiveTestConn) Read(b []byte) (n int, err error) {
+	return 0, io.EOF
+}
+
+// Write writes to the out buffer.
+func (c *unresponsiveTestConn) Write(b []byte) (n int, err error) {
+	return 0, nil
+}
+
+// Close closes the TestConn object.
+func (c *unresponsiveTestConn) Close() error {
+	return nil
+}
+
+// MakeFrame creates a handshake frame.
+func MakeFrame(pl string) []byte {
+	f := make([]byte, len(pl)+conn.MsgLenFieldSize)
+	binary.LittleEndian.PutUint32(f, uint32(len(pl)))
+	copy(f[conn.MsgLenFieldSize:], []byte(pl))
+	return f
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/utils.go b/vendor/google.golang.org/grpc/credentials/alts/utils.go
new file mode 100644
index 00000000..9f92eb1d
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/utils.go
@@ -0,0 +1,136 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package alts
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"os/exec"
+	"regexp"
+	"runtime"
+	"strings"
+	"time"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/peer"
+)
+
+const (
+	linuxProductNameFile     = "/sys/class/dmi/id/product_name"
+	windowsCheckCommand      = "powershell.exe"
+	windowsCheckCommandArgs  = "Get-WmiObject -Class Win32_BIOS"
+	powershellOutputFilter   = "Manufacturer"
+	windowsManufacturerRegex = ":(.*)"
+	windowsCheckTimeout      = 30 * time.Second
+)
+
+type platformError string
+
+func (k platformError) Error() string {
+	return fmt.Sprintf("%s is not supported", string(k))
+}
+
+var (
+	// The following two variables will be reassigned in tests.
+	runningOS          = runtime.GOOS
+	manufacturerReader = func() (io.Reader, error) {
+		switch runningOS {
+		case "linux":
+			return os.Open(linuxProductNameFile)
+		case "windows":
+			cmd := exec.Command(windowsCheckCommand, windowsCheckCommandArgs)
+			out, err := cmd.Output()
+			if err != nil {
+				return nil, err
+			}
+
+			for _, line := range strings.Split(strings.TrimSuffix(string(out), "\n"), "\n") {
+				if strings.HasPrefix(line, powershellOutputFilter) {
+					re := regexp.MustCompile(windowsManufacturerRegex)
+					name := re.FindString(line)
+					name = strings.TrimLeft(name, ":")
+					return strings.NewReader(name), nil
+				}
+			}
+
+			return nil, errors.New("cannot determine the machine's manufacturer")
+		default:
+			return nil, platformError(runningOS)
+		}
+	}
+	vmOnGCP bool
+)
+
+// isRunningOnGCP checks whether the local system, without doing a network request is
+// running on GCP.
+func isRunningOnGCP() bool {
+	manufacturer, err := readManufacturer()
+	if err != nil {
+		log.Fatalf("failure to read manufacturer information: %v", err)
+	}
+	name := string(manufacturer)
+	switch runningOS {
+	case "linux":
+		name = strings.TrimSpace(name)
+		return name == "Google" || name == "Google Compute Engine"
+	case "windows":
+		name = strings.Replace(name, " ", "", -1)
+		name = strings.Replace(name, "\n", "", -1)
+		name = strings.Replace(name, "\r", "", -1)
+		return name == "Google"
+	default:
+		log.Fatal(platformError(runningOS))
+	}
+	return false
+}
+
+func readManufacturer() ([]byte, error) {
+	reader, err := manufacturerReader()
+	if err != nil {
+		return nil, err
+	}
+	if reader == nil {
+		return nil, errors.New("got nil reader")
+	}
+	manufacturer, err := ioutil.ReadAll(reader)
+	if err != nil {
+		return nil, fmt.Errorf("failed reading %v: %v", linuxProductNameFile, err)
+	}
+	return manufacturer, nil
+}
+
+// AuthInfoFromContext extracts the alts.AuthInfo object from the given context,
+// if it exists. This API should be used by gRPC server RPC handlers to get
+// information about the communicating peer. For client-side, use grpc.Peer()
+// CallOption.
+func AuthInfoFromContext(ctx context.Context) (AuthInfo, error) {
+	peer, ok := peer.FromContext(ctx)
+	if !ok {
+		return nil, errors.New("no Peer found in Context")
+	}
+	altsAuthInfo, ok := peer.AuthInfo.(AuthInfo)
+	if !ok {
+		return nil, errors.New("no alts.AuthInfo found in Context")
+	}
+	return altsAuthInfo, nil
+}
diff --git a/vendor/google.golang.org/grpc/credentials/alts/utils_test.go b/vendor/google.golang.org/grpc/credentials/alts/utils_test.go
new file mode 100644
index 00000000..4724103f
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/alts/utils_test.go
@@ -0,0 +1,111 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package alts
+
+import (
+	"io"
+	"strings"
+	"testing"
+
+	"golang.org/x/net/context"
+	altspb "google.golang.org/grpc/credentials/alts/core/proto/grpc_gcp"
+	"google.golang.org/grpc/peer"
+)
+
+func TestIsRunningOnGCP(t *testing.T) {
+	for _, tc := range []struct {
+		description string
+		testOS      string
+		testReader  io.Reader
+		out         bool
+	}{
+		// Linux tests.
+		{"linux: not a GCP platform", "linux", strings.NewReader("not GCP"), false},
+		{"Linux: GCP platform (Google)", "linux", strings.NewReader("Google"), true},
+		{"Linux: GCP platform (Google Compute Engine)", "linux", strings.NewReader("Google Compute Engine"), true},
+		{"Linux: GCP platform (Google Compute Engine) with extra spaces", "linux", strings.NewReader("  Google Compute Engine        "), true},
+		// Windows tests.
+		{"windows: not a GCP platform", "windows", strings.NewReader("not GCP"), false},
+		{"windows: GCP platform (Google)", "windows", strings.NewReader("Google"), true},
+		{"windows: GCP platform (Google) with extra spaces", "windows", strings.NewReader("  Google     "), true},
+	} {
+		reverseFunc := setup(tc.testOS, tc.testReader)
+		if got, want := isRunningOnGCP(), tc.out; got != want {
+			t.Errorf("%v: isRunningOnGCP()=%v, want %v", tc.description, got, want)
+		}
+		reverseFunc()
+	}
+}
+
+func setup(testOS string, testReader io.Reader) func() {
+	tmpOS := runningOS
+	tmpReader := manufacturerReader
+
+	// Set test OS and reader function.
+	runningOS = testOS
+	manufacturerReader = func() (io.Reader, error) {
+		return testReader, nil
+	}
+
+	return func() {
+		runningOS = tmpOS
+		manufacturerReader = tmpReader
+	}
+}
+
+func TestAuthInfoFromContext(t *testing.T) {
+	ctx := context.Background()
+	altsAuthInfo := &fakeALTSAuthInfo{}
+	p := &peer.Peer{
+		AuthInfo: altsAuthInfo,
+	}
+	for _, tc := range []struct {
+		desc    string
+		ctx     context.Context
+		success bool
+		out     AuthInfo
+	}{
+		{
+			"working case",
+			peer.NewContext(ctx, p),
+			true,
+			altsAuthInfo,
+		},
+	} {
+		authInfo, err := AuthInfoFromContext(tc.ctx)
+		if got, want := (err == nil), tc.success; got != want {
+			t.Errorf("%v: AuthInfoFromContext(_)=(err=nil)=%v, want %v", tc.desc, got, want)
+		}
+		if got, want := authInfo, tc.out; got != want {
+			t.Errorf("%v:, AuthInfoFromContext(_)=(%v, _), want (%v, _)", tc.desc, got, want)
+		}
+	}
+}
+
+type fakeALTSAuthInfo struct{}
+
+func (*fakeALTSAuthInfo) AuthType() string            { return "" }
+func (*fakeALTSAuthInfo) ApplicationProtocol() string { return "" }
+func (*fakeALTSAuthInfo) RecordProtocol() string      { return "" }
+func (*fakeALTSAuthInfo) SecurityLevel() altspb.SecurityLevel {
+	return altspb.SecurityLevel_SECURITY_NONE
+}
+func (*fakeALTSAuthInfo) PeerServiceAccount() string                   { return "" }
+func (*fakeALTSAuthInfo) LocalServiceAccount() string                  { return "" }
+func (*fakeALTSAuthInfo) PeerRPCVersions() *altspb.RpcProtocolVersions { return nil }
diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go
index 3351bf0e..1dae57ab 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials.go
+++ b/vendor/google.golang.org/grpc/credentials/credentials.go
@@ -31,6 +31,7 @@ import (
 	"net"
 	"strings"
 
+	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
 )
 
@@ -118,6 +119,18 @@ func (t TLSInfo) AuthType() string {
 	return "tls"
 }
 
+// GetChannelzSecurityValue returns security info requested by channelz.
+func (t TLSInfo) GetChannelzSecurityValue() ChannelzSecurityValue {
+	v := &TLSChannelzSecurityValue{
+		StandardName: cipherSuiteLookup[t.State.CipherSuite],
+	}
+	// Currently there's no way to get LocalCertificate info from tls package.
+	if len(t.State.PeerCertificates) > 0 {
+		v.RemoteCertificate = t.State.PeerCertificates[0].Raw
+	}
+	return v
+}
+
 // tlsCreds is the credentials required for authenticating a connection using TLS.
 type tlsCreds struct {
 	// TLS configuration
@@ -155,7 +168,7 @@ func (c *tlsCreds) ClientHandshake(ctx context.Context, authority string, rawCon
 	case <-ctx.Done():
 		return nil, nil, ctx.Err()
 	}
-	return conn, TLSInfo{conn.ConnectionState()}, nil
+	return tlsConn{Conn: conn, rawConn: rawConn}, TLSInfo{conn.ConnectionState()}, nil
 }
 
 func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error) {
@@ -163,7 +176,7 @@ func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error)
 	if err := conn.Handshake(); err != nil {
 		return nil, nil, err
 	}
-	return conn, TLSInfo{conn.ConnectionState()}, nil
+	return tlsConn{Conn: conn, rawConn: rawConn}, TLSInfo{conn.ConnectionState()}, nil
 }
 
 func (c *tlsCreds) Clone() TransportCredentials {
@@ -218,3 +231,63 @@ func NewServerTLSFromFile(certFile, keyFile string) (TransportCredentials, error
 	}
 	return NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}}), nil
 }
+
+// ChannelzSecurityInfo defines the interface that security protocols should implement
+// in order to provide security info to channelz.
+type ChannelzSecurityInfo interface {
+	GetSecurityValue() ChannelzSecurityValue
+}
+
+// ChannelzSecurityValue defines the interface that GetSecurityValue() return value
+// should satisfy. This interface should only be satisfied by *TLSChannelzSecurityValue
+// and *OtherChannelzSecurityValue.
+type ChannelzSecurityValue interface {
+	isChannelzSecurityValue()
+}
+
+// TLSChannelzSecurityValue defines the struct that TLS protocol should return
+// from GetSecurityValue(), containing security info like cipher and certificate used.
+type TLSChannelzSecurityValue struct {
+	StandardName      string
+	LocalCertificate  []byte
+	RemoteCertificate []byte
+}
+
+func (*TLSChannelzSecurityValue) isChannelzSecurityValue() {}
+
+// OtherChannelzSecurityValue defines the struct that non-TLS protocol should return
+// from GetSecurityValue(), which contains protocol specific security info. Note
+// the Value field will be sent to users of channelz requesting channel info, and
+// thus sensitive info should better be avoided.
+type OtherChannelzSecurityValue struct {
+	Name  string
+	Value proto.Message
+}
+
+func (*OtherChannelzSecurityValue) isChannelzSecurityValue() {}
+
+type tlsConn struct {
+	*tls.Conn
+	rawConn net.Conn
+}
+
+var cipherSuiteLookup = map[uint16]string{
+	tls.TLS_RSA_WITH_RC4_128_SHA:                "TLS_RSA_WITH_RC4_128_SHA",
+	tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA:           "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
+	tls.TLS_RSA_WITH_AES_128_CBC_SHA:            "TLS_RSA_WITH_AES_128_CBC_SHA",
+	tls.TLS_RSA_WITH_AES_256_CBC_SHA:            "TLS_RSA_WITH_AES_256_CBC_SHA",
+	tls.TLS_RSA_WITH_AES_128_GCM_SHA256:         "TLS_RSA_WITH_AES_128_GCM_SHA256",
+	tls.TLS_RSA_WITH_AES_256_GCM_SHA384:         "TLS_RSA_WITH_AES_256_GCM_SHA384",
+	tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:        "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
+	tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:    "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
+	tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:    "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
+	tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA:          "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+	tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:     "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+	tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:      "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
+	tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:      "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
+	tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:   "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+	tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+	tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:   "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+	tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
+	tls.TLS_FALLBACK_SCSV:                       "TLS_FALLBACK_SCSV",
+}
diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go b/vendor/google.golang.org/grpc/credentials/go16.go
similarity index 100%
rename from vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
rename to vendor/google.golang.org/grpc/credentials/go16.go
diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go b/vendor/google.golang.org/grpc/credentials/go17.go
similarity index 98%
rename from vendor/google.golang.org/grpc/credentials/credentials_util_go17.go
rename to vendor/google.golang.org/grpc/credentials/go17.go
index 60409aac..fbd50000 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go
+++ b/vendor/google.golang.org/grpc/credentials/go17.go
@@ -1,5 +1,4 @@
-// +build go1.7
-// +build !go1.8
+// +build go1.7,!go1.8
 
 /*
  *
diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_go18.go b/vendor/google.golang.org/grpc/credentials/go18.go
similarity index 65%
rename from vendor/google.golang.org/grpc/credentials/credentials_util_go18.go
rename to vendor/google.golang.org/grpc/credentials/go18.go
index 93f0e1d8..db30d46c 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials_util_go18.go
+++ b/vendor/google.golang.org/grpc/credentials/go18.go
@@ -24,6 +24,14 @@ import (
 	"crypto/tls"
 )
 
+func init() {
+	cipherSuiteLookup[tls.TLS_RSA_WITH_AES_128_CBC_SHA256] = "TLS_RSA_WITH_AES_128_CBC_SHA256"
+	cipherSuiteLookup[tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256] = "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
+	cipherSuiteLookup[tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256] = "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
+	cipherSuiteLookup[tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305] = "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305"
+	cipherSuiteLookup[tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305] = "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305"
+}
+
 // cloneTLSConfig returns a shallow clone of the exported
 // fields of cfg, ignoring the unexported sync.Once, which
 // contains a mutex and must not be copied.
diff --git a/vendor/google.golang.org/grpc/credentials/go19.go b/vendor/google.golang.org/grpc/credentials/go19.go
new file mode 100644
index 00000000..2a4ca1a5
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/go19.go
@@ -0,0 +1,35 @@
+// +build go1.9,!appengine
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package credentials
+
+import (
+	"errors"
+	"syscall"
+)
+
+// implements the syscall.Conn interface
+func (c tlsConn) SyscallConn() (syscall.RawConn, error) {
+	conn, ok := c.rawConn.(syscall.Conn)
+	if !ok {
+		return nil, errors.New("RawConn does not implement syscall.Conn")
+	}
+	return conn.SyscallConn()
+}
diff --git a/vendor/google.golang.org/grpc/dialoptions.go b/vendor/google.golang.org/grpc/dialoptions.go
new file mode 100644
index 00000000..20accf1a
--- /dev/null
+++ b/vendor/google.golang.org/grpc/dialoptions.go
@@ -0,0 +1,450 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package grpc
+
+import (
+	"fmt"
+	"net"
+	"time"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/balancer"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/internal"
+	"google.golang.org/grpc/internal/backoff"
+	"google.golang.org/grpc/internal/envconfig"
+	"google.golang.org/grpc/internal/transport"
+	"google.golang.org/grpc/keepalive"
+	"google.golang.org/grpc/resolver"
+	"google.golang.org/grpc/stats"
+)
+
+// dialOptions configure a Dial call. dialOptions are set by the DialOption
+// values passed to Dial.
+type dialOptions struct {
+	unaryInt    UnaryClientInterceptor
+	streamInt   StreamClientInterceptor
+	cp          Compressor
+	dc          Decompressor
+	bs          backoff.Strategy
+	block       bool
+	insecure    bool
+	timeout     time.Duration
+	scChan      <-chan ServiceConfig
+	authority   string
+	copts       transport.ConnectOptions
+	callOptions []CallOption
+	// This is used by v1 balancer dial option WithBalancer to support v1
+	// balancer, and also by WithBalancerName dial option.
+	balancerBuilder balancer.Builder
+	// This is to support grpclb.
+	resolverBuilder      resolver.Builder
+	waitForHandshake     bool
+	channelzParentID     int64
+	disableServiceConfig bool
+	disableRetry         bool
+}
+
+// DialOption configures how we set up the connection.
+type DialOption interface {
+	apply(*dialOptions)
+}
+
+// EmptyDialOption does not alter the dial configuration. It can be embedded in
+// another structure to build custom dial options.
+//
+// This API is EXPERIMENTAL.
+type EmptyDialOption struct{}
+
+func (EmptyDialOption) apply(*dialOptions) {}
+
+// funcDialOption wraps a function that modifies dialOptions into an
+// implementation of the DialOption interface.
+type funcDialOption struct {
+	f func(*dialOptions)
+}
+
+func (fdo *funcDialOption) apply(do *dialOptions) {
+	fdo.f(do)
+}
+
+func newFuncDialOption(f func(*dialOptions)) *funcDialOption {
+	return &funcDialOption{
+		f: f,
+	}
+}
+
+// WithWaitForHandshake blocks until the initial settings frame is received from
+// the server before assigning RPCs to the connection. Experimental API.
+func WithWaitForHandshake() DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.waitForHandshake = true
+	})
+}
+
+// WithWriteBufferSize determines how much data can be batched before doing a
+// write on the wire. The corresponding memory allocation for this buffer will
+// be twice the size to keep syscalls low. The default value for this buffer is
+// 32KB.
+//
+// Zero will disable the write buffer such that each write will be on underlying
+// connection. Note: A Send call may not directly translate to a write.
+func WithWriteBufferSize(s int) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.WriteBufferSize = s
+	})
+}
+
+// WithReadBufferSize lets you set the size of read buffer, this determines how
+// much data can be read at most for each read syscall.
+//
+// The default value for this buffer is 32KB. Zero will disable read buffer for
+// a connection so data framer can access the underlying conn directly.
+func WithReadBufferSize(s int) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.ReadBufferSize = s
+	})
+}
+
+// WithInitialWindowSize returns a DialOption which sets the value for initial
+// window size on a stream. The lower bound for window size is 64K and any value
+// smaller than that will be ignored.
+func WithInitialWindowSize(s int32) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.InitialWindowSize = s
+	})
+}
+
+// WithInitialConnWindowSize returns a DialOption which sets the value for
+// initial window size on a connection. The lower bound for window size is 64K
+// and any value smaller than that will be ignored.
+func WithInitialConnWindowSize(s int32) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.InitialConnWindowSize = s
+	})
+}
+
+// WithMaxMsgSize returns a DialOption which sets the maximum message size the
+// client can receive.
+//
+// Deprecated: use WithDefaultCallOptions(MaxCallRecvMsgSize(s)) instead.
+func WithMaxMsgSize(s int) DialOption {
+	return WithDefaultCallOptions(MaxCallRecvMsgSize(s))
+}
+
+// WithDefaultCallOptions returns a DialOption which sets the default
+// CallOptions for calls over the connection.
+func WithDefaultCallOptions(cos ...CallOption) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.callOptions = append(o.callOptions, cos...)
+	})
+}
+
+// WithCodec returns a DialOption which sets a codec for message marshaling and
+// unmarshaling.
+//
+// Deprecated: use WithDefaultCallOptions(CallCustomCodec(c)) instead.
+func WithCodec(c Codec) DialOption {
+	return WithDefaultCallOptions(CallCustomCodec(c))
+}
+
+// WithCompressor returns a DialOption which sets a Compressor to use for
+// message compression. It has lower priority than the compressor set by the
+// UseCompressor CallOption.
+//
+// Deprecated: use UseCompressor instead.
+func WithCompressor(cp Compressor) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.cp = cp
+	})
+}
+
+// WithDecompressor returns a DialOption which sets a Decompressor to use for
+// incoming message decompression.  If incoming response messages are encoded
+// using the decompressor's Type(), it will be used.  Otherwise, the message
+// encoding will be used to look up the compressor registered via
+// encoding.RegisterCompressor, which will then be used to decompress the
+// message.  If no compressor is registered for the encoding, an Unimplemented
+// status error will be returned.
+//
+// Deprecated: use encoding.RegisterCompressor instead.
+func WithDecompressor(dc Decompressor) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.dc = dc
+	})
+}
+
+// WithBalancer returns a DialOption which sets a load balancer with the v1 API.
+// Name resolver will be ignored if this DialOption is specified.
+//
+// Deprecated: use the new balancer APIs in balancer package and
+// WithBalancerName.
+func WithBalancer(b Balancer) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.balancerBuilder = &balancerWrapperBuilder{
+			b: b,
+		}
+	})
+}
+
+// WithBalancerName sets the balancer that the ClientConn will be initialized
+// with. Balancer registered with balancerName will be used. This function
+// panics if no balancer was registered by balancerName.
+//
+// The balancer cannot be overridden by balancer option specified by service
+// config.
+//
+// This is an EXPERIMENTAL API.
+func WithBalancerName(balancerName string) DialOption {
+	builder := balancer.Get(balancerName)
+	if builder == nil {
+		panic(fmt.Sprintf("grpc.WithBalancerName: no balancer is registered for name %v", balancerName))
+	}
+	return newFuncDialOption(func(o *dialOptions) {
+		o.balancerBuilder = builder
+	})
+}
+
+// withResolverBuilder is only for grpclb.
+func withResolverBuilder(b resolver.Builder) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.resolverBuilder = b
+	})
+}
+
+// WithServiceConfig returns a DialOption which has a channel to read the
+// service configuration.
+//
+// Deprecated: service config should be received through name resolver, as
+// specified here.
+// https://github.com/grpc/grpc/blob/master/doc/service_config.md
+func WithServiceConfig(c <-chan ServiceConfig) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.scChan = c
+	})
+}
+
+// WithBackoffMaxDelay configures the dialer to use the provided maximum delay
+// when backing off after failed connection attempts.
+func WithBackoffMaxDelay(md time.Duration) DialOption {
+	return WithBackoffConfig(BackoffConfig{MaxDelay: md})
+}
+
+// WithBackoffConfig configures the dialer to use the provided backoff
+// parameters after connection failures.
+//
+// Use WithBackoffMaxDelay until more parameters on BackoffConfig are opened up
+// for use.
+func WithBackoffConfig(b BackoffConfig) DialOption {
+	return withBackoff(backoff.Exponential{
+		MaxDelay: b.MaxDelay,
+	})
+}
+
+// withBackoff sets the backoff strategy used for connectRetryNum after a failed
+// connection attempt.
+//
+// This can be exported if arbitrary backoff strategies are allowed by gRPC.
+func withBackoff(bs backoff.Strategy) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.bs = bs
+	})
+}
+
+// WithBlock returns a DialOption which makes caller of Dial blocks until the
+// underlying connection is up. Without this, Dial returns immediately and
+// connecting the server happens in background.
+func WithBlock() DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.block = true
+	})
+}
+
+// WithInsecure returns a DialOption which disables transport security for this
+// ClientConn. Note that transport security is required unless WithInsecure is
+// set.
+func WithInsecure() DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.insecure = true
+	})
+}
+
+// WithTransportCredentials returns a DialOption which configures a connection
+// level security credentials (e.g., TLS/SSL).
+func WithTransportCredentials(creds credentials.TransportCredentials) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.TransportCredentials = creds
+	})
+}
+
+// WithPerRPCCredentials returns a DialOption which sets credentials and places
+// auth state on each outbound RPC.
+func WithPerRPCCredentials(creds credentials.PerRPCCredentials) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.PerRPCCredentials = append(o.copts.PerRPCCredentials, creds)
+	})
+}
+
+// WithTimeout returns a DialOption that configures a timeout for dialing a
+// ClientConn initially. This is valid if and only if WithBlock() is present.
+//
+// Deprecated: use DialContext and context.WithTimeout instead.
+func WithTimeout(d time.Duration) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.timeout = d
+	})
+}
+
+func withContextDialer(f func(context.Context, string) (net.Conn, error)) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.Dialer = f
+	})
+}
+
+func init() {
+	internal.WithContextDialer = withContextDialer
+	internal.WithResolverBuilder = withResolverBuilder
+}
+
+// WithDialer returns a DialOption that specifies a function to use for dialing
+// network addresses. If FailOnNonTempDialError() is set to true, and an error
+// is returned by f, gRPC checks the error's Temporary() method to decide if it
+// should try to reconnect to the network address.
+func WithDialer(f func(string, time.Duration) (net.Conn, error)) DialOption {
+	return withContextDialer(
+		func(ctx context.Context, addr string) (net.Conn, error) {
+			if deadline, ok := ctx.Deadline(); ok {
+				return f(addr, deadline.Sub(time.Now()))
+			}
+			return f(addr, 0)
+		})
+}
+
+// WithStatsHandler returns a DialOption that specifies the stats handler for
+// all the RPCs and underlying network connections in this ClientConn.
+func WithStatsHandler(h stats.Handler) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.StatsHandler = h
+	})
+}
+
+// FailOnNonTempDialError returns a DialOption that specifies if gRPC fails on
+// non-temporary dial errors. If f is true, and dialer returns a non-temporary
+// error, gRPC will fail the connection to the network address and won't try to
+// reconnect. The default value of FailOnNonTempDialError is false.
+//
+// This is an EXPERIMENTAL API.
+func FailOnNonTempDialError(f bool) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.FailOnNonTempDialError = f
+	})
+}
+
+// WithUserAgent returns a DialOption that specifies a user agent string for all
+// the RPCs.
+func WithUserAgent(s string) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.UserAgent = s
+	})
+}
+
+// WithKeepaliveParams returns a DialOption that specifies keepalive parameters
+// for the client transport.
+func WithKeepaliveParams(kp keepalive.ClientParameters) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.KeepaliveParams = kp
+	})
+}
+
+// WithUnaryInterceptor returns a DialOption that specifies the interceptor for
+// unary RPCs.
+func WithUnaryInterceptor(f UnaryClientInterceptor) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.unaryInt = f
+	})
+}
+
+// WithStreamInterceptor returns a DialOption that specifies the interceptor for
+// streaming RPCs.
+func WithStreamInterceptor(f StreamClientInterceptor) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.streamInt = f
+	})
+}
+
+// WithAuthority returns a DialOption that specifies the value to be used as the
+// :authority pseudo-header. This value only works with WithInsecure and has no
+// effect if TransportCredentials are present.
+func WithAuthority(a string) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.authority = a
+	})
+}
+
+// WithChannelzParentID returns a DialOption that specifies the channelz ID of
+// current ClientConn's parent. This function is used in nested channel creation
+// (e.g. grpclb dial).
+func WithChannelzParentID(id int64) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.channelzParentID = id
+	})
+}
+
+// WithDisableServiceConfig returns a DialOption that causes grpc to ignore any
+// service config provided by the resolver and provides a hint to the resolver
+// to not fetch service configs.
+func WithDisableServiceConfig() DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.disableServiceConfig = true
+	})
+}
+
+// WithDisableRetry returns a DialOption that disables retries, even if the
+// service config enables them.  This does not impact transparent retries, which
+// will happen automatically if no data is written to the wire or if the RPC is
+// unprocessed by the remote server.
+//
+// Retry support is currently disabled by default, but will be enabled by
+// default in the future.  Until then, it may be enabled by setting the
+// environment variable "GRPC_GO_RETRY" to "on".
+//
+// This API is EXPERIMENTAL.
+func WithDisableRetry() DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.disableRetry = true
+	})
+}
+
+// WithMaxHeaderListSize returns a DialOption that specifies the maximum
+// (uncompressed) size of header list that the client is prepared to accept.
+func WithMaxHeaderListSize(s uint32) DialOption {
+	return newFuncDialOption(func(o *dialOptions) {
+		o.copts.MaxHeaderListSize = &s
+	})
+}
+
+func defaultDialOptions() dialOptions {
+	return dialOptions{
+		disableRetry: !envconfig.Retry,
+		copts: transport.ConnectOptions{
+			WriteBufferSize: defaultWriteBufSize,
+			ReadBufferSize:  defaultReadBufSize,
+		},
+	}
+}
diff --git a/vendor/google.golang.org/grpc/encoding/encoding.go b/vendor/google.golang.org/grpc/encoding/encoding.go
index 8e26c194..ade8b7ce 100644
--- a/vendor/google.golang.org/grpc/encoding/encoding.go
+++ b/vendor/google.golang.org/grpc/encoding/encoding.go
@@ -82,7 +82,7 @@ type Codec interface {
 	Name() string
 }
 
-var registeredCodecs = make(map[string]Codec, 0)
+var registeredCodecs = make(map[string]Codec)
 
 // RegisterCodec registers the provided Codec for use with all gRPC clients and
 // servers.
diff --git a/vendor/google.golang.org/grpc/encoding/gzip/gzip.go b/vendor/google.golang.org/grpc/encoding/gzip/gzip.go
index c991a662..09564db1 100644
--- a/vendor/google.golang.org/grpc/encoding/gzip/gzip.go
+++ b/vendor/google.golang.org/grpc/encoding/gzip/gzip.go
@@ -23,6 +23,7 @@ package gzip
 
 import (
 	"compress/gzip"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"sync"
@@ -46,6 +47,26 @@ type writer struct {
 	pool *sync.Pool
 }
 
+// SetLevel updates the registered gzip compressor to use the compression level specified (gzip.HuffmanOnly is not supported).
+// NOTE: this function must only be called during initialization time (i.e. in an init() function),
+// and is not thread-safe.
+//
+// The error returned will be nil if the specified level is valid.
+func SetLevel(level int) error {
+	if level < gzip.DefaultCompression || level > gzip.BestCompression {
+		return fmt.Errorf("grpc: invalid gzip compression level: %d", level)
+	}
+	c := encoding.GetCompressor(Name).(*compressor)
+	c.poolCompressor.New = func() interface{} {
+		w, err := gzip.NewWriterLevel(ioutil.Discard, level)
+		if err != nil {
+			panic(err)
+		}
+		return &writer{Writer: w, pool: &c.poolCompressor}
+	}
+	return nil
+}
+
 func (c *compressor) Compress(w io.Writer) (io.WriteCloser, error) {
 	z := c.poolCompressor.Get().(*writer)
 	z.Writer.Reset(w)
diff --git a/vendor/google.golang.org/grpc/encoding/proto/proto_test.go b/vendor/google.golang.org/grpc/encoding/proto/proto_test.go
index b6a0b666..10c6f778 100644
--- a/vendor/google.golang.org/grpc/encoding/proto/proto_test.go
+++ b/vendor/google.golang.org/grpc/encoding/proto/proto_test.go
@@ -40,7 +40,7 @@ func marshalAndUnmarshal(t *testing.T, codec encoding.Codec, expectedBody []byte
 		t.Errorf("codec.Unmarshal(_) returned an error")
 	}
 
-	if bytes.Compare(p.GetBody(), expectedBody) != 0 {
+	if !bytes.Equal(p.GetBody(), expectedBody) {
 		t.Errorf("Unexpected body; got %v; want %v", p.GetBody(), expectedBody)
 	}
 }
diff --git a/vendor/google.golang.org/grpc/examples/gotutorial.md b/vendor/google.golang.org/grpc/examples/gotutorial.md
index a520a5a1..cba85081 100644
--- a/vendor/google.golang.org/grpc/examples/gotutorial.md
+++ b/vendor/google.golang.org/grpc/examples/gotutorial.md
@@ -313,7 +313,7 @@ Now let's look at how we call our service methods. Note that in gRPC-Go, RPCs op
 Calling the simple RPC `GetFeature` is nearly as straightforward as calling a local method.
 
 ```go
-feature, err := client.GetFeature(context.Background(), &pb.Point{409146138, -746188906})
+feature, err := client.GetFeature(ctx, &pb.Point{409146138, -746188906})
 if err != nil {
         ...
 }
@@ -331,7 +331,7 @@ Here's where we call the server-side streaming method `ListFeatures`, which retu
 
 ```go
 rect := &pb.Rectangle{ ... }  // initialize a pb.Rectangle
-stream, err := client.ListFeatures(context.Background(), rect)
+stream, err := client.ListFeatures(ctx, rect)
 if err != nil {
     ...
 }
@@ -364,7 +364,7 @@ for i := 0; i < pointCount; i++ {
 	points = append(points, randomPoint(r))
 }
 log.Printf("Traversing %d points.", len(points))
-stream, err := client.RecordRoute(context.Background())
+stream, err := client.RecordRoute(ctx)
 if err != nil {
 	log.Fatalf("%v.RecordRoute(_) = _, %v", client, err)
 }
@@ -387,7 +387,7 @@ The `RouteGuide_RecordRouteClient` has a `Send()` method that we can use to send
 Finally, let's look at our bidirectional streaming RPC `RouteChat()`. As in the case of `RecordRoute`, we only pass the method a context object and get back a stream that we can use to both write and read messages. However, this time we return values via our method's stream while the server is still writing messages to *their* message stream.
 
 ```go
-stream, err := client.RouteChat(context.Background())
+stream, err := client.RouteChat(ctx)
 waitc := make(chan struct{})
 go func() {
 	for {
diff --git a/vendor/google.golang.org/grpc/examples/helloworld/greeter_client/main.go b/vendor/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
index 3dc426e2..4b99ff5a 100644
--- a/vendor/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
+++ b/vendor/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
@@ -21,6 +21,7 @@ package main
 import (
 	"log"
 	"os"
+	"time"
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -46,7 +47,9 @@ func main() {
 	if len(os.Args) > 1 {
 		name = os.Args[1]
 	}
-	r, err := c.SayHello(context.Background(), &pb.HelloRequest{Name: name})
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	r, err := c.SayHello(ctx, &pb.HelloRequest{Name: name})
 	if err != nil {
 		log.Fatalf("could not greet: %v", err)
 	}
diff --git a/vendor/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go b/vendor/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
index 64bd1ef3..11383d74 100644
--- a/vendor/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
+++ b/vendor/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
@@ -1,16 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: helloworld.proto
 
-/*
-Package helloworld is a generated protocol buffer package.
-
-It is generated from these files:
-	helloworld.proto
-
-It has these top-level messages:
-	HelloRequest
-	HelloReply
-*/
 package helloworld
 
 import proto "github.com/golang/protobuf/proto"
@@ -35,13 +25,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // The request message containing the user's name.
 type HelloRequest struct {
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HelloRequest) Reset()         { *m = HelloRequest{} }
+func (m *HelloRequest) String() string { return proto.CompactTextString(m) }
+func (*HelloRequest) ProtoMessage()    {}
+func (*HelloRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_helloworld_71e208cbdc16936b, []int{0}
+}
+func (m *HelloRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HelloRequest.Unmarshal(m, b)
+}
+func (m *HelloRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HelloRequest.Marshal(b, m, deterministic)
+}
+func (dst *HelloRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HelloRequest.Merge(dst, src)
+}
+func (m *HelloRequest) XXX_Size() int {
+	return xxx_messageInfo_HelloRequest.Size(m)
+}
+func (m *HelloRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_HelloRequest.DiscardUnknown(m)
 }
 
-func (m *HelloRequest) Reset()                    { *m = HelloRequest{} }
-func (m *HelloRequest) String() string            { return proto.CompactTextString(m) }
-func (*HelloRequest) ProtoMessage()               {}
-func (*HelloRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_HelloRequest proto.InternalMessageInfo
 
 func (m *HelloRequest) GetName() string {
 	if m != nil {
@@ -52,13 +64,35 @@ func (m *HelloRequest) GetName() string {
 
 // The response message containing the greetings
 type HelloReply struct {
-	Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"`
+	Message              string   `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *HelloReply) Reset()                    { *m = HelloReply{} }
-func (m *HelloReply) String() string            { return proto.CompactTextString(m) }
-func (*HelloReply) ProtoMessage()               {}
-func (*HelloReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *HelloReply) Reset()         { *m = HelloReply{} }
+func (m *HelloReply) String() string { return proto.CompactTextString(m) }
+func (*HelloReply) ProtoMessage()    {}
+func (*HelloReply) Descriptor() ([]byte, []int) {
+	return fileDescriptor_helloworld_71e208cbdc16936b, []int{1}
+}
+func (m *HelloReply) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HelloReply.Unmarshal(m, b)
+}
+func (m *HelloReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HelloReply.Marshal(b, m, deterministic)
+}
+func (dst *HelloReply) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HelloReply.Merge(dst, src)
+}
+func (m *HelloReply) XXX_Size() int {
+	return xxx_messageInfo_HelloReply.Size(m)
+}
+func (m *HelloReply) XXX_DiscardUnknown() {
+	xxx_messageInfo_HelloReply.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HelloReply proto.InternalMessageInfo
 
 func (m *HelloReply) GetMessage() string {
 	if m != nil {
@@ -80,8 +114,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Greeter service
-
+// GreeterClient is the client API for Greeter service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type GreeterClient interface {
 	// Sends a greeting
 	SayHello(ctx context.Context, in *HelloRequest, opts ...grpc.CallOption) (*HelloReply, error)
@@ -97,15 +132,14 @@ func NewGreeterClient(cc *grpc.ClientConn) GreeterClient {
 
 func (c *greeterClient) SayHello(ctx context.Context, in *HelloRequest, opts ...grpc.CallOption) (*HelloReply, error) {
 	out := new(HelloReply)
-	err := grpc.Invoke(ctx, "/helloworld.Greeter/SayHello", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/helloworld.Greeter/SayHello", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Greeter service
-
+// GreeterServer is the server API for Greeter service.
 type GreeterServer interface {
 	// Sends a greeting
 	SayHello(context.Context, *HelloRequest) (*HelloReply, error)
@@ -146,9 +180,9 @@ var _Greeter_serviceDesc = grpc.ServiceDesc{
 	Metadata: "helloworld.proto",
 }
 
-func init() { proto.RegisterFile("helloworld.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("helloworld.proto", fileDescriptor_helloworld_71e208cbdc16936b) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_helloworld_71e208cbdc16936b = []byte{
 	// 175 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xc8, 0x48, 0xcd, 0xc9,
 	0xc9, 0x2f, 0xcf, 0x2f, 0xca, 0x49, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x42, 0x88,
diff --git a/vendor/google.golang.org/grpc/examples/helloworld/mock_helloworld/hw_mock_test.go b/vendor/google.golang.org/grpc/examples/helloworld/mock_helloworld/hw_mock_test.go
index 5ad9b8b0..39667633 100644
--- a/vendor/google.golang.org/grpc/examples/helloworld/mock_helloworld/hw_mock_test.go
+++ b/vendor/google.golang.org/grpc/examples/helloworld/mock_helloworld/hw_mock_test.go
@@ -21,6 +21,7 @@ package mock_helloworld_test
 import (
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/golang/mock/gomock"
 	"github.com/golang/protobuf/proto"
@@ -59,7 +60,9 @@ func TestSayHello(t *testing.T) {
 }
 
 func testSayHello(t *testing.T, client helloworld.GreeterClient) {
-	r, err := client.SayHello(context.Background(), &helloworld.HelloRequest{Name: "unit_test"})
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	r, err := client.SayHello(ctx, &helloworld.HelloRequest{Name: "unit_test"})
 	if err != nil || r.Message != "Mocked Interface" {
 		t.Errorf("mocking failed")
 	}
diff --git a/vendor/google.golang.org/grpc/examples/oauth/client/main.go b/vendor/google.golang.org/grpc/examples/oauth/client/main.go
new file mode 100644
index 00000000..d167c43e
--- /dev/null
+++ b/vendor/google.golang.org/grpc/examples/oauth/client/main.go
@@ -0,0 +1,72 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// The client demonstrates how to supply an OAuth2 token for every RPC.
+package main
+
+import (
+	"crypto/tls"
+	"log"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/oauth2"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/oauth"
+	pb "google.golang.org/grpc/examples/helloworld/helloworld"
+)
+
+func main() {
+	perRPC := oauth.NewOauthAccess(fetchToken())
+	opts := []grpc.DialOption{
+		// In addition to the following grpc.DialOption, callers may also use
+		// the grpc.CallOption grpc.PerRPCCredentials with the RPC invocation
+		// itself.
+		// See: https://godoc.org/google.golang.org/grpc#PerRPCCredentials
+		grpc.WithPerRPCCredentials(perRPC),
+		// oauth.NewOauthAccess requires the configuration of transport
+		// credentials.
+		grpc.WithTransportCredentials(
+			credentials.NewTLS(&tls.Config{InsecureSkipVerify: true}),
+		),
+	}
+	conn, err := grpc.Dial(":8080", opts...)
+	if err != nil {
+		log.Fatalf("did not connect: %v", err)
+	}
+	defer conn.Close()
+	c := pb.NewGreeterClient(conn)
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	r, err := c.SayHello(ctx, &pb.HelloRequest{Name: "authenticated-client"})
+	if err != nil {
+		log.Fatalf("could not greet: %v", err)
+	}
+	log.Printf("Greeting: %s", r.Message)
+}
+
+// fetchToken simulates a token lookup and omits the details of proper token
+// acquisition. For examples of how to acquire an OAuth2 token, see:
+// https://godoc.org/golang.org/x/oauth2
+func fetchToken() *oauth2.Token {
+	return &oauth2.Token{
+		AccessToken: "some-secret-token",
+	}
+}
diff --git a/vendor/google.golang.org/grpc/examples/oauth/server/main.go b/vendor/google.golang.org/grpc/examples/oauth/server/main.go
new file mode 100644
index 00000000..5135e9dc
--- /dev/null
+++ b/vendor/google.golang.org/grpc/examples/oauth/server/main.go
@@ -0,0 +1,108 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// The server demonstrates how to consume and validate OAuth2 tokens provided by
+// clients for each RPC.
+package main
+
+import (
+	"crypto/tls"
+	"log"
+	"net"
+	"strings"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
+	pb "google.golang.org/grpc/examples/helloworld/helloworld"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+	"google.golang.org/grpc/testdata"
+)
+
+var (
+	errMissingMetadata = status.Errorf(codes.InvalidArgument, "missing metadata")
+	errInvalidToken    = status.Errorf(codes.Unauthenticated, "invalid token")
+)
+
+func main() {
+	log.Println("server starting on port 8080...")
+	cert, err := tls.LoadX509KeyPair(testdata.Path("server1.pem"), testdata.Path("server1.key"))
+	if err != nil {
+		log.Fatalf("failed to load key pair: %s", err)
+	}
+	opts := []grpc.ServerOption{
+		// The following grpc.ServerOption adds an interceptor for all unary
+		// RPCs. To configure an interceptor for streaming RPCs, see:
+		// https://godoc.org/google.golang.org/grpc#StreamInterceptor
+		grpc.UnaryInterceptor(ensureValidToken),
+		// Enable TLS for all incoming connections.
+		grpc.Creds(credentials.NewServerTLSFromCert(&cert)),
+	}
+	s := grpc.NewServer(opts...)
+	pb.RegisterGreeterServer(s, &server{})
+	lis, err := net.Listen("tcp", ":8080")
+	if err != nil {
+		log.Fatalf("failed to listen: %v", err)
+	}
+	if err := s.Serve(lis); err != nil {
+		log.Fatalf("failed to serve: %v", err)
+	}
+}
+
+// server is used to implement helloworld.GreeterServer.
+type server struct{}
+
+// SayHello implements helloworld.GreeterServer
+func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
+	return &pb.HelloReply{Message: "Hello " + in.Name}, nil
+}
+
+// valid validates the authorization.
+func valid(authorization []string) bool {
+	if len(authorization) < 1 {
+		return false
+	}
+	token := strings.TrimPrefix(authorization[0], "Bearer ")
+	// Perform the token validation here. For the sake of this example, the code
+	// here forgoes any of the usual OAuth2 token validation and instead checks
+	// for a token matching an arbitrary string.
+	if token != "some-secret-token" {
+		return false
+	}
+	return true
+}
+
+// ensureValidToken ensures a valid token exists within a request's metadata. If
+// the token is missing or invalid, the interceptor blocks execution of the
+// handler and returns an error. Otherwise, the interceptor invokes the unary
+// handler.
+func ensureValidToken(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		return nil, errMissingMetadata
+	}
+	// The keys within metadata.MD are normalized to lowercase.
+	// See: https://godoc.org/google.golang.org/grpc/metadata#New
+	if !valid(md["authorization"]) {
+		return nil, errInvalidToken
+	}
+	// Continue execution of handler after ensuring a valid token.
+	return handler(ctx, req)
+}
diff --git a/vendor/google.golang.org/grpc/examples/route_guide/client/client.go b/vendor/google.golang.org/grpc/examples/route_guide/client/client.go
index e789fabb..1ad1c179 100644
--- a/vendor/google.golang.org/grpc/examples/route_guide/client/client.go
+++ b/vendor/google.golang.org/grpc/examples/route_guide/client/client.go
@@ -46,7 +46,9 @@ var (
 // printFeature gets the feature for the given point.
 func printFeature(client pb.RouteGuideClient, point *pb.Point) {
 	log.Printf("Getting feature for point (%d, %d)", point.Latitude, point.Longitude)
-	feature, err := client.GetFeature(context.Background(), point)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	feature, err := client.GetFeature(ctx, point)
 	if err != nil {
 		log.Fatalf("%v.GetFeatures(_) = _, %v: ", client, err)
 	}
@@ -56,7 +58,9 @@ func printFeature(client pb.RouteGuideClient, point *pb.Point) {
 // printFeatures lists all the features within the given bounding Rectangle.
 func printFeatures(client pb.RouteGuideClient, rect *pb.Rectangle) {
 	log.Printf("Looking for features within %v", rect)
-	stream, err := client.ListFeatures(context.Background(), rect)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	stream, err := client.ListFeatures(ctx, rect)
 	if err != nil {
 		log.Fatalf("%v.ListFeatures(_) = _, %v", client, err)
 	}
@@ -82,7 +86,9 @@ func runRecordRoute(client pb.RouteGuideClient) {
 		points = append(points, randomPoint(r))
 	}
 	log.Printf("Traversing %d points.", len(points))
-	stream, err := client.RecordRoute(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	stream, err := client.RecordRoute(ctx)
 	if err != nil {
 		log.Fatalf("%v.RecordRoute(_) = _, %v", client, err)
 	}
@@ -108,7 +114,9 @@ func runRouteChat(client pb.RouteGuideClient) {
 		{Location: &pb.Point{Latitude: 0, Longitude: 2}, Message: "Fifth message"},
 		{Location: &pb.Point{Latitude: 0, Longitude: 3}, Message: "Sixth message"},
 	}
-	stream, err := client.RouteChat(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	stream, err := client.RouteChat(ctx)
 	if err != nil {
 		log.Fatalf("%v.RouteChat(_) = _, %v", client, err)
 	}
diff --git a/vendor/google.golang.org/grpc/examples/route_guide/mock_routeguide/rg_mock_test.go b/vendor/google.golang.org/grpc/examples/route_guide/mock_routeguide/rg_mock_test.go
index d084bd6a..8525cd5f 100644
--- a/vendor/google.golang.org/grpc/examples/route_guide/mock_routeguide/rg_mock_test.go
+++ b/vendor/google.golang.org/grpc/examples/route_guide/mock_routeguide/rg_mock_test.go
@@ -21,6 +21,7 @@ package mock_routeguide_test
 import (
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/golang/mock/gomock"
 	"github.com/golang/protobuf/proto"
@@ -59,7 +60,9 @@ func TestRouteChat(t *testing.T) {
 }
 
 func testRouteChat(client rgpb.RouteGuideClient) error {
-	stream, err := client.RouteChat(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	stream, err := client.RouteChat(ctx)
 	if err != nil {
 		return err
 	}
diff --git a/vendor/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go b/vendor/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
index cf7f3937..199a2ee0 100644
--- a/vendor/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
+++ b/vendor/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
@@ -1,19 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: route_guide.proto
 
-/*
-Package routeguide is a generated protocol buffer package.
-
-It is generated from these files:
-	route_guide.proto
-
-It has these top-level messages:
-	Point
-	Rectangle
-	Feature
-	RouteNote
-	RouteSummary
-*/
 package routeguide
 
 import proto "github.com/golang/protobuf/proto"
@@ -41,14 +28,36 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Latitudes should be in the range +/- 90 degrees and longitude should be in
 // the range +/- 180 degrees (inclusive).
 type Point struct {
-	Latitude  int32 `protobuf:"varint,1,opt,name=latitude" json:"latitude,omitempty"`
-	Longitude int32 `protobuf:"varint,2,opt,name=longitude" json:"longitude,omitempty"`
+	Latitude             int32    `protobuf:"varint,1,opt,name=latitude,proto3" json:"latitude,omitempty"`
+	Longitude            int32    `protobuf:"varint,2,opt,name=longitude,proto3" json:"longitude,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Point) Reset()                    { *m = Point{} }
-func (m *Point) String() string            { return proto.CompactTextString(m) }
-func (*Point) ProtoMessage()               {}
-func (*Point) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Point) Reset()         { *m = Point{} }
+func (m *Point) String() string { return proto.CompactTextString(m) }
+func (*Point) ProtoMessage()    {}
+func (*Point) Descriptor() ([]byte, []int) {
+	return fileDescriptor_route_guide_dc79de2de4c66c19, []int{0}
+}
+func (m *Point) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Point.Unmarshal(m, b)
+}
+func (m *Point) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Point.Marshal(b, m, deterministic)
+}
+func (dst *Point) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Point.Merge(dst, src)
+}
+func (m *Point) XXX_Size() int {
+	return xxx_messageInfo_Point.Size(m)
+}
+func (m *Point) XXX_DiscardUnknown() {
+	xxx_messageInfo_Point.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Point proto.InternalMessageInfo
 
 func (m *Point) GetLatitude() int32 {
 	if m != nil {
@@ -68,15 +77,37 @@ func (m *Point) GetLongitude() int32 {
 // points "lo" and "hi".
 type Rectangle struct {
 	// One corner of the rectangle.
-	Lo *Point `protobuf:"bytes,1,opt,name=lo" json:"lo,omitempty"`
+	Lo *Point `protobuf:"bytes,1,opt,name=lo,proto3" json:"lo,omitempty"`
 	// The other corner of the rectangle.
-	Hi *Point `protobuf:"bytes,2,opt,name=hi" json:"hi,omitempty"`
+	Hi                   *Point   `protobuf:"bytes,2,opt,name=hi,proto3" json:"hi,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Rectangle) Reset()                    { *m = Rectangle{} }
-func (m *Rectangle) String() string            { return proto.CompactTextString(m) }
-func (*Rectangle) ProtoMessage()               {}
-func (*Rectangle) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Rectangle) Reset()         { *m = Rectangle{} }
+func (m *Rectangle) String() string { return proto.CompactTextString(m) }
+func (*Rectangle) ProtoMessage()    {}
+func (*Rectangle) Descriptor() ([]byte, []int) {
+	return fileDescriptor_route_guide_dc79de2de4c66c19, []int{1}
+}
+func (m *Rectangle) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Rectangle.Unmarshal(m, b)
+}
+func (m *Rectangle) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Rectangle.Marshal(b, m, deterministic)
+}
+func (dst *Rectangle) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rectangle.Merge(dst, src)
+}
+func (m *Rectangle) XXX_Size() int {
+	return xxx_messageInfo_Rectangle.Size(m)
+}
+func (m *Rectangle) XXX_DiscardUnknown() {
+	xxx_messageInfo_Rectangle.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Rectangle proto.InternalMessageInfo
 
 func (m *Rectangle) GetLo() *Point {
 	if m != nil {
@@ -97,15 +128,37 @@ func (m *Rectangle) GetHi() *Point {
 // If a feature could not be named, the name is empty.
 type Feature struct {
 	// The name of the feature.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The point where the feature is detected.
-	Location *Point `protobuf:"bytes,2,opt,name=location" json:"location,omitempty"`
+	Location             *Point   `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Feature) Reset()         { *m = Feature{} }
+func (m *Feature) String() string { return proto.CompactTextString(m) }
+func (*Feature) ProtoMessage()    {}
+func (*Feature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_route_guide_dc79de2de4c66c19, []int{2}
+}
+func (m *Feature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Feature.Unmarshal(m, b)
+}
+func (m *Feature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Feature.Marshal(b, m, deterministic)
+}
+func (dst *Feature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Feature.Merge(dst, src)
+}
+func (m *Feature) XXX_Size() int {
+	return xxx_messageInfo_Feature.Size(m)
+}
+func (m *Feature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Feature.DiscardUnknown(m)
 }
 
-func (m *Feature) Reset()                    { *m = Feature{} }
-func (m *Feature) String() string            { return proto.CompactTextString(m) }
-func (*Feature) ProtoMessage()               {}
-func (*Feature) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_Feature proto.InternalMessageInfo
 
 func (m *Feature) GetName() string {
 	if m != nil {
@@ -124,15 +177,37 @@ func (m *Feature) GetLocation() *Point {
 // A RouteNote is a message sent while at a given point.
 type RouteNote struct {
 	// The location from which the message is sent.
-	Location *Point `protobuf:"bytes,1,opt,name=location" json:"location,omitempty"`
+	Location *Point `protobuf:"bytes,1,opt,name=location,proto3" json:"location,omitempty"`
 	// The message to be sent.
-	Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Message              string   `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *RouteNote) Reset()         { *m = RouteNote{} }
+func (m *RouteNote) String() string { return proto.CompactTextString(m) }
+func (*RouteNote) ProtoMessage()    {}
+func (*RouteNote) Descriptor() ([]byte, []int) {
+	return fileDescriptor_route_guide_dc79de2de4c66c19, []int{3}
+}
+func (m *RouteNote) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RouteNote.Unmarshal(m, b)
+}
+func (m *RouteNote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RouteNote.Marshal(b, m, deterministic)
+}
+func (dst *RouteNote) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RouteNote.Merge(dst, src)
+}
+func (m *RouteNote) XXX_Size() int {
+	return xxx_messageInfo_RouteNote.Size(m)
+}
+func (m *RouteNote) XXX_DiscardUnknown() {
+	xxx_messageInfo_RouteNote.DiscardUnknown(m)
 }
 
-func (m *RouteNote) Reset()                    { *m = RouteNote{} }
-func (m *RouteNote) String() string            { return proto.CompactTextString(m) }
-func (*RouteNote) ProtoMessage()               {}
-func (*RouteNote) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_RouteNote proto.InternalMessageInfo
 
 func (m *RouteNote) GetLocation() *Point {
 	if m != nil {
@@ -155,19 +230,41 @@ func (m *RouteNote) GetMessage() string {
 // the distance between each point.
 type RouteSummary struct {
 	// The number of points received.
-	PointCount int32 `protobuf:"varint,1,opt,name=point_count,json=pointCount" json:"point_count,omitempty"`
+	PointCount int32 `protobuf:"varint,1,opt,name=point_count,json=pointCount,proto3" json:"point_count,omitempty"`
 	// The number of known features passed while traversing the route.
-	FeatureCount int32 `protobuf:"varint,2,opt,name=feature_count,json=featureCount" json:"feature_count,omitempty"`
+	FeatureCount int32 `protobuf:"varint,2,opt,name=feature_count,json=featureCount,proto3" json:"feature_count,omitempty"`
 	// The distance covered in metres.
-	Distance int32 `protobuf:"varint,3,opt,name=distance" json:"distance,omitempty"`
+	Distance int32 `protobuf:"varint,3,opt,name=distance,proto3" json:"distance,omitempty"`
 	// The duration of the traversal in seconds.
-	ElapsedTime int32 `protobuf:"varint,4,opt,name=elapsed_time,json=elapsedTime" json:"elapsed_time,omitempty"`
+	ElapsedTime          int32    `protobuf:"varint,4,opt,name=elapsed_time,json=elapsedTime,proto3" json:"elapsed_time,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *RouteSummary) Reset()                    { *m = RouteSummary{} }
-func (m *RouteSummary) String() string            { return proto.CompactTextString(m) }
-func (*RouteSummary) ProtoMessage()               {}
-func (*RouteSummary) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *RouteSummary) Reset()         { *m = RouteSummary{} }
+func (m *RouteSummary) String() string { return proto.CompactTextString(m) }
+func (*RouteSummary) ProtoMessage()    {}
+func (*RouteSummary) Descriptor() ([]byte, []int) {
+	return fileDescriptor_route_guide_dc79de2de4c66c19, []int{4}
+}
+func (m *RouteSummary) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RouteSummary.Unmarshal(m, b)
+}
+func (m *RouteSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RouteSummary.Marshal(b, m, deterministic)
+}
+func (dst *RouteSummary) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RouteSummary.Merge(dst, src)
+}
+func (m *RouteSummary) XXX_Size() int {
+	return xxx_messageInfo_RouteSummary.Size(m)
+}
+func (m *RouteSummary) XXX_DiscardUnknown() {
+	xxx_messageInfo_RouteSummary.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RouteSummary proto.InternalMessageInfo
 
 func (m *RouteSummary) GetPointCount() int32 {
 	if m != nil {
@@ -213,8 +310,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for RouteGuide service
-
+// RouteGuideClient is the client API for RouteGuide service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type RouteGuideClient interface {
 	// A simple RPC.
 	//
@@ -252,7 +350,7 @@ func NewRouteGuideClient(cc *grpc.ClientConn) RouteGuideClient {
 
 func (c *routeGuideClient) GetFeature(ctx context.Context, in *Point, opts ...grpc.CallOption) (*Feature, error) {
 	out := new(Feature)
-	err := grpc.Invoke(ctx, "/routeguide.RouteGuide/GetFeature", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/routeguide.RouteGuide/GetFeature", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -260,7 +358,7 @@ func (c *routeGuideClient) GetFeature(ctx context.Context, in *Point, opts ...gr
 }
 
 func (c *routeGuideClient) ListFeatures(ctx context.Context, in *Rectangle, opts ...grpc.CallOption) (RouteGuide_ListFeaturesClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_RouteGuide_serviceDesc.Streams[0], c.cc, "/routeguide.RouteGuide/ListFeatures", opts...)
+	stream, err := c.cc.NewStream(ctx, &_RouteGuide_serviceDesc.Streams[0], "/routeguide.RouteGuide/ListFeatures", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -292,7 +390,7 @@ func (x *routeGuideListFeaturesClient) Recv() (*Feature, error) {
 }
 
 func (c *routeGuideClient) RecordRoute(ctx context.Context, opts ...grpc.CallOption) (RouteGuide_RecordRouteClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_RouteGuide_serviceDesc.Streams[1], c.cc, "/routeguide.RouteGuide/RecordRoute", opts...)
+	stream, err := c.cc.NewStream(ctx, &_RouteGuide_serviceDesc.Streams[1], "/routeguide.RouteGuide/RecordRoute", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -326,7 +424,7 @@ func (x *routeGuideRecordRouteClient) CloseAndRecv() (*RouteSummary, error) {
 }
 
 func (c *routeGuideClient) RouteChat(ctx context.Context, opts ...grpc.CallOption) (RouteGuide_RouteChatClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_RouteGuide_serviceDesc.Streams[2], c.cc, "/routeguide.RouteGuide/RouteChat", opts...)
+	stream, err := c.cc.NewStream(ctx, &_RouteGuide_serviceDesc.Streams[2], "/routeguide.RouteGuide/RouteChat", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -356,8 +454,7 @@ func (x *routeGuideRouteChatClient) Recv() (*RouteNote, error) {
 	return m, nil
 }
 
-// Server API for RouteGuide service
-
+// RouteGuideServer is the server API for RouteGuide service.
 type RouteGuideServer interface {
 	// A simple RPC.
 	//
@@ -510,9 +607,9 @@ var _RouteGuide_serviceDesc = grpc.ServiceDesc{
 	Metadata: "route_guide.proto",
 }
 
-func init() { proto.RegisterFile("route_guide.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("route_guide.proto", fileDescriptor_route_guide_dc79de2de4c66c19) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_route_guide_dc79de2de4c66c19 = []byte{
 	// 404 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xdd, 0xca, 0xd3, 0x40,
 	0x10, 0xfd, 0x36, 0x7e, 0x9f, 0x6d, 0x26, 0x11, 0xe9, 0x88, 0x10, 0xa2, 0xa0, 0x8d, 0x37, 0xbd,
diff --git a/vendor/google.golang.org/grpc/examples/route_guide/server/server.go b/vendor/google.golang.org/grpc/examples/route_guide/server/server.go
index cb452d21..ececfa7e 100644
--- a/vendor/google.golang.org/grpc/examples/route_guide/server/server.go
+++ b/vendor/google.golang.org/grpc/examples/route_guide/server/server.go
@@ -167,22 +167,20 @@ func toRadians(num float64) float64 {
 }
 
 // calcDistance calculates the distance between two points using the "haversine" formula.
-// This code was taken from http://www.movable-type.co.uk/scripts/latlong.html.
+// The formula is based on http://mathforum.org/library/drmath/view/51879.html.
 func calcDistance(p1 *pb.Point, p2 *pb.Point) int32 {
 	const CordFactor float64 = 1e7
-	const R float64 = float64(6371000) // metres
-	lat1 := float64(p1.Latitude) / CordFactor
-	lat2 := float64(p2.Latitude) / CordFactor
-	lng1 := float64(p1.Longitude) / CordFactor
-	lng2 := float64(p2.Longitude) / CordFactor
-	φ1 := toRadians(lat1)
-	φ2 := toRadians(lat2)
-	Δφ := toRadians(lat2 - lat1)
-	Δλ := toRadians(lng2 - lng1)
-
-	a := math.Sin(Δφ/2)*math.Sin(Δφ/2) +
-		math.Cos(φ1)*math.Cos(φ2)*
-			math.Sin(Δλ/2)*math.Sin(Δλ/2)
+	const R float64 = float64(6371000) // earth radius in metres
+	lat1 := toRadians(float64(p1.Latitude) / CordFactor)
+	lat2 := toRadians(float64(p2.Latitude) / CordFactor)
+	lng1 := toRadians(float64(p1.Longitude) / CordFactor)
+	lng2 := toRadians(float64(p2.Longitude) / CordFactor)
+	dlat := lat2 - lat1
+	dlng := lng2 - lng1
+
+	a := math.Sin(dlat/2)*math.Sin(dlat/2) +
+		math.Cos(lat1)*math.Cos(lat2)*
+			math.Sin(dlng/2)*math.Sin(dlng/2)
 	c := 2 * math.Atan2(math.Sqrt(a), math.Sqrt(1-a))
 
 	distance := R * c
diff --git a/vendor/google.golang.org/grpc/examples/rpc_errors/client/main.go b/vendor/google.golang.org/grpc/examples/rpc_errors/client/main.go
new file mode 100644
index 00000000..b50fa8ce
--- /dev/null
+++ b/vendor/google.golang.org/grpc/examples/rpc_errors/client/main.go
@@ -0,0 +1,62 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package main
+
+import (
+	"log"
+	"os"
+	"time"
+
+	"golang.org/x/net/context"
+	epb "google.golang.org/genproto/googleapis/rpc/errdetails"
+	"google.golang.org/grpc"
+	pb "google.golang.org/grpc/examples/helloworld/helloworld"
+	"google.golang.org/grpc/status"
+)
+
+func main() {
+	// Set up a connection to the server.
+	conn, err := grpc.Dial("localhost:50051", grpc.WithInsecure())
+	if err != nil {
+		log.Fatalf("did not connect: %v", err)
+	}
+	defer func() {
+		if e := conn.Close(); e != nil {
+			log.Printf("failed to close connection: %s", e)
+		}
+	}()
+	c := pb.NewGreeterClient(conn)
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	r, err := c.SayHello(ctx, &pb.HelloRequest{Name: "world"})
+	if err != nil {
+		s := status.Convert(err)
+		for _, d := range s.Details() {
+			switch info := d.(type) {
+			case *epb.QuotaFailure:
+				log.Printf("Quota failure: %s", info)
+			default:
+				log.Printf("Unexpected type: %s", info)
+			}
+		}
+		os.Exit(1)
+	}
+	log.Printf("Greeting: %s", r.Message)
+}
diff --git a/vendor/google.golang.org/grpc/examples/rpc_errors/server/main.go b/vendor/google.golang.org/grpc/examples/rpc_errors/server/main.go
new file mode 100644
index 00000000..ced95d3e
--- /dev/null
+++ b/vendor/google.golang.org/grpc/examples/rpc_errors/server/main.go
@@ -0,0 +1,80 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"net"
+	"sync"
+
+	"golang.org/x/net/context"
+	epb "google.golang.org/genproto/googleapis/rpc/errdetails"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	pb "google.golang.org/grpc/examples/helloworld/helloworld"
+	"google.golang.org/grpc/status"
+)
+
+const (
+	port = ":50051"
+)
+
+// server is used to implement helloworld.GreeterServer.
+type server struct {
+	mu    sync.Mutex
+	count map[string]int
+}
+
+// SayHello implements helloworld.GreeterServer
+func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	// Track the number of times the user has been greeted.
+	s.count[in.Name]++
+	if s.count[in.Name] > 1 {
+		st := status.New(codes.ResourceExhausted, "Request limit exceeded.")
+		ds, err := st.WithDetails(
+			&epb.QuotaFailure{
+				Violations: []*epb.QuotaFailure_Violation{{
+					Subject:     fmt.Sprintf("name:%s", in.Name),
+					Description: "Limit one greeting per person",
+				}},
+			},
+		)
+		if err != nil {
+			return nil, st.Err()
+		}
+		return nil, ds.Err()
+	}
+	return &pb.HelloReply{Message: "Hello " + in.Name}, nil
+}
+
+func main() {
+	log.Printf("server starting on port %s...", port)
+	lis, err := net.Listen("tcp", port)
+	if err != nil {
+		log.Fatalf("failed to listen: %v", err)
+	}
+	s := grpc.NewServer()
+	pb.RegisterGreeterServer(s, &server{count: make(map[string]int)})
+	if err := s.Serve(lis); err != nil {
+		log.Fatalf("failed to serve: %v", err)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/go16.go b/vendor/google.golang.org/grpc/go16.go
index 0ae4dbda..b1db21af 100644
--- a/vendor/google.golang.org/grpc/go16.go
+++ b/vendor/google.golang.org/grpc/go16.go
@@ -25,12 +25,11 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"os"
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/transport"
 )
 
 // dialContext connects to the address on the named network.
@@ -51,12 +50,13 @@ func toRPCErr(err error) error {
 	if err == nil || err == io.EOF {
 		return err
 	}
+	if err == io.ErrUnexpectedEOF {
+		return status.Error(codes.Internal, err.Error())
+	}
 	if _, ok := status.FromError(err); ok {
 		return err
 	}
 	switch e := err.(type) {
-	case transport.StreamError:
-		return status.Error(e.Code, e.Desc)
 	case transport.ConnectionError:
 		return status.Error(codes.Unavailable, e.Desc)
 	default:
@@ -69,31 +69,3 @@ func toRPCErr(err error) error {
 	}
 	return status.Error(codes.Unknown, err.Error())
 }
-
-// convertCode converts a standard Go error into its canonical code. Note that
-// this is only used to translate the error returned by the server applications.
-func convertCode(err error) codes.Code {
-	switch err {
-	case nil:
-		return codes.OK
-	case io.EOF:
-		return codes.OutOfRange
-	case io.ErrClosedPipe, io.ErrNoProgress, io.ErrShortBuffer, io.ErrShortWrite, io.ErrUnexpectedEOF:
-		return codes.FailedPrecondition
-	case os.ErrInvalid:
-		return codes.InvalidArgument
-	case context.Canceled:
-		return codes.Canceled
-	case context.DeadlineExceeded:
-		return codes.DeadlineExceeded
-	}
-	switch {
-	case os.IsExist(err):
-		return codes.AlreadyExists
-	case os.IsNotExist(err):
-		return codes.NotFound
-	case os.IsPermission(err):
-		return codes.PermissionDenied
-	}
-	return codes.Unknown
-}
diff --git a/vendor/google.golang.org/grpc/go17.go b/vendor/google.golang.org/grpc/go17.go
index 53908828..71a72e8f 100644
--- a/vendor/google.golang.org/grpc/go17.go
+++ b/vendor/google.golang.org/grpc/go17.go
@@ -26,12 +26,11 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"os"
 
 	netctx "golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/transport"
 )
 
 // dialContext connects to the address on the named network.
@@ -52,12 +51,13 @@ func toRPCErr(err error) error {
 	if err == nil || err == io.EOF {
 		return err
 	}
+	if err == io.ErrUnexpectedEOF {
+		return status.Error(codes.Internal, err.Error())
+	}
 	if _, ok := status.FromError(err); ok {
 		return err
 	}
 	switch e := err.(type) {
-	case transport.StreamError:
-		return status.Error(e.Code, e.Desc)
 	case transport.ConnectionError:
 		return status.Error(codes.Unavailable, e.Desc)
 	default:
@@ -70,31 +70,3 @@ func toRPCErr(err error) error {
 	}
 	return status.Error(codes.Unknown, err.Error())
 }
-
-// convertCode converts a standard Go error into its canonical code. Note that
-// this is only used to translate the error returned by the server applications.
-func convertCode(err error) codes.Code {
-	switch err {
-	case nil:
-		return codes.OK
-	case io.EOF:
-		return codes.OutOfRange
-	case io.ErrClosedPipe, io.ErrNoProgress, io.ErrShortBuffer, io.ErrShortWrite, io.ErrUnexpectedEOF:
-		return codes.FailedPrecondition
-	case os.ErrInvalid:
-		return codes.InvalidArgument
-	case context.Canceled, netctx.Canceled:
-		return codes.Canceled
-	case context.DeadlineExceeded, netctx.DeadlineExceeded:
-		return codes.DeadlineExceeded
-	}
-	switch {
-	case os.IsExist(err):
-		return codes.AlreadyExists
-	case os.IsNotExist(err):
-		return codes.NotFound
-	case os.IsPermission(err):
-		return codes.PermissionDenied
-	}
-	return codes.Unknown
-}
diff --git a/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.pb.go b/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.pb.go
deleted file mode 100644
index f4a27125..00000000
--- a/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.pb.go
+++ /dev/null
@@ -1,615 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: grpc_lb_v1/messages/messages.proto
-
-/*
-Package messages is a generated protocol buffer package.
-
-It is generated from these files:
-	grpc_lb_v1/messages/messages.proto
-
-It has these top-level messages:
-	Duration
-	Timestamp
-	LoadBalanceRequest
-	InitialLoadBalanceRequest
-	ClientStats
-	LoadBalanceResponse
-	InitialLoadBalanceResponse
-	ServerList
-	Server
-*/
-package messages
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-type Duration struct {
-	// Signed seconds of the span of time. Must be from -315,576,000,000
-	// to +315,576,000,000 inclusive.
-	Seconds int64 `protobuf:"varint,1,opt,name=seconds" json:"seconds,omitempty"`
-	// Signed fractions of a second at nanosecond resolution of the span
-	// of time. Durations less than one second are represented with a 0
-	// `seconds` field and a positive or negative `nanos` field. For durations
-	// of one second or more, a non-zero value for the `nanos` field must be
-	// of the same sign as the `seconds` field. Must be from -999,999,999
-	// to +999,999,999 inclusive.
-	Nanos int32 `protobuf:"varint,2,opt,name=nanos" json:"nanos,omitempty"`
-}
-
-func (m *Duration) Reset()                    { *m = Duration{} }
-func (m *Duration) String() string            { return proto.CompactTextString(m) }
-func (*Duration) ProtoMessage()               {}
-func (*Duration) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Duration) GetSeconds() int64 {
-	if m != nil {
-		return m.Seconds
-	}
-	return 0
-}
-
-func (m *Duration) GetNanos() int32 {
-	if m != nil {
-		return m.Nanos
-	}
-	return 0
-}
-
-type Timestamp struct {
-	// Represents seconds of UTC time since Unix epoch
-	// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-	// 9999-12-31T23:59:59Z inclusive.
-	Seconds int64 `protobuf:"varint,1,opt,name=seconds" json:"seconds,omitempty"`
-	// Non-negative fractions of a second at nanosecond resolution. Negative
-	// second values with fractions must still have non-negative nanos values
-	// that count forward in time. Must be from 0 to 999,999,999
-	// inclusive.
-	Nanos int32 `protobuf:"varint,2,opt,name=nanos" json:"nanos,omitempty"`
-}
-
-func (m *Timestamp) Reset()                    { *m = Timestamp{} }
-func (m *Timestamp) String() string            { return proto.CompactTextString(m) }
-func (*Timestamp) ProtoMessage()               {}
-func (*Timestamp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *Timestamp) GetSeconds() int64 {
-	if m != nil {
-		return m.Seconds
-	}
-	return 0
-}
-
-func (m *Timestamp) GetNanos() int32 {
-	if m != nil {
-		return m.Nanos
-	}
-	return 0
-}
-
-type LoadBalanceRequest struct {
-	// Types that are valid to be assigned to LoadBalanceRequestType:
-	//	*LoadBalanceRequest_InitialRequest
-	//	*LoadBalanceRequest_ClientStats
-	LoadBalanceRequestType isLoadBalanceRequest_LoadBalanceRequestType `protobuf_oneof:"load_balance_request_type"`
-}
-
-func (m *LoadBalanceRequest) Reset()                    { *m = LoadBalanceRequest{} }
-func (m *LoadBalanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*LoadBalanceRequest) ProtoMessage()               {}
-func (*LoadBalanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-type isLoadBalanceRequest_LoadBalanceRequestType interface {
-	isLoadBalanceRequest_LoadBalanceRequestType()
-}
-
-type LoadBalanceRequest_InitialRequest struct {
-	InitialRequest *InitialLoadBalanceRequest `protobuf:"bytes,1,opt,name=initial_request,json=initialRequest,oneof"`
-}
-type LoadBalanceRequest_ClientStats struct {
-	ClientStats *ClientStats `protobuf:"bytes,2,opt,name=client_stats,json=clientStats,oneof"`
-}
-
-func (*LoadBalanceRequest_InitialRequest) isLoadBalanceRequest_LoadBalanceRequestType() {}
-func (*LoadBalanceRequest_ClientStats) isLoadBalanceRequest_LoadBalanceRequestType()    {}
-
-func (m *LoadBalanceRequest) GetLoadBalanceRequestType() isLoadBalanceRequest_LoadBalanceRequestType {
-	if m != nil {
-		return m.LoadBalanceRequestType
-	}
-	return nil
-}
-
-func (m *LoadBalanceRequest) GetInitialRequest() *InitialLoadBalanceRequest {
-	if x, ok := m.GetLoadBalanceRequestType().(*LoadBalanceRequest_InitialRequest); ok {
-		return x.InitialRequest
-	}
-	return nil
-}
-
-func (m *LoadBalanceRequest) GetClientStats() *ClientStats {
-	if x, ok := m.GetLoadBalanceRequestType().(*LoadBalanceRequest_ClientStats); ok {
-		return x.ClientStats
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LoadBalanceRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LoadBalanceRequest_OneofMarshaler, _LoadBalanceRequest_OneofUnmarshaler, _LoadBalanceRequest_OneofSizer, []interface{}{
-		(*LoadBalanceRequest_InitialRequest)(nil),
-		(*LoadBalanceRequest_ClientStats)(nil),
-	}
-}
-
-func _LoadBalanceRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LoadBalanceRequest)
-	// load_balance_request_type
-	switch x := m.LoadBalanceRequestType.(type) {
-	case *LoadBalanceRequest_InitialRequest:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InitialRequest); err != nil {
-			return err
-		}
-	case *LoadBalanceRequest_ClientStats:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ClientStats); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LoadBalanceRequest.LoadBalanceRequestType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LoadBalanceRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LoadBalanceRequest)
-	switch tag {
-	case 1: // load_balance_request_type.initial_request
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InitialLoadBalanceRequest)
-		err := b.DecodeMessage(msg)
-		m.LoadBalanceRequestType = &LoadBalanceRequest_InitialRequest{msg}
-		return true, err
-	case 2: // load_balance_request_type.client_stats
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ClientStats)
-		err := b.DecodeMessage(msg)
-		m.LoadBalanceRequestType = &LoadBalanceRequest_ClientStats{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LoadBalanceRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LoadBalanceRequest)
-	// load_balance_request_type
-	switch x := m.LoadBalanceRequestType.(type) {
-	case *LoadBalanceRequest_InitialRequest:
-		s := proto.Size(x.InitialRequest)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LoadBalanceRequest_ClientStats:
-		s := proto.Size(x.ClientStats)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type InitialLoadBalanceRequest struct {
-	// Name of load balanced service (IE, balancer.service.com)
-	// length should be less than 256 bytes.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *InitialLoadBalanceRequest) Reset()                    { *m = InitialLoadBalanceRequest{} }
-func (m *InitialLoadBalanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*InitialLoadBalanceRequest) ProtoMessage()               {}
-func (*InitialLoadBalanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *InitialLoadBalanceRequest) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-// Contains client level statistics that are useful to load balancing. Each
-// count except the timestamp should be reset to zero after reporting the stats.
-type ClientStats struct {
-	// The timestamp of generating the report.
-	Timestamp *Timestamp `protobuf:"bytes,1,opt,name=timestamp" json:"timestamp,omitempty"`
-	// The total number of RPCs that started.
-	NumCallsStarted int64 `protobuf:"varint,2,opt,name=num_calls_started,json=numCallsStarted" json:"num_calls_started,omitempty"`
-	// The total number of RPCs that finished.
-	NumCallsFinished int64 `protobuf:"varint,3,opt,name=num_calls_finished,json=numCallsFinished" json:"num_calls_finished,omitempty"`
-	// The total number of RPCs that were dropped by the client because of rate
-	// limiting.
-	NumCallsFinishedWithDropForRateLimiting int64 `protobuf:"varint,4,opt,name=num_calls_finished_with_drop_for_rate_limiting,json=numCallsFinishedWithDropForRateLimiting" json:"num_calls_finished_with_drop_for_rate_limiting,omitempty"`
-	// The total number of RPCs that were dropped by the client because of load
-	// balancing.
-	NumCallsFinishedWithDropForLoadBalancing int64 `protobuf:"varint,5,opt,name=num_calls_finished_with_drop_for_load_balancing,json=numCallsFinishedWithDropForLoadBalancing" json:"num_calls_finished_with_drop_for_load_balancing,omitempty"`
-	// The total number of RPCs that failed to reach a server except dropped RPCs.
-	NumCallsFinishedWithClientFailedToSend int64 `protobuf:"varint,6,opt,name=num_calls_finished_with_client_failed_to_send,json=numCallsFinishedWithClientFailedToSend" json:"num_calls_finished_with_client_failed_to_send,omitempty"`
-	// The total number of RPCs that finished and are known to have been received
-	// by a server.
-	NumCallsFinishedKnownReceived int64 `protobuf:"varint,7,opt,name=num_calls_finished_known_received,json=numCallsFinishedKnownReceived" json:"num_calls_finished_known_received,omitempty"`
-}
-
-func (m *ClientStats) Reset()                    { *m = ClientStats{} }
-func (m *ClientStats) String() string            { return proto.CompactTextString(m) }
-func (*ClientStats) ProtoMessage()               {}
-func (*ClientStats) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *ClientStats) GetTimestamp() *Timestamp {
-	if m != nil {
-		return m.Timestamp
-	}
-	return nil
-}
-
-func (m *ClientStats) GetNumCallsStarted() int64 {
-	if m != nil {
-		return m.NumCallsStarted
-	}
-	return 0
-}
-
-func (m *ClientStats) GetNumCallsFinished() int64 {
-	if m != nil {
-		return m.NumCallsFinished
-	}
-	return 0
-}
-
-func (m *ClientStats) GetNumCallsFinishedWithDropForRateLimiting() int64 {
-	if m != nil {
-		return m.NumCallsFinishedWithDropForRateLimiting
-	}
-	return 0
-}
-
-func (m *ClientStats) GetNumCallsFinishedWithDropForLoadBalancing() int64 {
-	if m != nil {
-		return m.NumCallsFinishedWithDropForLoadBalancing
-	}
-	return 0
-}
-
-func (m *ClientStats) GetNumCallsFinishedWithClientFailedToSend() int64 {
-	if m != nil {
-		return m.NumCallsFinishedWithClientFailedToSend
-	}
-	return 0
-}
-
-func (m *ClientStats) GetNumCallsFinishedKnownReceived() int64 {
-	if m != nil {
-		return m.NumCallsFinishedKnownReceived
-	}
-	return 0
-}
-
-type LoadBalanceResponse struct {
-	// Types that are valid to be assigned to LoadBalanceResponseType:
-	//	*LoadBalanceResponse_InitialResponse
-	//	*LoadBalanceResponse_ServerList
-	LoadBalanceResponseType isLoadBalanceResponse_LoadBalanceResponseType `protobuf_oneof:"load_balance_response_type"`
-}
-
-func (m *LoadBalanceResponse) Reset()                    { *m = LoadBalanceResponse{} }
-func (m *LoadBalanceResponse) String() string            { return proto.CompactTextString(m) }
-func (*LoadBalanceResponse) ProtoMessage()               {}
-func (*LoadBalanceResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-type isLoadBalanceResponse_LoadBalanceResponseType interface {
-	isLoadBalanceResponse_LoadBalanceResponseType()
-}
-
-type LoadBalanceResponse_InitialResponse struct {
-	InitialResponse *InitialLoadBalanceResponse `protobuf:"bytes,1,opt,name=initial_response,json=initialResponse,oneof"`
-}
-type LoadBalanceResponse_ServerList struct {
-	ServerList *ServerList `protobuf:"bytes,2,opt,name=server_list,json=serverList,oneof"`
-}
-
-func (*LoadBalanceResponse_InitialResponse) isLoadBalanceResponse_LoadBalanceResponseType() {}
-func (*LoadBalanceResponse_ServerList) isLoadBalanceResponse_LoadBalanceResponseType()      {}
-
-func (m *LoadBalanceResponse) GetLoadBalanceResponseType() isLoadBalanceResponse_LoadBalanceResponseType {
-	if m != nil {
-		return m.LoadBalanceResponseType
-	}
-	return nil
-}
-
-func (m *LoadBalanceResponse) GetInitialResponse() *InitialLoadBalanceResponse {
-	if x, ok := m.GetLoadBalanceResponseType().(*LoadBalanceResponse_InitialResponse); ok {
-		return x.InitialResponse
-	}
-	return nil
-}
-
-func (m *LoadBalanceResponse) GetServerList() *ServerList {
-	if x, ok := m.GetLoadBalanceResponseType().(*LoadBalanceResponse_ServerList); ok {
-		return x.ServerList
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*LoadBalanceResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _LoadBalanceResponse_OneofMarshaler, _LoadBalanceResponse_OneofUnmarshaler, _LoadBalanceResponse_OneofSizer, []interface{}{
-		(*LoadBalanceResponse_InitialResponse)(nil),
-		(*LoadBalanceResponse_ServerList)(nil),
-	}
-}
-
-func _LoadBalanceResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*LoadBalanceResponse)
-	// load_balance_response_type
-	switch x := m.LoadBalanceResponseType.(type) {
-	case *LoadBalanceResponse_InitialResponse:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.InitialResponse); err != nil {
-			return err
-		}
-	case *LoadBalanceResponse_ServerList:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ServerList); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("LoadBalanceResponse.LoadBalanceResponseType has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _LoadBalanceResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*LoadBalanceResponse)
-	switch tag {
-	case 1: // load_balance_response_type.initial_response
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(InitialLoadBalanceResponse)
-		err := b.DecodeMessage(msg)
-		m.LoadBalanceResponseType = &LoadBalanceResponse_InitialResponse{msg}
-		return true, err
-	case 2: // load_balance_response_type.server_list
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ServerList)
-		err := b.DecodeMessage(msg)
-		m.LoadBalanceResponseType = &LoadBalanceResponse_ServerList{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _LoadBalanceResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*LoadBalanceResponse)
-	// load_balance_response_type
-	switch x := m.LoadBalanceResponseType.(type) {
-	case *LoadBalanceResponse_InitialResponse:
-		s := proto.Size(x.InitialResponse)
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *LoadBalanceResponse_ServerList:
-		s := proto.Size(x.ServerList)
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type InitialLoadBalanceResponse struct {
-	// This is an application layer redirect that indicates the client should use
-	// the specified server for load balancing. When this field is non-empty in
-	// the response, the client should open a separate connection to the
-	// load_balancer_delegate and call the BalanceLoad method. Its length should
-	// be less than 64 bytes.
-	LoadBalancerDelegate string `protobuf:"bytes,1,opt,name=load_balancer_delegate,json=loadBalancerDelegate" json:"load_balancer_delegate,omitempty"`
-	// This interval defines how often the client should send the client stats
-	// to the load balancer. Stats should only be reported when the duration is
-	// positive.
-	ClientStatsReportInterval *Duration `protobuf:"bytes,2,opt,name=client_stats_report_interval,json=clientStatsReportInterval" json:"client_stats_report_interval,omitempty"`
-}
-
-func (m *InitialLoadBalanceResponse) Reset()                    { *m = InitialLoadBalanceResponse{} }
-func (m *InitialLoadBalanceResponse) String() string            { return proto.CompactTextString(m) }
-func (*InitialLoadBalanceResponse) ProtoMessage()               {}
-func (*InitialLoadBalanceResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *InitialLoadBalanceResponse) GetLoadBalancerDelegate() string {
-	if m != nil {
-		return m.LoadBalancerDelegate
-	}
-	return ""
-}
-
-func (m *InitialLoadBalanceResponse) GetClientStatsReportInterval() *Duration {
-	if m != nil {
-		return m.ClientStatsReportInterval
-	}
-	return nil
-}
-
-type ServerList struct {
-	// Contains a list of servers selected by the load balancer. The list will
-	// be updated when server resolutions change or as needed to balance load
-	// across more servers. The client should consume the server list in order
-	// unless instructed otherwise via the client_config.
-	Servers []*Server `protobuf:"bytes,1,rep,name=servers" json:"servers,omitempty"`
-}
-
-func (m *ServerList) Reset()                    { *m = ServerList{} }
-func (m *ServerList) String() string            { return proto.CompactTextString(m) }
-func (*ServerList) ProtoMessage()               {}
-func (*ServerList) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *ServerList) GetServers() []*Server {
-	if m != nil {
-		return m.Servers
-	}
-	return nil
-}
-
-// Contains server information. When none of the [drop_for_*] fields are true,
-// use the other fields. When drop_for_rate_limiting is true, ignore all other
-// fields. Use drop_for_load_balancing only when it is true and
-// drop_for_rate_limiting is false.
-type Server struct {
-	// A resolved address for the server, serialized in network-byte-order. It may
-	// either be an IPv4 or IPv6 address.
-	IpAddress []byte `protobuf:"bytes,1,opt,name=ip_address,json=ipAddress,proto3" json:"ip_address,omitempty"`
-	// A resolved port number for the server.
-	Port int32 `protobuf:"varint,2,opt,name=port" json:"port,omitempty"`
-	// An opaque but printable token given to the frontend for each pick. All
-	// frontend requests for that pick must include the token in its initial
-	// metadata. The token is used by the backend to verify the request and to
-	// allow the backend to report load to the gRPC LB system.
-	//
-	// Its length is variable but less than 50 bytes.
-	LoadBalanceToken string `protobuf:"bytes,3,opt,name=load_balance_token,json=loadBalanceToken" json:"load_balance_token,omitempty"`
-	// Indicates whether this particular request should be dropped by the client
-	// for rate limiting.
-	DropForRateLimiting bool `protobuf:"varint,4,opt,name=drop_for_rate_limiting,json=dropForRateLimiting" json:"drop_for_rate_limiting,omitempty"`
-	// Indicates whether this particular request should be dropped by the client
-	// for load balancing.
-	DropForLoadBalancing bool `protobuf:"varint,5,opt,name=drop_for_load_balancing,json=dropForLoadBalancing" json:"drop_for_load_balancing,omitempty"`
-}
-
-func (m *Server) Reset()                    { *m = Server{} }
-func (m *Server) String() string            { return proto.CompactTextString(m) }
-func (*Server) ProtoMessage()               {}
-func (*Server) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *Server) GetIpAddress() []byte {
-	if m != nil {
-		return m.IpAddress
-	}
-	return nil
-}
-
-func (m *Server) GetPort() int32 {
-	if m != nil {
-		return m.Port
-	}
-	return 0
-}
-
-func (m *Server) GetLoadBalanceToken() string {
-	if m != nil {
-		return m.LoadBalanceToken
-	}
-	return ""
-}
-
-func (m *Server) GetDropForRateLimiting() bool {
-	if m != nil {
-		return m.DropForRateLimiting
-	}
-	return false
-}
-
-func (m *Server) GetDropForLoadBalancing() bool {
-	if m != nil {
-		return m.DropForLoadBalancing
-	}
-	return false
-}
-
-func init() {
-	proto.RegisterType((*Duration)(nil), "grpc.lb.v1.Duration")
-	proto.RegisterType((*Timestamp)(nil), "grpc.lb.v1.Timestamp")
-	proto.RegisterType((*LoadBalanceRequest)(nil), "grpc.lb.v1.LoadBalanceRequest")
-	proto.RegisterType((*InitialLoadBalanceRequest)(nil), "grpc.lb.v1.InitialLoadBalanceRequest")
-	proto.RegisterType((*ClientStats)(nil), "grpc.lb.v1.ClientStats")
-	proto.RegisterType((*LoadBalanceResponse)(nil), "grpc.lb.v1.LoadBalanceResponse")
-	proto.RegisterType((*InitialLoadBalanceResponse)(nil), "grpc.lb.v1.InitialLoadBalanceResponse")
-	proto.RegisterType((*ServerList)(nil), "grpc.lb.v1.ServerList")
-	proto.RegisterType((*Server)(nil), "grpc.lb.v1.Server")
-}
-
-func init() { proto.RegisterFile("grpc_lb_v1/messages/messages.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 709 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x4e, 0x1b, 0x3b,
-	0x10, 0x26, 0x27, 0x01, 0x92, 0x09, 0x3a, 0xe4, 0x98, 0x1c, 0x08, 0x14, 0x24, 0xba, 0x52, 0x69,
-	0x54, 0xd1, 0x20, 0xa0, 0xbd, 0xe8, 0xcf, 0x45, 0x1b, 0x10, 0x0a, 0x2d, 0x17, 0x95, 0x43, 0x55,
-	0xa9, 0x52, 0x65, 0x39, 0xd9, 0x21, 0x58, 0x6c, 0xec, 0xad, 0xed, 0x04, 0xf5, 0x11, 0xfa, 0x28,
-	0x7d, 0x8c, 0xaa, 0xcf, 0xd0, 0xf7, 0xa9, 0xd6, 0xbb, 0x9b, 0x5d, 0x20, 0x80, 0x7a, 0x67, 0x8f,
-	0xbf, 0xf9, 0xbe, 0xf1, 0xac, 0xbf, 0x59, 0xf0, 0x06, 0x3a, 0xec, 0xb3, 0xa0, 0xc7, 0xc6, 0xbb,
-	0x3b, 0x43, 0x34, 0x86, 0x0f, 0xd0, 0x4c, 0x16, 0xad, 0x50, 0x2b, 0xab, 0x08, 0x44, 0x98, 0x56,
-	0xd0, 0x6b, 0x8d, 0x77, 0xbd, 0x97, 0x50, 0x3e, 0x1c, 0x69, 0x6e, 0x85, 0x92, 0xa4, 0x01, 0xf3,
-	0x06, 0xfb, 0x4a, 0xfa, 0xa6, 0x51, 0xd8, 0x2c, 0x34, 0x8b, 0x34, 0xdd, 0x92, 0x3a, 0xcc, 0x4a,
-	0x2e, 0x95, 0x69, 0xfc, 0xb3, 0x59, 0x68, 0xce, 0xd2, 0x78, 0xe3, 0xbd, 0x82, 0xca, 0xa9, 0x18,
-	0xa2, 0xb1, 0x7c, 0x18, 0xfe, 0x75, 0xf2, 0xcf, 0x02, 0x90, 0x13, 0xc5, 0xfd, 0x36, 0x0f, 0xb8,
-	0xec, 0x23, 0xc5, 0xaf, 0x23, 0x34, 0x96, 0x7c, 0x80, 0x45, 0x21, 0x85, 0x15, 0x3c, 0x60, 0x3a,
-	0x0e, 0x39, 0xba, 0xea, 0xde, 0xa3, 0x56, 0x56, 0x75, 0xeb, 0x38, 0x86, 0xdc, 0xcc, 0xef, 0xcc,
-	0xd0, 0x7f, 0x93, 0xfc, 0x94, 0xf1, 0x35, 0x2c, 0xf4, 0x03, 0x81, 0xd2, 0x32, 0x63, 0xb9, 0x8d,
-	0xab, 0xa8, 0xee, 0xad, 0xe4, 0xe9, 0x0e, 0xdc, 0x79, 0x37, 0x3a, 0xee, 0xcc, 0xd0, 0x6a, 0x3f,
-	0xdb, 0xb6, 0x1f, 0xc0, 0x6a, 0xa0, 0xb8, 0xcf, 0x7a, 0xb1, 0x4c, 0x5a, 0x14, 0xb3, 0xdf, 0x42,
-	0xf4, 0x76, 0x60, 0xf5, 0xd6, 0x4a, 0x08, 0x81, 0x92, 0xe4, 0x43, 0x74, 0xe5, 0x57, 0xa8, 0x5b,
-	0x7b, 0xdf, 0x4b, 0x50, 0xcd, 0x89, 0x91, 0x7d, 0xa8, 0xd8, 0xb4, 0x83, 0xc9, 0x3d, 0xff, 0xcf,
-	0x17, 0x36, 0x69, 0x2f, 0xcd, 0x70, 0xe4, 0x09, 0xfc, 0x27, 0x47, 0x43, 0xd6, 0xe7, 0x41, 0x60,
-	0xa2, 0x3b, 0x69, 0x8b, 0xbe, 0xbb, 0x55, 0x91, 0x2e, 0xca, 0xd1, 0xf0, 0x20, 0x8a, 0x77, 0xe3,
-	0x30, 0xd9, 0x06, 0x92, 0x61, 0xcf, 0x84, 0x14, 0xe6, 0x1c, 0xfd, 0x46, 0xd1, 0x81, 0x6b, 0x29,
-	0xf8, 0x28, 0x89, 0x13, 0x06, 0xad, 0x9b, 0x68, 0x76, 0x29, 0xec, 0x39, 0xf3, 0xb5, 0x0a, 0xd9,
-	0x99, 0xd2, 0x4c, 0x73, 0x8b, 0x2c, 0x10, 0x43, 0x61, 0x85, 0x1c, 0x34, 0x4a, 0x8e, 0xe9, 0xf1,
-	0x75, 0xa6, 0x4f, 0xc2, 0x9e, 0x1f, 0x6a, 0x15, 0x1e, 0x29, 0x4d, 0xb9, 0xc5, 0x93, 0x04, 0x4e,
-	0x38, 0xec, 0xdc, 0x2b, 0x90, 0x6b, 0x77, 0xa4, 0x30, 0xeb, 0x14, 0x9a, 0x77, 0x28, 0x64, 0xbd,
-	0x8f, 0x24, 0xbe, 0xc0, 0xd3, 0xdb, 0x24, 0x92, 0x67, 0x70, 0xc6, 0x45, 0x80, 0x3e, 0xb3, 0x8a,
-	0x19, 0x94, 0x7e, 0x63, 0xce, 0x09, 0x6c, 0x4d, 0x13, 0x88, 0x3f, 0xd5, 0x91, 0xc3, 0x9f, 0xaa,
-	0x2e, 0x4a, 0x9f, 0x74, 0xe0, 0xe1, 0x14, 0xfa, 0x0b, 0xa9, 0x2e, 0x25, 0xd3, 0xd8, 0x47, 0x31,
-	0x46, 0xbf, 0x31, 0xef, 0x28, 0x37, 0xae, 0x53, 0xbe, 0x8f, 0x50, 0x34, 0x01, 0x79, 0xbf, 0x0a,
-	0xb0, 0x74, 0xe5, 0xd9, 0x98, 0x50, 0x49, 0x83, 0xa4, 0x0b, 0xb5, 0xcc, 0x01, 0x71, 0x2c, 0x79,
-	0x1a, 0x5b, 0xf7, 0x59, 0x20, 0x46, 0x77, 0x66, 0xe8, 0xe2, 0xc4, 0x03, 0x09, 0xe9, 0x0b, 0xa8,
-	0x1a, 0xd4, 0x63, 0xd4, 0x2c, 0x10, 0xc6, 0x26, 0x1e, 0x58, 0xce, 0xf3, 0x75, 0xdd, 0xf1, 0x89,
-	0x70, 0x1e, 0x02, 0x33, 0xd9, 0xb5, 0xd7, 0x61, 0xed, 0x9a, 0x03, 0x62, 0xce, 0xd8, 0x02, 0x3f,
-	0x0a, 0xb0, 0x76, 0x7b, 0x29, 0xe4, 0x19, 0x2c, 0xe7, 0x93, 0x35, 0xf3, 0x31, 0xc0, 0x01, 0xb7,
-	0xa9, 0x2d, 0xea, 0x41, 0x96, 0xa4, 0x0f, 0x93, 0x33, 0xf2, 0x11, 0xd6, 0xf3, 0x96, 0x65, 0x1a,
-	0x43, 0xa5, 0x2d, 0x13, 0xd2, 0xa2, 0x1e, 0xf3, 0x20, 0x29, 0xbf, 0x9e, 0x2f, 0x3f, 0x1d, 0x62,
-	0x74, 0x35, 0xe7, 0x5e, 0xea, 0xf2, 0x8e, 0x93, 0x34, 0xef, 0x0d, 0x40, 0x76, 0x4b, 0xb2, 0x1d,
-	0x0d, 0xac, 0x68, 0x17, 0x0d, 0xac, 0x62, 0xb3, 0xba, 0x47, 0x6e, 0xb6, 0x83, 0xa6, 0x90, 0x77,
-	0xa5, 0x72, 0xb1, 0x56, 0xf2, 0x7e, 0x17, 0x60, 0x2e, 0x3e, 0x21, 0x1b, 0x00, 0x22, 0x64, 0xdc,
-	0xf7, 0x35, 0x9a, 0x78, 0xe4, 0x2d, 0xd0, 0x8a, 0x08, 0xdf, 0xc6, 0x81, 0xc8, 0xfd, 0x91, 0x76,
-	0x32, 0xf3, 0xdc, 0x3a, 0x32, 0xe3, 0x95, 0x4e, 0x5a, 0x75, 0x81, 0xd2, 0x99, 0xb1, 0x42, 0x6b,
-	0xb9, 0x46, 0x9c, 0x46, 0x71, 0xb2, 0x0f, 0xcb, 0x77, 0x98, 0xae, 0x4c, 0x97, 0xfc, 0x29, 0x06,
-	0x7b, 0x0e, 0x2b, 0x77, 0x19, 0xa9, 0x4c, 0xeb, 0xfe, 0x14, 0xd3, 0xb4, 0xe1, 0x73, 0x39, 0xfd,
-	0x47, 0xf4, 0xe6, 0xdc, 0x4f, 0x62, 0xff, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x36, 0x86,
-	0xa6, 0x4a, 0x06, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.proto b/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.proto
deleted file mode 100644
index 42d99c10..00000000
--- a/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/messages/messages.proto
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2016 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package grpc.lb.v1;
-option go_package = "google.golang.org/grpc/grpclb/grpc_lb_v1/messages";
-
-message Duration {
-  // Signed seconds of the span of time. Must be from -315,576,000,000
-  // to +315,576,000,000 inclusive.
-  int64 seconds = 1;
-
-  // Signed fractions of a second at nanosecond resolution of the span
-  // of time. Durations less than one second are represented with a 0
-  // `seconds` field and a positive or negative `nanos` field. For durations
-  // of one second or more, a non-zero value for the `nanos` field must be
-  // of the same sign as the `seconds` field. Must be from -999,999,999
-  // to +999,999,999 inclusive.
-  int32 nanos = 2;
-}
-
-message Timestamp {
-  // Represents seconds of UTC time since Unix epoch
-  // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-  // 9999-12-31T23:59:59Z inclusive.
-  int64 seconds = 1;
-
-  // Non-negative fractions of a second at nanosecond resolution. Negative
-  // second values with fractions must still have non-negative nanos values
-  // that count forward in time. Must be from 0 to 999,999,999
-  // inclusive.
-  int32 nanos = 2;
-}
-
-message LoadBalanceRequest {
-  oneof load_balance_request_type {
-    // This message should be sent on the first request to the load balancer.
-    InitialLoadBalanceRequest initial_request = 1;
-
-    // The client stats should be periodically reported to the load balancer
-    // based on the duration defined in the InitialLoadBalanceResponse.
-    ClientStats client_stats = 2;
-  }
-}
-
-message InitialLoadBalanceRequest {
-  // Name of load balanced service (IE, balancer.service.com)
-  // length should be less than 256 bytes.
-  string name = 1;
-}
-
-// Contains client level statistics that are useful to load balancing. Each
-// count except the timestamp should be reset to zero after reporting the stats.
-message ClientStats {
-  // The timestamp of generating the report.
-  Timestamp timestamp = 1;
-
-  // The total number of RPCs that started.
-  int64 num_calls_started = 2;
-
-  // The total number of RPCs that finished.
-  int64 num_calls_finished = 3;
-
-  // The total number of RPCs that were dropped by the client because of rate
-  // limiting.
-  int64 num_calls_finished_with_drop_for_rate_limiting = 4;
-
-  // The total number of RPCs that were dropped by the client because of load
-  // balancing.
-  int64 num_calls_finished_with_drop_for_load_balancing = 5;
-
-  // The total number of RPCs that failed to reach a server except dropped RPCs.
-  int64 num_calls_finished_with_client_failed_to_send = 6;
-
-  // The total number of RPCs that finished and are known to have been received
-  // by a server.
-  int64 num_calls_finished_known_received = 7;
-}
-
-message LoadBalanceResponse {
-  oneof load_balance_response_type {
-    // This message should be sent on the first response to the client.
-    InitialLoadBalanceResponse initial_response = 1;
-
-    // Contains the list of servers selected by the load balancer. The client
-    // should send requests to these servers in the specified order.
-    ServerList server_list = 2;
-  }
-}
-
-message InitialLoadBalanceResponse {
-  // This is an application layer redirect that indicates the client should use
-  // the specified server for load balancing. When this field is non-empty in
-  // the response, the client should open a separate connection to the
-  // load_balancer_delegate and call the BalanceLoad method. Its length should
-  // be less than 64 bytes.
-  string load_balancer_delegate = 1;
-
-  // This interval defines how often the client should send the client stats
-  // to the load balancer. Stats should only be reported when the duration is
-  // positive.
-  Duration client_stats_report_interval = 2;
-}
-
-message ServerList {
-  // Contains a list of servers selected by the load balancer. The list will
-  // be updated when server resolutions change or as needed to balance load
-  // across more servers. The client should consume the server list in order
-  // unless instructed otherwise via the client_config.
-  repeated Server servers = 1;
-
-  // Was google.protobuf.Duration expiration_interval.
-  reserved 3;
-}
-
-// Contains server information. When none of the [drop_for_*] fields are true,
-// use the other fields. When drop_for_rate_limiting is true, ignore all other
-// fields. Use drop_for_load_balancing only when it is true and
-// drop_for_rate_limiting is false.
-message Server {
-  // A resolved address for the server, serialized in network-byte-order. It may
-  // either be an IPv4 or IPv6 address.
-  bytes ip_address = 1;
-
-  // A resolved port number for the server.
-  int32 port = 2;
-
-  // An opaque but printable token given to the frontend for each pick. All
-  // frontend requests for that pick must include the token in its initial
-  // metadata. The token is used by the backend to verify the request and to
-  // allow the backend to report load to the gRPC LB system.
-  //
-  // Its length is variable but less than 50 bytes.
-  string load_balance_token = 3;
-
-  // Indicates whether this particular request should be dropped by the client
-  // for rate limiting.
-  bool drop_for_rate_limiting = 4;
-
-  // Indicates whether this particular request should be dropped by the client
-  // for load balancing.
-  bool drop_for_load_balancing = 5;
-}
diff --git a/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/service/service.pb.go b/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/service/service.pb.go
deleted file mode 100644
index ebcbe56d..00000000
--- a/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/service/service.pb.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: grpc_lb_v1/service/service.proto
-
-/*
-Package service is a generated protocol buffer package.
-
-It is generated from these files:
-	grpc_lb_v1/service/service.proto
-
-It has these top-level messages:
-*/
-package service
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import grpc_lb_v1 "google.golang.org/grpc/grpclb/grpc_lb_v1/messages"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// 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
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for LoadBalancer service
-
-type LoadBalancerClient interface {
-	// Bidirectional rpc to get a list of servers.
-	BalanceLoad(ctx context.Context, opts ...grpc.CallOption) (LoadBalancer_BalanceLoadClient, error)
-}
-
-type loadBalancerClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewLoadBalancerClient(cc *grpc.ClientConn) LoadBalancerClient {
-	return &loadBalancerClient{cc}
-}
-
-func (c *loadBalancerClient) BalanceLoad(ctx context.Context, opts ...grpc.CallOption) (LoadBalancer_BalanceLoadClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_LoadBalancer_serviceDesc.Streams[0], c.cc, "/grpc.lb.v1.LoadBalancer/BalanceLoad", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &loadBalancerBalanceLoadClient{stream}
-	return x, nil
-}
-
-type LoadBalancer_BalanceLoadClient interface {
-	Send(*grpc_lb_v1.LoadBalanceRequest) error
-	Recv() (*grpc_lb_v1.LoadBalanceResponse, error)
-	grpc.ClientStream
-}
-
-type loadBalancerBalanceLoadClient struct {
-	grpc.ClientStream
-}
-
-func (x *loadBalancerBalanceLoadClient) Send(m *grpc_lb_v1.LoadBalanceRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *loadBalancerBalanceLoadClient) Recv() (*grpc_lb_v1.LoadBalanceResponse, error) {
-	m := new(grpc_lb_v1.LoadBalanceResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Server API for LoadBalancer service
-
-type LoadBalancerServer interface {
-	// Bidirectional rpc to get a list of servers.
-	BalanceLoad(LoadBalancer_BalanceLoadServer) error
-}
-
-func RegisterLoadBalancerServer(s *grpc.Server, srv LoadBalancerServer) {
-	s.RegisterService(&_LoadBalancer_serviceDesc, srv)
-}
-
-func _LoadBalancer_BalanceLoad_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(LoadBalancerServer).BalanceLoad(&loadBalancerBalanceLoadServer{stream})
-}
-
-type LoadBalancer_BalanceLoadServer interface {
-	Send(*grpc_lb_v1.LoadBalanceResponse) error
-	Recv() (*grpc_lb_v1.LoadBalanceRequest, error)
-	grpc.ServerStream
-}
-
-type loadBalancerBalanceLoadServer struct {
-	grpc.ServerStream
-}
-
-func (x *loadBalancerBalanceLoadServer) Send(m *grpc_lb_v1.LoadBalanceResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *loadBalancerBalanceLoadServer) Recv() (*grpc_lb_v1.LoadBalanceRequest, error) {
-	m := new(grpc_lb_v1.LoadBalanceRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-var _LoadBalancer_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "grpc.lb.v1.LoadBalancer",
-	HandlerType: (*LoadBalancerServer)(nil),
-	Methods:     []grpc.MethodDesc{},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "BalanceLoad",
-			Handler:       _LoadBalancer_BalanceLoad_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-	Metadata: "grpc_lb_v1/service/service.proto",
-}
-
-func init() { proto.RegisterFile("grpc_lb_v1/service/service.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 142 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0x2f, 0x2a, 0x48,
-	0x8e, 0xcf, 0x49, 0x8a, 0x2f, 0x33, 0xd4, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0x85, 0xd1,
-	0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x5c, 0x20, 0x15, 0x7a, 0x39, 0x49, 0x7a, 0x65, 0x86,
-	0x52, 0x4a, 0x48, 0xaa, 0x73, 0x53, 0x8b, 0x8b, 0x13, 0xd3, 0x53, 0x8b, 0xe1, 0x0c, 0x88, 0x7a,
-	0xa3, 0x24, 0x2e, 0x1e, 0x9f, 0xfc, 0xc4, 0x14, 0xa7, 0xc4, 0x9c, 0xc4, 0xbc, 0xe4, 0xd4, 0x22,
-	0xa1, 0x20, 0x2e, 0x6e, 0x28, 0x1b, 0x24, 0x2c, 0x24, 0xa7, 0x87, 0x30, 0x4f, 0x0f, 0x49, 0x61,
-	0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x94, 0x3c, 0x4e, 0xf9, 0xe2, 0x82, 0xfc, 0xbc, 0xe2,
-	0x54, 0x0d, 0x46, 0x03, 0x46, 0x27, 0xce, 0x28, 0x76, 0xa8, 0x23, 0x93, 0xd8, 0xc0, 0xb6, 0x1a,
-	0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x39, 0x4e, 0xb0, 0xf8, 0xc9, 0x00, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/service/service.proto b/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/service/service.proto
deleted file mode 100644
index 6971fdba..00000000
--- a/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/service/service.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2016 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package grpc.lb.v1;
-option go_package = "google.golang.org/grpc/grpclb/grpc_lb_v1/service";
-
-import "grpc_lb_v1/messages/messages.proto";
-
-service LoadBalancer {
-  // Bidirectional rpc to get a list of servers.
-  rpc BalanceLoad(stream LoadBalanceRequest)
-      returns (stream LoadBalanceResponse);
-}
diff --git a/vendor/google.golang.org/grpc/grpclog/grpclog.go b/vendor/google.golang.org/grpc/grpclog/grpclog.go
index 16a7d888..1fabb11e 100644
--- a/vendor/google.golang.org/grpc/grpclog/grpclog.go
+++ b/vendor/google.golang.org/grpc/grpclog/grpclog.go
@@ -105,18 +105,21 @@ func Fatalln(args ...interface{}) {
 }
 
 // Print prints to the logger. Arguments are handled in the manner of fmt.Print.
+//
 // Deprecated: use Info.
 func Print(args ...interface{}) {
 	logger.Info(args...)
 }
 
 // Printf prints to the logger. Arguments are handled in the manner of fmt.Printf.
+//
 // Deprecated: use Infof.
 func Printf(format string, args ...interface{}) {
 	logger.Infof(format, args...)
 }
 
 // Println prints to the logger. Arguments are handled in the manner of fmt.Println.
+//
 // Deprecated: use Infoln.
 func Println(args ...interface{}) {
 	logger.Infoln(args...)
diff --git a/vendor/google.golang.org/grpc/grpclog/logger.go b/vendor/google.golang.org/grpc/grpclog/logger.go
index d03b2397..097494f7 100644
--- a/vendor/google.golang.org/grpc/grpclog/logger.go
+++ b/vendor/google.golang.org/grpc/grpclog/logger.go
@@ -19,6 +19,7 @@
 package grpclog
 
 // Logger mimics golang's standard Logger as an interface.
+//
 // Deprecated: use LoggerV2.
 type Logger interface {
 	Fatal(args ...interface{})
@@ -31,6 +32,7 @@ type Logger interface {
 
 // SetLogger sets the logger that is used in grpc. Call only from
 // init() functions.
+//
 // Deprecated: use SetLoggerV2.
 func SetLogger(l Logger) {
 	logger = &loggerWrapper{Logger: l}
diff --git a/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go b/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go
index fdcbb9e0..a1fda280 100644
--- a/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go
+++ b/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go
@@ -1,17 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: grpc_health_v1/health.proto
+// source: grpc/health/v1/health.proto
 
-/*
-Package grpc_health_v1 is a generated protocol buffer package.
-
-It is generated from these files:
-	grpc_health_v1/health.proto
-
-It has these top-level messages:
-	HealthCheckRequest
-	HealthCheckResponse
-*/
-package grpc_health_v1
+package grpc_health_v1 // import "google.golang.org/grpc/health/grpc_health_v1"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -56,17 +46,39 @@ func (x HealthCheckResponse_ServingStatus) String() string {
 	return proto.EnumName(HealthCheckResponse_ServingStatus_name, int32(x))
 }
 func (HealthCheckResponse_ServingStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 0}
+	return fileDescriptor_health_85731b6c49265086, []int{1, 0}
 }
 
 type HealthCheckRequest struct {
-	Service string `protobuf:"bytes,1,opt,name=service" json:"service,omitempty"`
+	Service              string   `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *HealthCheckRequest) Reset()         { *m = HealthCheckRequest{} }
+func (m *HealthCheckRequest) String() string { return proto.CompactTextString(m) }
+func (*HealthCheckRequest) ProtoMessage()    {}
+func (*HealthCheckRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_health_85731b6c49265086, []int{0}
+}
+func (m *HealthCheckRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HealthCheckRequest.Unmarshal(m, b)
+}
+func (m *HealthCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HealthCheckRequest.Marshal(b, m, deterministic)
+}
+func (dst *HealthCheckRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HealthCheckRequest.Merge(dst, src)
+}
+func (m *HealthCheckRequest) XXX_Size() int {
+	return xxx_messageInfo_HealthCheckRequest.Size(m)
+}
+func (m *HealthCheckRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_HealthCheckRequest.DiscardUnknown(m)
 }
 
-func (m *HealthCheckRequest) Reset()                    { *m = HealthCheckRequest{} }
-func (m *HealthCheckRequest) String() string            { return proto.CompactTextString(m) }
-func (*HealthCheckRequest) ProtoMessage()               {}
-func (*HealthCheckRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_HealthCheckRequest proto.InternalMessageInfo
 
 func (m *HealthCheckRequest) GetService() string {
 	if m != nil {
@@ -76,13 +88,35 @@ func (m *HealthCheckRequest) GetService() string {
 }
 
 type HealthCheckResponse struct {
-	Status HealthCheckResponse_ServingStatus `protobuf:"varint,1,opt,name=status,enum=grpc.health.v1.HealthCheckResponse_ServingStatus" json:"status,omitempty"`
+	Status               HealthCheckResponse_ServingStatus `protobuf:"varint,1,opt,name=status,proto3,enum=grpc.health.v1.HealthCheckResponse_ServingStatus" json:"status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                          `json:"-"`
+	XXX_unrecognized     []byte                            `json:"-"`
+	XXX_sizecache        int32                             `json:"-"`
 }
 
-func (m *HealthCheckResponse) Reset()                    { *m = HealthCheckResponse{} }
-func (m *HealthCheckResponse) String() string            { return proto.CompactTextString(m) }
-func (*HealthCheckResponse) ProtoMessage()               {}
-func (*HealthCheckResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *HealthCheckResponse) Reset()         { *m = HealthCheckResponse{} }
+func (m *HealthCheckResponse) String() string { return proto.CompactTextString(m) }
+func (*HealthCheckResponse) ProtoMessage()    {}
+func (*HealthCheckResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_health_85731b6c49265086, []int{1}
+}
+func (m *HealthCheckResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HealthCheckResponse.Unmarshal(m, b)
+}
+func (m *HealthCheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HealthCheckResponse.Marshal(b, m, deterministic)
+}
+func (dst *HealthCheckResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HealthCheckResponse.Merge(dst, src)
+}
+func (m *HealthCheckResponse) XXX_Size() int {
+	return xxx_messageInfo_HealthCheckResponse.Size(m)
+}
+func (m *HealthCheckResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_HealthCheckResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HealthCheckResponse proto.InternalMessageInfo
 
 func (m *HealthCheckResponse) GetStatus() HealthCheckResponse_ServingStatus {
 	if m != nil {
@@ -105,8 +139,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for Health service
-
+// HealthClient is the client API for Health service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type HealthClient interface {
 	Check(ctx context.Context, in *HealthCheckRequest, opts ...grpc.CallOption) (*HealthCheckResponse, error)
 }
@@ -121,15 +156,14 @@ func NewHealthClient(cc *grpc.ClientConn) HealthClient {
 
 func (c *healthClient) Check(ctx context.Context, in *HealthCheckRequest, opts ...grpc.CallOption) (*HealthCheckResponse, error) {
 	out := new(HealthCheckResponse)
-	err := grpc.Invoke(ctx, "/grpc.health.v1.Health/Check", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.health.v1.Health/Check", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for Health service
-
+// HealthServer is the server API for Health service.
 type HealthServer interface {
 	Check(context.Context, *HealthCheckRequest) (*HealthCheckResponse, error)
 }
@@ -166,25 +200,28 @@ var _Health_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "grpc_health_v1/health.proto",
+	Metadata: "grpc/health/v1/health.proto",
 }
 
-func init() { proto.RegisterFile("grpc_health_v1/health.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("grpc/health/v1/health.proto", fileDescriptor_health_85731b6c49265086) }
 
-var fileDescriptor0 = []byte{
-	// 213 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_health_85731b6c49265086 = []byte{
+	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0x2f, 0x2a, 0x48,
-	0x8e, 0xcf, 0x48, 0x4d, 0xcc, 0x29, 0xc9, 0x88, 0x2f, 0x33, 0xd4, 0x87, 0xb0, 0xf4, 0x0a, 0x8a,
-	0xf2, 0x4b, 0xf2, 0x85, 0xf8, 0x40, 0x92, 0x7a, 0x50, 0xa1, 0x32, 0x43, 0x25, 0x3d, 0x2e, 0x21,
-	0x0f, 0x30, 0xc7, 0x39, 0x23, 0x35, 0x39, 0x3b, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x48,
-	0x82, 0x8b, 0xbd, 0x38, 0xb5, 0xa8, 0x2c, 0x33, 0x39, 0x55, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33,
-	0x08, 0xc6, 0x55, 0x9a, 0xc3, 0xc8, 0x25, 0x8c, 0xa2, 0xa1, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55,
-	0xc8, 0x93, 0x8b, 0xad, 0xb8, 0x24, 0xb1, 0xa4, 0xb4, 0x18, 0xac, 0x81, 0xcf, 0xc8, 0x50, 0x0f,
-	0xd5, 0x22, 0x3d, 0x2c, 0x9a, 0xf4, 0x82, 0x41, 0x86, 0xe6, 0xa5, 0x07, 0x83, 0x35, 0x06, 0x41,
-	0x0d, 0x50, 0xb2, 0xe2, 0xe2, 0x45, 0x91, 0x10, 0xe2, 0xe6, 0x62, 0x0f, 0xf5, 0xf3, 0xf6, 0xf3,
-	0x0f, 0xf7, 0x13, 0x60, 0x00, 0x71, 0x82, 0x5d, 0x83, 0xc2, 0x3c, 0xfd, 0xdc, 0x05, 0x18, 0x85,
-	0xf8, 0xb9, 0xb8, 0xfd, 0xfc, 0x43, 0xe2, 0x61, 0x02, 0x4c, 0x46, 0x51, 0x5c, 0x6c, 0x10, 0x8b,
-	0x84, 0x02, 0xb8, 0x58, 0xc1, 0x96, 0x09, 0x29, 0xe1, 0x75, 0x09, 0xd8, 0xbf, 0x52, 0xca, 0x44,
-	0xb8, 0x36, 0x89, 0x0d, 0x1c, 0x82, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x53, 0x2b, 0x65,
-	0x20, 0x60, 0x01, 0x00, 0x00,
+	0xd6, 0xcf, 0x48, 0x4d, 0xcc, 0x29, 0xc9, 0xd0, 0x2f, 0x33, 0x84, 0xb2, 0xf4, 0x0a, 0x8a, 0xf2,
+	0x4b, 0xf2, 0x85, 0xf8, 0x40, 0x92, 0x7a, 0x50, 0xa1, 0x32, 0x43, 0x25, 0x3d, 0x2e, 0x21, 0x0f,
+	0x30, 0xc7, 0x39, 0x23, 0x35, 0x39, 0x3b, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x48, 0x82,
+	0x8b, 0xbd, 0x38, 0xb5, 0xa8, 0x2c, 0x33, 0x39, 0x55, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08,
+	0xc6, 0x55, 0x9a, 0xc3, 0xc8, 0x25, 0x8c, 0xa2, 0xa1, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55, 0xc8,
+	0x93, 0x8b, 0xad, 0xb8, 0x24, 0xb1, 0xa4, 0xb4, 0x18, 0xac, 0x81, 0xcf, 0xc8, 0x50, 0x0f, 0xd5,
+	0x22, 0x3d, 0x2c, 0x9a, 0xf4, 0x82, 0x41, 0x86, 0xe6, 0xa5, 0x07, 0x83, 0x35, 0x06, 0x41, 0x0d,
+	0x50, 0xb2, 0xe2, 0xe2, 0x45, 0x91, 0x10, 0xe2, 0xe6, 0x62, 0x0f, 0xf5, 0xf3, 0xf6, 0xf3, 0x0f,
+	0xf7, 0x13, 0x60, 0x00, 0x71, 0x82, 0x5d, 0x83, 0xc2, 0x3c, 0xfd, 0xdc, 0x05, 0x18, 0x85, 0xf8,
+	0xb9, 0xb8, 0xfd, 0xfc, 0x43, 0xe2, 0x61, 0x02, 0x4c, 0x46, 0x51, 0x5c, 0x6c, 0x10, 0x8b, 0x84,
+	0x02, 0xb8, 0x58, 0xc1, 0x96, 0x09, 0x29, 0xe1, 0x75, 0x09, 0xd8, 0xbf, 0x52, 0xca, 0x44, 0xb8,
+	0xd6, 0x29, 0x91, 0x4b, 0x30, 0x33, 0x1f, 0x4d, 0xa1, 0x13, 0x37, 0x44, 0x65, 0x00, 0x28, 0x70,
+	0x03, 0x18, 0xa3, 0x74, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0xd2, 0xf3, 0x73, 0x12, 0xf3,
+	0xd2, 0xf5, 0xf2, 0x8b, 0xd2, 0xf5, 0x91, 0x63, 0x03, 0xc4, 0x8e, 0x87, 0xb0, 0xe3, 0xcb, 0x0c,
+	0x57, 0x31, 0xf1, 0xb9, 0x83, 0x4c, 0x83, 0x18, 0xa1, 0x17, 0x66, 0x98, 0xc4, 0x06, 0x8e, 0x24,
+	0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xec, 0x66, 0x81, 0xcb, 0xc3, 0x01, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/grpc/health/grpc_health_v1/health.proto b/vendor/google.golang.org/grpc/health/grpc_health_v1/health.proto
deleted file mode 100644
index 6072fdc3..00000000
--- a/vendor/google.golang.org/grpc/health/grpc_health_v1/health.proto
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2017 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package grpc.health.v1;
-
-message HealthCheckRequest {
-  string service = 1;
-}
-
-message HealthCheckResponse {
-  enum ServingStatus {
- 	UNKNOWN = 0;
-	SERVING = 1;
-	NOT_SERVING = 2;
-  }
-  ServingStatus status = 1;
-}
-
-service Health{
-  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
-} 
diff --git a/vendor/google.golang.org/grpc/health/health.go b/vendor/google.golang.org/grpc/health/health.go
index 30a78667..c2588867 100644
--- a/vendor/google.golang.org/grpc/health/health.go
+++ b/vendor/google.golang.org/grpc/health/health.go
@@ -16,7 +16,7 @@
  *
  */
 
-//go:generate protoc --go_out=plugins=grpc:. grpc_health_v1/health.proto
+//go:generate ./regenerate.sh
 
 // Package health provides some utility functions to health-check a server. The implementation
 // is based on protobuf. Users need to write their own implementations if other IDLs are used.
diff --git a/vendor/google.golang.org/grpc/health/regenerate.sh b/vendor/google.golang.org/grpc/health/regenerate.sh
new file mode 100755
index 00000000..b11eccb2
--- /dev/null
+++ b/vendor/google.golang.org/grpc/health/regenerate.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2018 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eux -o pipefail
+
+TMP=$(mktemp -d)
+
+function finish {
+  rm -rf "$TMP"
+}
+trap finish EXIT
+
+pushd "$TMP"
+mkdir -p grpc/health/v1
+curl https://raw.githubusercontent.com/grpc/grpc-proto/master/grpc/health/v1/health.proto > grpc/health/v1/health.proto
+
+protoc --go_out=plugins=grpc,paths=source_relative:. -I. grpc/health/v1/*.proto
+popd
+rm -f grpc_health_v1/*.pb.go
+cp "$TMP"/grpc/health/v1/*.pb.go grpc_health_v1/
+
diff --git a/vendor/google.golang.org/grpc/install_gae.sh b/vendor/google.golang.org/grpc/install_gae.sh
new file mode 100755
index 00000000..d4236f3b
--- /dev/null
+++ b/vendor/google.golang.org/grpc/install_gae.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+TMP=$(mktemp -d /tmp/sdk.XXX) \
+&& curl -o $TMP.zip "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-1.9.64.zip" \
+&& unzip -q $TMP.zip -d $TMP \
+&& export PATH="$PATH:$TMP/go_appengine"
diff --git a/vendor/google.golang.org/grpc/interceptor.go b/vendor/google.golang.org/grpc/interceptor.go
index 06dc825b..1f6ef678 100644
--- a/vendor/google.golang.org/grpc/interceptor.go
+++ b/vendor/google.golang.org/grpc/interceptor.go
@@ -48,7 +48,9 @@ type UnaryServerInfo struct {
 }
 
 // UnaryHandler defines the handler invoked by UnaryServerInterceptor to complete the normal
-// execution of a unary RPC.
+// execution of a unary RPC. If a UnaryHandler returns an error, it should be produced by the
+// status package, or else gRPC will use codes.Unknown as the status code and err.Error() as
+// the status message of the RPC.
 type UnaryHandler func(ctx context.Context, req interface{}) (interface{}, error)
 
 // UnaryServerInterceptor provides a hook to intercept the execution of a unary RPC on the server. info
diff --git a/vendor/google.golang.org/grpc/internal/backoff/backoff.go b/vendor/google.golang.org/grpc/internal/backoff/backoff.go
new file mode 100644
index 00000000..1bd0cce5
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/backoff/backoff.go
@@ -0,0 +1,78 @@
+/*
+ *
+ * Copyright 2017 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package backoff implement the backoff strategy for gRPC.
+//
+// This is kept in internal until the gRPC project decides whether or not to
+// allow alternative backoff strategies.
+package backoff
+
+import (
+	"time"
+
+	"google.golang.org/grpc/internal/grpcrand"
+)
+
+// Strategy defines the methodology for backing off after a grpc connection
+// failure.
+//
+type Strategy interface {
+	// Backoff returns the amount of time to wait before the next retry given
+	// the number of consecutive failures.
+	Backoff(retries int) time.Duration
+}
+
+const (
+	// baseDelay is the amount of time to wait before retrying after the first
+	// failure.
+	baseDelay = 1.0 * time.Second
+	// factor is applied to the backoff after each retry.
+	factor = 1.6
+	// jitter provides a range to randomize backoff delays.
+	jitter = 0.2
+)
+
+// Exponential implements exponential backoff algorithm as defined in
+// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
+type Exponential struct {
+	// MaxDelay is the upper bound of backoff delay.
+	MaxDelay time.Duration
+}
+
+// Backoff returns the amount of time to wait before the next retry given the
+// number of retries.
+func (bc Exponential) Backoff(retries int) time.Duration {
+	if retries == 0 {
+		return baseDelay
+	}
+	backoff, max := float64(baseDelay), float64(bc.MaxDelay)
+	for backoff < max && retries > 0 {
+		backoff *= factor
+		retries--
+	}
+	if backoff > max {
+		backoff = max
+	}
+	// Randomize backoff delays so that if a cluster of requests start at
+	// the same time, they won't operate in lockstep.
+	backoff *= 1 + jitter*(grpcrand.Float64()*2-1)
+	if backoff < 0 {
+		return 0
+	}
+	return time.Duration(backoff)
+}
diff --git a/vendor/google.golang.org/grpc/internal/channelz/funcs.go b/vendor/google.golang.org/grpc/internal/channelz/funcs.go
new file mode 100644
index 00000000..586a0336
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/channelz/funcs.go
@@ -0,0 +1,573 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package channelz defines APIs for enabling channelz service, entry
+// registration/deletion, and accessing channelz data. It also defines channelz
+// metric struct formats.
+//
+// All APIs in this package are experimental.
+package channelz
+
+import (
+	"sort"
+	"sync"
+	"sync/atomic"
+
+	"google.golang.org/grpc/grpclog"
+)
+
+var (
+	db    dbWrapper
+	idGen idGenerator
+	// EntryPerPage defines the number of channelz entries to be shown on a web page.
+	EntryPerPage = 50
+	curState     int32
+)
+
+// TurnOn turns on channelz data collection.
+func TurnOn() {
+	if !IsOn() {
+		NewChannelzStorage()
+		atomic.StoreInt32(&curState, 1)
+	}
+}
+
+// IsOn returns whether channelz data collection is on.
+func IsOn() bool {
+	return atomic.CompareAndSwapInt32(&curState, 1, 1)
+}
+
+// dbWarpper wraps around a reference to internal channelz data storage, and
+// provide synchronized functionality to set and get the reference.
+type dbWrapper struct {
+	mu sync.RWMutex
+	DB *channelMap
+}
+
+func (d *dbWrapper) set(db *channelMap) {
+	d.mu.Lock()
+	d.DB = db
+	d.mu.Unlock()
+}
+
+func (d *dbWrapper) get() *channelMap {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+	return d.DB
+}
+
+// NewChannelzStorage initializes channelz data storage and id generator.
+//
+// Note: This function is exported for testing purpose only. User should not call
+// it in most cases.
+func NewChannelzStorage() {
+	db.set(&channelMap{
+		topLevelChannels: make(map[int64]struct{}),
+		channels:         make(map[int64]*channel),
+		listenSockets:    make(map[int64]*listenSocket),
+		normalSockets:    make(map[int64]*normalSocket),
+		servers:          make(map[int64]*server),
+		subChannels:      make(map[int64]*subChannel),
+	})
+	idGen.reset()
+}
+
+// GetTopChannels returns a slice of top channel's ChannelMetric, along with a
+// boolean indicating whether there's more top channels to be queried for.
+//
+// The arg id specifies that only top channel with id at or above it will be included
+// in the result. The returned slice is up to a length of EntryPerPage, and is
+// sorted in ascending id order.
+func GetTopChannels(id int64) ([]*ChannelMetric, bool) {
+	return db.get().GetTopChannels(id)
+}
+
+// GetServers returns a slice of server's ServerMetric, along with a
+// boolean indicating whether there's more servers to be queried for.
+//
+// The arg id specifies that only server with id at or above it will be included
+// in the result. The returned slice is up to a length of EntryPerPage, and is
+// sorted in ascending id order.
+func GetServers(id int64) ([]*ServerMetric, bool) {
+	return db.get().GetServers(id)
+}
+
+// GetServerSockets returns a slice of server's (identified by id) normal socket's
+// SocketMetric, along with a boolean indicating whether there's more sockets to
+// be queried for.
+//
+// The arg startID specifies that only sockets with id at or above it will be
+// included in the result. The returned slice is up to a length of EntryPerPage,
+// and is sorted in ascending id order.
+func GetServerSockets(id int64, startID int64) ([]*SocketMetric, bool) {
+	return db.get().GetServerSockets(id, startID)
+}
+
+// GetChannel returns the ChannelMetric for the channel (identified by id).
+func GetChannel(id int64) *ChannelMetric {
+	return db.get().GetChannel(id)
+}
+
+// GetSubChannel returns the SubChannelMetric for the subchannel (identified by id).
+func GetSubChannel(id int64) *SubChannelMetric {
+	return db.get().GetSubChannel(id)
+}
+
+// GetSocket returns the SocketInternalMetric for the socket (identified by id).
+func GetSocket(id int64) *SocketMetric {
+	return db.get().GetSocket(id)
+}
+
+// RegisterChannel registers the given channel c in channelz database with ref
+// as its reference name, and add it to the child list of its parent (identified
+// by pid). pid = 0 means no parent. It returns the unique channelz tracking id
+// assigned to this channel.
+func RegisterChannel(c Channel, pid int64, ref string) int64 {
+	id := idGen.genID()
+	cn := &channel{
+		refName:     ref,
+		c:           c,
+		subChans:    make(map[int64]string),
+		nestedChans: make(map[int64]string),
+		id:          id,
+		pid:         pid,
+	}
+	if pid == 0 {
+		db.get().addChannel(id, cn, true, pid, ref)
+	} else {
+		db.get().addChannel(id, cn, false, pid, ref)
+	}
+	return id
+}
+
+// RegisterSubChannel registers the given channel c in channelz database with ref
+// as its reference name, and add it to the child list of its parent (identified
+// by pid). It returns the unique channelz tracking id assigned to this subchannel.
+func RegisterSubChannel(c Channel, pid int64, ref string) int64 {
+	if pid == 0 {
+		grpclog.Error("a SubChannel's parent id cannot be 0")
+		return 0
+	}
+	id := idGen.genID()
+	sc := &subChannel{
+		refName: ref,
+		c:       c,
+		sockets: make(map[int64]string),
+		id:      id,
+		pid:     pid,
+	}
+	db.get().addSubChannel(id, sc, pid, ref)
+	return id
+}
+
+// RegisterServer registers the given server s in channelz database. It returns
+// the unique channelz tracking id assigned to this server.
+func RegisterServer(s Server, ref string) int64 {
+	id := idGen.genID()
+	svr := &server{
+		refName:       ref,
+		s:             s,
+		sockets:       make(map[int64]string),
+		listenSockets: make(map[int64]string),
+		id:            id,
+	}
+	db.get().addServer(id, svr)
+	return id
+}
+
+// RegisterListenSocket registers the given listen socket s in channelz database
+// with ref as its reference name, and add it to the child list of its parent
+// (identified by pid). It returns the unique channelz tracking id assigned to
+// this listen socket.
+func RegisterListenSocket(s Socket, pid int64, ref string) int64 {
+	if pid == 0 {
+		grpclog.Error("a ListenSocket's parent id cannot be 0")
+		return 0
+	}
+	id := idGen.genID()
+	ls := &listenSocket{refName: ref, s: s, id: id, pid: pid}
+	db.get().addListenSocket(id, ls, pid, ref)
+	return id
+}
+
+// RegisterNormalSocket registers the given normal socket s in channelz database
+// with ref as its reference name, and add it to the child list of its parent
+// (identified by pid). It returns the unique channelz tracking id assigned to
+// this normal socket.
+func RegisterNormalSocket(s Socket, pid int64, ref string) int64 {
+	if pid == 0 {
+		grpclog.Error("a NormalSocket's parent id cannot be 0")
+		return 0
+	}
+	id := idGen.genID()
+	ns := &normalSocket{refName: ref, s: s, id: id, pid: pid}
+	db.get().addNormalSocket(id, ns, pid, ref)
+	return id
+}
+
+// RemoveEntry removes an entry with unique channelz trakcing id to be id from
+// channelz database.
+func RemoveEntry(id int64) {
+	db.get().removeEntry(id)
+}
+
+// channelMap is the storage data structure for channelz.
+// Methods of channelMap can be divided in two two categories with respect to locking.
+// 1. Methods acquire the global lock.
+// 2. Methods that can only be called when global lock is held.
+// A second type of method need always to be called inside a first type of method.
+type channelMap struct {
+	mu               sync.RWMutex
+	topLevelChannels map[int64]struct{}
+	servers          map[int64]*server
+	channels         map[int64]*channel
+	subChannels      map[int64]*subChannel
+	listenSockets    map[int64]*listenSocket
+	normalSockets    map[int64]*normalSocket
+}
+
+func (c *channelMap) addServer(id int64, s *server) {
+	c.mu.Lock()
+	s.cm = c
+	c.servers[id] = s
+	c.mu.Unlock()
+}
+
+func (c *channelMap) addChannel(id int64, cn *channel, isTopChannel bool, pid int64, ref string) {
+	c.mu.Lock()
+	cn.cm = c
+	c.channels[id] = cn
+	if isTopChannel {
+		c.topLevelChannels[id] = struct{}{}
+	} else {
+		c.findEntry(pid).addChild(id, cn)
+	}
+	c.mu.Unlock()
+}
+
+func (c *channelMap) addSubChannel(id int64, sc *subChannel, pid int64, ref string) {
+	c.mu.Lock()
+	sc.cm = c
+	c.subChannels[id] = sc
+	c.findEntry(pid).addChild(id, sc)
+	c.mu.Unlock()
+}
+
+func (c *channelMap) addListenSocket(id int64, ls *listenSocket, pid int64, ref string) {
+	c.mu.Lock()
+	ls.cm = c
+	c.listenSockets[id] = ls
+	c.findEntry(pid).addChild(id, ls)
+	c.mu.Unlock()
+}
+
+func (c *channelMap) addNormalSocket(id int64, ns *normalSocket, pid int64, ref string) {
+	c.mu.Lock()
+	ns.cm = c
+	c.normalSockets[id] = ns
+	c.findEntry(pid).addChild(id, ns)
+	c.mu.Unlock()
+}
+
+// removeEntry triggers the removal of an entry, which may not indeed delete the
+// entry, if it has to wait on the deletion of its children, or may lead to a chain
+// of entry deletion. For example, deleting the last socket of a gracefully shutting
+// down server will lead to the server being also deleted.
+func (c *channelMap) removeEntry(id int64) {
+	c.mu.Lock()
+	c.findEntry(id).triggerDelete()
+	c.mu.Unlock()
+}
+
+// c.mu must be held by the caller.
+func (c *channelMap) findEntry(id int64) entry {
+	var v entry
+	var ok bool
+	if v, ok = c.channels[id]; ok {
+		return v
+	}
+	if v, ok = c.subChannels[id]; ok {
+		return v
+	}
+	if v, ok = c.servers[id]; ok {
+		return v
+	}
+	if v, ok = c.listenSockets[id]; ok {
+		return v
+	}
+	if v, ok = c.normalSockets[id]; ok {
+		return v
+	}
+	return &dummyEntry{idNotFound: id}
+}
+
+// c.mu must be held by the caller
+// deleteEntry simply deletes an entry from the channelMap. Before calling this
+// method, caller must check this entry is ready to be deleted, i.e removeEntry()
+// has been called on it, and no children still exist.
+// Conditionals are ordered by the expected frequency of deletion of each entity
+// type, in order to optimize performance.
+func (c *channelMap) deleteEntry(id int64) {
+	var ok bool
+	if _, ok = c.normalSockets[id]; ok {
+		delete(c.normalSockets, id)
+		return
+	}
+	if _, ok = c.subChannels[id]; ok {
+		delete(c.subChannels, id)
+		return
+	}
+	if _, ok = c.channels[id]; ok {
+		delete(c.channels, id)
+		delete(c.topLevelChannels, id)
+		return
+	}
+	if _, ok = c.listenSockets[id]; ok {
+		delete(c.listenSockets, id)
+		return
+	}
+	if _, ok = c.servers[id]; ok {
+		delete(c.servers, id)
+		return
+	}
+}
+
+type int64Slice []int64
+
+func (s int64Slice) Len() int           { return len(s) }
+func (s int64Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s int64Slice) Less(i, j int) bool { return s[i] < s[j] }
+
+func copyMap(m map[int64]string) map[int64]string {
+	n := make(map[int64]string)
+	for k, v := range m {
+		n[k] = v
+	}
+	return n
+}
+
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
+
+func (c *channelMap) GetTopChannels(id int64) ([]*ChannelMetric, bool) {
+	c.mu.RLock()
+	l := len(c.topLevelChannels)
+	ids := make([]int64, 0, l)
+	cns := make([]*channel, 0, min(l, EntryPerPage))
+
+	for k := range c.topLevelChannels {
+		ids = append(ids, k)
+	}
+	sort.Sort(int64Slice(ids))
+	idx := sort.Search(len(ids), func(i int) bool { return ids[i] >= id })
+	count := 0
+	var end bool
+	var t []*ChannelMetric
+	for i, v := range ids[idx:] {
+		if count == EntryPerPage {
+			break
+		}
+		if cn, ok := c.channels[v]; ok {
+			cns = append(cns, cn)
+			t = append(t, &ChannelMetric{
+				NestedChans: copyMap(cn.nestedChans),
+				SubChans:    copyMap(cn.subChans),
+			})
+			count++
+		}
+		if i == len(ids[idx:])-1 {
+			end = true
+			break
+		}
+	}
+	c.mu.RUnlock()
+	if count == 0 {
+		end = true
+	}
+
+	for i, cn := range cns {
+		t[i].ChannelData = cn.c.ChannelzMetric()
+		t[i].ID = cn.id
+		t[i].RefName = cn.refName
+	}
+	return t, end
+}
+
+func (c *channelMap) GetServers(id int64) ([]*ServerMetric, bool) {
+	c.mu.RLock()
+	l := len(c.servers)
+	ids := make([]int64, 0, l)
+	ss := make([]*server, 0, min(l, EntryPerPage))
+	for k := range c.servers {
+		ids = append(ids, k)
+	}
+	sort.Sort(int64Slice(ids))
+	idx := sort.Search(len(ids), func(i int) bool { return ids[i] >= id })
+	count := 0
+	var end bool
+	var s []*ServerMetric
+	for i, v := range ids[idx:] {
+		if count == EntryPerPage {
+			break
+		}
+		if svr, ok := c.servers[v]; ok {
+			ss = append(ss, svr)
+			s = append(s, &ServerMetric{
+				ListenSockets: copyMap(svr.listenSockets),
+			})
+			count++
+		}
+		if i == len(ids[idx:])-1 {
+			end = true
+			break
+		}
+	}
+	c.mu.RUnlock()
+	if count == 0 {
+		end = true
+	}
+
+	for i, svr := range ss {
+		s[i].ServerData = svr.s.ChannelzMetric()
+		s[i].ID = svr.id
+		s[i].RefName = svr.refName
+	}
+	return s, end
+}
+
+func (c *channelMap) GetServerSockets(id int64, startID int64) ([]*SocketMetric, bool) {
+	var svr *server
+	var ok bool
+	c.mu.RLock()
+	if svr, ok = c.servers[id]; !ok {
+		// server with id doesn't exist.
+		c.mu.RUnlock()
+		return nil, true
+	}
+	svrskts := svr.sockets
+	l := len(svrskts)
+	ids := make([]int64, 0, l)
+	sks := make([]*normalSocket, 0, min(l, EntryPerPage))
+	for k := range svrskts {
+		ids = append(ids, k)
+	}
+	sort.Sort((int64Slice(ids)))
+	idx := sort.Search(len(ids), func(i int) bool { return ids[i] >= id })
+	count := 0
+	var end bool
+	for i, v := range ids[idx:] {
+		if count == EntryPerPage {
+			break
+		}
+		if ns, ok := c.normalSockets[v]; ok {
+			sks = append(sks, ns)
+			count++
+		}
+		if i == len(ids[idx:])-1 {
+			end = true
+			break
+		}
+	}
+	c.mu.RUnlock()
+	if count == 0 {
+		end = true
+	}
+	var s []*SocketMetric
+	for _, ns := range sks {
+		sm := &SocketMetric{}
+		sm.SocketData = ns.s.ChannelzMetric()
+		sm.ID = ns.id
+		sm.RefName = ns.refName
+		s = append(s, sm)
+	}
+	return s, end
+}
+
+func (c *channelMap) GetChannel(id int64) *ChannelMetric {
+	cm := &ChannelMetric{}
+	var cn *channel
+	var ok bool
+	c.mu.RLock()
+	if cn, ok = c.channels[id]; !ok {
+		// channel with id doesn't exist.
+		c.mu.RUnlock()
+		return nil
+	}
+	cm.NestedChans = copyMap(cn.nestedChans)
+	cm.SubChans = copyMap(cn.subChans)
+	c.mu.RUnlock()
+	cm.ChannelData = cn.c.ChannelzMetric()
+	cm.ID = cn.id
+	cm.RefName = cn.refName
+	return cm
+}
+
+func (c *channelMap) GetSubChannel(id int64) *SubChannelMetric {
+	cm := &SubChannelMetric{}
+	var sc *subChannel
+	var ok bool
+	c.mu.RLock()
+	if sc, ok = c.subChannels[id]; !ok {
+		// subchannel with id doesn't exist.
+		c.mu.RUnlock()
+		return nil
+	}
+	cm.Sockets = copyMap(sc.sockets)
+	c.mu.RUnlock()
+	cm.ChannelData = sc.c.ChannelzMetric()
+	cm.ID = sc.id
+	cm.RefName = sc.refName
+	return cm
+}
+
+func (c *channelMap) GetSocket(id int64) *SocketMetric {
+	sm := &SocketMetric{}
+	c.mu.RLock()
+	if ls, ok := c.listenSockets[id]; ok {
+		c.mu.RUnlock()
+		sm.SocketData = ls.s.ChannelzMetric()
+		sm.ID = ls.id
+		sm.RefName = ls.refName
+		return sm
+	}
+	if ns, ok := c.normalSockets[id]; ok {
+		c.mu.RUnlock()
+		sm.SocketData = ns.s.ChannelzMetric()
+		sm.ID = ns.id
+		sm.RefName = ns.refName
+		return sm
+	}
+	c.mu.RUnlock()
+	return nil
+}
+
+type idGenerator struct {
+	id int64
+}
+
+func (i *idGenerator) reset() {
+	atomic.StoreInt64(&i.id, 0)
+}
+
+func (i *idGenerator) genID() int64 {
+	return atomic.AddInt64(&i.id, 1)
+}
diff --git a/vendor/google.golang.org/grpc/internal/channelz/types.go b/vendor/google.golang.org/grpc/internal/channelz/types.go
new file mode 100644
index 00000000..6fd6bb38
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/channelz/types.go
@@ -0,0 +1,419 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package channelz
+
+import (
+	"net"
+	"time"
+
+	"google.golang.org/grpc/connectivity"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/grpclog"
+)
+
+// entry represents a node in the channelz database.
+type entry interface {
+	// addChild adds a child e, whose channelz id is id to child list
+	addChild(id int64, e entry)
+	// deleteChild deletes a child with channelz id to be id from child list
+	deleteChild(id int64)
+	// triggerDelete tries to delete self from channelz database. However, if child
+	// list is not empty, then deletion from the database is on hold until the last
+	// child is deleted from database.
+	triggerDelete()
+	// deleteSelfIfReady check whether triggerDelete() has been called before, and whether child
+	// list is now empty. If both conditions are met, then delete self from database.
+	deleteSelfIfReady()
+}
+
+// dummyEntry is a fake entry to handle entry not found case.
+type dummyEntry struct {
+	idNotFound int64
+}
+
+func (d *dummyEntry) addChild(id int64, e entry) {
+	// Note: It is possible for a normal program to reach here under race condition.
+	// For example, there could be a race between ClientConn.Close() info being propagated
+	// to addrConn and http2Client. ClientConn.Close() cancel the context and result
+	// in http2Client to error. The error info is then caught by transport monitor
+	// and before addrConn.tearDown() is called in side ClientConn.Close(). Therefore,
+	// the addrConn will create a new transport. And when registering the new transport in
+	// channelz, its parent addrConn could have already been torn down and deleted
+	// from channelz tracking, and thus reach the code here.
+	grpclog.Infof("attempt to add child of type %T with id %d to a parent (id=%d) that doesn't currently exist", e, id, d.idNotFound)
+}
+
+func (d *dummyEntry) deleteChild(id int64) {
+	// It is possible for a normal program to reach here under race condition.
+	// Refer to the example described in addChild().
+	grpclog.Infof("attempt to delete child with id %d from a parent (id=%d) that doesn't currently exist", id, d.idNotFound)
+}
+
+func (d *dummyEntry) triggerDelete() {
+	grpclog.Warningf("attempt to delete an entry (id=%d) that doesn't currently exist", d.idNotFound)
+}
+
+func (*dummyEntry) deleteSelfIfReady() {
+	// code should not reach here. deleteSelfIfReady is always called on an existing entry.
+}
+
+// ChannelMetric defines the info channelz provides for a specific Channel, which
+// includes ChannelInternalMetric and channelz-specific data, such as channelz id,
+// child list, etc.
+type ChannelMetric struct {
+	// ID is the channelz id of this channel.
+	ID int64
+	// RefName is the human readable reference string of this channel.
+	RefName string
+	// ChannelData contains channel internal metric reported by the channel through
+	// ChannelzMetric().
+	ChannelData *ChannelInternalMetric
+	// NestedChans tracks the nested channel type children of this channel in the format of
+	// a map from nested channel channelz id to corresponding reference string.
+	NestedChans map[int64]string
+	// SubChans tracks the subchannel type children of this channel in the format of a
+	// map from subchannel channelz id to corresponding reference string.
+	SubChans map[int64]string
+	// Sockets tracks the socket type children of this channel in the format of a map
+	// from socket channelz id to corresponding reference string.
+	// Note current grpc implementation doesn't allow channel having sockets directly,
+	// therefore, this is field is unused.
+	Sockets map[int64]string
+}
+
+// SubChannelMetric defines the info channelz provides for a specific SubChannel,
+// which includes ChannelInternalMetric and channelz-specific data, such as
+// channelz id, child list, etc.
+type SubChannelMetric struct {
+	// ID is the channelz id of this subchannel.
+	ID int64
+	// RefName is the human readable reference string of this subchannel.
+	RefName string
+	// ChannelData contains subchannel internal metric reported by the subchannel
+	// through ChannelzMetric().
+	ChannelData *ChannelInternalMetric
+	// NestedChans tracks the nested channel type children of this subchannel in the format of
+	// a map from nested channel channelz id to corresponding reference string.
+	// Note current grpc implementation doesn't allow subchannel to have nested channels
+	// as children, therefore, this field is unused.
+	NestedChans map[int64]string
+	// SubChans tracks the subchannel type children of this subchannel in the format of a
+	// map from subchannel channelz id to corresponding reference string.
+	// Note current grpc implementation doesn't allow subchannel to have subchannels
+	// as children, therefore, this field is unused.
+	SubChans map[int64]string
+	// Sockets tracks the socket type children of this subchannel in the format of a map
+	// from socket channelz id to corresponding reference string.
+	Sockets map[int64]string
+}
+
+// ChannelInternalMetric defines the struct that the implementor of Channel interface
+// should return from ChannelzMetric().
+type ChannelInternalMetric struct {
+	// current connectivity state of the channel.
+	State connectivity.State
+	// The target this channel originally tried to connect to.  May be absent
+	Target string
+	// The number of calls started on the channel.
+	CallsStarted int64
+	// The number of calls that have completed with an OK status.
+	CallsSucceeded int64
+	// The number of calls that have a completed with a non-OK status.
+	CallsFailed int64
+	// The last time a call was started on the channel.
+	LastCallStartedTimestamp time.Time
+	//TODO: trace
+}
+
+// Channel is the interface that should be satisfied in order to be tracked by
+// channelz as Channel or SubChannel.
+type Channel interface {
+	ChannelzMetric() *ChannelInternalMetric
+}
+
+type channel struct {
+	refName     string
+	c           Channel
+	closeCalled bool
+	nestedChans map[int64]string
+	subChans    map[int64]string
+	id          int64
+	pid         int64
+	cm          *channelMap
+}
+
+func (c *channel) addChild(id int64, e entry) {
+	switch v := e.(type) {
+	case *subChannel:
+		c.subChans[id] = v.refName
+	case *channel:
+		c.nestedChans[id] = v.refName
+	default:
+		grpclog.Errorf("cannot add a child (id = %d) of type %T to a channel", id, e)
+	}
+}
+
+func (c *channel) deleteChild(id int64) {
+	delete(c.subChans, id)
+	delete(c.nestedChans, id)
+	c.deleteSelfIfReady()
+}
+
+func (c *channel) triggerDelete() {
+	c.closeCalled = true
+	c.deleteSelfIfReady()
+}
+
+func (c *channel) deleteSelfIfReady() {
+	if !c.closeCalled || len(c.subChans)+len(c.nestedChans) != 0 {
+		return
+	}
+	c.cm.deleteEntry(c.id)
+	// not top channel
+	if c.pid != 0 {
+		c.cm.findEntry(c.pid).deleteChild(c.id)
+	}
+}
+
+type subChannel struct {
+	refName     string
+	c           Channel
+	closeCalled bool
+	sockets     map[int64]string
+	id          int64
+	pid         int64
+	cm          *channelMap
+}
+
+func (sc *subChannel) addChild(id int64, e entry) {
+	if v, ok := e.(*normalSocket); ok {
+		sc.sockets[id] = v.refName
+	} else {
+		grpclog.Errorf("cannot add a child (id = %d) of type %T to a subChannel", id, e)
+	}
+}
+
+func (sc *subChannel) deleteChild(id int64) {
+	delete(sc.sockets, id)
+	sc.deleteSelfIfReady()
+}
+
+func (sc *subChannel) triggerDelete() {
+	sc.closeCalled = true
+	sc.deleteSelfIfReady()
+}
+
+func (sc *subChannel) deleteSelfIfReady() {
+	if !sc.closeCalled || len(sc.sockets) != 0 {
+		return
+	}
+	sc.cm.deleteEntry(sc.id)
+	sc.cm.findEntry(sc.pid).deleteChild(sc.id)
+}
+
+// SocketMetric defines the info channelz provides for a specific Socket, which
+// includes SocketInternalMetric and channelz-specific data, such as channelz id, etc.
+type SocketMetric struct {
+	// ID is the channelz id of this socket.
+	ID int64
+	// RefName is the human readable reference string of this socket.
+	RefName string
+	// SocketData contains socket internal metric reported by the socket through
+	// ChannelzMetric().
+	SocketData *SocketInternalMetric
+}
+
+// SocketInternalMetric defines the struct that the implementor of Socket interface
+// should return from ChannelzMetric().
+type SocketInternalMetric struct {
+	// The number of streams that have been started.
+	StreamsStarted int64
+	// The number of streams that have ended successfully:
+	// On client side, receiving frame with eos bit set.
+	// On server side, sending frame with eos bit set.
+	StreamsSucceeded int64
+	// The number of streams that have ended unsuccessfully:
+	// On client side, termination without receiving frame with eos bit set.
+	// On server side, termination without sending frame with eos bit set.
+	StreamsFailed int64
+	// The number of messages successfully sent on this socket.
+	MessagesSent     int64
+	MessagesReceived int64
+	// The number of keep alives sent.  This is typically implemented with HTTP/2
+	// ping messages.
+	KeepAlivesSent int64
+	// The last time a stream was created by this endpoint.  Usually unset for
+	// servers.
+	LastLocalStreamCreatedTimestamp time.Time
+	// The last time a stream was created by the remote endpoint.  Usually unset
+	// for clients.
+	LastRemoteStreamCreatedTimestamp time.Time
+	// The last time a message was sent by this endpoint.
+	LastMessageSentTimestamp time.Time
+	// The last time a message was received by this endpoint.
+	LastMessageReceivedTimestamp time.Time
+	// The amount of window, granted to the local endpoint by the remote endpoint.
+	// This may be slightly out of date due to network latency.  This does NOT
+	// include stream level or TCP level flow control info.
+	LocalFlowControlWindow int64
+	// The amount of window, granted to the remote endpoint by the local endpoint.
+	// This may be slightly out of date due to network latency.  This does NOT
+	// include stream level or TCP level flow control info.
+	RemoteFlowControlWindow int64
+	// The locally bound address.
+	LocalAddr net.Addr
+	// The remote bound address.  May be absent.
+	RemoteAddr net.Addr
+	// Optional, represents the name of the remote endpoint, if different than
+	// the original target name.
+	RemoteName    string
+	SocketOptions *SocketOptionData
+	Security      credentials.ChannelzSecurityValue
+}
+
+// Socket is the interface that should be satisfied in order to be tracked by
+// channelz as Socket.
+type Socket interface {
+	ChannelzMetric() *SocketInternalMetric
+}
+
+type listenSocket struct {
+	refName string
+	s       Socket
+	id      int64
+	pid     int64
+	cm      *channelMap
+}
+
+func (ls *listenSocket) addChild(id int64, e entry) {
+	grpclog.Errorf("cannot add a child (id = %d) of type %T to a listen socket", id, e)
+}
+
+func (ls *listenSocket) deleteChild(id int64) {
+	grpclog.Errorf("cannot delete a child (id = %d) from a listen socket", id)
+}
+
+func (ls *listenSocket) triggerDelete() {
+	ls.cm.deleteEntry(ls.id)
+	ls.cm.findEntry(ls.pid).deleteChild(ls.id)
+}
+
+func (ls *listenSocket) deleteSelfIfReady() {
+	grpclog.Errorf("cannot call deleteSelfIfReady on a listen socket")
+}
+
+type normalSocket struct {
+	refName string
+	s       Socket
+	id      int64
+	pid     int64
+	cm      *channelMap
+}
+
+func (ns *normalSocket) addChild(id int64, e entry) {
+	grpclog.Errorf("cannot add a child (id = %d) of type %T to a normal socket", id, e)
+}
+
+func (ns *normalSocket) deleteChild(id int64) {
+	grpclog.Errorf("cannot delete a child (id = %d) from a normal socket", id)
+}
+
+func (ns *normalSocket) triggerDelete() {
+	ns.cm.deleteEntry(ns.id)
+	ns.cm.findEntry(ns.pid).deleteChild(ns.id)
+}
+
+func (ns *normalSocket) deleteSelfIfReady() {
+	grpclog.Errorf("cannot call deleteSelfIfReady on a normal socket")
+}
+
+// ServerMetric defines the info channelz provides for a specific Server, which
+// includes ServerInternalMetric and channelz-specific data, such as channelz id,
+// child list, etc.
+type ServerMetric struct {
+	// ID is the channelz id of this server.
+	ID int64
+	// RefName is the human readable reference string of this server.
+	RefName string
+	// ServerData contains server internal metric reported by the server through
+	// ChannelzMetric().
+	ServerData *ServerInternalMetric
+	// ListenSockets tracks the listener socket type children of this server in the
+	// format of a map from socket channelz id to corresponding reference string.
+	ListenSockets map[int64]string
+}
+
+// ServerInternalMetric defines the struct that the implementor of Server interface
+// should return from ChannelzMetric().
+type ServerInternalMetric struct {
+	// The number of incoming calls started on the server.
+	CallsStarted int64
+	// The number of incoming calls that have completed with an OK status.
+	CallsSucceeded int64
+	// The number of incoming calls that have a completed with a non-OK status.
+	CallsFailed int64
+	// The last time a call was started on the server.
+	LastCallStartedTimestamp time.Time
+	//TODO: trace
+}
+
+// Server is the interface to be satisfied in order to be tracked by channelz as
+// Server.
+type Server interface {
+	ChannelzMetric() *ServerInternalMetric
+}
+
+type server struct {
+	refName       string
+	s             Server
+	closeCalled   bool
+	sockets       map[int64]string
+	listenSockets map[int64]string
+	id            int64
+	cm            *channelMap
+}
+
+func (s *server) addChild(id int64, e entry) {
+	switch v := e.(type) {
+	case *normalSocket:
+		s.sockets[id] = v.refName
+	case *listenSocket:
+		s.listenSockets[id] = v.refName
+	default:
+		grpclog.Errorf("cannot add a child (id = %d) of type %T to a server", id, e)
+	}
+}
+
+func (s *server) deleteChild(id int64) {
+	delete(s.sockets, id)
+	delete(s.listenSockets, id)
+	s.deleteSelfIfReady()
+}
+
+func (s *server) triggerDelete() {
+	s.closeCalled = true
+	s.deleteSelfIfReady()
+}
+
+func (s *server) deleteSelfIfReady() {
+	if !s.closeCalled || len(s.sockets)+len(s.listenSockets) != 0 {
+		return
+	}
+	s.cm.deleteEntry(s.id)
+}
diff --git a/vendor/google.golang.org/grpc/internal/channelz/types_linux.go b/vendor/google.golang.org/grpc/internal/channelz/types_linux.go
new file mode 100644
index 00000000..9801c3e2
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/channelz/types_linux.go
@@ -0,0 +1,54 @@
+// +build !appengine,go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package channelz
+
+import (
+	"syscall"
+
+	"golang.org/x/sys/unix"
+)
+
+// SocketOptionData defines the struct to hold socket option data, and related
+// getter function to obtain info from fd.
+type SocketOptionData struct {
+	Linger      *unix.Linger
+	RecvTimeout *unix.Timeval
+	SendTimeout *unix.Timeval
+	TCPInfo     *unix.TCPInfo
+}
+
+// Getsockopt defines the function to get socket options requested by channelz.
+// It is to be passed to syscall.RawConn.Control().
+func (s *SocketOptionData) Getsockopt(fd uintptr) {
+	if v, err := unix.GetsockoptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER); err == nil {
+		s.Linger = v
+	}
+	if v, err := unix.GetsockoptTimeval(int(fd), syscall.SOL_SOCKET, syscall.SO_RCVTIMEO); err == nil {
+		s.RecvTimeout = v
+	}
+	if v, err := unix.GetsockoptTimeval(int(fd), syscall.SOL_SOCKET, syscall.SO_SNDTIMEO); err == nil {
+		s.SendTimeout = v
+	}
+	if v, err := unix.GetsockoptTCPInfo(int(fd), syscall.SOL_TCP, syscall.TCP_INFO); err == nil {
+		s.TCPInfo = v
+	}
+	return
+}
diff --git a/vendor/google.golang.org/grpc/internal/channelz/types_nonlinux.go b/vendor/google.golang.org/grpc/internal/channelz/types_nonlinux.go
new file mode 100644
index 00000000..884910c4
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/channelz/types_nonlinux.go
@@ -0,0 +1,38 @@
+// +build !linux appengine !go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package channelz
+
+import "google.golang.org/grpc/grpclog"
+
+func init() {
+	grpclog.Infof("Channelz: socket options are not supported on non-linux os and appengine.")
+}
+
+// SocketOptionData defines the struct to hold socket option data, and related
+// getter function to obtain info from fd.
+// Windows OS doesn't support Socket Option
+type SocketOptionData struct {
+}
+
+// Getsockopt defines the function to get socket options requested by channelz.
+// It is to be passed to syscall.RawConn.Control().
+// Windows OS doesn't support Socket Option
+func (s *SocketOptionData) Getsockopt(fd uintptr) {}
diff --git a/vendor/google.golang.org/grpc/internal/channelz/util_linux_go19.go b/vendor/google.golang.org/grpc/internal/channelz/util_linux_go19.go
new file mode 100644
index 00000000..e1e9e32d
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/channelz/util_linux_go19.go
@@ -0,0 +1,39 @@
+// +build linux,go1.9,!appengine
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package channelz
+
+import (
+	"syscall"
+)
+
+// GetSocketOption gets the socket option info of the conn.
+func GetSocketOption(socket interface{}) *SocketOptionData {
+	c, ok := socket.(syscall.Conn)
+	if !ok {
+		return nil
+	}
+	data := &SocketOptionData{}
+	if rawConn, err := c.SyscallConn(); err == nil {
+		rawConn.Control(data.Getsockopt)
+		return data
+	}
+	return nil
+}
diff --git a/vendor/google.golang.org/grpc/internal/channelz/util_nonlinux_pre_go19.go b/vendor/google.golang.org/grpc/internal/channelz/util_nonlinux_pre_go19.go
new file mode 100644
index 00000000..1d4da952
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/channelz/util_nonlinux_pre_go19.go
@@ -0,0 +1,26 @@
+// +build !linux !go1.9 appengine
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package channelz
+
+// GetSocketOption gets the socket option info of the conn.
+func GetSocketOption(c interface{}) *SocketOptionData {
+	return nil
+}
diff --git a/vendor/google.golang.org/grpc/internal/channelz/util_test.go b/vendor/google.golang.org/grpc/internal/channelz/util_test.go
new file mode 100644
index 00000000..4f3245fa
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/channelz/util_test.go
@@ -0,0 +1,91 @@
+// +build linux,go1.10,!appengine
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// The test in this file should be run in an environment that has go1.10 or later,
+// as the function SyscallConn() (required to get socket option) was introduced
+// to net.TCPListener in go1.10.
+
+package channelz_test
+
+import (
+	"net"
+	"reflect"
+	"syscall"
+	"testing"
+
+	"golang.org/x/sys/unix"
+	"google.golang.org/grpc/internal/channelz"
+)
+
+func TestGetSocketOpt(t *testing.T) {
+	network, addr := "tcp", ":0"
+	ln, err := net.Listen(network, addr)
+	if err != nil {
+		t.Fatalf("net.Listen(%s,%s) failed with err: %v", network, addr, err)
+	}
+	defer ln.Close()
+	go func() {
+		ln.Accept()
+	}()
+	conn, _ := net.Dial(network, ln.Addr().String())
+	defer conn.Close()
+	tcpc := conn.(*net.TCPConn)
+	raw, err := tcpc.SyscallConn()
+	if err != nil {
+		t.Fatalf("SyscallConn() failed due to %v", err)
+	}
+
+	l := &unix.Linger{Onoff: 1, Linger: 5}
+	recvTimout := &unix.Timeval{Sec: 100}
+	sendTimeout := &unix.Timeval{Sec: 8888}
+	raw.Control(func(fd uintptr) {
+		var err error
+		err = unix.SetsockoptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, l)
+		if err != nil {
+			t.Fatalf("failed to SetsockoptLinger(%v,%v,%v,%v) due to %v", int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, l, err)
+		}
+		err = unix.SetsockoptTimeval(int(fd), syscall.SOL_SOCKET, syscall.SO_RCVTIMEO, recvTimout)
+		if err != nil {
+			t.Fatalf("failed to SetsockoptTimeval(%v,%v,%v,%v) due to %v", int(fd), syscall.SOL_SOCKET, syscall.SO_RCVTIMEO, recvTimout, err)
+		}
+		err = unix.SetsockoptTimeval(int(fd), syscall.SOL_SOCKET, syscall.SO_SNDTIMEO, sendTimeout)
+		if err != nil {
+			t.Fatalf("failed to SetsockoptTimeval(%v,%v,%v,%v) due to %v", int(fd), syscall.SOL_SOCKET, syscall.SO_SNDTIMEO, sendTimeout, err)
+		}
+	})
+	sktopt := channelz.GetSocketOption(conn)
+	if !reflect.DeepEqual(sktopt.Linger, l) {
+		t.Fatalf("get socket option linger, want: %v, got %v", l, sktopt.Linger)
+	}
+	if !reflect.DeepEqual(sktopt.RecvTimeout, recvTimout) {
+		t.Logf("get socket option recv timeout, want: %v, got %v, may be caused by system allowing non or partial setting of this value", recvTimout, sktopt.RecvTimeout)
+	}
+	if !reflect.DeepEqual(sktopt.SendTimeout, sendTimeout) {
+		t.Logf("get socket option send timeout, want: %v, got %v, may be caused by system allowing non or partial setting of this value", sendTimeout, sktopt.SendTimeout)
+	}
+	if sktopt == nil || sktopt.TCPInfo != nil && sktopt.TCPInfo.State != 1 {
+		t.Fatalf("TCPInfo.State want 1 (TCP_ESTABLISHED), got %v", sktopt)
+	}
+
+	sktopt = channelz.GetSocketOption(ln)
+	if sktopt == nil || sktopt.TCPInfo == nil || sktopt.TCPInfo.State != 10 {
+		t.Fatalf("TCPInfo.State want 10 (TCP_LISTEN), got %v", sktopt)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go b/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
new file mode 100644
index 00000000..3ee8740f
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
@@ -0,0 +1,35 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package envconfig contains grpc settings configured by environment variables.
+package envconfig
+
+import (
+	"os"
+	"strings"
+)
+
+const (
+	prefix   = "GRPC_GO_"
+	retryStr = prefix + "RETRY"
+)
+
+var (
+	// Retry is set if retry is explicitly enabled via "GRPC_GO_RETRY=on".
+	Retry = strings.EqualFold(os.Getenv(retryStr), "on")
+)
diff --git a/vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go b/vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go
new file mode 100644
index 00000000..200b115c
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/grpcrand/grpcrand.go
@@ -0,0 +1,56 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package grpcrand implements math/rand functions in a concurrent-safe way
+// with a global random source, independent of math/rand's global source.
+package grpcrand
+
+import (
+	"math/rand"
+	"sync"
+	"time"
+)
+
+var (
+	r  = rand.New(rand.NewSource(time.Now().UnixNano()))
+	mu sync.Mutex
+)
+
+// Int63n implements rand.Int63n on the grpcrand global source.
+func Int63n(n int64) int64 {
+	mu.Lock()
+	res := r.Int63n(n)
+	mu.Unlock()
+	return res
+}
+
+// Intn implements rand.Intn on the grpcrand global source.
+func Intn(n int) int {
+	mu.Lock()
+	res := r.Intn(n)
+	mu.Unlock()
+	return res
+}
+
+// Float64 implements rand.Float64 on the grpcrand global source.
+func Float64() float64 {
+	mu.Lock()
+	res := r.Float64()
+	mu.Unlock()
+	return res
+}
diff --git a/vendor/google.golang.org/grpc/internal/grpcsync/event.go b/vendor/google.golang.org/grpc/internal/grpcsync/event.go
new file mode 100644
index 00000000..85dbea88
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/grpcsync/event.go
@@ -0,0 +1,61 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package grpcsync implements additional synchronization primitives built upon
+// the sync package.
+package grpcsync
+
+import "sync"
+
+// Event represents a one-time event that may occur in the future.
+type Event struct {
+	c chan struct{}
+	o sync.Once
+}
+
+// Fire causes e to complete.  It is safe to call multiple times, and
+// concurrently.  It returns true iff this call to Fire caused the signaling
+// channel returned by Done to close.
+func (e *Event) Fire() bool {
+	ret := false
+	e.o.Do(func() {
+		close(e.c)
+		ret = true
+	})
+	return ret
+}
+
+// Done returns a channel that will be closed when Fire is called.
+func (e *Event) Done() <-chan struct{} {
+	return e.c
+}
+
+// HasFired returns true if Fire has been called.
+func (e *Event) HasFired() bool {
+	select {
+	case <-e.c:
+		return true
+	default:
+		return false
+	}
+}
+
+// NewEvent returns a new, ready-to-use Event.
+func NewEvent() *Event {
+	return &Event{c: make(chan struct{})}
+}
diff --git a/vendor/google.golang.org/grpc/internal/grpcsync/event_test.go b/vendor/google.golang.org/grpc/internal/grpcsync/event_test.go
new file mode 100644
index 00000000..af64d183
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/grpcsync/event_test.go
@@ -0,0 +1,69 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package grpcsync
+
+import "testing"
+
+func TestEventHasFired(t *testing.T) {
+	e := NewEvent()
+	if e.HasFired() {
+		t.Fatal("e.HasFired() = true; want false")
+	}
+	if !e.Fire() {
+		t.Fatal("e.Fire() = false; want true")
+	}
+	if !e.HasFired() {
+		t.Fatal("e.HasFired() = false; want true")
+	}
+}
+
+func TestEventDoneChannel(t *testing.T) {
+	e := NewEvent()
+	select {
+	case <-e.Done():
+		t.Fatal("e.HasFired() = true; want false")
+	default:
+	}
+	if !e.Fire() {
+		t.Fatal("e.Fire() = false; want true")
+	}
+	select {
+	case <-e.Done():
+	default:
+		t.Fatal("e.HasFired() = false; want true")
+	}
+}
+
+func TestEventMultipleFires(t *testing.T) {
+	e := NewEvent()
+	if e.HasFired() {
+		t.Fatal("e.HasFired() = true; want false")
+	}
+	if !e.Fire() {
+		t.Fatal("e.Fire() = false; want true")
+	}
+	for i := 0; i < 3; i++ {
+		if !e.HasFired() {
+			t.Fatal("e.HasFired() = false; want true")
+		}
+		if e.Fire() {
+			t.Fatal("e.Fire() = true; want false")
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/internal/internal.go b/vendor/google.golang.org/grpc/internal/internal.go
index 53f17752..cd34267f 100644
--- a/vendor/google.golang.org/grpc/internal/internal.go
+++ b/vendor/google.golang.org/grpc/internal/internal.go
@@ -15,13 +15,22 @@
  *
  */
 
-// Package internal contains gRPC-internal code for testing, to avoid polluting
-// the godoc of the top-level grpc package.
+// Package internal contains gRPC-internal code, to avoid polluting
+// the godoc of the top-level grpc package.  It must not import any grpc
+// symbols to avoid circular dependencies.
 package internal
 
-// TestingUseHandlerImpl enables the http.Handler-based server implementation.
-// It must be called before Serve and requires TLS credentials.
-//
-// The provided grpcServer must be of type *grpc.Server. It is untyped
-// for circular dependency reasons.
-var TestingUseHandlerImpl func(grpcServer interface{})
+var (
+
+	// TestingUseHandlerImpl enables the http.Handler-based server implementation.
+	// It must be called before Serve and requires TLS credentials.
+	//
+	// The provided grpcServer must be of type *grpc.Server. It is untyped
+	// for circular dependency reasons.
+	TestingUseHandlerImpl func(grpcServer interface{})
+
+	// WithContextDialer is exported by clientconn.go
+	WithContextDialer interface{} // func(context.Context, string) (net.Conn, error) grpc.DialOption
+	// WithResolverBuilder is exported by clientconn.go
+	WithResolverBuilder interface{} // func (resolver.Builder) grpc.DialOption
+)
diff --git a/vendor/google.golang.org/grpc/test/leakcheck/leakcheck.go b/vendor/google.golang.org/grpc/internal/leakcheck/leakcheck.go
similarity index 100%
rename from vendor/google.golang.org/grpc/test/leakcheck/leakcheck.go
rename to vendor/google.golang.org/grpc/internal/leakcheck/leakcheck.go
diff --git a/vendor/google.golang.org/grpc/test/leakcheck/leakcheck_test.go b/vendor/google.golang.org/grpc/internal/leakcheck/leakcheck_test.go
similarity index 100%
rename from vendor/google.golang.org/grpc/test/leakcheck/leakcheck_test.go
rename to vendor/google.golang.org/grpc/internal/leakcheck/leakcheck_test.go
diff --git a/vendor/google.golang.org/grpc/internal/syscall/syscall_linux.go b/vendor/google.golang.org/grpc/internal/syscall/syscall_linux.go
new file mode 100644
index 00000000..87bc65a1
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/syscall/syscall_linux.go
@@ -0,0 +1,67 @@
+// +build !appengine,go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package syscall provides functionalities that grpc uses to get low-level operating system
+// stats/info.
+package syscall
+
+import (
+	"syscall"
+
+	"golang.org/x/sys/unix"
+	"google.golang.org/grpc/grpclog"
+)
+
+// GetCPUTime returns the how much CPU time has passed since the start of this process.
+func GetCPUTime() int64 {
+	var ts unix.Timespec
+	if err := unix.ClockGettime(unix.CLOCK_PROCESS_CPUTIME_ID, &ts); err != nil {
+		grpclog.Fatal(err)
+	}
+	return ts.Nano()
+}
+
+// Rusage is an alias for syscall.Rusage under linux non-appengine environment.
+type Rusage syscall.Rusage
+
+// GetRusage returns the resource usage of current process.
+func GetRusage() (rusage *Rusage) {
+	rusage = new(Rusage)
+	syscall.Getrusage(syscall.RUSAGE_SELF, (*syscall.Rusage)(rusage))
+	return
+}
+
+// CPUTimeDiff returns the differences of user CPU time and system CPU time used
+// between two Rusage structs.
+func CPUTimeDiff(first *Rusage, latest *Rusage) (float64, float64) {
+	f := (*syscall.Rusage)(first)
+	l := (*syscall.Rusage)(latest)
+	var (
+		utimeDiffs  = l.Utime.Sec - f.Utime.Sec
+		utimeDiffus = l.Utime.Usec - f.Utime.Usec
+		stimeDiffs  = l.Stime.Sec - f.Stime.Sec
+		stimeDiffus = l.Stime.Usec - f.Stime.Usec
+	)
+
+	uTimeElapsed := float64(utimeDiffs) + float64(utimeDiffus)*1.0e-6
+	sTimeElapsed := float64(stimeDiffs) + float64(stimeDiffus)*1.0e-6
+
+	return uTimeElapsed, sTimeElapsed
+}
diff --git a/vendor/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go b/vendor/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go
new file mode 100644
index 00000000..16a5c3fe
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go
@@ -0,0 +1,47 @@
+// +build !linux appengine !go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package syscall
+
+import "google.golang.org/grpc/grpclog"
+
+func init() {
+	grpclog.Info("CPU time info is unavailable on non-linux or appengine environment.")
+}
+
+// GetCPUTime returns the how much CPU time has passed since the start of this process.
+// It always returns 0 under non-linux or appengine environment.
+func GetCPUTime() int64 {
+	return 0
+}
+
+// Rusage is an empty struct under non-linux or appengine environment.
+type Rusage struct{}
+
+// GetRusage is a no-op function under non-linux or appengine environment.
+func GetRusage() (rusage *Rusage) {
+	return nil
+}
+
+// CPUTimeDiff returns the differences of user CPU time and system CPU time used
+// between two Rusage structs. It a no-op function for non-linux or appengine environment.
+func CPUTimeDiff(first *Rusage, latest *Rusage) (float64, float64) {
+	return 0, 0
+}
diff --git a/vendor/google.golang.org/grpc/transport/bdp_estimator.go b/vendor/google.golang.org/grpc/internal/transport/bdp_estimator.go
similarity index 100%
rename from vendor/google.golang.org/grpc/transport/bdp_estimator.go
rename to vendor/google.golang.org/grpc/internal/transport/bdp_estimator.go
diff --git a/vendor/google.golang.org/grpc/internal/transport/controlbuf.go b/vendor/google.golang.org/grpc/internal/transport/controlbuf.go
new file mode 100644
index 00000000..ce135c4d
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/transport/controlbuf.go
@@ -0,0 +1,856 @@
+/*
+ *
+ * Copyright 2014 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package transport
+
+import (
+	"bytes"
+	"fmt"
+	"runtime"
+	"sync"
+
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
+)
+
+var updateHeaderTblSize = func(e *hpack.Encoder, v uint32) {
+	e.SetMaxDynamicTableSizeLimit(v)
+}
+
+type itemNode struct {
+	it   interface{}
+	next *itemNode
+}
+
+type itemList struct {
+	head *itemNode
+	tail *itemNode
+}
+
+func (il *itemList) enqueue(i interface{}) {
+	n := &itemNode{it: i}
+	if il.tail == nil {
+		il.head, il.tail = n, n
+		return
+	}
+	il.tail.next = n
+	il.tail = n
+}
+
+// peek returns the first item in the list without removing it from the
+// list.
+func (il *itemList) peek() interface{} {
+	return il.head.it
+}
+
+func (il *itemList) dequeue() interface{} {
+	if il.head == nil {
+		return nil
+	}
+	i := il.head.it
+	il.head = il.head.next
+	if il.head == nil {
+		il.tail = nil
+	}
+	return i
+}
+
+func (il *itemList) dequeueAll() *itemNode {
+	h := il.head
+	il.head, il.tail = nil, nil
+	return h
+}
+
+func (il *itemList) isEmpty() bool {
+	return il.head == nil
+}
+
+// The following defines various control items which could flow through
+// the control buffer of transport. They represent different aspects of
+// control tasks, e.g., flow control, settings, streaming resetting, etc.
+
+// registerStream is used to register an incoming stream with loopy writer.
+type registerStream struct {
+	streamID uint32
+	wq       *writeQuota
+}
+
+// headerFrame is also used to register stream on the client-side.
+type headerFrame struct {
+	streamID   uint32
+	hf         []hpack.HeaderField
+	endStream  bool                       // Valid on server side.
+	initStream func(uint32) (bool, error) // Used only on the client side.
+	onWrite    func()
+	wq         *writeQuota    // write quota for the stream created.
+	cleanup    *cleanupStream // Valid on the server side.
+	onOrphaned func(error)    // Valid on client-side
+}
+
+type cleanupStream struct {
+	streamID uint32
+	idPtr    *uint32
+	rst      bool
+	rstCode  http2.ErrCode
+	onWrite  func()
+}
+
+type dataFrame struct {
+	streamID  uint32
+	endStream bool
+	h         []byte
+	d         []byte
+	// onEachWrite is called every time
+	// a part of d is written out.
+	onEachWrite func()
+}
+
+type incomingWindowUpdate struct {
+	streamID  uint32
+	increment uint32
+}
+
+type outgoingWindowUpdate struct {
+	streamID  uint32
+	increment uint32
+}
+
+type incomingSettings struct {
+	ss []http2.Setting
+}
+
+type outgoingSettings struct {
+	ss []http2.Setting
+}
+
+type settingsAck struct {
+}
+
+type incomingGoAway struct {
+}
+
+type goAway struct {
+	code      http2.ErrCode
+	debugData []byte
+	headsUp   bool
+	closeConn bool
+}
+
+type ping struct {
+	ack  bool
+	data [8]byte
+}
+
+type outFlowControlSizeRequest struct {
+	resp chan uint32
+}
+
+type outStreamState int
+
+const (
+	active outStreamState = iota
+	empty
+	waitingOnStreamQuota
+)
+
+type outStream struct {
+	id               uint32
+	state            outStreamState
+	itl              *itemList
+	bytesOutStanding int
+	wq               *writeQuota
+
+	next *outStream
+	prev *outStream
+}
+
+func (s *outStream) deleteSelf() {
+	if s.prev != nil {
+		s.prev.next = s.next
+	}
+	if s.next != nil {
+		s.next.prev = s.prev
+	}
+	s.next, s.prev = nil, nil
+}
+
+type outStreamList struct {
+	// Following are sentinel objects that mark the
+	// beginning and end of the list. They do not
+	// contain any item lists. All valid objects are
+	// inserted in between them.
+	// This is needed so that an outStream object can
+	// deleteSelf() in O(1) time without knowing which
+	// list it belongs to.
+	head *outStream
+	tail *outStream
+}
+
+func newOutStreamList() *outStreamList {
+	head, tail := new(outStream), new(outStream)
+	head.next = tail
+	tail.prev = head
+	return &outStreamList{
+		head: head,
+		tail: tail,
+	}
+}
+
+func (l *outStreamList) enqueue(s *outStream) {
+	e := l.tail.prev
+	e.next = s
+	s.prev = e
+	s.next = l.tail
+	l.tail.prev = s
+}
+
+// remove from the beginning of the list.
+func (l *outStreamList) dequeue() *outStream {
+	b := l.head.next
+	if b == l.tail {
+		return nil
+	}
+	b.deleteSelf()
+	return b
+}
+
+// controlBuffer is a way to pass information to loopy.
+// Information is passed as specific struct types called control frames.
+// A control frame not only represents data, messages or headers to be sent out
+// but can also be used to instruct loopy to update its internal state.
+// It shouldn't be confused with an HTTP2 frame, although some of the control frames
+// like dataFrame and headerFrame do go out on wire as HTTP2 frames.
+type controlBuffer struct {
+	ch              chan struct{}
+	done            <-chan struct{}
+	mu              sync.Mutex
+	consumerWaiting bool
+	list            *itemList
+	err             error
+}
+
+func newControlBuffer(done <-chan struct{}) *controlBuffer {
+	return &controlBuffer{
+		ch:   make(chan struct{}, 1),
+		list: &itemList{},
+		done: done,
+	}
+}
+
+func (c *controlBuffer) put(it interface{}) error {
+	_, err := c.executeAndPut(nil, it)
+	return err
+}
+
+func (c *controlBuffer) executeAndPut(f func(it interface{}) bool, it interface{}) (bool, error) {
+	var wakeUp bool
+	c.mu.Lock()
+	if c.err != nil {
+		c.mu.Unlock()
+		return false, c.err
+	}
+	if f != nil {
+		if !f(it) { // f wasn't successful
+			c.mu.Unlock()
+			return false, nil
+		}
+	}
+	if c.consumerWaiting {
+		wakeUp = true
+		c.consumerWaiting = false
+	}
+	c.list.enqueue(it)
+	c.mu.Unlock()
+	if wakeUp {
+		select {
+		case c.ch <- struct{}{}:
+		default:
+		}
+	}
+	return true, nil
+}
+
+// Note argument f should never be nil.
+func (c *controlBuffer) execute(f func(it interface{}) bool, it interface{}) (bool, error) {
+	c.mu.Lock()
+	if c.err != nil {
+		c.mu.Unlock()
+		return false, c.err
+	}
+	if !f(it) { // f wasn't successful
+		c.mu.Unlock()
+		return false, nil
+	}
+	c.mu.Unlock()
+	return true, nil
+}
+
+func (c *controlBuffer) get(block bool) (interface{}, error) {
+	for {
+		c.mu.Lock()
+		if c.err != nil {
+			c.mu.Unlock()
+			return nil, c.err
+		}
+		if !c.list.isEmpty() {
+			h := c.list.dequeue()
+			c.mu.Unlock()
+			return h, nil
+		}
+		if !block {
+			c.mu.Unlock()
+			return nil, nil
+		}
+		c.consumerWaiting = true
+		c.mu.Unlock()
+		select {
+		case <-c.ch:
+		case <-c.done:
+			c.finish()
+			return nil, ErrConnClosing
+		}
+	}
+}
+
+func (c *controlBuffer) finish() {
+	c.mu.Lock()
+	if c.err != nil {
+		c.mu.Unlock()
+		return
+	}
+	c.err = ErrConnClosing
+	// There may be headers for streams in the control buffer.
+	// These streams need to be cleaned out since the transport
+	// is still not aware of these yet.
+	for head := c.list.dequeueAll(); head != nil; head = head.next {
+		hdr, ok := head.it.(*headerFrame)
+		if !ok {
+			continue
+		}
+		if hdr.onOrphaned != nil { // It will be nil on the server-side.
+			hdr.onOrphaned(ErrConnClosing)
+		}
+	}
+	c.mu.Unlock()
+}
+
+type side int
+
+const (
+	clientSide side = iota
+	serverSide
+)
+
+// Loopy receives frames from the control buffer.
+// Each frame is handled individually; most of the work done by loopy goes
+// into handling data frames. Loopy maintains a queue of active streams, and each
+// stream maintains a queue of data frames; as loopy receives data frames
+// it gets added to the queue of the relevant stream.
+// Loopy goes over this list of active streams by processing one node every iteration,
+// thereby closely resemebling to a round-robin scheduling over all streams. While
+// processing a stream, loopy writes out data bytes from this stream capped by the min
+// of http2MaxFrameLen, connection-level flow control and stream-level flow control.
+type loopyWriter struct {
+	side      side
+	cbuf      *controlBuffer
+	sendQuota uint32
+	oiws      uint32 // outbound initial window size.
+	// estdStreams is map of all established streams that are not cleaned-up yet.
+	// On client-side, this is all streams whose headers were sent out.
+	// On server-side, this is all streams whose headers were received.
+	estdStreams map[uint32]*outStream // Established streams.
+	// activeStreams is a linked-list of all streams that have data to send and some
+	// stream-level flow control quota.
+	// Each of these streams internally have a list of data items(and perhaps trailers
+	// on the server-side) to be sent out.
+	activeStreams *outStreamList
+	framer        *framer
+	hBuf          *bytes.Buffer  // The buffer for HPACK encoding.
+	hEnc          *hpack.Encoder // HPACK encoder.
+	bdpEst        *bdpEstimator
+	draining      bool
+
+	// Side-specific handlers
+	ssGoAwayHandler func(*goAway) (bool, error)
+}
+
+func newLoopyWriter(s side, fr *framer, cbuf *controlBuffer, bdpEst *bdpEstimator) *loopyWriter {
+	var buf bytes.Buffer
+	l := &loopyWriter{
+		side:          s,
+		cbuf:          cbuf,
+		sendQuota:     defaultWindowSize,
+		oiws:          defaultWindowSize,
+		estdStreams:   make(map[uint32]*outStream),
+		activeStreams: newOutStreamList(),
+		framer:        fr,
+		hBuf:          &buf,
+		hEnc:          hpack.NewEncoder(&buf),
+		bdpEst:        bdpEst,
+	}
+	return l
+}
+
+const minBatchSize = 1000
+
+// run should be run in a separate goroutine.
+// It reads control frames from controlBuf and processes them by:
+// 1. Updating loopy's internal state, or/and
+// 2. Writing out HTTP2 frames on the wire.
+//
+// Loopy keeps all active streams with data to send in a linked-list.
+// All streams in the activeStreams linked-list must have both:
+// 1. Data to send, and
+// 2. Stream level flow control quota available.
+//
+// In each iteration of run loop, other than processing the incoming control
+// frame, loopy calls processData, which processes one node from the activeStreams linked-list.
+// This results in writing of HTTP2 frames into an underlying write buffer.
+// When there's no more control frames to read from controlBuf, loopy flushes the write buffer.
+// As an optimization, to increase the batch size for each flush, loopy yields the processor, once
+// if the batch size is too low to give stream goroutines a chance to fill it up.
+func (l *loopyWriter) run() (err error) {
+	defer func() {
+		if err == ErrConnClosing {
+			// Don't log ErrConnClosing as error since it happens
+			// 1. When the connection is closed by some other known issue.
+			// 2. User closed the connection.
+			// 3. A graceful close of connection.
+			infof("transport: loopyWriter.run returning. %v", err)
+			err = nil
+		}
+	}()
+	for {
+		it, err := l.cbuf.get(true)
+		if err != nil {
+			return err
+		}
+		if err = l.handle(it); err != nil {
+			return err
+		}
+		if _, err = l.processData(); err != nil {
+			return err
+		}
+		gosched := true
+	hasdata:
+		for {
+			it, err := l.cbuf.get(false)
+			if err != nil {
+				return err
+			}
+			if it != nil {
+				if err = l.handle(it); err != nil {
+					return err
+				}
+				if _, err = l.processData(); err != nil {
+					return err
+				}
+				continue hasdata
+			}
+			isEmpty, err := l.processData()
+			if err != nil {
+				return err
+			}
+			if !isEmpty {
+				continue hasdata
+			}
+			if gosched {
+				gosched = false
+				if l.framer.writer.offset < minBatchSize {
+					runtime.Gosched()
+					continue hasdata
+				}
+			}
+			l.framer.writer.Flush()
+			break hasdata
+
+		}
+	}
+}
+
+func (l *loopyWriter) outgoingWindowUpdateHandler(w *outgoingWindowUpdate) error {
+	return l.framer.fr.WriteWindowUpdate(w.streamID, w.increment)
+}
+
+func (l *loopyWriter) incomingWindowUpdateHandler(w *incomingWindowUpdate) error {
+	// Otherwise update the quota.
+	if w.streamID == 0 {
+		l.sendQuota += w.increment
+		return nil
+	}
+	// Find the stream and update it.
+	if str, ok := l.estdStreams[w.streamID]; ok {
+		str.bytesOutStanding -= int(w.increment)
+		if strQuota := int(l.oiws) - str.bytesOutStanding; strQuota > 0 && str.state == waitingOnStreamQuota {
+			str.state = active
+			l.activeStreams.enqueue(str)
+			return nil
+		}
+	}
+	return nil
+}
+
+func (l *loopyWriter) outgoingSettingsHandler(s *outgoingSettings) error {
+	return l.framer.fr.WriteSettings(s.ss...)
+}
+
+func (l *loopyWriter) incomingSettingsHandler(s *incomingSettings) error {
+	if err := l.applySettings(s.ss); err != nil {
+		return err
+	}
+	return l.framer.fr.WriteSettingsAck()
+}
+
+func (l *loopyWriter) registerStreamHandler(h *registerStream) error {
+	str := &outStream{
+		id:    h.streamID,
+		state: empty,
+		itl:   &itemList{},
+		wq:    h.wq,
+	}
+	l.estdStreams[h.streamID] = str
+	return nil
+}
+
+func (l *loopyWriter) headerHandler(h *headerFrame) error {
+	if l.side == serverSide {
+		str, ok := l.estdStreams[h.streamID]
+		if !ok {
+			warningf("transport: loopy doesn't recognize the stream: %d", h.streamID)
+			return nil
+		}
+		// Case 1.A: Server is responding back with headers.
+		if !h.endStream {
+			return l.writeHeader(h.streamID, h.endStream, h.hf, h.onWrite)
+		}
+		// else:  Case 1.B: Server wants to close stream.
+
+		if str.state != empty { // either active or waiting on stream quota.
+			// add it str's list of items.
+			str.itl.enqueue(h)
+			return nil
+		}
+		if err := l.writeHeader(h.streamID, h.endStream, h.hf, h.onWrite); err != nil {
+			return err
+		}
+		return l.cleanupStreamHandler(h.cleanup)
+	}
+	// Case 2: Client wants to originate stream.
+	str := &outStream{
+		id:    h.streamID,
+		state: empty,
+		itl:   &itemList{},
+		wq:    h.wq,
+	}
+	str.itl.enqueue(h)
+	return l.originateStream(str)
+}
+
+func (l *loopyWriter) originateStream(str *outStream) error {
+	hdr := str.itl.dequeue().(*headerFrame)
+	sendPing, err := hdr.initStream(str.id)
+	if err != nil {
+		if err == ErrConnClosing {
+			return err
+		}
+		// Other errors(errStreamDrain) need not close transport.
+		return nil
+	}
+	if err = l.writeHeader(str.id, hdr.endStream, hdr.hf, hdr.onWrite); err != nil {
+		return err
+	}
+	l.estdStreams[str.id] = str
+	if sendPing {
+		return l.pingHandler(&ping{data: [8]byte{}})
+	}
+	return nil
+}
+
+func (l *loopyWriter) writeHeader(streamID uint32, endStream bool, hf []hpack.HeaderField, onWrite func()) error {
+	if onWrite != nil {
+		onWrite()
+	}
+	l.hBuf.Reset()
+	for _, f := range hf {
+		if err := l.hEnc.WriteField(f); err != nil {
+			warningf("transport: loopyWriter.writeHeader encountered error while encoding headers:", err)
+		}
+	}
+	var (
+		err               error
+		endHeaders, first bool
+	)
+	first = true
+	for !endHeaders {
+		size := l.hBuf.Len()
+		if size > http2MaxFrameLen {
+			size = http2MaxFrameLen
+		} else {
+			endHeaders = true
+		}
+		if first {
+			first = false
+			err = l.framer.fr.WriteHeaders(http2.HeadersFrameParam{
+				StreamID:      streamID,
+				BlockFragment: l.hBuf.Next(size),
+				EndStream:     endStream,
+				EndHeaders:    endHeaders,
+			})
+		} else {
+			err = l.framer.fr.WriteContinuation(
+				streamID,
+				endHeaders,
+				l.hBuf.Next(size),
+			)
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (l *loopyWriter) preprocessData(df *dataFrame) error {
+	str, ok := l.estdStreams[df.streamID]
+	if !ok {
+		return nil
+	}
+	// If we got data for a stream it means that
+	// stream was originated and the headers were sent out.
+	str.itl.enqueue(df)
+	if str.state == empty {
+		str.state = active
+		l.activeStreams.enqueue(str)
+	}
+	return nil
+}
+
+func (l *loopyWriter) pingHandler(p *ping) error {
+	if !p.ack {
+		l.bdpEst.timesnap(p.data)
+	}
+	return l.framer.fr.WritePing(p.ack, p.data)
+
+}
+
+func (l *loopyWriter) outFlowControlSizeRequestHandler(o *outFlowControlSizeRequest) error {
+	o.resp <- l.sendQuota
+	return nil
+}
+
+func (l *loopyWriter) cleanupStreamHandler(c *cleanupStream) error {
+	c.onWrite()
+	if str, ok := l.estdStreams[c.streamID]; ok {
+		// On the server side it could be a trailers-only response or
+		// a RST_STREAM before stream initialization thus the stream might
+		// not be established yet.
+		delete(l.estdStreams, c.streamID)
+		str.deleteSelf()
+	}
+	if c.rst { // If RST_STREAM needs to be sent.
+		if err := l.framer.fr.WriteRSTStream(c.streamID, c.rstCode); err != nil {
+			return err
+		}
+	}
+	if l.side == clientSide && l.draining && len(l.estdStreams) == 0 {
+		return ErrConnClosing
+	}
+	return nil
+}
+
+func (l *loopyWriter) incomingGoAwayHandler(*incomingGoAway) error {
+	if l.side == clientSide {
+		l.draining = true
+		if len(l.estdStreams) == 0 {
+			return ErrConnClosing
+		}
+	}
+	return nil
+}
+
+func (l *loopyWriter) goAwayHandler(g *goAway) error {
+	// Handling of outgoing GoAway is very specific to side.
+	if l.ssGoAwayHandler != nil {
+		draining, err := l.ssGoAwayHandler(g)
+		if err != nil {
+			return err
+		}
+		l.draining = draining
+	}
+	return nil
+}
+
+func (l *loopyWriter) handle(i interface{}) error {
+	switch i := i.(type) {
+	case *incomingWindowUpdate:
+		return l.incomingWindowUpdateHandler(i)
+	case *outgoingWindowUpdate:
+		return l.outgoingWindowUpdateHandler(i)
+	case *incomingSettings:
+		return l.incomingSettingsHandler(i)
+	case *outgoingSettings:
+		return l.outgoingSettingsHandler(i)
+	case *headerFrame:
+		return l.headerHandler(i)
+	case *registerStream:
+		return l.registerStreamHandler(i)
+	case *cleanupStream:
+		return l.cleanupStreamHandler(i)
+	case *incomingGoAway:
+		return l.incomingGoAwayHandler(i)
+	case *dataFrame:
+		return l.preprocessData(i)
+	case *ping:
+		return l.pingHandler(i)
+	case *goAway:
+		return l.goAwayHandler(i)
+	case *outFlowControlSizeRequest:
+		return l.outFlowControlSizeRequestHandler(i)
+	default:
+		return fmt.Errorf("transport: unknown control message type %T", i)
+	}
+}
+
+func (l *loopyWriter) applySettings(ss []http2.Setting) error {
+	for _, s := range ss {
+		switch s.ID {
+		case http2.SettingInitialWindowSize:
+			o := l.oiws
+			l.oiws = s.Val
+			if o < l.oiws {
+				// If the new limit is greater make all depleted streams active.
+				for _, stream := range l.estdStreams {
+					if stream.state == waitingOnStreamQuota {
+						stream.state = active
+						l.activeStreams.enqueue(stream)
+					}
+				}
+			}
+		case http2.SettingHeaderTableSize:
+			updateHeaderTblSize(l.hEnc, s.Val)
+		}
+	}
+	return nil
+}
+
+// processData removes the first stream from active streams, writes out at most 16KB
+// of its data and then puts it at the end of activeStreams if there's still more data
+// to be sent and stream has some stream-level flow control.
+func (l *loopyWriter) processData() (bool, error) {
+	if l.sendQuota == 0 {
+		return true, nil
+	}
+	str := l.activeStreams.dequeue() // Remove the first stream.
+	if str == nil {
+		return true, nil
+	}
+	dataItem := str.itl.peek().(*dataFrame) // Peek at the first data item this stream.
+	// A data item is represented by a dataFrame, since it later translates into
+	// multiple HTTP2 data frames.
+	// Every dataFrame has two buffers; h that keeps grpc-message header and d that is acutal data.
+	// As an optimization to keep wire traffic low, data from d is copied to h to make as big as the
+	// maximum possilbe HTTP2 frame size.
+
+	if len(dataItem.h) == 0 && len(dataItem.d) == 0 { // Empty data frame
+		// Client sends out empty data frame with endStream = true
+		if err := l.framer.fr.WriteData(dataItem.streamID, dataItem.endStream, nil); err != nil {
+			return false, err
+		}
+		str.itl.dequeue() // remove the empty data item from stream
+		if str.itl.isEmpty() {
+			str.state = empty
+		} else if trailer, ok := str.itl.peek().(*headerFrame); ok { // the next item is trailers.
+			if err := l.writeHeader(trailer.streamID, trailer.endStream, trailer.hf, trailer.onWrite); err != nil {
+				return false, err
+			}
+			if err := l.cleanupStreamHandler(trailer.cleanup); err != nil {
+				return false, nil
+			}
+		} else {
+			l.activeStreams.enqueue(str)
+		}
+		return false, nil
+	}
+	var (
+		idx int
+		buf []byte
+	)
+	if len(dataItem.h) != 0 { // data header has not been written out yet.
+		buf = dataItem.h
+	} else {
+		idx = 1
+		buf = dataItem.d
+	}
+	size := http2MaxFrameLen
+	if len(buf) < size {
+		size = len(buf)
+	}
+	if strQuota := int(l.oiws) - str.bytesOutStanding; strQuota <= 0 { // stream-level flow control.
+		str.state = waitingOnStreamQuota
+		return false, nil
+	} else if strQuota < size {
+		size = strQuota
+	}
+
+	if l.sendQuota < uint32(size) { // connection-level flow control.
+		size = int(l.sendQuota)
+	}
+	// Now that outgoing flow controls are checked we can replenish str's write quota
+	str.wq.replenish(size)
+	var endStream bool
+	// If this is the last data message on this stream and all of it can be written in this iteration.
+	if dataItem.endStream && size == len(buf) {
+		// buf contains either data or it contains header but data is empty.
+		if idx == 1 || len(dataItem.d) == 0 {
+			endStream = true
+		}
+	}
+	if dataItem.onEachWrite != nil {
+		dataItem.onEachWrite()
+	}
+	if err := l.framer.fr.WriteData(dataItem.streamID, endStream, buf[:size]); err != nil {
+		return false, err
+	}
+	buf = buf[size:]
+	str.bytesOutStanding += size
+	l.sendQuota -= uint32(size)
+	if idx == 0 {
+		dataItem.h = buf
+	} else {
+		dataItem.d = buf
+	}
+
+	if len(dataItem.h) == 0 && len(dataItem.d) == 0 { // All the data from that message was written out.
+		str.itl.dequeue()
+	}
+	if str.itl.isEmpty() {
+		str.state = empty
+	} else if trailer, ok := str.itl.peek().(*headerFrame); ok { // The next item is trailers.
+		if err := l.writeHeader(trailer.streamID, trailer.endStream, trailer.hf, trailer.onWrite); err != nil {
+			return false, err
+		}
+		if err := l.cleanupStreamHandler(trailer.cleanup); err != nil {
+			return false, err
+		}
+	} else if int(l.oiws)-str.bytesOutStanding <= 0 { // Ran out of stream quota.
+		str.state = waitingOnStreamQuota
+	} else { // Otherwise add it back to the list of active streams.
+		l.activeStreams.enqueue(str)
+	}
+	return false, nil
+}
diff --git a/vendor/google.golang.org/grpc/internal/transport/defaults.go b/vendor/google.golang.org/grpc/internal/transport/defaults.go
new file mode 100644
index 00000000..9fa306b2
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/transport/defaults.go
@@ -0,0 +1,49 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package transport
+
+import (
+	"math"
+	"time"
+)
+
+const (
+	// The default value of flow control window size in HTTP2 spec.
+	defaultWindowSize = 65535
+	// The initial window size for flow control.
+	initialWindowSize             = defaultWindowSize // for an RPC
+	infinity                      = time.Duration(math.MaxInt64)
+	defaultClientKeepaliveTime    = infinity
+	defaultClientKeepaliveTimeout = 20 * time.Second
+	defaultMaxStreamsClient       = 100
+	defaultMaxConnectionIdle      = infinity
+	defaultMaxConnectionAge       = infinity
+	defaultMaxConnectionAgeGrace  = infinity
+	defaultServerKeepaliveTime    = 2 * time.Hour
+	defaultServerKeepaliveTimeout = 20 * time.Second
+	defaultKeepalivePolicyMinTime = 5 * time.Minute
+	// max window limit set by HTTP2 Specs.
+	maxWindowSize = math.MaxInt32
+	// defaultWriteQuota is the default value for number of data
+	// bytes that each stream can schedule before some of it being
+	// flushed out.
+	defaultWriteQuota              = 64 * 1024
+	defaultClientMaxHeaderListSize = uint32(16 << 20)
+	defaultServerMaxHeaderListSize = uint32(16 << 20)
+)
diff --git a/vendor/google.golang.org/grpc/internal/transport/flowcontrol.go b/vendor/google.golang.org/grpc/internal/transport/flowcontrol.go
new file mode 100644
index 00000000..5ea997a7
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/transport/flowcontrol.go
@@ -0,0 +1,218 @@
+/*
+ *
+ * Copyright 2014 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package transport
+
+import (
+	"fmt"
+	"math"
+	"sync"
+	"sync/atomic"
+)
+
+// writeQuota is a soft limit on the amount of data a stream can
+// schedule before some of it is written out.
+type writeQuota struct {
+	quota int32
+	// get waits on read from when quota goes less than or equal to zero.
+	// replenish writes on it when quota goes positive again.
+	ch chan struct{}
+	// done is triggered in error case.
+	done <-chan struct{}
+	// replenish is called by loopyWriter to give quota back to.
+	// It is implemented as a field so that it can be updated
+	// by tests.
+	replenish func(n int)
+}
+
+func newWriteQuota(sz int32, done <-chan struct{}) *writeQuota {
+	w := &writeQuota{
+		quota: sz,
+		ch:    make(chan struct{}, 1),
+		done:  done,
+	}
+	w.replenish = w.realReplenish
+	return w
+}
+
+func (w *writeQuota) get(sz int32) error {
+	for {
+		if atomic.LoadInt32(&w.quota) > 0 {
+			atomic.AddInt32(&w.quota, -sz)
+			return nil
+		}
+		select {
+		case <-w.ch:
+			continue
+		case <-w.done:
+			return errStreamDone
+		}
+	}
+}
+
+func (w *writeQuota) realReplenish(n int) {
+	sz := int32(n)
+	a := atomic.AddInt32(&w.quota, sz)
+	b := a - sz
+	if b <= 0 && a > 0 {
+		select {
+		case w.ch <- struct{}{}:
+		default:
+		}
+	}
+}
+
+type trInFlow struct {
+	limit               uint32
+	unacked             uint32
+	effectiveWindowSize uint32
+}
+
+func (f *trInFlow) newLimit(n uint32) uint32 {
+	d := n - f.limit
+	f.limit = n
+	f.updateEffectiveWindowSize()
+	return d
+}
+
+func (f *trInFlow) onData(n uint32) uint32 {
+	f.unacked += n
+	if f.unacked >= f.limit/4 {
+		w := f.unacked
+		f.unacked = 0
+		f.updateEffectiveWindowSize()
+		return w
+	}
+	f.updateEffectiveWindowSize()
+	return 0
+}
+
+func (f *trInFlow) reset() uint32 {
+	w := f.unacked
+	f.unacked = 0
+	f.updateEffectiveWindowSize()
+	return w
+}
+
+func (f *trInFlow) updateEffectiveWindowSize() {
+	atomic.StoreUint32(&f.effectiveWindowSize, f.limit-f.unacked)
+}
+
+func (f *trInFlow) getSize() uint32 {
+	return atomic.LoadUint32(&f.effectiveWindowSize)
+}
+
+// TODO(mmukhi): Simplify this code.
+// inFlow deals with inbound flow control
+type inFlow struct {
+	mu sync.Mutex
+	// The inbound flow control limit for pending data.
+	limit uint32
+	// pendingData is the overall data which have been received but not been
+	// consumed by applications.
+	pendingData uint32
+	// The amount of data the application has consumed but grpc has not sent
+	// window update for them. Used to reduce window update frequency.
+	pendingUpdate uint32
+	// delta is the extra window update given by receiver when an application
+	// is reading data bigger in size than the inFlow limit.
+	delta uint32
+}
+
+// newLimit updates the inflow window to a new value n.
+// It assumes that n is always greater than the old limit.
+func (f *inFlow) newLimit(n uint32) uint32 {
+	f.mu.Lock()
+	d := n - f.limit
+	f.limit = n
+	f.mu.Unlock()
+	return d
+}
+
+func (f *inFlow) maybeAdjust(n uint32) uint32 {
+	if n > uint32(math.MaxInt32) {
+		n = uint32(math.MaxInt32)
+	}
+	f.mu.Lock()
+	// estSenderQuota is the receiver's view of the maximum number of bytes the sender
+	// can send without a window update.
+	estSenderQuota := int32(f.limit - (f.pendingData + f.pendingUpdate))
+	// estUntransmittedData is the maximum number of bytes the sends might not have put
+	// on the wire yet. A value of 0 or less means that we have already received all or
+	// more bytes than the application is requesting to read.
+	estUntransmittedData := int32(n - f.pendingData) // Casting into int32 since it could be negative.
+	// This implies that unless we send a window update, the sender won't be able to send all the bytes
+	// for this message. Therefore we must send an update over the limit since there's an active read
+	// request from the application.
+	if estUntransmittedData > estSenderQuota {
+		// Sender's window shouldn't go more than 2^31 - 1 as specified in the HTTP spec.
+		if f.limit+n > maxWindowSize {
+			f.delta = maxWindowSize - f.limit
+		} else {
+			// Send a window update for the whole message and not just the difference between
+			// estUntransmittedData and estSenderQuota. This will be helpful in case the message
+			// is padded; We will fallback on the current available window(at least a 1/4th of the limit).
+			f.delta = n
+		}
+		f.mu.Unlock()
+		return f.delta
+	}
+	f.mu.Unlock()
+	return 0
+}
+
+// onData is invoked when some data frame is received. It updates pendingData.
+func (f *inFlow) onData(n uint32) error {
+	f.mu.Lock()
+	f.pendingData += n
+	if f.pendingData+f.pendingUpdate > f.limit+f.delta {
+		limit := f.limit
+		rcvd := f.pendingData + f.pendingUpdate
+		f.mu.Unlock()
+		return fmt.Errorf("received %d-bytes data exceeding the limit %d bytes", rcvd, limit)
+	}
+	f.mu.Unlock()
+	return nil
+}
+
+// onRead is invoked when the application reads the data. It returns the window size
+// to be sent to the peer.
+func (f *inFlow) onRead(n uint32) uint32 {
+	f.mu.Lock()
+	if f.pendingData == 0 {
+		f.mu.Unlock()
+		return 0
+	}
+	f.pendingData -= n
+	if n > f.delta {
+		n -= f.delta
+		f.delta = 0
+	} else {
+		f.delta -= n
+		n = 0
+	}
+	f.pendingUpdate += n
+	if f.pendingUpdate >= f.limit/4 {
+		wu := f.pendingUpdate
+		f.pendingUpdate = 0
+		f.mu.Unlock()
+		return wu
+	}
+	f.mu.Unlock()
+	return 0
+}
diff --git a/vendor/google.golang.org/grpc/transport/go16.go b/vendor/google.golang.org/grpc/internal/transport/go16.go
similarity index 77%
rename from vendor/google.golang.org/grpc/transport/go16.go
rename to vendor/google.golang.org/grpc/internal/transport/go16.go
index 5babcf9b..e0d00115 100644
--- a/vendor/google.golang.org/grpc/transport/go16.go
+++ b/vendor/google.golang.org/grpc/internal/transport/go16.go
@@ -25,6 +25,7 @@ import (
 	"net/http"
 
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	"golang.org/x/net/context"
 )
@@ -34,15 +35,15 @@ func dialContext(ctx context.Context, network, address string) (net.Conn, error)
 	return (&net.Dialer{Cancel: ctx.Done()}).Dial(network, address)
 }
 
-// ContextErr converts the error from context package into a StreamError.
-func ContextErr(err error) StreamError {
+// ContextErr converts the error from context package into a status error.
+func ContextErr(err error) error {
 	switch err {
 	case context.DeadlineExceeded:
-		return streamErrorf(codes.DeadlineExceeded, "%v", err)
+		return status.Error(codes.DeadlineExceeded, err.Error())
 	case context.Canceled:
-		return streamErrorf(codes.Canceled, "%v", err)
+		return status.Error(codes.Canceled, err.Error())
 	}
-	return streamErrorf(codes.Internal, "Unexpected error from context packet: %v", err)
+	return status.Errorf(codes.Internal, "Unexpected error from context packet: %v", err)
 }
 
 // contextFromRequest returns a background context.
diff --git a/vendor/google.golang.org/grpc/transport/go17.go b/vendor/google.golang.org/grpc/internal/transport/go17.go
similarity index 78%
rename from vendor/google.golang.org/grpc/transport/go17.go
rename to vendor/google.golang.org/grpc/internal/transport/go17.go
index b7fa6bdb..4d515b00 100644
--- a/vendor/google.golang.org/grpc/transport/go17.go
+++ b/vendor/google.golang.org/grpc/internal/transport/go17.go
@@ -26,6 +26,7 @@ import (
 	"net/http"
 
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	netctx "golang.org/x/net/context"
 )
@@ -35,15 +36,15 @@ func dialContext(ctx context.Context, network, address string) (net.Conn, error)
 	return (&net.Dialer{}).DialContext(ctx, network, address)
 }
 
-// ContextErr converts the error from context package into a StreamError.
-func ContextErr(err error) StreamError {
+// ContextErr converts the error from context package into a status error.
+func ContextErr(err error) error {
 	switch err {
 	case context.DeadlineExceeded, netctx.DeadlineExceeded:
-		return streamErrorf(codes.DeadlineExceeded, "%v", err)
+		return status.Error(codes.DeadlineExceeded, err.Error())
 	case context.Canceled, netctx.Canceled:
-		return streamErrorf(codes.Canceled, "%v", err)
+		return status.Error(codes.Canceled, err.Error())
 	}
-	return streamErrorf(codes.Internal, "Unexpected error from context packet: %v", err)
+	return status.Errorf(codes.Internal, "Unexpected error from context packet: %v", err)
 }
 
 // contextFromRequest returns a context from the HTTP Request.
diff --git a/vendor/google.golang.org/grpc/transport/handler_server.go b/vendor/google.golang.org/grpc/internal/transport/handler_server.go
similarity index 95%
rename from vendor/google.golang.org/grpc/transport/handler_server.go
rename to vendor/google.golang.org/grpc/internal/transport/handler_server.go
index 451d7e62..bc856434 100644
--- a/vendor/google.golang.org/grpc/transport/handler_server.go
+++ b/vendor/google.golang.org/grpc/internal/transport/handler_server.go
@@ -80,7 +80,7 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request, stats sta
 	if v := r.Header.Get("grpc-timeout"); v != "" {
 		to, err := decodeTimeout(v)
 		if err != nil {
-			return nil, streamErrorf(codes.Internal, "malformed time-out: %v", err)
+			return nil, status.Errorf(codes.Internal, "malformed time-out: %v", err)
 		}
 		st.timeoutSet = true
 		st.timeout = to
@@ -92,13 +92,13 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request, stats sta
 	}
 	for k, vv := range r.Header {
 		k = strings.ToLower(k)
-		if isReservedHeader(k) && !isWhitelistedPseudoHeader(k) {
+		if isReservedHeader(k) && !isWhitelistedHeader(k) {
 			continue
 		}
 		for _, v := range vv {
 			v, err := decodeMetadataHeader(k, v)
 			if err != nil {
-				return nil, streamErrorf(codes.InvalidArgument, "malformed binary metadata: %v", err)
+				return nil, status.Errorf(codes.Internal, "malformed binary metadata: %v", err)
 			}
 			metakv = append(metakv, k, v)
 		}
@@ -274,9 +274,7 @@ func (ht *serverHandlerTransport) Write(s *Stream, hdr []byte, data []byte, opts
 		ht.writeCommonHeaders(s)
 		ht.rw.Write(hdr)
 		ht.rw.Write(data)
-		if !opts.Delay {
-			ht.rw.(http.Flusher).Flush()
-		}
+		ht.rw.(http.Flusher).Flush()
 	})
 }
 
@@ -354,8 +352,7 @@ func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream), trace
 		pr.AuthInfo = credentials.TLSInfo{State: *req.TLS}
 	}
 	ctx = metadata.NewIncomingContext(ctx, ht.headerMD)
-	ctx = peer.NewContext(ctx, pr)
-	s.ctx = newContextWithStream(ctx, s)
+	s.ctx = peer.NewContext(ctx, pr)
 	if ht.stats != nil {
 		s.ctx = ht.stats.TagRPC(s.ctx, &stats.RPCTagInfo{FullMethodName: s.method})
 		inHeader := &stats.InHeader{
@@ -366,7 +363,7 @@ func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream), trace
 		ht.stats.HandleRPC(s.ctx, inHeader)
 	}
 	s.trReader = &transportReader{
-		reader:        &recvBufferReader{ctx: s.ctx, recv: s.buf},
+		reader:        &recvBufferReader{ctx: s.ctx, ctxDone: s.ctx.Done(), recv: s.buf},
 		windowHandler: func(int) {},
 	}
 
@@ -421,6 +418,10 @@ func (ht *serverHandlerTransport) runStream() {
 	}
 }
 
+func (ht *serverHandlerTransport) IncrMsgSent() {}
+
+func (ht *serverHandlerTransport) IncrMsgRecv() {}
+
 func (ht *serverHandlerTransport) Drain() {
 	panic("Drain() is not implemented")
 }
@@ -431,17 +432,14 @@ func (ht *serverHandlerTransport) Drain() {
 //   * io.EOF
 //   * io.ErrUnexpectedEOF
 //   * of type transport.ConnectionError
-//   * of type transport.StreamError
+//   * an error from the status package
 func mapRecvMsgError(err error) error {
 	if err == io.EOF || err == io.ErrUnexpectedEOF {
 		return err
 	}
 	if se, ok := err.(http2.StreamError); ok {
 		if code, ok := http2ErrConvTab[se.Code]; ok {
-			return StreamError{
-				Code: code,
-				Desc: se.Error(),
-			}
+			return status.Error(code, se.Error())
 		}
 	}
 	return connectionErrorf(true, err, err.Error())
diff --git a/vendor/google.golang.org/grpc/transport/handler_server_test.go b/vendor/google.golang.org/grpc/internal/transport/handler_server_test.go
similarity index 98%
rename from vendor/google.golang.org/grpc/transport/handler_server_test.go
rename to vendor/google.golang.org/grpc/internal/transport/handler_server_test.go
index 3261b8e3..da04e7ce 100644
--- a/vendor/google.golang.org/grpc/transport/handler_server_test.go
+++ b/vendor/google.golang.org/grpc/internal/transport/handler_server_test.go
@@ -179,7 +179,7 @@ func TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 				},
 				RequestURI: "/service/foo.bar",
 			},
-			wantErr: `stream error: code = Internal desc = "malformed time-out: transport: timeout unit is not recognized: \"tomorrow\""`,
+			wantErr: `rpc error: code = Internal desc = malformed time-out: transport: timeout unit is not recognized: "tomorrow"`,
 		},
 		{
 			name: "with metadata",
@@ -220,7 +220,7 @@ func TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 		}
 		got, gotErr := NewServerHandlerTransport(rw, tt.req, nil)
 		if (gotErr != nil) != (tt.wantErr != "") || (gotErr != nil && gotErr.Error() != tt.wantErr) {
-			t.Errorf("%s: error = %v; want %q", tt.name, gotErr, tt.wantErr)
+			t.Errorf("%s: error = %q; want %q", tt.name, gotErr.Error(), tt.wantErr)
 			continue
 		}
 		if gotErr != nil {
diff --git a/vendor/google.golang.org/grpc/transport/http2_client.go b/vendor/google.golang.org/grpc/internal/transport/http2_client.go
similarity index 58%
rename from vendor/google.golang.org/grpc/transport/http2_client.go
rename to vendor/google.golang.org/grpc/internal/transport/http2_client.go
index 56b434ef..88d1c161 100644
--- a/vendor/google.golang.org/grpc/transport/http2_client.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http2_client.go
@@ -19,11 +19,10 @@
 package transport
 
 import (
-	"bytes"
-	"fmt"
 	"io"
 	"math"
 	"net"
+	"strconv"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -32,8 +31,10 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/hpack"
+
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/internal/channelz"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
@@ -45,14 +46,17 @@ import (
 type http2Client struct {
 	ctx        context.Context
 	cancel     context.CancelFunc
+	ctxDone    <-chan struct{} // Cache the ctx.Done() chan.
 	userAgent  string
 	md         interface{}
 	conn       net.Conn // underlying communication channel
+	loopy      *loopyWriter
 	remoteAddr net.Addr
 	localAddr  net.Addr
 	authInfo   credentials.AuthInfo // auth info about the connection
-	nextID     uint32               // the next stream ID to be used
 
+	readerDone chan struct{} // sync point to enable testing.
+	writerDone chan struct{} // sync point to enable testing.
 	// goAway is closed to notify the upper layer (i.e., addrConn.transportMonitor)
 	// that the server sent GoAway on this transport.
 	goAway chan struct{}
@@ -60,21 +64,10 @@ type http2Client struct {
 	awakenKeepalive chan struct{}
 
 	framer *framer
-	hBuf   *bytes.Buffer  // the buffer for HPACK encoding
-	hEnc   *hpack.Encoder // HPACK encoder
-
 	// controlBuf delivers all the control related tasks (e.g., window
 	// updates, reset streams, and various settings) to the controller.
 	controlBuf *controlBuffer
-	fc         *inFlow
-	// sendQuotaPool provides flow control to outbound message.
-	sendQuotaPool *quotaPool
-	// localSendQuota limits the amount of data that can be scheduled
-	// for writing before it is actually written out.
-	localSendQuota *quotaPool
-	// streamsQuota limits the max number of concurrent streams.
-	streamsQuota *quotaPool
-
+	fc         *trInFlow
 	// The scheme used: https if TLS is on, http otherwise.
 	scheme string
 
@@ -84,33 +77,53 @@ type http2Client struct {
 
 	// Boolean to keep track of reading activity on transport.
 	// 1 is true and 0 is false.
-	activity uint32 // Accessed atomically.
-	kp       keepalive.ClientParameters
+	activity         uint32 // Accessed atomically.
+	kp               keepalive.ClientParameters
+	keepaliveEnabled bool
 
 	statsHandler stats.Handler
 
 	initialWindowSize int32
 
-	bdpEst          *bdpEstimator
-	outQuotaVersion uint32
+	// configured by peer through SETTINGS_MAX_HEADER_LIST_SIZE
+	maxSendHeaderListSize *uint32
 
+	bdpEst *bdpEstimator
 	// onSuccess is a callback that client transport calls upon
 	// receiving server preface to signal that a succefull HTTP2
 	// connection was established.
 	onSuccess func()
 
-	mu            sync.Mutex     // guard the following variables
-	state         transportState // the state of underlying connection
+	maxConcurrentStreams  uint32
+	streamQuota           int64
+	streamsQuotaAvailable chan struct{}
+	waitingStreams        uint32
+	nextID                uint32
+
+	mu            sync.Mutex // guard the following variables
+	state         transportState
 	activeStreams map[uint32]*Stream
-	// The max number of concurrent streams
-	maxStreams int
-	// the per-stream outbound flow control window size set by the peer.
-	streamSendQuota uint32
 	// prevGoAway ID records the Last-Stream-ID in the previous GOAway frame.
 	prevGoAwayID uint32
 	// goAwayReason records the http2.ErrCode and debug data received with the
 	// GoAway frame.
 	goAwayReason GoAwayReason
+
+	// Fields below are for channelz metric collection.
+	channelzID int64 // channelz unique identification number
+	czmu       sync.RWMutex
+	kpCount    int64
+	// The number of streams that have started, including already finished ones.
+	streamsStarted int64
+	// The number of streams that have ended successfully by receiving EoS bit set
+	// frame from server.
+	streamsSucceeded  int64
+	streamsFailed     int64
+	lastStreamCreated time.Time
+	msgSent           int64
+	msgRecv           int64
+	lastMsgSent       time.Time
+	lastMsgRecv       time.Time
 }
 
 func dial(ctx context.Context, fn func(context.Context, string) (net.Conn, error), addr string) (net.Conn, error) {
@@ -121,18 +134,6 @@ func dial(ctx context.Context, fn func(context.Context, string) (net.Conn, error
 }
 
 func isTemporary(err error) bool {
-	switch err {
-	case io.EOF:
-		// Connection closures may be resolved upon retry, and are thus
-		// treated as temporary.
-		return true
-	case context.DeadlineExceeded:
-		// In Go 1.7, context.DeadlineExceeded implements Timeout(), and this
-		// special case is not needed. Until then, we need to keep this
-		// clause.
-		return true
-	}
-
 	switch err := err.(type) {
 	case interface {
 		Temporary() bool
@@ -145,13 +146,13 @@ func isTemporary(err error) bool {
 		// temporary.
 		return err.Timeout()
 	}
-	return false
+	return true
 }
 
 // newHTTP2Client constructs a connected ClientTransport to addr based on HTTP2
 // and starts to receive messages on it. Non-nil error returns if construction
 // fails.
-func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts ConnectOptions, onSuccess func()) (_ ClientTransport, err error) {
+func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts ConnectOptions, onSuccess func()) (_ *http2Client, err error) {
 	scheme := "http"
 	ctx, cancel := context.WithCancel(ctx)
 	defer func() {
@@ -181,10 +182,7 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne
 		scheme = "https"
 		conn, authInfo, err = creds.ClientHandshake(connectCtx, addr.Authority, conn)
 		if err != nil {
-			// Credentials handshake errors are typically considered permanent
-			// to avoid retrying on e.g. bad certificates.
-			temp := isTemporary(err)
-			return nil, connectionErrorf(temp, err, "transport: authentication handshake failed: %v", err)
+			return nil, connectionErrorf(isTemporary(err), err, "transport: authentication handshake failed: %v", err)
 		}
 		isSecure = true
 	}
@@ -202,48 +200,42 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne
 		icwz = opts.InitialConnWindowSize
 		dynamicWindow = false
 	}
-	var buf bytes.Buffer
-	writeBufSize := defaultWriteBufSize
-	if opts.WriteBufferSize > 0 {
-		writeBufSize = opts.WriteBufferSize
-	}
-	readBufSize := defaultReadBufSize
-	if opts.ReadBufferSize > 0 {
-		readBufSize = opts.ReadBufferSize
+	writeBufSize := opts.WriteBufferSize
+	readBufSize := opts.ReadBufferSize
+	maxHeaderListSize := defaultClientMaxHeaderListSize
+	if opts.MaxHeaderListSize != nil {
+		maxHeaderListSize = *opts.MaxHeaderListSize
 	}
 	t := &http2Client{
-		ctx:        ctx,
-		cancel:     cancel,
-		userAgent:  opts.UserAgent,
-		md:         addr.Metadata,
-		conn:       conn,
-		remoteAddr: conn.RemoteAddr(),
-		localAddr:  conn.LocalAddr(),
-		authInfo:   authInfo,
-		// The client initiated stream id is odd starting from 1.
-		nextID:            1,
-		goAway:            make(chan struct{}),
-		awakenKeepalive:   make(chan struct{}, 1),
-		hBuf:              &buf,
-		hEnc:              hpack.NewEncoder(&buf),
-		framer:            newFramer(conn, writeBufSize, readBufSize),
-		controlBuf:        newControlBuffer(),
-		fc:                &inFlow{limit: uint32(icwz)},
-		sendQuotaPool:     newQuotaPool(defaultWindowSize),
-		localSendQuota:    newQuotaPool(defaultLocalSendQuota),
-		scheme:            scheme,
-		state:             reachable,
-		activeStreams:     make(map[uint32]*Stream),
-		isSecure:          isSecure,
-		creds:             opts.PerRPCCredentials,
-		maxStreams:        defaultMaxStreamsClient,
-		streamsQuota:      newQuotaPool(defaultMaxStreamsClient),
-		streamSendQuota:   defaultWindowSize,
-		kp:                kp,
-		statsHandler:      opts.StatsHandler,
-		initialWindowSize: initialWindowSize,
-		onSuccess:         onSuccess,
-	}
+		ctx:                   ctx,
+		ctxDone:               ctx.Done(), // Cache Done chan.
+		cancel:                cancel,
+		userAgent:             opts.UserAgent,
+		md:                    addr.Metadata,
+		conn:                  conn,
+		remoteAddr:            conn.RemoteAddr(),
+		localAddr:             conn.LocalAddr(),
+		authInfo:              authInfo,
+		readerDone:            make(chan struct{}),
+		writerDone:            make(chan struct{}),
+		goAway:                make(chan struct{}),
+		awakenKeepalive:       make(chan struct{}, 1),
+		framer:                newFramer(conn, writeBufSize, readBufSize, maxHeaderListSize),
+		fc:                    &trInFlow{limit: uint32(icwz)},
+		scheme:                scheme,
+		activeStreams:         make(map[uint32]*Stream),
+		isSecure:              isSecure,
+		creds:                 opts.PerRPCCredentials,
+		kp:                    kp,
+		statsHandler:          opts.StatsHandler,
+		initialWindowSize:     initialWindowSize,
+		onSuccess:             onSuccess,
+		nextID:                1,
+		maxConcurrentStreams:  defaultMaxStreamsClient,
+		streamQuota:           defaultMaxStreamsClient,
+		streamsQuotaAvailable: make(chan struct{}, 1),
+	}
+	t.controlBuf = newControlBuffer(t.ctxDone)
 	if opts.InitialWindowSize >= defaultWindowSize {
 		t.initialWindowSize = opts.InitialWindowSize
 		dynamicWindow = false
@@ -267,6 +259,13 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne
 		}
 		t.statsHandler.HandleConn(t.ctx, connBegin)
 	}
+	if channelz.IsOn() {
+		t.channelzID = channelz.RegisterNormalSocket(t, opts.ChannelzParentID, "")
+	}
+	if t.kp.Time != infinity {
+		t.keepaliveEnabled = true
+		go t.keepalive()
+	}
 	// Start the reader goroutine for incoming message. Each transport has
 	// a dedicated goroutine which reads HTTP2 frame from network. Then it
 	// dispatches the frame to the corresponding stream entity.
@@ -281,14 +280,21 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne
 		t.Close()
 		return nil, connectionErrorf(true, err, "transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
 	}
+	var ss []http2.Setting
+
 	if t.initialWindowSize != defaultWindowSize {
-		err = t.framer.fr.WriteSettings(http2.Setting{
+		ss = append(ss, http2.Setting{
 			ID:  http2.SettingInitialWindowSize,
 			Val: uint32(t.initialWindowSize),
 		})
-	} else {
-		err = t.framer.fr.WriteSettings()
 	}
+	if opts.MaxHeaderListSize != nil {
+		ss = append(ss, http2.Setting{
+			ID:  http2.SettingMaxHeaderListSize,
+			Val: *opts.MaxHeaderListSize,
+		})
+	}
+	err = t.framer.fr.WriteSettings(ss...)
 	if err != nil {
 		t.Close()
 		return nil, connectionErrorf(true, err, "transport: failed to write initial settings frame: %v", err)
@@ -302,30 +308,32 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne
 	}
 	t.framer.writer.Flush()
 	go func() {
-		loopyWriter(t.ctx, t.controlBuf, t.itemHandler)
-		t.conn.Close()
+		t.loopy = newLoopyWriter(clientSide, t.framer, t.controlBuf, t.bdpEst)
+		err := t.loopy.run()
+		if err != nil {
+			errorf("transport: loopyWriter.run returning. Err: %v", err)
+		}
+		// If it's a connection error, let reader goroutine handle it
+		// since there might be data in the buffers.
+		if _, ok := err.(net.Error); !ok {
+			t.conn.Close()
+		}
+		close(t.writerDone)
 	}()
-	if t.kp.Time != infinity {
-		go t.keepalive()
-	}
 	return t, nil
 }
 
 func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
 	// TODO(zhaoq): Handle uint32 overflow of Stream.id.
 	s := &Stream{
-		id:             t.nextID,
 		done:           make(chan struct{}),
-		goAway:         make(chan struct{}),
 		method:         callHdr.Method,
 		sendCompress:   callHdr.SendCompress,
 		buf:            newRecvBuffer(),
-		fc:             &inFlow{limit: uint32(t.initialWindowSize)},
-		sendQuotaPool:  newQuotaPool(int(t.streamSendQuota)),
 		headerChan:     make(chan struct{}),
 		contentSubtype: callHdr.ContentSubtype,
 	}
-	t.nextID += 2
+	s.wq = newWriteQuota(defaultWriteQuota, s.done)
 	s.requestRead = func(n int) {
 		t.adjustWindow(s, uint32(n))
 	}
@@ -335,26 +343,18 @@ func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
 	s.ctx = ctx
 	s.trReader = &transportReader{
 		reader: &recvBufferReader{
-			ctx:    s.ctx,
-			goAway: s.goAway,
-			recv:   s.buf,
+			ctx:     s.ctx,
+			ctxDone: s.ctx.Done(),
+			recv:    s.buf,
 		},
 		windowHandler: func(n int) {
 			t.updateWindow(s, uint32(n))
 		},
 	}
-	s.waiters = waiters{
-		ctx:    s.ctx,
-		tctx:   t.ctx,
-		done:   s.done,
-		goAway: s.goAway,
-	}
 	return s
 }
 
-// NewStream creates a stream and registers it into the transport as "active"
-// streams.
-func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Stream, err error) {
+func (t *http2Client) getPeer() *peer.Peer {
 	pr := &peer.Peer{
 		Addr: t.remoteAddr,
 	}
@@ -362,71 +362,17 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	if t.authInfo != nil {
 		pr.AuthInfo = t.authInfo
 	}
-	ctx = peer.NewContext(ctx, pr)
-	var (
-		authData = make(map[string]string)
-		audience string
-	)
-	// Create an audience string only if needed.
-	if len(t.creds) > 0 || callHdr.Creds != nil {
-		// Construct URI required to get auth request metadata.
-		// Omit port if it is the default one.
-		host := strings.TrimSuffix(callHdr.Host, ":443")
-		pos := strings.LastIndex(callHdr.Method, "/")
-		if pos == -1 {
-			pos = len(callHdr.Method)
-		}
-		audience = "https://" + host + callHdr.Method[:pos]
-	}
-	for _, c := range t.creds {
-		data, err := c.GetRequestMetadata(ctx, audience)
-		if err != nil {
-			if _, ok := status.FromError(err); ok {
-				return nil, err
-			}
+	return pr
+}
 
-			return nil, streamErrorf(codes.Unauthenticated, "transport: %v", err)
-		}
-		for k, v := range data {
-			// Capital header names are illegal in HTTP/2.
-			k = strings.ToLower(k)
-			authData[k] = v
-		}
-	}
-	callAuthData := map[string]string{}
-	// Check if credentials.PerRPCCredentials were provided via call options.
-	// Note: if these credentials are provided both via dial options and call
-	// options, then both sets of credentials will be applied.
-	if callCreds := callHdr.Creds; callCreds != nil {
-		if !t.isSecure && callCreds.RequireTransportSecurity() {
-			return nil, streamErrorf(codes.Unauthenticated, "transport: cannot send secure credentials on an insecure connection")
-		}
-		data, err := callCreds.GetRequestMetadata(ctx, audience)
-		if err != nil {
-			return nil, streamErrorf(codes.Internal, "transport: %v", err)
-		}
-		for k, v := range data {
-			// Capital header names are illegal in HTTP/2
-			k = strings.ToLower(k)
-			callAuthData[k] = v
-		}
-	}
-	t.mu.Lock()
-	if t.activeStreams == nil {
-		t.mu.Unlock()
-		return nil, ErrConnClosing
-	}
-	if t.state == draining {
-		t.mu.Unlock()
-		return nil, errStreamDrain
-	}
-	if t.state != reachable {
-		t.mu.Unlock()
-		return nil, ErrConnClosing
+func (t *http2Client) createHeaderFields(ctx context.Context, callHdr *CallHdr) ([]hpack.HeaderField, error) {
+	aud := t.createAudience(callHdr)
+	authData, err := t.getTrAuthData(ctx, aud)
+	if err != nil {
+		return nil, err
 	}
-	t.mu.Unlock()
-	// Get a quota of 1 from streamsQuota.
-	if _, _, err := t.streamsQuota.get(1, waiters{ctx: ctx, tctx: t.ctx}); err != nil {
+	callAuthData, err := t.getCallAuthData(ctx, aud, callHdr)
+	if err != nil {
 		return nil, err
 	}
 	// TODO(mmukhi): Benchmark if the performance gets better if count the metadata and other header fields
@@ -442,6 +388,9 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	headerFields = append(headerFields, hpack.HeaderField{Name: "content-type", Value: contentType(callHdr.ContentSubtype)})
 	headerFields = append(headerFields, hpack.HeaderField{Name: "user-agent", Value: t.userAgent})
 	headerFields = append(headerFields, hpack.HeaderField{Name: "te", Value: "trailers"})
+	if callHdr.PreviousAttempts > 0 {
+		headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-previous-rpc-attempts", Value: strconv.Itoa(callHdr.PreviousAttempts)})
+	}
 
 	if callHdr.SendCompress != "" {
 		headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-encoding", Value: callHdr.SendCompress})
@@ -500,38 +449,204 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 			}
 		}
 	}
-	t.mu.Lock()
-	if t.state == draining {
-		t.mu.Unlock()
-		t.streamsQuota.add(1)
-		return nil, errStreamDrain
+	return headerFields, nil
+}
+
+func (t *http2Client) createAudience(callHdr *CallHdr) string {
+	// Create an audience string only if needed.
+	if len(t.creds) == 0 && callHdr.Creds == nil {
+		return ""
 	}
-	if t.state != reachable {
-		t.mu.Unlock()
-		return nil, ErrConnClosing
+	// Construct URI required to get auth request metadata.
+	// Omit port if it is the default one.
+	host := strings.TrimSuffix(callHdr.Host, ":443")
+	pos := strings.LastIndex(callHdr.Method, "/")
+	if pos == -1 {
+		pos = len(callHdr.Method)
+	}
+	return "https://" + host + callHdr.Method[:pos]
+}
+
+func (t *http2Client) getTrAuthData(ctx context.Context, audience string) (map[string]string, error) {
+	authData := map[string]string{}
+	for _, c := range t.creds {
+		data, err := c.GetRequestMetadata(ctx, audience)
+		if err != nil {
+			if _, ok := status.FromError(err); ok {
+				return nil, err
+			}
+
+			return nil, status.Errorf(codes.Unauthenticated, "transport: %v", err)
+		}
+		for k, v := range data {
+			// Capital header names are illegal in HTTP/2.
+			k = strings.ToLower(k)
+			authData[k] = v
+		}
+	}
+	return authData, nil
+}
+
+func (t *http2Client) getCallAuthData(ctx context.Context, audience string, callHdr *CallHdr) (map[string]string, error) {
+	callAuthData := map[string]string{}
+	// Check if credentials.PerRPCCredentials were provided via call options.
+	// Note: if these credentials are provided both via dial options and call
+	// options, then both sets of credentials will be applied.
+	if callCreds := callHdr.Creds; callCreds != nil {
+		if !t.isSecure && callCreds.RequireTransportSecurity() {
+			return nil, status.Error(codes.Unauthenticated, "transport: cannot send secure credentials on an insecure connection")
+		}
+		data, err := callCreds.GetRequestMetadata(ctx, audience)
+		if err != nil {
+			return nil, status.Errorf(codes.Internal, "transport: %v", err)
+		}
+		for k, v := range data {
+			// Capital header names are illegal in HTTP/2
+			k = strings.ToLower(k)
+			callAuthData[k] = v
+		}
+	}
+	return callAuthData, nil
+}
+
+// NewStream creates a stream and registers it into the transport as "active"
+// streams.
+func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Stream, err error) {
+	ctx = peer.NewContext(ctx, t.getPeer())
+	headerFields, err := t.createHeaderFields(ctx, callHdr)
+	if err != nil {
+		return nil, err
 	}
 	s := t.newStream(ctx, callHdr)
-	t.activeStreams[s.id] = s
-	// If the number of active streams change from 0 to 1, then check if keepalive
-	// has gone dormant. If so, wake it up.
-	if len(t.activeStreams) == 1 {
-		select {
-		case t.awakenKeepalive <- struct{}{}:
-			t.controlBuf.put(&ping{data: [8]byte{}})
-			// Fill the awakenKeepalive channel again as this channel must be
-			// kept non-writable except at the point that the keepalive()
-			// goroutine is waiting either to be awaken or shutdown.
-			t.awakenKeepalive <- struct{}{}
-		default:
+	cleanup := func(err error) {
+		if s.swapState(streamDone) == streamDone {
+			// If it was already done, return.
+			return
+		}
+		// The stream was unprocessed by the server.
+		atomic.StoreUint32(&s.unprocessed, 1)
+		s.write(recvMsg{err: err})
+		close(s.done)
+		// If headerChan isn't closed, then close it.
+		if atomic.SwapUint32(&s.headerDone, 1) == 0 {
+			close(s.headerChan)
 		}
+
 	}
-	t.controlBuf.put(&headerFrame{
-		streamID:  s.id,
+	hdr := &headerFrame{
 		hf:        headerFields,
 		endStream: false,
-	})
-	t.mu.Unlock()
-
+		initStream: func(id uint32) (bool, error) {
+			t.mu.Lock()
+			if state := t.state; state != reachable {
+				t.mu.Unlock()
+				// Do a quick cleanup.
+				err := error(errStreamDrain)
+				if state == closing {
+					err = ErrConnClosing
+				}
+				cleanup(err)
+				return false, err
+			}
+			t.activeStreams[id] = s
+			if channelz.IsOn() {
+				t.czmu.Lock()
+				t.streamsStarted++
+				t.lastStreamCreated = time.Now()
+				t.czmu.Unlock()
+			}
+			var sendPing bool
+			// If the number of active streams change from 0 to 1, then check if keepalive
+			// has gone dormant. If so, wake it up.
+			if len(t.activeStreams) == 1 && t.keepaliveEnabled {
+				select {
+				case t.awakenKeepalive <- struct{}{}:
+					sendPing = true
+					// Fill the awakenKeepalive channel again as this channel must be
+					// kept non-writable except at the point that the keepalive()
+					// goroutine is waiting either to be awaken or shutdown.
+					t.awakenKeepalive <- struct{}{}
+				default:
+				}
+			}
+			t.mu.Unlock()
+			return sendPing, nil
+		},
+		onOrphaned: cleanup,
+		wq:         s.wq,
+	}
+	firstTry := true
+	var ch chan struct{}
+	checkForStreamQuota := func(it interface{}) bool {
+		if t.streamQuota <= 0 { // Can go negative if server decreases it.
+			if firstTry {
+				t.waitingStreams++
+			}
+			ch = t.streamsQuotaAvailable
+			return false
+		}
+		if !firstTry {
+			t.waitingStreams--
+		}
+		t.streamQuota--
+		h := it.(*headerFrame)
+		h.streamID = t.nextID
+		t.nextID += 2
+		s.id = h.streamID
+		s.fc = &inFlow{limit: uint32(t.initialWindowSize)}
+		if t.streamQuota > 0 && t.waitingStreams > 0 {
+			select {
+			case t.streamsQuotaAvailable <- struct{}{}:
+			default:
+			}
+		}
+		return true
+	}
+	var hdrListSizeErr error
+	checkForHeaderListSize := func(it interface{}) bool {
+		if t.maxSendHeaderListSize == nil {
+			return true
+		}
+		hdrFrame := it.(*headerFrame)
+		var sz int64
+		for _, f := range hdrFrame.hf {
+			if sz += int64(f.Size()); sz > int64(*t.maxSendHeaderListSize) {
+				hdrListSizeErr = status.Errorf(codes.Internal, "header list size to send violates the maximum size (%d bytes) set by server", *t.maxSendHeaderListSize)
+				return false
+			}
+		}
+		return true
+	}
+	for {
+		success, err := t.controlBuf.executeAndPut(func(it interface{}) bool {
+			if !checkForStreamQuota(it) {
+				return false
+			}
+			if !checkForHeaderListSize(it) {
+				return false
+			}
+			return true
+		}, hdr)
+		if err != nil {
+			return nil, err
+		}
+		if success {
+			break
+		}
+		if hdrListSizeErr != nil {
+			return nil, hdrListSizeErr
+		}
+		firstTry = false
+		select {
+		case <-ch:
+		case <-s.ctx.Done():
+			return nil, ContextErr(s.ctx.Err())
+		case <-t.goAway:
+			return nil, errStreamDrain
+		case <-t.ctx.Done():
+			return nil, ErrConnClosing
+		}
+	}
 	if t.statsHandler != nil {
 		outHeader := &stats.OutHeader{
 			Client:      true,
@@ -548,58 +663,73 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 // CloseStream clears the footprint of a stream when the stream is not needed any more.
 // This must not be executed in reader's goroutine.
 func (t *http2Client) CloseStream(s *Stream, err error) {
-	t.mu.Lock()
-	if t.activeStreams == nil {
-		t.mu.Unlock()
-		return
-	}
+	var (
+		rst     bool
+		rstCode http2.ErrCode
+	)
 	if err != nil {
-		// notify in-flight streams, before the deletion
-		s.write(recvMsg{err: err})
+		rst = true
+		rstCode = http2.ErrCodeCancel
 	}
-	delete(t.activeStreams, s.id)
-	if t.state == draining && len(t.activeStreams) == 0 {
-		// The transport is draining and s is the last live stream on t.
-		t.mu.Unlock()
-		t.Close()
+	t.closeStream(s, err, rst, rstCode, status.Convert(err), nil, false)
+}
+
+func (t *http2Client) closeStream(s *Stream, err error, rst bool, rstCode http2.ErrCode, st *status.Status, mdata map[string][]string, eosReceived bool) {
+	// Set stream status to done.
+	if s.swapState(streamDone) == streamDone {
+		// If it was already done, return.
 		return
 	}
-	t.mu.Unlock()
-	// rstStream is true in case the stream is being closed at the client-side
-	// and the server needs to be intimated about it by sending a RST_STREAM
-	// frame.
-	// To make sure this frame is written to the wire before the headers of the
-	// next stream waiting for streamsQuota, we add to streamsQuota pool only
-	// after having acquired the writableChan to send RST_STREAM out (look at
-	// the controller() routine).
-	var rstStream bool
-	var rstError http2.ErrCode
-	defer func() {
-		// In case, the client doesn't have to send RST_STREAM to server
-		// we can safely add back to streamsQuota pool now.
-		if !rstStream {
-			t.streamsQuota.add(1)
-			return
-		}
-		t.controlBuf.put(&resetStream{s.id, rstError})
-	}()
-	s.mu.Lock()
-	rstStream = s.rstStream
-	rstError = s.rstError
-	if s.state == streamDone {
-		s.mu.Unlock()
-		return
+	// status and trailers can be updated here without any synchronization because the stream goroutine will
+	// only read it after it sees an io.EOF error from read or write and we'll write those errors
+	// only after updating this.
+	s.status = st
+	if len(mdata) > 0 {
+		s.trailer = mdata
 	}
-	if !s.headerDone {
+	if err != nil {
+		// This will unblock reads eventually.
+		s.write(recvMsg{err: err})
+	}
+	// This will unblock write.
+	close(s.done)
+	// If headerChan isn't closed, then close it.
+	if atomic.SwapUint32(&s.headerDone, 1) == 0 {
+		s.noHeaders = true
 		close(s.headerChan)
-		s.headerDone = true
 	}
-	s.state = streamDone
-	s.mu.Unlock()
-	if err != nil && !rstStream {
-		rstStream = true
-		rstError = http2.ErrCodeCancel
+	cleanup := &cleanupStream{
+		streamID: s.id,
+		onWrite: func() {
+			t.mu.Lock()
+			if t.activeStreams != nil {
+				delete(t.activeStreams, s.id)
+			}
+			t.mu.Unlock()
+			if channelz.IsOn() {
+				t.czmu.Lock()
+				if eosReceived {
+					t.streamsSucceeded++
+				} else {
+					t.streamsFailed++
+				}
+				t.czmu.Unlock()
+			}
+		},
+		rst:     rst,
+		rstCode: rstCode,
 	}
+	addBackStreamQuota := func(interface{}) bool {
+		t.streamQuota++
+		if t.streamQuota > 0 && t.waitingStreams > 0 {
+			select {
+			case t.streamsQuotaAvailable <- struct{}{}:
+			default:
+			}
+		}
+		return true
+	}
+	t.controlBuf.executeAndPut(addBackStreamQuota, cleanup)
 }
 
 // Close kicks off the shutdown process of the transport. This should be called
@@ -607,27 +737,24 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
 // accessed any more.
 func (t *http2Client) Close() error {
 	t.mu.Lock()
+	// Make sure we only Close once.
 	if t.state == closing {
 		t.mu.Unlock()
 		return nil
 	}
 	t.state = closing
-	t.mu.Unlock()
-	t.cancel()
-	err := t.conn.Close()
-	t.mu.Lock()
 	streams := t.activeStreams
 	t.activeStreams = nil
 	t.mu.Unlock()
+	t.controlBuf.finish()
+	t.cancel()
+	err := t.conn.Close()
+	if channelz.IsOn() {
+		channelz.RemoveEntry(t.channelzID)
+	}
 	// Notify all active streams.
 	for _, s := range streams {
-		s.mu.Lock()
-		if !s.headerDone {
-			close(s.headerChan)
-			s.headerDone = true
-		}
-		s.mu.Unlock()
-		s.write(recvMsg{err: ErrConnClosing})
+		t.closeStream(s, ErrConnClosing, false, http2.ErrCodeNo, status.New(codes.Unavailable, ErrConnClosing.Desc), nil, false)
 	}
 	if t.statsHandler != nil {
 		connEnd := &stats.ConnEnd{
@@ -645,8 +772,8 @@ func (t *http2Client) Close() error {
 // closing.
 func (t *http2Client) GracefulClose() error {
 	t.mu.Lock()
-	switch t.state {
-	case closing, draining:
+	// Make sure we move to draining only from active.
+	if t.state == draining || t.state == closing {
 		t.mu.Unlock()
 		return nil
 	}
@@ -656,116 +783,41 @@ func (t *http2Client) GracefulClose() error {
 	if active == 0 {
 		return t.Close()
 	}
+	t.controlBuf.put(&incomingGoAway{})
 	return nil
 }
 
 // Write formats the data into HTTP2 data frame(s) and sends it out. The caller
 // should proceed only if Write returns nil.
 func (t *http2Client) Write(s *Stream, hdr []byte, data []byte, opts *Options) error {
-	select {
-	case <-s.ctx.Done():
-		return ContextErr(s.ctx.Err())
-	case <-s.done:
-		return io.EOF
-	case <-t.ctx.Done():
-		return ErrConnClosing
-	default:
-	}
-
-	if hdr == nil && data == nil && opts.Last {
-		// stream.CloseSend uses this to send an empty frame with endStream=True
-		t.controlBuf.put(&dataFrame{streamID: s.id, endStream: true, f: func() {}})
-		return nil
-	}
-	// Add data to header frame so that we can equally distribute data across frames.
-	emptyLen := http2MaxFrameLen - len(hdr)
-	if emptyLen > len(data) {
-		emptyLen = len(data)
-	}
-	hdr = append(hdr, data[:emptyLen]...)
-	data = data[emptyLen:]
-	var (
-		streamQuota    int
-		streamQuotaVer uint32
-		err            error
-	)
-	for idx, r := range [][]byte{hdr, data} {
-		for len(r) > 0 {
-			size := http2MaxFrameLen
-			if size > len(r) {
-				size = len(r)
-			}
-			if streamQuota == 0 { // Used up all the locally cached stream quota.
-				// Get all the stream quota there is.
-				streamQuota, streamQuotaVer, err = s.sendQuotaPool.get(math.MaxInt32, s.waiters)
-				if err != nil {
-					return err
-				}
-			}
-			if size > streamQuota {
-				size = streamQuota
-			}
-
-			// Get size worth quota from transport.
-			tq, _, err := t.sendQuotaPool.get(size, s.waiters)
-			if err != nil {
-				return err
-			}
-			if tq < size {
-				size = tq
-			}
-			ltq, _, err := t.localSendQuota.get(size, s.waiters)
-			if err != nil {
-				// Add the acquired quota back to transport.
-				t.sendQuotaPool.add(tq)
-				return err
-			}
-			// even if ltq is smaller than size we don't adjust size since
-			// ltq is only a soft limit.
-			streamQuota -= size
-			p := r[:size]
-			var endStream bool
-			// See if this is the last frame to be written.
-			if opts.Last {
-				if len(r)-size == 0 { // No more data in r after this iteration.
-					if idx == 0 { // We're writing data header.
-						if len(data) == 0 { // There's no data to follow.
-							endStream = true
-						}
-					} else { // We're writing data.
-						endStream = true
-					}
-				}
-			}
-			success := func() {
-				ltq := ltq
-				t.controlBuf.put(&dataFrame{streamID: s.id, endStream: endStream, d: p, f: func() { t.localSendQuota.add(ltq) }})
-				r = r[size:]
-			}
-			failure := func() { // The stream quota version must have changed.
-				// Our streamQuota cache is invalidated now, so give it back.
-				s.sendQuotaPool.lockedAdd(streamQuota + size)
-			}
-			if !s.sendQuotaPool.compareAndExecute(streamQuotaVer, success, failure) {
-				// Couldn't send this chunk out.
-				t.sendQuotaPool.add(size)
-				t.localSendQuota.add(ltq)
-				streamQuota = 0
-			}
+	if opts.Last {
+		// If it's the last message, update stream state.
+		if !s.compareAndSwapState(streamActive, streamWriteDone) {
+			return errStreamDone
 		}
+	} else if s.getState() != streamActive {
+		return errStreamDone
 	}
-	if streamQuota > 0 { // Add the left over quota back to stream.
-		s.sendQuotaPool.add(streamQuota)
-	}
-	if !opts.Last {
-		return nil
-	}
-	s.mu.Lock()
-	if s.state != streamDone {
-		s.state = streamWriteDone
+	df := &dataFrame{
+		streamID:  s.id,
+		endStream: opts.Last,
+	}
+	if hdr != nil || data != nil { // If it's not an empty data frame.
+		// Add some data to grpc message header so that we can equally
+		// distribute bytes across frames.
+		emptyLen := http2MaxFrameLen - len(hdr)
+		if emptyLen > len(data) {
+			emptyLen = len(data)
+		}
+		hdr = append(hdr, data[:emptyLen]...)
+		data = data[emptyLen:]
+		df.h, df.d = hdr, data
+		// TODO(mmukhi): The above logic in this if can be moved to loopyWriter's data handler.
+		if err := s.wq.get(int32(len(hdr) + len(data))); err != nil {
+			return err
+		}
 	}
-	s.mu.Unlock()
-	return nil
+	return t.controlBuf.put(df)
 }
 
 func (t *http2Client) getStream(f http2.Frame) (*Stream, bool) {
@@ -779,34 +831,17 @@ func (t *http2Client) getStream(f http2.Frame) (*Stream, bool) {
 // of stream if the application is requesting data larger in size than
 // the window.
 func (t *http2Client) adjustWindow(s *Stream, n uint32) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.state == streamDone {
-		return
-	}
 	if w := s.fc.maybeAdjust(n); w > 0 {
-		// Piggyback connection's window update along.
-		if cw := t.fc.resetPendingUpdate(); cw > 0 {
-			t.controlBuf.put(&windowUpdate{0, cw})
-		}
-		t.controlBuf.put(&windowUpdate{s.id, w})
+		t.controlBuf.put(&outgoingWindowUpdate{streamID: s.id, increment: w})
 	}
 }
 
-// updateWindow adjusts the inbound quota for the stream and the transport.
-// Window updates will deliver to the controller for sending when
-// the cumulative quota exceeds the corresponding threshold.
+// updateWindow adjusts the inbound quota for the stream.
+// Window updates will be sent out when the cumulative quota
+// exceeds the corresponding threshold.
 func (t *http2Client) updateWindow(s *Stream, n uint32) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.state == streamDone {
-		return
-	}
 	if w := s.fc.onRead(n); w > 0 {
-		if cw := t.fc.resetPendingUpdate(); cw > 0 {
-			t.controlBuf.put(&windowUpdate{0, cw})
-		}
-		t.controlBuf.put(&windowUpdate{s.id, w})
+		t.controlBuf.put(&outgoingWindowUpdate{streamID: s.id, increment: w})
 	}
 }
 
@@ -818,14 +853,17 @@ func (t *http2Client) updateFlowControl(n uint32) {
 	for _, s := range t.activeStreams {
 		s.fc.newLimit(n)
 	}
-	t.initialWindowSize = int32(n)
 	t.mu.Unlock()
-	t.controlBuf.put(&windowUpdate{0, t.fc.newLimit(n)})
-	t.controlBuf.put(&settings{
+	updateIWS := func(interface{}) bool {
+		t.initialWindowSize = int32(n)
+		return true
+	}
+	t.controlBuf.executeAndPut(updateIWS, &outgoingWindowUpdate{streamID: 0, increment: t.fc.newLimit(n)})
+	t.controlBuf.put(&outgoingSettings{
 		ss: []http2.Setting{
 			{
 				ID:  http2.SettingInitialWindowSize,
-				Val: uint32(n),
+				Val: n,
 			},
 		},
 	})
@@ -835,7 +873,7 @@ func (t *http2Client) handleData(f *http2.DataFrame) {
 	size := f.Header().Length
 	var sendBDPPing bool
 	if t.bdpEst != nil {
-		sendBDPPing = t.bdpEst.add(uint32(size))
+		sendBDPPing = t.bdpEst.add(size)
 	}
 	// Decouple connection's flow control from application's read.
 	// An update on connection's flow control should not depend on
@@ -846,21 +884,24 @@ func (t *http2Client) handleData(f *http2.DataFrame) {
 	// active(fast) streams from starving in presence of slow or
 	// inactive streams.
 	//
-	// Furthermore, if a bdpPing is being sent out we can piggyback
-	// connection's window update for the bytes we just received.
+	if w := t.fc.onData(size); w > 0 {
+		t.controlBuf.put(&outgoingWindowUpdate{
+			streamID:  0,
+			increment: w,
+		})
+	}
 	if sendBDPPing {
-		if size != 0 { // Could've been an empty data frame.
-			t.controlBuf.put(&windowUpdate{0, uint32(size)})
+		// Avoid excessive ping detection (e.g. in an L7 proxy)
+		// by sending a window update prior to the BDP ping.
+
+		if w := t.fc.reset(); w > 0 {
+			t.controlBuf.put(&outgoingWindowUpdate{
+				streamID:  0,
+				increment: w,
+			})
 		}
+
 		t.controlBuf.put(bdpPing)
-	} else {
-		if err := t.fc.onData(uint32(size)); err != nil {
-			t.Close()
-			return
-		}
-		if w := t.fc.onRead(uint32(size)); w > 0 {
-			t.controlBuf.put(&windowUpdate{0, w})
-		}
 	}
 	// Select the right stream to dispatch.
 	s, ok := t.getStream(f)
@@ -868,25 +909,15 @@ func (t *http2Client) handleData(f *http2.DataFrame) {
 		return
 	}
 	if size > 0 {
-		s.mu.Lock()
-		if s.state == streamDone {
-			s.mu.Unlock()
-			return
-		}
-		if err := s.fc.onData(uint32(size)); err != nil {
-			s.rstStream = true
-			s.rstError = http2.ErrCodeFlowControl
-			s.finish(status.New(codes.Internal, err.Error()))
-			s.mu.Unlock()
-			s.write(recvMsg{err: io.EOF})
+		if err := s.fc.onData(size); err != nil {
+			t.closeStream(s, io.EOF, true, http2.ErrCodeFlowControl, status.New(codes.Internal, err.Error()), nil, false)
 			return
 		}
 		if f.Header().Flags.Has(http2.FlagDataPadded) {
-			if w := s.fc.onRead(uint32(size) - uint32(len(f.Data()))); w > 0 {
-				t.controlBuf.put(&windowUpdate{s.id, w})
+			if w := s.fc.onRead(size - uint32(len(f.Data()))); w > 0 {
+				t.controlBuf.put(&outgoingWindowUpdate{s.id, w})
 			}
 		}
-		s.mu.Unlock()
 		// TODO(bradfitz, zhaoq): A copy is required here because there is no
 		// guarantee f.Data() is consumed before the arrival of next frame.
 		// Can this copy be eliminated?
@@ -899,14 +930,7 @@ func (t *http2Client) handleData(f *http2.DataFrame) {
 	// The server has closed the stream without sending trailers.  Record that
 	// the read direction is closed, and set the status appropriately.
 	if f.FrameHeader.Flags.Has(http2.FlagDataEndStream) {
-		s.mu.Lock()
-		if s.state == streamDone {
-			s.mu.Unlock()
-			return
-		}
-		s.finish(status.New(codes.Internal, "server closed the stream without sending trailers"))
-		s.mu.Unlock()
-		s.write(recvMsg{err: io.EOF})
+		t.closeStream(s, io.EOF, false, http2.ErrCodeNo, status.New(codes.Internal, "server closed the stream without sending trailers"), nil, true)
 	}
 }
 
@@ -915,73 +939,72 @@ func (t *http2Client) handleRSTStream(f *http2.RSTStreamFrame) {
 	if !ok {
 		return
 	}
-	s.mu.Lock()
-	if s.state == streamDone {
-		s.mu.Unlock()
-		return
-	}
-	if !s.headerDone {
-		close(s.headerChan)
-		s.headerDone = true
-	}
-
-	code := http2.ErrCode(f.ErrCode)
-	if code == http2.ErrCodeRefusedStream {
+	if f.ErrCode == http2.ErrCodeRefusedStream {
 		// The stream was unprocessed by the server.
-		s.unprocessed = true
+		atomic.StoreUint32(&s.unprocessed, 1)
 	}
-	statusCode, ok := http2ErrConvTab[code]
+	statusCode, ok := http2ErrConvTab[f.ErrCode]
 	if !ok {
 		warningf("transport: http2Client.handleRSTStream found no mapped gRPC status for the received http2 error %v", f.ErrCode)
 		statusCode = codes.Unknown
 	}
-	s.finish(status.Newf(statusCode, "stream terminated by RST_STREAM with error code: %v", f.ErrCode))
-	s.mu.Unlock()
-	s.write(recvMsg{err: io.EOF})
+	if statusCode == codes.Canceled {
+		// Our deadline was already exceeded, and that was likely the cause of
+		// this cancelation.  Alter the status code accordingly.
+		if d, ok := s.ctx.Deadline(); ok && d.After(time.Now()) {
+			statusCode = codes.DeadlineExceeded
+		}
+	}
+	t.closeStream(s, io.EOF, false, http2.ErrCodeNo, status.Newf(statusCode, "stream terminated by RST_STREAM with error code: %v", f.ErrCode), nil, false)
 }
 
 func (t *http2Client) handleSettings(f *http2.SettingsFrame, isFirst bool) {
 	if f.IsAck() {
 		return
 	}
-	var rs []http2.Setting
-	var ps []http2.Setting
-	isMaxConcurrentStreamsMissing := true
+	var maxStreams *uint32
+	var ss []http2.Setting
+	var updateFuncs []func()
 	f.ForeachSetting(func(s http2.Setting) error {
-		if s.ID == http2.SettingMaxConcurrentStreams {
-			isMaxConcurrentStreamsMissing = false
-		}
-		if t.isRestrictive(s) {
-			rs = append(rs, s)
-		} else {
-			ps = append(ps, s)
+		switch s.ID {
+		case http2.SettingMaxConcurrentStreams:
+			maxStreams = new(uint32)
+			*maxStreams = s.Val
+		case http2.SettingMaxHeaderListSize:
+			updateFuncs = append(updateFuncs, func() {
+				t.maxSendHeaderListSize = new(uint32)
+				*t.maxSendHeaderListSize = s.Val
+			})
+		default:
+			ss = append(ss, s)
 		}
 		return nil
 	})
-	if isFirst && isMaxConcurrentStreamsMissing {
-		// This means server is imposing no limits on
-		// maximum number of concurrent streams initiated by client.
-		// So we must remove our self-imposed limit.
-		ps = append(ps, http2.Setting{
-			ID:  http2.SettingMaxConcurrentStreams,
-			Val: math.MaxUint32,
-		})
-	}
-	t.applySettings(rs)
-	t.controlBuf.put(&settingsAck{})
-	t.applySettings(ps)
-}
-
-func (t *http2Client) isRestrictive(s http2.Setting) bool {
-	switch s.ID {
-	case http2.SettingMaxConcurrentStreams:
-		return int(s.Val) < t.maxStreams
-	case http2.SettingInitialWindowSize:
-		// Note: we don't acquire a lock here to read streamSendQuota
-		// because the same goroutine updates it later.
-		return s.Val < t.streamSendQuota
+	if isFirst && maxStreams == nil {
+		maxStreams = new(uint32)
+		*maxStreams = math.MaxUint32
+	}
+	sf := &incomingSettings{
+		ss: ss,
+	}
+	if maxStreams != nil {
+		updateStreamQuota := func() {
+			delta := int64(*maxStreams) - int64(t.maxConcurrentStreams)
+			t.maxConcurrentStreams = *maxStreams
+			t.streamQuota += delta
+			if delta > 0 && t.waitingStreams > 0 {
+				close(t.streamsQuotaAvailable) // wake all of them up.
+				t.streamsQuotaAvailable = make(chan struct{}, 1)
+			}
+		}
+		updateFuncs = append(updateFuncs, updateStreamQuota)
 	}
-	return false
+	t.controlBuf.executeAndPut(func(interface{}) bool {
+		for _, f := range updateFuncs {
+			f()
+		}
+		return true
+	}, sf)
 }
 
 func (t *http2Client) handlePing(f *http2.PingFrame) {
@@ -999,7 +1022,7 @@ func (t *http2Client) handlePing(f *http2.PingFrame) {
 
 func (t *http2Client) handleGoAway(f *http2.GoAwayFrame) {
 	t.mu.Lock()
-	if t.state != reachable && t.state != draining {
+	if t.state == closing {
 		t.mu.Unlock()
 		return
 	}
@@ -1034,6 +1057,7 @@ func (t *http2Client) handleGoAway(f *http2.GoAwayFrame) {
 		t.setGoAwayReason(f)
 		close(t.goAway)
 		t.state = draining
+		t.controlBuf.put(&incomingGoAway{})
 	}
 	// All streams with IDs greater than the GoAwayId
 	// and smaller than the previous GoAway ID should be killed.
@@ -1044,11 +1068,8 @@ func (t *http2Client) handleGoAway(f *http2.GoAwayFrame) {
 	for streamID, stream := range t.activeStreams {
 		if streamID > id && streamID <= upperLimit {
 			// The stream was unprocessed by the server.
-			stream.mu.Lock()
-			stream.unprocessed = true
-			stream.finish(statusGoAway)
-			stream.mu.Unlock()
-			close(stream.goAway)
+			atomic.StoreUint32(&stream.unprocessed, 1)
+			t.closeStream(stream, errStreamDrain, false, http2.ErrCodeNo, statusGoAway, nil, false)
 		}
 	}
 	t.prevGoAwayID = id
@@ -1080,15 +1101,10 @@ func (t *http2Client) GetGoAwayReason() GoAwayReason {
 }
 
 func (t *http2Client) handleWindowUpdate(f *http2.WindowUpdateFrame) {
-	id := f.Header().StreamID
-	incr := f.Increment
-	if id == 0 {
-		t.sendQuotaPool.add(int(incr))
-		return
-	}
-	if s, ok := t.getStream(f); ok {
-		s.sendQuotaPool.add(int(incr))
-	}
+	t.controlBuf.put(&incomingWindowUpdate{
+		streamID:  f.Header().StreamID,
+		increment: f.Increment,
+	})
 }
 
 // operateHeaders takes action on the decoded headers.
@@ -1097,18 +1113,10 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
 	if !ok {
 		return
 	}
-	s.mu.Lock()
-	s.bytesReceived = true
-	s.mu.Unlock()
+	atomic.StoreUint32(&s.bytesReceived, 1)
 	var state decodeState
-	if err := state.decodeResponseHeader(frame); err != nil {
-		s.mu.Lock()
-		if !s.headerDone {
-			close(s.headerChan)
-			s.headerDone = true
-		}
-		s.mu.Unlock()
-		s.write(recvMsg{err: err})
+	if err := state.decodeHeader(frame); err != nil {
+		t.closeStream(s, err, true, http2.ErrCodeProtocol, status.New(codes.Internal, err.Error()), nil, false)
 		// Something wrong. Stops reading even when there is remaining.
 		return
 	}
@@ -1132,40 +1140,27 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
 			}
 		}
 	}()
-
-	s.mu.Lock()
-	if !s.headerDone {
+	// If headers haven't been received yet.
+	if atomic.SwapUint32(&s.headerDone, 1) == 0 {
 		if !endStream {
 			// Headers frame is not actually a trailers-only frame.
 			isHeader = true
+			// These values can be set without any synchronization because
+			// stream goroutine will read it only after seeing a closed
+			// headerChan which we'll close after setting this.
 			s.recvCompress = state.encoding
 			if len(state.mdata) > 0 {
 				s.header = state.mdata
 			}
+		} else {
+			s.noHeaders = true
 		}
 		close(s.headerChan)
-		s.headerDone = true
 	}
-	if !endStream || s.state == streamDone {
-		s.mu.Unlock()
+	if !endStream {
 		return
 	}
-	if len(state.mdata) > 0 {
-		s.trailer = state.mdata
-	}
-	s.finish(state.status())
-	s.mu.Unlock()
-	s.write(recvMsg{err: io.EOF})
-}
-
-func handleMalformedHTTP2(s *Stream, err error) {
-	s.mu.Lock()
-	if !s.headerDone {
-		close(s.headerChan)
-		s.headerDone = true
-	}
-	s.mu.Unlock()
-	s.write(recvMsg{err: err})
+	t.closeStream(s, io.EOF, false, http2.ErrCodeNo, state.status(), state.mdata, true)
 }
 
 // reader runs as a separate goroutine in charge of reading data from network
@@ -1175,13 +1170,16 @@ func handleMalformedHTTP2(s *Stream, err error) {
 // optimal.
 // TODO(zhaoq): Check the validity of the incoming frame sequence.
 func (t *http2Client) reader() {
+	defer close(t.readerDone)
 	// Check the validity of server preface.
 	frame, err := t.framer.fr.ReadFrame()
 	if err != nil {
 		t.Close()
 		return
 	}
-	atomic.CompareAndSwapUint32(&t.activity, 0, 1)
+	if t.keepaliveEnabled {
+		atomic.CompareAndSwapUint32(&t.activity, 0, 1)
+	}
 	sf, ok := frame.(*http2.SettingsFrame)
 	if !ok {
 		t.Close()
@@ -1193,7 +1191,9 @@ func (t *http2Client) reader() {
 	// loop to keep reading incoming messages on this transport.
 	for {
 		frame, err := t.framer.fr.ReadFrame()
-		atomic.CompareAndSwapUint32(&t.activity, 0, 1)
+		if t.keepaliveEnabled {
+			atomic.CompareAndSwapUint32(&t.activity, 0, 1)
+		}
 		if err != nil {
 			// Abort an active stream if the http2.Framer returns a
 			// http2.StreamError. This can happen only if the server's response
@@ -1204,7 +1204,9 @@ func (t *http2Client) reader() {
 				t.mu.Unlock()
 				if s != nil {
 					// use error detail to provide better err message
-					handleMalformedHTTP2(s, streamErrorf(http2ErrConvTab[se.Code], "%v", t.framer.fr.ErrorDetail()))
+					code := http2ErrConvTab[se.Code]
+					msg := t.framer.fr.ErrorDetail().Error()
+					t.closeStream(s, status.Error(code, msg), true, http2.ErrCodeProtocol, status.New(code, msg), nil, false)
 				}
 				continue
 			} else {
@@ -1234,109 +1236,6 @@ func (t *http2Client) reader() {
 	}
 }
 
-func (t *http2Client) applySettings(ss []http2.Setting) {
-	for _, s := range ss {
-		switch s.ID {
-		case http2.SettingMaxConcurrentStreams:
-			// TODO(zhaoq): This is a hack to avoid significant refactoring of the
-			// code to deal with the unrealistic int32 overflow. Probably will try
-			// to find a better way to handle this later.
-			if s.Val > math.MaxInt32 {
-				s.Val = math.MaxInt32
-			}
-			ms := t.maxStreams
-			t.maxStreams = int(s.Val)
-			t.streamsQuota.add(int(s.Val) - ms)
-		case http2.SettingInitialWindowSize:
-			t.mu.Lock()
-			for _, stream := range t.activeStreams {
-				// Adjust the sending quota for each stream.
-				stream.sendQuotaPool.addAndUpdate(int(s.Val) - int(t.streamSendQuota))
-			}
-			t.streamSendQuota = s.Val
-			t.mu.Unlock()
-		}
-	}
-}
-
-// TODO(mmukhi): A lot of this code(and code in other places in the tranpsort layer)
-// is duplicated between the client and the server.
-// The transport layer needs to be refactored to take care of this.
-func (t *http2Client) itemHandler(i item) (err error) {
-	defer func() {
-		if err != nil {
-			errorf(" error in itemHandler: %v", err)
-		}
-	}()
-	switch i := i.(type) {
-	case *dataFrame:
-		if err := t.framer.fr.WriteData(i.streamID, i.endStream, i.d); err != nil {
-			return err
-		}
-		i.f()
-		return nil
-	case *headerFrame:
-		t.hBuf.Reset()
-		for _, f := range i.hf {
-			t.hEnc.WriteField(f)
-		}
-		endHeaders := false
-		first := true
-		for !endHeaders {
-			size := t.hBuf.Len()
-			if size > http2MaxFrameLen {
-				size = http2MaxFrameLen
-			} else {
-				endHeaders = true
-			}
-			if first {
-				first = false
-				err = t.framer.fr.WriteHeaders(http2.HeadersFrameParam{
-					StreamID:      i.streamID,
-					BlockFragment: t.hBuf.Next(size),
-					EndStream:     i.endStream,
-					EndHeaders:    endHeaders,
-				})
-			} else {
-				err = t.framer.fr.WriteContinuation(
-					i.streamID,
-					endHeaders,
-					t.hBuf.Next(size),
-				)
-			}
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	case *windowUpdate:
-		return t.framer.fr.WriteWindowUpdate(i.streamID, i.increment)
-	case *settings:
-		return t.framer.fr.WriteSettings(i.ss...)
-	case *settingsAck:
-		return t.framer.fr.WriteSettingsAck()
-	case *resetStream:
-		// If the server needs to be to intimated about stream closing,
-		// then we need to make sure the RST_STREAM frame is written to
-		// the wire before the headers of the next stream waiting on
-		// streamQuota. We ensure this by adding to the streamsQuota pool
-		// only after having acquired the writableChan to send RST_STREAM.
-		err := t.framer.fr.WriteRSTStream(i.streamID, i.code)
-		t.streamsQuota.add(1)
-		return err
-	case *flushIO:
-		return t.framer.writer.Flush()
-	case *ping:
-		if !i.ack {
-			t.bdpEst.timesnap(i.data)
-		}
-		return t.framer.fr.WritePing(i.ack, i.data)
-	default:
-		errorf("transport: http2Client.controller got unexpected item type %v", i)
-		return fmt.Errorf("transport: http2Client.controller got unexpected item type %v", i)
-	}
-}
-
 // keepalive running in a separate goroutune makes sure the connection is alive by sending pings.
 func (t *http2Client) keepalive() {
 	p := &ping{data: [8]byte{}}
@@ -1363,6 +1262,11 @@ func (t *http2Client) keepalive() {
 				}
 			} else {
 				t.mu.Unlock()
+				if channelz.IsOn() {
+					t.czmu.Lock()
+					t.kpCount++
+					t.czmu.Unlock()
+				}
 				// Send ping.
 				t.controlBuf.put(p)
 			}
@@ -1399,3 +1303,58 @@ func (t *http2Client) Error() <-chan struct{} {
 func (t *http2Client) GoAway() <-chan struct{} {
 	return t.goAway
 }
+
+func (t *http2Client) ChannelzMetric() *channelz.SocketInternalMetric {
+	t.czmu.RLock()
+	s := channelz.SocketInternalMetric{
+		StreamsStarted:                  t.streamsStarted,
+		StreamsSucceeded:                t.streamsSucceeded,
+		StreamsFailed:                   t.streamsFailed,
+		MessagesSent:                    t.msgSent,
+		MessagesReceived:                t.msgRecv,
+		KeepAlivesSent:                  t.kpCount,
+		LastLocalStreamCreatedTimestamp: t.lastStreamCreated,
+		LastMessageSentTimestamp:        t.lastMsgSent,
+		LastMessageReceivedTimestamp:    t.lastMsgRecv,
+		LocalFlowControlWindow:          int64(t.fc.getSize()),
+		SocketOptions:                   channelz.GetSocketOption(t.conn),
+		LocalAddr:                       t.localAddr,
+		RemoteAddr:                      t.remoteAddr,
+		// RemoteName :
+	}
+	if au, ok := t.authInfo.(credentials.ChannelzSecurityInfo); ok {
+		s.Security = au.GetSecurityValue()
+	}
+	t.czmu.RUnlock()
+	s.RemoteFlowControlWindow = t.getOutFlowWindow()
+	return &s
+}
+
+func (t *http2Client) IncrMsgSent() {
+	t.czmu.Lock()
+	t.msgSent++
+	t.lastMsgSent = time.Now()
+	t.czmu.Unlock()
+}
+
+func (t *http2Client) IncrMsgRecv() {
+	t.czmu.Lock()
+	t.msgRecv++
+	t.lastMsgRecv = time.Now()
+	t.czmu.Unlock()
+}
+
+func (t *http2Client) getOutFlowWindow() int64 {
+	resp := make(chan uint32, 1)
+	timer := time.NewTimer(time.Second)
+	defer timer.Stop()
+	t.controlBuf.put(&outFlowControlSizeRequest{resp})
+	select {
+	case sz := <-resp:
+		return int64(sz)
+	case <-t.ctxDone:
+		return -1
+	case <-timer.C:
+		return -2
+	}
+}
diff --git a/vendor/google.golang.org/grpc/transport/http2_server.go b/vendor/google.golang.org/grpc/internal/transport/http2_server.go
similarity index 64%
rename from vendor/google.golang.org/grpc/transport/http2_server.go
rename to vendor/google.golang.org/grpc/internal/transport/http2_server.go
index 24c2c7e1..a8a09270 100644
--- a/vendor/google.golang.org/grpc/transport/http2_server.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http2_server.go
@@ -24,7 +24,6 @@ import (
 	"fmt"
 	"io"
 	"math"
-	"math/rand"
 	"net"
 	"strconv"
 	"sync"
@@ -35,8 +34,12 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/hpack"
+
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/grpc/internal/grpcrand"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
@@ -45,35 +48,37 @@ import (
 	"google.golang.org/grpc/tap"
 )
 
-// ErrIllegalHeaderWrite indicates that setting header is illegal because of
-// the stream's state.
-var ErrIllegalHeaderWrite = errors.New("transport: the stream is done or WriteHeader was already called")
+var (
+	// ErrIllegalHeaderWrite indicates that setting header is illegal because of
+	// the stream's state.
+	ErrIllegalHeaderWrite = errors.New("transport: the stream is done or WriteHeader was already called")
+	// ErrHeaderListSizeLimitViolation indicates that the header list size is larger
+	// than the limit set by peer.
+	ErrHeaderListSizeLimitViolation = errors.New("transport: trying to send header list size larger than the limit set by peer")
+)
 
 // http2Server implements the ServerTransport interface with HTTP2.
 type http2Server struct {
 	ctx         context.Context
+	ctxDone     <-chan struct{} // Cache the context.Done() chan
 	cancel      context.CancelFunc
 	conn        net.Conn
+	loopy       *loopyWriter
+	readerDone  chan struct{} // sync point to enable testing.
+	writerDone  chan struct{} // sync point to enable testing.
 	remoteAddr  net.Addr
 	localAddr   net.Addr
 	maxStreamID uint32               // max stream ID ever seen
 	authInfo    credentials.AuthInfo // auth info about the connection
 	inTapHandle tap.ServerInHandle
 	framer      *framer
-	hBuf        *bytes.Buffer  // the buffer for HPACK encoding
-	hEnc        *hpack.Encoder // HPACK encoder
 	// The max number of concurrent streams.
 	maxStreams uint32
 	// controlBuf delivers all the control related tasks (e.g., window
 	// updates, reset streams, and various settings) to the controller.
 	controlBuf *controlBuffer
-	fc         *inFlow
-	// sendQuotaPool provides flow control to outbound message.
-	sendQuotaPool *quotaPool
-	// localSendQuota limits the amount of data that can be scheduled
-	// for writing before it is actually written out.
-	localSendQuota *quotaPool
-	stats          stats.Handler
+	fc         *trInFlow
+	stats      stats.Handler
 	// Flag to keep track of reading activity on transport.
 	// 1 is true and 0 is false.
 	activity uint32 // Accessed atomically.
@@ -89,9 +94,10 @@ type http2Server struct {
 	// Flag to signify that number of ping strikes should be reset to 0.
 	// This is set whenever data or header frames are sent.
 	// 1 means yes.
-	resetPingStrikes  uint32 // Accessed atomically.
-	initialWindowSize int32
-	bdpEst            *bdpEstimator
+	resetPingStrikes      uint32 // Accessed atomically.
+	initialWindowSize     int32
+	bdpEst                *bdpEstimator
+	maxSendHeaderListSize *uint32
 
 	mu sync.Mutex // guard the following
 
@@ -104,27 +110,39 @@ type http2Server struct {
 	drainChan     chan struct{}
 	state         transportState
 	activeStreams map[uint32]*Stream
-	// the per-stream outbound flow control window size set by the peer.
-	streamSendQuota uint32
 	// idle is the time instant when the connection went idle.
 	// This is either the beginning of the connection or when the number of
 	// RPCs go down to 0.
 	// When the connection is busy, this value is set to 0.
 	idle time.Time
+
+	// Fields below are for channelz metric collection.
+	channelzID int64 // channelz unique identification number
+	czmu       sync.RWMutex
+	kpCount    int64
+	// The number of streams that have started, including already finished ones.
+	streamsStarted int64
+	// The number of streams that have ended successfully by sending frame with
+	// EoS bit set.
+	streamsSucceeded  int64
+	streamsFailed     int64
+	lastStreamCreated time.Time
+	msgSent           int64
+	msgRecv           int64
+	lastMsgSent       time.Time
+	lastMsgRecv       time.Time
 }
 
 // newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is
 // returned if something goes wrong.
 func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err error) {
-	writeBufSize := defaultWriteBufSize
-	if config.WriteBufferSize > 0 {
-		writeBufSize = config.WriteBufferSize
-	}
-	readBufSize := defaultReadBufSize
-	if config.ReadBufferSize > 0 {
-		readBufSize = config.ReadBufferSize
+	writeBufSize := config.WriteBufferSize
+	readBufSize := config.ReadBufferSize
+	maxHeaderListSize := defaultServerMaxHeaderListSize
+	if config.MaxHeaderListSize != nil {
+		maxHeaderListSize = *config.MaxHeaderListSize
 	}
-	framer := newFramer(conn, writeBufSize, readBufSize)
+	framer := newFramer(conn, writeBufSize, readBufSize, maxHeaderListSize)
 	// Send initial settings as connection preface to client.
 	var isettings []http2.Setting
 	// TODO(zhaoq): Have a better way to signal "no limit" because 0 is
@@ -154,6 +172,12 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err
 			ID:  http2.SettingInitialWindowSize,
 			Val: uint32(iwz)})
 	}
+	if config.MaxHeaderListSize != nil {
+		isettings = append(isettings, http2.Setting{
+			ID:  http2.SettingMaxHeaderListSize,
+			Val: *config.MaxHeaderListSize,
+		})
+	}
 	if err := framer.fr.WriteSettings(isettings...); err != nil {
 		return nil, connectionErrorf(false, err, "transport: %v", err)
 	}
@@ -185,33 +209,30 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err
 	if kep.MinTime == 0 {
 		kep.MinTime = defaultKeepalivePolicyMinTime
 	}
-	var buf bytes.Buffer
 	ctx, cancel := context.WithCancel(context.Background())
 	t := &http2Server{
 		ctx:               ctx,
 		cancel:            cancel,
+		ctxDone:           ctx.Done(),
 		conn:              conn,
 		remoteAddr:        conn.RemoteAddr(),
 		localAddr:         conn.LocalAddr(),
 		authInfo:          config.AuthInfo,
 		framer:            framer,
-		hBuf:              &buf,
-		hEnc:              hpack.NewEncoder(&buf),
+		readerDone:        make(chan struct{}),
+		writerDone:        make(chan struct{}),
 		maxStreams:        maxStreams,
 		inTapHandle:       config.InTapHandle,
-		controlBuf:        newControlBuffer(),
-		fc:                &inFlow{limit: uint32(icwz)},
-		sendQuotaPool:     newQuotaPool(defaultWindowSize),
-		localSendQuota:    newQuotaPool(defaultLocalSendQuota),
+		fc:                &trInFlow{limit: uint32(icwz)},
 		state:             reachable,
 		activeStreams:     make(map[uint32]*Stream),
-		streamSendQuota:   defaultWindowSize,
 		stats:             config.StatsHandler,
 		kp:                kp,
 		idle:              time.Now(),
 		kep:               kep,
 		initialWindowSize: iwz,
 	}
+	t.controlBuf = newControlBuffer(t.ctxDone)
 	if dynamicWindow {
 		t.bdpEst = &bdpEstimator{
 			bdp:               initialWindowSize,
@@ -226,6 +247,9 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err
 		connBegin := &stats.ConnBegin{}
 		t.stats.HandleConn(t.ctx, connBegin)
 	}
+	if channelz.IsOn() {
+		t.channelzID = channelz.RegisterNormalSocket(t, config.ChannelzParentID, "")
+	}
 	t.framer.writer.Flush()
 
 	defer func() {
@@ -258,8 +282,13 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err
 	t.handleSettings(sf)
 
 	go func() {
-		loopyWriter(t.ctx, t.controlBuf, t.itemHandler)
+		t.loopy = newLoopyWriter(serverSide, t.framer, t.controlBuf, t.bdpEst)
+		t.loopy.ssGoAwayHandler = t.outgoingGoAwayHandler
+		if err := t.loopy.run(); err != nil {
+			errorf("transport: loopyWriter.run returning. Err: %v", err)
+		}
 		t.conn.Close()
+		close(t.writerDone)
 	}()
 	go t.keepalive()
 	return t, nil
@@ -268,15 +297,17 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err
 // operateHeader takes action on the decoded headers.
 func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(*Stream), traceCtx func(context.Context, string) context.Context) (close bool) {
 	streamID := frame.Header().StreamID
-
-	var state decodeState
-	for _, hf := range frame.Fields {
-		if err := state.processHeaderField(hf); err != nil {
-			if se, ok := err.(StreamError); ok {
-				t.controlBuf.put(&resetStream{streamID, statusCodeConvTab[se.Code]})
-			}
-			return
+	state := decodeState{serverSide: true}
+	if err := state.decodeHeader(frame); err != nil {
+		if se, ok := status.FromError(err); ok {
+			t.controlBuf.put(&cleanupStream{
+				streamID: streamID,
+				rst:      true,
+				rstCode:  statusCodeConvTab[se.Code()],
+				onWrite:  func() {},
+			})
 		}
+		return
 	}
 
 	buf := newRecvBuffer()
@@ -289,7 +320,6 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 		method:         state.method,
 		contentSubtype: state.contentSubtype,
 	}
-
 	if frame.StreamEnded() {
 		// s is just created by the caller. No lock needed.
 		s.state = streamReadDone
@@ -307,10 +337,6 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 		pr.AuthInfo = t.authInfo
 	}
 	s.ctx = peer.NewContext(s.ctx, pr)
-	// Cache the current stream to the context so that the server application
-	// can find out. Required when the server wants to send some metadata
-	// back to the client (unary call only).
-	s.ctx = newContextWithStream(s.ctx, s)
 	// Attach the received metadata to the context.
 	if len(state.mdata) > 0 {
 		s.ctx = metadata.NewIncomingContext(s.ctx, state.mdata)
@@ -329,7 +355,12 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 		s.ctx, err = t.inTapHandle(s.ctx, info)
 		if err != nil {
 			warningf("transport: http2Server.operateHeaders got an error from InTapHandle: %v", err)
-			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeRefusedStream})
+			t.controlBuf.put(&cleanupStream{
+				streamID: s.id,
+				rst:      true,
+				rstCode:  http2.ErrCodeRefusedStream,
+				onWrite:  func() {},
+			})
 			return
 		}
 	}
@@ -340,7 +371,12 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 	}
 	if uint32(len(t.activeStreams)) >= t.maxStreams {
 		t.mu.Unlock()
-		t.controlBuf.put(&resetStream{streamID, http2.ErrCodeRefusedStream})
+		t.controlBuf.put(&cleanupStream{
+			streamID: streamID,
+			rst:      true,
+			rstCode:  http2.ErrCodeRefusedStream,
+			onWrite:  func() {},
+		})
 		return
 	}
 	if streamID%2 != 1 || streamID <= t.maxStreamID {
@@ -350,12 +386,17 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 		return true
 	}
 	t.maxStreamID = streamID
-	s.sendQuotaPool = newQuotaPool(int(t.streamSendQuota))
 	t.activeStreams[streamID] = s
 	if len(t.activeStreams) == 1 {
 		t.idle = time.Time{}
 	}
 	t.mu.Unlock()
+	if channelz.IsOn() {
+		t.czmu.Lock()
+		t.streamsStarted++
+		t.lastStreamCreated = time.Now()
+		t.czmu.Unlock()
+	}
 	s.requestRead = func(n int) {
 		t.adjustWindow(s, uint32(n))
 	}
@@ -371,19 +412,23 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 		}
 		t.stats.HandleRPC(s.ctx, inHeader)
 	}
+	s.ctxDone = s.ctx.Done()
+	s.wq = newWriteQuota(defaultWriteQuota, s.ctxDone)
 	s.trReader = &transportReader{
 		reader: &recvBufferReader{
-			ctx:  s.ctx,
-			recv: s.buf,
+			ctx:     s.ctx,
+			ctxDone: s.ctxDone,
+			recv:    s.buf,
 		},
 		windowHandler: func(n int) {
 			t.updateWindow(s, uint32(n))
 		},
 	}
-	s.waiters = waiters{
-		ctx:  s.ctx,
-		tctx: t.ctx,
-	}
+	// Register the stream with loopy.
+	t.controlBuf.put(&registerStream{
+		streamID: s.id,
+		wq:       s.wq,
+	})
 	handle(s)
 	return
 }
@@ -392,18 +437,26 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 // typically run in a separate goroutine.
 // traceCtx attaches trace to ctx and returns the new context.
 func (t *http2Server) HandleStreams(handle func(*Stream), traceCtx func(context.Context, string) context.Context) {
+	defer close(t.readerDone)
 	for {
 		frame, err := t.framer.fr.ReadFrame()
 		atomic.StoreUint32(&t.activity, 1)
 		if err != nil {
 			if se, ok := err.(http2.StreamError); ok {
+				warningf("transport: http2Server.HandleStreams encountered http2.StreamError: %v", se)
 				t.mu.Lock()
 				s := t.activeStreams[se.StreamID]
 				t.mu.Unlock()
 				if s != nil {
-					t.closeStream(s)
+					t.closeStream(s, true, se.Code, nil, false)
+				} else {
+					t.controlBuf.put(&cleanupStream{
+						streamID: se.StreamID,
+						rst:      true,
+						rstCode:  se.Code,
+						onWrite:  func() {},
+					})
 				}
-				t.controlBuf.put(&resetStream{se.StreamID, se.Code})
 				continue
 			}
 			if err == io.EOF || err == io.ErrUnexpectedEOF {
@@ -457,33 +510,20 @@ func (t *http2Server) getStream(f http2.Frame) (*Stream, bool) {
 // of stream if the application is requesting data larger in size than
 // the window.
 func (t *http2Server) adjustWindow(s *Stream, n uint32) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.state == streamDone {
-		return
-	}
 	if w := s.fc.maybeAdjust(n); w > 0 {
-		if cw := t.fc.resetPendingUpdate(); cw > 0 {
-			t.controlBuf.put(&windowUpdate{0, cw})
-		}
-		t.controlBuf.put(&windowUpdate{s.id, w})
+		t.controlBuf.put(&outgoingWindowUpdate{streamID: s.id, increment: w})
 	}
+
 }
 
 // updateWindow adjusts the inbound quota for the stream and the transport.
 // Window updates will deliver to the controller for sending when
 // the cumulative quota exceeds the corresponding threshold.
 func (t *http2Server) updateWindow(s *Stream, n uint32) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.state == streamDone {
-		return
-	}
 	if w := s.fc.onRead(n); w > 0 {
-		if cw := t.fc.resetPendingUpdate(); cw > 0 {
-			t.controlBuf.put(&windowUpdate{0, cw})
-		}
-		t.controlBuf.put(&windowUpdate{s.id, w})
+		t.controlBuf.put(&outgoingWindowUpdate{streamID: s.id,
+			increment: w,
+		})
 	}
 }
 
@@ -497,12 +537,15 @@ func (t *http2Server) updateFlowControl(n uint32) {
 	}
 	t.initialWindowSize = int32(n)
 	t.mu.Unlock()
-	t.controlBuf.put(&windowUpdate{0, t.fc.newLimit(n)})
-	t.controlBuf.put(&settings{
+	t.controlBuf.put(&outgoingWindowUpdate{
+		streamID:  0,
+		increment: t.fc.newLimit(n),
+	})
+	t.controlBuf.put(&outgoingSettings{
 		ss: []http2.Setting{
 			{
 				ID:  http2.SettingInitialWindowSize,
-				Val: uint32(n),
+				Val: n,
 			},
 		},
 	})
@@ -513,7 +556,7 @@ func (t *http2Server) handleData(f *http2.DataFrame) {
 	size := f.Header().Length
 	var sendBDPPing bool
 	if t.bdpEst != nil {
-		sendBDPPing = t.bdpEst.add(uint32(size))
+		sendBDPPing = t.bdpEst.add(size)
 	}
 	// Decouple connection's flow control from application's read.
 	// An update on connection's flow control should not depend on
@@ -523,23 +566,22 @@ func (t *http2Server) handleData(f *http2.DataFrame) {
 	// Decoupling the connection flow control will prevent other
 	// active(fast) streams from starving in presence of slow or
 	// inactive streams.
-	//
-	// Furthermore, if a bdpPing is being sent out we can piggyback
-	// connection's window update for the bytes we just received.
+	if w := t.fc.onData(size); w > 0 {
+		t.controlBuf.put(&outgoingWindowUpdate{
+			streamID:  0,
+			increment: w,
+		})
+	}
 	if sendBDPPing {
-		if size != 0 { // Could be an empty frame.
-			t.controlBuf.put(&windowUpdate{0, uint32(size)})
+		// Avoid excessive ping detection (e.g. in an L7 proxy)
+		// by sending a window update prior to the BDP ping.
+		if w := t.fc.reset(); w > 0 {
+			t.controlBuf.put(&outgoingWindowUpdate{
+				streamID:  0,
+				increment: w,
+			})
 		}
 		t.controlBuf.put(bdpPing)
-	} else {
-		if err := t.fc.onData(uint32(size)); err != nil {
-			errorf("transport: http2Server %v", err)
-			t.Close()
-			return
-		}
-		if w := t.fc.onRead(uint32(size)); w > 0 {
-			t.controlBuf.put(&windowUpdate{0, w})
-		}
 	}
 	// Select the right stream to dispatch.
 	s, ok := t.getStream(f)
@@ -547,23 +589,15 @@ func (t *http2Server) handleData(f *http2.DataFrame) {
 		return
 	}
 	if size > 0 {
-		s.mu.Lock()
-		if s.state == streamDone {
-			s.mu.Unlock()
-			return
-		}
-		if err := s.fc.onData(uint32(size)); err != nil {
-			s.mu.Unlock()
-			t.closeStream(s)
-			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeFlowControl})
+		if err := s.fc.onData(size); err != nil {
+			t.closeStream(s, true, http2.ErrCodeFlowControl, nil, false)
 			return
 		}
 		if f.Header().Flags.Has(http2.FlagDataPadded) {
-			if w := s.fc.onRead(uint32(size) - uint32(len(f.Data()))); w > 0 {
-				t.controlBuf.put(&windowUpdate{s.id, w})
+			if w := s.fc.onRead(size - uint32(len(f.Data()))); w > 0 {
+				t.controlBuf.put(&outgoingWindowUpdate{s.id, w})
 			}
 		}
-		s.mu.Unlock()
 		// TODO(bradfitz, zhaoq): A copy is required here because there is no
 		// guarantee f.Data() is consumed before the arrival of next frame.
 		// Can this copy be eliminated?
@@ -575,11 +609,7 @@ func (t *http2Server) handleData(f *http2.DataFrame) {
 	}
 	if f.Header().Flags.Has(http2.FlagDataEndStream) {
 		// Received the end of stream from the client.
-		s.mu.Lock()
-		if s.state != streamDone {
-			s.state = streamReadDone
-		}
-		s.mu.Unlock()
+		s.compareAndSwapState(streamActive, streamReadDone)
 		s.write(recvMsg{err: io.EOF})
 	}
 }
@@ -589,50 +619,35 @@ func (t *http2Server) handleRSTStream(f *http2.RSTStreamFrame) {
 	if !ok {
 		return
 	}
-	t.closeStream(s)
+	t.closeStream(s, false, 0, nil, false)
 }
 
 func (t *http2Server) handleSettings(f *http2.SettingsFrame) {
 	if f.IsAck() {
 		return
 	}
-	var rs []http2.Setting
-	var ps []http2.Setting
+	var ss []http2.Setting
+	var updateFuncs []func()
 	f.ForeachSetting(func(s http2.Setting) error {
-		if t.isRestrictive(s) {
-			rs = append(rs, s)
-		} else {
-			ps = append(ps, s)
+		switch s.ID {
+		case http2.SettingMaxHeaderListSize:
+			updateFuncs = append(updateFuncs, func() {
+				t.maxSendHeaderListSize = new(uint32)
+				*t.maxSendHeaderListSize = s.Val
+			})
+		default:
+			ss = append(ss, s)
 		}
 		return nil
 	})
-	t.applySettings(rs)
-	t.controlBuf.put(&settingsAck{})
-	t.applySettings(ps)
-}
-
-func (t *http2Server) isRestrictive(s http2.Setting) bool {
-	switch s.ID {
-	case http2.SettingInitialWindowSize:
-		// Note: we don't acquire a lock here to read streamSendQuota
-		// because the same goroutine updates it later.
-		return s.Val < t.streamSendQuota
-	}
-	return false
-}
-
-func (t *http2Server) applySettings(ss []http2.Setting) {
-	for _, s := range ss {
-		if s.ID == http2.SettingInitialWindowSize {
-			t.mu.Lock()
-			for _, stream := range t.activeStreams {
-				stream.sendQuotaPool.addAndUpdate(int(s.Val) - int(t.streamSendQuota))
-			}
-			t.streamSendQuota = s.Val
-			t.mu.Unlock()
+	t.controlBuf.executeAndPut(func(interface{}) bool {
+		for _, f := range updateFuncs {
+			f()
 		}
-
-	}
+		return true
+	}, &incomingSettings{
+		ss: ss,
+	})
 }
 
 const (
@@ -691,33 +706,46 @@ func (t *http2Server) handlePing(f *http2.PingFrame) {
 }
 
 func (t *http2Server) handleWindowUpdate(f *http2.WindowUpdateFrame) {
-	id := f.Header().StreamID
-	incr := f.Increment
-	if id == 0 {
-		t.sendQuotaPool.add(int(incr))
-		return
+	t.controlBuf.put(&incomingWindowUpdate{
+		streamID:  f.Header().StreamID,
+		increment: f.Increment,
+	})
+}
+
+func appendHeaderFieldsFromMD(headerFields []hpack.HeaderField, md metadata.MD) []hpack.HeaderField {
+	for k, vv := range md {
+		if isReservedHeader(k) {
+			// Clients don't tolerate reading restricted headers after some non restricted ones were sent.
+			continue
+		}
+		for _, v := range vv {
+			headerFields = append(headerFields, hpack.HeaderField{Name: k, Value: encodeMetadataHeader(k, v)})
+		}
+	}
+	return headerFields
+}
+
+func (t *http2Server) checkForHeaderListSize(it interface{}) bool {
+	if t.maxSendHeaderListSize == nil {
+		return true
 	}
-	if s, ok := t.getStream(f); ok {
-		s.sendQuotaPool.add(int(incr))
+	hdrFrame := it.(*headerFrame)
+	var sz int64
+	for _, f := range hdrFrame.hf {
+		if sz += int64(f.Size()); sz > int64(*t.maxSendHeaderListSize) {
+			errorf("header list size to send violates the maximum size (%d bytes) set by client", *t.maxSendHeaderListSize)
+			return false
+		}
 	}
+	return true
 }
 
 // WriteHeader sends the header metedata md back to the client.
 func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
-	select {
-	case <-s.ctx.Done():
-		return ContextErr(s.ctx.Err())
-	case <-t.ctx.Done():
-		return ErrConnClosing
-	default:
-	}
-
-	s.mu.Lock()
-	if s.headerOk || s.state == streamDone {
-		s.mu.Unlock()
+	if s.updateHeaderSent() || s.getState() == streamDone {
 		return ErrIllegalHeaderWrite
 	}
-	s.headerOk = true
+	s.hdrMu.Lock()
 	if md.Len() > 0 {
 		if s.header.Len() > 0 {
 			s.header = metadata.Join(s.header, md)
@@ -725,8 +753,15 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 			s.header = md
 		}
 	}
-	md = s.header
-	s.mu.Unlock()
+	if err := t.writeHeaderLocked(s); err != nil {
+		s.hdrMu.Unlock()
+		return err
+	}
+	s.hdrMu.Unlock()
+	return nil
+}
+
+func (t *http2Server) writeHeaderLocked(s *Stream) error {
 	// TODO(mmukhi): Benchmark if the performance gets better if count the metadata and other header fields
 	// first and create a slice of that exact size.
 	headerFields := make([]hpack.HeaderField, 0, 2) // at least :status, content-type will be there if none else.
@@ -735,20 +770,22 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 	if s.sendCompress != "" {
 		headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-encoding", Value: s.sendCompress})
 	}
-	for k, vv := range md {
-		if isReservedHeader(k) {
-			// Clients don't tolerate reading restricted headers after some non restricted ones were sent.
-			continue
-		}
-		for _, v := range vv {
-			headerFields = append(headerFields, hpack.HeaderField{Name: k, Value: encodeMetadataHeader(k, v)})
-		}
-	}
-	t.controlBuf.put(&headerFrame{
+	headerFields = appendHeaderFieldsFromMD(headerFields, s.header)
+	success, err := t.controlBuf.executeAndPut(t.checkForHeaderListSize, &headerFrame{
 		streamID:  s.id,
 		hf:        headerFields,
 		endStream: false,
+		onWrite: func() {
+			atomic.StoreUint32(&t.resetPingStrikes, 1)
+		},
 	})
+	if !success {
+		if err != nil {
+			return err
+		}
+		t.closeStream(s, true, http2.ErrCodeInternal, nil, false)
+		return ErrHeaderListSizeLimitViolation
+	}
 	if t.stats != nil {
 		// Note: WireLength is not set in outHeader.
 		// TODO(mmukhi): Revisit this later, if needed.
@@ -763,37 +800,23 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 // TODO(zhaoq): Now it indicates the end of entire stream. Revisit if early
 // OK is adopted.
 func (t *http2Server) WriteStatus(s *Stream, st *status.Status) error {
-	select {
-	case <-t.ctx.Done():
-		return ErrConnClosing
-	default:
-	}
-
-	var headersSent, hasHeader bool
-	s.mu.Lock()
-	if s.state == streamDone {
-		s.mu.Unlock()
+	if s.getState() == streamDone {
 		return nil
 	}
-	if s.headerOk {
-		headersSent = true
-	}
-	if s.header.Len() > 0 {
-		hasHeader = true
-	}
-	s.mu.Unlock()
-
-	if !headersSent && hasHeader {
-		t.WriteHeader(s, nil)
-		headersSent = true
-	}
-
+	s.hdrMu.Lock()
 	// TODO(mmukhi): Benchmark if the performance gets better if count the metadata and other header fields
 	// first and create a slice of that exact size.
 	headerFields := make([]hpack.HeaderField, 0, 2) // grpc-status and grpc-message will be there if none else.
-	if !headersSent {
-		headerFields = append(headerFields, hpack.HeaderField{Name: ":status", Value: "200"})
-		headerFields = append(headerFields, hpack.HeaderField{Name: "content-type", Value: contentType(s.contentSubtype)})
+	if !s.updateHeaderSent() {                      // No headers have been sent.
+		if len(s.header) > 0 { // Send a separate header frame.
+			if err := t.writeHeaderLocked(s); err != nil {
+				s.hdrMu.Unlock()
+				return err
+			}
+		} else { // Send a trailer only response.
+			headerFields = append(headerFields, hpack.HeaderField{Name: ":status", Value: "200"})
+			headerFields = append(headerFields, hpack.HeaderField{Name: "content-type", Value: contentType(s.contentSubtype)})
+		}
 	}
 	headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-status", Value: strconv.Itoa(int(st.Code()))})
 	headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-message", Value: encodeGrpcMessage(st.Message())})
@@ -802,127 +825,83 @@ func (t *http2Server) WriteStatus(s *Stream, st *status.Status) error {
 		stBytes, err := proto.Marshal(p)
 		if err != nil {
 			// TODO: return error instead, when callers are able to handle it.
-			panic(err)
+			grpclog.Errorf("transport: failed to marshal rpc status: %v, error: %v", p, err)
+		} else {
+			headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-status-details-bin", Value: encodeBinHeader(stBytes)})
 		}
-
-		headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-status-details-bin", Value: encodeBinHeader(stBytes)})
 	}
 
 	// Attach the trailer metadata.
-	for k, vv := range s.trailer {
-		// Clients don't tolerate reading restricted headers after some non restricted ones were sent.
-		if isReservedHeader(k) {
-			continue
-		}
-		for _, v := range vv {
-			headerFields = append(headerFields, hpack.HeaderField{Name: k, Value: encodeMetadataHeader(k, v)})
-		}
-	}
-	t.controlBuf.put(&headerFrame{
+	headerFields = appendHeaderFieldsFromMD(headerFields, s.trailer)
+	trailingHeader := &headerFrame{
 		streamID:  s.id,
 		hf:        headerFields,
 		endStream: true,
-	})
+		onWrite: func() {
+			atomic.StoreUint32(&t.resetPingStrikes, 1)
+		},
+	}
+	s.hdrMu.Unlock()
+	success, err := t.controlBuf.execute(t.checkForHeaderListSize, trailingHeader)
+	if !success {
+		if err != nil {
+			return err
+		}
+		t.closeStream(s, true, http2.ErrCodeInternal, nil, false)
+		return ErrHeaderListSizeLimitViolation
+	}
+	t.closeStream(s, false, 0, trailingHeader, true)
 	if t.stats != nil {
 		t.stats.HandleRPC(s.Context(), &stats.OutTrailer{})
 	}
-	t.closeStream(s)
 	return nil
 }
 
 // Write converts the data into HTTP2 data frame and sends it out. Non-nil error
 // is returns if it fails (e.g., framing error, transport error).
 func (t *http2Server) Write(s *Stream, hdr []byte, data []byte, opts *Options) error {
-	select {
-	case <-s.ctx.Done():
-		return ContextErr(s.ctx.Err())
-	case <-t.ctx.Done():
-		return ErrConnClosing
-	default:
-	}
-
-	var writeHeaderFrame bool
-	s.mu.Lock()
-	if !s.headerOk {
-		writeHeaderFrame = true
-	}
-	s.mu.Unlock()
-	if writeHeaderFrame {
-		t.WriteHeader(s, nil)
+	if !s.isHeaderSent() { // Headers haven't been written yet.
+		if err := t.WriteHeader(s, nil); err != nil {
+			// TODO(mmukhi, dfawley): Make sure this is the right code to return.
+			return status.Errorf(codes.Internal, "transport: %v", err)
+		}
+	} else {
+		// Writing headers checks for this condition.
+		if s.getState() == streamDone {
+			// TODO(mmukhi, dfawley): Should the server write also return io.EOF?
+			s.cancel()
+			select {
+			case <-t.ctx.Done():
+				return ErrConnClosing
+			default:
+			}
+			return ContextErr(s.ctx.Err())
+		}
 	}
-	// Add data to header frame so that we can equally distribute data across frames.
+	// Add some data to header frame so that we can equally distribute bytes across frames.
 	emptyLen := http2MaxFrameLen - len(hdr)
 	if emptyLen > len(data) {
 		emptyLen = len(data)
 	}
 	hdr = append(hdr, data[:emptyLen]...)
 	data = data[emptyLen:]
-	var (
-		streamQuota    int
-		streamQuotaVer uint32
-		err            error
-	)
-	for _, r := range [][]byte{hdr, data} {
-		for len(r) > 0 {
-			size := http2MaxFrameLen
-			if size > len(r) {
-				size = len(r)
-			}
-			if streamQuota == 0 { // Used up all the locally cached stream quota.
-				// Get all the stream quota there is.
-				streamQuota, streamQuotaVer, err = s.sendQuotaPool.get(math.MaxInt32, s.waiters)
-				if err != nil {
-					return err
-				}
-			}
-			if size > streamQuota {
-				size = streamQuota
-			}
-			// Get size worth quota from transport.
-			tq, _, err := t.sendQuotaPool.get(size, s.waiters)
-			if err != nil {
-				return err
-			}
-			if tq < size {
-				size = tq
-			}
-			ltq, _, err := t.localSendQuota.get(size, s.waiters)
-			if err != nil {
-				// Add the acquired quota back to transport.
-				t.sendQuotaPool.add(tq)
-				return err
-			}
-			// even if ltq is smaller than size we don't adjust size since,
-			// ltq is only a soft limit.
-			streamQuota -= size
-			p := r[:size]
-			// Reset ping strikes when sending data since this might cause
-			// the peer to send ping.
+	df := &dataFrame{
+		streamID: s.id,
+		h:        hdr,
+		d:        data,
+		onEachWrite: func() {
 			atomic.StoreUint32(&t.resetPingStrikes, 1)
-			success := func() {
-				ltq := ltq
-				t.controlBuf.put(&dataFrame{streamID: s.id, endStream: false, d: p, f: func() {
-					t.localSendQuota.add(ltq)
-				}})
-				r = r[size:]
-			}
-			failure := func() { // The stream quota version must have changed.
-				// Our streamQuota cache is invalidated now, so give it back.
-				s.sendQuotaPool.lockedAdd(streamQuota + size)
-			}
-			if !s.sendQuotaPool.compareAndExecute(streamQuotaVer, success, failure) {
-				// Couldn't send this chunk out.
-				t.sendQuotaPool.add(size)
-				t.localSendQuota.add(ltq)
-				streamQuota = 0
-			}
-		}
+		},
 	}
-	if streamQuota > 0 {
-		// ADd the left over quota back to stream.
-		s.sendQuotaPool.add(streamQuota)
+	if err := s.wq.get(int32(len(hdr) + len(data))); err != nil {
+		select {
+		case <-t.ctx.Done():
+			return ErrConnClosing
+		default:
+		}
+		return ContextErr(s.ctx.Err())
 	}
-	return nil
+	return t.controlBuf.put(df)
 }
 
 // keepalive running in a separate goroutine does the following:
@@ -967,7 +946,7 @@ func (t *http2Server) keepalive() {
 				// The connection has been idle for a duration of keepalive.MaxConnectionIdle or more.
 				// Gracefully close the connection.
 				t.drain(http2.ErrCodeNo, []byte{})
-				// Reseting the timer so that the clean-up doesn't deadlock.
+				// Resetting the timer so that the clean-up doesn't deadlock.
 				maxIdle.Reset(infinity)
 				return
 			}
@@ -979,7 +958,7 @@ func (t *http2Server) keepalive() {
 			case <-maxAge.C:
 				// Close the connection after grace period.
 				t.Close()
-				// Reseting the timer so that the clean-up doesn't deadlock.
+				// Resetting the timer so that the clean-up doesn't deadlock.
 				maxAge.Reset(infinity)
 			case <-t.ctx.Done():
 			}
@@ -992,11 +971,16 @@ func (t *http2Server) keepalive() {
 			}
 			if pingSent {
 				t.Close()
-				// Reseting the timer so that the clean-up doesn't deadlock.
+				// Resetting the timer so that the clean-up doesn't deadlock.
 				keepalive.Reset(infinity)
 				return
 			}
 			pingSent = true
+			if channelz.IsOn() {
+				t.czmu.Lock()
+				t.kpCount++
+				t.czmu.Unlock()
+			}
 			t.controlBuf.put(p)
 			keepalive.Reset(t.kp.Timeout)
 		case <-t.ctx.Done():
@@ -1005,133 +989,6 @@ func (t *http2Server) keepalive() {
 	}
 }
 
-var goAwayPing = &ping{data: [8]byte{1, 6, 1, 8, 0, 3, 3, 9}}
-
-// TODO(mmukhi): A lot of this code(and code in other places in the tranpsort layer)
-// is duplicated between the client and the server.
-// The transport layer needs to be refactored to take care of this.
-func (t *http2Server) itemHandler(i item) error {
-	switch i := i.(type) {
-	case *dataFrame:
-		if err := t.framer.fr.WriteData(i.streamID, i.endStream, i.d); err != nil {
-			return err
-		}
-		i.f()
-		return nil
-	case *headerFrame:
-		t.hBuf.Reset()
-		for _, f := range i.hf {
-			t.hEnc.WriteField(f)
-		}
-		first := true
-		endHeaders := false
-		for !endHeaders {
-			size := t.hBuf.Len()
-			if size > http2MaxFrameLen {
-				size = http2MaxFrameLen
-			} else {
-				endHeaders = true
-			}
-			var err error
-			if first {
-				first = false
-				err = t.framer.fr.WriteHeaders(http2.HeadersFrameParam{
-					StreamID:      i.streamID,
-					BlockFragment: t.hBuf.Next(size),
-					EndStream:     i.endStream,
-					EndHeaders:    endHeaders,
-				})
-			} else {
-				err = t.framer.fr.WriteContinuation(
-					i.streamID,
-					endHeaders,
-					t.hBuf.Next(size),
-				)
-			}
-			if err != nil {
-				return err
-			}
-		}
-		atomic.StoreUint32(&t.resetPingStrikes, 1)
-		return nil
-	case *windowUpdate:
-		return t.framer.fr.WriteWindowUpdate(i.streamID, i.increment)
-	case *settings:
-		return t.framer.fr.WriteSettings(i.ss...)
-	case *settingsAck:
-		return t.framer.fr.WriteSettingsAck()
-	case *resetStream:
-		return t.framer.fr.WriteRSTStream(i.streamID, i.code)
-	case *goAway:
-		t.mu.Lock()
-		if t.state == closing {
-			t.mu.Unlock()
-			// The transport is closing.
-			return fmt.Errorf("transport: Connection closing")
-		}
-		sid := t.maxStreamID
-		if !i.headsUp {
-			// Stop accepting more streams now.
-			t.state = draining
-			if len(t.activeStreams) == 0 {
-				i.closeConn = true
-			}
-			t.mu.Unlock()
-			if err := t.framer.fr.WriteGoAway(sid, i.code, i.debugData); err != nil {
-				return err
-			}
-			if i.closeConn {
-				// Abruptly close the connection following the GoAway (via
-				// loopywriter).  But flush out what's inside the buffer first.
-				t.controlBuf.put(&flushIO{closeTr: true})
-			}
-			return nil
-		}
-		t.mu.Unlock()
-		// For a graceful close, send out a GoAway with stream ID of MaxUInt32,
-		// Follow that with a ping and wait for the ack to come back or a timer
-		// to expire. During this time accept new streams since they might have
-		// originated before the GoAway reaches the client.
-		// After getting the ack or timer expiration send out another GoAway this
-		// time with an ID of the max stream server intends to process.
-		if err := t.framer.fr.WriteGoAway(math.MaxUint32, http2.ErrCodeNo, []byte{}); err != nil {
-			return err
-		}
-		if err := t.framer.fr.WritePing(false, goAwayPing.data); err != nil {
-			return err
-		}
-		go func() {
-			timer := time.NewTimer(time.Minute)
-			defer timer.Stop()
-			select {
-			case <-t.drainChan:
-			case <-timer.C:
-			case <-t.ctx.Done():
-				return
-			}
-			t.controlBuf.put(&goAway{code: i.code, debugData: i.debugData})
-		}()
-		return nil
-	case *flushIO:
-		if err := t.framer.writer.Flush(); err != nil {
-			return err
-		}
-		if i.closeTr {
-			return ErrConnClosing
-		}
-		return nil
-	case *ping:
-		if !i.ack {
-			t.bdpEst.timesnap(i.data)
-		}
-		return t.framer.fr.WritePing(i.ack, i.data)
-	default:
-		err := status.Errorf(codes.Internal, "transport: http2Server.controller got unexpected item type %t", i)
-		errorf("%v", err)
-		return err
-	}
-}
-
 // Close starts shutting down the http2Server transport.
 // TODO(zhaoq): Now the destruction is not blocked on any pending streams. This
 // could cause some resource issue. Revisit this later.
@@ -1145,8 +1002,12 @@ func (t *http2Server) Close() error {
 	streams := t.activeStreams
 	t.activeStreams = nil
 	t.mu.Unlock()
+	t.controlBuf.finish()
 	t.cancel()
 	err := t.conn.Close()
+	if channelz.IsOn() {
+		channelz.RemoveEntry(t.channelzID)
+	}
 	// Cancel all active streams.
 	for _, s := range streams {
 		s.cancel()
@@ -1160,27 +1021,45 @@ func (t *http2Server) Close() error {
 
 // closeStream clears the footprint of a stream when the stream is not needed
 // any more.
-func (t *http2Server) closeStream(s *Stream) {
-	t.mu.Lock()
-	delete(t.activeStreams, s.id)
-	if len(t.activeStreams) == 0 {
-		t.idle = time.Now()
-	}
-	if t.state == draining && len(t.activeStreams) == 0 {
-		defer t.controlBuf.put(&flushIO{closeTr: true})
+func (t *http2Server) closeStream(s *Stream, rst bool, rstCode http2.ErrCode, hdr *headerFrame, eosReceived bool) {
+	if s.swapState(streamDone) == streamDone {
+		// If the stream was already done, return.
+		return
 	}
-	t.mu.Unlock()
 	// In case stream sending and receiving are invoked in separate
 	// goroutines (e.g., bi-directional streaming), cancel needs to be
 	// called to interrupt the potential blocking on other goroutines.
 	s.cancel()
-	s.mu.Lock()
-	if s.state == streamDone {
-		s.mu.Unlock()
-		return
+	cleanup := &cleanupStream{
+		streamID: s.id,
+		rst:      rst,
+		rstCode:  rstCode,
+		onWrite: func() {
+			t.mu.Lock()
+			if t.activeStreams != nil {
+				delete(t.activeStreams, s.id)
+				if len(t.activeStreams) == 0 {
+					t.idle = time.Now()
+				}
+			}
+			t.mu.Unlock()
+			if channelz.IsOn() {
+				t.czmu.Lock()
+				if eosReceived {
+					t.streamsSucceeded++
+				} else {
+					t.streamsFailed++
+				}
+				t.czmu.Unlock()
+			}
+		},
+	}
+	if hdr != nil {
+		hdr.cleanup = cleanup
+		t.controlBuf.put(hdr)
+	} else {
+		t.controlBuf.put(cleanup)
 	}
-	s.state = streamDone
-	s.mu.Unlock()
 }
 
 func (t *http2Server) RemoteAddr() net.Addr {
@@ -1201,7 +1080,117 @@ func (t *http2Server) drain(code http2.ErrCode, debugData []byte) {
 	t.controlBuf.put(&goAway{code: code, debugData: debugData, headsUp: true})
 }
 
-var rgen = rand.New(rand.NewSource(time.Now().UnixNano()))
+var goAwayPing = &ping{data: [8]byte{1, 6, 1, 8, 0, 3, 3, 9}}
+
+// Handles outgoing GoAway and returns true if loopy needs to put itself
+// in draining mode.
+func (t *http2Server) outgoingGoAwayHandler(g *goAway) (bool, error) {
+	t.mu.Lock()
+	if t.state == closing { // TODO(mmukhi): This seems unnecessary.
+		t.mu.Unlock()
+		// The transport is closing.
+		return false, ErrConnClosing
+	}
+	sid := t.maxStreamID
+	if !g.headsUp {
+		// Stop accepting more streams now.
+		t.state = draining
+		if len(t.activeStreams) == 0 {
+			g.closeConn = true
+		}
+		t.mu.Unlock()
+		if err := t.framer.fr.WriteGoAway(sid, g.code, g.debugData); err != nil {
+			return false, err
+		}
+		if g.closeConn {
+			// Abruptly close the connection following the GoAway (via
+			// loopywriter).  But flush out what's inside the buffer first.
+			t.framer.writer.Flush()
+			return false, fmt.Errorf("transport: Connection closing")
+		}
+		return true, nil
+	}
+	t.mu.Unlock()
+	// For a graceful close, send out a GoAway with stream ID of MaxUInt32,
+	// Follow that with a ping and wait for the ack to come back or a timer
+	// to expire. During this time accept new streams since they might have
+	// originated before the GoAway reaches the client.
+	// After getting the ack or timer expiration send out another GoAway this
+	// time with an ID of the max stream server intends to process.
+	if err := t.framer.fr.WriteGoAway(math.MaxUint32, http2.ErrCodeNo, []byte{}); err != nil {
+		return false, err
+	}
+	if err := t.framer.fr.WritePing(false, goAwayPing.data); err != nil {
+		return false, err
+	}
+	go func() {
+		timer := time.NewTimer(time.Minute)
+		defer timer.Stop()
+		select {
+		case <-t.drainChan:
+		case <-timer.C:
+		case <-t.ctx.Done():
+			return
+		}
+		t.controlBuf.put(&goAway{code: g.code, debugData: g.debugData})
+	}()
+	return false, nil
+}
+
+func (t *http2Server) ChannelzMetric() *channelz.SocketInternalMetric {
+	t.czmu.RLock()
+	s := channelz.SocketInternalMetric{
+		StreamsStarted:                   t.streamsStarted,
+		StreamsSucceeded:                 t.streamsSucceeded,
+		StreamsFailed:                    t.streamsFailed,
+		MessagesSent:                     t.msgSent,
+		MessagesReceived:                 t.msgRecv,
+		KeepAlivesSent:                   t.kpCount,
+		LastRemoteStreamCreatedTimestamp: t.lastStreamCreated,
+		LastMessageSentTimestamp:         t.lastMsgSent,
+		LastMessageReceivedTimestamp:     t.lastMsgRecv,
+		LocalFlowControlWindow:           int64(t.fc.getSize()),
+		SocketOptions:                    channelz.GetSocketOption(t.conn),
+		LocalAddr:                        t.localAddr,
+		RemoteAddr:                       t.remoteAddr,
+		// RemoteName :
+	}
+	if au, ok := t.authInfo.(credentials.ChannelzSecurityInfo); ok {
+		s.Security = au.GetSecurityValue()
+	}
+	t.czmu.RUnlock()
+	s.RemoteFlowControlWindow = t.getOutFlowWindow()
+	return &s
+}
+
+func (t *http2Server) IncrMsgSent() {
+	t.czmu.Lock()
+	t.msgSent++
+	t.lastMsgSent = time.Now()
+	t.czmu.Unlock()
+}
+
+func (t *http2Server) IncrMsgRecv() {
+	t.czmu.Lock()
+	t.msgRecv++
+	t.lastMsgRecv = time.Now()
+	t.czmu.Unlock()
+}
+
+func (t *http2Server) getOutFlowWindow() int64 {
+	resp := make(chan uint32)
+	timer := time.NewTimer(time.Second)
+	defer timer.Stop()
+	t.controlBuf.put(&outFlowControlSizeRequest{resp})
+	select {
+	case sz := <-resp:
+		return int64(sz)
+	case <-t.ctxDone:
+		return -1
+	case <-timer.C:
+		return -2
+	}
+}
 
 func getJitter(v time.Duration) time.Duration {
 	if v == infinity {
@@ -1209,6 +1198,6 @@ func getJitter(v time.Duration) time.Duration {
 	}
 	// Generate a jitter between +/- 10% of the value.
 	r := int64(v / 10)
-	j := rgen.Int63n(2*r) - r
+	j := grpcrand.Int63n(2*r) - r
 	return time.Duration(j)
 }
diff --git a/vendor/google.golang.org/grpc/transport/http_util.go b/vendor/google.golang.org/grpc/internal/transport/http_util.go
similarity index 76%
rename from vendor/google.golang.org/grpc/transport/http_util.go
rename to vendor/google.golang.org/grpc/internal/transport/http_util.go
index 34476773..21da6e80 100644
--- a/vendor/google.golang.org/grpc/transport/http_util.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http_util.go
@@ -29,6 +29,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/http2"
@@ -43,9 +44,6 @@ const (
 	http2MaxFrameLen = 16384 // 16KB frame
 	// http://http2.github.io/http2-spec/#SettingValues
 	http2InitHeaderTableSize = 4096
-	// http2IOBufSize specifies the buffer size for sending frames.
-	defaultWriteBufSize = 32 * 1024
-	defaultReadBufSize  = 32 * 1024
 	// baseContentType is the base content-type for gRPC.  This is a valid
 	// content-type on it's own, but can also include a content-subtype such as
 	// "proto" as a suffix after "+" or ";".  See
@@ -70,7 +68,7 @@ var (
 		http2.ErrCodeConnect:            codes.Internal,
 		http2.ErrCodeEnhanceYourCalm:    codes.ResourceExhausted,
 		http2.ErrCodeInadequateSecurity: codes.PermissionDenied,
-		http2.ErrCodeHTTP11Required:     codes.FailedPrecondition,
+		http2.ErrCodeHTTP11Required:     codes.Internal,
 	}
 	statusCodeConvTab = map[codes.Code]http2.ErrCode{
 		codes.Internal:          http2.ErrCodeInternal,
@@ -121,6 +119,8 @@ type decodeState struct {
 	statsTags      []byte
 	statsTrace     []byte
 	contentSubtype string
+	// whether decoding on server side or not
+	serverSide bool
 }
 
 // isReservedHeader checks whether hdr belongs to HTTP2 headers
@@ -132,12 +132,16 @@ func isReservedHeader(hdr string) bool {
 	}
 	switch hdr {
 	case "content-type",
+		"user-agent",
 		"grpc-message-type",
 		"grpc-encoding",
 		"grpc-message",
 		"grpc-status",
 		"grpc-timeout",
 		"grpc-status-details-bin",
+		// Intentionally exclude grpc-previous-rpc-attempts and
+		// grpc-retry-pushback-ms, which are "reserved", but their API
+		// intentionally works via metadata.
 		"te":
 		return true
 	default:
@@ -145,11 +149,11 @@ func isReservedHeader(hdr string) bool {
 	}
 }
 
-// isWhitelistedPseudoHeader checks whether hdr belongs to HTTP2 pseudoheaders
-// that should be propagated into metadata visible to users.
-func isWhitelistedPseudoHeader(hdr string) bool {
+// isWhitelistedHeader checks whether hdr should be propagated into metadata
+// visible to users, even though it is classified as "reserved", above.
+func isWhitelistedHeader(hdr string) bool {
 	switch hdr {
-	case ":authority":
+	case ":authority", "user-agent":
 		return true
 	default:
 		return false
@@ -233,13 +237,22 @@ func decodeMetadataHeader(k, v string) (string, error) {
 	return v, nil
 }
 
-func (d *decodeState) decodeResponseHeader(frame *http2.MetaHeadersFrame) error {
+func (d *decodeState) decodeHeader(frame *http2.MetaHeadersFrame) error {
+	// frame.Truncated is set to true when framer detects that the current header
+	// list size hits MaxHeaderListSize limit.
+	if frame.Truncated {
+		return status.Error(codes.Internal, "peer header list size exceeded limit")
+	}
 	for _, hf := range frame.Fields {
 		if err := d.processHeaderField(hf); err != nil {
 			return err
 		}
 	}
 
+	if d.serverSide {
+		return nil
+	}
+
 	// If grpc status exists, no need to check further.
 	if d.rawStatusCode != nil || d.statusGen != nil {
 		return nil
@@ -248,7 +261,7 @@ func (d *decodeState) decodeResponseHeader(frame *http2.MetaHeadersFrame) error
 	// If grpc status doesn't exist and http status doesn't exist,
 	// then it's a malformed header.
 	if d.httpStatus == nil {
-		return streamErrorf(codes.Internal, "malformed header: doesn't contain status(gRPC or HTTP)")
+		return status.Error(codes.Internal, "malformed header: doesn't contain status(gRPC or HTTP)")
 	}
 
 	if *(d.httpStatus) != http.StatusOK {
@@ -256,19 +269,18 @@ func (d *decodeState) decodeResponseHeader(frame *http2.MetaHeadersFrame) error
 		if !ok {
 			code = codes.Unknown
 		}
-		return streamErrorf(code, http.StatusText(*(d.httpStatus)))
+		return status.Error(code, http.StatusText(*(d.httpStatus)))
 	}
 
 	// gRPC status doesn't exist and http status is OK.
 	// Set rawStatusCode to be unknown and return nil error.
 	// So that, if the stream has ended this Unknown status
-	// will be propogated to the user.
+	// will be propagated to the user.
 	// Otherwise, it will be ignored. In which case, status from
-	// a later trailer, that has StreamEnded flag set, is propogated.
+	// a later trailer, that has StreamEnded flag set, is propagated.
 	code := int(codes.Unknown)
 	d.rawStatusCode = &code
 	return nil
-
 }
 
 func (d *decodeState) addMetadata(k, v string) {
@@ -283,7 +295,7 @@ func (d *decodeState) processHeaderField(f hpack.HeaderField) error {
 	case "content-type":
 		contentSubtype, validContentType := contentSubtype(f.Value)
 		if !validContentType {
-			return streamErrorf(codes.FailedPrecondition, "transport: received the unexpected content-type %q", f.Value)
+			return status.Errorf(codes.Internal, "transport: received the unexpected content-type %q", f.Value)
 		}
 		d.contentSubtype = contentSubtype
 		// TODO: do we want to propagate the whole content-type in the metadata,
@@ -296,7 +308,7 @@ func (d *decodeState) processHeaderField(f hpack.HeaderField) error {
 	case "grpc-status":
 		code, err := strconv.Atoi(f.Value)
 		if err != nil {
-			return streamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err)
+			return status.Errorf(codes.Internal, "transport: malformed grpc-status: %v", err)
 		}
 		d.rawStatusCode = &code
 	case "grpc-message":
@@ -304,43 +316,43 @@ func (d *decodeState) processHeaderField(f hpack.HeaderField) error {
 	case "grpc-status-details-bin":
 		v, err := decodeBinHeader(f.Value)
 		if err != nil {
-			return streamErrorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err)
+			return status.Errorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err)
 		}
 		s := &spb.Status{}
 		if err := proto.Unmarshal(v, s); err != nil {
-			return streamErrorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err)
+			return status.Errorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err)
 		}
 		d.statusGen = status.FromProto(s)
 	case "grpc-timeout":
 		d.timeoutSet = true
 		var err error
 		if d.timeout, err = decodeTimeout(f.Value); err != nil {
-			return streamErrorf(codes.Internal, "transport: malformed time-out: %v", err)
+			return status.Errorf(codes.Internal, "transport: malformed time-out: %v", err)
 		}
 	case ":path":
 		d.method = f.Value
 	case ":status":
 		code, err := strconv.Atoi(f.Value)
 		if err != nil {
-			return streamErrorf(codes.Internal, "transport: malformed http-status: %v", err)
+			return status.Errorf(codes.Internal, "transport: malformed http-status: %v", err)
 		}
 		d.httpStatus = &code
 	case "grpc-tags-bin":
 		v, err := decodeBinHeader(f.Value)
 		if err != nil {
-			return streamErrorf(codes.Internal, "transport: malformed grpc-tags-bin: %v", err)
+			return status.Errorf(codes.Internal, "transport: malformed grpc-tags-bin: %v", err)
 		}
 		d.statsTags = v
 		d.addMetadata(f.Name, string(v))
 	case "grpc-trace-bin":
 		v, err := decodeBinHeader(f.Value)
 		if err != nil {
-			return streamErrorf(codes.Internal, "transport: malformed grpc-trace-bin: %v", err)
+			return status.Errorf(codes.Internal, "transport: malformed grpc-trace-bin: %v", err)
 		}
 		d.statsTrace = v
 		d.addMetadata(f.Name, string(v))
 	default:
-		if isReservedHeader(f.Name) && !isWhitelistedPseudoHeader(f.Name) {
+		if isReservedHeader(f.Name) && !isWhitelistedHeader(f.Name) {
 			break
 		}
 		v, err := decodeMetadataHeader(f.Name, f.Value)
@@ -348,7 +360,7 @@ func (d *decodeState) processHeaderField(f hpack.HeaderField) error {
 			errorf("Failed to decode metadata header (%q, %q): %v", f.Name, f.Value, err)
 			return nil
 		}
-		d.addMetadata(f.Name, string(v))
+		d.addMetadata(f.Name, v)
 	}
 	return nil
 }
@@ -437,16 +449,17 @@ func decodeTimeout(s string) (time.Duration, error) {
 
 const (
 	spaceByte   = ' '
-	tildaByte   = '~'
+	tildeByte   = '~'
 	percentByte = '%'
 )
 
 // encodeGrpcMessage is used to encode status code in header field
-// "grpc-message".
-// It checks to see if each individual byte in msg is an
-// allowable byte, and then either percent encoding or passing it through.
-// When percent encoding, the byte is converted into hexadecimal notation
-// with a '%' prepended.
+// "grpc-message". It does percent encoding and also replaces invalid utf-8
+// characters with Unicode replacement character.
+//
+// It checks to see if each individual byte in msg is an allowable byte, and
+// then either percent encoding or passing it through. When percent encoding,
+// the byte is converted into hexadecimal notation with a '%' prepended.
 func encodeGrpcMessage(msg string) string {
 	if msg == "" {
 		return ""
@@ -454,7 +467,7 @@ func encodeGrpcMessage(msg string) string {
 	lenMsg := len(msg)
 	for i := 0; i < lenMsg; i++ {
 		c := msg[i]
-		if !(c >= spaceByte && c < tildaByte && c != percentByte) {
+		if !(c >= spaceByte && c <= tildeByte && c != percentByte) {
 			return encodeGrpcMessageUnchecked(msg)
 		}
 	}
@@ -463,14 +476,26 @@ func encodeGrpcMessage(msg string) string {
 
 func encodeGrpcMessageUnchecked(msg string) string {
 	var buf bytes.Buffer
-	lenMsg := len(msg)
-	for i := 0; i < lenMsg; i++ {
-		c := msg[i]
-		if c >= spaceByte && c < tildaByte && c != percentByte {
-			buf.WriteByte(c)
-		} else {
-			buf.WriteString(fmt.Sprintf("%%%02X", c))
+	for len(msg) > 0 {
+		r, size := utf8.DecodeRuneInString(msg)
+		for _, b := range []byte(string(r)) {
+			if size > 1 {
+				// If size > 1, r is not ascii. Always do percent encoding.
+				buf.WriteString(fmt.Sprintf("%%%02X", b))
+				continue
+			}
+
+			// The for loop is necessary even if size == 1. r could be
+			// utf8.RuneError.
+			//
+			// fmt.Sprintf("%%%02X", utf8.RuneError) gives "%FFFD".
+			if b >= spaceByte && b <= tildeByte && b != percentByte {
+				buf.WriteByte(b)
+			} else {
+				buf.WriteString(fmt.Sprintf("%%%02X", b))
+			}
 		}
+		msg = msg[size:]
 	}
 	return buf.String()
 }
@@ -509,22 +534,80 @@ func decodeGrpcMessageUnchecked(msg string) string {
 	return buf.String()
 }
 
+type bufWriter struct {
+	buf       []byte
+	offset    int
+	batchSize int
+	conn      net.Conn
+	err       error
+
+	onFlush func()
+}
+
+func newBufWriter(conn net.Conn, batchSize int) *bufWriter {
+	return &bufWriter{
+		buf:       make([]byte, batchSize*2),
+		batchSize: batchSize,
+		conn:      conn,
+	}
+}
+
+func (w *bufWriter) Write(b []byte) (n int, err error) {
+	if w.err != nil {
+		return 0, w.err
+	}
+	if w.batchSize == 0 { // Buffer has been disabled.
+		return w.conn.Write(b)
+	}
+	for len(b) > 0 {
+		nn := copy(w.buf[w.offset:], b)
+		b = b[nn:]
+		w.offset += nn
+		n += nn
+		if w.offset >= w.batchSize {
+			err = w.Flush()
+		}
+	}
+	return n, err
+}
+
+func (w *bufWriter) Flush() error {
+	if w.err != nil {
+		return w.err
+	}
+	if w.offset == 0 {
+		return nil
+	}
+	if w.onFlush != nil {
+		w.onFlush()
+	}
+	_, w.err = w.conn.Write(w.buf[:w.offset])
+	w.offset = 0
+	return w.err
+}
+
 type framer struct {
-	numWriters int32
-	reader     io.Reader
-	writer     *bufio.Writer
-	fr         *http2.Framer
+	writer *bufWriter
+	fr     *http2.Framer
 }
 
-func newFramer(conn net.Conn, writeBufferSize, readBufferSize int) *framer {
+func newFramer(conn net.Conn, writeBufferSize, readBufferSize int, maxHeaderListSize uint32) *framer {
+	if writeBufferSize < 0 {
+		writeBufferSize = 0
+	}
+	var r io.Reader = conn
+	if readBufferSize > 0 {
+		r = bufio.NewReaderSize(r, readBufferSize)
+	}
+	w := newBufWriter(conn, writeBufferSize)
 	f := &framer{
-		reader: bufio.NewReaderSize(conn, readBufferSize),
-		writer: bufio.NewWriterSize(conn, writeBufferSize),
+		writer: w,
+		fr:     http2.NewFramer(w, r),
 	}
-	f.fr = http2.NewFramer(f.writer, f.reader)
 	// Opt-in to Frame reuse API on framer to reduce garbage.
 	// Frames aren't safe to read from after a subsequent call to ReadFrame.
 	f.fr.SetReuseFrames()
+	f.fr.MaxHeaderListSize = maxHeaderListSize
 	f.fr.ReadMetaHeaders = hpack.NewDecoder(http2InitHeaderTableSize, nil)
 	return f
 }
diff --git a/vendor/google.golang.org/grpc/transport/http_util_test.go b/vendor/google.golang.org/grpc/internal/transport/http_util_test.go
similarity index 65%
rename from vendor/google.golang.org/grpc/transport/http_util_test.go
rename to vendor/google.golang.org/grpc/internal/transport/http_util_test.go
index c3754781..44169b65 100644
--- a/vendor/google.golang.org/grpc/transport/http_util_test.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http_util_test.go
@@ -102,12 +102,31 @@ func TestEncodeGrpcMessage(t *testing.T) {
 	}{
 		{"", ""},
 		{"Hello", "Hello"},
-		{"my favorite character is \u0000", "my favorite character is %00"},
-		{"my favorite character is %", "my favorite character is %25"},
+		{"\u0000", "%00"},
+		{"%", "%25"},
+		{"系统", "%E7%B3%BB%E7%BB%9F"},
+		{string([]byte{0xff, 0xfe, 0xfd}), "%EF%BF%BD%EF%BF%BD%EF%BF%BD"},
 	} {
 		actual := encodeGrpcMessage(tt.input)
 		if tt.expected != actual {
-			t.Errorf("encodeGrpcMessage(%v) = %v, want %v", tt.input, actual, tt.expected)
+			t.Errorf("encodeGrpcMessage(%q) = %q, want %q", tt.input, actual, tt.expected)
+		}
+	}
+
+	// make sure that all the visible ASCII chars except '%' are not percent encoded.
+	for i := ' '; i <= '~' && i != '%'; i++ {
+		output := encodeGrpcMessage(string(i))
+		if output != string(i) {
+			t.Errorf("encodeGrpcMessage(%v) = %v, want %v", string(i), output, string(i))
+		}
+	}
+
+	// make sure that all the invisible ASCII chars and '%' are percent encoded.
+	for i := rune(0); i == '%' || (i >= rune(0) && i < ' ') || (i > '~' && i <= rune(127)); i++ {
+		output := encodeGrpcMessage(string(i))
+		expected := fmt.Sprintf("%%%02X", i)
+		if output != expected {
+			t.Errorf("encodeGrpcMessage(%v) = %v, want %v", string(i), output, expected)
 		}
 	}
 }
@@ -123,10 +142,52 @@ func TestDecodeGrpcMessage(t *testing.T) {
 		{"H%6", "H%6"},
 		{"%G0", "%G0"},
 		{"%E7%B3%BB%E7%BB%9F", "系统"},
+		{"%EF%BF%BD", "�"},
 	} {
 		actual := decodeGrpcMessage(tt.input)
 		if tt.expected != actual {
-			t.Errorf("dncodeGrpcMessage(%v) = %v, want %v", tt.input, actual, tt.expected)
+			t.Errorf("decodeGrpcMessage(%q) = %q, want %q", tt.input, actual, tt.expected)
+		}
+	}
+
+	// make sure that all the visible ASCII chars except '%' are not percent decoded.
+	for i := ' '; i <= '~' && i != '%'; i++ {
+		output := decodeGrpcMessage(string(i))
+		if output != string(i) {
+			t.Errorf("decodeGrpcMessage(%v) = %v, want %v", string(i), output, string(i))
+		}
+	}
+
+	// make sure that all the invisible ASCII chars and '%' are percent decoded.
+	for i := rune(0); i == '%' || (i >= rune(0) && i < ' ') || (i > '~' && i <= rune(127)); i++ {
+		output := decodeGrpcMessage(fmt.Sprintf("%%%02X", i))
+		if output != string(i) {
+			t.Errorf("decodeGrpcMessage(%v) = %v, want %v", fmt.Sprintf("%%%02X", i), output, string(i))
+		}
+	}
+}
+
+// Decode an encoded string should get the same thing back, except for invalid
+// utf8 chars.
+func TestDecodeEncodeGrpcMessage(t *testing.T) {
+	testCases := []struct {
+		orig string
+		want string
+	}{
+		{"", ""},
+		{"hello", "hello"},
+		{"h%6", "h%6"},
+		{"%G0", "%G0"},
+		{"系统", "系统"},
+		{"Hello, 世界", "Hello, 世界"},
+
+		{string([]byte{0xff, 0xfe, 0xfd}), "���"},
+		{string([]byte{0xff}) + "Hello" + string([]byte{0xfe}) + "世界" + string([]byte{0xfd}), "�Hello�世界�"},
+	}
+	for _, tC := range testCases {
+		got := decodeGrpcMessage(encodeGrpcMessage(tC.orig))
+		if got != tC.want {
+			t.Errorf("decodeGrpcMessage(encodeGrpcMessage(%q)) = %q, want %q", tC.orig, got, tC.want)
 		}
 	}
 }
diff --git a/vendor/google.golang.org/grpc/transport/log.go b/vendor/google.golang.org/grpc/internal/transport/log.go
similarity index 100%
rename from vendor/google.golang.org/grpc/transport/log.go
rename to vendor/google.golang.org/grpc/internal/transport/log.go
diff --git a/vendor/google.golang.org/grpc/transport/transport.go b/vendor/google.golang.org/grpc/internal/transport/transport.go
similarity index 73%
rename from vendor/google.golang.org/grpc/transport/transport.go
rename to vendor/google.golang.org/grpc/internal/transport/transport.go
index e68f89ec..9775eeb8 100644
--- a/vendor/google.golang.org/grpc/transport/transport.go
+++ b/vendor/google.golang.org/grpc/internal/transport/transport.go
@@ -19,16 +19,17 @@
 // Package transport defines and implements message oriented communication
 // channel to complete various transactions (e.g., an RPC).  It is meant for
 // grpc-internal usage and is not intended to be imported directly by users.
-package transport // import "google.golang.org/grpc/transport"
+package transport
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"net"
 	"sync"
+	"sync/atomic"
 
 	"golang.org/x/net/context"
-	"golang.org/x/net/http2"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/keepalive"
@@ -57,6 +58,7 @@ type recvBuffer struct {
 	c       chan recvMsg
 	mu      sync.Mutex
 	backlog []recvMsg
+	err     error
 }
 
 func newRecvBuffer() *recvBuffer {
@@ -68,6 +70,13 @@ func newRecvBuffer() *recvBuffer {
 
 func (b *recvBuffer) put(r recvMsg) {
 	b.mu.Lock()
+	if b.err != nil {
+		b.mu.Unlock()
+		// An error had occurred earlier, don't accept more
+		// data or errors.
+		return
+	}
+	b.err = r.err
 	if len(b.backlog) == 0 {
 		select {
 		case b.c <- r:
@@ -101,14 +110,15 @@ func (b *recvBuffer) get() <-chan recvMsg {
 	return b.c
 }
 
+//
 // recvBufferReader implements io.Reader interface to read the data from
 // recvBuffer.
 type recvBufferReader struct {
-	ctx    context.Context
-	goAway chan struct{}
-	recv   *recvBuffer
-	last   []byte // Stores the remaining data in the previous calls.
-	err    error
+	ctx     context.Context
+	ctxDone <-chan struct{} // cache of ctx.Done() (for performance).
+	recv    *recvBuffer
+	last    []byte // Stores the remaining data in the previous calls.
+	err     error
 }
 
 // Read reads the next len(p) bytes from last. If last is drained, it tries to
@@ -130,10 +140,8 @@ func (r *recvBufferReader) read(p []byte) (n int, err error) {
 		return copied, nil
 	}
 	select {
-	case <-r.ctx.Done():
+	case <-r.ctxDone:
 		return 0, ContextErr(r.ctx.Err())
-	case <-r.goAway:
-		return 0, errStreamDrain
 	case m := <-r.recv.get():
 		r.recv.load()
 		if m.err != nil {
@@ -145,61 +153,7 @@ func (r *recvBufferReader) read(p []byte) (n int, err error) {
 	}
 }
 
-// All items in an out of a controlBuffer should be the same type.
-type item interface {
-	item()
-}
-
-// controlBuffer is an unbounded channel of item.
-type controlBuffer struct {
-	c       chan item
-	mu      sync.Mutex
-	backlog []item
-}
-
-func newControlBuffer() *controlBuffer {
-	b := &controlBuffer{
-		c: make(chan item, 1),
-	}
-	return b
-}
-
-func (b *controlBuffer) put(r item) {
-	b.mu.Lock()
-	if len(b.backlog) == 0 {
-		select {
-		case b.c <- r:
-			b.mu.Unlock()
-			return
-		default:
-		}
-	}
-	b.backlog = append(b.backlog, r)
-	b.mu.Unlock()
-}
-
-func (b *controlBuffer) load() {
-	b.mu.Lock()
-	if len(b.backlog) > 0 {
-		select {
-		case b.c <- b.backlog[0]:
-			b.backlog[0] = nil
-			b.backlog = b.backlog[1:]
-		default:
-		}
-	}
-	b.mu.Unlock()
-}
-
-// get returns the channel that receives an item in the buffer.
-//
-// Upon receipt of an item, the caller should call load to send another
-// item onto the channel if there is any.
-func (b *controlBuffer) get() <-chan item {
-	return b.c
-}
-
-type streamState uint8
+type streamState uint32
 
 const (
 	streamActive    streamState = iota
@@ -214,8 +168,8 @@ type Stream struct {
 	st           ServerTransport    // nil for client side Stream
 	ctx          context.Context    // the associated context of the stream
 	cancel       context.CancelFunc // always nil for client side Stream
-	done         chan struct{}      // closed when the final status arrives
-	goAway       chan struct{}      // closed when a GOAWAY control message is received
+	done         chan struct{}      // closed at the end of stream to unblock writers. On the client side.
+	ctxDone      <-chan struct{}    // same as done chan but for server side. Cache of ctx.Done() (for performance)
 	method       string             // the associated RPC method of the stream
 	recvCompress string
 	sendCompress string
@@ -223,47 +177,71 @@ type Stream struct {
 	trReader     io.Reader
 	fc           *inFlow
 	recvQuota    uint32
-	waiters      waiters
+	wq           *writeQuota
 
 	// Callback to state application's intentions to read data. This
 	// is used to adjust flow control, if needed.
 	requestRead func(int)
 
-	sendQuotaPool *quotaPool
-	headerChan    chan struct{} // closed to indicate the end of header metadata.
-	headerDone    bool          // set when headerChan is closed. Used to avoid closing headerChan multiple times.
-	header        metadata.MD   // the received header metadata.
-	trailer       metadata.MD   // the key-value map of trailer metadata.
+	headerChan chan struct{} // closed to indicate the end of header metadata.
+	headerDone uint32        // set when headerChan is closed. Used to avoid closing headerChan multiple times.
+
+	// hdrMu protects header and trailer metadata on the server-side.
+	hdrMu   sync.Mutex
+	header  metadata.MD // the received header metadata.
+	trailer metadata.MD // the key-value map of trailer metadata.
 
-	mu       sync.RWMutex // guard the following
-	headerOk bool         // becomes true from the first header is about to send
-	state    streamState
+	noHeaders bool // set if the client never received headers (set only after the stream is done).
 
-	status *status.Status // the status error received from the server
+	// On the server-side, headerSent is atomically set to 1 when the headers are sent out.
+	headerSent uint32
 
-	rstStream bool          // indicates whether a RST_STREAM frame needs to be sent
-	rstError  http2.ErrCode // the error that needs to be sent along with the RST_STREAM frame
+	state streamState
 
-	bytesReceived bool // indicates whether any bytes have been received on this stream
-	unprocessed   bool // set if the server sends a refused stream or GOAWAY including this stream
+	// On client-side it is the status error received from the server.
+	// On server-side it is unused.
+	status *status.Status
+
+	bytesReceived uint32 // indicates whether any bytes have been received on this stream
+	unprocessed   uint32 // set if the server sends a refused stream or GOAWAY including this stream
 
 	// contentSubtype is the content-subtype for requests.
 	// this must be lowercase or the behavior is undefined.
 	contentSubtype string
 }
 
+// isHeaderSent is only valid on the server-side.
+func (s *Stream) isHeaderSent() bool {
+	return atomic.LoadUint32(&s.headerSent) == 1
+}
+
+// updateHeaderSent updates headerSent and returns true
+// if it was alreay set. It is valid only on server-side.
+func (s *Stream) updateHeaderSent() bool {
+	return atomic.SwapUint32(&s.headerSent, 1) == 1
+}
+
+func (s *Stream) swapState(st streamState) streamState {
+	return streamState(atomic.SwapUint32((*uint32)(&s.state), uint32(st)))
+}
+
+func (s *Stream) compareAndSwapState(oldState, newState streamState) bool {
+	return atomic.CompareAndSwapUint32((*uint32)(&s.state), uint32(oldState), uint32(newState))
+}
+
+func (s *Stream) getState() streamState {
+	return streamState(atomic.LoadUint32((*uint32)(&s.state)))
+}
+
 func (s *Stream) waitOnHeader() error {
 	if s.headerChan == nil {
 		// On the server headerChan is always nil since a stream originates
 		// only after having received headers.
 		return nil
 	}
-	wc := s.waiters
 	select {
-	case <-wc.ctx.Done():
-		return ContextErr(wc.ctx.Err())
-	case <-wc.goAway:
-		return errStreamDrain
+	case <-s.ctx.Done():
+		return ContextErr(s.ctx.Err())
 	case <-s.headerChan:
 		return nil
 	}
@@ -283,18 +261,12 @@ func (s *Stream) SetSendCompress(str string) {
 	s.sendCompress = str
 }
 
-// Done returns a chanel which is closed when it receives the final status
+// Done returns a channel which is closed when it receives the final status
 // from the server.
 func (s *Stream) Done() <-chan struct{} {
 	return s.done
 }
 
-// GoAway returns a channel which is closed when the server sent GoAways signal
-// before this stream was initiated.
-func (s *Stream) GoAway() <-chan struct{} {
-	return s.goAway
-}
-
 // Header acquires the key-value pairs of header metadata once it
 // is available. It blocks until i) the metadata is ready or ii) there is no
 // header metadata or iii) the stream is canceled/expired.
@@ -303,28 +275,38 @@ func (s *Stream) Header() (metadata.MD, error) {
 	// Even if the stream is closed, header is returned if available.
 	select {
 	case <-s.headerChan:
+		if s.header == nil {
+			return nil, nil
+		}
 		return s.header.Copy(), nil
 	default:
 	}
 	return nil, err
 }
 
+// TrailersOnly blocks until a header or trailers-only frame is received and
+// then returns true if the stream was trailers-only.  If the stream ends
+// before headers are received, returns true, nil.  If a context error happens
+// first, returns it as a status error.  Client-side only.
+func (s *Stream) TrailersOnly() (bool, error) {
+	err := s.waitOnHeader()
+	if err != nil {
+		return false, err
+	}
+	// if !headerDone, some other connection error occurred.
+	return s.noHeaders && atomic.LoadUint32(&s.headerDone) == 1, nil
+}
+
 // Trailer returns the cached trailer metedata. Note that if it is not called
 // after the entire stream is done, it could return an empty MD. Client
 // side only.
+// It can be safely read only after stream has ended that is either read
+// or write have returned io.EOF.
 func (s *Stream) Trailer() metadata.MD {
-	s.mu.RLock()
 	c := s.trailer.Copy()
-	s.mu.RUnlock()
 	return c
 }
 
-// ServerTransport returns the underlying ServerTransport for the stream.
-// The client side stream always returns nil.
-func (s *Stream) ServerTransport() ServerTransport {
-	return s.st
-}
-
 // ContentSubtype returns the content-subtype for a request. For example, a
 // content-subtype of "proto" will result in a content-type of
 // "application/grpc+proto". This will always be lowercase.  See
@@ -345,36 +327,48 @@ func (s *Stream) Method() string {
 }
 
 // Status returns the status received from the server.
+// Status can be read safely only after the stream has ended,
+// that is, after Done() is closed.
 func (s *Stream) Status() *status.Status {
 	return s.status
 }
 
 // SetHeader sets the header metadata. This can be called multiple times.
 // Server side only.
+// This should not be called in parallel to other data writes.
 func (s *Stream) SetHeader(md metadata.MD) error {
-	s.mu.Lock()
-	if s.headerOk || s.state == streamDone {
-		s.mu.Unlock()
-		return ErrIllegalHeaderWrite
-	}
 	if md.Len() == 0 {
-		s.mu.Unlock()
 		return nil
 	}
+	if s.isHeaderSent() || s.getState() == streamDone {
+		return ErrIllegalHeaderWrite
+	}
+	s.hdrMu.Lock()
 	s.header = metadata.Join(s.header, md)
-	s.mu.Unlock()
+	s.hdrMu.Unlock()
 	return nil
 }
 
+// SendHeader sends the given header metadata. The given metadata is
+// combined with any metadata set by previous calls to SetHeader and
+// then written to the transport stream.
+func (s *Stream) SendHeader(md metadata.MD) error {
+	return s.st.WriteHeader(s, md)
+}
+
 // SetTrailer sets the trailer metadata which will be sent with the RPC status
 // by the server. This can be called multiple times. Server side only.
+// This should not be called parallel to other data writes.
 func (s *Stream) SetTrailer(md metadata.MD) error {
 	if md.Len() == 0 {
 		return nil
 	}
-	s.mu.Lock()
+	if s.getState() == streamDone {
+		return ErrIllegalHeaderWrite
+	}
+	s.hdrMu.Lock()
 	s.trailer = metadata.Join(s.trailer, md)
-	s.mu.Unlock()
+	s.hdrMu.Unlock()
 	return nil
 }
 
@@ -414,29 +408,15 @@ func (t *transportReader) Read(p []byte) (n int, err error) {
 	return
 }
 
-// finish sets the stream's state and status, and closes the done channel.
-// s.mu must be held by the caller.  st must always be non-nil.
-func (s *Stream) finish(st *status.Status) {
-	s.status = st
-	s.state = streamDone
-	close(s.done)
-}
-
 // BytesReceived indicates whether any bytes have been received on this stream.
 func (s *Stream) BytesReceived() bool {
-	s.mu.Lock()
-	br := s.bytesReceived
-	s.mu.Unlock()
-	return br
+	return atomic.LoadUint32(&s.bytesReceived) == 1
 }
 
 // Unprocessed indicates whether the server did not process this stream --
 // i.e. it sent a refused stream or GOAWAY including this stream ID.
 func (s *Stream) Unprocessed() bool {
-	s.mu.Lock()
-	br := s.unprocessed
-	s.mu.Unlock()
-	return br
+	return atomic.LoadUint32(&s.unprocessed) == 1
 }
 
 // GoString is implemented by Stream so context.String() won't
@@ -445,21 +425,6 @@ func (s *Stream) GoString() string {
 	return fmt.Sprintf("<stream: %p, %v>", s, s.method)
 }
 
-// The key to save transport.Stream in the context.
-type streamKey struct{}
-
-// newContextWithStream creates a new context from ctx and attaches stream
-// to it.
-func newContextWithStream(ctx context.Context, stream *Stream) context.Context {
-	return context.WithValue(ctx, streamKey{}, stream)
-}
-
-// StreamFromContext returns the stream saved in ctx.
-func StreamFromContext(ctx context.Context) (s *Stream, ok bool) {
-	s, ok = ctx.Value(streamKey{}).(*Stream)
-	return
-}
-
 // state of transport
 type transportState int
 
@@ -481,6 +446,8 @@ type ServerConfig struct {
 	InitialConnWindowSize int32
 	WriteBufferSize       int
 	ReadBufferSize        int
+	ChannelzParentID      int64
+	MaxHeaderListSize     *uint32
 }
 
 // NewServerTransport creates a ServerTransport with conn or non-nil error
@@ -493,9 +460,6 @@ func NewServerTransport(protocol string, conn net.Conn, config *ServerConfig) (S
 type ConnectOptions struct {
 	// UserAgent is the application user agent.
 	UserAgent string
-	// Authority is the :authority pseudo-header to use. This field has no effect if
-	// TransportCredentials is set.
-	Authority string
 	// Dialer specifies how to dial a network address.
 	Dialer func(context.Context, string) (net.Conn, error)
 	// FailOnNonTempDialError specifies if gRPC fails on non-temporary dial errors.
@@ -516,6 +480,10 @@ type ConnectOptions struct {
 	WriteBufferSize int
 	// ReadBufferSize sets the size of read buffer, which in turn determines how much data can be read at most for one read syscall.
 	ReadBufferSize int
+	// ChannelzParentID sets the addrConn id which initiate the creation of this client transport.
+	ChannelzParentID int64
+	// MaxHeaderListSize sets the max (uncompressed) size of header list that is prepared to be received.
+	MaxHeaderListSize *uint32
 }
 
 // TargetInfo contains the information of the target such as network address and metadata.
@@ -537,11 +505,6 @@ type Options struct {
 	// Last indicates whether this write is the last piece for
 	// this stream.
 	Last bool
-
-	// Delay is a hint to the transport implementation for whether
-	// the data could be buffered for a batching write. The
-	// transport implementation may ignore the hint.
-	Delay bool
 }
 
 // CallHdr carries the information of a particular RPC.
@@ -559,14 +522,6 @@ type CallHdr struct {
 	// Creds specifies credentials.PerRPCCredentials for a call.
 	Creds credentials.PerRPCCredentials
 
-	// Flush indicates whether a new stream command should be sent
-	// to the peer without waiting for the first data. This is
-	// only a hint.
-	// If it's true, the transport may modify the flush decision
-	// for performance purposes.
-	// If it's false, new stream will never be flushed.
-	Flush bool
-
 	// ContentSubtype specifies the content-subtype for a request. For example, a
 	// content-subtype of "proto" will result in a content-type of
 	// "application/grpc+proto". The value of ContentSubtype must be all
@@ -574,6 +529,8 @@ type CallHdr struct {
 	// https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#requests
 	// for more details.
 	ContentSubtype string
+
+	PreviousAttempts int // value of grpc-previous-rpc-attempts header to set
 }
 
 // ClientTransport is the common interface for all gRPC client-side transport
@@ -615,6 +572,12 @@ type ClientTransport interface {
 
 	// GetGoAwayReason returns the reason why GoAway frame was received.
 	GetGoAwayReason() GoAwayReason
+
+	// IncrMsgSent increments the number of message sent through this transport.
+	IncrMsgSent()
+
+	// IncrMsgRecv increments the number of message received through this transport.
+	IncrMsgRecv()
 }
 
 // ServerTransport is the common interface for all gRPC server-side transport
@@ -648,14 +611,12 @@ type ServerTransport interface {
 
 	// Drain notifies the client this ServerTransport stops accepting new RPCs.
 	Drain()
-}
 
-// streamErrorf creates an StreamError with the specified error code and description.
-func streamErrorf(c codes.Code, format string, a ...interface{}) StreamError {
-	return StreamError{
-		Code: c,
-		Desc: fmt.Sprintf(format, a...),
-	}
+	// IncrMsgSent increments the number of message sent through this transport.
+	IncrMsgSent()
+
+	// IncrMsgRecv increments the number of message received through this transport.
+	IncrMsgRecv()
 }
 
 // connectionErrorf creates an ConnectionError with the specified error description.
@@ -700,33 +661,15 @@ var (
 	// errStreamDrain indicates that the stream is rejected because the
 	// connection is draining. This could be caused by goaway or balancer
 	// removing the address.
-	errStreamDrain = streamErrorf(codes.Unavailable, "the connection is draining")
+	errStreamDrain = status.Error(codes.Unavailable, "the connection is draining")
+	// errStreamDone is returned from write at the client side to indiacte application
+	// layer of an error.
+	errStreamDone = errors.New("the stream is done")
 	// StatusGoAway indicates that the server sent a GOAWAY that included this
 	// stream's ID in unprocessed RPCs.
 	statusGoAway = status.New(codes.Unavailable, "the stream is rejected because server is draining the connection")
 )
 
-// TODO: See if we can replace StreamError with status package errors.
-
-// StreamError is an error that only affects one stream within a connection.
-type StreamError struct {
-	Code codes.Code
-	Desc string
-}
-
-func (e StreamError) Error() string {
-	return fmt.Sprintf("stream error: code = %s desc = %q", e.Code, e.Desc)
-}
-
-// waiters are passed to quotaPool get methods to
-// wait on in addition to waiting on quota.
-type waiters struct {
-	ctx    context.Context
-	tctx   context.Context
-	done   chan struct{}
-	goAway chan struct{}
-}
-
 // GoAwayReason contains the reason for the GoAway frame received.
 type GoAwayReason uint8
 
@@ -740,39 +683,3 @@ const (
 	// "too_many_pings".
 	GoAwayTooManyPings GoAwayReason = 2
 )
-
-// loopyWriter is run in a separate go routine. It is the single code path that will
-// write data on wire.
-func loopyWriter(ctx context.Context, cbuf *controlBuffer, handler func(item) error) {
-	for {
-		select {
-		case i := <-cbuf.get():
-			cbuf.load()
-			if err := handler(i); err != nil {
-				errorf("transport: Error while handling item. Err: %v", err)
-				return
-			}
-		case <-ctx.Done():
-			return
-		}
-	hasData:
-		for {
-			select {
-			case i := <-cbuf.get():
-				cbuf.load()
-				if err := handler(i); err != nil {
-					errorf("transport: Error while handling item. Err: %v", err)
-					return
-				}
-			case <-ctx.Done():
-				return
-			default:
-				if err := handler(&flushIO{}); err != nil {
-					errorf("transport: Error while flushing. Err: %v", err)
-					return
-				}
-				break hasData
-			}
-		}
-	}
-}
diff --git a/vendor/google.golang.org/grpc/transport/transport_test.go b/vendor/google.golang.org/grpc/internal/transport/transport_test.go
similarity index 61%
rename from vendor/google.golang.org/grpc/transport/transport_test.go
rename to vendor/google.golang.org/grpc/internal/transport/transport_test.go
index 8c004ec6..52be96f0 100644
--- a/vendor/google.golang.org/grpc/transport/transport_test.go
+++ b/vendor/google.golang.org/grpc/internal/transport/transport_test.go
@@ -29,6 +29,7 @@ import (
 	"net"
 	"net/http"
 	"reflect"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -39,6 +40,7 @@ import (
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/hpack"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/status"
 )
@@ -50,6 +52,7 @@ type server struct {
 	mu         sync.Mutex
 	conns      map[ServerTransport]bool
 	h          *testStreamHandler
+	ready      chan struct{}
 }
 
 var (
@@ -61,8 +64,9 @@ var (
 )
 
 type testStreamHandler struct {
-	t      *http2Server
-	notify chan struct{}
+	t           *http2Server
+	notify      chan struct{}
+	getNotified chan struct{}
 }
 
 type hType int
@@ -75,7 +79,6 @@ const (
 	encodingRequiredStatus
 	invalidHeaderField
 	delayRead
-	delayWrite
 	pingpong
 )
 
@@ -137,9 +140,9 @@ func (h *testStreamHandler) handleStreamPingPong(t *testing.T, s *Stream) {
 }
 
 func (h *testStreamHandler) handleStreamMisbehave(t *testing.T, s *Stream) {
-	conn, ok := s.ServerTransport().(*http2Server)
+	conn, ok := s.st.(*http2Server)
 	if !ok {
-		t.Fatalf("Failed to convert %v to *http2Server", s.ServerTransport())
+		t.Fatalf("Failed to convert %v to *http2Server", s.st)
 	}
 	var sent int
 	p := make([]byte, http2MaxFrameLen)
@@ -156,7 +159,12 @@ func (h *testStreamHandler) handleStreamMisbehave(t *testing.T, s *Stream) {
 				p = make([]byte, n+1)
 			}
 		}
-		conn.controlBuf.put(&dataFrame{s.id, false, p, func() {}})
+		conn.controlBuf.put(&dataFrame{
+			streamID:    s.id,
+			h:           nil,
+			d:           p,
+			onEachWrite: func() {},
+		})
 		sent += len(p)
 	}
 }
@@ -176,6 +184,10 @@ func (h *testStreamHandler) handleStreamInvalidHeaderField(t *testing.T, s *Stre
 	})
 }
 
+// handleStreamDelayRead delays reads so that the other side has to halt on
+// stream-level flow control.
+// This handler assumes dynamic flow control is turned off and assumes window
+// sizes to be set to defaultWindowSize.
 func (h *testStreamHandler) handleStreamDelayRead(t *testing.T, s *Stream) {
 	req := expectedRequest
 	resp := expectedResponse
@@ -183,49 +195,82 @@ func (h *testStreamHandler) handleStreamDelayRead(t *testing.T, s *Stream) {
 		req = expectedRequestLarge
 		resp = expectedResponseLarge
 	}
+	var (
+		mu    sync.Mutex
+		total int
+	)
+	s.wq.replenish = func(n int) {
+		mu.Lock()
+		total += n
+		mu.Unlock()
+		s.wq.realReplenish(n)
+	}
+	getTotal := func() int {
+		mu.Lock()
+		defer mu.Unlock()
+		return total
+	}
+	done := make(chan struct{})
+	defer close(done)
+	go func() {
+		for {
+			select {
+			// Prevent goroutine from leaking.
+			case <-done:
+				return
+			default:
+			}
+			if getTotal() == defaultWindowSize {
+				// Signal the client to start reading and
+				// thereby send window update.
+				close(h.notify)
+				return
+			}
+			runtime.Gosched()
+		}
+	}()
 	p := make([]byte, len(req))
 
-	// Wait before reading. Give time to client to start sending
-	// before server starts reading.
-	time.Sleep(2 * time.Second)
+	// Let the other side run out of stream-level window before
+	// starting to read and thereby sending a window update.
+	timer := time.NewTimer(time.Second * 10)
+	select {
+	case <-h.getNotified:
+		timer.Stop()
+	case <-timer.C:
+		t.Errorf("Server timed-out.")
+		return
+	}
 	_, err := s.Read(p)
 	if err != nil {
-		t.Fatalf("s.Read(_) = _, %v, want _, <nil>", err)
+		t.Errorf("s.Read(_) = _, %v, want _, <nil>", err)
 		return
 	}
 
 	if !bytes.Equal(p, req) {
-		t.Fatalf("handleStream got %v, want %v", p, req)
+		t.Errorf("handleStream got %v, want %v", p, req)
+		return
 	}
-	// send a response back to the client.
-	h.t.Write(s, nil, resp, &Options{})
-	// send the trailer to end the stream.
-	h.t.WriteStatus(s, status.New(codes.OK, ""))
-}
-
-func (h *testStreamHandler) handleStreamDelayWrite(t *testing.T, s *Stream) {
-	req := expectedRequest
-	resp := expectedResponse
-	if s.Method() == "foo.Large" {
-		req = expectedRequestLarge
-		resp = expectedResponseLarge
+	// This write will cause server to run out of stream level,
+	// flow control and the other side won't send a window update
+	// until that happens.
+	if err := h.t.Write(s, nil, resp, &Options{}); err != nil {
+		t.Errorf("server Write got %v, want <nil>", err)
+		return
 	}
-	p := make([]byte, len(req))
-	_, err := s.Read(p)
+	// Read one more time to ensure that everything remains fine and
+	// that the goroutine, that we launched earlier to signal client
+	// to read, gets enough time to process.
+	_, err = s.Read(p)
 	if err != nil {
-		t.Fatalf("s.Read(_) = _, %v, want _, <nil>", err)
+		t.Errorf("s.Read(_) = _, %v, want _, nil", err)
 		return
 	}
-	if !bytes.Equal(p, req) {
-		t.Fatalf("handleStream got %v, want %v", p, req)
-	}
-
-	// Wait before sending. Give time to client to start reading
-	// before server starts sending.
-	time.Sleep(2 * time.Second)
-	h.t.Write(s, nil, resp, &Options{})
 	// send the trailer to end the stream.
-	h.t.WriteStatus(s, status.New(codes.OK, ""))
+	if err := h.t.WriteStatus(s, status.New(codes.OK, "")); err != nil {
+		t.Errorf("server WriteStatus got %v, want <nil>", err)
+		return
+	}
 }
 
 // start starts server. Other goroutines should block on s.readyChan for further operations.
@@ -297,17 +342,16 @@ func (s *server) start(t *testing.T, port int, serverConfig *ServerConfig, ht hT
 				return ctx
 			})
 		case delayRead:
+			h.notify = make(chan struct{})
+			h.getNotified = make(chan struct{})
+			s.mu.Lock()
+			close(s.ready)
+			s.mu.Unlock()
 			go transport.HandleStreams(func(s *Stream) {
 				go h.handleStreamDelayRead(t, s)
 			}, func(ctx context.Context, method string) context.Context {
 				return ctx
 			})
-		case delayWrite:
-			go transport.HandleStreams(func(s *Stream) {
-				go h.handleStreamDelayWrite(t, s)
-			}, func(ctx context.Context, method string) context.Context {
-				return ctx
-			})
 		case pingpong:
 			go transport.HandleStreams(func(s *Stream) {
 				go h.handleStreamPingPong(t, s)
@@ -345,32 +389,33 @@ func (s *server) stop() {
 	s.mu.Unlock()
 }
 
-func setUp(t *testing.T, port int, maxStreams uint32, ht hType) (*server, ClientTransport) {
-	return setUpWithOptions(t, port, &ServerConfig{MaxStreams: maxStreams}, ht, ConnectOptions{})
-}
-
-func setUpWithOptions(t *testing.T, port int, serverConfig *ServerConfig, ht hType, copts ConnectOptions) (*server, ClientTransport) {
-	server := &server{startedErr: make(chan error, 1)}
+func setUpServerOnly(t *testing.T, port int, serverConfig *ServerConfig, ht hType) *server {
+	server := &server{startedErr: make(chan error, 1), ready: make(chan struct{})}
 	go server.start(t, port, serverConfig, ht)
 	server.wait(t, 2*time.Second)
+	return server
+}
+
+func setUp(t *testing.T, port int, maxStreams uint32, ht hType) (*server, *http2Client, func()) {
+	return setUpWithOptions(t, port, &ServerConfig{MaxStreams: maxStreams}, ht, ConnectOptions{}, func() {})
+}
+
+func setUpWithOptions(t *testing.T, port int, serverConfig *ServerConfig, ht hType, copts ConnectOptions, onHandshake func()) (*server, *http2Client, func()) {
+	server := setUpServerOnly(t, port, serverConfig, ht)
 	addr := "localhost:" + server.port
-	var (
-		ct      ClientTransport
-		connErr error
-	)
 	target := TargetInfo{
 		Addr: addr,
 	}
 	connectCtx, cancel := context.WithDeadline(context.Background(), time.Now().Add(2*time.Second))
-	ct, connErr = NewClientTransport(connectCtx, context.Background(), target, copts, func() {})
+	ct, connErr := NewClientTransport(connectCtx, context.Background(), target, copts, onHandshake)
 	if connErr != nil {
 		cancel() // Do not cancel in success path.
 		t.Fatalf("failed to create transport: %v", connErr)
 	}
-	return server, ct
+	return server, ct.(*http2Client), cancel
 }
 
-func setUpWithNoPingServer(t *testing.T, copts ConnectOptions, done chan net.Conn) ClientTransport {
+func setUpWithNoPingServer(t *testing.T, copts ConnectOptions, done chan net.Conn) (*http2Client, func()) {
 	lis, err := net.Listen("tcp", "localhost:0")
 	if err != nil {
 		t.Fatalf("Failed to listen: %v", err)
@@ -397,14 +442,15 @@ func setUpWithNoPingServer(t *testing.T, copts ConnectOptions, done chan net.Con
 		}
 		t.Fatalf("Failed to dial: %v", err)
 	}
-	return tr
+	return tr.(*http2Client), cancel
 }
 
 // TestInflightStreamClosing ensures that closing in-flight stream
-// sends StreamError to concurrent stream reader.
+// sends status error to concurrent stream reader.
 func TestInflightStreamClosing(t *testing.T) {
 	serverConfig := &ServerConfig{}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{})
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{}, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 
@@ -414,7 +460,7 @@ func TestInflightStreamClosing(t *testing.T) {
 	}
 
 	donec := make(chan struct{})
-	serr := StreamError{Desc: "client connection is closing"}
+	serr := status.Error(codes.Internal, "client connection is closing")
 	go func() {
 		defer close(donec)
 		if _, err := stream.Read(make([]byte, defaultWindowSize)); err != serr {
@@ -433,7 +479,7 @@ func TestInflightStreamClosing(t *testing.T) {
 			<-timeout.C
 		}
 	case <-timeout.C:
-		t.Fatalf("Test timed out, expected a StreamError.")
+		t.Fatalf("Test timed out, expected a status error.")
 	}
 }
 
@@ -446,17 +492,15 @@ func TestMaxConnectionIdle(t *testing.T) {
 			MaxConnectionIdle: 2 * time.Second,
 		},
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{})
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{}, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
-	stream, err := client.NewStream(context.Background(), &CallHdr{Flush: true})
+	stream, err := client.NewStream(context.Background(), &CallHdr{})
 	if err != nil {
 		t.Fatalf("Client failed to create RPC request: %v", err)
 	}
-	stream.mu.Lock()
-	stream.rstStream = true
-	stream.mu.Unlock()
-	client.CloseStream(stream, nil)
+	client.closeStream(stream, io.EOF, true, http2.ErrCodeCancel, nil, nil, false)
 	// wait for server to see that closed stream and max-age logic to send goaway after no new RPCs are mode
 	timeout := time.NewTimer(time.Second * 4)
 	select {
@@ -476,10 +520,11 @@ func TestMaxConnectionIdleNegative(t *testing.T) {
 			MaxConnectionIdle: 2 * time.Second,
 		},
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{})
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{}, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
-	_, err := client.NewStream(context.Background(), &CallHdr{Flush: true})
+	_, err := client.NewStream(context.Background(), &CallHdr{})
 	if err != nil {
 		t.Fatalf("Client failed to create RPC request: %v", err)
 	}
@@ -502,7 +547,8 @@ func TestMaxConnectionAge(t *testing.T) {
 			MaxConnectionAge: 2 * time.Second,
 		},
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{})
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{}, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 	_, err := client.NewStream(context.Background(), &CallHdr{})
@@ -521,6 +567,11 @@ func TestMaxConnectionAge(t *testing.T) {
 	}
 }
 
+const (
+	defaultWriteBufSize = 32 * 1024
+	defaultReadBufSize  = 32 * 1024
+)
+
 // TestKeepaliveServer tests that a server closes connection with a client that doesn't respond to keepalive pings.
 func TestKeepaliveServer(t *testing.T) {
 	serverConfig := &ServerConfig{
@@ -529,7 +580,8 @@ func TestKeepaliveServer(t *testing.T) {
 			Timeout: 1 * time.Second,
 		},
 	}
-	server, c := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{})
+	server, c, cancel := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{}, func() {})
+	defer cancel()
 	defer server.stop()
 	defer c.Close()
 	client, err := net.Dial("tcp", server.lis.Addr().String())
@@ -544,7 +596,7 @@ func TestKeepaliveServer(t *testing.T) {
 	if n, err := client.Write(clientPreface); err != nil || n != len(clientPreface) {
 		t.Fatalf("Error writing client preface; n=%v, err=%v", n, err)
 	}
-	framer := newFramer(client, defaultWriteBufSize, defaultReadBufSize)
+	framer := newFramer(client, defaultWriteBufSize, defaultReadBufSize, 0)
 	if err := framer.fr.WriteSettings(http2.Setting{}); err != nil {
 		t.Fatal("Error writing settings frame:", err)
 	}
@@ -572,27 +624,28 @@ func TestKeepaliveServerNegative(t *testing.T) {
 			Timeout: 1 * time.Second,
 		},
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{})
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{}, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 	// Give keepalive logic some time by sleeping.
 	time.Sleep(4 * time.Second)
 	// Assert that client is still active.
-	clientTr := client.(*http2Client)
-	clientTr.mu.Lock()
-	defer clientTr.mu.Unlock()
-	if clientTr.state != reachable {
+	client.mu.Lock()
+	defer client.mu.Unlock()
+	if client.state != reachable {
 		t.Fatalf("Test failed: Expected server-client connection to be healthy.")
 	}
 }
 
 func TestKeepaliveClientClosesIdleTransport(t *testing.T) {
 	done := make(chan net.Conn, 1)
-	tr := setUpWithNoPingServer(t, ConnectOptions{KeepaliveParams: keepalive.ClientParameters{
+	tr, cancel := setUpWithNoPingServer(t, ConnectOptions{KeepaliveParams: keepalive.ClientParameters{
 		Time:                2 * time.Second, // Keepalive time = 2 sec.
 		Timeout:             1 * time.Second, // Keepalive timeout = 1 sec.
 		PermitWithoutStream: true,            // Run keepalive even with no RPCs.
 	}}, done)
+	defer cancel()
 	defer tr.Close()
 	conn, ok := <-done
 	if !ok {
@@ -602,20 +655,20 @@ func TestKeepaliveClientClosesIdleTransport(t *testing.T) {
 	// Sleep for keepalive to close the connection.
 	time.Sleep(4 * time.Second)
 	// Assert that the connection was closed.
-	ct := tr.(*http2Client)
-	ct.mu.Lock()
-	defer ct.mu.Unlock()
-	if ct.state == reachable {
+	tr.mu.Lock()
+	defer tr.mu.Unlock()
+	if tr.state == reachable {
 		t.Fatalf("Test Failed: Expected client transport to have closed.")
 	}
 }
 
 func TestKeepaliveClientStaysHealthyOnIdleTransport(t *testing.T) {
 	done := make(chan net.Conn, 1)
-	tr := setUpWithNoPingServer(t, ConnectOptions{KeepaliveParams: keepalive.ClientParameters{
+	tr, cancel := setUpWithNoPingServer(t, ConnectOptions{KeepaliveParams: keepalive.ClientParameters{
 		Time:    2 * time.Second, // Keepalive time = 2 sec.
 		Timeout: 1 * time.Second, // Keepalive timeout = 1 sec.
 	}}, done)
+	defer cancel()
 	defer tr.Close()
 	conn, ok := <-done
 	if !ok {
@@ -625,20 +678,20 @@ func TestKeepaliveClientStaysHealthyOnIdleTransport(t *testing.T) {
 	// Give keepalive some time.
 	time.Sleep(4 * time.Second)
 	// Assert that connections is still healthy.
-	ct := tr.(*http2Client)
-	ct.mu.Lock()
-	defer ct.mu.Unlock()
-	if ct.state != reachable {
+	tr.mu.Lock()
+	defer tr.mu.Unlock()
+	if tr.state != reachable {
 		t.Fatalf("Test failed: Expected client transport to be healthy.")
 	}
 }
 
 func TestKeepaliveClientClosesWithActiveStreams(t *testing.T) {
 	done := make(chan net.Conn, 1)
-	tr := setUpWithNoPingServer(t, ConnectOptions{KeepaliveParams: keepalive.ClientParameters{
+	tr, cancel := setUpWithNoPingServer(t, ConnectOptions{KeepaliveParams: keepalive.ClientParameters{
 		Time:    2 * time.Second, // Keepalive time = 2 sec.
 		Timeout: 1 * time.Second, // Keepalive timeout = 1 sec.
 	}}, done)
+	defer cancel()
 	defer tr.Close()
 	conn, ok := <-done
 	if !ok {
@@ -646,36 +699,35 @@ func TestKeepaliveClientClosesWithActiveStreams(t *testing.T) {
 	}
 	defer conn.Close()
 	// Create a stream.
-	_, err := tr.NewStream(context.Background(), &CallHdr{Flush: true})
+	_, err := tr.NewStream(context.Background(), &CallHdr{})
 	if err != nil {
 		t.Fatalf("Failed to create a new stream: %v", err)
 	}
 	// Give keepalive some time.
 	time.Sleep(4 * time.Second)
 	// Assert that transport was closed.
-	ct := tr.(*http2Client)
-	ct.mu.Lock()
-	defer ct.mu.Unlock()
-	if ct.state == reachable {
+	tr.mu.Lock()
+	defer tr.mu.Unlock()
+	if tr.state == reachable {
 		t.Fatalf("Test failed: Expected client transport to have closed.")
 	}
 }
 
 func TestKeepaliveClientStaysHealthyWithResponsiveServer(t *testing.T) {
-	s, tr := setUpWithOptions(t, 0, &ServerConfig{MaxStreams: math.MaxUint32}, normal, ConnectOptions{KeepaliveParams: keepalive.ClientParameters{
+	s, tr, cancel := setUpWithOptions(t, 0, &ServerConfig{MaxStreams: math.MaxUint32}, normal, ConnectOptions{KeepaliveParams: keepalive.ClientParameters{
 		Time:                2 * time.Second, // Keepalive time = 2 sec.
 		Timeout:             1 * time.Second, // Keepalive timeout = 1 sec.
 		PermitWithoutStream: true,            // Run keepalive even with no RPCs.
-	}})
+	}}, func() {})
+	defer cancel()
 	defer s.stop()
 	defer tr.Close()
 	// Give keep alive some time.
 	time.Sleep(4 * time.Second)
 	// Assert that transport is healthy.
-	ct := tr.(*http2Client)
-	ct.mu.Lock()
-	defer ct.mu.Unlock()
-	if ct.state != reachable {
+	tr.mu.Lock()
+	defer tr.mu.Unlock()
+	if tr.state != reachable {
 		t.Fatalf("Test failed: Expected client transport to be healthy.")
 	}
 }
@@ -693,7 +745,8 @@ func TestKeepaliveServerEnforcementWithAbusiveClientNoRPC(t *testing.T) {
 			PermitWithoutStream: true,
 		},
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, normal, clientOptions)
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, normal, clientOptions, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 
@@ -707,10 +760,9 @@ func TestKeepaliveServerEnforcementWithAbusiveClientNoRPC(t *testing.T) {
 		t.Fatalf("Test failed: Expected a GoAway from server.")
 	}
 	time.Sleep(500 * time.Millisecond)
-	ct := client.(*http2Client)
-	ct.mu.Lock()
-	defer ct.mu.Unlock()
-	if ct.state == reachable {
+	client.mu.Lock()
+	defer client.mu.Unlock()
+	if client.state == reachable {
 		t.Fatalf("Test failed: Expected the connection to be closed.")
 	}
 }
@@ -727,11 +779,12 @@ func TestKeepaliveServerEnforcementWithAbusiveClientWithRPC(t *testing.T) {
 			Timeout: 1 * time.Second,
 		},
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, clientOptions)
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, suspended, clientOptions, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 
-	if _, err := client.NewStream(context.Background(), &CallHdr{Flush: true}); err != nil {
+	if _, err := client.NewStream(context.Background(), &CallHdr{}); err != nil {
 		t.Fatalf("Client failed to create stream.")
 	}
 	timeout := time.NewTimer(10 * time.Second)
@@ -744,10 +797,9 @@ func TestKeepaliveServerEnforcementWithAbusiveClientWithRPC(t *testing.T) {
 		t.Fatalf("Test failed: Expected a GoAway from server.")
 	}
 	time.Sleep(500 * time.Millisecond)
-	ct := client.(*http2Client)
-	ct.mu.Lock()
-	defer ct.mu.Unlock()
-	if ct.state == reachable {
+	client.mu.Lock()
+	defer client.mu.Unlock()
+	if client.state == reachable {
 		t.Fatalf("Test failed: Expected the connection to be closed.")
 	}
 }
@@ -766,17 +818,17 @@ func TestKeepaliveServerEnforcementWithObeyingClientNoRPC(t *testing.T) {
 			PermitWithoutStream: true,
 		},
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, normal, clientOptions)
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, normal, clientOptions, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 
 	// Give keepalive enough time.
 	time.Sleep(3 * time.Second)
 	// Assert that connection is healthy.
-	ct := client.(*http2Client)
-	ct.mu.Lock()
-	defer ct.mu.Unlock()
-	if ct.state != reachable {
+	client.mu.Lock()
+	defer client.mu.Unlock()
+	if client.state != reachable {
 		t.Fatalf("Test failed: Expected connection to be healthy.")
 	}
 }
@@ -793,27 +845,28 @@ func TestKeepaliveServerEnforcementWithObeyingClientWithRPC(t *testing.T) {
 			Timeout: 1 * time.Second,
 		},
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, clientOptions)
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, suspended, clientOptions, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 
-	if _, err := client.NewStream(context.Background(), &CallHdr{Flush: true}); err != nil {
+	if _, err := client.NewStream(context.Background(), &CallHdr{}); err != nil {
 		t.Fatalf("Client failed to create stream.")
 	}
 
 	// Give keepalive enough time.
 	time.Sleep(3 * time.Second)
 	// Assert that connection is healthy.
-	ct := client.(*http2Client)
-	ct.mu.Lock()
-	defer ct.mu.Unlock()
-	if ct.state != reachable {
+	client.mu.Lock()
+	defer client.mu.Unlock()
+	if client.state != reachable {
 		t.Fatalf("Test failed: Expected connection to be healthy.")
 	}
 }
 
 func TestClientSendAndReceive(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, normal)
+	server, ct, cancel := setUp(t, 0, math.MaxUint32, normal)
+	defer cancel()
 	callHdr := &CallHdr{
 		Host:   "localhost",
 		Method: "foo.Small",
@@ -832,10 +885,7 @@ func TestClientSendAndReceive(t *testing.T) {
 	if s2.id != 3 {
 		t.Fatalf("wrong stream id: %d", s2.id)
 	}
-	opts := Options{
-		Last:  true,
-		Delay: false,
-	}
+	opts := Options{Last: true}
 	if err := ct.Write(s1, nil, expectedRequest, &opts); err != nil && err != io.EOF {
 		t.Fatalf("failed to send data: %v", err)
 	}
@@ -853,7 +903,8 @@ func TestClientSendAndReceive(t *testing.T) {
 }
 
 func TestClientErrorNotify(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, normal)
+	server, ct, cancel := setUp(t, 0, math.MaxUint32, normal)
+	defer cancel()
 	go server.stop()
 	// ct.reader should detect the error and activate ct.Error().
 	<-ct.Error()
@@ -869,10 +920,7 @@ func performOneRPC(ct ClientTransport) {
 	if err != nil {
 		return
 	}
-	opts := Options{
-		Last:  true,
-		Delay: false,
-	}
+	opts := Options{Last: true}
 	if err := ct.Write(s, []byte{}, expectedRequest, &opts); err == nil || err == io.EOF {
 		time.Sleep(5 * time.Millisecond)
 		// The following s.Recv()'s could error out because the
@@ -887,7 +935,8 @@ func performOneRPC(ct ClientTransport) {
 }
 
 func TestClientMix(t *testing.T) {
-	s, ct := setUp(t, 0, math.MaxUint32, normal)
+	s, ct, cancel := setUp(t, 0, math.MaxUint32, normal)
+	defer cancel()
 	go func(s *server) {
 		time.Sleep(5 * time.Second)
 		s.stop()
@@ -903,7 +952,8 @@ func TestClientMix(t *testing.T) {
 }
 
 func TestLargeMessage(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, normal)
+	server, ct, cancel := setUp(t, 0, math.MaxUint32, normal)
+	defer cancel()
 	callHdr := &CallHdr{
 		Host:   "localhost",
 		Method: "foo.Large",
@@ -917,7 +967,7 @@ func TestLargeMessage(t *testing.T) {
 			if err != nil {
 				t.Errorf("%v.NewStream(_, _) = _, %v, want _, <nil>", ct, err)
 			}
-			if err := ct.Write(s, []byte{}, expectedRequestLarge, &Options{Last: true, Delay: false}); err != nil && err != io.EOF {
+			if err := ct.Write(s, []byte{}, expectedRequestLarge, &Options{Last: true}); err != nil && err != io.EOF {
 				t.Errorf("%v.Write(_, _, _) = %v, want  <nil>", ct, err)
 			}
 			p := make([]byte, len(expectedResponseLarge))
@@ -935,121 +985,170 @@ func TestLargeMessage(t *testing.T) {
 }
 
 func TestLargeMessageWithDelayRead(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, delayRead)
+	// Disable dynamic flow control.
+	sc := &ServerConfig{
+		InitialWindowSize:     defaultWindowSize,
+		InitialConnWindowSize: defaultWindowSize,
+	}
+	co := ConnectOptions{
+		InitialWindowSize:     defaultWindowSize,
+		InitialConnWindowSize: defaultWindowSize,
+	}
+	server, ct, cancel := setUpWithOptions(t, 0, sc, delayRead, co, func() {})
+	defer cancel()
+	defer server.stop()
+	defer ct.Close()
+	server.mu.Lock()
+	ready := server.ready
+	server.mu.Unlock()
 	callHdr := &CallHdr{
 		Host:   "localhost",
 		Method: "foo.Large",
 	}
-	var wg sync.WaitGroup
-	for i := 0; i < 2; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			s, err := ct.NewStream(context.Background(), callHdr)
-			if err != nil {
-				t.Errorf("%v.NewStream(_, _) = _, %v, want _, <nil>", ct, err)
-			}
-			if err := ct.Write(s, []byte{}, expectedRequestLarge, &Options{Last: true, Delay: false}); err != nil && err != io.EOF {
-				t.Errorf("%v.Write(_, _, _) = %v, want  <nil>", ct, err)
-			}
-			p := make([]byte, len(expectedResponseLarge))
-
-			// Give time to server to begin sending before client starts reading.
-			time.Sleep(2 * time.Second)
-			if _, err := s.Read(p); err != nil || !bytes.Equal(p, expectedResponseLarge) {
-				t.Errorf("s.Read(_) = _, %v, want _, <nil>", err)
+	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(time.Second*10))
+	defer cancel()
+	s, err := ct.NewStream(ctx, callHdr)
+	if err != nil {
+		t.Fatalf("%v.NewStream(_, _) = _, %v, want _, <nil>", ct, err)
+		return
+	}
+	// Wait for server's handerler to be initialized
+	select {
+	case <-ready:
+	case <-ctx.Done():
+		t.Fatalf("Client timed out waiting for server handler to be initialized.")
+	}
+	server.mu.Lock()
+	serviceHandler := server.h
+	server.mu.Unlock()
+	var (
+		mu    sync.Mutex
+		total int
+	)
+	s.wq.replenish = func(n int) {
+		mu.Lock()
+		total += n
+		mu.Unlock()
+		s.wq.realReplenish(n)
+	}
+	getTotal := func() int {
+		mu.Lock()
+		defer mu.Unlock()
+		return total
+	}
+	done := make(chan struct{})
+	defer close(done)
+	go func() {
+		for {
+			select {
+			// Prevent goroutine from leaking in case of error.
+			case <-done:
+				return
+			default:
 			}
-			if _, err = s.Read(p); err != io.EOF {
-				t.Errorf("Failed to complete the stream %v; want <EOF>", err)
+			if getTotal() == defaultWindowSize {
+				// unblock server to be able to read and
+				// thereby send stream level window update.
+				close(serviceHandler.getNotified)
+				return
 			}
-		}()
+			runtime.Gosched()
+		}
+	}()
+	// This write will cause client to run out of stream level,
+	// flow control and the other side won't send a window update
+	// until that happens.
+	if err := ct.Write(s, []byte{}, expectedRequestLarge, &Options{}); err != nil {
+		t.Fatalf("write(_, _, _) = %v, want  <nil>", err)
 	}
-	wg.Wait()
-	ct.Close()
-	server.stop()
-}
+	p := make([]byte, len(expectedResponseLarge))
 
-func TestLargeMessageDelayWrite(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, delayWrite)
-	callHdr := &CallHdr{
-		Host:   "localhost",
-		Method: "foo.Large",
+	// Wait for the other side to run out of stream level flow control before
+	// reading and thereby sending a window update.
+	select {
+	case <-serviceHandler.notify:
+	case <-ctx.Done():
+		t.Fatalf("Client timed out")
 	}
-	var wg sync.WaitGroup
-	for i := 0; i < 2; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			s, err := ct.NewStream(context.Background(), callHdr)
-			if err != nil {
-				t.Errorf("%v.NewStream(_, _) = _, %v, want _, <nil>", ct, err)
-			}
-
-			// Give time to server to start reading before client starts sending.
-			time.Sleep(2 * time.Second)
-			if err := ct.Write(s, []byte{}, expectedRequestLarge, &Options{Last: true, Delay: false}); err != nil && err != io.EOF {
-				t.Errorf("%v.Write(_, _, _) = %v, want  <nil>", ct, err)
-			}
-			p := make([]byte, len(expectedResponseLarge))
-			if _, err := s.Read(p); err != nil || !bytes.Equal(p, expectedResponseLarge) {
-				t.Errorf("io.ReadFull(%v) = _, %v, want %v, <nil>", err, p, expectedResponse)
-			}
-			if _, err = s.Read(p); err != io.EOF {
-				t.Errorf("Failed to complete the stream %v; want <EOF>", err)
-			}
-		}()
+	if _, err := s.Read(p); err != nil || !bytes.Equal(p, expectedResponseLarge) {
+		t.Fatalf("s.Read(_) = _, %v, want _, <nil>", err)
+	}
+	if err := ct.Write(s, []byte{}, expectedRequestLarge, &Options{Last: true}); err != nil {
+		t.Fatalf("Write(_, _, _) = %v, want <nil>", err)
+	}
+	if _, err = s.Read(p); err != io.EOF {
+		t.Fatalf("Failed to complete the stream %v; want <EOF>", err)
 	}
-	wg.Wait()
-	ct.Close()
-	server.stop()
 }
 
 func TestGracefulClose(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, normal)
-	callHdr := &CallHdr{
-		Host:   "localhost",
-		Method: "foo.Small",
-	}
-	s, err := ct.NewStream(context.Background(), callHdr)
+	server, ct, cancel := setUp(t, 0, math.MaxUint32, pingpong)
+	defer func() {
+		// Stop the server's listener to make the server's goroutines terminate
+		// (after the last active stream is done).
+		server.lis.Close()
+		// Check for goroutine leaks (i.e. GracefulClose with an active stream
+		// doesn't eventually close the connection when that stream completes).
+		leakcheck.Check(t)
+		// Correctly clean up the server
+		server.stop()
+		cancel()
+	}()
+	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(time.Second*10))
+	defer cancel()
+	s, err := ct.NewStream(ctx, &CallHdr{})
 	if err != nil {
-		t.Fatalf("%v.NewStream(_, _) = _, %v, want _, <nil>", ct, err)
+		t.Fatalf("NewStream(_, _) = _, %v, want _, <nil>", err)
+	}
+	msg := make([]byte, 1024)
+	outgoingHeader := make([]byte, 5)
+	outgoingHeader[0] = byte(0)
+	binary.BigEndian.PutUint32(outgoingHeader[1:], uint32(len(msg)))
+	incomingHeader := make([]byte, 5)
+	if err := ct.Write(s, outgoingHeader, msg, &Options{}); err != nil {
+		t.Fatalf("Error while writing: %v", err)
+	}
+	if _, err := s.Read(incomingHeader); err != nil {
+		t.Fatalf("Error while reading: %v", err)
+	}
+	sz := binary.BigEndian.Uint32(incomingHeader[1:])
+	recvMsg := make([]byte, int(sz))
+	if _, err := s.Read(recvMsg); err != nil {
+		t.Fatalf("Error while reading: %v", err)
 	}
 	if err = ct.GracefulClose(); err != nil {
-		t.Fatalf("%v.GracefulClose() = %v, want <nil>", ct, err)
+		t.Fatalf("GracefulClose() = %v, want <nil>", err)
 	}
 	var wg sync.WaitGroup
 	// Expect the failure for all the follow-up streams because ct has been closed gracefully.
-	for i := 0; i < 100; i++ {
+	for i := 0; i < 200; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			if _, err := ct.NewStream(context.Background(), callHdr); err != errStreamDrain {
-				t.Errorf("%v.NewStream(_, _) = _, %v, want _, %v", ct, err, errStreamDrain)
+			str, err := ct.NewStream(context.Background(), &CallHdr{})
+			if err == ErrConnClosing {
+				return
+			} else if err != nil {
+				t.Errorf("_.NewStream(_, _) = _, %v, want _, %v", err, ErrConnClosing)
+				return
+			}
+			ct.Write(str, nil, nil, &Options{Last: true})
+			if _, err := str.Read(make([]byte, 8)); err != errStreamDrain && err != ErrConnClosing {
+				t.Errorf("_.Read(_) = _, %v, want _, %v or %v", err, errStreamDrain, ErrConnClosing)
 			}
 		}()
 	}
-	opts := Options{
-		Last:  true,
-		Delay: false,
+	ct.Write(s, nil, nil, &Options{Last: true})
+	if _, err := s.Read(incomingHeader); err != io.EOF {
+		t.Fatalf("Client expected EOF from the server. Got: %v", err)
 	}
 	// The stream which was created before graceful close can still proceed.
-	if err := ct.Write(s, nil, expectedRequest, &opts); err != nil && err != io.EOF {
-		t.Fatalf("%v.Write(_, _, _) = %v, want  <nil>", ct, err)
-	}
-	p := make([]byte, len(expectedResponse))
-	if _, err := s.Read(p); err != nil || !bytes.Equal(p, expectedResponse) {
-		t.Fatalf("s.Read(%v) = _, %v, want %v, <nil>", err, p, expectedResponse)
-	}
-	if _, err = s.Read(p); err != io.EOF {
-		t.Fatalf("Failed to complete the stream %v; want <EOF>", err)
-	}
 	wg.Wait()
-	ct.Close()
-	server.stop()
 }
 
 func TestLargeMessageSuspension(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, suspended)
+	server, ct, cancelsvr := setUp(t, 0, math.MaxUint32, suspended)
+	defer cancelsvr()
 	callHdr := &CallHdr{
 		Host:   "localhost",
 		Method: "foo.Large",
@@ -1061,85 +1160,101 @@ func TestLargeMessageSuspension(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to open stream: %v", err)
 	}
+	// Launch a goroutine simillar to the stream monitoring goroutine in
+	// stream.go to keep track of context timeout and call CloseStream.
+	go func() {
+		<-ctx.Done()
+		ct.CloseStream(s, ContextErr(ctx.Err()))
+	}()
 	// Write should not be done successfully due to flow control.
 	msg := make([]byte, initialWindowSize*8)
-	err = ct.Write(s, nil, msg, &Options{Last: true, Delay: false})
-	expectedErr := streamErrorf(codes.DeadlineExceeded, "%v", context.DeadlineExceeded)
-	if err != expectedErr {
-		t.Fatalf("Write got %v, want %v", err, expectedErr)
+	ct.Write(s, nil, msg, &Options{})
+	err = ct.Write(s, nil, msg, &Options{Last: true})
+	if err != errStreamDone {
+		t.Fatalf("Write got %v, want io.EOF", err)
+	}
+	expectedErr := status.Error(codes.DeadlineExceeded, context.DeadlineExceeded.Error())
+	if _, err := s.Read(make([]byte, 8)); err.Error() != expectedErr.Error() {
+		t.Fatalf("Read got %v of type %T, want %v", err, err, expectedErr)
 	}
 	ct.Close()
 	server.stop()
 }
 
 func TestMaxStreams(t *testing.T) {
-	server, ct := setUp(t, 0, 1, suspended)
+	serverConfig := &ServerConfig{
+		MaxStreams: 1,
+	}
+	server, ct, cancel := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{}, func() {})
+	defer cancel()
+	defer ct.Close()
+	defer server.stop()
 	callHdr := &CallHdr{
 		Host:   "localhost",
 		Method: "foo.Large",
 	}
-	// Have a pending stream which takes all streams quota.
 	s, err := ct.NewStream(context.Background(), callHdr)
 	if err != nil {
 		t.Fatalf("Failed to open stream: %v", err)
 	}
-	cc, ok := ct.(*http2Client)
-	if !ok {
-		t.Fatalf("Failed to convert %v to *http2Client", ct)
-	}
-	done := make(chan struct{})
-	ch := make(chan int)
-	ready := make(chan struct{})
-	go func() {
-		for {
-			select {
-			case <-time.After(5 * time.Millisecond):
-				select {
-				case ch <- 0:
-				case <-ready:
-					return
-				}
-			case <-time.After(5 * time.Second):
-				close(done)
-				return
-			case <-ready:
-				return
-			}
-		}
-	}()
-	// Test these conditions until they pass or
-	// we reach the deadline (failure case).
+	// Keep creating streams until one fails with deadline exceeded, marking the application
+	// of server settings on client.
+	slist := []*Stream{}
+	pctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	timer := time.NewTimer(time.Second * 10)
+	expectedErr := status.Error(codes.DeadlineExceeded, context.DeadlineExceeded.Error())
 	for {
 		select {
-		case <-ch:
-		case <-done:
-			t.Fatalf("streamsQuota.quota shouldn't be non-zero.")
+		case <-timer.C:
+			t.Fatalf("Test timeout: client didn't receive server settings.")
+		default:
 		}
-		cc.streamsQuota.mu.Lock()
-		sq := cc.streamsQuota.quota
-		cc.streamsQuota.mu.Unlock()
-		if sq == 0 {
-			break
+		ctx, cancel := context.WithDeadline(pctx, time.Now().Add(time.Second))
+		// This is only to get rid of govet. All these context are based on a base
+		// context which is canceled at the end of the test.
+		defer cancel()
+		if str, err := ct.NewStream(ctx, callHdr); err == nil {
+			slist = append(slist, str)
+			continue
+		} else if err.Error() != expectedErr.Error() {
+			t.Fatalf("ct.NewStream(_,_) = _, %v, want _, %v", err, expectedErr)
 		}
+		timer.Stop()
+		break
 	}
-	close(ready)
-	// Close the pending stream so that the streams quota becomes available for the next new stream.
-	ct.CloseStream(s, nil)
-	cc.streamsQuota.mu.Lock()
-	i := cc.streamsQuota.quota
-	cc.streamsQuota.mu.Unlock()
-	if i != 1 {
-		t.Fatalf("streamsQuota is  %d, want 1.", i)
+	done := make(chan struct{})
+	// Try and create a new stream.
+	go func() {
+		defer close(done)
+		ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(time.Second*10))
+		defer cancel()
+		if _, err := ct.NewStream(ctx, callHdr); err != nil {
+			t.Errorf("Failed to open stream: %v", err)
+		}
+	}()
+	// Close all the extra streams created and make sure the new stream is not created.
+	for _, str := range slist {
+		ct.CloseStream(str, nil)
 	}
-	if _, err := ct.NewStream(context.Background(), callHdr); err != nil {
-		t.Fatalf("Failed to open stream: %v", err)
+	select {
+	case <-done:
+		t.Fatalf("Test failed: didn't expect new stream to be created just yet.")
+	default:
 	}
+	// Close the first stream created so that the new stream can finally be created.
+	ct.CloseStream(s, nil)
+	<-done
 	ct.Close()
-	server.stop()
+	<-ct.writerDone
+	if ct.maxConcurrentStreams != 1 {
+		t.Fatalf("ct.maxConcurrentStreams: %d, want 1", ct.maxConcurrentStreams)
+	}
 }
 
 func TestServerContextCanceledOnClosedConnection(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, suspended)
+	server, ct, cancel := setUp(t, 0, math.MaxUint32, suspended)
+	defer cancel()
 	callHdr := &CallHdr{
 		Host:   "localhost",
 		Method: "foo",
@@ -1163,15 +1278,17 @@ func TestServerContextCanceledOnClosedConnection(t *testing.T) {
 		server.mu.Unlock()
 		break
 	}
-	cc, ok := ct.(*http2Client)
-	if !ok {
-		t.Fatalf("Failed to convert %v to *http2Client", ct)
-	}
 	s, err := ct.NewStream(context.Background(), callHdr)
 	if err != nil {
 		t.Fatalf("Failed to open stream: %v", err)
 	}
-	cc.controlBuf.put(&dataFrame{s.id, false, make([]byte, http2MaxFrameLen), func() {}})
+	ct.controlBuf.put(&dataFrame{
+		streamID:    s.id,
+		endStream:   false,
+		h:           nil,
+		d:           make([]byte, http2MaxFrameLen),
+		onEachWrite: func() {},
+	})
 	// Loop until the server side stream is created.
 	var ss *Stream
 	for {
@@ -1185,7 +1302,7 @@ func TestServerContextCanceledOnClosedConnection(t *testing.T) {
 		sc.mu.Unlock()
 		break
 	}
-	cc.Close()
+	ct.Close()
 	select {
 	case <-ss.Context().Done():
 		if ss.Context().Err() != context.Canceled {
@@ -1202,7 +1319,8 @@ func TestClientConnDecoupledFromApplicationRead(t *testing.T) {
 		InitialWindowSize:     defaultWindowSize,
 		InitialConnWindowSize: defaultWindowSize,
 	}
-	server, client := setUpWithOptions(t, 0, &ServerConfig{}, notifyCall, connectOptions)
+	server, client, cancel := setUpWithOptions(t, 0, &ServerConfig{}, notifyCall, connectOptions, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 
@@ -1224,7 +1342,7 @@ func TestClientConnDecoupledFromApplicationRead(t *testing.T) {
 	notifyChan := make(chan struct{})
 	server.h.notify = notifyChan
 	server.mu.Unlock()
-	cstream1, err := client.NewStream(context.Background(), &CallHdr{Flush: true})
+	cstream1, err := client.NewStream(context.Background(), &CallHdr{})
 	if err != nil {
 		t.Fatalf("Client failed to create first stream. Err: %v", err)
 	}
@@ -1251,7 +1369,7 @@ func TestClientConnDecoupledFromApplicationRead(t *testing.T) {
 	server.h.notify = notifyChan
 	server.mu.Unlock()
 	// Create another stream on client.
-	cstream2, err := client.NewStream(context.Background(), &CallHdr{Flush: true})
+	cstream2, err := client.NewStream(context.Background(), &CallHdr{})
 	if err != nil {
 		t.Fatalf("Client failed to create second stream. Err: %v", err)
 	}
@@ -1288,7 +1406,8 @@ func TestServerConnDecoupledFromApplicationRead(t *testing.T) {
 		InitialWindowSize:     defaultWindowSize,
 		InitialConnWindowSize: defaultWindowSize,
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{})
+	server, client, cancel := setUpWithOptions(t, 0, serverConfig, suspended, ConnectOptions{}, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 	waitWhileTrue(t, func() (bool, error) {
@@ -1306,7 +1425,7 @@ func TestServerConnDecoupledFromApplicationRead(t *testing.T) {
 		st = k.(*http2Server)
 	}
 	server.mu.Unlock()
-	cstream1, err := client.NewStream(context.Background(), &CallHdr{Flush: true})
+	cstream1, err := client.NewStream(context.Background(), &CallHdr{})
 	if err != nil {
 		t.Fatalf("Failed to create 1st stream. Err: %v", err)
 	}
@@ -1315,7 +1434,7 @@ func TestServerConnDecoupledFromApplicationRead(t *testing.T) {
 		t.Fatalf("Client failed to write data. Err: %v", err)
 	}
 	//Client should be able to create another stream and send data on it.
-	cstream2, err := client.NewStream(context.Background(), &CallHdr{Flush: true})
+	cstream2, err := client.NewStream(context.Background(), &CallHdr{})
 	if err != nil {
 		t.Fatalf("Failed to create 2nd stream. Err: %v", err)
 	}
@@ -1340,18 +1459,6 @@ func TestServerConnDecoupledFromApplicationRead(t *testing.T) {
 		}
 	}
 	st.mu.Unlock()
-	// Trying to write more on a max-ed out stream should result in a RST_STREAM from the server.
-	ct := client.(*http2Client)
-	ct.controlBuf.put(&dataFrame{cstream2.id, true, make([]byte, 1), func() {}})
-	code := http2ErrConvTab[http2.ErrCodeFlowControl]
-	waitWhileTrue(t, func() (bool, error) {
-		cstream2.mu.Lock()
-		defer cstream2.mu.Unlock()
-		if cstream2.status.Code() != code {
-			return true, fmt.Errorf("want code = %v, got %v", code, cstream2.status.Code())
-		}
-		return false, nil
-	})
 	// Reading from the stream on server should succeed.
 	if _, err := sstream1.Read(make([]byte, defaultWindowSize)); err != nil {
 		t.Fatalf("_.Read(_) = %v, want <nil>", err)
@@ -1364,142 +1471,197 @@ func TestServerConnDecoupledFromApplicationRead(t *testing.T) {
 }
 
 func TestServerWithMisbehavedClient(t *testing.T) {
-	serverConfig := &ServerConfig{
-		InitialWindowSize:     defaultWindowSize,
-		InitialConnWindowSize: defaultWindowSize,
+	server := setUpServerOnly(t, 0, &ServerConfig{}, suspended)
+	defer server.stop()
+	// Create a client that can override server stream quota.
+	mconn, err := net.Dial("tcp", server.lis.Addr().String())
+	if err != nil {
+		t.Fatalf("Clent failed to dial:%v", err)
 	}
-	connectOptions := ConnectOptions{
-		InitialWindowSize:     defaultWindowSize,
-		InitialConnWindowSize: defaultWindowSize,
+	defer mconn.Close()
+	if err := mconn.SetWriteDeadline(time.Now().Add(time.Second * 10)); err != nil {
+		t.Fatalf("Failed to set write deadline: %v", err)
 	}
-	server, ct := setUpWithOptions(t, 0, serverConfig, suspended, connectOptions)
-	callHdr := &CallHdr{
-		Host:   "localhost",
-		Method: "foo",
+	if n, err := mconn.Write(clientPreface); err != nil || n != len(clientPreface) {
+		t.Fatalf("mconn.Write(clientPreface) = %d, %v, want %d, <nil>", n, err, len(clientPreface))
 	}
-	var sc *http2Server
-	// Wait until the server transport is setup.
-	for {
-		server.mu.Lock()
-		if len(server.conns) == 0 {
-			server.mu.Unlock()
-			time.Sleep(time.Millisecond)
-			continue
-		}
-		for k := range server.conns {
-			var ok bool
-			sc, ok = k.(*http2Server)
-			if !ok {
-				t.Fatalf("Failed to convert %v to *http2Server", k)
+	// success chan indicates that reader received a RSTStream from server.
+	success := make(chan struct{})
+	var mu sync.Mutex
+	framer := http2.NewFramer(mconn, mconn)
+	if err := framer.WriteSettings(); err != nil {
+		t.Fatalf("Error while writing settings: %v", err)
+	}
+	go func() { // Launch a reader for this misbehaving client.
+		for {
+			frame, err := framer.ReadFrame()
+			if err != nil {
+				return
+			}
+			switch frame := frame.(type) {
+			case *http2.PingFrame:
+				// Write ping ack back so that server's BDP estimation works right.
+				mu.Lock()
+				framer.WritePing(true, frame.Data)
+				mu.Unlock()
+			case *http2.RSTStreamFrame:
+				if frame.Header().StreamID != 1 || http2.ErrCode(frame.ErrCode) != http2.ErrCodeFlowControl {
+					t.Errorf("RST stream received with streamID: %d and code: %v, want streamID: 1 and code: http2.ErrCodeFlowControl", frame.Header().StreamID, http2.ErrCode(frame.ErrCode))
+				}
+				close(success)
+				return
+			default:
+				// Do nothing.
 			}
+
 		}
-		server.mu.Unlock()
-		break
+	}()
+	// Create a stream.
+	var buf bytes.Buffer
+	henc := hpack.NewEncoder(&buf)
+	// TODO(mmukhi): Remove unnecessary fields.
+	if err := henc.WriteField(hpack.HeaderField{Name: ":method", Value: "POST"}); err != nil {
+		t.Fatalf("Error while encoding header: %v", err)
 	}
-	cc, ok := ct.(*http2Client)
-	if !ok {
-		t.Fatalf("Failed to convert %v to *http2Client", ct)
+	if err := henc.WriteField(hpack.HeaderField{Name: ":path", Value: "foo"}); err != nil {
+		t.Fatalf("Error while encoding header: %v", err)
 	}
-	// Test server behavior for violation of stream flow control window size restriction.
-	s, err := ct.NewStream(context.Background(), callHdr)
-	if err != nil {
-		t.Fatalf("Failed to open stream: %v", err)
+	if err := henc.WriteField(hpack.HeaderField{Name: ":authority", Value: "localhost"}); err != nil {
+		t.Fatalf("Error while encoding header: %v", err)
 	}
-	var sent int
-	// Drain the stream flow control window
-	cc.controlBuf.put(&dataFrame{s.id, false, make([]byte, http2MaxFrameLen), func() {}})
-	sent += http2MaxFrameLen
-	// Wait until the server creates the corresponding stream and receive some data.
-	var ss *Stream
+	if err := henc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"}); err != nil {
+		t.Fatalf("Error while encoding header: %v", err)
+	}
+	mu.Lock()
+	if err := framer.WriteHeaders(http2.HeadersFrameParam{StreamID: 1, BlockFragment: buf.Bytes(), EndHeaders: true}); err != nil {
+		mu.Unlock()
+		t.Fatalf("Error while writing headers: %v", err)
+	}
+	mu.Unlock()
+
+	// Test server behavior for violation of stream flow control window size restriction.
+	timer := time.NewTimer(time.Second * 5)
+	dbuf := make([]byte, http2MaxFrameLen)
 	for {
-		time.Sleep(time.Millisecond)
-		sc.mu.Lock()
-		if len(sc.activeStreams) == 0 {
-			sc.mu.Unlock()
-			continue
+		select {
+		case <-timer.C:
+			t.Fatalf("Test timed out.")
+		case <-success:
+			return
+		default:
 		}
-		ss = sc.activeStreams[s.id]
-		sc.mu.Unlock()
-		ss.fc.mu.Lock()
-		if ss.fc.pendingData > 0 {
-			ss.fc.mu.Unlock()
-			break
+		mu.Lock()
+		if err := framer.WriteData(1, false, dbuf); err != nil {
+			mu.Unlock()
+			// Error here means the server could have closed the connection due to flow control
+			// violation. Make sure that is the case by waiting for success chan to be closed.
+			select {
+			case <-timer.C:
+				t.Fatalf("Error while writing data: %v", err)
+			case <-success:
+				return
+			}
 		}
-		ss.fc.mu.Unlock()
-	}
-	if ss.fc.pendingData != http2MaxFrameLen || ss.fc.pendingUpdate != 0 || sc.fc.pendingData != 0 || sc.fc.pendingUpdate != 0 {
-		t.Fatalf("Server mistakenly updates inbound flow control params: got %d, %d, %d, %d; want %d, %d, %d, %d", ss.fc.pendingData, ss.fc.pendingUpdate, sc.fc.pendingData, sc.fc.pendingUpdate, http2MaxFrameLen, 0, 0, 0)
-	}
-	// Keep sending until the server inbound window is drained for that stream.
-	for sent <= initialWindowSize {
-		cc.controlBuf.put(&dataFrame{s.id, false, make([]byte, 1), func() {}})
-		sent++
-	}
-	// Server sent a resetStream for s already.
-	code := http2ErrConvTab[http2.ErrCodeFlowControl]
-	if _, err := s.Read(make([]byte, 1)); err != io.EOF {
-		t.Fatalf("%v got err %v want <EOF>", s, err)
+		mu.Unlock()
+		// This for loop is capable of hogging the CPU and cause starvation
+		// in Go versions prior to 1.9,
+		// in single CPU environment. Explicitly relinquish processor.
+		runtime.Gosched()
 	}
-	if s.status.Code() != code {
-		t.Fatalf("%v got status %v; want Code=%v", s, s.status, code)
-	}
-
-	ct.CloseStream(s, nil)
-	ct.Close()
-	server.stop()
 }
 
 func TestClientWithMisbehavedServer(t *testing.T) {
-	// Turn off BDP estimation so that the server can
-	// violate stream window.
-	connectOptions := ConnectOptions{
-		InitialWindowSize: initialWindowSize,
-	}
-	server, ct := setUpWithOptions(t, 0, &ServerConfig{}, misbehaved, connectOptions)
-	callHdr := &CallHdr{
-		Host:   "localhost",
-		Method: "foo.Stream",
-	}
-	conn, ok := ct.(*http2Client)
-	if !ok {
-		t.Fatalf("Failed to convert %v to *http2Client", ct)
-	}
-	// Test the logic for the violation of stream flow control window size restriction.
-	s, err := ct.NewStream(context.Background(), callHdr)
+	// Create a misbehaving server.
+	lis, err := net.Listen("tcp", "localhost:0")
 	if err != nil {
-		t.Fatalf("Failed to open stream: %v", err)
-	}
-	d := make([]byte, 1)
-	if err := ct.Write(s, nil, d, &Options{Last: true, Delay: false}); err != nil && err != io.EOF {
-		t.Fatalf("Failed to write: %v", err)
-	}
-	// Read without window update.
-	for {
-		p := make([]byte, http2MaxFrameLen)
-		if _, err = s.trReader.(*transportReader).reader.Read(p); err != nil {
-			break
+		t.Fatalf("Error while listening: %v", err)
+	}
+	defer lis.Close()
+	// success chan indicates that the server received
+	// RSTStream from the client.
+	success := make(chan struct{})
+	go func() { // Launch the misbehaving server.
+		sconn, err := lis.Accept()
+		if err != nil {
+			t.Errorf("Error while accepting: %v", err)
+			return
 		}
+		defer sconn.Close()
+		if _, err := io.ReadFull(sconn, make([]byte, len(clientPreface))); err != nil {
+			t.Errorf("Error while reading clieng preface: %v", err)
+			return
+		}
+		sfr := http2.NewFramer(sconn, sconn)
+		if err := sfr.WriteSettingsAck(); err != nil {
+			t.Errorf("Error while writing settings: %v", err)
+			return
+		}
+		var mu sync.Mutex
+		for {
+			frame, err := sfr.ReadFrame()
+			if err != nil {
+				return
+			}
+			switch frame := frame.(type) {
+			case *http2.HeadersFrame:
+				// When the client creates a stream, violate the stream flow control.
+				go func() {
+					buf := make([]byte, http2MaxFrameLen)
+					for {
+						mu.Lock()
+						if err := sfr.WriteData(1, false, buf); err != nil {
+							mu.Unlock()
+							return
+						}
+						mu.Unlock()
+						// This for loop is capable of hogging the CPU and cause starvation
+						// in Go versions prior to 1.9,
+						// in single CPU environment. Explicitly relinquish processor.
+						runtime.Gosched()
+					}
+				}()
+			case *http2.RSTStreamFrame:
+				if frame.Header().StreamID != 1 || http2.ErrCode(frame.ErrCode) != http2.ErrCodeFlowControl {
+					t.Errorf("RST stream received with streamID: %d and code: %v, want streamID: 1 and code: http2.ErrCodeFlowControl", frame.Header().StreamID, http2.ErrCode(frame.ErrCode))
+				}
+				close(success)
+				return
+			case *http2.PingFrame:
+				mu.Lock()
+				sfr.WritePing(true, frame.Data)
+				mu.Unlock()
+			default:
+			}
+		}
+	}()
+	connectCtx, cancel := context.WithDeadline(context.Background(), time.Now().Add(2*time.Second))
+	defer cancel()
+	ct, err := NewClientTransport(connectCtx, context.Background(), TargetInfo{Addr: lis.Addr().String()}, ConnectOptions{}, func() {})
+	if err != nil {
+		t.Fatalf("Error while creating client transport: %v", err)
 	}
-	if s.fc.pendingData <= initialWindowSize || s.fc.pendingUpdate != 0 || conn.fc.pendingData != 0 || conn.fc.pendingUpdate != 0 {
-		t.Fatalf("Client mistakenly updates inbound flow control params: got %d, %d, %d, %d; want >%d, %d, %d, >%d", s.fc.pendingData, s.fc.pendingUpdate, conn.fc.pendingData, conn.fc.pendingUpdate, initialWindowSize, 0, 0, 0)
-	}
-
-	if err != io.EOF {
-		t.Fatalf("Got err %v, want <EOF>", err)
+	defer ct.Close()
+	str, err := ct.NewStream(context.Background(), &CallHdr{})
+	if err != nil {
+		t.Fatalf("Error while creating stream: %v", err)
 	}
-	if s.status.Code() != codes.Internal {
-		t.Fatalf("Got s.status %v, want s.status.Code()=Internal", s.status)
+	timer := time.NewTimer(time.Second * 5)
+	go func() { // This go routine mimics the one in stream.go to call CloseStream.
+		<-str.Done()
+		ct.CloseStream(str, nil)
+	}()
+	select {
+	case <-timer.C:
+		t.Fatalf("Test timed-out.")
+	case <-success:
 	}
-
-	conn.CloseStream(s, err)
-	ct.Close()
-	server.stop()
 }
 
 var encodingTestStatus = status.New(codes.Internal, "\n")
 
 func TestEncodingRequiredStatus(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, encodingRequiredStatus)
+	server, ct, cancel := setUp(t, 0, math.MaxUint32, encodingRequiredStatus)
+	defer cancel()
 	callHdr := &CallHdr{
 		Host:   "localhost",
 		Method: "foo",
@@ -1508,11 +1670,8 @@ func TestEncodingRequiredStatus(t *testing.T) {
 	if err != nil {
 		return
 	}
-	opts := Options{
-		Last:  true,
-		Delay: false,
-	}
-	if err := ct.Write(s, nil, expectedRequest, &opts); err != nil && err != io.EOF {
+	opts := Options{Last: true}
+	if err := ct.Write(s, nil, expectedRequest, &opts); err != nil && err != errStreamDone {
 		t.Fatalf("Failed to write the request: %v", err)
 	}
 	p := make([]byte, http2MaxFrameLen)
@@ -1527,7 +1686,8 @@ func TestEncodingRequiredStatus(t *testing.T) {
 }
 
 func TestInvalidHeaderField(t *testing.T) {
-	server, ct := setUp(t, 0, math.MaxUint32, invalidHeaderField)
+	server, ct, cancel := setUp(t, 0, math.MaxUint32, invalidHeaderField)
+	defer cancel()
 	callHdr := &CallHdr{
 		Host:   "localhost",
 		Method: "foo",
@@ -1536,31 +1696,15 @@ func TestInvalidHeaderField(t *testing.T) {
 	if err != nil {
 		return
 	}
-	opts := Options{
-		Last:  true,
-		Delay: false,
-	}
-	if err := ct.Write(s, nil, expectedRequest, &opts); err != nil && err != io.EOF {
-		t.Fatalf("Failed to write the request: %v", err)
-	}
 	p := make([]byte, http2MaxFrameLen)
 	_, err = s.trReader.(*transportReader).Read(p)
-	if se, ok := err.(StreamError); !ok || se.Code != codes.FailedPrecondition || !strings.Contains(err.Error(), expectedInvalidHeaderField) {
-		t.Fatalf("Read got error %v, want error with code %s and contains %q", err, codes.FailedPrecondition, expectedInvalidHeaderField)
+	if se, ok := status.FromError(err); !ok || se.Code() != codes.Internal || !strings.Contains(err.Error(), expectedInvalidHeaderField) {
+		t.Fatalf("Read got error %v, want error with code %s and contains %q", err, codes.Internal, expectedInvalidHeaderField)
 	}
 	ct.Close()
 	server.stop()
 }
 
-func TestStreamContext(t *testing.T) {
-	expectedStream := &Stream{}
-	ctx := newContextWithStream(context.Background(), expectedStream)
-	s, ok := StreamFromContext(ctx)
-	if !ok || expectedStream != s {
-		t.Fatalf("GetStreamFromContext(%v) = %v, %t, want: %v, true", ctx, s, ok, expectedStream)
-	}
-}
-
 func TestIsReservedHeader(t *testing.T) {
 	tests := []struct {
 		h    string
@@ -1569,6 +1713,8 @@ func TestIsReservedHeader(t *testing.T) {
 		{"", false}, // but should be rejected earlier
 		{"foo", false},
 		{"content-type", true},
+		{"user-agent", true},
+		{":anything", true},
 		{"grpc-message-type", true},
 		{"grpc-encoding", true},
 		{"grpc-message", true},
@@ -1589,13 +1735,13 @@ func TestContextErr(t *testing.T) {
 		// input
 		errIn error
 		// outputs
-		errOut StreamError
+		errOut error
 	}{
-		{context.DeadlineExceeded, StreamError{codes.DeadlineExceeded, context.DeadlineExceeded.Error()}},
-		{context.Canceled, StreamError{codes.Canceled, context.Canceled.Error()}},
+		{context.DeadlineExceeded, status.Error(codes.DeadlineExceeded, context.DeadlineExceeded.Error())},
+		{context.Canceled, status.Error(codes.Canceled, context.Canceled.Error())},
 	} {
 		err := ContextErr(test.errIn)
-		if err != test.errOut {
+		if err.Error() != test.errOut.Error() {
 			t.Fatalf("ContextErr{%v} = %v \nwant %v", test.errIn, err, test.errOut)
 		}
 	}
@@ -1622,7 +1768,7 @@ func TestAccountCheckWindowSizeWithLargeWindow(t *testing.T) {
 		clientStream: 6 * 1024 * 1024,
 		clientConn:   8 * 1024 * 1024,
 	}
-	testAccountCheckWindowSize(t, wc)
+	testFlowControlAccountCheck(t, 1024*1024, wc)
 }
 
 func TestAccountCheckWindowSizeWithSmallWindow(t *testing.T) {
@@ -1633,28 +1779,35 @@ func TestAccountCheckWindowSizeWithSmallWindow(t *testing.T) {
 		clientStream: defaultWindowSize,
 		clientConn:   defaultWindowSize,
 	}
-	testAccountCheckWindowSize(t, wc)
+	testFlowControlAccountCheck(t, 1024*1024, wc)
 }
 
-func testAccountCheckWindowSize(t *testing.T, wc windowSizeConfig) {
-	serverConfig := &ServerConfig{
+func TestAccountCheckDynamicWindowSmallMessage(t *testing.T) {
+	testFlowControlAccountCheck(t, 1024, windowSizeConfig{})
+}
+
+func TestAccountCheckDynamicWindowLargeMessage(t *testing.T) {
+	testFlowControlAccountCheck(t, 1024*1024, windowSizeConfig{})
+}
+
+func testFlowControlAccountCheck(t *testing.T, msgSize int, wc windowSizeConfig) {
+	sc := &ServerConfig{
 		InitialWindowSize:     wc.serverStream,
 		InitialConnWindowSize: wc.serverConn,
 	}
-	connectOptions := ConnectOptions{
+	co := ConnectOptions{
 		InitialWindowSize:     wc.clientStream,
 		InitialConnWindowSize: wc.clientConn,
 	}
-	server, client := setUpWithOptions(t, 0, serverConfig, suspended, connectOptions)
+	server, client, cancel := setUpWithOptions(t, 0, sc, pingpong, co, func() {})
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
-
-	// Wait for server conns to be populated with new server transport.
 	waitWhileTrue(t, func() (bool, error) {
 		server.mu.Lock()
 		defer server.mu.Unlock()
 		if len(server.conns) == 0 {
-			return true, fmt.Errorf("timed out waiting for server transport to be created")
+			return true, fmt.Errorf("timed out while waiting for server transport to be created")
 		}
 		return false, nil
 	})
@@ -1664,289 +1817,97 @@ func testAccountCheckWindowSize(t *testing.T, wc windowSizeConfig) {
 		st = k.(*http2Server)
 	}
 	server.mu.Unlock()
-	ct := client.(*http2Client)
-	cstream, err := client.NewStream(context.Background(), &CallHdr{Flush: true})
-	if err != nil {
-		t.Fatalf("Failed to create stream. Err: %v", err)
-	}
-	// Wait for server to receive headers.
-	waitWhileTrue(t, func() (bool, error) {
-		st.mu.Lock()
-		defer st.mu.Unlock()
-		if len(st.activeStreams) == 0 {
-			return true, fmt.Errorf("timed out waiting for server to receive headers")
-		}
-		return false, nil
-	})
-	// Sleeping to make sure the settings are applied in case of negative test.
-	time.Sleep(time.Second)
-
-	waitWhileTrue(t, func() (bool, error) {
-		st.fc.mu.Lock()
-		lim := st.fc.limit
-		st.fc.mu.Unlock()
-		if lim != uint32(serverConfig.InitialConnWindowSize) {
-			return true, fmt.Errorf("Server transport flow control window size: got %v, want %v", lim, serverConfig.InitialConnWindowSize)
+	const numStreams = 10
+	clientStreams := make([]*Stream, numStreams)
+	for i := 0; i < numStreams; i++ {
+		var err error
+		clientStreams[i], err = client.NewStream(context.Background(), &CallHdr{})
+		if err != nil {
+			t.Fatalf("Failed to create stream. Err: %v", err)
 		}
-		return false, nil
-	})
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-	serverSendQuota, _, err := st.sendQuotaPool.get(math.MaxInt32, waiters{
-		ctx:    ctx,
-		tctx:   st.ctx,
-		done:   nil,
-		goAway: nil,
-	})
-	if err != nil {
-		t.Fatalf("Error while acquiring sendQuota on server. Err: %v", err)
 	}
-	cancel()
-	st.sendQuotaPool.add(serverSendQuota)
-	if serverSendQuota != int(connectOptions.InitialConnWindowSize) {
-		t.Fatalf("Server send quota(%v) not equal to client's window size(%v) on conn.", serverSendQuota, connectOptions.InitialConnWindowSize)
+	var wg sync.WaitGroup
+	// For each stream send pingpong messages to the server.
+	for _, stream := range clientStreams {
+		wg.Add(1)
+		go func(stream *Stream) {
+			defer wg.Done()
+			buf := make([]byte, msgSize+5)
+			buf[0] = byte(0)
+			binary.BigEndian.PutUint32(buf[1:], uint32(msgSize))
+			opts := Options{}
+			header := make([]byte, 5)
+			for i := 1; i <= 10; i++ {
+				if err := client.Write(stream, nil, buf, &opts); err != nil {
+					t.Errorf("Error on client while writing message: %v", err)
+					return
+				}
+				if _, err := stream.Read(header); err != nil {
+					t.Errorf("Error on client while reading data frame header: %v", err)
+					return
+				}
+				sz := binary.BigEndian.Uint32(header[1:])
+				recvMsg := make([]byte, int(sz))
+				if _, err := stream.Read(recvMsg); err != nil {
+					t.Errorf("Error on client while reading data: %v", err)
+					return
+				}
+				if len(recvMsg) != msgSize {
+					t.Errorf("Length of message received by client: %v, want: %v", len(recvMsg), msgSize)
+					return
+				}
+			}
+		}(stream)
 	}
+	wg.Wait()
+	serverStreams := map[uint32]*Stream{}
+	loopyClientStreams := map[uint32]*outStream{}
+	loopyServerStreams := map[uint32]*outStream{}
+	// Get all the streams from server reader and writer and client writer.
 	st.mu.Lock()
-	ssq := st.streamSendQuota
-	st.mu.Unlock()
-	if ssq != uint32(connectOptions.InitialWindowSize) {
-		t.Fatalf("Server stream send quota(%v) not equal to client's window size(%v) on stream.", ssq, connectOptions.InitialWindowSize)
-	}
-	ct.fc.mu.Lock()
-	limit := ct.fc.limit
-	ct.fc.mu.Unlock()
-	if limit != uint32(connectOptions.InitialConnWindowSize) {
-		t.Fatalf("Client transport flow control window size is %v, want %v", limit, connectOptions.InitialConnWindowSize)
-	}
-	ctx, cancel = context.WithTimeout(context.Background(), time.Second)
-	clientSendQuota, _, err := ct.sendQuotaPool.get(math.MaxInt32, waiters{
-		ctx:    ctx,
-		tctx:   ct.ctx,
-		done:   nil,
-		goAway: nil,
-	})
-	if err != nil {
-		t.Fatalf("Error while acquiring sendQuota on client. Err: %v", err)
-	}
-	cancel()
-	ct.sendQuotaPool.add(clientSendQuota)
-	if clientSendQuota != int(serverConfig.InitialConnWindowSize) {
-		t.Fatalf("Client send quota(%v) not equal to server's window size(%v) on conn.", clientSendQuota, serverConfig.InitialConnWindowSize)
-	}
-	ct.mu.Lock()
-	ssq = ct.streamSendQuota
-	ct.mu.Unlock()
-	if ssq != uint32(serverConfig.InitialWindowSize) {
-		t.Fatalf("Client stream send quota(%v) not equal to server's window size(%v) on stream.", ssq, serverConfig.InitialWindowSize)
-	}
-	cstream.fc.mu.Lock()
-	limit = cstream.fc.limit
-	cstream.fc.mu.Unlock()
-	if limit != uint32(connectOptions.InitialWindowSize) {
-		t.Fatalf("Client stream flow control window size is %v, want %v", limit, connectOptions.InitialWindowSize)
-	}
-	var sstream *Stream
-	st.mu.Lock()
-	for _, v := range st.activeStreams {
-		sstream = v
+	for _, stream := range clientStreams {
+		id := stream.id
+		serverStreams[id] = st.activeStreams[id]
+		loopyServerStreams[id] = st.loopy.estdStreams[id]
+		loopyClientStreams[id] = client.loopy.estdStreams[id]
+
 	}
 	st.mu.Unlock()
-	sstream.fc.mu.Lock()
-	limit = sstream.fc.limit
-	sstream.fc.mu.Unlock()
-	if limit != uint32(serverConfig.InitialWindowSize) {
-		t.Fatalf("Server stream flow control window size is %v, want %v", limit, serverConfig.InitialWindowSize)
-	}
-}
-
-// Check accounting on both sides after sending and receiving large messages.
-func TestAccountCheckExpandingWindow(t *testing.T) {
-	server, client := setUp(t, 0, 0, pingpong)
-	defer server.stop()
-	defer client.Close()
-	waitWhileTrue(t, func() (bool, error) {
-		server.mu.Lock()
-		defer server.mu.Unlock()
-		if len(server.conns) == 0 {
-			return true, fmt.Errorf("timed out while waiting for server transport to be created")
+	// Close all streams
+	for _, stream := range clientStreams {
+		client.Write(stream, nil, nil, &Options{Last: true})
+		if _, err := stream.Read(make([]byte, 5)); err != io.EOF {
+			t.Fatalf("Client expected an EOF from the server. Got: %v", err)
 		}
-		return false, nil
-	})
-	var st *http2Server
-	server.mu.Lock()
-	for k := range server.conns {
-		st = k.(*http2Server)
 	}
-	server.mu.Unlock()
-	ct := client.(*http2Client)
-	cstream, err := client.NewStream(context.Background(), &CallHdr{Flush: true})
-	if err != nil {
-		t.Fatalf("Failed to create stream. Err: %v", err)
-	}
-
-	msgSize := 65535 * 16 * 2
-	msg := make([]byte, msgSize)
-	buf := make([]byte, msgSize+5)
-	buf[0] = byte(0)
-	binary.BigEndian.PutUint32(buf[1:], uint32(msgSize))
-	copy(buf[5:], msg)
-	opts := Options{}
-	header := make([]byte, 5)
-	for i := 1; i <= 10; i++ {
-		if err := ct.Write(cstream, nil, buf, &opts); err != nil {
-			t.Fatalf("Error on client while writing message: %v", err)
-		}
-		if _, err := cstream.Read(header); err != nil {
-			t.Fatalf("Error on client while reading data frame header: %v", err)
-		}
-		sz := binary.BigEndian.Uint32(header[1:])
-		recvMsg := make([]byte, int(sz))
-		if _, err := cstream.Read(recvMsg); err != nil {
-			t.Fatalf("Error on client while reading data: %v", err)
+	// Close down both server and client so that their internals can be read without data
+	// races.
+	client.Close()
+	st.Close()
+	<-st.readerDone
+	<-st.writerDone
+	<-client.readerDone
+	<-client.writerDone
+	for _, cstream := range clientStreams {
+		id := cstream.id
+		sstream := serverStreams[id]
+		loopyServerStream := loopyServerStreams[id]
+		loopyClientStream := loopyClientStreams[id]
+		// Check stream flow control.
+		if int(cstream.fc.limit+cstream.fc.delta-cstream.fc.pendingData-cstream.fc.pendingUpdate) != int(st.loopy.oiws)-loopyServerStream.bytesOutStanding {
+			t.Fatalf("Account mismatch: client stream inflow limit(%d) + delta(%d) - pendingData(%d) - pendingUpdate(%d) != server outgoing InitialWindowSize(%d) - outgoingStream.bytesOutStanding(%d)", cstream.fc.limit, cstream.fc.delta, cstream.fc.pendingData, cstream.fc.pendingUpdate, st.loopy.oiws, loopyServerStream.bytesOutStanding)
 		}
-		if len(recvMsg) != len(msg) {
-			t.Fatalf("Length of message received by client: %v, want: %v", len(recvMsg), len(msg))
+		if int(sstream.fc.limit+sstream.fc.delta-sstream.fc.pendingData-sstream.fc.pendingUpdate) != int(client.loopy.oiws)-loopyClientStream.bytesOutStanding {
+			t.Fatalf("Account mismatch: server stream inflow limit(%d) + delta(%d) - pendingData(%d) - pendingUpdate(%d) != client outgoing InitialWindowSize(%d) - outgoingStream.bytesOutStanding(%d)", sstream.fc.limit, sstream.fc.delta, sstream.fc.pendingData, sstream.fc.pendingUpdate, client.loopy.oiws, loopyClientStream.bytesOutStanding)
 		}
 	}
-	defer func() {
-		ct.Write(cstream, nil, nil, &Options{Last: true}) // Close the stream.
-		if _, err := cstream.Read(header); err != io.EOF {
-			t.Fatalf("Client expected an EOF from the server. Got: %v", err)
-		}
-	}()
-	var sstream *Stream
-	st.mu.Lock()
-	for _, v := range st.activeStreams {
-		sstream = v
+	// Check transport flow control.
+	if client.fc.limit != client.fc.unacked+st.loopy.sendQuota {
+		t.Fatalf("Account mismatch: client transport inflow(%d) != client unacked(%d) + server sendQuota(%d)", client.fc.limit, client.fc.unacked, st.loopy.sendQuota)
+	}
+	if st.fc.limit != st.fc.unacked+client.loopy.sendQuota {
+		t.Fatalf("Account mismatch: server transport inflow(%d) != server unacked(%d) + client sendQuota(%d)", st.fc.limit, st.fc.unacked, client.loopy.sendQuota)
 	}
-	st.mu.Unlock()
-
-	waitWhileTrue(t, func() (bool, error) {
-		// Check that pendingData and delta on flow control windows on both sides are 0.
-		cstream.fc.mu.Lock()
-		if cstream.fc.delta != 0 {
-			cstream.fc.mu.Unlock()
-			return true, fmt.Errorf("delta on flow control window of client stream is non-zero")
-		}
-		if cstream.fc.pendingData != 0 {
-			cstream.fc.mu.Unlock()
-			return true, fmt.Errorf("pendingData on flow control window of client stream is non-zero")
-		}
-		cstream.fc.mu.Unlock()
-		sstream.fc.mu.Lock()
-		if sstream.fc.delta != 0 {
-			sstream.fc.mu.Unlock()
-			return true, fmt.Errorf("delta on flow control window of server stream is non-zero")
-		}
-		if sstream.fc.pendingData != 0 {
-			sstream.fc.mu.Unlock()
-			return true, fmt.Errorf("pendingData on flow control window of sercer stream is non-zero")
-		}
-		sstream.fc.mu.Unlock()
-		ct.fc.mu.Lock()
-		if ct.fc.delta != 0 {
-			ct.fc.mu.Unlock()
-			return true, fmt.Errorf("delta on flow control window of client transport is non-zero")
-		}
-		if ct.fc.pendingData != 0 {
-			ct.fc.mu.Unlock()
-			return true, fmt.Errorf("pendingData on flow control window of client transport is non-zero")
-		}
-		ct.fc.mu.Unlock()
-		st.fc.mu.Lock()
-		if st.fc.delta != 0 {
-			st.fc.mu.Unlock()
-			return true, fmt.Errorf("delta on flow control window of server transport is non-zero")
-		}
-		if st.fc.pendingData != 0 {
-			st.fc.mu.Unlock()
-			return true, fmt.Errorf("pendingData on flow control window of server transport is non-zero")
-		}
-		st.fc.mu.Unlock()
-
-		// Check flow conrtrol window on client stream is equal to out flow on server stream.
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-		serverStreamSendQuota, _, err := sstream.sendQuotaPool.get(math.MaxInt32, waiters{
-			ctx:    ctx,
-			tctx:   context.Background(),
-			done:   nil,
-			goAway: nil,
-		})
-		cancel()
-		if err != nil {
-			return true, fmt.Errorf("error while acquiring server stream send quota. Err: %v", err)
-		}
-		sstream.sendQuotaPool.add(serverStreamSendQuota)
-		cstream.fc.mu.Lock()
-		clientEst := cstream.fc.limit - cstream.fc.pendingUpdate
-		cstream.fc.mu.Unlock()
-		if uint32(serverStreamSendQuota) != clientEst {
-			return true, fmt.Errorf("server stream outflow: %v, estimated by client: %v", serverStreamSendQuota, clientEst)
-		}
-
-		// Check flow control window on server stream is equal to out flow on client stream.
-		ctx, cancel = context.WithTimeout(context.Background(), time.Second)
-		clientStreamSendQuota, _, err := cstream.sendQuotaPool.get(math.MaxInt32, waiters{
-			ctx:    ctx,
-			tctx:   context.Background(),
-			done:   nil,
-			goAway: nil,
-		})
-		cancel()
-		if err != nil {
-			return true, fmt.Errorf("error while acquiring client stream send quota. Err: %v", err)
-		}
-		cstream.sendQuotaPool.add(clientStreamSendQuota)
-		sstream.fc.mu.Lock()
-		serverEst := sstream.fc.limit - sstream.fc.pendingUpdate
-		sstream.fc.mu.Unlock()
-		if uint32(clientStreamSendQuota) != serverEst {
-			return true, fmt.Errorf("client stream outflow: %v. estimated by server: %v", clientStreamSendQuota, serverEst)
-		}
-
-		// Check flow control window on client transport is equal to out flow of server transport.
-		ctx, cancel = context.WithTimeout(context.Background(), time.Second)
-		serverTrSendQuota, _, err := st.sendQuotaPool.get(math.MaxInt32, waiters{
-			ctx:    ctx,
-			tctx:   st.ctx,
-			done:   nil,
-			goAway: nil,
-		})
-		cancel()
-		if err != nil {
-			return true, fmt.Errorf("error while acquring server transport send quota. Err: %v", err)
-		}
-		st.sendQuotaPool.add(serverTrSendQuota)
-		ct.fc.mu.Lock()
-		clientEst = ct.fc.limit - ct.fc.pendingUpdate
-		ct.fc.mu.Unlock()
-		if uint32(serverTrSendQuota) != clientEst {
-			return true, fmt.Errorf("server transport outflow: %v, estimated by client: %v", serverTrSendQuota, clientEst)
-		}
-
-		// Check flow control window on server transport is equal to out flow of client transport.
-		ctx, cancel = context.WithTimeout(context.Background(), time.Second)
-		clientTrSendQuota, _, err := ct.sendQuotaPool.get(math.MaxInt32, waiters{
-			ctx:    ctx,
-			tctx:   ct.ctx,
-			done:   nil,
-			goAway: nil,
-		})
-		cancel()
-		if err != nil {
-			return true, fmt.Errorf("error while acquiring client transport send quota. Err: %v", err)
-		}
-		ct.sendQuotaPool.add(clientTrSendQuota)
-		st.fc.mu.Lock()
-		serverEst = st.fc.limit - st.fc.pendingUpdate
-		st.fc.mu.Unlock()
-		if uint32(clientTrSendQuota) != serverEst {
-			return true, fmt.Errorf("client transport outflow: %v, estimated by client: %v", clientTrSendQuota, serverEst)
-		}
-
-		return false, nil
-	})
-
 }
 
 func waitWhileTrue(t *testing.T, condition func() (bool, error)) {
@@ -2031,10 +1992,9 @@ func (s *httpServer) start(t *testing.T, lis net.Listener) {
 			t.Errorf("Error accepting connection: %v", err)
 			return
 		}
-		defer s.conn.Close()
 		// Read preface sent by client.
 		if _, err = io.ReadFull(s.conn, make([]byte, len(http2.ClientPreface))); err != nil {
-			t.Errorf("Error at server-side while reading preface from cleint. Err: %v", err)
+			t.Errorf("Error at server-side while reading preface from client. Err: %v", err)
 			return
 		}
 		reader := bufio.NewReaderSize(s.conn, defaultWriteBufSize)
@@ -2071,7 +2031,7 @@ func (s *httpServer) cleanUp() {
 	}
 }
 
-func setUpHTTPStatusTest(t *testing.T, httpStatus int, wh writeHeaders) (stream *Stream, cleanUp func()) {
+func setUpHTTPStatusTest(t *testing.T, httpStatus int, wh writeHeaders) (stream *Stream, cleanUp func(), cancel func()) {
 	var (
 		err    error
 		lis    net.Listener
@@ -2103,13 +2063,14 @@ func setUpHTTPStatusTest(t *testing.T, httpStatus int, wh writeHeaders) (stream
 		wh:         wh,
 	}
 	server.start(t, lis)
-	connectCtx, cancel := context.WithDeadline(context.Background(), time.Now().Add(2*time.Second))
+	var connectCtx context.Context
+	connectCtx, cancel = context.WithDeadline(context.Background(), time.Now().Add(2*time.Second))
 	client, err = newHTTP2Client(connectCtx, context.Background(), TargetInfo{Addr: lis.Addr().String()}, ConnectOptions{}, func() {})
 	if err != nil {
 		cancel() // Do not cancel in success path.
 		t.Fatalf("Error creating client. Err: %v", err)
 	}
-	stream, err = client.NewStream(context.Background(), &CallHdr{Method: "bogus/method", Flush: true})
+	stream, err = client.NewStream(context.Background(), &CallHdr{Method: "bogus/method"})
 	if err != nil {
 		t.Fatalf("Error creating stream at client-side. Err: %v", err)
 	}
@@ -2123,7 +2084,8 @@ func TestHTTPToGRPCStatusMapping(t *testing.T) {
 }
 
 func testHTTPToGRPCStatusMapping(t *testing.T, httpStatus int, wh writeHeaders) {
-	stream, cleanUp := setUpHTTPStatusTest(t, httpStatus, wh)
+	stream, cleanUp, cancel := setUpHTTPStatusTest(t, httpStatus, wh)
+	defer cancel()
 	defer cleanUp()
 	want := httpStatusConvTab[httpStatus]
 	buf := make([]byte, 8)
@@ -2131,17 +2093,18 @@ func testHTTPToGRPCStatusMapping(t *testing.T, httpStatus int, wh writeHeaders)
 	if err == nil {
 		t.Fatalf("Stream.Read(_) unexpectedly returned no error. Expected stream error with code %v", want)
 	}
-	serr, ok := err.(StreamError)
+	serr, ok := status.FromError(err)
 	if !ok {
-		t.Fatalf("err.(Type) = %T, want StreamError", err)
+		t.Fatalf("err.(Type) = %T, want status error", err)
 	}
-	if want != serr.Code {
-		t.Fatalf("Want error code: %v, got: %v", want, serr.Code)
+	if want != serr.Code() {
+		t.Fatalf("Want error code: %v, got: %v", want, serr.Code())
 	}
 }
 
 func TestHTTPStatusOKAndMissingGRPCStatus(t *testing.T) {
-	stream, cleanUp := setUpHTTPStatusTest(t, http.StatusOK, writeOneHeader)
+	stream, cleanUp, cancel := setUpHTTPStatusTest(t, http.StatusOK, writeOneHeader)
+	defer cancel()
 	defer cleanUp()
 	buf := make([]byte, 8)
 	_, err := stream.Read(buf)
@@ -2149,8 +2112,6 @@ func TestHTTPStatusOKAndMissingGRPCStatus(t *testing.T) {
 		t.Fatalf("stream.Read(_) = _, %v, want _, io.EOF", err)
 	}
 	want := codes.Unknown
-	stream.mu.Lock()
-	defer stream.mu.Unlock()
 	if stream.status.Code() != want {
 		t.Fatalf("Status code of stream: %v, want: %v", stream.status.Code(), want)
 	}
@@ -2166,15 +2127,14 @@ func TestReadGivesSameErrorAfterAnyErrorOccurs(t *testing.T) {
 	testRecvBuffer := newRecvBuffer()
 	s := &Stream{
 		ctx:         context.Background(),
-		goAway:      make(chan struct{}),
 		buf:         testRecvBuffer,
 		requestRead: func(int) {},
 	}
 	s.trReader = &transportReader{
 		reader: &recvBufferReader{
-			ctx:    s.ctx,
-			goAway: s.goAway,
-			recv:   s.buf,
+			ctx:     s.ctx,
+			ctxDone: s.ctx.Done(),
+			recv:    s.buf,
 		},
 		windowHandler: func(int) {},
 	}
@@ -2225,7 +2185,8 @@ func TestPingPong1MB(t *testing.T) {
 
 //This is a stress-test of flow control logic.
 func runPingPongTest(t *testing.T, msgSize int) {
-	server, client := setUp(t, 0, 0, pingpong)
+	server, client, cancel := setUp(t, 0, 0, pingpong)
+	defer cancel()
 	defer server.stop()
 	defer client.Close()
 	waitWhileTrue(t, func() (bool, error) {
@@ -2236,7 +2197,6 @@ func runPingPongTest(t *testing.T, msgSize int) {
 		}
 		return false, nil
 	})
-	ct := client.(*http2Client)
 	stream, err := client.NewStream(context.Background(), &CallHdr{})
 	if err != nil {
 		t.Fatalf("Failed to create stream. Err: %v", err)
@@ -2256,13 +2216,13 @@ func runPingPongTest(t *testing.T, msgSize int) {
 	for {
 		select {
 		case <-done:
-			ct.Write(stream, nil, nil, &Options{Last: true})
+			client.Write(stream, nil, nil, &Options{Last: true})
 			if _, err := stream.Read(incomingHeader); err != io.EOF {
 				t.Fatalf("Client expected EOF from the server. Got: %v", err)
 			}
 			return
 		default:
-			if err := ct.Write(stream, outgoingHeader, msg, opts); err != nil {
+			if err := client.Write(stream, outgoingHeader, msg, opts); err != nil {
 				t.Fatalf("Error on client while writing message. Err: %v", err)
 			}
 			if _, err := stream.Read(incomingHeader); err != nil {
@@ -2276,3 +2236,114 @@ func runPingPongTest(t *testing.T, msgSize int) {
 		}
 	}
 }
+
+type tableSizeLimit struct {
+	mu     sync.Mutex
+	limits []uint32
+}
+
+func (t *tableSizeLimit) add(limit uint32) {
+	t.mu.Lock()
+	t.limits = append(t.limits, limit)
+	t.mu.Unlock()
+}
+
+func (t *tableSizeLimit) getLen() int {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	return len(t.limits)
+}
+
+func (t *tableSizeLimit) getIndex(i int) uint32 {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	return t.limits[i]
+}
+
+func TestHeaderTblSize(t *testing.T) {
+	limits := &tableSizeLimit{}
+	updateHeaderTblSize = func(e *hpack.Encoder, v uint32) {
+		e.SetMaxDynamicTableSizeLimit(v)
+		limits.add(v)
+	}
+	defer func() {
+		updateHeaderTblSize = func(e *hpack.Encoder, v uint32) {
+			e.SetMaxDynamicTableSizeLimit(v)
+		}
+	}()
+
+	server, ct, cancel := setUp(t, 0, math.MaxUint32, normal)
+	defer cancel()
+	defer ct.Close()
+	defer server.stop()
+	_, err := ct.NewStream(context.Background(), &CallHdr{})
+	if err != nil {
+		t.Fatalf("failed to open stream: %v", err)
+	}
+
+	var svrTransport ServerTransport
+	var i int
+	for i = 0; i < 1000; i++ {
+		server.mu.Lock()
+		if len(server.conns) != 0 {
+			server.mu.Unlock()
+			break
+		}
+		server.mu.Unlock()
+		time.Sleep(10 * time.Millisecond)
+		continue
+	}
+	if i == 1000 {
+		t.Fatalf("unable to create any server transport after 10s")
+	}
+
+	for st := range server.conns {
+		svrTransport = st
+		break
+	}
+	svrTransport.(*http2Server).controlBuf.put(&outgoingSettings{
+		ss: []http2.Setting{
+			{
+				ID:  http2.SettingHeaderTableSize,
+				Val: uint32(100),
+			},
+		},
+	})
+
+	for i = 0; i < 1000; i++ {
+		if limits.getLen() != 1 {
+			time.Sleep(10 * time.Millisecond)
+			continue
+		}
+		if val := limits.getIndex(0); val != uint32(100) {
+			t.Fatalf("expected limits[0] = 100, got %d", val)
+		}
+		break
+	}
+	if i == 1000 {
+		t.Fatalf("expected len(limits) = 1 within 10s, got != 1")
+	}
+
+	ct.controlBuf.put(&outgoingSettings{
+		ss: []http2.Setting{
+			{
+				ID:  http2.SettingHeaderTableSize,
+				Val: uint32(200),
+			},
+		},
+	})
+
+	for i := 0; i < 1000; i++ {
+		if limits.getLen() != 2 {
+			time.Sleep(10 * time.Millisecond)
+			continue
+		}
+		if val := limits.getIndex(1); val != uint32(200) {
+			t.Fatalf("expected limits[1] = 200, got %d", val)
+		}
+		break
+	}
+	if i == 1000 {
+		t.Fatalf("expected len(limits) = 2 within 10s, got != 2")
+	}
+}
diff --git a/vendor/google.golang.org/grpc/interop/alts/client/client.go b/vendor/google.golang.org/grpc/interop/alts/client/client.go
new file mode 100644
index 00000000..3710c4b3
--- /dev/null
+++ b/vendor/google.golang.org/grpc/interop/alts/client/client.go
@@ -0,0 +1,69 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// This binary can only run on Google Cloud Platform (GCP).
+package main
+
+import (
+	"flag"
+	"time"
+
+	"golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/alts"
+	"google.golang.org/grpc/grpclog"
+	testpb "google.golang.org/grpc/interop/grpc_testing"
+)
+
+const (
+	value = "test_value"
+)
+
+var (
+	hsAddr     = flag.String("alts_handshaker_service_address", "", "ALTS handshaker gRPC service address")
+	serverAddr = flag.String("server_address", ":8080", "The port on which the server is listening")
+)
+
+func main() {
+	flag.Parse()
+
+	opts := alts.DefaultClientOptions()
+	if *hsAddr != "" {
+		opts.HandshakerServiceAddress = *hsAddr
+	}
+	altsTC := alts.NewClientCreds(opts)
+	// Block until the server is ready.
+	conn, err := grpc.Dial(*serverAddr, grpc.WithTransportCredentials(altsTC), grpc.WithBlock())
+	if err != nil {
+		grpclog.Fatalf("gRPC Client: failed to dial the server at %v: %v", *serverAddr, err)
+	}
+	defer conn.Close()
+	grpcClient := testpb.NewTestServiceClient(conn)
+
+	// Call the EmptyCall API.
+	ctx := context.Background()
+	request := &testpb.Empty{}
+	if _, err := grpcClient.EmptyCall(ctx, request); err != nil {
+		grpclog.Fatalf("grpc Client: EmptyCall(_, %v) failed: %v", request, err)
+	}
+	grpclog.Info("grpc Client: empty call succeeded")
+
+	// This sleep prevents the connection from being abruptly disconnected
+	// when running this binary (along with grpc_server) on GCP dev cluster.
+	time.Sleep(1 * time.Second)
+}
diff --git a/vendor/google.golang.org/grpc/interop/alts/server/server.go b/vendor/google.golang.org/grpc/interop/alts/server/server.go
new file mode 100644
index 00000000..c70a20b6
--- /dev/null
+++ b/vendor/google.golang.org/grpc/interop/alts/server/server.go
@@ -0,0 +1,53 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// This binary can only run on Google Cloud Platform (GCP).
+package main
+
+import (
+	"flag"
+	"net"
+
+	grpc "google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/alts"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/interop"
+	testpb "google.golang.org/grpc/interop/grpc_testing"
+)
+
+var (
+	hsAddr     = flag.String("alts_handshaker_service_address", "", "ALTS handshaker gRPC service address")
+	serverAddr = flag.String("server_address", ":8080", "The port on which the server is listening")
+)
+
+func main() {
+	flag.Parse()
+
+	lis, err := net.Listen("tcp", *serverAddr)
+	if err != nil {
+		grpclog.Fatalf("gRPC Server: failed to start the server at %v: %v", *serverAddr, err)
+	}
+	opts := alts.DefaultServerOptions()
+	if *hsAddr != "" {
+		opts.HandshakerServiceAddress = *hsAddr
+	}
+	altsTC := alts.NewServerCreds(opts)
+	grpcServer := grpc.NewServer(grpc.Creds(altsTC))
+	testpb.RegisterTestServiceServer(grpcServer, interop.NewTestServer())
+	grpcServer.Serve(lis)
+}
diff --git a/vendor/google.golang.org/grpc/interop/client/client.go b/vendor/google.golang.org/grpc/interop/client/client.go
index da6bc2d2..69bba925 100644
--- a/vendor/google.golang.org/grpc/interop/client/client.go
+++ b/vendor/google.golang.org/grpc/interop/client/client.go
@@ -24,17 +24,22 @@ import (
 	"strconv"
 
 	"google.golang.org/grpc"
+	_ "google.golang.org/grpc/balancer/grpclb"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/alts"
 	"google.golang.org/grpc/credentials/oauth"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/interop"
 	testpb "google.golang.org/grpc/interop/grpc_testing"
+	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/testdata"
 )
 
 var (
 	caFile                = flag.String("ca_file", "", "The file containning the CA root cert file")
-	useTLS                = flag.Bool("use_tls", false, "Connection uses TLS if true, else plain TCP")
+	useTLS                = flag.Bool("use_tls", false, "Connection uses TLS if true")
+	useALTS               = flag.Bool("use_alts", false, "Connection uses ALTS if true (this option can only be used on GCP)")
+	altsHSAddr            = flag.String("alts_handshaker_service_address", "", "ALTS handshaker gRPC service address")
 	testCA                = flag.Bool("use_test_ca", false, "Whether to replace platform root CAs with test CA as the CA root")
 	serviceAccountKeyFile = flag.String("service_account_key_file", "", "Path to service account json key file")
 	oauthScope            = flag.String("oauth_scope", "", "The scope for OAuth2 tokens")
@@ -59,6 +64,7 @@ var (
         cancel_after_begin: cancellation after metadata has been sent but before payloads are sent;
         cancel_after_first_response: cancellation after receiving 1st message from the server;
         status_code_and_message: status code propagated back to client;
+        special_status_message: Unicode and whitespace is correctly processed in status message;
         custom_metadata: server will echo custom metadata;
         unimplemented_method: client attempts to call unimplemented method;
         unimplemented_service: client attempts to call unimplemented service.`)
@@ -66,6 +72,10 @@ var (
 
 func main() {
 	flag.Parse()
+	resolver.SetDefaultScheme("dns")
+	if *useTLS && *useALTS {
+		grpclog.Fatalf("use_tls and use_alts cannot be both set to true")
+	}
 	serverAddr := net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort))
 	var opts []grpc.DialOption
 	if *useTLS {
@@ -87,6 +97,17 @@ func main() {
 			creds = credentials.NewClientTLSFromCert(nil, sn)
 		}
 		opts = append(opts, grpc.WithTransportCredentials(creds))
+	} else if *useALTS {
+		altsOpts := alts.DefaultClientOptions()
+		if *altsHSAddr != "" {
+			altsOpts.HandshakerServiceAddress = *altsHSAddr
+		}
+		altsTC := alts.NewClientCreds(altsOpts)
+		opts = append(opts, grpc.WithTransportCredentials(altsTC))
+	} else {
+		opts = append(opts, grpc.WithInsecure())
+	}
+	if *useTLS || *useALTS {
 		if *testCase == "compute_engine_creds" {
 			opts = append(opts, grpc.WithPerRPCCredentials(oauth.NewComputeEngine()))
 		} else if *testCase == "service_account_creds" {
@@ -104,8 +125,6 @@ func main() {
 		} else if *testCase == "oauth2_auth_token" {
 			opts = append(opts, grpc.WithPerRPCCredentials(oauth.NewOauthAccess(interop.GetToken(*serviceAccountKeyFile, *oauthScope))))
 		}
-	} else {
-		opts = append(opts, grpc.WithInsecure())
 	}
 	opts = append(opts, grpc.WithBlock())
 	conn, err := grpc.Dial(serverAddr, opts...)
@@ -117,73 +136,76 @@ func main() {
 	switch *testCase {
 	case "empty_unary":
 		interop.DoEmptyUnaryCall(tc)
-		grpclog.Println("EmptyUnaryCall done")
+		grpclog.Infoln("EmptyUnaryCall done")
 	case "large_unary":
 		interop.DoLargeUnaryCall(tc)
-		grpclog.Println("LargeUnaryCall done")
+		grpclog.Infoln("LargeUnaryCall done")
 	case "client_streaming":
 		interop.DoClientStreaming(tc)
-		grpclog.Println("ClientStreaming done")
+		grpclog.Infoln("ClientStreaming done")
 	case "server_streaming":
 		interop.DoServerStreaming(tc)
-		grpclog.Println("ServerStreaming done")
+		grpclog.Infoln("ServerStreaming done")
 	case "ping_pong":
 		interop.DoPingPong(tc)
-		grpclog.Println("Pingpong done")
+		grpclog.Infoln("Pingpong done")
 	case "empty_stream":
 		interop.DoEmptyStream(tc)
-		grpclog.Println("Emptystream done")
+		grpclog.Infoln("Emptystream done")
 	case "timeout_on_sleeping_server":
 		interop.DoTimeoutOnSleepingServer(tc)
-		grpclog.Println("TimeoutOnSleepingServer done")
+		grpclog.Infoln("TimeoutOnSleepingServer done")
 	case "compute_engine_creds":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute compute_engine_creds test case.")
+		if !*useTLS && !*useALTS {
+			grpclog.Fatalf("Neither TLS or ALTS are enabled. TLS or ALTS is required to execute compute_engine_creds test case.")
 		}
 		interop.DoComputeEngineCreds(tc, *defaultServiceAccount, *oauthScope)
-		grpclog.Println("ComputeEngineCreds done")
+		grpclog.Infoln("ComputeEngineCreds done")
 	case "service_account_creds":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute service_account_creds test case.")
+		if !*useTLS && !*useALTS {
+			grpclog.Fatalf("Neither TLS or ALTS are enabled. TLS or ALTS is required to execute service_account_creds test case.")
 		}
 		interop.DoServiceAccountCreds(tc, *serviceAccountKeyFile, *oauthScope)
-		grpclog.Println("ServiceAccountCreds done")
+		grpclog.Infoln("ServiceAccountCreds done")
 	case "jwt_token_creds":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute jwt_token_creds test case.")
+		if !*useTLS && !*useALTS {
+			grpclog.Fatalf("Neither TLS or ALTS are enabled. TLS or ALTS is required to execute jwt_token_creds test case.")
 		}
 		interop.DoJWTTokenCreds(tc, *serviceAccountKeyFile)
-		grpclog.Println("JWTtokenCreds done")
+		grpclog.Infoln("JWTtokenCreds done")
 	case "per_rpc_creds":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute per_rpc_creds test case.")
+		if !*useTLS && !*useALTS {
+			grpclog.Fatalf("Neither TLS or ALTS are enabled. TLS or ALTS is required to execute per_rpc_creds test case.")
 		}
 		interop.DoPerRPCCreds(tc, *serviceAccountKeyFile, *oauthScope)
-		grpclog.Println("PerRPCCreds done")
+		grpclog.Infoln("PerRPCCreds done")
 	case "oauth2_auth_token":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute oauth2_auth_token test case.")
+		if !*useTLS && !*useALTS {
+			grpclog.Fatalf("Neither TLS or ALTS are enabled. TLS or ALTS is required to execute oauth2_auth_token test case.")
 		}
 		interop.DoOauth2TokenCreds(tc, *serviceAccountKeyFile, *oauthScope)
-		grpclog.Println("Oauth2TokenCreds done")
+		grpclog.Infoln("Oauth2TokenCreds done")
 	case "cancel_after_begin":
 		interop.DoCancelAfterBegin(tc)
-		grpclog.Println("CancelAfterBegin done")
+		grpclog.Infoln("CancelAfterBegin done")
 	case "cancel_after_first_response":
 		interop.DoCancelAfterFirstResponse(tc)
-		grpclog.Println("CancelAfterFirstResponse done")
+		grpclog.Infoln("CancelAfterFirstResponse done")
 	case "status_code_and_message":
 		interop.DoStatusCodeAndMessage(tc)
-		grpclog.Println("StatusCodeAndMessage done")
+		grpclog.Infoln("StatusCodeAndMessage done")
+	case "special_status_message":
+		interop.DoSpecialStatusMessage(tc)
+		grpclog.Infoln("SpecialStatusMessage done")
 	case "custom_metadata":
 		interop.DoCustomMetadata(tc)
-		grpclog.Println("CustomMetadata done")
+		grpclog.Infoln("CustomMetadata done")
 	case "unimplemented_method":
 		interop.DoUnimplementedMethod(conn)
-		grpclog.Println("UnimplementedMethod done")
+		grpclog.Infoln("UnimplementedMethod done")
 	case "unimplemented_service":
 		interop.DoUnimplementedService(testpb.NewUnimplementedServiceClient(conn))
-		grpclog.Println("UnimplementedService done")
+		grpclog.Infoln("UnimplementedService done")
 	default:
 		grpclog.Fatal("Unsupported test case: ", *testCase)
 	}
diff --git a/vendor/google.golang.org/grpc/interop/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/interop/grpc_testing/test.pb.go
index 1e7a9abd..bb5e2eeb 100644
--- a/vendor/google.golang.org/grpc/interop/grpc_testing/test.pb.go
+++ b/vendor/google.golang.org/grpc/interop/grpc_testing/test.pb.go
@@ -1,24 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: grpc_testing/test.proto
 
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	grpc_testing/test.proto
-
-It has these top-level messages:
-	Empty
-	Payload
-	EchoStatus
-	SimpleRequest
-	SimpleResponse
-	StreamingInputCallRequest
-	StreamingInputCallResponse
-	ResponseParameters
-	StreamingOutputCallRequest
-	StreamingOutputCallResponse
-*/
 package grpc_testing
 
 import proto "github.com/golang/protobuf/proto"
@@ -67,28 +49,74 @@ var PayloadType_value = map[string]int32{
 func (x PayloadType) String() string {
 	return proto.EnumName(PayloadType_name, int32(x))
 }
-func (PayloadType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (PayloadType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{0}
+}
 
 type Empty struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Empty) Reset()         { *m = Empty{} }
+func (m *Empty) String() string { return proto.CompactTextString(m) }
+func (*Empty) ProtoMessage()    {}
+func (*Empty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{0}
+}
+func (m *Empty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Empty.Unmarshal(m, b)
+}
+func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Empty.Marshal(b, m, deterministic)
+}
+func (dst *Empty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Empty.Merge(dst, src)
+}
+func (m *Empty) XXX_Size() int {
+	return xxx_messageInfo_Empty.Size(m)
+}
+func (m *Empty) XXX_DiscardUnknown() {
+	xxx_messageInfo_Empty.DiscardUnknown(m)
 }
 
-func (m *Empty) Reset()                    { *m = Empty{} }
-func (m *Empty) String() string            { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()               {}
-func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Empty proto.InternalMessageInfo
 
 // A block of data, to simply increase gRPC message size.
 type Payload struct {
 	// The type of data in body.
-	Type PayloadType `protobuf:"varint,1,opt,name=type,enum=grpc.testing.PayloadType" json:"type,omitempty"`
+	Type PayloadType `protobuf:"varint,1,opt,name=type,proto3,enum=grpc.testing.PayloadType" json:"type,omitempty"`
 	// Primary contents of payload.
-	Body []byte `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	Body                 []byte   `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Payload) Reset()                    { *m = Payload{} }
-func (m *Payload) String() string            { return proto.CompactTextString(m) }
-func (*Payload) ProtoMessage()               {}
-func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Payload) Reset()         { *m = Payload{} }
+func (m *Payload) String() string { return proto.CompactTextString(m) }
+func (*Payload) ProtoMessage()    {}
+func (*Payload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{1}
+}
+func (m *Payload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Payload.Unmarshal(m, b)
+}
+func (m *Payload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Payload.Marshal(b, m, deterministic)
+}
+func (dst *Payload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Payload.Merge(dst, src)
+}
+func (m *Payload) XXX_Size() int {
+	return xxx_messageInfo_Payload.Size(m)
+}
+func (m *Payload) XXX_DiscardUnknown() {
+	xxx_messageInfo_Payload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Payload proto.InternalMessageInfo
 
 func (m *Payload) GetType() PayloadType {
 	if m != nil {
@@ -107,14 +135,36 @@ func (m *Payload) GetBody() []byte {
 // A protobuf representation for grpc status. This is used by test
 // clients to specify a status that the server should attempt to return.
 type EchoStatus struct {
-	Code    int32  `protobuf:"varint,1,opt,name=code" json:"code,omitempty"`
-	Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
+	Code                 int32    `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+	Message              string   `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EchoStatus) Reset()         { *m = EchoStatus{} }
+func (m *EchoStatus) String() string { return proto.CompactTextString(m) }
+func (*EchoStatus) ProtoMessage()    {}
+func (*EchoStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{2}
+}
+func (m *EchoStatus) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EchoStatus.Unmarshal(m, b)
+}
+func (m *EchoStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EchoStatus.Marshal(b, m, deterministic)
+}
+func (dst *EchoStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EchoStatus.Merge(dst, src)
+}
+func (m *EchoStatus) XXX_Size() int {
+	return xxx_messageInfo_EchoStatus.Size(m)
+}
+func (m *EchoStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_EchoStatus.DiscardUnknown(m)
 }
 
-func (m *EchoStatus) Reset()                    { *m = EchoStatus{} }
-func (m *EchoStatus) String() string            { return proto.CompactTextString(m) }
-func (*EchoStatus) ProtoMessage()               {}
-func (*EchoStatus) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_EchoStatus proto.InternalMessageInfo
 
 func (m *EchoStatus) GetCode() int32 {
 	if m != nil {
@@ -134,24 +184,46 @@ func (m *EchoStatus) GetMessage() string {
 type SimpleRequest struct {
 	// Desired payload type in the response from the server.
 	// If response_type is RANDOM, server randomly chooses one from other formats.
-	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
+	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,proto3,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
 	// Desired payload size in the response from the server.
 	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	ResponseSize int32 `protobuf:"varint,2,opt,name=response_size,json=responseSize" json:"response_size,omitempty"`
+	ResponseSize int32 `protobuf:"varint,2,opt,name=response_size,json=responseSize,proto3" json:"response_size,omitempty"`
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	Payload *Payload `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Whether SimpleResponse should include username.
-	FillUsername bool `protobuf:"varint,4,opt,name=fill_username,json=fillUsername" json:"fill_username,omitempty"`
+	FillUsername bool `protobuf:"varint,4,opt,name=fill_username,json=fillUsername,proto3" json:"fill_username,omitempty"`
 	// Whether SimpleResponse should include OAuth scope.
-	FillOauthScope bool `protobuf:"varint,5,opt,name=fill_oauth_scope,json=fillOauthScope" json:"fill_oauth_scope,omitempty"`
+	FillOauthScope bool `protobuf:"varint,5,opt,name=fill_oauth_scope,json=fillOauthScope,proto3" json:"fill_oauth_scope,omitempty"`
 	// Whether server should return a given status
-	ResponseStatus *EchoStatus `protobuf:"bytes,7,opt,name=response_status,json=responseStatus" json:"response_status,omitempty"`
+	ResponseStatus       *EchoStatus `protobuf:"bytes,7,opt,name=response_status,json=responseStatus,proto3" json:"response_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
+func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
+func (*SimpleRequest) ProtoMessage()    {}
+func (*SimpleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{3}
+}
+func (m *SimpleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleRequest.Unmarshal(m, b)
+}
+func (m *SimpleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleRequest.Marshal(b, m, deterministic)
+}
+func (dst *SimpleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleRequest.Merge(dst, src)
+}
+func (m *SimpleRequest) XXX_Size() int {
+	return xxx_messageInfo_SimpleRequest.Size(m)
+}
+func (m *SimpleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleRequest.DiscardUnknown(m)
 }
 
-func (m *SimpleRequest) Reset()                    { *m = SimpleRequest{} }
-func (m *SimpleRequest) String() string            { return proto.CompactTextString(m) }
-func (*SimpleRequest) ProtoMessage()               {}
-func (*SimpleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_SimpleRequest proto.InternalMessageInfo
 
 func (m *SimpleRequest) GetResponseType() PayloadType {
 	if m != nil {
@@ -198,18 +270,40 @@ func (m *SimpleRequest) GetResponseStatus() *EchoStatus {
 // Unary response, as configured by the request.
 type SimpleResponse struct {
 	// Payload to increase message size.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
 	// The user the request came from, for verifying authentication was
 	// successful when the client expected it.
-	Username string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
 	// OAuth scope.
-	OauthScope string `protobuf:"bytes,3,opt,name=oauth_scope,json=oauthScope" json:"oauth_scope,omitempty"`
+	OauthScope           string   `protobuf:"bytes,3,opt,name=oauth_scope,json=oauthScope,proto3" json:"oauth_scope,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SimpleResponse) Reset()                    { *m = SimpleResponse{} }
-func (m *SimpleResponse) String() string            { return proto.CompactTextString(m) }
-func (*SimpleResponse) ProtoMessage()               {}
-func (*SimpleResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
+func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
+func (*SimpleResponse) ProtoMessage()    {}
+func (*SimpleResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{4}
+}
+func (m *SimpleResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleResponse.Unmarshal(m, b)
+}
+func (m *SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleResponse.Marshal(b, m, deterministic)
+}
+func (dst *SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleResponse.Merge(dst, src)
+}
+func (m *SimpleResponse) XXX_Size() int {
+	return xxx_messageInfo_SimpleResponse.Size(m)
+}
+func (m *SimpleResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SimpleResponse proto.InternalMessageInfo
 
 func (m *SimpleResponse) GetPayload() *Payload {
 	if m != nil {
@@ -235,13 +329,35 @@ func (m *SimpleResponse) GetOauthScope() string {
 // Client-streaming request.
 type StreamingInputCallRequest struct {
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload              *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StreamingInputCallRequest) Reset()                    { *m = StreamingInputCallRequest{} }
-func (m *StreamingInputCallRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingInputCallRequest) ProtoMessage()               {}
-func (*StreamingInputCallRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *StreamingInputCallRequest) Reset()         { *m = StreamingInputCallRequest{} }
+func (m *StreamingInputCallRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingInputCallRequest) ProtoMessage()    {}
+func (*StreamingInputCallRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{5}
+}
+func (m *StreamingInputCallRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingInputCallRequest.Unmarshal(m, b)
+}
+func (m *StreamingInputCallRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingInputCallRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingInputCallRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingInputCallRequest.Merge(dst, src)
+}
+func (m *StreamingInputCallRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingInputCallRequest.Size(m)
+}
+func (m *StreamingInputCallRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingInputCallRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingInputCallRequest proto.InternalMessageInfo
 
 func (m *StreamingInputCallRequest) GetPayload() *Payload {
 	if m != nil {
@@ -253,13 +369,35 @@ func (m *StreamingInputCallRequest) GetPayload() *Payload {
 // Client-streaming response.
 type StreamingInputCallResponse struct {
 	// Aggregated size of payloads received from the client.
-	AggregatedPayloadSize int32 `protobuf:"varint,1,opt,name=aggregated_payload_size,json=aggregatedPayloadSize" json:"aggregated_payload_size,omitempty"`
+	AggregatedPayloadSize int32    `protobuf:"varint,1,opt,name=aggregated_payload_size,json=aggregatedPayloadSize,proto3" json:"aggregated_payload_size,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
 }
 
-func (m *StreamingInputCallResponse) Reset()                    { *m = StreamingInputCallResponse{} }
-func (m *StreamingInputCallResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingInputCallResponse) ProtoMessage()               {}
-func (*StreamingInputCallResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *StreamingInputCallResponse) Reset()         { *m = StreamingInputCallResponse{} }
+func (m *StreamingInputCallResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingInputCallResponse) ProtoMessage()    {}
+func (*StreamingInputCallResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{6}
+}
+func (m *StreamingInputCallResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingInputCallResponse.Unmarshal(m, b)
+}
+func (m *StreamingInputCallResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingInputCallResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingInputCallResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingInputCallResponse.Merge(dst, src)
+}
+func (m *StreamingInputCallResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingInputCallResponse.Size(m)
+}
+func (m *StreamingInputCallResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingInputCallResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingInputCallResponse proto.InternalMessageInfo
 
 func (m *StreamingInputCallResponse) GetAggregatedPayloadSize() int32 {
 	if m != nil {
@@ -272,16 +410,38 @@ func (m *StreamingInputCallResponse) GetAggregatedPayloadSize() int32 {
 type ResponseParameters struct {
 	// Desired payload sizes in responses from the server.
 	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	Size int32 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"`
+	Size int32 `protobuf:"varint,1,opt,name=size,proto3" json:"size,omitempty"`
 	// Desired interval between consecutive responses in the response stream in
 	// microseconds.
-	IntervalUs int32 `protobuf:"varint,2,opt,name=interval_us,json=intervalUs" json:"interval_us,omitempty"`
+	IntervalUs           int32    `protobuf:"varint,2,opt,name=interval_us,json=intervalUs,proto3" json:"interval_us,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ResponseParameters) Reset()         { *m = ResponseParameters{} }
+func (m *ResponseParameters) String() string { return proto.CompactTextString(m) }
+func (*ResponseParameters) ProtoMessage()    {}
+func (*ResponseParameters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{7}
+}
+func (m *ResponseParameters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResponseParameters.Unmarshal(m, b)
+}
+func (m *ResponseParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResponseParameters.Marshal(b, m, deterministic)
+}
+func (dst *ResponseParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResponseParameters.Merge(dst, src)
+}
+func (m *ResponseParameters) XXX_Size() int {
+	return xxx_messageInfo_ResponseParameters.Size(m)
+}
+func (m *ResponseParameters) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResponseParameters.DiscardUnknown(m)
 }
 
-func (m *ResponseParameters) Reset()                    { *m = ResponseParameters{} }
-func (m *ResponseParameters) String() string            { return proto.CompactTextString(m) }
-func (*ResponseParameters) ProtoMessage()               {}
-func (*ResponseParameters) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ResponseParameters proto.InternalMessageInfo
 
 func (m *ResponseParameters) GetSize() int32 {
 	if m != nil {
@@ -303,19 +463,41 @@ type StreamingOutputCallRequest struct {
 	// If response_type is RANDOM, the payload from each response in the stream
 	// might be of different types. This is to simulate a mixed type of payload
 	// stream.
-	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
+	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,proto3,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
 	// Configuration for each expected response message.
-	ResponseParameters []*ResponseParameters `protobuf:"bytes,2,rep,name=response_parameters,json=responseParameters" json:"response_parameters,omitempty"`
+	ResponseParameters []*ResponseParameters `protobuf:"bytes,2,rep,name=response_parameters,json=responseParameters,proto3" json:"response_parameters,omitempty"`
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	Payload *Payload `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Whether server should return a given status
-	ResponseStatus *EchoStatus `protobuf:"bytes,7,opt,name=response_status,json=responseStatus" json:"response_status,omitempty"`
+	ResponseStatus       *EchoStatus `protobuf:"bytes,7,opt,name=response_status,json=responseStatus,proto3" json:"response_status,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *StreamingOutputCallRequest) Reset()                    { *m = StreamingOutputCallRequest{} }
-func (m *StreamingOutputCallRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingOutputCallRequest) ProtoMessage()               {}
-func (*StreamingOutputCallRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *StreamingOutputCallRequest) Reset()         { *m = StreamingOutputCallRequest{} }
+func (m *StreamingOutputCallRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingOutputCallRequest) ProtoMessage()    {}
+func (*StreamingOutputCallRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{8}
+}
+func (m *StreamingOutputCallRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingOutputCallRequest.Unmarshal(m, b)
+}
+func (m *StreamingOutputCallRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingOutputCallRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingOutputCallRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingOutputCallRequest.Merge(dst, src)
+}
+func (m *StreamingOutputCallRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingOutputCallRequest.Size(m)
+}
+func (m *StreamingOutputCallRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingOutputCallRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingOutputCallRequest proto.InternalMessageInfo
 
 func (m *StreamingOutputCallRequest) GetResponseType() PayloadType {
 	if m != nil {
@@ -348,13 +530,35 @@ func (m *StreamingOutputCallRequest) GetResponseStatus() *EchoStatus {
 // Server-streaming response, as configured by the request and parameters.
 type StreamingOutputCallResponse struct {
 	// Payload to increase response size.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload              *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingOutputCallResponse) Reset()         { *m = StreamingOutputCallResponse{} }
+func (m *StreamingOutputCallResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingOutputCallResponse) ProtoMessage()    {}
+func (*StreamingOutputCallResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_4001f755b984bb27, []int{9}
+}
+func (m *StreamingOutputCallResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingOutputCallResponse.Unmarshal(m, b)
+}
+func (m *StreamingOutputCallResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingOutputCallResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingOutputCallResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingOutputCallResponse.Merge(dst, src)
+}
+func (m *StreamingOutputCallResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingOutputCallResponse.Size(m)
+}
+func (m *StreamingOutputCallResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingOutputCallResponse.DiscardUnknown(m)
 }
 
-func (m *StreamingOutputCallResponse) Reset()                    { *m = StreamingOutputCallResponse{} }
-func (m *StreamingOutputCallResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingOutputCallResponse) ProtoMessage()               {}
-func (*StreamingOutputCallResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_StreamingOutputCallResponse proto.InternalMessageInfo
 
 func (m *StreamingOutputCallResponse) GetPayload() *Payload {
 	if m != nil {
@@ -385,8 +589,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for TestService service
-
+// TestServiceClient is the client API for TestService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type TestServiceClient interface {
 	// One empty request followed by one empty response.
 	EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error)
@@ -420,7 +625,7 @@ func NewTestServiceClient(cc *grpc.ClientConn) TestServiceClient {
 
 func (c *testServiceClient) EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
 	out := new(Empty)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/EmptyCall", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.TestService/EmptyCall", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -429,7 +634,7 @@ func (c *testServiceClient) EmptyCall(ctx context.Context, in *Empty, opts ...gr
 
 func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
 	out := new(SimpleResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -437,7 +642,7 @@ func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, op
 }
 
 func (c *testServiceClient) StreamingOutputCall(ctx context.Context, in *StreamingOutputCallRequest, opts ...grpc.CallOption) (TestService_StreamingOutputCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[0], c.cc, "/grpc.testing.TestService/StreamingOutputCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[0], "/grpc.testing.TestService/StreamingOutputCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -469,7 +674,7 @@ func (x *testServiceStreamingOutputCallClient) Recv() (*StreamingOutputCallRespo
 }
 
 func (c *testServiceClient) StreamingInputCall(ctx context.Context, opts ...grpc.CallOption) (TestService_StreamingInputCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[1], c.cc, "/grpc.testing.TestService/StreamingInputCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[1], "/grpc.testing.TestService/StreamingInputCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -503,7 +708,7 @@ func (x *testServiceStreamingInputCallClient) CloseAndRecv() (*StreamingInputCal
 }
 
 func (c *testServiceClient) FullDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_FullDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[2], c.cc, "/grpc.testing.TestService/FullDuplexCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[2], "/grpc.testing.TestService/FullDuplexCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -534,7 +739,7 @@ func (x *testServiceFullDuplexCallClient) Recv() (*StreamingOutputCallResponse,
 }
 
 func (c *testServiceClient) HalfDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_HalfDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[3], c.cc, "/grpc.testing.TestService/HalfDuplexCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[3], "/grpc.testing.TestService/HalfDuplexCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -564,8 +769,7 @@ func (x *testServiceHalfDuplexCallClient) Recv() (*StreamingOutputCallResponse,
 	return m, nil
 }
 
-// Server API for TestService service
-
+// TestServiceServer is the server API for TestService service.
 type TestServiceServer interface {
 	// One empty request followed by one empty response.
 	EmptyCall(context.Context, *Empty) (*Empty, error)
@@ -768,8 +972,9 @@ var _TestService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "grpc_testing/test.proto",
 }
 
-// Client API for UnimplementedService service
-
+// UnimplementedServiceClient is the client API for UnimplementedService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type UnimplementedServiceClient interface {
 	// A call that no server should implement
 	UnimplementedCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error)
@@ -785,15 +990,14 @@ func NewUnimplementedServiceClient(cc *grpc.ClientConn) UnimplementedServiceClie
 
 func (c *unimplementedServiceClient) UnimplementedCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
 	out := new(Empty)
-	err := grpc.Invoke(ctx, "/grpc.testing.UnimplementedService/UnimplementedCall", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.UnimplementedService/UnimplementedCall", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for UnimplementedService service
-
+// UnimplementedServiceServer is the server API for UnimplementedService service.
 type UnimplementedServiceServer interface {
 	// A call that no server should implement
 	UnimplementedCall(context.Context, *Empty) (*Empty, error)
@@ -834,9 +1038,9 @@ var _UnimplementedService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "grpc_testing/test.proto",
 }
 
-func init() { proto.RegisterFile("grpc_testing/test.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("grpc_testing/test.proto", fileDescriptor_test_4001f755b984bb27) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_test_4001f755b984bb27 = []byte{
 	// 664 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xdd, 0x6e, 0xd3, 0x4c,
 	0x10, 0xfd, 0x9c, 0x26, 0x4d, 0x3b, 0x49, 0xfd, 0x85, 0x2d, 0x55, 0xdd, 0x14, 0x89, 0xc8, 0x5c,
diff --git a/vendor/google.golang.org/grpc/interop/http2/negative_http2_client.go b/vendor/google.golang.org/grpc/interop/http2/negative_http2_client.go
index 1806d465..7658a634 100644
--- a/vendor/google.golang.org/grpc/interop/http2/negative_http2_client.go
+++ b/vendor/google.golang.org/grpc/interop/http2/negative_http2_client.go
@@ -137,22 +137,22 @@ func main() {
 	switch *testCase {
 	case "goaway":
 		goaway(tc)
-		grpclog.Println("goaway done")
+		grpclog.Infoln("goaway done")
 	case "rst_after_header":
 		rstAfterHeader(tc)
-		grpclog.Println("rst_after_header done")
+		grpclog.Infoln("rst_after_header done")
 	case "rst_during_data":
 		rstDuringData(tc)
-		grpclog.Println("rst_during_data done")
+		grpclog.Infoln("rst_during_data done")
 	case "rst_after_data":
 		rstAfterData(tc)
-		grpclog.Println("rst_after_data done")
+		grpclog.Infoln("rst_after_data done")
 	case "ping":
 		ping(tc)
-		grpclog.Println("ping done")
+		grpclog.Infoln("ping done")
 	case "max_streams":
 		maxStreams(tc)
-		grpclog.Println("max_streams done")
+		grpclog.Infoln("max_streams done")
 	default:
 		grpclog.Fatal("Unsupported test case: ", *testCase)
 	}
diff --git a/vendor/google.golang.org/grpc/interop/server/server.go b/vendor/google.golang.org/grpc/interop/server/server.go
index b833c76f..dd0e8976 100644
--- a/vendor/google.golang.org/grpc/interop/server/server.go
+++ b/vendor/google.golang.org/grpc/interop/server/server.go
@@ -25,6 +25,7 @@ import (
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/alts"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/interop"
 	testpb "google.golang.org/grpc/interop/grpc_testing"
@@ -32,14 +33,19 @@ import (
 )
 
 var (
-	useTLS   = flag.Bool("use_tls", false, "Connection uses TLS if true, else plain TCP")
-	certFile = flag.String("tls_cert_file", "", "The TLS cert file")
-	keyFile  = flag.String("tls_key_file", "", "The TLS key file")
-	port     = flag.Int("port", 10000, "The server port")
+	useTLS     = flag.Bool("use_tls", false, "Connection uses TLS if true, else plain TCP")
+	useALTS    = flag.Bool("use_alts", false, "Connection uses ALTS if true (this option can only be used on GCP)")
+	altsHSAddr = flag.String("alts_handshaker_service_address", "", "ALTS handshaker gRPC service address")
+	certFile   = flag.String("tls_cert_file", "", "The TLS cert file")
+	keyFile    = flag.String("tls_key_file", "", "The TLS key file")
+	port       = flag.Int("port", 10000, "The server port")
 )
 
 func main() {
 	flag.Parse()
+	if *useTLS && *useALTS {
+		grpclog.Fatalf("use_tls and use_alts cannot be both set to true")
+	}
 	p := strconv.Itoa(*port)
 	lis, err := net.Listen("tcp", ":"+p)
 	if err != nil {
@@ -57,7 +63,14 @@ func main() {
 		if err != nil {
 			grpclog.Fatalf("Failed to generate credentials %v", err)
 		}
-		opts = []grpc.ServerOption{grpc.Creds(creds)}
+		opts = append(opts, grpc.Creds(creds))
+	} else if *useALTS {
+		altsOpts := alts.DefaultServerOptions()
+		if *altsHSAddr != "" {
+			altsOpts.HandshakerServiceAddress = *altsHSAddr
+		}
+		altsTC := alts.NewServerCreds(altsOpts)
+		opts = append(opts, grpc.Creds(altsTC))
 	}
 	server := grpc.NewServer(opts...)
 	testpb.RegisterTestServiceServer(server, interop.NewTestServer())
diff --git a/vendor/google.golang.org/grpc/interop/test_utils.go b/vendor/google.golang.org/grpc/interop/test_utils.go
index c3cd3fc8..ee1ae703 100644
--- a/vendor/google.golang.org/grpc/interop/test_utils.go
+++ b/vendor/google.golang.org/grpc/interop/test_utils.go
@@ -153,7 +153,7 @@ func DoServerStreaming(tc testpb.TestServiceClient, args ...grpc.CallOption) {
 			grpclog.Fatalf("Got the reply of type %d, want %d", t, testpb.PayloadType_COMPRESSABLE)
 		}
 		size := len(reply.GetPayload().GetBody())
-		if size != int(respSizes[index]) {
+		if size != respSizes[index] {
 			grpclog.Fatalf("Got reply body of length %d, want %d", size, respSizes[index])
 		}
 		index++
@@ -198,7 +198,7 @@ func DoPingPong(tc testpb.TestServiceClient, args ...grpc.CallOption) {
 			grpclog.Fatalf("Got the reply of type %d, want %d", t, testpb.PayloadType_COMPRESSABLE)
 		}
 		size := len(reply.GetPayload().GetBody())
-		if size != int(respSizes[index]) {
+		if size != respSizes[index] {
 			grpclog.Fatalf("Got reply body of length %d, want %d", size, respSizes[index])
 		}
 		index++
@@ -563,6 +563,27 @@ func DoStatusCodeAndMessage(tc testpb.TestServiceClient, args ...grpc.CallOption
 	}
 }
 
+// DoSpecialStatusMessage verifies Unicode and whitespace is correctly processed
+// in status message.
+func DoSpecialStatusMessage(tc testpb.TestServiceClient, args ...grpc.CallOption) {
+	const (
+		code int32  = 2
+		msg  string = "\t\ntest with whitespace\r\nand Unicode BMP ☺ and non-BMP 😈\t\n"
+	)
+	expectedErr := status.Error(codes.Code(code), msg)
+	req := &testpb.SimpleRequest{
+		ResponseStatus: &testpb.EchoStatus{
+			Code:    code,
+			Message: msg,
+		},
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	if _, err := tc.UnaryCall(ctx, req, args...); err == nil || err.Error() != expectedErr.Error() {
+		grpclog.Fatalf("%v.UnaryCall(_, %v) = _, %v, want _, %v", tc, req, err, expectedErr)
+	}
+}
+
 // DoUnimplementedService attempts to call a method from an unimplemented service.
 func DoUnimplementedService(tc testpb.UnimplementedServiceClient) {
 	_, err := tc.UnimplementedCall(context.Background(), &testpb.Empty{})
@@ -574,8 +595,8 @@ func DoUnimplementedService(tc testpb.UnimplementedServiceClient) {
 // DoUnimplementedMethod attempts to call an unimplemented method.
 func DoUnimplementedMethod(cc *grpc.ClientConn) {
 	var req, reply proto.Message
-	if err := grpc.Invoke(context.Background(), "/grpc.testing.TestService/UnimplementedCall", req, reply, cc); err == nil || status.Code(err) != codes.Unimplemented {
-		grpclog.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want error code %s", err, codes.Unimplemented)
+	if err := cc.Invoke(context.Background(), "/grpc.testing.TestService/UnimplementedCall", req, reply); err == nil || status.Code(err) != codes.Unimplemented {
+		grpclog.Fatalf("ClientConn.Invoke(_, _, _, _, _) = %v, want error code %s", err, codes.Unimplemented)
 	}
 }
 
diff --git a/vendor/google.golang.org/grpc/metadata/metadata.go b/vendor/google.golang.org/grpc/metadata/metadata.go
index 15662b5d..bd2eaf40 100644
--- a/vendor/google.golang.org/grpc/metadata/metadata.go
+++ b/vendor/google.golang.org/grpc/metadata/metadata.go
@@ -28,7 +28,9 @@ import (
 	"golang.org/x/net/context"
 )
 
-// DecodeKeyValue returns k, v, nil.  It is deprecated and should not be used.
+// DecodeKeyValue returns k, v, nil.
+//
+// Deprecated: use k and v directly instead.
 func DecodeKeyValue(k, v string) (string, string, error) {
 	return k, v, nil
 }
@@ -95,6 +97,30 @@ func (md MD) Copy() MD {
 	return Join(md)
 }
 
+// Get obtains the values for a given key.
+func (md MD) Get(k string) []string {
+	k = strings.ToLower(k)
+	return md[k]
+}
+
+// Set sets the value of a given key with a slice of values.
+func (md MD) Set(k string, vals ...string) {
+	if len(vals) == 0 {
+		return
+	}
+	k = strings.ToLower(k)
+	md[k] = vals
+}
+
+// Append adds the values to key k, not overwriting what was already stored at that key.
+func (md MD) Append(k string, vals ...string) {
+	if len(vals) == 0 {
+		return
+	}
+	k = strings.ToLower(k)
+	md[k] = append(md[k], vals...)
+}
+
 // Join joins any number of mds into a single MD.
 // The order of values for each key is determined by the order in which
 // the mds containing those values are presented to Join.
@@ -131,7 +157,11 @@ func AppendToOutgoingContext(ctx context.Context, kv ...string) context.Context
 		panic(fmt.Sprintf("metadata: AppendToOutgoingContext got an odd number of input pairs for metadata: %d", len(kv)))
 	}
 	md, _ := ctx.Value(mdOutgoingKey{}).(rawMD)
-	return context.WithValue(ctx, mdOutgoingKey{}, rawMD{md: md.md, added: append(md.added, kv)})
+	added := make([][]string, len(md.added)+1)
+	copy(added, md.added)
+	added[len(added)-1] = make([]string, len(kv))
+	copy(added[len(added)-1], kv)
+	return context.WithValue(ctx, mdOutgoingKey{}, rawMD{md: md.md, added: added})
 }
 
 // FromIncomingContext returns the incoming metadata in ctx if it exists.  The
@@ -159,7 +189,7 @@ func FromOutgoingContextRaw(ctx context.Context) (MD, [][]string, bool) {
 
 // FromOutgoingContext returns the outgoing metadata in ctx if it exists.  The
 // returned MD should not be modified. Writing to it may cause races.
-// Modification should be made to the copies of the returned MD.
+// Modification should be made to copies of the returned MD.
 func FromOutgoingContext(ctx context.Context) (MD, bool) {
 	raw, ok := ctx.Value(mdOutgoingKey{}).(rawMD)
 	if !ok {
diff --git a/vendor/google.golang.org/grpc/metadata/metadata_test.go b/vendor/google.golang.org/grpc/metadata/metadata_test.go
index 6edeeda6..4392145d 100644
--- a/vendor/google.golang.org/grpc/metadata/metadata_test.go
+++ b/vendor/google.golang.org/grpc/metadata/metadata_test.go
@@ -20,6 +20,7 @@ package metadata
 
 import (
 	"reflect"
+	"strconv"
 	"testing"
 
 	"golang.org/x/net/context"
@@ -72,6 +73,90 @@ func TestJoin(t *testing.T) {
 	}
 }
 
+func TestGet(t *testing.T) {
+	for _, test := range []struct {
+		md       MD
+		key      string
+		wantVals []string
+	}{
+		{md: Pairs("My-Optional-Header", "42"), key: "My-Optional-Header", wantVals: []string{"42"}},
+		{md: Pairs("Header", "42", "Header", "43", "Header", "44", "other", "1"), key: "HEADER", wantVals: []string{"42", "43", "44"}},
+		{md: Pairs("HEADER", "10"), key: "HEADER", wantVals: []string{"10"}},
+	} {
+		vals := test.md.Get(test.key)
+		if !reflect.DeepEqual(vals, test.wantVals) {
+			t.Errorf("value of metadata %v is %v, want %v", test.key, vals, test.wantVals)
+		}
+	}
+}
+
+func TestSet(t *testing.T) {
+	for _, test := range []struct {
+		md      MD
+		setKey  string
+		setVals []string
+		want    MD
+	}{
+		{
+			md:      Pairs("My-Optional-Header", "42", "other-key", "999"),
+			setKey:  "Other-Key",
+			setVals: []string{"1"},
+			want:    Pairs("my-optional-header", "42", "other-key", "1"),
+		},
+		{
+			md:      Pairs("My-Optional-Header", "42"),
+			setKey:  "Other-Key",
+			setVals: []string{"1", "2", "3"},
+			want:    Pairs("my-optional-header", "42", "other-key", "1", "other-key", "2", "other-key", "3"),
+		},
+		{
+			md:      Pairs("My-Optional-Header", "42"),
+			setKey:  "Other-Key",
+			setVals: []string{},
+			want:    Pairs("my-optional-header", "42"),
+		},
+	} {
+		test.md.Set(test.setKey, test.setVals...)
+		if !reflect.DeepEqual(test.md, test.want) {
+			t.Errorf("value of metadata is %v, want %v", test.md, test.want)
+		}
+	}
+}
+
+func TestAppend(t *testing.T) {
+	for _, test := range []struct {
+		md         MD
+		appendKey  string
+		appendVals []string
+		want       MD
+	}{
+		{
+			md:         Pairs("My-Optional-Header", "42"),
+			appendKey:  "Other-Key",
+			appendVals: []string{"1"},
+			want:       Pairs("my-optional-header", "42", "other-key", "1"),
+		},
+		{
+			md:         Pairs("My-Optional-Header", "42"),
+			appendKey:  "my-OptIoNal-HeAder",
+			appendVals: []string{"1", "2", "3"},
+			want: Pairs("my-optional-header", "42", "my-optional-header", "1",
+				"my-optional-header", "2", "my-optional-header", "3"),
+		},
+		{
+			md:         Pairs("My-Optional-Header", "42"),
+			appendKey:  "my-OptIoNal-HeAder",
+			appendVals: []string{},
+			want:       Pairs("my-optional-header", "42"),
+		},
+	} {
+		test.md.Append(test.appendKey, test.appendVals...)
+		if !reflect.DeepEqual(test.md, test.want) {
+			t.Errorf("value of metadata is %v, want %v", test.md, test.want)
+		}
+	}
+}
+
 func TestAppendToOutgoingContext(t *testing.T) {
 	// Pre-existing metadata
 	ctx := NewOutgoingContext(context.Background(), Pairs("k1", "v1", "k2", "v2"))
@@ -98,19 +183,60 @@ func TestAppendToOutgoingContext(t *testing.T) {
 	}
 }
 
+func TestAppendToOutgoingContext_Repeated(t *testing.T) {
+	ctx := context.Background()
+
+	for i := 0; i < 100; i = i + 2 {
+		ctx1 := AppendToOutgoingContext(ctx, "k", strconv.Itoa(i))
+		ctx2 := AppendToOutgoingContext(ctx, "k", strconv.Itoa(i+1))
+
+		md1, _ := FromOutgoingContext(ctx1)
+		md2, _ := FromOutgoingContext(ctx2)
+
+		if reflect.DeepEqual(md1, md2) {
+			t.Fatalf("md1, md2 = %v, %v; should not be equal", md1, md2)
+		}
+
+		ctx = ctx1
+	}
+}
+
+func TestAppendToOutgoingContext_FromKVSlice(t *testing.T) {
+	const k, v = "a", "b"
+	kv := []string{k, v}
+	ctx := AppendToOutgoingContext(context.Background(), kv...)
+	md, _ := FromOutgoingContext(ctx)
+	if md[k][0] != v {
+		t.Fatalf("md[%q] = %q; want %q", k, md[k], v)
+	}
+	kv[1] = "xxx"
+	md, _ = FromOutgoingContext(ctx)
+	if md[k][0] != v {
+		t.Fatalf("md[%q] = %q; want %q", k, md[k], v)
+	}
+}
+
 // Old/slow approach to adding metadata to context
 func Benchmark_AddingMetadata_ContextManipulationApproach(b *testing.B) {
+	// TODO: Add in N=1-100 tests once Go1.6 support is removed.
+	const num = 10
 	for n := 0; n < b.N; n++ {
 		ctx := context.Background()
-		md, _ := FromOutgoingContext(ctx)
-		NewOutgoingContext(ctx, Join(Pairs("k1", "v1", "k2", "v2"), md))
+		for i := 0; i < num; i++ {
+			md, _ := FromOutgoingContext(ctx)
+			NewOutgoingContext(ctx, Join(Pairs("k1", "v1", "k2", "v2"), md))
+		}
 	}
 }
 
 // Newer/faster approach to adding metadata to context
 func BenchmarkAppendToOutgoingContext(b *testing.B) {
+	const num = 10
 	for n := 0; n < b.N; n++ {
-		AppendToOutgoingContext(context.Background(), "k1", "v1", "k2", "v2")
+		ctx := context.Background()
+		for i := 0; i < num; i++ {
+			ctx = AppendToOutgoingContext(ctx, "k1", "v1", "k2", "v2")
+		}
 	}
 }
 
diff --git a/vendor/google.golang.org/grpc/naming/dns_resolver.go b/vendor/google.golang.org/grpc/naming/dns_resolver.go
index 7e69a2ca..0f8a908e 100644
--- a/vendor/google.golang.org/grpc/naming/dns_resolver.go
+++ b/vendor/google.golang.org/grpc/naming/dns_resolver.go
@@ -153,10 +153,10 @@ type ipWatcher struct {
 	updateChan chan *Update
 }
 
-// Next returns the adrress resolution Update for the target. For IP address,
-// the resolution is itself, thus polling name server is unncessary. Therefore,
+// Next returns the address resolution Update for the target. For IP address,
+// the resolution is itself, thus polling name server is unnecessary. Therefore,
 // Next() will return an Update the first time it is called, and will be blocked
-// for all following calls as no Update exisits until watcher is closed.
+// for all following calls as no Update exists until watcher is closed.
 func (i *ipWatcher) Next() ([]*Update, error) {
 	u, ok := <-i.updateChan
 	if !ok {
diff --git a/vendor/google.golang.org/grpc/naming/naming.go b/vendor/google.golang.org/grpc/naming/naming.go
index 1af7e32f..8cc39e93 100644
--- a/vendor/google.golang.org/grpc/naming/naming.go
+++ b/vendor/google.golang.org/grpc/naming/naming.go
@@ -18,20 +18,26 @@
 
 // Package naming defines the naming API and related data structures for gRPC.
 // The interface is EXPERIMENTAL and may be suject to change.
+//
+// Deprecated: please use package resolver.
 package naming
 
 // Operation defines the corresponding operations for a name resolution change.
+//
+// Deprecated: please use package resolver.
 type Operation uint8
 
 const (
 	// Add indicates a new address is added.
 	Add Operation = iota
-	// Delete indicates an exisiting address is deleted.
+	// Delete indicates an existing address is deleted.
 	Delete
 )
 
 // Update defines a name resolution update. Notice that it is not valid having both
 // empty string Addr and nil Metadata in an Update.
+//
+// Deprecated: please use package resolver.
 type Update struct {
 	// Op indicates the operation of the update.
 	Op Operation
@@ -43,12 +49,16 @@ type Update struct {
 }
 
 // Resolver creates a Watcher for a target to track its resolution changes.
+//
+// Deprecated: please use package resolver.
 type Resolver interface {
 	// Resolve creates a Watcher for target.
 	Resolve(target string) (Watcher, error)
 }
 
 // Watcher watches for the updates on the specified target.
+//
+// Deprecated: please use package resolver.
 type Watcher interface {
 	// Next blocks until an update or error happens. It may return one or more
 	// updates. The first call should get the full set of the results. It should
diff --git a/vendor/google.golang.org/grpc/picker_wrapper.go b/vendor/google.golang.org/grpc/picker_wrapper.go
index db82bfb3..76cc456a 100644
--- a/vendor/google.golang.org/grpc/picker_wrapper.go
+++ b/vendor/google.golang.org/grpc/picker_wrapper.go
@@ -19,14 +19,16 @@
 package grpc
 
 import (
+	"io"
 	"sync"
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/transport"
 )
 
 // pickerWrapper is a wrapper of balancer.Picker. It blocks on certain pick
@@ -36,6 +38,10 @@ type pickerWrapper struct {
 	done       bool
 	blockingCh chan struct{}
 	picker     balancer.Picker
+
+	// The latest connection happened.
+	connErrMu sync.Mutex
+	connErr   error
 }
 
 func newPickerWrapper() *pickerWrapper {
@@ -43,6 +49,19 @@ func newPickerWrapper() *pickerWrapper {
 	return bp
 }
 
+func (bp *pickerWrapper) updateConnectionError(err error) {
+	bp.connErrMu.Lock()
+	bp.connErr = err
+	bp.connErrMu.Unlock()
+}
+
+func (bp *pickerWrapper) connectionError() error {
+	bp.connErrMu.Lock()
+	err := bp.connErr
+	bp.connErrMu.Unlock()
+	return err
+}
+
 // updatePicker is called by UpdateBalancerState. It unblocks all blocked pick.
 func (bp *pickerWrapper) updatePicker(p balancer.Picker) {
 	bp.mu.Lock()
@@ -57,6 +76,23 @@ func (bp *pickerWrapper) updatePicker(p balancer.Picker) {
 	bp.mu.Unlock()
 }
 
+func doneChannelzWrapper(acw *acBalancerWrapper, done func(balancer.DoneInfo)) func(balancer.DoneInfo) {
+	acw.mu.Lock()
+	ac := acw.ac
+	acw.mu.Unlock()
+	ac.incrCallsStarted()
+	return func(b balancer.DoneInfo) {
+		if b.Err != nil && b.Err != io.EOF {
+			ac.incrCallsFailed()
+		} else {
+			ac.incrCallsSucceeded()
+		}
+		if done != nil {
+			done(b)
+		}
+	}
+}
+
 // pick returns the transport that will be used for the RPC.
 // It may block in the following cases:
 // - there's no picker
@@ -107,7 +143,7 @@ func (bp *pickerWrapper) pick(ctx context.Context, failfast bool, opts balancer.
 				if !failfast {
 					continue
 				}
-				return nil, nil, status.Errorf(codes.Unavailable, "%v", err)
+				return nil, nil, status.Errorf(codes.Unavailable, "%v, latest connection error: %v", err, bp.connectionError())
 			default:
 				// err is some other error.
 				return nil, nil, toRPCErr(err)
@@ -120,6 +156,9 @@ func (bp *pickerWrapper) pick(ctx context.Context, failfast bool, opts balancer.
 			continue
 		}
 		if t, ok := acw.getAddrConn().getReadyTransport(); ok {
+			if channelz.IsOn() {
+				return t, doneChannelzWrapper(acw, done), nil
+			}
 			return t, done, nil
 		}
 		grpclog.Infof("blockingPicker: the picked transport is not ready, loop back to repick")
diff --git a/vendor/google.golang.org/grpc/picker_wrapper_test.go b/vendor/google.golang.org/grpc/picker_wrapper_test.go
index 37dffa9e..34c6c891 100644
--- a/vendor/google.golang.org/grpc/picker_wrapper_test.go
+++ b/vendor/google.golang.org/grpc/picker_wrapper_test.go
@@ -28,8 +28,8 @@ import (
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/connectivity"
 	_ "google.golang.org/grpc/grpclog/glogger"
-	"google.golang.org/grpc/test/leakcheck"
-	"google.golang.org/grpc/transport"
+	"google.golang.org/grpc/internal/leakcheck"
+	"google.golang.org/grpc/internal/transport"
 )
 
 const goroutineCount = 5
diff --git a/vendor/google.golang.org/grpc/pickfirst_test.go b/vendor/google.golang.org/grpc/pickfirst_test.go
index 2f85febf..7f8169f1 100644
--- a/vendor/google.golang.org/grpc/pickfirst_test.go
+++ b/vendor/google.golang.org/grpc/pickfirst_test.go
@@ -26,10 +26,10 @@ import (
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/resolver/manual"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/test/leakcheck"
 )
 
 func errorDesc(err error) string {
@@ -58,14 +58,14 @@ func TestOneBackendPickfirst(t *testing.T) {
 	defer cancel()
 	req := "port"
 	var reply string
-	if err := Invoke(ctx, "/foo/bar", &req, &reply, cc); err == nil || status.Code(err) != codes.DeadlineExceeded {
+	if err := cc.Invoke(ctx, "/foo/bar", &req, &reply); err == nil || status.Code(err) != codes.DeadlineExceeded {
 		t.Fatalf("EmptyCall() = _, %v, want _, DeadlineExceeded", err)
 	}
 
 	r.NewAddress([]resolver.Address{{Addr: servers[0].addr}})
 	// The second RPC should succeed.
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[0].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[0].port {
 			return
 		}
 		time.Sleep(time.Millisecond)
@@ -92,14 +92,14 @@ func TestBackendsPickfirst(t *testing.T) {
 	defer cancel()
 	req := "port"
 	var reply string
-	if err := Invoke(ctx, "/foo/bar", &req, &reply, cc); err == nil || status.Code(err) != codes.DeadlineExceeded {
+	if err := cc.Invoke(ctx, "/foo/bar", &req, &reply); err == nil || status.Code(err) != codes.DeadlineExceeded {
 		t.Fatalf("EmptyCall() = _, %v, want _, DeadlineExceeded", err)
 	}
 
 	r.NewAddress([]resolver.Address{{Addr: servers[0].addr}, {Addr: servers[1].addr}})
 	// The second RPC should succeed with the first server.
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[0].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[0].port {
 			return
 		}
 		time.Sleep(time.Millisecond)
@@ -126,7 +126,7 @@ func TestNewAddressWhileBlockingPickfirst(t *testing.T) {
 	defer cancel()
 	req := "port"
 	var reply string
-	if err := Invoke(ctx, "/foo/bar", &req, &reply, cc); err == nil || status.Code(err) != codes.DeadlineExceeded {
+	if err := cc.Invoke(ctx, "/foo/bar", &req, &reply); err == nil || status.Code(err) != codes.DeadlineExceeded {
 		t.Fatalf("EmptyCall() = _, %v, want _, DeadlineExceeded", err)
 	}
 
@@ -136,7 +136,7 @@ func TestNewAddressWhileBlockingPickfirst(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			// This RPC blocks until NewAddress is called.
-			Invoke(context.Background(), "/foo/bar", &req, &reply, cc)
+			cc.Invoke(context.Background(), "/foo/bar", &req, &reply)
 		}()
 	}
 	time.Sleep(50 * time.Millisecond)
@@ -163,7 +163,7 @@ func TestCloseWithPendingRPCPickfirst(t *testing.T) {
 	defer cancel()
 	req := "port"
 	var reply string
-	if err := Invoke(ctx, "/foo/bar", &req, &reply, cc); err == nil || status.Code(err) != codes.DeadlineExceeded {
+	if err := cc.Invoke(ctx, "/foo/bar", &req, &reply); err == nil || status.Code(err) != codes.DeadlineExceeded {
 		t.Fatalf("EmptyCall() = _, %v, want _, DeadlineExceeded", err)
 	}
 
@@ -173,7 +173,7 @@ func TestCloseWithPendingRPCPickfirst(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			// This RPC blocks until NewAddress is called.
-			Invoke(context.Background(), "/foo/bar", &req, &reply, cc)
+			cc.Invoke(context.Background(), "/foo/bar", &req, &reply)
 		}()
 	}
 	time.Sleep(50 * time.Millisecond)
@@ -200,14 +200,14 @@ func TestOneServerDownPickfirst(t *testing.T) {
 	defer cancel()
 	req := "port"
 	var reply string
-	if err := Invoke(ctx, "/foo/bar", &req, &reply, cc); err == nil || status.Code(err) != codes.DeadlineExceeded {
+	if err := cc.Invoke(ctx, "/foo/bar", &req, &reply); err == nil || status.Code(err) != codes.DeadlineExceeded {
 		t.Fatalf("EmptyCall() = _, %v, want _, DeadlineExceeded", err)
 	}
 
 	r.NewAddress([]resolver.Address{{Addr: servers[0].addr}, {Addr: servers[1].addr}})
 	// The second RPC should succeed with the first server.
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[0].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[0].port {
 			break
 		}
 		time.Sleep(time.Millisecond)
@@ -215,7 +215,7 @@ func TestOneServerDownPickfirst(t *testing.T) {
 
 	servers[0].stop()
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[1].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[1].port {
 			return
 		}
 		time.Sleep(time.Millisecond)
@@ -242,14 +242,14 @@ func TestAllServersDownPickfirst(t *testing.T) {
 	defer cancel()
 	req := "port"
 	var reply string
-	if err := Invoke(ctx, "/foo/bar", &req, &reply, cc); err == nil || status.Code(err) != codes.DeadlineExceeded {
+	if err := cc.Invoke(ctx, "/foo/bar", &req, &reply); err == nil || status.Code(err) != codes.DeadlineExceeded {
 		t.Fatalf("EmptyCall() = _, %v, want _, DeadlineExceeded", err)
 	}
 
 	r.NewAddress([]resolver.Address{{Addr: servers[0].addr}, {Addr: servers[1].addr}})
 	// The second RPC should succeed with the first server.
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[0].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[0].port {
 			break
 		}
 		time.Sleep(time.Millisecond)
@@ -259,7 +259,7 @@ func TestAllServersDownPickfirst(t *testing.T) {
 		servers[i].stop()
 	}
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); status.Code(err) == codes.Unavailable {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); status.Code(err) == codes.Unavailable {
 			return
 		}
 		time.Sleep(time.Millisecond)
@@ -286,19 +286,19 @@ func TestAddressesRemovedPickfirst(t *testing.T) {
 	defer cancel()
 	req := "port"
 	var reply string
-	if err := Invoke(ctx, "/foo/bar", &req, &reply, cc); err == nil || status.Code(err) != codes.DeadlineExceeded {
+	if err := cc.Invoke(ctx, "/foo/bar", &req, &reply); err == nil || status.Code(err) != codes.DeadlineExceeded {
 		t.Fatalf("EmptyCall() = _, %v, want _, DeadlineExceeded", err)
 	}
 
 	r.NewAddress([]resolver.Address{{Addr: servers[0].addr}, {Addr: servers[1].addr}, {Addr: servers[2].addr}})
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[0].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[0].port {
 			break
 		}
 		time.Sleep(time.Millisecond)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[0].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[0].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 0, err, servers[0].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -307,13 +307,13 @@ func TestAddressesRemovedPickfirst(t *testing.T) {
 	// Remove server[0].
 	r.NewAddress([]resolver.Address{{Addr: servers[1].addr}, {Addr: servers[2].addr}})
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[1].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[1].port {
 			break
 		}
 		time.Sleep(time.Millisecond)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[1].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 1, err, servers[1].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -322,7 +322,7 @@ func TestAddressesRemovedPickfirst(t *testing.T) {
 	// Append server[0], nothing should change.
 	r.NewAddress([]resolver.Address{{Addr: servers[1].addr}, {Addr: servers[2].addr}, {Addr: servers[0].addr}})
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[1].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[1].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 1, err, servers[1].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -331,13 +331,13 @@ func TestAddressesRemovedPickfirst(t *testing.T) {
 	// Remove server[1].
 	r.NewAddress([]resolver.Address{{Addr: servers[2].addr}, {Addr: servers[0].addr}})
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[2].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[2].port {
 			break
 		}
 		time.Sleep(time.Millisecond)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[2].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[2].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 2, err, servers[2].port)
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -346,13 +346,13 @@ func TestAddressesRemovedPickfirst(t *testing.T) {
 	// Remove server[2].
 	r.NewAddress([]resolver.Address{{Addr: servers[0].addr}})
 	for i := 0; i < 1000; i++ {
-		if err = Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err != nil && errorDesc(err) == servers[0].port {
+		if err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err != nil && errorDesc(err) == servers[0].port {
 			break
 		}
 		time.Sleep(time.Millisecond)
 	}
 	for i := 0; i < 20; i++ {
-		if err := Invoke(context.Background(), "/foo/bar", &req, &reply, cc); err == nil || errorDesc(err) != servers[0].port {
+		if err := cc.Invoke(context.Background(), "/foo/bar", &req, &reply); err == nil || errorDesc(err) != servers[0].port {
 			t.Fatalf("Index %d: Invoke(_, _, _, _, _) = %v, want %s", 0, err, servers[0].port)
 		}
 		time.Sleep(10 * time.Millisecond)
diff --git a/vendor/google.golang.org/grpc/proxy_test.go b/vendor/google.golang.org/grpc/proxy_test.go
index 39ee123c..7183ba34 100644
--- a/vendor/google.golang.org/grpc/proxy_test.go
+++ b/vendor/google.golang.org/grpc/proxy_test.go
@@ -30,7 +30,7 @@ import (
 	"time"
 
 	"golang.org/x/net/context"
-	"google.golang.org/grpc/test/leakcheck"
+	"google.golang.org/grpc/internal/leakcheck"
 )
 
 const (
@@ -113,7 +113,7 @@ func TestHTTPConnect(t *testing.T) {
 	}
 
 	msg := []byte{4, 3, 5, 2}
-	recvBuf := make([]byte, len(msg), len(msg))
+	recvBuf := make([]byte, len(msg))
 	done := make(chan struct{})
 	go func() {
 		in, err := blis.Accept()
diff --git a/vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.pb.go b/vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.pb.go
index b4072532..ae5aa7db 100644
--- a/vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.pb.go
+++ b/vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.pb.go
@@ -1,22 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: grpc_reflection_v1alpha/reflection.proto
 
-/*
-Package grpc_reflection_v1alpha is a generated protocol buffer package.
-
-It is generated from these files:
-	grpc_reflection_v1alpha/reflection.proto
-
-It has these top-level messages:
-	ServerReflectionRequest
-	ExtensionRequest
-	ServerReflectionResponse
-	FileDescriptorResponse
-	ExtensionNumberResponse
-	ListServiceResponse
-	ServiceResponse
-	ErrorResponse
-*/
 package grpc_reflection_v1alpha
 
 import proto "github.com/golang/protobuf/proto"
@@ -41,7 +25,7 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // The message sent by the client when calling ServerReflectionInfo method.
 type ServerReflectionRequest struct {
-	Host string `protobuf:"bytes,1,opt,name=host" json:"host,omitempty"`
+	Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
 	// To use reflection service, the client should set one of the following
 	// fields in message_request. The server distinguishes requests by their
 	// defined field and then handles them using corresponding methods.
@@ -52,39 +36,76 @@ type ServerReflectionRequest struct {
 	//	*ServerReflectionRequest_FileContainingExtension
 	//	*ServerReflectionRequest_AllExtensionNumbersOfType
 	//	*ServerReflectionRequest_ListServices
-	MessageRequest isServerReflectionRequest_MessageRequest `protobuf_oneof:"message_request"`
+	MessageRequest       isServerReflectionRequest_MessageRequest `protobuf_oneof:"message_request"`
+	XXX_NoUnkeyedLiteral struct{}                                 `json:"-"`
+	XXX_unrecognized     []byte                                   `json:"-"`
+	XXX_sizecache        int32                                    `json:"-"`
 }
 
-func (m *ServerReflectionRequest) Reset()                    { *m = ServerReflectionRequest{} }
-func (m *ServerReflectionRequest) String() string            { return proto.CompactTextString(m) }
-func (*ServerReflectionRequest) ProtoMessage()               {}
-func (*ServerReflectionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *ServerReflectionRequest) Reset()         { *m = ServerReflectionRequest{} }
+func (m *ServerReflectionRequest) String() string { return proto.CompactTextString(m) }
+func (*ServerReflectionRequest) ProtoMessage()    {}
+func (*ServerReflectionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reflection_178bd1e101bf8b63, []int{0}
+}
+func (m *ServerReflectionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerReflectionRequest.Unmarshal(m, b)
+}
+func (m *ServerReflectionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerReflectionRequest.Marshal(b, m, deterministic)
+}
+func (dst *ServerReflectionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerReflectionRequest.Merge(dst, src)
+}
+func (m *ServerReflectionRequest) XXX_Size() int {
+	return xxx_messageInfo_ServerReflectionRequest.Size(m)
+}
+func (m *ServerReflectionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerReflectionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerReflectionRequest proto.InternalMessageInfo
+
+func (m *ServerReflectionRequest) GetHost() string {
+	if m != nil {
+		return m.Host
+	}
+	return ""
+}
 
 type isServerReflectionRequest_MessageRequest interface {
 	isServerReflectionRequest_MessageRequest()
 }
 
 type ServerReflectionRequest_FileByFilename struct {
-	FileByFilename string `protobuf:"bytes,3,opt,name=file_by_filename,json=fileByFilename,oneof"`
+	FileByFilename string `protobuf:"bytes,3,opt,name=file_by_filename,json=fileByFilename,proto3,oneof"`
 }
+
 type ServerReflectionRequest_FileContainingSymbol struct {
-	FileContainingSymbol string `protobuf:"bytes,4,opt,name=file_containing_symbol,json=fileContainingSymbol,oneof"`
+	FileContainingSymbol string `protobuf:"bytes,4,opt,name=file_containing_symbol,json=fileContainingSymbol,proto3,oneof"`
 }
+
 type ServerReflectionRequest_FileContainingExtension struct {
-	FileContainingExtension *ExtensionRequest `protobuf:"bytes,5,opt,name=file_containing_extension,json=fileContainingExtension,oneof"`
+	FileContainingExtension *ExtensionRequest `protobuf:"bytes,5,opt,name=file_containing_extension,json=fileContainingExtension,proto3,oneof"`
 }
+
 type ServerReflectionRequest_AllExtensionNumbersOfType struct {
-	AllExtensionNumbersOfType string `protobuf:"bytes,6,opt,name=all_extension_numbers_of_type,json=allExtensionNumbersOfType,oneof"`
+	AllExtensionNumbersOfType string `protobuf:"bytes,6,opt,name=all_extension_numbers_of_type,json=allExtensionNumbersOfType,proto3,oneof"`
 }
+
 type ServerReflectionRequest_ListServices struct {
-	ListServices string `protobuf:"bytes,7,opt,name=list_services,json=listServices,oneof"`
+	ListServices string `protobuf:"bytes,7,opt,name=list_services,json=listServices,proto3,oneof"`
 }
 
-func (*ServerReflectionRequest_FileByFilename) isServerReflectionRequest_MessageRequest()            {}
-func (*ServerReflectionRequest_FileContainingSymbol) isServerReflectionRequest_MessageRequest()      {}
-func (*ServerReflectionRequest_FileContainingExtension) isServerReflectionRequest_MessageRequest()   {}
+func (*ServerReflectionRequest_FileByFilename) isServerReflectionRequest_MessageRequest() {}
+
+func (*ServerReflectionRequest_FileContainingSymbol) isServerReflectionRequest_MessageRequest() {}
+
+func (*ServerReflectionRequest_FileContainingExtension) isServerReflectionRequest_MessageRequest() {}
+
 func (*ServerReflectionRequest_AllExtensionNumbersOfType) isServerReflectionRequest_MessageRequest() {}
-func (*ServerReflectionRequest_ListServices) isServerReflectionRequest_MessageRequest()              {}
+
+func (*ServerReflectionRequest_ListServices) isServerReflectionRequest_MessageRequest() {}
 
 func (m *ServerReflectionRequest) GetMessageRequest() isServerReflectionRequest_MessageRequest {
 	if m != nil {
@@ -93,13 +114,6 @@ func (m *ServerReflectionRequest) GetMessageRequest() isServerReflectionRequest_
 	return nil
 }
 
-func (m *ServerReflectionRequest) GetHost() string {
-	if m != nil {
-		return m.Host
-	}
-	return ""
-}
-
 func (m *ServerReflectionRequest) GetFileByFilename() string {
 	if x, ok := m.GetMessageRequest().(*ServerReflectionRequest_FileByFilename); ok {
 		return x.FileByFilename
@@ -223,24 +237,24 @@ func _ServerReflectionRequest_OneofSizer(msg proto.Message) (n int) {
 	// message_request
 	switch x := m.MessageRequest.(type) {
 	case *ServerReflectionRequest_FileByFilename:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.FileByFilename)))
 		n += len(x.FileByFilename)
 	case *ServerReflectionRequest_FileContainingSymbol:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.FileContainingSymbol)))
 		n += len(x.FileContainingSymbol)
 	case *ServerReflectionRequest_FileContainingExtension:
 		s := proto.Size(x.FileContainingExtension)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ServerReflectionRequest_AllExtensionNumbersOfType:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.AllExtensionNumbersOfType)))
 		n += len(x.AllExtensionNumbersOfType)
 	case *ServerReflectionRequest_ListServices:
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.ListServices)))
 		n += len(x.ListServices)
 	case nil:
@@ -254,14 +268,36 @@ func _ServerReflectionRequest_OneofSizer(msg proto.Message) (n int) {
 // file_containing_extension.
 type ExtensionRequest struct {
 	// Fully-qualified type name. The format should be <package>.<type>
-	ContainingType  string `protobuf:"bytes,1,opt,name=containing_type,json=containingType" json:"containing_type,omitempty"`
-	ExtensionNumber int32  `protobuf:"varint,2,opt,name=extension_number,json=extensionNumber" json:"extension_number,omitempty"`
+	ContainingType       string   `protobuf:"bytes,1,opt,name=containing_type,json=containingType,proto3" json:"containing_type,omitempty"`
+	ExtensionNumber      int32    `protobuf:"varint,2,opt,name=extension_number,json=extensionNumber,proto3" json:"extension_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ExtensionRequest) Reset()                    { *m = ExtensionRequest{} }
-func (m *ExtensionRequest) String() string            { return proto.CompactTextString(m) }
-func (*ExtensionRequest) ProtoMessage()               {}
-func (*ExtensionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *ExtensionRequest) Reset()         { *m = ExtensionRequest{} }
+func (m *ExtensionRequest) String() string { return proto.CompactTextString(m) }
+func (*ExtensionRequest) ProtoMessage()    {}
+func (*ExtensionRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reflection_178bd1e101bf8b63, []int{1}
+}
+func (m *ExtensionRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExtensionRequest.Unmarshal(m, b)
+}
+func (m *ExtensionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExtensionRequest.Marshal(b, m, deterministic)
+}
+func (dst *ExtensionRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionRequest.Merge(dst, src)
+}
+func (m *ExtensionRequest) XXX_Size() int {
+	return xxx_messageInfo_ExtensionRequest.Size(m)
+}
+func (m *ExtensionRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExtensionRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExtensionRequest proto.InternalMessageInfo
 
 func (m *ExtensionRequest) GetContainingType() string {
 	if m != nil {
@@ -279,46 +315,88 @@ func (m *ExtensionRequest) GetExtensionNumber() int32 {
 
 // The message sent by the server to answer ServerReflectionInfo method.
 type ServerReflectionResponse struct {
-	ValidHost       string                   `protobuf:"bytes,1,opt,name=valid_host,json=validHost" json:"valid_host,omitempty"`
-	OriginalRequest *ServerReflectionRequest `protobuf:"bytes,2,opt,name=original_request,json=originalRequest" json:"original_request,omitempty"`
-	// The server set one of the following fields according to the message_request
-	// in the request.
+	ValidHost       string                   `protobuf:"bytes,1,opt,name=valid_host,json=validHost,proto3" json:"valid_host,omitempty"`
+	OriginalRequest *ServerReflectionRequest `protobuf:"bytes,2,opt,name=original_request,json=originalRequest,proto3" json:"original_request,omitempty"`
+	// The server sets one of the following fields according to the
+	// message_request in the request.
 	//
 	// Types that are valid to be assigned to MessageResponse:
 	//	*ServerReflectionResponse_FileDescriptorResponse
 	//	*ServerReflectionResponse_AllExtensionNumbersResponse
 	//	*ServerReflectionResponse_ListServicesResponse
 	//	*ServerReflectionResponse_ErrorResponse
-	MessageResponse isServerReflectionResponse_MessageResponse `protobuf_oneof:"message_response"`
+	MessageResponse      isServerReflectionResponse_MessageResponse `protobuf_oneof:"message_response"`
+	XXX_NoUnkeyedLiteral struct{}                                   `json:"-"`
+	XXX_unrecognized     []byte                                     `json:"-"`
+	XXX_sizecache        int32                                      `json:"-"`
 }
 
-func (m *ServerReflectionResponse) Reset()                    { *m = ServerReflectionResponse{} }
-func (m *ServerReflectionResponse) String() string            { return proto.CompactTextString(m) }
-func (*ServerReflectionResponse) ProtoMessage()               {}
-func (*ServerReflectionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *ServerReflectionResponse) Reset()         { *m = ServerReflectionResponse{} }
+func (m *ServerReflectionResponse) String() string { return proto.CompactTextString(m) }
+func (*ServerReflectionResponse) ProtoMessage()    {}
+func (*ServerReflectionResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reflection_178bd1e101bf8b63, []int{2}
+}
+func (m *ServerReflectionResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServerReflectionResponse.Unmarshal(m, b)
+}
+func (m *ServerReflectionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServerReflectionResponse.Marshal(b, m, deterministic)
+}
+func (dst *ServerReflectionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServerReflectionResponse.Merge(dst, src)
+}
+func (m *ServerReflectionResponse) XXX_Size() int {
+	return xxx_messageInfo_ServerReflectionResponse.Size(m)
+}
+func (m *ServerReflectionResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServerReflectionResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServerReflectionResponse proto.InternalMessageInfo
+
+func (m *ServerReflectionResponse) GetValidHost() string {
+	if m != nil {
+		return m.ValidHost
+	}
+	return ""
+}
+
+func (m *ServerReflectionResponse) GetOriginalRequest() *ServerReflectionRequest {
+	if m != nil {
+		return m.OriginalRequest
+	}
+	return nil
+}
 
 type isServerReflectionResponse_MessageResponse interface {
 	isServerReflectionResponse_MessageResponse()
 }
 
 type ServerReflectionResponse_FileDescriptorResponse struct {
-	FileDescriptorResponse *FileDescriptorResponse `protobuf:"bytes,4,opt,name=file_descriptor_response,json=fileDescriptorResponse,oneof"`
+	FileDescriptorResponse *FileDescriptorResponse `protobuf:"bytes,4,opt,name=file_descriptor_response,json=fileDescriptorResponse,proto3,oneof"`
 }
+
 type ServerReflectionResponse_AllExtensionNumbersResponse struct {
-	AllExtensionNumbersResponse *ExtensionNumberResponse `protobuf:"bytes,5,opt,name=all_extension_numbers_response,json=allExtensionNumbersResponse,oneof"`
+	AllExtensionNumbersResponse *ExtensionNumberResponse `protobuf:"bytes,5,opt,name=all_extension_numbers_response,json=allExtensionNumbersResponse,proto3,oneof"`
 }
+
 type ServerReflectionResponse_ListServicesResponse struct {
-	ListServicesResponse *ListServiceResponse `protobuf:"bytes,6,opt,name=list_services_response,json=listServicesResponse,oneof"`
+	ListServicesResponse *ListServiceResponse `protobuf:"bytes,6,opt,name=list_services_response,json=listServicesResponse,proto3,oneof"`
 }
+
 type ServerReflectionResponse_ErrorResponse struct {
-	ErrorResponse *ErrorResponse `protobuf:"bytes,7,opt,name=error_response,json=errorResponse,oneof"`
+	ErrorResponse *ErrorResponse `protobuf:"bytes,7,opt,name=error_response,json=errorResponse,proto3,oneof"`
 }
 
 func (*ServerReflectionResponse_FileDescriptorResponse) isServerReflectionResponse_MessageResponse() {}
+
 func (*ServerReflectionResponse_AllExtensionNumbersResponse) isServerReflectionResponse_MessageResponse() {
 }
+
 func (*ServerReflectionResponse_ListServicesResponse) isServerReflectionResponse_MessageResponse() {}
-func (*ServerReflectionResponse_ErrorResponse) isServerReflectionResponse_MessageResponse()        {}
+
+func (*ServerReflectionResponse_ErrorResponse) isServerReflectionResponse_MessageResponse() {}
 
 func (m *ServerReflectionResponse) GetMessageResponse() isServerReflectionResponse_MessageResponse {
 	if m != nil {
@@ -327,20 +405,6 @@ func (m *ServerReflectionResponse) GetMessageResponse() isServerReflectionRespon
 	return nil
 }
 
-func (m *ServerReflectionResponse) GetValidHost() string {
-	if m != nil {
-		return m.ValidHost
-	}
-	return ""
-}
-
-func (m *ServerReflectionResponse) GetOriginalRequest() *ServerReflectionRequest {
-	if m != nil {
-		return m.OriginalRequest
-	}
-	return nil
-}
-
 func (m *ServerReflectionResponse) GetFileDescriptorResponse() *FileDescriptorResponse {
 	if x, ok := m.GetMessageResponse().(*ServerReflectionResponse_FileDescriptorResponse); ok {
 		return x.FileDescriptorResponse
@@ -456,22 +520,22 @@ func _ServerReflectionResponse_OneofSizer(msg proto.Message) (n int) {
 	switch x := m.MessageResponse.(type) {
 	case *ServerReflectionResponse_FileDescriptorResponse:
 		s := proto.Size(x.FileDescriptorResponse)
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ServerReflectionResponse_AllExtensionNumbersResponse:
 		s := proto.Size(x.AllExtensionNumbersResponse)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ServerReflectionResponse_ListServicesResponse:
 		s := proto.Size(x.ListServicesResponse)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case *ServerReflectionResponse_ErrorResponse:
 		s := proto.Size(x.ErrorResponse)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
 	case nil:
@@ -488,13 +552,35 @@ type FileDescriptorResponse struct {
 	// Serialized FileDescriptorProto messages. We avoid taking a dependency on
 	// descriptor.proto, which uses proto2 only features, by making them opaque
 	// bytes instead.
-	FileDescriptorProto [][]byte `protobuf:"bytes,1,rep,name=file_descriptor_proto,json=fileDescriptorProto,proto3" json:"file_descriptor_proto,omitempty"`
+	FileDescriptorProto  [][]byte `protobuf:"bytes,1,rep,name=file_descriptor_proto,json=fileDescriptorProto,proto3" json:"file_descriptor_proto,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FileDescriptorResponse) Reset()         { *m = FileDescriptorResponse{} }
+func (m *FileDescriptorResponse) String() string { return proto.CompactTextString(m) }
+func (*FileDescriptorResponse) ProtoMessage()    {}
+func (*FileDescriptorResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reflection_178bd1e101bf8b63, []int{3}
+}
+func (m *FileDescriptorResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FileDescriptorResponse.Unmarshal(m, b)
+}
+func (m *FileDescriptorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FileDescriptorResponse.Marshal(b, m, deterministic)
+}
+func (dst *FileDescriptorResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FileDescriptorResponse.Merge(dst, src)
+}
+func (m *FileDescriptorResponse) XXX_Size() int {
+	return xxx_messageInfo_FileDescriptorResponse.Size(m)
+}
+func (m *FileDescriptorResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_FileDescriptorResponse.DiscardUnknown(m)
 }
 
-func (m *FileDescriptorResponse) Reset()                    { *m = FileDescriptorResponse{} }
-func (m *FileDescriptorResponse) String() string            { return proto.CompactTextString(m) }
-func (*FileDescriptorResponse) ProtoMessage()               {}
-func (*FileDescriptorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_FileDescriptorResponse proto.InternalMessageInfo
 
 func (m *FileDescriptorResponse) GetFileDescriptorProto() [][]byte {
 	if m != nil {
@@ -508,14 +594,36 @@ func (m *FileDescriptorResponse) GetFileDescriptorProto() [][]byte {
 type ExtensionNumberResponse struct {
 	// Full name of the base type, including the package name. The format
 	// is <package>.<type>
-	BaseTypeName    string  `protobuf:"bytes,1,opt,name=base_type_name,json=baseTypeName" json:"base_type_name,omitempty"`
-	ExtensionNumber []int32 `protobuf:"varint,2,rep,packed,name=extension_number,json=extensionNumber" json:"extension_number,omitempty"`
+	BaseTypeName         string   `protobuf:"bytes,1,opt,name=base_type_name,json=baseTypeName,proto3" json:"base_type_name,omitempty"`
+	ExtensionNumber      []int32  `protobuf:"varint,2,rep,packed,name=extension_number,json=extensionNumber,proto3" json:"extension_number,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ExtensionNumberResponse) Reset()         { *m = ExtensionNumberResponse{} }
+func (m *ExtensionNumberResponse) String() string { return proto.CompactTextString(m) }
+func (*ExtensionNumberResponse) ProtoMessage()    {}
+func (*ExtensionNumberResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reflection_178bd1e101bf8b63, []int{4}
+}
+func (m *ExtensionNumberResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ExtensionNumberResponse.Unmarshal(m, b)
+}
+func (m *ExtensionNumberResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ExtensionNumberResponse.Marshal(b, m, deterministic)
+}
+func (dst *ExtensionNumberResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExtensionNumberResponse.Merge(dst, src)
+}
+func (m *ExtensionNumberResponse) XXX_Size() int {
+	return xxx_messageInfo_ExtensionNumberResponse.Size(m)
+}
+func (m *ExtensionNumberResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExtensionNumberResponse.DiscardUnknown(m)
 }
 
-func (m *ExtensionNumberResponse) Reset()                    { *m = ExtensionNumberResponse{} }
-func (m *ExtensionNumberResponse) String() string            { return proto.CompactTextString(m) }
-func (*ExtensionNumberResponse) ProtoMessage()               {}
-func (*ExtensionNumberResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_ExtensionNumberResponse proto.InternalMessageInfo
 
 func (m *ExtensionNumberResponse) GetBaseTypeName() string {
 	if m != nil {
@@ -535,13 +643,35 @@ func (m *ExtensionNumberResponse) GetExtensionNumber() []int32 {
 type ListServiceResponse struct {
 	// The information of each service may be expanded in the future, so we use
 	// ServiceResponse message to encapsulate it.
-	Service []*ServiceResponse `protobuf:"bytes,1,rep,name=service" json:"service,omitempty"`
+	Service              []*ServiceResponse `protobuf:"bytes,1,rep,name=service,proto3" json:"service,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
 }
 
-func (m *ListServiceResponse) Reset()                    { *m = ListServiceResponse{} }
-func (m *ListServiceResponse) String() string            { return proto.CompactTextString(m) }
-func (*ListServiceResponse) ProtoMessage()               {}
-func (*ListServiceResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *ListServiceResponse) Reset()         { *m = ListServiceResponse{} }
+func (m *ListServiceResponse) String() string { return proto.CompactTextString(m) }
+func (*ListServiceResponse) ProtoMessage()    {}
+func (*ListServiceResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reflection_178bd1e101bf8b63, []int{5}
+}
+func (m *ListServiceResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListServiceResponse.Unmarshal(m, b)
+}
+func (m *ListServiceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListServiceResponse.Marshal(b, m, deterministic)
+}
+func (dst *ListServiceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListServiceResponse.Merge(dst, src)
+}
+func (m *ListServiceResponse) XXX_Size() int {
+	return xxx_messageInfo_ListServiceResponse.Size(m)
+}
+func (m *ListServiceResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListServiceResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListServiceResponse proto.InternalMessageInfo
 
 func (m *ListServiceResponse) GetService() []*ServiceResponse {
 	if m != nil {
@@ -555,13 +685,35 @@ func (m *ListServiceResponse) GetService() []*ServiceResponse {
 type ServiceResponse struct {
 	// Full name of a registered service, including its package name. The format
 	// is <package>.<service>
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ServiceResponse) Reset()                    { *m = ServiceResponse{} }
-func (m *ServiceResponse) String() string            { return proto.CompactTextString(m) }
-func (*ServiceResponse) ProtoMessage()               {}
-func (*ServiceResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *ServiceResponse) Reset()         { *m = ServiceResponse{} }
+func (m *ServiceResponse) String() string { return proto.CompactTextString(m) }
+func (*ServiceResponse) ProtoMessage()    {}
+func (*ServiceResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reflection_178bd1e101bf8b63, []int{6}
+}
+func (m *ServiceResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ServiceResponse.Unmarshal(m, b)
+}
+func (m *ServiceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ServiceResponse.Marshal(b, m, deterministic)
+}
+func (dst *ServiceResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceResponse.Merge(dst, src)
+}
+func (m *ServiceResponse) XXX_Size() int {
+	return xxx_messageInfo_ServiceResponse.Size(m)
+}
+func (m *ServiceResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ServiceResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ServiceResponse proto.InternalMessageInfo
 
 func (m *ServiceResponse) GetName() string {
 	if m != nil {
@@ -573,14 +725,36 @@ func (m *ServiceResponse) GetName() string {
 // The error code and error message sent by the server when an error occurs.
 type ErrorResponse struct {
 	// This field uses the error codes defined in grpc::StatusCode.
-	ErrorCode    int32  `protobuf:"varint,1,opt,name=error_code,json=errorCode" json:"error_code,omitempty"`
-	ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,json=errorMessage" json:"error_message,omitempty"`
+	ErrorCode            int32    `protobuf:"varint,1,opt,name=error_code,json=errorCode,proto3" json:"error_code,omitempty"`
+	ErrorMessage         string   `protobuf:"bytes,2,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ErrorResponse) Reset()         { *m = ErrorResponse{} }
+func (m *ErrorResponse) String() string { return proto.CompactTextString(m) }
+func (*ErrorResponse) ProtoMessage()    {}
+func (*ErrorResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_reflection_178bd1e101bf8b63, []int{7}
+}
+func (m *ErrorResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ErrorResponse.Unmarshal(m, b)
+}
+func (m *ErrorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ErrorResponse.Marshal(b, m, deterministic)
+}
+func (dst *ErrorResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ErrorResponse.Merge(dst, src)
+}
+func (m *ErrorResponse) XXX_Size() int {
+	return xxx_messageInfo_ErrorResponse.Size(m)
+}
+func (m *ErrorResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ErrorResponse.DiscardUnknown(m)
 }
 
-func (m *ErrorResponse) Reset()                    { *m = ErrorResponse{} }
-func (m *ErrorResponse) String() string            { return proto.CompactTextString(m) }
-func (*ErrorResponse) ProtoMessage()               {}
-func (*ErrorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_ErrorResponse proto.InternalMessageInfo
 
 func (m *ErrorResponse) GetErrorCode() int32 {
 	if m != nil {
@@ -615,8 +789,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for ServerReflection service
-
+// ServerReflectionClient is the client API for ServerReflection service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ServerReflectionClient interface {
 	// The reflection service is structured as a bidirectional stream, ensuring
 	// all related requests go to a single server.
@@ -632,7 +807,7 @@ func NewServerReflectionClient(cc *grpc.ClientConn) ServerReflectionClient {
 }
 
 func (c *serverReflectionClient) ServerReflectionInfo(ctx context.Context, opts ...grpc.CallOption) (ServerReflection_ServerReflectionInfoClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_ServerReflection_serviceDesc.Streams[0], c.cc, "/grpc.reflection.v1alpha.ServerReflection/ServerReflectionInfo", opts...)
+	stream, err := c.cc.NewStream(ctx, &_ServerReflection_serviceDesc.Streams[0], "/grpc.reflection.v1alpha.ServerReflection/ServerReflectionInfo", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -662,8 +837,7 @@ func (x *serverReflectionServerReflectionInfoClient) Recv() (*ServerReflectionRe
 	return m, nil
 }
 
-// Server API for ServerReflection service
-
+// ServerReflectionServer is the server API for ServerReflection service.
 type ServerReflectionServer interface {
 	// The reflection service is structured as a bidirectional stream, ensuring
 	// all related requests go to a single server.
@@ -715,9 +889,11 @@ var _ServerReflection_serviceDesc = grpc.ServiceDesc{
 	Metadata: "grpc_reflection_v1alpha/reflection.proto",
 }
 
-func init() { proto.RegisterFile("grpc_reflection_v1alpha/reflection.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("grpc_reflection_v1alpha/reflection.proto", fileDescriptor_reflection_178bd1e101bf8b63)
+}
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_reflection_178bd1e101bf8b63 = []byte{
 	// 656 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x51, 0x73, 0xd2, 0x40,
 	0x10, 0x6e, 0x5a, 0x68, 0x87, 0x85, 0x02, 0x5e, 0x2b, 0xa4, 0x3a, 0x75, 0x98, 0x68, 0x35, 0x75,
diff --git a/vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.proto b/vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.proto
index c52ccc6a..99b00df0 100644
--- a/vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.proto
+++ b/vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.proto
@@ -72,21 +72,21 @@ message ExtensionRequest {
 message ServerReflectionResponse {
   string valid_host = 1;
   ServerReflectionRequest original_request = 2;
-  // The server set one of the following fields according to the message_request
-  // in the request.
+  // The server sets one of the following fields according to the
+  // message_request in the request.
   oneof message_response {
     // This message is used to answer file_by_filename, file_containing_symbol,
-    // file_containing_extension requests with transitive dependencies. As
-    // the repeated label is not allowed in oneof fields, we use a
+    // file_containing_extension requests with transitive dependencies.
+    // As the repeated label is not allowed in oneof fields, we use a
     // FileDescriptorResponse message to encapsulate the repeated fields.
     // The reflection service is allowed to avoid sending FileDescriptorProtos
     // that were previously sent in response to earlier requests in the stream.
     FileDescriptorResponse file_descriptor_response = 4;
 
-    // This message is used to answer all_extension_numbers_of_type requst.
+    // This message is used to answer all_extension_numbers_of_type requests.
     ExtensionNumberResponse all_extension_numbers_response = 5;
 
-    // This message is used to answer list_services request.
+    // This message is used to answer list_services requests.
     ListServiceResponse list_services_response = 6;
 
     // This message is used when an error occurs.
diff --git a/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2.pb.go b/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2.pb.go
index 5b016188..4a95d9be 100644
--- a/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2.pb.go
+++ b/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2.pb.go
@@ -1,22 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: proto2.proto
 
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	proto2.proto
-	proto2_ext.proto
-	proto2_ext2.proto
-	test.proto
-
-It has these top-level messages:
-	ToBeExtended
-	Extension
-	AnotherExtension
-	SearchResponse
-	SearchRequest
-*/
 package grpc_testing
 
 import proto "github.com/golang/protobuf/proto"
@@ -35,23 +19,44 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type ToBeExtended struct {
-	Foo                          *int32 `protobuf:"varint,1,req,name=foo" json:"foo,omitempty"`
+	Foo                          *int32   `protobuf:"varint,1,req,name=foo" json:"foo,omitempty"`
+	XXX_NoUnkeyedLiteral         struct{} `json:"-"`
 	proto.XXX_InternalExtensions `json:"-"`
 	XXX_unrecognized             []byte `json:"-"`
+	XXX_sizecache                int32  `json:"-"`
 }
 
-func (m *ToBeExtended) Reset()                    { *m = ToBeExtended{} }
-func (m *ToBeExtended) String() string            { return proto.CompactTextString(m) }
-func (*ToBeExtended) ProtoMessage()               {}
-func (*ToBeExtended) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *ToBeExtended) Reset()         { *m = ToBeExtended{} }
+func (m *ToBeExtended) String() string { return proto.CompactTextString(m) }
+func (*ToBeExtended) ProtoMessage()    {}
+func (*ToBeExtended) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto2_b16f7a513d0acdc0, []int{0}
+}
 
 var extRange_ToBeExtended = []proto.ExtensionRange{
-	{10, 30},
+	{Start: 10, End: 30},
 }
 
 func (*ToBeExtended) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_ToBeExtended
 }
+func (m *ToBeExtended) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ToBeExtended.Unmarshal(m, b)
+}
+func (m *ToBeExtended) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ToBeExtended.Marshal(b, m, deterministic)
+}
+func (dst *ToBeExtended) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ToBeExtended.Merge(dst, src)
+}
+func (m *ToBeExtended) XXX_Size() int {
+	return xxx_messageInfo_ToBeExtended.Size(m)
+}
+func (m *ToBeExtended) XXX_DiscardUnknown() {
+	xxx_messageInfo_ToBeExtended.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ToBeExtended proto.InternalMessageInfo
 
 func (m *ToBeExtended) GetFoo() int32 {
 	if m != nil && m.Foo != nil {
@@ -64,9 +69,9 @@ func init() {
 	proto.RegisterType((*ToBeExtended)(nil), "grpc.testing.ToBeExtended")
 }
 
-func init() { proto.RegisterFile("proto2.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("proto2.proto", fileDescriptor_proto2_b16f7a513d0acdc0) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_proto2_b16f7a513d0acdc0 = []byte{
 	// 86 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd2, 0x03, 0x53, 0x42, 0x3c, 0xe9, 0x45, 0x05, 0xc9, 0x7a, 0x25, 0xa9, 0xc5, 0x25,
diff --git a/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2_ext.pb.go b/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2_ext.pb.go
index 9ae4f07a..25baa1a0 100644
--- a/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2_ext.pb.go
+++ b/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2_ext.pb.go
@@ -12,15 +12,42 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type Extension struct {
-	Whatzit          *int32 `protobuf:"varint,1,opt,name=whatzit" json:"whatzit,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	Whatzit              *int32   `protobuf:"varint,1,opt,name=whatzit" json:"whatzit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Extension) Reset()         { *m = Extension{} }
+func (m *Extension) String() string { return proto.CompactTextString(m) }
+func (*Extension) ProtoMessage()    {}
+func (*Extension) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto2_ext_4437118420d604f2, []int{0}
+}
+func (m *Extension) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Extension.Unmarshal(m, b)
+}
+func (m *Extension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Extension.Marshal(b, m, deterministic)
+}
+func (dst *Extension) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Extension.Merge(dst, src)
+}
+func (m *Extension) XXX_Size() int {
+	return xxx_messageInfo_Extension.Size(m)
+}
+func (m *Extension) XXX_DiscardUnknown() {
+	xxx_messageInfo_Extension.DiscardUnknown(m)
 }
 
-func (m *Extension) Reset()                    { *m = Extension{} }
-func (m *Extension) String() string            { return proto.CompactTextString(m) }
-func (*Extension) ProtoMessage()               {}
-func (*Extension) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+var xxx_messageInfo_Extension proto.InternalMessageInfo
 
 func (m *Extension) GetWhatzit() int32 {
 	if m != nil && m.Whatzit != nil {
@@ -63,9 +90,9 @@ func init() {
 	proto.RegisterExtension(E_Baz)
 }
 
-func init() { proto.RegisterFile("proto2_ext.proto", fileDescriptor1) }
+func init() { proto.RegisterFile("proto2_ext.proto", fileDescriptor_proto2_ext_4437118420d604f2) }
 
-var fileDescriptor1 = []byte{
+var fileDescriptor_proto2_ext_4437118420d604f2 = []byte{
 	// 179 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x28, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0x8a, 0x4f, 0xad, 0x28, 0xd1, 0x03, 0x33, 0x85, 0x78, 0xd2, 0x8b, 0x0a, 0x92, 0xf5,
diff --git a/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2_ext2.pb.go b/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2_ext2.pb.go
index 26ec982a..869a6baf 100644
--- a/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2_ext2.pb.go
+++ b/vendor/google.golang.org/grpc/reflection/grpc_testing/proto2_ext2.pb.go
@@ -12,15 +12,42 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type AnotherExtension struct {
-	Whatchamacallit  *int32 `protobuf:"varint,1,opt,name=whatchamacallit" json:"whatchamacallit,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	Whatchamacallit      *int32   `protobuf:"varint,1,opt,name=whatchamacallit" json:"whatchamacallit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AnotherExtension) Reset()         { *m = AnotherExtension{} }
+func (m *AnotherExtension) String() string { return proto.CompactTextString(m) }
+func (*AnotherExtension) ProtoMessage()    {}
+func (*AnotherExtension) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto2_ext2_039d342873655470, []int{0}
+}
+func (m *AnotherExtension) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AnotherExtension.Unmarshal(m, b)
+}
+func (m *AnotherExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AnotherExtension.Marshal(b, m, deterministic)
+}
+func (dst *AnotherExtension) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AnotherExtension.Merge(dst, src)
+}
+func (m *AnotherExtension) XXX_Size() int {
+	return xxx_messageInfo_AnotherExtension.Size(m)
+}
+func (m *AnotherExtension) XXX_DiscardUnknown() {
+	xxx_messageInfo_AnotherExtension.DiscardUnknown(m)
 }
 
-func (m *AnotherExtension) Reset()                    { *m = AnotherExtension{} }
-func (m *AnotherExtension) String() string            { return proto.CompactTextString(m) }
-func (*AnotherExtension) ProtoMessage()               {}
-func (*AnotherExtension) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+var xxx_messageInfo_AnotherExtension proto.InternalMessageInfo
 
 func (m *AnotherExtension) GetWhatchamacallit() int32 {
 	if m != nil && m.Whatchamacallit != nil {
@@ -53,9 +80,9 @@ func init() {
 	proto.RegisterExtension(E_Nitz)
 }
 
-func init() { proto.RegisterFile("proto2_ext2.proto", fileDescriptor2) }
+func init() { proto.RegisterFile("proto2_ext2.proto", fileDescriptor_proto2_ext2_039d342873655470) }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor_proto2_ext2_039d342873655470 = []byte{
 	// 165 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2c, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0x8a, 0x4f, 0xad, 0x28, 0x31, 0xd2, 0x03, 0xb3, 0x85, 0x78, 0xd2, 0x8b, 0x0a, 0x92,
diff --git a/vendor/google.golang.org/grpc/reflection/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/reflection/grpc_testing/test.pb.go
index 62f71ff1..2566a49f 100644
--- a/vendor/google.golang.org/grpc/reflection/grpc_testing/test.pb.go
+++ b/vendor/google.golang.org/grpc/reflection/grpc_testing/test.pb.go
@@ -17,14 +17,42 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// 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
+
 type SearchResponse struct {
-	Results []*SearchResponse_Result `protobuf:"bytes,1,rep,name=results" json:"results,omitempty"`
+	Results              []*SearchResponse_Result `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
-func (m *SearchResponse) Reset()                    { *m = SearchResponse{} }
-func (m *SearchResponse) String() string            { return proto.CompactTextString(m) }
-func (*SearchResponse) ProtoMessage()               {}
-func (*SearchResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (m *SearchResponse) Reset()         { *m = SearchResponse{} }
+func (m *SearchResponse) String() string { return proto.CompactTextString(m) }
+func (*SearchResponse) ProtoMessage()    {}
+func (*SearchResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_a0c753075da50dd4, []int{0}
+}
+func (m *SearchResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchResponse.Unmarshal(m, b)
+}
+func (m *SearchResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchResponse.Marshal(b, m, deterministic)
+}
+func (dst *SearchResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchResponse.Merge(dst, src)
+}
+func (m *SearchResponse) XXX_Size() int {
+	return xxx_messageInfo_SearchResponse.Size(m)
+}
+func (m *SearchResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchResponse proto.InternalMessageInfo
 
 func (m *SearchResponse) GetResults() []*SearchResponse_Result {
 	if m != nil {
@@ -34,15 +62,37 @@ func (m *SearchResponse) GetResults() []*SearchResponse_Result {
 }
 
 type SearchResponse_Result struct {
-	Url      string   `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
-	Title    string   `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
-	Snippets []string `protobuf:"bytes,3,rep,name=snippets" json:"snippets,omitempty"`
+	Url                  string   `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	Title                string   `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
+	Snippets             []string `protobuf:"bytes,3,rep,name=snippets,proto3" json:"snippets,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SearchResponse_Result) Reset()                    { *m = SearchResponse_Result{} }
-func (m *SearchResponse_Result) String() string            { return proto.CompactTextString(m) }
-func (*SearchResponse_Result) ProtoMessage()               {}
-func (*SearchResponse_Result) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+func (m *SearchResponse_Result) Reset()         { *m = SearchResponse_Result{} }
+func (m *SearchResponse_Result) String() string { return proto.CompactTextString(m) }
+func (*SearchResponse_Result) ProtoMessage()    {}
+func (*SearchResponse_Result) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_a0c753075da50dd4, []int{0, 0}
+}
+func (m *SearchResponse_Result) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchResponse_Result.Unmarshal(m, b)
+}
+func (m *SearchResponse_Result) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchResponse_Result.Marshal(b, m, deterministic)
+}
+func (dst *SearchResponse_Result) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchResponse_Result.Merge(dst, src)
+}
+func (m *SearchResponse_Result) XXX_Size() int {
+	return xxx_messageInfo_SearchResponse_Result.Size(m)
+}
+func (m *SearchResponse_Result) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchResponse_Result.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SearchResponse_Result proto.InternalMessageInfo
 
 func (m *SearchResponse_Result) GetUrl() string {
 	if m != nil {
@@ -66,13 +116,35 @@ func (m *SearchResponse_Result) GetSnippets() []string {
 }
 
 type SearchRequest struct {
-	Query string `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
+	Query                string   `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SearchRequest) Reset()         { *m = SearchRequest{} }
+func (m *SearchRequest) String() string { return proto.CompactTextString(m) }
+func (*SearchRequest) ProtoMessage()    {}
+func (*SearchRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_a0c753075da50dd4, []int{1}
+}
+func (m *SearchRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SearchRequest.Unmarshal(m, b)
+}
+func (m *SearchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SearchRequest.Marshal(b, m, deterministic)
+}
+func (dst *SearchRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SearchRequest.Merge(dst, src)
+}
+func (m *SearchRequest) XXX_Size() int {
+	return xxx_messageInfo_SearchRequest.Size(m)
+}
+func (m *SearchRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SearchRequest.DiscardUnknown(m)
 }
 
-func (m *SearchRequest) Reset()                    { *m = SearchRequest{} }
-func (m *SearchRequest) String() string            { return proto.CompactTextString(m) }
-func (*SearchRequest) ProtoMessage()               {}
-func (*SearchRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+var xxx_messageInfo_SearchRequest proto.InternalMessageInfo
 
 func (m *SearchRequest) GetQuery() string {
 	if m != nil {
@@ -95,8 +167,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for SearchService service
-
+// SearchServiceClient is the client API for SearchService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SearchServiceClient interface {
 	Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (*SearchResponse, error)
 	StreamingSearch(ctx context.Context, opts ...grpc.CallOption) (SearchService_StreamingSearchClient, error)
@@ -112,7 +185,7 @@ func NewSearchServiceClient(cc *grpc.ClientConn) SearchServiceClient {
 
 func (c *searchServiceClient) Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (*SearchResponse, error) {
 	out := new(SearchResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.SearchService/Search", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.SearchService/Search", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -120,7 +193,7 @@ func (c *searchServiceClient) Search(ctx context.Context, in *SearchRequest, opt
 }
 
 func (c *searchServiceClient) StreamingSearch(ctx context.Context, opts ...grpc.CallOption) (SearchService_StreamingSearchClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_SearchService_serviceDesc.Streams[0], c.cc, "/grpc.testing.SearchService/StreamingSearch", opts...)
+	stream, err := c.cc.NewStream(ctx, &_SearchService_serviceDesc.Streams[0], "/grpc.testing.SearchService/StreamingSearch", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -150,8 +223,7 @@ func (x *searchServiceStreamingSearchClient) Recv() (*SearchResponse, error) {
 	return m, nil
 }
 
-// Server API for SearchService service
-
+// SearchServiceServer is the server API for SearchService service.
 type SearchServiceServer interface {
 	Search(context.Context, *SearchRequest) (*SearchResponse, error)
 	StreamingSearch(SearchService_StreamingSearchServer) error
@@ -225,9 +297,9 @@ var _SearchService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "test.proto",
 }
 
-func init() { proto.RegisterFile("test.proto", fileDescriptor3) }
+func init() { proto.RegisterFile("test.proto", fileDescriptor_test_a0c753075da50dd4) }
 
-var fileDescriptor3 = []byte{
+var fileDescriptor_test_a0c753075da50dd4 = []byte{
 	// 231 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x91, 0xbd, 0x4a, 0xc5, 0x40,
 	0x10, 0x85, 0x59, 0x83, 0xd1, 0x3b, 0xfe, 0x32, 0x58, 0x84, 0x68, 0x11, 0xae, 0x08, 0xa9, 0x16,
diff --git a/vendor/google.golang.org/grpc/reflection/grpc_testingv3/testv3.pb.go b/vendor/google.golang.org/grpc/reflection/grpc_testingv3/testv3.pb.go
index 78876aae..767efddf 100644
--- a/vendor/google.golang.org/grpc/reflection/grpc_testingv3/testv3.pb.go
+++ b/vendor/google.golang.org/grpc/reflection/grpc_testingv3/testv3.pb.go
@@ -34,8 +34,33 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
+type SearchResponseV3_State int32
+
+const (
+	SearchResponseV3_UNKNOWN SearchResponseV3_State = 0
+	SearchResponseV3_FRESH   SearchResponseV3_State = 1
+	SearchResponseV3_STALE   SearchResponseV3_State = 2
+)
+
+var SearchResponseV3_State_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "FRESH",
+	2: "STALE",
+}
+var SearchResponseV3_State_value = map[string]int32{
+	"UNKNOWN": 0,
+	"FRESH":   1,
+	"STALE":   2,
+}
+
+func (x SearchResponseV3_State) String() string {
+	return proto.EnumName(SearchResponseV3_State_name, int32(x))
+}
+func (SearchResponseV3_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
+
 type SearchResponseV3 struct {
 	Results []*SearchResponseV3_Result `protobuf:"bytes,1,rep,name=results" json:"results,omitempty"`
+	State   SearchResponseV3_State     `protobuf:"varint,2,opt,name=state,enum=grpc.testingv3.SearchResponseV3_State" json:"state,omitempty"`
 }
 
 func (m *SearchResponseV3) Reset()                    { *m = SearchResponseV3{} }
@@ -50,10 +75,18 @@ func (m *SearchResponseV3) GetResults() []*SearchResponseV3_Result {
 	return nil
 }
 
+func (m *SearchResponseV3) GetState() SearchResponseV3_State {
+	if m != nil {
+		return m.State
+	}
+	return SearchResponseV3_UNKNOWN
+}
+
 type SearchResponseV3_Result struct {
-	Url      string   `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
-	Title    string   `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
-	Snippets []string `protobuf:"bytes,3,rep,name=snippets" json:"snippets,omitempty"`
+	Url      string                                    `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Title    string                                    `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
+	Snippets []string                                  `protobuf:"bytes,3,rep,name=snippets" json:"snippets,omitempty"`
+	Metadata map[string]*SearchResponseV3_Result_Value `protobuf:"bytes,4,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 }
 
 func (m *SearchResponseV3_Result) Reset()                    { *m = SearchResponseV3_Result{} }
@@ -61,6 +94,174 @@ func (m *SearchResponseV3_Result) String() string            { return proto.Comp
 func (*SearchResponseV3_Result) ProtoMessage()               {}
 func (*SearchResponseV3_Result) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
 
+func (m *SearchResponseV3_Result) GetUrl() string {
+	if m != nil {
+		return m.Url
+	}
+	return ""
+}
+
+func (m *SearchResponseV3_Result) GetTitle() string {
+	if m != nil {
+		return m.Title
+	}
+	return ""
+}
+
+func (m *SearchResponseV3_Result) GetSnippets() []string {
+	if m != nil {
+		return m.Snippets
+	}
+	return nil
+}
+
+func (m *SearchResponseV3_Result) GetMetadata() map[string]*SearchResponseV3_Result_Value {
+	if m != nil {
+		return m.Metadata
+	}
+	return nil
+}
+
+type SearchResponseV3_Result_Value struct {
+	// Types that are valid to be assigned to Val:
+	//	*SearchResponseV3_Result_Value_Str
+	//	*SearchResponseV3_Result_Value_Int
+	//	*SearchResponseV3_Result_Value_Real
+	Val isSearchResponseV3_Result_Value_Val `protobuf_oneof:"val"`
+}
+
+func (m *SearchResponseV3_Result_Value) Reset()         { *m = SearchResponseV3_Result_Value{} }
+func (m *SearchResponseV3_Result_Value) String() string { return proto.CompactTextString(m) }
+func (*SearchResponseV3_Result_Value) ProtoMessage()    {}
+func (*SearchResponseV3_Result_Value) Descriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{0, 0, 0}
+}
+
+type isSearchResponseV3_Result_Value_Val interface {
+	isSearchResponseV3_Result_Value_Val()
+}
+
+type SearchResponseV3_Result_Value_Str struct {
+	Str string `protobuf:"bytes,1,opt,name=str,oneof"`
+}
+type SearchResponseV3_Result_Value_Int struct {
+	Int int64 `protobuf:"varint,2,opt,name=int,oneof"`
+}
+type SearchResponseV3_Result_Value_Real struct {
+	Real float64 `protobuf:"fixed64,3,opt,name=real,oneof"`
+}
+
+func (*SearchResponseV3_Result_Value_Str) isSearchResponseV3_Result_Value_Val()  {}
+func (*SearchResponseV3_Result_Value_Int) isSearchResponseV3_Result_Value_Val()  {}
+func (*SearchResponseV3_Result_Value_Real) isSearchResponseV3_Result_Value_Val() {}
+
+func (m *SearchResponseV3_Result_Value) GetVal() isSearchResponseV3_Result_Value_Val {
+	if m != nil {
+		return m.Val
+	}
+	return nil
+}
+
+func (m *SearchResponseV3_Result_Value) GetStr() string {
+	if x, ok := m.GetVal().(*SearchResponseV3_Result_Value_Str); ok {
+		return x.Str
+	}
+	return ""
+}
+
+func (m *SearchResponseV3_Result_Value) GetInt() int64 {
+	if x, ok := m.GetVal().(*SearchResponseV3_Result_Value_Int); ok {
+		return x.Int
+	}
+	return 0
+}
+
+func (m *SearchResponseV3_Result_Value) GetReal() float64 {
+	if x, ok := m.GetVal().(*SearchResponseV3_Result_Value_Real); ok {
+		return x.Real
+	}
+	return 0
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*SearchResponseV3_Result_Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _SearchResponseV3_Result_Value_OneofMarshaler, _SearchResponseV3_Result_Value_OneofUnmarshaler, _SearchResponseV3_Result_Value_OneofSizer, []interface{}{
+		(*SearchResponseV3_Result_Value_Str)(nil),
+		(*SearchResponseV3_Result_Value_Int)(nil),
+		(*SearchResponseV3_Result_Value_Real)(nil),
+	}
+}
+
+func _SearchResponseV3_Result_Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*SearchResponseV3_Result_Value)
+	// val
+	switch x := m.Val.(type) {
+	case *SearchResponseV3_Result_Value_Str:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Str)
+	case *SearchResponseV3_Result_Value_Int:
+		b.EncodeVarint(2<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.Int))
+	case *SearchResponseV3_Result_Value_Real:
+		b.EncodeVarint(3<<3 | proto.WireFixed64)
+		b.EncodeFixed64(math.Float64bits(x.Real))
+	case nil:
+	default:
+		return fmt.Errorf("SearchResponseV3_Result_Value.Val has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _SearchResponseV3_Result_Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*SearchResponseV3_Result_Value)
+	switch tag {
+	case 1: // val.str
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Val = &SearchResponseV3_Result_Value_Str{x}
+		return true, err
+	case 2: // val.int
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.Val = &SearchResponseV3_Result_Value_Int{int64(x)}
+		return true, err
+	case 3: // val.real
+		if wire != proto.WireFixed64 {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeFixed64()
+		m.Val = &SearchResponseV3_Result_Value_Real{math.Float64frombits(x)}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _SearchResponseV3_Result_Value_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*SearchResponseV3_Result_Value)
+	// val
+	switch x := m.Val.(type) {
+	case *SearchResponseV3_Result_Value_Str:
+		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(len(x.Str)))
+		n += len(x.Str)
+	case *SearchResponseV3_Result_Value_Int:
+		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += proto.SizeVarint(uint64(x.Int))
+	case *SearchResponseV3_Result_Value_Real:
+		n += proto.SizeVarint(3<<3 | proto.WireFixed64)
+		n += 8
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
 type SearchRequestV3 struct {
 	Query string `protobuf:"bytes,1,opt,name=query" json:"query,omitempty"`
 }
@@ -70,10 +271,19 @@ func (m *SearchRequestV3) String() string            { return proto.CompactTextS
 func (*SearchRequestV3) ProtoMessage()               {}
 func (*SearchRequestV3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
+func (m *SearchRequestV3) GetQuery() string {
+	if m != nil {
+		return m.Query
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*SearchResponseV3)(nil), "grpc.testingv3.SearchResponseV3")
 	proto.RegisterType((*SearchResponseV3_Result)(nil), "grpc.testingv3.SearchResponseV3.Result")
+	proto.RegisterType((*SearchResponseV3_Result_Value)(nil), "grpc.testingv3.SearchResponseV3.Result.Value")
 	proto.RegisterType((*SearchRequestV3)(nil), "grpc.testingv3.SearchRequestV3")
+	proto.RegisterEnum("grpc.testingv3.SearchResponseV3_State", SearchResponseV3_State_name, SearchResponseV3_State_value)
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -217,20 +427,31 @@ var _SearchServiceV3_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("testv3.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 240 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x91, 0x41, 0x4b, 0xc3, 0x40,
-	0x10, 0x85, 0x59, 0x83, 0xd1, 0x8e, 0x62, 0xcb, 0xe2, 0x21, 0xe4, 0x62, 0xe8, 0xa5, 0x39, 0x2d,
-	0xd2, 0xfd, 0x05, 0x9e, 0xf5, 0xb4, 0x81, 0xe2, 0xb5, 0x86, 0x21, 0x2e, 0xc4, 0x64, 0x3b, 0x33,
-	0x09, 0xf8, 0x7b, 0xfc, 0x13, 0xfe, 0x3c, 0x49, 0xd2, 0x08, 0x0a, 0xe2, 0xa5, 0xb7, 0x7d, 0x8f,
-	0xf7, 0xbe, 0xe5, 0x31, 0x70, 0x2d, 0xc8, 0xd2, 0x5b, 0x13, 0xa8, 0x95, 0x56, 0xdf, 0x54, 0x14,
-	0x4a, 0x33, 0x58, 0xbe, 0xa9, 0x7a, 0xbb, 0xfe, 0x50, 0xb0, 0x2a, 0x70, 0x4f, 0xe5, 0xab, 0x43,
-	0x0e, 0x6d, 0xc3, 0xb8, 0xb3, 0xfa, 0x01, 0x2e, 0x08, 0xb9, 0xab, 0x85, 0x13, 0x95, 0x45, 0xf9,
-	0xd5, 0x76, 0x63, 0x7e, 0xd6, 0xcc, 0xef, 0x8a, 0x71, 0x63, 0xde, 0xcd, 0xbd, 0xf4, 0x09, 0xe2,
-	0xc9, 0xd2, 0x2b, 0x88, 0x3a, 0xaa, 0x13, 0x95, 0xa9, 0x7c, 0xe1, 0x86, 0xa7, 0xbe, 0x85, 0x73,
-	0xf1, 0x52, 0x63, 0x72, 0x36, 0x7a, 0x93, 0xd0, 0x29, 0x5c, 0x72, 0xe3, 0x43, 0x40, 0xe1, 0x24,
-	0xca, 0xa2, 0x7c, 0xe1, 0xbe, 0xf5, 0x7a, 0x03, 0xcb, 0xf9, 0xc7, 0x43, 0x87, 0x2c, 0x3b, 0x3b,
-	0x40, 0x0e, 0x1d, 0xd2, 0xfb, 0x11, 0x3c, 0x89, 0xed, 0xa7, 0x9a, 0x93, 0x05, 0x52, 0xef, 0xcb,
-	0x61, 0xcd, 0x23, 0xc4, 0x93, 0xa5, 0xef, 0xfe, 0x9a, 0x71, 0x84, 0xa6, 0xd9, 0x7f, 0x3b, 0xf5,
-	0x33, 0x2c, 0x0b, 0x21, 0xdc, 0xbf, 0xf9, 0xa6, 0x3a, 0x19, 0x35, 0x57, 0xf7, 0xea, 0x25, 0x1e,
-	0x0f, 0x64, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd4, 0xe6, 0xa0, 0xf9, 0xb0, 0x01, 0x00, 0x00,
+	// 416 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xd1, 0x6a, 0xd4, 0x40,
+	0x14, 0x86, 0x77, 0x36, 0x9b, 0x6d, 0xf7, 0xac, 0xb6, 0x61, 0xe8, 0x45, 0xc8, 0x8d, 0x61, 0x2f,
+	0x6c, 0x10, 0x0c, 0x92, 0x20, 0x88, 0x78, 0x53, 0x65, 0x65, 0xa1, 0x75, 0xc5, 0x89, 0xae, 0xde,
+	0x8e, 0xeb, 0x61, 0x8d, 0x4d, 0xb3, 0xe9, 0xcc, 0x49, 0x60, 0x9f, 0xc5, 0x17, 0xf1, 0x55, 0x7c,
+	0x1b, 0x99, 0x99, 0xa6, 0x50, 0x41, 0xba, 0x17, 0xde, 0xcd, 0x7f, 0x38, 0xff, 0x37, 0xff, 0x3f,
+	0x24, 0xf0, 0x80, 0x50, 0x53, 0x97, 0xa7, 0x8d, 0xda, 0xd2, 0x96, 0x1f, 0x6d, 0x54, 0xb3, 0x4e,
+	0xcd, 0xa8, 0xac, 0x37, 0x5d, 0x3e, 0xfb, 0x39, 0x82, 0xa0, 0x40, 0xa9, 0xd6, 0xdf, 0x05, 0xea,
+	0x66, 0x5b, 0x6b, 0x5c, 0xe5, 0xfc, 0x0c, 0x0e, 0x14, 0xea, 0xb6, 0x22, 0x1d, 0xb2, 0xd8, 0x4b,
+	0xa6, 0xd9, 0x69, 0x7a, 0xd7, 0x96, 0xfe, 0x6d, 0x49, 0x85, 0xdd, 0x17, 0xbd, 0x8f, 0xbf, 0x02,
+	0x5f, 0x93, 0x24, 0x0c, 0x87, 0x31, 0x4b, 0x8e, 0xb2, 0xc7, 0xf7, 0x02, 0x0a, 0xb3, 0x2d, 0x9c,
+	0x29, 0xfa, 0x3d, 0x84, 0xb1, 0x23, 0xf2, 0x00, 0xbc, 0x56, 0x55, 0x21, 0x8b, 0x59, 0x32, 0x11,
+	0xe6, 0xc8, 0x4f, 0xc0, 0xa7, 0x92, 0x2a, 0x87, 0x9e, 0x08, 0x27, 0x78, 0x04, 0x87, 0xba, 0x2e,
+	0x9b, 0x06, 0x49, 0x87, 0x5e, 0xec, 0x25, 0x13, 0x71, 0xab, 0xf9, 0x07, 0x38, 0xbc, 0x42, 0x92,
+	0xdf, 0x24, 0xc9, 0x70, 0x64, 0x0b, 0x3d, 0xdf, 0xb3, 0x50, 0xfa, 0xee, 0xc6, 0x37, 0xaf, 0x49,
+	0xed, 0xc4, 0x2d, 0x26, 0xba, 0x00, 0x7f, 0x25, 0xab, 0x16, 0x39, 0x07, 0x4f, 0x93, 0x72, 0xf9,
+	0x16, 0x03, 0x61, 0x84, 0x99, 0x95, 0x35, 0xd9, 0x7c, 0x9e, 0x99, 0x95, 0x35, 0xf1, 0x13, 0x18,
+	0x29, 0x94, 0x55, 0xe8, 0xc5, 0x2c, 0x61, 0x8b, 0x81, 0xb0, 0xea, 0xb5, 0x0f, 0x5e, 0x27, 0xab,
+	0xe8, 0x07, 0x3c, 0xbc, 0x73, 0x91, 0x69, 0x7d, 0x89, 0xbb, 0xbe, 0xf5, 0x25, 0xee, 0xf8, 0x1b,
+	0xf0, 0x3b, 0x73, 0xa1, 0xa5, 0x4e, 0xb3, 0xa7, 0xfb, 0x16, 0xb0, 0x29, 0x85, 0xf3, 0xbe, 0x1c,
+	0xbe, 0x60, 0xb3, 0x27, 0xe0, 0xdb, 0xb7, 0xe6, 0x53, 0x38, 0xf8, 0xb4, 0x3c, 0x5f, 0xbe, 0xff,
+	0xbc, 0x0c, 0x06, 0x7c, 0x02, 0xfe, 0x5b, 0x31, 0x2f, 0x16, 0x01, 0x33, 0xc7, 0xe2, 0xe3, 0xd9,
+	0xc5, 0x3c, 0x18, 0xce, 0x4e, 0xe1, 0xb8, 0xe7, 0x5e, 0xb7, 0xa8, 0x69, 0x95, 0x9b, 0xd7, 0xbf,
+	0x6e, 0x51, 0xf5, 0xd9, 0x9c, 0xc8, 0x7e, 0xb1, 0x7e, 0xb3, 0x40, 0xd5, 0x95, 0x6b, 0xf3, 0x15,
+	0x9d, 0xc3, 0xd8, 0x8d, 0xf8, 0xa3, 0x7f, 0x85, 0xbd, 0x81, 0x46, 0xf1, 0x7d, 0x6d, 0xf8, 0x17,
+	0x38, 0x2e, 0x48, 0xa1, 0xbc, 0x2a, 0xeb, 0xcd, 0x7f, 0xa3, 0x26, 0xec, 0x19, 0xfb, 0x3a, 0xb6,
+	0x3f, 0x46, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0xed, 0xa2, 0x8d, 0x75, 0x28, 0x03, 0x00, 0x00,
 }
diff --git a/vendor/google.golang.org/grpc/reflection/grpc_testingv3/testv3.proto b/vendor/google.golang.org/grpc/reflection/grpc_testingv3/testv3.proto
index 1e175193..ee4966bf 100644
--- a/vendor/google.golang.org/grpc/reflection/grpc_testingv3/testv3.proto
+++ b/vendor/google.golang.org/grpc/reflection/grpc_testingv3/testv3.proto
@@ -7,8 +7,22 @@ message SearchResponseV3 {
     string url = 1;
     string title = 2;
     repeated string snippets = 3;
+    message Value {
+      oneof val {
+        string str = 1;
+        int64 int = 2;
+        double real = 3;
+      }
+    }
+    map<string, Value> metadata = 4;
+  }
+  enum State {
+    UNKNOWN = 0;
+    FRESH = 1;
+    STALE = 2;
   }
   repeated Result results = 1;
+  State state = 2;
 }
 
 message SearchRequestV3 {
diff --git a/vendor/google.golang.org/grpc/reflection/serverreflection.go b/vendor/google.golang.org/grpc/reflection/serverreflection.go
index 1bfbf3e7..dd22a2da 100644
--- a/vendor/google.golang.org/grpc/reflection/serverreflection.go
+++ b/vendor/google.golang.org/grpc/reflection/serverreflection.go
@@ -45,7 +45,8 @@ import (
 	"io"
 	"io/ioutil"
 	"reflect"
-	"strings"
+	"sort"
+	"sync"
 
 	"github.com/golang/protobuf/proto"
 	dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
@@ -57,8 +58,10 @@ import (
 
 type serverReflectionServer struct {
 	s *grpc.Server
-	// TODO add more cache if necessary
-	serviceInfo map[string]grpc.ServiceInfo // cache for s.GetServiceInfo()
+
+	initSymbols  sync.Once
+	serviceNames []string
+	symbols      map[string]*dpb.FileDescriptorProto // map of fully-qualified names to files
 }
 
 // Register registers the server reflection service on the given gRPC server.
@@ -76,6 +79,112 @@ type protoMessage interface {
 	Descriptor() ([]byte, []int)
 }
 
+func (s *serverReflectionServer) getSymbols() (svcNames []string, symbolIndex map[string]*dpb.FileDescriptorProto) {
+	s.initSymbols.Do(func() {
+		serviceInfo := s.s.GetServiceInfo()
+
+		s.symbols = map[string]*dpb.FileDescriptorProto{}
+		s.serviceNames = make([]string, 0, len(serviceInfo))
+		processed := map[string]struct{}{}
+		for svc, info := range serviceInfo {
+			s.serviceNames = append(s.serviceNames, svc)
+			fdenc, ok := parseMetadata(info.Metadata)
+			if !ok {
+				continue
+			}
+			fd, err := decodeFileDesc(fdenc)
+			if err != nil {
+				continue
+			}
+			s.processFile(fd, processed)
+		}
+		sort.Strings(s.serviceNames)
+	})
+
+	return s.serviceNames, s.symbols
+}
+
+func (s *serverReflectionServer) processFile(fd *dpb.FileDescriptorProto, processed map[string]struct{}) {
+	filename := fd.GetName()
+	if _, ok := processed[filename]; ok {
+		return
+	}
+	processed[filename] = struct{}{}
+
+	prefix := fd.GetPackage()
+
+	for _, msg := range fd.MessageType {
+		s.processMessage(fd, prefix, msg)
+	}
+	for _, en := range fd.EnumType {
+		s.processEnum(fd, prefix, en)
+	}
+	for _, ext := range fd.Extension {
+		s.processField(fd, prefix, ext)
+	}
+	for _, svc := range fd.Service {
+		svcName := fqn(prefix, svc.GetName())
+		s.symbols[svcName] = fd
+		for _, meth := range svc.Method {
+			name := fqn(svcName, meth.GetName())
+			s.symbols[name] = fd
+		}
+	}
+
+	for _, dep := range fd.Dependency {
+		fdenc := proto.FileDescriptor(dep)
+		fdDep, err := decodeFileDesc(fdenc)
+		if err != nil {
+			continue
+		}
+		s.processFile(fdDep, processed)
+	}
+}
+
+func (s *serverReflectionServer) processMessage(fd *dpb.FileDescriptorProto, prefix string, msg *dpb.DescriptorProto) {
+	msgName := fqn(prefix, msg.GetName())
+	s.symbols[msgName] = fd
+
+	for _, nested := range msg.NestedType {
+		s.processMessage(fd, msgName, nested)
+	}
+	for _, en := range msg.EnumType {
+		s.processEnum(fd, msgName, en)
+	}
+	for _, ext := range msg.Extension {
+		s.processField(fd, msgName, ext)
+	}
+	for _, fld := range msg.Field {
+		s.processField(fd, msgName, fld)
+	}
+	for _, oneof := range msg.OneofDecl {
+		oneofName := fqn(msgName, oneof.GetName())
+		s.symbols[oneofName] = fd
+	}
+}
+
+func (s *serverReflectionServer) processEnum(fd *dpb.FileDescriptorProto, prefix string, en *dpb.EnumDescriptorProto) {
+	enName := fqn(prefix, en.GetName())
+	s.symbols[enName] = fd
+
+	for _, val := range en.Value {
+		valName := fqn(enName, val.GetName())
+		s.symbols[valName] = fd
+	}
+}
+
+func (s *serverReflectionServer) processField(fd *dpb.FileDescriptorProto, prefix string, fld *dpb.FieldDescriptorProto) {
+	fldName := fqn(prefix, fld.GetName())
+	s.symbols[fldName] = fd
+}
+
+func fqn(prefix, name string) string {
+	if prefix == "" {
+		return name
+	}
+	return prefix + "." + name
+}
+
 // fileDescForType gets the file descriptor for the given type.
 // The given type should be a proto message.
 func (s *serverReflectionServer) fileDescForType(st reflect.Type) (*dpb.FileDescriptorProto, error) {
@@ -85,12 +194,12 @@ func (s *serverReflectionServer) fileDescForType(st reflect.Type) (*dpb.FileDesc
 	}
 	enc, _ := m.Descriptor()
 
-	return s.decodeFileDesc(enc)
+	return decodeFileDesc(enc)
 }
 
 // decodeFileDesc does decompression and unmarshalling on the given
 // file descriptor byte slice.
-func (s *serverReflectionServer) decodeFileDesc(enc []byte) (*dpb.FileDescriptorProto, error) {
+func decodeFileDesc(enc []byte) (*dpb.FileDescriptorProto, error) {
 	raw, err := decompress(enc)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decompress enc: %v", err)
@@ -116,7 +225,7 @@ func decompress(b []byte) ([]byte, error) {
 	return out, nil
 }
 
-func (s *serverReflectionServer) typeForName(name string) (reflect.Type, error) {
+func typeForName(name string) (reflect.Type, error) {
 	pt := proto.MessageType(name)
 	if pt == nil {
 		return nil, fmt.Errorf("unknown type: %q", name)
@@ -126,7 +235,7 @@ func (s *serverReflectionServer) typeForName(name string) (reflect.Type, error)
 	return st, nil
 }
 
-func (s *serverReflectionServer) fileDescContainingExtension(st reflect.Type, ext int32) (*dpb.FileDescriptorProto, error) {
+func fileDescContainingExtension(st reflect.Type, ext int32) (*dpb.FileDescriptorProto, error) {
 	m, ok := reflect.Zero(reflect.PtrTo(st)).Interface().(proto.Message)
 	if !ok {
 		return nil, fmt.Errorf("failed to create message from type: %v", st)
@@ -144,7 +253,7 @@ func (s *serverReflectionServer) fileDescContainingExtension(st reflect.Type, ex
 		return nil, fmt.Errorf("failed to find registered extension for extension number %v", ext)
 	}
 
-	return s.decodeFileDesc(proto.FileDescriptor(extDesc.Filename))
+	return decodeFileDesc(proto.FileDescriptor(extDesc.Filename))
 }
 
 func (s *serverReflectionServer) allExtensionNumbersForType(st reflect.Type) ([]int32, error) {
@@ -168,53 +277,13 @@ func (s *serverReflectionServer) fileDescEncodingByFilename(name string) ([]byte
 	if enc == nil {
 		return nil, fmt.Errorf("unknown file: %v", name)
 	}
-	fd, err := s.decodeFileDesc(enc)
+	fd, err := decodeFileDesc(enc)
 	if err != nil {
 		return nil, err
 	}
 	return proto.Marshal(fd)
 }
 
-// serviceMetadataForSymbol finds the metadata for name in s.serviceInfo.
-// name should be a service name or a method name.
-func (s *serverReflectionServer) serviceMetadataForSymbol(name string) (interface{}, error) {
-	if s.serviceInfo == nil {
-		s.serviceInfo = s.s.GetServiceInfo()
-	}
-
-	// Check if it's a service name.
-	if info, ok := s.serviceInfo[name]; ok {
-		return info.Metadata, nil
-	}
-
-	// Check if it's a method name.
-	pos := strings.LastIndex(name, ".")
-	// Not a valid method name.
-	if pos == -1 {
-		return nil, fmt.Errorf("unknown symbol: %v", name)
-	}
-
-	info, ok := s.serviceInfo[name[:pos]]
-	// Substring before last "." is not a service name.
-	if !ok {
-		return nil, fmt.Errorf("unknown symbol: %v", name)
-	}
-
-	// Search the method name in info.Methods.
-	var found bool
-	for _, m := range info.Methods {
-		if m.Name == name[pos+1:] {
-			found = true
-			break
-		}
-	}
-	if found {
-		return info.Metadata, nil
-	}
-
-	return nil, fmt.Errorf("unknown symbol: %v", name)
-}
-
 // parseMetadata finds the file descriptor bytes specified meta.
 // For SupportPackageIsVersion4, m is the name of the proto file, we
 // call proto.FileDescriptor to get the byte slice.
@@ -237,33 +306,21 @@ func parseMetadata(meta interface{}) ([]byte, bool) {
 // does marshalling on it and returns the marshalled result.
 // The given symbol can be a type, a service or a method.
 func (s *serverReflectionServer) fileDescEncodingContainingSymbol(name string) ([]byte, error) {
-	var (
-		fd *dpb.FileDescriptorProto
-	)
-	// Check if it's a type name.
-	if st, err := s.typeForName(name); err == nil {
-		fd, err = s.fileDescForType(st)
-		if err != nil {
-			return nil, err
-		}
-	} else { // Check if it's a service name or a method name.
-		meta, err := s.serviceMetadataForSymbol(name)
-
-		// Metadata not found.
-		if err != nil {
-			return nil, err
-		}
-
-		// Metadata not valid.
-		enc, ok := parseMetadata(meta)
-		if !ok {
-			return nil, fmt.Errorf("invalid file descriptor for symbol: %v", name)
+	_, symbols := s.getSymbols()
+	fd := symbols[name]
+	if fd == nil {
+		// Check if it's a type name that was not present in the
+		// transitive dependencies of the registered services.
+		if st, err := typeForName(name); err == nil {
+			fd, err = s.fileDescForType(st)
+			if err != nil {
+				return nil, err
+			}
 		}
+	}
 
-		fd, err = s.decodeFileDesc(enc)
-		if err != nil {
-			return nil, err
-		}
+	if fd == nil {
+		return nil, fmt.Errorf("unknown symbol: %v", name)
 	}
 
 	return proto.Marshal(fd)
@@ -272,11 +329,11 @@ func (s *serverReflectionServer) fileDescEncodingContainingSymbol(name string) (
 // fileDescEncodingContainingExtension finds the file descriptor containing given extension,
 // does marshalling on it and returns the marshalled result.
 func (s *serverReflectionServer) fileDescEncodingContainingExtension(typeName string, extNum int32) ([]byte, error) {
-	st, err := s.typeForName(typeName)
+	st, err := typeForName(typeName)
 	if err != nil {
 		return nil, err
 	}
-	fd, err := s.fileDescContainingExtension(st, extNum)
+	fd, err := fileDescContainingExtension(st, extNum)
 	if err != nil {
 		return nil, err
 	}
@@ -285,7 +342,7 @@ func (s *serverReflectionServer) fileDescEncodingContainingExtension(typeName st
 
 // allExtensionNumbersForTypeName returns all extension numbers for the given type.
 func (s *serverReflectionServer) allExtensionNumbersForTypeName(name string) ([]int32, error) {
-	st, err := s.typeForName(name)
+	st, err := typeForName(name)
 	if err != nil {
 		return nil, err
 	}
@@ -374,14 +431,12 @@ func (s *serverReflectionServer) ServerReflectionInfo(stream rpb.ServerReflectio
 				}
 			}
 		case *rpb.ServerReflectionRequest_ListServices:
-			if s.serviceInfo == nil {
-				s.serviceInfo = s.s.GetServiceInfo()
-			}
-			serviceResponses := make([]*rpb.ServiceResponse, 0, len(s.serviceInfo))
-			for n := range s.serviceInfo {
-				serviceResponses = append(serviceResponses, &rpb.ServiceResponse{
+			svcNames, _ := s.getSymbols()
+			serviceResponses := make([]*rpb.ServiceResponse, len(svcNames))
+			for i, n := range svcNames {
+				serviceResponses[i] = &rpb.ServiceResponse{
 					Name: n,
-				})
+				}
 			}
 			out.MessageResponse = &rpb.ServerReflectionResponse_ListServicesResponse{
 				ListServicesResponse: &rpb.ListServiceResponse{
diff --git a/vendor/google.golang.org/grpc/reflection/serverreflection_test.go b/vendor/google.golang.org/grpc/reflection/serverreflection_test.go
index 90858908..e2c74169 100644
--- a/vendor/google.golang.org/grpc/reflection/serverreflection_test.go
+++ b/vendor/google.golang.org/grpc/reflection/serverreflection_test.go
@@ -60,7 +60,7 @@ func loadFileDesc(filename string) (*dpb.FileDescriptorProto, []byte) {
 	if enc == nil {
 		panic(fmt.Sprintf("failed to find fd for file: %v", filename))
 	}
-	fd, err := s.decodeFileDesc(enc)
+	fd, err := decodeFileDesc(enc)
 	if err != nil {
 		panic(fmt.Sprintf("failed to decode enc: %v", err))
 	}
@@ -101,7 +101,7 @@ func TestTypeForName(t *testing.T) {
 	}{
 		{"grpc.testing.SearchResponse", reflect.TypeOf(pb.SearchResponse{})},
 	} {
-		r, err := s.typeForName(test.name)
+		r, err := typeForName(test.name)
 		if err != nil || r != test.want {
 			t.Errorf("typeForName(%q) = %q, %v, want %q, <nil>", test.name, r, err, test.want)
 		}
@@ -112,7 +112,7 @@ func TestTypeForNameNotFound(t *testing.T) {
 	for _, test := range []string{
 		"grpc.testing.not_exiting",
 	} {
-		_, err := s.typeForName(test)
+		_, err := typeForName(test)
 		if err == nil {
 			t.Errorf("typeForName(%q) = _, %v, want _, <non-nil>", test, err)
 		}
@@ -131,7 +131,7 @@ func TestFileDescContainingExtension(t *testing.T) {
 		{reflect.TypeOf(pb.ToBeExtended{}), 23, fdProto2Ext2},
 		{reflect.TypeOf(pb.ToBeExtended{}), 29, fdProto2Ext2},
 	} {
-		fd, err := s.fileDescContainingExtension(test.st, test.extNum)
+		fd, err := fileDescContainingExtension(test.st, test.extNum)
 		if err != nil || !proto.Equal(fd, test.want) {
 			t.Errorf("fileDescContainingExtension(%q) = %q, %v, want %q, <nil>", test.st, fd, err, test.want)
 		}
@@ -296,6 +296,12 @@ func testFileContainingSymbol(t *testing.T, stream rpb.ServerReflection_ServerRe
 		{"grpc.testingv3.SearchServiceV3.Search", fdTestv3Byte},
 		{"grpc.testingv3.SearchServiceV3.StreamingSearch", fdTestv3Byte},
 		{"grpc.testingv3.SearchResponseV3", fdTestv3Byte},
+		// search for field, oneof, enum, and enum value symbols, too
+		{"grpc.testingv3.SearchResponseV3.Result.snippets", fdTestv3Byte},
+		{"grpc.testingv3.SearchResponseV3.Result.Value.val", fdTestv3Byte},
+		{"grpc.testingv3.SearchResponseV3.Result.Value.str", fdTestv3Byte},
+		{"grpc.testingv3.SearchResponseV3.State", fdTestv3Byte},
+		{"grpc.testingv3.SearchResponseV3.State.FRESH", fdTestv3Byte},
 	} {
 		if err := stream.Send(&rpb.ServerReflectionRequest{
 			MessageRequest: &rpb.ServerReflectionRequest_FileContainingSymbol{
diff --git a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go b/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go
index a543a709..084bdbfe 100644
--- a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go
+++ b/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go
@@ -24,7 +24,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"math/rand"
 	"net"
 	"os"
 	"strconv"
@@ -34,6 +33,8 @@ import (
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/backoff"
+	"google.golang.org/grpc/internal/grpcrand"
 	"google.golang.org/grpc/resolver"
 )
 
@@ -50,20 +51,31 @@ const (
 	txtAttribute = "grpc_config="
 )
 
-var errMissingAddr = errors.New("missing address")
+var (
+	errMissingAddr = errors.New("dns resolver: missing address")
+
+	// Addresses ending with a colon that is supposed to be the separator
+	// between host and port is not allowed.  E.g. "::" is a valid address as
+	// it is an IPv6 address (host only) and "[::]:" is invalid as it ends with
+	// a colon as the host and port separator
+	errEndsWithColon = errors.New("dns resolver: missing port after port-separator colon")
+)
 
 // NewBuilder creates a dnsBuilder which is used to factory DNS resolvers.
 func NewBuilder() resolver.Builder {
-	return &dnsBuilder{freq: defaultFreq}
+	return &dnsBuilder{minFreq: defaultFreq}
 }
 
 type dnsBuilder struct {
-	// frequency of polling the DNS server.
-	freq time.Duration
+	// minimum frequency of polling the DNS server.
+	minFreq time.Duration
 }
 
 // Build creates and starts a DNS resolver that watches the name resolution of the target.
 func (b *dnsBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
+	if target.Authority != "" {
+		return nil, fmt.Errorf("Default DNS resolver does not support custom DNS server")
+	}
 	host, port, err := parseTarget(target.Endpoint)
 	if err != nil {
 		return nil, err
@@ -87,14 +99,16 @@ func (b *dnsBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts
 	// DNS address (non-IP).
 	ctx, cancel := context.WithCancel(context.Background())
 	d := &dnsResolver{
-		freq:   b.freq,
-		host:   host,
-		port:   port,
-		ctx:    ctx,
-		cancel: cancel,
-		cc:     cc,
-		t:      time.NewTimer(0),
-		rn:     make(chan struct{}, 1),
+		freq:                 b.minFreq,
+		backoff:              backoff.Exponential{MaxDelay: b.minFreq},
+		host:                 host,
+		port:                 port,
+		ctx:                  ctx,
+		cancel:               cancel,
+		cc:                   cc,
+		t:                    time.NewTimer(0),
+		rn:                   make(chan struct{}, 1),
+		disableServiceConfig: opts.DisableServiceConfig,
 	}
 
 	d.wg.Add(1)
@@ -142,12 +156,14 @@ func (i *ipResolver) watcher() {
 
 // dnsResolver watches for the name resolution update for a non-IP target.
 type dnsResolver struct {
-	freq   time.Duration
-	host   string
-	port   string
-	ctx    context.Context
-	cancel context.CancelFunc
-	cc     resolver.ClientConn
+	freq       time.Duration
+	backoff    backoff.Exponential
+	retryCount int
+	host       string
+	port       string
+	ctx        context.Context
+	cancel     context.CancelFunc
+	cc         resolver.ClientConn
 	// rn channel is used by ResolveNow() to force an immediate resolution of the target.
 	rn chan struct{}
 	t  *time.Timer
@@ -157,7 +173,8 @@ type dnsResolver struct {
 	// If Close() doesn't wait for watcher() goroutine finishes, race detector sometimes
 	// will warns lookup (READ the lookup function pointers) inside watcher() goroutine
 	// has data race with replaceNetFunc (WRITE the lookup function pointers).
-	wg sync.WaitGroup
+	wg                   sync.WaitGroup
+	disableServiceConfig bool
 }
 
 // ResolveNow invoke an immediate resolution of the target that this dnsResolver watches.
@@ -185,9 +202,16 @@ func (d *dnsResolver) watcher() {
 		case <-d.rn:
 		}
 		result, sc := d.lookup()
-		// Next lookup should happen after an interval defined by d.freq.
-		d.t.Reset(d.freq)
-		d.cc.NewServiceConfig(string(sc))
+		// Next lookup should happen within an interval defined by d.freq. It may be
+		// more often due to exponential retry on empty address list.
+		if len(result) == 0 {
+			d.retryCount++
+			d.t.Reset(d.backoff.Backoff(d.retryCount))
+		} else {
+			d.retryCount = 0
+			d.t.Reset(d.freq)
+		}
+		d.cc.NewServiceConfig(sc)
 		d.cc.NewAddress(result)
 	}
 }
@@ -202,7 +226,7 @@ func (d *dnsResolver) lookupSRV() []resolver.Address {
 	for _, s := range srvs {
 		lbAddrs, err := lookupHost(d.ctx, s.Target)
 		if err != nil {
-			grpclog.Warningf("grpc: failed load banlacer address dns lookup due to %v.\n", err)
+			grpclog.Infof("grpc: failed load balancer address dns lookup due to %v.\n", err)
 			continue
 		}
 		for _, a := range lbAddrs {
@@ -221,7 +245,7 @@ func (d *dnsResolver) lookupSRV() []resolver.Address {
 func (d *dnsResolver) lookupTXT() string {
 	ss, err := lookupTXT(d.ctx, d.host)
 	if err != nil {
-		grpclog.Warningf("grpc: failed dns TXT record lookup due to %v.\n", err)
+		grpclog.Infof("grpc: failed dns TXT record lookup due to %v.\n", err)
 		return ""
 	}
 	var res string
@@ -257,10 +281,12 @@ func (d *dnsResolver) lookupHost() []resolver.Address {
 }
 
 func (d *dnsResolver) lookup() ([]resolver.Address, string) {
-	var newAddrs []resolver.Address
-	newAddrs = d.lookupSRV()
+	newAddrs := d.lookupSRV()
 	// Support fallback to non-balancer address.
 	newAddrs = append(newAddrs, d.lookupHost()...)
+	if d.disableServiceConfig {
+		return newAddrs, ""
+	}
 	sc := d.lookupTXT()
 	return newAddrs, canaryingSC(sc)
 }
@@ -288,7 +314,6 @@ func formatIP(addr string) (addrIP string, ok bool) {
 // target: "ipv4-host:80" returns host: "ipv4-host", port: "80"
 // target: "[ipv6-host]" returns host: "ipv6-host", port: "443"
 // target: ":80" returns host: "localhost", port: "80"
-// target: ":" returns host: "localhost", port: "443"
 func parseTarget(target string) (host, port string, err error) {
 	if target == "" {
 		return "", "", errMissingAddr
@@ -298,15 +323,15 @@ func parseTarget(target string) (host, port string, err error) {
 		return target, defaultPort, nil
 	}
 	if host, port, err = net.SplitHostPort(target); err == nil {
+		if port == "" {
+			// If the port field is empty (target ends with colon), e.g. "[::1]:", this is an error.
+			return "", "", errEndsWithColon
+		}
 		// target has port, i.e ipv4-host:port, [ipv6-host]:port, host-name:port
 		if host == "" {
 			// Keep consistent with net.Dial(): If the host is empty, as in ":80", the local system is assumed.
 			host = "localhost"
 		}
-		if port == "" {
-			// If the port field is empty(target ends with colon), e.g. "[::1]:", defaultPort is used.
-			port = defaultPort
-		}
 		return host, port, nil
 	}
 	if host, port, err = net.SplitHostPort(target + ":" + defaultPort); err == nil {
@@ -339,12 +364,7 @@ func chosenByPercentage(a *int) bool {
 	if a == nil {
 		return true
 	}
-	s := rand.NewSource(time.Now().UnixNano())
-	r := rand.New(s)
-	if r.Intn(100)+1 > *a {
-		return false
-	}
-	return true
+	return grpcrand.Intn(100)+1 <= *a
 }
 
 func canaryingSC(js string) string {
diff --git a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver_test.go b/vendor/google.golang.org/grpc/resolver/dns/dns_resolver_test.go
index 41a9ecb9..53d6a871 100644
--- a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver_test.go
+++ b/vendor/google.golang.org/grpc/resolver/dns/dns_resolver_test.go
@@ -27,8 +27,8 @@ import (
 	"testing"
 	"time"
 
+	"google.golang.org/grpc/internal/leakcheck"
 	"google.golang.org/grpc/resolver"
-	"google.golang.org/grpc/test/leakcheck"
 )
 
 func TestMain(m *testing.M) {
@@ -46,7 +46,7 @@ type testClientConn struct {
 	target string
 	m1     sync.Mutex
 	addrs  []resolver.Address
-	a      int
+	a      int // how many times NewAddress() has been called
 	m2     sync.Mutex
 	sc     string
 	s      int
@@ -815,7 +815,7 @@ func testIPResolver(t *testing.T) {
 		{"127.0.0.1:12345", []resolver.Address{{Addr: "127.0.0.1:12345"}}},
 		{"::1", []resolver.Address{{Addr: "[::1]" + colonDefaultPort}}},
 		{"[::1]:12345", []resolver.Address{{Addr: "[::1]:12345"}}},
-		{"[::1]:", []resolver.Address{{Addr: "[::1]:443"}}},
+		{"[::1]", []resolver.Address{{Addr: "[::1]:443"}}},
 		{"2001:db8:85a3::8a2e:370:7334", []resolver.Address{{Addr: "[2001:db8:85a3::8a2e:370:7334]" + colonDefaultPort}}},
 		{"[2001:db8:85a3::8a2e:370:7334]", []resolver.Address{{Addr: "[2001:db8:85a3::8a2e:370:7334]" + colonDefaultPort}}},
 		{"[2001:db8:85a3::8a2e:370:7334]:12345", []resolver.Address{{Addr: "[2001:db8:85a3::8a2e:370:7334]:12345"}}},
@@ -867,6 +867,7 @@ func TestResolveFunc(t *testing.T) {
 		{"www.google.com", nil},
 		{"foo.bar:12345", nil},
 		{"127.0.0.1", nil},
+		{"::", nil},
 		{"127.0.0.1:12345", nil},
 		{"[::1]:80", nil},
 		{"[2001:db8:a0b:12f0::1]:21", nil},
@@ -875,7 +876,8 @@ func TestResolveFunc(t *testing.T) {
 		{"[fe80::1%lo0]:80", nil},
 		{"golang.org:http", nil},
 		{"[2001:db8::1]:http", nil},
-		{":", nil},
+		{"[2001:db8::1]:", errEndsWithColon},
+		{":", errEndsWithColon},
 		{"", errMissingAddr},
 		{"[2001:db8:a0b:12f0::1", errForInvalidTarget},
 	}
@@ -892,3 +894,102 @@ func TestResolveFunc(t *testing.T) {
 		}
 	}
 }
+
+func TestDisableServiceConfig(t *testing.T) {
+	defer leakcheck.Check(t)
+	tests := []struct {
+		target               string
+		scWant               string
+		disableServiceConfig bool
+	}{
+		{
+			"foo.bar.com",
+			generateSC("foo.bar.com"),
+			false,
+		},
+		{
+			"foo.bar.com",
+			"",
+			true,
+		},
+	}
+
+	for _, a := range tests {
+		b := NewBuilder()
+		cc := &testClientConn{target: a.target}
+		r, err := b.Build(resolver.Target{Endpoint: a.target}, cc, resolver.BuildOption{DisableServiceConfig: a.disableServiceConfig})
+		if err != nil {
+			t.Fatalf("%v\n", err)
+		}
+		var cnt int
+		var sc string
+		for {
+			sc, cnt = cc.getSc()
+			if cnt > 0 {
+				break
+			}
+			time.Sleep(time.Millisecond)
+		}
+		if !reflect.DeepEqual(a.scWant, sc) {
+			t.Errorf("Resolved service config of target: %q = %+v, want %+v\n", a.target, sc, a.scWant)
+		}
+		r.Close()
+	}
+}
+
+func TestDNSResolverRetry(t *testing.T) {
+	b := NewBuilder()
+	target := "ipv4.single.fake"
+	cc := &testClientConn{target: target}
+	r, err := b.Build(resolver.Target{Endpoint: target}, cc, resolver.BuildOption{})
+	if err != nil {
+		t.Fatalf("%v\n", err)
+	}
+	var addrs []resolver.Address
+	for {
+		addrs, _ = cc.getAddress()
+		if len(addrs) == 1 {
+			break
+		}
+		time.Sleep(time.Millisecond)
+	}
+	want := []resolver.Address{{Addr: "1.2.3.4" + colonDefaultPort}}
+	if !reflect.DeepEqual(want, addrs) {
+		t.Errorf("Resolved addresses of target: %q = %+v, want %+v\n", target, addrs, want)
+	}
+	// mutate the host lookup table so the target has 0 address returned.
+	revertTbl := mutateTbl(target)
+	// trigger a resolve that will get empty address list
+	r.ResolveNow(resolver.ResolveNowOption{})
+	for {
+		addrs, _ = cc.getAddress()
+		if len(addrs) == 0 {
+			break
+		}
+		time.Sleep(time.Millisecond)
+	}
+	revertTbl()
+	// wait for the retry to happen in two seconds.
+	timer := time.NewTimer(2 * time.Second)
+	for {
+		b := false
+		select {
+		case <-timer.C:
+			b = true
+		default:
+			addrs, _ = cc.getAddress()
+			if len(addrs) == 1 {
+				b = true
+				break
+			}
+			time.Sleep(time.Millisecond)
+		}
+		if b {
+			break
+		}
+	}
+	if !reflect.DeepEqual(want, addrs) {
+		t.Errorf("Resolved addresses of target: %q = %+v, want %+v\n", target, addrs, want)
+	}
+	r.Close()
+}
diff --git a/vendor/google.golang.org/grpc/resolver/manual/manual.go b/vendor/google.golang.org/grpc/resolver/manual/manual.go
index 50ed762a..aeb7aed3 100644
--- a/vendor/google.golang.org/grpc/resolver/manual/manual.go
+++ b/vendor/google.golang.org/grpc/resolver/manual/manual.go
@@ -81,7 +81,7 @@ func (r *Resolver) NewServiceConfig(sc string) {
 }
 
 // GenerateAndRegisterManualResolver generates a random scheme and a Resolver
-// with it. It also regieter this Resolver.
+// with it. It also registers this Resolver.
 // It returns the Resolver and a cleanup function to unregister it.
 func GenerateAndRegisterManualResolver() (*Resolver, func()) {
 	scheme := strconv.FormatInt(time.Now().UnixNano(), 36)
diff --git a/vendor/google.golang.org/grpc/resolver/resolver.go b/vendor/google.golang.org/grpc/resolver/resolver.go
index 9efcffb3..145cf477 100644
--- a/vendor/google.golang.org/grpc/resolver/resolver.go
+++ b/vendor/google.golang.org/grpc/resolver/resolver.go
@@ -29,37 +29,41 @@ var (
 
 // TODO(bar) install dns resolver in init(){}.
 
-// Register registers the resolver builder to the resolver map.
-// b.Scheme will be used as the scheme registered with this builder.
+// Register registers the resolver builder to the resolver map. b.Scheme will be
+// used as the scheme registered with this builder.
+//
+// NOTE: this function must only be called during initialization time (i.e. in
+// an init() function), and is not thread-safe. If multiple Resolvers are
+// registered with the same name, the one registered last will take effect.
 func Register(b Builder) {
 	m[b.Scheme()] = b
 }
 
 // Get returns the resolver builder registered with the given scheme.
-// If no builder is register with the scheme, the default scheme will
-// be used.
-// If the default scheme is not modified, "passthrough" will be the default
-// scheme, and the preinstalled dns resolver will be used.
-// If the default scheme is modified, and a resolver is registered with
-// the scheme, that resolver will be returned.
-// If the default scheme is modified, and no resolver is registered with
-// the scheme, nil will be returned.
+//
+// If no builder is register with the scheme, nil will be returned.
 func Get(scheme string) Builder {
 	if b, ok := m[scheme]; ok {
 		return b
 	}
-	if b, ok := m[defaultScheme]; ok {
-		return b
-	}
 	return nil
 }
 
-// SetDefaultScheme sets the default scheme that will be used.
-// The default default scheme is "passthrough".
+// SetDefaultScheme sets the default scheme that will be used. The default
+// default scheme is "passthrough".
+//
+// NOTE: this function must only be called during initialization time (i.e. in
+// an init() function), and is not thread-safe. The scheme set last overrides
+// previously set values.
 func SetDefaultScheme(scheme string) {
 	defaultScheme = scheme
 }
 
+// GetDefaultScheme gets the default scheme that will be used.
+func GetDefaultScheme() string {
+	return defaultScheme
+}
+
 // AddressType indicates the address type returned by name resolution.
 type AddressType uint8
 
@@ -90,6 +94,8 @@ type Address struct {
 // BuildOption includes additional information for the builder to create
 // the resolver.
 type BuildOption struct {
+	// DisableServiceConfig indicates whether resolver should fetch service config data.
+	DisableServiceConfig bool
 }
 
 // ClientConn contains the callbacks for resolver to notify any updates
diff --git a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go
index 1a1591e8..494d6931 100644
--- a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go
+++ b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go
@@ -48,31 +48,32 @@ func split2(s, sep string) (string, string, bool) {
 
 // parseTarget splits target into a struct containing scheme, authority and
 // endpoint.
+//
+// If target is not a valid scheme://authority/endpoint, it returns {Endpoint:
+// target}.
 func parseTarget(target string) (ret resolver.Target) {
 	var ok bool
 	ret.Scheme, ret.Endpoint, ok = split2(target, "://")
 	if !ok {
 		return resolver.Target{Endpoint: target}
 	}
-	ret.Authority, ret.Endpoint, _ = split2(ret.Endpoint, "/")
+	ret.Authority, ret.Endpoint, ok = split2(ret.Endpoint, "/")
+	if !ok {
+		return resolver.Target{Endpoint: target}
+	}
 	return ret
 }
 
 // newCCResolverWrapper parses cc.target for scheme and gets the resolver
-// builder for this scheme. It then builds the resolver and starts the
-// monitoring goroutine for it.
+// builder for this scheme and builds the resolver. The monitoring goroutine
+// for it is not started yet and can be created by calling start().
 //
 // If withResolverBuilder dial option is set, the specified resolver will be
 // used instead.
 func newCCResolverWrapper(cc *ClientConn) (*ccResolverWrapper, error) {
-	grpclog.Infof("dialing to target with scheme: %q", cc.parsedTarget.Scheme)
-
 	rb := cc.dopts.resolverBuilder
 	if rb == nil {
-		rb = resolver.Get(cc.parsedTarget.Scheme)
-		if rb == nil {
-			return nil, fmt.Errorf("could not get resolver for scheme: %q", cc.parsedTarget.Scheme)
-		}
+		return nil, fmt.Errorf("could not get resolver for scheme: %q", cc.parsedTarget.Scheme)
 	}
 
 	ccr := &ccResolverWrapper{
@@ -83,7 +84,7 @@ func newCCResolverWrapper(cc *ClientConn) (*ccResolverWrapper, error) {
 	}
 
 	var err error
-	ccr.resolver, err = rb.Build(cc.parsedTarget, ccr, resolver.BuildOption{})
+	ccr.resolver, err = rb.Build(cc.parsedTarget, ccr, resolver.BuildOption{DisableServiceConfig: cc.dopts.disableServiceConfig})
 	if err != nil {
 		return nil, err
 	}
@@ -94,7 +95,7 @@ func (ccr *ccResolverWrapper) start() {
 	go ccr.watcher()
 }
 
-// watcher processes address updates and service config updates sequencially.
+// watcher processes address updates and service config updates sequentially.
 // Otherwise, we need to resolve possible races between address and service
 // config (e.g. they specify different balancer types).
 func (ccr *ccResolverWrapper) watcher() {
@@ -147,7 +148,7 @@ func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) {
 }
 
 // NewServiceConfig is called by the resolver implemenetion to send service
-// configs to gPRC.
+// configs to gRPC.
 func (ccr *ccResolverWrapper) NewServiceConfig(sc string) {
 	select {
 	case <-ccr.scCh:
diff --git a/vendor/google.golang.org/grpc/resolver_conn_wrapper_test.go b/vendor/google.golang.org/grpc/resolver_conn_wrapper_test.go
index d857f437..6f1367a2 100644
--- a/vendor/google.golang.org/grpc/resolver_conn_wrapper_test.go
+++ b/vendor/google.golang.org/grpc/resolver_conn_wrapper_test.go
@@ -19,25 +19,20 @@
 package grpc
 
 import (
+	"fmt"
+	"net"
 	"testing"
+	"time"
 
 	"google.golang.org/grpc/resolver"
 )
 
 func TestParseTarget(t *testing.T) {
 	for _, test := range []resolver.Target{
-		{"", "", ""},
-		{"a", "", ""},
-		{"", "a", ""},
-		{"", "", "a"},
-		{"a", "b", ""},
-		{"a", "", "b"},
-		{"", "a", "b"},
-		{"a", "b", "c"},
-		{"dns", "", "google.com"},
-		{"dns", "a.server.com", "google.com"},
-		{"dns", "a.server.com", "google.com/?a=b"},
-		{"", "", "/unix/socket/address"},
+		{Scheme: "dns", Authority: "", Endpoint: "google.com"},
+		{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com"},
+		{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com/?a=b"},
+		{Scheme: "passthrough", Authority: "", Endpoint: "/unix/socket/address"},
 	} {
 		str := test.Scheme + "://" + test.Authority + "/" + test.Endpoint
 		got := parseTarget(str)
@@ -52,24 +47,32 @@ func TestParseTargetString(t *testing.T) {
 		targetStr string
 		want      resolver.Target
 	}{
-		{"", resolver.Target{"", "", ""}},
-		{"://", resolver.Target{"", "", ""}},
-		{":///", resolver.Target{"", "", ""}},
-		{"a:///", resolver.Target{"a", "", ""}},
-		{"://a/", resolver.Target{"", "a", ""}},
-		{":///a", resolver.Target{"", "", "a"}},
-		{"a://b/", resolver.Target{"a", "b", ""}},
-		{"a:///b", resolver.Target{"a", "", "b"}},
-		{"://a/b", resolver.Target{"", "a", "b"}},
-		{"a://b/c", resolver.Target{"a", "b", "c"}},
-		{"dns:///google.com", resolver.Target{"dns", "", "google.com"}},
-		{"dns://a.server.com/google.com", resolver.Target{"dns", "a.server.com", "google.com"}},
-		{"dns://a.server.com/google.com/?a=b", resolver.Target{"dns", "a.server.com", "google.com/?a=b"}},
+		{targetStr: "", want: resolver.Target{Scheme: "", Authority: "", Endpoint: ""}},
+		{targetStr: ":///", want: resolver.Target{Scheme: "", Authority: "", Endpoint: ""}},
+		{targetStr: "a:///", want: resolver.Target{Scheme: "a", Authority: "", Endpoint: ""}},
+		{targetStr: "://a/", want: resolver.Target{Scheme: "", Authority: "a", Endpoint: ""}},
+		{targetStr: ":///a", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a"}},
+		{targetStr: "a://b/", want: resolver.Target{Scheme: "a", Authority: "b", Endpoint: ""}},
+		{targetStr: "a:///b", want: resolver.Target{Scheme: "a", Authority: "", Endpoint: "b"}},
+		{targetStr: "://a/b", want: resolver.Target{Scheme: "", Authority: "a", Endpoint: "b"}},
+		{targetStr: "a://b/c", want: resolver.Target{Scheme: "a", Authority: "b", Endpoint: "c"}},
+		{targetStr: "dns:///google.com", want: resolver.Target{Scheme: "dns", Authority: "", Endpoint: "google.com"}},
+		{targetStr: "dns://a.server.com/google.com", want: resolver.Target{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com"}},
+		{targetStr: "dns://a.server.com/google.com/?a=b", want: resolver.Target{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com/?a=b"}},
 
-		{"/", resolver.Target{"", "", "/"}},
-		{"google.com", resolver.Target{"", "", "google.com"}},
-		{"google.com/?a=b", resolver.Target{"", "", "google.com/?a=b"}},
-		{"/unix/socket/address", resolver.Target{"", "", "/unix/socket/address"}},
+		{targetStr: "/", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "/"}},
+		{targetStr: "google.com", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "google.com"}},
+		{targetStr: "google.com/?a=b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "google.com/?a=b"}},
+		{targetStr: "/unix/socket/address", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "/unix/socket/address"}},
+
+		// If we can only parse part of the target.
+		{targetStr: "://", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "://"}},
+		{targetStr: "unix://domain", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "unix://domain"}},
+		{targetStr: "a:b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a:b"}},
+		{targetStr: "a/b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a/b"}},
+		{targetStr: "a:/b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a:/b"}},
+		{targetStr: "a//b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a//b"}},
+		{targetStr: "a://b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a://b"}},
 	} {
 		got := parseTarget(test.targetStr)
 		if got != test.want {
@@ -77,3 +80,34 @@ func TestParseTargetString(t *testing.T) {
 		}
 	}
 }
+
+// The target string with unknown scheme should be kept unchanged and passed to
+// the dialer.
+func TestDialParseTargetUnknownScheme(t *testing.T) {
+	for _, test := range []struct {
+		targetStr string
+		want      string
+	}{
+		{"/unix/socket/address", "/unix/socket/address"},
+
+		// Special test for "unix:///".
+		{"unix:///unix/socket/address", "unix:///unix/socket/address"},
+
+		// For known scheme.
+		{"passthrough://a.server.com/google.com", "google.com"},
+	} {
+		dialStrCh := make(chan string, 1)
+		cc, err := Dial(test.targetStr, WithInsecure(), WithDialer(func(t string, _ time.Duration) (net.Conn, error) {
+			dialStrCh <- t
+			return nil, fmt.Errorf("test dialer, always error")
+		}))
+		if err != nil {
+			t.Fatalf("Failed to create ClientConn: %v", err)
+		}
+		got := <-dialStrCh
+		cc.Close()
+		if got != test.want {
+			t.Errorf("Dial(%q), dialer got %q, want %q", test.targetStr, got, test.want)
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go
index 09245e0d..61342c9c 100644
--- a/vendor/google.golang.org/grpc/rpc_util.go
+++ b/vendor/google.golang.org/grpc/rpc_util.go
@@ -22,9 +22,11 @@ import (
 	"bytes"
 	"compress/gzip"
 	"encoding/binary"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"math"
+	"net/url"
 	"strings"
 	"sync"
 	"time"
@@ -34,14 +36,16 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/encoding"
 	"google.golang.org/grpc/encoding/proto"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/transport"
 )
 
 // Compressor defines the interface gRPC uses to compress a message.
+//
+// Deprecated: use package encoding.
 type Compressor interface {
 	// Do compresses p into w.
 	Do(w io.Writer, p []byte) error
@@ -54,14 +58,34 @@ type gzipCompressor struct {
 }
 
 // NewGZIPCompressor creates a Compressor based on GZIP.
+//
+// Deprecated: use package encoding/gzip.
 func NewGZIPCompressor() Compressor {
+	c, _ := NewGZIPCompressorWithLevel(gzip.DefaultCompression)
+	return c
+}
+
+// NewGZIPCompressorWithLevel is like NewGZIPCompressor but specifies the gzip compression level instead
+// of assuming DefaultCompression.
+//
+// The error returned will be nil if the level is valid.
+//
+// Deprecated: use package encoding/gzip.
+func NewGZIPCompressorWithLevel(level int) (Compressor, error) {
+	if level < gzip.DefaultCompression || level > gzip.BestCompression {
+		return nil, fmt.Errorf("grpc: invalid compression level: %d", level)
+	}
 	return &gzipCompressor{
 		pool: sync.Pool{
 			New: func() interface{} {
-				return gzip.NewWriter(ioutil.Discard)
+				w, err := gzip.NewWriterLevel(ioutil.Discard, level)
+				if err != nil {
+					panic(err)
+				}
+				return w
 			},
 		},
-	}
+	}, nil
 }
 
 func (c *gzipCompressor) Do(w io.Writer, p []byte) error {
@@ -79,6 +103,8 @@ func (c *gzipCompressor) Type() string {
 }
 
 // Decompressor defines the interface gRPC uses to decompress a message.
+//
+// Deprecated: use package encoding.
 type Decompressor interface {
 	// Do reads the data from r and uncompress them.
 	Do(r io.Reader) ([]byte, error)
@@ -91,6 +117,8 @@ type gzipDecompressor struct {
 }
 
 // NewGZIPDecompressor creates a Decompressor based on GZIP.
+//
+// Deprecated: use package encoding/gzip.
 func NewGZIPDecompressor() Decompressor {
 	return &gzipDecompressor{}
 }
@@ -127,17 +155,22 @@ func (d *gzipDecompressor) Type() string {
 type callInfo struct {
 	compressorType        string
 	failFast              bool
-	stream                *transport.Stream
+	stream                *clientStream
 	traceInfo             traceInfo // in trace.go
 	maxReceiveMessageSize *int
 	maxSendMessageSize    *int
 	creds                 credentials.PerRPCCredentials
 	contentSubtype        string
 	codec                 baseCodec
+	disableRetry          bool
+	maxRetryRPCBufferSize int
 }
 
 func defaultCallInfo() *callInfo {
-	return &callInfo{failFast: true}
+	return &callInfo{
+		failFast:              true,
+		maxRetryRPCBufferSize: 256 * 1024, // 256KB
+	}
 }
 
 // CallOption configures a Call before it starts or extracts information from
@@ -160,46 +193,66 @@ type EmptyCallOption struct{}
 func (EmptyCallOption) before(*callInfo) error { return nil }
 func (EmptyCallOption) after(*callInfo)        {}
 
-type beforeCall func(c *callInfo) error
-
-func (o beforeCall) before(c *callInfo) error { return o(c) }
-func (o beforeCall) after(c *callInfo)        {}
-
-type afterCall func(c *callInfo)
-
-func (o afterCall) before(c *callInfo) error { return nil }
-func (o afterCall) after(c *callInfo)        { o(c) }
-
 // Header returns a CallOptions that retrieves the header metadata
 // for a unary RPC.
 func Header(md *metadata.MD) CallOption {
-	return afterCall(func(c *callInfo) {
-		if c.stream != nil {
-			*md, _ = c.stream.Header()
-		}
-	})
+	return HeaderCallOption{HeaderAddr: md}
+}
+
+// HeaderCallOption is a CallOption for collecting response header metadata.
+// The metadata field will be populated *after* the RPC completes.
+// This is an EXPERIMENTAL API.
+type HeaderCallOption struct {
+	HeaderAddr *metadata.MD
+}
+
+func (o HeaderCallOption) before(c *callInfo) error { return nil }
+func (o HeaderCallOption) after(c *callInfo) {
+	if c.stream != nil {
+		*o.HeaderAddr, _ = c.stream.Header()
+	}
 }
 
 // Trailer returns a CallOptions that retrieves the trailer metadata
 // for a unary RPC.
 func Trailer(md *metadata.MD) CallOption {
-	return afterCall(func(c *callInfo) {
-		if c.stream != nil {
-			*md = c.stream.Trailer()
-		}
-	})
+	return TrailerCallOption{TrailerAddr: md}
 }
 
-// Peer returns a CallOption that retrieves peer information for a
-// unary RPC.
+// TrailerCallOption is a CallOption for collecting response trailer metadata.
+// The metadata field will be populated *after* the RPC completes.
+// This is an EXPERIMENTAL API.
+type TrailerCallOption struct {
+	TrailerAddr *metadata.MD
+}
+
+func (o TrailerCallOption) before(c *callInfo) error { return nil }
+func (o TrailerCallOption) after(c *callInfo) {
+	if c.stream != nil {
+		*o.TrailerAddr = c.stream.Trailer()
+	}
+}
+
+// Peer returns a CallOption that retrieves peer information for a unary RPC.
+// The peer field will be populated *after* the RPC completes.
 func Peer(p *peer.Peer) CallOption {
-	return afterCall(func(c *callInfo) {
-		if c.stream != nil {
-			if x, ok := peer.FromContext(c.stream.Context()); ok {
-				*p = *x
-			}
+	return PeerCallOption{PeerAddr: p}
+}
+
+// PeerCallOption is a CallOption for collecting the identity of the remote
+// peer. The peer field will be populated *after* the RPC completes.
+// This is an EXPERIMENTAL API.
+type PeerCallOption struct {
+	PeerAddr *peer.Peer
+}
+
+func (o PeerCallOption) before(c *callInfo) error { return nil }
+func (o PeerCallOption) after(c *callInfo) {
+	if c.stream != nil {
+		if x, ok := peer.FromContext(c.stream.Context()); ok {
+			*o.PeerAddr = *x
 		}
-	})
+	}
 }
 
 // FailFast configures the action to take when an RPC is attempted on broken
@@ -213,49 +266,98 @@ func Peer(p *peer.Peer) CallOption {
 //
 // By default, RPCs are "Fail Fast".
 func FailFast(failFast bool) CallOption {
-	return beforeCall(func(c *callInfo) error {
-		c.failFast = failFast
-		return nil
-	})
+	return FailFastCallOption{FailFast: failFast}
 }
 
+// FailFastCallOption is a CallOption for indicating whether an RPC should fail
+// fast or not.
+// This is an EXPERIMENTAL API.
+type FailFastCallOption struct {
+	FailFast bool
+}
+
+func (o FailFastCallOption) before(c *callInfo) error {
+	c.failFast = o.FailFast
+	return nil
+}
+func (o FailFastCallOption) after(c *callInfo) {}
+
 // MaxCallRecvMsgSize returns a CallOption which sets the maximum message size the client can receive.
 func MaxCallRecvMsgSize(s int) CallOption {
-	return beforeCall(func(o *callInfo) error {
-		o.maxReceiveMessageSize = &s
-		return nil
-	})
+	return MaxRecvMsgSizeCallOption{MaxRecvMsgSize: s}
+}
+
+// MaxRecvMsgSizeCallOption is a CallOption that indicates the maximum message
+// size the client can receive.
+// This is an EXPERIMENTAL API.
+type MaxRecvMsgSizeCallOption struct {
+	MaxRecvMsgSize int
+}
+
+func (o MaxRecvMsgSizeCallOption) before(c *callInfo) error {
+	c.maxReceiveMessageSize = &o.MaxRecvMsgSize
+	return nil
 }
+func (o MaxRecvMsgSizeCallOption) after(c *callInfo) {}
 
 // MaxCallSendMsgSize returns a CallOption which sets the maximum message size the client can send.
 func MaxCallSendMsgSize(s int) CallOption {
-	return beforeCall(func(o *callInfo) error {
-		o.maxSendMessageSize = &s
-		return nil
-	})
+	return MaxSendMsgSizeCallOption{MaxSendMsgSize: s}
+}
+
+// MaxSendMsgSizeCallOption is a CallOption that indicates the maximum message
+// size the client can send.
+// This is an EXPERIMENTAL API.
+type MaxSendMsgSizeCallOption struct {
+	MaxSendMsgSize int
+}
+
+func (o MaxSendMsgSizeCallOption) before(c *callInfo) error {
+	c.maxSendMessageSize = &o.MaxSendMsgSize
+	return nil
 }
+func (o MaxSendMsgSizeCallOption) after(c *callInfo) {}
 
 // PerRPCCredentials returns a CallOption that sets credentials.PerRPCCredentials
 // for a call.
 func PerRPCCredentials(creds credentials.PerRPCCredentials) CallOption {
-	return beforeCall(func(c *callInfo) error {
-		c.creds = creds
-		return nil
-	})
+	return PerRPCCredsCallOption{Creds: creds}
 }
 
+// PerRPCCredsCallOption is a CallOption that indicates the per-RPC
+// credentials to use for the call.
+// This is an EXPERIMENTAL API.
+type PerRPCCredsCallOption struct {
+	Creds credentials.PerRPCCredentials
+}
+
+func (o PerRPCCredsCallOption) before(c *callInfo) error {
+	c.creds = o.Creds
+	return nil
+}
+func (o PerRPCCredsCallOption) after(c *callInfo) {}
+
 // UseCompressor returns a CallOption which sets the compressor used when
 // sending the request.  If WithCompressor is also set, UseCompressor has
 // higher priority.
 //
 // This API is EXPERIMENTAL.
 func UseCompressor(name string) CallOption {
-	return beforeCall(func(c *callInfo) error {
-		c.compressorType = name
-		return nil
-	})
+	return CompressorCallOption{CompressorType: name}
+}
+
+// CompressorCallOption is a CallOption that indicates the compressor to use.
+// This is an EXPERIMENTAL API.
+type CompressorCallOption struct {
+	CompressorType string
 }
 
+func (o CompressorCallOption) before(c *callInfo) error {
+	c.compressorType = o.CompressorType
+	return nil
+}
+func (o CompressorCallOption) after(c *callInfo) {}
+
 // CallContentSubtype returns a CallOption that will set the content-subtype
 // for a call. For example, if content-subtype is "json", the Content-Type over
 // the wire will be "application/grpc+json". The content-subtype is converted
@@ -265,7 +367,7 @@ func UseCompressor(name string) CallOption {
 //
 // If CallCustomCodec is not also used, the content-subtype will be used to
 // look up the Codec to use in the registry controlled by RegisterCodec. See
-// the documention on RegisterCodec for details on registration. The lookup
+// the documentation on RegisterCodec for details on registration. The lookup
 // of content-subtype is case-insensitive. If no such Codec is found, the call
 // will result in an error with code codes.Internal.
 //
@@ -273,13 +375,22 @@ func UseCompressor(name string) CallOption {
 // response messages, with the content-subtype set to the given contentSubtype
 // here for requests.
 func CallContentSubtype(contentSubtype string) CallOption {
-	contentSubtype = strings.ToLower(contentSubtype)
-	return beforeCall(func(c *callInfo) error {
-		c.contentSubtype = contentSubtype
-		return nil
-	})
+	return ContentSubtypeCallOption{ContentSubtype: strings.ToLower(contentSubtype)}
 }
 
+// ContentSubtypeCallOption is a CallOption that indicates the content-subtype
+// used for marshaling messages.
+// This is an EXPERIMENTAL API.
+type ContentSubtypeCallOption struct {
+	ContentSubtype string
+}
+
+func (o ContentSubtypeCallOption) before(c *callInfo) error {
+	c.contentSubtype = o.ContentSubtype
+	return nil
+}
+func (o ContentSubtypeCallOption) after(c *callInfo) {}
+
 // CallCustomCodec returns a CallOption that will set the given Codec to be
 // used for all request and response messages for a call. The result of calling
 // String() will be used as the content-subtype in a case-insensitive manner.
@@ -293,18 +404,49 @@ func CallContentSubtype(contentSubtype string) CallOption {
 // This function is provided for advanced users; prefer to use only
 // CallContentSubtype to select a registered codec instead.
 func CallCustomCodec(codec Codec) CallOption {
-	return beforeCall(func(c *callInfo) error {
-		c.codec = codec
-		return nil
-	})
+	return CustomCodecCallOption{Codec: codec}
+}
+
+// CustomCodecCallOption is a CallOption that indicates the codec used for
+// marshaling messages.
+// This is an EXPERIMENTAL API.
+type CustomCodecCallOption struct {
+	Codec Codec
+}
+
+func (o CustomCodecCallOption) before(c *callInfo) error {
+	c.codec = o.Codec
+	return nil
 }
+func (o CustomCodecCallOption) after(c *callInfo) {}
+
+// MaxRetryRPCBufferSize returns a CallOption that limits the amount of memory
+// used for buffering this RPC's requests for retry purposes.
+//
+// This API is EXPERIMENTAL.
+func MaxRetryRPCBufferSize(bytes int) CallOption {
+	return MaxRetryRPCBufferSizeCallOption{bytes}
+}
+
+// MaxRetryRPCBufferSizeCallOption is a CallOption indicating the amount of
+// memory to be used for caching this RPC for retry purposes.
+// This is an EXPERIMENTAL API.
+type MaxRetryRPCBufferSizeCallOption struct {
+	MaxRetryRPCBufferSize int
+}
+
+func (o MaxRetryRPCBufferSizeCallOption) before(c *callInfo) error {
+	c.maxRetryRPCBufferSize = o.MaxRetryRPCBufferSize
+	return nil
+}
+func (o MaxRetryRPCBufferSizeCallOption) after(c *callInfo) {}
 
 // The format of the payload: compressed or not?
 type payloadFormat uint8
 
 const (
-	compressionNone payloadFormat = iota // no compression
-	compressionMade
+	compressionNone payloadFormat = 0 // no compression
+	compressionMade payloadFormat = 1 // compressed
 )
 
 // parser reads complete gRPC messages from the underlying reader.
@@ -328,7 +470,7 @@ type parser struct {
 //   * io.EOF, when no messages remain
 //   * io.ErrUnexpectedEOF
 //   * of type transport.ConnectionError
-//   * of type transport.StreamError
+//   * an error from the status package
 // No other error values or types must be returned, which also means
 // that the underlying io.Reader must not return an incompatible
 // error.
@@ -361,65 +503,82 @@ func (p *parser) recvMsg(maxReceiveMessageSize int) (pf payloadFormat, msg []byt
 	return pf, msg, nil
 }
 
-// encode serializes msg and returns a buffer of message header and a buffer of msg.
-// If msg is nil, it generates the message header and an empty msg buffer.
-// TODO(ddyihai): eliminate extra Compressor parameter.
-func encode(c baseCodec, msg interface{}, cp Compressor, outPayload *stats.OutPayload, compressor encoding.Compressor) ([]byte, []byte, error) {
-	var (
-		b    []byte
-		cbuf *bytes.Buffer
-	)
-	const (
-		payloadLen = 1
-		sizeLen    = 4
-	)
-	if msg != nil {
-		var err error
-		b, err = c.Marshal(msg)
-		if err != nil {
-			return nil, nil, status.Errorf(codes.Internal, "grpc: error while marshaling: %v", err.Error())
+// encode serializes msg and returns a buffer containing the message, or an
+// error if it is too large to be transmitted by grpc.  If msg is nil, it
+// generates an empty message.
+func encode(c baseCodec, msg interface{}) ([]byte, error) {
+	if msg == nil { // NOTE: typed nils will not be caught by this check
+		return nil, nil
+	}
+	b, err := c.Marshal(msg)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "grpc: error while marshaling: %v", err.Error())
+	}
+	if uint(len(b)) > math.MaxUint32 {
+		return nil, status.Errorf(codes.ResourceExhausted, "grpc: message too large (%d bytes)", len(b))
+	}
+	return b, nil
+}
+
+// compress returns the input bytes compressed by compressor or cp.  If both
+// compressors are nil, returns nil.
+//
+// TODO(dfawley): eliminate cp parameter by wrapping Compressor in an encoding.Compressor.
+func compress(in []byte, cp Compressor, compressor encoding.Compressor) ([]byte, error) {
+	if compressor == nil && cp == nil {
+		return nil, nil
+	}
+	wrapErr := func(err error) error {
+		return status.Errorf(codes.Internal, "grpc: error while compressing: %v", err.Error())
+	}
+	cbuf := &bytes.Buffer{}
+	if compressor != nil {
+		z, _ := compressor.Compress(cbuf)
+		if _, err := z.Write(in); err != nil {
+			return nil, wrapErr(err)
 		}
-		if outPayload != nil {
-			outPayload.Payload = msg
-			// TODO truncate large payload.
-			outPayload.Data = b
-			outPayload.Length = len(b)
+		if err := z.Close(); err != nil {
+			return nil, wrapErr(err)
 		}
-		if compressor != nil || cp != nil {
-			cbuf = new(bytes.Buffer)
-			// Has compressor, check Compressor is set by UseCompressor first.
-			if compressor != nil {
-				z, _ := compressor.Compress(cbuf)
-				if _, err := z.Write(b); err != nil {
-					return nil, nil, status.Errorf(codes.Internal, "grpc: error while compressing: %v", err.Error())
-				}
-				z.Close()
-			} else {
-				// If Compressor is not set by UseCompressor, use default Compressor
-				if err := cp.Do(cbuf, b); err != nil {
-					return nil, nil, status.Errorf(codes.Internal, "grpc: error while compressing: %v", err.Error())
-				}
-			}
-			b = cbuf.Bytes()
+	} else {
+		if err := cp.Do(cbuf, in); err != nil {
+			return nil, wrapErr(err)
 		}
 	}
-	if uint(len(b)) > math.MaxUint32 {
-		return nil, nil, status.Errorf(codes.ResourceExhausted, "grpc: message too large (%d bytes)", len(b))
-	}
+	return cbuf.Bytes(), nil
+}
+
+const (
+	payloadLen = 1
+	sizeLen    = 4
+	headerLen  = payloadLen + sizeLen
+)
 
-	bufHeader := make([]byte, payloadLen+sizeLen)
-	if compressor != nil || cp != nil {
-		bufHeader[0] = byte(compressionMade)
+// msgHeader returns a 5-byte header for the message being transmitted and the
+// payload, which is compData if non-nil or data otherwise.
+func msgHeader(data, compData []byte) (hdr []byte, payload []byte) {
+	hdr = make([]byte, headerLen)
+	if compData != nil {
+		hdr[0] = byte(compressionMade)
+		data = compData
 	} else {
-		bufHeader[0] = byte(compressionNone)
+		hdr[0] = byte(compressionNone)
 	}
 
-	// Write length of b into buf
-	binary.BigEndian.PutUint32(bufHeader[payloadLen:], uint32(len(b)))
-	if outPayload != nil {
-		outPayload.WireLength = payloadLen + sizeLen + len(b)
+	// Write length of payload into buf
+	binary.BigEndian.PutUint32(hdr[payloadLen:], uint32(len(data)))
+	return hdr, data
+}
+
+func outPayload(client bool, msg interface{}, data, payload []byte, t time.Time) *stats.OutPayload {
+	return &stats.OutPayload{
+		Client:     client,
+		Payload:    msg,
+		Data:       data,
+		Length:     len(data),
+		WireLength: len(payload) + headerLen,
+		SentTime:   t,
 	}
-	return bufHeader, b, nil
 }
 
 func checkRecvPayload(pf payloadFormat, recvCompress string, haveCompressor bool) *status.Status {
@@ -557,6 +716,40 @@ func setCallInfoCodec(c *callInfo) error {
 	return nil
 }
 
+// parseDialTarget returns the network and address to pass to dialer
+func parseDialTarget(target string) (net string, addr string) {
+	net = "tcp"
+
+	m1 := strings.Index(target, ":")
+	m2 := strings.Index(target, ":/")
+
+	// handle unix:addr which will fail with url.Parse
+	if m1 >= 0 && m2 < 0 {
+		if n := target[0:m1]; n == "unix" {
+			net = n
+			addr = target[m1+1:]
+			return net, addr
+		}
+	}
+	if m2 >= 0 {
+		t, err := url.Parse(target)
+		if err != nil {
+			return net, target
+		}
+		scheme := t.Scheme
+		addr = t.Path
+		if scheme == "unix" {
+			net = scheme
+			if addr == "" {
+				addr = t.Host
+			}
+			return net, addr
+		}
+	}
+
+	return net, target
+}
+
 // The SupportPackageIsVersion variables are referenced from generated protocol
 // buffer files to ensure compatibility with the gRPC version used.  The latest
 // support package version is 5.
@@ -571,7 +764,4 @@ const (
 	SupportPackageIsVersion5 = true
 )
 
-// Version is the current grpc version.
-const Version = "1.10.0"
-
 const grpcUA = "grpc-go/" + Version
diff --git a/vendor/google.golang.org/grpc/rpc_util_test.go b/vendor/google.golang.org/grpc/rpc_util_test.go
index 6e4f85ad..0335fc7d 100644
--- a/vendor/google.golang.org/grpc/rpc_util_test.go
+++ b/vendor/google.golang.org/grpc/rpc_util_test.go
@@ -20,6 +20,7 @@ package grpc
 
 import (
 	"bytes"
+	"compress/gzip"
 	"io"
 	"math"
 	"reflect"
@@ -29,9 +30,9 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/encoding"
 	protoenc "google.golang.org/grpc/encoding/proto"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/status"
 	perfpb "google.golang.org/grpc/test/codec_perf"
-	"google.golang.org/grpc/transport"
 )
 
 type fullReader struct {
@@ -104,22 +105,44 @@ func TestEncode(t *testing.T) {
 	for _, test := range []struct {
 		// input
 		msg proto.Message
-		cp  Compressor
 		// outputs
 		hdr  []byte
 		data []byte
 		err  error
 	}{
-		{nil, nil, []byte{0, 0, 0, 0, 0}, []byte{}, nil},
+		{nil, []byte{0, 0, 0, 0, 0}, []byte{}, nil},
 	} {
-		hdr, data, err := encode(encoding.GetCodec(protoenc.Name), test.msg, nil, nil, nil)
-		if err != test.err || !bytes.Equal(hdr, test.hdr) || !bytes.Equal(data, test.data) {
-			t.Fatalf("encode(_, _, %v, _) = %v, %v, %v\nwant %v, %v, %v", test.cp, hdr, data, err, test.hdr, test.data, test.err)
+		data, err := encode(encoding.GetCodec(protoenc.Name), test.msg)
+		if err != test.err || !bytes.Equal(data, test.data) {
+			t.Errorf("encode(_, %v) = %v, %v; want %v, %v", test.msg, data, err, test.data, test.err)
+			continue
+		}
+		if hdr, _ := msgHeader(data, nil); !bytes.Equal(hdr, test.hdr) {
+			t.Errorf("msgHeader(%v, false) = %v; want %v", data, hdr, test.hdr)
 		}
 	}
 }
 
 func TestCompress(t *testing.T) {
+	bestCompressor, err := NewGZIPCompressorWithLevel(gzip.BestCompression)
+	if err != nil {
+		t.Fatalf("Could not initialize gzip compressor with best compression.")
+	}
+	bestSpeedCompressor, err := NewGZIPCompressorWithLevel(gzip.BestSpeed)
+	if err != nil {
+		t.Fatalf("Could not initialize gzip compressor with best speed compression.")
+	}
+
+	defaultCompressor, err := NewGZIPCompressorWithLevel(gzip.BestSpeed)
+	if err != nil {
+		t.Fatalf("Could not initialize gzip compressor with default compression.")
+	}
+
+	level5, err := NewGZIPCompressorWithLevel(5)
+	if err != nil {
+		t.Fatalf("Could not initialize gzip compressor with level 5 compression.")
+	}
+
 	for _, test := range []struct {
 		// input
 		data []byte
@@ -129,6 +152,10 @@ func TestCompress(t *testing.T) {
 		err error
 	}{
 		{make([]byte, 1024), NewGZIPCompressor(), NewGZIPDecompressor(), nil},
+		{make([]byte, 1024), bestCompressor, NewGZIPDecompressor(), nil},
+		{make([]byte, 1024), bestSpeedCompressor, NewGZIPDecompressor(), nil},
+		{make([]byte, 1024), defaultCompressor, NewGZIPDecompressor(), nil},
+		{make([]byte, 1024), level5, NewGZIPDecompressor(), nil},
 	} {
 		b := new(bytes.Buffer)
 		if err := test.cp.Do(b, test.data); err != test.err {
@@ -150,8 +177,8 @@ func TestToRPCErr(t *testing.T) {
 		// outputs
 		errOut error
 	}{
-		{transport.StreamError{Code: codes.Unknown, Desc: ""}, status.Error(codes.Unknown, "")},
 		{transport.ErrConnClosing, status.Error(codes.Unavailable, transport.ErrConnClosing.Desc)},
+		{io.ErrUnexpectedEOF, status.Error(codes.Internal, io.ErrUnexpectedEOF.Error())},
 	} {
 		err := toRPCErr(test.errIn)
 		if _, ok := status.FromError(err); !ok {
@@ -163,17 +190,38 @@ func TestToRPCErr(t *testing.T) {
 	}
 }
 
+func TestParseDialTarget(t *testing.T) {
+	for _, test := range []struct {
+		target, wantNet, wantAddr string
+	}{
+		{"unix:etcd:0", "unix", "etcd:0"},
+		{"unix:///tmp/unix-3", "unix", "/tmp/unix-3"},
+		{"unix://domain", "unix", "domain"},
+		{"unix://etcd:0", "unix", "etcd:0"},
+		{"unix:///etcd:0", "unix", "/etcd:0"},
+		{"passthrough://unix://domain", "tcp", "passthrough://unix://domain"},
+		{"https://google.com:443", "tcp", "https://google.com:443"},
+		{"dns:///google.com", "tcp", "dns:///google.com"},
+		{"/unix/socket/address", "tcp", "/unix/socket/address"},
+	} {
+		gotNet, gotAddr := parseDialTarget(test.target)
+		if gotNet != test.wantNet || gotAddr != test.wantAddr {
+			t.Errorf("parseDialTarget(%q) = %s, %s want %s, %s", test.target, gotNet, gotAddr, test.wantNet, test.wantAddr)
+		}
+	}
+}
+
 // bmEncode benchmarks encoding a Protocol Buffer message containing mSize
 // bytes.
 func bmEncode(b *testing.B, mSize int) {
 	cdc := encoding.GetCodec(protoenc.Name)
 	msg := &perfpb.Buffer{Body: make([]byte, mSize)}
-	encodeHdr, encodeData, _ := encode(cdc, msg, nil, nil, nil)
-	encodedSz := int64(len(encodeHdr) + len(encodeData))
+	encodeData, _ := encode(cdc, msg)
+	encodedSz := int64(len(encodeData))
 	b.ReportAllocs()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		encode(cdc, msg, nil, nil, nil)
+		encode(cdc, msg)
 	}
 	b.SetBytes(encodedSz)
 }
diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go
index 0f7ff5d6..f5bea723 100644
--- a/vendor/google.golang.org/grpc/server.go
+++ b/vendor/google.golang.org/grpc/server.go
@@ -37,18 +37,20 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/trace"
+
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/encoding"
 	"google.golang.org/grpc/encoding/proto"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/internal"
+	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/tap"
-	"google.golang.org/grpc/transport"
 )
 
 const (
@@ -97,11 +99,19 @@ type Server struct {
 	m      map[string]*service // service name -> service info
 	events trace.EventLog
 
-	quit     chan struct{}
-	done     chan struct{}
-	quitOnce sync.Once
-	doneOnce sync.Once
-	serveWG  sync.WaitGroup // counts active Serve goroutines for GracefulStop
+	quit               chan struct{}
+	done               chan struct{}
+	quitOnce           sync.Once
+	doneOnce           sync.Once
+	channelzRemoveOnce sync.Once
+	serveWG            sync.WaitGroup // counts active Serve goroutines for GracefulStop
+
+	channelzID          int64 // channelz unique identification number
+	czmu                sync.RWMutex
+	callsStarted        int64
+	callsFailed         int64
+	callsSucceeded      int64
+	lastCallStartedTime time.Time
 }
 
 type options struct {
@@ -125,19 +135,25 @@ type options struct {
 	writeBufferSize       int
 	readBufferSize        int
 	connectionTimeout     time.Duration
+	maxHeaderListSize     *uint32
 }
 
 var defaultServerOptions = options{
 	maxReceiveMessageSize: defaultServerMaxReceiveMessageSize,
 	maxSendMessageSize:    defaultServerMaxSendMessageSize,
 	connectionTimeout:     120 * time.Second,
+	writeBufferSize:       defaultWriteBufSize,
+	readBufferSize:        defaultReadBufSize,
 }
 
 // A ServerOption sets options such as credentials, codec and keepalive parameters, etc.
 type ServerOption func(*options)
 
-// WriteBufferSize lets you set the size of write buffer, this determines how much data can be batched
-// before doing a write on the wire.
+// WriteBufferSize determines how much data can be batched before doing a write on the wire.
+// The corresponding memory allocation for this buffer will be twice the size to keep syscalls low.
+// The default value for this buffer is 32KB.
+// Zero will disable the write buffer such that each write will be on underlying connection.
+// Note: A Send call may not directly translate to a write.
 func WriteBufferSize(s int) ServerOption {
 	return func(o *options) {
 		o.writeBufferSize = s
@@ -146,6 +162,9 @@ func WriteBufferSize(s int) ServerOption {
 
 // ReadBufferSize lets you set the size of read buffer, this determines how much data can be read at most
 // for one read syscall.
+// The default value for this buffer is 32KB.
+// Zero will disable read buffer for a connection so data framer can access the underlying
+// conn directly.
 func ReadBufferSize(s int) ServerOption {
 	return func(o *options) {
 		o.readBufferSize = s
@@ -216,7 +235,9 @@ func RPCDecompressor(dc Decompressor) ServerOption {
 }
 
 // MaxMsgSize returns a ServerOption to set the max message size in bytes the server can receive.
-// If this is not set, gRPC uses the default limit. Deprecated: use MaxRecvMsgSize instead.
+// If this is not set, gRPC uses the default limit.
+//
+// Deprecated: use MaxRecvMsgSize instead.
 func MaxMsgSize(m int) ServerOption {
 	return MaxRecvMsgSize(m)
 }
@@ -323,6 +344,14 @@ func ConnectionTimeout(d time.Duration) ServerOption {
 	}
 }
 
+// MaxHeaderListSize returns a ServerOption that sets the max (uncompressed) size
+// of header list that the server is prepared to accept.
+func MaxHeaderListSize(s uint32) ServerOption {
+	return func(o *options) {
+		o.maxHeaderListSize = &s
+	}
+}
+
 // NewServer creates a gRPC server which has no service registered and has not
 // started to accept requests yet.
 func NewServer(opt ...ServerOption) *Server {
@@ -343,6 +372,10 @@ func NewServer(opt ...ServerOption) *Server {
 		_, file, line, _ := runtime.Caller(1)
 		s.events = trace.NewEventLog("grpc.Server", fmt.Sprintf("%s:%d", file, line))
 	}
+
+	if channelz.IsOn() {
+		s.channelzID = channelz.RegisterServer(s, "")
+	}
 	return s
 }
 
@@ -458,6 +491,26 @@ func (s *Server) useTransportAuthenticator(rawConn net.Conn) (net.Conn, credenti
 	return s.opts.creds.ServerHandshake(rawConn)
 }
 
+type listenSocket struct {
+	net.Listener
+	channelzID int64
+}
+
+func (l *listenSocket) ChannelzMetric() *channelz.SocketInternalMetric {
+	return &channelz.SocketInternalMetric{
+		SocketOptions: channelz.GetSocketOption(l.Listener),
+		LocalAddr:     l.Listener.Addr(),
+	}
+}
+
+func (l *listenSocket) Close() error {
+	err := l.Listener.Close()
+	if channelz.IsOn() {
+		channelz.RemoveEntry(l.channelzID)
+	}
+	return err
+}
+
 // Serve accepts incoming connections on the listener lis, creating a new
 // ServerTransport and service goroutine for each. The service goroutines
 // read gRPC requests and then call the registered handlers to reply to them.
@@ -486,13 +539,19 @@ func (s *Server) Serve(lis net.Listener) error {
 		}
 	}()
 
-	s.lis[lis] = true
+	ls := &listenSocket{Listener: lis}
+	s.lis[ls] = true
+
+	if channelz.IsOn() {
+		ls.channelzID = channelz.RegisterListenSocket(ls, s.channelzID, "")
+	}
 	s.mu.Unlock()
+
 	defer func() {
 		s.mu.Lock()
-		if s.lis != nil && s.lis[lis] {
-			lis.Close()
-			delete(s.lis, lis)
+		if s.lis != nil && s.lis[ls] {
+			ls.Close()
+			delete(s.lis, ls)
 		}
 		s.mu.Unlock()
 	}()
@@ -614,6 +673,8 @@ func (s *Server) newHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) tr
 		InitialConnWindowSize: s.opts.initialConnWindowSize,
 		WriteBufferSize:       s.opts.writeBufferSize,
 		ReadBufferSize:        s.opts.readBufferSize,
+		ChannelzParentID:      s.channelzID,
+		MaxHeaderListSize:     s.opts.maxHeaderListSize,
 	}
 	st, err := transport.NewServerTransport("http2", c, config)
 	if err != nil {
@@ -624,6 +685,7 @@ func (s *Server) newHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) tr
 		grpclog.Warningln("grpc: Server.Serve failed to create ServerTransport: ", err)
 		return nil
 	}
+
 	return st
 }
 
@@ -751,39 +813,83 @@ func (s *Server) removeConn(c io.Closer) {
 	}
 }
 
-func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Stream, msg interface{}, cp Compressor, opts *transport.Options, comp encoding.Compressor) error {
-	var (
-		outPayload *stats.OutPayload
-	)
-	if s.opts.statsHandler != nil {
-		outPayload = &stats.OutPayload{}
+// ChannelzMetric returns ServerInternalMetric of current server.
+// This is an EXPERIMENTAL API.
+func (s *Server) ChannelzMetric() *channelz.ServerInternalMetric {
+	s.czmu.RLock()
+	defer s.czmu.RUnlock()
+	return &channelz.ServerInternalMetric{
+		CallsStarted:             s.callsStarted,
+		CallsSucceeded:           s.callsSucceeded,
+		CallsFailed:              s.callsFailed,
+		LastCallStartedTimestamp: s.lastCallStartedTime,
 	}
-	hdr, data, err := encode(s.getCodec(stream.ContentSubtype()), msg, cp, outPayload, comp)
+}
+
+func (s *Server) incrCallsStarted() {
+	s.czmu.Lock()
+	s.callsStarted++
+	s.lastCallStartedTime = time.Now()
+	s.czmu.Unlock()
+}
+
+func (s *Server) incrCallsSucceeded() {
+	s.czmu.Lock()
+	s.callsSucceeded++
+	s.czmu.Unlock()
+}
+
+func (s *Server) incrCallsFailed() {
+	s.czmu.Lock()
+	s.callsFailed++
+	s.czmu.Unlock()
+}
+
+func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Stream, msg interface{}, cp Compressor, opts *transport.Options, comp encoding.Compressor) error {
+	data, err := encode(s.getCodec(stream.ContentSubtype()), msg)
 	if err != nil {
 		grpclog.Errorln("grpc: server failed to encode response: ", err)
 		return err
 	}
-	if len(data) > s.opts.maxSendMessageSize {
-		return status.Errorf(codes.ResourceExhausted, "grpc: trying to send message larger than max (%d vs. %d)", len(data), s.opts.maxSendMessageSize)
+	compData, err := compress(data, cp, comp)
+	if err != nil {
+		grpclog.Errorln("grpc: server failed to compress response: ", err)
+		return err
+	}
+	hdr, payload := msgHeader(data, compData)
+	// TODO(dfawley): should we be checking len(data) instead?
+	if len(payload) > s.opts.maxSendMessageSize {
+		return status.Errorf(codes.ResourceExhausted, "grpc: trying to send message larger than max (%d vs. %d)", len(payload), s.opts.maxSendMessageSize)
 	}
-	err = t.Write(stream, hdr, data, opts)
-	if err == nil && outPayload != nil {
-		outPayload.SentTime = time.Now()
-		s.opts.statsHandler.HandleRPC(stream.Context(), outPayload)
+	err = t.Write(stream, hdr, payload, opts)
+	if err == nil && s.opts.statsHandler != nil {
+		s.opts.statsHandler.HandleRPC(stream.Context(), outPayload(false, msg, data, payload, time.Now()))
 	}
 	return err
 }
 
 func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, md *MethodDesc, trInfo *traceInfo) (err error) {
+	if channelz.IsOn() {
+		s.incrCallsStarted()
+		defer func() {
+			if err != nil && err != io.EOF {
+				s.incrCallsFailed()
+			} else {
+				s.incrCallsSucceeded()
+			}
+		}()
+	}
 	sh := s.opts.statsHandler
 	if sh != nil {
+		beginTime := time.Now()
 		begin := &stats.Begin{
-			BeginTime: time.Now(),
+			BeginTime: beginTime,
 		}
 		sh.HandleRPC(stream.Context(), begin)
 		defer func() {
 			end := &stats.End{
-				EndTime: time.Now(),
+				BeginTime: beginTime,
+				EndTime:   time.Now(),
 			}
 			if err != nil && err != io.EOF {
 				end.Error = toRPCErr(err)
@@ -857,16 +963,15 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			switch st := err.(type) {
 			case transport.ConnectionError:
 				// Nothing to do here.
-			case transport.StreamError:
-				if e := t.WriteStatus(stream, status.New(st.Code, st.Desc)); e != nil {
-					grpclog.Warningf("grpc: Server.processUnaryRPC failed to write status %v", e)
-				}
 			default:
 				panic(fmt.Sprintf("grpc: Unexpected error (%T) from recvMsg: %v", st, st))
 			}
 		}
 		return err
 	}
+	if channelz.IsOn() {
+		t.IncrMsgRecv()
+	}
 	if st := checkRecvPayload(pf, stream.RecvCompress(), dc != nil || decomp != nil); st != nil {
 		if e := t.WriteStatus(stream, st); e != nil {
 			grpclog.Warningf("grpc: Server.processUnaryRPC failed to write status %v", e)
@@ -917,12 +1022,13 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 		}
 		return nil
 	}
-	reply, appErr := md.Handler(srv.server, stream.Context(), df, s.opts.unaryInt)
+	ctx := NewContextWithServerTransportStream(stream.Context(), stream)
+	reply, appErr := md.Handler(srv.server, ctx, df, s.opts.unaryInt)
 	if appErr != nil {
 		appStatus, ok := status.FromError(appErr)
 		if !ok {
 			// Convert appErr if it is not a grpc status error.
-			appErr = status.Error(convertCode(appErr), appErr.Error())
+			appErr = status.Error(codes.Unknown, appErr.Error())
 			appStatus, _ = status.FromError(appErr)
 		}
 		if trInfo != nil {
@@ -937,10 +1043,7 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 	if trInfo != nil {
 		trInfo.tr.LazyLog(stringer("OK"), false)
 	}
-	opts := &transport.Options{
-		Last:  true,
-		Delay: false,
-	}
+	opts := &transport.Options{Last: true}
 
 	if err := s.sendResponse(t, stream, reply, cp, opts, comp); err != nil {
 		if err == io.EOF {
@@ -955,16 +1058,15 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			switch st := err.(type) {
 			case transport.ConnectionError:
 				// Nothing to do here.
-			case transport.StreamError:
-				if e := t.WriteStatus(stream, status.New(st.Code, st.Desc)); e != nil {
-					grpclog.Warningf("grpc: Server.processUnaryRPC failed to write status %v", e)
-				}
 			default:
 				panic(fmt.Sprintf("grpc: Unexpected error (%T) from sendResponse: %v", st, st))
 			}
 		}
 		return err
 	}
+	if channelz.IsOn() {
+		t.IncrMsgSent()
+	}
 	if trInfo != nil {
 		trInfo.tr.LazyLog(&payload{sent: true, msg: reply}, true)
 	}
@@ -975,15 +1077,27 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 }
 
 func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, sd *StreamDesc, trInfo *traceInfo) (err error) {
+	if channelz.IsOn() {
+		s.incrCallsStarted()
+		defer func() {
+			if err != nil && err != io.EOF {
+				s.incrCallsFailed()
+			} else {
+				s.incrCallsSucceeded()
+			}
+		}()
+	}
 	sh := s.opts.statsHandler
 	if sh != nil {
+		beginTime := time.Now()
 		begin := &stats.Begin{
-			BeginTime: time.Now(),
+			BeginTime: beginTime,
 		}
 		sh.HandleRPC(stream.Context(), begin)
 		defer func() {
 			end := &stats.End{
-				EndTime: time.Now(),
+				BeginTime: beginTime,
+				EndTime:   time.Now(),
 			}
 			if err != nil && err != io.EOF {
 				end.Error = toRPCErr(err)
@@ -991,7 +1105,9 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
 			sh.HandleRPC(stream.Context(), end)
 		}()
 	}
+	ctx := NewContextWithServerTransportStream(stream.Context(), stream)
 	ss := &serverStream{
+		ctx:   ctx,
 		t:     t,
 		s:     stream,
 		p:     &parser{r: stream},
@@ -1061,12 +1177,7 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
 	if appErr != nil {
 		appStatus, ok := status.FromError(appErr)
 		if !ok {
-			switch err := appErr.(type) {
-			case transport.StreamError:
-				appStatus = status.New(err.Code, err.Desc)
-			default:
-				appStatus = status.New(convertCode(appErr), appErr.Error())
-			}
+			appStatus = status.New(codes.Unknown, appErr.Error())
 			appErr = appStatus.Err()
 		}
 		if trInfo != nil {
@@ -1085,7 +1196,6 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
 		ss.mu.Unlock()
 	}
 	return t.WriteStatus(ss.s, status.New(codes.OK, ""))
-
 }
 
 func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Stream, trInfo *traceInfo) {
@@ -1167,6 +1277,42 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str
 	}
 }
 
+// The key to save ServerTransportStream in the context.
+type streamKey struct{}
+
+// NewContextWithServerTransportStream creates a new context from ctx and
+// attaches stream to it.
+//
+// This API is EXPERIMENTAL.
+func NewContextWithServerTransportStream(ctx context.Context, stream ServerTransportStream) context.Context {
+	return context.WithValue(ctx, streamKey{}, stream)
+}
+
+// ServerTransportStream is a minimal interface that a transport stream must
+// implement. This can be used to mock an actual transport stream for tests of
+// handler code that use, for example, grpc.SetHeader (which requires some
+// stream to be in context).
+//
+// See also NewContextWithServerTransportStream.
+//
+// This API is EXPERIMENTAL.
+type ServerTransportStream interface {
+	Method() string
+	SetHeader(md metadata.MD) error
+	SendHeader(md metadata.MD) error
+	SetTrailer(md metadata.MD) error
+}
+
+// ServerTransportStreamFromContext returns the ServerTransportStream saved in
+// ctx. Returns nil if the given context has no stream associated with it
+// (which implies it is not an RPC invocation context).
+//
+// This API is EXPERIMENTAL.
+func ServerTransportStreamFromContext(ctx context.Context) ServerTransportStream {
+	s, _ := ctx.Value(streamKey{}).(ServerTransportStream)
+	return s
+}
+
 // Stop stops the gRPC server. It immediately closes all open
 // connections and listeners.
 // It cancels all active RPCs on the server side and the corresponding
@@ -1184,6 +1330,12 @@ func (s *Server) Stop() {
 		})
 	}()
 
+	s.channelzRemoveOnce.Do(func() {
+		if channelz.IsOn() {
+			channelz.RemoveEntry(s.channelzID)
+		}
+	})
+
 	s.mu.Lock()
 	listeners := s.lis
 	s.lis = nil
@@ -1222,11 +1374,17 @@ func (s *Server) GracefulStop() {
 		})
 	}()
 
+	s.channelzRemoveOnce.Do(func() {
+		if channelz.IsOn() {
+			channelz.RemoveEntry(s.channelzID)
+		}
+	})
 	s.mu.Lock()
 	if s.conns == nil {
 		s.mu.Unlock()
 		return
 	}
+
 	for lis := range s.lis {
 		lis.Close()
 	}
@@ -1287,8 +1445,8 @@ func SetHeader(ctx context.Context, md metadata.MD) error {
 	if md.Len() == 0 {
 		return nil
 	}
-	stream, ok := transport.StreamFromContext(ctx)
-	if !ok {
+	stream := ServerTransportStreamFromContext(ctx)
+	if stream == nil {
 		return status.Errorf(codes.Internal, "grpc: failed to fetch the stream from the context %v", ctx)
 	}
 	return stream.SetHeader(md)
@@ -1297,15 +1455,11 @@ func SetHeader(ctx context.Context, md metadata.MD) error {
 // SendHeader sends header metadata. It may be called at most once.
 // The provided md and headers set by SetHeader() will be sent.
 func SendHeader(ctx context.Context, md metadata.MD) error {
-	stream, ok := transport.StreamFromContext(ctx)
-	if !ok {
+	stream := ServerTransportStreamFromContext(ctx)
+	if stream == nil {
 		return status.Errorf(codes.Internal, "grpc: failed to fetch the stream from the context %v", ctx)
 	}
-	t := stream.ServerTransport()
-	if t == nil {
-		grpclog.Fatalf("grpc: SendHeader: %v has no ServerTransport to send header metadata.", stream)
-	}
-	if err := t.WriteHeader(stream, md); err != nil {
+	if err := stream.SendHeader(md); err != nil {
 		return toRPCErr(err)
 	}
 	return nil
@@ -1317,9 +1471,19 @@ func SetTrailer(ctx context.Context, md metadata.MD) error {
 	if md.Len() == 0 {
 		return nil
 	}
-	stream, ok := transport.StreamFromContext(ctx)
-	if !ok {
+	stream := ServerTransportStreamFromContext(ctx)
+	if stream == nil {
 		return status.Errorf(codes.Internal, "grpc: failed to fetch the stream from the context %v", ctx)
 	}
 	return stream.SetTrailer(md)
 }
+
+// Method returns the method string for the server context.  The returned
+// string is in the format of "/service/method".
+func Method(ctx context.Context) (string, bool) {
+	s := ServerTransportStreamFromContext(ctx)
+	if s == nil {
+		return "", false
+	}
+	return s.Method(), true
+}
diff --git a/vendor/google.golang.org/grpc/server_test.go b/vendor/google.golang.org/grpc/server_test.go
index 4a7a5244..11ce8673 100644
--- a/vendor/google.golang.org/grpc/server_test.go
+++ b/vendor/google.golang.org/grpc/server_test.go
@@ -25,7 +25,9 @@ import (
 	"testing"
 	"time"
 
-	"google.golang.org/grpc/test/leakcheck"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/internal/leakcheck"
+	"google.golang.org/grpc/internal/transport"
 )
 
 type emptyServiceServer interface{}
@@ -122,3 +124,13 @@ func TestGetServiceInfo(t *testing.T) {
 		t.Errorf("GetServiceInfo() = %+v, want %+v", info, want)
 	}
 }
+
+func TestStreamContext(t *testing.T) {
+	expectedStream := &transport.Stream{}
+	ctx := NewContextWithServerTransportStream(context.Background(), expectedStream)
+	s := ServerTransportStreamFromContext(ctx)
+	stream, ok := s.(*transport.Stream)
+	if !ok || expectedStream != stream {
+		t.Fatalf("GetStreamFromContext(%v) = %v, %t, want: %v, true", ctx, stream, ok, expectedStream)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/service_config.go b/vendor/google.golang.org/grpc/service_config.go
index 53fa88f3..e0d73526 100644
--- a/vendor/google.golang.org/grpc/service_config.go
+++ b/vendor/google.golang.org/grpc/service_config.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 	"time"
 
+	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
 )
 
@@ -32,7 +33,8 @@ const maxInt = int(^uint(0) >> 1)
 
 // MethodConfig defines the configuration recommended by the service providers for a
 // particular method.
-// DEPRECATED: Users should not use this struct. Service config should be received
+//
+// Deprecated: Users should not use this struct. Service config should be received
 // through name resolver, as specified here
 // https://github.com/grpc/grpc/blob/master/doc/service_config.md
 type MethodConfig struct {
@@ -55,22 +57,98 @@ type MethodConfig struct {
 	// MaxRespSize is the maximum allowed payload size for an individual response in a
 	// stream (server->client) in bytes.
 	MaxRespSize *int
+	// RetryPolicy configures retry options for the method.
+	retryPolicy *retryPolicy
 }
 
 // ServiceConfig is provided by the service provider and contains parameters for how
 // clients that connect to the service should behave.
-// DEPRECATED: Users should not use this struct. Service config should be received
+//
+// Deprecated: Users should not use this struct. Service config should be received
 // through name resolver, as specified here
 // https://github.com/grpc/grpc/blob/master/doc/service_config.md
 type ServiceConfig struct {
 	// LB is the load balancer the service providers recommends. The balancer specified
 	// via grpc.WithBalancer will override this.
 	LB *string
-	// Methods contains a map for the methods in this service.
-	// If there is an exact match for a method (i.e. /service/method) in the map, use the corresponding MethodConfig.
-	// If there's no exact match, look for the default config for the service (/service/) and use the corresponding MethodConfig if it exists.
-	// Otherwise, the method has no MethodConfig to use.
+
+	// Methods contains a map for the methods in this service.  If there is an
+	// exact match for a method (i.e. /service/method) in the map, use the
+	// corresponding MethodConfig.  If there's no exact match, look for the
+	// default config for the service (/service/) and use the corresponding
+	// MethodConfig if it exists.  Otherwise, the method has no MethodConfig to
+	// use.
 	Methods map[string]MethodConfig
+
+	// If a retryThrottlingPolicy is provided, gRPC will automatically throttle
+	// retry attempts and hedged RPCs when the client’s ratio of failures to
+	// successes exceeds a threshold.
+	//
+	// For each server name, the gRPC client will maintain a token_count which is
+	// initially set to maxTokens, and can take values between 0 and maxTokens.
+	//
+	// Every outgoing RPC (regardless of service or method invoked) will change
+	// token_count as follows:
+	//
+	//   - Every failed RPC will decrement the token_count by 1.
+	//   - Every successful RPC will increment the token_count by tokenRatio.
+	//
+	// If token_count is less than or equal to maxTokens / 2, then RPCs will not
+	// be retried and hedged RPCs will not be sent.
+	retryThrottling *retryThrottlingPolicy
+}
+
+// retryPolicy defines the go-native version of the retry policy defined by the
+// service config here:
+// https://github.com/grpc/proposal/blob/master/A6-client-retries.md#integration-with-service-config
+type retryPolicy struct {
+	// MaxAttempts is the maximum number of attempts, including the original RPC.
+	//
+	// This field is required and must be two or greater.
+	maxAttempts int
+
+	// Exponential backoff parameters. The initial retry attempt will occur at
+	// random(0, initialBackoffMS). In general, the nth attempt will occur at
+	// random(0,
+	//   min(initialBackoffMS*backoffMultiplier**(n-1), maxBackoffMS)).
+	//
+	// These fields are required and must be greater than zero.
+	initialBackoff    time.Duration
+	maxBackoff        time.Duration
+	backoffMultiplier float64
+
+	// The set of status codes which may be retried.
+	//
+	// Status codes are specified as strings, e.g., "UNAVAILABLE".
+	//
+	// This field is required and must be non-empty.
+	// Note: a set is used to store this for easy lookup.
+	retryableStatusCodes map[codes.Code]bool
+}
+
+type jsonRetryPolicy struct {
+	MaxAttempts          int
+	InitialBackoff       string
+	MaxBackoff           string
+	BackoffMultiplier    float64
+	RetryableStatusCodes []codes.Code
+}
+
+// retryThrottlingPolicy defines the go-native version of the retry throttling
+// policy defined by the service config here:
+// https://github.com/grpc/proposal/blob/master/A6-client-retries.md#integration-with-service-config
+type retryThrottlingPolicy struct {
+	// The number of tokens starts at maxTokens. The token_count will always be
+	// between 0 and maxTokens.
+	//
+	// This field is required and must be greater than zero.
+	MaxTokens float64
+	// The amount of tokens to add on each successful RPC. Typically this will
+	// be some number between 0 and 1, e.g., 0.1.
+	//
+	// This field is required and must be greater than zero. Up to 3 decimal
+	// places are supported.
+	TokenRatio float64
 }
 
 func parseDuration(s *string) (*time.Duration, error) {
@@ -140,12 +218,14 @@ type jsonMC struct {
 	Timeout                 *string
 	MaxRequestMessageBytes  *int64
 	MaxResponseMessageBytes *int64
+	RetryPolicy             *jsonRetryPolicy
 }
 
 // TODO(lyuxuan): delete this struct after cleaning up old service config implementation.
 type jsonSC struct {
 	LoadBalancingPolicy *string
 	MethodConfig        *[]jsonMC
+	RetryThrottling     *retryThrottlingPolicy
 }
 
 func parseServiceConfig(js string) (ServiceConfig, error) {
@@ -156,8 +236,9 @@ func parseServiceConfig(js string) (ServiceConfig, error) {
 		return ServiceConfig{}, err
 	}
 	sc := ServiceConfig{
-		LB:      rsc.LoadBalancingPolicy,
-		Methods: make(map[string]MethodConfig),
+		LB:              rsc.LoadBalancingPolicy,
+		Methods:         make(map[string]MethodConfig),
+		retryThrottling: rsc.RetryThrottling,
 	}
 	if rsc.MethodConfig == nil {
 		return sc, nil
@@ -177,6 +258,10 @@ func parseServiceConfig(js string) (ServiceConfig, error) {
 			WaitForReady: m.WaitForReady,
 			Timeout:      d,
 		}
+		if mc.retryPolicy, err = convertRetryPolicy(m.RetryPolicy); err != nil {
+			grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err)
+			return ServiceConfig{}, err
+		}
 		if m.MaxRequestMessageBytes != nil {
 			if *m.MaxRequestMessageBytes > int64(maxInt) {
 				mc.MaxReqSize = newInt(maxInt)
@@ -198,9 +283,56 @@ func parseServiceConfig(js string) (ServiceConfig, error) {
 		}
 	}
 
+	if sc.retryThrottling != nil {
+		if sc.retryThrottling.MaxTokens <= 0 ||
+			sc.retryThrottling.MaxTokens >= 1000 ||
+			sc.retryThrottling.TokenRatio <= 0 {
+			// Illegal throttling config; disable throttling.
+			sc.retryThrottling = nil
+		}
+	}
 	return sc, nil
 }
 
+func convertRetryPolicy(jrp *jsonRetryPolicy) (p *retryPolicy, err error) {
+	if jrp == nil {
+		return nil, nil
+	}
+	ib, err := parseDuration(&jrp.InitialBackoff)
+	if err != nil {
+		return nil, err
+	}
+	mb, err := parseDuration(&jrp.MaxBackoff)
+	if err != nil {
+		return nil, err
+	}
+
+	if jrp.MaxAttempts <= 1 ||
+		*ib <= 0 ||
+		*mb <= 0 ||
+		jrp.BackoffMultiplier <= 0 ||
+		len(jrp.RetryableStatusCodes) == 0 {
+		grpclog.Warningf("grpc: ignoring retry policy %v due to illegal configuration", jrp)
+		return nil, nil
+	}
+
+	rp := &retryPolicy{
+		maxAttempts:          jrp.MaxAttempts,
+		initialBackoff:       *ib,
+		maxBackoff:           *mb,
+		backoffMultiplier:    jrp.BackoffMultiplier,
+		retryableStatusCodes: make(map[codes.Code]bool),
+	}
+	if rp.maxAttempts > 5 {
+		// TODO(retry): Make the max maxAttempts configurable.
+		rp.maxAttempts = 5
+	}
+	for _, code := range jrp.RetryableStatusCodes {
+		rp.retryableStatusCodes[code] = true
+	}
+	return rp, nil
+}
+
 func min(a, b *int) *int {
 	if *a < *b {
 		return a
diff --git a/vendor/google.golang.org/grpc/stats/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/stats/grpc_testing/test.pb.go
index c0c14a24..9db10f81 100644
--- a/vendor/google.golang.org/grpc/stats/grpc_testing/test.pb.go
+++ b/vendor/google.golang.org/grpc/stats/grpc_testing/test.pb.go
@@ -1,16 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: grpc_testing/test.proto
 
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	grpc_testing/test.proto
-
-It has these top-level messages:
-	SimpleRequest
-	SimpleResponse
-*/
 package grpc_testing
 
 import proto "github.com/golang/protobuf/proto"
@@ -34,13 +24,35 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type SimpleRequest struct {
-	Id int32 `protobuf:"varint,2,opt,name=id" json:"id,omitempty"`
+	Id                   int32    `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
+func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
+func (*SimpleRequest) ProtoMessage()    {}
+func (*SimpleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_dd7ffeaa75513a0a, []int{0}
+}
+func (m *SimpleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleRequest.Unmarshal(m, b)
+}
+func (m *SimpleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleRequest.Marshal(b, m, deterministic)
+}
+func (dst *SimpleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleRequest.Merge(dst, src)
+}
+func (m *SimpleRequest) XXX_Size() int {
+	return xxx_messageInfo_SimpleRequest.Size(m)
+}
+func (m *SimpleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleRequest.DiscardUnknown(m)
 }
 
-func (m *SimpleRequest) Reset()                    { *m = SimpleRequest{} }
-func (m *SimpleRequest) String() string            { return proto.CompactTextString(m) }
-func (*SimpleRequest) ProtoMessage()               {}
-func (*SimpleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_SimpleRequest proto.InternalMessageInfo
 
 func (m *SimpleRequest) GetId() int32 {
 	if m != nil {
@@ -50,13 +62,35 @@ func (m *SimpleRequest) GetId() int32 {
 }
 
 type SimpleResponse struct {
-	Id int32 `protobuf:"varint,3,opt,name=id" json:"id,omitempty"`
+	Id                   int32    `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SimpleResponse) Reset()                    { *m = SimpleResponse{} }
-func (m *SimpleResponse) String() string            { return proto.CompactTextString(m) }
-func (*SimpleResponse) ProtoMessage()               {}
-func (*SimpleResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
+func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
+func (*SimpleResponse) ProtoMessage()    {}
+func (*SimpleResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_dd7ffeaa75513a0a, []int{1}
+}
+func (m *SimpleResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleResponse.Unmarshal(m, b)
+}
+func (m *SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleResponse.Marshal(b, m, deterministic)
+}
+func (dst *SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleResponse.Merge(dst, src)
+}
+func (m *SimpleResponse) XXX_Size() int {
+	return xxx_messageInfo_SimpleResponse.Size(m)
+}
+func (m *SimpleResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SimpleResponse proto.InternalMessageInfo
 
 func (m *SimpleResponse) GetId() int32 {
 	if m != nil {
@@ -78,8 +112,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for TestService service
-
+// TestServiceClient is the client API for TestService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type TestServiceClient interface {
 	// One request followed by one response.
 	// The server returns the client id as-is.
@@ -104,7 +139,7 @@ func NewTestServiceClient(cc *grpc.ClientConn) TestServiceClient {
 
 func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
 	out := new(SimpleResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -112,7 +147,7 @@ func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, op
 }
 
 func (c *testServiceClient) FullDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_FullDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[0], c.cc, "/grpc.testing.TestService/FullDuplexCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[0], "/grpc.testing.TestService/FullDuplexCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -143,7 +178,7 @@ func (x *testServiceFullDuplexCallClient) Recv() (*SimpleResponse, error) {
 }
 
 func (c *testServiceClient) ClientStreamCall(ctx context.Context, opts ...grpc.CallOption) (TestService_ClientStreamCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[1], c.cc, "/grpc.testing.TestService/ClientStreamCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[1], "/grpc.testing.TestService/ClientStreamCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -177,7 +212,7 @@ func (x *testServiceClientStreamCallClient) CloseAndRecv() (*SimpleResponse, err
 }
 
 func (c *testServiceClient) ServerStreamCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (TestService_ServerStreamCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[2], c.cc, "/grpc.testing.TestService/ServerStreamCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[2], "/grpc.testing.TestService/ServerStreamCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -208,8 +243,7 @@ func (x *testServiceServerStreamCallClient) Recv() (*SimpleResponse, error) {
 	return m, nil
 }
 
-// Server API for TestService service
-
+// TestServiceServer is the server API for TestService service.
 type TestServiceServer interface {
 	// One request followed by one response.
 	// The server returns the client id as-is.
@@ -349,9 +383,9 @@ var _TestService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "grpc_testing/test.proto",
 }
 
-func init() { proto.RegisterFile("grpc_testing/test.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("grpc_testing/test.proto", fileDescriptor_test_dd7ffeaa75513a0a) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_test_dd7ffeaa75513a0a = []byte{
 	// 202 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0x2f, 0x2a, 0x48,
 	0x8e, 0x2f, 0x49, 0x2d, 0x2e, 0xc9, 0xcc, 0x4b, 0xd7, 0x07, 0xd1, 0x7a, 0x05, 0x45, 0xf9, 0x25,
diff --git a/vendor/google.golang.org/grpc/stats/stats.go b/vendor/google.golang.org/grpc/stats/stats.go
index d5aa2f79..3f13190a 100644
--- a/vendor/google.golang.org/grpc/stats/stats.go
+++ b/vendor/google.golang.org/grpc/stats/stats.go
@@ -169,6 +169,8 @@ func (s *OutTrailer) isRPCStats() {}
 type End struct {
 	// Client is true if this End is from client side.
 	Client bool
+	// BeginTime is the time when the RPC began.
+	BeginTime time.Time
 	// EndTime is the time when the RPC ends.
 	EndTime time.Time
 	// Error is the error the RPC ended with. It is an error generated from
diff --git a/vendor/google.golang.org/grpc/stats/stats_test.go b/vendor/google.golang.org/grpc/stats/stats_test.go
index b6c7b998..00a5e4f3 100644
--- a/vendor/google.golang.org/grpc/stats/stats_test.go
+++ b/vendor/google.golang.org/grpc/stats/stats_test.go
@@ -638,6 +638,9 @@ func checkEnd(t *testing.T, d *gotData, e *expectedData) {
 	if d.ctx == nil {
 		t.Fatalf("d.ctx = nil, want <non-nil>")
 	}
+	if st.BeginTime.IsZero() {
+		t.Fatalf("st.BeginTime = %v, want <non-zero>", st.BeginTime)
+	}
 	if st.EndTime.IsZero() {
 		t.Fatalf("st.EndTime = %v, want <non-zero>", st.EndTime)
 	}
diff --git a/vendor/google.golang.org/grpc/status/go16.go b/vendor/google.golang.org/grpc/status/go16.go
new file mode 100644
index 00000000..e59b53e8
--- /dev/null
+++ b/vendor/google.golang.org/grpc/status/go16.go
@@ -0,0 +1,42 @@
+// +build go1.6,!go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package status
+
+import (
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/codes"
+)
+
+// FromContextError converts a context error into a Status.  It returns a
+// Status with codes.OK if err is nil, or a Status with codes.Unknown if err is
+// non-nil and not a context error.
+func FromContextError(err error) *Status {
+	switch err {
+	case nil:
+		return New(codes.OK, "")
+	case context.DeadlineExceeded:
+		return New(codes.DeadlineExceeded, err.Error())
+	case context.Canceled:
+		return New(codes.Canceled, err.Error())
+	default:
+		return New(codes.Unknown, err.Error())
+	}
+}
diff --git a/vendor/google.golang.org/grpc/status/go17.go b/vendor/google.golang.org/grpc/status/go17.go
new file mode 100644
index 00000000..09021514
--- /dev/null
+++ b/vendor/google.golang.org/grpc/status/go17.go
@@ -0,0 +1,44 @@
+// +build go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package status
+
+import (
+	"context"
+
+	netctx "golang.org/x/net/context"
+	"google.golang.org/grpc/codes"
+)
+
+// FromContextError converts a context error into a Status.  It returns a
+// Status with codes.OK if err is nil, or a Status with codes.Unknown if err is
+// non-nil and not a context error.
+func FromContextError(err error) *Status {
+	switch err {
+	case nil:
+		return New(codes.OK, "")
+	case context.DeadlineExceeded, netctx.DeadlineExceeded:
+		return New(codes.DeadlineExceeded, err.Error())
+	case context.Canceled, netctx.Canceled:
+		return New(codes.Canceled, err.Error())
+	default:
+		return New(codes.Unknown, err.Error())
+	}
+}
diff --git a/vendor/google.golang.org/grpc/status/go17_test.go b/vendor/google.golang.org/grpc/status/go17_test.go
new file mode 100644
index 00000000..2dc5add9
--- /dev/null
+++ b/vendor/google.golang.org/grpc/status/go17_test.go
@@ -0,0 +1,44 @@
+// +build go1.7
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package status
+
+import (
+	"context"
+	"testing"
+
+	"google.golang.org/grpc/codes"
+)
+
+func TestFromStdContextError(t *testing.T) {
+	testCases := []struct {
+		in   error
+		want *Status
+	}{
+		{in: context.DeadlineExceeded, want: New(codes.DeadlineExceeded, context.DeadlineExceeded.Error())},
+		{in: context.Canceled, want: New(codes.Canceled, context.Canceled.Error())},
+	}
+	for _, tc := range testCases {
+		got := FromContextError(tc.in)
+		if got.Code() != tc.want.Code() || got.Message() != tc.want.Message() {
+			t.Errorf("FromContextError(%v) = %v; want %v", tc.in, got, tc.want)
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/status/status.go b/vendor/google.golang.org/grpc/status/status.go
index 3a42dc6d..9c61b094 100644
--- a/vendor/google.golang.org/grpc/status/status.go
+++ b/vendor/google.golang.org/grpc/status/status.go
@@ -46,7 +46,7 @@ func (se *statusError) Error() string {
 	return fmt.Sprintf("rpc error: code = %s desc = %s", codes.Code(p.GetCode()), p.GetMessage())
 }
 
-func (se *statusError) status() *Status {
+func (se *statusError) GRPCStatus() *Status {
 	return &Status{s: (*spb.Status)(se)}
 }
 
@@ -120,14 +120,14 @@ func FromProto(s *spb.Status) *Status {
 }
 
 // FromError returns a Status representing err if it was produced from this
-// package. Otherwise, ok is false and a Status is returned with codes.Unknown
-// and the original error message.
+// package or has a method `GRPCStatus() *Status`. Otherwise, ok is false and a
+// Status is returned with codes.Unknown and the original error message.
 func FromError(err error) (s *Status, ok bool) {
 	if err == nil {
 		return &Status{s: &spb.Status{Code: int32(codes.OK)}}, true
 	}
-	if se, ok := err.(*statusError); ok {
-		return se.status(), true
+	if se, ok := err.(interface{ GRPCStatus() *Status }); ok {
+		return se.GRPCStatus(), true
 	}
 	return New(codes.Unknown, err.Error()), false
 }
@@ -182,8 +182,8 @@ func Code(err error) codes.Code {
 	if err == nil {
 		return codes.OK
 	}
-	if se, ok := err.(*statusError); ok {
-		return se.status().Code()
+	if se, ok := err.(interface{ GRPCStatus() *Status }); ok {
+		return se.GRPCStatus().Code()
 	}
 	return codes.Unknown
 }
diff --git a/vendor/google.golang.org/grpc/status/status_test.go b/vendor/google.golang.org/grpc/status/status_test.go
index 8b74c27d..1eb13209 100644
--- a/vendor/google.golang.org/grpc/status/status_test.go
+++ b/vendor/google.golang.org/grpc/status/status_test.go
@@ -28,6 +28,7 @@ import (
 	"github.com/golang/protobuf/ptypes"
 	apb "github.com/golang/protobuf/ptypes/any"
 	dpb "github.com/golang/protobuf/ptypes/duration"
+	"golang.org/x/net/context"
 	cpb "google.golang.org/genproto/googleapis/rpc/code"
 	epb "google.golang.org/genproto/googleapis/rpc/errdetails"
 	spb "google.golang.org/genproto/googleapis/rpc/status"
@@ -119,6 +120,47 @@ func TestFromErrorOK(t *testing.T) {
 	}
 }
 
+type customError struct {
+	Code    codes.Code
+	Message string
+	Details []*apb.Any
+}
+
+func (c customError) Error() string {
+	return fmt.Sprintf("rpc error: code = %s desc = %s", c.Code, c.Message)
+}
+
+func (c customError) GRPCStatus() *Status {
+	return &Status{
+		s: &spb.Status{
+			Code:    int32(c.Code),
+			Message: c.Message,
+			Details: c.Details,
+		},
+	}
+}
+
+func TestFromErrorImplementsInterface(t *testing.T) {
+	code, message := codes.Internal, "test description"
+	details := []*apb.Any{{
+		TypeUrl: "testUrl",
+		Value:   []byte("testValue"),
+	}}
+	err := customError{
+		Code:    code,
+		Message: message,
+		Details: details,
+	}
+	s, ok := FromError(err)
+	if !ok || s.Code() != code || s.Message() != message || s.Err() == nil {
+		t.Fatalf("FromError(%v) = %v, %v; want <Code()=%s, Message()=%q, Err()!=nil>, true", err, s, ok, code, message)
+	}
+	pd := s.Proto().GetDetails()
+	if len(pd) != 1 || !reflect.DeepEqual(pd[0], details[0]) {
+		t.Fatalf("s.Proto.GetDetails() = %v; want <Details()=%s>", pd, details)
+	}
+}
+
 func TestFromErrorUnknownError(t *testing.T) {
 	code, message := codes.Unknown, "unknown error"
 	err := errors.New("unknown error")
@@ -286,3 +328,21 @@ func mustMarshalAny(msg proto.Message) *apb.Any {
 	}
 	return any
 }
+
+func TestFromContextError(t *testing.T) {
+	testCases := []struct {
+		in   error
+		want *Status
+	}{
+		{in: nil, want: New(codes.OK, "")},
+		{in: context.DeadlineExceeded, want: New(codes.DeadlineExceeded, context.DeadlineExceeded.Error())},
+		{in: context.Canceled, want: New(codes.Canceled, context.Canceled.Error())},
+		{in: errors.New("other"), want: New(codes.Unknown, "other")},
+	}
+	for _, tc := range testCases {
+		got := FromContextError(tc.in)
+		if got.Code() != tc.want.Code() || got.Message() != tc.want.Message() {
+			t.Errorf("FromContextError(%v) = %v; want %v", tc.in, got, tc.want)
+		}
+	}
+}
diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go
index deb73592..65d45a1d 100644
--- a/vendor/google.golang.org/grpc/stream.go
+++ b/vendor/google.golang.org/grpc/stream.go
@@ -21,6 +21,8 @@ package grpc
 import (
 	"errors"
 	"io"
+	"math"
+	"strconv"
 	"sync"
 	"time"
 
@@ -29,14 +31,20 @@ import (
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/encoding"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/grpc/internal/grpcrand"
+	"google.golang.org/grpc/internal/transport"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/transport"
 )
 
 // StreamHandler defines the handler called by gRPC server to complete the
-// execution of a streaming RPC.
+// execution of a streaming RPC. If a StreamHandler returns an error, it
+// should be produced by the status package, or else gRPC will use
+// codes.Unknown as the status code and err.Error() as the status message
+// of the RPC.
 type StreamHandler func(srv interface{}, stream ServerStream) error
 
 // StreamDesc represents a streaming RPC service's method specification.
@@ -51,31 +59,20 @@ type StreamDesc struct {
 
 // Stream defines the common interface a client or server stream has to satisfy.
 //
-// All errors returned from Stream are compatible with the status package.
+// Deprecated: See ClientStream and ServerStream documentation instead.
 type Stream interface {
-	// Context returns the context for this stream.
+	// Deprecated: See ClientStream and ServerStream documentation instead.
 	Context() context.Context
-	// SendMsg blocks until it sends m, the stream is done or the stream
-	// breaks.
-	// On error, it aborts the stream and returns an RPC status on client
-	// side. On server side, it simply returns the error to the caller.
-	// SendMsg is called by generated code. Also Users can call SendMsg
-	// directly when it is really needed in their use cases.
-	// It's safe to have a goroutine calling SendMsg and another goroutine calling
-	// recvMsg on the same stream at the same time.
-	// But it is not safe to call SendMsg on the same stream in different goroutines.
+	// Deprecated: See ClientStream and ServerStream documentation instead.
 	SendMsg(m interface{}) error
-	// RecvMsg blocks until it receives a message or the stream is
-	// done. On client side, it returns io.EOF when the stream is done. On
-	// any other error, it aborts the stream and returns an RPC status. On
-	// server side, it simply returns the error to the caller.
-	// It's safe to have a goroutine calling SendMsg and another goroutine calling
-	// recvMsg on the same stream at the same time.
-	// But it is not safe to call RecvMsg on the same stream in different goroutines.
+	// Deprecated: See ClientStream and ServerStream documentation instead.
 	RecvMsg(m interface{}) error
 }
 
-// ClientStream defines the interface a client stream has to satisfy.
+// ClientStream defines the client-side behavior of a streaming RPC.
+//
+// All errors returned from ClientStream methods are compatible with the
+// status package.
 type ClientStream interface {
 	// Header returns the header metadata received from the server if there
 	// is any. It blocks if the metadata is not ready to read.
@@ -87,33 +84,81 @@ type ClientStream interface {
 	// CloseSend closes the send direction of the stream. It closes the stream
 	// when non-nil error is met.
 	CloseSend() error
-	// Stream.SendMsg() may return a non-nil error when something wrong happens sending
-	// the request. The returned error indicates the status of this sending, not the final
-	// status of the RPC.
+	// Context returns the context for this stream.
+	//
+	// It should not be called until after Header or RecvMsg has returned. Once
+	// called, subsequent client-side retries are disabled.
+	Context() context.Context
+	// SendMsg is generally called by generated code. On error, SendMsg aborts
+	// the stream. If the error was generated by the client, the status is
+	// returned directly; otherwise, io.EOF is returned and the status of
+	// the stream may be discovered using RecvMsg.
+	//
+	// SendMsg blocks until:
+	//   - There is sufficient flow control to schedule m with the transport, or
+	//   - The stream is done, or
+	//   - The stream breaks.
+	//
+	// SendMsg does not wait until the message is received by the server. An
+	// untimely stream closure may result in lost messages. To ensure delivery,
+	// users should ensure the RPC completed successfully using RecvMsg.
+	//
+	// It is safe to have a goroutine calling SendMsg and another goroutine
+	// calling RecvMsg on the same stream at the same time, but it is not safe
+	// to call SendMsg on the same stream in different goroutines.
+	SendMsg(m interface{}) error
+	// RecvMsg blocks until it receives a message into m or the stream is
+	// done. It returns io.EOF when the stream completes successfully. On
+	// any other error, the stream is aborted and the error contains the RPC
+	// status.
 	//
-	// Always call Stream.RecvMsg() to drain the stream and get the final
-	// status, otherwise there could be leaked resources.
-	Stream
+	// It is safe to have a goroutine calling SendMsg and another goroutine
+	// calling RecvMsg on the same stream at the same time, but it is not
+	// safe to call RecvMsg on the same stream in different goroutines.
+	RecvMsg(m interface{}) error
 }
 
 // NewStream creates a new Stream for the client side. This is typically
-// called by generated code.
+// called by generated code. ctx is used for the lifetime of the stream.
+//
+// To ensure resources are not leaked due to the stream returned, one of the following
+// actions must be performed:
+//
+//      1. Call Close on the ClientConn.
+//      2. Cancel the context provided.
+//      3. Call RecvMsg until a non-nil error is returned. A protobuf-generated
+//         client-streaming RPC, for instance, might use the helper function
+//         CloseAndRecv (note that CloseSend does not Recv, therefore is not
+//         guaranteed to release all resources).
+//      4. Receive a non-nil, non-io.EOF error from Header or SendMsg.
+//
+// If none of the above happen, a goroutine and a context will be leaked, and grpc
+// will not call the optionally-configured stats handler with a stats.End message.
 func (cc *ClientConn) NewStream(ctx context.Context, desc *StreamDesc, method string, opts ...CallOption) (ClientStream, error) {
+	// allow interceptor to see all applicable call options, which means those
+	// configured as defaults from dial option as well as per-call options
+	opts = combine(cc.dopts.callOptions, opts)
+
 	if cc.dopts.streamInt != nil {
 		return cc.dopts.streamInt(ctx, desc, cc, method, newClientStream, opts...)
 	}
 	return newClientStream(ctx, desc, cc, method, opts...)
 }
 
-// NewClientStream creates a new Stream for the client side. This is typically
-// called by generated code.
-//
-// DEPRECATED: Use ClientConn.NewStream instead.
+// NewClientStream is a wrapper for ClientConn.NewStream.
 func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) {
 	return cc.NewStream(ctx, desc, method, opts...)
 }
 
 func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (_ ClientStream, err error) {
+	if channelz.IsOn() {
+		cc.incrCallsStarted()
+		defer func() {
+			if err != nil {
+				cc.incrCallsFailed()
+			}
+		}()
+	}
 	c := defaultCallInfo()
 	mc := cc.GetMethodConfig(method)
 	if mc.WaitForReady != nil {
@@ -137,7 +182,6 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 		}
 	}()
 
-	opts = append(cc.dopts.callOptions, opts...)
 	for _, o := range opts {
 		if err := o.before(c); err != nil {
 			return nil, toRPCErr(err)
@@ -150,13 +194,8 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 	}
 
 	callHdr := &transport.CallHdr{
-		Host:   cc.authority,
-		Method: method,
-		// If it's not client streaming, we should already have the request to be sent,
-		// so we don't flush the header.
-		// If it's client streaming, the user may never send a request or send it any
-		// time soon, so we ask the transport to flush the header.
-		Flush:          desc.ClientStreams,
+		Host:           cc.authority,
+		Method:         method,
 		ContentSubtype: c.contentSubtype,
 	}
 
@@ -190,97 +229,54 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 		}
 		trInfo.tr.LazyLog(&trInfo.firstLine, false)
 		ctx = trace.NewContext(ctx, trInfo.tr)
-		defer func() {
-			if err != nil {
-				// Need to call tr.finish() if error is returned.
-				// Because tr will not be returned to caller.
-				trInfo.tr.LazyPrintf("RPC: [%v]", err)
-				trInfo.tr.SetError()
-				trInfo.tr.Finish()
-			}
-		}()
 	}
 	ctx = newContextWithRPCInfo(ctx, c.failFast)
 	sh := cc.dopts.copts.StatsHandler
+	var beginTime time.Time
 	if sh != nil {
 		ctx = sh.TagRPC(ctx, &stats.RPCTagInfo{FullMethodName: method, FailFast: c.failFast})
+		beginTime = time.Now()
 		begin := &stats.Begin{
 			Client:    true,
-			BeginTime: time.Now(),
+			BeginTime: beginTime,
 			FailFast:  c.failFast,
 		}
 		sh.HandleRPC(ctx, begin)
-		defer func() {
-			if err != nil {
-				// Only handle end stats if err != nil.
-				end := &stats.End{
-					Client: true,
-					Error:  err,
-				}
-				sh.HandleRPC(ctx, end)
-			}
-		}()
 	}
 
-	var (
-		t    transport.ClientTransport
-		s    *transport.Stream
-		done func(balancer.DoneInfo)
-	)
-	for {
-		// Check to make sure the context has expired.  This will prevent us from
-		// looping forever if an error occurs for wait-for-ready RPCs where no data
-		// is sent on the wire.
-		select {
-		case <-ctx.Done():
-			return nil, toRPCErr(ctx.Err())
-		default:
-		}
-
-		t, done, err = cc.getTransport(ctx, c.failFast)
-		if err != nil {
-			return nil, err
-		}
-
-		s, err = t.NewStream(ctx, callHdr)
-		if err != nil {
-			if done != nil {
-				done(balancer.DoneInfo{Err: err})
-				done = nil
-			}
-			// In the event of any error from NewStream, we never attempted to write
-			// anything to the wire, so we can retry indefinitely for non-fail-fast
-			// RPCs.
-			if !c.failFast {
-				continue
-			}
-			return nil, toRPCErr(err)
-		}
-		break
+	cs := &clientStream{
+		callHdr:      callHdr,
+		ctx:          ctx,
+		methodConfig: &mc,
+		opts:         opts,
+		callInfo:     c,
+		cc:           cc,
+		desc:         desc,
+		codec:        c.codec,
+		cp:           cp,
+		comp:         comp,
+		cancel:       cancel,
+		beginTime:    beginTime,
+		firstAttempt: true,
+	}
+	if !cc.dopts.disableRetry {
+		cs.retryThrottler = cc.retryThrottler.Load().(*retryThrottler)
+	}
+
+	cs.callInfo.stream = cs
+	// Only this initial attempt has stats/tracing.
+	// TODO(dfawley): move to newAttempt when per-attempt stats are implemented.
+	if err := cs.newAttemptLocked(sh, trInfo); err != nil {
+		cs.finish(err)
+		return nil, err
 	}
 
-	c.stream = s
-	cs := &clientStream{
-		opts:   opts,
-		c:      c,
-		desc:   desc,
-		codec:  c.codec,
-		cp:     cp,
-		dc:     cc.dopts.dc,
-		comp:   comp,
-		cancel: cancel,
-
-		done: done,
-		t:    t,
-		s:    s,
-		p:    &parser{r: s},
-
-		tracing: EnableTracing,
-		trInfo:  trInfo,
-
-		statsCtx:     ctx,
-		statsHandler: cc.dopts.copts.StatsHandler,
+	op := func(a *csAttempt) error { return a.newStream() }
+	if err := cs.withRetry(op, func() { cs.bufferForRetryLocked(0, op) }); err != nil {
+		cs.finish(err)
+		return nil, err
 	}
+
 	if desc != unaryStreamDesc {
 		// Listen on cc and stream contexts to cleanup when the user closes the
 		// ClientConn or cancels the stream context.  In all other cases, an error
@@ -292,167 +288,492 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 			case <-cc.ctx.Done():
 				cs.finish(ErrClientConnClosing)
 			case <-ctx.Done():
-				cs.finish(toRPCErr(s.Context().Err()))
+				cs.finish(toRPCErr(ctx.Err()))
 			}
 		}()
 	}
 	return cs, nil
 }
 
+func (cs *clientStream) newAttemptLocked(sh stats.Handler, trInfo traceInfo) error {
+	cs.attempt = &csAttempt{
+		cs:           cs,
+		dc:           cs.cc.dopts.dc,
+		statsHandler: sh,
+		trInfo:       trInfo,
+	}
+
+	if err := cs.ctx.Err(); err != nil {
+		return toRPCErr(err)
+	}
+	t, done, err := cs.cc.getTransport(cs.ctx, cs.callInfo.failFast, cs.callHdr.Method)
+	if err != nil {
+		return err
+	}
+	cs.attempt.t = t
+	cs.attempt.done = done
+	return nil
+}
+
+func (a *csAttempt) newStream() error {
+	cs := a.cs
+	cs.callHdr.PreviousAttempts = cs.numRetries
+	s, err := a.t.NewStream(cs.ctx, cs.callHdr)
+	if err != nil {
+		return toRPCErr(err)
+	}
+	cs.attempt.s = s
+	cs.attempt.p = &parser{r: s}
+	return nil
+}
+
 // clientStream implements a client side Stream.
 type clientStream struct {
-	opts []CallOption
-	c    *callInfo
+	callHdr  *transport.CallHdr
+	opts     []CallOption
+	callInfo *callInfo
+	cc       *ClientConn
+	desc     *StreamDesc
+
+	codec baseCodec
+	cp    Compressor
+	comp  encoding.Compressor
+
+	cancel context.CancelFunc // cancels all attempts
+
+	sentLast  bool // sent an end stream
+	beginTime time.Time
+
+	methodConfig *MethodConfig
+
+	ctx context.Context // the application's context, wrapped by stats/tracing
+
+	retryThrottler *retryThrottler // The throttler active when the RPC began.
+
+	mu                      sync.Mutex
+	firstAttempt            bool       // if true, transparent retry is valid
+	numRetries              int        // exclusive of transparent retry attempt(s)
+	numRetriesSincePushback int        // retries since pushback; to reset backoff
+	finished                bool       // TODO: replace with atomic cmpxchg or sync.Once?
+	attempt                 *csAttempt // the active client stream attempt
+	// TODO(hedging): hedging will have multiple attempts simultaneously.
+	committed  bool                       // active attempt committed for retry?
+	buffer     []func(a *csAttempt) error // operations to replay on retry
+	bufferSize int                        // current size of buffer
+}
+
+// csAttempt implements a single transport stream attempt within a
+// clientStream.
+type csAttempt struct {
+	cs   *clientStream
 	t    transport.ClientTransport
 	s    *transport.Stream
 	p    *parser
-	desc *StreamDesc
+	done func(balancer.DoneInfo)
 
-	codec     baseCodec
-	cp        Compressor
+	finished  bool
 	dc        Decompressor
-	comp      encoding.Compressor
 	decomp    encoding.Compressor
 	decompSet bool
 
-	// cancel is only called when RecvMsg() returns non-nil error, which means
-	// the stream finishes with error or with io.EOF.
-	cancel context.CancelFunc
-
-	tracing bool // set to EnableTracing when the clientStream is created.
-
-	mu       sync.Mutex
-	done     func(balancer.DoneInfo)
-	sentLast bool // sent an end stream
-	finished bool
-	// trInfo.tr is set when the clientStream is created (if EnableTracing is true),
-	// and is set to nil when the clientStream's finish method is called.
+	mu sync.Mutex // guards trInfo.tr
+	// trInfo.tr is set when created (if EnableTracing is true),
+	// and cleared when the finish method is called.
 	trInfo traceInfo
 
-	// statsCtx keeps the user context for stats handling.
-	// All stats collection should use the statsCtx (instead of the stream context)
-	// so that all the generated stats for a particular RPC can be associated in the processing phase.
-	statsCtx     context.Context
 	statsHandler stats.Handler
 }
 
+func (cs *clientStream) commitAttemptLocked() {
+	cs.committed = true
+	cs.buffer = nil
+}
+
+func (cs *clientStream) commitAttempt() {
+	cs.mu.Lock()
+	cs.commitAttemptLocked()
+	cs.mu.Unlock()
+}
+
+// shouldRetry returns nil if the RPC should be retried; otherwise it returns
+// the error that should be returned by the operation.
+func (cs *clientStream) shouldRetry(err error) error {
+	if cs.attempt.s == nil && !cs.callInfo.failFast {
+		// In the event of any error from NewStream (attempt.s == nil), we
+		// never attempted to write anything to the wire, so we can retry
+		// indefinitely for non-fail-fast RPCs.
+		return nil
+	}
+	if cs.finished || cs.committed {
+		// RPC is finished or committed; cannot retry.
+		return err
+	}
+	// Wait for the trailers.
+	if cs.attempt.s != nil {
+		<-cs.attempt.s.Done()
+	}
+	if cs.firstAttempt && !cs.callInfo.failFast && (cs.attempt.s == nil || cs.attempt.s.Unprocessed()) {
+		// First attempt, wait-for-ready, stream unprocessed: transparently retry.
+		cs.firstAttempt = false
+		return nil
+	}
+	cs.firstAttempt = false
+	if cs.cc.dopts.disableRetry {
+		return err
+	}
+
+	pushback := 0
+	hasPushback := false
+	if cs.attempt.s != nil {
+		if to, toErr := cs.attempt.s.TrailersOnly(); toErr != nil {
+			// Context error; stop now.
+			return toErr
+		} else if !to {
+			return err
+		}
+
+		// TODO(retry): Move down if the spec changes to not check server pushback
+		// before considering this a failure for throttling.
+		sps := cs.attempt.s.Trailer()["grpc-retry-pushback-ms"]
+		if len(sps) == 1 {
+			var e error
+			if pushback, e = strconv.Atoi(sps[0]); e != nil || pushback < 0 {
+				grpclog.Infof("Server retry pushback specified to abort (%q).", sps[0])
+				cs.retryThrottler.throttle() // This counts as a failure for throttling.
+				return err
+			}
+			hasPushback = true
+		} else if len(sps) > 1 {
+			grpclog.Warningf("Server retry pushback specified multiple values (%q); not retrying.", sps)
+			cs.retryThrottler.throttle() // This counts as a failure for throttling.
+			return err
+		}
+	}
+
+	var code codes.Code
+	if cs.attempt.s != nil {
+		code = cs.attempt.s.Status().Code()
+	} else {
+		code = status.Convert(err).Code()
+	}
+
+	rp := cs.methodConfig.retryPolicy
+	if rp == nil || !rp.retryableStatusCodes[code] {
+		return err
+	}
+
+	// Note: the ordering here is important; we count this as a failure
+	// only if the code matched a retryable code.
+	if cs.retryThrottler.throttle() {
+		return err
+	}
+	if cs.numRetries+1 >= rp.maxAttempts {
+		return err
+	}
+
+	var dur time.Duration
+	if hasPushback {
+		dur = time.Millisecond * time.Duration(pushback)
+		cs.numRetriesSincePushback = 0
+	} else {
+		fact := math.Pow(rp.backoffMultiplier, float64(cs.numRetriesSincePushback))
+		cur := float64(rp.initialBackoff) * fact
+		if max := float64(rp.maxBackoff); cur > max {
+			cur = max
+		}
+		dur = time.Duration(grpcrand.Int63n(int64(cur)))
+		cs.numRetriesSincePushback++
+	}
+
+	// TODO(dfawley): we could eagerly fail here if dur puts us past the
+	// deadline, but unsure if it is worth doing.
+	t := time.NewTimer(dur)
+	select {
+	case <-t.C:
+		cs.numRetries++
+		return nil
+	case <-cs.ctx.Done():
+		t.Stop()
+		return status.FromContextError(cs.ctx.Err()).Err()
+	}
+}
+
+// Returns nil if a retry was performed and succeeded; error otherwise.
+func (cs *clientStream) retryLocked(lastErr error) error {
+	for {
+		cs.attempt.finish(lastErr)
+		if err := cs.shouldRetry(lastErr); err != nil {
+			cs.commitAttemptLocked()
+			return err
+		}
+		if err := cs.newAttemptLocked(nil, traceInfo{}); err != nil {
+			return err
+		}
+		if lastErr = cs.replayBufferLocked(); lastErr == nil {
+			return nil
+		}
+	}
+}
+
 func (cs *clientStream) Context() context.Context {
-	return cs.s.Context()
+	cs.commitAttempt()
+	// No need to lock before using attempt, since we know it is committed and
+	// cannot change.
+	return cs.attempt.s.Context()
+}
+
+func (cs *clientStream) withRetry(op func(a *csAttempt) error, onSuccess func()) error {
+	cs.mu.Lock()
+	for {
+		if cs.committed {
+			cs.mu.Unlock()
+			return op(cs.attempt)
+		}
+		a := cs.attempt
+		cs.mu.Unlock()
+		err := op(a)
+		cs.mu.Lock()
+		if a != cs.attempt {
+			// We started another attempt already.
+			continue
+		}
+		if err == io.EOF {
+			<-a.s.Done()
+		}
+		if err == nil || (err == io.EOF && a.s.Status().Code() == codes.OK) {
+			onSuccess()
+			cs.mu.Unlock()
+			return err
+		}
+		if err := cs.retryLocked(err); err != nil {
+			cs.mu.Unlock()
+			return err
+		}
+	}
 }
 
 func (cs *clientStream) Header() (metadata.MD, error) {
-	m, err := cs.s.Header()
+	var m metadata.MD
+	err := cs.withRetry(func(a *csAttempt) error {
+		var err error
+		m, err = a.s.Header()
+		return toRPCErr(err)
+	}, cs.commitAttemptLocked)
 	if err != nil {
-		err = toRPCErr(err)
 		cs.finish(err)
 	}
 	return m, err
 }
 
 func (cs *clientStream) Trailer() metadata.MD {
-	return cs.s.Trailer()
+	// On RPC failure, we never need to retry, because usage requires that
+	// RecvMsg() returned a non-nil error before calling this function is valid.
+	// We would have retried earlier if necessary.
+	//
+	// Commit the attempt anyway, just in case users are not following those
+	// directions -- it will prevent races and should not meaningfully impact
+	// performance.
+	cs.commitAttempt()
+	if cs.attempt.s == nil {
+		return nil
+	}
+	return cs.attempt.s.Trailer()
 }
 
-func (cs *clientStream) SendMsg(m interface{}) (err error) {
-	// TODO: Check cs.sentLast and error if we already ended the stream.
-	if cs.tracing {
-		cs.mu.Lock()
-		if cs.trInfo.tr != nil {
-			cs.trInfo.tr.LazyLog(&payload{sent: true, msg: m}, true)
+func (cs *clientStream) replayBufferLocked() error {
+	a := cs.attempt
+	for _, f := range cs.buffer {
+		if err := f(a); err != nil {
+			return err
 		}
-		cs.mu.Unlock()
 	}
-	// TODO Investigate how to signal the stats handling party.
-	// generate error stats if err != nil && err != io.EOF?
+	return nil
+}
+
+func (cs *clientStream) bufferForRetryLocked(sz int, op func(a *csAttempt) error) {
+	// Note: we still will buffer if retry is disabled (for transparent retries).
+	if cs.committed {
+		return
+	}
+	cs.bufferSize += sz
+	if cs.bufferSize > cs.callInfo.maxRetryRPCBufferSize {
+		cs.commitAttemptLocked()
+		return
+	}
+	cs.buffer = append(cs.buffer, op)
+}
+
+func (cs *clientStream) SendMsg(m interface{}) (err error) {
 	defer func() {
-		// For non-client-streaming RPCs, we return nil instead of EOF on success
-		// because the generated code requires it.  finish is not called; RecvMsg()
-		// will call it with the stream's status independently.
-		if err == io.EOF && !cs.desc.ClientStreams {
-			err = nil
-		}
 		if err != nil && err != io.EOF {
-			// Call finish for errors generated by this SendMsg call.  (Transport
-			// errors are converted to an io.EOF error below; the real error will be
-			// returned from RecvMsg eventually in that case.)
+			// Call finish on the client stream for errors generated by this SendMsg
+			// call, as these indicate problems created by this client.  (Transport
+			// errors are converted to an io.EOF error in csAttempt.sendMsg; the real
+			// error will be returned from RecvMsg eventually in that case, or be
+			// retried.)
 			cs.finish(err)
 		}
 	}()
-	var outPayload *stats.OutPayload
-	if cs.statsHandler != nil {
-		outPayload = &stats.OutPayload{
-			Client: true,
-		}
+	if cs.sentLast {
+		return status.Errorf(codes.Internal, "SendMsg called after CloseSend")
+	}
+	if !cs.desc.ClientStreams {
+		cs.sentLast = true
+	}
+	data, err := encode(cs.codec, m)
+	if err != nil {
+		return err
 	}
-	hdr, data, err := encode(cs.codec, m, cs.cp, outPayload, cs.comp)
+	compData, err := compress(data, cs.cp, cs.comp)
 	if err != nil {
 		return err
 	}
-	if len(data) > *cs.c.maxSendMessageSize {
-		return status.Errorf(codes.ResourceExhausted, "trying to send message larger than max (%d vs. %d)", len(data), *cs.c.maxSendMessageSize)
+	hdr, payload := msgHeader(data, compData)
+	// TODO(dfawley): should we be checking len(data) instead?
+	if len(payload) > *cs.callInfo.maxSendMessageSize {
+		return status.Errorf(codes.ResourceExhausted, "trying to send message larger than max (%d vs. %d)", len(payload), *cs.callInfo.maxSendMessageSize)
 	}
-	if !cs.desc.ClientStreams {
-		cs.sentLast = true
+	op := func(a *csAttempt) error {
+		err := a.sendMsg(m, hdr, payload, data)
+		// nil out the message and uncomp when replaying; they are only needed for
+		// stats which is disabled for subsequent attempts.
+		m, data = nil, nil
+		return err
+	}
+	return cs.withRetry(op, func() { cs.bufferForRetryLocked(len(hdr)+len(payload), op) })
+}
+
+func (cs *clientStream) RecvMsg(m interface{}) error {
+	err := cs.withRetry(func(a *csAttempt) error {
+		return a.recvMsg(m)
+	}, cs.commitAttemptLocked)
+	if err != nil || !cs.desc.ServerStreams {
+		// err != nil or non-server-streaming indicates end of stream.
+		cs.finish(err)
+	}
+	return err
+}
+
+func (cs *clientStream) CloseSend() error {
+	if cs.sentLast {
+		// TODO: return an error and finish the stream instead, due to API misuse?
+		return nil
+	}
+	cs.sentLast = true
+	op := func(a *csAttempt) error { return a.t.Write(a.s, nil, nil, &transport.Options{Last: true}) }
+	cs.withRetry(op, func() { cs.bufferForRetryLocked(0, op) })
+	// We never returned an error here for reasons.
+	return nil
+}
+
+func (cs *clientStream) finish(err error) {
+	if err == io.EOF {
+		// Ending a stream with EOF indicates a success.
+		err = nil
+	}
+	cs.mu.Lock()
+	if cs.finished {
+		cs.mu.Unlock()
+		return
 	}
-	err = cs.t.Write(cs.s, hdr, data, &transport.Options{Last: !cs.desc.ClientStreams})
+	cs.finished = true
+	cs.commitAttemptLocked()
+	cs.mu.Unlock()
 	if err == nil {
-		if outPayload != nil {
-			outPayload.SentTime = time.Now()
-			cs.statsHandler.HandleRPC(cs.statsCtx, outPayload)
+		cs.retryThrottler.successfulRPC()
+	}
+	if channelz.IsOn() {
+		if err != nil {
+			cs.cc.incrCallsFailed()
+		} else {
+			cs.cc.incrCallsSucceeded()
+		}
+	}
+	if cs.attempt != nil {
+		cs.attempt.finish(err)
+	}
+	// after functions all rely upon having a stream.
+	if cs.attempt.s != nil {
+		for _, o := range cs.opts {
+			o.after(cs.callInfo)
 		}
-		return nil
 	}
-	return io.EOF
+	cs.cancel()
 }
 
-func (cs *clientStream) RecvMsg(m interface{}) (err error) {
-	defer func() {
-		if err != nil || !cs.desc.ServerStreams {
-			// err != nil or non-server-streaming indicates end of stream.
-			cs.finish(err)
+func (a *csAttempt) sendMsg(m interface{}, hdr, payld, data []byte) error {
+	cs := a.cs
+	if EnableTracing {
+		a.mu.Lock()
+		if a.trInfo.tr != nil {
+			a.trInfo.tr.LazyLog(&payload{sent: true, msg: m}, true)
 		}
-	}()
+		a.mu.Unlock()
+	}
+	if err := a.t.Write(a.s, hdr, payld, &transport.Options{Last: !cs.desc.ClientStreams}); err != nil {
+		if !cs.desc.ClientStreams {
+			// For non-client-streaming RPCs, we return nil instead of EOF on error
+			// because the generated code requires it.  finish is not called; RecvMsg()
+			// will call it with the stream's status independently.
+			return nil
+		}
+		return io.EOF
+	}
+	if a.statsHandler != nil {
+		a.statsHandler.HandleRPC(cs.ctx, outPayload(true, m, data, payld, time.Now()))
+	}
+	if channelz.IsOn() {
+		a.t.IncrMsgSent()
+	}
+	return nil
+}
+
+func (a *csAttempt) recvMsg(m interface{}) (err error) {
+	cs := a.cs
 	var inPayload *stats.InPayload
-	if cs.statsHandler != nil {
+	if a.statsHandler != nil {
 		inPayload = &stats.InPayload{
 			Client: true,
 		}
 	}
-	if !cs.decompSet {
+	if !a.decompSet {
 		// Block until we receive headers containing received message encoding.
-		if ct := cs.s.RecvCompress(); ct != "" && ct != encoding.Identity {
-			if cs.dc == nil || cs.dc.Type() != ct {
+		if ct := a.s.RecvCompress(); ct != "" && ct != encoding.Identity {
+			if a.dc == nil || a.dc.Type() != ct {
 				// No configured decompressor, or it does not match the incoming
 				// message encoding; attempt to find a registered compressor that does.
-				cs.dc = nil
-				cs.decomp = encoding.GetCompressor(ct)
+				a.dc = nil
+				a.decomp = encoding.GetCompressor(ct)
 			}
 		} else {
 			// No compression is used; disable our decompressor.
-			cs.dc = nil
+			a.dc = nil
 		}
 		// Only initialize this state once per stream.
-		cs.decompSet = true
+		a.decompSet = true
 	}
-	err = recv(cs.p, cs.codec, cs.s, cs.dc, m, *cs.c.maxReceiveMessageSize, inPayload, cs.decomp)
+	err = recv(a.p, cs.codec, a.s, a.dc, m, *cs.callInfo.maxReceiveMessageSize, inPayload, a.decomp)
 	if err != nil {
 		if err == io.EOF {
-			if statusErr := cs.s.Status().Err(); statusErr != nil {
+			if statusErr := a.s.Status().Err(); statusErr != nil {
 				return statusErr
 			}
 			return io.EOF // indicates successful end of stream.
 		}
 		return toRPCErr(err)
 	}
-	if cs.tracing {
-		cs.mu.Lock()
-		if cs.trInfo.tr != nil {
-			cs.trInfo.tr.LazyLog(&payload{sent: false, msg: m}, true)
+	if EnableTracing {
+		a.mu.Lock()
+		if a.trInfo.tr != nil {
+			a.trInfo.tr.LazyLog(&payload{sent: false, msg: m}, true)
 		}
-		cs.mu.Unlock()
+		a.mu.Unlock()
 	}
 	if inPayload != nil {
-		cs.statsHandler.HandleRPC(cs.statsCtx, inPayload)
+		a.statsHandler.HandleRPC(cs.ctx, inPayload)
+	}
+	if channelz.IsOn() {
+		a.t.IncrMsgRecv()
 	}
 	if cs.desc.ServerStreams {
 		// Subsequent messages should be received by subsequent RecvMsg calls.
@@ -461,77 +782,68 @@ func (cs *clientStream) RecvMsg(m interface{}) (err error) {
 
 	// Special handling for non-server-stream rpcs.
 	// This recv expects EOF or errors, so we don't collect inPayload.
-	err = recv(cs.p, cs.codec, cs.s, cs.dc, m, *cs.c.maxReceiveMessageSize, nil, cs.decomp)
+	err = recv(a.p, cs.codec, a.s, a.dc, m, *cs.callInfo.maxReceiveMessageSize, nil, a.decomp)
 	if err == nil {
 		return toRPCErr(errors.New("grpc: client streaming protocol violation: get <nil>, want <EOF>"))
 	}
 	if err == io.EOF {
-		return cs.s.Status().Err() // non-server streaming Recv returns nil on success
+		return a.s.Status().Err() // non-server streaming Recv returns nil on success
 	}
 	return toRPCErr(err)
 }
 
-func (cs *clientStream) CloseSend() error {
-	if cs.sentLast {
-		return nil
+func (a *csAttempt) finish(err error) {
+	a.mu.Lock()
+	if a.finished {
+		a.mu.Unlock()
+		return
 	}
-	cs.sentLast = true
-	cs.t.Write(cs.s, nil, nil, &transport.Options{Last: true})
-	// We ignore errors from Write and always return nil here.  Any error it
-	// would return would also be returned by a subsequent RecvMsg call, and the
-	// user is supposed to always finish the stream by calling RecvMsg until it
-	// returns err != nil.
-	return nil
-}
-
-func (cs *clientStream) finish(err error) {
+	a.finished = true
 	if err == io.EOF {
 		// Ending a stream with EOF indicates a success.
 		err = nil
 	}
-	cs.mu.Lock()
-	defer cs.mu.Unlock()
-	if cs.finished {
-		return
-	}
-	cs.finished = true
-	cs.t.CloseStream(cs.s, err)
-	for _, o := range cs.opts {
-		o.after(cs.c)
+	if a.s != nil {
+		a.t.CloseStream(a.s, err)
 	}
-	if cs.done != nil {
-		cs.done(balancer.DoneInfo{
+
+	if a.done != nil {
+		br := false
+		if a.s != nil {
+			br = a.s.BytesReceived()
+		}
+		a.done(balancer.DoneInfo{
 			Err:           err,
-			BytesSent:     true,
-			BytesReceived: cs.s.BytesReceived(),
+			BytesSent:     a.s != nil,
+			BytesReceived: br,
 		})
-		cs.done = nil
 	}
-	if cs.statsHandler != nil {
+	if a.statsHandler != nil {
 		end := &stats.End{
-			Client:  true,
-			EndTime: time.Now(),
-			Error:   err,
+			Client:    true,
+			BeginTime: a.cs.beginTime,
+			EndTime:   time.Now(),
+			Error:     err,
 		}
-		cs.statsHandler.HandleRPC(cs.statsCtx, end)
-	}
-	cs.cancel()
-	if !cs.tracing {
-		return
+		a.statsHandler.HandleRPC(a.cs.ctx, end)
 	}
-	if cs.trInfo.tr != nil {
+	if a.trInfo.tr != nil {
 		if err == nil {
-			cs.trInfo.tr.LazyPrintf("RPC: [OK]")
+			a.trInfo.tr.LazyPrintf("RPC: [OK]")
 		} else {
-			cs.trInfo.tr.LazyPrintf("RPC: [%v]", err)
-			cs.trInfo.tr.SetError()
+			a.trInfo.tr.LazyPrintf("RPC: [%v]", err)
+			a.trInfo.tr.SetError()
 		}
-		cs.trInfo.tr.Finish()
-		cs.trInfo.tr = nil
+		a.trInfo.tr.Finish()
+		a.trInfo.tr = nil
 	}
+	a.mu.Unlock()
 }
 
-// ServerStream defines the interface a server stream has to satisfy.
+// ServerStream defines the server-side behavior of a streaming RPC.
+//
+// All errors returned from ServerStream methods are compatible with the
+// status package.
 type ServerStream interface {
 	// SetHeader sets the header metadata. It may be called multiple times.
 	// When call multiple times, all the provided metadata will be merged.
@@ -547,11 +859,37 @@ type ServerStream interface {
 	// SetTrailer sets the trailer metadata which will be sent with the RPC status.
 	// When called more than once, all the provided metadata will be merged.
 	SetTrailer(metadata.MD)
-	Stream
+	// Context returns the context for this stream.
+	Context() context.Context
+	// SendMsg sends a message. On error, SendMsg aborts the stream and the
+	// error is returned directly.
+	//
+	// SendMsg blocks until:
+	//   - There is sufficient flow control to schedule m with the transport, or
+	//   - The stream is done, or
+	//   - The stream breaks.
+	//
+	// SendMsg does not wait until the message is received by the client. An
+	// untimely stream closure may result in lost messages.
+	//
+	// It is safe to have a goroutine calling SendMsg and another goroutine
+	// calling RecvMsg on the same stream at the same time, but it is not safe
+	// to call SendMsg on the same stream in different goroutines.
+	SendMsg(m interface{}) error
+	// RecvMsg blocks until it receives a message into m or the stream is
+	// done. It returns io.EOF when the client has performed a CloseSend. On
+	// any non-EOF error, the stream is aborted and the error contains the
+	// RPC status.
+	//
+	// It is safe to have a goroutine calling SendMsg and another goroutine
+	// calling RecvMsg on the same stream at the same time, but it is not
+	// safe to call RecvMsg on the same stream in different goroutines.
+	RecvMsg(m interface{}) error
 }
 
 // serverStream implements a server side Stream.
 type serverStream struct {
+	ctx   context.Context
 	t     transport.ServerTransport
 	s     *transport.Stream
 	p     *parser
@@ -572,7 +910,7 @@ type serverStream struct {
 }
 
 func (ss *serverStream) Context() context.Context {
-	return ss.s.Context()
+	return ss.ctx
 }
 
 func (ss *serverStream) SetHeader(md metadata.MD) error {
@@ -591,7 +929,6 @@ func (ss *serverStream) SetTrailer(md metadata.MD) {
 		return
 	}
 	ss.s.SetTrailer(md)
-	return
 }
 
 func (ss *serverStream) SendMsg(m interface{}) (err error) {
@@ -612,24 +949,28 @@ func (ss *serverStream) SendMsg(m interface{}) (err error) {
 			st, _ := status.FromError(toRPCErr(err))
 			ss.t.WriteStatus(ss.s, st)
 		}
+		if channelz.IsOn() && err == nil {
+			ss.t.IncrMsgSent()
+		}
 	}()
-	var outPayload *stats.OutPayload
-	if ss.statsHandler != nil {
-		outPayload = &stats.OutPayload{}
+	data, err := encode(ss.codec, m)
+	if err != nil {
+		return err
 	}
-	hdr, data, err := encode(ss.codec, m, ss.cp, outPayload, ss.comp)
+	compData, err := compress(data, ss.cp, ss.comp)
 	if err != nil {
 		return err
 	}
-	if len(data) > ss.maxSendMessageSize {
-		return status.Errorf(codes.ResourceExhausted, "trying to send message larger than max (%d vs. %d)", len(data), ss.maxSendMessageSize)
+	hdr, payload := msgHeader(data, compData)
+	// TODO(dfawley): should we be checking len(data) instead?
+	if len(payload) > ss.maxSendMessageSize {
+		return status.Errorf(codes.ResourceExhausted, "trying to send message larger than max (%d vs. %d)", len(payload), ss.maxSendMessageSize)
 	}
-	if err := ss.t.Write(ss.s, hdr, data, &transport.Options{Last: false}); err != nil {
+	if err := ss.t.Write(ss.s, hdr, payload, &transport.Options{Last: false}); err != nil {
 		return toRPCErr(err)
 	}
-	if outPayload != nil {
-		outPayload.SentTime = time.Now()
-		ss.statsHandler.HandleRPC(ss.s.Context(), outPayload)
+	if ss.statsHandler != nil {
+		ss.statsHandler.HandleRPC(ss.s.Context(), outPayload(false, m, data, payload, time.Now()))
 	}
 	return nil
 }
@@ -652,6 +993,9 @@ func (ss *serverStream) RecvMsg(m interface{}) (err error) {
 			st, _ := status.FromError(toRPCErr(err))
 			ss.t.WriteStatus(ss.s, st)
 		}
+		if channelz.IsOn() && err == nil {
+			ss.t.IncrMsgRecv()
+		}
 	}()
 	var inPayload *stats.InPayload
 	if ss.statsHandler != nil {
@@ -675,9 +1019,5 @@ func (ss *serverStream) RecvMsg(m interface{}) (err error) {
 // MethodFromServerStream returns the method string for the input stream.
 // The returned string is in the format of "/service/method".
 func MethodFromServerStream(stream ServerStream) (string, bool) {
-	s, ok := transport.StreamFromContext(stream.Context())
-	if !ok {
-		return "", ok
-	}
-	return s.Method(), ok
+	return Method(stream.Context())
 }
diff --git a/vendor/google.golang.org/grpc/stress/client/main.go b/vendor/google.golang.org/grpc/stress/client/main.go
index 6e7e733c..dab8a9d7 100644
--- a/vendor/google.golang.org/grpc/stress/client/main.go
+++ b/vendor/google.golang.org/grpc/stress/client/main.go
@@ -249,23 +249,23 @@ func performRPCs(gauge *gauge, conn *grpc.ClientConn, selector *weightedRandomTe
 }
 
 func logParameterInfo(addresses []string, tests []testCaseWithWeight) {
-	grpclog.Printf("server_addresses: %s", *serverAddresses)
-	grpclog.Printf("test_cases: %s", *testCases)
-	grpclog.Printf("test_duration_secs: %d", *testDurationSecs)
-	grpclog.Printf("num_channels_per_server: %d", *numChannelsPerServer)
-	grpclog.Printf("num_stubs_per_channel: %d", *numStubsPerChannel)
-	grpclog.Printf("metrics_port: %d", *metricsPort)
-	grpclog.Printf("use_tls: %t", *useTLS)
-	grpclog.Printf("use_test_ca: %t", *testCA)
-	grpclog.Printf("server_host_override: %s", *tlsServerName)
-
-	grpclog.Println("addresses:")
+	grpclog.Infof("server_addresses: %s", *serverAddresses)
+	grpclog.Infof("test_cases: %s", *testCases)
+	grpclog.Infof("test_duration_secs: %d", *testDurationSecs)
+	grpclog.Infof("num_channels_per_server: %d", *numChannelsPerServer)
+	grpclog.Infof("num_stubs_per_channel: %d", *numStubsPerChannel)
+	grpclog.Infof("metrics_port: %d", *metricsPort)
+	grpclog.Infof("use_tls: %t", *useTLS)
+	grpclog.Infof("use_test_ca: %t", *testCA)
+	grpclog.Infof("server_host_override: %s", *tlsServerName)
+
+	grpclog.Infoln("addresses:")
 	for i, addr := range addresses {
-		grpclog.Printf("%d. %s\n", i+1, addr)
+		grpclog.Infof("%d. %s\n", i+1, addr)
 	}
-	grpclog.Println("tests:")
+	grpclog.Infoln("tests:")
 	for i, test := range tests {
-		grpclog.Printf("%d. %v\n", i+1, test)
+		grpclog.Infof("%d. %v\n", i+1, test)
 	}
 }
 
@@ -332,6 +332,6 @@ func main() {
 		close(stop)
 	}
 	wg.Wait()
-	grpclog.Printf(" ===== ALL DONE ===== ")
+	grpclog.Infof(" ===== ALL DONE ===== ")
 
 }
diff --git a/vendor/google.golang.org/grpc/stress/grpc_testing/metrics.pb.go b/vendor/google.golang.org/grpc/stress/grpc_testing/metrics.pb.go
index 466668a4..0a8ad44f 100644
--- a/vendor/google.golang.org/grpc/stress/grpc_testing/metrics.pb.go
+++ b/vendor/google.golang.org/grpc/stress/grpc_testing/metrics.pb.go
@@ -1,17 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: metrics.proto
 
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	metrics.proto
-
-It has these top-level messages:
-	GaugeResponse
-	GaugeRequest
-	EmptyMessage
-*/
 package grpc_testing
 
 import proto "github.com/golang/protobuf/proto"
@@ -36,35 +25,68 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // Response message containing the gauge name and value
 type GaugeResponse struct {
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are valid to be assigned to Value:
 	//	*GaugeResponse_LongValue
 	//	*GaugeResponse_DoubleValue
 	//	*GaugeResponse_StringValue
-	Value isGaugeResponse_Value `protobuf_oneof:"value"`
+	Value                isGaugeResponse_Value `protobuf_oneof:"value"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
-func (m *GaugeResponse) Reset()                    { *m = GaugeResponse{} }
-func (m *GaugeResponse) String() string            { return proto.CompactTextString(m) }
-func (*GaugeResponse) ProtoMessage()               {}
-func (*GaugeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *GaugeResponse) Reset()         { *m = GaugeResponse{} }
+func (m *GaugeResponse) String() string { return proto.CompactTextString(m) }
+func (*GaugeResponse) ProtoMessage()    {}
+func (*GaugeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metrics_c9a45afc44ac5637, []int{0}
+}
+func (m *GaugeResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GaugeResponse.Unmarshal(m, b)
+}
+func (m *GaugeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GaugeResponse.Marshal(b, m, deterministic)
+}
+func (dst *GaugeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GaugeResponse.Merge(dst, src)
+}
+func (m *GaugeResponse) XXX_Size() int {
+	return xxx_messageInfo_GaugeResponse.Size(m)
+}
+func (m *GaugeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GaugeResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GaugeResponse proto.InternalMessageInfo
+
+func (m *GaugeResponse) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
 
 type isGaugeResponse_Value interface {
 	isGaugeResponse_Value()
 }
 
 type GaugeResponse_LongValue struct {
-	LongValue int64 `protobuf:"varint,2,opt,name=long_value,json=longValue,oneof"`
+	LongValue int64 `protobuf:"varint,2,opt,name=long_value,json=longValue,proto3,oneof"`
 }
+
 type GaugeResponse_DoubleValue struct {
-	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,oneof"`
+	DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,proto3,oneof"`
 }
+
 type GaugeResponse_StringValue struct {
-	StringValue string `protobuf:"bytes,4,opt,name=string_value,json=stringValue,oneof"`
+	StringValue string `protobuf:"bytes,4,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
 
-func (*GaugeResponse_LongValue) isGaugeResponse_Value()   {}
+func (*GaugeResponse_LongValue) isGaugeResponse_Value() {}
+
 func (*GaugeResponse_DoubleValue) isGaugeResponse_Value() {}
+
 func (*GaugeResponse_StringValue) isGaugeResponse_Value() {}
 
 func (m *GaugeResponse) GetValue() isGaugeResponse_Value {
@@ -74,13 +96,6 @@ func (m *GaugeResponse) GetValue() isGaugeResponse_Value {
 	return nil
 }
 
-func (m *GaugeResponse) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
 func (m *GaugeResponse) GetLongValue() int64 {
 	if x, ok := m.GetValue().(*GaugeResponse_LongValue); ok {
 		return x.LongValue
@@ -165,13 +180,13 @@ func _GaugeResponse_OneofSizer(msg proto.Message) (n int) {
 	// value
 	switch x := m.Value.(type) {
 	case *GaugeResponse_LongValue:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(x.LongValue))
 	case *GaugeResponse_DoubleValue:
-		n += proto.SizeVarint(3<<3 | proto.WireFixed64)
+		n += 1 // tag and wire
 		n += 8
 	case *GaugeResponse_StringValue:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
+		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(len(x.StringValue)))
 		n += len(x.StringValue)
 	case nil:
@@ -183,13 +198,35 @@ func _GaugeResponse_OneofSizer(msg proto.Message) (n int) {
 
 // Request message containing the gauge name
 type GaugeRequest struct {
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *GaugeRequest) Reset()                    { *m = GaugeRequest{} }
-func (m *GaugeRequest) String() string            { return proto.CompactTextString(m) }
-func (*GaugeRequest) ProtoMessage()               {}
-func (*GaugeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *GaugeRequest) Reset()         { *m = GaugeRequest{} }
+func (m *GaugeRequest) String() string { return proto.CompactTextString(m) }
+func (*GaugeRequest) ProtoMessage()    {}
+func (*GaugeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metrics_c9a45afc44ac5637, []int{1}
+}
+func (m *GaugeRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GaugeRequest.Unmarshal(m, b)
+}
+func (m *GaugeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GaugeRequest.Marshal(b, m, deterministic)
+}
+func (dst *GaugeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GaugeRequest.Merge(dst, src)
+}
+func (m *GaugeRequest) XXX_Size() int {
+	return xxx_messageInfo_GaugeRequest.Size(m)
+}
+func (m *GaugeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GaugeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GaugeRequest proto.InternalMessageInfo
 
 func (m *GaugeRequest) GetName() string {
 	if m != nil {
@@ -199,12 +236,34 @@ func (m *GaugeRequest) GetName() string {
 }
 
 type EmptyMessage struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *EmptyMessage) Reset()         { *m = EmptyMessage{} }
+func (m *EmptyMessage) String() string { return proto.CompactTextString(m) }
+func (*EmptyMessage) ProtoMessage()    {}
+func (*EmptyMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metrics_c9a45afc44ac5637, []int{2}
+}
+func (m *EmptyMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EmptyMessage.Unmarshal(m, b)
+}
+func (m *EmptyMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EmptyMessage.Marshal(b, m, deterministic)
+}
+func (dst *EmptyMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EmptyMessage.Merge(dst, src)
+}
+func (m *EmptyMessage) XXX_Size() int {
+	return xxx_messageInfo_EmptyMessage.Size(m)
+}
+func (m *EmptyMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_EmptyMessage.DiscardUnknown(m)
 }
 
-func (m *EmptyMessage) Reset()                    { *m = EmptyMessage{} }
-func (m *EmptyMessage) String() string            { return proto.CompactTextString(m) }
-func (*EmptyMessage) ProtoMessage()               {}
-func (*EmptyMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_EmptyMessage proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*GaugeResponse)(nil), "grpc.testing.GaugeResponse")
@@ -220,8 +279,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for MetricsService service
-
+// MetricsServiceClient is the client API for MetricsService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MetricsServiceClient interface {
 	// Returns the values of all the gauges that are currently being maintained by
 	// the service
@@ -239,7 +299,7 @@ func NewMetricsServiceClient(cc *grpc.ClientConn) MetricsServiceClient {
 }
 
 func (c *metricsServiceClient) GetAllGauges(ctx context.Context, in *EmptyMessage, opts ...grpc.CallOption) (MetricsService_GetAllGaugesClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_MetricsService_serviceDesc.Streams[0], c.cc, "/grpc.testing.MetricsService/GetAllGauges", opts...)
+	stream, err := c.cc.NewStream(ctx, &_MetricsService_serviceDesc.Streams[0], "/grpc.testing.MetricsService/GetAllGauges", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -272,15 +332,14 @@ func (x *metricsServiceGetAllGaugesClient) Recv() (*GaugeResponse, error) {
 
 func (c *metricsServiceClient) GetGauge(ctx context.Context, in *GaugeRequest, opts ...grpc.CallOption) (*GaugeResponse, error) {
 	out := new(GaugeResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.MetricsService/GetGauge", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.MetricsService/GetGauge", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for MetricsService service
-
+// MetricsServiceServer is the server API for MetricsService service.
 type MetricsServiceServer interface {
 	// Returns the values of all the gauges that are currently being maintained by
 	// the service
@@ -351,9 +410,9 @@ var _MetricsService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "metrics.proto",
 }
 
-func init() { proto.RegisterFile("metrics.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("metrics.proto", fileDescriptor_metrics_c9a45afc44ac5637) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_metrics_c9a45afc44ac5637 = []byte{
 	// 256 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x3f, 0x4f, 0xc3, 0x30,
 	0x10, 0xc5, 0x6b, 0x5a, 0xfe, 0xf4, 0x70, 0x3b, 0x78, 0xaa, 0xca, 0x40, 0x14, 0x96, 0x4c, 0x11,
diff --git a/vendor/google.golang.org/grpc/stress/metrics_client/main.go b/vendor/google.golang.org/grpc/stress/metrics_client/main.go
index 6405ec85..70b024b6 100644
--- a/vendor/google.golang.org/grpc/stress/metrics_client/main.go
+++ b/vendor/google.golang.org/grpc/stress/metrics_client/main.go
@@ -55,14 +55,14 @@ func printMetrics(client metricspb.MetricsServiceClient, totalOnly bool) {
 		}
 		v := gaugeResponse.GetLongValue()
 		if !totalOnly {
-			grpclog.Printf("%s: %d", gaugeResponse.Name, v)
+			grpclog.Infof("%s: %d", gaugeResponse.Name, v)
 		}
 		overallQPS += v
 	}
 	if rpcStatus != io.EOF {
 		grpclog.Fatalf("failed to finish server streaming: %v", rpcStatus)
 	}
-	grpclog.Printf("overall qps: %d", overallQPS)
+	grpclog.Infof("overall qps: %d", overallQPS)
 }
 
 func main() {
diff --git a/vendor/google.golang.org/grpc/test/channelz_linux_go110_test.go b/vendor/google.golang.org/grpc/test/channelz_linux_go110_test.go
new file mode 100644
index 00000000..31ce11db
--- /dev/null
+++ b/vendor/google.golang.org/grpc/test/channelz_linux_go110_test.go
@@ -0,0 +1,100 @@
+// +build go1.10,linux,!appengine
+
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// The test in this file should be run in an environment that has go1.10 or later,
+// as the function SyscallConn() (required to get socket option) was
+// introduced to net.TCPListener in go1.10.
+
+package test
+
+import (
+	"testing"
+	"time"
+
+	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/grpc/internal/leakcheck"
+	testpb "google.golang.org/grpc/test/grpc_testing"
+)
+
+func TestCZSocketMetricsSocketOption(t *testing.T) {
+	envs := []env{tcpClearRREnv, tcpTLSRREnv}
+	for _, e := range envs {
+		testCZSocketMetricsSocketOption(t, e)
+	}
+}
+
+func testCZSocketMetricsSocketOption(t *testing.T, e env) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	te := newTest(t, e)
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+	cc := te.clientConn()
+	tc := testpb.NewTestServiceClient(cc)
+	doSuccessfulUnaryCall(tc, t)
+
+	time.Sleep(10 * time.Millisecond)
+	ss, _ := channelz.GetServers(0)
+	if len(ss) != 1 {
+		t.Fatalf("There should be one server, not %d", len(ss))
+	}
+	if len(ss[0].ListenSockets) != 1 {
+		t.Fatalf("There should be one listen socket, not %d", len(ss[0].ListenSockets))
+	}
+	for id := range ss[0].ListenSockets {
+		sm := channelz.GetSocket(id)
+		if sm == nil || sm.SocketData == nil || sm.SocketData.SocketOptions == nil {
+			t.Fatalf("Unable to get server listen socket options")
+		}
+	}
+	ns, _ := channelz.GetServerSockets(ss[0].ID, 0)
+	if len(ns) != 1 {
+		t.Fatalf("There should be one server normal socket, not %d", len(ns))
+	}
+	if ns[0] == nil || ns[0].SocketData == nil || ns[0].SocketData.SocketOptions == nil {
+		t.Fatalf("Unable to get server normal socket options")
+	}
+
+	tchan, _ := channelz.GetTopChannels(0)
+	if len(tchan) != 1 {
+		t.Fatalf("There should only be one top channel, not %d", len(tchan))
+	}
+	if len(tchan[0].SubChans) != 1 {
+		t.Fatalf("There should only be one subchannel under top channel %d, not %d", tchan[0].ID, len(tchan[0].SubChans))
+	}
+	var id int64
+	for id = range tchan[0].SubChans {
+		break
+	}
+	sc := channelz.GetSubChannel(id)
+	if sc == nil {
+		t.Fatalf("There should only be one socket under subchannel %d, not 0", id)
+	}
+	if len(sc.Sockets) != 1 {
+		t.Fatalf("There should only be one socket under subchannel %d, not %d", sc.ID, len(sc.Sockets))
+	}
+	for id = range sc.Sockets {
+		break
+	}
+	skt := channelz.GetSocket(id)
+	if skt == nil || skt.SocketData == nil || skt.SocketData.SocketOptions == nil {
+		t.Fatalf("Unable to get client normal socket options")
+	}
+}
diff --git a/vendor/google.golang.org/grpc/test/channelz_test.go b/vendor/google.golang.org/grpc/test/channelz_test.go
new file mode 100644
index 00000000..0567e8f9
--- /dev/null
+++ b/vendor/google.golang.org/grpc/test/channelz_test.go
@@ -0,0 +1,1195 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package test
+
+import (
+	"fmt"
+	"net"
+	"sync"
+	"testing"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/http2"
+	"google.golang.org/grpc"
+	_ "google.golang.org/grpc/balancer/grpclb"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/grpc/internal/leakcheck"
+	"google.golang.org/grpc/keepalive"
+	"google.golang.org/grpc/resolver"
+	"google.golang.org/grpc/resolver/manual"
+	"google.golang.org/grpc/status"
+	testpb "google.golang.org/grpc/test/grpc_testing"
+)
+
+func (te *test) startServers(ts testpb.TestServiceServer, num int) {
+	for i := 0; i < num; i++ {
+		te.startServer(ts)
+		te.srvs = append(te.srvs, te.srv)
+		te.srvAddrs = append(te.srvAddrs, te.srvAddr)
+		te.srv = nil
+		te.srvAddr = ""
+	}
+}
+
+func verifyResultWithDelay(f func() (bool, error)) error {
+	var ok bool
+	var err error
+	for i := 0; i < 1000; i++ {
+		if ok, err = f(); ok {
+			return nil
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	return err
+}
+
+func TestCZServerRegistrationAndDeletion(t *testing.T) {
+	defer leakcheck.Check(t)
+	testcases := []struct {
+		total  int
+		start  int64
+		length int
+		end    bool
+	}{
+		{total: channelz.EntryPerPage, start: 0, length: channelz.EntryPerPage, end: true},
+		{total: channelz.EntryPerPage - 1, start: 0, length: channelz.EntryPerPage - 1, end: true},
+		{total: channelz.EntryPerPage + 1, start: 0, length: channelz.EntryPerPage, end: false},
+		{total: channelz.EntryPerPage + 1, start: int64(2*(channelz.EntryPerPage+1) + 1), length: 0, end: true},
+	}
+
+	for _, c := range testcases {
+		channelz.NewChannelzStorage()
+		e := tcpClearRREnv
+		te := newTest(t, e)
+		te.startServers(&testServer{security: e.security}, c.total)
+
+		ss, end := channelz.GetServers(c.start)
+		if len(ss) != c.length || end != c.end {
+			t.Fatalf("GetServers(%d) = %+v (len of which: %d), end: %+v, want len(GetServers(%d)) = %d, end: %+v", c.start, ss, len(ss), end, c.start, c.length, c.end)
+		}
+		te.tearDown()
+		ss, end = channelz.GetServers(c.start)
+		if len(ss) != 0 || !end {
+			t.Fatalf("GetServers(0) = %+v (len of which: %d), end: %+v, want len(GetServers(0)) = 0, end: true", ss, len(ss), end)
+		}
+	}
+}
+
+func TestCZTopChannelRegistrationAndDeletion(t *testing.T) {
+	defer leakcheck.Check(t)
+	testcases := []struct {
+		total  int
+		start  int64
+		length int
+		end    bool
+	}{
+		{total: channelz.EntryPerPage, start: 0, length: channelz.EntryPerPage, end: true},
+		{total: channelz.EntryPerPage - 1, start: 0, length: channelz.EntryPerPage - 1, end: true},
+		{total: channelz.EntryPerPage + 1, start: 0, length: channelz.EntryPerPage, end: false},
+		{total: channelz.EntryPerPage + 1, start: int64(2*(channelz.EntryPerPage+1) + 1), length: 0, end: true},
+	}
+
+	for _, c := range testcases {
+		channelz.NewChannelzStorage()
+		e := tcpClearRREnv
+		te := newTest(t, e)
+		var ccs []*grpc.ClientConn
+		for i := 0; i < c.total; i++ {
+			cc := te.clientConn()
+			te.cc = nil
+			// avoid making next dial blocking
+			te.srvAddr = ""
+			ccs = append(ccs, cc)
+		}
+		if err := verifyResultWithDelay(func() (bool, error) {
+			if tcs, end := channelz.GetTopChannels(c.start); len(tcs) != c.length || end != c.end {
+				return false, fmt.Errorf("GetTopChannels(%d) = %+v (len of which: %d), end: %+v, want len(GetTopChannels(%d)) = %d, end: %+v", c.start, tcs, len(tcs), end, c.start, c.length, c.end)
+			}
+			return true, nil
+		}); err != nil {
+			t.Fatal(err)
+		}
+
+		for _, cc := range ccs {
+			cc.Close()
+		}
+
+		if err := verifyResultWithDelay(func() (bool, error) {
+			if tcs, end := channelz.GetTopChannels(c.start); len(tcs) != 0 || !end {
+				return false, fmt.Errorf("GetTopChannels(0) = %+v (len of which: %d), end: %+v, want len(GetTopChannels(0)) = 0, end: true", tcs, len(tcs), end)
+			}
+			return true, nil
+		}); err != nil {
+			t.Fatal(err)
+		}
+		te.tearDown()
+	}
+}
+
+func TestCZNestedChannelRegistrationAndDeletion(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	// avoid calling API to set balancer type, which will void service config's change of balancer.
+	e.balancer = ""
+	te := newTest(t, e)
+	r, cleanup := manual.GenerateAndRegisterManualResolver()
+	defer cleanup()
+	resolvedAddrs := []resolver.Address{{Addr: "127.0.0.1:0", Type: resolver.GRPCLB, ServerName: "grpclb.server"}}
+	r.InitialAddrs(resolvedAddrs)
+	te.resolverScheme = r.Scheme()
+	te.clientConn()
+	defer te.tearDown()
+
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tcs, _ := channelz.GetTopChannels(0)
+		if len(tcs) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tcs))
+		}
+		if len(tcs[0].NestedChans) != 1 {
+			return false, fmt.Errorf("There should be one nested channel from grpclb, not %d", len(tcs[0].NestedChans))
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	r.NewServiceConfig(`{"loadBalancingPolicy": "round_robin"}`)
+	r.NewAddress([]resolver.Address{{Addr: "127.0.0.1:0"}})
+
+	// wait for the shutdown of grpclb balancer
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tcs, _ := channelz.GetTopChannels(0)
+		if len(tcs) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tcs))
+		}
+		if len(tcs[0].NestedChans) != 0 {
+			return false, fmt.Errorf("There should be 0 nested channel from grpclb, not %d", len(tcs[0].NestedChans))
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCZClientSubChannelSocketRegistrationAndDeletion(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	num := 3 // number of backends
+	te := newTest(t, e)
+	var svrAddrs []resolver.Address
+	te.startServers(&testServer{security: e.security}, num)
+	r, cleanup := manual.GenerateAndRegisterManualResolver()
+	defer cleanup()
+	for _, a := range te.srvAddrs {
+		svrAddrs = append(svrAddrs, resolver.Address{Addr: a})
+	}
+	r.InitialAddrs(svrAddrs)
+	te.resolverScheme = r.Scheme()
+	te.clientConn()
+	defer te.tearDown()
+	// Here, we just wait for all sockets to be up. In the future, if we implement
+	// IDLE, we may need to make several rpc calls to create the sockets.
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tcs, _ := channelz.GetTopChannels(0)
+		if len(tcs) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tcs))
+		}
+		if len(tcs[0].SubChans) != num {
+			return false, fmt.Errorf("There should be %d subchannel not %d", num, len(tcs[0].SubChans))
+		}
+		count := 0
+		for k := range tcs[0].SubChans {
+			sc := channelz.GetSubChannel(k)
+			if sc == nil {
+				return false, fmt.Errorf("got <nil> subchannel")
+			}
+			count += len(sc.Sockets)
+		}
+		if count != num {
+			return false, fmt.Errorf("There should be %d sockets not %d", num, count)
+		}
+
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	r.NewAddress(svrAddrs[:len(svrAddrs)-1])
+
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tcs, _ := channelz.GetTopChannels(0)
+		if len(tcs) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tcs))
+		}
+		if len(tcs[0].SubChans) != num-1 {
+			return false, fmt.Errorf("There should be %d subchannel not %d", num-1, len(tcs[0].SubChans))
+		}
+		count := 0
+		for k := range tcs[0].SubChans {
+			sc := channelz.GetSubChannel(k)
+			if sc == nil {
+				return false, fmt.Errorf("got <nil> subchannel")
+			}
+			count += len(sc.Sockets)
+		}
+		if count != num-1 {
+			return false, fmt.Errorf("There should be %d sockets not %d", num-1, count)
+		}
+
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCZServerSocketRegistrationAndDeletion(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	num := 3 // number of clients
+	te := newTest(t, e)
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+	var ccs []*grpc.ClientConn
+	for i := 0; i < num; i++ {
+		cc := te.clientConn()
+		te.cc = nil
+		ccs = append(ccs, cc)
+	}
+	defer func() {
+		for _, c := range ccs[:len(ccs)-1] {
+			c.Close()
+		}
+	}()
+	var svrID int64
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should only be one server, not %d", len(ss))
+		}
+		if len(ss[0].ListenSockets) != 1 {
+			return false, fmt.Errorf("There should only be one server listen socket, not %d", len(ss[0].ListenSockets))
+		}
+		ns, _ := channelz.GetServerSockets(ss[0].ID, 0)
+		if len(ns) != num {
+			return false, fmt.Errorf("There should be %d normal sockets not %d", num, len(ns))
+		}
+		svrID = ss[0].ID
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	ccs[len(ccs)-1].Close()
+
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ns, _ := channelz.GetServerSockets(svrID, 0)
+		if len(ns) != num-1 {
+			return false, fmt.Errorf("There should be %d normal sockets not %d", num-1, len(ns))
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCZServerListenSocketDeletion(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	s := grpc.NewServer()
+	lis, err := net.Listen("tcp", "localhost:0")
+	if err != nil {
+		t.Fatalf("failed to listen: %v", err)
+	}
+	go s.Serve(lis)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should only be one server, not %d", len(ss))
+		}
+		if len(ss[0].ListenSockets) != 1 {
+			return false, fmt.Errorf("There should only be one server listen socket, not %d", len(ss[0].ListenSockets))
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	lis.Close()
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should be 1 server, not %d", len(ss))
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+	s.Stop()
+}
+
+type dummyChannel struct{}
+
+func (d *dummyChannel) ChannelzMetric() *channelz.ChannelInternalMetric {
+	return &channelz.ChannelInternalMetric{}
+}
+
+type dummySocket struct{}
+
+func (d *dummySocket) ChannelzMetric() *channelz.SocketInternalMetric {
+	return &channelz.SocketInternalMetric{}
+}
+
+func TestCZRecusivelyDeletionOfEntry(t *testing.T) {
+	//           +--+TopChan+---+
+	//           |              |
+	//           v              v
+	//    +-+SubChan1+--+   SubChan2
+	//    |             |
+	//    v             v
+	// Socket1       Socket2
+	channelz.NewChannelzStorage()
+	topChanID := channelz.RegisterChannel(&dummyChannel{}, 0, "")
+	subChanID1 := channelz.RegisterSubChannel(&dummyChannel{}, topChanID, "")
+	subChanID2 := channelz.RegisterSubChannel(&dummyChannel{}, topChanID, "")
+	sktID1 := channelz.RegisterNormalSocket(&dummySocket{}, subChanID1, "")
+	sktID2 := channelz.RegisterNormalSocket(&dummySocket{}, subChanID1, "")
+
+	tcs, _ := channelz.GetTopChannels(0)
+	if tcs == nil || len(tcs) != 1 {
+		t.Fatalf("There should be one TopChannel entry")
+	}
+	if len(tcs[0].SubChans) != 2 {
+		t.Fatalf("There should be two SubChannel entries")
+	}
+	sc := channelz.GetSubChannel(subChanID1)
+	if sc == nil || len(sc.Sockets) != 2 {
+		t.Fatalf("There should be two Socket entries")
+	}
+
+	channelz.RemoveEntry(topChanID)
+	tcs, _ = channelz.GetTopChannels(0)
+	if tcs == nil || len(tcs) != 1 {
+		t.Fatalf("There should be one TopChannel entry")
+	}
+
+	channelz.RemoveEntry(subChanID1)
+	channelz.RemoveEntry(subChanID2)
+	tcs, _ = channelz.GetTopChannels(0)
+	if tcs == nil || len(tcs) != 1 {
+		t.Fatalf("There should be one TopChannel entry")
+	}
+	if len(tcs[0].SubChans) != 1 {
+		t.Fatalf("There should be one SubChannel entry")
+	}
+
+	channelz.RemoveEntry(sktID1)
+	channelz.RemoveEntry(sktID2)
+	tcs, _ = channelz.GetTopChannels(0)
+	if tcs != nil {
+		t.Fatalf("There should be no TopChannel entry")
+	}
+}
+
+func TestCZChannelMetrics(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	num := 3 // number of backends
+	te := newTest(t, e)
+	te.maxClientSendMsgSize = newInt(8)
+	var svrAddrs []resolver.Address
+	te.startServers(&testServer{security: e.security}, num)
+	r, cleanup := manual.GenerateAndRegisterManualResolver()
+	defer cleanup()
+	for _, a := range te.srvAddrs {
+		svrAddrs = append(svrAddrs, resolver.Address{Addr: a})
+	}
+	r.InitialAddrs(svrAddrs)
+	te.resolverScheme = r.Scheme()
+	cc := te.clientConn()
+	defer te.tearDown()
+	tc := testpb.NewTestServiceClient(cc)
+	if _, err := tc.EmptyCall(context.Background(), &testpb.Empty{}); err != nil {
+		t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want _, <nil>", err)
+	}
+
+	const smallSize = 1
+	const largeSize = 8
+
+	largePayload, err := newPayload(testpb.PayloadType_COMPRESSABLE, largeSize)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req := &testpb.SimpleRequest{
+		ResponseType: testpb.PayloadType_COMPRESSABLE,
+		ResponseSize: int32(smallSize),
+		Payload:      largePayload,
+	}
+
+	if _, err := tc.UnaryCall(context.Background(), req); err == nil || status.Code(err) != codes.ResourceExhausted {
+		t.Fatalf("TestService/UnaryCall(_, _) = _, %v, want _, error code: %s", err, codes.ResourceExhausted)
+	}
+
+	stream, err := tc.FullDuplexCall(context.Background())
+	if err != nil {
+		t.Fatalf("%v.FullDuplexCall(_) = _, %v, want <nil>", tc, err)
+	}
+	defer stream.CloseSend()
+	// Here, we just wait for all sockets to be up. In the future, if we implement
+	// IDLE, we may need to make several rpc calls to create the sockets.
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tcs, _ := channelz.GetTopChannels(0)
+		if len(tcs) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tcs))
+		}
+		if len(tcs[0].SubChans) != num {
+			return false, fmt.Errorf("There should be %d subchannel not %d", num, len(tcs[0].SubChans))
+		}
+		var cst, csu, cf int64
+		for k := range tcs[0].SubChans {
+			sc := channelz.GetSubChannel(k)
+			if sc == nil {
+				return false, fmt.Errorf("got <nil> subchannel")
+			}
+			cst += sc.ChannelData.CallsStarted
+			csu += sc.ChannelData.CallsSucceeded
+			cf += sc.ChannelData.CallsFailed
+		}
+		if cst != 3 {
+			return false, fmt.Errorf("There should be 3 CallsStarted not %d", cst)
+		}
+		if csu != 1 {
+			return false, fmt.Errorf("There should be 1 CallsSucceeded not %d", csu)
+		}
+		if cf != 1 {
+			return false, fmt.Errorf("There should be 1 CallsFailed not %d", cf)
+		}
+		if tcs[0].ChannelData.CallsStarted != 3 {
+			return false, fmt.Errorf("There should be 3 CallsStarted not %d", tcs[0].ChannelData.CallsStarted)
+		}
+		if tcs[0].ChannelData.CallsSucceeded != 1 {
+			return false, fmt.Errorf("There should be 1 CallsSucceeded not %d", tcs[0].ChannelData.CallsSucceeded)
+		}
+		if tcs[0].ChannelData.CallsFailed != 1 {
+			return false, fmt.Errorf("There should be 1 CallsFailed not %d", tcs[0].ChannelData.CallsFailed)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCZServerMetrics(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	te := newTest(t, e)
+	te.maxServerReceiveMsgSize = newInt(8)
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+	cc := te.clientConn()
+	tc := testpb.NewTestServiceClient(cc)
+	if _, err := tc.EmptyCall(context.Background(), &testpb.Empty{}); err != nil {
+		t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want _, <nil>", err)
+	}
+
+	const smallSize = 1
+	const largeSize = 8
+
+	largePayload, err := newPayload(testpb.PayloadType_COMPRESSABLE, largeSize)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req := &testpb.SimpleRequest{
+		ResponseType: testpb.PayloadType_COMPRESSABLE,
+		ResponseSize: int32(smallSize),
+		Payload:      largePayload,
+	}
+	if _, err := tc.UnaryCall(context.Background(), req); err == nil || status.Code(err) != codes.ResourceExhausted {
+		t.Fatalf("TestService/UnaryCall(_, _) = _, %v, want _, error code: %s", err, codes.ResourceExhausted)
+	}
+
+	stream, err := tc.FullDuplexCall(context.Background())
+	if err != nil {
+		t.Fatalf("%v.FullDuplexCall(_) = _, %v, want <nil>", tc, err)
+	}
+	defer stream.CloseSend()
+
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should only be one server, not %d", len(ss))
+		}
+		if ss[0].ServerData.CallsStarted != 3 {
+			return false, fmt.Errorf("There should be 3 CallsStarted not %d", ss[0].ServerData.CallsStarted)
+		}
+		if ss[0].ServerData.CallsSucceeded != 1 {
+			return false, fmt.Errorf("There should be 1 CallsSucceeded not %d", ss[0].ServerData.CallsSucceeded)
+		}
+		if ss[0].ServerData.CallsFailed != 1 {
+			return false, fmt.Errorf("There should be 1 CallsFailed not %d", ss[0].ServerData.CallsFailed)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+type testServiceClientWrapper struct {
+	testpb.TestServiceClient
+	mu             sync.RWMutex
+	streamsCreated int
+}
+
+func (t *testServiceClientWrapper) getCurrentStreamID() uint32 {
+	t.mu.RLock()
+	defer t.mu.RUnlock()
+	return uint32(2*t.streamsCreated - 1)
+}
+
+func (t *testServiceClientWrapper) EmptyCall(ctx context.Context, in *testpb.Empty, opts ...grpc.CallOption) (*testpb.Empty, error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.streamsCreated++
+	return t.TestServiceClient.EmptyCall(ctx, in, opts...)
+}
+
+func (t *testServiceClientWrapper) UnaryCall(ctx context.Context, in *testpb.SimpleRequest, opts ...grpc.CallOption) (*testpb.SimpleResponse, error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.streamsCreated++
+	return t.TestServiceClient.UnaryCall(ctx, in, opts...)
+}
+
+func (t *testServiceClientWrapper) StreamingOutputCall(ctx context.Context, in *testpb.StreamingOutputCallRequest, opts ...grpc.CallOption) (testpb.TestService_StreamingOutputCallClient, error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.streamsCreated++
+	return t.TestServiceClient.StreamingOutputCall(ctx, in, opts...)
+}
+
+func (t *testServiceClientWrapper) StreamingInputCall(ctx context.Context, opts ...grpc.CallOption) (testpb.TestService_StreamingInputCallClient, error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.streamsCreated++
+	return t.TestServiceClient.StreamingInputCall(ctx, opts...)
+}
+
+func (t *testServiceClientWrapper) FullDuplexCall(ctx context.Context, opts ...grpc.CallOption) (testpb.TestService_FullDuplexCallClient, error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.streamsCreated++
+	return t.TestServiceClient.FullDuplexCall(ctx, opts...)
+}
+
+func (t *testServiceClientWrapper) HalfDuplexCall(ctx context.Context, opts ...grpc.CallOption) (testpb.TestService_HalfDuplexCallClient, error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.streamsCreated++
+	return t.TestServiceClient.HalfDuplexCall(ctx, opts...)
+}
+
+func doSuccessfulUnaryCall(tc testpb.TestServiceClient, t *testing.T) {
+	if _, err := tc.EmptyCall(context.Background(), &testpb.Empty{}); err != nil {
+		t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want _, <nil>", err)
+	}
+}
+
+func doStreamingInputCallWithLargePayload(tc testpb.TestServiceClient, t *testing.T) {
+	s, err := tc.StreamingInputCall(context.Background())
+	if err != nil {
+		t.Fatalf("TestService/StreamingInputCall(_) = _, %v, want <nil>", err)
+	}
+	payload, err := newPayload(testpb.PayloadType_COMPRESSABLE, 10000)
+	if err != nil {
+		t.Fatal(err)
+	}
+	s.Send(&testpb.StreamingInputCallRequest{Payload: payload})
+}
+
+func doServerSideFailedUnaryCall(tc testpb.TestServiceClient, t *testing.T) {
+	const smallSize = 1
+	const largeSize = 2000
+
+	largePayload, err := newPayload(testpb.PayloadType_COMPRESSABLE, largeSize)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req := &testpb.SimpleRequest{
+		ResponseType: testpb.PayloadType_COMPRESSABLE,
+		ResponseSize: int32(smallSize),
+		Payload:      largePayload,
+	}
+	if _, err := tc.UnaryCall(context.Background(), req); err == nil || status.Code(err) != codes.ResourceExhausted {
+		t.Fatalf("TestService/UnaryCall(_, _) = _, %v, want _, error code: %s", err, codes.ResourceExhausted)
+	}
+}
+
+func doClientSideInitiatedFailedStream(tc testpb.TestServiceClient, t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	stream, err := tc.FullDuplexCall(ctx)
+	if err != nil {
+		t.Fatalf("TestService/FullDuplexCall(_) = _, %v, want <nil>", err)
+	}
+
+	const smallSize = 1
+	smallPayload, err := newPayload(testpb.PayloadType_COMPRESSABLE, smallSize)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sreq := &testpb.StreamingOutputCallRequest{
+		ResponseType: testpb.PayloadType_COMPRESSABLE,
+		ResponseParameters: []*testpb.ResponseParameters{
+			{Size: smallSize},
+		},
+		Payload: smallPayload,
+	}
+
+	if err := stream.Send(sreq); err != nil {
+		t.Fatalf("%v.Send(%v) = %v, want <nil>", stream, sreq, err)
+	}
+	if _, err := stream.Recv(); err != nil {
+		t.Fatalf("%v.Recv() = %v, want <nil>", stream, err)
+	}
+	// By canceling the call, the client will send rst_stream to end the call, and
+	// the stream will failed as a result.
+	cancel()
+}
+
+// This func is to be used to test client side counting of failed streams.
+func doServerSideInitiatedFailedStreamWithRSTStream(tc testpb.TestServiceClient, t *testing.T, l *listenerWrapper) {
+	stream, err := tc.FullDuplexCall(context.Background())
+	if err != nil {
+		t.Fatalf("TestService/FullDuplexCall(_) = _, %v, want <nil>", err)
+	}
+
+	const smallSize = 1
+	smallPayload, err := newPayload(testpb.PayloadType_COMPRESSABLE, smallSize)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sreq := &testpb.StreamingOutputCallRequest{
+		ResponseType: testpb.PayloadType_COMPRESSABLE,
+		ResponseParameters: []*testpb.ResponseParameters{
+			{Size: smallSize},
+		},
+		Payload: smallPayload,
+	}
+
+	if err := stream.Send(sreq); err != nil {
+		t.Fatalf("%v.Send(%v) = %v, want <nil>", stream, sreq, err)
+	}
+	if _, err := stream.Recv(); err != nil {
+		t.Fatalf("%v.Recv() = %v, want <nil>", stream, err)
+	}
+
+	rcw := l.getLastConn()
+
+	if rcw != nil {
+		rcw.writeRSTStream(tc.(*testServiceClientWrapper).getCurrentStreamID(), http2.ErrCodeCancel)
+	}
+	if _, err := stream.Recv(); err == nil {
+		t.Fatalf("%v.Recv() = %v, want <non-nil>", stream, err)
+	}
+}
+
+// this func is to be used to test client side counting of failed streams.
+func doServerSideInitiatedFailedStreamWithGoAway(tc testpb.TestServiceClient, t *testing.T, l *listenerWrapper) {
+	// This call is just to keep the transport from shutting down (socket will be deleted
+	// in this case, and we will not be able to get metrics).
+	s, err := tc.FullDuplexCall(context.Background())
+	if err != nil {
+		t.Fatalf("TestService/FullDuplexCall(_) = _, %v, want <nil>", err)
+	}
+	if err := s.Send(&testpb.StreamingOutputCallRequest{ResponseParameters: []*testpb.ResponseParameters{
+		{
+			Size: 1,
+		},
+	}}); err != nil {
+		t.Fatalf("s.Send() failed with error: %v", err)
+	}
+	if _, err := s.Recv(); err != nil {
+		t.Fatalf("s.Recv() failed with error: %v", err)
+	}
+
+	s, err = tc.FullDuplexCall(context.Background())
+	if err != nil {
+		t.Fatalf("TestService/FullDuplexCall(_) = _, %v, want <nil>", err)
+	}
+	if err := s.Send(&testpb.StreamingOutputCallRequest{ResponseParameters: []*testpb.ResponseParameters{
+		{
+			Size: 1,
+		},
+	}}); err != nil {
+		t.Fatalf("s.Send() failed with error: %v", err)
+	}
+	if _, err := s.Recv(); err != nil {
+		t.Fatalf("s.Recv() failed with error: %v", err)
+	}
+
+	rcw := l.getLastConn()
+	if rcw != nil {
+		rcw.writeGoAway(tc.(*testServiceClientWrapper).getCurrentStreamID()-2, http2.ErrCodeCancel, []byte{})
+	}
+	if _, err := s.Recv(); err == nil {
+		t.Fatalf("%v.Recv() = %v, want <non-nil>", s, err)
+	}
+}
+
+// this func is to be used to test client side counting of failed streams.
+func doServerSideInitiatedFailedStreamWithClientBreakFlowControl(tc testpb.TestServiceClient, t *testing.T, dw *dialerWrapper) {
+	stream, err := tc.FullDuplexCall(context.Background())
+	if err != nil {
+		t.Fatalf("TestService/FullDuplexCall(_) = _, %v, want <nil>", err)
+	}
+	// sleep here to make sure header frame being sent before the data frame we write directly below.
+	time.Sleep(10 * time.Millisecond)
+	payload := make([]byte, 65537, 65537)
+	dw.getRawConnWrapper().writeRawFrame(http2.FrameData, 0, tc.(*testServiceClientWrapper).getCurrentStreamID(), payload)
+	if _, err := stream.Recv(); err == nil || status.Code(err) != codes.ResourceExhausted {
+		t.Fatalf("%v.Recv() = %v, want error code: %v", stream, err, codes.ResourceExhausted)
+	}
+}
+
+func doIdleCallToInvokeKeepAlive(tc testpb.TestServiceClient, t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	_, err := tc.FullDuplexCall(ctx)
+	if err != nil {
+		t.Fatalf("TestService/FullDuplexCall(_) = _, %v, want <nil>", err)
+	}
+	// 2500ms allow for 2 keepalives (1000ms per round trip)
+	time.Sleep(2500 * time.Millisecond)
+	cancel()
+}
+
+func TestCZClientSocketMetricsStreamsAndMessagesCount(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	te := newTest(t, e)
+	te.maxServerReceiveMsgSize = newInt(20)
+	te.maxClientReceiveMsgSize = newInt(20)
+	rcw := te.startServerWithConnControl(&testServer{security: e.security})
+	defer te.tearDown()
+	cc := te.clientConn()
+	tc := &testServiceClientWrapper{TestServiceClient: testpb.NewTestServiceClient(cc)}
+
+	doSuccessfulUnaryCall(tc, t)
+	var scID, skID int64
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tchan, _ := channelz.GetTopChannels(0)
+		if len(tchan) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tchan))
+		}
+		if len(tchan[0].SubChans) != 1 {
+			return false, fmt.Errorf("There should only be one subchannel under top channel %d, not %d", tchan[0].ID, len(tchan[0].SubChans))
+		}
+
+		for scID = range tchan[0].SubChans {
+			break
+		}
+		sc := channelz.GetSubChannel(scID)
+		if sc == nil {
+			return false, fmt.Errorf("There should only be one socket under subchannel %d, not 0", scID)
+		}
+		if len(sc.Sockets) != 1 {
+			return false, fmt.Errorf("There should only be one socket under subchannel %d, not %d", sc.ID, len(sc.Sockets))
+		}
+		for skID = range sc.Sockets {
+			break
+		}
+		skt := channelz.GetSocket(skID)
+		sktData := skt.SocketData
+		if sktData.StreamsStarted != 1 || sktData.StreamsSucceeded != 1 || sktData.MessagesSent != 1 || sktData.MessagesReceived != 1 {
+			return false, fmt.Errorf("channelz.GetSocket(%d), want (StreamsStarted, StreamsSucceeded, MessagesSent, MessagesReceived) = (1, 1, 1, 1), got (%d, %d, %d, %d)", skt.ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.MessagesSent, sktData.MessagesReceived)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	doServerSideFailedUnaryCall(tc, t)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		skt := channelz.GetSocket(skID)
+		sktData := skt.SocketData
+		if sktData.StreamsStarted != 2 || sktData.StreamsSucceeded != 2 || sktData.MessagesSent != 2 || sktData.MessagesReceived != 1 {
+			return false, fmt.Errorf("channelz.GetSocket(%d), want (StreamsStarted, StreamsSucceeded, MessagesSent, MessagesReceived) = (2, 2, 2, 1), got (%d, %d, %d, %d)", skt.ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.MessagesSent, sktData.MessagesReceived)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	doClientSideInitiatedFailedStream(tc, t)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		skt := channelz.GetSocket(skID)
+		sktData := skt.SocketData
+		if sktData.StreamsStarted != 3 || sktData.StreamsSucceeded != 2 || sktData.StreamsFailed != 1 || sktData.MessagesSent != 3 || sktData.MessagesReceived != 2 {
+			return false, fmt.Errorf("channelz.GetSocket(%d), want (StreamsStarted, StreamsSucceeded, StreamsFailed, MessagesSent, MessagesReceived) = (3, 2, 1, 3, 2), got (%d, %d, %d, %d, %d)", skt.ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.StreamsFailed, sktData.MessagesSent, sktData.MessagesReceived)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	doServerSideInitiatedFailedStreamWithRSTStream(tc, t, rcw)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		skt := channelz.GetSocket(skID)
+		sktData := skt.SocketData
+		if sktData.StreamsStarted != 4 || sktData.StreamsSucceeded != 2 || sktData.StreamsFailed != 2 || sktData.MessagesSent != 4 || sktData.MessagesReceived != 3 {
+			return false, fmt.Errorf("channelz.GetSocket(%d), want (StreamsStarted, StreamsSucceeded, StreamsFailed, MessagesSent, MessagesReceived) = (4, 2, 2, 4, 3), got (%d, %d, %d, %d, %d)", skt.ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.StreamsFailed, sktData.MessagesSent, sktData.MessagesReceived)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	doServerSideInitiatedFailedStreamWithGoAway(tc, t, rcw)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		skt := channelz.GetSocket(skID)
+		sktData := skt.SocketData
+		if sktData.StreamsStarted != 6 || sktData.StreamsSucceeded != 2 || sktData.StreamsFailed != 3 || sktData.MessagesSent != 6 || sktData.MessagesReceived != 5 {
+			return false, fmt.Errorf("channelz.GetSocket(%d), want (StreamsStarted, StreamsSucceeded, StreamsFailed, MessagesSent, MessagesReceived) = (6, 2, 3, 6, 5), got (%d, %d, %d, %d, %d)", skt.ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.StreamsFailed, sktData.MessagesSent, sktData.MessagesReceived)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// This test is to complete TestCZClientSocketMetricsStreamsAndMessagesCount and
+// TestCZServerSocketMetricsStreamsAndMessagesCount by adding the test case of
+// server sending RST_STREAM to client due to client side flow control violation.
+// It is separated from other cases due to setup incompatibly, i.e. max receive
+// size violation will mask flow control violation.
+func TestCZClientAndServerSocketMetricsStreamsCountFlowControlRSTStream(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	te := newTest(t, e)
+	te.serverInitialWindowSize = 65536
+	// Avoid overflowing connection level flow control window, which will lead to
+	// transport being closed.
+	te.serverInitialConnWindowSize = 65536 * 2
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+	cc, dw := te.clientConnWithConnControl()
+	tc := &testServiceClientWrapper{TestServiceClient: testpb.NewTestServiceClient(cc)}
+
+	doServerSideInitiatedFailedStreamWithClientBreakFlowControl(tc, t, dw)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tchan, _ := channelz.GetTopChannels(0)
+		if len(tchan) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tchan))
+		}
+		if len(tchan[0].SubChans) != 1 {
+			return false, fmt.Errorf("There should only be one subchannel under top channel %d, not %d", tchan[0].ID, len(tchan[0].SubChans))
+		}
+		var id int64
+		for id = range tchan[0].SubChans {
+			break
+		}
+		sc := channelz.GetSubChannel(id)
+		if sc == nil {
+			return false, fmt.Errorf("There should only be one socket under subchannel %d, not 0", id)
+		}
+		if len(sc.Sockets) != 1 {
+			return false, fmt.Errorf("There should only be one socket under subchannel %d, not %d", sc.ID, len(sc.Sockets))
+		}
+		for id = range sc.Sockets {
+			break
+		}
+		skt := channelz.GetSocket(id)
+		sktData := skt.SocketData
+		if sktData.StreamsStarted != 1 || sktData.StreamsSucceeded != 0 || sktData.StreamsFailed != 1 {
+			return false, fmt.Errorf("channelz.GetSocket(%d), want (StreamsStarted, StreamsSucceeded, StreamsFailed) = (1, 0, 1), got (%d, %d, %d)", skt.ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.StreamsFailed)
+		}
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should only be one server, not %d", len(ss))
+		}
+
+		ns, _ := channelz.GetServerSockets(ss[0].ID, 0)
+		if len(ns) != 1 {
+			return false, fmt.Errorf("There should be one server normal socket, not %d", len(ns))
+		}
+		sktData = ns[0].SocketData
+		if sktData.StreamsStarted != 1 || sktData.StreamsSucceeded != 0 || sktData.StreamsFailed != 1 {
+			return false, fmt.Errorf("Server socket metric with ID %d, want (StreamsStarted, StreamsSucceeded, StreamsFailed) = (1, 0, 1), got (%d, %d, %d)", ns[0].ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.StreamsFailed)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCZClientAndServerSocketMetricsFlowControl(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	te := newTest(t, e)
+	// disable BDP
+	te.serverInitialWindowSize = 65536
+	te.serverInitialConnWindowSize = 65536
+	te.clientInitialWindowSize = 65536
+	te.clientInitialConnWindowSize = 65536
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+	cc := te.clientConn()
+	tc := testpb.NewTestServiceClient(cc)
+
+	for i := 0; i < 10; i++ {
+		doSuccessfulUnaryCall(tc, t)
+	}
+
+	var cliSktID, svrSktID int64
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tchan, _ := channelz.GetTopChannels(0)
+		if len(tchan) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tchan))
+		}
+		if len(tchan[0].SubChans) != 1 {
+			return false, fmt.Errorf("There should only be one subchannel under top channel %d, not %d", tchan[0].ID, len(tchan[0].SubChans))
+		}
+		var id int64
+		for id = range tchan[0].SubChans {
+			break
+		}
+		sc := channelz.GetSubChannel(id)
+		if sc == nil {
+			return false, fmt.Errorf("There should only be one socket under subchannel %d, not 0", id)
+		}
+		if len(sc.Sockets) != 1 {
+			return false, fmt.Errorf("There should only be one socket under subchannel %d, not %d", sc.ID, len(sc.Sockets))
+		}
+		for id = range sc.Sockets {
+			break
+		}
+		skt := channelz.GetSocket(id)
+		sktData := skt.SocketData
+		// 65536 - 5 (Length-Prefixed-Message size) * 10 = 65486
+		if sktData.LocalFlowControlWindow != 65486 || sktData.RemoteFlowControlWindow != 65486 {
+			return false, fmt.Errorf("Client: (LocalFlowControlWindow, RemoteFlowControlWindow) size should be (65536, 65486), not (%d, %d)", sktData.LocalFlowControlWindow, sktData.RemoteFlowControlWindow)
+		}
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should only be one server, not %d", len(ss))
+		}
+		ns, _ := channelz.GetServerSockets(ss[0].ID, 0)
+		sktData = ns[0].SocketData
+		if sktData.LocalFlowControlWindow != 65486 || sktData.RemoteFlowControlWindow != 65486 {
+			return false, fmt.Errorf("Server: (LocalFlowControlWindow, RemoteFlowControlWindow) size should be (65536, 65486), not (%d, %d)", sktData.LocalFlowControlWindow, sktData.RemoteFlowControlWindow)
+		}
+		cliSktID, svrSktID = id, ss[0].ID
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	doStreamingInputCallWithLargePayload(tc, t)
+
+	if err := verifyResultWithDelay(func() (bool, error) {
+		skt := channelz.GetSocket(cliSktID)
+		sktData := skt.SocketData
+		// Local: 65536 - 5 (Length-Prefixed-Message size) * 10 = 65486
+		// Remote: 65536 - 5 (Length-Prefixed-Message size) * 10 - 10011 = 55475
+		if sktData.LocalFlowControlWindow != 65486 || sktData.RemoteFlowControlWindow != 55475 {
+			return false, fmt.Errorf("Client: (LocalFlowControlWindow, RemoteFlowControlWindow) size should be (65486, 55475), not (%d, %d)", sktData.LocalFlowControlWindow, sktData.RemoteFlowControlWindow)
+		}
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should only be one server, not %d", len(ss))
+		}
+		ns, _ := channelz.GetServerSockets(svrSktID, 0)
+		sktData = ns[0].SocketData
+		if sktData.LocalFlowControlWindow != 55475 || sktData.RemoteFlowControlWindow != 65486 {
+			return false, fmt.Errorf("Server: (LocalFlowControlWindow, RemoteFlowControlWindow) size should be (55475, 65486), not (%d, %d)", sktData.LocalFlowControlWindow, sktData.RemoteFlowControlWindow)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	// triggers transport flow control window update on server side, since unacked
+	// bytes should be larger than limit now. i.e. 50 + 20022 > 65536/4.
+	doStreamingInputCallWithLargePayload(tc, t)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		skt := channelz.GetSocket(cliSktID)
+		sktData := skt.SocketData
+		// Local: 65536 - 5 (Length-Prefixed-Message size) * 10 = 65486
+		// Remote: 65536
+		if sktData.LocalFlowControlWindow != 65486 || sktData.RemoteFlowControlWindow != 65536 {
+			return false, fmt.Errorf("Client: (LocalFlowControlWindow, RemoteFlowControlWindow) size should be (65486, 65536), not (%d, %d)", sktData.LocalFlowControlWindow, sktData.RemoteFlowControlWindow)
+		}
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should only be one server, not %d", len(ss))
+		}
+		ns, _ := channelz.GetServerSockets(svrSktID, 0)
+		sktData = ns[0].SocketData
+		if sktData.LocalFlowControlWindow != 65536 || sktData.RemoteFlowControlWindow != 65486 {
+			return false, fmt.Errorf("Server: (LocalFlowControlWindow, RemoteFlowControlWindow) size should be (65536, 65486), not (%d, %d)", sktData.LocalFlowControlWindow, sktData.RemoteFlowControlWindow)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCZClientSocketMetricsKeepAlive(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	te := newTest(t, e)
+	te.cliKeepAlive = &keepalive.ClientParameters{Time: 500 * time.Millisecond, Timeout: 500 * time.Millisecond}
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+	cc := te.clientConn()
+	tc := testpb.NewTestServiceClient(cc)
+	doIdleCallToInvokeKeepAlive(tc, t)
+
+	if err := verifyResultWithDelay(func() (bool, error) {
+		tchan, _ := channelz.GetTopChannels(0)
+		if len(tchan) != 1 {
+			return false, fmt.Errorf("There should only be one top channel, not %d", len(tchan))
+		}
+		if len(tchan[0].SubChans) != 1 {
+			return false, fmt.Errorf("There should only be one subchannel under top channel %d, not %d", tchan[0].ID, len(tchan[0].SubChans))
+		}
+		var id int64
+		for id = range tchan[0].SubChans {
+			break
+		}
+		sc := channelz.GetSubChannel(id)
+		if sc == nil {
+			return false, fmt.Errorf("There should only be one socket under subchannel %d, not 0", id)
+		}
+		if len(sc.Sockets) != 1 {
+			return false, fmt.Errorf("There should only be one socket under subchannel %d, not %d", sc.ID, len(sc.Sockets))
+		}
+		for id = range sc.Sockets {
+			break
+		}
+		skt := channelz.GetSocket(id)
+		if skt.SocketData.KeepAlivesSent != 2 { // doIdleCallToInvokeKeepAlive func is set up to send 2 KeepAlives.
+			return false, fmt.Errorf("There should be 2 KeepAlives sent, not %d", skt.SocketData.KeepAlivesSent)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCZServerSocketMetricsStreamsAndMessagesCount(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	te := newTest(t, e)
+	te.maxServerReceiveMsgSize = newInt(20)
+	te.maxClientReceiveMsgSize = newInt(20)
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+	cc, _ := te.clientConnWithConnControl()
+	tc := &testServiceClientWrapper{TestServiceClient: testpb.NewTestServiceClient(cc)}
+
+	var svrID int64
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should only be one server, not %d", len(ss))
+		}
+		svrID = ss[0].ID
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	doSuccessfulUnaryCall(tc, t)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ns, _ := channelz.GetServerSockets(svrID, 0)
+		sktData := ns[0].SocketData
+		if sktData.StreamsStarted != 1 || sktData.StreamsSucceeded != 1 || sktData.StreamsFailed != 0 || sktData.MessagesSent != 1 || sktData.MessagesReceived != 1 {
+			return false, fmt.Errorf("Server socket metric with ID %d, want (StreamsStarted, StreamsSucceeded, MessagesSent, MessagesReceived) = (1, 1, 1, 1), got (%d, %d, %d, %d, %d)", ns[0].ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.StreamsFailed, sktData.MessagesSent, sktData.MessagesReceived)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	doServerSideFailedUnaryCall(tc, t)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ns, _ := channelz.GetServerSockets(svrID, 0)
+		sktData := ns[0].SocketData
+		if sktData.StreamsStarted != 2 || sktData.StreamsSucceeded != 2 || sktData.StreamsFailed != 0 || sktData.MessagesSent != 1 || sktData.MessagesReceived != 1 {
+			return false, fmt.Errorf("Server socket metric with ID %d, want (StreamsStarted, StreamsSucceeded, StreamsFailed, MessagesSent, MessagesReceived) = (2, 2, 0, 1, 1), got (%d, %d, %d, %d, %d)", ns[0].ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.StreamsFailed, sktData.MessagesSent, sktData.MessagesReceived)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	doClientSideInitiatedFailedStream(tc, t)
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ns, _ := channelz.GetServerSockets(svrID, 0)
+		sktData := ns[0].SocketData
+		if sktData.StreamsStarted != 3 || sktData.StreamsSucceeded != 2 || sktData.StreamsFailed != 1 || sktData.MessagesSent != 2 || sktData.MessagesReceived != 2 {
+			return false, fmt.Errorf("Server socket metric with ID %d, want (StreamsStarted, StreamsSucceeded, StreamsFailed, MessagesSent, MessagesReceived) = (3, 2, 1, 2, 2), got (%d, %d, %d, %d, %d)", ns[0].ID, sktData.StreamsStarted, sktData.StreamsSucceeded, sktData.StreamsFailed, sktData.MessagesSent, sktData.MessagesReceived)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCZServerSocketMetricsKeepAlive(t *testing.T) {
+	defer leakcheck.Check(t)
+	channelz.NewChannelzStorage()
+	e := tcpClearRREnv
+	te := newTest(t, e)
+	te.svrKeepAlive = &keepalive.ServerParameters{Time: 500 * time.Millisecond, Timeout: 500 * time.Millisecond}
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+	cc := te.clientConn()
+	tc := testpb.NewTestServiceClient(cc)
+	doIdleCallToInvokeKeepAlive(tc, t)
+
+	if err := verifyResultWithDelay(func() (bool, error) {
+		ss, _ := channelz.GetServers(0)
+		if len(ss) != 1 {
+			return false, fmt.Errorf("There should be one server, not %d", len(ss))
+		}
+		ns, _ := channelz.GetServerSockets(ss[0].ID, 0)
+		if len(ns) != 1 {
+			return false, fmt.Errorf("There should be one server normal socket, not %d", len(ns))
+		}
+		if ns[0].SocketData.KeepAlivesSent != 2 { // doIdleCallToInvokeKeepAlive func is set up to send 2 KeepAlives.
+			return false, fmt.Errorf("There should be 2 KeepAlives sent, not %d", ns[0].SocketData.KeepAlivesSent)
+		}
+		return true, nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/test/codec_perf/perf.pb.go b/vendor/google.golang.org/grpc/test/codec_perf/perf.pb.go
index fb6fc5d9..6bcbc3fd 100644
--- a/vendor/google.golang.org/grpc/test/codec_perf/perf.pb.go
+++ b/vendor/google.golang.org/grpc/test/codec_perf/perf.pb.go
@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: codec_perf/perf.proto
 
-/*
-Package codec_perf is a generated protocol buffer package.
-
-It is generated from these files:
-	codec_perf/perf.proto
-
-It has these top-level messages:
-	Buffer
-*/
 package codec_perf
 
 import proto "github.com/golang/protobuf/proto"
@@ -30,13 +21,35 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 // Buffer is a message that contains a body of bytes that is used to exercise
 // encoding and decoding overheads.
 type Buffer struct {
-	Body []byte `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"`
+	Body                 []byte   `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Buffer) Reset()         { *m = Buffer{} }
+func (m *Buffer) String() string { return proto.CompactTextString(m) }
+func (*Buffer) ProtoMessage()    {}
+func (*Buffer) Descriptor() ([]byte, []int) {
+	return fileDescriptor_perf_6cc81a33b24d08e7, []int{0}
+}
+func (m *Buffer) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Buffer.Unmarshal(m, b)
+}
+func (m *Buffer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Buffer.Marshal(b, m, deterministic)
+}
+func (dst *Buffer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Buffer.Merge(dst, src)
+}
+func (m *Buffer) XXX_Size() int {
+	return xxx_messageInfo_Buffer.Size(m)
+}
+func (m *Buffer) XXX_DiscardUnknown() {
+	xxx_messageInfo_Buffer.DiscardUnknown(m)
 }
 
-func (m *Buffer) Reset()                    { *m = Buffer{} }
-func (m *Buffer) String() string            { return proto.CompactTextString(m) }
-func (*Buffer) ProtoMessage()               {}
-func (*Buffer) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_Buffer proto.InternalMessageInfo
 
 func (m *Buffer) GetBody() []byte {
 	if m != nil {
@@ -49,9 +62,9 @@ func init() {
 	proto.RegisterType((*Buffer)(nil), "codec.perf.Buffer")
 }
 
-func init() { proto.RegisterFile("codec_perf/perf.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("codec_perf/perf.proto", fileDescriptor_perf_6cc81a33b24d08e7) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_perf_6cc81a33b24d08e7 = []byte{
 	// 83 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4d, 0xce, 0x4f, 0x49,
 	0x4d, 0x8e, 0x2f, 0x48, 0x2d, 0x4a, 0xd3, 0x07, 0x11, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42,
diff --git a/vendor/google.golang.org/grpc/test/end2end_test.go b/vendor/google.golang.org/grpc/test/end2end_test.go
index 6a583182..0087df56 100644
--- a/vendor/google.golang.org/grpc/test/end2end_test.go
+++ b/vendor/google.golang.org/grpc/test/end2end_test.go
@@ -53,8 +53,11 @@ import (
 	_ "google.golang.org/grpc/encoding/gzip"
 	_ "google.golang.org/grpc/grpclog/glogger"
 	"google.golang.org/grpc/health"
+	healthgrpc "google.golang.org/grpc/health/grpc_health_v1"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/grpc/internal"
+	"google.golang.org/grpc/internal/leakcheck"
+	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/resolver"
@@ -64,10 +67,13 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/tap"
 	testpb "google.golang.org/grpc/test/grpc_testing"
-	"google.golang.org/grpc/test/leakcheck"
 	"google.golang.org/grpc/testdata"
 )
 
+func init() {
+	grpc.RegisterChannelz()
+}
+
 var (
 	// For headers:
 	testMetadata = metadata.MD{
@@ -446,6 +452,8 @@ type test struct {
 	maxClientSendMsgSize    *int
 	maxServerReceiveMsgSize *int
 	maxServerSendMsgSize    *int
+	maxClientHeaderListSize *uint32
+	maxServerHeaderListSize *uint32
 	userAgent               string
 	// clientCompression and serverCompression are set to test the deprecated API
 	// WithCompressor and WithDecompressor.
@@ -469,6 +477,8 @@ type test struct {
 	perRPCCreds                 credentials.PerRPCCredentials
 	customDialOptions           []grpc.DialOption
 	resolverScheme              string
+	cliKeepAlive                *keepalive.ClientParameters
+	svrKeepAlive                *keepalive.ServerParameters
 
 	// All test dialing is blocking by default. Set this to true if dial
 	// should be non-blocking.
@@ -478,6 +488,10 @@ type test struct {
 	srv     *grpc.Server
 	srvAddr string
 
+	// srvs and srvAddrs are set once startServers is called.
+	srvs     []*grpc.Server
+	srvAddrs []string
+
 	cc          *grpc.ClientConn // nil until requested via clientConn
 	restoreLogs func()           // nil unless declareLogNoise is used
 }
@@ -487,17 +501,25 @@ func (te *test) tearDown() {
 		te.cancel()
 		te.cancel = nil
 	}
+
 	if te.cc != nil {
 		te.cc.Close()
 		te.cc = nil
 	}
+
 	if te.restoreLogs != nil {
 		te.restoreLogs()
 		te.restoreLogs = nil
 	}
+
 	if te.srv != nil {
 		te.srv.Stop()
 	}
+	if len(te.srvs) != 0 {
+		for _, s := range te.srvs {
+			s.Stop()
+		}
+	}
 }
 
 // newTest returns a new test using the provided testing.T and
@@ -513,9 +535,7 @@ func newTest(t *testing.T, e env) *test {
 	return te
 }
 
-// startServer starts a gRPC server listening. Callers should defer a
-// call to te.tearDown to clean up.
-func (te *test) startServer(ts testpb.TestServiceServer) {
+func (te *test) listenAndServe(ts testpb.TestServiceServer, listen func(network, address string) (net.Listener, error)) net.Listener {
 	te.testServer = ts
 	te.t.Logf("Running test in %s environment...", te.e.name)
 	sopts := []grpc.ServerOption{grpc.MaxConcurrentStreams(te.maxStream)}
@@ -528,6 +548,9 @@ func (te *test) startServer(ts testpb.TestServiceServer) {
 	if te.maxServerSendMsgSize != nil {
 		sopts = append(sopts, grpc.MaxSendMsgSize(*te.maxServerSendMsgSize))
 	}
+	if te.maxServerHeaderListSize != nil {
+		sopts = append(sopts, grpc.MaxHeaderListSize(*te.maxServerHeaderListSize))
+	}
 	if te.tapHandle != nil {
 		sopts = append(sopts, grpc.InTapHandle(te.tapHandle))
 	}
@@ -558,7 +581,7 @@ func (te *test) startServer(ts testpb.TestServiceServer) {
 		la = "/tmp/testsock" + fmt.Sprintf("%d", time.Now().UnixNano())
 		syscall.Unlink(la)
 	}
-	lis, err := net.Listen(te.e.network, la)
+	lis, err := listen(te.e.network, la)
 	if err != nil {
 		te.t.Fatalf("Failed to listen: %v", err)
 	}
@@ -575,13 +598,16 @@ func (te *test) startServer(ts testpb.TestServiceServer) {
 	if te.customCodec != nil {
 		sopts = append(sopts, grpc.CustomCodec(te.customCodec))
 	}
+	if te.svrKeepAlive != nil {
+		sopts = append(sopts, grpc.KeepaliveParams(*te.svrKeepAlive))
+	}
 	s := grpc.NewServer(sopts...)
 	te.srv = s
 	if te.e.httpHandler {
 		internal.TestingUseHandlerImpl(s)
 	}
 	if te.healthServer != nil {
-		healthpb.RegisterHealthServer(s, te.healthServer)
+		healthgrpc.RegisterHealthServer(s, te.healthServer)
 	}
 	if te.testServer != nil {
 		testpb.RegisterTestServiceServer(s, te.testServer)
@@ -599,6 +625,18 @@ func (te *test) startServer(ts testpb.TestServiceServer) {
 
 	go s.Serve(lis)
 	te.srvAddr = addr
+	return lis
+}
+
+func (te *test) startServerWithConnControl(ts testpb.TestServiceServer) *listenerWrapper {
+	l := te.listenAndServe(ts, listenWithConnControl)
+	return l.(*listenerWrapper)
+}
+
+// startServer starts a gRPC server listening. Callers should defer a
+// call to te.tearDown to clean up.
+func (te *test) startServer(ts testpb.TestServiceServer) {
+	te.listenAndServe(ts, net.Listen)
 }
 
 type nopCompressor struct {
@@ -627,14 +665,8 @@ func (d *nopDecompressor) Type() string {
 	return "nop"
 }
 
-func (te *test) clientConn() *grpc.ClientConn {
-	if te.cc != nil {
-		return te.cc
-	}
-	opts := []grpc.DialOption{
-		grpc.WithDialer(te.e.dialer),
-		grpc.WithUserAgent(te.userAgent),
-	}
+func (te *test) configDial(opts ...grpc.DialOption) ([]grpc.DialOption, string) {
+	opts = append(opts, grpc.WithDialer(te.e.dialer), grpc.WithUserAgent(te.userAgent))
 
 	if te.sc != nil {
 		opts = append(opts, grpc.WithServiceConfig(te.sc))
@@ -670,6 +702,9 @@ func (te *test) clientConn() *grpc.ClientConn {
 	if te.maxClientSendMsgSize != nil {
 		opts = append(opts, grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(*te.maxClientSendMsgSize)))
 	}
+	if te.maxClientHeaderListSize != nil {
+		opts = append(opts, grpc.WithMaxHeaderListSize(*te.maxClientHeaderListSize))
+	}
 	switch te.e.security {
 	case "tls":
 		creds, err := credentials.NewClientTLSFromFile(testdata.Path("ca.pem"), "x.test.youtube.com")
@@ -714,7 +749,35 @@ func (te *test) clientConn() *grpc.ClientConn {
 	if te.srvAddr == "" {
 		te.srvAddr = "client.side.only.test"
 	}
+	if te.cliKeepAlive != nil {
+		opts = append(opts, grpc.WithKeepaliveParams(*te.cliKeepAlive))
+	}
 	opts = append(opts, te.customDialOptions...)
+	return opts, scheme
+}
+
+func (te *test) clientConnWithConnControl() (*grpc.ClientConn, *dialerWrapper) {
+	if te.cc != nil {
+		return te.cc, nil
+	}
+	opts, scheme := te.configDial()
+	dw := &dialerWrapper{}
+	// overwrite the dialer before
+	opts = append(opts, grpc.WithDialer(dw.dialer))
+	var err error
+	te.cc, err = grpc.Dial(scheme+te.srvAddr, opts...)
+	if err != nil {
+		te.t.Fatalf("Dial(%q) = %v", scheme+te.srvAddr, err)
+	}
+	return te.cc, dw
+}
+
+func (te *test) clientConn(opts ...grpc.DialOption) *grpc.ClientConn {
+	if te.cc != nil {
+		return te.cc
+	}
+	var scheme string
+	opts, scheme = te.configDial(opts...)
 	var err error
 	te.cc, err = grpc.Dial(scheme+te.srvAddr, opts...)
 	if err != nil {
@@ -751,7 +814,6 @@ type lazyConn struct {
 
 func (l *lazyConn) Write(b []byte) (int, error) {
 	if atomic.LoadInt32(&(l.beLazy)) == 1 {
-		// The sleep duration here needs to less than the leakCheck deadline.
 		time.Sleep(time.Second)
 	}
 	return l.Conn.Write(b)
@@ -940,18 +1002,18 @@ func testServerGoAwayPendingRPC(t *testing.T, e env) {
 		close(ch)
 	}()
 	// Loop until the server side GoAway signal is propagated to the client.
-	abort := false
-	time.AfterFunc(time.Second, func() { abort = true })
-	for !abort {
+	start := time.Now()
+	errored := false
+	for time.Since(start) < time.Second {
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
-		if _, err := tc.EmptyCall(ctx, &testpb.Empty{}, grpc.FailFast(false)); err != nil {
-			cancel()
+		_, err := tc.EmptyCall(ctx, &testpb.Empty{}, grpc.FailFast(false))
+		cancel()
+		if err != nil {
+			errored = true
 			break
 		}
-		cancel()
 	}
-	// Don't bother stopping the timer; it will have no effect past here.
-	if abort {
+	if !errored {
 		t.Fatalf("GoAway never received by client")
 	}
 	respParam := []*testpb.ResponseParameters{{Size: 1}}
@@ -966,7 +1028,7 @@ func testServerGoAwayPendingRPC(t *testing.T, e env) {
 	}
 	// The existing RPC should be still good to proceed.
 	if err := stream.Send(req); err != nil {
-		t.Fatalf("%v.Send(%v) = %v, want <nil>", stream, req, err)
+		t.Fatalf("%v.Send(_) = %v, want <nil>", stream, err)
 	}
 	if _, err := stream.Recv(); err != nil {
 		t.Fatalf("%v.Recv() = _, %v, want _, <nil>", stream, err)
@@ -1247,7 +1309,7 @@ func testFailFast(t *testing.T, e env) {
 	if _, err := tc.EmptyCall(ctx, &testpb.Empty{}); err != nil {
 		t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want _, <nil>", err)
 	}
-	// Stop the server and tear down all the exisiting connections.
+	// Stop the server and tear down all the existing connections.
 	te.srv.Stop()
 	// Loop until the server teardown is propagated to the client.
 	for {
@@ -1834,9 +1896,7 @@ func TestStreamingRPCWithTimeoutInServiceConfigRecv(t *testing.T) {
 
 	te.resolverScheme = r.Scheme()
 	te.nonBlockingDial = true
-	fmt.Println("1")
 	cc := te.clientConn()
-	fmt.Println("10")
 	tc := testpb.NewTestServiceClient(cc)
 
 	r.NewAddress([]resolver.Address{{Addr: te.srvAddr}})
@@ -2199,7 +2259,7 @@ func testTap(t *testing.T, e env) {
 func healthCheck(d time.Duration, cc *grpc.ClientConn, serviceName string) (*healthpb.HealthCheckResponse, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), d)
 	defer cancel()
-	hc := healthpb.NewHealthClient(cc)
+	hc := healthgrpc.NewHealthClient(cc)
 	req := &healthpb.HealthCheckRequest{
 		Service: serviceName,
 	}
@@ -3021,7 +3081,9 @@ func testMultipleSetHeaderStreamingRPCError(t *testing.T, e env) {
 		argSize  = 1
 		respSize = -1
 	)
-	ctx := metadata.NewOutgoingContext(context.Background(), testMetadata)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	ctx = metadata.NewOutgoingContext(ctx, testMetadata)
 	stream, err := tc.FullDuplexCall(ctx)
 	if err != nil {
 		t.Fatalf("%v.FullDuplexCall(_) = _, %v, want <nil>", tc, err)
@@ -3056,7 +3118,6 @@ func testMultipleSetHeaderStreamingRPCError(t *testing.T, e env) {
 	if !reflect.DeepEqual(header, expectedHeader) {
 		t.Fatalf("Received header metadata %v, want %v", header, expectedHeader)
 	}
-
 	if err := stream.CloseSend(); err != nil {
 		t.Fatalf("%v.CloseSend() got %v, want %v", stream, err, nil)
 	}
@@ -3098,20 +3159,20 @@ func testMalformedHTTP2Metadata(t *testing.T, e env) {
 	}
 }
 
-func TestRetry(t *testing.T) {
+func TestTransparentRetry(t *testing.T) {
 	defer leakcheck.Check(t)
 	for _, e := range listTestEnv() {
 		if e.name == "handler-tls" {
 			// Fails with RST_STREAM / FLOW_CONTROL_ERROR
 			continue
 		}
-		testRetry(t, e)
+		testTransparentRetry(t, e)
 	}
 }
 
-// This test make sure RPCs are retried times when they receive a RST_STREAM
+// This test makes sure RPCs are retried times when they receive a RST_STREAM
 // with the REFUSED_STREAM error code, which the InTapHandle provokes.
-func testRetry(t *testing.T, e env) {
+func testTransparentRetry(t *testing.T, e env) {
 	te := newTest(t, e)
 	attempts := 0
 	successAttempt := 2
@@ -3159,44 +3220,6 @@ func testRetry(t *testing.T, e env) {
 	}
 }
 
-func TestRPCTimeout(t *testing.T) {
-	defer leakcheck.Check(t)
-	for _, e := range listTestEnv() {
-		testRPCTimeout(t, e)
-	}
-}
-
-// TODO(zhaoq): Have a better test coverage of timeout and cancellation mechanism.
-func testRPCTimeout(t *testing.T, e env) {
-	te := newTest(t, e)
-	te.startServer(&testServer{security: e.security, unaryCallSleepTime: 50 * time.Millisecond})
-	defer te.tearDown()
-
-	cc := te.clientConn()
-	tc := testpb.NewTestServiceClient(cc)
-
-	const argSize = 2718
-	const respSize = 314
-
-	payload, err := newPayload(testpb.PayloadType_COMPRESSABLE, argSize)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	req := &testpb.SimpleRequest{
-		ResponseType: testpb.PayloadType_COMPRESSABLE,
-		ResponseSize: respSize,
-		Payload:      payload,
-	}
-	for i := -1; i <= 10; i++ {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(i)*time.Millisecond)
-		if _, err := tc.UnaryCall(ctx, req); status.Code(err) != codes.DeadlineExceeded {
-			t.Fatalf("TestService/UnaryCallv(_, _) = _, %v; want <nil>, error code: %s", err, codes.DeadlineExceeded)
-		}
-		cancel()
-	}
-}
-
 func TestCancel(t *testing.T) {
 	defer leakcheck.Check(t)
 	for _, e := range listTestEnv() {
@@ -3690,7 +3713,7 @@ func testClientStreaming(t *testing.T, e env, sizes []int) {
 			Payload: payload,
 		}
 		if err := stream.Send(req); err != nil {
-			t.Fatalf("%v.Send(%v) = %v, want <nil>", stream, req, err)
+			t.Fatalf("%v.Send(_) = %v, want <nil>", stream, err)
 		}
 		sum += s
 	}
@@ -4830,8 +4853,11 @@ type stubServer struct {
 
 	// A client connected to this service the test may use.  Created in Start().
 	client testpb.TestServiceClient
+	cc     *grpc.ClientConn
 
 	cleanups []func() // Lambdas executed in Stop(); populated by Start().
+
+	r *manual.Resolver
 }
 
 func (ss *stubServer) EmptyCall(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
@@ -4843,7 +4869,11 @@ func (ss *stubServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallSer
 }
 
 // Start starts the server and creates a client connected to it.
-func (ss *stubServer) Start(sopts []grpc.ServerOption) error {
+func (ss *stubServer) Start(sopts []grpc.ServerOption, dopts ...grpc.DialOption) error {
+	r, cleanup := manual.GenerateAndRegisterManualResolver()
+	ss.r = r
+	ss.cleanups = append(ss.cleanups, cleanup)
+
 	lis, err := net.Listen("tcp", "localhost:0")
 	if err != nil {
 		return fmt.Errorf(`net.Listen("tcp", "localhost:0") = %v`, err)
@@ -4855,22 +4885,74 @@ func (ss *stubServer) Start(sopts []grpc.ServerOption) error {
 	go s.Serve(lis)
 	ss.cleanups = append(ss.cleanups, s.Stop)
 
-	cc, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure(), grpc.WithBlock())
+	target := ss.r.Scheme() + ":///" + lis.Addr().String()
+
+	opts := append([]grpc.DialOption{grpc.WithInsecure()}, dopts...)
+	cc, err := grpc.Dial(target, opts...)
 	if err != nil {
-		return fmt.Errorf("grpc.Dial(%q) = %v", lis.Addr().String(), err)
+		return fmt.Errorf("grpc.Dial(%q) = %v", target, err)
+	}
+	ss.cc = cc
+	ss.r.NewAddress([]resolver.Address{{Addr: lis.Addr().String()}})
+	if err := ss.waitForReady(cc); err != nil {
+		return err
 	}
+
 	ss.cleanups = append(ss.cleanups, func() { cc.Close() })
 
 	ss.client = testpb.NewTestServiceClient(cc)
 	return nil
 }
 
+func (ss *stubServer) waitForReady(cc *grpc.ClientConn) error {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	for {
+		s := cc.GetState()
+		if s == connectivity.Ready {
+			return nil
+		}
+		if !cc.WaitForStateChange(ctx, s) {
+			// ctx got timeout or canceled.
+			return ctx.Err()
+		}
+	}
+}
+
 func (ss *stubServer) Stop() {
 	for i := len(ss.cleanups) - 1; i >= 0; i-- {
 		ss.cleanups[i]()
 	}
 }
 
+func TestGRPCMethod(t *testing.T) {
+	defer leakcheck.Check(t)
+	var method string
+	var ok bool
+
+	ss := &stubServer{
+		emptyCall: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
+			method, ok = grpc.Method(ctx)
+			return &testpb.Empty{}, nil
+		},
+	}
+	if err := ss.Start(nil); err != nil {
+		t.Fatalf("Error starting endpoint server: %v", err)
+	}
+	defer ss.Stop()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+
+	if _, err := ss.client.EmptyCall(ctx, &testpb.Empty{}); err != nil {
+		t.Fatalf("ss.client.EmptyCall(_, _) = _, %v; want _, nil", err)
+	}
+
+	if want := "/grpc.testing.TestService/EmptyCall"; !ok || method != want {
+		t.Fatalf("grpc.Method(_) = %q, %v; want %q, true", method, ok, want)
+	}
+}
+
 func TestUnaryProxyDoesNotForwardMetadata(t *testing.T) {
 	const mdkey = "somedata"
 
@@ -5053,7 +5135,7 @@ func TestTapTimeout(t *testing.T) {
 	ss := &stubServer{
 		emptyCall: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
 			<-ctx.Done()
-			return &testpb.Empty{}, nil
+			return nil, status.Errorf(codes.Canceled, ctx.Err().Error())
 		},
 	}
 	if err := ss.Start(sopts); err != nil {
@@ -5082,7 +5164,7 @@ func TestClientWriteFailsAfterServerClosesStream(t *testing.T) {
 	}
 	sopts := []grpc.ServerOption{}
 	if err := ss.Start(sopts); err != nil {
-		t.Fatalf("Error starting endpoing server: %v", err)
+		t.Fatalf("Error starting endpoint server: %v", err)
 	}
 	defer ss.Stop()
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
@@ -5100,7 +5182,6 @@ func TestClientWriteFailsAfterServerClosesStream(t *testing.T) {
 			t.Fatalf("stream.Send(_) = %v, want io.EOF", err)
 		}
 	}
-
 }
 
 type windowSizeConfig struct {
@@ -5887,6 +5968,109 @@ func TestMethodFromServerStream(t *testing.T) {
 	}
 }
 
+func TestInterceptorCanAccessCallOptions(t *testing.T) {
+	defer leakcheck.Check(t)
+	e := tcpClearRREnv
+	te := newTest(t, e)
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+
+	type observedOptions struct {
+		headers     []*metadata.MD
+		trailers    []*metadata.MD
+		peer        []*peer.Peer
+		creds       []credentials.PerRPCCredentials
+		failFast    []bool
+		maxRecvSize []int
+		maxSendSize []int
+		compressor  []string
+		subtype     []string
+	}
+	var observedOpts observedOptions
+	populateOpts := func(opts []grpc.CallOption) {
+		for _, o := range opts {
+			switch o := o.(type) {
+			case grpc.HeaderCallOption:
+				observedOpts.headers = append(observedOpts.headers, o.HeaderAddr)
+			case grpc.TrailerCallOption:
+				observedOpts.trailers = append(observedOpts.trailers, o.TrailerAddr)
+			case grpc.PeerCallOption:
+				observedOpts.peer = append(observedOpts.peer, o.PeerAddr)
+			case grpc.PerRPCCredsCallOption:
+				observedOpts.creds = append(observedOpts.creds, o.Creds)
+			case grpc.FailFastCallOption:
+				observedOpts.failFast = append(observedOpts.failFast, o.FailFast)
+			case grpc.MaxRecvMsgSizeCallOption:
+				observedOpts.maxRecvSize = append(observedOpts.maxRecvSize, o.MaxRecvMsgSize)
+			case grpc.MaxSendMsgSizeCallOption:
+				observedOpts.maxSendSize = append(observedOpts.maxSendSize, o.MaxSendMsgSize)
+			case grpc.CompressorCallOption:
+				observedOpts.compressor = append(observedOpts.compressor, o.CompressorType)
+			case grpc.ContentSubtypeCallOption:
+				observedOpts.subtype = append(observedOpts.subtype, o.ContentSubtype)
+			}
+		}
+	}
+
+	te.unaryClientInt = func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
+		populateOpts(opts)
+		return nil
+	}
+	te.streamClientInt = func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
+		populateOpts(opts)
+		return nil, nil
+	}
+
+	defaults := []grpc.CallOption{
+		grpc.FailFast(false),
+		grpc.MaxCallRecvMsgSize(1010),
+	}
+	tc := testpb.NewTestServiceClient(te.clientConn(grpc.WithDefaultCallOptions(defaults...)))
+
+	var headers metadata.MD
+	var trailers metadata.MD
+	var pr peer.Peer
+	tc.UnaryCall(context.Background(), &testpb.SimpleRequest{},
+		grpc.MaxCallRecvMsgSize(100),
+		grpc.MaxCallSendMsgSize(200),
+		grpc.PerRPCCredentials(testPerRPCCredentials{}),
+		grpc.Header(&headers),
+		grpc.Trailer(&trailers),
+		grpc.Peer(&pr))
+	expected := observedOptions{
+		failFast:    []bool{false},
+		maxRecvSize: []int{1010, 100},
+		maxSendSize: []int{200},
+		creds:       []credentials.PerRPCCredentials{testPerRPCCredentials{}},
+		headers:     []*metadata.MD{&headers},
+		trailers:    []*metadata.MD{&trailers},
+		peer:        []*peer.Peer{&pr},
+	}
+
+	if !reflect.DeepEqual(expected, observedOpts) {
+		t.Errorf("unary call did not observe expected options: expected %#v, got %#v", expected, observedOpts)
+	}
+
+	observedOpts = observedOptions{} // reset
+
+	tc.StreamingInputCall(context.Background(),
+		grpc.FailFast(true),
+		grpc.MaxCallSendMsgSize(2020),
+		grpc.UseCompressor("comp-type"),
+		grpc.CallContentSubtype("json"))
+	expected = observedOptions{
+		failFast:    []bool{false, true},
+		maxRecvSize: []int{1010},
+		maxSendSize: []int{2020},
+		compressor:  []string{"comp-type"},
+		subtype:     []string{"json"},
+	}
+
+	if !reflect.DeepEqual(expected, observedOpts) {
+		t.Errorf("streaming call did not observe expected options: expected %#v, got %#v", expected, observedOpts)
+	}
+}
+
 func TestCompressorRegister(t *testing.T) {
 	defer leakcheck.Check(t)
 	for _, e := range listTestEnv() {
@@ -5997,6 +6181,73 @@ func TestServeExitsWhenListenerClosed(t *testing.T) {
 	}
 }
 
+// Service handler returns status with invalid utf8 message.
+func TestStatusInvalidUTF8Message(t *testing.T) {
+	defer leakcheck.Check(t)
+
+	var (
+		origMsg = string([]byte{0xff, 0xfe, 0xfd})
+		wantMsg = "���"
+	)
+
+	ss := &stubServer{
+		emptyCall: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
+			return nil, status.Errorf(codes.Internal, origMsg)
+		},
+	}
+	if err := ss.Start(nil); err != nil {
+		t.Fatalf("Error starting endpoint server: %v", err)
+	}
+	defer ss.Stop()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+
+	if _, err := ss.client.EmptyCall(ctx, &testpb.Empty{}); status.Convert(err).Message() != wantMsg {
+		t.Fatalf("ss.client.EmptyCall(_, _) = _, %v (msg %q); want _, err with msg %q", err, status.Convert(err).Message(), wantMsg)
+	}
+}
+
+// Service handler returns status with details and invalid utf8 message. Proto
+// will fail to marshal the status because of the invalid utf8 message. Details
+// will be dropped when sending.
+func TestStatusInvalidUTF8Details(t *testing.T) {
+	defer leakcheck.Check(t)
+
+	var (
+		origMsg = string([]byte{0xff, 0xfe, 0xfd})
+		wantMsg = "���"
+	)
+
+	ss := &stubServer{
+		emptyCall: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
+			st := status.New(codes.Internal, origMsg)
+			st, err := st.WithDetails(&testpb.Empty{})
+			if err != nil {
+				return nil, err
+			}
+			return nil, st.Err()
+		},
+	}
+	if err := ss.Start(nil); err != nil {
+		t.Fatalf("Error starting endpoint server: %v", err)
+	}
+	defer ss.Stop()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+
+	_, err := ss.client.EmptyCall(ctx, &testpb.Empty{})
+	st := status.Convert(err)
+	if st.Message() != wantMsg {
+		t.Fatalf("ss.client.EmptyCall(_, _) = _, %v (msg %q); want _, err with msg %q", err, st.Message(), wantMsg)
+	}
+	if len(st.Details()) != 0 {
+		// Details should be dropped on the server side.
+		t.Fatalf("RPC status contain details: %v, want no details", st.Details())
+	}
+}
+
 func TestClientDoesntDeadlockWhileWritingErrornousLargeMessages(t *testing.T) {
 	defer leakcheck.Check(t)
 	for _, e := range listTestEnv() {
@@ -6040,3 +6291,337 @@ func testClientDoesntDeadlockWhileWritingErrornousLargeMessages(t *testing.T, e
 	}
 	wg.Wait()
 }
+
+const clientAlwaysFailCredErrorMsg = "clientAlwaysFailCred always fails"
+
+var errClientAlwaysFailCred = errors.New(clientAlwaysFailCredErrorMsg)
+
+type clientAlwaysFailCred struct{}
+
+func (c clientAlwaysFailCred) ClientHandshake(ctx context.Context, addr string, rawConn net.Conn) (net.Conn, credentials.AuthInfo, error) {
+	return nil, nil, errClientAlwaysFailCred
+}
+func (c clientAlwaysFailCred) ServerHandshake(rawConn net.Conn) (net.Conn, credentials.AuthInfo, error) {
+	return rawConn, nil, nil
+}
+func (c clientAlwaysFailCred) Info() credentials.ProtocolInfo {
+	return credentials.ProtocolInfo{}
+}
+func (c clientAlwaysFailCred) Clone() credentials.TransportCredentials {
+	return nil
+}
+func (c clientAlwaysFailCred) OverrideServerName(s string) error {
+	return nil
+}
+
+func TestFailFastRPCErrorOnBadCertificates(t *testing.T) {
+	te := newTest(t, env{name: "bad-cred", network: "tcp", security: "clientAlwaysFailCred", balancer: "round_robin"})
+	te.startServer(&testServer{security: te.e.security})
+	defer te.tearDown()
+
+	opts := []grpc.DialOption{grpc.WithTransportCredentials(clientAlwaysFailCred{})}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	cc, err := grpc.DialContext(ctx, te.srvAddr, opts...)
+	if err != nil {
+		t.Fatalf("Dial(_) = %v, want %v", err, nil)
+	}
+	defer cc.Close()
+
+	tc := testpb.NewTestServiceClient(cc)
+	for i := 0; i < 1000; i++ {
+		// This loop runs for at most 1 second. The first several RPCs will fail
+		// with Unavailable because the connection hasn't started. When the
+		// first connection failed with creds error, the next RPC should also
+		// fail with the expected error.
+		if _, err = tc.EmptyCall(context.Background(), &testpb.Empty{}); strings.Contains(err.Error(), clientAlwaysFailCredErrorMsg) {
+			return
+		}
+		time.Sleep(time.Millisecond)
+	}
+	te.t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want err.Error() contains %q", err, clientAlwaysFailCredErrorMsg)
+}
+
+func TestRPCTimeout(t *testing.T) {
+	defer leakcheck.Check(t)
+	for _, e := range listTestEnv() {
+		testRPCTimeout(t, e)
+	}
+}
+
+func testRPCTimeout(t *testing.T, e env) {
+	te := newTest(t, e)
+	te.startServer(&testServer{security: e.security, unaryCallSleepTime: 500 * time.Millisecond})
+	defer te.tearDown()
+
+	cc := te.clientConn()
+	tc := testpb.NewTestServiceClient(cc)
+
+	const argSize = 2718
+	const respSize = 314
+
+	payload, err := newPayload(testpb.PayloadType_COMPRESSABLE, argSize)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	req := &testpb.SimpleRequest{
+		ResponseType: testpb.PayloadType_COMPRESSABLE,
+		ResponseSize: respSize,
+		Payload:      payload,
+	}
+	for i := -1; i <= 10; i++ {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(i)*time.Millisecond)
+		if _, err := tc.UnaryCall(ctx, req); status.Code(err) != codes.DeadlineExceeded {
+			t.Fatalf("TestService/UnaryCallv(_, _) = _, %v; want <nil>, error code: %s", err, codes.DeadlineExceeded)
+		}
+		cancel()
+	}
+}
+
+func TestDisabledIOBuffers(t *testing.T) {
+	defer leakcheck.Check(t)
+
+	payload, err := newPayload(testpb.PayloadType_COMPRESSABLE, int32(60000))
+	if err != nil {
+		t.Fatalf("Failed to create payload: %v", err)
+	}
+	req := &testpb.StreamingOutputCallRequest{
+		Payload: payload,
+	}
+	resp := &testpb.StreamingOutputCallResponse{
+		Payload: payload,
+	}
+
+	ss := &stubServer{
+		fullDuplexCall: func(stream testpb.TestService_FullDuplexCallServer) error {
+			for {
+				in, err := stream.Recv()
+				if err == io.EOF {
+					return nil
+				}
+				if err != nil {
+					t.Errorf("stream.Recv() = _, %v, want _, <nil>", err)
+					return err
+				}
+				if !reflect.DeepEqual(in.Payload.Body, payload.Body) {
+					t.Errorf("Received message(len: %v) on server not what was expected(len: %v).", len(in.Payload.Body), len(payload.Body))
+					return err
+				}
+				if err := stream.Send(resp); err != nil {
+					t.Errorf("stream.Send(_)= %v, want <nil>", err)
+					return err
+				}
+
+			}
+		},
+	}
+
+	s := grpc.NewServer(grpc.WriteBufferSize(0), grpc.ReadBufferSize(0))
+	testpb.RegisterTestServiceServer(s, ss)
+
+	lis, err := net.Listen("tcp", "localhost:0")
+	if err != nil {
+		t.Fatalf("Failed to create listener: %v", err)
+	}
+
+	done := make(chan struct{})
+	go func() {
+		s.Serve(lis)
+		close(done)
+	}()
+	defer s.Stop()
+	dctx, dcancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer dcancel()
+	cc, err := grpc.DialContext(dctx, lis.Addr().String(), grpc.WithInsecure(), grpc.WithBlock(), grpc.WithWriteBufferSize(0), grpc.WithReadBufferSize(0))
+	if err != nil {
+		t.Fatalf("Failed to dial server")
+	}
+	defer cc.Close()
+	c := testpb.NewTestServiceClient(cc)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	stream, err := c.FullDuplexCall(ctx, grpc.FailFast(false))
+	if err != nil {
+		t.Fatalf("Failed to send test RPC to server")
+	}
+	for i := 0; i < 10; i++ {
+		if err := stream.Send(req); err != nil {
+			t.Fatalf("stream.Send(_) = %v, want <nil>", err)
+		}
+		in, err := stream.Recv()
+		if err != nil {
+			t.Fatalf("stream.Recv() = _, %v, want _, <nil>", err)
+		}
+		if !reflect.DeepEqual(in.Payload.Body, payload.Body) {
+			t.Fatalf("Received message(len: %v) on client not what was expected(len: %v).", len(in.Payload.Body), len(payload.Body))
+		}
+	}
+	stream.CloseSend()
+	if _, err := stream.Recv(); err != io.EOF {
+		t.Fatalf("stream.Recv() = _, %v, want _, io.EOF", err)
+	}
+}
+
+func TestServerMaxHeaderListSizeClientUserViolation(t *testing.T) {
+	defer leakcheck.Check(t)
+	for _, e := range listTestEnv() {
+		if e.httpHandler {
+			continue
+		}
+		testServerMaxHeaderListSizeClientUserViolation(t, e)
+	}
+}
+
+func testServerMaxHeaderListSizeClientUserViolation(t *testing.T, e env) {
+	te := newTest(t, e)
+	te.maxServerHeaderListSize = new(uint32)
+	*te.maxServerHeaderListSize = 216
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+
+	cc := te.clientConn()
+	tc := testpb.NewTestServiceClient(cc)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	metadata.AppendToOutgoingContext(ctx, "oversize", string(make([]byte, 216)))
+	var err error
+	if err = verifyResultWithDelay(func() (bool, error) {
+		if _, err = tc.EmptyCall(ctx, &testpb.Empty{}); err != nil && status.Code(err) == codes.Internal {
+			return true, nil
+		}
+		return false, fmt.Errorf("tc.EmptyCall() = _, err: %v, want _, error code: %v", err, codes.Internal)
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestClientMaxHeaderListSizeServerUserViolation(t *testing.T) {
+	defer leakcheck.Check(t)
+	for _, e := range listTestEnv() {
+		if e.httpHandler == true {
+			continue
+		}
+		testClientMaxHeaderListSizeServerUserViolation(t, e)
+	}
+}
+
+func testClientMaxHeaderListSizeServerUserViolation(t *testing.T, e env) {
+	te := newTest(t, e)
+	te.maxClientHeaderListSize = new(uint32)
+	*te.maxClientHeaderListSize = 1 // any header server sends will violate
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+
+	cc := te.clientConn()
+	tc := testpb.NewTestServiceClient(cc)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	var err error
+	if err = verifyResultWithDelay(func() (bool, error) {
+		if _, err = tc.EmptyCall(ctx, &testpb.Empty{}); err != nil && status.Code(err) == codes.Internal {
+			return true, nil
+		}
+		return false, fmt.Errorf("tc.EmptyCall() = _, err: %v, want _, error code: %v", err, codes.Internal)
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestServerMaxHeaderListSizeClientIntentionalViolation(t *testing.T) {
+	defer leakcheck.Check(t)
+	for _, e := range listTestEnv() {
+		if e.httpHandler == true || e.security == "tls" {
+			continue
+		}
+		testServerMaxHeaderListSizeClientIntentionalViolation(t, e)
+	}
+}
+
+func testServerMaxHeaderListSizeClientIntentionalViolation(t *testing.T, e env) {
+	te := newTest(t, e)
+	te.maxServerHeaderListSize = new(uint32)
+	*te.maxServerHeaderListSize = 512
+	te.startServer(&testServer{security: e.security})
+	defer te.tearDown()
+
+	cc, dw := te.clientConnWithConnControl()
+	tc := &testServiceClientWrapper{TestServiceClient: testpb.NewTestServiceClient(cc)}
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	stream, err := tc.FullDuplexCall(ctx)
+	if err != nil {
+		t.Fatalf("%v.FullDuplexCall(_) = _, %v, want _, <nil>", tc, err)
+	}
+	rcw := dw.getRawConnWrapper()
+	val := make([]string, 512)
+	for i := range val {
+		val[i] = "a"
+	}
+	// allow for client to send the initial header
+	time.Sleep(100 * time.Millisecond)
+	rcw.writeHeaders(http2.HeadersFrameParam{
+		StreamID:      tc.getCurrentStreamID(),
+		BlockFragment: rcw.encodeHeader("oversize", strings.Join(val, "")),
+		EndStream:     false,
+		EndHeaders:    true,
+	})
+	if _, err := stream.Recv(); err == nil || status.Code(err) != codes.Internal {
+		t.Fatalf("stream.Recv() = _, %v, want _, error code: %v", err, codes.Internal)
+	}
+}
+
+func TestClientMaxHeaderListSizeServerIntentionalViolation(t *testing.T) {
+	defer leakcheck.Check(t)
+	for _, e := range listTestEnv() {
+		if e.httpHandler == true || e.security == "tls" {
+			continue
+		}
+		testClientMaxHeaderListSizeServerIntentionalViolation(t, e)
+	}
+}
+
+func testClientMaxHeaderListSizeServerIntentionalViolation(t *testing.T, e env) {
+	te := newTest(t, e)
+	te.maxClientHeaderListSize = new(uint32)
+	*te.maxClientHeaderListSize = 200
+	lw := te.startServerWithConnControl(&testServer{security: e.security, setHeaderOnly: true})
+	defer te.tearDown()
+	cc, _ := te.clientConnWithConnControl()
+	tc := &testServiceClientWrapper{TestServiceClient: testpb.NewTestServiceClient(cc)}
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	stream, err := tc.FullDuplexCall(ctx)
+	if err != nil {
+		t.Fatalf("%v.FullDuplexCall(_) = _, %v, want _, <nil>", tc, err)
+	}
+	var i int
+	var rcw *rawConnWrapper
+	for i = 0; i < 100; i++ {
+		rcw = lw.getLastConn()
+		if rcw != nil {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+		continue
+	}
+	if i == 100 {
+		t.Fatalf("failed to create server transport after 1s")
+	}
+
+	val := make([]string, 200)
+	for i := range val {
+		val[i] = "a"
+	}
+	// allow for client to send the initial header.
+	time.Sleep(100 * time.Millisecond)
+	rcw.writeHeaders(http2.HeadersFrameParam{
+		StreamID:      tc.getCurrentStreamID(),
+		BlockFragment: rcw.encodeHeader("oversize", strings.Join(val, "")),
+		EndStream:     false,
+		EndHeaders:    true,
+	})
+	if _, err := stream.Recv(); err == nil || status.Code(err) != codes.Internal {
+		t.Fatalf("stream.Recv() = _, %v, want _, error code: %v", err, codes.Internal)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/test/gracefulstop_test.go b/vendor/google.golang.org/grpc/test/gracefulstop_test.go
index 7ac12b09..56023585 100644
--- a/vendor/google.golang.org/grpc/test/gracefulstop_test.go
+++ b/vendor/google.golang.org/grpc/test/gracefulstop_test.go
@@ -20,6 +20,7 @@ package test
 
 import (
 	"fmt"
+	"io"
 	"net"
 	"sync"
 	"testing"
@@ -27,7 +28,7 @@ import (
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/test/leakcheck"
+	"google.golang.org/grpc/internal/leakcheck"
 
 	testpb "google.golang.org/grpc/test/grpc_testing"
 )
@@ -50,7 +51,12 @@ func (d *delayListener) Accept() (net.Conn, error) {
 		return nil, fmt.Errorf("listener is closed")
 	default:
 		close(d.acceptCalled)
-		return d.Listener.Accept()
+		conn, err := d.Listener.Accept()
+		// Allow closing of listener only after accept.
+		// Note: Dial can return successfully, yet Accept
+		// might now have finished.
+		d.allowClose()
+		return conn, err
 	}
 }
 
@@ -86,39 +92,19 @@ func (d *delayListener) Dial(to time.Duration) (net.Conn, error) {
 	return d.cc, nil
 }
 
-func (d *delayListener) clientWriteCalledChan() <-chan struct{} {
-	return d.cc.writeCalledChan()
-}
-
 type delayConn struct {
 	net.Conn
-	blockRead   chan struct{}
-	mu          sync.Mutex
-	writeCalled chan struct{}
+	blockRead chan struct{}
 }
 
-func (d *delayConn) writeCalledChan() <-chan struct{} {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-	d.writeCalled = make(chan struct{})
-	return d.writeCalled
-}
 func (d *delayConn) allowRead() {
 	close(d.blockRead)
 }
+
 func (d *delayConn) Read(b []byte) (n int, err error) {
 	<-d.blockRead
 	return d.Conn.Read(b)
 }
-func (d *delayConn) Write(b []byte) (n int, err error) {
-	d.mu.Lock()
-	if d.writeCalled != nil {
-		close(d.writeCalled)
-		d.writeCalled = nil
-	}
-	d.mu.Unlock()
-	return d.Conn.Write(b)
-}
 
 func TestGracefulStop(t *testing.T) {
 	defer leakcheck.Check(t)
@@ -148,10 +134,16 @@ func TestGracefulStop(t *testing.T) {
 		allowCloseCh: make(chan struct{}),
 	}
 	d := func(_ string, to time.Duration) (net.Conn, error) { return dlis.Dial(to) }
+	serverGotReq := make(chan struct{})
 
 	ss := &stubServer{
-		emptyCall: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
-			return &testpb.Empty{}, nil
+		fullDuplexCall: func(stream testpb.TestService_FullDuplexCallServer) error {
+			close(serverGotReq)
+			_, err := stream.Recv()
+			if err != nil {
+				return err
+			}
+			return stream.Send(&testpb.StreamingOutputCallResponse{})
 		},
 	}
 	s := grpc.NewServer()
@@ -182,33 +174,38 @@ func TestGracefulStop(t *testing.T) {
 
 	// Now dial.  The listener's Accept method will return a valid connection,
 	// even though GracefulStop has closed the listener.
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, dialCancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer dialCancel()
 	cc, err := grpc.DialContext(ctx, "", grpc.WithInsecure(), grpc.WithBlock(), grpc.WithDialer(d))
 	if err != nil {
 		t.Fatalf("grpc.Dial(%q) = %v", lis.Addr().String(), err)
 	}
-	cancel()
 	client := testpb.NewTestServiceClient(cc)
 	defer cc.Close()
 
-	dlis.allowClose()
-
-	wcch := dlis.clientWriteCalledChan()
+	// 4. Send an RPC on the new connection.
+	// The server would send a GOAWAY first, but we are delaying the server's
+	// writes for now until the client writes more than the preface.
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	stream, err := client.FullDuplexCall(ctx)
+	if err != nil {
+		t.Fatalf("FullDuplexCall= _, %v; want _, <nil>", err)
+	}
 	go func() {
 		// 5. Allow the client to read the GoAway.  The RPC should complete
 		//    successfully.
-		<-wcch
+		<-serverGotReq
 		dlis.allowClientRead()
 	}()
-
-	// 4. Send an RPC on the new connection.
-	// The server would send a GOAWAY first, but we are delaying the server's
-	// writes for now until the client writes more than the preface.
-	ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
-	if _, err := client.EmptyCall(ctx, &testpb.Empty{}); err != nil {
-		t.Fatalf("EmptyCall() = %v; want <nil>", err)
+	if err := stream.Send(&testpb.StreamingOutputCallRequest{}); err != nil {
+		t.Fatalf("stream.Send(_) = %v, want <nil>", err)
+	}
+	if _, err := stream.Recv(); err != nil {
+		t.Fatalf("stream.Recv() = _, %v, want _, <nil>", err)
+	}
+	if _, err := stream.Recv(); err != io.EOF {
+		t.Fatalf("stream.Recv() = _, %v, want _, io.EOF", err)
 	}
-
 	// 5. happens above, then we finish the call.
 	cancel()
 	wg.Wait()
diff --git a/vendor/google.golang.org/grpc/test/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/test/grpc_testing/test.pb.go
index ab48a152..871f7cc9 100644
--- a/vendor/google.golang.org/grpc/test/grpc_testing/test.pb.go
+++ b/vendor/google.golang.org/grpc/test/grpc_testing/test.pb.go
@@ -1,23 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: grpc_testing/test.proto
 
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	grpc_testing/test.proto
-
-It has these top-level messages:
-	Empty
-	Payload
-	SimpleRequest
-	SimpleResponse
-	StreamingInputCallRequest
-	StreamingInputCallResponse
-	ResponseParameters
-	StreamingOutputCallRequest
-	StreamingOutputCallResponse
-*/
 package grpc_testing
 
 import proto "github.com/golang/protobuf/proto"
@@ -66,28 +49,74 @@ var PayloadType_value = map[string]int32{
 func (x PayloadType) String() string {
 	return proto.EnumName(PayloadType_name, int32(x))
 }
-func (PayloadType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (PayloadType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{0}
+}
 
 type Empty struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Empty) Reset()                    { *m = Empty{} }
-func (m *Empty) String() string            { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()               {}
-func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *Empty) Reset()         { *m = Empty{} }
+func (m *Empty) String() string { return proto.CompactTextString(m) }
+func (*Empty) ProtoMessage()    {}
+func (*Empty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{0}
+}
+func (m *Empty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Empty.Unmarshal(m, b)
+}
+func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Empty.Marshal(b, m, deterministic)
+}
+func (dst *Empty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Empty.Merge(dst, src)
+}
+func (m *Empty) XXX_Size() int {
+	return xxx_messageInfo_Empty.Size(m)
+}
+func (m *Empty) XXX_DiscardUnknown() {
+	xxx_messageInfo_Empty.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Empty proto.InternalMessageInfo
 
 // A block of data, to simply increase gRPC message size.
 type Payload struct {
 	// The type of data in body.
-	Type PayloadType `protobuf:"varint,1,opt,name=type,enum=grpc.testing.PayloadType" json:"type,omitempty"`
+	Type PayloadType `protobuf:"varint,1,opt,name=type,proto3,enum=grpc.testing.PayloadType" json:"type,omitempty"`
 	// Primary contents of payload.
-	Body []byte `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	Body                 []byte   `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Payload) Reset()                    { *m = Payload{} }
-func (m *Payload) String() string            { return proto.CompactTextString(m) }
-func (*Payload) ProtoMessage()               {}
-func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *Payload) Reset()         { *m = Payload{} }
+func (m *Payload) String() string { return proto.CompactTextString(m) }
+func (*Payload) ProtoMessage()    {}
+func (*Payload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{1}
+}
+func (m *Payload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Payload.Unmarshal(m, b)
+}
+func (m *Payload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Payload.Marshal(b, m, deterministic)
+}
+func (dst *Payload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Payload.Merge(dst, src)
+}
+func (m *Payload) XXX_Size() int {
+	return xxx_messageInfo_Payload.Size(m)
+}
+func (m *Payload) XXX_DiscardUnknown() {
+	xxx_messageInfo_Payload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Payload proto.InternalMessageInfo
 
 func (m *Payload) GetType() PayloadType {
 	if m != nil {
@@ -107,22 +136,44 @@ func (m *Payload) GetBody() []byte {
 type SimpleRequest struct {
 	// Desired payload type in the response from the server.
 	// If response_type is RANDOM, server randomly chooses one from other formats.
-	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
+	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,proto3,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
 	// Desired payload size in the response from the server.
 	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	ResponseSize int32 `protobuf:"varint,2,opt,name=response_size,json=responseSize" json:"response_size,omitempty"`
+	ResponseSize int32 `protobuf:"varint,2,opt,name=response_size,json=responseSize,proto3" json:"response_size,omitempty"`
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	Payload *Payload `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Whether SimpleResponse should include username.
-	FillUsername bool `protobuf:"varint,4,opt,name=fill_username,json=fillUsername" json:"fill_username,omitempty"`
+	FillUsername bool `protobuf:"varint,4,opt,name=fill_username,json=fillUsername,proto3" json:"fill_username,omitempty"`
 	// Whether SimpleResponse should include OAuth scope.
-	FillOauthScope bool `protobuf:"varint,5,opt,name=fill_oauth_scope,json=fillOauthScope" json:"fill_oauth_scope,omitempty"`
+	FillOauthScope       bool     `protobuf:"varint,5,opt,name=fill_oauth_scope,json=fillOauthScope,proto3" json:"fill_oauth_scope,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SimpleRequest) Reset()                    { *m = SimpleRequest{} }
-func (m *SimpleRequest) String() string            { return proto.CompactTextString(m) }
-func (*SimpleRequest) ProtoMessage()               {}
-func (*SimpleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
+func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
+func (*SimpleRequest) ProtoMessage()    {}
+func (*SimpleRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{2}
+}
+func (m *SimpleRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleRequest.Unmarshal(m, b)
+}
+func (m *SimpleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleRequest.Marshal(b, m, deterministic)
+}
+func (dst *SimpleRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleRequest.Merge(dst, src)
+}
+func (m *SimpleRequest) XXX_Size() int {
+	return xxx_messageInfo_SimpleRequest.Size(m)
+}
+func (m *SimpleRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SimpleRequest proto.InternalMessageInfo
 
 func (m *SimpleRequest) GetResponseType() PayloadType {
 	if m != nil {
@@ -162,18 +213,40 @@ func (m *SimpleRequest) GetFillOauthScope() bool {
 // Unary response, as configured by the request.
 type SimpleResponse struct {
 	// Payload to increase message size.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
 	// The user the request came from, for verifying authentication was
 	// successful when the client expected it.
-	Username string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
 	// OAuth scope.
-	OauthScope string `protobuf:"bytes,3,opt,name=oauth_scope,json=oauthScope" json:"oauth_scope,omitempty"`
+	OauthScope           string   `protobuf:"bytes,3,opt,name=oauth_scope,json=oauthScope,proto3" json:"oauth_scope,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
+func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
+func (*SimpleResponse) ProtoMessage()    {}
+func (*SimpleResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{3}
+}
+func (m *SimpleResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SimpleResponse.Unmarshal(m, b)
+}
+func (m *SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SimpleResponse.Marshal(b, m, deterministic)
+}
+func (dst *SimpleResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SimpleResponse.Merge(dst, src)
+}
+func (m *SimpleResponse) XXX_Size() int {
+	return xxx_messageInfo_SimpleResponse.Size(m)
+}
+func (m *SimpleResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_SimpleResponse.DiscardUnknown(m)
 }
 
-func (m *SimpleResponse) Reset()                    { *m = SimpleResponse{} }
-func (m *SimpleResponse) String() string            { return proto.CompactTextString(m) }
-func (*SimpleResponse) ProtoMessage()               {}
-func (*SimpleResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+var xxx_messageInfo_SimpleResponse proto.InternalMessageInfo
 
 func (m *SimpleResponse) GetPayload() *Payload {
 	if m != nil {
@@ -199,13 +272,35 @@ func (m *SimpleResponse) GetOauthScope() string {
 // Client-streaming request.
 type StreamingInputCallRequest struct {
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload              *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingInputCallRequest) Reset()         { *m = StreamingInputCallRequest{} }
+func (m *StreamingInputCallRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingInputCallRequest) ProtoMessage()    {}
+func (*StreamingInputCallRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{4}
+}
+func (m *StreamingInputCallRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingInputCallRequest.Unmarshal(m, b)
+}
+func (m *StreamingInputCallRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingInputCallRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingInputCallRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingInputCallRequest.Merge(dst, src)
+}
+func (m *StreamingInputCallRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingInputCallRequest.Size(m)
+}
+func (m *StreamingInputCallRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingInputCallRequest.DiscardUnknown(m)
 }
 
-func (m *StreamingInputCallRequest) Reset()                    { *m = StreamingInputCallRequest{} }
-func (m *StreamingInputCallRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingInputCallRequest) ProtoMessage()               {}
-func (*StreamingInputCallRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+var xxx_messageInfo_StreamingInputCallRequest proto.InternalMessageInfo
 
 func (m *StreamingInputCallRequest) GetPayload() *Payload {
 	if m != nil {
@@ -217,13 +312,35 @@ func (m *StreamingInputCallRequest) GetPayload() *Payload {
 // Client-streaming response.
 type StreamingInputCallResponse struct {
 	// Aggregated size of payloads received from the client.
-	AggregatedPayloadSize int32 `protobuf:"varint,1,opt,name=aggregated_payload_size,json=aggregatedPayloadSize" json:"aggregated_payload_size,omitempty"`
+	AggregatedPayloadSize int32    `protobuf:"varint,1,opt,name=aggregated_payload_size,json=aggregatedPayloadSize,proto3" json:"aggregated_payload_size,omitempty"`
+	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
+	XXX_unrecognized      []byte   `json:"-"`
+	XXX_sizecache         int32    `json:"-"`
 }
 
-func (m *StreamingInputCallResponse) Reset()                    { *m = StreamingInputCallResponse{} }
-func (m *StreamingInputCallResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingInputCallResponse) ProtoMessage()               {}
-func (*StreamingInputCallResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (m *StreamingInputCallResponse) Reset()         { *m = StreamingInputCallResponse{} }
+func (m *StreamingInputCallResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingInputCallResponse) ProtoMessage()    {}
+func (*StreamingInputCallResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{5}
+}
+func (m *StreamingInputCallResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingInputCallResponse.Unmarshal(m, b)
+}
+func (m *StreamingInputCallResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingInputCallResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingInputCallResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingInputCallResponse.Merge(dst, src)
+}
+func (m *StreamingInputCallResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingInputCallResponse.Size(m)
+}
+func (m *StreamingInputCallResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingInputCallResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingInputCallResponse proto.InternalMessageInfo
 
 func (m *StreamingInputCallResponse) GetAggregatedPayloadSize() int32 {
 	if m != nil {
@@ -236,16 +353,38 @@ func (m *StreamingInputCallResponse) GetAggregatedPayloadSize() int32 {
 type ResponseParameters struct {
 	// Desired payload sizes in responses from the server.
 	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	Size int32 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"`
+	Size int32 `protobuf:"varint,1,opt,name=size,proto3" json:"size,omitempty"`
 	// Desired interval between consecutive responses in the response stream in
 	// microseconds.
-	IntervalUs int32 `protobuf:"varint,2,opt,name=interval_us,json=intervalUs" json:"interval_us,omitempty"`
+	IntervalUs           int32    `protobuf:"varint,2,opt,name=interval_us,json=intervalUs,proto3" json:"interval_us,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ResponseParameters) Reset()         { *m = ResponseParameters{} }
+func (m *ResponseParameters) String() string { return proto.CompactTextString(m) }
+func (*ResponseParameters) ProtoMessage()    {}
+func (*ResponseParameters) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{6}
+}
+func (m *ResponseParameters) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ResponseParameters.Unmarshal(m, b)
+}
+func (m *ResponseParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ResponseParameters.Marshal(b, m, deterministic)
+}
+func (dst *ResponseParameters) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ResponseParameters.Merge(dst, src)
+}
+func (m *ResponseParameters) XXX_Size() int {
+	return xxx_messageInfo_ResponseParameters.Size(m)
+}
+func (m *ResponseParameters) XXX_DiscardUnknown() {
+	xxx_messageInfo_ResponseParameters.DiscardUnknown(m)
 }
 
-func (m *ResponseParameters) Reset()                    { *m = ResponseParameters{} }
-func (m *ResponseParameters) String() string            { return proto.CompactTextString(m) }
-func (*ResponseParameters) ProtoMessage()               {}
-func (*ResponseParameters) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+var xxx_messageInfo_ResponseParameters proto.InternalMessageInfo
 
 func (m *ResponseParameters) GetSize() int32 {
 	if m != nil {
@@ -267,17 +406,39 @@ type StreamingOutputCallRequest struct {
 	// If response_type is RANDOM, the payload from each response in the stream
 	// might be of different types. This is to simulate a mixed type of payload
 	// stream.
-	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
+	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,json=responseType,proto3,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
 	// Configuration for each expected response message.
-	ResponseParameters []*ResponseParameters `protobuf:"bytes,2,rep,name=response_parameters,json=responseParameters" json:"response_parameters,omitempty"`
+	ResponseParameters []*ResponseParameters `protobuf:"bytes,2,rep,name=response_parameters,json=responseParameters,proto3" json:"response_parameters,omitempty"`
 	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
+	Payload              *Payload `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *StreamingOutputCallRequest) Reset()                    { *m = StreamingOutputCallRequest{} }
-func (m *StreamingOutputCallRequest) String() string            { return proto.CompactTextString(m) }
-func (*StreamingOutputCallRequest) ProtoMessage()               {}
-func (*StreamingOutputCallRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (m *StreamingOutputCallRequest) Reset()         { *m = StreamingOutputCallRequest{} }
+func (m *StreamingOutputCallRequest) String() string { return proto.CompactTextString(m) }
+func (*StreamingOutputCallRequest) ProtoMessage()    {}
+func (*StreamingOutputCallRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{7}
+}
+func (m *StreamingOutputCallRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingOutputCallRequest.Unmarshal(m, b)
+}
+func (m *StreamingOutputCallRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingOutputCallRequest.Marshal(b, m, deterministic)
+}
+func (dst *StreamingOutputCallRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingOutputCallRequest.Merge(dst, src)
+}
+func (m *StreamingOutputCallRequest) XXX_Size() int {
+	return xxx_messageInfo_StreamingOutputCallRequest.Size(m)
+}
+func (m *StreamingOutputCallRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingOutputCallRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StreamingOutputCallRequest proto.InternalMessageInfo
 
 func (m *StreamingOutputCallRequest) GetResponseType() PayloadType {
 	if m != nil {
@@ -303,13 +464,35 @@ func (m *StreamingOutputCallRequest) GetPayload() *Payload {
 // Server-streaming response, as configured by the request and parameters.
 type StreamingOutputCallResponse struct {
 	// Payload to increase response size.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
+	Payload              *Payload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *StreamingOutputCallResponse) Reset()         { *m = StreamingOutputCallResponse{} }
+func (m *StreamingOutputCallResponse) String() string { return proto.CompactTextString(m) }
+func (*StreamingOutputCallResponse) ProtoMessage()    {}
+func (*StreamingOutputCallResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_c9f6c5af4267cb88, []int{8}
+}
+func (m *StreamingOutputCallResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StreamingOutputCallResponse.Unmarshal(m, b)
+}
+func (m *StreamingOutputCallResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StreamingOutputCallResponse.Marshal(b, m, deterministic)
+}
+func (dst *StreamingOutputCallResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StreamingOutputCallResponse.Merge(dst, src)
+}
+func (m *StreamingOutputCallResponse) XXX_Size() int {
+	return xxx_messageInfo_StreamingOutputCallResponse.Size(m)
+}
+func (m *StreamingOutputCallResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_StreamingOutputCallResponse.DiscardUnknown(m)
 }
 
-func (m *StreamingOutputCallResponse) Reset()                    { *m = StreamingOutputCallResponse{} }
-func (m *StreamingOutputCallResponse) String() string            { return proto.CompactTextString(m) }
-func (*StreamingOutputCallResponse) ProtoMessage()               {}
-func (*StreamingOutputCallResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+var xxx_messageInfo_StreamingOutputCallResponse proto.InternalMessageInfo
 
 func (m *StreamingOutputCallResponse) GetPayload() *Payload {
 	if m != nil {
@@ -339,8 +522,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for TestService service
-
+// TestServiceClient is the client API for TestService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type TestServiceClient interface {
 	// One empty request followed by one empty response.
 	EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error)
@@ -374,7 +558,7 @@ func NewTestServiceClient(cc *grpc.ClientConn) TestServiceClient {
 
 func (c *testServiceClient) EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
 	out := new(Empty)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/EmptyCall", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.TestService/EmptyCall", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -383,7 +567,7 @@ func (c *testServiceClient) EmptyCall(ctx context.Context, in *Empty, opts ...gr
 
 func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
 	out := new(SimpleResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -391,7 +575,7 @@ func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, op
 }
 
 func (c *testServiceClient) StreamingOutputCall(ctx context.Context, in *StreamingOutputCallRequest, opts ...grpc.CallOption) (TestService_StreamingOutputCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[0], c.cc, "/grpc.testing.TestService/StreamingOutputCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[0], "/grpc.testing.TestService/StreamingOutputCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -423,7 +607,7 @@ func (x *testServiceStreamingOutputCallClient) Recv() (*StreamingOutputCallRespo
 }
 
 func (c *testServiceClient) StreamingInputCall(ctx context.Context, opts ...grpc.CallOption) (TestService_StreamingInputCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[1], c.cc, "/grpc.testing.TestService/StreamingInputCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[1], "/grpc.testing.TestService/StreamingInputCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -457,7 +641,7 @@ func (x *testServiceStreamingInputCallClient) CloseAndRecv() (*StreamingInputCal
 }
 
 func (c *testServiceClient) FullDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_FullDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[2], c.cc, "/grpc.testing.TestService/FullDuplexCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[2], "/grpc.testing.TestService/FullDuplexCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -488,7 +672,7 @@ func (x *testServiceFullDuplexCallClient) Recv() (*StreamingOutputCallResponse,
 }
 
 func (c *testServiceClient) HalfDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_HalfDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[3], c.cc, "/grpc.testing.TestService/HalfDuplexCall", opts...)
+	stream, err := c.cc.NewStream(ctx, &_TestService_serviceDesc.Streams[3], "/grpc.testing.TestService/HalfDuplexCall", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -518,8 +702,7 @@ func (x *testServiceHalfDuplexCallClient) Recv() (*StreamingOutputCallResponse,
 	return m, nil
 }
 
-// Server API for TestService service
-
+// TestServiceServer is the server API for TestService service.
 type TestServiceServer interface {
 	// One empty request followed by one empty response.
 	EmptyCall(context.Context, *Empty) (*Empty, error)
@@ -722,9 +905,9 @@ var _TestService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "grpc_testing/test.proto",
 }
 
-func init() { proto.RegisterFile("grpc_testing/test.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("grpc_testing/test.proto", fileDescriptor_test_c9f6c5af4267cb88) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_test_c9f6c5af4267cb88 = []byte{
 	// 587 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xdb, 0x6e, 0xd3, 0x40,
 	0x10, 0x65, 0xdb, 0xf4, 0x36, 0x49, 0xad, 0x68, 0xab, 0xaa, 0xae, 0x8b, 0x84, 0x65, 0x1e, 0x30,
diff --git a/vendor/google.golang.org/grpc/test/rawConnWrapper.go b/vendor/google.golang.org/grpc/test/rawConnWrapper.go
new file mode 100644
index 00000000..8d4ee020
--- /dev/null
+++ b/vendor/google.golang.org/grpc/test/rawConnWrapper.go
@@ -0,0 +1,345 @@
+/*
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package test
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"net"
+	"strings"
+	"sync"
+	"time"
+
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
+)
+
+type listenerWrapper struct {
+	net.Listener
+	mu  sync.Mutex
+	rcw *rawConnWrapper
+}
+
+func listenWithConnControl(network, address string) (net.Listener, error) {
+	l, err := net.Listen(network, address)
+	if err != nil {
+		return nil, err
+	}
+	return &listenerWrapper{Listener: l}, nil
+}
+
+// Accept blocks until Dial is called, then returns a net.Conn for the server
+// half of the connection.
+func (l *listenerWrapper) Accept() (net.Conn, error) {
+	c, err := l.Listener.Accept()
+	if err != nil {
+		return nil, err
+	}
+	l.mu.Lock()
+	l.rcw = newRawConnWrapperFromConn(c)
+	l.mu.Unlock()
+	return c, nil
+}
+
+func (l *listenerWrapper) getLastConn() *rawConnWrapper {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+	return l.rcw
+}
+
+type dialerWrapper struct {
+	c   net.Conn
+	rcw *rawConnWrapper
+}
+
+func (d *dialerWrapper) dialer(target string, t time.Duration) (net.Conn, error) {
+	c, err := net.DialTimeout("tcp", target, t)
+	d.c = c
+	d.rcw = newRawConnWrapperFromConn(c)
+	return c, err
+}
+
+func (d *dialerWrapper) getRawConnWrapper() *rawConnWrapper {
+	return d.rcw
+}
+
+type rawConnWrapper struct {
+	cc io.ReadWriteCloser
+	fr *http2.Framer
+
+	// writing headers:
+	headerBuf bytes.Buffer
+	hpackEnc  *hpack.Encoder
+
+	// reading frames:
+	frc       chan http2.Frame
+	frErrc    chan error
+	readTimer *time.Timer
+}
+
+func newRawConnWrapperFromConn(cc io.ReadWriteCloser) *rawConnWrapper {
+	rcw := &rawConnWrapper{
+		cc:     cc,
+		frc:    make(chan http2.Frame, 1),
+		frErrc: make(chan error, 1),
+	}
+	rcw.hpackEnc = hpack.NewEncoder(&rcw.headerBuf)
+	rcw.fr = http2.NewFramer(cc, cc)
+	rcw.fr.ReadMetaHeaders = hpack.NewDecoder(4096 /*initialHeaderTableSize*/, nil)
+
+	return rcw
+}
+
+func (rcw *rawConnWrapper) Close() error {
+	return rcw.cc.Close()
+}
+
+func (rcw *rawConnWrapper) readFrame() (http2.Frame, error) {
+	go func() {
+		fr, err := rcw.fr.ReadFrame()
+		if err != nil {
+			rcw.frErrc <- err
+		} else {
+			rcw.frc <- fr
+		}
+	}()
+	t := time.NewTimer(2 * time.Second)
+	defer t.Stop()
+	select {
+	case f := <-rcw.frc:
+		return f, nil
+	case err := <-rcw.frErrc:
+		return nil, err
+	case <-t.C:
+		return nil, fmt.Errorf("timeout waiting for frame")
+	}
+}
+
+// greet initiates the client's HTTP/2 connection into a state where
+// frames may be sent.
+func (rcw *rawConnWrapper) greet() error {
+	rcw.writePreface()
+	rcw.writeInitialSettings()
+	rcw.wantSettings()
+	rcw.writeSettingsAck()
+	for {
+		f, err := rcw.readFrame()
+		if err != nil {
+			return err
+		}
+		switch f := f.(type) {
+		case *http2.WindowUpdateFrame:
+			// grpc's transport/http2_server sends this
+			// before the settings ack. The Go http2
+			// server uses a setting instead.
+		case *http2.SettingsFrame:
+			if f.IsAck() {
+				return nil
+			}
+			return fmt.Errorf("during greet, got non-ACK settings frame")
+		default:
+			return fmt.Errorf("during greet, unexpected frame type %T", f)
+		}
+	}
+}
+
+func (rcw *rawConnWrapper) writePreface() error {
+	n, err := rcw.cc.Write([]byte(http2.ClientPreface))
+	if err != nil {
+		return fmt.Errorf("Error writing client preface: %v", err)
+	}
+	if n != len(http2.ClientPreface) {
+		return fmt.Errorf("Writing client preface, wrote %d bytes; want %d", n, len(http2.ClientPreface))
+	}
+	return nil
+}
+
+func (rcw *rawConnWrapper) writeInitialSettings() error {
+	if err := rcw.fr.WriteSettings(); err != nil {
+		return fmt.Errorf("Error writing initial SETTINGS frame from client to server: %v", err)
+	}
+	return nil
+}
+
+func (rcw *rawConnWrapper) writeSettingsAck() error {
+	if err := rcw.fr.WriteSettingsAck(); err != nil {
+		return fmt.Errorf("Error writing ACK of server's SETTINGS: %v", err)
+	}
+	return nil
+}
+
+func (rcw *rawConnWrapper) wantSettings() (*http2.SettingsFrame, error) {
+	f, err := rcw.readFrame()
+	if err != nil {
+		return nil, fmt.Errorf("Error while expecting a SETTINGS frame: %v", err)
+	}
+	sf, ok := f.(*http2.SettingsFrame)
+	if !ok {
+		return nil, fmt.Errorf("got a %T; want *SettingsFrame", f)
+	}
+	return sf, nil
+}
+
+func (rcw *rawConnWrapper) wantSettingsAck() error {
+	f, err := rcw.readFrame()
+	if err != nil {
+		return err
+	}
+	sf, ok := f.(*http2.SettingsFrame)
+	if !ok {
+		return fmt.Errorf("Wanting a settings ACK, received a %T", f)
+	}
+	if !sf.IsAck() {
+		return fmt.Errorf("Settings Frame didn't have ACK set")
+	}
+	return nil
+}
+
+// wait for any activity from the server
+func (rcw *rawConnWrapper) wantAnyFrame() (http2.Frame, error) {
+	f, err := rcw.fr.ReadFrame()
+	if err != nil {
+		return nil, err
+	}
+	return f, nil
+}
+
+func (rcw *rawConnWrapper) encodeHeaderField(k, v string) error {
+	err := rcw.hpackEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
+	if err != nil {
+		return fmt.Errorf("HPACK encoding error for %q/%q: %v", k, v, err)
+	}
+	return nil
+}
+
+// encodeHeader encodes headers and returns their HPACK bytes. headers
+// must contain an even number of key/value pairs.  There may be
+// multiple pairs for keys (e.g. "cookie").  The :method, :path, and
+// :scheme headers default to GET, / and https.
+func (rcw *rawConnWrapper) encodeHeader(headers ...string) []byte {
+	if len(headers)%2 == 1 {
+		panic("odd number of kv args")
+	}
+
+	rcw.headerBuf.Reset()
+
+	if len(headers) == 0 {
+		// Fast path, mostly for benchmarks, so test code doesn't pollute
+		// profiles when we're looking to improve server allocations.
+		rcw.encodeHeaderField(":method", "GET")
+		rcw.encodeHeaderField(":path", "/")
+		rcw.encodeHeaderField(":scheme", "https")
+		return rcw.headerBuf.Bytes()
+	}
+
+	if len(headers) == 2 && headers[0] == ":method" {
+		// Another fast path for benchmarks.
+		rcw.encodeHeaderField(":method", headers[1])
+		rcw.encodeHeaderField(":path", "/")
+		rcw.encodeHeaderField(":scheme", "https")
+		return rcw.headerBuf.Bytes()
+	}
+
+	pseudoCount := map[string]int{}
+	keys := []string{":method", ":path", ":scheme"}
+	vals := map[string][]string{
+		":method": {"GET"},
+		":path":   {"/"},
+		":scheme": {"https"},
+	}
+	for len(headers) > 0 {
+		k, v := headers[0], headers[1]
+		headers = headers[2:]
+		if _, ok := vals[k]; !ok {
+			keys = append(keys, k)
+		}
+		if strings.HasPrefix(k, ":") {
+			pseudoCount[k]++
+			if pseudoCount[k] == 1 {
+				vals[k] = []string{v}
+			} else {
+				// Allows testing of invalid headers w/ dup pseudo fields.
+				vals[k] = append(vals[k], v)
+			}
+		} else {
+			vals[k] = append(vals[k], v)
+		}
+	}
+	for _, k := range keys {
+		for _, v := range vals[k] {
+			rcw.encodeHeaderField(k, v)
+		}
+	}
+	return rcw.headerBuf.Bytes()
+}
+
+func (rcw *rawConnWrapper) writeHeadersGRPC(streamID uint32, path string) {
+	rcw.writeHeaders(http2.HeadersFrameParam{
+		StreamID: streamID,
+		BlockFragment: rcw.encodeHeader(
+			":method", "POST",
+			":path", path,
+			"content-type", "application/grpc",
+			"te", "trailers",
+		),
+		EndStream:  false,
+		EndHeaders: true,
+	})
+}
+
+func (rcw *rawConnWrapper) writeHeaders(p http2.HeadersFrameParam) error {
+	if err := rcw.fr.WriteHeaders(p); err != nil {
+		return fmt.Errorf("Error writing HEADERS: %v", err)
+	}
+	return nil
+}
+
+func (rcw *rawConnWrapper) writeData(streamID uint32, endStream bool, data []byte) error {
+	if err := rcw.fr.WriteData(streamID, endStream, data); err != nil {
+		return fmt.Errorf("Error writing DATA: %v", err)
+	}
+	return nil
+}
+
+func (rcw *rawConnWrapper) writeRSTStream(streamID uint32, code http2.ErrCode) error {
+	if err := rcw.fr.WriteRSTStream(streamID, code); err != nil {
+		return fmt.Errorf("Error writing RST_STREAM: %v", err)
+	}
+	return nil
+}
+
+func (rcw *rawConnWrapper) writeDataPadded(streamID uint32, endStream bool, data, padding []byte) error {
+	if err := rcw.fr.WriteDataPadded(streamID, endStream, data, padding); err != nil {
+		return fmt.Errorf("Error writing DATA with padding: %v", err)
+	}
+	return nil
+}
+
+func (rcw *rawConnWrapper) writeGoAway(maxStreamID uint32, code http2.ErrCode, debugData []byte) error {
+	if err := rcw.fr.WriteGoAway(maxStreamID, code, debugData); err != nil {
+		return fmt.Errorf("Error writing GoAway: %v", err)
+	}
+	return nil
+}
+
+func (rcw *rawConnWrapper) writeRawFrame(t http2.FrameType, flags http2.Flags, streamID uint32, payload []byte) error {
+	if err := rcw.fr.WriteRawFrame(t, flags, streamID, payload); err != nil {
+		return fmt.Errorf("Error writing Raw Frame: %v", err)
+	}
+	return nil
+}
diff --git a/vendor/google.golang.org/grpc/test/retry_test.go b/vendor/google.golang.org/grpc/test/retry_test.go
new file mode 100644
index 00000000..c53b66db
--- /dev/null
+++ b/vendor/google.golang.org/grpc/test/retry_test.go
@@ -0,0 +1,551 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package test
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"reflect"
+	"strconv"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/internal/envconfig"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+	testpb "google.golang.org/grpc/test/grpc_testing"
+)
+
+func enableRetry() func() {
+	old := envconfig.Retry
+	envconfig.Retry = true
+	return func() { envconfig.Retry = old }
+}
+
+func TestRetryUnary(t *testing.T) {
+	defer enableRetry()()
+	i := -1
+	ss := &stubServer{
+		emptyCall: func(context.Context, *testpb.Empty) (*testpb.Empty, error) {
+			i++
+			switch i {
+			case 0, 2, 5:
+				return &testpb.Empty{}, nil
+			case 6, 8, 11:
+				return nil, status.New(codes.Internal, "non-retryable error").Err()
+			}
+			return nil, status.New(codes.AlreadyExists, "retryable error").Err()
+		},
+	}
+	if err := ss.Start([]grpc.ServerOption{}); err != nil {
+		t.Fatalf("Error starting endpoint server: %v", err)
+	}
+	defer ss.Stop()
+	ss.r.NewServiceConfig(`{
+    "methodConfig": [{
+      "name": [{"service": "grpc.testing.TestService"}],
+      "waitForReady": true,
+      "retryPolicy": {
+        "MaxAttempts": 4,
+        "InitialBackoff": ".01s",
+        "MaxBackoff": ".01s",
+        "BackoffMultiplier": 1.0,
+        "RetryableStatusCodes": [ "ALREADY_EXISTS" ]
+      }
+    }]}`)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	for {
+		if ctx.Err() != nil {
+			t.Fatalf("Timed out waiting for service config update")
+		}
+		if ss.cc.GetMethodConfig("/grpc.testing.TestService/EmptyCall").WaitForReady != nil {
+			break
+		}
+		time.Sleep(time.Millisecond)
+	}
+	cancel()
+
+	testCases := []struct {
+		code  codes.Code
+		count int
+	}{
+		{codes.OK, 0},
+		{codes.OK, 2},
+		{codes.OK, 5},
+		{codes.Internal, 6},
+		{codes.Internal, 8},
+		{codes.Internal, 11},
+		{codes.AlreadyExists, 15},
+	}
+	for _, tc := range testCases {
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		_, err := ss.client.EmptyCall(ctx, &testpb.Empty{})
+		cancel()
+		if status.Code(err) != tc.code {
+			t.Fatalf("EmptyCall(_, _) = _, %v; want _, <Code() = %v>", err, tc.code)
+		}
+		if i != tc.count {
+			t.Fatalf("i = %v; want %v", i, tc.count)
+		}
+	}
+}
+
+func TestRetryDisabledByDefault(t *testing.T) {
+	if strings.EqualFold(os.Getenv("GRPC_GO_RETRY"), "on") {
+		return
+	}
+	i := -1
+	ss := &stubServer{
+		emptyCall: func(context.Context, *testpb.Empty) (*testpb.Empty, error) {
+			i++
+			switch i {
+			case 0:
+				return nil, status.New(codes.AlreadyExists, "retryable error").Err()
+			}
+			return &testpb.Empty{}, nil
+		},
+	}
+	if err := ss.Start([]grpc.ServerOption{}); err != nil {
+		t.Fatalf("Error starting endpoint server: %v", err)
+	}
+	defer ss.Stop()
+	ss.r.NewServiceConfig(`{
+    "methodConfig": [{
+      "name": [{"service": "grpc.testing.TestService"}],
+      "waitForReady": true,
+      "retryPolicy": {
+        "MaxAttempts": 4,
+        "InitialBackoff": ".01s",
+        "MaxBackoff": ".01s",
+        "BackoffMultiplier": 1.0,
+        "RetryableStatusCodes": [ "ALREADY_EXISTS" ]
+      }
+    }]}`)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	for {
+		if ctx.Err() != nil {
+			t.Fatalf("Timed out waiting for service config update")
+		}
+		if ss.cc.GetMethodConfig("/grpc.testing.TestService/EmptyCall").WaitForReady != nil {
+			break
+		}
+		time.Sleep(time.Millisecond)
+	}
+	cancel()
+
+	testCases := []struct {
+		code  codes.Code
+		count int
+	}{
+		{codes.AlreadyExists, 0},
+	}
+	for _, tc := range testCases {
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		_, err := ss.client.EmptyCall(ctx, &testpb.Empty{})
+		cancel()
+		if status.Code(err) != tc.code {
+			t.Fatalf("EmptyCall(_, _) = _, %v; want _, <Code() = %v>", err, tc.code)
+		}
+		if i != tc.count {
+			t.Fatalf("i = %v; want %v", i, tc.count)
+		}
+	}
+}
+
+func TestRetryThrottling(t *testing.T) {
+	defer enableRetry()()
+	i := -1
+	ss := &stubServer{
+		emptyCall: func(context.Context, *testpb.Empty) (*testpb.Empty, error) {
+			i++
+			switch i {
+			case 0, 3, 6, 10, 11, 12, 13, 14, 16, 18:
+				return &testpb.Empty{}, nil
+			}
+			return nil, status.New(codes.Unavailable, "retryable error").Err()
+		},
+	}
+	if err := ss.Start([]grpc.ServerOption{}); err != nil {
+		t.Fatalf("Error starting endpoint server: %v", err)
+	}
+	defer ss.Stop()
+	ss.r.NewServiceConfig(`{
+    "methodConfig": [{
+      "name": [{"service": "grpc.testing.TestService"}],
+      "waitForReady": true,
+      "retryPolicy": {
+        "MaxAttempts": 4,
+        "InitialBackoff": ".01s",
+        "MaxBackoff": ".01s",
+        "BackoffMultiplier": 1.0,
+        "RetryableStatusCodes": [ "UNAVAILABLE" ]
+      }
+    }],
+    "retryThrottling": {
+      "maxTokens": 10,
+      "tokenRatio": 0.5
+    }
+  }`)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	for {
+		if ctx.Err() != nil {
+			t.Fatalf("Timed out waiting for service config update")
+		}
+		if ss.cc.GetMethodConfig("/grpc.testing.TestService/EmptyCall").WaitForReady != nil {
+			break
+		}
+		time.Sleep(time.Millisecond)
+	}
+	cancel()
+
+	testCases := []struct {
+		code  codes.Code
+		count int
+	}{
+		{codes.OK, 0},           // tokens = 10
+		{codes.OK, 3},           // tokens = 8.5 (10 - 2 failures + 0.5 success)
+		{codes.OK, 6},           // tokens = 6
+		{codes.Unavailable, 8},  // tokens = 5 -- first attempt is retried; second aborted.
+		{codes.Unavailable, 9},  // tokens = 4
+		{codes.OK, 10},          // tokens = 4.5
+		{codes.OK, 11},          // tokens = 5
+		{codes.OK, 12},          // tokens = 5.5
+		{codes.OK, 13},          // tokens = 6
+		{codes.OK, 14},          // tokens = 6.5
+		{codes.OK, 16},          // tokens = 5.5
+		{codes.Unavailable, 17}, // tokens = 4.5
+	}
+	for _, tc := range testCases {
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		_, err := ss.client.EmptyCall(ctx, &testpb.Empty{})
+		cancel()
+		if status.Code(err) != tc.code {
+			t.Errorf("EmptyCall(_, _) = _, %v; want _, <Code() = %v>", err, tc.code)
+		}
+		if i != tc.count {
+			t.Errorf("i = %v; want %v", i, tc.count)
+		}
+	}
+}
+
+func TestRetryStreaming(t *testing.T) {
+	defer enableRetry()()
+	req := func(b byte) *testpb.StreamingOutputCallRequest {
+		return &testpb.StreamingOutputCallRequest{Payload: &testpb.Payload{Body: []byte{b}}}
+	}
+	res := func(b byte) *testpb.StreamingOutputCallResponse {
+		return &testpb.StreamingOutputCallResponse{Payload: &testpb.Payload{Body: []byte{b}}}
+	}
+
+	largePayload, _ := newPayload(testpb.PayloadType_COMPRESSABLE, 500)
+
+	type serverOp func(stream testpb.TestService_FullDuplexCallServer) error
+	type clientOp func(stream testpb.TestService_FullDuplexCallClient) error
+
+	// Server Operations
+	sAttempts := func(n int) serverOp {
+		return func(stream testpb.TestService_FullDuplexCallServer) error {
+			const key = "grpc-previous-rpc-attempts"
+			md, ok := metadata.FromIncomingContext(stream.Context())
+			if !ok {
+				return status.Errorf(codes.Internal, "server: no header metadata received")
+			}
+			if got := md[key]; len(got) != 1 || got[0] != strconv.Itoa(n) {
+				return status.Errorf(codes.Internal, "server: metadata = %v; want <contains %q: %q>", md, key, n)
+			}
+			return nil
+		}
+	}
+	sReq := func(b byte) serverOp {
+		return func(stream testpb.TestService_FullDuplexCallServer) error {
+			want := req(b)
+			if got, err := stream.Recv(); err != nil || !proto.Equal(got, want) {
+				return status.Errorf(codes.Internal, "server: Recv() = %v, %v; want %v, <nil>", got, err, want)
+			}
+			return nil
+		}
+	}
+	sReqPayload := func(p *testpb.Payload) serverOp {
+		return func(stream testpb.TestService_FullDuplexCallServer) error {
+			want := &testpb.StreamingOutputCallRequest{Payload: p}
+			if got, err := stream.Recv(); err != nil || !proto.Equal(got, want) {
+				return status.Errorf(codes.Internal, "server: Recv() = %v, %v; want %v, <nil>", got, err, want)
+			}
+			return nil
+		}
+	}
+	sRes := func(b byte) serverOp {
+		return func(stream testpb.TestService_FullDuplexCallServer) error {
+			msg := res(b)
+			if err := stream.Send(msg); err != nil {
+				return status.Errorf(codes.Internal, "server: Send(%v) = %v; want <nil>", msg, err)
+			}
+			return nil
+		}
+	}
+	sErr := func(c codes.Code) serverOp {
+		return func(stream testpb.TestService_FullDuplexCallServer) error {
+			return status.New(c, "").Err()
+		}
+	}
+	sCloseSend := func() serverOp {
+		return func(stream testpb.TestService_FullDuplexCallServer) error {
+			if msg, err := stream.Recv(); msg != nil || err != io.EOF {
+				return status.Errorf(codes.Internal, "server: Recv() = %v, %v; want <nil>, io.EOF", msg, err)
+			}
+			return nil
+		}
+	}
+	sPushback := func(s string) serverOp {
+		return func(stream testpb.TestService_FullDuplexCallServer) error {
+			stream.SetTrailer(metadata.MD{"grpc-retry-pushback-ms": []string{s}})
+			return nil
+		}
+	}
+
+	// Client Operations
+	cReq := func(b byte) clientOp {
+		return func(stream testpb.TestService_FullDuplexCallClient) error {
+			msg := req(b)
+			if err := stream.Send(msg); err != nil {
+				return fmt.Errorf("client: Send(%v) = %v; want <nil>", msg, err)
+			}
+			return nil
+		}
+	}
+	cReqPayload := func(p *testpb.Payload) clientOp {
+		return func(stream testpb.TestService_FullDuplexCallClient) error {
+			msg := &testpb.StreamingOutputCallRequest{Payload: p}
+			if err := stream.Send(msg); err != nil {
+				return fmt.Errorf("client: Send(%v) = %v; want <nil>", msg, err)
+			}
+			return nil
+		}
+	}
+	cRes := func(b byte) clientOp {
+		return func(stream testpb.TestService_FullDuplexCallClient) error {
+			want := res(b)
+			if got, err := stream.Recv(); err != nil || !proto.Equal(got, want) {
+				return fmt.Errorf("client: Recv() = %v, %v; want %v, <nil>", got, err, want)
+			}
+			return nil
+		}
+	}
+	cErr := func(c codes.Code) clientOp {
+		return func(stream testpb.TestService_FullDuplexCallClient) error {
+			want := status.New(c, "").Err()
+			if c == codes.OK {
+				want = io.EOF
+			}
+			res, err := stream.Recv()
+			if res != nil ||
+				((err == nil) != (want == nil)) ||
+				(want != nil && !reflect.DeepEqual(err, want)) {
+				return fmt.Errorf("client: Recv() = %v, %v; want <nil>, %v", res, err, want)
+			}
+			return nil
+		}
+	}
+	cCloseSend := func() clientOp {
+		return func(stream testpb.TestService_FullDuplexCallClient) error {
+			if err := stream.CloseSend(); err != nil {
+				return fmt.Errorf("client: CloseSend() = %v; want <nil>", err)
+			}
+			return nil
+		}
+	}
+	var curTime time.Time
+	cGetTime := func() clientOp {
+		return func(_ testpb.TestService_FullDuplexCallClient) error {
+			curTime = time.Now()
+			return nil
+		}
+	}
+	cCheckElapsed := func(d time.Duration) clientOp {
+		return func(_ testpb.TestService_FullDuplexCallClient) error {
+			if elapsed := time.Since(curTime); elapsed < d {
+				return fmt.Errorf("Elapsed time: %v; want >= %v", elapsed, d)
+			}
+			return nil
+		}
+	}
+	cHdr := func() clientOp {
+		return func(stream testpb.TestService_FullDuplexCallClient) error {
+			_, err := stream.Header()
+			return err
+		}
+	}
+	cCtx := func() clientOp {
+		return func(stream testpb.TestService_FullDuplexCallClient) error {
+			stream.Context()
+			return nil
+		}
+	}
+
+	testCases := []struct {
+		desc      string
+		serverOps []serverOp
+		clientOps []clientOp
+	}{{
+		desc:      "Non-retryable error code",
+		serverOps: []serverOp{sReq(1), sErr(codes.Internal)},
+		clientOps: []clientOp{cReq(1), cErr(codes.Internal)},
+	}, {
+		desc:      "One retry necessary",
+		serverOps: []serverOp{sReq(1), sErr(codes.Unavailable), sReq(1), sAttempts(1), sRes(1)},
+		clientOps: []clientOp{cReq(1), cRes(1), cErr(codes.OK)},
+	}, {
+		desc: "Exceed max attempts (4); check attempts header on server",
+		serverOps: []serverOp{
+			sReq(1), sErr(codes.Unavailable),
+			sReq(1), sAttempts(1), sErr(codes.Unavailable),
+			sAttempts(2), sReq(1), sErr(codes.Unavailable),
+			sAttempts(3), sReq(1), sErr(codes.Unavailable),
+		},
+		clientOps: []clientOp{cReq(1), cErr(codes.Unavailable)},
+	}, {
+		desc: "Multiple requests",
+		serverOps: []serverOp{
+			sReq(1), sReq(2), sErr(codes.Unavailable),
+			sReq(1), sReq(2), sRes(5),
+		},
+		clientOps: []clientOp{cReq(1), cReq(2), cRes(5), cErr(codes.OK)},
+	}, {
+		desc: "Multiple successive requests",
+		serverOps: []serverOp{
+			sReq(1), sErr(codes.Unavailable),
+			sReq(1), sReq(2), sErr(codes.Unavailable),
+			sReq(1), sReq(2), sReq(3), sRes(5),
+		},
+		clientOps: []clientOp{cReq(1), cReq(2), cReq(3), cRes(5), cErr(codes.OK)},
+	}, {
+		desc: "No retry after receiving",
+		serverOps: []serverOp{
+			sReq(1), sErr(codes.Unavailable),
+			sReq(1), sRes(3), sErr(codes.Unavailable),
+		},
+		clientOps: []clientOp{cReq(1), cRes(3), cErr(codes.Unavailable)},
+	}, {
+		desc:      "No retry after header",
+		serverOps: []serverOp{sReq(1), sErr(codes.Unavailable)},
+		clientOps: []clientOp{cReq(1), cHdr(), cErr(codes.Unavailable)},
+	}, {
+		desc:      "No retry after context",
+		serverOps: []serverOp{sReq(1), sErr(codes.Unavailable)},
+		clientOps: []clientOp{cReq(1), cCtx(), cErr(codes.Unavailable)},
+	}, {
+		desc: "Replaying close send",
+		serverOps: []serverOp{
+			sReq(1), sReq(2), sCloseSend(), sErr(codes.Unavailable),
+			sReq(1), sReq(2), sCloseSend(), sRes(1), sRes(3), sRes(5),
+		},
+		clientOps: []clientOp{cReq(1), cReq(2), cCloseSend(), cRes(1), cRes(3), cRes(5), cErr(codes.OK)},
+	}, {
+		desc:      "Negative server pushback - no retry",
+		serverOps: []serverOp{sReq(1), sPushback("-1"), sErr(codes.Unavailable)},
+		clientOps: []clientOp{cReq(1), cErr(codes.Unavailable)},
+	}, {
+		desc:      "Non-numeric server pushback - no retry",
+		serverOps: []serverOp{sReq(1), sPushback("xxx"), sErr(codes.Unavailable)},
+		clientOps: []clientOp{cReq(1), cErr(codes.Unavailable)},
+	}, {
+		desc:      "Multiple server pushback values - no retry",
+		serverOps: []serverOp{sReq(1), sPushback("100"), sPushback("10"), sErr(codes.Unavailable)},
+		clientOps: []clientOp{cReq(1), cErr(codes.Unavailable)},
+	}, {
+		desc:      "1s server pushback - delayed retry",
+		serverOps: []serverOp{sReq(1), sPushback("1000"), sErr(codes.Unavailable), sReq(1), sRes(2)},
+		clientOps: []clientOp{cGetTime(), cReq(1), cRes(2), cCheckElapsed(time.Second), cErr(codes.OK)},
+	}, {
+		desc:      "Overflowing buffer - no retry",
+		serverOps: []serverOp{sReqPayload(largePayload), sErr(codes.Unavailable)},
+		clientOps: []clientOp{cReqPayload(largePayload), cErr(codes.Unavailable)},
+	}}
+
+	var serverOpIter int
+	var serverOps []serverOp
+	ss := &stubServer{
+		fullDuplexCall: func(stream testpb.TestService_FullDuplexCallServer) error {
+			for serverOpIter < len(serverOps) {
+				op := serverOps[serverOpIter]
+				serverOpIter++
+				if err := op(stream); err != nil {
+					return err
+				}
+			}
+			return nil
+		},
+	}
+	if err := ss.Start([]grpc.ServerOption{}, grpc.WithDefaultCallOptions(grpc.MaxRetryRPCBufferSize(200))); err != nil {
+		t.Fatalf("Error starting endpoint server: %v", err)
+	}
+	defer ss.Stop()
+	ss.r.NewServiceConfig(`{
+    "methodConfig": [{
+      "name": [{"service": "grpc.testing.TestService"}],
+      "waitForReady": true,
+      "retryPolicy": {
+          "MaxAttempts": 4,
+          "InitialBackoff": ".01s",
+          "MaxBackoff": ".01s",
+          "BackoffMultiplier": 1.0,
+          "RetryableStatusCodes": [ "UNAVAILABLE" ]
+      }
+    }]}`)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	for {
+		if ctx.Err() != nil {
+			t.Fatalf("Timed out waiting for service config update")
+		}
+		if ss.cc.GetMethodConfig("/grpc.testing.TestService/FullDuplexCall").WaitForReady != nil {
+			break
+		}
+		time.Sleep(time.Millisecond)
+	}
+	cancel()
+
+	for _, tc := range testCases {
+		func() {
+			serverOpIter = 0
+			serverOps = tc.serverOps
+
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
+			stream, err := ss.client.FullDuplexCall(ctx)
+			if err != nil {
+				t.Fatalf("%v: Error while creating stream: %v", tc.desc, err)
+			}
+			for _, op := range tc.clientOps {
+				if err := op(stream); err != nil {
+					t.Errorf("%v: %v", tc.desc, err)
+					break
+				}
+			}
+			if serverOpIter != len(serverOps) {
+				t.Errorf("%v: serverOpIter = %v; want %v", tc.desc, serverOpIter, len(serverOps))
+			}
+		}()
+	}
+}
diff --git a/vendor/google.golang.org/grpc/transport/control.go b/vendor/google.golang.org/grpc/transport/control.go
deleted file mode 100644
index 0474b090..00000000
--- a/vendor/google.golang.org/grpc/transport/control.go
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- *
- * Copyright 2014 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package transport
-
-import (
-	"fmt"
-	"io"
-	"math"
-	"sync"
-	"time"
-
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-)
-
-const (
-	// The default value of flow control window size in HTTP2 spec.
-	defaultWindowSize = 65535
-	// The initial window size for flow control.
-	initialWindowSize             = defaultWindowSize // for an RPC
-	infinity                      = time.Duration(math.MaxInt64)
-	defaultClientKeepaliveTime    = infinity
-	defaultClientKeepaliveTimeout = time.Duration(20 * time.Second)
-	defaultMaxStreamsClient       = 100
-	defaultMaxConnectionIdle      = infinity
-	defaultMaxConnectionAge       = infinity
-	defaultMaxConnectionAgeGrace  = infinity
-	defaultServerKeepaliveTime    = time.Duration(2 * time.Hour)
-	defaultServerKeepaliveTimeout = time.Duration(20 * time.Second)
-	defaultKeepalivePolicyMinTime = time.Duration(5 * time.Minute)
-	// max window limit set by HTTP2 Specs.
-	maxWindowSize = math.MaxInt32
-	// defaultLocalSendQuota sets is default value for number of data
-	// bytes that each stream can schedule before some of it being
-	// flushed out.
-	defaultLocalSendQuota = 128 * 1024
-)
-
-// The following defines various control items which could flow through
-// the control buffer of transport. They represent different aspects of
-// control tasks, e.g., flow control, settings, streaming resetting, etc.
-
-type headerFrame struct {
-	streamID  uint32
-	hf        []hpack.HeaderField
-	endStream bool
-}
-
-func (*headerFrame) item() {}
-
-type continuationFrame struct {
-	streamID            uint32
-	endHeaders          bool
-	headerBlockFragment []byte
-}
-
-type dataFrame struct {
-	streamID  uint32
-	endStream bool
-	d         []byte
-	f         func()
-}
-
-func (*dataFrame) item() {}
-
-func (*continuationFrame) item() {}
-
-type windowUpdate struct {
-	streamID  uint32
-	increment uint32
-}
-
-func (*windowUpdate) item() {}
-
-type settings struct {
-	ss []http2.Setting
-}
-
-func (*settings) item() {}
-
-type settingsAck struct {
-}
-
-func (*settingsAck) item() {}
-
-type resetStream struct {
-	streamID uint32
-	code     http2.ErrCode
-}
-
-func (*resetStream) item() {}
-
-type goAway struct {
-	code      http2.ErrCode
-	debugData []byte
-	headsUp   bool
-	closeConn bool
-}
-
-func (*goAway) item() {}
-
-type flushIO struct {
-	closeTr bool
-}
-
-func (*flushIO) item() {}
-
-type ping struct {
-	ack  bool
-	data [8]byte
-}
-
-func (*ping) item() {}
-
-// quotaPool is a pool which accumulates the quota and sends it to acquire()
-// when it is available.
-type quotaPool struct {
-	mu      sync.Mutex
-	c       chan struct{}
-	version uint32
-	quota   int
-}
-
-// newQuotaPool creates a quotaPool which has quota q available to consume.
-func newQuotaPool(q int) *quotaPool {
-	qb := &quotaPool{
-		quota: q,
-		c:     make(chan struct{}, 1),
-	}
-	return qb
-}
-
-// add cancels the pending quota sent on acquired, incremented by v and sends
-// it back on acquire.
-func (qb *quotaPool) add(v int) {
-	qb.mu.Lock()
-	defer qb.mu.Unlock()
-	qb.lockedAdd(v)
-}
-
-func (qb *quotaPool) lockedAdd(v int) {
-	var wakeUp bool
-	if qb.quota <= 0 {
-		wakeUp = true // Wake up potential waiters.
-	}
-	qb.quota += v
-	if wakeUp && qb.quota > 0 {
-		select {
-		case qb.c <- struct{}{}:
-		default:
-		}
-	}
-}
-
-func (qb *quotaPool) addAndUpdate(v int) {
-	qb.mu.Lock()
-	qb.lockedAdd(v)
-	qb.version++
-	qb.mu.Unlock()
-}
-
-func (qb *quotaPool) get(v int, wc waiters) (int, uint32, error) {
-	qb.mu.Lock()
-	if qb.quota > 0 {
-		if v > qb.quota {
-			v = qb.quota
-		}
-		qb.quota -= v
-		ver := qb.version
-		qb.mu.Unlock()
-		return v, ver, nil
-	}
-	qb.mu.Unlock()
-	for {
-		select {
-		case <-wc.ctx.Done():
-			return 0, 0, ContextErr(wc.ctx.Err())
-		case <-wc.tctx.Done():
-			return 0, 0, ErrConnClosing
-		case <-wc.done:
-			return 0, 0, io.EOF
-		case <-wc.goAway:
-			return 0, 0, errStreamDrain
-		case <-qb.c:
-			qb.mu.Lock()
-			if qb.quota > 0 {
-				if v > qb.quota {
-					v = qb.quota
-				}
-				qb.quota -= v
-				ver := qb.version
-				if qb.quota > 0 {
-					select {
-					case qb.c <- struct{}{}:
-					default:
-					}
-				}
-				qb.mu.Unlock()
-				return v, ver, nil
-
-			}
-			qb.mu.Unlock()
-		}
-	}
-}
-
-func (qb *quotaPool) compareAndExecute(version uint32, success, failure func()) bool {
-	qb.mu.Lock()
-	if version == qb.version {
-		success()
-		qb.mu.Unlock()
-		return true
-	}
-	failure()
-	qb.mu.Unlock()
-	return false
-}
-
-// inFlow deals with inbound flow control
-type inFlow struct {
-	mu sync.Mutex
-	// The inbound flow control limit for pending data.
-	limit uint32
-	// pendingData is the overall data which have been received but not been
-	// consumed by applications.
-	pendingData uint32
-	// The amount of data the application has consumed but grpc has not sent
-	// window update for them. Used to reduce window update frequency.
-	pendingUpdate uint32
-	// delta is the extra window update given by receiver when an application
-	// is reading data bigger in size than the inFlow limit.
-	delta uint32
-}
-
-// newLimit updates the inflow window to a new value n.
-// It assumes that n is always greater than the old limit.
-func (f *inFlow) newLimit(n uint32) uint32 {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	d := n - f.limit
-	f.limit = n
-	return d
-}
-
-func (f *inFlow) maybeAdjust(n uint32) uint32 {
-	if n > uint32(math.MaxInt32) {
-		n = uint32(math.MaxInt32)
-	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	// estSenderQuota is the receiver's view of the maximum number of bytes the sender
-	// can send without a window update.
-	estSenderQuota := int32(f.limit - (f.pendingData + f.pendingUpdate))
-	// estUntransmittedData is the maximum number of bytes the sends might not have put
-	// on the wire yet. A value of 0 or less means that we have already received all or
-	// more bytes than the application is requesting to read.
-	estUntransmittedData := int32(n - f.pendingData) // Casting into int32 since it could be negative.
-	// This implies that unless we send a window update, the sender won't be able to send all the bytes
-	// for this message. Therefore we must send an update over the limit since there's an active read
-	// request from the application.
-	if estUntransmittedData > estSenderQuota {
-		// Sender's window shouldn't go more than 2^31 - 1 as speecified in the HTTP spec.
-		if f.limit+n > maxWindowSize {
-			f.delta = maxWindowSize - f.limit
-		} else {
-			// Send a window update for the whole message and not just the difference between
-			// estUntransmittedData and estSenderQuota. This will be helpful in case the message
-			// is padded; We will fallback on the current available window(at least a 1/4th of the limit).
-			f.delta = n
-		}
-		return f.delta
-	}
-	return 0
-}
-
-// onData is invoked when some data frame is received. It updates pendingData.
-func (f *inFlow) onData(n uint32) error {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	f.pendingData += n
-	if f.pendingData+f.pendingUpdate > f.limit+f.delta {
-		return fmt.Errorf("received %d-bytes data exceeding the limit %d bytes", f.pendingData+f.pendingUpdate, f.limit)
-	}
-	return nil
-}
-
-// onRead is invoked when the application reads the data. It returns the window size
-// to be sent to the peer.
-func (f *inFlow) onRead(n uint32) uint32 {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.pendingData == 0 {
-		return 0
-	}
-	f.pendingData -= n
-	if n > f.delta {
-		n -= f.delta
-		f.delta = 0
-	} else {
-		f.delta -= n
-		n = 0
-	}
-	f.pendingUpdate += n
-	if f.pendingUpdate >= f.limit/4 {
-		wu := f.pendingUpdate
-		f.pendingUpdate = 0
-		return wu
-	}
-	return 0
-}
-
-func (f *inFlow) resetPendingUpdate() uint32 {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	n := f.pendingUpdate
-	f.pendingUpdate = 0
-	return n
-}
diff --git a/vendor/google.golang.org/grpc/backoff_test.go b/vendor/google.golang.org/grpc/version.go
similarity index 68%
rename from vendor/google.golang.org/grpc/backoff_test.go
rename to vendor/google.golang.org/grpc/version.go
index 37e8e3f6..d668a424 100644
--- a/vendor/google.golang.org/grpc/backoff_test.go
+++ b/vendor/google.golang.org/grpc/version.go
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2017 gRPC authors.
+ * Copyright 2018 gRPC authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,5 @@
 
 package grpc
 
-import "testing"
-
-func TestBackoffConfigDefaults(t *testing.T) {
-	b := BackoffConfig{}
-	setDefaults(&b)
-	if b != DefaultBackoffConfig {
-		t.Fatalf("expected BackoffConfig to pickup default parameters: %v != %v", b, DefaultBackoffConfig)
-	}
-}
+// Version is the current grpc version.
+const Version = "1.14.0"
diff --git a/vendor/google.golang.org/grpc/vet.sh b/vendor/google.golang.org/grpc/vet.sh
index 2ad94fed..44a310e5 100755
--- a/vendor/google.golang.org/grpc/vet.sh
+++ b/vendor/google.golang.org/grpc/vet.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ `uname -a` = *"Darwin"* ]]; then
+  echo "It seems you are running on Mac. This script does not work on Mac. See https://github.com/grpc/grpc-go/issues/2047"
+  exit 1
+fi
+
 set -ex  # Exit on error; debugging enabled.
 set -o pipefail  # Fail a pipe if any sub-command fails.
 
@@ -10,11 +15,6 @@ die() {
 
 PATH="$GOPATH/bin:$GOROOT/bin:$PATH"
 
-# Check proto in manual runs or cron runs.
-if [[ "$TRAVIS" != "true" || "$TRAVIS_EVENT_TYPE" = "cron" ]]; then
-  check_proto="true"
-fi
-
 if [ "$1" = "-install" ]; then
   go get -d \
     google.golang.org/grpc/...
@@ -24,7 +24,7 @@ if [ "$1" = "-install" ]; then
     honnef.co/go/tools/cmd/staticcheck \
     github.com/client9/misspell/cmd/misspell \
     github.com/golang/protobuf/protoc-gen-go
-  if [[ "$check_proto" = "true" ]]; then
+  if [[ -z "$VET_SKIP_PROTO" ]]; then
     if [[ "$TRAVIS" = "true" ]]; then
       PROTOBUF_VERSION=3.3.0
       PROTOC_FILENAME=protoc-${PROTOBUF_VERSION}-linux-x86_64.zip
@@ -49,6 +49,8 @@ if git status --porcelain | read; then
 fi
 
 git ls-files "*.go" | xargs grep -L "\(Copyright [0-9]\{4,\} gRPC authors\)\|DO NOT EDIT" 2>&1 | tee /dev/stderr | (! read)
+git ls-files "*.go" | xargs grep -l '"unsafe"' 2>&1 | (! grep -v '_test.go') | tee /dev/stderr | (! read)
+git ls-files "*.go" | xargs grep -l '"math/rand"' 2>&1 | (! grep -v '^examples\|^stress\|grpcrand') | tee /dev/stderr | (! read)
 gofmt -s -d -l . 2>&1 | tee /dev/stderr | (! read)
 goimports -l . 2>&1 | tee /dev/stderr | (! read)
 golint ./... 2>&1 | (grep -vE "(_mock|\.pb)\.go:" || true) | tee /dev/stderr | (! read)
@@ -68,7 +70,7 @@ go tool vet -all . 2>&1 | grep -vE '(clientconn|transport\/transport_test).go:.*
 set -o pipefail
 git reset --hard HEAD
 
-if [[ "$check_proto" = "true" ]]; then
+if [[ -z "$VET_SKIP_PROTO" ]]; then
   PATH="/home/travis/bin:$PATH" make proto && \
     git status --porcelain 2>&1 | (! read) || \
     (git status; git --no-pager diff; exit 1)
@@ -76,9 +78,12 @@ fi
 
 # TODO(menghanl): fix errors in transport_test.
 staticcheck -ignore '
-google.golang.org/grpc/transport/transport_test.go:SA2002
+google.golang.org/grpc/internal/transport/transport_test.go:SA2002
 google.golang.org/grpc/benchmark/benchmain/main.go:SA1019
 google.golang.org/grpc/stats/stats_test.go:SA1019
 google.golang.org/grpc/test/end2end_test.go:SA1019
+google.golang.org/grpc/balancer_test.go:SA1019
+google.golang.org/grpc/balancer.go:SA1019
+google.golang.org/grpc/clientconn_test.go:SA1019
 ' ./...
 misspell -error .